diff --git a/.copywrite.hcl b/.copywrite.hcl
deleted file mode 100644
index ab9fa58f3411e..0000000000000
--- a/.copywrite.hcl
+++ /dev/null
@@ -1,16 +0,0 @@
-schema_version = 1
-
-project {
-  license        = "MPL-2.0"
-  copyright_year = 2015
-
-  # (OPTIONAL) A list of globs that should not have copyright/license headers.
-  # Supports doublestar glob patterns for more flexibility in defining which
-  # files or folders should be ignored
-  header_ignore = [
-    "builtin/credential/aws/pkcs7/**",
-    "ui/node_modules/**",
-    "enos/modules/k8s_deploy_vault/raft-config.hcl",
-    "plugins/database/postgresql/scram/**"
-  ]
-}
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 23958d8352807..9399e9b5dba9c 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 contact_links:
   - name: Ask a question
     url: https://discuss.hashicorp.com/c/vault
diff --git a/.github/actionlint.yaml b/.github/actionlint.yaml
index 335ce6d5aab00..e300244895fbf 100644
--- a/.github/actionlint.yaml
+++ b/.github/actionlint.yaml
@@ -7,4 +7,3 @@ self-hosted-runner:
     - small
     - large
     - ondemand
-
diff --git a/.github/configs/milestone-check.json b/.github/configs/milestone-check.json
deleted file mode 100644
index a06049b15398f..0000000000000
--- a/.github/configs/milestone-check.json
+++ /dev/null
@@ -1,8 +0,0 @@
-[
-    {
-      "type": "check-milestone",
-      "title": "Milestone Check",
-      "success": "Milestone set",
-      "failure": "Milestone not set"
-    }
-  ]
\ No newline at end of file
diff --git a/.github/enos-run-matrices/ent.json b/.github/enos-run-matrices/ent.json
new file mode 100644
index 0000000000000..d1dafc0fba595
--- /dev/null
+++ b/.github/enos-run-matrices/ent.json
@@ -0,0 +1,24 @@
+{
+  "include": [
+    {
+      "scenario": "smoke backend:consul consul_version:1.12.3 distro:ubuntu seal:awskms arch:amd64 builder:crt edition:ent",
+      "aws_region": "us-west-1"
+    },
+    {
+      "scenario": "smoke backend:raft consul_version:1.12.3 distro:ubuntu seal:shamir arch:amd64 builder:crt edition:ent",
+      "aws_region": "us-west-2"
+    },
+    {
+      "scenario": "upgrade backend:raft consul_version:1.11.7 distro:rhel seal:shamir arch:amd64 builder:crt edition:ent",
+      "aws_region": "us-west-1"
+    },
+    {
+      "scenario": "upgrade backend:consul consul_version:1.11.7 distro:rhel seal:awskms arch:amd64 builder:crt edition:ent",
+      "aws_region": "us-west-2"
+    },
+    {
+      "scenario": "autopilot distro:ubuntu seal:shamir arch:amd64 builder:crt edition:ent",
+      "aws_region": "us-west-1"
+    }
+  ]
+}
diff --git a/.github/enos-run-matrices/oss.json b/.github/enos-run-matrices/oss.json
new file mode 100644
index 0000000000000..7ce25ebc49a22
--- /dev/null
+++ b/.github/enos-run-matrices/oss.json
@@ -0,0 +1,20 @@
+{
+  "include": [
+    {
+      "scenario": "smoke backend:consul consul_version:1.12.3 distro:ubuntu seal:awskms arch:amd64 builder:crt edition:oss",
+      "aws_region": "us-west-1"
+    },
+    {
+      "scenario": "smoke backend:raft consul_version:1.12.3 distro:ubuntu seal:shamir arch:amd64 builder:crt edition:oss",
+      "aws_region": "us-west-2"
+    },
+    {
+      "scenario": "upgrade backend:raft consul_version:1.11.7 distro:rhel seal:shamir arch:amd64 builder:crt edition:oss",
+      "aws_region": "us-west-1"
+    },
+    {
+      "scenario": "upgrade backend:consul consul_version:1.11.7 distro:rhel seal:awskms arch:amd64 builder:crt edition:oss",
+      "aws_region": "us-west-2"
+    }
+  ]
+}
diff --git a/.github/scripts/generate-test-package-lists.sh b/.github/scripts/generate-test-package-lists.sh
index 408e1780adb02..2f430a297656d 100755
--- a/.github/scripts/generate-test-package-lists.sh
+++ b/.github/scripts/generate-test-package-lists.sh
@@ -8,8 +8,6 @@
 # solution. It distributes the entire set of test packages into 16 sublists,
 # which should roughly take an equal amount of time to complete.
 
-set -e
-
 test_packages=()
 
 base="github.com/hashicorp/vault"
@@ -20,14 +18,14 @@ test_packages[1]+=" $base/command"
 test_packages[1]+=" $base/sdk/helper/keysutil"
 
 # Total time: 1160
-test_packages[2]+=" $base/sdk/helper/ocsp"
+test_packages[2]+=" $base/builtin/credential/app-id"
 if [ "${ENTERPRISE:+x}" == "x" ] ; then
     test_packages[2]+=" $base/vault/external_tests/replication-perf"
 fi
 
 # Total time: 1009
 test_packages[3]+=" $base/builtin/credential/approle"
-test_packages[3]+=" $base/command/agentproxyshared/sink/file"
+test_packages[3]+=" $base/command/agent/sink/file"
 test_packages[3]+=" $base/command/agent/template"
 test_packages[3]+=" $base/helper/random"
 test_packages[3]+=" $base/helper/storagepacker"
@@ -45,8 +43,6 @@ fi
 test_packages[4]+=" $base/http"
 test_packages[4]+=" $base/sdk/helper/pluginutil"
 test_packages[4]+=" $base/serviceregistration/kubernetes"
-test_packages[4]+=" $base/tools/godoctests/pkg/analyzer"
-test_packages[4]+=" $base/tools/gonilnilfunctions/pkg/analyzer"
 if [ "${ENTERPRISE:+x}" == "x" ] ; then
     test_packages[4]+=" $base/vault/external_tests/apilock"
     test_packages[4]+=" $base/vault/external_tests/filteredpaths"
@@ -88,19 +84,15 @@ test_packages[6]+=" $base/builtin/audit/file"
 test_packages[6]+=" $base/builtin/credential/github"
 test_packages[6]+=" $base/builtin/credential/okta"
 test_packages[6]+=" $base/builtin/logical/database/dbplugin"
-test_packages[6]+=" $base/command/agentproxyshared/auth/cert"
-test_packages[6]+=" $base/command/agentproxyshared/auth/jwt"
-test_packages[6]+=" $base/command/agentproxyshared/auth/kerberos"
-test_packages[6]+=" $base/command/agentproxyshared/auth/kubernetes"
-test_packages[6]+=" $base/command/agentproxyshared/auth/token-file"
-test_packages[6]+=" $base/command/agentproxyshared"
-test_packages[6]+=" $base/command/agentproxyshared/cache"
-test_packages[6]+=" $base/command/agentproxyshared/cache/cacheboltdb"
-test_packages[6]+=" $base/command/agentproxyshared/cache/cachememdb"
-test_packages[6]+=" $base/command/agentproxyshared/cache/keymanager"
+test_packages[6]+=" $base/command/agent/auth/cert"
+test_packages[6]+=" $base/command/agent/auth/jwt"
+test_packages[6]+=" $base/command/agent/auth/kerberos"
+test_packages[6]+=" $base/command/agent/auth/kubernetes"
+test_packages[6]+=" $base/command/agent/cache"
+test_packages[6]+=" $base/command/agent/cache/cacheboltdb"
+test_packages[6]+=" $base/command/agent/cache/cachememdb"
+test_packages[6]+=" $base/command/agent/cache/keymanager"
 test_packages[6]+=" $base/command/agent/config"
-test_packages[6]+=" $base/command/agent/exec"
-test_packages[6]+=" $base/command/proxy/config"
 test_packages[6]+=" $base/command/config"
 test_packages[6]+=" $base/command/token"
 if [ "${ENTERPRISE:+x}" == "x" ] ; then
@@ -114,7 +106,6 @@ test_packages[6]+=" $base/helper/fairshare"
 test_packages[6]+=" $base/helper/flag-kv"
 test_packages[6]+=" $base/helper/flag-slice"
 test_packages[6]+=" $base/helper/forwarding"
-test_packages[6]+=" $base/helper/logging"
 test_packages[6]+=" $base/helper/metricsutil"
 test_packages[6]+=" $base/helper/namespace"
 test_packages[6]+=" $base/helper/osutil"
@@ -122,7 +113,6 @@ test_packages[6]+=" $base/helper/parseip"
 test_packages[6]+=" $base/helper/policies"
 test_packages[6]+=" $base/helper/testhelpers/logical"
 test_packages[6]+=" $base/helper/timeutil"
-test_packages[6]+=" $base/helper/useragent"
 test_packages[6]+=" $base/helper/versions"
 test_packages[6]+=" $base/internalshared/configutil"
 test_packages[6]+=" $base/internalshared/listenerutil"
@@ -147,20 +137,17 @@ test_packages[6]+=" $base/sdk/helper/kdf"
 test_packages[6]+=" $base/sdk/helper/locksutil"
 test_packages[6]+=" $base/sdk/helper/pathmanager"
 test_packages[6]+=" $base/sdk/helper/roottoken"
-test_packages[6]+=" $base/sdk/helper/testhelpers/schema"
 test_packages[6]+=" $base/sdk/helper/xor"
 test_packages[6]+=" $base/sdk/physical/file"
 test_packages[6]+=" $base/sdk/plugin/pb"
 test_packages[6]+=" $base/serviceregistration/kubernetes/client"
 test_packages[6]+=" $base/shamir"
 test_packages[6]+=" $base/vault/cluster"
-test_packages[6]+=" $base/vault/eventbus"
 test_packages[6]+=" $base/vault/external_tests/api"
 if [ "${ENTERPRISE:+x}" == "x" ] ; then
     test_packages[6]+=" $base/vault/external_tests/consistencyheaders"
 fi
 test_packages[6]+=" $base/vault/external_tests/expiration"
-test_packages[6]+=" $base/vault/external_tests/hcp_link"
 test_packages[6]+=" $base/vault/external_tests/kv"
 if [ "${ENTERPRISE:+x}" == "x" ] ; then
     test_packages[6]+=" $base/vault/external_tests/plugins"
@@ -203,7 +190,7 @@ test_packages[7]+=" $base/vault/quotas"
 # Total time: 779
 test_packages[8]+=" $base/builtin/credential/aws/pkcs7"
 test_packages[8]+=" $base/builtin/logical/totp"
-test_packages[8]+=" $base/command/agentproxyshared/auth"
+test_packages[8]+=" $base/command/agent/auth"
 test_packages[8]+=" $base/physical/raft"
 test_packages[8]+=" $base/sdk/framework"
 test_packages[8]+=" $base/sdk/plugin"
@@ -223,8 +210,8 @@ if [ "${ENTERPRISE:+x}" == "x" ] ; then
 fi
 
 # Total time: 310
-test_packages[9]+=" $base/vault/hcp_link/capabilities/api_capability"
 test_packages[9]+=" $base/vault/external_tests/plugin"
+test_packages[9]+=" $base/builtin/logical/cassandra"
 
 # Total time: 925
 test_packages[10]+=" $base/builtin/credential/ldap"
@@ -247,12 +234,10 @@ test_packages[12]+=" $base/plugins/database/mssql"
 test_packages[12]+=" $base/plugins/database/mysql"
 
 # Total time: 704
-test_packages[13]+=" $base/builtin/logical/pkiext"
 test_packages[13]+=" $base/command/server"
 test_packages[13]+=" $base/physical/aerospike"
 test_packages[13]+=" $base/physical/cockroachdb"
 test_packages[13]+=" $base/plugins/database/postgresql"
-test_packages[13]+=" $base/plugins/database/postgresql/scram"
 if [ "${ENTERPRISE:+x}" == "x" ] ; then
     test_packages[13]+=" $base/vault/external_tests/filteredpathsext"
 fi
@@ -261,6 +246,10 @@ test_packages[13]+=" $base/vault/external_tests/policy"
 # Total time: 374
 test_packages[14]+=" $base/builtin/credential/radius"
 test_packages[14]+=" $base/builtin/logical/ssh"
+test_packages[14]+=" $base/builtin/logical/mongodb"
+test_packages[14]+=" $base/builtin/logical/mssql"
+test_packages[14]+=" $base/builtin/logical/mysql"
+test_packages[14]+=" $base/builtin/logical/postgresql"
 if [ "${ENTERPRISE:+x}" == "x" ] ; then
     test_packages[14]+=" $base/enthelpers/wal"
 fi
@@ -287,10 +276,4 @@ if [ "${ENTERPRISE:+x}" == "x" ] ; then
     test_packages[16]+=" $base/vault/external_tests/autosnapshots"
     test_packages[16]+=" $base/vault/external_tests/replicationext"
     test_packages[16]+=" $base/vault/external_tests/sealext"
-fi
-
-for i in $(cd $(git rev-parse --show-toplevel) && go list -test -json ./... |
-  jq -r '.ForTest | select(.!=null) | select(.|test("_binary$"))');
-do
-  test_packages[17]+=" $i"
-done
+fi
\ No newline at end of file
diff --git a/.github/scripts/test-generate-test-package-lists.sh b/.github/scripts/test-generate-test-package-lists.sh
index c3d1cb60670b4..bc8d31cb3bb31 100755
--- a/.github/scripts/test-generate-test-package-lists.sh
+++ b/.github/scripts/test-generate-test-package-lists.sh
@@ -72,4 +72,4 @@ if (( ${#all_packages[@]} != $test_package_count )) ; then
     done
 
     echo "Packages in test_packages that aren't used: ${unused_packages// /}"
-fi
+fi
\ No newline at end of file
diff --git a/.github/scripts/verify_changes.sh b/.github/scripts/verify_changes.sh
index 78a41b14b3186..81f3b688eb5bd 100755
--- a/.github/scripts/verify_changes.sh
+++ b/.github/scripts/verify_changes.sh
@@ -3,13 +3,15 @@
 
 event_type=$1 # GH event type (pull_request)
 ref_name=$2 # branch reference that triggered the workflow
-base_ref=$3 # PR branch base ref
+head_ref=$3 # PR branch head ref
+base_ref=$4 # PR branch base ref
 
 changed_dir=""
 
 if [[ "$event_type" == "pull_request" ]]; then
+  git fetch --no-tags --prune origin $head_ref
   git fetch --no-tags --prune origin $base_ref
-  head_commit="HEAD"
+  head_commit="origin/$head_ref"
   base_commit="origin/$base_ref"
 else
   git fetch --no-tags --prune origin $ref_name
diff --git a/.github/workflows/actionlint.yml b/.github/workflows/actionlint.yml
index 817de2d37b937..abe7e7237b810 100644
--- a/.github/workflows/actionlint.yml
+++ b/.github/workflows/actionlint.yml
@@ -10,6 +10,6 @@ jobs:
   actionlint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
       - name: "Check workflow files"
         uses: docker://docker.mirror.hashicorp.services/rhysd/actionlint@sha256:93834930f56ca380be3e9a3377670d7aa5921be251b9c774891a39b3629b83b8
diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index f78464a8c8b9e..ebcbada20e0a1 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -11,11 +11,11 @@ jobs:
   backport-targeted-release-branch:
     if: github.event.pull_request.merged
     runs-on: ubuntu-latest
-    container: hashicorpdev/backport-assistant:0.3.3
+    container: hashicorpdev/backport-assistant:0.2.5
     steps:
       - name: Backport changes to targeted release branch
         run: |
-          backport-assistant backport -merge-method=squash -gh-automerge 
+          backport-assistant backport
         env:
           BACKPORT_LABEL_REGEXP: "backport/(?P<target>\\d+\\.\\d+\\.[+\\w]+)"
           BACKPORT_TARGET_TEMPLATE: "release/{{.target}}"
diff --git a/.github/workflows/build-vault-oss.yml b/.github/workflows/build-vault-oss.yml
index 60480d53ae23e..6b6f17f09dd94 100644
--- a/.github/workflows/build-vault-oss.yml
+++ b/.github/workflows/build-vault-oss.yml
@@ -40,14 +40,14 @@ jobs:
     runs-on: ubuntu-latest
     name: Vault ${{ inputs.goos }} ${{ inputs.goarch }} v${{ inputs.vault-version }}
     steps:
-      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
-      - uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v4.0.0
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v3
         with:
           go-version: ${{ inputs.go-version }}
       - name: Set up node and yarn
-        uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
+        uses: actions/setup-node@v3
         with:
-          node-version-file: './ui/package.json'
+          node-version: 14
           cache: yarn
           cache-dependency-path: ui/yarn.lock
       - name: Build UI
@@ -58,6 +58,8 @@ jobs:
           GOARCH: ${{ inputs.goarch }}
           GOOS: ${{ inputs.goos }}
           GO_TAGS: ${{ inputs.go-tags }}
+          # We started stripping symbol tables in 1.13.x
+          KEEP_SYMBOLS: true
         run: make ci-build
       - name: Determine artifact basename
         env:
@@ -68,7 +70,7 @@ jobs:
         env:
           BUNDLE_PATH: out/${{ env.ARTIFACT_BASENAME }}.zip
         run: make ci-bundle
-      - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+      - uses: actions/upload-artifact@v3
         with:
           name: ${{ env.ARTIFACT_BASENAME }}.zip
           path: out/${{ env.ARTIFACT_BASENAME }}.zip
@@ -96,13 +98,13 @@ jobs:
           echo "RPM_PACKAGE=$(basename out/*.rpm)" >> "$GITHUB_ENV"
           echo "DEB_PACKAGE=$(basename out/*.deb)" >> "$GITHUB_ENV"
       - if: ${{ inputs.create-packages }}
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ env.RPM_PACKAGE }}
           path: out/${{ env.RPM_PACKAGE }}
           if-no-files-found: error
       - if: ${{ inputs.create-packages }}
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ env.DEB_PACKAGE }}
           path: out/${{ env.DEB_PACKAGE }}
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ccf4a35194882..cc2da2af06090 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,11 +4,6 @@ name: build
 on:
   workflow_dispatch:
   pull_request:
-    # The default types for pull_request are [ opened, synchronize, reopened ].
-    # This is insufficient for our needs, since we're skipping stuff on PRs in
-    # draft mode.  By adding the ready_for_review type, when a draft pr is marked
-    # ready, we run everything, including the stuff we'd have skipped up until now.
-    types: [ opened, synchronize, reopened, ready_for_review ]
   push:
     branches:
       - main
@@ -17,22 +12,19 @@ on:
 jobs:
   # verify-changes determines if the changes are only for docs (website)
   verify-changes:
-    if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     outputs:
       is_docs_change: ${{ steps.get-changeddir.outputs.is_docs_change }}
     steps:
-      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-          fetch-depth: 0 # Use fetch depth 0 for comparing changes to base branch
+      - uses: actions/checkout@v3
       - name: Get changed directories
         id: get-changeddir
         env:
           TYPE: ${{ github.event_name }}
           REF_NAME: ${{ github.ref_name }}
+          HEAD_REF: ${{ github.head_ref }}
           BASE: ${{ github.base_ref }}
-        run: ./.github/scripts/verify_changes.sh ${{ env.TYPE }} ${{ env.REF_NAME }} ${{ env.BASE }}
+        run: ./.github/scripts/verify_changes.sh ${{ env.TYPE }} ${{ env.REF_NAME }} ${{ env.HEAD_REF }} ${{ env.BASE }}
 
   product-metadata:
     # do not run build and test steps for docs changes
@@ -51,7 +43,7 @@ jobs:
       vault-version: ${{ steps.get-metadata.outputs.vault-version }}
       vault-base-version: ${{ steps.get-metadata.outputs.vault-base-version }}
     steps:
-      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+      - uses: actions/checkout@v3
       - name: Get metadata
         id: get-metadata
         env:
@@ -73,7 +65,7 @@ jobs:
         with:
           version: ${{ steps.get-metadata.outputs.vault-version }}
           product: ${{ steps.get-metadata.outputs.package-name }}
-      - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+      - uses: actions/upload-artifact@v3
         with:
           name: metadata.json
           path: ${{ steps.generate-metadata-file.outputs.filepath }}
@@ -152,7 +144,7 @@ jobs:
       matrix:
         arch: [arm, arm64, 386, amd64]
     steps:
-      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+      - uses: actions/checkout@v3
       - uses: hashicorp/actions-docker-build@v1
         with:
           version: ${{ needs.product-metadata.outputs.vault-version }}
@@ -173,7 +165,7 @@ jobs:
       matrix:
         arch: [amd64]
     steps:
-      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+      - uses: actions/checkout@v2
       - uses: hashicorp/actions-docker-build@v1
         with:
           version: ${{ needs.product-metadata.outputs.vault-version }}
@@ -184,15 +176,6 @@ jobs:
 
   test:
     name: Test ${{ matrix.build-artifact-name }}
-    # Only run the Enos workflow against branches that are created from the
-    # hashicorp/vault repository. This has the effect of limiting execution of
-    # Enos scenarios to branches that originate from authors that have write
-    # access to hashicorp/vault repository. This is required as Github Actions
-    # will not populate the required secrets for branches created by outside
-    # contributors in order to protect the secrets integrity.
-    # This condition can be removed in future if enos workflow is updated to
-    # workflow_run event
-    if: "! github.event.pull_request.head.repo.fork"
     needs:
       - product-metadata
       - build-linux
@@ -216,16 +199,6 @@ jobs:
 
   test-docker-k8s:
     name: Test Docker K8s
-    # Only run the Enos workflow against branches that are created from the
-    # hashicorp/vault repository. This has the effect of limiting execution of
-    # Enos scenarios to branches that originate from authors that have write
-    # access to hashicorp/vault repository. This is required as Github Actions
-    # will not populate the required secrets for branches created by outside
-    # contributors in order to protect the secrets integrity.
-    # GHA secrets are only ready on workflow_run for public repo
-    # This condition can be removed in future if enos workflow is updated to
-    # workflow_run event
-    if: "! github.event.pull_request.head.repo.fork"
     needs:
       - product-metadata
       - build-docker
diff --git a/.github/workflows/changelog-checker.yml b/.github/workflows/changelog-checker.yml
index 155cc8eff1e7e..3811a767fb18a 100644
--- a/.github/workflows/changelog-checker.yml
+++ b/.github/workflows/changelog-checker.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+      - uses: actions/checkout@v2
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0 # by default the checkout action doesn't checkout all branches
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3658f62927470..2f857653503f9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,11 +1,6 @@
 name: CI
 on:
   pull_request:
-    # The default types for pull_request are [ opened, synchronize, reopened ].
-    # This is insufficient for our needs, since we're skipping stuff on PRs in
-    # draft mode.  By adding the ready_for_review type, when a draft pr is marked
-    # ready, we run everything, including the stuff we'd have skipped up until now.
-    types: [ opened, synchronize, reopened, ready_for_review ]
   push:
     branches:
       - main
@@ -54,7 +49,7 @@ jobs:
     container:
       image: returntocorp/semgrep@sha256:ffc6f3567654f9431456d49fd059dfe548f007c494a7eb6cd5a1a3e50d813fb3
     steps:
-    - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+    - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
     - name: Run Semgrep Rules
       id: semgrep
       run: semgrep ci --include '*.go' --config 'tools/semgrep/ci'
@@ -72,8 +67,8 @@ jobs:
     - setup
     runs-on: ${{ fromJSON(needs.setup.outputs.compute-tiny) }}
     steps:
-    - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
-    - uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v4.0.0
+    - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
+    - uses: actions/setup-go@d0a58c1c4d2b25278816e339b944508c875f3613
       with:
         go-version-file: ./.go-version
         cache: true
@@ -92,7 +87,7 @@ jobs:
     if: ${{ needs.setup.outputs.enterprise != '' && github.base_ref != '' }}
     runs-on: ${{ fromJSON(needs.setup.outputs.compute-tiny) }}
     steps:
-    - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+    - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
       with:
         fetch-depth: 0
     - id: determine-branch
@@ -130,10 +125,7 @@ jobs:
       !startsWith(github.head_ref, 'backport/docs/')
     uses: ./.github/workflows/test-go.yml
     with:
-      # The regular Go tests use an extra runner to execute the
-      # binary-dependent tests. We isolate them there so that the
-      # other tests aren't slowed down waiting for a binary build.
-      total-runners: 17
+      total-runners: 16
       go-arch: amd64
       go-build-tags: '${{ needs.setup.outputs.go-build-tags }},deadlock'
       runs-on: ${{ needs.setup.outputs.compute-larger }}
@@ -146,7 +138,6 @@ jobs:
     - setup-go-cache
     # Don't run this job for PR branches starting with 'ui/', 'backport/ui/', 'docs/', or 'backport/docs/'
     if: |
-      github.event.pull_request.draft == false &&
       !startsWith(github.head_ref, 'ui/') &&
       !startsWith(github.head_ref, 'backport/ui/') &&
       !startsWith(github.head_ref, 'docs/') &&
@@ -163,13 +154,11 @@ jobs:
       go-build-tags: ${{ needs.setup.outputs.go-build-tags }}
       runs-on: ${{ needs.setup.outputs.compute-huge }}
       enterprise: ${{ needs.setup.outputs.enterprise }}
-      name: "-race"
     secrets: inherit
   test-go-fips:
     name: Run Go tests with FIPS configuration
     # Only run this job for the enterprise repo if the PR branch doesn't start with 'ui/', 'backport/ui/', 'docs/', or 'backport/docs/'
     if: |
-      github.event.pull_request.draft == false &&
       needs.setup.outputs.enterprise == 1 &&
       !startsWith(github.head_ref, 'ui/') &&
       !startsWith(github.head_ref, 'backport/ui/') &&
@@ -189,21 +178,18 @@ jobs:
       go-build-tags: '${{ needs.setup.outputs.go-build-tags }},deadlock,cgo,fips,fips_140_2'
       runs-on: ${{ needs.setup.outputs.compute-larger }}
       enterprise: ${{ needs.setup.outputs.enterprise }}
-      name: "-fips"
     secrets: inherit
   test-ui:
     name: Test UI
     # The test-ui job is only run on:
     # - pushes to main and branches starting with "release/"
     # - PRs where the branch starts with "ui/", "backport/ui/", "merge", or when base branch starts with "release/"
-    # - PRs with the "ui" label on github
     if: |
       github.ref_name == 'main' ||
       startsWith(github.ref_name, 'release/') ||
       startsWith(github.head_ref, 'ui/') ||
       startsWith(github.head_ref, 'backport/ui/') ||
-      startsWith(github.head_ref, 'merge') || 
-      contains(github.event.pull_request.labels.*.name, 'ui')
+      startsWith(github.head_ref, 'merge')
     needs:
     - setup
     permissions:
@@ -211,26 +197,26 @@ jobs:
       contents: read
     runs-on: ${{ fromJSON(needs.setup.outputs.compute-larger) }}
     steps:
-    - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
-    - uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v4.0.0
+    - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
+    - uses: actions/setup-go@d0a58c1c4d2b25278816e339b944508c875f3613
       with:
         go-version-file: ./.go-version
         cache: true
     # Setup node.js without caching to allow running npm install -g yarn (next step)
-    - uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
+    - uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c
       with:
-        node-version-file: './ui/package.json'
+        node-version: 14
     - id: install-yarn
       run: |
         npm install -g yarn
     # Setup node.js with caching using the yarn.lock file
-    - uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
+    - uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c
       with:
-        node-version-file: './ui/package.json'
+        node-version: 14
         cache: yarn
         cache-dependency-path: ui/yarn.lock
     - id: install-browser
-      uses: browser-actions/setup-chrome@c485fa3bab6be59dce18dbc18ef6ab7cbc8ff5f1 # v1.2.0
+      uses: browser-actions/setup-chrome@29abc1a83d1d71557708563b4bc962d0f983a376
     - id: ui-dependencies
       name: ui-dependencies
       working-directory: ./ui
@@ -281,12 +267,12 @@ jobs:
         cd ui
         mkdir -p test-results/qunit
         yarn test:oss
-    - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+    - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce
       with:
         name: test-results-ui
         path: ui/test-results
       if: always()
-    - uses: test-summary/action@62bc5c68de2a6a0d02039763b8c754569df99e3f # TSCCR: no entry for repository "test-summary/action"
+    - uses: test-summary/action@62bc5c68de2a6a0d02039763b8c754569df99e3f
       with:
         paths: "ui/test-results/qunit/results.xml"
         show: "fail"
@@ -300,4 +286,4 @@ jobs:
     runs-on: ${{ fromJSON(needs.setup.outputs.compute-tiny) }}
     steps:
     - run: |
-        tr -d '\n' <<< '${{ toJSON(needs.*.result) }}' | grep -q -v -E '(failure|cancelled)'
+        tr -d '\n' <<< '${{ toJSON(needs.*.result) }}' | grep -q -v -E '(failure|cancelled)' 
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
new file mode 100644
index 0000000000000..af1f723925a96
--- /dev/null
+++ b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,50 @@
+name: "Code scanning - scheduled (weekly) or on-demand"
+
+on:
+  schedule:
+    - cron: '0 15 * * 0'
+  workflow_dispatch:
+
+jobs:
+  CodeQL-Build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        # We must fetch at least the immediate parents so that if this is
+        # a pull request then we can checkout the head.
+        fetch-depth: 2
+
+    # If this run was triggered by a pull request event, then checkout
+    # the head of the pull request instead of the merge commit.
+    - run: git checkout HEAD^2
+      if: ${{ github.event_name == 'pull_request' }}
+      
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      # Override language selection by uncommenting this and choosing your languages
+      with:
+        languages: go, javascript
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1
diff --git a/.github/workflows/drepecated-functions-checker.yml b/.github/workflows/drepecated-functions-checker.yml
deleted file mode 100644
index 853681b34f820..0000000000000
--- a/.github/workflows/drepecated-functions-checker.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: "Check Deprecations"
-
-on:
-  pull_request:
-    # Runs on PRs to main
-    branches:
-      - main
-
-jobs:
-  deprecations-check:
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
-        with:
-          fetch-depth: 0 # by default the checkout action doesn't checkout all branches
-      - name: Setup Go
-        uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v4.0.0
-        with:
-          go-version-file: ./.go-version
-          cache: true
-      - name: Install required tools
-        run: |
-          make bootstrap
-      - name: Check deprecations for files in diff
-        run: |
-          # Need to run this from repository root and not from scripts/ as staticcheck works 
-          # only on packages
-          ./scripts/deprecations-checker.sh ${{ github.event.pull_request.base.ref }} ${{ github.event.repository.name }}
-          
\ No newline at end of file
diff --git a/.github/workflows/enos-fmt.yml b/.github/workflows/enos-fmt.yml
index d3d5ade0d6309..298b2dc185f1e 100644
--- a/.github/workflows/enos-fmt.yml
+++ b/.github/workflows/enos-fmt.yml
@@ -15,7 +15,7 @@ jobs:
     env:
       GITHUB_TOKEN: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+      - uses: actions/checkout@v3
       - uses: hashicorp/setup-terraform@v2
         with:
           terraform_wrapper: false
diff --git a/.github/workflows/enos-release-testing-oss.yml b/.github/workflows/enos-release-testing-oss.yml
index a39bab7aaacfc..7cddbc56ed32c 100644
--- a/.github/workflows/enos-release-testing-oss.yml
+++ b/.github/workflows/enos-release-testing-oss.yml
@@ -15,7 +15,7 @@ jobs:
       vault-revision: ${{ steps.get-metadata.outputs.vault-revision }}
       vault-version: ${{ steps.get-metadata.outputs.vault-version }}
     steps:
-      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+      - uses: actions/checkout@v3
         with:
           # Check out the repository at the same Git SHA that was used to create
           # the artifacts to get the correct metadata.
@@ -64,7 +64,6 @@ jobs:
 
   save-metadata:
     runs-on: linux
-    if: always()
     needs: test
     steps:
       - name: Persist metadata
diff --git a/.github/workflows/enos-run-k8s.yml b/.github/workflows/enos-run-k8s.yml
index 6af4d0393d8a9..e5200d025151b 100644
--- a/.github/workflows/enos-run-k8s.yml
+++ b/.github/workflows/enos-run-k8s.yml
@@ -31,7 +31,7 @@ jobs:
       GITHUB_TOKEN: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
     steps:
       - name: Checkout
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+        uses: actions/checkout@v3
       - name: Set up Terraform
         uses: hashicorp/setup-terraform@v2
         with:
@@ -44,7 +44,7 @@ jobs:
           github-token: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
       - name: Download Docker Image
         id: download
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
+        uses: actions/download-artifact@e9ef242655d12993efdcda9058dee2db83a2cb9b
         with:
           name: ${{ inputs.artifact-name }}
           path: ./enos/support/downloads
diff --git a/.github/workflows/godoc-test-checker.yml b/.github/workflows/godoc-test-checker.yml
deleted file mode 100644
index e56ebda42f1a4..0000000000000
--- a/.github/workflows/godoc-test-checker.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: Check Go Docs for tests
-
-on:
-  pull_request:
-    types: [opened, synchronize]
-    # Runs on PRs to main
-    branches:
-      - main
-
-jobs:
-  godoc-test-check:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
-        with:
-          fetch-depth: 0
-      - name: Set Up Go
-        uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v4.0.0
-        with:
-          cache: true
-          go-version-file: ./.go-version
-      - name: Verify new tests have go docs
-        run: make ci-vet-godoctests
diff --git a/.github/workflows/milestone-checker.yml b/.github/workflows/milestone-checker.yml
deleted file mode 100644
index b23ce6081dd44..0000000000000
--- a/.github/workflows/milestone-checker.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-# This workflow checks that there is either a 'pr/no-milestone' label applied to a PR
-# or there is a milestone associated with a PR
-
-name: Check Milestone
-
-on:
-  pull_request:
-    types: [opened, synchronize, labeled, unlabeled]
-    # Runs on PRs to main and release branches
-    branches:
-      - main
-      - release/**
-  issues:
-    types: [milestoned, demilestoned]
-
-jobs:
-  # checks that a milestone entry is present for a PR
-  milestone-check:
-    # If there is a `pr/no-milestone` label we ignore this check
-    if: "! ( contains(github.event.pull_request.labels.*.name, 'pr/no-milestone') || ( github.event.name == 'labeled' && github.event.label == 'pr/no-milestone' ) )"
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Actions
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
-        with:
-          repository: "grafana/grafana-github-actions"
-          path: ./actions
-          ref: main
-      - name: Install Actions
-        run: npm install --production --prefix ./actions
-      - name: Run PR Checks
-        uses: ./actions/pr-checks
-        with:
-          token: ${{secrets.GITHUB_TOKEN}}
-          configPath: configs/milestone-check
diff --git a/.github/workflows/nil-nil-function-checker.yml b/.github/workflows/nil-nil-function-checker.yml
deleted file mode 100644
index 04c3e1ba43ddb..0000000000000
--- a/.github/workflows/nil-nil-function-checker.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: Check Functions For nil, nil returns
-
-on:
-  pull_request:
-    types: [opened, synchronize]
-    # Runs on PRs to main
-    branches:
-      - main
-
-jobs:
-  # Note: if there is a function we want to ignore this check for,
-  # You can add 'ignore-nil-nil-function-check' somewhere in the
-  # godoc for the function.
-  nil-nil-function-check:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
-        with:
-          fetch-depth: 0
-      - name: Set Up Go
-        uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v4.0.0
-        with:
-          cache: true
-          go-version-file: ./.go-version
-      - name: Verify functions don't return nil, nil
-        run: make ci-vet-gonilnilfunctions
diff --git a/.github/workflows/oss.yml b/.github/workflows/oss.yml
index dd6f3392f9f1f..d49550ff5a05f 100644
--- a/.github/workflows/oss.yml
+++ b/.github/workflows/oss.yml
@@ -19,9 +19,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - if: github.event.pull_request != null
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+        uses: actions/checkout@v3
       - if: github.event.pull_request != null
-        uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1
+        uses: dorny/paths-filter@v2
         id: changes
         with:
           # derived from CODEOWNERS
@@ -68,7 +68,7 @@ jobs:
       - if: github.event.pull_request != null && steps.changes.outputs.ui == 'true'
         run: echo "PROJECT=171" >> "$GITHUB_ENV"
 
-      - uses: actions/add-to-project@v0.3.0 # TSCCR: no entry for repository "actions/add-to-project"
+      - uses: actions/add-to-project@v0.3.0
         with:
           project-url: https://github.com/orgs/hashicorp/projects/${{ env.PROJECT }}
           github-token: ${{ secrets.TRIAGE_GITHUB_TOKEN }}
diff --git a/.github/workflows/remove-labels.yml b/.github/workflows/remove-labels.yml
deleted file mode 100644
index 014b6752af7a4..0000000000000
--- a/.github/workflows/remove-labels.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: Autoremove Labels
-
-on:
-  issues:
-    types: [closed]
-  pull_request_target:
-    types: [closed]
-
-jobs:
-
-  RemoveWaitingLabelFromClosedIssueOrPR:
-    if: github.event.action == 'closed'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Remove triaging labels from closed issues and PRs
-        uses: actions-ecosystem/action-remove-labels@2ce5d41b4b6aa8503e285553f75ed56e0a40bae0 # v1.3.0
-        with:
-          labels: |
-            waiting-for-response
\ No newline at end of file
diff --git a/.github/workflows/security-scan.yml b/.github/workflows/security-scan.yml
deleted file mode 100644
index 3d58acbb7a9f5..0000000000000
--- a/.github/workflows/security-scan.yml
+++ /dev/null
@@ -1,82 +0,0 @@
-name: Security Scan
-
-on:
-  push:
-    branches: [main]
-  pull_request:
-    branches:
-      - 'main'
-      - '!oss-merge-main*'
-
-jobs:
-  scan:
-    runs-on: ['linux', 'large']
-    if: ${{ github.actor != 'dependabot[bot]' || github.actor != 'hc-github-team-secure-vault-core' }}
-    steps:
-    - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
-
-    - name: Set up Go
-      uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v4.0.0
-      with:
-        go-version: 1.18
-
-    - name: Set up Python
-      uses: actions/setup-python@57ded4d7d5e986d7296eab16560982c6dd7c923b # v4.6.0
-      with:
-        python-version: 3.x
-
-    - name: Clone Security Scanner repo
-      uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
-      with:
-        repository: hashicorp/security-scanner
-        token: ${{ secrets.HASHIBOT_PRODSEC_GITHUB_TOKEN }}
-        path: security-scanner
-        ref: 5a491479f4131d343afe0a4f18f6fcd36639f3fa
-
-    - name: Install dependencies
-      shell: bash
-      env:
-        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: |
-        mkdir "$HOME/.bin"
-        cd "$GITHUB_WORKSPACE/security-scanner/pkg/sdk/examples/scan-plugin-semgrep"
-        go build -o scan-plugin-semgrep .
-        mv scan-plugin-semgrep "$HOME/.bin"
-        
-        cd "$GITHUB_WORKSPACE/security-scanner/pkg/sdk/examples/scan-plugin-codeql"
-        go build -o scan-plugin-codeql .
-        mv scan-plugin-codeql "$HOME/.bin"
-        
-        # Semgrep
-        python3 -m pip install semgrep
-        
-        # CodeQL
-        LATEST=$(gh release list --repo https://github.com/github/codeql-action | cut -f 3 | sort --version-sort | tail -n1)
-        gh release download --repo https://github.com/github/codeql-action --pattern codeql-bundle-linux64.tar.gz "$LATEST"
-        tar xf codeql-bundle-linux64.tar.gz -C "$HOME/.bin"
-        
-        # Add to PATH
-        echo "$HOME/.bin" >> "$GITHUB_PATH"
-        echo "$HOME/.bin/codeql" >> "$GITHUB_PATH"
-
-    - name: Scan
-      id: scan
-      uses: ./security-scanner
-      # env:
-        # Note: this _should_ work, but causes some issues with Semgrep.
-        # Instead, rely on filtering in the SARIF Output step.
-        #SEMGREP_BASELINE_REF: ${{ github.base_ref }}
-      with:
-        repository: "$PWD"
-
-    - name: SARIF Output
-      shell: bash
-      env:
-        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: |
-        cat results.sarif
-
-    - name: Upload SARIF file
-      uses: github/codeql-action/upload-sarif@9a866ed4524fc3422c3af1e446dab8efa3503411 # codeql-bundle-20230418
-      with:
-        sarif_file: results.sarif
diff --git a/.github/workflows/setup-go-cache.yml b/.github/workflows/setup-go-cache.yml
index 6d8096c5dc1e9..3b8040a20545c 100644
--- a/.github/workflows/setup-go-cache.yml
+++ b/.github/workflows/setup-go-cache.yml
@@ -8,10 +8,10 @@ jobs:
   setup-go-cache:
     runs-on: ${{ fromJSON(inputs.runs-on) }}
     steps:
-    - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+    - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c #v3.3.0 as of 2023-01-18
     - id: setup-go
       name: Setup go
-      uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v4.0.0
+      uses: actions/setup-go@d0a58c1c4d2b25278816e339b944508c875f3613 #v3.4.0 as of 2022-12-07
       with:
         go-version-file: ./.go-version
         cache: true
diff --git a/.github/workflows/stable-website.yaml b/.github/workflows/stable-website.yaml
index 1447151d73deb..fdd6da27f9d6a 100644
--- a/.github/workflows/stable-website.yaml
+++ b/.github/workflows/stable-website.yaml
@@ -10,7 +10,7 @@ jobs:
     name: Cherry pick to stable-website branch
     steps:
     - name: Checkout
-      uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+      uses: actions/checkout@v2
       with:
         ref: stable-website
     - run: |
diff --git a/.github/workflows/test-acc-dockeronly-nightly.yml b/.github/workflows/test-acc-dockeronly-nightly.yml
deleted file mode 100644
index 4a78bb62f49a2..0000000000000
--- a/.github/workflows/test-acc-dockeronly-nightly.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: test-go-acceptance-nightly
-
-on:
-  # Change to nightly cadence once API-credential-requiring tests are added to the jobs
-  workflow_dispatch: 
-
-# Currently the jobs here are only for acceptance tests that have no dependencies except for Docker
-jobs:
-  plugins-database:
-    uses: ./.github/workflows/test-run-acc-tests-for-path.yml
-    strategy:
-      matrix:
-        name: [mongodb, mysql, postgresql]
-    with:
-      name: plugins-database-${{ matrix.name }}
-      path: plugins/database/${{ matrix.name }}
-
-  external:
-    uses: ./.github/workflows/test-run-acc-tests-for-path.yml
-    strategy:
-      matrix:
-        name: [api, identity, token]
-    with:
-      name: external-${{ matrix.name }}
-      path: vault/external_tests/${{ matrix.name }}
-  
-  # Suggestions and tips for adding more acceptance test jobs:
-  #   - the job name is up to you, but it should be derived from the path that the tests are found in
-  #     - for instance, "plugins-database" is a job for acceptance tests in the plugins/database path
-  #   - the path will be used with go test wildcards, but don't include the preceding "./" or following "/..."
-  #   - the name parameter is used to construct the log artifact's name, make it something that is related to the path
diff --git a/.github/workflows/test-ci-bootstrap.yml b/.github/workflows/test-ci-bootstrap.yml
deleted file mode 100644
index a0efa8ddfdd0d..0000000000000
--- a/.github/workflows/test-ci-bootstrap.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-name: test-ci-bootstrap
-
-on:
-  workflow_dispatch:
-  pull_request:
-    branches:
-      - main
-    paths:
-      - enos/ci/**
-      - .github/workflows/test-ci-bootstrap.yml
-  push:
-    branches:
-      - main
-    paths:
-      - enos/ci/**
-      - .github/workflows/test-ci-bootstrap.yml
-
-jobs:
-  bootstrap-ci:
-    runs-on: ubuntu-latest
-    env:
-      TF_WORKSPACE: "${{ github.event.repository.name }}-ci-enos-bootstrap"
-      TF_VAR_repository: ${{ github.event.repository.name }}
-      TF_VAR_aws_ssh_public_key: ${{ secrets.SSH_KEY_PUBLIC_CI }}
-      TF_TOKEN_app_terraform_io: ${{ secrets.TF_API_TOKEN }}
-    steps:
-      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
-      - name: Set up Terraform
-        uses: hashicorp/setup-terraform@v2
-      - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@e1e17a757e536f70e52b5a12b2e8d1d1c60e04ef # v2.0.0
-        with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID_CI }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY_CI }}
-          aws-region: us-east-1
-          role-to-assume: ${{ secrets.AWS_ROLE_ARN_CI }}
-          role-skip-session-tagging: true
-          role-duration-seconds: 3600
-      - name: Init Terraform
-        id: tf_init
-        run: |
-          terraform -chdir=enos/ci/bootstrap init
-      - name: Plan Terraform
-        id: tf_plan
-        run: |
-          terraform -chdir=enos/ci/bootstrap plan
-      - name: Apply Terraform
-        if: ${{ github.ref == 'refs/heads/main' }}
-        id: tf_apply
-        run: |
-          terraform -chdir=enos/ci/bootstrap apply -auto-approve
diff --git a/.github/workflows/test-ci-cleanup.yml b/.github/workflows/test-ci-cleanup.yml
deleted file mode 100644
index 0e3c90dd3b5fd..0000000000000
--- a/.github/workflows/test-ci-cleanup.yml
+++ /dev/null
@@ -1,88 +0,0 @@
-name: test-ci-cleanup
-on:
-  schedule:
-    # * is a special character in YAML so you have to quote this string
-    - cron:  '05 02 * * *'
-
-jobs:
-  setup:
-    runs-on: ubuntu-latest
-    outputs:
-      regions: ${{steps.setup.outputs.regions}}
-    steps:
-      - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@e1e17a757e536f70e52b5a12b2e8d1d1c60e04ef # v2.0.0
-        with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID_CI }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY_CI }}
-          aws-region: us-east-1
-          role-to-assume: ${{ secrets.AWS_ROLE_ARN_CI }}
-          role-skip-session-tagging: true
-          role-duration-seconds: 3600
-      - name: Get all regions
-        id: setup
-        run: |
-          echo "regions=$(aws ec2 describe-regions --region us-east-1 --output json --query 'Regions[].RegionName' | tr -d '\n ')" >> "$GITHUB_OUTPUT"
-
-  aws-nuke:
-    needs: setup
-    runs-on: ubuntu-latest
-    container:
-      image: rebuy/aws-nuke
-      options:
-         --user root
-         -t
-      env:
-        AWS_ACCESS_KEY_ID: ${{ env.AWS_ACCESS_KEY_ID }}
-        AWS_SECRET_ACCESS_KEY: ${{ env.AWS_SECRET_ACCESS_KEY }}
-        TIME_LIMIT: "72h"
-    timeout-minutes: 60
-    steps:
-      - name: Configure AWS credentials
-        id: aws-configure
-        uses: aws-actions/configure-aws-credentials@e1e17a757e536f70e52b5a12b2e8d1d1c60e04ef # v2.0.0
-        with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID_CI }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY_CI }}
-          aws-region: us-east-1
-          role-to-assume: ${{ secrets.AWS_ROLE_ARN_CI }}
-          role-skip-session-tagging: true
-          role-duration-seconds: 3600
-          mask-aws-account-id: false
-      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
-      - name: Configure
-        run: |
-          cp enos/ci/aws-nuke.yml .
-          sed -i "s/ACCOUNT_NUM/${{ steps.aws-configure.outputs.aws-account-id }}/g" aws-nuke.yml
-          sed -i "s/TIME_LIMIT/${TIME_LIMIT}/g" aws-nuke.yml
-      # We don't care if cleanup succeeds or fails, because dependencies be dependenceies,
-      # we'll fail on actually actionable things in the quota steep afterwards.
-      - name: Clean up abandoned resources
-        # Filter STDERR because it's super noisy about things we don't have access to
-        run: |
-          aws-nuke -c aws-nuke.yml -q --no-dry-run --force 2>/tmp/aws-nuke-error.log || true
-
-  check-quotas:
-    needs: [ setup, aws-nuke ]
-    runs-on: ubuntu-latest
-    container:
-      image: jantman/awslimitchecker
-      env:
-        AWS_ACCESS_KEY_ID: ${{ env.AWS_ACCESS_KEY_ID_CI }}
-        AWS_SECRET_ACCESS_KEY: ${{ env.AWS_SECRET_ACCESS_KEY_CI }}
-    strategy:
-      matrix:
-        region: ${{ fromJSON(needs.setup.outputs.regions) }}
-    steps:
-      - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@e1e17a757e536f70e52b5a12b2e8d1d1c60e04ef # v2.0.0
-        with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID_CI }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY_CI }}
-          aws-region: us-east-1
-          role-to-assume: ${{ secrets.AWS_ROLE_ARN_CI }}
-          role-skip-session-tagging: true
-          role-duration-seconds: 3600
-      # Currently just checking VPC limits across all region, can add more checks here in future
-      - name: Check AWS Quotas
-        run: awslimitchecker -S "VPC" -r ${{matrix.region}}
diff --git a/.github/workflows/test-enos-scenario-ui.yml b/.github/workflows/test-enos-scenario-ui.yml
index 53ae5f9c9f37b..9fa25bd0f3b28 100644
--- a/.github/workflows/test-enos-scenario-ui.yml
+++ b/.github/workflows/test-enos-scenario-ui.yml
@@ -32,14 +32,18 @@ jobs:
     name: Get metadata
     runs-on: ubuntu-latest
     outputs:
+      go-version: ${{ steps.get-metadata.outputs.go-version }}
+      node-version: ${{ steps.get-metadata.outputs.node-version }}
       runs-on: ${{ steps.get-metadata.outputs.runs-on }}
       vault_edition: ${{ steps.get-metadata.outputs.vault_edition }}
     steps:
-      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+      - uses: actions/checkout@v3
       - id: get-metadata
         env:
           IS_ENT: ${{ startsWith(github.event.repository.name, 'vault-enterprise' ) }}
         run: |
+          echo "go-version=$(cat ./.go-version)" >> "$GITHUB_OUTPUT"
+          echo "node-version=$(cat ./ui/.nvmrc)" >> "$GITHUB_OUTPUT"
           if [ "$IS_ENT" == true ]; then
             echo "detected vault_edition=ent"
             echo "runs-on=['self-hosted', 'ondemand', 'os=linux', 'type=m5d.4xlarge']" >> "$GITHUB_OUTPUT"
@@ -67,20 +71,20 @@ jobs:
       GOPRIVATE: github.com/hashicorp
     steps:
       - name: Checkout
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+        uses: actions/checkout@v3
       - name: Set Up Go
-        uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v4.0.0
+        uses: actions/setup-go@v3
         with:
-          go-version-file: ./.go-version
+          go-version: ${{ needs.get-metadata.outputs.go-version }}
       - uses: hashicorp/action-setup-enos@v1
         with:
           github-token: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
       - name: Set Up Git
         run: git config --global url."https://${{ secrets.elevated_github_token }}:@github.com".insteadOf "https://github.com"
       - name: Set Up Node
-        uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
+        uses: actions/setup-node@v3
         with:
-          node-version-file: './ui/package.json'
+          node-version: ${{ needs.get-metadata.outputs.node-version }}
       - name: Set Up Terraform
         uses: hashicorp/setup-terraform@v2
         with:
@@ -104,12 +108,12 @@ jobs:
           sudo apt install -y libnss3-dev libgdk-pixbuf2.0-dev libgtk-3-dev libxss-dev libasound2
       - name: Install Chrome
         if: steps.chrome-check.outputs.chrome-version == 'not-installed'
-        uses: browser-actions/setup-chrome@c485fa3bab6be59dce18dbc18ef6ab7cbc8ff5f1 # v1.2.0
+        uses: browser-actions/setup-chrome@v1
       - name: Installed Chrome Version
         run: |
           echo "Installed Chrome Version = [$(chrome --version 2> /dev/null || google-chrome --version 2> /dev/null || google-chrome-stable --version 2> /dev/null)]"
       - name: Configure AWS credentials from Test account
-        uses: aws-actions/configure-aws-credentials@e1e17a757e536f70e52b5a12b2e8d1d1c60e04ef # v2.0.0
+        uses: aws-actions/configure-aws-credentials@v1-node16
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID_CI }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY_CI }}
diff --git a/.github/workflows/test-go.yml b/.github/workflows/test-go.yml
index b30608008ca5a..d0eeeeed81ff9 100644
--- a/.github/workflows/test-go.yml
+++ b/.github/workflows/test-go.yml
@@ -22,7 +22,6 @@ on:
         description: A space-separated list of additional build flags.
         required: false
         type: string
-        default: ''
       runs-on:
         description: An expression indicating which kind of runners to use.
         required: false
@@ -32,11 +31,6 @@ on:
         description: A comma-separated list of additional build tags to consider satisfied during the build.
         required: false
         type: string
-      name:
-        description: A suffix to append to archived test results
-        required: false
-        default: ''
-        type: string
 
 env: ${{ fromJSON(inputs.env-vars) }}
 
@@ -45,7 +39,7 @@ jobs:
     runs-on: ${{ fromJSON(inputs.runs-on) }}
     name: Verify Test Package Distribution
     steps:
-    - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+    - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
     - id: test
       working-directory: .github/scripts
       run: |
@@ -85,8 +79,8 @@ jobs:
       GOPRIVATE: github.com/hashicorp/*
       TIMEOUT_IN_MINUTES: 60
     steps:
-      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
-      - uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v4.0.0
+      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
+      - uses: actions/setup-go@d0a58c1c4d2b25278816e339b944508c875f3613
         with:
           go-version-file: ./.go-version
           cache: true
@@ -122,21 +116,9 @@ jobs:
         if: github.repository != 'hashicorp/vault-enterprise'
         run: |
           git config --global url."https://${{ secrets.ELEVATED_GITHUB_TOKEN}}@github.com".insteadOf https://github.com
-      - id: go-mod-download
-        if: matrix.runner-index > 16
-        env:
-          GOPRIVATE: github.com/hashicorp/*
-        run: time go mod download -x
-      - id: build
-        if: matrix.runner-index > 16
-        env:
-          GOPRIVATE: github.com/hashicorp/*
-        run: time make ci-bootstrap dev
       - id: run-go-tests
         name: Run Go tests
         timeout-minutes: ${{ fromJSON(env.TIMEOUT_IN_MINUTES) }}
-        env:
-          COMMIT_SHA: ${{ github.sha }}
         run: |
           set -exo pipefail
 
@@ -176,11 +158,6 @@ jobs:
             #export HCP_SCADA_ADDRESS=${{ secrets.HCP_SCADA_ADDRESS }}
           fi
 
-          if [ -f bin/vault ]; then
-            VAULT_BINARY="$(pwd)/bin/vault"
-            export VAULT_BINARY
-          fi
-          
           # shellcheck disable=SC2086 # can't quote package list
           GOARCH=${{ inputs.go-arch }} \
             go run gotest.tools/gotestsum --format=short-verbose \
@@ -210,13 +187,13 @@ jobs:
           datadog-ci junit upload --service "$GITHUB_REPOSITORY" test-results/go-test/results.xml
         if: always()
       - name: Archive test results
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce
         with:
-          name: test-results${{ inputs.name }}-${{ matrix.runner-index }}
+          name: test-results-${{ matrix.runner-index }}
           path: test-results/
         if: always()
       - name: Create a summary of tests
-        uses: test-summary/action@62bc5c68de2a6a0d02039763b8c754569df99e3f # TSCCR: no entry for repository "test-summary/action"
+        uses: test-summary/action@62bc5c68de2a6a0d02039763b8c754569df99e3f
         with:
           paths: "test-results/go-test/results.xml"
           show: "fail"
diff --git a/.github/workflows/test-run-acc-tests-for-path.yml b/.github/workflows/test-run-acc-tests-for-path.yml
deleted file mode 100644
index 10d539e7d85c2..0000000000000
--- a/.github/workflows/test-run-acc-tests-for-path.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-name: test-run-go-tests-for-path
-
-on:
-  workflow_call:
-    inputs:
-      name:
-        description: 'The name to use that will appear in the output log file artifact'
-        required: true
-        type: string
-      path:
-        description: 'The path to the test without the precedeing "./" or following "/..." e.g. go test -v ./$path/...'
-        required: true
-        type: string
-    # We will need to add the capacity for receiving passed secrets once we get to the tests that require API credentials
-
-env:
-  VAULT_ACC: 1
-
-jobs:
-  go-test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
-      - name: Set Up Go
-        uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v4.0.0
-        with:
-          go-version-file: ./.go-version
-      - run: go test -v ./${{ inputs.path }}/... 2>&1 | tee ${{ inputs.name }}.txt
-      - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
-        with:
-          name: ${{ inputs.name }}-output
-          path: ${{ inputs.name }}.txt
-          retention-days: 2
diff --git a/.github/workflows/test-run-enos-scenario-matrix.yml b/.github/workflows/test-run-enos-scenario-matrix.yml
index 7a1abd7bc3038..b40b6b50b3f25 100644
--- a/.github/workflows/test-run-enos-scenario-matrix.yml
+++ b/.github/workflows/test-run-enos-scenario-matrix.yml
@@ -72,7 +72,7 @@ jobs:
       MATRIX_FILE: ./.github/enos-run-matrices/${{ inputs.matrix-file-name }}.json
       MATRIX_TEST_GROUP: ${{ inputs.matrix-test-group }}
     steps:
-      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+      - uses: actions/checkout@v3
         with:
           ref: ${{ inputs.vault-revision }}
       - id: metadata
@@ -106,13 +106,13 @@ jobs:
       ENOS_VAR_vault_license_path: ./support/vault.hclic
       ENOS_DEBUG_DATA_ROOT_DIR: /tmp/enos-debug-data
     steps:
-      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+      - uses: actions/checkout@v3
       - uses: hashicorp/setup-terraform@v2
         with:
           # the Terraform wrapper will break Terraform execution in Enos because
           # it changes the output to text when we expect it to be JSON.
           terraform_wrapper: false
-      - uses: aws-actions/configure-aws-credentials@e1e17a757e536f70e52b5a12b2e8d1d1c60e04ef # v2.0.0
+      - uses: aws-actions/configure-aws-credentials@v1-node16
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID_CI }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY_CI }}
@@ -131,7 +131,7 @@ jobs:
           chmod 600 "./enos/support/private_key.pem"
           echo "debug_data_artifact_name=enos-debug-data_$(echo "${{ matrix.scenario }}" | sed -e 's/ /_/g' | sed -e 's/:/=/g')" >> "$GITHUB_OUTPUT"
       - if: contains(inputs.matrix-file-name, 'github')
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
+        uses: actions/download-artifact@v3
         with:
           name: ${{ inputs.build-artifact-name }}
           path: ./enos/support/downloads
@@ -150,7 +150,7 @@ jobs:
         run: enos scenario run --timeout 60m0s --chdir ./enos ${{ matrix.scenario }}
       - name: Upload Debug Data
         if: failure()
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+        uses: actions/upload-artifact@v3
         with:
           # The name of the artifact is the same as the matrix scenario name with the spaces replaced with underscores and colons replaced by equals.
           name: ${{ steps.prepare_scenario.outputs.debug_data_artifact_name }}
diff --git a/.gitignore b/.gitignore
index 81e0bbeb74468..628bfa88a0a6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,7 +51,6 @@ Vagrantfile
 
 # Configs
 *.hcl
-!.copywrite.hcl
 !.release/ci.hcl
 !.release/security-scan.hcl
 !.release/linux/package/etc/vault.d/vault.hcl
@@ -59,11 +58,10 @@ Vagrantfile
 !command/server/test-fixtures/**/*.hcl
 !enos/**/*.hcl
 
-# Enos
+# Enos local Terraform files
 enos/.enos
 enos/enos-local.vars.hcl
 enos/support
-# Enos local Terraform files
 enos/.terraform/*
 enos/.terraform.lock.hcl
 enos/*.tfstate
@@ -133,5 +131,3 @@ website/components/node_modules
 *.log
 
 tools/godoctests/.bin
-tools/gonilnilfunctions/.bin
-
diff --git a/.go-version b/.go-version
index 0bd54efd31633..91c48c058d7f2 100644
--- a/.go-version
+++ b/.go-version
@@ -1 +1 @@
-1.20.4
+1.19.9
diff --git a/.release/ci.hcl b/.release/ci.hcl
index 335a21200fbfa..0be4e8ba9b716 100644
--- a/.release/ci.hcl
+++ b/.release/ci.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 schema = "1"
 
 project "vault" {
diff --git a/.release/docker/docker-entrypoint.sh b/.release/docker/docker-entrypoint.sh
index 2b9b8f35a1606..3b72da25b7f41 100755
--- a/.release/docker/docker-entrypoint.sh
+++ b/.release/docker/docker-entrypoint.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/dumb-init /bin/sh
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 set -e
 
 # Note above that we run dumb-init as PID 1 in order to reap zombie processes
diff --git a/.release/docker/ubi-docker-entrypoint.sh b/.release/docker/ubi-docker-entrypoint.sh
index 794e69c614867..6f818bcd439fb 100755
--- a/.release/docker/ubi-docker-entrypoint.sh
+++ b/.release/docker/ubi-docker-entrypoint.sh
@@ -1,7 +1,4 @@
 #!/bin/sh
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 set -e
 
 # Prevent core dumps
diff --git a/.release/linux/package/etc/vault.d/vault.hcl b/.release/linux/package/etc/vault.d/vault.hcl
index 4a59d36725073..33c2e5f3225ed 100644
--- a/.release/linux/package/etc/vault.d/vault.hcl
+++ b/.release/linux/package/etc/vault.d/vault.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 # Full configuration options can be found at https://www.vaultproject.io/docs/configuration
 
 ui = true
diff --git a/.release/release-metadata.hcl b/.release/release-metadata.hcl
index 3a49b69c59b14..19aadfc71ae1a 100644
--- a/.release/release-metadata.hcl
+++ b/.release/release-metadata.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 url_docker_registry_dockerhub = "https://hub.docker.com/r/hashicorp/vault"
 url_docker_registry_ecr = "https://gallery.ecr.aws/hashicorp/vault"
 url_license = "https://github.com/hashicorp/vault/blob/main/LICENSE"
diff --git a/.release/security-scan.hcl b/.release/security-scan.hcl
index 62460e431db96..6d394feaacc18 100644
--- a/.release/security-scan.hcl
+++ b/.release/security-scan.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 container {
 	dependencies = true
 	alpine_secdb = true
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ad1236952d6c..bbbea3d397c84 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,904 +1,47 @@
-## 1.14.0-rc1
-### June 08, 2023
-
-CHANGES:
-
-* auth/alicloud: Updated plugin from v0.14.0 to v0.15.0 [[GH-20758](https://github.com/hashicorp/vault/pull/20758)]
-* auth/azure: Updated plugin from v0.13.0 to v0.15.0 [[GH-20816](https://github.com/hashicorp/vault/pull/20816)]
-* auth/centrify: Updated plugin from v0.14.0 to v0.15.1 [[GH-20745](https://github.com/hashicorp/vault/pull/20745)]
-* auth/gcp: Updated plugin from v0.15.0 to v0.16.0 [[GH-20725](https://github.com/hashicorp/vault/pull/20725)]
-* auth/jwt: Updated plugin from v0.15.0 to v0.16.0 [[GH-20799](https://github.com/hashicorp/vault/pull/20799)]
-* auth/kubernetes: Update plugin to v0.16.0 [[GH-20802](https://github.com/hashicorp/vault/pull/20802)]
-* core: Bump Go version to 1.20.4.
-* core: Remove feature toggle for SSCTs, i.e. the env var VAULT_DISABLE_SERVER_SIDE_CONSISTENT_TOKENS. [[GH-20834](https://github.com/hashicorp/vault/pull/20834)]
-* core: Revert #19676 (VAULT_GRPC_MIN_CONNECT_TIMEOUT env var) as we decided it was unnecessary. [[GH-20826](https://github.com/hashicorp/vault/pull/20826)]
-* database/couchbase: Updated plugin from v0.9.0 to v0.9.2 [[GH-20764](https://github.com/hashicorp/vault/pull/20764)]
-* database/redis-elasticache: Updated plugin from v0.2.0 to v0.2.1 [[GH-20751](https://github.com/hashicorp/vault/pull/20751)]
-* replication (enterprise): Add a new parameter for the update-primary API call
-that allows for setting of the primary cluster addresses directly, instead of
-via a token.
-* secrets/ad: Updated plugin from v0.10.1-0.20230329210417-0b2cdb26cf5d to v0.16.0 [[GH-20750](https://github.com/hashicorp/vault/pull/20750)]
-* secrets/alicloud: Updated plugin from v0.5.4-beta1.0.20230330124709-3fcfc5914a22 to v0.15.0 [[GH-20787](https://github.com/hashicorp/vault/pull/20787)]
-* secrets/aure: Updated plugin from v0.15.0 to v0.16.0 [[GH-20777](https://github.com/hashicorp/vault/pull/20777)]
-* secrets/database/mongodbatlas: Updated plugin from v0.9.0 to v0.10.0 [[GH-20882](https://github.com/hashicorp/vault/pull/20882)]
-* secrets/database/snowflake: Updated plugin from v0.7.0 to v0.8.0 [[GH-20807](https://github.com/hashicorp/vault/pull/20807)]
-* secrets/gcp: Updated plugin from v0.15.0 to v0.16.0 [[GH-20818](https://github.com/hashicorp/vault/pull/20818)]
-* secrets/keymgmt: Updated plugin to v0.9.1
-* secrets/kubernetes: Update plugin to v0.5.0 [[GH-20802](https://github.com/hashicorp/vault/pull/20802)]
-* secrets/mongodbatlas: Updated plugin from v0.9.1 to v0.10.0 [[GH-20742](https://github.com/hashicorp/vault/pull/20742)]
-* secrets/pki: Warning when issuing leafs from CSRs with basic constraints. In the future, issuance of non-CA leaf certs from CSRs with asserted IsCA Basic Constraints will be prohibited. [[GH-20654](https://github.com/hashicorp/vault/pull/20654)]
-
-FEATURES:
-
-* **AWS Static Roles**: The AWS Secrets Engine can manage static roles configured by users. [[GH-20536](https://github.com/hashicorp/vault/pull/20536)]
-* **Automated License Utilization Reporting**: Added automated license
-utilization reporting, which sends minimal product-license [metering
-data](https://developer.hashicorp.com/vault/docs/enterprise/license/utilization-reporting)
-to HashiCorp without requiring you to manually collect and report them.
-* **MongoDB Atlas Database Secrets**: Adds support for generating X.509 certificates on dynamic roles for user authentication [[GH-20882](https://github.com/hashicorp/vault/pull/20882)]
-* **NEW PKI Workflow in UI**: Completes generally available rollout of new PKI UI that provides smoother mount configuration and a more guided user experience [[GH-pki-ui-improvements](https://github.com/hashicorp/vault/pull/pki-ui-improvements)]
-* **Vault PKI ACME Server**: Support for the ACME certificate lifecycle management protocol has been added to the Vault PKI Plugin. This allows standard ACME clients, such as the EFF's certbot and the CNCF's k8s cert-manager, to request certificates from a Vault server with no knowledge of Vault APIs or authentication mechanisms. For public-facing Vault instances, we recommend requiring External Account Bindings (EAB) to limit the ability to request certificates to only authenticated clients. [[GH-20752](https://github.com/hashicorp/vault/pull/20752)]
-* **Vault Proxy**: Introduced Vault Proxy, a new subcommand of the Vault binary that can be invoked using `vault proxy -config=config.hcl`. It currently has the same feature set as Vault Agent's API proxy, but the two may diverge in the future. We plan to deprecate the API proxy functionality of Vault Agent in a future release. [[GH-20548](https://github.com/hashicorp/vault/pull/20548)]
-* cli: Add 'agent generate-config' sub-command [[GH-20530](https://github.com/hashicorp/vault/pull/20530)]
-* **Sidebar Navigation in UI**: A new sidebar navigation panel has been added in the UI to replace the top navigation bar.
-
-IMPROVEMENTS:
-
-* activitylog: EntityRecord protobufs now contain a ClientType field for
-distinguishing client sources. [[GH-20626](https://github.com/hashicorp/vault/pull/20626)]
-* agent: Add integration tests for agent running in process supervisor mode [[GH-20741](https://github.com/hashicorp/vault/pull/20741)]
-* agent: Add logic to validate env_template entries in configuration [[GH-20569](https://github.com/hashicorp/vault/pull/20569)]
-* agent: initial implementation of a process runner for injecting secrets via environment variables via vault agent [[GH-20628](https://github.com/hashicorp/vault/pull/20628)]
-* api: GET ... /sys/internal/counters/activity?current_billing_period=true now
-results in a response which contains the full billing period [[GH-20694](https://github.com/hashicorp/vault/pull/20694)]
-* audit: forwarded requests can now contain host metadata on the node it was sent 'from' or a flag to indicate that it was forwarded.
-* auth/kerberos: Enable plugin multiplexing
-auth/kerberos: Upgrade plugin dependencies [[GH-20771](https://github.com/hashicorp/vault/pull/20771)]
-* command/server (enterprise): -dev-three-node now creates perf standbys instead of regular standbys. [[GH-20629](https://github.com/hashicorp/vault/pull/20629)]
-* command/server: Add support for dumping pprof files to the filesystem via SIGUSR2 when
-`VAULT_PPROF_WRITE_TO_FILE=true` is set on the server. [[GH-20609](https://github.com/hashicorp/vault/pull/20609)]
-* core (enterprise): license updates trigger a reload of reporting and the activity log [[GH-20680](https://github.com/hashicorp/vault/pull/20680)]
-* core (enterprise): support reloading configuration for automated reporting via SIGHUP [[GH-20680](https://github.com/hashicorp/vault/pull/20680)]
-* core, secrets/pki, audit: Update dependency go-jose to v3 due to v2 deprecation. [[GH-20559](https://github.com/hashicorp/vault/pull/20559)]
-* core: Add possibility to decode a generated encoded root token via the rest API [[GH-20595](https://github.com/hashicorp/vault/pull/20595)]
-* core: include namespace path in granting_policies block of audit log
-* core: include reason for ErrReadOnly on PBPWF writing failures
-* core: report intermediate error messages during request forwarding [[GH-20643](https://github.com/hashicorp/vault/pull/20643)]
-* database/elasticsearch: Upgrade plugin dependencies [[GH-20767](https://github.com/hashicorp/vault/pull/20767)]
-* database/redis: Upgrade plugin dependencies [[GH-20763](https://github.com/hashicorp/vault/pull/20763)]
-* sdk/framework: Fix non-deterministic ordering of 'required' fields in OpenAPI spec [[GH-20881](https://github.com/hashicorp/vault/pull/20881)]
-* secrets/consul: Improve error message when ACL bootstrapping fails. [[GH-20891](https://github.com/hashicorp/vault/pull/20891)]
-* secrets/gcpkms: Enable plugin multiplexing
-secrets/gcpkms: Upgrade plugin dependencies [[GH-20784](https://github.com/hashicorp/vault/pull/20784)]
-* secrets/pki: add subject key identifier to read key response [[GH-20642](https://github.com/hashicorp/vault/pull/20642)]
-* secrets/transit: Respond to writes with updated key policy, cache configuration. [[GH-20652](https://github.com/hashicorp/vault/pull/20652)]
-* secrets/transit: Support BYOK-encrypted export of keys to securely allow synchronizing specific keys and version across clusters. [[GH-20736](https://github.com/hashicorp/vault/pull/20736)]
-* ui: Add filtering by auth type and auth name to the Authentication Method list view. [[GH-20747](https://github.com/hashicorp/vault/pull/20747)]
-* ui: Update Web CLI with examples and a new `kv-get` command for reading kv v2 data and metadata [[GH-20590](https://github.com/hashicorp/vault/pull/20590)]
-
-BUG FIXES:
-
-* agent: Fix bug with 'cache' stanza validation [[GH-20934](https://github.com/hashicorp/vault/pull/20934)]
-* api: Properly Handle nil identity_policies in Secret Data [[GH-20636](https://github.com/hashicorp/vault/pull/20636)]
-* auth/ldap: Set default value for `max_page_size` properly [[GH-20453](https://github.com/hashicorp/vault/pull/20453)]
-* core (enterprise): Fix intermittent issue with token entries sometimes not being found when using a newly created token in a request to a secondary, even when SSCT `new_token` forwarding is set. When this occurred, this would result in the following error to the client: `error performing token check: no lease entry found for token that ought to have one, possible eventual consistency issue`.
-* core (enterprise): Fix log shipper buffer size overflow issue for 32 bit architecture.
-* core (enterprise): Fix logshipper buffer size to default to DefaultBufferSize only when reported system memory is zero.
-* core (enterprise): Fix panic when using invalid accessor for control-group request
-* core (enterprise): Fix perf standby WAL streaming silently failures when replication setup happens at a bad time.
-* core (enterprise): Fix read on perf standbys failing with 412 after leadership change, unseal, restores or restarts when no writes occur
-* core (enterprise): Remove MFA Enforcment configuration for namespace when deleting namespace
-* core/ssct (enterprise): Fixed race condition where a newly promoted DR may revert `sscGenCounter`
-resulting in 412 errors.
-* core: Fix Forwarded Writer construction to correctly find active nodes, allowing PKI cross-cluster functionality to succeed on existing mounts.
-* core: Fix writes to readonly storage on performance standbys when user lockout feature is enabled. [[GH-20783](https://github.com/hashicorp/vault/pull/20783)]
-* license (enterprise): Fix bug where license would update even if the license didn't change.
-* replication (enterprise): Fix a caching issue when replicating filtered data to
-a performance secondary. This resulted in the data being set to nil in the cache
-and a "invalid value" error being returned from the API.
-* replication (enterprise): Fix a race condition with invalid tokens during WAL streaming that was causing Secondary clusters to be unable to connect to a Primary.
-* replication (enterprise): Fix bug where reloading external plugin on a secondary would
-break replication.
-* replication (enterprise): Fix replication status for Primary clusters showing its primary cluster's information (in case of DR) in secondaries field when known_secondaries field is nil
-* replication (enterprise): fix bug where secondary grpc connections would timeout when connecting to a primary host that no longer exists.
-* secrets/pki: Support setting both maintain_stored_certificate_counts=false and publish_stored_certificate_count_metrics=false explicitly in tidy config. [[GH-20664](https://github.com/hashicorp/vault/pull/20664)]
-* secrets/transform (enterprise): Address SQL connection leak when cleaning expired tokens
-* secrets/transform (enterprise): Fix a caching bug affecting secondary nodes after a tokenization key rotation
-* secrets/transform (enterprise): Fix persistence problem with rotated tokenization key versions
-* secrets/transform: Added importing of keys and key versions into the Transform secrets engine using the command 'vault transform import' and 'vault transform import-version'. [[GH-20668](https://github.com/hashicorp/vault/pull/20668)]
-* secrets/transit: Fix export of HMAC-only key, correctly exporting the key used for sign operations. For consumers of the previously incorrect key, use the plaintext export to retrieve these incorrect keys and import them as new versions.
-secrets/transit: Fix bug related to shorter dedicated HMAC key sizing.
-sdk/helper/keysutil: New HMAC type policies will have HMACKey equal to Key and be copied over on import. [[GH-20864](https://github.com/hashicorp/vault/pull/20864)]
-* ui: Fixes issue unsealing cluster for seal types other than shamir [[GH-20897](https://github.com/hashicorp/vault/pull/20897)]
-* ui: fixes auto_rotate_period ttl input for transit keys [[GH-20731](https://github.com/hashicorp/vault/pull/20731)]
-* ui: fixes key_bits and signature_bits reverting to default values when editing a pki role [[GH-20907](https://github.com/hashicorp/vault/pull/20907)]
-
-## 1.13.3
-### June 08, 2023
-
-CHANGES:
-
-* core: Bump Go version to 1.20.4.
-* core: Revert #19676 (VAULT_GRPC_MIN_CONNECT_TIMEOUT env var) as we decided it was unnecessary. [[GH-20826](https://github.com/hashicorp/vault/pull/20826)]
-* replication (enterprise): Add a new parameter for the update-primary API call
-that allows for setting of the primary cluster addresses directly, instead of
-via a token.
-* storage/aerospike: Aerospike storage shouldn't be used on 32-bit architectures and is now unsupported on them. [[GH-20825](https://github.com/hashicorp/vault/pull/20825)]
-
-IMPROVEMENTS:
-
-* Add debug symbols back to builds to fix Dynatrace support [[GH-20519](https://github.com/hashicorp/vault/pull/20519)]
-* audit: add a `mount_point` field to audit requests and response entries [[GH-20411](https://github.com/hashicorp/vault/pull/20411)]
-* autopilot: Update version to v0.2.0 to add better support for respecting min quorum [[GH-19472](https://github.com/hashicorp/vault/pull/19472)]
-* command/server: Add support for dumping pprof files to the filesystem via SIGUSR2 when 
-`VAULT_PPROF_WRITE_TO_FILE=true` is set on the server. [[GH-20609](https://github.com/hashicorp/vault/pull/20609)]
-* core: Add possibility to decode a generated encoded root token via the rest API [[GH-20595](https://github.com/hashicorp/vault/pull/20595)]
-* core: include namespace path in granting_policies block of audit log
-* core: report intermediate error messages during request forwarding [[GH-20643](https://github.com/hashicorp/vault/pull/20643)]
-* openapi: Fix generated types for duration strings [[GH-20841](https://github.com/hashicorp/vault/pull/20841)]
-* sdk/framework: Fix non-deterministic ordering of 'required' fields in OpenAPI spec [[GH-20881](https://github.com/hashicorp/vault/pull/20881)]
-* secrets/pki: add subject key identifier to read key response [[GH-20642](https://github.com/hashicorp/vault/pull/20642)]
-
-BUG FIXES:
-
-* api: Properly Handle nil identity_policies in Secret Data [[GH-20636](https://github.com/hashicorp/vault/pull/20636)]
-* auth/ldap: Set default value for `max_page_size` properly [[GH-20453](https://github.com/hashicorp/vault/pull/20453)]
-* cli: CLI should take days as a unit of time for ttl like flags [[GH-20477](https://github.com/hashicorp/vault/pull/20477)]
-* cli: disable printing flags warnings messages for the ssh command [[GH-20502](https://github.com/hashicorp/vault/pull/20502)]
-* command/server: fixes panic in Vault server command when running in recovery mode [[GH-20418](https://github.com/hashicorp/vault/pull/20418)]
-* core (enterprise): Fix log shipper buffer size overflow issue for 32 bit architecture.
-* core (enterprise): Fix logshipper buffer size to default to DefaultBufferSize only when reported system memory is zero.
-* core (enterprise): Remove MFA Enforcment configuration for namespace when deleting namespace
-* core/identity: Allow updates of only the custom-metadata for entity alias. [[GH-20368](https://github.com/hashicorp/vault/pull/20368)]
-* core: Fix Forwarded Writer construction to correctly find active nodes, allowing PKI cross-cluster functionality to succeed on existing mounts.
-* core: Fix writes to readonly storage on performance standbys when user lockout feature is enabled. [[GH-20783](https://github.com/hashicorp/vault/pull/20783)]
-* core: prevent panic on login after namespace is deleted that had mfa enforcement [[GH-20375](https://github.com/hashicorp/vault/pull/20375)]
-* replication (enterprise): Fix a race condition with invalid tokens during WAL streaming that was causing Secondary clusters to be unable to connect to a Primary.
-* replication (enterprise): fix bug where secondary grpc connections would timeout when connecting to a primary host that no longer exists.
-* secrets/pki: Include per-issuer enable_aia_url_templating in issuer read endpoint. [[GH-20354](https://github.com/hashicorp/vault/pull/20354)]
-* secrets/transform (enterprise): Fix a caching bug affecting secondary nodes after a tokenization key rotation
-* secrets/transform: Added importing of keys and key versions into the Transform secrets engine using the command 'vault transform import' and 'vault transform import-version'. [[GH-20668](https://github.com/hashicorp/vault/pull/20668)]
-* secrets/transit: Fix export of HMAC-only key, correctly exporting the key used for sign operations. For consumers of the previously incorrect key, use the plaintext export to retrieve these incorrect keys and import them as new versions.
-secrets/transit: Fix bug related to shorter dedicated HMAC key sizing.
-sdk/helper/keysutil: New HMAC type policies will have HMACKey equal to Key and be copied over on import. [[GH-20864](https://github.com/hashicorp/vault/pull/20864)]
-* ui: Fixes issue unsealing cluster for seal types other than shamir [[GH-20897](https://github.com/hashicorp/vault/pull/20897)]
-* ui: fixes issue creating mfa login enforcement from method enforcements tab [[GH-20603](https://github.com/hashicorp/vault/pull/20603)]
-* ui: fixes key_bits and signature_bits reverting to default values when editing a pki role [[GH-20907](https://github.com/hashicorp/vault/pull/20907)]
-
-## 1.13.2
-### April 26, 2023
-
-CHANGES:
-
-* core: Bump Go version to 1.20.3.
-
-SECURITY:
-
-* core/seal: Fix handling of HMACing of seal-wrapped storage entries from HSMs using CKM_AES_CBC or CKM_AES_CBC_PAD which may have allowed an attacker to conduct a padding oracle attack. This vulnerability, CVE-2023-2197, affects Vault from 1.13.0 up to 1.13.1 and was fixed in 1.13.2. [[HCSEC-2023-14](https://discuss.hashicorp.com/t/hcsec-2023-14-vault-enterprise-vulnerable-to-padding-oracle-attacks-when-using-a-cbc-based-encryption-mechanism-with-a-hsm/53322)]
-
-IMPROVEMENTS:
-
-* Add debug symbols back to builds to fix Dynatrace support [[GH-20294](https://github.com/hashicorp/vault/pull/20294)]
-* cli/namespace: Add detailed flag to output additional namespace information 
-such as namespace IDs and custom metadata. [[GH-20243](https://github.com/hashicorp/vault/pull/20243)]
-* core/activity: add an endpoint to write test activity log data, guarded by a build flag [[GH-20019](https://github.com/hashicorp/vault/pull/20019)]
-* core: Add a `raft` sub-field to the `storage` and `ha_storage` details provided by the
-`/sys/config/state/sanitized` endpoint in order to include the `max_entry_size`. [[GH-20044](https://github.com/hashicorp/vault/pull/20044)]
-* core: include reason for ErrReadOnly on PBPWF writing failures
-* sdk/ldaputil: added `connection_timeout` to tune connection timeout duration 
-for all LDAP plugins. [[GH-20144](https://github.com/hashicorp/vault/pull/20144)]
-* secrets/pki: Decrease size and improve compatibility of OCSP responses by removing issuer certificate. [[GH-20201](https://github.com/hashicorp/vault/pull/20201)]
-* sys/wrapping: Add example how to unwrap without authentication in Vault [[GH-20109](https://github.com/hashicorp/vault/pull/20109)]
-* ui: Allows license-banners to be dismissed. Saves preferences in localStorage. [[GH-19116](https://github.com/hashicorp/vault/pull/19116)]
-
-BUG FIXES:
-
-* auth/ldap: Add max_page_size configurable to LDAP configuration [[GH-19032](https://github.com/hashicorp/vault/pull/19032)]
-* command/server: Fix incorrect paths in generated config for `-dev-tls` flag on Windows [[GH-20257](https://github.com/hashicorp/vault/pull/20257)]
-* core (enterprise): Fix intermittent issue with token entries sometimes not being found when using a newly created token in a request to a secondary, even when SSCT `new_token` forwarding is set. When this occurred, this would result in the following error to the client: `error performing token check: no lease entry found for token that ought to have one, possible eventual consistency issue`.
-* core (enterprise): Fix read on perf standbys failing with 412 after leadership change, unseal, restores or restarts when no writes occur
-* core/ssct (enterprise): Fixed race condition where a newly promoted DR may revert `sscGenCounter` 
-resulting in 412 errors.
-* core: Fix regression breaking non-raft clusters whose nodes share the same cluster_addr/api_addr. [[GH-19721](https://github.com/hashicorp/vault/pull/19721)]
-* helper/random: Fix race condition in string generator helper [[GH-19875](https://github.com/hashicorp/vault/pull/19875)]
-* kmip (enterprise): Fix a problem decrypting with keys that have no Process Start Date attribute.
-* pki: Fix automatically turning off CRL signing on upgrade to Vault >= 1.12, if CA Key Usage disallows it [[GH-20220](https://github.com/hashicorp/vault/pull/20220)]
-* replication (enterprise): Fix a caching issue when replicating filtered data to
-a performance secondary. This resulted in the data being set to nil in the cache
-and a "invalid value" error being returned from the API.
-* replication (enterprise): Fix replication status for Primary clusters showing its primary cluster's information (in case of DR) in secondaries field when known_secondaries field is nil
-* sdk/helper/ocsp: Workaround bug in Go's ocsp.ParseResponse(...), causing validation to fail with embedded CA certificates.
-auth/cert: Fix OCSP validation against Vault's PKI engine. [[GH-20181](https://github.com/hashicorp/vault/pull/20181)]
-* secrets/aws: Revert changes that removed the lease on STS credentials, while leaving the new ttl field in place. [[GH-20034](https://github.com/hashicorp/vault/pull/20034)]
-* secrets/pki: Ensure cross-cluster delta WAL write failure only logs to avoid unattended forwarding. [[GH-20057](https://github.com/hashicorp/vault/pull/20057)]
-* secrets/pki: Fix building of unified delta CRLs and recovery during unified delta WAL write failures. [[GH-20058](https://github.com/hashicorp/vault/pull/20058)]
-* secrets/pki: Fix patching of leaf_not_after_behavior on issuers. [[GH-20341](https://github.com/hashicorp/vault/pull/20341)]
-* secrets/transform (enterprise): Address SQL connection leak when cleaning expired tokens
-* ui: Fix OIDC provider logo showing when domain doesn't match [[GH-20263](https://github.com/hashicorp/vault/pull/20263)]
-* ui: Fix bad link to namespace when namespace name includes `.` [[GH-19799](https://github.com/hashicorp/vault/pull/19799)]
-* ui: fixes browser console formatting for help command output [[GH-20064](https://github.com/hashicorp/vault/pull/20064)]
-* ui: fixes remaining doc links to include /vault in path [[GH-20070](https://github.com/hashicorp/vault/pull/20070)]
-* ui: remove use of htmlSafe except when first sanitized [[GH-20235](https://github.com/hashicorp/vault/pull/20235)]
-* website/docs: Fix Kubernetes Auth Code Example to use the correct whitespace in import. [[GH-20216](https://github.com/hashicorp/vault/pull/20216)]
-
-## 1.13.1
-### March 29, 2023
-
-SECURITY:
-
-* storage/mssql: When using Vault’s community-supported Microsoft SQL (MSSQL) database storage backend, a privileged attacker with the ability to write arbitrary data to Vault’s configuration may be able to perform arbitrary SQL commands on the underlying database server through Vault. This vulnerability, CVE-2023-0620, is fixed in Vault 1.13.1, 1.12.5, and 1.11.9. [[HCSEC-2023-12](https://discuss.hashicorp.com/t/hcsec-2023-12-vault-s-microsoft-sql-database-storage-backend-vulnerable-to-sql-injection-via-configuration-file/52080)]
-* secrets/pki: Vault’s PKI mount issuer endpoints did not correctly authorize access to remove an issuer or modify issuer metadata, potentially resulting in denial of service of the PKI mount. This bug did not affect public or private key material, trust chains or certificate issuance. This vulnerability, CVE-2023-0665, is fixed in Vault 1.13.1, 1.12.5, and 1.11.9. [[HCSEC-2023-11](https://discuss.hashicorp.com/t/hcsec-2023-11-vault-s-pki-issuer-endpoint-did-not-correctly-authorize-access-to-issuer-metadata/52079)]
-* core: HashiCorp Vault’s implementation of Shamir’s secret sharing used precomputed table lookups, and was vulnerable to cache-timing attacks. An attacker with access to, and the ability to observe a large number of unseal operations on the host through a side channel may reduce the search space of a brute force effort to recover the Shamir shares. This vulnerability, CVE-2023-25000, is fixed in Vault 1.13.1, 1.12.5, and 1.11.9. [[HCSEC-2023-10](https://discuss.hashicorp.com/t/hcsec-2023-10-vault-vulnerable-to-cache-timing-attacks-during-seal-and-unseal-operations/52078)]
-
-IMPROVEMENTS:
-
-* auth/github: Allow for an optional Github auth token environment variable to make authenticated requests when fetching org id
-website/docs: Add docs for `VAULT_AUTH_CONFIG_GITHUB_TOKEN` environment variable when writing Github config [[GH-19244](https://github.com/hashicorp/vault/pull/19244)]
-* core: Allow overriding gRPC connect timeout via VAULT_GRPC_MIN_CONNECT_TIMEOUT. This is an env var rather than a config setting because we don't expect this to ever be needed.  It's being added as a last-ditch
-option in case all else fails for some replication issues we may not have fully reproduced. [[GH-19676](https://github.com/hashicorp/vault/pull/19676)]
-* core: validate name identifiers in mssql physical storage backend prior use [[GH-19591](https://github.com/hashicorp/vault/pull/19591)]
-* database/elasticsearch: Update error messages resulting from Elasticsearch API errors [[GH-19545](https://github.com/hashicorp/vault/pull/19545)]
-* events: Suppress log warnings triggered when events are sent but the events system is not enabled. [[GH-19593](https://github.com/hashicorp/vault/pull/19593)]
-
-BUG FIXES:
-
-* agent: Fix panic when SIGHUP is issued to Agent while it has a non-TLS listener. [[GH-19483](https://github.com/hashicorp/vault/pull/19483)]
-* core (enterprise): Attempt to reconnect to a PKCS#11 HSM if we retrieve a CKR_FUNCTION_FAILED error.
-* core: Fixed issue with remounting mounts that have a non-trailing space in the 'to' or 'from' paths. [[GH-19585](https://github.com/hashicorp/vault/pull/19585)]
-* kmip (enterprise): Do not require attribute Cryptographic Usage Mask when registering Secret Data managed objects.
-* kmip (enterprise): Fix a problem forwarding some requests to the active node.
-* openapi: Fix logic for labeling unauthenticated/sudo paths. [[GH-19600](https://github.com/hashicorp/vault/pull/19600)]
-* secrets/ldap: Invalidates WAL entry for static role if `password_policy` has changed. [[GH-19640](https://github.com/hashicorp/vault/pull/19640)]
-* secrets/pki: Fix PKI revocation request forwarding from standby nodes due to an error wrapping bug [[GH-19624](https://github.com/hashicorp/vault/pull/19624)]
-* secrets/transform (enterprise): Fix persistence problem with rotated tokenization key versions
-* ui: Fixes crypto.randomUUID error in unsecure contexts from third party ember-data library [[GH-19428](https://github.com/hashicorp/vault/pull/19428)]
-* ui: fixes SSH engine config deletion [[GH-19448](https://github.com/hashicorp/vault/pull/19448)]
-* ui: fixes issue navigating back a level using the breadcrumb from secret metadata view [[GH-19703](https://github.com/hashicorp/vault/pull/19703)]
-* ui: fixes oidc tabs in auth form submitting with the root's default_role value after a namespace has been inputted [[GH-19541](https://github.com/hashicorp/vault/pull/19541)]
-* ui: pass encodeBase64 param to HMAC transit-key-actions. [[GH-19429](https://github.com/hashicorp/vault/pull/19429)]
-* ui: use URLSearchParams interface to capture namespace param from SSOs (ex. ADFS) with decoded state param in callback url [[GH-19460](https://github.com/hashicorp/vault/pull/19460)]
-
-## 1.13.0
-### March 01, 2023
-
-SECURITY:
-
-* secrets/ssh: removal of the deprecated dynamic keys mode. **When any remaining dynamic key leases expire**, an error stating `secret is unsupported by this backend` will be thrown by the lease manager. [[GH-18874](https://github.com/hashicorp/vault/pull/18874)]
-* auth/approle: When using the Vault and Vault Enterprise (Vault) approle auth method, any authenticated user with access to the /auth/approle/role/:role_name/secret-id-accessor/destroy endpoint can destroy the secret ID of any other role by providing the secret ID accessor. This vulnerability, CVE-2023-24999 has been fixed in Vault 1.13.0, 1.12.4, 1.11.8, 1.10.11 and above. [[HSEC-2023-07](https://discuss.hashicorp.com/t/hcsec-2023-07-vault-fails-to-verify-if-approle-secretid-belongs-to-role-during-a-destroy-operation/51305)]
-
-CHANGES:
-
-* auth/alicloud: require the `role` field on login [[GH-19005](https://github.com/hashicorp/vault/pull/19005)]
-* auth/approle: Add maximum length of 4096 for approle role_names, as this value results in HMAC calculation [[GH-17768](https://github.com/hashicorp/vault/pull/17768)]
-* auth: Returns invalid credentials for ldap, userpass and approle when wrong credentials are provided for existent users.
-This will only be used internally for implementing user lockout. [[GH-17104](https://github.com/hashicorp/vault/pull/17104)]
-* core: Bump Go version to 1.20.1.
-* core: Vault version has been moved out of sdk and into main vault module.
-Plugins using sdk/useragent.String must instead use sdk/useragent.PluginString. [[GH-14229](https://github.com/hashicorp/vault/pull/14229)]
-* logging: Removed legacy environment variable for log format ('LOGXI_FORMAT'), should use 'VAULT_LOG_FORMAT' instead [[GH-17822](https://github.com/hashicorp/vault/pull/17822)]
-* plugins: Mounts can no longer be pinned to a specific _builtin_ version. Mounts previously pinned to a specific builtin version will now automatically upgrade to the latest builtin version, and may now be overridden if an unversioned plugin of the same name and type is registered. Mounts using plugin versions without `builtin` in their metadata remain unaffected. [[GH-18051](https://github.com/hashicorp/vault/pull/18051)]
-* plugins: `GET /database/config/:name` endpoint now returns an additional `plugin_version` field in the response data. [[GH-16982](https://github.com/hashicorp/vault/pull/16982)]
-* plugins: `GET /sys/auth/:path/tune` and `GET /sys/mounts/:path/tune` endpoints may now return an additional `plugin_version` field in the response data if set. [[GH-17167](https://github.com/hashicorp/vault/pull/17167)]
-* plugins: `GET` for `/sys/auth`, `/sys/auth/:path`, `/sys/mounts`, and `/sys/mounts/:path` paths now return additional `plugin_version`, `running_plugin_version` and `running_sha256` fields in the response data for each mount. [[GH-17167](https://github.com/hashicorp/vault/pull/17167)]
-* sdk: Remove version package, make useragent.String versionless. [[GH-19068](https://github.com/hashicorp/vault/pull/19068)]
-* secrets/aws: do not create leases for non-renewable/non-revocable STS credentials to reduce storage calls [[GH-15869](https://github.com/hashicorp/vault/pull/15869)]
-* secrets/gcpkms: Updated plugin from v0.13.0 to v0.14.0 [[GH-19063](https://github.com/hashicorp/vault/pull/19063)]
-* sys/internal/inspect: Turns of this endpoint by default. A SIGHUP can now be used to reload the configs and turns this endpoint on.
-* ui: Upgrade Ember to version 4.4.0 [[GH-17086](https://github.com/hashicorp/vault/pull/17086)]
-
-FEATURES:
-
-* **Azure Auth Managed Identities**: Allow any Azure resource that supports managed identities to authenticate with Vault [[GH-19077](https://github.com/hashicorp/vault/pull/19077)]
-* **Azure Auth Rotate Root**: Add support for rotate root in Azure Auth engine [[GH-19077](https://github.com/hashicorp/vault/pull/19077)]
-* **Event System (Alpha)**: Vault has a new opt-in experimental event system. Not yet suitable for production use. Events are currently only generated on writes to the KV secrets engine, but external plugins can also be updated to start generating events. [[GH-19194](https://github.com/hashicorp/vault/pull/19194)]
-* **GCP Secrets Impersonated Account Support**: Add support for GCP service account impersonation, allowing callers to generate a GCP access token without requiring Vault to store or retrieve a GCP service account key for each role. [[GH-19018](https://github.com/hashicorp/vault/pull/19018)]
-* **Kubernetes Secrets Engine UI**: Kubernetes is now available in the UI as a supported secrets engine. [[GH-17893](https://github.com/hashicorp/vault/pull/17893)]
-* **New PKI UI**: Add beta support for new and improved PKI UI [[GH-18842](https://github.com/hashicorp/vault/pull/18842)]
-* **PKI Cross-Cluster Revocations**: Revocation information can now be
-synchronized across primary and performance replica clusters offering
-a unified CRL/OCSP view of revocations across cluster boundaries. [[GH-19196](https://github.com/hashicorp/vault/pull/19196)]
-* **Server UDS Listener**: Adding listener to Vault server to serve http request via unix domain socket [[GH-18227](https://github.com/hashicorp/vault/pull/18227)]
-* **Transit managed keys**: The transit secrets engine now supports configuring and using managed keys
-* **User Lockout**: Adds support to configure the user-lockout behaviour for failed logins to prevent 
-brute force attacks for userpass, approle and ldap auth methods. [[GH-19230](https://github.com/hashicorp/vault/pull/19230)]
-* **VMSS Flex Authentication**: Adds support for Virtual Machine Scale Set Flex Authentication [[GH-19077](https://github.com/hashicorp/vault/pull/19077)]
-* **Namespaces (enterprise)**: Added the ability to allow access to secrets and more to be shared across namespaces that do not share a namespace hierarchy. Using the new `sys/config/group-policy-application` API, policies can be configured to apply outside of namespace hierarchy, allowing this kind of cross-namespace sharing.
-* **OpenAPI-based Go & .NET Client Libraries (Beta)**: We have now made available two new [[OpenAPI-based Go](https://github.com/hashicorp/vault-client-go/)] & [[OpenAPI-based .NET](https://github.com/hashicorp/vault-client-dotnet/)] Client libraries (beta). You can use them to perform various secret management operations easily from your applications.
-
-IMPROVEMENTS:
-
-* **Redis ElastiCache DB Engine**: Renamed configuration parameters for disambiguation; old parameters still supported for compatibility. [[GH-18752](https://github.com/hashicorp/vault/pull/18752)]
-* Bump github.com/hashicorp/go-plugin version from 1.4.5 to 1.4.8 [[GH-19100](https://github.com/hashicorp/vault/pull/19100)]
-* Reduced binary size [[GH-17678](https://github.com/hashicorp/vault/pull/17678)]
-* agent/config: Allow config directories to be specified with -config, and allow multiple -configs to be supplied. [[GH-18403](https://github.com/hashicorp/vault/pull/18403)]
-* agent: Add note in logs when starting Vault Agent indicating if the version differs to the Vault Server. [[GH-18684](https://github.com/hashicorp/vault/pull/18684)]
-* agent: Added `token_file` auto-auth configuration to allow using a pre-existing token for Vault Agent. [[GH-18740](https://github.com/hashicorp/vault/pull/18740)]
-* agent: Agent listeners can now be to be the `metrics_only` role, serving only metrics, as part of the listener's new top level `role` option. [[GH-18101](https://github.com/hashicorp/vault/pull/18101)]
-* agent: Configured Vault Agent listeners now listen without the need for caching to be configured. [[GH-18137](https://github.com/hashicorp/vault/pull/18137)]
-* agent: allows some parts of config to be reloaded without requiring a restart. [[GH-18638](https://github.com/hashicorp/vault/pull/18638)]
-* agent: fix incorrectly used loop variables in parallel tests and when finalizing seals [[GH-16872](https://github.com/hashicorp/vault/pull/16872)]
-* api: Remove dependency on sdk module. [[GH-18962](https://github.com/hashicorp/vault/pull/18962)]
-* api: Support VAULT_DISABLE_REDIRECTS environment variable (and --disable-redirects flag) to disable default client behavior and prevent the client following any redirection responses. [[GH-17352](https://github.com/hashicorp/vault/pull/17352)]
-* audit: Add `elide_list_responses` option, providing a countermeasure for a common source of oversized audit log entries [[GH-18128](https://github.com/hashicorp/vault/pull/18128)]
-* audit: Include stack trace when audit logging recovers from a panic. [[GH-18121](https://github.com/hashicorp/vault/pull/18121)]
-* auth/alicloud: upgrades dependencies [[GH-18021](https://github.com/hashicorp/vault/pull/18021)]
-* auth/azure: Adds support for authentication with Managed Service Identity (MSI) from a 
-Virtual Machine Scale Set (VMSS) in flexible orchestration mode. [[GH-17540](https://github.com/hashicorp/vault/pull/17540)]
-* auth/azure: upgrades dependencies [[GH-17857](https://github.com/hashicorp/vault/pull/17857)]
-* auth/cert: Add configurable support for validating client certs with OCSP. [[GH-17093](https://github.com/hashicorp/vault/pull/17093)]
-* auth/cert: Support listing provisioned CRLs within the mount. [[GH-18043](https://github.com/hashicorp/vault/pull/18043)]
-* auth/cf: Remove incorrect usage of CreateOperation from path_config [[GH-19098](https://github.com/hashicorp/vault/pull/19098)]
-* auth/gcp: Upgrades dependencies [[GH-17858](https://github.com/hashicorp/vault/pull/17858)]
-* auth/oidc: Adds `abort_on_error` parameter to CLI login command to help in non-interactive contexts [[GH-19076](https://github.com/hashicorp/vault/pull/19076)]
-* auth/oidc: Adds ability to set Google Workspace domain for groups search [[GH-19076](https://github.com/hashicorp/vault/pull/19076)]
-* auth/token (enterprise): Allow batch token creation in perfStandby nodes
-* auth: Allow naming login MFA methods and using those names instead of IDs in satisfying MFA requirement for requests.
-Make passcode arguments consistent across login MFA method types. [[GH-18610](https://github.com/hashicorp/vault/pull/18610)]
-* auth: Provide an IP address of the requests from Vault to a Duo challenge after successful authentication. [[GH-18811](https://github.com/hashicorp/vault/pull/18811)]
-* autopilot: Update version to v.0.2.0 to add better support for respecting min quorum
-* cli/kv: improve kv CLI to remove data or custom metadata using kv patch [[GH-18067](https://github.com/hashicorp/vault/pull/18067)]
-* cli/pki: Add List-Intermediates functionality to pki client. [[GH-18463](https://github.com/hashicorp/vault/pull/18463)]
-* cli/pki: Add health-check subcommand to evaluate the health of a PKI instance. [[GH-17750](https://github.com/hashicorp/vault/pull/17750)]
-* cli/pki: Add pki issue command, which creates a CSR, has a vault mount sign it, then reimports it. [[GH-18467](https://github.com/hashicorp/vault/pull/18467)]
-* cli/pki: Added "Reissue" command which allows extracting fields from an existing certificate to create a new certificate. [[GH-18499](https://github.com/hashicorp/vault/pull/18499)]
-* cli/pki: Change the pki health-check --list default config output to JSON so it's a usable configuration file [[GH-19269](https://github.com/hashicorp/vault/pull/19269)]
-* cli: Add support for creating requests to existing non-KVv2 PATCH-capable endpoints. [[GH-17650](https://github.com/hashicorp/vault/pull/17650)]
-* cli: Add transit import key helper commands for BYOK to Transit/Transform. [[GH-18887](https://github.com/hashicorp/vault/pull/18887)]
-* cli: Support the -format=raw option, to read non-JSON Vault endpoints and original response bodies. [[GH-14945](https://github.com/hashicorp/vault/pull/14945)]
-* cli: updated `vault operator rekey` prompts to describe recovery keys when `-target=recovery` [[GH-18892](https://github.com/hashicorp/vault/pull/18892)]
-* client/pki: Add a new command verify-sign which checks the relationship between two certificates. [[GH-18437](https://github.com/hashicorp/vault/pull/18437)]
-* command/server: Environment variable keys are now logged at startup. [[GH-18125](https://github.com/hashicorp/vault/pull/18125)]
-* core/fips: use upstream toolchain for FIPS 140-2 compliance again; this will appear as X=boringcrypto on the Go version in Vault server logs.
-* core/identity: Add machine-readable output to body of response upon alias clash during entity merge [[GH-17459](https://github.com/hashicorp/vault/pull/17459)]
-* core/server: Added an environment variable to write goroutine stacktraces to a 
-temporary file for SIGUSR2 signals. [[GH-17929](https://github.com/hashicorp/vault/pull/17929)]
-* core: Add RPCs to read and update userFailedLoginInfo map
-* core: Add experiments system and `events.alpha1` experiment. [[GH-18682](https://github.com/hashicorp/vault/pull/18682)]
-* core: Add read support to `sys/loggers` and `sys/loggers/:name` endpoints [[GH-17979](https://github.com/hashicorp/vault/pull/17979)]
-* core: Add user lockout field to config and configuring this for auth mount using auth tune to prevent brute forcing in auth methods [[GH-17338](https://github.com/hashicorp/vault/pull/17338)]
-* core: Add vault.core.locked_users telemetry metric to emit information about total number of locked users. [[GH-18718](https://github.com/hashicorp/vault/pull/18718)]
-* core: Added sys/locked-users endpoint to list locked users. Changed api endpoint from
-sys/lockedusers/[mount_accessor]/unlock/[alias_identifier] to sys/locked-users/[mount_accessor]/unlock/[alias_identifier]. [[GH-18675](https://github.com/hashicorp/vault/pull/18675)]
-* core: Added sys/lockedusers/[mount_accessor]/unlock/[alias_identifier] endpoint to unlock an user
-with given mount_accessor and alias_identifier if locked [[GH-18279](https://github.com/hashicorp/vault/pull/18279)]
-* core: Added warning to /sys/seal-status and vault status command if potentially dangerous behaviour overrides are being used. [[GH-17855](https://github.com/hashicorp/vault/pull/17855)]
-* core: Implemented background thread to update locked user entries every 15 minutes to prevent brute forcing in auth methods. [[GH-18673](https://github.com/hashicorp/vault/pull/18673)]
-* core: License location is no longer cache exempt, meaning sys/health will not contribute as greatly to storage load when using consul as a storage backend. [[GH-17265](https://github.com/hashicorp/vault/pull/17265)]
-* core: Update protoc from 3.21.5 to 3.21.7 [[GH-17499](https://github.com/hashicorp/vault/pull/17499)]
-* core: add `detect_deadlocks` config to optionally detect core state deadlocks [[GH-18604](https://github.com/hashicorp/vault/pull/18604)]
-* core: added changes for user lockout workflow. [[GH-17951](https://github.com/hashicorp/vault/pull/17951)]
-* core: parallelize backend initialization to improve startup time for large numbers of mounts. [[GH-18244](https://github.com/hashicorp/vault/pull/18244)]
-* database/postgres: Support multiline strings for revocation statements. [[GH-18632](https://github.com/hashicorp/vault/pull/18632)]
-* database/redis-elasticache: changed config argument names for disambiguation [[GH-19044](https://github.com/hashicorp/vault/pull/19044)]
-* database/snowflake: Allow parallel requests to Snowflake [[GH-17593](https://github.com/hashicorp/vault/pull/17593)]
-* hcp/connectivity: Add foundational OSS support for opt-in secure communication between self-managed Vault nodes and [HashiCorp Cloud Platform](https://cloud.hashicorp.com) [[GH-18228](https://github.com/hashicorp/vault/pull/18228)]
-* hcp/connectivity: Include HCP organization, project, and resource ID in server startup logs [[GH-18315](https://github.com/hashicorp/vault/pull/18315)]
-* hcp/connectivity: Only update SCADA session metadata if status changes [[GH-18585](https://github.com/hashicorp/vault/pull/18585)]
-* hcp/status: Add cluster-level status information [[GH-18351](https://github.com/hashicorp/vault/pull/18351)]
-* hcp/status: Expand node-level status information [[GH-18302](https://github.com/hashicorp/vault/pull/18302)]
-* logging: Vault Agent supports logging to a specified file path via environment variable, CLI or config [[GH-17841](https://github.com/hashicorp/vault/pull/17841)]
-* logging: Vault agent and server commands support log file and log rotation. [[GH-18031](https://github.com/hashicorp/vault/pull/18031)]
-* migration: allow parallelization of key migration for `vault operator migrate` in order to speed up a migration. [[GH-18817](https://github.com/hashicorp/vault/pull/18817)]
-* namespaces (enterprise): Add new API, `sys/config/group-policy-application`, to allow group policies to be configurable
-to apply to a group in `any` namespace. The default, `within_namespace_hierarchy`, is the current behaviour.
-* openapi: Add default values to thing_mount_path parameters [[GH-18935](https://github.com/hashicorp/vault/pull/18935)]
-* openapi: Add logic to generate openapi response structures [[GH-18192](https://github.com/hashicorp/vault/pull/18192)]
-* openapi: Add openapi response definitions to approle/path_login.go & approle/path_tidy_user_id.go [[GH-18772](https://github.com/hashicorp/vault/pull/18772)]
-* openapi: Add openapi response definitions to approle/path_role.go [[GH-18198](https://github.com/hashicorp/vault/pull/18198)]
-* openapi: Change gen_openapi.sh to generate schema with generic mount paths [[GH-18934](https://github.com/hashicorp/vault/pull/18934)]
-* openapi: Mark request body objects as required [[GH-17909](https://github.com/hashicorp/vault/pull/17909)]
-* openapi: add openapi response defintions to /sys/audit endpoints [[GH-18456](https://github.com/hashicorp/vault/pull/18456)]
-* openapi: generic_mount_paths: Move implementation fully into server, rather than partially in plugin framework; recognize all 4 singleton mounts (auth/token, cubbyhole, identity, system) rather than just 2; change parameter from `{mountPath}` to `{<type>_mount_path}` [[GH-18663](https://github.com/hashicorp/vault/pull/18663)]
-* plugins: Add plugin version information to key plugin lifecycle log lines. [[GH-17430](https://github.com/hashicorp/vault/pull/17430)]
-* plugins: Allow selecting builtin plugins by their reported semantic version of the form `vX.Y.Z+builtin` or `vX.Y.Z+builtin.vault`. [[GH-17289](https://github.com/hashicorp/vault/pull/17289)]
-* plugins: Let Vault unseal and mount deprecated builtin plugins in a
-deactivated state if this is not the first unseal after an upgrade. [[GH-17879](https://github.com/hashicorp/vault/pull/17879)]
-* plugins: Mark app-id auth method Removed and remove the plugin code. [[GH-18039](https://github.com/hashicorp/vault/pull/18039)]
-* plugins: Mark logical database plugins Removed and remove the plugin code. [[GH-18039](https://github.com/hashicorp/vault/pull/18039)]
-* sdk/ldap: Added support for paging when searching for groups using group filters [[GH-17640](https://github.com/hashicorp/vault/pull/17640)]
-* sdk: Add response schema validation method framework/FieldData.ValidateStrict and two test helpers (ValidateResponse, ValidateResponseData) [[GH-18635](https://github.com/hashicorp/vault/pull/18635)]
-* sdk: Adding FindResponseSchema test helper to assist with response schema validation in tests [[GH-18636](https://github.com/hashicorp/vault/pull/18636)]
-* secrets/aws: Update dependencies [[PR-17747](https://github.com/hashicorp/vault/pull/17747)] [[GH-17747](https://github.com/hashicorp/vault/pull/17747)]
-* secrets/azure: Adds ability to persist an application for the lifetime of a role. [[GH-19096](https://github.com/hashicorp/vault/pull/19096)]
-* secrets/azure: upgrades dependencies [[GH-17964](https://github.com/hashicorp/vault/pull/17964)]
-* secrets/db/mysql: Add `tls_server_name` and `tls_skip_verify` parameters [[GH-18799](https://github.com/hashicorp/vault/pull/18799)]
-* secrets/gcp: Upgrades dependencies [[GH-17871](https://github.com/hashicorp/vault/pull/17871)]
-* secrets/kubernetes: Add /check endpoint to determine if environment variables are set [[GH-18](https://github.com/hashicorp/vault-plugin-secrets-kubernetes/pull/18)] [[GH-18587](https://github.com/hashicorp/vault/pull/18587)]
-* secrets/kubernetes: add /check endpoint to determine if environment variables are set [[GH-19084](https://github.com/hashicorp/vault/pull/19084)]
-* secrets/kv: Emit events on write if events system enabled [[GH-19145](https://github.com/hashicorp/vault/pull/19145)]
-* secrets/kv: make upgrade synchronous when no keys to upgrade [[GH-19056](https://github.com/hashicorp/vault/pull/19056)]
-* secrets/kv: new KVv2 mounts and KVv1 mounts without any keys will upgrade synchronously, allowing for instant use [[GH-17406](https://github.com/hashicorp/vault/pull/17406)]
-* secrets/pki: Add a new API that returns the serial numbers of revoked certificates on the local cluster [[GH-17779](https://github.com/hashicorp/vault/pull/17779)]
-* secrets/pki: Add support to specify signature bits when generating CSRs through intermediate/generate apis [[GH-17388](https://github.com/hashicorp/vault/pull/17388)]
-* secrets/pki: Added a new API that allows external actors to craft a CRL through JSON parameters [[GH-18040](https://github.com/hashicorp/vault/pull/18040)]
-* secrets/pki: Allow UserID Field (https://www.rfc-editor.org/rfc/rfc1274#section-9.3.1) to be set on Certificates when
-allowed by role [[GH-18397](https://github.com/hashicorp/vault/pull/18397)]
-* secrets/pki: Allow issuer creation, import to change default issuer via `default_follows_latest_issuer`. [[GH-17824](https://github.com/hashicorp/vault/pull/17824)]
-* secrets/pki: Allow templating performance replication cluster- and issuer-specific AIA URLs. [[GH-18199](https://github.com/hashicorp/vault/pull/18199)]
-* secrets/pki: Allow tidying of expired issuer certificates. [[GH-17823](https://github.com/hashicorp/vault/pull/17823)]
-* secrets/pki: Allow tidying of the legacy ca_bundle, improving startup on post-migrated, seal-wrapped PKI mounts. [[GH-18645](https://github.com/hashicorp/vault/pull/18645)]
-* secrets/pki: Respond with written data to `config/auto-tidy`, `config/crl`, and `roles/:role`. [[GH-18222](https://github.com/hashicorp/vault/pull/18222)]
-* secrets/pki: Return issuer_id and issuer_name on /issuer/:issuer_ref/json endpoint. [[GH-18482](https://github.com/hashicorp/vault/pull/18482)]
-* secrets/pki: Return new fields revocation_time_rfc3339 and issuer_id to existing certificate serial lookup api if it is revoked [[GH-17774](https://github.com/hashicorp/vault/pull/17774)]
-* secrets/ssh: Allow removing SSH host keys from the dynamic keys feature. [[GH-18939](https://github.com/hashicorp/vault/pull/18939)]
-* secrets/ssh: Evaluate ssh validprincipals user template before splitting [[GH-16622](https://github.com/hashicorp/vault/pull/16622)]
-* secrets/transit: Add an optional reference field to batch operation items
-which is repeated on batch responses to help more easily correlate inputs with outputs. [[GH-18243](https://github.com/hashicorp/vault/pull/18243)]
-* secrets/transit: Add associated_data parameter for additional authenticated data in AEAD ciphers [[GH-17638](https://github.com/hashicorp/vault/pull/17638)]
-* secrets/transit: Add support for PKCSv1_5_NoOID RSA signatures [[GH-17636](https://github.com/hashicorp/vault/pull/17636)]
-* secrets/transit: Allow configuring whether upsert of keys is allowed. [[GH-18272](https://github.com/hashicorp/vault/pull/18272)]
-* storage/raft: Add `retry_join_as_non_voter` config option. [[GH-18030](https://github.com/hashicorp/vault/pull/18030)]
-* storage/raft: add additional raft metrics relating to applied index and heartbeating; also ensure OSS standbys emit periodic metrics. [[GH-12166](https://github.com/hashicorp/vault/pull/12166)]
-* sys/internal/inspect: Creates an endpoint to look to inspect internal subsystems. [[GH-17789](https://github.com/hashicorp/vault/pull/17789)]
-* sys/internal/inspect: Creates an endpoint to look to inspect internal subsystems.
-* ui: Add algorithm-signer as a SSH Secrets Engine UI field [[GH-10299](https://github.com/hashicorp/vault/pull/10299)]
-* ui: Add inline policy creation when creating an identity entity or group [[GH-17749](https://github.com/hashicorp/vault/pull/17749)]
-* ui: Added JWT authentication warning message about blocked pop-up windows and web browser settings. [[GH-18787](https://github.com/hashicorp/vault/pull/18787)]
-* ui: Enable typescript for future development [[GH-17927](https://github.com/hashicorp/vault/pull/17927)]
-* ui: Prepends "passcode=" if not provided in user input for duo totp mfa method authentication [[GH-18342](https://github.com/hashicorp/vault/pull/18342)]
-* ui: Update language on database role to "Connection name" [[GH-18261](https://github.com/hashicorp/vault/issues/18261)] [[GH-18350](https://github.com/hashicorp/vault/pull/18350)]
-* ui: adds allowed_response_headers as param for secret engine mount config [[GH-19216](https://github.com/hashicorp/vault/pull/19216)]
-* ui: consolidate all <a> tag usage [[GH-17866](https://github.com/hashicorp/vault/pull/17866)]
-* ui: mfa: use proper request id generation [[GH-17835](https://github.com/hashicorp/vault/pull/17835)]
-* ui: remove wizard [[GH-19220](https://github.com/hashicorp/vault/pull/19220)]
-* ui: update DocLink component to use new host url: developer.hashicorp.com [[GH-18374](https://github.com/hashicorp/vault/pull/18374)]
-* ui: update TTL picker for consistency [[GH-18114](https://github.com/hashicorp/vault/pull/18114)]
-* ui: use the combined activity log (partial + historic) API for client count dashboard and remove use of monthly endpoint [[GH-17575](https://github.com/hashicorp/vault/pull/17575)]
-* vault/diagnose: Upgrade `go.opentelemetry.io/otel`, `go.opentelemetry.io/otel/sdk`, `go.opentelemetry.io/otel/trace` to v1.11.2 [[GH-18589](https://github.com/hashicorp/vault/pull/18589)]
-
-DEPRECATIONS:
-
-* secrets/ad: Marks the Active Directory (AD) secrets engine as deprecated. [[GH-19334](https://github.com/hashicorp/vault/pull/19334)]
-
-BUG FIXES:
-
-* api: Remove timeout logic from ReadRaw functions and add ReadRawWithContext [[GH-18708](https://github.com/hashicorp/vault/pull/18708)]
-* auth/alicloud: fix regression in vault login command that caused login to fail [[GH-19005](https://github.com/hashicorp/vault/pull/19005)]
-* auth/approle: Add nil check for the secret ID entry when deleting via secret id accessor preventing cross role secret id deletion [[GH-19186](https://github.com/hashicorp/vault/pull/19186)]
-* auth/approle: Fix `token_bound_cidrs` validation when using /32 blocks for role and secret ID [[GH-18145](https://github.com/hashicorp/vault/pull/18145)]
-* auth/cert: Address a race condition accessing the loaded crls without a lock [[GH-18945](https://github.com/hashicorp/vault/pull/18945)]
-* auth/kubernetes: Ensure a consistent TLS configuration for all k8s API requests [[#173](https://github.com/hashicorp/vault-plugin-auth-kubernetes/pull/173)] [[GH-18716](https://github.com/hashicorp/vault/pull/18716)]
-* auth/kubernetes: fixes and dep updates for the auth-kubernetes plugin (see plugin changelog for details) [[GH-19094](https://github.com/hashicorp/vault/pull/19094)]
-* auth/okta: fix a panic for AuthRenew in Okta [[GH-18011](https://github.com/hashicorp/vault/pull/18011)]
-* auth: Deduplicate policies prior to ACL generation [[GH-17914](https://github.com/hashicorp/vault/pull/17914)]
-* cli/kv: skip formatting of nil secrets for patch and put with field parameter set [[GH-18163](https://github.com/hashicorp/vault/pull/18163)]
-* cli/pki: Decode integer values properly in health-check configuration file [[GH-19265](https://github.com/hashicorp/vault/pull/19265)]
-* cli/pki: Fix path for role health-check warning messages [[GH-19274](https://github.com/hashicorp/vault/pull/19274)]
-* cli/pki: Properly report permission issues within health-check mount tune checks [[GH-19276](https://github.com/hashicorp/vault/pull/19276)]
-* cli/transit: Fix import, import-version command invocation [[GH-19373](https://github.com/hashicorp/vault/pull/19373)]
-* cli: Fix issue preventing kv commands from executing properly when the mount path provided by `-mount` flag and secret key path are the same. [[GH-17679](https://github.com/hashicorp/vault/pull/17679)]
-* cli: Fix vault read handling to return raw data as secret.Data when there is no top-level data object from api response. [[GH-17913](https://github.com/hashicorp/vault/pull/17913)]
-* cli: Remove empty table heading for `vault secrets list -detailed` output. [[GH-17577](https://github.com/hashicorp/vault/pull/17577)]
-* command/namespace: Fix vault cli namespace patch examples in help text. [[GH-18143](https://github.com/hashicorp/vault/pull/18143)]
-* core (enterprise): Fix missing quotation mark in error message
-* core (enterprise): Fix panic that could occur with SSCT alongside invoking external plugins for revocation.
-* core (enterprise): Fix panic when using invalid accessor for control-group request
-* core (enterprise): Fix perf standby WAL streaming silently failures when replication setup happens at a bad time.
-* core (enterprise): Supported storage check in `vault server` command will no longer prevent startup. Instead, a warning will be logged if configured to use storage backend other than `raft` or `consul`.
-* core/activity: add namespace breakdown for new clients when date range spans multiple months, including the current month. [[GH-18766](https://github.com/hashicorp/vault/pull/18766)]
-* core/activity: de-duplicate namespaces when historical and current month data are mixed [[GH-18452](https://github.com/hashicorp/vault/pull/18452)]
-* core/activity: fix the end_date returned from the activity log endpoint when partial counts are computed [[GH-17856](https://github.com/hashicorp/vault/pull/17856)]
-* core/activity: include mount counts when de-duplicating current and historical month data [[GH-18598](https://github.com/hashicorp/vault/pull/18598)]
-* core/activity: report mount paths (rather than mount accessors) in current month activity log counts and include deleted mount paths in precomputed queries. [[GH-18916](https://github.com/hashicorp/vault/pull/18916)]
-* core/activity: return partial month counts when querying a historical date range and no historical data exists. [[GH-17935](https://github.com/hashicorp/vault/pull/17935)]
-* core/auth: Return a 403 instead of a 500 for wrapping requests when token is not provided [[GH-18859](https://github.com/hashicorp/vault/pull/18859)]
-* core/managed-keys (enterprise): Limit verification checks to mounts in a key's namespace
-* core/managed-keys (enterprise): Return better error messages when encountering key creation failures
-* core/managed-keys (enterprise): Switch to using hash length as PSS Salt length within the test/sign api for better PKCS#11 compatibility
-* core/quotas (enterprise): Fix a lock contention issue that could occur and cause Vault to become unresponsive when creating, changing, or deleting lease count quotas.
-* core/quotas (enterprise): Fix a potential deadlock that could occur when using lease count quotas.
-* core/quotas: Fix issue with improper application of default rate limit quota exempt paths [[GH-18273](https://github.com/hashicorp/vault/pull/18273)]
-* core/seal: Fix regression handling of the key_id parameter in seal configuration HCL. [[GH-17612](https://github.com/hashicorp/vault/pull/17612)]
-* core: Fix panic caused in Vault Agent when rendering certificate templates [[GH-17419](https://github.com/hashicorp/vault/pull/17419)]
-* core: Fix potential deadlock if barrier ciphertext is less than 4 bytes. [[GH-17944](https://github.com/hashicorp/vault/pull/17944)]
-* core: Fix spurious `permission denied` for all HelpOperations on sudo-protected paths [[GH-18568](https://github.com/hashicorp/vault/pull/18568)]
-* core: Fix vault operator init command to show the right curl string with -output-curl-string and right policy hcl with -output-policy [[GH-17514](https://github.com/hashicorp/vault/pull/17514)]
-* core: Fixes spurious warnings being emitted relating to "unknown or unsupported fields" for JSON config [[GH-17660](https://github.com/hashicorp/vault/pull/17660)]
-* core: Linux packages now have vendor label and set the default label to HashiCorp. 
-This fix is implemented for any future releases, but will not be updated for historical releases.
-* core: Prevent panics in `sys/leases/lookup`, `sys/leases/revoke`, and `sys/leases/renew` endpoints if provided `lease_id` is null [[GH-18951](https://github.com/hashicorp/vault/pull/18951)]
-* core: Refactor lock grabbing code to simplify stateLock deadlock investigations [[GH-17187](https://github.com/hashicorp/vault/pull/17187)]
-* core: fix GPG encryption to support subkeys. [[GH-16224](https://github.com/hashicorp/vault/pull/16224)]
-* core: fix a start up race condition where performance standbys could go into a 
-mount loop if default policies are not yet synced from the active node. [[GH-17801](https://github.com/hashicorp/vault/pull/17801)]
-* core: fix bug where context cancellations weren't forwarded to active node from performance standbys.
-* core: fix race when using SystemView.ReplicationState outside of a request context [[GH-17186](https://github.com/hashicorp/vault/pull/17186)]
-* core: prevent memory leak when using control group factors in a policy [[GH-17532](https://github.com/hashicorp/vault/pull/17532)]
-* core: prevent panic during mfa after enforcement's namespace is deleted [[GH-17562](https://github.com/hashicorp/vault/pull/17562)]
-* core: prevent panic in login mfa enforcement delete after enforcement's namespace is deleted [[GH-18923](https://github.com/hashicorp/vault/pull/18923)]
-* core: trying to unseal with the wrong key now returns HTTP 400 [[GH-17836](https://github.com/hashicorp/vault/pull/17836)]
-* credential/cert: adds error message if no tls connection is found during the AliasLookahead operation [[GH-17904](https://github.com/hashicorp/vault/pull/17904)]
-* database/mongodb: Fix writeConcern set to be applied to any query made on the database [[GH-18546](https://github.com/hashicorp/vault/pull/18546)]
-* expiration: Prevent panics on perf standbys when an irrevocable lease gets deleted. [[GH-18401](https://github.com/hashicorp/vault/pull/18401)]
-* kmip (enterprise): Fix a problem with some multi-part MAC Verify operations.
-* kmip (enterprise): Only require data to be full blocks on encrypt/decrypt operations using CBC and ECB block cipher modes.
-* license (enterprise): Fix bug where license would update even if the license didn't change.
-* licensing (enterprise): update autoloaded license cache after reload
-* login: Store token in tokenhelper for interactive login MFA [[GH-17040](https://github.com/hashicorp/vault/pull/17040)]
-* openapi: Fix many incorrect details in generated API spec, by using better techniques to parse path regexps [[GH-18554](https://github.com/hashicorp/vault/pull/18554)]
-* openapi: fix gen_openapi.sh script to correctly load vault plugins [[GH-17752](https://github.com/hashicorp/vault/pull/17752)]
-* plugins/kv: KV v2 returns 404 instead of 500 for request paths that incorrectly include a trailing slash. [[GH-17339](https://github.com/hashicorp/vault/pull/17339)]
-* plugins: Allow running external plugins which override deprecated builtins. [[GH-17879](https://github.com/hashicorp/vault/pull/17879)]
-* plugins: Corrected the path to check permissions on when the registered plugin name does not match the plugin binary's filename. [[GH-17340](https://github.com/hashicorp/vault/pull/17340)]
-* plugins: Listing all plugins while audit logging is enabled will no longer result in an internal server error. [[GH-18173](https://github.com/hashicorp/vault/pull/18173)]
-* plugins: Only report deprecation status for builtin plugins. [[GH-17816](https://github.com/hashicorp/vault/pull/17816)]
-* plugins: Skip loading but still mount data associated with missing plugins on unseal. [[GH-18189](https://github.com/hashicorp/vault/pull/18189)]
-* plugins: Vault upgrades will no longer fail if a mount has been created using an explicit builtin plugin version. [[GH-18051](https://github.com/hashicorp/vault/pull/18051)]
-* replication (enterprise): Fix bug where reloading external plugin on a secondary would 
-break replication.
-* sdk: Don't panic if system view or storage methods called during plugin setup. [[GH-18210](https://github.com/hashicorp/vault/pull/18210)]
-* secret/pki: fix bug with initial legacy bundle migration (from < 1.11 into 1.11+) and missing issuers from ca_chain [[GH-17772](https://github.com/hashicorp/vault/pull/17772)]
-* secrets/ad: Fix bug where updates to config would fail if password isn't provided [[GH-19061](https://github.com/hashicorp/vault/pull/19061)]
-* secrets/gcp: fix issue where IAM bindings were not preserved during policy update [[GH-19018](https://github.com/hashicorp/vault/pull/19018)]
-* secrets/mongodb-atlas: Fix a bug that did not allow WAL rollback to handle partial failures when creating API keys [[GH-19111](https://github.com/hashicorp/vault/pull/19111)]
-* secrets/pki: Address nil panic when an empty POST request is sent to the OCSP handler [[GH-18184](https://github.com/hashicorp/vault/pull/18184)]
-* secrets/pki: Allow patching issuer to set an empty issuer name. [[GH-18466](https://github.com/hashicorp/vault/pull/18466)]
-* secrets/pki: Do not read revoked certificates from backend when CRL is disabled [[GH-17385](https://github.com/hashicorp/vault/pull/17385)]
-* secrets/pki: Fix upgrade of missing expiry, delta_rebuild_interval by setting them to the default. [[GH-17693](https://github.com/hashicorp/vault/pull/17693)]
-* secrets/pki: Fixes duplicate otherName in certificates created by the sign-verbatim endpoint. [[GH-16700](https://github.com/hashicorp/vault/pull/16700)]
-* secrets/pki: OCSP GET request parameter was not being URL unescaped before processing. [[GH-18938](https://github.com/hashicorp/vault/pull/18938)]
-* secrets/pki: Respond to tidy-status, tidy-cancel on PR Secondary clusters. [[GH-17497](https://github.com/hashicorp/vault/pull/17497)]
-* secrets/pki: Revert fix for PR [18938](https://github.com/hashicorp/vault/pull/18938) [[GH-19037](https://github.com/hashicorp/vault/pull/19037)]
-* secrets/pki: consistently use UTC for CA's notAfter exceeded error message [[GH-18984](https://github.com/hashicorp/vault/pull/18984)]
-* secrets/pki: fix race between tidy's cert counting and tidy status reporting. [[GH-18899](https://github.com/hashicorp/vault/pull/18899)]
-* secrets/transit: Do not warn about unrecognized parameter 'batch_input' [[GH-18299](https://github.com/hashicorp/vault/pull/18299)]
-* secrets/transit: Honor `partial_success_response_code` on decryption failures. [[GH-18310](https://github.com/hashicorp/vault/pull/18310)]
-* server/config:  Use file.Stat when checking file permissions when VAULT_ENABLE_FILE_PERMISSIONS_CHECK is enabled [[GH-19311](https://github.com/hashicorp/vault/pull/19311)]
-* storage/raft (enterprise): An already joined node can rejoin by wiping storage
-and re-issueing a join request, but in doing so could transiently become a
-non-voter.  In some scenarios this resulted in loss of quorum. [[GH-18263](https://github.com/hashicorp/vault/pull/18263)]
-* storage/raft: Don't panic on unknown raft ops [[GH-17732](https://github.com/hashicorp/vault/pull/17732)]
-* storage/raft: Fix race with follower heartbeat tracker during teardown. [[GH-18704](https://github.com/hashicorp/vault/pull/18704)]
-* ui/keymgmt: Sets the defaultValue for type when creating a key. [[GH-17407](https://github.com/hashicorp/vault/pull/17407)]
-* ui: Fix bug where logging in via OIDC fails if browser is in fullscreen mode [[GH-19071](https://github.com/hashicorp/vault/pull/19071)]
-* ui: Fixes issue with not being able to download raft snapshot via service worker [[GH-17769](https://github.com/hashicorp/vault/pull/17769)]
-* ui: Fixes oidc/jwt login issue with alternate mount path and jwt login via mount path tab [[GH-17661](https://github.com/hashicorp/vault/pull/17661)]
-* ui: Remove `default` and add `default-service` and `default-batch` to UI token_type for auth mount and tuning. [[GH-19290](https://github.com/hashicorp/vault/pull/19290)]
-* ui: Remove default value of 30 to TtlPicker2 if no value is passed in. [[GH-17376](https://github.com/hashicorp/vault/pull/17376)]
-* ui: allow selection of "default" for ssh algorithm_signer in web interface [[GH-17894](https://github.com/hashicorp/vault/pull/17894)]
-* ui: cleanup unsaved auth method ember data record when navigating away from mount backend form [[GH-18651](https://github.com/hashicorp/vault/pull/18651)]
-* ui: fix entity policies list link to policy show page [[GH-17950](https://github.com/hashicorp/vault/pull/17950)]
-* ui: fixes query parameters not passed in api explorer test requests [[GH-18743](https://github.com/hashicorp/vault/pull/18743)]
-* ui: fixes reliance on secure context (https) by removing methods using the Crypto interface [[GH-19403](https://github.com/hashicorp/vault/pull/19403)]
-* ui: show Get credentials button for static roles detail page when a user has the proper permissions. [[GH-19190](https://github.com/hashicorp/vault/pull/19190)]
-
-## 1.12.7
-### June 08, 2023
-
-CHANGES:
-
-* core: Bump Go version to 1.19.9.
-* core: Revert #19676 (VAULT_GRPC_MIN_CONNECT_TIMEOUT env var) as we decided it was unnecessary. [[GH-20826](https://github.com/hashicorp/vault/pull/20826)]
-
-IMPROVEMENTS:
-
-* audit: add a `mount_point` field to audit requests and response entries [[GH-20411](https://github.com/hashicorp/vault/pull/20411)]
-* command/server: Add support for dumping pprof files to the filesystem via SIGUSR2 when 
-`VAULT_PPROF_WRITE_TO_FILE=true` is set on the server. [[GH-20609](https://github.com/hashicorp/vault/pull/20609)]
-* core: include namespace path in granting_policies block of audit log
-* openapi: Fix generated types for duration strings [[GH-20841](https://github.com/hashicorp/vault/pull/20841)]
-* sdk/framework: Fix non-deterministic ordering of 'required' fields in OpenAPI spec [[GH-20881](https://github.com/hashicorp/vault/pull/20881)]
-* secrets/pki: add subject key identifier to read key response [[GH-20642](https://github.com/hashicorp/vault/pull/20642)]
-* ui: update TTL picker for consistency [[GH-18114](https://github.com/hashicorp/vault/pull/18114)]
-
-BUG FIXES:
-
-* api: Properly Handle nil identity_policies in Secret Data [[GH-20636](https://github.com/hashicorp/vault/pull/20636)]
-* auth/ldap: Set default value for `max_page_size` properly [[GH-20453](https://github.com/hashicorp/vault/pull/20453)]
-* cli: CLI should take days as a unit of time for ttl like flags [[GH-20477](https://github.com/hashicorp/vault/pull/20477)]
-* cli: disable printing flags warnings messages for the ssh command [[GH-20502](https://github.com/hashicorp/vault/pull/20502)]
-* core (enterprise): Fix log shipper buffer size overflow issue for 32 bit architecture.
-* core (enterprise): Fix logshipper buffer size to default to DefaultBufferSize only when reported system memory is zero.
-* core (enterprise): Remove MFA Enforcment configuration for namespace when deleting namespace
-* core: prevent panic on login after namespace is deleted that had mfa enforcement [[GH-20375](https://github.com/hashicorp/vault/pull/20375)]
-* replication (enterprise): Fix a race condition with invalid tokens during WAL streaming that was causing Secondary clusters to be unable to connect to a Primary.
-* replication (enterprise): fix bug where secondary grpc connections would timeout when connecting to a primary host that no longer exists.
-* secrets/transform (enterprise): Fix a caching bug affecting secondary nodes after a tokenization key rotation
-* secrets/transit: Fix export of HMAC-only key, correctly exporting the key used for sign operations. For consumers of the previously incorrect key, use the plaintext export to retrieve these incorrect keys and import them as new versions.
-secrets/transit: Fix bug related to shorter dedicated HMAC key sizing.
-sdk/helper/keysutil: New HMAC type policies will have HMACKey equal to Key and be copied over on import. [[GH-20864](https://github.com/hashicorp/vault/pull/20864)]
-* ui: Fixes issue unsealing cluster for seal types other than shamir [[GH-20897](https://github.com/hashicorp/vault/pull/20897)]  
-                                                                       
-## 1.12.6
-### April 26, 2023
-
-CHANGES:
-
-* core: Bump Go version to 1.19.8.
-
-IMPROVEMENTS:
-
-* cli/namespace: Add detailed flag to output additional namespace information 
-such as namespace IDs and custom metadata. [[GH-20243](https://github.com/hashicorp/vault/pull/20243)]
-* core/activity: add an endpoint to write test activity log data, guarded by a build flag [[GH-20019](https://github.com/hashicorp/vault/pull/20019)]
-* core: Add a `raft` sub-field to the `storage` and `ha_storage` details provided by the
-`/sys/config/state/sanitized` endpoint in order to include the `max_entry_size`. [[GH-20044](https://github.com/hashicorp/vault/pull/20044)]
-* sdk/ldaputil: added `connection_timeout` to tune connection timeout duration 
-for all LDAP plugins. [[GH-20144](https://github.com/hashicorp/vault/pull/20144)]
-* secrets/pki: Decrease size and improve compatibility of OCSP responses by removing issuer certificate. [[GH-20201](https://github.com/hashicorp/vault/pull/20201)]
-
-BUG FIXES:
-
-* auth/ldap: Add max_page_size configurable to LDAP configuration [[GH-19032](https://github.com/hashicorp/vault/pull/19032)]
-* command/server: Fix incorrect paths in generated config for `-dev-tls` flag on Windows [[GH-20257](https://github.com/hashicorp/vault/pull/20257)]
-* core (enterprise): Fix intermittent issue with token entries sometimes not being found when using a newly created token in a request to a secondary, even when SSCT `new_token` forwarding is set. When this occurred, this would result in the following error to the client: `error performing token check: no lease entry found for token that ought to have one, possible eventual consistency issue`.
-* core (enterprise): Fix read on perf standbys failing with 412 after leadership change, unseal, restores or restarts when no writes occur
-* core/ssct (enterprise): Fixed race condition where a newly promoted DR may revert `sscGenCounter` 
-resulting in 412 errors.
-* core: Fix regression breaking non-raft clusters whose nodes share the same cluster_addr/api_addr. [[GH-19721](https://github.com/hashicorp/vault/pull/19721)]
-* helper/random: Fix race condition in string generator helper [[GH-19875](https://github.com/hashicorp/vault/pull/19875)]
-* kmip (enterprise): Fix a problem decrypting with keys that have no Process Start Date attribute.
-* openapi: Fix many incorrect details in generated API spec, by using better techniques to parse path regexps [[GH-18554](https://github.com/hashicorp/vault/pull/18554)]
-* pki: Fix automatically turning off CRL signing on upgrade to Vault >= 1.12, if CA Key Usage disallows it [[GH-20220](https://github.com/hashicorp/vault/pull/20220)]
-* replication (enterprise): Fix a caching issue when replicating filtered data to
-a performance secondary. This resulted in the data being set to nil in the cache
-and a "invalid value" error being returned from the API.
-* replication (enterprise): Fix replication status for Primary clusters showing its primary cluster's information (in case of DR) in secondaries field when known_secondaries field is nil
-* secrets/pki: Fix patching of leaf_not_after_behavior on issuers. [[GH-20341](https://github.com/hashicorp/vault/pull/20341)]
-* secrets/transform (enterprise): Address SQL connection leak when cleaning expired tokens
-* ui: Fix OIDC provider logo showing when domain doesn't match [[GH-20263](https://github.com/hashicorp/vault/pull/20263)]
-* ui: Fix bad link to namespace when namespace name includes `.` [[GH-19799](https://github.com/hashicorp/vault/pull/19799)]
-* ui: fixes browser console formatting for help command output [[GH-20064](https://github.com/hashicorp/vault/pull/20064)]
-* ui: remove use of htmlSafe except when first sanitized [[GH-20235](https://github.com/hashicorp/vault/pull/20235)]
-                                                                       
-## 1.12.5
-### March 29, 2023
-
-SECURITY:
-
-* storage/mssql: When using Vault’s community-supported Microsoft SQL (MSSQL) database storage backend, a privileged attacker with the ability to write arbitrary data to Vault’s configuration may be able to perform arbitrary SQL commands on the underlying database server through Vault. This vulnerability, CVE-2023-0620, is fixed in Vault 1.13.1, 1.12.5, and 1.11.9. [[HCSEC-2023-12](https://discuss.hashicorp.com/t/hcsec-2023-12-vault-s-microsoft-sql-database-storage-backend-vulnerable-to-sql-injection-via-configuration-file/52080)]
-* secrets/pki: Vault’s PKI mount issuer endpoints did not correctly authorize access to remove an issuer or modify issuer metadata, potentially resulting in denial of service of the PKI mount. This bug did not affect public or private key material, trust chains or certificate issuance. This vulnerability, CVE-2023-0665, is fixed in Vault 1.13.1, 1.12.5, and 1.11.9. [[HCSEC-2023-11](https://discuss.hashicorp.com/t/hcsec-2023-11-vault-s-pki-issuer-endpoint-did-not-correctly-authorize-access-to-issuer-metadata/52079)]
-* core: HashiCorp Vault’s implementation of Shamir’s secret sharing used precomputed table lookups, and was vulnerable to cache-timing attacks. An attacker with access to, and the ability to observe a large number of unseal operations on the host through a side channel may reduce the search space of a brute force effort to recover the Shamir shares. This vulnerability, CVE-2023-25000, is fixed in Vault 1.13.1, 1.12.5, and 1.11.9. [[HCSEC-2023-10](https://discuss.hashicorp.com/t/hcsec-2023-10-vault-vulnerable-to-cache-timing-attacks-during-seal-and-unseal-operations/52078)]
-
-IMPROVEMENTS:
-
-* auth/github: Allow for an optional Github auth token environment variable to make authenticated requests when fetching org id
-website/docs: Add docs for `VAULT_AUTH_CONFIG_GITHUB_TOKEN` environment variable when writing Github config [[GH-19244](https://github.com/hashicorp/vault/pull/19244)]
-* core: Allow overriding gRPC connect timeout via VAULT_GRPC_MIN_CONNECT_TIMEOUT. This is an env var rather than a config setting because we don't expect this to ever be needed.  It's being added as a last-ditch
-option in case all else fails for some replication issues we may not have fully reproduced. [[GH-19676](https://github.com/hashicorp/vault/pull/19676)]
-* core: validate name identifiers in mssql physical storage backend prior use [[GH-19591](https://github.com/hashicorp/vault/pull/19591)]
-
-BUG FIXES:
-
-* cli: Fix vault read handling to return raw data as secret.Data when there is no top-level data object from api response. [[GH-17913](https://github.com/hashicorp/vault/pull/17913)]
-* core (enterprise): Attempt to reconnect to a PKCS#11 HSM if we retrieve a CKR_FUNCTION_FAILED error.
-* core: Fixed issue with remounting mounts that have a non-trailing space in the 'to' or 'from' paths. [[GH-19585](https://github.com/hashicorp/vault/pull/19585)]
-* kmip (enterprise): Do not require attribute Cryptographic Usage Mask when registering Secret Data managed objects.
-* kmip (enterprise): Fix a problem forwarding some requests to the active node.
-* openapi: Fix logic for labeling unauthenticated/sudo paths. [[GH-19600](https://github.com/hashicorp/vault/pull/19600)]
-* secrets/ldap: Invalidates WAL entry for static role if `password_policy` has changed. [[GH-19641](https://github.com/hashicorp/vault/pull/19641)]
-* secrets/transform (enterprise): Fix persistence problem with rotated tokenization key versions
-* ui: fixes issue navigating back a level using the breadcrumb from secret metadata view [[GH-19703](https://github.com/hashicorp/vault/pull/19703)]
-* ui: pass encodeBase64 param to HMAC transit-key-actions. [[GH-19429](https://github.com/hashicorp/vault/pull/19429)]
-* ui: use URLSearchParams interface to capture namespace param from SSOs (ex. ADFS) with decoded state param in callback url [[GH-19460](https://github.com/hashicorp/vault/pull/19460)]
-
-## 1.12.4
-### March 01, 2023
-
-SECURITY:
-* auth/approle: When using the Vault and Vault Enterprise (Vault) approle auth method, any authenticated user with access to the /auth/approle/role/:role_name/secret-id-accessor/destroy endpoint can destroy the secret ID of any other role by providing the secret ID accessor. This vulnerability, CVE-2023-24999 has been fixed in Vault 1.13.0, 1.12.4, 1.11.8, 1.10.11 and above. [[HSEC-2023-07](https://discuss.hashicorp.com/t/hcsec-2023-07-vault-fails-to-verify-if-approle-secretid-belongs-to-role-during-a-destroy-operation/51305)]
-
-CHANGES:
-
-* core: Bump Go version to 1.19.6.
-
-IMPROVEMENTS:
-
-* secrets/database: Adds error message requiring password on root crednetial rotation. [[GH-19103](https://github.com/hashicorp/vault/pull/19103)]
-* ui: remove wizard [[GH-19220](https://github.com/hashicorp/vault/pull/19220)]
-
-BUG FIXES:
-
-* auth/approle: Add nil check for the secret ID entry when deleting via secret id accessor preventing cross role secret id deletion [[GH-19186](https://github.com/hashicorp/vault/pull/19186)]
-* core (enterprise): Fix panic when using invalid accessor for control-group request
-* core (enterprise): Fix perf standby WAL streaming silently failures when replication setup happens at a bad time.
-* core: Prevent panics in `sys/leases/lookup`, `sys/leases/revoke`, and `sys/leases/renew` endpoints if provided `lease_id` is null [[GH-18951](https://github.com/hashicorp/vault/pull/18951)]
-* license (enterprise): Fix bug where license would update even if the license didn't change.
-* replication (enterprise): Fix bug where reloading external plugin on a secondary would 
-break replication.
-* secrets/ad: Fix bug where config couldn't be updated unless binddn/bindpass were included in the update. [[GH-18207](https://github.com/hashicorp/vault/pull/18207)]
-* secrets/pki: Revert fix for PR [18938](https://github.com/hashicorp/vault/pull/18938) [[GH-19037](https://github.com/hashicorp/vault/pull/19037)]
-* server/config:  Use file.Stat when checking file permissions when VAULT_ENABLE_FILE_PERMISSIONS_CHECK is enabled [[GH-19311](https://github.com/hashicorp/vault/pull/19311)]
-* ui (enterprise): Fix cancel button from transform engine role creation page [[GH-19135](https://github.com/hashicorp/vault/pull/19135)]
-* ui: Fix bug where logging in via OIDC fails if browser is in fullscreen mode [[GH-19071](https://github.com/hashicorp/vault/pull/19071)]
-* ui: fixes reliance on secure context (https) by removing methods using the Crypto interface [[GH-19410](https://github.com/hashicorp/vault/pull/19410)]
-* ui: show Get credentials button for static roles detail page when a user has the proper permissions. [[GH-19190](https://github.com/hashicorp/vault/pull/19190)]
-
-## 1.12.3
-### February 6, 2023
-                                                                       
-CHANGES:
-
-* core: Bump Go version to 1.19.4.
-
-IMPROVEMENTS:
-
-* audit: Include stack trace when audit logging recovers from a panic. [[GH-18121](https://github.com/hashicorp/vault/pull/18121)]
-* command/server: Environment variable keys are now logged at startup. [[GH-18125](https://github.com/hashicorp/vault/pull/18125)]
-* core/fips: use upstream toolchain for FIPS 140-2 compliance again; this will appear as X=boringcrypto on the Go version in Vault server logs.
-* core: Add read support to `sys/loggers` and `sys/loggers/:name` endpoints [[GH-17979](https://github.com/hashicorp/vault/pull/17979)]
-* plugins: Let Vault unseal and mount deprecated builtin plugins in a
-deactivated state if this is not the first unseal after an upgrade. [[GH-17879](https://github.com/hashicorp/vault/pull/17879)]
-* secrets/db/mysql: Add `tls_server_name` and `tls_skip_verify` parameters [[GH-18799](https://github.com/hashicorp/vault/pull/18799)]
-* secrets/kv: new KVv2 mounts and KVv1 mounts without any keys will upgrade synchronously, allowing for instant use [[GH-17406](https://github.com/hashicorp/vault/pull/17406)]
-* storage/raft: add additional raft metrics relating to applied index and heartbeating; also ensure OSS standbys emit periodic metrics. [[GH-12166](https://github.com/hashicorp/vault/pull/12166)]
-* ui: Added JWT authentication warning message about blocked pop-up windows and web browser settings. [[GH-18787](https://github.com/hashicorp/vault/pull/18787)]
-* ui: Prepends "passcode=" if not provided in user input for duo totp mfa method authentication [[GH-18342](https://github.com/hashicorp/vault/pull/18342)]
-* ui: Update language on database role to "Connection name" [[GH-18261](https://github.com/hashicorp/vault/issues/18261)] [[GH-18350](https://github.com/hashicorp/vault/pull/18350)]
-
-BUG FIXES:
-
-* auth/approle: Fix `token_bound_cidrs` validation when using /32 blocks for role and secret ID [[GH-18145](https://github.com/hashicorp/vault/pull/18145)]
-* auth/cert: Address a race condition accessing the loaded crls without a lock [[GH-18945](https://github.com/hashicorp/vault/pull/18945)]
-* auth/kubernetes: Ensure a consistent TLS configuration for all k8s API requests [[#173](https://github.com/hashicorp/vault-plugin-auth-kubernetes/pull/173)] [[GH-18716](https://github.com/hashicorp/vault/pull/18716)]
-* cli/kv: skip formatting of nil secrets for patch and put with field parameter set [[GH-18163](https://github.com/hashicorp/vault/pull/18163)]
-* command/namespace: Fix vault cli namespace patch examples in help text. [[GH-18143](https://github.com/hashicorp/vault/pull/18143)]
-* core (enterprise): Fix a race condition resulting in login errors to PKCS#11 modules under high concurrency.
-* core/managed-keys (enterprise): Limit verification checks to mounts in a key's namespace
-* core/quotas (enterprise): Fix a potential deadlock that could occur when using lease count quotas.
-* core/quotas: Fix issue with improper application of default rate limit quota exempt paths [[GH-18273](https://github.com/hashicorp/vault/pull/18273)]
-* core/seal: Fix regression handling of the key_id parameter in seal configuration HCL. [[GH-17612](https://github.com/hashicorp/vault/pull/17612)]
-* core: fix bug where context cancellations weren't forwarded to active node from performance standbys.
-* core: prevent panic in login mfa enforcement delete after enforcement's namespace is deleted [[GH-18923](https://github.com/hashicorp/vault/pull/18923)]
-* database/mongodb: Fix writeConcern set to be applied to any query made on the database [[GH-18546](https://github.com/hashicorp/vault/pull/18546)]
-* expiration: Prevent panics on perf standbys when an irrevocable lease gets deleted. [[GH-18401](https://github.com/hashicorp/vault/pull/18401)]
-* kmip (enterprise): Fix Destroy operation response that omitted Unique Identifier on some batched responses.
-* kmip (enterprise): Fix Locate operation response incompatibility with clients using KMIP versions prior to 1.3.
-* kmip (enterprise): Fix Query operation response that omitted streaming capability and supported profiles.
-* licensing (enterprise): update autoloaded license cache after reload
-* plugins: Allow running external plugins which override deprecated builtins. [[GH-17879](https://github.com/hashicorp/vault/pull/17879)]
-* plugins: Listing all plugins while audit logging is enabled will no longer result in an internal server error. [[GH-18173](https://github.com/hashicorp/vault/pull/18173)]
-* plugins: Skip loading but still mount data associated with missing plugins on unseal. [[GH-18189](https://github.com/hashicorp/vault/pull/18189)]
-* sdk: Don't panic if system view or storage methods called during plugin setup. [[GH-18210](https://github.com/hashicorp/vault/pull/18210)]
-* secrets/pki: Address nil panic when an empty POST request is sent to the OCSP handler [[GH-18184](https://github.com/hashicorp/vault/pull/18184)]
-* secrets/pki: Allow patching issuer to set an empty issuer name. [[GH-18466](https://github.com/hashicorp/vault/pull/18466)]
-* secrets/pki: OCSP GET request parameter was not being URL unescaped before processing. [[GH-18938](https://github.com/hashicorp/vault/pull/18938)]
-* secrets/pki: fix race between tidy's cert counting and tidy status reporting. [[GH-18899](https://github.com/hashicorp/vault/pull/18899)]
-* secrets/transit: Do not warn about unrecognized parameter 'batch_input' [[GH-18299](https://github.com/hashicorp/vault/pull/18299)]
-* secrets/transit: Honor `partial_success_response_code` on decryption failures. [[GH-18310](https://github.com/hashicorp/vault/pull/18310)]
-* storage/raft (enterprise): An already joined node can rejoin by wiping storage
-and re-issueing a join request, but in doing so could transiently become a
-non-voter.  In some scenarios this resulted in loss of quorum. [[GH-18263](https://github.com/hashicorp/vault/pull/18263)]
-* storage/raft: Don't panic on unknown raft ops [[GH-17732](https://github.com/hashicorp/vault/pull/17732)]
-* ui: cleanup unsaved auth method ember data record when navigating away from mount backend form [[GH-18651](https://github.com/hashicorp/vault/pull/18651)]
-* ui: fixes query parameters not passed in api explorer test requests [[GH-18743](https://github.com/hashicorp/vault/pull/18743)]                                                                                                                                              
-## 1.12.2
-### November 30, 2022
-
-CHANGES:
-
-* core: Bump Go version to 1.19.3.
-* plugins: Mounts can no longer be pinned to a specific _builtin_ version. Mounts previously pinned to a specific builtin version will now automatically upgrade to the latest builtin version, and may now be overridden if an unversioned plugin of the same name and type is registered. Mounts using plugin versions without `builtin` in their metadata remain unaffected. [[GH-18051](https://github.com/hashicorp/vault/pull/18051)]
-
-IMPROVEMENTS:
-
-* secrets/pki: Allow issuer creation, import to change default issuer via `default_follows_latest_issuer`. [[GH-17824](https://github.com/hashicorp/vault/pull/17824)]
-* storage/raft: Add `retry_join_as_non_voter` config option. [[GH-18030](https://github.com/hashicorp/vault/pull/18030)]
-
-BUG FIXES:
-
-* auth/okta: fix a panic for AuthRenew in Okta [[GH-18011](https://github.com/hashicorp/vault/pull/18011)]
-* auth: Deduplicate policies prior to ACL generation [[GH-17914](https://github.com/hashicorp/vault/pull/17914)]
-* cli: Fix issue preventing kv commands from executing properly when the mount path provided by `-mount` flag and secret key path are the same. [[GH-17679](https://github.com/hashicorp/vault/pull/17679)]
-* core (enterprise): Supported storage check in `vault server` command will no longer prevent startup. Instead, a warning will be logged if configured to use storage backend other than `raft` or `consul`.
-* core/quotas (enterprise): Fix a lock contention issue that could occur and cause Vault to become unresponsive when creating, changing, or deleting lease count quotas.
-* core: Fix potential deadlock if barrier ciphertext is less than 4 bytes. [[GH-17944](https://github.com/hashicorp/vault/pull/17944)]
-* core: fix a start up race condition where performance standbys could go into a
-  mount loop if default policies are not yet synced from the active node. [[GH-17801](https://github.com/hashicorp/vault/pull/17801)]
-* plugins: Only report deprecation status for builtin plugins. [[GH-17816](https://github.com/hashicorp/vault/pull/17816)]
-* plugins: Vault upgrades will no longer fail if a mount has been created using an explicit builtin plugin version. [[GH-18051](https://github.com/hashicorp/vault/pull/18051)]
-* secret/pki: fix bug with initial legacy bundle migration (from < 1.11 into 1.11+) and missing issuers from ca_chain [[GH-17772](https://github.com/hashicorp/vault/pull/17772)]
-* secrets/azure: add WAL to clean up role assignments if errors occur [[GH-18086](https://github.com/hashicorp/vault/pull/18086)]
-* secrets/gcp: Fixes duplicate service account key for rotate root on standby or secondary [[GH-18111](https://github.com/hashicorp/vault/pull/18111)]
-* secrets/pki: Fix upgrade of missing expiry, delta_rebuild_interval by setting them to the default. [[GH-17693](https://github.com/hashicorp/vault/pull/17693)]
-* ui: Fixes issue with not being able to download raft snapshot via service worker [[GH-17769](https://github.com/hashicorp/vault/pull/17769)]
-* ui: fix entity policies list link to policy show page [[GH-17950](https://github.com/hashicorp/vault/pull/17950)]
-
-## 1.12.1
-### November 2, 2022
-
-IMPROVEMENTS:
-
-* api: Support VAULT_DISABLE_REDIRECTS environment variable (and --disable-redirects flag) to disable default client behavior and prevent the client following any redirection responses. [[GH-17352](https://github.com/hashicorp/vault/pull/17352)]
-* database/snowflake: Allow parallel requests to Snowflake [[GH-17593](https://github.com/hashicorp/vault/pull/17593)]
-* plugins: Add plugin version information to key plugin lifecycle log lines. [[GH-17430](https://github.com/hashicorp/vault/pull/17430)]
-* sdk/ldap: Added support for paging when searching for groups using group filters [[GH-17640](https://github.com/hashicorp/vault/pull/17640)]
-
-BUG FIXES:
-
-* cli: Remove empty table heading for `vault secrets list -detailed` output. [[GH-17577](https://github.com/hashicorp/vault/pull/17577)]
-* core/managed-keys (enterprise): Return better error messages when encountering key creation failures
-* core/managed-keys (enterprise): Switch to using hash length as PSS Salt length within the test/sign api for better PKCS#11 compatibility
-* core: Fix panic caused in Vault Agent when rendering certificate templates [[GH-17419](https://github.com/hashicorp/vault/pull/17419)]
-* core: Fixes spurious warnings being emitted relating to "unknown or unsupported fields" for JSON config [[GH-17660](https://github.com/hashicorp/vault/pull/17660)]
-* core: prevent memory leak when using control group factors in a policy [[GH-17532](https://github.com/hashicorp/vault/pull/17532)]
-* core: prevent panic during mfa after enforcement's namespace is deleted [[GH-17562](https://github.com/hashicorp/vault/pull/17562)]
-* kmip (enterprise): Fix a problem in the handling of attributes that caused Import operations to fail.
-* kmip (enterprise): Fix selection of Cryptographic Parameters for Encrypt/Decrypt operations.
-* login: Store token in tokenhelper for interactive login MFA [[GH-17040](https://github.com/hashicorp/vault/pull/17040)]
-* secrets/pki: Respond to tidy-status, tidy-cancel on PR Secondary clusters. [[GH-17497](https://github.com/hashicorp/vault/pull/17497)]
-* ui: Fixes oidc/jwt login issue with alternate mount path and jwt login via mount path tab [[GH-17661](https://github.com/hashicorp/vault/pull/17661)]
-
 ## 1.12.0
-### October 13, 2022
-
-SECURITY:
-
-* secrets/pki: Vault’s TLS certificate auth method did not initially load the optionally-configured CRL issued by the role’s CA into memory on startup, resulting in the revocation list not being checked, if the CRL has not yet been retrieved. This vulnerability, CVE-2022-41316, is fixed in Vault 1.12.0, 1.11.4, 1.10.7, and 1.9.10. [[HSEC-2022-24](https://discuss.hashicorp.com/t/hcsec-2022-24-vaults-tls-cert-auth-method-only-loaded-crl-after-first-request/45483)]
+### Unreleased
 
 CHANGES:
 
-* api: Exclusively use `GET /sys/plugins/catalog` endpoint for listing plugins, and add `details` field to list responses. [[GH-17347](https://github.com/hashicorp/vault/pull/17347)]
-* auth: `GET /sys/auth/:name` endpoint now returns an additional `deprecation_status` field in the response data for builtins. [[GH-16849](https://github.com/hashicorp/vault/pull/16849)]
-* auth: `GET /sys/auth` endpoint now returns an additional `deprecation_status` field in the response data for builtins. [[GH-16849](https://github.com/hashicorp/vault/pull/16849)]
-* auth: `POST /sys/auth/:type` endpoint response contains a warning for `Deprecated` auth methods. [[GH-17058](https://github.com/hashicorp/vault/pull/17058)]
-* auth: `auth enable` returns an error and `POST /sys/auth/:type` endpoint reports an error for `Pending Removal` auth methods. [[GH-17005](https://github.com/hashicorp/vault/pull/17005)]
 * core/entities: Fixed stranding of aliases upon entity merge, and require explicit selection of which aliases should be kept when some must be deleted [[GH-16539](https://github.com/hashicorp/vault/pull/16539)]
-* core: Bump Go version to 1.19.2.
+* core: Bump Go version to 1.18.5.
 * core: Validate input parameters for vault operator init command. Vault 1.12 CLI version is needed to run operator init now. [[GH-16379](https://github.com/hashicorp/vault/pull/16379)]
 * identity: a request to `/identity/group` that includes `member_group_ids` that contains a cycle will now be responded to with a 400 rather than 500 [[GH-15912](https://github.com/hashicorp/vault/pull/15912)]
-* licensing (enterprise): Terminated licenses will no longer result in shutdown. Instead, upgrades will not be allowed if the license expiration time is before the build date of the binary.
-* plugins: Add plugin version to auth register, list, and mount table [[GH-16856](https://github.com/hashicorp/vault/pull/16856)]
-* plugins: `GET /sys/plugins/catalog/:type/:name` endpoint contains deprecation status for builtin plugins. [[GH-17077](https://github.com/hashicorp/vault/pull/17077)]
+* licensing (enterprise): Terminated licenses will no longer result in shutdown. Instead, upgrades
+will not be allowed if the license termination time is before the build date of the binary.
 * plugins: `GET /sys/plugins/catalog/:type/:name` endpoint now returns an additional `version` field in the response data. [[GH-16688](https://github.com/hashicorp/vault/pull/16688)]
-* plugins: `GET /sys/plugins/catalog/` endpoint contains deprecation status in `detailed` list. [[GH-17077](https://github.com/hashicorp/vault/pull/17077)]
 * plugins: `GET /sys/plugins/catalog` endpoint now returns an additional `detailed` field in the response data with a list of additional plugin metadata. [[GH-16688](https://github.com/hashicorp/vault/pull/16688)]
-* plugins: `plugin info` displays deprecation status for builtin plugins. [[GH-17077](https://github.com/hashicorp/vault/pull/17077)]
-* plugins: `plugin list` now accepts a `-detailed` flag, which display deprecation status and version info. [[GH-17077](https://github.com/hashicorp/vault/pull/17077)]
-* secrets/azure: Removed deprecated AAD graph API support from the secrets engine. [[GH-17180](https://github.com/hashicorp/vault/pull/17180)]
-* secrets: All database-specific (standalone DB) secrets engines are now marked `Pending Removal`. [[GH-17038](https://github.com/hashicorp/vault/pull/17038)]
-* secrets: `GET /sys/mounts/:name` endpoint now returns an additional `deprecation_status` field in the response data for builtins. [[GH-16849](https://github.com/hashicorp/vault/pull/16849)]
-* secrets: `GET /sys/mounts` endpoint now returns an additional `deprecation_status` field in the response data for builtins. [[GH-16849](https://github.com/hashicorp/vault/pull/16849)]
-* secrets: `POST /sys/mounts/:type` endpoint response contains a warning for `Deprecated` secrets engines. [[GH-17058](https://github.com/hashicorp/vault/pull/17058)]
-* secrets: `secrets enable` returns an error and `POST /sys/mount/:type` endpoint reports an error for `Pending Removal` secrets engines. [[GH-17005](https://github.com/hashicorp/vault/pull/17005)]
 
 FEATURES:
 
-* **GCP Cloud KMS support for managed keys**: Managed keys now support using GCP Cloud KMS keys
-* **LDAP Secrets Engine**: Adds the `ldap` secrets engine with service account check-out functionality for all supported schemas. [[GH-17152](https://github.com/hashicorp/vault/pull/17152)]
-* **OCSP Responder**: PKI mounts now have an OCSP responder that implements a subset of RFC6960, answering single serial number OCSP requests for a specific cluster's revoked certificates in a mount. [[GH-16723](https://github.com/hashicorp/vault/pull/16723)]
-* **Redis DB Engine**: Adding the new Redis database engine that supports the generation of static and dynamic user roles and root credential rotation on a stand alone Redis server. [[GH-17070](https://github.com/hashicorp/vault/pull/17070)]
-* **Redis ElastiCache DB Plugin**: Added Redis ElastiCache as a built-in plugin. [[GH-17075](https://github.com/hashicorp/vault/pull/17075)]
 * **Secrets/auth plugin multiplexing**: manage multiple plugin configurations with a single plugin process [[GH-14946](https://github.com/hashicorp/vault/pull/14946)]
-* **Transform Key Import (BYOK)**: The transform secrets engine now supports importing keys for tokenization and FPE transformations
-* HCP (enterprise): Adding foundational support for self-managed vault nodes to securely communicate with [HashiCorp Cloud Platform](https://cloud.hashicorp.com) as an opt-in feature
+* secrets/database/hana: Add ability to customize dynamic usernames [[GH-16631](https://github.com/hashicorp/vault/pull/16631)]
+* secrets/pki: Add an OCSP responder that implements a subset of RFC6960, answering single serial number OCSP requests for
+a specific cluster's revoked certificates in a mount. [[GH-16723](https://github.com/hashicorp/vault/pull/16723)]
 * ui: UI support for Okta Number Challenge. [[GH-15998](https://github.com/hashicorp/vault/pull/15998)]
-* **Plugin Versioning**: Vault supports registering, managing, and running plugins with semantic versions specified.
 
 IMPROVEMENTS:
 
-* core/managed-keys (enterprise): Allow operators to specify PSS signatures and/or hash algorithm for the test/sign api
 * activity (enterprise): Added new clients unit tests to test accuracy of estimates
-* agent/auto-auth: Add `exit_on_err` which when set to true, will cause Agent to exit if any errors are encountered during authentication. [[GH-17091](https://github.com/hashicorp/vault/pull/17091)]
 * agent: Added `disable_idle_connections` configuration to disable leaving idle connections open in auto-auth, caching and templating. [[GH-15986](https://github.com/hashicorp/vault/pull/15986)]
 * agent: Added `disable_keep_alives` configuration to disable keep alives in auto-auth, caching and templating. [[GH-16479](https://github.com/hashicorp/vault/pull/16479)]
 * agent: JWT auto auth now supports a `remove_jwt_after_reading` config option which defaults to true. [[GH-11969](https://github.com/hashicorp/vault/pull/11969)]
 * agent: Send notifications to systemd on start and stop. [[GH-9802](https://github.com/hashicorp/vault/pull/9802)]
 * api/mfa: Add namespace path to the MFA read/list endpoint [[GH-16911](https://github.com/hashicorp/vault/pull/16911)]
 * api: Add a sentinel error for missing KV secrets [[GH-16699](https://github.com/hashicorp/vault/pull/16699)]
-* auth/alicloud: Enables AliCloud roles to be compatible with Vault's role based quotas. [[GH-17251](https://github.com/hashicorp/vault/pull/17251)]
-* auth/approle: SecretIDs can now be generated with an per-request specified TTL and num_uses.
-When either the ttl and num_uses fields are not specified, the role's configuration is used. [[GH-14474](https://github.com/hashicorp/vault/pull/14474)]
 * auth/aws: PKCS7 signatures will now use SHA256 by default in prep for Go 1.18 [[GH-16455](https://github.com/hashicorp/vault/pull/16455)]
-* auth/azure: Enables Azure roles to be compatible with Vault's role based quotas. [[GH-17194](https://github.com/hashicorp/vault/pull/17194)]
 * auth/cert: Add metadata to identity-alias [[GH-14751](https://github.com/hashicorp/vault/pull/14751)]
-* auth/cert: Operators can now specify a CRL distribution point URL, in which case the cert auth engine will fetch and use the CRL from that location rather than needing to push CRLs directly to auth/cert. [[GH-17136](https://github.com/hashicorp/vault/pull/17136)]
-* auth/cf: Enables CF roles to be compatible with Vault's role based quotas. [[GH-17196](https://github.com/hashicorp/vault/pull/17196)]
 * auth/gcp: Add support for GCE regional instance groups [[GH-16435](https://github.com/hashicorp/vault/pull/16435)]
-* auth/gcp: Updates dependencies: `google.golang.org/api@v0.83.0`, `github.com/hashicorp/go-gcp-common@v0.8.0`. [[GH-17160](https://github.com/hashicorp/vault/pull/17160)]
 * auth/jwt: Adds support for Microsoft US Gov L4 to the Azure provider for groups fetching. [[GH-16525](https://github.com/hashicorp/vault/pull/16525)]
 * auth/jwt: Improves detection of Windows Subsystem for Linux (WSL) for CLI-based logins. [[GH-16525](https://github.com/hashicorp/vault/pull/16525)]
 * auth/kerberos: add `add_group_aliases` config to include LDAP groups in Vault group aliases [[GH-16890](https://github.com/hashicorp/vault/pull/16890)]
-* auth/kerberos: add `remove_instance_name` parameter to the login CLI and the Kerberos config in Vault. This removes any instance names found in the keytab service principal name. [[GH-16594](https://github.com/hashicorp/vault/pull/16594)]
-* auth/kubernetes: Role resolution for K8S Auth [[GH-156](https://github.com/hashicorp/vault-plugin-auth-kubernetes/pull/156)] [[GH-17161](https://github.com/hashicorp/vault/pull/17161)]
-* auth/oci: Add support for role resolution. [[GH-17212](https://github.com/hashicorp/vault/pull/17212)]
+* auth/kerberos: add `remove_instance_name` parameter to the login CLI and the 
+Kerberos config in Vault. This removes any instance names found in the keytab 
+service principal name. [[GH-16594](https://github.com/hashicorp/vault/pull/16594)]
 * auth/oidc: Adds support for group membership parsing when using SecureAuth as an OIDC provider. [[GH-16274](https://github.com/hashicorp/vault/pull/16274)]
 * cli: CLI commands will print a warning if flags will be ignored because they are passed after positional arguments. [[GH-16441](https://github.com/hashicorp/vault/pull/16441)]
-* cli: `auth` and `secrets` list `-detailed` commands now show Deprecation Status for builtin plugins. [[GH-16849](https://github.com/hashicorp/vault/pull/16849)]
-* cli: `vault plugin list` now has a `details` field in JSON format, and version and type information in table format. [[GH-17347](https://github.com/hashicorp/vault/pull/17347)]
 * command/audit: Improve missing type error message [[GH-16409](https://github.com/hashicorp/vault/pull/16409)]
 * command/server: add `-dev-tls` and `-dev-tls-cert-dir` subcommands to create a Vault dev server with generated certificates and private key. [[GH-16421](https://github.com/hashicorp/vault/pull/16421)]
-* command: Fix shell completion for KV v2 mounts [[GH-16553](https://github.com/hashicorp/vault/pull/16553)]
 * core (enterprise): Add HTTP PATCH support for namespaces with an associated `namespace patch` CLI command
 * core (enterprise): Add check to `vault server` command to ensure configured storage backend is supported.
 * core (enterprise): Add custom metadata support for namespaces
@@ -909,9 +52,7 @@ When either the ttl and num_uses fields are not specified, the role's configurat
 * core/quotas (enterprise): Added ability to add role information for lease-count resource quotas, to limit login requests on auth mounts made using that role
 * core/quotas: Added ability to add path suffixes for rate-limit resource quotas [[GH-15989](https://github.com/hashicorp/vault/pull/15989)]
 * core/quotas: Added ability to add role information for rate-limit resource quotas, to limit login requests on auth mounts made using that role [[GH-16115](https://github.com/hashicorp/vault/pull/16115)]
-* core: Activity log goroutine management improvements to allow tests to be more deterministic. [[GH-17028](https://github.com/hashicorp/vault/pull/17028)]
 * core: Add `sys/loggers` and `sys/loggers/:name` endpoints to provide ability to modify logging verbosity [[GH-16111](https://github.com/hashicorp/vault/pull/16111)]
-* core: Handle and log deprecated builtin mounts. Introduces `VAULT_ALLOW_PENDING_REMOVAL_MOUNTS` to override shutdown and error when attempting to mount `Pending Removal` builtin plugins. [[GH-17005](https://github.com/hashicorp/vault/pull/17005)]
 * core: Limit activity log client count usage by namespaces [[GH-16000](https://github.com/hashicorp/vault/pull/16000)]
 * core: Upgrade github.com/hashicorp/raft [[GH-16609](https://github.com/hashicorp/vault/pull/16609)]
 * core: remove gox [[GH-16353](https://github.com/hashicorp/vault/pull/16353)]
@@ -921,12 +62,8 @@ When either the ttl and num_uses fields are not specified, the role's configurat
 * identity/oidc: allows filtering the list providers response by an allowed_client_id [[GH-16181](https://github.com/hashicorp/vault/pull/16181)]
 * identity: Prevent possibility of data races on entity creation. [[GH-16487](https://github.com/hashicorp/vault/pull/16487)]
 * physical/postgresql: pass context to queries to propagate timeouts and cancellations on requests. [[GH-15866](https://github.com/hashicorp/vault/pull/15866)]
-* plugins/multiplexing: Added multiplexing support to database plugins if run as external plugins [[GH-16995](https://github.com/hashicorp/vault/pull/16995)]
 * plugins: Add Deprecation Status method to builtinregistry. [[GH-16846](https://github.com/hashicorp/vault/pull/16846)]
-* plugins: Added environment variable flag to opt-out specific plugins from multiplexing [[GH-16972](https://github.com/hashicorp/vault/pull/16972)]
-* plugins: Adding version to plugin GRPC interface [[GH-17088](https://github.com/hashicorp/vault/pull/17088)]
 * plugins: Plugin catalog supports registering and managing plugins with semantic version information. [[GH-16688](https://github.com/hashicorp/vault/pull/16688)]
-* replication (enterprise): Fix race in merkle sync that can prevent streaming by returning key value matching provided hash if found in log shipper buffer.
 * secret/nomad: allow reading CA and client auth certificate from /nomad/config/access [[GH-15809](https://github.com/hashicorp/vault/pull/15809)]
 * secret/pki: Add RSA PSS signature support for issuing certificates, signing CRLs [[GH-16519](https://github.com/hashicorp/vault/pull/16519)]
 * secret/pki: Add signature_bits to sign-intermediate, sign-verbatim endpoints [[GH-16124](https://github.com/hashicorp/vault/pull/16124)]
@@ -934,21 +71,11 @@ When either the ttl and num_uses fields are not specified, the role's configurat
 * secret/pki: Allow specifying SKID for cross-signed issuance from older Vault versions. [[GH-16494](https://github.com/hashicorp/vault/pull/16494)]
 * secret/transit: Allow importing Ed25519 keys from PKCS#8 with inner RFC 5915 ECPrivateKey blobs (NSS-wrapped keys). [[GH-15742](https://github.com/hashicorp/vault/pull/15742)]
 * secrets/ad: set config default length only if password_policy is missing [[GH-16140](https://github.com/hashicorp/vault/pull/16140)]
-* secrets/azure: Adds option to permanently delete AzureAD objects created by Vault. [[GH-17045](https://github.com/hashicorp/vault/pull/17045)]
-* secrets/database/hana: Add ability to customize dynamic usernames [[GH-16631](https://github.com/hashicorp/vault/pull/16631)]
-* secrets/database/snowflake: Add multiplexing support [[GH-17159](https://github.com/hashicorp/vault/pull/17159)]
-* secrets/gcp: Updates dependencies: `google.golang.org/api@v0.83.0`, `github.com/hashicorp/go-gcp-common@v0.8.0`. [[GH-17174](https://github.com/hashicorp/vault/pull/17174)]
-* secrets/gcpkms: Update dependencies: google.golang.org/api@v0.83.0. [[GH-17199](https://github.com/hashicorp/vault/pull/17199)]
-* secrets/kubernetes: upgrade to v0.2.0 [[GH-17164](https://github.com/hashicorp/vault/pull/17164)]
+* secrets/kubernetes: Add allowed_kubernetes_namespace_selector to allow selecting Kubernetes namespaces with a label selector when configuring roles. [[GH-16240](https://github.com/hashicorp/vault/pull/16240)]
 * secrets/pki/tidy: Add another pair of metrics counting certificates not deleted by the tidy operation. [[GH-16702](https://github.com/hashicorp/vault/pull/16702)]
-* secrets/pki: Add a new flag to issue/sign APIs which can filter out root CAs from the returned ca_chain field [[GH-16935](https://github.com/hashicorp/vault/pull/16935)]
-* secrets/pki: Add a warning to any successful response when the requested TTL is overwritten by MaxTTL [[GH-17073](https://github.com/hashicorp/vault/pull/17073)]
-* secrets/pki: Add ability to cancel tidy operations, control tidy resource usage. [[GH-16958](https://github.com/hashicorp/vault/pull/16958)]
 * secrets/pki: Add ability to periodically rebuild CRL before expiry [[GH-16762](https://github.com/hashicorp/vault/pull/16762)]
 * secrets/pki: Add ability to periodically run tidy operations to remove expired certificates. [[GH-16900](https://github.com/hashicorp/vault/pull/16900)]
 * secrets/pki: Add support for per-issuer Authority Information Access (AIA) URLs [[GH-16563](https://github.com/hashicorp/vault/pull/16563)]
-* secrets/pki: Add support to specify signature bits when generating CSRs through intermediate/generate apis [[GH-17388](https://github.com/hashicorp/vault/pull/17388)]
-* secrets/pki: Added gauge metrics "secrets.pki.total_revoked_certificates_stored" and "secrets.pki.total_certificates_stored" to track the number of certificates in storage. [[GH-16676](https://github.com/hashicorp/vault/pull/16676)]
 * secrets/pki: Allow revocation of certificates with explicitly provided certificate (bring your own certificate / BYOC). [[GH-16564](https://github.com/hashicorp/vault/pull/16564)]
 * secrets/pki: Allow revocation via proving possession of certificate's private key [[GH-16566](https://github.com/hashicorp/vault/pull/16566)]
 * secrets/pki: Allow tidy to associate revoked certs with their issuers for OCSP performance [[GH-16871](https://github.com/hashicorp/vault/pull/16871)]
@@ -958,334 +85,75 @@ When either the ttl and num_uses fields are not specified, the role's configurat
 * secrets/ssh: Add allowed_domains_template to allow templating of allowed_domains. [[GH-16056](https://github.com/hashicorp/vault/pull/16056)]
 * secrets/ssh: Allow additional text along with a template definition in defaultExtension value fields. [[GH-16018](https://github.com/hashicorp/vault/pull/16018)]
 * secrets/ssh: Allow the use of Identity templates in the `default_user` field [[GH-16351](https://github.com/hashicorp/vault/pull/16351)]
-* secrets/transit: Add a dedicated HMAC key type, which can be used with key import. [[GH-16668](https://github.com/hashicorp/vault/pull/16668)]
-* secrets/transit: Added a parameter to encrypt/decrypt batch operations to allow the caller to override the HTTP response code in case of partial user-input failures. [[GH-17118](https://github.com/hashicorp/vault/pull/17118)]
-* secrets/transit: Allow configuring the possible salt lengths for RSA PSS signatures. [[GH-16549](https://github.com/hashicorp/vault/pull/16549)]
 * ssh: Addition of an endpoint `ssh/issue/:role` to allow the creation of signed key pairs [[GH-15561](https://github.com/hashicorp/vault/pull/15561)]
 * storage/cassandra: tuning parameters for clustered environments `connection_timeout`, `initial_connection_timeout`, `simple_retry_policy_retries`. [[GH-10467](https://github.com/hashicorp/vault/pull/10467)]
 * storage/gcs: Add documentation explaining how to configure the gcs backend using environment variables instead of options in the configuration stanza [[GH-14455](https://github.com/hashicorp/vault/pull/14455)]
 * ui: Changed the tokenBoundCidrs tooltip content to clarify that comma separated values are not accepted in this field. [[GH-15852](https://github.com/hashicorp/vault/pull/15852)]
-* ui: Prevents requests to /sys/internal/ui/resultant-acl endpoint when unauthenticated [[GH-17139](https://github.com/hashicorp/vault/pull/17139)]
 * ui: Removed deprecated version of core-js 2.6.11 [[GH-15898](https://github.com/hashicorp/vault/pull/15898)]
 * ui: Renamed labels under Tools for wrap, lookup, rewrap and unwrap with description. [[GH-16489](https://github.com/hashicorp/vault/pull/16489)]
-* ui: Replaces non-inclusive terms [[GH-17116](https://github.com/hashicorp/vault/pull/17116)]
 * ui: redirect_to param forwards from auth route when authenticated [[GH-16821](https://github.com/hashicorp/vault/pull/16821)]
 * website/docs: API generate-recovery-token documentation. [[GH-16213](https://github.com/hashicorp/vault/pull/16213)]
-* website/docs: Add documentation around the expensiveness of making lots of lease count quotas in a short period [[GH-16950](https://github.com/hashicorp/vault/pull/16950)]
-* website/docs: Removes mentions of unauthenticated from internal ui resultant-acl doc [[GH-17139](https://github.com/hashicorp/vault/pull/17139)]
 * website/docs: Update replication docs to mention Integrated Storage [[GH-16063](https://github.com/hashicorp/vault/pull/16063)]
-* website/docs: changed to echo for all string examples instead of (<<<) here-string. [[GH-9081](https://github.com/hashicorp/vault/pull/9081)]  
+* website/docs: changed to echo for all string examples instead of (<<<) here-string. [[GH-9081](https://github.com/hashicorp/vault/pull/9081)]
 
 BUG FIXES:
 
 * agent/template: Fix parsing error for the exec stanza [[GH-16231](https://github.com/hashicorp/vault/pull/16231)]
-* agent: Agent will now respect `max_retries` retry configuration even when caching is set. [[GH-16970](https://github.com/hashicorp/vault/pull/16970)]
 * agent: Update consul-template for pkiCert bug fixes [[GH-16087](https://github.com/hashicorp/vault/pull/16087)]
 * api/sys/internal/specs/openapi: support a new "dynamic" query parameter to generate generic mountpaths [[GH-15835](https://github.com/hashicorp/vault/pull/15835)]
 * api: Fixed erroneous warnings of unrecognized parameters when unwrapping data. [[GH-16794](https://github.com/hashicorp/vault/pull/16794)]
 * api: Fixed issue with internal/ui/mounts and internal/ui/mounts/(?P<path>.+) endpoints where it was not properly handling /auth/ [[GH-15552](https://github.com/hashicorp/vault/pull/15552)]
 * api: properly handle switching to/from unix domain socket when changing client address [[GH-11904](https://github.com/hashicorp/vault/pull/11904)]
-* auth/cert: Vault does not initially load the CRLs in cert auth unless the read/write CRL endpoint is hit. [[GH-17138](https://github.com/hashicorp/vault/pull/17138)]
 * auth/kerberos: Maintain headers set by the client [[GH-16636](https://github.com/hashicorp/vault/pull/16636)]
-* auth/kubernetes: Restore support for JWT signature algorithm ES384 [[GH-160](https://github.com/hashicorp/vault-plugin-auth-kubernetes/pull/160)] [[GH-17161](https://github.com/hashicorp/vault/pull/17161)]
-* auth/token: Fix ignored parameter warnings for valid parameters on token create [[GH-16938](https://github.com/hashicorp/vault/pull/16938)]
 * command/debug: fix bug where monitor was not honoring configured duration [[GH-16834](https://github.com/hashicorp/vault/pull/16834)]
 * core (enterprise): Fix bug where wrapping token lookup does not work within namespaces. [[GH-15583](https://github.com/hashicorp/vault/pull/15583)]
 * core (enterprise): Fix creation of duplicate entities via alias metadata changes on local auth mounts.
 * core/auth: Return a 403 instead of a 500 for a malformed SSCT [[GH-16112](https://github.com/hashicorp/vault/pull/16112)]
 * core/identity: Replicate member_entity_ids and policies in identity/group across nodes identically [[GH-16088](https://github.com/hashicorp/vault/pull/16088)]
 * core/license (enterprise): Always remove stored license and allow unseal to complete when license cleanup fails
-* core/managed-keys (enterprise): fix panic when having `cache_disable` true
 * core/quotas (enterprise): Fixed issue with improper counting of leases if lease count quota created after leases
 * core/quotas: Added globbing functionality on the end of path suffix quota paths [[GH-16386](https://github.com/hashicorp/vault/pull/16386)]
-* core/quotas: Fix goroutine leak caused by the seal process not fully cleaning up Rate Limit Quotas. [[GH-17281](https://github.com/hashicorp/vault/pull/17281)]
 * core/replication (enterprise): Don't flush merkle tree pages to disk after losing active duty
 * core/seal: Fix possible keyring truncation when using the file backend. [[GH-15946](https://github.com/hashicorp/vault/pull/15946)]
-* core: Fix panic when the plugin catalog returns neither a plugin nor an error. [[GH-17204](https://github.com/hashicorp/vault/pull/17204)]
 * core: Fixes parsing boolean values for ha_storage backends in config [[GH-15900](https://github.com/hashicorp/vault/pull/15900)]
 * core: Increase the allowed concurrent gRPC streams over the cluster port. [[GH-16327](https://github.com/hashicorp/vault/pull/16327)]
-* core: Prevent two or more DR failovers from invalidating SSCT tokens generated on the previous primaries. [[GH-16956](https://github.com/hashicorp/vault/pull/16956)]
 * database: Invalidate queue should cancel context first to avoid deadlock [[GH-15933](https://github.com/hashicorp/vault/pull/15933)]
 * debug: Fix panic when capturing debug bundle on Windows [[GH-14399](https://github.com/hashicorp/vault/pull/14399)]
 * debug: Remove extra empty lines from vault.log when debug command is run [[GH-16714](https://github.com/hashicorp/vault/pull/16714)]
 * identity (enterprise): Fix a data race when creating an entity for a local alias.
-* identity/oidc: Adds `claims_supported` to discovery document. [[GH-16992](https://github.com/hashicorp/vault/pull/16992)]
 * identity/oidc: Change the `state` parameter of the Authorization Endpoint to optional. [[GH-16599](https://github.com/hashicorp/vault/pull/16599)]
-* identity/oidc: Detect invalid `redirect_uri` values sooner in validation of the Authorization Endpoint. [[GH-16601](https://github.com/hashicorp/vault/pull/16601)]
+* identity/oidc: Detect invalid `redirect_uri` values sooner in validation of the 
+Authorization Endpoint. [[GH-16601](https://github.com/hashicorp/vault/pull/16601)]
 * identity/oidc: Fixes validation of the `request` and `request_uri` parameters. [[GH-16600](https://github.com/hashicorp/vault/pull/16600)]
 * openapi: Fixed issue where information about /auth/token endpoints was not present with explicit policy permissions [[GH-15552](https://github.com/hashicorp/vault/pull/15552)]
 * plugin/multiplexing: Fix panic when id doesn't exist in connection map [[GH-16094](https://github.com/hashicorp/vault/pull/16094)]
 * plugin/secrets/auth: Fix a bug with aliased backends such as aws-ec2 or generic [[GH-16673](https://github.com/hashicorp/vault/pull/16673)]
-* plugins: Corrected the path to check permissions on when the registered plugin name does not match the plugin binary's filename. [[GH-17340](https://github.com/hashicorp/vault/pull/17340)]
 * quotas/lease-count: Fix lease-count quotas on mounts not properly being enforced when the lease generating request is a read [[GH-15735](https://github.com/hashicorp/vault/pull/15735)]
 * replication (enterprise): Fix data race in SaveCheckpoint()
 * replication (enterprise): Fix data race in saveCheckpoint.
-* replication (enterprise): Fix possible data race during merkle diff/sync
 * secret/pki: Do not fail validation with a legacy key_bits default value and key_type=any when signing CSRs [[GH-16246](https://github.com/hashicorp/vault/pull/16246)]
 * secrets/database: Fix a bug where the secret engine would queue up a lot of WAL deletes during startup. [[GH-16686](https://github.com/hashicorp/vault/pull/16686)]
 * secrets/gcp: Fixes duplicate static account key creation from performance secondary clusters. [[GH-16534](https://github.com/hashicorp/vault/pull/16534)]
 * secrets/kv: Fix `kv get` issue preventing the ability to read a secret when providing a leading slash [[GH-16443](https://github.com/hashicorp/vault/pull/16443)]
 * secrets/pki: Allow import of issuers without CRLSign KeyUsage; prohibit setting crl-signing usage on such issuers [[GH-16865](https://github.com/hashicorp/vault/pull/16865)]
-* secrets/pki: Do not ignore provided signature bits value when signing intermediate and leaf certificates with a managed key [[GH-17328](https://github.com/hashicorp/vault/pull/17328)]
-* secrets/pki: Do not read revoked certificates from backend when CRL is disabled [[GH-17385](https://github.com/hashicorp/vault/pull/17385)]
 * secrets/pki: Fix migration to properly handle mounts that contain only keys, no certificates [[GH-16813](https://github.com/hashicorp/vault/pull/16813)]
 * secrets/pki: Ignore EC PARAMETER PEM blocks during issuer import (/config/ca, /issuers/import/*, and /intermediate/set-signed) [[GH-16721](https://github.com/hashicorp/vault/pull/16721)]
 * secrets/pki: LIST issuers endpoint is now unauthenticated. [[GH-16830](https://github.com/hashicorp/vault/pull/16830)]
-* secrets/transform (enterprise): Fix an issue loading tokenization transform configuration after a specific sequence of reconfigurations.
-* secrets/transform (enterprise): Fix persistence problem with tokenization store credentials.
 * storage/raft (enterprise): Fix some storage-modifying RPCs used by perf standbys that weren't returning the resulting WAL state.
 * storage/raft (enterprise): Prevent unauthenticated voter status change with rejoin [[GH-16324](https://github.com/hashicorp/vault/pull/16324)]
 * storage/raft: Fix retry_join initialization failure [[GH-16550](https://github.com/hashicorp/vault/pull/16550)]
-* storage/raft: Nodes no longer get demoted to nonvoter if we don't know their version due to missing heartbeats. [[GH-17019](https://github.com/hashicorp/vault/pull/17019)]
-* ui/keymgmt: Sets the defaultValue for type when creating a key. [[GH-17407](https://github.com/hashicorp/vault/pull/17407)]
 * ui: Fix OIDC callback to accept namespace flag in different formats [[GH-16886](https://github.com/hashicorp/vault/pull/16886)]
 * ui: Fix info tooltip submitting form [[GH-16659](https://github.com/hashicorp/vault/pull/16659)]
 * ui: Fix issue logging in with JWT auth method [[GH-16466](https://github.com/hashicorp/vault/pull/16466)]
 * ui: Fix lease force revoke action [[GH-16930](https://github.com/hashicorp/vault/pull/16930)]
 * ui: Fix naming of permitted_dns_domains form parameter on CA creation (root generation and sign intermediate). [[GH-16739](https://github.com/hashicorp/vault/pull/16739)]
 * ui: Fixed bug where red spellcheck underline appears in sensitive/secret kv values when it should not appear [[GH-15681](https://github.com/hashicorp/vault/pull/15681)]
-* ui: Fixes secret version and status menu links transitioning to auth screen [[GH-16983](https://github.com/hashicorp/vault/pull/16983)]
 * ui: OIDC login type uses localStorage instead of sessionStorage [[GH-16170](https://github.com/hashicorp/vault/pull/16170)]
 * vault: Fix a bug where duplicate policies could be added to an identity group. [[GH-15638](https://github.com/hashicorp/vault/pull/15638)]
 
-## 1.11.11
-### June 08, 2023
-
-CHANGES:
-
-* core: Bump Go version to 1.19.9.
-* core: Revert #19676 (VAULT_GRPC_MIN_CONNECT_TIMEOUT env var) as we decided it was unnecessary. [[GH-20826](https://github.com/hashicorp/vault/pull/20826)]
-
-IMPROVEMENTS:
-
-* command/server: Add support for dumping pprof files to the filesystem via SIGUSR2 when 
-`VAULT_PPROF_WRITE_TO_FILE=true` is set on the server. [[GH-20609](https://github.com/hashicorp/vault/pull/20609)]
-* secrets/pki: add subject key identifier to read key response [[GH-20642](https://github.com/hashicorp/vault/pull/20642)]
-* ui: update TTL picker for consistency [[GH-18114](https://github.com/hashicorp/vault/pull/18114)]
-
-BUG FIXES:
-
-* api: Properly Handle nil identity_policies in Secret Data [[GH-20636](https://github.com/hashicorp/vault/pull/20636)]
-* auth/ldap: Set default value for `max_page_size` properly [[GH-20453](https://github.com/hashicorp/vault/pull/20453)]
-* cli: CLI should take days as a unit of time for ttl like flags [[GH-20477](https://github.com/hashicorp/vault/pull/20477)]
-* core (enterprise): Fix log shipper buffer size overflow issue for 32 bit architecture.
-* core (enterprise): Fix logshipper buffer size to default to DefaultBufferSize only when reported system memory is zero.
-* core (enterprise): Remove MFA Enforcment configuration for namespace when deleting namespace
-* core: prevent panic on login after namespace is deleted that had mfa enforcement [[GH-20375](https://github.com/hashicorp/vault/pull/20375)]
-* replication (enterprise): Fix a race condition with invalid tokens during WAL streaming that was causing Secondary clusters to be unable to connect to a Primary.
-* replication (enterprise): fix bug where secondary grpc connections would timeout when connecting to a primary host that no longer exists.
-* secrets/transform (enterprise): Fix a caching bug affecting secondary nodes after a tokenization key rotation
-  
-## 1.11.10
-### April 26, 2023
-
-CHANGES:
-
-* core: Bump Go version to 1.19.8.
-
-IMPROVEMENTS:
-
-* cli/namespace: Add detailed flag to output additional namespace information 
-such as namespace IDs and custom metadata. [[GH-20243](https://github.com/hashicorp/vault/pull/20243)]
-* core/activity: add an endpoint to write test activity log data, guarded by a build flag [[GH-20019](https://github.com/hashicorp/vault/pull/20019)]
-* core: Add a `raft` sub-field to the `storage` and `ha_storage` details provided by the
-`/sys/config/state/sanitized` endpoint in order to include the `max_entry_size`. [[GH-20044](https://github.com/hashicorp/vault/pull/20044)]
-* sdk/ldaputil: added `connection_timeout` to tune connection timeout duration 
-for all LDAP plugins. [[GH-20144](https://github.com/hashicorp/vault/pull/20144)]
-
-BUG FIXES:
-
-* auth/ldap: Add max_page_size configurable to LDAP configuration [[GH-19032](https://github.com/hashicorp/vault/pull/19032)]
-* core (enterprise): Fix intermittent issue with token entries sometimes not being found when using a newly created token in a request to a secondary, even when SSCT `new_token` forwarding is set. When this occurred, this would result in the following error to the client: `error performing token check: no lease entry found for token that ought to have one, possible eventual consistency issue`.
-* core (enterprise): Fix read on perf standbys failing with 412 after leadership change, unseal, restores or restarts when no writes occur
-* core/ssct (enterprise): Fixed race condition where a newly promoted DR may revert `sscGenCounter` 
-resulting in 412 errors.
-* core: Fix regression breaking non-raft clusters whose nodes share the same cluster_addr/api_addr. [[GH-19721](https://github.com/hashicorp/vault/pull/19721)]
-* helper/random: Fix race condition in string generator helper [[GH-19875](https://github.com/hashicorp/vault/pull/19875)]
-* openapi: Fix many incorrect details in generated API spec, by using better techniques to parse path regexps [[GH-18554](https://github.com/hashicorp/vault/pull/18554)]
-* replication (enterprise): Fix replication status for Primary clusters showing its primary cluster's information (in case of DR) in secondaries field when known_secondaries field is nil
-* secrets/pki: Fix patching of leaf_not_after_behavior on issuers. [[GH-20341](https://github.com/hashicorp/vault/pull/20341)]
-* secrets/transform (enterprise): Address SQL connection leak when cleaning expired tokens
-* ui: Fix OIDC provider logo showing when domain doesn't match [[GH-20263](https://github.com/hashicorp/vault/pull/20263)]
-* ui: Fix bad link to namespace when namespace name includes `.` [[GH-19799](https://github.com/hashicorp/vault/pull/19799)]
-* ui: fixes browser console formatting for help command output [[GH-20064](https://github.com/hashicorp/vault/pull/20064)]
-* ui: remove use of htmlSafe except when first sanitized [[GH-20235](https://github.com/hashicorp/vault/pull/20235)]
-  
-## 1.11.9
-### March 29, 2023
-
-SECURITY:
-
-* storage/mssql: When using Vault’s community-supported Microsoft SQL (MSSQL) database storage backend, a privileged attacker with the ability to write arbitrary data to Vault’s configuration may be able to perform arbitrary SQL commands on the underlying database server through Vault. This vulnerability, CVE-2023-0620, is fixed in Vault 1.13.1, 1.12.5, and 1.11.9. [[HCSEC-2023-12](https://discuss.hashicorp.com/t/hcsec-2023-12-vault-s-microsoft-sql-database-storage-backend-vulnerable-to-sql-injection-via-configuration-file/52080)]
-* secrets/pki: Vault’s PKI mount issuer endpoints did not correctly authorize access to remove an issuer or modify issuer metadata, potentially resulting in denial of service of the PKI mount. This bug did not affect public or private key material, trust chains or certificate issuance. This vulnerability, CVE-2023-0665, is fixed in Vault 1.13.1, 1.12.5, and 1.11.9. [[HCSEC-2023-11](https://discuss.hashicorp.com/t/hcsec-2023-11-vault-s-pki-issuer-endpoint-did-not-correctly-authorize-access-to-issuer-metadata/52079)]
-* core: HashiCorp Vault’s implementation of Shamir’s secret sharing used precomputed table lookups, and was vulnerable to cache-timing attacks. An attacker with access to, and the ability to observe a large number of unseal operations on the host through a side channel may reduce the search space of a brute force effort to recover the Shamir shares. This vulnerability, CVE-2023-25000, is fixed in Vault 1.13.1, 1.12.5, and 1.11.9. [[HCSEC-2023-10](https://discuss.hashicorp.com/t/hcsec-2023-10-vault-vulnerable-to-cache-timing-attacks-during-seal-and-unseal-operations/52078)]
-
-IMPROVEMENTS:
-
-* auth/github: Allow for an optional Github auth token environment variable to make authenticated requests when fetching org id
-website/docs: Add docs for `VAULT_AUTH_CONFIG_GITHUB_TOKEN` environment variable when writing Github config [[GH-19244](https://github.com/hashicorp/vault/pull/19244)]
-* core: Allow overriding gRPC connect timeout via VAULT_GRPC_MIN_CONNECT_TIMEOUT. This is an env var rather than a config setting because we don't expect this to ever be needed.  It's being added as a last-ditch
-option in case all else fails for some replication issues we may not have fully reproduced. [[GH-19676](https://github.com/hashicorp/vault/pull/19676)]
-* core: validate name identifiers in mssql physical storage backend prior use [[GH-19591](https://github.com/hashicorp/vault/pull/19591)]
-
-BUG FIXES:
-
-* auth/kubernetes: Ensure a consistent TLS configuration for all k8s API requests [[#190](https://github.com/hashicorp/vault-plugin-auth-kubernetes/pull/190)] [[GH-19720](https://github.com/hashicorp/vault/pull/19720)]
-* cli: Fix vault read handling to return raw data as secret.Data when there is no top-level data object from api response. [[GH-17913](https://github.com/hashicorp/vault/pull/17913)]
-* core (enterprise): Attempt to reconnect to a PKCS#11 HSM if we retrieve a CKR_FUNCTION_FAILED error.
-* core: Fixed issue with remounting mounts that have a non-trailing space in the 'to' or 'from' paths. [[GH-19585](https://github.com/hashicorp/vault/pull/19585)]
-* openapi: Fix logic for labeling unauthenticated/sudo paths. [[GH-19600](https://github.com/hashicorp/vault/pull/19600)]
-* secrets/transform (enterprise): Fix persistence problem with rotated tokenization key versions
-* ui: fixes issue navigating back a level using the breadcrumb from secret metadata view [[GH-19703](https://github.com/hashicorp/vault/pull/19703)]
-* ui: pass encodeBase64 param to HMAC transit-key-actions. [[GH-19429](https://github.com/hashicorp/vault/pull/19429)]
-* ui: use URLSearchParams interface to capture namespace param from SSOs (ex. ADFS) with decoded state param in callback url [[GH-19460](https://github.com/hashicorp/vault/pull/19460)]
-
-## 1.11.8
-### March 01, 2023
-
-SECURITY:
-
-* auth/approle: When using the Vault and Vault Enterprise (Vault) approle auth method, any authenticated user with access to the /auth/approle/role/:role_name/secret-id-accessor/destroy endpoint can destroy the secret ID of any other role by providing the secret ID accessor. This vulnerability, CVE-2023-24999 has been fixed in Vault 1.13.0, 1.12.4, 1.11.8, 1.10.11 and above. [[HSEC-2023-07](https://discuss.hashicorp.com/t/hcsec-2023-07-vault-fails-to-verify-if-approle-secretid-belongs-to-role-during-a-destroy-operation/51305)]
-
-CHANGES:
-
-* core: Bump Go version to 1.19.6.
-
-IMPROVEMENTS:
-
-* secrets/database: Adds error message requiring password on root crednetial rotation. [[GH-19103](https://github.com/hashicorp/vault/pull/19103)]
-
-BUG FIXES:
-
-* auth/approle: Add nil check for the secret ID entry when deleting via secret id accessor preventing cross role secret id deletion [[GH-19186](https://github.com/hashicorp/vault/pull/19186)]
-* core (enterprise): Fix panic when using invalid accessor for control-group request
-* core (enterprise): Fix perf standby WAL streaming silently failures when replication setup happens at a bad time.
-* core: Prevent panics in `sys/leases/lookup`, `sys/leases/revoke`, and `sys/leases/renew` endpoints if provided `lease_id` is null [[GH-18951](https://github.com/hashicorp/vault/pull/18951)]
-* license (enterprise): Fix bug where license would update even if the license didn't change.
-* replication (enterprise): Fix bug where reloading external plugin on a secondary would 
-break replication.
-* secrets/ad: Fix bug where config couldn't be updated unless binddn/bindpass were included in the update. [[GH-18208](https://github.com/hashicorp/vault/pull/18208)]
-* ui (enterprise): Fix cancel button from transform engine role creation page [[GH-19135](https://github.com/hashicorp/vault/pull/19135)]
-* ui: Fix bug where logging in via OIDC fails if browser is in fullscreen mode [[GH-19071](https://github.com/hashicorp/vault/pull/19071)]
-* ui: show Get credentials button for static roles detail page when a user has the proper permissions. [[GH-19190](https://github.com/hashicorp/vault/pull/19190)]  
-
-## 1.11.7
-### February 6, 2023
-  
-CHANGES:
-
-* core: Bump Go version to 1.19.4.
-
-IMPROVEMENTS:
-
-* command/server: Environment variable keys are now logged at startup. [[GH-18125](https://github.com/hashicorp/vault/pull/18125)]
-* core/fips: use upstream toolchain for FIPS 140-2 compliance again; this will appear as X=boringcrypto on the Go version in Vault server logs.
-* secrets/db/mysql: Add `tls_server_name` and `tls_skip_verify` parameters [[GH-18799](https://github.com/hashicorp/vault/pull/18799)]
-* ui: Prepends "passcode=" if not provided in user input for duo totp mfa method authentication [[GH-18342](https://github.com/hashicorp/vault/pull/18342)]
-* ui: Update language on database role to "Connection name" [[GH-18261](https://github.com/hashicorp/vault/issues/18261)] [[GH-18350](https://github.com/hashicorp/vault/pull/18350)]
-
-BUG FIXES:
-
-* auth/approle: Fix `token_bound_cidrs` validation when using /32 blocks for role and secret ID [[GH-18145](https://github.com/hashicorp/vault/pull/18145)]
-* cli/kv: skip formatting of nil secrets for patch and put with field parameter set [[GH-18163](https://github.com/hashicorp/vault/pull/18163)]
-* core (enterprise): Fix a race condition resulting in login errors to PKCS#11 modules under high concurrency.
-* core/managed-keys (enterprise): Limit verification checks to mounts in a key's namespace
-* core/quotas (enterprise): Fix a potential deadlock that could occur when using lease count quotas.
-* core/quotas: Fix issue with improper application of default rate limit quota exempt paths [[GH-18273](https://github.com/hashicorp/vault/pull/18273)]
-* core: fix bug where context cancellations weren't forwarded to active node from performance standbys.
-* core: prevent panic in login mfa enforcement delete after enforcement's namespace is deleted [[GH-18923](https://github.com/hashicorp/vault/pull/18923)]
-* database/mongodb: Fix writeConcern set to be applied to any query made on the database [[GH-18546](https://github.com/hashicorp/vault/pull/18546)]
-* identity (enterprise): Fix a data race when creating an entity for a local alias.
-* kmip (enterprise): Fix Destroy operation response that omitted Unique Identifier on some batched responses.
-* kmip (enterprise): Fix Locate operation response incompatibility with clients using KMIP versions prior to 1.3.
-* kmip (enterprise): Fix Query operation response that omitted streaming capability and supported profiles.
-* licensing (enterprise): update autoloaded license cache after reload
-* secrets/pki: Allow patching issuer to set an empty issuer name. [[GH-18466](https://github.com/hashicorp/vault/pull/18466)]
-* secrets/transit: Do not warn about unrecognized parameter 'batch_input' [[GH-18299](https://github.com/hashicorp/vault/pull/18299)]
-* storage/raft (enterprise): An already joined node can rejoin by wiping storage
-and re-issueing a join request, but in doing so could transiently become a
-non-voter.  In some scenarios this resulted in loss of quorum. [[GH-18263](https://github.com/hashicorp/vault/pull/18263)]
-* storage/raft (enterprise): Fix some storage-modifying RPCs used by perf standbys that weren't returning the resulting WAL state.
-* storage/raft: Don't panic on unknown raft ops [[GH-17732](https://github.com/hashicorp/vault/pull/17732)]
-* ui: fixes query parameters not passed in api explorer test requests [[GH-18743](https://github.com/hashicorp/vault/pull/18743)]
-
-## 1.11.6
-### November 30, 2022
-
-IMPROVEMENTS:
-
-* secrets/pki: Allow issuer creation, import to change default issuer via `default_follows_latest_issuer`. [[GH-17824](https://github.com/hashicorp/vault/pull/17824)]
-
-BUG FIXES:
-
-* auth/okta: fix a panic for AuthRenew in Okta [[GH-18011](https://github.com/hashicorp/vault/pull/18011)]
-* auth: Deduplicate policies prior to ACL generation [[GH-17914](https://github.com/hashicorp/vault/pull/17914)]
-* cli: Fix issue preventing kv commands from executing properly when the mount path provided by `-mount` flag and secret key path are the same. [[GH-17679](https://github.com/hashicorp/vault/pull/17679)]
-* core/quotas (enterprise): Fix a lock contention issue that could occur and cause Vault to become unresponsive when creating, changing, or deleting lease count quotas.
-* core: Fix potential deadlock if barrier ciphertext is less than 4 bytes. [[GH-17944](https://github.com/hashicorp/vault/pull/17944)]
-* core: fix a start up race condition where performance standbys could go into a
-  mount loop if default policies are not yet synced from the active node. [[GH-17801](https://github.com/hashicorp/vault/pull/17801)]
-* secret/pki: fix bug with initial legacy bundle migration (from < 1.11 into 1.11+) and missing issuers from ca_chain [[GH-17772](https://github.com/hashicorp/vault/pull/17772)]
-* secrets/azure: add WAL to clean up role assignments if errors occur [[GH-18085](https://github.com/hashicorp/vault/pull/18085)]
-* secrets/gcp: Fixes duplicate service account key for rotate root on standby or secondary [[GH-18110](https://github.com/hashicorp/vault/pull/18110)]
-* ui: Fixes issue with not being able to download raft snapshot via service worker [[GH-17769](https://github.com/hashicorp/vault/pull/17769)]
-* ui: fix entity policies list link to policy show page [[GH-17950](https://github.com/hashicorp/vault/pull/17950)]
-
-## 1.11.5
-### November 2, 2022
-
-IMPROVEMENTS:
-
-* database/snowflake: Allow parallel requests to Snowflake [[GH-17594](https://github.com/hashicorp/vault/pull/17594)]
-* sdk/ldap: Added support for paging when searching for groups using group filters [[GH-17640](https://github.com/hashicorp/vault/pull/17640)]
-
-BUG FIXES:
-
-* core/managed-keys (enterprise): Return better error messages when encountering key creation failures
-* core/managed-keys (enterprise): fix panic when having `cache_disable` true
-* core: prevent memory leak when using control group factors in a policy [[GH-17532](https://github.com/hashicorp/vault/pull/17532)]
-* core: prevent panic during mfa after enforcement's namespace is deleted [[GH-17562](https://github.com/hashicorp/vault/pull/17562)]
-* kmip (enterprise): Fix a problem in the handling of attributes that caused Import operations to fail.
-* login: Store token in tokenhelper for interactive login MFA [[GH-17040](https://github.com/hashicorp/vault/pull/17040)]
-* secrets/pki: Do not ignore provided signature bits value when signing intermediate and leaf certificates with a managed key [[GH-17328](https://github.com/hashicorp/vault/pull/17328)]
-* secrets/pki: Do not read revoked certificates from backend when CRL is disabled [[GH-17384](https://github.com/hashicorp/vault/pull/17384)]
-* secrets/pki: Respond to tidy-status, tidy-cancel on PR Secondary clusters. [[GH-17497](https://github.com/hashicorp/vault/pull/17497)]
-* ui/keymgmt: Sets the defaultValue for type when creating a key. [[GH-17407](https://github.com/hashicorp/vault/pull/17407)]
-* ui: Fixes oidc/jwt login issue with alternate mount path and jwt login via mount path tab [[GH-17661](https://github.com/hashicorp/vault/pull/17661)]
-  
-## 1.11.4
-### September 30, 2022
-
-SECURITY:
-
-* secrets/pki: Vault’s TLS certificate auth method did not initially load the optionally-configured CRL issued by the role’s CA into memory on startup, resulting in the revocation list not being checked, if the CRL has not yet been retrieved. This vulnerability, CVE-2022-41316, is fixed in Vault 1.12.0, 1.11.4, 1.10.7, and 1.9.10. [[HSEC-2022-24](https://discuss.hashicorp.com/t/hcsec-2022-24-vaults-tls-cert-auth-method-only-loaded-crl-after-first-request/45483)]
-
-IMPROVEMENTS:
-
-* agent/auto-auth: Add `exit_on_err` which when set to true, will cause Agent to exit if any errors are encountered during authentication. [[GH-17091](https://github.com/hashicorp/vault/pull/17091)]
-* agent: Send notifications to systemd on start and stop. [[GH-9802](https://github.com/hashicorp/vault/pull/9802)]
-
-BUG FIXES:
-
-* auth/cert: Vault does not initially load the CRLs in cert auth unless the read/write CRL endpoint is hit. [[GH-17138](https://github.com/hashicorp/vault/pull/17138)]
-* auth/kubernetes: Restore support for JWT signature algorithm ES384 [[GH-160](https://github.com/hashicorp/vault-plugin-auth-kubernetes/pull/160)] [[GH-17162](https://github.com/hashicorp/vault/pull/17162)]
-* auth/token: Fix ignored parameter warnings for valid parameters on token create [[GH-16938](https://github.com/hashicorp/vault/pull/16938)]
-* core/quotas: Fix goroutine leak caused by the seal process not fully cleaning up Rate Limit Quotas. [[GH-17281](https://github.com/hashicorp/vault/pull/17281)]
-* core: Prevent two or more DR failovers from invalidating SSCT tokens generated on the previous primaries. [[GH-16956](https://github.com/hashicorp/vault/pull/16956)]
-* identity/oidc: Adds `claims_supported` to discovery document. [[GH-16992](https://github.com/hashicorp/vault/pull/16992)]
-* replication (enterprise): Fix data race in SaveCheckpoint()
-* secrets/transform (enterprise): Fix an issue loading tokenization transform configuration after a specific sequence of reconfigurations.
-* secrets/transform (enterprise): Fix persistence problem with tokenization store credentials.
-* ui: Fixes secret version and status menu links transitioning to auth screen [[GH-16983](https://github.com/hashicorp/vault/pull/16983)]  
-* ui: Fixes secret version and status menu links transitioning to auth screen [[GH-16983](https://github.com/hashicorp/vault/pull/16983)]
-
 ## 1.11.3
 ### August 31, 2022
 
-SECURITY:
-
-* core: When entity aliases mapped to a single entity share the same alias name, but have different mount accessors, Vault can leak metadata between the aliases. This metadata leak may result in unexpected access if templated policies are using alias metadata for path names. This vulnerability, CVE-2022-40186, is fixed in 1.11.3, 1.10.6, and 1.9.9. [[HSEC-2022-18](https://discuss.hashicorp.com/t/hcsec-2022-18-vault-entity-alias-metadata-may-leak-between-aliases-with-the-same-name-assigned-to-the-same-entity/44550)]
-
 CHANGES:
 
 * core: Bump Go version to 1.17.13.
@@ -1321,11 +189,7 @@ Authorization Endpoint. [[GH-16601](https://github.com/hashicorp/vault/pull/1660
 * ui: Fix OIDC callback to accept namespace flag in different formats [[GH-16886](https://github.com/hashicorp/vault/pull/16886)]
 * ui: Fix info tooltip submitting form [[GH-16659](https://github.com/hashicorp/vault/pull/16659)]
 * ui: Fix naming of permitted_dns_domains form parameter on CA creation (root generation and sign intermediate). [[GH-16739](https://github.com/hashicorp/vault/pull/16739)]
-
-SECURITY:
-
-* identity/entity: When entity aliases mapped to a single entity share the same alias name, but have different mount accessors, Vault can leak metadata between the aliases. This metadata leak may result in unexpected access if templated policies are using alias metadata for path names. [[HCSEC-2022-18](https://discuss.hashicorp.com/t/hcsec-2022-18-vault-entity-alias-metadata-may-leak-between-aliases-with-the-same-name-assigned-to-the-same-entity/44550)]
-
+  
 ## 1.11.2
 ### August 2, 2022
 
@@ -1339,14 +203,10 @@ BUG FIXES:
 * core: Increase the allowed concurrent gRPC streams over the cluster port. [[GH-16327](https://github.com/hashicorp/vault/pull/16327)]
 * secrets/kv: Fix `kv get` issue preventing the ability to read a secret when providing a leading slash [[GH-16443](https://github.com/hashicorp/vault/pull/16443)]
 * ui: Fix issue logging in with JWT auth method [[GH-16466](https://github.com/hashicorp/vault/pull/16466)]
-
+  
 ## 1.11.1
 ### July 21, 2022
 
-SECURITY:
-
-* storage/raft: Vault Enterprise (“Vault”) clusters using Integrated Storage expose an unauthenticated API endpoint that could be abused to override the voter status of a node within a Vault HA cluster, introducing potential for future data loss or catastrophic failure. This vulnerability, CVE-2022-36129, was fixed in Vault 1.9.8, 1.10.5, and 1.11.1. [[HSEC-2022-15](https://discuss.hashicorp.com/t/hcsec-2022-15-vault-enterprise-does-not-verify-existing-voter-status-when-joining-an-integrated-storage-ha-node/42420)]
-
 CHANGES:
 
 * core: Bump Go version to 1.17.12.
@@ -1370,11 +230,11 @@ BUG FIXES:
 * storage/raft (enterprise): Prevent unauthenticated voter status change with rejoin [[GH-16324](https://github.com/hashicorp/vault/pull/16324)]
 * transform (enterprise): Fix a bug in the handling of nested or unmatched capture groups in FPE transformations.
 * ui: OIDC login type uses localStorage instead of sessionStorage [[GH-16170](https://github.com/hashicorp/vault/pull/16170)]
-
+  
 SECURITY:
 
 * storage/raft (enterprise): Vault Enterprise (“Vault”) clusters using Integrated Storage expose an unauthenticated API endpoint that could be abused to override the voter status of a node within a Vault HA cluster, introducing potential for future data loss or catastrophic failure. This vulnerability, CVE-2022-36129, was fixed in Vault 1.9.8, 1.10.5, and 1.11.1. [[HCSEC-2022-15](https://discuss.hashicorp.com/t/hcsec-2022-15-vault-enterprise-does-not-verify-existing-voter-status-when-joining-an-integrated-storage-ha-node/42420)]
-
+  
 ## 1.11.0
 ### June 20, 2022
 
@@ -1598,119 +458,9 @@ rebuilt upon changes to the list of issuers. [[GH-15179](https://github.com/hash
 * ui: fix search-select component showing blank selections when editing group member entity [[GH-15058](https://github.com/hashicorp/vault/pull/15058)]
 * ui: masked values no longer give away length or location of special characters [[GH-15025](https://github.com/hashicorp/vault/pull/15025)]
 
-## 1.10.11
-### March 01, 2023
-
-SECURITY:
-
-* auth/approle: When using the Vault and Vault Enterprise (Vault) approle auth method, any authenticated user with access to the /auth/approle/role/:role_name/secret-id-accessor/destroy endpoint can destroy the secret ID of any other role by providing the secret ID accessor. This vulnerability, CVE-2023-24999 has been fixed in Vault 1.13.0, 1.12.4, 1.11.8, 1.10.11 and above. [[HSEC-2023-07](https://discuss.hashicorp.com/t/hcsec-2023-07-vault-fails-to-verify-if-approle-secretid-belongs-to-role-during-a-destroy-operation/51305)]
-
-CHANGES:
-
-* core: Bump Go version to 1.19.6.
-
-IMPROVEMENTS:
-
-* secrets/database: Adds error message requiring password on root crednetial rotation. [[GH-19103](https://github.com/hashicorp/vault/pull/19103)]
-
-BUG FIXES:
-
-* auth/approle: Add nil check for the secret ID entry when deleting via secret id accessor preventing cross role secret id deletion [[GH-19186](https://github.com/hashicorp/vault/pull/19186)]
-* core (enterprise): Fix panic when using invalid accessor for control-group request
-* core: Prevent panics in `sys/leases/lookup`, `sys/leases/revoke`, and `sys/leases/renew` endpoints if provided `lease_id` is null [[GH-18951](https://github.com/hashicorp/vault/pull/18951)]
-* replication (enterprise): Fix bug where reloading external plugin on a secondary would 
-break replication.
-* secrets/ad: Fix bug where config couldn't be updated unless binddn/bindpass were included in the update. [[GH-18209](https://github.com/hashicorp/vault/pull/18209)]
-* ui (enterprise): Fix cancel button from transform engine role creation page [[GH-19135](https://github.com/hashicorp/vault/pull/19135)]
-* ui: Fix bug where logging in via OIDC fails if browser is in fullscreen mode [[GH-19071](https://github.com/hashicorp/vault/pull/19071)]
-
-## 1.10.10
-### February 6, 2023
-  
-CHANGES:
-
-* core: Bump Go version to 1.19.4.
-
-IMPROVEMENTS:
-
-* command/server: Environment variable keys are now logged at startup. [[GH-18125](https://github.com/hashicorp/vault/pull/18125)]
-* core/fips: use upstream toolchain for FIPS 140-2 compliance again; this will appear as X=boringcrypto on the Go version in Vault server logs.
-* secrets/db/mysql: Add `tls_server_name` and `tls_skip_verify` parameters [[GH-18799](https://github.com/hashicorp/vault/pull/18799)]
-* ui: Prepends "passcode=" if not provided in user input for duo totp mfa method authentication [[GH-18342](https://github.com/hashicorp/vault/pull/18342)]
-* ui: Update language on database role to "Connection name" [[GH-18261](https://github.com/hashicorp/vault/issues/18261)] [[GH-18350](https://github.com/hashicorp/vault/pull/18350)]
-
-BUG FIXES:
-
-* auth/approle: Fix `token_bound_cidrs` validation when using /32 blocks for role and secret ID [[GH-18145](https://github.com/hashicorp/vault/pull/18145)]
-* auth/token: Fix ignored parameter warnings for valid parameters on token create [[GH-16938](https://github.com/hashicorp/vault/pull/16938)]
-* cli/kv: skip formatting of nil secrets for patch and put with field parameter set [[GH-18163](https://github.com/hashicorp/vault/pull/18163)]
-* core (enterprise): Fix a race condition resulting in login errors to PKCS#11 modules under high concurrency.
-* core/managed-keys (enterprise): Limit verification checks to mounts in a key's namespace
-* core/quotas (enterprise): Fix a potential deadlock that could occur when using lease count quotas.
-* core/quotas: Fix issue with improper application of default rate limit quota exempt paths [[GH-18273](https://github.com/hashicorp/vault/pull/18273)]
-* core: fix bug where context cancellations weren't forwarded to active node from performance standbys.
-* core: prevent panic in login mfa enforcement delete after enforcement's namespace is deleted [[GH-18923](https://github.com/hashicorp/vault/pull/18923)]
-* database/mongodb: Fix writeConcern set to be applied to any query made on the database [[GH-18546](https://github.com/hashicorp/vault/pull/18546)]
-* identity (enterprise): Fix a data race when creating an entity for a local alias.
-* kmip (enterprise): Fix Destroy operation response that omitted Unique Identifier on some batched responses.
-* kmip (enterprise): Fix Locate operation response incompatibility with clients using KMIP versions prior to 1.3.
-* licensing (enterprise): update autoloaded license cache after reload
-* storage/raft (enterprise): Fix some storage-modifying RPCs used by perf standbys that weren't returning the resulting WAL state.
-* ui: fixes query parameters not passed in api explorer test requests [[GH-18743](https://github.com/hashicorp/vault/pull/18743)]
-  
-## 1.10.9
-### November 30, 2022
-
-BUG FIXES:
-
-* auth: Deduplicate policies prior to ACL generation [[GH-17914](https://github.com/hashicorp/vault/pull/17914)]
-* core/quotas (enterprise): Fix a lock contention issue that could occur and cause Vault to become unresponsive when creating, changing, or deleting lease count quotas.
-* core: Fix potential deadlock if barrier ciphertext is less than 4 bytes. [[GH-17944](https://github.com/hashicorp/vault/pull/17944)]
-* core: fix a start up race condition where performance standbys could go into a
-  mount loop if default policies are not yet synced from the active node. [[GH-17801](https://github.com/hashicorp/vault/pull/17801)]
-* secrets/azure: add WAL to clean up role assignments if errors occur [[GH-18084](https://github.com/hashicorp/vault/pull/18084)]
-* secrets/gcp: Fixes duplicate service account key for rotate root on standby or secondary [[GH-18109](https://github.com/hashicorp/vault/pull/18109)]
-* ui: fix entity policies list link to policy show page [[GH-17950](https://github.com/hashicorp/vault/pull/17950)]
-
-## 1.10.8
-### November 2, 2022
-  
-BUG FIXES:
-
-* core/managed-keys (enterprise): Return better error messages when encountering key creation failures
-* core/managed-keys (enterprise): fix panic when having `cache_disable` true
-* core: prevent memory leak when using control group factors in a policy [[GH-17532](https://github.com/hashicorp/vault/pull/17532)]
-* core: prevent panic during mfa after enforcement's namespace is deleted [[GH-17562](https://github.com/hashicorp/vault/pull/17562)]
-* login: Store token in tokenhelper for interactive login MFA [[GH-17040](https://github.com/hashicorp/vault/pull/17040)]
-* secrets/pki: Do not ignore provided signature bits value when signing intermediate and leaf certificates with a managed key [[GH-17328](https://github.com/hashicorp/vault/pull/17328)]
-* secrets/pki: Respond to tidy-status, tidy-cancel on PR Secondary clusters. [[GH-17497](https://github.com/hashicorp/vault/pull/17497)]
-* ui: Fixes oidc/jwt login issue with alternate mount path and jwt login via mount path tab [[GH-17661](https://github.com/hashicorp/vault/pull/17661)]
-
-## 1.10.7
-### September 30, 2022
-
-SECURITY:
-
-* secrets/pki: Vault’s TLS certificate auth method did not initially load the optionally-configured CRL issued by the role’s CA into memory on startup, resulting in the revocation list not being checked, if the CRL has not yet been retrieved. This vulnerability, CVE-2022-41316, is fixed in Vault 1.12.0, 1.11.4, 1.10.7, and 1.9.10. [[HSEC-2022-24](https://discuss.hashicorp.com/t/hcsec-2022-24-vaults-tls-cert-auth-method-only-loaded-crl-after-first-request/45483)]
-
-BUG FIXES:
-
-* auth/cert: Vault does not initially load the CRLs in cert auth unless the read/write CRL endpoint is hit. [[GH-17138](https://github.com/hashicorp/vault/pull/17138)]
-* core/quotas: Fix goroutine leak caused by the seal process not fully cleaning up Rate Limit Quotas. [[GH-17281](https://github.com/hashicorp/vault/pull/17281)]
-* core: Prevent two or more DR failovers from invalidating SSCT tokens generated on the previous primaries. [[GH-16956](https://github.com/hashicorp/vault/pull/16956)]
-* identity/oidc: Adds `claims_supported` to discovery document. [[GH-16992](https://github.com/hashicorp/vault/pull/16992)]
-* replication (enterprise): Fix data race in SaveCheckpoint()
-* secrets/transform (enterprise): Fix an issue loading tokenization transform configuration after a specific sequence of reconfigurations.
-* secrets/transform (enterprise): Fix persistence problem with tokenization store credentials.
-* ui: Fix lease force revoke action [[GH-16930](https://github.com/hashicorp/vault/pull/16930)]
-
 ## 1.10.6
 ### August 31, 2022
 
-SECURITY:
-
-* core: When entity aliases mapped to a single entity share the same alias name, but have different mount accessors, Vault can leak metadata between the aliases. This metadata leak may result in unexpected access if templated policies are using alias metadata for path names. This vulnerability, CVE-2022-40186, is fixed in 1.11.3, 1.10.6, and 1.9.9. [[HSEC-2022-18](https://discuss.hashicorp.com/t/hcsec-2022-18-vault-entity-alias-metadata-may-leak-between-aliases-with-the-same-name-assigned-to-the-same-entity/44550)]
-
 CHANGES:
 
 * core: Bump Go version to 1.17.13.
@@ -1736,18 +486,10 @@ Authorization Endpoint. [[GH-16601](https://github.com/hashicorp/vault/pull/1660
 * ui: Fix OIDC callback to accept namespace flag in different formats [[GH-16886](https://github.com/hashicorp/vault/pull/16886)]
 * ui: Fix issue logging in with JWT auth method [[GH-16466](https://github.com/hashicorp/vault/pull/16466)]
 * ui: Fix naming of permitted_dns_domains form parameter on CA creation (root generation and sign intermediate). [[GH-16739](https://github.com/hashicorp/vault/pull/16739)]
-
-SECURITY:
-
-* identity/entity: When entity aliases mapped to a single entity share the same alias name, but have different mount accessors, Vault can leak metadata between the aliases. This metadata leak may result in unexpected access if templated policies are using alias metadata for path names. [[HCSEC-2022-18](https://discuss.hashicorp.com/t/hcsec-2022-18-vault-entity-alias-metadata-may-leak-between-aliases-with-the-same-name-assigned-to-the-same-entity/44550)]
   
 ## 1.10.5
 ### July 21, 2022
 
-SECURITY:
-
-* storage/raft: Vault Enterprise (“Vault”) clusters using Integrated Storage expose an unauthenticated API endpoint that could be abused to override the voter status of a node within a Vault HA cluster, introducing potential for future data loss or catastrophic failure. This vulnerability, CVE-2022-36129, was fixed in Vault 1.9.8, 1.10.5, and 1.11.1. [[HSEC-2022-15](https://discuss.hashicorp.com/t/hcsec-2022-15-vault-enterprise-does-not-verify-existing-voter-status-when-joining-an-integrated-storage-ha-node/42420)]
-
 CHANGES:
 
 * core/fips: Disable and warn about entropy augmentation in FIPS 140-2 Inside mode [[GH-15858](https://github.com/hashicorp/vault/pull/15858)]
@@ -2102,26 +844,9 @@ operation for upgraded configurations with a `root_password_ttl` of zero. [[GH-1
 * ui: Removes ability to tune token_type for token auth methods [[GH-12904](https://github.com/hashicorp/vault/pull/12904)]
 * ui: trigger token renewal if inactive and half of TTL has passed [[GH-13950](https://github.com/hashicorp/vault/pull/13950)]
 
-## 1.9.10
-### September 30, 2022
-
-SECURITY:
-
-* secrets/pki: Vault’s TLS certificate auth method did not initially load the optionally-configured CRL issued by the role’s CA into memory on startup, resulting in the revocation list not being checked, if the CRL has not yet been retrieved. This vulnerability, CVE-2022-41316, is fixed in Vault 1.12.0, 1.11.4, 1.10.7, and 1.9.10. [[HSEC-2022-24](https://discuss.hashicorp.com/t/hcsec-2022-24-vaults-tls-cert-auth-method-only-loaded-crl-after-first-request/45483)]
-
-BUG FIXES:
-
-* auth/cert: Vault does not initially load the CRLs in cert auth unless the read/write CRL endpoint is hit. [[GH-17138](https://github.com/hashicorp/vault/pull/17138)]
-* replication (enterprise): Fix data race in SaveCheckpoint()
-* ui: Fix lease force revoke action [[GH-16930](https://github.com/hashicorp/vault/pull/16930)]
-  
 ## 1.9.9
 ### August 31, 2022
 
-SECURITY:
-
-* core: When entity aliases mapped to a single entity share the same alias name, but have different mount accessors, Vault can leak metadata between the aliases. This metadata leak may result in unexpected access if templated policies are using alias metadata for path names. This vulnerability, CVE-2022-40186, is fixed in 1.11.3, 1.10.6, and 1.9.9. [[HSEC-2022-18](https://discuss.hashicorp.com/t/hcsec-2022-18-vault-entity-alias-metadata-may-leak-between-aliases-with-the-same-name-assigned-to-the-same-entity/44550)]
-
 CHANGES:
 
 * core: Bump Go version to 1.17.13.
@@ -2135,17 +860,9 @@ BUG FIXES:
 * ui: Fix OIDC callback to accept namespace flag in different formats [[GH-16886](https://github.com/hashicorp/vault/pull/16886)]
 * ui: Fix issue logging in with JWT auth method [[GH-16466](https://github.com/hashicorp/vault/pull/16466)]
 
-SECURITY:
-
-* identity/entity: When entity aliases mapped to a single entity share the same alias name, but have different mount accessors, Vault can leak metadata between the aliases. This metadata leak may result in unexpected access if templated policies are using alias metadata for path names. [[HCSEC-2022-18](https://discuss.hashicorp.com/t/hcsec-2022-18-vault-entity-alias-metadata-may-leak-between-aliases-with-the-same-name-assigned-to-the-same-entity/44550)]
-
 ## 1.9.8
 ### July 21, 2022
 
-SECURITY:
-
-* storage/raft: Vault Enterprise (“Vault”) clusters using Integrated Storage expose an unauthenticated API endpoint that could be abused to override the voter status of a node within a Vault HA cluster, introducing potential for future data loss or catastrophic failure. This vulnerability, CVE-2022-36129, was fixed in Vault 1.9.8, 1.10.5, and 1.11.1. [[HSEC-2022-15](https://discuss.hashicorp.com/t/hcsec-2022-15-vault-enterprise-does-not-verify-existing-voter-status-when-joining-an-integrated-storage-ha-node/42420)]
-
 CHANGES:
 
 * core: Bump Go version to 1.17.12.
diff --git a/CODEOWNERS b/CODEOWNERS
index e13a6b5398222..745562e547280 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -25,12 +25,12 @@
 /plugins/                     @hashicorp/vault-ecosystem
 /vault/plugin_catalog.go      @hashicorp/vault-ecosystem
 
-/website/content/ @hashicorp/vault-education-approvers
-/website/content/docs/plugin-portal.mdx   @acahn @hashicorp/vault-education-approvers
+/website/content/                         @taoism4504
+/website/content/docs/plugin-portal.mdx   @taoism4504  @acahn
 
 # Plugin docs
-/website/content/docs/plugins/              @fairclothjm @hashicorp/vault-education-approvers
-/website/content/docs/upgrading/plugins.mdx @fairclothjm @hashicorp/vault-education-approvers
+/website/content/docs/plugins/              @taoism4504 @fairclothjm
+/website/content/docs/upgrading/plugins.mdx @taoism4504 @fairclothjm
 
 # UI code related to Vault's JWT/OIDC auth method and OIDC provider.
 # Changes to these files often require coordination with backend code,
@@ -45,40 +45,3 @@
 # Quality engineering
 /.github/  @hashicorp/quality-team
 /enos/     @hashicorp/quality-team
-
-# Cryptosec
-/builtin/logical/pki/                                @hashicorp/vault-crypto
-/builtin/logical/pkiext/                             @hashicorp/vault-crypto
-/website/content/docs/secrets/pki/                   @hashicorp/vault-crypto
-/website/content/api-docs/secret/pki.mdx             @hashicorp/vault-crypto
-/builtin/credential/cert/                            @hashicorp/vault-crypto
-/website/content/docs/auth/cert.mdx                  @hashicorp/vault-crypto
-/website/content/api-docs/auth/cert.mdx              @hashicorp/vault-crypto
-/builtin/logical/ssh/                                @hashicorp/vault-crypto
-/website/content/docs/secrets/ssh/                   @hashicorp/vault-crypto
-/website/content/api-docs/secret/ssh.mdx             @hashicorp/vault-crypto
-/builtin/logical/transit/                            @hashicorp/vault-crypto
-/website/content/docs/secrets/transit/               @hashicorp/vault-crypto
-/website/content/api-docs/secret/transit.mdx         @hashicorp/vault-crypto
-/helper/random/                                      @hashicorp/vault-crypto
-/sdk/helper/certutil/                                @hashicorp/vault-crypto
-/sdk/helper/cryptoutil/                              @hashicorp/vault-crypto
-/sdk/helper/kdf/                                     @hashicorp/vault-crypto
-/sdk/helper/keysutil/                                @hashicorp/vault-crypto
-/sdk/helper/ocsp/                                    @hashicorp/vault-crypto
-/sdk/helper/salt/                                    @hashicorp/vault-crypto
-/sdk/helper/tlsutil/                                 @hashicorp/vault-crypto
-/shamir/                                             @hashicorp/vault-crypto
-/vault/barrier*                                      @hashicorp/vault-crypto
-/vault/managed_key*                                  @hashicorp/vault-crypto
-/vault/seal*                                         @hashicorp/vault-crypto
-/vault/seal/                                         @hashicorp/vault-crypto
-/website/content/docs/configuration/seal/            @hashicorp/vault-crypto
-/website/content/docs/enterprise/sealwrap.mdx        @hashicorp/vault-crypto
-/website/content/api-docs/system/sealwrap-rewrap.mdx @hashicorp/vault-crypto
-/website/content/docs/secrets/transform/             @hashicorp/vault-crypto
-/website/content/api-docs/secret/transform.mdx       @hashicorp/vault-crypto
-/website/content/docs/secrets/kmip-profiles.mdx      @hashicorp/vault-crypto
-/website/content/docs/secrets/kmip.mdx               @hashicorp/vault-crypto
-/website/content/api-docs/secret/kmip.mdx            @hashicorp/vault-crypto
-/website/content/docs/enterprise/fips/               @hashicorp/vault-crypto
diff --git a/Dockerfile b/Dockerfile
index d088623b834ba..5d4ce5f581999 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 ## DOCKERHUB DOCKERFILE ##
 FROM alpine:3.15 as default
 
diff --git a/LICENSE b/LICENSE
index f4f97ee5853a2..e87a115e462e1 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,3 @@
-Copyright (c) 2015 HashiCorp, Inc.
-
 Mozilla Public License, version 2.0
 
 1. Definitions
diff --git a/Makefile b/Makefile
index 82fed7a838830..38a305a442855 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ GOFMT_FILES?=$$(find . -name '*.go' | grep -v pb.go | grep -v vendor)
 SED?=$(shell command -v gsed || command -v sed)
 
 GO_VERSION_MIN=$$(cat $(CURDIR)/.go-version)
-PROTOC_VERSION_MIN=3.21.12
+PROTOC_VERSION_MIN=3.21.5
 GO_CMD?=go
 CGO_ENABLED?=0
 ifneq ($(FDB_ENABLED), )
@@ -111,49 +111,6 @@ vet:
 			echo "and fix them if necessary before submitting the code for reviewal."; \
 		fi
 
-# deprecations runs staticcheck tool to look for deprecations. Checks entire code to see if it 
-# has deprecated function, variable, constant or field
-deprecations:
-	make bootstrap
-	repositoryName=$(basename `git rev-parse --show-toplevel`)
-	./scripts/deprecations-checker.sh "" repositoryName
-
-# ci-deprecations runs staticcheck tool to look for deprecations. All output gets piped to revgrep
-# which will only return an error if changes that is not on main has deprecated function, variable, constant or field
-ci-deprecations:
-	make bootstrap
-	repositoryName=$(basename `git rev-parse --show-toplevel`)
-	./scripts/deprecations-checker.sh main repositoryName
-
-# tools/godoctests/.bin/godoctests builds the custom analyzer to check for godocs for tests
-tools/godoctests/.bin/godoctests:
-	@cd tools/godoctests && $(GO_CMD) build -o .bin/godoctests .
-
-# vet-godoctests runs godoctests on the test functions. All output gets piped to revgrep
-# which will only return an error if a new function is missing a godoc
-vet-godoctests: bootstrap tools/godoctests/.bin/godoctests
-	@$(GO_CMD) vet -vettool=./tools/godoctests/.bin/godoctests $(TEST) 2>&1 | revgrep
-
-# ci-vet-godoctests runs godoctests on the test functions. All output gets piped to revgrep
-# which will only return an error if a new function that is not on main is missing a godoc
-ci-vet-godoctests: ci-bootstrap tools/godoctests/.bin/godoctests
-	@$(GO_CMD) vet -vettool=./tools/godoctests/.bin/godoctests $(TEST) 2>&1 | revgrep origin/main
-
-# tools/gonilnilfunctions/.bin/gonilnilfunctions builds the custom analyzer to check for nil, nil function returns
-tools/gonilnilfunctions/.bin/gonilnilfunctions:
-	@cd tools/gonilnilfunctions && $(GO_CMD) build -o .bin/gonilnilfunctions .
-
-# vet-gonilnilfunctions runs gonilnilfunctions on functions. All output gets piped to revgrep
-# which will only return an error if a new function returns nil, nil (where one of the nils could be an error)
-vet-gonilnilfunctions: bootstrap tools/gonilnilfunctions/.bin/gonilnilfunctions
-	@$(GO_CMD) vet -vettool=./tools/gonilnilfunctions/.bin/gonilnilfunctions ./... 2>&1 | revgrep
-
-# ci-vet-gonilnilfunctions runs gonilnilfunctions on functions. All output gets piped to revgrep
-# which will only return an error if a new function that is not on main has an issue
-ci-vet-gonilnilfunctions: ci-bootstrap tools/gonilnilfunctions/.bin/gonilnilfunctions
-	@$(GO_CMD) vet -vettool=./tools/gonilnilfunctions/.bin/gonilnilfunctions ./... 2>&1 | revgrep origin/main
-
-
 # lint runs vet plus a number of other checkers, it is more comprehensive, but louder
 lint:
 	@$(GO_CMD) list -f '{{.Dir}}' ./... | grep -v /vendor/ \
@@ -194,7 +151,7 @@ static-assets-dir:
 
 install-ui-dependencies:
 	@echo "--> Installing JavaScript assets"
-	@cd ui && yarn
+	@cd ui && yarn --ignore-optional
 
 test-ember: install-ui-dependencies
 	@echo "--> Running ember tests"
@@ -244,8 +201,8 @@ proto: bootstrap
 	# No additional sed expressions should be added to this list. Going forward
 	# we should just use the variable names choosen by protobuf. These are left
 	# here for backwards compatability, namely for SDK compilation.
-	$(SED) -i -e 's/Id/ID/' -e 's/SPDX-License-IDentifier/SPDX-License-Identifier/' vault/request_forwarding_service.pb.go
-	$(SED) -i -e 's/Idp/IDP/' -e 's/Url/URL/' -e 's/Id/ID/' -e 's/IDentity/Identity/' -e 's/EntityId/EntityID/' -e 's/Api/API/' -e 's/Qr/QR/' -e 's/Totp/TOTP/' -e 's/Mfa/MFA/' -e 's/Pingid/PingID/' -e 's/namespaceId/namespaceID/' -e 's/Ttl/TTL/' -e 's/BoundCidrs/BoundCIDRs/' -e 's/SPDX-License-IDentifier/SPDX-License-Identifier/' helper/identity/types.pb.go helper/identity/mfa/types.pb.go helper/storagepacker/types.pb.go sdk/plugin/pb/backend.pb.go sdk/logical/identity.pb.go vault/activity/activity_log.pb.go
+	$(SED) -i -e 's/Id/ID/' vault/request_forwarding_service.pb.go
+	$(SED) -i -e 's/Idp/IDP/' -e 's/Url/URL/' -e 's/Id/ID/' -e 's/IDentity/Identity/' -e 's/EntityId/EntityID/' -e 's/Api/API/' -e 's/Qr/QR/' -e 's/Totp/TOTP/' -e 's/Mfa/MFA/' -e 's/Pingid/PingID/' -e 's/namespaceId/namespaceID/' -e 's/Ttl/TTL/' -e 's/BoundCidrs/BoundCIDRs/' helper/identity/types.pb.go helper/identity/mfa/types.pb.go helper/storagepacker/types.pb.go sdk/plugin/pb/backend.pb.go sdk/logical/identity.pb.go vault/activity/activity_log.pb.go
 
 	# This will inject the sentinel struct tags as decorated in the proto files.
 	protoc-go-inject-tag -input=./helper/identity/types.pb.go
@@ -296,7 +253,7 @@ hana-database-plugin:
 mongodb-database-plugin:
 	@CGO_ENABLED=0 $(GO_CMD) build -o bin/mongodb-database-plugin ./plugins/database/mongodb/mongodb-database-plugin
 
-.PHONY: bin default prep test vet bootstrap ci-bootstrap fmt fmtcheck mysql-database-plugin mysql-legacy-database-plugin cassandra-database-plugin influxdb-database-plugin postgresql-database-plugin mssql-database-plugin hana-database-plugin mongodb-database-plugin ember-dist ember-dist-dev static-dist static-dist-dev assetcheck check-vault-in-path packages build build-ci semgrep semgrep-ci vet-godoctests ci-vet-godoctests vet-gonilnilfunctions ci-vet-gonilnilfunctions
+.PHONY: bin default prep test vet bootstrap ci-bootstrap fmt fmtcheck mysql-database-plugin mysql-legacy-database-plugin cassandra-database-plugin influxdb-database-plugin postgresql-database-plugin mssql-database-plugin hana-database-plugin mongodb-database-plugin ember-dist ember-dist-dev static-dist static-dist-dev assetcheck check-vault-in-path packages build build-ci semgrep semgrep-ci vet-godoctests ci-vet-godoctests
 
 .NOTPARALLEL: ember-dist ember-dist-dev
 
diff --git a/api/api_test.go b/api/api_test.go
index 8bf69e0de97a6..e4ba3153203eb 100644
--- a/api/api_test.go
+++ b/api/api_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/auth.go b/api/auth.go
index c1ef7a77989d5..fa92de4b3fd33 100644
--- a/api/auth.go
+++ b/api/auth.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
@@ -66,7 +63,7 @@ func (a *Auth) MFAValidate(ctx context.Context, mfaSecret *Secret, payload map[s
 		return nil, fmt.Errorf("secret does not contain MFARequirements")
 	}
 
-	s, err := a.c.Sys().MFAValidateWithContext(ctx, mfaSecret.Auth.MFARequirement.MFARequestID, payload)
+	s, err := a.c.Sys().MFAValidateWithContext(ctx, mfaSecret.Auth.MFARequirement.GetMFARequestID(), payload)
 	if err != nil {
 		return nil, err
 	}
diff --git a/api/auth/approle/approle.go b/api/auth/approle/approle.go
index 10d26b610f42e..b8cf012284418 100644
--- a/api/auth/approle/approle.go
+++ b/api/auth/approle/approle.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package approle
 
 import (
diff --git a/api/auth/approle/approle_test.go b/api/auth/approle/approle_test.go
index cdfb4e285e792..f2628c695cc27 100644
--- a/api/auth/approle/approle_test.go
+++ b/api/auth/approle/approle_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package approle
 
 import (
diff --git a/api/auth/approle/go.mod b/api/auth/approle/go.mod
index a1d1f47851477..b3d871b887ad6 100644
--- a/api/auth/approle/go.mod
+++ b/api/auth/approle/go.mod
@@ -2,4 +2,4 @@ module github.com/hashicorp/vault/api/auth/approle
 
 go 1.16
 
-require github.com/hashicorp/vault/api v1.9.2
+require github.com/hashicorp/vault/api v1.8.0
diff --git a/api/auth/approle/go.sum b/api/auth/approle/go.sum
index dfd66b2ccb247..c7835a3bf723f 100644
--- a/api/auth/approle/go.sum
+++ b/api/auth/approle/go.sum
@@ -1,46 +1,160 @@
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
+github.com/armon/go-metrics v0.3.9 h1:O2sNqxBdvq8Eq5xmzljcYzAORli6RWCvEym4cJf9m18=
+github.com/armon/go-metrics v0.3.9/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
+github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI=
+github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
+github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
 github.com/cenkalti/backoff/v3 v3.0.0 h1:ske+9nBpD9qZsTBoF41nW5L+AIuFBKMeze18XQ3eG1c=
 github.com/cenkalti/backoff/v3 v3.0.0/go.mod h1:cIeZDE3IrqwwJl6VUwCN6trj1oXrTS4rc0ij+ULvLYs=
+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
+github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
+github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
+github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
+github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/evanphx/json-patch/v5 v5.5.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4=
 github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
-github.com/go-jose/go-jose/v3 v3.0.0 h1:s6rrhirfEP/CGIoc6p+PZAeogN2SxKav6Wp7+dyMWVo=
-github.com/go-jose/go-jose/v3 v3.0.0/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxFMht0mSX+u8=
+github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
+github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
+github.com/frankban/quicktest v1.10.0/go.mod h1:ui7WezCLWMWxVWr1GETZY3smRy0G4KWq9vcPtJmFl7Y=
+github.com/frankban/quicktest v1.13.0 h1:yNZif1OkDfNoDfb9zZa9aXIpejNR4F23Wely0c+Qdqk=
+github.com/frankban/quicktest v1.13.0/go.mod h1:qLE0fzW0VuyUAJgPU19zByoIr0HtCHN/r/VLSOOIySU=
+github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
+github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-ldap/ldap/v3 v3.1.10/go.mod h1:5Zun81jBTabRaI8lzN7E1JjyEl1g6zI6u9pd8luAK4Q=
+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-test/deep v1.0.2 h1:onZX1rnHT3Wv6cqNgYyFOOlgVKJrksuCMCRvJStbMYw=
 github.com/go-test/deep v1.0.2/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
+github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
+github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
-github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
+github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
 github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
+github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
 github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
 github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
+github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
 github.com/hashicorp/go-hclog v0.16.2 h1:K4ev2ib4LdQETX5cSZBG0DVLk1jwGqSPXBjdah3veNs=
 github.com/hashicorp/go-hclog v0.16.2/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
+github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
+github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc=
+github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
+github.com/hashicorp/go-kms-wrapping/entropy/v2 v2.0.0/go.mod h1:xvb32K2keAc+R8DSFG2IwDcydK9DBQE+fGA5fsw6hSk=
 github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
 github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
+github.com/hashicorp/go-plugin v1.4.3 h1:DXmvivbWD5qdiBts9TpBC7BYL1Aia5sxbRgQB+v6UZM=
+github.com/hashicorp/go-plugin v1.4.3/go.mod h1:5fGEH17QVwTTcR0zV7yhDPLLmFX9YSZ38b18Udy6vYQ=
+github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
 github.com/hashicorp/go-retryablehttp v0.6.6 h1:HJunrbHTDDbBb/ay4kxa1n+dLmttUlnP3V9oNE4hmsM=
 github.com/hashicorp/go-retryablehttp v0.6.6/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
 github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc=
 github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
+github.com/hashicorp/go-secure-stdlib/base62 v0.1.1/go.mod h1:EdWO6czbmthiwZ3/PUsDV+UD1D5IRU4ActiaWGwt0Yw=
+github.com/hashicorp/go-secure-stdlib/mlock v0.1.1 h1:cCRo8gK7oq6A2L6LICkUZ+/a5rLiRXFMf1Qd4xSwxTc=
+github.com/hashicorp/go-secure-stdlib/mlock v0.1.1/go.mod h1:zq93CJChV6L9QTfGKtfBxKqD7BqqXx5O04A/ns2p5+I=
+github.com/hashicorp/go-secure-stdlib/parseutil v0.1.1/go.mod h1:QmrqtbKuxxSWTN3ETMPuB+VtEiBJ/A9XhoYGv8E1uD8=
 github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6 h1:om4Al8Oy7kCm/B86rLCLah4Dt5Aa0Fr5rYBG60OzwHQ=
 github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6/go.mod h1:QmrqtbKuxxSWTN3ETMPuB+VtEiBJ/A9XhoYGv8E1uD8=
+github.com/hashicorp/go-secure-stdlib/password v0.1.1/go.mod h1:9hH302QllNwu1o2TGYtSk8I8kTAN0ca1EHpwhm5Mmzo=
 github.com/hashicorp/go-secure-stdlib/strutil v0.1.1/go.mod h1:gKOamz3EwoIoJq7mlMIRBpVTAUn8qPCrEclOKKWhD3U=
 github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 h1:kes8mmyCpxJsI7FTwtzRqEy9CdjCtrXrXGuOpxEA7Ts=
 github.com/hashicorp/go-secure-stdlib/strutil v0.1.2/go.mod h1:Gou2R9+il93BqX25LAKCLuM+y9U2T4hlwvT1yprcna4=
+github.com/hashicorp/go-secure-stdlib/tlsutil v0.1.1/go.mod h1:l8slYwnJA26yBz+ErHpp2IRCLr0vuOMGBORIz4rRiAs=
 github.com/hashicorp/go-sockaddr v1.0.2 h1:ztczhD1jLxIRjVejw8gFomI1BQZOe2WoVOu0SyteCQc=
 github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A=
+github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE=
+github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/go-version v1.2.0 h1:3vNe/fWF5CBgRIguda1meWhsZHy3m8gCJ5wx+dIzX/E=
+github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
+github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
+github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
-github.com/hashicorp/vault/api v1.9.2 h1:YjkZLJ7K3inKgMZ0wzCU9OHqc+UqMQyXsPXnf3Cl2as=
-github.com/hashicorp/vault/api v1.9.2/go.mod h1:jo5Y/ET+hNyz+JnKDt8XLAdKs+AM0G5W0Vp1IrFI8N8=
+github.com/hashicorp/vault/api v1.8.0 h1:7765sW1XBt+qf4XKIYE4ebY9qc/yi9V2/egzGSUNMZU=
+github.com/hashicorp/vault/api v1.8.0/go.mod h1:uJrw6D3y9Rv7hhmS17JQC50jbPDAZdjZoTtrCCxxs7E=
+github.com/hashicorp/vault/sdk v0.6.0 h1:6Z+In5DXHiUfZvIZdMx7e2loL1PPyDjA4bVh9ZTIAhs=
+github.com/hashicorp/vault/sdk v0.6.0/go.mod h1:+DRpzoXIdMvKc88R4qxr+edwy/RvH5QK8itmxLiDHLc=
+github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb h1:b5rjCoWHc7eqmAS4/qyk21ZsHyb6Mxv/jykxvNTkU4M=
+github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
+github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
+github.com/jhump/protoreflect v1.6.0 h1:h5jfMVslIg6l29nsMs0D8Wj17RDVdNYti0vDN/PZZoE=
+github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74=
+github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.6 h1:6Su7aK7lXmJ/U79bYtBjLNaha4Fs1Rg9plHpcH+vvnE=
@@ -50,68 +164,169 @@ github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd
 github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
 github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
+github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ=
+github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
+github.com/mitchellh/go-testing-interface v1.0.0 h1:fzU/JVNcaqHQEcVFAKeR41fkiLdIPrefOvVG1VZ96U0=
+github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
 github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
 github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/IfikLNY=
+github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw=
+github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
+github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=
+github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
+github.com/pierrec/lz4 v2.5.2+incompatible h1:WCjObylUIOlKy/+7Abdn34TLIkXiA4UWUMhxq9m9ZXI=
+github.com/pierrec/lz4 v2.5.2+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
+github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
+github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
+github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
+github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
+github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk=
 github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc=
+github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
+go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
+go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
+go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
-golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 h1:/UOmuWzQfxxo9UtlXMwuQU8CMgg1eZXqTRwkSQJWKOI=
+golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
-golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1 h1:NusfzzA6yGQ+ua51ck7E3omNUX/JuqbFSaRGqU8CcLI=
 golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
+google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
+google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/grpc v1.41.0 h1:f+PlOh7QV4iIJkPrx5NQ7qaNGFQ3OTse67yaDHfju4E=
+google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/square/go-jose.v2 v2.5.1 h1:7odma5RETjNHWJnR32wx8t+Io4djHE1PqxCFx3iiZ2w=
+gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
diff --git a/api/auth/aws/aws.go b/api/auth/aws/aws.go
index f2aa9be1d00c4..44a4f6db1f584 100644
--- a/api/auth/aws/aws.go
+++ b/api/auth/aws/aws.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package aws
 
 import (
diff --git a/api/auth/aws/go.mod b/api/auth/aws/go.mod
index 86261e766a14b..6ccdb0f4e1dde 100644
--- a/api/auth/aws/go.mod
+++ b/api/auth/aws/go.mod
@@ -7,5 +7,5 @@ require (
 	github.com/hashicorp/go-hclog v0.16.2
 	github.com/hashicorp/go-secure-stdlib/awsutil v0.1.6
 	github.com/hashicorp/go-uuid v1.0.2
-	github.com/hashicorp/vault/api v1.9.2
+	github.com/hashicorp/vault/api v1.8.0
 )
diff --git a/api/auth/aws/go.sum b/api/auth/aws/go.sum
index 4d30b11ac2787..0d29275b814c1 100644
--- a/api/auth/aws/go.sum
+++ b/api/auth/aws/go.sum
@@ -1,60 +1,167 @@
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
+github.com/armon/go-metrics v0.3.9 h1:O2sNqxBdvq8Eq5xmzljcYzAORli6RWCvEym4cJf9m18=
+github.com/armon/go-metrics v0.3.9/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
+github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI=
+github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
 github.com/aws/aws-sdk-go v1.30.27 h1:9gPjZWVDSoQrBO2AvqrWObS6KAZByfEJxQoCYo4ZfK0=
 github.com/aws/aws-sdk-go v1.30.27/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
+github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
 github.com/cenkalti/backoff/v3 v3.0.0 h1:ske+9nBpD9qZsTBoF41nW5L+AIuFBKMeze18XQ3eG1c=
 github.com/cenkalti/backoff/v3 v3.0.0/go.mod h1:cIeZDE3IrqwwJl6VUwCN6trj1oXrTS4rc0ij+ULvLYs=
+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
+github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
+github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
+github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
+github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/evanphx/json-patch/v5 v5.5.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4=
 github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
-github.com/go-jose/go-jose/v3 v3.0.0 h1:s6rrhirfEP/CGIoc6p+PZAeogN2SxKav6Wp7+dyMWVo=
-github.com/go-jose/go-jose/v3 v3.0.0/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxFMht0mSX+u8=
+github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
+github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
+github.com/frankban/quicktest v1.10.0/go.mod h1:ui7WezCLWMWxVWr1GETZY3smRy0G4KWq9vcPtJmFl7Y=
+github.com/frankban/quicktest v1.13.0 h1:yNZif1OkDfNoDfb9zZa9aXIpejNR4F23Wely0c+Qdqk=
+github.com/frankban/quicktest v1.13.0/go.mod h1:qLE0fzW0VuyUAJgPU19zByoIr0HtCHN/r/VLSOOIySU=
+github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
+github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-ldap/ldap/v3 v3.1.10/go.mod h1:5Zun81jBTabRaI8lzN7E1JjyEl1g6zI6u9pd8luAK4Q=
+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-test/deep v1.0.2 h1:onZX1rnHT3Wv6cqNgYyFOOlgVKJrksuCMCRvJStbMYw=
 github.com/go-test/deep v1.0.2/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
+github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
+github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
-github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
+github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
 github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
+github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
 github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
 github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
+github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
 github.com/hashicorp/go-hclog v0.16.2 h1:K4ev2ib4LdQETX5cSZBG0DVLk1jwGqSPXBjdah3veNs=
 github.com/hashicorp/go-hclog v0.16.2/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
+github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
+github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc=
+github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
+github.com/hashicorp/go-kms-wrapping/entropy/v2 v2.0.0/go.mod h1:xvb32K2keAc+R8DSFG2IwDcydK9DBQE+fGA5fsw6hSk=
 github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
 github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
+github.com/hashicorp/go-plugin v1.4.3 h1:DXmvivbWD5qdiBts9TpBC7BYL1Aia5sxbRgQB+v6UZM=
+github.com/hashicorp/go-plugin v1.4.3/go.mod h1:5fGEH17QVwTTcR0zV7yhDPLLmFX9YSZ38b18Udy6vYQ=
+github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
 github.com/hashicorp/go-retryablehttp v0.6.6 h1:HJunrbHTDDbBb/ay4kxa1n+dLmttUlnP3V9oNE4hmsM=
 github.com/hashicorp/go-retryablehttp v0.6.6/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
 github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc=
 github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
 github.com/hashicorp/go-secure-stdlib/awsutil v0.1.6 h1:W9WN8p6moV1fjKLkeqEgkAMu5rauy9QeYDAmIaPuuiA=
 github.com/hashicorp/go-secure-stdlib/awsutil v0.1.6/go.mod h1:MpCPSPGLDILGb4JMm94/mMi3YysIqsXzGCzkEZjcjXg=
+github.com/hashicorp/go-secure-stdlib/base62 v0.1.1/go.mod h1:EdWO6czbmthiwZ3/PUsDV+UD1D5IRU4ActiaWGwt0Yw=
+github.com/hashicorp/go-secure-stdlib/mlock v0.1.1 h1:cCRo8gK7oq6A2L6LICkUZ+/a5rLiRXFMf1Qd4xSwxTc=
+github.com/hashicorp/go-secure-stdlib/mlock v0.1.1/go.mod h1:zq93CJChV6L9QTfGKtfBxKqD7BqqXx5O04A/ns2p5+I=
+github.com/hashicorp/go-secure-stdlib/parseutil v0.1.1/go.mod h1:QmrqtbKuxxSWTN3ETMPuB+VtEiBJ/A9XhoYGv8E1uD8=
 github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6 h1:om4Al8Oy7kCm/B86rLCLah4Dt5Aa0Fr5rYBG60OzwHQ=
 github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6/go.mod h1:QmrqtbKuxxSWTN3ETMPuB+VtEiBJ/A9XhoYGv8E1uD8=
+github.com/hashicorp/go-secure-stdlib/password v0.1.1/go.mod h1:9hH302QllNwu1o2TGYtSk8I8kTAN0ca1EHpwhm5Mmzo=
 github.com/hashicorp/go-secure-stdlib/strutil v0.1.1/go.mod h1:gKOamz3EwoIoJq7mlMIRBpVTAUn8qPCrEclOKKWhD3U=
 github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 h1:kes8mmyCpxJsI7FTwtzRqEy9CdjCtrXrXGuOpxEA7Ts=
 github.com/hashicorp/go-secure-stdlib/strutil v0.1.2/go.mod h1:Gou2R9+il93BqX25LAKCLuM+y9U2T4hlwvT1yprcna4=
+github.com/hashicorp/go-secure-stdlib/tlsutil v0.1.1/go.mod h1:l8slYwnJA26yBz+ErHpp2IRCLr0vuOMGBORIz4rRiAs=
 github.com/hashicorp/go-sockaddr v1.0.2 h1:ztczhD1jLxIRjVejw8gFomI1BQZOe2WoVOu0SyteCQc=
 github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A=
+github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE=
 github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/go-version v1.2.0 h1:3vNe/fWF5CBgRIguda1meWhsZHy3m8gCJ5wx+dIzX/E=
+github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
+github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
+github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
-github.com/hashicorp/vault/api v1.9.2 h1:YjkZLJ7K3inKgMZ0wzCU9OHqc+UqMQyXsPXnf3Cl2as=
-github.com/hashicorp/vault/api v1.9.2/go.mod h1:jo5Y/ET+hNyz+JnKDt8XLAdKs+AM0G5W0Vp1IrFI8N8=
+github.com/hashicorp/vault/api v1.8.0 h1:7765sW1XBt+qf4XKIYE4ebY9qc/yi9V2/egzGSUNMZU=
+github.com/hashicorp/vault/api v1.8.0/go.mod h1:uJrw6D3y9Rv7hhmS17JQC50jbPDAZdjZoTtrCCxxs7E=
+github.com/hashicorp/vault/sdk v0.6.0 h1:6Z+In5DXHiUfZvIZdMx7e2loL1PPyDjA4bVh9ZTIAhs=
+github.com/hashicorp/vault/sdk v0.6.0/go.mod h1:+DRpzoXIdMvKc88R4qxr+edwy/RvH5QK8itmxLiDHLc=
+github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb h1:b5rjCoWHc7eqmAS4/qyk21ZsHyb6Mxv/jykxvNTkU4M=
+github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
+github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
+github.com/jhump/protoreflect v1.6.0 h1:h5jfMVslIg6l29nsMs0D8Wj17RDVdNYti0vDN/PZZoE=
+github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74=
 github.com/jmespath/go-jmespath v0.3.0 h1:OS12ieG61fsCg5+qLJ+SsW9NicxNkg3b25OyT2yCeUc=
 github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik=
+github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
 github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
@@ -65,78 +172,177 @@ github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd
 github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
 github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
+github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ=
+github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
+github.com/mitchellh/go-testing-interface v1.0.0 h1:fzU/JVNcaqHQEcVFAKeR41fkiLdIPrefOvVG1VZ96U0=
+github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
 github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
 github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/IfikLNY=
+github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw=
+github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
+github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=
+github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
+github.com/pierrec/lz4 v2.5.2+incompatible h1:WCjObylUIOlKy/+7Abdn34TLIkXiA4UWUMhxq9m9ZXI=
+github.com/pierrec/lz4 v2.5.2+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
+github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
+github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
+github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
+github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
+github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
+github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k=
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk=
 github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc=
+github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
+go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
+go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
+go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
-golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 h1:/UOmuWzQfxxo9UtlXMwuQU8CMgg1eZXqTRwkSQJWKOI=
+golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
-golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1 h1:NusfzzA6yGQ+ua51ck7E3omNUX/JuqbFSaRGqU8CcLI=
 golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
+google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
+google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/grpc v1.41.0 h1:f+PlOh7QV4iIJkPrx5NQ7qaNGFQ3OTse67yaDHfju4E=
+google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
+gopkg.in/square/go-jose.v2 v2.5.1 h1:7odma5RETjNHWJnR32wx8t+Io4djHE1PqxCFx3iiZ2w=
+gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
diff --git a/api/auth/azure/azure.go b/api/auth/azure/azure.go
index b682195701150..a09d15a147214 100644
--- a/api/auth/azure/azure.go
+++ b/api/auth/azure/azure.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package azure
 
 import (
diff --git a/api/auth/azure/go.mod b/api/auth/azure/go.mod
index 3a192f3e06263..becdcd90e12a0 100644
--- a/api/auth/azure/go.mod
+++ b/api/auth/azure/go.mod
@@ -2,4 +2,4 @@ module github.com/hashicorp/vault/api/auth/azure
 
 go 1.16
 
-require github.com/hashicorp/vault/api v1.9.2
+require github.com/hashicorp/vault/api v1.8.0
diff --git a/api/auth/azure/go.sum b/api/auth/azure/go.sum
index dfd66b2ccb247..c7835a3bf723f 100644
--- a/api/auth/azure/go.sum
+++ b/api/auth/azure/go.sum
@@ -1,46 +1,160 @@
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
+github.com/armon/go-metrics v0.3.9 h1:O2sNqxBdvq8Eq5xmzljcYzAORli6RWCvEym4cJf9m18=
+github.com/armon/go-metrics v0.3.9/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
+github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI=
+github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
+github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
 github.com/cenkalti/backoff/v3 v3.0.0 h1:ske+9nBpD9qZsTBoF41nW5L+AIuFBKMeze18XQ3eG1c=
 github.com/cenkalti/backoff/v3 v3.0.0/go.mod h1:cIeZDE3IrqwwJl6VUwCN6trj1oXrTS4rc0ij+ULvLYs=
+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
+github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
+github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
+github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
+github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/evanphx/json-patch/v5 v5.5.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4=
 github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
-github.com/go-jose/go-jose/v3 v3.0.0 h1:s6rrhirfEP/CGIoc6p+PZAeogN2SxKav6Wp7+dyMWVo=
-github.com/go-jose/go-jose/v3 v3.0.0/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxFMht0mSX+u8=
+github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
+github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
+github.com/frankban/quicktest v1.10.0/go.mod h1:ui7WezCLWMWxVWr1GETZY3smRy0G4KWq9vcPtJmFl7Y=
+github.com/frankban/quicktest v1.13.0 h1:yNZif1OkDfNoDfb9zZa9aXIpejNR4F23Wely0c+Qdqk=
+github.com/frankban/quicktest v1.13.0/go.mod h1:qLE0fzW0VuyUAJgPU19zByoIr0HtCHN/r/VLSOOIySU=
+github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
+github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-ldap/ldap/v3 v3.1.10/go.mod h1:5Zun81jBTabRaI8lzN7E1JjyEl1g6zI6u9pd8luAK4Q=
+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-test/deep v1.0.2 h1:onZX1rnHT3Wv6cqNgYyFOOlgVKJrksuCMCRvJStbMYw=
 github.com/go-test/deep v1.0.2/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
+github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
+github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
-github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
+github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
 github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
+github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
 github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
 github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
+github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
 github.com/hashicorp/go-hclog v0.16.2 h1:K4ev2ib4LdQETX5cSZBG0DVLk1jwGqSPXBjdah3veNs=
 github.com/hashicorp/go-hclog v0.16.2/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
+github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
+github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc=
+github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
+github.com/hashicorp/go-kms-wrapping/entropy/v2 v2.0.0/go.mod h1:xvb32K2keAc+R8DSFG2IwDcydK9DBQE+fGA5fsw6hSk=
 github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
 github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
+github.com/hashicorp/go-plugin v1.4.3 h1:DXmvivbWD5qdiBts9TpBC7BYL1Aia5sxbRgQB+v6UZM=
+github.com/hashicorp/go-plugin v1.4.3/go.mod h1:5fGEH17QVwTTcR0zV7yhDPLLmFX9YSZ38b18Udy6vYQ=
+github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
 github.com/hashicorp/go-retryablehttp v0.6.6 h1:HJunrbHTDDbBb/ay4kxa1n+dLmttUlnP3V9oNE4hmsM=
 github.com/hashicorp/go-retryablehttp v0.6.6/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
 github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc=
 github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
+github.com/hashicorp/go-secure-stdlib/base62 v0.1.1/go.mod h1:EdWO6czbmthiwZ3/PUsDV+UD1D5IRU4ActiaWGwt0Yw=
+github.com/hashicorp/go-secure-stdlib/mlock v0.1.1 h1:cCRo8gK7oq6A2L6LICkUZ+/a5rLiRXFMf1Qd4xSwxTc=
+github.com/hashicorp/go-secure-stdlib/mlock v0.1.1/go.mod h1:zq93CJChV6L9QTfGKtfBxKqD7BqqXx5O04A/ns2p5+I=
+github.com/hashicorp/go-secure-stdlib/parseutil v0.1.1/go.mod h1:QmrqtbKuxxSWTN3ETMPuB+VtEiBJ/A9XhoYGv8E1uD8=
 github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6 h1:om4Al8Oy7kCm/B86rLCLah4Dt5Aa0Fr5rYBG60OzwHQ=
 github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6/go.mod h1:QmrqtbKuxxSWTN3ETMPuB+VtEiBJ/A9XhoYGv8E1uD8=
+github.com/hashicorp/go-secure-stdlib/password v0.1.1/go.mod h1:9hH302QllNwu1o2TGYtSk8I8kTAN0ca1EHpwhm5Mmzo=
 github.com/hashicorp/go-secure-stdlib/strutil v0.1.1/go.mod h1:gKOamz3EwoIoJq7mlMIRBpVTAUn8qPCrEclOKKWhD3U=
 github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 h1:kes8mmyCpxJsI7FTwtzRqEy9CdjCtrXrXGuOpxEA7Ts=
 github.com/hashicorp/go-secure-stdlib/strutil v0.1.2/go.mod h1:Gou2R9+il93BqX25LAKCLuM+y9U2T4hlwvT1yprcna4=
+github.com/hashicorp/go-secure-stdlib/tlsutil v0.1.1/go.mod h1:l8slYwnJA26yBz+ErHpp2IRCLr0vuOMGBORIz4rRiAs=
 github.com/hashicorp/go-sockaddr v1.0.2 h1:ztczhD1jLxIRjVejw8gFomI1BQZOe2WoVOu0SyteCQc=
 github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A=
+github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE=
+github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/go-version v1.2.0 h1:3vNe/fWF5CBgRIguda1meWhsZHy3m8gCJ5wx+dIzX/E=
+github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
+github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
+github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
-github.com/hashicorp/vault/api v1.9.2 h1:YjkZLJ7K3inKgMZ0wzCU9OHqc+UqMQyXsPXnf3Cl2as=
-github.com/hashicorp/vault/api v1.9.2/go.mod h1:jo5Y/ET+hNyz+JnKDt8XLAdKs+AM0G5W0Vp1IrFI8N8=
+github.com/hashicorp/vault/api v1.8.0 h1:7765sW1XBt+qf4XKIYE4ebY9qc/yi9V2/egzGSUNMZU=
+github.com/hashicorp/vault/api v1.8.0/go.mod h1:uJrw6D3y9Rv7hhmS17JQC50jbPDAZdjZoTtrCCxxs7E=
+github.com/hashicorp/vault/sdk v0.6.0 h1:6Z+In5DXHiUfZvIZdMx7e2loL1PPyDjA4bVh9ZTIAhs=
+github.com/hashicorp/vault/sdk v0.6.0/go.mod h1:+DRpzoXIdMvKc88R4qxr+edwy/RvH5QK8itmxLiDHLc=
+github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb h1:b5rjCoWHc7eqmAS4/qyk21ZsHyb6Mxv/jykxvNTkU4M=
+github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
+github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
+github.com/jhump/protoreflect v1.6.0 h1:h5jfMVslIg6l29nsMs0D8Wj17RDVdNYti0vDN/PZZoE=
+github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74=
+github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.6 h1:6Su7aK7lXmJ/U79bYtBjLNaha4Fs1Rg9plHpcH+vvnE=
@@ -50,68 +164,169 @@ github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd
 github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
 github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
+github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ=
+github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
+github.com/mitchellh/go-testing-interface v1.0.0 h1:fzU/JVNcaqHQEcVFAKeR41fkiLdIPrefOvVG1VZ96U0=
+github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
 github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
 github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/IfikLNY=
+github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw=
+github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
+github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=
+github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
+github.com/pierrec/lz4 v2.5.2+incompatible h1:WCjObylUIOlKy/+7Abdn34TLIkXiA4UWUMhxq9m9ZXI=
+github.com/pierrec/lz4 v2.5.2+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
+github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
+github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
+github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
+github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
+github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk=
 github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc=
+github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
+go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
+go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
+go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
-golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 h1:/UOmuWzQfxxo9UtlXMwuQU8CMgg1eZXqTRwkSQJWKOI=
+golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
-golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1 h1:NusfzzA6yGQ+ua51ck7E3omNUX/JuqbFSaRGqU8CcLI=
 golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
+google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
+google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/grpc v1.41.0 h1:f+PlOh7QV4iIJkPrx5NQ7qaNGFQ3OTse67yaDHfju4E=
+google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/square/go-jose.v2 v2.5.1 h1:7odma5RETjNHWJnR32wx8t+Io4djHE1PqxCFx3iiZ2w=
+gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
diff --git a/api/auth/gcp/gcp.go b/api/auth/gcp/gcp.go
index 2d6ef842a4b43..a5dd936461281 100644
--- a/api/auth/gcp/gcp.go
+++ b/api/auth/gcp/gcp.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package gcp
 
 import (
diff --git a/api/auth/gcp/go.mod b/api/auth/gcp/go.mod
index 7509753daf55e..cb122ae9cfe30 100644
--- a/api/auth/gcp/go.mod
+++ b/api/auth/gcp/go.mod
@@ -4,7 +4,6 @@ go 1.16
 
 require (
 	cloud.google.com/go v0.97.0
-	github.com/hashicorp/vault/api v1.9.2
+	github.com/hashicorp/vault/api v1.8.0
 	google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0
-	google.golang.org/grpc v1.41.0 // indirect
 )
diff --git a/api/auth/gcp/go.sum b/api/auth/gcp/go.sum
index 35da60ad89ecb..a9fda24c58efb 100644
--- a/api/auth/gcp/go.sum
+++ b/api/auth/gcp/go.sum
@@ -46,9 +46,21 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
+github.com/armon/go-metrics v0.3.9 h1:O2sNqxBdvq8Eq5xmzljcYzAORli6RWCvEym4cJf9m18=
+github.com/armon/go-metrics v0.3.9/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
+github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI=
+github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
+github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
 github.com/cenkalti/backoff/v3 v3.0.0 h1:ske+9nBpD9qZsTBoF41nW5L+AIuFBKMeze18XQ3eG1c=
 github.com/cenkalti/backoff/v3 v3.0.0/go.mod h1:cIeZDE3IrqwwJl6VUwCN6trj1oXrTS4rc0ij+ULvLYs=
@@ -58,12 +70,15 @@ github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
+github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
+github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -76,16 +91,28 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.m
 github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
 github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/evanphx/json-patch/v5 v5.5.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4=
 github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
+github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
+github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
+github.com/frankban/quicktest v1.10.0/go.mod h1:ui7WezCLWMWxVWr1GETZY3smRy0G4KWq9vcPtJmFl7Y=
+github.com/frankban/quicktest v1.13.0 h1:yNZif1OkDfNoDfb9zZa9aXIpejNR4F23Wely0c+Qdqk=
+github.com/frankban/quicktest v1.13.0/go.mod h1:qLE0fzW0VuyUAJgPU19zByoIr0HtCHN/r/VLSOOIySU=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
-github.com/go-jose/go-jose/v3 v3.0.0 h1:s6rrhirfEP/CGIoc6p+PZAeogN2SxKav6Wp7+dyMWVo=
-github.com/go-jose/go-jose/v3 v3.0.0/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxFMht0mSX+u8=
+github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-ldap/ldap/v3 v3.1.10/go.mod h1:5Zun81jBTabRaI8lzN7E1JjyEl1g6zI6u9pd8luAK4Q=
+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-test/deep v1.0.2 h1:onZX1rnHT3Wv6cqNgYyFOOlgVKJrksuCMCRvJStbMYw=
 github.com/go-test/deep v1.0.2/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
+github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -119,6 +146,8 @@ github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx
 github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
+github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
@@ -132,9 +161,9 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
-github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
 github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
@@ -163,40 +192,79 @@ github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFb
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
 github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
+github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
 github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
 github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
+github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
 github.com/hashicorp/go-hclog v0.16.2 h1:K4ev2ib4LdQETX5cSZBG0DVLk1jwGqSPXBjdah3veNs=
 github.com/hashicorp/go-hclog v0.16.2/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
+github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
+github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc=
+github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
+github.com/hashicorp/go-kms-wrapping/entropy/v2 v2.0.0/go.mod h1:xvb32K2keAc+R8DSFG2IwDcydK9DBQE+fGA5fsw6hSk=
 github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
 github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
+github.com/hashicorp/go-plugin v1.4.3 h1:DXmvivbWD5qdiBts9TpBC7BYL1Aia5sxbRgQB+v6UZM=
+github.com/hashicorp/go-plugin v1.4.3/go.mod h1:5fGEH17QVwTTcR0zV7yhDPLLmFX9YSZ38b18Udy6vYQ=
+github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
 github.com/hashicorp/go-retryablehttp v0.6.6 h1:HJunrbHTDDbBb/ay4kxa1n+dLmttUlnP3V9oNE4hmsM=
 github.com/hashicorp/go-retryablehttp v0.6.6/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
 github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc=
 github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
+github.com/hashicorp/go-secure-stdlib/base62 v0.1.1/go.mod h1:EdWO6czbmthiwZ3/PUsDV+UD1D5IRU4ActiaWGwt0Yw=
+github.com/hashicorp/go-secure-stdlib/mlock v0.1.1 h1:cCRo8gK7oq6A2L6LICkUZ+/a5rLiRXFMf1Qd4xSwxTc=
+github.com/hashicorp/go-secure-stdlib/mlock v0.1.1/go.mod h1:zq93CJChV6L9QTfGKtfBxKqD7BqqXx5O04A/ns2p5+I=
+github.com/hashicorp/go-secure-stdlib/parseutil v0.1.1/go.mod h1:QmrqtbKuxxSWTN3ETMPuB+VtEiBJ/A9XhoYGv8E1uD8=
 github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6 h1:om4Al8Oy7kCm/B86rLCLah4Dt5Aa0Fr5rYBG60OzwHQ=
 github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6/go.mod h1:QmrqtbKuxxSWTN3ETMPuB+VtEiBJ/A9XhoYGv8E1uD8=
+github.com/hashicorp/go-secure-stdlib/password v0.1.1/go.mod h1:9hH302QllNwu1o2TGYtSk8I8kTAN0ca1EHpwhm5Mmzo=
 github.com/hashicorp/go-secure-stdlib/strutil v0.1.1/go.mod h1:gKOamz3EwoIoJq7mlMIRBpVTAUn8qPCrEclOKKWhD3U=
 github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 h1:kes8mmyCpxJsI7FTwtzRqEy9CdjCtrXrXGuOpxEA7Ts=
 github.com/hashicorp/go-secure-stdlib/strutil v0.1.2/go.mod h1:Gou2R9+il93BqX25LAKCLuM+y9U2T4hlwvT1yprcna4=
+github.com/hashicorp/go-secure-stdlib/tlsutil v0.1.1/go.mod h1:l8slYwnJA26yBz+ErHpp2IRCLr0vuOMGBORIz4rRiAs=
 github.com/hashicorp/go-sockaddr v1.0.2 h1:ztczhD1jLxIRjVejw8gFomI1BQZOe2WoVOu0SyteCQc=
 github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A=
+github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE=
+github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/go-version v1.2.0 h1:3vNe/fWF5CBgRIguda1meWhsZHy3m8gCJ5wx+dIzX/E=
+github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
+github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
-github.com/hashicorp/vault/api v1.9.2 h1:YjkZLJ7K3inKgMZ0wzCU9OHqc+UqMQyXsPXnf3Cl2as=
-github.com/hashicorp/vault/api v1.9.2/go.mod h1:jo5Y/ET+hNyz+JnKDt8XLAdKs+AM0G5W0Vp1IrFI8N8=
+github.com/hashicorp/vault/api v1.8.0 h1:7765sW1XBt+qf4XKIYE4ebY9qc/yi9V2/egzGSUNMZU=
+github.com/hashicorp/vault/api v1.8.0/go.mod h1:uJrw6D3y9Rv7hhmS17JQC50jbPDAZdjZoTtrCCxxs7E=
+github.com/hashicorp/vault/sdk v0.6.0 h1:6Z+In5DXHiUfZvIZdMx7e2loL1PPyDjA4bVh9ZTIAhs=
+github.com/hashicorp/vault/sdk v0.6.0/go.mod h1:+DRpzoXIdMvKc88R4qxr+edwy/RvH5QK8itmxLiDHLc=
+github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb h1:b5rjCoWHc7eqmAS4/qyk21ZsHyb6Mxv/jykxvNTkU4M=
+github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
+github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
+github.com/jhump/protoreflect v1.6.0 h1:h5jfMVslIg6l29nsMs0D8Wj17RDVdNYti0vDN/PZZoE=
+github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74=
+github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
+github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.6 h1:6Su7aK7lXmJ/U79bYtBjLNaha4Fs1Rg9plHpcH+vvnE=
@@ -206,36 +274,74 @@ github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd
 github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
 github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
+github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ=
+github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
+github.com/mitchellh/go-testing-interface v1.0.0 h1:fzU/JVNcaqHQEcVFAKeR41fkiLdIPrefOvVG1VZ96U0=
+github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
 github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
 github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/IfikLNY=
+github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw=
+github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
+github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=
+github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
+github.com/pierrec/lz4 v2.5.2+incompatible h1:WCjObylUIOlKy/+7Abdn34TLIkXiA4UWUMhxq9m9ZXI=
+github.com/pierrec/lz4 v2.5.2+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
+github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
+github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
+github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
+github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk=
 github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc=
+github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
@@ -245,15 +351,16 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
+go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
+go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
-golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
+golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 h1:/UOmuWzQfxxo9UtlXMwuQU8CMgg1eZXqTRwkSQJWKOI=
+golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -289,9 +396,10 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -299,6 +407,7 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
+golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -324,11 +433,8 @@ golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
+golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420 h1:a8jGStKg0XqKDlKqjLrXn0ioF5MH36pT7Z0BRTqLhbk=
 golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
-golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -356,13 +462,15 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -406,14 +514,9 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365 h1:6wSTsvPddg9gc/mVEEyk9oOAoxn+bT4Z9q1zx+4RwA4=
 golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -421,10 +524,8 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -481,7 +582,6 @@ golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -524,6 +624,7 @@ google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
 google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
@@ -580,6 +681,7 @@ google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEc
 google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
 google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0 h1:5Tbluzus3QxoAJx4IefGt1W0HQZW4nuMrVk684jI74Q=
 google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
@@ -622,11 +724,18 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
+gopkg.in/square/go-jose.v2 v2.5.1 h1:7odma5RETjNHWJnR32wx8t+Io4djHE1PqxCFx3iiZ2w=
+gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
diff --git a/api/auth/kubernetes/go.mod b/api/auth/kubernetes/go.mod
index 107628276e5d8..0faeebfcc91aa 100644
--- a/api/auth/kubernetes/go.mod
+++ b/api/auth/kubernetes/go.mod
@@ -2,4 +2,4 @@ module github.com/hashicorp/vault/api/auth/kubernetes
 
 go 1.16
 
-require github.com/hashicorp/vault/api v1.9.2
+require github.com/hashicorp/vault/api v1.8.0
diff --git a/api/auth/kubernetes/go.sum b/api/auth/kubernetes/go.sum
index dfd66b2ccb247..c7835a3bf723f 100644
--- a/api/auth/kubernetes/go.sum
+++ b/api/auth/kubernetes/go.sum
@@ -1,46 +1,160 @@
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
+github.com/armon/go-metrics v0.3.9 h1:O2sNqxBdvq8Eq5xmzljcYzAORli6RWCvEym4cJf9m18=
+github.com/armon/go-metrics v0.3.9/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
+github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI=
+github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
+github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
 github.com/cenkalti/backoff/v3 v3.0.0 h1:ske+9nBpD9qZsTBoF41nW5L+AIuFBKMeze18XQ3eG1c=
 github.com/cenkalti/backoff/v3 v3.0.0/go.mod h1:cIeZDE3IrqwwJl6VUwCN6trj1oXrTS4rc0ij+ULvLYs=
+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
+github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
+github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
+github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
+github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/evanphx/json-patch/v5 v5.5.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4=
 github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
-github.com/go-jose/go-jose/v3 v3.0.0 h1:s6rrhirfEP/CGIoc6p+PZAeogN2SxKav6Wp7+dyMWVo=
-github.com/go-jose/go-jose/v3 v3.0.0/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxFMht0mSX+u8=
+github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
+github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
+github.com/frankban/quicktest v1.10.0/go.mod h1:ui7WezCLWMWxVWr1GETZY3smRy0G4KWq9vcPtJmFl7Y=
+github.com/frankban/quicktest v1.13.0 h1:yNZif1OkDfNoDfb9zZa9aXIpejNR4F23Wely0c+Qdqk=
+github.com/frankban/quicktest v1.13.0/go.mod h1:qLE0fzW0VuyUAJgPU19zByoIr0HtCHN/r/VLSOOIySU=
+github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
+github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-ldap/ldap/v3 v3.1.10/go.mod h1:5Zun81jBTabRaI8lzN7E1JjyEl1g6zI6u9pd8luAK4Q=
+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-test/deep v1.0.2 h1:onZX1rnHT3Wv6cqNgYyFOOlgVKJrksuCMCRvJStbMYw=
 github.com/go-test/deep v1.0.2/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
+github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
+github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
-github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
+github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
 github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
+github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
 github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
 github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
+github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
 github.com/hashicorp/go-hclog v0.16.2 h1:K4ev2ib4LdQETX5cSZBG0DVLk1jwGqSPXBjdah3veNs=
 github.com/hashicorp/go-hclog v0.16.2/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
+github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
+github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc=
+github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
+github.com/hashicorp/go-kms-wrapping/entropy/v2 v2.0.0/go.mod h1:xvb32K2keAc+R8DSFG2IwDcydK9DBQE+fGA5fsw6hSk=
 github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
 github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
+github.com/hashicorp/go-plugin v1.4.3 h1:DXmvivbWD5qdiBts9TpBC7BYL1Aia5sxbRgQB+v6UZM=
+github.com/hashicorp/go-plugin v1.4.3/go.mod h1:5fGEH17QVwTTcR0zV7yhDPLLmFX9YSZ38b18Udy6vYQ=
+github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
 github.com/hashicorp/go-retryablehttp v0.6.6 h1:HJunrbHTDDbBb/ay4kxa1n+dLmttUlnP3V9oNE4hmsM=
 github.com/hashicorp/go-retryablehttp v0.6.6/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
 github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc=
 github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
+github.com/hashicorp/go-secure-stdlib/base62 v0.1.1/go.mod h1:EdWO6czbmthiwZ3/PUsDV+UD1D5IRU4ActiaWGwt0Yw=
+github.com/hashicorp/go-secure-stdlib/mlock v0.1.1 h1:cCRo8gK7oq6A2L6LICkUZ+/a5rLiRXFMf1Qd4xSwxTc=
+github.com/hashicorp/go-secure-stdlib/mlock v0.1.1/go.mod h1:zq93CJChV6L9QTfGKtfBxKqD7BqqXx5O04A/ns2p5+I=
+github.com/hashicorp/go-secure-stdlib/parseutil v0.1.1/go.mod h1:QmrqtbKuxxSWTN3ETMPuB+VtEiBJ/A9XhoYGv8E1uD8=
 github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6 h1:om4Al8Oy7kCm/B86rLCLah4Dt5Aa0Fr5rYBG60OzwHQ=
 github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6/go.mod h1:QmrqtbKuxxSWTN3ETMPuB+VtEiBJ/A9XhoYGv8E1uD8=
+github.com/hashicorp/go-secure-stdlib/password v0.1.1/go.mod h1:9hH302QllNwu1o2TGYtSk8I8kTAN0ca1EHpwhm5Mmzo=
 github.com/hashicorp/go-secure-stdlib/strutil v0.1.1/go.mod h1:gKOamz3EwoIoJq7mlMIRBpVTAUn8qPCrEclOKKWhD3U=
 github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 h1:kes8mmyCpxJsI7FTwtzRqEy9CdjCtrXrXGuOpxEA7Ts=
 github.com/hashicorp/go-secure-stdlib/strutil v0.1.2/go.mod h1:Gou2R9+il93BqX25LAKCLuM+y9U2T4hlwvT1yprcna4=
+github.com/hashicorp/go-secure-stdlib/tlsutil v0.1.1/go.mod h1:l8slYwnJA26yBz+ErHpp2IRCLr0vuOMGBORIz4rRiAs=
 github.com/hashicorp/go-sockaddr v1.0.2 h1:ztczhD1jLxIRjVejw8gFomI1BQZOe2WoVOu0SyteCQc=
 github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A=
+github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE=
+github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/go-version v1.2.0 h1:3vNe/fWF5CBgRIguda1meWhsZHy3m8gCJ5wx+dIzX/E=
+github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
+github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
+github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
-github.com/hashicorp/vault/api v1.9.2 h1:YjkZLJ7K3inKgMZ0wzCU9OHqc+UqMQyXsPXnf3Cl2as=
-github.com/hashicorp/vault/api v1.9.2/go.mod h1:jo5Y/ET+hNyz+JnKDt8XLAdKs+AM0G5W0Vp1IrFI8N8=
+github.com/hashicorp/vault/api v1.8.0 h1:7765sW1XBt+qf4XKIYE4ebY9qc/yi9V2/egzGSUNMZU=
+github.com/hashicorp/vault/api v1.8.0/go.mod h1:uJrw6D3y9Rv7hhmS17JQC50jbPDAZdjZoTtrCCxxs7E=
+github.com/hashicorp/vault/sdk v0.6.0 h1:6Z+In5DXHiUfZvIZdMx7e2loL1PPyDjA4bVh9ZTIAhs=
+github.com/hashicorp/vault/sdk v0.6.0/go.mod h1:+DRpzoXIdMvKc88R4qxr+edwy/RvH5QK8itmxLiDHLc=
+github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb h1:b5rjCoWHc7eqmAS4/qyk21ZsHyb6Mxv/jykxvNTkU4M=
+github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
+github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
+github.com/jhump/protoreflect v1.6.0 h1:h5jfMVslIg6l29nsMs0D8Wj17RDVdNYti0vDN/PZZoE=
+github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74=
+github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.6 h1:6Su7aK7lXmJ/U79bYtBjLNaha4Fs1Rg9plHpcH+vvnE=
@@ -50,68 +164,169 @@ github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd
 github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
 github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
+github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ=
+github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
+github.com/mitchellh/go-testing-interface v1.0.0 h1:fzU/JVNcaqHQEcVFAKeR41fkiLdIPrefOvVG1VZ96U0=
+github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
 github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
 github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/IfikLNY=
+github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw=
+github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
+github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=
+github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
+github.com/pierrec/lz4 v2.5.2+incompatible h1:WCjObylUIOlKy/+7Abdn34TLIkXiA4UWUMhxq9m9ZXI=
+github.com/pierrec/lz4 v2.5.2+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
+github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
+github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
+github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
+github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
+github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk=
 github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc=
+github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
+go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
+go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
+go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
-golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 h1:/UOmuWzQfxxo9UtlXMwuQU8CMgg1eZXqTRwkSQJWKOI=
+golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
-golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1 h1:NusfzzA6yGQ+ua51ck7E3omNUX/JuqbFSaRGqU8CcLI=
 golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
+google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
+google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/grpc v1.41.0 h1:f+PlOh7QV4iIJkPrx5NQ7qaNGFQ3OTse67yaDHfju4E=
+google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/square/go-jose.v2 v2.5.1 h1:7odma5RETjNHWJnR32wx8t+Io4djHE1PqxCFx3iiZ2w=
+gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
diff --git a/api/auth/kubernetes/kubernetes.go b/api/auth/kubernetes/kubernetes.go
index f0e38c17a2b47..c2fef86a5fd0e 100644
--- a/api/auth/kubernetes/kubernetes.go
+++ b/api/auth/kubernetes/kubernetes.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package kubernetes
 
 import (
diff --git a/api/auth/ldap/go.mod b/api/auth/ldap/go.mod
index 4bfa972ebf0fb..15b683c2696ab 100644
--- a/api/auth/ldap/go.mod
+++ b/api/auth/ldap/go.mod
@@ -2,4 +2,4 @@ module github.com/hashicorp/vault/api/auth/ldap
 
 go 1.16
 
-require github.com/hashicorp/vault/api v1.9.2
+require github.com/hashicorp/vault/api v1.8.0
diff --git a/api/auth/ldap/go.sum b/api/auth/ldap/go.sum
index dfd66b2ccb247..c7835a3bf723f 100644
--- a/api/auth/ldap/go.sum
+++ b/api/auth/ldap/go.sum
@@ -1,46 +1,160 @@
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
+github.com/armon/go-metrics v0.3.9 h1:O2sNqxBdvq8Eq5xmzljcYzAORli6RWCvEym4cJf9m18=
+github.com/armon/go-metrics v0.3.9/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
+github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI=
+github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
+github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
 github.com/cenkalti/backoff/v3 v3.0.0 h1:ske+9nBpD9qZsTBoF41nW5L+AIuFBKMeze18XQ3eG1c=
 github.com/cenkalti/backoff/v3 v3.0.0/go.mod h1:cIeZDE3IrqwwJl6VUwCN6trj1oXrTS4rc0ij+ULvLYs=
+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
+github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
+github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
+github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
+github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/evanphx/json-patch/v5 v5.5.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4=
 github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
-github.com/go-jose/go-jose/v3 v3.0.0 h1:s6rrhirfEP/CGIoc6p+PZAeogN2SxKav6Wp7+dyMWVo=
-github.com/go-jose/go-jose/v3 v3.0.0/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxFMht0mSX+u8=
+github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
+github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
+github.com/frankban/quicktest v1.10.0/go.mod h1:ui7WezCLWMWxVWr1GETZY3smRy0G4KWq9vcPtJmFl7Y=
+github.com/frankban/quicktest v1.13.0 h1:yNZif1OkDfNoDfb9zZa9aXIpejNR4F23Wely0c+Qdqk=
+github.com/frankban/quicktest v1.13.0/go.mod h1:qLE0fzW0VuyUAJgPU19zByoIr0HtCHN/r/VLSOOIySU=
+github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
+github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-ldap/ldap/v3 v3.1.10/go.mod h1:5Zun81jBTabRaI8lzN7E1JjyEl1g6zI6u9pd8luAK4Q=
+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-test/deep v1.0.2 h1:onZX1rnHT3Wv6cqNgYyFOOlgVKJrksuCMCRvJStbMYw=
 github.com/go-test/deep v1.0.2/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
+github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
+github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
-github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
+github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
 github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
+github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
 github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
 github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
+github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
 github.com/hashicorp/go-hclog v0.16.2 h1:K4ev2ib4LdQETX5cSZBG0DVLk1jwGqSPXBjdah3veNs=
 github.com/hashicorp/go-hclog v0.16.2/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
+github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
+github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc=
+github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
+github.com/hashicorp/go-kms-wrapping/entropy/v2 v2.0.0/go.mod h1:xvb32K2keAc+R8DSFG2IwDcydK9DBQE+fGA5fsw6hSk=
 github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
 github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
+github.com/hashicorp/go-plugin v1.4.3 h1:DXmvivbWD5qdiBts9TpBC7BYL1Aia5sxbRgQB+v6UZM=
+github.com/hashicorp/go-plugin v1.4.3/go.mod h1:5fGEH17QVwTTcR0zV7yhDPLLmFX9YSZ38b18Udy6vYQ=
+github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
 github.com/hashicorp/go-retryablehttp v0.6.6 h1:HJunrbHTDDbBb/ay4kxa1n+dLmttUlnP3V9oNE4hmsM=
 github.com/hashicorp/go-retryablehttp v0.6.6/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
 github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc=
 github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
+github.com/hashicorp/go-secure-stdlib/base62 v0.1.1/go.mod h1:EdWO6czbmthiwZ3/PUsDV+UD1D5IRU4ActiaWGwt0Yw=
+github.com/hashicorp/go-secure-stdlib/mlock v0.1.1 h1:cCRo8gK7oq6A2L6LICkUZ+/a5rLiRXFMf1Qd4xSwxTc=
+github.com/hashicorp/go-secure-stdlib/mlock v0.1.1/go.mod h1:zq93CJChV6L9QTfGKtfBxKqD7BqqXx5O04A/ns2p5+I=
+github.com/hashicorp/go-secure-stdlib/parseutil v0.1.1/go.mod h1:QmrqtbKuxxSWTN3ETMPuB+VtEiBJ/A9XhoYGv8E1uD8=
 github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6 h1:om4Al8Oy7kCm/B86rLCLah4Dt5Aa0Fr5rYBG60OzwHQ=
 github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6/go.mod h1:QmrqtbKuxxSWTN3ETMPuB+VtEiBJ/A9XhoYGv8E1uD8=
+github.com/hashicorp/go-secure-stdlib/password v0.1.1/go.mod h1:9hH302QllNwu1o2TGYtSk8I8kTAN0ca1EHpwhm5Mmzo=
 github.com/hashicorp/go-secure-stdlib/strutil v0.1.1/go.mod h1:gKOamz3EwoIoJq7mlMIRBpVTAUn8qPCrEclOKKWhD3U=
 github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 h1:kes8mmyCpxJsI7FTwtzRqEy9CdjCtrXrXGuOpxEA7Ts=
 github.com/hashicorp/go-secure-stdlib/strutil v0.1.2/go.mod h1:Gou2R9+il93BqX25LAKCLuM+y9U2T4hlwvT1yprcna4=
+github.com/hashicorp/go-secure-stdlib/tlsutil v0.1.1/go.mod h1:l8slYwnJA26yBz+ErHpp2IRCLr0vuOMGBORIz4rRiAs=
 github.com/hashicorp/go-sockaddr v1.0.2 h1:ztczhD1jLxIRjVejw8gFomI1BQZOe2WoVOu0SyteCQc=
 github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A=
+github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE=
+github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/go-version v1.2.0 h1:3vNe/fWF5CBgRIguda1meWhsZHy3m8gCJ5wx+dIzX/E=
+github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
+github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
+github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
-github.com/hashicorp/vault/api v1.9.2 h1:YjkZLJ7K3inKgMZ0wzCU9OHqc+UqMQyXsPXnf3Cl2as=
-github.com/hashicorp/vault/api v1.9.2/go.mod h1:jo5Y/ET+hNyz+JnKDt8XLAdKs+AM0G5W0Vp1IrFI8N8=
+github.com/hashicorp/vault/api v1.8.0 h1:7765sW1XBt+qf4XKIYE4ebY9qc/yi9V2/egzGSUNMZU=
+github.com/hashicorp/vault/api v1.8.0/go.mod h1:uJrw6D3y9Rv7hhmS17JQC50jbPDAZdjZoTtrCCxxs7E=
+github.com/hashicorp/vault/sdk v0.6.0 h1:6Z+In5DXHiUfZvIZdMx7e2loL1PPyDjA4bVh9ZTIAhs=
+github.com/hashicorp/vault/sdk v0.6.0/go.mod h1:+DRpzoXIdMvKc88R4qxr+edwy/RvH5QK8itmxLiDHLc=
+github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb h1:b5rjCoWHc7eqmAS4/qyk21ZsHyb6Mxv/jykxvNTkU4M=
+github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
+github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
+github.com/jhump/protoreflect v1.6.0 h1:h5jfMVslIg6l29nsMs0D8Wj17RDVdNYti0vDN/PZZoE=
+github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74=
+github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.6 h1:6Su7aK7lXmJ/U79bYtBjLNaha4Fs1Rg9plHpcH+vvnE=
@@ -50,68 +164,169 @@ github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd
 github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
 github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
+github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ=
+github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
+github.com/mitchellh/go-testing-interface v1.0.0 h1:fzU/JVNcaqHQEcVFAKeR41fkiLdIPrefOvVG1VZ96U0=
+github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
 github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
 github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/IfikLNY=
+github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw=
+github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
+github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=
+github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
+github.com/pierrec/lz4 v2.5.2+incompatible h1:WCjObylUIOlKy/+7Abdn34TLIkXiA4UWUMhxq9m9ZXI=
+github.com/pierrec/lz4 v2.5.2+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
+github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
+github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
+github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
+github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
+github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk=
 github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc=
+github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
+go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
+go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
+go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
-golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 h1:/UOmuWzQfxxo9UtlXMwuQU8CMgg1eZXqTRwkSQJWKOI=
+golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
-golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1 h1:NusfzzA6yGQ+ua51ck7E3omNUX/JuqbFSaRGqU8CcLI=
 golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
+google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
+google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/grpc v1.41.0 h1:f+PlOh7QV4iIJkPrx5NQ7qaNGFQ3OTse67yaDHfju4E=
+google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/square/go-jose.v2 v2.5.1 h1:7odma5RETjNHWJnR32wx8t+Io4djHE1PqxCFx3iiZ2w=
+gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
diff --git a/api/auth/ldap/ldap.go b/api/auth/ldap/ldap.go
index fdf1a38dd0c11..9f37abc664f7f 100644
--- a/api/auth/ldap/ldap.go
+++ b/api/auth/ldap/ldap.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package ldap
 
 import (
diff --git a/api/auth/ldap/ldap_test.go b/api/auth/ldap/ldap_test.go
index abdccb0358356..8633c4dfac116 100644
--- a/api/auth/ldap/ldap_test.go
+++ b/api/auth/ldap/ldap_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package ldap
 
 import (
diff --git a/api/auth/userpass/go.mod b/api/auth/userpass/go.mod
index 194bc6c952b71..5f907553bd35f 100644
--- a/api/auth/userpass/go.mod
+++ b/api/auth/userpass/go.mod
@@ -2,4 +2,4 @@ module github.com/hashicorp/vault/api/auth/userpass
 
 go 1.16
 
-require github.com/hashicorp/vault/api v1.9.2
+require github.com/hashicorp/vault/api v1.8.0
diff --git a/api/auth/userpass/go.sum b/api/auth/userpass/go.sum
index dfd66b2ccb247..c7835a3bf723f 100644
--- a/api/auth/userpass/go.sum
+++ b/api/auth/userpass/go.sum
@@ -1,46 +1,160 @@
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
+github.com/armon/go-metrics v0.3.9 h1:O2sNqxBdvq8Eq5xmzljcYzAORli6RWCvEym4cJf9m18=
+github.com/armon/go-metrics v0.3.9/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
+github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI=
+github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
+github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
 github.com/cenkalti/backoff/v3 v3.0.0 h1:ske+9nBpD9qZsTBoF41nW5L+AIuFBKMeze18XQ3eG1c=
 github.com/cenkalti/backoff/v3 v3.0.0/go.mod h1:cIeZDE3IrqwwJl6VUwCN6trj1oXrTS4rc0ij+ULvLYs=
+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
+github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
+github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
+github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
+github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/evanphx/json-patch/v5 v5.5.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4=
 github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
-github.com/go-jose/go-jose/v3 v3.0.0 h1:s6rrhirfEP/CGIoc6p+PZAeogN2SxKav6Wp7+dyMWVo=
-github.com/go-jose/go-jose/v3 v3.0.0/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxFMht0mSX+u8=
+github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
+github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
+github.com/frankban/quicktest v1.10.0/go.mod h1:ui7WezCLWMWxVWr1GETZY3smRy0G4KWq9vcPtJmFl7Y=
+github.com/frankban/quicktest v1.13.0 h1:yNZif1OkDfNoDfb9zZa9aXIpejNR4F23Wely0c+Qdqk=
+github.com/frankban/quicktest v1.13.0/go.mod h1:qLE0fzW0VuyUAJgPU19zByoIr0HtCHN/r/VLSOOIySU=
+github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
+github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-ldap/ldap/v3 v3.1.10/go.mod h1:5Zun81jBTabRaI8lzN7E1JjyEl1g6zI6u9pd8luAK4Q=
+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-test/deep v1.0.2 h1:onZX1rnHT3Wv6cqNgYyFOOlgVKJrksuCMCRvJStbMYw=
 github.com/go-test/deep v1.0.2/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
+github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
+github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
-github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
+github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
 github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
+github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
 github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
 github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
+github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
 github.com/hashicorp/go-hclog v0.16.2 h1:K4ev2ib4LdQETX5cSZBG0DVLk1jwGqSPXBjdah3veNs=
 github.com/hashicorp/go-hclog v0.16.2/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
+github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
+github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc=
+github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
+github.com/hashicorp/go-kms-wrapping/entropy/v2 v2.0.0/go.mod h1:xvb32K2keAc+R8DSFG2IwDcydK9DBQE+fGA5fsw6hSk=
 github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
 github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
+github.com/hashicorp/go-plugin v1.4.3 h1:DXmvivbWD5qdiBts9TpBC7BYL1Aia5sxbRgQB+v6UZM=
+github.com/hashicorp/go-plugin v1.4.3/go.mod h1:5fGEH17QVwTTcR0zV7yhDPLLmFX9YSZ38b18Udy6vYQ=
+github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
 github.com/hashicorp/go-retryablehttp v0.6.6 h1:HJunrbHTDDbBb/ay4kxa1n+dLmttUlnP3V9oNE4hmsM=
 github.com/hashicorp/go-retryablehttp v0.6.6/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
 github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc=
 github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
+github.com/hashicorp/go-secure-stdlib/base62 v0.1.1/go.mod h1:EdWO6czbmthiwZ3/PUsDV+UD1D5IRU4ActiaWGwt0Yw=
+github.com/hashicorp/go-secure-stdlib/mlock v0.1.1 h1:cCRo8gK7oq6A2L6LICkUZ+/a5rLiRXFMf1Qd4xSwxTc=
+github.com/hashicorp/go-secure-stdlib/mlock v0.1.1/go.mod h1:zq93CJChV6L9QTfGKtfBxKqD7BqqXx5O04A/ns2p5+I=
+github.com/hashicorp/go-secure-stdlib/parseutil v0.1.1/go.mod h1:QmrqtbKuxxSWTN3ETMPuB+VtEiBJ/A9XhoYGv8E1uD8=
 github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6 h1:om4Al8Oy7kCm/B86rLCLah4Dt5Aa0Fr5rYBG60OzwHQ=
 github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6/go.mod h1:QmrqtbKuxxSWTN3ETMPuB+VtEiBJ/A9XhoYGv8E1uD8=
+github.com/hashicorp/go-secure-stdlib/password v0.1.1/go.mod h1:9hH302QllNwu1o2TGYtSk8I8kTAN0ca1EHpwhm5Mmzo=
 github.com/hashicorp/go-secure-stdlib/strutil v0.1.1/go.mod h1:gKOamz3EwoIoJq7mlMIRBpVTAUn8qPCrEclOKKWhD3U=
 github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 h1:kes8mmyCpxJsI7FTwtzRqEy9CdjCtrXrXGuOpxEA7Ts=
 github.com/hashicorp/go-secure-stdlib/strutil v0.1.2/go.mod h1:Gou2R9+il93BqX25LAKCLuM+y9U2T4hlwvT1yprcna4=
+github.com/hashicorp/go-secure-stdlib/tlsutil v0.1.1/go.mod h1:l8slYwnJA26yBz+ErHpp2IRCLr0vuOMGBORIz4rRiAs=
 github.com/hashicorp/go-sockaddr v1.0.2 h1:ztczhD1jLxIRjVejw8gFomI1BQZOe2WoVOu0SyteCQc=
 github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A=
+github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE=
+github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/go-version v1.2.0 h1:3vNe/fWF5CBgRIguda1meWhsZHy3m8gCJ5wx+dIzX/E=
+github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
+github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
+github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
-github.com/hashicorp/vault/api v1.9.2 h1:YjkZLJ7K3inKgMZ0wzCU9OHqc+UqMQyXsPXnf3Cl2as=
-github.com/hashicorp/vault/api v1.9.2/go.mod h1:jo5Y/ET+hNyz+JnKDt8XLAdKs+AM0G5W0Vp1IrFI8N8=
+github.com/hashicorp/vault/api v1.8.0 h1:7765sW1XBt+qf4XKIYE4ebY9qc/yi9V2/egzGSUNMZU=
+github.com/hashicorp/vault/api v1.8.0/go.mod h1:uJrw6D3y9Rv7hhmS17JQC50jbPDAZdjZoTtrCCxxs7E=
+github.com/hashicorp/vault/sdk v0.6.0 h1:6Z+In5DXHiUfZvIZdMx7e2loL1PPyDjA4bVh9ZTIAhs=
+github.com/hashicorp/vault/sdk v0.6.0/go.mod h1:+DRpzoXIdMvKc88R4qxr+edwy/RvH5QK8itmxLiDHLc=
+github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb h1:b5rjCoWHc7eqmAS4/qyk21ZsHyb6Mxv/jykxvNTkU4M=
+github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
+github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
+github.com/jhump/protoreflect v1.6.0 h1:h5jfMVslIg6l29nsMs0D8Wj17RDVdNYti0vDN/PZZoE=
+github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74=
+github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.6 h1:6Su7aK7lXmJ/U79bYtBjLNaha4Fs1Rg9plHpcH+vvnE=
@@ -50,68 +164,169 @@ github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd
 github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
 github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
+github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ=
+github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
+github.com/mitchellh/go-testing-interface v1.0.0 h1:fzU/JVNcaqHQEcVFAKeR41fkiLdIPrefOvVG1VZ96U0=
+github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
 github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
 github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/IfikLNY=
+github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw=
+github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
+github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=
+github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
+github.com/pierrec/lz4 v2.5.2+incompatible h1:WCjObylUIOlKy/+7Abdn34TLIkXiA4UWUMhxq9m9ZXI=
+github.com/pierrec/lz4 v2.5.2+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
+github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
+github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
+github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
+github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
+github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk=
 github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc=
+github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
+go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
+go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
+go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
-golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 h1:/UOmuWzQfxxo9UtlXMwuQU8CMgg1eZXqTRwkSQJWKOI=
+golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
-golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1 h1:NusfzzA6yGQ+ua51ck7E3omNUX/JuqbFSaRGqU8CcLI=
 golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
+google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
+google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/grpc v1.41.0 h1:f+PlOh7QV4iIJkPrx5NQ7qaNGFQ3OTse67yaDHfju4E=
+google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/square/go-jose.v2 v2.5.1 h1:7odma5RETjNHWJnR32wx8t+Io4djHE1PqxCFx3iiZ2w=
+gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
diff --git a/api/auth/userpass/userpass.go b/api/auth/userpass/userpass.go
index 3e8942953d3a8..124cd7a68f8e9 100644
--- a/api/auth/userpass/userpass.go
+++ b/api/auth/userpass/userpass.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package userpass
 
 import (
diff --git a/api/auth/userpass/userpass_test.go b/api/auth/userpass/userpass_test.go
index 4fe68d8d4ef12..0728117a1e8c4 100644
--- a/api/auth/userpass/userpass_test.go
+++ b/api/auth/userpass/userpass_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package userpass
 
 import (
diff --git a/api/auth_test.go b/api/auth_test.go
index ca69630cce5e9..46113d92f7beb 100644
--- a/api/auth_test.go
+++ b/api/auth_test.go
@@ -1,11 +1,10 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
 	"context"
 	"testing"
+
+	"github.com/hashicorp/vault/sdk/logical"
 )
 
 type mockAuthMethod struct {
@@ -92,7 +91,7 @@ func TestAuth_MFALoginTwoPhase(t *testing.T) {
 			m: &mockAuthMethod{
 				mockedSecret: &Secret{
 					Auth: &SecretAuth{
-						MFARequirement: &MFARequirement{
+						MFARequirement: &logical.MFARequirement{
 							MFARequestID:   "a-req-id",
 							MFAConstraints: nil,
 						},
diff --git a/api/auth_token.go b/api/auth_token.go
index 1980be06ef5b9..52be1e7852b94 100644
--- a/api/auth_token.go
+++ b/api/auth_token.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/client.go b/api/client.go
index d20477e1d9d7b..c6843348e58e5 100644
--- a/api/client.go
+++ b/api/client.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
@@ -27,9 +24,12 @@ import (
 	"github.com/hashicorp/go-retryablehttp"
 	"github.com/hashicorp/go-rootcerts"
 	"github.com/hashicorp/go-secure-stdlib/parseutil"
-	"github.com/hashicorp/go-secure-stdlib/strutil"
 	"golang.org/x/net/http2"
 	"golang.org/x/time/rate"
+
+	"github.com/hashicorp/vault/sdk/helper/consts"
+	"github.com/hashicorp/vault/sdk/helper/strutil"
+	"github.com/hashicorp/vault/sdk/logical"
 )
 
 const (
@@ -56,19 +56,7 @@ const (
 	HeaderIndex              = "X-Vault-Index"
 	HeaderForward            = "X-Vault-Forward"
 	HeaderInconsistent       = "X-Vault-Inconsistent"
-
-	// NamespaceHeaderName is the header set to specify which namespace the
-	// request is indented for.
-	NamespaceHeaderName = "X-Vault-Namespace"
-
-	// AuthHeaderName is the name of the header containing the token.
-	AuthHeaderName = "X-Vault-Token"
-
-	// RequestHeaderName is the name of the header used by the Agent for
-	// SSRF protection.
-	RequestHeaderName = "X-Vault-Request"
-
-	TLSErrorString = "This error usually means that the server is running with TLS disabled\n" +
+	TLSErrorString           = "This error usually means that the server is running with TLS disabled\n" +
 		"but the client is configured to use TLS. Please either enable TLS\n" +
 		"on the server or run the client with -address set to an address\n" +
 		"that uses the http protocol:\n\n" +
@@ -126,11 +114,7 @@ type Config struct {
 	// of three tries).
 	MaxRetries int
 
-	// Timeout, given a non-negative value, will apply the request timeout
-	// to each request function unless an earlier deadline is passed to the
-	// request function through context.Context. Note that this timeout is
-	// not applicable to Logical().ReadRaw* (raw response) functions.
-	// Defaults to 60 seconds.
+	// Timeout is for setting custom timeout parameter in the HttpClient
 	Timeout time.Duration
 
 	// If there is an error when creating the configuration, this will be the
@@ -203,7 +187,6 @@ type Config struct {
 	// commands such as 'vault operator raft snapshot' as this redirects to the
 	// primary node.
 	DisableRedirects bool
-	clientTLSConfig  *tls.Config
 }
 
 // TLSConfig contains the parameters needed to configure TLS on the HTTP client
@@ -338,17 +321,10 @@ func (c *Config) configureTLS(t *TLSConfig) error {
 	if t.TLSServerName != "" {
 		clientTLSConfig.ServerName = t.TLSServerName
 	}
-	c.clientTLSConfig = clientTLSConfig
 
 	return nil
 }
 
-func (c *Config) TLSConfig() *tls.Config {
-	c.modifyLock.RLock()
-	defer c.modifyLock.RUnlock()
-	return c.clientTLSConfig.Clone()
-}
-
 // ConfigureTLS takes a set of TLS configurations and applies those to the
 // HTTP client.
 func (c *Config) ConfigureTLS(t *TLSConfig) error {
@@ -641,7 +617,7 @@ func NewClient(c *Config) (*Client, error) {
 	}
 
 	// Add the VaultRequest SSRF protection header
-	client.headers[RequestHeaderName] = []string{"true"}
+	client.headers[consts.RequestHeaderName] = []string{"true"}
 
 	if token := os.Getenv(EnvVaultToken); token != "" {
 		client.token = token
@@ -673,7 +649,6 @@ func (c *Client) CloneConfig() *Config {
 	newConfig.CloneHeaders = c.config.CloneHeaders
 	newConfig.CloneToken = c.config.CloneToken
 	newConfig.ReadYourWrites = c.config.ReadYourWrites
-	newConfig.clientTLSConfig = c.config.clientTLSConfig
 
 	// we specifically want a _copy_ of the client here, not a pointer to the original one
 	newClient := *c.config.HttpClient
@@ -959,7 +934,7 @@ func (c *Client) setNamespace(namespace string) {
 		c.headers = make(http.Header)
 	}
 
-	c.headers.Set(NamespaceHeaderName, namespace)
+	c.headers.Set(consts.NamespaceHeaderName, namespace)
 }
 
 // ClearNamespace removes the namespace header if set.
@@ -967,7 +942,7 @@ func (c *Client) ClearNamespace() {
 	c.modifyLock.Lock()
 	defer c.modifyLock.Unlock()
 	if c.headers != nil {
-		c.headers.Del(NamespaceHeaderName)
+		c.headers.Del(consts.NamespaceHeaderName)
 	}
 }
 
@@ -979,7 +954,7 @@ func (c *Client) Namespace() string {
 	if c.headers == nil {
 		return ""
 	}
-	return c.headers.Get(NamespaceHeaderName)
+	return c.headers.Get(consts.NamespaceHeaderName)
 }
 
 // WithNamespace makes a shallow copy of Client, modifies it to use
@@ -1280,9 +1255,8 @@ func (c *Client) NewRequest(method, requestPath string) *Request {
 // a Vault server not configured with this client. This is an advanced operation
 // that generally won't need to be called externally.
 //
-// Deprecated: RawRequest exists for historical compatibility and should not be
-// used directly. Use client.Logical().ReadRaw(...) or higher level methods
-// instead.
+// Deprecated: This method should not be used directly. Use higher level
+// methods instead.
 func (c *Client) RawRequest(r *Request) (*Response, error) {
 	return c.RawRequestWithContext(context.Background(), r)
 }
@@ -1291,9 +1265,8 @@ func (c *Client) RawRequest(r *Request) (*Response, error) {
 // a Vault server not configured with this client. This is an advanced operation
 // that generally won't need to be called externally.
 //
-// Deprecated: RawRequestWithContext exists for historical compatibility and
-// should not be used directly. Use client.Logical().ReadRawWithContext(...)
-// or higher level methods instead.
+// Deprecated: This method should not be used directly. Use higher level
+// methods instead.
 func (c *Client) RawRequestWithContext(ctx context.Context, r *Request) (*Response, error) {
 	// Note: we purposefully do not call cancel manually. The reason is
 	// when canceled, the request.Body will EOF when reading due to the way
@@ -1315,7 +1288,7 @@ func (c *Client) rawRequestWithContext(ctx context.Context, r *Request) (*Respon
 	checkRetry := c.config.CheckRetry
 	backoff := c.config.Backoff
 	httpClient := c.config.HttpClient
-	ns := c.headers.Get(NamespaceHeaderName)
+	ns := c.headers.Get(consts.NamespaceHeaderName)
 	outputCurlString := c.config.OutputCurlString
 	outputPolicy := c.config.OutputPolicy
 	logger := c.config.Logger
@@ -1328,9 +1301,9 @@ func (c *Client) rawRequestWithContext(ctx context.Context, r *Request) (*Respon
 	// e.g. calls using (*Client).WithNamespace
 	switch ns {
 	case "":
-		r.Headers.Del(NamespaceHeaderName)
+		r.Headers.Del(consts.NamespaceHeaderName)
 	default:
-		r.Headers.Set(NamespaceHeaderName, ns)
+		r.Headers.Set(consts.NamespaceHeaderName, ns)
 	}
 
 	for _, cb := range c.requestCallbacks {
@@ -1376,7 +1349,6 @@ START:
 		LastOutputPolicyError = &OutputPolicyError{
 			method: req.Method,
 			path:   strings.TrimPrefix(req.URL.Path, "/v1"),
-			params: req.URL.Query(),
 		}
 		return nil, LastOutputPolicyError
 	}
@@ -1484,8 +1456,8 @@ func (c *Client) httpRequestWithContext(ctx context.Context, r *Request) (*Respo
 			}
 		}
 		// explicitly set the namespace header to current client
-		if ns := c.headers.Get(NamespaceHeaderName); ns != "" {
-			r.Headers.Set(NamespaceHeaderName, ns)
+		if ns := c.headers.Get(consts.NamespaceHeaderName); ns != "" {
+			r.Headers.Set(consts.NamespaceHeaderName, ns)
 		}
 	}
 
@@ -1506,7 +1478,7 @@ func (c *Client) httpRequestWithContext(ctx context.Context, r *Request) (*Respo
 	req.Host = r.URL.Host
 
 	if len(r.ClientToken) != 0 {
-		req.Header.Set(AuthHeaderName, r.ClientToken)
+		req.Header.Set(consts.AuthHeaderName, r.ClientToken)
 	}
 
 	if len(r.WrapTTL) != 0 {
@@ -1696,13 +1668,7 @@ func MergeReplicationStates(old []string, new string) []string {
 	return strutil.RemoveDuplicates(ret, false)
 }
 
-type WALState struct {
-	ClusterID       string
-	LocalIndex      uint64
-	ReplicatedIndex uint64
-}
-
-func ParseReplicationState(raw string, hmacKey []byte) (*WALState, error) {
+func ParseReplicationState(raw string, hmacKey []byte) (*logical.WALState, error) {
 	cooked, err := base64.StdEncoding.DecodeString(raw)
 	if err != nil {
 		return nil, err
@@ -1740,7 +1706,7 @@ func ParseReplicationState(raw string, hmacKey []byte) (*WALState, error) {
 		return nil, fmt.Errorf("invalid replicated index in state header: %w", err)
 	}
 
-	return &WALState{
+	return &logical.WALState{
 		ClusterID:       pieces[1],
 		LocalIndex:      localIndex,
 		ReplicatedIndex: replicatedIndex,
diff --git a/api/client_test.go b/api/client_test.go
index a23c0c19e7d58..4f57451753a08 100644
--- a/api/client_test.go
+++ b/api/client_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
@@ -22,6 +19,7 @@ import (
 
 	"github.com/go-test/deep"
 	"github.com/hashicorp/go-hclog"
+	"github.com/hashicorp/vault/sdk/helper/consts"
 )
 
 func init() {
@@ -445,7 +443,7 @@ func TestClientDeprecatedEnvSettings(t *testing.T) {
 func TestClientEnvNamespace(t *testing.T) {
 	var seenNamespace string
 	handler := func(w http.ResponseWriter, req *http.Request) {
-		seenNamespace = req.Header.Get(NamespaceHeaderName)
+		seenNamespace = req.Header.Get(consts.NamespaceHeaderName)
 	}
 	config, ln := testHTTPServer(t, http.HandlerFunc(handler))
 	defer ln.Close()
@@ -1270,7 +1268,7 @@ func TestClient_SetCloneToken(t *testing.T) {
 func TestClientWithNamespace(t *testing.T) {
 	var ns string
 	handler := func(w http.ResponseWriter, req *http.Request) {
-		ns = req.Header.Get(NamespaceHeaderName)
+		ns = req.Header.Get(consts.NamespaceHeaderName)
 	}
 	config, ln := testHTTPServer(t, http.HandlerFunc(handler))
 	defer ln.Close()
diff --git a/api/go.mod b/api/go.mod
index 20fb4617af23b..4627c5a5518ed 100644
--- a/api/go.mod
+++ b/api/go.mod
@@ -1,15 +1,11 @@
 module github.com/hashicorp/vault/api
 
-// The Go version directive for the api package should normally only be updated when
-// code in the api package requires a newer Go version to build.  It should not
-// automatically track the Go version used to build Vault itself.  Many projects import
-// the api module and we don't want to impose a newer version on them any more than we
-// have to.
-go 1.19
+go 1.17
+
+replace github.com/hashicorp/vault/sdk => ../sdk
 
 require (
 	github.com/cenkalti/backoff/v3 v3.0.0
-	github.com/go-jose/go-jose/v3 v3.0.0
 	github.com/go-test/deep v1.0.2
 	github.com/hashicorp/errwrap v1.1.0
 	github.com/hashicorp/go-cleanhttp v0.5.2
@@ -18,22 +14,44 @@ require (
 	github.com/hashicorp/go-retryablehttp v0.6.6
 	github.com/hashicorp/go-rootcerts v1.0.2
 	github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6
-	github.com/hashicorp/go-secure-stdlib/strutil v0.1.2
 	github.com/hashicorp/hcl v1.0.0
+	github.com/hashicorp/vault/sdk v0.6.0
 	github.com/mitchellh/mapstructure v1.5.0
 	golang.org/x/net v0.7.0
 	golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1
+	gopkg.in/square/go-jose.v2 v2.5.1
 )
 
 require (
+	github.com/armon/go-metrics v0.3.9 // indirect
+	github.com/armon/go-radix v1.0.0 // indirect
 	github.com/fatih/color v1.7.0 // indirect
-	github.com/google/go-cmp v0.5.7 // indirect
+	github.com/frankban/quicktest v1.13.0 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/golang/snappy v0.0.4 // indirect
+	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
+	github.com/hashicorp/go-plugin v1.4.3 // indirect
+	github.com/hashicorp/go-secure-stdlib/mlock v0.1.1 // indirect
+	github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
 	github.com/hashicorp/go-sockaddr v1.0.2 // indirect
+	github.com/hashicorp/go-uuid v1.0.2 // indirect
+	github.com/hashicorp/go-version v1.2.0 // indirect
+	github.com/hashicorp/golang-lru v0.5.4 // indirect
+	github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb // indirect
 	github.com/mattn/go-colorable v0.1.6 // indirect
 	github.com/mattn/go-isatty v0.0.12 // indirect
+	github.com/mitchellh/copystructure v1.0.0 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
+	github.com/mitchellh/go-testing-interface v1.0.0 // indirect
+	github.com/mitchellh/reflectwalk v1.0.0 // indirect
+	github.com/oklog/run v1.0.0 // indirect
+	github.com/pierrec/lz4 v2.5.2+incompatible // indirect
 	github.com/ryanuber/go-glob v1.0.0 // indirect
+	go.uber.org/atomic v1.9.0 // indirect
 	golang.org/x/crypto v0.6.0 // indirect
 	golang.org/x/sys v0.5.0 // indirect
 	golang.org/x/text v0.7.0 // indirect
+	google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect
+	google.golang.org/grpc v1.41.0 // indirect
+	google.golang.org/protobuf v1.26.0 // indirect
 )
diff --git a/api/go.sum b/api/go.sum
index e8f5f1811f8f4..c81062b56dd13 100644
--- a/api/go.sum
+++ b/api/go.sum
@@ -1,44 +1,156 @@
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
+github.com/armon/go-metrics v0.3.9 h1:O2sNqxBdvq8Eq5xmzljcYzAORli6RWCvEym4cJf9m18=
+github.com/armon/go-metrics v0.3.9/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
+github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI=
+github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
+github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
 github.com/cenkalti/backoff/v3 v3.0.0 h1:ske+9nBpD9qZsTBoF41nW5L+AIuFBKMeze18XQ3eG1c=
 github.com/cenkalti/backoff/v3 v3.0.0/go.mod h1:cIeZDE3IrqwwJl6VUwCN6trj1oXrTS4rc0ij+ULvLYs=
+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
+github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
+github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
+github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
+github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/evanphx/json-patch/v5 v5.5.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4=
 github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
-github.com/go-jose/go-jose/v3 v3.0.0 h1:s6rrhirfEP/CGIoc6p+PZAeogN2SxKav6Wp7+dyMWVo=
-github.com/go-jose/go-jose/v3 v3.0.0/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxFMht0mSX+u8=
+github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
+github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
+github.com/frankban/quicktest v1.10.0/go.mod h1:ui7WezCLWMWxVWr1GETZY3smRy0G4KWq9vcPtJmFl7Y=
+github.com/frankban/quicktest v1.13.0 h1:yNZif1OkDfNoDfb9zZa9aXIpejNR4F23Wely0c+Qdqk=
+github.com/frankban/quicktest v1.13.0/go.mod h1:qLE0fzW0VuyUAJgPU19zByoIr0HtCHN/r/VLSOOIySU=
+github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
+github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-ldap/ldap/v3 v3.1.10/go.mod h1:5Zun81jBTabRaI8lzN7E1JjyEl1g6zI6u9pd8luAK4Q=
+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-test/deep v1.0.2 h1:onZX1rnHT3Wv6cqNgYyFOOlgVKJrksuCMCRvJStbMYw=
 github.com/go-test/deep v1.0.2/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
+github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
+github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
-github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
+github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
 github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
+github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
 github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
 github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
+github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
 github.com/hashicorp/go-hclog v0.16.2 h1:K4ev2ib4LdQETX5cSZBG0DVLk1jwGqSPXBjdah3veNs=
 github.com/hashicorp/go-hclog v0.16.2/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
+github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
+github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc=
+github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
+github.com/hashicorp/go-kms-wrapping/entropy/v2 v2.0.0/go.mod h1:xvb32K2keAc+R8DSFG2IwDcydK9DBQE+fGA5fsw6hSk=
 github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
 github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
+github.com/hashicorp/go-plugin v1.4.3 h1:DXmvivbWD5qdiBts9TpBC7BYL1Aia5sxbRgQB+v6UZM=
+github.com/hashicorp/go-plugin v1.4.3/go.mod h1:5fGEH17QVwTTcR0zV7yhDPLLmFX9YSZ38b18Udy6vYQ=
+github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
 github.com/hashicorp/go-retryablehttp v0.6.6 h1:HJunrbHTDDbBb/ay4kxa1n+dLmttUlnP3V9oNE4hmsM=
 github.com/hashicorp/go-retryablehttp v0.6.6/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
 github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc=
 github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
+github.com/hashicorp/go-secure-stdlib/base62 v0.1.1/go.mod h1:EdWO6czbmthiwZ3/PUsDV+UD1D5IRU4ActiaWGwt0Yw=
+github.com/hashicorp/go-secure-stdlib/mlock v0.1.1 h1:cCRo8gK7oq6A2L6LICkUZ+/a5rLiRXFMf1Qd4xSwxTc=
+github.com/hashicorp/go-secure-stdlib/mlock v0.1.1/go.mod h1:zq93CJChV6L9QTfGKtfBxKqD7BqqXx5O04A/ns2p5+I=
+github.com/hashicorp/go-secure-stdlib/parseutil v0.1.1/go.mod h1:QmrqtbKuxxSWTN3ETMPuB+VtEiBJ/A9XhoYGv8E1uD8=
 github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6 h1:om4Al8Oy7kCm/B86rLCLah4Dt5Aa0Fr5rYBG60OzwHQ=
 github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6/go.mod h1:QmrqtbKuxxSWTN3ETMPuB+VtEiBJ/A9XhoYGv8E1uD8=
+github.com/hashicorp/go-secure-stdlib/password v0.1.1/go.mod h1:9hH302QllNwu1o2TGYtSk8I8kTAN0ca1EHpwhm5Mmzo=
 github.com/hashicorp/go-secure-stdlib/strutil v0.1.1/go.mod h1:gKOamz3EwoIoJq7mlMIRBpVTAUn8qPCrEclOKKWhD3U=
 github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 h1:kes8mmyCpxJsI7FTwtzRqEy9CdjCtrXrXGuOpxEA7Ts=
 github.com/hashicorp/go-secure-stdlib/strutil v0.1.2/go.mod h1:Gou2R9+il93BqX25LAKCLuM+y9U2T4hlwvT1yprcna4=
+github.com/hashicorp/go-secure-stdlib/tlsutil v0.1.2/go.mod h1:l8slYwnJA26yBz+ErHpp2IRCLr0vuOMGBORIz4rRiAs=
 github.com/hashicorp/go-sockaddr v1.0.2 h1:ztczhD1jLxIRjVejw8gFomI1BQZOe2WoVOu0SyteCQc=
 github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A=
+github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE=
+github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/go-version v1.2.0 h1:3vNe/fWF5CBgRIguda1meWhsZHy3m8gCJ5wx+dIzX/E=
+github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
+github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
+github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
+github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb h1:b5rjCoWHc7eqmAS4/qyk21ZsHyb6Mxv/jykxvNTkU4M=
+github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
+github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
+github.com/jhump/protoreflect v1.6.0 h1:h5jfMVslIg6l29nsMs0D8Wj17RDVdNYti0vDN/PZZoE=
+github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74=
+github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.6 h1:6Su7aK7lXmJ/U79bYtBjLNaha4Fs1Rg9plHpcH+vvnE=
@@ -48,46 +160,188 @@ github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd
 github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
 github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
+github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ=
+github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
+github.com/mitchellh/go-testing-interface v1.0.0 h1:fzU/JVNcaqHQEcVFAKeR41fkiLdIPrefOvVG1VZ96U0=
+github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
 github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
 github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/IfikLNY=
+github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw=
+github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
+github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=
+github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
+github.com/pierrec/lz4 v2.5.2+incompatible h1:WCjObylUIOlKy/+7Abdn34TLIkXiA4UWUMhxq9m9ZXI=
+github.com/pierrec/lz4 v2.5.2+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
+github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
+github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
+github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
+github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
+github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk=
 github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc=
+github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
+go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
+go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
 golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
 golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1 h1:NusfzzA6yGQ+ua51ck7E3omNUX/JuqbFSaRGqU8CcLI=
 golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
+google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
+google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/grpc v1.41.0 h1:f+PlOh7QV4iIJkPrx5NQ7qaNGFQ3OTse67yaDHfju4E=
+google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/square/go-jose.v2 v2.5.1 h1:7odma5RETjNHWJnR32wx8t+Io4djHE1PqxCFx3iiZ2w=
+gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
diff --git a/api/help.go b/api/help.go
index c119f6c3c9535..0988ebcd1fc9d 100644
--- a/api/help.go
+++ b/api/help.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/kv.go b/api/kv.go
index 20862fbfdf1d9..37699df266f9f 100644
--- a/api/kv.go
+++ b/api/kv.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import "errors"
diff --git a/api/kv_test.go b/api/kv_test.go
index 36d769feaa6b6..2c16b2d43ad66 100644
--- a/api/kv_test.go
+++ b/api/kv_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
@@ -322,66 +319,13 @@ func TestExtractCustomMetadata(t *testing.T) {
 			},
 			expected: map[string]interface{}{"org": "eng"},
 		},
-		{
-			name: "a read response with no custom metadata from a pre-1.9 Vault server",
-			inputAPIResp: &Secret{
-				Data: map[string]interface{}{
-					"metadata": map[string]interface{}{},
-				},
-			},
-			expected: map[string]interface{}(nil),
-		},
-		{
-			name: "a write response with no custom metadata from a pre-1.9 Vault server",
-			inputAPIResp: &Secret{
-				Data: map[string]interface{}{},
-			},
-			expected: map[string]interface{}(nil),
-		},
-		{
-			name: "a read response with no custom metadata from a post-1.9 Vault server",
-			inputAPIResp: &Secret{
-				Data: map[string]interface{}{
-					"metadata": map[string]interface{}{
-						"custom_metadata": nil,
-					},
-				},
-			},
-			expected: map[string]interface{}(nil),
-		},
-		{
-			name: "a write response with no custom metadata from a post-1.9 Vault server",
-			inputAPIResp: &Secret{
-				Data: map[string]interface{}{
-					"custom_metadata": nil,
-				},
-			},
-			expected: map[string]interface{}(nil),
-		},
-		{
-			name: "a read response where custom metadata was deleted",
-			inputAPIResp: &Secret{
-				Data: map[string]interface{}{
-					"metadata": map[string]interface{}{
-						"custom_metadata": map[string]interface{}{},
-					},
-				},
-			},
-			expected: map[string]interface{}{},
-		},
-		{
-			name: "a write response where custom metadata was deleted",
-			inputAPIResp: &Secret{
-				Data: map[string]interface{}{
-					"custom_metadata": map[string]interface{}{},
-				},
-			},
-			expected: map[string]interface{}{},
-		},
 	}
 
 	for _, tc := range testCases {
-		cm := extractCustomMetadata(tc.inputAPIResp)
+		cm, err := extractCustomMetadata(tc.inputAPIResp)
+		if err != nil {
+			t.Fatalf("err: %s", err)
+		}
 
 		if !reflect.DeepEqual(cm, tc.expected) {
 			t.Fatalf("%s: got\n%#v\nexpected\n%#v\n", tc.name, cm, tc.expected)
diff --git a/api/kv_v1.go b/api/kv_v1.go
index a914e03576e86..22ba992384b79 100644
--- a/api/kv_v1.go
+++ b/api/kv_v1.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/kv_v2.go b/api/kv_v2.go
index 72c29eaa42612..7a98cfeefd234 100644
--- a/api/kv_v2.go
+++ b/api/kv_v2.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
@@ -128,7 +125,11 @@ func (kv *KVv2) Get(ctx context.Context, secretPath string) (*KVSecret, error) {
 		return nil, fmt.Errorf("error parsing secret at %s: %w", pathToRead, err)
 	}
 
-	kvSecret.CustomMetadata = extractCustomMetadata(secret)
+	cm, err := extractCustomMetadata(secret)
+	if err != nil {
+		return nil, fmt.Errorf("error reading custom metadata for secret at %s: %w", pathToRead, err)
+	}
+	kvSecret.CustomMetadata = cm
 
 	return kvSecret, nil
 }
@@ -158,7 +159,11 @@ func (kv *KVv2) GetVersion(ctx context.Context, secretPath string, version int)
 		return nil, fmt.Errorf("error parsing secret at %s: %w", pathToRead, err)
 	}
 
-	kvSecret.CustomMetadata = extractCustomMetadata(secret)
+	cm, err := extractCustomMetadata(secret)
+	if err != nil {
+		return nil, fmt.Errorf("error reading custom metadata for secret at %s: %w", pathToRead, err)
+	}
+	kvSecret.CustomMetadata = cm
 
 	return kvSecret, nil
 }
@@ -255,7 +260,11 @@ func (kv *KVv2) Put(ctx context.Context, secretPath string, data map[string]inte
 		Raw:             secret,
 	}
 
-	kvSecret.CustomMetadata = extractCustomMetadata(secret)
+	cm, err := extractCustomMetadata(secret)
+	if err != nil {
+		return nil, fmt.Errorf("error reading custom metadata for secret at %s: %w", pathToWriteTo, err)
+	}
+	kvSecret.CustomMetadata = cm
 
 	return kvSecret, nil
 }
@@ -488,24 +497,30 @@ func (kv *KVv2) Rollback(ctx context.Context, secretPath string, toVersion int)
 	return kvs, nil
 }
 
-func extractCustomMetadata(secret *Secret) map[string]interface{} {
+func extractCustomMetadata(secret *Secret) (map[string]interface{}, error) {
 	// Logical Writes return the metadata directly, Reads return it nested inside the "metadata" key
 	customMetadataInterface, ok := secret.Data["custom_metadata"]
 	if !ok {
-		metadataInterface := secret.Data["metadata"]
+		metadataInterface, ok := secret.Data["metadata"]
+		if !ok { // if that's not found, bail since it should have had one or the other
+			return nil, fmt.Errorf("secret is missing expected fields")
+		}
 		metadataMap, ok := metadataInterface.(map[string]interface{})
 		if !ok {
-			return nil
+			return nil, fmt.Errorf("unexpected type for 'metadata' element: %T (%#v)", metadataInterface, metadataInterface)
+		}
+		customMetadataInterface, ok = metadataMap["custom_metadata"]
+		if !ok {
+			return nil, fmt.Errorf("metadata missing expected field \"custom_metadata\": %v", metadataMap)
 		}
-		customMetadataInterface = metadataMap["custom_metadata"]
 	}
 
 	cm, ok := customMetadataInterface.(map[string]interface{})
-	if !ok {
-		return nil
+	if !ok && customMetadataInterface != nil {
+		return nil, fmt.Errorf("unexpected type for 'metadata' element: %T (%#v)", customMetadataInterface, customMetadataInterface)
 	}
 
-	return cm
+	return cm, nil
 }
 
 func extractDataAndVersionMetadata(secret *Secret) (*KVSecret, error) {
@@ -709,7 +724,11 @@ func mergePatch(ctx context.Context, client *Client, mountPath string, secretPat
 		Raw:             secret,
 	}
 
-	kvSecret.CustomMetadata = extractCustomMetadata(secret)
+	cm, err := extractCustomMetadata(secret)
+	if err != nil {
+		return nil, fmt.Errorf("error reading custom metadata for secret %s: %w", secretPath, err)
+	}
+	kvSecret.CustomMetadata = cm
 
 	return kvSecret, nil
 }
diff --git a/api/lifetime_watcher.go b/api/lifetime_watcher.go
index 5c060e5a15099..5f3eadbffdd88 100644
--- a/api/lifetime_watcher.go
+++ b/api/lifetime_watcher.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
@@ -150,13 +147,6 @@ func (c *Client) NewLifetimeWatcher(i *LifetimeWatcherInput) (*LifetimeWatcher,
 
 	random := i.Rand
 	if random == nil {
-		// NOTE:
-		// Rather than a cryptographically secure random number generator (RNG),
-		// the default behavior uses the math/rand package. The random number is
-		// used to introduce a slight jitter when calculating the grace period
-		// for a monitored secret monitoring. This is intended to stagger renewal
-		// requests to the Vault server, but in a semi-predictable way, so there
-		// is no need to use a cryptographically secure RNG.
 		random = rand.New(rand.NewSource(int64(time.Now().Nanosecond())))
 	}
 
@@ -347,14 +337,24 @@ func (r *LifetimeWatcher) doRenewWithOptions(tokenMode bool, nonRenewable bool,
 
 		var sleepDuration time.Duration
 
-		if errorBackoff == nil {
-			sleepDuration = r.calculateSleepDuration(remainingLeaseDuration, priorDuration)
-		} else if errorBackoff.NextBackOff() == backoff.Stop {
-			return err
-		}
+		if errorBackoff != nil {
+			sleepDuration = errorBackoff.NextBackOff()
+			if sleepDuration == backoff.Stop {
+				return err
+			}
+		} else {
+			// We keep evaluating a new grace period so long as the lease is
+			// extending. Once it stops extending, we've hit the max and need to
+			// rely on the grace duration.
+			if remainingLeaseDuration > priorDuration {
+				r.calculateGrace(remainingLeaseDuration, time.Duration(r.increment)*time.Second)
+			}
+			priorDuration = remainingLeaseDuration
 
-		// remainingLeaseDuration becomes the priorDuration for the next loop
-		priorDuration = remainingLeaseDuration
+			// The sleep duration is set to 2/3 of the current lease duration plus
+			// 1/3 of the current grace period, which adds jitter.
+			sleepDuration = time.Duration(float64(remainingLeaseDuration.Nanoseconds())*2/3 + float64(r.grace.Nanoseconds())/3)
+		}
 
 		// If we are within grace, return now; or, if the amount of time we
 		// would sleep would land us in the grace period. This helps with short
@@ -366,32 +366,15 @@ func (r *LifetimeWatcher) doRenewWithOptions(tokenMode bool, nonRenewable bool,
 			return nil
 		}
 
-		timer := time.NewTimer(sleepDuration)
 		select {
 		case <-r.stopCh:
-			timer.Stop()
 			return nil
-		case <-timer.C:
+		case <-time.After(sleepDuration):
 			continue
 		}
 	}
 }
 
-// calculateSleepDuration calculates the amount of time the LifeTimeWatcher should sleep
-// before re-entering its loop.
-func (r *LifetimeWatcher) calculateSleepDuration(remainingLeaseDuration, priorDuration time.Duration) time.Duration {
-	// We keep evaluating a new grace period so long as the lease is
-	// extending. Once it stops extending, we've hit the max and need to
-	// rely on the grace duration.
-	if remainingLeaseDuration > priorDuration {
-		r.calculateGrace(remainingLeaseDuration, time.Duration(r.increment)*time.Second)
-	}
-
-	// The sleep duration is set to 2/3 of the current lease duration plus
-	// 1/3 of the current grace period, which adds jitter.
-	return time.Duration(float64(remainingLeaseDuration.Nanoseconds())*2/3 + float64(r.grace.Nanoseconds())/3)
-}
-
 // calculateGrace calculates the grace period based on the minimum of the
 // remaining lease duration and the token increment value; it also adds some
 // jitter to not have clients be in sync.
diff --git a/api/logical.go b/api/logical.go
index 927dd168e4404..747b9bc12c4c9 100644
--- a/api/logical.go
+++ b/api/logical.go
@@ -1,12 +1,8 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
 	"bytes"
 	"context"
-	"encoding/json"
 	"fmt"
 	"io"
 	"net/http"
@@ -15,6 +11,7 @@ import (
 	"strings"
 
 	"github.com/hashicorp/errwrap"
+	"github.com/hashicorp/vault/sdk/helper/jsonutil"
 )
 
 const (
@@ -68,54 +65,23 @@ func (c *Logical) ReadWithDataWithContext(ctx context.Context, path string, data
 	ctx, cancelFunc := c.c.withConfiguredTimeout(ctx)
 	defer cancelFunc()
 
-	resp, err := c.readRawWithDataWithContext(ctx, path, data)
-	return c.ParseRawResponseAndCloseBody(resp, err)
-}
-
-// ReadRaw attempts to read the value stored at the given Vault path
-// (without '/v1/' prefix) and returns a raw *http.Response.
-//
-// Note: the raw-response functions do not respect the client-configured
-// request timeout; if a timeout is desired, please use ReadRawWithContext
-// instead and set the timeout through context.WithTimeout or context.WithDeadline.
-func (c *Logical) ReadRaw(path string) (*Response, error) {
-	return c.ReadRawWithDataWithContext(context.Background(), path, nil)
-}
-
-// ReadRawWithContext attempts to read the value stored at the give Vault path
-// (without '/v1/' prefix) and returns a raw *http.Response.
-//
-// Note: the raw-response functions do not respect the client-configured
-// request timeout; if a timeout is desired, please set it through
-// context.WithTimeout or context.WithDeadline.
-func (c *Logical) ReadRawWithContext(ctx context.Context, path string) (*Response, error) {
-	return c.ReadRawWithDataWithContext(ctx, path, nil)
-}
+	r := c.c.NewRequest(http.MethodGet, "/v1/"+path)
 
-// ReadRawWithData attempts to read the value stored at the given Vault
-// path (without '/v1/' prefix) and returns a raw *http.Response. The 'data' map
-// is added as query parameters to the request.
-//
-// Note: the raw-response functions do not respect the client-configured
-// request timeout; if a timeout is desired, please use
-// ReadRawWithDataWithContext instead and set the timeout through
-// context.WithTimeout or context.WithDeadline.
-func (c *Logical) ReadRawWithData(path string, data map[string][]string) (*Response, error) {
-	return c.ReadRawWithDataWithContext(context.Background(), path, data)
-}
+	var values url.Values
+	for k, v := range data {
+		if values == nil {
+			values = make(url.Values)
+		}
+		for _, val := range v {
+			values.Add(k, val)
+		}
+	}
 
-// ReadRawWithDataWithContext attempts to read the value stored at the given
-// Vault path (without '/v1/' prefix) and returns a raw *http.Response. The 'data'
-// map is added as query parameters to the request.
-//
-// Note: the raw-response functions do not respect the client-configured
-// request timeout; if a timeout is desired, please set it through
-// context.WithTimeout or context.WithDeadline.
-func (c *Logical) ReadRawWithDataWithContext(ctx context.Context, path string, data map[string][]string) (*Response, error) {
-	return c.readRawWithDataWithContext(ctx, path, data)
-}
+	if values != nil {
+		r.Params = values
+	}
 
-func (c *Logical) ParseRawResponseAndCloseBody(resp *Response, err error) (*Secret, error) {
+	resp, err := c.c.rawRequestWithContext(ctx, r)
 	if resp != nil {
 		defer resp.Body.Close()
 	}
@@ -140,26 +106,6 @@ func (c *Logical) ParseRawResponseAndCloseBody(resp *Response, err error) (*Secr
 	return ParseSecret(resp.Body)
 }
 
-func (c *Logical) readRawWithDataWithContext(ctx context.Context, path string, data map[string][]string) (*Response, error) {
-	r := c.c.NewRequest(http.MethodGet, "/v1/"+path)
-
-	var values url.Values
-	for k, v := range data {
-		if values == nil {
-			values = make(url.Values)
-		}
-		for _, val := range v {
-			values.Add(k, val)
-		}
-	}
-
-	if values != nil {
-		r.Params = values
-	}
-
-	return c.c.RawRequestWithContext(ctx, r)
-}
-
 func (c *Logical) List(path string) (*Secret, error) {
 	return c.ListWithContext(context.Background(), path)
 }
@@ -393,9 +339,7 @@ func (c *Logical) UnwrapWithContext(ctx context.Context, wrappingToken string) (
 
 	wrappedSecret := new(Secret)
 	buf := bytes.NewBufferString(secret.Data["response"].(string))
-	dec := json.NewDecoder(buf)
-	dec.UseNumber()
-	if err := dec.Decode(wrappedSecret); err != nil {
+	if err := jsonutil.DecodeJSONFromReader(buf, wrappedSecret); err != nil {
 		return nil, errwrap.Wrapf("error unmarshalling wrapped secret: {{err}}", err)
 	}
 
diff --git a/api/output_policy.go b/api/output_policy.go
index c3ec522891b50..85d1617e5e943 100644
--- a/api/output_policy.go
+++ b/api/output_policy.go
@@ -1,13 +1,9 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
 	"fmt"
 	"net/http"
 	"net/url"
-	"strconv"
 	"strings"
 )
 
@@ -20,7 +16,6 @@ var LastOutputPolicyError *OutputPolicyError
 type OutputPolicyError struct {
 	method         string
 	path           string
-	params         url.Values
 	finalHCLString string
 }
 
@@ -49,22 +44,8 @@ func (d *OutputPolicyError) HCLString() (string, error) {
 
 // Builds a sample policy document from the request
 func (d *OutputPolicyError) buildSamplePolicy() (string, error) {
-	operation := d.method
-	// List is often defined as a URL param instead of as an http.Method
-	// this will check for the header and properly switch off of the intended functionality
-	if d.params.Has("list") {
-		isList, err := strconv.ParseBool(d.params.Get("list"))
-		if err != nil {
-			return "", fmt.Errorf("the value of the list url param is not a bool: %v", err)
-		}
-
-		if isList {
-			operation = "LIST"
-		}
-	}
-
 	var capabilities []string
-	switch operation {
+	switch d.method {
 	case http.MethodGet, "":
 		capabilities = append(capabilities, "read")
 	case http.MethodPost, http.MethodPut:
@@ -78,15 +59,17 @@ func (d *OutputPolicyError) buildSamplePolicy() (string, error) {
 		capabilities = append(capabilities, "list")
 	}
 
+	// sanitize, then trim the Vault address and v1 from the front of the path
+	path, err := url.PathUnescape(d.path)
+	if err != nil {
+		return "", fmt.Errorf("failed to unescape request URL characters: %v", err)
+	}
+
 	// determine whether to add sudo capability
-	if IsSudoPath(d.path) {
+	if IsSudoPath(path) {
 		capabilities = append(capabilities, "sudo")
 	}
 
-	return formatOutputPolicy(d.path, capabilities), nil
-}
-
-func formatOutputPolicy(path string, capabilities []string) string {
 	// the OpenAPI response has a / in front of each path,
 	// but policies need the path without that leading slash
 	path = strings.TrimLeft(path, "/")
@@ -95,5 +78,5 @@ func formatOutputPolicy(path string, capabilities []string) string {
 	return fmt.Sprintf(
 		`path "%s" {
   capabilities = ["%s"]
-}`, path, capStr)
+}`, path, capStr), nil
 }
diff --git a/api/output_policy_test.go b/api/output_policy_test.go
deleted file mode 100644
index 2092e2ba2a016..0000000000000
--- a/api/output_policy_test.go
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package api
-
-import (
-	"net/http"
-	"net/url"
-	"testing"
-)
-
-func TestBuildSamplePolicy(t *testing.T) {
-	t.Parallel()
-
-	testCases := []struct {
-		name     string
-		req      *OutputPolicyError
-		expected string
-		err      error
-	}{
-		{
-			"happy path",
-			&OutputPolicyError{
-				method: http.MethodGet,
-				path:   "/something",
-			},
-			formatOutputPolicy("/something", []string{"read"}),
-			nil,
-		},
-		{ // test included to clear up some confusion around the sanitize comment
-			"demonstrate that this function does not format fully",
-			&OutputPolicyError{
-				method: http.MethodGet,
-				path:   "http://vault.test/v1/something",
-			},
-			formatOutputPolicy("http://vault.test/v1/something", []string{"read"}),
-			nil,
-		},
-		{ // test that list is properly returned
-			"list over read returned",
-			&OutputPolicyError{
-				method: http.MethodGet,
-				path:   "/something",
-				params: url.Values{
-					"list": []string{"true"},
-				},
-			},
-			formatOutputPolicy("/something", []string{"list"}),
-			nil,
-		},
-		{
-			"valid protected path",
-			&OutputPolicyError{
-				method: http.MethodGet,
-				path:   "/sys/config/ui/headers/",
-			},
-			formatOutputPolicy("/sys/config/ui/headers/", []string{"read", "sudo"}),
-			nil,
-		},
-		{ // ensure that a formatted path that trims the trailing slash as the code does still works for recognizing a sudo path
-			"valid protected path no trailing /",
-			&OutputPolicyError{
-				method: http.MethodGet,
-				path:   "/sys/config/ui/headers",
-			},
-			formatOutputPolicy("/sys/config/ui/headers", []string{"read", "sudo"}),
-			nil,
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			result, err := tc.req.buildSamplePolicy()
-			if tc.err != err {
-				t.Fatalf("expected for the error to be %v instead got %v\n", tc.err, err)
-			}
-
-			if tc.expected != result {
-				t.Fatalf("expected for the policy string to be %v instead got %v\n", tc.expected, result)
-			}
-		})
-	}
-}
diff --git a/api/output_string.go b/api/output_string.go
index d7777712d2095..80c591f20b5c7 100644
--- a/api/output_string.go
+++ b/api/output_string.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/plugin_helpers.go b/api/plugin_helpers.go
index 507b72c4c20de..2b1b35c3b593e 100644
--- a/api/plugin_helpers.go
+++ b/api/plugin_helpers.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
@@ -14,7 +11,7 @@ import (
 	"os"
 	"regexp"
 
-	"github.com/go-jose/go-jose/v3/jwt"
+	squarejwt "gopkg.in/square/go-jose.v2/jwt"
 
 	"github.com/hashicorp/errwrap"
 )
@@ -40,7 +37,7 @@ const (
 // path matches that path or not (useful specifically for the paths that
 // contain templated fields.)
 var sudoPaths = map[string]*regexp.Regexp{
-	"/auth/token/accessors/":                        regexp.MustCompile(`^/auth/token/accessors/?$`),
+	"/auth/token/accessors/":                        regexp.MustCompile(`^/auth/token/accessors/$`),
 	"/pki/root":                                     regexp.MustCompile(`^/pki/root$`),
 	"/pki/root/sign-self-issued":                    regexp.MustCompile(`^/pki/root/sign-self-issued$`),
 	"/sys/audit":                                    regexp.MustCompile(`^/sys/audit$`),
@@ -50,10 +47,10 @@ var sudoPaths = map[string]*regexp.Regexp{
 	"/sys/config/auditing/request-headers":          regexp.MustCompile(`^/sys/config/auditing/request-headers$`),
 	"/sys/config/auditing/request-headers/{header}": regexp.MustCompile(`^/sys/config/auditing/request-headers/.+$`),
 	"/sys/config/cors":                              regexp.MustCompile(`^/sys/config/cors$`),
-	"/sys/config/ui/headers/":                       regexp.MustCompile(`^/sys/config/ui/headers/?$`),
+	"/sys/config/ui/headers/":                       regexp.MustCompile(`^/sys/config/ui/headers/$`),
 	"/sys/config/ui/headers/{header}":               regexp.MustCompile(`^/sys/config/ui/headers/.+$`),
 	"/sys/leases":                                   regexp.MustCompile(`^/sys/leases$`),
-	"/sys/leases/lookup/":                           regexp.MustCompile(`^/sys/leases/lookup/?$`),
+	"/sys/leases/lookup/":                           regexp.MustCompile(`^/sys/leases/lookup/$`),
 	"/sys/leases/lookup/{prefix}":                   regexp.MustCompile(`^/sys/leases/lookup/.+$`),
 	"/sys/leases/revoke-force/{prefix}":             regexp.MustCompile(`^/sys/leases/revoke-force/.+$`),
 	"/sys/leases/revoke-prefix/{prefix}":            regexp.MustCompile(`^/sys/leases/revoke-prefix/.+$`),
@@ -66,14 +63,13 @@ var sudoPaths = map[string]*regexp.Regexp{
 	"/sys/revoke-force/{prefix}":                    regexp.MustCompile(`^/sys/revoke-force/.+$`),
 	"/sys/revoke-prefix/{prefix}":                   regexp.MustCompile(`^/sys/revoke-prefix/.+$`),
 	"/sys/rotate":                                   regexp.MustCompile(`^/sys/rotate$`),
-	"/sys/internal/inspect/router/{tag}":            regexp.MustCompile(`^/sys/internal/inspect/router/.+$`),
 
 	// enterprise-only paths
 	"/sys/replication/dr/primary/secondary-token":          regexp.MustCompile(`^/sys/replication/dr/primary/secondary-token$`),
 	"/sys/replication/performance/primary/secondary-token": regexp.MustCompile(`^/sys/replication/performance/primary/secondary-token$`),
 	"/sys/replication/primary/secondary-token":             regexp.MustCompile(`^/sys/replication/primary/secondary-token$`),
 	"/sys/replication/reindex":                             regexp.MustCompile(`^/sys/replication/reindex$`),
-	"/sys/storage/raft/snapshot-auto/config/":              regexp.MustCompile(`^/sys/storage/raft/snapshot-auto/config/?$`),
+	"/sys/storage/raft/snapshot-auto/config/":              regexp.MustCompile(`^/sys/storage/raft/snapshot-auto/config/$`),
 	"/sys/storage/raft/snapshot-auto/config/{name}":        regexp.MustCompile(`^/sys/storage/raft/snapshot-auto/config/[^/]+$`),
 }
 
@@ -135,7 +131,7 @@ func VaultPluginTLSProviderContext(ctx context.Context, apiTLSConfig *TLSConfig)
 	return func() (*tls.Config, error) {
 		unwrapToken := os.Getenv(PluginUnwrapTokenEnv)
 
-		parsedJWT, err := jwt.ParseSigned(unwrapToken)
+		parsedJWT, err := squarejwt.ParseSigned(unwrapToken)
 		if err != nil {
 			return nil, errwrap.Wrapf("error parsing wrapping token: {{err}}", err)
 		}
diff --git a/api/plugin_helpers_test.go b/api/plugin_helpers_test.go
index 7b3ddbf8154af..453720ea7a5aa 100644
--- a/api/plugin_helpers_test.go
+++ b/api/plugin_helpers_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import "testing"
diff --git a/api/plugin_types.go b/api/plugin_types.go
deleted file mode 100644
index 4c759a2decc51..0000000000000
--- a/api/plugin_types.go
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package api
-
-// NOTE: this file was copied from
-// https://github.com/hashicorp/vault/blob/main/sdk/helper/consts/plugin_types.go
-// Any changes made should be made to both files at the same time.
-
-import "fmt"
-
-var PluginTypes = []PluginType{
-	PluginTypeUnknown,
-	PluginTypeCredential,
-	PluginTypeDatabase,
-	PluginTypeSecrets,
-}
-
-type PluginType uint32
-
-// This is a list of PluginTypes used by Vault.
-// If we need to add any in the future, it would
-// be best to add them to the _end_ of the list below
-// because they resolve to incrementing numbers,
-// which may be saved in state somewhere. Thus if
-// the name for one of those numbers changed because
-// a value were added to the middle, that could cause
-// the wrong plugin types to be read from storage
-// for a given underlying number. Example of the problem
-// here: https://play.golang.org/p/YAaPw5ww3er
-const (
-	PluginTypeUnknown PluginType = iota
-	PluginTypeCredential
-	PluginTypeDatabase
-	PluginTypeSecrets
-)
-
-func (p PluginType) String() string {
-	switch p {
-	case PluginTypeUnknown:
-		return "unknown"
-	case PluginTypeCredential:
-		return "auth"
-	case PluginTypeDatabase:
-		return "database"
-	case PluginTypeSecrets:
-		return "secret"
-	default:
-		return "unsupported"
-	}
-}
-
-func ParsePluginType(pluginType string) (PluginType, error) {
-	switch pluginType {
-	case "unknown":
-		return PluginTypeUnknown, nil
-	case "auth":
-		return PluginTypeCredential, nil
-	case "database":
-		return PluginTypeDatabase, nil
-	case "secret":
-		return PluginTypeSecrets, nil
-	default:
-		return PluginTypeUnknown, fmt.Errorf("%q is not a supported plugin type", pluginType)
-	}
-}
diff --git a/api/renewer_test.go b/api/renewer_test.go
index 7ba16e66eca24..3b28d8546d42d 100644
--- a/api/renewer_test.go
+++ b/api/renewer_test.go
@@ -1,15 +1,9 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
 	"errors"
 	"fmt"
-	"math/rand"
-	"reflect"
 	"testing"
-	"testing/quick"
 	"time"
 
 	"github.com/go-test/deep"
@@ -239,47 +233,3 @@ func TestLifetimeWatcher(t *testing.T) {
 		})
 	}
 }
-
-// TestCalcSleepPeriod uses property based testing to evaluate the calculateSleepDuration
-// function of LifeTimeWatchers, but also incidentally tests "calculateGrace".
-// This is on account of "calculateSleepDuration" performing the "calculateGrace"
-// function in particular instances.
-// Both of these functions support the vital functionality of the LifeTimeWatcher
-// and therefore should be tested rigorously.
-func TestCalcSleepPeriod(t *testing.T) {
-	c := quick.Config{
-		MaxCount: 10000,
-		Values: func(values []reflect.Value, r *rand.Rand) {
-			leaseDuration := r.Int63()
-			priorDuration := r.Int63n(leaseDuration)
-			remainingLeaseDuration := r.Int63n(priorDuration)
-			increment := r.Int63n(remainingLeaseDuration)
-
-			values[0] = reflect.ValueOf(r)
-			values[1] = reflect.ValueOf(time.Duration(leaseDuration))
-			values[2] = reflect.ValueOf(time.Duration(priorDuration))
-			values[3] = reflect.ValueOf(time.Duration(remainingLeaseDuration))
-			values[4] = reflect.ValueOf(time.Duration(increment))
-		},
-	}
-
-	// tests that "calculateSleepDuration" will always return a value less than
-	// the remaining lease duration given a random leaseDuration, priorDuration, remainingLeaseDuration, and increment.
-	// Inputs are generated so that:
-	// leaseDuration > priorDuration > remainingLeaseDuration
-	// and remainingLeaseDuration > increment
-	if err := quick.Check(func(r *rand.Rand, leaseDuration, priorDuration, remainingLeaseDuration, increment time.Duration) bool {
-		lw := LifetimeWatcher{
-			grace:     0,
-			increment: int(increment.Seconds()),
-			random:    r,
-		}
-
-		lw.calculateGrace(remainingLeaseDuration, increment)
-
-		// ensure that we sleep for less than the remaining lease.
-		return lw.calculateSleepDuration(remainingLeaseDuration, priorDuration) < remainingLeaseDuration
-	}, &c); err != nil {
-		t.Error(err)
-	}
-}
diff --git a/api/replication_status.go b/api/replication_status.go
deleted file mode 100644
index 1668daf19c127..0000000000000
--- a/api/replication_status.go
+++ /dev/null
@@ -1,130 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package api
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"net/http"
-
-	"github.com/mitchellh/mapstructure"
-)
-
-const (
-	apiRepPerformanceStatusPath = "/v1/sys/replication/performance/status"
-	apiRepDRStatusPath          = "/v1/sys/replication/dr/status"
-	apiRepStatusPath            = "/v1/sys/replication/status"
-)
-
-type ClusterInfo struct {
-	APIAddr          string `json:"api_address,omitempty" mapstructure:"api_address"`
-	ClusterAddress   string `json:"cluster_address,omitempty" mapstructure:"cluster_address"`
-	ConnectionStatus string `json:"connection_status,omitempty" mapstructure:"connection_status"`
-	LastHeartBeat    string `json:"last_heartbeat,omitempty" mapstructure:"last_heartbeat"`
-	NodeID           string `json:"node_id,omitempty" mapstructure:"node_id"`
-}
-
-type ReplicationStatusGenericResponse struct {
-	LastDRWAL             uint64 `json:"last_dr_wal,omitempty" mapstructure:"last_dr_wal"`
-	LastReindexEpoch      string `json:"last_reindex_epoch,omitempty" mapstructure:"last_reindex_epoch"`
-	ClusterID             string `json:"cluster_id,omitempty" mapstructure:"cluster_id"`
-	LastWAL               uint64 `json:"last_wal,omitempty" mapstructure:"last_wal"`
-	MerkleRoot            string `json:"merkle_root,omitempty" mapstructure:"merkle_root"`
-	Mode                  string `json:"mode,omitempty" mapstructure:"mode"`
-	PrimaryClusterAddr    string `json:"primary_cluster_addr,omitempty" mapstructure:"primary_cluster_addr"`
-	LastPerformanceWAL    uint64 `json:"last_performance_wal,omitempty" mapstructure:"last_performance_wal"`
-	State                 string `json:"state,omitempty" mapstructure:"state"`
-	LastRemoteWAL         uint64 `json:"last_remote_wal,omitempty" mapstructure:"last_remote_wal"`
-	SecondaryID           string `json:"secondary_id,omitempty" mapstructure:"secondary_id"`
-	SSCTGenerationCounter uint64 `json:"ssct_generation_counter,omitempty" mapstructure:"ssct_generation_counter"`
-
-	KnownSecondaries         []string      `json:"known_secondaries,omitempty" mapstructure:"known_secondaries"`
-	KnownPrimaryClusterAddrs []string      `json:"known_primary_cluster_addrs,omitempty" mapstructure:"known_primary_cluster_addrs"`
-	Primaries                []ClusterInfo `json:"primaries,omitempty" mapstructure:"primaries"`
-	Secondaries              []ClusterInfo `json:"secondaries,omitempty" mapstructure:"secondaries"`
-}
-
-type ReplicationStatusResponse struct {
-	DR          ReplicationStatusGenericResponse `json:"dr,omitempty" mapstructure:"dr"`
-	Performance ReplicationStatusGenericResponse `json:"performance,omitempty" mapstructure:"performance"`
-}
-
-func (c *Sys) ReplicationStatus() (*ReplicationStatusResponse, error) {
-	return c.ReplicationStatusWithContext(context.Background(), apiRepStatusPath)
-}
-
-func (c *Sys) ReplicationPerformanceStatusWithContext(ctx context.Context) (*ReplicationStatusGenericResponse, error) {
-	s, err := c.ReplicationStatusWithContext(ctx, apiRepPerformanceStatusPath)
-	if err != nil {
-		return nil, err
-	}
-
-	return &s.Performance, nil
-}
-
-func (c *Sys) ReplicationDRStatusWithContext(ctx context.Context) (*ReplicationStatusGenericResponse, error) {
-	s, err := c.ReplicationStatusWithContext(ctx, apiRepDRStatusPath)
-	if err != nil {
-		return nil, err
-	}
-
-	return &s.DR, nil
-}
-
-func (c *Sys) ReplicationStatusWithContext(ctx context.Context, path string) (*ReplicationStatusResponse, error) {
-	// default to replication/status
-	if path == "" {
-		path = apiRepStatusPath
-	}
-
-	ctx, cancelFunc := c.c.withConfiguredTimeout(ctx)
-	defer cancelFunc()
-
-	r := c.c.NewRequest(http.MethodGet, path)
-
-	resp, err := c.c.rawRequestWithContext(ctx, r)
-	if err != nil {
-		return nil, err
-	}
-	defer func() { _ = resp.Body.Close() }()
-
-	// First decode response into a map[string]interface{}
-	data := make(map[string]interface{})
-	dec := json.NewDecoder(resp.Body)
-	dec.UseNumber()
-	if err := dec.Decode(&data); err != nil {
-		return nil, err
-	}
-
-	rawData, ok := data["data"]
-	if !ok {
-		return nil, fmt.Errorf("empty data in replication status response")
-	}
-
-	s := &ReplicationStatusResponse{}
-	g := &ReplicationStatusGenericResponse{}
-	switch {
-	case path == apiRepPerformanceStatusPath:
-		err = mapstructure.Decode(rawData, g)
-		if err != nil {
-			return nil, err
-		}
-		s.Performance = *g
-	case path == apiRepDRStatusPath:
-		err = mapstructure.Decode(rawData, g)
-		if err != nil {
-			return nil, err
-		}
-		s.DR = *g
-	default:
-		err = mapstructure.Decode(rawData, s)
-		if err != nil {
-			return nil, err
-		}
-		return s, err
-	}
-
-	return s, err
-}
diff --git a/api/request.go b/api/request.go
index ecf783701ad4b..1cbbc62f908b1 100644
--- a/api/request.go
+++ b/api/request.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
@@ -11,6 +8,8 @@ import (
 	"net/http"
 	"net/url"
 
+	"github.com/hashicorp/vault/sdk/helper/consts"
+
 	retryablehttp "github.com/hashicorp/go-retryablehttp"
 )
 
@@ -128,7 +127,7 @@ func (r *Request) toRetryableHTTP() (*retryablehttp.Request, error) {
 	}
 
 	if len(r.ClientToken) != 0 {
-		req.Header.Set(AuthHeaderName, r.ClientToken)
+		req.Header.Set(consts.AuthHeaderName, r.ClientToken)
 	}
 
 	if len(r.WrapTTL) != 0 {
diff --git a/api/request_test.go b/api/request_test.go
index ac21b80198728..f2657e61c5038 100644
--- a/api/request_test.go
+++ b/api/request_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/response.go b/api/response.go
index 2842c125514a4..9ce3d12aacca1 100644
--- a/api/response.go
+++ b/api/response.go
@@ -1,15 +1,14 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
 	"bytes"
-	"encoding/json"
 	"fmt"
 	"io"
 	"io/ioutil"
 	"net/http"
+
+	"github.com/hashicorp/vault/sdk/helper/consts"
+	"github.com/hashicorp/vault/sdk/helper/jsonutil"
 )
 
 // Response is a raw response that wraps an HTTP response.
@@ -21,9 +20,7 @@ type Response struct {
 // will consume the response body, but will not close it. Close must
 // still be called.
 func (r *Response) DecodeJSON(out interface{}) error {
-	dec := json.NewDecoder(r.Body)
-	dec.UseNumber()
-	return dec.Decode(out)
+	return jsonutil.DecodeJSONFromReader(r.Body, out)
 }
 
 // Error returns an error response if there is one. If there is an error,
@@ -45,7 +42,7 @@ func (r *Response) Error() error {
 
 	r.Body.Close()
 	r.Body = ioutil.NopCloser(bodyBuf)
-	ns := r.Header.Get(NamespaceHeaderName)
+	ns := r.Header.Get(consts.NamespaceHeaderName)
 
 	// Build up the error object
 	respErr := &ResponseError{
@@ -59,9 +56,7 @@ func (r *Response) Error() error {
 	// in a bytes.Reader here so that the JSON decoder doesn't move the
 	// read pointer for the original buffer.
 	var resp ErrorResponse
-	dec := json.NewDecoder(bytes.NewReader(bodyBuf.Bytes()))
-	dec.UseNumber()
-	if err := dec.Decode(&resp); err != nil {
+	if err := jsonutil.DecodeJSON(bodyBuf.Bytes(), &resp); err != nil {
 		// Store the fact that we couldn't decode the errors
 		respErr.RawError = true
 		respErr.Errors = []string{bodyBuf.String()}
diff --git a/api/secret.go b/api/secret.go
index 3d15f7a806a6e..feb7dfdf96597 100644
--- a/api/secret.go
+++ b/api/secret.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
@@ -14,6 +11,8 @@ import (
 
 	"github.com/hashicorp/errwrap"
 	"github.com/hashicorp/go-secure-stdlib/parseutil"
+	"github.com/hashicorp/vault/sdk/helper/jsonutil"
+	"github.com/hashicorp/vault/sdk/logical"
 )
 
 // Secret is the structure returned for every secret within Vault.
@@ -284,22 +283,6 @@ type SecretWrapInfo struct {
 	WrappedAccessor string    `json:"wrapped_accessor"`
 }
 
-type MFAMethodID struct {
-	Type         string `json:"type,omitempty"`
-	ID           string `json:"id,omitempty"`
-	UsesPasscode bool   `json:"uses_passcode,omitempty"`
-	Name         string `json:"name,omitempty"`
-}
-
-type MFAConstraintAny struct {
-	Any []*MFAMethodID `json:"any,omitempty"`
-}
-
-type MFARequirement struct {
-	MFARequestID   string                       `json:"mfa_request_id,omitempty"`
-	MFAConstraints map[string]*MFAConstraintAny `json:"mfa_constraints,omitempty"`
-}
-
 // SecretAuth is the structure containing auth information if we have it.
 type SecretAuth struct {
 	ClientToken      string            `json:"client_token"`
@@ -314,7 +297,7 @@ type SecretAuth struct {
 	LeaseDuration int  `json:"lease_duration"`
 	Renewable     bool `json:"renewable"`
 
-	MFARequirement *MFARequirement `json:"mfa_requirement"`
+	MFARequirement *logical.MFARequirement `json:"mfa_requirement"`
 }
 
 // ParseSecret is used to parse a secret value from JSON from an io.Reader.
@@ -340,18 +323,14 @@ func ParseSecret(r io.Reader) (*Secret, error) {
 
 	// First decode the JSON into a map[string]interface{}
 	var secret Secret
-	dec := json.NewDecoder(&buf)
-	dec.UseNumber()
-	if err := dec.Decode(&secret); err != nil {
+	if err := jsonutil.DecodeJSONFromReader(&buf, &secret); err != nil {
 		return nil, err
 	}
 
 	// If the secret is null, add raw data to secret data if present
 	if reflect.DeepEqual(secret, Secret{}) {
 		data := make(map[string]interface{})
-		dec := json.NewDecoder(&teebuf)
-		dec.UseNumber()
-		if err := dec.Decode(&data); err != nil {
+		if err := jsonutil.DecodeJSONFromReader(&teebuf, &data); err != nil {
 			return nil, err
 		}
 		errRaw, errPresent := data["errors"]
diff --git a/api/ssh.go b/api/ssh.go
index 28510eecc23f3..b832e27482909 100644
--- a/api/ssh.go
+++ b/api/ssh.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/ssh_agent.go b/api/ssh_agent.go
index e61503772fa3c..03fe2bea53ed2 100644
--- a/api/ssh_agent.go
+++ b/api/ssh_agent.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
@@ -18,6 +15,7 @@ import (
 	rootcerts "github.com/hashicorp/go-rootcerts"
 	"github.com/hashicorp/hcl"
 	"github.com/hashicorp/hcl/hcl/ast"
+	"github.com/hashicorp/vault/sdk/helper/hclutil"
 	"github.com/mitchellh/mapstructure"
 )
 
@@ -171,7 +169,7 @@ func ParseSSHHelperConfig(contents string) (*SSHHelperConfig, error) {
 		"tls_skip_verify",
 		"tls_server_name",
 	}
-	if err := CheckHCLKeys(list, valid); err != nil {
+	if err := hclutil.CheckHCLKeys(list, valid); err != nil {
 		return nil, multierror.Prefix(err, "ssh_helper:")
 	}
 
@@ -187,33 +185,6 @@ func ParseSSHHelperConfig(contents string) (*SSHHelperConfig, error) {
 	return &c, nil
 }
 
-func CheckHCLKeys(node ast.Node, valid []string) error {
-	var list *ast.ObjectList
-	switch n := node.(type) {
-	case *ast.ObjectList:
-		list = n
-	case *ast.ObjectType:
-		list = n.List
-	default:
-		return fmt.Errorf("cannot check HCL keys of type %T", n)
-	}
-
-	validMap := make(map[string]struct{}, len(valid))
-	for _, v := range valid {
-		validMap[v] = struct{}{}
-	}
-
-	var result error
-	for _, item := range list.Items {
-		key := item.Keys[0].Token.Value().(string)
-		if _, ok := validMap[key]; !ok {
-			result = multierror.Append(result, fmt.Errorf("invalid key %q on line %d", key, item.Assign.Line))
-		}
-	}
-
-	return result
-}
-
 // SSHHelper creates an SSHHelper object which can talk to Vault server with SSH backend
 // mounted at default path ("ssh").
 func (c *Client) SSHHelper() *SSHHelper {
diff --git a/api/ssh_agent_test.go b/api/ssh_agent_test.go
index 38117e42a7062..d233b09c476cf 100644
--- a/api/ssh_agent_test.go
+++ b/api/ssh_agent_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/sys.go b/api/sys.go
index 81ebb3a2509f2..5fb111887c0d3 100644
--- a/api/sys.go
+++ b/api/sys.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 // Sys is used to perform system-related operations on Vault.
diff --git a/api/sys_audit.go b/api/sys_audit.go
index 2244087aad588..82d9aab0b7a01 100644
--- a/api/sys_audit.go
+++ b/api/sys_audit.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/sys_auth.go b/api/sys_auth.go
index e814412191f35..238bd5e468a02 100644
--- a/api/sys_auth.go
+++ b/api/sys_auth.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/sys_capabilities.go b/api/sys_capabilities.go
index 6310d42fcf46c..af306a07f3126 100644
--- a/api/sys_capabilities.go
+++ b/api/sys_capabilities.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/sys_config_cors.go b/api/sys_config_cors.go
index e80aa9d8b4175..1e2cda4f48cbf 100644
--- a/api/sys_config_cors.go
+++ b/api/sys_config_cors.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/sys_generate_root.go b/api/sys_generate_root.go
index da4ad2f9b73ba..096cadb793d90 100644
--- a/api/sys_generate_root.go
+++ b/api/sys_generate_root.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/sys_hastatus.go b/api/sys_hastatus.go
index 2b2aa7c3e9806..d89d59651a92f 100644
--- a/api/sys_hastatus.go
+++ b/api/sys_hastatus.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/sys_health.go b/api/sys_health.go
index 13fd8d4d37432..953c1c21eaa3c 100644
--- a/api/sys_health.go
+++ b/api/sys_health.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/sys_init.go b/api/sys_init.go
index 13fa94806976b..05dea86f6ab5c 100644
--- a/api/sys_init.go
+++ b/api/sys_init.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/sys_leader.go b/api/sys_leader.go
index 868914d3b1394..a74e206ebed45 100644
--- a/api/sys_leader.go
+++ b/api/sys_leader.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/sys_leases.go b/api/sys_leases.go
index c46f07e64b41f..c02402f5314c3 100644
--- a/api/sys_leases.go
+++ b/api/sys_leases.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/sys_mfa.go b/api/sys_mfa.go
index 2be6695846486..a1ba1bd80f944 100644
--- a/api/sys_mfa.go
+++ b/api/sys_mfa.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/sys_monitor.go b/api/sys_monitor.go
index 15a8a13d175c9..6813799f01415 100644
--- a/api/sys_monitor.go
+++ b/api/sys_monitor.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
@@ -8,6 +5,8 @@ import (
 	"context"
 	"fmt"
 	"net/http"
+
+	"github.com/hashicorp/vault/sdk/helper/logging"
 )
 
 // Monitor returns a channel that outputs strings containing the log messages
@@ -21,7 +20,7 @@ func (c *Sys) Monitor(ctx context.Context, logLevel string, logFormat string) (c
 		r.Params.Add("log_level", logLevel)
 	}
 
-	if logFormat == "" {
+	if logFormat == "" || logFormat == logging.UnspecifiedFormat.String() {
 		r.Params.Add("log_format", "standard")
 	} else {
 		r.Params.Add("log_format", logFormat)
diff --git a/api/sys_mounts.go b/api/sys_mounts.go
index a6c2a0f5412e6..75173b4d8f2d8 100644
--- a/api/sys_mounts.go
+++ b/api/sys_mounts.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
@@ -257,20 +254,20 @@ type MountInput struct {
 }
 
 type MountConfigInput struct {
-	Options                   map[string]string       `json:"options" mapstructure:"options"`
-	DefaultLeaseTTL           string                  `json:"default_lease_ttl" mapstructure:"default_lease_ttl"`
-	Description               *string                 `json:"description,omitempty" mapstructure:"description"`
-	MaxLeaseTTL               string                  `json:"max_lease_ttl" mapstructure:"max_lease_ttl"`
-	ForceNoCache              bool                    `json:"force_no_cache" mapstructure:"force_no_cache"`
-	AuditNonHMACRequestKeys   []string                `json:"audit_non_hmac_request_keys,omitempty" mapstructure:"audit_non_hmac_request_keys"`
-	AuditNonHMACResponseKeys  []string                `json:"audit_non_hmac_response_keys,omitempty" mapstructure:"audit_non_hmac_response_keys"`
-	ListingVisibility         string                  `json:"listing_visibility,omitempty" mapstructure:"listing_visibility"`
-	PassthroughRequestHeaders []string                `json:"passthrough_request_headers,omitempty" mapstructure:"passthrough_request_headers"`
-	AllowedResponseHeaders    []string                `json:"allowed_response_headers,omitempty" mapstructure:"allowed_response_headers"`
-	TokenType                 string                  `json:"token_type,omitempty" mapstructure:"token_type"`
-	AllowedManagedKeys        []string                `json:"allowed_managed_keys,omitempty" mapstructure:"allowed_managed_keys"`
-	PluginVersion             string                  `json:"plugin_version,omitempty"`
-	UserLockoutConfig         *UserLockoutConfigInput `json:"user_lockout_config,omitempty"`
+	Options                   map[string]string `json:"options" mapstructure:"options"`
+	DefaultLeaseTTL           string            `json:"default_lease_ttl" mapstructure:"default_lease_ttl"`
+	Description               *string           `json:"description,omitempty" mapstructure:"description"`
+	MaxLeaseTTL               string            `json:"max_lease_ttl" mapstructure:"max_lease_ttl"`
+	ForceNoCache              bool              `json:"force_no_cache" mapstructure:"force_no_cache"`
+	AuditNonHMACRequestKeys   []string          `json:"audit_non_hmac_request_keys,omitempty" mapstructure:"audit_non_hmac_request_keys"`
+	AuditNonHMACResponseKeys  []string          `json:"audit_non_hmac_response_keys,omitempty" mapstructure:"audit_non_hmac_response_keys"`
+	ListingVisibility         string            `json:"listing_visibility,omitempty" mapstructure:"listing_visibility"`
+	PassthroughRequestHeaders []string          `json:"passthrough_request_headers,omitempty" mapstructure:"passthrough_request_headers"`
+	AllowedResponseHeaders    []string          `json:"allowed_response_headers,omitempty" mapstructure:"allowed_response_headers"`
+	TokenType                 string            `json:"token_type,omitempty" mapstructure:"token_type"`
+	AllowedManagedKeys        []string          `json:"allowed_managed_keys,omitempty" mapstructure:"allowed_managed_keys"`
+	PluginVersion             string            `json:"plugin_version,omitempty"`
+
 	// Deprecated: This field will always be blank for newer server responses.
 	PluginName string `json:"plugin_name,omitempty" mapstructure:"plugin_name"`
 }
@@ -292,35 +289,21 @@ type MountOutput struct {
 }
 
 type MountConfigOutput struct {
-	DefaultLeaseTTL           int                      `json:"default_lease_ttl" mapstructure:"default_lease_ttl"`
-	MaxLeaseTTL               int                      `json:"max_lease_ttl" mapstructure:"max_lease_ttl"`
-	ForceNoCache              bool                     `json:"force_no_cache" mapstructure:"force_no_cache"`
-	AuditNonHMACRequestKeys   []string                 `json:"audit_non_hmac_request_keys,omitempty" mapstructure:"audit_non_hmac_request_keys"`
-	AuditNonHMACResponseKeys  []string                 `json:"audit_non_hmac_response_keys,omitempty" mapstructure:"audit_non_hmac_response_keys"`
-	ListingVisibility         string                   `json:"listing_visibility,omitempty" mapstructure:"listing_visibility"`
-	PassthroughRequestHeaders []string                 `json:"passthrough_request_headers,omitempty" mapstructure:"passthrough_request_headers"`
-	AllowedResponseHeaders    []string                 `json:"allowed_response_headers,omitempty" mapstructure:"allowed_response_headers"`
-	TokenType                 string                   `json:"token_type,omitempty" mapstructure:"token_type"`
-	AllowedManagedKeys        []string                 `json:"allowed_managed_keys,omitempty" mapstructure:"allowed_managed_keys"`
-	UserLockoutConfig         *UserLockoutConfigOutput `json:"user_lockout_config,omitempty"`
+	DefaultLeaseTTL           int      `json:"default_lease_ttl" mapstructure:"default_lease_ttl"`
+	MaxLeaseTTL               int      `json:"max_lease_ttl" mapstructure:"max_lease_ttl"`
+	ForceNoCache              bool     `json:"force_no_cache" mapstructure:"force_no_cache"`
+	AuditNonHMACRequestKeys   []string `json:"audit_non_hmac_request_keys,omitempty" mapstructure:"audit_non_hmac_request_keys"`
+	AuditNonHMACResponseKeys  []string `json:"audit_non_hmac_response_keys,omitempty" mapstructure:"audit_non_hmac_response_keys"`
+	ListingVisibility         string   `json:"listing_visibility,omitempty" mapstructure:"listing_visibility"`
+	PassthroughRequestHeaders []string `json:"passthrough_request_headers,omitempty" mapstructure:"passthrough_request_headers"`
+	AllowedResponseHeaders    []string `json:"allowed_response_headers,omitempty" mapstructure:"allowed_response_headers"`
+	TokenType                 string   `json:"token_type,omitempty" mapstructure:"token_type"`
+	AllowedManagedKeys        []string `json:"allowed_managed_keys,omitempty" mapstructure:"allowed_managed_keys"`
+
 	// Deprecated: This field will always be blank for newer server responses.
 	PluginName string `json:"plugin_name,omitempty" mapstructure:"plugin_name"`
 }
 
-type UserLockoutConfigInput struct {
-	LockoutThreshold            string `json:"lockout_threshold,omitempty" structs:"lockout_threshold" mapstructure:"lockout_threshold"`
-	LockoutDuration             string `json:"lockout_duration,omitempty" structs:"lockout_duration" mapstructure:"lockout_duration"`
-	LockoutCounterResetDuration string `json:"lockout_counter_reset_duration,omitempty" structs:"lockout_counter_reset_duration" mapstructure:"lockout_counter_reset_duration"`
-	DisableLockout              *bool  `json:"lockout_disable,omitempty" structs:"lockout_disable" mapstructure:"lockout_disable"`
-}
-
-type UserLockoutConfigOutput struct {
-	LockoutThreshold    uint  `json:"lockout_threshold,omitempty" structs:"lockout_threshold" mapstructure:"lockout_threshold"`
-	LockoutDuration     int   `json:"lockout_duration,omitempty" structs:"lockout_duration" mapstructure:"lockout_duration"`
-	LockoutCounterReset int   `json:"lockout_counter_reset,omitempty" structs:"lockout_counter_reset" mapstructure:"lockout_counter_reset"`
-	DisableLockout      *bool `json:"disable_lockout,omitempty" structs:"disable_lockout" mapstructure:"disable_lockout"`
-}
-
 type MountMigrationOutput struct {
 	MigrationID string `mapstructure:"migration_id"`
 }
diff --git a/api/sys_mounts_test.go b/api/sys_mounts_test.go
index a810c6268a1c7..d461a9d495cf8 100644
--- a/api/sys_mounts_test.go
+++ b/api/sys_mounts_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/sys_plugins.go b/api/sys_plugins.go
index 2ee024d9defc8..989c78f1d5baa 100644
--- a/api/sys_plugins.go
+++ b/api/sys_plugins.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
@@ -10,19 +7,20 @@ import (
 	"net/http"
 	"time"
 
+	"github.com/hashicorp/vault/sdk/helper/consts"
 	"github.com/mitchellh/mapstructure"
 )
 
 // ListPluginsInput is used as input to the ListPlugins function.
 type ListPluginsInput struct {
 	// Type of the plugin. Required.
-	Type PluginType `json:"type"`
+	Type consts.PluginType `json:"type"`
 }
 
 // ListPluginsResponse is the response from the ListPlugins call.
 type ListPluginsResponse struct {
 	// PluginsByType is the list of plugins by type.
-	PluginsByType map[PluginType][]string `json:"types"`
+	PluginsByType map[consts.PluginType][]string `json:"types"`
 
 	Details []PluginDetails `json:"details,omitempty"`
 
@@ -70,11 +68,11 @@ func (c *Sys) ListPluginsWithContext(ctx context.Context, i *ListPluginsInput) (
 	}
 
 	result := &ListPluginsResponse{
-		PluginsByType: make(map[PluginType][]string),
+		PluginsByType: make(map[consts.PluginType][]string),
 	}
 	switch i.Type {
-	case PluginTypeUnknown:
-		for _, pluginType := range PluginTypes {
+	case consts.PluginTypeUnknown:
+		for _, pluginType := range consts.PluginTypes {
 			pluginsRaw, ok := secret.Data[pluginType.String()]
 			if !ok {
 				continue
@@ -115,7 +113,7 @@ func (c *Sys) ListPluginsWithContext(ctx context.Context, i *ListPluginsInput) (
 		}
 
 		switch i.Type {
-		case PluginTypeUnknown:
+		case consts.PluginTypeUnknown:
 			result.Details = details
 		default:
 			// Filter for just the queried type.
@@ -135,8 +133,8 @@ type GetPluginInput struct {
 	Name string `json:"-"`
 
 	// Type of the plugin. Required.
-	Type    PluginType `json:"type"`
-	Version string     `json:"version"`
+	Type    consts.PluginType `json:"type"`
+	Version string            `json:"version"`
 }
 
 // GetPluginResponse is the response from the GetPlugin call.
@@ -188,7 +186,7 @@ type RegisterPluginInput struct {
 	Name string `json:"-"`
 
 	// Type of the plugin. Required.
-	Type PluginType `json:"type"`
+	Type consts.PluginType `json:"type"`
 
 	// Args is the list of args to spawn the process with.
 	Args []string `json:"args,omitempty"`
@@ -233,7 +231,7 @@ type DeregisterPluginInput struct {
 	Name string `json:"-"`
 
 	// Type of the plugin. Required.
-	Type PluginType `json:"type"`
+	Type consts.PluginType `json:"type"`
 
 	// Version of the plugin. Optional.
 	Version string `json:"version,omitempty"`
@@ -370,11 +368,11 @@ func (c *Sys) ReloadPluginStatusWithContext(ctx context.Context, reloadStatusInp
 }
 
 // catalogPathByType is a helper to construct the proper API path by plugin type
-func catalogPathByType(pluginType PluginType, name string) string {
+func catalogPathByType(pluginType consts.PluginType, name string) string {
 	path := fmt.Sprintf("/v1/sys/plugins/catalog/%s/%s", pluginType, name)
 
 	// Backwards compat, if type is not provided then use old path
-	if pluginType == PluginTypeUnknown {
+	if pluginType == consts.PluginTypeUnknown {
 		path = fmt.Sprintf("/v1/sys/plugins/catalog/%s", name)
 	}
 
diff --git a/api/sys_plugins_test.go b/api/sys_plugins_test.go
index 3673181472a7d..b3b94d7302893 100644
--- a/api/sys_plugins_test.go
+++ b/api/sys_plugins_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
@@ -10,7 +7,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/hashicorp/go-secure-stdlib/strutil"
+	"github.com/hashicorp/vault/sdk/helper/consts"
+	"github.com/hashicorp/vault/sdk/helper/strutil"
 )
 
 func TestRegisterPlugin(t *testing.T) {
@@ -45,32 +43,32 @@ func TestListPlugins(t *testing.T) {
 
 	for name, tc := range map[string]struct {
 		input           ListPluginsInput
-		expectedPlugins map[PluginType][]string
+		expectedPlugins map[consts.PluginType][]string
 	}{
 		"no type specified": {
 			input: ListPluginsInput{},
-			expectedPlugins: map[PluginType][]string{
-				PluginTypeCredential: {"alicloud"},
-				PluginTypeDatabase:   {"cassandra-database-plugin"},
-				PluginTypeSecrets:    {"ad", "alicloud"},
+			expectedPlugins: map[consts.PluginType][]string{
+				consts.PluginTypeCredential: {"alicloud"},
+				consts.PluginTypeDatabase:   {"cassandra-database-plugin"},
+				consts.PluginTypeSecrets:    {"ad", "alicloud"},
 			},
 		},
 		"only auth plugins": {
-			input: ListPluginsInput{Type: PluginTypeCredential},
-			expectedPlugins: map[PluginType][]string{
-				PluginTypeCredential: {"alicloud"},
+			input: ListPluginsInput{Type: consts.PluginTypeCredential},
+			expectedPlugins: map[consts.PluginType][]string{
+				consts.PluginTypeCredential: {"alicloud"},
 			},
 		},
 		"only database plugins": {
-			input: ListPluginsInput{Type: PluginTypeDatabase},
-			expectedPlugins: map[PluginType][]string{
-				PluginTypeDatabase: {"cassandra-database-plugin"},
+			input: ListPluginsInput{Type: consts.PluginTypeDatabase},
+			expectedPlugins: map[consts.PluginType][]string{
+				consts.PluginTypeDatabase: {"cassandra-database-plugin"},
 			},
 		},
 		"only secret plugins": {
-			input: ListPluginsInput{Type: PluginTypeSecrets},
-			expectedPlugins: map[PluginType][]string{
-				PluginTypeSecrets: {"ad", "alicloud"},
+			input: ListPluginsInput{Type: consts.PluginTypeSecrets},
+			expectedPlugins: map[consts.PluginType][]string{
+				consts.PluginTypeSecrets: {"ad", "alicloud"},
 			},
 		},
 	} {
@@ -106,7 +104,7 @@ func TestListPlugins(t *testing.T) {
 			}
 
 			for _, actual := range resp.Details {
-				pluginType, err := ParsePluginType(actual.Type)
+				pluginType, err := consts.ParsePluginType(actual.Type)
 				if err != nil {
 					t.Fatal(err)
 				}
@@ -175,7 +173,7 @@ func TestGetPlugin(t *testing.T) {
 
 			input := GetPluginInput{
 				Name: "azure",
-				Type: PluginTypeSecrets,
+				Type: consts.PluginTypeSecrets,
 			}
 			if tc.version != "" {
 				input.Version = tc.version
diff --git a/api/sys_policy.go b/api/sys_policy.go
index 9ddffe4ec7c4a..4a4f91b08c71e 100644
--- a/api/sys_policy.go
+++ b/api/sys_policy.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/sys_raft.go b/api/sys_raft.go
index 29bfed0f5613b..7806a1418df83 100644
--- a/api/sys_raft.go
+++ b/api/sys_raft.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/sys_rekey.go b/api/sys_rekey.go
index 573201751c7b9..2ac8a4743bcfd 100644
--- a/api/sys_rekey.go
+++ b/api/sys_rekey.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/sys_rotate.go b/api/sys_rotate.go
index 295d989f9e2a1..fa86886c35b8e 100644
--- a/api/sys_rotate.go
+++ b/api/sys_rotate.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/sys_seal.go b/api/sys_seal.go
index 7a9c5621ed194..c772ae0fc2600 100644
--- a/api/sys_seal.go
+++ b/api/sys_seal.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
@@ -96,23 +93,22 @@ func sealStatusRequestWithContext(ctx context.Context, c *Sys, r *Request) (*Sea
 }
 
 type SealStatusResponse struct {
-	Type              string   `json:"type"`
-	Initialized       bool     `json:"initialized"`
-	Sealed            bool     `json:"sealed"`
-	T                 int      `json:"t"`
-	N                 int      `json:"n"`
-	Progress          int      `json:"progress"`
-	Nonce             string   `json:"nonce"`
-	Version           string   `json:"version"`
-	BuildDate         string   `json:"build_date"`
-	Migration         bool     `json:"migration"`
-	ClusterName       string   `json:"cluster_name,omitempty"`
-	ClusterID         string   `json:"cluster_id,omitempty"`
-	RecoverySeal      bool     `json:"recovery_seal"`
-	StorageType       string   `json:"storage_type,omitempty"`
-	HCPLinkStatus     string   `json:"hcp_link_status,omitempty"`
-	HCPLinkResourceID string   `json:"hcp_link_resource_ID,omitempty"`
-	Warnings          []string `json:"warnings,omitempty"`
+	Type              string `json:"type"`
+	Initialized       bool   `json:"initialized"`
+	Sealed            bool   `json:"sealed"`
+	T                 int    `json:"t"`
+	N                 int    `json:"n"`
+	Progress          int    `json:"progress"`
+	Nonce             string `json:"nonce"`
+	Version           string `json:"version"`
+	BuildDate         string `json:"build_date"`
+	Migration         bool   `json:"migration"`
+	ClusterName       string `json:"cluster_name,omitempty"`
+	ClusterID         string `json:"cluster_id,omitempty"`
+	RecoverySeal      bool   `json:"recovery_seal"`
+	StorageType       string `json:"storage_type,omitempty"`
+	HCPLinkStatus     string `json:"hcp_link_status,omitempty"`
+	HCPLinkResourceID string `json:"hcp_link_resource_ID,omitempty"`
 }
 
 type UnsealOpts struct {
diff --git a/api/sys_stepdown.go b/api/sys_stepdown.go
index c55ed1e666db9..833f31a6f7602 100644
--- a/api/sys_stepdown.go
+++ b/api/sys_stepdown.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/test-fixtures/agent_config.hcl b/api/test-fixtures/agent_config.hcl
index 38d8026057f52..8339f53d7eaad 100644
--- a/api/test-fixtures/agent_config.hcl
+++ b/api/test-fixtures/agent_config.hcl
@@ -1,5 +1,2 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 vault_addr="http://127.0.0.1:8200"
 ssh_mount_point="ssh"
diff --git a/audit/audit.go b/audit/audit.go
index 35a3d38a0558d..5641b449af309 100644
--- a/audit/audit.go
+++ b/audit/audit.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package audit
 
 import (
diff --git a/audit/format.go b/audit/format.go
index d595f2fd17401..6cafc1b4f3aae 100644
--- a/audit/format.go
+++ b/audit/format.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package audit
 
 import (
@@ -11,7 +8,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/go-jose/go-jose/v3/jwt"
+	squarejwt "gopkg.in/square/go-jose.v2/jwt"
 
 	"github.com/hashicorp/vault/helper/namespace"
 	"github.com/hashicorp/vault/sdk/helper/salt"
@@ -92,9 +89,9 @@ func (f *AuditFormatter) FormatRequest(ctx context.Context, w io.Writer, config
 		reqType = "request"
 	}
 	reqEntry := &AuditRequestEntry{
-		Type:          reqType,
-		Error:         errString,
-		ForwardedFrom: req.ForwardedFrom,
+		Type:  reqType,
+		Error: errString,
+
 		Auth: &AuditAuth{
 			ClientToken:               auth.ClientToken,
 			Accessor:                  auth.Accessor,
@@ -112,18 +109,14 @@ func (f *AuditFormatter) FormatRequest(ctx context.Context, w io.Writer, config
 		},
 
 		Request: &AuditRequest{
-			ID:                    req.ID,
-			ClientID:              req.ClientID,
-			ClientToken:           req.ClientToken,
-			ClientTokenAccessor:   req.ClientTokenAccessor,
-			Operation:             req.Operation,
-			MountPoint:            req.MountPoint,
-			MountType:             req.MountType,
-			MountAccessor:         req.MountAccessor,
-			MountRunningVersion:   req.MountRunningVersion(),
-			MountRunningSha256:    req.MountRunningSha256(),
-			MountIsExternalPlugin: req.MountIsExternalPlugin(),
-			MountClass:            req.MountClass(),
+			ID:                  req.ID,
+			ClientID:            req.ClientID,
+			ClientToken:         req.ClientToken,
+			ClientTokenAccessor: req.ClientTokenAccessor,
+			Operation:           req.Operation,
+			MountPoint:          req.MountPoint,
+			MountType:           req.MountType,
+			MountAccessor:       req.MountAccessor,
 			Namespace: &AuditNamespace{
 				ID:   ns.ID,
 				Path: ns.Path,
@@ -201,24 +194,7 @@ func (f *AuditFormatter) FormatResponse(ctx context.Context, w io.Writer, config
 		connState = in.Request.Connection.ConnState
 	}
 
-	elideListResponseData := config.ElideListResponses && req.Operation == logical.ListOperation
-
-	var respData map[string]interface{}
-	if config.Raw {
-		// In the non-raw case, elision of list response data occurs inside HashResponse, to avoid redundant deep
-		// copies and hashing of data only to elide it later. In the raw case, we need to do it here.
-		if elideListResponseData && resp.Data != nil {
-			// Copy the data map before making changes, but we only need to go one level deep in this case
-			respData = make(map[string]interface{}, len(resp.Data))
-			for k, v := range resp.Data {
-				respData[k] = v
-			}
-
-			doElideListResponseData(respData)
-		} else {
-			respData = resp.Data
-		}
-	} else {
+	if !config.Raw {
 		auth, err = HashAuth(salt, auth, config.HMACAccessor)
 		if err != nil {
 			return err
@@ -229,12 +205,10 @@ func (f *AuditFormatter) FormatResponse(ctx context.Context, w io.Writer, config
 			return err
 		}
 
-		resp, err = HashResponse(salt, resp, config.HMACAccessor, in.NonHMACRespDataKeys, elideListResponseData)
+		resp, err = HashResponse(salt, resp, config.HMACAccessor, in.NonHMACRespDataKeys)
 		if err != nil {
 			return err
 		}
-
-		respData = resp.Data
 	}
 
 	var errString string
@@ -297,9 +271,8 @@ func (f *AuditFormatter) FormatResponse(ctx context.Context, w io.Writer, config
 		respType = "response"
 	}
 	respEntry := &AuditResponseEntry{
-		Type:      respType,
-		Error:     errString,
-		Forwarded: req.ForwardedFrom != "",
+		Type:  respType,
+		Error: errString,
 		Auth: &AuditAuth{
 			ClientToken:               auth.ClientToken,
 			Accessor:                  auth.Accessor,
@@ -318,18 +291,14 @@ func (f *AuditFormatter) FormatResponse(ctx context.Context, w io.Writer, config
 		},
 
 		Request: &AuditRequest{
-			ID:                    req.ID,
-			ClientToken:           req.ClientToken,
-			ClientTokenAccessor:   req.ClientTokenAccessor,
-			ClientID:              req.ClientID,
-			Operation:             req.Operation,
-			MountPoint:            req.MountPoint,
-			MountType:             req.MountType,
-			MountAccessor:         req.MountAccessor,
-			MountRunningVersion:   req.MountRunningVersion(),
-			MountRunningSha256:    req.MountRunningSha256(),
-			MountIsExternalPlugin: req.MountIsExternalPlugin(),
-			MountClass:            req.MountClass(),
+			ID:                  req.ID,
+			ClientToken:         req.ClientToken,
+			ClientTokenAccessor: req.ClientTokenAccessor,
+			ClientID:            req.ClientID,
+			Operation:           req.Operation,
+			MountPoint:          req.MountPoint,
+			MountType:           req.MountType,
+			MountAccessor:       req.MountAccessor,
 			Namespace: &AuditNamespace{
 				ID:   ns.ID,
 				Path: ns.Path,
@@ -345,20 +314,16 @@ func (f *AuditFormatter) FormatResponse(ctx context.Context, w io.Writer, config
 		},
 
 		Response: &AuditResponse{
-			MountPoint:            req.MountPoint,
-			MountType:             req.MountType,
-			MountAccessor:         req.MountAccessor,
-			MountRunningVersion:   req.MountRunningVersion(),
-			MountRunningSha256:    req.MountRunningSha256(),
-			MountIsExternalPlugin: req.MountIsExternalPlugin(),
-			MountClass:            req.MountClass(),
-			Auth:                  respAuth,
-			Secret:                respSecret,
-			Data:                  respData,
-			Warnings:              resp.Warnings,
-			Redirect:              resp.Redirect,
-			WrapInfo:              respWrapInfo,
-			Headers:               resp.Headers,
+			MountPoint:    req.MountPoint,
+			MountType:     req.MountType,
+			MountAccessor: req.MountAccessor,
+			Auth:          respAuth,
+			Secret:        respSecret,
+			Data:          resp.Data,
+			Warnings:      resp.Warnings,
+			Redirect:      resp.Redirect,
+			WrapInfo:      respWrapInfo,
+			Headers:       resp.Headers,
 		},
 	}
 
@@ -393,23 +358,21 @@ func (f *AuditFormatter) FormatResponse(ctx context.Context, w io.Writer, config
 
 // AuditRequestEntry is the structure of a request audit log entry in Audit.
 type AuditRequestEntry struct {
-	Time          string        `json:"time,omitempty"`
-	Type          string        `json:"type,omitempty"`
-	Auth          *AuditAuth    `json:"auth,omitempty"`
-	Request       *AuditRequest `json:"request,omitempty"`
-	Error         string        `json:"error,omitempty"`
-	ForwardedFrom string        `json:"forwarded_from,omitempty"` // Populated in Enterprise when a request is forwarded
+	Time    string        `json:"time,omitempty"`
+	Type    string        `json:"type,omitempty"`
+	Auth    *AuditAuth    `json:"auth,omitempty"`
+	Request *AuditRequest `json:"request,omitempty"`
+	Error   string        `json:"error,omitempty"`
 }
 
 // AuditResponseEntry is the structure of a response audit log entry in Audit.
 type AuditResponseEntry struct {
-	Time      string         `json:"time,omitempty"`
-	Type      string         `json:"type,omitempty"`
-	Auth      *AuditAuth     `json:"auth,omitempty"`
-	Request   *AuditRequest  `json:"request,omitempty"`
-	Response  *AuditResponse `json:"response,omitempty"`
-	Error     string         `json:"error,omitempty"`
-	Forwarded bool           `json:"forwarded,omitempty"`
+	Time     string         `json:"time,omitempty"`
+	Type     string         `json:"type,omitempty"`
+	Auth     *AuditAuth     `json:"auth,omitempty"`
+	Request  *AuditRequest  `json:"request,omitempty"`
+	Response *AuditResponse `json:"response,omitempty"`
+	Error    string         `json:"error,omitempty"`
 }
 
 type AuditRequest struct {
@@ -420,10 +383,6 @@ type AuditRequest struct {
 	MountPoint                    string                 `json:"mount_point,omitempty"`
 	MountType                     string                 `json:"mount_type,omitempty"`
 	MountAccessor                 string                 `json:"mount_accessor,omitempty"`
-	MountRunningVersion           string                 `json:"mount_running_version,omitempty"`
-	MountRunningSha256            string                 `json:"mount_running_sha256,omitempty"`
-	MountClass                    string                 `json:"mount_class,omitempty"`
-	MountIsExternalPlugin         bool                   `json:"mount_is_external_plugin,omitempty"`
 	ClientToken                   string                 `json:"client_token,omitempty"`
 	ClientTokenAccessor           string                 `json:"client_token_accessor,omitempty"`
 	Namespace                     *AuditNamespace        `json:"namespace,omitempty"`
@@ -438,20 +397,16 @@ type AuditRequest struct {
 }
 
 type AuditResponse struct {
-	Auth                  *AuditAuth             `json:"auth,omitempty"`
-	MountPoint            string                 `json:"mount_point,omitempty"`
-	MountType             string                 `json:"mount_type,omitempty"`
-	MountAccessor         string                 `json:"mount_accessor,omitempty"`
-	MountRunningVersion   string                 `json:"mount_running_plugin_version,omitempty"`
-	MountRunningSha256    string                 `json:"mount_running_sha256,omitempty"`
-	MountClass            string                 `json:"mount_class,omitempty"`
-	MountIsExternalPlugin bool                   `json:"mount_is_external_plugin,omitempty"`
-	Secret                *AuditSecret           `json:"secret,omitempty"`
-	Data                  map[string]interface{} `json:"data,omitempty"`
-	Warnings              []string               `json:"warnings,omitempty"`
-	Redirect              string                 `json:"redirect,omitempty"`
-	WrapInfo              *AuditResponseWrapInfo `json:"wrap_info,omitempty"`
-	Headers               map[string][]string    `json:"headers,omitempty"`
+	Auth          *AuditAuth             `json:"auth,omitempty"`
+	MountPoint    string                 `json:"mount_point,omitempty"`
+	MountType     string                 `json:"mount_type,omitempty"`
+	MountAccessor string                 `json:"mount_accessor,omitempty"`
+	Secret        *AuditSecret           `json:"secret,omitempty"`
+	Data          map[string]interface{} `json:"data,omitempty"`
+	Warnings      []string               `json:"warnings,omitempty"`
+	Redirect      string                 `json:"redirect,omitempty"`
+	WrapInfo      *AuditResponseWrapInfo `json:"wrap_info,omitempty"`
+	Headers       map[string][]string    `json:"headers,omitempty"`
 }
 
 type AuditAuth struct {
@@ -535,12 +490,12 @@ func parseVaultTokenFromJWT(token string) *string {
 		return nil
 	}
 
-	parsedJWT, err := jwt.ParseSigned(token)
+	parsedJWT, err := squarejwt.ParseSigned(token)
 	if err != nil {
 		return nil
 	}
 
-	var claims jwt.Claims
+	var claims squarejwt.Claims
 	if err = parsedJWT.UnsafeClaimsWithoutVerification(&claims); err != nil {
 		return nil
 	}
@@ -548,7 +503,7 @@ func parseVaultTokenFromJWT(token string) *string {
 	return &claims.ID
 }
 
-// NewTemporaryFormatter creates a formatter not backed by a persistent salt
+// Create a formatter not backed by a persistent salt.
 func NewTemporaryFormatter(format, prefix string) *AuditFormatter {
 	temporarySalt := func(ctx context.Context) (*salt.Salt, error) {
 		return salt.NewNonpersistentSalt(), nil
@@ -569,22 +524,3 @@ func NewTemporaryFormatter(format, prefix string) *AuditFormatter {
 	}
 	return ret
 }
-
-// doElideListResponseData performs the actual elision of list operation response data, once surrounding code has
-// determined it should apply to a particular request. The data map that is passed in must be a copy that is safe to
-// modify in place, but need not be a full recursive deep copy, as only top-level keys are changed.
-//
-// See the documentation of the controlling option in FormatterConfig for more information on the purpose.
-func doElideListResponseData(data map[string]interface{}) {
-	for k, v := range data {
-		if k == "keys" {
-			if vSlice, ok := v.([]string); ok {
-				data[k] = len(vSlice)
-			}
-		} else if k == "key_info" {
-			if vMap, ok := v.(map[string]interface{}); ok {
-				data[k] = len(vMap)
-			}
-		}
-	}
-}
diff --git a/audit/format_json.go b/audit/format_json.go
index 74f4138184a46..4003c05a72178 100644
--- a/audit/format_json.go
+++ b/audit/format_json.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package audit
 
 import (
diff --git a/audit/format_json_test.go b/audit/format_json_test.go
index fa31cde83bea6..e4a703d12ad42 100644
--- a/audit/format_json_test.go
+++ b/audit/format_json_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package audit
 
 import (
diff --git a/audit/format_jsonx.go b/audit/format_jsonx.go
index 20352a2deadeb..bff244099a9ab 100644
--- a/audit/format_jsonx.go
+++ b/audit/format_jsonx.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package audit
 
 import (
diff --git a/audit/format_jsonx_test.go b/audit/format_jsonx_test.go
index fb6046195187e..00921c0c71a95 100644
--- a/audit/format_jsonx_test.go
+++ b/audit/format_jsonx_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package audit
 
 import (
diff --git a/audit/format_test.go b/audit/format_test.go
index 5395d916cc816..4f3cc5cbb2e57 100644
--- a/audit/format_test.go
+++ b/audit/format_test.go
@@ -1,79 +1,47 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package audit
 
 import (
 	"context"
 	"io"
+	"io/ioutil"
 	"testing"
 
-	"github.com/hashicorp/vault/helper/namespace"
 	"github.com/hashicorp/vault/sdk/helper/salt"
 	"github.com/hashicorp/vault/sdk/logical"
-	"github.com/mitchellh/copystructure"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 )
 
-type testingFormatWriter struct {
-	salt         *salt.Salt
-	lastRequest  *AuditRequestEntry
-	lastResponse *AuditResponseEntry
+type noopFormatWriter struct {
+	salt     *salt.Salt
+	SaltFunc func() (*salt.Salt, error)
 }
 
-func (fw *testingFormatWriter) WriteRequest(_ io.Writer, entry *AuditRequestEntry) error {
-	fw.lastRequest = entry
+func (n *noopFormatWriter) WriteRequest(_ io.Writer, _ *AuditRequestEntry) error {
 	return nil
 }
 
-func (fw *testingFormatWriter) WriteResponse(_ io.Writer, entry *AuditResponseEntry) error {
-	fw.lastResponse = entry
+func (n *noopFormatWriter) WriteResponse(_ io.Writer, _ *AuditResponseEntry) error {
 	return nil
 }
 
-func (fw *testingFormatWriter) Salt(ctx context.Context) (*salt.Salt, error) {
-	if fw.salt != nil {
-		return fw.salt, nil
+func (n *noopFormatWriter) Salt(ctx context.Context) (*salt.Salt, error) {
+	if n.salt != nil {
+		return n.salt, nil
 	}
 	var err error
-	fw.salt, err = salt.NewSalt(ctx, nil, nil)
+	n.salt, err = salt.NewSalt(ctx, nil, nil)
 	if err != nil {
 		return nil, err
 	}
-	return fw.salt, nil
-}
-
-// hashExpectedValueForComparison replicates enough of the audit HMAC process on a piece of expected data in a test,
-// so that we can use assert.Equal to compare the expected and output values.
-func (fw *testingFormatWriter) hashExpectedValueForComparison(input map[string]interface{}) map[string]interface{} {
-	// Copy input before modifying, since we may re-use the same data in another test
-	copied, err := copystructure.Copy(input)
-	if err != nil {
-		panic(err)
-	}
-	copiedAsMap := copied.(map[string]interface{})
-
-	salter, err := fw.Salt(context.Background())
-	if err != nil {
-		panic(err)
-	}
-
-	err = hashMap(salter.GetIdentifiedHMAC, copiedAsMap, nil)
-	if err != nil {
-		panic(err)
-	}
-
-	return copiedAsMap
+	return n.salt, nil
 }
 
 func TestFormatRequestErrors(t *testing.T) {
 	config := FormatterConfig{}
 	formatter := AuditFormatter{
-		AuditFormatWriter: &testingFormatWriter{},
+		AuditFormatWriter: &noopFormatWriter{},
 	}
 
-	if err := formatter.FormatRequest(context.Background(), io.Discard, config, &logical.LogInput{}); err == nil {
+	if err := formatter.FormatRequest(context.Background(), ioutil.Discard, config, &logical.LogInput{}); err == nil {
 		t.Fatal("expected error due to nil request")
 	}
 
@@ -88,10 +56,10 @@ func TestFormatRequestErrors(t *testing.T) {
 func TestFormatResponseErrors(t *testing.T) {
 	config := FormatterConfig{}
 	formatter := AuditFormatter{
-		AuditFormatWriter: &testingFormatWriter{},
+		AuditFormatWriter: &noopFormatWriter{},
 	}
 
-	if err := formatter.FormatResponse(context.Background(), io.Discard, config, &logical.LogInput{}); err == nil {
+	if err := formatter.FormatResponse(context.Background(), ioutil.Discard, config, &logical.LogInput{}); err == nil {
 		t.Fatal("expected error due to nil request")
 	}
 
@@ -102,123 +70,3 @@ func TestFormatResponseErrors(t *testing.T) {
 		t.Fatal("expected error due to nil writer")
 	}
 }
-
-func TestElideListResponses(t *testing.T) {
-	tfw := testingFormatWriter{}
-	formatter := AuditFormatter{&tfw}
-	ctx := namespace.RootContext(context.Background())
-
-	type test struct {
-		name         string
-		inputData    map[string]interface{}
-		expectedData map[string]interface{}
-	}
-
-	tests := []test{
-		{
-			"nil data",
-			nil,
-			nil,
-		},
-		{
-			"Normal list (keys only)",
-			map[string]interface{}{
-				"keys": []string{"foo", "bar", "baz"},
-			},
-			map[string]interface{}{
-				"keys": 3,
-			},
-		},
-		{
-			"Enhanced list (has key_info)",
-			map[string]interface{}{
-				"keys": []string{"foo", "bar", "baz", "quux"},
-				"key_info": map[string]interface{}{
-					"foo":  "alpha",
-					"bar":  "beta",
-					"baz":  "gamma",
-					"quux": "delta",
-				},
-			},
-			map[string]interface{}{
-				"keys":     4,
-				"key_info": 4,
-			},
-		},
-		{
-			"Unconventional other values in a list response are not touched",
-			map[string]interface{}{
-				"keys":           []string{"foo", "bar"},
-				"something_else": "baz",
-			},
-			map[string]interface{}{
-				"keys":           2,
-				"something_else": "baz",
-			},
-		},
-		{
-			"Conventional values in a list response are not elided if their data types are unconventional",
-			map[string]interface{}{
-				"keys": map[string]interface{}{
-					"You wouldn't expect keys to be a map": nil,
-				},
-				"key_info": []string{
-					"You wouldn't expect key_info to be a slice",
-				},
-			},
-			map[string]interface{}{
-				"keys": map[string]interface{}{
-					"You wouldn't expect keys to be a map": nil,
-				},
-				"key_info": []string{
-					"You wouldn't expect key_info to be a slice",
-				},
-			},
-		},
-	}
-	oneInterestingTestCase := tests[2]
-
-	formatResponse := func(
-		t *testing.T,
-		config FormatterConfig,
-		operation logical.Operation,
-		inputData map[string]interface{},
-	) {
-		err := formatter.FormatResponse(ctx, io.Discard, config, &logical.LogInput{
-			Request:  &logical.Request{Operation: operation},
-			Response: &logical.Response{Data: inputData},
-		})
-		require.Nil(t, err)
-	}
-
-	t.Run("Default case", func(t *testing.T) {
-		config := FormatterConfig{ElideListResponses: true}
-		for _, tc := range tests {
-			t.Run(tc.name, func(t *testing.T) {
-				formatResponse(t, config, logical.ListOperation, tc.inputData)
-				assert.Equal(t, tfw.hashExpectedValueForComparison(tc.expectedData), tfw.lastResponse.Response.Data)
-			})
-		}
-	})
-
-	t.Run("When Operation is not list, eliding does not happen", func(t *testing.T) {
-		config := FormatterConfig{ElideListResponses: true}
-		tc := oneInterestingTestCase
-		formatResponse(t, config, logical.ReadOperation, tc.inputData)
-		assert.Equal(t, tfw.hashExpectedValueForComparison(tc.inputData), tfw.lastResponse.Response.Data)
-	})
-
-	t.Run("When ElideListResponses is false, eliding does not happen", func(t *testing.T) {
-		config := FormatterConfig{ElideListResponses: false}
-		tc := oneInterestingTestCase
-		formatResponse(t, config, logical.ListOperation, tc.inputData)
-		assert.Equal(t, tfw.hashExpectedValueForComparison(tc.inputData), tfw.lastResponse.Response.Data)
-	})
-
-	t.Run("When Raw is true, eliding still happens", func(t *testing.T) {
-		config := FormatterConfig{ElideListResponses: true, Raw: true}
-		tc := oneInterestingTestCase
-		formatResponse(t, config, logical.ListOperation, tc.inputData)
-		assert.Equal(t, tc.expectedData, tfw.lastResponse.Response.Data)
-	})
-}
diff --git a/audit/formatter.go b/audit/formatter.go
index 98c393c3b8170..c27035768d359 100644
--- a/audit/formatter.go
+++ b/audit/formatter.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package audit
 
 import (
@@ -10,7 +7,7 @@ import (
 	"github.com/hashicorp/vault/sdk/logical"
 )
 
-// Formatter is an interface that is responsible for formatting a
+// Formatter is an interface that is responsible for formating a
 // request/response into some format. Formatters write their output
 // to an io.Writer.
 //
@@ -24,28 +21,6 @@ type FormatterConfig struct {
 	Raw          bool
 	HMACAccessor bool
 
-	// Vault lacks pagination in its APIs. As a result, certain list operations can return **very** large responses.
-	// The user's chosen audit sinks may experience difficulty consuming audit records that swell to tens of megabytes
-	// of JSON. The responses of list operations are typically not very interesting, as they are mostly lists of keys,
-	// or, even when they include a "key_info" field, are not returning confidential information. They become even less
-	// interesting once HMAC-ed by the audit system.
-	//
-	// Some example Vault "list" operations that are prone to becoming very large in an active Vault installation are:
-	//   auth/token/accessors/
-	//   identity/entity/id/
-	//   identity/entity-alias/id/
-	//   pki/certs/
-	//
-	// This option exists to provide such users with the option to have response data elided from audit logs, only when
-	// the operation type is "list". For added safety, the elision only applies to the "keys" and "key_info" fields
-	// within the response data - these are conventionally the only fields present in a list response - see
-	// logical.ListResponse, and logical.ListResponseWithInfo. However, other fields are technically possible if a
-	// plugin author writes unusual code, and these will be preserved in the audit log even with this option enabled.
-	// The elision replaces the values of the "keys" and "key_info" fields with an integer count of the number of
-	// entries. This allows even the elided audit logs to still be useful for answering questions like
-	// "Was any data returned?" or "How many records were listed?".
-	ElideListResponses bool
-
 	// This should only ever be used in a testing context
 	OmitTime bool
 }
diff --git a/audit/hashstructure.go b/audit/hashstructure.go
index cd4f8085d13d3..11c6214ff7b34 100644
--- a/audit/hashstructure.go
+++ b/audit/hashstructure.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package audit
 
 import (
@@ -101,13 +98,7 @@ func hashMap(fn func(string) string, data map[string]interface{}, nonHMACDataKey
 }
 
 // HashResponse returns a hashed copy of the logical.Request input.
-func HashResponse(
-	salter *salt.Salt,
-	in *logical.Response,
-	HMACAccessor bool,
-	nonHMACDataKeys []string,
-	elideListResponseData bool,
-) (*logical.Response, error) {
+func HashResponse(salter *salt.Salt, in *logical.Response, HMACAccessor bool, nonHMACDataKeys []string) (*logical.Response, error) {
 	if in == nil {
 		return nil, nil
 	}
@@ -138,20 +129,12 @@ func HashResponse(
 			mapCopy[logical.HTTPRawBody] = string(b)
 		}
 
-		// Processing list response data elision takes place at this point in the code for performance reasons:
-		// - take advantage of the deep copy of resp.Data that was going to be done anyway for hashing
-		// - but elide data before potentially spending time hashing it
-		if elideListResponseData {
-			doElideListResponseData(mapCopy)
-		}
-
 		err = hashMap(fn, mapCopy, nonHMACDataKeys)
 		if err != nil {
 			return nil, err
 		}
 		resp.Data = mapCopy
 	}
-
 	if resp.WrapInfo != nil {
 		var err error
 		resp.WrapInfo, err = HashWrapInfo(salter, resp.WrapInfo, HMACAccessor)
diff --git a/audit/hashstructure_test.go b/audit/hashstructure_test.go
index c65931f7c5be2..7f6c5a8694857 100644
--- a/audit/hashstructure_test.go
+++ b/audit/hashstructure_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package audit
 
 import (
@@ -296,7 +293,7 @@ func TestHashResponse(t *testing.T) {
 	}
 	for _, tc := range cases {
 		input := fmt.Sprintf("%#v", tc.Input)
-		out, err := HashResponse(localSalt, tc.Input, tc.HMACAccessor, tc.NonHMACDataKeys, false)
+		out, err := HashResponse(localSalt, tc.Input, tc.HMACAccessor, tc.NonHMACDataKeys)
 		if err != nil {
 			t.Fatalf("err: %s\n\n%s", err, input)
 		}
diff --git a/builtin/audit/file/backend.go b/builtin/audit/file/backend.go
index 2c3ef3f8e0774..9e7d7c36c7108 100644
--- a/builtin/audit/file/backend.go
+++ b/builtin/audit/file/backend.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package file
 
 import (
@@ -74,15 +71,6 @@ func Factory(ctx context.Context, conf *audit.BackendConfig) (audit.Backend, err
 		logRaw = b
 	}
 
-	elideListResponses := false
-	if elideListResponsesRaw, ok := conf.Config["elide_list_responses"]; ok {
-		value, err := strconv.ParseBool(elideListResponsesRaw)
-		if err != nil {
-			return nil, err
-		}
-		elideListResponses = value
-	}
-
 	// Check if mode is provided
 	mode := os.FileMode(0o600)
 	if modeRaw, ok := conf.Config["mode"]; ok {
@@ -114,9 +102,8 @@ func Factory(ctx context.Context, conf *audit.BackendConfig) (audit.Backend, err
 		saltView:   conf.SaltView,
 		salt:       new(atomic.Value),
 		formatConfig: audit.FormatterConfig{
-			Raw:                logRaw,
-			HMACAccessor:       hmacAccessor,
-			ElideListResponses: elideListResponses,
+			Raw:          logRaw,
+			HMACAccessor: hmacAccessor,
 		},
 	}
 
diff --git a/builtin/audit/file/backend_test.go b/builtin/audit/file/backend_test.go
index ad082ace5d432..817518c50bd85 100644
--- a/builtin/audit/file/backend_test.go
+++ b/builtin/audit/file/backend_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package file
 
 import (
diff --git a/builtin/audit/socket/backend.go b/builtin/audit/socket/backend.go
index 4c649e0e9c748..7a000b2c7c667 100644
--- a/builtin/audit/socket/backend.go
+++ b/builtin/audit/socket/backend.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package socket
 
 import (
@@ -12,7 +9,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/hashicorp/go-multierror"
+	multierror "github.com/hashicorp/go-multierror"
 	"github.com/hashicorp/go-secure-stdlib/parseutil"
 	"github.com/hashicorp/vault/audit"
 	"github.com/hashicorp/vault/sdk/helper/salt"
@@ -76,22 +73,12 @@ func Factory(ctx context.Context, conf *audit.BackendConfig) (audit.Backend, err
 		logRaw = b
 	}
 
-	elideListResponses := false
-	if elideListResponsesRaw, ok := conf.Config["elide_list_responses"]; ok {
-		value, err := strconv.ParseBool(elideListResponsesRaw)
-		if err != nil {
-			return nil, err
-		}
-		elideListResponses = value
-	}
-
 	b := &Backend{
 		saltConfig: conf.SaltConfig,
 		saltView:   conf.SaltView,
 		formatConfig: audit.FormatterConfig{
-			Raw:                logRaw,
-			HMACAccessor:       hmacAccessor,
-			ElideListResponses: elideListResponses,
+			Raw:          logRaw,
+			HMACAccessor: hmacAccessor,
 		},
 
 		writeDuration: writeDuration,
diff --git a/builtin/audit/syslog/backend.go b/builtin/audit/syslog/backend.go
index 2da92fe2e40e5..9c7b775b88c80 100644
--- a/builtin/audit/syslog/backend.go
+++ b/builtin/audit/syslog/backend.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package syslog
 
 import (
@@ -66,15 +63,6 @@ func Factory(ctx context.Context, conf *audit.BackendConfig) (audit.Backend, err
 		logRaw = b
 	}
 
-	elideListResponses := false
-	if elideListResponsesRaw, ok := conf.Config["elide_list_responses"]; ok {
-		value, err := strconv.ParseBool(elideListResponsesRaw)
-		if err != nil {
-			return nil, err
-		}
-		elideListResponses = value
-	}
-
 	// Get the logger
 	logger, err := gsyslog.NewLogger(gsyslog.LOG_INFO, facility, tag)
 	if err != nil {
@@ -86,9 +74,8 @@ func Factory(ctx context.Context, conf *audit.BackendConfig) (audit.Backend, err
 		saltConfig: conf.SaltConfig,
 		saltView:   conf.SaltView,
 		formatConfig: audit.FormatterConfig{
-			Raw:                logRaw,
-			HMACAccessor:       hmacAccessor,
-			ElideListResponses: elideListResponses,
+			Raw:          logRaw,
+			HMACAccessor: hmacAccessor,
 		},
 	}
 
diff --git a/builtin/credential/app-id/backend.go b/builtin/credential/app-id/backend.go
new file mode 100644
index 0000000000000..b77221d75ba61
--- /dev/null
+++ b/builtin/credential/app-id/backend.go
@@ -0,0 +1,184 @@
+package appId
+
+import (
+	"context"
+	"sync"
+
+	"github.com/hashicorp/vault/sdk/framework"
+	"github.com/hashicorp/vault/sdk/helper/salt"
+	"github.com/hashicorp/vault/sdk/logical"
+)
+
+func Factory(ctx context.Context, conf *logical.BackendConfig) (logical.Backend, error) {
+	b, err := Backend(conf)
+	if err != nil {
+		return nil, err
+	}
+	if err := b.Setup(ctx, conf); err != nil {
+		return nil, err
+	}
+	return b, nil
+}
+
+func Backend(conf *logical.BackendConfig) (*backend, error) {
+	var b backend
+	b.MapAppId = &framework.PolicyMap{
+		PathMap: framework.PathMap{
+			Name: "app-id",
+			Schema: map[string]*framework.FieldSchema{
+				"display_name": {
+					Type:        framework.TypeString,
+					Description: "A name to map to this app ID for logs.",
+				},
+
+				"value": {
+					Type:        framework.TypeString,
+					Description: "Policies for the app ID.",
+				},
+			},
+		},
+		DefaultKey: "default",
+	}
+
+	b.MapUserId = &framework.PathMap{
+		Name: "user-id",
+		Schema: map[string]*framework.FieldSchema{
+			"cidr_block": {
+				Type:        framework.TypeString,
+				Description: "If not blank, restricts auth by this CIDR block",
+			},
+
+			"value": {
+				Type:        framework.TypeString,
+				Description: "App IDs that this user associates with.",
+			},
+		},
+	}
+
+	b.Backend = &framework.Backend{
+		Help: backendHelp,
+
+		PathsSpecial: &logical.Paths{
+			Unauthenticated: []string{
+				"login",
+				"login/*",
+			},
+		},
+		Paths: framework.PathAppend([]*framework.Path{
+			pathLogin(&b),
+			pathLoginWithAppIDPath(&b),
+		},
+			b.MapAppId.Paths(),
+			b.MapUserId.Paths(),
+		),
+		AuthRenew:   b.pathLoginRenew,
+		Invalidate:  b.invalidate,
+		BackendType: logical.TypeCredential,
+	}
+
+	b.view = conf.StorageView
+	b.MapAppId.SaltFunc = b.Salt
+	b.MapUserId.SaltFunc = b.Salt
+
+	return &b, nil
+}
+
+type backend struct {
+	*framework.Backend
+
+	salt      *salt.Salt
+	SaltMutex sync.RWMutex
+	view      logical.Storage
+	MapAppId  *framework.PolicyMap
+	MapUserId *framework.PathMap
+}
+
+func (b *backend) Salt(ctx context.Context) (*salt.Salt, error) {
+	b.SaltMutex.RLock()
+	if b.salt != nil {
+		defer b.SaltMutex.RUnlock()
+		return b.salt, nil
+	}
+	b.SaltMutex.RUnlock()
+	b.SaltMutex.Lock()
+	defer b.SaltMutex.Unlock()
+	if b.salt != nil {
+		return b.salt, nil
+	}
+	salt, err := salt.NewSalt(ctx, b.view, &salt.Config{
+		HashFunc: salt.SHA1Hash,
+		Location: salt.DefaultLocation,
+	})
+	if err != nil {
+		return nil, err
+	}
+	b.salt = salt
+	return salt, nil
+}
+
+func (b *backend) invalidate(_ context.Context, key string) {
+	switch key {
+	case salt.DefaultLocation:
+		b.SaltMutex.Lock()
+		defer b.SaltMutex.Unlock()
+		b.salt = nil
+	}
+}
+
+const backendHelp = `
+The App ID credential provider is used to perform authentication from
+within applications or machine by pairing together two hard-to-guess
+unique pieces of information: a unique app ID, and a unique user ID.
+
+The goal of this credential provider is to allow elastic users
+(dynamic machines, containers, etc.) to authenticate with Vault without
+having to store passwords outside of Vault. It is a single method of
+solving the chicken-and-egg problem of setting up Vault access on a machine.
+With this provider, nobody except the machine itself has access to both
+pieces of information necessary to authenticate. For example:
+configuration management will have the app IDs, but the machine itself
+will detect its user ID based on some unique machine property such as a
+MAC address (or a hash of it with some salt).
+
+An example, real world process for using this provider:
+
+  1. Create unique app IDs (UUIDs work well) and map them to policies.
+     (Path: map/app-id/<app-id>)
+
+  2. Store the app IDs within configuration management systems.
+
+  3. An out-of-band process run by security operators map unique user IDs
+     to these app IDs. Example: when an instance is launched, a cloud-init
+     system tells security operators a unique ID for this machine. This
+     process can be scripted, but the key is that it is out-of-band and
+     out of reach of configuration management.
+	 (Path: map/user-id/<user-id>)
+
+  4. A new server is provisioned. Configuration management configures the
+     app ID, the server itself detects its user ID. With both of these
+     pieces of information, Vault can be accessed according to the policy
+     set by the app ID.
+
+More details on this process follow:
+
+The app ID is a unique ID that maps to a set of policies. This ID is
+generated by an operator and configured into the backend. The ID itself
+is usually a UUID, but any hard-to-guess unique value can be used.
+
+After creating app IDs, an operator authorizes a fixed set of user IDs
+with each app ID. When a valid {app ID, user ID} tuple is given to the
+"login" path, then the user is authenticated with the configured app
+ID policies.
+
+The user ID can be any value (just like the app ID), however it is
+generally a value unique to a machine, such as a MAC address or instance ID,
+or a value hashed from these unique values.
+
+It is possible to authorize multiple app IDs with each
+user ID by writing them as comma-separated values to the map/user-id/<user-id>
+path.
+
+It is also possible to renew the auth tokens with 'vault token-renew <token>' command.
+Before the token is renewed, the validity of app ID, user ID and the associated
+policies are checked again.
+`
diff --git a/builtin/credential/app-id/backend_test.go b/builtin/credential/app-id/backend_test.go
new file mode 100644
index 0000000000000..a8b7077ef002c
--- /dev/null
+++ b/builtin/credential/app-id/backend_test.go
@@ -0,0 +1,239 @@
+package appId
+
+import (
+	"context"
+	"fmt"
+	"testing"
+
+	logicaltest "github.com/hashicorp/vault/helper/testhelpers/logical"
+	"github.com/hashicorp/vault/sdk/helper/salt"
+	"github.com/hashicorp/vault/sdk/logical"
+)
+
+func TestBackend_basic(t *testing.T) {
+	var b *backend
+	var err error
+	var storage logical.Storage
+	factory := func(ctx context.Context, conf *logical.BackendConfig) (logical.Backend, error) {
+		b, err = Backend(conf)
+		if err != nil {
+			t.Fatal(err)
+		}
+		storage = conf.StorageView
+		if err := b.Setup(ctx, conf); err != nil {
+			return nil, err
+		}
+		return b, nil
+	}
+	logicaltest.Test(t, logicaltest.TestCase{
+		CredentialFactory: factory,
+		Steps: []logicaltest.TestStep{
+			testAccStepMapAppId(t),
+			testAccStepMapUserId(t),
+			testAccLogin(t, ""),
+			testAccLoginAppIDInPath(t, ""),
+			testAccLoginInvalid(t),
+			testAccStepDeleteUserId(t),
+			testAccLoginDeleted(t),
+		},
+	})
+
+	req := &logical.Request{
+		Path:      "map/app-id",
+		Operation: logical.ListOperation,
+		Storage:   storage,
+	}
+	resp, err := b.HandleRequest(context.Background(), req)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if resp == nil {
+		t.Fatal("nil response")
+	}
+	keys := resp.Data["keys"].([]string)
+	if len(keys) != 1 {
+		t.Fatalf("expected 1 key, got %d", len(keys))
+	}
+	bSalt, err := b.Salt(context.Background())
+	if err != nil {
+		t.Fatal(err)
+	}
+	if keys[0] != "s"+bSalt.SaltIDHashFunc("foo", salt.SHA256Hash) {
+		t.Fatal("value was improperly salted")
+	}
+}
+
+func TestBackend_cidr(t *testing.T) {
+	logicaltest.Test(t, logicaltest.TestCase{
+		CredentialFactory: Factory,
+		Steps: []logicaltest.TestStep{
+			testAccStepMapAppIdDisplayName(t),
+			testAccStepMapUserIdCidr(t, "192.168.1.0/16"),
+			testAccLoginCidr(t, "192.168.1.5", false),
+			testAccLoginCidr(t, "10.0.1.5", true),
+			testAccLoginCidr(t, "", true),
+		},
+	})
+}
+
+func TestBackend_displayName(t *testing.T) {
+	logicaltest.Test(t, logicaltest.TestCase{
+		CredentialFactory: Factory,
+		Steps: []logicaltest.TestStep{
+			testAccStepMapAppIdDisplayName(t),
+			testAccStepMapUserId(t),
+			testAccLogin(t, "tubbin"),
+			testAccLoginAppIDInPath(t, "tubbin"),
+			testAccLoginInvalid(t),
+			testAccStepDeleteUserId(t),
+			testAccLoginDeleted(t),
+		},
+	})
+}
+
+func testAccStepMapAppId(t *testing.T) logicaltest.TestStep {
+	return logicaltest.TestStep{
+		Operation: logical.UpdateOperation,
+		Path:      "map/app-id/foo",
+		Data: map[string]interface{}{
+			"value": "foo,bar",
+		},
+	}
+}
+
+func testAccStepMapAppIdDisplayName(t *testing.T) logicaltest.TestStep {
+	return logicaltest.TestStep{
+		Operation: logical.UpdateOperation,
+		Path:      "map/app-id/foo",
+		Data: map[string]interface{}{
+			"display_name": "tubbin",
+			"value":        "foo,bar",
+		},
+	}
+}
+
+func testAccStepMapUserId(t *testing.T) logicaltest.TestStep {
+	return logicaltest.TestStep{
+		Operation: logical.UpdateOperation,
+		Path:      "map/user-id/42",
+		Data: map[string]interface{}{
+			"value": "foo",
+		},
+	}
+}
+
+func testAccStepDeleteUserId(t *testing.T) logicaltest.TestStep {
+	return logicaltest.TestStep{
+		Operation: logical.DeleteOperation,
+		Path:      "map/user-id/42",
+	}
+}
+
+func testAccStepMapUserIdCidr(t *testing.T, cidr string) logicaltest.TestStep {
+	return logicaltest.TestStep{
+		Operation: logical.UpdateOperation,
+		Path:      "map/user-id/42",
+		Data: map[string]interface{}{
+			"value":      "foo",
+			"cidr_block": cidr,
+		},
+	}
+}
+
+func testAccLogin(t *testing.T, display string) logicaltest.TestStep {
+	checkTTL := func(resp *logical.Response) error {
+		if resp.Auth.LeaseOptions.TTL.String() != "768h0m0s" {
+			return fmt.Errorf("invalid TTL: got %s", resp.Auth.LeaseOptions.TTL)
+		}
+		return nil
+	}
+	return logicaltest.TestStep{
+		Operation: logical.UpdateOperation,
+		Path:      "login",
+		Data: map[string]interface{}{
+			"app_id":  "foo",
+			"user_id": "42",
+		},
+		Unauthenticated: true,
+
+		Check: logicaltest.TestCheckMulti(
+			logicaltest.TestCheckAuth([]string{"bar", "default", "foo"}),
+			logicaltest.TestCheckAuthDisplayName(display),
+			checkTTL,
+		),
+	}
+}
+
+func testAccLoginAppIDInPath(t *testing.T, display string) logicaltest.TestStep {
+	checkTTL := func(resp *logical.Response) error {
+		if resp.Auth.LeaseOptions.TTL.String() != "768h0m0s" {
+			return fmt.Errorf("invalid TTL: got %s", resp.Auth.LeaseOptions.TTL)
+		}
+		return nil
+	}
+	return logicaltest.TestStep{
+		Operation: logical.UpdateOperation,
+		Path:      "login/foo",
+		Data: map[string]interface{}{
+			"user_id": "42",
+		},
+		Unauthenticated: true,
+
+		Check: logicaltest.TestCheckMulti(
+			logicaltest.TestCheckAuth([]string{"bar", "default", "foo"}),
+			logicaltest.TestCheckAuthDisplayName(display),
+			checkTTL,
+		),
+	}
+}
+
+func testAccLoginCidr(t *testing.T, ip string, err bool) logicaltest.TestStep {
+	check := logicaltest.TestCheckError()
+	if !err {
+		check = logicaltest.TestCheckAuth([]string{"bar", "default", "foo"})
+	}
+
+	return logicaltest.TestStep{
+		Operation: logical.UpdateOperation,
+		Path:      "login",
+		Data: map[string]interface{}{
+			"app_id":  "foo",
+			"user_id": "42",
+		},
+		ErrorOk:         err,
+		Unauthenticated: true,
+		RemoteAddr:      ip,
+
+		Check: check,
+	}
+}
+
+func testAccLoginInvalid(t *testing.T) logicaltest.TestStep {
+	return logicaltest.TestStep{
+		Operation: logical.UpdateOperation,
+		Path:      "login",
+		Data: map[string]interface{}{
+			"app_id":  "foo",
+			"user_id": "48",
+		},
+		ErrorOk:         true,
+		Unauthenticated: true,
+
+		Check: logicaltest.TestCheckError(),
+	}
+}
+
+func testAccLoginDeleted(t *testing.T) logicaltest.TestStep {
+	return logicaltest.TestStep{
+		Operation: logical.UpdateOperation,
+		Path:      "login",
+		Data: map[string]interface{}{
+			"app_id":  "foo",
+			"user_id": "42",
+		},
+		ErrorOk:         true,
+		Unauthenticated: true,
+
+		Check: logicaltest.TestCheckError(),
+	}
+}
diff --git a/builtin/credential/app-id/cmd/app-id/main.go b/builtin/credential/app-id/cmd/app-id/main.go
new file mode 100644
index 0000000000000..ce482d6302065
--- /dev/null
+++ b/builtin/credential/app-id/cmd/app-id/main.go
@@ -0,0 +1,29 @@
+package main
+
+import (
+	"os"
+
+	hclog "github.com/hashicorp/go-hclog"
+	"github.com/hashicorp/vault/api"
+	appId "github.com/hashicorp/vault/builtin/credential/app-id"
+	"github.com/hashicorp/vault/sdk/plugin"
+)
+
+func main() {
+	apiClientMeta := &api.PluginAPIClientMeta{}
+	flags := apiClientMeta.FlagSet()
+	flags.Parse(os.Args[1:])
+
+	tlsConfig := apiClientMeta.GetTLSConfig()
+	tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig)
+
+	if err := plugin.Serve(&plugin.ServeOpts{
+		BackendFactoryFunc: appId.Factory,
+		TLSProviderFunc:    tlsProviderFunc,
+	}); err != nil {
+		logger := hclog.New(&hclog.LoggerOptions{})
+
+		logger.Error("plugin shutting down", "error", err)
+		os.Exit(1)
+	}
+}
diff --git a/builtin/credential/app-id/path_login.go b/builtin/credential/app-id/path_login.go
new file mode 100644
index 0000000000000..1c1198a195496
--- /dev/null
+++ b/builtin/credential/app-id/path_login.go
@@ -0,0 +1,229 @@
+package appId
+
+import (
+	"context"
+	"crypto/sha1"
+	"crypto/subtle"
+	"encoding/hex"
+	"fmt"
+	"net"
+	"strings"
+
+	"github.com/hashicorp/vault/sdk/framework"
+	"github.com/hashicorp/vault/sdk/helper/policyutil"
+	"github.com/hashicorp/vault/sdk/logical"
+)
+
+func pathLoginWithAppIDPath(b *backend) *framework.Path {
+	return &framework.Path{
+		Pattern: "login/(?P<app_id>.+)",
+		Fields: map[string]*framework.FieldSchema{
+			"app_id": {
+				Type:        framework.TypeString,
+				Description: "The unique app ID",
+			},
+
+			"user_id": {
+				Type:        framework.TypeString,
+				Description: "The unique user ID",
+			},
+		},
+
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.UpdateOperation: b.pathLogin,
+		},
+
+		HelpSynopsis:    pathLoginSyn,
+		HelpDescription: pathLoginDesc,
+	}
+}
+
+func pathLogin(b *backend) *framework.Path {
+	return &framework.Path{
+		Pattern: "login$",
+		Fields: map[string]*framework.FieldSchema{
+			"app_id": {
+				Type:        framework.TypeString,
+				Description: "The unique app ID",
+			},
+
+			"user_id": {
+				Type:        framework.TypeString,
+				Description: "The unique user ID",
+			},
+		},
+
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.UpdateOperation:         b.pathLogin,
+			logical.AliasLookaheadOperation: b.pathLoginAliasLookahead,
+		},
+
+		HelpSynopsis:    pathLoginSyn,
+		HelpDescription: pathLoginDesc,
+	}
+}
+
+func (b *backend) pathLoginAliasLookahead(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
+	appId := data.Get("app_id").(string)
+
+	if appId == "" {
+		return nil, fmt.Errorf("missing app_id")
+	}
+
+	return &logical.Response{
+		Auth: &logical.Auth{
+			Alias: &logical.Alias{
+				Name: appId,
+			},
+		},
+	}, nil
+}
+
+func (b *backend) pathLogin(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
+	appId := data.Get("app_id").(string)
+	userId := data.Get("user_id").(string)
+
+	var displayName string
+	if dispName, resp, err := b.verifyCredentials(ctx, req, appId, userId); err != nil {
+		return nil, err
+	} else if resp != nil {
+		return resp, nil
+	} else {
+		displayName = dispName
+	}
+
+	// Get the policies associated with the app
+	policies, err := b.MapAppId.Policies(ctx, req.Storage, appId)
+	if err != nil {
+		return nil, err
+	}
+
+	// Store hashes of the app ID and user ID for the metadata
+	appIdHash := sha1.Sum([]byte(appId))
+	userIdHash := sha1.Sum([]byte(userId))
+	metadata := map[string]string{
+		"app-id":  "sha1:" + hex.EncodeToString(appIdHash[:]),
+		"user-id": "sha1:" + hex.EncodeToString(userIdHash[:]),
+	}
+
+	return &logical.Response{
+		Auth: &logical.Auth{
+			InternalData: map[string]interface{}{
+				"app-id":  appId,
+				"user-id": userId,
+			},
+			DisplayName: displayName,
+			Policies:    policies,
+			Metadata:    metadata,
+			LeaseOptions: logical.LeaseOptions{
+				Renewable: true,
+			},
+			Alias: &logical.Alias{
+				Name: appId,
+			},
+		},
+	}, nil
+}
+
+func (b *backend) pathLoginRenew(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
+	appId := req.Auth.InternalData["app-id"].(string)
+	userId := req.Auth.InternalData["user-id"].(string)
+
+	// Skipping CIDR verification to enable renewal from machines other than
+	// the ones encompassed by CIDR block.
+	if _, resp, err := b.verifyCredentials(ctx, req, appId, userId); err != nil {
+		return nil, err
+	} else if resp != nil {
+		return resp, nil
+	}
+
+	// Get the policies associated with the app
+	mapPolicies, err := b.MapAppId.Policies(ctx, req.Storage, appId)
+	if err != nil {
+		return nil, err
+	}
+	if !policyutil.EquivalentPolicies(mapPolicies, req.Auth.TokenPolicies) {
+		return nil, fmt.Errorf("policies do not match")
+	}
+
+	return &logical.Response{Auth: req.Auth}, nil
+}
+
+func (b *backend) verifyCredentials(ctx context.Context, req *logical.Request, appId, userId string) (string, *logical.Response, error) {
+	// Ensure both appId and userId are provided
+	if appId == "" || userId == "" {
+		return "", logical.ErrorResponse("missing 'app_id' or 'user_id'"), nil
+	}
+
+	// Look up the apps that this user is allowed to access
+	appsMap, err := b.MapUserId.Get(ctx, req.Storage, userId)
+	if err != nil {
+		return "", nil, err
+	}
+	if appsMap == nil {
+		return "", logical.ErrorResponse("invalid user ID or app ID"), nil
+	}
+
+	// If there is a CIDR block restriction, check that
+	if raw, ok := appsMap["cidr_block"]; ok {
+		_, cidr, err := net.ParseCIDR(raw.(string))
+		if err != nil {
+			return "", nil, fmt.Errorf("invalid restriction cidr: %w", err)
+		}
+
+		var addr string
+		if req.Connection != nil {
+			addr = req.Connection.RemoteAddr
+		}
+		if addr == "" || !cidr.Contains(net.ParseIP(addr)) {
+			return "", logical.ErrorResponse("unauthorized source address"), nil
+		}
+	}
+
+	appsRaw, ok := appsMap["value"]
+	if !ok {
+		appsRaw = ""
+	}
+
+	apps, ok := appsRaw.(string)
+	if !ok {
+		return "", nil, fmt.Errorf("mapping is not a string")
+	}
+
+	// Verify that the app is in the list
+	found := false
+	appIdBytes := []byte(appId)
+	for _, app := range strings.Split(apps, ",") {
+		match := []byte(strings.TrimSpace(app))
+		// Protect against a timing attack with the app_id comparison
+		if subtle.ConstantTimeCompare(match, appIdBytes) == 1 {
+			found = true
+		}
+	}
+	if !found {
+		return "", logical.ErrorResponse("invalid user ID or app ID"), nil
+	}
+
+	// Get the raw data associated with the app
+	appRaw, err := b.MapAppId.Get(ctx, req.Storage, appId)
+	if err != nil {
+		return "", nil, err
+	}
+	if appRaw == nil {
+		return "", logical.ErrorResponse("invalid user ID or app ID"), nil
+	}
+	var displayName string
+	if raw, ok := appRaw["display_name"]; ok {
+		displayName = raw.(string)
+	}
+
+	return displayName, nil, nil
+}
+
+const pathLoginSyn = `
+Log in with an App ID and User ID.
+`
+
+const pathLoginDesc = `
+This endpoint authenticates using an application ID, user ID and potential the IP address of the connecting client.
+`
diff --git a/builtin/credential/approle/backend.go b/builtin/credential/approle/backend.go
index 4165fbbec47ef..ebd8d3c06a801 100644
--- a/builtin/credential/approle/backend.go
+++ b/builtin/credential/approle/backend.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package approle
 
 import (
@@ -15,7 +12,6 @@ import (
 )
 
 const (
-	operationPrefixAppRole      = "app-role"
 	secretIDPrefix              = "secret_id/"
 	secretIDLocalPrefix         = "secret_id_local/"
 	secretIDAccessorPrefix      = "accessor/"
diff --git a/builtin/credential/approle/backend_test.go b/builtin/credential/approle/backend_test.go
index 683249e316dc6..044f02d2a2a4c 100644
--- a/builtin/credential/approle/backend_test.go
+++ b/builtin/credential/approle/backend_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package approle
 
 import (
@@ -177,7 +174,7 @@ func TestAppRole_RoleNameCaseSensitivity(t *testing.T) {
 			},
 			Storage: s,
 		})
-		if err != nil && err != logical.ErrInvalidCredentials {
+		if err != nil {
 			t.Fatal(err)
 		}
 		if resp == nil || !resp.IsError() {
@@ -236,7 +233,7 @@ func TestAppRole_RoleNameCaseSensitivity(t *testing.T) {
 			},
 			Storage: s,
 		})
-		if err != nil && err != logical.ErrInvalidCredentials {
+		if err != nil {
 			t.Fatal(err)
 		}
 		if resp == nil || !resp.IsError() {
@@ -295,7 +292,7 @@ func TestAppRole_RoleNameCaseSensitivity(t *testing.T) {
 			},
 			Storage: s,
 		})
-		if err != nil && err != logical.ErrInvalidCredentials {
+		if err != nil {
 			t.Fatal(err)
 		}
 		if resp == nil || !resp.IsError() {
@@ -354,7 +351,7 @@ func TestAppRole_RoleNameCaseSensitivity(t *testing.T) {
 			},
 			Storage: s,
 		})
-		if err != nil && err != logical.ErrInvalidCredentials {
+		if err != nil {
 			t.Fatal(err)
 		}
 		if resp == nil || !resp.IsError() {
@@ -413,7 +410,7 @@ func TestAppRole_RoleNameCaseSensitivity(t *testing.T) {
 			},
 			Storage: s,
 		})
-		if err != nil && err != logical.ErrInvalidCredentials {
+		if err != nil {
 			t.Fatal(err)
 		}
 		if resp == nil || !resp.IsError() {
diff --git a/builtin/credential/approle/cmd/approle/main.go b/builtin/credential/approle/cmd/approle/main.go
index 9000ea95810a9..22fa242fa623d 100644
--- a/builtin/credential/approle/cmd/approle/main.go
+++ b/builtin/credential/approle/cmd/approle/main.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package main
 
 import (
@@ -20,11 +17,9 @@ func main() {
 	tlsConfig := apiClientMeta.GetTLSConfig()
 	tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig)
 
-	if err := plugin.ServeMultiplex(&plugin.ServeOpts{
+	if err := plugin.Serve(&plugin.ServeOpts{
 		BackendFactoryFunc: approle.Factory,
-		// set the TLSProviderFunc so that the plugin maintains backwards
-		// compatibility with Vault versions that don’t support plugin AutoMTLS
-		TLSProviderFunc: tlsProviderFunc,
+		TLSProviderFunc:    tlsProviderFunc,
 	}); err != nil {
 		logger := hclog.New(&hclog.LoggerOptions{})
 
diff --git a/builtin/credential/approle/path_login.go b/builtin/credential/approle/path_login.go
index a4c4fe82cde9a..5822519b1c79f 100644
--- a/builtin/credential/approle/path_login.go
+++ b/builtin/credential/approle/path_login.go
@@ -1,12 +1,8 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package approle
 
 import (
 	"context"
 	"fmt"
-	"net/http"
 	"strings"
 	"time"
 
@@ -19,10 +15,6 @@ import (
 func pathLogin(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "login$",
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixAppRole,
-			OperationVerb:   "login",
-		},
 		Fields: map[string]*framework.FieldSchema{
 			"role_id": {
 				Type:        framework.TypeString,
@@ -37,33 +29,12 @@ func pathLogin(b *backend) *framework.Path {
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.UpdateOperation: &framework.PathOperation{
 				Callback: b.pathLoginUpdate,
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: http.StatusText(http.StatusOK),
-					}},
-				},
 			},
 			logical.AliasLookaheadOperation: &framework.PathOperation{
 				Callback: b.pathLoginUpdateAliasLookahead,
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: http.StatusText(http.StatusOK),
-					}},
-				},
 			},
 			logical.ResolveRoleOperation: &framework.PathOperation{
 				Callback: b.pathLoginResolveRole,
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: http.StatusText(http.StatusOK),
-						Fields: map[string]*framework.FieldSchema{
-							"role": {
-								Type:     framework.TypeString,
-								Required: true,
-							},
-						},
-					}},
-				},
 			},
 		},
 		HelpSynopsis:    pathLoginHelpSys,
@@ -184,7 +155,7 @@ func (b *backend) pathLoginUpdate(ctx context.Context, req *logical.Request, dat
 			return nil, err
 		}
 		if entry == nil {
-			return logical.ErrorResponse("invalid secret id"), logical.ErrInvalidCredentials
+			return logical.ErrorResponse("invalid secret id"), nil
 		}
 
 		// If a secret ID entry does not have a corresponding accessor
diff --git a/builtin/credential/approle/path_login_test.go b/builtin/credential/approle/path_login_test.go
index 5a09c6c4e3f42..542bf665b6e9a 100644
--- a/builtin/credential/approle/path_login_test.go
+++ b/builtin/credential/approle/path_login_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package approle
 
 import (
@@ -19,7 +16,7 @@ func TestAppRole_BoundCIDRLogin(t *testing.T) {
 
 	// Create a role with secret ID binding disabled and only bound cidr list
 	// enabled
-	resp = b.requestNoErr(t, &logical.Request{
+	resp, err = b.HandleRequest(context.Background(), &logical.Request{
 		Path:      "role/testrole",
 		Operation: logical.CreateOperation,
 		Data: map[string]interface{}{
@@ -29,18 +26,24 @@ func TestAppRole_BoundCIDRLogin(t *testing.T) {
 		},
 		Storage: s,
 	})
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	// Read the role ID
-	resp = b.requestNoErr(t, &logical.Request{
+	resp, err = b.HandleRequest(context.Background(), &logical.Request{
 		Path:      "role/testrole/role-id",
 		Operation: logical.ReadOperation,
 		Storage:   s,
 	})
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	roleID := resp.Data["role_id"]
 
 	// Fill in the connection information and login with just the role ID
-	resp = b.requestNoErr(t, &logical.Request{
+	resp, err = b.HandleRequest(context.Background(), &logical.Request{
 		Path:      "login",
 		Operation: logical.UpdateOperation,
 		Data: map[string]interface{}{
@@ -49,7 +52,9 @@ func TestAppRole_BoundCIDRLogin(t *testing.T) {
 		Storage:    s,
 		Connection: &logical.Connection{RemoteAddr: "127.0.0.1"},
 	})
-
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 	if resp.Auth == nil {
 		t.Fatal("expected login to succeed")
 	}
@@ -61,7 +66,7 @@ func TestAppRole_BoundCIDRLogin(t *testing.T) {
 	}
 
 	// Override with a secret-id value, verify it doesn't pass
-	resp = b.requestNoErr(t, &logical.Request{
+	resp, err = b.HandleRequest(context.Background(), &logical.Request{
 		Path:      "role/testrole",
 		Operation: logical.UpdateOperation,
 		Data: map[string]interface{}{
@@ -69,6 +74,9 @@ func TestAppRole_BoundCIDRLogin(t *testing.T) {
 		},
 		Storage: s,
 	})
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	roleSecretIDReq := &logical.Request{
 		Operation: logical.UpdateOperation,
@@ -84,11 +92,13 @@ func TestAppRole_BoundCIDRLogin(t *testing.T) {
 	}
 
 	roleSecretIDReq.Data["token_bound_cidrs"] = "10.0.0.0/24"
-	resp = b.requestNoErr(t, roleSecretIDReq)
-
+	resp, err = b.HandleRequest(context.Background(), roleSecretIDReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 	secretID := resp.Data["secret_id"]
 
-	resp = b.requestNoErr(t, &logical.Request{
+	resp, err = b.HandleRequest(context.Background(), &logical.Request{
 		Path:      "login",
 		Operation: logical.UpdateOperation,
 		Data: map[string]interface{}{
@@ -98,7 +108,9 @@ func TestAppRole_BoundCIDRLogin(t *testing.T) {
 		Storage:    s,
 		Connection: &logical.Connection{RemoteAddr: "127.0.0.1"},
 	})
-
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 	if resp.Auth == nil {
 		t.Fatal("expected login to succeed")
 	}
@@ -121,8 +133,10 @@ func TestAppRole_RoleLogin(t *testing.T) {
 		Path:      "role/role1/role-id",
 		Storage:   storage,
 	}
-	resp = b.requestNoErr(t, roleRoleIDReq)
-
+	resp, err = b.HandleRequest(context.Background(), roleRoleIDReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 	roleID := resp.Data["role_id"]
 
 	roleSecretIDReq := &logical.Request{
@@ -130,8 +144,10 @@ func TestAppRole_RoleLogin(t *testing.T) {
 		Path:      "role/role1/secret-id",
 		Storage:   storage,
 	}
-	resp = b.requestNoErr(t, roleSecretIDReq)
-
+	resp, err = b.HandleRequest(context.Background(), roleSecretIDReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 	secretID := resp.Data["secret_id"]
 
 	loginData := map[string]interface{}{
@@ -200,15 +216,20 @@ func TestAppRole_RoleLogin(t *testing.T) {
 		Storage:   storage,
 		Data:      roleData,
 	}
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	roleRoleIDReq = &logical.Request{
 		Operation: logical.ReadOperation,
 		Path:      "role/role-period/role-id",
 		Storage:   storage,
 	}
-	resp = b.requestNoErr(t, roleRoleIDReq)
-
+	resp, err = b.HandleRequest(context.Background(), roleRoleIDReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 	roleID = resp.Data["role_id"]
 
 	roleSecretIDReq = &logical.Request{
@@ -216,8 +237,10 @@ func TestAppRole_RoleLogin(t *testing.T) {
 		Path:      "role/role-period/secret-id",
 		Storage:   storage,
 	}
-	resp = b.requestNoErr(t, roleSecretIDReq)
-
+	resp, err = b.HandleRequest(context.Background(), roleSecretIDReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 	secretID = resp.Data["secret_id"]
 
 	loginData["role_id"] = roleID
@@ -280,6 +303,8 @@ func generateRenewRequest(s logical.Storage, auth *logical.Auth) *logical.Reques
 }
 
 func TestAppRole_RoleResolve(t *testing.T) {
+	var resp *logical.Response
+	var err error
 	b, storage := createBackendWithStorage(t)
 
 	role := "role1"
@@ -289,8 +314,10 @@ func TestAppRole_RoleResolve(t *testing.T) {
 		Path:      "role/role1/role-id",
 		Storage:   storage,
 	}
-	resp := b.requestNoErr(t, roleRoleIDReq)
-
+	resp, err = b.HandleRequest(context.Background(), roleRoleIDReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 	roleID := resp.Data["role_id"]
 
 	roleSecretIDReq := &logical.Request{
@@ -298,8 +325,10 @@ func TestAppRole_RoleResolve(t *testing.T) {
 		Path:      "role/role1/secret-id",
 		Storage:   storage,
 	}
-	resp = b.requestNoErr(t, roleSecretIDReq)
-
+	resp, err = b.HandleRequest(context.Background(), roleSecretIDReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 	secretID := resp.Data["secret_id"]
 
 	loginData := map[string]interface{}{
@@ -316,7 +345,10 @@ func TestAppRole_RoleResolve(t *testing.T) {
 		},
 	}
 
-	resp = b.requestNoErr(t, loginReq)
+	resp, err = b.HandleRequest(context.Background(), loginReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	if resp.Data["role"] != role {
 		t.Fatalf("Role was not as expected. Expected %s, received %s", role, resp.Data["role"])
diff --git a/builtin/credential/approle/path_role.go b/builtin/credential/approle/path_role.go
index 112d2e0f13d97..eb9c65d23e7b3 100644
--- a/builtin/credential/approle/path_role.go
+++ b/builtin/credential/approle/path_role.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package approle
 
 import (
@@ -111,27 +108,12 @@ type roleIDStorageEntry struct {
 func rolePaths(b *backend) []*framework.Path {
 	defTokenFields := tokenutil.TokenFields()
 
-	responseOK := map[int][]framework.Response{
-		http.StatusOK: {{
-			Description: "OK",
-		}},
-	}
-	responseNoContent := map[int][]framework.Response{
-		http.StatusNoContent: {{
-			Description: "No Content",
-		}},
-	}
-
 	p := &framework.Path{
 		Pattern: "role/" + framework.GenericNameRegex("role_name"),
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixAppRole,
-			OperationSuffix: "role",
-		},
 		Fields: map[string]*framework.FieldSchema{
 			"role_name": {
 				Type:        framework.TypeString,
-				Description: fmt.Sprintf("Name of the role. Must be less than %d bytes.", maxHmacInputLength),
+				Description: "Name of the role.",
 			},
 			"bind_secret_id": {
 				Type:        framework.TypeBool,
@@ -187,112 +169,11 @@ can only be set during role creation and once set, it can't be reset later.`,
 			},
 		},
 		ExistenceCheck: b.pathRoleExistenceCheck,
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.CreateOperation: &framework.PathOperation{
-				Callback:  b.pathRoleCreateUpdate,
-				Responses: responseOK,
-			},
-			logical.UpdateOperation: &framework.PathOperation{
-				Callback:  b.pathRoleCreateUpdate,
-				Responses: responseOK,
-			},
-			logical.ReadOperation: &framework.PathOperation{
-				Callback: b.pathRoleRead,
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"bind_secret_id": {
-								Type:        framework.TypeBool,
-								Required:    true,
-								Description: "Impose secret ID to be presented when logging in using this role.",
-							},
-							"secret_id_bound_cidrs": {
-								Type:        framework.TypeCommaStringSlice,
-								Required:    true,
-								Description: "Comma separated string or list of CIDR blocks. If set, specifies the blocks of IP addresses which can perform the login operation.",
-							},
-							"secret_id_num_uses": {
-								Type:        framework.TypeInt,
-								Required:    true,
-								Description: "Number of times a secret ID can access the role, after which the secret ID will expire.",
-							},
-							"secret_id_ttl": {
-								Type:        framework.TypeDurationSecond,
-								Required:    true,
-								Description: "Duration in seconds after which the issued secret ID expires.",
-							},
-							"local_secret_ids": {
-								Type:        framework.TypeBool,
-								Required:    true,
-								Description: "If true, the secret identifiers generated using this role will be cluster local. This can only be set during role creation and once set, it can't be reset later",
-							},
-							"token_bound_cidrs": {
-								Type:        framework.TypeCommaStringSlice,
-								Required:    true,
-								Description: `Comma separated string or JSON list of CIDR blocks. If set, specifies the blocks of IP addresses which are allowed to use the generated token.`,
-							},
-							"token_explicit_max_ttl": {
-								Type:        framework.TypeDurationSecond,
-								Required:    true,
-								Description: "If set, tokens created via this role carry an explicit maximum TTL. During renewal, the current maximum TTL values of the role and the mount are not checked for changes, and any updates to these values will have no effect on the token being renewed.",
-							},
-							"token_max_ttl": {
-								Type:        framework.TypeDurationSecond,
-								Required:    true,
-								Description: "The maximum lifetime of the generated token",
-							},
-							"token_no_default_policy": {
-								Type:        framework.TypeBool,
-								Required:    true,
-								Description: "If true, the 'default' policy will not automatically be added to generated tokens",
-							},
-							"token_period": {
-								Type:        framework.TypeDurationSecond,
-								Required:    true,
-								Description: "If set, tokens created via this role will have no max lifetime; instead, their renewal period will be fixed to this value.",
-							},
-							"token_policies": {
-								Type:        framework.TypeCommaStringSlice,
-								Required:    true,
-								Description: "Comma-separated list of policies",
-							},
-							"token_type": {
-								Type:        framework.TypeString,
-								Required:    true,
-								Default:     "default-service",
-								Description: "The type of token to generate, service or batch",
-							},
-							"token_ttl": {
-								Type:        framework.TypeDurationSecond,
-								Required:    true,
-								Description: "The initial ttl of the token to generate",
-							},
-							"token_num_uses": {
-								Type:        framework.TypeInt,
-								Required:    true,
-								Description: "The maximum number of times a token may be used, a value of zero means unlimited",
-							},
-							"period": {
-								Type:        framework.TypeDurationSecond,
-								Required:    false,
-								Description: tokenutil.DeprecationText("token_period"),
-								Deprecated:  true,
-							},
-							"policies": {
-								Type:        framework.TypeCommaStringSlice,
-								Required:    false,
-								Description: tokenutil.DeprecationText("token_policies"),
-								Deprecated:  true,
-							},
-						},
-					}},
-				},
-			},
-			logical.DeleteOperation: &framework.PathOperation{
-				Callback:  b.pathRoleDelete,
-				Responses: responseNoContent,
-			},
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.CreateOperation: b.pathRoleCreateUpdate,
+			logical.UpdateOperation: b.pathRoleCreateUpdate,
+			logical.ReadOperation:   b.pathRoleRead,
+			logical.DeleteOperation: b.pathRoleDelete,
 		},
 		HelpSynopsis:    strings.TrimSpace(roleHelp["role"][0]),
 		HelpDescription: strings.TrimSpace(roleHelp["role"][1]),
@@ -304,71 +185,32 @@ can only be set during role creation and once set, it can't be reset later.`,
 		p,
 		{
 			Pattern: "role/?",
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: operationPrefixAppRole,
-				OperationSuffix: "roles",
-			},
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.ListOperation: &framework.PathOperation{
-					Callback: b.pathRoleList,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"keys": {
-									Type:     framework.TypeStringSlice,
-									Required: true,
-								},
-							},
-						}},
-					},
-				},
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.ListOperation: b.pathRoleList,
 			},
 			HelpSynopsis:    strings.TrimSpace(roleHelp["role-list"][0]),
 			HelpDescription: strings.TrimSpace(roleHelp["role-list"][1]),
 		},
 		{
 			Pattern: "role/" + framework.GenericNameRegex("role_name") + "/local-secret-ids$",
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: operationPrefixAppRole,
-				OperationSuffix: "local-secret-ids",
-			},
 			Fields: map[string]*framework.FieldSchema{
 				"role_name": {
 					Type:        framework.TypeString,
-					Description: fmt.Sprintf("Name of the role. Must be less than %d bytes.", maxHmacInputLength),
+					Description: "Name of the role.",
 				},
 			},
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.ReadOperation: &framework.PathOperation{
-					Callback: b.pathRoleLocalSecretIDsRead,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"local_secret_ids": {
-									Type:        framework.TypeBool,
-									Required:    true,
-									Description: "If true, the secret identifiers generated using this role will be cluster local. This can only be set during role creation and once set, it can't be reset later",
-								},
-							},
-						}},
-					},
-				},
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.ReadOperation: b.pathRoleLocalSecretIDsRead,
 			},
 			HelpSynopsis:    strings.TrimSpace(roleHelp["role-local-secret-ids"][0]),
 			HelpDescription: strings.TrimSpace(roleHelp["role-local-secret-ids"][1]),
 		},
 		{
 			Pattern: "role/" + framework.GenericNameRegex("role_name") + "/policies$",
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: operationPrefixAppRole,
-				OperationSuffix: "policies",
-			},
 			Fields: map[string]*framework.FieldSchema{
 				"role_name": {
 					Type:        framework.TypeString,
-					Description: fmt.Sprintf("Name of the role. Must be less than %d bytes.", maxHmacInputLength),
+					Description: "Name of the role.",
 				},
 				"policies": {
 					Type:        framework.TypeCommaStringSlice,
@@ -380,50 +222,20 @@ can only be set during role creation and once set, it can't be reset later.`,
 					Description: defTokenFields["token_policies"].Description,
 				},
 			},
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.UpdateOperation: &framework.PathOperation{
-					Callback:  b.pathRolePoliciesUpdate,
-					Responses: responseNoContent,
-				},
-				logical.ReadOperation: &framework.PathOperation{
-					Callback: b.pathRolePoliciesRead,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"policies": {
-									Type:        framework.TypeCommaStringSlice,
-									Required:    false,
-									Description: tokenutil.DeprecationText("token_policies"),
-									Deprecated:  true,
-								},
-								"token_policies": {
-									Type:        framework.TypeCommaStringSlice,
-									Required:    true,
-									Description: defTokenFields["token_policies"].Description,
-								},
-							},
-						}},
-					},
-				},
-				logical.DeleteOperation: &framework.PathOperation{
-					Callback:  b.pathRolePoliciesDelete,
-					Responses: responseNoContent,
-				},
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.UpdateOperation: b.pathRolePoliciesUpdate,
+				logical.ReadOperation:   b.pathRolePoliciesRead,
+				logical.DeleteOperation: b.pathRolePoliciesDelete,
 			},
 			HelpSynopsis:    strings.TrimSpace(roleHelp["role-policies"][0]),
 			HelpDescription: strings.TrimSpace(roleHelp["role-policies"][1]),
 		},
 		{
 			Pattern: "role/" + framework.GenericNameRegex("role_name") + "/bound-cidr-list$",
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: operationPrefixAppRole,
-				OperationSuffix: "bound-cidr-list",
-			},
 			Fields: map[string]*framework.FieldSchema{
 				"role_name": {
 					Type:        framework.TypeString,
-					Description: fmt.Sprintf("Name of the role. Must be less than %d bytes.", maxHmacInputLength),
+					Description: "Name of the role.",
 				},
 				"bound_cidr_list": {
 					Type: framework.TypeCommaStringSlice,
@@ -431,45 +243,20 @@ can only be set during role creation and once set, it can't be reset later.`,
 of CIDR blocks. If set, specifies the blocks of IP addresses which can perform the login operation.`,
 				},
 			},
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.UpdateOperation: &framework.PathOperation{
-					Callback:  b.pathRoleBoundCIDRUpdate,
-					Responses: responseNoContent,
-				},
-				logical.ReadOperation: &framework.PathOperation{
-					Callback: b.pathRoleBoundCIDRListRead,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"bound_cidr_list": {
-									Type:        framework.TypeCommaStringSlice,
-									Required:    true,
-									Description: `Deprecated: Please use "secret_id_bound_cidrs" instead. Comma separated string or list of CIDR blocks. If set, specifies the blocks of IP addresses which can perform the login operation.`,
-									Deprecated:  true,
-								},
-							},
-						}},
-					},
-				},
-				logical.DeleteOperation: &framework.PathOperation{
-					Callback:  b.pathRoleBoundCIDRListDelete,
-					Responses: responseNoContent,
-				},
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.UpdateOperation: b.pathRoleBoundCIDRUpdate,
+				logical.ReadOperation:   b.pathRoleBoundCIDRListRead,
+				logical.DeleteOperation: b.pathRoleBoundCIDRListDelete,
 			},
 			HelpSynopsis:    strings.TrimSpace(roleHelp["role-bound-cidr-list"][0]),
 			HelpDescription: strings.TrimSpace(roleHelp["role-bound-cidr-list"][1]),
 		},
 		{
 			Pattern: "role/" + framework.GenericNameRegex("role_name") + "/secret-id-bound-cidrs$",
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: operationPrefixAppRole,
-				OperationSuffix: "secret-id-bound-cidrs",
-			},
 			Fields: map[string]*framework.FieldSchema{
 				"role_name": {
 					Type:        framework.TypeString,
-					Description: fmt.Sprintf("Name of the role. Must be less than %d bytes.", maxHmacInputLength),
+					Description: "Name of the role.",
 				},
 				"secret_id_bound_cidrs": {
 					Type: framework.TypeCommaStringSlice,
@@ -477,88 +264,40 @@ of CIDR blocks. If set, specifies the blocks of IP addresses which can perform t
 IP addresses which can perform the login operation.`,
 				},
 			},
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.UpdateOperation: &framework.PathOperation{
-					Callback:  b.pathRoleSecretIDBoundCIDRUpdate,
-					Responses: responseNoContent,
-				},
-				logical.ReadOperation: &framework.PathOperation{
-					Callback: b.pathRoleSecretIDBoundCIDRRead,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"secret_id_bound_cidrs": {
-									Type:        framework.TypeCommaStringSlice,
-									Required:    true,
-									Description: `Comma separated string or list of CIDR blocks. If set, specifies the blocks of IP addresses which can perform the login operation.`,
-								},
-							},
-						}},
-					},
-				},
-				logical.DeleteOperation: &framework.PathOperation{
-					Callback:  b.pathRoleSecretIDBoundCIDRDelete,
-					Responses: responseNoContent,
-				},
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.UpdateOperation: b.pathRoleSecretIDBoundCIDRUpdate,
+				logical.ReadOperation:   b.pathRoleSecretIDBoundCIDRRead,
+				logical.DeleteOperation: b.pathRoleSecretIDBoundCIDRDelete,
 			},
 			HelpSynopsis:    strings.TrimSpace(roleHelp["secret-id-bound-cidrs"][0]),
 			HelpDescription: strings.TrimSpace(roleHelp["secret-id-bound-cidrs"][1]),
 		},
 		{
 			Pattern: "role/" + framework.GenericNameRegex("role_name") + "/token-bound-cidrs$",
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: operationPrefixAppRole,
-				OperationSuffix: "token-bound-cidrs",
-			},
 			Fields: map[string]*framework.FieldSchema{
 				"role_name": {
 					Type:        framework.TypeString,
-					Description: fmt.Sprintf("Name of the role. Must be less than %d bytes.", maxHmacInputLength),
+					Description: "Name of the role.",
 				},
 				"token_bound_cidrs": {
 					Type:        framework.TypeCommaStringSlice,
 					Description: defTokenFields["token_bound_cidrs"].Description,
 				},
 			},
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.UpdateOperation: &framework.PathOperation{
-					Callback:  b.pathRoleTokenBoundCIDRUpdate,
-					Responses: responseNoContent,
-				},
-				logical.ReadOperation: &framework.PathOperation{
-					Callback: b.pathRoleTokenBoundCIDRRead,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"token_bound_cidrs": {
-									Type:        framework.TypeCommaStringSlice,
-									Required:    true,
-									Description: `Comma separated string or list of CIDR blocks. If set, specifies the blocks of IP addresses which can use the returned token. Should be a subset of the token CIDR blocks listed on the role, if any.`,
-								},
-							},
-						}},
-					},
-				},
-				logical.DeleteOperation: &framework.PathOperation{
-					Callback:  b.pathRoleTokenBoundCIDRDelete,
-					Responses: responseNoContent,
-				},
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.UpdateOperation: b.pathRoleTokenBoundCIDRUpdate,
+				logical.ReadOperation:   b.pathRoleTokenBoundCIDRRead,
+				logical.DeleteOperation: b.pathRoleTokenBoundCIDRDelete,
 			},
 			HelpSynopsis:    strings.TrimSpace(roleHelp["token-bound-cidrs"][0]),
 			HelpDescription: strings.TrimSpace(roleHelp["token-bound-cidrs"][1]),
 		},
 		{
 			Pattern: "role/" + framework.GenericNameRegex("role_name") + "/bind-secret-id$",
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: operationPrefixAppRole,
-				OperationSuffix: "bind-secret-id",
-			},
 			Fields: map[string]*framework.FieldSchema{
 				"role_name": {
 					Type:        framework.TypeString,
-					Description: fmt.Sprintf("Name of the role. Must be less than %d bytes.", maxHmacInputLength),
+					Description: "Name of the role.",
 				},
 				"bind_secret_id": {
 					Type:        framework.TypeBool,
@@ -566,88 +305,40 @@ IP addresses which can perform the login operation.`,
 					Description: "Impose secret_id to be presented when logging in using this role.",
 				},
 			},
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.UpdateOperation: &framework.PathOperation{
-					Callback:  b.pathRoleBindSecretIDUpdate,
-					Responses: responseNoContent,
-				},
-				logical.ReadOperation: &framework.PathOperation{
-					Callback: b.pathRoleBindSecretIDRead,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"bind_secret_id": {
-									Type:        framework.TypeBool,
-									Required:    true,
-									Description: "Impose secret_id to be presented when logging in using this role. Defaults to 'true'.",
-								},
-							},
-						}},
-					},
-				},
-				logical.DeleteOperation: &framework.PathOperation{
-					Callback:  b.pathRoleBindSecretIDDelete,
-					Responses: responseNoContent,
-				},
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.UpdateOperation: b.pathRoleBindSecretIDUpdate,
+				logical.ReadOperation:   b.pathRoleBindSecretIDRead,
+				logical.DeleteOperation: b.pathRoleBindSecretIDDelete,
 			},
 			HelpSynopsis:    strings.TrimSpace(roleHelp["role-bind-secret-id"][0]),
 			HelpDescription: strings.TrimSpace(roleHelp["role-bind-secret-id"][1]),
 		},
 		{
 			Pattern: "role/" + framework.GenericNameRegex("role_name") + "/secret-id-num-uses$",
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: operationPrefixAppRole,
-				OperationSuffix: "secret-id-num-uses",
-			},
 			Fields: map[string]*framework.FieldSchema{
 				"role_name": {
 					Type:        framework.TypeString,
-					Description: fmt.Sprintf("Name of the role. Must be less than %d bytes.", maxHmacInputLength),
+					Description: "Name of the role.",
 				},
 				"secret_id_num_uses": {
 					Type:        framework.TypeInt,
 					Description: "Number of times a SecretID can access the role, after which the SecretID will expire.",
 				},
 			},
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.UpdateOperation: &framework.PathOperation{
-					Callback:  b.pathRoleSecretIDNumUsesUpdate,
-					Responses: responseNoContent,
-				},
-				logical.ReadOperation: &framework.PathOperation{
-					Callback: b.pathRoleSecretIDNumUsesRead,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"secret_id_num_uses": {
-									Type:        framework.TypeInt,
-									Required:    true,
-									Description: "Number of times a secret ID can access the role, after which the SecretID will expire. Defaults to 0 meaning that the secret ID is of unlimited use.",
-								},
-							},
-						}},
-					},
-				},
-				logical.DeleteOperation: &framework.PathOperation{
-					Callback:  b.pathRoleSecretIDNumUsesDelete,
-					Responses: responseNoContent,
-				},
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.UpdateOperation: b.pathRoleSecretIDNumUsesUpdate,
+				logical.ReadOperation:   b.pathRoleSecretIDNumUsesRead,
+				logical.DeleteOperation: b.pathRoleSecretIDNumUsesDelete,
 			},
 			HelpSynopsis:    strings.TrimSpace(roleHelp["role-secret-id-num-uses"][0]),
 			HelpDescription: strings.TrimSpace(roleHelp["role-secret-id-num-uses"][1]),
 		},
 		{
 			Pattern: "role/" + framework.GenericNameRegex("role_name") + "/secret-id-ttl$",
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: operationPrefixAppRole,
-				OperationSuffix: "secret-id-ttl",
-			},
 			Fields: map[string]*framework.FieldSchema{
 				"role_name": {
 					Type:        framework.TypeString,
-					Description: fmt.Sprintf("Name of the role. Must be less than %d bytes.", maxHmacInputLength),
+					Description: "Name of the role.",
 				},
 				"secret_id_ttl": {
 					Type: framework.TypeDurationSecond,
@@ -655,44 +346,20 @@ IP addresses which can perform the login operation.`,
 to 0, meaning no expiration.`,
 				},
 			},
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.UpdateOperation: &framework.PathOperation{
-					Callback:  b.pathRoleSecretIDTTLUpdate,
-					Responses: responseNoContent,
-				},
-				logical.ReadOperation: &framework.PathOperation{
-					Callback: b.pathRoleSecretIDTTLRead,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"secret_id_ttl": {
-									Type:        framework.TypeDurationSecond,
-									Required:    true,
-									Description: "Duration in seconds after which the issued secret ID should expire. Defaults to 0, meaning no expiration.",
-								},
-							},
-						}},
-					},
-				},
-				logical.DeleteOperation: &framework.PathOperation{
-					Callback:  b.pathRoleSecretIDTTLDelete,
-					Responses: responseNoContent,
-				},
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.UpdateOperation: b.pathRoleSecretIDTTLUpdate,
+				logical.ReadOperation:   b.pathRoleSecretIDTTLRead,
+				logical.DeleteOperation: b.pathRoleSecretIDTTLDelete,
 			},
 			HelpSynopsis:    strings.TrimSpace(roleHelp["role-secret-id-ttl"][0]),
 			HelpDescription: strings.TrimSpace(roleHelp["role-secret-id-ttl"][1]),
 		},
 		{
 			Pattern: "role/" + framework.GenericNameRegex("role_name") + "/period$",
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: operationPrefixAppRole,
-				OperationSuffix: "period",
-			},
 			Fields: map[string]*framework.FieldSchema{
 				"role_name": {
 					Type:        framework.TypeString,
-					Description: fmt.Sprintf("Name of the role. Must be less than %d bytes.", maxHmacInputLength),
+					Description: "Name of the role.",
 				},
 				"period": {
 					Type:        framework.TypeDurationSecond,
@@ -704,222 +371,99 @@ to 0, meaning no expiration.`,
 					Description: defTokenFields["token_period"].Description,
 				},
 			},
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.UpdateOperation: &framework.PathOperation{
-					Callback:  b.pathRolePeriodUpdate,
-					Responses: responseNoContent,
-				},
-				logical.ReadOperation: &framework.PathOperation{
-					Callback: b.pathRolePeriodRead,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"period": {
-									Type:        framework.TypeDurationSecond,
-									Required:    false,
-									Description: tokenutil.DeprecationText("token_period"),
-									Deprecated:  true,
-								},
-								"token_period": {
-									Type:        framework.TypeDurationSecond,
-									Required:    true,
-									Description: defTokenFields["token_period"].Description,
-								},
-							},
-						}},
-					},
-				},
-				logical.DeleteOperation: &framework.PathOperation{
-					Callback:  b.pathRolePeriodDelete,
-					Responses: responseNoContent,
-				},
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.UpdateOperation: b.pathRolePeriodUpdate,
+				logical.ReadOperation:   b.pathRolePeriodRead,
+				logical.DeleteOperation: b.pathRolePeriodDelete,
 			},
 			HelpSynopsis:    strings.TrimSpace(roleHelp["role-period"][0]),
 			HelpDescription: strings.TrimSpace(roleHelp["role-period"][1]),
 		},
 		{
 			Pattern: "role/" + framework.GenericNameRegex("role_name") + "/token-num-uses$",
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: operationPrefixAppRole,
-				OperationSuffix: "token-num-uses",
-			},
 			Fields: map[string]*framework.FieldSchema{
 				"role_name": {
 					Type:        framework.TypeString,
-					Description: fmt.Sprintf("Name of the role. Must be less than %d bytes.", maxHmacInputLength),
+					Description: "Name of the role.",
 				},
 				"token_num_uses": {
 					Type:        framework.TypeInt,
 					Description: defTokenFields["token_num_uses"].Description,
 				},
 			},
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.UpdateOperation: &framework.PathOperation{
-					Callback:  b.pathRoleTokenNumUsesUpdate,
-					Responses: responseNoContent,
-				},
-				logical.ReadOperation: &framework.PathOperation{
-					Callback: b.pathRoleTokenNumUsesRead,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"token_num_uses": {
-									Type:        framework.TypeInt,
-									Required:    true,
-									Description: defTokenFields["token_num_uses"].Description,
-								},
-							},
-						}},
-					},
-				},
-				logical.DeleteOperation: &framework.PathOperation{
-					Callback:  b.pathRoleTokenNumUsesDelete,
-					Responses: responseNoContent,
-				},
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.UpdateOperation: b.pathRoleTokenNumUsesUpdate,
+				logical.ReadOperation:   b.pathRoleTokenNumUsesRead,
+				logical.DeleteOperation: b.pathRoleTokenNumUsesDelete,
 			},
 			HelpSynopsis:    strings.TrimSpace(roleHelp["role-token-num-uses"][0]),
 			HelpDescription: strings.TrimSpace(roleHelp["role-token-num-uses"][1]),
 		},
 		{
 			Pattern: "role/" + framework.GenericNameRegex("role_name") + "/token-ttl$",
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: operationPrefixAppRole,
-				OperationSuffix: "token-ttl",
-			},
 			Fields: map[string]*framework.FieldSchema{
 				"role_name": {
 					Type:        framework.TypeString,
-					Description: fmt.Sprintf("Name of the role. Must be less than %d bytes.", maxHmacInputLength),
+					Description: "Name of the role.",
 				},
 				"token_ttl": {
 					Type:        framework.TypeDurationSecond,
 					Description: defTokenFields["token_ttl"].Description,
 				},
 			},
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.UpdateOperation: &framework.PathOperation{
-					Callback:  b.pathRoleTokenTTLUpdate,
-					Responses: responseNoContent,
-				},
-				logical.ReadOperation: &framework.PathOperation{
-					Callback: b.pathRoleTokenTTLRead,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"token_ttl": {
-									Type:        framework.TypeDurationSecond,
-									Required:    true,
-									Description: defTokenFields["token_ttl"].Description,
-								},
-							},
-						}},
-					},
-				},
-				logical.DeleteOperation: &framework.PathOperation{
-					Callback:  b.pathRoleTokenTTLDelete,
-					Responses: responseNoContent,
-				},
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.UpdateOperation: b.pathRoleTokenTTLUpdate,
+				logical.ReadOperation:   b.pathRoleTokenTTLRead,
+				logical.DeleteOperation: b.pathRoleTokenTTLDelete,
 			},
 			HelpSynopsis:    strings.TrimSpace(roleHelp["role-token-ttl"][0]),
 			HelpDescription: strings.TrimSpace(roleHelp["role-token-ttl"][1]),
 		},
 		{
 			Pattern: "role/" + framework.GenericNameRegex("role_name") + "/token-max-ttl$",
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: operationPrefixAppRole,
-				OperationSuffix: "token-max-ttl",
-			},
 			Fields: map[string]*framework.FieldSchema{
 				"role_name": {
 					Type:        framework.TypeString,
-					Description: fmt.Sprintf("Name of the role. Must be less than %d bytes.", maxHmacInputLength),
+					Description: "Name of the role.",
 				},
 				"token_max_ttl": {
 					Type:        framework.TypeDurationSecond,
 					Description: defTokenFields["token_max_ttl"].Description,
 				},
 			},
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.UpdateOperation: &framework.PathOperation{
-					Callback:  b.pathRoleTokenMaxTTLUpdate,
-					Responses: responseNoContent,
-				},
-				logical.ReadOperation: &framework.PathOperation{
-					Callback: b.pathRoleTokenMaxTTLRead,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"token_max_ttl": {
-									Type:        framework.TypeDurationSecond,
-									Required:    true,
-									Description: defTokenFields["token_max_ttl"].Description,
-								},
-							},
-						}},
-					},
-				},
-				logical.DeleteOperation: &framework.PathOperation{
-					Callback:  b.pathRoleTokenMaxTTLDelete,
-					Responses: responseNoContent,
-				},
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.UpdateOperation: b.pathRoleTokenMaxTTLUpdate,
+				logical.ReadOperation:   b.pathRoleTokenMaxTTLRead,
+				logical.DeleteOperation: b.pathRoleTokenMaxTTLDelete,
 			},
 			HelpSynopsis:    strings.TrimSpace(roleHelp["role-token-max-ttl"][0]),
 			HelpDescription: strings.TrimSpace(roleHelp["role-token-max-ttl"][1]),
 		},
 		{
 			Pattern: "role/" + framework.GenericNameRegex("role_name") + "/role-id$",
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: operationPrefixAppRole,
-				OperationSuffix: "role-id",
-			},
 			Fields: map[string]*framework.FieldSchema{
 				"role_name": {
 					Type:        framework.TypeString,
-					Description: fmt.Sprintf("Name of the role. Must be less than %d bytes.", maxHmacInputLength),
+					Description: "Name of the role.",
 				},
 				"role_id": {
 					Type:        framework.TypeString,
 					Description: "Identifier of the role. Defaults to a UUID.",
 				},
 			},
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.ReadOperation: &framework.PathOperation{
-					Callback: b.pathRoleRoleIDRead,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"role_id": {
-									Type:        framework.TypeString,
-									Required:    false,
-									Description: "Identifier of the role. Defaults to a UUID.",
-								},
-							},
-						}},
-					},
-				},
-				logical.UpdateOperation: &framework.PathOperation{
-					Callback:  b.pathRoleRoleIDUpdate,
-					Responses: responseNoContent,
-				},
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.ReadOperation:   b.pathRoleRoleIDRead,
+				logical.UpdateOperation: b.pathRoleRoleIDUpdate,
 			},
 			HelpSynopsis:    strings.TrimSpace(roleHelp["role-id"][0]),
 			HelpDescription: strings.TrimSpace(roleHelp["role-id"][1]),
 		},
 		{
 			Pattern: "role/" + framework.GenericNameRegex("role_name") + "/secret-id/?$",
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: operationPrefixAppRole,
-				OperationSuffix: "secret-id",
-			},
 			Fields: map[string]*framework.FieldSchema{
 				"role_name": {
 					Type:        framework.TypeString,
-					Description: fmt.Sprintf("Name of the role. Must be less than %d bytes.", maxHmacInputLength),
+					Description: "Name of the role.",
 				},
 				"metadata": {
 					Type: framework.TypeString,
@@ -948,284 +492,93 @@ Overrides secret_id_num_uses role option when supplied. May not be higher than r
 Overrides secret_id_ttl role option when supplied. May not be longer than role's secret_id_ttl.`,
 				},
 			},
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.UpdateOperation: &framework.PathOperation{
-					Callback: b.pathRoleSecretIDUpdate,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"secret_id": {
-									Type:        framework.TypeString,
-									Required:    true,
-									Description: "Secret ID attached to the role.",
-								},
-								"secret_id_accessor": {
-									Type:        framework.TypeString,
-									Required:    true,
-									Description: "Accessor of the secret ID",
-								},
-								"secret_id_ttl": {
-									Type:        framework.TypeDurationSecond,
-									Required:    true,
-									Description: "Duration in seconds after which the issued secret ID expires.",
-								},
-								"secret_id_num_uses": {
-									Type:        framework.TypeInt,
-									Required:    true,
-									Description: "Number of times a secret ID can access the role, after which the secret ID will expire.",
-								},
-							},
-						}},
-					},
-				},
-				logical.ListOperation: &framework.PathOperation{
-					Callback: b.pathRoleSecretIDList,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationSuffix: "secret-ids",
-					},
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"keys": {
-									Required: true,
-									Type:     framework.TypeStringSlice,
-								},
-							},
-						}},
-					},
-				},
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.UpdateOperation: b.pathRoleSecretIDUpdate,
+				logical.ListOperation:   b.pathRoleSecretIDList,
 			},
 			HelpSynopsis:    strings.TrimSpace(roleHelp["role-secret-id"][0]),
 			HelpDescription: strings.TrimSpace(roleHelp["role-secret-id"][1]),
 		},
 		{
 			Pattern: "role/" + framework.GenericNameRegex("role_name") + "/secret-id/lookup/?$",
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: operationPrefixAppRole,
-				OperationSuffix: "secret-id",
-				OperationVerb:   "look-up",
-			},
 			Fields: map[string]*framework.FieldSchema{
 				"role_name": {
 					Type:        framework.TypeString,
-					Description: fmt.Sprintf("Name of the role. Must be less than %d bytes.", maxHmacInputLength),
+					Description: "Name of the role.",
 				},
 				"secret_id": {
 					Type:        framework.TypeString,
 					Description: "SecretID attached to the role.",
 				},
 			},
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.UpdateOperation: &framework.PathOperation{
-					Callback: b.pathRoleSecretIDLookupUpdate,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"secret_id_accessor": {
-									Type:        framework.TypeString,
-									Required:    true,
-									Description: "Accessor of the secret ID",
-								},
-								"secret_id_ttl": {
-									Type:        framework.TypeDurationSecond,
-									Required:    true,
-									Description: "Duration in seconds after which the issued secret ID expires.",
-								},
-								"secret_id_num_uses": {
-									Type:        framework.TypeInt,
-									Required:    true,
-									Description: "Number of times a secret ID can access the role, after which the secret ID will expire.",
-								},
-								"creation_time": {
-									Type:     framework.TypeTime,
-									Required: true,
-								},
-								"expiration_time": {
-									Type:     framework.TypeTime,
-									Required: true,
-								},
-								"last_updated_time": {
-									Type:     framework.TypeTime,
-									Required: true,
-								},
-								"metadata": {
-									Type:     framework.TypeKVPairs,
-									Required: true,
-								},
-								"cidr_list": {
-									Type:        framework.TypeCommaStringSlice,
-									Required:    true,
-									Description: "List of CIDR blocks enforcing secret IDs to be used from specific set of IP addresses. If 'bound_cidr_list' is set on the role, then the list of CIDR blocks listed here should be a subset of the CIDR blocks listed on the role.",
-								},
-								"token_bound_cidrs": {
-									Type:        framework.TypeCommaStringSlice,
-									Required:    true,
-									Description: "List of CIDR blocks. If set, specifies the blocks of IP addresses which can use the returned token. Should be a subset of the token CIDR blocks listed on the role, if any.",
-								},
-							},
-						}},
-					},
-				},
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.UpdateOperation: b.pathRoleSecretIDLookupUpdate,
 			},
 			HelpSynopsis:    strings.TrimSpace(roleHelp["role-secret-id-lookup"][0]),
 			HelpDescription: strings.TrimSpace(roleHelp["role-secret-id-lookup"][1]),
 		},
 		{
 			Pattern: "role/" + framework.GenericNameRegex("role_name") + "/secret-id/destroy/?$",
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: operationPrefixAppRole,
-				OperationVerb:   "destroy",
-			},
 			Fields: map[string]*framework.FieldSchema{
 				"role_name": {
 					Type:        framework.TypeString,
-					Description: fmt.Sprintf("Name of the role. Must be less than %d bytes.", maxHmacInputLength),
+					Description: "Name of the role.",
 				},
 				"secret_id": {
 					Type:        framework.TypeString,
 					Description: "SecretID attached to the role.",
 				},
 			},
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.UpdateOperation: &framework.PathOperation{
-					Callback:  b.pathRoleSecretIDDestroyUpdateDelete,
-					Responses: responseNoContent,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationSuffix: "secret-id",
-					},
-				},
-				logical.DeleteOperation: &framework.PathOperation{
-					Callback:  b.pathRoleSecretIDDestroyUpdateDelete,
-					Responses: responseNoContent,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationSuffix: "secret-id2",
-					},
-				},
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.UpdateOperation: b.pathRoleSecretIDDestroyUpdateDelete,
+				logical.DeleteOperation: b.pathRoleSecretIDDestroyUpdateDelete,
 			},
 			HelpSynopsis:    strings.TrimSpace(roleHelp["role-secret-id-destroy"][0]),
 			HelpDescription: strings.TrimSpace(roleHelp["role-secret-id-destroy"][1]),
 		},
 		{
 			Pattern: "role/" + framework.GenericNameRegex("role_name") + "/secret-id-accessor/lookup/?$",
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: operationPrefixAppRole,
-				OperationSuffix: "secret-id-by-accessor",
-				OperationVerb:   "look-up",
-			},
 			Fields: map[string]*framework.FieldSchema{
 				"role_name": {
 					Type:        framework.TypeString,
-					Description: fmt.Sprintf("Name of the role. Must be less than %d bytes.", maxHmacInputLength),
+					Description: "Name of the role.",
 				},
 				"secret_id_accessor": {
 					Type:        framework.TypeString,
 					Description: "Accessor of the SecretID",
 				},
 			},
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.UpdateOperation: &framework.PathOperation{
-					Callback: b.pathRoleSecretIDAccessorLookupUpdate,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"secret_id_accessor": {
-									Type:        framework.TypeString,
-									Required:    true,
-									Description: "Accessor of the secret ID",
-								},
-								"secret_id_ttl": {
-									Type:        framework.TypeDurationSecond,
-									Required:    true,
-									Description: "Duration in seconds after which the issued secret ID expires.",
-								},
-								"secret_id_num_uses": {
-									Type:        framework.TypeInt,
-									Required:    true,
-									Description: "Number of times a secret ID can access the role, after which the secret ID will expire.",
-								},
-								"creation_time": {
-									Type:     framework.TypeTime,
-									Required: true,
-								},
-								"expiration_time": {
-									Type:     framework.TypeTime,
-									Required: true,
-								},
-								"last_updated_time": {
-									Type:     framework.TypeTime,
-									Required: true,
-								},
-								"metadata": {
-									Type:     framework.TypeKVPairs,
-									Required: true,
-								},
-								"cidr_list": {
-									Type:        framework.TypeCommaStringSlice,
-									Required:    true,
-									Description: "List of CIDR blocks enforcing secret IDs to be used from specific set of IP addresses. If 'bound_cidr_list' is set on the role, then the list of CIDR blocks listed here should be a subset of the CIDR blocks listed on the role.",
-								},
-								"token_bound_cidrs": {
-									Type:        framework.TypeCommaStringSlice,
-									Required:    true,
-									Description: "List of CIDR blocks. If set, specifies the blocks of IP addresses which can use the returned token. Should be a subset of the token CIDR blocks listed on the role, if any.",
-								},
-							},
-						}},
-					},
-				},
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.UpdateOperation: b.pathRoleSecretIDAccessorLookupUpdate,
 			},
 			HelpSynopsis:    strings.TrimSpace(roleHelp["role-secret-id-accessor"][0]),
 			HelpDescription: strings.TrimSpace(roleHelp["role-secret-id-accessor"][1]),
 		},
 		{
 			Pattern: "role/" + framework.GenericNameRegex("role_name") + "/secret-id-accessor/destroy/?$",
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: operationPrefixAppRole,
-				OperationVerb:   "destroy",
-			},
 			Fields: map[string]*framework.FieldSchema{
 				"role_name": {
 					Type:        framework.TypeString,
-					Description: fmt.Sprintf("Name of the role. Must be less than %d bytes.", maxHmacInputLength),
+					Description: "Name of the role.",
 				},
 				"secret_id_accessor": {
 					Type:        framework.TypeString,
 					Description: "Accessor of the SecretID",
 				},
 			},
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.UpdateOperation: &framework.PathOperation{
-					Callback:  b.pathRoleSecretIDAccessorDestroyUpdateDelete,
-					Responses: responseNoContent,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationSuffix: "secret-id-by-accessor",
-					},
-				},
-				logical.DeleteOperation: &framework.PathOperation{
-					Callback:  b.pathRoleSecretIDAccessorDestroyUpdateDelete,
-					Responses: responseNoContent,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationSuffix: "secret-id-by-accessor2",
-					},
-				},
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.UpdateOperation: b.pathRoleSecretIDAccessorDestroyUpdateDelete,
+				logical.DeleteOperation: b.pathRoleSecretIDAccessorDestroyUpdateDelete,
 			},
 			HelpSynopsis:    strings.TrimSpace(roleHelp["role-secret-id-accessor"][0]),
 			HelpDescription: strings.TrimSpace(roleHelp["role-secret-id-accessor"][1]),
 		},
 		{
 			Pattern: "role/" + framework.GenericNameRegex("role_name") + "/custom-secret-id$",
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: operationPrefixAppRole,
-				OperationSuffix: "custom-secret-id",
-			},
 			Fields: map[string]*framework.FieldSchema{
 				"role_name": {
 					Type:        framework.TypeString,
-					Description: fmt.Sprintf("Name of the role. Must be less than %d bytes.", maxHmacInputLength),
+					Description: "Name of the role.",
 				},
 				"secret_id": {
 					Type:        framework.TypeString,
@@ -1259,37 +612,8 @@ Overrides secret_id_num_uses role option when supplied. May not be higher than r
 Overrides secret_id_ttl role option when supplied. May not be longer than role's secret_id_ttl.`,
 				},
 			},
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.UpdateOperation: &framework.PathOperation{
-					Callback: b.pathRoleCustomSecretIDUpdate,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"secret_id": {
-									Type:        framework.TypeString,
-									Required:    true,
-									Description: "Secret ID attached to the role.",
-								},
-								"secret_id_accessor": {
-									Type:        framework.TypeString,
-									Required:    true,
-									Description: "Accessor of the secret ID",
-								},
-								"secret_id_ttl": {
-									Type:        framework.TypeDurationSecond,
-									Required:    true,
-									Description: "Duration in seconds after which the issued secret ID expires.",
-								},
-								"secret_id_num_uses": {
-									Type:        framework.TypeInt,
-									Required:    true,
-									Description: "Number of times a secret ID can access the role, after which the secret ID will expire.",
-								},
-							},
-						}},
-					},
-				},
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.UpdateOperation: b.pathRoleCustomSecretIDUpdate,
 			},
 			HelpSynopsis:    strings.TrimSpace(roleHelp["role-custom-secret-id"][0]),
 			HelpDescription: strings.TrimSpace(roleHelp["role-custom-secret-id"][1]),
@@ -1556,10 +880,6 @@ func (b *backend) pathRoleCreateUpdate(ctx context.Context, req *logical.Request
 		return logical.ErrorResponse("missing role_name"), nil
 	}
 
-	if len(roleName) > maxHmacInputLength {
-		return logical.ErrorResponse(fmt.Sprintf("role_name is longer than maximum of %d bytes", maxHmacInputLength)), nil
-	}
-
 	lock := b.roleLock(roleName)
 	lock.Lock()
 	defer lock.Unlock()
diff --git a/builtin/credential/approle/path_role_test.go b/builtin/credential/approle/path_role_test.go
index a5ea9d1d51599..136b288c9685c 100644
--- a/builtin/credential/approle/path_role_test.go
+++ b/builtin/credential/approle/path_role_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package approle
 
 import (
@@ -15,23 +12,14 @@ import (
 	"github.com/go-test/deep"
 	"github.com/hashicorp/go-sockaddr"
 	"github.com/hashicorp/vault/sdk/helper/policyutil"
-	"github.com/hashicorp/vault/sdk/helper/testhelpers/schema"
 	"github.com/hashicorp/vault/sdk/helper/tokenutil"
 	"github.com/hashicorp/vault/sdk/logical"
 	"github.com/mitchellh/mapstructure"
 )
 
-func (b *backend) requestNoErr(t *testing.T, req *logical.Request) *logical.Response {
-	t.Helper()
-	resp, err := b.HandleRequest(context.Background(), req)
-	if err != nil || (resp != nil && resp.IsError()) {
-		t.Fatalf("err:%v resp:%#v", err, resp)
-	}
-	schema.ValidateResponse(t, schema.GetResponseSchema(t, b.Route(req.Path), req.Operation), resp, true)
-	return resp
-}
-
 func TestAppRole_LocalSecretIDsRead(t *testing.T) {
+	var resp *logical.Response
+	var err error
 	b, storage := createBackendWithStorage(t)
 
 	roleData := map[string]interface{}{
@@ -39,29 +27,37 @@ func TestAppRole_LocalSecretIDsRead(t *testing.T) {
 		"bind_secret_id":   true,
 	}
 
-	b.requestNoErr(t, &logical.Request{
+	resp, err = b.HandleRequest(context.Background(), &logical.Request{
 		Operation: logical.CreateOperation,
 		Path:      "role/testrole",
 		Storage:   storage,
 		Data:      roleData,
 	})
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
-	resp := b.requestNoErr(t, &logical.Request{
+	resp, err = b.HandleRequest(context.Background(), &logical.Request{
 		Operation: logical.ReadOperation,
 		Storage:   storage,
 		Path:      "role/testrole/local-secret-ids",
 	})
-
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 	if !resp.Data["local_secret_ids"].(bool) {
 		t.Fatalf("expected local_secret_ids to be returned")
 	}
 }
 
 func TestAppRole_LocalNonLocalSecretIDs(t *testing.T) {
+	var resp *logical.Response
+	var err error
+
 	b, storage := createBackendWithStorage(t)
 
 	// Create a role with local_secret_ids set
-	resp := b.requestNoErr(t, &logical.Request{
+	resp, err = b.HandleRequest(context.Background(), &logical.Request{
 		Path:      "role/testrole1",
 		Operation: logical.CreateOperation,
 		Storage:   storage,
@@ -71,9 +67,12 @@ func TestAppRole_LocalNonLocalSecretIDs(t *testing.T) {
 			"local_secret_ids": true,
 		},
 	})
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("bad: err: %v\n resp: %#v", err, resp)
+	}
 
 	// Create another role without setting local_secret_ids
-	resp = b.requestNoErr(t, &logical.Request{
+	resp, err = b.HandleRequest(context.Background(), &logical.Request{
 		Path:      "role/testrole2",
 		Operation: logical.CreateOperation,
 		Storage:   storage,
@@ -82,43 +81,56 @@ func TestAppRole_LocalNonLocalSecretIDs(t *testing.T) {
 			"bind_secret_id": true,
 		},
 	})
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("bad: err: %v\n resp: %#v", err, resp)
+	}
 
 	count := 10
 	// Create secret IDs on testrole1
 	for i := 0; i < count; i++ {
-		resp = b.requestNoErr(t, &logical.Request{
+		resp, err = b.HandleRequest(context.Background(), &logical.Request{
 			Path:      "role/testrole1/secret-id",
 			Operation: logical.UpdateOperation,
 			Storage:   storage,
 		})
+		if err != nil || (resp != nil && resp.IsError()) {
+			t.Fatalf("bad: resp: %#v\nerr: %v", resp, err)
+		}
 	}
 
 	// Check the number of secret IDs generated
-	resp = b.requestNoErr(t, &logical.Request{
+	resp, err = b.HandleRequest(context.Background(), &logical.Request{
 		Path:      "role/testrole1/secret-id",
 		Operation: logical.ListOperation,
 		Storage:   storage,
 	})
-
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("bad: resp: %#v\nerr: %v", resp, err)
+	}
 	if len(resp.Data["keys"].([]string)) != count {
 		t.Fatalf("failed to list secret IDs")
 	}
 
 	// Create secret IDs on testrole1
 	for i := 0; i < count; i++ {
-		resp = b.requestNoErr(t, &logical.Request{
+		resp, err = b.HandleRequest(context.Background(), &logical.Request{
 			Path:      "role/testrole2/secret-id",
 			Operation: logical.UpdateOperation,
 			Storage:   storage,
 		})
+		if err != nil || (resp != nil && resp.IsError()) {
+			t.Fatalf("bad: resp: %#v\nerr: %v", resp, err)
+		}
 	}
 
-	resp = b.requestNoErr(t, &logical.Request{
+	resp, err = b.HandleRequest(context.Background(), &logical.Request{
 		Path:      "role/testrole2/secret-id",
 		Operation: logical.ListOperation,
 		Storage:   storage,
 	})
-
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("bad: resp: %#v\nerr: %v", resp, err)
+	}
 	if len(resp.Data["keys"].([]string)) != count {
 		t.Fatalf("failed to list secret IDs")
 	}
@@ -152,12 +164,14 @@ func TestAppRole_UpgradeSecretIDPrefix(t *testing.T) {
 	}
 
 	// Ensure that the API response contains local_secret_ids
-	resp = b.requestNoErr(t, &logical.Request{
+	resp, err = b.HandleRequest(context.Background(), &logical.Request{
 		Path:      "role/testrole",
 		Operation: logical.ReadOperation,
 		Storage:   storage,
 	})
-
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("bad: err: %v\n resp: %#v", err, resp)
+	}
 	_, ok := resp.Data["local_secret_ids"]
 	if !ok {
 		t.Fatalf("expected local_secret_ids to be present in the response")
@@ -178,12 +192,15 @@ func TestAppRole_LocalSecretIDImmutability(t *testing.T) {
 	}
 
 	// Create a role with local_secret_ids set
-	resp = b.requestNoErr(t, &logical.Request{
+	resp, err = b.HandleRequest(context.Background(), &logical.Request{
 		Path:      "role/testrole",
 		Operation: logical.CreateOperation,
 		Storage:   storage,
 		Data:      roleData,
 	})
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("bad: err: %v\nresp: %#v", err, resp)
+	}
 
 	// Attempt to modify local_secret_ids should fail
 	resp, err = b.HandleRequest(context.Background(), &logical.Request{
@@ -213,19 +230,25 @@ func TestAppRole_UpgradeBoundCIDRList(t *testing.T) {
 	}
 
 	// Create a role with bound_cidr_list set
-	resp = b.requestNoErr(t, &logical.Request{
+	resp, err = b.HandleRequest(context.Background(), &logical.Request{
 		Path:      "role/testrole",
 		Operation: logical.CreateOperation,
 		Storage:   storage,
 		Data:      roleData,
 	})
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("bad: err: %v\nresp: %#v", err, resp)
+	}
 
 	// Read the role and check that the bound_cidr_list is set properly
-	resp = b.requestNoErr(t, &logical.Request{
+	resp, err = b.HandleRequest(context.Background(), &logical.Request{
 		Path:      "role/testrole",
 		Operation: logical.ReadOperation,
 		Storage:   storage,
 	})
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("bad: err: %v\nresp: %#v", err, resp)
+	}
 
 	expected := []string{"127.0.0.1/18", "192.178.1.2/24"}
 	actual := resp.Data["secret_id_bound_cidrs"].([]string)
@@ -249,18 +272,20 @@ func TestAppRole_UpgradeBoundCIDRList(t *testing.T) {
 	}
 
 	// Read the role. The upgrade code should have migrated the old type to the new type
-	resp = b.requestNoErr(t, &logical.Request{
+	resp, err = b.HandleRequest(context.Background(), &logical.Request{
 		Path:      "role/testrole",
 		Operation: logical.ReadOperation,
 		Storage:   storage,
 	})
-
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("bad: err: %v\nresp: %#v", err, resp)
+	}
 	if !reflect.DeepEqual(expected, actual) {
 		t.Fatalf("bad: bound_cidr_list; expected: %#v\nactual: %#v\n", expected, actual)
 	}
 
 	// Create a secret-id by supplying a subset of the role's CIDR blocks with the new type
-	resp = b.requestNoErr(t, &logical.Request{
+	resp, err = b.HandleRequest(context.Background(), &logical.Request{
 		Path:      "role/testrole/secret-id",
 		Operation: logical.UpdateOperation,
 		Storage:   storage,
@@ -268,13 +293,15 @@ func TestAppRole_UpgradeBoundCIDRList(t *testing.T) {
 			"cidr_list": []string{"127.0.0.1/24"},
 		},
 	})
-
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("bad: err: %v\nresp: %#v", err, resp)
+	}
 	if resp.Data["secret_id"].(string) == "" {
 		t.Fatalf("failed to generate secret-id")
 	}
 
 	// Check that the backwards compatibility for the string type is not broken
-	resp = b.requestNoErr(t, &logical.Request{
+	resp, err = b.HandleRequest(context.Background(), &logical.Request{
 		Path:      "role/testrole/secret-id",
 		Operation: logical.UpdateOperation,
 		Storage:   storage,
@@ -282,7 +309,9 @@ func TestAppRole_UpgradeBoundCIDRList(t *testing.T) {
 			"cidr_list": "127.0.0.1/24",
 		},
 	})
-
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("bad: err: %v\nresp: %#v", err, resp)
+	}
 	if resp.Data["secret_id"].(string) == "" {
 		t.Fatalf("failed to generate secret-id")
 	}
@@ -313,13 +342,15 @@ func TestAppRole_RoleNameLowerCasing(t *testing.T) {
 		Operation: logical.UpdateOperation,
 		Storage:   storage,
 	}
-	resp = b.requestNoErr(t, secretIDReq)
-
+	resp, err = b.HandleRequest(context.Background(), secretIDReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("bad: resp: %#v\nerr: %v", resp, err)
+	}
 	secretID = resp.Data["secret_id"].(string)
 	roleID = "testroleid"
 
 	// Regular login flow. This should succeed.
-	resp = b.requestNoErr(t, &logical.Request{
+	resp, err = b.HandleRequest(context.Background(), &logical.Request{
 		Path:      "login",
 		Operation: logical.UpdateOperation,
 		Storage:   storage,
@@ -328,11 +359,16 @@ func TestAppRole_RoleNameLowerCasing(t *testing.T) {
 			"secret_id": secretID,
 		},
 	})
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("bad: resp: %#v\nerr: %v", resp, err)
+	}
 
 	// Lower case the role name when generating the secret id
 	secretIDReq.Path = "role/testrolename/secret-id"
-	resp = b.requestNoErr(t, secretIDReq)
-
+	resp, err = b.HandleRequest(context.Background(), secretIDReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("bad: resp: %#v\nerr: %v", resp, err)
+	}
 	secretID = resp.Data["secret_id"].(string)
 
 	// Login should fail
@@ -345,7 +381,7 @@ func TestAppRole_RoleNameLowerCasing(t *testing.T) {
 			"secret_id": secretID,
 		},
 	})
-	if err != nil && err != logical.ErrInvalidCredentials {
+	if err != nil {
 		t.Fatal(err)
 	}
 	if resp == nil || !resp.IsError() {
@@ -355,11 +391,14 @@ func TestAppRole_RoleNameLowerCasing(t *testing.T) {
 	// Delete the role and create it again. This time don't directly persist
 	// it, but route the request to the creation handler so that it sets the
 	// LowerCaseRoleName to true.
-	resp = b.requestNoErr(t, &logical.Request{
+	resp, err = b.HandleRequest(context.Background(), &logical.Request{
 		Path:      "role/testRoleName",
 		Operation: logical.DeleteOperation,
 		Storage:   storage,
 	})
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("bad: resp: %#v\nerr: %v", resp, err)
+	}
 
 	roleReq := &logical.Request{
 		Path:      "role/testRoleName",
@@ -369,27 +408,34 @@ func TestAppRole_RoleNameLowerCasing(t *testing.T) {
 			"bind_secret_id": true,
 		},
 	}
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("bad: resp: %#v\nerr: %v", resp, err)
+	}
 
 	// Create secret id with lower cased role name
-	resp = b.requestNoErr(t, &logical.Request{
+	resp, err = b.HandleRequest(context.Background(), &logical.Request{
 		Path:      "role/testrolename/secret-id",
 		Operation: logical.UpdateOperation,
 		Storage:   storage,
 	})
-
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("bad: resp: %#v\nerr: %v", resp, err)
+	}
 	secretID = resp.Data["secret_id"].(string)
 
-	resp = b.requestNoErr(t, &logical.Request{
+	resp, err = b.HandleRequest(context.Background(), &logical.Request{
 		Path:      "role/testrolename/role-id",
 		Operation: logical.ReadOperation,
 		Storage:   storage,
 	})
-
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("bad: resp: %#v\nerr: %v", resp, err)
+	}
 	roleID = resp.Data["role_id"].(string)
 
 	// Login should pass
-	resp = b.requestNoErr(t, &logical.Request{
+	resp, err = b.HandleRequest(context.Background(), &logical.Request{
 		Path:      "login",
 		Operation: logical.UpdateOperation,
 		Storage:   storage,
@@ -398,9 +444,12 @@ func TestAppRole_RoleNameLowerCasing(t *testing.T) {
 			"secret_id": secretID,
 		},
 	})
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("bad: resp: %#v\nerr:%v", resp, err)
+	}
 
 	// Lookup of secret ID should work in case-insensitive manner
-	resp = b.requestNoErr(t, &logical.Request{
+	resp, err = b.HandleRequest(context.Background(), &logical.Request{
 		Path:      "role/testrolename/secret-id/lookup",
 		Operation: logical.UpdateOperation,
 		Storage:   storage,
@@ -408,17 +457,22 @@ func TestAppRole_RoleNameLowerCasing(t *testing.T) {
 			"secret_id": secretID,
 		},
 	})
-
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("bad: resp: %#v\nerr: %v", resp, err)
+	}
 	if resp == nil {
 		t.Fatalf("failed to lookup secret IDs")
 	}
 
 	// Listing of secret IDs should work in case-insensitive manner
-	resp = b.requestNoErr(t, &logical.Request{
+	resp, err = b.HandleRequest(context.Background(), &logical.Request{
 		Path:      "role/testrolename/secret-id",
 		Operation: logical.ListOperation,
 		Storage:   storage,
 	})
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("bad: resp: %#v\nerr: %v", resp, err)
+	}
 
 	if len(resp.Data["keys"].([]string)) != 1 {
 		t.Fatalf("failed to list secret IDs")
@@ -441,7 +495,10 @@ func TestAppRole_RoleReadSetIndex(t *testing.T) {
 	}
 
 	// Create a role
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("bad: resp: %#v\n err: %v\n", resp, err)
+	}
 
 	roleIDReq := &logical.Request{
 		Path:      "role/testrole/role-id",
@@ -450,8 +507,10 @@ func TestAppRole_RoleReadSetIndex(t *testing.T) {
 	}
 
 	// Get the role ID
-	resp = b.requestNoErr(t, roleIDReq)
-
+	resp, err = b.HandleRequest(context.Background(), roleIDReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("bad: resp: %#v\n err: %v\n", resp, err)
+	}
 	roleID := resp.Data["role_id"].(string)
 
 	// Delete the role ID index
@@ -462,7 +521,10 @@ func TestAppRole_RoleReadSetIndex(t *testing.T) {
 
 	// Read the role again. This should add the index and return a warning
 	roleReq.Operation = logical.ReadOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("bad: resp: %#v\n err: %v\n", resp, err)
+	}
 
 	// Check if the warning is being returned
 	if !strings.Contains(resp.Warnings[0], "Role identifier was missing an index back to role name.") {
@@ -487,10 +549,15 @@ func TestAppRole_RoleReadSetIndex(t *testing.T) {
 
 	// Check if updating and reading of roles work and that there are no lock
 	// contentions dangling due to previous operation
-	resp = b.requestNoErr(t, roleReq)
-
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("bad: resp: %#v\n err: %v\n", resp, err)
+	}
 	roleReq.Operation = logical.ReadOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("bad: resp: %#v\n err: %v\n", resp, err)
+	}
 }
 
 func TestAppRole_CIDRSubset(t *testing.T) {
@@ -512,7 +579,10 @@ func TestAppRole_CIDRSubset(t *testing.T) {
 		Data:      roleData,
 	}
 
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err: %v resp: %#v", err, resp)
+	}
 
 	secretIDData := map[string]interface{}{
 		"cidr_list": "127.0.0.1/16",
@@ -534,10 +604,19 @@ func TestAppRole_CIDRSubset(t *testing.T) {
 
 	roleData["bound_cidr_list"] = "192.168.27.29/16,172.245.30.40/24,10.20.30.40/30"
 	roleReq.Operation = logical.UpdateOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err: %v resp: %#v", err, resp)
+	}
 
 	secretIDData["cidr_list"] = "192.168.27.29/20,172.245.30.40/25,10.20.30.40/32"
-	resp = b.requestNoErr(t, secretIDReq)
+	resp, err = b.HandleRequest(context.Background(), secretIDReq)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if resp != nil && resp.IsError() {
+		t.Fatalf("resp: %#v", resp)
+	}
 }
 
 func TestAppRole_TokenBoundCIDRSubset32Mask(t *testing.T) {
@@ -559,7 +638,10 @@ func TestAppRole_TokenBoundCIDRSubset32Mask(t *testing.T) {
 		Data:      roleData,
 	}
 
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err: %v resp: %#v", err, resp)
+	}
 
 	secretIDData := map[string]interface{}{
 		"token_bound_cidrs": "127.0.0.1/32",
@@ -571,7 +653,10 @@ func TestAppRole_TokenBoundCIDRSubset32Mask(t *testing.T) {
 		Data:      secretIDData,
 	}
 
-	resp = b.requestNoErr(t, secretIDReq)
+	resp, err = b.HandleRequest(context.Background(), secretIDReq)
+	if err != nil {
+		t.Fatalf("err: %v resp: %#v", err, resp)
+	}
 
 	secretIDData = map[string]interface{}{
 		"token_bound_cidrs": "127.0.0.1/24",
@@ -611,13 +696,19 @@ func TestAppRole_RoleConstraints(t *testing.T) {
 	}
 
 	// Set bind_secret_id, which is enabled by default
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	// Set bound_cidr_list alone by explicitly disabling bind_secret_id
 	roleReq.Operation = logical.UpdateOperation
 	roleData["bind_secret_id"] = false
 	roleData["bound_cidr_list"] = "0.0.0.0/0"
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	// Remove both constraints
 	roleReq.Operation = logical.UpdateOperation
@@ -634,6 +725,7 @@ func TestAppRole_RoleConstraints(t *testing.T) {
 
 func TestAppRole_RoleIDUpdate(t *testing.T) {
 	var resp *logical.Response
+	var err error
 	b, storage := createBackendWithStorage(t)
 
 	roleData := map[string]interface{}{
@@ -650,7 +742,10 @@ func TestAppRole_RoleIDUpdate(t *testing.T) {
 		Storage:   storage,
 		Data:      roleData,
 	}
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	roleIDUpdateReq := &logical.Request{
 		Operation: logical.UpdateOperation,
@@ -660,15 +755,20 @@ func TestAppRole_RoleIDUpdate(t *testing.T) {
 			"role_id": "customroleid",
 		},
 	}
-	resp = b.requestNoErr(t, roleIDUpdateReq)
+	resp, err = b.HandleRequest(context.Background(), roleIDUpdateReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	secretIDReq := &logical.Request{
 		Operation: logical.UpdateOperation,
 		Storage:   storage,
 		Path:      "role/testrole1/secret-id",
 	}
-	resp = b.requestNoErr(t, secretIDReq)
-
+	resp, err = b.HandleRequest(context.Background(), secretIDReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 	secretID := resp.Data["secret_id"].(string)
 
 	loginData := map[string]interface{}{
@@ -684,7 +784,10 @@ func TestAppRole_RoleIDUpdate(t *testing.T) {
 			RemoteAddr: "127.0.0.1",
 		},
 	}
-	resp = b.requestNoErr(t, loginReq)
+	resp, err = b.HandleRequest(context.Background(), loginReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	if resp.Auth == nil {
 		t.Fatalf("expected a non-nil auth object in the response")
@@ -711,7 +814,10 @@ func TestAppRole_RoleIDUniqueness(t *testing.T) {
 		Data:      roleData,
 	}
 
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	roleReq.Path = "role/testrole2"
 	resp, err = b.HandleRequest(context.Background(), roleReq)
@@ -720,7 +826,10 @@ func TestAppRole_RoleIDUniqueness(t *testing.T) {
 	}
 
 	roleData["role_id"] = "role-id-456"
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	roleReq.Operation = logical.UpdateOperation
 	roleData["role_id"] = "role-id-123"
@@ -758,15 +867,22 @@ func TestAppRole_RoleIDUniqueness(t *testing.T) {
 	}
 
 	roleIDData["role_id"] = "role-id-2000"
-	resp = b.requestNoErr(t, roleIDReq)
+	resp, err = b.HandleRequest(context.Background(), roleIDReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	roleIDData["role_id"] = "role-id-1000"
 	roleIDReq.Path = "role/testrole1/role-id"
-	resp = b.requestNoErr(t, roleIDReq)
+	resp, err = b.HandleRequest(context.Background(), roleIDReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 }
 
 func TestAppRole_RoleDeleteSecretID(t *testing.T) {
 	var resp *logical.Response
+	var err error
 	b, storage := createBackendWithStorage(t)
 
 	createRole(t, b, storage, "role1", "a,b")
@@ -776,17 +892,28 @@ func TestAppRole_RoleDeleteSecretID(t *testing.T) {
 		Path:      "role/role1/secret-id",
 	}
 	// Create 3 secrets on the role
-	resp = b.requestNoErr(t, secretIDReq)
-	resp = b.requestNoErr(t, secretIDReq)
-	resp = b.requestNoErr(t, secretIDReq)
+	resp, err = b.HandleRequest(context.Background(), secretIDReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
+	resp, err = b.HandleRequest(context.Background(), secretIDReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
+	resp, err = b.HandleRequest(context.Background(), secretIDReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	listReq := &logical.Request{
 		Operation: logical.ListOperation,
 		Storage:   storage,
 		Path:      "role/role1/secret-id",
 	}
-	resp = b.requestNoErr(t, listReq)
-
+	resp, err = b.HandleRequest(context.Background(), listReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 	secretIDAccessors := resp.Data["keys"].([]string)
 	if len(secretIDAccessors) != 3 {
 		t.Fatalf("bad: len of secretIDAccessors: expected:3 actual:%d", len(secretIDAccessors))
@@ -797,9 +924,11 @@ func TestAppRole_RoleDeleteSecretID(t *testing.T) {
 		Storage:   storage,
 		Path:      "role/role1",
 	}
-	resp = b.requestNoErr(t, roleReq)
-
-	resp, err := b.HandleRequest(context.Background(), listReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
+	resp, err = b.HandleRequest(context.Background(), listReq)
 	if err != nil || resp == nil || (resp != nil && !resp.IsError()) {
 		t.Fatalf("expected an error. err:%v resp:%#v", err, resp)
 	}
@@ -816,7 +945,10 @@ func TestAppRole_RoleSecretIDReadDelete(t *testing.T) {
 		Storage:   storage,
 		Path:      "role/role1/secret-id",
 	}
-	resp = b.requestNoErr(t, secretIDCreateReq)
+	resp, err = b.HandleRequest(context.Background(), secretIDCreateReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	secretID := resp.Data["secret_id"].(string)
 	if secretID == "" {
@@ -831,8 +963,10 @@ func TestAppRole_RoleSecretIDReadDelete(t *testing.T) {
 			"secret_id": secretID,
 		},
 	}
-	resp = b.requestNoErr(t, secretIDReq)
-
+	resp, err = b.HandleRequest(context.Background(), secretIDReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 	if resp.Data == nil {
 		t.Fatal(err)
 	}
@@ -845,7 +979,11 @@ func TestAppRole_RoleSecretIDReadDelete(t *testing.T) {
 			"secret_id": secretID,
 		},
 	}
-	resp = b.requestNoErr(t, deleteSecretIDReq)
+	resp, err = b.HandleRequest(context.Background(), deleteSecretIDReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
+
 	resp, err = b.HandleRequest(context.Background(), secretIDReq)
 	if resp != nil && resp.IsError() {
 		t.Fatalf("error response:%#v", resp)
@@ -866,15 +1004,20 @@ func TestAppRole_RoleSecretIDAccessorReadDelete(t *testing.T) {
 		Storage:   storage,
 		Path:      "role/role1/secret-id",
 	}
-	resp = b.requestNoErr(t, secretIDReq)
+	resp, err = b.HandleRequest(context.Background(), secretIDReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	listReq := &logical.Request{
 		Operation: logical.ListOperation,
 		Storage:   storage,
 		Path:      "role/role1/secret-id",
 	}
-	resp = b.requestNoErr(t, listReq)
-
+	resp, err = b.HandleRequest(context.Background(), listReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 	hmacSecretID := resp.Data["keys"].([]string)[0]
 
 	hmacReq := &logical.Request{
@@ -885,14 +1028,19 @@ func TestAppRole_RoleSecretIDAccessorReadDelete(t *testing.T) {
 			"secret_id_accessor": hmacSecretID,
 		},
 	}
-	resp = b.requestNoErr(t, hmacReq)
-
+	resp, err = b.HandleRequest(context.Background(), hmacReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 	if resp.Data == nil {
 		t.Fatal(err)
 	}
 
 	hmacReq.Path = "role/role1/secret-id-accessor/destroy"
-	resp = b.requestNoErr(t, hmacReq)
+	resp, err = b.HandleRequest(context.Background(), hmacReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	hmacReq.Operation = logical.ReadOperation
 	resp, err = b.HandleRequest(context.Background(), hmacReq)
@@ -934,6 +1082,7 @@ func TestAppRoleSecretIDLookup(t *testing.T) {
 
 func TestAppRoleRoleListSecretID(t *testing.T) {
 	var resp *logical.Response
+	var err error
 	b, storage := createBackendWithStorage(t)
 
 	createRole(t, b, storage, "role1", "a,b")
@@ -944,19 +1093,36 @@ func TestAppRoleRoleListSecretID(t *testing.T) {
 		Path:      "role/role1/secret-id",
 	}
 	// Create 5 'secret_id's
-	resp = b.requestNoErr(t, secretIDReq)
-	resp = b.requestNoErr(t, secretIDReq)
-	resp = b.requestNoErr(t, secretIDReq)
-	resp = b.requestNoErr(t, secretIDReq)
-	resp = b.requestNoErr(t, secretIDReq)
+	resp, err = b.HandleRequest(context.Background(), secretIDReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
+	resp, err = b.HandleRequest(context.Background(), secretIDReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
+	resp, err = b.HandleRequest(context.Background(), secretIDReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
+	resp, err = b.HandleRequest(context.Background(), secretIDReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
+	resp, err = b.HandleRequest(context.Background(), secretIDReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	listReq := &logical.Request{
 		Operation: logical.ListOperation,
 		Storage:   storage,
 		Path:      "role/role1/secret-id/",
 	}
-	resp = b.requestNoErr(t, listReq)
-
+	resp, err = b.HandleRequest(context.Background(), listReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 	secrets := resp.Data["keys"].([]string)
 	if len(secrets) != 5 {
 		t.Fatalf("bad: len of secrets: expected:5 actual:%d", len(secrets))
@@ -965,6 +1131,7 @@ func TestAppRoleRoleListSecretID(t *testing.T) {
 
 func TestAppRole_RoleList(t *testing.T) {
 	var resp *logical.Response
+	var err error
 	b, storage := createBackendWithStorage(t)
 
 	createRole(t, b, storage, "role1", "a,b")
@@ -978,7 +1145,10 @@ func TestAppRole_RoleList(t *testing.T) {
 		Path:      "role",
 		Storage:   storage,
 	}
-	resp = b.requestNoErr(t, listReq)
+	resp, err = b.HandleRequest(context.Background(), listReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	actual := resp.Data["keys"].([]string)
 	expected := []string{"role1", "role2", "role3", "role4", "role5"}
@@ -989,6 +1159,7 @@ func TestAppRole_RoleList(t *testing.T) {
 
 func TestAppRole_RoleSecretIDWithoutFields(t *testing.T) {
 	var resp *logical.Response
+	var err error
 	b, storage := createBackendWithStorage(t)
 
 	roleData := map[string]interface{}{
@@ -1005,14 +1176,20 @@ func TestAppRole_RoleSecretIDWithoutFields(t *testing.T) {
 		Data:      roleData,
 	}
 
-	resp = b.requestNoErr(t, roleReq)
-
-	roleSecretIDReq := &logical.Request{
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
+
+	roleSecretIDReq := &logical.Request{
 		Operation: logical.UpdateOperation,
 		Path:      "role/role1/secret-id",
 		Storage:   storage,
 	}
-	resp = b.requestNoErr(t, roleSecretIDReq)
+	resp, err = b.HandleRequest(context.Background(), roleSecretIDReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	if resp.Data["secret_id"].(string) == "" {
 		t.Fatalf("failed to generate secret_id")
@@ -1029,7 +1206,10 @@ func TestAppRole_RoleSecretIDWithoutFields(t *testing.T) {
 		"secret_id": "abcd123",
 	}
 	roleSecretIDReq.Data = roleCustomSecretIDData
-	resp = b.requestNoErr(t, roleSecretIDReq)
+	resp, err = b.HandleRequest(context.Background(), roleSecretIDReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	if resp.Data["secret_id"] != "abcd123" {
 		t.Fatalf("failed to set specific secret_id to role")
@@ -1049,6 +1229,7 @@ func TestAppRole_RoleSecretIDWithValidFields(t *testing.T) {
 	}
 
 	var resp *logical.Response
+	var err error
 	b, storage := createBackendWithStorage(t)
 
 	roleData := map[string]interface{}{
@@ -1065,7 +1246,10 @@ func TestAppRole_RoleSecretIDWithValidFields(t *testing.T) {
 		Data:      roleData,
 	}
 
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	testCases := []testCase{
 		{
@@ -1096,7 +1280,10 @@ func TestAppRole_RoleSecretIDWithValidFields(t *testing.T) {
 			roleCustomSecretIDData := tc.payload
 			roleSecretIDReq.Data = roleCustomSecretIDData
 
-			resp = b.requestNoErr(t, roleSecretIDReq)
+			resp, err = b.HandleRequest(context.Background(), roleSecretIDReq)
+			if err != nil || (resp != nil && resp.IsError()) {
+				t.Fatalf("err:%v resp:%#v", err, resp)
+			}
 
 			if resp.Data["secret_id"].(string) == "" {
 				t.Fatalf("failed to generate secret_id")
@@ -1110,7 +1297,10 @@ func TestAppRole_RoleSecretIDWithValidFields(t *testing.T) {
 
 			roleSecretIDReq.Path = "role/role1/custom-secret-id"
 			roleSecretIDReq.Data = roleCustomSecretIDData
-			resp = b.requestNoErr(t, roleSecretIDReq)
+			resp, err = b.HandleRequest(context.Background(), roleSecretIDReq)
+			if err != nil || (resp != nil && resp.IsError()) {
+				t.Fatalf("err:%v resp:%#v", err, resp)
+			}
 
 			if resp.Data["secret_id"] != tc.payload["secret_id"] {
 				t.Fatalf("failed to set specific secret_id to role")
@@ -1226,7 +1416,10 @@ func TestAppRole_ErrorsRoleSecretIDWithInvalidFields(t *testing.T) {
 			Data:      roleData,
 		}
 
-		resp = b.requestNoErr(t, roleReq)
+		resp, err = b.HandleRequest(context.Background(), roleReq)
+		if err != nil || (resp != nil && resp.IsError()) {
+			t.Fatalf("err:%v resp:%#v", err, resp)
+		}
 
 		for _, tc := range rc.cases {
 			t.Run(fmt.Sprintf("%s/%s", rc.name, tc.name), func(t *testing.T) {
@@ -1278,10 +1471,16 @@ func TestAppRole_RoleCRUD(t *testing.T) {
 		Data:      roleData,
 	}
 
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	roleReq.Operation = logical.ReadOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	expected := map[string]interface{}{
 		"bind_secret_id":        true,
@@ -1324,10 +1523,16 @@ func TestAppRole_RoleCRUD(t *testing.T) {
 	roleReq.Data = roleData
 	roleReq.Operation = logical.UpdateOperation
 
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	roleReq.Operation = logical.ReadOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	expected = map[string]interface{}{
 		"policies":           []string{"a", "b", "c", "d"},
@@ -1353,19 +1558,26 @@ func TestAppRole_RoleCRUD(t *testing.T) {
 	// RU for role_id field
 	roleReq.Path = "role/role1/role-id"
 	roleReq.Operation = logical.ReadOperation
-	resp = b.requestNoErr(t, roleReq)
-
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 	if resp.Data["role_id"].(string) != "test_role_id" {
 		t.Fatalf("bad: role_id: expected:test_role_id actual:%s\n", resp.Data["role_id"].(string))
 	}
 
 	roleReq.Data = map[string]interface{}{"role_id": "custom_role_id"}
 	roleReq.Operation = logical.UpdateOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	roleReq.Operation = logical.ReadOperation
-	resp = b.requestNoErr(t, roleReq)
-
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 	if resp.Data["role_id"].(string) != "custom_role_id" {
 		t.Fatalf("bad: role_id: expected:custom_role_id actual:%s\n", resp.Data["role_id"].(string))
 	}
@@ -1373,23 +1585,38 @@ func TestAppRole_RoleCRUD(t *testing.T) {
 	// RUD for bind_secret_id field
 	roleReq.Path = "role/role1/bind-secret-id"
 	roleReq.Operation = logical.ReadOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	roleReq.Data = map[string]interface{}{"bind_secret_id": false}
 	roleReq.Operation = logical.UpdateOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	roleReq.Operation = logical.ReadOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	if resp.Data["bind_secret_id"].(bool) {
 		t.Fatalf("bad: bind_secret_id: expected:false actual:%t\n", resp.Data["bind_secret_id"].(bool))
 	}
 	roleReq.Operation = logical.DeleteOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	roleReq.Operation = logical.ReadOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	if !resp.Data["bind_secret_id"].(bool) {
 		t.Fatalf("expected the default value of 'true' to be set")
@@ -1398,14 +1625,23 @@ func TestAppRole_RoleCRUD(t *testing.T) {
 	// RUD for policies field
 	roleReq.Path = "role/role1/policies"
 	roleReq.Operation = logical.ReadOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	roleReq.Data = map[string]interface{}{"policies": "a1,b1,c1,d1"}
 	roleReq.Operation = logical.UpdateOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	roleReq.Operation = logical.ReadOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	if !reflect.DeepEqual(resp.Data["policies"].([]string), []string{"a1", "b1", "c1", "d1"}) {
 		t.Fatalf("bad: policies: actual:%s\n", resp.Data["policies"].([]string))
@@ -1414,10 +1650,16 @@ func TestAppRole_RoleCRUD(t *testing.T) {
 		t.Fatalf("bad: policies: actual:%s\n", resp.Data["policies"].([]string))
 	}
 	roleReq.Operation = logical.DeleteOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	roleReq.Operation = logical.ReadOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	expectedPolicies := []string{}
 	actualPolicies := resp.Data["token_policies"].([]string)
@@ -1428,23 +1670,38 @@ func TestAppRole_RoleCRUD(t *testing.T) {
 	// RUD for secret-id-num-uses field
 	roleReq.Path = "role/role1/secret-id-num-uses"
 	roleReq.Operation = logical.ReadOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	roleReq.Data = map[string]interface{}{"secret_id_num_uses": 200}
 	roleReq.Operation = logical.UpdateOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	roleReq.Operation = logical.ReadOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	if resp.Data["secret_id_num_uses"].(int) != 200 {
 		t.Fatalf("bad: secret_id_num_uses: expected:200 actual:%d\n", resp.Data["secret_id_num_uses"].(int))
 	}
 	roleReq.Operation = logical.DeleteOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	roleReq.Operation = logical.ReadOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	if resp.Data["secret_id_num_uses"].(int) != 0 {
 		t.Fatalf("expected value to be reset")
@@ -1453,23 +1710,38 @@ func TestAppRole_RoleCRUD(t *testing.T) {
 	// RUD for secret_id_ttl field
 	roleReq.Path = "role/role1/secret-id-ttl"
 	roleReq.Operation = logical.ReadOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	roleReq.Data = map[string]interface{}{"secret_id_ttl": 3001}
 	roleReq.Operation = logical.UpdateOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	roleReq.Operation = logical.ReadOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	if resp.Data["secret_id_ttl"].(time.Duration) != 3001 {
 		t.Fatalf("bad: secret_id_ttl: expected:3001 actual:%d\n", resp.Data["secret_id_ttl"].(time.Duration))
 	}
 	roleReq.Operation = logical.DeleteOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	roleReq.Operation = logical.ReadOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	if resp.Data["secret_id_ttl"].(time.Duration) != 0 {
 		t.Fatalf("expected value to be reset")
@@ -1478,28 +1750,42 @@ func TestAppRole_RoleCRUD(t *testing.T) {
 	// RUD for secret-id-num-uses field
 	roleReq.Path = "role/role1/token-num-uses"
 	roleReq.Operation = logical.ReadOperation
-	resp = b.requestNoErr(t, roleReq)
-
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 	if resp.Data["token_num_uses"].(int) != 600 {
 		t.Fatalf("bad: token_num_uses: expected:600 actual:%d\n", resp.Data["token_num_uses"].(int))
 	}
 
 	roleReq.Data = map[string]interface{}{"token_num_uses": 60}
 	roleReq.Operation = logical.UpdateOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	roleReq.Operation = logical.ReadOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	if resp.Data["token_num_uses"].(int) != 60 {
 		t.Fatalf("bad: token_num_uses: expected:60 actual:%d\n", resp.Data["token_num_uses"].(int))
 	}
 
 	roleReq.Operation = logical.DeleteOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	roleReq.Operation = logical.ReadOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	if resp.Data["token_num_uses"].(int) != 0 {
 		t.Fatalf("expected value to be reset")
@@ -1508,23 +1794,38 @@ func TestAppRole_RoleCRUD(t *testing.T) {
 	// RUD for 'period' field
 	roleReq.Path = "role/role1/period"
 	roleReq.Operation = logical.ReadOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	roleReq.Data = map[string]interface{}{"period": 9001}
 	roleReq.Operation = logical.UpdateOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	roleReq.Operation = logical.ReadOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	if resp.Data["period"].(time.Duration) != 9001 {
 		t.Fatalf("bad: period: expected:9001 actual:%d\n", resp.Data["9001"].(time.Duration))
 	}
 	roleReq.Operation = logical.DeleteOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	roleReq.Operation = logical.ReadOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	if resp.Data["token_period"].(time.Duration) != 0 {
 		t.Fatalf("expected value to be reset")
@@ -1533,23 +1834,38 @@ func TestAppRole_RoleCRUD(t *testing.T) {
 	// RUD for token_ttl field
 	roleReq.Path = "role/role1/token-ttl"
 	roleReq.Operation = logical.ReadOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	roleReq.Data = map[string]interface{}{"token_ttl": 4001}
 	roleReq.Operation = logical.UpdateOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	roleReq.Operation = logical.ReadOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	if resp.Data["token_ttl"].(time.Duration) != 4001 {
 		t.Fatalf("bad: token_ttl: expected:4001 actual:%d\n", resp.Data["token_ttl"].(time.Duration))
 	}
 	roleReq.Operation = logical.DeleteOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	roleReq.Operation = logical.ReadOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	if resp.Data["token_ttl"].(time.Duration) != 0 {
 		t.Fatalf("expected value to be reset")
@@ -1558,23 +1874,38 @@ func TestAppRole_RoleCRUD(t *testing.T) {
 	// RUD for token_max_ttl field
 	roleReq.Path = "role/role1/token-max-ttl"
 	roleReq.Operation = logical.ReadOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	roleReq.Data = map[string]interface{}{"token_max_ttl": 5001}
 	roleReq.Operation = logical.UpdateOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	roleReq.Operation = logical.ReadOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	if resp.Data["token_max_ttl"].(time.Duration) != 5001 {
 		t.Fatalf("bad: token_max_ttl: expected:5001 actual:%d\n", resp.Data["token_max_ttl"].(time.Duration))
 	}
 	roleReq.Operation = logical.DeleteOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	roleReq.Operation = logical.ReadOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	if resp.Data["token_max_ttl"].(time.Duration) != 0 {
 		t.Fatalf("expected value to be reset")
@@ -1583,7 +1914,10 @@ func TestAppRole_RoleCRUD(t *testing.T) {
 	// Delete test for role
 	roleReq.Path = "role/role1"
 	roleReq.Operation = logical.DeleteOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	roleReq.Operation = logical.ReadOperation
 	resp, err = b.HandleRequest(context.Background(), roleReq)
@@ -1618,10 +1952,16 @@ func TestAppRole_RoleWithTokenBoundCIDRsCRUD(t *testing.T) {
 		Data:      roleData,
 	}
 
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	roleReq.Operation = logical.ReadOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	expected := map[string]interface{}{
 		"bind_secret_id":        true,
@@ -1664,10 +2004,16 @@ func TestAppRole_RoleWithTokenBoundCIDRsCRUD(t *testing.T) {
 	roleReq.Data = roleData
 	roleReq.Operation = logical.UpdateOperation
 
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	roleReq.Operation = logical.ReadOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	expected = map[string]interface{}{
 		"policies":           []string{"a", "b", "c", "d"},
@@ -1693,8 +2039,10 @@ func TestAppRole_RoleWithTokenBoundCIDRsCRUD(t *testing.T) {
 	// RUD for secret-id-bound-cidrs field
 	roleReq.Path = "role/role1/secret-id-bound-cidrs"
 	roleReq.Operation = logical.ReadOperation
-	resp = b.requestNoErr(t, roleReq)
-
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 	if resp.Data["secret_id_bound_cidrs"].([]string)[0] != "127.0.0.1/32" ||
 		resp.Data["secret_id_bound_cidrs"].([]string)[1] != "127.0.0.1/16" {
 		t.Fatalf("bad: secret_id_bound_cidrs: expected:127.0.0.1/32,127.0.0.1/16 actual:%d\n", resp.Data["secret_id_bound_cidrs"].(int))
@@ -1702,20 +2050,32 @@ func TestAppRole_RoleWithTokenBoundCIDRsCRUD(t *testing.T) {
 
 	roleReq.Data = map[string]interface{}{"secret_id_bound_cidrs": []string{"127.0.0.1/20"}}
 	roleReq.Operation = logical.UpdateOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	roleReq.Operation = logical.ReadOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	if resp.Data["secret_id_bound_cidrs"].([]string)[0] != "127.0.0.1/20" {
 		t.Fatalf("bad: secret_id_bound_cidrs: expected:127.0.0.1/20 actual:%s\n", resp.Data["secret_id_bound_cidrs"].([]string)[0])
 	}
 
 	roleReq.Operation = logical.DeleteOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	roleReq.Operation = logical.ReadOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	if len(resp.Data["secret_id_bound_cidrs"].([]string)) != 0 {
 		t.Fatalf("expected value to be reset")
@@ -1724,8 +2084,10 @@ func TestAppRole_RoleWithTokenBoundCIDRsCRUD(t *testing.T) {
 	// RUD for token-bound-cidrs field
 	roleReq.Path = "role/role1/token-bound-cidrs"
 	roleReq.Operation = logical.ReadOperation
-	resp = b.requestNoErr(t, roleReq)
-
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 	if resp.Data["token_bound_cidrs"].([]*sockaddr.SockAddrMarshaler)[0].String() != "127.0.0.1" ||
 		resp.Data["token_bound_cidrs"].([]*sockaddr.SockAddrMarshaler)[1].String() != "127.0.0.1/16" {
 		m, err := json.Marshal(resp.Data["token_bound_cidrs"].([]*sockaddr.SockAddrMarshaler))
@@ -1737,20 +2099,32 @@ func TestAppRole_RoleWithTokenBoundCIDRsCRUD(t *testing.T) {
 
 	roleReq.Data = map[string]interface{}{"token_bound_cidrs": []string{"127.0.0.1/20"}}
 	roleReq.Operation = logical.UpdateOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	roleReq.Operation = logical.ReadOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	if resp.Data["token_bound_cidrs"].([]*sockaddr.SockAddrMarshaler)[0].String() != "127.0.0.1/20" {
 		t.Fatalf("bad: token_bound_cidrs: expected:127.0.0.1/20 actual:%s\n", resp.Data["token_bound_cidrs"].([]*sockaddr.SockAddrMarshaler)[0])
 	}
 
 	roleReq.Operation = logical.DeleteOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	roleReq.Operation = logical.ReadOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	if len(resp.Data["token_bound_cidrs"].([]*sockaddr.SockAddrMarshaler)) != 0 {
 		t.Fatalf("expected value to be reset")
@@ -1759,13 +2133,17 @@ func TestAppRole_RoleWithTokenBoundCIDRsCRUD(t *testing.T) {
 	// Delete test for role
 	roleReq.Path = "role/role1"
 	roleReq.Operation = logical.DeleteOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	roleReq.Operation = logical.ReadOperation
 	resp, err = b.HandleRequest(context.Background(), roleReq)
 	if err != nil || (resp != nil && resp.IsError()) {
 		t.Fatalf("err:%v resp:%#v", err, resp)
 	}
+
 	if resp != nil {
 		t.Fatalf("expected a nil response")
 	}
@@ -1792,14 +2170,19 @@ func TestAppRole_RoleWithTokenTypeCRUD(t *testing.T) {
 		Data:      roleData,
 	}
 
-	resp = b.requestNoErr(t, roleReq)
-
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 	if 0 == len(resp.Warnings) {
 		t.Fatalf("bad:\nexpected warning in resp:%#v\n", resp.Warnings)
 	}
 
 	roleReq.Operation = logical.ReadOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	expected := map[string]interface{}{
 		"bind_secret_id":     true,
@@ -1841,14 +2224,19 @@ func TestAppRole_RoleWithTokenTypeCRUD(t *testing.T) {
 	roleReq.Data = roleData
 	roleReq.Operation = logical.UpdateOperation
 
-	resp = b.requestNoErr(t, roleReq)
-
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 	if 0 == len(resp.Warnings) {
 		t.Fatalf("bad:\nexpected a warning in resp:%#v\n", resp.Warnings)
 	}
 
 	roleReq.Operation = logical.ReadOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	expected = map[string]interface{}{
 		"policies":           []string{"a", "b", "c", "d"},
@@ -1875,13 +2263,17 @@ func TestAppRole_RoleWithTokenTypeCRUD(t *testing.T) {
 	// Delete test for role
 	roleReq.Path = "role/role1"
 	roleReq.Operation = logical.DeleteOperation
-	resp = b.requestNoErr(t, roleReq)
+	resp, err = b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	roleReq.Operation = logical.ReadOperation
 	resp, err = b.HandleRequest(context.Background(), roleReq)
 	if err != nil || (resp != nil && resp.IsError()) {
 		t.Fatalf("err:%v resp:%#v", err, resp)
 	}
+
 	if resp != nil {
 		t.Fatalf("expected a nil response")
 	}
@@ -1901,7 +2293,11 @@ func createRole(t *testing.T, b *backend, s logical.Storage, roleName, policies
 		Storage:   s,
 		Data:      roleData,
 	}
-	_ = b.requestNoErr(t, roleReq)
+
+	resp, err := b.HandleRequest(context.Background(), roleReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 }
 
 // TestAppRole_TokenutilUpgrade ensures that when we read values out that are
@@ -2037,7 +2433,10 @@ func TestAppRole_SecretID_WithTTL(t *testing.T) {
 				Storage:   storage,
 				Data:      roleData,
 			}
-			resp := b.requestNoErr(t, roleReq)
+			resp, err := b.HandleRequest(context.Background(), roleReq)
+			if err != nil || (resp != nil && resp.IsError()) {
+				t.Fatalf("err:%v resp:%#v", err, resp)
+			}
 
 			// Generate secret ID
 			secretIDReq := &logical.Request{
@@ -2045,7 +2444,10 @@ func TestAppRole_SecretID_WithTTL(t *testing.T) {
 				Path:      "role/" + tt.roleName + "/secret-id",
 				Storage:   storage,
 			}
-			resp = b.requestNoErr(t, secretIDReq)
+			resp, err = b.HandleRequest(context.Background(), secretIDReq)
+			if err != nil || (resp != nil && resp.IsError()) {
+				t.Fatalf("err:%v resp:%#v", err, resp)
+			}
 
 			// Extract the "ttl" value from the response data if it exists
 			ttlRaw, okTTL := resp.Data["secret_id_ttl"]
@@ -2059,7 +2461,7 @@ func TestAppRole_SecretID_WithTTL(t *testing.T) {
 			)
 			respTTL, ok = ttlRaw.(int64)
 			if !ok {
-				t.Fatalf("expected ttl to be an integer, got: %T", ttlRaw)
+				t.Fatalf("expected ttl to be an integer, got: %s", err)
 			}
 
 			// Verify secret ID response for different cases
@@ -2086,30 +2488,39 @@ func TestAppRole_RoleSecretIDAccessorCrossDelete(t *testing.T) {
 
 	// Create First Role
 	createRole(t, b, storage, "role1", "a,b")
-	_ = b.requestNoErr(t, &logical.Request{
+	_, err = b.HandleRequest(context.Background(), &logical.Request{
 		Operation: logical.UpdateOperation,
 		Storage:   storage,
 		Path:      "role/role1/secret-id",
 	})
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	// Create Second Role
 	createRole(t, b, storage, "role2", "a,b")
-	_ = b.requestNoErr(t, &logical.Request{
+	_, err = b.HandleRequest(context.Background(), &logical.Request{
 		Operation: logical.UpdateOperation,
 		Storage:   storage,
 		Path:      "role/role2/secret-id",
 	})
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	// Get role2 secretID Accessor
-	resp = b.requestNoErr(t, &logical.Request{
+	resp, err = b.HandleRequest(context.Background(), &logical.Request{
 		Operation: logical.ListOperation,
 		Storage:   storage,
 		Path:      "role/role2/secret-id",
 	})
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	// Read back role2 secretID Accessor information
 	hmacSecretID := resp.Data["keys"].([]string)[0]
-	_ = b.requestNoErr(t, &logical.Request{
+	_, err = b.HandleRequest(context.Background(), &logical.Request{
 		Operation: logical.UpdateOperation,
 		Storage:   storage,
 		Path:      "role/role2/secret-id-accessor/lookup",
@@ -2117,6 +2528,9 @@ func TestAppRole_RoleSecretIDAccessorCrossDelete(t *testing.T) {
 			"secret_id_accessor": hmacSecretID,
 		},
 	})
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	// Attempt to destroy role2 secretID accessor using role1 path
 	_, err = b.HandleRequest(context.Background(), &logical.Request{
diff --git a/builtin/credential/approle/path_tidy_user_id.go b/builtin/credential/approle/path_tidy_user_id.go
index b6c777b149614..b7c6fcc6b1ec8 100644
--- a/builtin/credential/approle/path_tidy_user_id.go
+++ b/builtin/credential/approle/path_tidy_user_id.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package approle
 
 import (
@@ -20,21 +17,8 @@ func pathTidySecretID(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "tidy/secret-id$",
 
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixAppRole,
-			OperationSuffix: "secret-id",
-			OperationVerb:   "tidy",
-		},
-
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.UpdateOperation: &framework.PathOperation{
-				Callback: b.pathTidySecretIDUpdate,
-				Responses: map[int][]framework.Response{
-					http.StatusAccepted: {{
-						Description: http.StatusText(http.StatusAccepted),
-					}},
-				},
-			},
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.UpdateOperation: b.pathTidySecretIDUpdate,
 		},
 
 		HelpSynopsis:    pathTidySecretIDSyn,
diff --git a/builtin/credential/approle/path_tidy_user_id_test.go b/builtin/credential/approle/path_tidy_user_id_test.go
index c03686e89cbf9..dd7dfdfd7d652 100644
--- a/builtin/credential/approle/path_tidy_user_id_test.go
+++ b/builtin/credential/approle/path_tidy_user_id_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package approle
 
 import (
@@ -11,11 +8,12 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/vault/sdk/helper/testhelpers/schema"
 	"github.com/hashicorp/vault/sdk/logical"
 )
 
 func TestAppRole_TidyDanglingAccessors_Normal(t *testing.T) {
+	var resp *logical.Response
+	var err error
 	b, storage := createBackendWithStorage(t)
 
 	// Create a role
@@ -27,7 +25,10 @@ func TestAppRole_TidyDanglingAccessors_Normal(t *testing.T) {
 		Path:      "role/role1/secret-id",
 		Storage:   storage,
 	}
-	_ = b.requestNoErr(t, roleSecretIDReq)
+	resp, err = b.HandleRequest(context.Background(), roleSecretIDReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 
 	accessorHashes, err := storage.List(context.Background(), "accessor/")
 	if err != nil {
@@ -72,18 +73,12 @@ func TestAppRole_TidyDanglingAccessors_Normal(t *testing.T) {
 		t.Fatalf("bad: len(accessorHashes); expect 3, got %d", len(accessorHashes))
 	}
 
-	secret, err := b.tidySecretID(context.Background(), &logical.Request{
+	_, err = b.tidySecretID(context.Background(), &logical.Request{
 		Storage: storage,
 	})
 	if err != nil {
 		t.Fatal(err)
 	}
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, pathTidySecretID(b), logical.UpdateOperation),
-		secret,
-		true,
-	)
 
 	// It runs async so we give it a bit of time to run
 	time.Sleep(10 * time.Second)
@@ -98,6 +93,8 @@ func TestAppRole_TidyDanglingAccessors_Normal(t *testing.T) {
 }
 
 func TestAppRole_TidyDanglingAccessors_RaceTest(t *testing.T) {
+	var resp *logical.Response
+	var err error
 	b, storage := createBackendWithStorage(t)
 
 	// Create a role
@@ -109,26 +106,22 @@ func TestAppRole_TidyDanglingAccessors_RaceTest(t *testing.T) {
 		Path:      "role/role1/secret-id",
 		Storage:   storage,
 	}
-	_ = b.requestNoErr(t, roleSecretIDReq)
-
+	resp, err = b.HandleRequest(context.Background(), roleSecretIDReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%v resp:%#v", err, resp)
+	}
 	count := 1
 
 	wg := &sync.WaitGroup{}
 	start := time.Now()
 	for time.Now().Sub(start) < 10*time.Second {
 		if time.Now().Sub(start) > 100*time.Millisecond && atomic.LoadUint32(b.tidySecretIDCASGuard) == 0 {
-			secret, err := b.tidySecretID(context.Background(), &logical.Request{
+			_, err = b.tidySecretID(context.Background(), &logical.Request{
 				Storage: storage,
 			})
 			if err != nil {
 				t.Fatal(err)
 			}
-			schema.ValidateResponse(
-				t,
-				schema.GetResponseSchema(t, pathTidySecretID(b), logical.UpdateOperation),
-				secret,
-				true,
-			)
 		}
 		wg.Add(1)
 		go func() {
@@ -138,7 +131,10 @@ func TestAppRole_TidyDanglingAccessors_RaceTest(t *testing.T) {
 				Path:      "role/role1/secret-id",
 				Storage:   storage,
 			}
-			_ = b.requestNoErr(t, roleSecretIDReq)
+			resp, err := b.HandleRequest(context.Background(), roleSecretIDReq)
+			if err != nil || (resp != nil && resp.IsError()) {
+				t.Fatalf("err:%v resp:%#v", err, resp)
+			}
 		}()
 
 		entry, err := logical.StorageEntryJSON(
@@ -177,12 +173,6 @@ func TestAppRole_TidyDanglingAccessors_RaceTest(t *testing.T) {
 	if err != nil || len(secret.Warnings) > 0 {
 		t.Fatal(err, secret.Warnings)
 	}
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, pathTidySecretID(b), logical.UpdateOperation),
-		secret,
-		true,
-	)
 
 	// Wait for tidy to start
 	for atomic.LoadUint32(b.tidySecretIDCASGuard) == 0 {
diff --git a/builtin/credential/approle/validation.go b/builtin/credential/approle/validation.go
index 70f2194aa6783..6ff901670980a 100644
--- a/builtin/credential/approle/validation.go
+++ b/builtin/credential/approle/validation.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package approle
 
 import (
@@ -104,7 +101,7 @@ func verifyCIDRRoleSecretIDSubset(secretIDCIDRs []string, roleBoundCIDRList []st
 	return nil
 }
 
-const maxHmacInputLength = 4096
+const maxHmacInputLength = 1024
 
 // Creates a SHA256 HMAC of the given 'value' using the given 'key' and returns
 // a hex encoded string.
diff --git a/builtin/credential/approle/validation_test.go b/builtin/credential/approle/validation_test.go
index 7f7366b679377..ff325f4b1be95 100644
--- a/builtin/credential/approle/validation_test.go
+++ b/builtin/credential/approle/validation_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package approle
 
 import (
diff --git a/builtin/credential/aws/backend.go b/builtin/credential/aws/backend.go
index e8424f2c4956c..543608968396f 100644
--- a/builtin/credential/aws/backend.go
+++ b/builtin/credential/aws/backend.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package awsauth
 
 import (
@@ -20,10 +17,7 @@ import (
 	cache "github.com/patrickmn/go-cache"
 )
 
-const (
-	amzHeaderPrefix    = "X-Amz-"
-	operationPrefixAWS = "aws"
-)
+const amzHeaderPrefix = "X-Amz-"
 
 var defaultAllowedSTSRequestHeaders = []string{
 	"X-Amz-Algorithm",
@@ -129,9 +123,7 @@ func Backend(_ *logical.BackendConfig) (*backend, error) {
 
 		deprecatedTerms: strings.NewReplacer(
 			"accesslist", "whitelist",
-			"access-list", "whitelist",
 			"denylist", "blacklist",
-			"deny-list", "blacklist",
 		),
 	}
 
@@ -317,7 +309,7 @@ func (b *backend) resolveArnToRealUniqueId(ctx context.Context, s logical.Storag
 
 	switch entity.Type {
 	case "user":
-		userInfo, err := iamClient.GetUserWithContext(ctx, &iam.GetUserInput{UserName: &entity.FriendlyName})
+		userInfo, err := iamClient.GetUser(&iam.GetUserInput{UserName: &entity.FriendlyName})
 		if err != nil {
 			return "", awsutil.AppendAWSError(err)
 		}
@@ -326,7 +318,7 @@ func (b *backend) resolveArnToRealUniqueId(ctx context.Context, s logical.Storag
 		}
 		return *userInfo.User.UserId, nil
 	case "role":
-		roleInfo, err := iamClient.GetRoleWithContext(ctx, &iam.GetRoleInput{RoleName: &entity.FriendlyName})
+		roleInfo, err := iamClient.GetRole(&iam.GetRoleInput{RoleName: &entity.FriendlyName})
 		if err != nil {
 			return "", awsutil.AppendAWSError(err)
 		}
@@ -335,7 +327,7 @@ func (b *backend) resolveArnToRealUniqueId(ctx context.Context, s logical.Storag
 		}
 		return *roleInfo.Role.RoleId, nil
 	case "instance-profile":
-		profileInfo, err := iamClient.GetInstanceProfileWithContext(ctx, &iam.GetInstanceProfileInput{InstanceProfileName: &entity.FriendlyName})
+		profileInfo, err := iamClient.GetInstanceProfile(&iam.GetInstanceProfileInput{InstanceProfileName: &entity.FriendlyName})
 		if err != nil {
 			return "", awsutil.AppendAWSError(err)
 		}
@@ -348,33 +340,13 @@ func (b *backend) resolveArnToRealUniqueId(ctx context.Context, s logical.Storag
 	}
 }
 
-// genDeprecatedPath will return a deprecated version of a framework.Path. The
-// path pattern and display attributes (if any) will contain deprecated terms,
-// and the path will be marked as deprecated.
+// genDeprecatedPath will return a deprecated version of a framework.Path. The will include
+// using deprecated terms in the path pattern, and marking the path as deprecated.
 func (b *backend) genDeprecatedPath(path *framework.Path) *framework.Path {
 	pathDeprecated := *path
 	pathDeprecated.Pattern = b.deprecatedTerms.Replace(path.Pattern)
 	pathDeprecated.Deprecated = true
 
-	if path.DisplayAttrs != nil {
-		deprecatedDisplayAttrs := *path.DisplayAttrs
-		deprecatedDisplayAttrs.OperationPrefix = b.deprecatedTerms.Replace(path.DisplayAttrs.OperationPrefix)
-		deprecatedDisplayAttrs.OperationVerb = b.deprecatedTerms.Replace(path.DisplayAttrs.OperationVerb)
-		deprecatedDisplayAttrs.OperationSuffix = b.deprecatedTerms.Replace(path.DisplayAttrs.OperationSuffix)
-		pathDeprecated.DisplayAttrs = &deprecatedDisplayAttrs
-	}
-
-	for i, op := range path.Operations {
-		if op.Properties().DisplayAttrs != nil {
-			deprecatedDisplayAttrs := *op.Properties().DisplayAttrs
-			deprecatedDisplayAttrs.OperationPrefix = b.deprecatedTerms.Replace(op.Properties().DisplayAttrs.OperationPrefix)
-			deprecatedDisplayAttrs.OperationVerb = b.deprecatedTerms.Replace(op.Properties().DisplayAttrs.OperationVerb)
-			deprecatedDisplayAttrs.OperationSuffix = b.deprecatedTerms.Replace(op.Properties().DisplayAttrs.OperationSuffix)
-			deprecatedProperties := pathDeprecated.Operations[i].(*framework.PathOperation)
-			deprecatedProperties.DisplayAttrs = &deprecatedDisplayAttrs
-		}
-	}
-
 	return &pathDeprecated
 }
 
diff --git a/builtin/credential/aws/backend_e2e_test.go b/builtin/credential/aws/backend_e2e_test.go
index e8939b9d67afd..ac2bb22f129ae 100644
--- a/builtin/credential/aws/backend_e2e_test.go
+++ b/builtin/credential/aws/backend_e2e_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package awsauth
 
 import (
diff --git a/builtin/credential/aws/backend_test.go b/builtin/credential/aws/backend_test.go
index dea280c00262d..5b435d3e3a5ce 100644
--- a/builtin/credential/aws/backend_test.go
+++ b/builtin/credential/aws/backend_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package awsauth
 
 import (
@@ -1524,7 +1521,6 @@ func TestBackendAcc_LoginWithCallerIdentity(t *testing.T) {
 		return
 	}
 
-	ctx := context.Background()
 	storage := &logical.InmemStorage{}
 	config := logical.TestBackendConfig()
 	config.StorageView = storage
@@ -1603,7 +1599,7 @@ func TestBackendAcc_LoginWithCallerIdentity(t *testing.T) {
 		Storage:   storage,
 		Data:      clientConfigData,
 	}
-	_, err = b.HandleRequest(ctx, clientRequest)
+	_, err = b.HandleRequest(context.Background(), clientRequest)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -1617,7 +1613,7 @@ func TestBackendAcc_LoginWithCallerIdentity(t *testing.T) {
 		Storage:   storage,
 		Data:      configIdentityData,
 	}
-	resp, err := b.HandleRequest(ctx, configIdentityRequest)
+	resp, err := b.HandleRequest(context.Background(), configIdentityRequest)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -1637,7 +1633,7 @@ func TestBackendAcc_LoginWithCallerIdentity(t *testing.T) {
 		Storage:   storage,
 		Data:      roleData,
 	}
-	resp, err = b.HandleRequest(ctx, roleRequest)
+	resp, err = b.HandleRequest(context.Background(), roleRequest)
 	if err != nil || (resp != nil && resp.IsError()) {
 		t.Fatalf("bad: failed to create role: resp:%#v\nerr:%v", resp, err)
 	}
@@ -1654,7 +1650,7 @@ func TestBackendAcc_LoginWithCallerIdentity(t *testing.T) {
 		Storage:   storage,
 		Data:      roleDataEc2,
 	}
-	resp, err = b.HandleRequest(ctx, roleRequestEc2)
+	resp, err = b.HandleRequest(context.Background(), roleRequestEc2)
 	if err != nil || (resp != nil && resp.IsError()) {
 		t.Fatalf("bad: failed to create role; resp:%#v\nerr:%v", resp, err)
 	}
@@ -1692,7 +1688,7 @@ func TestBackendAcc_LoginWithCallerIdentity(t *testing.T) {
 		Storage:   storage,
 		Data:      loginData,
 	}
-	resp, err = b.HandleRequest(ctx, loginRequest)
+	resp, err = b.HandleRequest(context.Background(), loginRequest)
 	if err != nil || resp == nil || !resp.IsError() {
 		t.Errorf("bad: expected failed login due to missing header: resp:%#v\nerr:%v", resp, err)
 	}
@@ -1715,7 +1711,7 @@ func TestBackendAcc_LoginWithCallerIdentity(t *testing.T) {
 		Storage:   storage,
 		Data:      loginData,
 	}
-	resp, err = b.HandleRequest(ctx, loginRequest)
+	resp, err = b.HandleRequest(context.Background(), loginRequest)
 	if err != nil || resp == nil || !resp.IsError() {
 		t.Errorf("bad: expected failed login due to invalid header: resp:%#v\nerr:%v", resp, err)
 	}
@@ -1734,13 +1730,13 @@ func TestBackendAcc_LoginWithCallerIdentity(t *testing.T) {
 		Storage:   storage,
 		Data:      loginData,
 	}
-	resp, err = b.HandleRequest(ctx, loginRequest)
+	resp, err = b.HandleRequest(context.Background(), loginRequest)
 	if err != nil || resp == nil || !resp.IsError() {
 		t.Errorf("bad: expected failed login due to invalid role: resp:%#v\nerr:%v", resp, err)
 	}
 
 	loginData["role"] = "ec2only"
-	resp, err = b.HandleRequest(ctx, loginRequest)
+	resp, err = b.HandleRequest(context.Background(), loginRequest)
 	if err != nil || resp == nil || !resp.IsError() {
 		t.Errorf("bad: expected failed login due to bad auth type: resp:%#v\nerr:%v", resp, err)
 	}
@@ -1748,7 +1744,7 @@ func TestBackendAcc_LoginWithCallerIdentity(t *testing.T) {
 	// finally, the happy path test :)
 
 	loginData["role"] = testValidRoleName
-	resp, err = b.HandleRequest(ctx, loginRequest)
+	resp, err = b.HandleRequest(context.Background(), loginRequest)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -1771,7 +1767,7 @@ func TestBackendAcc_LoginWithCallerIdentity(t *testing.T) {
 		Schema: b.pathLogin().Fields,
 	}
 	// ensure we can renew
-	resp, err = b.pathLoginRenew(ctx, renewReq, emptyLoginFd)
+	resp, err = b.pathLoginRenew(context.Background(), renewReq, emptyLoginFd)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -1789,17 +1785,17 @@ func TestBackendAcc_LoginWithCallerIdentity(t *testing.T) {
 	// pick up the fake user ID
 	roleData["bound_iam_principal_arn"] = entity.canonicalArn()
 	roleRequest.Path = "role/" + testValidRoleName
-	resp, err = b.HandleRequest(ctx, roleRequest)
+	resp, err = b.HandleRequest(context.Background(), roleRequest)
 	if err != nil || (resp != nil && resp.IsError()) {
 		t.Fatalf("bad: failed to recreate role: resp:%#v\nerr:%v", resp, err)
 	}
-	resp, err = b.HandleRequest(ctx, loginRequest)
+	resp, err = b.HandleRequest(context.Background(), loginRequest)
 	if err != nil || resp == nil || !resp.IsError() {
 		t.Errorf("bad: expected failed login due to changed AWS role ID: resp: %#v\nerr:%v", resp, err)
 	}
 
 	// and ensure a renew no longer works
-	resp, err = b.pathLoginRenew(ctx, renewReq, emptyLoginFd)
+	resp, err = b.pathLoginRenew(context.Background(), renewReq, emptyLoginFd)
 	if err == nil || (resp != nil && !resp.IsError()) {
 		t.Errorf("bad: expected failed renew due to changed AWS role ID: resp: %#v", resp)
 	}
@@ -1812,13 +1808,13 @@ func TestBackendAcc_LoginWithCallerIdentity(t *testing.T) {
 	wildcardEntity.FriendlyName = "*"
 	roleData["bound_iam_principal_arn"] = []string{wildcardEntity.canonicalArn(), "arn:aws:iam::123456789012:role/DoesNotExist/Vault_Fake_Role*"}
 	roleRequest.Path = "role/" + wildcardRoleName
-	resp, err = b.HandleRequest(ctx, roleRequest)
+	resp, err = b.HandleRequest(context.Background(), roleRequest)
 	if err != nil || (resp != nil && resp.IsError()) {
 		t.Fatalf("bad: failed to create wildcard roles: resp:%#v\nerr:%v", resp, err)
 	}
 
 	loginData["role"] = wildcardRoleName
-	resp, err = b.HandleRequest(ctx, loginRequest)
+	resp, err = b.HandleRequest(context.Background(), loginRequest)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -1827,7 +1823,7 @@ func TestBackendAcc_LoginWithCallerIdentity(t *testing.T) {
 	}
 	// and ensure we can renew
 	renewReq = generateRenewRequest(storage, resp.Auth)
-	resp, err = b.pathLoginRenew(ctx, renewReq, emptyLoginFd)
+	resp, err = b.pathLoginRenew(context.Background(), renewReq, emptyLoginFd)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -1838,17 +1834,7 @@ func TestBackendAcc_LoginWithCallerIdentity(t *testing.T) {
 		t.Fatalf("got error when renewing: %#v", *resp)
 	}
 	// ensure the cache is populated
-
-	clientUserIDRaw, ok := resp.Auth.InternalData["client_user_id"]
-	if !ok {
-		t.Errorf("client_user_id not found in response")
-	}
-	clientUserID, ok := clientUserIDRaw.(string)
-	if !ok {
-		t.Errorf("client_user_id is not a string: %#v", clientUserIDRaw)
-	}
-
-	cachedArn := b.getCachedUserId(clientUserID)
+	cachedArn := b.getCachedUserId(resp.Auth.Metadata["client_user_id"])
 	if cachedArn == "" {
 		t.Errorf("got empty ARN back from user ID cache; expected full arn")
 	}
@@ -1857,13 +1843,13 @@ func TestBackendAcc_LoginWithCallerIdentity(t *testing.T) {
 	period := 600 * time.Second
 	roleData["period"] = period.String()
 	roleRequest.Path = "role/" + testValidRoleName
-	resp, err = b.HandleRequest(ctx, roleRequest)
+	resp, err = b.HandleRequest(context.Background(), roleRequest)
 	if err != nil || (resp != nil && resp.IsError()) {
 		t.Fatalf("bad: failed to create wildcard role: resp:%#v\nerr:%v", resp, err)
 	}
 
 	loginData["role"] = testValidRoleName
-	resp, err = b.HandleRequest(ctx, loginRequest)
+	resp, err = b.HandleRequest(context.Background(), loginRequest)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/builtin/credential/aws/certificates.go b/builtin/credential/aws/certificates.go
index 4b97a952b6fac..c745ad2b3f243 100644
--- a/builtin/credential/aws/certificates.go
+++ b/builtin/credential/aws/certificates.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package awsauth
 
 import (
diff --git a/builtin/credential/aws/cli.go b/builtin/credential/aws/cli.go
index a1695574f3b69..7b063fa5f42a0 100644
--- a/builtin/credential/aws/cli.go
+++ b/builtin/credential/aws/cli.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package awsauth
 
 import (
diff --git a/builtin/credential/aws/client.go b/builtin/credential/aws/client.go
index 314c97ec395aa..ff8ff5c837f9b 100644
--- a/builtin/credential/aws/client.go
+++ b/builtin/credential/aws/client.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package awsauth
 
 import (
@@ -122,7 +119,7 @@ func (b *backend) getClientConfig(ctx context.Context, s logical.Storage, region
 				return nil, fmt.Errorf("could not obtain sts client: %w", err)
 			}
 			inputParams := &sts.GetCallerIdentityInput{}
-			identity, err := client.GetCallerIdentityWithContext(ctx, inputParams)
+			identity, err := client.GetCallerIdentity(inputParams)
 			if err != nil {
 				return nil, fmt.Errorf("unable to fetch current caller: %w", err)
 			}
diff --git a/builtin/credential/aws/cmd/aws/main.go b/builtin/credential/aws/cmd/aws/main.go
index c7fce3e33fab9..6de96d02d1964 100644
--- a/builtin/credential/aws/cmd/aws/main.go
+++ b/builtin/credential/aws/cmd/aws/main.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package main
 
 import (
@@ -20,11 +17,9 @@ func main() {
 	tlsConfig := apiClientMeta.GetTLSConfig()
 	tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig)
 
-	if err := plugin.ServeMultiplex(&plugin.ServeOpts{
+	if err := plugin.Serve(&plugin.ServeOpts{
 		BackendFactoryFunc: awsauth.Factory,
-		// set the TLSProviderFunc so that the plugin maintains backwards
-		// compatibility with Vault versions that don’t support plugin AutoMTLS
-		TLSProviderFunc: tlsProviderFunc,
+		TLSProviderFunc:    tlsProviderFunc,
 	}); err != nil {
 		logger := hclog.New(&hclog.LoggerOptions{})
 
diff --git a/builtin/credential/aws/path_config_certificate.go b/builtin/credential/aws/path_config_certificate.go
index 36dfe3c213932..f734694781b35 100644
--- a/builtin/credential/aws/path_config_certificate.go
+++ b/builtin/credential/aws/path_config_certificate.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package awsauth
 
 import (
@@ -21,11 +18,6 @@ func (b *backend) pathListCertificates() *framework.Path {
 	return &framework.Path{
 		Pattern: "config/certificates/?",
 
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixAWS,
-			OperationSuffix: "certificate-configurations",
-		},
-
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.ListOperation: &framework.PathOperation{
 				Callback: b.pathCertificatesList,
@@ -40,11 +32,6 @@ func (b *backend) pathListCertificates() *framework.Path {
 func (b *backend) pathConfigCertificate() *framework.Path {
 	return &framework.Path{
 		Pattern: "config/certificate/" + framework.GenericNameRegex("cert_name"),
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixAWS,
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"cert_name": {
 				Type:        framework.TypeString,
@@ -71,29 +58,15 @@ vary. Defaults to "pkcs7".`,
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.CreateOperation: &framework.PathOperation{
 				Callback: b.pathConfigCertificateCreateUpdate,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb:   "configure",
-					OperationSuffix: "certificate",
-				},
 			},
 			logical.UpdateOperation: &framework.PathOperation{
 				Callback: b.pathConfigCertificateCreateUpdate,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb:   "configure",
-					OperationSuffix: "certificate",
-				},
 			},
 			logical.ReadOperation: &framework.PathOperation{
 				Callback: b.pathConfigCertificateRead,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationSuffix: "certificate-configuration",
-				},
 			},
 			logical.DeleteOperation: &framework.PathOperation{
 				Callback: b.pathConfigCertificateDelete,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationSuffix: "certificate-configuration",
-				},
 			},
 		},
 
diff --git a/builtin/credential/aws/path_config_client.go b/builtin/credential/aws/path_config_client.go
index 979fac11a9d8c..c609e1acd608a 100644
--- a/builtin/credential/aws/path_config_client.go
+++ b/builtin/credential/aws/path_config_client.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package awsauth
 
 import (
@@ -19,11 +16,6 @@ import (
 func (b *backend) pathConfigClient() *framework.Path {
 	return &framework.Path{
 		Pattern: "config/client$",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixAWS,
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"access_key": {
 				Type:        framework.TypeString,
@@ -85,29 +77,15 @@ func (b *backend) pathConfigClient() *framework.Path {
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.CreateOperation: &framework.PathOperation{
 				Callback: b.pathConfigClientCreateUpdate,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb:   "configure",
-					OperationSuffix: "client",
-				},
 			},
 			logical.UpdateOperation: &framework.PathOperation{
 				Callback: b.pathConfigClientCreateUpdate,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb:   "configure",
-					OperationSuffix: "client",
-				},
 			},
 			logical.DeleteOperation: &framework.PathOperation{
 				Callback: b.pathConfigClientDelete,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationSuffix: "client-configuration",
-				},
 			},
 			logical.ReadOperation: &framework.PathOperation{
 				Callback: b.pathConfigClientRead,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationSuffix: "client-configuration",
-				},
 			},
 		},
 
diff --git a/builtin/credential/aws/path_config_client_test.go b/builtin/credential/aws/path_config_client_test.go
index 4c807d1b40f8c..493d20d9df000 100644
--- a/builtin/credential/aws/path_config_client_test.go
+++ b/builtin/credential/aws/path_config_client_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package awsauth
 
 import (
diff --git a/builtin/credential/aws/path_config_identity.go b/builtin/credential/aws/path_config_identity.go
index 2512c9db39fd2..282d277fab547 100644
--- a/builtin/credential/aws/path_config_identity.go
+++ b/builtin/credential/aws/path_config_identity.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package awsauth
 
 import (
@@ -57,11 +54,6 @@ var (
 func (b *backend) pathConfigIdentity() *framework.Path {
 	return &framework.Path{
 		Pattern: "config/identity$",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixAWS,
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"iam_alias": {
 				Type:        framework.TypeString,
@@ -80,16 +72,9 @@ func (b *backend) pathConfigIdentity() *framework.Path {
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.ReadOperation: &framework.PathOperation{
 				Callback: pathConfigIdentityRead,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationSuffix: "identity-integration-configuration",
-				},
 			},
 			logical.UpdateOperation: &framework.PathOperation{
 				Callback: pathConfigIdentityUpdate,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb:   "configure",
-					OperationSuffix: "identity-integration",
-				},
 			},
 		},
 
diff --git a/builtin/credential/aws/path_config_identity_test.go b/builtin/credential/aws/path_config_identity_test.go
index 8a7db09f2bbdc..19e919fb1179d 100644
--- a/builtin/credential/aws/path_config_identity_test.go
+++ b/builtin/credential/aws/path_config_identity_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package awsauth
 
 import (
diff --git a/builtin/credential/aws/path_config_rotate_root.go b/builtin/credential/aws/path_config_rotate_root.go
index 141b7e2fbea57..125056234312b 100644
--- a/builtin/credential/aws/path_config_rotate_root.go
+++ b/builtin/credential/aws/path_config_rotate_root.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package awsauth
 
 import (
@@ -24,12 +21,6 @@ func (b *backend) pathConfigRotateRoot() *framework.Path {
 	return &framework.Path{
 		Pattern: "config/rotate-root",
 
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixAWS,
-			OperationVerb:   "rotate",
-			OperationSuffix: "root-credentials",
-		},
-
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.UpdateOperation: &framework.PathOperation{
 				Callback: b.pathConfigRotateRootUpdate,
@@ -106,7 +97,7 @@ func (b *backend) pathConfigRotateRootUpdate(ctx context.Context, req *logical.R
 	// Get the current user's name since it's required to create an access key.
 	// Empty input means get the current user.
 	var getUserInput iam.GetUserInput
-	getUserRes, err := iamClient.GetUserWithContext(ctx, &getUserInput)
+	getUserRes, err := iamClient.GetUser(&getUserInput)
 	if err != nil {
 		return nil, fmt.Errorf("error calling GetUser: %w", err)
 	}
@@ -124,7 +115,7 @@ func (b *backend) pathConfigRotateRootUpdate(ctx context.Context, req *logical.R
 	createAccessKeyInput := iam.CreateAccessKeyInput{
 		UserName: getUserRes.User.UserName,
 	}
-	createAccessKeyRes, err := iamClient.CreateAccessKeyWithContext(ctx, &createAccessKeyInput)
+	createAccessKeyRes, err := iamClient.CreateAccessKey(&createAccessKeyInput)
 	if err != nil {
 		return nil, fmt.Errorf("error calling CreateAccessKey: %w", err)
 	}
@@ -148,7 +139,7 @@ func (b *backend) pathConfigRotateRootUpdate(ctx context.Context, req *logical.R
 			AccessKeyId: createAccessKeyRes.AccessKey.AccessKeyId,
 			UserName:    getUserRes.User.UserName,
 		}
-		if _, err := iamClient.DeleteAccessKeyWithContext(ctx, &deleteAccessKeyInput); err != nil {
+		if _, err := iamClient.DeleteAccessKey(&deleteAccessKeyInput); err != nil {
 			// Include this error in the errs returned by this method.
 			errs = multierror.Append(errs, fmt.Errorf("error deleting newly created but unstored access key ID %s: %s", *createAccessKeyRes.AccessKey.AccessKeyId, err))
 		}
@@ -185,7 +176,7 @@ func (b *backend) pathConfigRotateRootUpdate(ctx context.Context, req *logical.R
 		AccessKeyId: aws.String(oldAccessKey),
 		UserName:    getUserRes.User.UserName,
 	}
-	if _, err = iamClient.DeleteAccessKeyWithContext(ctx, &deleteAccessKeyInput); err != nil {
+	if _, err = iamClient.DeleteAccessKey(&deleteAccessKeyInput); err != nil {
 		errs = multierror.Append(errs, fmt.Errorf("error deleting old access key ID %s: %w", oldAccessKey, err))
 		return nil, errs
 	}
diff --git a/builtin/credential/aws/path_config_rotate_root_test.go b/builtin/credential/aws/path_config_rotate_root_test.go
index 3fe5b29c0479c..940c6d1022709 100644
--- a/builtin/credential/aws/path_config_rotate_root_test.go
+++ b/builtin/credential/aws/path_config_rotate_root_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package awsauth
 
 import (
@@ -8,7 +5,6 @@ import (
 	"testing"
 
 	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/request"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/iam"
 	"github.com/aws/aws-sdk-go/service/iam/iamiface"
@@ -16,23 +12,9 @@ import (
 	"github.com/hashicorp/vault/sdk/logical"
 )
 
-type mockIAMClient awsutil.MockIAM
-
-func (m *mockIAMClient) GetUserWithContext(_ aws.Context, input *iam.GetUserInput, _ ...request.Option) (*iam.GetUserOutput, error) {
-	return (*awsutil.MockIAM)(m).GetUser(input)
-}
-
-func (m *mockIAMClient) CreateAccessKeyWithContext(_ aws.Context, input *iam.CreateAccessKeyInput, _ ...request.Option) (*iam.CreateAccessKeyOutput, error) {
-	return (*awsutil.MockIAM)(m).CreateAccessKey(input)
-}
-
-func (m *mockIAMClient) DeleteAccessKeyWithContext(_ aws.Context, input *iam.DeleteAccessKeyInput, _ ...request.Option) (*iam.DeleteAccessKeyOutput, error) {
-	return (*awsutil.MockIAM)(m).DeleteAccessKey(input)
-}
-
 func TestPathConfigRotateRoot(t *testing.T) {
 	getIAMClient = func(sess *session.Session) iamiface.IAMAPI {
-		return &mockIAMClient{
+		return &awsutil.MockIAM{
 			CreateAccessKeyOutput: &iam.CreateAccessKeyOutput{
 				AccessKey: &iam.AccessKey{
 					AccessKeyId:     aws.String("fizz2"),
diff --git a/builtin/credential/aws/path_config_sts.go b/builtin/credential/aws/path_config_sts.go
index 50d986d20c84e..3666a90041793 100644
--- a/builtin/credential/aws/path_config_sts.go
+++ b/builtin/credential/aws/path_config_sts.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package awsauth
 
 import (
@@ -20,11 +17,6 @@ func (b *backend) pathListSts() *framework.Path {
 	return &framework.Path{
 		Pattern: "config/sts/?",
 
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixAWS,
-			OperationSuffix: "sts-role-relationships",
-		},
-
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.ListOperation: &framework.PathOperation{
 				Callback: b.pathStsList,
@@ -39,12 +31,6 @@ func (b *backend) pathListSts() *framework.Path {
 func (b *backend) pathConfigSts() *framework.Path {
 	return &framework.Path{
 		Pattern: "config/sts/" + framework.GenericNameRegex("account_id"),
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixAWS,
-			OperationSuffix: "sts-role",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"account_id": {
 				Type: framework.TypeString,
diff --git a/builtin/credential/aws/path_config_tidy_identity_accesslist.go b/builtin/credential/aws/path_config_tidy_identity_accesslist.go
index 686b0263c1aa9..f89c5ab215974 100644
--- a/builtin/credential/aws/path_config_tidy_identity_accesslist.go
+++ b/builtin/credential/aws/path_config_tidy_identity_accesslist.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package awsauth
 
 import (
@@ -18,11 +15,6 @@ const (
 func (b *backend) pathConfigTidyIdentityAccessList() *framework.Path {
 	return &framework.Path{
 		Pattern: fmt.Sprintf("%s$", "config/tidy/identity-accesslist"),
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixAWS,
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"safety_buffer": {
 				Type:    framework.TypeDurationSecond,
@@ -42,29 +34,15 @@ expiration, before it is removed from the backend storage.`,
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.CreateOperation: &framework.PathOperation{
 				Callback: b.pathConfigTidyIdentityAccessListCreateUpdate,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb:   "configure",
-					OperationSuffix: "identity-access-list-tidy-operation",
-				},
 			},
 			logical.UpdateOperation: &framework.PathOperation{
 				Callback: b.pathConfigTidyIdentityAccessListCreateUpdate,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb:   "configure",
-					OperationSuffix: "identity-access-list-tidy-operation",
-				},
 			},
 			logical.ReadOperation: &framework.PathOperation{
 				Callback: b.pathConfigTidyIdentityAccessListRead,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationSuffix: "identity-access-list-tidy-settings",
-				},
 			},
 			logical.DeleteOperation: &framework.PathOperation{
 				Callback: b.pathConfigTidyIdentityAccessListDelete,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationSuffix: "identity-access-list-tidy-settings",
-				},
 			},
 		},
 
diff --git a/builtin/credential/aws/path_config_tidy_roletag_denylist.go b/builtin/credential/aws/path_config_tidy_roletag_denylist.go
index fa82b77d25f2a..e00404d7ec647 100644
--- a/builtin/credential/aws/path_config_tidy_roletag_denylist.go
+++ b/builtin/credential/aws/path_config_tidy_roletag_denylist.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package awsauth
 
 import (
@@ -17,11 +14,6 @@ const (
 func (b *backend) pathConfigTidyRoletagDenyList() *framework.Path {
 	return &framework.Path{
 		Pattern: "config/tidy/roletag-denylist$",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixAWS,
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"safety_buffer": {
 				Type:    framework.TypeDurationSecond,
@@ -43,29 +35,15 @@ Defaults to 4320h (180 days).`,
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.CreateOperation: &framework.PathOperation{
 				Callback: b.pathConfigTidyRoletagDenyListCreateUpdate,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb:   "configure",
-					OperationSuffix: "role-tag-deny-list-tidy-operation",
-				},
 			},
 			logical.UpdateOperation: &framework.PathOperation{
 				Callback: b.pathConfigTidyRoletagDenyListCreateUpdate,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb:   "configure",
-					OperationSuffix: "role-tag-deny-list-tidy-operation",
-				},
 			},
 			logical.ReadOperation: &framework.PathOperation{
 				Callback: b.pathConfigTidyRoletagDenyListRead,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationSuffix: "role-tag-deny-list-tidy-settings",
-				},
 			},
 			logical.DeleteOperation: &framework.PathOperation{
 				Callback: b.pathConfigTidyRoletagDenyListDelete,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationSuffix: "role-tag-deny-list-tidy-settings",
-				},
 			},
 		},
 
diff --git a/builtin/credential/aws/path_identity_accesslist.go b/builtin/credential/aws/path_identity_accesslist.go
index 77ec5749496df..a622b7d8f962f 100644
--- a/builtin/credential/aws/path_identity_accesslist.go
+++ b/builtin/credential/aws/path_identity_accesslist.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package awsauth
 
 import (
@@ -16,12 +13,6 @@ const identityAccessListStorage = "whitelist/identity/"
 func (b *backend) pathIdentityAccessList() *framework.Path {
 	return &framework.Path{
 		Pattern: "identity-accesslist/" + framework.GenericNameRegex("instance_id"),
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixAWS,
-			OperationSuffix: "identity-access-list",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"instance_id": {
 				Type: framework.TypeString,
@@ -48,11 +39,6 @@ func (b *backend) pathListIdentityAccessList() *framework.Path {
 	return &framework.Path{
 		Pattern: "identity-accesslist/?",
 
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixAWS,
-			OperationSuffix: "identity-access-list",
-		},
-
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.ListOperation: &framework.PathOperation{
 				Callback: b.pathAccessListIdentitiesList,
diff --git a/builtin/credential/aws/path_login.go b/builtin/credential/aws/path_login.go
index f4041b38db839..fb8ab4f47492f 100644
--- a/builtin/credential/aws/path_login.go
+++ b/builtin/credential/aws/path_login.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package awsauth
 
 import (
@@ -55,10 +52,6 @@ var (
 func (b *backend) pathLogin() *framework.Path {
 	return &framework.Path{
 		Pattern: "login$",
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixAWS,
-			OperationVerb:   "login",
-		},
 		Fields: map[string]*framework.FieldSchema{
 			"role": {
 				Type: framework.TypeString,
@@ -110,8 +103,8 @@ This must match the request body included in the signature.`,
 			"iam_request_headers": {
 				Type: framework.TypeHeader,
 				Description: `Key/value pairs of headers for use in the
-sts:GetCallerIdentity HTTP requests headers when auth_type is iam. Can be either
-a Base64-encoded, JSON-serialized string, or a JSON object of key/value pairs.
+sts:GetCallerIdentity HTTP requests headers when auth_type is iam. Can be either 
+a Base64-encoded, JSON-serialized string, or a JSON object of key/value pairs. 
 This must at a minimum include the headers over which AWS has included a  signature.`,
 			},
 			"identity": {
@@ -344,7 +337,7 @@ func (b *backend) pathLoginResolveRoleIam(ctx context.Context, req *logical.Requ
 
 // instanceIamRoleARN fetches the IAM role ARN associated with the given
 // instance profile name
-func (b *backend) instanceIamRoleARN(ctx context.Context, iamClient *iam.IAM, instanceProfileName string) (string, error) {
+func (b *backend) instanceIamRoleARN(iamClient *iam.IAM, instanceProfileName string) (string, error) {
 	if iamClient == nil {
 		return "", fmt.Errorf("nil iamClient")
 	}
@@ -352,7 +345,7 @@ func (b *backend) instanceIamRoleARN(ctx context.Context, iamClient *iam.IAM, in
 		return "", fmt.Errorf("missing instance profile name")
 	}
 
-	profile, err := iamClient.GetInstanceProfileWithContext(ctx, &iam.GetInstanceProfileInput{
+	profile, err := iamClient.GetInstanceProfile(&iam.GetInstanceProfileInput{
 		InstanceProfileName: aws.String(instanceProfileName),
 	})
 	if err != nil {
@@ -386,7 +379,7 @@ func (b *backend) validateInstance(ctx context.Context, s logical.Storage, insta
 		return nil, err
 	}
 
-	status, err := ec2Client.DescribeInstancesWithContext(ctx, &ec2.DescribeInstancesInput{
+	status, err := ec2Client.DescribeInstances(&ec2.DescribeInstancesInput{
 		InstanceIds: []*string{
 			aws.String(instanceID),
 		},
@@ -728,7 +721,7 @@ func (b *backend) verifyInstanceMeetsRoleRequirements(ctx context.Context,
 		} else if iamClient == nil {
 			return nil, fmt.Errorf("received a nil iamClient")
 		}
-		iamRoleARN, err := b.instanceIamRoleARN(ctx, iamClient, iamInstanceProfileEntity.FriendlyName)
+		iamRoleARN, err := b.instanceIamRoleARN(iamClient, iamInstanceProfileEntity.FriendlyName)
 		if err != nil {
 			return nil, fmt.Errorf("IAM role ARN could not be fetched: %w", err)
 		}
@@ -1839,7 +1832,7 @@ func (b *backend) fullArn(ctx context.Context, e *iamEntity, s logical.Storage)
 		input := iam.GetUserInput{
 			UserName: aws.String(e.FriendlyName),
 		}
-		resp, err := client.GetUserWithContext(ctx, &input)
+		resp, err := client.GetUser(&input)
 		if err != nil {
 			return "", fmt.Errorf("error fetching user %q: %w", e.FriendlyName, err)
 		}
@@ -1853,7 +1846,7 @@ func (b *backend) fullArn(ctx context.Context, e *iamEntity, s logical.Storage)
 		input := iam.GetRoleInput{
 			RoleName: aws.String(e.FriendlyName),
 		}
-		resp, err := client.GetRoleWithContext(ctx, &input)
+		resp, err := client.GetRole(&input)
 		if err != nil {
 			return "", fmt.Errorf("error fetching role %q: %w", e.FriendlyName, err)
 		}
diff --git a/builtin/credential/aws/path_login_test.go b/builtin/credential/aws/path_login_test.go
index 2c0262075ad38..6ffd60ed14943 100644
--- a/builtin/credential/aws/path_login_test.go
+++ b/builtin/credential/aws/path_login_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package awsauth
 
 import (
diff --git a/builtin/credential/aws/path_role.go b/builtin/credential/aws/path_role.go
index 1c9ecf2728327..12a4c7d0f2d9f 100644
--- a/builtin/credential/aws/path_role.go
+++ b/builtin/credential/aws/path_role.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package awsauth
 
 import (
@@ -23,12 +20,6 @@ var currentRoleStorageVersion = 3
 func (b *backend) pathRole() *framework.Path {
 	p := &framework.Path{
 		Pattern: "role/" + framework.GenericNameRegex("role"),
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixAWS,
-			OperationSuffix: "auth-role",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"role": {
 				Type:        framework.TypeString,
@@ -87,9 +78,6 @@ auth_type is ec2 or inferred_entity_type is ec2_instance.`,
 given instance IDs. Can be a list or comma-separated string of EC2 instance
 IDs. This is only applicable when auth_type is ec2 or inferred_entity_type is
 ec2_instance.`,
-				DisplayAttrs: &framework.DisplayAttributes{
-					Description: "If set, defines a constraint on the EC2 instances to have one of the given instance IDs. A list of EC2 instance IDs. This is only applicable when auth_type is ec2 or inferred_entity_type is ec2_instance.",
-				},
 			},
 			"resolve_aws_unique_ids": {
 				Type:    framework.TypeBool,
@@ -211,11 +199,6 @@ func (b *backend) pathListRole() *framework.Path {
 	return &framework.Path{
 		Pattern: "role/?",
 
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixAWS,
-			OperationSuffix: "auth-roles",
-		},
-
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.ListOperation: &framework.PathOperation{
 				Callback: b.pathRoleList,
@@ -231,11 +214,6 @@ func (b *backend) pathListRoles() *framework.Path {
 	return &framework.Path{
 		Pattern: "roles/?",
 
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixAWS,
-			OperationSuffix: "auth-roles2",
-		},
-
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.ListOperation: &framework.PathOperation{
 				Callback: b.pathRoleList,
diff --git a/builtin/credential/aws/path_role_tag.go b/builtin/credential/aws/path_role_tag.go
index 180b4105c69c8..15927a82a2bb6 100644
--- a/builtin/credential/aws/path_role_tag.go
+++ b/builtin/credential/aws/path_role_tag.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package awsauth
 
 import (
@@ -26,12 +23,6 @@ const roleTagVersion = "v1"
 func (b *backend) pathRoleTag() *framework.Path {
 	return &framework.Path{
 		Pattern: "role/" + framework.GenericNameRegex("role") + "/tag$",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixAWS,
-			OperationSuffix: "role-tag",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"role": {
 				Type:        framework.TypeString,
diff --git a/builtin/credential/aws/path_role_test.go b/builtin/credential/aws/path_role_test.go
index 3a63d4cd35553..b8e824a9d27c4 100644
--- a/builtin/credential/aws/path_role_test.go
+++ b/builtin/credential/aws/path_role_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package awsauth
 
 import (
diff --git a/builtin/credential/aws/path_roletag_denylist.go b/builtin/credential/aws/path_roletag_denylist.go
index 82004363530bb..19520aab2f59f 100644
--- a/builtin/credential/aws/path_roletag_denylist.go
+++ b/builtin/credential/aws/path_roletag_denylist.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package awsauth
 
 import (
@@ -15,12 +12,6 @@ import (
 func (b *backend) pathRoletagDenyList() *framework.Path {
 	return &framework.Path{
 		Pattern: "roletag-denylist/(?P<role_tag>.*)",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixAWS,
-			OperationSuffix: "role-tag-deny-list",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"role_tag": {
 				Type: framework.TypeString,
@@ -51,11 +42,6 @@ func (b *backend) pathListRoletagDenyList() *framework.Path {
 	return &framework.Path{
 		Pattern: "roletag-denylist/?",
 
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixAWS,
-			OperationSuffix: "role-tag-deny-lists",
-		},
-
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.ListOperation: &framework.PathOperation{
 				Callback: b.pathRoletagDenyListsList,
diff --git a/builtin/credential/aws/path_tidy_identity_accesslist.go b/builtin/credential/aws/path_tidy_identity_accesslist.go
index 3b907c43d3788..9455cc0d3df1a 100644
--- a/builtin/credential/aws/path_tidy_identity_accesslist.go
+++ b/builtin/credential/aws/path_tidy_identity_accesslist.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package awsauth
 
 import (
@@ -18,13 +15,6 @@ import (
 func (b *backend) pathTidyIdentityAccessList() *framework.Path {
 	return &framework.Path{
 		Pattern: "tidy/identity-accesslist$",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixAWS,
-			OperationSuffix: "identity-access-list",
-			OperationVerb:   "tidy",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"safety_buffer": {
 				Type:    framework.TypeDurationSecond,
diff --git a/builtin/credential/aws/path_tidy_roletag_denylist.go b/builtin/credential/aws/path_tidy_roletag_denylist.go
index ddd1f7944d573..80c9dd8afea72 100644
--- a/builtin/credential/aws/path_tidy_roletag_denylist.go
+++ b/builtin/credential/aws/path_tidy_roletag_denylist.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package awsauth
 
 import (
@@ -22,13 +19,6 @@ const (
 func (b *backend) pathTidyRoletagDenyList() *framework.Path {
 	return &framework.Path{
 		Pattern: "tidy/roletag-denylist$",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixAWS,
-			OperationSuffix: "role-tag-deny-list",
-			OperationVerb:   "tidy",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"safety_buffer": {
 				Type:    framework.TypeDurationSecond,
diff --git a/builtin/credential/aws/pkcs7/LICENSE b/builtin/credential/aws/pkcs7/LICENSE
deleted file mode 100644
index f2fc6efbfcdc6..0000000000000
--- a/builtin/credential/aws/pkcs7/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 Andrew Smith
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
\ No newline at end of file
diff --git a/builtin/credential/cert/backend.go b/builtin/credential/cert/backend.go
index 61dd88988e361..542735dfd4d88 100644
--- a/builtin/credential/cert/backend.go
+++ b/builtin/credential/cert/backend.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package cert
 
 import (
@@ -11,23 +8,21 @@ import (
 	"net/http"
 	"strings"
 	"sync"
-	"sync/atomic"
 	"time"
 
-	"github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/go-multierror"
 	"github.com/hashicorp/vault/sdk/framework"
-	"github.com/hashicorp/vault/sdk/helper/ocsp"
 	"github.com/hashicorp/vault/sdk/logical"
 )
 
-const operationPrefixCert = "cert"
-
 func Factory(ctx context.Context, conf *logical.BackendConfig) (logical.Backend, error) {
 	b := Backend()
 	if err := b.Setup(ctx, conf); err != nil {
 		return nil, err
 	}
+	if err := b.lockThenpopulateCRLs(ctx, conf.StorageView); err != nil {
+		return nil, err
+	}
 	return b, nil
 }
 
@@ -45,17 +40,16 @@ func Backend() *backend {
 			pathLogin(&b),
 			pathListCerts(&b),
 			pathCerts(&b),
-			pathListCRLs(&b),
 			pathCRLs(&b),
 		},
-		AuthRenew:      b.loginPathWrapper(b.pathLoginRenew),
-		Invalidate:     b.invalidate,
-		BackendType:    logical.TypeCredential,
-		InitializeFunc: b.initialize,
-		PeriodicFunc:   b.updateCRLs,
+		AuthRenew:    b.loginPathWrapper(b.pathLoginRenew),
+		Invalidate:   b.invalidate,
+		BackendType:  logical.TypeCredential,
+		PeriodicFunc: b.updateCRLs,
 	}
 
 	b.crlUpdateMutex = &sync.RWMutex{}
+
 	return &b
 }
 
@@ -63,30 +57,8 @@ type backend struct {
 	*framework.Backend
 	MapCertId *framework.PathMap
 
-	crls            map[string]CRLInfo
-	crlUpdateMutex  *sync.RWMutex
-	ocspClientMutex sync.RWMutex
-	ocspClient      *ocsp.Client
-	configUpdated   atomic.Bool
-}
-
-func (b *backend) initialize(ctx context.Context, req *logical.InitializationRequest) error {
-	bConf, err := b.Config(ctx, req.Storage)
-	if err != nil {
-		b.Logger().Error(fmt.Sprintf("failed to load backend configuration: %v", err))
-		return err
-	}
-
-	if bConf != nil {
-		b.updatedConfig(bConf)
-	}
-
-	if err := b.lockThenpopulateCRLs(ctx, req.Storage); err != nil {
-		b.Logger().Error(fmt.Sprintf("failed to populate CRLs: %v", err))
-		return err
-	}
-
-	return nil
+	crls           map[string]CRLInfo
+	crlUpdateMutex *sync.RWMutex
 }
 
 func (b *backend) invalidate(_ context.Context, key string) {
@@ -95,25 +67,9 @@ func (b *backend) invalidate(_ context.Context, key string) {
 		b.crlUpdateMutex.Lock()
 		defer b.crlUpdateMutex.Unlock()
 		b.crls = nil
-	case key == "config":
-		b.configUpdated.Store(true)
 	}
 }
 
-func (b *backend) initOCSPClient(cacheSize int) {
-	b.ocspClient = ocsp.New(func() hclog.Logger {
-		return b.Logger()
-	}, cacheSize)
-}
-
-func (b *backend) updatedConfig(config *config) {
-	b.ocspClientMutex.Lock()
-	defer b.ocspClientMutex.Unlock()
-	b.initOCSPClient(config.OcspCacheSize)
-	b.configUpdated.Store(false)
-	return
-}
-
 func (b *backend) fetchCRL(ctx context.Context, storage logical.Storage, name string, crl *CRLInfo) error {
 	response, err := http.Get(crl.CDP.Url)
 	if err != nil {
@@ -148,19 +104,6 @@ func (b *backend) updateCRLs(ctx context.Context, req *logical.Request) error {
 	return errs.ErrorOrNil()
 }
 
-func (b *backend) storeConfig(ctx context.Context, storage logical.Storage, config *config) error {
-	entry, err := logical.StorageEntryJSON("config", config)
-	if err != nil {
-		return err
-	}
-
-	if err := storage.Put(ctx, entry); err != nil {
-		return err
-	}
-	b.updatedConfig(config)
-	return nil
-}
-
 const backendHelp = `
 The "cert" credential provider allows authentication using
 TLS client certificates. A client connects to Vault and uses
diff --git a/builtin/credential/cert/backend_test.go b/builtin/credential/cert/backend_test.go
index 47d7ae05d5442..4365df47716ae 100644
--- a/builtin/credential/cert/backend_test.go
+++ b/builtin/credential/cert/backend_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package cert
 
 import (
@@ -448,7 +445,7 @@ func TestBackend_PermittedDNSDomainsIntermediateCA(t *testing.T) {
 	}
 
 	// Create a new api client with the desired TLS configuration
-	newClient := getAPIClient(cores[0].Listeners[0].Address.Port, cores[0].TLSConfig())
+	newClient := getAPIClient(cores[0].Listeners[0].Address.Port, cores[0].TLSConfig)
 
 	secret, err = newClient.Logical().Write("auth/cert/login", map[string]interface{}{
 		"name": "myvault-dot-com",
@@ -598,7 +595,7 @@ path "kv/ext/{{identity.entity.aliases.%s.metadata.2-1-1-1}}" {
 	}
 
 	// Create a new api client with the desired TLS configuration
-	newClient := getAPIClient(cores[0].Listeners[0].Address.Port, cores[0].TLSConfig())
+	newClient := getAPIClient(cores[0].Listeners[0].Address.Port, cores[0].TLSConfig)
 
 	var secret *api.Secret
 
@@ -928,21 +925,6 @@ func TestBackend_RegisteredNonCA_CRL(t *testing.T) {
 		t.Fatalf("err:%v resp:%#v", err, resp)
 	}
 
-	// Ensure the CRL shows up on a list.
-	listReq := &logical.Request{
-		Operation: logical.ListOperation,
-		Storage:   storage,
-		Path:      "crls",
-		Data:      map[string]interface{}{},
-	}
-	resp, err = b.HandleRequest(context.Background(), listReq)
-	if err != nil || (resp != nil && resp.IsError()) {
-		t.Fatalf("err:%v resp:%#v", err, resp)
-	}
-	if len(resp.Data) != 1 || len(resp.Data["keys"].([]string)) != 1 || resp.Data["keys"].([]string)[0] != "issuedcrl" {
-		t.Fatalf("bad listing: resp:%v", resp)
-	}
-
 	// Attempt login with the same connection state but with the CRL registered
 	resp, err = b.HandleRequest(context.Background(), loginReq)
 	if err != nil {
@@ -1095,22 +1077,16 @@ func TestBackend_CRLs(t *testing.T) {
 }
 
 func testFactory(t *testing.T) logical.Backend {
-	storage := &logical.InmemStorage{}
 	b, err := Factory(context.Background(), &logical.BackendConfig{
 		System: &logical.StaticSystemView{
 			DefaultLeaseTTLVal: 1000 * time.Second,
 			MaxLeaseTTLVal:     1800 * time.Second,
 		},
-		StorageView: storage,
+		StorageView: &logical.InmemStorage{},
 	})
 	if err != nil {
 		t.Fatalf("error: %s", err)
 	}
-	if err := b.Initialize(context.Background(), &logical.InitializationRequest{
-		Storage: storage,
-	}); err != nil {
-		t.Fatalf("error: %s", err)
-	}
 	return b
 }
 
@@ -1932,58 +1908,31 @@ type allowed struct {
 	metadata_ext         string // allowed metadata extensions to add to identity alias
 }
 
-func testAccStepCert(t *testing.T, name string, cert []byte, policies string, testData allowed, expectError bool) logicaltest.TestStep {
-	return testAccStepCertWithExtraParams(t, name, cert, policies, testData, expectError, nil)
-}
-
-func testAccStepCertWithExtraParams(t *testing.T, name string, cert []byte, policies string, testData allowed, expectError bool, extraParams map[string]interface{}) logicaltest.TestStep {
-	data := map[string]interface{}{
-		"certificate":                  string(cert),
-		"policies":                     policies,
-		"display_name":                 name,
-		"allowed_names":                testData.names,
-		"allowed_common_names":         testData.common_names,
-		"allowed_dns_sans":             testData.dns,
-		"allowed_email_sans":           testData.emails,
-		"allowed_uri_sans":             testData.uris,
-		"allowed_organizational_units": testData.organizational_units,
-		"required_extensions":          testData.ext,
-		"allowed_metadata_extensions":  testData.metadata_ext,
-		"lease":                        1000,
-	}
-	for k, v := range extraParams {
-		data[k] = v
-	}
+func testAccStepCert(
+	t *testing.T, name string, cert []byte, policies string, testData allowed, expectError bool,
+) logicaltest.TestStep {
 	return logicaltest.TestStep{
 		Operation: logical.UpdateOperation,
 		Path:      "certs/" + name,
 		ErrorOk:   expectError,
-		Data:      data,
-		Check: func(resp *logical.Response) error {
-			if resp == nil && expectError {
-				return fmt.Errorf("expected error but received nil")
-			}
-			return nil
+		Data: map[string]interface{}{
+			"certificate":                  string(cert),
+			"policies":                     policies,
+			"display_name":                 name,
+			"allowed_names":                testData.names,
+			"allowed_common_names":         testData.common_names,
+			"allowed_dns_sans":             testData.dns,
+			"allowed_email_sans":           testData.emails,
+			"allowed_uri_sans":             testData.uris,
+			"allowed_organizational_units": testData.organizational_units,
+			"required_extensions":          testData.ext,
+			"allowed_metadata_extensions":  testData.metadata_ext,
+			"lease":                        1000,
 		},
-	}
-}
-
-func testAccStepReadCertPolicy(t *testing.T, name string, expectError bool, expected map[string]interface{}) logicaltest.TestStep {
-	return logicaltest.TestStep{
-		Operation: logical.ReadOperation,
-		Path:      "certs/" + name,
-		ErrorOk:   expectError,
-		Data:      nil,
 		Check: func(resp *logical.Response) error {
-			if (resp == nil || len(resp.Data) == 0) && expectError {
+			if resp == nil && expectError {
 				return fmt.Errorf("expected error but received nil")
 			}
-			for key, expectedValue := range expected {
-				actualValue := resp.Data[key]
-				if expectedValue != actualValue {
-					return fmt.Errorf("Expected to get [%v]=[%v] but read [%v]=[%v] from server for certs/%v: %v", key, expectedValue, key, actualValue, name, resp)
-				}
-			}
 			return nil
 		},
 	}
diff --git a/builtin/credential/cert/cli.go b/builtin/credential/cert/cli.go
index 3ba1e712d1344..4a470c89616f8 100644
--- a/builtin/credential/cert/cli.go
+++ b/builtin/credential/cert/cli.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package cert
 
 import (
diff --git a/builtin/credential/cert/cmd/cert/main.go b/builtin/credential/cert/cmd/cert/main.go
index 5b80a54cde778..09018ec3f040d 100644
--- a/builtin/credential/cert/cmd/cert/main.go
+++ b/builtin/credential/cert/cmd/cert/main.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package main
 
 import (
@@ -20,11 +17,9 @@ func main() {
 	tlsConfig := apiClientMeta.GetTLSConfig()
 	tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig)
 
-	if err := plugin.ServeMultiplex(&plugin.ServeOpts{
+	if err := plugin.Serve(&plugin.ServeOpts{
 		BackendFactoryFunc: cert.Factory,
-		// set the TLSProviderFunc so that the plugin maintains backwards
-		// compatibility with Vault versions that don’t support plugin AutoMTLS
-		TLSProviderFunc: tlsProviderFunc,
+		TLSProviderFunc:    tlsProviderFunc,
 	}); err != nil {
 		logger := hclog.New(&hclog.LoggerOptions{})
 
diff --git a/builtin/credential/cert/path_certs.go b/builtin/credential/cert/path_certs.go
index 03a3e5586210e..d303dec15d46c 100644
--- a/builtin/credential/cert/path_certs.go
+++ b/builtin/credential/cert/path_certs.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package cert
 
 import (
@@ -10,8 +7,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/hashicorp/go-sockaddr"
-
+	sockaddr "github.com/hashicorp/go-sockaddr"
 	"github.com/hashicorp/vault/sdk/framework"
 	"github.com/hashicorp/vault/sdk/helper/tokenutil"
 	"github.com/hashicorp/vault/sdk/logical"
@@ -21,33 +17,22 @@ func pathListCerts(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "certs/?",
 
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixCert,
-			OperationSuffix: "certificates",
-			Navigation:      true,
-			ItemType:        "Certificate",
-		},
-
 		Callbacks: map[logical.Operation]framework.OperationFunc{
 			logical.ListOperation: b.pathCertList,
 		},
 
 		HelpSynopsis:    pathCertHelpSyn,
 		HelpDescription: pathCertHelpDesc,
+		DisplayAttrs: &framework.DisplayAttributes{
+			Navigation: true,
+			ItemType:   "Certificate",
+		},
 	}
 }
 
 func pathCerts(b *backend) *framework.Path {
 	p := &framework.Path{
 		Pattern: "certs/" + framework.GenericNameRegex("name"),
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixCert,
-			OperationSuffix: "certificate",
-			Action:          "Create",
-			ItemType:        "Certificate",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"name": {
 				Type:        framework.TypeString,
@@ -62,35 +47,7 @@ Must be x509 PEM encoded.`,
 					EditType: "file",
 				},
 			},
-			"ocsp_enabled": {
-				Type:        framework.TypeBool,
-				Description: `Whether to attempt OCSP verification of certificates at login`,
-			},
-			"ocsp_ca_certificates": {
-				Type:        framework.TypeString,
-				Description: `Any additional CA certificates needed to communicate with OCSP servers`,
-				DisplayAttrs: &framework.DisplayAttributes{
-					EditType: "file",
-				},
-			},
-			"ocsp_servers_override": {
-				Type: framework.TypeCommaStringSlice,
-				Description: `A comma-separated list of OCSP server addresses.  If unset, the OCSP server is determined 
-from the AuthorityInformationAccess extension on the certificate being inspected.`,
-				DisplayAttrs: &framework.DisplayAttributes{
-					Description: "A list of OCSP server addresses. If unset, the OCSP server is determined from the AuthorityInformationAccess extension on the certificate being inspected.",
-				},
-			},
-			"ocsp_fail_open": {
-				Type:        framework.TypeBool,
-				Default:     false,
-				Description: "If set to true, if an OCSP revocation cannot be made successfully, login will proceed rather than failing.  If false, failing to get an OCSP status fails the request.",
-			},
-			"ocsp_query_all_servers": {
-				Type:        framework.TypeBool,
-				Default:     false,
-				Description: "If set to true, rather than accepting the first successful OCSP response, query all servers and consider the certificate valid only if all servers agree.",
-			},
+
 			"allowed_names": {
 				Type: framework.TypeCommaStringSlice,
 				Description: `A comma-separated list of names.
@@ -98,8 +55,7 @@ At least one must exist in either the Common Name or SANs. Supports globbing.
 This parameter is deprecated, please use allowed_common_names, allowed_dns_sans, 
 allowed_email_sans, allowed_uri_sans.`,
 				DisplayAttrs: &framework.DisplayAttributes{
-					Group:       "Constraints",
-					Description: "A list of names. At least one must exist in either the Common Name or SANs. Supports globbing. This parameter is deprecated, please use allowed_common_names, allowed_dns_sans, allowed_email_sans, allowed_uri_sans.",
+					Group: "Constraints",
 				},
 			},
 
@@ -108,8 +64,7 @@ allowed_email_sans, allowed_uri_sans.`,
 				Description: `A comma-separated list of names.
 At least one must exist in the Common Name. Supports globbing.`,
 				DisplayAttrs: &framework.DisplayAttributes{
-					Group:       "Constraints",
-					Description: "A list of names. At least one must exist in the Common Name. Supports globbing.",
+					Group: "Constraints",
 				},
 			},
 
@@ -118,9 +73,8 @@ At least one must exist in the Common Name. Supports globbing.`,
 				Description: `A comma-separated list of DNS names.
 At least one must exist in the SANs. Supports globbing.`,
 				DisplayAttrs: &framework.DisplayAttributes{
-					Name:        "Allowed DNS SANs",
-					Group:       "Constraints",
-					Description: "A list of DNS names. At least one must exist in the SANs. Supports globbing.",
+					Name:  "Allowed DNS SANs",
+					Group: "Constraints",
 				},
 			},
 
@@ -129,9 +83,8 @@ At least one must exist in the SANs. Supports globbing.`,
 				Description: `A comma-separated list of Email Addresses.
 At least one must exist in the SANs. Supports globbing.`,
 				DisplayAttrs: &framework.DisplayAttributes{
-					Name:        "Allowed Email SANs",
-					Group:       "Constraints",
-					Description: "A list of Email Addresses. At least one must exist in the SANs. Supports globbing.",
+					Name:  "Allowed Email SANs",
+					Group: "Constraints",
 				},
 			},
 
@@ -140,9 +93,8 @@ At least one must exist in the SANs. Supports globbing.`,
 				Description: `A comma-separated list of URIs.
 At least one must exist in the SANs. Supports globbing.`,
 				DisplayAttrs: &framework.DisplayAttributes{
-					Name:        "Allowed URI SANs",
-					Group:       "Constraints",
-					Description: "A list of URIs. At least one must exist in the SANs. Supports globbing.",
+					Name:  "Allowed URI SANs",
+					Group: "Constraints",
 				},
 			},
 
@@ -151,8 +103,7 @@ At least one must exist in the SANs. Supports globbing.`,
 				Description: `A comma-separated list of Organizational Units names.
 At least one must exist in the OU field.`,
 				DisplayAttrs: &framework.DisplayAttributes{
-					Group:       "Constraints",
-					Description: "A list of Organizational Units names. At least one must exist in the OU field.",
+					Group: "Constraints",
 				},
 			},
 
@@ -161,9 +112,6 @@ At least one must exist in the OU field.`,
 				Description: `A comma-separated string or array of extensions
 formatted as "oid:value". Expects the extension value to be some type of ASN1 encoded string.
 All values much match. Supports globbing on "value".`,
-				DisplayAttrs: &framework.DisplayAttributes{
-					Description: "A list of extensions formatted as 'oid:value'. Expects the extension value to be some type of ASN1 encoded string. All values much match. Supports globbing on 'value'.",
-				},
 			},
 
 			"allowed_metadata_extensions": {
@@ -172,9 +120,6 @@ All values much match. Supports globbing on "value".`,
 Upon successful authentication, these extensions will be added as metadata if they are present
 in the certificate. The metadata key will be the string consisting of the oid numbers
 separated by a dash (-) instead of a dot (.) to allow usage in ACL templates.`,
-				DisplayAttrs: &framework.DisplayAttributes{
-					Description: "A list of OID extensions. Upon successful authentication, these extensions will be added as metadata if they are present in the certificate. The metadata key will be the string consisting of the OID numbers separated by a dash (-) instead of a dot (.) to allow usage in ACL templates.",
-				},
 			},
 
 			"display_name": {
@@ -228,6 +173,10 @@ certificate.`,
 
 		HelpSynopsis:    pathCertHelpSyn,
 		HelpDescription: pathCertHelpDesc,
+		DisplayAttrs: &framework.DisplayAttributes{
+			Action:   "Create",
+			ItemType: "Certificate",
+		},
 	}
 
 	tokenutil.AddTokenFields(p.Fields)
@@ -303,11 +252,6 @@ func (b *backend) pathCertRead(ctx context.Context, req *logical.Request, d *fra
 		"allowed_organizational_units": cert.AllowedOrganizationalUnits,
 		"required_extensions":          cert.RequiredExtensions,
 		"allowed_metadata_extensions":  cert.AllowedMetadataExtensions,
-		"ocsp_ca_certificates":         cert.OcspCaCertificates,
-		"ocsp_enabled":                 cert.OcspEnabled,
-		"ocsp_servers_override":        cert.OcspServersOverride,
-		"ocsp_fail_open":               cert.OcspFailOpen,
-		"ocsp_query_all_servers":       cert.OcspQueryAllServers,
 	}
 	cert.PopulateTokenData(data)
 
@@ -350,21 +294,6 @@ func (b *backend) pathCertWrite(ctx context.Context, req *logical.Request, d *fr
 	if certificateRaw, ok := d.GetOk("certificate"); ok {
 		cert.Certificate = certificateRaw.(string)
 	}
-	if ocspCertificatesRaw, ok := d.GetOk("ocsp_ca_certificates"); ok {
-		cert.OcspCaCertificates = ocspCertificatesRaw.(string)
-	}
-	if ocspEnabledRaw, ok := d.GetOk("ocsp_enabled"); ok {
-		cert.OcspEnabled = ocspEnabledRaw.(bool)
-	}
-	if ocspServerOverrides, ok := d.GetOk("ocsp_servers_override"); ok {
-		cert.OcspServersOverride = ocspServerOverrides.([]string)
-	}
-	if ocspFailOpen, ok := d.GetOk("ocsp_fail_open"); ok {
-		cert.OcspFailOpen = ocspFailOpen.(bool)
-	}
-	if ocspQueryAll, ok := d.GetOk("ocsp_query_all_servers"); ok {
-		cert.OcspQueryAllServers = ocspQueryAll.(bool)
-	}
 	if displayNameRaw, ok := d.GetOk("display_name"); ok {
 		cert.DisplayName = displayNameRaw.(string)
 	}
@@ -470,7 +399,7 @@ func (b *backend) pathCertWrite(ctx context.Context, req *logical.Request, d *fr
 			}
 		}
 		if !clientAuth {
-			return logical.ErrorResponse("nonCA certificates should have TLS client authentication set as an extended key usage"), nil
+			return logical.ErrorResponse("non-CA certificates should have TLS client authentication set as an extended key usage"), nil
 		}
 	}
 
@@ -509,12 +438,6 @@ type CertEntry struct {
 	RequiredExtensions         []string
 	AllowedMetadataExtensions  []string
 	BoundCIDRs                 []*sockaddr.SockAddrMarshaler
-
-	OcspCaCertificates  string
-	OcspEnabled         bool
-	OcspServersOverride []string
-	OcspFailOpen        bool
-	OcspQueryAllServers bool
 }
 
 const pathCertHelpSyn = `
@@ -526,7 +449,6 @@ This endpoint allows you to create, read, update, and delete trusted certificate
 that are allowed to authenticate.
 
 Deleting a certificate will not revoke auth for prior authenticated connections.
-To do this, do a revoke on "login". If you don'log need to revoke login immediately,
+To do this, do a revoke on "login". If you don't need to revoke login immediately,
 then the next renew will cause the lease to expire.
-
 `
diff --git a/builtin/credential/cert/path_config.go b/builtin/credential/cert/path_config.go
index 6f1f290372355..9cc17f3a6aafe 100644
--- a/builtin/credential/cert/path_config.go
+++ b/builtin/credential/cert/path_config.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package cert
 
 import (
@@ -11,16 +8,9 @@ import (
 	"github.com/hashicorp/vault/sdk/logical"
 )
 
-const maxCacheSize = 100000
-
 func pathConfig(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "config",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixCert,
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"disable_binding": {
 				Type:        framework.TypeBool,
@@ -32,50 +22,28 @@ func pathConfig(b *backend) *framework.Path {
 				Default:     false,
 				Description: `If set, metadata of the certificate including the metadata corresponding to allowed_metadata_extensions will be stored in the alias. Defaults to false.`,
 			},
-			"ocsp_cache_size": {
-				Type:        framework.TypeInt,
-				Default:     100,
-				Description: `The size of the in memory OCSP response cache, shared by all configured certs`,
-			},
 		},
 
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.UpdateOperation: &framework.PathOperation{
-				Callback: b.pathConfigWrite,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb: "configure",
-				},
-			},
-			logical.ReadOperation: &framework.PathOperation{
-				Callback: b.pathConfigRead,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationSuffix: "configuration",
-				},
-			},
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.UpdateOperation: b.pathConfigWrite,
+			logical.ReadOperation:   b.pathConfigRead,
 		},
 	}
 }
 
 func (b *backend) pathConfigWrite(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
-	config, err := b.Config(ctx, req.Storage)
+	disableBinding := data.Get("disable_binding").(bool)
+	enableIdentityAliasMetadata := data.Get("enable_identity_alias_metadata").(bool)
+
+	entry, err := logical.StorageEntryJSON("config", config{
+		DisableBinding:              disableBinding,
+		EnableIdentityAliasMetadata: enableIdentityAliasMetadata,
+	})
 	if err != nil {
 		return nil, err
 	}
 
-	if disableBindingRaw, ok := data.GetOk("disable_binding"); ok {
-		config.DisableBinding = disableBindingRaw.(bool)
-	}
-	if enableIdentityAliasMetadataRaw, ok := data.GetOk("enable_identity_alias_metadata"); ok {
-		config.EnableIdentityAliasMetadata = enableIdentityAliasMetadataRaw.(bool)
-	}
-	if cacheSizeRaw, ok := data.GetOk("ocsp_cache_size"); ok {
-		cacheSize := cacheSizeRaw.(int)
-		if cacheSize < 2 || cacheSize > maxCacheSize {
-			return logical.ErrorResponse("invalid cache size, must be >= 2 and <= %d", maxCacheSize), nil
-		}
-		config.OcspCacheSize = cacheSize
-	}
-	if err := b.storeConfig(ctx, req.Storage, config); err != nil {
+	if err := req.Storage.Put(ctx, entry); err != nil {
 		return nil, err
 	}
 	return nil, nil
@@ -90,7 +58,6 @@ func (b *backend) pathConfigRead(ctx context.Context, req *logical.Request, d *f
 	data := map[string]interface{}{
 		"disable_binding":                cfg.DisableBinding,
 		"enable_identity_alias_metadata": cfg.EnableIdentityAliasMetadata,
-		"ocsp_cache_size":                cfg.OcspCacheSize,
 	}
 
 	return &logical.Response{
@@ -118,5 +85,4 @@ func (b *backend) Config(ctx context.Context, s logical.Storage) (*config, error
 type config struct {
 	DisableBinding              bool `json:"disable_binding"`
 	EnableIdentityAliasMetadata bool `json:"enable_identity_alias_metadata"`
-	OcspCacheSize               int  `json:"ocsp_cache_size"`
 }
diff --git a/builtin/credential/cert/path_crls.go b/builtin/credential/cert/path_crls.go
index 9dd710758cef1..afb00470676b8 100644
--- a/builtin/credential/cert/path_crls.go
+++ b/builtin/credential/cert/path_crls.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package cert
 
 import (
@@ -19,41 +16,9 @@ import (
 	"github.com/hashicorp/vault/sdk/logical"
 )
 
-func pathListCRLs(b *backend) *framework.Path {
-	return &framework.Path{
-		Pattern: "crls/?$",
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixCert,
-			OperationSuffix: "crls",
-		},
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.ListOperation: &framework.PathOperation{
-				Callback: b.pathCRLsList,
-			},
-		},
-		HelpSynopsis:    pathCRLsHelpSyn,
-		HelpDescription: pathCRLsHelpDesc,
-	}
-}
-
-func (b *backend) pathCRLsList(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
-	entries, err := req.Storage.List(ctx, "crls/")
-	if err != nil {
-		return nil, fmt.Errorf("failed to list CRLs: %w", err)
-	}
-
-	return logical.ListResponse(entries), nil
-}
-
 func pathCRLs(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "crls/" + framework.GenericNameRegex("name"),
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixCert,
-			OperationSuffix: "crl",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"name": {
 				Type:        framework.TypeString,
@@ -333,7 +298,7 @@ Manage Certificate Revocation Lists checked during authentication.
 `
 
 const pathCRLsHelpDesc = `
-This endpoint allows you to list, create, read, update, and delete the Certificate
+This endpoint allows you to create, read, update, and delete the Certificate
 Revocation Lists checked during authentication, and/or CRL Distribution Point 
 URLs.
 
diff --git a/builtin/credential/cert/path_crls_test.go b/builtin/credential/cert/path_crls_test.go
index 24211f5cad5bb..7cb4bda83696c 100644
--- a/builtin/credential/cert/path_crls_test.go
+++ b/builtin/credential/cert/path_crls_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package cert
 
 import (
@@ -18,11 +15,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/vault/helper/testhelpers/corehelpers"
-
 	"github.com/hashicorp/vault/sdk/framework"
 	"github.com/hashicorp/vault/sdk/helper/certutil"
 	"github.com/hashicorp/vault/sdk/logical"
+	"github.com/hashicorp/vault/vault"
+
 	"github.com/stretchr/testify/require"
 )
 
@@ -194,7 +191,7 @@ func TestCRLFetch(t *testing.T) {
 
 	// Give ourselves a little extra room on slower CI systems to ensure we
 	// can fetch the new CRL.
-	corehelpers.RetryUntil(t, 2*time.Second, func() error {
+	vault.RetryUntil(t, 2*time.Second, func() error {
 		b.crlUpdateMutex.Lock()
 		defer b.crlUpdateMutex.Unlock()
 
diff --git a/builtin/credential/cert/path_login.go b/builtin/credential/cert/path_login.go
index d59c5b4a9195d..383f99a0cd7e4 100644
--- a/builtin/credential/cert/path_login.go
+++ b/builtin/credential/cert/path_login.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package cert
 
 import (
@@ -17,13 +14,10 @@ import (
 
 	"github.com/hashicorp/vault/sdk/framework"
 	"github.com/hashicorp/vault/sdk/helper/certutil"
-	"github.com/hashicorp/vault/sdk/helper/cidrutil"
-	"github.com/hashicorp/vault/sdk/helper/ocsp"
 	"github.com/hashicorp/vault/sdk/helper/policyutil"
 	"github.com/hashicorp/vault/sdk/logical"
 
-	"github.com/hashicorp/errwrap"
-	"github.com/hashicorp/go-multierror"
+	"github.com/hashicorp/vault/sdk/helper/cidrutil"
 	glob "github.com/ryanuber/go-glob"
 )
 
@@ -36,10 +30,6 @@ type ParsedCert struct {
 func pathLogin(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "login",
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixCert,
-			OperationVerb:   "login",
-		},
 		Fields: map[string]*framework.FieldSchema{
 			"name": {
 				Type:        framework.TypeString,
@@ -84,9 +74,6 @@ func (b *backend) pathLoginResolveRole(ctx context.Context, req *logical.Request
 }
 
 func (b *backend) pathLoginAliasLookahead(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
-	if req.Connection == nil || req.Connection.ConnState == nil {
-		return nil, fmt.Errorf("tls connection not found")
-	}
 	clientCerts := req.Connection.ConnState.PeerCertificates
 	if len(clientCerts) == 0 {
 		return nil, fmt.Errorf("no client certificate found")
@@ -106,9 +93,6 @@ func (b *backend) pathLogin(ctx context.Context, req *logical.Request, data *fra
 	if err != nil {
 		return nil, err
 	}
-	if b.configUpdated.Load() {
-		b.updatedConfig(config)
-	}
 
 	var matched *ParsedCert
 	if verifyResp, resp, err := b.verifyCredentials(ctx, req, data); err != nil {
@@ -182,9 +166,6 @@ func (b *backend) pathLoginRenew(ctx context.Context, req *logical.Request, d *f
 	if err != nil {
 		return nil, err
 	}
-	if b.configUpdated.Load() {
-		b.updatedConfig(config)
-	}
 
 	if !config.DisableBinding {
 		var matched *ParsedCert
@@ -255,8 +236,8 @@ func (b *backend) verifyCredentials(ctx context.Context, req *logical.Request, d
 		certName = d.Get("name").(string)
 	}
 
-	// Load the trusted certificates and other details
-	roots, trusted, trustedNonCAs, verifyConf := b.loadTrustedCerts(ctx, req.Storage, certName)
+	// Load the trusted certificates
+	roots, trusted, trustedNonCAs := b.loadTrustedCerts(ctx, req.Storage, certName)
 
 	// Get the list of full chains matching the connection and validates the
 	// certificate itself
@@ -265,37 +246,16 @@ func (b *backend) verifyCredentials(ctx context.Context, req *logical.Request, d
 		return nil, nil, err
 	}
 
-	var extraCas []*x509.Certificate
-	for _, t := range trusted {
-		extraCas = append(extraCas, t.Certificates...)
-	}
-
 	// If trustedNonCAs is not empty it means that client had registered a non-CA cert
 	// with the backend.
-	var retErr error
 	if len(trustedNonCAs) != 0 {
 		for _, trustedNonCA := range trustedNonCAs {
 			tCert := trustedNonCA.Certificates[0]
 			// Check for client cert being explicitly listed in the config (and matching other constraints)
 			if tCert.SerialNumber.Cmp(clientCert.SerialNumber) == 0 &&
-				bytes.Equal(tCert.AuthorityKeyId, clientCert.AuthorityKeyId) {
-				matches, err := b.matchesConstraints(ctx, clientCert, trustedNonCA.Certificates, trustedNonCA, verifyConf)
-
-				// matchesConstraints returns an error when OCSP verification fails,
-				// but some other path might still give us success. Add to the
-				// retErr multierror, but avoid duplicates. This way, if we reach a
-				// failure later, we can give additional context.
-				//
-				// XXX: If matchesConstraints is updated to generate additional,
-				// immediately fatal errors, we likely need to extend it to return
-				// another boolean (fatality) or other detection scheme.
-				if err != nil && (retErr == nil || !errwrap.Contains(retErr, err.Error())) {
-					retErr = multierror.Append(retErr, err)
-				}
-
-				if matches {
-					return trustedNonCA, nil, nil
-				}
+				bytes.Equal(tCert.AuthorityKeyId, clientCert.AuthorityKeyId) &&
+				b.matchesConstraints(clientCert, trustedNonCA.Certificates, trustedNonCA) {
+				return trustedNonCA, nil, nil
 			}
 		}
 	}
@@ -303,54 +263,36 @@ func (b *backend) verifyCredentials(ctx context.Context, req *logical.Request, d
 	// If no trusted chain was found, client is not authenticated
 	// This check happens after checking for a matching configured non-CA certs
 	if len(trustedChains) == 0 {
-		if retErr == nil {
-			return nil, logical.ErrorResponse(fmt.Sprintf("invalid certificate or no client certificate supplied; additionally got errors during verification: %v", retErr)), nil
-		}
 		return nil, logical.ErrorResponse("invalid certificate or no client certificate supplied"), nil
 	}
 
 	// Search for a ParsedCert that intersects with the validated chains and any additional constraints
+	matches := make([]*ParsedCert, 0)
 	for _, trust := range trusted { // For each ParsedCert in the config
 		for _, tCert := range trust.Certificates { // For each certificate in the entry
 			for _, chain := range trustedChains { // For each root chain that we matched
 				for _, cCert := range chain { // For each cert in the matched chain
-					if tCert.Equal(cCert) { // ParsedCert intersects with matched chain
-						match, err := b.matchesConstraints(ctx, clientCert, chain, trust, verifyConf) // validate client cert + matched chain against the config
-
-						// See note above.
-						if err != nil && (retErr == nil || !errwrap.Contains(retErr, err.Error())) {
-							retErr = multierror.Append(retErr, err)
-						}
-
-						// Return the first matching entry (for backwards
-						// compatibility, we continue to just pick the first
-						// one if we have multiple matches).
-						//
-						// Here, we return directly: this means that any
-						// future OCSP errors would be ignored; in the future,
-						// if these become fatal, we could revisit this
-						// choice and choose the first match after evaluating
-						// all possible candidates.
-						if match && err == nil {
-							return trust, nil, nil
-						}
+					if tCert.Equal(cCert) && // ParsedCert intersects with matched chain
+						b.matchesConstraints(clientCert, chain, trust) { // validate client cert + matched chain against the config
+						// Add the match to the list
+						matches = append(matches, trust)
 					}
 				}
 			}
 		}
 	}
 
-	if retErr != nil {
-		return nil, logical.ErrorResponse(fmt.Sprintf("no chain matching all constraints could be found for this login certificate; additionally got errors during verification: %v", retErr)), nil
+	// Fail on no matches
+	if len(matches) == 0 {
+		return nil, logical.ErrorResponse("no chain matching all constraints could be found for this login certificate"), nil
 	}
 
-	return nil, logical.ErrorResponse("no chain matching all constraints could be found for this login certificate"), nil
+	// Return the first matching entry (for backwards compatibility, we continue to just pick one if multiple match)
+	return matches[0], nil, nil
 }
 
-func (b *backend) matchesConstraints(ctx context.Context, clientCert *x509.Certificate, trustedChain []*x509.Certificate,
-	config *ParsedCert, conf *ocsp.VerifyConfig,
-) (bool, error) {
-	soFar := !b.checkForChainInCRLs(trustedChain) &&
+func (b *backend) matchesConstraints(clientCert *x509.Certificate, trustedChain []*x509.Certificate, config *ParsedCert) bool {
+	return !b.checkForChainInCRLs(trustedChain) &&
 		b.matchesNames(clientCert, config) &&
 		b.matchesCommonName(clientCert, config) &&
 		b.matchesDNSSANs(clientCert, config) &&
@@ -358,14 +300,6 @@ func (b *backend) matchesConstraints(ctx context.Context, clientCert *x509.Certi
 		b.matchesURISANs(clientCert, config) &&
 		b.matchesOrganizationalUnits(clientCert, config) &&
 		b.matchesCertificateExtensions(clientCert, config)
-	if config.Entry.OcspEnabled {
-		ocspGood, err := b.checkForCertInOCSP(ctx, clientCert, trustedChain, conf)
-		if err != nil {
-			return false, err
-		}
-		soFar = soFar && ocspGood
-	}
-	return soFar, nil
 }
 
 // matchesNames verifies that the certificate matches at least one configured
@@ -512,7 +446,7 @@ func (b *backend) matchesCertificateExtensions(clientCert *x509.Certificate, con
 		asn1.Unmarshal(ext.Value, &parsedValue)
 		clientExtMap[ext.Id.String()] = parsedValue
 	}
-	// If any of the required extensions don'log match the constraint fails
+	// If any of the required extensions don't match the constraint fails
 	for _, requiredExt := range config.Entry.RequiredExtensions {
 		reqExt := strings.SplitN(requiredExt, ":", 2)
 		clientExtValue, clientExtValueOk := clientExtMap[reqExt[0]]
@@ -556,7 +490,7 @@ func (b *backend) certificateExtensionsMetadata(clientCert *x509.Certificate, co
 }
 
 // loadTrustedCerts is used to load all the trusted certificates from the backend
-func (b *backend) loadTrustedCerts(ctx context.Context, storage logical.Storage, certName string) (pool *x509.CertPool, trusted []*ParsedCert, trustedNonCAs []*ParsedCert, conf *ocsp.VerifyConfig) {
+func (b *backend) loadTrustedCerts(ctx context.Context, storage logical.Storage, certName string) (pool *x509.CertPool, trusted []*ParsedCert, trustedNonCAs []*ParsedCert) {
 	pool = x509.NewCertPool()
 	trusted = make([]*ParsedCert, 0)
 	trustedNonCAs = make([]*ParsedCert, 0)
@@ -573,7 +507,6 @@ func (b *backend) loadTrustedCerts(ctx context.Context, storage logical.Storage,
 		}
 	}
 
-	conf = &ocsp.VerifyConfig{}
 	for _, name := range names {
 		entry, err := b.Cert(ctx, storage, strings.TrimPrefix(name, "cert/"))
 		if err != nil {
@@ -581,7 +514,7 @@ func (b *backend) loadTrustedCerts(ctx context.Context, storage logical.Storage,
 			continue
 		}
 		if entry == nil {
-			// This could happen when the certName was provided and the cert doesn'log exist,
+			// This could happen when the certName was provided and the cert doesn't exist,
 			// or just if between the LIST and the GET the cert was deleted.
 			continue
 		}
@@ -591,8 +524,6 @@ func (b *backend) loadTrustedCerts(ctx context.Context, storage logical.Storage,
 			b.Logger().Error("failed to parse certificate", "name", name)
 			continue
 		}
-		parsed = append(parsed, parsePEM([]byte(entry.OcspCaCertificates))...)
-
 		if !parsed[0].IsCA {
 			trustedNonCAs = append(trustedNonCAs, &ParsedCert{
 				Entry:        entry,
@@ -609,39 +540,10 @@ func (b *backend) loadTrustedCerts(ctx context.Context, storage logical.Storage,
 				Certificates: parsed,
 			})
 		}
-		if entry.OcspEnabled {
-			conf.OcspEnabled = true
-			conf.OcspServersOverride = append(conf.OcspServersOverride, entry.OcspServersOverride...)
-			if entry.OcspFailOpen {
-				conf.OcspFailureMode = ocsp.FailOpenTrue
-			} else {
-				conf.OcspFailureMode = ocsp.FailOpenFalse
-			}
-			conf.QueryAllServers = conf.QueryAllServers || entry.OcspQueryAllServers
-		}
 	}
 	return
 }
 
-func (b *backend) checkForCertInOCSP(ctx context.Context, clientCert *x509.Certificate, chain []*x509.Certificate, conf *ocsp.VerifyConfig) (bool, error) {
-	if !conf.OcspEnabled || len(chain) < 2 {
-		return true, nil
-	}
-	b.ocspClientMutex.RLock()
-	defer b.ocspClientMutex.RUnlock()
-	err := b.ocspClient.VerifyLeafCertificate(ctx, clientCert, chain[1], conf)
-	if err != nil {
-		// We want to preserve error messages when they have additional,
-		// potentially useful information. Just having a revoked cert
-		// isn't additionally useful.
-		if !strings.Contains(err.Error(), "has been revoked") {
-			return false, err
-		}
-		return false, nil
-	}
-	return true, nil
-}
-
 func (b *backend) checkForChainInCRLs(chain []*x509.Certificate) bool {
 	badChain := false
 	for _, cert := range chain {
diff --git a/builtin/credential/cert/path_login_test.go b/builtin/credential/cert/path_login_test.go
index d86bd31bd92eb..a01ec981663f3 100644
--- a/builtin/credential/cert/path_login_test.go
+++ b/builtin/credential/cert/path_login_test.go
@@ -1,64 +1,24 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package cert
 
 import (
-	"context"
 	"crypto/tls"
 	"crypto/x509"
 	"crypto/x509/pkix"
-	"fmt"
 	"io/ioutil"
 	"math/big"
 	mathrand "math/rand"
 	"net"
-	"net/http"
 	"os"
 	"path/filepath"
 	"strings"
 	"testing"
 	"time"
 
-	"github.com/hashicorp/vault/sdk/helper/certutil"
-
-	"golang.org/x/crypto/ocsp"
-
 	logicaltest "github.com/hashicorp/vault/helper/testhelpers/logical"
 
 	"github.com/hashicorp/vault/sdk/logical"
 )
 
-var ocspPort int
-
-var source InMemorySource
-
-type testLogger struct{}
-
-func (t *testLogger) Log(args ...any) {
-	fmt.Printf("%v", args)
-}
-
-func TestMain(m *testing.M) {
-	source = make(InMemorySource)
-
-	listener, err := net.Listen("tcp", ":0")
-	if err != nil {
-		return
-	}
-
-	ocspPort = listener.Addr().(*net.TCPAddr).Port
-	srv := &http.Server{
-		Addr:    "localhost:0",
-		Handler: NewResponder(&testLogger{}, source, nil),
-	}
-	go func() {
-		srv.Serve(listener)
-	}()
-	defer srv.Shutdown(context.Background())
-	m.Run()
-}
-
 func TestCert_RoleResolve(t *testing.T) {
 	certTemplate := &x509.Certificate{
 		Subject: pkix.Name{
@@ -199,34 +159,6 @@ func testAccStepResolveRoleExpectRoleResolutionToFail(t *testing.T, connState tl
 	}
 }
 
-func testAccStepResolveRoleOCSPFail(t *testing.T, connState tls.ConnectionState, certName string) logicaltest.TestStep {
-	return logicaltest.TestStep{
-		Operation:       logical.ResolveRoleOperation,
-		Path:            "login",
-		Unauthenticated: true,
-		ConnState:       &connState,
-		ErrorOk:         true,
-		Check: func(resp *logical.Response) error {
-			if resp == nil || !resp.IsError() {
-				t.Fatalf("Response was not an error: resp:%#v", resp)
-			}
-
-			errString, ok := resp.Data["error"].(string)
-			if !ok {
-				t.Fatal("Error not part of response.")
-			}
-
-			if !strings.Contains(errString, "no chain matching") {
-				t.Fatalf("Error was not due to OCSP failure. Error: %s", errString)
-			}
-			return nil
-		},
-		Data: map[string]interface{}{
-			"name": certName,
-		},
-	}
-}
-
 func TestCert_RoleResolve_RoleDoesNotExist(t *testing.T) {
 	certTemplate := &x509.Certificate{
 		Subject: pkix.Name{
@@ -265,98 +197,3 @@ func TestCert_RoleResolve_RoleDoesNotExist(t *testing.T) {
 		},
 	})
 }
-
-func TestCert_RoleResolveOCSP(t *testing.T) {
-	cases := []struct {
-		name        string
-		failOpen    bool
-		certStatus  int
-		errExpected bool
-	}{
-		{"failFalseGoodCert", false, ocsp.Good, false},
-		{"failFalseRevokedCert", false, ocsp.Revoked, true},
-		{"failFalseUnknownCert", false, ocsp.Unknown, true},
-		{"failTrueGoodCert", true, ocsp.Good, false},
-		{"failTrueRevokedCert", true, ocsp.Revoked, true},
-		{"failTrueUnknownCert", true, ocsp.Unknown, false},
-	}
-	certTemplate := &x509.Certificate{
-		Subject: pkix.Name{
-			CommonName: "example.com",
-		},
-		DNSNames:    []string{"example.com"},
-		IPAddresses: []net.IP{net.ParseIP("127.0.0.1")},
-		ExtKeyUsage: []x509.ExtKeyUsage{
-			x509.ExtKeyUsageServerAuth,
-			x509.ExtKeyUsageClientAuth,
-		},
-		KeyUsage:     x509.KeyUsageDigitalSignature | x509.KeyUsageKeyEncipherment | x509.KeyUsageKeyAgreement,
-		SerialNumber: big.NewInt(mathrand.Int63()),
-		NotBefore:    time.Now().Add(-30 * time.Second),
-		NotAfter:     time.Now().Add(262980 * time.Hour),
-		OCSPServer:   []string{fmt.Sprintf("http://localhost:%d", ocspPort)},
-	}
-	tempDir, connState, err := generateTestCertAndConnState(t, certTemplate)
-	if tempDir != "" {
-		defer os.RemoveAll(tempDir)
-	}
-	if err != nil {
-		t.Fatalf("error testing connection state: %v", err)
-	}
-	ca, err := ioutil.ReadFile(filepath.Join(tempDir, "ca_cert.pem"))
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	issuer := parsePEM(ca)
-	pkf, err := ioutil.ReadFile(filepath.Join(tempDir, "ca_key.pem"))
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	pk, err := certutil.ParsePEMBundle(string(pkf))
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	for _, c := range cases {
-		t.Run(c.name, func(t *testing.T) {
-			resp, err := ocsp.CreateResponse(issuer[0], issuer[0], ocsp.Response{
-				Status:       c.certStatus,
-				SerialNumber: certTemplate.SerialNumber,
-				ProducedAt:   time.Now(),
-				ThisUpdate:   time.Now(),
-				NextUpdate:   time.Now().Add(time.Hour),
-			}, pk.PrivateKey)
-			if err != nil {
-				t.Fatal(err)
-			}
-			source[certTemplate.SerialNumber.String()] = resp
-
-			b := testFactory(t)
-			b.(*backend).ocspClient.ClearCache()
-			var resolveStep logicaltest.TestStep
-			var loginStep logicaltest.TestStep
-			if c.errExpected {
-				loginStep = testAccStepLoginWithNameInvalid(t, connState, "web")
-				resolveStep = testAccStepResolveRoleOCSPFail(t, connState, "web")
-			} else {
-				loginStep = testAccStepLoginWithName(t, connState, "web")
-				resolveStep = testAccStepResolveRoleWithName(t, connState, "web")
-			}
-			logicaltest.Test(t, logicaltest.TestCase{
-				CredentialBackend: b,
-				Steps: []logicaltest.TestStep{
-					testAccStepCertWithExtraParams(t, "web", ca, "foo", allowed{dns: "example.com"}, false,
-						map[string]interface{}{"ocsp_enabled": true, "ocsp_fail_open": c.failOpen}),
-					testAccStepReadCertPolicy(t, "web", false, map[string]interface{}{"ocsp_enabled": true, "ocsp_fail_open": c.failOpen}),
-					loginStep,
-					resolveStep,
-				},
-			})
-		})
-	}
-}
-
-func serialFromBigInt(serial *big.Int) string {
-	return strings.TrimSpace(certutil.GetHexFormatted(serial.Bytes(), ":"))
-}
diff --git a/builtin/credential/cert/test_responder.go b/builtin/credential/cert/test_responder.go
deleted file mode 100644
index d68ebe080e083..0000000000000
--- a/builtin/credential/cert/test_responder.go
+++ /dev/null
@@ -1,304 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-// Package ocsp implements an OCSP responder based on a generic storage backend.
-// It provides a couple of sample implementations.
-// Because OCSP responders handle high query volumes, we have to be careful
-// about how much logging we do. Error-level logs are reserved for problems
-// internal to the server, that can be fixed by an administrator. Any type of
-// incorrect input from a user should be logged and Info or below. For things
-// that are logged on every request, Debug is the appropriate level.
-//
-// From https://github.com/cloudflare/cfssl/blob/master/ocsp/responder.go
-
-package cert
-
-import (
-	"crypto"
-	"crypto/sha256"
-	"encoding/base64"
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"net/url"
-	"time"
-
-	"golang.org/x/crypto/ocsp"
-)
-
-var (
-	malformedRequestErrorResponse = []byte{0x30, 0x03, 0x0A, 0x01, 0x01}
-	internalErrorErrorResponse    = []byte{0x30, 0x03, 0x0A, 0x01, 0x02}
-	tryLaterErrorResponse         = []byte{0x30, 0x03, 0x0A, 0x01, 0x03}
-	sigRequredErrorResponse       = []byte{0x30, 0x03, 0x0A, 0x01, 0x05}
-	unauthorizedErrorResponse     = []byte{0x30, 0x03, 0x0A, 0x01, 0x06}
-
-	// ErrNotFound indicates the request OCSP response was not found. It is used to
-	// indicate that the responder should reply with unauthorizedErrorResponse.
-	ErrNotFound = errors.New("Request OCSP Response not found")
-)
-
-// Source represents the logical source of OCSP responses, i.e.,
-// the logic that actually chooses a response based on a request.  In
-// order to create an actual responder, wrap one of these in a Responder
-// object and pass it to http.Handle. By default the Responder will set
-// the headers Cache-Control to "max-age=(response.NextUpdate-now), public, no-transform, must-revalidate",
-// Last-Modified to response.ThisUpdate, Expires to response.NextUpdate,
-// ETag to the SHA256 hash of the response, and Content-Type to
-// application/ocsp-response. If you want to override these headers,
-// or set extra headers, your source should return a http.Header
-// with the headers you wish to set. If you don'log want to set any
-// extra headers you may return nil instead.
-type Source interface {
-	Response(*ocsp.Request) ([]byte, http.Header, error)
-}
-
-// An InMemorySource is a map from serialNumber -> der(response)
-type InMemorySource map[string][]byte
-
-// Response looks up an OCSP response to provide for a given request.
-// InMemorySource looks up a response purely based on serial number,
-// without regard to what issuer the request is asking for.
-func (src InMemorySource) Response(request *ocsp.Request) ([]byte, http.Header, error) {
-	response, present := src[request.SerialNumber.String()]
-	if !present {
-		return nil, nil, ErrNotFound
-	}
-	return response, nil, nil
-}
-
-// Stats is a basic interface that allows users to record information
-// about returned responses
-type Stats interface {
-	ResponseStatus(ocsp.ResponseStatus)
-}
-
-type logger interface {
-	Log(args ...any)
-}
-
-// A Responder object provides the HTTP logic to expose a
-// Source of OCSP responses.
-type Responder struct {
-	log    logger
-	Source Source
-	stats  Stats
-}
-
-// NewResponder instantiates a Responder with the give Source.
-func NewResponder(t logger, source Source, stats Stats) *Responder {
-	return &Responder{
-		Source: source,
-		stats:  stats,
-		log:    t,
-	}
-}
-
-func overrideHeaders(response http.ResponseWriter, headers http.Header) {
-	for k, v := range headers {
-		if len(v) == 1 {
-			response.Header().Set(k, v[0])
-		} else if len(v) > 1 {
-			response.Header().Del(k)
-			for _, e := range v {
-				response.Header().Add(k, e)
-			}
-		}
-	}
-}
-
-// hashToString contains mappings for the only hash functions
-// x/crypto/ocsp supports
-var hashToString = map[crypto.Hash]string{
-	crypto.SHA1:   "SHA1",
-	crypto.SHA256: "SHA256",
-	crypto.SHA384: "SHA384",
-	crypto.SHA512: "SHA512",
-}
-
-// A Responder can process both GET and POST requests.  The mapping
-// from an OCSP request to an OCSP response is done by the Source;
-// the Responder simply decodes the request, and passes back whatever
-// response is provided by the source.
-// Note: The caller must use http.StripPrefix to strip any path components
-// (including '/') on GET requests.
-// Do not use this responder in conjunction with http.NewServeMux, because the
-// default handler will try to canonicalize path components by changing any
-// strings of repeated '/' into a single '/', which will break the base64
-// encoding.
-func (rs *Responder) ServeHTTP(response http.ResponseWriter, request *http.Request) {
-	// By default we set a 'max-age=0, no-cache' Cache-Control header, this
-	// is only returned to the client if a valid authorized OCSP response
-	// is not found or an error is returned. If a response if found the header
-	// will be altered to contain the proper max-age and modifiers.
-	response.Header().Add("Cache-Control", "max-age=0, no-cache")
-	// Read response from request
-	var requestBody []byte
-	var err error
-	switch request.Method {
-	case "GET":
-		base64Request, err := url.QueryUnescape(request.URL.Path)
-		if err != nil {
-			rs.log.Log("Error decoding URL:", request.URL.Path)
-			response.WriteHeader(http.StatusBadRequest)
-			return
-		}
-		// url.QueryUnescape not only unescapes %2B escaping, but it additionally
-		// turns the resulting '+' into a space, which makes base64 decoding fail.
-		// So we go back afterwards and turn ' ' back into '+'. This means we
-		// accept some malformed input that includes ' ' or %20, but that's fine.
-		base64RequestBytes := []byte(base64Request)
-		for i := range base64RequestBytes {
-			if base64RequestBytes[i] == ' ' {
-				base64RequestBytes[i] = '+'
-			}
-		}
-		// In certain situations a UA may construct a request that has a double
-		// slash between the host name and the base64 request body due to naively
-		// constructing the request URL. In that case strip the leading slash
-		// so that we can still decode the request.
-		if len(base64RequestBytes) > 0 && base64RequestBytes[0] == '/' {
-			base64RequestBytes = base64RequestBytes[1:]
-		}
-		requestBody, err = base64.StdEncoding.DecodeString(string(base64RequestBytes))
-		if err != nil {
-			rs.log.Log("Error decoding base64 from URL", string(base64RequestBytes))
-			response.WriteHeader(http.StatusBadRequest)
-			return
-		}
-	case "POST":
-		requestBody, err = ioutil.ReadAll(request.Body)
-		if err != nil {
-			rs.log.Log("Problem reading body of POST", err)
-			response.WriteHeader(http.StatusBadRequest)
-			return
-		}
-	default:
-		response.WriteHeader(http.StatusMethodNotAllowed)
-		return
-	}
-	b64Body := base64.StdEncoding.EncodeToString(requestBody)
-	rs.log.Log("Received OCSP request", b64Body)
-
-	// All responses after this point will be OCSP.
-	// We could check for the content type of the request, but that
-	// seems unnecessariliy restrictive.
-	response.Header().Add("Content-Type", "application/ocsp-response")
-
-	// Parse response as an OCSP request
-	// XXX: This fails if the request contains the nonce extension.
-	//      We don'log intend to support nonces anyway, but maybe we
-	//      should return unauthorizedRequest instead of malformed.
-	ocspRequest, err := ocsp.ParseRequest(requestBody)
-	if err != nil {
-		rs.log.Log("Error decoding request body", b64Body)
-		response.WriteHeader(http.StatusBadRequest)
-		response.Write(malformedRequestErrorResponse)
-		if rs.stats != nil {
-			rs.stats.ResponseStatus(ocsp.Malformed)
-		}
-		return
-	}
-
-	// Look up OCSP response from source
-	ocspResponse, headers, err := rs.Source.Response(ocspRequest)
-	if err != nil {
-		if err == ErrNotFound {
-			rs.log.Log("No response found for request: serial %x, request body %s",
-				ocspRequest.SerialNumber, b64Body)
-			response.Write(unauthorizedErrorResponse)
-			if rs.stats != nil {
-				rs.stats.ResponseStatus(ocsp.Unauthorized)
-			}
-			return
-		}
-		rs.log.Log("Error retrieving response for request: serial %x, request body %s, error",
-			ocspRequest.SerialNumber, b64Body, err)
-		response.WriteHeader(http.StatusInternalServerError)
-		response.Write(internalErrorErrorResponse)
-		if rs.stats != nil {
-			rs.stats.ResponseStatus(ocsp.InternalError)
-		}
-		return
-	}
-
-	parsedResponse, err := ocsp.ParseResponse(ocspResponse, nil)
-	if err != nil {
-		rs.log.Log("Error parsing response for serial %x",
-			ocspRequest.SerialNumber, err)
-		response.Write(internalErrorErrorResponse)
-		if rs.stats != nil {
-			rs.stats.ResponseStatus(ocsp.InternalError)
-		}
-		return
-	}
-
-	// Write OCSP response to response
-	response.Header().Add("Last-Modified", parsedResponse.ThisUpdate.Format(time.RFC1123))
-	response.Header().Add("Expires", parsedResponse.NextUpdate.Format(time.RFC1123))
-	now := time.Now()
-	maxAge := 0
-	if now.Before(parsedResponse.NextUpdate) {
-		maxAge = int(parsedResponse.NextUpdate.Sub(now) / time.Second)
-	} else {
-		// TODO(#530): we want max-age=0 but this is technically an authorized OCSP response
-		//             (despite being stale) and 5019 forbids attaching no-cache
-		maxAge = 0
-	}
-	response.Header().Set(
-		"Cache-Control",
-		fmt.Sprintf(
-			"max-age=%d, public, no-transform, must-revalidate",
-			maxAge,
-		),
-	)
-	responseHash := sha256.Sum256(ocspResponse)
-	response.Header().Add("ETag", fmt.Sprintf("\"%X\"", responseHash))
-
-	if headers != nil {
-		overrideHeaders(response, headers)
-	}
-
-	// RFC 7232 says that a 304 response must contain the above
-	// headers if they would also be sent for a 200 for the same
-	// request, so we have to wait until here to do this
-	if etag := request.Header.Get("If-None-Match"); etag != "" {
-		if etag == fmt.Sprintf("\"%X\"", responseHash) {
-			response.WriteHeader(http.StatusNotModified)
-			return
-		}
-	}
-	response.WriteHeader(http.StatusOK)
-	response.Write(ocspResponse)
-	if rs.stats != nil {
-		rs.stats.ResponseStatus(ocsp.Success)
-	}
-}
-
-/*
-Copyright (c) 2014 CloudFlare Inc.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-
-Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
diff --git a/builtin/credential/github/backend.go b/builtin/credential/github/backend.go
index f8bbcc403c61d..89ce37c7cd6d0 100644
--- a/builtin/credential/github/backend.go
+++ b/builtin/credential/github/backend.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package github
 
 import (
@@ -14,8 +11,6 @@ import (
 	"golang.org/x/oauth2"
 )
 
-const operationPrefixGithub = "github"
-
 func Factory(ctx context.Context, conf *logical.BackendConfig) (logical.Backend, error) {
 	b := Backend()
 	if err := b.Setup(ctx, conf); err != nil {
@@ -33,17 +28,6 @@ func Backend() *backend {
 		DefaultKey: "default",
 	}
 
-	teamMapPaths := b.TeamMap.Paths()
-
-	teamMapPaths[0].DisplayAttrs = &framework.DisplayAttributes{
-		OperationPrefix: operationPrefixGithub,
-		OperationSuffix: "teams",
-	}
-	teamMapPaths[1].DisplayAttrs = &framework.DisplayAttributes{
-		OperationPrefix: operationPrefixGithub,
-		OperationSuffix: "team-mapping",
-	}
-
 	b.UserMap = &framework.PolicyMap{
 		PathMap: framework.PathMap{
 			Name: "users",
@@ -51,18 +35,7 @@ func Backend() *backend {
 		DefaultKey: "default",
 	}
 
-	userMapPaths := b.UserMap.Paths()
-
-	userMapPaths[0].DisplayAttrs = &framework.DisplayAttributes{
-		OperationPrefix: operationPrefixGithub,
-		OperationSuffix: "users",
-	}
-	userMapPaths[1].DisplayAttrs = &framework.DisplayAttributes{
-		OperationPrefix: operationPrefixGithub,
-		OperationSuffix: "user-mapping",
-	}
-
-	allPaths := append(teamMapPaths, userMapPaths...)
+	allPaths := append(b.TeamMap.Paths(), b.UserMap.Paths()...)
 	b.Backend = &framework.Backend{
 		Help: backendHelp,
 
diff --git a/builtin/credential/github/backend_test.go b/builtin/credential/github/backend_test.go
index 6ea08ee58134e..f3360f52cfb57 100644
--- a/builtin/credential/github/backend_test.go
+++ b/builtin/credential/github/backend_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package github
 
 import (
diff --git a/builtin/credential/github/cli.go b/builtin/credential/github/cli.go
index d40f1b56d9e7e..bccc6fa516e2d 100644
--- a/builtin/credential/github/cli.go
+++ b/builtin/credential/github/cli.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package github
 
 import (
diff --git a/builtin/credential/github/cmd/github/main.go b/builtin/credential/github/cmd/github/main.go
index 499469a0f6813..be4fbb64ca65f 100644
--- a/builtin/credential/github/cmd/github/main.go
+++ b/builtin/credential/github/cmd/github/main.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package main
 
 import (
@@ -20,11 +17,9 @@ func main() {
 	tlsConfig := apiClientMeta.GetTLSConfig()
 	tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig)
 
-	if err := plugin.ServeMultiplex(&plugin.ServeOpts{
+	if err := plugin.Serve(&plugin.ServeOpts{
 		BackendFactoryFunc: github.Factory,
-		// set the TLSProviderFunc so that the plugin maintains backwards
-		// compatibility with Vault versions that don’t support plugin AutoMTLS
-		TLSProviderFunc: tlsProviderFunc,
+		TLSProviderFunc:    tlsProviderFunc,
 	}); err != nil {
 		logger := hclog.New(&hclog.LoggerOptions{})
 
diff --git a/builtin/credential/github/path_config.go b/builtin/credential/github/path_config.go
index 83238f32c49b4..707115c567e33 100644
--- a/builtin/credential/github/path_config.go
+++ b/builtin/credential/github/path_config.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package github
 
 import (
@@ -20,11 +17,6 @@ import (
 func pathConfig(b *backend) *framework.Path {
 	p := &framework.Path{
 		Pattern: "config",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixGithub,
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"organization": {
 				Type:        framework.TypeString,
@@ -57,20 +49,9 @@ API-compatible authentication server.`,
 			},
 		},
 
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.UpdateOperation: &framework.PathOperation{
-				Callback: b.pathConfigWrite,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationPrefix: operationPrefixGithub,
-					OperationVerb:   "configure",
-				},
-			},
-			logical.ReadOperation: &framework.PathOperation{
-				Callback: b.pathConfigRead,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationSuffix: "configuration",
-				},
-			},
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.UpdateOperation: b.pathConfigWrite,
+			logical.ReadOperation:   b.pathConfigRead,
 		},
 	}
 
diff --git a/builtin/credential/github/path_config_test.go b/builtin/credential/github/path_config_test.go
index 2f592b21f7b8c..d59599f326209 100644
--- a/builtin/credential/github/path_config_test.go
+++ b/builtin/credential/github/path_config_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package github
 
 import (
diff --git a/builtin/credential/github/path_login.go b/builtin/credential/github/path_login.go
index 4ee94e5d5c670..252b5641cd4fe 100644
--- a/builtin/credential/github/path_login.go
+++ b/builtin/credential/github/path_login.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package github
 
 import (
@@ -19,12 +16,6 @@ import (
 func pathLogin(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "login",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixGithub,
-			OperationVerb:   "login",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"token": {
 				Type:        framework.TypeString,
diff --git a/builtin/credential/github/path_login_test.go b/builtin/credential/github/path_login_test.go
index 282e3fa9401df..25baf7f811e8a 100644
--- a/builtin/credential/github/path_login_test.go
+++ b/builtin/credential/github/path_login_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package github
 
 import (
diff --git a/builtin/credential/ldap/backend.go b/builtin/credential/ldap/backend.go
index ffc1d1ee8c39f..d318fe4b4c6bb 100644
--- a/builtin/credential/ldap/backend.go
+++ b/builtin/credential/ldap/backend.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package ldap
 
 import (
@@ -14,10 +11,7 @@ import (
 	"github.com/hashicorp/vault/sdk/logical"
 )
 
-const (
-	operationPrefixLDAP = "ldap"
-	errUserBindFailed   = "ldap operation failed: failed to bind as user"
-)
+const errUserBindFailed = `ldap operation failed: failed to bind as user`
 
 func Factory(ctx context.Context, conf *logical.BackendConfig) (logical.Backend, error) {
 	b := Backend()
@@ -113,7 +107,7 @@ func (b *backend) Login(ctx context.Context, req *logical.Request, username stri
 		if b.Logger().IsDebug() {
 			b.Logger().Debug("ldap bind failed", "error", err)
 		}
-		return "", nil, logical.ErrorResponse(errUserBindFailed), nil, logical.ErrInvalidCredentials
+		return "", nil, logical.ErrorResponse(errUserBindFailed), nil, nil
 	}
 
 	// We re-bind to the BindDN if it's defined because we assume
@@ -123,7 +117,7 @@ func (b *backend) Login(ctx context.Context, req *logical.Request, username stri
 			if b.Logger().IsDebug() {
 				b.Logger().Debug("error while attempting to re-bind with the BindDN User", "error", err)
 			}
-			return "", nil, logical.ErrorResponse("ldap operation failed: failed to re-bind with the BindDN user"), nil, logical.ErrInvalidCredentials
+			return "", nil, logical.ErrorResponse("ldap operation failed: failed to re-bind with the BindDN user"), nil, nil
 		}
 		if b.Logger().IsDebug() {
 			b.Logger().Debug("re-bound to original binddn")
diff --git a/builtin/credential/ldap/backend_test.go b/builtin/credential/ldap/backend_test.go
index beda248e4b090..74dfdf99ed074 100644
--- a/builtin/credential/ldap/backend_test.go
+++ b/builtin/credential/ldap/backend_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package ldap
 
 import (
@@ -1242,7 +1239,6 @@ func TestLdapAuthBackend_ConfigUpgrade(t *testing.T) {
 			RequestTimeout:           cfg.RequestTimeout,
 			ConnectionTimeout:        cfg.ConnectionTimeout,
 			UsernameAsAlias:          false,
-			DerefAliases:             "never",
 			MaximumPageSize:          1000,
 		},
 	}
diff --git a/builtin/credential/ldap/cli.go b/builtin/credential/ldap/cli.go
index 772603434940a..e0d744b4caadb 100644
--- a/builtin/credential/ldap/cli.go
+++ b/builtin/credential/ldap/cli.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package ldap
 
 import (
@@ -29,15 +26,12 @@ func (h *CLIHandler) Auth(c *api.Client, m map[string]string) (*api.Secret, erro
 	}
 	password, ok := m["password"]
 	if !ok {
-		password = passwordFromEnv()
-		if password == "" {
-			fmt.Fprintf(os.Stderr, "Password (will be hidden): ")
-			var err error
-			password, err = pwd.Read(os.Stdin)
-			fmt.Fprintf(os.Stderr, "\n")
-			if err != nil {
-				return nil, err
-			}
+		fmt.Fprintf(os.Stderr, "Password (will be hidden): ")
+		var err error
+		password, err = pwd.Read(os.Stdin)
+		fmt.Fprintf(os.Stderr, "\n")
+		if err != nil {
+			return nil, err
 		}
 	}
 
@@ -76,9 +70,8 @@ Usage: vault login -method=ldap [CONFIG K=V...]
 Configuration:
 
   password=<string>
-      LDAP password to use for authentication. If not provided, it will use
-			the VAULT_LDAP_PASSWORD environment variable. If this is not set, the
-			CLI will prompt for this on stdin.
+      LDAP password to use for authentication. If not provided, the CLI will
+      prompt for this on stdin.
 
   username=<string>
       LDAP username to use for authentication.
@@ -96,7 +89,3 @@ func usernameFromEnv() string {
 	}
 	return ""
 }
-
-func passwordFromEnv() string {
-	return os.Getenv("VAULT_LDAP_PASSWORD")
-}
diff --git a/builtin/credential/ldap/cmd/ldap/main.go b/builtin/credential/ldap/cmd/ldap/main.go
index 2dcb802e20927..b632c011ce136 100644
--- a/builtin/credential/ldap/cmd/ldap/main.go
+++ b/builtin/credential/ldap/cmd/ldap/main.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package main
 
 import (
@@ -20,11 +17,9 @@ func main() {
 	tlsConfig := apiClientMeta.GetTLSConfig()
 	tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig)
 
-	if err := plugin.ServeMultiplex(&plugin.ServeOpts{
+	if err := plugin.Serve(&plugin.ServeOpts{
 		BackendFactoryFunc: ldap.Factory,
-		// set the TLSProviderFunc so that the plugin maintains backwards
-		// compatibility with Vault versions that don’t support plugin AutoMTLS
-		TLSProviderFunc: tlsProviderFunc,
+		TLSProviderFunc:    tlsProviderFunc,
 	}); err != nil {
 		logger := hclog.New(&hclog.LoggerOptions{})
 
diff --git a/builtin/credential/ldap/path_config.go b/builtin/credential/ldap/path_config.go
index a06c6666f8857..45e5294c79d93 100644
--- a/builtin/credential/ldap/path_config.go
+++ b/builtin/credential/ldap/path_config.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package ldap
 
 import (
@@ -19,31 +16,18 @@ const userFilterWarning = "userfilter configured does not consider userattr and
 func pathConfig(b *backend) *framework.Path {
 	p := &framework.Path{
 		Pattern: `config`,
+		Fields:  ldaputil.ConfigFields(),
 
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixLDAP,
-			Action:          "Configure",
-		},
-
-		Fields: ldaputil.ConfigFields(),
-
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.ReadOperation: &framework.PathOperation{
-				Callback: b.pathConfigRead,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationSuffix: "auth-configuration",
-				},
-			},
-			logical.UpdateOperation: &framework.PathOperation{
-				Callback: b.pathConfigWrite,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb: "configure-auth",
-				},
-			},
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.ReadOperation:   b.pathConfigRead,
+			logical.UpdateOperation: b.pathConfigWrite,
 		},
 
 		HelpSynopsis:    pathConfigHelpSyn,
 		HelpDescription: pathConfigHelpDesc,
+		DisplayAttrs: &framework.DisplayAttributes{
+			Action: "Configure",
+		},
 	}
 
 	tokenutil.AddTokenFields(p.Fields)
diff --git a/builtin/credential/ldap/path_groups.go b/builtin/credential/ldap/path_groups.go
index 08ac00d7fd2c2..b39691cf8174f 100644
--- a/builtin/credential/ldap/path_groups.go
+++ b/builtin/credential/ldap/path_groups.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package ldap
 
 import (
@@ -16,33 +13,22 @@ func pathGroupsList(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "groups/?$",
 
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixLDAP,
-			OperationSuffix: "groups",
-			Navigation:      true,
-			ItemType:        "Group",
-		},
-
 		Callbacks: map[logical.Operation]framework.OperationFunc{
 			logical.ListOperation: b.pathGroupList,
 		},
 
 		HelpSynopsis:    pathGroupHelpSyn,
 		HelpDescription: pathGroupHelpDesc,
+		DisplayAttrs: &framework.DisplayAttributes{
+			Navigation: true,
+			ItemType:   "Group",
+		},
 	}
 }
 
 func pathGroups(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: `groups/(?P<name>.+)`,
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixLDAP,
-			OperationSuffix: "group",
-			Action:          "Create",
-			ItemType:        "Group",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"name": {
 				Type:        framework.TypeString,
@@ -52,9 +38,6 @@ func pathGroups(b *backend) *framework.Path {
 			"policies": {
 				Type:        framework.TypeCommaStringSlice,
 				Description: "Comma-separated list of policies associated to the group.",
-				DisplayAttrs: &framework.DisplayAttributes{
-					Description: "A list of policies associated to the group.",
-				},
 			},
 		},
 
@@ -66,6 +49,10 @@ func pathGroups(b *backend) *framework.Path {
 
 		HelpSynopsis:    pathGroupHelpSyn,
 		HelpDescription: pathGroupHelpDesc,
+		DisplayAttrs: &framework.DisplayAttributes{
+			Action:   "Create",
+			ItemType: "Group",
+		},
 	}
 }
 
diff --git a/builtin/credential/ldap/path_login.go b/builtin/credential/ldap/path_login.go
index 440e725399212..67303911e5a17 100644
--- a/builtin/credential/ldap/path_login.go
+++ b/builtin/credential/ldap/path_login.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package ldap
 
 import (
@@ -16,12 +13,6 @@ import (
 func pathLogin(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: `login/(?P<username>.+)`,
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixLDAP,
-			OperationVerb:   "login",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"username": {
 				Type:        framework.TypeString,
diff --git a/builtin/credential/ldap/path_users.go b/builtin/credential/ldap/path_users.go
index 1ce252d1df558..a4e18d30eb6d8 100644
--- a/builtin/credential/ldap/path_users.go
+++ b/builtin/credential/ldap/path_users.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package ldap
 
 import (
@@ -17,33 +14,22 @@ func pathUsersList(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "users/?$",
 
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixLDAP,
-			OperationSuffix: "users",
-			Navigation:      true,
-			ItemType:        "User",
-		},
-
 		Callbacks: map[logical.Operation]framework.OperationFunc{
 			logical.ListOperation: b.pathUserList,
 		},
 
 		HelpSynopsis:    pathUserHelpSyn,
 		HelpDescription: pathUserHelpDesc,
+		DisplayAttrs: &framework.DisplayAttributes{
+			Navigation: true,
+			ItemType:   "User",
+		},
 	}
 }
 
 func pathUsers(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: `users/(?P<name>.+)`,
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixLDAP,
-			OperationSuffix: "user",
-			Action:          "Create",
-			ItemType:        "User",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"name": {
 				Type:        framework.TypeString,
@@ -53,17 +39,11 @@ func pathUsers(b *backend) *framework.Path {
 			"groups": {
 				Type:        framework.TypeCommaStringSlice,
 				Description: "Comma-separated list of additional groups associated with the user.",
-				DisplayAttrs: &framework.DisplayAttributes{
-					Description: "A list of additional groups associated with the user.",
-				},
 			},
 
 			"policies": {
 				Type:        framework.TypeCommaStringSlice,
 				Description: "Comma-separated list of policies associated with the user.",
-				DisplayAttrs: &framework.DisplayAttributes{
-					Description: "A list of policies associated with the user.",
-				},
 			},
 		},
 
@@ -75,6 +55,10 @@ func pathUsers(b *backend) *framework.Path {
 
 		HelpSynopsis:    pathUserHelpSyn,
 		HelpDescription: pathUserHelpDesc,
+		DisplayAttrs: &framework.DisplayAttributes{
+			Action:   "Create",
+			ItemType: "User",
+		},
 	}
 }
 
diff --git a/builtin/credential/okta/backend.go b/builtin/credential/okta/backend.go
index 04dba968ab36f..d7ac1d8cbcf48 100644
--- a/builtin/credential/okta/backend.go
+++ b/builtin/credential/okta/backend.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package okta
 
 import (
@@ -18,9 +15,8 @@ import (
 )
 
 const (
-	operationPrefixOkta = "okta"
-	mfaPushMethod       = "push"
-	mfaTOTPMethod       = "token:software:totp"
+	mfaPushMethod = "push"
+	mfaTOTPMethod = "token:software:totp"
 )
 
 func Factory(ctx context.Context, conf *logical.BackendConfig) (logical.Backend, error) {
@@ -271,12 +267,10 @@ func (b *backend) Login(ctx context.Context, req *logical.Request, username, pas
 					return nil, logical.ErrorResponse("okta auth backend unexpected failure"), nil, nil
 				}
 
-				timer := time.NewTimer(1 * time.Second)
 				select {
-				case <-timer.C:
+				case <-time.After(1 * time.Second):
 					// Continue
 				case <-ctx.Done():
-					timer.Stop()
 					return nil, logical.ErrorResponse("exiting pending mfa challenge"), nil, nil
 				}
 			case "REJECTED":
diff --git a/builtin/credential/okta/backend_test.go b/builtin/credential/okta/backend_test.go
index 85642e802a498..ee1588ee25ac5 100644
--- a/builtin/credential/okta/backend_test.go
+++ b/builtin/credential/okta/backend_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package okta
 
 import (
@@ -12,7 +9,6 @@ import (
 	"time"
 
 	log "github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/vault/helper/testhelpers"
 	logicaltest "github.com/hashicorp/vault/helper/testhelpers/logical"
 	"github.com/hashicorp/vault/sdk/helper/logging"
 	"github.com/hashicorp/vault/sdk/helper/policyutil"
@@ -39,15 +35,6 @@ func TestBackend_Config(t *testing.T) {
 	if os.Getenv("VAULT_ACC") == "" {
 		t.SkipNow()
 	}
-
-	// Ensure each cred is populated.
-	credNames := []string{
-		"OKTA_USERNAME",
-		"OKTA_PASSWORD",
-		"OKTA_API_TOKEN",
-	}
-	testhelpers.SkipUnlessEnvVarsSet(t, credNames)
-
 	defaultLeaseTTLVal := time.Hour * 12
 	maxLeaseTTLVal := time.Hour * 24
 	b, err := Factory(context.Background(), &logical.BackendConfig{
diff --git a/builtin/credential/okta/cli.go b/builtin/credential/okta/cli.go
index df252960a2c22..f6e3d13b73c22 100644
--- a/builtin/credential/okta/cli.go
+++ b/builtin/credential/okta/cli.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package okta
 
 import (
@@ -64,12 +61,10 @@ func (h *CLIHandler) Auth(c *api.Client, m map[string]string) (*api.Secret, erro
 
 	go func() {
 		for {
-			timer := time.NewTimer(time.Second)
 			select {
 			case <-doneCh:
-				timer.Stop()
 				return
-			case <-timer.C:
+			case <-time.After(time.Second):
 			}
 
 			resp, _ := c.Logical().Read(fmt.Sprintf("auth/%s/verify/%s", mount, nonce))
diff --git a/builtin/credential/okta/cmd/okta/main.go b/builtin/credential/okta/cmd/okta/main.go
index e28b34a016c8c..e2452ba4b8ad9 100644
--- a/builtin/credential/okta/cmd/okta/main.go
+++ b/builtin/credential/okta/cmd/okta/main.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package main
 
 import (
@@ -20,11 +17,9 @@ func main() {
 	tlsConfig := apiClientMeta.GetTLSConfig()
 	tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig)
 
-	if err := plugin.ServeMultiplex(&plugin.ServeOpts{
+	if err := plugin.Serve(&plugin.ServeOpts{
 		BackendFactoryFunc: okta.Factory,
-		// set the TLSProviderFunc so that the plugin maintains backwards
-		// compatibility with Vault versions that don’t support plugin AutoMTLS
-		TLSProviderFunc: tlsProviderFunc,
+		TLSProviderFunc:    tlsProviderFunc,
 	}); err != nil {
 		logger := hclog.New(&hclog.LoggerOptions{})
 
diff --git a/builtin/credential/okta/path_config.go b/builtin/credential/okta/path_config.go
index 045d4fdb37792..7fc93efb87c7d 100644
--- a/builtin/credential/okta/path_config.go
+++ b/builtin/credential/okta/path_config.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package okta
 
 import (
@@ -27,12 +24,6 @@ const (
 func pathConfig(b *backend) *framework.Path {
 	p := &framework.Path{
 		Pattern: `config`,
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixOkta,
-			Action:          "Configure",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"organization": {
 				Type:        framework.TypeString,
@@ -89,30 +80,18 @@ func pathConfig(b *backend) *framework.Path {
 			},
 		},
 
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.ReadOperation: &framework.PathOperation{
-				Callback: b.pathConfigRead,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationSuffix: "configuration",
-				},
-			},
-			logical.CreateOperation: &framework.PathOperation{
-				Callback: b.pathConfigWrite,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb: "configure",
-				},
-			},
-			logical.UpdateOperation: &framework.PathOperation{
-				Callback: b.pathConfigWrite,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb: "configure",
-				},
-			},
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.ReadOperation:   b.pathConfigRead,
+			logical.CreateOperation: b.pathConfigWrite,
+			logical.UpdateOperation: b.pathConfigWrite,
 		},
 
 		ExistenceCheck: b.pathConfigExistenceCheck,
 
 		HelpSynopsis: pathConfigHelp,
+		DisplayAttrs: &framework.DisplayAttributes{
+			Action: "Configure",
+		},
 	}
 
 	tokenutil.AddTokenFields(p.Fields)
diff --git a/builtin/credential/okta/path_groups.go b/builtin/credential/okta/path_groups.go
index 753c1cacdd517..f9ff0225ac98c 100644
--- a/builtin/credential/okta/path_groups.go
+++ b/builtin/credential/okta/path_groups.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package okta
 
 import (
@@ -16,33 +13,22 @@ func pathGroupsList(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "groups/?$",
 
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixOkta,
-			OperationSuffix: "groups",
-			Navigation:      true,
-			ItemType:        "Group",
-		},
-
 		Callbacks: map[logical.Operation]framework.OperationFunc{
 			logical.ListOperation: b.pathGroupList,
 		},
 
 		HelpSynopsis:    pathGroupHelpSyn,
 		HelpDescription: pathGroupHelpDesc,
+		DisplayAttrs: &framework.DisplayAttributes{
+			Navigation: true,
+			ItemType:   "Group",
+		},
 	}
 }
 
 func pathGroups(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: `groups/(?P<name>.+)`,
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixOkta,
-			OperationSuffix: "group",
-			Action:          "Create",
-			ItemType:        "Group",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"name": {
 				Type:        framework.TypeString,
@@ -52,9 +38,6 @@ func pathGroups(b *backend) *framework.Path {
 			"policies": {
 				Type:        framework.TypeCommaStringSlice,
 				Description: "Comma-separated list of policies associated to the group.",
-				DisplayAttrs: &framework.DisplayAttributes{
-					Description: "A list of policies associated to the group.",
-				},
 			},
 		},
 
@@ -66,6 +49,10 @@ func pathGroups(b *backend) *framework.Path {
 
 		HelpSynopsis:    pathGroupHelpSyn,
 		HelpDescription: pathGroupHelpDesc,
+		DisplayAttrs: &framework.DisplayAttributes{
+			Action:   "Create",
+			ItemType: "Group",
+		},
 	}
 }
 
diff --git a/builtin/credential/okta/path_groups_test.go b/builtin/credential/okta/path_groups_test.go
index 8e4ba8cc2d5d6..84253f379fd8a 100644
--- a/builtin/credential/okta/path_groups_test.go
+++ b/builtin/credential/okta/path_groups_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package okta
 
 import (
diff --git a/builtin/credential/okta/path_login.go b/builtin/credential/okta/path_login.go
index 1f2cb090a76c5..0f8967576bb7c 100644
--- a/builtin/credential/okta/path_login.go
+++ b/builtin/credential/okta/path_login.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package okta
 
 import (
@@ -23,12 +20,6 @@ const (
 func pathLogin(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: `login/(?P<username>.+)`,
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixOkta,
-			OperationVerb:   "login",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"username": {
 				Type:        framework.TypeString,
@@ -198,10 +189,6 @@ func (b *backend) pathLoginRenew(ctx context.Context, req *logical.Request, d *f
 func pathVerify(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: `verify/(?P<nonce>.+)`,
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixOkta,
-			OperationVerb:   "verify",
-		},
 		Fields: map[string]*framework.FieldSchema{
 			"nonce": {
 				Type: framework.TypeString,
diff --git a/builtin/credential/okta/path_users.go b/builtin/credential/okta/path_users.go
index 3c38e855548b3..bd5fdc0ebbe0d 100644
--- a/builtin/credential/okta/path_users.go
+++ b/builtin/credential/okta/path_users.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package okta
 
 import (
@@ -14,33 +11,22 @@ func pathUsersList(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "users/?$",
 
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixOkta,
-			OperationSuffix: "users",
-			Navigation:      true,
-			ItemType:        "User",
-		},
-
 		Callbacks: map[logical.Operation]framework.OperationFunc{
 			logical.ListOperation: b.pathUserList,
 		},
 
 		HelpSynopsis:    pathUserHelpSyn,
 		HelpDescription: pathUserHelpDesc,
+		DisplayAttrs: &framework.DisplayAttributes{
+			Navigation: true,
+			ItemType:   "User",
+		},
 	}
 }
 
 func pathUsers(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: `users/(?P<name>.+)`,
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixOkta,
-			OperationSuffix: "user",
-			Action:          "Create",
-			ItemType:        "User",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"name": {
 				Type:        framework.TypeString,
@@ -66,6 +52,10 @@ func pathUsers(b *backend) *framework.Path {
 
 		HelpSynopsis:    pathUserHelpSyn,
 		HelpDescription: pathUserHelpDesc,
+		DisplayAttrs: &framework.DisplayAttributes{
+			Action:   "Create",
+			ItemType: "User",
+		},
 	}
 }
 
diff --git a/builtin/credential/radius/backend.go b/builtin/credential/radius/backend.go
index 3ec37a6fe634d..03da06efd9bbf 100644
--- a/builtin/credential/radius/backend.go
+++ b/builtin/credential/radius/backend.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package radius
 
 import (
@@ -10,8 +7,6 @@ import (
 	"github.com/hashicorp/vault/sdk/logical"
 )
 
-const operationPrefixRadius = "radius"
-
 func Factory(ctx context.Context, conf *logical.BackendConfig) (logical.Backend, error) {
 	b := Backend()
 	if err := b.Setup(ctx, conf); err != nil {
diff --git a/builtin/credential/radius/backend_test.go b/builtin/credential/radius/backend_test.go
index 9e9567f470645..de90b3b79d6e9 100644
--- a/builtin/credential/radius/backend_test.go
+++ b/builtin/credential/radius/backend_test.go
@@ -1,22 +1,21 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package radius
 
 import (
 	"context"
 	"fmt"
+	"io"
 	"os"
 	"reflect"
-	"runtime"
 	"strconv"
 	"strings"
 	"testing"
 	"time"
 
+	"github.com/hashicorp/vault/helper/testhelpers/docker"
 	logicaltest "github.com/hashicorp/vault/helper/testhelpers/logical"
-	"github.com/hashicorp/vault/sdk/helper/docker"
 	"github.com/hashicorp/vault/sdk/logical"
+
+	"github.com/docker/docker/api/types"
 )
 
 const (
@@ -31,15 +30,40 @@ const (
 )
 
 func prepareRadiusTestContainer(t *testing.T) (func(), string, int) {
-	if strings.Contains(runtime.GOARCH, "arm") {
-		t.Skip("Skipping, as this image is not supported on ARM architectures")
-	}
-
 	if os.Getenv(envRadiusRadiusHost) != "" {
 		port, _ := strconv.Atoi(os.Getenv(envRadiusPort))
 		return func() {}, os.Getenv(envRadiusRadiusHost), port
 	}
 
+	radiusdOptions := []string{"radiusd", "-f", "-l", "stdout", "-X"}
+	runner, err := docker.NewServiceRunner(docker.RunOptions{
+		ImageRepo:     "jumanjiman/radiusd",
+		ImageTag:      "latest",
+		ContainerName: "radiusd",
+		// Switch the entry point for this operation; we want to sleep
+		// instead of exec'ing radiusd, as we first need to write a new
+		// client configuration. radiusd's SIGHUP handler does not reload
+		// this config file, hence we choose to manually start radiusd
+		// below.
+		Entrypoint: []string{"sleep", "3600"},
+		Ports:      []string{"1812/udp"},
+		LogConsumer: func(s string) {
+			if t.Failed() {
+				t.Logf("container logs: %s", s)
+			}
+		},
+	})
+	if err != nil {
+		t.Fatalf("Could not start docker radiusd: %s", err)
+	}
+
+	svc, err := runner.StartService(context.Background(), func(ctx context.Context, host string, port int) (docker.ServiceConfig, error) {
+		return docker.NewServiceHostPort(host, port), nil
+	})
+	if err != nil {
+		t.Fatalf("Could not start docker radiusd: %s", err)
+	}
+
 	// Now allow any client to connect to this radiusd instance by writing our
 	// own clients.conf file.
 	//
@@ -50,8 +74,7 @@ func prepareRadiusTestContainer(t *testing.T) (func(), string, int) {
 	//
 	// See also: https://freeradius.org/radiusd/man/clients.conf.html
 	ctx := context.Background()
-	clientsConfig := `
-client 0.0.0.0/1 {
+	clientsConfig := `client 0.0.0.0/1 {
  ipaddr = 0.0.0.0/1
  secret = testing123
  shortname = all-clients-first
@@ -61,55 +84,45 @@ client 128.0.0.0/1 {
  ipaddr = 128.0.0.0/1
  secret = testing123
  shortname = all-clients-second
-}
-`
-
-	containerfile := `
-FROM docker.mirror.hashicorp.services/jumanjiman/radiusd:latest
-
-COPY clients.conf /etc/raddb/clients.conf
-`
-
-	bCtx := docker.NewBuildContext()
-	bCtx["clients.conf"] = docker.PathContentsFromBytes([]byte(clientsConfig))
-
-	imageName := "vault_radiusd_any_client"
-	imageTag := "latest"
-
-	runner, err := docker.NewServiceRunner(docker.RunOptions{
-		ImageRepo:     imageName,
-		ImageTag:      imageTag,
-		ContainerName: "radiusd",
-		Cmd:           []string{"-f", "-l", "stdout", "-X"},
-		Ports:         []string{"1812/udp"},
-		LogConsumer: func(s string) {
-			if t.Failed() {
-				t.Logf("container logs: %s", s)
-			}
-		},
+}`
+	ret, err := runner.DockerAPI.ContainerExecCreate(ctx, svc.Container.ID, types.ExecConfig{
+		User:         "0",
+		AttachStderr: true,
+		AttachStdout: true,
+		// Hack: write this via echo, since it exists in the container.
+		Cmd: []string{"sh", "-c", "echo '" + clientsConfig + "' > /etc/raddb/clients.conf"},
 	})
 	if err != nil {
-		t.Fatalf("Could not provision docker service runner: %s", err)
+		t.Fatalf("Failed to update radiusd client config: error creating command: %v", err)
 	}
-
-	output, err := runner.BuildImage(ctx, containerfile, bCtx,
-		docker.BuildRemove(true), docker.BuildForceRemove(true),
-		docker.BuildPullParent(true),
-		docker.BuildTags([]string{imageName + ":" + imageTag}))
+	resp, err := runner.DockerAPI.ContainerExecAttach(ctx, ret.ID, types.ExecStartCheck{})
 	if err != nil {
-		t.Fatalf("Could not build new image: %v", err)
+		t.Fatalf("Failed to update radiusd client config: error attaching command: %v", err)
 	}
-
-	t.Logf("Image build output: %v", string(output))
-
-	svc, err := runner.StartService(context.Background(), func(ctx context.Context, host string, port int) (docker.ServiceConfig, error) {
-		time.Sleep(2 * time.Second)
-		return docker.NewServiceHostPort(host, port), nil
+	read, err := io.ReadAll(resp.Reader)
+	t.Logf("Command Output (%v):\n%v", err, string(read))
+
+	ret, err = runner.DockerAPI.ContainerExecCreate(ctx, svc.Container.ID, types.ExecConfig{
+		User:         "0",
+		AttachStderr: true,
+		AttachStdout: true,
+		// As noted above, we need to start radiusd manually now.
+		Cmd: radiusdOptions,
 	})
 	if err != nil {
-		t.Fatalf("Could not start docker radiusd: %s", err)
+		t.Fatalf("Failed to start radiusd service: error creating command: %v", err)
+	}
+	err = runner.DockerAPI.ContainerExecStart(ctx, ret.ID, types.ExecStartCheck{})
+	if err != nil {
+		t.Fatalf("Failed to start radiusd service: error starting command: %v", err)
 	}
 
+	// Give radiusd time to start...
+	//
+	// There's no straightfoward way to check the state, but the server starts
+	// up quick so a 2 second sleep should be enough.
+	time.Sleep(2 * time.Second)
+
 	pieces := strings.Split(svc.Config.Address(), ":")
 	port, _ := strconv.Atoi(pieces[1])
 	return svc.Cleanup, pieces[0], port
diff --git a/builtin/credential/radius/cmd/radius/main.go b/builtin/credential/radius/cmd/radius/main.go
index b3045a31a1a73..9ab5a636948c7 100644
--- a/builtin/credential/radius/cmd/radius/main.go
+++ b/builtin/credential/radius/cmd/radius/main.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package main
 
 import (
@@ -20,11 +17,9 @@ func main() {
 	tlsConfig := apiClientMeta.GetTLSConfig()
 	tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig)
 
-	if err := plugin.ServeMultiplex(&plugin.ServeOpts{
+	if err := plugin.Serve(&plugin.ServeOpts{
 		BackendFactoryFunc: radius.Factory,
-		// set the TLSProviderFunc so that the plugin maintains backwards
-		// compatibility with Vault versions that don’t support plugin AutoMTLS
-		TLSProviderFunc: tlsProviderFunc,
+		TLSProviderFunc:    tlsProviderFunc,
 	}); err != nil {
 		logger := hclog.New(&hclog.LoggerOptions{})
 
diff --git a/builtin/credential/radius/path_config.go b/builtin/credential/radius/path_config.go
index 6bdc2967361d2..33d4d0d99175d 100644
--- a/builtin/credential/radius/path_config.go
+++ b/builtin/credential/radius/path_config.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package radius
 
 import (
@@ -15,12 +12,6 @@ import (
 func pathConfig(b *backend) *framework.Path {
 	p := &framework.Path{
 		Pattern: "config",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixRadius,
-			Action:          "Configure",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"host": {
 				Type:        framework.TypeString,
@@ -44,10 +35,9 @@ func pathConfig(b *backend) *framework.Path {
 			"unregistered_user_policies": {
 				Type:        framework.TypeString,
 				Default:     "",
-				Description: "Comma-separated list of policies to grant upon successful RADIUS authentication of an unregistered user (default: empty)",
+				Description: "Comma-separated list of policies to grant upon successful RADIUS authentication of an unregisted user (default: empty)",
 				DisplayAttrs: &framework.DisplayAttributes{
-					Name:        "Policies for unregistered users",
-					Description: "List of policies to grant upon successful RADIUS authentication of an unregistered user (default: empty)",
+					Name: "Policies for unregistered users",
 				},
 			},
 			"dial_timeout": {
@@ -87,29 +77,17 @@ func pathConfig(b *backend) *framework.Path {
 
 		ExistenceCheck: b.configExistenceCheck,
 
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.ReadOperation: &framework.PathOperation{
-				Callback: b.pathConfigRead,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationSuffix: "configuration",
-				},
-			},
-			logical.CreateOperation: &framework.PathOperation{
-				Callback: b.pathConfigCreateUpdate,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb: "configure",
-				},
-			},
-			logical.UpdateOperation: &framework.PathOperation{
-				Callback: b.pathConfigCreateUpdate,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb: "configure",
-				},
-			},
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.ReadOperation:   b.pathConfigRead,
+			logical.CreateOperation: b.pathConfigCreateUpdate,
+			logical.UpdateOperation: b.pathConfigCreateUpdate,
 		},
 
 		HelpSynopsis:    pathConfigHelpSyn,
 		HelpDescription: pathConfigHelpDesc,
+		DisplayAttrs: &framework.DisplayAttributes{
+			Action: "Configure",
+		},
 	}
 
 	tokenutil.AddTokenFields(p.Fields)
diff --git a/builtin/credential/radius/path_login.go b/builtin/credential/radius/path_login.go
index 6feaf1bfcaf40..c8a1ab8f43ed9 100644
--- a/builtin/credential/radius/path_login.go
+++ b/builtin/credential/radius/path_login.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package radius
 
 import (
@@ -23,13 +20,6 @@ import (
 func pathLogin(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "login" + framework.OptionalParamRegex("urlusername"),
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixRadius,
-			OperationVerb:   "login",
-			OperationSuffix: "|with-username",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"urlusername": {
 				Type:        framework.TypeString,
diff --git a/builtin/credential/radius/path_users.go b/builtin/credential/radius/path_users.go
index 63ac5bbc2e878..de7b5d4690e6e 100644
--- a/builtin/credential/radius/path_users.go
+++ b/builtin/credential/radius/path_users.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package radius
 
 import (
@@ -17,33 +14,22 @@ func pathUsersList(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "users/?$",
 
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixRadius,
-			OperationSuffix: "users",
-			Navigation:      true,
-			ItemType:        "User",
-		},
-
 		Callbacks: map[logical.Operation]framework.OperationFunc{
 			logical.ListOperation: b.pathUserList,
 		},
 
 		HelpSynopsis:    pathUserHelpSyn,
 		HelpDescription: pathUserHelpDesc,
+		DisplayAttrs: &framework.DisplayAttributes{
+			Navigation: true,
+			ItemType:   "User",
+		},
 	}
 }
 
 func pathUsers(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: `users/(?P<name>.+)`,
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixRadius,
-			OperationSuffix: "user",
-			Action:          "Create",
-			ItemType:        "User",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"name": {
 				Type:        framework.TypeString,
@@ -53,9 +39,6 @@ func pathUsers(b *backend) *framework.Path {
 			"policies": {
 				Type:        framework.TypeCommaStringSlice,
 				Description: "Comma-separated list of policies associated to the user.",
-				DisplayAttrs: &framework.DisplayAttributes{
-					Description: "A list of policies associated to the user.",
-				},
 			},
 		},
 
@@ -70,6 +53,10 @@ func pathUsers(b *backend) *framework.Path {
 
 		HelpSynopsis:    pathUserHelpSyn,
 		HelpDescription: pathUserHelpDesc,
+		DisplayAttrs: &framework.DisplayAttributes{
+			Action:   "Create",
+			ItemType: "User",
+		},
 	}
 }
 
diff --git a/builtin/credential/token/cli.go b/builtin/credential/token/cli.go
index 853d6eade7c45..64a88169cbe7e 100644
--- a/builtin/credential/token/cli.go
+++ b/builtin/credential/token/cli.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package token
 
 import (
diff --git a/builtin/credential/userpass/backend.go b/builtin/credential/userpass/backend.go
index 428e8b25ca766..aa45dc3766db2 100644
--- a/builtin/credential/userpass/backend.go
+++ b/builtin/credential/userpass/backend.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package userpass
 
 import (
@@ -10,8 +7,6 @@ import (
 	"github.com/hashicorp/vault/sdk/logical"
 )
 
-const operationPrefixUserpass = "userpass"
-
 func Factory(ctx context.Context, conf *logical.BackendConfig) (logical.Backend, error) {
 	b := Backend()
 	if err := b.Setup(ctx, conf); err != nil {
diff --git a/builtin/credential/userpass/backend_test.go b/builtin/credential/userpass/backend_test.go
index 3df8cfa2a9bb5..83f79db9a4e1e 100644
--- a/builtin/credential/userpass/backend_test.go
+++ b/builtin/credential/userpass/backend_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package userpass
 
 import (
diff --git a/builtin/credential/userpass/cli.go b/builtin/credential/userpass/cli.go
index e100ae9f244e5..092d0927ef1f8 100644
--- a/builtin/credential/userpass/cli.go
+++ b/builtin/credential/userpass/cli.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package userpass
 
 import (
diff --git a/builtin/credential/userpass/cmd/userpass/main.go b/builtin/credential/userpass/cmd/userpass/main.go
index 4747a56f44097..5ea1894d219e5 100644
--- a/builtin/credential/userpass/cmd/userpass/main.go
+++ b/builtin/credential/userpass/cmd/userpass/main.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package main
 
 import (
@@ -19,11 +16,9 @@ func main() {
 	tlsConfig := apiClientMeta.GetTLSConfig()
 	tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig)
 
-	if err := plugin.ServeMultiplex(&plugin.ServeOpts{
+	if err := plugin.Serve(&plugin.ServeOpts{
 		BackendFactoryFunc: userpass.Factory,
-		// set the TLSProviderFunc so that the plugin maintains backwards
-		// compatibility with Vault versions that don’t support plugin AutoMTLS
-		TLSProviderFunc: tlsProviderFunc,
+		TLSProviderFunc:    tlsProviderFunc,
 	}); err != nil {
 		logger := hclog.New(&hclog.LoggerOptions{})
 
diff --git a/builtin/credential/userpass/path_login.go b/builtin/credential/userpass/path_login.go
index 0565864471e02..95d63f28c6260 100644
--- a/builtin/credential/userpass/path_login.go
+++ b/builtin/credential/userpass/path_login.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package userpass
 
 import (
@@ -19,12 +16,6 @@ import (
 func pathLogin(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "login/" + framework.GenericNameRegex("username"),
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixUserpass,
-			OperationVerb:   "login",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"username": {
 				Type:        framework.TypeString,
@@ -48,7 +39,7 @@ func pathLogin(b *backend) *framework.Path {
 }
 
 func (b *backend) pathLoginAliasLookahead(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
-	username := d.Get("username").(string)
+	username := strings.ToLower(d.Get("username").(string))
 	if username == "" {
 		return nil, fmt.Errorf("missing username")
 	}
@@ -95,26 +86,14 @@ func (b *backend) pathLogin(ctx context.Context, req *logical.Request, d *framew
 	// Check for a password match. Check for a hash collision for Vault 0.2+,
 	// but handle the older legacy passwords with a constant time comparison.
 	passwordBytes := []byte(password)
-	switch {
-	case !legacyPassword:
+	if !legacyPassword {
 		if err := bcrypt.CompareHashAndPassword(userPassword, passwordBytes); err != nil {
-			// The failed login info of existing users alone are tracked as only
-			// existing user's failed login information is stored in storage for optimization
-			if user == nil || userError != nil {
-				return logical.ErrorResponse("invalid username or password"), nil
-			}
-			return logical.ErrorResponse("invalid username or password"), logical.ErrInvalidCredentials
+			return logical.ErrorResponse("invalid username or password"), nil
 		}
-	default:
+	} else {
 		if subtle.ConstantTimeCompare(userPassword, passwordBytes) != 1 {
-			// The failed login info of existing users alone are tracked as only
-			// existing user's failed login information is stored in storage for optimization
-			if user == nil || userError != nil {
-				return logical.ErrorResponse("invalid username or password"), nil
-			}
-			return logical.ErrorResponse("invalid username or password"), logical.ErrInvalidCredentials
+			return logical.ErrorResponse("invalid username or password"), nil
 		}
-
 	}
 
 	if userError != nil {
diff --git a/builtin/credential/userpass/path_user_password.go b/builtin/credential/userpass/path_user_password.go
index 63b52ca0ca1a4..5007497304789 100644
--- a/builtin/credential/userpass/path_user_password.go
+++ b/builtin/credential/userpass/path_user_password.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package userpass
 
 import (
@@ -16,13 +13,6 @@ import (
 func pathUserPassword(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "users/" + framework.GenericNameRegex("username") + "/password$",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixUserpass,
-			OperationVerb:   "reset",
-			OperationSuffix: "password",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"username": {
 				Type:        framework.TypeString,
diff --git a/builtin/credential/userpass/path_user_policies.go b/builtin/credential/userpass/path_user_policies.go
index 8c5a9174ae966..3c017253869e2 100644
--- a/builtin/credential/userpass/path_user_policies.go
+++ b/builtin/credential/userpass/path_user_policies.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package userpass
 
 import (
@@ -16,13 +13,6 @@ import (
 func pathUserPolicies(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "users/" + framework.GenericNameRegex("username") + "/policies$",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixUserpass,
-			OperationVerb:   "update",
-			OperationSuffix: "policies",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"username": {
 				Type:        framework.TypeString,
@@ -36,9 +26,6 @@ func pathUserPolicies(b *backend) *framework.Path {
 			"token_policies": {
 				Type:        framework.TypeCommaStringSlice,
 				Description: "Comma-separated list of policies",
-				DisplayAttrs: &framework.DisplayAttributes{
-					Description: "A list of policies that will apply to the generated token for this user.",
-				},
 			},
 		},
 
diff --git a/builtin/credential/userpass/path_users.go b/builtin/credential/userpass/path_users.go
index 221fc2c4fcbf3..7ec22c5fbd455 100644
--- a/builtin/credential/userpass/path_users.go
+++ b/builtin/credential/userpass/path_users.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package userpass
 
 import (
@@ -19,33 +16,22 @@ func pathUsersList(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "users/?",
 
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixUserpass,
-			OperationSuffix: "users",
-			Navigation:      true,
-			ItemType:        "User",
-		},
-
 		Callbacks: map[logical.Operation]framework.OperationFunc{
 			logical.ListOperation: b.pathUserList,
 		},
 
 		HelpSynopsis:    pathUserHelpSyn,
 		HelpDescription: pathUserHelpDesc,
+		DisplayAttrs: &framework.DisplayAttributes{
+			Navigation: true,
+			ItemType:   "User",
+		},
 	}
 }
 
 func pathUsers(b *backend) *framework.Path {
 	p := &framework.Path{
 		Pattern: "users/" + framework.GenericNameRegex("username"),
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixUserpass,
-			OperationSuffix: "user",
-			Action:          "Create",
-			ItemType:        "User",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"username": {
 				Type:        framework.TypeString,
@@ -96,6 +82,10 @@ func pathUsers(b *backend) *framework.Path {
 
 		HelpSynopsis:    pathUserHelpSyn,
 		HelpDescription: pathUserHelpDesc,
+		DisplayAttrs: &framework.DisplayAttributes{
+			Action:   "Create",
+			ItemType: "User",
+		},
 	}
 
 	tokenutil.AddTokenFields(p.Fields)
diff --git a/builtin/credential/userpass/stepwise_test.go b/builtin/credential/userpass/stepwise_test.go
index ab797ed200c96..90820b883d273 100644
--- a/builtin/credential/userpass/stepwise_test.go
+++ b/builtin/credential/userpass/stepwise_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package userpass
 
 import (
@@ -19,7 +16,7 @@ func TestAccBackend_stepwise_UserCrud(t *testing.T) {
 	customPluginName := "my-userpass"
 	envOptions := &stepwise.MountOptions{
 		RegistryName:    customPluginName,
-		PluginType:      api.PluginTypeCredential,
+		PluginType:      stepwise.PluginTypeCredential,
 		PluginName:      "userpass",
 		MountPathPrefix: customPluginName,
 	}
diff --git a/builtin/logical/aws/backend.go b/builtin/logical/aws/backend.go
index d93c394f98fd1..9c5abe1e82e80 100644
--- a/builtin/logical/aws/backend.go
+++ b/builtin/logical/aws/backend.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package aws
 
 import (
@@ -12,29 +9,24 @@ import (
 	"github.com/aws/aws-sdk-go/service/iam/iamiface"
 	"github.com/aws/aws-sdk-go/service/sts/stsiface"
 	"github.com/hashicorp/vault/sdk/framework"
-	"github.com/hashicorp/vault/sdk/helper/consts"
 	"github.com/hashicorp/vault/sdk/logical"
-	"github.com/hashicorp/vault/sdk/queue"
 )
 
 const (
 	rootConfigPath        = "config/root"
 	minAwsUserRollbackAge = 5 * time.Minute
-	operationPrefixAWS    = "aws"
-	operationPrefixAWSASD = "aws-config"
 )
 
 func Factory(ctx context.Context, conf *logical.BackendConfig) (logical.Backend, error) {
-	b := Backend(conf)
+	b := Backend()
 	if err := b.Setup(ctx, conf); err != nil {
 		return nil, err
 	}
 	return b, nil
 }
 
-func Backend(conf *logical.BackendConfig) *backend {
+func Backend() *backend {
 	var b backend
-	b.credRotationQueue = queue.New()
 	b.Backend = &framework.Backend{
 		Help: strings.TrimSpace(backendHelp),
 
@@ -43,8 +35,7 @@ func Backend(conf *logical.BackendConfig) *backend {
 				framework.WALPrefix,
 			},
 			SealWrapStorage: []string{
-				rootConfigPath,
-				pathStaticCreds + "/",
+				"config/root",
 			},
 		},
 
@@ -54,8 +45,6 @@ func Backend(conf *logical.BackendConfig) *backend {
 			pathConfigLease(&b),
 			pathRoles(&b),
 			pathListRoles(&b),
-			pathStaticRoles(&b),
-			pathStaticCredentials(&b),
 			pathUser(&b),
 		},
 
@@ -66,17 +55,7 @@ func Backend(conf *logical.BackendConfig) *backend {
 		Invalidate:        b.invalidate,
 		WALRollback:       b.walRollback,
 		WALRollbackMinAge: minAwsUserRollbackAge,
-		PeriodicFunc: func(ctx context.Context, req *logical.Request) error {
-			repState := conf.System.ReplicationState()
-			if (conf.System.LocalMount() ||
-				!repState.HasState(consts.ReplicationPerformanceSecondary)) &&
-				!repState.HasState(consts.ReplicationDRSecondary) &&
-				!repState.HasState(consts.ReplicationPerformanceStandby) {
-				return b.rotateExpiredStaticCreds(ctx, req)
-			}
-			return nil
-		},
-		BackendType: logical.TypeLogical,
+		BackendType:       logical.TypeLogical,
 	}
 
 	return &b
@@ -95,10 +74,6 @@ type backend struct {
 	// to enable mocking with AWS iface for tests
 	iamClient iamiface.IAMAPI
 	stsClient stsiface.STSAPI
-
-	// the age of a static role's credential is tracked by a priority queue and handled
-	// by the PeriodicFunc
-	credRotationQueue *queue.PriorityQueue
 }
 
 const backendHelp = `
diff --git a/builtin/logical/aws/backend_test.go b/builtin/logical/aws/backend_test.go
index 260bcc6d645b7..4ca6e66c916d2 100644
--- a/builtin/logical/aws/backend_test.go
+++ b/builtin/logical/aws/backend_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package aws
 
 import (
@@ -15,11 +12,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/aws/aws-sdk-go-v2/config"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/aws/credentials"
-	"github.com/aws/aws-sdk-go/aws/request"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/dynamodb"
 	"github.com/aws/aws-sdk-go/service/ec2"
@@ -40,7 +35,7 @@ type mockIAMClient struct {
 	iamiface.IAMAPI
 }
 
-func (m *mockIAMClient) CreateUserWithContext(_ aws.Context, input *iam.CreateUserInput, _ ...request.Option) (*iam.CreateUserOutput, error) {
+func (m *mockIAMClient) CreateUser(input *iam.CreateUserInput) (*iam.CreateUserOutput, error) {
 	return nil, awserr.New("Throttling", "", nil)
 }
 
@@ -148,7 +143,7 @@ func TestBackend_throttled(t *testing.T) {
 	config := logical.TestBackendConfig()
 	config.StorageView = &logical.InmemStorage{}
 
-	b := Backend(config)
+	b := Backend()
 	if err := b.Setup(context.Background(), config); err != nil {
 		t.Fatal(err)
 	}
@@ -200,10 +195,6 @@ func TestBackend_throttled(t *testing.T) {
 }
 
 func testAccPreCheck(t *testing.T) {
-	if !hasAWSCredentials() {
-		t.Skip("Skipping because AWS credentials could not be resolved. See https://docs.aws.amazon.com/sdk-for-go/v1/developer-guide/configuring-sdk.html#specifying-credentials for information on how to set up AWS credentials.")
-	}
-
 	initSetup.Do(func() {
 		if v := os.Getenv("AWS_DEFAULT_REGION"); v == "" {
 			log.Println("[INFO] Test: Using us-west-2 as test region")
@@ -212,23 +203,6 @@ func testAccPreCheck(t *testing.T) {
 	})
 }
 
-func hasAWSCredentials() bool {
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-	defer cancel()
-
-	cfg, err := config.LoadDefaultConfig(ctx)
-	if err != nil {
-		return false
-	}
-
-	creds, err := cfg.Credentials.Retrieve(ctx)
-	if err != nil {
-		return false
-	}
-
-	return creds.HasKeys()
-}
-
 func getAccountID() (string, error) {
 	awsConfig := &aws.Config{
 		Region:     aws.String("us-east-1"),
@@ -261,11 +235,8 @@ func createRole(t *testing.T, roleName, awsAccountID string, policyARNs []string
               "Principal": {
                   "AWS": "arn:aws:iam::%s:root"
               },
-              "Action": [
-                  "sts:AssumeRole",
-                  "sts:SetSourceIdentity"
-              ]
-          }
+              "Action": "sts:AssumeRole"
+           }
       ]
 }
 `
@@ -684,7 +655,7 @@ func testAccStepRead(t *testing.T, path, name string, credentialTests []credenti
 	}
 }
 
-func testAccStepReadSTSResponse(name string, maximumTTL time.Duration) logicaltest.TestStep {
+func testAccStepReadTTL(name string, maximumTTL time.Duration) logicaltest.TestStep {
 	return logicaltest.TestStep{
 		Operation: logical.ReadOperation,
 		Path:      "creds/" + name,
@@ -1345,7 +1316,7 @@ func TestAcceptanceBackend_RoleDefaultSTSTTL(t *testing.T) {
 		Steps: []logicaltest.TestStep{
 			testAccStepConfig(t),
 			testAccStepWriteRole(t, "test", roleData),
-			testAccStepReadSTSResponse("test", time.Duration(minAwsAssumeRoleDuration)*time.Second), // allow a little slack
+			testAccStepReadTTL("test", time.Duration(minAwsAssumeRoleDuration)*time.Second), // allow a little slack
 		},
 		Teardown: func() error {
 			return deleteTestRole(roleName)
diff --git a/builtin/logical/aws/client.go b/builtin/logical/aws/client.go
index 71d24f3abb2e8..80d839ed55edf 100644
--- a/builtin/logical/aws/client.go
+++ b/builtin/logical/aws/client.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package aws
 
 import (
diff --git a/builtin/logical/aws/cmd/aws/main.go b/builtin/logical/aws/cmd/aws/main.go
index 28de1eb3f8d93..74f7d97a7b868 100644
--- a/builtin/logical/aws/cmd/aws/main.go
+++ b/builtin/logical/aws/cmd/aws/main.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package main
 
 import (
@@ -20,11 +17,9 @@ func main() {
 	tlsConfig := apiClientMeta.GetTLSConfig()
 	tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig)
 
-	if err := plugin.ServeMultiplex(&plugin.ServeOpts{
+	if err := plugin.Serve(&plugin.ServeOpts{
 		BackendFactoryFunc: aws.Factory,
-		// set the TLSProviderFunc so that the plugin maintains backwards
-		// compatibility with Vault versions that don’t support plugin AutoMTLS
-		TLSProviderFunc: tlsProviderFunc,
+		TLSProviderFunc:    tlsProviderFunc,
 	}); err != nil {
 		logger := hclog.New(&hclog.LoggerOptions{})
 
diff --git a/builtin/logical/aws/iam_policies.go b/builtin/logical/aws/iam_policies.go
index 002a7389eb161..caf79e33d310b 100644
--- a/builtin/logical/aws/iam_policies.go
+++ b/builtin/logical/aws/iam_policies.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package aws
 
 import (
@@ -73,7 +70,7 @@ func (b *backend) getGroupPolicies(ctx context.Context, s logical.Storage, iamGr
 
 	for _, g := range iamGroups {
 		// Collect managed policy ARNs from the IAM Group
-		agp, err = iamClient.ListAttachedGroupPoliciesWithContext(ctx, &iam.ListAttachedGroupPoliciesInput{
+		agp, err = iamClient.ListAttachedGroupPolicies(&iam.ListAttachedGroupPoliciesInput{
 			GroupName: aws.String(g),
 		})
 		if err != nil {
@@ -84,14 +81,14 @@ func (b *backend) getGroupPolicies(ctx context.Context, s logical.Storage, iamGr
 		}
 
 		// Collect inline policy names from the IAM Group
-		inlinePolicies, err = iamClient.ListGroupPoliciesWithContext(ctx, &iam.ListGroupPoliciesInput{
+		inlinePolicies, err = iamClient.ListGroupPolicies(&iam.ListGroupPoliciesInput{
 			GroupName: aws.String(g),
 		})
 		if err != nil {
 			return nil, nil, err
 		}
 		for _, iP := range inlinePolicies.PolicyNames {
-			inlinePolicyDoc, err = iamClient.GetGroupPolicyWithContext(ctx, &iam.GetGroupPolicyInput{
+			inlinePolicyDoc, err = iamClient.GetGroupPolicy(&iam.GetGroupPolicyInput{
 				GroupName:  &g,
 				PolicyName: iP,
 			})
diff --git a/builtin/logical/aws/iam_policies_test.go b/builtin/logical/aws/iam_policies_test.go
index 7f8f96adb87ca..ddba67f6b8bdc 100644
--- a/builtin/logical/aws/iam_policies_test.go
+++ b/builtin/logical/aws/iam_policies_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package aws
 
 import (
@@ -8,7 +5,6 @@ import (
 	"testing"
 
 	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/request"
 	"github.com/aws/aws-sdk-go/service/iam"
 	"github.com/aws/aws-sdk-go/service/iam/iamiface"
 	"github.com/hashicorp/vault/sdk/logical"
@@ -30,15 +26,15 @@ type mockGroupIAMClient struct {
 	GetGroupPolicyResp            iam.GetGroupPolicyOutput
 }
 
-func (m mockGroupIAMClient) ListAttachedGroupPoliciesWithContext(_ aws.Context, in *iam.ListAttachedGroupPoliciesInput, _ ...request.Option) (*iam.ListAttachedGroupPoliciesOutput, error) {
+func (m mockGroupIAMClient) ListAttachedGroupPolicies(in *iam.ListAttachedGroupPoliciesInput) (*iam.ListAttachedGroupPoliciesOutput, error) {
 	return &m.ListAttachedGroupPoliciesResp, nil
 }
 
-func (m mockGroupIAMClient) ListGroupPoliciesWithContext(_ aws.Context, in *iam.ListGroupPoliciesInput, _ ...request.Option) (*iam.ListGroupPoliciesOutput, error) {
+func (m mockGroupIAMClient) ListGroupPolicies(in *iam.ListGroupPoliciesInput) (*iam.ListGroupPoliciesOutput, error) {
 	return &m.ListGroupPoliciesResp, nil
 }
 
-func (m mockGroupIAMClient) GetGroupPolicyWithContext(_ aws.Context, in *iam.GetGroupPolicyInput, _ ...request.Option) (*iam.GetGroupPolicyOutput, error) {
+func (m mockGroupIAMClient) GetGroupPolicy(in *iam.GetGroupPolicyInput) (*iam.GetGroupPolicyOutput, error) {
 	return &m.GetGroupPolicyResp, nil
 }
 
@@ -141,7 +137,7 @@ func Test_getGroupPolicies(t *testing.T) {
 			config := logical.TestBackendConfig()
 			config.StorageView = &logical.InmemStorage{}
 
-			b := Backend(config)
+			b := Backend()
 			if err := b.Setup(context.Background(), config); err != nil {
 				t.Fatal(err)
 			}
diff --git a/builtin/logical/aws/path_config_lease.go b/builtin/logical/aws/path_config_lease.go
index 1b01388a3b8a6..b953b2305e3c6 100644
--- a/builtin/logical/aws/path_config_lease.go
+++ b/builtin/logical/aws/path_config_lease.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package aws
 
 import (
@@ -15,11 +12,6 @@ import (
 func pathConfigLease(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "config/lease",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixAWS,
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"lease": {
 				Type:        framework.TypeString,
@@ -32,20 +24,9 @@ func pathConfigLease(b *backend) *framework.Path {
 			},
 		},
 
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.ReadOperation: &framework.PathOperation{
-				Callback: b.pathLeaseRead,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationSuffix: "lease-configuration",
-				},
-			},
-			logical.UpdateOperation: &framework.PathOperation{
-				Callback: b.pathLeaseWrite,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb:   "configure",
-					OperationSuffix: "lease",
-				},
-			},
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.ReadOperation:   b.pathLeaseRead,
+			logical.UpdateOperation: b.pathLeaseWrite,
 		},
 
 		HelpSynopsis:    pathConfigLeaseHelpSyn,
diff --git a/builtin/logical/aws/path_config_root.go b/builtin/logical/aws/path_config_root.go
index bd6c09e0e5e3b..1262980fa8066 100644
--- a/builtin/logical/aws/path_config_root.go
+++ b/builtin/logical/aws/path_config_root.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package aws
 
 import (
@@ -17,11 +14,6 @@ const defaultUserNameTemplate = `{{ if (eq .Type "STS") }}{{ printf "vault-%s-%s
 func pathConfigRoot(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "config/root",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixAWS,
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"access_key": {
 				Type:        framework.TypeString,
@@ -56,20 +48,9 @@ func pathConfigRoot(b *backend) *framework.Path {
 			},
 		},
 
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.ReadOperation: &framework.PathOperation{
-				Callback: b.pathConfigRootRead,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationSuffix: "root-iam-credentials-configuration",
-				},
-			},
-			logical.UpdateOperation: &framework.PathOperation{
-				Callback: b.pathConfigRootWrite,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb:   "configure",
-					OperationSuffix: "root-iam-credentials",
-				},
-			},
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.ReadOperation:   b.pathConfigRootRead,
+			logical.UpdateOperation: b.pathConfigRootWrite,
 		},
 
 		HelpSynopsis:    pathConfigRootHelpSyn,
diff --git a/builtin/logical/aws/path_config_root_test.go b/builtin/logical/aws/path_config_root_test.go
index a007064904179..d90ee6cacb38d 100644
--- a/builtin/logical/aws/path_config_root_test.go
+++ b/builtin/logical/aws/path_config_root_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package aws
 
 import (
@@ -15,7 +12,7 @@ func TestBackend_PathConfigRoot(t *testing.T) {
 	config := logical.TestBackendConfig()
 	config.StorageView = &logical.InmemStorage{}
 
-	b := Backend(config)
+	b := Backend()
 	if err := b.Setup(context.Background(), config); err != nil {
 		t.Fatal(err)
 	}
diff --git a/builtin/logical/aws/path_config_rotate_root.go b/builtin/logical/aws/path_config_rotate_root.go
index 0434d22e54c8c..1f7ca31133661 100644
--- a/builtin/logical/aws/path_config_rotate_root.go
+++ b/builtin/logical/aws/path_config_rotate_root.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package aws
 
 import (
@@ -16,13 +13,6 @@ import (
 func pathConfigRotateRoot(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "config/rotate-root",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixAWS,
-			OperationSuffix: "root-iam-credentials",
-			OperationVerb:   "rotate",
-		},
-
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.UpdateOperation: &framework.PathOperation{
 				Callback:                    b.pathConfigRotateRootUpdate,
@@ -66,7 +56,7 @@ func (b *backend) pathConfigRotateRootUpdate(ctx context.Context, req *logical.R
 	}
 
 	var getUserInput iam.GetUserInput // empty input means get current user
-	getUserRes, err := client.GetUserWithContext(ctx, &getUserInput)
+	getUserRes, err := client.GetUser(&getUserInput)
 	if err != nil {
 		return nil, fmt.Errorf("error calling GetUser: %w", err)
 	}
@@ -83,7 +73,7 @@ func (b *backend) pathConfigRotateRootUpdate(ctx context.Context, req *logical.R
 	createAccessKeyInput := iam.CreateAccessKeyInput{
 		UserName: getUserRes.User.UserName,
 	}
-	createAccessKeyRes, err := client.CreateAccessKeyWithContext(ctx, &createAccessKeyInput)
+	createAccessKeyRes, err := client.CreateAccessKey(&createAccessKeyInput)
 	if err != nil {
 		return nil, fmt.Errorf("error calling CreateAccessKey: %w", err)
 	}
@@ -114,7 +104,7 @@ func (b *backend) pathConfigRotateRootUpdate(ctx context.Context, req *logical.R
 		AccessKeyId: aws.String(oldAccessKey),
 		UserName:    getUserRes.User.UserName,
 	}
-	_, err = client.DeleteAccessKeyWithContext(ctx, &deleteAccessKeyInput)
+	_, err = client.DeleteAccessKey(&deleteAccessKeyInput)
 	if err != nil {
 		return nil, fmt.Errorf("error deleting old access key: %w", err)
 	}
diff --git a/builtin/logical/aws/path_roles.go b/builtin/logical/aws/path_roles.go
index 67545e641434d..a7c3dd84a8967 100644
--- a/builtin/logical/aws/path_roles.go
+++ b/builtin/logical/aws/path_roles.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package aws
 
 import (
@@ -27,11 +24,6 @@ func pathListRoles(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "roles/?$",
 
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixAWS,
-			OperationSuffix: "roles",
-		},
-
 		Callbacks: map[logical.Operation]framework.OperationFunc{
 			logical.ListOperation: b.pathRoleList,
 		},
@@ -44,18 +36,12 @@ func pathListRoles(b *backend) *framework.Path {
 func pathRoles(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "roles/" + framework.GenericNameWithAtRegex("name"),
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixAWS,
-			OperationSuffix: "role",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"name": {
 				Type:        framework.TypeString,
-				Description: "Name of the role",
+				Description: "Name of the policy",
 				DisplayAttrs: &framework.DisplayAttributes{
-					Name: "Role Name",
+					Name: "Policy Name",
 				},
 			},
 
diff --git a/builtin/logical/aws/path_roles_test.go b/builtin/logical/aws/path_roles_test.go
index c5bf167866cc9..39c9d90811fc4 100644
--- a/builtin/logical/aws/path_roles_test.go
+++ b/builtin/logical/aws/path_roles_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package aws
 
 import (
@@ -21,7 +18,7 @@ func TestBackend_PathListRoles(t *testing.T) {
 	config := logical.TestBackendConfig()
 	config.StorageView = &logical.InmemStorage{}
 
-	b := Backend(config)
+	b := Backend()
 	if err := b.Setup(context.Background(), config); err != nil {
 		t.Fatal(err)
 	}
@@ -224,7 +221,7 @@ func TestRoleCRUDWithPermissionsBoundary(t *testing.T) {
 	config := logical.TestBackendConfig()
 	config.StorageView = &logical.InmemStorage{}
 
-	b := Backend(config)
+	b := Backend()
 	if err := b.Setup(context.Background(), config); err != nil {
 		t.Fatal(err)
 	}
@@ -268,7 +265,7 @@ func TestRoleWithPermissionsBoundaryValidation(t *testing.T) {
 	config := logical.TestBackendConfig()
 	config.StorageView = &logical.InmemStorage{}
 
-	b := Backend(config)
+	b := Backend()
 	if err := b.Setup(context.Background(), config); err != nil {
 		t.Fatal(err)
 	}
diff --git a/builtin/logical/aws/path_static_creds.go b/builtin/logical/aws/path_static_creds.go
deleted file mode 100644
index 119f5d0b3debd..0000000000000
--- a/builtin/logical/aws/path_static_creds.go
+++ /dev/null
@@ -1,99 +0,0 @@
-package aws
-
-import (
-	"context"
-	"fmt"
-	"net/http"
-
-	"github.com/fatih/structs"
-	"github.com/hashicorp/vault/sdk/framework"
-	"github.com/hashicorp/vault/sdk/logical"
-)
-
-const (
-	pathStaticCreds = "static-creds"
-
-	paramAccessKeyID      = "access_key"
-	paramSecretsAccessKey = "secret_key"
-)
-
-type awsCredentials struct {
-	AccessKeyID     string `json:"access_key" structs:"access_key" mapstructure:"access_key"`
-	SecretAccessKey string `json:"secret_key" structs:"secret_key" mapstructure:"secret_key"`
-}
-
-func pathStaticCredentials(b *backend) *framework.Path {
-	return &framework.Path{
-		Pattern: fmt.Sprintf("%s/%s", pathStaticCreds, framework.GenericNameWithAtRegex(paramRoleName)),
-		Fields: map[string]*framework.FieldSchema{
-			paramRoleName: {
-				Type:        framework.TypeString,
-				Description: descRoleName,
-			},
-		},
-
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.ReadOperation: &framework.PathOperation{
-				Callback: b.pathStaticCredsRead,
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: http.StatusText(http.StatusOK),
-						Fields: map[string]*framework.FieldSchema{
-							paramAccessKeyID: {
-								Type:        framework.TypeString,
-								Description: descAccessKeyID,
-							},
-							paramSecretsAccessKey: {
-								Type:        framework.TypeString,
-								Description: descSecretAccessKey,
-							},
-						},
-					}},
-				},
-			},
-		},
-
-		HelpSynopsis:    pathStaticCredsHelpSyn,
-		HelpDescription: pathStaticCredsHelpDesc,
-	}
-}
-
-func (b *backend) pathStaticCredsRead(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
-	roleName, ok := data.GetOk(paramRoleName)
-	if !ok {
-		return nil, fmt.Errorf("missing %q parameter", paramRoleName)
-	}
-
-	entry, err := req.Storage.Get(ctx, formatCredsStoragePath(roleName.(string)))
-	if err != nil {
-		return nil, fmt.Errorf("failed to read credentials for role %q: %w", roleName, err)
-	}
-	if entry == nil {
-		return nil, nil
-	}
-
-	var credentials awsCredentials
-	if err := entry.DecodeJSON(&credentials); err != nil {
-		return nil, fmt.Errorf("failed to decode credentials: %w", err)
-	}
-
-	return &logical.Response{
-		Data: structs.New(credentials).Map(),
-	}, nil
-}
-
-func formatCredsStoragePath(roleName string) string {
-	return fmt.Sprintf("%s/%s", pathStaticCreds, roleName)
-}
-
-const pathStaticCredsHelpSyn = `Retrieve static credentials from the named role.`
-
-const pathStaticCredsHelpDesc = `
-This path reads AWS credentials for a certain static role. The keys are rotated
-periodically according to their configuration, and will return the same password
-until they are rotated.`
-
-const (
-	descAccessKeyID     = "The access key of the AWS Credential"
-	descSecretAccessKey = "The secret key of the AWS Credential"
-)
diff --git a/builtin/logical/aws/path_static_creds_test.go b/builtin/logical/aws/path_static_creds_test.go
deleted file mode 100644
index c478e3f74358c..0000000000000
--- a/builtin/logical/aws/path_static_creds_test.go
+++ /dev/null
@@ -1,92 +0,0 @@
-package aws
-
-import (
-	"context"
-	"reflect"
-	"testing"
-
-	"github.com/fatih/structs"
-
-	"github.com/hashicorp/vault/sdk/framework"
-
-	"github.com/hashicorp/vault/sdk/logical"
-)
-
-// TestStaticCredsRead verifies that we can correctly read a cred that exists, and correctly _not read_
-// a cred that does not exist.
-func TestStaticCredsRead(t *testing.T) {
-	// setup
-	config := logical.TestBackendConfig()
-	config.StorageView = &logical.InmemStorage{}
-	bgCTX := context.Background() // for brevity later
-
-	// insert a cred to get
-	creds := &awsCredentials{
-		AccessKeyID:     "foo",
-		SecretAccessKey: "bar",
-	}
-	entry, err := logical.StorageEntryJSON(formatCredsStoragePath("test"), creds)
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = config.StorageView.Put(bgCTX, entry)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// cases
-	cases := []struct {
-		name             string
-		roleName         string
-		expectedError    error
-		expectedResponse *logical.Response
-	}{
-		{
-			name:     "get existing creds",
-			roleName: "test",
-			expectedResponse: &logical.Response{
-				Data: structs.New(creds).Map(),
-			},
-		},
-		{
-			name:     "get non-existent creds",
-			roleName: "this-doesnt-exist",
-			// returns nil, nil
-		},
-	}
-
-	for _, c := range cases {
-		t.Run(c.name, func(t *testing.T) {
-			b := Backend(config)
-
-			req := &logical.Request{
-				Storage: config.StorageView,
-				Data: map[string]interface{}{
-					"name": c.roleName,
-				},
-			}
-			resp, err := b.pathStaticCredsRead(bgCTX, req, staticCredsFieldData(req.Data))
-
-			if err != c.expectedError {
-				t.Fatalf("got error %q, but expected %q", err, c.expectedError)
-			}
-			if !reflect.DeepEqual(resp, c.expectedResponse) {
-				t.Fatalf("got response %v, but expected %v", resp, c.expectedResponse)
-			}
-		})
-	}
-}
-
-func staticCredsFieldData(data map[string]interface{}) *framework.FieldData {
-	schema := map[string]*framework.FieldSchema{
-		paramRoleName: {
-			Type:        framework.TypeString,
-			Description: descRoleName,
-		},
-	}
-
-	return &framework.FieldData{
-		Raw:    data,
-		Schema: schema,
-	}
-}
diff --git a/builtin/logical/aws/path_static_roles.go b/builtin/logical/aws/path_static_roles.go
deleted file mode 100644
index b0aa3b02c7716..0000000000000
--- a/builtin/logical/aws/path_static_roles.go
+++ /dev/null
@@ -1,331 +0,0 @@
-package aws
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"net/http"
-	"time"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/service/iam"
-	"github.com/fatih/structs"
-	"github.com/hashicorp/vault/sdk/framework"
-	"github.com/hashicorp/vault/sdk/logical"
-	"github.com/hashicorp/vault/sdk/queue"
-)
-
-const (
-	pathStaticRole = "static-roles"
-
-	paramRoleName       = "name"
-	paramUsername       = "username"
-	paramRotationPeriod = "rotation_period"
-)
-
-type staticRoleEntry struct {
-	Name           string        `json:"name" structs:"name" mapstructure:"name"`
-	ID             string        `json:"id" structs:"id" mapstructure:"id"`
-	Username       string        `json:"username" structs:"username" mapstructure:"username"`
-	RotationPeriod time.Duration `json:"rotation_period" structs:"rotation_period" mapstructure:"rotation_period"`
-}
-
-func pathStaticRoles(b *backend) *framework.Path {
-	roleResponse := map[int][]framework.Response{
-		http.StatusOK: {{
-			Description: http.StatusText(http.StatusOK),
-			Fields: map[string]*framework.FieldSchema{
-				paramRoleName: {
-					Type:        framework.TypeString,
-					Description: descRoleName,
-				},
-				paramUsername: {
-					Type:        framework.TypeString,
-					Description: descUsername,
-				},
-				paramRotationPeriod: {
-					Type:        framework.TypeDurationSecond,
-					Description: descRotationPeriod,
-				},
-			},
-		}},
-	}
-
-	return &framework.Path{
-		Pattern: fmt.Sprintf("%s/%s", pathStaticRole, framework.GenericNameWithAtRegex(paramRoleName)),
-		Fields: map[string]*framework.FieldSchema{
-			paramRoleName: {
-				Type:        framework.TypeString,
-				Description: descRoleName,
-			},
-			paramUsername: {
-				Type:        framework.TypeString,
-				Description: descUsername,
-			},
-			paramRotationPeriod: {
-				Type:        framework.TypeDurationSecond,
-				Description: descRotationPeriod,
-			},
-		},
-
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.ReadOperation: &framework.PathOperation{
-				Callback:  b.pathStaticRolesRead,
-				Responses: roleResponse,
-			},
-			logical.UpdateOperation: &framework.PathOperation{
-				Callback:                    b.pathStaticRolesWrite,
-				ForwardPerformanceSecondary: true,
-				ForwardPerformanceStandby:   true,
-				Responses:                   roleResponse,
-			},
-			logical.DeleteOperation: &framework.PathOperation{
-				Callback:                    b.pathStaticRolesDelete,
-				ForwardPerformanceSecondary: true,
-				ForwardPerformanceStandby:   true,
-				Responses: map[int][]framework.Response{
-					http.StatusNoContent: {{
-						Description: http.StatusText(http.StatusNoContent),
-					}},
-				},
-			},
-		},
-
-		HelpSynopsis:    pathStaticRolesHelpSyn,
-		HelpDescription: pathStaticRolesHelpDesc,
-	}
-}
-
-func (b *backend) pathStaticRolesRead(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
-	roleName, ok := data.GetOk(paramRoleName)
-	if !ok {
-		return nil, fmt.Errorf("missing %q parameter", paramRoleName)
-	}
-
-	b.roleMutex.RLock()
-	defer b.roleMutex.RUnlock()
-
-	entry, err := req.Storage.Get(ctx, formatRoleStoragePath(roleName.(string)))
-	if err != nil {
-		return nil, fmt.Errorf("failed to read configuration for static role %q: %w", roleName, err)
-	}
-	if entry == nil {
-		return nil, nil
-	}
-
-	var config staticRoleEntry
-	if err := entry.DecodeJSON(&config); err != nil {
-		return nil, fmt.Errorf("failed to decode configuration for static role %q: %w", roleName, err)
-	}
-
-	return &logical.Response{
-		Data: formatResponse(config),
-	}, nil
-}
-
-func (b *backend) pathStaticRolesWrite(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
-	// Create & validate config from request parameters
-	config := staticRoleEntry{}
-	isCreate := req.Operation == logical.CreateOperation
-
-	if rawRoleName, ok := data.GetOk(paramRoleName); ok {
-		config.Name = rawRoleName.(string)
-
-		if err := b.validateRoleName(config.Name); err != nil {
-			return nil, err
-		}
-	} else {
-		return logical.ErrorResponse("missing %q parameter", paramRoleName), nil
-	}
-
-	// retrieve old role value
-	entry, err := req.Storage.Get(ctx, formatRoleStoragePath(config.Name))
-	if err != nil {
-		return nil, fmt.Errorf("couldn't check storage for pre-existing role: %w", err)
-	}
-
-	if entry != nil {
-		err = entry.DecodeJSON(&config)
-		if err != nil {
-			return nil, fmt.Errorf("couldn't convert existing role into config struct: %w", err)
-		}
-	} else {
-		// if we couldn't find an entry, this is a create event
-		isCreate = true
-	}
-
-	// other params are optional if we're not Creating
-
-	if rawUsername, ok := data.GetOk(paramUsername); ok {
-		config.Username = rawUsername.(string)
-
-		if err := b.validateIAMUserExists(ctx, req.Storage, &config, isCreate); err != nil {
-			return nil, err
-		}
-	} else if isCreate {
-		return logical.ErrorResponse("missing %q parameter", paramUsername), nil
-	}
-
-	if rawRotationPeriod, ok := data.GetOk(paramRotationPeriod); ok {
-		config.RotationPeriod = time.Duration(rawRotationPeriod.(int)) * time.Second
-
-		if err := b.validateRotationPeriod(config.RotationPeriod); err != nil {
-			return nil, err
-		}
-	} else if isCreate {
-		return logical.ErrorResponse("missing %q parameter", paramRotationPeriod), nil
-	}
-
-	b.roleMutex.Lock()
-	defer b.roleMutex.Unlock()
-
-	// Upsert role config
-	newRole, err := logical.StorageEntryJSON(formatRoleStoragePath(config.Name), config)
-	if err != nil {
-		return nil, fmt.Errorf("failed to marshal object to JSON: %w", err)
-	}
-	err = req.Storage.Put(ctx, newRole)
-	if err != nil {
-		return nil, fmt.Errorf("failed to save object in storage: %w", err)
-	}
-
-	// Bootstrap initial set of keys if they did not exist before. AWS Secret Access Keys can only be obtained on creation,
-	// so we need to boostrap new roles with a new initial set of keys to be able to serve valid credentials to Vault clients.
-	existingCreds, err := req.Storage.Get(ctx, formatCredsStoragePath(config.Name))
-	if err != nil {
-		return nil, fmt.Errorf("unable to verify if credentials already exist for role %q: %w", config.Name, err)
-	}
-	if existingCreds == nil {
-		err := b.createCredential(ctx, req.Storage, config, false)
-		if err != nil {
-			return nil, fmt.Errorf("failed to create new credentials for role %q: %w", config.Name, err)
-		}
-
-		err = b.credRotationQueue.Push(&queue.Item{
-			Key:      config.Name,
-			Value:    config,
-			Priority: time.Now().Add(config.RotationPeriod).Unix(),
-		})
-		if err != nil {
-			return nil, fmt.Errorf("failed to add item into the rotation queue for role %q: %w", config.Name, err)
-		}
-	}
-
-	return &logical.Response{
-		Data: formatResponse(config),
-	}, nil
-}
-
-func (b *backend) pathStaticRolesDelete(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
-	roleName, ok := data.GetOk(paramRoleName)
-	if !ok {
-		return nil, fmt.Errorf("missing %q parameter", paramRoleName)
-	}
-
-	b.roleMutex.Lock()
-	defer b.roleMutex.Unlock()
-
-	entry, err := req.Storage.Get(ctx, formatRoleStoragePath(roleName.(string)))
-	if err != nil {
-		return nil, fmt.Errorf("couldn't locate role in storage due to error: %w", err)
-	}
-	// no entry in storage, but no error either, congrats, it's deleted!
-	if entry == nil {
-		return nil, nil
-	}
-	var cfg staticRoleEntry
-	err = entry.DecodeJSON(&cfg)
-	if err != nil {
-		return nil, fmt.Errorf("couldn't convert storage entry to role config")
-	}
-
-	err = b.deleteCredential(ctx, req.Storage, cfg, false)
-	if err != nil {
-		return nil, fmt.Errorf("failed to clean credentials while deleting role %q: %w", roleName.(string), err)
-	}
-
-	// delete from the queue
-	_, err = b.credRotationQueue.PopByKey(cfg.Name)
-	if err != nil {
-		return nil, fmt.Errorf("couldn't delete key from queue: %w", err)
-	}
-
-	return nil, req.Storage.Delete(ctx, formatRoleStoragePath(roleName.(string)))
-}
-
-func (b *backend) validateRoleName(name string) error {
-	if name == "" {
-		return errors.New("empty role name attribute given")
-	}
-	return nil
-}
-
-// validateIAMUser checks the user information we have for the role against the information on AWS. On a create, it uses the username
-// to retrieve the user information and _sets_ the userID. On update, it validates the userID and username.
-func (b *backend) validateIAMUserExists(ctx context.Context, storage logical.Storage, entry *staticRoleEntry, isCreate bool) error {
-	c, err := b.clientIAM(ctx, storage)
-	if err != nil {
-		return fmt.Errorf("unable to validate username %q: %w", entry.Username, err)
-	}
-
-	// we don't really care about the content of the result, just that it's not an error
-	out, err := c.GetUser(&iam.GetUserInput{
-		UserName: aws.String(entry.Username),
-	})
-	if err != nil || out.User == nil {
-		return fmt.Errorf("unable to validate username %q: %w", entry.Username, err)
-	}
-	if *out.User.UserName != entry.Username {
-		return fmt.Errorf("AWS GetUser returned a username, but it didn't match: %q was requested, but %q was returned", entry.Username, *out.User.UserName)
-	}
-
-	if !isCreate && *out.User.UserId != entry.ID {
-		return fmt.Errorf("AWS GetUser returned a user, but the ID did not match: %q was requested, but %q was returned", entry.ID, *out.User.UserId)
-	} else {
-		// if this is an insert, store the userID. This is the immutable part of an IAM user, but it's not exactly user-friendly.
-		// So, we allow users to specify usernames, but on updates we'll use the ID as a verification cross-check.
-		entry.ID = *out.User.UserId
-	}
-
-	return nil
-}
-
-const (
-	minAllowableRotationPeriod = 1 * time.Minute
-)
-
-func (b *backend) validateRotationPeriod(period time.Duration) error {
-	if period < minAllowableRotationPeriod {
-		return fmt.Errorf("role rotation period out of range: must be greater than %.2f seconds", minAllowableRotationPeriod.Seconds())
-	}
-	return nil
-}
-
-func formatResponse(cfg staticRoleEntry) map[string]interface{} {
-	response := structs.New(cfg).Map()
-	response[paramRotationPeriod] = int64(cfg.RotationPeriod.Seconds())
-
-	return response
-}
-
-func formatRoleStoragePath(roleName string) string {
-	return fmt.Sprintf("%s/%s", pathStaticRole, roleName)
-}
-
-const pathStaticRolesHelpSyn = `
-Manage static roles for AWS.
-`
-
-const pathStaticRolesHelpDesc = `
-This path lets you manage static roles (users) for the AWS secret backend.
-A static role is associated with a single IAM user, and manages the access
-keys based on a rotation period, automatically rotating the credential. If
-the IAM user has multiple access keys, the oldest key will be rotated.
-`
-
-const (
-	descRoleName       = "The name of this role."
-	descUsername       = "The IAM user to adopt as a static role."
-	descRotationPeriod = `Period by which to rotate the backing credential of the adopted user. 
-This can be a Go duration (e.g, '1m', 24h'), or an integer number of seconds.`
-)
diff --git a/builtin/logical/aws/path_static_roles_test.go b/builtin/logical/aws/path_static_roles_test.go
deleted file mode 100644
index 205b42cd00978..0000000000000
--- a/builtin/logical/aws/path_static_roles_test.go
+++ /dev/null
@@ -1,490 +0,0 @@
-package aws
-
-import (
-	"context"
-	"errors"
-	"testing"
-	"time"
-
-	"github.com/hashicorp/vault/sdk/queue"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/service/iam"
-	"github.com/hashicorp/go-secure-stdlib/awsutil"
-	"github.com/hashicorp/vault/sdk/framework"
-	"github.com/hashicorp/vault/sdk/logical"
-)
-
-// TestStaticRolesValidation verifies that valid requests pass validation and that invalid requests fail validation.
-// This includes the user already existing in IAM roles, and the rotation period being sufficiently long.
-func TestStaticRolesValidation(t *testing.T) {
-	config := logical.TestBackendConfig()
-	config.StorageView = &logical.InmemStorage{}
-	bgCTX := context.Background() // for brevity
-
-	cases := []struct {
-		name        string
-		opts        []awsutil.MockIAMOption
-		requestData map[string]interface{}
-		isError     bool
-	}{
-		{
-			name: "all good",
-			opts: []awsutil.MockIAMOption{
-				awsutil.WithGetUserOutput(&iam.GetUserOutput{User: &iam.User{UserName: aws.String("jane-doe"), UserId: aws.String("unique-id")}}),
-				awsutil.WithCreateAccessKeyOutput(&iam.CreateAccessKeyOutput{
-					AccessKey: &iam.AccessKey{
-						AccessKeyId:     aws.String("abcdefghijklmnopqrstuvwxyz"),
-						SecretAccessKey: aws.String("zyxwvutsrqponmlkjihgfedcba"),
-						UserName:        aws.String("jane-doe"),
-					},
-				}),
-				awsutil.WithListAccessKeysOutput(&iam.ListAccessKeysOutput{
-					AccessKeyMetadata: []*iam.AccessKeyMetadata{},
-					IsTruncated:       aws.Bool(false),
-				}),
-			},
-			requestData: map[string]interface{}{
-				"name":            "test",
-				"username":        "jane-doe",
-				"rotation_period": "1d",
-			},
-		},
-		{
-			name: "bad user",
-			opts: []awsutil.MockIAMOption{
-				awsutil.WithGetUserError(errors.New("oh no")),
-			},
-			requestData: map[string]interface{}{
-				"name":            "test",
-				"username":        "jane-doe",
-				"rotation_period": "24h",
-			},
-			isError: true,
-		},
-		{
-			name: "user mismatch",
-			opts: []awsutil.MockIAMOption{
-				awsutil.WithGetUserOutput(&iam.GetUserOutput{User: &iam.User{UserName: aws.String("ms-impostor"), UserId: aws.String("fake-id")}}),
-			},
-			requestData: map[string]interface{}{
-				"name":            "test",
-				"username":        "jane-doe",
-				"rotation_period": "1d2h",
-			},
-			isError: true,
-		},
-		{
-			name: "bad rotation period",
-			opts: []awsutil.MockIAMOption{
-				awsutil.WithGetUserOutput(&iam.GetUserOutput{User: &iam.User{UserName: aws.String("jane-doe"), UserId: aws.String("unique-id")}}),
-			},
-			requestData: map[string]interface{}{
-				"name":            "test",
-				"username":        "jane-doe",
-				"rotation_period": "45s",
-			},
-			isError: true,
-		},
-	}
-
-	for _, c := range cases {
-		t.Run(c.name, func(t *testing.T) {
-			b := Backend(config)
-			miam, err := awsutil.NewMockIAM(c.opts...)(nil)
-			if err != nil {
-				t.Fatal(err)
-			}
-			b.iamClient = miam
-			if err := b.Setup(bgCTX, config); err != nil {
-				t.Fatal(err)
-			}
-			req := &logical.Request{
-				Operation: logical.UpdateOperation,
-				Storage:   config.StorageView,
-				Data:      c.requestData,
-				Path:      "static-roles/test",
-			}
-			_, err = b.pathStaticRolesWrite(bgCTX, req, staticRoleFieldData(req.Data))
-			if c.isError && err == nil {
-				t.Fatal("expected an error but didn't get one")
-			} else if !c.isError && err != nil {
-				t.Fatalf("got an unexpected error: %s", err)
-			}
-		})
-	}
-}
-
-// TestStaticRolesWrite validates that we can write a new entry for a new static role, and that we correctly
-// do not write if the request is invalid in some way.
-func TestStaticRolesWrite(t *testing.T) {
-	bgCTX := context.Background()
-
-	cases := []struct {
-		name          string
-		opts          []awsutil.MockIAMOption
-		data          map[string]interface{}
-		expectedError bool
-		findUser      bool
-		isUpdate      bool
-	}{
-		{
-			name: "happy path",
-			opts: []awsutil.MockIAMOption{
-				awsutil.WithGetUserOutput(&iam.GetUserOutput{User: &iam.User{UserName: aws.String("jane-doe"), UserId: aws.String("unique-id")}}),
-				awsutil.WithListAccessKeysOutput(&iam.ListAccessKeysOutput{
-					AccessKeyMetadata: []*iam.AccessKeyMetadata{},
-					IsTruncated:       aws.Bool(false),
-				}),
-				awsutil.WithCreateAccessKeyOutput(&iam.CreateAccessKeyOutput{
-					AccessKey: &iam.AccessKey{
-						AccessKeyId:     aws.String("abcdefghijklmnopqrstuvwxyz"),
-						SecretAccessKey: aws.String("zyxwvutsrqponmlkjihgfedcba"),
-						UserName:        aws.String("jane-doe"),
-					},
-				}),
-			},
-			data: map[string]interface{}{
-				"name":            "test",
-				"username":        "jane-doe",
-				"rotation_period": "1d",
-			},
-			// writes role, writes cred
-			findUser: true,
-		},
-		{
-			name: "no aws user",
-			opts: []awsutil.MockIAMOption{
-				awsutil.WithGetUserError(errors.New("no such user, etc etc")),
-			},
-			data: map[string]interface{}{
-				"name":            "test",
-				"username":        "a-nony-mous",
-				"rotation_period": "15s",
-			},
-			expectedError: true,
-		},
-		{
-			name: "update existing user",
-			opts: []awsutil.MockIAMOption{
-				awsutil.WithGetUserOutput(&iam.GetUserOutput{User: &iam.User{UserName: aws.String("john-doe"), UserId: aws.String("unique-id")}}),
-				awsutil.WithListAccessKeysOutput(&iam.ListAccessKeysOutput{
-					AccessKeyMetadata: []*iam.AccessKeyMetadata{},
-					IsTruncated:       aws.Bool(false),
-				}),
-				awsutil.WithCreateAccessKeyOutput(&iam.CreateAccessKeyOutput{
-					AccessKey: &iam.AccessKey{
-						AccessKeyId:     aws.String("abcdefghijklmnopqrstuvwxyz"),
-						SecretAccessKey: aws.String("zyxwvutsrqponmlkjihgfedcba"),
-						UserName:        aws.String("john-doe"),
-					},
-				}),
-			},
-			data: map[string]interface{}{
-				"name":            "johnny",
-				"rotation_period": "19m",
-			},
-			findUser: true,
-			isUpdate: true,
-		},
-	}
-
-	// if a user exists (user doesn't exist is tested in validation)
-	// we'll check how many keys the user has - if it's two, we delete one.
-
-	for _, c := range cases {
-		t.Run(c.name, func(t *testing.T) {
-			config := logical.TestBackendConfig()
-			config.StorageView = &logical.InmemStorage{}
-
-			miam, err := awsutil.NewMockIAM(
-				c.opts...,
-			)(nil)
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			b := Backend(config)
-			b.iamClient = miam
-			if err := b.Setup(bgCTX, config); err != nil {
-				t.Fatal(err)
-			}
-
-			// put a role in storage for update tests
-			staticRole := staticRoleEntry{
-				Name:           "johnny",
-				Username:       "john-doe",
-				ID:             "unique-id",
-				RotationPeriod: 24 * time.Hour,
-			}
-			entry, err := logical.StorageEntryJSON(formatRoleStoragePath(staticRole.Name), staticRole)
-			if err != nil {
-				t.Fatal(err)
-			}
-			err = config.StorageView.Put(bgCTX, entry)
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			req := &logical.Request{
-				Operation: logical.UpdateOperation,
-				Storage:   config.StorageView,
-				Data:      c.data,
-				Path:      "static-roles/" + c.data["name"].(string),
-			}
-
-			r, err := b.pathStaticRolesWrite(bgCTX, req, staticRoleFieldData(req.Data))
-			if c.expectedError && err == nil {
-				t.Fatal(err)
-			} else if c.expectedError {
-				return // save us some if statements
-			}
-
-			if err != nil {
-				t.Fatalf("got an error back unexpectedly: %s", err)
-			}
-
-			if c.findUser && r == nil {
-				t.Fatal("response was nil, but it shouldn't have been")
-			}
-
-			role, err := config.StorageView.Get(bgCTX, req.Path)
-			if c.findUser && (err != nil || role == nil) {
-				t.Fatalf("couldn't find the role we should have stored: %s", err)
-			}
-			var actualData staticRoleEntry
-			err = role.DecodeJSON(&actualData)
-			if err != nil {
-				t.Fatalf("couldn't convert storage data to role entry: %s", err)
-			}
-
-			// construct expected data
-			var expectedData staticRoleEntry
-			fieldData := staticRoleFieldData(c.data)
-			if c.isUpdate {
-				// data is johnny + c.data
-				expectedData = staticRole
-			}
-
-			if u, ok := fieldData.GetOk("username"); ok {
-				expectedData.Username = u.(string)
-			}
-			if r, ok := fieldData.GetOk("rotation_period"); ok {
-				expectedData.RotationPeriod = time.Duration(r.(int)) * time.Second
-			}
-			if n, ok := fieldData.GetOk("name"); ok {
-				expectedData.Name = n.(string)
-			}
-
-			// validate fields
-			if eu, au := expectedData.Username, actualData.Username; eu != au {
-				t.Fatalf("mismatched username, expected %q but got %q", eu, au)
-			}
-			if er, ar := expectedData.RotationPeriod, actualData.RotationPeriod; er != ar {
-				t.Fatalf("mismatched rotation period, expected %q but got %q", er, ar)
-			}
-			if en, an := expectedData.Name, actualData.Name; en != an {
-				t.Fatalf("mismatched role name, expected %q, but got %q", en, an)
-			}
-		})
-	}
-}
-
-// TestStaticRoleRead validates that we can read a configured role and correctly do not read anything if we
-// request something that doesn't exist.
-func TestStaticRoleRead(t *testing.T) {
-	config := logical.TestBackendConfig()
-	config.StorageView = &logical.InmemStorage{}
-	bgCTX := context.Background()
-
-	// test cases are run against an inmem storage holding a role called "test" attached to an IAM user called "jane-doe"
-	cases := []struct {
-		name     string
-		roleName string
-		found    bool
-	}{
-		{
-			name:     "role name exists",
-			roleName: "test",
-			found:    true,
-		},
-		{
-			name:     "role name not found",
-			roleName: "toast",
-			found:    false, // implied, but set for clarity
-		},
-	}
-
-	staticRole := staticRoleEntry{
-		Name:           "test",
-		Username:       "jane-doe",
-		RotationPeriod: 24 * time.Hour,
-	}
-	entry, err := logical.StorageEntryJSON(formatRoleStoragePath(staticRole.Name), staticRole)
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = config.StorageView.Put(bgCTX, entry)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	for _, c := range cases {
-		t.Run(c.name, func(t *testing.T) {
-			req := &logical.Request{
-				Operation: logical.ReadOperation,
-				Storage:   config.StorageView,
-				Data: map[string]interface{}{
-					"name": c.roleName,
-				},
-				Path: formatRoleStoragePath(c.roleName),
-			}
-
-			b := Backend(config)
-
-			r, err := b.pathStaticRolesRead(bgCTX, req, staticRoleFieldData(req.Data))
-			if err != nil {
-				t.Fatal(err)
-			}
-			if c.found {
-				if r == nil {
-					t.Fatal("response was nil, but it shouldn't have been")
-				}
-			} else {
-				if r != nil {
-					t.Fatal("response should have been nil on a non-existent role")
-				}
-			}
-		})
-	}
-}
-
-// TestStaticRoleDelete validates that we correctly remove a role on a delete request, and that we correctly do not
-// remove anything if a role does not exist with that name.
-func TestStaticRoleDelete(t *testing.T) {
-	bgCTX := context.Background()
-
-	// test cases are run against an inmem storage holding a role called "test" attached to an IAM user called "jane-doe"
-	cases := []struct {
-		name  string
-		role  string
-		found bool
-	}{
-		{
-			name:  "role found",
-			role:  "test",
-			found: true,
-		},
-		{
-			name:  "role not found",
-			role:  "tossed",
-			found: false,
-		},
-	}
-	for _, c := range cases {
-		t.Run(c.name, func(t *testing.T) {
-			config := logical.TestBackendConfig()
-			config.StorageView = &logical.InmemStorage{}
-
-			// fake an IAM
-			var iamfunc awsutil.IAMAPIFunc
-			if !c.found {
-				iamfunc = awsutil.NewMockIAM(awsutil.WithDeleteAccessKeyError(errors.New("shouldn't have called delete")))
-			} else {
-				iamfunc = awsutil.NewMockIAM()
-			}
-			miam, err := iamfunc(nil)
-			if err != nil {
-				t.Fatalf("couldn't initialize mockiam: %s", err)
-			}
-
-			b := Backend(config)
-			b.iamClient = miam
-
-			// put in storage
-			staticRole := staticRoleEntry{
-				Name:           "test",
-				Username:       "jane-doe",
-				RotationPeriod: 24 * time.Hour,
-			}
-			entry, err := logical.StorageEntryJSON(formatRoleStoragePath(staticRole.Name), staticRole)
-			if err != nil {
-				t.Fatal(err)
-			}
-			err = config.StorageView.Put(bgCTX, entry)
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			l, err := config.StorageView.List(bgCTX, "")
-			if err != nil || len(l) != 1 {
-				t.Fatalf("couldn't add an entry to storage during test setup: %s", err)
-			}
-
-			// put in queue
-			err = b.credRotationQueue.Push(&queue.Item{
-				Key:      staticRole.Name,
-				Value:    staticRole,
-				Priority: time.Now().Add(90 * time.Hour).Unix(),
-			})
-			if err != nil {
-				t.Fatalf("couldn't add items to pq")
-			}
-
-			req := &logical.Request{
-				Operation: logical.ReadOperation,
-				Storage:   config.StorageView,
-				Data: map[string]interface{}{
-					"name": c.role,
-				},
-				Path: formatRoleStoragePath(c.role),
-			}
-
-			r, err := b.pathStaticRolesDelete(bgCTX, req, staticRoleFieldData(req.Data))
-			if err != nil {
-				t.Fatal(err)
-			}
-			if r != nil {
-				t.Fatal("response wasn't nil, but it should have been")
-			}
-
-			l, err = config.StorageView.List(bgCTX, "")
-			if err != nil {
-				t.Fatal(err)
-			}
-			if c.found && len(l) != 0 {
-				t.Fatal("size of role storage is non zero after delete")
-			} else if !c.found && len(l) != 1 {
-				t.Fatal("size of role storage changed after what should have been no deletion")
-			}
-
-			if c.found && b.credRotationQueue.Len() != 0 {
-				t.Fatal("size of queue is non-zero after delete")
-			} else if !c.found && b.credRotationQueue.Len() != 1 {
-				t.Fatal("size of queue changed after what should have been no deletion")
-			}
-		})
-	}
-}
-
-func staticRoleFieldData(data map[string]interface{}) *framework.FieldData {
-	schema := map[string]*framework.FieldSchema{
-		paramRoleName: {
-			Type:        framework.TypeString,
-			Description: descRoleName,
-		},
-		paramUsername: {
-			Type:        framework.TypeString,
-			Description: descUsername,
-		},
-		paramRotationPeriod: {
-			Type:        framework.TypeDurationSecond,
-			Description: descRotationPeriod,
-		},
-	}
-
-	return &framework.FieldData{
-		Raw:    data,
-		Schema: schema,
-	}
-}
diff --git a/builtin/logical/aws/path_user.go b/builtin/logical/aws/path_user.go
index f368365c60247..035350cdbfb1f 100644
--- a/builtin/logical/aws/path_user.go
+++ b/builtin/logical/aws/path_user.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package aws
 
 import (
@@ -21,12 +18,6 @@ import (
 func pathUser(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "(creds|sts)/" + framework.GenericNameWithAtRegex("name"),
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixAWS,
-			OperationVerb:   "generate",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"name": {
 				Type:        framework.TypeString,
@@ -47,19 +38,9 @@ func pathUser(b *backend) *framework.Path {
 			},
 		},
 
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.ReadOperation: &framework.PathOperation{
-				Callback: b.pathCredsRead,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationSuffix: "credentials|sts-credentials",
-				},
-			},
-			logical.UpdateOperation: &framework.PathOperation{
-				Callback: b.pathCredsRead,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationSuffix: "credentials-with-parameters|sts-credentials-with-parameters",
-				},
-			},
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.ReadOperation:   b.pathCredsRead,
+			logical.UpdateOperation: b.pathCredsRead,
 		},
 
 		HelpSynopsis:    pathUserHelpSyn,
@@ -171,7 +152,7 @@ func (b *backend) pathUserRollback(ctx context.Context, req *logical.Request, _k
 	}
 
 	// Get information about this user
-	groupsResp, err := client.ListGroupsForUserWithContext(ctx, &iam.ListGroupsForUserInput{
+	groupsResp, err := client.ListGroupsForUser(&iam.ListGroupsForUserInput{
 		UserName: aws.String(username),
 		MaxItems: aws.Int64(1000),
 	})
@@ -210,7 +191,7 @@ func (b *backend) pathUserRollback(ctx context.Context, req *logical.Request, _k
 	groups := groupsResp.Groups
 
 	// Inline (user) policies
-	policiesResp, err := client.ListUserPoliciesWithContext(ctx, &iam.ListUserPoliciesInput{
+	policiesResp, err := client.ListUserPolicies(&iam.ListUserPoliciesInput{
 		UserName: aws.String(username),
 		MaxItems: aws.Int64(1000),
 	})
@@ -220,7 +201,7 @@ func (b *backend) pathUserRollback(ctx context.Context, req *logical.Request, _k
 	policies := policiesResp.PolicyNames
 
 	// Attached managed policies
-	manPoliciesResp, err := client.ListAttachedUserPoliciesWithContext(ctx, &iam.ListAttachedUserPoliciesInput{
+	manPoliciesResp, err := client.ListAttachedUserPolicies(&iam.ListAttachedUserPoliciesInput{
 		UserName: aws.String(username),
 		MaxItems: aws.Int64(1000),
 	})
@@ -229,7 +210,7 @@ func (b *backend) pathUserRollback(ctx context.Context, req *logical.Request, _k
 	}
 	manPolicies := manPoliciesResp.AttachedPolicies
 
-	keysResp, err := client.ListAccessKeysWithContext(ctx, &iam.ListAccessKeysInput{
+	keysResp, err := client.ListAccessKeys(&iam.ListAccessKeysInput{
 		UserName: aws.String(username),
 		MaxItems: aws.Int64(1000),
 	})
@@ -240,7 +221,7 @@ func (b *backend) pathUserRollback(ctx context.Context, req *logical.Request, _k
 
 	// Revoke all keys
 	for _, k := range keys {
-		_, err = client.DeleteAccessKeyWithContext(ctx, &iam.DeleteAccessKeyInput{
+		_, err = client.DeleteAccessKey(&iam.DeleteAccessKeyInput{
 			AccessKeyId: k.AccessKeyId,
 			UserName:    aws.String(username),
 		})
@@ -251,7 +232,7 @@ func (b *backend) pathUserRollback(ctx context.Context, req *logical.Request, _k
 
 	// Detach managed policies
 	for _, p := range manPolicies {
-		_, err = client.DetachUserPolicyWithContext(ctx, &iam.DetachUserPolicyInput{
+		_, err = client.DetachUserPolicy(&iam.DetachUserPolicyInput{
 			UserName:  aws.String(username),
 			PolicyArn: p.PolicyArn,
 		})
@@ -262,7 +243,7 @@ func (b *backend) pathUserRollback(ctx context.Context, req *logical.Request, _k
 
 	// Delete any inline (user) policies
 	for _, p := range policies {
-		_, err = client.DeleteUserPolicyWithContext(ctx, &iam.DeleteUserPolicyInput{
+		_, err = client.DeleteUserPolicy(&iam.DeleteUserPolicyInput{
 			UserName:   aws.String(username),
 			PolicyName: p,
 		})
@@ -273,7 +254,7 @@ func (b *backend) pathUserRollback(ctx context.Context, req *logical.Request, _k
 
 	// Remove the user from all their groups
 	for _, g := range groups {
-		_, err = client.RemoveUserFromGroupWithContext(ctx, &iam.RemoveUserFromGroupInput{
+		_, err = client.RemoveUserFromGroup(&iam.RemoveUserFromGroupInput{
 			GroupName: g.GroupName,
 			UserName:  aws.String(username),
 		})
@@ -283,7 +264,7 @@ func (b *backend) pathUserRollback(ctx context.Context, req *logical.Request, _k
 	}
 
 	// Delete the user
-	_, err = client.DeleteUserWithContext(ctx, &iam.DeleteUserInput{
+	_, err = client.DeleteUser(&iam.DeleteUserInput{
 		UserName: aws.String(username),
 	})
 	if err != nil {
diff --git a/builtin/logical/aws/rollback.go b/builtin/logical/aws/rollback.go
index 847ecd1c258b7..e498fc6b2bafd 100644
--- a/builtin/logical/aws/rollback.go
+++ b/builtin/logical/aws/rollback.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package aws
 
 import (
diff --git a/builtin/logical/aws/rotation.go b/builtin/logical/aws/rotation.go
deleted file mode 100644
index 4461437624656..0000000000000
--- a/builtin/logical/aws/rotation.go
+++ /dev/null
@@ -1,188 +0,0 @@
-package aws
-
-import (
-	"context"
-	"fmt"
-	"time"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/service/iam"
-	"github.com/hashicorp/go-multierror"
-	"github.com/hashicorp/vault/sdk/logical"
-	"github.com/hashicorp/vault/sdk/queue"
-)
-
-// rotateExpiredStaticCreds will pop expired credentials (credentials whose priority
-// represents a time before the present), rotate the associated credential, and push
-// them back onto the queue with the new priority.
-func (b *backend) rotateExpiredStaticCreds(ctx context.Context, req *logical.Request) error {
-	var errs *multierror.Error
-
-	for {
-		keepGoing, err := b.rotateCredential(ctx, req.Storage)
-		if err != nil {
-			errs = multierror.Append(errs, err)
-		}
-		if !keepGoing {
-			if errs.ErrorOrNil() != nil {
-				return fmt.Errorf("error(s) occurred while rotating expired static credentials: %w", errs)
-			} else {
-				return nil
-			}
-		}
-	}
-}
-
-// rotateCredential pops an element from the priority queue, and if it is expired, rotate and re-push.
-// If a cred was rotated, it returns true, otherwise false.
-func (b *backend) rotateCredential(ctx context.Context, storage logical.Storage) (rotated bool, err error) {
-	// If queue is empty or first item does not need a rotation (priority is next rotation timestamp) there is nothing to do
-	item, err := b.credRotationQueue.Pop()
-	if err != nil {
-		// the queue is just empty, which is fine.
-		if err == queue.ErrEmpty {
-			return false, nil
-		}
-		return false, fmt.Errorf("failed to pop from queue for role %q: %w", item.Key, err)
-	}
-	if item.Priority > time.Now().Unix() {
-		// no rotation required
-		// push the item back into priority queue
-		err = b.credRotationQueue.Push(item)
-		if err != nil {
-			return false, fmt.Errorf("failed to add item into the rotation queue for role %q: %w", item.Key, err)
-		}
-		return false, nil
-	}
-
-	cfg := item.Value.(staticRoleEntry)
-
-	err = b.createCredential(ctx, storage, cfg, true)
-	if err != nil {
-		return false, err
-	}
-
-	// set new priority and re-queue
-	item.Priority = time.Now().Add(cfg.RotationPeriod).Unix()
-	err = b.credRotationQueue.Push(item)
-	if err != nil {
-		return false, fmt.Errorf("failed to add item into the rotation queue for role %q: %w", cfg.Name, err)
-	}
-
-	return true, nil
-}
-
-// createCredential will create a new iam credential, deleting the oldest one if necessary.
-func (b *backend) createCredential(ctx context.Context, storage logical.Storage, cfg staticRoleEntry, shouldLockStorage bool) error {
-	iamClient, err := b.clientIAM(ctx, storage)
-	if err != nil {
-		return fmt.Errorf("unable to get the AWS IAM client: %w", err)
-	}
-
-	// IAM users can have a most 2 sets of keys at a time.
-	// (https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_iam-quotas.html)
-	// Ideally we would get this value through an api check, but I'm not sure one exists.
-	const maxAllowedKeys = 2
-
-	err = b.validateIAMUserExists(ctx, storage, &cfg, false)
-	if err != nil {
-		return fmt.Errorf("iam user didn't exist, or username/userid didn't match: %w", err)
-	}
-
-	accessKeys, err := iamClient.ListAccessKeys(&iam.ListAccessKeysInput{
-		UserName: aws.String(cfg.Username),
-	})
-	if err != nil {
-		return fmt.Errorf("unable to list existing access keys for IAM user %q: %w", cfg.Username, err)
-	}
-
-	// If we have the maximum number of keys, we have to delete one to make another (so we can get the credentials).
-	// We'll delete the oldest one.
-	//
-	// Since this check relies on a pre-coded maximum, it's a bit fragile. If the number goes up, we risk deleting
-	// a key when we didn't need to. If this number goes down, we'll start throwing errors because we think we're
-	// allowed to create a key and aren't. In either case, adjusting the constant should be sufficient to fix things.
-	if len(accessKeys.AccessKeyMetadata) >= maxAllowedKeys {
-		oldestKey := accessKeys.AccessKeyMetadata[0]
-
-		for i := 1; i < len(accessKeys.AccessKeyMetadata); i++ {
-			if accessKeys.AccessKeyMetadata[i].CreateDate.Before(*oldestKey.CreateDate) {
-				oldestKey = accessKeys.AccessKeyMetadata[i]
-			}
-		}
-
-		_, err := iamClient.DeleteAccessKey(&iam.DeleteAccessKeyInput{
-			AccessKeyId: oldestKey.AccessKeyId,
-			UserName:    oldestKey.UserName,
-		})
-		if err != nil {
-			return fmt.Errorf("unable to delete oldest access keys for user %q: %w", cfg.Username, err)
-		}
-	}
-
-	// Create new set of keys
-	out, err := iamClient.CreateAccessKey(&iam.CreateAccessKeyInput{
-		UserName: aws.String(cfg.Username),
-	})
-	if err != nil {
-		return fmt.Errorf("unable to create new access keys for user %q: %w", cfg.Username, err)
-	}
-
-	// Persist new keys
-	entry, err := logical.StorageEntryJSON(formatCredsStoragePath(cfg.Name), &awsCredentials{
-		AccessKeyID:     *out.AccessKey.AccessKeyId,
-		SecretAccessKey: *out.AccessKey.SecretAccessKey,
-	})
-	if err != nil {
-		return fmt.Errorf("failed to marshal object to JSON: %w", err)
-	}
-	if shouldLockStorage {
-		b.roleMutex.Lock()
-		defer b.roleMutex.Unlock()
-	}
-	err = storage.Put(ctx, entry)
-	if err != nil {
-		return fmt.Errorf("failed to save object in storage: %w", err)
-	}
-
-	return nil
-}
-
-// delete credential will remove the credential associated with the role from storage.
-func (b *backend) deleteCredential(ctx context.Context, storage logical.Storage, cfg staticRoleEntry, shouldLockStorage bool) error {
-	// synchronize storage access if we didn't in the caller.
-	if shouldLockStorage {
-		b.roleMutex.Lock()
-		defer b.roleMutex.Unlock()
-	}
-
-	key, err := storage.Get(ctx, formatCredsStoragePath(cfg.Name))
-	if err != nil {
-		return fmt.Errorf("couldn't find key in storage: %w", err)
-	}
-	// no entry, so i guess we deleted it already
-	if key == nil {
-		return nil
-	}
-	var creds awsCredentials
-	err = key.DecodeJSON(&creds)
-	if err != nil {
-		return fmt.Errorf("couldn't decode storage entry to a valid credential: %w", err)
-	}
-
-	err = storage.Delete(ctx, formatCredsStoragePath(cfg.Name))
-	if err != nil {
-		return fmt.Errorf("couldn't delete from storage: %w", err)
-	}
-
-	// because we have the information, this is the one we created, so it's safe for us to delete.
-	_, err = b.iamClient.DeleteAccessKey(&iam.DeleteAccessKeyInput{
-		AccessKeyId: aws.String(creds.AccessKeyID),
-		UserName:    aws.String(cfg.Username),
-	})
-	if err != nil {
-		return fmt.Errorf("couldn't delete from IAM: %w", err)
-	}
-
-	return nil
-}
diff --git a/builtin/logical/aws/rotation_test.go b/builtin/logical/aws/rotation_test.go
deleted file mode 100644
index 8f672efc69196..0000000000000
--- a/builtin/logical/aws/rotation_test.go
+++ /dev/null
@@ -1,348 +0,0 @@
-package aws
-
-import (
-	"context"
-	"errors"
-	"testing"
-	"time"
-
-	"github.com/aws/aws-sdk-go/service/iam/iamiface"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/service/iam"
-	"github.com/hashicorp/go-secure-stdlib/awsutil"
-	"github.com/hashicorp/vault/sdk/logical"
-	"github.com/hashicorp/vault/sdk/queue"
-)
-
-// TestRotation verifies that the rotation code and priority queue correctly selects and rotates credentials
-// for static secrets.
-func TestRotation(t *testing.T) {
-	bgCTX := context.Background()
-
-	type credToInsert struct {
-		config staticRoleEntry // role configuration from a normal createRole request
-		age    time.Duration   // how old the cred should be - if this is longer than the config.RotationPeriod,
-		// the cred is 'pre-expired'
-
-		changed bool // whether we expect the cred to change - this is technically redundant to a comparison between
-		// rotationPeriod and age.
-	}
-
-	// due to a limitation with the mockIAM implementation, any cred you want to rotate must have
-	// username jane-doe and userid unique-id, since we can only pre-can one exact response to GetUser
-	cases := []struct {
-		name  string
-		creds []credToInsert
-	}{
-		{
-			name: "refresh one",
-			creds: []credToInsert{
-				{
-					config: staticRoleEntry{
-						Name:           "test",
-						Username:       "jane-doe",
-						ID:             "unique-id",
-						RotationPeriod: 2 * time.Second,
-					},
-					age:     5 * time.Second,
-					changed: true,
-				},
-			},
-		},
-		{
-			name: "refresh none",
-			creds: []credToInsert{
-				{
-					config: staticRoleEntry{
-						Name:           "test",
-						Username:       "jane-doe",
-						ID:             "unique-id",
-						RotationPeriod: 1 * time.Minute,
-					},
-					age:     5 * time.Second,
-					changed: false,
-				},
-			},
-		},
-		{
-			name: "refresh one of two",
-			creds: []credToInsert{
-				{
-					config: staticRoleEntry{
-						Name:           "toast",
-						Username:       "john-doe",
-						ID:             "other-id",
-						RotationPeriod: 1 * time.Minute,
-					},
-					age:     5 * time.Second,
-					changed: false,
-				},
-				{
-					config: staticRoleEntry{
-						Name:           "test",
-						Username:       "jane-doe",
-						ID:             "unique-id",
-						RotationPeriod: 1 * time.Second,
-					},
-					age:     5 * time.Second,
-					changed: true,
-				},
-			},
-		},
-		{
-			name:  "no creds to rotate",
-			creds: []credToInsert{},
-		},
-	}
-
-	ak := "long-access-key-id"
-	oldSecret := "abcdefghijklmnopqrstuvwxyz"
-	newSecret := "zyxwvutsrqponmlkjihgfedcba"
-
-	for _, c := range cases {
-		t.Run(c.name, func(t *testing.T) {
-			config := logical.TestBackendConfig()
-			config.StorageView = &logical.InmemStorage{}
-
-			b := Backend(config)
-
-			// insert all our creds
-			for i, cred := range c.creds {
-
-				// all the creds will be the same for every user, but that's okay
-				// since what we care about is whether they changed on a single-user basis.
-				miam, err := awsutil.NewMockIAM(
-					// blank list for existing user
-					awsutil.WithListAccessKeysOutput(&iam.ListAccessKeysOutput{
-						AccessKeyMetadata: []*iam.AccessKeyMetadata{
-							{},
-						},
-					}),
-					// initial key to store
-					awsutil.WithCreateAccessKeyOutput(&iam.CreateAccessKeyOutput{
-						AccessKey: &iam.AccessKey{
-							AccessKeyId:     aws.String(ak),
-							SecretAccessKey: aws.String(oldSecret),
-						},
-					}),
-					awsutil.WithGetUserOutput(&iam.GetUserOutput{
-						User: &iam.User{
-							UserId:   aws.String(cred.config.ID),
-							UserName: aws.String(cred.config.Username),
-						},
-					}),
-				)(nil)
-				if err != nil {
-					t.Fatalf("couldn't initialze mock IAM handler: %s", err)
-				}
-				b.iamClient = miam
-
-				err = b.createCredential(bgCTX, config.StorageView, cred.config, true)
-				if err != nil {
-					t.Fatalf("couldn't insert credential %d: %s", i, err)
-				}
-
-				item := &queue.Item{
-					Key:      cred.config.Name,
-					Value:    cred.config,
-					Priority: time.Now().Add(-1 * cred.age).Add(cred.config.RotationPeriod).Unix(),
-				}
-				err = b.credRotationQueue.Push(item)
-				if err != nil {
-					t.Fatalf("couldn't push item onto queue: %s", err)
-				}
-			}
-
-			// update aws responses, same argument for why it's okay every cred will be the same
-			miam, err := awsutil.NewMockIAM(
-				// old key
-				awsutil.WithListAccessKeysOutput(&iam.ListAccessKeysOutput{
-					AccessKeyMetadata: []*iam.AccessKeyMetadata{
-						{
-							AccessKeyId: aws.String(ak),
-						},
-					},
-				}),
-				// new key
-				awsutil.WithCreateAccessKeyOutput(&iam.CreateAccessKeyOutput{
-					AccessKey: &iam.AccessKey{
-						AccessKeyId:     aws.String(ak),
-						SecretAccessKey: aws.String(newSecret),
-					},
-				}),
-				awsutil.WithGetUserOutput(&iam.GetUserOutput{
-					User: &iam.User{
-						UserId:   aws.String("unique-id"),
-						UserName: aws.String("jane-doe"),
-					},
-				}),
-			)(nil)
-			if err != nil {
-				t.Fatalf("couldn't initialze mock IAM handler: %s", err)
-			}
-			b.iamClient = miam
-
-			req := &logical.Request{
-				Storage: config.StorageView,
-			}
-			err = b.rotateExpiredStaticCreds(bgCTX, req)
-			if err != nil {
-				t.Fatalf("got an error rotating credentials: %s", err)
-			}
-
-			// check our credentials
-			for i, cred := range c.creds {
-				entry, err := config.StorageView.Get(bgCTX, formatCredsStoragePath(cred.config.Name))
-				if err != nil {
-					t.Fatalf("got an error retrieving credentials %d", i)
-				}
-				var out awsCredentials
-				err = entry.DecodeJSON(&out)
-				if err != nil {
-					t.Fatalf("could not unmarshal storage view entry for cred %d to an aws credential: %s", i, err)
-				}
-
-				if cred.changed && out.SecretAccessKey != newSecret {
-					t.Fatalf("expected the key for cred %d to have changed, but it hasn't", i)
-				} else if !cred.changed && out.SecretAccessKey != oldSecret {
-					t.Fatalf("expected the key for cred %d to have stayed the same, but it changed", i)
-				}
-			}
-		})
-	}
-}
-
-type fakeIAM struct {
-	iamiface.IAMAPI
-	delReqs []*iam.DeleteAccessKeyInput
-}
-
-func (f *fakeIAM) DeleteAccessKey(r *iam.DeleteAccessKeyInput) (*iam.DeleteAccessKeyOutput, error) {
-	f.delReqs = append(f.delReqs, r)
-	return f.IAMAPI.DeleteAccessKey(r)
-}
-
-// TestCreateCredential verifies that credential creation firstly only deletes credentials if it needs to (i.e., two
-// or more credentials on IAM), and secondly correctly deletes the oldest one.
-func TestCreateCredential(t *testing.T) {
-	cases := []struct {
-		name       string
-		username   string
-		id         string
-		deletedKey string
-		opts       []awsutil.MockIAMOption
-	}{
-		{
-			name:     "zero keys",
-			username: "jane-doe",
-			id:       "unique-id",
-			opts: []awsutil.MockIAMOption{
-				awsutil.WithListAccessKeysOutput(&iam.ListAccessKeysOutput{
-					AccessKeyMetadata: []*iam.AccessKeyMetadata{},
-				}),
-				// delete should _not_ be called
-				awsutil.WithDeleteAccessKeyError(errors.New("should not have been called")),
-				awsutil.WithCreateAccessKeyOutput(&iam.CreateAccessKeyOutput{
-					AccessKey: &iam.AccessKey{
-						AccessKeyId:     aws.String("key"),
-						SecretAccessKey: aws.String("itsasecret"),
-					},
-				}),
-				awsutil.WithGetUserOutput(&iam.GetUserOutput{
-					User: &iam.User{
-						UserId:   aws.String("unique-id"),
-						UserName: aws.String("jane-doe"),
-					},
-				}),
-			},
-		},
-		{
-			name:     "one key",
-			username: "jane-doe",
-			id:       "unique-id",
-			opts: []awsutil.MockIAMOption{
-				awsutil.WithListAccessKeysOutput(&iam.ListAccessKeysOutput{
-					AccessKeyMetadata: []*iam.AccessKeyMetadata{
-						{AccessKeyId: aws.String("foo"), CreateDate: aws.Time(time.Now())},
-					},
-				}),
-				// delete should _not_ be called
-				awsutil.WithDeleteAccessKeyError(errors.New("should not have been called")),
-				awsutil.WithCreateAccessKeyOutput(&iam.CreateAccessKeyOutput{
-					AccessKey: &iam.AccessKey{
-						AccessKeyId:     aws.String("key"),
-						SecretAccessKey: aws.String("itsasecret"),
-					},
-				}),
-				awsutil.WithGetUserOutput(&iam.GetUserOutput{
-					User: &iam.User{
-						UserId:   aws.String("unique-id"),
-						UserName: aws.String("jane-doe"),
-					},
-				}),
-			},
-		},
-		{
-			name:       "two keys",
-			username:   "jane-doe",
-			id:         "unique-id",
-			deletedKey: "foo",
-			opts: []awsutil.MockIAMOption{
-				awsutil.WithListAccessKeysOutput(&iam.ListAccessKeysOutput{
-					AccessKeyMetadata: []*iam.AccessKeyMetadata{
-						{AccessKeyId: aws.String("foo"), CreateDate: aws.Time(time.Time{})},
-						{AccessKeyId: aws.String("bar"), CreateDate: aws.Time(time.Now())},
-					},
-				}),
-				awsutil.WithCreateAccessKeyOutput(&iam.CreateAccessKeyOutput{
-					AccessKey: &iam.AccessKey{
-						AccessKeyId:     aws.String("key"),
-						SecretAccessKey: aws.String("itsasecret"),
-					},
-				}),
-				awsutil.WithGetUserOutput(&iam.GetUserOutput{
-					User: &iam.User{
-						UserId:   aws.String("unique-id"),
-						UserName: aws.String("jane-doe"),
-					},
-				}),
-			},
-		},
-	}
-
-	config := logical.TestBackendConfig()
-	config.StorageView = &logical.InmemStorage{}
-
-	for _, c := range cases {
-		t.Run(c.name, func(t *testing.T) {
-			miam, err := awsutil.NewMockIAM(
-				c.opts...,
-			)(nil)
-			if err != nil {
-				t.Fatal(err)
-			}
-			fiam := &fakeIAM{
-				IAMAPI: miam,
-			}
-
-			b := Backend(config)
-			b.iamClient = fiam
-
-			err = b.createCredential(context.Background(), config.StorageView, staticRoleEntry{Username: c.username, ID: c.id}, true)
-			if err != nil {
-				t.Fatalf("got an error we didn't expect: %q", err)
-			}
-
-			if c.deletedKey != "" {
-				if len(fiam.delReqs) != 1 {
-					t.Fatalf("called the wrong number of deletes (called %d deletes)", len(fiam.delReqs))
-				}
-				actualKey := *fiam.delReqs[0].AccessKeyId
-				if c.deletedKey != actualKey {
-					t.Fatalf("we deleted the wrong key: %q instead of %q", actualKey, c.deletedKey)
-				}
-			}
-		})
-	}
-}
diff --git a/builtin/logical/aws/secret_access_keys.go b/builtin/logical/aws/secret_access_keys.go
index 2f1ac442bcbf5..c70386d681464 100644
--- a/builtin/logical/aws/secret_access_keys.go
+++ b/builtin/logical/aws/secret_access_keys.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package aws
 
 import (
@@ -153,20 +150,15 @@ func (b *backend) getFederationToken(ctx context.Context, s logical.Storage,
 		return logical.ErrorResponse("must specify at least one of policy_arns or policy_document with %s credential_type", federationTokenCred), nil
 	}
 
-	tokenResp, err := stsClient.GetFederationTokenWithContext(ctx, getTokenInput)
+	tokenResp, err := stsClient.GetFederationToken(getTokenInput)
 	if err != nil {
 		return logical.ErrorResponse("Error generating STS keys: %s", err), awsutil.CheckAWSError(err)
 	}
 
-	// While STS credentials cannot be revoked/renewed, we will still create a lease since users are
-	// relying on a non-zero `lease_duration` in order to manage their lease lifecycles manually.
-	//
-	ttl := tokenResp.Credentials.Expiration.Sub(time.Now())
 	resp := b.Secret(secretAccessKeyType).Response(map[string]interface{}{
 		"access_key":     *tokenResp.Credentials.AccessKeyId,
 		"secret_key":     *tokenResp.Credentials.SecretAccessKey,
 		"security_token": *tokenResp.Credentials.SessionToken,
-		"ttl":            uint64(ttl.Seconds()),
 	}, map[string]interface{}{
 		"username": username,
 		"policy":   policy,
@@ -174,7 +166,7 @@ func (b *backend) getFederationToken(ctx context.Context, s logical.Storage,
 	})
 
 	// Set the secret TTL to appropriately match the expiration of the token
-	resp.Secret.TTL = ttl
+	resp.Secret.TTL = tokenResp.Credentials.Expiration.Sub(time.Now())
 
 	// STS are purposefully short-lived and aren't renewable
 	resp.Secret.Renewable = false
@@ -241,21 +233,16 @@ func (b *backend) assumeRole(ctx context.Context, s logical.Storage,
 	if len(policyARNs) > 0 {
 		assumeRoleInput.SetPolicyArns(convertPolicyARNs(policyARNs))
 	}
-	tokenResp, err := stsClient.AssumeRoleWithContext(ctx, assumeRoleInput)
+	tokenResp, err := stsClient.AssumeRole(assumeRoleInput)
 	if err != nil {
 		return logical.ErrorResponse("Error assuming role: %s", err), awsutil.CheckAWSError(err)
 	}
 
-	// While STS credentials cannot be revoked/renewed, we will still create a lease since users are
-	// relying on a non-zero `lease_duration` in order to manage their lease lifecycles manually.
-	//
-	ttl := tokenResp.Credentials.Expiration.Sub(time.Now())
 	resp := b.Secret(secretAccessKeyType).Response(map[string]interface{}{
 		"access_key":     *tokenResp.Credentials.AccessKeyId,
 		"secret_key":     *tokenResp.Credentials.SecretAccessKey,
 		"security_token": *tokenResp.Credentials.SessionToken,
 		"arn":            *tokenResp.AssumedRoleUser.Arn,
-		"ttl":            uint64(ttl.Seconds()),
 	}, map[string]interface{}{
 		"username": roleSessionName,
 		"policy":   roleArn,
@@ -263,7 +250,7 @@ func (b *backend) assumeRole(ctx context.Context, s logical.Storage,
 	})
 
 	// Set the secret TTL to appropriately match the expiration of the token
-	resp.Secret.TTL = ttl
+	resp.Secret.TTL = tokenResp.Credentials.Expiration.Sub(time.Now())
 
 	// STS are purposefully short-lived and aren't renewable
 	resp.Secret.Renewable = false
@@ -340,7 +327,7 @@ func (b *backend) secretAccessKeysCreate(
 	}
 
 	// Create the user
-	_, err = iamClient.CreateUserWithContext(ctx, createUserRequest)
+	_, err = iamClient.CreateUser(createUserRequest)
 	if err != nil {
 		if walErr := framework.DeleteWAL(ctx, s, walID); walErr != nil {
 			iamErr := fmt.Errorf("error creating IAM user: %w", err)
@@ -351,7 +338,7 @@ func (b *backend) secretAccessKeysCreate(
 
 	for _, arn := range role.PolicyArns {
 		// Attach existing policy against user
-		_, err = iamClient.AttachUserPolicyWithContext(ctx, &iam.AttachUserPolicyInput{
+		_, err = iamClient.AttachUserPolicy(&iam.AttachUserPolicyInput{
 			UserName:  aws.String(username),
 			PolicyArn: aws.String(arn),
 		})
@@ -362,7 +349,7 @@ func (b *backend) secretAccessKeysCreate(
 	}
 	if role.PolicyDocument != "" {
 		// Add new inline user policy against user
-		_, err = iamClient.PutUserPolicyWithContext(ctx, &iam.PutUserPolicyInput{
+		_, err = iamClient.PutUserPolicy(&iam.PutUserPolicyInput{
 			UserName:       aws.String(username),
 			PolicyName:     aws.String(policyName),
 			PolicyDocument: aws.String(role.PolicyDocument),
@@ -374,7 +361,7 @@ func (b *backend) secretAccessKeysCreate(
 
 	for _, group := range role.IAMGroups {
 		// Add user to IAM groups
-		_, err = iamClient.AddUserToGroupWithContext(ctx, &iam.AddUserToGroupInput{
+		_, err = iamClient.AddUserToGroup(&iam.AddUserToGroupInput{
 			UserName:  aws.String(username),
 			GroupName: aws.String(group),
 		})
@@ -393,7 +380,7 @@ func (b *backend) secretAccessKeysCreate(
 	}
 
 	if len(tags) > 0 {
-		_, err = iamClient.TagUserWithContext(ctx, &iam.TagUserInput{
+		_, err = iamClient.TagUser(&iam.TagUserInput{
 			Tags:     tags,
 			UserName: &username,
 		})
@@ -404,7 +391,7 @@ func (b *backend) secretAccessKeysCreate(
 	}
 
 	// Create the keys
-	keyResp, err := iamClient.CreateAccessKeyWithContext(ctx, &iam.CreateAccessKeyInput{
+	keyResp, err := iamClient.CreateAccessKey(&iam.CreateAccessKeyInput{
 		UserName: aws.String(username),
 	})
 	if err != nil {
diff --git a/builtin/logical/aws/secret_access_keys_test.go b/builtin/logical/aws/secret_access_keys_test.go
index 890bb57b09122..7ee9d33b80275 100644
--- a/builtin/logical/aws/secret_access_keys_test.go
+++ b/builtin/logical/aws/secret_access_keys_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package aws
 
 import (
@@ -120,7 +117,7 @@ func TestGenUsername(t *testing.T) {
 func TestReadConfig_DefaultTemplate(t *testing.T) {
 	config := logical.TestBackendConfig()
 	config.StorageView = &logical.InmemStorage{}
-	b := Backend(config)
+	b := Backend()
 	if err := b.Setup(context.Background(), config); err != nil {
 		t.Fatal(err)
 	}
@@ -164,7 +161,7 @@ func TestReadConfig_DefaultTemplate(t *testing.T) {
 func TestReadConfig_CustomTemplate(t *testing.T) {
 	config := logical.TestBackendConfig()
 	config.StorageView = &logical.InmemStorage{}
-	b := Backend(config)
+	b := Backend()
 	if err := b.Setup(context.Background(), config); err != nil {
 		t.Fatal(err)
 	}
diff --git a/builtin/logical/aws/stepwise_test.go b/builtin/logical/aws/stepwise_test.go
index b6f1ffea81d51..78feb1442595e 100644
--- a/builtin/logical/aws/stepwise_test.go
+++ b/builtin/logical/aws/stepwise_test.go
@@ -1,11 +1,7 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package aws
 
 import (
 	"os"
-	"sync"
 	"testing"
 
 	stepwise "github.com/hashicorp/vault-testing-stepwise"
@@ -14,13 +10,11 @@ import (
 	"github.com/mitchellh/mapstructure"
 )
 
-var stepwiseSetup sync.Once
-
 func TestAccBackend_Stepwise_basic(t *testing.T) {
 	t.Parallel()
 	envOptions := &stepwise.MountOptions{
 		RegistryName:    "aws-sec",
-		PluginType:      api.PluginTypeSecrets,
+		PluginType:      stepwise.PluginTypeSecrets,
 		PluginName:      "aws",
 		MountPathPrefix: "aws-sec",
 	}
@@ -88,7 +82,7 @@ func testAccStepwiseRead(t *testing.T, path, name string, credentialTests []cred
 }
 
 func testAccStepwisePreCheck(t *testing.T) {
-	stepwiseSetup.Do(func() {
+	initSetup.Do(func() {
 		if v := os.Getenv("AWS_DEFAULT_REGION"); v == "" {
 			t.Logf("[INFO] Test: Using us-west-2 as test region")
 			os.Setenv("AWS_DEFAULT_REGION", "us-west-2")
diff --git a/builtin/logical/cassandra/backend.go b/builtin/logical/cassandra/backend.go
new file mode 100644
index 0000000000000..e7087448d15a2
--- /dev/null
+++ b/builtin/logical/cassandra/backend.go
@@ -0,0 +1,134 @@
+package cassandra
+
+import (
+	"context"
+	"fmt"
+	"strings"
+	"sync"
+
+	"github.com/gocql/gocql"
+	"github.com/hashicorp/vault/sdk/framework"
+	"github.com/hashicorp/vault/sdk/logical"
+)
+
+// Factory creates a new backend
+func Factory(ctx context.Context, conf *logical.BackendConfig) (logical.Backend, error) {
+	b := Backend()
+	if err := b.Setup(ctx, conf); err != nil {
+		return nil, err
+	}
+	return b, nil
+}
+
+// Backend contains the base information for the backend's functionality
+func Backend() *backend {
+	var b backend
+	b.Backend = &framework.Backend{
+		Help: strings.TrimSpace(backendHelp),
+
+		PathsSpecial: &logical.Paths{
+			SealWrapStorage: []string{
+				"config/connection",
+			},
+		},
+
+		Paths: []*framework.Path{
+			pathConfigConnection(&b),
+			pathRoles(&b),
+			pathCredsCreate(&b),
+		},
+
+		Secrets: []*framework.Secret{
+			secretCreds(&b),
+		},
+
+		Invalidate: b.invalidate,
+
+		Clean: func(_ context.Context) {
+			b.ResetDB(nil)
+		},
+		BackendType: logical.TypeLogical,
+	}
+
+	return &b
+}
+
+type backend struct {
+	*framework.Backend
+
+	// Session is goroutine safe, however, since we reinitialize
+	// it when connection info changes, we want to make sure we
+	// can close it and use a new connection; hence the lock
+	session *gocql.Session
+	lock    sync.Mutex
+}
+
+type sessionConfig struct {
+	Hosts           string `json:"hosts" structs:"hosts" mapstructure:"hosts"`
+	Username        string `json:"username" structs:"username" mapstructure:"username"`
+	Password        string `json:"password" structs:"password" mapstructure:"password"`
+	TLS             bool   `json:"tls" structs:"tls" mapstructure:"tls"`
+	InsecureTLS     bool   `json:"insecure_tls" structs:"insecure_tls" mapstructure:"insecure_tls"`
+	Certificate     string `json:"certificate" structs:"certificate" mapstructure:"certificate"`
+	PrivateKey      string `json:"private_key" structs:"private_key" mapstructure:"private_key"`
+	IssuingCA       string `json:"issuing_ca" structs:"issuing_ca" mapstructure:"issuing_ca"`
+	ProtocolVersion int    `json:"protocol_version" structs:"protocol_version" mapstructure:"protocol_version"`
+	ConnectTimeout  int    `json:"connect_timeout" structs:"connect_timeout" mapstructure:"connect_timeout"`
+	TLSMinVersion   string `json:"tls_min_version" structs:"tls_min_version" mapstructure:"tls_min_version"`
+}
+
+// DB returns the database connection.
+func (b *backend) DB(ctx context.Context, s logical.Storage) (*gocql.Session, error) {
+	b.lock.Lock()
+	defer b.lock.Unlock()
+
+	// If we already have a DB, we got it!
+	if b.session != nil {
+		return b.session, nil
+	}
+
+	entry, err := s.Get(ctx, "config/connection")
+	if err != nil {
+		return nil, err
+	}
+	if entry == nil {
+		return nil, fmt.Errorf("configure the DB connection with config/connection first")
+	}
+
+	config := &sessionConfig{}
+	if err := entry.DecodeJSON(config); err != nil {
+		return nil, err
+	}
+
+	session, err := createSession(config, s)
+	//  Store the session in backend for reuse
+	b.session = session
+
+	return session, err
+}
+
+// ResetDB forces a connection next time DB() is called.
+func (b *backend) ResetDB(newSession *gocql.Session) {
+	b.lock.Lock()
+	defer b.lock.Unlock()
+
+	if b.session != nil {
+		b.session.Close()
+	}
+
+	b.session = newSession
+}
+
+func (b *backend) invalidate(_ context.Context, key string) {
+	switch key {
+	case "config/connection":
+		b.ResetDB(nil)
+	}
+}
+
+const backendHelp = `
+The Cassandra backend dynamically generates database users.
+
+After mounting this backend, configure it using the endpoints within
+the "config/" path.
+`
diff --git a/builtin/logical/cassandra/backend_test.go b/builtin/logical/cassandra/backend_test.go
new file mode 100644
index 0000000000000..1b76dfe6c2a42
--- /dev/null
+++ b/builtin/logical/cassandra/backend_test.go
@@ -0,0 +1,163 @@
+package cassandra
+
+import (
+	"context"
+	"fmt"
+	"log"
+	"testing"
+
+	"github.com/hashicorp/vault/helper/testhelpers/cassandra"
+	logicaltest "github.com/hashicorp/vault/helper/testhelpers/logical"
+	"github.com/hashicorp/vault/sdk/logical"
+	"github.com/mitchellh/mapstructure"
+)
+
+func TestBackend_basic(t *testing.T) {
+	config := logical.TestBackendConfig()
+	config.StorageView = &logical.InmemStorage{}
+	b, err := Factory(context.Background(), config)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	copyFromTo := map[string]string{
+		"test-fixtures/cassandra.yaml": "/etc/cassandra/cassandra.yaml",
+	}
+	host, cleanup := cassandra.PrepareTestContainer(t,
+		cassandra.CopyFromTo(copyFromTo),
+	)
+	defer cleanup()
+
+	logicaltest.Test(t, logicaltest.TestCase{
+		LogicalBackend: b,
+		Steps: []logicaltest.TestStep{
+			testAccStepConfig(t, host.ConnectionURL()),
+			testAccStepRole(t),
+			testAccStepReadCreds(t, "test"),
+		},
+	})
+}
+
+func TestBackend_roleCrud(t *testing.T) {
+	config := logical.TestBackendConfig()
+	config.StorageView = &logical.InmemStorage{}
+	b, err := Factory(context.Background(), config)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	copyFromTo := map[string]string{
+		"test-fixtures/cassandra.yaml": "/etc/cassandra/cassandra.yaml",
+	}
+	host, cleanup := cassandra.PrepareTestContainer(t,
+		cassandra.CopyFromTo(copyFromTo))
+	defer cleanup()
+
+	logicaltest.Test(t, logicaltest.TestCase{
+		LogicalBackend: b,
+		Steps: []logicaltest.TestStep{
+			testAccStepConfig(t, host.ConnectionURL()),
+			testAccStepRole(t),
+			testAccStepRoleWithOptions(t),
+			testAccStepReadRole(t, "test", testRole),
+			testAccStepReadRole(t, "test2", testRole),
+			testAccStepDeleteRole(t, "test"),
+			testAccStepDeleteRole(t, "test2"),
+			testAccStepReadRole(t, "test", ""),
+			testAccStepReadRole(t, "test2", ""),
+		},
+	})
+}
+
+func testAccStepConfig(t *testing.T, hostname string) logicaltest.TestStep {
+	return logicaltest.TestStep{
+		Operation: logical.UpdateOperation,
+		Path:      "config/connection",
+		Data: map[string]interface{}{
+			"hosts":            hostname,
+			"username":         "cassandra",
+			"password":         "cassandra",
+			"protocol_version": 3,
+		},
+	}
+}
+
+func testAccStepRole(t *testing.T) logicaltest.TestStep {
+	return logicaltest.TestStep{
+		Operation: logical.UpdateOperation,
+		Path:      "roles/test",
+		Data: map[string]interface{}{
+			"creation_cql": testRole,
+		},
+	}
+}
+
+func testAccStepRoleWithOptions(t *testing.T) logicaltest.TestStep {
+	return logicaltest.TestStep{
+		Operation: logical.UpdateOperation,
+		Path:      "roles/test2",
+		Data: map[string]interface{}{
+			"creation_cql": testRole,
+			"lease":        "30s",
+			"consistency":  "All",
+		},
+	}
+}
+
+func testAccStepDeleteRole(t *testing.T, n string) logicaltest.TestStep {
+	return logicaltest.TestStep{
+		Operation: logical.DeleteOperation,
+		Path:      "roles/" + n,
+	}
+}
+
+func testAccStepReadCreds(t *testing.T, name string) logicaltest.TestStep {
+	return logicaltest.TestStep{
+		Operation: logical.ReadOperation,
+		Path:      "creds/" + name,
+		Check: func(resp *logical.Response) error {
+			var d struct {
+				Username string `mapstructure:"username"`
+				Password string `mapstructure:"password"`
+			}
+			if err := mapstructure.Decode(resp.Data, &d); err != nil {
+				return err
+			}
+			log.Printf("[WARN] Generated credentials: %v", d)
+
+			return nil
+		},
+	}
+}
+
+func testAccStepReadRole(t *testing.T, name string, cql string) logicaltest.TestStep {
+	return logicaltest.TestStep{
+		Operation: logical.ReadOperation,
+		Path:      "roles/" + name,
+		Check: func(resp *logical.Response) error {
+			if resp == nil {
+				if cql == "" {
+					return nil
+				}
+
+				return fmt.Errorf("response is nil")
+			}
+
+			var d struct {
+				CreationCQL string `mapstructure:"creation_cql"`
+			}
+			if err := mapstructure.Decode(resp.Data, &d); err != nil {
+				return err
+			}
+
+			if d.CreationCQL != cql {
+				return fmt.Errorf("bad: %#v\n%#v\n%#v\n", resp, cql, d.CreationCQL)
+			}
+
+			return nil
+		},
+	}
+}
+
+const testRole = `CREATE USER '{{username}}' WITH PASSWORD '{{password}}' NOSUPERUSER;
+GRANT ALL PERMISSIONS ON ALL KEYSPACES TO {{username}};`
diff --git a/builtin/logical/cassandra/cmd/cassandra/main.go b/builtin/logical/cassandra/cmd/cassandra/main.go
new file mode 100644
index 0000000000000..0ab900aa112aa
--- /dev/null
+++ b/builtin/logical/cassandra/cmd/cassandra/main.go
@@ -0,0 +1,29 @@
+package main
+
+import (
+	"os"
+
+	hclog "github.com/hashicorp/go-hclog"
+	"github.com/hashicorp/vault/api"
+	"github.com/hashicorp/vault/builtin/logical/cassandra"
+	"github.com/hashicorp/vault/sdk/plugin"
+)
+
+func main() {
+	apiClientMeta := &api.PluginAPIClientMeta{}
+	flags := apiClientMeta.FlagSet()
+	flags.Parse(os.Args[1:])
+
+	tlsConfig := apiClientMeta.GetTLSConfig()
+	tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig)
+
+	if err := plugin.Serve(&plugin.ServeOpts{
+		BackendFactoryFunc: cassandra.Factory,
+		TLSProviderFunc:    tlsProviderFunc,
+	}); err != nil {
+		logger := hclog.New(&hclog.LoggerOptions{})
+
+		logger.Error("plugin shutting down", "error", err)
+		os.Exit(1)
+	}
+}
diff --git a/builtin/logical/cassandra/path_config_connection.go b/builtin/logical/cassandra/path_config_connection.go
new file mode 100644
index 0000000000000..afa1816880d81
--- /dev/null
+++ b/builtin/logical/cassandra/path_config_connection.go
@@ -0,0 +1,245 @@
+package cassandra
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/hashicorp/go-secure-stdlib/tlsutil"
+	"github.com/hashicorp/vault/sdk/framework"
+	"github.com/hashicorp/vault/sdk/helper/certutil"
+	"github.com/hashicorp/vault/sdk/logical"
+)
+
+func pathConfigConnection(b *backend) *framework.Path {
+	return &framework.Path{
+		Pattern: "config/connection",
+		Fields: map[string]*framework.FieldSchema{
+			"hosts": {
+				Type:        framework.TypeString,
+				Description: "Comma-separated list of hosts",
+			},
+
+			"username": {
+				Type:        framework.TypeString,
+				Description: "The username to use for connecting to the cluster",
+			},
+
+			"password": {
+				Type:        framework.TypeString,
+				Description: "The password to use for connecting to the cluster",
+			},
+
+			"tls": {
+				Type: framework.TypeBool,
+				Description: `Whether to use TLS. If pem_bundle or pem_json are
+set, this is automatically set to true`,
+			},
+
+			"insecure_tls": {
+				Type: framework.TypeBool,
+				Description: `Whether to use TLS but skip verification; has no
+effect if a CA certificate is provided`,
+			},
+
+			// TLS 1.3 is not supported as this engine is deprecated. Please switch to the Cassandra database secrets engine
+			"tls_min_version": {
+				Type:        framework.TypeString,
+				Default:     "tls12",
+				Description: "Minimum TLS version to use. Accepted values are 'tls10', 'tls11' or 'tls12'. Defaults to 'tls12'",
+			},
+
+			"pem_bundle": {
+				Type: framework.TypeString,
+				Description: `PEM-format, concatenated unencrypted secret key
+and certificate, with optional CA certificate`,
+			},
+
+			"pem_json": {
+				Type: framework.TypeString,
+				Description: `JSON containing a PEM-format, unencrypted secret
+key and certificate, with optional CA certificate.
+The JSON output of a certificate issued with the PKI
+backend can be directly passed into this parameter.
+If both this and "pem_bundle" are specified, this will
+take precedence.`,
+			},
+
+			"protocol_version": {
+				Type:        framework.TypeInt,
+				Description: `The protocol version to use. Defaults to 2.`,
+			},
+
+			"connect_timeout": {
+				Type:        framework.TypeDurationSecond,
+				Default:     5,
+				Description: `The connection timeout to use. Defaults to 5.`,
+			},
+		},
+
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.ReadOperation:   b.pathConnectionRead,
+			logical.UpdateOperation: b.pathConnectionWrite,
+		},
+
+		HelpSynopsis:    pathConfigConnectionHelpSyn,
+		HelpDescription: pathConfigConnectionHelpDesc,
+	}
+}
+
+func (b *backend) pathConnectionRead(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
+	entry, err := req.Storage.Get(ctx, "config/connection")
+	if err != nil {
+		return nil, err
+	}
+	if entry == nil {
+		return logical.ErrorResponse(fmt.Sprintf("Configure the DB connection with config/connection first")), nil
+	}
+
+	config := &sessionConfig{}
+	if err := entry.DecodeJSON(config); err != nil {
+		return nil, err
+	}
+
+	resp := &logical.Response{
+		Data: map[string]interface{}{
+			"hosts":            config.Hosts,
+			"username":         config.Username,
+			"tls":              config.TLS,
+			"insecure_tls":     config.InsecureTLS,
+			"certificate":      config.Certificate,
+			"issuing_ca":       config.IssuingCA,
+			"protocol_version": config.ProtocolVersion,
+			"connect_timeout":  config.ConnectTimeout,
+			"tls_min_version":  config.TLSMinVersion,
+		},
+	}
+	return resp, nil
+}
+
+func (b *backend) pathConnectionWrite(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
+	hosts := data.Get("hosts").(string)
+	username := data.Get("username").(string)
+	password := data.Get("password").(string)
+
+	switch {
+	case len(hosts) == 0:
+		return logical.ErrorResponse("Hosts cannot be empty"), nil
+	case len(username) == 0:
+		return logical.ErrorResponse("Username cannot be empty"), nil
+	case len(password) == 0:
+		return logical.ErrorResponse("Password cannot be empty"), nil
+	}
+
+	config := &sessionConfig{
+		Hosts:           hosts,
+		Username:        username,
+		Password:        password,
+		TLS:             data.Get("tls").(bool),
+		InsecureTLS:     data.Get("insecure_tls").(bool),
+		ProtocolVersion: data.Get("protocol_version").(int),
+		ConnectTimeout:  data.Get("connect_timeout").(int),
+	}
+
+	config.TLSMinVersion = data.Get("tls_min_version").(string)
+	if config.TLSMinVersion == "" {
+		return logical.ErrorResponse("failed to get 'tls_min_version' value"), nil
+	}
+
+	var ok bool
+	_, ok = tlsutil.TLSLookup[config.TLSMinVersion]
+	if !ok {
+		return logical.ErrorResponse("invalid 'tls_min_version'"), nil
+	}
+
+	if config.InsecureTLS {
+		config.TLS = true
+	}
+
+	pemBundle := data.Get("pem_bundle").(string)
+	pemJSON := data.Get("pem_json").(string)
+
+	var certBundle *certutil.CertBundle
+	var parsedCertBundle *certutil.ParsedCertBundle
+	var err error
+
+	switch {
+	case len(pemJSON) != 0:
+		parsedCertBundle, err = certutil.ParsePKIJSON([]byte(pemJSON))
+		if err != nil {
+			return logical.ErrorResponse(fmt.Sprintf("Could not parse given JSON; it must be in the format of the output of the PKI backend certificate issuing command: %s", err)), nil
+		}
+		certBundle, err = parsedCertBundle.ToCertBundle()
+		if err != nil {
+			return logical.ErrorResponse(fmt.Sprintf("Error marshaling PEM information: %s", err)), nil
+		}
+		config.Certificate = certBundle.Certificate
+		config.PrivateKey = certBundle.PrivateKey
+		config.IssuingCA = certBundle.IssuingCA
+		config.TLS = true
+
+	case len(pemBundle) != 0:
+		parsedCertBundle, err = certutil.ParsePEMBundle(pemBundle)
+		if err != nil {
+			return logical.ErrorResponse(fmt.Sprintf("Error parsing the given PEM information: %s", err)), nil
+		}
+		certBundle, err = parsedCertBundle.ToCertBundle()
+		if err != nil {
+			return logical.ErrorResponse(fmt.Sprintf("Error marshaling PEM information: %s", err)), nil
+		}
+		config.Certificate = certBundle.Certificate
+		config.PrivateKey = certBundle.PrivateKey
+		config.IssuingCA = certBundle.IssuingCA
+		config.TLS = true
+	}
+
+	session, err := createSession(config, req.Storage)
+	if err != nil {
+		return logical.ErrorResponse(err.Error()), nil
+	}
+
+	// Store it
+	entry, err := logical.StorageEntryJSON("config/connection", config)
+	if err != nil {
+		return nil, err
+	}
+	if err := req.Storage.Put(ctx, entry); err != nil {
+		return nil, err
+	}
+
+	// Reset the DB connection
+	b.ResetDB(session)
+
+	return nil, nil
+}
+
+const pathConfigConnectionHelpSyn = `
+Configure the connection information to talk to Cassandra.
+`
+
+const pathConfigConnectionHelpDesc = `
+This path configures the connection information used to connect to Cassandra.
+
+"hosts" is a comma-delimited list of hostnames in the Cassandra cluster.
+
+"username" and "password" are self-explanatory, although the given user
+must have superuser access within Cassandra. Note that since this backend
+issues username/password credentials, Cassandra must be configured to use
+PasswordAuthenticator or a similar backend for its authentication. If you wish
+to have no authorization in Cassandra and want to use TLS client certificates,
+see the PKI backend.
+
+TLS works as follows:
+
+* If "tls" is set to true, the connection will use TLS; this happens automatically if "pem_bundle", "pem_json", or "insecure_tls" is set
+
+* If "insecure_tls" is set to true, the connection will not perform verification of the server certificate; this also sets "tls" to true
+
+* If only "issuing_ca" is set in "pem_json", or the only certificate in "pem_bundle" is a CA certificate, the given CA certificate will be used for server certificate verification; otherwise the system CA certificates will be used
+
+* If "certificate" and "private_key" are set in "pem_bundle" or "pem_json", client auth will be turned on for the connection
+
+"pem_bundle" should be a PEM-concatenated bundle of a private key + client certificate, an issuing CA certificate, or both. "pem_json" should contain the same information; for convenience, the JSON format is the same as that output by the issue command from the PKI backend.
+
+When configuring the connection information, the backend will verify its
+validity.
+`
diff --git a/builtin/logical/cassandra/path_creds_create.go b/builtin/logical/cassandra/path_creds_create.go
new file mode 100644
index 0000000000000..ec100b961317b
--- /dev/null
+++ b/builtin/logical/cassandra/path_creds_create.go
@@ -0,0 +1,123 @@
+package cassandra
+
+import (
+	"context"
+	"fmt"
+	"strings"
+	"time"
+
+	"github.com/gocql/gocql"
+	"github.com/hashicorp/go-secure-stdlib/strutil"
+	uuid "github.com/hashicorp/go-uuid"
+	"github.com/hashicorp/vault/sdk/framework"
+	"github.com/hashicorp/vault/sdk/logical"
+)
+
+func pathCredsCreate(b *backend) *framework.Path {
+	return &framework.Path{
+		Pattern: "creds/" + framework.GenericNameRegex("name"),
+		Fields: map[string]*framework.FieldSchema{
+			"name": {
+				Type:        framework.TypeString,
+				Description: "Name of the role",
+			},
+		},
+
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.ReadOperation: b.pathCredsCreateRead,
+		},
+
+		HelpSynopsis:    pathCredsCreateReadHelpSyn,
+		HelpDescription: pathCredsCreateReadHelpDesc,
+	}
+}
+
+func (b *backend) pathCredsCreateRead(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
+	name := data.Get("name").(string)
+
+	// Get the role
+	role, err := getRole(ctx, req.Storage, name)
+	if err != nil {
+		return nil, err
+	}
+	if role == nil {
+		return logical.ErrorResponse(fmt.Sprintf("Unknown role: %s", name)), nil
+	}
+
+	displayName := req.DisplayName
+	userUUID, err := uuid.GenerateUUID()
+	if err != nil {
+		return nil, err
+	}
+	username := fmt.Sprintf("vault_%s_%s_%s_%d", name, displayName, userUUID, time.Now().Unix())
+	username = strings.ReplaceAll(username, "-", "_")
+	password, err := uuid.GenerateUUID()
+	if err != nil {
+		return nil, err
+	}
+
+	// Get our connection
+	session, err := b.DB(ctx, req.Storage)
+	if err != nil {
+		return nil, err
+	}
+
+	// Set consistency
+	if role.Consistency != "" {
+		consistencyValue, err := gocql.ParseConsistencyWrapper(role.Consistency)
+		if err != nil {
+			return nil, err
+		}
+
+		session.SetConsistency(consistencyValue)
+	}
+
+	// Execute each query
+	for _, query := range strutil.ParseArbitraryStringSlice(role.CreationCQL, ";") {
+		query = strings.TrimSpace(query)
+		if len(query) == 0 {
+			continue
+		}
+
+		err = session.Query(substQuery(query, map[string]string{
+			"username": username,
+			"password": password,
+		})).Exec()
+		if err != nil {
+			for _, query := range strutil.ParseArbitraryStringSlice(role.RollbackCQL, ";") {
+				query = strings.TrimSpace(query)
+				if len(query) == 0 {
+					continue
+				}
+
+				session.Query(substQuery(query, map[string]string{
+					"username": username,
+					"password": password,
+				})).Exec()
+			}
+			return nil, err
+		}
+	}
+
+	// Return the secret
+	resp := b.Secret(SecretCredsType).Response(map[string]interface{}{
+		"username": username,
+		"password": password,
+	}, map[string]interface{}{
+		"username": username,
+		"role":     name,
+	})
+	resp.Secret.TTL = role.Lease
+
+	return resp, nil
+}
+
+const pathCredsCreateReadHelpSyn = `
+Request database credentials for a certain role.
+`
+
+const pathCredsCreateReadHelpDesc = `
+This path creates database credentials for a certain role. The
+database credentials will be generated on demand and will be automatically
+revoked when the lease is up.
+`
diff --git a/builtin/logical/cassandra/path_roles.go b/builtin/logical/cassandra/path_roles.go
new file mode 100644
index 0000000000000..df7671e47e7cc
--- /dev/null
+++ b/builtin/logical/cassandra/path_roles.go
@@ -0,0 +1,196 @@
+package cassandra
+
+import (
+	"context"
+	"fmt"
+	"time"
+
+	"github.com/fatih/structs"
+	"github.com/gocql/gocql"
+	"github.com/hashicorp/vault/sdk/framework"
+	"github.com/hashicorp/vault/sdk/logical"
+)
+
+const (
+	defaultCreationCQL = `CREATE USER '{{username}}' WITH PASSWORD '{{password}}' NOSUPERUSER;`
+	defaultRollbackCQL = `DROP USER '{{username}}';`
+)
+
+func pathRoles(b *backend) *framework.Path {
+	return &framework.Path{
+		Pattern: "roles/" + framework.GenericNameRegex("name"),
+		Fields: map[string]*framework.FieldSchema{
+			"name": {
+				Type:        framework.TypeString,
+				Description: "Name of the role",
+			},
+
+			"creation_cql": {
+				Type:    framework.TypeString,
+				Default: defaultCreationCQL,
+				Description: `CQL to create a user and optionally grant
+authorization. If not supplied, a default that
+creates non-superuser accounts with the built-in
+password authenticator will be used; no
+authorization grants will be configured. Separate
+statements by semicolons; use @file to load from a
+file. Valid template values are '{{username}}' and
+'{{password}}' -- the single quotes are important!`,
+			},
+
+			"rollback_cql": {
+				Type:    framework.TypeString,
+				Default: defaultRollbackCQL,
+				Description: `CQL to roll back an account operation. This will
+be used if there is an error during execution of a
+statement passed in via the "creation_cql" parameter
+parameter. The default simply drops the user, which
+should generally be sufficient. Separate statements
+by semicolons; use @file to load from a file. Valid
+template values are '{{username}}' and
+'{{password}}' -- the single quotes are important!`,
+			},
+
+			"lease": {
+				Type:        framework.TypeString,
+				Default:     "4h",
+				Description: "The lease length; defaults to 4 hours",
+			},
+
+			"consistency": {
+				Type:        framework.TypeString,
+				Default:     "Quorum",
+				Description: "The consistency level for the operations; defaults to Quorum.",
+			},
+		},
+
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.ReadOperation:   b.pathRoleRead,
+			logical.UpdateOperation: b.pathRoleCreate,
+			logical.DeleteOperation: b.pathRoleDelete,
+		},
+
+		HelpSynopsis:    pathRoleHelpSyn,
+		HelpDescription: pathRoleHelpDesc,
+	}
+}
+
+func getRole(ctx context.Context, s logical.Storage, n string) (*roleEntry, error) {
+	entry, err := s.Get(ctx, "role/"+n)
+	if err != nil {
+		return nil, err
+	}
+	if entry == nil {
+		return nil, nil
+	}
+
+	var result roleEntry
+	if err := entry.DecodeJSON(&result); err != nil {
+		return nil, err
+	}
+
+	return &result, nil
+}
+
+func (b *backend) pathRoleDelete(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
+	err := req.Storage.Delete(ctx, "role/"+data.Get("name").(string))
+	if err != nil {
+		return nil, err
+	}
+
+	return nil, nil
+}
+
+func (b *backend) pathRoleRead(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
+	role, err := getRole(ctx, req.Storage, data.Get("name").(string))
+	if err != nil {
+		return nil, err
+	}
+	if role == nil {
+		return nil, nil
+	}
+
+	return &logical.Response{
+		Data: structs.New(role).Map(),
+	}, nil
+}
+
+func (b *backend) pathRoleCreate(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
+	name := data.Get("name").(string)
+
+	creationCQL := data.Get("creation_cql").(string)
+
+	rollbackCQL := data.Get("rollback_cql").(string)
+
+	leaseRaw := data.Get("lease").(string)
+	lease, err := time.ParseDuration(leaseRaw)
+	if err != nil {
+		return logical.ErrorResponse(fmt.Sprintf(
+			"Error parsing lease value of %s: %s", leaseRaw, err)), nil
+	}
+
+	consistencyStr := data.Get("consistency").(string)
+	_, err = gocql.ParseConsistencyWrapper(consistencyStr)
+	if err != nil {
+		return logical.ErrorResponse(fmt.Sprintf(
+			"Error parsing consistency value of %q: %v", consistencyStr, err)), nil
+	}
+
+	entry := &roleEntry{
+		Lease:       lease,
+		CreationCQL: creationCQL,
+		RollbackCQL: rollbackCQL,
+		Consistency: consistencyStr,
+	}
+
+	// Store it
+	entryJSON, err := logical.StorageEntryJSON("role/"+name, entry)
+	if err != nil {
+		return nil, err
+	}
+	if err := req.Storage.Put(ctx, entryJSON); err != nil {
+		return nil, err
+	}
+
+	return nil, nil
+}
+
+type roleEntry struct {
+	CreationCQL string        `json:"creation_cql" structs:"creation_cql"`
+	Lease       time.Duration `json:"lease" structs:"lease"`
+	RollbackCQL string        `json:"rollback_cql" structs:"rollback_cql"`
+	Consistency string        `json:"consistency" structs:"consistency"`
+}
+
+const pathRoleHelpSyn = `
+Manage the roles that can be created with this backend.
+`
+
+const pathRoleHelpDesc = `
+This path lets you manage the roles that can be created with this backend.
+
+The "creation_cql" parameter customizes the CQL string used to create users
+and assign them grants. This can be a sequence of CQL queries separated by
+semicolons. Some substitution will be done to the CQL string for certain keys.
+The names of the variables must be surrounded by '{{' and '}}' to be replaced.
+Note that it is important that single quotes are used, not double quotes.
+
+  * "username" - The random username generated for the DB user.
+
+  * "password" - The random password generated for the DB user.
+
+If no "creation_cql" parameter is given, a default will be used:
+
+` + defaultCreationCQL + `
+
+This default should be suitable for Cassandra installations using the password
+authenticator but not configured to use authorization.
+
+Similarly, the "rollback_cql" is used if user creation fails, in the absence of
+Cassandra transactions. The default should be suitable for almost any
+instance of Cassandra:
+
+` + defaultRollbackCQL + `
+
+"lease" the lease time; if not set the mount/system defaults are used.
+`
diff --git a/builtin/logical/cassandra/secret_creds.go b/builtin/logical/cassandra/secret_creds.go
new file mode 100644
index 0000000000000..3ca06c9279038
--- /dev/null
+++ b/builtin/logical/cassandra/secret_creds.go
@@ -0,0 +1,77 @@
+package cassandra
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/hashicorp/vault/sdk/framework"
+	"github.com/hashicorp/vault/sdk/logical"
+)
+
+// SecretCredsType is the type of creds issued from this backend
+const SecretCredsType = "cassandra"
+
+func secretCreds(b *backend) *framework.Secret {
+	return &framework.Secret{
+		Type: SecretCredsType,
+		Fields: map[string]*framework.FieldSchema{
+			"username": {
+				Type:        framework.TypeString,
+				Description: "Username",
+			},
+
+			"password": {
+				Type:        framework.TypeString,
+				Description: "Password",
+			},
+		},
+
+		Renew:  b.secretCredsRenew,
+		Revoke: b.secretCredsRevoke,
+	}
+}
+
+func (b *backend) secretCredsRenew(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
+	// Get the lease information
+	roleRaw, ok := req.Secret.InternalData["role"]
+	if !ok {
+		return nil, fmt.Errorf("secret is missing role internal data")
+	}
+	roleName, ok := roleRaw.(string)
+	if !ok {
+		return nil, fmt.Errorf("error converting role internal data to string")
+	}
+
+	role, err := getRole(ctx, req.Storage, roleName)
+	if err != nil {
+		return nil, fmt.Errorf("unable to load role: %w", err)
+	}
+
+	resp := &logical.Response{Secret: req.Secret}
+	resp.Secret.TTL = role.Lease
+	return resp, nil
+}
+
+func (b *backend) secretCredsRevoke(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
+	// Get the username from the internal data
+	usernameRaw, ok := req.Secret.InternalData["username"]
+	if !ok {
+		return nil, fmt.Errorf("secret is missing username internal data")
+	}
+	username, ok := usernameRaw.(string)
+	if !ok {
+		return nil, fmt.Errorf("error converting username internal data to string")
+	}
+
+	session, err := b.DB(ctx, req.Storage)
+	if err != nil {
+		return nil, fmt.Errorf("error getting session")
+	}
+
+	err = session.Query(fmt.Sprintf("DROP USER '%s'", username)).Exec()
+	if err != nil {
+		return nil, fmt.Errorf("error removing user %q", username)
+	}
+
+	return nil, nil
+}
diff --git a/builtin/logical/cassandra/test-fixtures/cassandra.yaml b/builtin/logical/cassandra/test-fixtures/cassandra.yaml
new file mode 100644
index 0000000000000..fe1ec8b07bbd0
--- /dev/null
+++ b/builtin/logical/cassandra/test-fixtures/cassandra.yaml
@@ -0,0 +1,1146 @@
+# Cassandra storage config YAML
+
+# NOTE:
+#   See http://wiki.apache.org/cassandra/StorageConfiguration for
+#   full explanations of configuration directives
+# /NOTE
+
+# The name of the cluster. This is mainly used to prevent machines in
+# one logical cluster from joining another.
+cluster_name: 'Test Cluster'
+
+# This defines the number of tokens randomly assigned to this node on the ring
+# The more tokens, relative to other nodes, the larger the proportion of data
+# that this node will store. You probably want all nodes to have the same number
+# of tokens assuming they have equal hardware capability.
+#
+# If you leave this unspecified, Cassandra will use the default of 1 token for legacy compatibility,
+# and will use the initial_token as described below.
+#
+# Specifying initial_token will override this setting on the node's initial start,
+# on subsequent starts, this setting will apply even if initial token is set.
+#
+# If you already have a cluster with 1 token per node, and wish to migrate to
+# multiple tokens per node, see http://wiki.apache.org/cassandra/Operations
+num_tokens: 256
+
+# Triggers automatic allocation of num_tokens tokens for this node. The allocation
+# algorithm attempts to choose tokens in a way that optimizes replicated load over
+# the nodes in the datacenter for the replication strategy used by the specified
+# keyspace.
+#
+# The load assigned to each node will be close to proportional to its number of
+# vnodes.
+#
+# Only supported with the Murmur3Partitioner.
+# allocate_tokens_for_keyspace: KEYSPACE
+
+# initial_token allows you to specify tokens manually.  While you can use it with
+# vnodes (num_tokens > 1, above) -- in which case you should provide a
+# comma-separated list -- it's primarily used when adding nodes to legacy clusters
+# that do not have vnodes enabled.
+# initial_token:
+
+# See http://wiki.apache.org/cassandra/HintedHandoff
+# May either be "true" or "false" to enable globally
+hinted_handoff_enabled: true
+
+# When hinted_handoff_enabled is true, a black list of data centers that will not
+# perform hinted handoff
+# hinted_handoff_disabled_datacenters:
+#    - DC1
+#    - DC2
+
+# this defines the maximum amount of time a dead host will have hints
+# generated.  After it has been dead this long, new hints for it will not be
+# created until it has been seen alive and gone down again.
+max_hint_window_in_ms: 10800000 # 3 hours
+
+# Maximum throttle in KBs per second, per delivery thread.  This will be
+# reduced proportionally to the number of nodes in the cluster.  (If there
+# are two nodes in the cluster, each delivery thread will use the maximum
+# rate; if there are three, each will throttle to half of the maximum,
+# since we expect two nodes to be delivering hints simultaneously.)
+hinted_handoff_throttle_in_kb: 1024
+
+# Number of threads with which to deliver hints;
+# Consider increasing this number when you have multi-dc deployments, since
+# cross-dc handoff tends to be slower
+max_hints_delivery_threads: 2
+
+# Directory where Cassandra should store hints.
+# If not set, the default directory is $CASSANDRA_HOME/data/hints.
+# hints_directory: /var/lib/cassandra/hints
+
+# How often hints should be flushed from the internal buffers to disk.
+# Will *not* trigger fsync.
+hints_flush_period_in_ms: 10000
+
+# Maximum size for a single hints file, in megabytes.
+max_hints_file_size_in_mb: 128
+
+# Compression to apply to the hint files. If omitted, hints files
+# will be written uncompressed. LZ4, Snappy, and Deflate compressors
+# are supported.
+#hints_compression:
+#   - class_name: LZ4Compressor
+#     parameters:
+#         -
+
+# Maximum throttle in KBs per second, total. This will be
+# reduced proportionally to the number of nodes in the cluster.
+batchlog_replay_throttle_in_kb: 1024
+
+# Authentication backend, implementing IAuthenticator; used to identify users
+# Out of the box, Cassandra provides org.apache.cassandra.auth.{AllowAllAuthenticator,
+# PasswordAuthenticator}.
+#
+# - AllowAllAuthenticator performs no checks - set it to disable authentication.
+# - PasswordAuthenticator relies on username/password pairs to authenticate
+#   users. It keeps usernames and hashed passwords in system_auth.credentials table.
+#   Please increase system_auth keyspace replication factor if you use this authenticator.
+#   If using PasswordAuthenticator, CassandraRoleManager must also be used (see below)
+authenticator: PasswordAuthenticator
+
+# Authorization backend, implementing IAuthorizer; used to limit access/provide permissions
+# Out of the box, Cassandra provides org.apache.cassandra.auth.{AllowAllAuthorizer,
+# CassandraAuthorizer}.
+#
+# - AllowAllAuthorizer allows any action to any user - set it to disable authorization.
+# - CassandraAuthorizer stores permissions in system_auth.permissions table. Please
+#   increase system_auth keyspace replication factor if you use this authorizer.
+authorizer: CassandraAuthorizer
+
+# Part of the Authentication & Authorization backend, implementing IRoleManager; used
+# to maintain grants and memberships between roles.
+# Out of the box, Cassandra provides org.apache.cassandra.auth.CassandraRoleManager,
+# which stores role information in the system_auth keyspace. Most functions of the
+# IRoleManager require an authenticated login, so unless the configured IAuthenticator
+# actually implements authentication, most of this functionality will be unavailable.
+#
+# - CassandraRoleManager stores role data in the system_auth keyspace. Please
+#   increase system_auth keyspace replication factor if you use this role manager.
+role_manager: CassandraRoleManager
+
+# Validity period for roles cache (fetching granted roles can be an expensive
+# operation depending on the role manager, CassandraRoleManager is one example)
+# Granted roles are cached for authenticated sessions in AuthenticatedUser and
+# after the period specified here, become eligible for (async) reload.
+# Defaults to 2000, set to 0 to disable caching entirely.
+# Will be disabled automatically for AllowAllAuthenticator.
+roles_validity_in_ms: 2000
+
+# Refresh interval for roles cache (if enabled).
+# After this interval, cache entries become eligible for refresh. Upon next
+# access, an async reload is scheduled and the old value returned until it
+# completes. If roles_validity_in_ms is non-zero, then this must be
+# also.
+# Defaults to the same value as roles_validity_in_ms.
+# roles_update_interval_in_ms: 2000
+
+# Validity period for permissions cache (fetching permissions can be an
+# expensive operation depending on the authorizer, CassandraAuthorizer is
+# one example). Defaults to 2000, set to 0 to disable.
+# Will be disabled automatically for AllowAllAuthorizer.
+permissions_validity_in_ms: 2000
+
+# Refresh interval for permissions cache (if enabled).
+# After this interval, cache entries become eligible for refresh. Upon next
+# access, an async reload is scheduled and the old value returned until it
+# completes. If permissions_validity_in_ms is non-zero, then this must be
+# also.
+# Defaults to the same value as permissions_validity_in_ms.
+# permissions_update_interval_in_ms: 2000
+
+# Validity period for credentials cache. This cache is tightly coupled to
+# the provided PasswordAuthenticator implementation of IAuthenticator. If
+# another IAuthenticator implementation is configured, this cache will not
+# be automatically used and so the following settings will have no effect.
+# Please note, credentials are cached in their encrypted form, so while
+# activating this cache may reduce the number of queries made to the
+# underlying table, it may not  bring a significant reduction in the
+# latency of individual authentication attempts.
+# Defaults to 2000, set to 0 to disable credentials caching.
+credentials_validity_in_ms: 2000
+
+# Refresh interval for credentials cache (if enabled).
+# After this interval, cache entries become eligible for refresh. Upon next
+# access, an async reload is scheduled and the old value returned until it
+# completes. If credentials_validity_in_ms is non-zero, then this must be
+# also.
+# Defaults to the same value as credentials_validity_in_ms.
+# credentials_update_interval_in_ms: 2000
+
+# The partitioner is responsible for distributing groups of rows (by
+# partition key) across nodes in the cluster.  You should leave this
+# alone for new clusters.  The partitioner can NOT be changed without
+# reloading all data, so when upgrading you should set this to the
+# same partitioner you were already using.
+#
+# Besides Murmur3Partitioner, partitioners included for backwards
+# compatibility include RandomPartitioner, ByteOrderedPartitioner, and
+# OrderPreservingPartitioner.
+#
+partitioner: org.apache.cassandra.dht.Murmur3Partitioner
+
+# Directories where Cassandra should store data on disk.  Cassandra
+# will spread data evenly across them, subject to the granularity of
+# the configured compaction strategy.
+# If not set, the default directory is $CASSANDRA_HOME/data/data.
+data_file_directories:
+    - /var/lib/cassandra/data
+
+# commit log.  when running on magnetic HDD, this should be a
+# separate spindle than the data directories.
+# If not set, the default directory is $CASSANDRA_HOME/data/commitlog.
+commitlog_directory: /var/lib/cassandra/commitlog
+
+# Enable / disable CDC functionality on a per-node basis. This modifies the logic used
+# for write path allocation rejection (standard: never reject. cdc: reject Mutation
+# containing a CDC-enabled table if at space limit in cdc_raw_directory).
+cdc_enabled: false
+
+# CommitLogSegments are moved to this directory on flush if cdc_enabled: true and the
+# segment contains mutations for a CDC-enabled table. This should be placed on a
+# separate spindle than the data directories. If not set, the default directory is
+# $CASSANDRA_HOME/data/cdc_raw.
+# cdc_raw_directory: /var/lib/cassandra/cdc_raw
+
+# Policy for data disk failures:
+#
+# die
+#   shut down gossip and client transports and kill the JVM for any fs errors or
+#   single-sstable errors, so the node can be replaced.
+#
+# stop_paranoid
+#   shut down gossip and client transports even for single-sstable errors,
+#   kill the JVM for errors during startup.
+#
+# stop
+#   shut down gossip and client transports, leaving the node effectively dead, but
+#   can still be inspected via JMX, kill the JVM for errors during startup.
+#
+# best_effort
+#    stop using the failed disk and respond to requests based on
+#    remaining available sstables.  This means you WILL see obsolete
+#    data at CL.ONE!
+#
+# ignore
+#    ignore fatal errors and let requests fail, as in pre-1.2 Cassandra
+disk_failure_policy: stop
+
+# Policy for commit disk failures:
+#
+# die
+#   shut down gossip and Thrift and kill the JVM, so the node can be replaced.
+#
+# stop
+#   shut down gossip and Thrift, leaving the node effectively dead, but
+#   can still be inspected via JMX.
+#
+# stop_commit
+#   shutdown the commit log, letting writes collect but
+#   continuing to service reads, as in pre-2.0.5 Cassandra
+#
+# ignore
+#   ignore fatal errors and let the batches fail
+commit_failure_policy: stop
+
+# Maximum size of the native protocol prepared statement cache
+#
+# Valid values are either "auto" (omitting the value) or a value greater 0.
+#
+# Note that specifying a too large value will result in long running GCs and possibly
+# out-of-memory errors. Keep the value at a small fraction of the heap.
+#
+# If you constantly see "prepared statements discarded in the last minute because
+# cache limit reached" messages, the first step is to investigate the root cause
+# of these messages and check whether prepared statements are used correctly -
+# i.e. use bind markers for variable parts.
+#
+# Do only change the default value, if you really have more prepared statements than
+# fit in the cache. In most cases it is not necessary to change this value.
+# Constantly re-preparing statements is a performance penalty.
+#
+# Default value ("auto") is 1/256th of the heap or 10MB, whichever is greater
+prepared_statements_cache_size_mb:
+
+# Maximum size of the Thrift prepared statement cache
+#
+# If you do not use Thrift at all, it is safe to leave this value at "auto".
+#
+# See description of 'prepared_statements_cache_size_mb' above for more information.
+#
+# Default value ("auto") is 1/256th of the heap or 10MB, whichever is greater
+thrift_prepared_statements_cache_size_mb:
+
+# Maximum size of the key cache in memory.
+#
+# Each key cache hit saves 1 seek and each row cache hit saves 2 seeks at the
+# minimum, sometimes more. The key cache is fairly tiny for the amount of
+# time it saves, so it's worthwhile to use it at large numbers.
+# The row cache saves even more time, but must contain the entire row,
+# so it is extremely space-intensive. It's best to only use the
+# row cache if you have hot rows or static rows.
+#
+# NOTE: if you reduce the size, you may not get you hottest keys loaded on startup.
+#
+# Default value is empty to make it "auto" (min(5% of Heap (in MB), 100MB)). Set to 0 to disable key cache.
+key_cache_size_in_mb:
+
+# Duration in seconds after which Cassandra should
+# save the key cache. Caches are saved to saved_caches_directory as
+# specified in this configuration file.
+#
+# Saved caches greatly improve cold-start speeds, and is relatively cheap in
+# terms of I/O for the key cache. Row cache saving is much more expensive and
+# has limited use.
+#
+# Default is 14400 or 4 hours.
+key_cache_save_period: 14400
+
+# Number of keys from the key cache to save
+# Disabled by default, meaning all keys are going to be saved
+# key_cache_keys_to_save: 100
+
+# Row cache implementation class name. Available implementations:
+#
+# org.apache.cassandra.cache.OHCProvider
+#   Fully off-heap row cache implementation (default).
+#
+# org.apache.cassandra.cache.SerializingCacheProvider
+#   This is the row cache implementation availabile
+#   in previous releases of Cassandra.
+# row_cache_class_name: org.apache.cassandra.cache.OHCProvider
+
+# Maximum size of the row cache in memory.
+# Please note that OHC cache implementation requires some additional off-heap memory to manage
+# the map structures and some in-flight memory during operations before/after cache entries can be
+# accounted against the cache capacity. This overhead is usually small compared to the whole capacity.
+# Do not specify more memory that the system can afford in the worst usual situation and leave some
+# headroom for OS block level cache. Do never allow your system to swap.
+#
+# Default value is 0, to disable row caching.
+row_cache_size_in_mb: 0
+
+# Duration in seconds after which Cassandra should save the row cache.
+# Caches are saved to saved_caches_directory as specified in this configuration file.
+#
+# Saved caches greatly improve cold-start speeds, and is relatively cheap in
+# terms of I/O for the key cache. Row cache saving is much more expensive and
+# has limited use.
+#
+# Default is 0 to disable saving the row cache.
+row_cache_save_period: 0
+
+# Number of keys from the row cache to save.
+# Specify 0 (which is the default), meaning all keys are going to be saved
+# row_cache_keys_to_save: 100
+
+# Maximum size of the counter cache in memory.
+#
+# Counter cache helps to reduce counter locks' contention for hot counter cells.
+# In case of RF = 1 a counter cache hit will cause Cassandra to skip the read before
+# write entirely. With RF > 1 a counter cache hit will still help to reduce the duration
+# of the lock hold, helping with hot counter cell updates, but will not allow skipping
+# the read entirely. Only the local (clock, count) tuple of a counter cell is kept
+# in memory, not the whole counter, so it's relatively cheap.
+#
+# NOTE: if you reduce the size, you may not get you hottest keys loaded on startup.
+#
+# Default value is empty to make it "auto" (min(2.5% of Heap (in MB), 50MB)). Set to 0 to disable counter cache.
+# NOTE: if you perform counter deletes and rely on low gcgs, you should disable the counter cache.
+counter_cache_size_in_mb:
+
+# Duration in seconds after which Cassandra should
+# save the counter cache (keys only). Caches are saved to saved_caches_directory as
+# specified in this configuration file.
+#
+# Default is 7200 or 2 hours.
+counter_cache_save_period: 7200
+
+# Number of keys from the counter cache to save
+# Disabled by default, meaning all keys are going to be saved
+# counter_cache_keys_to_save: 100
+
+# saved caches
+# If not set, the default directory is $CASSANDRA_HOME/data/saved_caches.
+saved_caches_directory: /var/lib/cassandra/saved_caches
+
+# commitlog_sync may be either "periodic" or "batch."
+#
+# When in batch mode, Cassandra won't ack writes until the commit log
+# has been fsynced to disk.  It will wait
+# commitlog_sync_batch_window_in_ms milliseconds between fsyncs.
+# This window should be kept short because the writer threads will
+# be unable to do extra work while waiting.  (You may need to increase
+# concurrent_writes for the same reason.)
+#
+# commitlog_sync: batch
+# commitlog_sync_batch_window_in_ms: 2
+#
+# the other option is "periodic" where writes may be acked immediately
+# and the CommitLog is simply synced every commitlog_sync_period_in_ms
+# milliseconds.
+commitlog_sync: periodic
+commitlog_sync_period_in_ms: 10000
+
+# The size of the individual commitlog file segments.  A commitlog
+# segment may be archived, deleted, or recycled once all the data
+# in it (potentially from each columnfamily in the system) has been
+# flushed to sstables.
+#
+# The default size is 32, which is almost always fine, but if you are
+# archiving commitlog segments (see commitlog_archiving.properties),
+# then you probably want a finer granularity of archiving; 8 or 16 MB
+# is reasonable.
+# Max mutation size is also configurable via max_mutation_size_in_kb setting in
+# cassandra.yaml. The default is half the size commitlog_segment_size_in_mb * 1024.
+#
+# NOTE: If max_mutation_size_in_kb is set explicitly then commitlog_segment_size_in_mb must
+# be set to at least twice the size of max_mutation_size_in_kb / 1024
+#
+commitlog_segment_size_in_mb: 32
+
+# Compression to apply to the commit log. If omitted, the commit log
+# will be written uncompressed.  LZ4, Snappy, and Deflate compressors
+# are supported.
+# commitlog_compression:
+#   - class_name: LZ4Compressor
+#     parameters:
+#         -
+
+# any class that implements the SeedProvider interface and has a
+# constructor that takes a Map<String, String> of parameters will do.
+seed_provider:
+    # Addresses of hosts that are deemed contact points.
+    # Cassandra nodes use this list of hosts to find each other and learn
+    # the topology of the ring.  You must change this if you are running
+    # multiple nodes!
+    - class_name: org.apache.cassandra.locator.SimpleSeedProvider
+      parameters:
+          # seeds is actually a comma-delimited list of addresses.
+          # Ex: "<ip1>,<ip2>,<ip3>"
+          - seeds: "127.0.0.1"
+
+# For workloads with more data than can fit in memory, Cassandra's
+# bottleneck will be reads that need to fetch data from
+# disk. "concurrent_reads" should be set to (16 * number_of_drives) in
+# order to allow the operations to enqueue low enough in the stack
+# that the OS and drives can reorder them. Same applies to
+# "concurrent_counter_writes", since counter writes read the current
+# values before incrementing and writing them back.
+#
+# On the other hand, since writes are almost never IO bound, the ideal
+# number of "concurrent_writes" is dependent on the number of cores in
+# your system; (8 * number_of_cores) is a good rule of thumb.
+concurrent_reads: 32
+concurrent_writes: 32
+concurrent_counter_writes: 32
+
+# For materialized view writes, as there is a read involved, so this should
+# be limited by the less of concurrent reads or concurrent writes.
+concurrent_materialized_view_writes: 32
+
+# Maximum memory to use for sstable chunk cache and buffer pooling.
+# 32MB of this are reserved for pooling buffers, the rest is used as an
+# cache that holds uncompressed sstable chunks.
+# Defaults to the smaller of 1/4 of heap or 512MB. This pool is allocated off-heap,
+# so is in addition to the memory allocated for heap. The cache also has on-heap
+# overhead which is roughly 128 bytes per chunk (i.e. 0.2% of the reserved size
+# if the default 64k chunk size is used).
+# Memory is only allocated when needed.
+# file_cache_size_in_mb: 512
+
+# Flag indicating whether to allocate on or off heap when the sstable buffer
+# pool is exhausted, that is when it has exceeded the maximum memory
+# file_cache_size_in_mb, beyond which it will not cache buffers but allocate on request.
+
+# buffer_pool_use_heap_if_exhausted: true
+
+# The strategy for optimizing disk read
+# Possible values are:
+# ssd (for solid state disks, the default)
+# spinning (for spinning disks)
+# disk_optimization_strategy: ssd
+
+# Total permitted memory to use for memtables. Cassandra will stop
+# accepting writes when the limit is exceeded until a flush completes,
+# and will trigger a flush based on memtable_cleanup_threshold
+# If omitted, Cassandra will set both to 1/4 the size of the heap.
+# memtable_heap_space_in_mb: 2048
+# memtable_offheap_space_in_mb: 2048
+
+# Ratio of occupied non-flushing memtable size to total permitted size
+# that will trigger a flush of the largest memtable. Larger mct will
+# mean larger flushes and hence less compaction, but also less concurrent
+# flush activity which can make it difficult to keep your disks fed
+# under heavy write load.
+#
+# memtable_cleanup_threshold defaults to 1 / (memtable_flush_writers + 1)
+# memtable_cleanup_threshold: 0.11
+
+# Specify the way Cassandra allocates and manages memtable memory.
+# Options are:
+#
+# heap_buffers
+#   on heap nio buffers
+#
+# offheap_buffers
+#   off heap (direct) nio buffers
+#
+# offheap_objects
+#    off heap objects
+memtable_allocation_type: heap_buffers
+
+# Total space to use for commit logs on disk.
+#
+# If space gets above this value, Cassandra will flush every dirty CF
+# in the oldest segment and remove it.  So a small total commitlog space
+# will tend to cause more flush activity on less-active columnfamilies.
+#
+# The default value is the smaller of 8192, and 1/4 of the total space
+# of the commitlog volume.
+#
+# commitlog_total_space_in_mb: 8192
+
+# This sets the amount of memtable flush writer threads.  These will
+# be blocked by disk io, and each one will hold a memtable in memory
+# while blocked.
+#
+# memtable_flush_writers defaults to one per data_file_directory.
+#
+# If your data directories are backed by SSD, you can increase this, but
+# avoid having memtable_flush_writers * data_file_directories > number of cores
+#memtable_flush_writers: 1
+
+# Total space to use for change-data-capture logs on disk.
+#
+# If space gets above this value, Cassandra will throw WriteTimeoutException
+# on Mutations including tables with CDC enabled. A CDCCompactor is responsible
+# for parsing the raw CDC logs and deleting them when parsing is completed.
+#
+# The default value is the min of 4096 mb and 1/8th of the total space
+# of the drive where cdc_raw_directory resides.
+# cdc_total_space_in_mb: 4096
+
+# When we hit our cdc_raw limit and the CDCCompactor is either running behind
+# or experiencing backpressure, we check at the following interval to see if any
+# new space for cdc-tracked tables has been made available. Default to 250ms
+# cdc_free_space_check_interval_ms: 250
+
+# A fixed memory pool size in MB for SSTable index summaries. If left
+# empty, this will default to 5% of the heap size. If the memory usage of
+# all index summaries exceeds this limit, SSTables with low read rates will
+# shrink their index summaries in order to meet this limit.  However, this
+# is a best-effort process. In extreme conditions Cassandra may need to use
+# more than this amount of memory.
+index_summary_capacity_in_mb:
+
+# How frequently index summaries should be resampled.  This is done
+# periodically to redistribute memory from the fixed-size pool to sstables
+# proportional their recent read rates.  Setting to -1 will disable this
+# process, leaving existing index summaries at their current sampling level.
+index_summary_resize_interval_in_minutes: 60
+
+# Whether to, when doing sequential writing, fsync() at intervals in
+# order to force the operating system to flush the dirty
+# buffers. Enable this to avoid sudden dirty buffer flushing from
+# impacting read latencies. Almost always a good idea on SSDs; not
+# necessarily on platters.
+trickle_fsync: false
+trickle_fsync_interval_in_kb: 10240
+
+# TCP port, for commands and data
+# For security reasons, you should not expose this port to the internet.  Firewall it if needed.
+storage_port: 7000
+
+# SSL port, for encrypted communication.  Unused unless enabled in
+# encryption_options
+# For security reasons, you should not expose this port to the internet.  Firewall it if needed.
+ssl_storage_port: 7001
+
+# Address or interface to bind to and tell other Cassandra nodes to connect to.
+# You _must_ change this if you want multiple nodes to be able to communicate!
+#
+# Set listen_address OR listen_interface, not both.
+#
+# Leaving it blank leaves it up to InetAddress.getLocalHost(). This
+# will always do the Right Thing _if_ the node is properly configured
+# (hostname, name resolution, etc), and the Right Thing is to use the
+# address associated with the hostname (it might not be).
+#
+# Setting listen_address to 0.0.0.0 is always wrong.
+#
+listen_address: 172.17.0.2
+
+# Set listen_address OR listen_interface, not both. Interfaces must correspond
+# to a single address, IP aliasing is not supported.
+# listen_interface: eth0
+
+# If you choose to specify the interface by name and the interface has an ipv4 and an ipv6 address
+# you can specify which should be chosen using listen_interface_prefer_ipv6. If false the first ipv4
+# address will be used. If true the first ipv6 address will be used. Defaults to false preferring
+# ipv4. If there is only one address it will be selected regardless of ipv4/ipv6.
+# listen_interface_prefer_ipv6: false
+
+# Address to broadcast to other Cassandra nodes
+# Leaving this blank will set it to the same value as listen_address
+broadcast_address: 127.0.0.1
+
+# When using multiple physical network interfaces, set this
+# to true to listen on broadcast_address in addition to
+# the listen_address, allowing nodes to communicate in both
+# interfaces.
+# Ignore this property if the network configuration automatically
+# routes  between the public and private networks such as EC2.
+# listen_on_broadcast_address: false
+
+# Internode authentication backend, implementing IInternodeAuthenticator;
+# used to allow/disallow connections from peer nodes.
+# internode_authenticator: org.apache.cassandra.auth.AllowAllInternodeAuthenticator
+
+# Whether to start the native transport server.
+# Please note that the address on which the native transport is bound is the
+# same as the rpc_address. The port however is different and specified below.
+start_native_transport: true
+# port for the CQL native transport to listen for clients on
+# For security reasons, you should not expose this port to the internet.  Firewall it if needed.
+native_transport_port: 9042
+# Enabling native transport encryption in client_encryption_options allows you to either use
+# encryption for the standard port or to use a dedicated, additional port along with the unencrypted
+# standard native_transport_port.
+# Enabling client encryption and keeping native_transport_port_ssl disabled will use encryption
+# for native_transport_port. Setting native_transport_port_ssl to a different value
+# from native_transport_port will use encryption for native_transport_port_ssl while
+# keeping native_transport_port unencrypted.
+# native_transport_port_ssl: 9142
+# The maximum threads for handling requests when the native transport is used.
+# This is similar to rpc_max_threads though the default differs slightly (and
+# there is no native_transport_min_threads, idle threads will always be stopped
+# after 30 seconds).
+# native_transport_max_threads: 128
+#
+# The maximum size of allowed frame. Frame (requests) larger than this will
+# be rejected as invalid. The default is 256MB. If you're changing this parameter,
+# you may want to adjust max_value_size_in_mb accordingly.
+# native_transport_max_frame_size_in_mb: 256
+
+# The maximum number of concurrent client connections.
+# The default is -1, which means unlimited.
+# native_transport_max_concurrent_connections: -1
+
+# The maximum number of concurrent client connections per source ip.
+# The default is -1, which means unlimited.
+# native_transport_max_concurrent_connections_per_ip: -1
+
+# Whether to start the thrift rpc server.
+start_rpc: false
+
+# The address or interface to bind the Thrift RPC service and native transport
+# server to.
+#
+# Set rpc_address OR rpc_interface, not both.
+#
+# Leaving rpc_address blank has the same effect as on listen_address
+# (i.e. it will be based on the configured hostname of the node).
+#
+# Note that unlike listen_address, you can specify 0.0.0.0, but you must also
+# set broadcast_rpc_address to a value other than 0.0.0.0.
+#
+# For security reasons, you should not expose this port to the internet.  Firewall it if needed.
+rpc_address: 0.0.0.0
+
+# Set rpc_address OR rpc_interface, not both. Interfaces must correspond
+# to a single address, IP aliasing is not supported.
+# rpc_interface: eth1
+
+# If you choose to specify the interface by name and the interface has an ipv4 and an ipv6 address
+# you can specify which should be chosen using rpc_interface_prefer_ipv6. If false the first ipv4
+# address will be used. If true the first ipv6 address will be used. Defaults to false preferring
+# ipv4. If there is only one address it will be selected regardless of ipv4/ipv6.
+# rpc_interface_prefer_ipv6: false
+
+# port for Thrift to listen for clients on
+rpc_port: 9160
+
+# RPC address to broadcast to drivers and other Cassandra nodes. This cannot
+# be set to 0.0.0.0. If left blank, this will be set to the value of
+# rpc_address. If rpc_address is set to 0.0.0.0, broadcast_rpc_address must
+# be set.
+broadcast_rpc_address: 127.0.0.1
+
+# enable or disable keepalive on rpc/native connections
+rpc_keepalive: true
+
+# Cassandra provides two out-of-the-box options for the RPC Server:
+#
+# sync
+#   One thread per thrift connection. For a very large number of clients, memory
+#   will be your limiting factor. On a 64 bit JVM, 180KB is the minimum stack size
+#   per thread, and that will correspond to your use of virtual memory (but physical memory
+#   may be limited depending on use of stack space).
+#
+# hsha
+#   Stands for "half synchronous, half asynchronous." All thrift clients are handled
+#   asynchronously using a small number of threads that does not vary with the amount
+#   of thrift clients (and thus scales well to many clients). The rpc requests are still
+#   synchronous (one thread per active request). If hsha is selected then it is essential
+#   that rpc_max_threads is changed from the default value of unlimited.
+#
+# The default is sync because on Windows hsha is about 30% slower.  On Linux,
+# sync/hsha performance is about the same, with hsha of course using less memory.
+#
+# Alternatively,  can provide your own RPC server by providing the fully-qualified class name
+# of an o.a.c.t.TServerFactory that can create an instance of it.
+rpc_server_type: sync
+
+# Uncomment rpc_min|max_thread to set request pool size limits.
+#
+# Regardless of your choice of RPC server (see above), the number of maximum requests in the
+# RPC thread pool dictates how many concurrent requests are possible (but if you are using the sync
+# RPC server, it also dictates the number of clients that can be connected at all).
+#
+# The default is unlimited and thus provides no protection against clients overwhelming the server. You are
+# encouraged to set a maximum that makes sense for you in production, but do keep in mind that
+# rpc_max_threads represents the maximum number of client requests this server may execute concurrently.
+#
+# rpc_min_threads: 16
+# rpc_max_threads: 2048
+
+# uncomment to set socket buffer sizes on rpc connections
+# rpc_send_buff_size_in_bytes:
+# rpc_recv_buff_size_in_bytes:
+
+# Uncomment to set socket buffer size for internode communication
+# Note that when setting this, the buffer size is limited by net.core.wmem_max
+# and when not setting it it is defined by net.ipv4.tcp_wmem
+# See also:
+# /proc/sys/net/core/wmem_max
+# /proc/sys/net/core/rmem_max
+# /proc/sys/net/ipv4/tcp_wmem
+# /proc/sys/net/ipv4/tcp_wmem
+# and 'man tcp'
+# internode_send_buff_size_in_bytes:
+
+# Uncomment to set socket buffer size for internode communication
+# Note that when setting this, the buffer size is limited by net.core.wmem_max
+# and when not setting it it is defined by net.ipv4.tcp_wmem
+# internode_recv_buff_size_in_bytes:
+
+# Frame size for thrift (maximum message length).
+thrift_framed_transport_size_in_mb: 15
+
+# Set to true to have Cassandra create a hard link to each sstable
+# flushed or streamed locally in a backups/ subdirectory of the
+# keyspace data.  Removing these links is the operator's
+# responsibility.
+incremental_backups: false
+
+# Whether or not to take a snapshot before each compaction.  Be
+# careful using this option, since Cassandra won't clean up the
+# snapshots for you.  Mostly useful if you're paranoid when there
+# is a data format change.
+snapshot_before_compaction: false
+
+# Whether or not a snapshot is taken of the data before keyspace truncation
+# or dropping of column families. The STRONGLY advised default of true
+# should be used to provide data safety. If you set this flag to false, you will
+# lose data on truncation or drop.
+auto_snapshot: true
+
+# Granularity of the collation index of rows within a partition.
+# Increase if your rows are large, or if you have a very large
+# number of rows per partition.  The competing goals are these:
+#
+# - a smaller granularity means more index entries are generated
+#   and looking up rows withing the partition by collation column
+#   is faster
+# - but, Cassandra will keep the collation index in memory for hot
+#   rows (as part of the key cache), so a larger granularity means
+#   you can cache more hot rows
+column_index_size_in_kb: 64
+
+# Per sstable indexed key cache entries (the collation index in memory
+# mentioned above) exceeding this size will not be held on heap.
+# This means that only partition information is held on heap and the
+# index entries are read from disk.
+#
+# Note that this size refers to the size of the
+# serialized index information and not the size of the partition.
+column_index_cache_size_in_kb: 2
+
+# Number of simultaneous compactions to allow, NOT including
+# validation "compactions" for anti-entropy repair.  Simultaneous
+# compactions can help preserve read performance in a mixed read/write
+# workload, by mitigating the tendency of small sstables to accumulate
+# during a single long running compactions. The default is usually
+# fine and if you experience problems with compaction running too
+# slowly or too fast, you should look at
+# compaction_throughput_mb_per_sec first.
+#
+# concurrent_compactors defaults to the smaller of (number of disks,
+# number of cores), with a minimum of 2 and a maximum of 8.
+#
+# If your data directories are backed by SSD, you should increase this
+# to the number of cores.
+#concurrent_compactors: 1
+
+# Throttles compaction to the given total throughput across the entire
+# system. The faster you insert data, the faster you need to compact in
+# order to keep the sstable count down, but in general, setting this to
+# 16 to 32 times the rate you are inserting data is more than sufficient.
+# Setting this to 0 disables throttling. Note that this account for all types
+# of compaction, including validation compaction.
+compaction_throughput_mb_per_sec: 16
+
+# When compacting, the replacement sstable(s) can be opened before they
+# are completely written, and used in place of the prior sstables for
+# any range that has been written. This helps to smoothly transfer reads
+# between the sstables, reducing page cache churn and keeping hot rows hot
+sstable_preemptive_open_interval_in_mb: 50
+
+# Throttles all outbound streaming file transfers on this node to the
+# given total throughput in Mbps. This is necessary because Cassandra does
+# mostly sequential IO when streaming data during bootstrap or repair, which
+# can lead to saturating the network connection and degrading rpc performance.
+# When unset, the default is 200 Mbps or 25 MB/s.
+# stream_throughput_outbound_megabits_per_sec: 200
+
+# Throttles all streaming file transfer between the datacenters,
+# this setting allows users to throttle inter dc stream throughput in addition
+# to throttling all network stream traffic as configured with
+# stream_throughput_outbound_megabits_per_sec
+# When unset, the default is 200 Mbps or 25 MB/s
+# inter_dc_stream_throughput_outbound_megabits_per_sec: 200
+
+# How long the coordinator should wait for read operations to complete
+read_request_timeout_in_ms: 5000
+# How long the coordinator should wait for seq or index scans to complete
+range_request_timeout_in_ms: 10000
+# How long the coordinator should wait for writes to complete
+write_request_timeout_in_ms: 2000
+# How long the coordinator should wait for counter writes to complete
+counter_write_request_timeout_in_ms: 5000
+# How long a coordinator should continue to retry a CAS operation
+# that contends with other proposals for the same row
+cas_contention_timeout_in_ms: 1000
+# How long the coordinator should wait for truncates to complete
+# (This can be much longer, because unless auto_snapshot is disabled
+# we need to flush first so we can snapshot before removing the data.)
+truncate_request_timeout_in_ms: 60000
+# The default timeout for other, miscellaneous operations
+request_timeout_in_ms: 10000
+
+# Enable operation timeout information exchange between nodes to accurately
+# measure request timeouts.  If disabled, replicas will assume that requests
+# were forwarded to them instantly by the coordinator, which means that
+# under overload conditions we will waste that much extra time processing
+# already-timed-out requests.
+#
+# Warning: before enabling this property make sure to ntp is installed
+# and the times are synchronized between the nodes.
+cross_node_timeout: false
+
+# Set socket timeout for streaming operation.
+# The stream session is failed if no data/ack is received by any of the participants
+# within that period, which means this should also be sufficient to stream a large
+# sstable or rebuild table indexes.
+# Default value is 86400000ms, which means stale streams timeout after 24 hours.
+# A value of zero means stream sockets should never time out.
+# streaming_socket_timeout_in_ms: 86400000
+
+# phi value that must be reached for a host to be marked down.
+# most users should never need to adjust this.
+# phi_convict_threshold: 8
+
+# endpoint_snitch -- Set this to a class that implements
+# IEndpointSnitch.  The snitch has two functions:
+#
+# - it teaches Cassandra enough about your network topology to route
+#   requests efficiently
+# - it allows Cassandra to spread replicas around your cluster to avoid
+#   correlated failures. It does this by grouping machines into
+#   "datacenters" and "racks."  Cassandra will do its best not to have
+#   more than one replica on the same "rack" (which may not actually
+#   be a physical location)
+#
+# CASSANDRA WILL NOT ALLOW YOU TO SWITCH TO AN INCOMPATIBLE SNITCH
+# ONCE DATA IS INSERTED INTO THE CLUSTER.  This would cause data loss.
+# This means that if you start with the default SimpleSnitch, which
+# locates every node on "rack1" in "datacenter1", your only options
+# if you need to add another datacenter are GossipingPropertyFileSnitch
+# (and the older PFS).  From there, if you want to migrate to an
+# incompatible snitch like Ec2Snitch you can do it by adding new nodes
+# under Ec2Snitch (which will locate them in a new "datacenter") and
+# decommissioning the old ones.
+#
+# Out of the box, Cassandra provides:
+#
+# SimpleSnitch:
+#    Treats Strategy order as proximity. This can improve cache
+#    locality when disabling read repair.  Only appropriate for
+#    single-datacenter deployments.
+#
+# GossipingPropertyFileSnitch
+#    This should be your go-to snitch for production use.  The rack
+#    and datacenter for the local node are defined in
+#    cassandra-rackdc.properties and propagated to other nodes via
+#    gossip.  If cassandra-topology.properties exists, it is used as a
+#    fallback, allowing migration from the PropertyFileSnitch.
+#
+# PropertyFileSnitch:
+#    Proximity is determined by rack and data center, which are
+#    explicitly configured in cassandra-topology.properties.
+#
+# Ec2Snitch:
+#    Appropriate for EC2 deployments in a single Region. Loads Region
+#    and Availability Zone information from the EC2 API. The Region is
+#    treated as the datacenter, and the Availability Zone as the rack.
+#    Only private IPs are used, so this will not work across multiple
+#    Regions.
+#
+# Ec2MultiRegionSnitch:
+#    Uses public IPs as broadcast_address to allow cross-region
+#    connectivity.  (Thus, you should set seed addresses to the public
+#    IP as well.) You will need to open the storage_port or
+#    ssl_storage_port on the public IP firewall.  (For intra-Region
+#    traffic, Cassandra will switch to the private IP after
+#    establishing a connection.)
+#
+# RackInferringSnitch:
+#    Proximity is determined by rack and data center, which are
+#    assumed to correspond to the 3rd and 2nd octet of each node's IP
+#    address, respectively.  Unless this happens to match your
+#    deployment conventions, this is best used as an example of
+#    writing a custom Snitch class and is provided in that spirit.
+#
+# You can use a custom Snitch by setting this to the full class name
+# of the snitch, which will be assumed to be on your classpath.
+endpoint_snitch: SimpleSnitch
+
+# controls how often to perform the more expensive part of host score
+# calculation
+dynamic_snitch_update_interval_in_ms: 100
+# controls how often to reset all host scores, allowing a bad host to
+# possibly recover
+dynamic_snitch_reset_interval_in_ms: 600000
+# if set greater than zero and read_repair_chance is < 1.0, this will allow
+# 'pinning' of replicas to hosts in order to increase cache capacity.
+# The badness threshold will control how much worse the pinned host has to be
+# before the dynamic snitch will prefer other replicas over it.  This is
+# expressed as a double which represents a percentage.  Thus, a value of
+# 0.2 means Cassandra would continue to prefer the static snitch values
+# until the pinned host was 20% worse than the fastest.
+dynamic_snitch_badness_threshold: 0.1
+
+# request_scheduler -- Set this to a class that implements
+# RequestScheduler, which will schedule incoming client requests
+# according to the specific policy. This is useful for multi-tenancy
+# with a single Cassandra cluster.
+# NOTE: This is specifically for requests from the client and does
+# not affect inter node communication.
+# org.apache.cassandra.scheduler.NoScheduler - No scheduling takes place
+# org.apache.cassandra.scheduler.RoundRobinScheduler - Round robin of
+# client requests to a node with a separate queue for each
+# request_scheduler_id. The scheduler is further customized by
+# request_scheduler_options as described below.
+request_scheduler: org.apache.cassandra.scheduler.NoScheduler
+
+# Scheduler Options vary based on the type of scheduler
+#
+# NoScheduler
+#   Has no options
+#
+# RoundRobin
+#   throttle_limit
+#     The throttle_limit is the number of in-flight
+#     requests per client.  Requests beyond
+#     that limit are queued up until
+#     running requests can complete.
+#     The value of 80 here is twice the number of
+#     concurrent_reads + concurrent_writes.
+#   default_weight
+#     default_weight is optional and allows for
+#     overriding the default which is 1.
+#   weights
+#     Weights are optional and will default to 1 or the
+#     overridden default_weight. The weight translates into how
+#     many requests are handled during each turn of the
+#     RoundRobin, based on the scheduler id.
+#
+# request_scheduler_options:
+#    throttle_limit: 80
+#    default_weight: 5
+#    weights:
+#      Keyspace1: 1
+#      Keyspace2: 5
+
+# request_scheduler_id -- An identifier based on which to perform
+# the request scheduling. Currently the only valid option is keyspace.
+# request_scheduler_id: keyspace
+
+# Enable or disable inter-node encryption
+# JVM defaults for supported SSL socket protocols and cipher suites can
+# be replaced using custom encryption options. This is not recommended
+# unless you have policies in place that dictate certain settings, or
+# need to disable vulnerable ciphers or protocols in case the JVM cannot
+# be updated.
+# FIPS compliant settings can be configured at JVM level and should not
+# involve changing encryption settings here:
+# https://docs.oracle.com/javase/8/docs/technotes/guides/security/jsse/FIPS.html
+# *NOTE* No custom encryption options are enabled at the moment
+# The available internode options are : all, none, dc, rack
+#
+# If set to dc cassandra will encrypt the traffic between the DCs
+# If set to rack cassandra will encrypt the traffic between the racks
+#
+# The passwords used in these options must match the passwords used when generating
+# the keystore and truststore.  For instructions on generating these files, see:
+# http://download.oracle.com/javase/6/docs/technotes/guides/security/jsse/JSSERefGuide.html#CreateKeystore
+#
+server_encryption_options:
+    internode_encryption: none
+    keystore: conf/.keystore
+    keystore_password: cassandra
+    truststore: conf/.truststore
+    truststore_password: cassandra
+    # More advanced defaults below:
+    # protocol: TLS
+    # algorithm: SunX509
+    # store_type: JKS
+    # cipher_suites: [TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_RSA_WITH_AES_256_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA]
+    # require_client_auth: false
+    # require_endpoint_verification: false
+
+# enable or disable client/server encryption.
+client_encryption_options:
+    enabled: false
+    # If enabled and optional is set to true encrypted and unencrypted connections are handled.
+    optional: false
+    keystore: conf/.keystore
+    keystore_password: cassandra
+    # require_client_auth: false
+    # Set truststore and truststore_password if require_client_auth is true
+    # truststore: conf/.truststore
+    # truststore_password: cassandra
+    # More advanced defaults below:
+    # protocol: TLS
+    # algorithm: SunX509
+    # store_type: JKS
+    # cipher_suites: [TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_RSA_WITH_AES_256_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA]
+
+# internode_compression controls whether traffic between nodes is
+# compressed.
+# Can be:
+#
+# all
+#   all traffic is compressed
+#
+# dc
+#   traffic between different datacenters is compressed
+#
+# none
+#   nothing is compressed.
+internode_compression: dc
+
+# Enable or disable tcp_nodelay for inter-dc communication.
+# Disabling it will result in larger (but fewer) network packets being sent,
+# reducing overhead from the TCP protocol itself, at the cost of increasing
+# latency if you block for cross-datacenter responses.
+inter_dc_tcp_nodelay: false
+
+# TTL for different trace types used during logging of the repair process.
+tracetype_query_ttl: 86400
+tracetype_repair_ttl: 604800
+
+# By default, Cassandra logs GC Pauses greater than 200 ms at INFO level
+# This threshold can be adjusted to minimize logging if necessary
+# gc_log_threshold_in_ms: 200
+
+# If unset, all GC Pauses greater than gc_log_threshold_in_ms will log at
+# INFO level
+# UDFs (user defined functions) are disabled by default.
+# As of Cassandra 3.0 there is a sandbox in place that should prevent execution of evil code.
+enable_user_defined_functions: false
+
+# Enables scripted UDFs (JavaScript UDFs).
+# Java UDFs are always enabled, if enable_user_defined_functions is true.
+# Enable this option to be able to use UDFs with "language javascript" or any custom JSR-223 provider.
+# This option has no effect, if enable_user_defined_functions is false.
+enable_scripted_user_defined_functions: false
+
+# The default Windows kernel timer and scheduling resolution is 15.6ms for power conservation.
+# Lowering this value on Windows can provide much tighter latency and better throughput, however
+# some virtualized environments may see a negative performance impact from changing this setting
+# below their system default. The sysinternals 'clockres' tool can confirm your system's default
+# setting.
+windows_timer_interval: 1
+
+
+# Enables encrypting data at-rest (on disk). Different key providers can be plugged in, but the default reads from
+# a JCE-style keystore. A single keystore can hold multiple keys, but the one referenced by
+# the "key_alias" is the only key that will be used for encrypt operations; previously used keys
+# can still (and should!) be in the keystore and will be used on decrypt operations
+# (to handle the case of key rotation).
+#
+# It is strongly recommended to download and install Java Cryptography Extension (JCE)
+# Unlimited Strength Jurisdiction Policy Files for your version of the JDK.
+# (current link: http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html)
+#
+# Currently, only the following file types are supported for transparent data encryption, although
+# more are coming in future cassandra releases: commitlog, hints
+transparent_data_encryption_options:
+    enabled: false
+    chunk_length_kb: 64
+    cipher: AES/CBC/PKCS5Padding
+    key_alias: testing:1
+    # CBC IV length for AES needs to be 16 bytes (which is also the default size)
+    # iv_length: 16
+    key_provider:
+      - class_name: org.apache.cassandra.security.JKSKeyProvider
+        parameters:
+          - keystore: conf/.keystore
+            keystore_password: cassandra
+            store_type: JCEKS
+            key_password: cassandra
+
+
+#####################
+# SAFETY THRESHOLDS #
+#####################
+
+# When executing a scan, within or across a partition, we need to keep the
+# tombstones seen in memory so we can return them to the coordinator, which
+# will use them to make sure other replicas also know about the deleted rows.
+# With workloads that generate a lot of tombstones, this can cause performance
+# problems and even exhaust the server heap.
+# (http://www.datastax.com/dev/blog/cassandra-anti-patterns-queues-and-queue-like-datasets)
+# Adjust the thresholds here if you understand the dangers and want to
+# scan more tombstones anyway.  These thresholds may also be adjusted at runtime
+# using the StorageService mbean.
+tombstone_warn_threshold: 1000
+tombstone_failure_threshold: 100000
+
+# Log WARN on any batch size exceeding this value. 5kb per batch by default.
+# Caution should be taken on increasing the size of this threshold as it can lead to node instability.
+batch_size_warn_threshold_in_kb: 5
+
+# Fail any batch exceeding this value. 50kb (10x warn threshold) by default.
+batch_size_fail_threshold_in_kb: 50
+
+# Log WARN on any batches not of type LOGGED than span across more partitions than this limit
+unlogged_batch_across_partitions_warn_threshold: 10
+
+# Log a warning when compacting partitions larger than this value
+compaction_large_partition_warning_threshold_mb: 100
+
+# GC Pauses greater than gc_warn_threshold_in_ms will be logged at WARN level
+# Adjust the threshold based on your application throughput requirement
+# By default, Cassandra logs GC Pauses greater than 200 ms at INFO level
+gc_warn_threshold_in_ms: 1000
+
+# Maximum size of any value in SSTables. Safety measure to detect SSTable corruption
+# early. Any value size larger than this threshold will result into marking an SSTable
+# as corrupted.
+# max_value_size_in_mb: 256
diff --git a/builtin/logical/cassandra/util.go b/builtin/logical/cassandra/util.go
new file mode 100644
index 0000000000000..8257aafd787fb
--- /dev/null
+++ b/builtin/logical/cassandra/util.go
@@ -0,0 +1,95 @@
+package cassandra
+
+import (
+	"crypto/tls"
+	"fmt"
+	"strings"
+	"time"
+
+	"github.com/gocql/gocql"
+	"github.com/hashicorp/go-secure-stdlib/tlsutil"
+	"github.com/hashicorp/vault/sdk/helper/certutil"
+	"github.com/hashicorp/vault/sdk/logical"
+)
+
+// Query templates a query for us.
+func substQuery(tpl string, data map[string]string) string {
+	for k, v := range data {
+		tpl = strings.ReplaceAll(tpl, fmt.Sprintf("{{%s}}", k), v)
+	}
+
+	return tpl
+}
+
+func createSession(cfg *sessionConfig, s logical.Storage) (*gocql.Session, error) {
+	clusterConfig := gocql.NewCluster(strings.Split(cfg.Hosts, ",")...)
+	clusterConfig.Authenticator = gocql.PasswordAuthenticator{
+		Username: cfg.Username,
+		Password: cfg.Password,
+	}
+
+	clusterConfig.ProtoVersion = cfg.ProtocolVersion
+	if clusterConfig.ProtoVersion == 0 {
+		clusterConfig.ProtoVersion = 2
+	}
+
+	clusterConfig.Timeout = time.Duration(cfg.ConnectTimeout) * time.Second
+
+	if cfg.TLS {
+		var tlsConfig *tls.Config
+		if len(cfg.Certificate) > 0 || len(cfg.IssuingCA) > 0 {
+			if len(cfg.Certificate) > 0 && len(cfg.PrivateKey) == 0 {
+				return nil, fmt.Errorf("found certificate for TLS authentication but no private key")
+			}
+
+			certBundle := &certutil.CertBundle{}
+			if len(cfg.Certificate) > 0 {
+				certBundle.Certificate = cfg.Certificate
+				certBundle.PrivateKey = cfg.PrivateKey
+			}
+			if len(cfg.IssuingCA) > 0 {
+				certBundle.IssuingCA = cfg.IssuingCA
+			}
+
+			parsedCertBundle, err := certBundle.ToParsedCertBundle()
+			if err != nil {
+				return nil, fmt.Errorf("failed to parse certificate bundle: %w", err)
+			}
+
+			tlsConfig, err = parsedCertBundle.GetTLSConfig(certutil.TLSClient)
+			if err != nil || tlsConfig == nil {
+				return nil, fmt.Errorf("failed to get TLS configuration: tlsConfig: %#v; %w", tlsConfig, err)
+			}
+			tlsConfig.InsecureSkipVerify = cfg.InsecureTLS
+
+			if cfg.TLSMinVersion != "" {
+				var ok bool
+				tlsConfig.MinVersion, ok = tlsutil.TLSLookup[cfg.TLSMinVersion]
+				if !ok {
+					return nil, fmt.Errorf("invalid 'tls_min_version' in config")
+				}
+			} else {
+				// MinVersion was not being set earlier. Reset it to
+				// zero to gracefully handle upgrades.
+				tlsConfig.MinVersion = 0
+			}
+		}
+
+		clusterConfig.SslOpts = &gocql.SslOptions{
+			Config: tlsConfig,
+		}
+	}
+
+	session, err := clusterConfig.CreateSession()
+	if err != nil {
+		return nil, fmt.Errorf("error creating session: %w", err)
+	}
+
+	// Verify the info
+	err = session.Query(`LIST USERS`).Exec()
+	if err != nil {
+		return nil, fmt.Errorf("error validating connection info: %w", err)
+	}
+
+	return session, nil
+}
diff --git a/builtin/logical/consul/backend.go b/builtin/logical/consul/backend.go
index 5e42a5197ed09..7fce10e262944 100644
--- a/builtin/logical/consul/backend.go
+++ b/builtin/logical/consul/backend.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package consul
 
 import (
@@ -10,8 +7,6 @@ import (
 	"github.com/hashicorp/vault/sdk/logical"
 )
 
-const operationPrefixConsul = "consul"
-
 // ReportedVersion is used to report a specific version to Vault.
 var ReportedVersion = ""
 
diff --git a/builtin/logical/consul/backend_test.go b/builtin/logical/consul/backend_test.go
index 94ce864d965f7..fa7cf647135a2 100644
--- a/builtin/logical/consul/backend_test.go
+++ b/builtin/logical/consul/backend_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package consul
 
 import (
diff --git a/builtin/logical/consul/client.go b/builtin/logical/consul/client.go
index 1e30c660271c4..fd54830a4b777 100644
--- a/builtin/logical/consul/client.go
+++ b/builtin/logical/consul/client.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package consul
 
 import (
diff --git a/builtin/logical/consul/cmd/consul/main.go b/builtin/logical/consul/cmd/consul/main.go
index f42a535b95876..3b884ddf85ef4 100644
--- a/builtin/logical/consul/cmd/consul/main.go
+++ b/builtin/logical/consul/cmd/consul/main.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package main
 
 import (
@@ -20,11 +17,9 @@ func main() {
 	tlsConfig := apiClientMeta.GetTLSConfig()
 	tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig)
 
-	if err := plugin.ServeMultiplex(&plugin.ServeOpts{
+	if err := plugin.Serve(&plugin.ServeOpts{
 		BackendFactoryFunc: consul.Factory,
-		// set the TLSProviderFunc so that the plugin maintains backwards
-		// compatibility with Vault versions that don’t support plugin AutoMTLS
-		TLSProviderFunc: tlsProviderFunc,
+		TLSProviderFunc:    tlsProviderFunc,
 	}); err != nil {
 		logger := hclog.New(&hclog.LoggerOptions{})
 
diff --git a/builtin/logical/consul/path_config.go b/builtin/logical/consul/path_config.go
index 2f925d5b24e91..1fd60e30ec578 100644
--- a/builtin/logical/consul/path_config.go
+++ b/builtin/logical/consul/path_config.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package consul
 
 import (
@@ -15,11 +12,6 @@ import (
 func pathConfigAccess(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "config/access",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixConsul,
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"address": {
 				Type:        framework.TypeString,
@@ -60,20 +52,9 @@ must be x509 PEM encoded and if this is set you need to also set client_cert.`,
 			},
 		},
 
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.ReadOperation: &framework.PathOperation{
-				Callback: b.pathConfigAccessRead,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationSuffix: "access-configuration",
-				},
-			},
-			logical.UpdateOperation: &framework.PathOperation{
-				Callback: b.pathConfigAccessWrite,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb:   "configure",
-					OperationSuffix: "access",
-				},
-			},
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.ReadOperation:   b.pathConfigAccessRead,
+			logical.UpdateOperation: b.pathConfigAccessWrite,
 		},
 	}
 }
@@ -135,7 +116,7 @@ func (b *backend) pathConfigAccessWrite(ctx context.Context, req *logical.Reques
 		}
 		token, _, err := client.ACL().Bootstrap()
 		if err != nil {
-			return logical.ErrorResponse("Token not provided and failed to bootstrap ACLs: %s", err), nil
+			return logical.ErrorResponse("Token not provided and failed to bootstrap ACLs"), err
 		}
 		config.Token = token.SecretID
 	}
diff --git a/builtin/logical/consul/path_roles.go b/builtin/logical/consul/path_roles.go
index 3e8c059f53d5a..fa513b5017d28 100644
--- a/builtin/logical/consul/path_roles.go
+++ b/builtin/logical/consul/path_roles.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package consul
 
 import (
@@ -17,11 +14,6 @@ func pathListRoles(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "roles/?$",
 
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixConsul,
-			OperationSuffix: "roles",
-		},
-
 		Callbacks: map[logical.Operation]framework.OperationFunc{
 			logical.ListOperation: b.pathRoleList,
 		},
@@ -31,12 +23,6 @@ func pathListRoles(b *backend) *framework.Path {
 func pathRoles(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "roles/" + framework.GenericNameRegex("name"),
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixConsul,
-			OperationSuffix: "role",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"name": {
 				Type:        framework.TypeString,
diff --git a/builtin/logical/consul/path_token.go b/builtin/logical/consul/path_token.go
index 9c8dbd1d4457e..7568774f39c6b 100644
--- a/builtin/logical/consul/path_token.go
+++ b/builtin/logical/consul/path_token.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package consul
 
 import (
@@ -21,13 +18,6 @@ const (
 func pathToken(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "creds/" + framework.GenericNameRegex("role"),
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixConsul,
-			OperationVerb:   "generate",
-			OperationSuffix: "credentials",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"role": {
 				Type:        framework.TypeString,
diff --git a/builtin/logical/consul/path_token_test.go b/builtin/logical/consul/path_token_test.go
index 77e7f29ab128a..98e2b826fbcae 100644
--- a/builtin/logical/consul/path_token_test.go
+++ b/builtin/logical/consul/path_token_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package consul
 
 import (
diff --git a/builtin/logical/consul/secret_token.go b/builtin/logical/consul/secret_token.go
index f2f206b7026a7..6dbccca014cef 100644
--- a/builtin/logical/consul/secret_token.go
+++ b/builtin/logical/consul/secret_token.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package consul
 
 import (
diff --git a/builtin/logical/database/backend.go b/builtin/logical/database/backend.go
index 94091e201947e..e2e362fd5fa31 100644
--- a/builtin/logical/database/backend.go
+++ b/builtin/logical/database/backend.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package database
 
 import (
@@ -27,11 +24,10 @@ import (
 )
 
 const (
-	operationPrefixDatabase = "database"
-	databaseConfigPath      = "config/"
-	databaseRolePath        = "role/"
-	databaseStaticRolePath  = "static-role/"
-	minRootCredRollbackAge  = 1 * time.Minute
+	databaseConfigPath     = "config/"
+	databaseRolePath       = "role/"
+	databaseStaticRolePath = "static-role/"
+	minRootCredRollbackAge = 1 * time.Minute
 )
 
 type dbPluginInstance struct {
diff --git a/builtin/logical/database/backend_test.go b/builtin/logical/database/backend_test.go
index 574bcd01af629..27ce027c959e2 100644
--- a/builtin/logical/database/backend_test.go
+++ b/builtin/logical/database/backend_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package database
 
 import (
diff --git a/builtin/logical/database/credentials.go b/builtin/logical/database/credentials.go
index c43c2648f03de..a6e54678d0589 100644
--- a/builtin/logical/database/credentials.go
+++ b/builtin/logical/database/credentials.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package database
 
 import (
@@ -8,17 +5,12 @@ import (
 	"crypto/rand"
 	"crypto/rsa"
 	"crypto/x509"
-	"crypto/x509/pkix"
 	"encoding/pem"
 	"fmt"
 	"io"
 	"strings"
-	"time"
 
 	"github.com/hashicorp/vault/helper/random"
-	"github.com/hashicorp/vault/sdk/database/dbplugin/v5"
-	"github.com/hashicorp/vault/sdk/helper/certutil"
-	"github.com/hashicorp/vault/sdk/helper/template"
 	"github.com/mitchellh/mapstructure"
 )
 
@@ -175,217 +167,3 @@ func (kg rsaKeyGenerator) configMap() (map[string]interface{}, error) {
 	}
 	return config, nil
 }
-
-type ClientCertificateGenerator struct {
-	// CommonNameTemplate is username template to be used for the client certificate common name.
-	CommonNameTemplate string `mapstructure:"common_name_template,omitempty"`
-
-	// CAPrivateKey is the PEM-encoded private key for the given ca_cert.
-	CAPrivateKey string `mapstructure:"ca_private_key,omitempty"`
-
-	// CACert is the PEM-encoded CA certificate.
-	CACert string `mapstructure:"ca_cert,omitempty"`
-
-	// KeyType specifies the desired key type.
-	// Options include: 'rsa', 'ed25519', 'ec'.
-	KeyType string `mapstructure:"key_type,omitempty"`
-
-	// KeyBits is the number of bits to use for the generated keys.
-	// Options include: with key_type=rsa, 2048 (default), 3072, 4096;
-	// With key_type=ec, allowed values are: 224, 256 (default), 384, 521;
-	// Ignored with key_type=ed25519.
-	KeyBits int `mapstructure:"key_bits,omitempty"`
-
-	// SignatureBits is the number of bits to use in the signature algorithm.
-	// Options include: 256 (default), 384, 512.
-	SignatureBits int `mapstructure:"signature_bits,omitempty"`
-
-	parsedCABundle *certutil.ParsedCertBundle
-	cnProducer     template.StringTemplate
-}
-
-// newClientCertificateGenerator returns a new ClientCertificateGenerator
-// using the given config. Default values will be set on the returned
-// ClientCertificateGenerator if not provided in the config.
-func newClientCertificateGenerator(config map[string]interface{}) (ClientCertificateGenerator, error) {
-	var cg ClientCertificateGenerator
-	if err := mapstructure.WeakDecode(config, &cg); err != nil {
-		return cg, err
-	}
-
-	switch cg.KeyType {
-	case "rsa":
-		switch cg.KeyBits {
-		case 0:
-			cg.KeyBits = 2048
-		case 2048, 3072, 4096:
-		default:
-			return cg, fmt.Errorf("invalid key_bits")
-		}
-	case "ec":
-		switch cg.KeyBits {
-		case 0:
-			cg.KeyBits = 256
-		case 224, 256, 384, 521:
-		default:
-			return cg, fmt.Errorf("invalid key_bits")
-		}
-	case "ed25519":
-	// key_bits ignored
-	default:
-		return cg, fmt.Errorf("invalid key_type")
-	}
-
-	switch cg.SignatureBits {
-	case 0:
-		cg.SignatureBits = 256
-	case 256, 384, 512:
-	default:
-		return cg, fmt.Errorf("invalid signature_bits")
-	}
-
-	if cg.CommonNameTemplate == "" {
-		return cg, fmt.Errorf("missing required common_name_template")
-	}
-
-	// Validate the common name template
-	t, err := template.NewTemplate(template.Template(cg.CommonNameTemplate))
-	if err != nil {
-		return cg, fmt.Errorf("failed to create template: %w", err)
-	}
-
-	_, err = t.Generate(dbplugin.UsernameMetadata{})
-	if err != nil {
-		return cg, fmt.Errorf("invalid common_name_template: %w", err)
-	}
-	cg.cnProducer = t
-
-	if cg.CACert == "" {
-		return cg, fmt.Errorf("missing required ca_cert")
-	}
-	if cg.CAPrivateKey == "" {
-		return cg, fmt.Errorf("missing required ca_private_key")
-	}
-	parsedBundle, err := certutil.ParsePEMBundle(strings.Join([]string{cg.CACert, cg.CAPrivateKey}, "\n"))
-	if err != nil {
-		return cg, err
-	}
-	if parsedBundle.PrivateKey == nil {
-		return cg, fmt.Errorf("private key not found in the PEM bundle")
-	}
-	if parsedBundle.PrivateKeyType == certutil.UnknownPrivateKey {
-		return cg, fmt.Errorf("unknown private key found in the PEM bundle")
-	}
-	if parsedBundle.Certificate == nil {
-		return cg, fmt.Errorf("certificate not found in the PEM bundle")
-	}
-	if !parsedBundle.Certificate.IsCA {
-		return cg, fmt.Errorf("the given certificate is not marked for CA use")
-	}
-	if !parsedBundle.Certificate.BasicConstraintsValid {
-		return cg, fmt.Errorf("the given certificate does not meet basic constraints for CA use")
-	}
-
-	certBundle, err := parsedBundle.ToCertBundle()
-	if err != nil {
-		return cg, fmt.Errorf("error converting raw values into cert bundle: %w", err)
-	}
-
-	parsedCABundle, err := certBundle.ToParsedCertBundle()
-	if err != nil {
-		return cg, fmt.Errorf("failed to parse cert bundle: %w", err)
-	}
-	cg.parsedCABundle = parsedCABundle
-
-	return cg, nil
-}
-
-func (cg *ClientCertificateGenerator) generate(r io.Reader, expiration time.Time, userMeta dbplugin.UsernameMetadata) (*certutil.CertBundle, string, error) {
-	commonName, err := cg.cnProducer.Generate(userMeta)
-	if err != nil {
-		return nil, "", err
-	}
-
-	// Set defaults
-	keyBits := cg.KeyBits
-	signatureBits := cg.SignatureBits
-	switch cg.KeyType {
-	case "rsa":
-		if keyBits == 0 {
-			keyBits = 2048
-		}
-		if signatureBits == 0 {
-			signatureBits = 256
-		}
-	case "ec":
-		if keyBits == 0 {
-			keyBits = 256
-		}
-		if signatureBits == 0 {
-			if keyBits == 224 {
-				signatureBits = 256
-			} else {
-				signatureBits = keyBits
-			}
-		}
-	case "ed25519":
-		// key_bits ignored
-		if signatureBits == 0 {
-			signatureBits = 256
-		}
-	}
-
-	subject := pkix.Name{
-		CommonName: commonName,
-		// Additional subject DN options intentionally omitted for now
-	}
-
-	creation := &certutil.CreationBundle{
-		Params: &certutil.CreationParameters{
-			Subject:                       subject,
-			KeyType:                       cg.KeyType,
-			KeyBits:                       cg.KeyBits,
-			SignatureBits:                 cg.SignatureBits,
-			NotAfter:                      expiration,
-			KeyUsage:                      x509.KeyUsageDigitalSignature,
-			ExtKeyUsage:                   certutil.ClientAuthExtKeyUsage,
-			BasicConstraintsValidForNonCA: false,
-			NotBeforeDuration:             30 * time.Second,
-			URLs: &certutil.URLEntries{
-				IssuingCertificates:   []string{},
-				CRLDistributionPoints: []string{},
-				OCSPServers:           []string{},
-			},
-		},
-		SigningBundle: &certutil.CAInfoBundle{
-			ParsedCertBundle: *cg.parsedCABundle,
-			URLs: &certutil.URLEntries{
-				IssuingCertificates:   []string{},
-				CRLDistributionPoints: []string{},
-				OCSPServers:           []string{},
-			},
-		},
-	}
-
-	parsedClientBundle, err := certutil.CreateCertificateWithRandomSource(creation, r)
-	if err != nil {
-		return nil, "", fmt.Errorf("unable to generate client certificate: %w", err)
-	}
-
-	cb, err := parsedClientBundle.ToCertBundle()
-	if err != nil {
-		return nil, "", fmt.Errorf("error converting raw cert bundle to cert bundle: %w", err)
-	}
-
-	return cb, subject.String(), nil
-}
-
-// configMap returns the configuration of the ClientCertificateGenerator
-// as a map from string to string.
-func (cg ClientCertificateGenerator) configMap() (map[string]interface{}, error) {
-	config := make(map[string]interface{})
-	if err := mapstructure.WeakDecode(cg, &config); err != nil {
-		return nil, err
-	}
-	return config, nil
-}
diff --git a/builtin/logical/database/credentials_test.go b/builtin/logical/database/credentials_test.go
index 5e113e3b2310f..32ddc26856fef 100644
--- a/builtin/logical/database/credentials_test.go
+++ b/builtin/logical/database/credentials_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package database
 
 import (
@@ -17,252 +14,6 @@ import (
 	"github.com/stretchr/testify/mock"
 )
 
-// Test_newClientCertificateGenerator tests the ClientCertificateGenerator struct based on the config
-func Test_newClientCertificateGenerator(t *testing.T) {
-	type args struct {
-		config map[string]interface{}
-	}
-	tests := []struct {
-		name    string
-		args    args
-		want    ClientCertificateGenerator
-		wantErr bool
-	}{
-		{
-			name: "newClientCertificateGenerator with nil config",
-			args: args{
-				config: nil,
-			},
-			want: ClientCertificateGenerator{
-				CommonNameTemplate: "",
-				CAPrivateKey:       "",
-				CACert:             "",
-				KeyType:            "",
-				KeyBits:            0,
-				SignatureBits:      0,
-			},
-		},
-		{
-			name: "newClientCertificateGenerator with zero value key_type",
-			args: args{
-				config: map[string]interface{}{
-					"key_type": "",
-				},
-			},
-			want: ClientCertificateGenerator{
-				KeyType: "",
-			},
-		},
-		{
-			name: "newClientCertificateGenerator with rsa value key_type",
-			args: args{
-				config: map[string]interface{}{
-					"key_type": "rsa",
-				},
-			},
-			want: ClientCertificateGenerator{
-				KeyType:       "rsa",
-				KeyBits:       2048,
-				SignatureBits: 256,
-			},
-		},
-		{
-			name: "newClientCertificateGenerator with ec value key_type",
-			args: args{
-				config: map[string]interface{}{
-					"key_type": "ec",
-				},
-			},
-			want: ClientCertificateGenerator{
-				KeyType:       "ec",
-				KeyBits:       256,
-				SignatureBits: 256,
-			},
-		},
-		{
-			name: "newClientCertificateGenerator with ed25519 value key_type",
-			args: args{
-				config: map[string]interface{}{
-					"key_type": "ed25519",
-				},
-			},
-			want: ClientCertificateGenerator{
-				KeyType:       "ed25519",
-				SignatureBits: 256,
-			},
-		},
-		{
-			name: "newClientCertificateGenerator with invalid key_type",
-			args: args{
-				config: map[string]interface{}{
-					"key_type": "ece",
-				},
-			},
-			wantErr: true,
-		},
-		{
-			name: "newClientCertificateGenerator with zero value key_bits",
-			args: args{
-				config: map[string]interface{}{
-					"key_bits": "0",
-				},
-			},
-			want: ClientCertificateGenerator{
-				KeyBits: 0,
-			},
-		},
-		{
-			name: "newClientCertificateGenerator with 2048 value key_bits",
-			args: args{
-				config: map[string]interface{}{
-					"key_bits": "2048",
-				},
-			},
-			want: ClientCertificateGenerator{
-				KeyBits: 2048,
-			},
-		},
-		{
-			name: "newClientCertificateGenerator with 3072 value key_bits",
-			args: args{
-				config: map[string]interface{}{
-					"key_bits": "3072",
-				},
-			},
-			want: ClientCertificateGenerator{
-				KeyBits: 3072,
-			},
-		},
-		{
-			name: "newClientCertificateGenerator with 4096 value key_bits",
-			args: args{
-				config: map[string]interface{}{
-					"key_bits": "4096",
-				},
-			},
-			want: ClientCertificateGenerator{
-				KeyBits: 4096,
-			},
-		},
-		{
-			name: "newClientCertificateGenerator with 224 value key_bits",
-			args: args{
-				config: map[string]interface{}{
-					"key_bits": "224",
-				},
-			},
-			want: ClientCertificateGenerator{
-				KeyBits: 224,
-			},
-		},
-		{
-			name: "newClientCertificateGenerator with 256 value key_bits",
-			args: args{
-				config: map[string]interface{}{
-					"key_bits": "256",
-				},
-			},
-			want: ClientCertificateGenerator{
-				KeyBits: 256,
-			},
-		},
-		{
-			name: "newClientCertificateGenerator with 384 value key_bits",
-			args: args{
-				config: map[string]interface{}{
-					"key_bits": "384",
-				},
-			},
-			want: ClientCertificateGenerator{
-				KeyBits: 384,
-			},
-		},
-		{
-			name: "newClientCertificateGenerator with 521 value key_bits",
-			args: args{
-				config: map[string]interface{}{
-					"key_bits": "521",
-				},
-			},
-			want: ClientCertificateGenerator{
-				KeyBits: 521,
-			},
-		},
-		{
-			name: "newClientCertificateGenerator with invalid key_bits",
-			args: args{
-				config: map[string]interface{}{
-					"key_bits": "4097",
-				},
-			},
-			wantErr: true,
-		},
-		{
-			name: "newClientCertificateGenerator with zero value signature_bits",
-			args: args{
-				config: map[string]interface{}{
-					"signature_bits": "0",
-				},
-			},
-			want: ClientCertificateGenerator{
-				SignatureBits: 0,
-			},
-		},
-		{
-			name: "newClientCertificateGenerator with 256 value signature_bits",
-			args: args{
-				config: map[string]interface{}{
-					"signature_bits": "256",
-				},
-			},
-			want: ClientCertificateGenerator{
-				SignatureBits: 256,
-			},
-		},
-		{
-			name: "newClientCertificateGenerator with 384 value signature_bits",
-			args: args{
-				config: map[string]interface{}{
-					"signature_bits": "384",
-				},
-			},
-			want: ClientCertificateGenerator{
-				SignatureBits: 384,
-			},
-		},
-		{
-			name: "newClientCertificateGenerator with 512 value signature_bits",
-			args: args{
-				config: map[string]interface{}{
-					"signature_bits": "512",
-				},
-			},
-			want: ClientCertificateGenerator{
-				SignatureBits: 512,
-			},
-		},
-		{
-			name: "newClientCertificateGenerator with invalid signature_bits",
-			args: args{
-				config: map[string]interface{}{
-					"signature_bits": "612",
-				},
-			},
-			wantErr: true,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got, err := newClientCertificateGenerator(tt.args.config)
-			if tt.wantErr {
-				assert.Error(t, err)
-				return
-			}
-			assert.Equal(t, tt.want, got)
-		})
-	}
-}
-
 func Test_newPasswordGenerator(t *testing.T) {
 	type args struct {
 		config map[string]interface{}
diff --git a/builtin/logical/database/dbplugin/plugin_test.go b/builtin/logical/database/dbplugin/plugin_test.go
index 2b5f7a981ec36..bea9e30ec7a58 100644
--- a/builtin/logical/database/dbplugin/plugin_test.go
+++ b/builtin/logical/database/dbplugin/plugin_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package dbplugin_test
 
 import (
diff --git a/builtin/logical/database/mocks_test.go b/builtin/logical/database/mocks_test.go
index afb1bbc79f68a..13eb530061426 100644
--- a/builtin/logical/database/mocks_test.go
+++ b/builtin/logical/database/mocks_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package database
 
 import (
diff --git a/builtin/logical/database/mockv4.go b/builtin/logical/database/mockv4.go
index a85f307ec49d6..4f0b181683a85 100644
--- a/builtin/logical/database/mockv4.go
+++ b/builtin/logical/database/mockv4.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package database
 
 import (
diff --git a/builtin/logical/database/mockv5.go b/builtin/logical/database/mockv5.go
index fecccfed209f5..632cfb38e037f 100644
--- a/builtin/logical/database/mockv5.go
+++ b/builtin/logical/database/mockv5.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package database
 
 import (
diff --git a/builtin/logical/database/path_config_connection.go b/builtin/logical/database/path_config_connection.go
index b869facef0dec..9f1ad4cf5744d 100644
--- a/builtin/logical/database/path_config_connection.go
+++ b/builtin/logical/database/path_config_connection.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package database
 
 import (
@@ -62,13 +59,6 @@ func (c *DatabaseConfig) SupportsCredentialType(credentialType v5.CredentialType
 func pathResetConnection(b *databaseBackend) *framework.Path {
 	return &framework.Path{
 		Pattern: fmt.Sprintf("reset/%s", framework.GenericNameRegex("name")),
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixDatabase,
-			OperationVerb:   "reset",
-			OperationSuffix: "connection",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"name": {
 				Type:        framework.TypeString,
@@ -113,11 +103,6 @@ func (b *databaseBackend) pathConnectionReset() framework.OperationFunc {
 func pathConfigurePluginConnection(b *databaseBackend) *framework.Path {
 	return &framework.Path{
 		Pattern: fmt.Sprintf("config/%s", framework.GenericNameRegex("name")),
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixDatabase,
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"name": {
 				Type:        framework.TypeString,
@@ -164,36 +149,11 @@ func pathConfigurePluginConnection(b *databaseBackend) *framework.Path {
 		},
 
 		ExistenceCheck: b.connectionExistenceCheck(),
-
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.CreateOperation: &framework.PathOperation{
-				Callback: b.connectionWriteHandler(),
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb:   "configure",
-					OperationSuffix: "connection",
-				},
-			},
-			logical.UpdateOperation: &framework.PathOperation{
-				Callback: b.connectionWriteHandler(),
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb:   "configure",
-					OperationSuffix: "connection",
-				},
-			},
-			logical.ReadOperation: &framework.PathOperation{
-				Callback: b.connectionReadHandler(),
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb:   "read",
-					OperationSuffix: "connection-configuration",
-				},
-			},
-			logical.DeleteOperation: &framework.PathOperation{
-				Callback: b.connectionDeleteHandler(),
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb:   "delete",
-					OperationSuffix: "connection-configuration",
-				},
-			},
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.CreateOperation: b.connectionWriteHandler(),
+			logical.UpdateOperation: b.connectionWriteHandler(),
+			logical.ReadOperation:   b.connectionReadHandler(),
+			logical.DeleteOperation: b.connectionDeleteHandler(),
 		},
 
 		HelpSynopsis:    pathConfigConnectionHelpSyn,
@@ -221,11 +181,6 @@ func pathListPluginConnection(b *databaseBackend) *framework.Path {
 	return &framework.Path{
 		Pattern: fmt.Sprintf("config/?$"),
 
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixDatabase,
-			OperationSuffix: "connections",
-		},
-
 		Callbacks: map[logical.Operation]framework.OperationFunc{
 			logical.ListOperation: b.connectionListHandler(),
 		},
diff --git a/builtin/logical/database/path_config_connection_test.go b/builtin/logical/database/path_config_connection_test.go
index 8cf06062890f5..18f850dbce925 100644
--- a/builtin/logical/database/path_config_connection_test.go
+++ b/builtin/logical/database/path_config_connection_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package database
 
 import (
diff --git a/builtin/logical/database/path_creds_create.go b/builtin/logical/database/path_creds_create.go
index a0fe6a38456c9..e57516259fefb 100644
--- a/builtin/logical/database/path_creds_create.go
+++ b/builtin/logical/database/path_creds_create.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package database
 
 import (
@@ -9,7 +6,6 @@ import (
 	"time"
 
 	"github.com/hashicorp/go-secure-stdlib/strutil"
-	"github.com/hashicorp/vault/sdk/database/dbplugin/v5"
 	v5 "github.com/hashicorp/vault/sdk/database/dbplugin/v5"
 	"github.com/hashicorp/vault/sdk/framework"
 	"github.com/hashicorp/vault/sdk/logical"
@@ -19,13 +15,6 @@ func pathCredsCreate(b *databaseBackend) []*framework.Path {
 	return []*framework.Path{
 		{
 			Pattern: "creds/" + framework.GenericNameRegex("name"),
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: operationPrefixDatabase,
-				OperationVerb:   "generate",
-				OperationSuffix: "credentials",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"name": {
 					Type:        framework.TypeString,
@@ -42,13 +31,6 @@ func pathCredsCreate(b *databaseBackend) []*framework.Path {
 		},
 		{
 			Pattern: "static-creds/" + framework.GenericNameRegex("name"),
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: operationPrefixDatabase,
-				OperationVerb:   "read",
-				OperationSuffix: "static-role-credentials",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"name": {
 					Type:        framework.TypeString,
@@ -172,27 +154,6 @@ func (b *databaseBackend) pathCredsCreateRead() framework.OperationFunc {
 
 			// Set output credential
 			respData["rsa_private_key"] = string(private)
-		case v5.CredentialTypeClientCertificate:
-			generator, err := newClientCertificateGenerator(role.CredentialConfig)
-			if err != nil {
-				return nil, fmt.Errorf("failed to construct credential generator: %s", err)
-			}
-
-			// Generate the client certificate
-			cb, subject, err := generator.generate(b.GetRandomReader(), expiration,
-				newUserReq.UsernameConfig)
-			if err != nil {
-				return nil, fmt.Errorf("failed to generate client certificate: %w", err)
-			}
-
-			// Set input credential
-			newUserReq.CredentialType = dbplugin.CredentialTypeClientCertificate
-			newUserReq.Subject = subject
-
-			// Set output credential
-			respData["client_certificate"] = cb.Certificate
-			respData["private_key"] = cb.PrivateKey
-			respData["private_key_type"] = cb.PrivateKeyType
 		}
 
 		// Overwriting the password in the event this is a legacy database
diff --git a/builtin/logical/database/path_roles.go b/builtin/logical/database/path_roles.go
index ba4aa7f20e4b3..02a199c5326d8 100644
--- a/builtin/logical/database/path_roles.go
+++ b/builtin/logical/database/path_roles.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package database
 
 import (
@@ -24,12 +21,6 @@ func pathListRoles(b *databaseBackend) []*framework.Path {
 		{
 			Pattern: "roles/?$",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: operationPrefixDatabase,
-				OperationVerb:   "list",
-				OperationSuffix: "roles",
-			},
-
 			Callbacks: map[logical.Operation]framework.OperationFunc{
 				logical.ListOperation: b.pathRoleList,
 			},
@@ -40,12 +31,6 @@ func pathListRoles(b *databaseBackend) []*framework.Path {
 		{
 			Pattern: "static-roles/?$",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: operationPrefixDatabase,
-				OperationVerb:   "list",
-				OperationSuffix: "static-roles",
-			},
-
 			Callbacks: map[logical.Operation]framework.OperationFunc{
 				logical.ListOperation: b.pathRoleList,
 			},
@@ -59,11 +44,7 @@ func pathListRoles(b *databaseBackend) []*framework.Path {
 func pathRoles(b *databaseBackend) []*framework.Path {
 	return []*framework.Path{
 		{
-			Pattern: "roles/" + framework.GenericNameRegex("name"),
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: operationPrefixDatabase,
-				OperationSuffix: "role",
-			},
+			Pattern:        "roles/" + framework.GenericNameRegex("name"),
 			Fields:         fieldsForType(databaseRolePath),
 			ExistenceCheck: b.pathRoleExistenceCheck,
 			Callbacks: map[logical.Operation]framework.OperationFunc{
@@ -78,11 +59,7 @@ func pathRoles(b *databaseBackend) []*framework.Path {
 		},
 
 		{
-			Pattern: "static-roles/" + framework.GenericNameRegex("name"),
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: operationPrefixDatabase,
-				OperationSuffix: "static-role",
-			},
+			Pattern:        "static-roles/" + framework.GenericNameRegex("name"),
 			Fields:         fieldsForType(databaseStaticRolePath),
 			ExistenceCheck: b.pathStaticRoleExistenceCheck,
 			Callbacks: map[logical.Operation]framework.OperationFunc{
@@ -651,8 +628,6 @@ func (r *roleEntry) setCredentialType(credentialType string) error {
 		r.CredentialType = v5.CredentialTypePassword
 	case v5.CredentialTypeRSAPrivateKey.String():
 		r.CredentialType = v5.CredentialTypeRSAPrivateKey
-	case v5.CredentialTypeClientCertificate.String():
-		r.CredentialType = v5.CredentialTypeClientCertificate
 	default:
 		return fmt.Errorf("invalid credential_type %q", credentialType)
 	}
@@ -694,18 +669,6 @@ func (r *roleEntry) setCredentialConfig(config map[string]string) error {
 		if len(cm) > 0 {
 			r.CredentialConfig = cm
 		}
-	case v5.CredentialTypeClientCertificate:
-		generator, err := newClientCertificateGenerator(c)
-		if err != nil {
-			return err
-		}
-		cm, err := generator.configMap()
-		if err != nil {
-			return err
-		}
-		if len(cm) > 0 {
-			r.CredentialConfig = cm
-		}
 	}
 
 	return nil
diff --git a/builtin/logical/database/path_roles_test.go b/builtin/logical/database/path_roles_test.go
index dc2eddeb1a04f..bfb20633896ef 100644
--- a/builtin/logical/database/path_roles_test.go
+++ b/builtin/logical/database/path_roles_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package database
 
 import (
diff --git a/builtin/logical/database/path_rotate_credentials.go b/builtin/logical/database/path_rotate_credentials.go
index 49081a3c3f404..2d5fa7a8f9aea 100644
--- a/builtin/logical/database/path_rotate_credentials.go
+++ b/builtin/logical/database/path_rotate_credentials.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package database
 
 import (
@@ -19,13 +16,6 @@ func pathRotateRootCredentials(b *databaseBackend) []*framework.Path {
 	return []*framework.Path{
 		{
 			Pattern: "rotate-root/" + framework.GenericNameRegex("name"),
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: operationPrefixDatabase,
-				OperationVerb:   "rotate",
-				OperationSuffix: "root-credentials",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"name": {
 					Type:        framework.TypeString,
@@ -46,13 +36,6 @@ func pathRotateRootCredentials(b *databaseBackend) []*framework.Path {
 		},
 		{
 			Pattern: "rotate-role/" + framework.GenericNameRegex("name"),
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: operationPrefixDatabase,
-				OperationVerb:   "rotate",
-				OperationSuffix: "static-role-credentials",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"name": {
 					Type:        framework.TypeString,
diff --git a/builtin/logical/database/rollback.go b/builtin/logical/database/rollback.go
index 22ce6168663e0..a9810e816643f 100644
--- a/builtin/logical/database/rollback.go
+++ b/builtin/logical/database/rollback.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package database
 
 import (
diff --git a/builtin/logical/database/rollback_test.go b/builtin/logical/database/rollback_test.go
index 8f36fe26a7957..dc061ae99a3fb 100644
--- a/builtin/logical/database/rollback_test.go
+++ b/builtin/logical/database/rollback_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package database
 
 import (
diff --git a/builtin/logical/database/rotation.go b/builtin/logical/database/rotation.go
index 1ef54aecac326..5ae2756f279cd 100644
--- a/builtin/logical/database/rotation.go
+++ b/builtin/logical/database/rotation.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package database
 
 import (
diff --git a/builtin/logical/database/rotation_test.go b/builtin/logical/database/rotation_test.go
index e0cb96dd67cfb..1fdbba55f1d6d 100644
--- a/builtin/logical/database/rotation_test.go
+++ b/builtin/logical/database/rotation_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package database
 
 import (
@@ -509,6 +506,8 @@ func TestBackend_Static_QueueWAL_discard_role_not_found(t *testing.T) {
 // Second scenario, WAL contains a role name that does exist, but the role's
 // LastVaultRotation is greater than the WAL has
 func TestBackend_Static_QueueWAL_discard_role_newer_rotation_date(t *testing.T) {
+	t.Skip("temporarily disabled due to intermittent failures")
+
 	cluster, sys := getCluster(t)
 	defer cluster.Cleanup()
 
diff --git a/builtin/logical/database/secret_creds.go b/builtin/logical/database/secret_creds.go
index fefa452a5d356..9c9b348e2437a 100644
--- a/builtin/logical/database/secret_creds.go
+++ b/builtin/logical/database/secret_creds.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package database
 
 import (
diff --git a/builtin/logical/database/version_wrapper.go b/builtin/logical/database/version_wrapper.go
index daab17964d3e2..8c4db1388861c 100644
--- a/builtin/logical/database/version_wrapper.go
+++ b/builtin/logical/database/version_wrapper.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package database
 
 import (
diff --git a/builtin/logical/database/version_wrapper_test.go b/builtin/logical/database/version_wrapper_test.go
index 95a5f7b6fa953..054241f978a32 100644
--- a/builtin/logical/database/version_wrapper_test.go
+++ b/builtin/logical/database/version_wrapper_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package database
 
 import (
diff --git a/builtin/logical/database/versioning_large_test.go b/builtin/logical/database/versioning_large_test.go
index b39ddb7e1ce4a..a9f7efde62a68 100644
--- a/builtin/logical/database/versioning_large_test.go
+++ b/builtin/logical/database/versioning_large_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package database
 
 // This file contains all "large"/expensive tests. These are running requests against a running backend
diff --git a/builtin/logical/mongodb/backend.go b/builtin/logical/mongodb/backend.go
new file mode 100644
index 0000000000000..a9374243b86c1
--- /dev/null
+++ b/builtin/logical/mongodb/backend.go
@@ -0,0 +1,144 @@
+package mongodb
+
+import (
+	"context"
+	"fmt"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/hashicorp/vault/sdk/framework"
+	"github.com/hashicorp/vault/sdk/logical"
+	mgo "gopkg.in/mgo.v2"
+)
+
+func Factory(ctx context.Context, conf *logical.BackendConfig) (logical.Backend, error) {
+	b := Backend()
+	if err := b.Setup(ctx, conf); err != nil {
+		return nil, err
+	}
+	return b, nil
+}
+
+func Backend() *framework.Backend {
+	var b backend
+	b.Backend = &framework.Backend{
+		Help: strings.TrimSpace(backendHelp),
+
+		PathsSpecial: &logical.Paths{
+			SealWrapStorage: []string{
+				"config/connection",
+			},
+		},
+
+		Paths: []*framework.Path{
+			pathConfigConnection(&b),
+			pathConfigLease(&b),
+			pathListRoles(&b),
+			pathRoles(&b),
+			pathCredsCreate(&b),
+		},
+
+		Secrets: []*framework.Secret{
+			secretCreds(&b),
+		},
+
+		Clean: b.ResetSession,
+
+		Invalidate:  b.invalidate,
+		BackendType: logical.TypeLogical,
+	}
+
+	return b.Backend
+}
+
+type backend struct {
+	*framework.Backend
+
+	session *mgo.Session
+	lock    sync.Mutex
+}
+
+// Session returns the database connection.
+func (b *backend) Session(ctx context.Context, s logical.Storage) (*mgo.Session, error) {
+	b.lock.Lock()
+	defer b.lock.Unlock()
+
+	if b.session != nil {
+		if err := b.session.Ping(); err == nil {
+			return b.session, nil
+		}
+		b.session.Close()
+	}
+
+	connConfigJSON, err := s.Get(ctx, "config/connection")
+	if err != nil {
+		return nil, err
+	}
+	if connConfigJSON == nil {
+		return nil, fmt.Errorf("configure the MongoDB connection with config/connection first")
+	}
+
+	var connConfig connectionConfig
+	if err := connConfigJSON.DecodeJSON(&connConfig); err != nil {
+		return nil, err
+	}
+
+	dialInfo, err := parseMongoURI(connConfig.URI)
+	if err != nil {
+		return nil, err
+	}
+
+	b.session, err = mgo.DialWithInfo(dialInfo)
+	if err != nil {
+		return nil, err
+	}
+	b.session.SetSyncTimeout(1 * time.Minute)
+	b.session.SetSocketTimeout(1 * time.Minute)
+
+	return b.session, nil
+}
+
+// ResetSession forces creation of a new connection next time Session() is called.
+func (b *backend) ResetSession(_ context.Context) {
+	b.lock.Lock()
+	defer b.lock.Unlock()
+
+	if b.session != nil {
+		b.session.Close()
+	}
+
+	b.session = nil
+}
+
+func (b *backend) invalidate(ctx context.Context, key string) {
+	switch key {
+	case "config/connection":
+		b.ResetSession(ctx)
+	}
+}
+
+// LeaseConfig returns the lease configuration
+func (b *backend) LeaseConfig(ctx context.Context, s logical.Storage) (*configLease, error) {
+	entry, err := s.Get(ctx, "config/lease")
+	if err != nil {
+		return nil, err
+	}
+	if entry == nil {
+		return nil, nil
+	}
+
+	var result configLease
+	if err := entry.DecodeJSON(&result); err != nil {
+		return nil, err
+	}
+
+	return &result, nil
+}
+
+const backendHelp = `
+The mongodb backend dynamically generates MongoDB credentials.
+
+After mounting this backend, configure it using the endpoints within
+the "config/" path.
+`
diff --git a/builtin/logical/mongodb/backend_test.go b/builtin/logical/mongodb/backend_test.go
new file mode 100644
index 0000000000000..43cee7de981ca
--- /dev/null
+++ b/builtin/logical/mongodb/backend_test.go
@@ -0,0 +1,268 @@
+package mongodb
+
+import (
+	"context"
+	"fmt"
+	"log"
+	"strings"
+	"sync"
+	"testing"
+
+	logicaltest "github.com/hashicorp/vault/helper/testhelpers/logical"
+	"github.com/hashicorp/vault/helper/testhelpers/mongodb"
+	"github.com/hashicorp/vault/sdk/logical"
+	"github.com/mitchellh/mapstructure"
+)
+
+var testImagePull sync.Once
+
+func TestBackend_config_connection(t *testing.T) {
+	var resp *logical.Response
+	var err error
+	config := logical.TestBackendConfig()
+	config.StorageView = &logical.InmemStorage{}
+	b, err := Factory(context.Background(), config)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	configData := map[string]interface{}{
+		"uri":               "sample_connection_uri",
+		"verify_connection": false,
+	}
+
+	configReq := &logical.Request{
+		Operation: logical.UpdateOperation,
+		Path:      "config/connection",
+		Storage:   config.StorageView,
+		Data:      configData,
+	}
+	resp, err = b.HandleRequest(context.Background(), configReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%s resp:%#v\n", err, resp)
+	}
+
+	configReq.Operation = logical.ReadOperation
+	resp, err = b.HandleRequest(context.Background(), configReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%s resp:%#v\n", err, resp)
+	}
+}
+
+func TestBackend_basic(t *testing.T) {
+	config := logical.TestBackendConfig()
+	config.StorageView = &logical.InmemStorage{}
+	b, err := Factory(context.Background(), config)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	cleanup, connURI := mongodb.PrepareTestContainer(t, "5.0.10")
+	defer cleanup()
+	connData := map[string]interface{}{
+		"uri": connURI,
+	}
+
+	logicaltest.Test(t, logicaltest.TestCase{
+		LogicalBackend: b,
+		Steps: []logicaltest.TestStep{
+			testAccStepConfig(connData, false),
+			testAccStepRole(),
+			testAccStepReadCreds("web"),
+		},
+	})
+}
+
+func TestBackend_roleCrud(t *testing.T) {
+	config := logical.TestBackendConfig()
+	config.StorageView = &logical.InmemStorage{}
+	b, err := Factory(context.Background(), config)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	cleanup, connURI := mongodb.PrepareTestContainer(t, "5.0.10")
+	defer cleanup()
+	connData := map[string]interface{}{
+		"uri": connURI,
+	}
+
+	logicaltest.Test(t, logicaltest.TestCase{
+		LogicalBackend: b,
+		Steps: []logicaltest.TestStep{
+			testAccStepConfig(connData, false),
+			testAccStepRole(),
+			testAccStepReadRole("web", testDb, testMongoDBRoles),
+			testAccStepDeleteRole("web"),
+			testAccStepReadRole("web", "", ""),
+		},
+	})
+}
+
+func TestBackend_leaseWriteRead(t *testing.T) {
+	config := logical.TestBackendConfig()
+	config.StorageView = &logical.InmemStorage{}
+	b, err := Factory(context.Background(), config)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	cleanup, connURI := mongodb.PrepareTestContainer(t, "5.0.10")
+	defer cleanup()
+	connData := map[string]interface{}{
+		"uri": connURI,
+	}
+
+	logicaltest.Test(t, logicaltest.TestCase{
+		LogicalBackend: b,
+		Steps: []logicaltest.TestStep{
+			testAccStepConfig(connData, false),
+			testAccStepWriteLease(),
+			testAccStepReadLease(),
+		},
+	})
+}
+
+func testAccStepConfig(d map[string]interface{}, expectError bool) logicaltest.TestStep {
+	return logicaltest.TestStep{
+		Operation: logical.UpdateOperation,
+		Path:      "config/connection",
+		Data:      d,
+		ErrorOk:   true,
+		Check: func(resp *logical.Response) error {
+			if expectError {
+				if resp.Data == nil {
+					return fmt.Errorf("data is nil")
+				}
+				var e struct {
+					Error string `mapstructure:"error"`
+				}
+				if err := mapstructure.Decode(resp.Data, &e); err != nil {
+					return err
+				}
+				if len(e.Error) == 0 {
+					return fmt.Errorf("expected error, but write succeeded")
+				}
+				return nil
+			} else if resp != nil && resp.IsError() {
+				return fmt.Errorf("got an error response: %v", resp.Error())
+			}
+			return nil
+		},
+	}
+}
+
+func testAccStepRole() logicaltest.TestStep {
+	return logicaltest.TestStep{
+		Operation: logical.UpdateOperation,
+		Path:      "roles/web",
+		Data: map[string]interface{}{
+			"db":    testDb,
+			"roles": testMongoDBRoles,
+		},
+	}
+}
+
+func testAccStepDeleteRole(n string) logicaltest.TestStep {
+	return logicaltest.TestStep{
+		Operation: logical.DeleteOperation,
+		Path:      "roles/" + n,
+	}
+}
+
+func testAccStepReadCreds(name string) logicaltest.TestStep {
+	return logicaltest.TestStep{
+		Operation: logical.ReadOperation,
+		Path:      "creds/" + name,
+		Check: func(resp *logical.Response) error {
+			var d struct {
+				DB       string `mapstructure:"db"`
+				Username string `mapstructure:"username"`
+				Password string `mapstructure:"password"`
+			}
+			if err := mapstructure.Decode(resp.Data, &d); err != nil {
+				return err
+			}
+
+			if d.DB == "" {
+				return fmt.Errorf("bad: %#v", resp)
+			}
+			if d.Username == "" {
+				return fmt.Errorf("bad: %#v", resp)
+			}
+			if !strings.HasPrefix(d.Username, "vault-root-") {
+				return fmt.Errorf("bad: %#v", resp)
+			}
+			if d.Password == "" {
+				return fmt.Errorf("bad: %#v", resp)
+			}
+
+			log.Printf("[WARN] Generated credentials: %v", d)
+
+			return nil
+		},
+	}
+}
+
+func testAccStepReadRole(name, db, mongoDBRoles string) logicaltest.TestStep {
+	return logicaltest.TestStep{
+		Operation: logical.ReadOperation,
+		Path:      "roles/" + name,
+		Check: func(resp *logical.Response) error {
+			if resp == nil {
+				if db == "" && mongoDBRoles == "" {
+					return nil
+				}
+
+				return fmt.Errorf("bad: %#v", resp)
+			}
+
+			var d struct {
+				DB           string `mapstructure:"db"`
+				MongoDBRoles string `mapstructure:"roles"`
+			}
+			if err := mapstructure.Decode(resp.Data, &d); err != nil {
+				return err
+			}
+
+			if d.DB != db {
+				return fmt.Errorf("bad: %#v", resp)
+			}
+			if d.MongoDBRoles != mongoDBRoles {
+				return fmt.Errorf("bad: %#v", resp)
+			}
+
+			return nil
+		},
+	}
+}
+
+func testAccStepWriteLease() logicaltest.TestStep {
+	return logicaltest.TestStep{
+		Operation: logical.UpdateOperation,
+		Path:      "config/lease",
+		Data: map[string]interface{}{
+			"ttl":     "1h5m",
+			"max_ttl": "24h",
+		},
+	}
+}
+
+func testAccStepReadLease() logicaltest.TestStep {
+	return logicaltest.TestStep{
+		Operation: logical.ReadOperation,
+		Path:      "config/lease",
+		Check: func(resp *logical.Response) error {
+			if resp.Data["ttl"].(float64) != 3900 || resp.Data["max_ttl"].(float64) != 86400 {
+				return fmt.Errorf("bad: %#v", resp)
+			}
+
+			return nil
+		},
+	}
+}
+
+const (
+	testDb           = "foo"
+	testMongoDBRoles = `["readWrite",{"role":"read","db":"bar"}]`
+)
diff --git a/builtin/logical/mongodb/cmd/mongodb/main.go b/builtin/logical/mongodb/cmd/mongodb/main.go
new file mode 100644
index 0000000000000..619f8e3a5a40e
--- /dev/null
+++ b/builtin/logical/mongodb/cmd/mongodb/main.go
@@ -0,0 +1,29 @@
+package main
+
+import (
+	"os"
+
+	hclog "github.com/hashicorp/go-hclog"
+	"github.com/hashicorp/vault/api"
+	"github.com/hashicorp/vault/builtin/logical/mongodb"
+	"github.com/hashicorp/vault/sdk/plugin"
+)
+
+func main() {
+	apiClientMeta := &api.PluginAPIClientMeta{}
+	flags := apiClientMeta.FlagSet()
+	flags.Parse(os.Args[1:])
+
+	tlsConfig := apiClientMeta.GetTLSConfig()
+	tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig)
+
+	if err := plugin.Serve(&plugin.ServeOpts{
+		BackendFactoryFunc: mongodb.Factory,
+		TLSProviderFunc:    tlsProviderFunc,
+	}); err != nil {
+		logger := hclog.New(&hclog.LoggerOptions{})
+
+		logger.Error("plugin shutting down", "error", err)
+		os.Exit(1)
+	}
+}
diff --git a/builtin/logical/mongodb/path_config_connection.go b/builtin/logical/mongodb/path_config_connection.go
new file mode 100644
index 0000000000000..7f7360729a1dc
--- /dev/null
+++ b/builtin/logical/mongodb/path_config_connection.go
@@ -0,0 +1,112 @@
+package mongodb
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/hashicorp/vault/sdk/framework"
+	"github.com/hashicorp/vault/sdk/logical"
+	mgo "gopkg.in/mgo.v2"
+)
+
+func pathConfigConnection(b *backend) *framework.Path {
+	return &framework.Path{
+		Pattern: "config/connection",
+		Fields: map[string]*framework.FieldSchema{
+			"uri": {
+				Type:        framework.TypeString,
+				Description: "MongoDB standard connection string (URI)",
+			},
+			"verify_connection": {
+				Type:        framework.TypeBool,
+				Default:     true,
+				Description: `If set, uri is verified by actually connecting to the database`,
+			},
+		},
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.ReadOperation:   b.pathConnectionRead,
+			logical.UpdateOperation: b.pathConnectionWrite,
+		},
+		HelpSynopsis:    pathConfigConnectionHelpSyn,
+		HelpDescription: pathConfigConnectionHelpDesc,
+	}
+}
+
+// pathConnectionRead reads out the connection configuration
+func (b *backend) pathConnectionRead(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
+	entry, err := req.Storage.Get(ctx, "config/connection")
+	if err != nil {
+		return nil, fmt.Errorf("failed to read connection configuration")
+	}
+	if entry == nil {
+		return nil, nil
+	}
+
+	return nil, nil
+}
+
+func (b *backend) pathConnectionWrite(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
+	uri := data.Get("uri").(string)
+	if uri == "" {
+		return logical.ErrorResponse("uri parameter is required"), nil
+	}
+
+	dialInfo, err := parseMongoURI(uri)
+	if err != nil {
+		return logical.ErrorResponse(fmt.Sprintf("invalid uri: %s", err)), nil
+	}
+
+	// Don't check the config if verification is disabled
+	verifyConnection := data.Get("verify_connection").(bool)
+	if verifyConnection {
+		// Verify the config
+		session, err := mgo.DialWithInfo(dialInfo)
+		if err != nil {
+			return logical.ErrorResponse(fmt.Sprintf(
+				"Error validating connection info: %s", err)), nil
+		}
+		defer session.Close()
+		if err := session.Ping(); err != nil {
+			return logical.ErrorResponse(fmt.Sprintf(
+				"Error validating connection info: %s", err)), nil
+		}
+	}
+
+	// Store it
+	entry, err := logical.StorageEntryJSON("config/connection", connectionConfig{
+		URI: uri,
+	})
+	if err != nil {
+		return nil, err
+	}
+	if err := req.Storage.Put(ctx, entry); err != nil {
+		return nil, err
+	}
+
+	// Reset the Session
+	b.ResetSession(ctx)
+
+	resp := &logical.Response{}
+	resp.AddWarning("Read access to this endpoint should be controlled via ACLs as it will return the connection URI as it is, including passwords, if any.")
+
+	return resp, nil
+}
+
+type connectionConfig struct {
+	URI string `json:"uri" structs:"uri" mapstructure:"uri"`
+}
+
+const pathConfigConnectionHelpSyn = `
+Configure the connection string to talk to MongoDB.
+`
+
+const pathConfigConnectionHelpDesc = `
+This path configures the standard connection string (URI) used to connect to MongoDB.
+
+A MongoDB URI looks like:
+"mongodb://[username:password@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][/[database][?options]]"
+
+See https://docs.mongodb.org/manual/reference/connection-string/ for detailed documentation of the URI format.
+
+When configuring the connection string, the backend will verify its validity.
+`
diff --git a/builtin/logical/mongodb/path_config_lease.go b/builtin/logical/mongodb/path_config_lease.go
new file mode 100644
index 0000000000000..c64a4d1d89a7f
--- /dev/null
+++ b/builtin/logical/mongodb/path_config_lease.go
@@ -0,0 +1,89 @@
+package mongodb
+
+import (
+	"context"
+	"time"
+
+	"github.com/hashicorp/vault/sdk/framework"
+	"github.com/hashicorp/vault/sdk/logical"
+)
+
+func pathConfigLease(b *backend) *framework.Path {
+	return &framework.Path{
+		Pattern: "config/lease",
+		Fields: map[string]*framework.FieldSchema{
+			"ttl": {
+				Type:        framework.TypeDurationSecond,
+				Description: "Default ttl for credentials.",
+			},
+
+			"max_ttl": {
+				Type:        framework.TypeDurationSecond,
+				Description: "Maximum time a set of credentials can be valid for.",
+			},
+		},
+
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.ReadOperation:   b.pathConfigLeaseRead,
+			logical.UpdateOperation: b.pathConfigLeaseWrite,
+		},
+
+		HelpSynopsis:    pathConfigLeaseHelpSyn,
+		HelpDescription: pathConfigLeaseHelpDesc,
+	}
+}
+
+func (b *backend) pathConfigLeaseWrite(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
+	entry, err := logical.StorageEntryJSON("config/lease", &configLease{
+		TTL:    time.Second * time.Duration(d.Get("ttl").(int)),
+		MaxTTL: time.Second * time.Duration(d.Get("max_ttl").(int)),
+	})
+	if err != nil {
+		return nil, err
+	}
+	if err := req.Storage.Put(ctx, entry); err != nil {
+		return nil, err
+	}
+
+	return nil, nil
+}
+
+func (b *backend) pathConfigLeaseRead(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
+	leaseConfig, err := b.LeaseConfig(ctx, req.Storage)
+	if err != nil {
+		return nil, err
+	}
+	if leaseConfig == nil {
+		return nil, nil
+	}
+
+	return &logical.Response{
+		Data: map[string]interface{}{
+			"ttl":     leaseConfig.TTL.Seconds(),
+			"max_ttl": leaseConfig.MaxTTL.Seconds(),
+		},
+	}, nil
+}
+
+type configLease struct {
+	TTL    time.Duration
+	MaxTTL time.Duration
+}
+
+const pathConfigLeaseHelpSyn = `
+Configure the default lease TTL settings for credentials
+generated by the mongodb backend.
+`
+
+const pathConfigLeaseHelpDesc = `
+This configures the default lease TTL settings used for
+credentials generated by this backend. The ttl specifies the
+duration that a set of credentials will be valid for before
+the lease must be renewed (if it is renewable), while the
+max_ttl specifies the overall maximum duration that the
+credentials will be valid regardless of lease renewals.
+
+The format for the TTL values is an integer and then unit. For
+example, the value "1h" specifies a 1-hour TTL. The longest
+supported unit is hours.
+`
diff --git a/builtin/logical/mongodb/path_creds_create.go b/builtin/logical/mongodb/path_creds_create.go
new file mode 100644
index 0000000000000..ca65334086696
--- /dev/null
+++ b/builtin/logical/mongodb/path_creds_create.go
@@ -0,0 +1,119 @@
+package mongodb
+
+import (
+	"context"
+	"fmt"
+
+	uuid "github.com/hashicorp/go-uuid"
+	"github.com/hashicorp/vault/sdk/framework"
+	"github.com/hashicorp/vault/sdk/logical"
+)
+
+func pathCredsCreate(b *backend) *framework.Path {
+	return &framework.Path{
+		Pattern: "creds/" + framework.GenericNameRegex("name"),
+		Fields: map[string]*framework.FieldSchema{
+			"name": {
+				Type:        framework.TypeString,
+				Description: "Name of the role to generate credentials for.",
+			},
+		},
+
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.ReadOperation: b.pathCredsCreateRead,
+		},
+
+		HelpSynopsis:    pathCredsCreateReadHelpSyn,
+		HelpDescription: pathCredsCreateReadHelpDesc,
+	}
+}
+
+func (b *backend) pathCredsCreateRead(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
+	name := data.Get("name").(string)
+
+	// Get the role
+	role, err := b.Role(ctx, req.Storage, name)
+	if err != nil {
+		return nil, err
+	}
+	if role == nil {
+		return logical.ErrorResponse(fmt.Sprintf("unknown role: %s", name)), nil
+	}
+
+	// Determine if we have a lease configuration
+	leaseConfig, err := b.LeaseConfig(ctx, req.Storage)
+	if err != nil {
+		return nil, err
+	}
+	if leaseConfig == nil {
+		leaseConfig = &configLease{}
+	}
+
+	// Generate the username and password
+	displayName := req.DisplayName
+	if displayName != "" {
+		displayName += "-"
+	}
+
+	userUUID, err := uuid.GenerateUUID()
+	if err != nil {
+		return nil, err
+	}
+
+	username := fmt.Sprintf("vault-%s%s", displayName, userUUID)
+
+	password, err := uuid.GenerateUUID()
+	if err != nil {
+		return nil, err
+	}
+
+	// Build the user creation command
+	createUserCmd := createUserCommand{
+		Username: username,
+		Password: password,
+		Roles:    role.MongoDBRoles.toStandardRolesArray(),
+	}
+
+	// Get our connection
+	session, err := b.Session(ctx, req.Storage)
+	if err != nil {
+		return nil, err
+	}
+
+	// Create the user
+	err = session.DB(role.DB).Run(createUserCmd, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	// Return the secret
+	resp := b.Secret(SecretCredsType).Response(map[string]interface{}{
+		"db":       role.DB,
+		"username": username,
+		"password": password,
+	}, map[string]interface{}{
+		"username": username,
+		"db":       role.DB,
+	})
+	resp.Secret.TTL = leaseConfig.TTL
+	resp.Secret.MaxTTL = leaseConfig.MaxTTL
+
+	return resp, nil
+}
+
+type createUserCommand struct {
+	Username string        `bson:"createUser"`
+	Password string        `bson:"pwd"`
+	Roles    []interface{} `bson:"roles"`
+}
+
+const pathCredsCreateReadHelpSyn = `
+Request MongoDB database credentials for a particular role.
+`
+
+const pathCredsCreateReadHelpDesc = `
+This path reads generates MongoDB database credentials for
+a particular role. The database credentials will be
+generated on demand and will be automatically revoked when
+the lease is up.
+`
diff --git a/builtin/logical/mongodb/path_roles.go b/builtin/logical/mongodb/path_roles.go
new file mode 100644
index 0000000000000..9bea9e4d4aaa7
--- /dev/null
+++ b/builtin/logical/mongodb/path_roles.go
@@ -0,0 +1,224 @@
+package mongodb
+
+import (
+	"context"
+	"encoding/json"
+
+	"github.com/hashicorp/vault/sdk/framework"
+	"github.com/hashicorp/vault/sdk/logical"
+)
+
+func pathListRoles(b *backend) *framework.Path {
+	return &framework.Path{
+		Pattern: "roles/?$",
+
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.ListOperation: b.pathRoleList,
+		},
+
+		HelpSynopsis:    pathRoleHelpSyn,
+		HelpDescription: pathRoleHelpDesc,
+	}
+}
+
+func pathRoles(b *backend) *framework.Path {
+	return &framework.Path{
+		Pattern: "roles/" + framework.GenericNameRegex("name"),
+		Fields: map[string]*framework.FieldSchema{
+			"name": {
+				Type:        framework.TypeString,
+				Description: "Name of the role.",
+			},
+			"db": {
+				Type:        framework.TypeString,
+				Description: "Name of the authentication database for users generated for this role.",
+			},
+			"roles": {
+				Type:        framework.TypeString,
+				Description: "MongoDB roles to assign to the users generated for this role.",
+			},
+		},
+
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.ReadOperation:   b.pathRoleRead,
+			logical.UpdateOperation: b.pathRoleCreate,
+			logical.DeleteOperation: b.pathRoleDelete,
+		},
+
+		HelpSynopsis:    pathRoleHelpSyn,
+		HelpDescription: pathRoleHelpDesc,
+	}
+}
+
+func (b *backend) Role(ctx context.Context, s logical.Storage, n string) (*roleStorageEntry, error) {
+	entry, err := s.Get(ctx, "role/"+n)
+	if err != nil {
+		return nil, err
+	}
+	if entry == nil {
+		return nil, nil
+	}
+
+	var result roleStorageEntry
+	if err := entry.DecodeJSON(&result); err != nil {
+		return nil, err
+	}
+
+	return &result, nil
+}
+
+func (b *backend) pathRoleDelete(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
+	err := req.Storage.Delete(ctx, "role/"+data.Get("name").(string))
+	if err != nil {
+		return nil, err
+	}
+
+	return nil, nil
+}
+
+func (b *backend) pathRoleRead(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
+	role, err := b.Role(ctx, req.Storage, data.Get("name").(string))
+	if err != nil {
+		return nil, err
+	}
+	if role == nil {
+		return nil, nil
+	}
+
+	rolesJsonBytes, err := json.Marshal(role.MongoDBRoles.toStandardRolesArray())
+	if err != nil {
+		return nil, err
+	}
+
+	return &logical.Response{
+		Data: map[string]interface{}{
+			"db":    role.DB,
+			"roles": string(rolesJsonBytes),
+		},
+	}, nil
+}
+
+func (b *backend) pathRoleList(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
+	entries, err := req.Storage.List(ctx, "role/")
+	if err != nil {
+		return nil, err
+	}
+
+	return logical.ListResponse(entries), nil
+}
+
+func (b *backend) pathRoleCreate(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
+	name := data.Get("name").(string)
+	if name == "" {
+		return logical.ErrorResponse("Missing name"), nil
+	}
+
+	roleDB := data.Get("db").(string)
+	if roleDB == "" {
+		return logical.ErrorResponse("db parameter is required"), nil
+	}
+
+	// Example roles JSON:
+	//
+	// [ "readWrite", { "role": "readWrite", "db": "test" } ]
+	//
+	// For storage, we convert such an array into a homogeneous array of role documents like:
+	//
+	// [ { "role": "readWrite" }, { "role": "readWrite", "db": "test" } ]
+	//
+	var roles []mongodbRole
+	rolesJson := []byte(data.Get("roles").(string))
+	if len(rolesJson) > 0 {
+		var rolesArray []interface{}
+		err := json.Unmarshal(rolesJson, &rolesArray)
+		if err != nil {
+			return nil, err
+		}
+		for _, rawRole := range rolesArray {
+			switch role := rawRole.(type) {
+			case string:
+				roles = append(roles, mongodbRole{Role: role})
+			case map[string]interface{}:
+				if db, ok := role["db"].(string); ok {
+					if roleName, ok := role["role"].(string); ok {
+						roles = append(roles, mongodbRole{Role: roleName, DB: db})
+					}
+				}
+			}
+		}
+	}
+
+	// Store it
+	entry, err := logical.StorageEntryJSON("role/"+name, &roleStorageEntry{
+		DB:           roleDB,
+		MongoDBRoles: roles,
+	})
+	if err != nil {
+		return nil, err
+	}
+	if err := req.Storage.Put(ctx, entry); err != nil {
+		return nil, err
+	}
+
+	return nil, nil
+}
+
+func (roles mongodbRoles) toStandardRolesArray() []interface{} {
+	// Convert array of role documents like:
+	//
+	// [ { "role": "readWrite" }, { "role": "readWrite", "db": "test" } ]
+	//
+	// into a "standard" MongoDB roles array containing both strings and role documents:
+	//
+	// [ "readWrite", { "role": "readWrite", "db": "test" } ]
+	//
+	// MongoDB's createUser command accepts the latter.
+	//
+	var standardRolesArray []interface{}
+	for _, role := range roles {
+		if role.DB == "" {
+			standardRolesArray = append(standardRolesArray, role.Role)
+		} else {
+			standardRolesArray = append(standardRolesArray, role)
+		}
+	}
+	return standardRolesArray
+}
+
+type roleStorageEntry struct {
+	DB           string       `json:"db"`
+	MongoDBRoles mongodbRoles `json:"roles"`
+}
+
+type mongodbRole struct {
+	Role string `json:"role" bson:"role"`
+	DB   string `json:"db"   bson:"db"`
+}
+
+type mongodbRoles []mongodbRole
+
+const pathRoleHelpSyn = `
+Manage the roles used to generate MongoDB credentials.
+`
+
+const pathRoleHelpDesc = `
+This path lets you manage the roles used to generate MongoDB credentials.
+
+The "db" parameter specifies the authentication database for users
+generated for a given role.
+
+The "roles" parameter specifies the MongoDB roles that should be assigned
+to users created for a given role. Just like when creating a user directly
+using db.createUser, the roles JSON array can specify both built-in roles
+and user-defined roles for both the database the user is created in and
+for other databases.
+
+For example, the following roles JSON array grants the "readWrite"
+permission on both the user's authentication database and the "test"
+database:
+
+[ "readWrite", { "role": "readWrite", "db": "test" } ]
+
+Please consult the MongoDB documentation for more
+details on Role-Based Access Control in MongoDB.
+`
diff --git a/builtin/logical/mongodb/secret_creds.go b/builtin/logical/mongodb/secret_creds.go
new file mode 100644
index 0000000000000..4e5e09fc24279
--- /dev/null
+++ b/builtin/logical/mongodb/secret_creds.go
@@ -0,0 +1,84 @@
+package mongodb
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/hashicorp/vault/sdk/framework"
+	"github.com/hashicorp/vault/sdk/logical"
+	mgo "gopkg.in/mgo.v2"
+)
+
+const SecretCredsType = "creds"
+
+func secretCreds(b *backend) *framework.Secret {
+	return &framework.Secret{
+		Type: SecretCredsType,
+		Fields: map[string]*framework.FieldSchema{
+			"username": {
+				Type:        framework.TypeString,
+				Description: "Username",
+			},
+
+			"password": {
+				Type:        framework.TypeString,
+				Description: "Password",
+			},
+		},
+
+		Renew:  b.secretCredsRenew,
+		Revoke: b.secretCredsRevoke,
+	}
+}
+
+func (b *backend) secretCredsRenew(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
+	// Get the lease information
+	leaseConfig, err := b.LeaseConfig(ctx, req.Storage)
+	if err != nil {
+		return nil, err
+	}
+	if leaseConfig == nil {
+		leaseConfig = &configLease{}
+	}
+
+	resp := &logical.Response{Secret: req.Secret}
+	resp.Secret.TTL = leaseConfig.TTL
+	resp.Secret.MaxTTL = leaseConfig.MaxTTL
+	return resp, nil
+}
+
+func (b *backend) secretCredsRevoke(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
+	// Get the username from the internal data
+	usernameRaw, ok := req.Secret.InternalData["username"]
+	if !ok {
+		return nil, fmt.Errorf("secret is missing username internal data")
+	}
+	username, ok := usernameRaw.(string)
+	if !ok {
+		return nil, fmt.Errorf("username internal data is not a string")
+	}
+
+	// Get the db from the internal data
+	dbRaw, ok := req.Secret.InternalData["db"]
+	if !ok {
+		return nil, fmt.Errorf("secret is missing db internal data")
+	}
+	db, ok := dbRaw.(string)
+	if !ok {
+		return nil, fmt.Errorf("db internal data is not a string")
+	}
+
+	// Get our connection
+	session, err := b.Session(ctx, req.Storage)
+	if err != nil {
+		return nil, err
+	}
+
+	// Drop the user
+	err = session.DB(db).RemoveUser(username)
+	if err != nil && err != mgo.ErrNotFound {
+		return nil, err
+	}
+
+	return nil, nil
+}
diff --git a/builtin/logical/mongodb/util.go b/builtin/logical/mongodb/util.go
new file mode 100644
index 0000000000000..1880bbd40b41d
--- /dev/null
+++ b/builtin/logical/mongodb/util.go
@@ -0,0 +1,81 @@
+package mongodb
+
+import (
+	"crypto/tls"
+	"errors"
+	"net"
+	"net/url"
+	"strconv"
+	"strings"
+	"time"
+
+	mgo "gopkg.in/mgo.v2"
+)
+
+// Unfortunately, mgo doesn't support the ssl parameter in its MongoDB URI parsing logic, so we have to handle that
+// ourselves. See https://github.com/go-mgo/mgo/issues/84
+func parseMongoURI(rawUri string) (*mgo.DialInfo, error) {
+	uri, err := url.Parse(rawUri)
+	if err != nil {
+		return nil, err
+	}
+
+	info := mgo.DialInfo{
+		Addrs:    strings.Split(uri.Host, ","),
+		Database: strings.TrimPrefix(uri.Path, "/"),
+		Timeout:  10 * time.Second,
+	}
+
+	if uri.User != nil {
+		info.Username = uri.User.Username()
+		info.Password, _ = uri.User.Password()
+	}
+
+	query := uri.Query()
+	for key, values := range query {
+		var value string
+		if len(values) > 0 {
+			value = values[0]
+		}
+
+		switch key {
+		case "authSource":
+			info.Source = value
+		case "authMechanism":
+			info.Mechanism = value
+		case "gssapiServiceName":
+			info.Service = value
+		case "replicaSet":
+			info.ReplicaSetName = value
+		case "maxPoolSize":
+			poolLimit, err := strconv.Atoi(value)
+			if err != nil {
+				return nil, errors.New("bad value for maxPoolSize: " + value)
+			}
+			info.PoolLimit = poolLimit
+		case "ssl":
+			ssl, err := strconv.ParseBool(value)
+			if err != nil {
+				return nil, errors.New("bad value for ssl: " + value)
+			}
+			if ssl {
+				info.DialServer = func(addr *mgo.ServerAddr) (net.Conn, error) {
+					return tls.Dial("tcp", addr.String(), &tls.Config{})
+				}
+			}
+		case "connect":
+			if value == "direct" {
+				info.Direct = true
+				break
+			}
+			if value == "replicaSet" {
+				break
+			}
+			fallthrough
+		default:
+			return nil, errors.New("unsupported connection URL option: " + key + "=" + value)
+		}
+	}
+
+	return &info, nil
+}
diff --git a/builtin/logical/mssql/backend.go b/builtin/logical/mssql/backend.go
new file mode 100644
index 0000000000000..b06a7ff96c7f7
--- /dev/null
+++ b/builtin/logical/mssql/backend.go
@@ -0,0 +1,160 @@
+package mssql
+
+import (
+	"context"
+	"database/sql"
+	"fmt"
+	"strings"
+	"sync"
+
+	_ "github.com/denisenkom/go-mssqldb"
+	"github.com/hashicorp/vault/sdk/framework"
+	"github.com/hashicorp/vault/sdk/logical"
+)
+
+func Factory(ctx context.Context, conf *logical.BackendConfig) (logical.Backend, error) {
+	b := Backend()
+	if err := b.Setup(ctx, conf); err != nil {
+		return nil, err
+	}
+	return b, nil
+}
+
+func Backend() *backend {
+	var b backend
+	b.Backend = &framework.Backend{
+		Help: strings.TrimSpace(backendHelp),
+
+		PathsSpecial: &logical.Paths{
+			SealWrapStorage: []string{
+				"config/connection",
+			},
+		},
+
+		Paths: []*framework.Path{
+			pathConfigConnection(&b),
+			pathConfigLease(&b),
+			pathListRoles(&b),
+			pathRoles(&b),
+			pathCredsCreate(&b),
+		},
+
+		Secrets: []*framework.Secret{
+			secretCreds(&b),
+		},
+
+		Invalidate:  b.invalidate,
+		Clean:       b.ResetDB,
+		BackendType: logical.TypeLogical,
+	}
+
+	return &b
+}
+
+type backend struct {
+	*framework.Backend
+
+	db        *sql.DB
+	defaultDb string
+	lock      sync.Mutex
+}
+
+// DB returns the default database connection.
+func (b *backend) DB(ctx context.Context, s logical.Storage) (*sql.DB, error) {
+	b.lock.Lock()
+	defer b.lock.Unlock()
+
+	// If we already have a DB, we got it!
+	if b.db != nil {
+		if err := b.db.Ping(); err == nil {
+			return b.db, nil
+		}
+		// If the ping was unsuccessful, close it and ignore errors as we'll be
+		// reestablishing anyways
+		b.db.Close()
+	}
+
+	// Otherwise, attempt to make connection
+	entry, err := s.Get(ctx, "config/connection")
+	if err != nil {
+		return nil, err
+	}
+	if entry == nil {
+		return nil, fmt.Errorf("configure the DB connection with config/connection first")
+	}
+
+	var connConfig connectionConfig
+	if err := entry.DecodeJSON(&connConfig); err != nil {
+		return nil, err
+	}
+	connString := connConfig.ConnectionString
+
+	db, err := sql.Open("sqlserver", connString)
+	if err != nil {
+		return nil, err
+	}
+
+	// Set some connection pool settings. We don't need much of this,
+	// since the request rate shouldn't be high.
+	db.SetMaxOpenConns(connConfig.MaxOpenConnections)
+
+	stmt, err := db.Prepare("SELECT db_name();")
+	if err != nil {
+		return nil, err
+	}
+	defer stmt.Close()
+
+	err = stmt.QueryRow().Scan(&b.defaultDb)
+	if err != nil {
+		return nil, err
+	}
+
+	b.db = db
+	return b.db, nil
+}
+
+// ResetDB forces a connection next time DB() is called.
+func (b *backend) ResetDB(_ context.Context) {
+	b.lock.Lock()
+	defer b.lock.Unlock()
+
+	if b.db != nil {
+		b.db.Close()
+	}
+
+	b.db = nil
+}
+
+func (b *backend) invalidate(ctx context.Context, key string) {
+	switch key {
+	case "config/connection":
+		b.ResetDB(ctx)
+	}
+}
+
+// LeaseConfig returns the lease configuration
+func (b *backend) LeaseConfig(ctx context.Context, s logical.Storage) (*configLease, error) {
+	entry, err := s.Get(ctx, "config/lease")
+	if err != nil {
+		return nil, err
+	}
+	if entry == nil {
+		return nil, nil
+	}
+
+	var result configLease
+	if err := entry.DecodeJSON(&result); err != nil {
+		return nil, err
+	}
+
+	return &result, nil
+}
+
+const backendHelp = `
+The MSSQL backend dynamically generates database users.
+
+After mounting this backend, configure it using the endpoints within
+the "config/" path.
+
+This backend does not support Azure SQL Databases.
+`
diff --git a/builtin/logical/mssql/backend_test.go b/builtin/logical/mssql/backend_test.go
new file mode 100644
index 0000000000000..afb239c2d3fb5
--- /dev/null
+++ b/builtin/logical/mssql/backend_test.go
@@ -0,0 +1,222 @@
+package mssql
+
+import (
+	"context"
+	"fmt"
+	"log"
+	"reflect"
+	"testing"
+
+	_ "github.com/denisenkom/go-mssqldb"
+	logicaltest "github.com/hashicorp/vault/helper/testhelpers/logical"
+	mssqlhelper "github.com/hashicorp/vault/helper/testhelpers/mssql"
+	"github.com/hashicorp/vault/sdk/logical"
+	"github.com/mitchellh/mapstructure"
+)
+
+func Backend_config_connection(t *testing.T) {
+	var resp *logical.Response
+	var err error
+	config := logical.TestBackendConfig()
+	config.StorageView = &logical.InmemStorage{}
+	b, err := Factory(context.Background(), config)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	configData := map[string]interface{}{
+		"connection_string":    "sample_connection_string",
+		"max_open_connections": 7,
+		"verify_connection":    false,
+	}
+
+	configReq := &logical.Request{
+		Operation: logical.UpdateOperation,
+		Path:      "config/connection",
+		Storage:   config.StorageView,
+		Data:      configData,
+	}
+	resp, err = b.HandleRequest(context.Background(), configReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%s resp:%#v\n", err, resp)
+	}
+
+	configReq.Operation = logical.ReadOperation
+	resp, err = b.HandleRequest(context.Background(), configReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%s resp:%#v\n", err, resp)
+	}
+
+	delete(configData, "verify_connection")
+	delete(configData, "connection_string")
+	if !reflect.DeepEqual(configData, resp.Data) {
+		t.Fatalf("bad: expected:%#v\nactual:%#v\n", configData, resp.Data)
+	}
+}
+
+func TestBackend_basic(t *testing.T) {
+	b, _ := Factory(context.Background(), logical.TestBackendConfig())
+
+	cleanup, connURL := mssqlhelper.PrepareMSSQLTestContainer(t)
+	defer cleanup()
+
+	logicaltest.Test(t, logicaltest.TestCase{
+		PreCheck:       testAccPreCheckFunc(t, connURL),
+		LogicalBackend: b,
+		Steps: []logicaltest.TestStep{
+			testAccStepConfig(t, connURL),
+			testAccStepRole(t),
+			testAccStepReadCreds(t, "web"),
+		},
+	})
+}
+
+func TestBackend_roleCrud(t *testing.T) {
+	b := Backend()
+
+	cleanup, connURL := mssqlhelper.PrepareMSSQLTestContainer(t)
+	defer cleanup()
+
+	logicaltest.Test(t, logicaltest.TestCase{
+		PreCheck:       testAccPreCheckFunc(t, connURL),
+		LogicalBackend: b,
+		Steps: []logicaltest.TestStep{
+			testAccStepConfig(t, connURL),
+			testAccStepRole(t),
+			testAccStepReadRole(t, "web", testRoleSQL),
+			testAccStepDeleteRole(t, "web"),
+			testAccStepReadRole(t, "web", ""),
+		},
+	})
+}
+
+func TestBackend_leaseWriteRead(t *testing.T) {
+	b := Backend()
+
+	cleanup, connURL := mssqlhelper.PrepareMSSQLTestContainer(t)
+	defer cleanup()
+
+	logicaltest.Test(t, logicaltest.TestCase{
+		PreCheck:       testAccPreCheckFunc(t, connURL),
+		LogicalBackend: b,
+		Steps: []logicaltest.TestStep{
+			testAccStepConfig(t, connURL),
+			testAccStepWriteLease(t),
+			testAccStepReadLease(t),
+		},
+	})
+}
+
+func testAccPreCheckFunc(t *testing.T, connectionURL string) func() {
+	return func() {
+		if connectionURL == "" {
+			t.Fatal("connection URL must be set for acceptance tests")
+		}
+	}
+}
+
+func testAccStepConfig(t *testing.T, connURL string) logicaltest.TestStep {
+	return logicaltest.TestStep{
+		Operation: logical.UpdateOperation,
+		Path:      "config/connection",
+		Data: map[string]interface{}{
+			"connection_string": connURL,
+		},
+	}
+}
+
+func testAccStepRole(t *testing.T) logicaltest.TestStep {
+	return logicaltest.TestStep{
+		Operation: logical.UpdateOperation,
+		Path:      "roles/web",
+		Data: map[string]interface{}{
+			"sql": testRoleSQL,
+		},
+	}
+}
+
+func testAccStepDeleteRole(t *testing.T, n string) logicaltest.TestStep {
+	return logicaltest.TestStep{
+		Operation: logical.DeleteOperation,
+		Path:      "roles/" + n,
+	}
+}
+
+func testAccStepReadCreds(t *testing.T, name string) logicaltest.TestStep {
+	return logicaltest.TestStep{
+		Operation: logical.ReadOperation,
+		Path:      "creds/" + name,
+		Check: func(resp *logical.Response) error {
+			var d struct {
+				Username string `mapstructure:"username"`
+				Password string `mapstructure:"password"`
+			}
+			if err := mapstructure.Decode(resp.Data, &d); err != nil {
+				return err
+			}
+			log.Printf("[WARN] Generated credentials: %v", d)
+
+			return nil
+		},
+	}
+}
+
+func testAccStepReadRole(t *testing.T, name, sql string) logicaltest.TestStep {
+	return logicaltest.TestStep{
+		Operation: logical.ReadOperation,
+		Path:      "roles/" + name,
+		Check: func(resp *logical.Response) error {
+			if resp == nil {
+				if sql == "" {
+					return nil
+				}
+
+				return fmt.Errorf("bad: %#v", resp)
+			}
+
+			var d struct {
+				SQL string `mapstructure:"sql"`
+			}
+			if err := mapstructure.Decode(resp.Data, &d); err != nil {
+				return err
+			}
+
+			if d.SQL != sql {
+				return fmt.Errorf("bad: %#v", resp)
+			}
+
+			return nil
+		},
+	}
+}
+
+func testAccStepWriteLease(t *testing.T) logicaltest.TestStep {
+	return logicaltest.TestStep{
+		Operation: logical.UpdateOperation,
+		Path:      "config/lease",
+		Data: map[string]interface{}{
+			"ttl":     "1h5m",
+			"max_ttl": "24h",
+		},
+	}
+}
+
+func testAccStepReadLease(t *testing.T) logicaltest.TestStep {
+	return logicaltest.TestStep{
+		Operation: logical.ReadOperation,
+		Path:      "config/lease",
+		Check: func(resp *logical.Response) error {
+			if resp.Data["ttl"] != "1h5m0s" || resp.Data["max_ttl"] != "24h0m0s" {
+				return fmt.Errorf("bad: %#v", resp)
+			}
+
+			return nil
+		},
+	}
+}
+
+const testRoleSQL = `
+CREATE LOGIN [{{name}}] WITH PASSWORD = '{{password}}';
+CREATE USER [{{name}}] FOR LOGIN [{{name}}];
+GRANT SELECT ON SCHEMA::dbo TO [{{name}}]
+`
diff --git a/builtin/logical/mssql/cmd/mssql/main.go b/builtin/logical/mssql/cmd/mssql/main.go
new file mode 100644
index 0000000000000..0db9c1c982039
--- /dev/null
+++ b/builtin/logical/mssql/cmd/mssql/main.go
@@ -0,0 +1,29 @@
+package main
+
+import (
+	"os"
+
+	hclog "github.com/hashicorp/go-hclog"
+	"github.com/hashicorp/vault/api"
+	"github.com/hashicorp/vault/builtin/logical/mssql"
+	"github.com/hashicorp/vault/sdk/plugin"
+)
+
+func main() {
+	apiClientMeta := &api.PluginAPIClientMeta{}
+	flags := apiClientMeta.FlagSet()
+	flags.Parse(os.Args[1:])
+
+	tlsConfig := apiClientMeta.GetTLSConfig()
+	tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig)
+
+	if err := plugin.Serve(&plugin.ServeOpts{
+		BackendFactoryFunc: mssql.Factory,
+		TLSProviderFunc:    tlsProviderFunc,
+	}); err != nil {
+		logger := hclog.New(&hclog.LoggerOptions{})
+
+		logger.Error("plugin shutting down", "error", err)
+		os.Exit(1)
+	}
+}
diff --git a/builtin/logical/mssql/path_config_connection.go b/builtin/logical/mssql/path_config_connection.go
new file mode 100644
index 0000000000000..f0ad63108e814
--- /dev/null
+++ b/builtin/logical/mssql/path_config_connection.go
@@ -0,0 +1,126 @@
+package mssql
+
+import (
+	"context"
+	"database/sql"
+	"fmt"
+
+	"github.com/hashicorp/vault/sdk/framework"
+	"github.com/hashicorp/vault/sdk/logical"
+)
+
+func pathConfigConnection(b *backend) *framework.Path {
+	return &framework.Path{
+		Pattern: "config/connection",
+		Fields: map[string]*framework.FieldSchema{
+			"connection_string": {
+				Type:        framework.TypeString,
+				Description: "DB connection parameters",
+			},
+			"max_open_connections": {
+				Type:        framework.TypeInt,
+				Description: "Maximum number of open connections to database",
+			},
+			"verify_connection": {
+				Type:        framework.TypeBool,
+				Default:     true,
+				Description: "If set, connection_string is verified by actually connecting to the database",
+			},
+		},
+
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.UpdateOperation: b.pathConnectionWrite,
+			logical.ReadOperation:   b.pathConnectionRead,
+		},
+
+		HelpSynopsis:    pathConfigConnectionHelpSyn,
+		HelpDescription: pathConfigConnectionHelpDesc,
+	}
+}
+
+// pathConnectionRead reads out the connection configuration
+func (b *backend) pathConnectionRead(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
+	entry, err := req.Storage.Get(ctx, "config/connection")
+	if err != nil {
+		return nil, fmt.Errorf("failed to read connection configuration")
+	}
+	if entry == nil {
+		return nil, nil
+	}
+
+	var config connectionConfig
+	if err := entry.DecodeJSON(&config); err != nil {
+		return nil, err
+	}
+
+	return &logical.Response{
+		Data: map[string]interface{}{
+			"max_open_connections": config.MaxOpenConnections,
+		},
+	}, nil
+}
+
+// pathConnectionWrite stores the connection configuration
+func (b *backend) pathConnectionWrite(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
+	connString := data.Get("connection_string").(string)
+
+	maxOpenConns := data.Get("max_open_connections").(int)
+	if maxOpenConns == 0 {
+		maxOpenConns = 2
+	}
+
+	// Don't check the connection_string if verification is disabled
+	verifyConnection := data.Get("verify_connection").(bool)
+	if verifyConnection {
+		// Verify the string
+		db, err := sql.Open("mssql", connString)
+		if err != nil {
+			return logical.ErrorResponse(fmt.Sprintf(
+				"Error validating connection info: %s", err)), nil
+		}
+		defer db.Close()
+		if err := db.Ping(); err != nil {
+			return logical.ErrorResponse(fmt.Sprintf(
+				"Error validating connection info: %s", err)), nil
+		}
+	}
+
+	// Store it
+	entry, err := logical.StorageEntryJSON("config/connection", connectionConfig{
+		ConnectionString:   connString,
+		MaxOpenConnections: maxOpenConns,
+	})
+	if err != nil {
+		return nil, err
+	}
+	if err := req.Storage.Put(ctx, entry); err != nil {
+		return nil, err
+	}
+
+	// Reset the DB connection
+	b.ResetDB(ctx)
+
+	resp := &logical.Response{}
+	resp.AddWarning("Read access to this endpoint should be controlled via ACLs as it will return the connection string as it is, including passwords, if any.")
+
+	return resp, nil
+}
+
+type connectionConfig struct {
+	ConnectionString   string `json:"connection_string" structs:"connection_string" mapstructure:"connection_string"`
+	MaxOpenConnections int    `json:"max_open_connections" structs:"max_open_connections" mapstructure:"max_open_connections"`
+}
+
+const pathConfigConnectionHelpSyn = `
+Configure the connection string to talk to Microsoft Sql Server.
+`
+
+const pathConfigConnectionHelpDesc = `
+This path configures the connection string used to connect to Sql Server.
+The value of the string is a Data Source Name (DSN). An example is
+using "server=<hostname>;port=<port>;user id=<username>;password=<password>;database=<database>;app name=vault;"
+
+When configuring the connection string, the backend will verify its validity.
+If the database is not available when setting the connection string, set the
+"verify_connection" option to false.
+`
diff --git a/builtin/logical/mssql/path_config_lease.go b/builtin/logical/mssql/path_config_lease.go
new file mode 100644
index 0000000000000..d0fe86dfbd40d
--- /dev/null
+++ b/builtin/logical/mssql/path_config_lease.go
@@ -0,0 +1,114 @@
+package mssql
+
+import (
+	"context"
+	"fmt"
+	"time"
+
+	"github.com/hashicorp/vault/sdk/framework"
+	"github.com/hashicorp/vault/sdk/logical"
+)
+
+func pathConfigLease(b *backend) *framework.Path {
+	return &framework.Path{
+		Pattern: "config/lease",
+		Fields: map[string]*framework.FieldSchema{
+			"ttl": {
+				Type:        framework.TypeString,
+				Description: "Default ttl for roles.",
+			},
+
+			"ttl_max": {
+				Type: framework.TypeString,
+				Description: `Deprecated: use "max_ttl" instead.  Maximum
+time a credential is valid for.`,
+			},
+
+			"max_ttl": {
+				Type:        framework.TypeString,
+				Description: "Maximum time a credential is valid for.",
+			},
+		},
+
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.ReadOperation:   b.pathConfigLeaseRead,
+			logical.UpdateOperation: b.pathConfigLeaseWrite,
+		},
+
+		HelpSynopsis:    pathConfigLeaseHelpSyn,
+		HelpDescription: pathConfigLeaseHelpDesc,
+	}
+}
+
+func (b *backend) pathConfigLeaseWrite(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
+	ttlRaw := d.Get("ttl").(string)
+	ttlMaxRaw := d.Get("max_ttl").(string)
+	if len(ttlMaxRaw) == 0 {
+		ttlMaxRaw = d.Get("ttl_max").(string)
+	}
+
+	ttl, err := time.ParseDuration(ttlRaw)
+	if err != nil {
+		return logical.ErrorResponse(fmt.Sprintf(
+			"Invalid ttl: %s", err)), nil
+	}
+	ttlMax, err := time.ParseDuration(ttlMaxRaw)
+	if err != nil {
+		return logical.ErrorResponse(fmt.Sprintf(
+			"Invalid max_ttl: %s", err)), nil
+	}
+
+	// Store it
+	entry, err := logical.StorageEntryJSON("config/lease", &configLease{
+		TTL:    ttl,
+		TTLMax: ttlMax,
+	})
+	if err != nil {
+		return nil, err
+	}
+	if err := req.Storage.Put(ctx, entry); err != nil {
+		return nil, err
+	}
+
+	return nil, nil
+}
+
+func (b *backend) pathConfigLeaseRead(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
+	leaseConfig, err := b.LeaseConfig(ctx, req.Storage)
+	if err != nil {
+		return nil, err
+	}
+	if leaseConfig == nil {
+		return nil, nil
+	}
+
+	resp := &logical.Response{
+		Data: map[string]interface{}{
+			"ttl":     leaseConfig.TTL.String(),
+			"ttl_max": leaseConfig.TTLMax.String(),
+			"max_ttl": leaseConfig.TTLMax.String(),
+		},
+	}
+	resp.AddWarning("The field ttl_max is deprecated and will be removed in a future release. Use max_ttl instead.")
+
+	return resp, nil
+}
+
+type configLease struct {
+	TTL    time.Duration
+	TTLMax time.Duration
+}
+
+const pathConfigLeaseHelpSyn = `
+Configure the default lease ttl for generated credentials.
+`
+
+const pathConfigLeaseHelpDesc = `
+This configures the default lease ttl used for credentials
+generated by this backend. The ttl specifies the duration that a
+credential will be valid for, as well as the maximum session for
+a set of credentials.
+
+The format for the ttl is "1h" or integer and then unit. The longest
+unit is hour.
+`
diff --git a/builtin/logical/mssql/path_creds_create.go b/builtin/logical/mssql/path_creds_create.go
new file mode 100644
index 0000000000000..42e8642c031aa
--- /dev/null
+++ b/builtin/logical/mssql/path_creds_create.go
@@ -0,0 +1,129 @@
+package mssql
+
+import (
+	"context"
+	"fmt"
+	"strings"
+
+	"github.com/hashicorp/go-secure-stdlib/strutil"
+	uuid "github.com/hashicorp/go-uuid"
+	"github.com/hashicorp/vault/sdk/framework"
+	"github.com/hashicorp/vault/sdk/helper/dbtxn"
+	"github.com/hashicorp/vault/sdk/logical"
+)
+
+func pathCredsCreate(b *backend) *framework.Path {
+	return &framework.Path{
+		Pattern: "creds/" + framework.GenericNameRegex("name"),
+		Fields: map[string]*framework.FieldSchema{
+			"name": {
+				Type:        framework.TypeString,
+				Description: "Name of the role.",
+			},
+		},
+
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.ReadOperation: b.pathCredsCreateRead,
+		},
+
+		HelpSynopsis:    pathCredsCreateHelpSyn,
+		HelpDescription: pathCredsCreateHelpDesc,
+	}
+}
+
+func (b *backend) pathCredsCreateRead(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
+	name := data.Get("name").(string)
+
+	// Get the role
+	role, err := b.Role(ctx, req.Storage, name)
+	if err != nil {
+		return nil, err
+	}
+	if role == nil {
+		return logical.ErrorResponse(fmt.Sprintf("unknown role: %s", name)), nil
+	}
+
+	// Determine if we have a lease configuration
+	leaseConfig, err := b.LeaseConfig(ctx, req.Storage)
+	if err != nil {
+		return nil, err
+	}
+	if leaseConfig == nil {
+		leaseConfig = &configLease{}
+	}
+
+	// Generate our username and password
+	displayName := req.DisplayName
+	if len(displayName) > 10 {
+		displayName = displayName[:10]
+	}
+	userUUID, err := uuid.GenerateUUID()
+	if err != nil {
+		return nil, err
+	}
+	username := fmt.Sprintf("%s-%s", displayName, userUUID)
+	password, err := uuid.GenerateUUID()
+	if err != nil {
+		return nil, err
+	}
+
+	// Get our handle
+	db, err := b.DB(ctx, req.Storage)
+	if err != nil {
+		return nil, err
+	}
+
+	// Start a transaction
+	tx, err := db.Begin()
+	if err != nil {
+		return nil, err
+	}
+	defer tx.Rollback()
+
+	// Always reset database to default db of connection.  Since it is in a
+	// transaction, all statements will be on the same connection in the pool.
+	roleSQL := fmt.Sprintf("USE [%s]; %s", b.defaultDb, role.SQL)
+
+	// Execute each query
+	for _, query := range strutil.ParseArbitraryStringSlice(roleSQL, ";") {
+		query = strings.TrimSpace(query)
+		if len(query) == 0 {
+			continue
+		}
+
+		m := map[string]string{
+			"name":     username,
+			"password": password,
+		}
+		if err := dbtxn.ExecuteTxQueryDirect(ctx, tx, m, query); err != nil {
+			return nil, err
+		}
+	}
+
+	// Commit the transaction
+	if err := tx.Commit(); err != nil {
+		return nil, err
+	}
+
+	// Return the secret
+	resp := b.Secret(SecretCredsType).Response(map[string]interface{}{
+		"username": username,
+		"password": password,
+	}, map[string]interface{}{
+		"username": username,
+	})
+	resp.Secret.TTL = leaseConfig.TTL
+	resp.Secret.MaxTTL = leaseConfig.TTLMax
+
+	return resp, nil
+}
+
+const pathCredsCreateHelpSyn = `
+Request database credentials for a certain role.
+`
+
+const pathCredsCreateHelpDesc = `
+This path reads database credentials for a certain role. The
+database credentials will be generated on demand and will be automatically
+revoked when the lease is up.
+`
diff --git a/builtin/logical/mssql/path_roles.go b/builtin/logical/mssql/path_roles.go
new file mode 100644
index 0000000000000..e378422d3cf79
--- /dev/null
+++ b/builtin/logical/mssql/path_roles.go
@@ -0,0 +1,172 @@
+package mssql
+
+import (
+	"context"
+	"fmt"
+	"strings"
+
+	"github.com/hashicorp/go-secure-stdlib/strutil"
+	"github.com/hashicorp/vault/sdk/framework"
+	"github.com/hashicorp/vault/sdk/logical"
+)
+
+func pathListRoles(b *backend) *framework.Path {
+	return &framework.Path{
+		Pattern: "roles/?$",
+
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.ListOperation: b.pathRoleList,
+		},
+
+		HelpSynopsis:    pathRoleHelpSyn,
+		HelpDescription: pathRoleHelpDesc,
+	}
+}
+
+func pathRoles(b *backend) *framework.Path {
+	return &framework.Path{
+		Pattern: "roles/" + framework.GenericNameRegex("name"),
+		Fields: map[string]*framework.FieldSchema{
+			"name": {
+				Type:        framework.TypeString,
+				Description: "Name of the role.",
+			},
+
+			"sql": {
+				Type:        framework.TypeString,
+				Description: "SQL string to create a role. See help for more info.",
+			},
+		},
+
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.ReadOperation:   b.pathRoleRead,
+			logical.UpdateOperation: b.pathRoleCreate,
+			logical.DeleteOperation: b.pathRoleDelete,
+		},
+
+		HelpSynopsis:    pathRoleHelpSyn,
+		HelpDescription: pathRoleHelpDesc,
+	}
+}
+
+func (b *backend) Role(ctx context.Context, s logical.Storage, n string) (*roleEntry, error) {
+	entry, err := s.Get(ctx, "role/"+n)
+	if err != nil {
+		return nil, err
+	}
+	if entry == nil {
+		return nil, nil
+	}
+
+	var result roleEntry
+	if err := entry.DecodeJSON(&result); err != nil {
+		return nil, err
+	}
+
+	return &result, nil
+}
+
+func (b *backend) pathRoleDelete(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
+	err := req.Storage.Delete(ctx, "role/"+data.Get("name").(string))
+	if err != nil {
+		return nil, err
+	}
+
+	return nil, nil
+}
+
+func (b *backend) pathRoleRead(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
+	role, err := b.Role(ctx, req.Storage, data.Get("name").(string))
+	if err != nil {
+		return nil, err
+	}
+	if role == nil {
+		return nil, nil
+	}
+
+	return &logical.Response{
+		Data: map[string]interface{}{
+			"sql": role.SQL,
+		},
+	}, nil
+}
+
+func (b *backend) pathRoleList(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
+	entries, err := req.Storage.List(ctx, "role/")
+	if err != nil {
+		return nil, err
+	}
+
+	return logical.ListResponse(entries), nil
+}
+
+func (b *backend) pathRoleCreate(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
+	name := data.Get("name").(string)
+	sql := data.Get("sql").(string)
+
+	// Get our connection
+	db, err := b.DB(ctx, req.Storage)
+	if err != nil {
+		return nil, err
+	}
+
+	// Test the query by trying to prepare it
+	for _, query := range strutil.ParseArbitraryStringSlice(sql, ";") {
+		query = strings.TrimSpace(query)
+		if len(query) == 0 {
+			continue
+		}
+
+		stmt, err := db.Prepare(Query(query, map[string]string{
+			"name":     "foo",
+			"password": "bar",
+		}))
+		if err != nil {
+			return logical.ErrorResponse(fmt.Sprintf(
+				"Error testing query: %s", err)), nil
+		}
+		stmt.Close()
+	}
+
+	// Store it
+	entry, err := logical.StorageEntryJSON("role/"+name, &roleEntry{
+		SQL: sql,
+	})
+	if err != nil {
+		return nil, err
+	}
+	if err := req.Storage.Put(ctx, entry); err != nil {
+		return nil, err
+	}
+	return nil, nil
+}
+
+type roleEntry struct {
+	SQL string `json:"sql"`
+}
+
+const pathRoleHelpSyn = `
+Manage the roles that can be created with this backend.
+`
+
+const pathRoleHelpDesc = `
+This path lets you manage the roles that can be created with this backend.
+
+The "sql" parameter customizes the SQL string used to create the login to
+the server.  The parameter can be a sequence of SQL queries, each semi-colon
+separated. Some substitution will be done to the SQL string for certain keys.
+The names of the variables must be surrounded by "{{" and "}}" to be replaced.
+
+  * "name" - The random username generated for the DB user.
+
+  * "password" - The random password generated for the DB user.
+
+Example SQL query to use:
+
+  CREATE LOGIN [{{name}}] WITH PASSWORD = '{{password}}';
+  CREATE USER [{{name}}] FROM LOGIN [{{name}}];
+  GRANT SELECT, UPDATE, DELETE, INSERT on SCHEMA::dbo TO [{{name}}];
+
+Please see the Microsoft SQL Server manual on the GRANT command to learn how to
+do more fine grained access.
+`
diff --git a/builtin/logical/mssql/secret_creds.go b/builtin/logical/mssql/secret_creds.go
new file mode 100644
index 0000000000000..9fc52f9a777ac
--- /dev/null
+++ b/builtin/logical/mssql/secret_creds.go
@@ -0,0 +1,180 @@
+package mssql
+
+import (
+	"context"
+	"database/sql"
+	"fmt"
+
+	"github.com/hashicorp/vault/sdk/framework"
+	"github.com/hashicorp/vault/sdk/helper/dbtxn"
+	"github.com/hashicorp/vault/sdk/logical"
+)
+
+const SecretCredsType = "creds"
+
+func secretCreds(b *backend) *framework.Secret {
+	return &framework.Secret{
+		Type: SecretCredsType,
+		Fields: map[string]*framework.FieldSchema{
+			"username": {
+				Type:        framework.TypeString,
+				Description: "Username",
+			},
+
+			"password": {
+				Type:        framework.TypeString,
+				Description: "Password",
+			},
+		},
+
+		Renew:  b.secretCredsRenew,
+		Revoke: b.secretCredsRevoke,
+	}
+}
+
+func (b *backend) secretCredsRenew(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
+	// Get the lease information
+	leaseConfig, err := b.LeaseConfig(ctx, req.Storage)
+	if err != nil {
+		return nil, err
+	}
+	if leaseConfig == nil {
+		leaseConfig = &configLease{}
+	}
+
+	resp := &logical.Response{Secret: req.Secret}
+	resp.Secret.TTL = leaseConfig.TTL
+	resp.Secret.MaxTTL = leaseConfig.TTLMax
+	return resp, nil
+}
+
+func (b *backend) secretCredsRevoke(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
+	// Get the username from the internal data
+	usernameRaw, ok := req.Secret.InternalData["username"]
+	if !ok {
+		return nil, fmt.Errorf("secret is missing username internal data")
+	}
+	username, ok := usernameRaw.(string)
+
+	// Get our connection
+	db, err := b.DB(ctx, req.Storage)
+	if err != nil {
+		return nil, err
+	}
+
+	// First disable server login
+	disableStmt, err := db.Prepare(fmt.Sprintf("ALTER LOGIN [%s] DISABLE;", username))
+	if err != nil {
+		return nil, err
+	}
+	defer disableStmt.Close()
+	if _, err := disableStmt.Exec(); err != nil {
+		return nil, err
+	}
+
+	// Query for sessions for the login so that we can kill any outstanding
+	// sessions.  There cannot be any active sessions before we drop the logins
+	// This isn't done in a transaction because even if we fail along the way,
+	// we want to remove as much access as possible
+	sessionStmt, err := db.Prepare("SELECT session_id FROM sys.dm_exec_sessions WHERE login_name = @p1;")
+	if err != nil {
+		return nil, err
+	}
+	defer sessionStmt.Close()
+
+	sessionRows, err := sessionStmt.Query(username)
+	if err != nil {
+		return nil, err
+	}
+	defer sessionRows.Close()
+
+	var revokeStmts []string
+	for sessionRows.Next() {
+		var sessionID int
+		err = sessionRows.Scan(&sessionID)
+		if err != nil {
+			return nil, err
+		}
+		revokeStmts = append(revokeStmts, fmt.Sprintf("KILL %d;", sessionID))
+	}
+
+	// Query for database users using undocumented stored procedure for now since
+	// it is the easiest way to get this information;
+	// we need to drop the database users before we can drop the login and the role
+	// This isn't done in a transaction because even if we fail along the way,
+	// we want to remove as much access as possible
+	stmt, err := db.Prepare("EXEC master.dbo.sp_msloginmappings @p1;")
+	if err != nil {
+		return nil, err
+	}
+	defer stmt.Close()
+
+	rows, err := stmt.Query(username)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+
+	for rows.Next() {
+		var loginName, dbName, qUsername, aliasName sql.NullString
+		err = rows.Scan(&loginName, &dbName, &qUsername, &aliasName)
+		if err != nil {
+			return nil, err
+		}
+		if !dbName.Valid {
+			continue
+		}
+		revokeStmts = append(revokeStmts, fmt.Sprintf(dropUserSQL, dbName.String, username, username))
+	}
+
+	// we do not stop on error, as we want to remove as
+	// many permissions as possible right now
+	var lastStmtError error
+	for _, query := range revokeStmts {
+		if err := dbtxn.ExecuteDBQueryDirect(ctx, db, nil, query); err != nil {
+			lastStmtError = err
+			continue
+		}
+	}
+
+	// can't drop if not all database users are dropped
+	if rows.Err() != nil {
+		return nil, fmt.Errorf("could not generate sql statements for all rows: %w", rows.Err())
+	}
+	if lastStmtError != nil {
+		return nil, fmt.Errorf("could not perform all sql statements: %w", lastStmtError)
+	}
+
+	// Drop this login
+	stmt, err = db.Prepare(fmt.Sprintf(dropLoginSQL, username, username))
+	if err != nil {
+		return nil, err
+	}
+	defer stmt.Close()
+	if _, err := stmt.Exec(); err != nil {
+		return nil, err
+	}
+
+	return nil, nil
+}
+
+const dropUserSQL = `
+USE [%s]
+IF EXISTS
+  (SELECT name
+   FROM sys.database_principals
+   WHERE name = N'%s')
+BEGIN
+  DROP USER [%s]
+END
+`
+
+const dropLoginSQL = `
+IF EXISTS
+  (SELECT name
+   FROM master.sys.server_principals
+   WHERE name = N'%s')
+BEGIN
+  DROP LOGIN [%s]
+END
+`
diff --git a/builtin/logical/mssql/util.go b/builtin/logical/mssql/util.go
new file mode 100644
index 0000000000000..17c46c6813bb8
--- /dev/null
+++ b/builtin/logical/mssql/util.go
@@ -0,0 +1,28 @@
+package mssql
+
+import (
+	"fmt"
+	"strings"
+)
+
+// SplitSQL is used to split a series of SQL statements
+func SplitSQL(sql string) []string {
+	parts := strings.Split(sql, ";")
+	out := make([]string, 0, len(parts))
+	for _, p := range parts {
+		clean := strings.TrimSpace(p)
+		if len(clean) > 0 {
+			out = append(out, clean)
+		}
+	}
+	return out
+}
+
+// Query templates a query for us.
+func Query(tpl string, data map[string]string) string {
+	for k, v := range data {
+		tpl = strings.ReplaceAll(tpl, fmt.Sprintf("{{%s}}", k), v)
+	}
+
+	return tpl
+}
diff --git a/builtin/logical/mysql/backend.go b/builtin/logical/mysql/backend.go
new file mode 100644
index 0000000000000..b9840dad3000d
--- /dev/null
+++ b/builtin/logical/mysql/backend.go
@@ -0,0 +1,151 @@
+package mysql
+
+import (
+	"context"
+	"database/sql"
+	"fmt"
+	"strings"
+	"sync"
+
+	_ "github.com/go-sql-driver/mysql"
+	"github.com/hashicorp/vault/sdk/framework"
+	"github.com/hashicorp/vault/sdk/logical"
+)
+
+func Factory(ctx context.Context, conf *logical.BackendConfig) (logical.Backend, error) {
+	b := Backend()
+	if err := b.Setup(ctx, conf); err != nil {
+		return nil, err
+	}
+	return b, nil
+}
+
+func Backend() *backend {
+	var b backend
+	b.Backend = &framework.Backend{
+		Help: strings.TrimSpace(backendHelp),
+
+		PathsSpecial: &logical.Paths{
+			SealWrapStorage: []string{
+				"config/connection",
+			},
+		},
+
+		Paths: []*framework.Path{
+			pathConfigConnection(&b),
+			pathConfigLease(&b),
+			pathListRoles(&b),
+			pathRoles(&b),
+			pathRoleCreate(&b),
+		},
+
+		Secrets: []*framework.Secret{
+			secretCreds(&b),
+		},
+
+		Invalidate:  b.invalidate,
+		Clean:       b.ResetDB,
+		BackendType: logical.TypeLogical,
+	}
+
+	return &b
+}
+
+type backend struct {
+	*framework.Backend
+
+	db   *sql.DB
+	lock sync.Mutex
+}
+
+// DB returns the database connection.
+func (b *backend) DB(ctx context.Context, s logical.Storage) (*sql.DB, error) {
+	b.lock.Lock()
+	defer b.lock.Unlock()
+
+	// If we already have a DB, we got it!
+	if b.db != nil {
+		if err := b.db.Ping(); err == nil {
+			return b.db, nil
+		}
+		// If the ping was unsuccessful, close it and ignore errors as we'll be
+		// reestablishing anyways
+		b.db.Close()
+	}
+
+	// Otherwise, attempt to make connection
+	entry, err := s.Get(ctx, "config/connection")
+	if err != nil {
+		return nil, err
+	}
+	if entry == nil {
+		return nil,
+			fmt.Errorf("configure the DB connection with config/connection first")
+	}
+
+	var connConfig connectionConfig
+	if err := entry.DecodeJSON(&connConfig); err != nil {
+		return nil, err
+	}
+
+	conn := connConfig.ConnectionURL
+	if len(conn) == 0 {
+		conn = connConfig.ConnectionString
+	}
+
+	b.db, err = sql.Open("mysql", conn)
+	if err != nil {
+		return nil, err
+	}
+
+	// Set some connection pool settings. We don't need much of this,
+	// since the request rate shouldn't be high.
+	b.db.SetMaxOpenConns(connConfig.MaxOpenConnections)
+	b.db.SetMaxIdleConns(connConfig.MaxIdleConnections)
+
+	return b.db, nil
+}
+
+// ResetDB forces a connection next time DB() is called.
+func (b *backend) ResetDB(_ context.Context) {
+	b.lock.Lock()
+	defer b.lock.Unlock()
+
+	if b.db != nil {
+		b.db.Close()
+	}
+
+	b.db = nil
+}
+
+func (b *backend) invalidate(ctx context.Context, key string) {
+	switch key {
+	case "config/connection":
+		b.ResetDB(ctx)
+	}
+}
+
+// Lease returns the lease information
+func (b *backend) Lease(ctx context.Context, s logical.Storage) (*configLease, error) {
+	entry, err := s.Get(ctx, "config/lease")
+	if err != nil {
+		return nil, err
+	}
+	if entry == nil {
+		return nil, nil
+	}
+
+	var result configLease
+	if err := entry.DecodeJSON(&result); err != nil {
+		return nil, err
+	}
+
+	return &result, nil
+}
+
+const backendHelp = `
+The MySQL backend dynamically generates database users.
+
+After mounting this backend, configure it using the endpoints within
+the "config/" path.
+`
diff --git a/builtin/logical/mysql/backend_test.go b/builtin/logical/mysql/backend_test.go
new file mode 100644
index 0000000000000..62074d8ed4e5b
--- /dev/null
+++ b/builtin/logical/mysql/backend_test.go
@@ -0,0 +1,307 @@
+package mysql
+
+import (
+	"context"
+	"fmt"
+	"log"
+	"reflect"
+	"testing"
+
+	logicaltest "github.com/hashicorp/vault/helper/testhelpers/logical"
+	mysqlhelper "github.com/hashicorp/vault/helper/testhelpers/mysql"
+	"github.com/hashicorp/vault/sdk/logical"
+	"github.com/mitchellh/mapstructure"
+)
+
+func TestBackend_config_connection(t *testing.T) {
+	var resp *logical.Response
+	var err error
+	config := logical.TestBackendConfig()
+	config.StorageView = &logical.InmemStorage{}
+	b, err := Factory(context.Background(), config)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	configData := map[string]interface{}{
+		"connection_url":       "sample_connection_url",
+		"max_open_connections": 9,
+		"max_idle_connections": 7,
+		"verify_connection":    false,
+	}
+
+	configReq := &logical.Request{
+		Operation: logical.UpdateOperation,
+		Path:      "config/connection",
+		Storage:   config.StorageView,
+		Data:      configData,
+	}
+	resp, err = b.HandleRequest(context.Background(), configReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%s resp:%#v\n", err, resp)
+	}
+
+	configReq.Operation = logical.ReadOperation
+	resp, err = b.HandleRequest(context.Background(), configReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%s resp:%#v\n", err, resp)
+	}
+
+	delete(configData, "verify_connection")
+	delete(configData, "connection_url")
+	if !reflect.DeepEqual(configData, resp.Data) {
+		t.Fatalf("bad: expected:%#v\nactual:%#v\n", configData, resp.Data)
+	}
+}
+
+func TestBackend_basic(t *testing.T) {
+	config := logical.TestBackendConfig()
+	config.StorageView = &logical.InmemStorage{}
+	b, err := Factory(context.Background(), config)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	cleanup, connURL := mysqlhelper.PrepareTestContainer(t, false, "secret")
+	defer cleanup()
+
+	connData := map[string]interface{}{
+		"connection_url": connURL,
+	}
+
+	// for wildcard based mysql user
+	logicaltest.Test(t, logicaltest.TestCase{
+		LogicalBackend: b,
+		Steps: []logicaltest.TestStep{
+			testAccStepConfig(t, connData, false),
+			testAccStepRole(t, true),
+			testAccStepReadCreds(t, "web"),
+		},
+	})
+}
+
+func TestBackend_basicHostRevoke(t *testing.T) {
+	config := logical.TestBackendConfig()
+	config.StorageView = &logical.InmemStorage{}
+	b, err := Factory(context.Background(), config)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	cleanup, connURL := mysqlhelper.PrepareTestContainer(t, false, "secret")
+	defer cleanup()
+
+	connData := map[string]interface{}{
+		"connection_url": connURL,
+	}
+
+	// for host based mysql user
+	logicaltest.Test(t, logicaltest.TestCase{
+		LogicalBackend: b,
+		Steps: []logicaltest.TestStep{
+			testAccStepConfig(t, connData, false),
+			testAccStepRole(t, false),
+			testAccStepReadCreds(t, "web"),
+		},
+	})
+}
+
+func TestBackend_roleCrud(t *testing.T) {
+	config := logical.TestBackendConfig()
+	config.StorageView = &logical.InmemStorage{}
+	b, err := Factory(context.Background(), config)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	cleanup, connURL := mysqlhelper.PrepareTestContainer(t, false, "secret")
+	defer cleanup()
+
+	connData := map[string]interface{}{
+		"connection_url": connURL,
+	}
+
+	logicaltest.Test(t, logicaltest.TestCase{
+		LogicalBackend: b,
+		Steps: []logicaltest.TestStep{
+			testAccStepConfig(t, connData, false),
+			// test SQL with wildcard based user
+			testAccStepRole(t, true),
+			testAccStepReadRole(t, "web", testRoleWildCard),
+			testAccStepDeleteRole(t, "web"),
+			// test SQL with host  based user
+			testAccStepRole(t, false),
+			testAccStepReadRole(t, "web", testRoleHost),
+			testAccStepDeleteRole(t, "web"),
+		},
+	})
+}
+
+func TestBackend_leaseWriteRead(t *testing.T) {
+	config := logical.TestBackendConfig()
+	config.StorageView = &logical.InmemStorage{}
+	b, err := Factory(context.Background(), config)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	cleanup, connURL := mysqlhelper.PrepareTestContainer(t, false, "secret")
+	defer cleanup()
+
+	connData := map[string]interface{}{
+		"connection_url": connURL,
+	}
+
+	logicaltest.Test(t, logicaltest.TestCase{
+		LogicalBackend: b,
+		Steps: []logicaltest.TestStep{
+			testAccStepConfig(t, connData, false),
+			testAccStepWriteLease(t),
+			testAccStepReadLease(t),
+		},
+	})
+}
+
+func testAccStepConfig(t *testing.T, d map[string]interface{}, expectError bool) logicaltest.TestStep {
+	return logicaltest.TestStep{
+		Operation: logical.UpdateOperation,
+		Path:      "config/connection",
+		Data:      d,
+		ErrorOk:   true,
+		Check: func(resp *logical.Response) error {
+			if expectError {
+				if resp.Data == nil {
+					return fmt.Errorf("data is nil")
+				}
+				var e struct {
+					Error string `mapstructure:"error"`
+				}
+				if err := mapstructure.Decode(resp.Data, &e); err != nil {
+					return err
+				}
+				if len(e.Error) == 0 {
+					return fmt.Errorf("expected error, but write succeeded")
+				}
+				return nil
+			} else if resp != nil && resp.IsError() {
+				return fmt.Errorf("got an error response: %v", resp.Error())
+			}
+			return nil
+		},
+	}
+}
+
+func testAccStepRole(t *testing.T, wildCard bool) logicaltest.TestStep {
+	pathData := make(map[string]interface{})
+	if wildCard {
+		pathData = map[string]interface{}{
+			"sql": testRoleWildCard,
+		}
+	} else {
+		pathData = map[string]interface{}{
+			"sql":            testRoleHost,
+			"revocation_sql": testRevocationSQL,
+		}
+	}
+
+	return logicaltest.TestStep{
+		Operation: logical.UpdateOperation,
+		Path:      "roles/web",
+		Data:      pathData,
+	}
+}
+
+func testAccStepDeleteRole(t *testing.T, n string) logicaltest.TestStep {
+	return logicaltest.TestStep{
+		Operation: logical.DeleteOperation,
+		Path:      "roles/" + n,
+	}
+}
+
+func testAccStepReadCreds(t *testing.T, name string) logicaltest.TestStep {
+	return logicaltest.TestStep{
+		Operation: logical.ReadOperation,
+		Path:      "creds/" + name,
+		Check: func(resp *logical.Response) error {
+			var d struct {
+				Username string `mapstructure:"username"`
+				Password string `mapstructure:"password"`
+			}
+			if err := mapstructure.Decode(resp.Data, &d); err != nil {
+				return err
+			}
+			log.Printf("[WARN] Generated credentials: %v", d)
+
+			return nil
+		},
+	}
+}
+
+func testAccStepReadRole(t *testing.T, name string, sql string) logicaltest.TestStep {
+	return logicaltest.TestStep{
+		Operation: logical.ReadOperation,
+		Path:      "roles/" + name,
+		Check: func(resp *logical.Response) error {
+			if resp == nil {
+				if sql == "" {
+					return nil
+				}
+
+				return fmt.Errorf("bad: %#v", resp)
+			}
+
+			var d struct {
+				SQL string `mapstructure:"sql"`
+			}
+			if err := mapstructure.Decode(resp.Data, &d); err != nil {
+				return err
+			}
+
+			if d.SQL != sql {
+				return fmt.Errorf("bad: %#v", resp)
+			}
+
+			return nil
+		},
+	}
+}
+
+func testAccStepWriteLease(t *testing.T) logicaltest.TestStep {
+	return logicaltest.TestStep{
+		Operation: logical.UpdateOperation,
+		Path:      "config/lease",
+		Data: map[string]interface{}{
+			"lease":     "1h5m",
+			"lease_max": "24h",
+		},
+	}
+}
+
+func testAccStepReadLease(t *testing.T) logicaltest.TestStep {
+	return logicaltest.TestStep{
+		Operation: logical.ReadOperation,
+		Path:      "config/lease",
+		Check: func(resp *logical.Response) error {
+			if resp.Data["lease"] != "1h5m0s" || resp.Data["lease_max"] != "24h0m0s" {
+				return fmt.Errorf("bad: %#v", resp)
+			}
+
+			return nil
+		},
+	}
+}
+
+const testRoleWildCard = `
+CREATE USER '{{name}}'@'%' IDENTIFIED BY '{{password}}';
+GRANT SELECT ON *.* TO '{{name}}'@'%';
+`
+
+const testRoleHost = `
+CREATE USER '{{name}}'@'10.1.1.2' IDENTIFIED BY '{{password}}';
+GRANT SELECT ON *.* TO '{{name}}'@'10.1.1.2';
+`
+
+const testRevocationSQL = `
+REVOKE ALL PRIVILEGES, GRANT OPTION FROM '{{name}}'@'10.1.1.2'; 
+DROP USER '{{name}}'@'10.1.1.2';
+`
diff --git a/builtin/logical/mysql/cmd/mysql/main.go b/builtin/logical/mysql/cmd/mysql/main.go
new file mode 100644
index 0000000000000..e1fbe4a01e492
--- /dev/null
+++ b/builtin/logical/mysql/cmd/mysql/main.go
@@ -0,0 +1,29 @@
+package main
+
+import (
+	"os"
+
+	hclog "github.com/hashicorp/go-hclog"
+	"github.com/hashicorp/vault/api"
+	"github.com/hashicorp/vault/builtin/logical/mysql"
+	"github.com/hashicorp/vault/sdk/plugin"
+)
+
+func main() {
+	apiClientMeta := &api.PluginAPIClientMeta{}
+	flags := apiClientMeta.FlagSet()
+	flags.Parse(os.Args[1:])
+
+	tlsConfig := apiClientMeta.GetTLSConfig()
+	tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig)
+
+	if err := plugin.Serve(&plugin.ServeOpts{
+		BackendFactoryFunc: mysql.Factory,
+		TLSProviderFunc:    tlsProviderFunc,
+	}); err != nil {
+		logger := hclog.New(&hclog.LoggerOptions{})
+
+		logger.Error("plugin shutting down", "error", err)
+		os.Exit(1)
+	}
+}
diff --git a/builtin/logical/mysql/path_config_connection.go b/builtin/logical/mysql/path_config_connection.go
new file mode 100644
index 0000000000000..151fd7c8787c3
--- /dev/null
+++ b/builtin/logical/mysql/path_config_connection.go
@@ -0,0 +1,159 @@
+package mysql
+
+import (
+	"context"
+	"database/sql"
+	"fmt"
+
+	_ "github.com/go-sql-driver/mysql"
+	"github.com/hashicorp/vault/sdk/framework"
+	"github.com/hashicorp/vault/sdk/logical"
+)
+
+func pathConfigConnection(b *backend) *framework.Path {
+	return &framework.Path{
+		Pattern: "config/connection",
+		Fields: map[string]*framework.FieldSchema{
+			"connection_url": {
+				Type:        framework.TypeString,
+				Description: "DB connection string",
+			},
+			"value": {
+				Type: framework.TypeString,
+				Description: `DB connection string. Use 'connection_url' instead.
+This name is deprecated.`,
+			},
+			"max_open_connections": {
+				Type:        framework.TypeInt,
+				Description: "Maximum number of open connections to database",
+			},
+			"max_idle_connections": {
+				Type:        framework.TypeInt,
+				Description: "Maximum number of idle connections to the database; a zero uses the value of max_open_connections and a negative value disables idle connections. If larger than max_open_connections it will be reduced to the same size.",
+			},
+			"verify_connection": {
+				Type:        framework.TypeBool,
+				Default:     true,
+				Description: "If set, connection_url is verified by actually connecting to the database",
+			},
+		},
+
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.UpdateOperation: b.pathConnectionWrite,
+			logical.ReadOperation:   b.pathConnectionRead,
+		},
+
+		HelpSynopsis:    pathConfigConnectionHelpSyn,
+		HelpDescription: pathConfigConnectionHelpDesc,
+	}
+}
+
+// pathConnectionRead reads out the connection configuration
+func (b *backend) pathConnectionRead(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
+	entry, err := req.Storage.Get(ctx, "config/connection")
+	if err != nil {
+		return nil, fmt.Errorf("failed to read connection configuration")
+	}
+	if entry == nil {
+		return nil, nil
+	}
+
+	var config connectionConfig
+	if err := entry.DecodeJSON(&config); err != nil {
+		return nil, err
+	}
+
+	return &logical.Response{
+		Data: map[string]interface{}{
+			"max_open_connections": config.MaxOpenConnections,
+			"max_idle_connections": config.MaxIdleConnections,
+		},
+	}, nil
+}
+
+func (b *backend) pathConnectionWrite(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
+	connValue := data.Get("value").(string)
+	connURL := data.Get("connection_url").(string)
+	if connURL == "" {
+		if connValue == "" {
+			return logical.ErrorResponse("the connection_url parameter must be supplied"), nil
+		} else {
+			connURL = connValue
+		}
+	}
+
+	maxOpenConns := data.Get("max_open_connections").(int)
+	if maxOpenConns == 0 {
+		maxOpenConns = 2
+	}
+
+	maxIdleConns := data.Get("max_idle_connections").(int)
+	if maxIdleConns == 0 {
+		maxIdleConns = maxOpenConns
+	}
+	if maxIdleConns > maxOpenConns {
+		maxIdleConns = maxOpenConns
+	}
+
+	// Don't check the connection_url if verification is disabled
+	verifyConnection := data.Get("verify_connection").(bool)
+	if verifyConnection {
+		// Verify the string
+		db, err := sql.Open("mysql", connURL)
+		if err != nil {
+			return logical.ErrorResponse(fmt.Sprintf(
+				"error validating connection info: %s", err)), nil
+		}
+		defer db.Close()
+		if err := db.Ping(); err != nil {
+			return logical.ErrorResponse(fmt.Sprintf(
+				"error validating connection info: %s", err)), nil
+		}
+	}
+
+	// Store it
+	entry, err := logical.StorageEntryJSON("config/connection", connectionConfig{
+		ConnectionURL:      connURL,
+		MaxOpenConnections: maxOpenConns,
+		MaxIdleConnections: maxIdleConns,
+	})
+	if err != nil {
+		return nil, err
+	}
+	if err := req.Storage.Put(ctx, entry); err != nil {
+		return nil, err
+	}
+
+	// Reset the DB connection
+	b.ResetDB(ctx)
+
+	resp := &logical.Response{}
+	resp.AddWarning("Read access to this endpoint should be controlled via ACLs as it will return the connection URL as it is, including passwords, if any.")
+
+	return resp, nil
+}
+
+type connectionConfig struct {
+	ConnectionURL string `json:"connection_url" structs:"connection_url" mapstructure:"connection_url"`
+	// Deprecate "value" in coming releases
+	ConnectionString   string `json:"value" structs:"value" mapstructure:"value"`
+	MaxOpenConnections int    `json:"max_open_connections" structs:"max_open_connections" mapstructure:"max_open_connections"`
+	MaxIdleConnections int    `json:"max_idle_connections" structs:"max_idle_connections" mapstructure:"max_idle_connections"`
+}
+
+const pathConfigConnectionHelpSyn = `
+Configure the connection string to talk to MySQL.
+`
+
+const pathConfigConnectionHelpDesc = `
+This path configures the connection string used to connect to MySQL.  The value
+of the string is a Data Source Name (DSN). An example is using
+"username:password@protocol(address)/dbname?param=value"
+
+For example, RDS may look like:
+"id:password@tcp(your-amazonaws-uri.com:3306)/dbname"
+
+When configuring the connection string, the backend will verify its validity.
+If the database is not available when setting the connection URL, set the
+"verify_connection" option to false.
+`
diff --git a/builtin/logical/mysql/path_config_lease.go b/builtin/logical/mysql/path_config_lease.go
new file mode 100644
index 0000000000000..e8b0543e0101a
--- /dev/null
+++ b/builtin/logical/mysql/path_config_lease.go
@@ -0,0 +1,101 @@
+package mysql
+
+import (
+	"context"
+	"fmt"
+	"time"
+
+	"github.com/hashicorp/vault/sdk/framework"
+	"github.com/hashicorp/vault/sdk/logical"
+)
+
+func pathConfigLease(b *backend) *framework.Path {
+	return &framework.Path{
+		Pattern: "config/lease",
+		Fields: map[string]*framework.FieldSchema{
+			"lease": {
+				Type:        framework.TypeString,
+				Description: "Default lease for roles.",
+			},
+
+			"lease_max": {
+				Type:        framework.TypeString,
+				Description: "Maximum time a credential is valid for.",
+			},
+		},
+
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.ReadOperation:   b.pathLeaseRead,
+			logical.UpdateOperation: b.pathLeaseWrite,
+		},
+
+		HelpSynopsis:    pathConfigLeaseHelpSyn,
+		HelpDescription: pathConfigLeaseHelpDesc,
+	}
+}
+
+func (b *backend) pathLeaseWrite(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
+	leaseRaw := d.Get("lease").(string)
+	leaseMaxRaw := d.Get("lease_max").(string)
+
+	lease, err := time.ParseDuration(leaseRaw)
+	if err != nil {
+		return logical.ErrorResponse(fmt.Sprintf(
+			"Invalid lease: %s", err)), nil
+	}
+	leaseMax, err := time.ParseDuration(leaseMaxRaw)
+	if err != nil {
+		return logical.ErrorResponse(fmt.Sprintf(
+			"Invalid lease: %s", err)), nil
+	}
+
+	// Store it
+	entry, err := logical.StorageEntryJSON("config/lease", &configLease{
+		Lease:    lease,
+		LeaseMax: leaseMax,
+	})
+	if err != nil {
+		return nil, err
+	}
+	if err := req.Storage.Put(ctx, entry); err != nil {
+		return nil, err
+	}
+
+	return nil, nil
+}
+
+func (b *backend) pathLeaseRead(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
+	lease, err := b.Lease(ctx, req.Storage)
+	if err != nil {
+		return nil, err
+	}
+	if lease == nil {
+		return nil, nil
+	}
+
+	return &logical.Response{
+		Data: map[string]interface{}{
+			"lease":     lease.Lease.String(),
+			"lease_max": lease.LeaseMax.String(),
+		},
+	}, nil
+}
+
+type configLease struct {
+	Lease    time.Duration
+	LeaseMax time.Duration
+}
+
+const pathConfigLeaseHelpSyn = `
+Configure the default lease information for generated credentials.
+`
+
+const pathConfigLeaseHelpDesc = `
+This configures the default lease information used for credentials
+generated by this backend. The lease specifies the duration that a
+credential will be valid for, as well as the maximum session for
+a set of credentials.
+
+The format for the lease is "1h" or integer and then unit. The longest
+unit is hour.
+`
diff --git a/builtin/logical/mysql/path_role_create.go b/builtin/logical/mysql/path_role_create.go
new file mode 100644
index 0000000000000..6bc0c4b3b3214
--- /dev/null
+++ b/builtin/logical/mysql/path_role_create.go
@@ -0,0 +1,143 @@
+package mysql
+
+import (
+	"context"
+	"fmt"
+	"strings"
+
+	"github.com/hashicorp/go-secure-stdlib/strutil"
+	uuid "github.com/hashicorp/go-uuid"
+	"github.com/hashicorp/vault/sdk/framework"
+	"github.com/hashicorp/vault/sdk/helper/dbtxn"
+	"github.com/hashicorp/vault/sdk/logical"
+)
+
+func pathRoleCreate(b *backend) *framework.Path {
+	return &framework.Path{
+		Pattern: "creds/" + framework.GenericNameRegex("name"),
+		Fields: map[string]*framework.FieldSchema{
+			"name": {
+				Type:        framework.TypeString,
+				Description: "Name of the role.",
+			},
+		},
+
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.ReadOperation: b.pathRoleCreateRead,
+		},
+
+		HelpSynopsis:    pathRoleCreateReadHelpSyn,
+		HelpDescription: pathRoleCreateReadHelpDesc,
+	}
+}
+
+func (b *backend) pathRoleCreateRead(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
+	name := data.Get("name").(string)
+
+	// Get the role
+	role, err := b.Role(ctx, req.Storage, name)
+	if err != nil {
+		return nil, err
+	}
+	if role == nil {
+		return logical.ErrorResponse(fmt.Sprintf("unknown role: %s", name)), nil
+	}
+
+	// Determine if we have a lease
+	lease, err := b.Lease(ctx, req.Storage)
+	if err != nil {
+		return nil, err
+	}
+	if lease == nil {
+		lease = &configLease{}
+	}
+
+	// Generate our username and password. The username will be a
+	// concatenation of:
+	//
+	// - the role name, truncated to role.rolenameLength (default 4)
+	// - the token display name, truncated to role.displaynameLength (default 4)
+	// - a UUID
+	//
+	// the entire concatenated string is then truncated to role.usernameLength,
+	// which by default is 16 due to limitations in older but still-prevalent
+	// versions of MySQL.
+	roleName := name
+	if len(roleName) > role.RolenameLength {
+		roleName = roleName[:role.RolenameLength]
+	}
+	displayName := req.DisplayName
+	if len(displayName) > role.DisplaynameLength {
+		displayName = displayName[:role.DisplaynameLength]
+	}
+	userUUID, err := uuid.GenerateUUID()
+	if err != nil {
+		return nil, err
+	}
+	username := fmt.Sprintf("%s-%s-%s", roleName, displayName, userUUID)
+	if len(username) > role.UsernameLength {
+		username = username[:role.UsernameLength]
+	}
+	password, err := uuid.GenerateUUID()
+	if err != nil {
+		return nil, err
+	}
+
+	// Get our handle
+	db, err := b.DB(ctx, req.Storage)
+	if err != nil {
+		return nil, err
+	}
+
+	// Start a transaction
+	tx, err := db.Begin()
+	if err != nil {
+		return nil, err
+	}
+	defer tx.Rollback()
+
+	// Execute each query
+	for _, query := range strutil.ParseArbitraryStringSlice(role.SQL, ";") {
+		query = strings.TrimSpace(query)
+		if len(query) == 0 {
+			continue
+		}
+
+		m := map[string]string{
+			"name":     username,
+			"password": password,
+		}
+		if err := dbtxn.ExecuteTxQueryDirect(ctx, tx, m, query); err != nil {
+			return nil, err
+		}
+	}
+
+	// Commit the transaction
+	if err := tx.Commit(); err != nil {
+		return nil, err
+	}
+
+	// Return the secret
+	resp := b.Secret(SecretCredsType).Response(map[string]interface{}{
+		"username": username,
+		"password": password,
+	}, map[string]interface{}{
+		"username": username,
+		"role":     name,
+	})
+
+	resp.Secret.TTL = lease.Lease
+	resp.Secret.MaxTTL = lease.LeaseMax
+
+	return resp, nil
+}
+
+const pathRoleCreateReadHelpSyn = `
+Request database credentials for a certain role.
+`
+
+const pathRoleCreateReadHelpDesc = `
+This path reads database credentials for a certain role. The
+database credentials will be generated on demand and will be automatically
+revoked when the lease is up.
+`
diff --git a/builtin/logical/mysql/path_roles.go b/builtin/logical/mysql/path_roles.go
new file mode 100644
index 0000000000000..eecf48732fe21
--- /dev/null
+++ b/builtin/logical/mysql/path_roles.go
@@ -0,0 +1,230 @@
+package mysql
+
+import (
+	"context"
+	"fmt"
+	"strings"
+
+	_ "github.com/go-sql-driver/mysql"
+	"github.com/hashicorp/go-secure-stdlib/strutil"
+	"github.com/hashicorp/vault/sdk/framework"
+	"github.com/hashicorp/vault/sdk/logical"
+)
+
+func pathListRoles(b *backend) *framework.Path {
+	return &framework.Path{
+		Pattern: "roles/?$",
+
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.ListOperation: b.pathRoleList,
+		},
+
+		HelpSynopsis:    pathRoleHelpSyn,
+		HelpDescription: pathRoleHelpDesc,
+	}
+}
+
+func pathRoles(b *backend) *framework.Path {
+	return &framework.Path{
+		Pattern: "roles/" + framework.GenericNameRegex("name"),
+		Fields: map[string]*framework.FieldSchema{
+			"name": {
+				Type:        framework.TypeString,
+				Description: "Name of the role.",
+			},
+
+			"sql": {
+				Type:        framework.TypeString,
+				Description: "SQL string to create a user. See help for more info.",
+			},
+
+			"revocation_sql": {
+				Type:        framework.TypeString,
+				Description: "SQL string to revoke a user. See help for more info.",
+			},
+
+			"username_length": {
+				Type:        framework.TypeInt,
+				Description: "number of characters to truncate generated mysql usernames to (default 16)",
+				Default:     16,
+			},
+
+			"rolename_length": {
+				Type:        framework.TypeInt,
+				Description: "number of characters to truncate the rolename portion of generated mysql usernames to (default 4)",
+				Default:     4,
+			},
+
+			"displayname_length": {
+				Type:        framework.TypeInt,
+				Description: "number of characters to truncate the displayname portion of generated mysql usernames to (default 4)",
+				Default:     4,
+			},
+		},
+
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.ReadOperation:   b.pathRoleRead,
+			logical.UpdateOperation: b.pathRoleCreate,
+			logical.DeleteOperation: b.pathRoleDelete,
+		},
+
+		HelpSynopsis:    pathRoleHelpSyn,
+		HelpDescription: pathRoleHelpDesc,
+	}
+}
+
+func (b *backend) Role(ctx context.Context, s logical.Storage, n string) (*roleEntry, error) {
+	entry, err := s.Get(ctx, "role/"+n)
+	if err != nil {
+		return nil, err
+	}
+	if entry == nil {
+		return nil, nil
+	}
+
+	// Set defaults to handle upgrade cases
+	result := roleEntry{
+		UsernameLength:    16,
+		RolenameLength:    4,
+		DisplaynameLength: 4,
+	}
+
+	if err := entry.DecodeJSON(&result); err != nil {
+		return nil, err
+	}
+
+	return &result, nil
+}
+
+func (b *backend) pathRoleDelete(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
+	err := req.Storage.Delete(ctx, "role/"+data.Get("name").(string))
+	if err != nil {
+		return nil, err
+	}
+
+	return nil, nil
+}
+
+func (b *backend) pathRoleRead(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
+	role, err := b.Role(ctx, req.Storage, data.Get("name").(string))
+	if err != nil {
+		return nil, err
+	}
+	if role == nil {
+		return nil, nil
+	}
+
+	return &logical.Response{
+		Data: map[string]interface{}{
+			"sql":            role.SQL,
+			"revocation_sql": role.RevocationSQL,
+		},
+	}, nil
+}
+
+func (b *backend) pathRoleList(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
+	entries, err := req.Storage.List(ctx, "role/")
+	if err != nil {
+		return nil, err
+	}
+
+	return logical.ListResponse(entries), nil
+}
+
+func (b *backend) pathRoleCreate(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
+	name := data.Get("name").(string)
+
+	// Get our connection
+	db, err := b.DB(ctx, req.Storage)
+	if err != nil {
+		return nil, err
+	}
+
+	// Test the query by trying to prepare it
+	sql := data.Get("sql").(string)
+	for _, query := range strutil.ParseArbitraryStringSlice(sql, ";") {
+		query = strings.TrimSpace(query)
+		if len(query) == 0 {
+			continue
+		}
+
+		stmt, err := db.Prepare(Query(query, map[string]string{
+			"name":     "foo",
+			"password": "bar",
+		}))
+		if err != nil {
+			return logical.ErrorResponse(fmt.Sprintf(
+				"Error testing query: %s", err)), nil
+		}
+		stmt.Close()
+	}
+
+	// Store it
+	entry, err := logical.StorageEntryJSON("role/"+name, &roleEntry{
+		SQL:               sql,
+		RevocationSQL:     data.Get("revocation_sql").(string),
+		UsernameLength:    data.Get("username_length").(int),
+		DisplaynameLength: data.Get("displayname_length").(int),
+		RolenameLength:    data.Get("rolename_length").(int),
+	})
+	if err != nil {
+		return nil, err
+	}
+	if err := req.Storage.Put(ctx, entry); err != nil {
+		return nil, err
+	}
+	return nil, nil
+}
+
+type roleEntry struct {
+	SQL               string `json:"sql" mapstructure:"sql" structs:"sql"`
+	RevocationSQL     string `json:"revocation_sql" mapstructure:"revocation_sql" structs:"revocation_sql"`
+	UsernameLength    int    `json:"username_length" mapstructure:"username_length" structs:"username_length"`
+	DisplaynameLength int    `json:"displayname_length" mapstructure:"displayname_length" structs:"displayname_length"`
+	RolenameLength    int    `json:"rolename_length" mapstructure:"rolename_length" structs:"rolename_length"`
+}
+
+const pathRoleHelpSyn = `
+Manage the roles that can be created with this backend.
+`
+
+const pathRoleHelpDesc = `
+This path lets you manage the roles that can be created with this backend.
+
+The "sql" parameter customizes the SQL string used to create the role.
+This can be a sequence of SQL queries, each semi-colon separated. Some
+substitution will be done to the SQL string for certain keys.
+The names of the variables must be surrounded by "{{" and "}}" to be replaced.
+
+  * "name" - The random username generated for the DB user.
+
+  * "password" - The random password generated for the DB user.
+
+Example of a decent SQL query to use:
+
+  CREATE USER '{{name}}'@'%' IDENTIFIED BY '{{password}}';
+  GRANT ALL ON db1.* TO '{{name}}'@'%';
+
+Note the above user would be able to access anything in db1. Please see the MySQL
+manual on the GRANT command to learn how to do more fine grained access.
+
+The "rolename_length" parameter determines how many characters of the role name
+will be used in creating the generated mysql username; the default is 4.
+
+The "displayname_length" parameter determines how many characters of the token
+display name will be used in creating the generated mysql username; the default
+is 4.
+
+The "username_length" parameter determines how many total characters the
+generated username (including the role name, token display name and the uuid
+portion) will be truncated to.  Versions of MySQL prior to 5.7.8 are limited to
+16 characters total (see
+http://dev.mysql.com/doc/refman/5.7/en/user-names.html) so that is the default;
+for versions >=5.7.8 it is safe to increase this to 32.
+
+For best readability in MySQL process lists, we recommend using MySQL 5.7.8 or
+later, setting "username_length" to 32 and setting both "rolename_length" and
+"displayname_length" to 8.  However due the the prevalence of older versions of
+MySQL in general deployment, the defaults are currently tuned for a
+username_length of 16.
+`
diff --git a/builtin/logical/mysql/secret_creds.go b/builtin/logical/mysql/secret_creds.go
new file mode 100644
index 0000000000000..454edbaa927e1
--- /dev/null
+++ b/builtin/logical/mysql/secret_creds.go
@@ -0,0 +1,136 @@
+package mysql
+
+import (
+	"context"
+	"fmt"
+	"strings"
+
+	"github.com/hashicorp/go-secure-stdlib/strutil"
+	"github.com/hashicorp/vault/sdk/framework"
+	"github.com/hashicorp/vault/sdk/logical"
+)
+
+const SecretCredsType = "creds"
+
+// defaultRevocationSQL is a default SQL statement for revoking a user. Revoking
+// permissions for the user is done before the drop, because MySQL explicitly
+// documents that open user connections will not be closed. By revoking all
+// grants, at least we ensure that the open connection is useless. Dropping the
+// user will only affect the next connection.
+const defaultRevocationSQL = `
+REVOKE ALL PRIVILEGES, GRANT OPTION FROM '{{name}}'@'%';
+DROP USER '{{name}}'@'%'
+`
+
+func secretCreds(b *backend) *framework.Secret {
+	return &framework.Secret{
+		Type: SecretCredsType,
+		Fields: map[string]*framework.FieldSchema{
+			"username": {
+				Type:        framework.TypeString,
+				Description: "Username",
+			},
+
+			"password": {
+				Type:        framework.TypeString,
+				Description: "Password",
+			},
+		},
+
+		Renew:  b.secretCredsRenew,
+		Revoke: b.secretCredsRevoke,
+	}
+}
+
+func (b *backend) secretCredsRenew(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
+	// Get the lease information
+	lease, err := b.Lease(ctx, req.Storage)
+	if err != nil {
+		return nil, err
+	}
+	if lease == nil {
+		lease = &configLease{}
+	}
+
+	resp := &logical.Response{Secret: req.Secret}
+	resp.Secret.TTL = lease.Lease
+	resp.Secret.MaxTTL = lease.LeaseMax
+	return resp, nil
+}
+
+func (b *backend) secretCredsRevoke(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
+	var resp *logical.Response
+
+	// Get the username from the internal data
+	usernameRaw, ok := req.Secret.InternalData["username"]
+	if !ok {
+		return nil, fmt.Errorf("secret is missing username internal data")
+	}
+	username, ok := usernameRaw.(string)
+	if !ok {
+		return nil, fmt.Errorf("usernameRaw is not a string")
+	}
+
+	// Get our connection
+	db, err := b.DB(ctx, req.Storage)
+	if err != nil {
+		return nil, err
+	}
+
+	roleName := ""
+	roleNameRaw, ok := req.Secret.InternalData["role"]
+	if ok {
+		roleName = roleNameRaw.(string)
+	}
+
+	var role *roleEntry
+	if roleName != "" {
+		role, err = b.Role(ctx, req.Storage, roleName)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	// Use a default SQL statement for revocation if one cannot be fetched from the role
+	revocationSQL := defaultRevocationSQL
+
+	if role != nil && role.RevocationSQL != "" {
+		revocationSQL = role.RevocationSQL
+	} else {
+		if resp == nil {
+			resp = &logical.Response{}
+		}
+		resp.AddWarning(fmt.Sprintf("Role %q cannot be found. Using default SQL for revoking user.", roleName))
+	}
+
+	// Start a transaction
+	tx, err := db.Begin()
+	if err != nil {
+		return nil, err
+	}
+	defer tx.Rollback()
+
+	for _, query := range strutil.ParseArbitraryStringSlice(revocationSQL, ";") {
+		query = strings.TrimSpace(query)
+		if len(query) == 0 {
+			continue
+		}
+
+		// This is not a prepared statement because not all commands are supported
+		// 1295: This command is not supported in the prepared statement protocol yet
+		// Reference https://mariadb.com/kb/en/mariadb/prepare-statement/
+		query = strings.ReplaceAll(query, "{{name}}", username)
+		_, err = tx.Exec(query)
+		if err != nil {
+			return nil, err
+		}
+
+	}
+
+	// Commit the transaction
+	if err := tx.Commit(); err != nil {
+		return nil, err
+	}
+
+	return resp, nil
+}
diff --git a/builtin/logical/mysql/util.go b/builtin/logical/mysql/util.go
new file mode 100644
index 0000000000000..4ba7c650c208d
--- /dev/null
+++ b/builtin/logical/mysql/util.go
@@ -0,0 +1,15 @@
+package mysql
+
+import (
+	"fmt"
+	"strings"
+)
+
+// Query templates a query for us.
+func Query(tpl string, data map[string]string) string {
+	for k, v := range data {
+		tpl = strings.ReplaceAll(tpl, fmt.Sprintf("{{%s}}", k), v)
+	}
+
+	return tpl
+}
diff --git a/builtin/logical/nomad/backend.go b/builtin/logical/nomad/backend.go
index 0becdae776b12..e1df32e87a831 100644
--- a/builtin/logical/nomad/backend.go
+++ b/builtin/logical/nomad/backend.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package nomad
 
 import (
@@ -11,8 +8,6 @@ import (
 	"github.com/hashicorp/vault/sdk/logical"
 )
 
-const operationPrefixNomad = "nomad"
-
 // Factory returns a Nomad backend that satisfies the logical.Backend interface
 func Factory(ctx context.Context, conf *logical.BackendConfig) (logical.Backend, error) {
 	b := Backend()
diff --git a/builtin/logical/nomad/backend_test.go b/builtin/logical/nomad/backend_test.go
index 1fe6adbb2d38e..8452c2b019e41 100644
--- a/builtin/logical/nomad/backend_test.go
+++ b/builtin/logical/nomad/backend_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package nomad
 
 import (
@@ -8,14 +5,13 @@ import (
 	"fmt"
 	"os"
 	"reflect"
-	"runtime"
 	"strings"
 	"testing"
 	"time"
 
 	nomadapi "github.com/hashicorp/nomad/api"
 	"github.com/hashicorp/vault/helper/testhelpers"
-	"github.com/hashicorp/vault/sdk/helper/docker"
+	"github.com/hashicorp/vault/helper/testhelpers/docker"
 	"github.com/hashicorp/vault/sdk/logical"
 	"github.com/mitchellh/mapstructure"
 )
@@ -39,11 +35,6 @@ func (c *Config) Client() (*nomadapi.Client, error) {
 }
 
 func prepareTestContainer(t *testing.T, bootstrap bool) (func(), *Config) {
-	// Skipping on ARM, as this image can't run on ARM architecture
-	if strings.Contains(runtime.GOARCH, "arm") {
-		t.Skip("Skipping, as this image is not supported on ARM architectures")
-	}
-
 	if retAddress := os.Getenv("NOMAD_ADDR"); retAddress != "" {
 		s, err := docker.NewServiceURLParse(retAddress)
 		if err != nil {
@@ -53,7 +44,7 @@ func prepareTestContainer(t *testing.T, bootstrap bool) (func(), *Config) {
 	}
 
 	runner, err := docker.NewServiceRunner(docker.RunOptions{
-		ImageRepo:     "docker.mirror.hashicorp.services/multani/nomad",
+		ImageRepo:     "multani/nomad",
 		ImageTag:      "1.1.6",
 		ContainerName: "nomad",
 		Ports:         []string{"4646/tcp"},
diff --git a/builtin/logical/nomad/cmd/nomad/main.go b/builtin/logical/nomad/cmd/nomad/main.go
index 10f45aabb4837..31b1c93500e7d 100644
--- a/builtin/logical/nomad/cmd/nomad/main.go
+++ b/builtin/logical/nomad/cmd/nomad/main.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package main
 
 import (
@@ -20,11 +17,9 @@ func main() {
 	tlsConfig := apiClientMeta.GetTLSConfig()
 	tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig)
 
-	if err := plugin.ServeMultiplex(&plugin.ServeOpts{
+	if err := plugin.Serve(&plugin.ServeOpts{
 		BackendFactoryFunc: nomad.Factory,
-		// set the TLSProviderFunc so that the plugin maintains backwards
-		// compatibility with Vault versions that don’t support plugin AutoMTLS
-		TLSProviderFunc: tlsProviderFunc,
+		TLSProviderFunc:    tlsProviderFunc,
 	}); err != nil {
 		logger := hclog.New(&hclog.LoggerOptions{})
 
diff --git a/builtin/logical/nomad/path_config_access.go b/builtin/logical/nomad/path_config_access.go
index cbb214002438f..b482a9c1aca86 100644
--- a/builtin/logical/nomad/path_config_access.go
+++ b/builtin/logical/nomad/path_config_access.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package nomad
 
 import (
@@ -16,11 +13,6 @@ const configAccessKey = "config/access"
 func pathConfigAccess(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "config/access",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixNomad,
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"address": {
 				Type:        framework.TypeString,
@@ -53,35 +45,11 @@ must be x509 PEM encoded and if this is set you need to also set client_cert.`,
 			},
 		},
 
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.ReadOperation: &framework.PathOperation{
-				Callback: b.pathConfigAccessRead,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb:   "read",
-					OperationSuffix: "access-configuration",
-				},
-			},
-			logical.CreateOperation: &framework.PathOperation{
-				Callback: b.pathConfigAccessWrite,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb:   "configure",
-					OperationSuffix: "access",
-				},
-			},
-			logical.UpdateOperation: &framework.PathOperation{
-				Callback: b.pathConfigAccessWrite,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb:   "configure",
-					OperationSuffix: "access",
-				},
-			},
-			logical.DeleteOperation: &framework.PathOperation{
-				Callback: b.pathConfigAccessDelete,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb:   "delete",
-					OperationSuffix: "access-configuration",
-				},
-			},
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.ReadOperation:   b.pathConfigAccessRead,
+			logical.CreateOperation: b.pathConfigAccessWrite,
+			logical.UpdateOperation: b.pathConfigAccessWrite,
+			logical.DeleteOperation: b.pathConfigAccessDelete,
 		},
 
 		ExistenceCheck: b.configExistenceCheck,
diff --git a/builtin/logical/nomad/path_config_lease.go b/builtin/logical/nomad/path_config_lease.go
index 05c83ff938f8a..676e515cb84b5 100644
--- a/builtin/logical/nomad/path_config_lease.go
+++ b/builtin/logical/nomad/path_config_lease.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package nomad
 
 import (
@@ -16,11 +13,6 @@ const leaseConfigKey = "config/lease"
 func pathConfigLease(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "config/lease",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixNomad,
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"ttl": {
 				Type:        framework.TypeDurationSecond,
@@ -32,28 +24,10 @@ func pathConfigLease(b *backend) *framework.Path {
 			},
 		},
 
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.ReadOperation: &framework.PathOperation{
-				Callback: b.pathLeaseRead,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb:   "read",
-					OperationSuffix: "lease-configuration",
-				},
-			},
-			logical.UpdateOperation: &framework.PathOperation{
-				Callback: b.pathLeaseUpdate,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb:   "configure",
-					OperationSuffix: "lease",
-				},
-			},
-			logical.DeleteOperation: &framework.PathOperation{
-				Callback: b.pathLeaseDelete,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb:   "delete",
-					OperationSuffix: "lease-configuration",
-				},
-			},
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.ReadOperation:   b.pathLeaseRead,
+			logical.UpdateOperation: b.pathLeaseUpdate,
+			logical.DeleteOperation: b.pathLeaseDelete,
 		},
 
 		HelpSynopsis:    pathConfigLeaseHelpSyn,
diff --git a/builtin/logical/nomad/path_creds_create.go b/builtin/logical/nomad/path_creds_create.go
index 29f84d136908d..14df1ff939db5 100644
--- a/builtin/logical/nomad/path_creds_create.go
+++ b/builtin/logical/nomad/path_creds_create.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package nomad
 
 import (
@@ -20,13 +17,6 @@ const maxTokenNameLength = 256
 func pathCredsCreate(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "creds/" + framework.GenericNameRegex("name"),
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixNomad,
-			OperationVerb:   "generate",
-			OperationSuffix: "credentials",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"name": {
 				Type:        framework.TypeString,
diff --git a/builtin/logical/nomad/path_roles.go b/builtin/logical/nomad/path_roles.go
index e3cebefb52329..92109ba741230 100644
--- a/builtin/logical/nomad/path_roles.go
+++ b/builtin/logical/nomad/path_roles.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package nomad
 
 import (
@@ -16,11 +13,6 @@ func pathListRoles(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "role/?$",
 
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixNomad,
-			OperationSuffix: "roles",
-		},
-
 		Callbacks: map[logical.Operation]framework.OperationFunc{
 			logical.ListOperation: b.pathRoleList,
 		},
@@ -30,12 +22,6 @@ func pathListRoles(b *backend) *framework.Path {
 func pathRoles(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "role/" + framework.GenericNameRegex("name"),
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixNomad,
-			OperationSuffix: "role",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"name": {
 				Type:        framework.TypeString,
diff --git a/builtin/logical/nomad/secret_token.go b/builtin/logical/nomad/secret_token.go
index 3c6b920681d37..fd446f7a6436f 100644
--- a/builtin/logical/nomad/secret_token.go
+++ b/builtin/logical/nomad/secret_token.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package nomad
 
 import (
diff --git a/builtin/logical/pki/acme_authorizations.go b/builtin/logical/pki/acme_authorizations.go
deleted file mode 100644
index 82d439d88a540..0000000000000
--- a/builtin/logical/pki/acme_authorizations.go
+++ /dev/null
@@ -1,187 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package pki
-
-import (
-	"fmt"
-	"time"
-)
-
-type ACMEIdentifierType string
-
-const (
-	ACMEDNSIdentifier ACMEIdentifierType = "dns"
-	ACMEIPIdentifier  ACMEIdentifierType = "ip"
-)
-
-type ACMEIdentifier struct {
-	Type          ACMEIdentifierType `json:"type"`
-	Value         string             `json:"value"`
-	OriginalValue string             `json:"original_value"`
-	IsWildcard    bool               `json:"is_wildcard"`
-}
-
-func (ai *ACMEIdentifier) MaybeParseWildcard() (bool, string, error) {
-	if ai.Type != ACMEDNSIdentifier || !isWildcardDomain(ai.Value) {
-		return false, ai.Value, nil
-	}
-
-	// Here on out, technically it is a wildcard.
-	ai.IsWildcard = true
-
-	wildcardLabel, reducedName, err := validateWildcardDomain(ai.Value)
-	if err != nil {
-		return true, "", err
-	}
-
-	if wildcardLabel != "*" {
-		// Per RFC 8555 Section. 7.1.3. Order Objects:
-		//
-		// > Any identifier of type "dns" in a newOrder request MAY have a
-		// > wildcard domain name as its value.  A wildcard domain name consists
-		// > of a single asterisk character followed by a single full stop
-		// > character ("*.") followed by a domain name as defined for use in the
-		// > Subject Alternate Name Extension by [RFC5280].
-		return true, "", fmt.Errorf("wildcard must be entire left-most label")
-	}
-
-	if reducedName == "" {
-		return true, "", fmt.Errorf("wildcard must not be entire domain name; need at least two domain labels")
-	}
-
-	// Parsing was indeed successful, so update our reduced name.
-	ai.Value = reducedName
-
-	return true, reducedName, nil
-}
-
-func (ai *ACMEIdentifier) NetworkMarshal(useOriginalValue bool) map[string]interface{} {
-	value := ai.OriginalValue
-	if !useOriginalValue {
-		value = ai.Value
-	}
-	return map[string]interface{}{
-		"type":  ai.Type,
-		"value": value,
-	}
-}
-
-type ACMEAuthorizationStatusType string
-
-const (
-	ACMEAuthorizationPending     ACMEAuthorizationStatusType = "pending"
-	ACMEAuthorizationValid       ACMEAuthorizationStatusType = "valid"
-	ACMEAuthorizationInvalid     ACMEAuthorizationStatusType = "invalid"
-	ACMEAuthorizationDeactivated ACMEAuthorizationStatusType = "deactivated"
-	ACMEAuthorizationExpired     ACMEAuthorizationStatusType = "expired"
-	ACMEAuthorizationRevoked     ACMEAuthorizationStatusType = "revoked"
-)
-
-type ACMEOrderStatusType string
-
-const (
-	ACMEOrderPending    ACMEOrderStatusType = "pending"
-	ACMEOrderProcessing ACMEOrderStatusType = "processing"
-	ACMEOrderValid      ACMEOrderStatusType = "valid"
-	ACMEOrderInvalid    ACMEOrderStatusType = "invalid"
-	ACMEOrderReady      ACMEOrderStatusType = "ready"
-)
-
-type ACMEChallengeType string
-
-const (
-	ACMEHTTPChallenge ACMEChallengeType = "http-01"
-	ACMEDNSChallenge  ACMEChallengeType = "dns-01"
-	ACMEALPNChallenge ACMEChallengeType = "tls-alpn-01"
-)
-
-type ACMEChallengeStatusType string
-
-const (
-	ACMEChallengePending    ACMEChallengeStatusType = "pending"
-	ACMEChallengeProcessing ACMEChallengeStatusType = "processing"
-	ACMEChallengeValid      ACMEChallengeStatusType = "valid"
-	ACMEChallengeInvalid    ACMEChallengeStatusType = "invalid"
-)
-
-type ACMEChallenge struct {
-	Type            ACMEChallengeType       `json:"type"`
-	Status          ACMEChallengeStatusType `json:"status"`
-	Validated       string                  `json:"validated,optional"`
-	Error           map[string]interface{}  `json:"error,optional"`
-	ChallengeFields map[string]interface{}  `json:"challenge_fields"`
-}
-
-func (ac *ACMEChallenge) NetworkMarshal(acmeCtx *acmeContext, authId string) map[string]interface{} {
-	resp := map[string]interface{}{
-		"type":   ac.Type,
-		"url":    buildChallengeUrl(acmeCtx, authId, string(ac.Type)),
-		"status": ac.Status,
-	}
-
-	if ac.Validated != "" {
-		resp["validated"] = ac.Validated
-	}
-
-	if len(ac.Error) > 0 {
-		resp["error"] = ac.Error
-	}
-
-	for field, value := range ac.ChallengeFields {
-		resp[field] = value
-	}
-
-	return resp
-}
-
-func buildChallengeUrl(acmeCtx *acmeContext, authId, challengeType string) string {
-	return acmeCtx.baseUrl.JoinPath("/challenge/", authId, challengeType).String()
-}
-
-type ACMEAuthorization struct {
-	Id        string `json:"id"`
-	AccountId string `json:"account_id"`
-
-	Identifier *ACMEIdentifier             `json:"identifier"`
-	Status     ACMEAuthorizationStatusType `json:"status"`
-
-	// Per RFC 8555 Section 7.1.4. Authorization Objects:
-	//
-	// > This field is REQUIRED for objects with "valid" in the "status"
-	// > field.
-	Expires string `json:"expires,optional"`
-
-	Challenges []*ACMEChallenge `json:"challenges"`
-	Wildcard   bool             `json:"wildcard"`
-}
-
-func (aa *ACMEAuthorization) GetExpires() (time.Time, error) {
-	if aa.Expires == "" {
-		return time.Time{}, nil
-	}
-
-	return time.Parse(time.RFC3339, aa.Expires)
-}
-
-func (aa *ACMEAuthorization) NetworkMarshal(acmeCtx *acmeContext) map[string]interface{} {
-	resp := map[string]interface{}{
-		"identifier": aa.Identifier.NetworkMarshal( /* use value, not original value */ false),
-		"status":     aa.Status,
-		"wildcard":   aa.Wildcard,
-	}
-
-	if aa.Expires != "" {
-		resp["expires"] = aa.Expires
-	}
-
-	if len(aa.Challenges) > 0 {
-		challenges := []map[string]interface{}{}
-		for _, challenge := range aa.Challenges {
-			challenges = append(challenges, challenge.NetworkMarshal(acmeCtx, aa.Id))
-		}
-		resp["challenges"] = challenges
-	}
-
-	return resp
-}
diff --git a/builtin/logical/pki/acme_billing.go b/builtin/logical/pki/acme_billing.go
deleted file mode 100644
index 642e0f4fcdd38..0000000000000
--- a/builtin/logical/pki/acme_billing.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package pki
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/hashicorp/vault/sdk/logical"
-)
-
-func (b *backend) doTrackBilling(ctx context.Context, identifiers []*ACMEIdentifier) error {
-	billingView, ok := b.System().(logical.ACMEBillingSystemView)
-	if !ok {
-		return fmt.Errorf("failed to perform cast to ACME billing system view interface")
-	}
-
-	var realized []string
-	for _, identifier := range identifiers {
-		realized = append(realized, fmt.Sprintf("%s/%s", identifier.Type, identifier.OriginalValue))
-	}
-
-	return billingView.CreateActivityCountEventForIdentifiers(ctx, realized)
-}
diff --git a/builtin/logical/pki/acme_billing_test.go b/builtin/logical/pki/acme_billing_test.go
deleted file mode 100644
index 3a240f1875d6a..0000000000000
--- a/builtin/logical/pki/acme_billing_test.go
+++ /dev/null
@@ -1,318 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package pki
-
-import (
-	"context"
-	"crypto/ecdsa"
-	"crypto/elliptic"
-	"crypto/rand"
-	"crypto/x509"
-	"crypto/x509/pkix"
-	"encoding/json"
-	"strings"
-	"testing"
-	"time"
-
-	"golang.org/x/crypto/acme"
-
-	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/builtin/logical/pki/dnstest"
-	"github.com/hashicorp/vault/helper/constants"
-	"github.com/hashicorp/vault/helper/timeutil"
-	"github.com/hashicorp/vault/vault"
-	"github.com/hashicorp/vault/vault/activity"
-
-	"github.com/stretchr/testify/require"
-)
-
-// TestACMEBilling is a basic test that will validate client counts created via ACME workflows.
-func TestACMEBilling(t *testing.T) {
-	t.Parallel()
-	timeutil.SkipAtEndOfMonth(t)
-
-	cluster, client, _ := setupAcmeBackend(t)
-	defer cluster.Cleanup()
-
-	dns := dnstest.SetupResolver(t, "dadgarcorp.com")
-	defer dns.Cleanup()
-
-	// Enable additional mounts.
-	setupAcmeBackendOnClusterAtPath(t, cluster, client, "pki2")
-	setupAcmeBackendOnClusterAtPath(t, cluster, client, "ns1/pki")
-	setupAcmeBackendOnClusterAtPath(t, cluster, client, "ns2/pki")
-
-	// Enable custom DNS resolver for testing.
-	for _, mount := range []string{"pki", "pki2", "ns1/pki", "ns2/pki"} {
-		_, err := client.Logical().Write(mount+"/config/acme", map[string]interface{}{
-			"dns_resolver": dns.GetLocalAddr(),
-		})
-		require.NoError(t, err, "failed to set local dns resolver address for testing on mount: "+mount)
-	}
-
-	// Enable client counting.
-	_, err := client.Logical().Write("/sys/internal/counters/config", map[string]interface{}{
-		"enabled": "enable",
-	})
-	require.NoError(t, err, "failed to enable client counting")
-
-	// Setup ACME clients. We refresh account keys each time for consistency.
-	acmeClientPKI := getAcmeClientForCluster(t, cluster, "/v1/pki/acme/", nil)
-	acmeClientPKI2 := getAcmeClientForCluster(t, cluster, "/v1/pki2/acme/", nil)
-	acmeClientPKINS1 := getAcmeClientForCluster(t, cluster, "/v1/ns1/pki/acme/", nil)
-	acmeClientPKINS2 := getAcmeClientForCluster(t, cluster, "/v1/ns2/pki/acme/", nil)
-
-	// Get our initial count.
-	expectedCount := validateClientCount(t, client, "", -1, "initial fetch")
-
-	// Unique identifier: should increase by one.
-	doACMEForDomainWithDNS(t, dns, acmeClientPKI, []string{"dadgarcorp.com"})
-	expectedCount = validateClientCount(t, client, "pki", expectedCount+1, "new certificate")
-
-	// Different identifier; should increase by one.
-	doACMEForDomainWithDNS(t, dns, acmeClientPKI, []string{"example.dadgarcorp.com"})
-	expectedCount = validateClientCount(t, client, "pki", expectedCount+1, "new certificate")
-
-	// While same identifiers, used together and so thus are unique; increase by one.
-	doACMEForDomainWithDNS(t, dns, acmeClientPKI, []string{"example.dadgarcorp.com", "dadgarcorp.com"})
-	expectedCount = validateClientCount(t, client, "pki", expectedCount+1, "new certificate")
-
-	// Same identifiers in different order are not unique; keep the same.
-	doACMEForDomainWithDNS(t, dns, acmeClientPKI, []string{"dadgarcorp.com", "example.dadgarcorp.com"})
-	expectedCount = validateClientCount(t, client, "pki", expectedCount, "different order; same identifiers")
-
-	// Using a different mount shouldn't affect counts.
-	doACMEForDomainWithDNS(t, dns, acmeClientPKI2, []string{"dadgarcorp.com"})
-	expectedCount = validateClientCount(t, client, "", expectedCount, "different mount; same identifiers")
-
-	// But using a different identifier should.
-	doACMEForDomainWithDNS(t, dns, acmeClientPKI2, []string{"pki2.dadgarcorp.com"})
-	expectedCount = validateClientCount(t, client, "pki2", expectedCount+1, "different mount with different identifiers")
-
-	// A new identifier in a unique namespace will affect results.
-	doACMEForDomainWithDNS(t, dns, acmeClientPKINS1, []string{"unique.dadgarcorp.com"})
-	expectedCount = validateClientCount(t, client, "ns1/pki", expectedCount+1, "unique identifier in a namespace")
-
-	// But in a different namespace with the existing identifier will not.
-	doACMEForDomainWithDNS(t, dns, acmeClientPKINS2, []string{"unique.dadgarcorp.com"})
-	expectedCount = validateClientCount(t, client, "", expectedCount, "existing identifier in a namespace")
-	doACMEForDomainWithDNS(t, dns, acmeClientPKI2, []string{"unique.dadgarcorp.com"})
-	expectedCount = validateClientCount(t, client, "", expectedCount, "existing identifier outside of a namespace")
-
-	// Creating a unique identifier in a namespace with a mount with the
-	// same name as another namespace should increase counts as well.
-	doACMEForDomainWithDNS(t, dns, acmeClientPKINS2, []string{"very-unique.dadgarcorp.com"})
-	expectedCount = validateClientCount(t, client, "ns2/pki", expectedCount+1, "unique identifier in a different namespace")
-
-	// Check the current fragment
-	fragment := cluster.Cores[0].Core.ResetActivityLog()[0]
-	if fragment == nil {
-		t.Fatal("no fragment created")
-	}
-	validateAcmeClientTypes(t, fragment, expectedCount)
-}
-
-func validateAcmeClientTypes(t *testing.T, fragment *activity.LogFragment, expectedCount int64) {
-	t.Helper()
-	if int64(len(fragment.Clients)) != expectedCount {
-		t.Fatalf("bad number of entities, expected %v: got %v, entities are: %v", expectedCount, len(fragment.Clients), fragment.Clients)
-	}
-
-	for _, ac := range fragment.Clients {
-		if ac.ClientType != vault.ACMEActivityType {
-			t.Fatalf("Couldn't find expected '%v' client_type in %v", vault.ACMEActivityType, fragment.Clients)
-		}
-	}
-}
-
-func validateClientCount(t *testing.T, client *api.Client, mount string, expected int64, message string) int64 {
-	resp, err := client.Logical().Read("/sys/internal/counters/activity/monthly")
-	require.NoError(t, err, "failed to fetch client count values")
-	t.Logf("got client count numbers: %v", resp)
-
-	require.NotNil(t, resp)
-	require.NotNil(t, resp.Data)
-	require.Contains(t, resp.Data, "non_entity_clients")
-	require.Contains(t, resp.Data, "months")
-
-	rawCount := resp.Data["non_entity_clients"].(json.Number)
-	count, err := rawCount.Int64()
-	require.NoError(t, err, "failed to parse number as int64: "+rawCount.String())
-
-	if expected != -1 {
-		require.Equal(t, expected, count, "value of client counts did not match expectations: "+message)
-	}
-
-	if mount == "" {
-		return count
-	}
-
-	months := resp.Data["months"].([]interface{})
-	if len(months) > 1 {
-		t.Fatalf("running across a month boundary despite using SkipAtEndOfMonth(...); rerun test from start fully in the next month instead")
-	}
-
-	require.Equal(t, 1, len(months), "expected only a single month when running this test")
-
-	monthlyInfo := months[0].(map[string]interface{})
-
-	// Validate this month's aggregate counts match the overall value.
-	require.Contains(t, monthlyInfo, "counts", "expected monthly info to contain a count key")
-	monthlyCounts := monthlyInfo["counts"].(map[string]interface{})
-	require.Contains(t, monthlyCounts, "non_entity_clients", "expected month[0].counts to contain a non_entity_clients key")
-	monthlyCountNonEntityRaw := monthlyCounts["non_entity_clients"].(json.Number)
-	monthlyCountNonEntity, err := monthlyCountNonEntityRaw.Int64()
-	require.NoError(t, err, "failed to parse number as int64: "+monthlyCountNonEntityRaw.String())
-	require.Equal(t, count, monthlyCountNonEntity, "expected equal values for non entity client counts")
-
-	// Validate this mount's namespace is included in the namespaces list,
-	// if this is enterprise. Otherwise, if its OSS or we don't have a
-	// namespace, we default to the value root.
-	mountNamespace := ""
-	mountPath := mount + "/"
-	if constants.IsEnterprise && strings.Contains(mount, "/") {
-		pieces := strings.Split(mount, "/")
-		require.Equal(t, 2, len(pieces), "we do not support nested namespaces in this test")
-		mountNamespace = pieces[0] + "/"
-		mountPath = pieces[1] + "/"
-	}
-
-	require.Contains(t, monthlyInfo, "namespaces", "expected monthly info to contain a namespaces key")
-	monthlyNamespaces := monthlyInfo["namespaces"].([]interface{})
-	foundNamespace := false
-	for index, namespaceRaw := range monthlyNamespaces {
-		namespace := namespaceRaw.(map[string]interface{})
-		require.Contains(t, namespace, "namespace_path", "expected monthly.namespaces[%v] to contain a namespace_path key", index)
-		namespacePath := namespace["namespace_path"].(string)
-
-		if namespacePath != mountNamespace {
-			t.Logf("skipping non-matching namespace %v: %v != %v / %v", index, namespacePath, mountNamespace, namespace)
-			continue
-		}
-
-		foundNamespace = true
-
-		// This namespace must have a non-empty aggregate non-entity count.
-		require.Contains(t, namespace, "counts", "expected monthly.namespaces[%v] to contain a counts key", index)
-		namespaceCounts := namespace["counts"].(map[string]interface{})
-		require.Contains(t, namespaceCounts, "non_entity_clients", "expected namespace counts to contain a non_entity_clients key")
-		namespaceCountNonEntityRaw := namespaceCounts["non_entity_clients"].(json.Number)
-		namespaceCountNonEntity, err := namespaceCountNonEntityRaw.Int64()
-		require.NoError(t, err, "failed to parse number as int64: "+namespaceCountNonEntityRaw.String())
-		require.Greater(t, namespaceCountNonEntity, int64(0), "expected at least one non-entity client count value in the namespace")
-
-		require.Contains(t, namespace, "mounts", "expected monthly.namespaces[%v] to contain a mounts key", index)
-		namespaceMounts := namespace["mounts"].([]interface{})
-		foundMount := false
-		for mountIndex, mountRaw := range namespaceMounts {
-			mountInfo := mountRaw.(map[string]interface{})
-			require.Contains(t, mountInfo, "mount_path", "expected monthly.namespaces[%v].mounts[%v] to contain a mount_path key", index, mountIndex)
-			mountInfoPath := mountInfo["mount_path"].(string)
-			if mountPath != mountInfoPath {
-				t.Logf("skipping non-matching mount path %v in namespace %v: %v != %v / %v of %v", mountIndex, index, mountPath, mountInfoPath, mountInfo, namespace)
-				continue
-			}
-
-			foundMount = true
-
-			// This mount must also have a non-empty non-entity client count.
-			require.Contains(t, mountInfo, "counts", "expected monthly.namespaces[%v].mounts[%v] to contain a counts key", index, mountIndex)
-			mountCounts := mountInfo["counts"].(map[string]interface{})
-			require.Contains(t, mountCounts, "non_entity_clients", "expected mount counts to contain a non_entity_clients key")
-			mountCountNonEntityRaw := mountCounts["non_entity_clients"].(json.Number)
-			mountCountNonEntity, err := mountCountNonEntityRaw.Int64()
-			require.NoError(t, err, "failed to parse number as int64: "+mountCountNonEntityRaw.String())
-			require.Greater(t, mountCountNonEntity, int64(0), "expected at least one non-entity client count value in the mount")
-		}
-
-		require.True(t, foundMount, "expected to find the mount "+mountPath+" in the list of mounts for namespace, but did not")
-	}
-
-	require.True(t, foundNamespace, "expected to find the namespace "+mountNamespace+" in the list of namespaces, but did not")
-
-	return count
-}
-
-func doACMEForDomainWithDNS(t *testing.T, dns *dnstest.TestServer, acmeClient *acme.Client, domains []string) *x509.Certificate {
-	cr := &x509.CertificateRequest{
-		Subject:  pkix.Name{CommonName: domains[0]},
-		DNSNames: domains,
-	}
-
-	accountKey, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
-	require.NoError(t, err, "failed to generate account key")
-	acmeClient.Key = accountKey
-
-	testCtx, cancelFunc := context.WithTimeout(context.Background(), 2*time.Minute)
-	defer cancelFunc()
-
-	// Register the client.
-	_, err = acmeClient.Register(testCtx, &acme.Account{Contact: []string{"mailto:ipsans@dadgarcorp.com"}}, func(tosURL string) bool { return true })
-	require.NoError(t, err, "failed registering account")
-
-	// Create the Order
-	var orderIdentifiers []acme.AuthzID
-	for _, domain := range domains {
-		orderIdentifiers = append(orderIdentifiers, acme.AuthzID{Type: "dns", Value: domain})
-	}
-	order, err := acmeClient.AuthorizeOrder(testCtx, orderIdentifiers)
-	require.NoError(t, err, "failed creating ACME order")
-
-	// Fetch its authorizations.
-	var auths []*acme.Authorization
-	for _, authUrl := range order.AuthzURLs {
-		authorization, err := acmeClient.GetAuthorization(testCtx, authUrl)
-		require.NoError(t, err, "failed to lookup authorization at url: %s", authUrl)
-		auths = append(auths, authorization)
-	}
-
-	// For each dns-01 challenge, place the record in the associated DNS resolver.
-	var challengesToAccept []*acme.Challenge
-	for _, auth := range auths {
-		for _, challenge := range auth.Challenges {
-			if challenge.Status != acme.StatusPending {
-				t.Logf("ignoring challenge not in status pending: %v", challenge)
-				continue
-			}
-
-			if challenge.Type == "dns-01" {
-				challengeBody, err := acmeClient.DNS01ChallengeRecord(challenge.Token)
-				require.NoError(t, err, "failed generating challenge response")
-
-				dns.AddRecord("_acme-challenge."+auth.Identifier.Value, "TXT", challengeBody)
-				defer dns.RemoveRecord("_acme-challenge."+auth.Identifier.Value, "TXT", challengeBody)
-
-				require.NoError(t, err, "failed setting DNS record")
-
-				challengesToAccept = append(challengesToAccept, challenge)
-			}
-		}
-	}
-
-	dns.PushConfig()
-	require.GreaterOrEqual(t, len(challengesToAccept), 1, "Need at least one challenge, got none")
-
-	// Tell the ACME server, that they can now validate those challenges.
-	for _, challenge := range challengesToAccept {
-		_, err = acmeClient.Accept(testCtx, challenge)
-		require.NoError(t, err, "failed to accept challenge: %v", challenge)
-	}
-
-	// Wait for the order/challenges to be validated.
-	_, err = acmeClient.WaitOrder(testCtx, order.URI)
-	require.NoError(t, err, "failed waiting for order to be ready")
-
-	// Create/sign the CSR and ask ACME server to sign it returning us the final certificate
-	csrKey, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
-	csr, err := x509.CreateCertificateRequest(rand.Reader, cr, csrKey)
-	require.NoError(t, err, "failed generating csr")
-
-	certs, _, err := acmeClient.CreateOrderCert(testCtx, order.FinalizeURL, csr, false)
-	require.NoError(t, err, "failed to get a certificate back from ACME")
-
-	acmeCert, err := x509.ParseCertificate(certs[0])
-	require.NoError(t, err, "failed parsing acme cert bytes")
-
-	return acmeCert
-}
diff --git a/builtin/logical/pki/acme_challenge_engine.go b/builtin/logical/pki/acme_challenge_engine.go
deleted file mode 100644
index 5103a0376e7e9..0000000000000
--- a/builtin/logical/pki/acme_challenge_engine.go
+++ /dev/null
@@ -1,535 +0,0 @@
-package pki
-
-import (
-	"container/list"
-	"context"
-	"fmt"
-	"sync"
-	"time"
-
-	"github.com/hashicorp/vault/sdk/logical"
-)
-
-var MaxChallengeTimeout = 1 * time.Minute
-
-const MaxRetryAttempts = 5
-
-const ChallengeAttemptFailedMsg = "this may occur if the validation target was misconfigured: check that challenge responses are available at the required locations and retry."
-
-type ChallengeValidation struct {
-	// Account KID that this validation attempt is recorded under.
-	Account string `json:"account"`
-
-	// The authorization ID that this validation attempt is for.
-	Authorization string            `json:"authorization"`
-	ChallengeType ACMEChallengeType `json:"challenge_type"`
-
-	// The token of this challenge and the JWS thumbprint of the account
-	// we're validating against.
-	Token      string `json:"token"`
-	Thumbprint string `json:"thumbprint"`
-
-	Initiated       time.Time `json:"initiated"`
-	FirstValidation time.Time `json:"first_validation,omitempty"`
-	RetryCount      int       `json:"retry_count,omitempty"`
-	LastRetry       time.Time `json:"last_retry,omitempty"`
-	RetryAfter      time.Time `json:"retry_after,omitempty"`
-}
-
-type ChallengeQueueEntry struct {
-	Identifier string
-	RetryAfter time.Time
-}
-
-type ACMEChallengeEngine struct {
-	NumWorkers int
-
-	ValidationLock sync.Mutex
-	NewValidation  chan string
-	Closing        chan struct{}
-	Validations    *list.List
-}
-
-func NewACMEChallengeEngine() *ACMEChallengeEngine {
-	ace := &ACMEChallengeEngine{}
-	ace.NewValidation = make(chan string, 1)
-	ace.Closing = make(chan struct{}, 1)
-	ace.Validations = list.New()
-	ace.NumWorkers = 5
-
-	return ace
-}
-
-func (ace *ACMEChallengeEngine) LoadFromStorage(b *backend, sc *storageContext) error {
-	items, err := sc.Storage.List(sc.Context, acmeValidationPrefix)
-	if err != nil {
-		return fmt.Errorf("failed loading list of validations from disk: %w", err)
-	}
-
-	ace.ValidationLock.Lock()
-	defer ace.ValidationLock.Unlock()
-
-	// Add them to our queue of validations to work through later.
-	foundExistingValidations := false
-	for _, item := range items {
-		ace.Validations.PushBack(&ChallengeQueueEntry{
-			Identifier: item,
-		})
-		foundExistingValidations = true
-	}
-
-	if foundExistingValidations {
-		ace.NewValidation <- "existing"
-	}
-
-	return nil
-}
-
-func (ace *ACMEChallengeEngine) Run(b *backend, state *acmeState, sc *storageContext) {
-	// We load the existing ACME challenges within the Run thread to avoid
-	// delaying the PKI mount initialization
-	b.Logger().Debug("Loading existing challenge validations on disk")
-	err := ace.LoadFromStorage(b, sc)
-	if err != nil {
-		b.Logger().Error("failed loading existing ACME challenge validations:", "err", err)
-	}
-
-	for true {
-		// err == nil on shutdown.
-		b.Logger().Debug("Starting ACME challenge validation engine")
-		err := ace._run(b, state)
-		if err != nil {
-			b.Logger().Error("Got unexpected error from ACME challenge validation engine", "err", err)
-			time.Sleep(1 * time.Second)
-			continue
-		}
-		break
-	}
-}
-
-func (ace *ACMEChallengeEngine) _run(b *backend, state *acmeState) error {
-	// This runner uses a background context for storage operations: we don't
-	// want to tie it to a inbound request and we don't want to set a time
-	// limit, so create a fresh background context.
-	runnerSC := b.makeStorageContext(context.Background(), b.storage)
-
-	// We want at most a certain number of workers operating to verify
-	// challenges.
-	var finishedWorkersChannels []chan bool
-	for true {
-		// Wait until we've got more work to do.
-		select {
-		case <-ace.Closing:
-			b.Logger().Debug("shutting down ACME challenge validation engine")
-			return nil
-		case <-ace.NewValidation:
-		}
-
-		// First try to reap any finished workers. Read from their channels
-		// and if not finished yet, add to a fresh slice.
-		var newFinishedWorkersChannels []chan bool
-		for _, channel := range finishedWorkersChannels {
-			select {
-			case <-channel:
-			default:
-				// This channel had not been written to, indicating that the
-				// worker had not yet finished.
-				newFinishedWorkersChannels = append(newFinishedWorkersChannels, channel)
-			}
-		}
-		finishedWorkersChannels = newFinishedWorkersChannels
-
-		// If we have space to take on another work item, do so.
-		firstIdentifier := ""
-		startedWork := false
-		now := time.Now()
-		for len(finishedWorkersChannels) < ace.NumWorkers {
-			var task *ChallengeQueueEntry
-
-			// Find our next work item. We do all of these operations
-			// while holding the queue lock, hence some repeated checks
-			// afterwards. Out of this, we get a candidate task, using
-			// element == nil as a sentinel for breaking our parent
-			// loop.
-			ace.ValidationLock.Lock()
-			element := ace.Validations.Front()
-			if element != nil {
-				ace.Validations.Remove(element)
-				task = element.Value.(*ChallengeQueueEntry)
-				if !task.RetryAfter.IsZero() && now.Before(task.RetryAfter) {
-					// We cannot work on this element yet; remove it to
-					// the back of the queue. This allows us to potentially
-					// select the next item in the next iteration.
-					ace.Validations.PushBack(task)
-				}
-
-				if firstIdentifier != "" && task.Identifier == firstIdentifier {
-					// We found and rejected this element before; exit the
-					// loop by "claiming" we didn't find any work.
-					element = nil
-				} else if firstIdentifier == "" {
-					firstIdentifier = task.Identifier
-				}
-			}
-			ace.ValidationLock.Unlock()
-			if element == nil {
-				// There was no more work to do to fill up the queue; exit
-				// this loop.
-				break
-			}
-			if now.Before(task.RetryAfter) {
-				// Here, while we found an element, we didn't want to
-				// completely exit the loop (perhaps it was our first time
-				// finding a work order), so retry without modifying
-				// firstIdentifier.
-				continue
-			}
-
-			config, err := state.getConfigWithUpdate(runnerSC)
-			if err != nil {
-				return fmt.Errorf("failed fetching ACME configuration: %w", err)
-			}
-
-			// Since this work item was valid, we won't expect to see it in
-			// the validation queue again until it is executed. Here, we
-			// want to avoid infinite looping above (if we removed the one
-			// valid item and the remainder are all not immediately
-			// actionable). At the worst, we'll spend a little more time
-			// looping through the queue until we hit a repeat.
-			firstIdentifier = ""
-
-			// Here, we got a piece of work that is ready to check; create a
-			// channel and a new go routine and run it. Note that this still
-			// could have a RetryAfter date we're not aware of (e.g., if the
-			// cluster restarted as we do not read the entries there).
-			channel := make(chan bool, 1)
-			go ace.VerifyChallenge(runnerSC, task.Identifier, channel, config)
-			finishedWorkersChannels = append(finishedWorkersChannels, channel)
-			startedWork = true
-		}
-
-		// If we have no more capacity for work, we should pause a little to
-		// let the system catch up. Additionally, if we only had
-		// non-actionable work items, we should pause until some time has
-		// elapsed: not too much that we potentially starve any new incoming
-		// items from validation, but not too short that we cause a busy loop.
-		if len(finishedWorkersChannels) == ace.NumWorkers || !startedWork {
-			time.Sleep(100 * time.Millisecond)
-		}
-
-		// Lastly, if we have more work to do, re-trigger ourselves.
-		ace.ValidationLock.Lock()
-		if ace.Validations.Front() != nil {
-			select {
-			case ace.NewValidation <- "retry":
-			default:
-			}
-		}
-		ace.ValidationLock.Unlock()
-	}
-
-	return fmt.Errorf("unexpectedly exited from ACMEChallengeEngine._run()")
-}
-
-func (ace *ACMEChallengeEngine) AcceptChallenge(sc *storageContext, account string, authz *ACMEAuthorization, challenge *ACMEChallenge, thumbprint string) error {
-	name := authz.Id + "-" + string(challenge.Type)
-	path := acmeValidationPrefix + name
-
-	entry, err := sc.Storage.Get(sc.Context, path)
-	if err == nil && entry != nil {
-		// Challenge already in the queue; exit without re-adding it.
-		return nil
-	}
-
-	if authz.Status != ACMEAuthorizationPending {
-		return fmt.Errorf("%w: cannot accept already validated authorization %v (%v)", ErrMalformed, authz.Id, authz.Status)
-	}
-
-	for _, otherChallenge := range authz.Challenges {
-		// We assume within an authorization we won't have multiple challenges of the same challenge type
-		// and we want to limit a single challenge being in a processing state to avoid race conditions
-		// failing one challenge and passing another.
-		if otherChallenge.Type != challenge.Type && otherChallenge.Status != ACMEChallengePending {
-			return fmt.Errorf("%w: only a single challenge within an authorization can be accepted (%v) in status %v", ErrMalformed, otherChallenge.Type, otherChallenge.Status)
-		}
-
-		// The requested challenge can ping us to wake us up, so allow pending and currently processing statuses
-		if otherChallenge.Status != ACMEChallengePending && otherChallenge.Status != ACMEChallengeProcessing {
-			return fmt.Errorf("%w: challenge is in invalid state (%v) in authorization %v", ErrMalformed, challenge.Status, authz.Id)
-		}
-	}
-
-	token := challenge.ChallengeFields["token"].(string)
-
-	cv := &ChallengeValidation{
-		Account:       account,
-		Authorization: authz.Id,
-		ChallengeType: challenge.Type,
-		Token:         token,
-		Thumbprint:    thumbprint,
-		Initiated:     time.Now(),
-	}
-
-	json, err := logical.StorageEntryJSON(path, &cv)
-	if err != nil {
-		return fmt.Errorf("error creating challenge validation queue entry: %w", err)
-	}
-
-	if err := sc.Storage.Put(sc.Context, json); err != nil {
-		return fmt.Errorf("error writing challenge validation entry: %w", err)
-	}
-
-	if challenge.Status == ACMEChallengePending {
-		challenge.Status = ACMEChallengeProcessing
-
-		authzPath := getAuthorizationPath(account, authz.Id)
-		if err := saveAuthorizationAtPath(sc, authzPath, authz); err != nil {
-			return fmt.Errorf("error saving updated authorization %v: %w", authz.Id, err)
-		}
-	}
-
-	ace.ValidationLock.Lock()
-	defer ace.ValidationLock.Unlock()
-	ace.Validations.PushBack(&ChallengeQueueEntry{
-		Identifier: name,
-	})
-
-	select {
-	case ace.NewValidation <- name:
-	default:
-	}
-
-	return nil
-}
-
-func (ace *ACMEChallengeEngine) VerifyChallenge(runnerSc *storageContext, id string, finished chan bool, config *acmeConfigEntry) {
-	sc, _ /* cancel func */ := runnerSc.WithFreshTimeout(MaxChallengeTimeout)
-	runnerSc.Backend.Logger().Debug("Starting verification of challenge", "id", id)
-
-	if retry, retryAfter, err := ace._verifyChallenge(sc, id, config); err != nil {
-		// Because verification of this challenge failed, we need to retry
-		// it in the future. Log the error and re-add the item to the queue
-		// to try again later.
-		sc.Backend.Logger().Error(fmt.Sprintf("ACME validation failed for %v: %v", id, err))
-
-		if retry {
-			ace.ValidationLock.Lock()
-			defer ace.ValidationLock.Unlock()
-			ace.Validations.PushBack(&ChallengeQueueEntry{
-				Identifier: id,
-				RetryAfter: retryAfter,
-			})
-
-			// Let the validator know there's a pending challenge.
-			select {
-			case ace.NewValidation <- id:
-			default:
-			}
-		}
-
-		// We're the only producer on this channel and it has a buffer size
-		// of one element, so it is safe to directly write here.
-		finished <- true
-		return
-	}
-
-	// We're the only producer on this channel and it has a buffer size of one
-	// element, so it is safe to directly write here.
-	finished <- false
-}
-
-func (ace *ACMEChallengeEngine) _verifyChallenge(sc *storageContext, id string, config *acmeConfigEntry) (bool, time.Time, error) {
-	now := time.Now()
-	path := acmeValidationPrefix + id
-	challengeEntry, err := sc.Storage.Get(sc.Context, path)
-	if err != nil {
-		return true, now, fmt.Errorf("error loading challenge %v: %w", id, err)
-	}
-
-	if challengeEntry == nil {
-		// Something must've successfully cleaned up our storage entry from
-		// under us. Assume we don't need to rerun, else the client will
-		// trigger us to re-run.
-		err = nil
-		return ace._verifyChallengeCleanup(sc, err, id)
-	}
-
-	var cv *ChallengeValidation
-	if err := challengeEntry.DecodeJSON(&cv); err != nil {
-		return true, now, fmt.Errorf("error decoding challenge %v: %w", id, err)
-	}
-
-	if now.Before(cv.RetryAfter) {
-		return true, cv.RetryAfter, fmt.Errorf("retrying challenge %v too soon", id)
-	}
-
-	authzPath := getAuthorizationPath(cv.Account, cv.Authorization)
-	authz, err := loadAuthorizationAtPath(sc, authzPath)
-	if err != nil {
-		return true, now, fmt.Errorf("error loading authorization %v/%v for challenge %v: %w", cv.Account, cv.Authorization, id, err)
-	}
-
-	if authz.Status != ACMEAuthorizationPending {
-		// Something must've finished up this challenge for us. Assume we
-		// don't need to rerun and exit instead.
-		err = nil
-		return ace._verifyChallengeCleanup(sc, err, id)
-	}
-
-	var challenge *ACMEChallenge
-	for _, authzChallenge := range authz.Challenges {
-		if authzChallenge.Type == cv.ChallengeType {
-			challenge = authzChallenge
-			break
-		}
-	}
-
-	if challenge == nil {
-		err = fmt.Errorf("no challenge of type %v in authorization %v/%v for challenge %v", cv.ChallengeType, cv.Account, cv.Authorization, id)
-		return ace._verifyChallengeCleanup(sc, err, id)
-	}
-
-	if challenge.Status != ACMEChallengePending && challenge.Status != ACMEChallengeProcessing {
-		err = fmt.Errorf("challenge is in invalid state %v in authorization %v/%v for challenge %v", challenge.Status, cv.Account, cv.Authorization, id)
-		return ace._verifyChallengeCleanup(sc, err, id)
-	}
-
-	var valid bool
-	switch challenge.Type {
-	case ACMEHTTPChallenge:
-		if authz.Identifier.Type != ACMEDNSIdentifier && authz.Identifier.Type != ACMEIPIdentifier {
-			err = fmt.Errorf("unsupported identifier type for authorization %v/%v in challenge %v: %v", cv.Account, cv.Authorization, id, authz.Identifier.Type)
-			return ace._verifyChallengeCleanup(sc, err, id)
-		}
-
-		if authz.Wildcard {
-			err = fmt.Errorf("unable to validate wildcard authorization %v/%v in challenge %v via http-01 challenge", cv.Account, cv.Authorization, id)
-			return ace._verifyChallengeCleanup(sc, err, id)
-		}
-
-		valid, err = ValidateHTTP01Challenge(authz.Identifier.Value, cv.Token, cv.Thumbprint, config)
-		if err != nil {
-			err = fmt.Errorf("%w: error validating http-01 challenge %v: %v; %v", ErrIncorrectResponse, id, err, ChallengeAttemptFailedMsg)
-			return ace._verifyChallengeRetry(sc, cv, authzPath, authz, challenge, err, id)
-		}
-	case ACMEDNSChallenge:
-		if authz.Identifier.Type != ACMEDNSIdentifier {
-			err = fmt.Errorf("unsupported identifier type for authorization %v/%v in challenge %v: %v", cv.Account, cv.Authorization, id, authz.Identifier.Type)
-			return ace._verifyChallengeCleanup(sc, err, id)
-		}
-
-		valid, err = ValidateDNS01Challenge(authz.Identifier.Value, cv.Token, cv.Thumbprint, config)
-		if err != nil {
-			err = fmt.Errorf("%w: error validating dns-01 challenge %v: %v; %v", ErrIncorrectResponse, id, err, ChallengeAttemptFailedMsg)
-			return ace._verifyChallengeRetry(sc, cv, authzPath, authz, challenge, err, id)
-		}
-	case ACMEALPNChallenge:
-		if authz.Identifier.Type != ACMEDNSIdentifier {
-			err = fmt.Errorf("unsupported identifier type for authorization %v/%v in challenge %v: %v", cv.Account, cv.Authorization, id, authz.Identifier.Type)
-			return ace._verifyChallengeCleanup(sc, err, id)
-		}
-
-		if authz.Wildcard {
-			err = fmt.Errorf("unable to validate wildcard authorization %v/%v in challenge %v via tls-alpn-01 challenge", cv.Account, cv.Authorization, id)
-			return ace._verifyChallengeCleanup(sc, err, id)
-		}
-
-		valid, err = ValidateTLSALPN01Challenge(authz.Identifier.Value, cv.Token, cv.Thumbprint, config)
-		if err != nil {
-			err = fmt.Errorf("%w: error validating tls-alpn-01 challenge %v: %s", ErrIncorrectResponse, id, err.Error())
-			return ace._verifyChallengeRetry(sc, cv, authzPath, authz, challenge, err, id)
-		}
-	default:
-		err = fmt.Errorf("unsupported ACME challenge type %v for challenge %v", cv.ChallengeType, id)
-		return ace._verifyChallengeCleanup(sc, err, id)
-	}
-
-	if !valid {
-		err = fmt.Errorf("%w: challenge failed with no additional information", ErrIncorrectResponse)
-		return ace._verifyChallengeRetry(sc, cv, authzPath, authz, challenge, err, id)
-	}
-
-	// If we got here, the challenge verification was successful. Update
-	// the authorization appropriately.
-	expires := now.Add(15 * 24 * time.Hour)
-	challenge.Status = ACMEChallengeValid
-	challenge.Validated = now.Format(time.RFC3339)
-	challenge.Error = nil
-	authz.Status = ACMEAuthorizationValid
-	authz.Expires = expires.Format(time.RFC3339)
-
-	if err := saveAuthorizationAtPath(sc, authzPath, authz); err != nil {
-		err = fmt.Errorf("error saving updated (validated) authorization %v/%v for challenge %v: %w", cv.Account, cv.Authorization, id, err)
-		return ace._verifyChallengeRetry(sc, cv, authzPath, authz, challenge, err, id)
-	}
-
-	return ace._verifyChallengeCleanup(sc, nil, id)
-}
-
-func (ace *ACMEChallengeEngine) _verifyChallengeRetry(sc *storageContext, cv *ChallengeValidation, authzPath string, auth *ACMEAuthorization, challenge *ACMEChallenge, verificationErr error, id string) (bool, time.Time, error) {
-	now := time.Now()
-	path := acmeValidationPrefix + id
-
-	if err := updateChallengeStatus(sc, cv, authzPath, auth, challenge, verificationErr); err != nil {
-		return true, now, err
-	}
-
-	if cv.RetryCount > MaxRetryAttempts {
-		err := fmt.Errorf("reached max error attempts for challenge %v: %w", id, verificationErr)
-		return ace._verifyChallengeCleanup(sc, err, id)
-	}
-
-	if cv.FirstValidation.IsZero() {
-		cv.FirstValidation = now
-	}
-	cv.RetryCount += 1
-	cv.LastRetry = now
-	cv.RetryAfter = now.Add(time.Duration(cv.RetryCount*5) * time.Second)
-
-	json, jsonErr := logical.StorageEntryJSON(path, cv)
-	if jsonErr != nil {
-		return true, now, fmt.Errorf("error persisting updated challenge validation queue entry (error prior to retry, if any: %v): %w", verificationErr, jsonErr)
-	}
-
-	if putErr := sc.Storage.Put(sc.Context, json); putErr != nil {
-		return true, now, fmt.Errorf("error writing updated challenge validation entry (error prior to retry, if any: %v): %w", verificationErr, putErr)
-	}
-
-	if verificationErr != nil {
-		verificationErr = fmt.Errorf("retrying validation: %w", verificationErr)
-	}
-
-	return true, cv.RetryAfter, verificationErr
-}
-
-func updateChallengeStatus(sc *storageContext, cv *ChallengeValidation, authzPath string, auth *ACMEAuthorization, challenge *ACMEChallenge, verificationErr error) error {
-	if verificationErr != nil {
-		challengeError := TranslateErrorToErrorResponse(verificationErr)
-		challenge.Error = challengeError.MarshalForStorage()
-	}
-
-	if cv.RetryCount > MaxRetryAttempts {
-		challenge.Status = ACMEChallengeInvalid
-		auth.Status = ACMEAuthorizationInvalid
-	}
-
-	if err := saveAuthorizationAtPath(sc, authzPath, auth); err != nil {
-		return fmt.Errorf("error persisting authorization/challenge update: %w", err)
-	}
-	return nil
-}
-
-func (ace *ACMEChallengeEngine) _verifyChallengeCleanup(sc *storageContext, err error, id string) (bool, time.Time, error) {
-	now := time.Now()
-
-	// Remove our ChallengeValidation entry only.
-	if deleteErr := sc.Storage.Delete(sc.Context, acmeValidationPrefix+id); deleteErr != nil {
-		return true, now.Add(-1 * time.Second), fmt.Errorf("error deleting challenge %v (error prior to cleanup, if any: %v): %w", id, err, deleteErr)
-	}
-
-	if err != nil {
-		err = fmt.Errorf("removing challenge validation attempt and not retrying %v; previous error: %w", id, err)
-	}
-
-	return false, now, err
-}
diff --git a/builtin/logical/pki/acme_challenges.go b/builtin/logical/pki/acme_challenges.go
deleted file mode 100644
index 855035729e97e..0000000000000
--- a/builtin/logical/pki/acme_challenges.go
+++ /dev/null
@@ -1,469 +0,0 @@
-package pki
-
-import (
-	"bytes"
-	"context"
-	"crypto/sha256"
-	"crypto/tls"
-	"crypto/x509"
-	"encoding/asn1"
-	"encoding/base64"
-	"fmt"
-	"io"
-	"net"
-	"net/http"
-	"strings"
-	"time"
-)
-
-const (
-	DNSChallengePrefix = "_acme-challenge."
-	ALPNProtocol       = "acme-tls/1"
-)
-
-// While this should be a constant, there's no way to do a low-level test of
-// ValidateTLSALPN01Challenge without spinning up a complicated Docker
-// instance to build a custom responder. Because we already have a local
-// toolchain, it is far easier to drive this through Go tests with a custom
-// (high) port, rather than requiring permission to bind to port 443 (root-run
-// tests are even worse).
-var ALPNPort = "443"
-
-// OID of the acmeIdentifier X.509 Certificate Extension.
-var OIDACMEIdentifier = asn1.ObjectIdentifier{1, 3, 6, 1, 5, 5, 7, 1, 31}
-
-// ValidateKeyAuthorization validates that the given keyAuthz from a challenge
-// matches our expectation, returning (true, nil) if so, or (false, err) if
-// not.
-func ValidateKeyAuthorization(keyAuthz string, token string, thumbprint string) (bool, error) {
-	parts := strings.Split(keyAuthz, ".")
-	if len(parts) != 2 {
-		return false, fmt.Errorf("invalid authorization: got %v parts, expected 2", len(parts))
-	}
-
-	tokenPart := parts[0]
-	thumbprintPart := parts[1]
-
-	if token != tokenPart || thumbprint != thumbprintPart {
-		return false, fmt.Errorf("key authorization was invalid")
-	}
-
-	return true, nil
-}
-
-// ValidateSHA256KeyAuthorization validates that the given keyAuthz from a
-// challenge matches our expectation, returning (true, nil) if so, or
-// (false, err) if not.
-//
-// This is for use with DNS challenges, which require
-func ValidateSHA256KeyAuthorization(keyAuthz string, token string, thumbprint string) (bool, error) {
-	authzContents := token + "." + thumbprint
-	checksum := sha256.Sum256([]byte(authzContents))
-	expectedAuthz := base64.RawURLEncoding.EncodeToString(checksum[:])
-
-	if keyAuthz != expectedAuthz {
-		return false, fmt.Errorf("sha256 key authorization was invalid")
-	}
-
-	return true, nil
-}
-
-func buildResolver(config *acmeConfigEntry) (*net.Resolver, error) {
-	if len(config.DNSResolver) == 0 {
-		return net.DefaultResolver, nil
-	}
-
-	return &net.Resolver{
-		PreferGo:     true,
-		StrictErrors: false,
-		Dial: func(ctx context.Context, network, address string) (net.Conn, error) {
-			d := net.Dialer{
-				Timeout: 10 * time.Second,
-			}
-			return d.DialContext(ctx, network, config.DNSResolver)
-		},
-	}, nil
-}
-
-func buildDialerConfig(config *acmeConfigEntry) (*net.Dialer, error) {
-	resolver, err := buildResolver(config)
-	if err != nil {
-		return nil, fmt.Errorf("failed to build resolver: %w", err)
-	}
-
-	return &net.Dialer{
-		Timeout:   10 * time.Second,
-		KeepAlive: -1 * time.Second,
-		Resolver:  resolver,
-	}, nil
-}
-
-// Validates a given ACME http-01 challenge against the specified domain,
-// per RFC 8555.
-//
-// We attempt to be defensive here against timeouts, extra redirects, &c.
-func ValidateHTTP01Challenge(domain string, token string, thumbprint string, config *acmeConfigEntry) (bool, error) {
-	path := "http://" + domain + "/.well-known/acme-challenge/" + token
-	dialer, err := buildDialerConfig(config)
-	if err != nil {
-		return false, fmt.Errorf("failed to build dialer: %w", err)
-	}
-
-	transport := &http.Transport{
-		// Only a single request is sent to this server as we do not do any
-		// batching of validation attempts. There is no need to do an HTTP
-		// KeepAlive as a result.
-		DisableKeepAlives:   true,
-		MaxIdleConns:        1,
-		MaxIdleConnsPerHost: 1,
-		MaxConnsPerHost:     1,
-		IdleConnTimeout:     1 * time.Second,
-
-		// We'd rather timeout and re-attempt validation later than hang
-		// too many validators waiting for slow hosts.
-		DialContext:           dialer.DialContext,
-		ResponseHeaderTimeout: 10 * time.Second,
-	}
-
-	maxRedirects := 10
-	urlLength := 2000
-
-	client := &http.Client{
-		Transport: transport,
-		CheckRedirect: func(req *http.Request, via []*http.Request) error {
-			if len(via)+1 >= maxRedirects {
-				return fmt.Errorf("http-01: too many redirects: %v", len(via)+1)
-			}
-
-			reqUrlLen := len(req.URL.String())
-			if reqUrlLen > urlLength {
-				return fmt.Errorf("http-01: redirect url length too long: %v", reqUrlLen)
-			}
-
-			return nil
-		},
-	}
-
-	resp, err := client.Get(path)
-	if err != nil {
-		return false, fmt.Errorf("http-01: failed to fetch path %v: %w", path, err)
-	}
-
-	// We provision a buffer which allows for a variable size challenge, some
-	// whitespace, and a detection gap for too long of a message.
-	minExpected := len(token) + 1 + len(thumbprint)
-	maxExpected := 512
-
-	defer resp.Body.Close()
-
-	// Attempt to read the body, but don't do so infinitely.
-	body, err := io.ReadAll(io.LimitReader(resp.Body, int64(maxExpected+1)))
-	if err != nil {
-		return false, fmt.Errorf("http-01: unexpected error while reading body: %w", err)
-	}
-
-	if len(body) > maxExpected {
-		return false, fmt.Errorf("http-01: response too large: received %v > %v bytes", len(body), maxExpected)
-	}
-
-	if len(body) < minExpected {
-		return false, fmt.Errorf("http-01: response too small: received %v < %v bytes", len(body), minExpected)
-	}
-
-	// Per RFC 8555 Section 8.3. HTTP Challenge:
-	//
-	// > The server SHOULD ignore whitespace characters at the end of the body.
-	keyAuthz := string(body)
-	keyAuthz = strings.TrimSpace(keyAuthz)
-
-	// If we got here, we got no non-EOF error while reading. Try to validate
-	// the token because we're bounded by a reasonable amount of length.
-	return ValidateKeyAuthorization(keyAuthz, token, thumbprint)
-}
-
-func ValidateDNS01Challenge(domain string, token string, thumbprint string, config *acmeConfigEntry) (bool, error) {
-	// Here, domain is the value from the post-wildcard-processed identifier.
-	// Per RFC 8555, no difference in validation occurs if a wildcard entry
-	// is requested or if a non-wildcard entry is requested.
-	//
-	// XXX: In this case the DNS server is operator controlled and is assumed
-	// to be less malicious so the default resolver is used. In the future,
-	// we'll want to use net.Resolver for two reasons:
-	//
-	// 1. To control the actual resolver via ACME configuration,
-	// 2. To use a context to set stricter timeout limits.
-	resolver, err := buildResolver(config)
-	if err != nil {
-		return false, fmt.Errorf("failed to build resolver: %w", err)
-	}
-
-	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
-	defer cancel()
-
-	name := DNSChallengePrefix + domain
-	results, err := resolver.LookupTXT(ctx, name)
-	if err != nil {
-		return false, fmt.Errorf("dns-01: failed to lookup TXT records for domain (%v) via resolver %v: %w", name, config.DNSResolver, err)
-	}
-
-	for _, keyAuthz := range results {
-		ok, _ := ValidateSHA256KeyAuthorization(keyAuthz, token, thumbprint)
-		if ok {
-			return true, nil
-		}
-	}
-
-	return false, fmt.Errorf("dns-01: challenge failed against %v records", len(results))
-}
-
-func ValidateTLSALPN01Challenge(domain string, token string, thumbprint string, config *acmeConfigEntry) (bool, error) {
-	// This RFC is defined in RFC 8737 Automated Certificate Management
-	// Environment (ACME) TLS Application‑Layer Protocol Negotiation
-	// (ALPN) Challenge Extension.
-	//
-	// This is conceptually similar to ValidateHTTP01Challenge, but
-	// uses a TLS connection on port 443 with the specified ALPN
-	// protocol.
-
-	cfg := &tls.Config{
-		// Per RFC 8737 Section 3. TLS with Application-Layer Protocol
-		// Negotiation (TLS ALPN) Challenge, the name of the negotiated
-		// protocol is "acme-tls/1".
-		NextProtos: []string{ALPNProtocol},
-
-		// Per RFC 8737 Section 3. TLS with Application-Layer Protocol
-		// Negotiation (TLS ALPN) Challenge:
-		//
-		// > ... and an SNI extension containing only the domain name
-		// > being validated during the TLS handshake.
-		//
-		// According to the Go docs, setting this option (even though
-		// InsecureSkipVerify=true is also specified), allows us to
-		// set the SNI extension to this value.
-		ServerName: domain,
-
-		VerifyConnection: func(connState tls.ConnectionState) error {
-			// We initiated a fresh connection with no session tickets;
-			// even if we did have a session ticket, we do not wish to
-			// use it. Verify that the server has not inadvertently
-			// reused connections between validation attempts or something.
-			if connState.DidResume {
-				return fmt.Errorf("server under test incorrectly reported that handshake was resumed when no session cache was provided; refusing to continue")
-			}
-
-			// Per RFC 8737 Section 3. TLS with Application-Layer Protocol
-			// Negotiation (TLS ALPN) Challenge:
-			//
-			// > The ACME server verifies that during the TLS handshake the
-			// > application-layer protocol "acme-tls/1" was successfully
-			// > negotiated (and that the ALPN extension contained only the
-			// > value "acme-tls/1").
-			if connState.NegotiatedProtocol != ALPNProtocol {
-				return fmt.Errorf("server under test negotiated unexpected ALPN protocol %v", connState.NegotiatedProtocol)
-			}
-
-			// Per RFC 8737 Section 3. TLS with Application-Layer Protocol
-			// Negotiation (TLS ALPN) Challenge:
-			//
-			// > and that the certificate returned
-			//
-			// Because this certificate MUST be self-signed (per earlier
-			// statement in RFC 8737 Section 3), there is no point in sending
-			// more than one certificate, and so we will err early here if
-			// we got more than one.
-			if len(connState.PeerCertificates) > 1 {
-				return fmt.Errorf("server under test returned multiple (%v) certificates when we expected only one", len(connState.PeerCertificates))
-			}
-			cert := connState.PeerCertificates[0]
-
-			// Per RFC 8737 Section 3. TLS with Application-Layer Protocol
-			// Negotiation (TLS ALPN) Challenge:
-			//
-			// > The client prepares for validation by constructing a
-			// > self-signed certificate that MUST contain an acmeIdentifier
-			// > extension and a subjectAlternativeName extension [RFC5280].
-			//
-			// Verify that this is a self-signed certificate that isn't signed
-			// by another certificate (i.e., with the same key material but
-			// different issuer).
-			if err := cert.CheckSignatureFrom(cert); err != nil {
-				return fmt.Errorf("server under test returned a non-self-signed certificate: %w", err)
-			}
-			if !bytes.Equal(cert.RawSubject, cert.RawIssuer) {
-				return fmt.Errorf("server under test returned a non-self-signed certificate: invalid subject (%v) <-> issuer (%v) match", cert.Subject.String(), cert.Issuer.String())
-			}
-
-			// Per RFC 8737 Section 3. TLS with Application-Layer Protocol
-			// Negotiation (TLS ALPN) Challenge:
-			//
-			// > The subjectAlternativeName extension MUST contain a single
-			// > dNSName entry where the value is the domain name being
-			// > validated.
-			//
-			// TODO: this does not validate that there are not other SANs
-			// with unknown (to Go) OIDs.
-			if len(cert.DNSNames) != 1 || len(cert.EmailAddresses) > 0 || len(cert.IPAddresses) > 0 || len(cert.URIs) > 0 {
-				return fmt.Errorf("server under test returned a certificate with incorrect SANs")
-			}
-
-			// Per RFC 8737 Section 3. TLS with Application-Layer Protocol
-			// Negotiation (TLS ALPN) Challenge:
-			//
-			// > The comparison of dNSNames MUST be case insensitive
-			// > [RFC4343]. Note that as ACME doesn't support Unicode
-			// > identifiers, all dNSNames MUST be encoded using the rules
-			// > of [RFC3492].
-			if !strings.EqualFold(cert.DNSNames[0], domain) {
-				return fmt.Errorf("server under test returned a certificate with unexpected identifier: %v", cert.DNSNames[0])
-			}
-
-			// Per above, verify that the acmeIdentifier extension is present
-			// exactly once and has the correct value.
-			var foundACMEId bool
-			for _, ext := range cert.Extensions {
-				if !ext.Id.Equal(OIDACMEIdentifier) {
-					continue
-				}
-
-				// There must be only a single ACME extension.
-				if foundACMEId {
-					return fmt.Errorf("server under test returned a certificate with multiple acmeIdentifier extensions")
-				}
-				foundACMEId = true
-
-				// Per RFC 8737 Section 3. TLS with Application-Layer Protocol
-				// Negotiation (TLS ALPN) Challenge:
-				//
-				// > a critical acmeIdentifier extension
-				if !ext.Critical {
-					return fmt.Errorf("server under test returned a certificate with an acmeIdentifier extension marked non-Critical")
-				}
-
-				keyAuthz := string(ext.Value)
-				ok, err := ValidateSHA256KeyAuthorization(keyAuthz, token, thumbprint)
-				if !ok || err != nil {
-					return fmt.Errorf("server under test returned a certificate with an invalid key authorization (%w)", err)
-				}
-			}
-
-			// Per RFC 8737 Section 3. TLS with Application-Layer Protocol
-			// Negotiation (TLS ALPN) Challenge:
-			//
-			// > The ACME server verifies that ... the certificate returned
-			// > contains: ... a critical acmeIdentifier extension containing
-			// > the expected SHA-256 digest computed in step 1.
-			if !foundACMEId {
-				return fmt.Errorf("server under test returned a certificate without the required acmeIdentifier extension")
-			}
-
-			// Remove the handled critical extension and validate that we
-			// have no additional critical extensions left unhandled.
-			var index int = -1
-			for oidIndex, oid := range cert.UnhandledCriticalExtensions {
-				if oid.Equal(OIDACMEIdentifier) {
-					index = oidIndex
-					break
-				}
-			}
-			if index != -1 {
-				// Unlike the foundACMEId case, this is not a failure; if Go
-				// updates to "understand" this critical extension, we do not
-				// wish to fail.
-				cert.UnhandledCriticalExtensions = append(cert.UnhandledCriticalExtensions[0:index], cert.UnhandledCriticalExtensions[index+1:]...)
-			}
-			if len(cert.UnhandledCriticalExtensions) > 0 {
-				return fmt.Errorf("server under test returned a certificate with additional unknown critical extensions (%v)", cert.UnhandledCriticalExtensions)
-			}
-
-			// All good!
-			return nil
-		},
-
-		// We never want to resume a connection; do not provide session
-		// cache storage.
-		ClientSessionCache: nil,
-
-		// Do not trust any system trusted certificates; we're going to be
-		// manually validating the chain, so specifying a non-empty pool
-		// here could only cause additional, unnecessary work.
-		RootCAs: x509.NewCertPool(),
-
-		// Do not bother validating the client's chain; we know it should be
-		// self-signed. This also disables hostname verification, but we do
-		// this verification as part of VerifyConnection(...) ourselves.
-		//
-		// Per Go docs, this option is only safe in conjunction with
-		// VerifyConnection which we define above.
-		InsecureSkipVerify: true,
-
-		// RFC 8737 Section 4. acme-tls/1 Protocol Definition:
-		//
-		// > ACME servers that implement "acme-tls/1" MUST only negotiate
-		// > TLS 1.2 [RFC5246] or higher when connecting to clients for
-		// > validation.
-		MinVersion: tls.VersionTLS12,
-
-		// While RFC 8737 does not place restrictions around allowed cipher
-		// suites, we wish to restrict ourselves to secure defaults. Specify
-		// the Intermediate guideline from Mozilla's TLS config generator to
-		// disable obviously weak ciphers.
-		//
-		// See also: https://ssl-config.mozilla.org/#server=go&version=1.14.4&config=intermediate&guideline=5.7
-		CipherSuites: []uint16{
-			tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
-			tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
-			tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
-			tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
-			tls.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,
-			tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,
-		},
-	}
-
-	// Build a dialer using our custom DNS resolver, to ensure domains get
-	// resolved according to configuration.
-	dialer, err := buildDialerConfig(config)
-	if err != nil {
-		return false, fmt.Errorf("failed to build dialer: %w", err)
-	}
-
-	// Per RFC 8737 Section 3. TLS with Application-Layer Protocol
-	// Negotiation (TLS ALPN) Challenge:
-	//
-	// > 2. The ACME server resolves the domain name being validated and
-	// >    chooses one of the IP addresses returned for validation (the
-	// >    server MAY validate against multiple addresses if more than
-	// >    one is returned).
-	// > 3. The ACME server initiates a TLS connection to the chosen IP
-	// >    address. This connection MUST use TCP port 443.
-	address := fmt.Sprintf("%v:"+ALPNPort, domain)
-	conn, err := dialer.Dial("tcp", address)
-	if err != nil {
-		return false, fmt.Errorf("tls-alpn-01: failed to dial host: %w", err)
-	}
-
-	// Initiate the connection to the remote peer.
-	client := tls.Client(conn, cfg)
-
-	// We intentionally swallow this error as it isn't useful to the
-	// underlying protocol we perform here. Notably, per RFC 8737
-	// Section 4. acme-tls/1 Protocol Definition:
-	//
-	// > Once the handshake is completed, the client MUST NOT exchange
-	// > any further data with the server and MUST immediately close the
-	// > connection. ... Because of this, an ACME server MAY choose to
-	// > withhold authorization if either the certificate signature is
-	// > invalid or the handshake doesn't fully complete.
-	defer client.Close()
-
-	// We wish to put time bounds on the total time the handshake can
-	// stall for, so build a connection context here.
-	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
-	defer cancel()
-
-	// See note above about why we can allow Handshake to complete
-	// successfully.
-	if err := client.HandshakeContext(ctx); err != nil {
-		return false, fmt.Errorf("tls-alpn-01: failed to perform handshake: %w", err)
-	}
-	return true, nil
-}
diff --git a/builtin/logical/pki/acme_challenges_test.go b/builtin/logical/pki/acme_challenges_test.go
deleted file mode 100644
index 3bcdf88141d79..0000000000000
--- a/builtin/logical/pki/acme_challenges_test.go
+++ /dev/null
@@ -1,703 +0,0 @@
-package pki
-
-import (
-	"context"
-	"crypto"
-	"crypto/ecdsa"
-	"crypto/elliptic"
-	"crypto/rand"
-	"crypto/sha256"
-	"crypto/tls"
-	"crypto/x509"
-	"crypto/x509/pkix"
-	"encoding/base64"
-	"fmt"
-	"math/big"
-	"net/http"
-	"net/http/httptest"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/hashicorp/vault/builtin/logical/pki/dnstest"
-
-	"github.com/stretchr/testify/require"
-)
-
-type keyAuthorizationTestCase struct {
-	keyAuthz   string
-	token      string
-	thumbprint string
-	shouldFail bool
-}
-
-var keyAuthorizationTestCases = []keyAuthorizationTestCase{
-	{
-		// Entirely empty
-		"",
-		"non-empty-token",
-		"non-empty-thumbprint",
-		true,
-	},
-	{
-		// Both empty
-		".",
-		"non-empty-token",
-		"non-empty-thumbprint",
-		true,
-	},
-	{
-		// Not equal
-		"non-.non-",
-		"non-empty-token",
-		"non-empty-thumbprint",
-		true,
-	},
-	{
-		// Empty thumbprint
-		"non-.",
-		"non-empty-token",
-		"non-empty-thumbprint",
-		true,
-	},
-	{
-		// Empty token
-		".non-",
-		"non-empty-token",
-		"non-empty-thumbprint",
-		true,
-	},
-	{
-		// Wrong order
-		"non-empty-thumbprint.non-empty-token",
-		"non-empty-token",
-		"non-empty-thumbprint",
-		true,
-	},
-	{
-		// Too many pieces
-		"one.two.three",
-		"non-empty-token",
-		"non-empty-thumbprint",
-		true,
-	},
-	{
-		// Valid
-		"non-empty-token.non-empty-thumbprint",
-		"non-empty-token",
-		"non-empty-thumbprint",
-		false,
-	},
-}
-
-func TestAcmeValidateKeyAuthorization(t *testing.T) {
-	t.Parallel()
-
-	for index, tc := range keyAuthorizationTestCases {
-		isValid, err := ValidateKeyAuthorization(tc.keyAuthz, tc.token, tc.thumbprint)
-		if !isValid && err == nil {
-			t.Fatalf("[%d] expected failure to give reason via err (%v / %v)", index, isValid, err)
-		}
-
-		expectedValid := !tc.shouldFail
-		if expectedValid != isValid {
-			t.Fatalf("[%d] got ret=%v, expected ret=%v (shouldFail=%v)", index, isValid, expectedValid, tc.shouldFail)
-		}
-	}
-}
-
-func TestAcmeValidateHTTP01Challenge(t *testing.T) {
-	t.Parallel()
-
-	for index, tc := range keyAuthorizationTestCases {
-		validFunc := func(w http.ResponseWriter, r *http.Request) {
-			w.Write([]byte(tc.keyAuthz))
-		}
-		withPadding := func(w http.ResponseWriter, r *http.Request) {
-			w.Write([]byte("  " + tc.keyAuthz + "     "))
-		}
-		withRedirect := func(w http.ResponseWriter, r *http.Request) {
-			if strings.Contains(r.URL.Path, "/.well-known/") {
-				http.Redirect(w, r, "/my-http-01-challenge-response", 301)
-				return
-			}
-
-			w.Write([]byte(tc.keyAuthz))
-		}
-		withSleep := func(w http.ResponseWriter, r *http.Request) {
-			// Long enough to ensure any excessively short timeouts are hit,
-			// not long enough to trigger a failure (hopefully).
-			time.Sleep(5 * time.Second)
-			w.Write([]byte(tc.keyAuthz))
-		}
-
-		validHandlers := []http.HandlerFunc{
-			http.HandlerFunc(validFunc), http.HandlerFunc(withPadding),
-			http.HandlerFunc(withRedirect), http.HandlerFunc(withSleep),
-		}
-
-		for handlerIndex, handler := range validHandlers {
-			func() {
-				ts := httptest.NewServer(handler)
-				defer ts.Close()
-
-				host := ts.URL[7:]
-				isValid, err := ValidateHTTP01Challenge(host, tc.token, tc.thumbprint, &acmeConfigEntry{})
-				if !isValid && err == nil {
-					t.Fatalf("[tc=%d/handler=%d] expected failure to give reason via err (%v / %v)", index, handlerIndex, isValid, err)
-				}
-
-				expectedValid := !tc.shouldFail
-				if expectedValid != isValid {
-					t.Fatalf("[tc=%d/handler=%d] got ret=%v (err=%v), expected ret=%v (shouldFail=%v)", index, handlerIndex, isValid, err, expectedValid, tc.shouldFail)
-				}
-			}()
-		}
-	}
-
-	// Negative test cases for various HTTP-specific scenarios.
-	redirectLoop := func(w http.ResponseWriter, r *http.Request) {
-		http.Redirect(w, r, "/my-http-01-challenge-response", 301)
-	}
-	publicRedirect := func(w http.ResponseWriter, r *http.Request) {
-		http.Redirect(w, r, "http://hashicorp.com/", 301)
-	}
-	noData := func(w http.ResponseWriter, r *http.Request) {}
-	noContent := func(w http.ResponseWriter, r *http.Request) {
-		w.WriteHeader(http.StatusNoContent)
-	}
-	notFound := func(w http.ResponseWriter, r *http.Request) {
-		w.WriteHeader(http.StatusNotFound)
-	}
-	simulateHang := func(w http.ResponseWriter, r *http.Request) {
-		time.Sleep(30 * time.Second)
-		w.Write([]byte("my-token.my-thumbprint"))
-	}
-	tooLarge := func(w http.ResponseWriter, r *http.Request) {
-		for i := 0; i < 512; i++ {
-			w.Write([]byte("my-token.my-thumbprint\n"))
-		}
-	}
-
-	validHandlers := []http.HandlerFunc{
-		http.HandlerFunc(redirectLoop), http.HandlerFunc(publicRedirect),
-		http.HandlerFunc(noData), http.HandlerFunc(noContent),
-		http.HandlerFunc(notFound), http.HandlerFunc(simulateHang),
-		http.HandlerFunc(tooLarge),
-	}
-	for handlerIndex, handler := range validHandlers {
-		func() {
-			ts := httptest.NewServer(handler)
-			defer ts.Close()
-
-			host := ts.URL[7:]
-			isValid, err := ValidateHTTP01Challenge(host, "my-token", "my-thumbprint", &acmeConfigEntry{})
-			if isValid || err == nil {
-				t.Fatalf("[handler=%d] expected failure validating challenge (%v / %v)", handlerIndex, isValid, err)
-			}
-		}()
-	}
-}
-
-func TestAcmeValidateDNS01Challenge(t *testing.T) {
-	t.Parallel()
-
-	host := "dadgarcorp.com"
-	resolver := dnstest.SetupResolver(t, host)
-	defer resolver.Cleanup()
-
-	t.Logf("DNS Server Address: %v", resolver.GetLocalAddr())
-
-	config := &acmeConfigEntry{
-		DNSResolver: resolver.GetLocalAddr(),
-	}
-
-	for index, tc := range keyAuthorizationTestCases {
-		checksum := sha256.Sum256([]byte(tc.keyAuthz))
-		authz := base64.RawURLEncoding.EncodeToString(checksum[:])
-		resolver.AddRecord(DNSChallengePrefix+host, "TXT", authz)
-		resolver.PushConfig()
-
-		isValid, err := ValidateDNS01Challenge(host, tc.token, tc.thumbprint, config)
-		if !isValid && err == nil {
-			t.Fatalf("[tc=%d] expected failure to give reason via err (%v / %v)", index, isValid, err)
-		}
-
-		expectedValid := !tc.shouldFail
-		if expectedValid != isValid {
-			t.Fatalf("[tc=%d] got ret=%v (err=%v), expected ret=%v (shouldFail=%v)", index, isValid, err, expectedValid, tc.shouldFail)
-		}
-
-		resolver.RemoveAllRecords()
-	}
-}
-
-func TestAcmeValidateTLSALPN01Challenge(t *testing.T) {
-	// This test is not parallel because we modify ALPNPort to use a custom
-	// non-standard port _just for testing purposes_.
-	host := "localhost"
-	config := &acmeConfigEntry{}
-
-	returnedProtocols := []string{ALPNProtocol}
-	var certificates []*x509.Certificate
-	var privateKey crypto.PrivateKey
-
-	tlsCfg := &tls.Config{}
-	tlsCfg.GetConfigForClient = func(*tls.ClientHelloInfo) (*tls.Config, error) {
-		var retCfg tls.Config = *tlsCfg
-		retCfg.NextProtos = returnedProtocols
-		t.Logf("[alpn-server] returned protocol: %v", returnedProtocols)
-		return &retCfg, nil
-	}
-	tlsCfg.GetCertificate = func(*tls.ClientHelloInfo) (*tls.Certificate, error) {
-		var ret tls.Certificate
-		for index, cert := range certificates {
-			ret.Certificate = append(ret.Certificate, cert.Raw)
-			if index == 0 {
-				ret.Leaf = cert
-			}
-		}
-		ret.PrivateKey = privateKey
-		t.Logf("[alpn-server] returned certificates: %v", ret)
-		return &ret, nil
-	}
-
-	ln, err := tls.Listen("tcp", host+":0", tlsCfg)
-	require.NoError(t, err, "failed to listen with TLS config")
-
-	doOneAccept := func() {
-		t.Logf("[alpn-server] starting accept...")
-		connRaw, err := ln.Accept()
-		require.NoError(t, err, "failed to accept TLS connection")
-
-		t.Logf("[alpn-server] got connection...")
-		conn := tls.Server(connRaw.(*tls.Conn), tlsCfg)
-
-		ctx, cancel := context.WithTimeout(context.Background(), 1*time.Minute)
-		defer func() {
-			t.Logf("[alpn-server] defer context cancel executing")
-			cancel()
-		}()
-
-		t.Logf("[alpn-server] starting handshake...")
-		if err := conn.HandshakeContext(ctx); err != nil {
-			t.Logf("[alpn-server] got non-fatal error while handshaking connection: %v", err)
-		}
-
-		t.Logf("[alpn-server] closing connection...")
-		if err := conn.Close(); err != nil {
-			t.Logf("[alpn-server] got non-fatal error while closing connection: %v", err)
-		}
-	}
-
-	ALPNPort = strings.Split(ln.Addr().String(), ":")[1]
-
-	type alpnTestCase struct {
-		name         string
-		certificates []*x509.Certificate
-		privateKey   crypto.PrivateKey
-		protocols    []string
-		token        string
-		thumbprint   string
-		shouldFail   bool
-	}
-
-	var alpnTestCases []alpnTestCase
-	// Add all of our keyAuthorizationTestCases into alpnTestCases
-	for index, tc := range keyAuthorizationTestCases {
-		t.Logf("using keyAuthorizationTestCase [tc=%d] as alpnTestCase [tc=%d]...", index, len(alpnTestCases))
-		// Properly encode the authorization.
-		checksum := sha256.Sum256([]byte(tc.keyAuthz))
-		authz := base64.RawURLEncoding.EncodeToString(checksum[:])
-
-		// Build a self-signed certificate.
-		key, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
-		require.NoError(t, err, "failed generating private key")
-		tmpl := &x509.Certificate{
-			Subject: pkix.Name{
-				CommonName: host,
-			},
-			Issuer: pkix.Name{
-				CommonName: host,
-			},
-			KeyUsage:     x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign,
-			ExtKeyUsage:  []x509.ExtKeyUsage{x509.ExtKeyUsageAny},
-			PublicKey:    key.Public(),
-			SerialNumber: big.NewInt(1),
-			DNSNames:     []string{host},
-			ExtraExtensions: []pkix.Extension{
-				{
-					Id:       OIDACMEIdentifier,
-					Critical: true,
-					Value:    []byte(authz),
-				},
-			},
-			BasicConstraintsValid: true,
-			IsCA:                  true,
-		}
-		certBytes, err := x509.CreateCertificate(rand.Reader, tmpl, tmpl, key.Public(), key)
-		require.NoError(t, err, "failed to create certificate")
-		cert, err := x509.ParseCertificate(certBytes)
-		require.NoError(t, err, "failed to parse newly generated certificate")
-
-		newTc := alpnTestCase{
-			name:         fmt.Sprintf("keyAuthorizationTestCase[%d]", index),
-			certificates: []*x509.Certificate{cert},
-			privateKey:   key,
-			protocols:    []string{ALPNProtocol},
-			token:        tc.token,
-			thumbprint:   tc.thumbprint,
-			shouldFail:   tc.shouldFail,
-		}
-		alpnTestCases = append(alpnTestCases, newTc)
-	}
-
-	{
-		// Test case: Longer chain
-		// Build a self-signed certificate.
-		rootKey, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
-		require.NoError(t, err, "failed generating root private key")
-		tmpl := &x509.Certificate{
-			Subject: pkix.Name{
-				CommonName: "Root CA",
-			},
-			Issuer: pkix.Name{
-				CommonName: "Root CA",
-			},
-			KeyUsage:              x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign,
-			ExtKeyUsage:           []x509.ExtKeyUsage{x509.ExtKeyUsageAny},
-			PublicKey:             rootKey.Public(),
-			SerialNumber:          big.NewInt(1),
-			BasicConstraintsValid: true,
-			IsCA:                  true,
-		}
-		rootCertBytes, err := x509.CreateCertificate(rand.Reader, tmpl, tmpl, rootKey.Public(), rootKey)
-		require.NoError(t, err, "failed to create root certificate")
-		rootCert, err := x509.ParseCertificate(rootCertBytes)
-		require.NoError(t, err, "failed to parse newly generated root certificate")
-
-		// Compute our authorization.
-		checksum := sha256.Sum256([]byte("valid.valid"))
-		authz := base64.RawURLEncoding.EncodeToString(checksum[:])
-
-		// Build a leaf certificate which _could_ pass validation
-		key, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
-		require.NoError(t, err, "failed generating leaf private key")
-		tmpl = &x509.Certificate{
-			Subject: pkix.Name{
-				CommonName: host,
-			},
-			Issuer: pkix.Name{
-				CommonName: "Root CA",
-			},
-			KeyUsage:     x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign,
-			ExtKeyUsage:  []x509.ExtKeyUsage{x509.ExtKeyUsageAny},
-			PublicKey:    key.Public(),
-			SerialNumber: big.NewInt(2),
-			DNSNames:     []string{host},
-			ExtraExtensions: []pkix.Extension{
-				{
-					Id:       OIDACMEIdentifier,
-					Critical: true,
-					Value:    []byte(authz),
-				},
-			},
-			BasicConstraintsValid: true,
-			IsCA:                  true,
-		}
-		certBytes, err := x509.CreateCertificate(rand.Reader, tmpl, rootCert, key.Public(), rootKey)
-		require.NoError(t, err, "failed to create leaf certificate")
-		cert, err := x509.ParseCertificate(certBytes)
-		require.NoError(t, err, "failed to parse newly generated leaf certificate")
-
-		newTc := alpnTestCase{
-			name:         "longer chain with valid leaf",
-			certificates: []*x509.Certificate{cert, rootCert},
-			privateKey:   key,
-			protocols:    []string{ALPNProtocol},
-			token:        "valid",
-			thumbprint:   "valid",
-			shouldFail:   true,
-		}
-		alpnTestCases = append(alpnTestCases, newTc)
-	}
-
-	{
-		// Test case: cert without DNSSan
-		// Compute our authorization.
-		checksum := sha256.Sum256([]byte("valid.valid"))
-		authz := base64.RawURLEncoding.EncodeToString(checksum[:])
-
-		// Build a leaf certificate without a DNSSan
-		key, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
-		require.NoError(t, err, "failed generating leaf private key")
-		tmpl := &x509.Certificate{
-			Subject: pkix.Name{
-				CommonName: host,
-			},
-			Issuer: pkix.Name{
-				CommonName: host,
-			},
-			KeyUsage:     x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign,
-			ExtKeyUsage:  []x509.ExtKeyUsage{x509.ExtKeyUsageAny},
-			PublicKey:    key.Public(),
-			SerialNumber: big.NewInt(2),
-			// NO DNSNames
-			ExtraExtensions: []pkix.Extension{
-				{
-					Id:       OIDACMEIdentifier,
-					Critical: true,
-					Value:    []byte(authz),
-				},
-			},
-			BasicConstraintsValid: true,
-			IsCA:                  true,
-		}
-		certBytes, err := x509.CreateCertificate(rand.Reader, tmpl, tmpl, key.Public(), key)
-		require.NoError(t, err, "failed to create leaf certificate")
-		cert, err := x509.ParseCertificate(certBytes)
-		require.NoError(t, err, "failed to parse newly generated leaf certificate")
-
-		newTc := alpnTestCase{
-			name:         "valid keyauthz without valid dnsname",
-			certificates: []*x509.Certificate{cert},
-			privateKey:   key,
-			protocols:    []string{ALPNProtocol},
-			token:        "valid",
-			thumbprint:   "valid",
-			shouldFail:   true,
-		}
-		alpnTestCases = append(alpnTestCases, newTc)
-	}
-
-	{
-		// Test case: cert without matching DNSSan
-		// Compute our authorization.
-		checksum := sha256.Sum256([]byte("valid.valid"))
-		authz := base64.RawURLEncoding.EncodeToString(checksum[:])
-
-		// Build a leaf certificate which fails validation due to bad DNSName
-		key, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
-		require.NoError(t, err, "failed generating leaf private key")
-		tmpl := &x509.Certificate{
-			Subject: pkix.Name{
-				CommonName: host,
-			},
-			Issuer: pkix.Name{
-				CommonName: host,
-			},
-			KeyUsage:     x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign,
-			ExtKeyUsage:  []x509.ExtKeyUsage{x509.ExtKeyUsageAny},
-			PublicKey:    key.Public(),
-			SerialNumber: big.NewInt(2),
-			DNSNames:     []string{host + ".dadgarcorp.com" /* not matching host! */},
-			ExtraExtensions: []pkix.Extension{
-				{
-					Id:       OIDACMEIdentifier,
-					Critical: true,
-					Value:    []byte(authz),
-				},
-			},
-			BasicConstraintsValid: true,
-			IsCA:                  true,
-		}
-		certBytes, err := x509.CreateCertificate(rand.Reader, tmpl, tmpl, key.Public(), key)
-		require.NoError(t, err, "failed to create leaf certificate")
-		cert, err := x509.ParseCertificate(certBytes)
-		require.NoError(t, err, "failed to parse newly generated leaf certificate")
-
-		newTc := alpnTestCase{
-			name:         "valid keyauthz without matching dnsname",
-			certificates: []*x509.Certificate{cert},
-			privateKey:   key,
-			protocols:    []string{ALPNProtocol},
-			token:        "valid",
-			thumbprint:   "valid",
-			shouldFail:   true,
-		}
-		alpnTestCases = append(alpnTestCases, newTc)
-	}
-
-	{
-		// Test case: cert with additional SAN
-		// Compute our authorization.
-		checksum := sha256.Sum256([]byte("valid.valid"))
-		authz := base64.RawURLEncoding.EncodeToString(checksum[:])
-
-		// Build a leaf certificate which has an invalid additional SAN
-		key, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
-		require.NoError(t, err, "failed generating leaf private key")
-		tmpl := &x509.Certificate{
-			Subject: pkix.Name{
-				CommonName: host,
-			},
-			Issuer: pkix.Name{
-				CommonName: host,
-			},
-			KeyUsage:       x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign,
-			ExtKeyUsage:    []x509.ExtKeyUsage{x509.ExtKeyUsageAny},
-			PublicKey:      key.Public(),
-			SerialNumber:   big.NewInt(2),
-			DNSNames:       []string{host},
-			EmailAddresses: []string{"webmaster@" + host}, /* unexpected */
-			ExtraExtensions: []pkix.Extension{
-				{
-					Id:       OIDACMEIdentifier,
-					Critical: true,
-					Value:    []byte(authz),
-				},
-			},
-			BasicConstraintsValid: true,
-			IsCA:                  true,
-		}
-		certBytes, err := x509.CreateCertificate(rand.Reader, tmpl, tmpl, key.Public(), key)
-		require.NoError(t, err, "failed to create leaf certificate")
-		cert, err := x509.ParseCertificate(certBytes)
-		require.NoError(t, err, "failed to parse newly generated leaf certificate")
-
-		newTc := alpnTestCase{
-			name:         "valid keyauthz with additional email SANs",
-			certificates: []*x509.Certificate{cert},
-			privateKey:   key,
-			protocols:    []string{ALPNProtocol},
-			token:        "valid",
-			thumbprint:   "valid",
-			shouldFail:   true,
-		}
-		alpnTestCases = append(alpnTestCases, newTc)
-	}
-
-	{
-		// Test case: cert without CN
-		// Compute our authorization.
-		checksum := sha256.Sum256([]byte("valid.valid"))
-		authz := base64.RawURLEncoding.EncodeToString(checksum[:])
-
-		// Build a leaf certificate which should pass validation
-		key, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
-		require.NoError(t, err, "failed generating leaf private key")
-		tmpl := &x509.Certificate{
-			Subject:      pkix.Name{},
-			Issuer:       pkix.Name{},
-			KeyUsage:     x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign,
-			ExtKeyUsage:  []x509.ExtKeyUsage{x509.ExtKeyUsageAny},
-			PublicKey:    key.Public(),
-			SerialNumber: big.NewInt(2),
-			DNSNames:     []string{host},
-			ExtraExtensions: []pkix.Extension{
-				{
-					Id:       OIDACMEIdentifier,
-					Critical: true,
-					Value:    []byte(authz),
-				},
-			},
-			BasicConstraintsValid: true,
-			IsCA:                  true,
-		}
-		certBytes, err := x509.CreateCertificate(rand.Reader, tmpl, tmpl, key.Public(), key)
-		require.NoError(t, err, "failed to create leaf certificate")
-		cert, err := x509.ParseCertificate(certBytes)
-		require.NoError(t, err, "failed to parse newly generated leaf certificate")
-
-		newTc := alpnTestCase{
-			name:         "valid certificate; no Subject/Issuer (missing CN)",
-			certificates: []*x509.Certificate{cert},
-			privateKey:   key,
-			protocols:    []string{ALPNProtocol},
-			token:        "valid",
-			thumbprint:   "valid",
-			shouldFail:   false,
-		}
-		alpnTestCases = append(alpnTestCases, newTc)
-	}
-
-	{
-		// Test case: cert without the extension
-		// Build a leaf certificate which should fail validation
-		key, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
-		require.NoError(t, err, "failed generating leaf private key")
-		tmpl := &x509.Certificate{
-			Subject:               pkix.Name{},
-			Issuer:                pkix.Name{},
-			KeyUsage:              x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign,
-			ExtKeyUsage:           []x509.ExtKeyUsage{x509.ExtKeyUsageAny},
-			PublicKey:             key.Public(),
-			SerialNumber:          big.NewInt(1),
-			DNSNames:              []string{host},
-			BasicConstraintsValid: true,
-			IsCA:                  true,
-		}
-		certBytes, err := x509.CreateCertificate(rand.Reader, tmpl, tmpl, key.Public(), key)
-		require.NoError(t, err, "failed to create leaf certificate")
-		cert, err := x509.ParseCertificate(certBytes)
-		require.NoError(t, err, "failed to parse newly generated leaf certificate")
-
-		newTc := alpnTestCase{
-			name:         "missing required acmeIdentifier extension",
-			certificates: []*x509.Certificate{cert},
-			privateKey:   key,
-			protocols:    []string{ALPNProtocol},
-			token:        "valid",
-			thumbprint:   "valid",
-			shouldFail:   true,
-		}
-		alpnTestCases = append(alpnTestCases, newTc)
-	}
-
-	{
-		// Test case: root without a leaf
-		// Build a self-signed certificate.
-		rootKey, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
-		require.NoError(t, err, "failed generating root private key")
-		tmpl := &x509.Certificate{
-			Subject: pkix.Name{
-				CommonName: "Root CA",
-			},
-			Issuer: pkix.Name{
-				CommonName: "Root CA",
-			},
-			KeyUsage:              x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign,
-			ExtKeyUsage:           []x509.ExtKeyUsage{x509.ExtKeyUsageAny},
-			PublicKey:             rootKey.Public(),
-			SerialNumber:          big.NewInt(1),
-			BasicConstraintsValid: true,
-			IsCA:                  true,
-		}
-		rootCertBytes, err := x509.CreateCertificate(rand.Reader, tmpl, tmpl, rootKey.Public(), rootKey)
-		require.NoError(t, err, "failed to create root certificate")
-		rootCert, err := x509.ParseCertificate(rootCertBytes)
-		require.NoError(t, err, "failed to parse newly generated root certificate")
-
-		newTc := alpnTestCase{
-			name:         "root without leaf",
-			certificates: []*x509.Certificate{rootCert},
-			privateKey:   rootKey,
-			protocols:    []string{ALPNProtocol},
-			token:        "valid",
-			thumbprint:   "valid",
-			shouldFail:   true,
-		}
-		alpnTestCases = append(alpnTestCases, newTc)
-	}
-
-	for index, tc := range alpnTestCases {
-		t.Logf("\n\n[tc=%d/name=%s] starting validation", index, tc.name)
-		certificates = tc.certificates
-		privateKey = tc.privateKey
-		returnedProtocols = tc.protocols
-
-		// Attempt to validate the challenge.
-		go doOneAccept()
-		isValid, err := ValidateTLSALPN01Challenge(host, tc.token, tc.thumbprint, config)
-		if !isValid && err == nil {
-			t.Fatalf("[tc=%d/name=%s] expected failure to give reason via err (%v / %v)", index, tc.name, isValid, err)
-		}
-
-		expectedValid := !tc.shouldFail
-		if expectedValid != isValid {
-			t.Fatalf("[tc=%d/name=%s] got ret=%v (err=%v), expected ret=%v (shouldFail=%v)", index, tc.name, isValid, err, expectedValid, tc.shouldFail)
-		} else if err != nil {
-			t.Logf("[tc=%d/name=%s] got expected failure: err=%v", index, tc.name, err)
-		}
-	}
-}
diff --git a/builtin/logical/pki/acme_eab_policy.go b/builtin/logical/pki/acme_eab_policy.go
deleted file mode 100644
index 9a96f3af269e5..0000000000000
--- a/builtin/logical/pki/acme_eab_policy.go
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package pki
-
-import (
-	"fmt"
-	"strings"
-)
-
-type EabPolicyName string
-
-const (
-	eabPolicyNotRequired        EabPolicyName = "not-required"
-	eabPolicyNewAccountRequired EabPolicyName = "new-account-required"
-	eabPolicyAlwaysRequired     EabPolicyName = "always-required"
-)
-
-func getEabPolicyByString(name string) (EabPolicy, error) {
-	lcName := strings.TrimSpace(strings.ToLower(name))
-	switch lcName {
-	case string(eabPolicyNotRequired):
-		return getEabPolicyByName(eabPolicyNotRequired), nil
-	case string(eabPolicyNewAccountRequired):
-		return getEabPolicyByName(eabPolicyNewAccountRequired), nil
-	case string(eabPolicyAlwaysRequired):
-		return getEabPolicyByName(eabPolicyAlwaysRequired), nil
-	default:
-		return getEabPolicyByName(eabPolicyAlwaysRequired), fmt.Errorf("unknown eab policy name: %s", name)
-	}
-}
-
-func getEabPolicyByName(name EabPolicyName) EabPolicy {
-	return EabPolicy{Name: name}
-}
-
-type EabPolicy struct {
-	Name EabPolicyName
-}
-
-// EnforceForNewAccount for new account creations, should we require an EAB.
-func (ep EabPolicy) EnforceForNewAccount(eabData *eabType) error {
-	if (ep.Name == eabPolicyAlwaysRequired || ep.Name == eabPolicyNewAccountRequired) && eabData == nil {
-		return ErrExternalAccountRequired
-	}
-
-	return nil
-}
-
-// EnforceForExistingAccount for all operations within ACME, does the account being used require an EAB attached to it.
-func (ep EabPolicy) EnforceForExistingAccount(account *acmeAccount) error {
-	if ep.Name == eabPolicyAlwaysRequired && account.Eab == nil {
-		return ErrExternalAccountRequired
-	}
-
-	return nil
-}
-
-// IsExternalAccountRequired for new accounts incoming does is an EAB required
-func (ep EabPolicy) IsExternalAccountRequired() bool {
-	return ep.Name == eabPolicyAlwaysRequired || ep.Name == eabPolicyNewAccountRequired
-}
-
-// OverrideEnvDisablingPublicAcme determines if ACME is enabled but the OS environment variable
-// has said to disable public acme support, if we can override that environment variable to
-// turn on ACME support
-func (ep EabPolicy) OverrideEnvDisablingPublicAcme() bool {
-	return ep.Name == eabPolicyAlwaysRequired
-}
diff --git a/builtin/logical/pki/acme_errors.go b/builtin/logical/pki/acme_errors.go
deleted file mode 100644
index 5b73d9d215e0b..0000000000000
--- a/builtin/logical/pki/acme_errors.go
+++ /dev/null
@@ -1,210 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package pki
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"net/http"
-
-	"github.com/hashicorp/go-multierror"
-	"github.com/hashicorp/vault/sdk/logical"
-)
-
-// Error prefix; see RFC 8555 Section 6.7. Errors.
-const ErrorPrefix = "urn:ietf:params:acme:error:"
-const ErrorContentType = "application/problem+json"
-
-// See RFC 8555 Section 6.7. Errors.
-var ErrAccountDoesNotExist = errors.New("The request specified an account that does not exist")
-
-var ErrAcmeDisabled = errors.New("ACME feature is disabled")
-
-var (
-	ErrAlreadyRevoked          = errors.New("The request specified a certificate to be revoked that has already been revoked")
-	ErrBadCSR                  = errors.New("The CSR is unacceptable")
-	ErrBadNonce                = errors.New("The client sent an unacceptable anti-replay nonce")
-	ErrBadPublicKey            = errors.New("The JWS was signed by a public key the server does not support")
-	ErrBadRevocationReason     = errors.New("The revocation reason provided is not allowed by the server")
-	ErrBadSignatureAlgorithm   = errors.New("The JWS was signed with an algorithm the server does not support")
-	ErrCAA                     = errors.New("Certification Authority Authorization (CAA) records forbid the CA from issuing a certificate")
-	ErrCompound                = errors.New("Specific error conditions are indicated in the 'subproblems' array")
-	ErrConnection              = errors.New("The server could not connect to validation target")
-	ErrDNS                     = errors.New("There was a problem with a DNS query during identifier validation")
-	ErrExternalAccountRequired = errors.New("The request must include a value for the 'externalAccountBinding' field")
-	ErrIncorrectResponse       = errors.New("Response received didn't match the challenge's requirements")
-	ErrInvalidContact          = errors.New("A contact URL for an account was invalid")
-	ErrMalformed               = errors.New("The request message was malformed")
-	ErrOrderNotReady           = errors.New("The request attempted to finalize an order that is not ready to be finalized")
-	ErrRateLimited             = errors.New("The request exceeds a rate limit")
-	ErrRejectedIdentifier      = errors.New("The server will not issue certificates for the identifier")
-	ErrServerInternal          = errors.New("The server experienced an internal error")
-	ErrTLS                     = errors.New("The server received a TLS error during validation")
-	ErrUnauthorized            = errors.New("The client lacks sufficient authorization")
-	ErrUnsupportedContact      = errors.New("A contact URL for an account used an unsupported protocol scheme")
-	ErrUnsupportedIdentifier   = errors.New("An identifier is of an unsupported type")
-	ErrUserActionRequired      = errors.New("Visit the 'instance' URL and take actions specified there")
-)
-
-// Mapping of err->name; see table in RFC 8555 Section 6.7. Errors.
-var errIdMappings = map[error]string{
-	ErrAccountDoesNotExist:     "accountDoesNotExist",
-	ErrAlreadyRevoked:          "alreadyRevoked",
-	ErrBadCSR:                  "badCSR",
-	ErrBadNonce:                "badNonce",
-	ErrBadPublicKey:            "badPublicKey",
-	ErrBadRevocationReason:     "badRevocationReason",
-	ErrBadSignatureAlgorithm:   "badSignatureAlgorithm",
-	ErrCAA:                     "caa",
-	ErrCompound:                "compound",
-	ErrConnection:              "connection",
-	ErrDNS:                     "dns",
-	ErrExternalAccountRequired: "externalAccountRequired",
-	ErrIncorrectResponse:       "incorrectResponse",
-	ErrInvalidContact:          "invalidContact",
-	ErrMalformed:               "malformed",
-	ErrOrderNotReady:           "orderNotReady",
-	ErrRateLimited:             "rateLimited",
-	ErrRejectedIdentifier:      "rejectedIdentifier",
-	ErrServerInternal:          "serverInternal",
-	ErrTLS:                     "tls",
-	ErrUnauthorized:            "unauthorized",
-	ErrUnsupportedContact:      "unsupportedContact",
-	ErrUnsupportedIdentifier:   "unsupportedIdentifier",
-	ErrUserActionRequired:      "userActionRequired",
-}
-
-// Mapping of err->status codes; see table in RFC 8555 Section 6.7. Errors.
-var errCodeMappings = map[error]int{
-	ErrAccountDoesNotExist:     http.StatusBadRequest, // See RFC 8555 Section 7.3.1. Finding an Account URL Given a Key.
-	ErrAlreadyRevoked:          http.StatusBadRequest,
-	ErrBadCSR:                  http.StatusBadRequest,
-	ErrBadNonce:                http.StatusBadRequest,
-	ErrBadPublicKey:            http.StatusBadRequest,
-	ErrBadRevocationReason:     http.StatusBadRequest,
-	ErrBadSignatureAlgorithm:   http.StatusBadRequest,
-	ErrCAA:                     http.StatusForbidden,
-	ErrCompound:                http.StatusBadRequest,
-	ErrConnection:              http.StatusInternalServerError,
-	ErrDNS:                     http.StatusInternalServerError,
-	ErrExternalAccountRequired: http.StatusUnauthorized,
-	ErrIncorrectResponse:       http.StatusBadRequest,
-	ErrInvalidContact:          http.StatusBadRequest,
-	ErrMalformed:               http.StatusBadRequest,
-	ErrOrderNotReady:           http.StatusForbidden, // See RFC 8555 Section 7.4. Applying for Certificate Issuance.
-	ErrRateLimited:             http.StatusTooManyRequests,
-	ErrRejectedIdentifier:      http.StatusBadRequest,
-	ErrServerInternal:          http.StatusInternalServerError,
-	ErrTLS:                     http.StatusInternalServerError,
-	ErrUnauthorized:            http.StatusUnauthorized,
-	ErrUnsupportedContact:      http.StatusBadRequest,
-	ErrUnsupportedIdentifier:   http.StatusBadRequest,
-	ErrUserActionRequired:      http.StatusUnauthorized,
-}
-
-type ErrorResponse struct {
-	StatusCode  int              `json:"-"`
-	Type        string           `json:"type"`
-	Detail      string           `json:"detail"`
-	Subproblems []*ErrorResponse `json:"subproblems"`
-}
-
-func (e *ErrorResponse) MarshalForStorage() map[string]interface{} {
-	subProblems := []map[string]interface{}{}
-	for _, subProblem := range e.Subproblems {
-		subProblems = append(subProblems, subProblem.MarshalForStorage())
-	}
-	return map[string]interface{}{
-		"status":      e.StatusCode,
-		"type":        e.Type,
-		"detail":      e.Detail,
-		"subproblems": subProblems,
-	}
-}
-
-func (e *ErrorResponse) Marshal() (*logical.Response, error) {
-	body, err := json.Marshal(e)
-	if err != nil {
-		return nil, fmt.Errorf("failed marshalling of error response: %w", err)
-	}
-
-	var resp logical.Response
-	resp.Data = map[string]interface{}{
-		logical.HTTPContentType: ErrorContentType,
-		logical.HTTPRawBody:     body,
-		logical.HTTPStatusCode:  e.StatusCode,
-	}
-
-	return &resp, nil
-}
-
-func FindType(given error) (err error, id string, code int, found bool) {
-	matchedError := false
-	for err, id = range errIdMappings {
-		if errors.Is(given, err) {
-			matchedError = true
-			break
-		}
-	}
-
-	// If the given error was not matched from one of the standard ACME errors
-	// make this error, force ErrServerInternal
-	if !matchedError {
-		err = ErrServerInternal
-		id = errIdMappings[err]
-	}
-
-	code = errCodeMappings[err]
-
-	return
-}
-
-func TranslateError(given error) (*logical.Response, error) {
-	if errors.Is(given, logical.ErrReadOnly) {
-		return nil, given
-	}
-
-	if errors.Is(given, ErrAcmeDisabled) {
-		return logical.RespondWithStatusCode(nil, nil, http.StatusNotFound)
-	}
-
-	body := TranslateErrorToErrorResponse(given)
-
-	return body.Marshal()
-}
-
-func TranslateErrorToErrorResponse(given error) ErrorResponse {
-	// We're multierror aware here: if we're given a list of errors, assume
-	// they're structured so the first error is the outer error and the inner
-	// subproblems are subsequent in the multierror.
-	var remaining []error
-	if unwrapped, ok := given.(*multierror.Error); ok {
-		remaining = unwrapped.Errors[1:]
-		given = unwrapped.Errors[0]
-	}
-
-	_, id, code, found := FindType(given)
-	if !found && len(remaining) > 0 {
-		// Translate multierrors into a generic error code.
-		id = errIdMappings[ErrCompound]
-		code = errCodeMappings[ErrCompound]
-	}
-
-	var body ErrorResponse
-	body.Type = ErrorPrefix + id
-	body.Detail = given.Error()
-	body.StatusCode = code
-
-	for _, subgiven := range remaining {
-		_, subid, _, _ := FindType(subgiven)
-
-		var sub ErrorResponse
-		sub.Type = ErrorPrefix + subid
-		body.Detail = subgiven.Error()
-
-		body.Subproblems = append(body.Subproblems, &sub)
-	}
-	return body
-}
diff --git a/builtin/logical/pki/acme_jws.go b/builtin/logical/pki/acme_jws.go
deleted file mode 100644
index 3f6ba6d27187c..0000000000000
--- a/builtin/logical/pki/acme_jws.go
+++ /dev/null
@@ -1,278 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package pki
-
-import (
-	"bytes"
-	"crypto"
-	"encoding/base64"
-	"encoding/json"
-	"fmt"
-	"strings"
-
-	"github.com/go-jose/go-jose/v3"
-)
-
-var AllowedOuterJWSTypes = map[string]interface{}{
-	"RS256":  true,
-	"RS384":  true,
-	"RS512":  true,
-	"PS256":  true,
-	"PS384":  true,
-	"PS512":  true,
-	"ES256":  true,
-	"ES384":  true,
-	"ES512":  true,
-	"EdDSA2": true,
-}
-
-var AllowedEabJWSTypes = map[string]interface{}{
-	"HS256": true,
-	"HS384": true,
-	"HS512": true,
-}
-
-// This wraps a JWS message structure.
-type jwsCtx struct {
-	Algo     string          `json:"alg"`
-	Kid      string          `json:"kid"`
-	Jwk      json.RawMessage `json:"jwk"`
-	Nonce    string          `json:"nonce"`
-	Url      string          `json:"url"`
-	Key      jose.JSONWebKey `json:"-"`
-	Existing bool            `json:"-"`
-}
-
-func (c *jwsCtx) GetKeyThumbprint() (string, error) {
-	keyThumbprint, err := c.Key.Thumbprint(crypto.SHA256)
-	if err != nil {
-		return "", fmt.Errorf("failed creating thumbprint: %w", err)
-	}
-	return base64.RawURLEncoding.EncodeToString(keyThumbprint), nil
-}
-
-func UnmarshalEabJwsJson(eabBytes []byte) (*jwsCtx, error) {
-	var eabJws jwsCtx
-	var err error
-	if err = json.Unmarshal(eabBytes, &eabJws); err != nil {
-		return nil, err
-	}
-
-	if eabJws.Kid == "" {
-		return nil, fmt.Errorf("invalid header: got missing required field 'kid': %w", ErrMalformed)
-	}
-
-	if _, present := AllowedEabJWSTypes[eabJws.Algo]; !present {
-		return nil, fmt.Errorf("invalid header: unexpected value for 'algo': %w", ErrMalformed)
-	}
-
-	return &eabJws, nil
-}
-
-func (c *jwsCtx) UnmarshalOuterJwsJson(a *acmeState, ac *acmeContext, jws []byte) error {
-	var err error
-	if err = json.Unmarshal(jws, c); err != nil {
-		return err
-	}
-
-	if c.Kid != "" && len(c.Jwk) > 0 {
-		// See RFC 8555 Section 6.2. Request Authentication:
-		//
-		// > The "jwk" and "kid" fields are mutually exclusive.  Servers MUST
-		// > reject requests that contain both.
-		return fmt.Errorf("invalid header: got both account 'kid' and 'jwk' in the same message; expected only one: %w", ErrMalformed)
-	}
-
-	if c.Kid == "" && len(c.Jwk) == 0 {
-		// See RFC 8555 Section 6.2. Request Authentication:
-		//
-		// > Either "jwk" (JSON Web Key) or "kid" (Key ID) as specified
-		// > below
-		return fmt.Errorf("invalid header: got neither required fields of 'kid' nor 'jwk': %w", ErrMalformed)
-	}
-
-	if _, present := AllowedOuterJWSTypes[c.Algo]; !present {
-		// See RFC 8555 Section 6.2. Request Authentication:
-		//
-		// > The JWS Protected Header MUST include the following fields:
-		// >
-		// > - "alg" (Algorithm)
-		// >
-		// >   * This field MUST NOT contain "none" or a Message
-		// >     Authentication Code (MAC) algorithm (e.g. one in which the
-		// >     algorithm registry description mentions MAC/HMAC).
-		return fmt.Errorf("invalid header: unexpected value for 'algo': %w", ErrMalformed)
-	}
-
-	if c.Kid != "" {
-		// Load KID from storage first.
-		kid := getKeyIdFromAccountUrl(c.Kid)
-		c.Jwk, err = a.LoadJWK(ac, kid)
-		if err != nil {
-			return err
-		}
-		c.Kid = kid // Use the uuid itself, not the full account url that was originally provided to us.
-		c.Existing = true
-	}
-
-	if err = c.Key.UnmarshalJSON(c.Jwk); err != nil {
-		return err
-	}
-
-	if !c.Key.Valid() {
-		return fmt.Errorf("received invalid jwk: %w", ErrMalformed)
-	}
-
-	if c.Kid == "" {
-		c.Kid = genUuid()
-		c.Existing = false
-	}
-
-	return nil
-}
-
-func getKeyIdFromAccountUrl(accountUrl string) string {
-	pieces := strings.Split(accountUrl, "/")
-	return pieces[len(pieces)-1]
-}
-
-func hasValues(h jose.Header) bool {
-	return h.KeyID != "" || h.JSONWebKey != nil || h.Algorithm != "" || h.Nonce != "" || len(h.ExtraHeaders) > 0
-}
-
-func (c *jwsCtx) VerifyJWS(signature string) (map[string]interface{}, error) {
-	// See RFC 8555 Section 6.2. Request Authentication:
-	//
-	// > The JWS Unencoded Payload Option [RFC7797] MUST NOT be used
-	//
-	// This is validated by go-jose.
-	sig, err := jose.ParseSigned(signature)
-	if err != nil {
-		return nil, fmt.Errorf("error parsing signature: %s: %w", err, ErrMalformed)
-	}
-
-	if len(sig.Signatures) > 1 {
-		// See RFC 8555 Section 6.2. Request Authentication:
-		//
-		// > The JWS MUST NOT have multiple signatures
-		return nil, fmt.Errorf("request had multiple signatures: %w", ErrMalformed)
-	}
-
-	if hasValues(sig.Signatures[0].Unprotected) {
-		// See RFC 8555 Section 6.2. Request Authentication:
-		//
-		// > The JWS Unprotected Header [RFC7515] MUST NOT be used
-		return nil, fmt.Errorf("request had unprotected headers: %w", ErrMalformed)
-	}
-
-	payload, err := sig.Verify(c.Key)
-	if err != nil {
-		return nil, err
-	}
-
-	if len(payload) == 0 {
-		// Distinguish POST-AS-GET from POST-with-an-empty-body.
-		return nil, nil
-	}
-
-	var m map[string]interface{}
-	if err := json.Unmarshal(payload, &m); err != nil {
-		return nil, fmt.Errorf("failed to json unmarshal 'payload': %s: %w", err, ErrMalformed)
-	}
-
-	return m, nil
-}
-
-func verifyEabPayload(acmeState *acmeState, ac *acmeContext, outer *jwsCtx, expectedPath string, payload map[string]interface{}) (*eabType, error) {
-	// Parse the key out.
-	rawProtectedBase64, ok := payload["protected"]
-	if !ok {
-		return nil, fmt.Errorf("missing required field 'protected': %w", ErrMalformed)
-	}
-	jwkBase64 := rawProtectedBase64.(string)
-
-	jwkBytes, err := base64.RawURLEncoding.DecodeString(jwkBase64)
-	if err != nil {
-		return nil, fmt.Errorf("failed to base64 parse eab 'protected': %s: %w", err, ErrMalformed)
-	}
-
-	eabJws, err := UnmarshalEabJwsJson(jwkBytes)
-	if err != nil {
-		return nil, fmt.Errorf("failed to json unmarshal eab 'protected': %w", err)
-	}
-
-	if len(eabJws.Url) == 0 {
-		return nil, fmt.Errorf("missing required parameter 'url' in eab 'protected': %w", ErrMalformed)
-	}
-	expectedUrl := ac.clusterUrl.JoinPath(expectedPath).String()
-	if expectedUrl != eabJws.Url {
-		return nil, fmt.Errorf("invalid value for 'url' in eab 'protected': got '%v' expected '%v': %w", eabJws.Url, expectedUrl, ErrUnauthorized)
-	}
-
-	if len(eabJws.Nonce) != 0 {
-		return nil, fmt.Errorf("nonce should not be provided in eab 'protected': %w", ErrMalformed)
-	}
-
-	rawPayloadBase64, ok := payload["payload"]
-	if !ok {
-		return nil, fmt.Errorf("missing required field eab 'payload': %w", ErrMalformed)
-	}
-	payloadBase64, ok := rawPayloadBase64.(string)
-	if !ok {
-		return nil, fmt.Errorf("failed to parse 'payload' field: %w", ErrMalformed)
-	}
-
-	rawSignatureBase64, ok := payload["signature"]
-	if !ok {
-		return nil, fmt.Errorf("missing required field 'signature': %w", ErrMalformed)
-	}
-	signatureBase64, ok := rawSignatureBase64.(string)
-	if !ok {
-		return nil, fmt.Errorf("failed to parse 'signature' field: %w", ErrMalformed)
-	}
-
-	// go-jose only seems to support compact signature encodings.
-	compactSig := fmt.Sprintf("%v.%v.%v", jwkBase64, payloadBase64, signatureBase64)
-	sig, err := jose.ParseSigned(compactSig)
-	if err != nil {
-		return nil, fmt.Errorf("error parsing eab signature: %s: %w", err, ErrMalformed)
-	}
-
-	if len(sig.Signatures) > 1 {
-		// See RFC 8555 Section 6.2. Request Authentication:
-		//
-		// > The JWS MUST NOT have multiple signatures
-		return nil, fmt.Errorf("eab had multiple signatures: %w", ErrMalformed)
-	}
-
-	if hasValues(sig.Signatures[0].Unprotected) {
-		// See RFC 8555 Section 6.2. Request Authentication:
-		//
-		// > The JWS Unprotected Header [RFC7515] MUST NOT be used
-		return nil, fmt.Errorf("eab had unprotected headers: %w", ErrMalformed)
-	}
-
-	// Load the EAB to validate the signature against
-	eabEntry, err := acmeState.LoadEab(ac.sc, eabJws.Kid)
-	if err != nil {
-		return nil, fmt.Errorf("%w: failed to verify eab", ErrUnauthorized)
-	}
-
-	verifiedPayload, err := sig.Verify(eabEntry.PrivateBytes)
-	if err != nil {
-		return nil, err
-	}
-
-	// Make sure how eab payload matches the outer JWK key value
-	if !bytes.Equal(outer.Jwk, verifiedPayload) {
-		return nil, fmt.Errorf("eab payload does not match outer JWK key: %w", ErrMalformed)
-	}
-
-	if eabEntry.AcmeDirectory != ac.acmeDirectory {
-		// This EAB was not created for this specific ACME directory, reject it
-		return nil, fmt.Errorf("%w: failed to verify eab", ErrUnauthorized)
-	}
-
-	return eabEntry, nil
-}
diff --git a/builtin/logical/pki/acme_state.go b/builtin/logical/pki/acme_state.go
deleted file mode 100644
index c026de3d5cb5f..0000000000000
--- a/builtin/logical/pki/acme_state.go
+++ /dev/null
@@ -1,659 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package pki
-
-import (
-	"crypto/rand"
-	"encoding/base64"
-	"errors"
-	"fmt"
-	"io"
-	"net"
-	"path"
-	"strings"
-	"sync"
-	"sync/atomic"
-	"time"
-
-	"github.com/hashicorp/go-secure-stdlib/nonceutil"
-	"github.com/hashicorp/vault/sdk/framework"
-	"github.com/hashicorp/vault/sdk/logical"
-)
-
-const (
-	// How many bytes are in a token. Per RFC 8555 Section
-	// 8.3. HTTP Challenge and Section 11.3 Token Entropy:
-	//
-	// > token (required, string):  A random value that uniquely identifies
-	// >   the challenge.  This value MUST have at least 128 bits of entropy.
-	tokenBytes = 128 / 8
-
-	// Path Prefixes
-	acmePathPrefix       = "acme/"
-	acmeAccountPrefix    = acmePathPrefix + "accounts/"
-	acmeThumbprintPrefix = acmePathPrefix + "account-thumbprints/"
-	acmeValidationPrefix = acmePathPrefix + "validations/"
-	acmeEabPrefix        = acmePathPrefix + "eab/"
-)
-
-type acmeState struct {
-	nonces nonceutil.NonceService
-
-	validator *ACMEChallengeEngine
-
-	configDirty *atomic.Bool
-	_config     sync.RWMutex
-	config      acmeConfigEntry
-}
-
-type acmeThumbprint struct {
-	Kid        string `json:"kid"`
-	Thumbprint string `json:"-"`
-}
-
-func NewACMEState() *acmeState {
-	state := &acmeState{
-		nonces:      nonceutil.NewNonceService(),
-		validator:   NewACMEChallengeEngine(),
-		configDirty: new(atomic.Bool),
-	}
-	// Config hasn't been loaded yet; mark dirty.
-	state.configDirty.Store(true)
-
-	return state
-}
-
-func (a *acmeState) Initialize(b *backend, sc *storageContext) error {
-	// Initialize the nonce service.
-	if err := a.nonces.Initialize(); err != nil {
-		return fmt.Errorf("failed to initialize the ACME nonce service: %w", err)
-	}
-
-	// Load the ACME config.
-	_, err := a.getConfigWithUpdate(sc)
-	if err != nil {
-		return fmt.Errorf("error initializing ACME engine: %w", err)
-	}
-
-	// Kick off our ACME challenge validation engine.
-	go a.validator.Run(b, a, sc)
-
-	// All good.
-	return nil
-}
-
-func (a *acmeState) markConfigDirty() {
-	a.configDirty.Store(true)
-}
-
-func (a *acmeState) reloadConfigIfRequired(sc *storageContext) error {
-	if !a.configDirty.Load() {
-		return nil
-	}
-
-	a._config.Lock()
-	defer a._config.Unlock()
-
-	if !a.configDirty.Load() {
-		// Someone beat us to grabbing the above write lock and already
-		// updated the config.
-		return nil
-	}
-
-	config, err := sc.getAcmeConfig()
-	if err != nil {
-		return fmt.Errorf("failed reading config: %w", err)
-	}
-
-	a.config = *config
-	a.configDirty.Store(false)
-
-	return nil
-}
-
-func (a *acmeState) getConfigWithUpdate(sc *storageContext) (*acmeConfigEntry, error) {
-	if err := a.reloadConfigIfRequired(sc); err != nil {
-		return nil, err
-	}
-
-	a._config.RLock()
-	defer a._config.RUnlock()
-
-	configCopy := a.config
-	return &configCopy, nil
-}
-
-func generateRandomBase64(srcBytes int) (string, error) {
-	data := make([]byte, 21)
-	if _, err := io.ReadFull(rand.Reader, data); err != nil {
-		return "", err
-	}
-
-	return base64.RawURLEncoding.EncodeToString(data), nil
-}
-
-func (a *acmeState) GetNonce() (string, time.Time, error) {
-	return a.nonces.Get()
-}
-
-func (a *acmeState) RedeemNonce(nonce string) bool {
-	return a.nonces.Redeem(nonce)
-}
-
-func (a *acmeState) DoTidyNonces() {
-	a.nonces.Tidy()
-}
-
-type ACMEAccountStatus string
-
-func (aas ACMEAccountStatus) String() string {
-	return string(aas)
-}
-
-const (
-	AccountStatusValid       ACMEAccountStatus = "valid"
-	AccountStatusDeactivated ACMEAccountStatus = "deactivated"
-	AccountStatusRevoked     ACMEAccountStatus = "revoked"
-)
-
-type acmeAccount struct {
-	KeyId                string            `json:"-"`
-	Status               ACMEAccountStatus `json:"status"`
-	Contact              []string          `json:"contact"`
-	TermsOfServiceAgreed bool              `json:"terms-of-service-agreed"`
-	Jwk                  []byte            `json:"jwk"`
-	AcmeDirectory        string            `json:"acme-directory"`
-	AccountCreatedDate   time.Time         `json:"account-created-date"`
-	MaxCertExpiry        time.Time         `json:"account-max-cert-expiry"`
-	AccountRevokedDate   time.Time         `json:"account-revoked-date"`
-	Eab                  *eabType          `json:"eab"`
-}
-
-type acmeOrder struct {
-	OrderId                 string              `json:"-"`
-	AccountId               string              `json:"account-id"`
-	Status                  ACMEOrderStatusType `json:"status"`
-	Expires                 time.Time           `json:"expires"`
-	Identifiers             []*ACMEIdentifier   `json:"identifiers"`
-	AuthorizationIds        []string            `json:"authorization-ids"`
-	CertificateSerialNumber string              `json:"cert-serial-number"`
-	CertificateExpiry       time.Time           `json:"cert-expiry"`
-	// The actual issuer UUID that issued the certificate, blank if an order exists but no certificate was issued.
-	IssuerId issuerID `json:"issuer-id"`
-}
-
-func (o acmeOrder) getIdentifierDNSValues() []string {
-	var identifiers []string
-	for _, value := range o.Identifiers {
-		if value.Type == ACMEDNSIdentifier {
-			// Here, because of wildcard processing, we need to use the
-			// original value provided by the caller rather than the
-			// post-modification (trimmed '*.' prefix) value.
-			identifiers = append(identifiers, value.OriginalValue)
-		}
-	}
-	return identifiers
-}
-
-func (o acmeOrder) getIdentifierIPValues() []net.IP {
-	var identifiers []net.IP
-	for _, value := range o.Identifiers {
-		if value.Type == ACMEIPIdentifier {
-			identifiers = append(identifiers, net.ParseIP(value.Value))
-		}
-	}
-	return identifiers
-}
-
-func (a *acmeState) CreateAccount(ac *acmeContext, c *jwsCtx, contact []string, termsOfServiceAgreed bool, eab *eabType) (*acmeAccount, error) {
-	// Write out the thumbprint value/entry out first, if we get an error mid-way through
-	// this is easier to recover from. The new kid with the same existing public key
-	// will rewrite the thumbprint entry. This goes in hand with LoadAccountByKey that
-	// will return a nil, nil value if the referenced kid in a loaded thumbprint does not
-	// exist. This effectively makes this self-healing IF the end-user re-attempts the
-	// account creation with the same public key.
-	thumbprint, err := c.GetKeyThumbprint()
-	if err != nil {
-		return nil, fmt.Errorf("failed generating thumbprint: %w", err)
-	}
-
-	thumbPrint := &acmeThumbprint{
-		Kid:        c.Kid,
-		Thumbprint: thumbprint,
-	}
-	thumbPrintEntry, err := logical.StorageEntryJSON(acmeThumbprintPrefix+thumbprint, thumbPrint)
-	if err != nil {
-		return nil, fmt.Errorf("error generating account thumbprint entry: %w", err)
-	}
-
-	if err = ac.sc.Storage.Put(ac.sc.Context, thumbPrintEntry); err != nil {
-		return nil, fmt.Errorf("error writing account thumbprint entry: %w", err)
-	}
-
-	// Now write out the main value that the thumbprint points too.
-	acct := &acmeAccount{
-		KeyId:                c.Kid,
-		Contact:              contact,
-		TermsOfServiceAgreed: termsOfServiceAgreed,
-		Jwk:                  c.Jwk,
-		Status:               AccountStatusValid,
-		AcmeDirectory:        ac.acmeDirectory,
-		AccountCreatedDate:   time.Now(),
-		Eab:                  eab,
-	}
-	json, err := logical.StorageEntryJSON(acmeAccountPrefix+c.Kid, acct)
-	if err != nil {
-		return nil, fmt.Errorf("error creating account entry: %w", err)
-	}
-
-	if err := ac.sc.Storage.Put(ac.sc.Context, json); err != nil {
-		return nil, fmt.Errorf("error writing account entry: %w", err)
-	}
-
-	return acct, nil
-}
-
-func (a *acmeState) UpdateAccount(ac *acmeContext, acct *acmeAccount) error {
-	json, err := logical.StorageEntryJSON(acmeAccountPrefix+acct.KeyId, acct)
-	if err != nil {
-		return fmt.Errorf("error creating account entry: %w", err)
-	}
-
-	if err := ac.sc.Storage.Put(ac.sc.Context, json); err != nil {
-		return fmt.Errorf("error writing account entry: %w", err)
-	}
-
-	return nil
-}
-
-// LoadAccount will load the account object based on the passed in keyId field value
-// otherwise will return an error if the account does not exist.
-func (a *acmeState) LoadAccount(ac *acmeContext, keyId string) (*acmeAccount, error) {
-	entry, err := ac.sc.Storage.Get(ac.sc.Context, acmeAccountPrefix+keyId)
-	if err != nil {
-		return nil, fmt.Errorf("error loading account: %w", err)
-	}
-	if entry == nil {
-		return nil, fmt.Errorf("account not found: %w", ErrAccountDoesNotExist)
-	}
-
-	var acct acmeAccount
-	err = entry.DecodeJSON(&acct)
-	if err != nil {
-		return nil, fmt.Errorf("error decoding account: %w", err)
-	}
-
-	if acct.AcmeDirectory != ac.acmeDirectory {
-		return nil, fmt.Errorf("%w: account part of different ACME directory path", ErrMalformed)
-	}
-
-	acct.KeyId = keyId
-
-	return &acct, nil
-}
-
-// LoadAccountByKey will attempt to load the account based on a key thumbprint. If the thumbprint
-// or kid is unknown a nil, nil will be returned.
-func (a *acmeState) LoadAccountByKey(ac *acmeContext, keyThumbprint string) (*acmeAccount, error) {
-	thumbprintEntry, err := ac.sc.Storage.Get(ac.sc.Context, acmeThumbprintPrefix+keyThumbprint)
-	if err != nil {
-		return nil, fmt.Errorf("failed loading acme thumbprintEntry for key: %w", err)
-	}
-	if thumbprintEntry == nil {
-		return nil, nil
-	}
-
-	var thumbprint acmeThumbprint
-	err = thumbprintEntry.DecodeJSON(&thumbprint)
-	if err != nil {
-		return nil, fmt.Errorf("failed decoding thumbprint entry: %s: %w", keyThumbprint, err)
-	}
-
-	if len(thumbprint.Kid) == 0 {
-		return nil, fmt.Errorf("empty kid within thumbprint entry: %s", keyThumbprint)
-	}
-
-	acct, err := a.LoadAccount(ac, thumbprint.Kid)
-	if err != nil {
-		// If we fail to lookup the account that the thumbprint entry references, assume a bad
-		// write previously occurred in which we managed to write out the thumbprint but failed
-		// writing out the main account information.
-		if errors.Is(err, ErrAccountDoesNotExist) {
-			return nil, nil
-		}
-		return nil, err
-	}
-
-	return acct, nil
-}
-
-func (a *acmeState) LoadJWK(ac *acmeContext, keyId string) ([]byte, error) {
-	key, err := a.LoadAccount(ac, keyId)
-	if err != nil {
-		return nil, err
-	}
-
-	if len(key.Jwk) == 0 {
-		return nil, fmt.Errorf("malformed key entry lacks JWK")
-	}
-
-	return key.Jwk, nil
-}
-
-func (a *acmeState) LoadAuthorization(ac *acmeContext, userCtx *jwsCtx, authId string) (*ACMEAuthorization, error) {
-	if authId == "" {
-		return nil, fmt.Errorf("malformed authorization identifier")
-	}
-
-	authorizationPath := getAuthorizationPath(userCtx.Kid, authId)
-
-	authz, err := loadAuthorizationAtPath(ac.sc, authorizationPath)
-	if err != nil {
-		return nil, err
-	}
-
-	if userCtx.Kid != authz.AccountId {
-		return nil, ErrUnauthorized
-	}
-
-	return authz, nil
-}
-
-func loadAuthorizationAtPath(sc *storageContext, authorizationPath string) (*ACMEAuthorization, error) {
-	entry, err := sc.Storage.Get(sc.Context, authorizationPath)
-	if err != nil {
-		return nil, fmt.Errorf("error loading authorization: %w", err)
-	}
-
-	if entry == nil {
-		return nil, fmt.Errorf("authorization does not exist: %w", ErrMalformed)
-	}
-
-	var authz ACMEAuthorization
-	err = entry.DecodeJSON(&authz)
-	if err != nil {
-		return nil, fmt.Errorf("error decoding authorization: %w", err)
-	}
-
-	return &authz, nil
-}
-
-func (a *acmeState) SaveAuthorization(ac *acmeContext, authz *ACMEAuthorization) error {
-	path := getAuthorizationPath(authz.AccountId, authz.Id)
-	return saveAuthorizationAtPath(ac.sc, path, authz)
-}
-
-func saveAuthorizationAtPath(sc *storageContext, path string, authz *ACMEAuthorization) error {
-	if authz.Id == "" {
-		return fmt.Errorf("invalid authorization, missing id")
-	}
-
-	if authz.AccountId == "" {
-		return fmt.Errorf("invalid authorization, missing account id")
-	}
-
-	json, err := logical.StorageEntryJSON(path, authz)
-	if err != nil {
-		return fmt.Errorf("error creating authorization entry: %w", err)
-	}
-
-	if err = sc.Storage.Put(sc.Context, json); err != nil {
-		return fmt.Errorf("error writing authorization entry: %w", err)
-	}
-
-	return nil
-}
-
-func (a *acmeState) ParseRequestParams(ac *acmeContext, req *logical.Request, data *framework.FieldData) (*jwsCtx, map[string]interface{}, error) {
-	var c jwsCtx
-	var m map[string]interface{}
-
-	// Parse the key out.
-	rawJWKBase64, ok := data.GetOk("protected")
-	if !ok {
-		return nil, nil, fmt.Errorf("missing required field 'protected': %w", ErrMalformed)
-	}
-	jwkBase64 := rawJWKBase64.(string)
-
-	jwkBytes, err := base64.RawURLEncoding.DecodeString(jwkBase64)
-	if err != nil {
-		return nil, nil, fmt.Errorf("failed to base64 parse 'protected': %s: %w", err, ErrMalformed)
-	}
-	if err = c.UnmarshalOuterJwsJson(a, ac, jwkBytes); err != nil {
-		return nil, nil, fmt.Errorf("failed to json unmarshal 'protected': %w", err)
-	}
-
-	// Since we already parsed the header to verify the JWS context, we
-	// should read and redeem the nonce here too, to avoid doing any extra
-	// work if it is invalid.
-	if !a.RedeemNonce(c.Nonce) {
-		return nil, nil, fmt.Errorf("invalid or reused nonce: %w", ErrBadNonce)
-	}
-
-	// If the path is incorrect, reject the request.
-	//
-	// See RFC 8555 Section 6.4. Request URL Integrity:
-	//
-	// > As noted in Section 6.2, all ACME request objects carry a "url"
-	// > header parameter in their protected header. ... On receiving such
-	// > an object in an HTTP request, the server MUST compare the "url"
-	// > header parameter to the request URL.  If the two do not match,
-	// > then the server MUST reject the request as unauthorized.
-	if len(c.Url) == 0 {
-		return nil, nil, fmt.Errorf("missing required parameter 'url' in 'protected': %w", ErrMalformed)
-	}
-	if ac.clusterUrl.JoinPath(req.Path).String() != c.Url {
-		return nil, nil, fmt.Errorf("invalid value for 'url' in 'protected': got '%v' expected '%v': %w", c.Url, ac.clusterUrl.JoinPath(req.Path).String(), ErrUnauthorized)
-	}
-
-	rawPayloadBase64, ok := data.GetOk("payload")
-	if !ok {
-		return nil, nil, fmt.Errorf("missing required field 'payload': %w", ErrMalformed)
-	}
-	payloadBase64 := rawPayloadBase64.(string)
-
-	rawSignatureBase64, ok := data.GetOk("signature")
-	if !ok {
-		return nil, nil, fmt.Errorf("missing required field 'signature': %w", ErrMalformed)
-	}
-	signatureBase64 := rawSignatureBase64.(string)
-
-	// go-jose only seems to support compact signature encodings.
-	compactSig := fmt.Sprintf("%v.%v.%v", jwkBase64, payloadBase64, signatureBase64)
-	m, err = c.VerifyJWS(compactSig)
-	if err != nil {
-		return nil, nil, fmt.Errorf("failed to verify signature: %w", err)
-	}
-
-	return &c, m, nil
-}
-
-func (a *acmeState) LoadOrder(ac *acmeContext, userCtx *jwsCtx, orderId string) (*acmeOrder, error) {
-	path := getOrderPath(userCtx.Kid, orderId)
-	entry, err := ac.sc.Storage.Get(ac.sc.Context, path)
-	if err != nil {
-		return nil, fmt.Errorf("error loading order: %w", err)
-	}
-
-	if entry == nil {
-		return nil, fmt.Errorf("order does not exist: %w", ErrMalformed)
-	}
-
-	var order acmeOrder
-	err = entry.DecodeJSON(&order)
-	if err != nil {
-		return nil, fmt.Errorf("error decoding order: %w", err)
-	}
-
-	if userCtx.Kid != order.AccountId {
-		return nil, ErrUnauthorized
-	}
-
-	order.OrderId = orderId
-
-	return &order, nil
-}
-
-func (a *acmeState) SaveOrder(ac *acmeContext, order *acmeOrder) error {
-	if order.OrderId == "" {
-		return fmt.Errorf("invalid order, missing order id")
-	}
-
-	if order.AccountId == "" {
-		return fmt.Errorf("invalid order, missing account id")
-	}
-	path := getOrderPath(order.AccountId, order.OrderId)
-	json, err := logical.StorageEntryJSON(path, order)
-	if err != nil {
-		return fmt.Errorf("error serializing order entry: %w", err)
-	}
-
-	if err = ac.sc.Storage.Put(ac.sc.Context, json); err != nil {
-		return fmt.Errorf("error writing order entry: %w", err)
-	}
-
-	return nil
-}
-
-func (a *acmeState) ListOrderIds(ac *acmeContext, accountId string) ([]string, error) {
-	accountOrderPrefixPath := acmeAccountPrefix + accountId + "/orders/"
-
-	rawOrderIds, err := ac.sc.Storage.List(ac.sc.Context, accountOrderPrefixPath)
-	if err != nil {
-		return nil, fmt.Errorf("failed listing order ids for account %s: %w", accountId, err)
-	}
-
-	orderIds := []string{}
-	for _, order := range rawOrderIds {
-		if strings.HasSuffix(order, "/") {
-			// skip any folders we might have for some reason
-			continue
-		}
-		orderIds = append(orderIds, order)
-	}
-	return orderIds, nil
-}
-
-type acmeCertEntry struct {
-	Serial  string `json:"-"`
-	Account string `json:"-"`
-	Order   string `json:"order"`
-}
-
-func (a *acmeState) TrackIssuedCert(ac *acmeContext, accountId string, serial string, orderId string) error {
-	path := getAcmeSerialToAccountTrackerPath(accountId, serial)
-	entry := acmeCertEntry{
-		Order: orderId,
-	}
-
-	json, err := logical.StorageEntryJSON(path, &entry)
-	if err != nil {
-		return fmt.Errorf("error serializing acme cert entry: %w", err)
-	}
-
-	if err = ac.sc.Storage.Put(ac.sc.Context, json); err != nil {
-		return fmt.Errorf("error writing acme cert entry: %w", err)
-	}
-
-	return nil
-}
-
-func (a *acmeState) GetIssuedCert(ac *acmeContext, accountId string, serial string) (*acmeCertEntry, error) {
-	path := acmeAccountPrefix + accountId + "/certs/" + normalizeSerial(serial)
-
-	entry, err := ac.sc.Storage.Get(ac.sc.Context, path)
-	if err != nil {
-		return nil, fmt.Errorf("error loading acme cert entry: %w", err)
-	}
-
-	if entry == nil {
-		return nil, fmt.Errorf("no certificate with this serial was issued for this account")
-	}
-
-	var cert acmeCertEntry
-	err = entry.DecodeJSON(&cert)
-	if err != nil {
-		return nil, fmt.Errorf("error decoding acme cert entry: %w", err)
-	}
-
-	cert.Serial = denormalizeSerial(serial)
-	cert.Account = accountId
-
-	return &cert, nil
-}
-
-func (a *acmeState) SaveEab(sc *storageContext, eab *eabType) error {
-	json, err := logical.StorageEntryJSON(path.Join(acmeEabPrefix, eab.KeyID), eab)
-	if err != nil {
-		return err
-	}
-	return sc.Storage.Put(sc.Context, json)
-}
-
-func (a *acmeState) LoadEab(sc *storageContext, eabKid string) (*eabType, error) {
-	rawEntry, err := sc.Storage.Get(sc.Context, path.Join(acmeEabPrefix, eabKid))
-	if err != nil {
-		return nil, err
-	}
-	if rawEntry == nil {
-		return nil, fmt.Errorf("%w: no eab found for kid %s", ErrStorageItemNotFound, eabKid)
-	}
-
-	var eab eabType
-	err = rawEntry.DecodeJSON(&eab)
-	if err != nil {
-		return nil, err
-	}
-
-	eab.KeyID = eabKid
-	return &eab, nil
-}
-
-func (a *acmeState) DeleteEab(sc *storageContext, eabKid string) (bool, error) {
-	rawEntry, err := sc.Storage.Get(sc.Context, path.Join(acmeEabPrefix, eabKid))
-	if err != nil {
-		return false, err
-	}
-	if rawEntry == nil {
-		return false, nil
-	}
-
-	err = sc.Storage.Delete(sc.Context, path.Join(acmeEabPrefix, eabKid))
-	if err != nil {
-		return false, err
-	}
-	return true, nil
-}
-
-func (a *acmeState) ListEabIds(sc *storageContext) ([]string, error) {
-	entries, err := sc.Storage.List(sc.Context, acmeEabPrefix)
-	if err != nil {
-		return nil, err
-	}
-	var ids []string
-	for _, entry := range entries {
-		if strings.HasSuffix(entry, "/") {
-			continue
-		}
-		ids = append(ids, entry)
-	}
-
-	return ids, nil
-}
-
-func getAcmeSerialToAccountTrackerPath(accountId string, serial string) string {
-	return acmeAccountPrefix + accountId + "/certs/" + normalizeSerial(serial)
-}
-
-func getAuthorizationPath(accountId string, authId string) string {
-	return acmeAccountPrefix + accountId + "/authorizations/" + authId
-}
-
-func getOrderPath(accountId string, orderId string) string {
-	return acmeAccountPrefix + accountId + "/orders/" + orderId
-}
-
-func getACMEToken() (string, error) {
-	return generateRandomBase64(tokenBytes)
-}
diff --git a/builtin/logical/pki/acme_state_test.go b/builtin/logical/pki/acme_state_test.go
deleted file mode 100644
index 8d4f12127ab20..0000000000000
--- a/builtin/logical/pki/acme_state_test.go
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package pki
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestAcmeNonces(t *testing.T) {
-	t.Parallel()
-
-	a := NewACMEState()
-	a.nonces.Initialize()
-
-	// Simple operation should succeed.
-	nonce, _, err := a.GetNonce()
-	require.NoError(t, err)
-	require.NotEmpty(t, nonce)
-
-	require.True(t, a.RedeemNonce(nonce))
-	require.False(t, a.RedeemNonce(nonce))
-
-	// Redeeming in opposite order should work.
-	var nonces []string
-	for i := 0; i < len(nonce); i++ {
-		nonce, _, err = a.GetNonce()
-		require.NoError(t, err)
-		require.NotEmpty(t, nonce)
-	}
-
-	for i := len(nonces) - 1; i >= 0; i-- {
-		nonce = nonces[i]
-		require.True(t, a.RedeemNonce(nonce))
-	}
-
-	for i := 0; i < len(nonces); i++ {
-		nonce = nonces[i]
-		require.False(t, a.RedeemNonce(nonce))
-	}
-}
diff --git a/builtin/logical/pki/acme_wrappers.go b/builtin/logical/pki/acme_wrappers.go
deleted file mode 100644
index ef83bbce2c553..0000000000000
--- a/builtin/logical/pki/acme_wrappers.go
+++ /dev/null
@@ -1,467 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package pki
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"net/http"
-	"net/url"
-	"strings"
-
-	"github.com/hashicorp/vault/sdk/framework"
-	"github.com/hashicorp/vault/sdk/logical"
-)
-
-type acmeContext struct {
-	// baseUrl is the combination of the configured cluster local URL and the acmePath up to /acme/
-	baseUrl    *url.URL
-	clusterUrl *url.URL
-	sc         *storageContext
-	role       *roleEntry
-	issuer     *issuerEntry
-	// acmeDirectory is a string that can distinguish the various acme directories we have configured
-	// if something needs to remain locked into a directory path structure.
-	acmeDirectory string
-	eabPolicy     EabPolicy
-}
-
-func (c acmeContext) getAcmeState() *acmeState {
-	return c.sc.Backend.acmeState
-}
-
-type (
-	acmeOperation                func(acmeCtx *acmeContext, r *logical.Request, _ *framework.FieldData) (*logical.Response, error)
-	acmeParsedOperation          func(acmeCtx *acmeContext, r *logical.Request, fields *framework.FieldData, userCtx *jwsCtx, data map[string]interface{}) (*logical.Response, error)
-	acmeAccountRequiredOperation func(acmeCtx *acmeContext, r *logical.Request, fields *framework.FieldData, userCtx *jwsCtx, data map[string]interface{}, acct *acmeAccount) (*logical.Response, error)
-)
-
-// acmeErrorWrapper the lowest level wrapper that will translate errors into proper ACME error responses
-func acmeErrorWrapper(op framework.OperationFunc) framework.OperationFunc {
-	return func(ctx context.Context, r *logical.Request, data *framework.FieldData) (*logical.Response, error) {
-		resp, err := op(ctx, r, data)
-		if err != nil {
-			return TranslateError(err)
-		}
-
-		return resp, nil
-	}
-}
-
-// acmeWrapper a basic wrapper that all ACME handlers should leverage as the basis.
-// This will create a basic ACME context, validate basic ACME configuration is setup
-// for operations. This pulls in acmeErrorWrapper to translate error messages for users,
-// but does not enforce any sort of ACME authentication.
-func (b *backend) acmeWrapper(op acmeOperation) framework.OperationFunc {
-	return acmeErrorWrapper(func(ctx context.Context, r *logical.Request, data *framework.FieldData) (*logical.Response, error) {
-		sc := b.makeStorageContext(ctx, r.Storage)
-
-		config, err := sc.Backend.acmeState.getConfigWithUpdate(sc)
-		if err != nil {
-			return nil, fmt.Errorf("failed to fetch ACME configuration: %w", err)
-		}
-
-		// use string form in case someone messes up our config from raw storage.
-		eabPolicy, err := getEabPolicyByString(string(config.EabPolicyName))
-		if err != nil {
-			return nil, err
-		}
-
-		if isAcmeDisabled(sc, config, eabPolicy) {
-			return nil, ErrAcmeDisabled
-		}
-
-		if b.useLegacyBundleCaStorage() {
-			return nil, fmt.Errorf("%w: Can not perform ACME operations until migration has completed", ErrServerInternal)
-		}
-
-		acmeBaseUrl, clusterBase, err := getAcmeBaseUrl(sc, r)
-		if err != nil {
-			return nil, err
-		}
-
-		role, issuer, err := getAcmeRoleAndIssuer(sc, data, config)
-		if err != nil {
-			return nil, err
-		}
-
-		acmeDirectory, err := getAcmeDirectory(r)
-		if err != nil {
-			return nil, err
-		}
-
-		acmeCtx := &acmeContext{
-			baseUrl:       acmeBaseUrl,
-			clusterUrl:    clusterBase,
-			sc:            sc,
-			role:          role,
-			issuer:        issuer,
-			acmeDirectory: acmeDirectory,
-			eabPolicy:     eabPolicy,
-		}
-
-		return op(acmeCtx, r, data)
-	})
-}
-
-// acmeParsedWrapper is an ACME wrapper that will parse out the ACME request parameters, validate
-// that we have a proper signature and pass to the operation a decoded map of arguments received.
-// This wrapper builds on top of acmeWrapper. Note that this does perform signature verification
-// it does not enforce the account being in a valid state nor existing.
-func (b *backend) acmeParsedWrapper(op acmeParsedOperation) framework.OperationFunc {
-	return b.acmeWrapper(func(acmeCtx *acmeContext, r *logical.Request, fields *framework.FieldData) (*logical.Response, error) {
-		user, data, err := b.acmeState.ParseRequestParams(acmeCtx, r, fields)
-		if err != nil {
-			return nil, err
-		}
-
-		resp, err := op(acmeCtx, r, fields, user, data)
-
-		// Our response handlers might not add the necessary headers.
-		if resp != nil {
-			if resp.Headers == nil {
-				resp.Headers = map[string][]string{}
-			}
-
-			if _, ok := resp.Headers["Replay-Nonce"]; !ok {
-				nonce, _, err := b.acmeState.GetNonce()
-				if err != nil {
-					return nil, err
-				}
-
-				resp.Headers["Replay-Nonce"] = []string{nonce}
-			}
-
-			if _, ok := resp.Headers["Link"]; !ok {
-				resp.Headers["Link"] = genAcmeLinkHeader(acmeCtx)
-			} else {
-				directory := genAcmeLinkHeader(acmeCtx)[0]
-				addDirectory := true
-				for _, item := range resp.Headers["Link"] {
-					if item == directory {
-						addDirectory = false
-						break
-					}
-				}
-				if addDirectory {
-					resp.Headers["Link"] = append(resp.Headers["Link"], directory)
-				}
-			}
-
-			// ACME responses don't understand Vault's default encoding
-			// format. Rather than expecting everything to handle creating
-			// ACME-formatted responses, do the marshaling in one place.
-			if _, ok := resp.Data[logical.HTTPRawBody]; !ok {
-				ignored_values := map[string]bool{logical.HTTPContentType: true, logical.HTTPStatusCode: true}
-				fields := map[string]interface{}{}
-				body := map[string]interface{}{
-					logical.HTTPContentType: "application/json",
-					logical.HTTPStatusCode:  http.StatusOK,
-				}
-
-				for key, value := range resp.Data {
-					if _, present := ignored_values[key]; !present {
-						fields[key] = value
-					} else {
-						body[key] = value
-					}
-				}
-
-				rawBody, err := json.Marshal(fields)
-				if err != nil {
-					return nil, fmt.Errorf("Error marshaling JSON body: %w", err)
-				}
-
-				body[logical.HTTPRawBody] = rawBody
-				resp.Data = body
-			}
-		}
-
-		return resp, err
-	})
-}
-
-// acmeAccountRequiredWrapper builds on top of acmeParsedWrapper, enforcing the
-// request has a proper signature for an existing account, and that account is
-// in a valid status. It passes to the operation a decoded form of the request
-// parameters as well as the ACME account the request is for.
-func (b *backend) acmeAccountRequiredWrapper(op acmeAccountRequiredOperation) framework.OperationFunc {
-	return b.acmeParsedWrapper(func(acmeCtx *acmeContext, r *logical.Request, fields *framework.FieldData, uc *jwsCtx, data map[string]interface{}) (*logical.Response, error) {
-		if !uc.Existing {
-			return nil, fmt.Errorf("cannot process request without a 'kid': %w", ErrMalformed)
-		}
-
-		account, err := requireValidAcmeAccount(acmeCtx, uc)
-		if err != nil {
-			return nil, err
-		}
-
-		return op(acmeCtx, r, fields, uc, data, account)
-	})
-}
-
-func requireValidAcmeAccount(acmeCtx *acmeContext, uc *jwsCtx) (*acmeAccount, error) {
-	account, err := acmeCtx.getAcmeState().LoadAccount(acmeCtx, uc.Kid)
-	if err != nil {
-		return nil, fmt.Errorf("error loading account: %w", err)
-	}
-
-	if err = acmeCtx.eabPolicy.EnforceForExistingAccount(account); err != nil {
-		return nil, err
-	}
-
-	if account.Status != AccountStatusValid {
-		// Treating "revoked" and "deactivated" as the same here.
-		return nil, fmt.Errorf("%w: account in status: %s", ErrUnauthorized, account.Status)
-	}
-	return account, nil
-}
-
-// A helper function that will build up the various path patterns we want for ACME APIs.
-func buildAcmeFrameworkPaths(b *backend, patternFunc func(b *backend, pattern string) *framework.Path, acmeApi string) []*framework.Path {
-	var patterns []*framework.Path
-	for _, baseUrl := range []string{
-		"acme",
-		"roles/" + framework.GenericNameRegex("role") + "/acme",
-		"issuer/" + framework.GenericNameRegex(issuerRefParam) + "/acme",
-		"issuer/" + framework.GenericNameRegex(issuerRefParam) + "/roles/" + framework.GenericNameRegex("role") + "/acme",
-	} {
-
-		if !strings.HasPrefix(acmeApi, "/") {
-			acmeApi = "/" + acmeApi
-		}
-
-		path := patternFunc(b, baseUrl+acmeApi)
-		patterns = append(patterns, path)
-	}
-
-	return patterns
-}
-
-func getAcmeBaseUrl(sc *storageContext, r *logical.Request) (*url.URL, *url.URL, error) {
-	baseUrl, err := getBasePathFromClusterConfig(sc)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	directoryPrefix, err := getAcmeDirectory(r)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	return baseUrl.JoinPath(directoryPrefix), baseUrl, nil
-}
-
-func getBasePathFromClusterConfig(sc *storageContext) (*url.URL, error) {
-	cfg, err := sc.getClusterConfig()
-	if err != nil {
-		return nil, fmt.Errorf("failed loading cluster config: %w", err)
-	}
-
-	if cfg.Path == "" {
-		return nil, fmt.Errorf("ACME feature requires local cluster 'path' field configuration to be set")
-	}
-
-	baseUrl, err := url.Parse(cfg.Path)
-	if err != nil {
-		return nil, fmt.Errorf("failed parsing URL configured in local cluster 'path' configuration: %s: %s",
-			cfg.Path, err.Error())
-	}
-	return baseUrl, nil
-}
-
-func getAcmeIssuer(sc *storageContext, issuerName string) (*issuerEntry, error) {
-	if issuerName == "" {
-		issuerName = defaultRef
-	}
-	issuerId, err := sc.resolveIssuerReference(issuerName)
-	if err != nil {
-		return nil, fmt.Errorf("%w: issuer does not exist", ErrMalformed)
-	}
-
-	issuer, err := sc.fetchIssuerById(issuerId)
-	if err != nil {
-		return nil, fmt.Errorf("issuer failed to load: %w", err)
-	}
-
-	if issuer.Usage.HasUsage(IssuanceUsage) && len(issuer.KeyID) > 0 {
-		return issuer, nil
-	}
-
-	return nil, fmt.Errorf("%w: issuer missing proper issuance usage or key", ErrServerInternal)
-}
-
-// getAcmeDirectory return the base acme directory path, without a leading '/' and including
-// the trailing /acme/ folder which is the root of all our various directories
-func getAcmeDirectory(r *logical.Request) (string, error) {
-	acmePath := r.Path
-	if !strings.HasPrefix(acmePath, "/") {
-		acmePath = "/" + acmePath
-	}
-
-	lastIndex := strings.LastIndex(acmePath, "/acme/")
-	if lastIndex == -1 {
-		return "", fmt.Errorf("%w: unable to determine acme base folder path: %s", ErrServerInternal, acmePath)
-	}
-
-	// Skip the leading '/' and return our base path with the /acme/
-	return strings.TrimLeft(acmePath[0:lastIndex]+"/acme/", "/"), nil
-}
-
-func getAcmeRoleAndIssuer(sc *storageContext, data *framework.FieldData, config *acmeConfigEntry) (*roleEntry, *issuerEntry, error) {
-	requestedIssuer := getRequestedAcmeIssuerFromPath(data)
-	requestedRole := getRequestedAcmeRoleFromPath(data)
-	issuerToLoad := requestedIssuer
-
-	var role *roleEntry
-	var err error
-
-	if len(requestedRole) == 0 { // Default Directory
-		policyType, err := getDefaultDirectoryPolicyType(config.DefaultDirectoryPolicy)
-		if err != nil {
-			return nil, nil, err
-		}
-		switch policyType {
-		case Forbid:
-			return nil, nil, fmt.Errorf("%w: default directory not allowed by ACME policy", ErrServerInternal)
-		case SignVerbatim:
-			role = buildSignVerbatimRoleWithNoData(&roleEntry{
-				Issuer:  requestedIssuer,
-				NoStore: false,
-				Name:    requestedRole,
-			})
-		case Role:
-			defaultRole, err := getDefaultDirectoryPolicyRole(config.DefaultDirectoryPolicy)
-			if err != nil {
-				return nil, nil, err
-			}
-			role, err = getAndValidateAcmeRole(sc, defaultRole)
-			if err != nil {
-				return nil, nil, err
-			}
-		}
-	} else { // Requested Role
-		role, err = getAndValidateAcmeRole(sc, requestedRole)
-		if err != nil {
-			return nil, nil, err
-		}
-
-		// Check the Requested Role is Allowed
-		allowAnyRole := len(config.AllowedRoles) == 1 && config.AllowedRoles[0] == "*"
-		if !allowAnyRole {
-
-			var foundRole bool
-			for _, name := range config.AllowedRoles {
-				if name == role.Name {
-					foundRole = true
-					break
-				}
-			}
-
-			if !foundRole {
-				return nil, nil, fmt.Errorf("%w: specified role not allowed by ACME policy", ErrServerInternal)
-			}
-		}
-
-	}
-
-	// If we haven't loaded an issuer directly from our path and the specified (or default)
-	// role does specify an issuer prefer the role's issuer rather than the default issuer.
-	if len(role.Issuer) > 0 && len(requestedIssuer) == 0 {
-		issuerToLoad = role.Issuer
-	}
-
-	issuer, err := getAcmeIssuer(sc, issuerToLoad)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	allowAnyIssuer := len(config.AllowedIssuers) == 1 && config.AllowedIssuers[0] == "*"
-	if !allowAnyIssuer {
-		var foundIssuer bool
-		for index, name := range config.AllowedIssuers {
-			candidateId, err := sc.resolveIssuerReference(name)
-			if err != nil {
-				return nil, nil, fmt.Errorf("failed to resolve reference for allowed_issuer entry %d: %w", index, err)
-			}
-
-			if candidateId == issuer.ID {
-				foundIssuer = true
-				break
-			}
-		}
-
-		if !foundIssuer {
-			return nil, nil, fmt.Errorf("%w: specified issuer not allowed by ACME policy", ErrServerInternal)
-		}
-	}
-
-	// Override ExtKeyUsage behavior to force it to only be ServerAuth within ACME issued certs
-	role.ExtKeyUsage = []string{"serverauth"}
-	role.ExtKeyUsageOIDs = []string{}
-	role.ServerFlag = true
-	role.ClientFlag = false
-	role.CodeSigningFlag = false
-	role.EmailProtectionFlag = false
-
-	return role, issuer, nil
-}
-
-func getAndValidateAcmeRole(sc *storageContext, requestedRole string) (*roleEntry, error) {
-	var err error
-	role, err := sc.Backend.getRole(sc.Context, sc.Storage, requestedRole)
-	if err != nil {
-		return nil, fmt.Errorf("%w: err loading role", ErrServerInternal)
-	}
-
-	if role == nil {
-		return nil, fmt.Errorf("%w: role does not exist", ErrMalformed)
-	}
-
-	if role.NoStore {
-		return nil, fmt.Errorf("%w: role can not be used as NoStore is set to true", ErrServerInternal)
-	}
-
-	return role, nil
-}
-
-func getRequestedAcmeRoleFromPath(data *framework.FieldData) string {
-	requestedRole := ""
-	roleNameRaw, present := data.GetOk("role")
-	if present {
-		requestedRole = roleNameRaw.(string)
-	}
-	return requestedRole
-}
-
-func getRequestedAcmeIssuerFromPath(data *framework.FieldData) string {
-	requestedIssuer := ""
-	requestedIssuerRaw, present := data.GetOk(issuerRefParam)
-	if present {
-		requestedIssuer = requestedIssuerRaw.(string)
-	}
-	return requestedIssuer
-}
-
-func isAcmeDisabled(sc *storageContext, config *acmeConfigEntry, policy EabPolicy) bool {
-	if !config.Enabled {
-		return true
-	}
-
-	disableAcme, nonFatalErr := isPublicACMEDisabledByEnv()
-	if nonFatalErr != nil {
-		sc.Backend.Logger().Warn(fmt.Sprintf("could not parse env var '%s'", disableAcmeEnvVar), "error", nonFatalErr)
-	}
-
-	// The OS environment if true will override any configuration option.
-	if disableAcme {
-		if policy.OverrideEnvDisablingPublicAcme() {
-			return false
-		}
-		return true
-	}
-
-	return false
-}
diff --git a/builtin/logical/pki/acme_wrappers_test.go b/builtin/logical/pki/acme_wrappers_test.go
deleted file mode 100644
index 4182066495c4f..0000000000000
--- a/builtin/logical/pki/acme_wrappers_test.go
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package pki
-
-import (
-	"context"
-	"fmt"
-	"strings"
-	"testing"
-
-	"github.com/hashicorp/vault/sdk/framework"
-	"github.com/hashicorp/vault/sdk/logical"
-	"github.com/stretchr/testify/require"
-)
-
-// TestACMEIssuerRoleLoading validates the role and issuer loading logic within the base
-// ACME wrapper is correct.
-func TestACMEIssuerRoleLoading(t *testing.T) {
-	b, s := CreateBackendWithStorage(t)
-
-	_, err := CBWrite(b, s, "config/cluster", map[string]interface{}{
-		"path":     "http://localhost:8200/v1/pki",
-		"aia_path": "http://localhost:8200/cdn/pki",
-	})
-	require.NoError(t, err)
-
-	_, err = CBWrite(b, s, "config/acme", map[string]interface{}{
-		"enabled": true,
-	})
-	require.NoError(t, err)
-
-	_, err = CBWrite(b, s, "root/generate/internal", map[string]interface{}{
-		"common_name": "myvault1.com",
-		"issuer_name": "issuer-1",
-		"key_type":    "ec",
-	})
-	require.NoError(t, err, "failed creating issuer issuer-1")
-
-	_, err = CBWrite(b, s, "root/generate/internal", map[string]interface{}{
-		"common_name": "myvault2.com",
-		"issuer_name": "issuer-2",
-		"key_type":    "ec",
-	})
-	require.NoError(t, err, "failed creating issuer issuer-2")
-
-	_, err = CBWrite(b, s, "roles/role-bad-issuer", map[string]interface{}{
-		issuerRefParam: "non-existant",
-		"no_store":     "false",
-	})
-	require.NoError(t, err, "failed creating role role-bad-issuer")
-
-	_, err = CBWrite(b, s, "roles/role-no-store-enabled", map[string]interface{}{
-		issuerRefParam: "issuer-2",
-		"no_store":     "true",
-	})
-	require.NoError(t, err, "failed creating role role-no-store-enabled")
-
-	_, err = CBWrite(b, s, "roles/role-issuer-2", map[string]interface{}{
-		issuerRefParam: "issuer-2",
-		"no_store":     "false",
-	})
-	require.NoError(t, err, "failed creating role role-issuer-2")
-
-	tc := []struct {
-		name               string
-		roleName           string
-		issuerName         string
-		expectedIssuerName string
-		expectErr          bool
-	}{
-		{name: "pass-default-use-default", roleName: "", issuerName: "", expectedIssuerName: "issuer-1", expectErr: false},
-		{name: "pass-role-issuer-2", roleName: "role-issuer-2", issuerName: "", expectedIssuerName: "issuer-2", expectErr: false},
-		{name: "pass-issuer-1-no-role", roleName: "", issuerName: "issuer-1", expectedIssuerName: "issuer-1", expectErr: false},
-		{name: "fail-role-has-bad-issuer", roleName: "role-bad-issuer", issuerName: "", expectedIssuerName: "", expectErr: true},
-		{name: "fail-role-no-store-enabled", roleName: "role-no-store-enabled", issuerName: "", expectedIssuerName: "", expectErr: true},
-		{name: "fail-role-no-store-enabled", roleName: "role-no-store-enabled", issuerName: "", expectedIssuerName: "", expectErr: true},
-		{name: "fail-role-does-not-exist", roleName: "non-existant", issuerName: "", expectedIssuerName: "", expectErr: true},
-		{name: "fail-issuer-does-not-exist", roleName: "", issuerName: "non-existant", expectedIssuerName: "", expectErr: true},
-	}
-
-	for _, tt := range tc {
-		t.Run(tt.name, func(t *testing.T) {
-			f := b.acmeWrapper(func(acmeCtx *acmeContext, r *logical.Request, _ *framework.FieldData) (*logical.Response, error) {
-				if tt.roleName != acmeCtx.role.Name {
-					return nil, fmt.Errorf("expected role %s but got %s", tt.roleName, acmeCtx.role.Name)
-				}
-
-				if tt.expectedIssuerName != acmeCtx.issuer.Name {
-					return nil, fmt.Errorf("expected issuer %s but got %s", tt.expectedIssuerName, acmeCtx.issuer.Name)
-				}
-
-				return nil, nil
-			})
-
-			var acmePath string
-			fieldRaw := map[string]interface{}{}
-			if tt.issuerName != "" {
-				fieldRaw[issuerRefParam] = tt.issuerName
-				acmePath = "issuer/" + tt.issuerName + "/"
-			}
-			if tt.roleName != "" {
-				fieldRaw["role"] = tt.roleName
-				acmePath = acmePath + "roles/" + tt.roleName + "/"
-			}
-
-			acmePath = strings.TrimLeft(acmePath+"/acme/directory", "/")
-
-			resp, err := f(context.Background(), &logical.Request{Path: acmePath, Storage: s}, &framework.FieldData{
-				Raw:    fieldRaw,
-				Schema: getCsrSignVerbatimSchemaFields(),
-			})
-			require.NoError(t, err, "all errors should be re-encoded")
-
-			if tt.expectErr {
-				require.NotEqual(t, 200, resp.Data[logical.HTTPStatusCode])
-				require.Equal(t, ErrorContentType, resp.Data[logical.HTTPContentType])
-			} else {
-				if resp != nil {
-					t.Fatalf("expected no error got %s", string(resp.Data[logical.HTTPRawBody].([]uint8)))
-				}
-			}
-		})
-	}
-}
diff --git a/builtin/logical/pki/backend.go b/builtin/logical/pki/backend.go
index 8caf2f6a2db90..69fda68e540f5 100644
--- a/builtin/logical/pki/backend.go
+++ b/builtin/logical/pki/backend.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pki
 
 import (
@@ -14,22 +11,16 @@ import (
 
 	atomic2 "go.uber.org/atomic"
 
+	"github.com/hashicorp/vault/sdk/helper/consts"
+
 	"github.com/armon/go-metrics"
-	"github.com/hashicorp/go-multierror"
-	"github.com/hashicorp/vault/helper/constants"
 	"github.com/hashicorp/vault/helper/metricsutil"
 	"github.com/hashicorp/vault/helper/namespace"
 	"github.com/hashicorp/vault/sdk/framework"
-	"github.com/hashicorp/vault/sdk/helper/consts"
 	"github.com/hashicorp/vault/sdk/logical"
 )
 
 const (
-	operationPrefixPKI        = "pki"
-	operationPrefixPKIIssuer  = "pki-issuer"
-	operationPrefixPKIIssuers = "pki-issuers"
-	operationPrefixPKIRoot    = "pki-root"
-
 	noRole       = 0
 	roleOptional = 1
 	roleRequired = 2
@@ -97,36 +88,20 @@ func Backend(conf *logical.BackendConfig) *backend {
 				"issuer/+/crl/delta/der",
 				"issuer/+/crl/delta/pem",
 				"issuer/+/crl/delta",
-				"issuer/+/unified-crl/der",
-				"issuer/+/unified-crl/pem",
-				"issuer/+/unified-crl",
-				"issuer/+/unified-crl/delta/der",
-				"issuer/+/unified-crl/delta/pem",
-				"issuer/+/unified-crl/delta",
 				"issuer/+/pem",
 				"issuer/+/der",
 				"issuer/+/json",
 				"issuers/", // LIST operations append a '/' to the requested path
 				"ocsp",     // OCSP POST
 				"ocsp/*",   // OCSP GET
-				"unified-crl/delta",
-				"unified-crl/delta/pem",
-				"unified-crl/pem",
-				"unified-crl",
-				"unified-ocsp",   // Unified OCSP POST
-				"unified-ocsp/*", // Unified OCSP GET
-
-				// ACME paths are added below
 			},
 
 			LocalStorage: []string{
 				revokedPath,
-				localDeltaWALPath,
+				deltaWALPath,
 				legacyCRLPath,
-				clusterConfigPath,
 				"crls/",
 				"certs/",
-				acmePathPrefix,
 			},
 
 			Root: []string{
@@ -136,15 +111,8 @@ func Backend(conf *logical.BackendConfig) *backend {
 
 			SealWrapStorage: []string{
 				legacyCertBundlePath,
-				legacyCertBundleBackupPath,
 				keyPrefix,
 			},
-
-			WriteForwardedStorage: []string{
-				crossRevocationPath,
-				unifiedRevocationWritePathPrefix,
-				unifiedDeltaWALPath,
-			},
 		},
 
 		Paths: []*framework.Path{
@@ -159,7 +127,6 @@ func Backend(conf *logical.BackendConfig) *backend {
 			pathConfigCA(&b),
 			pathConfigCRL(&b),
 			pathConfigURLs(&b),
-			pathConfigCluster(&b),
 			pathSignVerbatim(&b),
 			pathSign(&b),
 			pathIssue(&b),
@@ -167,7 +134,6 @@ func Backend(conf *logical.BackendConfig) *backend {
 			pathRotateDeltaCRL(&b),
 			pathRevoke(&b),
 			pathRevokeWithKey(&b),
-			pathListCertsRevoked(&b),
 			pathTidy(&b),
 			pathTidyCancel(&b),
 			pathTidyStatus(&b),
@@ -211,15 +177,6 @@ func Backend(conf *logical.BackendConfig) *backend {
 			// OCSP APIs
 			buildPathOcspGet(&b),
 			buildPathOcspPost(&b),
-
-			// CRL Signing
-			pathResignCrls(&b),
-			pathSignRevocationList(&b),
-
-			// ACME
-			pathAcmeConfig(&b),
-			pathAcmeEabList(&b),
-			pathAcmeEabDelete(&b),
 		},
 
 		Secrets: []*framework.Secret{
@@ -230,58 +187,6 @@ func Backend(conf *logical.BackendConfig) *backend {
 		InitializeFunc: b.initialize,
 		Invalidate:     b.invalidate,
 		PeriodicFunc:   b.periodicFunc,
-		Clean:          b.cleanup,
-	}
-
-	// Add ACME paths to backend
-	var acmePaths []*framework.Path
-	acmePaths = append(acmePaths, pathAcmeDirectory(&b)...)
-	acmePaths = append(acmePaths, pathAcmeNonce(&b)...)
-	acmePaths = append(acmePaths, pathAcmeNewAccount(&b)...)
-	acmePaths = append(acmePaths, pathAcmeUpdateAccount(&b)...)
-	acmePaths = append(acmePaths, pathAcmeGetOrder(&b)...)
-	acmePaths = append(acmePaths, pathAcmeListOrders(&b)...)
-	acmePaths = append(acmePaths, pathAcmeNewOrder(&b)...)
-	acmePaths = append(acmePaths, pathAcmeFinalizeOrder(&b)...)
-	acmePaths = append(acmePaths, pathAcmeFetchOrderCert(&b)...)
-	acmePaths = append(acmePaths, pathAcmeChallenge(&b)...)
-	acmePaths = append(acmePaths, pathAcmeAuthorization(&b)...)
-	acmePaths = append(acmePaths, pathAcmeRevoke(&b)...)
-	acmePaths = append(acmePaths, pathAcmeNewEab(&b)...) // auth'd API that lives underneath the various /acme paths
-
-	for _, acmePath := range acmePaths {
-		b.Backend.Paths = append(b.Backend.Paths, acmePath)
-	}
-
-	// Add specific un-auth'd paths for ACME APIs
-	for _, acmePrefix := range []string{"", "issuer/+/", "roles/+/", "issuer/+/roles/+/"} {
-		b.PathsSpecial.Unauthenticated = append(b.PathsSpecial.Unauthenticated, acmePrefix+"acme/directory")
-		b.PathsSpecial.Unauthenticated = append(b.PathsSpecial.Unauthenticated, acmePrefix+"acme/new-nonce")
-		b.PathsSpecial.Unauthenticated = append(b.PathsSpecial.Unauthenticated, acmePrefix+"acme/new-account")
-		b.PathsSpecial.Unauthenticated = append(b.PathsSpecial.Unauthenticated, acmePrefix+"acme/new-order")
-		b.PathsSpecial.Unauthenticated = append(b.PathsSpecial.Unauthenticated, acmePrefix+"acme/revoke-cert")
-		b.PathsSpecial.Unauthenticated = append(b.PathsSpecial.Unauthenticated, acmePrefix+"acme/key-change")
-		b.PathsSpecial.Unauthenticated = append(b.PathsSpecial.Unauthenticated, acmePrefix+"acme/account/+")
-		b.PathsSpecial.Unauthenticated = append(b.PathsSpecial.Unauthenticated, acmePrefix+"acme/authorization/+")
-		b.PathsSpecial.Unauthenticated = append(b.PathsSpecial.Unauthenticated, acmePrefix+"acme/challenge/+/+")
-		b.PathsSpecial.Unauthenticated = append(b.PathsSpecial.Unauthenticated, acmePrefix+"acme/orders")
-		b.PathsSpecial.Unauthenticated = append(b.PathsSpecial.Unauthenticated, acmePrefix+"acme/order/+")
-		b.PathsSpecial.Unauthenticated = append(b.PathsSpecial.Unauthenticated, acmePrefix+"acme/order/+/finalize")
-		b.PathsSpecial.Unauthenticated = append(b.PathsSpecial.Unauthenticated, acmePrefix+"acme/order/+/cert")
-		// We specifically do NOT add acme/new-eab to this as it should be auth'd
-	}
-
-	if constants.IsEnterprise {
-		// Unified CRL/OCSP paths are ENT only
-		entOnly := []*framework.Path{
-			pathGetIssuerUnifiedCRL(&b),
-			pathListCertsRevocationQueue(&b),
-			pathListUnifiedRevoked(&b),
-			pathFetchUnifiedCRL(&b),
-			buildPathUnifiedOcspGet(&b),
-			buildPathUnifiedOcspPost(&b),
-		}
-		b.Backend.Paths = append(b.Backend.Paths, entOnly...)
 	}
 
 	b.tidyCASGuard = new(uint32)
@@ -303,18 +208,12 @@ func Backend(conf *logical.BackendConfig) *backend {
 	b.lastTidy = time.Now()
 
 	// Metrics initialization for count of certificates in storage
-	b.certCountEnabled = atomic2.NewBool(false)
-	b.publishCertCountMetrics = atomic2.NewBool(false)
 	b.certsCounted = atomic2.NewBool(false)
-	b.certCountError = "Initialize Not Yet Run, Cert Counts Unavailable"
-	b.certCount = &atomic.Uint32{}
-	b.revokedCertCount = &atomic.Uint32{}
+	b.certCount = new(uint32)
+	b.revokedCertCount = new(uint32)
 	b.possibleDoubleCountedSerials = make([]string, 0, 250)
 	b.possibleDoubleCountedRevokedSerials = make([]string, 0, 250)
 
-	b.unifiedTransferStatus = newUnifiedTransferStatus()
-
-	b.acmeState = NewACMEState()
 	return &b
 }
 
@@ -331,14 +230,9 @@ type backend struct {
 	tidyStatus     *tidyStatus
 	lastTidy       time.Time
 
-	unifiedTransferStatus *unifiedTransferStatus
-
-	certCountEnabled                    *atomic2.Bool
-	publishCertCountMetrics             *atomic2.Bool
-	certCount                           *atomic.Uint32
-	revokedCertCount                    *atomic.Uint32
+	certCount                           *uint32
+	revokedCertCount                    *uint32
 	certsCounted                        *atomic2.Bool
-	certCountError                      string
 	possibleDoubleCountedSerials        []string
 	possibleDoubleCountedRevokedSerials []string
 
@@ -347,14 +241,40 @@ type backend struct {
 
 	// Write lock around issuers and keys.
 	issuersLock sync.RWMutex
-
-	// Context around ACME operations
-	acmeState       *acmeState
-	acmeAccountLock sync.RWMutex // (Write) Locked on Tidy, (Read) Locked on Account Creation
-	// TODO: Stress test this - eg. creating an order while an account is being revoked
 }
 
-type roleOperation func(ctx context.Context, req *logical.Request, data *framework.FieldData, role *roleEntry) (*logical.Response, error)
+type (
+	tidyStatusState int
+	roleOperation   func(ctx context.Context, req *logical.Request, data *framework.FieldData, role *roleEntry) (*logical.Response, error)
+)
+
+const (
+	tidyStatusInactive   tidyStatusState = iota
+	tidyStatusStarted                    = iota
+	tidyStatusFinished                   = iota
+	tidyStatusError                      = iota
+	tidyStatusCancelling                 = iota
+	tidyStatusCancelled                  = iota
+)
+
+type tidyStatus struct {
+	// Parameters used to initiate the operation
+	safetyBuffer      int
+	tidyCertStore     bool
+	tidyRevokedCerts  bool
+	tidyRevokedAssocs bool
+	pauseDuration     string
+
+	// Status
+	state                   tidyStatusState
+	err                     error
+	timeStarted             time.Time
+	timeFinished            time.Time
+	message                 string
+	certStoreDeletedCount   uint
+	revokedCertDeletedCount uint
+	missingIssuerCertCount  uint
+}
 
 const backendHelp = `
 The PKI backend dynamically generates X509 server and client certificates.
@@ -432,26 +352,15 @@ func (b *backend) initialize(ctx context.Context, _ *logical.InitializationReque
 		return err
 	}
 
-	err = b.acmeState.Initialize(b, sc)
-	if err != nil {
-		return err
-	}
-
 	// Initialize also needs to populate our certificate and revoked certificate count
 	err = b.initializeStoredCertificateCounts(ctx)
 	if err != nil {
-		// Don't block/err initialize/startup for metrics.  Context on this call can time out due to number of certificates.
-		b.Logger().Error("Could not initialize stored certificate counts", "error", err)
-		b.certCountError = err.Error()
+		return err
 	}
 
 	return nil
 }
 
-func (b *backend) cleanup(_ context.Context) {
-	b.acmeState.validator.Closing <- struct{}{}
-}
-
 func (b *backend) initializePKIIssuersStorage(ctx context.Context) error {
 	// Grab the lock prior to the updating of the storage lock preventing us flipping
 	// the storage flag midway through the request stream of other requests.
@@ -498,12 +407,6 @@ func (b *backend) updatePkiStorageVersion(ctx context.Context, grabIssuersLock b
 		return
 	}
 
-	// If this method is called outside the initialize function, like say an
-	// invalidate func on a performance replica cluster, we should be grabbing
-	// the issuers lock to offer a consistent view of the storage version while
-	// other events are processing things. Its unknown what might happen during
-	// a single event if one part thinks we are in legacy mode, and then later
-	// on we aren't.
 	if grabIssuersLock {
 		b.issuersLock.Lock()
 		defer b.issuersLock.Unlock()
@@ -517,9 +420,6 @@ func (b *backend) updatePkiStorageVersion(ctx context.Context, grabIssuersLock b
 }
 
 func (b *backend) invalidate(ctx context.Context, key string) {
-	isNotPerfPrimary := b.System().ReplicationState().HasState(consts.ReplicationDRSecondary|consts.ReplicationPerformanceStandby) ||
-		(!b.System().LocalMount() && b.System().ReplicationState().HasState(consts.ReplicationPerformanceSecondary))
-
 	switch {
 	case strings.HasPrefix(key, legacyMigrationBundleLogKey):
 		// This is for a secondary cluster to pick up that the migration has completed
@@ -548,37 +448,8 @@ func (b *backend) invalidate(ctx context.Context, key string) {
 	case key == "config/crl":
 		// We may need to reload our OCSP status flag
 		b.crlBuilder.markConfigDirty()
-	case key == storageAcmeConfig:
-		b.acmeState.markConfigDirty()
 	case key == storageIssuerConfig:
 		b.crlBuilder.invalidateCRLBuildTime()
-	case strings.HasPrefix(key, crossRevocationPrefix):
-		split := strings.Split(key, "/")
-
-		if !strings.HasSuffix(key, "/confirmed") {
-			cluster := split[len(split)-2]
-			serial := split[len(split)-1]
-			b.crlBuilder.addCertForRevocationCheck(cluster, serial)
-		} else {
-			if len(split) >= 3 {
-				cluster := split[len(split)-3]
-				serial := split[len(split)-2]
-				// Only process confirmations on the perf primary. The
-				// performance secondaries cannot remove other clusters'
-				// entries, and so do not need to track them (only to
-				// ignore them). On performance primary nodes though,
-				// we do want to track them to remove them.
-				if !isNotPerfPrimary {
-					b.crlBuilder.addCertForRevocationRemoval(cluster, serial)
-				}
-			}
-		}
-	case strings.HasPrefix(key, unifiedRevocationReadPathPrefix):
-		// Three parts to this key: prefix, cluster, and serial.
-		split := strings.Split(key, "/")
-		cluster := split[len(split)-2]
-		serial := split[len(split)-1]
-		b.crlBuilder.addCertFromCrossRevocation(cluster, serial)
 	}
 }
 
@@ -598,48 +469,22 @@ func (b *backend) periodicFunc(ctx context.Context, request *logical.Request) er
 			return nil
 		}
 
-		// First handle any global revocation queue entries.
-		if err := b.crlBuilder.processRevocationQueue(sc); err != nil {
-			return err
-		}
-
-		// Then handle any unified cross-cluster revocations.
-		if err := b.crlBuilder.processCrossClusterRevocations(sc); err != nil {
-			return err
-		}
-
 		// Check if we're set to auto rebuild and a CRL is set to expire.
 		if err := b.crlBuilder.checkForAutoRebuild(sc); err != nil {
 			return err
 		}
 
 		// Then attempt to rebuild the CRLs if required.
-		warnings, err := b.crlBuilder.rebuildIfForced(sc)
-		if err != nil {
+		if err := b.crlBuilder.rebuildIfForced(ctx, b, request); err != nil {
 			return err
 		}
-		if len(warnings) > 0 {
-			msg := "During rebuild of complete CRL, got the following warnings:"
-			for index, warning := range warnings {
-				msg = fmt.Sprintf("%v\n %d. %v", msg, index+1, warning)
-			}
-			b.Logger().Warn(msg)
-		}
 
 		// If a delta CRL was rebuilt above as part of the complete CRL rebuild,
 		// this will be a no-op. However, if we do need to rebuild delta CRLs,
 		// this would cause us to do so.
-		warnings, err = b.crlBuilder.rebuildDeltaCRLsIfForced(sc, false)
-		if err != nil {
+		if err := b.crlBuilder.rebuildDeltaCRLsIfForced(sc, false); err != nil {
 			return err
 		}
-		if len(warnings) > 0 {
-			msg := "During rebuild of delta CRL, got the following warnings:"
-			for index, warning := range warnings {
-				msg = fmt.Sprintf("%v\n %d. %v", msg, index+1, warning)
-			}
-			b.Logger().Warn(msg)
-		}
 
 		return nil
 	}
@@ -695,35 +540,19 @@ func (b *backend) periodicFunc(ctx context.Context, request *logical.Request) er
 		return nil
 	}
 
-	// First tidy any ACME nonces to free memory.
-	b.acmeState.DoTidyNonces()
-
-	// Then run unified transfer.
-	backgroundSc := b.makeStorageContext(context.Background(), b.storage)
-	go runUnifiedTransfer(backgroundSc)
-
-	// Then run the CRL rebuild and tidy operation.
 	crlErr := doCRL()
 	tidyErr := doAutoTidy()
 
-	// Periodically re-emit gauges so that they don't disappear/go stale
-	tidyConfig, err := sc.getAutoTidyConfig()
-	if err != nil {
-		return err
+	if crlErr != nil && tidyErr != nil {
+		return fmt.Errorf("Error building CRLs:\n - %v\n\nError running auto-tidy:\n - %v\n", crlErr, tidyErr)
 	}
-	b.emitCertStoreMetrics(tidyConfig)
 
-	var errors error
 	if crlErr != nil {
-		errors = multierror.Append(errors, fmt.Errorf("Error building CRLs:\n - %w\n", crlErr))
+		return fmt.Errorf("Error building CRLs:\n - %v\n", crlErr)
 	}
 
 	if tidyErr != nil {
-		errors = multierror.Append(errors, fmt.Errorf("Error running auto-tidy:\n - %w\n", tidyErr))
-	}
-
-	if errors != nil {
-		return errors
+		return fmt.Errorf("Error running auto-tidy:\n - %v\n", tidyErr)
 	}
 
 	// Check if the CRL was invalidated due to issuer swap and update
@@ -737,51 +566,24 @@ func (b *backend) periodicFunc(ctx context.Context, request *logical.Request) er
 }
 
 func (b *backend) initializeStoredCertificateCounts(ctx context.Context) error {
+	b.tidyStatusLock.RLock()
+	defer b.tidyStatusLock.RUnlock()
 	// For performance reasons, we can't lock on issuance/storage of certs until a list operation completes,
 	// but we want to limit possible miscounts / double-counts to over-counting, so we take the tidy lock which
 	// prevents (most) deletions - in particular we take a read lock (sufficient to block the write lock in
 	// tidyStatusStart while allowing tidy to still acquire a read lock to report via its endpoint)
-	b.tidyStatusLock.RLock()
-	defer b.tidyStatusLock.RUnlock()
-	sc := b.makeStorageContext(ctx, b.storage)
-	config, err := sc.getAutoTidyConfig()
-	if err != nil {
-		return err
-	}
-
-	b.certCountEnabled.Store(config.MaintainCount)
-	b.publishCertCountMetrics.Store(config.PublishMetrics)
-
-	if config.MaintainCount == false {
-		b.possibleDoubleCountedRevokedSerials = nil
-		b.possibleDoubleCountedSerials = nil
-		b.certsCounted.Store(true)
-		b.certCount.Store(0)
-		b.revokedCertCount.Store(0)
-		b.certCountError = "Cert Count is Disabled: enable via Tidy Config maintain_stored_certificate_counts"
-		return nil
-	}
-
-	// Ideally these three things would be set in one transaction, since that isn't possible, set the counts to "0",
-	// first, so count will over-count (and miss putting things in deduplicate queue), rather than under-count.
-	b.certCount.Store(0)
-	b.revokedCertCount.Store(0)
-	b.possibleDoubleCountedRevokedSerials = nil
-	b.possibleDoubleCountedSerials = nil
-	// A cert issued or revoked here will be double-counted.  That's okay, this is "best effort" metrics.
-	b.certsCounted.Store(false)
 
 	entries, err := b.storage.List(ctx, "certs/")
 	if err != nil {
 		return err
 	}
-	b.certCount.Add(uint32(len(entries)))
+	atomic.AddUint32(b.certCount, uint32(len(entries)))
 
 	revokedEntries, err := b.storage.List(ctx, "revoked/")
 	if err != nil {
 		return err
 	}
-	b.revokedCertCount.Add(uint32(len(revokedEntries)))
+	atomic.AddUint32(b.revokedCertCount, uint32(len(revokedEntries)))
 
 	b.certsCounted.Store(true)
 	// Now that the metrics are set, we can switch from appending newly-stored certificates to the possible double-count
@@ -862,98 +664,64 @@ func (b *backend) initializeStoredCertificateCounts(ctx context.Context) error {
 	b.possibleDoubleCountedRevokedSerials = nil
 	b.possibleDoubleCountedSerials = nil
 
-	b.emitCertStoreMetrics(config)
-
-	b.certCountError = ""
+	certCount := atomic.LoadUint32(b.certCount)
+	metrics.SetGauge([]string{"secrets", "pki", b.backendUUID, "total_certificates_stored"}, float32(certCount))
+	revokedCertCount := atomic.LoadUint32(b.revokedCertCount)
+	metrics.SetGauge([]string{"secrets", "pki", b.backendUUID, "total_revoked_certificates_stored"}, float32(revokedCertCount))
 
 	return nil
 }
 
-func (b *backend) emitCertStoreMetrics(config *tidyConfig) {
-	if config.PublishMetrics == true {
-		certCount := b.certCount.Load()
-		b.emitTotalCertCountMetric(certCount)
-		revokedCertCount := b.revokedCertCount.Load()
-		b.emitTotalRevokedCountMetric(revokedCertCount)
-	}
-}
-
 // The "certsCounted" boolean here should be loaded from the backend certsCounted before the corresponding storage call:
 // eg. certsCounted := b.certsCounted.Load()
-func (b *backend) ifCountEnabledIncrementTotalCertificatesCount(certsCounted bool, newSerial string) {
-	if b.certCountEnabled.Load() {
-		certCount := b.certCount.Add(1)
-		switch {
-		case !certsCounted:
-			// This is unsafe, but a good best-attempt
-			if strings.HasPrefix(newSerial, "certs/") {
-				newSerial = newSerial[6:]
-			}
-			b.possibleDoubleCountedSerials = append(b.possibleDoubleCountedSerials, newSerial)
-		default:
-			if b.publishCertCountMetrics.Load() {
-				b.emitTotalCertCountMetric(certCount)
-			}
-		}
-	}
-}
-
-func (b *backend) ifCountEnabledDecrementTotalCertificatesCountReport() {
-	if b.certCountEnabled.Load() {
-		certCount := b.decrementTotalCertificatesCountNoReport()
-		if b.publishCertCountMetrics.Load() {
-			b.emitTotalCertCountMetric(certCount)
+func (b *backend) incrementTotalCertificatesCount(certsCounted bool, newSerial string) {
+	certCount := atomic.AddUint32(b.certCount, 1)
+	switch {
+	case !certsCounted:
+		// This is unsafe, but a good best-attempt
+		if strings.HasPrefix(newSerial, "certs/") {
+			newSerial = newSerial[6:]
 		}
+		b.possibleDoubleCountedSerials = append(b.possibleDoubleCountedSerials, newSerial)
+	default:
+		metrics.SetGauge([]string{"secrets", "pki", b.backendUUID, "total_certificates_stored"}, float32(certCount))
 	}
 }
 
-func (b *backend) emitTotalCertCountMetric(certCount uint32) {
+func (b *backend) decrementTotalCertificatesCountReport() {
+	certCount := b.decrementTotalCertificatesCountNoReport()
 	metrics.SetGauge([]string{"secrets", "pki", b.backendUUID, "total_certificates_stored"}, float32(certCount))
 }
 
 // Called directly only by the initialize function to deduplicate the count, when we don't have a full count yet
-// Does not respect whether-we-are-counting backend information.
 func (b *backend) decrementTotalCertificatesCountNoReport() uint32 {
-	newCount := b.certCount.Add(^uint32(0))
+	newCount := atomic.AddUint32(b.certCount, ^uint32(0))
 	return newCount
 }
 
 // The "certsCounted" boolean here should be loaded from the backend certsCounted before the corresponding storage call:
 // eg. certsCounted := b.certsCounted.Load()
-func (b *backend) ifCountEnabledIncrementTotalRevokedCertificatesCount(certsCounted bool, newSerial string) {
-	if b.certCountEnabled.Load() {
-		newRevokedCertCount := b.revokedCertCount.Add(1)
-		switch {
-		case !certsCounted:
-			// This is unsafe, but a good best-attempt
-			if strings.HasPrefix(newSerial, "revoked/") { // allow passing in the path (revoked/serial) OR the serial
-				newSerial = newSerial[8:]
-			}
-			b.possibleDoubleCountedRevokedSerials = append(b.possibleDoubleCountedRevokedSerials, newSerial)
-		default:
-			if b.publishCertCountMetrics.Load() {
-				b.emitTotalRevokedCountMetric(newRevokedCertCount)
-			}
-		}
-	}
-}
-
-func (b *backend) ifCountEnabledDecrementTotalRevokedCertificatesCountReport() {
-	if b.certCountEnabled.Load() {
-		revokedCertCount := b.decrementTotalRevokedCertificatesCountNoReport()
-		if b.publishCertCountMetrics.Load() {
-			b.emitTotalRevokedCountMetric(revokedCertCount)
+func (b *backend) incrementTotalRevokedCertificatesCount(certsCounted bool, newSerial string) {
+	newRevokedCertCount := atomic.AddUint32(b.revokedCertCount, 1)
+	switch {
+	case !certsCounted:
+		// This is unsafe, but a good best-attempt
+		if strings.HasPrefix(newSerial, "revoked/") { // allow passing in the path (revoked/serial) OR the serial
+			newSerial = newSerial[8:]
 		}
+		b.possibleDoubleCountedRevokedSerials = append(b.possibleDoubleCountedRevokedSerials, newSerial)
+	default:
+		metrics.SetGauge([]string{"secrets", "pki", b.backendUUID, "total_revoked_certificates_stored"}, float32(newRevokedCertCount))
 	}
 }
 
-func (b *backend) emitTotalRevokedCountMetric(revokedCertCount uint32) {
+func (b *backend) decrementTotalRevokedCertificatesCountReport() {
+	revokedCertCount := b.decrementTotalRevokedCertificatesCountNoReport()
 	metrics.SetGauge([]string{"secrets", "pki", b.backendUUID, "total_revoked_certificates_stored"}, float32(revokedCertCount))
 }
 
 // Called directly only by the initialize function to deduplicate the count, when we don't have a full count yet
-// Does not respect whether-we-are-counting backend information.
 func (b *backend) decrementTotalRevokedCertificatesCountNoReport() uint32 {
-	newRevokedCertCount := b.revokedCertCount.Add(^uint32(0))
+	newRevokedCertCount := atomic.AddUint32(b.revokedCertCount, ^uint32(0))
 	return newRevokedCertCount
 }
diff --git a/builtin/logical/pki/backend_test.go b/builtin/logical/pki/backend_test.go
index 6e779199363ef..69a379d79f8bd 100644
--- a/builtin/logical/pki/backend_test.go
+++ b/builtin/logical/pki/backend_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pki
 
 import (
@@ -30,15 +27,10 @@ import (
 	"strconv"
 	"strings"
 	"sync"
+	"sync/atomic"
 	"testing"
 	"time"
 
-	"github.com/hashicorp/vault/helper/testhelpers/teststorage"
-
-	"github.com/hashicorp/vault/helper/testhelpers"
-
-	"github.com/hashicorp/vault/sdk/helper/testhelpers/schema"
-
 	"github.com/stretchr/testify/require"
 
 	"github.com/armon/go-metrics"
@@ -112,7 +104,7 @@ OzQeADTSCn5VidOfjDkIst9UXjMlrFfV9/oJEw5Eiqa6lkNPCGDhfA8=
 
 func TestPKI_RequireCN(t *testing.T) {
 	t.Parallel()
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 
 	resp, err := CBWrite(b, s, "root/generate/internal", map[string]interface{}{
 		"common_name": "myvault.com",
@@ -137,10 +129,9 @@ func TestPKI_RequireCN(t *testing.T) {
 
 	// Issue a cert with require_cn set to true and with common name supplied.
 	// It should succeed.
-	resp, err = CBWrite(b, s, "issue/example", map[string]interface{}{
+	_, err = CBWrite(b, s, "issue/example", map[string]interface{}{
 		"common_name": "foobar.com",
 	})
-	schema.ValidateResponse(t, schema.GetResponseSchema(t, b.Route("issue/example"), logical.UpdateOperation), resp, true)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -189,7 +180,7 @@ func TestPKI_RequireCN(t *testing.T) {
 
 func TestPKI_DeviceCert(t *testing.T) {
 	t.Parallel()
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 
 	resp, err := CBWrite(b, s, "root/generate/internal", map[string]interface{}{
 		"common_name":         "myvault.com",
@@ -258,7 +249,7 @@ func TestPKI_DeviceCert(t *testing.T) {
 
 func TestBackend_InvalidParameter(t *testing.T) {
 	t.Parallel()
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 
 	_, err := CBWrite(b, s, "root/generate/internal", map[string]interface{}{
 		"common_name": "myvault.com",
@@ -281,7 +272,7 @@ func TestBackend_InvalidParameter(t *testing.T) {
 func TestBackend_CSRValues(t *testing.T) {
 	t.Parallel()
 	initTest.Do(setCerts)
-	b, _ := CreateBackendWithStorage(t)
+	b, _ := createBackendWithStorage(t)
 
 	testCase := logicaltest.TestCase{
 		LogicalBackend: b,
@@ -298,7 +289,7 @@ func TestBackend_CSRValues(t *testing.T) {
 func TestBackend_URLsCRUD(t *testing.T) {
 	t.Parallel()
 	initTest.Do(setCerts)
-	b, _ := CreateBackendWithStorage(t)
+	b, _ := createBackendWithStorage(t)
 
 	testCase := logicaltest.TestCase{
 		LogicalBackend: b,
@@ -334,7 +325,7 @@ func TestBackend_Roles(t *testing.T) {
 
 		t.Run(tc.name, func(t *testing.T) {
 			initTest.Do(setCerts)
-			b, _ := CreateBackendWithStorage(t)
+			b, _ := createBackendWithStorage(t)
 
 			testCase := logicaltest.TestCase{
 				LogicalBackend: b,
@@ -475,13 +466,8 @@ func checkCertsAndPrivateKey(keyType string, key crypto.Signer, usage x509.KeyUs
 		}
 	}
 
-	// TODO: We incremented 20->25 due to CircleCI execution
-	// being slow and pausing this test. We might consider recording the
-	// actual issuance time of the cert and calculating the expected
-	// validity period +/- fuzz, but that'd require recording and passing
-	// through more information.
-	if math.Abs(float64(time.Now().Add(validity).Unix()-cert.NotAfter.Unix())) > 25 {
-		return nil, fmt.Errorf("certificate validity end: %s; expected within 25 seconds of %s", cert.NotAfter.Format(time.RFC3339), time.Now().Add(validity).Format(time.RFC3339))
+	if math.Abs(float64(time.Now().Add(validity).Unix()-cert.NotAfter.Unix())) > 20 {
+		return nil, fmt.Errorf("certificate validity end: %s; expected within 20 seconds of %s", cert.NotAfter.Format(time.RFC3339), time.Now().Add(validity).Format(time.RFC3339))
 	}
 
 	return parsedCertBundle, nil
@@ -560,6 +546,7 @@ func generateURLSteps(t *testing.T, caCert, caKey string, intdata, reqdata map[s
 				if err != nil {
 					return err
 				}
+
 				if !reflect.DeepEqual(entries, expected) {
 					return fmt.Errorf("expected urls\n%#v\ndoes not match provided\n%#v\n", expected, entries)
 				}
@@ -612,7 +599,7 @@ func generateURLSteps(t *testing.T, caCert, caKey string, intdata, reqdata map[s
 				certBytes, _ := base64.StdEncoding.DecodeString(certString)
 				certs, err := x509.ParseCertificates(certBytes)
 				if err != nil {
-					return fmt.Errorf("returned cert cannot be parsed: %w", err)
+					return fmt.Errorf("returned cert cannot be parsed: %v", err)
 				}
 				if len(certs) != 1 {
 					return fmt.Errorf("unexpected returned length of certificates: %d", len(certs))
@@ -665,7 +652,7 @@ func generateURLSteps(t *testing.T, caCert, caKey string, intdata, reqdata map[s
 				certBytes, _ := base64.StdEncoding.DecodeString(certString)
 				certs, err := x509.ParseCertificates(certBytes)
 				if err != nil {
-					return fmt.Errorf("returned cert cannot be parsed: %w", err)
+					return fmt.Errorf("returned cert cannot be parsed: %v", err)
 				}
 				if len(certs) != 1 {
 					return fmt.Errorf("unexpected returned length of certificates: %d", len(certs))
@@ -691,8 +678,6 @@ func generateURLSteps(t *testing.T, caCert, caKey string, intdata, reqdata map[s
 }
 
 func generateCSR(t *testing.T, csrTemplate *x509.CertificateRequest, keyType string, keyBits int) (interface{}, []byte, string) {
-	t.Helper()
-
 	var priv interface{}
 	var err error
 	switch keyType {
@@ -788,7 +773,7 @@ func generateCSRSteps(t *testing.T, caCert, caKey string, intdata, reqdata map[s
 				certBytes, _ := base64.StdEncoding.DecodeString(certString)
 				certs, err := x509.ParseCertificates(certBytes)
 				if err != nil {
-					return fmt.Errorf("returned cert cannot be parsed: %w", err)
+					return fmt.Errorf("returned cert cannot be parsed: %v", err)
 				}
 				if len(certs) != 1 {
 					return fmt.Errorf("unexpected returned length of certificates: %d", len(certs))
@@ -824,8 +809,6 @@ func generateCSRSteps(t *testing.T, caCert, caKey string, intdata, reqdata map[s
 }
 
 func generateTestCsr(t *testing.T, keyType certutil.PrivateKeyType, keyBits int) (x509.CertificateRequest, string) {
-	t.Helper()
-
 	csrTemplate := x509.CertificateRequest{
 		Subject: pkix.Name{
 			Country:      []string{"MyCountry"},
@@ -1747,7 +1730,7 @@ func generateRoleSteps(t *testing.T, useCSRs bool) []logicaltest.TestStep {
 
 func TestRolesAltIssuer(t *testing.T) {
 	t.Parallel()
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 
 	// Create two issuers.
 	resp, err := CBWrite(b, s, "root/generate/internal", map[string]interface{}{
@@ -1845,7 +1828,7 @@ func TestRolesAltIssuer(t *testing.T) {
 
 func TestBackend_PathFetchValidRaw(t *testing.T) {
 	t.Parallel()
-	b, storage := CreateBackendWithStorage(t)
+	b, storage := createBackendWithStorage(t)
 
 	resp, err := b.HandleRequest(context.Background(), &logical.Request{
 		Operation: logical.UpdateOperation,
@@ -1887,7 +1870,6 @@ func TestBackend_PathFetchValidRaw(t *testing.T) {
 		Data:       map[string]interface{}{},
 		MountPoint: "pki/",
 	})
-	schema.ValidateResponse(t, schema.GetResponseSchema(t, b.Route("ca/pem"), logical.ReadOperation), resp, true)
 	require.NoError(t, err)
 	if resp != nil && resp.IsError() {
 		t.Fatalf("failed read ca/pem, %#v", resp)
@@ -1978,7 +1960,7 @@ func TestBackend_PathFetchValidRaw(t *testing.T) {
 func TestBackend_PathFetchCertList(t *testing.T) {
 	t.Parallel()
 	// create the backend
-	b, storage := CreateBackendWithStorage(t)
+	b, storage := createBackendWithStorage(t)
 
 	// generate root
 	rootData := map[string]interface{}{
@@ -1993,7 +1975,6 @@ func TestBackend_PathFetchCertList(t *testing.T) {
 		Data:       rootData,
 		MountPoint: "pki/",
 	})
-
 	if resp != nil && resp.IsError() {
 		t.Fatalf("failed to generate root, %#v", resp)
 	}
@@ -2014,16 +1995,6 @@ func TestBackend_PathFetchCertList(t *testing.T) {
 		Data:       urlsData,
 		MountPoint: "pki/",
 	})
-	schema.ValidateResponse(t, schema.GetResponseSchema(t, b.Route("config/urls"), logical.UpdateOperation), resp, true)
-
-	resp, err = b.HandleRequest(context.Background(), &logical.Request{
-		Operation:  logical.ReadOperation,
-		Path:       "config/urls",
-		Storage:    storage,
-		MountPoint: "pki/",
-	})
-	schema.ValidateResponse(t, schema.GetResponseSchema(t, b.Route("config/urls"), logical.ReadOperation), resp, true)
-
 	if resp != nil && resp.IsError() {
 		t.Fatalf("failed to config urls, %#v", resp)
 	}
@@ -2133,7 +2104,7 @@ func TestBackend_SignVerbatim(t *testing.T) {
 
 func runTestSignVerbatim(t *testing.T, keyType string) {
 	// create the backend
-	b, storage := CreateBackendWithStorage(t)
+	b, storage := createBackendWithStorage(t)
 
 	// generate root
 	rootData := map[string]interface{}{
@@ -2164,16 +2135,6 @@ func runTestSignVerbatim(t *testing.T, keyType string) {
 		Subject: pkix.Name{
 			CommonName: "foo.bar.com",
 		},
-		// Check that otherName extensions are not duplicated (see hashicorp/vault#16700).
-		// If these extensions are duplicated, sign-verbatim will fail when parsing the signed certificate on Go 1.19+ (see golang/go#50988).
-		// On older versions of Go this test will fail due to an explicit check for duplicate otherNames later in this test.
-		ExtraExtensions: []pkix.Extension{
-			{
-				Id:       oidExtensionSubjectAltName,
-				Critical: false,
-				Value:    []byte{0x30, 0x26, 0xA0, 0x24, 0x06, 0x0A, 0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0x37, 0x14, 0x02, 0x03, 0xA0, 0x16, 0x0C, 0x14, 0x75, 0x73, 0x65, 0x72, 0x6E, 0x61, 0x6D, 0x65, 0x40, 0x65, 0x78, 0x61, 0x6D, 0x70, 0x6C, 0x65, 0x2E, 0x63, 0x6F, 0x6D},
-			},
-		},
 	}
 	csr, err := x509.CreateCertificateRequest(rand.Reader, csrReq, key)
 	if err != nil {
@@ -2203,8 +2164,6 @@ func runTestSignVerbatim(t *testing.T, keyType string) {
 		Data:       signVerbatimData,
 		MountPoint: "pki/",
 	})
-	schema.ValidateResponse(t, schema.GetResponseSchema(t, b.Route("sign-verbatim"), logical.UpdateOperation), resp, true)
-
 	if resp != nil && resp.IsError() {
 		t.Fatalf("failed to sign-verbatim basic CSR: %#v", *resp)
 	}
@@ -2326,19 +2285,6 @@ func runTestSignVerbatim(t *testing.T, keyType string) {
 		t.Fatalf("expected a single cert, got %d", len(certs))
 	}
 	cert = certs[0]
-
-	// Fallback check for duplicate otherName, necessary on Go versions before 1.19.
-	// We assume that there is only one SAN in the original CSR and that it is an otherName.
-	san_count := 0
-	for _, ext := range cert.Extensions {
-		if ext.Id.Equal(oidExtensionSubjectAltName) {
-			san_count += 1
-		}
-	}
-	if san_count != 1 {
-		t.Fatalf("expected one SAN extension, got %d", san_count)
-	}
-
 	notAfter := cert.NotAfter.Format(time.RFC3339)
 	if notAfter != "9999-12-31T23:59:59Z" {
 		t.Fatal(fmt.Errorf("not after from certificate is not matching with input parameter"))
@@ -2390,7 +2336,7 @@ func runTestSignVerbatim(t *testing.T, keyType string) {
 
 func TestBackend_Root_Idempotency(t *testing.T) {
 	t.Parallel()
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 
 	// This is a change within 1.11, we are no longer idempotent across generate/internal calls.
 	resp, err := CBWrite(b, s, "root/generate/internal", map[string]interface{}{
@@ -2438,7 +2384,6 @@ func TestBackend_Root_Idempotency(t *testing.T) {
 	// Now because the issued CA's have no links, the call to ca_chain should return the same data (ca chain from default)
 	resp, err = CBRead(b, s, "cert/ca_chain")
 	require.NoError(t, err, "error reading ca_chain: %v", err)
-	schema.ValidateResponse(t, schema.GetResponseSchema(t, b.Route("cert/ca_chain"), logical.ReadOperation), resp, true)
 
 	r2Data := resp.Data
 	if !reflect.DeepEqual(r1Data, r2Data) {
@@ -2450,31 +2395,15 @@ func TestBackend_Root_Idempotency(t *testing.T) {
 	resp, err = CBWrite(b, s, "config/ca", map[string]interface{}{
 		"pem_bundle": pemBundleRootCA,
 	})
-	schema.ValidateResponse(t, schema.GetResponseSchema(t, b.Route("config/ca"), logical.UpdateOperation), resp, true)
-
 	require.NoError(t, err)
 	require.NotNil(t, resp, "expected ca info")
-	firstMapping := resp.Data["mapping"].(map[string]string)
 	firstImportedKeys := resp.Data["imported_keys"].([]string)
 	firstImportedIssuers := resp.Data["imported_issuers"].([]string)
-	firstExistingKeys := resp.Data["existing_keys"].([]string)
-	firstExistingIssuers := resp.Data["existing_issuers"].([]string)
 
 	require.NotContains(t, firstImportedKeys, keyId1)
 	require.NotContains(t, firstImportedKeys, keyId2)
 	require.NotContains(t, firstImportedIssuers, issuerId1)
 	require.NotContains(t, firstImportedIssuers, issuerId2)
-	require.Empty(t, firstExistingKeys)
-	require.Empty(t, firstExistingIssuers)
-	require.NotEmpty(t, firstMapping)
-	require.Equal(t, 1, len(firstMapping))
-
-	var issuerId3 string
-	var keyId3 string
-	for i, k := range firstMapping {
-		issuerId3 = i
-		keyId3 = k
-	}
 
 	// Performing this again should result in no key/issuer ids being imported/generated.
 	resp, err = CBWrite(b, s, "config/ca", map[string]interface{}{
@@ -2482,17 +2411,11 @@ func TestBackend_Root_Idempotency(t *testing.T) {
 	})
 	require.NoError(t, err)
 	require.NotNil(t, resp, "expected ca info")
-	secondMapping := resp.Data["mapping"].(map[string]string)
 	secondImportedKeys := resp.Data["imported_keys"]
 	secondImportedIssuers := resp.Data["imported_issuers"]
-	secondExistingKeys := resp.Data["existing_keys"]
-	secondExistingIssuers := resp.Data["existing_issuers"]
 
-	require.Empty(t, secondImportedKeys)
-	require.Empty(t, secondImportedIssuers)
-	require.Contains(t, secondExistingKeys, keyId3)
-	require.Contains(t, secondExistingIssuers, issuerId3)
-	require.Equal(t, 1, len(secondMapping))
+	require.Nil(t, secondImportedKeys)
+	require.Nil(t, secondImportedIssuers)
 
 	resp, err = CBDelete(b, s, "root")
 	require.NoError(t, err)
@@ -2532,10 +2455,10 @@ func TestBackend_Root_Idempotency(t *testing.T) {
 	}
 }
 
-func TestBackend_SignIntermediate_AllowedPastCAValidity(t *testing.T) {
+func TestBackend_SignIntermediate_AllowedPastCA(t *testing.T) {
 	t.Parallel()
-	b_root, s_root := CreateBackendWithStorage(t)
-	b_int, s_int := CreateBackendWithStorage(t)
+	b_root, s_root := createBackendWithStorage(t)
+	b_int, s_int := createBackendWithStorage(t)
 	var err error
 
 	// Direct issuing from root
@@ -2550,7 +2473,6 @@ func TestBackend_SignIntermediate_AllowedPastCAValidity(t *testing.T) {
 	_, err = CBWrite(b_root, s_root, "roles/test", map[string]interface{}{
 		"allow_bare_domains": true,
 		"allow_subdomains":   true,
-		"allow_any_name":     true,
 	})
 	if err != nil {
 		t.Fatal(err)
@@ -2559,7 +2481,6 @@ func TestBackend_SignIntermediate_AllowedPastCAValidity(t *testing.T) {
 	resp, err := CBWrite(b_int, s_int, "intermediate/generate/internal", map[string]interface{}{
 		"common_name": "myint.com",
 	})
-	schema.ValidateResponse(t, schema.GetResponseSchema(t, b_root.Route("intermediate/generate/internal"), logical.UpdateOperation), resp, true)
 	require.Contains(t, resp.Data, "key_id")
 	intKeyId := resp.Data["key_id"].(keyID)
 	csr := resp.Data["csr"]
@@ -2578,7 +2499,9 @@ func TestBackend_SignIntermediate_AllowedPastCAValidity(t *testing.T) {
 		"csr":         csr,
 		"ttl":         "60h",
 	})
-	require.ErrorContains(t, err, "that is beyond the expiration of the CA certificate")
+	if err == nil {
+		t.Fatal("expected error")
+	}
 
 	_, err = CBWrite(b_root, s_root, "sign-verbatim/test", map[string]interface{}{
 		"common_name": "myint.com",
@@ -2586,7 +2509,9 @@ func TestBackend_SignIntermediate_AllowedPastCAValidity(t *testing.T) {
 		"csr":         csr,
 		"ttl":         "60h",
 	})
-	require.ErrorContains(t, err, "that is beyond the expiration of the CA certificate")
+	if err == nil {
+		t.Fatal("expected error")
+	}
 
 	resp, err = CBWrite(b_root, s_root, "root/sign-intermediate", map[string]interface{}{
 		"common_name": "myint.com",
@@ -2612,7 +2537,7 @@ func TestBackend_SignIntermediate_AllowedPastCAValidity(t *testing.T) {
 func TestBackend_ConsulSignLeafWithLegacyRole(t *testing.T) {
 	t.Parallel()
 	// create the backend
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 
 	// generate root
 	data, err := CBWrite(b, s, "root/generate/internal", map[string]interface{}{
@@ -2647,7 +2572,7 @@ func TestBackend_ConsulSignLeafWithLegacyRole(t *testing.T) {
 func TestBackend_SignSelfIssued(t *testing.T) {
 	t.Parallel()
 	// create the backend
-	b, storage := CreateBackendWithStorage(t)
+	b, storage := createBackendWithStorage(t)
 
 	// generate root
 	rootData := map[string]interface{}{
@@ -2744,7 +2669,6 @@ func TestBackend_SignSelfIssued(t *testing.T) {
 		},
 		MountPoint: "pki/",
 	})
-	schema.ValidateResponse(t, schema.GetResponseSchema(t, b.Route("root/sign-self-issued"), logical.UpdateOperation), resp, true)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -2789,7 +2713,7 @@ func TestBackend_SignSelfIssued(t *testing.T) {
 func TestBackend_SignSelfIssued_DifferentTypes(t *testing.T) {
 	t.Parallel()
 	// create the backend
-	b, storage := CreateBackendWithStorage(t)
+	b, storage := createBackendWithStorage(t)
 
 	// generate root
 	rootData := map[string]interface{}{
@@ -2914,7 +2838,7 @@ func TestBackend_SignSelfIssued_DifferentTypes(t *testing.T) {
 // easy to validate.
 func TestBackend_OID_SANs(t *testing.T) {
 	t.Parallel()
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 
 	var err error
 	var resp *logical.Response
@@ -3137,7 +3061,7 @@ func TestBackend_OID_SANs(t *testing.T) {
 
 func TestBackend_AllowedSerialNumbers(t *testing.T) {
 	t.Parallel()
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 
 	var err error
 	var resp *logical.Response
@@ -3244,7 +3168,7 @@ func TestBackend_AllowedSerialNumbers(t *testing.T) {
 
 func TestBackend_URI_SANs(t *testing.T) {
 	t.Parallel()
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 
 	var err error
 
@@ -3696,7 +3620,6 @@ func TestReadWriteDeleteRoles(t *testing.T) {
 		"code_signing_flag":                  false,
 		"issuer_ref":                         "default",
 		"cn_validations":                     []interface{}{"email", "hostname"},
-		"allowed_user_ids":                   []interface{}{},
 	}
 
 	if diff := deep.Equal(expectedData, resp.Data); len(diff) > 0 {
@@ -3868,15 +3791,6 @@ func TestBackend_RevokePlusTidy_Intermediate(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	// Set up Metric Configuration, then restart to enable it
-	_, err = client.Logical().Write("pki/config/auto-tidy", map[string]interface{}{
-		"maintain_stored_certificate_counts":       true,
-		"publish_stored_certificate_count_metrics": true,
-	})
-	_, err = client.Logical().Write("/sys/plugins/reload/backend", map[string]interface{}{
-		"mounts": "pki/",
-	})
-
 	// Check the metrics initialized in order to calculate backendUUID for /pki
 	// BackendUUID not consistent during tests with UUID from /sys/mounts/pki
 	metricsSuffix := "total_certificates_stored"
@@ -3913,14 +3827,6 @@ func TestBackend_RevokePlusTidy_Intermediate(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	// Set up Metric Configuration, then restart to enable it
-	_, err = client.Logical().Write("pki2/config/auto-tidy", map[string]interface{}{
-		"maintain_stored_certificate_counts":       true,
-		"publish_stored_certificate_count_metrics": true,
-	})
-	_, err = client.Logical().Write("/sys/plugins/reload/backend", map[string]interface{}{
-		"mounts": "pki2/",
-	})
 
 	// Create a CSR for the intermediate CA
 	secret, err := client.Logical().Write("pki2/intermediate/generate/internal", nil)
@@ -3946,7 +3852,6 @@ func TestBackend_RevokePlusTidy_Intermediate(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-
 	if secret == nil || len(secret.Data) == 0 || len(secret.Data["certificate"].(string)) == 0 {
 		t.Fatal("expected certificate information from read operation")
 	}
@@ -4029,36 +3934,20 @@ func TestBackend_RevokePlusTidy_Intermediate(t *testing.T) {
 		}
 		expectedData := map[string]interface{}{
 			"safety_buffer":                         json.Number("1"),
-			"issuer_safety_buffer":                  json.Number("31536000"),
-			"revocation_queue_safety_buffer":        json.Number("172800"),
 			"tidy_cert_store":                       true,
 			"tidy_revoked_certs":                    true,
 			"tidy_revoked_cert_issuer_associations": false,
-			"tidy_expired_issuers":                  false,
-			"tidy_move_legacy_ca_bundle":            false,
-			"tidy_revocation_queue":                 false,
-			"tidy_cross_cluster_revoked_certs":      false,
 			"pause_duration":                        "0s",
 			"state":                                 "Finished",
 			"error":                                 nil,
 			"time_started":                          nil,
 			"time_finished":                         nil,
-			"last_auto_tidy_finished":               nil,
 			"message":                               nil,
 			"cert_store_deleted_count":              json.Number("1"),
 			"revoked_cert_deleted_count":            json.Number("1"),
 			"missing_issuer_cert_count":             json.Number("0"),
 			"current_cert_store_count":              json.Number("0"),
 			"current_revoked_cert_count":            json.Number("0"),
-			"revocation_queue_deleted_count":        json.Number("0"),
-			"cross_revoked_cert_deleted_count":      json.Number("0"),
-			"internal_backend_uuid":                 backendUUID,
-			"tidy_acme":                             false,
-			"acme_account_safety_buffer":            json.Number("2592000"),
-			"acme_orders_deleted_count":             json.Number("0"),
-			"acme_account_revoked_count":            json.Number("0"),
-			"acme_account_deleted_count":            json.Number("0"),
-			"total_acme_account_count":              json.Number("0"),
 		}
 		// Let's copy the times from the response so that we can use deep.Equal()
 		timeStarted, ok := tidyStatus.Data["time_started"]
@@ -4071,7 +3960,6 @@ func TestBackend_RevokePlusTidy_Intermediate(t *testing.T) {
 			t.Fatal("Expected tidy status response to include a value for time_finished")
 		}
 		expectedData["time_finished"] = timeFinished
-		expectedData["last_auto_tidy_finished"] = tidyStatus.Data["last_auto_tidy_finished"]
 
 		if diff := deep.Equal(expectedData, tidyStatus.Data); diff != nil {
 			t.Fatal(diff)
@@ -4160,7 +4048,7 @@ func TestBackend_Root_FullCAChain(t *testing.T) {
 
 func runFullCAChainTest(t *testing.T, keyType string) {
 	// Generate a root CA at /pki-root
-	b_root, s_root := CreateBackendWithStorage(t)
+	b_root, s_root := createBackendWithStorage(t)
 
 	var err error
 
@@ -4206,7 +4094,7 @@ func runFullCAChainTest(t *testing.T, keyType string) {
 	requireCertInCaChainArray(t, fullChainArray, rootCert, "expected root cert within root issuance pki-root/issue/example")
 
 	// Now generate an intermediate at /pki-intermediate, signed by the root.
-	b_int, s_int := CreateBackendWithStorage(t)
+	b_int, s_int := createBackendWithStorage(t)
 
 	resp, err = CBWrite(b_int, s_int, "intermediate/generate/exported", map[string]interface{}{
 		"common_name": "intermediate myvault.com",
@@ -4286,7 +4174,7 @@ func runFullCAChainTest(t *testing.T, keyType string) {
 
 	// Finally, import this signing cert chain into a new mount to ensure
 	// "external" CAs behave as expected.
-	b_ext, s_ext := CreateBackendWithStorage(t)
+	b_ext, s_ext := createBackendWithStorage(t)
 
 	_, err = CBWrite(b_ext, s_ext, "config/ca", map[string]interface{}{
 		"pem_bundle": intermediateKey + "\n" + intermediateCert + "\n" + rootCert + "\n",
@@ -4625,7 +4513,7 @@ func TestBackend_Roles_IssuanceRegression(t *testing.T) {
 		t.Fatalf("misnumbered test case entries will make it hard to find bugs: %v", len(testCases))
 	}
 
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 
 	// We need a RSA key so all signature sizes are valid with it.
 	resp, err := CBWrite(b, s, "root/generate/exported", map[string]interface{}{
@@ -4794,7 +4682,7 @@ func TestBackend_Roles_KeySizeRegression(t *testing.T) {
 		t.Fatalf("misnumbered test case entries will make it hard to find bugs: %v", len(testCases))
 	}
 
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 
 	tested := 0
 	for index, test := range testCases {
@@ -4806,7 +4694,7 @@ func TestBackend_Roles_KeySizeRegression(t *testing.T) {
 
 func TestRootWithExistingKey(t *testing.T) {
 	t.Parallel()
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 	var err error
 
 	// Fail requests if type is existing, and we specify the key_type param
@@ -4857,7 +4745,6 @@ func TestRootWithExistingKey(t *testing.T) {
 		"key_type":    "rsa",
 		"issuer_name": "my-issuer1",
 	})
-	schema.ValidateResponse(t, schema.GetResponseSchema(t, b.Route("issuers/generate/root/internal"), logical.UpdateOperation), resp, true)
 	require.NoError(t, err)
 	require.NotNil(t, resp.Data["certificate"])
 	myIssuerId1 := resp.Data["issuer_id"]
@@ -4940,7 +4827,7 @@ func TestRootWithExistingKey(t *testing.T) {
 
 func TestIntermediateWithExistingKey(t *testing.T) {
 	t.Parallel()
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 
 	var err error
 
@@ -4973,7 +4860,6 @@ func TestIntermediateWithExistingKey(t *testing.T) {
 		"common_name": "root myvault.com",
 		"key_type":    "rsa",
 	})
-	schema.ValidateResponse(t, schema.GetResponseSchema(t, b.Route("issuers/generate/intermediate/internal"), logical.UpdateOperation), resp, true)
 	require.NoError(t, err)
 	// csr1 := resp.Data["csr"]
 	myKeyId1 := resp.Data["key_id"]
@@ -5006,7 +4892,7 @@ func TestIntermediateWithExistingKey(t *testing.T) {
 
 func TestIssuanceTTLs(t *testing.T) {
 	t.Parallel()
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 
 	resp, err := CBWrite(b, s, "root/generate/internal", map[string]interface{}{
 		"common_name": "root example.com",
@@ -5084,7 +4970,7 @@ func TestIssuanceTTLs(t *testing.T) {
 
 func TestSealWrappedStorageConfigured(t *testing.T) {
 	t.Parallel()
-	b, _ := CreateBackendWithStorage(t)
+	b, _ := createBackendWithStorage(t)
 	wrappedEntries := b.Backend.PathsSpecial.SealWrapStorage
 
 	// Make sure our legacy bundle is within the list
@@ -5096,7 +4982,7 @@ func TestSealWrappedStorageConfigured(t *testing.T) {
 
 func TestBackend_ConfigCA_WithECParams(t *testing.T) {
 	t.Parallel()
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 
 	// Generated key with OpenSSL:
 	// $ openssl ecparam -out p256.key -name prime256v1 -genkey
@@ -5125,7 +5011,7 @@ AwEHoUQDQgAE57NX8bR/nDoW8yRgLswoXBQcjHrdyfuHS0gPwki6BNnfunUzryVb
 
 func TestPerIssuerAIA(t *testing.T) {
 	t.Parallel()
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 
 	// Generating a root without anything should not have AIAs.
 	resp, err := CBWrite(b, s, "root/generate/internal", map[string]interface{}{
@@ -5141,11 +5027,9 @@ func TestPerIssuerAIA(t *testing.T) {
 	require.Empty(t, rootCert.CRLDistributionPoints)
 
 	// Set some local URLs on the issuer.
-	resp, err = CBWrite(b, s, "issuer/default", map[string]interface{}{
+	_, err = CBWrite(b, s, "issuer/default", map[string]interface{}{
 		"issuing_certificates": []string{"https://google.com"},
 	})
-	schema.ValidateResponse(t, schema.GetResponseSchema(t, b.Route("issuer/default"), logical.UpdateOperation), resp, true)
-
 	require.NoError(t, err)
 
 	_, err = CBWrite(b, s, "roles/testing", map[string]interface{}{
@@ -5212,7 +5096,7 @@ func TestPerIssuerAIA(t *testing.T) {
 
 func TestIssuersWithoutCRLBits(t *testing.T) {
 	t.Parallel()
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 
 	// Importing a root without CRL signing bits should work fine.
 	customBundleWithoutCRLBits := `
@@ -5267,7 +5151,6 @@ TgM7RZnmEjNdeaa4M52o7VY=
 	resp, err := CBWrite(b, s, "issuers/import/bundle", map[string]interface{}{
 		"pem_bundle": customBundleWithoutCRLBits,
 	})
-	schema.ValidateResponse(t, schema.GetResponseSchema(t, b.Route("issuers/import/bundle"), logical.UpdateOperation), resp, true)
 	require.NoError(t, err)
 	require.NotNil(t, resp)
 	require.NotEmpty(t, resp.Data)
@@ -5309,8 +5192,7 @@ func TestBackend_IfModifiedSinceHeaders(t *testing.T) {
 		},
 	}
 	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
-		HandlerFunc:             vaulthttp.Handler,
-		RequestResponseCallback: schema.ResponseValidatingCallback(t),
+		HandlerFunc: vaulthttp.Handler,
 	})
 	cluster.Start()
 	defer cluster.Cleanup()
@@ -5599,17 +5481,17 @@ func TestBackend_IfModifiedSinceHeaders(t *testing.T) {
 		lastHeaders = client.Headers()
 	}
 
+	time.Sleep(4 * time.Second)
+
+	beforeDeltaRotation := time.Now().Add(-2 * time.Second)
+
 	// Finally, rebuild the delta CRL and ensure that only that is
-	// invalidated. We first need to enable it though, and wait for
-	// all CRLs to rebuild.
+	// invalidated. We first need to enable it though.
 	_, err = client.Logical().Write("pki/config/crl", map[string]interface{}{
 		"auto_rebuild": true,
 		"enable_delta": true,
 	})
 	require.NoError(t, err)
-	time.Sleep(4 * time.Second)
-	beforeDeltaRotation := time.Now().Add(-2 * time.Second)
-
 	resp, err = client.Logical().Read("pki/crl/rotate-delta")
 	require.NoError(t, err)
 	require.NotNil(t, resp)
@@ -5659,7 +5541,7 @@ func TestBackend_IfModifiedSinceHeaders(t *testing.T) {
 
 func TestBackend_InitializeCertificateCounts(t *testing.T) {
 	t.Parallel()
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 	ctx := context.Background()
 
 	// Set up an Issuer and Role
@@ -5698,14 +5580,6 @@ func TestBackend_InitializeCertificateCounts(t *testing.T) {
 		serials[i] = resp.Data["serial_number"].(string)
 	}
 
-	// Turn on certificate counting:
-	CBWrite(b, s, "config/auto-tidy", map[string]interface{}{
-		"maintain_stored_certificate_counts":       true,
-		"publish_stored_certificate_count_metrics": false,
-	})
-	// Assert initialize from clean is correct:
-	b.initializeStoredCertificateCounts(ctx)
-
 	// Revoke certificates A + B
 	revocations := serials[0:2]
 	for _, key := range revocations {
@@ -5717,16 +5591,18 @@ func TestBackend_InitializeCertificateCounts(t *testing.T) {
 		}
 	}
 
-	if b.certCount.Load() != 6 {
-		t.Fatalf("Failed to count six certificates root,A,B,C,D,E, instead counted %d certs", b.certCount.Load())
+	// Assert initialize from clean is correct:
+	b.initializeStoredCertificateCounts(ctx)
+	if atomic.LoadUint32(b.certCount) != 6 {
+		t.Fatalf("Failed to count six certificates root,A,B,C,D,E, instead counted %d certs", atomic.LoadUint32(b.certCount))
 	}
-	if b.revokedCertCount.Load() != 2 {
-		t.Fatalf("Failed to count two revoked certificates A+B, instead counted %d certs", b.revokedCertCount.Load())
+	if atomic.LoadUint32(b.revokedCertCount) != 2 {
+		t.Fatalf("Failed to count two revoked certificates A+B, instead counted %d certs", atomic.LoadUint32(b.revokedCertCount))
 	}
 
 	// Simulates listing while initialize in progress, by "restarting it"
-	b.certCount.Store(0)
-	b.revokedCertCount.Store(0)
+	atomic.StoreUint32(b.certCount, 0)
+	atomic.StoreUint32(b.revokedCertCount, 0)
 	b.certsCounted.Store(false)
 
 	// Revoke certificates C, D
@@ -5755,12 +5631,12 @@ func TestBackend_InitializeCertificateCounts(t *testing.T) {
 	b.initializeStoredCertificateCounts(ctx)
 
 	// Test certificate count
-	if b.certCount.Load() != 8 {
-		t.Fatalf("Failed to initialize count of certificates root, A,B,C,D,E,F,G counted %d certs", b.certCount.Load())
+	if atomic.LoadUint32(b.certCount) != 8 {
+		t.Fatalf("Failed to initialize count of certificates root, A,B,C,D,E,F,G counted %d certs", *(b.certCount))
 	}
 
-	if b.revokedCertCount.Load() != 4 {
-		t.Fatalf("Failed to count revoked certificates A,B,C,D counted %d certs", b.revokedCertCount.Load())
+	if atomic.LoadUint32(b.revokedCertCount) != 4 {
+		t.Fatalf("Failed to count revoked certificates A,B,C,D counted %d certs", *(b.revokedCertCount))
 	}
 
 	return
@@ -5771,7 +5647,7 @@ func TestBackend_InitializeCertificateCounts(t *testing.T) {
 // for fields across the two APIs.
 func TestBackend_VerifyIssuerUpdateDefaultsMatchCreation(t *testing.T) {
 	t.Parallel()
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 
 	resp, err := CBWrite(b, s, "root/generate/internal", map[string]interface{}{
 		"common_name": "myvault.com",
@@ -5800,7 +5676,7 @@ func TestBackend_VerifyIssuerUpdateDefaultsMatchCreation(t *testing.T) {
 
 func TestBackend_VerifyPSSKeysIssuersFailImport(t *testing.T) {
 	t.Parallel()
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 
 	// PKCS8 parsing fails on this key due to rsaPSS OID
 	rsaOIDKey := `
@@ -6003,7 +5879,7 @@ EBuOIhCv6WiwVyGeTVynuHYkHyw3rIL/zU7N8+zIFV2G2M1UAv5D/eyh/74cr9Of
 
 func TestPKI_EmptyCRLConfigUpgraded(t *testing.T) {
 	t.Parallel()
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 
 	// Write an empty CRLConfig into storage.
 	crlConfigEntry, err := logical.StorageEntryJSON("config/crl", &crlConfig{})
@@ -6024,498 +5900,6 @@ func TestPKI_EmptyCRLConfigUpgraded(t *testing.T) {
 	require.Equal(t, resp.Data["delta_rebuild_interval"], defaultCrlConfig.DeltaRebuildInterval)
 }
 
-func TestPKI_ListRevokedCerts(t *testing.T) {
-	t.Parallel()
-	b, s := CreateBackendWithStorage(t)
-
-	// Test empty cluster
-	resp, err := CBList(b, s, "certs/revoked")
-	schema.ValidateResponse(t, schema.GetResponseSchema(t, b.Route("certs/revoked"), logical.ListOperation), resp, true)
-	requireSuccessNonNilResponse(t, resp, err, "failed listing empty cluster")
-	require.Empty(t, resp.Data, "response map contained data that we did not expect")
-
-	// Set up a mount that we can revoke under (We will create 3 leaf certs, 2 of which will be revoked)
-	resp, err = CBWrite(b, s, "root/generate/internal", map[string]interface{}{
-		"common_name": "test.com",
-		"key_type":    "ec",
-	})
-	requireSuccessNonNilResponse(t, resp, err, "error generating root CA")
-	requireFieldsSetInResp(t, resp, "serial_number")
-	issuerSerial := resp.Data["serial_number"]
-
-	resp, err = CBWrite(b, s, "roles/test", map[string]interface{}{
-		"allowed_domains":  "test.com",
-		"allow_subdomains": "true",
-		"max_ttl":          "1h",
-	})
-	requireSuccessNonNilResponse(t, resp, err, "error setting up pki role")
-
-	resp, err = CBWrite(b, s, "issue/test", map[string]interface{}{
-		"common_name": "test1.test.com",
-	})
-	requireSuccessNonNilResponse(t, resp, err, "error issuing cert 1")
-	requireFieldsSetInResp(t, resp, "serial_number")
-	serial1 := resp.Data["serial_number"]
-
-	resp, err = CBWrite(b, s, "issue/test", map[string]interface{}{
-		"common_name": "test2.test.com",
-	})
-	requireSuccessNonNilResponse(t, resp, err, "error issuing cert 2")
-	requireFieldsSetInResp(t, resp, "serial_number")
-	serial2 := resp.Data["serial_number"]
-
-	resp, err = CBWrite(b, s, "issue/test", map[string]interface{}{
-		"common_name": "test3.test.com",
-	})
-	requireSuccessNonNilResponse(t, resp, err, "error issuing cert 2")
-	requireFieldsSetInResp(t, resp, "serial_number")
-	serial3 := resp.Data["serial_number"]
-
-	resp, err = CBWrite(b, s, "revoke", map[string]interface{}{"serial_number": serial1})
-	requireSuccessNonNilResponse(t, resp, err, "error revoking cert 1")
-
-	resp, err = CBWrite(b, s, "revoke", map[string]interface{}{"serial_number": serial2})
-	requireSuccessNonNilResponse(t, resp, err, "error revoking cert 2")
-
-	// Test that we get back the expected revoked serial numbers.
-	resp, err = CBList(b, s, "certs/revoked")
-	requireSuccessNonNilResponse(t, resp, err, "failed listing revoked certs")
-	requireFieldsSetInResp(t, resp, "keys")
-	revokedKeys := resp.Data["keys"].([]string)
-
-	require.Contains(t, revokedKeys, serial1)
-	require.Contains(t, revokedKeys, serial2)
-	require.Equal(t, 2, len(revokedKeys), "Expected 2 revoked entries got %d: %v", len(revokedKeys), revokedKeys)
-
-	// Test that listing our certs returns a different response
-	resp, err = CBList(b, s, "certs")
-	requireSuccessNonNilResponse(t, resp, err, "failed listing written certs")
-	requireFieldsSetInResp(t, resp, "keys")
-	certKeys := resp.Data["keys"].([]string)
-
-	require.Contains(t, certKeys, serial1)
-	require.Contains(t, certKeys, serial2)
-	require.Contains(t, certKeys, serial3)
-	require.Contains(t, certKeys, issuerSerial)
-	require.Equal(t, 4, len(certKeys), "Expected 4 cert entries got %d: %v", len(certKeys), certKeys)
-}
-
-func TestPKI_TemplatedAIAs(t *testing.T) {
-	t.Parallel()
-	b, s := CreateBackendWithStorage(t)
-
-	// Setting templated AIAs should succeed.
-	resp, err := CBWrite(b, s, "config/cluster", map[string]interface{}{
-		"path":     "http://localhost:8200/v1/pki",
-		"aia_path": "http://localhost:8200/cdn/pki",
-	})
-	require.NoError(t, err)
-	schema.ValidateResponse(t, schema.GetResponseSchema(t, b.Route("config/cluster"), logical.UpdateOperation), resp, true)
-
-	resp, err = CBRead(b, s, "config/cluster")
-	require.NoError(t, err)
-	schema.ValidateResponse(t, schema.GetResponseSchema(t, b.Route("config/cluster"), logical.ReadOperation), resp, true)
-
-	aiaData := map[string]interface{}{
-		"crl_distribution_points": "{{cluster_path}}/issuer/{{issuer_id}}/crl/der",
-		"issuing_certificates":    "{{cluster_aia_path}}/issuer/{{issuer_id}}/der",
-		"ocsp_servers":            "{{cluster_path}}/ocsp",
-		"enable_templating":       true,
-	}
-	_, err = CBWrite(b, s, "config/urls", aiaData)
-	require.NoError(t, err)
-
-	// But root generation will fail.
-	rootData := map[string]interface{}{
-		"common_name": "Long-Lived Root X1",
-		"issuer_name": "long-root-x1",
-		"key_type":    "ec",
-	}
-	_, err = CBWrite(b, s, "root/generate/internal", rootData)
-	require.Error(t, err)
-	require.Contains(t, err.Error(), "unable to parse AIA URL")
-
-	// Clearing the config and regenerating the root should succeed.
-	_, err = CBWrite(b, s, "config/urls", map[string]interface{}{
-		"crl_distribution_points": "",
-		"issuing_certificates":    "",
-		"ocsp_servers":            "",
-		"enable_templating":       false,
-	})
-	require.NoError(t, err)
-	resp, err = CBWrite(b, s, "root/generate/internal", rootData)
-	requireSuccessNonNilResponse(t, resp, err)
-	issuerId := string(resp.Data["issuer_id"].(issuerID))
-
-	// Now write the original AIA config and sign a leaf.
-	_, err = CBWrite(b, s, "config/urls", aiaData)
-	require.NoError(t, err)
-	_, err = CBWrite(b, s, "roles/testing", map[string]interface{}{
-		"allow_any_name": "true",
-		"key_type":       "ec",
-		"ttl":            "50m",
-	})
-	require.NoError(t, err)
-	resp, err = CBWrite(b, s, "issue/testing", map[string]interface{}{
-		"common_name": "example.com",
-	})
-	requireSuccessNonNilResponse(t, resp, err)
-
-	// Validate the AIA info is correctly templated.
-	cert := parseCert(t, resp.Data["certificate"].(string))
-	require.Equal(t, cert.OCSPServer, []string{"http://localhost:8200/v1/pki/ocsp"})
-	require.Equal(t, cert.IssuingCertificateURL, []string{"http://localhost:8200/cdn/pki/issuer/" + issuerId + "/der"})
-	require.Equal(t, cert.CRLDistributionPoints, []string{"http://localhost:8200/v1/pki/issuer/" + issuerId + "/crl/der"})
-
-	// Modify our issuer to set custom AIAs: these URLs are bad.
-	_, err = CBPatch(b, s, "issuer/default", map[string]interface{}{
-		"enable_aia_url_templating": "false",
-		"crl_distribution_points":   "a",
-		"issuing_certificates":      "b",
-		"ocsp_servers":              "c",
-	})
-	require.Error(t, err)
-
-	// These URLs are good.
-	_, err = CBPatch(b, s, "issuer/default", map[string]interface{}{
-		"enable_aia_url_templating": "false",
-		"crl_distribution_points":   "http://localhost/a",
-		"issuing_certificates":      "http://localhost/b",
-		"ocsp_servers":              "http://localhost/c",
-	})
-
-	resp, err = CBWrite(b, s, "issue/testing", map[string]interface{}{
-		"common_name": "example.com",
-	})
-	requireSuccessNonNilResponse(t, resp, err)
-
-	// Validate the AIA info is correctly templated.
-	cert = parseCert(t, resp.Data["certificate"].(string))
-	require.Equal(t, cert.OCSPServer, []string{"http://localhost/c"})
-	require.Equal(t, cert.IssuingCertificateURL, []string{"http://localhost/b"})
-	require.Equal(t, cert.CRLDistributionPoints, []string{"http://localhost/a"})
-
-	// These URLs are bad, but will fail at issuance time due to AIA templating.
-	resp, err = CBPatch(b, s, "issuer/default", map[string]interface{}{
-		"enable_aia_url_templating": "true",
-		"crl_distribution_points":   "a",
-		"issuing_certificates":      "b",
-		"ocsp_servers":              "c",
-	})
-	requireSuccessNonNilResponse(t, resp, err)
-	require.NotEmpty(t, resp.Warnings)
-	_, err = CBWrite(b, s, "issue/testing", map[string]interface{}{
-		"common_name": "example.com",
-	})
-	require.Error(t, err)
-}
-
-func requireSubjectUserIDAttr(t *testing.T, cert string, target string) {
-	xCert := parseCert(t, cert)
-
-	for _, attr := range xCert.Subject.Names {
-		var userID string
-		if attr.Type.Equal(certutil.SubjectPilotUserIDAttributeOID) {
-			if target == "" {
-				t.Fatalf("expected no UserID (OID: %v) subject attributes in cert:\n%v", certutil.SubjectPilotUserIDAttributeOID, cert)
-			}
-
-			switch aValue := attr.Value.(type) {
-			case string:
-				userID = aValue
-			case []byte:
-				userID = string(aValue)
-			default:
-				t.Fatalf("unknown type for UserID attribute: %v\nCert: %v", attr, cert)
-			}
-
-			if userID == target {
-				return
-			}
-		}
-	}
-
-	if target != "" {
-		t.Fatalf("failed to find UserID (OID: %v) matching %v in cert:\n%v", certutil.SubjectPilotUserIDAttributeOID, target, cert)
-	}
-}
-
-func TestUserIDsInLeafCerts(t *testing.T) {
-	t.Parallel()
-	b, s := CreateBackendWithStorage(t)
-
-	// 1. Setup root issuer.
-	resp, err := CBWrite(b, s, "root/generate/internal", map[string]interface{}{
-		"common_name": "Vault Root CA",
-		"key_type":    "ec",
-		"ttl":         "7200h",
-	})
-	requireSuccessNonNilResponse(t, resp, err, "failed generating root issuer")
-
-	// 2. Allow no user IDs.
-	resp, err = CBWrite(b, s, "roles/testing", map[string]interface{}{
-		"allowed_user_ids": "",
-		"key_type":         "ec",
-	})
-	requireSuccessNonNilResponse(t, resp, err, "failed setting up role")
-
-	// - Issue cert without user IDs should work.
-	resp, err = CBWrite(b, s, "issue/testing", map[string]interface{}{
-		"common_name": "localhost",
-	})
-	requireSuccessNonNilResponse(t, resp, err, "failed issuing leaf cert")
-	requireSubjectUserIDAttr(t, resp.Data["certificate"].(string), "")
-
-	// - Issue cert with user ID should fail.
-	resp, err = CBWrite(b, s, "issue/testing", map[string]interface{}{
-		"common_name": "localhost",
-		"user_ids":    "humanoid",
-	})
-	require.Error(t, err)
-	require.True(t, resp.IsError())
-
-	// 3. Allow any user IDs.
-	resp, err = CBWrite(b, s, "roles/testing", map[string]interface{}{
-		"allowed_user_ids": "*",
-		"key_type":         "ec",
-	})
-	requireSuccessNonNilResponse(t, resp, err, "failed setting up role")
-
-	// - Issue cert without user IDs.
-	resp, err = CBWrite(b, s, "issue/testing", map[string]interface{}{
-		"common_name": "localhost",
-	})
-	requireSuccessNonNilResponse(t, resp, err, "failed issuing leaf cert")
-	requireSubjectUserIDAttr(t, resp.Data["certificate"].(string), "")
-
-	// - Issue cert with one user ID.
-	resp, err = CBWrite(b, s, "issue/testing", map[string]interface{}{
-		"common_name": "localhost",
-		"user_ids":    "humanoid",
-	})
-	requireSuccessNonNilResponse(t, resp, err, "failed issuing leaf cert")
-	requireSubjectUserIDAttr(t, resp.Data["certificate"].(string), "humanoid")
-
-	// - Issue cert with two user IDs.
-	resp, err = CBWrite(b, s, "issue/testing", map[string]interface{}{
-		"common_name": "localhost",
-		"user_ids":    "humanoid,robot",
-	})
-	requireSuccessNonNilResponse(t, resp, err, "failed issuing leaf cert")
-	requireSubjectUserIDAttr(t, resp.Data["certificate"].(string), "humanoid")
-	requireSubjectUserIDAttr(t, resp.Data["certificate"].(string), "robot")
-
-	// 4. Allow one specific user ID.
-	resp, err = CBWrite(b, s, "roles/testing", map[string]interface{}{
-		"allowed_user_ids": "humanoid",
-		"key_type":         "ec",
-	})
-	requireSuccessNonNilResponse(t, resp, err, "failed setting up role")
-
-	// - Issue cert without user IDs.
-	resp, err = CBWrite(b, s, "issue/testing", map[string]interface{}{
-		"common_name": "localhost",
-	})
-	requireSuccessNonNilResponse(t, resp, err, "failed issuing leaf cert")
-	requireSubjectUserIDAttr(t, resp.Data["certificate"].(string), "")
-
-	// - Issue cert with approved ID.
-	resp, err = CBWrite(b, s, "issue/testing", map[string]interface{}{
-		"common_name": "localhost",
-		"user_ids":    "humanoid",
-	})
-	requireSuccessNonNilResponse(t, resp, err, "failed issuing leaf cert")
-	requireSubjectUserIDAttr(t, resp.Data["certificate"].(string), "humanoid")
-
-	// - Issue cert with non-approved user ID should fail.
-	resp, err = CBWrite(b, s, "issue/testing", map[string]interface{}{
-		"common_name": "localhost",
-		"user_ids":    "robot",
-	})
-	require.Error(t, err)
-	require.True(t, resp.IsError())
-
-	// - Issue cert with one approved and one non-approved should also fail.
-	resp, err = CBWrite(b, s, "issue/testing", map[string]interface{}{
-		"common_name": "localhost",
-		"user_ids":    "humanoid,robot",
-	})
-	require.Error(t, err)
-	require.True(t, resp.IsError())
-
-	// 5. Allow two specific user IDs.
-	resp, err = CBWrite(b, s, "roles/testing", map[string]interface{}{
-		"allowed_user_ids": "humanoid,robot",
-		"key_type":         "ec",
-	})
-	requireSuccessNonNilResponse(t, resp, err, "failed setting up role")
-
-	// - Issue cert without user IDs.
-	resp, err = CBWrite(b, s, "issue/testing", map[string]interface{}{
-		"common_name": "localhost",
-	})
-	requireSuccessNonNilResponse(t, resp, err, "failed issuing leaf cert")
-	requireSubjectUserIDAttr(t, resp.Data["certificate"].(string), "")
-
-	// - Issue cert with one approved ID.
-	resp, err = CBWrite(b, s, "issue/testing", map[string]interface{}{
-		"common_name": "localhost",
-		"user_ids":    "humanoid",
-	})
-	requireSuccessNonNilResponse(t, resp, err, "failed issuing leaf cert")
-	requireSubjectUserIDAttr(t, resp.Data["certificate"].(string), "humanoid")
-
-	// - Issue cert with other user ID.
-	resp, err = CBWrite(b, s, "issue/testing", map[string]interface{}{
-		"common_name": "localhost",
-		"user_ids":    "robot",
-	})
-	requireSuccessNonNilResponse(t, resp, err, "failed issuing leaf cert")
-	requireSubjectUserIDAttr(t, resp.Data["certificate"].(string), "robot")
-
-	// - Issue cert with unknown user ID will fail.
-	resp, err = CBWrite(b, s, "issue/testing", map[string]interface{}{
-		"common_name": "localhost",
-		"user_ids":    "robot2",
-	})
-	require.Error(t, err)
-	require.True(t, resp.IsError())
-
-	// - Issue cert with both should succeed.
-	resp, err = CBWrite(b, s, "issue/testing", map[string]interface{}{
-		"common_name": "localhost",
-		"user_ids":    "humanoid,robot",
-	})
-	requireSuccessNonNilResponse(t, resp, err, "failed issuing leaf cert")
-	requireSubjectUserIDAttr(t, resp.Data["certificate"].(string), "humanoid")
-	requireSubjectUserIDAttr(t, resp.Data["certificate"].(string), "robot")
-
-	// 6. Use a glob.
-	resp, err = CBWrite(b, s, "roles/testing", map[string]interface{}{
-		"allowed_user_ids": "human*",
-		"key_type":         "ec",
-		"use_csr_sans":     true, // setup for further testing.
-	})
-	requireSuccessNonNilResponse(t, resp, err, "failed setting up role")
-
-	// - Issue cert without user IDs.
-	resp, err = CBWrite(b, s, "issue/testing", map[string]interface{}{
-		"common_name": "localhost",
-	})
-	requireSuccessNonNilResponse(t, resp, err, "failed issuing leaf cert")
-	requireSubjectUserIDAttr(t, resp.Data["certificate"].(string), "")
-
-	// - Issue cert with approved ID.
-	resp, err = CBWrite(b, s, "issue/testing", map[string]interface{}{
-		"common_name": "localhost",
-		"user_ids":    "humanoid",
-	})
-	requireSuccessNonNilResponse(t, resp, err, "failed issuing leaf cert")
-	requireSubjectUserIDAttr(t, resp.Data["certificate"].(string), "humanoid")
-
-	// - Issue cert with another approved ID.
-	resp, err = CBWrite(b, s, "issue/testing", map[string]interface{}{
-		"common_name": "localhost",
-		"user_ids":    "human",
-	})
-	requireSuccessNonNilResponse(t, resp, err, "failed issuing leaf cert")
-	requireSubjectUserIDAttr(t, resp.Data["certificate"].(string), "human")
-
-	// - Issue cert with literal glob.
-	resp, err = CBWrite(b, s, "issue/testing", map[string]interface{}{
-		"common_name": "localhost",
-		"user_ids":    "human*",
-	})
-	requireSuccessNonNilResponse(t, resp, err, "failed issuing leaf cert")
-	requireSubjectUserIDAttr(t, resp.Data["certificate"].(string), "human*")
-
-	// - Still no robotic certs are allowed; will fail.
-	resp, err = CBWrite(b, s, "issue/testing", map[string]interface{}{
-		"common_name": "localhost",
-		"user_ids":    "robot",
-	})
-	require.Error(t, err)
-	require.True(t, resp.IsError())
-
-	// Create a CSR and validate it works with both sign/ and sign-verbatim.
-	csrTemplate := x509.CertificateRequest{
-		Subject: pkix.Name{
-			CommonName: "localhost",
-			ExtraNames: []pkix.AttributeTypeAndValue{
-				{
-					Type:  certutil.SubjectPilotUserIDAttributeOID,
-					Value: "humanoid",
-				},
-			},
-		},
-	}
-	_, _, csrPem := generateCSR(t, &csrTemplate, "ec", 256)
-
-	// Should work with role-based signing.
-	resp, err = CBWrite(b, s, "sign/testing", map[string]interface{}{
-		"csr": csrPem,
-	})
-	schema.ValidateResponse(t, schema.GetResponseSchema(t, b.Route("sign/testing"), logical.UpdateOperation), resp, true)
-	requireSuccessNonNilResponse(t, resp, err, "failed issuing leaf cert")
-	requireSubjectUserIDAttr(t, resp.Data["certificate"].(string), "humanoid")
-
-	// - Definitely will work with sign-verbatim.
-	resp, err = CBWrite(b, s, "sign-verbatim", map[string]interface{}{
-		"csr": csrPem,
-	})
-	requireSuccessNonNilResponse(t, resp, err, "failed issuing leaf cert")
-	requireSubjectUserIDAttr(t, resp.Data["certificate"].(string), "humanoid")
-}
-
-// TestStandby_Operations test proper forwarding for PKI requests from a standby node to the
-// active node within a cluster.
-func TestStandby_Operations(t *testing.T) {
-	conf, opts := teststorage.ClusterSetup(&vault.CoreConfig{
-		LogicalBackends: map[string]logical.Factory{
-			"pki": Factory,
-		},
-	}, nil, teststorage.InmemBackendSetup)
-	cluster := vault.NewTestCluster(t, conf, opts)
-	cluster.Start()
-	defer cluster.Cleanup()
-
-	testhelpers.WaitForActiveNodeAndStandbys(t, cluster)
-	standbyCores := testhelpers.DeriveStandbyCores(t, cluster)
-	require.Greater(t, len(standbyCores), 0, "Need at least one standby core.")
-	client := standbyCores[0].Client
-
-	mountPKIEndpoint(t, client, "pki")
-
-	_, err := client.Logical().Write("pki/root/generate/internal", map[string]interface{}{
-		"key_type":    "ec",
-		"common_name": "root-ca.com",
-		"ttl":         "600h",
-	})
-	require.NoError(t, err, "error setting up pki role: %v", err)
-
-	_, err = client.Logical().Write("pki/roles/example", map[string]interface{}{
-		"allowed_domains":  "example.com",
-		"allow_subdomains": "true",
-		"no_store":         "false", // make sure we store this cert
-		"ttl":              "5h",
-		"key_type":         "ec",
-	})
-	require.NoError(t, err, "error setting up pki role: %v", err)
-
-	resp, err := client.Logical().Write("pki/issue/example", map[string]interface{}{
-		"common_name": "test.example.com",
-	})
-	require.NoError(t, err, "error issuing certificate: %v", err)
-	require.NotNil(t, resp, "got nil response from issuing request")
-	serialOfCert := resp.Data["serial_number"].(string)
-
-	resp, err = client.Logical().Write("pki/revoke", map[string]interface{}{
-		"serial_number": serialOfCert,
-	})
-	require.NoError(t, err, "error revoking certificate: %v", err)
-	require.NotNil(t, resp, "got nil response from revoke request")
-}
-
 type pathAuthCheckerFunc func(t *testing.T, client *api.Client, path string, token string)
 
 func isPermDenied(err error) bool {
@@ -6744,7 +6128,7 @@ func TestProperAuthing(t *testing.T) {
 		t.Fatal(err)
 	}
 	serial := resp.Data["serial_number"].(string)
-	eabKid := "13b80844-e60d-42d2-b7e9-152a8e834b90"
+
 	paths := map[string]pathAuthChecker{
 		"ca_chain":                               shouldBeUnauthedReadList,
 		"cert/ca_chain":                          shouldBeUnauthedReadList,
@@ -6759,20 +6143,10 @@ func TestProperAuthing(t *testing.T) {
 		"cert/delta-crl":                         shouldBeUnauthedReadList,
 		"cert/delta-crl/raw":                     shouldBeUnauthedReadList,
 		"cert/delta-crl/raw/pem":                 shouldBeUnauthedReadList,
-		"cert/unified-crl":                       shouldBeUnauthedReadList,
-		"cert/unified-crl/raw":                   shouldBeUnauthedReadList,
-		"cert/unified-crl/raw/pem":               shouldBeUnauthedReadList,
-		"cert/unified-delta-crl":                 shouldBeUnauthedReadList,
-		"cert/unified-delta-crl/raw":             shouldBeUnauthedReadList,
-		"cert/unified-delta-crl/raw/pem":         shouldBeUnauthedReadList,
 		"certs":                                  shouldBeAuthed,
 		"certs/revoked":                          shouldBeAuthed,
-		"certs/revocation-queue":                 shouldBeAuthed,
-		"certs/unified-revoked":                  shouldBeAuthed,
-		"config/acme":                            shouldBeAuthed,
 		"config/auto-tidy":                       shouldBeAuthed,
 		"config/ca":                              shouldBeAuthed,
-		"config/cluster":                         shouldBeAuthed,
 		"config/crl":                             shouldBeAuthed,
 		"config/issuers":                         shouldBeAuthed,
 		"config/keys":                            shouldBeAuthed,
@@ -6800,12 +6174,6 @@ func TestProperAuthing(t *testing.T) {
 		"issuer/default/crl/delta":               shouldBeUnauthedReadList,
 		"issuer/default/crl/delta/der":           shouldBeUnauthedReadList,
 		"issuer/default/crl/delta/pem":           shouldBeUnauthedReadList,
-		"issuer/default/unified-crl":             shouldBeUnauthedReadList,
-		"issuer/default/unified-crl/pem":         shouldBeUnauthedReadList,
-		"issuer/default/unified-crl/der":         shouldBeUnauthedReadList,
-		"issuer/default/unified-crl/delta":       shouldBeUnauthedReadList,
-		"issuer/default/unified-crl/delta/der":   shouldBeUnauthedReadList,
-		"issuer/default/unified-crl/delta/pem":   shouldBeUnauthedReadList,
 		"issuer/default/issue/test":              shouldBeAuthed,
 		"issuer/default/resign-crls":             shouldBeAuthed,
 		"issuer/default/revoke":                  shouldBeAuthed,
@@ -6856,35 +6224,7 @@ func TestProperAuthing(t *testing.T) {
 		"tidy":                                   shouldBeAuthed,
 		"tidy-cancel":                            shouldBeAuthed,
 		"tidy-status":                            shouldBeAuthed,
-		"unified-crl":                            shouldBeUnauthedReadList,
-		"unified-crl/pem":                        shouldBeUnauthedReadList,
-		"unified-crl/delta":                      shouldBeUnauthedReadList,
-		"unified-crl/delta/pem":                  shouldBeUnauthedReadList,
-		"unified-ocsp":                           shouldBeUnauthedWriteOnly,
-		"unified-ocsp/dGVzdAo=":                  shouldBeUnauthedReadList,
-		"eab":                                    shouldBeAuthed,
-		"eab/" + eabKid:                          shouldBeAuthed,
-	}
-
-	// Add ACME based paths to the test suite
-	for _, acmePrefix := range []string{"", "issuer/default/", "roles/test/", "issuer/default/roles/test/"} {
-		paths[acmePrefix+"acme/directory"] = shouldBeUnauthedReadList
-		paths[acmePrefix+"acme/new-nonce"] = shouldBeUnauthedReadList
-		paths[acmePrefix+"acme/new-account"] = shouldBeUnauthedWriteOnly
-		paths[acmePrefix+"acme/revoke-cert"] = shouldBeUnauthedWriteOnly
-		paths[acmePrefix+"acme/new-order"] = shouldBeUnauthedWriteOnly
-		paths[acmePrefix+"acme/orders"] = shouldBeUnauthedWriteOnly
-		paths[acmePrefix+"acme/account/hrKmDYTvicHoHGVN2-3uzZV_BPGdE0W_dNaqYTtYqeo="] = shouldBeUnauthedWriteOnly
-		paths[acmePrefix+"acme/authorization/29da8c38-7a09-465e-b9a6-3d76802b1afd"] = shouldBeUnauthedWriteOnly
-		paths[acmePrefix+"acme/challenge/29da8c38-7a09-465e-b9a6-3d76802b1afd/http-01"] = shouldBeUnauthedWriteOnly
-		paths[acmePrefix+"acme/order/13b80844-e60d-42d2-b7e9-152a8e834b90"] = shouldBeUnauthedWriteOnly
-		paths[acmePrefix+"acme/order/13b80844-e60d-42d2-b7e9-152a8e834b90/finalize"] = shouldBeUnauthedWriteOnly
-		paths[acmePrefix+"acme/order/13b80844-e60d-42d2-b7e9-152a8e834b90/cert"] = shouldBeUnauthedWriteOnly
-
-		// Make sure this new-eab path is auth'd
-		paths[acmePrefix+"acme/new-eab"] = shouldBeAuthed
 	}
-
 	for path, checkerType := range paths {
 		checker := pathAuthChckerMap[checkerType]
 		checker(t, client, "pki/"+path, token)
@@ -6896,6 +6236,13 @@ func TestProperAuthing(t *testing.T) {
 		t.Fatalf("failed to get openapi data: %v", err)
 	}
 
+	for openapi_path := range openAPIResp.Data["paths"].(map[string]interface{}) {
+		if strings.HasPrefix(openapi_path, "/pki/") && strings.Contains(openapi_path, "//") {
+			t.Skipf("Skipping OpenAPI validation due to malformed PKI paths: %v", openapi_path)
+			return
+		}
+	}
+
 	validatedPath := false
 	for openapi_path, raw_data := range openAPIResp.Data["paths"].(map[string]interface{}) {
 		if !strings.HasPrefix(openapi_path, "/pki/") {
@@ -6928,21 +6275,6 @@ func TestProperAuthing(t *testing.T) {
 		if strings.Contains(raw_path, "{serial}") {
 			raw_path = strings.ReplaceAll(raw_path, "{serial}", serial)
 		}
-		if strings.Contains(raw_path, "acme/account/") && strings.Contains(raw_path, "{kid}") {
-			raw_path = strings.ReplaceAll(raw_path, "{kid}", "hrKmDYTvicHoHGVN2-3uzZV_BPGdE0W_dNaqYTtYqeo=")
-		}
-		if strings.Contains(raw_path, "acme/") && strings.Contains(raw_path, "{auth_id}") {
-			raw_path = strings.ReplaceAll(raw_path, "{auth_id}", "29da8c38-7a09-465e-b9a6-3d76802b1afd")
-		}
-		if strings.Contains(raw_path, "acme/") && strings.Contains(raw_path, "{challenge_type}") {
-			raw_path = strings.ReplaceAll(raw_path, "{challenge_type}", "http-01")
-		}
-		if strings.Contains(raw_path, "acme/") && strings.Contains(raw_path, "{order_id}") {
-			raw_path = strings.ReplaceAll(raw_path, "{order_id}", "13b80844-e60d-42d2-b7e9-152a8e834b90")
-		}
-		if strings.Contains(raw_path, "eab") && strings.Contains(raw_path, "{key_id}") {
-			raw_path = strings.ReplaceAll(raw_path, "{key_id}", eabKid)
-		}
 
 		handler, present := paths[raw_path]
 		if !present {
@@ -6981,123 +6313,6 @@ func TestProperAuthing(t *testing.T) {
 	}
 }
 
-func TestPatchIssuer(t *testing.T) {
-	t.Parallel()
-
-	type TestCase struct {
-		Field   string
-		Before  interface{}
-		Patched interface{}
-	}
-	testCases := []TestCase{
-		{
-			Field:   "issuer_name",
-			Before:  "root",
-			Patched: "root-new",
-		},
-		{
-			Field:   "leaf_not_after_behavior",
-			Before:  "err",
-			Patched: "permit",
-		},
-		{
-			Field:   "usage",
-			Before:  "crl-signing,issuing-certificates,ocsp-signing,read-only",
-			Patched: "issuing-certificates,read-only",
-		},
-		{
-			Field:   "revocation_signature_algorithm",
-			Before:  "ECDSAWithSHA256",
-			Patched: "ECDSAWithSHA384",
-		},
-		{
-			Field:   "issuing_certificates",
-			Before:  []string{"http://localhost/v1/pki-1/ca"},
-			Patched: []string{"http://localhost/v1/pki/ca"},
-		},
-		{
-			Field:   "crl_distribution_points",
-			Before:  []string{"http://localhost/v1/pki-1/crl"},
-			Patched: []string{"http://localhost/v1/pki/crl"},
-		},
-		{
-			Field:   "ocsp_servers",
-			Before:  []string{"http://localhost/v1/pki-1/ocsp"},
-			Patched: []string{"http://localhost/v1/pki/ocsp"},
-		},
-		{
-			Field:   "enable_aia_url_templating",
-			Before:  false,
-			Patched: true,
-		},
-		{
-			Field:   "manual_chain",
-			Before:  []string(nil),
-			Patched: []string{"self"},
-		},
-	}
-
-	for index, testCase := range testCases {
-		t.Logf("index: %v / tc: %v", index, testCase)
-
-		b, s := CreateBackendWithStorage(t)
-
-		// 1. Setup root issuer.
-		resp, err := CBWrite(b, s, "root/generate/internal", map[string]interface{}{
-			"common_name": "Vault Root CA",
-			"key_type":    "ec",
-			"ttl":         "7200h",
-			"issuer_name": "root",
-		})
-		requireSuccessNonNilResponse(t, resp, err, "failed generating root issuer")
-		id := string(resp.Data["issuer_id"].(issuerID))
-
-		// 2. Enable Cluster paths
-		resp, err = CBWrite(b, s, "config/urls", map[string]interface{}{
-			"path":     "https://localhost/v1/pki",
-			"aia_path": "http://localhost/v1/pki",
-		})
-		requireSuccessNonNilResponse(t, resp, err, "failed updating AIA config")
-
-		// 3. Add AIA information
-		resp, err = CBPatch(b, s, "issuer/default", map[string]interface{}{
-			"issuing_certificates":    "http://localhost/v1/pki-1/ca",
-			"crl_distribution_points": "http://localhost/v1/pki-1/crl",
-			"ocsp_servers":            "http://localhost/v1/pki-1/ocsp",
-		})
-		requireSuccessNonNilResponse(t, resp, err, "failed setting up issuer")
-
-		// 4. Read the issuer before.
-		resp, err = CBRead(b, s, "issuer/default")
-		requireSuccessNonNilResponse(t, resp, err, "failed reading root issuer before")
-		require.Equal(t, testCase.Before, resp.Data[testCase.Field], "bad expectations")
-
-		// 5. Perform modification.
-		resp, err = CBPatch(b, s, "issuer/default", map[string]interface{}{
-			testCase.Field: testCase.Patched,
-		})
-		requireSuccessNonNilResponse(t, resp, err, "failed patching root issuer")
-
-		if testCase.Field != "manual_chain" {
-			require.Equal(t, testCase.Patched, resp.Data[testCase.Field], "failed persisting value")
-		} else {
-			// self->id
-			require.Equal(t, []string{id}, resp.Data[testCase.Field], "failed persisting value")
-		}
-
-		// 6. Ensure it stuck
-		resp, err = CBRead(b, s, "issuer/default")
-		requireSuccessNonNilResponse(t, resp, err, "failed reading root issuer after")
-
-		if testCase.Field != "manual_chain" {
-			require.Equal(t, testCase.Patched, resp.Data[testCase.Field])
-		} else {
-			// self->id
-			require.Equal(t, []string{id}, resp.Data[testCase.Field], "failed persisting value")
-		}
-	}
-}
-
 var (
 	initTest  sync.Once
 	rsaCAKey  string
diff --git a/builtin/logical/pki/ca_test.go b/builtin/logical/pki/ca_test.go
index 7dbffef24774a..2c33397114259 100644
--- a/builtin/logical/pki/ca_test.go
+++ b/builtin/logical/pki/ca_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pki
 
 import (
@@ -307,14 +304,6 @@ func runSteps(t *testing.T, rootB, intB *backend, client *api.Client, rootName,
 			if path == "issuer/default/json" {
 				// Preserves the new line.
 				expected += "\n"
-				_, present := resp.Data["issuer_id"]
-				if !present {
-					t.Fatalf("expected issuer/default/json to include issuer_id")
-				}
-				_, present = resp.Data["issuer_name"]
-				if !present {
-					t.Fatalf("expected issuer/default/json to include issuer_name")
-				}
 			}
 			if diff := deep.Equal(resp.Data["certificate"].(string), expected); diff != nil {
 				t.Fatal(diff)
diff --git a/builtin/logical/pki/ca_util.go b/builtin/logical/pki/ca_util.go
index 85dc243e58bd4..d2a59f34bdd2f 100644
--- a/builtin/logical/pki/ca_util.go
+++ b/builtin/logical/pki/ca_util.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pki
 
 import (
@@ -61,7 +58,6 @@ func getGenerationParams(sc *storageContext, data *framework.FieldData) (exporte
 		AllowedURISANs:            []string{"*"},
 		AllowedOtherSANs:          []string{"*"},
 		AllowedSerialNumbers:      []string{"*"},
-		AllowedUserIDs:            []string{"*"},
 		OU:                        data.Get("ou").([]string),
 		Organization:              data.Get("organization").([]string),
 		Country:                   data.Get("country").([]string),
@@ -189,7 +185,7 @@ func (sc *storageContext) getKeyTypeAndBitsForRole(data *framework.FieldData) (s
 	if kmsRequestedFromFieldData(data) {
 		keyId, err := getManagedKeyId(data)
 		if err != nil {
-			return "", 0, errors.New("unable to determine managed key id: " + err.Error())
+			return "", 0, errors.New("unable to determine managed key id" + err.Error())
 		}
 
 		pubKeyManagedKey, err := getManagedKeyPublicKey(sc.Context, sc.Backend, keyId)
@@ -264,61 +260,3 @@ func existingKeyGeneratorFromBytes(key *keyEntry) certutil.KeyGenerator {
 		return nil
 	}
 }
-
-func buildSignVerbatimRoleWithNoData(role *roleEntry) *roleEntry {
-	data := &framework.FieldData{
-		Raw:    map[string]interface{}{},
-		Schema: addSignVerbatimRoleFields(map[string]*framework.FieldSchema{}),
-	}
-	return buildSignVerbatimRole(data, role)
-}
-
-func buildSignVerbatimRole(data *framework.FieldData, role *roleEntry) *roleEntry {
-	entry := &roleEntry{
-		AllowLocalhost:            true,
-		AllowAnyName:              true,
-		AllowIPSANs:               true,
-		AllowWildcardCertificates: new(bool),
-		EnforceHostnames:          false,
-		KeyType:                   "any",
-		UseCSRCommonName:          true,
-		UseCSRSANs:                true,
-		AllowedOtherSANs:          []string{"*"},
-		AllowedSerialNumbers:      []string{"*"},
-		AllowedURISANs:            []string{"*"},
-		AllowedUserIDs:            []string{"*"},
-		CNValidations:             []string{"disabled"},
-		GenerateLease:             new(bool),
-		// If adding new fields to be read, update the field list within addSignVerbatimRoleFields
-		KeyUsage:        data.Get("key_usage").([]string),
-		ExtKeyUsage:     data.Get("ext_key_usage").([]string),
-		ExtKeyUsageOIDs: data.Get("ext_key_usage_oids").([]string),
-		SignatureBits:   data.Get("signature_bits").(int),
-		UsePSS:          data.Get("use_pss").(bool),
-	}
-	*entry.AllowWildcardCertificates = true
-	*entry.GenerateLease = false
-
-	if role != nil {
-		if role.TTL > 0 {
-			entry.TTL = role.TTL
-		}
-		if role.MaxTTL > 0 {
-			entry.MaxTTL = role.MaxTTL
-		}
-		if role.GenerateLease != nil {
-			*entry.GenerateLease = *role.GenerateLease
-		}
-		if role.NotBeforeDuration > 0 {
-			entry.NotBeforeDuration = role.NotBeforeDuration
-		}
-		entry.NoStore = role.NoStore
-		entry.Issuer = role.Issuer
-	}
-
-	if len(entry.Issuer) == 0 {
-		entry.Issuer = defaultRef
-	}
-
-	return entry
-}
diff --git a/builtin/logical/pki/cert_util.go b/builtin/logical/pki/cert_util.go
index 1795fcab8aac9..5608310637567 100644
--- a/builtin/logical/pki/cert_util.go
+++ b/builtin/logical/pki/cert_util.go
@@ -1,9 +1,7 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pki
 
 import (
+	"context"
 	"crypto"
 	"crypto/ecdsa"
 	"crypto/ed25519"
@@ -88,11 +86,6 @@ func getFormat(data *framework.FieldData) string {
 // loading using the legacyBundleShimID and should be used with care. This should be called only once
 // within the request path otherwise you run the risk of a race condition with the issuer migration on perf-secondaries.
 func (sc *storageContext) fetchCAInfo(issuerRef string, usage issuerUsage) (*certutil.CAInfoBundle, error) {
-	bundle, _, err := sc.fetchCAInfoWithIssuer(issuerRef, usage)
-	return bundle, err
-}
-
-func (sc *storageContext) fetchCAInfoWithIssuer(issuerRef string, usage issuerUsage) (*certutil.CAInfoBundle, issuerID, error) {
 	var issuerId issuerID
 
 	if sc.Backend.useLegacyBundleCaStorage() {
@@ -104,16 +97,11 @@ func (sc *storageContext) fetchCAInfoWithIssuer(issuerRef string, usage issuerUs
 		issuerId, err = sc.resolveIssuerReference(issuerRef)
 		if err != nil {
 			// Usually a bad label from the user or mis-configured default.
-			return nil, IssuerRefNotFound, errutil.UserError{Err: err.Error()}
+			return nil, errutil.UserError{Err: err.Error()}
 		}
 	}
 
-	bundle, err := sc.fetchCAInfoByIssuerId(issuerId, usage)
-	if err != nil {
-		return nil, IssuerRefNotFound, err
-	}
-
-	return bundle, issuerId, nil
+	return sc.fetchCAInfoByIssuerId(issuerId, usage)
 }
 
 // fetchCAInfoByIssuerId will fetch the CA info, will return an error if no ca info exists for the given issuerId.
@@ -156,15 +144,15 @@ func (sc *storageContext) fetchCAInfoByIssuerId(issuerId issuerID, usage issuerU
 
 	entries, err := entry.GetAIAURLs(sc)
 	if err != nil {
-		return nil, errutil.InternalError{Err: fmt.Sprintf("unable to fetch AIA URL information: %v", err)}
+		return nil, errutil.InternalError{Err: fmt.Sprintf("unable to fetch URL information: %v", err)}
 	}
 	caInfo.URLs = entries
 
 	return caInfo, nil
 }
 
-func fetchCertBySerialBigInt(sc *storageContext, prefix string, serial *big.Int) (*logical.StorageEntry, error) {
-	return fetchCertBySerial(sc, prefix, serialFromBigInt(serial))
+func fetchCertBySerialBigInt(ctx context.Context, b *backend, req *logical.Request, prefix string, serial *big.Int) (*logical.StorageEntry, error) {
+	return fetchCertBySerial(ctx, b, req, prefix, serialFromBigInt(serial))
 }
 
 // Allows fetching certificates from the backend; it handles the slightly
@@ -172,7 +160,7 @@ func fetchCertBySerialBigInt(sc *storageContext, prefix string, serial *big.Int)
 //
 // Support for fetching CA certificates was removed, due to the new issuers
 // changes.
-func fetchCertBySerial(sc *storageContext, prefix, serial string) (*logical.StorageEntry, error) {
+func fetchCertBySerial(ctx context.Context, b *backend, req *logical.Request, prefix, serial string) (*logical.StorageEntry, error) {
 	var path, legacyPath string
 	var err error
 	var certEntry *logical.StorageEntry
@@ -186,26 +174,17 @@ func fetchCertBySerial(sc *storageContext, prefix, serial string) (*logical.Stor
 	case strings.HasPrefix(prefix, "revoked/"):
 		legacyPath = "revoked/" + colonSerial
 		path = "revoked/" + hyphenSerial
-	case serial == legacyCRLPath || serial == deltaCRLPath || serial == unifiedCRLPath || serial == unifiedDeltaCRLPath:
-		warnings, err := sc.Backend.crlBuilder.rebuildIfForced(sc)
-		if err != nil {
+	case serial == legacyCRLPath || serial == deltaCRLPath:
+		if err = b.crlBuilder.rebuildIfForced(ctx, b, req); err != nil {
 			return nil, err
 		}
-		if len(warnings) > 0 {
-			msg := "During rebuild of CRL for cert fetch, got the following warnings:"
-			for index, warning := range warnings {
-				msg = fmt.Sprintf("%v\n %d. %v", msg, index+1, warning)
-			}
-			sc.Backend.Logger().Warn(msg)
-		}
-
-		unified := serial == unifiedCRLPath || serial == unifiedDeltaCRLPath
-		path, err = sc.resolveIssuerCRLPath(defaultRef, unified)
+		sc := b.makeStorageContext(ctx, req.Storage)
+		path, err = sc.resolveIssuerCRLPath(defaultRef)
 		if err != nil {
 			return nil, err
 		}
 
-		if serial == deltaCRLPath || serial == unifiedDeltaCRLPath {
+		if serial == deltaCRLPath {
 			if sc.Backend.useLegacyBundleCaStorage() {
 				return nil, fmt.Errorf("refusing to serve delta CRL with legacy CA bundle")
 			}
@@ -217,7 +196,7 @@ func fetchCertBySerial(sc *storageContext, prefix, serial string) (*logical.Stor
 		path = "certs/" + hyphenSerial
 	}
 
-	certEntry, err = sc.Storage.Get(sc.Context, path)
+	certEntry, err = req.Storage.Get(ctx, path)
 	if err != nil {
 		return nil, errutil.InternalError{Err: fmt.Sprintf("error fetching certificate %s: %s", serial, err)}
 	}
@@ -237,7 +216,7 @@ func fetchCertBySerial(sc *storageContext, prefix, serial string) (*logical.Stor
 	// always manifest on Windows, and thus the initial check for a revoked
 	// cert fails would return an error when the cert isn't revoked, preventing
 	// the happy path from working.
-	certEntry, _ = sc.Storage.Get(sc.Context, legacyPath)
+	certEntry, _ = req.Storage.Get(ctx, legacyPath)
 	if certEntry == nil {
 		return nil, nil
 	}
@@ -247,17 +226,17 @@ func fetchCertBySerial(sc *storageContext, prefix, serial string) (*logical.Stor
 
 	// Update old-style paths to new-style paths
 	certEntry.Key = path
-	certsCounted := sc.Backend.certsCounted.Load()
-	if err = sc.Storage.Put(sc.Context, certEntry); err != nil {
+	certsCounted := b.certsCounted.Load()
+	if err = req.Storage.Put(ctx, certEntry); err != nil {
 		return nil, errutil.InternalError{Err: fmt.Sprintf("error saving certificate with serial %s to new location", serial)}
 	}
-	if err = sc.Storage.Delete(sc.Context, legacyPath); err != nil {
+	if err = req.Storage.Delete(ctx, legacyPath); err != nil {
 		// If we fail here, we have an extra (copy) of a cert in storage, add to metrics:
 		switch {
 		case strings.HasPrefix(prefix, "revoked/"):
-			sc.Backend.ifCountEnabledIncrementTotalRevokedCertificatesCount(certsCounted, path)
+			b.incrementTotalRevokedCertificatesCount(certsCounted, path)
 		default:
-			sc.Backend.ifCountEnabledIncrementTotalCertificatesCount(certsCounted, path)
+			b.incrementTotalCertificatesCount(certsCounted, path)
 		}
 		return nil, errutil.InternalError{Err: fmt.Sprintf("error deleting certificate with serial %s from old location", serial)}
 	}
@@ -336,71 +315,6 @@ func validateCommonName(b *backend, data *inputBundle, name string) string {
 	return ""
 }
 
-func isWildcardDomain(name string) bool {
-	// Per RFC 6125 Section 6.4.3, and explicitly contradicting the earlier
-	// RFC 2818 which no modern client will validate against, there are two
-	// main types of wildcards, each with a single wildcard specifier (`*`,
-	// functionally different from the `*` used as a glob from the
-	// AllowGlobDomains parsing path) in the left-most label:
-	//
-	//  1. Entire label is a single wildcard character (most common and
-	//     well-supported),
-	//  2. Part of the label contains a single wildcard character (e.g. per
-	//     RFC 6125: baz*.example.net, *baz.example.net, or b*z.example.net).
-	//
-	// We permit issuance of both but not the older RFC 2818 style under
-	// the new AllowWildcardCertificates option. However, anything with a
-	// glob character is technically a wildcard, though not a valid one.
-
-	return strings.Contains(name, "*")
-}
-
-func validateWildcardDomain(name string) (string, string, error) {
-	// See note in isWildcardDomain(...) about the definition of a wildcard
-	// domain.
-	var wildcardLabel string
-	var reducedName string
-
-	if strings.Count(name, "*") > 1 {
-		// As mentioned above, only one wildcard character is permitted
-		// under RFC 6125 semantics.
-		return wildcardLabel, reducedName, fmt.Errorf("expected only one wildcard identifier in the given domain name")
-	}
-
-	// Split the Common Name into two parts: a left-most label and the
-	// remaining segments (if present).
-	splitLabels := strings.SplitN(name, ".", 2)
-	if len(splitLabels) != 2 {
-		// We've been given a single-part domain name that consists
-		// entirely of a wildcard. This is a little tricky to handle,
-		// but EnforceHostnames validates both the wildcard-containing
-		// label and the reduced name, but _only_ the latter if it is
-		// non-empty. This allows us to still validate the only label
-		// component matches hostname expectations still.
-		wildcardLabel = splitLabels[0]
-		reducedName = ""
-	} else {
-		// We have a (at least) two label domain name. But before we can
-		// update our names, we need to validate the wildcard ended up
-		// in the segment we expected it to. While this is (kinda)
-		// validated under EnforceHostnames's leftWildLabelRegex, we
-		// still need to validate it in the non-enforced mode.
-		//
-		// By validated assumption above, we know there's strictly one
-		// wildcard in this domain so we only need to check the wildcard
-		// label or the reduced name (as one is equivalent to the other).
-		// Because we later assume reducedName _lacks_ wildcard segments,
-		// we validate that.
-		wildcardLabel = splitLabels[0]
-		reducedName = splitLabels[1]
-		if strings.Contains(reducedName, "*") {
-			return wildcardLabel, reducedName, fmt.Errorf("expected wildcard to only be present in left-most domain label")
-		}
-	}
-
-	return wildcardLabel, reducedName, nil
-}
-
 // Given a set of requested names for a certificate, verifies that all of them
 // match the various toggles set in the role for controlling issuance.
 // If one does not pass, it is returned in the string argument.
@@ -435,7 +349,21 @@ func validateNames(b *backend, data *inputBundle, names []string) string {
 			isEmail = true
 		}
 
-		if isWildcardDomain(reducedName) {
+		// Per RFC 6125 Section 6.4.3, and explicitly contradicting the earlier
+		// RFC 2818 which no modern client will validate against, there are two
+		// main types of wildcards, each with a single wildcard specifier (`*`,
+		// functionally different from the `*` used as a glob from the
+		// AllowGlobDomains parsing path) in the left-most label:
+		//
+		//  1. Entire label is a single wildcard character (most common and
+		//     well-supported),
+		//  2. Part of the label contains a single wildcard character (e.g. per
+		///    RFC 6125: baz*.example.net, *baz.example.net, or b*z.example.net).
+		//
+		// We permit issuance of both but not the older RFC 2818 style under
+		// the new AllowWildcardCertificates option. However, anything with a
+		// glob character is technically a wildcard.
+		if strings.Contains(reducedName, "*") {
 			// Regardless of later rejections below, this common name contains
 			// a wildcard character and is thus technically a wildcard name.
 			isWildcard = true
@@ -450,12 +378,42 @@ func validateNames(b *backend, data *inputBundle, names []string) string {
 				return name
 			}
 
-			// Check that this domain is well-formatted per RFC 6125.
-			var err error
-			wildcardLabel, reducedName, err = validateWildcardDomain(reducedName)
-			if err != nil {
+			if strings.Count(reducedName, "*") > 1 {
+				// As mentioned above, only one wildcard character is permitted
+				// under RFC 6125 semantics.
 				return name
 			}
+
+			// Split the Common Name into two parts: a left-most label and the
+			// remaining segments (if present).
+			splitLabels := strings.SplitN(reducedName, ".", 2)
+			if len(splitLabels) != 2 {
+				// We've been given a single-part domain name that consists
+				// entirely of a wildcard. This is a little tricky to handle,
+				// but EnforceHostnames validates both the wildcard-containing
+				// label and the reduced name, but _only_ the latter if it is
+				// non-empty. This allows us to still validate the only label
+				// component matches hostname expectations still.
+				wildcardLabel = splitLabels[0]
+				reducedName = ""
+			} else {
+				// We have a (at least) two label domain name. But before we can
+				// update our names, we need to validate the wildcard ended up
+				// in the segment we expected it to. While this is (kinda)
+				// validated under EnforceHostnames's leftWildLabelRegex, we
+				// still need to validate it in the non-enforced mode.
+				//
+				// By validated assumption above, we know there's strictly one
+				// wildcard in this domain so we only need to check the wildcard
+				// label or the reduced name (as one is equivalent to the other).
+				// Because we later assume reducedName _lacks_ wildcard segments,
+				// we validate that.
+				wildcardLabel = splitLabels[0]
+				reducedName = splitLabels[1]
+				if strings.Contains(reducedName, "*") {
+					return name
+				}
+			}
 		}
 
 		// Email addresses using wildcard domain names do not make sense
@@ -684,33 +642,6 @@ func parseOtherSANs(others []string) (map[string][]string, error) {
 	return result, nil
 }
 
-// Returns bool stating whether the given UserId is Valid
-func validateUserId(data *inputBundle, userId string) bool {
-	allowedList := data.role.AllowedUserIDs
-
-	if len(allowedList) == 0 {
-		// Nothing is allowed.
-		return false
-	}
-
-	if strutil.StrListContainsCaseInsensitive(allowedList, userId) {
-		return true
-	}
-
-	for _, rolePattern := range allowedList {
-		if rolePattern == "" {
-			continue
-		}
-
-		if strings.Contains(rolePattern, "*") && glob.Glob(rolePattern, userId) {
-			return true
-		}
-	}
-
-	// No matches.
-	return false
-}
-
 func validateSerialNumber(data *inputBundle, serialNumber string) string {
 	valid := false
 	if len(data.role.AllowedSerialNumbers) > 0 {
@@ -768,15 +699,9 @@ func generateCert(sc *storageContext,
 			// issuer entry yet, we default to the global URLs.
 			entries, err := getGlobalAIAURLs(ctx, sc.Storage)
 			if err != nil {
-				return nil, nil, errutil.InternalError{Err: fmt.Sprintf("unable to fetch AIA URL information: %v", err)}
-			}
-
-			uris, err := entries.toURLEntries(sc, issuerID(""))
-			if err != nil {
-				return nil, nil, errutil.InternalError{Err: fmt.Sprintf("unable to parse AIA URL information: %v\nUsing templated AIA URL's {{issuer_id}} field when generating root certificates is not supported.", err)}
+				return nil, nil, errutil.InternalError{Err: fmt.Sprintf("unable to fetch URL information: %v", err)}
 			}
-
-			data.Params.URLs = uris
+			data.Params.URLs = entries
 
 			if input.role.MaxPathLength == nil {
 				data.Params.MaxPathLength = -1
@@ -1002,12 +927,6 @@ func signCert(b *backend,
 
 	if isCA {
 		creation.Params.PermittedDNSDomains = data.apiData.Get("permitted_dns_domains").([]string)
-	} else {
-		for _, ext := range csr.Extensions {
-			if ext.Id.Equal(certutil.ExtensionBasicConstraintsOID) {
-				warnings = append(warnings, "specified CSR contained a Basic Constraints extension that was ignored during issuance")
-			}
-		}
 	}
 
 	parsedBundle, err := certutil.SignCertificate(creation)
@@ -1379,11 +1298,71 @@ func generateCreationBundle(b *backend, data *inputBundle, caSign *certutil.CAIn
 	}
 
 	// Get the TTL and verify it against the max allowed
-	notAfter, ttlWarnings, err := getCertificateNotAfter(b, data, caSign)
-	if err != nil {
-		return nil, warnings, err
+	var ttl time.Duration
+	var maxTTL time.Duration
+	var notAfter time.Time
+	var err error
+	{
+		ttl = time.Duration(data.apiData.Get("ttl").(int)) * time.Second
+		notAfterAlt := data.role.NotAfter
+		if notAfterAlt == "" {
+			notAfterAltRaw, ok := data.apiData.GetOk("not_after")
+			if ok {
+				notAfterAlt = notAfterAltRaw.(string)
+			}
+
+		}
+		if ttl > 0 && notAfterAlt != "" {
+			return nil, nil, errutil.UserError{
+				Err: "Either ttl or not_after should be provided. Both should not be provided in the same request.",
+			}
+		}
+
+		if ttl == 0 && data.role.TTL > 0 {
+			ttl = data.role.TTL
+		}
+
+		if data.role.MaxTTL > 0 {
+			maxTTL = data.role.MaxTTL
+		}
+
+		if ttl == 0 {
+			ttl = b.System().DefaultLeaseTTL()
+		}
+		if maxTTL == 0 {
+			maxTTL = b.System().MaxLeaseTTL()
+		}
+		if ttl > maxTTL {
+			warnings = append(warnings, fmt.Sprintf("TTL %q is longer than permitted maxTTL %q, so maxTTL is being used", ttl, maxTTL))
+			ttl = maxTTL
+		}
+
+		if notAfterAlt != "" {
+			notAfter, err = time.Parse(time.RFC3339, notAfterAlt)
+			if err != nil {
+				return nil, nil, errutil.UserError{Err: err.Error()}
+			}
+		} else {
+			notAfter = time.Now().Add(ttl)
+		}
+		if caSign != nil && notAfter.After(caSign.Certificate.NotAfter) {
+			// If it's not self-signed, verify that the issued certificate
+			// won't be valid past the lifetime of the CA certificate, and
+			// act accordingly. This is dependent based on the issuer's
+			// LeafNotAfterBehavior argument.
+			switch caSign.LeafNotAfterBehavior {
+			case certutil.PermitNotAfterBehavior:
+				// Explicitly do nothing.
+			case certutil.TruncateNotAfterBehavior:
+				notAfter = caSign.Certificate.NotAfter
+			case certutil.ErrNotAfterBehavior:
+				fallthrough
+			default:
+				return nil, nil, errutil.UserError{Err: fmt.Sprintf(
+					"cannot satisfy request, as TTL would result in notAfter %s that is beyond the expiration of the CA certificate at %s", notAfter.Format(time.RFC3339Nano), caSign.Certificate.NotAfter.Format(time.RFC3339Nano))}
+			}
+		}
 	}
-	warnings = append(warnings, ttlWarnings...)
 
 	// Parse SKID from the request for cross-signing.
 	var skid []byte
@@ -1406,41 +1385,6 @@ func generateCreationBundle(b *backend, data *inputBundle, caSign *certutil.CAIn
 		}
 	}
 
-	// Add UserIDs into the Subject, if the request type supports it.
-	if _, present := data.apiData.Schema["user_ids"]; present {
-		rawUserIDs := data.apiData.Get("user_ids").([]string)
-
-		// Only take UserIDs from CSR if one was not supplied via API.
-		if len(rawUserIDs) == 0 && csr != nil {
-			for _, attr := range csr.Subject.Names {
-				if attr.Type.Equal(certutil.SubjectPilotUserIDAttributeOID) {
-					switch aValue := attr.Value.(type) {
-					case string:
-						rawUserIDs = append(rawUserIDs, aValue)
-					case []byte:
-						rawUserIDs = append(rawUserIDs, string(aValue))
-					default:
-						return nil, nil, errutil.UserError{Err: "unknown type for user_id attribute in CSR's Subject"}
-					}
-				}
-			}
-		}
-
-		// Check for bad userIDs and add to the subject.
-		if len(rawUserIDs) > 0 {
-			for _, value := range rawUserIDs {
-				if !validateUserId(data, value) {
-					return nil, nil, errutil.UserError{Err: fmt.Sprintf("user_id %v is not allowed by this role", value)}
-				}
-
-				subject.ExtraNames = append(subject.ExtraNames, pkix.AttributeTypeAndValue{
-					Type:  certutil.SubjectPilotUserIDAttributeOID,
-					Value: value,
-				})
-			}
-		}
-	}
-
 	creation := &certutil.CreationBundle{
 		Params: &certutil.CreationParameters{
 			Subject:                       subject,
@@ -1499,73 +1443,6 @@ func generateCreationBundle(b *backend, data *inputBundle, caSign *certutil.CAIn
 	return creation, warnings, nil
 }
 
-// getCertificateNotAfter compute a certificate's NotAfter date based on the mount ttl, role, signing bundle and input
-// api data being sent. Returns a NotAfter time, a set of warnings or an error.
-func getCertificateNotAfter(b *backend, data *inputBundle, caSign *certutil.CAInfoBundle) (time.Time, []string, error) {
-	var warnings []string
-	var maxTTL time.Duration
-	var notAfter time.Time
-	var err error
-
-	ttl := time.Duration(data.apiData.Get("ttl").(int)) * time.Second
-	notAfterAlt := data.role.NotAfter
-	if notAfterAlt == "" {
-		notAfterAltRaw, ok := data.apiData.GetOk("not_after")
-		if ok {
-			notAfterAlt = notAfterAltRaw.(string)
-		}
-	}
-	if ttl > 0 && notAfterAlt != "" {
-		return time.Time{}, warnings, errutil.UserError{Err: "Either ttl or not_after should be provided. Both should not be provided in the same request."}
-	}
-
-	if ttl == 0 && data.role.TTL > 0 {
-		ttl = data.role.TTL
-	}
-
-	if data.role.MaxTTL > 0 {
-		maxTTL = data.role.MaxTTL
-	}
-
-	if ttl == 0 {
-		ttl = b.System().DefaultLeaseTTL()
-	}
-	if maxTTL == 0 {
-		maxTTL = b.System().MaxLeaseTTL()
-	}
-	if ttl > maxTTL {
-		warnings = append(warnings, fmt.Sprintf("TTL %q is longer than permitted maxTTL %q, so maxTTL is being used", ttl, maxTTL))
-		ttl = maxTTL
-	}
-
-	if notAfterAlt != "" {
-		notAfter, err = time.Parse(time.RFC3339, notAfterAlt)
-		if err != nil {
-			return notAfter, warnings, errutil.UserError{Err: err.Error()}
-		}
-	} else {
-		notAfter = time.Now().Add(ttl)
-	}
-	if caSign != nil && notAfter.After(caSign.Certificate.NotAfter) {
-		// If it's not self-signed, verify that the issued certificate
-		// won't be valid past the lifetime of the CA certificate, and
-		// act accordingly. This is dependent based on the issuer's
-		// LeafNotAfterBehavior argument.
-		switch caSign.LeafNotAfterBehavior {
-		case certutil.PermitNotAfterBehavior:
-			// Explicitly do nothing.
-		case certutil.TruncateNotAfterBehavior:
-			notAfter = caSign.Certificate.NotAfter
-		case certutil.ErrNotAfterBehavior:
-			fallthrough
-		default:
-			return time.Time{}, warnings, errutil.UserError{Err: fmt.Sprintf(
-				"cannot satisfy request, as TTL would result in notAfter of %s that is beyond the expiration of the CA certificate at %s", notAfter.UTC().Format(time.RFC3339Nano), caSign.Certificate.NotAfter.UTC().Format(time.RFC3339Nano))}
-		}
-	}
-	return notAfter, warnings, nil
-}
-
 func convertRespToPKCS8(resp *logical.Response) error {
 	privRaw, ok := resp.Data["private_key"]
 	if !ok {
diff --git a/builtin/logical/pki/cert_util_test.go b/builtin/logical/pki/cert_util_test.go
index 7fb811cb8fcfe..ba2e6f8106116 100644
--- a/builtin/logical/pki/cert_util_test.go
+++ b/builtin/logical/pki/cert_util_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pki
 
 import (
@@ -16,8 +13,7 @@ import (
 
 func TestPki_FetchCertBySerial(t *testing.T) {
 	t.Parallel()
-	b, storage := CreateBackendWithStorage(t)
-	sc := b.makeStorageContext(ctx, storage)
+	b, storage := createBackendWithStorage(t)
 
 	cases := map[string]struct {
 		Req    *logical.Request
@@ -51,7 +47,7 @@ func TestPki_FetchCertBySerial(t *testing.T) {
 			t.Fatalf("error writing to storage on %s colon-based storage path: %s", name, err)
 		}
 
-		certEntry, err := fetchCertBySerial(sc, tc.Prefix, tc.Serial)
+		certEntry, err := fetchCertBySerial(context.Background(), b, tc.Req, tc.Prefix, tc.Serial)
 		if err != nil {
 			t.Fatalf("error on %s for colon-based storage path: %s", name, err)
 		}
@@ -86,7 +82,7 @@ func TestPki_FetchCertBySerial(t *testing.T) {
 			t.Fatalf("error writing to storage on %s hyphen-based storage path: %s", name, err)
 		}
 
-		certEntry, err := fetchCertBySerial(sc, tc.Prefix, tc.Serial)
+		certEntry, err := fetchCertBySerial(context.Background(), b, tc.Req, tc.Prefix, tc.Serial)
 		if err != nil || certEntry == nil {
 			t.Fatalf("error on %s for hyphen-based storage path: err: %v, entry: %v", name, err, certEntry)
 		}
diff --git a/builtin/logical/pki/chain_test.go b/builtin/logical/pki/chain_test.go
index e76df359e9ed1..746a378cbaf47 100644
--- a/builtin/logical/pki/chain_test.go
+++ b/builtin/logical/pki/chain_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pki
 
 import (
@@ -312,8 +309,6 @@ func (c CBValidateChain) PrettyChain(t testing.TB, chain []string, knownCerts ma
 }
 
 func ToCertificate(t testing.TB, cert string) *x509.Certificate {
-	t.Helper()
-
 	block, _ := pem.Decode([]byte(cert))
 	if block == nil {
 		t.Fatalf("Unable to parse certificate: nil PEM block\n[%v]\n", cert)
@@ -328,8 +323,6 @@ func ToCertificate(t testing.TB, cert string) *x509.Certificate {
 }
 
 func ToCRL(t testing.TB, crl string, issuer *x509.Certificate) *pkix.CertificateList {
-	t.Helper()
-
 	block, _ := pem.Decode([]byte(crl))
 	if block == nil {
 		t.Fatalf("Unable to parse CRL: nil PEM block\n[%v]\n", crl)
@@ -1605,7 +1598,7 @@ var chainBuildingTestCases = []CBTestScenario{
 func Test_CAChainBuilding(t *testing.T) {
 	t.Parallel()
 	for testIndex, testCase := range chainBuildingTestCases {
-		b, s := CreateBackendWithStorage(t)
+		b, s := createBackendWithStorage(t)
 
 		knownKeys := make(map[string]string)
 		knownCerts := make(map[string]string)
@@ -1627,7 +1620,7 @@ func BenchmarkChainBuilding(benchies *testing.B) {
 			bench.StopTimer()
 			bench.ResetTimer()
 
-			b, s := CreateBackendWithStorage(bench)
+			b, s := createBackendWithStorage(bench)
 
 			knownKeys := make(map[string]string)
 			knownCerts := make(map[string]string)
diff --git a/builtin/logical/pki/chain_util.go b/builtin/logical/pki/chain_util.go
index e884f075588ee..6b7a6a5c7bebd 100644
--- a/builtin/logical/pki/chain_util.go
+++ b/builtin/logical/pki/chain_util.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pki
 
 import (
diff --git a/builtin/logical/pki/cmd/pki/main.go b/builtin/logical/pki/cmd/pki/main.go
index 7c804be23713d..ffcb4521c8958 100644
--- a/builtin/logical/pki/cmd/pki/main.go
+++ b/builtin/logical/pki/cmd/pki/main.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package main
 
 import (
@@ -20,11 +17,9 @@ func main() {
 	tlsConfig := apiClientMeta.GetTLSConfig()
 	tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig)
 
-	if err := plugin.ServeMultiplex(&plugin.ServeOpts{
+	if err := plugin.Serve(&plugin.ServeOpts{
 		BackendFactoryFunc: pki.Factory,
-		// set the TLSProviderFunc so that the plugin maintains backwards
-		// compatibility with Vault versions that don’t support plugin AutoMTLS
-		TLSProviderFunc: tlsProviderFunc,
+		TLSProviderFunc:    tlsProviderFunc,
 	}); err != nil {
 		logger := hclog.New(&hclog.LoggerOptions{})
 
diff --git a/builtin/logical/pki/config_util.go b/builtin/logical/pki/config_util.go
index 80814550c7531..0d8b8dad26e43 100644
--- a/builtin/logical/pki/config_util.go
+++ b/builtin/logical/pki/config_util.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pki
 
 import (
@@ -100,21 +97,21 @@ func (sc *storageContext) changeDefaultIssuerTimestamps(oldDefault issuerID, new
 		issuer.LastModified = now
 		err = sc.writeIssuer(issuer)
 		if err != nil {
-			return fmt.Errorf("unable to update issuer (%v)'s modification time: error persisting issuer: %w", thisId, err)
+			return fmt.Errorf("unable to update issuer (%v)'s modification time: error persisting issuer: %v", thisId, err)
 		}
 	}
 
-	// Fetch and update the internalCRLConfigEntry (3&4).
+	// Fetch and update the localCRLConfigEntry (3&4).
 	cfg, err := sc.getLocalCRLConfig()
 	if err != nil {
-		return fmt.Errorf("unable to update local CRL config's modification time: error fetching local CRL config: %w", err)
+		return fmt.Errorf("unable to update local CRL config's modification time: error fetching local CRL config: %v", err)
 	}
 
 	cfg.LastModified = now
 	cfg.DeltaLastModified = now
 	err = sc.setLocalCRLConfig(cfg)
 	if err != nil {
-		return fmt.Errorf("unable to update local CRL config's modification time: error persisting local CRL config: %w", err)
+		return fmt.Errorf("unable to update local CRL config's modification time: error persisting local CRL config: %v", err)
 	}
 
 	return nil
diff --git a/builtin/logical/pki/crl_test.go b/builtin/logical/pki/crl_test.go
index aaa67ba77d805..8f15aae2f4cb3 100644
--- a/builtin/logical/pki/crl_test.go
+++ b/builtin/logical/pki/crl_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pki
 
 import (
@@ -12,8 +9,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/vault/sdk/helper/testhelpers/schema"
-
 	"github.com/hashicorp/vault/api"
 	vaulthttp "github.com/hashicorp/vault/http"
 	"github.com/hashicorp/vault/sdk/logical"
@@ -24,7 +19,7 @@ import (
 
 func TestBackend_CRL_EnableDisableRoot(t *testing.T) {
 	t.Parallel()
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 
 	resp, err := CBWrite(b, s, "root/generate/internal", map[string]interface{}{
 		"ttl":         "40h",
@@ -40,7 +35,7 @@ func TestBackend_CRL_EnableDisableRoot(t *testing.T) {
 
 func TestBackend_CRLConfigUpdate(t *testing.T) {
 	t.Parallel()
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 
 	// Write a legacy config to storage.
 	type legacyConfig struct {
@@ -84,7 +79,7 @@ func TestBackend_CRLConfig(t *testing.T) {
 	for _, tc := range tests {
 		name := fmt.Sprintf("%s-%t-%t", tc.expiry, tc.disable, tc.ocspDisable)
 		t.Run(name, func(t *testing.T) {
-			b, s := CreateBackendWithStorage(t)
+			b, s := createBackendWithStorage(t)
 
 			resp, err := CBWrite(b, s, "config/crl", map[string]interface{}{
 				"expiry":                    tc.expiry,
@@ -94,12 +89,9 @@ func TestBackend_CRLConfig(t *testing.T) {
 				"auto_rebuild":              tc.autoRebuild,
 				"auto_rebuild_grace_period": tc.autoRebuildGracePeriod,
 			})
-			requireSuccessNonNilResponse(t, resp, err)
-			schema.ValidateResponse(t, schema.GetResponseSchema(t, b.Route("config/crl"), logical.UpdateOperation), resp, true)
+			requireSuccessNilResponse(t, resp, err)
 
 			resp, err = CBRead(b, s, "config/crl")
-			schema.ValidateResponse(t, schema.GetResponseSchema(t, b.Route("config/crl"), logical.ReadOperation), resp, true)
-
 			requireSuccessNonNilResponse(t, resp, err)
 			requireFieldsSetInResp(t, resp, "disable", "expiry", "ocsp_disable", "auto_rebuild", "auto_rebuild_grace_period")
 
@@ -131,7 +123,7 @@ func TestBackend_CRLConfig(t *testing.T) {
 	for _, tc := range badValueTests {
 		name := fmt.Sprintf("bad-%s-%s-%s", tc.expiry, tc.disable, tc.ocspDisable)
 		t.Run(name, func(t *testing.T) {
-			b, s := CreateBackendWithStorage(t)
+			b, s := createBackendWithStorage(t)
 
 			_, err := CBWrite(b, s, "config/crl", map[string]interface{}{
 				"expiry":                    tc.expiry,
@@ -172,7 +164,7 @@ func TestBackend_CRL_AllKeyTypeSigAlgos(t *testing.T) {
 
 	for index, tc := range testCases {
 		t.Logf("tv %v", index)
-		b, s := CreateBackendWithStorage(t)
+		b, s := createBackendWithStorage(t)
 
 		resp, err := CBWrite(b, s, "root/generate/internal", map[string]interface{}{
 			"ttl":            "40h",
@@ -215,7 +207,7 @@ func TestBackend_CRL_EnableDisableIntermediateWithoutRoot(t *testing.T) {
 }
 
 func crlEnableDisableIntermediateTestForBackend(t *testing.T, withRoot bool) {
-	b_root, s_root := CreateBackendWithStorage(t)
+	b_root, s_root := createBackendWithStorage(t)
 
 	resp, err := CBWrite(b_root, s_root, "root/generate/internal", map[string]interface{}{
 		"ttl":         "40h",
@@ -226,7 +218,7 @@ func crlEnableDisableIntermediateTestForBackend(t *testing.T, withRoot bool) {
 	}
 	rootSerial := resp.Data["serial_number"].(string)
 
-	b_int, s_int := CreateBackendWithStorage(t)
+	b_int, s_int := createBackendWithStorage(t)
 
 	resp, err = CBWrite(b_int, s_int, "intermediate/generate/internal", map[string]interface{}{
 		"common_name": "intermediate myvault.com",
@@ -379,7 +371,7 @@ func crlEnableDisableTestForBackend(t *testing.T, b *backend, s logical.Storage,
 func TestBackend_Secondary_CRL_Rebuilding(t *testing.T) {
 	t.Parallel()
 	ctx := context.Background()
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 	sc := b.makeStorageContext(ctx, s)
 
 	// Write out the issuer/key to storage without going through the api call as replication would.
@@ -404,7 +396,7 @@ func TestBackend_Secondary_CRL_Rebuilding(t *testing.T) {
 func TestCrlRebuilder(t *testing.T) {
 	t.Parallel()
 	ctx := context.Background()
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 	sc := b.makeStorageContext(ctx, s)
 
 	// Write out the issuer/key to storage without going through the api call as replication would.
@@ -412,21 +404,19 @@ func TestCrlRebuilder(t *testing.T) {
 	_, _, err := sc.writeCaBundle(bundle, "", "")
 	require.NoError(t, err)
 
+	req := &logical.Request{Storage: s}
 	cb := newCRLBuilder(true /* can rebuild and write CRLs */)
 
 	// Force an initial build
-	warnings, err := cb.rebuild(sc, true)
+	err = cb.rebuild(ctx, b, req, true)
 	require.NoError(t, err, "Failed to rebuild CRL")
-	require.Empty(t, warnings, "unexpectedly got warnings rebuilding CRL")
 
 	resp := requestCrlFromBackend(t, s, b)
 	crl1 := parseCrlPemBytes(t, resp.Data["http_raw_body"].([]byte))
 
 	// We shouldn't rebuild within this call.
-	warnings, err = cb.rebuildIfForced(sc)
+	err = cb.rebuildIfForced(ctx, b, req)
 	require.NoError(t, err, "Failed to rebuild if forced CRL")
-	require.Empty(t, warnings, "unexpectedly got warnings rebuilding CRL")
-
 	resp = requestCrlFromBackend(t, s, b)
 	crl2 := parseCrlPemBytes(t, resp.Data["http_raw_body"].([]byte))
 	require.Equal(t, crl1.ThisUpdate, crl2.ThisUpdate, "According to the update field, we rebuilt the CRL")
@@ -442,12 +432,9 @@ func TestCrlRebuilder(t *testing.T) {
 
 	// This should rebuild the CRL
 	cb.requestRebuildIfActiveNode(b)
-	warnings, err = cb.rebuildIfForced(sc)
+	err = cb.rebuildIfForced(ctx, b, req)
 	require.NoError(t, err, "Failed to rebuild if forced CRL")
-	require.Empty(t, warnings, "unexpectedly got warnings rebuilding CRL")
 	resp = requestCrlFromBackend(t, s, b)
-	schema.ValidateResponse(t, schema.GetResponseSchema(t, b.Route("crl/pem"), logical.ReadOperation), resp, true)
-
 	crl3 := parseCrlPemBytes(t, resp.Data["http_raw_body"].([]byte))
 	require.True(t, crl1.ThisUpdate.Before(crl3.ThisUpdate),
 		"initial crl time: %#v not before next crl rebuild time: %#v", crl1.ThisUpdate, crl3.ThisUpdate)
@@ -456,7 +443,7 @@ func TestCrlRebuilder(t *testing.T) {
 func TestBYOC(t *testing.T) {
 	t.Parallel()
 
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 
 	// Create a root CA.
 	resp, err := CBWrite(b, s, "root/generate/internal", map[string]interface{}{
@@ -575,7 +562,7 @@ func TestBYOC(t *testing.T) {
 func TestPoP(t *testing.T) {
 	t.Parallel()
 
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 
 	// Create a root CA.
 	resp, err := CBWrite(b, s, "root/generate/internal", map[string]interface{}{
@@ -607,11 +594,10 @@ func TestPoP(t *testing.T) {
 	require.NotNil(t, resp)
 	require.NotEmpty(t, resp.Data["certificate"])
 
-	resp, err = CBWrite(b, s, "revoke-with-key", map[string]interface{}{
+	_, err = CBWrite(b, s, "revoke-with-key", map[string]interface{}{
 		"certificate": resp.Data["certificate"],
 		"private_key": resp.Data["private_key"],
 	})
-	schema.ValidateResponse(t, schema.GetResponseSchema(t, b.Route("revoke-with-key"), logical.UpdateOperation), resp, true)
 	require.NoError(t, err)
 
 	// Issue a second leaf, but hold onto it for now.
@@ -736,7 +722,7 @@ func TestPoP(t *testing.T) {
 func TestIssuerRevocation(t *testing.T) {
 	t.Parallel()
 
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 
 	// Write a config with auto-rebuilding so that we can verify stuff doesn't
 	// appear on the delta CRL.
@@ -781,16 +767,12 @@ func TestIssuerRevocation(t *testing.T) {
 
 	// Revoke it.
 	resp, err = CBWrite(b, s, "issuer/root2/revoke", map[string]interface{}{})
-	schema.ValidateResponse(t, schema.GetResponseSchema(t, b.Route("issuer/root2/revoke"), logical.UpdateOperation), resp, true)
-
 	require.NoError(t, err)
 	require.NotNil(t, resp)
 	require.NotZero(t, resp.Data["revocation_time"])
 
 	// Regenerate the CRLs
-	resp, err = CBRead(b, s, "crl/rotate")
-	schema.ValidateResponse(t, schema.GetResponseSchema(t, b.Route("crl/rotate"), logical.ReadOperation), resp, true)
-
+	_, err = CBRead(b, s, "crl/rotate")
 	require.NoError(t, err)
 
 	// Ensure the old cert isn't on its own CRL.
@@ -815,7 +797,7 @@ func TestIssuerRevocation(t *testing.T) {
 	require.NoError(t, err)
 
 	// Issue a leaf cert and ensure it fails (because the issuer is revoked).
-	resp, err = CBWrite(b, s, "issuer/root2/issue/local-testing", map[string]interface{}{
+	_, err = CBWrite(b, s, "issuer/root2/issue/local-testing", map[string]interface{}{
 		"common_name": "testing",
 	})
 	require.Error(t, err)
@@ -841,8 +823,6 @@ func TestIssuerRevocation(t *testing.T) {
 	resp, err = CBWrite(b, s, "intermediate/set-signed", map[string]interface{}{
 		"certificate": intCert,
 	})
-	schema.ValidateResponse(t, schema.GetResponseSchema(t, b.Route("intermediate/set-signed"), logical.UpdateOperation), resp, true)
-
 	require.NoError(t, err)
 	require.NotNil(t, resp)
 	require.NotEmpty(t, resp.Data["imported_issuers"])
@@ -858,8 +838,6 @@ func TestIssuerRevocation(t *testing.T) {
 	resp, err = CBWrite(b, s, "issuer/int1/issue/local-testing", map[string]interface{}{
 		"common_name": "testing",
 	})
-	schema.ValidateResponse(t, schema.GetResponseSchema(t, b.Route("issuer/int1/issue/local-testing"), logical.UpdateOperation), resp, true)
-
 	require.NoError(t, err)
 	require.NotNil(t, resp)
 	require.NotEmpty(t, resp.Data["certificate"])
@@ -1002,9 +980,8 @@ func TestAutoRebuild(t *testing.T) {
 	})
 	require.NoError(t, err)
 
-	defaultCrlPath := "/v1/pki/crl"
-	crl := getParsedCrlAtPath(t, client, defaultCrlPath).TBSCertList
-	lastCRLNumber := getCRLNumber(t, crl)
+	crl := getCrlCertificateList(t, client, "pki")
+	lastCRLNumber := crl.Version
 	lastCRLExpiry := crl.NextUpdate
 	requireSerialNumberInCRL(t, crl, leafSerial)
 
@@ -1018,12 +995,6 @@ func TestAutoRebuild(t *testing.T) {
 	})
 	require.NoError(t, err)
 
-	// Wait for the CRL to update based on the configuration change we just did
-	// so that it doesn't grab the revocation we are going to do afterwards.
-	crl = waitForUpdatedCrl(t, client, defaultCrlPath, lastCRLNumber, lastCRLExpiry.Sub(time.Now()))
-	lastCRLNumber = getCRLNumber(t, crl)
-	lastCRLExpiry = crl.NextUpdate
-
 	// Issue a cert and revoke it.
 	resp, err = client.Logical().Write("pki/issue/local-testing", map[string]interface{}{
 		"common_name": "example.com",
@@ -1044,7 +1015,13 @@ func TestAutoRebuild(t *testing.T) {
 	// each revocation. Pull the storage from the cluster (via the sys/raw
 	// endpoint which requires the mount UUID) and verify the revInfo contains
 	// a matching issuer.
-	pkiMount := findStorageMountUuid(t, client, "pki")
+	resp, err = client.Logical().Read("sys/mounts/pki")
+	require.NoError(t, err)
+	require.NotNil(t, resp)
+	require.NotNil(t, resp.Data)
+	require.NotEmpty(t, resp.Data["uuid"])
+	pkiMount := resp.Data["uuid"].(string)
+	require.NotEmpty(t, pkiMount)
 	revEntryPath := "logical/" + pkiMount + "/" + revokedPath + normalizeSerial(newLeafSerial)
 
 	// storage from cluster.Core[0] is a physical storage copy, not a logical
@@ -1065,7 +1042,7 @@ func TestAutoRebuild(t *testing.T) {
 
 	// New serial should not appear on CRL.
 	crl = getCrlCertificateList(t, client, "pki")
-	thisCRLNumber := getCRLNumber(t, crl)
+	thisCRLNumber := crl.Version
 	requireSerialNumberInCRL(t, crl, leafSerial) // But the old one should.
 	now := time.Now()
 	graceInterval, _ := time.ParseDuration(gracePeriod)
@@ -1086,7 +1063,7 @@ func TestAutoRebuild(t *testing.T) {
 	}
 
 	// This serial should exist in the delta WAL section for the mount...
-	resp, err = client.Logical().List("sys/raw/logical/" + pkiMount + "/" + localDeltaWALPath)
+	resp, err = client.Logical().List("sys/raw/logical/" + pkiMount + "/" + deltaWALPath)
 	require.NoError(t, err)
 	require.NotNil(t, resp)
 	require.NotEmpty(t, resp.Data)
@@ -1106,7 +1083,7 @@ func TestAutoRebuild(t *testing.T) {
 		default:
 			// Check and see if there's a storage entry for the last rebuild
 			// serial. If so, validate the delta CRL contains this entry.
-			resp, err = client.Logical().List("sys/raw/logical/" + pkiMount + "/" + localDeltaWALPath)
+			resp, err = client.Logical().List("sys/raw/logical/" + pkiMount + "/" + deltaWALPath)
 			require.NoError(t, err)
 			require.NotNil(t, resp)
 			require.NotEmpty(t, resp.Data)
@@ -1127,7 +1104,7 @@ func TestAutoRebuild(t *testing.T) {
 			}
 
 			// Read the marker and see if its correct.
-			resp, err = client.Logical().Read("sys/raw/logical/" + pkiMount + "/" + localDeltaWALLastBuildSerial)
+			resp, err = client.Logical().Read("sys/raw/logical/" + pkiMount + "/" + deltaWALLastBuildSerial)
 			require.NoError(t, err)
 			if resp == nil {
 				time.Sleep(1 * time.Second)
@@ -1150,13 +1127,8 @@ func TestAutoRebuild(t *testing.T) {
 			deltaCrl := getParsedCrlAtPath(t, client, "/v1/pki/crl/delta").TBSCertList
 			if !requireSerialNumberInCRL(nil, deltaCrl, newLeafSerial) {
 				// Check if it is on the main CRL because its already regenerated.
-				mainCRL := getParsedCrlAtPath(t, client, defaultCrlPath).TBSCertList
+				mainCRL := getParsedCrlAtPath(t, client, "/v1/pki/crl").TBSCertList
 				requireSerialNumberInCRL(t, mainCRL, newLeafSerial)
-			} else {
-				referenceCrlNum := getCrlReferenceFromDelta(t, deltaCrl)
-				if lastCRLNumber < referenceCrlNum {
-					lastCRLNumber = referenceCrlNum
-				}
 			}
 		}
 	}
@@ -1167,26 +1139,38 @@ func TestAutoRebuild(t *testing.T) {
 		time.Sleep(expectedUpdate.Sub(now))
 	}
 
-	crl = waitForUpdatedCrl(t, client, defaultCrlPath, lastCRLNumber, lastCRLExpiry.Sub(now)+delta)
-	requireSerialNumberInCRL(t, crl, leafSerial)
-	requireSerialNumberInCRL(t, crl, newLeafSerial)
-}
+	// Otherwise, the absolute latest we're willing to wait is some delta
+	// after CRL expiry (to let stuff regenerate &c).
+	interruptChan = time.After(lastCRLExpiry.Sub(now) + delta)
+	for {
+		select {
+		case <-interruptChan:
+			t.Fatalf("expected CRL to regenerate prior to CRL expiry (plus %v grace period)", delta)
+		default:
+			crl = getCrlCertificateList(t, client, "pki")
+			if crl.NextUpdate.Equal(lastCRLExpiry) {
+				// Hack to ensure we got a net-new CRL. If we didn't, we can
+				// exit this default conditional and wait for the next
+				// go-round. When the timer fires, it'll populate the channel
+				// and we'll exit correctly.
+				time.Sleep(1 * time.Second)
+				break
+			}
 
-func findStorageMountUuid(t *testing.T, client *api.Client, mount string) string {
-	resp, err := client.Logical().Read("sys/mounts/" + mount)
-	require.NoError(t, err)
-	require.NotNil(t, resp)
-	require.NotNil(t, resp.Data)
-	require.NotEmpty(t, resp.Data["uuid"])
-	pkiMount := resp.Data["uuid"].(string)
-	require.NotEmpty(t, pkiMount)
-	return pkiMount
+			now := time.Now()
+			require.True(t, crl.ThisUpdate.Before(now))
+			require.True(t, crl.NextUpdate.After(now))
+			requireSerialNumberInCRL(t, crl, leafSerial)
+			requireSerialNumberInCRL(t, crl, newLeafSerial)
+			return
+		}
+	}
 }
 
 func TestTidyIssuerAssociation(t *testing.T) {
 	t.Parallel()
 
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 
 	// Create a root CA.
 	resp, err := CBWrite(b, s, "root/generate/internal", map[string]interface{}{
@@ -1334,106 +1318,3 @@ func requestCrlFromBackend(t *testing.T, s logical.Storage, b *backend) *logical
 	require.False(t, resp.IsError(), "crl error response: %v", resp)
 	return resp
 }
-
-func TestCRLWarningsEmptyKeyUsage(t *testing.T) {
-	t.Parallel()
-
-	b, s := CreateBackendWithStorage(t)
-
-	// Generated using OpenSSL with a configuration lacking KeyUsage on
-	// the CA certificate.
-	cert := `-----BEGIN CERTIFICATE-----
-MIIDBjCCAe6gAwIBAgIBATANBgkqhkiG9w0BAQsFADATMREwDwYDVQQDDAhyb290
-LW9sZDAeFw0yMDAxMDEwMTAxMDFaFw0yMTAxMDEwMTAxMDFaMBMxETAPBgNVBAMM
-CHJvb3Qtb2xkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzqhSZxAL
-PwFhCIPL1jFPq6jxp1wFgo6YNSfVI13gfaGIjfErxsQUbosmlEuTeOc50zXXN3kb
-SDufy5Yi1OeSkFZRdJ78zdKzsEDIVR1ukUngVsSrt05gdNMJlh8XOPbcrJo78jYG
-lRgtkkFSc/wCu+ue6JqkfKrbUY/G9WK0UM8ppHm1Ux67ZGoypyEgaqqxKHBRC4Yl
-D+lAs1vP4C6cavqdUMKgAPTKmMBzlbpCuYPLHSzWh9Com3WQSqCbrlo3uH5RT3V9
-5Gjuk3mMUhY1l6fRL7wG3f+4x+DS+ICQNT0o4lnMxpIsiTh0cEHUFgY7G0iHWYPj
-CIN8UDhpZIpoCQIDAQABo2UwYzAdBgNVHQ4EFgQUJlHk3PN7pfC22FGxAb0rWgQt
-L4cwHwYDVR0jBBgwFoAUJlHk3PN7pfC22FGxAb0rWgQtL4cwDAYDVR0TBAUwAwEB
-/zATBgNVHSUEDDAKBggrBgEFBQcDATANBgkqhkiG9w0BAQsFAAOCAQEAcaU0FbXb
-FfXluBrjKfOzVKz+kvQ1CVv3xe3MBkS6wvqybBjJCFChnqCPxEe57BdSbBXNU5LZ
-zCR/OqYas4Csv9+msSn9BI2FSMAmfMDTsp5/6iIQJqlJx9L8a7bjzVMGX6QJm/3x
-S/EgGsMETAgewQXeu4jhI6StgJ2V/4Ofe498hYw4LAiBapJmkU/nHezWodNBZJ7h
-LcLOzVj0Hu5MZplGBgJFgRqBCVVkqXA0q7tORuhNzYtNdJFpv3pZIhvVFFu3HUPf
-wYQPhLye5WNtosz5xKe8X0Q9qp8g6azMTk+5Qe7u1d8MYAA2AIlGuKUvPHRruOmN
-NC+gQnS7AK1lCw==
------END CERTIFICATE-----`
-	privKey := `-----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDOqFJnEAs/AWEI
-g8vWMU+rqPGnXAWCjpg1J9UjXeB9oYiN8SvGxBRuiyaUS5N45znTNdc3eRtIO5/L
-liLU55KQVlF0nvzN0rOwQMhVHW6RSeBWxKu3TmB00wmWHxc49tysmjvyNgaVGC2S
-QVJz/AK7657omqR8qttRj8b1YrRQzymkebVTHrtkajKnISBqqrEocFELhiUP6UCz
-W8/gLpxq+p1QwqAA9MqYwHOVukK5g8sdLNaH0KibdZBKoJuuWje4flFPdX3kaO6T
-eYxSFjWXp9EvvAbd/7jH4NL4gJA1PSjiWczGkiyJOHRwQdQWBjsbSIdZg+MIg3xQ
-OGlkimgJAgMBAAECggEABKmCdmXDwy+eR0ll41aoc/hzPzHRxADAiU51Pf+DrYHj
-6UPcF3db+KR2Adl0ocEhqlSoHs3CIk6KC9c+wOvagBwaaVWe4WvT9vF3M4he8rMm
-dv6n2xJPFcOfDz5zUSssjk5KdOvoGRv7BzYnDIvOafvmUVwPwuo92Wizddy8saf4
-Xuea0Cupz1PELPKkbXcAqb+TzbAZrwdPj1Y7vTe/KGE4+aoDqCW/sFB1E0UsMGlt
-/yfGwFP48b7kdkqSpcEQW5H8+WL3TfqRcolCD9To4vo2J+1Po0S/8qPNRvkNQDDX
-AypHtrXFBOWHpJgXT4rKyH+ZGJchrCRDblt9s/sNQwKBgQD7NytvYET3pWemYiX+
-MB9uc6cPuMFONvlzjA9T6dbOSi/HLaeDoW027aMUZqb7QeaQCoWcUwh13dI2SZq0
-5+l9hei4JkWjoDhbWmPe7zDuQr3UMl0CSk3egz3BSHkjAhRAuUxK0QLKGB23zWxz
-k8mUWYZaZRA39C6aqMt/jbJjDwKBgQDSl+eO+DjpwPzrjPSphpF4xYo4XDje9ovK
-9q4KTHye7Flc3cMCX3WZBmzdt0zbqu6gWZjJH0XbWX/+SkJBGh77XWD0FeQnU7Vk
-ipoeb8zTsCVxD9EytQuXti3cqBgClcCMvLKgLOJIcNYTnygojwg3t+jboQqbtV7p
-VpQfAC6jZwKBgQCxJ46x1CnOmg4l/0DbqAQCV/yP0bI//fSbz0Ff459fimF3DHL9
-GHF0MtC2Kk3HEgoNud3PB58Hv43mSrGWsZSuuCgM9LBXWz1i7rNPG05eNyK26W09
-mDihmduK2hjS3zx5CDMM76gP7EHIxEyelLGqtBdS18JAMypKVo5rPPl3cQKBgQCG
-ueXLImQOr4dfDntLpSqV0BLAQcekZKhEPZJURmCHr37wGXNzpixurJyjL2w9MFqf
-PRKwwJAJZ3Wp8kn2qkZd23x2Szb+LeBjJQS6Kh4o44zgixTz0r1K3qLygptxs+pO
-Xz4LmQte+skKHo0rfW3tb3vKXnmR6fOBZgE23//2SwKBgHck44hoE1Ex2gDEfIq1
-04OBoS1cpuc9ge4uHEmv+8uANjzwlsYf8hY1qae513MGixRBOkxcI5xX/fYPQV9F
-t3Jfh8QX85JjnGntuXuraYZJMUjpwXr3QHPx0jpvAM3Au5j6qD3biC9Vrwq9Chkg
-hbiiPARizZA/Tsna/9ox1qDT
------END PRIVATE KEY-----`
-	resp, err := CBWrite(b, s, "issuers/import/bundle", map[string]interface{}{
-		"pem_bundle": cert + "\n" + privKey,
-	})
-	require.NoError(t, err)
-	require.NotNil(t, resp)
-	require.NotEmpty(t, resp.Warnings)
-	originalWarnings := resp.Warnings
-
-	resp, err = CBRead(b, s, "crl/rotate")
-	require.NoError(t, err)
-	require.NotNil(t, resp)
-	require.NotEmpty(t, resp.Warnings)
-
-	// All CRL-specific warnings should've already occurred earlier on the
-	// import's CRL rebuild.
-	for _, warning := range resp.Warnings {
-		require.Contains(t, originalWarnings, warning)
-	}
-
-	// Deleting the issuer and key should remove the warning.
-	_, err = CBDelete(b, s, "root")
-	require.NoError(t, err)
-
-	resp, err = CBRead(b, s, "crl/rotate")
-	require.NoError(t, err)
-	require.NotNil(t, resp)
-	require.Empty(t, resp.Warnings)
-
-	// Adding back just the cert shouldn't cause CRL rebuild warnings.
-	resp, err = CBWrite(b, s, "issuers/import/bundle", map[string]interface{}{
-		"pem_bundle": cert,
-	})
-	require.NoError(t, err)
-	require.NotNil(t, resp)
-	require.NotNil(t, resp.Data)
-	require.NotNil(t, resp.Data["mapping"])
-	require.NotEmpty(t, resp.Data["mapping"])
-	require.Equal(t, len(resp.Data["mapping"].(map[string]string)), 1)
-	for key, value := range resp.Data["mapping"].(map[string]string) {
-		require.NotEmpty(t, key)
-		require.Empty(t, value)
-	}
-
-	resp, err = CBRead(b, s, "crl/rotate")
-	require.NoError(t, err)
-	require.NotNil(t, resp)
-	require.Empty(t, resp.Warnings)
-}
diff --git a/builtin/logical/pki/crl_util.go b/builtin/logical/pki/crl_util.go
index 894e427f10110..d3337e06ba439 100644
--- a/builtin/logical/pki/crl_util.go
+++ b/builtin/logical/pki/crl_util.go
@@ -1,10 +1,8 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pki
 
 import (
 	"bytes"
+	"context"
 	"crypto/rand"
 	"crypto/x509"
 	"crypto/x509/pkix"
@@ -17,24 +15,17 @@ import (
 	atomic2 "go.uber.org/atomic"
 
 	"github.com/hashicorp/vault/sdk/helper/certutil"
-	"github.com/hashicorp/vault/sdk/helper/consts"
 	"github.com/hashicorp/vault/sdk/helper/errutil"
 	"github.com/hashicorp/vault/sdk/logical"
 )
 
 const (
-	revokedPath                      = "revoked/"
-	crossRevocationPrefix            = "cross-revocation-queue/"
-	crossRevocationPath              = crossRevocationPrefix + "{{clusterId}}/"
-	deltaWALLastBuildSerialName      = "last-build-serial"
-	deltaWALLastRevokedSerialName    = "last-revoked-serial"
-	localDeltaWALPath                = "delta-wal/"
-	localDeltaWALLastBuildSerial     = localDeltaWALPath + deltaWALLastBuildSerialName
-	localDeltaWALLastRevokedSerial   = localDeltaWALPath + deltaWALLastRevokedSerialName
-	unifiedDeltaWALPrefix            = "unified-delta-wal/"
-	unifiedDeltaWALPath              = "unified-delta-wal/{{clusterId}}/"
-	unifiedDeltaWALLastBuildSerial   = unifiedDeltaWALPath + deltaWALLastBuildSerialName
-	unifiedDeltaWALLastRevokedSerial = unifiedDeltaWALPath + deltaWALLastRevokedSerialName
+	revokedPath                   = "revoked/"
+	deltaWALPath                  = "delta-wal/"
+	deltaWALLastBuildSerialName   = "last-build-serial"
+	deltaWALLastBuildSerial       = deltaWALPath + deltaWALLastBuildSerialName
+	deltaWALLastRevokedSerialName = "last-revoked-serial"
+	deltaWALLastRevokedSerial     = deltaWALPath + deltaWALLastRevokedSerialName
 )
 
 type revocationInfo struct {
@@ -44,20 +35,6 @@ type revocationInfo struct {
 	CertificateIssuer issuerID  `json:"issuer_id"`
 }
 
-type revocationRequest struct {
-	RequestedAt time.Time `json:"requested_at"`
-}
-
-type revocationConfirmed struct {
-	RevokedAt string `json:"revoked_at"`
-	Source    string `json:"source"`
-}
-
-type revocationQueueEntry struct {
-	Cluster string
-	Serial  string
-}
-
 type (
 	// Placeholder in case of migrations needing more data. Currently
 	// we use the path name to store the serial number that was revoked.
@@ -94,21 +71,13 @@ type crlBuilder struct {
 	canRebuild            bool
 	lastDeltaRebuildCheck time.Time
 
-	_config               sync.RWMutex
-	dirty                 *atomic2.Bool
-	config                crlConfig
-	haveInitializedConfig bool
+	_config sync.RWMutex
+	dirty   *atomic2.Bool
+	config  crlConfig
 
 	// Whether to invalidate our LastModifiedTime due to write on the
 	// global issuance config.
 	invalidate *atomic2.Bool
-
-	// Global revocation queue entries get accepted by the invalidate func
-	// and passed to the crlBuilder for processing.
-	haveInitializedQueue *atomic2.Bool
-	revQueue             *revocationQueue
-	removalQueue         *revocationQueue
-	crossQueue           *revocationQueue
 }
 
 const (
@@ -127,10 +96,6 @@ func newCRLBuilder(canRebuild bool) *crlBuilder {
 		dirty:                 atomic2.NewBool(true),
 		config:                defaultCrlConfig,
 		invalidate:            atomic2.NewBool(false),
-		haveInitializedQueue:  atomic2.NewBool(false),
-		revQueue:              newRevocationQueue(),
-		removalQueue:          newRevocationQueue(),
-		crossQueue:            newRevocationQueue(),
 	}
 }
 
@@ -155,7 +120,6 @@ func (cb *crlBuilder) reloadConfigIfRequired(sc *storageContext) error {
 			return err
 		}
 
-		previousConfig := cb.config
 		// Set the default config if none was returned to us.
 		if config != nil {
 			cb.config = *config
@@ -165,34 +129,11 @@ func (cb *crlBuilder) reloadConfigIfRequired(sc *storageContext) error {
 
 		// Updated the config; unset dirty.
 		cb.dirty.Store(false)
-		triggerChangeNotification := true
-		if !cb.haveInitializedConfig {
-			cb.haveInitializedConfig = true
-			triggerChangeNotification = false // do not trigger on the initial loading of configuration.
-		}
-
-		// Certain things need to be triggered on all server types when crlConfig is loaded.
-		if triggerChangeNotification {
-			cb.notifyOnConfigChange(sc, previousConfig, cb.config)
-		}
 	}
 
 	return nil
 }
 
-func (cb *crlBuilder) notifyOnConfigChange(sc *storageContext, priorConfig crlConfig, newConfig crlConfig) {
-	// If you need to hook into a CRL configuration change across different server types
-	// such as primary clusters as well as performance replicas, it is easier to do here than
-	// in two places (API layer and in invalidateFunc)
-	if priorConfig.UnifiedCRL != newConfig.UnifiedCRL && newConfig.UnifiedCRL {
-		sc.Backend.unifiedTransferStatus.forceRun()
-	}
-
-	if priorConfig.UseGlobalQueue != newConfig.UseGlobalQueue && newConfig.UseGlobalQueue {
-		cb.haveInitializedQueue.Store(false)
-	}
-}
-
 func (cb *crlBuilder) getConfigWithUpdate(sc *storageContext) (*crlConfig, error) {
 	// Config may mutate immediately after accessing, but will be freshly
 	// fetched if necessary.
@@ -225,21 +166,21 @@ func (cb *crlBuilder) checkForAutoRebuild(sc *storageContext) error {
 	//
 	// We store a list of all (unique) CRLs in the cluster-local CRL
 	// configuration along with their expiration dates.
-	internalCRLConfig, err := sc.getLocalCRLConfig()
+	crlConfig, err := sc.getLocalCRLConfig()
 	if err != nil {
-		return fmt.Errorf("error checking for auto-rebuild status: unable to fetch cluster-local CRL configuration: %w", err)
+		return fmt.Errorf("error checking for auto-rebuild status: unable to fetch cluster-local CRL configuration: %v", err)
 	}
 
 	// If there's no config, assume we've gotta rebuild it to get this
 	// information.
-	if internalCRLConfig == nil {
+	if crlConfig == nil {
 		cb.forceRebuild.Store(true)
 		return nil
 	}
 
 	// If the map is empty, assume we need to upgrade and schedule a
 	// rebuild.
-	if len(internalCRLConfig.CRLExpirationMap) == 0 {
+	if len(crlConfig.CRLExpirationMap) == 0 {
 		cb.forceRebuild.Store(true)
 		return nil
 	}
@@ -255,13 +196,13 @@ func (cb *crlBuilder) checkForAutoRebuild(sc *storageContext) error {
 		// error.
 		defaultPeriod, defaultErr := time.ParseDuration(defaultCrlConfig.AutoRebuildGracePeriod)
 		if defaultErr != nil {
-			return fmt.Errorf("error checking for auto-rebuild status: unable to parse duration from both config's grace period (%v) and default grace period (%v):\n- config: %v\n- default: %w\n", cfg.AutoRebuildGracePeriod, defaultCrlConfig.AutoRebuildGracePeriod, err, defaultErr)
+			return fmt.Errorf("error checking for auto-rebuild status: unable to parse duration from both config's grace period (%v) and default grace period (%v):\n- config: %v\n- default: %v\n", cfg.AutoRebuildGracePeriod, defaultCrlConfig.AutoRebuildGracePeriod, err, defaultErr)
 		}
 
 		period = defaultPeriod
 	}
 
-	for _, value := range internalCRLConfig.CRLExpirationMap {
+	for _, value := range crlConfig.CRLExpirationMap {
 		if value.IsZero() || now.After(value.Add(-1*period)) {
 			cb.forceRebuild.Store(true)
 			return nil
@@ -284,7 +225,7 @@ func (cb *crlBuilder) flushCRLBuildTimeInvalidation(sc *storageContext) error {
 		cfg, err := sc.getLocalCRLConfig()
 		if err != nil {
 			cb.invalidate.Store(true)
-			return fmt.Errorf("unable to update local CRL config's modification time: error fetching: %w", err)
+			return fmt.Errorf("unable to update local CRL config's modification time: error fetching: %v", err)
 		}
 
 		cfg.LastModified = time.Now().UTC()
@@ -292,7 +233,7 @@ func (cb *crlBuilder) flushCRLBuildTimeInvalidation(sc *storageContext) error {
 		err = sc.setLocalCRLConfig(cfg)
 		if err != nil {
 			cb.invalidate.Store(true)
-			return fmt.Errorf("unable to update local CRL config's modification time: error persisting: %w", err)
+			return fmt.Errorf("unable to update local CRL config's modification time: error persisting: %v", err)
 		}
 	}
 
@@ -301,17 +242,17 @@ func (cb *crlBuilder) flushCRLBuildTimeInvalidation(sc *storageContext) error {
 
 // rebuildIfForced is to be called by readers or periodic functions that might need to trigger
 // a refresh of the CRL before the read occurs.
-func (cb *crlBuilder) rebuildIfForced(sc *storageContext) ([]string, error) {
+func (cb *crlBuilder) rebuildIfForced(ctx context.Context, b *backend, request *logical.Request) error {
 	if cb.forceRebuild.Load() {
-		return cb._doRebuild(sc, true, _enforceForceFlag)
+		return cb._doRebuild(ctx, b, request, true, _enforceForceFlag)
 	}
 
-	return nil, nil
+	return nil
 }
 
 // rebuild is to be called by various write apis that know the CRL is to be updated and can be now.
-func (cb *crlBuilder) rebuild(sc *storageContext, forceNew bool) ([]string, error) {
-	return cb._doRebuild(sc, forceNew, _ignoreForceFlag)
+func (cb *crlBuilder) rebuild(ctx context.Context, b *backend, request *logical.Request, forceNew bool) error {
+	return cb._doRebuild(ctx, b, request, forceNew, _ignoreForceFlag)
 }
 
 // requestRebuildIfActiveNode will schedule a rebuild of the CRL from the next read or write api call assuming we are the active node of a cluster
@@ -329,7 +270,7 @@ func (cb *crlBuilder) requestRebuildIfActiveNode(b *backend) {
 	cb.forceRebuild.Store(true)
 }
 
-func (cb *crlBuilder) _doRebuild(sc *storageContext, forceNew bool, ignoreForceFlag bool) ([]string, error) {
+func (cb *crlBuilder) _doRebuild(ctx context.Context, b *backend, request *logical.Request, forceNew bool, ignoreForceFlag bool) error {
 	cb._builder.Lock()
 	defer cb._builder.Unlock()
 	// Re-read the lock in case someone beat us to the punch between the previous load op.
@@ -343,17 +284,17 @@ func (cb *crlBuilder) _doRebuild(sc *storageContext, forceNew bool, ignoreForceF
 
 		// if forceRebuild was requested, that should force a complete rebuild even if requested not too by forceNew
 		myForceNew := forceBuildFlag || forceNew
-		return buildCRLs(sc, myForceNew)
+		return buildCRLs(ctx, b, request, myForceNew)
 	}
 
-	return nil, nil
+	return nil
 }
 
-func (cb *crlBuilder) _getPresentDeltaWALForClearing(sc *storageContext, path string) ([]string, error) {
+func (cb *crlBuilder) getPresentDeltaWALForClearing(sc *storageContext) ([]string, error) {
 	// Clearing of the delta WAL occurs after a new complete CRL has been built.
-	walSerials, err := sc.Storage.List(sc.Context, path)
+	walSerials, err := sc.Storage.List(sc.Context, deltaWALPath)
 	if err != nil {
-		return nil, fmt.Errorf("error fetching list of delta WAL certificates to clear: %w", err)
+		return nil, fmt.Errorf("error fetching list of delta WAL certificates to clear: %s", err)
 	}
 
 	// We _should_ remove the special WAL entries here, but we don't really
@@ -362,60 +303,23 @@ func (cb *crlBuilder) _getPresentDeltaWALForClearing(sc *storageContext, path st
 	return walSerials, nil
 }
 
-func (cb *crlBuilder) getPresentLocalDeltaWALForClearing(sc *storageContext) ([]string, error) {
-	return cb._getPresentDeltaWALForClearing(sc, localDeltaWALPath)
-}
-
-func (cb *crlBuilder) getPresentUnifiedDeltaWALForClearing(sc *storageContext) ([]string, error) {
-	walClusters, err := sc.Storage.List(sc.Context, unifiedDeltaWALPrefix)
-	if err != nil {
-		return nil, fmt.Errorf("error fetching list of clusters with delta WAL entries: %w", err)
-	}
-
-	var allPaths []string
-	for index, cluster := range walClusters {
-		prefix := unifiedDeltaWALPrefix + cluster
-		clusterPaths, err := cb._getPresentDeltaWALForClearing(sc, prefix)
-		if err != nil {
-			return nil, fmt.Errorf("error fetching delta WAL entries for cluster (%v / %v): %w", index, cluster, err)
-		}
-
-		// Here, we don't want to include the unifiedDeltaWALPrefix because
-		// clearUnifiedDeltaWAL handles that for us. Instead, just include
-		// the cluster identifier.
-		for _, clusterPath := range clusterPaths {
-			allPaths = append(allPaths, cluster+clusterPath)
-		}
-	}
-
-	return allPaths, nil
-}
-
-func (cb *crlBuilder) _clearDeltaWAL(sc *storageContext, walSerials []string, path string) error {
+func (cb *crlBuilder) clearDeltaWAL(sc *storageContext, walSerials []string) error {
 	// Clearing of the delta WAL occurs after a new complete CRL has been built.
 	for _, serial := range walSerials {
 		// Don't remove our special entries!
-		if strings.HasSuffix(serial, deltaWALLastBuildSerialName) || strings.HasSuffix(serial, deltaWALLastRevokedSerialName) {
+		if serial == deltaWALLastBuildSerialName || serial == deltaWALLastRevokedSerialName {
 			continue
 		}
 
-		if err := sc.Storage.Delete(sc.Context, path+serial); err != nil {
-			return fmt.Errorf("error clearing delta WAL certificate: %w", err)
+		if err := sc.Storage.Delete(sc.Context, deltaWALPath+serial); err != nil {
+			return fmt.Errorf("error clearing delta WAL certificate: %s", err)
 		}
 	}
 
 	return nil
 }
 
-func (cb *crlBuilder) clearLocalDeltaWAL(sc *storageContext, walSerials []string) error {
-	return cb._clearDeltaWAL(sc, walSerials, localDeltaWALPath)
-}
-
-func (cb *crlBuilder) clearUnifiedDeltaWAL(sc *storageContext, walSerials []string) error {
-	return cb._clearDeltaWAL(sc, walSerials, unifiedDeltaWALPrefix)
-}
-
-func (cb *crlBuilder) rebuildDeltaCRLsIfForced(sc *storageContext, override bool) ([]string, error) {
+func (cb *crlBuilder) rebuildDeltaCRLsIfForced(sc *storageContext, override bool) error {
 	// Delta CRLs use the same expiry duration as the complete CRL. Because
 	// we always rebuild the complete CRL and then the delta CRL, we can
 	// be assured that the delta CRL always expires after a complete CRL,
@@ -427,18 +331,18 @@ func (cb *crlBuilder) rebuildDeltaCRLsIfForced(sc *storageContext, override bool
 	// within our time window for updating it.
 	cfg, err := cb.getConfigWithUpdate(sc)
 	if err != nil {
-		return nil, err
+		return err
 	}
 
 	if !cfg.EnableDelta {
 		// We explicitly do not update the last check time here, as we
 		// want to persist the last rebuild window if it hasn't been set.
-		return nil, nil
+		return nil
 	}
 
 	deltaRebuildDuration, err := time.ParseDuration(cfg.DeltaRebuildInterval)
 	if err != nil {
-		return nil, err
+		return err
 	}
 
 	// Acquire CRL building locks before we get too much further.
@@ -454,7 +358,7 @@ func (cb *crlBuilder) rebuildDeltaCRLsIfForced(sc *storageContext, override bool
 		// If we're still before the time of our next rebuild check, we can
 		// safely return here even if we have certs. We'll wait for a bit,
 		// retrigger this check, and then do the rebuild.
-		return nil, nil
+		return nil
 	}
 
 	// Update our check time. If we bail out below (due to storage errors
@@ -463,39 +367,20 @@ func (cb *crlBuilder) rebuildDeltaCRLsIfForced(sc *storageContext, override bool
 	// until our next complete CRL build.
 	cb.lastDeltaRebuildCheck = now
 
-	rebuildLocal, err := cb._shouldRebuildLocalCRLs(sc, override)
-	if err != nil {
-		return nil, fmt.Errorf("error determining if local CRLs should be rebuilt: %w", err)
-	}
-
-	rebuildUnified, err := cb._shouldRebuildUnifiedCRLs(sc, override)
-	if err != nil {
-		return nil, fmt.Errorf("error determining if unified CRLs should be rebuilt: %w", err)
-	}
-
-	if !rebuildLocal && !rebuildUnified {
-		return nil, nil
-	}
-
-	// Finally, we must've needed to do the rebuild. Execute!
-	return cb.rebuildDeltaCRLsHoldingLock(sc, false)
-}
-
-func (cb *crlBuilder) _shouldRebuildLocalCRLs(sc *storageContext, override bool) (bool, error) {
 	// Fetch two storage entries to see if we actually need to do this
 	// rebuild, given we're within the window.
-	lastWALEntry, err := sc.Storage.Get(sc.Context, localDeltaWALLastRevokedSerial)
+	lastWALEntry, err := sc.Storage.Get(sc.Context, deltaWALLastRevokedSerial)
 	if err != nil || !override && (lastWALEntry == nil || lastWALEntry.Value == nil) {
 		// If this entry does not exist, we don't need to rebuild the
 		// delta WAL due to the expiration assumption above. There must
 		// not have been any new revocations. Since err should be nil
 		// in this case, we can safely return it.
-		return false, err
+		return err
 	}
 
-	lastBuildEntry, err := sc.Storage.Get(sc.Context, localDeltaWALLastBuildSerial)
+	lastBuildEntry, err := sc.Storage.Get(sc.Context, deltaWALLastBuildSerial)
 	if err != nil {
-		return false, err
+		return err
 	}
 
 	if !override && lastBuildEntry != nil && lastBuildEntry.Value != nil {
@@ -508,369 +393,37 @@ func (cb *crlBuilder) _shouldRebuildLocalCRLs(sc *storageContext, override bool)
 		// guard.
 		var walInfo lastWALInfo
 		if err := lastWALEntry.DecodeJSON(&walInfo); err != nil {
-			return false, err
+			return err
 		}
 
 		var deltaInfo lastDeltaInfo
 		if err := lastBuildEntry.DecodeJSON(&deltaInfo); err != nil {
-			return false, err
+			return err
 		}
 
 		// Here, everything decoded properly and we know that no new certs
 		// have been revoked since we built this last delta CRL. We can exit
 		// without rebuilding then.
 		if walInfo.Serial == deltaInfo.Serial {
-			return false, nil
-		}
-	}
-
-	return true, nil
-}
-
-func (cb *crlBuilder) _shouldRebuildUnifiedCRLs(sc *storageContext, override bool) (bool, error) {
-	// Unified CRL can only be built by the main cluster.
-	b := sc.Backend
-	if b.System().ReplicationState().HasState(consts.ReplicationDRSecondary|consts.ReplicationPerformanceStandby) ||
-		(!b.System().LocalMount() && b.System().ReplicationState().HasState(consts.ReplicationPerformanceSecondary)) {
-		return false, nil
-	}
-
-	// If we're overriding whether we should build Delta CRLs, always return
-	// true, even if storage errors might've happen.
-	if override {
-		return true, nil
-	}
-
-	// Fetch two storage entries to see if we actually need to do this
-	// rebuild, given we're within the window. We need to fetch these
-	// two entries per cluster.
-	clusters, err := sc.Storage.List(sc.Context, unifiedDeltaWALPrefix)
-	if err != nil {
-		return false, fmt.Errorf("failed to get the list of clusters having written Delta WALs: %w", err)
-	}
-
-	// If any cluster tells us to rebuild, we should rebuild.
-	shouldRebuild := false
-	for index, cluster := range clusters {
-		prefix := unifiedDeltaWALPrefix + cluster
-		clusterUnifiedLastRevokedWALEntry := prefix + deltaWALLastRevokedSerialName
-		clusterUnifiedLastBuiltWALEntry := prefix + deltaWALLastBuildSerialName
-
-		lastWALEntry, err := sc.Storage.Get(sc.Context, clusterUnifiedLastRevokedWALEntry)
-		if err != nil {
-			return false, fmt.Errorf("failed fetching last revoked WAL entry for cluster (%v / %v): %w", index, cluster, err)
-		}
-
-		if lastWALEntry == nil || lastWALEntry.Value == nil {
-			continue
-		}
-
-		lastBuildEntry, err := sc.Storage.Get(sc.Context, clusterUnifiedLastBuiltWALEntry)
-		if err != nil {
-			return false, fmt.Errorf("failed fetching last built CRL WAL entry for cluster (%v / %v): %w", index, cluster, err)
-		}
-
-		if lastBuildEntry == nil || lastBuildEntry.Value == nil {
-			// If the last build entry doesn't exist, we still want to build a
-			// new delta WAL, since this could be our very first time doing so.
-			shouldRebuild = true
-			break
-		}
-
-		// Otherwise, here, now that we know it exists, we want to check this
-		// value against the other value. Since we previously guarded the WAL
-		// entry being non-empty, we're good to decode everything within this
-		// guard.
-		var walInfo lastWALInfo
-		if err := lastWALEntry.DecodeJSON(&walInfo); err != nil {
-			return false, fmt.Errorf("failed decoding last revoked WAL entry for cluster (%v / %v): %w", index, cluster, err)
-		}
-
-		var deltaInfo lastDeltaInfo
-		if err := lastBuildEntry.DecodeJSON(&deltaInfo); err != nil {
-			return false, fmt.Errorf("failed decoding last built CRL WAL entry for cluster (%v / %v): %w", index, cluster, err)
-		}
-
-		if walInfo.Serial != deltaInfo.Serial {
-			shouldRebuild = true
-			break
+			return nil
 		}
 	}
 
-	// No errors occurred, so return the result.
-	return shouldRebuild, nil
+	// Finally, we must've needed to do the rebuild. Execute!
+	return cb.rebuildDeltaCRLsHoldingLock(sc, false)
 }
 
-func (cb *crlBuilder) rebuildDeltaCRLs(sc *storageContext, forceNew bool) ([]string, error) {
+func (cb *crlBuilder) rebuildDeltaCRLs(sc *storageContext, forceNew bool) error {
 	cb._builder.Lock()
 	defer cb._builder.Unlock()
 
 	return cb.rebuildDeltaCRLsHoldingLock(sc, forceNew)
 }
 
-func (cb *crlBuilder) rebuildDeltaCRLsHoldingLock(sc *storageContext, forceNew bool) ([]string, error) {
+func (cb *crlBuilder) rebuildDeltaCRLsHoldingLock(sc *storageContext, forceNew bool) error {
 	return buildAnyCRLs(sc, forceNew, true /* building delta */)
 }
 
-func (cb *crlBuilder) addCertForRevocationCheck(cluster, serial string) {
-	entry := &revocationQueueEntry{
-		Cluster: cluster,
-		Serial:  serial,
-	}
-	cb.revQueue.Add(entry)
-}
-
-func (cb *crlBuilder) addCertForRevocationRemoval(cluster, serial string) {
-	entry := &revocationQueueEntry{
-		Cluster: cluster,
-		Serial:  serial,
-	}
-	cb.removalQueue.Add(entry)
-}
-
-func (cb *crlBuilder) addCertFromCrossRevocation(cluster, serial string) {
-	entry := &revocationQueueEntry{
-		Cluster: cluster,
-		Serial:  serial,
-	}
-	cb.crossQueue.Add(entry)
-}
-
-func (cb *crlBuilder) maybeGatherQueueForFirstProcess(sc *storageContext, isNotPerfPrimary bool) error {
-	// Assume holding lock.
-	if cb.haveInitializedQueue.Load() {
-		return nil
-	}
-
-	sc.Backend.Logger().Debug(fmt.Sprintf("gathering first time existing revocations"))
-
-	clusters, err := sc.Storage.List(sc.Context, crossRevocationPrefix)
-	if err != nil {
-		return fmt.Errorf("failed to list cross-cluster revocation queue participating clusters: %w", err)
-	}
-
-	sc.Backend.Logger().Debug(fmt.Sprintf("found %v clusters: %v", len(clusters), clusters))
-
-	for cIndex, cluster := range clusters {
-		cluster = cluster[0 : len(cluster)-1]
-		cPath := crossRevocationPrefix + cluster + "/"
-		serials, err := sc.Storage.List(sc.Context, cPath)
-		if err != nil {
-			return fmt.Errorf("failed to list cross-cluster revocation queue entries for cluster %v (%v): %w", cluster, cIndex, err)
-		}
-
-		sc.Backend.Logger().Debug(fmt.Sprintf("found %v serials for cluster %v: %v", len(serials), cluster, serials))
-
-		for _, serial := range serials {
-			if serial[len(serial)-1] == '/' {
-				serial = serial[0 : len(serial)-1]
-			}
-
-			ePath := cPath + serial
-			eConfirmPath := ePath + "/confirmed"
-			removalEntry, err := sc.Storage.Get(sc.Context, eConfirmPath)
-
-			entry := &revocationQueueEntry{
-				Cluster: cluster,
-				Serial:  serial,
-			}
-
-			// No removal entry yet; add to regular queue. Otherwise, slate it
-			// for removal if we're a perfPrimary.
-			if err != nil || removalEntry == nil {
-				cb.revQueue.Add(entry)
-			} else if !isNotPerfPrimary {
-				cb.removalQueue.Add(entry)
-			} // Else, this is a confirmation but we're on a perf secondary so ignore it.
-
-			// Overwrite the error; we don't really care about its contents
-			// at this step.
-			err = nil
-		}
-	}
-
-	return nil
-}
-
-func (cb *crlBuilder) processRevocationQueue(sc *storageContext) error {
-	sc.Backend.Logger().Debug(fmt.Sprintf("starting to process revocation requests"))
-
-	isNotPerfPrimary := sc.Backend.System().ReplicationState().HasState(consts.ReplicationDRSecondary|consts.ReplicationPerformanceStandby) ||
-		(!sc.Backend.System().LocalMount() && sc.Backend.System().ReplicationState().HasState(consts.ReplicationPerformanceSecondary))
-
-	if err := cb.maybeGatherQueueForFirstProcess(sc, isNotPerfPrimary); err != nil {
-		return fmt.Errorf("failed to gather first queue: %w", err)
-	}
-
-	revQueue := cb.revQueue.Iterate()
-	removalQueue := cb.removalQueue.Iterate()
-
-	sc.Backend.Logger().Debug(fmt.Sprintf("gathered %v revocations and %v confirmation entries", len(revQueue), len(removalQueue)))
-
-	crlConfig, err := cb.getConfigWithUpdate(sc)
-	if err != nil {
-		return err
-	}
-
-	ourClusterId, err := sc.Backend.System().ClusterID(sc.Context)
-	if err != nil {
-		return fmt.Errorf("unable to fetch clusterID to ignore local revocation entries: %w", err)
-	}
-
-	for _, req := range revQueue {
-		// Regardless of whether we're on the perf primary or a secondary
-		// cluster, we can safely ignore revocation requests originating
-		// from our node, because we've already checked them once (when
-		// they were created).
-		if ourClusterId != "" && ourClusterId == req.Cluster {
-			continue
-		}
-
-		// Fetch the revocation entry to ensure it exists.
-		rPath := crossRevocationPrefix + req.Cluster + "/" + req.Serial
-		entry, err := sc.Storage.Get(sc.Context, rPath)
-		if err != nil {
-			return fmt.Errorf("failed to read cross-cluster revocation queue entry: %w", err)
-		}
-		if entry == nil {
-			// Skipping this entry; it was likely an incorrect invalidation
-			// caused by the primary cluster removing the confirmation.
-			cb.revQueue.Remove(req)
-			continue
-		}
-
-		resp, err := tryRevokeCertBySerial(sc, crlConfig, req.Serial)
-		if err == nil && resp != nil && !resp.IsError() && resp.Data != nil && resp.Data["state"].(string) == "revoked" {
-			if isNotPerfPrimary {
-				// Write a revocation queue removal entry.
-				confirmed := revocationConfirmed{
-					RevokedAt: resp.Data["revocation_time_rfc3339"].(string),
-					Source:    req.Cluster,
-				}
-				path := crossRevocationPath + req.Serial + "/confirmed"
-				confirmedEntry, err := logical.StorageEntryJSON(path, confirmed)
-				if err != nil {
-					return fmt.Errorf("failed to create storage entry for cross-cluster revocation confirmed response: %w", err)
-				}
-
-				if err := sc.Storage.Put(sc.Context, confirmedEntry); err != nil {
-					return fmt.Errorf("error persisting cross-cluster revocation confirmation: %w", err)
-				}
-			} else {
-				// Since we're the active node of the primary cluster, go ahead
-				// and just remove it.
-				path := crossRevocationPrefix + req.Cluster + "/" + req.Serial
-				if err := sc.Storage.Delete(sc.Context, path); err != nil {
-					return fmt.Errorf("failed to delete processed revocation request: %w", err)
-				}
-			}
-		} else if err != nil {
-			// Because we fake being from a lease, we get the guarantee that
-			// err == nil == resp if the cert was already revoked; this means
-			// this err should actually be fatal.
-			return err
-		}
-		cb.revQueue.Remove(req)
-	}
-
-	if isNotPerfPrimary {
-		sc.Backend.Logger().Debug(fmt.Sprintf("not on perf primary so ignoring any revocation confirmations"))
-
-		// See note in pki/backend.go; this should be empty.
-		cb.removalQueue.RemoveAll()
-		cb.haveInitializedQueue.Store(true)
-		return nil
-	}
-
-	clusters, err := sc.Storage.List(sc.Context, crossRevocationPrefix)
-	if err != nil {
-		return err
-	}
-
-	for _, entry := range removalQueue {
-		// First remove the revocation request.
-		for cIndex, cluster := range clusters {
-			eEntry := crossRevocationPrefix + cluster + entry.Serial
-			if err := sc.Storage.Delete(sc.Context, eEntry); err != nil {
-				return fmt.Errorf("failed to delete potential cross-cluster revocation entry for cluster %v (%v) and serial %v: %w", cluster, cIndex, entry.Serial, err)
-			}
-		}
-
-		// Then remove the confirmation.
-		if err := sc.Storage.Delete(sc.Context, crossRevocationPrefix+entry.Cluster+"/"+entry.Serial+"/confirmed"); err != nil {
-			return fmt.Errorf("failed to delete cross-cluster revocation confirmation entry for cluster %v and serial %v: %w", entry.Cluster, entry.Serial, err)
-		}
-
-		cb.removalQueue.Remove(entry)
-	}
-
-	cb.haveInitializedQueue.Store(true)
-
-	return nil
-}
-
-func (cb *crlBuilder) processCrossClusterRevocations(sc *storageContext) error {
-	sc.Backend.Logger().Debug(fmt.Sprintf("starting to process unified revocations"))
-
-	crlConfig, err := cb.getConfigWithUpdate(sc)
-	if err != nil {
-		return err
-	}
-
-	if !crlConfig.UnifiedCRL {
-		cb.crossQueue.RemoveAll()
-		return nil
-	}
-
-	crossQueue := cb.crossQueue.Iterate()
-	sc.Backend.Logger().Debug(fmt.Sprintf("gathered %v unified revocations entries", len(crossQueue)))
-
-	ourClusterId, err := sc.Backend.System().ClusterID(sc.Context)
-	if err != nil {
-		return fmt.Errorf("unable to fetch clusterID to ignore local unified revocation entries: %w", err)
-	}
-
-	for _, req := range crossQueue {
-		// Regardless of whether we're on the perf primary or a secondary
-		// cluster, we can safely ignore revocation requests originating
-		// from our node, because we've already checked them once (when
-		// they were created).
-		if ourClusterId != "" && ourClusterId == req.Cluster {
-			continue
-		}
-
-		// Fetch the revocation entry to ensure it exists and this wasn't
-		// a delete.
-		rPath := unifiedRevocationReadPathPrefix + req.Cluster + "/" + req.Serial
-		entry, err := sc.Storage.Get(sc.Context, rPath)
-		if err != nil {
-			return fmt.Errorf("failed to read unified revocation entry: %w", err)
-		}
-		if entry == nil {
-			// Skip this entry: it was likely caused by the deletion of this
-			// record during tidy.
-			cb.crossQueue.Remove(req)
-			continue
-		}
-
-		resp, err := tryRevokeCertBySerial(sc, crlConfig, req.Serial)
-		if err == nil && resp != nil && !resp.IsError() && resp.Data != nil && resp.Data["state"].(string) == "revoked" {
-			// We could theoretically save ourselves from writing a global
-			// revocation entry during the above certificate revocation, as
-			// we don't really need it to appear on either the unified CRL
-			// or its delta CRL, but this would require more plumbing.
-			cb.crossQueue.Remove(req)
-		} else if err != nil {
-			// Because we fake being from a lease, we get the guarantee that
-			// err == nil == resp if the cert was already revoked; this means
-			// this err should actually be fatal.
-			return err
-		}
-	}
-
-	return nil
-}
-
 // Helper function to fetch a map of issuerID->parsed cert for revocation
 // usage. Unlike other paths, this needs to handle the legacy bundle
 // more gracefully than rejecting it outright.
@@ -881,7 +434,7 @@ func fetchIssuerMapForRevocationChecking(sc *storageContext) (map[issuerID]*x509
 	if !sc.Backend.useLegacyBundleCaStorage() {
 		issuers, err = sc.listIssuers()
 		if err != nil {
-			return nil, fmt.Errorf("could not fetch issuers list: %w", err)
+			return nil, fmt.Errorf("could not fetch issuers list: %v", err)
 		}
 	} else {
 		// Hack: this isn't a real issuerID, but it works for fetchCAInfo
@@ -893,7 +446,7 @@ func fetchIssuerMapForRevocationChecking(sc *storageContext) (map[issuerID]*x509
 	for _, issuer := range issuers {
 		_, bundle, caErr := sc.fetchCertBundleByIssuerId(issuer, false)
 		if caErr != nil {
-			return nil, fmt.Errorf("error fetching CA certificate for issuer id %v: %w", issuer, caErr)
+			return nil, fmt.Errorf("error fetching CA certificate for issuer id %v: %s", issuer, caErr)
 		}
 
 		if bundle == nil {
@@ -915,53 +468,23 @@ func fetchIssuerMapForRevocationChecking(sc *storageContext) (map[issuerID]*x509
 	return issuerIDCertMap, nil
 }
 
-// Revoke a certificate from a given serial number if it is present in local
-// storage.
-func tryRevokeCertBySerial(sc *storageContext, config *crlConfig, serial string) (*logical.Response, error) {
-	// revokeCert requires us to hold these locks before calling it.
-	sc.Backend.revokeStorageLock.Lock()
-	defer sc.Backend.revokeStorageLock.Unlock()
-
-	certEntry, err := fetchCertBySerial(sc, "certs/", serial)
-	if err != nil {
-		switch err.(type) {
-		case errutil.UserError:
-			return logical.ErrorResponse(err.Error()), nil
-		default:
-			return nil, err
-		}
-	}
-
-	if certEntry == nil {
-		return nil, nil
-	}
-
-	cert, err := x509.ParseCertificate(certEntry.Value)
-	if err != nil {
-		return nil, fmt.Errorf("error parsing certificate: %w", err)
-	}
-
-	return revokeCert(sc, config, cert)
-}
-
 // Revokes a cert, and tries to be smart about error recovery
-func revokeCert(sc *storageContext, config *crlConfig, cert *x509.Certificate) (*logical.Response, error) {
+func revokeCert(ctx context.Context, b *backend, req *logical.Request, serial string, fromLease bool) (*logical.Response, error) {
 	// As this backend is self-contained and this function does not hook into
 	// third parties to manage users or resources, if the mount is tainted,
 	// revocation doesn't matter anyways -- the CRL that would be written will
 	// be immediately blown away by the view being cleared. So we can simply
 	// fast path a successful exit.
-	if sc.Backend.System().Tainted() {
+	if b.System().Tainted() {
 		return nil, nil
 	}
 
-	colonSerial := serialFromCert(cert)
-	hyphenSerial := normalizeSerial(colonSerial)
-
 	// Validate that no issuers match the serial number to be revoked. We need
 	// to gracefully degrade to the legacy cert bundle when it is required, as
 	// secondary PR clusters might not have been upgraded, but still need to
 	// handle revoking certs.
+	sc := b.makeStorageContext(ctx, req.Storage)
+
 	issuerIDCertMap, err := fetchIssuerMapForRevocationChecking(sc)
 	if err != nil {
 		return nil, err
@@ -970,93 +493,104 @@ func revokeCert(sc *storageContext, config *crlConfig, cert *x509.Certificate) (
 	// Ensure we don't revoke an issuer via this API; use /issuer/:issuer_ref/revoke
 	// instead.
 	for issuer, certificate := range issuerIDCertMap {
+		colonSerial := strings.ReplaceAll(strings.ToLower(serial), "-", ":")
 		if colonSerial == serialFromCert(certificate) {
 			return logical.ErrorResponse(fmt.Sprintf("adding issuer (id: %v) to its own CRL is not allowed", issuer)), nil
 		}
 	}
 
-	curRevInfo, err := sc.fetchRevocationInfo(colonSerial)
+	alreadyRevoked := false
+	var revInfo revocationInfo
+
+	revEntry, err := fetchCertBySerial(ctx, b, req, revokedPath, serial)
 	if err != nil {
-		return nil, err
-	}
-	if curRevInfo != nil {
-		resp := &logical.Response{
-			Data: map[string]interface{}{
-				"revocation_time": curRevInfo.RevocationTime,
-				"state":           "revoked",
-			},
+		switch err.(type) {
+		case errutil.UserError:
+			return logical.ErrorResponse(err.Error()), nil
+		default:
+			return nil, err
 		}
-		if !curRevInfo.RevocationTimeUTC.IsZero() {
-			resp.Data["revocation_time_rfc3339"] = curRevInfo.RevocationTimeUTC.Format(time.RFC3339Nano)
+	}
+	if revEntry != nil {
+		// Set the revocation info to the existing values
+		alreadyRevoked = true
+		err = revEntry.DecodeJSON(&revInfo)
+		if err != nil {
+			return nil, fmt.Errorf("error decoding existing revocation info")
 		}
-
-		return resp, nil
 	}
 
-	// Add a little wiggle room because leases are stored with a second
-	// granularity
-	if cert.NotAfter.Before(time.Now().Add(2 * time.Second)) {
-		response := &logical.Response{}
-		response.AddWarning(fmt.Sprintf("certificate with serial %s already expired; refusing to add to CRL", colonSerial))
-		return response, nil
-	}
+	if !alreadyRevoked {
+		certEntry, err := fetchCertBySerial(ctx, b, req, "certs/", serial)
+		if err != nil {
+			switch err.(type) {
+			case errutil.UserError:
+				return logical.ErrorResponse(err.Error()), nil
+			default:
+				return nil, err
+			}
+		}
+		if certEntry == nil {
+			if fromLease {
+				// We can't write to revoked/ or update the CRL anyway because we don't have the cert,
+				// and there's no reason to expect this will work on a subsequent
+				// retry.  Just give up and let the lease get deleted.
+				b.Logger().Warn("expired certificate revoke failed because not found in storage, treating as success", "serial", serial)
+				return nil, nil
+			}
+			return logical.ErrorResponse(fmt.Sprintf("certificate with serial %s not found", serial)), nil
+		}
 
-	currTime := time.Now()
-	revInfo := revocationInfo{
-		CertificateBytes:  cert.Raw,
-		RevocationTime:    currTime.Unix(),
-		RevocationTimeUTC: currTime.UTC(),
-	}
+		cert, err := x509.ParseCertificate(certEntry.Value)
+		if err != nil {
+			return nil, fmt.Errorf("error parsing certificate: %w", err)
+		}
+		if cert == nil {
+			return nil, fmt.Errorf("got a nil certificate")
+		}
 
-	// We may not find an issuer with this certificate; that's fine so
-	// ignore the return value.
-	associateRevokedCertWithIsssuer(&revInfo, cert, issuerIDCertMap)
+		// Add a little wiggle room because leases are stored with a second
+		// granularity
+		if cert.NotAfter.Before(time.Now().Add(2 * time.Second)) {
+			response := &logical.Response{}
+			response.AddWarning(fmt.Sprintf("certificate with serial %s already expired; refusing to add to CRL", serial))
+			return response, nil
+		}
 
-	revEntry, err := logical.StorageEntryJSON(revokedPath+hyphenSerial, revInfo)
-	if err != nil {
-		return nil, fmt.Errorf("error creating revocation entry: %w", err)
-	}
+		// Compatibility: Don't revoke CAs if they had leases. New CAs going
+		// forward aren't issued leases.
+		if cert.IsCA && fromLease {
+			return nil, nil
+		}
 
-	certsCounted := sc.Backend.certsCounted.Load()
-	err = sc.Storage.Put(sc.Context, revEntry)
-	if err != nil {
-		return nil, fmt.Errorf("error saving revoked certificate to new location: %w", err)
-	}
-	sc.Backend.ifCountEnabledIncrementTotalRevokedCertificatesCount(certsCounted, revEntry.Key)
+		currTime := time.Now()
+		revInfo.CertificateBytes = certEntry.Value
+		revInfo.RevocationTime = currTime.Unix()
+		revInfo.RevocationTimeUTC = currTime.UTC()
 
-	// From here on out, the certificate has been revoked locally. Any other
-	// persistence issues might still err, but any other failure messages
-	// should be added as warnings to the revocation.
-	resp := &logical.Response{
-		Data: map[string]interface{}{
-			"revocation_time":         revInfo.RevocationTime,
-			"revocation_time_rfc3339": revInfo.RevocationTimeUTC.Format(time.RFC3339Nano),
-			"state":                   "revoked",
-		},
-	}
+		// We may not find an issuer with this certificate; that's fine so
+		// ignore the return value.
+		associateRevokedCertWithIsssuer(&revInfo, cert, issuerIDCertMap)
 
-	// If this flag is enabled after the fact, existing local entries will be published to
-	// the unified storage space through a periodic function.
-	failedWritingUnifiedCRL := false
-	if config.UnifiedCRL {
-		entry := &unifiedRevocationEntry{
-			SerialNumber:      colonSerial,
-			CertExpiration:    cert.NotAfter,
-			RevocationTimeUTC: revInfo.RevocationTimeUTC,
-			CertificateIssuer: revInfo.CertificateIssuer,
+		revEntry, err = logical.StorageEntryJSON(revokedPath+normalizeSerial(serial), revInfo)
+		if err != nil {
+			return nil, fmt.Errorf("error creating revocation entry")
 		}
 
-		ignoreErr := writeUnifiedRevocationEntry(sc, entry)
-		if ignoreErr != nil {
-			// Just log the error if we fail to write across clusters, a separate background
-			// thread will reattempt it later on as we have the local write done.
-			sc.Backend.Logger().Error("Failed to write unified revocation entry, will re-attempt later",
-				"serial_number", colonSerial, "error", ignoreErr)
-			sc.Backend.unifiedTransferStatus.forceRun()
-
-			resp.AddWarning(fmt.Sprintf("Failed to write unified revocation entry, will re-attempt later: %v", err))
-			failedWritingUnifiedCRL = true
+		certsCounted := b.certsCounted.Load()
+		err = req.Storage.Put(ctx, revEntry)
+		if err != nil {
+			return nil, fmt.Errorf("error saving revoked certificate to new location")
 		}
+		b.incrementTotalRevokedCertificatesCount(certsCounted, revEntry.Key)
+	}
+
+	// Fetch the config and see if we need to rebuild the CRL. If we have
+	// auto building enabled, we will wait for the next rebuild period to
+	// actually rebuild it.
+	config, err := b.crlBuilder.getConfigWithUpdate(sc)
+	if err != nil {
+		return nil, fmt.Errorf("error building CRL: while updating config: %v", err)
 	}
 
 	if !config.AutoRebuild {
@@ -1064,7 +598,7 @@ func revokeCert(sc *storageContext, config *crlConfig, cert *x509.Certificate) (
 		// already rebuilt the full CRL so the Delta WAL will be cleared
 		// afterwards. Writing an entry only to immediately remove it
 		// isn't necessary.
-		warnings, crlErr := sc.Backend.crlBuilder.rebuild(sc, false)
+		crlErr := b.crlBuilder.rebuild(ctx, b, req, false)
 		if crlErr != nil {
 			switch crlErr.(type) {
 			case errutil.UserError:
@@ -1072,107 +606,62 @@ func revokeCert(sc *storageContext, config *crlConfig, cert *x509.Certificate) (
 			default:
 				return nil, fmt.Errorf("error encountered during CRL building: %w", crlErr)
 			}
-		}
-		for index, warning := range warnings {
-			resp.AddWarning(fmt.Sprintf("Warning %d during CRL rebuild: %v", index+1, warning))
-		}
-	} else if config.EnableDelta {
-		if err := writeRevocationDeltaWALs(sc, config, resp, failedWritingUnifiedCRL, hyphenSerial, colonSerial); err != nil {
-			return nil, fmt.Errorf("failed to write WAL entries for Delta CRLs: %w", err)
-		}
-	}
-
-	return resp, nil
-}
-
-func writeRevocationDeltaWALs(sc *storageContext, config *crlConfig, resp *logical.Response, failedWritingUnifiedCRL bool, hyphenSerial string, colonSerial string) error {
-	if err := writeSpecificRevocationDeltaWALs(sc, hyphenSerial, colonSerial, localDeltaWALPath); err != nil {
-		return fmt.Errorf("failed to write local delta WAL entry: %w", err)
-	}
-
-	if config.UnifiedCRL && !failedWritingUnifiedCRL {
-		// We only need to write cross-cluster unified Delta WAL entries when
-		// it is enabled; in particular, because we rebuild CRLs when enabling
-		// this flag, any revocations that happened prior to enabling unified
-		// revocation will appear on the complete CRL (+/- synchronization:
-		// in particular, if a perf replica revokes a cert prior to seeing
-		// unified revocation enabled, but after the main node has done the
-		// listing for the unified CRL rebuild, this revocation will not
-		// appear on either the main or the next delta CRL, but will need to
-		// wait for a subsequent complete CRL rebuild).
-		//
-		// Lastly, we don't attempt this if the unified CRL entry failed to
-		// write, as we need that entry before the delta WAL entry will make
-		// sense.
-		if ignoredErr := writeSpecificRevocationDeltaWALs(sc, hyphenSerial, colonSerial, unifiedDeltaWALPath); ignoredErr != nil {
-			// Just log the error if we fail to write across clusters, a separate background
-			// thread will reattempt it later on as we have the local write done.
-			sc.Backend.Logger().Error("Failed to write cross-cluster delta WAL entry, will re-attempt later",
-				"serial_number", colonSerial, "error", ignoredErr)
-			sc.Backend.unifiedTransferStatus.forceRun()
-
-			resp.AddWarning(fmt.Sprintf("Failed to write cross-cluster delta WAL entry, will re-attempt later: %v", ignoredErr))
-		}
-	} else if failedWritingUnifiedCRL {
-		resp.AddWarning("Skipping cross-cluster delta WAL entry as cross-cluster revocation failed to write; will re-attempt later.")
-	}
-
-	return nil
-}
-
-func writeSpecificRevocationDeltaWALs(sc *storageContext, hyphenSerial string, colonSerial string, pathPrefix string) error {
-	// Previously, regardless of whether or not we've presently enabled
-	// Delta CRLs, we would always write the Delta WAL in case it is
-	// enabled in the future. We though we could trigger another full CRL
-	// rebuild instead (to avoid inconsistent state between the CRL and
-	// missing Delta WAL entries), but writing extra (unused?) WAL entries
-	// versus an expensive full CRL rebuild was thought of as being
-	// probably a net wash.
-	//
-	// However, we've now added unified CRL building, adding cross-cluster
-	// writes to the revocation path. Because this is relatively expensive,
-	// we've opted to rebuild the complete+delta CRLs when toggling the
-	// state of delta enabled, instead of always writing delta CRL entries.
-	//
-	// Thus Delta WAL building happens **only** when Delta CRLs are enabled.
-	//
-	// We should only do this when the cert hasn't already been revoked.
-	// Otherwise, the re-revocation may appear on both an existing CRL and
-	// on a delta CRL, or a serial may be skipped from the delta CRL if
-	// there's an A->B->A revocation pattern and the delta was rebuilt
-	// after the first cert.
-	//
-	// Currently we don't store any data in the WAL entry.
-	var walInfo deltaWALInfo
-	walEntry, err := logical.StorageEntryJSON(pathPrefix+hyphenSerial, walInfo)
-	if err != nil {
-		return fmt.Errorf("unable to create delta CRL WAL entry: %w", err)
-	}
+		}
+	} else if !alreadyRevoked {
+		// Regardless of whether or not we've presently enabled Delta CRLs,
+		// we should always write the Delta WAL in case it is enabled in the
+		// future. We could trigger another full CRL rebuild instead (to avoid
+		// inconsistent state between the CRL and missing Delta WAL entries),
+		// but writing extra (unused?) WAL entries versus an expensive full
+		// CRL rebuild is probably a net wash.
+		///
+		// We should only do this when the cert hasn't already been revoked.
+		// Otherwise, the re-revocation may appear on both an existing CRL and
+		// on a delta CRL, or a serial may be skipped from the delta CRL if
+		// there's an A->B->A revocation pattern and the delta was rebuilt
+		// after the first cert.
+		//
+		// Currently we don't store any data in the WAL entry.
+		var walInfo deltaWALInfo
+		walEntry, err := logical.StorageEntryJSON(deltaWALPath+normalizeSerial(serial), walInfo)
+		if err != nil {
+			return nil, fmt.Errorf("unable to create delta CRL WAL entry")
+		}
 
-	if err = sc.Storage.Put(sc.Context, walEntry); err != nil {
-		return fmt.Errorf("error saving delta CRL WAL entry: %w", err)
+		if err = req.Storage.Put(ctx, walEntry); err != nil {
+			return nil, fmt.Errorf("error saving delta CRL WAL entry")
+		}
+
+		// In order for periodic delta rebuild to be mildly efficient, we
+		// should write the last revoked delta WAL entry so we know if we
+		// have new revocations that we should rebuild the delta WAL for.
+		lastRevSerial := lastWALInfo{Serial: serial}
+		lastWALEntry, err := logical.StorageEntryJSON(deltaWALLastRevokedSerial, lastRevSerial)
+		if err != nil {
+			return nil, fmt.Errorf("unable to create last delta CRL WAL entry")
+		}
+		if err = req.Storage.Put(ctx, lastWALEntry); err != nil {
+			return nil, fmt.Errorf("error saving last delta CRL WAL entry")
+		}
 	}
 
-	// In order for periodic delta rebuild to be mildly efficient, we
-	// should write the last revoked delta WAL entry so we know if we
-	// have new revocations that we should rebuild the delta WAL for.
-	lastRevSerial := lastWALInfo{Serial: colonSerial}
-	lastWALEntry, err := logical.StorageEntryJSON(pathPrefix+deltaWALLastRevokedSerialName, lastRevSerial)
-	if err != nil {
-		return fmt.Errorf("unable to create last delta CRL WAL entry: %w", err)
+	resp := &logical.Response{
+		Data: map[string]interface{}{
+			"revocation_time": revInfo.RevocationTime,
+		},
 	}
-	if err = sc.Storage.Put(sc.Context, lastWALEntry); err != nil {
-		return fmt.Errorf("error saving last delta CRL WAL entry: %w", err)
+	if !revInfo.RevocationTimeUTC.IsZero() {
+		resp.Data["revocation_time_rfc3339"] = revInfo.RevocationTimeUTC.Format(time.RFC3339Nano)
 	}
-
-	return nil
+	return resp, nil
 }
 
-func buildCRLs(sc *storageContext, forceNew bool) ([]string, error) {
+func buildCRLs(ctx context.Context, b *backend, req *logical.Request, forceNew bool) error {
+	sc := b.makeStorageContext(ctx, req.Storage)
 	return buildAnyCRLs(sc, forceNew, false)
 }
 
-func buildAnyCRLs(sc *storageContext, forceNew bool, isDelta bool) ([]string, error) {
+func buildAnyCRLs(sc *storageContext, forceNew bool, isDelta bool) error {
 	// In order to build all CRLs, we need knowledge of all issuers. Any two
 	// issuers with the same keys _and_ subject should have the same CRL since
 	// they're functionally equivalent.
@@ -1207,25 +696,25 @@ func buildAnyCRLs(sc *storageContext, forceNew bool, isDelta bool) ([]string, er
 	// buildCRL.
 	globalCRLConfig, err := sc.Backend.crlBuilder.getConfigWithUpdate(sc)
 	if err != nil {
-		return nil, fmt.Errorf("error building CRL: while updating config: %w", err)
+		return fmt.Errorf("error building CRL: while updating config: %v", err)
 	}
 
 	if globalCRLConfig.Disable && !forceNew {
-		// We build a single long-lived (but regular validity) empty CRL in
-		// the event that we disable the CRL, but we don't keep updating it
-		// with newer, more-valid empty CRLs in the event that we later
-		// re-enable it. This is a historical behavior.
+		// We build a single long-lived empty CRL in the event that we disable
+		// the CRL, but we don't keep updating it with newer, more-valid empty
+		// CRLs in the event that we later re-enable it. This is a historical
+		// behavior.
 		//
 		// So, since tidy can now associate issuers on revocation entries, we
 		// can skip the rest of this function and exit early without updating
 		// anything.
-		return nil, nil
+		return nil
 	}
 
 	if !sc.Backend.useLegacyBundleCaStorage() {
 		issuers, err = sc.listIssuers()
 		if err != nil {
-			return nil, fmt.Errorf("error building CRL: while listing issuers: %w", err)
+			return fmt.Errorf("error building CRL: while listing issuers: %v", err)
 		}
 	} else {
 		// Here, we hard-code the legacy issuer entry instead of using the
@@ -1239,13 +728,13 @@ func buildAnyCRLs(sc *storageContext, forceNew bool, isDelta bool) ([]string, er
 		// Users should upgrade symmetrically, rather than attempting
 		// backward compatibility for new features across disparate versions.
 		if isDelta {
-			return []string{"refusing to rebuild delta CRL with legacy bundle; finish migrating to newer issuer storage layout"}, nil
+			return nil
 		}
 	}
 
-	issuersConfig, err := sc.getIssuersConfig()
+	config, err := sc.getIssuersConfig()
 	if err != nil {
-		return nil, fmt.Errorf("error building CRLs: while getting the default config: %w", err)
+		return fmt.Errorf("error building CRLs: while getting the default config: %v", err)
 	}
 
 	// We map issuerID->entry for fast lookup and also issuerID->Cert for
@@ -1262,7 +751,7 @@ func buildAnyCRLs(sc *storageContext, forceNew bool, isDelta bool) ([]string, er
 		// legacy path is automatically ignored.
 		thisEntry, _, err := sc.fetchCertBundleByIssuerId(issuer, false)
 		if err != nil {
-			return nil, fmt.Errorf("error building CRLs: unable to fetch specified issuer (%v): %w", issuer, err)
+			return fmt.Errorf("error building CRLs: unable to fetch specified issuer (%v): %v", issuer, err)
 		}
 
 		if len(thisEntry.KeyID) == 0 {
@@ -1287,7 +776,7 @@ func buildAnyCRLs(sc *storageContext, forceNew bool, isDelta bool) ([]string, er
 
 		thisCert, err := thisEntry.GetCertificate()
 		if err != nil {
-			return nil, fmt.Errorf("error building CRLs: unable to parse issuer (%v)'s certificate: %w", issuer, err)
+			return fmt.Errorf("error building CRLs: unable to parse issuer (%v)'s certificate: %v", issuer, err)
 		}
 		issuerIDCertMap[issuer] = thisCert
 
@@ -1299,218 +788,11 @@ func buildAnyCRLs(sc *storageContext, forceNew bool, isDelta bool) ([]string, er
 		keySubjectIssuersMap[thisEntry.KeyID][subject] = append(keySubjectIssuersMap[thisEntry.KeyID][subject], issuer)
 	}
 
-	// Now we do two calls: building the cluster-local CRL, and potentially
-	// building the global CRL if we're on the active node of the performance
-	// primary.
-	currLocalDeltaSerials, localWarnings, err := buildAnyLocalCRLs(sc, issuersConfig, globalCRLConfig,
-		issuers, issuerIDEntryMap,
-		issuerIDCertMap, keySubjectIssuersMap,
-		wasLegacy, forceNew, isDelta)
-	if err != nil {
-		return nil, err
-	}
-	currUnifiedDeltaSerials, unifiedWarnings, err := buildAnyUnifiedCRLs(sc, issuersConfig, globalCRLConfig,
-		issuers, issuerIDEntryMap,
-		issuerIDCertMap, keySubjectIssuersMap,
-		wasLegacy, forceNew, isDelta)
-	if err != nil {
-		return nil, err
-	}
-
-	var warnings []string
-	for _, warning := range localWarnings {
-		warnings = append(warnings, fmt.Sprintf("warning from local CRL rebuild: %v", warning))
-	}
-	for _, warning := range unifiedWarnings {
-		warnings = append(warnings, fmt.Sprintf("warning from unified CRL rebuild: %v", warning))
-	}
-
-	// Finally, we decide if we need to rebuild the Delta CRLs again, for both
-	// global and local CRLs if necessary.
-	if !isDelta {
-		// After we've confirmed the primary CRLs have built OK, go ahead and
-		// clear the delta CRL WAL and rebuild it.
-		if err := sc.Backend.crlBuilder.clearLocalDeltaWAL(sc, currLocalDeltaSerials); err != nil {
-			return nil, fmt.Errorf("error building CRLs: unable to clear Delta WAL: %w", err)
-		}
-		if err := sc.Backend.crlBuilder.clearUnifiedDeltaWAL(sc, currUnifiedDeltaSerials); err != nil {
-			return nil, fmt.Errorf("error building CRLs: unable to clear Delta WAL: %w", err)
-		}
-		deltaWarnings, err := sc.Backend.crlBuilder.rebuildDeltaCRLsHoldingLock(sc, forceNew)
-		if err != nil {
-			return nil, fmt.Errorf("error building CRLs: unable to rebuild empty Delta WAL: %w", err)
-		}
-		for _, warning := range deltaWarnings {
-			warnings = append(warnings, fmt.Sprintf("warning from delta CRL rebuild: %v", warning))
-		}
-	}
-
-	return warnings, nil
-}
-
-func getLastWALSerial(sc *storageContext, path string) (string, error) {
-	lastWALEntry, err := sc.Storage.Get(sc.Context, path)
-	if err != nil {
-		return "", err
-	}
-
-	if lastWALEntry != nil && lastWALEntry.Value != nil {
-		var walInfo lastWALInfo
-		if err := lastWALEntry.DecodeJSON(&walInfo); err != nil {
-			return "", err
-		}
-
-		return walInfo.Serial, nil
-	}
-
-	// No serial to return.
-	return "", nil
-}
-
-func buildAnyLocalCRLs(
-	sc *storageContext,
-	issuersConfig *issuerConfigEntry,
-	globalCRLConfig *crlConfig,
-	issuers []issuerID,
-	issuerIDEntryMap map[issuerID]*issuerEntry,
-	issuerIDCertMap map[issuerID]*x509.Certificate,
-	keySubjectIssuersMap map[keyID]map[string][]issuerID,
-	wasLegacy bool,
-	forceNew bool,
-	isDelta bool,
-) ([]string, []string, error) {
-	var err error
-	var warnings []string
-
-	// Before we load cert entries, we want to store the last seen delta WAL
-	// serial number. The subsequent List will have at LEAST that certificate
-	// (and potentially more) in it; when we're done writing the delta CRL,
-	// we'll write this serial as a sentinel to see if we need to rebuild it
-	// in the future.
-	var lastDeltaSerial string
-	if isDelta {
-		lastDeltaSerial, err = getLastWALSerial(sc, localDeltaWALLastRevokedSerial)
-		if err != nil {
-			return nil, nil, err
-		}
-	}
-
-	// We fetch a list of delta WAL entries prior to generating the complete
-	// CRL. This allows us to avoid a lock (to clear such storage): anything
-	// visible now, should also be visible on the complete CRL we're writing.
-	var currDeltaCerts []string
-	if !isDelta {
-		currDeltaCerts, err = sc.Backend.crlBuilder.getPresentLocalDeltaWALForClearing(sc)
-		if err != nil {
-			return nil, nil, fmt.Errorf("error building CRLs: unable to get present delta WAL entries for removal: %w", err)
-		}
-	}
-
-	var unassignedCerts []pkix.RevokedCertificate
-	var revokedCertsMap map[issuerID][]pkix.RevokedCertificate
-
-	// If the CRL is disabled do not bother reading in all the revoked certificates.
-	if !globalCRLConfig.Disable {
-		// Next, we load and parse all revoked certificates. We need to assign
-		// these certificates to an issuer. Some certificates will not be
-		// assignable (if they were issued by a since-deleted issuer), so we need
-		// a separate pool for those.
-		unassignedCerts, revokedCertsMap, err = getLocalRevokedCertEntries(sc, issuerIDCertMap, isDelta)
-		if err != nil {
-			return nil, nil, fmt.Errorf("error building CRLs: unable to get revoked certificate entries: %w", err)
-		}
-
-		if !isDelta {
-			// Revoking an issuer forces us to rebuild our complete CRL,
-			// regardless of whether or not we've enabled auto rebuilding or
-			// delta CRLs. If we elide the above isDelta check, this results
-			// in a non-empty delta CRL, containing the serial of the
-			// now-revoked issuer, even though it was generated _after_ the
-			// complete CRL with the issuer on it. There's no reason to
-			// duplicate this serial number on the delta, hence the above
-			// guard for isDelta.
-			if err := augmentWithRevokedIssuers(issuerIDEntryMap, issuerIDCertMap, revokedCertsMap); err != nil {
-				return nil, nil, fmt.Errorf("error building CRLs: unable to parse revoked issuers: %w", err)
-			}
-		}
-	}
-
 	// Fetch the cluster-local CRL mapping so we know where to write the
 	// CRLs.
-	internalCRLConfig, err := sc.getLocalCRLConfig()
+	crlConfig, err := sc.getLocalCRLConfig()
 	if err != nil {
-		return nil, nil, fmt.Errorf("error building CRLs: unable to fetch cluster-local CRL configuration: %w", err)
-	}
-
-	rebuildWarnings, err := buildAnyCRLsWithCerts(sc, issuersConfig, globalCRLConfig, internalCRLConfig,
-		issuers, issuerIDEntryMap, keySubjectIssuersMap,
-		unassignedCerts, revokedCertsMap,
-		forceNew, false /* isUnified */, isDelta)
-	if err != nil {
-		return nil, nil, fmt.Errorf("error building CRLs: %w", err)
-	}
-	if len(rebuildWarnings) > 0 {
-		warnings = append(warnings, rebuildWarnings...)
-	}
-
-	// Finally, persist our potentially updated local CRL config. Only do this
-	// if we didn't have a legacy CRL bundle.
-	if !wasLegacy {
-		if err := sc.setLocalCRLConfig(internalCRLConfig); err != nil {
-			return nil, nil, fmt.Errorf("error building CRLs: unable to persist updated cluster-local CRL config: %w", err)
-		}
-	}
-
-	if isDelta {
-		// Update our last build time here so we avoid checking for new certs
-		// for a while.
-		sc.Backend.crlBuilder.lastDeltaRebuildCheck = time.Now()
-
-		if len(lastDeltaSerial) > 0 {
-			// When we have a last delta serial, write out the relevant info
-			// so we can skip extra CRL rebuilds.
-			deltaInfo := lastDeltaInfo{Serial: lastDeltaSerial}
-
-			lastDeltaBuildEntry, err := logical.StorageEntryJSON(localDeltaWALLastBuildSerial, deltaInfo)
-			if err != nil {
-				return nil, nil, fmt.Errorf("error creating last delta CRL rebuild serial entry: %w", err)
-			}
-
-			err = sc.Storage.Put(sc.Context, lastDeltaBuildEntry)
-			if err != nil {
-				return nil, nil, fmt.Errorf("error persisting last delta CRL rebuild info: %w", err)
-			}
-		}
-	}
-
-	return currDeltaCerts, warnings, nil
-}
-
-func buildAnyUnifiedCRLs(
-	sc *storageContext,
-	issuersConfig *issuerConfigEntry,
-	globalCRLConfig *crlConfig,
-	issuers []issuerID,
-	issuerIDEntryMap map[issuerID]*issuerEntry,
-	issuerIDCertMap map[issuerID]*x509.Certificate,
-	keySubjectIssuersMap map[keyID]map[string][]issuerID,
-	wasLegacy bool,
-	forceNew bool,
-	isDelta bool,
-) ([]string, []string, error) {
-	var err error
-	var warnings []string
-
-	// Unified CRL can only be built by the main cluster.
-	b := sc.Backend
-	if b.System().ReplicationState().HasState(consts.ReplicationDRSecondary|consts.ReplicationPerformanceStandby) ||
-		(!b.System().LocalMount() && b.System().ReplicationState().HasState(consts.ReplicationPerformanceSecondary)) {
-		return nil, nil, nil
-	}
-
-	// Unified CRL should only be built if enabled.
-	if !globalCRLConfig.UnifiedCRL && !forceNew {
-		return nil, nil, nil
+		return fmt.Errorf("error building CRLs: unable to fetch cluster-local CRL configuration: %v", err)
 	}
 
 	// Before we load cert entries, we want to store the last seen delta WAL
@@ -1518,23 +800,20 @@ func buildAnyUnifiedCRLs(
 	// (and potentially more) in it; when we're done writing the delta CRL,
 	// we'll write this serial as a sentinel to see if we need to rebuild it
 	// in the future.
-	//
-	// We need to do this per-cluster.
-	lastDeltaSerial := map[string]string{}
+	var lastDeltaSerial string
 	if isDelta {
-		clusters, err := sc.Storage.List(sc.Context, unifiedDeltaWALPrefix)
+		lastWALEntry, err := sc.Storage.Get(sc.Context, deltaWALLastRevokedSerial)
 		if err != nil {
-			return nil, nil, fmt.Errorf("error listing clusters for unified delta WAL building: %w", err)
+			return err
 		}
 
-		for index, cluster := range clusters {
-			path := unifiedDeltaWALPrefix + cluster + deltaWALLastRevokedSerialName
-			serial, err := getLastWALSerial(sc, path)
-			if err != nil {
-				return nil, nil, fmt.Errorf("error getting last written Delta WAL serial for cluster (%v / %v): %w", index, cluster, err)
+		if lastWALEntry != nil && lastWALEntry.Value != nil {
+			var walInfo lastWALInfo
+			if err := lastWALEntry.DecodeJSON(&walInfo); err != nil {
+				return err
 			}
 
-			lastDeltaSerial[cluster] = serial
+			lastDeltaSerial = walInfo.Serial
 		}
 	}
 
@@ -1543,9 +822,9 @@ func buildAnyUnifiedCRLs(
 	// visible now, should also be visible on the complete CRL we're writing.
 	var currDeltaCerts []string
 	if !isDelta {
-		currDeltaCerts, err = sc.Backend.crlBuilder.getPresentUnifiedDeltaWALForClearing(sc)
+		currDeltaCerts, err = sc.Backend.crlBuilder.getPresentDeltaWALForClearing(sc)
 		if err != nil {
-			return nil, nil, fmt.Errorf("error building CRLs: unable to get present delta WAL entries for removal: %w", err)
+			return fmt.Errorf("error building CRLs: unable to get present delta WAL entries for removal: %v", err)
 		}
 	}
 
@@ -1558,9 +837,9 @@ func buildAnyUnifiedCRLs(
 		// these certificates to an issuer. Some certificates will not be
 		// assignable (if they were issued by a since-deleted issuer), so we need
 		// a separate pool for those.
-		unassignedCerts, revokedCertsMap, err = getUnifiedRevokedCertEntries(sc, issuerIDCertMap, isDelta)
+		unassignedCerts, revokedCertsMap, err = getRevokedCertEntries(sc, issuerIDCertMap, isDelta)
 		if err != nil {
-			return nil, nil, fmt.Errorf("error building CRLs: unable to get revoked certificate entries: %w", err)
+			return fmt.Errorf("error building CRLs: unable to get revoked certificate entries: %v", err)
 		}
 
 		if !isDelta {
@@ -1573,87 +852,13 @@ func buildAnyUnifiedCRLs(
 			// duplicate this serial number on the delta, hence the above
 			// guard for isDelta.
 			if err := augmentWithRevokedIssuers(issuerIDEntryMap, issuerIDCertMap, revokedCertsMap); err != nil {
-				return nil, nil, fmt.Errorf("error building CRLs: unable to parse revoked issuers: %w", err)
-			}
-		}
-	}
-
-	// Fetch the cluster-local CRL mapping so we know where to write the
-	// CRLs.
-	internalCRLConfig, err := sc.getUnifiedCRLConfig()
-	if err != nil {
-		return nil, nil, fmt.Errorf("error building CRLs: unable to fetch cluster-local CRL configuration: %w", err)
-	}
-
-	rebuildWarnings, err := buildAnyCRLsWithCerts(sc, issuersConfig, globalCRLConfig, internalCRLConfig,
-		issuers, issuerIDEntryMap, keySubjectIssuersMap,
-		unassignedCerts, revokedCertsMap,
-		forceNew, true /* isUnified */, isDelta)
-	if err != nil {
-		return nil, nil, fmt.Errorf("error building CRLs: %w", err)
-	}
-	if len(rebuildWarnings) > 0 {
-		warnings = append(warnings, rebuildWarnings...)
-	}
-
-	// Finally, persist our potentially updated local CRL config. Only do this
-	// if we didn't have a legacy CRL bundle.
-	if !wasLegacy {
-		if err := sc.setUnifiedCRLConfig(internalCRLConfig); err != nil {
-			return nil, nil, fmt.Errorf("error building CRLs: unable to persist updated cluster-local CRL config: %w", err)
-		}
-	}
-
-	if isDelta {
-		// Update our last build time here so we avoid checking for new certs
-		// for a while.
-		sc.Backend.crlBuilder.lastDeltaRebuildCheck = time.Now()
-
-		// Persist all of our known last revoked serial numbers here, as the
-		// last seen serial during build. This will allow us to detect if any
-		// new revocations have occurred, forcing us to rebuild the delta CRL.
-		for cluster, serial := range lastDeltaSerial {
-			if len(serial) == 0 {
-				continue
-			}
-
-			// Make sure to use the cluster-specific path. Since we're on the
-			// active node of the primary cluster, we own this entry and can
-			// safely write it.
-			path := unifiedDeltaWALPrefix + cluster + deltaWALLastBuildSerialName
-			deltaInfo := lastDeltaInfo{Serial: serial}
-			lastDeltaBuildEntry, err := logical.StorageEntryJSON(path, deltaInfo)
-			if err != nil {
-				return nil, nil, fmt.Errorf("error creating last delta CRL rebuild serial entry: %w", err)
-			}
-
-			err = sc.Storage.Put(sc.Context, lastDeltaBuildEntry)
-			if err != nil {
-				return nil, nil, fmt.Errorf("error persisting last delta CRL rebuild info: %w", err)
+				return fmt.Errorf("error building CRLs: unable to parse revoked issuers: %v", err)
 			}
 		}
 	}
 
-	return currDeltaCerts, warnings, nil
-}
-
-func buildAnyCRLsWithCerts(
-	sc *storageContext,
-	issuersConfig *issuerConfigEntry,
-	globalCRLConfig *crlConfig,
-	internalCRLConfig *internalCRLConfigEntry,
-	issuers []issuerID,
-	issuerIDEntryMap map[issuerID]*issuerEntry,
-	keySubjectIssuersMap map[keyID]map[string][]issuerID,
-	unassignedCerts []pkix.RevokedCertificate,
-	revokedCertsMap map[issuerID][]pkix.RevokedCertificate,
-	forceNew bool,
-	isUnified bool,
-	isDelta bool,
-) ([]string, error) {
 	// Now we can call buildCRL once, on an arbitrary/representative issuer
 	// from each of these (keyID, subject) sets.
-	var warnings []string
 	for _, subjectIssuersMap := range keySubjectIssuersMap {
 		for _, issuersSet := range subjectIssuersMap {
 			if len(issuersSet) == 0 {
@@ -1679,7 +884,7 @@ func buildAnyCRLsWithCerts(
 				// If it is, we'll also pull in the unassigned certs to remain
 				// compatible with Vault's earlier, potentially questionable
 				// behavior.
-				if issuerId == issuersConfig.DefaultIssuerId {
+				if issuerId == config.DefaultIssuerId {
 					if len(unassignedCerts) > 0 {
 						revokedCerts = append(revokedCerts, unassignedCerts...)
 					}
@@ -1699,9 +904,9 @@ func buildAnyCRLsWithCerts(
 				}
 
 				// Finally, check our crlIdentifier.
-				if thisCRLId, ok := internalCRLConfig.IssuerIDCRLMap[issuerId]; ok && len(thisCRLId) > 0 {
+				if thisCRLId, ok := crlConfig.IssuerIDCRLMap[issuerId]; ok && len(thisCRLId) > 0 {
 					if len(crlIdentifier) > 0 && crlIdentifier != thisCRLId {
-						return nil, fmt.Errorf("error building CRLs: two issuers with same keys/subjects (%v vs %v) have different internal CRL IDs: %v vs %v", issuerId, crlIdIssuer, thisCRLId, crlIdentifier)
+						return fmt.Errorf("error building CRLs: two issuers with same keys/subjects (%v vs %v) have different internal CRL IDs: %v vs %v", issuerId, crlIdIssuer, thisCRLId, crlIdentifier)
 					}
 
 					crlIdentifier = thisCRLId
@@ -1713,48 +918,30 @@ func buildAnyCRLsWithCerts(
 				// Skip this set for the time being; while we have valid
 				// issuers and associated keys, this occurred because we lack
 				// crl-signing usage on all issuers in this set.
-				//
-				// But, tell the user about this, so they can either correct
-				// this by reissuing the CA certificate or adding an equivalent
-				// version with KU bits if the CA cert lacks KU altogether.
-				//
-				// See also: https://github.com/hashicorp/vault/issues/20137
-				warning := "Issuer equivalency set with associated keys lacked an issuer with CRL Signing KeyUsage; refusing to rebuild CRL for this group of issuers: "
-				var issuers []string
-				for _, issuerId := range issuersSet {
-					issuers = append(issuers, issuerId.String())
-				}
-				warning += strings.Join(issuers, ",")
-
-				// We only need this warning once. :-)
-				if !isUnified && !isDelta {
-					warnings = append(warnings, warning)
-				}
-
 				continue
 			}
 
 			if len(crlIdentifier) == 0 {
 				// Create a new random UUID for this CRL if none exists.
 				crlIdentifier = genCRLId()
-				internalCRLConfig.CRLNumberMap[crlIdentifier] = 1
+				crlConfig.CRLNumberMap[crlIdentifier] = 1
 			}
 
 			// Update all issuers in this group to set the CRL Issuer
 			for _, issuerId := range issuersSet {
-				internalCRLConfig.IssuerIDCRLMap[issuerId] = crlIdentifier
+				crlConfig.IssuerIDCRLMap[issuerId] = crlIdentifier
 			}
 
 			// We always update the CRL Number since we never want to
 			// duplicate numbers and missing numbers is fine.
-			crlNumber := internalCRLConfig.CRLNumberMap[crlIdentifier]
-			internalCRLConfig.CRLNumberMap[crlIdentifier] += 1
+			crlNumber := crlConfig.CRLNumberMap[crlIdentifier]
+			crlConfig.CRLNumberMap[crlIdentifier] += 1
 
 			// CRLs (regardless of complete vs delta) are incrementally
 			// numbered. But delta CRLs need to know the number of the
 			// last complete CRL. We assume that's the previous identifier
 			// if no value presently exists.
-			lastCompleteNumber, haveLast := internalCRLConfig.LastCompleteNumberMap[crlIdentifier]
+			lastCompleteNumber, haveLast := crlConfig.LastCompleteNumberMap[crlIdentifier]
 			if !haveLast {
 				// We use the value of crlNumber for the current CRL, so
 				// decrement it by one to find the last one.
@@ -1763,24 +950,24 @@ func buildAnyCRLsWithCerts(
 
 			// Update `LastModified`
 			if isDelta {
-				internalCRLConfig.DeltaLastModified = time.Now().UTC()
+				crlConfig.DeltaLastModified = time.Now().UTC()
 			} else {
-				internalCRLConfig.LastModified = time.Now().UTC()
+				crlConfig.LastModified = time.Now().UTC()
 			}
 
 			// Lastly, build the CRL.
-			nextUpdate, err := buildCRL(sc, globalCRLConfig, forceNew, representative, revokedCerts, crlIdentifier, crlNumber, isUnified, isDelta, lastCompleteNumber)
+			nextUpdate, err := buildCRL(sc, globalCRLConfig, forceNew, representative, revokedCerts, crlIdentifier, crlNumber, isDelta, lastCompleteNumber)
 			if err != nil {
-				return nil, fmt.Errorf("error building CRLs: unable to build CRL for issuer (%v): %w", representative, err)
+				return fmt.Errorf("error building CRLs: unable to build CRL for issuer (%v): %v", representative, err)
 			}
 
-			internalCRLConfig.CRLExpirationMap[crlIdentifier] = *nextUpdate
+			crlConfig.CRLExpirationMap[crlIdentifier] = *nextUpdate
 			if !isDelta {
-				internalCRLConfig.LastCompleteNumberMap[crlIdentifier] = crlNumber
+				crlConfig.LastCompleteNumberMap[crlIdentifier] = crlNumber
 			} else if !haveLast {
 				// Since we're writing this config anyways, save our guess
 				// as to the last CRL number.
-				internalCRLConfig.LastCompleteNumberMap[crlIdentifier] = lastCompleteNumber
+				crlConfig.LastCompleteNumberMap[crlIdentifier] = lastCompleteNumber
 			}
 		}
 	}
@@ -1796,7 +983,7 @@ func buildAnyCRLsWithCerts(
 	// root deletion behavior, but using soft issuer deletes. If there is an
 	// alternate, equivalent issuer however, we'll keep updating the shared
 	// CRL; all equivalent issuers must have their CRLs disabled.
-	for mapIssuerId := range internalCRLConfig.IssuerIDCRLMap {
+	for mapIssuerId := range crlConfig.IssuerIDCRLMap {
 		stillHaveIssuer := false
 		for _, listedIssuerId := range issuers {
 			if mapIssuerId == listedIssuerId {
@@ -1806,12 +993,12 @@ func buildAnyCRLsWithCerts(
 		}
 
 		if !stillHaveIssuer {
-			delete(internalCRLConfig.IssuerIDCRLMap, mapIssuerId)
+			delete(crlConfig.IssuerIDCRLMap, mapIssuerId)
 		}
 	}
-	for crlId := range internalCRLConfig.CRLNumberMap {
+	for crlId := range crlConfig.CRLNumberMap {
 		stillHaveIssuerForID := false
-		for _, remainingCRL := range internalCRLConfig.IssuerIDCRLMap {
+		for _, remainingCRL := range crlConfig.IssuerIDCRLMap {
 			if remainingCRL == crlId {
 				stillHaveIssuerForID = true
 				break
@@ -1820,13 +1007,52 @@ func buildAnyCRLsWithCerts(
 
 		if !stillHaveIssuerForID {
 			if err := sc.Storage.Delete(sc.Context, "crls/"+crlId.String()); err != nil {
-				return nil, fmt.Errorf("error building CRLs: unable to clean up deleted issuers' CRL: %w", err)
+				return fmt.Errorf("error building CRLs: unable to clean up deleted issuers' CRL: %v", err)
+			}
+		}
+	}
+
+	// Finally, persist our potentially updated local CRL config. Only do this
+	// if we didn't have a legacy CRL bundle.
+	if !wasLegacy {
+		if err := sc.setLocalCRLConfig(crlConfig); err != nil {
+			return fmt.Errorf("error building CRLs: unable to persist updated cluster-local CRL config: %v", err)
+		}
+	}
+
+	if !isDelta {
+		// After we've confirmed the primary CRLs have built OK, go ahead and
+		// clear the delta CRL WAL and rebuild it.
+		if err := sc.Backend.crlBuilder.clearDeltaWAL(sc, currDeltaCerts); err != nil {
+			return fmt.Errorf("error building CRLs: unable to clear Delta WAL: %v", err)
+		}
+		if err := sc.Backend.crlBuilder.rebuildDeltaCRLsHoldingLock(sc, forceNew); err != nil {
+			return fmt.Errorf("error building CRLs: unable to rebuild empty Delta WAL: %v", err)
+		}
+	} else {
+		// Update our last build time here so we avoid checking for new certs
+		// for a while.
+		sc.Backend.crlBuilder.lastDeltaRebuildCheck = time.Now()
+
+		if len(lastDeltaSerial) > 0 {
+			// When we have a last delta serial, write out the relevant info
+			// so we can skip extra CRL rebuilds.
+			deltaInfo := lastDeltaInfo{Serial: lastDeltaSerial}
+
+			lastDeltaBuildEntry, err := logical.StorageEntryJSON(deltaWALLastBuildSerial, deltaInfo)
+			if err != nil {
+				return fmt.Errorf("error creating last delta CRL rebuild serial entry: %v", err)
+			}
+
+			err = sc.Storage.Put(sc.Context, lastDeltaBuildEntry)
+			if err != nil {
+				return fmt.Errorf("error persisting last delta CRL rebuild info: %v", err)
 			}
 		}
 	}
 
 	// All good :-)
-	return warnings, nil
+	return nil
 }
 
 func isRevInfoIssuerValid(revInfo *revocationInfo, issuerIDCertMap map[issuerID]*x509.Certificate) bool {
@@ -1854,13 +1080,13 @@ func associateRevokedCertWithIsssuer(revInfo *revocationInfo, revokedCert *x509.
 	return false
 }
 
-func getLocalRevokedCertEntries(sc *storageContext, issuerIDCertMap map[issuerID]*x509.Certificate, isDelta bool) ([]pkix.RevokedCertificate, map[issuerID][]pkix.RevokedCertificate, error) {
+func getRevokedCertEntries(sc *storageContext, issuerIDCertMap map[issuerID]*x509.Certificate, isDelta bool) ([]pkix.RevokedCertificate, map[issuerID][]pkix.RevokedCertificate, error) {
 	var unassignedCerts []pkix.RevokedCertificate
 	revokedCertsMap := make(map[issuerID][]pkix.RevokedCertificate)
 
 	listingPath := revokedPath
 	if isDelta {
-		listingPath = localDeltaWALPath
+		listingPath = deltaWALPath
 	}
 
 	revokedSerials, err := sc.Storage.List(sc.Context, listingPath)
@@ -1970,108 +1196,12 @@ func getLocalRevokedCertEntries(sc *storageContext, issuerIDCertMap map[issuerID
 			// we should update the entry to make future CRL builds faster.
 			revokedEntry, err = logical.StorageEntryJSON(revokedPath+serial, revInfo)
 			if err != nil {
-				return nil, nil, fmt.Errorf("error creating revocation entry for existing cert: %v: %w", serial, err)
+				return nil, nil, fmt.Errorf("error creating revocation entry for existing cert: %v", serial)
 			}
 
 			err = sc.Storage.Put(sc.Context, revokedEntry)
 			if err != nil {
-				return nil, nil, fmt.Errorf("error updating revoked certificate at existing location: %v: %w", serial, err)
-			}
-		}
-	}
-
-	return unassignedCerts, revokedCertsMap, nil
-}
-
-func getUnifiedRevokedCertEntries(sc *storageContext, issuerIDCertMap map[issuerID]*x509.Certificate, isDelta bool) ([]pkix.RevokedCertificate, map[issuerID][]pkix.RevokedCertificate, error) {
-	// Getting unified revocation entries is a bit different than getting
-	// the local ones. In particular, the full copy of the certificate is
-	// unavailable, so we'll be able to avoid parsing the stored certificate,
-	// at the expense of potentially having incorrect issuer mappings.
-	var unassignedCerts []pkix.RevokedCertificate
-	revokedCertsMap := make(map[issuerID][]pkix.RevokedCertificate)
-
-	listingPath := unifiedRevocationReadPathPrefix
-	if isDelta {
-		listingPath = unifiedDeltaWALPrefix
-	}
-
-	// First, we find all clusters that have written certificates.
-	clusterIds, err := sc.Storage.List(sc.Context, listingPath)
-	if err != nil {
-		return nil, nil, fmt.Errorf("failed to list clusters for unified CRL building: %w", err)
-	}
-
-	// We wish to prevent duplicate revocations on separate clusters from
-	// being added multiple times to the CRL. While we can't guarantee these
-	// are the same certificate, it doesn't matter as (as long as they have
-	// the same issuer), it'd imply issuance of two certs with the same
-	// serial which'd be an intentional violation of RFC 5280 before importing
-	// an issuer into Vault, and would be highly unlikely within Vault, due
-	// to 120-bit random serial numbers.
-	foundSerials := make(map[string]bool)
-
-	// Then for every cluster, we find its revoked certificates...
-	for _, clusterId := range clusterIds {
-		if !strings.HasSuffix(clusterId, "/") {
-			// No entries
-			continue
-		}
-
-		clusterPath := listingPath + clusterId
-		serials, err := sc.Storage.List(sc.Context, clusterPath)
-		if err != nil {
-			return nil, nil, fmt.Errorf("failed to list serials in cluster (%v) for unified CRL building: %w", clusterId, err)
-		}
-
-		// At this point, we need the storage entry. Rather than using the
-		// clusterPath and adding the serial, we need to use the true
-		// cross-cluster revocation entry (as, our above listing might have
-		// used delta WAL entires without the full revocation info).
-		serialPrefix := unifiedRevocationReadPathPrefix + clusterId
-		for _, serial := range serials {
-			if isDelta && (serial == deltaWALLastBuildSerialName || serial == deltaWALLastRevokedSerialName) {
-				// Skip our placeholder entries...
-				continue
-			}
-
-			serialPath := serialPrefix + serial
-			entryRaw, err := sc.Storage.Get(sc.Context, serialPath)
-			if err != nil {
-				return nil, nil, fmt.Errorf("failed to read unified revocation entry in cluster (%v) for unified CRL building: %w", clusterId, err)
-			}
-			if entryRaw == nil {
-				// Skip empty entries. We'll eventually tidy them.
-				continue
-			}
-
-			var xRevEntry unifiedRevocationEntry
-			if err := entryRaw.DecodeJSON(&xRevEntry); err != nil {
-				return nil, nil, fmt.Errorf("failed json decoding of unified revocation entry at path %v: %w ", serialPath, err)
-			}
-
-			// Convert to pkix.RevokedCertificate entries.
-			var revEntry pkix.RevokedCertificate
-			var ok bool
-			revEntry.SerialNumber, ok = serialToBigInt(serial)
-			if !ok {
-				return nil, nil, fmt.Errorf("failed to encode serial for CRL building: %v", serial)
-			}
-
-			revEntry.RevocationTime = xRevEntry.RevocationTimeUTC
-
-			if found, inFoundMap := foundSerials[normalizeSerial(serial)]; found && inFoundMap {
-				// Serial has already been added to the CRL.
-				continue
-			}
-			foundSerials[normalizeSerial(serial)] = true
-
-			// Finally, add it to the correct mapping.
-			_, present := issuerIDCertMap[xRevEntry.CertificateIssuer]
-			if !present {
-				unassignedCerts = append(unassignedCerts, revEntry)
-			} else {
-				revokedCertsMap[xRevEntry.CertificateIssuer] = append(revokedCertsMap[xRevEntry.CertificateIssuer], revEntry)
+				return nil, nil, fmt.Errorf("error updating revoked certificate at existing location: %v", serial)
 			}
 		}
 	}
@@ -2115,7 +1245,7 @@ func augmentWithRevokedIssuers(issuerIDEntryMap map[issuerID]*issuerEntry, issue
 
 // Builds a CRL by going through the list of revoked certificates and building
 // a new CRL with the stored revocation times and serial numbers.
-func buildCRL(sc *storageContext, crlInfo *crlConfig, forceNew bool, thisIssuerId issuerID, revoked []pkix.RevokedCertificate, identifier crlID, crlNumber int64, isUnified bool, isDelta bool, lastCompleteNumber int64) (*time.Time, error) {
+func buildCRL(sc *storageContext, crlInfo *crlConfig, forceNew bool, thisIssuerId issuerID, revoked []pkix.RevokedCertificate, identifier crlID, crlNumber int64, isDelta bool, lastCompleteNumber int64) (*time.Time, error) {
 	var revokedCerts []pkix.RevokedCertificate
 
 	crlLifetime, err := time.ParseDuration(crlInfo.Expiry)
@@ -2159,7 +1289,7 @@ WRITE:
 	if isDelta {
 		ext, err := certutil.CreateDeltaCRLIndicatorExt(lastCompleteNumber)
 		if err != nil {
-			return nil, fmt.Errorf("could not create crl delta indicator extension: %w", err)
+			return nil, fmt.Errorf("could not create crl delta indicator extension: %v", err)
 		}
 		extensions = []pkix.Extension{ext}
 	}
@@ -2183,15 +1313,9 @@ WRITE:
 		// Ignore the CRL ID as it won't be persisted anyways; hard-code the
 		// old legacy path and allow it to be updated.
 		writePath = legacyCRLPath
-	} else {
-		if isUnified {
-			writePath = unifiedCRLPathPrefix + writePath
-		}
-
-		if isDelta {
-			// Write the delta CRL to a unique storage location.
-			writePath += deltaCRLPathSuffix
-		}
+	} else if isDelta {
+		// Write the delta CRL to a unique storage location.
+		writePath += deltaCRLPathSuffix
 	}
 
 	err = sc.Storage.Put(sc.Context, &logical.StorageEntry{
@@ -2204,9 +1328,3 @@ WRITE:
 
 	return &nextUpdate, nil
 }
-
-// shouldLocalPathsUseUnified assuming a legacy path for a CRL/OCSP request, does our
-// configuration say we should be returning the unified response or not
-func shouldLocalPathsUseUnified(cfg *crlConfig) bool {
-	return cfg.UnifiedCRL && cfg.UnifiedCRLOnExistingPaths
-}
diff --git a/builtin/logical/pki/dnstest/server.go b/builtin/logical/pki/dnstest/server.go
deleted file mode 100644
index 87091ed5eb60e..0000000000000
--- a/builtin/logical/pki/dnstest/server.go
+++ /dev/null
@@ -1,415 +0,0 @@
-package dnstest
-
-import (
-	"context"
-	"fmt"
-	"net"
-	"strings"
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/hashicorp/vault/helper/testhelpers/corehelpers"
-	"github.com/hashicorp/vault/sdk/helper/docker"
-	"github.com/stretchr/testify/require"
-)
-
-type TestServer struct {
-	t   *testing.T
-	ctx context.Context
-
-	runner  *docker.Runner
-	network string
-	startup *docker.Service
-
-	lock       sync.Mutex
-	serial     int
-	forwarders []string
-	domains    []string
-	records    map[string]map[string][]string // domain -> record -> value(s).
-
-	cleanup func()
-}
-
-func SetupResolver(t *testing.T, domain string) *TestServer {
-	return SetupResolverOnNetwork(t, domain, "")
-}
-
-func SetupResolverOnNetwork(t *testing.T, domain string, network string) *TestServer {
-	var ts TestServer
-	ts.t = t
-	ts.ctx = context.Background()
-	ts.domains = []string{domain}
-	ts.records = map[string]map[string][]string{}
-	ts.network = network
-
-	ts.setupRunner(domain, network)
-	ts.startContainer(network)
-	ts.PushConfig()
-
-	return &ts
-}
-
-func (ts *TestServer) setupRunner(domain string, network string) {
-	var err error
-	ts.runner, err = docker.NewServiceRunner(docker.RunOptions{
-		ImageRepo:     "ubuntu/bind9",
-		ImageTag:      "latest",
-		ContainerName: "bind9-dns-" + strings.ReplaceAll(domain, ".", "-"),
-		NetworkName:   network,
-		Ports:         []string{"53/udp"},
-		LogConsumer: func(s string) {
-			ts.t.Logf(s)
-		},
-	})
-	require.NoError(ts.t, err)
-}
-
-func (ts *TestServer) startContainer(network string) {
-	connUpFunc := func(ctx context.Context, host string, port int) (docker.ServiceConfig, error) {
-		// Perform a simple connection to this resolver, even though the
-		// default configuration doesn't do anything useful.
-		peer, err := net.ResolveUDPAddr("udp", fmt.Sprintf("%s:%d", host, port))
-		if err != nil {
-			return nil, fmt.Errorf("failed to resolve peer: %v / %v: %w", host, port, err)
-		}
-
-		conn, err := net.DialUDP("udp", nil, peer)
-		if err != nil {
-			return nil, fmt.Errorf("failed to dial peer: %v / %v / %v: %w", host, port, peer, err)
-		}
-		defer conn.Close()
-
-		_, err = conn.Write([]byte("garbage-in"))
-		if err != nil {
-			return nil, fmt.Errorf("failed to write to peer: %v / %v / %v: %w", host, port, peer, err)
-		}
-
-		// Connection worked.
-		return docker.NewServiceHostPort(host, port), nil
-	}
-
-	result, _, err := ts.runner.StartNewService(ts.ctx, true, true, connUpFunc)
-	require.NoError(ts.t, err, "failed to start dns resolver for "+ts.domains[0])
-	ts.startup = result
-
-	if ts.startup.StartResult.RealIP == "" {
-		mapping, err := ts.runner.GetNetworkAndAddresses(ts.startup.Container.ID)
-		require.NoError(ts.t, err, "failed to fetch network addresses to correct missing real IP address")
-		if len(network) == 0 {
-			require.Equal(ts.t, 1, len(mapping), "expected exactly one network address")
-			for network = range mapping {
-				// Because mapping is a map of network name->ip, we need
-				// to use the above range's assignment to get the name,
-				// as there is no other way of getting the keys of a map.
-			}
-		}
-		require.Contains(ts.t, mapping, network, "expected network to be part of the mapping")
-		ts.startup.StartResult.RealIP = mapping[network]
-	}
-
-	ts.t.Logf("[dnsserv] Addresses of DNS resolver: local=%v / container=%v", ts.GetLocalAddr(), ts.GetRemoteAddr())
-}
-
-func (ts *TestServer) buildNamedConf() string {
-	forwarders := "\n"
-	if len(ts.forwarders) > 0 {
-		forwarders = "\tforwarders {\n"
-		for _, forwarder := range ts.forwarders {
-			forwarders += "\t\t" + forwarder + ";\n"
-		}
-		forwarders += "\t};\n"
-	}
-
-	zones := "\n"
-	for _, domain := range ts.domains {
-		zones += fmt.Sprintf("zone \"%s\" {\n", domain)
-		zones += "\ttype primary;\n"
-		zones += fmt.Sprintf("\tfile \"%s.zone\";\n", domain)
-		zones += "\tallow-update {\n\t\tnone;\n\t};\n"
-		zones += "\tnotify no;\n"
-		zones += "};\n\n"
-	}
-
-	// Reverse lookups are not handles as they're not presently necessary.
-
-	cfg := `options {
-	directory "/var/cache/bind";
-
-	dnssec-validation no;
-
-	` + forwarders + `
-};
-
-` + zones
-
-	return cfg
-}
-
-func (ts *TestServer) buildZoneFile(target string) string {
-	// One second TTL by default to allow quick refreshes.
-	zone := "$TTL 1;\n"
-
-	ts.serial += 1
-	zone += fmt.Sprintf("@\tIN\tSOA\tns.%v.\troot.%v.\t(\n", target, target)
-	zone += fmt.Sprintf("\t\t\t%d;\n\t\t\t1;\n\t\t\t1;\n\t\t\t2;\n\t\t\t1;\n\t\t\t)\n\n", ts.serial)
-	zone += fmt.Sprintf("@\tIN\tNS\tns%d.%v.\n", ts.serial, target)
-	zone += fmt.Sprintf("ns%d.%v.\tIN\tA\t%v\n", ts.serial, target, "127.0.0.1")
-
-	for domain, records := range ts.records {
-		if !strings.HasSuffix(domain, target) {
-			continue
-		}
-
-		for recordType, values := range records {
-			for _, value := range values {
-				zone += fmt.Sprintf("%s.\tIN\t%s\t%s\n", domain, recordType, value)
-			}
-		}
-	}
-
-	return zone
-}
-
-func (ts *TestServer) pushNamedConf() {
-	contents := docker.NewBuildContext()
-	cfgPath := "/etc/bind/named.conf.options"
-	namedCfg := ts.buildNamedConf()
-	contents[cfgPath] = docker.PathContentsFromString(namedCfg)
-	contents[cfgPath].SetOwners(0, 142) // root, bind
-
-	ts.t.Logf("Generated bind9 config (%s):\n%v\n", cfgPath, namedCfg)
-
-	err := ts.runner.CopyTo(ts.startup.Container.ID, "/", contents)
-	require.NoError(ts.t, err, "failed pushing updated named.conf.options to container")
-}
-
-func (ts *TestServer) pushZoneFiles() {
-	contents := docker.NewBuildContext()
-
-	for _, domain := range ts.domains {
-		path := "/var/cache/bind/" + domain + ".zone"
-		zoneFile := ts.buildZoneFile(domain)
-		contents[path] = docker.PathContentsFromString(zoneFile)
-		contents[path].SetOwners(0, 142) // root, bind
-
-		ts.t.Logf("Generated bind9 zone file for %v (%s):\n%v\n", domain, path, zoneFile)
-	}
-
-	err := ts.runner.CopyTo(ts.startup.Container.ID, "/", contents)
-	require.NoError(ts.t, err, "failed pushing updated named.conf.options to container")
-}
-
-func (ts *TestServer) PushConfig() {
-	ts.lock.Lock()
-	defer ts.lock.Unlock()
-
-	// There's two cases here:
-	//
-	// 1. We've added a new top-level domain name. Here, we want to make
-	//    sure the new zone file is pushed before we push the reference
-	//    to it.
-	// 2. We've just added a new. Here, the order doesn't matter, but
-	//    mostly likely the second push will be a no-op.
-	ts.pushZoneFiles()
-	ts.pushNamedConf()
-
-	// Wait until our config has taken.
-	corehelpers.RetryUntil(ts.t, 15*time.Second, func() error {
-		// bind reloads based on file mtime, touch files before starting
-		// to make sure it has been updated more recently than when the
-		// last update was written. Then issue a new SIGHUP.
-		for _, domain := range ts.domains {
-			path := "/var/cache/bind/" + domain + ".zone"
-			touchCmd := []string{"touch", path}
-
-			_, _, _, err := ts.runner.RunCmdWithOutput(ts.ctx, ts.startup.Container.ID, touchCmd)
-			if err != nil {
-				return fmt.Errorf("failed to update zone mtime: %w", err)
-			}
-		}
-		ts.runner.DockerAPI.ContainerKill(ts.ctx, ts.startup.Container.ID, "SIGHUP")
-
-		// Connect to our bind resolver.
-		resolver := &net.Resolver{
-			PreferGo:     true,
-			StrictErrors: false,
-			Dial: func(ctx context.Context, network, address string) (net.Conn, error) {
-				d := net.Dialer{
-					Timeout: 10 * time.Second,
-				}
-				return d.DialContext(ctx, network, ts.GetLocalAddr())
-			},
-		}
-
-		// last domain has the given serial number, which also appears in the
-		// NS record so we can fetch it via Go.
-		lastDomain := ts.domains[len(ts.domains)-1]
-		records, err := resolver.LookupNS(ts.ctx, lastDomain)
-		if err != nil {
-			return fmt.Errorf("failed to lookup NS record for %v: %w", lastDomain, err)
-		}
-
-		if len(records) != 1 {
-			return fmt.Errorf("expected only 1 NS record for %v, got %v/%v", lastDomain, len(records), records)
-		}
-
-		expectedNS := fmt.Sprintf("ns%d.%v.", ts.serial, lastDomain)
-		if records[0].Host != expectedNS {
-			return fmt.Errorf("expected to find NS %v, got %v indicating reload hadn't completed", expectedNS, records[0])
-		}
-
-		return nil
-	})
-}
-
-func (ts *TestServer) GetLocalAddr() string {
-	return ts.startup.Config.Address()
-}
-
-func (ts *TestServer) GetRemoteAddr() string {
-	return fmt.Sprintf("%s:%d", ts.startup.StartResult.RealIP, 53)
-}
-
-func (ts *TestServer) AddDomain(domain string) {
-	ts.lock.Lock()
-	defer ts.lock.Unlock()
-
-	for _, existing := range ts.domains {
-		if existing == domain {
-			return
-		}
-	}
-
-	ts.domains = append(ts.domains, domain)
-}
-
-func (ts *TestServer) AddRecord(domain string, record string, value string) {
-	ts.lock.Lock()
-	defer ts.lock.Unlock()
-
-	foundDomain := false
-	for _, existing := range ts.domains {
-		if strings.HasSuffix(domain, existing) {
-			foundDomain = true
-			break
-		}
-	}
-	if !foundDomain {
-		ts.t.Fatalf("cannot add record %v/%v :: [%v] -- no domain zone matching (%v)", record, domain, value, ts.domains)
-	}
-
-	value = strings.TrimSpace(value)
-	if _, present := ts.records[domain]; !present {
-		ts.records[domain] = map[string][]string{}
-	}
-
-	if values, present := ts.records[domain][record]; present {
-		for _, candidate := range values {
-			if candidate == value {
-				// Already present; skip adding.
-				return
-			}
-		}
-	}
-
-	ts.records[domain][record] = append(ts.records[domain][record], value)
-}
-
-func (ts *TestServer) RemoveRecord(domain string, record string, value string) {
-	ts.lock.Lock()
-	defer ts.lock.Unlock()
-
-	foundDomain := false
-	for _, existing := range ts.domains {
-		if strings.HasSuffix(domain, existing) {
-			foundDomain = true
-			break
-		}
-	}
-	if !foundDomain {
-		// Not found.
-		return
-	}
-
-	value = strings.TrimSpace(value)
-	if _, present := ts.records[domain]; !present {
-		// Not found.
-		return
-	}
-
-	var remaining []string
-	if values, present := ts.records[domain][record]; present {
-		for _, candidate := range values {
-			if candidate != value {
-				remaining = append(remaining, candidate)
-			}
-		}
-	}
-
-	ts.records[domain][record] = remaining
-}
-
-func (ts *TestServer) RemoveRecordsOfTypeForDomain(domain string, record string) {
-	ts.lock.Lock()
-	defer ts.lock.Unlock()
-
-	foundDomain := false
-	for _, existing := range ts.domains {
-		if strings.HasSuffix(domain, existing) {
-			foundDomain = true
-			break
-		}
-	}
-	if !foundDomain {
-		// Not found.
-		return
-	}
-
-	if _, present := ts.records[domain]; !present {
-		// Not found.
-		return
-	}
-
-	delete(ts.records[domain], record)
-}
-
-func (ts *TestServer) RemoveRecordsForDomain(domain string) {
-	ts.lock.Lock()
-	defer ts.lock.Unlock()
-
-	foundDomain := false
-	for _, existing := range ts.domains {
-		if strings.HasSuffix(domain, existing) {
-			foundDomain = true
-			break
-		}
-	}
-	if !foundDomain {
-		// Not found.
-		return
-	}
-
-	if _, present := ts.records[domain]; !present {
-		// Not found.
-		return
-	}
-
-	ts.records[domain] = map[string][]string{}
-}
-
-func (ts *TestServer) RemoveAllRecords() {
-	ts.lock.Lock()
-	defer ts.lock.Unlock()
-
-	ts.records = map[string]map[string][]string{}
-}
-
-func (ts *TestServer) Cleanup() {
-	if ts.cleanup != nil {
-		ts.cleanup()
-	}
-	if ts.startup != nil && ts.startup.Cleanup != nil {
-		ts.startup.Cleanup()
-	}
-}
diff --git a/builtin/logical/pki/fields.go b/builtin/logical/pki/fields.go
index b29353985e216..a509cd0090db9 100644
--- a/builtin/logical/pki/fields.go
+++ b/builtin/logical/pki/fields.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pki
 
 import (
@@ -156,16 +153,6 @@ The value format should be given in UTC format YYYY-MM-ddTHH:MM:SSZ`,
 of the ca_chain field.`,
 	}
 
-	fields["user_ids"] = &framework.FieldSchema{
-		Type: framework.TypeCommaStringSlice,
-		Description: `The requested user_ids value to place in the subject,
-if any, in a comma-delimited list. Restricted by allowed_user_ids.
-Any values are added with OID 0.9.2342.19200300.100.1.1.`,
-		DisplayAttrs: &framework.DisplayAttributes{
-			Name: "User ID(s)",
-		},
-	}
-
 	fields = addIssuerRefField(fields)
 
 	return fields
@@ -468,47 +455,6 @@ on revocation entries. This helps increase the performance of CRL building
 and OCSP responses.`,
 	}
 
-	fields["tidy_expired_issuers"] = &framework.FieldSchema{
-		Type: framework.TypeBool,
-		Description: `Set to true to automatically remove expired issuers
-past the issuer_safety_buffer. No keys will be removed as part of this
-operation.`,
-	}
-
-	fields["tidy_move_legacy_ca_bundle"] = &framework.FieldSchema{
-		Type: framework.TypeBool,
-		Description: `Set to true to move the legacy ca_bundle from
-/config/ca_bundle to /config/ca_bundle.bak. This prevents downgrades
-to pre-Vault 1.11 versions (as older PKI engines do not know about
-the new multi-issuer storage layout), but improves the performance
-on seal wrapped PKI mounts. This will only occur if at least
-issuer_safety_buffer time has occurred after the initial storage
-migration.
-
-This backup is saved in case of an issue in future migrations.
-Operators may consider removing it via sys/raw if they desire.
-The backup will be removed via a DELETE /root call, but note that
-this removes ALL issuers within the mount (and is thus not desirable
-in most operational scenarios).`,
-	}
-
-	fields["tidy_acme"] = &framework.FieldSchema{
-		Type: framework.TypeBool,
-		Description: `Set to true to enable tidying ACME accounts,
-orders and authorizations.  ACME orders are tidied (deleted) 
-safety_buffer after the certificate associated with them expires,
-or after the order and relevant authorizations have expired if no 
-certificate was produced.  Authorizations are tidied with the 
-corresponding order.
-
-When a valid ACME Account is at least acme_account_safety_buffer
-old, and has no remaining orders associated with it, the account is
-marked as revoked.  After another acme_account_safety_buffer has 
-passed from the revocation or deactivation date, a revoked or 
-deactivated ACME account is deleted.`,
-		Default: false,
-	}
-
 	fields["safety_buffer"] = &framework.FieldSchema{
 		Type: framework.TypeDurationSecond,
 		Description: `The amount of extra time that must have passed
@@ -518,23 +464,6 @@ Defaults to 72 hours.`,
 		Default: int(defaultTidyConfig.SafetyBuffer / time.Second), // TypeDurationSecond currently requires defaults to be int
 	}
 
-	fields["issuer_safety_buffer"] = &framework.FieldSchema{
-		Type: framework.TypeDurationSecond,
-		Description: `The amount of extra time that must have passed
-beyond issuer's expiration before it is removed
-from the backend storage.
-Defaults to 8760 hours (1 year).`,
-		Default: int(defaultTidyConfig.IssuerSafetyBuffer / time.Second), // TypeDurationSecond currently requires defaults to be int
-	}
-
-	fields["acme_account_safety_buffer"] = &framework.FieldSchema{
-		Type: framework.TypeDurationSecond,
-		Description: `The amount of time that must pass after creation
-that an account with no orders is marked revoked, and the amount of time
-after being marked revoked or deactivated.`,
-		Default: int(defaultTidyConfig.AcmeAccountSafetyBuffer / time.Second), // TypeDurationSecond currently requires defaults to be int
-	}
-
 	fields["pause_duration"] = &framework.FieldSchema{
 		Type: framework.TypeString,
 		Description: `The amount of time to wait between processing
@@ -547,99 +476,5 @@ greater period of time. By default this is zero seconds.`,
 		Default: "0s",
 	}
 
-	fields["tidy_revocation_queue"] = &framework.FieldSchema{
-		Type: framework.TypeBool,
-		Description: `Set to true to remove stale revocation queue entries
-that haven't been confirmed by any active cluster. Only runs on the
-active primary node`,
-		Default: defaultTidyConfig.RevocationQueue,
-	}
-
-	fields["revocation_queue_safety_buffer"] = &framework.FieldSchema{
-		Type: framework.TypeDurationSecond,
-		Description: `The amount of time that must pass from the
-cross-cluster revocation request being initiated to when it will be
-slated for removal. Setting this too low may remove valid revocation
-requests before the owning cluster has a chance to process them,
-especially if the cluster is offline.`,
-		Default: int(defaultTidyConfig.QueueSafetyBuffer / time.Second), // TypeDurationSecond currently requires defaults to be int
-	}
-
-	fields["tidy_cross_cluster_revoked_certs"] = &framework.FieldSchema{
-		Type: framework.TypeBool,
-		Description: `Set to true to enable tidying up
-the cross-cluster revoked certificate store. Only runs on the active
-primary node.`,
-	}
-
-	return fields
-}
-
-// generate the entire list of schema fields we need for CSR sign verbatim, this is also
-// leveraged by ACME internally.
-func getCsrSignVerbatimSchemaFields() map[string]*framework.FieldSchema {
-	fields := map[string]*framework.FieldSchema{}
-	fields = addNonCACommonFields(fields)
-	fields = addSignVerbatimRoleFields(fields)
-
-	fields["csr"] = &framework.FieldSchema{
-		Type:    framework.TypeString,
-		Default: "",
-		Description: `PEM-format CSR to be signed. Values will be
-taken verbatim from the CSR, except for
-basic constraints.`,
-	}
-
-	return fields
-}
-
-// addSignVerbatimRoleFields provides the fields and defaults to be used by anything that is building up the fields
-// and their corresponding default values when generating/using a sign-verbatim type role such as buildSignVerbatimRole.
-func addSignVerbatimRoleFields(fields map[string]*framework.FieldSchema) map[string]*framework.FieldSchema {
-	fields["key_usage"] = &framework.FieldSchema{
-		Type:    framework.TypeCommaStringSlice,
-		Default: []string{"DigitalSignature", "KeyAgreement", "KeyEncipherment"},
-		Description: `A comma-separated string or list of key usages (not extended
-key usages). Valid values can be found at
-https://golang.org/pkg/crypto/x509/#KeyUsage
--- simply drop the "KeyUsage" part of the name.
-To remove all key usages from being set, set
-this value to an empty list.`,
-	}
-
-	fields["ext_key_usage"] = &framework.FieldSchema{
-		Type:    framework.TypeCommaStringSlice,
-		Default: []string{},
-		Description: `A comma-separated string or list of extended key usages. Valid values can be found at
-https://golang.org/pkg/crypto/x509/#ExtKeyUsage
--- simply drop the "ExtKeyUsage" part of the name.
-To remove all key usages from being set, set
-this value to an empty list.`,
-	}
-
-	fields["ext_key_usage_oids"] = &framework.FieldSchema{
-		Type:        framework.TypeCommaStringSlice,
-		Description: `A comma-separated string or list of extended key usage oids.`,
-	}
-
-	fields["signature_bits"] = &framework.FieldSchema{
-		Type:    framework.TypeInt,
-		Default: 0,
-		Description: `The number of bits to use in the signature
-algorithm; accepts 256 for SHA-2-256, 384 for SHA-2-384, and 512 for
-SHA-2-512. Defaults to 0 to automatically detect based on key length
-(SHA-2-256 for RSA keys, and matching the curve size for NIST P-Curves).`,
-		DisplayAttrs: &framework.DisplayAttributes{
-			Value: 0,
-		},
-	}
-
-	fields["use_pss"] = &framework.FieldSchema{
-		Type:    framework.TypeBool,
-		Default: false,
-		Description: `Whether or not to use PSS signatures when using a
-RSA key-type issuer. Defaults to false.`,
-	}
-
 	return fields
 }
diff --git a/builtin/logical/pki/integation_test.go b/builtin/logical/pki/integation_test.go
new file mode 100644
index 0000000000000..d71909981c6a1
--- /dev/null
+++ b/builtin/logical/pki/integation_test.go
@@ -0,0 +1,492 @@
+package pki
+
+import (
+	"context"
+	"crypto"
+	"crypto/ecdsa"
+	"crypto/ed25519"
+	"crypto/rsa"
+	"crypto/x509"
+	"encoding/pem"
+	"fmt"
+	"testing"
+
+	"github.com/hashicorp/vault/sdk/logical"
+	"github.com/stretchr/testify/require"
+)
+
+func TestIntegration_RotateRootUsesNext(t *testing.T) {
+	t.Parallel()
+	b, s := createBackendWithStorage(t)
+	resp, err := b.HandleRequest(context.Background(), &logical.Request{
+		Operation: logical.UpdateOperation,
+		Path:      "root/rotate/internal",
+		Storage:   s,
+		Data: map[string]interface{}{
+			"common_name": "test.com",
+		},
+		MountPoint: "pki/",
+	})
+	require.NoError(t, err, "failed rotate root")
+	require.NotNil(t, resp, "got nil response from rotate root")
+	require.False(t, resp.IsError(), "got an error from rotate root: %#v", resp)
+
+	issuerId1 := resp.Data["issuer_id"].(issuerID)
+	issuerName1 := resp.Data["issuer_name"]
+
+	require.NotEmpty(t, issuerId1, "issuer id was empty on initial rotate root command")
+	require.Equal(t, "next", issuerName1, "expected an issuer name of next on initial rotate root command")
+
+	// Call it again, we should get a new issuer id, but since next issuer_name is used we should get a blank value.
+	resp, err = b.HandleRequest(context.Background(), &logical.Request{
+		Operation: logical.UpdateOperation,
+		Path:      "root/rotate/internal",
+		Storage:   s,
+		Data: map[string]interface{}{
+			"common_name": "test.com",
+		},
+		MountPoint: "pki/",
+	})
+	require.NoError(t, err, "failed rotate root")
+	require.NotNil(t, resp, "got nil response from rotate root")
+	require.False(t, resp.IsError(), "got an error from rotate root: %#v", resp)
+
+	issuerId2 := resp.Data["issuer_id"].(issuerID)
+	issuerName2 := resp.Data["issuer_name"]
+
+	require.NotEmpty(t, issuerId2, "issuer id was empty on second rotate root command")
+	require.NotEqual(t, issuerId1, issuerId2, "should have been different issuer ids")
+	require.Empty(t, issuerName2, "expected a blank issuer name on the second rotate root command")
+
+	// Call it again, making sure we can use our own name if desired.
+	resp, err = b.HandleRequest(context.Background(), &logical.Request{
+		Operation: logical.UpdateOperation,
+		Path:      "root/rotate/internal",
+		Storage:   s,
+		Data: map[string]interface{}{
+			"common_name": "test.com",
+			"issuer_name": "next-cert",
+		},
+		MountPoint: "pki/",
+	})
+	require.NoError(t, err, "failed rotate root")
+	require.NotNil(t, resp, "got nil response from rotate root")
+	require.False(t, resp.IsError(), "got an error from rotate root: %#v", resp)
+
+	issuerId3 := resp.Data["issuer_id"].(issuerID)
+	issuerName3 := resp.Data["issuer_name"]
+
+	require.NotEmpty(t, issuerId3, "issuer id was empty on third rotate root command")
+	require.NotEqual(t, issuerId3, issuerId1, "should have been different issuer id from initial")
+	require.NotEqual(t, issuerId3, issuerId2, "should have been different issuer id from second call")
+	require.Equal(t, "next-cert", issuerName3, "expected an issuer name that we specified on third rotate root command")
+}
+
+func TestIntegration_ReplaceRootNormal(t *testing.T) {
+	t.Parallel()
+	b, s := createBackendWithStorage(t)
+
+	// generate roots
+	genTestRootCa(t, b, s)
+	issuerId2, _ := genTestRootCa(t, b, s)
+
+	resp, err := b.HandleRequest(context.Background(), &logical.Request{
+		Operation: logical.UpdateOperation,
+		Path:      "root/replace",
+		Storage:   s,
+		Data: map[string]interface{}{
+			"default": issuerId2.String(),
+		},
+		MountPoint: "pki/",
+	})
+	require.NoError(t, err, "failed replacing root")
+	require.NotNil(t, resp, "got nil response from replacing root")
+	require.False(t, resp.IsError(), "got an error from replacing root: %#v", resp)
+
+	replacedIssuer := resp.Data["default"]
+	require.Equal(t, issuerId2, replacedIssuer, "expected return value to match issuer we set")
+
+	resp, err = b.HandleRequest(context.Background(), &logical.Request{
+		Operation:  logical.ReadOperation,
+		Path:       "config/issuers",
+		Storage:    s,
+		MountPoint: "pki/",
+	})
+	require.NoError(t, err, "failed replacing root")
+	require.NotNil(t, resp, "got nil response from replacing root")
+	require.False(t, resp.IsError(), "got an error from replacing root: %#v", resp)
+
+	defaultIssuer := resp.Data["default"]
+	require.Equal(t, issuerId2, defaultIssuer, "expected default issuer to be updated")
+}
+
+func TestIntegration_ReplaceRootDefaultsToNext(t *testing.T) {
+	t.Parallel()
+	b, s := createBackendWithStorage(t)
+
+	// generate roots
+	genTestRootCa(t, b, s)
+	issuerId2, _ := genTestRootCaWithIssuerName(t, b, s, "next")
+
+	// Do not specify the default value to replace.
+	resp, err := b.HandleRequest(context.Background(), &logical.Request{
+		Operation:  logical.UpdateOperation,
+		Path:       "root/replace",
+		Storage:    s,
+		Data:       map[string]interface{}{},
+		MountPoint: "pki/",
+	})
+	require.NoError(t, err, "failed replacing root")
+	require.NotNil(t, resp, "got nil response from replacing root")
+	require.False(t, resp.IsError(), "got an error from replacing root: %#v", resp)
+
+	replacedIssuer := resp.Data["default"]
+	require.Equal(t, issuerId2, replacedIssuer, "expected return value to match the 'next' issuer we set")
+
+	resp, err = b.HandleRequest(context.Background(), &logical.Request{
+		Operation:  logical.ReadOperation,
+		Path:       "config/issuers",
+		Storage:    s,
+		MountPoint: "pki/",
+	})
+	require.NoError(t, err, "failed replacing root")
+	require.NotNil(t, resp, "got nil response from replacing root")
+	require.False(t, resp.IsError(), "got an error from replacing root: %#v", resp)
+
+	defaultIssuer := resp.Data["default"]
+	require.Equal(t, issuerId2, defaultIssuer, "expected default issuer to be updated")
+}
+
+func TestIntegration_ReplaceRootBadIssuer(t *testing.T) {
+	t.Parallel()
+	b, s := createBackendWithStorage(t)
+
+	// generate roots
+	genTestRootCa(t, b, s)
+	genTestRootCa(t, b, s)
+
+	resp, err := b.HandleRequest(context.Background(), &logical.Request{
+		Operation: logical.UpdateOperation,
+		Path:      "root/replace",
+		Storage:   s,
+		Data: map[string]interface{}{
+			"default": "a-bad-issuer-id",
+		},
+		MountPoint: "pki/",
+	})
+	require.NoError(t, err, "failed replacing root, should have been an error in the response.")
+	require.NotNil(t, resp, "got nil response from replacing root")
+	require.True(t, resp.IsError(), "did not get an error from replacing root: %#v", resp)
+
+	// Make sure we trap replacing with default.
+	resp, err = b.HandleRequest(context.Background(), &logical.Request{
+		Operation: logical.UpdateOperation,
+		Path:      "root/replace",
+		Storage:   s,
+		Data: map[string]interface{}{
+			"default": "default",
+		},
+		MountPoint: "pki/",
+	})
+	require.NoError(t, err, "failed replacing root, should have been an error in the response.")
+	require.NotNil(t, resp, "got nil response from replacing root")
+	require.True(t, resp.IsError(), "did not get an error from replacing root: %#v", resp)
+
+	// Make sure we trap replacing with blank string.
+	resp, err = b.HandleRequest(context.Background(), &logical.Request{
+		Operation: logical.UpdateOperation,
+		Path:      "root/replace",
+		Storage:   s,
+		Data: map[string]interface{}{
+			"default": "",
+		},
+		MountPoint: "pki/",
+	})
+	require.NoError(t, err, "failed replacing root, should have been an error in the response.")
+	require.NotNil(t, resp, "got nil response from replacing root")
+	require.True(t, resp.IsError(), "did not get an error from replacing root: %#v", resp)
+}
+
+func TestIntegration_SetSignedWithBackwardsPemBundles(t *testing.T) {
+	t.Parallel()
+	rootBackend, rootStorage := createBackendWithStorage(t)
+	intBackend, intStorage := createBackendWithStorage(t)
+
+	// generate root
+	resp, err := rootBackend.HandleRequest(context.Background(), &logical.Request{
+		Operation: logical.UpdateOperation,
+		Path:      "issuers/generate/root/internal",
+		Storage:   rootStorage,
+		Data: map[string]interface{}{
+			"common_name": "test.com",
+		},
+		MountPoint: "pki/",
+	})
+	require.NoError(t, err, "failed generating root ca")
+	require.NotNil(t, resp, "got nil response from generating root ca")
+	require.False(t, resp.IsError(), "got an error from generating root ca: %#v", resp)
+	rootCert := resp.Data["certificate"].(string)
+
+	// generate intermediate
+	resp, err = intBackend.HandleRequest(context.Background(), &logical.Request{
+		Operation: logical.UpdateOperation,
+		Path:      "issuers/generate/intermediate/internal",
+		Storage:   intStorage,
+		Data: map[string]interface{}{
+			"common_name": "test.com",
+		},
+		MountPoint: "pki-int/",
+	})
+	require.NoError(t, err, "failed generating int ca")
+	require.NotNil(t, resp, "got nil response from generating int ca")
+	require.False(t, resp.IsError(), "got an error from generating int ca: %#v", resp)
+	intCsr := resp.Data["csr"].(string)
+
+	// sign csr
+	resp, err = rootBackend.HandleRequest(context.Background(), &logical.Request{
+		Operation: logical.UpdateOperation,
+		Path:      "root/sign-intermediate",
+		Storage:   rootStorage,
+		Data: map[string]interface{}{
+			"csr":    intCsr,
+			"format": "pem_bundle",
+		},
+		MountPoint: "pki/",
+	})
+	require.NoError(t, err, "failed generating root ca")
+	require.NotNil(t, resp, "got nil response from generating root ca")
+	require.False(t, resp.IsError(), "got an error from generating root ca: %#v", resp)
+
+	intCert := resp.Data["certificate"].(string)
+
+	// Send in the chain backwards now and make sure we link intCert as default.
+	resp, err = intBackend.HandleRequest(context.Background(), &logical.Request{
+		Operation: logical.UpdateOperation,
+		Path:      "intermediate/set-signed",
+		Storage:   intStorage,
+		Data: map[string]interface{}{
+			"certificate": rootCert + "\n" + intCert + "\n",
+		},
+		MountPoint: "pki-int/",
+	})
+	require.NoError(t, err, "failed generating root ca")
+	require.NotNil(t, resp, "got nil response from generating root ca")
+	require.False(t, resp.IsError(), "got an error from generating root ca: %#v", resp)
+
+	// setup role
+	resp, err = intBackend.HandleRequest(context.Background(), &logical.Request{
+		Operation: logical.UpdateOperation,
+		Path:      "roles/example",
+		Storage:   intStorage,
+		Data: map[string]interface{}{
+			"allowed_domains":  "example.com",
+			"allow_subdomains": "true",
+			"max_ttl":          "1h",
+		},
+		MountPoint: "pki-int/",
+	})
+	require.NoError(t, err, "failed setting up role example")
+	require.Nil(t, resp, "got non-nil response from setting up role example: %#v", resp)
+
+	// Issue cert
+	resp, err = intBackend.HandleRequest(context.Background(), &logical.Request{
+		Operation: logical.UpdateOperation,
+		Path:      "issue/example",
+		Storage:   intStorage,
+		Data: map[string]interface{}{
+			"common_name": "test.example.com",
+			"ttl":         "5m",
+		},
+		MountPoint: "pki-int/",
+	})
+	require.NoError(t, err, "failed issuing a leaf cert from int ca")
+	require.NotNil(t, resp, "got nil response issuing a leaf cert from int ca")
+	require.False(t, resp.IsError(), "got an error issuing a leaf cert from int ca: %#v", resp)
+}
+
+func TestIntegration_CSRGeneration(t *testing.T) {
+	t.Parallel()
+	b, s := createBackendWithStorage(t)
+	testCases := []struct {
+		keyType               string
+		usePss                bool
+		keyBits               int
+		sigBits               int
+		expectedPublicKeyType crypto.PublicKey
+		expectedSignature     x509.SignatureAlgorithm
+	}{
+		{"rsa", false, 2048, 0, &rsa.PublicKey{}, x509.SHA256WithRSA},
+		{"rsa", false, 2048, 384, &rsa.PublicKey{}, x509.SHA384WithRSA},
+		// Add back once https://github.com/golang/go/issues/45990 is fixed.
+		// {"rsa", true, 2048, 0, &rsa.PublicKey{}, x509.SHA256WithRSAPSS},
+		// {"rsa", true, 2048, 512, &rsa.PublicKey{}, x509.SHA512WithRSAPSS},
+		{"ec", false, 224, 0, &ecdsa.PublicKey{}, x509.ECDSAWithSHA256},
+		{"ec", false, 256, 0, &ecdsa.PublicKey{}, x509.ECDSAWithSHA256},
+		{"ec", false, 384, 0, &ecdsa.PublicKey{}, x509.ECDSAWithSHA384},
+		{"ec", false, 521, 0, &ecdsa.PublicKey{}, x509.ECDSAWithSHA512},
+		{"ec", false, 521, 224, &ecdsa.PublicKey{}, x509.ECDSAWithSHA512}, // We ignore signature_bits for ec
+		{"ed25519", false, 0, 0, ed25519.PublicKey{}, x509.PureEd25519},   // We ignore both fields for ed25519
+	}
+	for _, tc := range testCases {
+		keyTypeName := tc.keyType
+		if tc.usePss {
+			keyTypeName = tc.keyType + "-pss"
+		}
+		testName := fmt.Sprintf("%s-%d-%d", keyTypeName, tc.keyBits, tc.sigBits)
+		t.Run(testName, func(t *testing.T) {
+			resp, err := CBWrite(b, s, "intermediate/generate/internal", map[string]interface{}{
+				"common_name":    "myint.com",
+				"key_type":       tc.keyType,
+				"key_bits":       tc.keyBits,
+				"signature_bits": tc.sigBits,
+				"use_pss":        tc.usePss,
+			})
+			requireSuccessNonNilResponse(t, resp, err)
+			requireFieldsSetInResp(t, resp, "csr")
+
+			csrString := resp.Data["csr"].(string)
+			pemBlock, _ := pem.Decode([]byte(csrString))
+			require.NotNil(t, pemBlock, "failed to parse returned csr pem block")
+			csr, err := x509.ParseCertificateRequest(pemBlock.Bytes)
+			require.NoError(t, err, "failed parsing certificate request")
+
+			require.Equal(t, tc.expectedSignature, csr.SignatureAlgorithm,
+				"Expected %s, got %s", tc.expectedSignature.String(), csr.SignatureAlgorithm.String())
+			require.IsType(t, tc.expectedPublicKeyType, csr.PublicKey)
+		})
+	}
+}
+
+func TestIntegration_AutoIssuer(t *testing.T) {
+	t.Parallel()
+	b, s := createBackendWithStorage(t)
+
+	// Generate two roots. The first should become default under the existing
+	// behavior; when we update the config and generate a second, it should
+	// take over as default. Deleting the first and re-importing it will make
+	// it default again, and then disabling the option and removing and
+	// reimporting the second and creating a new root won't affect it again.
+	resp, err := CBWrite(b, s, "root/generate/internal", map[string]interface{}{
+		"common_name": "Root X1",
+		"issuer_name": "root-1",
+		"key_type":    "ec",
+	})
+	requireSuccessNonNilResponse(t, resp, err)
+	issuerIdOne := resp.Data["issuer_id"]
+	require.NotEmpty(t, issuerIdOne)
+	certOne := resp.Data["certificate"]
+	require.NotEmpty(t, certOne)
+
+	resp, err = CBRead(b, s, "config/issuers")
+	requireSuccessNonNilResponse(t, resp, err)
+	require.Equal(t, issuerIdOne, resp.Data["default"])
+
+	// Enable the new config option.
+	_, err = CBWrite(b, s, "config/issuers", map[string]interface{}{
+		"default":                       issuerIdOne,
+		"default_follows_latest_issuer": true,
+	})
+	require.NoError(t, err)
+
+	// Now generate the second root; it should become default.
+	resp, err = CBWrite(b, s, "root/generate/internal", map[string]interface{}{
+		"common_name": "Root X2",
+		"issuer_name": "root-2",
+		"key_type":    "ec",
+	})
+	requireSuccessNonNilResponse(t, resp, err)
+	issuerIdTwo := resp.Data["issuer_id"]
+	require.NotEmpty(t, issuerIdTwo)
+	certTwo := resp.Data["certificate"]
+	require.NotEmpty(t, certTwo)
+
+	resp, err = CBRead(b, s, "config/issuers")
+	requireSuccessNonNilResponse(t, resp, err)
+	require.Equal(t, issuerIdTwo, resp.Data["default"])
+
+	// Deleting the first shouldn't affect the default issuer.
+	_, err = CBDelete(b, s, "issuer/root-1")
+	require.NoError(t, err)
+	resp, err = CBRead(b, s, "config/issuers")
+	requireSuccessNonNilResponse(t, resp, err)
+	require.Equal(t, issuerIdTwo, resp.Data["default"])
+
+	// But reimporting it should update it to the new issuer's value.
+	resp, err = CBWrite(b, s, "issuers/import/bundle", map[string]interface{}{
+		"pem_bundle": certOne,
+	})
+	requireSuccessNonNilResponse(t, resp, err)
+	issuerIdOneReimported := issuerID(resp.Data["imported_issuers"].([]string)[0])
+
+	resp, err = CBRead(b, s, "config/issuers")
+	requireSuccessNonNilResponse(t, resp, err)
+	require.Equal(t, issuerIdOneReimported, resp.Data["default"])
+
+	// Now update the config to disable this option again.
+	_, err = CBWrite(b, s, "config/issuers", map[string]interface{}{
+		"default":                       issuerIdOneReimported,
+		"default_follows_latest_issuer": false,
+	})
+	require.NoError(t, err)
+
+	// Generating a new root shouldn't update the default.
+	resp, err = CBWrite(b, s, "root/generate/internal", map[string]interface{}{
+		"common_name": "Root X3",
+		"issuer_name": "root-3",
+		"key_type":    "ec",
+	})
+	requireSuccessNonNilResponse(t, resp, err)
+	issuerIdThree := resp.Data["issuer_id"]
+	require.NotEmpty(t, issuerIdThree)
+
+	resp, err = CBRead(b, s, "config/issuers")
+	requireSuccessNonNilResponse(t, resp, err)
+	require.Equal(t, issuerIdOneReimported, resp.Data["default"])
+
+	// Deleting and re-importing root 2 should also not affect it.
+	_, err = CBDelete(b, s, "issuer/root-2")
+	require.NoError(t, err)
+	resp, err = CBRead(b, s, "config/issuers")
+	requireSuccessNonNilResponse(t, resp, err)
+	require.Equal(t, issuerIdOneReimported, resp.Data["default"])
+
+	resp, err = CBWrite(b, s, "issuers/import/bundle", map[string]interface{}{
+		"pem_bundle": certTwo,
+	})
+	requireSuccessNonNilResponse(t, resp, err)
+	require.Equal(t, 1, len(resp.Data["imported_issuers"].([]string)))
+	resp, err = CBRead(b, s, "config/issuers")
+	requireSuccessNonNilResponse(t, resp, err)
+	require.Equal(t, issuerIdOneReimported, resp.Data["default"])
+}
+
+func genTestRootCa(t *testing.T, b *backend, s logical.Storage) (issuerID, keyID) {
+	return genTestRootCaWithIssuerName(t, b, s, "")
+}
+
+func genTestRootCaWithIssuerName(t *testing.T, b *backend, s logical.Storage, issuerName string) (issuerID, keyID) {
+	data := map[string]interface{}{
+		"common_name": "test.com",
+	}
+	if len(issuerName) > 0 {
+		data["issuer_name"] = issuerName
+	}
+	resp, err := b.HandleRequest(context.Background(), &logical.Request{
+		Operation:  logical.UpdateOperation,
+		Path:       "issuers/generate/root/internal",
+		Storage:    s,
+		Data:       data,
+		MountPoint: "pki/",
+	})
+	require.NoError(t, err, "failed generating root ca")
+	require.NotNil(t, resp, "got nil response from generating root ca")
+	require.False(t, resp.IsError(), "got an error from generating root ca: %#v", resp)
+
+	issuerId := resp.Data["issuer_id"].(issuerID)
+	keyId := resp.Data["key_id"].(keyID)
+
+	require.NotEmpty(t, issuerId, "returned issuer id was empty")
+	require.NotEmpty(t, keyId, "returned key id was empty")
+
+	return issuerId, keyId
+}
diff --git a/builtin/logical/pki/integration_test.go b/builtin/logical/pki/integration_test.go
deleted file mode 100644
index f6e9ec6482593..0000000000000
--- a/builtin/logical/pki/integration_test.go
+++ /dev/null
@@ -1,669 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package pki
-
-import (
-	"context"
-	"crypto"
-	"crypto/ecdsa"
-	"crypto/ed25519"
-	"crypto/rsa"
-	"crypto/x509"
-	"encoding/pem"
-	"fmt"
-	"testing"
-
-	"github.com/hashicorp/vault/api"
-	vaulthttp "github.com/hashicorp/vault/http"
-	vaultocsp "github.com/hashicorp/vault/sdk/helper/ocsp"
-	"github.com/hashicorp/vault/sdk/helper/testhelpers/schema"
-	"github.com/hashicorp/vault/sdk/logical"
-	"github.com/hashicorp/vault/vault"
-
-	"github.com/hashicorp/go-hclog"
-	"github.com/stretchr/testify/require"
-)
-
-func TestIntegration_RotateRootUsesNext(t *testing.T) {
-	t.Parallel()
-	b, s := CreateBackendWithStorage(t)
-	resp, err := b.HandleRequest(context.Background(), &logical.Request{
-		Operation: logical.UpdateOperation,
-		Path:      "root/rotate/internal",
-		Storage:   s,
-		Data: map[string]interface{}{
-			"common_name": "test.com",
-		},
-		MountPoint: "pki/",
-	})
-	require.NoError(t, err, "failed rotate root")
-	require.NotNil(t, resp, "got nil response from rotate root")
-	require.False(t, resp.IsError(), "got an error from rotate root: %#v", resp)
-
-	issuerId1 := resp.Data["issuer_id"].(issuerID)
-	issuerName1 := resp.Data["issuer_name"]
-
-	require.NotEmpty(t, issuerId1, "issuer id was empty on initial rotate root command")
-	require.Equal(t, "next", issuerName1, "expected an issuer name of next on initial rotate root command")
-
-	// Call it again, we should get a new issuer id, but since next issuer_name is used we should get a blank value.
-	resp, err = b.HandleRequest(context.Background(), &logical.Request{
-		Operation: logical.UpdateOperation,
-		Path:      "root/rotate/internal",
-		Storage:   s,
-		Data: map[string]interface{}{
-			"common_name": "test.com",
-		},
-		MountPoint: "pki/",
-	})
-	require.NoError(t, err, "failed rotate root")
-	require.NotNil(t, resp, "got nil response from rotate root")
-	require.False(t, resp.IsError(), "got an error from rotate root: %#v", resp)
-
-	issuerId2 := resp.Data["issuer_id"].(issuerID)
-	issuerName2 := resp.Data["issuer_name"]
-
-	require.NotEmpty(t, issuerId2, "issuer id was empty on second rotate root command")
-	require.NotEqual(t, issuerId1, issuerId2, "should have been different issuer ids")
-	require.Empty(t, issuerName2, "expected a blank issuer name on the second rotate root command")
-
-	// Call it again, making sure we can use our own name if desired.
-	resp, err = b.HandleRequest(context.Background(), &logical.Request{
-		Operation: logical.UpdateOperation,
-		Path:      "root/rotate/internal",
-		Storage:   s,
-		Data: map[string]interface{}{
-			"common_name": "test.com",
-			"issuer_name": "next-cert",
-		},
-		MountPoint: "pki/",
-	})
-	require.NoError(t, err, "failed rotate root")
-	require.NotNil(t, resp, "got nil response from rotate root")
-	require.False(t, resp.IsError(), "got an error from rotate root: %#v", resp)
-
-	issuerId3 := resp.Data["issuer_id"].(issuerID)
-	issuerName3 := resp.Data["issuer_name"]
-
-	require.NotEmpty(t, issuerId3, "issuer id was empty on third rotate root command")
-	require.NotEqual(t, issuerId3, issuerId1, "should have been different issuer id from initial")
-	require.NotEqual(t, issuerId3, issuerId2, "should have been different issuer id from second call")
-	require.Equal(t, "next-cert", issuerName3, "expected an issuer name that we specified on third rotate root command")
-}
-
-func TestIntegration_ReplaceRootNormal(t *testing.T) {
-	t.Parallel()
-	b, s := CreateBackendWithStorage(t)
-
-	// generate roots
-	genTestRootCa(t, b, s)
-	issuerId2, _ := genTestRootCa(t, b, s)
-
-	resp, err := b.HandleRequest(context.Background(), &logical.Request{
-		Operation: logical.UpdateOperation,
-		Path:      "root/replace",
-		Storage:   s,
-		Data: map[string]interface{}{
-			"default": issuerId2.String(),
-		},
-		MountPoint: "pki/",
-	})
-	require.NoError(t, err, "failed replacing root")
-	require.NotNil(t, resp, "got nil response from replacing root")
-	require.False(t, resp.IsError(), "got an error from replacing root: %#v", resp)
-
-	replacedIssuer := resp.Data["default"]
-	require.Equal(t, issuerId2, replacedIssuer, "expected return value to match issuer we set")
-
-	resp, err = b.HandleRequest(context.Background(), &logical.Request{
-		Operation:  logical.ReadOperation,
-		Path:       "config/issuers",
-		Storage:    s,
-		MountPoint: "pki/",
-	})
-	require.NoError(t, err, "failed replacing root")
-	require.NotNil(t, resp, "got nil response from replacing root")
-	require.False(t, resp.IsError(), "got an error from replacing root: %#v", resp)
-
-	defaultIssuer := resp.Data["default"]
-	require.Equal(t, issuerId2, defaultIssuer, "expected default issuer to be updated")
-}
-
-func TestIntegration_ReplaceRootDefaultsToNext(t *testing.T) {
-	t.Parallel()
-	b, s := CreateBackendWithStorage(t)
-
-	// generate roots
-	genTestRootCa(t, b, s)
-	issuerId2, _ := genTestRootCaWithIssuerName(t, b, s, "next")
-
-	// Do not specify the default value to replace.
-	resp, err := b.HandleRequest(context.Background(), &logical.Request{
-		Operation:  logical.UpdateOperation,
-		Path:       "root/replace",
-		Storage:    s,
-		Data:       map[string]interface{}{},
-		MountPoint: "pki/",
-	})
-	require.NoError(t, err, "failed replacing root")
-	require.NotNil(t, resp, "got nil response from replacing root")
-	require.False(t, resp.IsError(), "got an error from replacing root: %#v", resp)
-
-	replacedIssuer := resp.Data["default"]
-	require.Equal(t, issuerId2, replacedIssuer, "expected return value to match the 'next' issuer we set")
-
-	resp, err = b.HandleRequest(context.Background(), &logical.Request{
-		Operation:  logical.ReadOperation,
-		Path:       "config/issuers",
-		Storage:    s,
-		MountPoint: "pki/",
-	})
-	require.NoError(t, err, "failed replacing root")
-	require.NotNil(t, resp, "got nil response from replacing root")
-	require.False(t, resp.IsError(), "got an error from replacing root: %#v", resp)
-
-	defaultIssuer := resp.Data["default"]
-	require.Equal(t, issuerId2, defaultIssuer, "expected default issuer to be updated")
-}
-
-func TestIntegration_ReplaceRootBadIssuer(t *testing.T) {
-	t.Parallel()
-	b, s := CreateBackendWithStorage(t)
-
-	// generate roots
-	genTestRootCa(t, b, s)
-	genTestRootCa(t, b, s)
-
-	resp, err := b.HandleRequest(context.Background(), &logical.Request{
-		Operation: logical.UpdateOperation,
-		Path:      "root/replace",
-		Storage:   s,
-		Data: map[string]interface{}{
-			"default": "a-bad-issuer-id",
-		},
-		MountPoint: "pki/",
-	})
-	require.NoError(t, err, "failed replacing root, should have been an error in the response.")
-	require.NotNil(t, resp, "got nil response from replacing root")
-	require.True(t, resp.IsError(), "did not get an error from replacing root: %#v", resp)
-
-	// Make sure we trap replacing with default.
-	resp, err = b.HandleRequest(context.Background(), &logical.Request{
-		Operation: logical.UpdateOperation,
-		Path:      "root/replace",
-		Storage:   s,
-		Data: map[string]interface{}{
-			"default": "default",
-		},
-		MountPoint: "pki/",
-	})
-	require.NoError(t, err, "failed replacing root, should have been an error in the response.")
-	require.NotNil(t, resp, "got nil response from replacing root")
-	require.True(t, resp.IsError(), "did not get an error from replacing root: %#v", resp)
-
-	// Make sure we trap replacing with blank string.
-	resp, err = b.HandleRequest(context.Background(), &logical.Request{
-		Operation: logical.UpdateOperation,
-		Path:      "root/replace",
-		Storage:   s,
-		Data: map[string]interface{}{
-			"default": "",
-		},
-		MountPoint: "pki/",
-	})
-	require.NoError(t, err, "failed replacing root, should have been an error in the response.")
-	require.NotNil(t, resp, "got nil response from replacing root")
-	require.True(t, resp.IsError(), "did not get an error from replacing root: %#v", resp)
-}
-
-func TestIntegration_SetSignedWithBackwardsPemBundles(t *testing.T) {
-	t.Parallel()
-	rootBackend, rootStorage := CreateBackendWithStorage(t)
-	intBackend, intStorage := CreateBackendWithStorage(t)
-
-	// generate root
-	resp, err := rootBackend.HandleRequest(context.Background(), &logical.Request{
-		Operation: logical.UpdateOperation,
-		Path:      "issuers/generate/root/internal",
-		Storage:   rootStorage,
-		Data: map[string]interface{}{
-			"common_name": "test.com",
-		},
-		MountPoint: "pki/",
-	})
-	require.NoError(t, err, "failed generating root ca")
-	require.NotNil(t, resp, "got nil response from generating root ca")
-	require.False(t, resp.IsError(), "got an error from generating root ca: %#v", resp)
-	rootCert := resp.Data["certificate"].(string)
-
-	// generate intermediate
-	resp, err = intBackend.HandleRequest(context.Background(), &logical.Request{
-		Operation: logical.UpdateOperation,
-		Path:      "issuers/generate/intermediate/internal",
-		Storage:   intStorage,
-		Data: map[string]interface{}{
-			"common_name": "test.com",
-		},
-		MountPoint: "pki-int/",
-	})
-	require.NoError(t, err, "failed generating int ca")
-	require.NotNil(t, resp, "got nil response from generating int ca")
-	require.False(t, resp.IsError(), "got an error from generating int ca: %#v", resp)
-	intCsr := resp.Data["csr"].(string)
-
-	// sign csr
-	resp, err = rootBackend.HandleRequest(context.Background(), &logical.Request{
-		Operation: logical.UpdateOperation,
-		Path:      "root/sign-intermediate",
-		Storage:   rootStorage,
-		Data: map[string]interface{}{
-			"csr":    intCsr,
-			"format": "pem_bundle",
-		},
-		MountPoint: "pki/",
-	})
-	require.NoError(t, err, "failed generating root ca")
-	require.NotNil(t, resp, "got nil response from generating root ca")
-	require.False(t, resp.IsError(), "got an error from generating root ca: %#v", resp)
-
-	intCert := resp.Data["certificate"].(string)
-
-	// Send in the chain backwards now and make sure we link intCert as default.
-	resp, err = intBackend.HandleRequest(context.Background(), &logical.Request{
-		Operation: logical.UpdateOperation,
-		Path:      "intermediate/set-signed",
-		Storage:   intStorage,
-		Data: map[string]interface{}{
-			"certificate": rootCert + "\n" + intCert + "\n",
-		},
-		MountPoint: "pki-int/",
-	})
-	require.NoError(t, err, "failed generating root ca")
-	require.NotNil(t, resp, "got nil response from generating root ca")
-	require.False(t, resp.IsError(), "got an error from generating root ca: %#v", resp)
-
-	// setup role
-	resp, err = intBackend.HandleRequest(context.Background(), &logical.Request{
-		Operation: logical.UpdateOperation,
-		Path:      "roles/example",
-		Storage:   intStorage,
-		Data: map[string]interface{}{
-			"allowed_domains":  "example.com",
-			"allow_subdomains": "true",
-			"max_ttl":          "1h",
-		},
-		MountPoint: "pki-int/",
-	})
-	require.NoError(t, err, "failed setting up role example")
-	require.NotNil(t, resp, "got nil response from setting up role example: %#v", resp)
-
-	// Issue cert
-	resp, err = intBackend.HandleRequest(context.Background(), &logical.Request{
-		Operation: logical.UpdateOperation,
-		Path:      "issue/example",
-		Storage:   intStorage,
-		Data: map[string]interface{}{
-			"common_name": "test.example.com",
-			"ttl":         "5m",
-		},
-		MountPoint: "pki-int/",
-	})
-	require.NoError(t, err, "failed issuing a leaf cert from int ca")
-	require.NotNil(t, resp, "got nil response issuing a leaf cert from int ca")
-	require.False(t, resp.IsError(), "got an error issuing a leaf cert from int ca: %#v", resp)
-}
-
-func TestIntegration_CSRGeneration(t *testing.T) {
-	t.Parallel()
-	b, s := CreateBackendWithStorage(t)
-	testCases := []struct {
-		keyType               string
-		usePss                bool
-		keyBits               int
-		sigBits               int
-		expectedPublicKeyType crypto.PublicKey
-		expectedSignature     x509.SignatureAlgorithm
-	}{
-		{"rsa", false, 2048, 0, &rsa.PublicKey{}, x509.SHA256WithRSA},
-		{"rsa", false, 2048, 384, &rsa.PublicKey{}, x509.SHA384WithRSA},
-		// Add back once https://github.com/golang/go/issues/45990 is fixed.
-		// {"rsa", true, 2048, 0, &rsa.PublicKey{}, x509.SHA256WithRSAPSS},
-		// {"rsa", true, 2048, 512, &rsa.PublicKey{}, x509.SHA512WithRSAPSS},
-		{"ec", false, 224, 0, &ecdsa.PublicKey{}, x509.ECDSAWithSHA256},
-		{"ec", false, 256, 0, &ecdsa.PublicKey{}, x509.ECDSAWithSHA256},
-		{"ec", false, 384, 0, &ecdsa.PublicKey{}, x509.ECDSAWithSHA384},
-		{"ec", false, 521, 0, &ecdsa.PublicKey{}, x509.ECDSAWithSHA512},
-		{"ec", false, 521, 224, &ecdsa.PublicKey{}, x509.ECDSAWithSHA512}, // We ignore signature_bits for ec
-		{"ed25519", false, 0, 0, ed25519.PublicKey{}, x509.PureEd25519},   // We ignore both fields for ed25519
-	}
-	for _, tc := range testCases {
-		keyTypeName := tc.keyType
-		if tc.usePss {
-			keyTypeName = tc.keyType + "-pss"
-		}
-		testName := fmt.Sprintf("%s-%d-%d", keyTypeName, tc.keyBits, tc.sigBits)
-		t.Run(testName, func(t *testing.T) {
-			resp, err := CBWrite(b, s, "intermediate/generate/internal", map[string]interface{}{
-				"common_name":    "myint.com",
-				"key_type":       tc.keyType,
-				"key_bits":       tc.keyBits,
-				"signature_bits": tc.sigBits,
-				"use_pss":        tc.usePss,
-			})
-			requireSuccessNonNilResponse(t, resp, err)
-			requireFieldsSetInResp(t, resp, "csr")
-
-			csrString := resp.Data["csr"].(string)
-			pemBlock, _ := pem.Decode([]byte(csrString))
-			require.NotNil(t, pemBlock, "failed to parse returned csr pem block")
-			csr, err := x509.ParseCertificateRequest(pemBlock.Bytes)
-			require.NoError(t, err, "failed parsing certificate request")
-
-			require.Equal(t, tc.expectedSignature, csr.SignatureAlgorithm,
-				"Expected %s, got %s", tc.expectedSignature.String(), csr.SignatureAlgorithm.String())
-			require.IsType(t, tc.expectedPublicKeyType, csr.PublicKey)
-		})
-	}
-}
-
-func TestIntegration_AutoIssuer(t *testing.T) {
-	t.Parallel()
-	b, s := CreateBackendWithStorage(t)
-
-	// Generate two roots. The first should become default under the existing
-	// behavior; when we update the config and generate a second, it should
-	// take over as default. Deleting the first and re-importing it will make
-	// it default again, and then disabling the option and removing and
-	// reimporting the second and creating a new root won't affect it again.
-	resp, err := CBWrite(b, s, "root/generate/internal", map[string]interface{}{
-		"common_name": "Root X1",
-		"issuer_name": "root-1",
-		"key_type":    "ec",
-	})
-
-	requireSuccessNonNilResponse(t, resp, err)
-	issuerIdOne := resp.Data["issuer_id"]
-	require.NotEmpty(t, issuerIdOne)
-	certOne := resp.Data["certificate"]
-	require.NotEmpty(t, certOne)
-
-	resp, err = CBRead(b, s, "config/issuers")
-	requireSuccessNonNilResponse(t, resp, err)
-	require.Equal(t, issuerIdOne, resp.Data["default"])
-
-	schema.ValidateResponse(t, schema.GetResponseSchema(t, b.Route("config/issuers"), logical.ReadOperation), resp, true)
-
-	// Enable the new config option.
-	resp, err = CBWrite(b, s, "config/issuers", map[string]interface{}{
-		"default":                       issuerIdOne,
-		"default_follows_latest_issuer": true,
-	})
-	require.NoError(t, err)
-	schema.ValidateResponse(t, schema.GetResponseSchema(t, b.Route("config/issuers"), logical.UpdateOperation), resp, true)
-
-	// Now generate the second root; it should become default.
-	resp, err = CBWrite(b, s, "root/generate/internal", map[string]interface{}{
-		"common_name": "Root X2",
-		"issuer_name": "root-2",
-		"key_type":    "ec",
-	})
-	requireSuccessNonNilResponse(t, resp, err)
-	issuerIdTwo := resp.Data["issuer_id"]
-	require.NotEmpty(t, issuerIdTwo)
-	certTwo := resp.Data["certificate"]
-	require.NotEmpty(t, certTwo)
-
-	resp, err = CBRead(b, s, "config/issuers")
-	requireSuccessNonNilResponse(t, resp, err)
-	require.Equal(t, issuerIdTwo, resp.Data["default"])
-
-	// Deleting the first shouldn't affect the default issuer.
-	_, err = CBDelete(b, s, "issuer/root-1")
-	require.NoError(t, err)
-	resp, err = CBRead(b, s, "config/issuers")
-	requireSuccessNonNilResponse(t, resp, err)
-	require.Equal(t, issuerIdTwo, resp.Data["default"])
-
-	// But reimporting it should update it to the new issuer's value.
-	resp, err = CBWrite(b, s, "issuers/import/bundle", map[string]interface{}{
-		"pem_bundle": certOne,
-	})
-	requireSuccessNonNilResponse(t, resp, err)
-	issuerIdOneReimported := issuerID(resp.Data["imported_issuers"].([]string)[0])
-
-	resp, err = CBRead(b, s, "config/issuers")
-	requireSuccessNonNilResponse(t, resp, err)
-	require.Equal(t, issuerIdOneReimported, resp.Data["default"])
-
-	// Now update the config to disable this option again.
-	_, err = CBWrite(b, s, "config/issuers", map[string]interface{}{
-		"default":                       issuerIdOneReimported,
-		"default_follows_latest_issuer": false,
-	})
-	require.NoError(t, err)
-
-	// Generating a new root shouldn't update the default.
-	resp, err = CBWrite(b, s, "root/generate/internal", map[string]interface{}{
-		"common_name": "Root X3",
-		"issuer_name": "root-3",
-		"key_type":    "ec",
-	})
-	requireSuccessNonNilResponse(t, resp, err)
-	issuerIdThree := resp.Data["issuer_id"]
-	require.NotEmpty(t, issuerIdThree)
-
-	resp, err = CBRead(b, s, "config/issuers")
-	requireSuccessNonNilResponse(t, resp, err)
-	require.Equal(t, issuerIdOneReimported, resp.Data["default"])
-
-	// Deleting and re-importing root 2 should also not affect it.
-	_, err = CBDelete(b, s, "issuer/root-2")
-	require.NoError(t, err)
-	resp, err = CBRead(b, s, "config/issuers")
-	requireSuccessNonNilResponse(t, resp, err)
-	require.Equal(t, issuerIdOneReimported, resp.Data["default"])
-
-	resp, err = CBWrite(b, s, "issuers/import/bundle", map[string]interface{}{
-		"pem_bundle": certTwo,
-	})
-	requireSuccessNonNilResponse(t, resp, err)
-	require.Equal(t, 1, len(resp.Data["imported_issuers"].([]string)))
-	resp, err = CBRead(b, s, "config/issuers")
-	requireSuccessNonNilResponse(t, resp, err)
-	require.Equal(t, issuerIdOneReimported, resp.Data["default"])
-}
-
-func TestIntegrationOCSPClientWithPKI(t *testing.T) {
-	t.Parallel()
-
-	coreConfig := &vault.CoreConfig{
-		LogicalBackends: map[string]logical.Factory{
-			"pki": Factory,
-		},
-	}
-	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
-		HandlerFunc: vaulthttp.Handler,
-	})
-
-	cluster.Start()
-	defer cluster.Cleanup()
-	cores := cluster.Cores
-	vault.TestWaitActive(t, cores[0].Core)
-	client := cores[0].Client
-
-	err := client.Sys().Mount("pki", &api.MountInput{
-		Type: "pki",
-		Config: api.MountConfigInput{
-			DefaultLeaseTTL: "16h",
-			MaxLeaseTTL:     "32h",
-		},
-	})
-	require.NoError(t, err)
-
-	resp, err := client.Logical().Write("pki/root/generate/internal", map[string]interface{}{
-		"ttl":         "40h",
-		"common_name": "Root R1",
-		"key_type":    "ec",
-	})
-	require.NoError(t, err)
-	require.NotNil(t, resp)
-	require.NotNil(t, resp.Data)
-	require.NotEmpty(t, resp.Data["issuer_id"])
-	rootIssuerId := resp.Data["issuer_id"].(string)
-
-	// Set URLs pointing to the issuer.
-	_, err = client.Logical().Write("pki/config/cluster", map[string]interface{}{
-		"path":     client.Address() + "/v1/pki",
-		"aia_path": client.Address() + "/v1/pki",
-	})
-	require.NoError(t, err)
-
-	_, err = client.Logical().Write("pki/config/urls", map[string]interface{}{
-		"enable_templating":       true,
-		"crl_distribution_points": "{{cluster_aia_path}}/issuer/{{issuer_id}}/crl/der",
-		"issuing_certificates":    "{{cluster_aia_path}}/issuer/{{issuer_id}}/der",
-		"ocsp_servers":            "{{cluster_aia_path}}/ocsp",
-	})
-	require.NoError(t, err)
-
-	// Build an intermediate CA
-	resp, err = client.Logical().Write("pki/intermediate/generate/internal", map[string]interface{}{
-		"common_name": "Int X1",
-		"key_type":    "ec",
-	})
-	require.NoError(t, err)
-	require.NotNil(t, resp)
-	require.NotNil(t, resp.Data)
-	require.NotEmpty(t, resp.Data["csr"])
-	intermediateCSR := resp.Data["csr"].(string)
-
-	resp, err = client.Logical().Write("pki/root/sign-intermediate", map[string]interface{}{
-		"csr": intermediateCSR,
-		"ttl": "20h",
-	})
-	require.NoError(t, err)
-	require.NotNil(t, resp)
-	require.NotNil(t, resp.Data)
-	require.NotEmpty(t, resp.Data["certificate"])
-	intermediateCert := resp.Data["certificate"]
-
-	resp, err = client.Logical().Write("pki/intermediate/set-signed", map[string]interface{}{
-		"certificate": intermediateCert,
-	})
-	require.NoError(t, err)
-	require.NotNil(t, resp)
-	require.NotNil(t, resp.Data)
-	require.NotEmpty(t, resp.Data["imported_issuers"])
-	rawImportedIssuers := resp.Data["imported_issuers"].([]interface{})
-	require.Equal(t, len(rawImportedIssuers), 1)
-	importedIssuer := rawImportedIssuers[0].(string)
-	require.NotEmpty(t, importedIssuer)
-
-	// Set intermediate as default.
-	_, err = client.Logical().Write("pki/config/issuers", map[string]interface{}{
-		"default": importedIssuer,
-	})
-	require.NoError(t, err)
-
-	// Setup roles for root, intermediate.
-	_, err = client.Logical().Write("pki/roles/example-root", map[string]interface{}{
-		"allowed_domains":  "example.com",
-		"allow_subdomains": "true",
-		"max_ttl":          "1h",
-		"key_type":         "ec",
-		"issuer_ref":       rootIssuerId,
-	})
-	require.NoError(t, err)
-
-	_, err = client.Logical().Write("pki/roles/example-int", map[string]interface{}{
-		"allowed_domains":  "example.com",
-		"allow_subdomains": "true",
-		"max_ttl":          "1h",
-		"key_type":         "ec",
-	})
-	require.NoError(t, err)
-
-	// Issue certs and validate them against OCSP.
-	for _, path := range []string{"pki/issue/example-int", "pki/issue/example-root"} {
-		t.Logf("Validating against path: %v", path)
-		resp, err = client.Logical().Write(path, map[string]interface{}{
-			"common_name": "test.example.com",
-			"ttl":         "5m",
-		})
-		require.NoError(t, err)
-		require.NotNil(t, resp)
-		require.NotNil(t, resp.Data)
-		require.NotEmpty(t, resp.Data["certificate"])
-		require.NotEmpty(t, resp.Data["issuing_ca"])
-		require.NotEmpty(t, resp.Data["serial_number"])
-
-		certPEM := resp.Data["certificate"].(string)
-		certBlock, _ := pem.Decode([]byte(certPEM))
-		require.NotNil(t, certBlock)
-		cert, err := x509.ParseCertificate(certBlock.Bytes)
-		require.NoError(t, err)
-		require.NotNil(t, cert)
-
-		issuerPEM := resp.Data["issuing_ca"].(string)
-		issuerBlock, _ := pem.Decode([]byte(issuerPEM))
-		require.NotNil(t, issuerBlock)
-		issuer, err := x509.ParseCertificate(issuerBlock.Bytes)
-		require.NoError(t, err)
-		require.NotNil(t, issuer)
-
-		serialNumber := resp.Data["serial_number"].(string)
-
-		testLogger := hclog.New(hclog.DefaultOptions)
-
-		conf := &vaultocsp.VerifyConfig{
-			OcspFailureMode: vaultocsp.FailOpenFalse,
-			ExtraCas:        []*x509.Certificate{cluster.CACert},
-		}
-		ocspClient := vaultocsp.New(func() hclog.Logger {
-			return testLogger
-		}, 10)
-
-		err = ocspClient.VerifyLeafCertificate(context.Background(), cert, issuer, conf)
-		require.NoError(t, err)
-
-		_, err = client.Logical().Write("pki/revoke", map[string]interface{}{
-			"serial_number": serialNumber,
-		})
-		require.NoError(t, err)
-
-		err = ocspClient.VerifyLeafCertificate(context.Background(), cert, issuer, conf)
-		require.Error(t, err)
-	}
-}
-
-func genTestRootCa(t *testing.T, b *backend, s logical.Storage) (issuerID, keyID) {
-	return genTestRootCaWithIssuerName(t, b, s, "")
-}
-
-func genTestRootCaWithIssuerName(t *testing.T, b *backend, s logical.Storage, issuerName string) (issuerID, keyID) {
-	data := map[string]interface{}{
-		"common_name": "test.com",
-	}
-	if len(issuerName) > 0 {
-		data["issuer_name"] = issuerName
-	}
-	resp, err := b.HandleRequest(context.Background(), &logical.Request{
-		Operation:  logical.UpdateOperation,
-		Path:       "issuers/generate/root/internal",
-		Storage:    s,
-		Data:       data,
-		MountPoint: "pki/",
-	})
-	require.NoError(t, err, "failed generating root ca")
-	require.NotNil(t, resp, "got nil response from generating root ca")
-	require.False(t, resp.IsError(), "got an error from generating root ca: %#v", resp)
-
-	issuerId := resp.Data["issuer_id"].(issuerID)
-	keyId := resp.Data["key_id"].(keyID)
-
-	require.NotEmpty(t, issuerId, "returned issuer id was empty")
-	require.NotEmpty(t, keyId, "returned key id was empty")
-
-	return issuerId, keyId
-}
diff --git a/builtin/logical/pki/key_util.go b/builtin/logical/pki/key_util.go
index 5f2d19c65dad4..c40831714625e 100644
--- a/builtin/logical/pki/key_util.go
+++ b/builtin/logical/pki/key_util.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pki
 
 import (
diff --git a/builtin/logical/pki/managed_key_util.go b/builtin/logical/pki/managed_key_util.go
index 42e031deceb31..29ab43381329e 100644
--- a/builtin/logical/pki/managed_key_util.go
+++ b/builtin/logical/pki/managed_key_util.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !enterprise
 
 package pki
diff --git a/builtin/logical/pki/path_acme_account.go b/builtin/logical/pki/path_acme_account.go
deleted file mode 100644
index 36801df151bff..0000000000000
--- a/builtin/logical/pki/path_acme_account.go
+++ /dev/null
@@ -1,474 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package pki
-
-import (
-	"fmt"
-	"net/http"
-	"path"
-	"strings"
-	"time"
-
-	"github.com/hashicorp/go-secure-stdlib/strutil"
-
-	"github.com/hashicorp/vault/sdk/framework"
-	"github.com/hashicorp/vault/sdk/logical"
-)
-
-func uuidNameRegex(name string) string {
-	return fmt.Sprintf("(?P<%s>[[:alnum:]]{8}-[[:alnum:]]{4}-[[:alnum:]]{4}-[[:alnum:]]{4}-[[:alnum:]]{12}?)", name)
-}
-
-func pathAcmeNewAccount(b *backend) []*framework.Path {
-	return buildAcmeFrameworkPaths(b, patternAcmeNewAccount, "/new-account")
-}
-
-func pathAcmeUpdateAccount(b *backend) []*framework.Path {
-	return buildAcmeFrameworkPaths(b, patternAcmeNewAccount, "/account/"+uuidNameRegex("kid"))
-}
-
-func addFieldsForACMEPath(fields map[string]*framework.FieldSchema, pattern string) map[string]*framework.FieldSchema {
-	if strings.Contains(pattern, framework.GenericNameRegex("role")) {
-		fields["role"] = &framework.FieldSchema{
-			Type:        framework.TypeString,
-			Description: `The desired role for the acme request`,
-			Required:    true,
-		}
-	}
-	if strings.Contains(pattern, framework.GenericNameRegex(issuerRefParam)) {
-		fields[issuerRefParam] = &framework.FieldSchema{
-			Type:        framework.TypeString,
-			Description: `Reference to an existing issuer name or issuer id`,
-			Required:    true,
-		}
-	}
-
-	return fields
-}
-
-func addFieldsForACMERequest(fields map[string]*framework.FieldSchema) map[string]*framework.FieldSchema {
-	fields["protected"] = &framework.FieldSchema{
-		Type:        framework.TypeString,
-		Description: "ACME request 'protected' value",
-		Required:    false,
-	}
-
-	fields["payload"] = &framework.FieldSchema{
-		Type:        framework.TypeString,
-		Description: "ACME request 'payload' value",
-		Required:    false,
-	}
-
-	fields["signature"] = &framework.FieldSchema{
-		Type:        framework.TypeString,
-		Description: "ACME request 'signature' value",
-		Required:    false,
-	}
-
-	return fields
-}
-
-func addFieldsForACMEKidRequest(fields map[string]*framework.FieldSchema, pattern string) map[string]*framework.FieldSchema {
-	if strings.Contains(pattern, uuidNameRegex("kid")) {
-		fields["kid"] = &framework.FieldSchema{
-			Type:        framework.TypeString,
-			Description: `The key identifier provided by the CA`,
-			Required:    true,
-		}
-	}
-
-	return fields
-}
-
-func patternAcmeNewAccount(b *backend, pattern string) *framework.Path {
-	fields := map[string]*framework.FieldSchema{}
-	addFieldsForACMEPath(fields, pattern)
-	addFieldsForACMERequest(fields)
-	addFieldsForACMEKidRequest(fields, pattern)
-
-	return &framework.Path{
-		Pattern: pattern,
-		Fields:  fields,
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.UpdateOperation: &framework.PathOperation{
-				Callback:                    b.acmeParsedWrapper(b.acmeNewAccountHandler),
-				ForwardPerformanceSecondary: false,
-				ForwardPerformanceStandby:   true,
-			},
-		},
-
-		HelpSynopsis:    pathAcmeHelpSync,
-		HelpDescription: pathAcmeHelpDesc,
-	}
-}
-
-func (b *backend) acmeNewAccountHandler(acmeCtx *acmeContext, r *logical.Request, fields *framework.FieldData, userCtx *jwsCtx, data map[string]interface{}) (*logical.Response, error) {
-	// Parameters
-	var ok bool
-	var onlyReturnExisting bool
-	var contacts []string
-	var termsOfServiceAgreed bool
-	var status string
-	var eabData map[string]interface{}
-
-	rawContact, present := data["contact"]
-	if present {
-		listContact, ok := rawContact.([]interface{})
-		if !ok {
-			return nil, fmt.Errorf("invalid type (%T) for field 'contact': %w", rawContact, ErrMalformed)
-		}
-
-		for index, singleContact := range listContact {
-			contact, ok := singleContact.(string)
-			if !ok {
-				return nil, fmt.Errorf("invalid type (%T) for field 'contact' item %d: %w", singleContact, index, ErrMalformed)
-			}
-
-			contacts = append(contacts, contact)
-		}
-	}
-
-	rawTermsOfServiceAgreed, present := data["termsOfServiceAgreed"]
-	if present {
-		termsOfServiceAgreed, ok = rawTermsOfServiceAgreed.(bool)
-		if !ok {
-			return nil, fmt.Errorf("invalid type (%T) for field 'termsOfServiceAgreed': %w", rawTermsOfServiceAgreed, ErrMalformed)
-		}
-	}
-
-	rawOnlyReturnExisting, present := data["onlyReturnExisting"]
-	if present {
-		onlyReturnExisting, ok = rawOnlyReturnExisting.(bool)
-		if !ok {
-			return nil, fmt.Errorf("invalid type (%T) for field 'onlyReturnExisting': %w", rawOnlyReturnExisting, ErrMalformed)
-		}
-	}
-
-	// Per RFC 8555 7.3.6 Account deactivation, we will handle it within our update API.
-	rawStatus, present := data["status"]
-	if present {
-		status, ok = rawStatus.(string)
-		if !ok {
-			return nil, fmt.Errorf("invalid type (%T) for field 'onlyReturnExisting': %w", rawOnlyReturnExisting, ErrMalformed)
-		}
-	}
-
-	if eabDataRaw, ok := data["externalAccountBinding"]; ok {
-		eabData, ok = eabDataRaw.(map[string]interface{})
-		if !ok {
-			return nil, fmt.Errorf("%w: externalAccountBinding field was unparseable", ErrMalformed)
-		}
-	}
-
-	// We have two paths here: search or create.
-	if onlyReturnExisting {
-		return b.acmeAccountSearchHandler(acmeCtx, userCtx)
-	}
-
-	// Pass through the /new-account API calls to this specific handler as its requirements are different
-	// from the account update handler.
-	if strings.HasSuffix(r.Path, "/new-account") {
-		return b.acmeNewAccountCreateHandler(acmeCtx, userCtx, contacts, termsOfServiceAgreed, r, eabData)
-	}
-
-	return b.acmeNewAccountUpdateHandler(acmeCtx, userCtx, contacts, status, eabData)
-}
-
-func formatNewAccountResponse(acmeCtx *acmeContext, acct *acmeAccount, eabData map[string]interface{}) *logical.Response {
-	resp := formatAccountResponse(acmeCtx, acct)
-
-	// Per RFC 8555 Section 7.1.2.  Account Objects
-	// Including this field in a newAccount request indicates approval by
-	// the holder of an existing non-ACME account to bind that account to
-	// this ACME account
-	if acct.Eab != nil && len(eabData) != 0 {
-		resp.Data["externalAccountBinding"] = eabData
-	}
-
-	return resp
-}
-
-func formatAccountResponse(acmeCtx *acmeContext, acct *acmeAccount) *logical.Response {
-	location := acmeCtx.baseUrl.String() + "account/" + acct.KeyId
-
-	resp := &logical.Response{
-		Data: map[string]interface{}{
-			"status": acct.Status,
-			"orders": location + "/orders",
-		},
-		Headers: map[string][]string{
-			"Location": {location},
-		},
-	}
-
-	if len(acct.Contact) > 0 {
-		resp.Data["contact"] = acct.Contact
-	}
-
-	return resp
-}
-
-func (b *backend) acmeAccountSearchHandler(acmeCtx *acmeContext, userCtx *jwsCtx) (*logical.Response, error) {
-	thumbprint, err := userCtx.GetKeyThumbprint()
-	if err != nil {
-		return nil, fmt.Errorf("failed generating thumbprint for key: %w", err)
-	}
-
-	account, err := b.acmeState.LoadAccountByKey(acmeCtx, thumbprint)
-	if err != nil {
-		return nil, fmt.Errorf("failed to load account by thumbprint: %w", err)
-	}
-
-	if account != nil {
-		if err = acmeCtx.eabPolicy.EnforceForExistingAccount(account); err != nil {
-			return nil, err
-		}
-		return formatAccountResponse(acmeCtx, account), nil
-	}
-
-	// Per RFC 8555 Section 7.3.1. Finding an Account URL Given a Key:
-	//
-	// > If a client sends such a request and an account does not exist,
-	// > then the server MUST return an error response with status code
-	// > 400 (Bad Request) and type "urn:ietf:params:acme:error:accountDoesNotExist".
-	return nil, fmt.Errorf("An account with this key does not exist: %w", ErrAccountDoesNotExist)
-}
-
-func (b *backend) acmeNewAccountCreateHandler(acmeCtx *acmeContext, userCtx *jwsCtx, contact []string, termsOfServiceAgreed bool, r *logical.Request, eabData map[string]interface{}) (*logical.Response, error) {
-	if userCtx.Existing {
-		return nil, fmt.Errorf("cannot submit to newAccount with 'kid': %w", ErrMalformed)
-	}
-
-	// If the account already exists, return the existing one.
-	thumbprint, err := userCtx.GetKeyThumbprint()
-	if err != nil {
-		return nil, fmt.Errorf("failed generating thumbprint for key: %w", err)
-	}
-
-	accountByKey, err := b.acmeState.LoadAccountByKey(acmeCtx, thumbprint)
-	if err != nil {
-		return nil, fmt.Errorf("failed to load account by thumbprint: %w", err)
-	}
-
-	if accountByKey != nil {
-		if err = acmeCtx.eabPolicy.EnforceForExistingAccount(accountByKey); err != nil {
-			return nil, err
-		}
-		return formatAccountResponse(acmeCtx, accountByKey), nil
-	}
-
-	var eab *eabType
-	if len(eabData) != 0 {
-		eab, err = verifyEabPayload(b.acmeState, acmeCtx, userCtx, r.Path, eabData)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	// Verify against our EAB policy
-	if err = acmeCtx.eabPolicy.EnforceForNewAccount(eab); err != nil {
-		return nil, err
-	}
-
-	// TODO: Limit this only when ToS are required or set by the operator, since we don't have a
-	//       ToS URL in the directory at the moment, we can not enforce this.
-	//if !termsOfServiceAgreed {
-	//	return nil, fmt.Errorf("terms of service not agreed to: %w", ErrUserActionRequired)
-	//}
-
-	if eab != nil {
-		// We delete the EAB to prevent future re-use after associating it with an account, worst
-		// case if we fail creating the account we simply nuked the EAB which they can create another
-		// and retry
-		wasDeleted, err := b.acmeState.DeleteEab(acmeCtx.sc, eab.KeyID)
-		if err != nil {
-			return nil, fmt.Errorf("failed to delete eab reference: %w", err)
-		}
-
-		if !wasDeleted {
-			// Something consumed our EAB before we did bail...
-			return nil, fmt.Errorf("eab was already used: %w", ErrUnauthorized)
-		}
-	}
-
-	b.acmeAccountLock.RLock() // Prevents Account Creation and Tidy Interfering
-	defer b.acmeAccountLock.RUnlock()
-
-	accountByKid, err := b.acmeState.CreateAccount(acmeCtx, userCtx, contact, termsOfServiceAgreed, eab)
-	if err != nil {
-		if eab != nil {
-			return nil, fmt.Errorf("failed to create account: %w; the EAB key used for this request has been deleted as a result of this operation; fetch a new EAB key before retrying", err)
-		}
-		return nil, fmt.Errorf("failed to create account: %w", err)
-	}
-
-	resp := formatNewAccountResponse(acmeCtx, accountByKid, eabData)
-
-	// Per RFC 8555 Section 7.3. Account Management:
-	//
-	// > The server returns this account object in a 201 (Created) response,
-	// > with the account URL in a Location header field.
-	resp.Data[logical.HTTPStatusCode] = http.StatusCreated
-	return resp, nil
-}
-
-func (b *backend) acmeNewAccountUpdateHandler(acmeCtx *acmeContext, userCtx *jwsCtx, contact []string, status string, eabData map[string]interface{}) (*logical.Response, error) {
-	if !userCtx.Existing {
-		return nil, fmt.Errorf("cannot submit to account updates without a 'kid': %w", ErrMalformed)
-	}
-
-	if len(eabData) != 0 {
-		return nil, fmt.Errorf("%w: not allowed to update EAB data in accounts", ErrMalformed)
-	}
-
-	account, err := b.acmeState.LoadAccount(acmeCtx, userCtx.Kid)
-	if err != nil {
-		return nil, fmt.Errorf("error loading account: %w", err)
-	}
-
-	if err = acmeCtx.eabPolicy.EnforceForExistingAccount(account); err != nil {
-		return nil, err
-	}
-
-	// Per RFC 8555 7.3.6 Account deactivation, if we were previously deactivated, we should return
-	// unauthorized. There is no way to reactivate any accounts per ACME RFC.
-	if account.Status != AccountStatusValid {
-		// Treating "revoked" and "deactivated" as the same here.
-		return nil, ErrUnauthorized
-	}
-
-	shouldUpdate := false
-	// Check to see if we should update, we don't really care about ordering
-	if !strutil.EquivalentSlices(account.Contact, contact) {
-		shouldUpdate = true
-		account.Contact = contact
-	}
-
-	// Check to process account de-activation status was requested.
-	// 7.3.6. Account Deactivation
-	if string(AccountStatusDeactivated) == status {
-		shouldUpdate = true
-		// TODO: This should cancel any ongoing operations (do not revoke certs),
-		//       perhaps we should delete this account here?
-		account.Status = AccountStatusDeactivated
-		account.AccountRevokedDate = time.Now()
-	}
-
-	if shouldUpdate {
-		err = b.acmeState.UpdateAccount(acmeCtx, account)
-		if err != nil {
-			return nil, fmt.Errorf("failed to update account: %w", err)
-		}
-	}
-
-	resp := formatAccountResponse(acmeCtx, account)
-	return resp, nil
-}
-
-func (b *backend) tidyAcmeAccountByThumbprint(as *acmeState, ac *acmeContext, keyThumbprint string, certTidyBuffer, accountTidyBuffer time.Duration) error {
-	thumbprintEntry, err := ac.sc.Storage.Get(ac.sc.Context, path.Join(acmeThumbprintPrefix, keyThumbprint))
-	if err != nil {
-		return fmt.Errorf("error retrieving thumbprint entry %v, unable to find corresponding account entry: %w", keyThumbprint, err)
-	}
-	if thumbprintEntry == nil {
-		return fmt.Errorf("empty thumbprint entry %v, unable to find corresponding account entry", keyThumbprint)
-	}
-
-	var thumbprint acmeThumbprint
-	err = thumbprintEntry.DecodeJSON(&thumbprint)
-	if err != nil {
-		return fmt.Errorf("unable to decode thumbprint entry %v to find account entry: %w", keyThumbprint, err)
-	}
-
-	if len(thumbprint.Kid) == 0 {
-		return fmt.Errorf("unable to find account entry: empty kid within thumbprint entry: %s", keyThumbprint)
-	}
-
-	// Now Get the Account:
-	accountEntry, err := ac.sc.Storage.Get(ac.sc.Context, acmeAccountPrefix+thumbprint.Kid)
-	if err != nil {
-		return err
-	}
-	if accountEntry == nil {
-		// We delete the Thumbprint Associated with the Account, and we are done
-		err = ac.sc.Storage.Delete(ac.sc.Context, path.Join(acmeThumbprintPrefix, keyThumbprint))
-		if err != nil {
-			return err
-		}
-		b.tidyStatusIncDeletedAcmeAccountCount()
-		return nil
-	}
-
-	var account acmeAccount
-	err = accountEntry.DecodeJSON(&account)
-	if err != nil {
-		return err
-	}
-
-	// Tidy Orders On the Account
-	orderIds, err := as.ListOrderIds(ac, thumbprint.Kid)
-	if err != nil {
-		return err
-	}
-	allOrdersTidied := true
-	maxCertExpiryUpdated := false
-	for _, orderId := range orderIds {
-		wasTidied, orderExpiry, err := b.acmeTidyOrder(ac, thumbprint.Kid, getOrderPath(thumbprint.Kid, orderId), certTidyBuffer)
-		if err != nil {
-			return err
-		}
-		if !wasTidied {
-			allOrdersTidied = false
-		}
-
-		if !orderExpiry.IsZero() && account.MaxCertExpiry.Before(orderExpiry) {
-			account.MaxCertExpiry = orderExpiry
-			maxCertExpiryUpdated = true
-		}
-	}
-
-	now := time.Now()
-	if allOrdersTidied &&
-		now.After(account.AccountCreatedDate.Add(accountTidyBuffer)) &&
-		now.After(account.MaxCertExpiry.Add(accountTidyBuffer)) {
-		// Tidy this account
-		// If it is Revoked or Deactivated:
-		if (account.Status == AccountStatusRevoked || account.Status == AccountStatusDeactivated) && now.After(account.AccountRevokedDate.Add(accountTidyBuffer)) {
-			// We Delete the Account Associated with this Thumbprint:
-			err = ac.sc.Storage.Delete(ac.sc.Context, path.Join(acmeAccountPrefix, thumbprint.Kid))
-			if err != nil {
-				return err
-			}
-
-			// Now we delete the Thumbprint Associated with the Account:
-			err = ac.sc.Storage.Delete(ac.sc.Context, path.Join(acmeThumbprintPrefix, keyThumbprint))
-			if err != nil {
-				return err
-			}
-			b.tidyStatusIncDeletedAcmeAccountCount()
-		} else if account.Status == AccountStatusValid {
-			// Revoke This Account
-			account.AccountRevokedDate = now
-			account.Status = AccountStatusRevoked
-			err := as.UpdateAccount(ac, &account)
-			if err != nil {
-				return err
-			}
-			b.tidyStatusIncRevAcmeAccountCount()
-		}
-	}
-
-	// Only update the account if we modified the max cert expiry values and the account is still valid,
-	// to prevent us from adding back a deleted account or not re-writing the revoked account that was
-	// already written above.
-	if maxCertExpiryUpdated && account.Status == AccountStatusValid {
-		// Update our expiry time we previously setup.
-		err := as.UpdateAccount(ac, &account)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/builtin/logical/pki/path_acme_authorizations.go b/builtin/logical/pki/path_acme_authorizations.go
deleted file mode 100644
index 9914491f619ee..0000000000000
--- a/builtin/logical/pki/path_acme_authorizations.go
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package pki
-
-import (
-	"fmt"
-
-	"github.com/hashicorp/vault/sdk/framework"
-	"github.com/hashicorp/vault/sdk/logical"
-)
-
-func pathAcmeAuthorization(b *backend) []*framework.Path {
-	return buildAcmeFrameworkPaths(b, patternAcmeAuthorization, "/authorization/"+framework.MatchAllRegex("auth_id"))
-}
-
-func addFieldsForACMEAuthorization(fields map[string]*framework.FieldSchema) map[string]*framework.FieldSchema {
-	fields["auth_id"] = &framework.FieldSchema{
-		Type:        framework.TypeString,
-		Description: "ACME authorization identifier value",
-		Required:    true,
-	}
-
-	return fields
-}
-
-func patternAcmeAuthorization(b *backend, pattern string) *framework.Path {
-	fields := map[string]*framework.FieldSchema{}
-	addFieldsForACMEPath(fields, pattern)
-	addFieldsForACMERequest(fields)
-	addFieldsForACMEAuthorization(fields)
-
-	return &framework.Path{
-		Pattern: pattern,
-		Fields:  fields,
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.UpdateOperation: &framework.PathOperation{
-				Callback:                    b.acmeAccountRequiredWrapper(b.acmeAuthorizationHandler),
-				ForwardPerformanceSecondary: false,
-				ForwardPerformanceStandby:   true,
-			},
-		},
-
-		HelpSynopsis:    pathAcmeHelpSync,
-		HelpDescription: pathAcmeHelpDesc,
-	}
-}
-
-func (b *backend) acmeAuthorizationHandler(acmeCtx *acmeContext, r *logical.Request, fields *framework.FieldData, userCtx *jwsCtx, data map[string]interface{}, _ *acmeAccount) (*logical.Response, error) {
-	authId := fields.Get("auth_id").(string)
-	authz, err := b.acmeState.LoadAuthorization(acmeCtx, userCtx, authId)
-	if err != nil {
-		return nil, fmt.Errorf("failed to load authorization: %w", err)
-	}
-
-	var status string
-	rawStatus, haveStatus := data["status"]
-	if haveStatus {
-		var ok bool
-		status, ok = rawStatus.(string)
-		if !ok {
-			return nil, fmt.Errorf("bad type (%T) for value 'status': %w", rawStatus, ErrMalformed)
-		}
-	}
-
-	if len(data) == 0 {
-		return b.acmeAuthorizationFetchHandler(acmeCtx, r, fields, userCtx, data, authz)
-	}
-
-	if haveStatus && status == "deactivated" {
-		return b.acmeAuthorizationDeactivateHandler(acmeCtx, r, fields, userCtx, data, authz)
-	}
-
-	return nil, ErrMalformed
-}
-
-func (b *backend) acmeAuthorizationFetchHandler(acmeCtx *acmeContext, r *logical.Request, fields *framework.FieldData, userCtx *jwsCtx, data map[string]interface{}, authz *ACMEAuthorization) (*logical.Response, error) {
-	return &logical.Response{
-		Data: authz.NetworkMarshal(acmeCtx),
-	}, nil
-}
-
-func (b *backend) acmeAuthorizationDeactivateHandler(acmeCtx *acmeContext, r *logical.Request, fields *framework.FieldData, userCtx *jwsCtx, data map[string]interface{}, authz *ACMEAuthorization) (*logical.Response, error) {
-	if authz.Status != ACMEAuthorizationPending && authz.Status != ACMEAuthorizationValid {
-		return nil, fmt.Errorf("unable to deactivate authorization in '%v' status: %w", authz.Status, ErrMalformed)
-	}
-
-	authz.Status = ACMEAuthorizationDeactivated
-	for _, challenge := range authz.Challenges {
-		challenge.Status = ACMEChallengeInvalid
-	}
-
-	if err := b.acmeState.SaveAuthorization(acmeCtx, authz); err != nil {
-		return nil, fmt.Errorf("error saving deactivated authorization: %w", err)
-	}
-
-	return &logical.Response{
-		Data: authz.NetworkMarshal(acmeCtx),
-	}, nil
-}
diff --git a/builtin/logical/pki/path_acme_challenges.go b/builtin/logical/pki/path_acme_challenges.go
deleted file mode 100644
index cded9d32a3c9c..0000000000000
--- a/builtin/logical/pki/path_acme_challenges.go
+++ /dev/null
@@ -1,114 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package pki
-
-import (
-	"fmt"
-
-	"github.com/hashicorp/vault/sdk/framework"
-	"github.com/hashicorp/vault/sdk/logical"
-)
-
-func pathAcmeChallenge(b *backend) []*framework.Path {
-	return buildAcmeFrameworkPaths(b, patternAcmeChallenge,
-		"/challenge/"+framework.MatchAllRegex("auth_id")+"/"+framework.MatchAllRegex("challenge_type"))
-}
-
-func addFieldsForACMEChallenge(fields map[string]*framework.FieldSchema) map[string]*framework.FieldSchema {
-	fields["auth_id"] = &framework.FieldSchema{
-		Type:        framework.TypeString,
-		Description: "ACME authorization identifier value",
-		Required:    true,
-	}
-
-	fields["challenge_type"] = &framework.FieldSchema{
-		Type:        framework.TypeString,
-		Description: "ACME challenge type",
-		Required:    true,
-	}
-
-	return fields
-}
-
-func patternAcmeChallenge(b *backend, pattern string) *framework.Path {
-	fields := map[string]*framework.FieldSchema{}
-	addFieldsForACMEPath(fields, pattern)
-	addFieldsForACMERequest(fields)
-	addFieldsForACMEChallenge(fields)
-
-	return &framework.Path{
-		Pattern: pattern,
-		Fields:  fields,
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.UpdateOperation: &framework.PathOperation{
-				Callback:                    b.acmeAccountRequiredWrapper(b.acmeChallengeHandler),
-				ForwardPerformanceSecondary: false,
-				ForwardPerformanceStandby:   true,
-			},
-		},
-
-		HelpSynopsis:    pathAcmeHelpSync,
-		HelpDescription: pathAcmeHelpDesc,
-	}
-}
-
-func (b *backend) acmeChallengeHandler(acmeCtx *acmeContext, r *logical.Request, fields *framework.FieldData, userCtx *jwsCtx, data map[string]interface{}, _ *acmeAccount) (*logical.Response, error) {
-	authId := fields.Get("auth_id").(string)
-	challengeType := fields.Get("challenge_type").(string)
-
-	authz, err := b.acmeState.LoadAuthorization(acmeCtx, userCtx, authId)
-	if err != nil {
-		return nil, fmt.Errorf("failed to load authorization: %w", err)
-	}
-
-	return b.acmeChallengeFetchHandler(acmeCtx, r, fields, userCtx, data, authz, challengeType)
-}
-
-func (b *backend) acmeChallengeFetchHandler(acmeCtx *acmeContext, r *logical.Request, fields *framework.FieldData, userCtx *jwsCtx, data map[string]interface{}, authz *ACMEAuthorization, challengeType string) (*logical.Response, error) {
-	var challenge *ACMEChallenge
-	for _, c := range authz.Challenges {
-		if string(c.Type) == challengeType {
-			challenge = c
-			break
-		}
-	}
-
-	if challenge == nil {
-		return nil, fmt.Errorf("unknown challenge of type '%v' in authorization: %w", challengeType, ErrMalformed)
-	}
-
-	// Per RFC 8555 Section 7.5.1. Responding to Challenges:
-	//
-	// > The client indicates to the server that it is ready for the challenge
-	// > validation by sending an empty JSON body ("{}") carried in a POST
-	// > request to the challenge URL (not the authorization URL).
-	if len(data) > 0 {
-		return nil, fmt.Errorf("unexpected request parameters: %w", ErrMalformed)
-	}
-
-	// If data was nil, we got a POST-as-GET request, just return current challenge without an accept,
-	// otherwise we most likely got a "{}" payload which we should now accept the challenge.
-	if data != nil {
-		thumbprint, err := userCtx.GetKeyThumbprint()
-		if err != nil {
-			return nil, fmt.Errorf("failed to get thumbprint for key: %w", err)
-		}
-
-		if err := b.acmeState.validator.AcceptChallenge(acmeCtx.sc, userCtx.Kid, authz, challenge, thumbprint); err != nil {
-			return nil, fmt.Errorf("error submitting challenge for validation: %w", err)
-		}
-	}
-
-	return &logical.Response{
-		Data: challenge.NetworkMarshal(acmeCtx, authz.Id),
-
-		// Per RFC 8555 Section 7.1. Resources:
-		//
-		// > The "up" link relation is used with challenge resources to indicate
-		// > the authorization resource to which a challenge belongs.
-		Headers: map[string][]string{
-			"Link": {fmt.Sprintf("<%s>;rel=\"up\"", buildAuthorizationUrl(acmeCtx, authz.Id))},
-		},
-	}, nil
-}
diff --git a/builtin/logical/pki/path_acme_directory.go b/builtin/logical/pki/path_acme_directory.go
deleted file mode 100644
index e556b35db5bd9..0000000000000
--- a/builtin/logical/pki/path_acme_directory.go
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package pki
-
-import (
-	"encoding/json"
-	"fmt"
-	"net/http"
-
-	"github.com/hashicorp/vault/sdk/framework"
-	"github.com/hashicorp/vault/sdk/logical"
-)
-
-const (
-	pathAcmeHelpSync = `An endpoint implementing the standard ACME protocol`
-	pathAcmeHelpDesc = `This API endpoint implementing a subset of the ACME protocol
- defined in RFC 8555, with its own authentication and argument syntax that
- does not follow conventional Vault operations. An ACME client tool or library
- should be used to interact with these endpoints.`
-)
-
-func pathAcmeDirectory(b *backend) []*framework.Path {
-	return buildAcmeFrameworkPaths(b, patternAcmeDirectory, "/directory")
-}
-
-func patternAcmeDirectory(b *backend, pattern string) *framework.Path {
-	fields := map[string]*framework.FieldSchema{}
-	addFieldsForACMEPath(fields, pattern)
-
-	return &framework.Path{
-		Pattern: pattern,
-		Fields:  fields,
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.ReadOperation: &framework.PathOperation{
-				Callback:                    b.acmeWrapper(b.acmeDirectoryHandler),
-				ForwardPerformanceSecondary: false,
-				ForwardPerformanceStandby:   true,
-			},
-		},
-
-		HelpSynopsis:    pathAcmeHelpSync,
-		HelpDescription: pathAcmeHelpDesc,
-	}
-}
-
-func (b *backend) acmeDirectoryHandler(acmeCtx *acmeContext, r *logical.Request, _ *framework.FieldData) (*logical.Response, error) {
-	rawBody, err := json.Marshal(map[string]interface{}{
-		"newNonce":   acmeCtx.baseUrl.JoinPath("new-nonce").String(),
-		"newAccount": acmeCtx.baseUrl.JoinPath("new-account").String(),
-		"newOrder":   acmeCtx.baseUrl.JoinPath("new-order").String(),
-		"revokeCert": acmeCtx.baseUrl.JoinPath("revoke-cert").String(),
-		"keyChange":  acmeCtx.baseUrl.JoinPath("key-change").String(),
-		// This is purposefully missing newAuthz as we don't support pre-authorization
-		"meta": map[string]interface{}{
-			"externalAccountRequired": acmeCtx.eabPolicy.IsExternalAccountRequired(),
-		},
-	})
-	if err != nil {
-		return nil, fmt.Errorf("failed encoding response: %w", err)
-	}
-
-	return &logical.Response{
-		Data: map[string]interface{}{
-			logical.HTTPContentType: "application/json",
-			logical.HTTPStatusCode:  http.StatusOK,
-			logical.HTTPRawBody:     rawBody,
-		},
-	}, nil
-}
diff --git a/builtin/logical/pki/path_acme_eab.go b/builtin/logical/pki/path_acme_eab.go
deleted file mode 100644
index d575d6c453d1f..0000000000000
--- a/builtin/logical/pki/path_acme_eab.go
+++ /dev/null
@@ -1,232 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package pki
-
-import (
-	"context"
-	"crypto/rand"
-	"encoding/base64"
-	"fmt"
-	"path"
-	"time"
-
-	"github.com/hashicorp/go-uuid"
-	"github.com/hashicorp/vault/sdk/framework"
-	"github.com/hashicorp/vault/sdk/logical"
-)
-
-var decodedTokenPrefix = mustBase64Decode("vault-eab-0-")
-
-func mustBase64Decode(s string) []byte {
-	bytes, err := base64.RawURLEncoding.DecodeString(s)
-	if err != nil {
-		panic(fmt.Sprintf("Token prefix value: %s failed decoding: %v", s, err))
-	}
-
-	// Should be dividable by 3 otherwise our prefix will not be properly honored.
-	if len(bytes)%3 != 0 {
-		panic(fmt.Sprintf("Token prefix value: %s is not dividable by 3, will not prefix properly", s))
-	}
-	return bytes
-}
-
-/*
- * This file unlike the other path_acme_xxx.go are VAULT APIs to manage the
- * ACME External Account Bindings, this isn't providing any APIs that an ACME
- * client would use.
- */
-func pathAcmeEabList(b *backend) *framework.Path {
-	return &framework.Path{
-		Pattern: "eab/?$",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixPKI,
-		},
-
-		Fields: map[string]*framework.FieldSchema{},
-
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.ListOperation: &framework.PathOperation{
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb:   "list-eab-key",
-					OperationSuffix: "acme",
-				},
-				Callback: b.pathAcmeListEab,
-			},
-		},
-
-		HelpSynopsis:    "list external account bindings to be used for ACME",
-		HelpDescription: `list identifiers that have been generated but yet to be used.`,
-	}
-}
-
-func pathAcmeNewEab(b *backend) []*framework.Path {
-	return buildAcmeFrameworkPaths(b, patternAcmeNewEab, "/new-eab")
-}
-
-func patternAcmeNewEab(b *backend, pattern string) *framework.Path {
-	fields := map[string]*framework.FieldSchema{}
-	addFieldsForACMEPath(fields, pattern)
-
-	return &framework.Path{
-		Pattern: pattern,
-		Fields:  fields,
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.UpdateOperation: &framework.PathOperation{
-				Callback:                    b.pathAcmeCreateEab,
-				ForwardPerformanceSecondary: false,
-				ForwardPerformanceStandby:   true,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb:   "generate-eab-key",
-					OperationSuffix: "acme",
-				},
-			},
-		},
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixPKI,
-		},
-
-		HelpSynopsis:    "Generate external account bindings to be used for ACME",
-		HelpDescription: `Generate single use id/key pairs to be used for ACME EAB.`,
-	}
-}
-
-func pathAcmeEabDelete(b *backend) *framework.Path {
-	return &framework.Path{
-		Pattern: "eab/" + uuidNameRegex("key_id"),
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixPKI,
-		},
-
-		Fields: map[string]*framework.FieldSchema{
-			"key_id": {
-				Type:        framework.TypeString,
-				Description: "EAB key identifier",
-				Required:    true,
-			},
-		},
-
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.DeleteOperation: &framework.PathOperation{
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationSuffix: "acme-configuration",
-				},
-				Callback:                    b.pathAcmeDeleteEab,
-				ForwardPerformanceSecondary: false,
-				ForwardPerformanceStandby:   true,
-			},
-		},
-
-		HelpSynopsis: "Delete an external account binding id prior to its use within an ACME account",
-		HelpDescription: `Allows an operator to delete an external account binding,
-before its bound to a new ACME account. If the identifier provided does not exist or 
-was already consumed by an ACME account a successful response is returned along with 
-a warning that it did not exist.`,
-	}
-}
-
-type eabType struct {
-	KeyID         string    `json:"-"`
-	KeyType       string    `json:"key-type"`
-	PrivateBytes  []byte    `json:"private-bytes"`
-	AcmeDirectory string    `json:"acme-directory"`
-	CreatedOn     time.Time `json:"created-on"`
-}
-
-func (b *backend) pathAcmeListEab(ctx context.Context, r *logical.Request, _ *framework.FieldData) (*logical.Response, error) {
-	sc := b.makeStorageContext(ctx, r.Storage)
-
-	eabIds, err := b.acmeState.ListEabIds(sc)
-	if err != nil {
-		return nil, err
-	}
-
-	var warnings []string
-	var keyIds []string
-	keyInfos := map[string]interface{}{}
-
-	for _, eabKey := range eabIds {
-		eab, err := b.acmeState.LoadEab(sc, eabKey)
-		if err != nil {
-			warnings = append(warnings, fmt.Sprintf("failed loading eab entry %s: %v", eabKey, err))
-			continue
-		}
-
-		keyIds = append(keyIds, eab.KeyID)
-		keyInfos[eab.KeyID] = map[string]interface{}{
-			"key_type":       eab.KeyType,
-			"acme_directory": path.Join(eab.AcmeDirectory, "directory"),
-			"created_on":     eab.CreatedOn.Format(time.RFC3339),
-		}
-	}
-
-	resp := logical.ListResponseWithInfo(keyIds, keyInfos)
-	for _, warning := range warnings {
-		resp.AddWarning(warning)
-	}
-	return resp, nil
-}
-
-func (b *backend) pathAcmeCreateEab(ctx context.Context, r *logical.Request, data *framework.FieldData) (*logical.Response, error) {
-	kid := genUuid()
-	size := 32
-	bytes, err := uuid.GenerateRandomBytesWithReader(size, rand.Reader)
-	if err != nil {
-		return nil, fmt.Errorf("failed generating eab key: %w", err)
-	}
-
-	acmeDirectory, err := getAcmeDirectory(r)
-	if err != nil {
-		return nil, err
-	}
-
-	eab := &eabType{
-		KeyID:         kid,
-		KeyType:       "hs",
-		PrivateBytes:  append(decodedTokenPrefix, bytes...), // we do this to avoid generating tokens that start with -
-		AcmeDirectory: acmeDirectory,
-		CreatedOn:     time.Now(),
-	}
-
-	sc := b.makeStorageContext(ctx, r.Storage)
-	err = b.acmeState.SaveEab(sc, eab)
-	if err != nil {
-		return nil, fmt.Errorf("failed saving generated eab: %w", err)
-	}
-
-	encodedKey := base64.RawURLEncoding.EncodeToString(eab.PrivateBytes)
-
-	return &logical.Response{
-		Data: map[string]interface{}{
-			"id":             eab.KeyID,
-			"key_type":       eab.KeyType,
-			"key":            encodedKey,
-			"acme_directory": path.Join(eab.AcmeDirectory, "directory"),
-			"created_on":     eab.CreatedOn.Format(time.RFC3339),
-		},
-	}, nil
-}
-
-func (b *backend) pathAcmeDeleteEab(ctx context.Context, r *logical.Request, d *framework.FieldData) (*logical.Response, error) {
-	sc := b.makeStorageContext(ctx, r.Storage)
-	keyId := d.Get("key_id").(string)
-
-	_, err := uuid.ParseUUID(keyId)
-	if err != nil {
-		return nil, fmt.Errorf("badly formatted key_id field")
-	}
-
-	deleted, err := b.acmeState.DeleteEab(sc, keyId)
-	if err != nil {
-		return nil, fmt.Errorf("failed deleting key id: %w", err)
-	}
-
-	resp := &logical.Response{}
-	if !deleted {
-		resp.AddWarning("No key id found with id: " + keyId)
-	}
-	return resp, nil
-}
diff --git a/builtin/logical/pki/path_acme_nonce.go b/builtin/logical/pki/path_acme_nonce.go
deleted file mode 100644
index e973039a2226f..0000000000000
--- a/builtin/logical/pki/path_acme_nonce.go
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package pki
-
-import (
-	"fmt"
-	"net/http"
-
-	"github.com/hashicorp/vault/sdk/framework"
-	"github.com/hashicorp/vault/sdk/logical"
-)
-
-func pathAcmeNonce(b *backend) []*framework.Path {
-	return buildAcmeFrameworkPaths(b, patternAcmeNonce, "/new-nonce")
-}
-
-func patternAcmeNonce(b *backend, pattern string) *framework.Path {
-	fields := map[string]*framework.FieldSchema{}
-	addFieldsForACMEPath(fields, pattern)
-
-	return &framework.Path{
-		Pattern: pattern,
-		Fields:  fields,
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.HeaderOperation: &framework.PathOperation{
-				Callback:                    b.acmeWrapper(b.acmeNonceHandler),
-				ForwardPerformanceSecondary: false,
-				ForwardPerformanceStandby:   true,
-			},
-			logical.ReadOperation: &framework.PathOperation{
-				Callback:                    b.acmeWrapper(b.acmeNonceHandler),
-				ForwardPerformanceSecondary: false,
-				ForwardPerformanceStandby:   true,
-			},
-		},
-
-		HelpSynopsis:    pathAcmeHelpSync,
-		HelpDescription: pathAcmeHelpDesc,
-	}
-}
-
-func (b *backend) acmeNonceHandler(ctx *acmeContext, r *logical.Request, _ *framework.FieldData) (*logical.Response, error) {
-	nonce, _, err := b.acmeState.GetNonce()
-	if err != nil {
-		return nil, err
-	}
-
-	// Header operations return 200, GET return 204.
-	httpStatus := http.StatusOK
-	if r.Operation == logical.ReadOperation {
-		httpStatus = http.StatusNoContent
-	}
-
-	return &logical.Response{
-		Headers: map[string][]string{
-			"Cache-Control": {"no-store"},
-			"Replay-Nonce":  {nonce},
-			"Link":          genAcmeLinkHeader(ctx),
-		},
-		Data: map[string]interface{}{
-			logical.HTTPStatusCode: httpStatus,
-			// Get around Vault limitation of requiring a body set if the status is not http.StatusNoContent
-			// for our HEAD request responses.
-			logical.HTTPContentType: "",
-		},
-	}, nil
-}
-
-func genAcmeLinkHeader(ctx *acmeContext) []string {
-	path := fmt.Sprintf("<%s>;rel=\"index\"", ctx.baseUrl.JoinPath("directory").String())
-	return []string{path}
-}
diff --git a/builtin/logical/pki/path_acme_order.go b/builtin/logical/pki/path_acme_order.go
deleted file mode 100644
index eb2ffaf9e681e..0000000000000
--- a/builtin/logical/pki/path_acme_order.go
+++ /dev/null
@@ -1,1084 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package pki
-
-import (
-	"crypto/x509"
-	"encoding/base64"
-	"encoding/pem"
-	"fmt"
-	"net"
-	"net/http"
-	"sort"
-	"strings"
-	"time"
-
-	"github.com/hashicorp/vault/sdk/helper/strutil"
-
-	"github.com/hashicorp/vault/sdk/helper/certutil"
-
-	"github.com/hashicorp/vault/sdk/framework"
-	"github.com/hashicorp/vault/sdk/logical"
-	"golang.org/x/net/idna"
-)
-
-var maxAcmeCertTTL = 90 * (24 * time.Hour)
-
-func pathAcmeListOrders(b *backend) []*framework.Path {
-	return buildAcmeFrameworkPaths(b, patternAcmeListOrders, "/orders")
-}
-
-func pathAcmeGetOrder(b *backend) []*framework.Path {
-	return buildAcmeFrameworkPaths(b, patternAcmeGetOrder, "/order/"+uuidNameRegex("order_id"))
-}
-
-func pathAcmeNewOrder(b *backend) []*framework.Path {
-	return buildAcmeFrameworkPaths(b, patternAcmeNewOrder, "/new-order")
-}
-
-func pathAcmeFinalizeOrder(b *backend) []*framework.Path {
-	return buildAcmeFrameworkPaths(b, patternAcmeFinalizeOrder, "/order/"+uuidNameRegex("order_id")+"/finalize")
-}
-
-func pathAcmeFetchOrderCert(b *backend) []*framework.Path {
-	return buildAcmeFrameworkPaths(b, patternAcmeFetchOrderCert, "/order/"+uuidNameRegex("order_id")+"/cert")
-}
-
-func patternAcmeNewOrder(b *backend, pattern string) *framework.Path {
-	fields := map[string]*framework.FieldSchema{}
-	addFieldsForACMEPath(fields, pattern)
-	addFieldsForACMERequest(fields)
-
-	return &framework.Path{
-		Pattern: pattern,
-		Fields:  fields,
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.UpdateOperation: &framework.PathOperation{
-				Callback:                    b.acmeAccountRequiredWrapper(b.acmeNewOrderHandler),
-				ForwardPerformanceSecondary: false,
-				ForwardPerformanceStandby:   true,
-			},
-		},
-
-		HelpSynopsis:    pathAcmeHelpSync,
-		HelpDescription: pathAcmeHelpDesc,
-	}
-}
-
-func patternAcmeListOrders(b *backend, pattern string) *framework.Path {
-	fields := map[string]*framework.FieldSchema{}
-	addFieldsForACMEPath(fields, pattern)
-	addFieldsForACMERequest(fields)
-
-	return &framework.Path{
-		Pattern: pattern,
-		Fields:  fields,
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.UpdateOperation: &framework.PathOperation{
-				Callback:                    b.acmeAccountRequiredWrapper(b.acmeListOrdersHandler),
-				ForwardPerformanceSecondary: false,
-				ForwardPerformanceStandby:   true,
-			},
-		},
-
-		HelpSynopsis:    pathAcmeHelpSync,
-		HelpDescription: pathAcmeHelpDesc,
-	}
-}
-
-func patternAcmeGetOrder(b *backend, pattern string) *framework.Path {
-	fields := map[string]*framework.FieldSchema{}
-	addFieldsForACMEPath(fields, pattern)
-	addFieldsForACMERequest(fields)
-	addFieldsForACMEOrder(fields)
-
-	return &framework.Path{
-		Pattern: pattern,
-		Fields:  fields,
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.UpdateOperation: &framework.PathOperation{
-				Callback:                    b.acmeAccountRequiredWrapper(b.acmeGetOrderHandler),
-				ForwardPerformanceSecondary: false,
-				ForwardPerformanceStandby:   true,
-			},
-		},
-
-		HelpSynopsis:    pathAcmeHelpSync,
-		HelpDescription: pathAcmeHelpDesc,
-	}
-}
-
-func patternAcmeFinalizeOrder(b *backend, pattern string) *framework.Path {
-	fields := map[string]*framework.FieldSchema{}
-	addFieldsForACMEPath(fields, pattern)
-	addFieldsForACMERequest(fields)
-	addFieldsForACMEOrder(fields)
-
-	return &framework.Path{
-		Pattern: pattern,
-		Fields:  fields,
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.UpdateOperation: &framework.PathOperation{
-				Callback:                    b.acmeAccountRequiredWrapper(b.acmeFinalizeOrderHandler),
-				ForwardPerformanceSecondary: false,
-				ForwardPerformanceStandby:   true,
-			},
-		},
-
-		HelpSynopsis:    pathAcmeHelpSync,
-		HelpDescription: pathAcmeHelpDesc,
-	}
-}
-
-func patternAcmeFetchOrderCert(b *backend, pattern string) *framework.Path {
-	fields := map[string]*framework.FieldSchema{}
-	addFieldsForACMEPath(fields, pattern)
-	addFieldsForACMERequest(fields)
-	addFieldsForACMEOrder(fields)
-
-	return &framework.Path{
-		Pattern: pattern,
-		Fields:  fields,
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.UpdateOperation: &framework.PathOperation{
-				Callback:                    b.acmeAccountRequiredWrapper(b.acmeFetchCertOrderHandler),
-				ForwardPerformanceSecondary: false,
-				ForwardPerformanceStandby:   true,
-			},
-		},
-
-		HelpSynopsis:    pathAcmeHelpSync,
-		HelpDescription: pathAcmeHelpDesc,
-	}
-}
-
-func addFieldsForACMEOrder(fields map[string]*framework.FieldSchema) {
-	fields["order_id"] = &framework.FieldSchema{
-		Type:        framework.TypeString,
-		Description: `The ACME order identifier to fetch`,
-		Required:    true,
-	}
-}
-
-func (b *backend) acmeFetchCertOrderHandler(ac *acmeContext, _ *logical.Request, fields *framework.FieldData, uc *jwsCtx, data map[string]interface{}, _ *acmeAccount) (*logical.Response, error) {
-	orderId := fields.Get("order_id").(string)
-
-	order, err := b.acmeState.LoadOrder(ac, uc, orderId)
-	if err != nil {
-		return nil, err
-	}
-
-	if order.Status != ACMEOrderValid {
-		return nil, fmt.Errorf("%w: order is status %s, needs to be in valid state", ErrOrderNotReady, order.Status)
-	}
-
-	if len(order.IssuerId) == 0 || len(order.CertificateSerialNumber) == 0 {
-		return nil, fmt.Errorf("order is missing required fields to load certificate")
-	}
-
-	certEntry, err := fetchCertBySerial(ac.sc, "certs/", order.CertificateSerialNumber)
-	if err != nil {
-		return nil, fmt.Errorf("failed reading certificate %s from storage: %w", order.CertificateSerialNumber, err)
-	}
-	if certEntry == nil || len(certEntry.Value) == 0 {
-		return nil, fmt.Errorf("missing certificate %s from storage", order.CertificateSerialNumber)
-	}
-
-	cert, err := x509.ParseCertificate(certEntry.Value)
-	if err != nil {
-		return nil, fmt.Errorf("failed parsing certificate %s: %w", order.CertificateSerialNumber, err)
-	}
-
-	issuer, err := ac.sc.fetchIssuerById(order.IssuerId)
-	if err != nil {
-		return nil, fmt.Errorf("failed loading certificate issuer %s from storage: %w", order.IssuerId, err)
-	}
-
-	allPems, err := func() ([]byte, error) {
-		leafPEM := pem.EncodeToMemory(&pem.Block{
-			Type:  "CERTIFICATE",
-			Bytes: cert.Raw,
-		})
-
-		chains := []byte(issuer.Certificate)
-		for _, chainVal := range issuer.CAChain {
-			if chainVal == issuer.Certificate {
-				continue
-			}
-			chains = append(chains, []byte(chainVal)...)
-		}
-
-		return append(leafPEM, chains...), nil
-	}()
-	if err != nil {
-		return nil, fmt.Errorf("failed encoding certificate ca chain: %w", err)
-	}
-
-	return &logical.Response{
-		Data: map[string]interface{}{
-			logical.HTTPContentType: "application/pem-certificate-chain",
-			logical.HTTPStatusCode:  http.StatusOK,
-			logical.HTTPRawBody:     allPems,
-		},
-	}, nil
-}
-
-func (b *backend) acmeFinalizeOrderHandler(ac *acmeContext, _ *logical.Request, fields *framework.FieldData, uc *jwsCtx, data map[string]interface{}, account *acmeAccount) (*logical.Response, error) {
-	orderId := fields.Get("order_id").(string)
-
-	csr, err := parseCsrFromFinalize(data)
-	if err != nil {
-		return nil, err
-	}
-
-	order, err := b.acmeState.LoadOrder(ac, uc, orderId)
-	if err != nil {
-		return nil, err
-	}
-
-	order.Status, err = computeOrderStatus(ac, uc, order)
-	if err != nil {
-		return nil, err
-	}
-
-	if order.Status != ACMEOrderReady {
-		return nil, fmt.Errorf("%w: order is status %s, needs to be in ready state", ErrOrderNotReady, order.Status)
-	}
-
-	now := time.Now()
-	if !order.Expires.IsZero() && now.After(order.Expires) {
-		return nil, fmt.Errorf("%w: order %s is expired", ErrMalformed, orderId)
-	}
-
-	if err = validateCsrMatchesOrder(csr, order); err != nil {
-		return nil, err
-	}
-
-	if err = validateCsrNotUsingAccountKey(csr, uc); err != nil {
-		return nil, err
-	}
-
-	signedCertBundle, issuerId, err := issueCertFromCsr(ac, csr)
-	if err != nil {
-		return nil, err
-	}
-
-	hyphenSerialNumber := normalizeSerialFromBigInt(signedCertBundle.Certificate.SerialNumber)
-	err = storeCertificate(ac.sc, signedCertBundle)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := b.acmeState.TrackIssuedCert(ac, order.AccountId, hyphenSerialNumber, order.OrderId); err != nil {
-		b.Logger().Warn("orphaned generated ACME certificate due to error saving account->cert->order reference", "serial_number", hyphenSerialNumber, "error", err)
-		return nil, err
-	}
-
-	order.Status = ACMEOrderValid
-	order.CertificateSerialNumber = hyphenSerialNumber
-	order.CertificateExpiry = signedCertBundle.Certificate.NotAfter
-	order.IssuerId = issuerId
-
-	err = b.acmeState.SaveOrder(ac, order)
-	if err != nil {
-		b.Logger().Warn("orphaned generated ACME certificate due to error saving order", "serial_number", hyphenSerialNumber, "error", err)
-		return nil, fmt.Errorf("failed saving updated order: %w", err)
-	}
-
-	if err := b.doTrackBilling(ac.sc.Context, order.Identifiers); err != nil {
-		b.Logger().Error("failed to track billing for order", "order", orderId, "error", err)
-		err = nil
-	}
-
-	return formatOrderResponse(ac, order), nil
-}
-
-func computeOrderStatus(ac *acmeContext, uc *jwsCtx, order *acmeOrder) (ACMEOrderStatusType, error) {
-	// If we reached a final stage, no use computing anything else
-	if order.Status == ACMEOrderInvalid || order.Status == ACMEOrderValid {
-		return order.Status, nil
-	}
-
-	// We aren't in a final state yet, check for expiry
-	if time.Now().After(order.Expires) {
-		return ACMEOrderInvalid, nil
-	}
-
-	// Intermediary steps passed authorizations should short circuit us as well
-	if order.Status == ACMEOrderReady || order.Status == ACMEOrderProcessing {
-		return order.Status, nil
-	}
-
-	// If we have no authorizations attached to the order, nothing to compute either
-	if len(order.AuthorizationIds) == 0 {
-		return ACMEOrderPending, nil
-	}
-
-	anyFailed := false
-	allPassed := true
-	for _, authId := range order.AuthorizationIds {
-		authorization, err := ac.getAcmeState().LoadAuthorization(ac, uc, authId)
-		if err != nil {
-			return order.Status, fmt.Errorf("failed loading authorization: %s: %w", authId, err)
-		}
-
-		if authorization.Status == ACMEAuthorizationPending {
-			allPassed = false
-			continue
-		}
-
-		if authorization.Status != ACMEAuthorizationValid {
-			// Per RFC 8555 - 7.1.6. Status Changes
-			// The order also moves to the "invalid" state if it expires or
-			// one of its authorizations enters a final state other than
-			// "valid" ("expired", "revoked", or "deactivated").
-			allPassed = false
-			anyFailed = true
-			break
-		}
-	}
-
-	if anyFailed {
-		return ACMEOrderInvalid, nil
-	}
-
-	if allPassed {
-		return ACMEOrderReady, nil
-	}
-
-	// The order has not expired, no authorizations have yet to be marked as failed
-	// nor have we passed them all.
-	return ACMEOrderPending, nil
-}
-
-func validateCsrNotUsingAccountKey(csr *x509.CertificateRequest, uc *jwsCtx) error {
-	csrKey := csr.PublicKey
-	userKey := uc.Key.Public().Key
-
-	sameKey, err := certutil.ComparePublicKeysAndType(csrKey, userKey)
-	if err != nil {
-		return err
-	}
-
-	if sameKey {
-		return fmt.Errorf("%w: certificate public key must not match account key", ErrBadCSR)
-	}
-
-	return nil
-}
-
-func validateCsrMatchesOrder(csr *x509.CertificateRequest, order *acmeOrder) error {
-	csrDNSIdentifiers, csrIPIdentifiers := getIdentifiersFromCSR(csr)
-	orderDNSIdentifiers := strutil.RemoveDuplicates(order.getIdentifierDNSValues(), true)
-	orderIPIdentifiers := removeDuplicatesAndSortIps(order.getIdentifierIPValues())
-
-	if len(orderDNSIdentifiers) == 0 && len(orderIPIdentifiers) == 0 {
-		return fmt.Errorf("%w: order did not include any identifiers", ErrServerInternal)
-	}
-
-	if len(orderDNSIdentifiers) != len(csrDNSIdentifiers) {
-		return fmt.Errorf("%w: Order (%v) and CSR (%v) mismatch on number of DNS identifiers", ErrBadCSR, len(orderDNSIdentifiers), len(csrDNSIdentifiers))
-	}
-
-	if len(orderIPIdentifiers) != len(csrIPIdentifiers) {
-		return fmt.Errorf("%w: Order (%v) and CSR (%v) mismatch on number of IP identifiers", ErrBadCSR, len(orderIPIdentifiers), len(csrIPIdentifiers))
-	}
-
-	for i, identifier := range orderDNSIdentifiers {
-		if identifier != csrDNSIdentifiers[i] {
-			return fmt.Errorf("%w: CSR is missing order DNS identifier %s", ErrBadCSR, identifier)
-		}
-	}
-
-	for i, identifier := range orderIPIdentifiers {
-		if !identifier.Equal(csrIPIdentifiers[i]) {
-			return fmt.Errorf("%w: CSR is missing order IP identifier %s", ErrBadCSR, identifier.String())
-		}
-	}
-
-	// Since we do not support NotBefore/NotAfter dates at this time no need to validate CSR/Order match.
-
-	return nil
-}
-
-func (b *backend) validateIdentifiersAgainstRole(role *roleEntry, identifiers []*ACMEIdentifier) error {
-	for _, identifier := range identifiers {
-		switch identifier.Type {
-		case ACMEDNSIdentifier:
-			data := &inputBundle{
-				role:    role,
-				req:     &logical.Request{},
-				apiData: &framework.FieldData{},
-			}
-
-			if validateNames(b, data, []string{identifier.OriginalValue}) != "" {
-				return fmt.Errorf("%w: role (%s) will not issue certificate for name %v",
-					ErrRejectedIdentifier, role.Name, identifier.OriginalValue)
-			}
-		case ACMEIPIdentifier:
-			if !role.AllowIPSANs {
-				return fmt.Errorf("%w: role (%s) does not allow IP sans, so cannot issue certificate for %v",
-					ErrRejectedIdentifier, role.Name, identifier.OriginalValue)
-			}
-		default:
-			return fmt.Errorf("unknown type of identifier: %v for %v", identifier.Type, identifier.OriginalValue)
-		}
-	}
-
-	return nil
-}
-
-func getIdentifiersFromCSR(csr *x509.CertificateRequest) ([]string, []net.IP) {
-	dnsIdentifiers := append([]string(nil), csr.DNSNames...)
-	ipIdentifiers := append([]net.IP(nil), csr.IPAddresses...)
-
-	if csr.Subject.CommonName != "" {
-		ip := net.ParseIP(csr.Subject.CommonName)
-		if ip != nil {
-			ipIdentifiers = append(ipIdentifiers, ip)
-		} else {
-			dnsIdentifiers = append(dnsIdentifiers, csr.Subject.CommonName)
-		}
-	}
-
-	return strutil.RemoveDuplicates(dnsIdentifiers, true), removeDuplicatesAndSortIps(ipIdentifiers)
-}
-
-func removeDuplicatesAndSortIps(ipIdentifiers []net.IP) []net.IP {
-	var uniqueIpIdentifiers []net.IP
-	for _, ip := range ipIdentifiers {
-		found := false
-		for _, curIp := range uniqueIpIdentifiers {
-			if curIp.Equal(ip) {
-				found = true
-			}
-		}
-
-		if !found {
-			uniqueIpIdentifiers = append(uniqueIpIdentifiers, ip)
-		}
-	}
-
-	sort.Slice(uniqueIpIdentifiers, func(i, j int) bool {
-		return uniqueIpIdentifiers[i].String() < uniqueIpIdentifiers[j].String()
-	})
-	return uniqueIpIdentifiers
-}
-
-func storeCertificate(sc *storageContext, signedCertBundle *certutil.ParsedCertBundle) error {
-	hyphenSerialNumber := normalizeSerialFromBigInt(signedCertBundle.Certificate.SerialNumber)
-	key := "certs/" + hyphenSerialNumber
-	certsCounted := sc.Backend.certsCounted.Load()
-	err := sc.Storage.Put(sc.Context, &logical.StorageEntry{
-		Key:   key,
-		Value: signedCertBundle.CertificateBytes,
-	})
-	if err != nil {
-		return fmt.Errorf("unable to store certificate locally: %w", err)
-	}
-	sc.Backend.ifCountEnabledIncrementTotalCertificatesCount(certsCounted, key)
-	return nil
-}
-
-func maybeAugmentReqDataWithSuitableCN(ac *acmeContext, csr *x509.CertificateRequest, data *framework.FieldData) {
-	// Role doesn't require a CN, so we don't care.
-	if !ac.role.RequireCN {
-		return
-	}
-
-	// CSR contains a CN, so use that one.
-	if csr.Subject.CommonName != "" {
-		return
-	}
-
-	// Choose a CN in the order wildcard -> DNS -> IP -> fail.
-	for _, name := range csr.DNSNames {
-		if strings.Contains(name, "*") {
-			data.Raw["common_name"] = name
-			return
-		}
-	}
-	if len(csr.DNSNames) > 0 {
-		data.Raw["common_name"] = csr.DNSNames[0]
-		return
-	}
-	if len(csr.IPAddresses) > 0 {
-		data.Raw["common_name"] = csr.IPAddresses[0].String()
-		return
-	}
-}
-
-func issueCertFromCsr(ac *acmeContext, csr *x509.CertificateRequest) (*certutil.ParsedCertBundle, issuerID, error) {
-	pemBlock := &pem.Block{
-		Type:    "CERTIFICATE REQUEST",
-		Headers: nil,
-		Bytes:   csr.Raw,
-	}
-	pemCsr := string(pem.EncodeToMemory(pemBlock))
-
-	data := &framework.FieldData{
-		Raw: map[string]interface{}{
-			"csr": pemCsr,
-		},
-		Schema: getCsrSignVerbatimSchemaFields(),
-	}
-
-	// XXX: Usability hack: by default, minimalist roles have require_cn=true,
-	// but some ACME clients do not provision one in the certificate as modern
-	// (TLS) clients are mostly verifying against server's DNS SANs.
-	maybeAugmentReqDataWithSuitableCN(ac, csr, data)
-
-	signingBundle, issuerId, err := ac.sc.fetchCAInfoWithIssuer(ac.issuer.ID.String(), IssuanceUsage)
-	if err != nil {
-		return nil, "", fmt.Errorf("failed loading CA %s: %w", ac.issuer.ID.String(), err)
-	}
-
-	// ACME issued cert will override the TTL values to truncate to the issuer's
-	// expiration if we go beyond, no matter the setting
-	if signingBundle.LeafNotAfterBehavior == certutil.ErrNotAfterBehavior {
-		signingBundle.LeafNotAfterBehavior = certutil.TruncateNotAfterBehavior
-	}
-
-	input := &inputBundle{
-		req:     &logical.Request{},
-		apiData: data,
-		role:    ac.role,
-	}
-
-	normalNotAfter, _, err := getCertificateNotAfter(ac.sc.Backend, input, signingBundle)
-	if err != nil {
-		return nil, "", fmt.Errorf("failed computing certificate TTL from role/mount: %v: %w", err, ErrMalformed)
-	}
-
-	// Force a maximum 90 day TTL or lower for ACME
-	if time.Now().Add(maxAcmeCertTTL).Before(normalNotAfter) {
-		input.apiData.Raw["ttl"] = maxAcmeCertTTL
-	}
-
-	if csr.PublicKeyAlgorithm == x509.UnknownPublicKeyAlgorithm || csr.PublicKey == nil {
-		return nil, "", fmt.Errorf("%w: Refusing to sign CSR with empty PublicKey", ErrBadCSR)
-	}
-
-	// UseCSRValues as defined in certutil/helpers.go accepts the following
-	// fields off of the CSR:
-	//
-	// 1. Subject fields,
-	// 2. SANs,
-	// 3. Extensions (except for a BasicConstraint extension)
-	//
-	// Because we have stricter validation of subject parameters, and no way
-	// to validate or allow extensions, we do not wish to use the CSR's
-	// parameters for these values. If a CSR sets, e.g., an organizational
-	// unit, we have no way of validating this (via ACME here, without perhaps
-	// an external policy engine), and thus should not be setting it on our
-	// final issued certificate.
-	parsedBundle, _, err := signCert(ac.sc.Backend, input, signingBundle, false /* is_ca=false */, false /* use_csr_values */)
-	if err != nil {
-		return nil, "", fmt.Errorf("%w: refusing to sign CSR: %s", ErrBadCSR, err.Error())
-	}
-
-	if err = parsedBundle.Verify(); err != nil {
-		return nil, "", fmt.Errorf("verification of parsed bundle failed: %w", err)
-	}
-
-	// We only allow ServerAuth key usage from ACME issued certs.
-	for _, usage := range parsedBundle.Certificate.ExtKeyUsage {
-		if usage != x509.ExtKeyUsageServerAuth {
-			return nil, "", fmt.Errorf("%w: ACME certs only allow ServerAuth key usage", ErrBadCSR)
-		}
-	}
-
-	return parsedBundle, issuerId, err
-}
-
-func parseCsrFromFinalize(data map[string]interface{}) (*x509.CertificateRequest, error) {
-	csrInterface, present := data["csr"]
-	if !present {
-		return nil, fmt.Errorf("%w: missing csr in payload", ErrMalformed)
-	}
-
-	base64Csr, ok := csrInterface.(string)
-	if !ok {
-		return nil, fmt.Errorf("%w: csr in payload not the expected type: %T", ErrMalformed, csrInterface)
-	}
-
-	derCsr, err := base64.RawURLEncoding.DecodeString(base64Csr)
-	if err != nil {
-		return nil, fmt.Errorf("%w: failed base64 decoding csr: %s", ErrMalformed, err.Error())
-	}
-
-	csr, err := x509.ParseCertificateRequest(derCsr)
-	if err != nil {
-		return nil, fmt.Errorf("%w: failed to parse csr: %s", ErrMalformed, err.Error())
-	}
-
-	if csr.PublicKey == nil || csr.PublicKeyAlgorithm == x509.UnknownPublicKeyAlgorithm {
-		return nil, fmt.Errorf("%w: failed to parse csr no public key info or unknown key algorithm used", ErrBadCSR)
-	}
-
-	for _, ext := range csr.Extensions {
-		if ext.Id.Equal(certutil.ExtensionBasicConstraintsOID) {
-			isCa, _, err := certutil.ParseBasicConstraintExtension(ext)
-			if err != nil {
-				return nil, fmt.Errorf("%w: refusing to accept CSR with Basic Constraints extension: %v", ErrBadCSR, err.Error())
-			}
-
-			if isCa {
-				return nil, fmt.Errorf("%w: refusing to accept CSR with Basic Constraints extension with CA set to true", ErrBadCSR)
-			}
-		}
-	}
-
-	return csr, nil
-}
-
-func (b *backend) acmeGetOrderHandler(ac *acmeContext, _ *logical.Request, fields *framework.FieldData, uc *jwsCtx, _ map[string]interface{}, _ *acmeAccount) (*logical.Response, error) {
-	orderId := fields.Get("order_id").(string)
-
-	order, err := b.acmeState.LoadOrder(ac, uc, orderId)
-	if err != nil {
-		return nil, err
-	}
-
-	order.Status, err = computeOrderStatus(ac, uc, order)
-	if err != nil {
-		return nil, err
-	}
-
-	// Per RFC 8555 -> 7.1.3.  Order Objects
-	// For final orders (in the "valid" or "invalid" state), the authorizations that were completed.
-	//
-	// Otherwise, for "pending" orders we will return our list as it was originally saved.
-	requiresFiltering := order.Status == ACMEOrderValid || order.Status == ACMEOrderInvalid
-	if requiresFiltering {
-		filteredAuthorizationIds := []string{}
-
-		for _, authId := range order.AuthorizationIds {
-			authorization, err := b.acmeState.LoadAuthorization(ac, uc, authId)
-			if err != nil {
-				return nil, err
-			}
-
-			if (order.Status == ACMEOrderInvalid || order.Status == ACMEOrderValid) &&
-				authorization.Status == ACMEAuthorizationValid {
-				filteredAuthorizationIds = append(filteredAuthorizationIds, authId)
-			}
-		}
-
-		order.AuthorizationIds = filteredAuthorizationIds
-	}
-
-	return formatOrderResponse(ac, order), nil
-}
-
-func (b *backend) acmeListOrdersHandler(ac *acmeContext, _ *logical.Request, _ *framework.FieldData, uc *jwsCtx, _ map[string]interface{}, acct *acmeAccount) (*logical.Response, error) {
-	orderIds, err := b.acmeState.ListOrderIds(ac, acct.KeyId)
-	if err != nil {
-		return nil, err
-	}
-
-	orderUrls := []string{}
-	for _, orderId := range orderIds {
-		order, err := b.acmeState.LoadOrder(ac, uc, orderId)
-		if err != nil {
-			return nil, err
-		}
-
-		if order.Status == ACMEOrderInvalid {
-			// Per RFC8555 -> 7.1.2.1 - Orders List
-			// The server SHOULD include pending orders and SHOULD NOT
-			// include orders that are invalid in the array of URLs.
-			continue
-		}
-
-		orderUrls = append(orderUrls, buildOrderUrl(ac, orderId))
-	}
-
-	resp := &logical.Response{
-		Data: map[string]interface{}{
-			"orders": orderUrls,
-		},
-	}
-
-	return resp, nil
-}
-
-func (b *backend) acmeNewOrderHandler(ac *acmeContext, _ *logical.Request, _ *framework.FieldData, _ *jwsCtx, data map[string]interface{}, account *acmeAccount) (*logical.Response, error) {
-	identifiers, err := parseOrderIdentifiers(data)
-	if err != nil {
-		return nil, err
-	}
-
-	notBefore, err := parseOptRFC3339Field(data, "notBefore")
-	if err != nil {
-		return nil, err
-	}
-
-	notAfter, err := parseOptRFC3339Field(data, "notAfter")
-	if err != nil {
-		return nil, err
-	}
-
-	if !notBefore.IsZero() || !notAfter.IsZero() {
-		return nil, fmt.Errorf("%w: NotBefore and NotAfter are not supported", ErrMalformed)
-	}
-
-	err = validateAcmeProvidedOrderDates(notBefore, notAfter)
-	if err != nil {
-		return nil, err
-	}
-
-	err = b.validateIdentifiersAgainstRole(ac.role, identifiers)
-	if err != nil {
-		return nil, err
-	}
-
-	// Per RFC 8555 -> 7.1.3. Order Objects
-	// For pending orders, the authorizations that the client needs to complete before the
-	// requested certificate can be issued (see Section 7.5), including
-	// unexpired authorizations that the client has completed in the past
-	// for identifiers specified in the order.
-	//
-	// Since we are generating all authorizations here, there is no need to filter them out
-	// IF/WHEN we support pre-authz workflows and associate existing authorizations to this
-	// order they will need filtering.
-	var authorizations []*ACMEAuthorization
-	var authorizationIds []string
-	for _, identifier := range identifiers {
-		authz, err := generateAuthorization(account, identifier)
-		if err != nil {
-			return nil, fmt.Errorf("error generating authorizations: %w", err)
-		}
-		authorizations = append(authorizations, authz)
-
-		err = b.acmeState.SaveAuthorization(ac, authz)
-		if err != nil {
-			return nil, fmt.Errorf("failed storing authorization: %w", err)
-		}
-
-		authorizationIds = append(authorizationIds, authz.Id)
-	}
-
-	order := &acmeOrder{
-		OrderId:          genUuid(),
-		AccountId:        account.KeyId,
-		Status:           ACMEOrderPending,
-		Expires:          time.Now().Add(24 * time.Hour), // TODO: Readjust this based on authz and/or config
-		Identifiers:      identifiers,
-		AuthorizationIds: authorizationIds,
-	}
-
-	err = b.acmeState.SaveOrder(ac, order)
-	if err != nil {
-		return nil, fmt.Errorf("failed storing order: %w", err)
-	}
-
-	resp := formatOrderResponse(ac, order)
-
-	// Per RFC 8555 Section 7.4. Applying for Certificate Issuance:
-	//
-	// > If the server is willing to issue the requested certificate, it
-	// > responds with a 201 (Created) response.
-	resp.Data[logical.HTTPStatusCode] = http.StatusCreated
-	return resp, nil
-}
-
-func validateAcmeProvidedOrderDates(notBefore time.Time, notAfter time.Time) error {
-	if !notBefore.IsZero() && !notAfter.IsZero() {
-		if notBefore.Equal(notAfter) {
-			return fmt.Errorf("%w: provided notBefore and notAfter dates can not be equal", ErrMalformed)
-		}
-
-		if notBefore.After(notAfter) {
-			return fmt.Errorf("%w: provided notBefore can not be greater than notAfter", ErrMalformed)
-		}
-	}
-
-	if !notAfter.IsZero() {
-		if time.Now().After(notAfter) {
-			return fmt.Errorf("%w: provided notAfter can not be in the past", ErrMalformed)
-		}
-	}
-
-	return nil
-}
-
-func formatOrderResponse(acmeCtx *acmeContext, order *acmeOrder) *logical.Response {
-	baseOrderUrl := buildOrderUrl(acmeCtx, order.OrderId)
-
-	var authorizationUrls []string
-	for _, authId := range order.AuthorizationIds {
-		authorizationUrls = append(authorizationUrls, buildAuthorizationUrl(acmeCtx, authId))
-	}
-
-	var identifiers []map[string]interface{}
-	for _, identifier := range order.Identifiers {
-		identifiers = append(identifiers, identifier.NetworkMarshal( /* use original value */ true))
-	}
-
-	resp := &logical.Response{
-		Data: map[string]interface{}{
-			"status":         order.Status,
-			"expires":        order.Expires.Format(time.RFC3339),
-			"identifiers":    identifiers,
-			"authorizations": authorizationUrls,
-			"finalize":       baseOrderUrl + "/finalize",
-		},
-		Headers: map[string][]string{
-			"Location": {baseOrderUrl},
-		},
-	}
-
-	// Only reply with the certificate URL if we are in a valid order state.
-	if order.Status == ACMEOrderValid {
-		resp.Data["certificate"] = baseOrderUrl + "/cert"
-	}
-
-	return resp
-}
-
-func buildAuthorizationUrl(acmeCtx *acmeContext, authId string) string {
-	return acmeCtx.baseUrl.JoinPath("authorization", authId).String()
-}
-
-func buildOrderUrl(acmeCtx *acmeContext, orderId string) string {
-	return acmeCtx.baseUrl.JoinPath("order", orderId).String()
-}
-
-func generateAuthorization(acct *acmeAccount, identifier *ACMEIdentifier) (*ACMEAuthorization, error) {
-	authId := genUuid()
-
-	// Certain challenges have certain restrictions: DNS challenges cannot
-	// be used to validate IP addresses, and only DNS challenges can be used
-	// to validate wildcards.
-	allowedChallenges := []ACMEChallengeType{ACMEHTTPChallenge, ACMEDNSChallenge, ACMEALPNChallenge}
-	if identifier.Type == ACMEIPIdentifier {
-		allowedChallenges = []ACMEChallengeType{ACMEHTTPChallenge}
-	} else if identifier.IsWildcard {
-		allowedChallenges = []ACMEChallengeType{ACMEDNSChallenge}
-	}
-
-	var challenges []*ACMEChallenge
-	for _, challengeType := range allowedChallenges {
-		token, err := getACMEToken()
-		if err != nil {
-			return nil, err
-		}
-
-		challenge := &ACMEChallenge{
-			Type:   challengeType,
-			Status: ACMEChallengePending,
-			ChallengeFields: map[string]interface{}{
-				"token": token,
-			},
-		}
-
-		challenges = append(challenges, challenge)
-	}
-
-	return &ACMEAuthorization{
-		Id:         authId,
-		AccountId:  acct.KeyId,
-		Identifier: identifier,
-		Status:     ACMEAuthorizationPending,
-		Expires:    "", // only populated when it switches to valid.
-		Challenges: challenges,
-		Wildcard:   identifier.IsWildcard,
-	}, nil
-}
-
-func parseOptRFC3339Field(data map[string]interface{}, keyName string) (time.Time, error) {
-	var timeVal time.Time
-	var err error
-
-	rawBefore, present := data[keyName]
-	if present {
-		beforeStr, ok := rawBefore.(string)
-		if !ok {
-			return timeVal, fmt.Errorf("invalid type (%T) for field '%s': %w", rawBefore, keyName, ErrMalformed)
-		}
-		timeVal, err = time.Parse(time.RFC3339, beforeStr)
-		if err != nil {
-			return timeVal, fmt.Errorf("failed parsing field '%s' (%s): %s: %w", keyName, rawBefore, err.Error(), ErrMalformed)
-		}
-
-		if timeVal.IsZero() {
-			return timeVal, fmt.Errorf("provided time value is invalid '%s' (%s): %w", keyName, rawBefore, ErrMalformed)
-		}
-	}
-
-	return timeVal, nil
-}
-
-func parseOrderIdentifiers(data map[string]interface{}) ([]*ACMEIdentifier, error) {
-	rawIdentifiers, present := data["identifiers"]
-	if !present {
-		return nil, fmt.Errorf("missing required identifiers argument: %w", ErrMalformed)
-	}
-
-	listIdentifiers, ok := rawIdentifiers.([]interface{})
-	if !ok {
-		return nil, fmt.Errorf("invalid type (%T) for field 'identifiers': %w", rawIdentifiers, ErrMalformed)
-	}
-
-	var identifiers []*ACMEIdentifier
-	for _, rawIdentifier := range listIdentifiers {
-		mapIdentifier, ok := rawIdentifier.(map[string]interface{})
-		if !ok {
-			return nil, fmt.Errorf("invalid type (%T) for value in 'identifiers': %w", rawIdentifier, ErrMalformed)
-		}
-
-		typeVal, present := mapIdentifier["type"]
-		if !present {
-			return nil, fmt.Errorf("missing type argument for value in 'identifiers': %w", ErrMalformed)
-		}
-		typeStr, ok := typeVal.(string)
-		if !ok {
-			return nil, fmt.Errorf("invalid type for type argument (%T) for value in 'identifiers': %w", typeStr, ErrMalformed)
-		}
-
-		valueVal, present := mapIdentifier["value"]
-		if !present {
-			return nil, fmt.Errorf("missing value argument for value in 'identifiers': %w", ErrMalformed)
-		}
-		valueStr, ok := valueVal.(string)
-		if !ok {
-			return nil, fmt.Errorf("invalid type for value argument (%T) for value in 'identifiers': %w", valueStr, ErrMalformed)
-		}
-
-		if len(valueStr) == 0 {
-			return nil, fmt.Errorf("value argument for value in 'identifiers' can not be blank: %w", ErrMalformed)
-		}
-
-		identifier := &ACMEIdentifier{
-			Value:         valueStr,
-			OriginalValue: valueStr,
-		}
-
-		switch typeStr {
-		case string(ACMEIPIdentifier):
-			identifier.Type = ACMEIPIdentifier
-			ip := net.ParseIP(valueStr)
-			if ip == nil {
-				return nil, fmt.Errorf("value argument (%s) failed validation: failed parsing as IP: %w", valueStr, ErrMalformed)
-			}
-		case string(ACMEDNSIdentifier):
-			identifier.Type = ACMEDNSIdentifier
-
-			// This check modifies the identifier if it is a wildcard,
-			// removing the non-wildcard portion. We do this before the
-			// IP address checks, in case of an attempt to bypass the IP/DNS
-			// check via including a leading wildcard (e.g., *.127.0.0.1).
-			//
-			// Per RFC 8555 Section 7.1.4. Authorization Objects:
-			//
-			// > Wildcard domain names (with "*" as the first label) MUST NOT
-			// > be included in authorization objects.
-			if _, _, err := identifier.MaybeParseWildcard(); err != nil {
-				return nil, fmt.Errorf("value argument (%s) failed validation: invalid wildcard: %v: %w", valueStr, err, ErrMalformed)
-			}
-
-			if isIP := net.ParseIP(identifier.Value); isIP != nil {
-				return nil, fmt.Errorf("refusing to accept argument (%s) as DNS type identifier: parsed OK as IP address: %w", valueStr, ErrMalformed)
-			}
-
-			// Use the reduced (identifier.Value) in case this was a wildcard
-			// domain.
-			p := idna.New(idna.ValidateForRegistration())
-			converted, err := p.ToASCII(identifier.Value)
-			if err != nil {
-				return nil, fmt.Errorf("value argument (%s) failed validation: %s: %w", valueStr, err.Error(), ErrMalformed)
-			}
-
-			// Per RFC 8555 Section 7.1.4. Authorization Objects:
-			//
-			// > The domain name MUST be encoded in the form in which it
-			// > would appear in a certificate.  That is, it MUST be encoded
-			// > according to the rules in Section 7 of [RFC5280]. Servers
-			// > MUST verify any identifier values that begin with the
-			// > ASCII-Compatible Encoding prefix "xn--" as defined in
-			// > [RFC5890] are properly encoded.
-			if identifier.Value != converted {
-				return nil, fmt.Errorf("value argument (%s) failed IDNA round-tripping to ASCII: %w", valueStr, ErrMalformed)
-			}
-		default:
-			return nil, fmt.Errorf("unsupported identifier type %s: %w", typeStr, ErrUnsupportedIdentifier)
-		}
-
-		identifiers = append(identifiers, identifier)
-	}
-
-	return identifiers, nil
-}
-
-func (b *backend) acmeTidyOrder(ac *acmeContext, accountId string, orderPath string, certTidyBuffer time.Duration) (bool, time.Time, error) {
-	// First we get the order; note that the orderPath includes the account
-	// It's only accessed at acme/orders/<order_id> with the account context
-	// It's saved at acme/<account_id>/orders/<orderId>
-	entry, err := ac.sc.Storage.Get(ac.sc.Context, orderPath)
-	if err != nil {
-		return false, time.Time{}, fmt.Errorf("error loading order: %w", err)
-	}
-	if entry == nil {
-		return false, time.Time{}, fmt.Errorf("order does not exist: %w", ErrMalformed)
-	}
-	var order acmeOrder
-	err = entry.DecodeJSON(&order)
-	if err != nil {
-		return false, time.Time{}, fmt.Errorf("error decoding order: %w", err)
-	}
-
-	// Determine whether we should tidy this order
-	shouldTidy := false
-
-	// Track either the order expiry or certificate expiry to return to the caller, this
-	// can be used to influence the account's expiry
-	orderExpiry := order.CertificateExpiry
-
-	// It is faster to check certificate information on the order entry rather than fetch the cert entry to parse:
-	if !order.CertificateExpiry.IsZero() {
-		// This implies that a certificate exists
-		// When a certificate exists, we want to expire and tidy the order when we tidy the certificate:
-		if time.Now().After(order.CertificateExpiry.Add(certTidyBuffer)) { // It's time to clean
-			shouldTidy = true
-		}
-	} else {
-		// This implies that no certificate exists
-		// In this case, we want to expire the order after it has expired (+ some safety buffer)
-		if time.Now().After(order.Expires) {
-			shouldTidy = true
-		}
-		orderExpiry = order.Expires
-	}
-	if shouldTidy == false {
-		return shouldTidy, orderExpiry, nil
-	}
-
-	// Tidy this Order
-	// That includes any certificate acme/<account_id>/orders/orderPath/cert
-	// That also includes any related authorizations: acme/<account_id>/authorizations/<auth_id>
-
-	// First Authorizations
-	for _, authorizationId := range order.AuthorizationIds {
-		err = ac.sc.Storage.Delete(ac.sc.Context, getAuthorizationPath(accountId, authorizationId))
-		if err != nil {
-			return false, orderExpiry, err
-		}
-	}
-
-	// Normal Tidy will Take Care of the Certificate, we need to clean up the certificate to account tracker though
-	err = ac.sc.Storage.Delete(ac.sc.Context, getAcmeSerialToAccountTrackerPath(accountId, order.CertificateSerialNumber))
-	if err != nil {
-		return false, orderExpiry, err
-	}
-
-	// And Finally, the order:
-	err = ac.sc.Storage.Delete(ac.sc.Context, orderPath)
-	if err != nil {
-		return false, orderExpiry, err
-	}
-	b.tidyStatusIncDelAcmeOrderCount()
-
-	return true, orderExpiry, nil
-}
diff --git a/builtin/logical/pki/path_acme_order_test.go b/builtin/logical/pki/path_acme_order_test.go
deleted file mode 100644
index 5340bbd31caca..0000000000000
--- a/builtin/logical/pki/path_acme_order_test.go
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package pki
-
-import (
-	"net"
-	"testing"
-
-	"github.com/hashicorp/vault/sdk/framework"
-	"github.com/hashicorp/vault/sdk/logical"
-	"github.com/stretchr/testify/require"
-)
-
-// TestACME_ValidateIdentifiersAgainstRole Verify the ACME order creation
-// function verifies somewhat the identifiers that were provided have a
-// decent chance of being allowed by the selected role.
-func TestACME_ValidateIdentifiersAgainstRole(t *testing.T) {
-	b, _ := CreateBackendWithStorage(t)
-
-	tests := []struct {
-		name        string
-		role        *roleEntry
-		identifiers []*ACMEIdentifier
-		expectErr   bool
-	}{
-		{
-			name:        "verbatim-role-allows-dns-ip",
-			role:        buildSignVerbatimRoleWithNoData(nil),
-			identifiers: _buildACMEIdentifiers("test.com", "127.0.0.1"),
-			expectErr:   false,
-		},
-		{
-			name:        "default-role-does-not-allow-dns",
-			role:        buildTestRole(t, nil),
-			identifiers: _buildACMEIdentifiers("www.test.com"),
-			expectErr:   true,
-		},
-		{
-			name:        "default-role-allows-ip",
-			role:        buildTestRole(t, nil),
-			identifiers: _buildACMEIdentifiers("192.168.0.1"),
-			expectErr:   false,
-		},
-		{
-			name:        "disable-ip-sans-forbids-ip",
-			role:        buildTestRole(t, map[string]interface{}{"allow_ip_sans": false}),
-			identifiers: _buildACMEIdentifiers("192.168.0.1"),
-			expectErr:   true,
-		},
-		{
-			name: "role-no-wildcards-allowed-without",
-			role: buildTestRole(t, map[string]interface{}{
-				"allow_subdomains":            true,
-				"allow_bare_domains":          true,
-				"allowed_domains":             []string{"test.com"},
-				"allow_wildcard_certificates": false,
-			}),
-			identifiers: _buildACMEIdentifiers("www.test.com", "test.com"),
-			expectErr:   false,
-		},
-		{
-			name: "role-no-wildcards-allowed-with-wildcard",
-			role: buildTestRole(t, map[string]interface{}{
-				"allow_subdomains":            true,
-				"allowed_domains":             []string{"test.com"},
-				"allow_wildcard_certificates": false,
-			}),
-			identifiers: _buildACMEIdentifiers("*.test.com"),
-			expectErr:   true,
-		},
-		{
-			name: "role-wildcards-allowed-with-wildcard",
-			role: buildTestRole(t, map[string]interface{}{
-				"allow_subdomains":            true,
-				"allowed_domains":             []string{"test.com"},
-				"allow_wildcard_certificates": true,
-			}),
-			identifiers: _buildACMEIdentifiers("*.test.com"),
-			expectErr:   false,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			err := b.validateIdentifiersAgainstRole(tt.role, tt.identifiers)
-
-			if tt.expectErr {
-				require.Error(t, err, "validateIdentifiersAgainstRole(%v, %v)", tt.role.ToResponseData(), tt.identifiers)
-				// If we did return an error if should be classified as a ErrRejectedIdentifier
-				require.ErrorIs(t, err, ErrRejectedIdentifier)
-			} else {
-				require.NoError(t, err, "validateIdentifiersAgainstRole(%v, %v)", tt.role.ToResponseData(), tt.identifiers)
-			}
-		})
-	}
-}
-
-func _buildACMEIdentifiers(values ...string) []*ACMEIdentifier {
-	var identifiers []*ACMEIdentifier
-
-	for _, value := range values {
-		identifiers = append(identifiers, _buildACMEIdentifier(value))
-	}
-
-	return identifiers
-}
-
-func _buildACMEIdentifier(val string) *ACMEIdentifier {
-	ip := net.ParseIP(val)
-	if ip == nil {
-		identifier := &ACMEIdentifier{Type: "dns", Value: val, OriginalValue: val, IsWildcard: false}
-		_, _, _ = identifier.MaybeParseWildcard()
-		return identifier
-	}
-
-	return &ACMEIdentifier{Type: "ip", Value: val, OriginalValue: val, IsWildcard: false}
-}
-
-// Easily allow tests to create valid roles with proper defaults, since we don't have an easy
-// way to generate roles with proper defaults, go through the createRole handler with the handlers
-// field data so we pickup all the defaults specified there.
-func buildTestRole(t *testing.T, config map[string]interface{}) *roleEntry {
-	b, s := CreateBackendWithStorage(t)
-
-	path := pathRoles(b)
-	fields := path.Fields
-	if config == nil {
-		config = map[string]interface{}{}
-	}
-
-	if _, exists := config["name"]; !exists {
-		config["name"] = genUuid()
-	}
-
-	_, err := b.pathRoleCreate(ctx, &logical.Request{Storage: s}, &framework.FieldData{Raw: config, Schema: fields})
-	require.NoError(t, err, "failed generating role with config %v", config)
-
-	role, err := b.getRole(ctx, s, config["name"].(string))
-	require.NoError(t, err, "failed loading stored role")
-
-	return role
-}
diff --git a/builtin/logical/pki/path_acme_revoke.go b/builtin/logical/pki/path_acme_revoke.go
deleted file mode 100644
index 9a71f1cd91100..0000000000000
--- a/builtin/logical/pki/path_acme_revoke.go
+++ /dev/null
@@ -1,176 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package pki
-
-import (
-	"bytes"
-	"crypto"
-	"crypto/x509"
-	"encoding/base64"
-	"fmt"
-	"time"
-
-	"github.com/hashicorp/vault/sdk/framework"
-	"github.com/hashicorp/vault/sdk/logical"
-)
-
-func pathAcmeRevoke(b *backend) []*framework.Path {
-	return buildAcmeFrameworkPaths(b, patternAcmeRevoke, "/revoke-cert")
-}
-
-func patternAcmeRevoke(b *backend, pattern string) *framework.Path {
-	fields := map[string]*framework.FieldSchema{}
-	addFieldsForACMEPath(fields, pattern)
-	addFieldsForACMERequest(fields)
-
-	return &framework.Path{
-		Pattern: pattern,
-		Fields:  fields,
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.UpdateOperation: &framework.PathOperation{
-				Callback:                    b.acmeParsedWrapper(b.acmeRevocationHandler),
-				ForwardPerformanceSecondary: false,
-				ForwardPerformanceStandby:   true,
-			},
-		},
-
-		HelpSynopsis:    pathAcmeHelpSync,
-		HelpDescription: pathAcmeHelpDesc,
-	}
-}
-
-func (b *backend) acmeRevocationHandler(acmeCtx *acmeContext, _ *logical.Request, _ *framework.FieldData, userCtx *jwsCtx, data map[string]interface{}) (*logical.Response, error) {
-	var cert *x509.Certificate
-
-	rawCertificate, present := data["certificate"]
-	if present {
-		certBase64, ok := rawCertificate.(string)
-		if !ok {
-			return nil, fmt.Errorf("invalid type (%T; expected string) for field 'certificate': %w", rawCertificate, ErrMalformed)
-		}
-
-		certBytes, err := base64.RawURLEncoding.DecodeString(certBase64)
-		if err != nil {
-			return nil, fmt.Errorf("failed to base64 decode certificate: %v: %w", err, ErrMalformed)
-		}
-
-		cert, err = x509.ParseCertificate(certBytes)
-		if err != nil {
-			return nil, fmt.Errorf("failed to parse certificate: %v: %w", err, ErrMalformed)
-		}
-	} else {
-		return nil, fmt.Errorf("bad request was lacking required field 'certificate': %w", ErrMalformed)
-	}
-
-	rawReason, present := data["reason"]
-	if present {
-		reason, ok := rawReason.(float64)
-		if !ok {
-			return nil, fmt.Errorf("invalid type (%T; expected float64) for field 'reason': %w", rawReason, ErrMalformed)
-		}
-
-		if int(reason) != 0 {
-			return nil, fmt.Errorf("Vault does not support revocation reasons (got %v; expected omitted or 0/unspecified): %w", int(reason), ErrBadRevocationReason)
-		}
-	}
-
-	// If the certificate expired, there's no point in revoking it.
-	if cert.NotAfter.Before(time.Now()) {
-		return nil, fmt.Errorf("refusing to revoke expired certificate: %w", ErrMalformed)
-	}
-
-	// Fetch the CRL config as we need it to ultimately do the
-	// revocation. This should be cached and thus relatively fast.
-	config, err := b.crlBuilder.getConfigWithUpdate(acmeCtx.sc)
-	if err != nil {
-		return nil, fmt.Errorf("unable to revoke certificate: failed reading revocation config: %v: %w", err, ErrServerInternal)
-	}
-
-	// Load our certificate from storage to ensure it exists and matches
-	// what was given to us.
-	serial := serialFromCert(cert)
-	certEntry, err := fetchCertBySerial(acmeCtx.sc, "certs/", serial)
-	if err != nil {
-		return nil, fmt.Errorf("unable to revoke certificate: err reading global cert entry: %v: %w", err, ErrServerInternal)
-	}
-	if certEntry == nil {
-		return nil, fmt.Errorf("unable to revoke certificate: no global cert entry found: %w", ErrServerInternal)
-	}
-
-	// Validate that the provided certificate matches the stored
-	// certificate. This completes the chain of:
-	//
-	//     provided_auth -> provided_cert == stored cert.
-	//
-	// Allowing revocation to be safe.
-	//
-	// We use the non-subtle unsafe bytes equality check here as we have
-	// already fetched this certificate from storage, thus already leaking
-	// timing information that this cert exists. The user could thus simply
-	// fetch the cert from Vault matching this serial number via the unauthed
-	// pki/certs/:serial API endpoint.
-	if !bytes.Equal(certEntry.Value, cert.Raw) {
-		return nil, fmt.Errorf("unable to revoke certificate: supplied certificate does not match CA's stored value: %w", ErrMalformed)
-	}
-
-	// Check if it was already revoked; in this case, we do not need to
-	// revoke it again and want to respond with an appropriate error message.
-	revEntry, err := fetchCertBySerial(acmeCtx.sc, "revoked/", serial)
-	if err != nil {
-		return nil, fmt.Errorf("unable to revoke certificate: err reading revocation entry: %v: %w", err, ErrServerInternal)
-	}
-	if revEntry != nil {
-		return nil, fmt.Errorf("unable to revoke certificate: %w", ErrAlreadyRevoked)
-	}
-
-	// Finally, do the relevant permissions/authorization check as
-	// appropriate based on the type of revocation happening.
-	if !userCtx.Existing {
-		return b.acmeRevocationByPoP(acmeCtx, userCtx, cert, config)
-	}
-
-	return b.acmeRevocationByAccount(acmeCtx, userCtx, cert, config)
-}
-
-func (b *backend) acmeRevocationByPoP(acmeCtx *acmeContext, userCtx *jwsCtx, cert *x509.Certificate, config *crlConfig) (*logical.Response, error) {
-	// Since this account does not exist, ensure we've gotten a private key
-	// matching the certificate's public key.
-	signer, ok := userCtx.Key.Key.(crypto.Signer)
-	if !ok {
-		return nil, fmt.Errorf("unable to revoke certificate: unable to parse JWS key of type (%T): %w", userCtx.Key.Key, ErrMalformed)
-	}
-
-	// Ensure that our PoP is indeed valid.
-	if err := validatePrivateKeyMatchesCert(signer, cert); err != nil {
-		return nil, fmt.Errorf("unable to revoke certificate: unable to verify proof of possession: %v: %w", err, ErrMalformed)
-	}
-
-	// Now it is safe to revoke.
-	b.revokeStorageLock.Lock()
-	defer b.revokeStorageLock.Unlock()
-
-	return revokeCert(acmeCtx.sc, config, cert)
-}
-
-func (b *backend) acmeRevocationByAccount(acmeCtx *acmeContext, userCtx *jwsCtx, cert *x509.Certificate, config *crlConfig) (*logical.Response, error) {
-	// Fetch the account; disallow revocations from non-valid-status accounts.
-	_, err := requireValidAcmeAccount(acmeCtx, userCtx)
-	if err != nil {
-		return nil, fmt.Errorf("failed to lookup account: %w", err)
-	}
-
-	// We only support certificates issued by this user, we don't support
-	// cross-account revocations.
-	serial := serialFromCert(cert)
-	acmeEntry, err := b.acmeState.GetIssuedCert(acmeCtx, userCtx.Kid, serial)
-	if err != nil || acmeEntry == nil {
-		return nil, fmt.Errorf("unable to revoke certificate: %v: %w", err, ErrMalformed)
-	}
-
-	// Now it is safe to revoke.
-	b.revokeStorageLock.Lock()
-	defer b.revokeStorageLock.Unlock()
-
-	return revokeCert(acmeCtx.sc, config, cert)
-}
diff --git a/builtin/logical/pki/path_acme_test.go b/builtin/logical/pki/path_acme_test.go
deleted file mode 100644
index aed906863466f..0000000000000
--- a/builtin/logical/pki/path_acme_test.go
+++ /dev/null
@@ -1,1578 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package pki
-
-import (
-	"context"
-	"crypto"
-	"crypto/ecdsa"
-	"crypto/elliptic"
-	"crypto/rand"
-	"crypto/rsa"
-	"crypto/x509"
-	"crypto/x509/pkix"
-	"encoding/base64"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net"
-	"net/http"
-	"os"
-	"path"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/hashicorp/vault/sdk/helper/certutil"
-
-	"github.com/go-test/deep"
-	"github.com/stretchr/testify/require"
-	"golang.org/x/crypto/acme"
-	"golang.org/x/net/http2"
-
-	"github.com/hashicorp/go-cleanhttp"
-	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/builtin/logical/pki/dnstest"
-	"github.com/hashicorp/vault/helper/constants"
-	"github.com/hashicorp/vault/helper/testhelpers"
-	vaulthttp "github.com/hashicorp/vault/http"
-	"github.com/hashicorp/vault/sdk/helper/jsonutil"
-	"github.com/hashicorp/vault/sdk/logical"
-	"github.com/hashicorp/vault/vault"
-)
-
-// TestAcmeBasicWorkflow a test that will validate a basic ACME workflow using the Golang ACME client.
-func TestAcmeBasicWorkflow(t *testing.T) {
-	t.Parallel()
-	cluster, client, _ := setupAcmeBackend(t)
-	defer cluster.Cleanup()
-	cases := []struct {
-		name      string
-		prefixUrl string
-	}{
-		{"root", "acme/"},
-		{"role", "roles/test-role/acme/"},
-		{"issuer", "issuer/int-ca/acme/"},
-		{"issuer_role", "issuer/int-ca/roles/test-role/acme/"},
-	}
-	testCtx := context.Background()
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			baseAcmeURL := "/v1/pki/" + tc.prefixUrl
-			accountKey, err := rsa.GenerateKey(rand.Reader, 2048)
-			require.NoError(t, err, "failed creating rsa key")
-
-			acmeClient := getAcmeClientForCluster(t, cluster, baseAcmeURL, accountKey)
-
-			t.Logf("Testing discover on %s", baseAcmeURL)
-			discovery, err := acmeClient.Discover(testCtx)
-			require.NoError(t, err, "failed acme discovery call")
-
-			discoveryBaseUrl := client.Address() + baseAcmeURL
-			require.Equal(t, discoveryBaseUrl+"new-nonce", discovery.NonceURL)
-			require.Equal(t, discoveryBaseUrl+"new-account", discovery.RegURL)
-			require.Equal(t, discoveryBaseUrl+"new-order", discovery.OrderURL)
-			require.Equal(t, discoveryBaseUrl+"revoke-cert", discovery.RevokeURL)
-			require.Equal(t, discoveryBaseUrl+"key-change", discovery.KeyChangeURL)
-			require.False(t, discovery.ExternalAccountRequired, "bad value for external account required in directory")
-
-			// Attempt to update prior to creating an account
-			t.Logf("Testing updates with no proper account fail on %s", baseAcmeURL)
-			_, err = acmeClient.UpdateReg(testCtx, &acme.Account{Contact: []string{"mailto:shouldfail@example.com"}})
-			require.ErrorIs(t, err, acme.ErrNoAccount, "expected failure attempting to update prior to account registration")
-
-			// Create new account
-			t.Logf("Testing register on %s", baseAcmeURL)
-			acct, err := acmeClient.Register(testCtx, &acme.Account{
-				Contact: []string{"mailto:test@example.com", "mailto:test2@test.com"},
-			}, func(tosURL string) bool { return true })
-			require.NoError(t, err, "failed registering account")
-			require.Equal(t, acme.StatusValid, acct.Status)
-			require.Contains(t, acct.Contact, "mailto:test@example.com")
-			require.Contains(t, acct.Contact, "mailto:test2@test.com")
-			require.Len(t, acct.Contact, 2)
-
-			// Call register again we should get existing account
-			t.Logf("Testing duplicate register returns existing account on %s", baseAcmeURL)
-			_, err = acmeClient.Register(testCtx, acct, func(tosURL string) bool { return true })
-			require.ErrorIs(t, err, acme.ErrAccountAlreadyExists,
-				"We should have returned a 200 status code which would have triggered an error in the golang acme"+
-					" library")
-
-			// Update contact
-			t.Logf("Testing Update account contacts on %s", baseAcmeURL)
-			acct.Contact = []string{"mailto:test3@example.com"}
-			acct2, err := acmeClient.UpdateReg(testCtx, acct)
-			require.NoError(t, err, "failed updating account")
-			require.Equal(t, acme.StatusValid, acct2.Status)
-			// We should get this back, not the original values.
-			require.Contains(t, acct2.Contact, "mailto:test3@example.com")
-			require.Len(t, acct2.Contact, 1)
-
-			// Make sure order's do not accept dates
-			_, err = acmeClient.AuthorizeOrder(testCtx, []acme.AuthzID{{Type: "dns", Value: "localhost"}},
-				acme.WithOrderNotBefore(time.Now().Add(10*time.Minute)))
-			require.Error(t, err, "should have rejected a new order with NotBefore set")
-
-			_, err = acmeClient.AuthorizeOrder(testCtx, []acme.AuthzID{{Type: "dns", Value: "localhost"}},
-				acme.WithOrderNotAfter(time.Now().Add(10*time.Minute)))
-			require.Error(t, err, "should have rejected a new order with NotAfter set")
-
-			// Make sure DNS identifiers cannot include IP addresses
-			_, err = acmeClient.AuthorizeOrder(testCtx, []acme.AuthzID{{Type: "dns", Value: "127.0.0.1"}},
-				acme.WithOrderNotAfter(time.Now().Add(10*time.Minute)))
-			require.Error(t, err, "should have rejected a new order with IP-like DNS-type identifier")
-			_, err = acmeClient.AuthorizeOrder(testCtx, []acme.AuthzID{{Type: "dns", Value: "*.127.0.0.1"}},
-				acme.WithOrderNotAfter(time.Now().Add(10*time.Minute)))
-			require.Error(t, err, "should have rejected a new order with IP-like DNS-type identifier")
-
-			// Create an order
-			t.Logf("Testing Authorize Order on %s", baseAcmeURL)
-			identifiers := []string{"localhost.localdomain", "*.localdomain"}
-			createOrder, err := acmeClient.AuthorizeOrder(testCtx, []acme.AuthzID{
-				{Type: "dns", Value: identifiers[0]},
-				{Type: "dns", Value: identifiers[1]},
-			})
-			require.NoError(t, err, "failed creating order")
-			require.Equal(t, acme.StatusPending, createOrder.Status)
-			require.Empty(t, createOrder.CertURL)
-			require.Equal(t, createOrder.URI+"/finalize", createOrder.FinalizeURL)
-			require.Len(t, createOrder.AuthzURLs, 2, "expected two authzurls")
-
-			// Get order
-			t.Logf("Testing GetOrder on %s", baseAcmeURL)
-			getOrder, err := acmeClient.GetOrder(testCtx, createOrder.URI)
-			require.NoError(t, err, "failed fetching order")
-			require.Equal(t, acme.StatusPending, createOrder.Status)
-			if diffs := deep.Equal(createOrder, getOrder); diffs != nil {
-				t.Fatalf("Differences exist between create and get order: \n%v", strings.Join(diffs, "\n"))
-			}
-
-			// Make sure the identifiers returned in the order contain the original values
-			var ids []string
-			for _, id := range getOrder.Identifiers {
-				require.Equal(t, "dns", id.Type)
-				ids = append(ids, id.Value)
-			}
-			require.ElementsMatch(t, identifiers, ids, "order responses should have all original identifiers")
-
-			// Load authorizations
-			var authorizations []*acme.Authorization
-			for _, authUrl := range getOrder.AuthzURLs {
-				auth, err := acmeClient.GetAuthorization(testCtx, authUrl)
-				require.NoError(t, err, "failed fetching authorization: %s", authUrl)
-
-				authorizations = append(authorizations, auth)
-			}
-
-			// We should have 2 separate auth challenges as we have two separate identifier
-			require.Len(t, authorizations, 2, "expected 2 authorizations in order")
-
-			var wildcardAuth *acme.Authorization
-			var domainAuth *acme.Authorization
-			for _, auth := range authorizations {
-				if auth.Wildcard {
-					wildcardAuth = auth
-				} else {
-					domainAuth = auth
-				}
-			}
-
-			// Test the values for the domain authentication
-			require.Equal(t, acme.StatusPending, domainAuth.Status)
-			require.Equal(t, "dns", domainAuth.Identifier.Type)
-			require.Equal(t, "localhost.localdomain", domainAuth.Identifier.Value)
-			require.False(t, domainAuth.Wildcard, "should not be a wildcard")
-			require.True(t, domainAuth.Expires.IsZero(), "authorization should only have expiry set on valid status")
-
-			require.Len(t, domainAuth.Challenges, 3, "expected three challenges")
-			require.Equal(t, acme.StatusPending, domainAuth.Challenges[0].Status)
-			require.True(t, domainAuth.Challenges[0].Validated.IsZero(), "validated time should be 0 on challenge")
-			require.Equal(t, "http-01", domainAuth.Challenges[0].Type)
-			require.NotEmpty(t, domainAuth.Challenges[0].Token, "missing challenge token")
-			require.Equal(t, acme.StatusPending, domainAuth.Challenges[1].Status)
-			require.True(t, domainAuth.Challenges[1].Validated.IsZero(), "validated time should be 0 on challenge")
-			require.Equal(t, "dns-01", domainAuth.Challenges[1].Type)
-			require.NotEmpty(t, domainAuth.Challenges[1].Token, "missing challenge token")
-			require.Equal(t, acme.StatusPending, domainAuth.Challenges[2].Status)
-			require.True(t, domainAuth.Challenges[2].Validated.IsZero(), "validated time should be 0 on challenge")
-			require.Equal(t, "tls-alpn-01", domainAuth.Challenges[2].Type)
-			require.NotEmpty(t, domainAuth.Challenges[2].Token, "missing challenge token")
-
-			// Test the values for the wildcard authentication
-			require.Equal(t, acme.StatusPending, wildcardAuth.Status)
-			require.Equal(t, "dns", wildcardAuth.Identifier.Type)
-			require.Equal(t, "localdomain", wildcardAuth.Identifier.Value) // Make sure we strip the *. in auth responses
-			require.True(t, wildcardAuth.Wildcard, "should be a wildcard")
-			require.True(t, wildcardAuth.Expires.IsZero(), "authorization should only have expiry set on valid status")
-
-			require.Len(t, wildcardAuth.Challenges, 1, "expected one challenge")
-			require.Equal(t, acme.StatusPending, domainAuth.Challenges[0].Status)
-			require.True(t, wildcardAuth.Challenges[0].Validated.IsZero(), "validated time should be 0 on challenge")
-			require.Equal(t, "dns-01", wildcardAuth.Challenges[0].Type)
-			require.NotEmpty(t, domainAuth.Challenges[0].Token, "missing challenge token")
-
-			// Make sure that getting a challenge does not start it.
-			challenge, err := acmeClient.GetChallenge(testCtx, domainAuth.Challenges[0].URI)
-			require.NoError(t, err, "failed to load challenge")
-			require.Equal(t, acme.StatusPending, challenge.Status)
-			require.True(t, challenge.Validated.IsZero(), "validated time should be 0 on challenge")
-			require.Equal(t, "http-01", challenge.Type)
-
-			// Accept a challenge; this triggers validation to start.
-			challenge, err = acmeClient.Accept(testCtx, domainAuth.Challenges[0])
-			require.NoError(t, err, "failed to load challenge")
-			require.Equal(t, acme.StatusProcessing, challenge.Status)
-			require.True(t, challenge.Validated.IsZero(), "validated time should be 0 on challenge")
-			require.Equal(t, "http-01", challenge.Type)
-
-			require.NotEmpty(t, challenge.Token, "missing challenge token")
-
-			// HACK: Update authorization/challenge to completed as we can't really do it properly in this workflow
-			//       test.
-			markAuthorizationSuccess(t, client, acmeClient, acct, getOrder)
-
-			// Make sure sending a CSR with the account key gets rejected.
-			goodCr := &x509.CertificateRequest{
-				Subject:  pkix.Name{CommonName: identifiers[1]},
-				DNSNames: []string{identifiers[0], identifiers[1]},
-			}
-			t.Logf("csr: %v", goodCr)
-
-			// We want to make sure people are not using the same keys for CSR/Certs and their ACME account.
-			csrSignedWithAccountKey, err := x509.CreateCertificateRequest(rand.Reader, goodCr, accountKey)
-			require.NoError(t, err, "failed generating csr")
-			_, _, err = acmeClient.CreateOrderCert(testCtx, createOrder.FinalizeURL, csrSignedWithAccountKey, true)
-			require.Error(t, err, "should not be allowed to use the account key for a CSR")
-
-			csrKey, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
-			require.NoError(t, err, "failed generated key for CSR")
-
-			// Validate we reject CSRs that contain CN that aren't in the original order
-			badCr := &x509.CertificateRequest{
-				Subject:  pkix.Name{CommonName: "not-in-original-order.com"},
-				DNSNames: []string{identifiers[0], identifiers[1]},
-			}
-			t.Logf("csr: %v", badCr)
-
-			csrWithBadCName, err := x509.CreateCertificateRequest(rand.Reader, badCr, csrKey)
-			require.NoError(t, err, "failed generating csr with bad common name")
-
-			_, _, err = acmeClient.CreateOrderCert(testCtx, createOrder.FinalizeURL, csrWithBadCName, true)
-			require.Error(t, err, "should not be allowed to csr with different common names than order")
-
-			// Validate we reject CSRs that contain DNS names that aren't in the original order
-			badCr = &x509.CertificateRequest{
-				Subject:  pkix.Name{CommonName: createOrder.Identifiers[0].Value},
-				DNSNames: []string{"www.notinorder.com"},
-			}
-
-			csrWithBadName, err := x509.CreateCertificateRequest(rand.Reader, badCr, csrKey)
-			require.NoError(t, err, "failed generating csr with bad name")
-
-			_, _, err = acmeClient.CreateOrderCert(testCtx, createOrder.FinalizeURL, csrWithBadName, true)
-			require.Error(t, err, "should not be allowed to csr with different names than order")
-
-			// Validate we reject CSRs that contain IP addreses that weren't in the original order
-			badCr = &x509.CertificateRequest{
-				Subject:     pkix.Name{CommonName: createOrder.Identifiers[0].Value},
-				IPAddresses: []net.IP{{127, 0, 0, 1}},
-			}
-
-			csrWithBadIP, err := x509.CreateCertificateRequest(rand.Reader, badCr, csrKey)
-			require.NoError(t, err, "failed generating csr with bad name")
-
-			_, _, err = acmeClient.CreateOrderCert(testCtx, createOrder.FinalizeURL, csrWithBadIP, true)
-			require.Error(t, err, "should not be allowed to csr with different ip address than order")
-
-			// Validate we reject CSRs that contains fewer names than in the original order.
-			badCr = &x509.CertificateRequest{
-				Subject: pkix.Name{CommonName: identifiers[0]},
-			}
-
-			csrWithBadName, err = x509.CreateCertificateRequest(rand.Reader, badCr, csrKey)
-			require.NoError(t, err, "failed generating csr with bad name")
-
-			_, _, err = acmeClient.CreateOrderCert(testCtx, createOrder.FinalizeURL, csrWithBadName, true)
-			require.Error(t, err, "should not be allowed to csr with different names than order")
-
-			// Finally test a proper CSR, with the correct name and signed with a different key works.
-			csr, err := x509.CreateCertificateRequest(rand.Reader, goodCr, csrKey)
-			require.NoError(t, err, "failed generating csr")
-
-			certs, _, err := acmeClient.CreateOrderCert(testCtx, createOrder.FinalizeURL, csr, true)
-			require.NoError(t, err, "failed finalizing order")
-			require.Len(t, certs, 3, "expected three items within the returned certs")
-
-			testAcmeCertSignedByCa(t, client, certs, "int-ca")
-
-			// Make sure the certificate has a NotAfter date of a maximum of 90 days
-			acmeCert, err := x509.ParseCertificate(certs[0])
-			require.NoError(t, err, "failed parsing acme cert bytes")
-			maxAcmeNotAfter := time.Now().Add(maxAcmeCertTTL)
-			if maxAcmeNotAfter.Before(acmeCert.NotAfter) {
-				require.Fail(t, fmt.Sprintf("certificate has a NotAfter value %v greater than ACME max ttl %v", acmeCert.NotAfter, maxAcmeNotAfter))
-			}
-			// Deactivate account
-			t.Logf("Testing deactivate account on %s", baseAcmeURL)
-			err = acmeClient.DeactivateReg(testCtx)
-			require.NoError(t, err, "failed deactivating account")
-
-			// Make sure we get an unauthorized error trying to update the account again.
-			t.Logf("Testing update on deactivated account fails on %s", baseAcmeURL)
-			_, err = acmeClient.UpdateReg(testCtx, acct)
-			require.Error(t, err, "expected account to be deactivated")
-			require.IsType(t, &acme.Error{}, err, "expected acme error type")
-			acmeErr := err.(*acme.Error)
-			require.Equal(t, "urn:ietf:params:acme:error:unauthorized", acmeErr.ProblemType)
-		})
-	}
-}
-
-// TestAcmeBasicWorkflowWithEab verify that new accounts require EAB's if enforced by configuration.
-func TestAcmeBasicWorkflowWithEab(t *testing.T) {
-	t.Parallel()
-	cluster, client, _ := setupAcmeBackend(t)
-	defer cluster.Cleanup()
-	testCtx := context.Background()
-
-	// Enable EAB
-	_, err := client.Logical().WriteWithContext(context.Background(), "pki/config/acme", map[string]interface{}{
-		"enabled":    true,
-		"eab_policy": "always-required",
-	})
-	require.NoError(t, err)
-
-	cases := []struct {
-		name      string
-		prefixUrl string
-	}{
-		{"root", "acme/"},
-		{"role", "roles/test-role/acme/"},
-		{"issuer", "issuer/int-ca/acme/"},
-		{"issuer_role", "issuer/int-ca/roles/test-role/acme/"},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			baseAcmeURL := "/v1/pki/" + tc.prefixUrl
-			accountKey, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
-			require.NoError(t, err, "failed creating ec key")
-
-			acmeClient := getAcmeClientForCluster(t, cluster, baseAcmeURL, accountKey)
-
-			t.Logf("Testing discover on %s", baseAcmeURL)
-			discovery, err := acmeClient.Discover(testCtx)
-			require.NoError(t, err, "failed acme discovery call")
-			require.True(t, discovery.ExternalAccountRequired, "bad value for external account required in directory")
-
-			// Create new account without EAB, should fail
-			t.Logf("Testing register on %s", baseAcmeURL)
-			_, err = acmeClient.Register(testCtx, &acme.Account{}, func(tosURL string) bool { return true })
-			require.ErrorContains(t, err, "urn:ietf:params:acme:error:externalAccountRequired",
-				"expected failure creating an account without eab")
-
-			// Test fetch, list, delete workflow
-			kid, _ := getEABKey(t, client, tc.prefixUrl)
-			resp, err := client.Logical().ListWithContext(testCtx, "pki/eab")
-			require.NoError(t, err, "failed to list eab tokens")
-			require.NotNil(t, resp, "list response for eab tokens should not be nil")
-			require.Contains(t, resp.Data, "keys")
-			require.Contains(t, resp.Data, "key_info")
-			require.Len(t, resp.Data["keys"], 1)
-			require.Contains(t, resp.Data["keys"], kid)
-
-			_, err = client.Logical().DeleteWithContext(testCtx, "pki/eab/"+kid)
-			require.NoError(t, err, "failed to delete eab")
-
-			// List eabs should return zero results
-			resp, err = client.Logical().ListWithContext(testCtx, "pki/eab")
-			require.NoError(t, err, "failed to list eab tokens")
-			require.Nil(t, resp, "list response for eab tokens should have been nil")
-
-			// fetch a new EAB
-			kid, eabKeyBytes := getEABKey(t, client, tc.prefixUrl)
-			acct := &acme.Account{
-				ExternalAccountBinding: &acme.ExternalAccountBinding{
-					KID: kid,
-					Key: eabKeyBytes,
-				},
-			}
-
-			// Make sure we can list our key
-			resp, err = client.Logical().ListWithContext(testCtx, "pki/eab")
-			require.NoError(t, err, "failed to list eab tokens")
-			require.NotNil(t, resp, "list response for eab tokens should not be nil")
-			require.Contains(t, resp.Data, "keys")
-			require.Contains(t, resp.Data, "key_info")
-			require.Len(t, resp.Data["keys"], 1)
-			require.Contains(t, resp.Data["keys"], kid)
-
-			keyInfo := resp.Data["key_info"].(map[string]interface{})
-			require.Contains(t, keyInfo, kid)
-
-			infoForKid := keyInfo[kid].(map[string]interface{})
-			require.Equal(t, "hs", infoForKid["key_type"])
-			require.Equal(t, tc.prefixUrl+"directory", infoForKid["acme_directory"])
-
-			// Create new account with EAB
-			t.Logf("Testing register on %s", baseAcmeURL)
-			_, err = acmeClient.Register(testCtx, acct, func(tosURL string) bool { return true })
-			require.NoError(t, err, "failed registering new account with eab")
-
-			// Make sure our EAB is no longer available
-			resp, err = client.Logical().ListWithContext(context.Background(), "pki/eab")
-			require.NoError(t, err, "failed to list eab tokens")
-			require.Nil(t, resp, "list response for eab tokens should have been nil due to empty list")
-
-			// Attempt to create another account with the same EAB as before -- should fail
-			accountKey2, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
-			require.NoError(t, err, "failed creating ec key")
-
-			acmeClient2 := getAcmeClientForCluster(t, cluster, baseAcmeURL, accountKey2)
-			acct2 := &acme.Account{
-				ExternalAccountBinding: &acme.ExternalAccountBinding{
-					KID: kid,
-					Key: eabKeyBytes,
-				},
-			}
-
-			_, err = acmeClient2.Register(testCtx, acct2, func(tosURL string) bool { return true })
-			require.ErrorContains(t, err, "urn:ietf:params:acme:error:unauthorized", "should fail due to EAB re-use")
-
-			// We can lookup/find an existing account without EAB if we have the account key
-			_, err = acmeClient.GetReg(testCtx /* unused url */, "")
-			require.NoError(t, err, "expected to lookup existing account without eab")
-		})
-	}
-}
-
-// TestAcmeNonce a basic test that will validate we get back a nonce with the proper status codes
-// based on the
-func TestAcmeNonce(t *testing.T) {
-	t.Parallel()
-	cluster, client, pathConfig := setupAcmeBackend(t)
-	defer cluster.Cleanup()
-
-	cases := []struct {
-		name         string
-		prefixUrl    string
-		directoryUrl string
-	}{
-		{"root", "", "pki/acme/new-nonce"},
-		{"role", "/roles/test-role", "pki/roles/test-role/acme/new-nonce"},
-		{"issuer", "/issuer/default", "pki/issuer/default/acme/new-nonce"},
-		{"issuer_role", "/issuer/default/roles/test-role", "pki/issuer/default/roles/test-role/acme/new-nonce"},
-	}
-
-	for _, tc := range cases {
-		for _, httpOp := range []string{"get", "header"} {
-			t.Run(fmt.Sprintf("%s-%s", tc.name, httpOp), func(t *testing.T) {
-				var req *api.Request
-				switch httpOp {
-				case "get":
-					req = client.NewRequest(http.MethodGet, "/v1/"+tc.directoryUrl)
-				case "header":
-					req = client.NewRequest(http.MethodHead, "/v1/"+tc.directoryUrl)
-				}
-				res, err := client.RawRequestWithContext(ctx, req)
-				require.NoError(t, err, "failed sending raw request")
-				_ = res.Body.Close()
-
-				// Proper Status Code
-				switch httpOp {
-				case "get":
-					require.Equal(t, http.StatusNoContent, res.StatusCode)
-				case "header":
-					require.Equal(t, http.StatusOK, res.StatusCode)
-				}
-
-				// Make sure we don't have a Content-Type header.
-				require.Equal(t, "", res.Header.Get("Content-Type"))
-
-				// Make sure we return the Cache-Control header
-				require.Contains(t, res.Header.Get("Cache-Control"), "no-store",
-					"missing Cache-Control header with no-store header value")
-
-				// Test for our nonce header value
-				require.NotEmpty(t, res.Header.Get("Replay-Nonce"), "missing Replay-Nonce header with an actual value")
-
-				// Test Link header value
-				expectedLinkHeader := fmt.Sprintf("<%s>;rel=\"index\"", pathConfig+tc.prefixUrl+"/acme/directory")
-				require.Contains(t, res.Header.Get("Link"), expectedLinkHeader,
-					"different value for link header than expected")
-			})
-		}
-	}
-}
-
-// TestAcmeClusterPathNotConfigured basic testing of the ACME error handler.
-func TestAcmeClusterPathNotConfigured(t *testing.T) {
-	t.Parallel()
-	cluster, client := setupTestPkiCluster(t)
-	defer cluster.Cleanup()
-
-	// Go sneaky, sneaky and update the acme configuration through sys/raw to bypass config/cluster path checks
-	pkiMount := findStorageMountUuid(t, client, "pki")
-	rawPath := path.Join("/sys/raw/logical/", pkiMount, storageAcmeConfig)
-	_, err := client.Logical().WriteWithContext(context.Background(), rawPath, map[string]interface{}{
-		"value": "{\"enabled\": true, \"eab_policy_name\": \"not-required\"}",
-	})
-	require.NoError(t, err, "failed updating acme config through sys/raw")
-
-	// Force reload the plugin so we read the new config we slipped in.
-	_, err = client.Sys().ReloadPluginWithContext(context.Background(), &api.ReloadPluginInput{Mounts: []string{"pki"}})
-	require.NoError(t, err, "failed reloading plugin")
-
-	// Do not fill in the path option within the local cluster configuration
-	cases := []struct {
-		name         string
-		directoryUrl string
-	}{
-		{"root", "pki/acme/directory"},
-		{"role", "pki/roles/test-role/acme/directory"},
-		{"issuer", "pki/issuer/default/acme/directory"},
-		{"issuer_role", "pki/issuer/default/roles/test-role/acme/directory"},
-	}
-	testCtx := context.Background()
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			dirResp, err := client.Logical().ReadRawWithContext(testCtx, tc.directoryUrl)
-			require.Error(t, err, "expected failure reading ACME directory configuration got none")
-
-			require.Equal(t, "application/problem+json", dirResp.Header.Get("Content-Type"))
-			require.Equal(t, http.StatusInternalServerError, dirResp.StatusCode)
-
-			rawBodyBytes, err := io.ReadAll(dirResp.Body)
-			require.NoError(t, err, "failed reading from directory response body")
-			_ = dirResp.Body.Close()
-
-			respType := map[string]interface{}{}
-			err = json.Unmarshal(rawBodyBytes, &respType)
-			require.NoError(t, err, "failed unmarshalling ACME directory response body")
-
-			require.Equal(t, "urn:ietf:params:acme:error:serverInternal", respType["type"])
-			require.NotEmpty(t, respType["detail"])
-		})
-	}
-}
-
-// TestAcmeAccountsCrossingDirectoryPath make sure that if an account attempts to use a different ACME
-// directory path that we get an error.
-func TestAcmeAccountsCrossingDirectoryPath(t *testing.T) {
-	t.Parallel()
-	cluster, _, _ := setupAcmeBackend(t)
-	defer cluster.Cleanup()
-
-	baseAcmeURL := "/v1/pki/acme/"
-	accountKey, err := rsa.GenerateKey(rand.Reader, 2048)
-	require.NoError(t, err, "failed creating rsa key")
-
-	testCtx := context.Background()
-	acmeClient := getAcmeClientForCluster(t, cluster, baseAcmeURL, accountKey)
-
-	// Create new account
-	acct, err := acmeClient.Register(testCtx, &acme.Account{}, func(tosURL string) bool { return true })
-	require.NoError(t, err, "failed registering account")
-
-	// Try to update the account under another ACME directory
-	baseAcmeURL2 := "/v1/pki/roles/test-role/acme/"
-	acmeClient2 := getAcmeClientForCluster(t, cluster, baseAcmeURL2, accountKey)
-	acct.Contact = []string{"mailto:test3@example.com"}
-	_, err = acmeClient2.UpdateReg(testCtx, acct)
-	require.Error(t, err, "successfully updated account when we should have failed due to different directory")
-	// We don't test for the specific error about using the wrong directory, as the golang library
-	// swallows the error we are sending back to a no account error
-}
-
-// TestAcmeEabCrossingDirectoryPath make sure that if an account attempts to use a different ACME
-// directory path that an EAB was created within we get an error.
-func TestAcmeEabCrossingDirectoryPath(t *testing.T) {
-	t.Parallel()
-	cluster, client, _ := setupAcmeBackend(t)
-	defer cluster.Cleanup()
-
-	// Enable EAB
-	_, err := client.Logical().WriteWithContext(context.Background(), "pki/config/acme", map[string]interface{}{
-		"enabled":    true,
-		"eab_policy": "always-required",
-	})
-	require.NoError(t, err)
-
-	baseAcmeURL := "/v1/pki/acme/"
-	accountKey, err := rsa.GenerateKey(rand.Reader, 2048)
-	require.NoError(t, err, "failed creating rsa key")
-
-	testCtx := context.Background()
-	acmeClient := getAcmeClientForCluster(t, cluster, baseAcmeURL, accountKey)
-
-	// fetch a new EAB
-	kid, eabKeyBytes := getEABKey(t, client, "roles/test-role/acme/")
-	acct := &acme.Account{
-		ExternalAccountBinding: &acme.ExternalAccountBinding{
-			KID: kid,
-			Key: eabKeyBytes,
-		},
-	}
-
-	// Create new account
-	_, err = acmeClient.Register(testCtx, acct, func(tosURL string) bool { return true })
-	require.ErrorContains(t, err, "failed to verify eab", "should have failed as EAB is for a different directory")
-}
-
-// TestAcmeDisabledWithEnvVar verifies if VAULT_DISABLE_PUBLIC_ACME is set that we completely
-// disable the ACME service
-func TestAcmeDisabledWithEnvVar(t *testing.T) {
-	// Setup a cluster with the configuration set to not-required, initially as the
-	// configuration will validate if the environment var is set
-	cluster, client, _ := setupAcmeBackend(t)
-	defer cluster.Cleanup()
-
-	// Seal setup the environment variable, and unseal which now means we have a cluster
-	// with ACME configuration saying it is enabled with a bad EAB policy.
-	cluster.EnsureCoresSealed(t)
-	t.Setenv("VAULT_DISABLE_PUBLIC_ACME", "true")
-	cluster.UnsealCores(t)
-
-	// Make sure that ACME is disabled now.
-	for _, method := range []string{http.MethodHead, http.MethodGet} {
-		t.Run(fmt.Sprintf("%s", method), func(t *testing.T) {
-			req := client.NewRequest(method, "/v1/pki/acme/new-nonce")
-			_, err := client.RawRequestWithContext(ctx, req)
-			require.Error(t, err, "should have received an error as ACME should have been disabled")
-
-			if apiError, ok := err.(*api.ResponseError); ok {
-				require.Equal(t, 404, apiError.StatusCode)
-			}
-		})
-	}
-}
-
-// TestAcmeConfigChecksPublicAcmeEnv verifies certain EAB policy values can not be set if ENV var is enabled
-func TestAcmeConfigChecksPublicAcmeEnv(t *testing.T) {
-	t.Setenv("VAULT_DISABLE_PUBLIC_ACME", "true")
-	cluster, client := setupTestPkiCluster(t)
-	defer cluster.Cleanup()
-
-	_, err := client.Logical().WriteWithContext(context.Background(), "pki/config/cluster", map[string]interface{}{
-		"path": "https://dadgarcorp.com/v1/pki",
-	})
-	require.NoError(t, err)
-
-	_, err = client.Logical().WriteWithContext(context.Background(), "pki/config/acme", map[string]interface{}{
-		"enabled":    true,
-		"eab_policy": string(eabPolicyAlwaysRequired),
-	})
-	require.NoError(t, err)
-
-	for _, policyName := range []EabPolicyName{eabPolicyNewAccountRequired, eabPolicyNotRequired} {
-		_, err = client.Logical().WriteWithContext(context.Background(), "pki/config/acme", map[string]interface{}{
-			"enabled":    true,
-			"eab_policy": string(policyName),
-		})
-		require.Error(t, err, "eab policy %s should have not been allowed to be set")
-	}
-
-	// Make sure we can disable ACME and the eab policy is not checked
-	_, err = client.Logical().WriteWithContext(context.Background(), "pki/config/acme", map[string]interface{}{
-		"enabled":    false,
-		"eab_policy": string(eabPolicyNotRequired),
-	})
-	require.NoError(t, err)
-}
-
-// TestAcmeTruncatesToIssuerExpiry make sure that if the selected issuer's expiry is shorter than the
-// CSR's selected TTL value in ACME and the issuer's leaf_not_after_behavior setting is set to Err,
-// we will override the configured behavior and truncate to the issuer's NotAfter
-func TestAcmeTruncatesToIssuerExpiry(t *testing.T) {
-	t.Parallel()
-
-	cluster, client, _ := setupAcmeBackend(t)
-	defer cluster.Cleanup()
-
-	testCtx := context.Background()
-	mount := "pki"
-	resp, err := client.Logical().WriteWithContext(context.Background(), mount+"/issuers/generate/intermediate/internal",
-		map[string]interface{}{
-			"key_name":    "short-key",
-			"key_type":    "ec",
-			"common_name": "test.com",
-		})
-	require.NoError(t, err, "failed creating intermediary CSR")
-	intermediateCSR := resp.Data["csr"].(string)
-
-	// Sign the intermediate CSR using /pki
-	resp, err = client.Logical().Write(mount+"/issuer/root-ca/sign-intermediate", map[string]interface{}{
-		"csr":     intermediateCSR,
-		"ttl":     "10m",
-		"max_ttl": "1h",
-	})
-	require.NoError(t, err, "failed signing intermediary CSR")
-	intermediateCertPEM := resp.Data["certificate"].(string)
-
-	shortCa := parseCert(t, intermediateCertPEM)
-
-	// Configure the intermediate cert as the CA in /pki2
-	resp, err = client.Logical().Write(mount+"/issuers/import/cert", map[string]interface{}{
-		"pem_bundle": intermediateCertPEM,
-	})
-	require.NoError(t, err, "failed importing intermediary cert")
-	importedIssuersRaw := resp.Data["imported_issuers"].([]interface{})
-	require.Len(t, importedIssuersRaw, 1)
-	shortCaUuid := importedIssuersRaw[0].(string)
-
-	_, err = client.Logical().Write(mount+"/issuer/"+shortCaUuid, map[string]interface{}{
-		"leaf_not_after_behavior": "err",
-		"issuer_name":             "short-ca",
-	})
-	require.NoError(t, err, "failed updating issuer name")
-
-	baseAcmeURL := "/v1/pki/issuer/short-ca/acme/"
-	accountKey, err := rsa.GenerateKey(rand.Reader, 2048)
-	require.NoError(t, err, "failed creating rsa key")
-
-	acmeClient := getAcmeClientForCluster(t, cluster, baseAcmeURL, accountKey)
-
-	// Create new account
-	t.Logf("Testing register on %s", baseAcmeURL)
-	acct, err := acmeClient.Register(testCtx, &acme.Account{}, func(tosURL string) bool { return true })
-	require.NoError(t, err, "failed registering account")
-
-	// Create an order
-	t.Logf("Testing Authorize Order on %s", baseAcmeURL)
-	identifiers := []string{"*.localdomain"}
-	order, err := acmeClient.AuthorizeOrder(testCtx, []acme.AuthzID{
-		{Type: "dns", Value: identifiers[0]},
-	})
-	require.NoError(t, err, "failed creating order")
-
-	// HACK: Update authorization/challenge to completed as we can't really do it properly in this workflow
-	//       test.
-	markAuthorizationSuccess(t, client, acmeClient, acct, order)
-
-	// Build a proper CSR, with the correct name and signed with a different key works.
-	goodCr := &x509.CertificateRequest{DNSNames: []string{identifiers[0]}}
-	csrKey, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
-	require.NoError(t, err, "failed generated key for CSR")
-	csr, err := x509.CreateCertificateRequest(rand.Reader, goodCr, csrKey)
-	require.NoError(t, err, "failed generating csr")
-
-	certs, _, err := acmeClient.CreateOrderCert(testCtx, order.FinalizeURL, csr, true)
-	require.NoError(t, err, "failed finalizing order")
-	require.Len(t, certs, 3, "expected full acme chain")
-
-	testAcmeCertSignedByCa(t, client, certs, "short-ca")
-
-	acmeCert, err := x509.ParseCertificate(certs[0])
-	require.NoError(t, err, "failed parsing acme cert")
-
-	require.Equal(t, shortCa.NotAfter, acmeCert.NotAfter, "certificate times aren't the same")
-}
-
-// TestAcmeIgnoresRoleExtKeyUsage
-func TestAcmeIgnoresRoleExtKeyUsage(t *testing.T) {
-	t.Parallel()
-
-	cluster, client, _ := setupAcmeBackend(t)
-	defer cluster.Cleanup()
-
-	testCtx := context.Background()
-
-	roleName := "test-role"
-
-	roleOpt := map[string]interface{}{
-		"ttl_duration":                "365h",
-		"max_ttl_duration":            "720h",
-		"key_type":                    "any",
-		"allowed_domains":             "localdomain",
-		"allow_subdomains":            "true",
-		"allow_wildcard_certificates": "true",
-		"require_cn":                  "true", /* explicit default */
-		"server_flag":                 "true",
-		"client_flag":                 "true",
-		"code_signing_flag":           "true",
-		"email_protection_flag":       "true",
-	}
-
-	_, err := client.Logical().Write("pki/roles/"+roleName, roleOpt)
-
-	baseAcmeURL := "/v1/pki/roles/" + roleName + "/acme/"
-	accountKey, err := rsa.GenerateKey(rand.Reader, 2048)
-	require.NoError(t, err, "failed creating rsa key")
-
-	require.NoError(t, err, "failed creating role test-role")
-
-	acmeClient := getAcmeClientForCluster(t, cluster, baseAcmeURL, accountKey)
-
-	// Create new account
-	t.Logf("Testing register on %s", baseAcmeURL)
-	acct, err := acmeClient.Register(testCtx, &acme.Account{}, func(tosURL string) bool { return true })
-	require.NoError(t, err, "failed registering account")
-
-	// Create an order
-	t.Logf("Testing Authorize Order on %s", baseAcmeURL)
-	identifiers := []string{"*.localdomain"}
-	order, err := acmeClient.AuthorizeOrder(testCtx, []acme.AuthzID{
-		{Type: "dns", Value: identifiers[0]},
-	})
-	require.NoError(t, err, "failed creating order")
-
-	// HACK: Update authorization/challenge to completed as we can't really do it properly in this workflow test.
-	markAuthorizationSuccess(t, client, acmeClient, acct, order)
-
-	// Build a proper CSR, with the correct name and signed with a different key works.
-	goodCr := &x509.CertificateRequest{DNSNames: []string{identifiers[0]}}
-	csrKey, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
-	require.NoError(t, err, "failed generated key for CSR")
-	csr, err := x509.CreateCertificateRequest(rand.Reader, goodCr, csrKey)
-	require.NoError(t, err, "failed generating csr")
-
-	certs, _, err := acmeClient.CreateOrderCert(testCtx, order.FinalizeURL, csr, true)
-	require.NoError(t, err, "order finalization failed")
-	require.GreaterOrEqual(t, len(certs), 1, "expected at least one cert in bundle")
-	acmeCert, err := x509.ParseCertificate(certs[0])
-	require.NoError(t, err, "failed parsing acme cert")
-
-	require.Equal(t, 1, len(acmeCert.ExtKeyUsage), "mis-match on expected ExtKeyUsages")
-	require.ElementsMatch(t, []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth}, acmeCert.ExtKeyUsage,
-		"mismatch of ExtKeyUsage flags")
-}
-
-func TestIssuerRoleDirectoryAssociations(t *testing.T) {
-	t.Parallel()
-
-	// This creates two issuers for us (root-ca, int-ca) and two
-	// roles (test-role, acme) that we can use with various directory
-	// configurations.
-	cluster, client, _ := setupAcmeBackend(t)
-	defer cluster.Cleanup()
-
-	// Setup DNS for validations.
-	testCtx := context.Background()
-	dns := dnstest.SetupResolver(t, "dadgarcorp.com")
-	defer dns.Cleanup()
-	_, err := client.Logical().WriteWithContext(testCtx, "pki/config/acme", map[string]interface{}{
-		"dns_resolver": dns.GetLocalAddr(),
-	})
-	require.NoError(t, err, "failed to specify dns resolver")
-
-	// 1. Use a forbidden role should fail.
-	resp, err := client.Logical().WriteWithContext(testCtx, "pki/config/acme", map[string]interface{}{
-		"enabled":       true,
-		"allowed_roles": []string{"acme"},
-	})
-	require.NoError(t, err, "failed to write config")
-	require.NotNil(t, resp)
-
-	_, err = client.Logical().ReadWithContext(testCtx, "pki/roles/test-role/acme/directory")
-	require.Error(t, err, "failed to forbid usage of test-role")
-	_, err = client.Logical().ReadWithContext(testCtx, "pki/issuer/default/roles/test-role/acme/directory")
-	require.Error(t, err, "failed to forbid usage of test-role under default issuer")
-	_, err = client.Logical().ReadWithContext(testCtx, "pki/issuer/int-ca/roles/test-role/acme/directory")
-	require.Error(t, err, "failed to forbid usage of test-role under int-ca issuer")
-	_, err = client.Logical().ReadWithContext(testCtx, "pki/issuer/root-ca/roles/test-role/acme/directory")
-	require.Error(t, err, "failed to forbid usage of test-role under root-ca issuer")
-
-	_, err = client.Logical().ReadWithContext(testCtx, "pki/roles/acme/acme/directory")
-	require.NoError(t, err, "failed to allow usage of acme")
-	_, err = client.Logical().ReadWithContext(testCtx, "pki/issuer/default/roles/acme/acme/directory")
-	require.NoError(t, err, "failed to allow usage of acme under default issuer")
-	_, err = client.Logical().ReadWithContext(testCtx, "pki/issuer/int-ca/roles/acme/acme/directory")
-	require.NoError(t, err, "failed to allow usage of acme under int-ca issuer")
-	_, err = client.Logical().ReadWithContext(testCtx, "pki/issuer/root-ca/roles/acme/acme/directory")
-	require.NoError(t, err, "failed to allow usage of acme under root-ca issuer")
-
-	// 2. Use a forbidden issuer should fail.
-	resp, err = client.Logical().WriteWithContext(testCtx, "pki/config/acme", map[string]interface{}{
-		"allowed_roles":   []string{"acme"},
-		"allowed_issuers": []string{"int-ca"},
-	})
-	require.NoError(t, err, "failed to write config")
-	require.NotNil(t, resp)
-
-	_, err = client.Logical().ReadWithContext(testCtx, "pki/roles/test-role/acme/directory")
-	require.Error(t, err, "failed to forbid usage of test-role")
-	_, err = client.Logical().ReadWithContext(testCtx, "pki/issuer/default/roles/test-role/acme/directory")
-	require.Error(t, err, "failed to forbid usage of test-role under default issuer")
-	_, err = client.Logical().ReadWithContext(testCtx, "pki/issuer/int-ca/roles/test-role/acme/directory")
-	require.Error(t, err, "failed to forbid usage of test-role under int-ca issuer")
-	_, err = client.Logical().ReadWithContext(testCtx, "pki/issuer/root-ca/roles/test-role/acme/directory")
-	require.Error(t, err, "failed to forbid usage of test-role under root-ca issuer")
-
-	_, err = client.Logical().ReadWithContext(testCtx, "pki/issuer/root-ca/roles/acme/acme/directory")
-	require.Error(t, err, "failed to forbid usage of acme under root-ca issuer")
-
-	_, err = client.Logical().ReadWithContext(testCtx, "pki/roles/acme/acme/directory")
-	require.NoError(t, err, "failed to allow usage of acme")
-	_, err = client.Logical().ReadWithContext(testCtx, "pki/issuer/default/roles/acme/acme/directory")
-	require.NoError(t, err, "failed to allow usage of acme under default issuer")
-	_, err = client.Logical().ReadWithContext(testCtx, "pki/issuer/int-ca/roles/acme/acme/directory")
-	require.NoError(t, err, "failed to allow usage of acme under int-ca issuer")
-
-	// 3. Setting the default directory to be a sign-verbatim policy and
-	// using two different CAs should result in certs signed by each CA.
-	resp, err = client.Logical().WriteWithContext(testCtx, "pki/config/acme", map[string]interface{}{
-		"allowed_roles":            []string{"*"},
-		"allowed_issuers":          []string{"*"},
-		"default_directory_policy": "sign-verbatim",
-	})
-	require.NoError(t, err, "failed to write config")
-	require.NotNil(t, resp)
-
-	// default == int-ca
-	acmeClientDefault := getAcmeClientForCluster(t, cluster, "/v1/pki/issuer/default/acme/", nil)
-	defaultLeafCert := doACMEForDomainWithDNS(t, dns, acmeClientDefault, []string{"default-ca.dadgarcorp.com"})
-	requireSignedByAtPath(t, client, defaultLeafCert, "pki/issuer/int-ca")
-
-	acmeClientIntCA := getAcmeClientForCluster(t, cluster, "/v1/pki/issuer/int-ca/acme/", nil)
-	intCALeafCert := doACMEForDomainWithDNS(t, dns, acmeClientIntCA, []string{"int-ca.dadgarcorp.com"})
-	requireSignedByAtPath(t, client, intCALeafCert, "pki/issuer/int-ca")
-
-	acmeClientRootCA := getAcmeClientForCluster(t, cluster, "/v1/pki/issuer/root-ca/acme/", nil)
-	rootCALeafCert := doACMEForDomainWithDNS(t, dns, acmeClientRootCA, []string{"root-ca.dadgarcorp.com"})
-	requireSignedByAtPath(t, client, rootCALeafCert, "pki/issuer/root-ca")
-
-	// 4. Using a role-based default directory should allow us to control leaf
-	// issuance on the base and issuer-specific directories.
-	resp, err = client.Logical().WriteWithContext(testCtx, "pki/config/acme", map[string]interface{}{
-		"allowed_roles":            []string{"*"},
-		"allowed_issuers":          []string{"*"},
-		"default_directory_policy": "role:acme",
-	})
-	require.NoError(t, err, "failed to write config")
-	require.NotNil(t, resp)
-
-	resp, err = client.Logical().JSONMergePatch(testCtx, "pki/roles/acme", map[string]interface{}{
-		"ou":             "IT Security",
-		"organization":   []string{"Dadgar Corporation, Limited"},
-		"allow_any_name": true,
-	})
-	require.NoError(t, err, "failed to write role differentiator")
-	require.NotNil(t, resp)
-
-	for _, issuer := range []string{"", "default", "int-ca", "root-ca"} {
-		// Path should override role.
-		directory := "/v1/pki/issuer/" + issuer + "/acme/"
-		issuerPath := "/pki/issuer/" + issuer
-		if issuer == "" {
-			directory = "/v1/pki/acme/"
-			issuerPath = "/pki/issuer/int-ca"
-		} else if issuer == "default" {
-			issuerPath = "/pki/issuer/int-ca"
-		}
-
-		t.Logf("using directory: %v / issuer: %v", directory, issuerPath)
-
-		acmeClient := getAcmeClientForCluster(t, cluster, directory, nil)
-		leafCert := doACMEForDomainWithDNS(t, dns, acmeClient, []string{"role-restricted.dadgarcorp.com"})
-		require.Contains(t, leafCert.Subject.Organization, "Dadgar Corporation, Limited", "on directory: %v", directory)
-		require.Contains(t, leafCert.Subject.OrganizationalUnit, "IT Security", "on directory: %v", directory)
-		requireSignedByAtPath(t, client, leafCert, issuerPath)
-	}
-
-	// 5.
-}
-
-// TestAcmeWithCsrIncludingBasicConstraintExtension verify that we error out for a CSR that is requesting a
-// certificate with the IsCA set to true, false is okay, within the basic constraints extension and that no matter what
-// the extension is not present on the returned certificate.
-func TestAcmeWithCsrIncludingBasicConstraintExtension(t *testing.T) {
-	t.Parallel()
-
-	cluster, client, _ := setupAcmeBackend(t)
-	defer cluster.Cleanup()
-
-	testCtx := context.Background()
-
-	baseAcmeURL := "/v1/pki/acme/"
-	accountKey, err := rsa.GenerateKey(rand.Reader, 2048)
-	require.NoError(t, err, "failed creating rsa key")
-
-	acmeClient := getAcmeClientForCluster(t, cluster, baseAcmeURL, accountKey)
-
-	// Create new account
-	t.Logf("Testing register on %s", baseAcmeURL)
-	acct, err := acmeClient.Register(testCtx, &acme.Account{}, func(tosURL string) bool { return true })
-	require.NoError(t, err, "failed registering account")
-
-	// Create an order
-	t.Logf("Testing Authorize Order on %s", baseAcmeURL)
-	identifiers := []string{"*.localdomain"}
-	order, err := acmeClient.AuthorizeOrder(testCtx, []acme.AuthzID{
-		{Type: "dns", Value: identifiers[0]},
-	})
-	require.NoError(t, err, "failed creating order")
-
-	// HACK: Update authorization/challenge to completed as we can't really do it properly in this workflow test.
-	markAuthorizationSuccess(t, client, acmeClient, acct, order)
-
-	// Build a CSR with IsCA set to true, making sure we reject it
-	extension, err := certutil.CreateBasicConstraintExtension(true, -1)
-	require.NoError(t, err, "failed generating basic constraint extension")
-
-	isCATrueCSR := &x509.CertificateRequest{
-		DNSNames:        []string{identifiers[0]},
-		ExtraExtensions: []pkix.Extension{extension},
-	}
-	csrKey, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
-	require.NoError(t, err, "failed generated key for CSR")
-	csr, err := x509.CreateCertificateRequest(rand.Reader, isCATrueCSR, csrKey)
-	require.NoError(t, err, "failed generating csr")
-
-	_, _, err = acmeClient.CreateOrderCert(testCtx, order.FinalizeURL, csr, true)
-	require.Error(t, err, "order finalization should have failed with IsCA set to true")
-
-	extension, err = certutil.CreateBasicConstraintExtension(false, -1)
-	require.NoError(t, err, "failed generating basic constraint extension")
-	isCAFalseCSR := &x509.CertificateRequest{
-		DNSNames:   []string{identifiers[0]},
-		Extensions: []pkix.Extension{extension},
-	}
-
-	csr, err = x509.CreateCertificateRequest(rand.Reader, isCAFalseCSR, csrKey)
-	require.NoError(t, err, "failed generating csr")
-
-	certs, _, err := acmeClient.CreateOrderCert(testCtx, order.FinalizeURL, csr, true)
-	require.NoError(t, err, "order finalization should have failed with IsCA set to false")
-
-	require.GreaterOrEqual(t, len(certs), 1, "expected at least one cert in bundle")
-	acmeCert, err := x509.ParseCertificate(certs[0])
-	require.NoError(t, err, "failed parsing acme cert")
-
-	// Make sure we don't have any basic constraint extension within the returned cert
-	for _, ext := range acmeCert.Extensions {
-		if ext.Id.Equal(certutil.ExtensionBasicConstraintsOID) {
-			// We shouldn't have this extension in our cert
-			t.Fatalf("acme csr contained a basic constraints extension")
-		}
-	}
-}
-
-func markAuthorizationSuccess(t *testing.T, client *api.Client, acmeClient *acme.Client, acct *acme.Account,
-	order *acme.Order,
-) {
-	testCtx := context.Background()
-
-	pkiMount := findStorageMountUuid(t, client, "pki")
-
-	// Delete any and all challenge validation entries to stop the engine from overwriting our hack here
-	i := 0
-	for {
-		deleteCvEntries(t, client, pkiMount)
-
-		accountId := acct.URI[strings.LastIndex(acct.URI, "/"):]
-		for _, authURI := range order.AuthzURLs {
-			authId := authURI[strings.LastIndex(authURI, "/"):]
-
-			rawPath := path.Join("/sys/raw/logical/", pkiMount, getAuthorizationPath(accountId, authId))
-			resp, err := client.Logical().ReadWithContext(testCtx, rawPath)
-			require.NoError(t, err, "failed looking up authorization storage")
-			require.NotNil(t, resp, "sys raw response was nil")
-			require.NotEmpty(t, resp.Data["value"], "no value field in sys raw response")
-
-			var authz ACMEAuthorization
-			err = jsonutil.DecodeJSON([]byte(resp.Data["value"].(string)), &authz)
-			require.NoError(t, err, "error decoding authorization: %w", err)
-			authz.Status = ACMEAuthorizationValid
-			for _, challenge := range authz.Challenges {
-				challenge.Status = ACMEChallengeValid
-			}
-
-			encodeJSON, err := jsonutil.EncodeJSON(authz)
-			require.NoError(t, err, "failed encoding authz json")
-			_, err = client.Logical().WriteWithContext(testCtx, rawPath, map[string]interface{}{
-				"value":    base64.StdEncoding.EncodeToString(encodeJSON),
-				"encoding": "base64",
-			})
-			require.NoError(t, err, "failed writing authorization storage")
-		}
-
-		// Give some time
-		time.Sleep(200 * time.Millisecond)
-
-		// Check to see if we have fixed up the status and no new entries have appeared.
-		if !deleteCvEntries(t, client, pkiMount) {
-			// No entries found
-			// Look to see if we raced against the engine
-			orderLookup, err := acmeClient.GetOrder(testCtx, order.URI)
-			require.NoError(t, err, "failed loading order status after manually ")
-
-			if orderLookup.Status == string(ACMEOrderReady) {
-				// Our order seems to be in the proper status, should be safe-ish to go ahead now
-				break
-			} else {
-				t.Logf("order status was not ready, retrying")
-			}
-		} else {
-			t.Logf("new challenge entries appeared after deletion, retrying")
-		}
-
-		if i > 5 {
-			t.Fatalf("We are constantly deleting cv entries or order status is not changing, something is wrong")
-		}
-
-		i++
-	}
-}
-
-func deleteCvEntries(t *testing.T, client *api.Client, pkiMount string) bool {
-	testCtx := context.Background()
-
-	cvPath := path.Join("/sys/raw/logical/", pkiMount, acmeValidationPrefix)
-	resp, err := client.Logical().ListWithContext(testCtx, cvPath)
-	require.NoError(t, err, "failed listing cv path items")
-
-	deletedEntries := false
-	if resp != nil {
-		cvEntries := resp.Data["keys"].([]interface{})
-		for _, cvEntry := range cvEntries {
-			cvEntryPath := path.Join(cvPath, cvEntry.(string))
-			_, err = client.Logical().DeleteWithContext(testCtx, cvEntryPath)
-			require.NoError(t, err, "failed to delete cv entry")
-			deletedEntries = true
-		}
-	}
-
-	return deletedEntries
-}
-
-func setupAcmeBackend(t *testing.T) (*vault.TestCluster, *api.Client, string) {
-	cluster, client := setupTestPkiCluster(t)
-
-	return setupAcmeBackendOnClusterAtPath(t, cluster, client, "pki")
-}
-
-func setupAcmeBackendOnClusterAtPath(t *testing.T, cluster *vault.TestCluster, client *api.Client, mount string) (*vault.TestCluster, *api.Client, string) {
-	mount = strings.Trim(mount, "/")
-
-	// Setting templated AIAs should succeed.
-	pathConfig := client.Address() + "/v1/" + mount
-
-	namespace := ""
-	mountName := mount
-	if mount != "pki" {
-		if strings.Contains(mount, "/") && constants.IsEnterprise {
-			ns_pieces := strings.Split(mount, "/")
-			c := len(ns_pieces)
-			// mount is c-1
-			ns_name := ns_pieces[c-2]
-			if len(ns_pieces) > 2 {
-				// Parent's namespaces
-				parent := strings.Join(ns_pieces[0:c-2], "/")
-				_, err := client.WithNamespace(parent).Logical().Write("/sys/namespaces/"+ns_name, nil)
-				require.NoError(t, err, "failed to create nested namespaces "+parent+" -> "+ns_name)
-			} else {
-				_, err := client.Logical().Write("/sys/namespaces/"+ns_name, nil)
-				require.NoError(t, err, "failed to create nested namespace "+ns_name)
-			}
-			namespace = strings.Join(ns_pieces[0:c-1], "/")
-			mountName = ns_pieces[c-1]
-		}
-
-		err := client.WithNamespace(namespace).Sys().Mount(mountName, &api.MountInput{
-			Type: "pki",
-			Config: api.MountConfigInput{
-				DefaultLeaseTTL: "3000h",
-				MaxLeaseTTL:     "600000h",
-			},
-		})
-		require.NoError(t, err, "failed to mount new PKI instance at "+mount)
-	}
-
-	err := client.Sys().TuneMountWithContext(ctx, mountName, api.MountConfigInput{
-		DefaultLeaseTTL: "3000h",
-		MaxLeaseTTL:     "600000h",
-	})
-	require.NoError(t, err, "failed updating mount lease times "+mount)
-
-	_, err = client.Logical().WriteWithContext(context.Background(), mount+"/config/cluster", map[string]interface{}{
-		"path":     pathConfig,
-		"aia_path": "http://localhost:8200/cdn/" + mount,
-	})
-	require.NoError(t, err)
-
-	_, err = client.Logical().WriteWithContext(context.Background(), mount+"/config/acme", map[string]interface{}{
-		"enabled":    true,
-		"eab_policy": "not-required",
-	})
-	require.NoError(t, err)
-
-	// Allow certain headers to pass through for ACME support
-	_, err = client.WithNamespace(namespace).Logical().WriteWithContext(context.Background(), "sys/mounts/"+mountName+"/tune", map[string]interface{}{
-		"allowed_response_headers": []string{"Last-Modified", "Replay-Nonce", "Link", "Location"},
-		"max_lease_ttl":            "920000h",
-	})
-	require.NoError(t, err, "failed tuning mount response headers")
-
-	resp, err := client.Logical().WriteWithContext(context.Background(), mount+"/issuers/generate/root/internal",
-		map[string]interface{}{
-			"issuer_name": "root-ca",
-			"key_name":    "root-key",
-			"key_type":    "ec",
-			"common_name": "root.com",
-			"ttl":         "7200h",
-			"max_ttl":     "920000h",
-		})
-	require.NoError(t, err, "failed creating root CA")
-
-	resp, err = client.Logical().WriteWithContext(context.Background(), mount+"/issuers/generate/intermediate/internal",
-		map[string]interface{}{
-			"key_name":    "int-key",
-			"key_type":    "ec",
-			"common_name": "test.com",
-		})
-	require.NoError(t, err, "failed creating intermediary CSR")
-	intermediateCSR := resp.Data["csr"].(string)
-
-	// Sign the intermediate CSR using /pki
-	resp, err = client.Logical().Write(mount+"/issuer/root-ca/sign-intermediate", map[string]interface{}{
-		"csr":     intermediateCSR,
-		"ttl":     "7100h",
-		"max_ttl": "910000h",
-	})
-	require.NoError(t, err, "failed signing intermediary CSR")
-	intermediateCertPEM := resp.Data["certificate"].(string)
-
-	// Configure the intermediate cert as the CA in /pki2
-	resp, err = client.Logical().Write(mount+"/issuers/import/cert", map[string]interface{}{
-		"pem_bundle": intermediateCertPEM,
-	})
-	require.NoError(t, err, "failed importing intermediary cert")
-	importedIssuersRaw := resp.Data["imported_issuers"].([]interface{})
-	require.Len(t, importedIssuersRaw, 1)
-	intCaUuid := importedIssuersRaw[0].(string)
-
-	_, err = client.Logical().Write(mount+"/issuer/"+intCaUuid, map[string]interface{}{
-		"issuer_name": "int-ca",
-	})
-	require.NoError(t, err, "failed updating issuer name")
-
-	_, err = client.Logical().Write(mount+"/config/issuers", map[string]interface{}{
-		"default": "int-ca",
-	})
-	require.NoError(t, err, "failed updating default issuer")
-
-	_, err = client.Logical().Write(mount+"/roles/test-role", map[string]interface{}{
-		"ttl_duration":                "168h",
-		"max_ttl_duration":            "168h",
-		"key_type":                    "any",
-		"allowed_domains":             "localdomain",
-		"allow_subdomains":            "true",
-		"allow_wildcard_certificates": "true",
-	})
-	require.NoError(t, err, "failed creating role test-role")
-
-	_, err = client.Logical().Write(mount+"/roles/acme", map[string]interface{}{
-		"ttl_duration":     "3650h",
-		"max_ttl_duration": "7200h",
-		"key_type":         "any",
-	})
-	require.NoError(t, err, "failed creating role acme")
-
-	return cluster, client, pathConfig
-}
-
-func testAcmeCertSignedByCa(t *testing.T, client *api.Client, derCerts [][]byte, issuerRef string) {
-	t.Helper()
-	require.NotEmpty(t, derCerts)
-	acmeCert, err := x509.ParseCertificate(derCerts[0])
-	require.NoError(t, err, "failed parsing acme cert bytes")
-
-	resp, err := client.Logical().ReadWithContext(context.Background(), "pki/issuer/"+issuerRef)
-	require.NoError(t, err, "failed reading issuer with name %s", issuerRef)
-	issuerCert := parseCert(t, resp.Data["certificate"].(string))
-	issuerChainRaw := resp.Data["ca_chain"].([]interface{})
-
-	err = acmeCert.CheckSignatureFrom(issuerCert)
-	require.NoError(t, err, "issuer %s did not sign provided cert", issuerRef)
-
-	expectedCerts := [][]byte{derCerts[0]}
-
-	for _, entry := range issuerChainRaw {
-		chainCert := parseCert(t, entry.(string))
-		expectedCerts = append(expectedCerts, chainCert.Raw)
-	}
-
-	if diffs := deep.Equal(expectedCerts, derCerts); diffs != nil {
-		t.Fatalf("diffs were found between the acme chain returned and the expected value: \n%v", diffs)
-	}
-}
-
-// TestAcmeValidationError make sure that we properly return errors on validation errors.
-func TestAcmeValidationError(t *testing.T) {
-	t.Parallel()
-	cluster, _, _ := setupAcmeBackend(t)
-	defer cluster.Cleanup()
-
-	testCtx := context.Background()
-	baseAcmeURL := "/v1/pki/acme/"
-	accountKey, err := rsa.GenerateKey(rand.Reader, 2048)
-	require.NoError(t, err, "failed creating rsa key")
-
-	acmeClient := getAcmeClientForCluster(t, cluster, baseAcmeURL, accountKey)
-
-	// Create new account
-	t.Logf("Testing register on %s", baseAcmeURL)
-	_, err = acmeClient.Register(testCtx, &acme.Account{}, func(tosURL string) bool { return true })
-	require.NoError(t, err, "failed registering account")
-
-	// Create an order
-	t.Logf("Testing Authorize Order on %s", baseAcmeURL)
-	identifiers := []string{"www.dadgarcorp.com"}
-	order, err := acmeClient.AuthorizeOrder(testCtx, []acme.AuthzID{
-		{Type: "dns", Value: identifiers[0]},
-	})
-	require.NoError(t, err, "failed creating order")
-
-	// Load authorizations
-	var authorizations []*acme.Authorization
-	for _, authUrl := range order.AuthzURLs {
-		auth, err := acmeClient.GetAuthorization(testCtx, authUrl)
-		require.NoError(t, err, "failed fetching authorization: %s", authUrl)
-
-		authorizations = append(authorizations, auth)
-	}
-	require.Len(t, authorizations, 1, "expected a certain number of authorizations")
-	require.Len(t, authorizations[0].Challenges, 3, "expected a certain number of challenges associated with authorization")
-
-	acceptedAuth, err := acmeClient.Accept(testCtx, authorizations[0].Challenges[0])
-	require.NoError(t, err, "Should have been allowed to accept challenge 1")
-	require.Equal(t, string(ACMEChallengeProcessing), acceptedAuth.Status)
-
-	_, err = acmeClient.Accept(testCtx, authorizations[0].Challenges[1])
-	require.Error(t, err, "Should have been prevented to accept challenge 2")
-
-	// Make sure our challenge returns errors
-	testhelpers.RetryUntil(t, 30*time.Second, func() error {
-		challenge, err := acmeClient.GetChallenge(testCtx, authorizations[0].Challenges[0].URI)
-		if err != nil {
-			return err
-		}
-
-		if challenge.Error == nil {
-			return fmt.Errorf("no error set in challenge yet")
-		}
-
-		acmeError, ok := challenge.Error.(*acme.Error)
-		if !ok {
-			return fmt.Errorf("unexpected error back: %v", err)
-		}
-
-		if acmeError.ProblemType != "urn:ietf:params:acme:error:incorrectResponse" {
-			return fmt.Errorf("unexpected ACME error back: %v", acmeError)
-		}
-
-		return nil
-	})
-
-	// Make sure our challenge,auth and order status change.
-	// This takes a little too long to run in CI properly, we need the ability to influence
-	// how long the validations take before CI can go wild on this.
-	if os.Getenv("CI") == "" {
-		testhelpers.RetryUntil(t, 10*time.Minute, func() error {
-			challenge, err := acmeClient.GetChallenge(testCtx, authorizations[0].Challenges[0].URI)
-			if err != nil {
-				return fmt.Errorf("failed to load challenge: %w", err)
-			}
-
-			if challenge.Status != string(ACMEChallengeInvalid) {
-				return fmt.Errorf("challenge state was not changed to invalid: %v", challenge)
-			}
-
-			authz, err := acmeClient.GetAuthorization(testCtx, authorizations[0].URI)
-			if err != nil {
-				return fmt.Errorf("failed to load authorization: %w", err)
-			}
-
-			if authz.Status != string(ACMEAuthorizationInvalid) {
-				return fmt.Errorf("authz state was not changed to invalid: %v", authz)
-			}
-
-			myOrder, err := acmeClient.GetOrder(testCtx, order.URI)
-			if err != nil {
-				return fmt.Errorf("failed to load order: %w", err)
-			}
-
-			if myOrder.Status != string(ACMEOrderInvalid) {
-				return fmt.Errorf("order state was not changed to invalid: %v", order)
-			}
-
-			return nil
-		})
-	}
-}
-
-func setupTestPkiCluster(t *testing.T) (*vault.TestCluster, *api.Client) {
-	coreConfig := &vault.CoreConfig{
-		LogicalBackends: map[string]logical.Factory{
-			"pki": Factory,
-		},
-		EnableRaw: true,
-	}
-	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
-		HandlerFunc: vaulthttp.Handler,
-	})
-	cluster.Start()
-	client := cluster.Cores[0].Client
-	mountPKIEndpoint(t, client, "pki")
-	return cluster, client
-}
-
-func getAcmeClientForCluster(t *testing.T, cluster *vault.TestCluster, baseUrl string, key crypto.Signer) *acme.Client {
-	coreAddr := cluster.Cores[0].Listeners[0].Address
-	tlsConfig := cluster.Cores[0].TLSConfig()
-
-	transport := cleanhttp.DefaultPooledTransport()
-	transport.TLSClientConfig = tlsConfig.Clone()
-	if err := http2.ConfigureTransport(transport); err != nil {
-		t.Fatal(err)
-	}
-	httpClient := &http.Client{Transport: transport}
-	if baseUrl[0] == '/' {
-		baseUrl = baseUrl[1:]
-	}
-	if !strings.HasPrefix(baseUrl, "v1/") {
-		baseUrl = "v1/" + baseUrl
-	}
-	baseAcmeURL := fmt.Sprintf("https://%s/%s", coreAddr.String(), baseUrl)
-	return &acme.Client{
-		Key:          key,
-		HTTPClient:   httpClient,
-		DirectoryURL: baseAcmeURL + "directory",
-	}
-}
-
-func getEABKey(t *testing.T, client *api.Client, baseUrl string) (string, []byte) {
-	resp, err := client.Logical().WriteWithContext(ctx, path.Join("pki/", baseUrl, "/new-eab"), map[string]interface{}{})
-	require.NoError(t, err, "failed getting eab key")
-	require.NotNil(t, resp, "eab key returned nil response")
-	require.NotEmpty(t, resp.Data["id"], "eab key response missing id field")
-	kid := resp.Data["id"].(string)
-
-	require.NotEmpty(t, resp.Data["key"], "eab key response missing private_key field")
-	base64Key := resp.Data["key"].(string)
-	require.True(t, strings.HasPrefix(base64Key, "vault-eab-0-"), "%s should have had a prefix of vault-eab-0-", base64Key)
-	privateKeyBytes, err := base64.RawURLEncoding.DecodeString(base64Key)
-	require.NoError(t, err, "failed base 64 decoding eab key response")
-
-	require.Equal(t, "hs", resp.Data["key_type"], "eab key_type field mis-match")
-	require.Equal(t, baseUrl+"directory", resp.Data["acme_directory"], "eab acme_directory field mis-match")
-	require.NotEmpty(t, resp.Data["created_on"], "empty created_on field")
-	_, err = time.Parse(time.RFC3339, resp.Data["created_on"].(string))
-	require.NoError(t, err, "failed parsing eab created_on field")
-
-	return kid, privateKeyBytes
-}
-
-func TestACMEClientRequestLimits(t *testing.T) {
-	cluster, client, _ := setupAcmeBackend(t)
-	defer cluster.Cleanup()
-
-	cases := []struct {
-		name           string
-		authorizations []acme.AuthzID
-		requestCSR     x509.CertificateRequest
-		valid          bool
-	}{
-		{
-			"validate-only-cn",
-			[]acme.AuthzID{
-				{"dns", "localhost"},
-			},
-			x509.CertificateRequest{
-				Subject: pkix.Name{CommonName: "localhost"},
-			},
-			true,
-		},
-		{
-			"validate-only-san",
-			[]acme.AuthzID{
-				{"dns", "localhost"},
-			},
-			x509.CertificateRequest{
-				DNSNames: []string{"localhost"},
-			},
-			true,
-		},
-		{
-			"validate-only-ip-address",
-			[]acme.AuthzID{
-				{"ip", "127.0.0.1"},
-			},
-			x509.CertificateRequest{
-				IPAddresses: []net.IP{{127, 0, 0, 1}},
-			},
-			true,
-		},
-	}
-
-	testCtx := context.Background()
-	acmeConfig := map[string]interface{}{
-		"enabled":                  true,
-		"allowed_issuers":          "*",
-		"allowed_roles":            "*",
-		"default_directory_policy": "sign-verbatim",
-		"dns_resolver":             "",
-		"eab_policy_name":          "",
-	}
-	_, err := client.Logical().WriteWithContext(testCtx, "pki/config/acme", acmeConfig)
-	require.NoError(t, err, "error configuring acme")
-
-	for _, tc := range cases {
-
-		// First Create Our Client
-		accountKey, err := rsa.GenerateKey(rand.Reader, 2048)
-		require.NoError(t, err, "failed creating rsa key")
-		acmeClient := getAcmeClientForCluster(t, cluster, "/v1/pki/acme/", accountKey)
-
-		discovery, err := acmeClient.Discover(testCtx)
-		require.NoError(t, err, "failed acme discovery call")
-		t.Logf("%v", discovery)
-
-		acct, err := acmeClient.Register(testCtx, &acme.Account{
-			Contact: []string{"mailto:test@example.com"},
-		}, func(tosURL string) bool { return true })
-		require.NoError(t, err, "failed registering account")
-		require.Equal(t, acme.StatusValid, acct.Status)
-		require.Contains(t, acct.Contact, "mailto:test@example.com")
-		require.Len(t, acct.Contact, 1)
-
-		// Create an order
-		t.Logf("Testing Authorize Order on %s", "pki/acme")
-		identifiers := make([]string, len(tc.authorizations))
-		for index, auth := range tc.authorizations {
-			identifiers[index] = auth.Value
-		}
-
-		createOrder, err := acmeClient.AuthorizeOrder(testCtx, tc.authorizations)
-		require.NoError(t, err, "failed creating order")
-		require.Equal(t, acme.StatusPending, createOrder.Status)
-		require.Empty(t, createOrder.CertURL)
-		require.Equal(t, createOrder.URI+"/finalize", createOrder.FinalizeURL)
-		require.Len(t, createOrder.AuthzURLs, len(tc.authorizations), "expected same number of authzurls as identifiers")
-
-		// HACK: Update authorization/challenge to completed as we can't really do it properly in this workflow
-		//       test.
-		markAuthorizationSuccess(t, client, acmeClient, acct, createOrder)
-
-		// Submit the CSR
-		csrKey, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
-		require.NoError(t, err, "failed generated key for CSR")
-		csr, err := x509.CreateCertificateRequest(rand.Reader, &tc.requestCSR, csrKey)
-		require.NoError(t, err, "failed generating csr")
-
-		certs, _, err := acmeClient.CreateOrderCert(testCtx, createOrder.FinalizeURL, csr, true)
-
-		if tc.valid {
-			require.NoError(t, err, "failed finalizing order")
-
-			// Validate we get a signed cert back
-			testAcmeCertSignedByCa(t, client, certs, "int-ca")
-		} else {
-			require.Error(t, err, "Not a valid CSR, should err")
-		}
-	}
-}
diff --git a/builtin/logical/pki/path_config_acme.go b/builtin/logical/pki/path_config_acme.go
deleted file mode 100644
index 6b1b78bc37fe0..0000000000000
--- a/builtin/logical/pki/path_config_acme.go
+++ /dev/null
@@ -1,372 +0,0 @@
-package pki
-
-import (
-	"context"
-	"fmt"
-	"net"
-	"os"
-	"strconv"
-	"strings"
-
-	"github.com/hashicorp/vault/sdk/framework"
-	"github.com/hashicorp/vault/sdk/helper/errutil"
-	"github.com/hashicorp/vault/sdk/logical"
-)
-
-const (
-	storageAcmeConfig      = "config/acme"
-	pathConfigAcmeHelpSyn  = "Configuration of ACME Endpoints"
-	pathConfigAcmeHelpDesc = "Here we configure:\n\nenabled=false, whether ACME is enabled, defaults to false meaning that clusters will by default not get ACME support,\nallowed_issuers=\"default\", which issuers are allowed for use with ACME; by default, this will only be the primary (default) issuer,\nallowed_roles=\"*\", which roles are allowed for use with ACME; by default these will be all roles matching our selection criteria,\ndefault_directory_policy=\"\", either \"forbid\", preventing the default directory from being used at all, \"role:<role_name>\" which is the role to be used for non-role-qualified ACME requests; or \"sign-verbatim\", the default meaning ACME issuance will be equivalent to sign-verbatim.,\ndns_resolver=\"\", which specifies a custom DNS resolver to use for all ACME-related DNS lookups"
-	disableAcmeEnvVar      = "VAULT_DISABLE_PUBLIC_ACME"
-)
-
-type acmeConfigEntry struct {
-	Enabled                bool          `json:"enabled"`
-	AllowedIssuers         []string      `json:"allowed_issuers="`
-	AllowedRoles           []string      `json:"allowed_roles"`
-	DefaultDirectoryPolicy string        `json:"default_directory_policy"`
-	DNSResolver            string        `json:"dns_resolver"`
-	EabPolicyName          EabPolicyName `json:"eab_policy_name"`
-}
-
-var defaultAcmeConfig = acmeConfigEntry{
-	Enabled:                false,
-	AllowedIssuers:         []string{"*"},
-	AllowedRoles:           []string{"*"},
-	DefaultDirectoryPolicy: "sign-verbatim",
-	DNSResolver:            "",
-	EabPolicyName:          eabPolicyNotRequired,
-}
-
-func (sc *storageContext) getAcmeConfig() (*acmeConfigEntry, error) {
-	entry, err := sc.Storage.Get(sc.Context, storageAcmeConfig)
-	if err != nil {
-		return nil, err
-	}
-
-	var mapping acmeConfigEntry
-	if entry == nil {
-		mapping = defaultAcmeConfig
-		return &mapping, nil
-	}
-
-	if err := entry.DecodeJSON(&mapping); err != nil {
-		return nil, errutil.InternalError{Err: fmt.Sprintf("unable to decode ACME configuration: %v", err)}
-	}
-
-	return &mapping, nil
-}
-
-func (sc *storageContext) setAcmeConfig(entry *acmeConfigEntry) error {
-	json, err := logical.StorageEntryJSON(storageAcmeConfig, entry)
-	if err != nil {
-		return fmt.Errorf("failed creating storage entry: %w", err)
-	}
-
-	if err := sc.Storage.Put(sc.Context, json); err != nil {
-		return fmt.Errorf("failed writing storage entry: %w", err)
-	}
-
-	sc.Backend.acmeState.markConfigDirty()
-	return nil
-}
-
-func pathAcmeConfig(b *backend) *framework.Path {
-	return &framework.Path{
-		Pattern: "config/acme",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixPKI,
-		},
-
-		Fields: map[string]*framework.FieldSchema{
-			"enabled": {
-				Type:        framework.TypeBool,
-				Description: `whether ACME is enabled, defaults to false meaning that clusters will by default not get ACME support`,
-				Default:     false,
-			},
-			"allowed_issuers": {
-				Type:        framework.TypeCommaStringSlice,
-				Description: `which issuers are allowed for use with ACME; by default, this will only be the primary (default) issuer`,
-				Default:     []string{"*"},
-			},
-			"allowed_roles": {
-				Type:        framework.TypeCommaStringSlice,
-				Description: `which roles are allowed for use with ACME; by default via '*', these will be all roles including sign-verbatim; when concrete role names are specified, any default_directory_policy role must be included to allow usage of the default acme directories under /pki/acme/directory and /pki/issuer/:issuer_id/acme/directory.`,
-				Default:     []string{"*"},
-			},
-			"default_directory_policy": {
-				Type:        framework.TypeString,
-				Description: `the policy to be used for non-role-qualified ACME requests; by default ACME issuance will be otherwise unrestricted, equivalent to the sign-verbatim endpoint; one may also specify a role to use as this policy, as "role:<role_name>", the specified role must be allowed by allowed_roles`,
-				Default:     "sign-verbatim",
-			},
-			"dns_resolver": {
-				Type:        framework.TypeString,
-				Description: `DNS resolver to use for domain resolution on this mount. Defaults to using the default system resolver. Must be in the format <host>:<port>, with both parts mandatory.`,
-				Default:     "",
-			},
-			"eab_policy": {
-				Type:        framework.TypeString,
-				Description: `Specify the policy to use for external account binding behaviour, 'not-required', 'new-account-required' or 'always-required'`,
-				Default:     "always-required",
-			},
-		},
-
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.ReadOperation: &framework.PathOperation{
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationSuffix: "acme-configuration",
-				},
-				Callback: b.pathAcmeRead,
-			},
-			logical.UpdateOperation: &framework.PathOperation{
-				Callback: b.pathAcmeWrite,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb:   "configure",
-					OperationSuffix: "acme",
-				},
-				// Read more about why these flags are set in backend.go.
-				ForwardPerformanceStandby:   true,
-				ForwardPerformanceSecondary: true,
-			},
-		},
-
-		HelpSynopsis:    pathConfigAcmeHelpSyn,
-		HelpDescription: pathConfigAcmeHelpDesc,
-	}
-}
-
-func (b *backend) pathAcmeRead(ctx context.Context, req *logical.Request, _ *framework.FieldData) (*logical.Response, error) {
-	sc := b.makeStorageContext(ctx, req.Storage)
-	config, err := sc.getAcmeConfig()
-	if err != nil {
-		return nil, err
-	}
-
-	var warnings []string
-	if config.Enabled {
-		_, err := getBasePathFromClusterConfig(sc)
-		if err != nil {
-			warnings = append(warnings, err.Error())
-		}
-	}
-
-	return genResponseFromAcmeConfig(config, warnings), nil
-}
-
-func genResponseFromAcmeConfig(config *acmeConfigEntry, warnings []string) *logical.Response {
-	response := &logical.Response{
-		Data: map[string]interface{}{
-			"allowed_roles":            config.AllowedRoles,
-			"allowed_issuers":          config.AllowedIssuers,
-			"default_directory_policy": config.DefaultDirectoryPolicy,
-			"enabled":                  config.Enabled,
-			"dns_resolver":             config.DNSResolver,
-			"eab_policy":               config.EabPolicyName,
-		},
-		Warnings: warnings,
-	}
-
-	// TODO: Add some nice warning if we are on a replication cluster and path isn't set
-
-	return response
-}
-
-func (b *backend) pathAcmeWrite(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
-	sc := b.makeStorageContext(ctx, req.Storage)
-
-	config, err := sc.getAcmeConfig()
-	if err != nil {
-		return nil, err
-	}
-
-	if enabledRaw, ok := d.GetOk("enabled"); ok {
-		config.Enabled = enabledRaw.(bool)
-	}
-
-	if allowedRolesRaw, ok := d.GetOk("allowed_roles"); ok {
-		config.AllowedRoles = allowedRolesRaw.([]string)
-		if len(config.AllowedRoles) == 0 {
-			return nil, fmt.Errorf("allowed_roles must take a non-zero length value; specify '*' as the value to allow anything or specify enabled=false to disable ACME entirely")
-		}
-	}
-
-	if defaultDirectoryPolicyRaw, ok := d.GetOk("default_directory_policy"); ok {
-		config.DefaultDirectoryPolicy = defaultDirectoryPolicyRaw.(string)
-	}
-
-	if allowedIssuersRaw, ok := d.GetOk("allowed_issuers"); ok {
-		config.AllowedIssuers = allowedIssuersRaw.([]string)
-		if len(config.AllowedIssuers) == 0 {
-			return nil, fmt.Errorf("allowed_issuers must take a non-zero length value; specify '*' as the value to allow anything or specify enabled=false to disable ACME entirely")
-		}
-	}
-
-	if dnsResolverRaw, ok := d.GetOk("dns_resolver"); ok {
-		config.DNSResolver = dnsResolverRaw.(string)
-		if config.DNSResolver != "" {
-			addr, _, err := net.SplitHostPort(config.DNSResolver)
-			if err != nil {
-				return nil, fmt.Errorf("failed to parse DNS resolver address: %w", err)
-			}
-			if addr == "" {
-				return nil, fmt.Errorf("failed to parse DNS resolver address: got empty address")
-			}
-			if net.ParseIP(addr) == nil {
-				return nil, fmt.Errorf("failed to parse DNS resolver address: expected IPv4/IPv6 address, likely got hostname")
-			}
-		}
-	}
-
-	if eabPolicyRaw, ok := d.GetOk("eab_policy"); ok {
-		eabPolicy, err := getEabPolicyByString(eabPolicyRaw.(string))
-		if err != nil {
-			return nil, fmt.Errorf("invalid eab policy name provided, valid values are '%s', '%s', '%s'",
-				eabPolicyNotRequired, eabPolicyNewAccountRequired, eabPolicyAlwaysRequired)
-		}
-		config.EabPolicyName = eabPolicy.Name
-	}
-
-	// Validate Default Directory Behavior:
-	defaultDirectoryPolicyType, err := getDefaultDirectoryPolicyType(config.DefaultDirectoryPolicy)
-	if err != nil {
-		return nil, fmt.Errorf("invalid default_directory_policy: %w", err)
-	}
-	defaultDirectoryRoleName := ""
-	switch defaultDirectoryPolicyType {
-	case Forbid:
-	case SignVerbatim:
-	case Role:
-		defaultDirectoryRoleName, err = getDefaultDirectoryPolicyRole(config.DefaultDirectoryPolicy)
-		if err != nil {
-			return nil, fmt.Errorf("failed extracting role name from default directory policy %w", err)
-		}
-
-		_, err := getAndValidateAcmeRole(sc, defaultDirectoryRoleName)
-		if err != nil {
-			return nil, fmt.Errorf("default directory policy role %v is not a valid ACME role: %w", defaultDirectoryRoleName, err)
-		}
-	default:
-		return nil, fmt.Errorf("validation for the type of policy defined by %v is undefined", config.DefaultDirectoryPolicy)
-	}
-
-	// Validate Allowed Roles
-	allowAnyRole := len(config.AllowedRoles) == 1 && config.AllowedRoles[0] == "*"
-	foundDefault := false
-	if !allowAnyRole {
-		for index, name := range config.AllowedRoles {
-			if name == "*" {
-				return nil, fmt.Errorf("cannot use '*' as role name at index %d", index)
-			}
-
-			_, err := getAndValidateAcmeRole(sc, name)
-			if err != nil {
-				return nil, fmt.Errorf("allowed_role %v is not a valid acme role: %w", name, err)
-			}
-
-			if defaultDirectoryPolicyType == Role && name == defaultDirectoryRoleName {
-				foundDefault = true
-			}
-		}
-
-		if !foundDefault && defaultDirectoryPolicyType == Role {
-			return nil, fmt.Errorf("default directory policy %v was not specified in allowed_roles: %v", config.DefaultDirectoryPolicy, config.AllowedRoles)
-		}
-	}
-
-	allowAnyIssuer := len(config.AllowedIssuers) == 1 && config.AllowedIssuers[0] == "*"
-	if !allowAnyIssuer {
-		for index, name := range config.AllowedIssuers {
-			if name == "*" {
-				return nil, fmt.Errorf("cannot use '*' as issuer name at index %d", index)
-			}
-
-			_, err := sc.resolveIssuerReference(name)
-			if err != nil {
-				return nil, fmt.Errorf("failed validating allowed_issuers: unable to fetch issuer: %v: %w", name, err)
-			}
-		}
-	}
-
-	// Check to make sure that we have a proper value for the cluster path which ACME requires
-	if config.Enabled {
-		_, err = getBasePathFromClusterConfig(sc)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	var warnings []string
-	// Lastly lets verify that the configuration is honored/invalidated by the public ACME env var.
-	isPublicAcmeDisabledByEnv, err := isPublicACMEDisabledByEnv()
-	if err != nil {
-		warnings = append(warnings, err.Error())
-	}
-	if isPublicAcmeDisabledByEnv && config.Enabled {
-		eabPolicy := getEabPolicyByName(config.EabPolicyName)
-		if !eabPolicy.OverrideEnvDisablingPublicAcme() {
-			resp := logical.ErrorResponse("%s env var is enabled, ACME EAB policy needs to be '%s' with ACME enabled",
-				disableAcmeEnvVar, eabPolicyAlwaysRequired)
-			resp.Warnings = warnings
-			return resp, nil
-		}
-	}
-
-	err = sc.setAcmeConfig(config)
-	if err != nil {
-		return nil, err
-	}
-
-	return genResponseFromAcmeConfig(config, warnings), nil
-}
-
-func isPublicACMEDisabledByEnv() (bool, error) {
-	disableAcmeRaw, ok := os.LookupEnv(disableAcmeEnvVar)
-	if !ok {
-		return false, nil
-	}
-
-	disableAcme, err := strconv.ParseBool(disableAcmeRaw)
-	if err != nil {
-		// So the environment variable was set but we couldn't parse the value as a string, assume
-		// the operator wanted public ACME disabled.
-		return true, fmt.Errorf("failed parsing environment variable %s: %w", disableAcmeEnvVar, err)
-	}
-
-	return disableAcme, nil
-}
-
-func getDefaultDirectoryPolicyType(defaultDirectoryPolicy string) (DefaultDirectoryPolicyType, error) {
-	switch {
-	case defaultDirectoryPolicy == "forbid":
-		return Forbid, nil
-	case defaultDirectoryPolicy == "sign-verbatim":
-		return SignVerbatim, nil
-	case strings.HasPrefix(defaultDirectoryPolicy, "role:"):
-		if len(defaultDirectoryPolicy) == 5 {
-			return Forbid, fmt.Errorf("no role specified by policy %v", defaultDirectoryPolicy)
-		}
-		return Role, nil
-	default:
-		return Forbid, fmt.Errorf("string %v not a valid Default Directory Policy", defaultDirectoryPolicy)
-	}
-}
-
-func getDefaultDirectoryPolicyRole(defaultDirectoryPolicy string) (string, error) {
-	policyType, err := getDefaultDirectoryPolicyType(defaultDirectoryPolicy)
-	if err != nil {
-		return "", err
-	}
-	if policyType != Role {
-		return "", fmt.Errorf("default directory policy %v is not a role-based-policy", defaultDirectoryPolicy)
-	}
-	return defaultDirectoryPolicy[5:], nil
-}
-
-type DefaultDirectoryPolicyType int
-
-const (
-	Forbid DefaultDirectoryPolicyType = iota
-	SignVerbatim
-	Role
-)
diff --git a/builtin/logical/pki/path_config_acme_test.go b/builtin/logical/pki/path_config_acme_test.go
deleted file mode 100644
index 93be569d667d4..0000000000000
--- a/builtin/logical/pki/path_config_acme_test.go
+++ /dev/null
@@ -1,132 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package pki
-
-import (
-	"context"
-	"crypto/rand"
-	"crypto/rsa"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestAcmeConfig(t *testing.T) {
-	cluster, client, _ := setupAcmeBackend(t)
-	defer cluster.Cleanup()
-
-	cases := []struct {
-		name        string
-		AcmeConfig  map[string]interface{}
-		prefixUrl   string
-		validConfig bool
-		works       bool
-	}{
-		{"unspecified-root", map[string]interface{}{
-			"enabled":         true,
-			"allowed_issuers": "*",
-			"allowed_roles":   "*",
-			"dns_resolver":    "",
-			"eab_policy_name": "",
-		}, "acme/", true, true},
-		{"bad-policy-root", map[string]interface{}{
-			"enabled":                  true,
-			"allowed_issuers":          "*",
-			"allowed_roles":            "*",
-			"default_directory_policy": "bad",
-			"dns_resolver":             "",
-			"eab_policy_name":          "",
-		}, "acme/", false, false},
-		{"forbid-root", map[string]interface{}{
-			"enabled":                  true,
-			"allowed_issuers":          "*",
-			"allowed_roles":            "*",
-			"default_directory_policy": "forbid",
-			"dns_resolver":             "",
-			"eab_policy_name":          "",
-		}, "acme/", true, false},
-		{"sign-verbatim-root", map[string]interface{}{
-			"enabled":                  true,
-			"allowed_issuers":          "*",
-			"allowed_roles":            "*",
-			"default_directory_policy": "sign-verbatim",
-			"dns_resolver":             "",
-			"eab_policy_name":          "",
-		}, "acme/", true, true},
-		{"role-root", map[string]interface{}{
-			"enabled":                  true,
-			"allowed_issuers":          "*",
-			"allowed_roles":            "*",
-			"default_directory_policy": "role:exists",
-			"dns_resolver":             "",
-			"eab_policy_name":          "",
-		}, "acme/", true, true},
-		{"bad-role-root", map[string]interface{}{
-			"enabled":                  true,
-			"allowed_issuers":          "*",
-			"allowed_roles":            "*",
-			"default_directory_policy": "role:notgood",
-			"dns_resolver":             "",
-			"eab_policy_name":          "",
-		}, "acme/", false, true},
-		{"disallowed-role-root", map[string]interface{}{
-			"enabled":                  true,
-			"allowed_issuers":          "*",
-			"allowed_roles":            "good",
-			"default_directory_policy": "role:exists",
-			"dns_resolver":             "",
-			"eab_policy_name":          "",
-		}, "acme/", false, false},
-	}
-
-	roleConfig := map[string]interface{}{
-		"issuer_ref":       "default",
-		"allowed_domains":  "example.com",
-		"allow_subdomains": true,
-		"max_ttl":          "720h",
-	}
-
-	testCtx := context.Background()
-
-	for _, tc := range cases {
-		deadline := time.Now().Add(time.Second * 10)
-		subTestCtx, _ := context.WithDeadline(testCtx, deadline)
-
-		_, err := client.Logical().WriteWithContext(subTestCtx, "pki/roles/exists", roleConfig)
-		require.NoError(t, err)
-		_, err = client.Logical().WriteWithContext(subTestCtx, "pki/roles/good", roleConfig)
-		require.NoError(t, err)
-
-		t.Run(tc.name, func(t *testing.T) {
-			_, err := client.Logical().WriteWithContext(subTestCtx, "pki/config/acme", tc.AcmeConfig)
-
-			if tc.validConfig {
-				require.NoError(t, err)
-			} else {
-				require.Error(t, err)
-				return
-			}
-
-			_, err = client.Logical().ReadWithContext(subTestCtx, "pki/acme/directory")
-			if tc.works {
-				require.NoError(t, err)
-
-				baseAcmeURL := "/v1/pki/" + tc.prefixUrl
-				accountKey, err := rsa.GenerateKey(rand.Reader, 2048)
-				require.NoError(t, err, "failed creating rsa key")
-
-				acmeClient := getAcmeClientForCluster(t, cluster, baseAcmeURL, accountKey)
-
-				// Create new account
-				_, err = acmeClient.Discover(subTestCtx)
-				require.NoError(t, err, "failed acme discovery call")
-			} else {
-				require.Error(t, err, "Acme Configuration should prevent usage")
-			}
-
-			t.Logf("Completed case %v", tc.name)
-		})
-	}
-}
diff --git a/builtin/logical/pki/path_config_ca.go b/builtin/logical/pki/path_config_ca.go
index e77386f4b1876..f7a7706455cb1 100644
--- a/builtin/logical/pki/path_config_ca.go
+++ b/builtin/logical/pki/path_config_ca.go
@@ -1,26 +1,16 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pki
 
 import (
 	"context"
-	"net/http"
 
 	"github.com/hashicorp/vault/sdk/framework"
+	"github.com/hashicorp/vault/sdk/helper/errutil"
 	"github.com/hashicorp/vault/sdk/logical"
 )
 
 func pathConfigCA(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "config/ca",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixPKI,
-			OperationVerb:   "configure",
-			OperationSuffix: "ca",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"pem_bundle": {
 				Type: framework.TypeString,
@@ -32,38 +22,6 @@ secret key and certificate.`,
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.UpdateOperation: &framework.PathOperation{
 				Callback: b.pathImportIssuers,
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"mapping": {
-								Type:        framework.TypeMap,
-								Description: "A mapping of issuer_id to key_id for all issuers included in this request",
-								Required:    true,
-							},
-							"imported_keys": {
-								Type:        framework.TypeCommaStringSlice,
-								Description: "Net-new keys imported as a part of this request",
-								Required:    true,
-							},
-							"imported_issuers": {
-								Type:        framework.TypeCommaStringSlice,
-								Description: "Net-new issuers imported as a part of this request",
-								Required:    true,
-							},
-							"existing_keys": {
-								Type:        framework.TypeCommaStringSlice,
-								Description: "Existing keys specified as part of the import bundle of this request",
-								Required:    true,
-							},
-							"existing_issuers": {
-								Type:        framework.TypeCommaStringSlice,
-								Description: "Existing issuers specified as part of the import bundle of this request",
-								Required:    true,
-							},
-						},
-					}},
-				},
 				// Read more about why these flags are set in backend.go.
 				ForwardPerformanceStandby:   true,
 				ForwardPerformanceSecondary: true,
@@ -90,11 +48,6 @@ For security reasons, the secret key cannot be retrieved later.
 func pathConfigIssuers(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "config/issuers",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixPKI,
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			defaultRef: {
 				Type:        framework.TypeString,
@@ -106,51 +59,13 @@ func pathConfigIssuers(b *backend) *framework.Path {
 				Default:     false,
 			},
 		},
+
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.ReadOperation: &framework.PathOperation{
 				Callback: b.pathCAIssuersRead,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationSuffix: "issuers-configuration",
-				},
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"default": {
-								Type:        framework.TypeString,
-								Description: `Reference (name or identifier) to the default issuer.`,
-								Required:    true,
-							},
-							"default_follows_latest_issuer": {
-								Type:        framework.TypeBool,
-								Description: `Whether the default issuer should automatically follow the latest generated or imported issuer. Defaults to false.`,
-								Required:    true,
-							},
-						},
-					}},
-				},
 			},
 			logical.UpdateOperation: &framework.PathOperation{
 				Callback: b.pathCAIssuersWrite,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb:   "configure",
-					OperationSuffix: "issuers",
-				},
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"default": {
-								Type:        framework.TypeString,
-								Description: `Reference (name or identifier) to the default issuer.`,
-							},
-							"default_follows_latest_issuer": {
-								Type:        framework.TypeBool,
-								Description: `Whether the default issuer should automatically follow the latest generated or imported issuer. Defaults to false.`,
-							},
-						},
-					}},
-				},
 				// Read more about why these flags are set in backend.go.
 				ForwardPerformanceStandby:   true,
 				ForwardPerformanceSecondary: true,
@@ -165,13 +80,6 @@ func pathConfigIssuers(b *backend) *framework.Path {
 func pathReplaceRoot(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "root/replace",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixPKI,
-			OperationVerb:   "replace",
-			OperationSuffix: "root",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"default": {
 				Type:        framework.TypeString,
@@ -183,23 +91,6 @@ func pathReplaceRoot(b *backend) *framework.Path {
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.UpdateOperation: &framework.PathOperation{
 				Callback: b.pathCAIssuersWrite,
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"default": {
-								Type:        framework.TypeString,
-								Description: `Reference (name or identifier) to the default issuer.`,
-								Required:    true,
-							},
-							"default_follows_latest_issuer": {
-								Type:        framework.TypeBool,
-								Description: `Whether the default issuer should automatically follow the latest generated or imported issuer. Defaults to false.`,
-								Required:    true,
-							},
-						},
-					}},
-				},
 				// Read more about why these flags are set in backend.go.
 				ForwardPerformanceStandby:   true,
 				ForwardPerformanceSecondary: true,
@@ -254,6 +145,7 @@ func (b *backend) pathCAIssuersWrite(ctx context.Context, req *logical.Request,
 	parsedIssuer, err := sc.resolveIssuerReference(newDefault)
 	if err != nil {
 		return logical.ErrorResponse("Error resolving issuer reference: " + err.Error()), nil
+		return nil, errutil.UserError{Err: "Error resolving issuer reference: " + err.Error()}
 	}
 	entry, err := sc.fetchIssuerById(parsedIssuer)
 	if err != nil {
@@ -309,11 +201,6 @@ value of the issuer with the name "next", if it exists.
 func pathConfigKeys(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "config/keys",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixPKI,
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			defaultRef: {
 				Type:        framework.TypeString,
@@ -323,42 +210,12 @@ func pathConfigKeys(b *backend) *framework.Path {
 
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.UpdateOperation: &framework.PathOperation{
-				Callback: b.pathKeyDefaultWrite,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb:   "configure",
-					OperationSuffix: "keys",
-				},
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"default": {
-								Type:        framework.TypeString,
-								Description: `Reference (name or identifier) to the default issuer.`,
-								Required:    true,
-							},
-						},
-					}},
-				},
+				Callback:                    b.pathKeyDefaultWrite,
 				ForwardPerformanceStandby:   true,
 				ForwardPerformanceSecondary: true,
 			},
 			logical.ReadOperation: &framework.PathOperation{
-				Callback: b.pathKeyDefaultRead,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationSuffix: "keys-configuration",
-				},
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"default": {
-								Type:        framework.TypeString,
-								Description: `Reference (name or identifier) to the default issuer.`,
-							},
-						},
-					}},
-				},
+				Callback:                    b.pathKeyDefaultRead,
 				ForwardPerformanceStandby:   false,
 				ForwardPerformanceSecondary: false,
 			},
diff --git a/builtin/logical/pki/path_config_cluster.go b/builtin/logical/pki/path_config_cluster.go
deleted file mode 100644
index 4bdfb820576ad..0000000000000
--- a/builtin/logical/pki/path_config_cluster.go
+++ /dev/null
@@ -1,198 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package pki
-
-import (
-	"context"
-	"fmt"
-	"net/http"
-
-	"github.com/asaskevich/govalidator"
-	"github.com/hashicorp/vault/sdk/framework"
-	"github.com/hashicorp/vault/sdk/logical"
-)
-
-func pathConfigCluster(b *backend) *framework.Path {
-	return &framework.Path{
-		Pattern: "config/cluster",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixPKI,
-		},
-
-		Fields: map[string]*framework.FieldSchema{
-			"path": {
-				Type: framework.TypeString,
-				Description: `Canonical URI to this mount on this performance
-replication cluster's external address. This is for resolving AIA URLs and
-providing the {{cluster_path}} template parameter but might be used for other
-purposes in the future.
-
-This should only point back to this particular PR replica and should not ever
-point to another PR cluster. It may point to any node in the PR replica,
-including standby nodes, and need not always point to the active node.
-
-For example: https://pr1.vault.example.com:8200/v1/pki`,
-			},
-			"aia_path": {
-				Type: framework.TypeString,
-				Description: `Optional URI to this mount's AIA distribution
-point; may refer to an external non-Vault responder. This is for resolving AIA
-URLs and providing the {{cluster_aia_path}} template parameter and will not
-be used for other purposes. As such, unlike path above, this could safely
-be an insecure transit mechanism (like HTTP without TLS).
-
-For example: http://cdn.example.com/pr1/pki`,
-			},
-		},
-
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.UpdateOperation: &framework.PathOperation{
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb:   "configure",
-					OperationSuffix: "cluster",
-				},
-				Callback: b.pathWriteCluster,
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"path": {
-								Type: framework.TypeString,
-								Description: `Canonical URI to this mount on this performance
-replication cluster's external address. This is for resolving AIA URLs and
-providing the {{cluster_path}} template parameter but might be used for other
-purposes in the future.
-
-This should only point back to this particular PR replica and should not ever
-point to another PR cluster. It may point to any node in the PR replica,
-including standby nodes, and need not always point to the active node.
-
-For example: https://pr1.vault.example.com:8200/v1/pki`,
-							},
-							"aia_path": {
-								Type: framework.TypeString,
-								Description: `Optional URI to this mount's AIA distribution
-point; may refer to an external non-Vault responder. This is for resolving AIA
-URLs and providing the {{cluster_aia_path}} template parameter and will not
-be used for other purposes. As such, unlike path above, this could safely
-be an insecure transit mechanism (like HTTP without TLS).
-
-For example: http://cdn.example.com/pr1/pki`,
-							},
-						},
-					}},
-				},
-			},
-			logical.ReadOperation: &framework.PathOperation{
-				Callback: b.pathReadCluster,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationSuffix: "cluster-configuration",
-				},
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"path": {
-								Type: framework.TypeString,
-								Description: `Canonical URI to this mount on this performance
-replication cluster's external address. This is for resolving AIA URLs and
-providing the {{cluster_path}} template parameter but might be used for other
-purposes in the future.
-
-This should only point back to this particular PR replica and should not ever
-point to another PR cluster. It may point to any node in the PR replica,
-including standby nodes, and need not always point to the active node.
-
-For example: https://pr1.vault.example.com:8200/v1/pki`,
-								Required: true,
-							},
-							"aia_path": {
-								Type: framework.TypeString,
-								Description: `Optional URI to this mount's AIA distribution
-point; may refer to an external non-Vault responder. This is for resolving AIA
-URLs and providing the {{cluster_aia_path}} template parameter and will not
-be used for other purposes. As such, unlike path above, this could safely
-be an insecure transit mechanism (like HTTP without TLS).
-
-For example: http://cdn.example.com/pr1/pki`,
-							},
-						},
-					}},
-				},
-			},
-		},
-
-		HelpSynopsis:    pathConfigClusterHelpSyn,
-		HelpDescription: pathConfigClusterHelpDesc,
-	}
-}
-
-func (b *backend) pathReadCluster(ctx context.Context, req *logical.Request, _ *framework.FieldData) (*logical.Response, error) {
-	sc := b.makeStorageContext(ctx, req.Storage)
-	cfg, err := sc.getClusterConfig()
-	if err != nil {
-		return nil, err
-	}
-
-	resp := &logical.Response{
-		Data: map[string]interface{}{
-			"path":     cfg.Path,
-			"aia_path": cfg.AIAPath,
-		},
-	}
-
-	return resp, nil
-}
-
-func (b *backend) pathWriteCluster(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
-	sc := b.makeStorageContext(ctx, req.Storage)
-	cfg, err := sc.getClusterConfig()
-	if err != nil {
-		return nil, err
-	}
-
-	if value, ok := data.GetOk("path"); ok {
-		cfg.Path = value.(string)
-
-		// This field is required by ACME, if ever we allow un-setting in the
-		// future, this code will need to verify that ACME is not enabled.
-		if !govalidator.IsURL(cfg.Path) {
-			return nil, fmt.Errorf("invalid, non-URL path given to cluster: %v", cfg.Path)
-		}
-	}
-
-	if value, ok := data.GetOk("aia_path"); ok {
-		cfg.AIAPath = value.(string)
-		if !govalidator.IsURL(cfg.AIAPath) {
-			return nil, fmt.Errorf("invalid, non-URL aia_path given to cluster: %v", cfg.AIAPath)
-		}
-	}
-
-	if err := sc.writeClusterConfig(cfg); err != nil {
-		return nil, err
-	}
-
-	resp := &logical.Response{
-		Data: map[string]interface{}{
-			"path":     cfg.Path,
-			"aia_path": cfg.AIAPath,
-		},
-	}
-
-	return resp, nil
-}
-
-const pathConfigClusterHelpSyn = `
-Set cluster-local configuration, including address to this PR cluster.
-`
-
-const pathConfigClusterHelpDesc = `
-This path allows you to set cluster-local configuration, including the
-URI to this performance replication cluster. This allows you to use
-templated AIA URLs with /config/urls and /issuer/:issuer_ref, setting the
-reference to the cluster's URI.
-
-Only one address can be specified for any given cluster.
-`
diff --git a/builtin/logical/pki/path_config_crl.go b/builtin/logical/pki/path_config_crl.go
index 0249e6f084b70..30b8047b53fc6 100644
--- a/builtin/logical/pki/path_config_crl.go
+++ b/builtin/logical/pki/path_config_crl.go
@@ -1,15 +1,10 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pki
 
 import (
 	"context"
 	"fmt"
-	"net/http"
 	"time"
 
-	"github.com/hashicorp/vault/helper/constants"
 	"github.com/hashicorp/vault/sdk/framework"
 	"github.com/hashicorp/vault/sdk/helper/errutil"
 	"github.com/hashicorp/vault/sdk/logical"
@@ -19,44 +14,33 @@ const latestCrlConfigVersion = 1
 
 // CRLConfig holds basic CRL configuration information
 type crlConfig struct {
-	Version                   int    `json:"version"`
-	Expiry                    string `json:"expiry"`
-	Disable                   bool   `json:"disable"`
-	OcspDisable               bool   `json:"ocsp_disable"`
-	AutoRebuild               bool   `json:"auto_rebuild"`
-	AutoRebuildGracePeriod    string `json:"auto_rebuild_grace_period"`
-	OcspExpiry                string `json:"ocsp_expiry"`
-	EnableDelta               bool   `json:"enable_delta"`
-	DeltaRebuildInterval      string `json:"delta_rebuild_interval"`
-	UseGlobalQueue            bool   `json:"cross_cluster_revocation"`
-	UnifiedCRL                bool   `json:"unified_crl"`
-	UnifiedCRLOnExistingPaths bool   `json:"unified_crl_on_existing_paths"`
+	Version                int    `json:"version"`
+	Expiry                 string `json:"expiry"`
+	Disable                bool   `json:"disable"`
+	OcspDisable            bool   `json:"ocsp_disable"`
+	AutoRebuild            bool   `json:"auto_rebuild"`
+	AutoRebuildGracePeriod string `json:"auto_rebuild_grace_period"`
+	OcspExpiry             string `json:"ocsp_expiry"`
+	EnableDelta            bool   `json:"enable_delta"`
+	DeltaRebuildInterval   string `json:"delta_rebuild_interval"`
 }
 
 // Implicit default values for the config if it does not exist.
 var defaultCrlConfig = crlConfig{
-	Version:                   latestCrlConfigVersion,
-	Expiry:                    "72h",
-	Disable:                   false,
-	OcspDisable:               false,
-	OcspExpiry:                "12h",
-	AutoRebuild:               false,
-	AutoRebuildGracePeriod:    "12h",
-	EnableDelta:               false,
-	DeltaRebuildInterval:      "15m",
-	UseGlobalQueue:            false,
-	UnifiedCRL:                false,
-	UnifiedCRLOnExistingPaths: false,
+	Version:                latestCrlConfigVersion,
+	Expiry:                 "72h",
+	Disable:                false,
+	OcspDisable:            false,
+	OcspExpiry:             "12h",
+	AutoRebuild:            false,
+	AutoRebuildGracePeriod: "12h",
+	EnableDelta:            false,
+	DeltaRebuildInterval:   "15m",
 }
 
 func pathConfigCRL(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "config/crl",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixPKI,
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"expiry": {
 				Type: framework.TypeString,
@@ -96,171 +80,14 @@ the NextUpdate field); defaults to 12 hours`,
 				Description: `The time between delta CRL rebuilds if a new revocation has occurred. Must be shorter than the CRL expiry. Defaults to 15m.`,
 				Default:     "15m",
 			},
-			"cross_cluster_revocation": {
-				Type: framework.TypeBool,
-				Description: `Whether to enable a global, cross-cluster revocation queue.
-Must be used with auto_rebuild=true.`,
-			},
-			"unified_crl": {
-				Type: framework.TypeBool,
-				Description: `If set to true enables global replication of revocation entries,
-also enabling unified versions of OCSP and CRLs if their respective features are enabled.
-disable for CRLs and ocsp_disable for OCSP.`,
-				Default: "false",
-			},
-			"unified_crl_on_existing_paths": {
-				Type: framework.TypeBool,
-				Description: `If set to true, 
-existing CRL and OCSP paths will return the unified CRL instead of a response based on cluster-local data`,
-				Default: "false",
-			},
 		},
 
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.ReadOperation: &framework.PathOperation{
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationSuffix: "crl-configuration",
-				},
 				Callback: b.pathCRLRead,
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"expiry": {
-								Type: framework.TypeString,
-								Description: `The amount of time the generated CRL should be
-valid; defaults to 72 hours`,
-								Required: true,
-							},
-							"disable": {
-								Type:        framework.TypeBool,
-								Description: `If set to true, disables generating the CRL entirely.`,
-								Required:    true,
-							},
-							"ocsp_disable": {
-								Type:        framework.TypeBool,
-								Description: `If set to true, ocsp unauthorized responses will be returned.`,
-								Required:    true,
-							},
-							"ocsp_expiry": {
-								Type: framework.TypeString,
-								Description: `The amount of time an OCSP response will be valid (controls 
-the NextUpdate field); defaults to 12 hours`,
-								Required: true,
-							},
-							"auto_rebuild": {
-								Type:        framework.TypeBool,
-								Description: `If set to true, enables automatic rebuilding of the CRL`,
-								Required:    true,
-							},
-							"auto_rebuild_grace_period": {
-								Type:        framework.TypeString,
-								Description: `The time before the CRL expires to automatically rebuild it, when enabled. Must be shorter than the CRL expiry. Defaults to 12h.`,
-								Required:    true,
-							},
-							"enable_delta": {
-								Type:        framework.TypeBool,
-								Description: `Whether to enable delta CRLs between authoritative CRL rebuilds`,
-								Required:    true,
-							},
-							"delta_rebuild_interval": {
-								Type:        framework.TypeString,
-								Description: `The time between delta CRL rebuilds if a new revocation has occurred. Must be shorter than the CRL expiry. Defaults to 15m.`,
-								Required:    true,
-							},
-							"cross_cluster_revocation": {
-								Type: framework.TypeBool,
-								Description: `Whether to enable a global, cross-cluster revocation queue.
-Must be used with auto_rebuild=true.`,
-								Required: true,
-							},
-							"unified_crl": {
-								Type: framework.TypeBool,
-								Description: `If set to true enables global replication of revocation entries,
-also enabling unified versions of OCSP and CRLs if their respective features are enabled.
-disable for CRLs and ocsp_disable for OCSP.`,
-								Required: true,
-							},
-							"unified_crl_on_existing_paths": {
-								Type: framework.TypeBool,
-								Description: `If set to true, 
-existing CRL and OCSP paths will return the unified CRL instead of a response based on cluster-local data`,
-								Required: true,
-							},
-						},
-					}},
-				},
 			},
 			logical.UpdateOperation: &framework.PathOperation{
 				Callback: b.pathCRLWrite,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb:   "configure",
-					OperationSuffix: "crl",
-				},
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"expiry": {
-								Type: framework.TypeString,
-								Description: `The amount of time the generated CRL should be
-valid; defaults to 72 hours`,
-								Default: "72h",
-							},
-							"disable": {
-								Type:        framework.TypeBool,
-								Description: `If set to true, disables generating the CRL entirely.`,
-							},
-							"ocsp_disable": {
-								Type:        framework.TypeBool,
-								Description: `If set to true, ocsp unauthorized responses will be returned.`,
-							},
-							"ocsp_expiry": {
-								Type: framework.TypeString,
-								Description: `The amount of time an OCSP response will be valid (controls 
-the NextUpdate field); defaults to 12 hours`,
-								Default: "1h",
-							},
-							"auto_rebuild": {
-								Type:        framework.TypeBool,
-								Description: `If set to true, enables automatic rebuilding of the CRL`,
-							},
-							"auto_rebuild_grace_period": {
-								Type:        framework.TypeString,
-								Description: `The time before the CRL expires to automatically rebuild it, when enabled. Must be shorter than the CRL expiry. Defaults to 12h.`,
-								Default:     "12h",
-							},
-							"enable_delta": {
-								Type:        framework.TypeBool,
-								Description: `Whether to enable delta CRLs between authoritative CRL rebuilds`,
-							},
-							"delta_rebuild_interval": {
-								Type:        framework.TypeString,
-								Description: `The time between delta CRL rebuilds if a new revocation has occurred. Must be shorter than the CRL expiry. Defaults to 15m.`,
-								Default:     "15m",
-							},
-							"cross_cluster_revocation": {
-								Type: framework.TypeBool,
-								Description: `Whether to enable a global, cross-cluster revocation queue.
-Must be used with auto_rebuild=true.`,
-								Required: false,
-							},
-							"unified_crl": {
-								Type: framework.TypeBool,
-								Description: `If set to true enables global replication of revocation entries,
-also enabling unified versions of OCSP and CRLs if their respective features are enabled.
-disable for CRLs and ocsp_disable for OCSP.`,
-								Required: false,
-							},
-							"unified_crl_on_existing_paths": {
-								Type: framework.TypeBool,
-								Description: `If set to true, 
-existing CRL and OCSP paths will return the unified CRL instead of a response based on cluster-local data`,
-								Required: false,
-							},
-						},
-					}},
-				},
 				// Read more about why these flags are set in backend.go.
 				ForwardPerformanceStandby:   true,
 				ForwardPerformanceSecondary: true,
@@ -279,7 +106,18 @@ func (b *backend) pathCRLRead(ctx context.Context, req *logical.Request, _ *fram
 		return nil, err
 	}
 
-	return genResponseFromCrlConfig(config), nil
+	return &logical.Response{
+		Data: map[string]interface{}{
+			"expiry":                    config.Expiry,
+			"disable":                   config.Disable,
+			"ocsp_disable":              config.OcspDisable,
+			"ocsp_expiry":               config.OcspExpiry,
+			"auto_rebuild":              config.AutoRebuild,
+			"auto_rebuild_grace_period": config.AutoRebuildGracePeriod,
+			"enable_delta":              config.EnableDelta,
+			"delta_rebuild_interval":    config.DeltaRebuildInterval,
+		},
+	}, nil
 }
 
 func (b *backend) pathCRLWrite(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
@@ -332,7 +170,6 @@ func (b *backend) pathCRLWrite(ctx context.Context, req *logical.Request, d *fra
 		config.AutoRebuildGracePeriod = autoRebuildGracePeriod
 	}
 
-	oldEnableDelta := config.EnableDelta
 	if enableDeltaRaw, ok := d.GetOk("enable_delta"); ok {
 		config.EnableDelta = enableDeltaRaw.(bool)
 	}
@@ -345,23 +182,6 @@ func (b *backend) pathCRLWrite(ctx context.Context, req *logical.Request, d *fra
 		config.DeltaRebuildInterval = deltaRebuildInterval
 	}
 
-	if useGlobalQueue, ok := d.GetOk("cross_cluster_revocation"); ok {
-		config.UseGlobalQueue = useGlobalQueue.(bool)
-	}
-
-	oldUnifiedCRL := config.UnifiedCRL
-	if unifiedCrlRaw, ok := d.GetOk("unified_crl"); ok {
-		config.UnifiedCRL = unifiedCrlRaw.(bool)
-	}
-
-	if unifiedCrlOnExistingPathsRaw, ok := d.GetOk("unified_crl_on_existing_paths"); ok {
-		config.UnifiedCRLOnExistingPaths = unifiedCrlOnExistingPathsRaw.(bool)
-	}
-
-	if config.UnifiedCRLOnExistingPaths && !config.UnifiedCRL {
-		return logical.ErrorResponse("unified_crl_on_existing_paths cannot be enabled if unified_crl is disabled"), nil
-	}
-
 	expiry, _ := time.ParseDuration(config.Expiry)
 	if config.AutoRebuild {
 		gracePeriod, _ := time.ParseDuration(config.AutoRebuildGracePeriod)
@@ -377,36 +197,8 @@ func (b *backend) pathCRLWrite(ctx context.Context, req *logical.Request, d *fra
 		}
 	}
 
-	if !config.AutoRebuild {
-		if config.EnableDelta {
-			return logical.ErrorResponse("Delta CRLs cannot be enabled when auto rebuilding is disabled as the complete CRL is always regenerated!"), nil
-		}
-
-		if config.UseGlobalQueue {
-			return logical.ErrorResponse("Global, cross-cluster revocation queue cannot be enabled when auto rebuilding is disabled as the local cluster may not have the certificate entry!"), nil
-		}
-	}
-
-	if !constants.IsEnterprise && config.UseGlobalQueue {
-		return logical.ErrorResponse("Global, cross-cluster revocation queue (cross_cluster_revocation) can only be enabled on Vault Enterprise."), nil
-	}
-
-	if !constants.IsEnterprise && config.UnifiedCRL {
-		return logical.ErrorResponse("unified_crl can only be enabled on Vault Enterprise"), nil
-	}
-
-	isLocalMount := b.System().LocalMount()
-	if isLocalMount && config.UseGlobalQueue {
-		return logical.ErrorResponse("Global, cross-cluster revocation queue (cross_cluster_revocation) cannot be enabled on local mounts."),
-			nil
-	}
-
-	if isLocalMount && config.UnifiedCRL {
-		return logical.ErrorResponse("unified_crl cannot be enabled on local mounts."), nil
-	}
-
-	if !config.AutoRebuild && config.UnifiedCRL {
-		return logical.ErrorResponse("unified_crl=true requires auto_rebuild=true, as unified CRLs cannot be rebuilt on every revocation."), nil
+	if config.EnableDelta && !config.AutoRebuild {
+		return logical.ErrorResponse("Delta CRLs cannot be enabled when auto rebuilding is disabled as the complete CRL is always regenerated!"), nil
 	}
 
 	entry, err := logical.StorageEntryJSON("config/crl", config)
@@ -421,17 +213,10 @@ func (b *backend) pathCRLWrite(ctx context.Context, req *logical.Request, d *fra
 	b.crlBuilder.markConfigDirty()
 	b.crlBuilder.reloadConfigIfRequired(sc)
 
-	resp := genResponseFromCrlConfig(config)
-
-	// Note this only affects/happens on the main cluster node, if you need to
-	// notify something based on a configuration change on all server types
-	// have a look at crlBuilder::reloadConfigIfRequired
-	if oldDisable != config.Disable || (oldAutoRebuild && !config.AutoRebuild) || (oldEnableDelta != config.EnableDelta) || (oldUnifiedCRL != config.UnifiedCRL) {
+	if oldDisable != config.Disable || (oldAutoRebuild && !config.AutoRebuild) {
 		// It wasn't disabled but now it is (or equivalently, we were set to
-		// auto-rebuild and we aren't now or equivalently, we changed our
-		// mind about delta CRLs and need a new complete one or equivalently,
-		// we changed our mind about unified CRLs), rotate the CRLs.
-		warnings, crlErr := b.crlBuilder.rebuild(sc, true)
+		// auto-rebuild and we aren't now), so rotate the CRL.
+		crlErr := b.crlBuilder.rebuild(ctx, b, req, true)
 		if crlErr != nil {
 			switch crlErr.(type) {
 			case errutil.UserError:
@@ -440,30 +225,9 @@ func (b *backend) pathCRLWrite(ctx context.Context, req *logical.Request, d *fra
 				return nil, fmt.Errorf("error encountered during CRL building: %w", crlErr)
 			}
 		}
-		for index, warning := range warnings {
-			resp.AddWarning(fmt.Sprintf("Warning %d during CRL rebuild: %v", index+1, warning))
-		}
 	}
 
-	return resp, nil
-}
-
-func genResponseFromCrlConfig(config *crlConfig) *logical.Response {
-	return &logical.Response{
-		Data: map[string]interface{}{
-			"expiry":                        config.Expiry,
-			"disable":                       config.Disable,
-			"ocsp_disable":                  config.OcspDisable,
-			"ocsp_expiry":                   config.OcspExpiry,
-			"auto_rebuild":                  config.AutoRebuild,
-			"auto_rebuild_grace_period":     config.AutoRebuildGracePeriod,
-			"enable_delta":                  config.EnableDelta,
-			"delta_rebuild_interval":        config.DeltaRebuildInterval,
-			"cross_cluster_revocation":      config.UseGlobalQueue,
-			"unified_crl":                   config.UnifiedCRL,
-			"unified_crl_on_existing_paths": config.UnifiedCRLOnExistingPaths,
-		},
-	}
+	return nil, nil
 }
 
 const pathConfigCRLHelpSyn = `
diff --git a/builtin/logical/pki/path_config_urls.go b/builtin/logical/pki/path_config_urls.go
index 341f3db635573..830ca34ad099d 100644
--- a/builtin/logical/pki/path_config_urls.go
+++ b/builtin/logical/pki/path_config_urls.go
@@ -1,27 +1,18 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pki
 
 import (
 	"context"
 	"fmt"
-	"net/http"
-	"strings"
 
 	"github.com/asaskevich/govalidator"
 	"github.com/hashicorp/vault/sdk/framework"
+	"github.com/hashicorp/vault/sdk/helper/certutil"
 	"github.com/hashicorp/vault/sdk/logical"
 )
 
 func pathConfigURLs(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "config/urls",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixPKI,
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"issuing_certificates": {
 				Type: framework.TypeCommaStringSlice,
@@ -40,98 +31,14 @@ for the CRL distribution points attribute. See also RFC 5280 Section 4.2.1.13.`,
 				Description: `Comma-separated list of URLs to be used
 for the OCSP servers attribute. See also RFC 5280 Section 4.2.2.1.`,
 			},
-
-			"enable_templating": {
-				Type: framework.TypeBool,
-				Description: `Whether or not to enabling templating of the
-above AIA fields. When templating is enabled the special values '{{issuer_id}}',
-'{{cluster_path}}', and '{{cluster_aia_path}}' are available, but the addresses
-are not checked for URI validity until issuance time. Using '{{cluster_path}}'
-requires /config/cluster's 'path' member to be set on all PR Secondary clusters
-and using '{{cluster_aia_path}}' requires /config/cluster's 'aia_path' member
-to be set on all PR secondary clusters.`,
-				Default: false,
-			},
 		},
 
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.UpdateOperation: &framework.PathOperation{
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb:   "configure",
-					OperationSuffix: "urls",
-				},
 				Callback: b.pathWriteURL,
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"issuing_certificates": {
-								Type: framework.TypeCommaStringSlice,
-								Description: `Comma-separated list of URLs to be used
-for the issuing certificate attribute. See also RFC 5280 Section 4.2.2.1.`,
-							},
-							"crl_distribution_points": {
-								Type: framework.TypeCommaStringSlice,
-								Description: `Comma-separated list of URLs to be used
-for the CRL distribution points attribute. See also RFC 5280 Section 4.2.1.13.`,
-							},
-							"ocsp_servers": {
-								Type: framework.TypeCommaStringSlice,
-								Description: `Comma-separated list of URLs to be used
-for the OCSP servers attribute. See also RFC 5280 Section 4.2.2.1.`,
-							},
-							"enable_templating": {
-								Type: framework.TypeBool,
-								Description: `Whether or not to enabling templating of the
-above AIA fields. When templating is enabled the special values '{{issuer_id}}'
-and '{{cluster_path}}' are available, but the addresses are not checked for
-URI validity until issuance time. This requires /config/cluster's path to be
-set on all PR Secondary clusters.`,
-								Default: false,
-							},
-						},
-					}},
-				},
 			},
 			logical.ReadOperation: &framework.PathOperation{
 				Callback: b.pathReadURL,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationSuffix: "urls-configuration",
-				},
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"issuing_certificates": {
-								Type: framework.TypeCommaStringSlice,
-								Description: `Comma-separated list of URLs to be used
-for the issuing certificate attribute. See also RFC 5280 Section 4.2.2.1.`,
-								Required: true,
-							},
-							"crl_distribution_points": {
-								Type: framework.TypeCommaStringSlice,
-								Description: `Comma-separated list of URLs to be used
-for the CRL distribution points attribute. See also RFC 5280 Section 4.2.1.13.`,
-								Required: true,
-							},
-							"ocsp_servers": {
-								Type: framework.TypeCommaStringSlice,
-								Description: `Comma-separated list of URLs to be used
-for the OCSP servers attribute. See also RFC 5280 Section 4.2.2.1.`,
-								Required: true,
-							},
-							"enable_templating": {
-								Type: framework.TypeBool,
-								Description: `Whether or not to enable templating of the
-above AIA fields. When templating is enabled the special values '{{issuer_id}}'
-and '{{cluster_path}}' are available, but the addresses are not checked for
-URI validity until issuance time. This requires /config/cluster's path to be
-set on all PR Secondary clusters.`,
-								Required: true,
-							},
-						},
-					}},
-				},
 			},
 		},
 
@@ -142,7 +49,7 @@ set on all PR Secondary clusters.`,
 
 func validateURLs(urls []string) string {
 	for _, curr := range urls {
-		if !govalidator.IsURL(curr) || strings.Contains(curr, "{{issuer_id}}") || strings.Contains(curr, "{{cluster_path}}") || strings.Contains(curr, "{{cluster_aia_path}}") {
+		if !govalidator.IsURL(curr) {
 			return curr
 		}
 	}
@@ -150,17 +57,16 @@ func validateURLs(urls []string) string {
 	return ""
 }
 
-func getGlobalAIAURLs(ctx context.Context, storage logical.Storage) (*aiaConfigEntry, error) {
+func getGlobalAIAURLs(ctx context.Context, storage logical.Storage) (*certutil.URLEntries, error) {
 	entry, err := storage.Get(ctx, "urls")
 	if err != nil {
 		return nil, err
 	}
 
-	entries := &aiaConfigEntry{
+	entries := &certutil.URLEntries{
 		IssuingCertificates:   []string{},
 		CRLDistributionPoints: []string{},
 		OCSPServers:           []string{},
-		EnableTemplating:      false,
 	}
 
 	if entry == nil {
@@ -174,7 +80,7 @@ func getGlobalAIAURLs(ctx context.Context, storage logical.Storage) (*aiaConfigE
 	return entries, nil
 }
 
-func writeURLs(ctx context.Context, storage logical.Storage, entries *aiaConfigEntry) error {
+func writeURLs(ctx context.Context, storage logical.Storage, entries *certutil.URLEntries) error {
 	entry, err := logical.StorageEntryJSON("urls", entries)
 	if err != nil {
 		return err
@@ -202,7 +108,6 @@ func (b *backend) pathReadURL(ctx context.Context, req *logical.Request, _ *fram
 			"issuing_certificates":    entries.IssuingCertificates,
 			"crl_distribution_points": entries.CRLDistributionPoints,
 			"ocsp_servers":            entries.OCSPServers,
-			"enable_templating":       entries.EnableTemplating,
 		},
 	}
 
@@ -215,68 +120,29 @@ func (b *backend) pathWriteURL(ctx context.Context, req *logical.Request, data *
 		return nil, err
 	}
 
-	if enableTemplating, ok := data.GetOk("enable_templating"); ok {
-		entries.EnableTemplating = enableTemplating.(bool)
-	}
 	if urlsInt, ok := data.GetOk("issuing_certificates"); ok {
 		entries.IssuingCertificates = urlsInt.([]string)
-	}
-	if urlsInt, ok := data.GetOk("crl_distribution_points"); ok {
-		entries.CRLDistributionPoints = urlsInt.([]string)
-	}
-	if urlsInt, ok := data.GetOk("ocsp_servers"); ok {
-		entries.OCSPServers = urlsInt.([]string)
-	}
-
-	resp := &logical.Response{
-		Data: map[string]interface{}{
-			"issuing_certificates":    entries.IssuingCertificates,
-			"crl_distribution_points": entries.CRLDistributionPoints,
-			"ocsp_servers":            entries.OCSPServers,
-			"enable_templating":       entries.EnableTemplating,
-		},
-	}
-
-	if entries.EnableTemplating && !b.useLegacyBundleCaStorage() {
-		sc := b.makeStorageContext(ctx, req.Storage)
-		issuers, err := sc.listIssuers()
-		if err != nil {
-			return nil, fmt.Errorf("unable to read issuers list to validate templated URIs: %w", err)
-		}
-
-		if len(issuers) > 0 {
-			issuer, err := sc.fetchIssuerById(issuers[0])
-			if err != nil {
-				return nil, fmt.Errorf("unable to read issuer to validate templated URIs: %w", err)
-			}
-
-			_, err = entries.toURLEntries(sc, issuer.ID)
-			if err != nil {
-				resp.AddWarning(fmt.Sprintf("issuance may fail: %v\n\nConsider setting the cluster-local address if it is not already set.", err))
-			}
-		}
-	} else if !entries.EnableTemplating {
 		if badURL := validateURLs(entries.IssuingCertificates); badURL != "" {
 			return logical.ErrorResponse(fmt.Sprintf(
 				"invalid URL found in Authority Information Access (AIA) parameter issuing_certificates: %s", badURL)), nil
 		}
-
+	}
+	if urlsInt, ok := data.GetOk("crl_distribution_points"); ok {
+		entries.CRLDistributionPoints = urlsInt.([]string)
 		if badURL := validateURLs(entries.CRLDistributionPoints); badURL != "" {
 			return logical.ErrorResponse(fmt.Sprintf(
 				"invalid URL found in Authority Information Access (AIA) parameter crl_distribution_points: %s", badURL)), nil
 		}
-
+	}
+	if urlsInt, ok := data.GetOk("ocsp_servers"); ok {
+		entries.OCSPServers = urlsInt.([]string)
 		if badURL := validateURLs(entries.OCSPServers); badURL != "" {
 			return logical.ErrorResponse(fmt.Sprintf(
 				"invalid URL found in Authority Information Access (AIA) parameter ocsp_servers: %s", badURL)), nil
 		}
 	}
 
-	if err := writeURLs(ctx, req.Storage, entries); err != nil {
-		return nil, err
-	}
-
-	return resp, nil
+	return nil, writeURLs(ctx, req.Storage, entries)
 }
 
 const pathConfigURLsHelpSyn = `
diff --git a/builtin/logical/pki/path_fetch.go b/builtin/logical/pki/path_fetch.go
index 1798e705db88d..e0a1079eade76 100644
--- a/builtin/logical/pki/path_fetch.go
+++ b/builtin/logical/pki/path_fetch.go
@@ -1,70 +1,24 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pki
 
 import (
 	"context"
 	"encoding/pem"
 	"fmt"
-	"net/http"
 	"strings"
-	"time"
-
-	"github.com/hashicorp/vault/helper/constants"
 
 	"github.com/hashicorp/vault/sdk/framework"
 	"github.com/hashicorp/vault/sdk/helper/errutil"
 	"github.com/hashicorp/vault/sdk/logical"
 )
 
-var pathFetchReadSchema = map[int][]framework.Response{
-	http.StatusOK: {{
-		Description: "OK",
-		Fields: map[string]*framework.FieldSchema{
-			"certificate": {
-				Type:        framework.TypeString,
-				Description: `Certificate`,
-				Required:    false,
-			},
-			"revocation_time": {
-				Type:        framework.TypeString,
-				Description: `Revocation time`,
-				Required:    false,
-			},
-			"revocation_time_rfc3339": {
-				Type:        framework.TypeString,
-				Description: `Revocation time RFC 3339 formatted`,
-				Required:    false,
-			},
-			"issuer_id": {
-				Type:        framework.TypeString,
-				Description: `ID of the issuer`,
-				Required:    false,
-			},
-			"ca_chain": {
-				Type:        framework.TypeStringSlice,
-				Description: `Issuing CA Chain`,
-				Required:    false,
-			},
-		},
-	}},
-}
-
 // Returns the CA in raw format
 func pathFetchCA(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: `ca(/pem)?`,
 
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixPKI,
-			OperationSuffix: "ca-der|ca-pem",
-		},
-
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.ReadOperation: &framework.PathOperation{
-				Callback:  b.pathFetchRead,
-				Responses: pathFetchReadSchema,
+				Callback: b.pathFetchRead,
 			},
 		},
 
@@ -78,15 +32,9 @@ func pathFetchCAChain(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: `(cert/)?ca_chain`,
 
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixPKI,
-			OperationSuffix: "ca-chain-pem|cert-ca-chain",
-		},
-
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.ReadOperation: &framework.PathOperation{
-				Callback:  b.pathFetchRead,
-				Responses: pathFetchReadSchema,
+				Callback: b.pathFetchRead,
 			},
 		},
 
@@ -100,33 +48,6 @@ func pathFetchCRL(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: `crl(/pem|/delta(/pem)?)?`,
 
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixPKI,
-			OperationSuffix: "crl-der|crl-pem|crl-delta|crl-delta-pem",
-		},
-
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.ReadOperation: &framework.PathOperation{
-				Callback:  b.pathFetchRead,
-				Responses: pathFetchReadSchema,
-			},
-		},
-
-		HelpSynopsis:    pathFetchHelpSyn,
-		HelpDescription: pathFetchHelpDesc,
-	}
-}
-
-// Returns the CRL in raw format
-func pathFetchUnifiedCRL(b *backend) *framework.Path {
-	return &framework.Path{
-		Pattern: `unified-crl(/pem|/delta(/pem)?)?`,
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixPKI,
-			OperationSuffix: "unified-crl-der|unified-crl-pem|unified-crl-delta|unified-crl-delta-pem",
-		},
-
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.ReadOperation: &framework.PathOperation{
 				Callback: b.pathFetchRead,
@@ -142,12 +63,6 @@ func pathFetchUnifiedCRL(b *backend) *framework.Path {
 func pathFetchValidRaw(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: `cert/(?P<serial>[0-9A-Fa-f-:]+)/raw(/pem)?`,
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixPKI,
-			OperationSuffix: "cert-raw-der|cert-raw-pem",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"serial": {
 				Type: framework.TypeString,
@@ -158,8 +73,7 @@ hyphen-separated octal`,
 
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.ReadOperation: &framework.PathOperation{
-				Callback:  b.pathFetchRead,
-				Responses: pathFetchReadSchema,
+				Callback: b.pathFetchRead,
 			},
 		},
 
@@ -173,12 +87,6 @@ hyphen-separated octal`,
 func pathFetchValid(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: `cert/(?P<serial>[0-9A-Fa-f-:]+)`,
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixPKI,
-			OperationSuffix: "cert",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"serial": {
 				Type: framework.TypeString,
@@ -189,8 +97,7 @@ hyphen-separated octal`,
 
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.ReadOperation: &framework.PathOperation{
-				Callback:  b.pathFetchRead,
-				Responses: pathFetchReadSchema,
+				Callback: b.pathFetchRead,
 			},
 		},
 
@@ -201,23 +108,12 @@ hyphen-separated octal`,
 
 // This returns the CRL in a non-raw format
 func pathFetchCRLViaCertPath(b *backend) *framework.Path {
-	pattern := `cert/(crl|delta-crl)`
-	if constants.IsEnterprise {
-		pattern = `cert/(crl|delta-crl|unified-crl|unified-delta-crl)`
-	}
-
 	return &framework.Path{
-		Pattern: pattern,
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixPKI,
-			OperationSuffix: "cert-crl|cert-delta-crl|cert-unified-crl|cert-unified-delta-crl",
-		},
+		Pattern: `cert/(crl|delta-crl)`,
 
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.ReadOperation: &framework.PathOperation{
-				Callback:  b.pathFetchRead,
-				Responses: pathFetchReadSchema,
+				Callback: b.pathFetchRead,
 			},
 		},
 
@@ -231,26 +127,9 @@ func pathFetchListCerts(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "certs/?$",
 
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixPKI,
-			OperationSuffix: "certs",
-		},
-
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.ListOperation: &framework.PathOperation{
 				Callback: b.pathFetchCertList,
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"keys": {
-								Type:        framework.TypeStringSlice,
-								Description: `A list of keys`,
-								Required:    true,
-							},
-						},
-					}},
-				},
 			},
 		},
 
@@ -277,9 +156,6 @@ func (b *backend) pathFetchRead(ctx context.Context, req *logical.Request, data
 	var certificate []byte
 	var fullChain []byte
 	var revocationTime int64
-	var revocationIssuerId string
-	var revocationTimeRfc3339 string
-
 	response = &logical.Response{
 		Data: map[string]interface{}{},
 	}
@@ -317,30 +193,11 @@ func (b *backend) pathFetchRead(ctx context.Context, req *logical.Request, data
 		if req.Path == "ca_chain" {
 			contentType = "application/pkix-cert"
 		}
-	case req.Path == "crl" || req.Path == "crl/pem" || req.Path == "crl/delta" || req.Path == "crl/delta/pem" || req.Path == "cert/crl" || req.Path == "cert/crl/raw" || req.Path == "cert/crl/raw/pem" || req.Path == "cert/delta-crl" || req.Path == "cert/delta-crl/raw" || req.Path == "cert/delta-crl/raw/pem" || req.Path == "unified-crl" || req.Path == "unified-crl/pem" || req.Path == "unified-crl/delta" || req.Path == "unified-crl/delta/pem" || req.Path == "cert/unified-crl" || req.Path == "cert/unified-crl/raw" || req.Path == "cert/unified-crl/raw/pem" || req.Path == "cert/unified-delta-crl" || req.Path == "cert/unified-delta-crl/raw" || req.Path == "cert/unified-delta-crl/raw/pem":
-		config, err := b.crlBuilder.getConfigWithUpdate(sc)
-		if err != nil {
-			retErr = err
-			goto reply
-		}
-		var isDelta bool
-		var isUnified bool
-		if strings.Contains(req.Path, "delta") {
-			isDelta = true
-		}
-		if strings.Contains(req.Path, "unified") || shouldLocalPathsUseUnified(config) {
-			isUnified = true
-		}
-
+	case req.Path == "crl" || req.Path == "crl/pem" || req.Path == "crl/delta" || req.Path == "crl/delta/pem" || req.Path == "cert/crl" || req.Path == "cert/crl/raw" || req.Path == "cert/crl/raw/pem" || req.Path == "cert/delta-crl":
 		modifiedCtx.reqType = ifModifiedCRL
-		if !isUnified && isDelta {
+		if strings.Contains(req.Path, "delta") {
 			modifiedCtx.reqType = ifModifiedDeltaCRL
-		} else if isUnified && !isDelta {
-			modifiedCtx.reqType = ifModifiedUnifiedCRL
-		} else if isUnified && isDelta {
-			modifiedCtx.reqType = ifModifiedUnifiedDeltaCRL
 		}
-
 		ret, err := sendNotModifiedResponseIfNecessary(modifiedCtx, sc, response)
 		if err != nil || ret {
 			retErr = err
@@ -348,19 +205,14 @@ func (b *backend) pathFetchRead(ctx context.Context, req *logical.Request, data
 		}
 
 		serial = legacyCRLPath
-		if !isUnified && isDelta {
+		if req.Path == "crl/delta" || req.Path == "crl/delta/pem" || req.Path == "cert/delta-crl" {
 			serial = deltaCRLPath
-		} else if isUnified && !isDelta {
-			serial = unifiedCRLPath
-		} else if isUnified && isDelta {
-			serial = unifiedDeltaCRLPath
 		}
-
 		contentType = "application/pkix-crl"
-		if strings.Contains(req.Path, "pem") {
+		if req.Path == "crl/pem" || req.Path == "crl/delta/pem" {
 			pemType = "X509 CRL"
 			contentType = "application/x-pem-file"
-		} else if req.Path == "cert/crl" || req.Path == "cert/delta-crl" || req.Path == "cert/unified-crl" || req.Path == "cert/unified-delta-crl" {
+		} else if req.Path == "cert/crl" || req.Path == "cert/delta-crl" {
 			pemType = "X509 CRL"
 			contentType = ""
 		}
@@ -424,7 +276,7 @@ func (b *backend) pathFetchRead(ctx context.Context, req *logical.Request, data
 		goto reply
 	}
 
-	certEntry, funcErr = fetchCertBySerial(sc, req.Path, serial)
+	certEntry, funcErr = fetchCertBySerial(ctx, b, req, req.Path, serial)
 	if funcErr != nil {
 		switch funcErr.(type) {
 		case errutil.UserError:
@@ -452,7 +304,7 @@ func (b *backend) pathFetchRead(ctx context.Context, req *logical.Request, data
 		certificate = []byte(strings.TrimSpace(string(pem.EncodeToMemory(&block))))
 	}
 
-	revokedEntry, funcErr = fetchCertBySerial(sc, "revoked/", serial)
+	revokedEntry, funcErr = fetchCertBySerial(ctx, b, req, "revoked/", serial)
 	if funcErr != nil {
 		switch funcErr.(type) {
 		case errutil.UserError:
@@ -470,11 +322,6 @@ func (b *backend) pathFetchRead(ctx context.Context, req *logical.Request, data
 			return logical.ErrorResponse(fmt.Sprintf("Error decoding revocation entry for serial %s: %s", serial, err)), nil
 		}
 		revocationTime = revInfo.RevocationTime
-		revocationIssuerId = revInfo.CertificateIssuer.String()
-
-		if !revInfo.RevocationTimeUTC.IsZero() {
-			revocationTimeRfc3339 = revInfo.RevocationTimeUTC.Format(time.RFC3339Nano)
-		}
 	}
 
 reply:
@@ -507,12 +354,6 @@ reply:
 	default:
 		response.Data["certificate"] = string(certificate)
 		response.Data["revocation_time"] = revocationTime
-		response.Data["revocation_time_rfc3339"] = revocationTimeRfc3339
-		// Only output this field if we have a value for it as it doesn't make sense for a
-		// bunch of code paths that go through here
-		if revocationIssuerId != "" {
-			response.Data["issuer_id"] = revocationIssuerId
-		}
 
 		if len(fullChain) > 0 {
 			response.Data["ca_chain"] = string(fullChain)
diff --git a/builtin/logical/pki/path_fetch_issuers.go b/builtin/logical/pki/path_fetch_issuers.go
index 48596bb5849c8..eeea1778e3dd6 100644
--- a/builtin/logical/pki/path_fetch_issuers.go
+++ b/builtin/logical/pki/path_fetch_issuers.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pki
 
 import (
@@ -8,7 +5,6 @@ import (
 	"crypto/x509"
 	"encoding/pem"
 	"fmt"
-	"net/http"
 	"strings"
 	"time"
 
@@ -21,31 +17,9 @@ func pathListIssuers(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "issuers/?$",
 
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixPKI,
-			OperationSuffix: "issuers",
-		},
-
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.ListOperation: &framework.PathOperation{
 				Callback: b.pathListIssuersHandler,
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"keys": {
-								Type:        framework.TypeStringSlice,
-								Description: `A list of keys`,
-								Required:    true,
-							},
-							"key_info": {
-								Type:        framework.TypeMap,
-								Description: `Key info with issuer name`,
-								Required:    false,
-							},
-						},
-					}},
-				},
 			},
 		},
 
@@ -84,28 +58,8 @@ func (b *backend) pathListIssuersHandler(ctx context.Context, req *logical.Reque
 
 		responseKeys = append(responseKeys, string(identifier))
 		responseInfo[string(identifier)] = map[string]interface{}{
-			"issuer_name":   issuer.Name,
-			"is_default":    identifier == config.DefaultIssuerId,
-			"serial_number": issuer.SerialNumber,
-
-			// While nominally this could be considered sensitive information
-			// to be returned on an unauthed endpoint, there's two mitigating
-			// circumstances:
-			//
-			// 1. Key IDs are purely random numbers generated by Vault and
-			//    have no relationship to the actual key material.
-			// 2. They also don't _do_ anything by themselves. There is no
-			//    modification of KeyIDs allowed, you need to be authenticated
-			//    to Vault to understand what they mean, you _essentially_
-			//    get the same information from looking at/comparing various
-			//    cert's SubjectPublicKeyInfo field, and there's the `default`
-			//    reference that anyone with issuer generation capabilities
-			//    can use even if they can't access any of the other /key/*
-			//    endpoints.
-			//
-			// So all in all, exposing this value is not a security risk and
-			// is otherwise beneficial for the UI, hence its inclusion.
-			"key_id": issuer.KeyID,
+			"issuer_name": issuer.Name,
+			"is_default":  identifier == config.DefaultIssuerId,
 		}
 	}
 
@@ -122,27 +76,15 @@ their identifier and their name (if set).
 
 func pathGetIssuer(b *backend) *framework.Path {
 	pattern := "issuer/" + framework.GenericNameRegex(issuerRefParam) + "$"
-
-	displayAttrs := &framework.DisplayAttributes{
-		OperationPrefix: operationPrefixPKI,
-		OperationSuffix: "issuer",
-	}
-
-	return buildPathIssuer(b, pattern, displayAttrs)
+	return buildPathIssuer(b, pattern)
 }
 
 func pathGetUnauthedIssuer(b *backend) *framework.Path {
 	pattern := "issuer/" + framework.GenericNameRegex(issuerRefParam) + "/(json|der|pem)$"
-
-	displayAttrs := &framework.DisplayAttributes{
-		OperationPrefix: operationPrefixPKI,
-		OperationSuffix: "issuer-json|issuer-der|issuer-pem",
-	}
-
-	return buildPathGetIssuer(b, pattern, displayAttrs)
+	return buildPathGetIssuer(b, pattern)
 }
 
-func buildPathIssuer(b *backend, pattern string, displayAttrs *framework.DisplayAttributes) *framework.Path {
+func buildPathIssuer(b *backend, pattern string) *framework.Path {
 	fields := map[string]*framework.FieldSchema{}
 	fields = addIssuerRefNameFields(fields)
 
@@ -197,137 +139,30 @@ for the CRL distribution points attribute. See also RFC 5280 Section 4.2.1.13.`,
 		Description: `Comma-separated list of URLs to be used
 for the OCSP servers attribute. See also RFC 5280 Section 4.2.2.1.`,
 	}
-	fields["enable_aia_url_templating"] = &framework.FieldSchema{
-		Type: framework.TypeBool,
-		Description: `Whether or not to enabling templating of the
-above AIA fields. When templating is enabled the special values '{{issuer_id}}',
-'{{cluster_path}}', '{{cluster_aia_path}}' are available, but the addresses are
-not checked for URL validity until issuance time. Using '{{cluster_path}}'
-requires /config/cluster's 'path' member to be set on all PR Secondary clusters
-and using '{{cluster_aia_path}}' requires /config/cluster's 'aia_path' member
-to be set on all PR secondary clusters.`,
-		Default: false,
-	}
-
-	updateIssuerSchema := map[int][]framework.Response{
-		http.StatusOK: {{
-			Description: "OK",
-			Fields: map[string]*framework.FieldSchema{
-				"issuer_id": {
-					Type:        framework.TypeString,
-					Description: `Issuer Id`,
-					Required:    false,
-				},
-				"issuer_name": {
-					Type:        framework.TypeString,
-					Description: `Issuer Name`,
-					Required:    false,
-				},
-				"key_id": {
-					Type:        framework.TypeString,
-					Description: `Key Id`,
-					Required:    false,
-				},
-				"certificate": {
-					Type:        framework.TypeString,
-					Description: `Certificate`,
-					Required:    false,
-				},
-				"manual_chain": {
-					Type:        framework.TypeStringSlice,
-					Description: `Manual Chain`,
-					Required:    false,
-				},
-				"ca_chain": {
-					Type:        framework.TypeStringSlice,
-					Description: `CA Chain`,
-					Required:    false,
-				},
-				"leaf_not_after_behavior": {
-					Type:        framework.TypeString,
-					Description: `Leaf Not After Behavior`,
-					Required:    false,
-				},
-				"usage": {
-					Type:        framework.TypeStringSlice,
-					Description: `Usage`,
-					Required:    false,
-				},
-				"revocation_signature_algorithm": {
-					Type:        framework.TypeString,
-					Description: `Revocation Signature Alogrithm`,
-					Required:    false,
-				},
-				"revoked": {
-					Type:        framework.TypeBool,
-					Description: `Revoked`,
-					Required:    false,
-				},
-				"revocation_time": {
-					Type:     framework.TypeInt,
-					Required: false,
-				},
-				"revocation_time_rfc3339": {
-					Type:     framework.TypeString,
-					Required: false,
-				},
-				"issuing_certificates": {
-					Type:        framework.TypeStringSlice,
-					Description: `Issuing Certificates`,
-					Required:    false,
-				},
-				"crl_distribution_points": {
-					Type:        framework.TypeStringSlice,
-					Description: `CRL Distribution Points`,
-					Required:    false,
-				},
-				"ocsp_servers": {
-					Type:        framework.TypeStringSlice,
-					Description: `OSCP Servers`,
-					Required:    false,
-				},
-				"enable_aia_url_templating": {
-					Type:        framework.TypeBool,
-					Description: `Whether or not templating is enabled for AIA fields`,
-					Required:    false,
-				},
-			},
-		}},
-	}
 
 	return &framework.Path{
 		// Returns a JSON entry.
-		Pattern:      pattern,
-		DisplayAttrs: displayAttrs,
-		Fields:       fields,
+		Pattern: pattern,
+		Fields:  fields,
 
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.ReadOperation: &framework.PathOperation{
-				Callback:  b.pathGetIssuer,
-				Responses: updateIssuerSchema,
+				Callback: b.pathGetIssuer,
 			},
 			logical.UpdateOperation: &framework.PathOperation{
-				Callback:  b.pathUpdateIssuer,
-				Responses: updateIssuerSchema,
-
+				Callback: b.pathUpdateIssuer,
 				// Read more about why these flags are set in backend.go.
 				ForwardPerformanceStandby:   true,
 				ForwardPerformanceSecondary: true,
 			},
 			logical.DeleteOperation: &framework.PathOperation{
 				Callback: b.pathDeleteIssuer,
-				Responses: map[int][]framework.Response{
-					http.StatusNoContent: {{
-						Description: "No Content",
-					}},
-				},
 				// Read more about why these flags are set in backend.go.
 				ForwardPerformanceStandby:   true,
 				ForwardPerformanceSecondary: true,
 			},
 			logical.PatchOperation: &framework.PathOperation{
-				Callback:  b.pathPatchIssuer,
-				Responses: updateIssuerSchema,
+				Callback: b.pathPatchIssuer,
 				// Read more about why these flags are set in backend.go.
 				ForwardPerformanceStandby:   true,
 				ForwardPerformanceSecondary: true,
@@ -339,51 +174,18 @@ to be set on all PR secondary clusters.`,
 	}
 }
 
-func buildPathGetIssuer(b *backend, pattern string, displayAttrs *framework.DisplayAttributes) *framework.Path {
+func buildPathGetIssuer(b *backend, pattern string) *framework.Path {
 	fields := map[string]*framework.FieldSchema{}
 	fields = addIssuerRefField(fields)
 
-	getIssuerSchema := map[int][]framework.Response{
-		http.StatusNotModified: {{
-			Description: "Not Modified",
-		}},
-		http.StatusOK: {{
-			Description: "OK",
-			Fields: map[string]*framework.FieldSchema{
-				"issuer_id": {
-					Type:        framework.TypeString,
-					Description: `Issuer Id`,
-					Required:    true,
-				},
-				"issuer_name": {
-					Type:        framework.TypeString,
-					Description: `Issuer Name`,
-					Required:    true,
-				},
-				"certificate": {
-					Type:        framework.TypeString,
-					Description: `Certificate`,
-					Required:    true,
-				},
-				"ca_chain": {
-					Type:        framework.TypeStringSlice,
-					Description: `CA Chain`,
-					Required:    true,
-				},
-			},
-		}},
-	}
-
 	return &framework.Path{
 		// Returns a JSON entry.
-		Pattern:      pattern,
-		DisplayAttrs: displayAttrs,
-		Fields:       fields,
+		Pattern: pattern,
+		Fields:  fields,
 
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.ReadOperation: &framework.PathOperation{
-				Callback:  b.pathGetIssuer,
-				Responses: getIssuerSchema,
+				Callback: b.pathGetIssuer,
 			},
 		},
 
@@ -463,7 +265,6 @@ func respondReadIssuer(issuer *issuerEntry) (*logical.Response, error) {
 		data["issuing_certificates"] = issuer.AIAURIs.IssuingCertificates
 		data["crl_distribution_points"] = issuer.AIAURIs.CRLDistributionPoints
 		data["ocsp_servers"] = issuer.AIAURIs.OCSPServers
-		data["enable_aia_url_templating"] = issuer.AIAURIs.EnableTemplating
 	}
 
 	response := &logical.Response{
@@ -560,17 +361,16 @@ func (b *backend) pathUpdateIssuer(ctx context.Context, req *logical.Request, da
 	}
 
 	// AIA access changes
-	enableTemplating := data.Get("enable_aia_url_templating").(bool)
 	issuerCertificates := data.Get("issuing_certificates").([]string)
-	if badURL := validateURLs(issuerCertificates); !enableTemplating && badURL != "" {
+	if badURL := validateURLs(issuerCertificates); badURL != "" {
 		return logical.ErrorResponse(fmt.Sprintf("invalid URL found in Authority Information Access (AIA) parameter issuing_certificates: %s", badURL)), nil
 	}
 	crlDistributionPoints := data.Get("crl_distribution_points").([]string)
-	if badURL := validateURLs(crlDistributionPoints); !enableTemplating && badURL != "" {
+	if badURL := validateURLs(crlDistributionPoints); badURL != "" {
 		return logical.ErrorResponse(fmt.Sprintf("invalid URL found in Authority Information Access (AIA) parameter crl_distribution_points: %s", badURL)), nil
 	}
 	ocspServers := data.Get("ocsp_servers").([]string)
-	if badURL := validateURLs(ocspServers); !enableTemplating && badURL != "" {
+	if badURL := validateURLs(ocspServers); badURL != "" {
 		return logical.ErrorResponse(fmt.Sprintf("invalid URL found in Authority Information Access (AIA) parameter ocsp_servers: %s", badURL)), nil
 	}
 
@@ -602,7 +402,7 @@ func (b *backend) pathUpdateIssuer(ctx context.Context, req *logical.Request, da
 		// cert itself.
 		cert, err := issuer.GetCertificate()
 		if err != nil {
-			return nil, fmt.Errorf("unable to parse issuer's certificate: %w", err)
+			return nil, fmt.Errorf("unable to parse issuer's certificate: %v", err)
 		}
 		if (cert.KeyUsage&x509.KeyUsageCRLSign) == 0 && newUsage.HasUsage(CRLSigningUsage) {
 			return logical.ErrorResponse("This issuer's underlying certificate lacks the CRLSign KeyUsage value; unable to set CRLSigningUsage on this issuer as a result."), nil
@@ -618,7 +418,7 @@ func (b *backend) pathUpdateIssuer(ctx context.Context, req *logical.Request, da
 	}
 
 	if issuer.AIAURIs == nil && (len(issuerCertificates) > 0 || len(crlDistributionPoints) > 0 || len(ocspServers) > 0) {
-		issuer.AIAURIs = &aiaConfigEntry{}
+		issuer.AIAURIs = &certutil.URLEntries{}
 	}
 	if issuer.AIAURIs != nil {
 		// Associative mapping from data source to destination on the
@@ -649,10 +449,6 @@ func (b *backend) pathUpdateIssuer(ctx context.Context, req *logical.Request, da
 				modified = true
 			}
 		}
-		if enableTemplating != issuer.AIAURIs.EnableTemplating {
-			issuer.AIAURIs.EnableTemplating = enableTemplating
-			modified = true
-		}
 
 		// If no AIA URLs exist on the issuer, set the AIA URLs entry to nil
 		// to ease usage later.
@@ -714,12 +510,6 @@ func (b *backend) pathUpdateIssuer(ctx context.Context, req *logical.Request, da
 	if newName != oldName {
 		addWarningOnDereferencing(sc, oldName, response)
 	}
-	if issuer.AIAURIs != nil && issuer.AIAURIs.EnableTemplating {
-		_, aiaErr := issuer.AIAURIs.toURLEntries(sc, issuer.ID)
-		if aiaErr != nil {
-			response.AddWarning(fmt.Sprintf("issuance may fail: %v\n\nConsider setting the cluster-local address if it is not already set.", aiaErr))
-		}
-	}
 
 	return response, err
 }
@@ -825,7 +615,7 @@ func (b *backend) pathPatchIssuer(ctx context.Context, req *logical.Request, dat
 
 			cert, err := issuer.GetCertificate()
 			if err != nil {
-				return nil, fmt.Errorf("unable to parse issuer's certificate: %w", err)
+				return nil, fmt.Errorf("unable to parse issuer's certificate: %v", err)
 			}
 			if (cert.KeyUsage&x509.KeyUsageCRLSign) == 0 && newUsage.HasUsage(CRLSigningUsage) {
 				return logical.ErrorResponse("This issuer's underlying certificate lacks the CRLSign KeyUsage value; unable to set CRLSigningUsage on this issuer as a result."), nil
@@ -864,7 +654,7 @@ func (b *backend) pathPatchIssuer(ctx context.Context, req *logical.Request, dat
 
 	// AIA access changes.
 	if issuer.AIAURIs == nil {
-		issuer.AIAURIs = &aiaConfigEntry{}
+		issuer.AIAURIs = &certutil.URLEntries{}
 	}
 
 	// Associative mapping from data source to destination on the
@@ -890,20 +680,12 @@ func (b *backend) pathPatchIssuer(ctx context.Context, req *logical.Request, dat
 		},
 	}
 
-	if enableTemplatingRaw, ok := data.GetOk("enable_aia_url_templating"); ok {
-		enableTemplating := enableTemplatingRaw.(bool)
-		if enableTemplating != issuer.AIAURIs.EnableTemplating {
-			issuer.AIAURIs.EnableTemplating = true
-			modified = true
-		}
-	}
-
 	// For each pair, if it is different on the object, update it.
 	for _, pair := range pairs {
 		rawURLsValue, ok := data.GetOk(pair.Source)
 		if ok {
 			urlsValue := rawURLsValue.([]string)
-			if badURL := validateURLs(urlsValue); !issuer.AIAURIs.EnableTemplating && badURL != "" {
+			if badURL := validateURLs(urlsValue); badURL != "" {
 				return logical.ErrorResponse(fmt.Sprintf("invalid URL found in Authority Information Access (AIA) parameter %v: %s", pair.Source, badURL)), nil
 			}
 
@@ -975,12 +757,6 @@ func (b *backend) pathPatchIssuer(ctx context.Context, req *logical.Request, dat
 	if newName != oldName {
 		addWarningOnDereferencing(sc, oldName, response)
 	}
-	if issuer.AIAURIs != nil && issuer.AIAURIs.EnableTemplating {
-		_, aiaErr := issuer.AIAURIs.toURLEntries(sc, issuer.ID)
-		if aiaErr != nil {
-			response.AddWarning(fmt.Sprintf("issuance may fail: %v\n\nConsider setting the cluster-local address if it is not already set.", aiaErr))
-		}
-	}
 
 	return response, err
 }
@@ -1056,8 +832,6 @@ func (b *backend) pathGetRawIssuer(ctx context.Context, req *logical.Request, da
 			Data: map[string]interface{}{
 				"certificate": string(certificate),
 				"ca_chain":    issuer.CAChain,
-				"issuer_id":   issuer.ID,
-				"issuer_name": issuer.Name,
 			},
 		}, nil
 	}
@@ -1155,50 +929,21 @@ the certificate.
 
 func pathGetIssuerCRL(b *backend) *framework.Path {
 	pattern := "issuer/" + framework.GenericNameRegex(issuerRefParam) + "/crl(/pem|/der|/delta(/pem|/der)?)?"
-
-	displayAttrs := &framework.DisplayAttributes{
-		OperationPrefix: operationPrefixPKIIssuer,
-		OperationSuffix: "crl|crl-pem|crl-der|crl-delta|crl-delta-pem|crl-delta-der",
-	}
-
-	return buildPathGetIssuerCRL(b, pattern, displayAttrs)
-}
-
-func pathGetIssuerUnifiedCRL(b *backend) *framework.Path {
-	pattern := "issuer/" + framework.GenericNameRegex(issuerRefParam) + "/unified-crl(/pem|/der|/delta(/pem|/der)?)?"
-
-	displayAttrs := &framework.DisplayAttributes{
-		OperationPrefix: operationPrefixPKIIssuer,
-		OperationSuffix: "unified-crl|unified-crl-pem|unified-crl-der|unified-crl-delta|unified-crl-delta-pem|unified-crl-delta-der",
-	}
-
-	return buildPathGetIssuerCRL(b, pattern, displayAttrs)
+	return buildPathGetIssuerCRL(b, pattern)
 }
 
-func buildPathGetIssuerCRL(b *backend, pattern string, displayAttrs *framework.DisplayAttributes) *framework.Path {
+func buildPathGetIssuerCRL(b *backend, pattern string) *framework.Path {
 	fields := map[string]*framework.FieldSchema{}
 	fields = addIssuerRefNameFields(fields)
 
 	return &framework.Path{
 		// Returns raw values.
-		Pattern:      pattern,
-		DisplayAttrs: displayAttrs,
-		Fields:       fields,
+		Pattern: pattern,
+		Fields:  fields,
 
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.ReadOperation: &framework.PathOperation{
 				Callback: b.pathGetIssuerCRL,
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"crl": {
-								Type:     framework.TypeString,
-								Required: false,
-							},
-						},
-					}},
-				},
 			},
 		},
 
@@ -1217,39 +962,19 @@ func (b *backend) pathGetIssuerCRL(ctx context.Context, req *logical.Request, da
 		return logical.ErrorResponse("missing issuer reference"), nil
 	}
 
-	sc := b.makeStorageContext(ctx, req.Storage)
-	warnings, err := b.crlBuilder.rebuildIfForced(sc)
-	if err != nil {
+	if err := b.crlBuilder.rebuildIfForced(ctx, b, req); err != nil {
 		return nil, err
 	}
-	if len(warnings) > 0 {
-		// Since this is a fetch of a specific CRL, this most likely comes
-		// from an automated system of some sort; these warnings would be
-		// ignored and likely meaningless. Log them instead.
-		msg := "During rebuild of CRL on issuer CRL fetch, got the following warnings:"
-		for index, warning := range warnings {
-			msg = fmt.Sprintf("%v\n %d. %v", msg, index+1, warning)
-		}
-		b.Logger().Warn(msg)
-	}
 
 	var certificate []byte
 	var contentType string
 
-	isUnified := strings.Contains(req.Path, "unified")
-	isDelta := strings.Contains(req.Path, "delta")
-
+	sc := b.makeStorageContext(ctx, req.Storage)
 	response := &logical.Response{}
 	var crlType ifModifiedReqType = ifModifiedCRL
-
-	if !isUnified && isDelta {
+	if strings.Contains(req.Path, "delta") {
 		crlType = ifModifiedDeltaCRL
-	} else if isUnified && !isDelta {
-		crlType = ifModifiedUnifiedCRL
-	} else if isUnified && isDelta {
-		crlType = ifModifiedUnifiedDeltaCRL
 	}
-
 	ret, err := sendNotModifiedResponseIfNecessary(&IfModifiedSinceHelper{req: req, reqType: crlType}, sc, response)
 	if err != nil {
 		return nil, err
@@ -1257,8 +982,7 @@ func (b *backend) pathGetIssuerCRL(ctx context.Context, req *logical.Request, da
 	if ret {
 		return response, nil
 	}
-
-	crlPath, err := sc.resolveIssuerCRLPath(issuerName, isUnified)
+	crlPath, err := sc.resolveIssuerCRLPath(issuerName)
 	if err != nil {
 		return nil, err
 	}
diff --git a/builtin/logical/pki/path_fetch_keys.go b/builtin/logical/pki/path_fetch_keys.go
index 23b3bf58dcb22..d0a01cb429b0e 100644
--- a/builtin/logical/pki/path_fetch_keys.go
+++ b/builtin/logical/pki/path_fetch_keys.go
@@ -1,13 +1,9 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pki
 
 import (
 	"context"
 	"crypto"
 	"fmt"
-	"net/http"
 
 	"github.com/hashicorp/vault/sdk/helper/certutil"
 	"github.com/hashicorp/vault/sdk/helper/errutil"
@@ -20,31 +16,9 @@ func pathListKeys(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "keys/?$",
 
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixPKI,
-			OperationSuffix: "keys",
-		},
-
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.ListOperation: &framework.PathOperation{
-				Callback: b.pathListKeysHandler,
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"keys": {
-								Type:        framework.TypeStringSlice,
-								Description: `A list of keys`,
-								Required:    true,
-							},
-							"key_info": {
-								Type:        framework.TypeMap,
-								Description: `Key info with issuer name`,
-								Required:    false,
-							},
-						},
-					}},
-				},
+				Callback:                    b.pathListKeysHandler,
 				ForwardPerformanceStandby:   false,
 				ForwardPerformanceSecondary: false,
 			},
@@ -98,19 +72,12 @@ func (b *backend) pathListKeysHandler(ctx context.Context, req *logical.Request,
 
 func pathKey(b *backend) *framework.Path {
 	pattern := "key/" + framework.GenericNameRegex(keyRefParam)
-
-	displayAttrs := &framework.DisplayAttributes{
-		OperationPrefix: operationPrefixPKI,
-		OperationSuffix: "key",
-	}
-
-	return buildPathKey(b, pattern, displayAttrs)
+	return buildPathKey(b, pattern)
 }
 
-func buildPathKey(b *backend, pattern string, displayAttrs *framework.DisplayAttributes) *framework.Path {
+func buildPathKey(b *backend, pattern string) *framework.Path {
 	return &framework.Path{
-		Pattern:      pattern,
-		DisplayAttrs: displayAttrs,
+		Pattern: pattern,
 
 		Fields: map[string]*framework.FieldSchema{
 			keyRefParam: {
@@ -126,81 +93,17 @@ func buildPathKey(b *backend, pattern string, displayAttrs *framework.DisplayAtt
 
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.ReadOperation: &framework.PathOperation{
-				Callback: b.pathGetKeyHandler,
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"key_id": {
-								Type:        framework.TypeString,
-								Description: `Key Id`,
-								Required:    true,
-							},
-							"key_name": {
-								Type:        framework.TypeString,
-								Description: `Key Name`,
-								Required:    true,
-							},
-							"key_type": {
-								Type:        framework.TypeString,
-								Description: `Key Type`,
-								Required:    true,
-							},
-							"subject_key_id": {
-								Type:        framework.TypeString,
-								Description: `RFC 5280 Subject Key Identifier of the public counterpart`,
-								Required:    false,
-							},
-							"managed_key_id": {
-								Type:        framework.TypeString,
-								Description: `Managed Key Id`,
-								Required:    false,
-							},
-							"managed_key_name": {
-								Type:        framework.TypeString,
-								Description: `Managed Key Name`,
-								Required:    false,
-							},
-						},
-					}},
-				},
+				Callback:                    b.pathGetKeyHandler,
 				ForwardPerformanceStandby:   false,
 				ForwardPerformanceSecondary: false,
 			},
 			logical.UpdateOperation: &framework.PathOperation{
-				Callback: b.pathUpdateKeyHandler,
-				Responses: map[int][]framework.Response{
-					http.StatusNoContent: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"key_id": {
-								Type:        framework.TypeString,
-								Description: `Key Id`,
-								Required:    true,
-							},
-							"key_name": {
-								Type:        framework.TypeString,
-								Description: `Key Name`,
-								Required:    true,
-							},
-							"key_type": {
-								Type:        framework.TypeString,
-								Description: `Key Type`,
-								Required:    true,
-							},
-						},
-					}},
-				},
+				Callback:                    b.pathUpdateKeyHandler,
 				ForwardPerformanceStandby:   true,
 				ForwardPerformanceSecondary: true,
 			},
 			logical.DeleteOperation: &framework.PathOperation{
-				Callback: b.pathDeleteKeyHandler,
-				Responses: map[int][]framework.Response{
-					http.StatusNoContent: {{
-						Description: "No Content",
-					}},
-				},
+				Callback:                    b.pathDeleteKeyHandler,
 				ForwardPerformanceStandby:   true,
 				ForwardPerformanceSecondary: true,
 			},
diff --git a/builtin/logical/pki/path_intermediate.go b/builtin/logical/pki/path_intermediate.go
index 1a685630e63bb..cfcff87b04f37 100644
--- a/builtin/logical/pki/path_intermediate.go
+++ b/builtin/logical/pki/path_intermediate.go
@@ -1,13 +1,9 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pki
 
 import (
 	"context"
 	"encoding/base64"
 	"fmt"
-	"net/http"
 
 	"github.com/hashicorp/vault/sdk/framework"
 	"github.com/hashicorp/vault/sdk/helper/errutil"
@@ -15,27 +11,13 @@ import (
 )
 
 func pathGenerateIntermediate(b *backend) *framework.Path {
-	pattern := "intermediate/generate/" + framework.GenericNameRegex("exported")
-
-	displayAttrs := &framework.DisplayAttributes{
-		OperationPrefix: operationPrefixPKI,
-		OperationVerb:   "generate",
-		OperationSuffix: "intermediate",
-	}
-
-	return buildPathGenerateIntermediate(b, pattern, displayAttrs)
+	return buildPathGenerateIntermediate(b, "intermediate/generate/"+framework.GenericNameRegex("exported"))
 }
 
 func pathSetSignedIntermediate(b *backend) *framework.Path {
 	ret := &framework.Path{
 		Pattern: "intermediate/set-signed",
 
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixPKI,
-			OperationVerb:   "set-signed",
-			OperationSuffix: "intermediate",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"certificate": {
 				Type: framework.TypeString,
@@ -49,38 +31,6 @@ appended to the bundle.`,
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.UpdateOperation: &framework.PathOperation{
 				Callback: b.pathImportIssuers,
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"mapping": {
-								Type:        framework.TypeMap,
-								Description: "A mapping of issuer_id to key_id for all issuers included in this request",
-								Required:    true,
-							},
-							"imported_keys": {
-								Type:        framework.TypeCommaStringSlice,
-								Description: "Net-new keys imported as a part of this request",
-								Required:    true,
-							},
-							"imported_issuers": {
-								Type:        framework.TypeCommaStringSlice,
-								Description: "Net-new issuers imported as a part of this request",
-								Required:    true,
-							},
-							"existing_keys": {
-								Type:        framework.TypeCommaStringSlice,
-								Description: "Existing keys specified as part of the import bundle of this request",
-								Required:    true,
-							},
-							"existing_issuers": {
-								Type:        framework.TypeCommaStringSlice,
-								Description: "Existing issuers specified as part of the import bundle of this request",
-								Required:    true,
-							},
-						},
-					}},
-				},
 				// Read more about why these flags are set in backend.go
 				ForwardPerformanceStandby:   true,
 				ForwardPerformanceSecondary: true,
diff --git a/builtin/logical/pki/path_issue_sign.go b/builtin/logical/pki/path_issue_sign.go
index 388e80cd21a78..7203d56c73cf0 100644
--- a/builtin/logical/pki/path_issue_sign.go
+++ b/builtin/logical/pki/path_issue_sign.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pki
 
 import (
@@ -10,7 +7,6 @@ import (
 	"encoding/base64"
 	"encoding/pem"
 	"fmt"
-	"net/http"
 	"strings"
 	"time"
 
@@ -23,78 +19,21 @@ import (
 
 func pathIssue(b *backend) *framework.Path {
 	pattern := "issue/" + framework.GenericNameRegex("role")
-
-	displayAttrs := &framework.DisplayAttributes{
-		OperationPrefix: operationPrefixPKI,
-		OperationVerb:   "issue",
-		OperationSuffix: "with-role",
-	}
-
-	return buildPathIssue(b, pattern, displayAttrs)
+	return buildPathIssue(b, pattern)
 }
 
 func pathIssuerIssue(b *backend) *framework.Path {
 	pattern := "issuer/" + framework.GenericNameRegex(issuerRefParam) + "/issue/" + framework.GenericNameRegex("role")
-
-	displayAttrs := &framework.DisplayAttributes{
-		OperationPrefix: operationPrefixPKIIssuer,
-		OperationVerb:   "issue",
-		OperationSuffix: "with-role",
-	}
-
-	return buildPathIssue(b, pattern, displayAttrs)
+	return buildPathIssue(b, pattern)
 }
 
-func buildPathIssue(b *backend, pattern string, displayAttrs *framework.DisplayAttributes) *framework.Path {
+func buildPathIssue(b *backend, pattern string) *framework.Path {
 	ret := &framework.Path{
-		Pattern:      pattern,
-		DisplayAttrs: displayAttrs,
+		Pattern: pattern,
 
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.UpdateOperation: &framework.PathOperation{
 				Callback: b.metricsWrap("issue", roleRequired, b.pathIssue),
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"certificate": {
-								Type:        framework.TypeString,
-								Description: `Certificate`,
-								Required:    true,
-							},
-							"issuing_ca": {
-								Type:        framework.TypeString,
-								Description: `Issuing Certificate Authority`,
-								Required:    true,
-							},
-							"ca_chain": {
-								Type:        framework.TypeCommaStringSlice,
-								Description: `Certificate Chain`,
-								Required:    false,
-							},
-							"serial_number": {
-								Type:        framework.TypeString,
-								Description: `Serial Number`,
-								Required:    false,
-							},
-							"expiration": {
-								Type:        framework.TypeString,
-								Description: `Time of expiration`,
-								Required:    false,
-							},
-							"private_key": {
-								Type:        framework.TypeString,
-								Description: `Private key`,
-								Required:    false,
-							},
-							"private_key_type": {
-								Type:        framework.TypeString,
-								Description: `Private key type`,
-								Required:    false,
-							},
-						},
-					}},
-				},
 			},
 		},
 
@@ -108,78 +47,21 @@ func buildPathIssue(b *backend, pattern string, displayAttrs *framework.DisplayA
 
 func pathSign(b *backend) *framework.Path {
 	pattern := "sign/" + framework.GenericNameRegex("role")
-
-	displayAttrs := &framework.DisplayAttributes{
-		OperationPrefix: operationPrefixPKI,
-		OperationVerb:   "sign",
-		OperationSuffix: "with-role",
-	}
-
-	return buildPathSign(b, pattern, displayAttrs)
+	return buildPathSign(b, pattern)
 }
 
 func pathIssuerSign(b *backend) *framework.Path {
 	pattern := "issuer/" + framework.GenericNameRegex(issuerRefParam) + "/sign/" + framework.GenericNameRegex("role")
-
-	displayAttrs := &framework.DisplayAttributes{
-		OperationPrefix: operationPrefixPKIIssuer,
-		OperationVerb:   "sign",
-		OperationSuffix: "with-role",
-	}
-
-	return buildPathSign(b, pattern, displayAttrs)
+	return buildPathSign(b, pattern)
 }
 
-func buildPathSign(b *backend, pattern string, displayAttrs *framework.DisplayAttributes) *framework.Path {
+func buildPathSign(b *backend, pattern string) *framework.Path {
 	ret := &framework.Path{
-		Pattern:      pattern,
-		DisplayAttrs: displayAttrs,
+		Pattern: pattern,
 
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.UpdateOperation: &framework.PathOperation{
 				Callback: b.metricsWrap("sign", roleRequired, b.pathSign),
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"certificate": {
-								Type:        framework.TypeString,
-								Description: `Certificate`,
-								Required:    true,
-							},
-							"issuing_ca": {
-								Type:        framework.TypeString,
-								Description: `Issuing Certificate Authority`,
-								Required:    true,
-							},
-							"ca_chain": {
-								Type:        framework.TypeCommaStringSlice,
-								Description: `Certificate Chain`,
-								Required:    false,
-							},
-							"serial_number": {
-								Type:        framework.TypeString,
-								Description: `Serial Number`,
-								Required:    true,
-							},
-							"expiration": {
-								Type:        framework.TypeString,
-								Description: `Time of expiration`,
-								Required:    true,
-							},
-							"private_key": {
-								Type:        framework.TypeString,
-								Description: `Private key`,
-								Required:    false,
-							},
-							"private_key_type": {
-								Type:        framework.TypeString,
-								Description: `Private key type`,
-								Required:    false,
-							},
-						},
-					}},
-				},
 			},
 		},
 
@@ -200,79 +82,22 @@ func buildPathSign(b *backend, pattern string, displayAttrs *framework.DisplayAt
 
 func pathIssuerSignVerbatim(b *backend) *framework.Path {
 	pattern := "issuer/" + framework.GenericNameRegex(issuerRefParam) + "/sign-verbatim" + framework.OptionalParamRegex("role")
-
-	displayAttrs := &framework.DisplayAttributes{
-		OperationPrefix: operationPrefixPKIIssuer,
-		OperationVerb:   "sign",
-		OperationSuffix: "verbatim|verbatim-with-role",
-	}
-
-	return buildPathIssuerSignVerbatim(b, pattern, displayAttrs)
+	return buildPathIssuerSignVerbatim(b, pattern)
 }
 
 func pathSignVerbatim(b *backend) *framework.Path {
 	pattern := "sign-verbatim" + framework.OptionalParamRegex("role")
-
-	displayAttrs := &framework.DisplayAttributes{
-		OperationPrefix: operationPrefixPKI,
-		OperationVerb:   "sign",
-		OperationSuffix: "verbatim|verbatim-with-role",
-	}
-
-	return buildPathIssuerSignVerbatim(b, pattern, displayAttrs)
+	return buildPathIssuerSignVerbatim(b, pattern)
 }
 
-func buildPathIssuerSignVerbatim(b *backend, pattern string, displayAttrs *framework.DisplayAttributes) *framework.Path {
+func buildPathIssuerSignVerbatim(b *backend, pattern string) *framework.Path {
 	ret := &framework.Path{
-		Pattern:      pattern,
-		DisplayAttrs: displayAttrs,
-		Fields:       getCsrSignVerbatimSchemaFields(),
+		Pattern: pattern,
+		Fields:  map[string]*framework.FieldSchema{},
 
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.UpdateOperation: &framework.PathOperation{
 				Callback: b.metricsWrap("sign-verbatim", roleOptional, b.pathSignVerbatim),
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"certificate": {
-								Type:        framework.TypeString,
-								Description: `Certificate`,
-								Required:    true,
-							},
-							"issuing_ca": {
-								Type:        framework.TypeString,
-								Description: `Issuing Certificate Authority`,
-								Required:    true,
-							},
-							"ca_chain": {
-								Type:        framework.TypeCommaStringSlice,
-								Description: `Certificate Chain`,
-								Required:    false,
-							},
-							"serial_number": {
-								Type:        framework.TypeString,
-								Description: `Serial Number`,
-								Required:    false,
-							},
-							"expiration": {
-								Type:        framework.TypeString,
-								Description: `Time of expiration`,
-								Required:    false,
-							},
-							"private_key": {
-								Type:        framework.TypeString,
-								Description: `Private key`,
-								Required:    false,
-							},
-							"private_key_type": {
-								Type:        framework.TypeString,
-								Description: `Private key type`,
-								Required:    false,
-							},
-						},
-					}},
-				},
 			},
 		},
 
@@ -280,6 +105,61 @@ func buildPathIssuerSignVerbatim(b *backend, pattern string, displayAttrs *frame
 		HelpDescription: pathIssuerSignVerbatimHelpDesc,
 	}
 
+	ret.Fields = addNonCACommonFields(ret.Fields)
+
+	ret.Fields["csr"] = &framework.FieldSchema{
+		Type:    framework.TypeString,
+		Default: "",
+		Description: `PEM-format CSR to be signed. Values will be
+taken verbatim from the CSR, except for
+basic constraints.`,
+	}
+
+	ret.Fields["key_usage"] = &framework.FieldSchema{
+		Type:    framework.TypeCommaStringSlice,
+		Default: []string{"DigitalSignature", "KeyAgreement", "KeyEncipherment"},
+		Description: `A comma-separated string or list of key usages (not extended
+key usages). Valid values can be found at
+https://golang.org/pkg/crypto/x509/#KeyUsage
+-- simply drop the "KeyUsage" part of the name.
+To remove all key usages from being set, set
+this value to an empty list.`,
+	}
+
+	ret.Fields["ext_key_usage"] = &framework.FieldSchema{
+		Type:    framework.TypeCommaStringSlice,
+		Default: []string{},
+		Description: `A comma-separated string or list of extended key usages. Valid values can be found at
+https://golang.org/pkg/crypto/x509/#ExtKeyUsage
+-- simply drop the "ExtKeyUsage" part of the name.
+To remove all key usages from being set, set
+this value to an empty list.`,
+	}
+
+	ret.Fields["ext_key_usage_oids"] = &framework.FieldSchema{
+		Type:        framework.TypeCommaStringSlice,
+		Description: `A comma-separated string or list of extended key usage oids.`,
+	}
+
+	ret.Fields["signature_bits"] = &framework.FieldSchema{
+		Type:    framework.TypeInt,
+		Default: 0,
+		Description: `The number of bits to use in the signature
+algorithm; accepts 256 for SHA-2-256, 384 for SHA-2-384, and 512 for
+SHA-2-512. Defaults to 0 to automatically detect based on key length
+(SHA-2-256 for RSA keys, and matching the curve size for NIST P-Curves).`,
+		DisplayAttrs: &framework.DisplayAttributes{
+			Value: 0,
+		},
+	}
+
+	ret.Fields["use_pss"] = &framework.FieldSchema{
+		Type:    framework.TypeBool,
+		Default: false,
+		Description: `Whether or not to use PSS signatures when using a
+RSA key-type issuer. Defaults to false.`,
+	}
+
 	return ret
 }
 
@@ -322,7 +202,50 @@ func (b *backend) pathSign(ctx context.Context, req *logical.Request, data *fram
 // pathSignVerbatim issues a certificate from a submitted CSR, *not* subject to
 // role restrictions
 func (b *backend) pathSignVerbatim(ctx context.Context, req *logical.Request, data *framework.FieldData, role *roleEntry) (*logical.Response, error) {
-	entry := buildSignVerbatimRole(data, role)
+	entry := &roleEntry{
+		AllowLocalhost:            true,
+		AllowAnyName:              true,
+		AllowIPSANs:               true,
+		AllowWildcardCertificates: new(bool),
+		EnforceHostnames:          false,
+		KeyType:                   "any",
+		UseCSRCommonName:          true,
+		UseCSRSANs:                true,
+		AllowedOtherSANs:          []string{"*"},
+		AllowedSerialNumbers:      []string{"*"},
+		AllowedURISANs:            []string{"*"},
+		CNValidations:             []string{"disabled"},
+		GenerateLease:             new(bool),
+		KeyUsage:                  data.Get("key_usage").([]string),
+		ExtKeyUsage:               data.Get("ext_key_usage").([]string),
+		ExtKeyUsageOIDs:           data.Get("ext_key_usage_oids").([]string),
+		SignatureBits:             data.Get("signature_bits").(int),
+		UsePSS:                    data.Get("use_pss").(bool),
+	}
+	*entry.AllowWildcardCertificates = true
+
+	*entry.GenerateLease = false
+
+	if role != nil {
+		if role.TTL > 0 {
+			entry.TTL = role.TTL
+		}
+		if role.MaxTTL > 0 {
+			entry.MaxTTL = role.MaxTTL
+		}
+		if role.GenerateLease != nil {
+			*entry.GenerateLease = *role.GenerateLease
+		}
+		if role.NotBeforeDuration > 0 {
+			entry.NotBeforeDuration = role.NotBeforeDuration
+		}
+		entry.NoStore = role.NoStore
+		entry.Issuer = role.Issuer
+	}
+
+	if len(entry.Issuer) == 0 {
+		entry.Issuer = defaultRef
+	}
 
 	return b.pathIssueSignCert(ctx, req, data, entry, true, true)
 }
@@ -495,7 +418,7 @@ func (b *backend) pathIssueSignCert(ctx context.Context, req *logical.Request, d
 		if err != nil {
 			return nil, fmt.Errorf("unable to store certificate locally: %w", err)
 		}
-		b.ifCountEnabledIncrementTotalCertificatesCount(certsCounted, key)
+		b.incrementTotalCertificatesCount(certsCounted, key)
 	}
 
 	if useCSR {
diff --git a/builtin/logical/pki/path_manage_issuers.go b/builtin/logical/pki/path_manage_issuers.go
index 0a4a4bc8cb314..712c80f7d7a92 100644
--- a/builtin/logical/pki/path_manage_issuers.go
+++ b/builtin/logical/pki/path_manage_issuers.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pki
 
 import (
@@ -9,7 +6,6 @@ import (
 	"crypto/x509"
 	"encoding/pem"
 	"fmt"
-	"net/http"
 	"strings"
 	"time"
 
@@ -19,89 +15,20 @@ import (
 )
 
 func pathIssuerGenerateRoot(b *backend) *framework.Path {
-	pattern := "issuers/generate/root/" + framework.GenericNameRegex("exported")
-
-	displayAttrs := &framework.DisplayAttributes{
-		OperationPrefix: operationPrefixPKIIssuers,
-		OperationVerb:   "generate",
-		OperationSuffix: "root",
-	}
-
-	return buildPathGenerateRoot(b, pattern, displayAttrs)
+	return buildPathGenerateRoot(b, "issuers/generate/root/"+framework.GenericNameRegex("exported"))
 }
 
 func pathRotateRoot(b *backend) *framework.Path {
-	pattern := "root/rotate/" + framework.GenericNameRegex("exported")
-
-	displayAttrs := &framework.DisplayAttributes{
-		OperationPrefix: operationPrefixPKIIssuers,
-		OperationVerb:   "rotate",
-		OperationSuffix: "root",
-	}
-
-	return buildPathGenerateRoot(b, pattern, displayAttrs)
+	return buildPathGenerateRoot(b, "root/rotate/"+framework.GenericNameRegex("exported"))
 }
 
-func buildPathGenerateRoot(b *backend, pattern string, displayAttrs *framework.DisplayAttributes) *framework.Path {
+func buildPathGenerateRoot(b *backend, pattern string) *framework.Path {
 	ret := &framework.Path{
-		Pattern:      pattern,
-		DisplayAttrs: displayAttrs,
+		Pattern: pattern,
 
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.UpdateOperation: &framework.PathOperation{
 				Callback: b.pathCAGenerateRoot,
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"expiration": {
-								Type:        framework.TypeString,
-								Description: `The expiration of the given.`,
-								Required:    true,
-							},
-							"serial_number": {
-								Type:        framework.TypeString,
-								Description: `The requested Subject's named serial number.`,
-								Required:    true,
-							},
-							"certificate": {
-								Type:        framework.TypeString,
-								Description: `The generated self-signed CA certificate.`,
-								Required:    true,
-							},
-							"issuing_ca": {
-								Type:        framework.TypeString,
-								Description: `The issuing certificate authority.`,
-								Required:    true,
-							},
-							"issuer_id": {
-								Type:        framework.TypeString,
-								Description: `The ID of the issuer`,
-								Required:    true,
-							},
-							"issuer_name": {
-								Type:        framework.TypeString,
-								Description: `The name of the issuer.`,
-								Required:    true,
-							},
-							"key_id": {
-								Type:        framework.TypeString,
-								Description: `The ID of the key.`,
-								Required:    true,
-							},
-							"key_name": {
-								Type:        framework.TypeString,
-								Description: `The key name if given.`,
-								Required:    true,
-							},
-							"private_key": {
-								Type:        framework.TypeString,
-								Description: `The private key if exported was specified.`,
-								Required:    false,
-							},
-						},
-					}},
-				},
 				// Read more about why these flags are set in backend.go
 				ForwardPerformanceStandby:   true,
 				ForwardPerformanceSecondary: true,
@@ -119,63 +46,20 @@ func buildPathGenerateRoot(b *backend, pattern string, displayAttrs *framework.D
 }
 
 func pathIssuerGenerateIntermediate(b *backend) *framework.Path {
-	pattern := "issuers/generate/intermediate/" + framework.GenericNameRegex("exported")
-
-	displayAttrs := &framework.DisplayAttributes{
-		OperationPrefix: operationPrefixPKIIssuers,
-		OperationVerb:   "generate",
-		OperationSuffix: "intermediate",
-	}
-
-	return buildPathGenerateIntermediate(b, pattern, displayAttrs)
+	return buildPathGenerateIntermediate(b,
+		"issuers/generate/intermediate/"+framework.GenericNameRegex("exported"))
 }
 
 func pathCrossSignIntermediate(b *backend) *framework.Path {
-	pattern := "intermediate/cross-sign"
-
-	displayAttrs := &framework.DisplayAttributes{
-		OperationPrefix: operationPrefixPKI,
-		OperationVerb:   "cross-sign",
-		OperationSuffix: "intermediate",
-	}
-
-	return buildPathGenerateIntermediate(b, pattern, displayAttrs)
+	return buildPathGenerateIntermediate(b, "intermediate/cross-sign")
 }
 
-func buildPathGenerateIntermediate(b *backend, pattern string, displayAttrs *framework.DisplayAttributes) *framework.Path {
+func buildPathGenerateIntermediate(b *backend, pattern string) *framework.Path {
 	ret := &framework.Path{
-		Pattern:      pattern,
-		DisplayAttrs: displayAttrs,
+		Pattern: pattern,
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.UpdateOperation: &framework.PathOperation{
 				Callback: b.pathGenerateIntermediate,
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"csr": {
-								Type:        framework.TypeString,
-								Description: `Certificate signing request.`,
-								Required:    true,
-							},
-							"key_id": {
-								Type:        framework.TypeString,
-								Description: `Id of the key.`,
-								Required:    true,
-							},
-							"private_key": {
-								Type:        framework.TypeString,
-								Description: `Generated private key.`,
-								Required:    false,
-							},
-							"private_key_type": {
-								Type:        framework.TypeString,
-								Description: `Specifies the format used for marshaling the private key.`,
-								Required:    false,
-							},
-						},
-					}},
-				},
 				// Read more about why these flags are set in backend.go
 				ForwardPerformanceStandby:   true,
 				ForwardPerformanceSecondary: true,
@@ -206,13 +90,6 @@ with Active Directory Certificate Services.`,
 func pathImportIssuer(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "issuers/import/(cert|bundle)",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixPKIIssuers,
-			OperationVerb:   "import",
-			OperationSuffix: "cert|bundle",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"pem_bundle": {
 				Type: framework.TypeString,
@@ -224,38 +101,6 @@ secret-key (optional) and certificates.`,
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.UpdateOperation: &framework.PathOperation{
 				Callback: b.pathImportIssuers,
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"mapping": {
-								Type:        framework.TypeMap,
-								Description: "A mapping of issuer_id to key_id for all issuers included in this request",
-								Required:    true,
-							},
-							"imported_keys": {
-								Type:        framework.TypeCommaStringSlice,
-								Description: "Net-new keys imported as a part of this request",
-								Required:    true,
-							},
-							"imported_issuers": {
-								Type:        framework.TypeCommaStringSlice,
-								Description: "Net-new issuers imported as a part of this request",
-								Required:    true,
-							},
-							"existing_keys": {
-								Type:        framework.TypeCommaStringSlice,
-								Description: "Existing keys specified as part of the import bundle of this request",
-								Required:    true,
-							},
-							"existing_issuers": {
-								Type:        framework.TypeCommaStringSlice,
-								Description: "Existing issuers specified as part of the import bundle of this request",
-								Required:    true,
-							},
-						},
-					}},
-				},
 				// Read more about why these flags are set in backend.go
 				ForwardPerformanceStandby:   true,
 				ForwardPerformanceSecondary: true,
@@ -318,8 +163,6 @@ func (b *backend) pathImportIssuers(ctx context.Context, req *logical.Request, d
 
 	var createdKeys []string
 	var createdIssuers []string
-	var existingKeys []string
-	var existingIssuers []string
 	issuerKeyMap := make(map[string]string)
 
 	// Rather than using certutil.ParsePEMBundle (which restricts the
@@ -376,8 +219,6 @@ func (b *backend) pathImportIssuers(ctx context.Context, req *logical.Request, d
 
 		if !existing {
 			createdKeys = append(createdKeys, key.ID.String())
-		} else {
-			existingKeys = append(existingKeys, key.ID.String())
 		}
 	}
 
@@ -390,8 +231,6 @@ func (b *backend) pathImportIssuers(ctx context.Context, req *logical.Request, d
 		issuerKeyMap[cert.ID.String()] = cert.KeyID.String()
 		if !existing {
 			createdIssuers = append(createdIssuers, cert.ID.String())
-		} else {
-			existingIssuers = append(existingIssuers, cert.ID.String())
 		}
 	}
 
@@ -400,30 +239,25 @@ func (b *backend) pathImportIssuers(ctx context.Context, req *logical.Request, d
 			"mapping":          issuerKeyMap,
 			"imported_keys":    createdKeys,
 			"imported_issuers": createdIssuers,
-			"existing_keys":    existingKeys,
-			"existing_issuers": existingIssuers,
 		},
 	}
 
 	if len(createdIssuers) > 0 {
-		warnings, err := b.crlBuilder.rebuild(sc, true)
+		err := b.crlBuilder.rebuild(ctx, b, req, true)
 		if err != nil {
 			// Before returning, check if the error message includes the
 			// string "PSS". If so, it indicates we might've wanted to modify
 			// this issuer, so convert the error to a warning.
 			if strings.Contains(err.Error(), "PSS") || strings.Contains(err.Error(), "pss") {
-				err = fmt.Errorf("Rebuilding the CRL failed with a message relating to the PSS signature algorithm. This likely means the revocation_signature_algorithm needs to be set on the newly imported issuer(s) because a managed key supports only the PSS algorithm; by default PKCS#1v1.5 was used to build the CRLs. CRLs will not be generated until this has been addressed, however the import was successful. The original error is reproduced below:\n\n\t%w", err)
+				err = fmt.Errorf("Rebuilding the CRL failed with a message relating to the PSS signature algorithm. This likely means the revocation_signature_algorithm needs to be set on the newly imported issuer(s) because a managed key supports only the PSS algorithm; by default PKCS#1v1.5 was used to build the CRLs. CRLs will not be generated until this has been addressed, however the import was successful. The original error is reproduced below:\n\n\t%v", err)
 			} else {
 				// Note to the caller that while this is an error, we did
 				// successfully import the issuers.
-				err = fmt.Errorf("Rebuilding the CRL failed. While this is indicative of a problem with the imported issuers (perhaps because of their revocation_signature_algorithm), they did import successfully and are now usable. It is strongly suggested to fix the CRL building errors before continuing. The original error is reproduced below:\n\n\t%w", err)
+				err = fmt.Errorf("Rebuilding the CRL failed. While this is indicative of a problem with the imported issuers (perhaps because of their revocation_signature_algorithm), they did import successfully and are now usable. It is strongly suggested to fix the CRL building errors before continuing. The original error is reproduced below:\n\n\t%v", err)
 			}
 
 			return nil, err
 		}
-		for index, warning := range warnings {
-			response.AddWarning(fmt.Sprintf("Warning %d during CRL rebuild: %v", index+1, warning))
-		}
 
 		var issuersWithKeys []string
 		for _, issuer := range createdIssuers {
@@ -515,100 +349,11 @@ func pathRevokeIssuer(b *backend) *framework.Path {
 
 	return &framework.Path{
 		Pattern: "issuer/" + framework.GenericNameRegex(issuerRefParam) + "/revoke",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixPKI,
-			OperationVerb:   "revoke",
-			OperationSuffix: "issuer",
-		},
-
-		Fields: fields,
+		Fields:  fields,
 
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.UpdateOperation: &framework.PathOperation{
 				Callback: b.pathRevokeIssuer,
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"issuer_id": {
-								Type:        framework.TypeString,
-								Description: `ID of the issuer`,
-								Required:    true,
-							},
-							"issuer_name": {
-								Type:        framework.TypeString,
-								Description: `Name of the issuer`,
-								Required:    true,
-							},
-							"key_id": {
-								Type:        framework.TypeString,
-								Description: `ID of the Key`,
-								Required:    true,
-							},
-							"certificate": {
-								Type:        framework.TypeString,
-								Description: `Certificate`,
-								Required:    true,
-							},
-							"manual_chain": {
-								Type:        framework.TypeCommaStringSlice,
-								Description: `Manual Chain`,
-								Required:    true,
-							},
-							"ca_chain": {
-								Type:        framework.TypeCommaStringSlice,
-								Description: `Certificate Authority Chain`,
-								Required:    true,
-							},
-							"leaf_not_after_behavior": {
-								Type:        framework.TypeString,
-								Description: ``,
-								Required:    true,
-							},
-							"usage": {
-								Type:        framework.TypeString,
-								Description: `Allowed usage`,
-								Required:    true,
-							},
-							"revocation_signature_algorithm": {
-								Type:        framework.TypeString,
-								Description: `Which signature algorithm to use when building CRLs`,
-								Required:    true,
-							},
-							"revoked": {
-								Type:        framework.TypeBool,
-								Description: `Whether the issuer was revoked`,
-								Required:    true,
-							},
-							"issuing_certificates": {
-								Type:        framework.TypeCommaStringSlice,
-								Description: `Specifies the URL values for the Issuing Certificate field`,
-								Required:    true,
-							},
-							"crl_distribution_points": {
-								Type:        framework.TypeStringSlice,
-								Description: `Specifies the URL values for the CRL Distribution Points field`,
-								Required:    true,
-							},
-							"ocsp_servers": {
-								Type:        framework.TypeStringSlice,
-								Description: `Specifies the URL values for the OCSP Servers field`,
-								Required:    true,
-							},
-							"revocation_time": {
-								Type:        framework.TypeInt64,
-								Description: `Time of revocation`,
-								Required:    false,
-							},
-							"revocation_time_rfc3339": {
-								Type:        framework.TypeTime,
-								Description: `RFC formatted time of revocation`,
-								Required:    false,
-							},
-						},
-					}},
-				},
 				// Read more about why these flags are set in backend.go
 				ForwardPerformanceStandby:   true,
 				ForwardPerformanceSecondary: true,
@@ -687,18 +432,18 @@ func (b *backend) pathRevokeIssuer(ctx context.Context, req *logical.Request, da
 	// include both in two separate CRLs. Hence, the former is the condition
 	// we check in CRL building, but this step satisfies other guarantees
 	// within Vault.
-	certEntry, err := fetchCertBySerial(sc, "certs/", issuer.SerialNumber)
+	certEntry, err := fetchCertBySerial(ctx, b, req, "certs/", issuer.SerialNumber)
 	if err == nil && certEntry != nil {
 		// We've inverted this error check as it doesn't matter; we already
 		// consider this certificate revoked.
 		storageCert, err := x509.ParseCertificate(certEntry.Value)
 		if err != nil {
-			return nil, fmt.Errorf("error parsing stored certificate value: %w", err)
+			return nil, fmt.Errorf("error parsing stored certificate value: %v", err)
 		}
 
 		issuerCert, err := issuer.GetCertificate()
 		if err != nil {
-			return nil, fmt.Errorf("error parsing issuer certificate value: %w", err)
+			return nil, fmt.Errorf("error parsing issuer certificate value: %v", err)
 		}
 
 		if bytes.Equal(issuerCert.Raw, storageCert.Raw) {
@@ -719,18 +464,18 @@ func (b *backend) pathRevokeIssuer(ctx context.Context, req *logical.Request, da
 
 			revEntry, err := logical.StorageEntryJSON(revokedPath+normalizeSerial(issuer.SerialNumber), revInfo)
 			if err != nil {
-				return nil, fmt.Errorf("error creating revocation entry for issuer: %w", err)
+				return nil, fmt.Errorf("error creating revocation entry for issuer: %v", err)
 			}
 
 			err = req.Storage.Put(ctx, revEntry)
 			if err != nil {
-				return nil, fmt.Errorf("error saving revoked issuer to new location: %w", err)
+				return nil, fmt.Errorf("error saving revoked issuer to new location: %v", err)
 			}
 		}
 	}
 
 	// Rebuild the CRL to include the newly revoked issuer.
-	warnings, crlErr := b.crlBuilder.rebuild(sc, false)
+	crlErr := b.crlBuilder.rebuild(ctx, b, req, false)
 	if crlErr != nil {
 		switch crlErr.(type) {
 		case errutil.UserError:
@@ -746,9 +491,6 @@ func (b *backend) pathRevokeIssuer(ctx context.Context, req *logical.Request, da
 		// Impossible.
 		return nil, err
 	}
-	for index, warning := range warnings {
-		response.AddWarning(fmt.Sprintf("Warning %d during CRL rebuild: %v", index+1, warning))
-	}
 
 	// For sanity, we'll add a warning message here if there's no other
 	// issuer which verifies this issuer.
diff --git a/builtin/logical/pki/path_manage_keys.go b/builtin/logical/pki/path_manage_keys.go
index 3c10c32903d34..90119ce4e8a1e 100644
--- a/builtin/logical/pki/path_manage_keys.go
+++ b/builtin/logical/pki/path_manage_keys.go
@@ -1,13 +1,9 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pki
 
 import (
 	"bytes"
 	"context"
 	"encoding/pem"
-	"net/http"
 	"strings"
 
 	"github.com/hashicorp/vault/sdk/framework"
@@ -19,12 +15,6 @@ func pathGenerateKey(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "keys/generate/(internal|exported|kms)",
 
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixPKI,
-			OperationVerb:   "generate",
-			OperationSuffix: "internal-key|exported-key|kms-key",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			keyNameParam: {
 				Type:        framework.TypeString,
@@ -64,36 +54,7 @@ is required. Ignored for other types.`,
 
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.UpdateOperation: &framework.PathOperation{
-				Callback: b.pathGenerateKeyHandler,
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"key_id": {
-								Type:        framework.TypeString,
-								Description: `ID assigned to this key.`,
-								Required:    true,
-							},
-							"key_name": {
-								Type:        framework.TypeString,
-								Description: `Name assigned to this key.`,
-								Required:    true,
-							},
-							"key_type": {
-								Type: framework.TypeString,
-								Description: `The type of key to use; defaults to RSA. "rsa"
-								"ec" and "ed25519" are the only valid values.`,
-								Required: true,
-							},
-							"private_key": {
-								Type:        framework.TypeString,
-								Description: `The private key string`,
-								Required:    false,
-							},
-						},
-					}},
-				},
-
+				Callback:                    b.pathGenerateKeyHandler,
 				ForwardPerformanceStandby:   true,
 				ForwardPerformanceSecondary: true,
 			},
@@ -188,12 +149,6 @@ func pathImportKey(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "keys/import",
 
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixPKI,
-			OperationVerb:   "import",
-			OperationSuffix: "key",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			keyNameParam: {
 				Type:        framework.TypeString,
@@ -207,30 +162,7 @@ func pathImportKey(b *backend) *framework.Path {
 
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.UpdateOperation: &framework.PathOperation{
-				Callback: b.pathImportKeyHandler,
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"key_id": {
-								Type:        framework.TypeString,
-								Description: `ID assigned to this key.`,
-								Required:    true,
-							},
-							"key_name": {
-								Type:        framework.TypeString,
-								Description: `Name assigned to this key.`,
-								Required:    true,
-							},
-							"key_type": {
-								Type: framework.TypeString,
-								Description: `The type of key to use; defaults to RSA. "rsa"
-								"ec" and "ed25519" are the only valid values.`,
-								Required: true,
-							},
-						},
-					}},
-				},
+				Callback:                    b.pathImportKeyHandler,
 				ForwardPerformanceStandby:   true,
 				ForwardPerformanceSecondary: true,
 			},
diff --git a/builtin/logical/pki/path_manage_keys_test.go b/builtin/logical/pki/path_manage_keys_test.go
index 3c5708a8bb04d..979f8a203d4ab 100644
--- a/builtin/logical/pki/path_manage_keys_test.go
+++ b/builtin/logical/pki/path_manage_keys_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pki
 
 import (
@@ -12,8 +9,6 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/vault/sdk/helper/testhelpers/schema"
-
 	"github.com/hashicorp/vault/sdk/helper/certutil"
 
 	"github.com/hashicorp/vault/sdk/logical"
@@ -22,7 +17,7 @@ import (
 
 func TestPKI_PathManageKeys_GenerateInternalKeys(t *testing.T) {
 	t.Parallel()
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 
 	tests := []struct {
 		name           string
@@ -88,7 +83,7 @@ func TestPKI_PathManageKeys_GenerateInternalKeys(t *testing.T) {
 func TestPKI_PathManageKeys_GenerateExportedKeys(t *testing.T) {
 	t.Parallel()
 	// We tested a lot of the logic above within the internal test, so just make sure we honor the exported contract
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 
 	resp, err := b.HandleRequest(context.Background(), &logical.Request{
 		Operation: logical.UpdateOperation,
@@ -100,8 +95,6 @@ func TestPKI_PathManageKeys_GenerateExportedKeys(t *testing.T) {
 		},
 		MountPoint: "pki/",
 	})
-	schema.ValidateResponse(t, schema.GetResponseSchema(t, b.Route("keys/generate/exported"), logical.UpdateOperation), resp, true)
-
 	require.NoError(t, err, "Failed generating exported key")
 	require.NotNil(t, resp, "Got nil response generating exported key")
 	require.Equal(t, "ec", resp.Data["key_type"], "key_type field contained an invalid type")
@@ -122,7 +115,7 @@ func TestPKI_PathManageKeys_GenerateExportedKeys(t *testing.T) {
 
 func TestPKI_PathManageKeys_ImportKeyBundle(t *testing.T) {
 	t.Parallel()
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 
 	bundle1, err := certutil.CreateKeyBundle("ec", 224, rand.Reader)
 	require.NoError(t, err, "failed generating an ec key bundle")
@@ -143,9 +136,6 @@ func TestPKI_PathManageKeys_ImportKeyBundle(t *testing.T) {
 		},
 		MountPoint: "pki/",
 	})
-
-	schema.ValidateResponse(t, schema.GetResponseSchema(t, b.Route("keys/import"), logical.UpdateOperation), resp, true)
-
 	require.NoError(t, err, "Failed importing ec key")
 	require.NotNil(t, resp, "Got nil response importing ec key")
 	require.False(t, resp.IsError(), "received an error response: %v", resp.Error())
@@ -258,7 +248,7 @@ func TestPKI_PathManageKeys_ImportKeyBundle(t *testing.T) {
 
 func TestPKI_PathManageKeys_DeleteDefaultKeyWarns(t *testing.T) {
 	t.Parallel()
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 
 	resp, err := b.HandleRequest(context.Background(), &logical.Request{
 		Operation:  logical.UpdateOperation,
@@ -286,7 +276,7 @@ func TestPKI_PathManageKeys_DeleteDefaultKeyWarns(t *testing.T) {
 
 func TestPKI_PathManageKeys_DeleteUsedKeyFails(t *testing.T) {
 	t.Parallel()
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 
 	resp, err := b.HandleRequest(context.Background(), &logical.Request{
 		Operation:  logical.UpdateOperation,
@@ -313,7 +303,7 @@ func TestPKI_PathManageKeys_DeleteUsedKeyFails(t *testing.T) {
 
 func TestPKI_PathManageKeys_UpdateKeyDetails(t *testing.T) {
 	t.Parallel()
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 
 	resp, err := b.HandleRequest(context.Background(), &logical.Request{
 		Operation:  logical.UpdateOperation,
@@ -334,8 +324,6 @@ func TestPKI_PathManageKeys_UpdateKeyDetails(t *testing.T) {
 		Data:       map[string]interface{}{"key_name": "new-name"},
 		MountPoint: "pki/",
 	})
-	schema.ValidateResponse(t, schema.GetResponseSchema(t, b.Route("key/"+keyId.String()), logical.UpdateOperation), resp, true)
-
 	require.NoError(t, err, "failed updating key with new name")
 	require.NotNil(t, resp, "Got nil response updating key with new name")
 	require.False(t, resp.IsError(), "unexpected error updating key with new name: %#v", resp.Error())
@@ -346,8 +334,6 @@ func TestPKI_PathManageKeys_UpdateKeyDetails(t *testing.T) {
 		Storage:    s,
 		MountPoint: "pki/",
 	})
-	schema.ValidateResponse(t, schema.GetResponseSchema(t, b.Route("key/"+keyId.String()), logical.ReadOperation), resp, true)
-
 	require.NoError(t, err, "failed reading key after name update")
 	require.NotNil(t, resp, "Got nil response reading key after name update")
 	require.False(t, resp.IsError(), "unexpected error reading key: %#v", resp.Error())
@@ -370,7 +356,7 @@ func TestPKI_PathManageKeys_UpdateKeyDetails(t *testing.T) {
 
 func TestPKI_PathManageKeys_ImportKeyBundleBadData(t *testing.T) {
 	t.Parallel()
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 
 	resp, err := b.HandleRequest(context.Background(), &logical.Request{
 		Operation: logical.UpdateOperation,
@@ -404,7 +390,7 @@ func TestPKI_PathManageKeys_ImportKeyBundleBadData(t *testing.T) {
 
 func TestPKI_PathManageKeys_ImportKeyRejectsMultipleKeys(t *testing.T) {
 	t.Parallel()
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 
 	bundle1, err := certutil.CreateKeyBundle("ec", 224, rand.Reader)
 	require.NoError(t, err, "failed generating an ec key bundle")
diff --git a/builtin/logical/pki/path_ocsp.go b/builtin/logical/pki/path_ocsp.go
index b9f5cd1f9fd98..4ee6d38f68b3c 100644
--- a/builtin/logical/pki/path_ocsp.go
+++ b/builtin/logical/pki/path_ocsp.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pki
 
 import (
@@ -16,7 +13,6 @@ import (
 	"io"
 	"math/big"
 	"net/http"
-	"strings"
 	"time"
 
 	"github.com/hashicorp/vault/sdk/helper/errutil"
@@ -71,33 +67,8 @@ var (
 )
 
 func buildPathOcspGet(b *backend) *framework.Path {
-	pattern := "ocsp/" + framework.MatchAllRegex(ocspReqParam)
-
-	displayAttrs := &framework.DisplayAttributes{
-		OperationPrefix: operationPrefixPKI,
-		OperationVerb:   "query",
-		OperationSuffix: "ocsp-with-get-req",
-	}
-
-	return buildOcspGetWithPath(b, pattern, displayAttrs)
-}
-
-func buildPathUnifiedOcspGet(b *backend) *framework.Path {
-	pattern := "unified-ocsp/" + framework.MatchAllRegex(ocspReqParam)
-
-	displayAttrs := &framework.DisplayAttributes{
-		OperationPrefix: operationPrefixPKI,
-		OperationVerb:   "query",
-		OperationSuffix: "unified-ocsp-with-get-req",
-	}
-
-	return buildOcspGetWithPath(b, pattern, displayAttrs)
-}
-
-func buildOcspGetWithPath(b *backend, pattern string, displayAttrs *framework.DisplayAttributes) *framework.Path {
 	return &framework.Path{
-		Pattern:      pattern,
-		DisplayAttrs: displayAttrs,
+		Pattern: "ocsp/" + framework.MatchAllRegex(ocspReqParam),
 		Fields: map[string]*framework.FieldSchema{
 			ocspReqParam: {
 				Type:        framework.TypeString,
@@ -116,33 +87,8 @@ func buildOcspGetWithPath(b *backend, pattern string, displayAttrs *framework.Di
 }
 
 func buildPathOcspPost(b *backend) *framework.Path {
-	pattern := "ocsp"
-
-	displayAttrs := &framework.DisplayAttributes{
-		OperationPrefix: operationPrefixPKI,
-		OperationVerb:   "query",
-		OperationSuffix: "ocsp",
-	}
-
-	return buildOcspPostWithPath(b, pattern, displayAttrs)
-}
-
-func buildPathUnifiedOcspPost(b *backend) *framework.Path {
-	pattern := "unified-ocsp"
-
-	displayAttrs := &framework.DisplayAttributes{
-		OperationPrefix: operationPrefixPKI,
-		OperationVerb:   "query",
-		OperationSuffix: "unified-ocsp",
-	}
-
-	return buildOcspPostWithPath(b, pattern, displayAttrs)
-}
-
-func buildOcspPostWithPath(b *backend, pattern string, displayAttrs *framework.DisplayAttributes) *framework.Path {
 	return &framework.Path{
-		Pattern:      pattern,
-		DisplayAttrs: displayAttrs,
+		Pattern: "ocsp",
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.UpdateOperation: &framework.PathOperation{
 				Callback: b.ocspHandler,
@@ -157,7 +103,7 @@ func buildOcspPostWithPath(b *backend, pattern string, displayAttrs *framework.D
 func (b *backend) ocspHandler(ctx context.Context, request *logical.Request, data *framework.FieldData) (*logical.Response, error) {
 	sc := b.makeStorageContext(ctx, request.Storage)
 	cfg, err := b.crlBuilder.getConfigWithUpdate(sc)
-	if err != nil || cfg.OcspDisable || (isUnifiedOcspPath(request) && !cfg.UnifiedCRL) {
+	if err != nil || cfg.OcspDisable {
 		return OcspUnauthorizedResponse, nil
 	}
 
@@ -171,9 +117,7 @@ func (b *backend) ocspHandler(ctx context.Context, request *logical.Request, dat
 		return OcspMalformedResponse, nil
 	}
 
-	useUnifiedStorage := canUseUnifiedStorage(request, cfg)
-
-	ocspStatus, err := getOcspStatus(sc, ocspReq, useUnifiedStorage)
+	ocspStatus, err := getOcspStatus(sc, request, ocspReq)
 	if err != nil {
 		return logAndReturnInternalError(b, err), nil
 	}
@@ -210,20 +154,6 @@ func (b *backend) ocspHandler(ctx context.Context, request *logical.Request, dat
 	}, nil
 }
 
-func canUseUnifiedStorage(req *logical.Request, cfg *crlConfig) bool {
-	if isUnifiedOcspPath(req) {
-		return true
-	}
-
-	// We are operating on the existing /pki/ocsp path, both of these fields need to be enabled
-	// for us to use the unified path.
-	return shouldLocalPathsUseUnified(cfg)
-}
-
-func isUnifiedOcspPath(req *logical.Request) bool {
-	return strings.HasPrefix(req.Path, "unified-ocsp")
-}
-
 func generateUnknownResponse(cfg *crlConfig, sc *storageContext, ocspReq *ocsp.Request) *logical.Response {
 	// Generate an Unknown OCSP response, signing with the default issuer from the mount as we did
 	// not match the request's issuer. If no default issuer can be used, return with Unauthorized as there
@@ -322,8 +252,8 @@ func logAndReturnInternalError(b *backend, err error) *logical.Response {
 	return OcspInternalErrorResponse
 }
 
-func getOcspStatus(sc *storageContext, ocspReq *ocsp.Request, useUnifiedStorage bool) (*ocspRespInfo, error) {
-	revEntryRaw, err := fetchCertBySerialBigInt(sc, revokedPath, ocspReq.SerialNumber)
+func getOcspStatus(sc *storageContext, request *logical.Request, ocspReq *ocsp.Request) (*ocspRespInfo, error) {
+	revEntryRaw, err := fetchCertBySerialBigInt(sc.Context, sc.Backend, request, revokedPath, ocspReq.SerialNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -342,18 +272,6 @@ func getOcspStatus(sc *storageContext, ocspReq *ocsp.Request, useUnifiedStorage
 		info.ocspStatus = ocsp.Revoked
 		info.revocationTimeUTC = &revEntry.RevocationTimeUTC
 		info.issuerID = revEntry.CertificateIssuer // This might be empty if the CRL hasn't been rebuilt
-	} else if useUnifiedStorage {
-		dashSerial := normalizeSerialFromBigInt(ocspReq.SerialNumber)
-		unifiedEntry, err := getUnifiedRevocationBySerial(sc, dashSerial)
-		if err != nil {
-			return nil, err
-		}
-
-		if unifiedEntry != nil {
-			info.ocspStatus = ocsp.Revoked
-			info.revocationTimeUTC = &unifiedEntry.RevocationTimeUTC
-			info.issuerID = unifiedEntry.CertificateIssuer
-		}
 	}
 
 	return &info, nil
diff --git a/builtin/logical/pki/path_ocsp_test.go b/builtin/logical/pki/path_ocsp_test.go
index ab1173fa34293..6504b3d3ffb26 100644
--- a/builtin/logical/pki/path_ocsp_test.go
+++ b/builtin/logical/pki/path_ocsp_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pki
 
 import (
@@ -17,8 +14,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/vault/sdk/helper/testhelpers/schema"
-
 	vaulthttp "github.com/hashicorp/vault/http"
 	"github.com/hashicorp/vault/vault"
 
@@ -48,8 +43,8 @@ func TestOcsp_Disabled(t *testing.T) {
 			resp, err := CBWrite(b, s, "config/crl", map[string]interface{}{
 				"ocsp_disable": "true",
 			})
-			requireSuccessNonNilResponse(t, resp, err)
-			resp, err = SendOcspRequest(t, b, s, localTT.reqType, testEnv.leafCertIssuer1, testEnv.issuer1, crypto.SHA1)
+			requireSuccessNilResponse(t, resp, err)
+			resp, err = sendOcspRequest(t, b, s, localTT.reqType, testEnv.leafCertIssuer1, testEnv.issuer1, crypto.SHA1)
 			require.NoError(t, err)
 			requireFieldsSetInResp(t, resp, "http_content_type", "http_status_code", "http_raw_body")
 			require.Equal(t, 401, resp.Data["http_status_code"])
@@ -69,9 +64,9 @@ func TestOcsp_UnknownIssuerWithNoDefault(t *testing.T) {
 
 	_, _, testEnv := setupOcspEnv(t, "ec")
 	// Create another completely empty mount so the created issuer/certificate above is unknown
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 
-	resp, err := SendOcspRequest(t, b, s, "get", testEnv.leafCertIssuer1, testEnv.issuer1, crypto.SHA1)
+	resp, err := sendOcspRequest(t, b, s, "get", testEnv.leafCertIssuer1, testEnv.issuer1, crypto.SHA1)
 	require.NoError(t, err)
 	requireFieldsSetInResp(t, resp, "http_content_type", "http_status_code", "http_raw_body")
 	require.Equal(t, 401, resp.Data["http_status_code"])
@@ -93,7 +88,7 @@ func TestOcsp_WrongIssuerInRequest(t *testing.T) {
 	})
 	requireSuccessNonNilResponse(t, resp, err, "revoke")
 
-	resp, err = SendOcspRequest(t, b, s, "get", testEnv.leafCertIssuer1, testEnv.issuer2, crypto.SHA1)
+	resp, err = sendOcspRequest(t, b, s, "get", testEnv.leafCertIssuer1, testEnv.issuer2, crypto.SHA1)
 	require.NoError(t, err)
 	requireFieldsSetInResp(t, resp, "http_content_type", "http_status_code", "http_raw_body")
 	require.Equal(t, 200, resp.Data["http_status_code"])
@@ -175,7 +170,7 @@ func TestOcsp_InvalidIssuerIdInRevocationEntry(t *testing.T) {
 	require.NoError(t, err, "failed writing out new revocation entry: %v", revEntry)
 
 	// Send the request
-	resp, err = SendOcspRequest(t, b, s, "get", testEnv.leafCertIssuer1, testEnv.issuer1, crypto.SHA1)
+	resp, err = sendOcspRequest(t, b, s, "get", testEnv.leafCertIssuer1, testEnv.issuer1, crypto.SHA1)
 	require.NoError(t, err)
 	requireFieldsSetInResp(t, resp, "http_content_type", "http_status_code", "http_raw_body")
 	require.Equal(t, 200, resp.Data["http_status_code"])
@@ -202,7 +197,6 @@ func TestOcsp_UnknownIssuerIdWithDefaultHavingOcspUsageRemoved(t *testing.T) {
 	resp, err := CBWrite(b, s, "revoke", map[string]interface{}{
 		"serial_number": serial,
 	})
-	schema.ValidateResponse(t, schema.GetResponseSchema(t, b.Route("revoke"), logical.UpdateOperation), resp, true)
 	requireSuccessNonNilResponse(t, resp, err, "revoke")
 
 	// Twiddle the entry so that the issuer id is no longer valid.
@@ -229,7 +223,7 @@ func TestOcsp_UnknownIssuerIdWithDefaultHavingOcspUsageRemoved(t *testing.T) {
 	requireSuccessNonNilResponse(t, resp, err, "failed resetting usage flags on issuer2")
 
 	// Send the request
-	resp, err = SendOcspRequest(t, b, s, "get", testEnv.leafCertIssuer1, testEnv.issuer1, crypto.SHA1)
+	resp, err = sendOcspRequest(t, b, s, "get", testEnv.leafCertIssuer1, testEnv.issuer1, crypto.SHA1)
 	require.NoError(t, err)
 	requireFieldsSetInResp(t, resp, "http_content_type", "http_status_code", "http_raw_body")
 	require.Equal(t, 401, resp.Data["http_status_code"])
@@ -266,7 +260,7 @@ func TestOcsp_RevokedCertHasIssuerWithoutOcspUsage(t *testing.T) {
 	require.False(t, usages.HasUsage(OCSPSigningUsage))
 
 	// Request an OCSP request from it, we should get an Unauthorized response back
-	resp, err = SendOcspRequest(t, b, s, "get", testEnv.leafCertIssuer1, testEnv.issuer1, crypto.SHA1)
+	resp, err = sendOcspRequest(t, b, s, "get", testEnv.leafCertIssuer1, testEnv.issuer1, crypto.SHA1)
 	requireSuccessNonNilResponse(t, resp, err, "ocsp get request")
 	requireFieldsSetInResp(t, resp, "http_content_type", "http_status_code", "http_raw_body")
 	require.Equal(t, 401, resp.Data["http_status_code"])
@@ -305,7 +299,7 @@ func TestOcsp_RevokedCertHasIssuerWithoutAKey(t *testing.T) {
 	requireSuccessNonNilResponse(t, resp, err, "failed deleting key")
 
 	// Request an OCSP request from it, we should get an Unauthorized response back
-	resp, err = SendOcspRequest(t, b, s, "get", testEnv.leafCertIssuer1, testEnv.issuer1, crypto.SHA1)
+	resp, err = sendOcspRequest(t, b, s, "get", testEnv.leafCertIssuer1, testEnv.issuer1, crypto.SHA1)
 	requireSuccessNonNilResponse(t, resp, err, "ocsp get request")
 	requireFieldsSetInResp(t, resp, "http_content_type", "http_status_code", "http_raw_body")
 	require.Equal(t, 401, resp.Data["http_status_code"])
@@ -351,7 +345,7 @@ func TestOcsp_MultipleMatchingIssuersOneWithoutSigningUsage(t *testing.T) {
 	require.False(t, usages.HasUsage(OCSPSigningUsage))
 
 	// Request an OCSP request from it, we should get a Good response back, from the rotated cert
-	resp, err = SendOcspRequest(t, b, s, "get", testEnv.leafCertIssuer1, testEnv.issuer1, crypto.SHA1)
+	resp, err = sendOcspRequest(t, b, s, "get", testEnv.leafCertIssuer1, testEnv.issuer1, crypto.SHA1)
 	requireSuccessNonNilResponse(t, resp, err, "ocsp get request")
 	requireFieldsSetInResp(t, resp, "http_content_type", "http_status_code", "http_raw_body")
 	require.Equal(t, 200, resp.Data["http_status_code"])
@@ -517,7 +511,7 @@ func runOcspRequestTest(t *testing.T, requestType string, caKeyType string, caKe
 	b, s, testEnv := setupOcspEnvWithCaKeyConfig(t, caKeyType, caKeyBits, caKeySigBits)
 
 	// Non-revoked cert
-	resp, err := SendOcspRequest(t, b, s, requestType, testEnv.leafCertIssuer1, testEnv.issuer1, requestHash)
+	resp, err := sendOcspRequest(t, b, s, requestType, testEnv.leafCertIssuer1, testEnv.issuer1, requestHash)
 	requireSuccessNonNilResponse(t, resp, err, "ocsp get request")
 	requireFieldsSetInResp(t, resp, "http_content_type", "http_status_code", "http_raw_body")
 	require.Equal(t, 200, resp.Data["http_status_code"])
@@ -541,7 +535,7 @@ func runOcspRequestTest(t *testing.T, requestType string, caKeyType string, caKe
 	})
 	requireSuccessNonNilResponse(t, resp, err, "revoke")
 
-	resp, err = SendOcspRequest(t, b, s, requestType, testEnv.leafCertIssuer1, testEnv.issuer1, requestHash)
+	resp, err = sendOcspRequest(t, b, s, requestType, testEnv.leafCertIssuer1, testEnv.issuer1, requestHash)
 	requireSuccessNonNilResponse(t, resp, err, "ocsp get request with revoked")
 	requireFieldsSetInResp(t, resp, "http_content_type", "http_status_code", "http_raw_body")
 	require.Equal(t, 200, resp.Data["http_status_code"])
@@ -560,7 +554,7 @@ func runOcspRequestTest(t *testing.T, requestType string, caKeyType string, caKe
 	requireOcspResponseSignedBy(t, ocspResp, testEnv.issuer1)
 
 	// Request status for our second issuer
-	resp, err = SendOcspRequest(t, b, s, requestType, testEnv.leafCertIssuer2, testEnv.issuer2, requestHash)
+	resp, err = sendOcspRequest(t, b, s, requestType, testEnv.leafCertIssuer2, testEnv.issuer2, requestHash)
 	requireSuccessNonNilResponse(t, resp, err, "ocsp get request")
 	requireFieldsSetInResp(t, resp, "http_content_type", "http_status_code", "http_raw_body")
 	require.Equal(t, 200, resp.Data["http_status_code"])
@@ -592,8 +586,6 @@ func runOcspRequestTest(t *testing.T, requestType string, caKeyType string, caKe
 }
 
 func requireOcspSignatureAlgoForKey(t *testing.T, expected x509.SignatureAlgorithm, actual x509.SignatureAlgorithm) {
-	t.Helper()
-
 	require.Equal(t, expected.String(), actual.String())
 }
 
@@ -616,7 +608,7 @@ func setupOcspEnv(t *testing.T, keyType string) (*backend, logical.Storage, *ocs
 }
 
 func setupOcspEnvWithCaKeyConfig(t *testing.T, keyType string, caKeyBits int, caKeySigBits int) (*backend, logical.Storage, *ocspTestEnv) {
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 	var issuerCerts []*x509.Certificate
 	var leafCerts []*x509.Certificate
 	var issuerIds []issuerID
@@ -644,7 +636,7 @@ func setupOcspEnvWithCaKeyConfig(t *testing.T, keyType string, caKeyBits int, ca
 			"issuer_ref":         issuerId,
 			"key_type":           keyType,
 		})
-		requireSuccessNonNilResponse(t, resp, err, "roles/test"+strconv.FormatInt(int64(i), 10))
+		requireSuccessNilResponse(t, resp, err, "roles/test"+strconv.FormatInt(int64(i), 10))
 
 		resp, err = CBWrite(b, s, "issue/test"+strconv.FormatInt(int64(i), 10), map[string]interface{}{
 			"common_name": "test.foobar.com",
@@ -675,9 +667,7 @@ func setupOcspEnvWithCaKeyConfig(t *testing.T, keyType string, caKeyBits int, ca
 	return b, s, testEnv
 }
 
-func SendOcspRequest(t *testing.T, b *backend, s logical.Storage, getOrPost string, cert, issuer *x509.Certificate, requestHash crypto.Hash) (*logical.Response, error) {
-	t.Helper()
-
+func sendOcspRequest(t *testing.T, b *backend, s logical.Storage, getOrPost string, cert, issuer *x509.Certificate, requestHash crypto.Hash) (*logical.Response, error) {
 	ocspRequest := generateRequest(t, requestHash, cert, issuer)
 
 	switch strings.ToLower(getOrPost) {
@@ -686,7 +676,7 @@ func SendOcspRequest(t *testing.T, b *backend, s logical.Storage, getOrPost stri
 	case "post":
 		return sendOcspPostRequest(b, s, ocspRequest)
 	default:
-		t.Fatalf("unsupported value for SendOcspRequest getOrPost arg: %s", getOrPost)
+		t.Fatalf("unsupported value for sendOcspRequest getOrPost arg: %s", getOrPost)
 	}
 	return nil, nil
 }
@@ -712,8 +702,6 @@ func sendOcspPostRequest(b *backend, s logical.Storage, ocspRequest []byte) (*lo
 }
 
 func generateRequest(t *testing.T, requestHash crypto.Hash, cert *x509.Certificate, issuer *x509.Certificate) []byte {
-	t.Helper()
-
 	opts := &ocsp.RequestOptions{Hash: requestHash}
 	ocspRequestDer, err := ocsp.CreateRequest(cert, issuer, opts)
 	require.NoError(t, err, "Failed generating OCSP request")
@@ -721,8 +709,6 @@ func generateRequest(t *testing.T, requestHash crypto.Hash, cert *x509.Certifica
 }
 
 func requireOcspResponseSignedBy(t *testing.T, ocspResp *ocsp.Response, issuer *x509.Certificate) {
-	t.Helper()
-
 	err := ocspResp.CheckSignatureFrom(issuer)
 	require.NoError(t, err, "Failed signature verification of ocsp response: %w", err)
 }
diff --git a/builtin/logical/pki/path_resign_crls.go b/builtin/logical/pki/path_resign_crls.go
deleted file mode 100644
index a82f94f32fbcd..0000000000000
--- a/builtin/logical/pki/path_resign_crls.go
+++ /dev/null
@@ -1,675 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package pki
-
-import (
-	"context"
-	"crypto/rand"
-	"crypto/x509"
-	"crypto/x509/pkix"
-	"encoding/asn1"
-	"encoding/base64"
-	"encoding/hex"
-	"encoding/pem"
-	"errors"
-	"fmt"
-	"math/big"
-	"net/http"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/hashicorp/go-secure-stdlib/parseutil"
-	"github.com/hashicorp/vault/sdk/framework"
-	"github.com/hashicorp/vault/sdk/helper/certutil"
-	"github.com/hashicorp/vault/sdk/logical"
-)
-
-const (
-	crlNumberParam          = "crl_number"
-	deltaCrlBaseNumberParam = "delta_crl_base_number"
-	nextUpdateParam         = "next_update"
-	crlsParam               = "crls"
-	formatParam             = "format"
-)
-
-var (
-	akOid       = asn1.ObjectIdentifier{2, 5, 29, 35}
-	crlNumOid   = asn1.ObjectIdentifier{2, 5, 29, 20}
-	deltaCrlOid = asn1.ObjectIdentifier{2, 5, 29, 27}
-)
-
-func pathResignCrls(b *backend) *framework.Path {
-	return &framework.Path{
-		Pattern: "issuer/" + framework.GenericNameRegex(issuerRefParam) + "/resign-crls",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixPKIIssuer,
-			OperationVerb:   "resign",
-			OperationSuffix: "crls",
-		},
-
-		Fields: map[string]*framework.FieldSchema{
-			issuerRefParam: {
-				Type: framework.TypeString,
-				Description: `Reference to a existing issuer; either "default"
-for the configured default issuer, an identifier or the name assigned
-to the issuer.`,
-				Default: defaultRef,
-			},
-			crlNumberParam: {
-				Type:        framework.TypeInt,
-				Description: `The sequence number to be written within the CRL Number extension.`,
-			},
-			deltaCrlBaseNumberParam: {
-				Type: framework.TypeInt,
-				Description: `Using a zero or greater value specifies the base CRL revision number to encode within
- a Delta CRL indicator extension, otherwise the extension will not be added.`,
-				Default: -1,
-			},
-			nextUpdateParam: {
-				Type: framework.TypeString,
-				Description: `The amount of time the generated CRL should be
-valid; defaults to 72 hours.`,
-				Default: defaultCrlConfig.Expiry,
-			},
-			crlsParam: {
-				Type:        framework.TypeStringSlice,
-				Description: `A list of PEM encoded CRLs to combine, originally signed by the requested issuer.`,
-			},
-			formatParam: {
-				Type: framework.TypeString,
-				Description: `The format of the combined CRL, can be "pem" or "der". If "der", the value will be
-base64 encoded. Defaults to "pem".`,
-				Default: "pem",
-			},
-		},
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.UpdateOperation: &framework.PathOperation{
-				Callback: b.pathUpdateResignCrlsHandler,
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"crl": {
-								Type:        framework.TypeString,
-								Description: `CRL`,
-								Required:    true,
-							},
-						},
-					}},
-				},
-			},
-		},
-
-		HelpSynopsis: `Combine and sign with the provided issuer different CRLs`,
-		HelpDescription: `Provide two or more PEM encoded CRLs signed by the issuer,
- normally from separate Vault clusters to be combined and signed.`,
-	}
-}
-
-func pathSignRevocationList(b *backend) *framework.Path {
-	return &framework.Path{
-		Pattern: "issuer/" + framework.GenericNameRegex(issuerRefParam) + "/sign-revocation-list",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixPKIIssuer,
-			OperationVerb:   "sign",
-			OperationSuffix: "revocation-list",
-		},
-
-		Fields: map[string]*framework.FieldSchema{
-			issuerRefParam: {
-				Type: framework.TypeString,
-				Description: `Reference to a existing issuer; either "default"
-for the configured default issuer, an identifier or the name assigned
-to the issuer.`,
-				Default: defaultRef,
-			},
-			crlNumberParam: {
-				Type:        framework.TypeInt,
-				Description: `The sequence number to be written within the CRL Number extension.`,
-			},
-			deltaCrlBaseNumberParam: {
-				Type: framework.TypeInt,
-				Description: `Using a zero or greater value specifies the base CRL revision number to encode within
- a Delta CRL indicator extension, otherwise the extension will not be added.`,
-				Default: -1,
-			},
-			nextUpdateParam: {
-				Type: framework.TypeString,
-				Description: `The amount of time the generated CRL should be
-valid; defaults to 72 hours.`,
-				Default: defaultCrlConfig.Expiry,
-			},
-			formatParam: {
-				Type: framework.TypeString,
-				Description: `The format of the combined CRL, can be "pem" or "der". If "der", the value will be
-base64 encoded. Defaults to "pem".`,
-				Default: "pem",
-			},
-			"revoked_certs": {
-				Type: framework.TypeSlice,
-				Description: `A list of maps containing the keys serial_number (string), revocation_time (string), 
-and extensions (map with keys id (string), critical (bool), value (string))`,
-			},
-			"extensions": {
-				Type: framework.TypeSlice,
-				Description: `A list of maps containing extensions with keys id (string), critical (bool), 
-value (string)`,
-			},
-		},
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.UpdateOperation: &framework.PathOperation{
-				Callback: b.pathUpdateSignRevocationListHandler,
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"crl": {
-								Type:        framework.TypeString,
-								Description: `CRL`,
-								Required:    true,
-							},
-						},
-					}},
-				},
-			},
-		},
-
-		HelpSynopsis: `Generate and sign a CRL based on the provided parameters.`,
-		HelpDescription: `Given a list of revoked certificates and other parameters, 
-return a signed CRL based on the parameter values.`,
-	}
-}
-
-func (b *backend) pathUpdateResignCrlsHandler(ctx context.Context, request *logical.Request, data *framework.FieldData) (*logical.Response, error) {
-	if b.useLegacyBundleCaStorage() {
-		return logical.ErrorResponse("This API cannot be used until the migration has completed"), nil
-	}
-
-	issuerRef := getIssuerRef(data)
-	crlNumber := data.Get(crlNumberParam).(int)
-	deltaCrlBaseNumber := data.Get(deltaCrlBaseNumberParam).(int)
-	nextUpdateStr := data.Get(nextUpdateParam).(string)
-	rawCrls := data.Get(crlsParam).([]string)
-
-	format, err := parseCrlFormat(data.Get(formatParam).(string))
-	if err != nil {
-		return logical.ErrorResponse(err.Error()), nil
-	}
-
-	nextUpdateOffset, err := parseutil.ParseDurationSecond(nextUpdateStr)
-	if err != nil {
-		return logical.ErrorResponse("invalid value for %s: %v", nextUpdateParam, err), nil
-	}
-
-	if nextUpdateOffset <= 0 {
-		return logical.ErrorResponse("%s parameter must be greater than 0", nextUpdateParam), nil
-	}
-
-	if crlNumber < 0 {
-		return logical.ErrorResponse("%s parameter must be 0 or greater", crlNumberParam), nil
-	}
-	if deltaCrlBaseNumber < -1 {
-		return logical.ErrorResponse("%s parameter must be -1 or greater", deltaCrlBaseNumberParam), nil
-	}
-
-	if issuerRef == "" {
-		return logical.ErrorResponse("%s parameter cannot be blank", issuerRefParam), nil
-	}
-
-	providedCrls, err := decodePemCrls(rawCrls)
-	if err != nil {
-		return logical.ErrorResponse(err.Error()), nil
-	}
-
-	sc := b.makeStorageContext(ctx, request.Storage)
-	caBundle, err := getCaBundle(sc, issuerRef)
-	if err != nil {
-		return logical.ErrorResponse(err.Error()), nil
-	}
-
-	if err := verifyCrlsAreFromIssuersKey(caBundle.Certificate, providedCrls); err != nil {
-		return logical.ErrorResponse(err.Error()), nil
-	}
-
-	revokedCerts, warnings, err := getAllRevokedCertsFromPem(providedCrls)
-	if err != nil {
-		return logical.ErrorResponse(err.Error()), nil
-	}
-
-	now := time.Now()
-	template := &x509.RevocationList{
-		SignatureAlgorithm:  caBundle.RevocationSigAlg,
-		RevokedCertificates: revokedCerts,
-		Number:              big.NewInt(int64(crlNumber)),
-		ThisUpdate:          now,
-		NextUpdate:          now.Add(nextUpdateOffset),
-	}
-
-	if deltaCrlBaseNumber > -1 {
-		ext, err := certutil.CreateDeltaCRLIndicatorExt(int64(deltaCrlBaseNumber))
-		if err != nil {
-			return nil, fmt.Errorf("could not create crl delta indicator extension: %v", err)
-		}
-		template.ExtraExtensions = []pkix.Extension{ext}
-	}
-
-	crlBytes, err := x509.CreateRevocationList(rand.Reader, template, caBundle.Certificate, caBundle.PrivateKey)
-	if err != nil {
-		return nil, fmt.Errorf("error creating new CRL: %w", err)
-	}
-
-	body := encodeResponse(crlBytes, format == "der")
-
-	return &logical.Response{
-		Warnings: warnings,
-		Data: map[string]interface{}{
-			"crl": body,
-		},
-	}, nil
-}
-
-func (b *backend) pathUpdateSignRevocationListHandler(ctx context.Context, request *logical.Request, data *framework.FieldData) (*logical.Response, error) {
-	if b.useLegacyBundleCaStorage() {
-		return logical.ErrorResponse("This API cannot be used until the migration has completed"), nil
-	}
-
-	issuerRef := getIssuerRef(data)
-	crlNumber := data.Get(crlNumberParam).(int)
-	deltaCrlBaseNumber := data.Get(deltaCrlBaseNumberParam).(int)
-	nextUpdateStr := data.Get(nextUpdateParam).(string)
-	nextUpdateOffset, err := parseutil.ParseDurationSecond(nextUpdateStr)
-	if err != nil {
-		return logical.ErrorResponse("invalid value for %s: %v", nextUpdateParam, err), nil
-	}
-
-	if nextUpdateOffset <= 0 {
-		return logical.ErrorResponse("%s parameter must be greater than 0", nextUpdateParam), nil
-	}
-
-	if crlNumber < 0 {
-		return logical.ErrorResponse("%s parameter must be 0 or greater", crlNumberParam), nil
-	}
-	if deltaCrlBaseNumber < -1 {
-		return logical.ErrorResponse("%s parameter must be -1 or greater", deltaCrlBaseNumberParam), nil
-	}
-
-	if issuerRef == "" {
-		return logical.ErrorResponse("%s parameter cannot be blank", issuerRefParam), nil
-	}
-
-	format, err := parseCrlFormat(data.Get(formatParam).(string))
-	if err != nil {
-		return logical.ErrorResponse(err.Error()), nil
-	}
-
-	revokedCerts, err := parseRevokedCertsParam(data.Get("revoked_certs").([]interface{}))
-	if err != nil {
-		return logical.ErrorResponse(err.Error()), nil
-	}
-
-	crlExtensions, err := parseExtensionsParam(data.Get("extensions").([]interface{}))
-	if err != nil {
-		return logical.ErrorResponse(err.Error()), nil
-	}
-
-	sc := b.makeStorageContext(ctx, request.Storage)
-	caBundle, err := getCaBundle(sc, issuerRef)
-	if err != nil {
-		return logical.ErrorResponse(err.Error()), nil
-	}
-
-	if deltaCrlBaseNumber > -1 {
-		ext, err := certutil.CreateDeltaCRLIndicatorExt(int64(deltaCrlBaseNumber))
-		if err != nil {
-			return nil, fmt.Errorf("could not create crl delta indicator extension: %v", err)
-		}
-		crlExtensions = append(crlExtensions, ext)
-	}
-
-	now := time.Now()
-	template := &x509.RevocationList{
-		SignatureAlgorithm:  caBundle.RevocationSigAlg,
-		RevokedCertificates: revokedCerts,
-		Number:              big.NewInt(int64(crlNumber)),
-		ThisUpdate:          now,
-		NextUpdate:          now.Add(nextUpdateOffset),
-		ExtraExtensions:     crlExtensions,
-	}
-
-	crlBytes, err := x509.CreateRevocationList(rand.Reader, template, caBundle.Certificate, caBundle.PrivateKey)
-	if err != nil {
-		return nil, fmt.Errorf("error creating new CRL: %w", err)
-	}
-
-	body := encodeResponse(crlBytes, format == "der")
-
-	return &logical.Response{
-		Data: map[string]interface{}{
-			"crl": body,
-		},
-	}, nil
-}
-
-func parseRevokedCertsParam(revokedCerts []interface{}) ([]pkix.RevokedCertificate, error) {
-	var parsedCerts []pkix.RevokedCertificate
-	seenSerials := make(map[*big.Int]int)
-	for i, entry := range revokedCerts {
-		if revokedCert, ok := entry.(map[string]interface{}); ok {
-			serialNum, err := parseSerialNum(revokedCert)
-			if err != nil {
-				return nil, fmt.Errorf("failed parsing serial_number from entry %d: %w", i, err)
-			}
-
-			if origEntry, exists := seenSerials[serialNum]; exists {
-				serialNumStr := revokedCert["serial_number"]
-				return nil, fmt.Errorf("duplicate serial number: %s, original entry %d and %d", serialNumStr, origEntry, i)
-			}
-
-			seenSerials[serialNum] = i
-
-			revocationTime, err := parseRevocationTime(revokedCert)
-			if err != nil {
-				return nil, fmt.Errorf("failed parsing revocation_time from entry %d: %w", i, err)
-			}
-
-			extensions, err := parseCertExtensions(revokedCert)
-			if err != nil {
-				return nil, fmt.Errorf("failed parsing extensions from entry %d: %w", i, err)
-			}
-
-			parsedCerts = append(parsedCerts, pkix.RevokedCertificate{
-				SerialNumber:   serialNum,
-				RevocationTime: revocationTime,
-				Extensions:     extensions,
-			})
-		}
-	}
-
-	return parsedCerts, nil
-}
-
-func parseCertExtensions(cert map[string]interface{}) ([]pkix.Extension, error) {
-	extRaw, exists := cert["extensions"]
-	if !exists || extRaw == nil || extRaw == "" {
-		// We don't require extensions to be populated
-		return []pkix.Extension{}, nil
-	}
-
-	extListRaw, ok := extRaw.([]interface{})
-	if !ok {
-		return nil, errors.New("'extensions' field did not contain a slice")
-	}
-
-	return parseExtensionsParam(extListRaw)
-}
-
-func parseExtensionsParam(extRawList []interface{}) ([]pkix.Extension, error) {
-	var extensions []pkix.Extension
-	seenOid := make(map[string]struct{})
-	for i, entryRaw := range extRawList {
-		entry, ok := entryRaw.(map[string]interface{})
-		if !ok {
-			return nil, fmt.Errorf("extension entry %d not a map", i)
-		}
-		extension, err := parseExtension(entry)
-		if err != nil {
-			return nil, fmt.Errorf("failed parsing extension entry %d: %w", i, err)
-		}
-
-		parsedIdStr := extension.Id.String()
-		if _, exists := seenOid[parsedIdStr]; exists {
-			return nil, fmt.Errorf("duplicate extension id: %s", parsedIdStr)
-		}
-
-		seenOid[parsedIdStr] = struct{}{}
-
-		extensions = append(extensions, extension)
-	}
-
-	return extensions, nil
-}
-
-func parseExtension(entry map[string]interface{}) (pkix.Extension, error) {
-	asnObjectId, err := parseExtAsn1ObjectId(entry)
-	if err != nil {
-		return pkix.Extension{}, err
-	}
-
-	if asnObjectId.Equal(akOid) {
-		return pkix.Extension{}, fmt.Errorf("authority key object identifier (%s) is reserved", akOid.String())
-	}
-
-	if asnObjectId.Equal(crlNumOid) {
-		return pkix.Extension{}, fmt.Errorf("crl number object identifier (%s) is reserved", crlNumOid.String())
-	}
-
-	if asnObjectId.Equal(deltaCrlOid) {
-		return pkix.Extension{}, fmt.Errorf("delta crl object identifier (%s) is reserved", deltaCrlOid.String())
-	}
-
-	critical, err := parseExtCritical(entry)
-	if err != nil {
-		return pkix.Extension{}, err
-	}
-
-	extVal, err := parseExtValue(entry)
-	if err != nil {
-		return pkix.Extension{}, err
-	}
-
-	return pkix.Extension{
-		Id:       asnObjectId,
-		Critical: critical,
-		Value:    extVal,
-	}, nil
-}
-
-func parseExtValue(entry map[string]interface{}) ([]byte, error) {
-	valRaw, exists := entry["value"]
-	if !exists {
-		return nil, errors.New("missing 'value' field")
-	}
-
-	valStr, err := parseutil.ParseString(valRaw)
-	if err != nil {
-		return nil, fmt.Errorf("'value' field value was not a string: %w", err)
-	}
-
-	if len(valStr) == 0 {
-		return []byte{}, nil
-	}
-
-	decodeString, err := base64.StdEncoding.DecodeString(valStr)
-	if err != nil {
-		return nil, fmt.Errorf("failed base64 decoding 'value' field: %w", err)
-	}
-	return decodeString, nil
-}
-
-func parseExtCritical(entry map[string]interface{}) (bool, error) {
-	critRaw, exists := entry["critical"]
-	if !exists || critRaw == nil || critRaw == "" {
-		// Optional field, so just return as if they provided the value false.
-		return false, nil
-	}
-
-	myBool, err := parseutil.ParseBool(critRaw)
-	if err != nil {
-		return false, fmt.Errorf("critical field value failed to be parsed: %w", err)
-	}
-
-	return myBool, nil
-}
-
-func parseExtAsn1ObjectId(entry map[string]interface{}) (asn1.ObjectIdentifier, error) {
-	idRaw, idExists := entry["id"]
-	if !idExists {
-		return asn1.ObjectIdentifier{}, errors.New("missing id field")
-	}
-
-	oidStr, err := parseutil.ParseString(idRaw)
-	if err != nil {
-		return nil, fmt.Errorf("'id' field value was not a string: %w", err)
-	}
-
-	if len(oidStr) == 0 {
-		return asn1.ObjectIdentifier{}, errors.New("zero length object identifier")
-	}
-
-	// Parse out dot notation
-	oidParts := strings.Split(oidStr, ".")
-	oid := make(asn1.ObjectIdentifier, len(oidParts), len(oidParts))
-	for i := range oidParts {
-		oidIntVal, err := strconv.Atoi(oidParts[i])
-		if err != nil {
-			return nil, fmt.Errorf("failed parsing asn1 index element %d value %s: %w", i, oidParts[i], err)
-		}
-		oid[i] = oidIntVal
-	}
-	return oid, nil
-}
-
-func parseRevocationTime(cert map[string]interface{}) (time.Time, error) {
-	var revTime time.Time
-	revTimeRaw, exists := cert["revocation_time"]
-	if !exists {
-		return revTime, errors.New("missing 'revocation_time' field")
-	}
-	revTime, err := parseutil.ParseAbsoluteTime(revTimeRaw)
-	if err != nil {
-		return revTime, fmt.Errorf("failed parsing time %v: %w", revTimeRaw, err)
-	}
-	return revTime, nil
-}
-
-func parseSerialNum(cert map[string]interface{}) (*big.Int, error) {
-	serialNumRaw, serialExists := cert["serial_number"]
-	if !serialExists {
-		return nil, errors.New("missing 'serial_number' field")
-	}
-	serialNumStr, err := parseutil.ParseString(serialNumRaw)
-	if err != nil {
-		return nil, fmt.Errorf("'serial_number' field value was not a string: %w", err)
-	}
-	// Clean up any provided serials to decoder
-	for _, separator := range []string{":", ".", "-", " "} {
-		serialNumStr = strings.ReplaceAll(serialNumStr, separator, "")
-	}
-	// Prefer hex.DecodeString over certutil.ParseHexFormatted as we don't need a separator
-	serialBytes, err := hex.DecodeString(serialNumStr)
-	if err != nil {
-		return nil, fmt.Errorf("'serial_number' failed converting to bytes: %w", err)
-	}
-
-	bigIntSerial := big.Int{}
-	bigIntSerial.SetBytes(serialBytes)
-	return &bigIntSerial, nil
-}
-
-func parseCrlFormat(requestedValue string) (string, error) {
-	format := strings.ToLower(requestedValue)
-	switch format {
-	case "pem", "der":
-		return format, nil
-	default:
-		return "", fmt.Errorf("unknown format value of %s", requestedValue)
-	}
-}
-
-func verifyCrlsAreFromIssuersKey(caCert *x509.Certificate, crls []*x509.RevocationList) error {
-	for i, crl := range crls {
-		// At this point we assume if the issuer's key signed the CRL that is a good enough check
-		// to validate that we owned/generated the provided CRL.
-		if err := crl.CheckSignatureFrom(caCert); err != nil {
-			return fmt.Errorf("CRL index: %d was not signed by requested issuer", i)
-		}
-	}
-
-	return nil
-}
-
-func encodeResponse(crlBytes []byte, derFormatRequested bool) string {
-	if derFormatRequested {
-		return base64.StdEncoding.EncodeToString(crlBytes)
-	}
-
-	block := pem.Block{
-		Type:  "X509 CRL",
-		Bytes: crlBytes,
-	}
-	return string(pem.EncodeToMemory(&block))
-}
-
-func getAllRevokedCertsFromPem(crls []*x509.RevocationList) ([]pkix.RevokedCertificate, []string, error) {
-	uniqueCert := map[string]pkix.RevokedCertificate{}
-	var warnings []string
-	for _, crl := range crls {
-		for _, curCert := range crl.RevokedCertificates {
-			serial := serialFromBigInt(curCert.SerialNumber)
-			// Get rid of any extensions the existing certificate might have had.
-			curCert.Extensions = []pkix.Extension{}
-
-			existingCert, exists := uniqueCert[serial]
-			if !exists {
-				// First time we see the revoked cert
-				uniqueCert[serial] = curCert
-				continue
-			}
-
-			if existingCert.RevocationTime.Equal(curCert.RevocationTime) {
-				// Same revocation times, just skip it
-				continue
-			}
-
-			warn := fmt.Sprintf("Duplicate serial %s with different revocation "+
-				"times detected, using oldest revocation time", serial)
-			warnings = append(warnings, warn)
-
-			if existingCert.RevocationTime.After(curCert.RevocationTime) {
-				uniqueCert[serial] = curCert
-			}
-		}
-	}
-
-	var revokedCerts []pkix.RevokedCertificate
-	for _, cert := range uniqueCert {
-		revokedCerts = append(revokedCerts, cert)
-	}
-
-	return revokedCerts, warnings, nil
-}
-
-func getCaBundle(sc *storageContext, issuerRef string) (*certutil.CAInfoBundle, error) {
-	issuerId, err := sc.resolveIssuerReference(issuerRef)
-	if err != nil {
-		return nil, fmt.Errorf("failed to resolve issuer %s: %w", issuerRefParam, err)
-	}
-
-	return sc.fetchCAInfoByIssuerId(issuerId, CRLSigningUsage)
-}
-
-func decodePemCrls(rawCrls []string) ([]*x509.RevocationList, error) {
-	var crls []*x509.RevocationList
-	for i, rawCrl := range rawCrls {
-		crl, err := decodePemCrl(rawCrl)
-		if err != nil {
-			return nil, fmt.Errorf("failed decoding crl %d: %w", i, err)
-		}
-		crls = append(crls, crl)
-	}
-
-	return crls, nil
-}
-
-func decodePemCrl(crl string) (*x509.RevocationList, error) {
-	block, rest := pem.Decode([]byte(crl))
-	if len(rest) != 0 {
-		return nil, errors.New("invalid crl; should be one PEM block only")
-	}
-
-	return x509.ParseRevocationList(block.Bytes)
-}
diff --git a/builtin/logical/pki/path_resign_crls_test.go b/builtin/logical/pki/path_resign_crls_test.go
deleted file mode 100644
index f1ee1152c041a..0000000000000
--- a/builtin/logical/pki/path_resign_crls_test.go
+++ /dev/null
@@ -1,512 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package pki
-
-import (
-	"crypto/x509"
-	"crypto/x509/pkix"
-	"encoding/asn1"
-	"encoding/base64"
-	"fmt"
-	"math/big"
-	"testing"
-	"time"
-
-	"github.com/hashicorp/vault/sdk/helper/testhelpers/schema"
-
-	"github.com/hashicorp/vault/api"
-	vaulthttp "github.com/hashicorp/vault/http"
-	"github.com/hashicorp/vault/vault"
-
-	"github.com/hashicorp/vault/sdk/logical"
-	"github.com/stretchr/testify/require"
-)
-
-func TestResignCrls_ForbidSigningOtherIssuerCRL(t *testing.T) {
-	t.Parallel()
-
-	// Some random CRL from another issuer
-	pem1 := "-----BEGIN X509 CRL-----\nMIIBvjCBpwIBATANBgkqhkiG9w0BAQsFADAbMRkwFwYDVQQDExByb290LWV4YW1w\nbGUuY29tFw0yMjEwMjYyMTI5MzlaFw0yMjEwMjkyMTI5MzlaMCcwJQIUSnVf8wsd\nHjOt9drCYFhWxS9QqGoXDTIyMTAyNjIxMjkzOVqgLzAtMB8GA1UdIwQYMBaAFHki\nZ0XDUQVSajNRGXrg66OaIFlYMAoGA1UdFAQDAgEDMA0GCSqGSIb3DQEBCwUAA4IB\nAQBGIdtqTwemnLZF5AoP+jzvKZ26S3y7qvRIzd7f4A0EawzYmWXSXfwqo4TQ4DG3\nnvT+AaA1zCCOlH/1U+ufN9gSSN0j9ax58brSYMnMskMCqhLKIp0qnvS4jr/gopmF\nv8grbvLHEqNYTu1T7umMLdNQUsWT3Qc+EIjfoKj8xD2FHsZwJ+EMbytwl8Unipjr\nhz4rmcES/65vavfdFpOI6YXfi+UAaHBdkTqmHgg4BdpuXfYtlf+iotFSOkygD5fl\n0D+RVFW9uJv2WfbQ7kRt1X/VcFk/onw0AQqxZRVUzvjoMw+EMcxSq3UKOlXcWDxm\nEFz9rFQQ66L388EP8RD7Dh3X\n-----END X509 CRL-----"
-
-	b, s := CreateBackendWithStorage(t)
-	resp, err := CBWrite(b, s, "root/generate/internal", map[string]interface{}{
-		"common_name": "test.com",
-		"key_type":    "ec",
-	})
-	requireSuccessNonNilResponse(t, resp, err)
-
-	resp, err = CBWrite(b, s, "issuer/default/resign-crls", map[string]interface{}{
-		"crl_number":  "2",
-		"next_update": "1h",
-		"format":      "pem",
-		"crls":        []string{pem1},
-	})
-	require.ErrorContains(t, err, "was not signed by requested issuer")
-}
-
-func TestResignCrls_NormalCrl(t *testing.T) {
-	t.Parallel()
-	b1, s1 := CreateBackendWithStorage(t)
-	b2, s2 := CreateBackendWithStorage(t)
-
-	// Setup two backends, with the same key material/certificate with a different leaf in each that is revoked.
-	caCert, serial1, serial2, crl1, crl2 := setupResignCrlMounts(t, b1, s1, b2, s2)
-
-	// Attempt to combine the CRLs
-	resp, err := CBWrite(b1, s1, "issuer/default/resign-crls", map[string]interface{}{
-		"crl_number":  "2",
-		"next_update": "1h",
-		"format":      "pem",
-		"crls":        []string{crl1, crl2},
-	})
-	schema.ValidateResponse(t, schema.GetResponseSchema(t, b1.Route("issuer/default/resign-crls"), logical.UpdateOperation), resp, true)
-	requireSuccessNonNilResponse(t, resp, err)
-	requireFieldsSetInResp(t, resp, "crl")
-	pemCrl := resp.Data["crl"].(string)
-	combinedCrl, err := decodePemCrl(pemCrl)
-	require.NoError(t, err, "failed decoding combined CRL")
-	serials := extractSerialsFromCrl(t, combinedCrl)
-
-	require.Contains(t, serials, serial1)
-	require.Contains(t, serials, serial2)
-	require.Equal(t, 2, len(serials), "serials contained more serials than expected")
-
-	require.Equal(t, big.NewInt(int64(2)), combinedCrl.Number)
-	require.Equal(t, combinedCrl.ThisUpdate.Add(1*time.Hour), combinedCrl.NextUpdate)
-
-	extensions := combinedCrl.Extensions
-	requireExtensionOid(t, []int{2, 5, 29, 20}, extensions) // CRL Number Extension
-	requireExtensionOid(t, []int{2, 5, 29, 35}, extensions) // akidOid
-	require.Equal(t, 2, len(extensions))
-
-	err = combinedCrl.CheckSignatureFrom(caCert)
-	require.NoError(t, err, "failed signature check of CRL")
-}
-
-func TestResignCrls_EliminateDuplicates(t *testing.T) {
-	t.Parallel()
-	b1, s1 := CreateBackendWithStorage(t)
-	b2, s2 := CreateBackendWithStorage(t)
-
-	// Setup two backends, with the same key material/certificate with a different leaf in each that is revoked.
-	_, serial1, _, crl1, _ := setupResignCrlMounts(t, b1, s1, b2, s2)
-
-	// Pass in the same CRLs to make sure we do not duplicate entries
-	resp, err := CBWrite(b1, s1, "issuer/default/resign-crls", map[string]interface{}{
-		"crl_number":  "2",
-		"next_update": "1h",
-		"format":      "pem",
-		"crls":        []string{crl1, crl1},
-	})
-	requireSuccessNonNilResponse(t, resp, err)
-	requireFieldsSetInResp(t, resp, "crl")
-	pemCrl := resp.Data["crl"].(string)
-	combinedCrl, err := decodePemCrl(pemCrl)
-	require.NoError(t, err, "failed decoding combined CRL")
-
-	// Technically this will die if we have duplicates.
-	serials := extractSerialsFromCrl(t, combinedCrl)
-
-	// We should have no warnings about collisions if they have the same revoked time
-	require.Empty(t, resp.Warnings, "expected no warnings in response")
-
-	require.Contains(t, serials, serial1)
-	require.Equal(t, 1, len(serials), "serials contained more serials than expected")
-}
-
-func TestResignCrls_ConflictingExpiry(t *testing.T) {
-	t.Parallel()
-	b1, s1 := CreateBackendWithStorage(t)
-	b2, s2 := CreateBackendWithStorage(t)
-
-	// Setup two backends, with the same key material/certificate with a different leaf in each that is revoked.
-	_, serial1, serial2, crl1, _ := setupResignCrlMounts(t, b1, s1, b2, s2)
-
-	timeAfterMountSetup := time.Now()
-
-	// Read in serial1 from mount 1
-	resp, err := CBRead(b1, s1, "cert/"+serial1)
-	requireSuccessNonNilResponse(t, resp, err, "failed reading serial 1's certificate")
-	requireFieldsSetInResp(t, resp, "certificate")
-	cert1 := resp.Data["certificate"].(string)
-
-	// Wait until at least we have rolled over to the next second to match sure the generated CRL time
-	// on backend 2 for the serial 1 will be different
-	for {
-		if time.Now().After(timeAfterMountSetup.Add(1 * time.Second)) {
-			break
-		}
-	}
-
-	// Use BYOC to revoke the same certificate on backend 2 now
-	resp, err = CBWrite(b2, s2, "revoke", map[string]interface{}{
-		"certificate": cert1,
-	})
-	requireSuccessNonNilResponse(t, resp, err, "failed revoking serial 1 on backend 2")
-
-	// Fetch the new CRL from backend2 now
-	resp, err = CBRead(b2, s2, "cert/crl")
-	requireSuccessNonNilResponse(t, resp, err, "error fetch crl from backend 2")
-	requireFieldsSetInResp(t, resp, "certificate")
-	crl2 := resp.Data["certificate"].(string)
-
-	// Attempt to combine the CRLs
-	resp, err = CBWrite(b1, s1, "issuer/default/resign-crls", map[string]interface{}{
-		"crl_number":  "2",
-		"next_update": "1h",
-		"format":      "pem",
-		"crls":        []string{crl2, crl1}, // Make sure we don't just grab the first colliding entry...
-	})
-	requireSuccessNonNilResponse(t, resp, err)
-	requireFieldsSetInResp(t, resp, "crl")
-	pemCrl := resp.Data["crl"].(string)
-	combinedCrl, err := decodePemCrl(pemCrl)
-	require.NoError(t, err, "failed decoding combined CRL")
-	combinedSerials := extractSerialsFromCrl(t, combinedCrl)
-
-	require.Contains(t, combinedSerials, serial1)
-	require.Contains(t, combinedSerials, serial2)
-	require.Equal(t, 2, len(combinedSerials), "serials contained more serials than expected")
-
-	// Make sure we issued a warning about the time collision
-	require.NotEmpty(t, resp.Warnings, "expected at least one warning")
-	require.Contains(t, resp.Warnings[0], "different revocation times detected")
-
-	// Make sure we have the initial revocation time from backend 1 within the combined CRL.
-	decodedCrl1, err := decodePemCrl(crl1)
-	require.NoError(t, err, "failed decoding crl from backend 1")
-	serialsFromBackend1 := extractSerialsFromCrl(t, decodedCrl1)
-
-	require.Equal(t, serialsFromBackend1[serial1], combinedSerials[serial1])
-
-	// Make sure we have the initial revocation time from backend 1 does not match with backend 2's time
-	decodedCrl2, err := decodePemCrl(crl2)
-	require.NoError(t, err, "failed decoding crl from backend 2")
-	serialsFromBackend2 := extractSerialsFromCrl(t, decodedCrl2)
-
-	require.NotEqual(t, serialsFromBackend1[serial1], serialsFromBackend2[serial1])
-}
-
-func TestResignCrls_DeltaCrl(t *testing.T) {
-	t.Parallel()
-
-	b1, s1 := CreateBackendWithStorage(t)
-	b2, s2 := CreateBackendWithStorage(t)
-
-	// Setup two backends, with the same key material/certificate with a different leaf in each that is revoked.
-	caCert, serial1, serial2, crl1, crl2 := setupResignCrlMounts(t, b1, s1, b2, s2)
-
-	resp, err := CBWrite(b1, s1, "issuer/default/resign-crls", map[string]interface{}{
-		"crl_number":            "5",
-		"delta_crl_base_number": "4",
-		"next_update":           "12h",
-		"format":                "pem",
-		"crls":                  []string{crl1, crl2},
-	})
-	requireSuccessNonNilResponse(t, resp, err)
-	requireFieldsSetInResp(t, resp, "crl")
-	pemCrl := resp.Data["crl"].(string)
-	combinedCrl, err := decodePemCrl(pemCrl)
-	require.NoError(t, err, "failed decoding combined CRL")
-	serials := extractSerialsFromCrl(t, combinedCrl)
-
-	require.Contains(t, serials, serial1)
-	require.Contains(t, serials, serial2)
-	require.Equal(t, 2, len(serials), "serials contained more serials than expected")
-
-	require.Equal(t, big.NewInt(int64(5)), combinedCrl.Number)
-	require.Equal(t, combinedCrl.ThisUpdate.Add(12*time.Hour), combinedCrl.NextUpdate)
-
-	extensions := combinedCrl.Extensions
-	requireExtensionOid(t, []int{2, 5, 29, 27}, extensions) // Delta CRL Extension
-	requireExtensionOid(t, []int{2, 5, 29, 20}, extensions) // CRL Number Extension
-	requireExtensionOid(t, []int{2, 5, 29, 35}, extensions) // akidOid
-	require.Equal(t, 3, len(extensions))
-
-	err = combinedCrl.CheckSignatureFrom(caCert)
-	require.NoError(t, err, "failed signature check of CRL")
-}
-
-func TestSignRevocationList(t *testing.T) {
-	t.Parallel()
-
-	coreConfig := &vault.CoreConfig{
-		LogicalBackends: map[string]logical.Factory{
-			"pki": Factory,
-		},
-	}
-	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
-		HandlerFunc: vaulthttp.Handler,
-	})
-	cluster.Start()
-	defer cluster.Cleanup()
-	client := cluster.Cores[0].Client
-
-	// Mount PKI, use this form of backend so our request is closer to reality (json parsed)
-	err := client.Sys().Mount("pki", &api.MountInput{
-		Type: "pki",
-		Config: api.MountConfigInput{
-			DefaultLeaseTTL: "16h",
-			MaxLeaseTTL:     "60h",
-		},
-	})
-	require.NoError(t, err)
-
-	// Generate internal CA.
-	resp, err := client.Logical().Write("pki/root/generate/internal", map[string]interface{}{
-		"ttl":         "40h",
-		"common_name": "myvault.com",
-	})
-	require.NoError(t, err)
-	caCert := parseCert(t, resp.Data["certificate"].(string))
-
-	resp, err = client.Logical().Write("pki/issuer/default/sign-revocation-list", map[string]interface{}{
-		"crl_number":  "1",
-		"next_update": "12h",
-		"format":      "pem",
-		"revoked_certs": []map[string]interface{}{
-			{
-				"serial_number":   "37:60:16:e4:85:d5:96:38:3a:ed:31:06:8d:ed:7a:46:d4:22:63:d8",
-				"revocation_time": "1668614976",
-				"extensions":      []map[string]interface{}{},
-			},
-			{
-				"serial_number":   "27:03:89:76:5a:d4:d8:19:48:47:ca:96:db:6f:27:86:31:92:9f:82",
-				"revocation_time": "2022-11-16T16:09:36.739592Z",
-			},
-			{
-				"serial_number":   "27:03:89:76:5a:d4:d8:19:48:47:ca:96:db:6f:27:86:31:92:9f:81",
-				"revocation_time": "2022-10-16T16:09:36.739592Z",
-				"extensions": []map[string]interface{}{
-					{
-						"id":       "2.5.29.100",
-						"critical": "true",
-						"value":    "aGVsbG8=", // "hello" base64 encoded
-					},
-					{
-						"id":       "2.5.29.101",
-						"critical": "false",
-						"value":    "Ynll", // "bye" base64 encoded
-					},
-				},
-			},
-		},
-		"extensions": []map[string]interface{}{
-			{
-				"id":       "2.5.29.200",
-				"critical": "true",
-				"value":    "aGVsbG8=", // "hello" base64 encoded
-			},
-			{
-				"id":       "2.5.29.201",
-				"critical": "false",
-				"value":    "Ynll", // "bye" base64 encoded
-			},
-		},
-	})
-	require.NoError(t, err)
-	pemCrl := resp.Data["crl"].(string)
-	crl, err := decodePemCrl(pemCrl)
-	require.NoError(t, err, "failed decoding CRL")
-	serials := extractSerialsFromCrl(t, crl)
-	require.Contains(t, serials, "37:60:16:e4:85:d5:96:38:3a:ed:31:06:8d:ed:7a:46:d4:22:63:d8")
-	require.Contains(t, serials, "27:03:89:76:5a:d4:d8:19:48:47:ca:96:db:6f:27:86:31:92:9f:82")
-	require.Contains(t, serials, "27:03:89:76:5a:d4:d8:19:48:47:ca:96:db:6f:27:86:31:92:9f:81")
-	require.Equal(t, 3, len(serials), "expected 3 serials within CRL")
-
-	// Make sure extensions on serials match what we expect.
-	require.Equal(t, 0, len(crl.RevokedCertificates[0].Extensions), "Expected no extensions on 1st serial")
-	require.Equal(t, 0, len(crl.RevokedCertificates[1].Extensions), "Expected no extensions on 2nd serial")
-	require.Equal(t, 2, len(crl.RevokedCertificates[2].Extensions), "Expected 2 extensions on 3 serial")
-	require.Equal(t, "2.5.29.100", crl.RevokedCertificates[2].Extensions[0].Id.String())
-	require.True(t, crl.RevokedCertificates[2].Extensions[0].Critical)
-	require.Equal(t, []byte("hello"), crl.RevokedCertificates[2].Extensions[0].Value)
-
-	require.Equal(t, "2.5.29.101", crl.RevokedCertificates[2].Extensions[1].Id.String())
-	require.False(t, crl.RevokedCertificates[2].Extensions[1].Critical)
-	require.Equal(t, []byte("bye"), crl.RevokedCertificates[2].Extensions[1].Value)
-
-	// CRL Number and times
-	require.Equal(t, big.NewInt(int64(1)), crl.Number)
-	require.Equal(t, crl.ThisUpdate.Add(12*time.Hour), crl.NextUpdate)
-
-	// Verify top level extensions are present
-	extensions := crl.Extensions
-	requireExtensionOid(t, []int{2, 5, 29, 20}, extensions)  // CRL Number Extension
-	requireExtensionOid(t, []int{2, 5, 29, 35}, extensions)  // akidOid
-	requireExtensionOid(t, []int{2, 5, 29, 200}, extensions) // Added value from param
-	requireExtensionOid(t, []int{2, 5, 29, 201}, extensions) // Added value from param
-	require.Equal(t, 4, len(extensions))
-
-	// Signature
-	err = crl.CheckSignatureFrom(caCert)
-	require.NoError(t, err, "failed signature check of CRL")
-}
-
-func TestSignRevocationList_NoRevokedCerts(t *testing.T) {
-	t.Parallel()
-	b, s := CreateBackendWithStorage(t)
-	resp, err := CBWrite(b, s, "root/generate/internal", map[string]interface{}{
-		"common_name": "test.com",
-	})
-	requireSuccessNonNilResponse(t, resp, err)
-
-	resp, err = CBWrite(b, s, "issuer/default/sign-revocation-list", map[string]interface{}{
-		"crl_number":  "10000",
-		"next_update": "12h",
-		"format":      "pem",
-	})
-	schema.ValidateResponse(t, schema.GetResponseSchema(t, b.Route("issuer/default/sign-revocation-list"), logical.UpdateOperation), resp, true)
-	requireSuccessNonNilResponse(t, resp, err)
-	requireFieldsSetInResp(t, resp, "crl")
-	pemCrl := resp.Data["crl"].(string)
-	crl, err := decodePemCrl(pemCrl)
-	require.NoError(t, err, "failed decoding CRL")
-
-	serials := extractSerialsFromCrl(t, crl)
-	require.Equal(t, 0, len(serials), "no serials were expected in CRL")
-
-	require.Equal(t, big.NewInt(int64(10000)), crl.Number)
-	require.Equal(t, crl.ThisUpdate.Add(12*time.Hour), crl.NextUpdate)
-}
-
-func TestSignRevocationList_ReservedExtensions(t *testing.T) {
-	t.Parallel()
-
-	reservedOids := []asn1.ObjectIdentifier{
-		akOid, deltaCrlOid, crlNumOid,
-	}
-	// Validate there isn't copy/paste issues with our constants...
-	require.Equal(t, asn1.ObjectIdentifier{2, 5, 29, 27}, deltaCrlOid) // Delta CRL Extension
-	require.Equal(t, asn1.ObjectIdentifier{2, 5, 29, 20}, crlNumOid)   // CRL Number Extension
-	require.Equal(t, asn1.ObjectIdentifier{2, 5, 29, 35}, akOid)       // akidOid
-
-	for _, reservedOid := range reservedOids {
-		t.Run(reservedOid.String(), func(t *testing.T) {
-			b, s := CreateBackendWithStorage(t)
-			resp, err := CBWrite(b, s, "root/generate/internal", map[string]interface{}{
-				"common_name": "test.com",
-			})
-			requireSuccessNonNilResponse(t, resp, err)
-
-			resp, err = CBWrite(b, s, "issuer/default/sign-revocation-list", map[string]interface{}{
-				"crl_number":  "1",
-				"next_update": "12h",
-				"format":      "pem",
-				"extensions": []map[string]interface{}{
-					{
-						"id":       reservedOid.String(),
-						"critical": "false",
-						"value":    base64.StdEncoding.EncodeToString([]byte("hello")),
-					},
-				},
-			})
-
-			require.ErrorContains(t, err, "is reserved")
-		})
-	}
-}
-
-func setupResignCrlMounts(t *testing.T, b1 *backend, s1 logical.Storage, b2 *backend, s2 logical.Storage) (*x509.Certificate, string, string, string, string) {
-	t.Helper()
-
-	// Setup two mounts with the same CA/key material
-	resp, err := CBWrite(b1, s1, "root/generate/exported", map[string]interface{}{
-		"common_name": "test.com",
-	})
-	requireSuccessNonNilResponse(t, resp, err)
-	requireFieldsSetInResp(t, resp, "certificate", "private_key")
-	pemCaCert := resp.Data["certificate"].(string)
-	caCert := parseCert(t, pemCaCert)
-	privKey := resp.Data["private_key"].(string)
-
-	// Import the above key/cert into another mount
-	resp, err = CBWrite(b2, s2, "config/ca", map[string]interface{}{
-		"pem_bundle": pemCaCert + "\n" + privKey,
-	})
-	requireSuccessNonNilResponse(t, resp, err, "error setting up CA on backend 2")
-
-	// Create the same role in both mounts
-	resp, err = CBWrite(b1, s1, "roles/test", map[string]interface{}{
-		"allowed_domains":  "test.com",
-		"allow_subdomains": "true",
-		"max_ttl":          "1h",
-	})
-	requireSuccessNonNilResponse(t, resp, err, "error setting up pki role on backend 1")
-
-	resp, err = CBWrite(b2, s2, "roles/test", map[string]interface{}{
-		"allowed_domains":  "test.com",
-		"allow_subdomains": "true",
-		"max_ttl":          "1h",
-	})
-	requireSuccessNonNilResponse(t, resp, err, "error setting up pki role on backend 2")
-
-	// Issue and revoke a cert in backend 1
-	resp, err = CBWrite(b1, s1, "issue/test", map[string]interface{}{
-		"common_name": "test1.test.com",
-	})
-	requireSuccessNonNilResponse(t, resp, err, "error issuing cert from backend 1")
-	requireFieldsSetInResp(t, resp, "serial_number")
-	serial1 := resp.Data["serial_number"].(string)
-
-	resp, err = CBWrite(b1, s1, "revoke", map[string]interface{}{"serial_number": serial1})
-	requireSuccessNonNilResponse(t, resp, err, "error revoking cert from backend 2")
-
-	// Issue and revoke a cert in backend 2
-	resp, err = CBWrite(b2, s2, "issue/test", map[string]interface{}{
-		"common_name": "test1.test.com",
-	})
-	requireSuccessNonNilResponse(t, resp, err, "error issuing cert from backend 2")
-	requireFieldsSetInResp(t, resp, "serial_number")
-	serial2 := resp.Data["serial_number"].(string)
-
-	resp, err = CBWrite(b2, s2, "revoke", map[string]interface{}{"serial_number": serial2})
-	requireSuccessNonNilResponse(t, resp, err, "error revoking cert from backend 2")
-
-	// Fetch PEM CRLs from each
-	resp, err = CBRead(b1, s1, "cert/crl")
-	requireSuccessNonNilResponse(t, resp, err, "error fetch crl from backend 1")
-	requireFieldsSetInResp(t, resp, "certificate")
-	crl1 := resp.Data["certificate"].(string)
-
-	resp, err = CBRead(b2, s2, "cert/crl")
-	requireSuccessNonNilResponse(t, resp, err, "error fetch crl from backend 2")
-	requireFieldsSetInResp(t, resp, "certificate")
-	crl2 := resp.Data["certificate"].(string)
-	return caCert, serial1, serial2, crl1, crl2
-}
-
-func requireExtensionOid(t *testing.T, identifier asn1.ObjectIdentifier, extensions []pkix.Extension, msgAndArgs ...interface{}) {
-	t.Helper()
-
-	found := false
-	var oidsInExtensions []string
-	for _, extension := range extensions {
-		oidsInExtensions = append(oidsInExtensions, extension.Id.String())
-		if extension.Id.Equal(identifier) {
-			found = true
-			break
-		}
-	}
-
-	if !found {
-		msg := fmt.Sprintf("Failed to find matching asn oid %s out of %v", identifier.String(), oidsInExtensions)
-		require.Fail(t, msg, msgAndArgs)
-	}
-}
-
-func extractSerialsFromCrl(t *testing.T, crl *x509.RevocationList) map[string]time.Time {
-	t.Helper()
-
-	serials := map[string]time.Time{}
-
-	for _, revokedCert := range crl.RevokedCertificates {
-		serial := serialFromBigInt(revokedCert.SerialNumber)
-		if _, exists := serials[serial]; exists {
-			t.Fatalf("Serial number %s was duplicated in CRL", serial)
-		}
-		serials[serial] = revokedCert.RevocationTime
-	}
-	return serials
-}
diff --git a/builtin/logical/pki/path_revoke.go b/builtin/logical/pki/path_revoke.go
index 7aa23bc723052..d33c013caf9f3 100644
--- a/builtin/logical/pki/path_revoke.go
+++ b/builtin/logical/pki/path_revoke.go
@@ -1,11 +1,7 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pki
 
 import (
 	"context"
-	"crypto"
 	"crypto/ecdsa"
 	"crypto/ed25519"
 	"crypto/rsa"
@@ -13,79 +9,18 @@ import (
 	"crypto/x509"
 	"encoding/pem"
 	"fmt"
-	"net/http"
 	"strings"
-	"time"
-
-	"github.com/hashicorp/vault/sdk/helper/consts"
 
 	"github.com/hashicorp/vault/sdk/framework"
 	"github.com/hashicorp/vault/sdk/helper/certutil"
+	"github.com/hashicorp/vault/sdk/helper/consts"
 	"github.com/hashicorp/vault/sdk/helper/errutil"
 	"github.com/hashicorp/vault/sdk/logical"
 )
 
-func pathListCertsRevoked(b *backend) *framework.Path {
-	return &framework.Path{
-		Pattern: "certs/revoked/?$",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixPKI,
-			OperationSuffix: "revoked-certs",
-		},
-
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.ListOperation: &framework.PathOperation{
-				Callback: b.pathListRevokedCertsHandler,
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"keys": {
-								Type:        framework.TypeStringSlice,
-								Description: `List of Keys`,
-								Required:    false,
-							},
-						},
-					}},
-				},
-			},
-		},
-
-		HelpSynopsis:    pathListRevokedHelpSyn,
-		HelpDescription: pathListRevokedHelpDesc,
-	}
-}
-
-func pathListCertsRevocationQueue(b *backend) *framework.Path {
-	return &framework.Path{
-		Pattern: "certs/revocation-queue/?$",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixPKI,
-			OperationSuffix: "certs-revocation-queue",
-		},
-
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.ListOperation: &framework.PathOperation{
-				Callback: b.pathListRevocationQueueHandler,
-			},
-		},
-
-		HelpSynopsis:    pathListRevocationQueueHelpSyn,
-		HelpDescription: pathListRevocationQueueHelpDesc,
-	}
-}
-
 func pathRevoke(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: `revoke`,
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixPKI,
-			OperationVerb:   "revoke",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"serial_number": {
 				Type: framework.TypeString,
@@ -106,28 +41,6 @@ signed by an issuer in this mount.`,
 				// If this needs to write, the entire request will be forwarded to the
 				// active node of the current performance cluster, but we don't want to
 				// forward invalid revoke requests there.
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"revocation_time": {
-								Type:        framework.TypeDurationSecond,
-								Description: `Revocation Time`,
-								Required:    false,
-							},
-							"revocation_time_rfc3339": {
-								Type:        framework.TypeTime,
-								Description: `Revocation Time`,
-								Required:    false,
-							},
-							"state": {
-								Type:        framework.TypeString,
-								Description: `Revocation State`,
-								Required:    false,
-							},
-						},
-					}},
-				},
 			},
 		},
 
@@ -139,13 +52,6 @@ signed by an issuer in this mount.`,
 func pathRevokeWithKey(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: `revoke-with-key`,
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixPKI,
-			OperationVerb:   "revoke",
-			OperationSuffix: "with-key",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"serial_number": {
 				Type: framework.TypeString,
@@ -171,28 +77,6 @@ be in PEM format.`,
 				// If this needs to write, the entire request will be forwarded to the
 				// active node of the current performance cluster, but we don't want to
 				// forward invalid revoke requests there.
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"revocation_time": {
-								Type:        framework.TypeDurationSecond,
-								Description: `Revocation Time`,
-								Required:    false,
-							},
-							"revocation_time_rfc3339": {
-								Type:        framework.TypeTime,
-								Description: `Revocation Time`,
-								Required:    false,
-							},
-							"state": {
-								Type:        framework.TypeString,
-								Description: `Revocation State`,
-								Required:    false,
-							},
-						},
-					}},
-				},
 			},
 		},
 
@@ -205,12 +89,6 @@ func pathRotateCRL(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: `crl/rotate`,
 
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixPKI,
-			OperationVerb:   "rotate",
-			OperationSuffix: "crl",
-		},
-
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.ReadOperation: &framework.PathOperation{
 				Callback: b.pathRotateCRLRead,
@@ -218,18 +96,6 @@ func pathRotateCRL(b *backend) *framework.Path {
 				// so this request should be forwarded when it is first seen, not
 				// when it is ready to write.
 				ForwardPerformanceStandby: true,
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"success": {
-								Type:        framework.TypeBool,
-								Description: `Whether rotation was successful`,
-								Required:    true,
-							},
-						},
-					}},
-				},
 			},
 		},
 
@@ -242,12 +108,6 @@ func pathRotateDeltaCRL(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: `crl/rotate-delta`,
 
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixPKI,
-			OperationVerb:   "rotate",
-			OperationSuffix: "delta-crl",
-		},
-
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.ReadOperation: &framework.PathOperation{
 				Callback: b.pathRotateDeltaCRLRead,
@@ -255,18 +115,6 @@ func pathRotateDeltaCRL(b *backend) *framework.Path {
 				// so this request should be forwarded when it is first seen, not
 				// when it is ready to write.
 				ForwardPerformanceStandby: true,
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"success": {
-								Type:        framework.TypeBool,
-								Description: `Whether rotation was successful`,
-								Required:    true,
-							},
-						},
-					}},
-				},
 			},
 		},
 
@@ -275,44 +123,7 @@ func pathRotateDeltaCRL(b *backend) *framework.Path {
 	}
 }
 
-func pathListUnifiedRevoked(b *backend) *framework.Path {
-	return &framework.Path{
-		Pattern: "certs/unified-revoked/?$",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixPKI,
-			OperationSuffix: "unified-revoked-certs",
-		},
-
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.ListOperation: &framework.PathOperation{
-				Callback: b.pathListUnifiedRevokedCertsHandler,
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"keys": {
-								Type:        framework.TypeStringSlice,
-								Description: `List of Keys`,
-								Required:    false,
-							},
-							"key_info": {
-								Type:        framework.TypeString,
-								Description: `Key information`,
-								Required:    false,
-							},
-						},
-					}},
-				},
-			},
-		},
-
-		HelpSynopsis:    pathListUnifiedRevokedHelpSyn,
-		HelpDescription: pathListUnifiedRevokedHelpDesc,
-	}
-}
-
-func (b *backend) pathRevokeWriteHandleCertificate(ctx context.Context, req *logical.Request, certPem string) (string, bool, *x509.Certificate, error) {
+func (b *backend) pathRevokeWriteHandleCertificate(ctx context.Context, req *logical.Request, certPem string) (string, bool, []byte, error) {
 	// This function handles just the verification of the certificate against
 	// the global issuer set, checking whether or not it is importable.
 	//
@@ -357,8 +168,7 @@ func (b *backend) pathRevokeWriteHandleCertificate(ctx context.Context, req *log
 	//
 	// Start with the latter since its cheaper. Fetch the cert (by serial)
 	// and if it exists, compare the contents.
-	sc := b.makeStorageContext(ctx, req.Storage)
-	certEntry, err := fetchCertBySerial(sc, "certs/", serial)
+	certEntry, err := fetchCertBySerial(ctx, b, req, req.Path, serial)
 	if err != nil {
 		return serial, false, nil, err
 	}
@@ -382,7 +192,7 @@ func (b *backend) pathRevokeWriteHandleCertificate(ctx context.Context, req *log
 			// imported this certificate, likely when we issued it. We don't
 			// need to re-verify the signature as we assume it was already
 			// verified when it was imported.
-			return serial, false, certReferenceStored, nil
+			return serial, false, certEntry.Value, nil
 		}
 	}
 
@@ -390,6 +200,7 @@ func (b *backend) pathRevokeWriteHandleCertificate(ctx context.Context, req *log
 	// parameter (except in error cases) should cause the cert to write out.
 	//
 	// Fetch and iterate through each issuer.
+	sc := b.makeStorageContext(ctx, req.Storage)
 	issuers, err := sc.listIssuers()
 	if err != nil {
 		return serial, false, nil, err
@@ -416,13 +227,13 @@ func (b *backend) pathRevokeWriteHandleCertificate(ctx context.Context, req *log
 	}
 
 	if foundMatchingIssuer {
-		return serial, true, certReference, nil
+		return serial, true, certReference.Raw, nil
 	}
 
 	return serial, false, nil, errutil.UserError{Err: "unable to verify signature on presented cert from any present issuer in this mount; certificates from previous CAs will need to have their issuing CA and key re-imported if revocation is necessary"}
 }
 
-func (b *backend) pathRevokeWriteHandleKey(req *logical.Request, certReference *x509.Certificate, keyPem string) error {
+func (b *backend) pathRevokeWriteHandleKey(ctx context.Context, req *logical.Request, cert []byte, keyPem string) error {
 	if keyPem == "" {
 		// The only way to get here should be via the /revoke endpoint;
 		// validate the path one more time and return an error if necessary.
@@ -435,6 +246,12 @@ func (b *backend) pathRevokeWriteHandleKey(req *logical.Request, certReference *
 		return nil
 	}
 
+	// Parse the certificate for reference.
+	certReference, err := x509.ParseCertificate(cert)
+	if err != nil {
+		return errutil.UserError{Err: fmt.Sprintf("certificate could not be parsed: %v", err)}
+	}
+
 	// Now parse the key's PEM block.
 	pemBlock, _ := pem.Decode([]byte(keyPem))
 	if pemBlock == nil {
@@ -444,13 +261,9 @@ func (b *backend) pathRevokeWriteHandleKey(req *logical.Request, certReference *
 	// Parse the inner DER key.
 	signer, _, err := certutil.ParseDERKey(pemBlock.Bytes)
 	if err != nil {
-		return fmt.Errorf("failed to parse provided private key: %w", err)
+		return fmt.Errorf("failed to parse provided private key: %v", err)
 	}
 
-	return validatePrivateKeyMatchesCert(signer, certReference)
-}
-
-func validatePrivateKeyMatchesCert(signer crypto.Signer, certReference *x509.Certificate) error {
 	// Finally, verify if the cert and key match. This code has been
 	// cribbed from the Go TLS config code, with minor modifications.
 	//
@@ -458,6 +271,7 @@ func validatePrivateKeyMatchesCert(signer crypto.Signer, certReference *x509.Cer
 	// components and ensure we validate exponent and curve information
 	// as well.
 	//
+	//
 	// See: https://github.com/golang/go/blob/c6a2dada0df8c2d75cf3ae599d7caed77d416fa2/src/crypto/tls/tls.go#L304-L331
 	switch certPub := certReference.PublicKey.(type) {
 	case *rsa.PublicKey:
@@ -494,47 +308,9 @@ func validatePrivateKeyMatchesCert(signer crypto.Signer, certReference *x509.Cer
 	return nil
 }
 
-func (b *backend) maybeRevokeCrossCluster(sc *storageContext, config *crlConfig, serial string, havePrivateKey bool) (*logical.Response, error) {
-	if !config.UseGlobalQueue {
-		return logical.ErrorResponse(fmt.Sprintf("certificate with serial %s not found.", serial)), nil
-	}
-
-	if havePrivateKey {
-		return logical.ErrorResponse(fmt.Sprintf("certificate with serial %s not found, "+
-			"and cross-cluster revocation not supported with key revocation.", serial)), nil
-	}
-
-	// Here, we have to use the global revocation queue as the cert
-	// was not found on this current cluster.
-	currTime := time.Now()
-	nSerial := normalizeSerial(serial)
-	queueReq := revocationRequest{
-		RequestedAt: currTime,
-	}
-	path := crossRevocationPath + nSerial
-
-	reqEntry, err := logical.StorageEntryJSON(path, queueReq)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create storage entry for cross-cluster revocation request: %w", err)
-	}
-
-	if err := sc.Storage.Put(sc.Context, reqEntry); err != nil {
-		return nil, fmt.Errorf("error persisting cross-cluster revocation request: %w", err)
-	}
-
-	resp := &logical.Response{
-		Data: map[string]interface{}{
-			"state": "pending",
-		},
-	}
-	resp.AddWarning("Revocation request was not found on this present node. This request will be in a pending state until the PR cluster which issued this certificate sees the request and revokes the certificate. If no online cluster has this certificate, the request will eventually be removed without revoking any certificates.")
-	return resp, nil
-}
-
 func (b *backend) pathRevokeWrite(ctx context.Context, req *logical.Request, data *framework.FieldData, _ *roleEntry) (*logical.Response, error) {
 	rawSerial, haveSerial := data.GetOk("serial_number")
 	rawCertificate, haveCert := data.GetOk("certificate")
-	sc := b.makeStorageContext(ctx, req.Storage)
 
 	if !haveSerial && !haveCert {
 		return logical.ErrorResponse("The serial number or certificate to revoke must be provided."), nil
@@ -556,28 +332,16 @@ func (b *backend) pathRevokeWrite(ctx context.Context, req *logical.Request, dat
 		}
 	}
 
-	writeCert := false
-	var cert *x509.Certificate
 	var serial string
-
-	config, err := sc.Backend.crlBuilder.getConfigWithUpdate(sc)
-	if err != nil {
-		return nil, fmt.Errorf("error revoking serial: %s: failed reading config: %w", serial, err)
-	}
-
-	if haveCert {
-		serial, writeCert, cert, err = b.pathRevokeWriteHandleCertificate(ctx, req, rawCertificate.(string))
-		if err != nil {
-			return nil, err
-		}
-	} else {
+	if haveSerial {
 		// Easy case: this cert should be in storage already.
 		serial = rawSerial.(string)
 		if len(serial) == 0 {
 			return logical.ErrorResponse("The serial number must be provided"), nil
 		}
 
-		certEntry, err := fetchCertBySerial(sc, "certs/", serial)
+		// Here, fetch the certificate from disk to validate we can revoke it.
+		certEntry, err := fetchCertBySerial(ctx, b, req, req.Path, serial)
 		if err != nil {
 			switch err.(type) {
 			case errutil.UserError:
@@ -586,55 +350,49 @@ func (b *backend) pathRevokeWrite(ctx context.Context, req *logical.Request, dat
 				return nil, err
 			}
 		}
+		if certEntry == nil {
+			return logical.ErrorResponse(fmt.Sprintf("certificate with serial %s not found or was already revoked", serial)), nil
+		}
 
-		if certEntry != nil {
-			cert, err = x509.ParseCertificate(certEntry.Value)
-			if err != nil {
-				return nil, fmt.Errorf("error parsing certificate: %w", err)
-			}
+		// Now, if the user provided a key, we'll have to make sure the key
+		// and stored certificate match.
+		if err := b.pathRevokeWriteHandleKey(ctx, req, certEntry.Value, keyPem); err != nil {
+			return nil, err
+		}
+	} else {
+		// Otherwise, we've gotta parse the certificate from the request and
+		// then import it into cluster-local storage. Before writing the
+		// certificate (and forwarding), we want to verify this certificate
+		// was actually signed by one of our present issuers.
+		var err error
+		var writeCert bool
+		var certBytes []byte
+		serial, writeCert, certBytes, err = b.pathRevokeWriteHandleCertificate(ctx, req, rawCertificate.(string))
+		if err != nil {
+			return nil, err
 		}
-	}
 
-	if cert == nil {
-		if config.UnifiedCRL {
-			// Saving grace if we aren't able to load the certificate locally/or were given it,
-			// if we have a unified revocation entry already return its revocation times,
-			// otherwise we fail with a certificate not found message.
-			unifiedRev, err := getUnifiedRevocationBySerial(sc, normalizeSerial(serial))
+		// Before we write the certificate, we've gotta verify the request in
+		// the event of a PoP-based revocation scheme; we don't want to litter
+		// storage with issued-but-not-revoked certificates.
+		if err := b.pathRevokeWriteHandleKey(ctx, req, certBytes, keyPem); err != nil {
+			return nil, err
+		}
+
+		// At this point, a forward operation will occur if we're on a standby
+		// node as we're now attempting to write the bytes of the cert out to
+		// disk.
+		if writeCert {
+			err = req.Storage.Put(ctx, &logical.StorageEntry{
+				Key:   "certs/" + serial,
+				Value: certBytes,
+			})
 			if err != nil {
 				return nil, err
 			}
-			if unifiedRev != nil {
-				return &logical.Response{
-					Data: map[string]interface{}{
-						"revocation_time":         unifiedRev.RevocationTimeUTC.Unix(),
-						"revocation_time_rfc3339": unifiedRev.RevocationTimeUTC.Format(time.RFC3339Nano),
-					},
-				}, nil
-			}
 		}
 
-		return b.maybeRevokeCrossCluster(sc, config, serial, keyPem != "")
-	}
-
-	// Before we write the certificate, we've gotta verify the request in
-	// the event of a PoP-based revocation scheme; we don't want to litter
-	// storage with issued-but-not-revoked certificates.
-	if err := b.pathRevokeWriteHandleKey(req, cert, keyPem); err != nil {
-		return nil, err
-	}
-
-	// At this point, a forward operation will occur if we're on a standby
-	// node as we're now attempting to write the bytes of the cert out to
-	// disk.
-	if writeCert {
-		err := req.Storage.Put(ctx, &logical.StorageEntry{
-			Key:   "certs/" + normalizeSerial(serial),
-			Value: cert.Raw,
-		})
-		if err != nil {
-			return nil, err
-		}
+		// Finally, we have a valid serial number to use for BYOC revocation!
 	}
 
 	// Assumption: this check is cheap. Call this twice, in the cert-import
@@ -644,18 +402,21 @@ func (b *backend) pathRevokeWrite(ctx context.Context, req *logical.Request, dat
 		return nil, logical.ErrReadOnly
 	}
 
+	// We store and identify by lowercase colon-separated hex, but other
+	// utilities use dashes and/or uppercase, so normalize
+	serial = strings.ReplaceAll(strings.ToLower(serial), "-", ":")
+
 	b.revokeStorageLock.Lock()
 	defer b.revokeStorageLock.Unlock()
 
-	return revokeCert(sc, config, cert)
+	return revokeCert(ctx, b, req, serial, false)
 }
 
 func (b *backend) pathRotateCRLRead(ctx context.Context, req *logical.Request, _ *framework.FieldData) (*logical.Response, error) {
 	b.revokeStorageLock.RLock()
 	defer b.revokeStorageLock.RUnlock()
 
-	sc := b.makeStorageContext(ctx, req.Storage)
-	warnings, crlErr := b.crlBuilder.rebuild(sc, false)
+	crlErr := b.crlBuilder.rebuild(ctx, b, req, false)
 	if crlErr != nil {
 		switch crlErr.(type) {
 		case errutil.UserError:
@@ -665,17 +426,11 @@ func (b *backend) pathRotateCRLRead(ctx context.Context, req *logical.Request, _
 		}
 	}
 
-	resp := &logical.Response{
+	return &logical.Response{
 		Data: map[string]interface{}{
 			"success": true,
 		},
-	}
-
-	for index, warning := range warnings {
-		resp.AddWarning(fmt.Sprintf("Warning %d during CRL rebuild: %v", index+1, warning))
-	}
-
-	return resp, nil
+	}, nil
 }
 
 func (b *backend) pathRotateDeltaCRLRead(ctx context.Context, req *logical.Request, _ *framework.FieldData) (*logical.Response, error) {
@@ -683,12 +438,12 @@ func (b *backend) pathRotateDeltaCRLRead(ctx context.Context, req *logical.Reque
 
 	cfg, err := b.crlBuilder.getConfigWithUpdate(sc)
 	if err != nil {
-		return nil, fmt.Errorf("error fetching CRL configuration: %w", err)
+		return nil, fmt.Errorf("error fetching CRL configuration: %v", err)
 	}
 
 	isEnabled := cfg.EnableDelta
 
-	warnings, crlErr := b.crlBuilder.rebuildDeltaCRLsIfForced(sc, true)
+	crlErr := b.crlBuilder.rebuildDeltaCRLsIfForced(sc, true)
 	if crlErr != nil {
 		switch crlErr.(type) {
 		case errutil.UserError:
@@ -707,119 +462,10 @@ func (b *backend) pathRotateDeltaCRLRead(ctx context.Context, req *logical.Reque
 	if !isEnabled {
 		resp.AddWarning("requested rebuild of delta CRL when delta CRL is not enabled; this is a no-op")
 	}
-	for index, warning := range warnings {
-		resp.AddWarning(fmt.Sprintf("Warning %d during CRL rebuild: %v", index+1, warning))
-	}
 
 	return resp, nil
 }
 
-func (b *backend) pathListRevokedCertsHandler(ctx context.Context, request *logical.Request, _ *framework.FieldData) (*logical.Response, error) {
-	sc := b.makeStorageContext(ctx, request.Storage)
-
-	revokedCerts, err := sc.listRevokedCerts()
-	if err != nil {
-		return nil, err
-	}
-
-	// Normalize serial back to a format people are expecting.
-	for i, serial := range revokedCerts {
-		revokedCerts[i] = denormalizeSerial(serial)
-	}
-
-	return logical.ListResponse(revokedCerts), nil
-}
-
-func (b *backend) pathListRevocationQueueHandler(ctx context.Context, request *logical.Request, _ *framework.FieldData) (*logical.Response, error) {
-	var responseKeys []string
-	responseInfo := make(map[string]interface{})
-
-	sc := b.makeStorageContext(ctx, request.Storage)
-
-	clusters, err := sc.Storage.List(sc.Context, crossRevocationPrefix)
-	if err != nil {
-		return nil, fmt.Errorf("failed to list cross-cluster revocation queue participating clusters: %w", err)
-	}
-
-	for cIndex, cluster := range clusters {
-		cluster = cluster[0 : len(cluster)-1]
-		cPath := crossRevocationPrefix + cluster + "/"
-		serials, err := sc.Storage.List(sc.Context, cPath)
-		if err != nil {
-			return nil, fmt.Errorf("failed to list cross-cluster revocation queue entries for cluster %v (%v): %w", cluster, cIndex, err)
-		}
-
-		for _, serial := range serials {
-			// Always strip the slash out; it indicates the presence of
-			// a confirmed revocation, which we add to the main serial's
-			// entry.
-			hasSlash := serial[len(serial)-1] == '/'
-			if hasSlash {
-				serial = serial[0 : len(serial)-1]
-			}
-			serial = denormalizeSerial(serial)
-
-			var data map[string]interface{}
-			rawData, isPresent := responseInfo[serial]
-			if !isPresent {
-				data = map[string]interface{}{}
-				responseKeys = append(responseKeys, serial)
-			} else {
-				data = rawData.(map[string]interface{})
-			}
-
-			if hasSlash {
-				data["confirmed"] = true
-				data["confirmation_cluster"] = cluster
-			} else {
-				data["requesting_cluster"] = cluster
-			}
-
-			responseInfo[serial] = data
-		}
-	}
-
-	return logical.ListResponseWithInfo(responseKeys, responseInfo), nil
-}
-
-func (b *backend) pathListUnifiedRevokedCertsHandler(ctx context.Context, request *logical.Request, _ *framework.FieldData) (*logical.Response, error) {
-	sc := b.makeStorageContext(ctx, request.Storage)
-	responseKeys := []string{}
-	responseInfo := make(map[string]interface{})
-
-	clusterPathsById, err := lookupUnifiedClusterPaths(sc)
-	if err != nil {
-		return nil, err
-	}
-
-	for clusterId := range clusterPathsById {
-		clusterSerials, err := listClusterSpecificUnifiedRevokedCerts(sc, clusterId)
-		if err != nil {
-			return nil, err
-		}
-		for _, serial := range clusterSerials {
-			if strings.HasSuffix(serial, "/") {
-				// Skip folders as they wouldn't be a proper revocation
-				continue
-			}
-			colonSerial := denormalizeSerial(serial)
-			var data map[string][]string
-			rawData, isPresent := responseInfo[colonSerial]
-			if !isPresent {
-				responseKeys = append(responseKeys, colonSerial)
-				data = map[string][]string{}
-			} else {
-				data = rawData.(map[string][]string)
-			}
-
-			data["revoking_clusters"] = append(data["revoking_clusters"], clusterId)
-			responseInfo[colonSerial] = data
-		}
-	}
-
-	return logical.ListResponseWithInfo(responseKeys, responseInfo), nil
-}
-
 const pathRevokeHelpSyn = `
 Revoke a certificate by serial number or with explicit certificate.
 
@@ -847,28 +493,3 @@ Force a rebuild of the delta CRL.
 const pathRotateDeltaCRLHelpDesc = `
 Force a rebuild of the delta CRL. This can be used to force an update of the otherwise periodically-rebuilt delta CRLs.
 `
-
-const pathListRevokedHelpSyn = `
-List all revoked serial numbers within the local cluster
-`
-
-const pathListRevokedHelpDesc = `
-Returns a list of serial numbers for revoked certificates in the local cluster. 
-`
-
-const pathListUnifiedRevokedHelpSyn = `
-List all revoked serial numbers within this cluster's unified storage area.
-`
-
-const pathListUnifiedRevokedHelpDesc = `
-Returns a list of serial numbers for revoked certificates within this cluster's unified storage.
-`
-
-const pathListRevocationQueueHelpSyn = `
-List all pending, cross-cluster revocations known to the local cluster.
-`
-
-const pathListRevocationQueueHelpDesc = `
-Returns a detailed list containing serial number, requesting cluster, and
-optionally a confirming cluster.
-`
diff --git a/builtin/logical/pki/path_roles.go b/builtin/logical/pki/path_roles.go
index 16564085e76f9..89a899a8c24dc 100644
--- a/builtin/logical/pki/path_roles.go
+++ b/builtin/logical/pki/path_roles.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pki
 
 import (
@@ -8,7 +5,6 @@ import (
 	"crypto/x509"
 	"encoding/json"
 	"fmt"
-	"net/http"
 	"strings"
 	"time"
 
@@ -24,26 +20,9 @@ func pathListRoles(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "roles/?$",
 
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixPKI,
-			OperationSuffix: "roles",
-		},
-
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.ListOperation: &framework.PathOperation{
 				Callback: b.pathRoleList,
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"keys": {
-								Type:        framework.TypeStringSlice,
-								Description: "List of roles",
-								Required:    true,
-							},
-						},
-					}},
-				},
 			},
 		},
 
@@ -53,360 +32,8 @@ func pathListRoles(b *backend) *framework.Path {
 }
 
 func pathRoles(b *backend) *framework.Path {
-	pathRolesResponseFields := map[string]*framework.FieldSchema{
-		"ttl": {
-			Type:     framework.TypeDurationSecond,
-			Required: true,
-			Description: `The lease duration (validity period of the
-certificate) if no specific lease duration is requested.
-The lease duration controls the expiration of certificates
-issued by this backend. Defaults to the system default
-value or the value of max_ttl, whichever is shorter.`,
-		},
-
-		"max_ttl": {
-			Type:     framework.TypeDurationSecond,
-			Required: true,
-			Description: `The maximum allowed lease duration. If not
-set, defaults to the system maximum lease TTL.`,
-		},
-		"allow_token_displayname": {
-			Type:     framework.TypeBool,
-			Required: true,
-			Description: `Whether to allow "localhost" and "localdomain"
-as a valid common name in a request, independent of allowed_domains value.`,
-		},
-
-		"allow_localhost": {
-			Type:     framework.TypeBool,
-			Required: true,
-			Description: `Whether to allow "localhost" and "localdomain"
-as a valid common name in a request, independent of allowed_domains value.`,
-		},
-
-		"allowed_domains": {
-			Type:     framework.TypeCommaStringSlice,
-			Required: true,
-			Description: `Specifies the domains this role is allowed
-to issue certificates for. This is used with the allow_bare_domains,
-allow_subdomains, and allow_glob_domains to determine matches for the
-common name, DNS-typed SAN entries, and Email-typed SAN entries of
-certificates. See the documentation for more information. This parameter
-accepts a comma-separated string or list of domains.`,
-		},
-		"allowed_domains_template": {
-			Type:     framework.TypeBool,
-			Required: true,
-			Description: `If set, Allowed domains can be specified using identity template policies.
-				Non-templated domains are also permitted.`,
-		},
-		"allow_bare_domains": {
-			Type:     framework.TypeBool,
-			Required: true,
-			Description: `If set, clients can request certificates
-for the base domains themselves, e.g. "example.com" of domains listed
-in allowed_domains. This is a separate option as in some cases this can
-be considered a security threat. See the documentation for more
-information.`,
-		},
-
-		"allow_subdomains": {
-			Type:     framework.TypeBool,
-			Required: true,
-			Description: `If set, clients can request certificates for
-subdomains of domains listed in allowed_domains, including wildcard
-subdomains. See the documentation for more information.`,
-		},
-
-		"allow_glob_domains": {
-			Type:     framework.TypeBool,
-			Required: true,
-			Description: `If set, domains specified in allowed_domains
-can include shell-style glob patterns, e.g. "ftp*.example.com".
-See the documentation for more information.`,
-		},
-
-		"allow_wildcard_certificates": {
-			Type:     framework.TypeBool,
-			Required: true,
-			Description: `If set, allows certificates with wildcards in
-the common name to be issued, conforming to RFC 6125's Section 6.4.3; e.g.,
-"*.example.net" or "b*z.example.net". See the documentation for more
-information.`,
-		},
-
-		"allow_any_name": {
-			Type:     framework.TypeBool,
-			Required: true,
-			Description: `If set, clients can request certificates for
-any domain, regardless of allowed_domains restrictions.
-See the documentation for more information.`,
-		},
-
-		"enforce_hostnames": {
-			Type:     framework.TypeBool,
-			Required: true,
-			Description: `If set, only valid host names are allowed for
-CN and DNS SANs, and the host part of email addresses. Defaults to true.`,
-		},
-
-		"allow_ip_sans": {
-			Type:     framework.TypeBool,
-			Required: true,
-			Description: `If set, IP Subject Alternative Names are allowed.
-Any valid IP is accepted and No authorization checking is performed.`,
-		},
-
-		"allowed_uri_sans": {
-			Type:     framework.TypeCommaStringSlice,
-			Required: true,
-			Description: `If set, an array of allowed URIs for URI Subject Alternative Names.
-Any valid URI is accepted, these values support globbing.`,
-		},
-
-		"allowed_uri_sans_template": {
-			Type:     framework.TypeBool,
-			Required: true,
-			Description: `If set, Allowed URI SANs can be specified using identity template policies.
-				Non-templated URI SANs are also permitted.`,
-		},
-
-		"allowed_other_sans": {
-			Type:        framework.TypeCommaStringSlice,
-			Required:    true,
-			Description: `If set, an array of allowed other names to put in SANs. These values support globbing and must be in the format <oid>;<type>:<value>. Currently only "utf8" is a valid type. All values, including globbing values, must use this syntax, with the exception being a single "*" which allows any OID and any value (but type must still be utf8).`,
-		},
-
-		"allowed_serial_numbers": {
-			Type:        framework.TypeCommaStringSlice,
-			Required:    true,
-			Description: `If set, an array of allowed serial numbers to put in Subject. These values support globbing.`,
-		},
-		"allowed_user_ids": {
-			Type:        framework.TypeCommaStringSlice,
-			Description: `If set, an array of allowed user-ids to put in user system login name specified here: https://www.rfc-editor.org/rfc/rfc1274#section-9.3.1`,
-		},
-		"server_flag": {
-			Type:    framework.TypeBool,
-			Default: true,
-			Description: `If set, certificates are flagged for server auth use.
-Defaults to true. See also RFC 5280 Section 4.2.1.12.`,
-		},
-
-		"client_flag": {
-			Type:     framework.TypeBool,
-			Required: true,
-			Description: `If set, certificates are flagged for client auth use.
-Defaults to true. See also RFC 5280 Section 4.2.1.12.`,
-		},
-
-		"code_signing_flag": {
-			Type:     framework.TypeBool,
-			Required: true,
-			Description: `If set, certificates are flagged for code signing
-use. Defaults to false. See also RFC 5280 Section 4.2.1.12.`,
-		},
-
-		"email_protection_flag": {
-			Type:     framework.TypeBool,
-			Required: true,
-			Description: `If set, certificates are flagged for email
-protection use. Defaults to false. See also RFC 5280 Section 4.2.1.12.`,
-		},
-
-		"key_type": {
-			Type:     framework.TypeString,
-			Required: true,
-			Description: `The type of key to use; defaults to RSA. "rsa"
-"ec", "ed25519" and "any" are the only valid values.`,
-		},
-
-		"key_bits": {
-			Type:     framework.TypeInt,
-			Required: true,
-			Description: `The number of bits to use. Allowed values are
-0 (universal default); with rsa key_type: 2048 (default), 3072, or
-4096; with ec key_type: 224, 256 (default), 384, or 521; ignored with
-ed25519.`,
-		},
-		"signature_bits": {
-			Type:     framework.TypeInt,
-			Required: true,
-			Description: `The number of bits to use in the signature
-algorithm; accepts 256 for SHA-2-256, 384 for SHA-2-384, and 512 for
-SHA-2-512. Defaults to 0 to automatically detect based on key length
-(SHA-2-256 for RSA keys, and matching the curve size for NIST P-Curves).`,
-		},
-		"use_pss": {
-			Type:     framework.TypeBool,
-			Required: false,
-			Description: `Whether or not to use PSS signatures when using a
-RSA key-type issuer. Defaults to false.`,
-		},
-		"key_usage": {
-			Type:     framework.TypeCommaStringSlice,
-			Required: true,
-			Description: `A comma-separated string or list of key usages (not extended
-key usages). Valid values can be found at
-https://golang.org/pkg/crypto/x509/#KeyUsage
--- simply drop the "KeyUsage" part of the name.
-To remove all key usages from being set, set
-this value to an empty list. See also RFC 5280
-Section 4.2.1.3.`,
-		},
-
-		"ext_key_usage": {
-			Type:     framework.TypeCommaStringSlice,
-			Required: true,
-			Description: `A comma-separated string or list of extended key usages. Valid values can be found at
-https://golang.org/pkg/crypto/x509/#ExtKeyUsage
--- simply drop the "ExtKeyUsage" part of the name.
-To remove all key usages from being set, set
-this value to an empty list. See also RFC 5280
-Section 4.2.1.12.`,
-		},
-
-		"ext_key_usage_oids": {
-			Type:        framework.TypeCommaStringSlice,
-			Required:    true,
-			Description: `A comma-separated string or list of extended key usage oids.`,
-		},
-
-		"use_csr_common_name": {
-			Type:     framework.TypeBool,
-			Required: true,
-			Description: `If set, when used with a signing profile,
-the common name in the CSR will be used. This
-does *not* include any requested Subject Alternative
-Names; use use_csr_sans for that. Defaults to true.`,
-		},
-
-		"use_csr_sans": {
-			Type:     framework.TypeBool,
-			Required: true,
-			Description: `If set, when used with a signing profile,
-the SANs in the CSR will be used. This does *not*
-include the Common Name (cn); use use_csr_common_name
-for that. Defaults to true.`,
-		},
-
-		"ou": {
-			Type: framework.TypeCommaStringSlice,
-			Description: `If set, OU (OrganizationalUnit) will be set to
-this value in certificates issued by this role.`,
-		},
-
-		"organization": {
-			Type: framework.TypeCommaStringSlice,
-			Description: `If set, O (Organization) will be set to
-this value in certificates issued by this role.`,
-		},
-
-		"country": {
-			Type: framework.TypeCommaStringSlice,
-			Description: `If set, Country will be set to
-this value in certificates issued by this role.`,
-		},
-
-		"locality": {
-			Type: framework.TypeCommaStringSlice,
-			Description: `If set, Locality will be set to
-this value in certificates issued by this role.`,
-		},
-
-		"province": {
-			Type: framework.TypeCommaStringSlice,
-			Description: `If set, Province will be set to
-this value in certificates issued by this role.`,
-		},
-
-		"street_address": {
-			Type: framework.TypeCommaStringSlice,
-			Description: `If set, Street Address will be set to
-this value in certificates issued by this role.`,
-		},
-
-		"postal_code": {
-			Type: framework.TypeCommaStringSlice,
-			Description: `If set, Postal Code will be set to
-this value in certificates issued by this role.`,
-		},
-
-		"generate_lease": {
-			Type: framework.TypeBool,
-			Description: `
-If set, certificates issued/signed against this role will have Vault leases
-attached to them. Defaults to "false". Certificates can be added to the CRL by
-"vault revoke <lease_id>" when certificates are associated with leases.  It can
-also be done using the "pki/revoke" endpoint. However, when lease generation is
-disabled, invoking "pki/revoke" would be the only way to add the certificates
-to the CRL.  When large number of certificates are generated with long
-lifetimes, it is recommended that lease generation be disabled, as large amount of
-leases adversely affect the startup time of Vault.`,
-		},
-
-		"no_store": {
-			Type: framework.TypeBool,
-			Description: `
-If set, certificates issued/signed against this role will not be stored in the
-storage backend. This can improve performance when issuing large numbers of 
-certificates. However, certificates issued in this way cannot be enumerated
-or revoked, so this option is recommended only for certificates that are
-non-sensitive, or extremely short-lived. This option implies a value of "false"
-for "generate_lease".`,
-		},
-
-		"require_cn": {
-			Type:        framework.TypeBool,
-			Description: `If set to false, makes the 'common_name' field optional while generating a certificate.`,
-		},
-
-		"cn_validations": {
-			Type: framework.TypeCommaStringSlice,
-			Description: `List of allowed validations to run against the
-Common Name field. Values can include 'email' to validate the CN is a email
-address, 'hostname' to validate the CN is a valid hostname (potentially
-including wildcards). When multiple validations are specified, these take
-OR semantics (either email OR hostname are allowed). The special value
-'disabled' allows disabling all CN name validations, allowing for arbitrary
-non-Hostname, non-Email address CNs.`,
-		},
-
-		"policy_identifiers": {
-			Type: framework.TypeCommaStringSlice,
-			Description: `A comma-separated string or list of policy OIDs, or a JSON list of qualified policy
-information, which must include an oid, and may include a notice and/or cps url, using the form 
-[{"oid"="1.3.6.1.4.1.7.8","notice"="I am a user Notice"}, {"oid"="1.3.6.1.4.1.44947.1.2.4 ","cps"="https://example.com"}].`,
-		},
-
-		"basic_constraints_valid_for_non_ca": {
-			Type:        framework.TypeBool,
-			Description: `Mark Basic Constraints valid when issuing non-CA certificates.`,
-		},
-		"not_before_duration": {
-			Type:        framework.TypeDurationSecond,
-			Description: `The duration before now which the certificate needs to be backdated by.`,
-		},
-		"not_after": {
-			Type: framework.TypeString,
-			Description: `Set the not after field of the certificate with specified date value.
-The value format should be given in UTC format YYYY-MM-ddTHH:MM:SSZ.`,
-		},
-		"issuer_ref": {
-			Type: framework.TypeString,
-			Description: `Reference to the issuer used to sign requests
-serviced by this role.`,
-		},
-	}
-
 	return &framework.Path{
 		Pattern: "roles/" + framework.GenericNameRegex("name"),
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixPKI,
-			OperationSuffix: "role",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"backend": {
 				Type:        framework.TypeString,
@@ -553,11 +180,6 @@ Any valid URI is accepted, these values support globbing.`,
 				Description: `If set, an array of allowed serial numbers to put in Subject. These values support globbing.`,
 			},
 
-			"allowed_user_ids": {
-				Type:        framework.TypeCommaStringSlice,
-				Description: `If set, an array of allowed user-ids to put in user system login name specified here: https://www.rfc-editor.org/rfc/rfc1274#section-9.3.1`,
-			},
-
 			"server_flag": {
 				Type:    framework.TypeBool,
 				Default: true,
@@ -823,44 +445,21 @@ serviced by this role.`,
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.ReadOperation: &framework.PathOperation{
 				Callback: b.pathRoleRead,
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields:      pathRolesResponseFields,
-					}},
-				},
 			},
 			logical.UpdateOperation: &framework.PathOperation{
 				Callback: b.pathRoleCreate,
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields:      pathRolesResponseFields,
-					}},
-				},
 				// Read more about why these flags are set in backend.go.
 				ForwardPerformanceStandby:   true,
 				ForwardPerformanceSecondary: true,
 			},
 			logical.DeleteOperation: &framework.PathOperation{
 				Callback: b.pathRoleDelete,
-				Responses: map[int][]framework.Response{
-					http.StatusNoContent: {{
-						Description: "No Content",
-					}},
-				},
 				// Read more about why these flags are set in backend.go.
 				ForwardPerformanceStandby:   true,
 				ForwardPerformanceSecondary: true,
 			},
 			logical.PatchOperation: &framework.PathOperation{
 				Callback: b.pathRolePatch,
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields:      pathRolesResponseFields,
-					}},
-				},
 				// Read more about why these flags are set in backend.go.
 				ForwardPerformanceStandby:   true,
 				ForwardPerformanceSecondary: true,
@@ -1014,8 +613,6 @@ func (b *backend) getRole(ctx context.Context, s logical.Storage, n string) (*ro
 		}
 	}
 
-	result.Name = n
-
 	return &result, nil
 }
 
@@ -1101,13 +698,11 @@ func (b *backend) pathRoleCreate(ctx context.Context, req *logical.Request, data
 		RequireCN:                     data.Get("require_cn").(bool),
 		CNValidations:                 data.Get("cn_validations").([]string),
 		AllowedSerialNumbers:          data.Get("allowed_serial_numbers").([]string),
-		AllowedUserIDs:                data.Get("allowed_user_ids").([]string),
 		PolicyIdentifiers:             getPolicyIdentifier(data, nil),
 		BasicConstraintsValidForNonCA: data.Get("basic_constraints_valid_for_non_ca").(bool),
 		NotBeforeDuration:             time.Duration(data.Get("not_before_duration").(int)) * time.Second,
 		NotAfter:                      data.Get("not_after").(string),
 		Issuer:                        data.Get("issuer_ref").(string),
-		Name:                          name,
 	}
 
 	allowedOtherSANs := data.Get("allowed_other_sans").([]string)
@@ -1150,6 +745,9 @@ func (b *backend) pathRoleCreate(ctx context.Context, req *logical.Request, data
 		return nil, err
 	}
 	if warning != "" {
+		if resp == nil {
+			resp = &logical.Response{}
+		}
 		resp.AddWarning(warning)
 	}
 	if resp.IsError() {
@@ -1169,7 +767,7 @@ func (b *backend) pathRoleCreate(ctx context.Context, req *logical.Request, data
 }
 
 func validateRole(b *backend, entry *roleEntry, ctx context.Context, s logical.Storage) (*logical.Response, error) {
-	resp := &logical.Response{}
+	var resp *logical.Response
 	var err error
 
 	if entry.MaxTTL > 0 && entry.TTL > entry.MaxTTL {
@@ -1230,7 +828,6 @@ func validateRole(b *backend, entry *roleEntry, ctx context.Context, s logical.S
 		return nil, errutil.UserError{Err: err.Error()}
 	}
 
-	resp.Data = entry.ToResponseData()
 	return resp, nil
 }
 
@@ -1301,7 +898,6 @@ func (b *backend) pathRolePatch(ctx context.Context, req *logical.Request, data
 		RequireCN:                     getWithExplicitDefault(data, "require_cn", oldEntry.RequireCN).(bool),
 		CNValidations:                 getWithExplicitDefault(data, "cn_validations", oldEntry.CNValidations).([]string),
 		AllowedSerialNumbers:          getWithExplicitDefault(data, "allowed_serial_numbers", oldEntry.AllowedSerialNumbers).([]string),
-		AllowedUserIDs:                getWithExplicitDefault(data, "allowed_user_ids", oldEntry.AllowedUserIDs).([]string),
 		PolicyIdentifiers:             getPolicyIdentifier(data, &oldEntry.PolicyIdentifiers),
 		BasicConstraintsValidForNonCA: getWithExplicitDefault(data, "basic_constraints_valid_for_non_ca", oldEntry.BasicConstraintsValidForNonCA).(bool),
 		NotBeforeDuration:             getTimeWithExplicitDefault(data, "not_before_duration", oldEntry.NotBeforeDuration),
@@ -1504,7 +1100,6 @@ type roleEntry struct {
 	CNValidations                 []string      `json:"cn_validations"`
 	AllowedOtherSANs              []string      `json:"allowed_other_sans"`
 	AllowedSerialNumbers          []string      `json:"allowed_serial_numbers"`
-	AllowedUserIDs                []string      `json:"allowed_user_ids"`
 	AllowedURISANs                []string      `json:"allowed_uri_sans"`
 	AllowedURISANsTemplate        bool          `json:"allowed_uri_sans_template"`
 	PolicyIdentifiers             []string      `json:"policy_identifiers"`
@@ -1513,8 +1108,6 @@ type roleEntry struct {
 	NotBeforeDuration             time.Duration `json:"not_before_duration"`
 	NotAfter                      string        `json:"not_after"`
 	Issuer                        string        `json:"issuer"`
-	// Name is only set when the role has been stored, on the fly roles have a blank name
-	Name string `json:"-"`
 }
 
 func (r *roleEntry) ToResponseData() map[string]interface{} {
@@ -1556,7 +1149,6 @@ func (r *roleEntry) ToResponseData() map[string]interface{} {
 		"no_store":                           r.NoStore,
 		"allowed_other_sans":                 r.AllowedOtherSANs,
 		"allowed_serial_numbers":             r.AllowedSerialNumbers,
-		"allowed_user_ids":                   r.AllowedUserIDs,
 		"allowed_uri_sans":                   r.AllowedURISANs,
 		"require_cn":                         r.RequireCN,
 		"cn_validations":                     r.CNValidations,
diff --git a/builtin/logical/pki/path_roles_test.go b/builtin/logical/pki/path_roles_test.go
index 98f5e277bbafa..34952d4772209 100644
--- a/builtin/logical/pki/path_roles_test.go
+++ b/builtin/logical/pki/path_roles_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pki
 
 import (
@@ -14,7 +11,6 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/hashicorp/go-secure-stdlib/strutil"
-	"github.com/hashicorp/vault/sdk/helper/testhelpers/schema"
 	"github.com/hashicorp/vault/sdk/logical"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -24,7 +20,7 @@ func TestPki_RoleGenerateLease(t *testing.T) {
 	t.Parallel()
 	var resp *logical.Response
 	var err error
-	b, storage := CreateBackendWithStorage(t)
+	b, storage := createBackendWithStorage(t)
 
 	roleData := map[string]interface{}{
 		"allowed_domains": "myvault.com",
@@ -129,7 +125,7 @@ func TestPki_RoleKeyUsage(t *testing.T) {
 	t.Parallel()
 	var resp *logical.Response
 	var err error
-	b, storage := CreateBackendWithStorage(t)
+	b, storage := createBackendWithStorage(t)
 
 	roleData := map[string]interface{}{
 		"allowed_domains": "myvault.com",
@@ -145,14 +141,12 @@ func TestPki_RoleKeyUsage(t *testing.T) {
 	}
 
 	resp, err = b.HandleRequest(context.Background(), roleReq)
-	schema.ValidateResponse(t, schema.GetResponseSchema(t, b.Route(roleReq.Path), logical.UpdateOperation), resp, true)
 	if err != nil || (resp != nil && resp.IsError()) {
 		t.Fatalf("bad: err: %v resp: %#v", err, resp)
 	}
 
 	roleReq.Operation = logical.ReadOperation
 	resp, err = b.HandleRequest(context.Background(), roleReq)
-	schema.ValidateResponse(t, schema.GetResponseSchema(t, b.Route(roleReq.Path), logical.ReadOperation), resp, true)
 	if err != nil || (resp != nil && resp.IsError()) {
 		t.Fatalf("bad: err: %v resp: %#v", err, resp)
 	}
@@ -222,7 +216,7 @@ func TestPki_RoleOUOrganizationUpgrade(t *testing.T) {
 	t.Parallel()
 	var resp *logical.Response
 	var err error
-	b, storage := CreateBackendWithStorage(t)
+	b, storage := createBackendWithStorage(t)
 
 	roleData := map[string]interface{}{
 		"allowed_domains": "myvault.com",
@@ -328,7 +322,7 @@ func TestPki_RoleAllowedDomains(t *testing.T) {
 	t.Parallel()
 	var resp *logical.Response
 	var err error
-	b, storage := CreateBackendWithStorage(t)
+	b, storage := createBackendWithStorage(t)
 
 	roleData := map[string]interface{}{
 		"allowed_domains": []string{"foobar.com", "*example.com"},
@@ -416,7 +410,7 @@ func TestPki_RoleAllowedURISANs(t *testing.T) {
 	t.Parallel()
 	var resp *logical.Response
 	var err error
-	b, storage := CreateBackendWithStorage(t)
+	b, storage := createBackendWithStorage(t)
 
 	roleData := map[string]interface{}{
 		"allowed_uri_sans": []string{"http://foobar.com", "spiffe://*"},
@@ -451,7 +445,7 @@ func TestPki_RolePkixFields(t *testing.T) {
 	t.Parallel()
 	var resp *logical.Response
 	var err error
-	b, storage := CreateBackendWithStorage(t)
+	b, storage := createBackendWithStorage(t)
 
 	roleData := map[string]interface{}{
 		"ttl":            "5h",
@@ -543,7 +537,7 @@ func TestPki_RoleNoStore(t *testing.T) {
 	t.Parallel()
 	var resp *logical.Response
 	var err error
-	b, storage := CreateBackendWithStorage(t)
+	b, storage := createBackendWithStorage(t)
 
 	roleData := map[string]interface{}{
 		"allowed_domains": "myvault.com",
@@ -664,7 +658,7 @@ func TestPki_CertsLease(t *testing.T) {
 	t.Parallel()
 	var resp *logical.Response
 	var err error
-	b, storage := CreateBackendWithStorage(t)
+	b, storage := createBackendWithStorage(t)
 
 	caData := map[string]interface{}{
 		"common_name": "myvault.com",
@@ -955,7 +949,7 @@ func TestPki_RolePatch(t *testing.T) {
 		},
 	}
 
-	b, storage := CreateBackendWithStorage(t)
+	b, storage := createBackendWithStorage(t)
 
 	for index, testCase := range testCases {
 		var resp *logical.Response
@@ -1051,7 +1045,7 @@ func TestPKI_RolePolicyInformation_Flat(t *testing.T) {
 		},
 	}
 
-	b, storage := CreateBackendWithStorage(t)
+	b, storage := createBackendWithStorage(t)
 
 	caData := map[string]interface{}{
 		"common_name": "myvault.com",
diff --git a/builtin/logical/pki/path_root.go b/builtin/logical/pki/path_root.go
index fc5476bef05f0..5f9ab837e5406 100644
--- a/builtin/logical/pki/path_root.go
+++ b/builtin/logical/pki/path_root.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pki
 
 import (
@@ -15,7 +12,6 @@ import (
 	"encoding/pem"
 	"errors"
 	"fmt"
-	"net/http"
 	"reflect"
 	"strings"
 	"time"
@@ -30,34 +26,15 @@ import (
 )
 
 func pathGenerateRoot(b *backend) *framework.Path {
-	pattern := "root/generate/" + framework.GenericNameRegex("exported")
-
-	displayAttrs := &framework.DisplayAttributes{
-		OperationPrefix: operationPrefixPKI,
-		OperationVerb:   "generate",
-		OperationSuffix: "root",
-	}
-
-	return buildPathGenerateRoot(b, pattern, displayAttrs)
+	return buildPathGenerateRoot(b, "root/generate/"+framework.GenericNameRegex("exported"))
 }
 
 func pathDeleteRoot(b *backend) *framework.Path {
 	ret := &framework.Path{
 		Pattern: "root",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixPKI,
-			OperationSuffix: "root",
-		},
-
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.DeleteOperation: &framework.PathOperation{
 				Callback: b.pathCADeleteRoot,
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-					}},
-				},
 				// Read more about why these flags are set in backend.go
 				ForwardPerformanceStandby:   true,
 				ForwardPerformanceSecondary: true,
@@ -103,15 +80,11 @@ func (b *backend) pathCADeleteRoot(ctx context.Context, req *logical.Request, _
 		}
 	}
 
-	// Delete legacy CA bundle and its backup, if any.
+	// Delete legacy CA bundle.
 	if err := req.Storage.Delete(ctx, legacyCertBundlePath); err != nil {
 		return nil, err
 	}
 
-	if err := req.Storage.Delete(ctx, legacyCertBundleBackupPath); err != nil {
-		return nil, err
-	}
-
 	// Delete legacy CRL bundle.
 	if err := req.Storage.Delete(ctx, legacyCRLPath); err != nil {
 		return nil, err
@@ -280,7 +253,7 @@ func (b *backend) pathCAGenerateRoot(ctx context.Context, req *logical.Request,
 	// RevocationSigAlg unconditionally on roots now.
 	myIssuer.RevocationSigAlg = parsedBundle.Certificate.SignatureAlgorithm
 	if err := sc.writeIssuer(myIssuer); err != nil {
-		return nil, fmt.Errorf("unable to store PSS-updated issuer: %w", err)
+		return nil, fmt.Errorf("unable to store PSS-updated issuer: %v", err)
 	}
 
 	// Also store it as just the certificate identified by serial number, so it
@@ -294,16 +267,13 @@ func (b *backend) pathCAGenerateRoot(ctx context.Context, req *logical.Request,
 	if err != nil {
 		return nil, fmt.Errorf("unable to store certificate locally: %w", err)
 	}
-	b.ifCountEnabledIncrementTotalCertificatesCount(certsCounted, key)
+	b.incrementTotalCertificatesCount(certsCounted, key)
 
 	// Build a fresh CRL
-	warnings, err = b.crlBuilder.rebuild(sc, true)
+	err = b.crlBuilder.rebuild(ctx, b, req, true)
 	if err != nil {
 		return nil, err
 	}
-	for index, warning := range warnings {
-		resp.AddWarning(fmt.Sprintf("Warning %d during CRL rebuild: %v", index+1, warning))
-	}
 
 	if parsedBundle.Certificate.MaxPathLen == 0 {
 		resp.AddWarning("Max path length of the generated certificate is zero. This certificate cannot be used to issue intermediate CA certificates.")
@@ -494,7 +464,7 @@ func (b *backend) pathIssuerSignIntermediate(ctx context.Context, req *logical.R
 	if err != nil {
 		return nil, fmt.Errorf("unable to store certificate locally: %w", err)
 	}
-	b.ifCountEnabledIncrementTotalCertificatesCount(certsCounted, key)
+	b.incrementTotalCertificatesCount(certsCounted, key)
 
 	if parsedBundle.Certificate.MaxPathLen == 0 {
 		resp.AddWarning("Max path length of the signed certificate is zero. This certificate cannot be used to issue intermediate CA certificates.")
diff --git a/builtin/logical/pki/path_sign_issuers.go b/builtin/logical/pki/path_sign_issuers.go
index 0b6b8334e418f..cadbac5553f36 100644
--- a/builtin/logical/pki/path_sign_issuers.go
+++ b/builtin/logical/pki/path_sign_issuers.go
@@ -1,80 +1,28 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pki
 
 import (
-	"net/http"
-
 	"github.com/hashicorp/vault/sdk/framework"
 	"github.com/hashicorp/vault/sdk/logical"
 )
 
 func pathIssuerSignIntermediate(b *backend) *framework.Path {
 	pattern := "issuer/" + framework.GenericNameRegex(issuerRefParam) + "/sign-intermediate"
-
-	displayAttrs := &framework.DisplayAttributes{
-		OperationPrefix: operationPrefixPKIIssuer,
-		OperationVerb:   "sign",
-		OperationSuffix: "intermediate",
-	}
-
-	return buildPathIssuerSignIntermediateRaw(b, pattern, displayAttrs)
+	return buildPathIssuerSignIntermediateRaw(b, pattern)
 }
 
 func pathSignIntermediate(b *backend) *framework.Path {
 	pattern := "root/sign-intermediate"
-
-	displayAttrs := &framework.DisplayAttributes{
-		OperationPrefix: operationPrefixPKIRoot,
-		OperationVerb:   "sign",
-		OperationSuffix: "intermediate",
-	}
-
-	return buildPathIssuerSignIntermediateRaw(b, pattern, displayAttrs)
+	return buildPathIssuerSignIntermediateRaw(b, pattern)
 }
 
-func buildPathIssuerSignIntermediateRaw(b *backend, pattern string, displayAttrs *framework.DisplayAttributes) *framework.Path {
+func buildPathIssuerSignIntermediateRaw(b *backend, pattern string) *framework.Path {
 	fields := addIssuerRefField(map[string]*framework.FieldSchema{})
 	path := &framework.Path{
-		Pattern:      pattern,
-		DisplayAttrs: displayAttrs,
-		Fields:       fields,
+		Pattern: pattern,
+		Fields:  fields,
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.UpdateOperation: &framework.PathOperation{
 				Callback: b.pathIssuerSignIntermediate,
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"expiration": {
-								Type:        framework.TypeInt64,
-								Description: `Expiration Time`,
-								Required:    true,
-							},
-							"serial_number": {
-								Type:        framework.TypeString,
-								Description: `Serial Number`,
-								Required:    false,
-							},
-							"certificate": {
-								Type:        framework.TypeString,
-								Description: `Certificate`,
-								Required:    true,
-							},
-							"issuing_ca": {
-								Type:        framework.TypeString,
-								Description: `Issuing CA`,
-								Required:    true,
-							},
-							"ca_chain": {
-								Type:        framework.TypeStringSlice,
-								Description: `CA Chain`,
-								Required:    true,
-							},
-						},
-					}},
-				},
 			},
 		},
 
@@ -165,29 +113,15 @@ See the API documentation for more information about required parameters.
 
 func pathIssuerSignSelfIssued(b *backend) *framework.Path {
 	pattern := "issuer/" + framework.GenericNameRegex(issuerRefParam) + "/sign-self-issued"
-
-	displayAttrs := &framework.DisplayAttributes{
-		OperationPrefix: operationPrefixPKIIssuer,
-		OperationVerb:   "sign",
-		OperationSuffix: "self-issued",
-	}
-
-	return buildPathIssuerSignSelfIssued(b, pattern, displayAttrs)
+	return buildPathIssuerSignSelfIssued(b, pattern)
 }
 
 func pathSignSelfIssued(b *backend) *framework.Path {
 	pattern := "root/sign-self-issued"
-
-	displayAttrs := &framework.DisplayAttributes{
-		OperationPrefix: operationPrefixPKIRoot,
-		OperationVerb:   "sign",
-		OperationSuffix: "self-issued",
-	}
-
-	return buildPathIssuerSignSelfIssued(b, pattern, displayAttrs)
+	return buildPathIssuerSignSelfIssued(b, pattern)
 }
 
-func buildPathIssuerSignSelfIssued(b *backend, pattern string, displayAttrs *framework.DisplayAttributes) *framework.Path {
+func buildPathIssuerSignSelfIssued(b *backend, pattern string) *framework.Path {
 	fields := map[string]*framework.FieldSchema{
 		"certificate": {
 			Type:        framework.TypeString,
@@ -201,29 +135,11 @@ func buildPathIssuerSignSelfIssued(b *backend, pattern string, displayAttrs *fra
 	}
 	fields = addIssuerRefField(fields)
 	path := &framework.Path{
-		Pattern:      pattern,
-		DisplayAttrs: displayAttrs,
-		Fields:       fields,
+		Pattern: pattern,
+		Fields:  fields,
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.UpdateOperation: &framework.PathOperation{
 				Callback: b.pathIssuerSignSelfIssued,
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"certificate": {
-								Type:        framework.TypeString,
-								Description: `Certificate`,
-								Required:    true,
-							},
-							"issuing_ca": {
-								Type:        framework.TypeString,
-								Description: `Issuing CA`,
-								Required:    true,
-							},
-						},
-					}},
-				},
 			},
 		},
 
diff --git a/builtin/logical/pki/path_tidy.go b/builtin/logical/pki/path_tidy.go
index 22c406249c3c7..d65d5c8c792c7 100644
--- a/builtin/logical/pki/path_tidy.go
+++ b/builtin/logical/pki/path_tidy.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pki
 
 import (
@@ -16,135 +13,38 @@ import (
 	"github.com/hashicorp/go-hclog"
 
 	"github.com/hashicorp/vault/sdk/framework"
-	"github.com/hashicorp/vault/sdk/helper/consts"
 	"github.com/hashicorp/vault/sdk/logical"
 )
 
 var tidyCancelledError = errors.New("tidy operation cancelled")
 
-type tidyStatusState int
-
-const (
-	tidyStatusInactive   tidyStatusState = iota
-	tidyStatusStarted                    = iota
-	tidyStatusFinished                   = iota
-	tidyStatusError                      = iota
-	tidyStatusCancelling                 = iota
-	tidyStatusCancelled                  = iota
-)
-
-type tidyStatus struct {
-	// Parameters used to initiate the operation
-	safetyBuffer            int
-	issuerSafetyBuffer      int
-	revQueueSafetyBuffer    int
-	acmeAccountSafetyBuffer int
-
-	tidyCertStore         bool
-	tidyRevokedCerts      bool
-	tidyRevokedAssocs     bool
-	tidyExpiredIssuers    bool
-	tidyBackupBundle      bool
-	tidyRevocationQueue   bool
-	tidyCrossRevokedCerts bool
-	tidyAcme              bool
-	pauseDuration         string
-
-	// Status
-	state        tidyStatusState
-	err          error
-	timeStarted  time.Time
-	timeFinished time.Time
-	message      string
-
-	// These counts use a custom incrementer that grab and release
-	// a lock prior to reading.
-	certStoreDeletedCount    uint
-	revokedCertDeletedCount  uint
-	missingIssuerCertCount   uint
-	revQueueDeletedCount     uint
-	crossRevokedDeletedCount uint
-
-	acmeAccountsCount        uint
-	acmeAccountsRevokedCount uint
-	acmeAccountsDeletedCount uint
-	acmeOrdersDeletedCount   uint
-}
-
 type tidyConfig struct {
-	// AutoTidy config
-	Enabled  bool          `json:"enabled"`
-	Interval time.Duration `json:"interval_duration"`
-
-	// Tidy Operations
-	CertStore         bool `json:"tidy_cert_store"`
-	RevokedCerts      bool `json:"tidy_revoked_certs"`
-	IssuerAssocs      bool `json:"tidy_revoked_cert_issuer_associations"`
-	ExpiredIssuers    bool `json:"tidy_expired_issuers"`
-	BackupBundle      bool `json:"tidy_move_legacy_ca_bundle"`
-	RevocationQueue   bool `json:"tidy_revocation_queue"`
-	CrossRevokedCerts bool `json:"tidy_cross_cluster_revoked_certs"`
-	TidyAcme          bool `json:"tidy_acme"`
-
-	// Safety Buffers
-	SafetyBuffer            time.Duration `json:"safety_buffer"`
-	IssuerSafetyBuffer      time.Duration `json:"issuer_safety_buffer"`
-	QueueSafetyBuffer       time.Duration `json:"revocation_queue_safety_buffer"`
-	AcmeAccountSafetyBuffer time.Duration `json:"acme_account_safety_buffer"`
-	PauseDuration           time.Duration `json:"pause_duration"`
-
-	// Metrics.
-	MaintainCount  bool `json:"maintain_stored_certificate_counts"`
-	PublishMetrics bool `json:"publish_stored_certificate_count_metrics"`
-}
-
-func (tc *tidyConfig) IsAnyTidyEnabled() bool {
-	return tc.CertStore || tc.RevokedCerts || tc.IssuerAssocs || tc.ExpiredIssuers || tc.BackupBundle || tc.TidyAcme || tc.CrossRevokedCerts || tc.RevocationQueue
-}
-
-func (tc *tidyConfig) AnyTidyConfig() string {
-	return "tidy_cert_store / tidy_revoked_certs / tidy_revoked_cert_issuer_associations / tidy_expired_issuers / tidy_move_legacy_ca_bundle / tidy_revocation_queue / tidy_cross_cluster_revoked_certs / tidy_acme"
+	Enabled       bool          `json:"enabled"`
+	Interval      time.Duration `json:"interval_duration"`
+	CertStore     bool          `json:"tidy_cert_store"`
+	RevokedCerts  bool          `json:"tidy_revoked_certs"`
+	IssuerAssocs  bool          `json:"tidy_revoked_cert_issuer_associations"`
+	SafetyBuffer  time.Duration `json:"safety_buffer"`
+	PauseDuration time.Duration `json:"pause_duration"`
 }
 
 var defaultTidyConfig = tidyConfig{
-	Enabled:                 false,
-	Interval:                12 * time.Hour,
-	CertStore:               false,
-	RevokedCerts:            false,
-	IssuerAssocs:            false,
-	ExpiredIssuers:          false,
-	BackupBundle:            false,
-	TidyAcme:                false,
-	SafetyBuffer:            72 * time.Hour,
-	IssuerSafetyBuffer:      365 * 24 * time.Hour,
-	AcmeAccountSafetyBuffer: 30 * 24 * time.Hour,
-	PauseDuration:           0 * time.Second,
-	MaintainCount:           false,
-	PublishMetrics:          false,
-	RevocationQueue:         false,
-	QueueSafetyBuffer:       48 * time.Hour,
-	CrossRevokedCerts:       false,
+	Enabled:       false,
+	Interval:      12 * time.Hour,
+	CertStore:     false,
+	RevokedCerts:  false,
+	IssuerAssocs:  false,
+	SafetyBuffer:  72 * time.Hour,
+	PauseDuration: 0 * time.Second,
 }
 
 func pathTidy(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "tidy$",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixPKI,
-			OperationVerb:   "tidy",
-		},
-
-		Fields: addTidyFields(map[string]*framework.FieldSchema{}),
+		Fields:  addTidyFields(map[string]*framework.FieldSchema{}),
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.UpdateOperation: &framework.PathOperation{
-				Callback: b.pathTidyWrite,
-				Responses: map[int][]framework.Response{
-					http.StatusAccepted: {{
-						Description: "Accepted",
-						Fields:      map[string]*framework.FieldSchema{},
-					}},
-				},
+				Callback:                  b.pathTidyWrite,
 				ForwardPerformanceStandby: true,
 			},
 		},
@@ -156,171 +56,9 @@ func pathTidy(b *backend) *framework.Path {
 func pathTidyCancel(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "tidy-cancel$",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixPKI,
-			OperationVerb:   "tidy",
-			OperationSuffix: "cancel",
-		},
-
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.UpdateOperation: &framework.PathOperation{
-				Callback: b.pathTidyCancelWrite,
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"safety_buffer": {
-								Type:        framework.TypeInt,
-								Description: `Safety buffer time duration`,
-								Required:    false,
-							},
-							"issuer_safety_buffer": {
-								Type:        framework.TypeInt,
-								Description: `Issuer safety buffer`,
-								Required:    false,
-							},
-							"revocation_queue_safety_buffer": {
-								Type:        framework.TypeInt,
-								Description: `Revocation queue safety buffer`,
-								Required:    true,
-							},
-							"tidy_cert_store": {
-								Type:        framework.TypeBool,
-								Description: `Tidy certificate store`,
-								Required:    false,
-							},
-							"tidy_revoked_certs": {
-								Type:        framework.TypeBool,
-								Description: `Tidy revoked certificates`,
-								Required:    false,
-							},
-							"tidy_revoked_cert_issuer_associations": {
-								Type:        framework.TypeBool,
-								Description: `Tidy revoked certificate issuer associations`,
-								Required:    false,
-							},
-							"tidy_acme": {
-								Type:        framework.TypeBool,
-								Description: `Tidy Unused Acme Accounts, and Orders`,
-								Required:    false,
-							},
-							"acme_account_safety_buffer": {
-								Type:        framework.TypeInt,
-								Description: `Safety buffer after creation after which accounts lacking orders are revoked`,
-								Required:    false,
-							},
-							"tidy_expired_issuers": {
-								Type:        framework.TypeBool,
-								Description: `Tidy expired issuers`,
-								Required:    false,
-							},
-							"pause_duration": {
-								Type:        framework.TypeString,
-								Description: `Duration to pause between tidying certificates`,
-								Required:    false,
-							},
-							"state": {
-								Type:        framework.TypeString,
-								Description: `One of Inactive, Running, Finished, or Error`,
-								Required:    false,
-							},
-							"error": {
-								Type:        framework.TypeString,
-								Description: `The error message`,
-								Required:    false,
-							},
-							"time_started": {
-								Type:        framework.TypeString,
-								Description: `Time the operation started`,
-								Required:    false,
-							},
-							"time_finished": {
-								Type:        framework.TypeString,
-								Description: `Time the operation finished`,
-								Required:    false,
-							},
-							"last_auto_tidy_finished": {
-								Type:        framework.TypeString,
-								Description: `Time the last auto-tidy operation finished`,
-								Required:    true,
-							},
-							"message": {
-								Type:        framework.TypeString,
-								Description: `Message of the operation`,
-								Required:    false,
-							},
-							"cert_store_deleted_count": {
-								Type:        framework.TypeInt,
-								Description: `The number of certificate storage entries deleted`,
-								Required:    false,
-							},
-							"revoked_cert_deleted_count": {
-								Type:        framework.TypeInt,
-								Description: `The number of revoked certificate entries deleted`,
-								Required:    false,
-							},
-							"current_cert_store_count": {
-								Type:        framework.TypeInt,
-								Description: `The number of revoked certificate entries deleted`,
-								Required:    false,
-							},
-							"current_revoked_cert_count": {
-								Type:        framework.TypeInt,
-								Description: `The number of revoked certificate entries deleted`,
-								Required:    false,
-							},
-							"missing_issuer_cert_count": {
-								Type:     framework.TypeInt,
-								Required: false,
-							},
-							"tidy_move_legacy_ca_bundle": {
-								Type:     framework.TypeBool,
-								Required: false,
-							},
-							"tidy_cross_cluster_revoked_certs": {
-								Type:     framework.TypeBool,
-								Required: false,
-							},
-							"tidy_revocation_queue": {
-								Type:     framework.TypeBool,
-								Required: false,
-							},
-							"revocation_queue_deleted_count": {
-								Type:     framework.TypeInt,
-								Required: false,
-							},
-							"cross_revoked_cert_deleted_count": {
-								Type:     framework.TypeInt,
-								Required: false,
-							},
-							"internal_backend_uuid": {
-								Type:     framework.TypeString,
-								Required: false,
-							},
-							"total_acme_account_count": {
-								Type:        framework.TypeInt,
-								Description: `Total number of acme accounts iterated over`,
-								Required:    false,
-							},
-							"acme_account_deleted_count": {
-								Type:        framework.TypeInt,
-								Description: `The number of revoked acme accounts removed`,
-								Required:    false,
-							},
-							"acme_account_revoked_count": {
-								Type:        framework.TypeInt,
-								Description: `The number of unused acme accounts revoked`,
-								Required:    false,
-							},
-							"acme_orders_deleted_count": {
-								Type:        framework.TypeInt,
-								Description: `The number of expired, unused acme orders removed`,
-								Required:    false,
-							},
-						},
-					}},
-				},
+				Callback:                  b.pathTidyCancelWrite,
 				ForwardPerformanceStandby: true,
 			},
 		},
@@ -332,173 +70,9 @@ func pathTidyCancel(b *backend) *framework.Path {
 func pathTidyStatus(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "tidy-status$",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixPKI,
-			OperationVerb:   "tidy",
-			OperationSuffix: "status",
-		},
-
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.ReadOperation: &framework.PathOperation{
-				Callback: b.pathTidyStatusRead,
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"safety_buffer": {
-								Type:        framework.TypeInt,
-								Description: `Safety buffer time duration`,
-								Required:    true,
-							},
-							"issuer_safety_buffer": {
-								Type:        framework.TypeInt,
-								Description: `Issuer safety buffer`,
-								Required:    true,
-							},
-							"revocation_queue_safety_buffer": {
-								Type:        framework.TypeInt,
-								Description: `Revocation queue safety buffer`,
-								Required:    true,
-							},
-							"acme_account_safety_buffer": {
-								Type:        framework.TypeInt,
-								Description: `Safety buffer after creation after which accounts lacking orders are revoked`,
-								Required:    false,
-							},
-							"tidy_cert_store": {
-								Type:        framework.TypeBool,
-								Description: `Tidy certificate store`,
-								Required:    true,
-							},
-							"tidy_revoked_certs": {
-								Type:        framework.TypeBool,
-								Description: `Tidy revoked certificates`,
-								Required:    true,
-							},
-							"tidy_revoked_cert_issuer_associations": {
-								Type:        framework.TypeBool,
-								Description: `Tidy revoked certificate issuer associations`,
-								Required:    true,
-							},
-							"tidy_expired_issuers": {
-								Type:        framework.TypeBool,
-								Description: `Tidy expired issuers`,
-								Required:    true,
-							},
-							"tidy_cross_cluster_revoked_certs": {
-								Type:        framework.TypeString,
-								Description: ``,
-								Required:    false,
-							},
-							"tidy_acme": {
-								Type:        framework.TypeBool,
-								Description: `Tidy Unused Acme Accounts, and Orders`,
-								Required:    true,
-							},
-							"pause_duration": {
-								Type:        framework.TypeString,
-								Description: `Duration to pause between tidying certificates`,
-								Required:    true,
-							},
-							"state": {
-								Type:        framework.TypeString,
-								Description: `One of Inactive, Running, Finished, or Error`,
-								Required:    true,
-							},
-							"error": {
-								Type:        framework.TypeString,
-								Description: `The error message`,
-								Required:    true,
-							},
-							"time_started": {
-								Type:        framework.TypeString,
-								Description: `Time the operation started`,
-								Required:    true,
-							},
-							"time_finished": {
-								Type:        framework.TypeString,
-								Description: `Time the operation finished`,
-								Required:    false,
-							},
-							"last_auto_tidy_finished": {
-								Type:        framework.TypeString,
-								Description: `Time the last auto-tidy operation finished`,
-								Required:    true,
-							},
-							"message": {
-								Type:        framework.TypeString,
-								Description: `Message of the operation`,
-								Required:    true,
-							},
-							"cert_store_deleted_count": {
-								Type:        framework.TypeInt,
-								Description: `The number of certificate storage entries deleted`,
-								Required:    true,
-							},
-							"revoked_cert_deleted_count": {
-								Type:        framework.TypeInt,
-								Description: `The number of revoked certificate entries deleted`,
-								Required:    true,
-							},
-							"current_cert_store_count": {
-								Type:        framework.TypeInt,
-								Description: `The number of revoked certificate entries deleted`,
-								Required:    true,
-							},
-							"cross_revoked_cert_deleted_count": {
-								Type:        framework.TypeInt,
-								Description: ``,
-								Required:    true,
-							},
-							"current_revoked_cert_count": {
-								Type:        framework.TypeInt,
-								Description: `The number of revoked certificate entries deleted`,
-								Required:    true,
-							},
-							"revocation_queue_deleted_count": {
-								Type:     framework.TypeInt,
-								Required: true,
-							},
-							"tidy_move_legacy_ca_bundle": {
-								Type:     framework.TypeBool,
-								Required: true,
-							},
-							"tidy_revocation_queue": {
-								Type:     framework.TypeBool,
-								Required: true,
-							},
-							"missing_issuer_cert_count": {
-								Type:     framework.TypeInt,
-								Required: true,
-							},
-							"internal_backend_uuid": {
-								Type:     framework.TypeString,
-								Required: true,
-							},
-							"total_acme_account_count": {
-								Type:        framework.TypeInt,
-								Description: `Total number of acme accounts iterated over`,
-								Required:    false,
-							},
-							"acme_account_deleted_count": {
-								Type:        framework.TypeInt,
-								Description: `The number of revoked acme accounts removed`,
-								Required:    false,
-							},
-							"acme_account_revoked_count": {
-								Type:        framework.TypeInt,
-								Description: `The number of unused acme accounts revoked`,
-								Required:    false,
-							},
-							"acme_orders_deleted_count": {
-								Type:        framework.TypeInt,
-								Description: `The number of expired, unused acme orders removed`,
-								Required:    false,
-							},
-						},
-					}},
-				},
+				Callback:                  b.pathTidyStatusRead,
 				ForwardPerformanceStandby: true,
 			},
 		},
@@ -510,9 +84,6 @@ func pathTidyStatus(b *backend) *framework.Path {
 func pathConfigAutoTidy(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "config/auto-tidy",
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixPKI,
-		},
 		Fields: addTidyFields(map[string]*framework.FieldSchema{
 			"enabled": {
 				Type:        framework.TypeBool,
@@ -523,207 +94,13 @@ func pathConfigAutoTidy(b *backend) *framework.Path {
 				Description: `Interval at which to run an auto-tidy operation. This is the time between tidy invocations (after one finishes to the start of the next). Running a manual tidy will reset this duration.`,
 				Default:     int(defaultTidyConfig.Interval / time.Second), // TypeDurationSecond currently requires the default to be an int.
 			},
-			"maintain_stored_certificate_counts": {
-				Type: framework.TypeBool,
-				Description: `This configures whether stored certificates
-are counted upon initialization of the backend, and whether during
-normal operation, a running count of certificates stored is maintained.`,
-				Default: false,
-			},
-			"publish_stored_certificate_count_metrics": {
-				Type: framework.TypeBool,
-				Description: `This configures whether the stored certificate
-count is published to the metrics consumer.  It does not affect if the
-stored certificate count is maintained, and if maintained, it will be
-available on the tidy-status endpoint.`,
-				Default: false,
-			},
 		}),
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.ReadOperation: &framework.PathOperation{
 				Callback: b.pathConfigAutoTidyRead,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationSuffix: "auto-tidy-configuration",
-				},
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"enabled": {
-								Type:        framework.TypeBool,
-								Description: `Specifies whether automatic tidy is enabled or not`,
-								Required:    true,
-							},
-							"interval_duration": {
-								Type:        framework.TypeInt,
-								Description: `Specifies the duration between automatic tidy operation`,
-								Required:    true,
-							},
-							"tidy_cert_store": {
-								Type:        framework.TypeBool,
-								Description: `Specifies whether to tidy up the certificate store`,
-								Required:    true,
-							},
-							"tidy_revoked_certs": {
-								Type:        framework.TypeBool,
-								Description: `Specifies whether to remove all invalid and expired certificates from storage`,
-								Required:    true,
-							},
-							"tidy_revoked_cert_issuer_associations": {
-								Type:        framework.TypeBool,
-								Description: `Specifies whether to associate revoked certificates with their corresponding issuers`,
-								Required:    true,
-							},
-							"tidy_expired_issuers": {
-								Type:        framework.TypeBool,
-								Description: `Specifies whether tidy expired issuers`,
-								Required:    true,
-							},
-							"tidy_acme": {
-								Type:        framework.TypeBool,
-								Description: `Tidy Unused Acme Accounts, and Orders`,
-								Required:    true,
-							},
-							"safety_buffer": {
-								Type:        framework.TypeInt,
-								Description: `Safety buffer time duration`,
-								Required:    true,
-							},
-							"issuer_safety_buffer": {
-								Type:        framework.TypeInt,
-								Description: `Issuer safety buffer`,
-								Required:    true,
-							},
-							"acme_account_safety_buffer": {
-								Type:        framework.TypeInt,
-								Description: `Safety buffer after creation after which accounts lacking orders are revoked`,
-								Required:    false,
-							},
-							"pause_duration": {
-								Type:        framework.TypeString,
-								Description: `Duration to pause between tidying certificates`,
-								Required:    true,
-							},
-							"tidy_move_legacy_ca_bundle": {
-								Type:     framework.TypeBool,
-								Required: true,
-							},
-							"tidy_cross_cluster_revoked_certs": {
-								Type:     framework.TypeBool,
-								Required: true,
-							},
-							"tidy_revocation_queue": {
-								Type:     framework.TypeBool,
-								Required: true,
-							},
-							"revocation_queue_safety_buffer": {
-								Type:     framework.TypeDurationSecond,
-								Required: true,
-							},
-							"publish_stored_certificate_count_metrics": {
-								Type:     framework.TypeBool,
-								Required: true,
-							},
-							"maintain_stored_certificate_counts": {
-								Type:     framework.TypeBool,
-								Required: true,
-							},
-						},
-					}},
-				},
 			},
 			logical.UpdateOperation: &framework.PathOperation{
 				Callback: b.pathConfigAutoTidyWrite,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb:   "configure",
-					OperationSuffix: "auto-tidy",
-				},
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"enabled": {
-								Type:        framework.TypeBool,
-								Description: `Specifies whether automatic tidy is enabled or not`,
-								Required:    true,
-							},
-							"interval_duration": {
-								Type:        framework.TypeInt,
-								Description: `Specifies the duration between automatic tidy operation`,
-								Required:    true,
-							},
-							"tidy_cert_store": {
-								Type:        framework.TypeBool,
-								Description: `Specifies whether to tidy up the certificate store`,
-								Required:    true,
-							},
-							"tidy_revoked_certs": {
-								Type:        framework.TypeBool,
-								Description: `Specifies whether to remove all invalid and expired certificates from storage`,
-								Required:    true,
-							},
-							"tidy_revoked_cert_issuer_associations": {
-								Type:        framework.TypeBool,
-								Description: `Specifies whether to associate revoked certificates with their corresponding issuers`,
-								Required:    true,
-							},
-							"tidy_expired_issuers": {
-								Type:        framework.TypeBool,
-								Description: `Specifies whether tidy expired issuers`,
-								Required:    true,
-							},
-							"tidy_acme": {
-								Type:        framework.TypeBool,
-								Description: `Tidy Unused Acme Accounts, and Orders`,
-								Required:    true,
-							},
-							"safety_buffer": {
-								Type:        framework.TypeInt,
-								Description: `Safety buffer time duration`,
-								Required:    true,
-							},
-							"issuer_safety_buffer": {
-								Type:        framework.TypeInt,
-								Description: `Issuer safety buffer`,
-								Required:    true,
-							},
-							"acme_account_safety_buffer": {
-								Type:        framework.TypeInt,
-								Description: `Safety buffer after creation after which accounts lacking orders are revoked`,
-								Required:    true,
-							},
-							"pause_duration": {
-								Type:        framework.TypeString,
-								Description: `Duration to pause between tidying certificates`,
-								Required:    true,
-							},
-							"tidy_cross_cluster_revoked_certs": {
-								Type:     framework.TypeBool,
-								Required: true,
-							},
-							"tidy_revocation_queue": {
-								Type:     framework.TypeBool,
-								Required: true,
-							},
-							"tidy_move_legacy_ca_bundle": {
-								Type:     framework.TypeBool,
-								Required: true,
-							},
-							"revocation_queue_safety_buffer": {
-								Type:     framework.TypeDurationSecond,
-								Required: true,
-							},
-							"publish_stored_certificate_count_metrics": {
-								Type:     framework.TypeBool,
-								Required: true,
-							},
-							"maintain_stored_certificate_counts": {
-								Type:     framework.TypeBool,
-								Required: true,
-							},
-						},
-					}},
-				},
 				// Read more about why these flags are set in backend.go.
 				ForwardPerformanceStandby:   true,
 				ForwardPerformanceSecondary: true,
@@ -739,33 +116,13 @@ func (b *backend) pathTidyWrite(ctx context.Context, req *logical.Request, d *fr
 	tidyCertStore := d.Get("tidy_cert_store").(bool)
 	tidyRevokedCerts := d.Get("tidy_revoked_certs").(bool) || d.Get("tidy_revocation_list").(bool)
 	tidyRevokedAssocs := d.Get("tidy_revoked_cert_issuer_associations").(bool)
-	tidyExpiredIssuers := d.Get("tidy_expired_issuers").(bool)
-	tidyBackupBundle := d.Get("tidy_move_legacy_ca_bundle").(bool)
-	issuerSafetyBuffer := d.Get("issuer_safety_buffer").(int)
 	pauseDurationStr := d.Get("pause_duration").(string)
 	pauseDuration := 0 * time.Second
-	tidyRevocationQueue := d.Get("tidy_revocation_queue").(bool)
-	queueSafetyBuffer := d.Get("revocation_queue_safety_buffer").(int)
-	tidyCrossRevokedCerts := d.Get("tidy_cross_cluster_revoked_certs").(bool)
-	tidyAcme := d.Get("tidy_acme").(bool)
-	acmeAccountSafetyBuffer := d.Get("acme_account_safety_buffer").(int)
 
 	if safetyBuffer < 1 {
 		return logical.ErrorResponse("safety_buffer must be greater than zero"), nil
 	}
 
-	if issuerSafetyBuffer < 1 {
-		return logical.ErrorResponse("issuer_safety_buffer must be greater than zero"), nil
-	}
-
-	if queueSafetyBuffer < 1 {
-		return logical.ErrorResponse("revocation_queue_safety_buffer must be greater than zero"), nil
-	}
-
-	if acmeAccountSafetyBuffer < 1 {
-		return logical.ErrorResponse("acme_account_safety_buffer must be greater than zero"), nil
-	}
-
 	if pauseDurationStr != "" {
 		var err error
 		pauseDuration, err = time.ParseDuration(pauseDurationStr)
@@ -779,27 +136,16 @@ func (b *backend) pathTidyWrite(ctx context.Context, req *logical.Request, d *fr
 	}
 
 	bufferDuration := time.Duration(safetyBuffer) * time.Second
-	issuerBufferDuration := time.Duration(issuerSafetyBuffer) * time.Second
-	queueSafetyBufferDuration := time.Duration(queueSafetyBuffer) * time.Second
-	acmeAccountSafetyBufferDuration := time.Duration(acmeAccountSafetyBuffer) * time.Second
 
 	// Manual run with constructed configuration.
 	config := &tidyConfig{
-		Enabled:                 true,
-		Interval:                0 * time.Second,
-		CertStore:               tidyCertStore,
-		RevokedCerts:            tidyRevokedCerts,
-		IssuerAssocs:            tidyRevokedAssocs,
-		ExpiredIssuers:          tidyExpiredIssuers,
-		BackupBundle:            tidyBackupBundle,
-		SafetyBuffer:            bufferDuration,
-		IssuerSafetyBuffer:      issuerBufferDuration,
-		PauseDuration:           pauseDuration,
-		RevocationQueue:         tidyRevocationQueue,
-		QueueSafetyBuffer:       queueSafetyBufferDuration,
-		CrossRevokedCerts:       tidyCrossRevokedCerts,
-		TidyAcme:                tidyAcme,
-		AcmeAccountSafetyBuffer: acmeAccountSafetyBufferDuration,
+		Enabled:       true,
+		Interval:      0 * time.Second,
+		CertStore:     tidyCertStore,
+		RevokedCerts:  tidyRevokedCerts,
+		IssuerAssocs:  tidyRevokedAssocs,
+		SafetyBuffer:  bufferDuration,
+		PauseDuration: pauseDuration,
 	}
 
 	if !atomic.CompareAndSwapUint32(b.tidyCASGuard, 0, 1) {
@@ -824,20 +170,12 @@ func (b *backend) pathTidyWrite(ctx context.Context, req *logical.Request, d *fr
 	b.startTidyOperation(req, config)
 
 	resp := &logical.Response{}
-	if !config.IsAnyTidyEnabled() {
-		resp.AddWarning("Manual tidy requested but no tidy operations were set. Enable at least one tidy operation to be run (" + config.AnyTidyConfig() + ").")
+	if !tidyCertStore && !tidyRevokedCerts && !tidyRevokedAssocs {
+		resp.AddWarning("No targets to tidy; specify tidy_cert_store=true or tidy_revoked_certs=true or tidy_revoked_cert_issuer_associations=true to start a tidy operation.")
 	} else {
 		resp.AddWarning("Tidy operation successfully started. Any information from the operation will be printed to Vault's server logs.")
 	}
 
-	if tidyRevocationQueue || tidyCrossRevokedCerts {
-		isNotPerfPrimary := b.System().ReplicationState().HasState(consts.ReplicationDRSecondary|consts.ReplicationPerformanceStandby) ||
-			(!b.System().LocalMount() && b.System().ReplicationState().HasState(consts.ReplicationPerformanceSecondary))
-		if isNotPerfPrimary {
-			resp.AddWarning("tidy_revocation_queue=true and tidy_cross_cluster_revoked_certs=true can only be set on the active node of the primary cluster unless a local mount is used; this option has been ignored.")
-		}
-	}
-
 	return logical.RespondWithStatusCode(resp, req, http.StatusAccepted)
 }
 
@@ -871,61 +209,6 @@ func (b *backend) startTidyOperation(req *logical.Request, config *tidyConfig) {
 				}
 			}
 
-			// Check for cancel before continuing.
-			if atomic.CompareAndSwapUint32(b.tidyCancelCAS, 1, 0) {
-				return tidyCancelledError
-			}
-
-			if config.ExpiredIssuers {
-				if err := b.doTidyExpiredIssuers(ctx, req, logger, config); err != nil {
-					return err
-				}
-			}
-
-			// Check for cancel before continuing.
-			if atomic.CompareAndSwapUint32(b.tidyCancelCAS, 1, 0) {
-				return tidyCancelledError
-			}
-
-			if config.BackupBundle {
-				if err := b.doTidyMoveCABundle(ctx, req, logger, config); err != nil {
-					return err
-				}
-			}
-
-			// Check for cancel before continuing.
-			if atomic.CompareAndSwapUint32(b.tidyCancelCAS, 1, 0) {
-				return tidyCancelledError
-			}
-
-			if config.RevocationQueue {
-				if err := b.doTidyRevocationQueue(ctx, req, logger, config); err != nil {
-					return err
-				}
-			}
-
-			// Check for cancel before continuing.
-			if atomic.CompareAndSwapUint32(b.tidyCancelCAS, 1, 0) {
-				return tidyCancelledError
-			}
-
-			if config.CrossRevokedCerts {
-				if err := b.doTidyCrossRevocationStore(ctx, req, logger, config); err != nil {
-					return err
-				}
-			}
-
-			// Check for cancel before continuing.
-			if atomic.CompareAndSwapUint32(b.tidyCancelCAS, 1, 0) {
-				return tidyCancelledError
-			}
-
-			if config.TidyAcme {
-				if err := b.doTidyAcme(ctx, req, logger, config); err != nil {
-					return err
-				}
-			}
-
 			return nil
 		}
 
@@ -995,7 +278,7 @@ func (b *backend) doTidyCertStore(ctx context.Context, req *logical.Request, log
 			return fmt.Errorf("unable to parse stored certificate with serial %q: %w", serial, err)
 		}
 
-		if time.Since(cert.NotAfter) > config.SafetyBuffer {
+		if time.Now().After(cert.NotAfter.Add(config.SafetyBuffer)) {
 			if err := req.Storage.Delete(ctx, "certs/"+serial); err != nil {
 				return fmt.Errorf("error deleting serial %q from storage: %w", serial, err)
 			}
@@ -1103,7 +386,7 @@ func (b *backend) doTidyRevocationStore(ctx context.Context, req *logical.Reques
 			// past its NotAfter value. This is because we use the
 			// information on revoked/ to build the CRL and the
 			// information on certs/ for lookup.
-			if time.Since(revokedCert.NotAfter) > config.SafetyBuffer {
+			if time.Now().After(revokedCert.NotAfter.Add(config.SafetyBuffer)) {
 				if err := req.Storage.Delete(ctx, "revoked/"+serial); err != nil {
 					return fmt.Errorf("error deleting serial %q from revoked list: %w", serial, err)
 				}
@@ -1121,12 +404,12 @@ func (b *backend) doTidyRevocationStore(ctx context.Context, req *logical.Reques
 		if storeCert {
 			revokedEntry, err = logical.StorageEntryJSON("revoked/"+serial, revInfo)
 			if err != nil {
-				return fmt.Errorf("error building entry to persist changes to serial %v from revoked list: %w", serial, err)
+				return fmt.Errorf("error building entry to persist changes to serial %v from revoked list: %v", serial, err)
 			}
 
 			err = req.Storage.Put(ctx, revokedEntry)
 			if err != nil {
-				return fmt.Errorf("error persisting changes to serial %v from revoked list: %w", serial, err)
+				return fmt.Errorf("error persisting changes to serial %v from revoked list: %v", serial, err)
 			}
 		}
 	}
@@ -1148,466 +431,9 @@ func (b *backend) doTidyRevocationStore(ctx context.Context, req *logical.Reques
 		}
 
 		if !config.AutoRebuild {
-			warnings, err := b.crlBuilder.rebuild(sc, false)
-			if err != nil {
+			if err := b.crlBuilder.rebuild(ctx, b, req, false); err != nil {
 				return err
 			}
-			if len(warnings) > 0 {
-				msg := "During rebuild of CRL for tidy, got the following warnings:"
-				for index, warning := range warnings {
-					msg = fmt.Sprintf("%v\n %d. %v", msg, index+1, warning)
-				}
-				b.Logger().Warn(msg)
-			}
-		}
-	}
-
-	return nil
-}
-
-func (b *backend) doTidyExpiredIssuers(ctx context.Context, req *logical.Request, logger hclog.Logger, config *tidyConfig) error {
-	// We do not support cancelling within the expired issuers operation.
-	// Any cancellation will occur before or after this operation.
-
-	if b.System().ReplicationState().HasState(consts.ReplicationDRSecondary|consts.ReplicationPerformanceStandby) ||
-		(!b.System().LocalMount() && b.System().ReplicationState().HasState(consts.ReplicationPerformanceSecondary)) {
-		b.Logger().Debug("skipping expired issuer tidy as we're not on the primary or secondary with a local mount")
-		return nil
-	}
-
-	// Short-circuit to avoid having to deal with the legacy mounts. While we
-	// could handle this case and remove these issuers, its somewhat
-	// unexpected behavior and we'd prefer to finish the migration first.
-	if b.useLegacyBundleCaStorage() {
-		return nil
-	}
-
-	b.issuersLock.Lock()
-	defer b.issuersLock.Unlock()
-
-	// Fetch and parse our issuers so we have their expiration date.
-	sc := b.makeStorageContext(ctx, req.Storage)
-	issuerIDCertMap, err := fetchIssuerMapForRevocationChecking(sc)
-	if err != nil {
-		return err
-	}
-
-	// Fetch the issuer config to find the default; we don't want to remove
-	// the current active issuer automatically.
-	iConfig, err := sc.getIssuersConfig()
-	if err != nil {
-		return err
-	}
-
-	// We want certificates which have expired before this date by a given
-	// safety buffer.
-	rebuildChainsAndCRL := false
-
-	for issuer, cert := range issuerIDCertMap {
-		if time.Since(cert.NotAfter) <= config.IssuerSafetyBuffer {
-			continue
-		}
-
-		entry, err := sc.fetchIssuerById(issuer)
-		if err != nil {
-			return nil
-		}
-
-		// This issuer's certificate has expired. We explicitly persist the
-		// key, but log both the certificate and the keyId to the
-		// informational logs so an admin can recover the removed cert if
-		// necessary or remove the key (and know which cert it belonged to),
-		// if desired.
-		msg := "[Tidy on mount: %v] Issuer %v has expired by %v and is being removed."
-		idAndName := fmt.Sprintf("[id:%v/name:%v]", entry.ID, entry.Name)
-		msg = fmt.Sprintf(msg, b.backendUUID, idAndName, config.IssuerSafetyBuffer)
-
-		// Before we log, check if we're the default. While this is late, and
-		// after we read it from storage, we have more info here to tell the
-		// user that their default has expired AND has passed the safety
-		// buffer.
-		if iConfig.DefaultIssuerId == issuer {
-			msg = "[Tidy on mount: %v] Issuer %v has expired and would be removed via tidy, but won't be, as it is currently the default issuer."
-			msg = fmt.Sprintf(msg, b.backendUUID, idAndName)
-			b.Logger().Warn(msg)
-			continue
-		}
-
-		// Log the above message..
-		b.Logger().Info(msg, "serial_number", entry.SerialNumber, "key_id", entry.KeyID, "certificate", entry.Certificate)
-
-		wasDefault, err := sc.deleteIssuer(issuer)
-		if err != nil {
-			b.Logger().Error(fmt.Sprintf("failed to remove %v: %v", idAndName, err))
-			return err
-		}
-		if wasDefault {
-			b.Logger().Warn(fmt.Sprintf("expired issuer %v was default; it is strongly encouraged to choose a new default issuer for backwards compatibility", idAndName))
-		}
-
-		rebuildChainsAndCRL = true
-	}
-
-	if rebuildChainsAndCRL {
-		// When issuers are removed, there's a chance chains change as a
-		// result; remove them.
-		if err := sc.rebuildIssuersChains(nil); err != nil {
-			return err
-		}
-
-		// Removal of issuers is generally a good reason to rebuild the CRL,
-		// even if auto-rebuild is enabled.
-		b.revokeStorageLock.Lock()
-		defer b.revokeStorageLock.Unlock()
-
-		warnings, err := b.crlBuilder.rebuild(sc, false)
-		if err != nil {
-			return err
-		}
-		if len(warnings) > 0 {
-			msg := "During rebuild of CRL for tidy, got the following warnings:"
-			for index, warning := range warnings {
-				msg = fmt.Sprintf("%v\n %d. %v", msg, index+1, warning)
-			}
-			b.Logger().Warn(msg)
-		}
-	}
-
-	return nil
-}
-
-func (b *backend) doTidyMoveCABundle(ctx context.Context, req *logical.Request, logger hclog.Logger, config *tidyConfig) error {
-	// We do not support cancelling within this operation; any cancel will
-	// occur before or after this operation.
-
-	if b.System().ReplicationState().HasState(consts.ReplicationDRSecondary|consts.ReplicationPerformanceStandby) ||
-		(!b.System().LocalMount() && b.System().ReplicationState().HasState(consts.ReplicationPerformanceSecondary)) {
-		b.Logger().Debug("skipping moving the legacy CA bundle as we're not on the primary or secondary with a local mount")
-		return nil
-	}
-
-	// Short-circuit to avoid moving the legacy bundle from under a legacy
-	// mount.
-	if b.useLegacyBundleCaStorage() {
-		return nil
-	}
-
-	// If we've already run, exit.
-	_, bundle, err := getLegacyCertBundle(ctx, req.Storage)
-	if err != nil {
-		return fmt.Errorf("failed to fetch the legacy CA bundle: %w", err)
-	}
-
-	if bundle == nil {
-		b.Logger().Debug("No legacy CA bundle available; nothing to do.")
-		return nil
-	}
-
-	log, err := getLegacyBundleMigrationLog(ctx, req.Storage)
-	if err != nil {
-		return fmt.Errorf("failed to fetch the legacy bundle migration log: %w", err)
-	}
-
-	if log == nil {
-		return fmt.Errorf("refusing to tidy with an empty legacy migration log but present CA bundle: %w", err)
-	}
-
-	if time.Since(log.Created) <= config.IssuerSafetyBuffer {
-		b.Logger().Debug("Migration was created too recently to remove the legacy bundle; refusing to move legacy CA bundle to backup location.")
-		return nil
-	}
-
-	// Do the write before the delete.
-	entry, err := logical.StorageEntryJSON(legacyCertBundleBackupPath, bundle)
-	if err != nil {
-		return fmt.Errorf("failed to create new backup storage entry: %w", err)
-	}
-
-	err = req.Storage.Put(ctx, entry)
-	if err != nil {
-		return fmt.Errorf("failed to write new backup legacy CA bundle: %w", err)
-	}
-
-	err = req.Storage.Delete(ctx, legacyCertBundlePath)
-	if err != nil {
-		return fmt.Errorf("failed to remove old legacy CA bundle path: %w", err)
-	}
-
-	b.Logger().Info("legacy CA bundle successfully moved to backup location")
-	return nil
-}
-
-func (b *backend) doTidyRevocationQueue(ctx context.Context, req *logical.Request, logger hclog.Logger, config *tidyConfig) error {
-	if b.System().ReplicationState().HasState(consts.ReplicationDRSecondary|consts.ReplicationPerformanceStandby) ||
-		(!b.System().LocalMount() && b.System().ReplicationState().HasState(consts.ReplicationPerformanceSecondary)) {
-		b.Logger().Debug("skipping cross-cluster revocation queue tidy as we're not on the primary or secondary with a local mount")
-		return nil
-	}
-
-	sc := b.makeStorageContext(ctx, req.Storage)
-	clusters, err := sc.Storage.List(sc.Context, crossRevocationPrefix)
-	if err != nil {
-		return fmt.Errorf("failed to list cross-cluster revocation queue participating clusters: %w", err)
-	}
-
-	// Grab locks as we're potentially modifying revocation-related storage.
-	b.revokeStorageLock.Lock()
-	defer b.revokeStorageLock.Unlock()
-
-	for cIndex, cluster := range clusters {
-		if cluster[len(cluster)-1] == '/' {
-			cluster = cluster[0 : len(cluster)-1]
-		}
-
-		cPath := crossRevocationPrefix + cluster + "/"
-		serials, err := sc.Storage.List(sc.Context, cPath)
-		if err != nil {
-			return fmt.Errorf("failed to list cross-cluster revocation queue entries for cluster %v (%v): %w", cluster, cIndex, err)
-		}
-
-		for _, serial := range serials {
-			// Check for cancellation.
-			if atomic.CompareAndSwapUint32(b.tidyCancelCAS, 1, 0) {
-				return tidyCancelledError
-			}
-
-			// Check for pause duration to reduce resource consumption.
-			if config.PauseDuration > (0 * time.Second) {
-				b.revokeStorageLock.Unlock()
-				time.Sleep(config.PauseDuration)
-				b.revokeStorageLock.Lock()
-			}
-
-			// Confirmation entries _should_ be handled by this cluster's
-			// processRevocationQueue(...) invocation; if not, when the plugin
-			// reloads, maybeGatherQueueForFirstProcess(...) will remove all
-			// stale confirmation requests. However, we don't want to force an
-			// operator to reload their in-use plugin, so allow tidy to also
-			// clean up confirmation values without reloading.
-			if serial[len(serial)-1] == '/' {
-				// Check if we have a confirmed entry.
-				confirmedPath := cPath + serial + "confirmed"
-				removalEntry, err := sc.Storage.Get(sc.Context, confirmedPath)
-				if err != nil {
-					return fmt.Errorf("error reading revocation confirmation (%v) during tidy: %w", confirmedPath, err)
-				}
-				if removalEntry == nil {
-					continue
-				}
-
-				// Remove potential revocation requests from all clusters.
-				for _, subCluster := range clusters {
-					if subCluster[len(subCluster)-1] == '/' {
-						subCluster = subCluster[0 : len(subCluster)-1]
-					}
-
-					reqPath := subCluster + "/" + serial[0:len(serial)-1]
-					if err := sc.Storage.Delete(sc.Context, reqPath); err != nil {
-						return fmt.Errorf("failed to remove confirmed revocation request on candidate cluster (%v): %w", reqPath, err)
-					}
-				}
-
-				// Then delete the confirmation.
-				if err := sc.Storage.Delete(sc.Context, confirmedPath); err != nil {
-					return fmt.Errorf("failed to remove confirmed revocation confirmation (%v): %w", confirmedPath, err)
-				}
-
-				// No need to handle a revocation request at this path: it can't
-				// still exist on this cluster after we deleted it above.
-				continue
-			}
-
-			ePath := cPath + serial
-			entry, err := sc.Storage.Get(sc.Context, ePath)
-			if err != nil {
-				return fmt.Errorf("error reading revocation request (%v) to tidy: %w", ePath, err)
-			}
-			if entry == nil || entry.Value == nil {
-				continue
-			}
-
-			var revRequest revocationRequest
-			if err := entry.DecodeJSON(&revRequest); err != nil {
-				return fmt.Errorf("error reading revocation request (%v) to tidy: %w", ePath, err)
-			}
-
-			if time.Since(revRequest.RequestedAt) <= config.QueueSafetyBuffer {
-				continue
-			}
-
-			// Safe to remove this entry.
-			if err := sc.Storage.Delete(sc.Context, ePath); err != nil {
-				return fmt.Errorf("error deleting revocation request (%v): %w", ePath, err)
-			}
-
-			// Assumption: there should never be a need to remove this from
-			// the processing queue on this node. We're on the active primary,
-			// so our writes don't cause invalidations. This means we'd have
-			// to have slated it for deletion very quickly after it'd been
-			// sent (i.e., inside of the 1-minute boundary that periodicFunc
-			// executes at). While this is possible, because we grab the
-			// revocationStorageLock above, we can't execute interleaved
-			// with that periodicFunc, so the periodicFunc would've had to
-			// finished before we actually did this deletion (or it wouldn't
-			// have ignored this serial because our deletion would've
-			// happened prior to it reading the storage entry). Thus we should
-			// be safe to ignore the revocation queue removal here.
-			b.tidyStatusIncRevQueueCount()
-		}
-	}
-
-	return nil
-}
-
-func (b *backend) doTidyCrossRevocationStore(ctx context.Context, req *logical.Request, logger hclog.Logger, config *tidyConfig) error {
-	if b.System().ReplicationState().HasState(consts.ReplicationDRSecondary|consts.ReplicationPerformanceStandby) ||
-		(!b.System().LocalMount() && b.System().ReplicationState().HasState(consts.ReplicationPerformanceSecondary)) {
-		b.Logger().Debug("skipping cross-cluster revoked certificate store tidy as we're not on the primary or secondary with a local mount")
-		return nil
-	}
-
-	sc := b.makeStorageContext(ctx, req.Storage)
-	clusters, err := sc.Storage.List(sc.Context, unifiedRevocationReadPathPrefix)
-	if err != nil {
-		return fmt.Errorf("failed to list cross-cluster revoked certificate store participating clusters: %w", err)
-	}
-
-	// Grab locks as we're potentially modifying revocation-related storage.
-	b.revokeStorageLock.Lock()
-	defer b.revokeStorageLock.Unlock()
-
-	for cIndex, cluster := range clusters {
-		if cluster[len(cluster)-1] == '/' {
-			cluster = cluster[0 : len(cluster)-1]
-		}
-
-		cPath := unifiedRevocationReadPathPrefix + cluster + "/"
-		serials, err := sc.Storage.List(sc.Context, cPath)
-		if err != nil {
-			return fmt.Errorf("failed to list cross-cluster revoked certificate store entries for cluster %v (%v): %w", cluster, cIndex, err)
-		}
-
-		for _, serial := range serials {
-			// Check for cancellation.
-			if atomic.CompareAndSwapUint32(b.tidyCancelCAS, 1, 0) {
-				return tidyCancelledError
-			}
-
-			// Check for pause duration to reduce resource consumption.
-			if config.PauseDuration > (0 * time.Second) {
-				b.revokeStorageLock.Unlock()
-				time.Sleep(config.PauseDuration)
-				b.revokeStorageLock.Lock()
-			}
-
-			ePath := cPath + serial
-			entry, err := sc.Storage.Get(sc.Context, ePath)
-			if err != nil {
-				return fmt.Errorf("error reading cross-cluster revocation entry (%v) to tidy: %w", ePath, err)
-			}
-			if entry == nil || entry.Value == nil {
-				continue
-			}
-
-			var details unifiedRevocationEntry
-			if err := entry.DecodeJSON(&details); err != nil {
-				return fmt.Errorf("error decoding cross-cluster revocation entry (%v) to tidy: %w", ePath, err)
-			}
-
-			if time.Since(details.CertExpiration) <= config.SafetyBuffer {
-				continue
-			}
-
-			// Safe to remove this entry.
-			if err := sc.Storage.Delete(sc.Context, ePath); err != nil {
-				return fmt.Errorf("error deleting revocation request (%v): %w", ePath, err)
-			}
-
-			b.tidyStatusIncCrossRevCertCount()
-		}
-	}
-
-	return nil
-}
-
-func (b *backend) doTidyAcme(ctx context.Context, req *logical.Request, logger hclog.Logger, config *tidyConfig) error {
-	b.acmeAccountLock.Lock()
-	defer b.acmeAccountLock.Unlock()
-
-	sc := b.makeStorageContext(ctx, req.Storage)
-	thumbprints, err := sc.Storage.List(ctx, acmeThumbprintPrefix)
-	if err != nil {
-		return err
-	}
-
-	b.tidyStatusLock.Lock()
-	b.tidyStatus.acmeAccountsCount = uint(len(thumbprints))
-	b.tidyStatusLock.Unlock()
-
-	baseUrl, _, err := getAcmeBaseUrl(sc, req)
-	if err != nil {
-		return err
-	}
-
-	acmeCtx := &acmeContext{
-		baseUrl: baseUrl,
-		sc:      sc,
-	}
-
-	for _, thumbprint := range thumbprints {
-		err := b.tidyAcmeAccountByThumbprint(b.acmeState, acmeCtx, thumbprint, config.SafetyBuffer, config.AcmeAccountSafetyBuffer)
-		if err != nil {
-			logger.Warn("error tidying account %v: %v", thumbprint, err.Error())
-		}
-
-		// Check for cancel before continuing.
-		if atomic.CompareAndSwapUint32(b.tidyCancelCAS, 1, 0) {
-			return tidyCancelledError
-		}
-
-		// Check for pause duration to reduce resource consumption.
-		if config.PauseDuration > (0 * time.Second) {
-			b.acmeAccountLock.Unlock() // Correct the Lock
-			time.Sleep(config.PauseDuration)
-			b.acmeAccountLock.Lock()
-		}
-
-	}
-
-	// Clean up any unused EAB
-	eabIds, err := b.acmeState.ListEabIds(sc)
-	if err != nil {
-		return fmt.Errorf("failed listing EAB ids: %w", err)
-	}
-
-	for _, eabId := range eabIds {
-		eab, err := b.acmeState.LoadEab(sc, eabId)
-		if err != nil {
-			if errors.Is(err, ErrStorageItemNotFound) {
-				// We don't need to worry about a consumed EAB
-				continue
-			}
-			return err
-		}
-
-		eabExpiration := eab.CreatedOn.Add(config.AcmeAccountSafetyBuffer)
-		if time.Now().After(eabExpiration) {
-			_, err := b.acmeState.DeleteEab(sc, eabId)
-			if err != nil {
-				return fmt.Errorf("failed to tidy eab %s: %w", eabId, err)
-			}
-		}
-
-		// Check for cancel before continuing.
-		if atomic.CompareAndSwapUint32(b.tidyCancelCAS, 1, 0) {
-			return tidyCancelledError
-		}
-
-		// Check for pause duration to reduce resource consumption.
-		if config.PauseDuration > (0 * time.Second) {
-			b.acmeAccountLock.Unlock() // Correct the Lock
-			time.Sleep(config.PauseDuration)
-			b.acmeAccountLock.Lock()
 		}
 	}
 
@@ -1644,15 +470,9 @@ func (b *backend) pathTidyStatusRead(_ context.Context, _ *logical.Request, _ *f
 	resp := &logical.Response{
 		Data: map[string]interface{}{
 			"safety_buffer":                         nil,
-			"issuer_safety_buffer":                  nil,
 			"tidy_cert_store":                       nil,
 			"tidy_revoked_certs":                    nil,
 			"tidy_revoked_cert_issuer_associations": nil,
-			"tidy_expired_issuers":                  nil,
-			"tidy_move_legacy_ca_bundle":            nil,
-			"tidy_revocation_queue":                 nil,
-			"tidy_cross_cluster_revoked_certs":      nil,
-			"tidy_acme":                             nil,
 			"pause_duration":                        nil,
 			"state":                                 "Inactive",
 			"error":                                 nil,
@@ -1664,60 +484,23 @@ func (b *backend) pathTidyStatusRead(_ context.Context, _ *logical.Request, _ *f
 			"missing_issuer_cert_count":             nil,
 			"current_cert_store_count":              nil,
 			"current_revoked_cert_count":            nil,
-			"internal_backend_uuid":                 nil,
-			"revocation_queue_deleted_count":        nil,
-			"cross_revoked_cert_deleted_count":      nil,
-			"total_acme_account_count":              nil,
-			"acme_account_deleted_count":            nil,
-			"acme_account_revoked_count":            nil,
-			"acme_orders_deleted_count":             nil,
-			"acme_account_safety_buffer":            nil,
 		},
 	}
 
-	resp.Data["internal_backend_uuid"] = b.backendUUID
-
-	if b.certCountEnabled.Load() {
-		resp.Data["current_cert_store_count"] = b.certCount.Load()
-		resp.Data["current_revoked_cert_count"] = b.revokedCertCount.Load()
-		if !b.certsCounted.Load() {
-			resp.AddWarning("Certificates in storage are still being counted, current counts provided may be " +
-				"inaccurate")
-		}
-		if b.certCountError != "" {
-			resp.Data["certificate_counting_error"] = b.certCountError
-		}
-	}
-
 	if b.tidyStatus.state == tidyStatusInactive {
 		return resp, nil
 	}
 
 	resp.Data["safety_buffer"] = b.tidyStatus.safetyBuffer
-	resp.Data["issuer_safety_buffer"] = b.tidyStatus.issuerSafetyBuffer
 	resp.Data["tidy_cert_store"] = b.tidyStatus.tidyCertStore
 	resp.Data["tidy_revoked_certs"] = b.tidyStatus.tidyRevokedCerts
 	resp.Data["tidy_revoked_cert_issuer_associations"] = b.tidyStatus.tidyRevokedAssocs
-	resp.Data["tidy_expired_issuers"] = b.tidyStatus.tidyExpiredIssuers
-	resp.Data["tidy_move_legacy_ca_bundle"] = b.tidyStatus.tidyBackupBundle
-	resp.Data["tidy_revocation_queue"] = b.tidyStatus.tidyRevocationQueue
-	resp.Data["tidy_cross_cluster_revoked_certs"] = b.tidyStatus.tidyCrossRevokedCerts
-	resp.Data["tidy_acme"] = b.tidyStatus.tidyAcme
 	resp.Data["pause_duration"] = b.tidyStatus.pauseDuration
 	resp.Data["time_started"] = b.tidyStatus.timeStarted
 	resp.Data["message"] = b.tidyStatus.message
 	resp.Data["cert_store_deleted_count"] = b.tidyStatus.certStoreDeletedCount
 	resp.Data["revoked_cert_deleted_count"] = b.tidyStatus.revokedCertDeletedCount
 	resp.Data["missing_issuer_cert_count"] = b.tidyStatus.missingIssuerCertCount
-	resp.Data["revocation_queue_deleted_count"] = b.tidyStatus.revQueueDeletedCount
-	resp.Data["cross_revoked_cert_deleted_count"] = b.tidyStatus.crossRevokedDeletedCount
-	resp.Data["revocation_queue_safety_buffer"] = b.tidyStatus.revQueueSafetyBuffer
-	resp.Data["last_auto_tidy_finished"] = b.lastTidy
-	resp.Data["total_acme_account_count"] = b.tidyStatus.acmeAccountsCount
-	resp.Data["acme_account_deleted_count"] = b.tidyStatus.acmeAccountsDeletedCount
-	resp.Data["acme_account_revoked_count"] = b.tidyStatus.acmeAccountsRevokedCount
-	resp.Data["acme_orders_deleted_count"] = b.tidyStatus.acmeOrdersDeletedCount
-	resp.Data["acme_account_safety_buffer"] = b.tidyStatus.acmeAccountSafetyBuffer
 
 	switch b.tidyStatus.state {
 	case tidyStatusStarted:
@@ -1739,6 +522,14 @@ func (b *backend) pathTidyStatusRead(_ context.Context, _ *logical.Request, _ *f
 		resp.Data["time_finished"] = b.tidyStatus.timeFinished
 	}
 
+	resp.Data["current_cert_store_count"] = atomic.LoadUint32(b.certCount)
+	resp.Data["current_revoked_cert_count"] = atomic.LoadUint32(b.revokedCertCount)
+
+	if !b.certsCounted.Load() {
+		resp.AddWarning("Certificates in storage are still being counted, current counts provided may be " +
+			"inaccurate")
+	}
+
 	return resp, nil
 }
 
@@ -1750,7 +541,15 @@ func (b *backend) pathConfigAutoTidyRead(ctx context.Context, req *logical.Reque
 	}
 
 	return &logical.Response{
-		Data: getTidyConfigData(*config),
+		Data: map[string]interface{}{
+			"enabled":                               config.Enabled,
+			"interval_duration":                     int(config.Interval / time.Second),
+			"tidy_cert_store":                       config.CertStore,
+			"tidy_revoked_certs":                    config.RevokedCerts,
+			"tidy_revoked_cert_issuer_associations": config.IssuerAssocs,
+			"safety_buffer":                         int(config.SafetyBuffer / time.Second),
+			"pause_duration":                        config.PauseDuration.String(),
+		},
 	}, nil
 }
 
@@ -1787,7 +586,7 @@ func (b *backend) pathConfigAutoTidyWrite(ctx context.Context, req *logical.Requ
 	if safetyBufferRaw, ok := d.GetOk("safety_buffer"); ok {
 		config.SafetyBuffer = time.Duration(safetyBufferRaw.(int)) * time.Second
 		if config.SafetyBuffer < 1*time.Second {
-			return logical.ErrorResponse(fmt.Sprintf("given safety_buffer must be at least one second; got: %v", safetyBufferRaw)), nil
+			return logical.ErrorResponse(fmt.Sprintf("given safety_buffer must be greater than zero seconds; got: %v", safetyBufferRaw)), nil
 		}
 	}
 
@@ -1802,63 +601,11 @@ func (b *backend) pathConfigAutoTidyWrite(ctx context.Context, req *logical.Requ
 		}
 	}
 
-	if expiredIssuers, ok := d.GetOk("tidy_expired_issuers"); ok {
-		config.ExpiredIssuers = expiredIssuers.(bool)
-	}
-
-	if issuerSafetyBufferRaw, ok := d.GetOk("issuer_safety_buffer"); ok {
-		config.IssuerSafetyBuffer = time.Duration(issuerSafetyBufferRaw.(int)) * time.Second
-		if config.IssuerSafetyBuffer < 1*time.Second {
-			return logical.ErrorResponse(fmt.Sprintf("given safety_buffer must be at least one second; got: %v", issuerSafetyBufferRaw)), nil
-		}
-	}
-
-	if backupBundle, ok := d.GetOk("tidy_move_legacy_ca_bundle"); ok {
-		config.BackupBundle = backupBundle.(bool)
-	}
-
-	if revocationQueueRaw, ok := d.GetOk("tidy_revocation_queue"); ok {
-		config.RevocationQueue = revocationQueueRaw.(bool)
-	}
-
-	if queueSafetyBufferRaw, ok := d.GetOk("revocation_queue_safety_buffer"); ok {
-		config.QueueSafetyBuffer = time.Duration(queueSafetyBufferRaw.(int)) * time.Second
-		if config.QueueSafetyBuffer < 1*time.Second {
-			return logical.ErrorResponse(fmt.Sprintf("given revocation_queue_safety_buffer must be at least one second; got: %v", queueSafetyBufferRaw)), nil
-		}
-	}
-
-	if crossRevokedRaw, ok := d.GetOk("tidy_cross_cluster_revoked_certs"); ok {
-		config.CrossRevokedCerts = crossRevokedRaw.(bool)
-	}
-
-	if tidyAcmeRaw, ok := d.GetOk("tidy_acme"); ok {
-		config.TidyAcme = tidyAcmeRaw.(bool)
-	}
-
-	if config.Enabled && !config.IsAnyTidyEnabled() {
-		return logical.ErrorResponse("Auto-tidy enabled but no tidy operations were requested. Enable at least one tidy operation to be run (" + config.AnyTidyConfig() + ")."), nil
-	}
-
-	if maintainCountEnabledRaw, ok := d.GetOk("maintain_stored_certificate_counts"); ok {
-		config.MaintainCount = maintainCountEnabledRaw.(bool)
-	}
-
-	if runningStorageMetricsEnabledRaw, ok := d.GetOk("publish_stored_certificate_count_metrics"); ok {
-		config.PublishMetrics = runningStorageMetricsEnabledRaw.(bool)
-	}
-
-	if config.PublishMetrics && !config.MaintainCount {
-		return logical.ErrorResponse("Can not publish a running storage metrics count to metrics without first maintaining that count.  Enable `maintain_stored_certificate_counts` to enable `publish_stored_certificate_count_metrics`."), nil
+	if config.Enabled && !(config.CertStore || config.RevokedCerts || config.IssuerAssocs) {
+		return logical.ErrorResponse("Auto-tidy enabled but no tidy operations were requested. Enable at least one tidy operation to be run (tidy_cert_store / tidy_revoked_certs / tidy_revoked_cert_issuer_associations)."), nil
 	}
 
-	if err := sc.writeAutoTidyConfig(config); err != nil {
-		return nil, err
-	}
-
-	return &logical.Response{
-		Data: getTidyConfigData(*config),
-	}, nil
+	return nil, sc.writeAutoTidyConfig(config)
 }
 
 func (b *backend) tidyStatusStart(config *tidyConfig) {
@@ -1866,19 +613,11 @@ func (b *backend) tidyStatusStart(config *tidyConfig) {
 	defer b.tidyStatusLock.Unlock()
 
 	b.tidyStatus = &tidyStatus{
-		safetyBuffer:            int(config.SafetyBuffer / time.Second),
-		issuerSafetyBuffer:      int(config.IssuerSafetyBuffer / time.Second),
-		revQueueSafetyBuffer:    int(config.QueueSafetyBuffer / time.Second),
-		acmeAccountSafetyBuffer: int(config.AcmeAccountSafetyBuffer / time.Second),
-		tidyCertStore:           config.CertStore,
-		tidyRevokedCerts:        config.RevokedCerts,
-		tidyRevokedAssocs:       config.IssuerAssocs,
-		tidyExpiredIssuers:      config.ExpiredIssuers,
-		tidyBackupBundle:        config.BackupBundle,
-		tidyRevocationQueue:     config.RevocationQueue,
-		tidyCrossRevokedCerts:   config.CrossRevokedCerts,
-		tidyAcme:                config.TidyAcme,
-		pauseDuration:           config.PauseDuration.String(),
+		safetyBuffer:      int(config.SafetyBuffer / time.Second),
+		tidyCertStore:     config.CertStore,
+		tidyRevokedCerts:  config.RevokedCerts,
+		tidyRevokedAssocs: config.IssuerAssocs,
+		pauseDuration:     config.PauseDuration.String(),
 
 		state:       tidyStatusStarted,
 		timeStarted: time.Now(),
@@ -1926,7 +665,7 @@ func (b *backend) tidyStatusIncCertStoreCount() {
 
 	b.tidyStatus.certStoreDeletedCount++
 
-	b.ifCountEnabledDecrementTotalCertificatesCountReport()
+	b.decrementTotalCertificatesCountReport()
 }
 
 func (b *backend) tidyStatusIncRevokedCertCount() {
@@ -1935,7 +674,7 @@ func (b *backend) tidyStatusIncRevokedCertCount() {
 
 	b.tidyStatus.revokedCertDeletedCount++
 
-	b.ifCountEnabledDecrementTotalRevokedCertificatesCountReport()
+	b.decrementTotalRevokedCertificatesCountReport()
 }
 
 func (b *backend) tidyStatusIncMissingIssuerCertCount() {
@@ -1945,41 +684,6 @@ func (b *backend) tidyStatusIncMissingIssuerCertCount() {
 	b.tidyStatus.missingIssuerCertCount++
 }
 
-func (b *backend) tidyStatusIncRevQueueCount() {
-	b.tidyStatusLock.Lock()
-	defer b.tidyStatusLock.Unlock()
-
-	b.tidyStatus.revQueueDeletedCount++
-}
-
-func (b *backend) tidyStatusIncCrossRevCertCount() {
-	b.tidyStatusLock.Lock()
-	defer b.tidyStatusLock.Unlock()
-
-	b.tidyStatus.crossRevokedDeletedCount++
-}
-
-func (b *backend) tidyStatusIncRevAcmeAccountCount() {
-	b.tidyStatusLock.Lock()
-	defer b.tidyStatusLock.Unlock()
-
-	b.tidyStatus.acmeAccountsRevokedCount++
-}
-
-func (b *backend) tidyStatusIncDeletedAcmeAccountCount() {
-	b.tidyStatusLock.Lock()
-	defer b.tidyStatusLock.Unlock()
-
-	b.tidyStatus.acmeAccountsDeletedCount++
-}
-
-func (b *backend) tidyStatusIncDelAcmeOrderCount() {
-	b.tidyStatusLock.Lock()
-	defer b.tidyStatusLock.Unlock()
-
-	b.tidyStatus.acmeOrdersDeletedCount++
-}
-
 const pathTidyHelpSyn = `
 Tidy up the backend by removing expired certificates, revocation information,
 or both.
@@ -2041,20 +745,6 @@ The result includes the following fields:
 * 'cert_store_deleted_count': The number of certificate storage entries deleted
 * 'revoked_cert_deleted_count': The number of revoked certificate entries deleted
 * 'missing_issuer_cert_count': The number of revoked certificates which were missing a valid issuer reference
-* 'tidy_expired_issuers': the value of this parameter when initiating the tidy operation
-* 'issuer_safety_buffer': the value of this parameter when initiating the tidy operation
-* 'tidy_move_legacy_ca_bundle': the value of this parameter when initiating the tidy operation
-* 'tidy_revocation_queue': the value of this parameter when initiating the tidy operation
-* 'revocation_queue_deleted_count': the number of revocation queue entries deleted
-* 'tidy_cross_cluster_revoked_certs': the value of this parameter when initiating the tidy operation
-* 'cross_revoked_cert_deleted_count': the number of cross-cluster revoked certificate entries deleted
-* 'revocation_queue_safety_buffer': the value of this parameter when initiating the tidy operation
-* 'tidy_acme': the value of this parameter when initiating the tidy operation
-* 'acme_account_safety_buffer': the value of this parameter when initiating the tidy operation
-* 'total_acme_account_count': the total number of acme accounts in the list to be iterated over
-* 'acme_account_deleted_count': the number of revoked acme accounts deleted during the operation
-* 'acme_account_revoked_count': the number of acme accounts revoked during the operation
-* 'acme_orders_deleted_count': the number of acme orders deleted during the operation
 `
 
 const pathConfigAutoTidySyn = `
@@ -2070,26 +760,3 @@ controls the frequency of auto-tidy execution).
 Once enabled, a tidy operation will be kicked off automatically, as if it
 were executed with the posted configuration.
 `
-
-func getTidyConfigData(config tidyConfig) map[string]interface{} {
-	return map[string]interface{}{
-		// This map is in the same order as tidyConfig to ensure that all fields are accounted for
-		"enabled":                                  config.Enabled,
-		"interval_duration":                        int(config.Interval / time.Second),
-		"tidy_cert_store":                          config.CertStore,
-		"tidy_revoked_certs":                       config.RevokedCerts,
-		"tidy_revoked_cert_issuer_associations":    config.IssuerAssocs,
-		"tidy_expired_issuers":                     config.ExpiredIssuers,
-		"tidy_move_legacy_ca_bundle":               config.BackupBundle,
-		"tidy_acme":                                config.TidyAcme,
-		"safety_buffer":                            int(config.SafetyBuffer / time.Second),
-		"issuer_safety_buffer":                     int(config.IssuerSafetyBuffer / time.Second),
-		"acme_account_safety_buffer":               int(config.AcmeAccountSafetyBuffer / time.Second),
-		"pause_duration":                           config.PauseDuration.String(),
-		"publish_stored_certificate_count_metrics": config.PublishMetrics,
-		"maintain_stored_certificate_counts":       config.MaintainCount,
-		"tidy_revocation_queue":                    config.RevocationQueue,
-		"revocation_queue_safety_buffer":           int(config.QueueSafetyBuffer / time.Second),
-		"tidy_cross_cluster_revoked_certs":         config.CrossRevokedCerts,
-	}
-}
diff --git a/builtin/logical/pki/path_tidy_test.go b/builtin/logical/pki/path_tidy_test.go
index a5469ce003e58..e06c7068bb1b0 100644
--- a/builtin/logical/pki/path_tidy_test.go
+++ b/builtin/logical/pki/path_tidy_test.go
@@ -1,21 +1,9 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pki
 
 import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"strings"
 	"testing"
 	"time"
 
-	"github.com/hashicorp/vault/helper/testhelpers"
-	"github.com/hashicorp/vault/sdk/helper/testhelpers/schema"
-
-	"github.com/armon/go-metrics"
-
 	"github.com/hashicorp/vault/api"
 	vaulthttp "github.com/hashicorp/vault/http"
 	"github.com/hashicorp/vault/sdk/logical"
@@ -24,41 +12,6 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestTidyConfigs(t *testing.T) {
-	t.Parallel()
-
-	var cfg tidyConfig
-	operations := strings.Split(cfg.AnyTidyConfig(), " / ")
-	t.Logf("Got tidy operations: %v", operations)
-
-	for _, operation := range operations {
-		b, s := CreateBackendWithStorage(t)
-
-		resp, err := CBWrite(b, s, "config/auto-tidy", map[string]interface{}{
-			"enabled": true,
-			operation: true,
-		})
-		requireSuccessNonNilResponse(t, resp, err, "expected to be able to enable auto-tidy operation "+operation)
-
-		resp, err = CBRead(b, s, "config/auto-tidy")
-		requireSuccessNonNilResponse(t, resp, err, "expected to be able to read auto-tidy operation for operation "+operation)
-		require.True(t, resp.Data[operation].(bool), "expected operation to be enabled after reading auto-tidy config "+operation)
-
-		resp, err = CBWrite(b, s, "tidy", map[string]interface{}{
-			operation: true,
-		})
-		requireSuccessNonNilResponse(t, resp, err, "expected to be able to start tidy operation with "+operation)
-		if len(resp.Warnings) > 0 {
-			t.Logf("got warnings while starting manual tidy: %v", resp.Warnings)
-			for _, warning := range resp.Warnings {
-				if strings.Contains(warning, "Manual tidy requested but no tidy operations were set.") {
-					t.Fatalf("expected to be able to enable tidy operation with just %v but got warning: %v / (resp=%v)", operation, warning, resp)
-				}
-			}
-		}
-	}
-}
-
 func TestAutoTidy(t *testing.T) {
 	t.Parallel()
 
@@ -110,7 +63,6 @@ func TestAutoTidy(t *testing.T) {
 	require.NotNil(t, resp)
 	require.NotEmpty(t, resp.Data)
 	require.NotEmpty(t, resp.Data["issuer_id"])
-	issuerId := resp.Data["issuer_id"]
 
 	// Run tidy so status is not empty when we run it later...
 	_, err = client.Logical().Write("pki/tidy", map[string]interface{}{
@@ -149,17 +101,6 @@ func TestAutoTidy(t *testing.T) {
 	leafSerial := resp.Data["serial_number"].(string)
 	leafCert := parseCert(t, resp.Data["certificate"].(string))
 
-	// Read cert before revoking
-	resp, err = client.Logical().Read("pki/cert/" + leafSerial)
-	require.NoError(t, err)
-	require.NotNil(t, resp)
-	require.NotNil(t, resp.Data)
-	require.NotEmpty(t, resp.Data["certificate"])
-	revocationTime, err := (resp.Data["revocation_time"].(json.Number)).Int64()
-	require.Equal(t, int64(0), revocationTime, "revocation time was not zero")
-	require.Empty(t, resp.Data["revocation_time_rfc3339"], "revocation_time_rfc3339 was not empty")
-	require.Empty(t, resp.Data["issuer_id"], "issuer_id was not empty")
-
 	_, err = client.Logical().Write("pki/revoke", map[string]interface{}{
 		"serial_number": leafSerial,
 	})
@@ -171,22 +112,6 @@ func TestAutoTidy(t *testing.T) {
 	require.NotNil(t, resp)
 	require.NotNil(t, resp.Data)
 	require.NotEmpty(t, resp.Data["certificate"])
-	revocationTime, err = (resp.Data["revocation_time"].(json.Number)).Int64()
-	require.NoError(t, err, "failed converting %s to int", resp.Data["revocation_time"])
-	revTime := time.Unix(revocationTime, 0)
-	now := time.Now()
-	if !(now.After(revTime) && now.Add(-10*time.Minute).Before(revTime)) {
-		t.Fatalf("parsed revocation time not within the last 10 minutes current time: %s, revocation time: %s", now, revTime)
-	}
-	utcLoc, err := time.LoadLocation("UTC")
-	require.NoError(t, err, "failed to parse UTC location?")
-
-	rfc3339RevocationTime, err := time.Parse(time.RFC3339Nano, resp.Data["revocation_time_rfc3339"].(string))
-	require.NoError(t, err, "failed parsing revocation_time_rfc3339 field: %s", resp.Data["revocation_time_rfc3339"])
-
-	require.Equal(t, revTime.In(utcLoc), rfc3339RevocationTime.Truncate(time.Second),
-		"revocation times did not match revocation_time: %s, "+"rfc3339 time: %s", revTime, rfc3339RevocationTime)
-	require.Equal(t, issuerId, resp.Data["issuer_id"], "issuer_id on leaf cert did not match")
 
 	// Wait for cert to expire and the safety buffer to elapse.
 	time.Sleep(time.Until(leafCert.NotAfter) + 3*time.Second)
@@ -238,7 +163,7 @@ func TestTidyCancellation(t *testing.T) {
 
 	numLeaves := 100
 
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 
 	// Create a root, a role, and a bunch of leaves.
 	_, err := CBWrite(b, s, "root/generate/internal", map[string]interface{}{
@@ -264,19 +189,17 @@ func TestTidyCancellation(t *testing.T) {
 
 	// Kick off a tidy operation (which runs in the background), but with
 	// a slow-ish pause between certificates.
-	resp, err := CBWrite(b, s, "tidy", map[string]interface{}{
+	_, err = CBWrite(b, s, "tidy", map[string]interface{}{
 		"tidy_cert_store": true,
 		"safety_buffer":   "1s",
 		"pause_duration":  "1s",
 	})
-	schema.ValidateResponse(t, schema.GetResponseSchema(t, b.Route("tidy"), logical.UpdateOperation), resp, true)
 
 	// If we wait six seconds, the operation should still be running. That's
 	// how we check that pause_duration works.
 	time.Sleep(3 * time.Second)
 
-	resp, err = CBRead(b, s, "tidy-status")
-
+	resp, err := CBRead(b, s, "tidy-status")
 	require.NoError(t, err)
 	require.NotNil(t, resp)
 	require.NotNil(t, resp.Data)
@@ -284,7 +207,6 @@ func TestTidyCancellation(t *testing.T) {
 
 	// If we now cancel the operation, the response should say Cancelling.
 	cancelResp, err := CBWrite(b, s, "tidy-cancel", map[string]interface{}{})
-	schema.ValidateResponse(t, schema.GetResponseSchema(t, b.Route("tidy-cancel"), logical.UpdateOperation), resp, true)
 	require.NoError(t, err)
 	require.NotNil(t, cancelResp)
 	require.NotNil(t, cancelResp.Data)
@@ -304,7 +226,6 @@ func TestTidyCancellation(t *testing.T) {
 	time.Sleep(3 * time.Second)
 
 	statusResp, err := CBRead(b, s, "tidy-status")
-	schema.ValidateResponse(t, schema.GetResponseSchema(t, b.Route("tidy-status"), logical.ReadOperation), resp, true)
 	require.NoError(t, err)
 	require.NotNil(t, statusResp)
 	require.NotNil(t, statusResp.Data)
@@ -314,483 +235,3 @@ func TestTidyCancellation(t *testing.T) {
 		t.Fatalf("expected to only process at most 3 more certificates, but processed (%v >>> %v) certs", nowMany, howMany)
 	}
 }
-
-func TestTidyIssuers(t *testing.T) {
-	t.Parallel()
-
-	b, s := CreateBackendWithStorage(t)
-
-	// Create a root that expires quickly and one valid for longer.
-	_, err := CBWrite(b, s, "root/generate/internal", map[string]interface{}{
-		"common_name": "root1 example.com",
-		"issuer_name": "root-expired",
-		"ttl":         "1s",
-		"key_type":    "ec",
-	})
-	require.NoError(t, err)
-
-	_, err = CBWrite(b, s, "root/generate/internal", map[string]interface{}{
-		"common_name": "root2 example.com",
-		"issuer_name": "root-valid",
-		"ttl":         "60m",
-		"key_type":    "rsa",
-	})
-	require.NoError(t, err)
-
-	// Sleep long enough to expire the root.
-	time.Sleep(2 * time.Second)
-
-	// First tidy run shouldn't remove anything; too long of safety buffer.
-	_, err = CBWrite(b, s, "tidy", map[string]interface{}{
-		"tidy_expired_issuers": true,
-		"issuer_safety_buffer": "60m",
-	})
-	require.NoError(t, err)
-
-	// Wait for tidy to finish.
-	time.Sleep(2 * time.Second)
-
-	// Expired issuer should exist.
-	resp, err := CBRead(b, s, "issuer/root-expired")
-	requireSuccessNonNilResponse(t, resp, err, "expired should still be present")
-	resp, err = CBRead(b, s, "issuer/root-valid")
-	requireSuccessNonNilResponse(t, resp, err, "valid should still be present")
-
-	// Second tidy run with shorter safety buffer shouldn't remove the
-	// expired one, as it should be the default issuer.
-	_, err = CBWrite(b, s, "tidy", map[string]interface{}{
-		"tidy_expired_issuers": true,
-		"issuer_safety_buffer": "1s",
-	})
-	require.NoError(t, err)
-
-	// Wait for tidy to finish.
-	time.Sleep(2 * time.Second)
-
-	// Expired issuer should still exist.
-	resp, err = CBRead(b, s, "issuer/root-expired")
-	requireSuccessNonNilResponse(t, resp, err, "expired should still be present")
-	resp, err = CBRead(b, s, "issuer/root-valid")
-	requireSuccessNonNilResponse(t, resp, err, "valid should still be present")
-
-	// Update the default issuer.
-	_, err = CBWrite(b, s, "config/issuers", map[string]interface{}{
-		"default": "root-valid",
-	})
-	require.NoError(t, err)
-
-	// Third tidy run should remove the expired one.
-	_, err = CBWrite(b, s, "tidy", map[string]interface{}{
-		"tidy_expired_issuers": true,
-		"issuer_safety_buffer": "1s",
-	})
-	require.NoError(t, err)
-
-	// Wait for tidy to finish.
-	time.Sleep(2 * time.Second)
-
-	// Valid issuer should exist still; other should be removed.
-	resp, err = CBRead(b, s, "issuer/root-expired")
-	require.Error(t, err)
-	require.Nil(t, resp)
-	resp, err = CBRead(b, s, "issuer/root-valid")
-	requireSuccessNonNilResponse(t, resp, err, "valid should still be present")
-
-	// Finally, one more tidy should cause no changes.
-	_, err = CBWrite(b, s, "tidy", map[string]interface{}{
-		"tidy_expired_issuers": true,
-		"issuer_safety_buffer": "1s",
-	})
-	require.NoError(t, err)
-
-	// Wait for tidy to finish.
-	time.Sleep(2 * time.Second)
-
-	// Valid issuer should exist still; other should be removed.
-	resp, err = CBRead(b, s, "issuer/root-expired")
-	require.Error(t, err)
-	require.Nil(t, resp)
-	resp, err = CBRead(b, s, "issuer/root-valid")
-	requireSuccessNonNilResponse(t, resp, err, "valid should still be present")
-
-	// Ensure we have safety buffer and expired issuers set correctly.
-	statusResp, err := CBRead(b, s, "tidy-status")
-	require.NoError(t, err)
-	require.NotNil(t, statusResp)
-	require.NotNil(t, statusResp.Data)
-	require.Equal(t, statusResp.Data["issuer_safety_buffer"], 1)
-	require.Equal(t, statusResp.Data["tidy_expired_issuers"], true)
-}
-
-func TestTidyIssuerConfig(t *testing.T) {
-	t.Parallel()
-
-	b, s := CreateBackendWithStorage(t)
-
-	// Ensure the default auto-tidy config matches expectations
-	resp, err := CBRead(b, s, "config/auto-tidy")
-	schema.ValidateResponse(t, schema.GetResponseSchema(t, b.Route("config/auto-tidy"), logical.ReadOperation), resp, true)
-	requireSuccessNonNilResponse(t, resp, err)
-
-	jsonBlob, err := json.Marshal(&defaultTidyConfig)
-	require.NoError(t, err)
-	var defaultConfigMap map[string]interface{}
-	err = json.Unmarshal(jsonBlob, &defaultConfigMap)
-	require.NoError(t, err)
-
-	// Coerce defaults to API response types.
-	defaultConfigMap["interval_duration"] = int(time.Duration(defaultConfigMap["interval_duration"].(float64)) / time.Second)
-	defaultConfigMap["issuer_safety_buffer"] = int(time.Duration(defaultConfigMap["issuer_safety_buffer"].(float64)) / time.Second)
-	defaultConfigMap["safety_buffer"] = int(time.Duration(defaultConfigMap["safety_buffer"].(float64)) / time.Second)
-	defaultConfigMap["pause_duration"] = time.Duration(defaultConfigMap["pause_duration"].(float64)).String()
-	defaultConfigMap["revocation_queue_safety_buffer"] = int(time.Duration(defaultConfigMap["revocation_queue_safety_buffer"].(float64)) / time.Second)
-	defaultConfigMap["acme_account_safety_buffer"] = int(time.Duration(defaultConfigMap["acme_account_safety_buffer"].(float64)) / time.Second)
-
-	require.Equal(t, defaultConfigMap, resp.Data)
-
-	// Ensure setting issuer-tidy related fields stick.
-	resp, err = CBWrite(b, s, "config/auto-tidy", map[string]interface{}{
-		"tidy_expired_issuers": true,
-		"issuer_safety_buffer": "5s",
-	})
-	schema.ValidateResponse(t, schema.GetResponseSchema(t, b.Route("config/auto-tidy"), logical.UpdateOperation), resp, true)
-
-	requireSuccessNonNilResponse(t, resp, err)
-	require.Equal(t, true, resp.Data["tidy_expired_issuers"])
-	require.Equal(t, 5, resp.Data["issuer_safety_buffer"])
-}
-
-// TestCertStorageMetrics ensures that when enabled, metrics are able to count the number of certificates in storage and
-// number of revoked certificates in storage.  Moreover, this test ensures that the gauge is emitted periodically, so
-// that the metric does not disappear or go stale.
-func TestCertStorageMetrics(t *testing.T) {
-	// This tests uses the same setup as TestAutoTidy
-	newPeriod := 1 * time.Second
-
-	// We set up a metrics accumulator
-	inmemSink := metrics.NewInmemSink(
-		2*newPeriod,  // A short time period is ideal here to test metrics are emitted every periodic func
-		10*newPeriod) // Do not keep a huge amount of metrics in the sink forever, clear them out to save memory usage.
-
-	metricsConf := metrics.DefaultConfig("")
-	metricsConf.EnableHostname = false
-	metricsConf.EnableHostnameLabel = false
-	metricsConf.EnableServiceLabel = false
-	metricsConf.EnableTypePrefix = false
-
-	_, err := metrics.NewGlobal(metricsConf, inmemSink)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// This test requires the periodicFunc to trigger, which requires we stand
-	// up a full test cluster.
-	coreConfig := &vault.CoreConfig{
-		LogicalBackends: map[string]logical.Factory{
-			"pki": Factory,
-		},
-		// See notes below about usage of /sys/raw for reading cluster
-		// storage without barrier encryption.
-		EnableRaw:      true,
-		RollbackPeriod: newPeriod,
-	}
-	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
-		HandlerFunc: vaulthttp.Handler,
-	})
-	cluster.Start()
-	defer cluster.Cleanup()
-	client := cluster.Cores[0].Client
-
-	// Mount PKI
-	err = client.Sys().Mount("pki", &api.MountInput{
-		Type: "pki",
-		Config: api.MountConfigInput{
-			DefaultLeaseTTL: "10m",
-			MaxLeaseTTL:     "60m",
-		},
-	})
-	require.NoError(t, err)
-
-	// Generate root.
-	resp, err := client.Logical().Write("pki/root/generate/internal", map[string]interface{}{
-		"ttl":         "40h",
-		"common_name": "Root X1",
-		"key_type":    "ec",
-	})
-	require.NoError(t, err)
-	require.NotNil(t, resp)
-	require.NotEmpty(t, resp.Data)
-	require.NotEmpty(t, resp.Data["issuer_id"])
-
-	// Set up a testing role.
-	_, err = client.Logical().Write("pki/roles/local-testing", map[string]interface{}{
-		"allow_any_name":    true,
-		"enforce_hostnames": false,
-		"key_type":          "ec",
-	})
-	require.NoError(t, err)
-
-	// Run tidy so that tidy-status is not empty
-	_, err = client.Logical().Write("pki/tidy", map[string]interface{}{
-		"tidy_revoked_certs": true,
-	})
-	require.NoError(t, err)
-
-	// Since certificate counts are off by default, we shouldn't see counts in the tidy status
-	tidyStatus, err := client.Logical().Read("pki/tidy-status")
-	if err != nil {
-		t.Fatal(err)
-	}
-	// backendUUID should exist, we need this for metrics
-	backendUUID := tidyStatus.Data["internal_backend_uuid"].(string)
-	// "current_cert_store_count", "current_revoked_cert_count"
-	countData, ok := tidyStatus.Data["current_cert_store_count"]
-	if ok && countData != nil {
-		t.Fatalf("Certificate counting should be off by default, but current cert store count %v appeared in tidy status in unconfigured mount", countData)
-	}
-	revokedCountData, ok := tidyStatus.Data["current_revoked_cert_count"]
-	if ok && revokedCountData != nil {
-		t.Fatalf("Certificate counting should be off by default, but revoked cert count %v appeared in tidy status in unconfigured mount", revokedCountData)
-	}
-
-	// Since certificate counts are off by default, those metrics should not exist yet
-	mostRecentInterval := inmemSink.Data()[len(inmemSink.Data())-1]
-	_, ok = mostRecentInterval.Gauges["secrets.pki."+backendUUID+".total_revoked_certificates_stored"]
-	if ok {
-		t.Fatalf("Certificate counting should be off by default, but revoked cert count was emitted as a metric in an unconfigured mount")
-	}
-	_, ok = mostRecentInterval.Gauges["secrets.pki."+backendUUID+".total_certificates_stored"]
-	if ok {
-		t.Fatalf("Certificate counting should be off by default, but total certificate count was emitted as a metric in an unconfigured mount")
-	}
-
-	// Write the auto-tidy config.
-	_, err = client.Logical().Write("pki/config/auto-tidy", map[string]interface{}{
-		"enabled":                                  true,
-		"interval_duration":                        "1s",
-		"tidy_cert_store":                          true,
-		"tidy_revoked_certs":                       true,
-		"safety_buffer":                            "1s",
-		"maintain_stored_certificate_counts":       true,
-		"publish_stored_certificate_count_metrics": false,
-	})
-	require.NoError(t, err)
-
-	// Reload the Mount - Otherwise Stored Certificate Counts Will Not Be Populated
-	_, err = client.Logical().Write("/sys/plugins/reload/backend", map[string]interface{}{
-		"plugin": "pki",
-	})
-
-	// By reading the auto-tidy endpoint, we ensure that initialize has completed (which has a write lock on auto-tidy)
-	_, err = client.Logical().Read("/pki/config/auto-tidy")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Since publish_stored_certificate_count_metrics is still false, these metrics should still not exist yet
-	mostRecentInterval = inmemSink.Data()[len(inmemSink.Data())-1]
-	_, ok = mostRecentInterval.Gauges["secrets.pki."+backendUUID+".total_revoked_certificates_stored"]
-	if ok {
-		t.Fatalf("Certificate counting should be off by default, but revoked cert count was emitted as a metric in an unconfigured mount")
-	}
-	_, ok = mostRecentInterval.Gauges["secrets.pki."+backendUUID+".total_certificates_stored"]
-	if ok {
-		t.Fatalf("Certificate counting should be off by default, but total certificate count was emitted as a metric in an unconfigured mount")
-	}
-
-	// But since certificate counting is on, the metrics should exist on tidyStatus endpoint:
-	tidyStatus, err = client.Logical().Read("pki/tidy-status")
-	if err != nil {
-		t.Fatal(err)
-	}
-	// backendUUID should exist, we need this for metrics
-	backendUUID = tidyStatus.Data["internal_backend_uuid"].(string)
-	// "current_cert_store_count", "current_revoked_cert_count"
-	certStoreCount, ok := tidyStatus.Data["current_cert_store_count"]
-	if !ok {
-		t.Fatalf("Certificate counting has been turned on, but current cert store count does not appear in tidy status")
-	}
-	if certStoreCount != json.Number("1") {
-		t.Fatalf("Only created one certificate, but a got a certificate count of %v", certStoreCount)
-	}
-	revokedCertCount, ok := tidyStatus.Data["current_revoked_cert_count"]
-	if !ok {
-		t.Fatalf("Certificate counting has been turned on, but revoked cert store count does not appear in tidy status")
-	}
-	if revokedCertCount != json.Number("0") {
-		t.Fatalf("Have not yet revoked a certificate, but got a revoked cert store count of %v", revokedCertCount)
-	}
-
-	// Write the auto-tidy config, again, this time turning on metrics
-	_, err = client.Logical().Write("pki/config/auto-tidy", map[string]interface{}{
-		"enabled":                                  true,
-		"interval_duration":                        "1s",
-		"tidy_cert_store":                          true,
-		"tidy_revoked_certs":                       true,
-		"safety_buffer":                            "1s",
-		"maintain_stored_certificate_counts":       true,
-		"publish_stored_certificate_count_metrics": true,
-	})
-	require.NoError(t, err)
-
-	// Issue a cert and revoke it.
-	resp, err = client.Logical().Write("pki/issue/local-testing", map[string]interface{}{
-		"common_name": "example.com",
-		"ttl":         "10s",
-	})
-	require.NoError(t, err)
-	require.NotNil(t, resp)
-	require.NotNil(t, resp.Data)
-	require.NotEmpty(t, resp.Data["serial_number"])
-	require.NotEmpty(t, resp.Data["certificate"])
-	leafSerial := resp.Data["serial_number"].(string)
-	leafCert := parseCert(t, resp.Data["certificate"].(string))
-
-	// Read cert before revoking
-	resp, err = client.Logical().Read("pki/cert/" + leafSerial)
-	require.NoError(t, err)
-	require.NotNil(t, resp)
-	require.NotNil(t, resp.Data)
-	require.NotEmpty(t, resp.Data["certificate"])
-	revocationTime, err := (resp.Data["revocation_time"].(json.Number)).Int64()
-	require.Equal(t, int64(0), revocationTime, "revocation time was not zero")
-	require.Empty(t, resp.Data["revocation_time_rfc3339"], "revocation_time_rfc3339 was not empty")
-	require.Empty(t, resp.Data["issuer_id"], "issuer_id was not empty")
-
-	_, err = client.Logical().Write("pki/revoke", map[string]interface{}{
-		"serial_number": leafSerial,
-	})
-	require.NoError(t, err)
-
-	// We read the auto-tidy endpoint again, to ensure any metrics logic has completed (lock on config)
-	_, err = client.Logical().Read("/pki/config/auto-tidy")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Check Metrics After Cert Has Be Created and Revoked
-	tidyStatus, err = client.Logical().Read("pki/tidy-status")
-	if err != nil {
-		t.Fatal(err)
-	}
-	backendUUID = tidyStatus.Data["internal_backend_uuid"].(string)
-	certStoreCount, ok = tidyStatus.Data["current_cert_store_count"]
-	if !ok {
-		t.Fatalf("Certificate counting has been turned on, but current cert store count does not appear in tidy status")
-	}
-	if certStoreCount != json.Number("2") {
-		t.Fatalf("Created root and leaf certificate, but a got a certificate count of %v", certStoreCount)
-	}
-	revokedCertCount, ok = tidyStatus.Data["current_revoked_cert_count"]
-	if !ok {
-		t.Fatalf("Certificate counting has been turned on, but revoked cert store count does not appear in tidy status")
-	}
-	if revokedCertCount != json.Number("1") {
-		t.Fatalf("Revoked one certificate, but got a revoked cert store count of %v", revokedCertCount)
-	}
-	// This should now be initialized
-	certCountError, ok := tidyStatus.Data["certificate_counting_error"]
-	if ok && certCountError.(string) != "" {
-		t.Fatalf("Expected certificate count error to disappear after initialization, but got error %v", certCountError)
-	}
-
-	testhelpers.RetryUntil(t, newPeriod*5, func() error {
-		mostRecentInterval = inmemSink.Data()[len(inmemSink.Data())-1]
-		revokedCertCountGaugeValue, ok := mostRecentInterval.Gauges["secrets.pki."+backendUUID+".total_revoked_certificates_stored"]
-		if !ok {
-			return errors.New("turned on metrics, but revoked cert count was not emitted")
-		}
-		if revokedCertCountGaugeValue.Value != 1 {
-			return fmt.Errorf("revoked one certificate, but metrics emitted a revoked cert store count of %v", revokedCertCountGaugeValue)
-		}
-		certStoreCountGaugeValue, ok := mostRecentInterval.Gauges["secrets.pki."+backendUUID+".total_certificates_stored"]
-		if !ok {
-			return errors.New("turned on metrics, but total certificate count was not emitted")
-		}
-		if certStoreCountGaugeValue.Value != 2 {
-			return fmt.Errorf("stored two certificiates, but total certificate count emitted was %v", certStoreCountGaugeValue.Value)
-		}
-		return nil
-	})
-
-	// Wait for cert to expire and the safety buffer to elapse.
-	time.Sleep(time.Until(leafCert.NotAfter) + 3*time.Second)
-
-	// Wait for auto-tidy to run afterwards.
-	var foundTidyRunning string
-	var foundTidyFinished bool
-	timeoutChan := time.After(120 * time.Second)
-	for {
-		if foundTidyRunning != "" && foundTidyFinished {
-			break
-		}
-
-		select {
-		case <-timeoutChan:
-			t.Fatalf("expected auto-tidy to run (%v) and finish (%v) before 120 seconds elapsed", foundTidyRunning, foundTidyFinished)
-		default:
-			time.Sleep(250 * time.Millisecond)
-
-			resp, err = client.Logical().Read("pki/tidy-status")
-			require.NoError(t, err)
-			require.NotNil(t, resp)
-			require.NotNil(t, resp.Data)
-			require.NotEmpty(t, resp.Data["state"])
-			require.NotEmpty(t, resp.Data["time_started"])
-			state := resp.Data["state"].(string)
-			started := resp.Data["time_started"].(string)
-			t.Logf("Resp: %v", resp.Data)
-
-			// We want the _next_ tidy run after the cert expires. This
-			// means if we're currently finished when we hit this the
-			// first time, we want to wait for the next run.
-			if foundTidyRunning == "" {
-				foundTidyRunning = started
-			} else if foundTidyRunning != started && !foundTidyFinished && state == "Finished" {
-				foundTidyFinished = true
-			}
-		}
-	}
-
-	// After Tidy, Cert Store Count Should Still Be Available, and Be Updated:
-	// Check Metrics After Cert Has Be Created and Revoked
-	tidyStatus, err = client.Logical().Read("pki/tidy-status")
-	if err != nil {
-		t.Fatal(err)
-	}
-	backendUUID = tidyStatus.Data["internal_backend_uuid"].(string)
-	// "current_cert_store_count", "current_revoked_cert_count"
-	certStoreCount, ok = tidyStatus.Data["current_cert_store_count"]
-	if !ok {
-		t.Fatalf("Certificate counting has been turned on, but current cert store count does not appear in tidy status")
-	}
-	if certStoreCount != json.Number("1") {
-		t.Fatalf("Created root and leaf certificate, deleted leaf, but a got a certificate count of %v", certStoreCount)
-	}
-	revokedCertCount, ok = tidyStatus.Data["current_revoked_cert_count"]
-	if !ok {
-		t.Fatalf("Certificate counting has been turned on, but revoked cert store count does not appear in tidy status")
-	}
-	if revokedCertCount != json.Number("0") {
-		t.Fatalf("Revoked certificate has been tidied, but got a revoked cert store count of %v", revokedCertCount)
-	}
-
-	testhelpers.RetryUntil(t, newPeriod*5, func() error {
-		mostRecentInterval = inmemSink.Data()[len(inmemSink.Data())-1]
-		revokedCertCountGaugeValue, ok := mostRecentInterval.Gauges["secrets.pki."+backendUUID+".total_revoked_certificates_stored"]
-		if !ok {
-			return errors.New("turned on metrics, but revoked cert count was not emitted")
-		}
-		if revokedCertCountGaugeValue.Value != 0 {
-			return fmt.Errorf("revoked certificate has been tidied, but metrics emitted a revoked cert store count of %v", revokedCertCountGaugeValue)
-		}
-		certStoreCountGaugeValue, ok := mostRecentInterval.Gauges["secrets.pki."+backendUUID+".total_certificates_stored"]
-		if !ok {
-			return errors.New("turned on metrics, but total certificate count was not emitted")
-		}
-		if certStoreCountGaugeValue.Value != 1 {
-			return fmt.Errorf("only one of two certificates left after tidy, but total certificate count emitted was %v", certStoreCountGaugeValue.Value)
-		}
-		return nil
-	})
-}
diff --git a/builtin/logical/pki/periodic.go b/builtin/logical/pki/periodic.go
deleted file mode 100644
index 77ff31212ef96..0000000000000
--- a/builtin/logical/pki/periodic.go
+++ /dev/null
@@ -1,337 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package pki
-
-import (
-	"crypto/x509"
-	"errors"
-	"fmt"
-	"sync/atomic"
-	"time"
-
-	"github.com/hashicorp/vault/sdk/helper/consts"
-	"github.com/hashicorp/vault/sdk/logical"
-)
-
-const (
-	minUnifiedTransferDelay = 30 * time.Minute
-)
-
-type unifiedTransferStatus struct {
-	isRunning  atomic.Bool
-	lastRun    time.Time
-	forceRerun atomic.Bool
-}
-
-func (uts *unifiedTransferStatus) forceRun() {
-	uts.forceRerun.Store(true)
-}
-
-func newUnifiedTransferStatus() *unifiedTransferStatus {
-	return &unifiedTransferStatus{}
-}
-
-// runUnifiedTransfer meant to run as a background, this will process all and
-// send all missing local revocation entries to the unified space if the feature
-// is enabled.
-func runUnifiedTransfer(sc *storageContext) {
-	b := sc.Backend
-	status := b.unifiedTransferStatus
-
-	isPerfStandby := b.System().ReplicationState().HasState(consts.ReplicationDRSecondary | consts.ReplicationPerformanceStandby)
-
-	if isPerfStandby || b.System().LocalMount() {
-		// We only do this on active enterprise nodes, when we aren't a local mount
-		return
-	}
-
-	config, err := b.crlBuilder.getConfigWithUpdate(sc)
-	if err != nil {
-		b.Logger().Error("failed to retrieve crl config from storage for unified transfer background process",
-			"error", err)
-		return
-	}
-
-	if !config.UnifiedCRL {
-		// Feature is disabled, no need to run
-		return
-	}
-
-	clusterId, err := b.System().ClusterID(sc.Context)
-	if err != nil {
-		b.Logger().Error("failed to fetch cluster id for unified transfer background process",
-			"error", err)
-		return
-	}
-
-	if !status.isRunning.CompareAndSwap(false, true) {
-		b.Logger().Debug("an existing unified transfer process is already running")
-		return
-	}
-	defer status.isRunning.Store(false)
-
-	// Because access to lastRun is not locked, we need to delay this check
-	// until after we grab the isRunning CAS lock.
-	if !status.lastRun.IsZero() {
-		// We have run before, we only run again if we have
-		// been requested to forceRerun, and we haven't run since our
-		// minimum delay.
-		if !(status.forceRerun.Load() && time.Since(status.lastRun) < minUnifiedTransferDelay) {
-			return
-		}
-	}
-
-	// Reset our flag before we begin, we do this before we start as
-	// we can't guarantee that we can properly parse/fix the error from an
-	// error that comes in from the revoke API after that. This will
-	// force another run, which worst case, we will fix it on the next
-	// periodic function call that passes our min delay.
-	status.forceRerun.Store(false)
-
-	err = doUnifiedTransferMissingLocalSerials(sc, clusterId)
-	if err != nil {
-		b.Logger().Error("an error occurred running unified transfer", "error", err.Error())
-		status.forceRerun.Store(true)
-	} else {
-		if config.EnableDelta {
-			err = doUnifiedTransferMissingDeltaWALSerials(sc, clusterId)
-			if err != nil {
-				b.Logger().Error("an error occurred running unified transfer", "error", err.Error())
-				status.forceRerun.Store(true)
-			}
-		}
-	}
-
-	status.lastRun = time.Now()
-}
-
-func doUnifiedTransferMissingLocalSerials(sc *storageContext, clusterId string) error {
-	localRevokedSerialNums, err := sc.listRevokedCerts()
-	if err != nil {
-		return err
-	}
-	if len(localRevokedSerialNums) == 0 {
-		// No local certs to transfer, no further work to do.
-		return nil
-	}
-
-	unifiedSerials, err := listClusterSpecificUnifiedRevokedCerts(sc, clusterId)
-	if err != nil {
-		return err
-	}
-	unifiedCertLookup := sliceToMapKey(unifiedSerials)
-
-	errCount := 0
-	for i, serialNum := range localRevokedSerialNums {
-		if i%25 == 0 {
-			config, _ := sc.Backend.crlBuilder.getConfigWithUpdate(sc)
-			if config != nil && !config.UnifiedCRL {
-				return errors.New("unified crl has been disabled after we started, stopping")
-			}
-		}
-		if _, ok := unifiedCertLookup[serialNum]; !ok {
-			err := readRevocationEntryAndTransfer(sc, serialNum)
-			if err != nil {
-				errCount++
-				sc.Backend.Logger().Error("Failed transferring local revocation to unified space",
-					"serial", serialNum, "error", err)
-			}
-		}
-	}
-
-	if errCount > 0 {
-		sc.Backend.Logger().Warn(fmt.Sprintf("Failed transfering %d local serials to unified storage", errCount))
-	}
-
-	return nil
-}
-
-func doUnifiedTransferMissingDeltaWALSerials(sc *storageContext, clusterId string) error {
-	// We need to do a similar thing for Delta WAL entry certificates.
-	// When the delta WAL failed to write for one or more entries,
-	// we'll need to replicate these up to the primary cluster. When it
-	// has performed a new delta WAL build, it will empty storage and
-	// update to a last written WAL entry that exceeds what we've seen
-	// locally.
-	thisUnifiedWALEntryPath := unifiedDeltaWALPath + deltaWALLastRevokedSerialName
-	lastUnifiedWALEntry, err := getLastWALSerial(sc, thisUnifiedWALEntryPath)
-	if err != nil {
-		return fmt.Errorf("failed to fetch last cross-cluster unified revoked delta WAL serial number: %w", err)
-	}
-
-	lastLocalWALEntry, err := getLastWALSerial(sc, localDeltaWALLastRevokedSerial)
-	if err != nil {
-		return fmt.Errorf("failed to fetch last locally revoked delta WAL serial number: %w", err)
-	}
-
-	// We now need to transfer all the entries and then write the last WAL
-	// entry at the end. Start by listing all certificates; any missing
-	// certificates will be copied over and then the WAL entry will be
-	// updated once.
-	//
-	// We do not delete entries either locally or remotely, as either
-	// cluster could've rebuilt delta CRLs with out-of-sync information,
-	// removing some entries (and, we cannot differentiate between these
-	// two cases). On next full CRL rebuild (on either cluster), the state
-	// should get synchronized, and future delta CRLs after this function
-	// returns without issue will see the remaining entries.
-	//
-	// Lastly, we need to ensure we don't accidentally write any unified
-	// delta WAL entries that aren't present in the main cross-cluster
-	// revoked storage location. This would mean the above function failed
-	// to copy them for some reason, despite them presumably appearing
-	// locally.
-	_unifiedWALEntries, err := sc.Storage.List(sc.Context, unifiedDeltaWALPath)
-	if err != nil {
-		return fmt.Errorf("failed to list cross-cluster unified delta WAL storage: %w", err)
-	}
-	unifiedWALEntries := sliceToMapKey(_unifiedWALEntries)
-
-	_unifiedRevokedSerials, err := listClusterSpecificUnifiedRevokedCerts(sc, clusterId)
-	if err != nil {
-		return fmt.Errorf("failed to list cross-cluster revoked certificates: %w", err)
-	}
-	unifiedRevokedSerials := sliceToMapKey(_unifiedRevokedSerials)
-
-	localWALEntries, err := sc.Storage.List(sc.Context, localDeltaWALPath)
-	if err != nil {
-		return fmt.Errorf("failed to list local delta WAL storage: %w", err)
-	}
-
-	if lastUnifiedWALEntry == lastLocalWALEntry && len(_unifiedWALEntries) == len(localWALEntries) {
-		// Writing the last revoked WAL entry is the last thing that we do.
-		// Because these entries match (across clusters) and we have the same
-		// number of entries, assume we don't have anything to sync and exit
-		// early.
-		//
-		// We need both checks as, in the event of PBPWF failing and then
-		// returning while more revocations are happening, we could have
-		// been schedule to run, but then skip running (if only the first
-		// condition was checked) because a later revocation succeeded
-		// in writing a unified WAL entry, before we started replicating
-		// the rest back up.
-		//
-		// The downside of this approach is that, if the main cluster
-		// does a full rebuild in the mean time, we could re-sync more
-		// entries back up to the primary cluster that are already
-		// included in the complete CRL. Users can manually rebuild the
-		// full CRL (clearing these duplicate delta CRL entries) if this
-		// affects them.
-		return nil
-	}
-
-	errCount := 0
-	for index, serial := range localWALEntries {
-		if index%25 == 0 {
-			config, _ := sc.Backend.crlBuilder.getConfigWithUpdate(sc)
-			if config != nil && (!config.UnifiedCRL || !config.EnableDelta) {
-				return errors.New("unified or delta CRLs have been disabled after we started, stopping")
-			}
-		}
-
-		if serial == deltaWALLastBuildSerialName || serial == deltaWALLastRevokedSerialName {
-			// Skip our special serial numbers.
-			continue
-		}
-
-		_, isAlreadyPresent := unifiedWALEntries[serial]
-		if isAlreadyPresent {
-			// Serial exists on both local and unified cluster. We're
-			// presuming we don't need to read and re-write these entries
-			// and that only missing entries need to be updated.
-			continue
-		}
-
-		_, isRevokedCopied := unifiedRevokedSerials[serial]
-		if !isRevokedCopied {
-			// We need to wait here to copy over.
-			errCount += 1
-			sc.Backend.Logger().Debug("Delta WAL exists locally, but corresponding cross-cluster full revocation entry is missing; skipping", "serial", serial)
-			continue
-		}
-
-		// All good: read the local entry and write to the remote variant.
-		localPath := localDeltaWALPath + serial
-		unifiedPath := unifiedDeltaWALPath + serial
-
-		entry, err := sc.Storage.Get(sc.Context, localPath)
-		if err != nil || entry == nil {
-			errCount += 1
-			sc.Backend.Logger().Error("Failed reading local delta WAL entry to copy to cross-cluster", "serial", serial, "err", err)
-			continue
-		}
-
-		entry.Key = unifiedPath
-		err = sc.Storage.Put(sc.Context, entry)
-		if err != nil {
-			errCount += 1
-			sc.Backend.Logger().Error("Failed sync local delta WAL entry to cross-cluster unified delta WAL location", "serial", serial, "err", err)
-			continue
-		}
-	}
-
-	if errCount > 0 {
-		// See note above about why we don't fail here.
-		sc.Backend.Logger().Warn(fmt.Sprintf("Failed transfering %d local delta WAL serials to unified storage", errCount))
-		return nil
-	}
-
-	// Everything worked. Here, we can write over the delta WAL last revoked
-	// value. By using the earlier value, even if new revocations have
-	// occurred, we ensure any further missing entries can be handled in the
-	// next round.
-	lastRevSerial := lastWALInfo{Serial: lastLocalWALEntry}
-	lastWALEntry, err := logical.StorageEntryJSON(thisUnifiedWALEntryPath, lastRevSerial)
-	if err != nil {
-		return fmt.Errorf("unable to create cross-cluster unified last delta CRL WAL entry: %w", err)
-	}
-	if err = sc.Storage.Put(sc.Context, lastWALEntry); err != nil {
-		return fmt.Errorf("error saving cross-cluster unified last delta CRL WAL entry: %w", err)
-	}
-
-	return nil
-}
-
-func readRevocationEntryAndTransfer(sc *storageContext, serial string) error {
-	hyphenSerial := normalizeSerial(serial)
-	revInfo, err := sc.fetchRevocationInfo(hyphenSerial)
-	if err != nil {
-		return fmt.Errorf("failed loading revocation entry for serial: %s: %w", serial, err)
-	}
-	if revInfo == nil {
-		sc.Backend.Logger().Debug("no certificate revocation entry for serial", "serial", serial)
-		return nil
-	}
-	cert, err := x509.ParseCertificate(revInfo.CertificateBytes)
-	if err != nil {
-		sc.Backend.Logger().Debug("failed parsing certificate stored in revocation entry for serial",
-			"serial", serial, "error", err)
-		return nil
-	}
-	if revInfo.CertificateIssuer == "" {
-		// No certificate issuer assigned to this serial yet, just drop it for now,
-		// as a crl rebuild/tidy needs to happen
-		return nil
-	}
-
-	revocationTime := revInfo.RevocationTimeUTC
-	if revInfo.RevocationTimeUTC.IsZero() {
-		// Legacy revocation entries only had this field and not revocationTimeUTC set...
-		revocationTime = time.Unix(revInfo.RevocationTime, 0)
-	}
-
-	if time.Now().After(cert.NotAfter) {
-		// ignore transferring this entry as it has already expired.
-		return nil
-	}
-
-	entry := &unifiedRevocationEntry{
-		SerialNumber:      hyphenSerial,
-		CertExpiration:    cert.NotAfter,
-		RevocationTimeUTC: revocationTime,
-		CertificateIssuer: revInfo.CertificateIssuer,
-	}
-
-	return writeUnifiedRevocationEntry(sc, entry)
-}
diff --git a/builtin/logical/pki/secret_certs.go b/builtin/logical/pki/secret_certs.go
index 11ebcd2ac7cb3..79fa410843cd0 100644
--- a/builtin/logical/pki/secret_certs.go
+++ b/builtin/logical/pki/secret_certs.go
@@ -1,11 +1,7 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pki
 
 import (
 	"context"
-	"crypto/x509"
 	"fmt"
 
 	"github.com/hashicorp/vault/sdk/framework"
@@ -52,35 +48,5 @@ func (b *backend) secretCredsRevoke(ctx context.Context, req *logical.Request, _
 	b.revokeStorageLock.Lock()
 	defer b.revokeStorageLock.Unlock()
 
-	sc := b.makeStorageContext(ctx, req.Storage)
-	serial := serialInt.(string)
-
-	certEntry, err := fetchCertBySerial(sc, "certs/", serial)
-	if err != nil {
-		return nil, err
-	}
-	if certEntry == nil {
-		// We can't write to revoked/ or update the CRL anyway because we don't have the cert,
-		// and there's no reason to expect this will work on a subsequent
-		// retry.  Just give up and let the lease get deleted.
-		b.Logger().Warn("expired certificate revoke failed because not found in storage, treating as success", "serial", serial)
-		return nil, nil
-	}
-
-	cert, err := x509.ParseCertificate(certEntry.Value)
-	if err != nil {
-		return nil, fmt.Errorf("error parsing certificate: %w", err)
-	}
-
-	// Compatibility: Don't revoke CAs if they had leases. New CAs going forward aren't issued leases.
-	if cert.IsCA {
-		return nil, nil
-	}
-
-	config, err := sc.Backend.crlBuilder.getConfigWithUpdate(sc)
-	if err != nil {
-		return nil, fmt.Errorf("error revoking serial: %s: failed reading config: %w", serial, err)
-	}
-
-	return revokeCert(sc, config, cert)
+	return revokeCert(ctx, b, req, serialInt.(string), true)
 }
diff --git a/builtin/logical/pki/storage.go b/builtin/logical/pki/storage.go
index 52b0faf2ca3b6..6a2cf2fc23a70 100644
--- a/builtin/logical/pki/storage.go
+++ b/builtin/logical/pki/storage.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pki
 
 import (
@@ -8,41 +5,31 @@ import (
 	"context"
 	"crypto"
 	"crypto/x509"
-	"errors"
 	"fmt"
 	"sort"
 	"strings"
 	"time"
 
 	"github.com/hashicorp/go-uuid"
-	"github.com/hashicorp/vault/helper/constants"
 	"github.com/hashicorp/vault/sdk/helper/certutil"
 	"github.com/hashicorp/vault/sdk/helper/errutil"
 	"github.com/hashicorp/vault/sdk/logical"
 )
 
-var ErrStorageItemNotFound = errors.New("storage item not found")
-
 const (
-	storageKeyConfig        = "config/keys"
-	storageIssuerConfig     = "config/issuers"
-	keyPrefix               = "config/key/"
-	issuerPrefix            = "config/issuer/"
-	storageLocalCRLConfig   = "crls/config"
-	storageUnifiedCRLConfig = "unified-crls/config"
+	storageKeyConfig      = "config/keys"
+	storageIssuerConfig   = "config/issuers"
+	keyPrefix             = "config/key/"
+	issuerPrefix          = "config/issuer/"
+	storageLocalCRLConfig = "crls/config"
 
 	legacyMigrationBundleLogKey = "config/legacyMigrationBundleLog"
 	legacyCertBundlePath        = "config/ca_bundle"
-	legacyCertBundleBackupPath  = "config/ca_bundle.bak"
 	legacyCRLPath               = "crl"
 	deltaCRLPath                = "delta-crl"
 	deltaCRLPathSuffix          = "-delta"
-	unifiedCRLPath              = "unified-crl"
-	unifiedDeltaCRLPath         = "unified-delta-crl"
-	unifiedCRLPathPrefix        = "unified-"
 
 	autoTidyConfigPath = "config/auto-tidy"
-	clusterConfigPath  = "config/cluster"
 
 	// Used as a quick sanity check for a reference id lookups...
 	uuidLength = 36
@@ -181,19 +168,18 @@ type issuerEntry struct {
 	Revoked              bool                      `json:"revoked"`
 	RevocationTime       int64                     `json:"revocation_time"`
 	RevocationTimeUTC    time.Time                 `json:"revocation_time_utc"`
-	AIAURIs              *aiaConfigEntry           `json:"aia_uris,omitempty"`
+	AIAURIs              *certutil.URLEntries      `json:"aia_uris,omitempty"`
 	LastModified         time.Time                 `json:"last_modified"`
 	Version              uint                      `json:"version"`
 }
 
-type internalCRLConfigEntry struct {
+type localCRLConfigEntry struct {
 	IssuerIDCRLMap        map[issuerID]crlID  `json:"issuer_id_crl_map"`
 	CRLNumberMap          map[crlID]int64     `json:"crl_number_map"`
 	LastCompleteNumberMap map[crlID]int64     `json:"last_complete_number_map"`
 	CRLExpirationMap      map[crlID]time.Time `json:"crl_expiration_map"`
 	LastModified          time.Time           `json:"last_modified"`
 	DeltaLastModified     time.Time           `json:"delta_last_modified"`
-	UseGlobalQueue        bool                `json:"cross_cluster_revocation"`
 }
 
 type keyConfigEntry struct {
@@ -209,70 +195,6 @@ type issuerConfigEntry struct {
 	DefaultFollowsLatestIssuer bool     `json:"default_follows_latest_issuer"`
 }
 
-type clusterConfigEntry struct {
-	Path    string `json:"path"`
-	AIAPath string `json:"aia_path"`
-}
-
-type aiaConfigEntry struct {
-	IssuingCertificates   []string `json:"issuing_certificates"`
-	CRLDistributionPoints []string `json:"crl_distribution_points"`
-	OCSPServers           []string `json:"ocsp_servers"`
-	EnableTemplating      bool     `json:"enable_templating"`
-}
-
-func (c *aiaConfigEntry) toURLEntries(sc *storageContext, issuer issuerID) (*certutil.URLEntries, error) {
-	if len(c.IssuingCertificates) == 0 && len(c.CRLDistributionPoints) == 0 && len(c.OCSPServers) == 0 {
-		return &certutil.URLEntries{}, nil
-	}
-
-	result := certutil.URLEntries{
-		IssuingCertificates:   c.IssuingCertificates[:],
-		CRLDistributionPoints: c.CRLDistributionPoints[:],
-		OCSPServers:           c.OCSPServers[:],
-	}
-
-	if c.EnableTemplating {
-		cfg, err := sc.getClusterConfig()
-		if err != nil {
-			return nil, fmt.Errorf("error fetching cluster-local address config: %w", err)
-		}
-
-		for name, source := range map[string]*[]string{
-			"issuing_certificates":    &result.IssuingCertificates,
-			"crl_distribution_points": &result.CRLDistributionPoints,
-			"ocsp_servers":            &result.OCSPServers,
-		} {
-			templated := make([]string, len(*source))
-			for index, uri := range *source {
-				if strings.Contains(uri, "{{cluster_path}}") && len(cfg.Path) == 0 {
-					return nil, fmt.Errorf("unable to template AIA URLs as we lack local cluster address information (path)")
-				}
-				if strings.Contains(uri, "{{cluster_aia_path}}") && len(cfg.AIAPath) == 0 {
-					return nil, fmt.Errorf("unable to template AIA URLs as we lack local cluster address information (aia_path)")
-				}
-				if strings.Contains(uri, "{{issuer_id}}") && len(issuer) == 0 {
-					// Elide issuer AIA info as we lack an issuer_id.
-					return nil, fmt.Errorf("unable to template AIA URLs as we lack an issuer_id for this operation")
-				}
-
-				uri = strings.ReplaceAll(uri, "{{cluster_path}}", cfg.Path)
-				uri = strings.ReplaceAll(uri, "{{cluster_aia_path}}", cfg.AIAPath)
-				uri = strings.ReplaceAll(uri, "{{issuer_id}}", issuer.String())
-				templated[index] = uri
-			}
-
-			if uri := validateURLs(templated); uri != "" {
-				return nil, fmt.Errorf("error validating templated %v; invalid URI: %v", name, uri)
-			}
-
-			*source = templated
-		}
-	}
-
-	return &result, nil
-}
-
 type storageContext struct {
 	Context context.Context
 	Storage logical.Storage
@@ -287,15 +209,6 @@ func (b *backend) makeStorageContext(ctx context.Context, s logical.Storage) *st
 	}
 }
 
-func (sc *storageContext) WithFreshTimeout(timeout time.Duration) (*storageContext, context.CancelFunc) {
-	ctx, cancel := context.WithTimeout(context.Background(), timeout)
-	return &storageContext{
-		Context: ctx,
-		Storage: sc.Storage,
-		Backend: sc.Backend,
-	}, cancel
-}
-
 func (sc *storageContext) listKeys() ([]keyID, error) {
 	strList, err := sc.Storage.List(sc.Context, keyPrefix)
 	if err != nil {
@@ -567,7 +480,7 @@ func (i issuerEntry) CanMaybeSignWithAlgo(algo x509.SignatureAlgorithm) error {
 
 	cert, err := i.GetCertificate()
 	if err != nil {
-		return fmt.Errorf("unable to parse issuer's potential signature algorithm types: %w", err)
+		return fmt.Errorf("unable to parse issuer's potential signature algorithm types: %v", err)
 	}
 
 	switch cert.PublicKeyAlgorithm {
@@ -593,26 +506,17 @@ func (i issuerEntry) CanMaybeSignWithAlgo(algo x509.SignatureAlgorithm) error {
 	return fmt.Errorf("unable to use issuer of type %v to sign with %v key type", cert.PublicKeyAlgorithm.String(), algo.String())
 }
 
-func (i issuerEntry) GetAIAURLs(sc *storageContext) (*certutil.URLEntries, error) {
+func (i issuerEntry) GetAIAURLs(sc *storageContext) (urls *certutil.URLEntries, err error) {
 	// Default to the per-issuer AIA URLs.
-	entries := i.AIAURIs
+	urls = i.AIAURIs
 
 	// If none are set (either due to a nil entry or because no URLs have
 	// been provided), fall back to the global AIA URL config.
-	if entries == nil || (len(entries.IssuingCertificates) == 0 && len(entries.CRLDistributionPoints) == 0 && len(entries.OCSPServers) == 0) {
-		var err error
-
-		entries, err = getGlobalAIAURLs(sc.Context, sc.Storage)
-		if err != nil {
-			return nil, err
-		}
+	if urls == nil || (len(urls.IssuingCertificates) == 0 && len(urls.CRLDistributionPoints) == 0 && len(urls.OCSPServers) == 0) {
+		urls, err = getGlobalAIAURLs(sc.Context, sc.Storage)
 	}
 
-	if entries == nil {
-		return &certutil.URLEntries{}, nil
-	}
-
-	return entries.toURLEntries(sc, i.ID)
+	return urls, err
 }
 
 func (sc *storageContext) listIssuers() ([]issuerID, error) {
@@ -930,8 +834,8 @@ func areCertificatesEqual(cert1 *x509.Certificate, cert2 *x509.Certificate) bool
 	return bytes.Equal(cert1.Raw, cert2.Raw)
 }
 
-func (sc *storageContext) _setInternalCRLConfig(mapping *internalCRLConfigEntry, path string) error {
-	json, err := logical.StorageEntryJSON(path, mapping)
+func (sc *storageContext) setLocalCRLConfig(mapping *localCRLConfigEntry) error {
+	json, err := logical.StorageEntryJSON(storageLocalCRLConfig, mapping)
 	if err != nil {
 		return err
 	}
@@ -939,21 +843,13 @@ func (sc *storageContext) _setInternalCRLConfig(mapping *internalCRLConfigEntry,
 	return sc.Storage.Put(sc.Context, json)
 }
 
-func (sc *storageContext) setLocalCRLConfig(mapping *internalCRLConfigEntry) error {
-	return sc._setInternalCRLConfig(mapping, storageLocalCRLConfig)
-}
-
-func (sc *storageContext) setUnifiedCRLConfig(mapping *internalCRLConfigEntry) error {
-	return sc._setInternalCRLConfig(mapping, storageUnifiedCRLConfig)
-}
-
-func (sc *storageContext) _getInternalCRLConfig(path string) (*internalCRLConfigEntry, error) {
-	entry, err := sc.Storage.Get(sc.Context, path)
+func (sc *storageContext) getLocalCRLConfig() (*localCRLConfigEntry, error) {
+	entry, err := sc.Storage.Get(sc.Context, storageLocalCRLConfig)
 	if err != nil {
 		return nil, err
 	}
 
-	mapping := &internalCRLConfigEntry{}
+	mapping := &localCRLConfigEntry{}
 	if entry != nil {
 		if err := entry.DecodeJSON(mapping); err != nil {
 			return nil, errutil.InternalError{Err: fmt.Sprintf("unable to decode cluster-local CRL configuration: %v", err)}
@@ -993,14 +889,6 @@ func (sc *storageContext) _getInternalCRLConfig(path string) (*internalCRLConfig
 	return mapping, nil
 }
 
-func (sc *storageContext) getLocalCRLConfig() (*internalCRLConfigEntry, error) {
-	return sc._getInternalCRLConfig(storageLocalCRLConfig)
-}
-
-func (sc *storageContext) getUnifiedCRLConfig() (*internalCRLConfigEntry, error) {
-	return sc._getInternalCRLConfig(storageUnifiedCRLConfig)
-}
-
 func (sc *storageContext) setKeysConfig(config *keyConfigEntry) error {
 	json, err := logical.StorageEntryJSON(storageKeyConfig, config)
 	if err != nil {
@@ -1110,7 +998,7 @@ func (sc *storageContext) resolveIssuerReference(reference string) (issuerID, er
 	return IssuerRefNotFound, errutil.UserError{Err: fmt.Sprintf("unable to find PKI issuer for reference: %v", reference)}
 }
 
-func (sc *storageContext) resolveIssuerCRLPath(reference string, unified bool) (string, error) {
+func (sc *storageContext) resolveIssuerCRLPath(reference string) (string, error) {
 	if sc.Backend.useLegacyBundleCaStorage() {
 		return legacyCRLPath, nil
 	}
@@ -1120,23 +1008,13 @@ func (sc *storageContext) resolveIssuerCRLPath(reference string, unified bool) (
 		return legacyCRLPath, err
 	}
 
-	configPath := storageLocalCRLConfig
-	if unified {
-		configPath = storageUnifiedCRLConfig
-	}
-
-	crlConfig, err := sc._getInternalCRLConfig(configPath)
+	crlConfig, err := sc.getLocalCRLConfig()
 	if err != nil {
 		return legacyCRLPath, err
 	}
 
 	if crlId, ok := crlConfig.IssuerIDCRLMap[issuer]; ok && len(crlId) > 0 {
-		path := fmt.Sprintf("crls/%v", crlId)
-		if unified {
-			path = unifiedCRLPathPrefix + path
-		}
-
-		return path, nil
+		return fmt.Sprintf("crls/%v", crlId), nil
 	}
 
 	return legacyCRLPath, fmt.Errorf("unable to find CRL for issuer: id:%v/ref:%v", issuer, reference)
@@ -1325,16 +1203,6 @@ func (sc *storageContext) getRevocationConfig() (*crlConfig, error) {
 		result.Expiry = defaultCrlConfig.Expiry
 	}
 
-	isLocalMount := sc.Backend.System().LocalMount()
-	if (!constants.IsEnterprise || isLocalMount) && (result.UnifiedCRLOnExistingPaths || result.UnifiedCRL || result.UseGlobalQueue) {
-		// An end user must have had Enterprise, enabled the unified config args and then downgraded to OSS.
-		sc.Backend.Logger().Warn("Not running Vault Enterprise or using a local mount, " +
-			"disabling unified_crl, unified_crl_on_existing_paths and cross_cluster_revocation config flags.")
-		result.UnifiedCRLOnExistingPaths = false
-		result.UnifiedCRL = false
-		result.UseGlobalQueue = false
-	}
-
 	return &result, nil
 }
 
@@ -1354,10 +1222,6 @@ func (sc *storageContext) getAutoTidyConfig() (*tidyConfig, error) {
 		return nil, err
 	}
 
-	if result.IssuerSafetyBuffer == 0 {
-		result.IssuerSafetyBuffer = defaultTidyConfig.IssuerSafetyBuffer
-	}
-
 	return &result, nil
 }
 
@@ -1367,83 +1231,5 @@ func (sc *storageContext) writeAutoTidyConfig(config *tidyConfig) error {
 		return err
 	}
 
-	err = sc.Storage.Put(sc.Context, entry)
-	if err != nil {
-		return err
-	}
-
-	sc.Backend.publishCertCountMetrics.Store(config.PublishMetrics)
-
-	// To Potentially Disable Certificate Counting
-	if config.MaintainCount == false {
-		certCountWasEnabled := sc.Backend.certCountEnabled.Swap(config.MaintainCount)
-		if certCountWasEnabled {
-			sc.Backend.certsCounted.Store(true)
-			sc.Backend.certCountError = "Cert Count is Disabled: enable via Tidy Config maintain_stored_certificate_counts"
-			sc.Backend.possibleDoubleCountedSerials = nil        // This won't stop a list operation, but will stop an expensive clean-up during initialize
-			sc.Backend.possibleDoubleCountedRevokedSerials = nil // This won't stop a list operation, but will stop an expensive clean-up during initialize
-			sc.Backend.certCount.Store(0)
-			sc.Backend.revokedCertCount.Store(0)
-		}
-	} else { // To Potentially Enable Certificate Counting
-		if sc.Backend.certCountEnabled.Load() == false {
-			// We haven't written "re-enable certificate counts" outside the initialize function
-			// Any call derived call to do so is likely to time out on ~2 million certs
-			sc.Backend.certCountError = "Certificate Counting Has Not Been Initialized, re-initialize this mount"
-		}
-	}
-
-	return nil
-}
-
-func (sc *storageContext) listRevokedCerts() ([]string, error) {
-	list, err := sc.Storage.List(sc.Context, revokedPath)
-	if err != nil {
-		return nil, fmt.Errorf("failed listing revoked certs: %w", err)
-	}
-
-	return list, err
-}
-
-func (sc *storageContext) getClusterConfig() (*clusterConfigEntry, error) {
-	entry, err := sc.Storage.Get(sc.Context, clusterConfigPath)
-	if err != nil {
-		return nil, err
-	}
-
-	var result clusterConfigEntry
-	if entry == nil {
-		return &result, nil
-	}
-
-	if err = entry.DecodeJSON(&result); err != nil {
-		return nil, err
-	}
-
-	return &result, nil
-}
-
-func (sc *storageContext) writeClusterConfig(config *clusterConfigEntry) error {
-	entry, err := logical.StorageEntryJSON(clusterConfigPath, config)
-	if err != nil {
-		return err
-	}
-
 	return sc.Storage.Put(sc.Context, entry)
 }
-
-func (sc *storageContext) fetchRevocationInfo(serial string) (*revocationInfo, error) {
-	var revInfo *revocationInfo
-	revEntry, err := fetchCertBySerial(sc, revokedPath, serial)
-	if err != nil {
-		return nil, err
-	}
-	if revEntry != nil {
-		err = revEntry.DecodeJSON(&revInfo)
-		if err != nil {
-			return nil, fmt.Errorf("error decoding existing revocation info: %w", err)
-		}
-	}
-
-	return revInfo, nil
-}
diff --git a/builtin/logical/pki/storage_migrations.go b/builtin/logical/pki/storage_migrations.go
index f4b9237266b76..9104e5c6f3afb 100644
--- a/builtin/logical/pki/storage_migrations.go
+++ b/builtin/logical/pki/storage_migrations.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pki
 
 import (
diff --git a/builtin/logical/pki/storage_migrations_test.go b/builtin/logical/pki/storage_migrations_test.go
index 754f3993d14b2..49217bcdf013d 100644
--- a/builtin/logical/pki/storage_migrations_test.go
+++ b/builtin/logical/pki/storage_migrations_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pki
 
 import (
@@ -18,7 +15,7 @@ func Test_migrateStorageEmptyStorage(t *testing.T) {
 	t.Parallel()
 	startTime := time.Now()
 	ctx := context.Background()
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 	sc := b.makeStorageContext(ctx, s)
 
 	// Reset the version the helper above set to 1.
@@ -67,7 +64,7 @@ func Test_migrateStorageOnlyKey(t *testing.T) {
 	t.Parallel()
 	startTime := time.Now()
 	ctx := context.Background()
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 	sc := b.makeStorageContext(ctx, s)
 
 	// Reset the version the helper above set to 1.
@@ -149,7 +146,7 @@ func Test_migrateStorageSimpleBundle(t *testing.T) {
 	t.Parallel()
 	startTime := time.Now()
 	ctx := context.Background()
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 	sc := b.makeStorageContext(ctx, s)
 
 	// Reset the version the helper above set to 1.
@@ -255,7 +252,7 @@ func Test_migrateStorageSimpleBundle(t *testing.T) {
 func TestMigration_OnceChainRebuild(t *testing.T) {
 	t.Parallel()
 	ctx := context.Background()
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 	sc := b.makeStorageContext(ctx, s)
 
 	// Create a legacy CA bundle that we'll migrate to the new layout. We call
@@ -365,7 +362,7 @@ func TestMigration_OnceChainRebuild(t *testing.T) {
 func TestExpectedOpsWork_PreMigration(t *testing.T) {
 	t.Parallel()
 	ctx := context.Background()
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 	// Reset the version the helper above set to 1.
 	b.pkiStorageVersion.Store(0)
 	require.True(t, b.useLegacyBundleCaStorage(), "pre migration we should have been told to use legacy storage.")
@@ -388,7 +385,7 @@ func TestExpectedOpsWork_PreMigration(t *testing.T) {
 		MountPoint: "pki/",
 	})
 	require.NoError(t, err, "error from creating role")
-	require.NotNil(t, resp, "got nil response object from creating role")
+	require.Nil(t, resp, "got non-nil response object from creating role")
 
 	// List roles
 	resp, err = b.HandleRequest(context.Background(), &logical.Request{
@@ -474,7 +471,7 @@ func TestExpectedOpsWork_PreMigration(t *testing.T) {
 		MountPoint: "pki/",
 	})
 	require.NoError(t, err, "error setting CRL config")
-	require.NotNil(t, resp, "got nil response setting CRL config")
+	require.Nil(t, resp, "got non-nil response setting CRL config")
 
 	// Set URL config
 	resp, err = b.HandleRequest(context.Background(), &logical.Request{
@@ -486,7 +483,8 @@ func TestExpectedOpsWork_PreMigration(t *testing.T) {
 		},
 		MountPoint: "pki/",
 	})
-	requireSuccessNonNilResponse(t, resp, err)
+	require.NoError(t, err, "error setting URL config")
+	require.Nil(t, resp, "got non-nil response setting URL config")
 
 	// Make sure we can fetch the old values...
 	for _, path := range []string{"ca/pem", "ca_chain", "cert/" + serialNum, "cert/ca", "cert/crl", "cert/ca_chain", "config/crl", "config/urls"} {
@@ -593,190 +591,6 @@ func TestExpectedOpsWork_PreMigration(t *testing.T) {
 	requireFailInMigration(t, b, s, logical.ReadOperation, "config/keys")
 }
 
-func TestBackupBundle(t *testing.T) {
-	t.Parallel()
-	ctx := context.Background()
-	b, s := CreateBackendWithStorage(t)
-	sc := b.makeStorageContext(ctx, s)
-
-	// Reset the version the helper above set to 1.
-	b.pkiStorageVersion.Store(0)
-	require.True(t, b.useLegacyBundleCaStorage(), "pre migration we should have been told to use legacy storage.")
-
-	// Create an empty request and tidy configuration for us.
-	req := &logical.Request{
-		Storage:    s,
-		MountPoint: "pki/",
-	}
-	cfg := &tidyConfig{
-		BackupBundle:       true,
-		IssuerSafetyBuffer: 120 * time.Second,
-	}
-
-	// Migration should do nothing if we're on an empty mount.
-	err := b.doTidyMoveCABundle(ctx, req, b.Logger(), cfg)
-	require.NoError(t, err)
-	requireFileNotExists(t, sc, legacyCertBundlePath)
-	requireFileNotExists(t, sc, legacyCertBundleBackupPath)
-	issuerIds, err := sc.listIssuers()
-	require.NoError(t, err)
-	require.Empty(t, issuerIds)
-	keyIds, err := sc.listKeys()
-	require.NoError(t, err)
-	require.Empty(t, keyIds)
-
-	// Create a legacy CA bundle and write it out.
-	bundle := genCertBundle(t, b, s)
-	json, err := logical.StorageEntryJSON(legacyCertBundlePath, bundle)
-	require.NoError(t, err)
-	err = s.Put(ctx, json)
-	require.NoError(t, err)
-	legacyContents := requireFileExists(t, sc, legacyCertBundlePath, nil)
-
-	// Doing another tidy should maintain the status quo since we've
-	// still not done our migration.
-	err = b.doTidyMoveCABundle(ctx, req, b.Logger(), cfg)
-	require.NoError(t, err)
-	requireFileExists(t, sc, legacyCertBundlePath, legacyContents)
-	requireFileNotExists(t, sc, legacyCertBundleBackupPath)
-	issuerIds, err = sc.listIssuers()
-	require.NoError(t, err)
-	require.Empty(t, issuerIds)
-	keyIds, err = sc.listKeys()
-	require.NoError(t, err)
-	require.Empty(t, keyIds)
-
-	// Do a migration; this should provision an issuer and key.
-	initReq := &logical.InitializationRequest{Storage: s}
-	err = b.initialize(ctx, initReq)
-	require.NoError(t, err)
-	requireFileExists(t, sc, legacyCertBundlePath, legacyContents)
-	issuerIds, err = sc.listIssuers()
-	require.NoError(t, err)
-	require.NotEmpty(t, issuerIds)
-	keyIds, err = sc.listKeys()
-	require.NoError(t, err)
-	require.NotEmpty(t, keyIds)
-
-	// Doing another tidy should maintain the status quo since we've
-	// done our migration too recently relative to the safety buffer.
-	err = b.doTidyMoveCABundle(ctx, req, b.Logger(), cfg)
-	require.NoError(t, err)
-	requireFileExists(t, sc, legacyCertBundlePath, legacyContents)
-	requireFileNotExists(t, sc, legacyCertBundleBackupPath)
-	issuerIds, err = sc.listIssuers()
-	require.NoError(t, err)
-	require.NotEmpty(t, issuerIds)
-	keyIds, err = sc.listKeys()
-	require.NoError(t, err)
-	require.NotEmpty(t, keyIds)
-
-	// Shortening our buffer should ensure the migration occurs, removing
-	// the legacy bundle but creating the backup one.
-	time.Sleep(2 * time.Second)
-	cfg.IssuerSafetyBuffer = 1 * time.Second
-	err = b.doTidyMoveCABundle(ctx, req, b.Logger(), cfg)
-	require.NoError(t, err)
-	requireFileNotExists(t, sc, legacyCertBundlePath)
-	requireFileExists(t, sc, legacyCertBundleBackupPath, legacyContents)
-	issuerIds, err = sc.listIssuers()
-	require.NoError(t, err)
-	require.NotEmpty(t, issuerIds)
-	keyIds, err = sc.listKeys()
-	require.NoError(t, err)
-	require.NotEmpty(t, keyIds)
-
-	// A new initialization should do nothing.
-	err = b.initialize(ctx, initReq)
-	require.NoError(t, err)
-	requireFileNotExists(t, sc, legacyCertBundlePath)
-	requireFileExists(t, sc, legacyCertBundleBackupPath, legacyContents)
-	issuerIds, err = sc.listIssuers()
-	require.NoError(t, err)
-	require.NotEmpty(t, issuerIds)
-	require.Equal(t, len(issuerIds), 1)
-	keyIds, err = sc.listKeys()
-	require.NoError(t, err)
-	require.NotEmpty(t, keyIds)
-	require.Equal(t, len(keyIds), 1)
-
-	// Restoring the legacy bundles with new issuers should redo the
-	// migration.
-	newBundle := genCertBundle(t, b, s)
-	json, err = logical.StorageEntryJSON(legacyCertBundlePath, newBundle)
-	require.NoError(t, err)
-	err = s.Put(ctx, json)
-	require.NoError(t, err)
-	newLegacyContents := requireFileExists(t, sc, legacyCertBundlePath, nil)
-
-	// -> reinit
-	err = b.initialize(ctx, initReq)
-	require.NoError(t, err)
-	requireFileExists(t, sc, legacyCertBundlePath, newLegacyContents)
-	requireFileExists(t, sc, legacyCertBundleBackupPath, legacyContents)
-	issuerIds, err = sc.listIssuers()
-	require.NoError(t, err)
-	require.NotEmpty(t, issuerIds)
-	require.Equal(t, len(issuerIds), 2)
-	keyIds, err = sc.listKeys()
-	require.NoError(t, err)
-	require.NotEmpty(t, keyIds)
-	require.Equal(t, len(keyIds), 2)
-
-	// -> when we tidy again, we'll overwrite the old backup with the new
-	// one.
-	time.Sleep(2 * time.Second)
-	err = b.doTidyMoveCABundle(ctx, req, b.Logger(), cfg)
-	require.NoError(t, err)
-	requireFileNotExists(t, sc, legacyCertBundlePath)
-	requireFileExists(t, sc, legacyCertBundleBackupPath, newLegacyContents)
-	issuerIds, err = sc.listIssuers()
-	require.NoError(t, err)
-	require.NotEmpty(t, issuerIds)
-	keyIds, err = sc.listKeys()
-	require.NoError(t, err)
-	require.NotEmpty(t, keyIds)
-
-	// Finally, restoring the legacy bundle and re-migrating should redo
-	// the migration.
-	err = s.Put(ctx, json)
-	require.NoError(t, err)
-	requireFileExists(t, sc, legacyCertBundlePath, newLegacyContents)
-	requireFileExists(t, sc, legacyCertBundleBackupPath, newLegacyContents)
-
-	// -> overwrite the version and re-migrate
-	logEntry, err := getLegacyBundleMigrationLog(ctx, s)
-	require.NoError(t, err)
-	logEntry.MigrationVersion = 0
-	err = setLegacyBundleMigrationLog(ctx, s, logEntry)
-	require.NoError(t, err)
-	err = b.initialize(ctx, initReq)
-	require.NoError(t, err)
-	requireFileExists(t, sc, legacyCertBundlePath, newLegacyContents)
-	requireFileExists(t, sc, legacyCertBundleBackupPath, newLegacyContents)
-	issuerIds, err = sc.listIssuers()
-	require.NoError(t, err)
-	require.NotEmpty(t, issuerIds)
-	require.Equal(t, len(issuerIds), 2)
-	keyIds, err = sc.listKeys()
-	require.NoError(t, err)
-	require.NotEmpty(t, keyIds)
-	require.Equal(t, len(keyIds), 2)
-
-	// -> Re-tidy should remove the legacy one.
-	time.Sleep(2 * time.Second)
-	err = b.doTidyMoveCABundle(ctx, req, b.Logger(), cfg)
-	require.NoError(t, err)
-	requireFileNotExists(t, sc, legacyCertBundlePath)
-	requireFileExists(t, sc, legacyCertBundleBackupPath, newLegacyContents)
-	issuerIds, err = sc.listIssuers()
-	require.NoError(t, err)
-	require.NotEmpty(t, issuerIds)
-	keyIds, err = sc.listKeys()
-	require.NoError(t, err)
-	require.NotEmpty(t, keyIds)
-}
-
 // requireFailInMigration validate that we fail the operation with the appropriate error message to the end-user
 func requireFailInMigration(t *testing.T, b *backend, s logical.Storage, operation logical.Operation, path string) {
 	resp, err := b.HandleRequest(context.Background(), &logical.Request{
@@ -792,31 +606,6 @@ func requireFailInMigration(t *testing.T, b *backend, s logical.Storage, operati
 		"error message did not contain migration test for op:%s path:%s resp: %#v", operation, path, resp)
 }
 
-func requireFileNotExists(t *testing.T, sc *storageContext, path string) {
-	t.Helper()
-
-	entry, err := sc.Storage.Get(sc.Context, path)
-	require.NoError(t, err)
-	if entry != nil {
-		require.Empty(t, entry.Value)
-	} else {
-		require.Empty(t, entry)
-	}
-}
-
-func requireFileExists(t *testing.T, sc *storageContext, path string, contents []byte) []byte {
-	t.Helper()
-
-	entry, err := sc.Storage.Get(sc.Context, path)
-	require.NoError(t, err)
-	require.NotNil(t, entry)
-	require.NotEmpty(t, entry.Value)
-	if contents != nil {
-		require.Equal(t, entry.Value, contents)
-	}
-	return entry.Value
-}
-
 // Keys to simulate an intermediate CA mount with also-imported root (parent).
 const (
 	migIntPrivKey = `-----BEGIN RSA PRIVATE KEY-----
diff --git a/builtin/logical/pki/storage_test.go b/builtin/logical/pki/storage_test.go
index 625c046d00c86..17700576fda13 100644
--- a/builtin/logical/pki/storage_test.go
+++ b/builtin/logical/pki/storage_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pki
 
 import (
@@ -18,7 +15,7 @@ var ctx = context.Background()
 
 func Test_ConfigsRoundTrip(t *testing.T) {
 	t.Parallel()
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 	sc := b.makeStorageContext(ctx, s)
 
 	// Create an empty key, issuer for testing.
@@ -62,7 +59,7 @@ func Test_ConfigsRoundTrip(t *testing.T) {
 
 func Test_IssuerRoundTrip(t *testing.T) {
 	t.Parallel()
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 	sc := b.makeStorageContext(ctx, s)
 	issuer1, key1 := genIssuerAndKey(t, b, s)
 	issuer2, key2 := genIssuerAndKey(t, b, s)
@@ -108,7 +105,7 @@ func Test_IssuerRoundTrip(t *testing.T) {
 
 func Test_KeysIssuerImport(t *testing.T) {
 	t.Parallel()
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 	sc := b.makeStorageContext(ctx, s)
 
 	issuer1, key1 := genIssuerAndKey(t, b, s)
@@ -177,7 +174,7 @@ func Test_KeysIssuerImport(t *testing.T) {
 
 func Test_IssuerUpgrade(t *testing.T) {
 	t.Parallel()
-	b, s := CreateBackendWithStorage(t)
+	b, s := createBackendWithStorage(t)
 	sc := b.makeStorageContext(ctx, s)
 
 	// Make sure that we add OCSP signing to v0 issuers if CRLSigning is enabled
diff --git a/builtin/logical/pki/storage_unified.go b/builtin/logical/pki/storage_unified.go
deleted file mode 100644
index 28c656bb8bb65..0000000000000
--- a/builtin/logical/pki/storage_unified.go
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package pki
-
-import (
-	"fmt"
-	"strings"
-	"time"
-
-	"github.com/hashicorp/vault/sdk/logical"
-)
-
-const (
-	unifiedRevocationReadPathPrefix  = "unified-revocation/"
-	unifiedRevocationWritePathPrefix = unifiedRevocationReadPathPrefix + "{{clusterId}}/"
-)
-
-type unifiedRevocationEntry struct {
-	SerialNumber      string    `json:"-"`
-	CertExpiration    time.Time `json:"certificate_expiration_utc"`
-	RevocationTimeUTC time.Time `json:"revocation_time_utc"`
-	CertificateIssuer issuerID  `json:"issuer_id"`
-}
-
-func getUnifiedRevocationBySerial(sc *storageContext, serial string) (*unifiedRevocationEntry, error) {
-	clusterPaths, err := lookupUnifiedClusterPaths(sc)
-	if err != nil {
-		return nil, err
-	}
-
-	for _, path := range clusterPaths {
-		serialPath := path + serial
-		entryRaw, err := sc.Storage.Get(sc.Context, serialPath)
-		if err != nil {
-			return nil, err
-		}
-
-		if entryRaw != nil {
-			var revEntry unifiedRevocationEntry
-			if err := entryRaw.DecodeJSON(&revEntry); err != nil {
-				return nil, fmt.Errorf("failed json decoding of unified entry at path %s: %w", serialPath, err)
-			}
-			revEntry.SerialNumber = serial
-			return &revEntry, nil
-		}
-	}
-
-	return nil, nil
-}
-
-func writeUnifiedRevocationEntry(sc *storageContext, ure *unifiedRevocationEntry) error {
-	json, err := logical.StorageEntryJSON(unifiedRevocationWritePathPrefix+normalizeSerial(ure.SerialNumber), ure)
-	if err != nil {
-		return err
-	}
-
-	return sc.Storage.Put(sc.Context, json)
-}
-
-// listClusterSpecificUnifiedRevokedCerts returns a list of revoked certificates from a given cluster
-func listClusterSpecificUnifiedRevokedCerts(sc *storageContext, clusterId string) ([]string, error) {
-	path := unifiedRevocationReadPathPrefix + clusterId + "/"
-	serials, err := sc.Storage.List(sc.Context, path)
-	if err != nil {
-		return nil, err
-	}
-
-	return serials, nil
-}
-
-// lookupUnifiedClusterPaths returns a map of cluster id to the prefix storage path for that given cluster's
-// unified revoked certificates
-func lookupUnifiedClusterPaths(sc *storageContext) (map[string]string, error) {
-	fullPaths := map[string]string{}
-
-	clusterPaths, err := sc.Storage.List(sc.Context, unifiedRevocationReadPathPrefix)
-	if err != nil {
-		return nil, err
-	}
-
-	for _, clusterIdWithSlash := range clusterPaths {
-		// Only include folder listings, if a file were to be stored under this path ignore it.
-		if strings.HasSuffix(clusterIdWithSlash, "/") {
-			clusterId := clusterIdWithSlash[:len(clusterIdWithSlash)-1] // remove trailing /
-			fullPaths[clusterId] = unifiedRevocationReadPathPrefix + clusterIdWithSlash
-		}
-	}
-
-	return fullPaths, nil
-}
diff --git a/builtin/logical/pki/test_helpers.go b/builtin/logical/pki/test_helpers.go
index 0a003438ba8a2..acf083cede614 100644
--- a/builtin/logical/pki/test_helpers.go
+++ b/builtin/logical/pki/test_helpers.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pki
 
 import (
@@ -10,15 +7,11 @@ import (
 	"crypto/rsa"
 	"crypto/x509"
 	"crypto/x509/pkix"
-	"encoding/asn1"
 	"encoding/pem"
 	"fmt"
 	"io"
-	"math"
-	"math/big"
 	"strings"
 	"testing"
-	"time"
 
 	"github.com/hashicorp/vault/api"
 	"github.com/hashicorp/vault/sdk/helper/certutil"
@@ -27,9 +20,7 @@ import (
 )
 
 // Setup helpers
-func CreateBackendWithStorage(t testing.TB) (*backend, logical.Storage) {
-	t.Helper()
-
+func createBackendWithStorage(t testing.TB) (*backend, logical.Storage) {
 	config := logical.TestBackendConfig()
 	config.StorageView = &logical.InmemStorage{}
 
@@ -45,8 +36,6 @@ func CreateBackendWithStorage(t testing.TB) (*backend, logical.Storage) {
 }
 
 func mountPKIEndpoint(t testing.TB, client *api.Client, path string) {
-	t.Helper()
-
 	err := client.Sys().Mount(path, &api.MountInput{
 		Type: "pki",
 		Config: api.MountConfigInput{
@@ -59,32 +48,13 @@ func mountPKIEndpoint(t testing.TB, client *api.Client, path string) {
 
 // Signing helpers
 func requireSignedBy(t *testing.T, cert *x509.Certificate, signingCert *x509.Certificate) {
-	t.Helper()
-
 	if err := cert.CheckSignatureFrom(signingCert); err != nil {
 		t.Fatalf("signature verification failed: %v", err)
 	}
 }
 
-func requireSignedByAtPath(t *testing.T, client *api.Client, leaf *x509.Certificate, path string) {
-	t.Helper()
-
-	resp, err := client.Logical().Read(path)
-	require.NoError(t, err, "got unexpected error fetching parent certificate")
-	require.NotNil(t, resp, "missing response when fetching parent certificate")
-	require.NotNil(t, resp.Data, "missing data from parent certificate response")
-	require.NotNil(t, resp.Data["certificate"], "missing certificate field on parent read response")
-
-	parentCert := resp.Data["certificate"].(string)
-	parent := parseCert(t, parentCert)
-
-	requireSignedBy(t, leaf, parent)
-}
-
 // Certificate helper
 func parseCert(t *testing.T, pemCert string) *x509.Certificate {
-	t.Helper()
-
 	block, _ := pem.Decode([]byte(pemCert))
 	require.NotNil(t, block, "failed to decode PEM block")
 
@@ -94,8 +64,6 @@ func parseCert(t *testing.T, pemCert string) *x509.Certificate {
 }
 
 func requireMatchingPublicKeys(t *testing.T, cert *x509.Certificate, key crypto.PublicKey) {
-	t.Helper()
-
 	certPubKey := cert.PublicKey
 	areEqual, err := certutil.ComparePublicKeysAndType(certPubKey, key)
 	require.NoError(t, err, "failed comparing public keys: %#v", err)
@@ -121,25 +89,17 @@ func getSelfSigned(t *testing.T, subject, issuer *x509.Certificate, key *rsa.Pri
 
 // CRL related helpers
 func getCrlCertificateList(t *testing.T, client *api.Client, mountPoint string) pkix.TBSCertificateList {
-	t.Helper()
-
 	path := fmt.Sprintf("/v1/%s/crl", mountPoint)
 	return getParsedCrlAtPath(t, client, path).TBSCertList
 }
 
 func parseCrlPemBytes(t *testing.T, crlPem []byte) pkix.TBSCertificateList {
-	t.Helper()
-
 	certList, err := x509.ParseCRL(crlPem)
 	require.NoError(t, err)
 	return certList.TBSCertList
 }
 
 func requireSerialNumberInCRL(t *testing.T, revokeList pkix.TBSCertificateList, serialNum string) bool {
-	if t != nil {
-		t.Helper()
-	}
-
 	serialsInList := make([]string, 0, len(revokeList.RevokedCertificates))
 	for _, revokeEntry := range revokeList.RevokedCertificates {
 		formattedSerial := certutil.GetHexFormatted(revokeEntry.SerialNumber.Bytes(), ":")
@@ -157,15 +117,11 @@ func requireSerialNumberInCRL(t *testing.T, revokeList pkix.TBSCertificateList,
 }
 
 func getParsedCrl(t *testing.T, client *api.Client, mountPoint string) *pkix.CertificateList {
-	t.Helper()
-
 	path := fmt.Sprintf("/v1/%s/crl", mountPoint)
 	return getParsedCrlAtPath(t, client, path)
 }
 
 func getParsedCrlAtPath(t *testing.T, client *api.Client, path string) *pkix.CertificateList {
-	t.Helper()
-
 	req := client.NewRequest("GET", path)
 	resp, err := client.RawRequest(req)
 	if err != nil {
@@ -189,8 +145,6 @@ func getParsedCrlAtPath(t *testing.T, client *api.Client, path string) *pkix.Cer
 }
 
 func getParsedCrlFromBackend(t *testing.T, b *backend, s logical.Storage, path string) *pkix.CertificateList {
-	t.Helper()
-
 	resp, err := CBRead(b, s, path)
 	if err != nil {
 		t.Fatal(err)
@@ -226,10 +180,6 @@ func CBReq(b *backend, s logical.Storage, operation logical.Operation, path stri
 	return resp, nil
 }
 
-func CBHeader(b *backend, s logical.Storage, path string) (*logical.Response, error) {
-	return CBReq(b, s, logical.HeaderOperation, path, make(map[string]interface{}))
-}
-
 func CBRead(b *backend, s logical.Storage, path string) (*logical.Response, error) {
 	return CBReq(b, s, logical.ReadOperation, path, make(map[string]interface{}))
 }
@@ -251,8 +201,6 @@ func CBDelete(b *backend, s logical.Storage, path string) (*logical.Response, er
 }
 
 func requireFieldsSetInResp(t *testing.T, resp *logical.Response, fields ...string) {
-	t.Helper()
-
 	var missingFields []string
 	for _, field := range fields {
 		value, ok := resp.Data[field]
@@ -265,131 +213,13 @@ func requireFieldsSetInResp(t *testing.T, resp *logical.Response, fields ...stri
 }
 
 func requireSuccessNonNilResponse(t *testing.T, resp *logical.Response, err error, msgAndArgs ...interface{}) {
-	t.Helper()
-
 	require.NoError(t, err, msgAndArgs...)
-	if resp.IsError() {
-		errContext := fmt.Sprintf("Expected successful response but got error: %v", resp.Error())
-		require.Falsef(t, resp.IsError(), errContext, msgAndArgs...)
-	}
+	require.False(t, resp.IsError(), msgAndArgs...)
 	require.NotNil(t, resp, msgAndArgs...)
 }
 
 func requireSuccessNilResponse(t *testing.T, resp *logical.Response, err error, msgAndArgs ...interface{}) {
-	t.Helper()
-
 	require.NoError(t, err, msgAndArgs...)
-	if resp.IsError() {
-		errContext := fmt.Sprintf("Expected successful response but got error: %v", resp.Error())
-		require.Falsef(t, resp.IsError(), errContext, msgAndArgs...)
-	}
-	if resp != nil {
-		msg := fmt.Sprintf("expected nil response but got: %v", resp)
-		require.Nilf(t, resp, msg, msgAndArgs...)
-	}
-}
-
-func getCRLNumber(t *testing.T, crl pkix.TBSCertificateList) int {
-	t.Helper()
-
-	for _, extension := range crl.Extensions {
-		if extension.Id.Equal(certutil.CRLNumberOID) {
-			bigInt := new(big.Int)
-			leftOver, err := asn1.Unmarshal(extension.Value, &bigInt)
-			require.NoError(t, err, "Failed unmarshalling crl number extension")
-			require.Empty(t, leftOver, "leftover bytes from unmarshalling crl number extension")
-			require.True(t, bigInt.IsInt64(), "parsed crl number integer is not an int64")
-			require.False(t, math.MaxInt <= bigInt.Int64(), "parsed crl number integer can not fit in an int")
-			return int(bigInt.Int64())
-		}
-	}
-
-	t.Fatalf("failed to find crl number extension")
-	return 0
-}
-
-func getCrlReferenceFromDelta(t *testing.T, crl pkix.TBSCertificateList) int {
-	t.Helper()
-
-	for _, extension := range crl.Extensions {
-		if extension.Id.Equal(certutil.DeltaCRLIndicatorOID) {
-			bigInt := new(big.Int)
-			leftOver, err := asn1.Unmarshal(extension.Value, &bigInt)
-			require.NoError(t, err, "Failed unmarshalling delta crl indicator extension")
-			require.Empty(t, leftOver, "leftover bytes from unmarshalling delta crl indicator extension")
-			require.True(t, bigInt.IsInt64(), "parsed delta crl integer is not an int64")
-			require.False(t, math.MaxInt <= bigInt.Int64(), "parsed delta crl integer can not fit in an int")
-			return int(bigInt.Int64())
-		}
-	}
-
-	t.Fatalf("failed to find delta crl indicator extension")
-	return 0
-}
-
-// waitForUpdatedCrl will wait until the CRL at the provided path has been reloaded
-// up for a maxWait duration and gives up if the timeout has been reached. If a negative
-// value for lastSeenCRLNumber is provided, the method will load the current CRL and wait
-// for a newer CRL be generated.
-func waitForUpdatedCrl(t *testing.T, client *api.Client, crlPath string, lastSeenCRLNumber int, maxWait time.Duration) pkix.TBSCertificateList {
-	t.Helper()
-
-	newCrl, didTimeOut := waitForUpdatedCrlUntil(t, client, crlPath, lastSeenCRLNumber, maxWait)
-	if didTimeOut {
-		t.Fatalf("Timed out waiting for new CRL rebuild on path %s", crlPath)
-	}
-	return newCrl.TBSCertList
-}
-
-// waitForUpdatedCrlUntil is a helper method that will wait for a CRL to be updated up until maxWait duration
-// or give up and return the last CRL it loaded. It will not fail, if it does not see a new CRL within the
-// max duration unlike waitForUpdatedCrl. Returns the last loaded CRL at the provided path and a boolean
-// indicating if we hit maxWait duration or not.
-func waitForUpdatedCrlUntil(t *testing.T, client *api.Client, crlPath string, lastSeenCrlNumber int, maxWait time.Duration) (*pkix.CertificateList, bool) {
-	t.Helper()
-
-	crl := getParsedCrlAtPath(t, client, crlPath)
-	initialCrlRevision := getCRLNumber(t, crl.TBSCertList)
-	newCrlRevision := initialCrlRevision
-
-	// Short circuit the fetches if we have a version of the CRL we want
-	if lastSeenCrlNumber > 0 && getCRLNumber(t, crl.TBSCertList) > lastSeenCrlNumber {
-		return crl, false
-	}
-
-	start := time.Now()
-	iteration := 0
-	for {
-		iteration++
-
-		if time.Since(start) > maxWait {
-			t.Logf("Timed out waiting for new CRL on path %s after iteration %d, delay: %v",
-				crlPath, iteration, time.Now().Sub(start))
-			return crl, true
-		}
-
-		crl = getParsedCrlAtPath(t, client, crlPath)
-		newCrlRevision = getCRLNumber(t, crl.TBSCertList)
-		if newCrlRevision > initialCrlRevision {
-			t.Logf("Got new revision of CRL %s from %d to %d after iteration %d, delay %v",
-				crlPath, initialCrlRevision, newCrlRevision, iteration, time.Now().Sub(start))
-			return crl, false
-		}
-
-		time.Sleep(100 * time.Millisecond)
-	}
-}
-
-// A quick CRL to string to provide better test error messages
-func summarizeCrl(t *testing.T, crl pkix.TBSCertificateList) string {
-	version := getCRLNumber(t, crl)
-	serials := []string{}
-	for _, cert := range crl.RevokedCertificates {
-		serials = append(serials, normalizeSerialFromBigInt(cert.SerialNumber))
-	}
-	return fmt.Sprintf("CRL Version: %d\n"+
-		"This Update: %s\n"+
-		"Next Update: %s\n"+
-		"Revoked Serial Count: %d\n"+
-		"Revoked Serials: %v", version, crl.ThisUpdate, crl.NextUpdate, len(serials), serials)
+	require.False(t, resp.IsError(), msgAndArgs...)
+	require.Nil(t, resp, msgAndArgs...)
 }
diff --git a/builtin/logical/pki/util.go b/builtin/logical/pki/util.go
index d90e055e6cbcb..7d5a50faddbc6 100644
--- a/builtin/logical/pki/util.go
+++ b/builtin/logical/pki/util.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pki
 
 import (
@@ -11,7 +8,6 @@ import (
 	"net/http"
 	"regexp"
 	"strings"
-	"sync"
 	"time"
 
 	"github.com/hashicorp/vault/sdk/framework"
@@ -46,10 +42,6 @@ func serialFromBigInt(serial *big.Int) string {
 	return strings.TrimSpace(certutil.GetHexFormatted(serial.Bytes(), ":"))
 }
 
-func normalizeSerialFromBigInt(serial *big.Int) string {
-	return strings.TrimSpace(certutil.GetHexFormatted(serial.Bytes(), "-"))
-}
-
 func normalizeSerial(serial string) string {
 	return strings.ReplaceAll(strings.ToLower(serial), ":", "-")
 }
@@ -58,12 +50,6 @@ func denormalizeSerial(serial string) string {
 	return strings.ReplaceAll(strings.ToLower(serial), "-", ":")
 }
 
-func serialToBigInt(serial string) (*big.Int, bool) {
-	norm := normalizeSerial(serial)
-	hex := strings.ReplaceAll(norm, "-", "")
-	return big.NewInt(0).SetString(hex, 16)
-}
-
 func kmsRequested(input *inputBundle) bool {
 	return kmsRequestedFromFieldData(input.apiData)
 }
@@ -266,7 +252,7 @@ func parseIfNotModifiedSince(req *logical.Request) (time.Time, error) {
 
 	headerTimeValue, err := time.Parse(time.RFC1123, headerValue[0])
 	if err != nil {
-		return headerTimeValue, fmt.Errorf("failed to parse given value for '%s' header: %w", headerIfModifiedSince, err)
+		return headerTimeValue, fmt.Errorf("failed to parse given value for '%s' header: %v", headerIfModifiedSince, err)
 	}
 
 	return headerTimeValue, nil
@@ -275,12 +261,10 @@ func parseIfNotModifiedSince(req *logical.Request) (time.Time, error) {
 type ifModifiedReqType int
 
 const (
-	ifModifiedUnknown         ifModifiedReqType = iota
-	ifModifiedCA                                = iota
-	ifModifiedCRL                               = iota
-	ifModifiedDeltaCRL                          = iota
-	ifModifiedUnifiedCRL                        = iota
-	ifModifiedUnifiedDeltaCRL                   = iota
+	ifModifiedUnknown  ifModifiedReqType = iota
+	ifModifiedCA                         = iota
+	ifModifiedCRL                        = iota
+	ifModifiedDeltaCRL                   = iota
 )
 
 type IfModifiedSinceHelper struct {
@@ -345,26 +329,6 @@ func (sc *storageContext) isIfModifiedSinceBeforeLastModified(helper *IfModified
 		if helper.reqType == ifModifiedDeltaCRL {
 			lastModified = crlConfig.DeltaLastModified
 		}
-	case ifModifiedUnifiedCRL, ifModifiedUnifiedDeltaCRL:
-		if sc.Backend.crlBuilder.invalidate.Load() {
-			// When we see the CRL is invalidated, respond with false
-			// regardless of what the local CRL state says. We've likely
-			// renamed some issuers or are about to rebuild a new CRL....
-			//
-			// We do this earlier, ahead of config load, as it saves us a
-			// potential error condition.
-			return false, nil
-		}
-
-		crlConfig, err := sc.getUnifiedCRLConfig()
-		if err != nil {
-			return false, err
-		}
-
-		lastModified = crlConfig.LastModified
-		if helper.reqType == ifModifiedUnifiedDeltaCRL {
-			lastModified = crlConfig.DeltaLastModified
-		}
 	case ifModifiedCA:
 		issuerId, err := sc.resolveIssuerReference(string(helper.issuerRef))
 		if err != nil {
@@ -395,109 +359,3 @@ func addWarnings(resp *logical.Response, warnings []string) *logical.Response {
 	}
 	return resp
 }
-
-// revocationQueue is a type for allowing invalidateFunc to continue operating
-// quickly, while letting periodicFunc slowly sort through all open
-// revocations to process. In particular, we do not wish to be holding this
-// lock while periodicFunc is running, so iteration returns a full copy of
-// the data in this queue. We use a map from serial->[]clusterId, allowing us
-// to quickly insert and remove items, without using a slice of tuples. One
-// serial might be present on two clusters, if two clusters both have the cert
-// stored locally (e.g., via BYOC), which would result in two confirmation
-// entries and thus dictating the need for []clusterId. This also lets us
-// avoid having duplicate entries.
-type revocationQueue struct {
-	_l    sync.Mutex
-	queue map[string][]string
-}
-
-func newRevocationQueue() *revocationQueue {
-	return &revocationQueue{
-		queue: make(map[string][]string),
-	}
-}
-
-func (q *revocationQueue) Add(items ...*revocationQueueEntry) {
-	q._l.Lock()
-	defer q._l.Unlock()
-
-	for _, item := range items {
-		var found bool
-		for _, cluster := range q.queue[item.Serial] {
-			if cluster == item.Cluster {
-				found = true
-				break
-			}
-		}
-
-		if !found {
-			q.queue[item.Serial] = append(q.queue[item.Serial], item.Cluster)
-		}
-	}
-}
-
-func (q *revocationQueue) Remove(item *revocationQueueEntry) {
-	q._l.Lock()
-	defer q._l.Unlock()
-
-	clusters, present := q.queue[item.Serial]
-	if !present {
-		return
-	}
-
-	if len(clusters) == 0 || (len(clusters) == 1 && clusters[0] == item.Cluster) {
-		delete(q.queue, item.Serial)
-		return
-	}
-
-	result := clusters
-	for index, cluster := range clusters {
-		if cluster == item.Cluster {
-			result = append(clusters[0:index], clusters[index+1:]...)
-			break
-		}
-	}
-
-	q.queue[item.Serial] = result
-}
-
-// As this doesn't depend on any internal state, it should not be called
-// unless it is OK to remove any items added since the last Iterate()
-// function call.
-func (q *revocationQueue) RemoveAll() {
-	q._l.Lock()
-	defer q._l.Unlock()
-
-	q.queue = make(map[string][]string)
-}
-
-func (q *revocationQueue) Iterate() []*revocationQueueEntry {
-	q._l.Lock()
-	defer q._l.Unlock()
-
-	// Heuristic: by storing by serial, occasionally we'll get double entires
-	// if it was already revoked, but otherwise we'll be off by fewer when
-	// building this list.
-	ret := make([]*revocationQueueEntry, 0, len(q.queue))
-
-	for serial, clusters := range q.queue {
-		for _, cluster := range clusters {
-			ret = append(ret, &revocationQueueEntry{
-				Serial:  serial,
-				Cluster: cluster,
-			})
-		}
-	}
-
-	return ret
-}
-
-// sliceToMapKey return a map that who's keys are entries in a map.
-func sliceToMapKey(s []string) map[string]struct{} {
-	var empty struct{}
-	myMap := make(map[string]struct{}, len(s))
-	for _, s := range s {
-		myMap[s] = empty
-	}
-	return myMap
-}
diff --git a/builtin/logical/pkiext/README.md b/builtin/logical/pkiext/README.md
deleted file mode 100644
index 40364e085c594..0000000000000
--- a/builtin/logical/pkiext/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# What is `pkiext`?
-
-`pkiext` exists to split the Docker tests into a separate package from the
-main PKI tests. Because the Docker tests execute in a smaller runner with
-fewer resources, and we were hitting timeouts waiting for the entire PKI
-test suite to run, we need to split the larger non-Docker PKI tests from
-the smaller Docker tests, to ensure the former can execute.
-
-This package should lack any non-test related targets.
diff --git a/builtin/logical/pkiext/nginx_test.go b/builtin/logical/pkiext/nginx_test.go
deleted file mode 100644
index 1532f3e81f6ca..0000000000000
--- a/builtin/logical/pkiext/nginx_test.go
+++ /dev/null
@@ -1,638 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package pkiext
-
-import (
-	"context"
-	"crypto/tls"
-	"crypto/x509"
-	"fmt"
-	"io"
-	"net"
-	"net/http"
-	"strconv"
-	"strings"
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/hashicorp/go-uuid"
-	"github.com/hashicorp/vault/builtin/logical/pki"
-	"github.com/hashicorp/vault/sdk/helper/docker"
-	"github.com/stretchr/testify/require"
-)
-
-var (
-	cwRunner                 *docker.Runner
-	builtNetwork             string
-	buildClientContainerOnce sync.Once
-)
-
-const (
-	protectedFile    = `dadgarcorp-internal-protected`
-	unprotectedFile  = `hello-world`
-	failureIndicator = `THIS-TEST-SHOULD-FAIL`
-	uniqueHostname   = `dadgarcorpvaultpkitestingnginxwgetcurlcontainersexample.com`
-	containerName    = `vault_pki_nginx_integration`
-)
-
-func buildNginxContainer(t *testing.T, root string, crl string, chain string, private string) (func(), string, int, string, string, int) {
-	containerfile := `
-FROM nginx:latest
-
-RUN mkdir /www /etc/nginx/ssl && rm /etc/nginx/conf.d/*.conf
-
-COPY testing.conf /etc/nginx/conf.d/
-COPY root.pem /etc/nginx/ssl/root.pem
-COPY fullchain.pem /etc/nginx/ssl/fullchain.pem
-COPY privkey.pem /etc/nginx/ssl/privkey.pem
-COPY crl.pem /etc/nginx/ssl/crl.pem
-COPY /data /www/data
-`
-
-	siteConfig := `
-server {
-	listen 80;
-	listen [::]:80;
-
-    location / {
-        return 301 $request_uri;
-    }
-}
-
-server {
-    listen 443 ssl;
-    listen [::]:443 ssl;
-
-	ssl_certificate /etc/nginx/ssl/fullchain.pem;
-	ssl_certificate_key /etc/nginx/ssl/privkey.pem;
-
-	ssl_client_certificate /etc/nginx/ssl/root.pem;
-	ssl_crl /etc/nginx/ssl/crl.pem;
-	ssl_verify_client optional;
-
-	# Magic per: https://serverfault.com/questions/891603/nginx-reverse-proxy-with-optional-ssl-client-authentication
-	# Only necessary since we're too lazy to setup two different subdomains.
-	set $ssl_status 'open';
-	if ($request_uri ~ protected) {
-		set $ssl_status 'closed';
-	}
-
-	if ($ssl_client_verify != SUCCESS) {
-		set $ssl_status "$ssl_status-fail";
-	}
-
-	if ($ssl_status = "closed-fail") {
-		return 403;
-	}
-
-	location / {
-		root /www/data;
-    }
-}
-`
-
-	bCtx := docker.NewBuildContext()
-	bCtx["testing.conf"] = docker.PathContentsFromString(siteConfig)
-	bCtx["root.pem"] = docker.PathContentsFromString(root)
-	bCtx["fullchain.pem"] = docker.PathContentsFromString(chain)
-	bCtx["privkey.pem"] = docker.PathContentsFromString(private)
-	bCtx["crl.pem"] = docker.PathContentsFromString(crl)
-	bCtx["/data/index.html"] = docker.PathContentsFromString(unprotectedFile)
-	bCtx["/data/protected.html"] = docker.PathContentsFromString(protectedFile)
-
-	imageName := "vault_pki_nginx_integration"
-	suffix, err := uuid.GenerateUUID()
-	if err != nil {
-		t.Fatalf("error generating unique suffix: %v", err)
-	}
-	imageTag := suffix
-
-	runner, err := docker.NewServiceRunner(docker.RunOptions{
-		ImageRepo:     imageName,
-		ImageTag:      imageTag,
-		ContainerName: containerName,
-		Ports:         []string{"443/tcp"},
-		LogConsumer: func(s string) {
-			if t.Failed() {
-				t.Logf("container logs: %s", s)
-			}
-		},
-	})
-	if err != nil {
-		t.Fatalf("Could not provision docker service runner: %s", err)
-	}
-
-	ctx := context.Background()
-	output, err := runner.BuildImage(ctx, containerfile, bCtx,
-		docker.BuildRemove(true), docker.BuildForceRemove(true),
-		docker.BuildPullParent(true),
-		docker.BuildTags([]string{imageName + ":" + imageTag}))
-	if err != nil {
-		t.Fatalf("Could not build new image: %v", err)
-	}
-
-	t.Logf("Image build output: %v", string(output))
-
-	svc, err := runner.StartService(ctx, func(ctx context.Context, host string, port int) (docker.ServiceConfig, error) {
-		// Nginx loads fast, we're too lazy to validate this properly.
-		time.Sleep(5 * time.Second)
-		return docker.NewServiceHostPort(host, port), nil
-	})
-	if err != nil {
-		t.Fatalf("Could not start nginx container: %v", err)
-	}
-
-	// We also need to find the network address of this node, and return
-	// the non-local address associated with it so that we can spawn the
-	// client command on the correct network/port.
-	networks, err := runner.GetNetworkAndAddresses(svc.Container.ID)
-	if err != nil {
-		t.Fatalf("Could not interrogate container for addresses: %v", err)
-	}
-
-	var networkName string
-	var networkAddr string
-	for name, addr := range networks {
-		if addr == "" {
-			continue
-		}
-
-		networkName = name
-		networkAddr = addr
-		break
-	}
-
-	if networkName == "" || networkAddr == "" {
-		t.Fatalf("failed to get network info for containers: empty network address: %v", networks)
-	}
-
-	pieces := strings.Split(svc.Config.Address(), ":")
-	port, _ := strconv.Atoi(pieces[1])
-	return svc.Cleanup, pieces[0], port, networkName, networkAddr, 443
-}
-
-func buildWgetCurlContainer(t *testing.T, network string) {
-	containerfile := `
-FROM ubuntu:latest
-
-RUN apt update && DEBIAN_FRONTEND="noninteractive" apt install -y curl wget wget2
-`
-
-	bCtx := docker.NewBuildContext()
-
-	imageName := "vault_pki_wget_curl_integration"
-	imageTag := "latest"
-
-	var err error
-	cwRunner, err = docker.NewServiceRunner(docker.RunOptions{
-		ImageRepo:     imageName,
-		ImageTag:      imageTag,
-		ContainerName: "vault_pki_wget_curl",
-		NetworkID:     network,
-		// We want to run sleep in the background so we're not stuck waiting
-		// for the default ubuntu container's shell to prompt for input.
-		Entrypoint: []string{"sleep", "45"},
-		LogConsumer: func(s string) {
-			if t.Failed() {
-				t.Logf("container logs: %s", s)
-			}
-		},
-	})
-	if err != nil {
-		t.Fatalf("Could not provision docker service runner: %s", err)
-	}
-
-	ctx := context.Background()
-	output, err := cwRunner.BuildImage(ctx, containerfile, bCtx,
-		docker.BuildRemove(true), docker.BuildForceRemove(true),
-		docker.BuildPullParent(true),
-		docker.BuildTags([]string{imageName + ":" + imageTag}))
-	if err != nil {
-		t.Fatalf("Could not build new image: %v", err)
-	}
-
-	t.Logf("Image build output: %v", string(output))
-}
-
-func CheckWithClients(t *testing.T, network string, address string, url string, rootCert string, certificate string, privatekey string) {
-	// We assume the network doesn't change once assigned.
-	buildClientContainerOnce.Do(func() {
-		buildWgetCurlContainer(t, network)
-		builtNetwork = network
-	})
-
-	if builtNetwork != network {
-		t.Fatalf("failed assumption check: different built network (%v) vs run network (%v); must've changed while running tests", builtNetwork, network)
-	}
-
-	// Start our service with a random name to not conflict with other
-	// threads.
-	ctx := context.Background()
-	result, err := cwRunner.Start(ctx, true, false)
-	if err != nil {
-		t.Fatalf("Could not start golang container for wget/curl checks: %s", err)
-	}
-
-	// Commands to run after potentially writing the certificate. We
-	// might augment these if the certificate exists.
-	//
-	// We manually add the expected hostname to the local hosts file
-	// to avoid resolving it over the network and instead resolving it
-	// to this other container we just started (potentially in parallel
-	// with other containers).
-	hostPrimeCmd := []string{"sh", "-c", "echo '" + address + "	" + uniqueHostname + "' >> /etc/hosts"}
-	wgetCmd := []string{"wget", "--verbose", "--ca-certificate=/root.pem", url}
-	curlCmd := []string{"curl", "--verbose", "--cacert", "/root.pem", url}
-
-	certCtx := docker.NewBuildContext()
-	certCtx["root.pem"] = docker.PathContentsFromString(rootCert)
-	if certificate != "" {
-		// Copy the cert into the newly running container.
-		certCtx["client-cert.pem"] = docker.PathContentsFromString(certificate)
-		certCtx["client-privkey.pem"] = docker.PathContentsFromString(privatekey)
-
-		wgetCmd = []string{"wget", "--verbose", "--ca-certificate=/root.pem", "--certificate=/client-cert.pem", "--private-key=/client-privkey.pem", url}
-		curlCmd = []string{"curl", "--verbose", "--cacert", "/root.pem", "--cert", "/client-cert.pem", "--key", "/client-privkey.pem", url}
-	}
-	if err := cwRunner.CopyTo(result.Container.ID, "/", certCtx); err != nil {
-		t.Fatalf("Could not copy certificate and key into container: %v", err)
-	}
-
-	for _, cmd := range [][]string{hostPrimeCmd, wgetCmd, curlCmd} {
-		t.Logf("Running client connection command: %v", cmd)
-
-		stdout, stderr, retcode, err := cwRunner.RunCmdWithOutput(ctx, result.Container.ID, cmd)
-		if err != nil {
-			t.Fatalf("Could not run command (%v) in container: %v", cmd, err)
-		}
-
-		if len(stderr) != 0 {
-			t.Logf("Got stderr from command (%v):\n%v\n", cmd, string(stderr))
-		}
-
-		if retcode != 0 {
-			t.Logf("Got stdout from command (%v):\n%v\n", cmd, string(stdout))
-			t.Fatalf("Got unexpected non-zero retcode from command (%v): %v\n", cmd, retcode)
-		}
-	}
-}
-
-func CheckDeltaCRL(t *testing.T, network string, address string, url string, rootCert string, crls string) {
-	// We assume the network doesn't change once assigned.
-	buildClientContainerOnce.Do(func() {
-		buildWgetCurlContainer(t, network)
-		builtNetwork = network
-	})
-
-	if builtNetwork != network {
-		t.Fatalf("failed assumption check: different built network (%v) vs run network (%v); must've changed while running tests", builtNetwork, network)
-	}
-
-	// Start our service with a random name to not conflict with other
-	// threads.
-	ctx := context.Background()
-	result, err := cwRunner.Start(ctx, true, false)
-	if err != nil {
-		t.Fatalf("Could not start golang container for wget2 delta CRL checks: %s", err)
-	}
-
-	// Commands to run after potentially writing the certificate. We
-	// might augment these if the certificate exists.
-	//
-	// We manually add the expected hostname to the local hosts file
-	// to avoid resolving it over the network and instead resolving it
-	// to this other container we just started (potentially in parallel
-	// with other containers).
-	hostPrimeCmd := []string{"sh", "-c", "echo '" + address + "	" + uniqueHostname + "' >> /etc/hosts"}
-	wgetCmd := []string{"wget2", "--verbose", "--ca-certificate=/root.pem", "--crl-file=/crls.pem", url}
-
-	certCtx := docker.NewBuildContext()
-	certCtx["root.pem"] = docker.PathContentsFromString(rootCert)
-	certCtx["crls.pem"] = docker.PathContentsFromString(crls)
-	if err := cwRunner.CopyTo(result.Container.ID, "/", certCtx); err != nil {
-		t.Fatalf("Could not copy certificate and key into container: %v", err)
-	}
-
-	for index, cmd := range [][]string{hostPrimeCmd, wgetCmd} {
-		t.Logf("Running client connection command: %v", cmd)
-
-		stdout, stderr, retcode, err := cwRunner.RunCmdWithOutput(ctx, result.Container.ID, cmd)
-		if err != nil {
-			t.Fatalf("Could not run command (%v) in container: %v", cmd, err)
-		}
-
-		if len(stderr) != 0 {
-			t.Logf("Got stderr from command (%v):\n%v\n", cmd, string(stderr))
-		}
-
-		if retcode != 0 && index == 0 {
-			t.Logf("Got stdout from command (%v):\n%v\n", cmd, string(stdout))
-			t.Fatalf("Got unexpected non-zero retcode from command (%v): %v\n", cmd, retcode)
-		}
-
-		if retcode == 0 && index == 1 {
-			t.Logf("Got stdout from command (%v):\n%v\n", cmd, string(stdout))
-			t.Fatalf("Got unexpected zero retcode from command; wanted this to fail (%v): %v\n", cmd, retcode)
-		}
-	}
-}
-
-func CheckWithGo(t *testing.T, rootCert string, clientCert string, clientChain []string, clientKey string, host string, port int, networkAddr string, networkPort int, url string, expected string, shouldFail bool) {
-	// Ensure we can connect with Go.
-	pool := x509.NewCertPool()
-	pool.AppendCertsFromPEM([]byte(rootCert))
-	tlsConfig := &tls.Config{
-		RootCAs: pool,
-	}
-
-	if clientCert != "" {
-		var clientTLSCert tls.Certificate
-		clientTLSCert.Certificate = append(clientTLSCert.Certificate, parseCert(t, clientCert).Raw)
-		clientTLSCert.PrivateKey = parseKey(t, clientKey)
-		for _, cert := range clientChain {
-			clientTLSCert.Certificate = append(clientTLSCert.Certificate, parseCert(t, cert).Raw)
-		}
-
-		tlsConfig.Certificates = append(tlsConfig.Certificates, clientTLSCert)
-	}
-
-	dialer := &net.Dialer{
-		Timeout:   30 * time.Second,
-		KeepAlive: 30 * time.Second,
-	}
-
-	transport := &http.Transport{
-		TLSClientConfig: tlsConfig,
-		DialContext: func(ctx context.Context, network, addr string) (net.Conn, error) {
-			if addr == host+":"+strconv.Itoa(port) {
-				// If we can't resolve our hostname, try
-				// accessing it via the docker protocol
-				// instead of via the returned service
-				// address.
-				if _, err := net.LookupHost(host); err != nil && strings.Contains(err.Error(), "no such host") {
-					addr = networkAddr + ":" + strconv.Itoa(networkPort)
-				}
-			}
-			return dialer.DialContext(ctx, network, addr)
-		},
-	}
-
-	client := &http.Client{Transport: transport}
-	clientResp, err := client.Get(url)
-	if err != nil {
-		if shouldFail {
-			return
-		}
-
-		t.Fatalf("failed to fetch url (%v): %v", url, err)
-	} else if shouldFail {
-		if clientResp.StatusCode == 200 {
-			t.Fatalf("expected failure to fetch url (%v): got response: %v", url, clientResp)
-		}
-
-		return
-	}
-
-	defer clientResp.Body.Close()
-	body, err := io.ReadAll(clientResp.Body)
-	if err != nil {
-		t.Fatalf("failed to get read response body: %v", err)
-	}
-	if !strings.Contains(string(body), expected) {
-		t.Fatalf("expected body to contain (%v) but was:\n%v", expected, string(body))
-	}
-}
-
-func RunNginxRootTest(t *testing.T, caKeyType string, caKeyBits int, caUsePSS bool, roleKeyType string, roleKeyBits int, roleUsePSS bool) {
-	t.Skipf("flaky in CI")
-
-	b, s := pki.CreateBackendWithStorage(t)
-
-	testSuffix := fmt.Sprintf(" - %v %v %v - %v %v %v", caKeyType, caKeyType, caUsePSS, roleKeyType, roleKeyBits, roleUsePSS)
-
-	// Configure our mount to use auto-rotate, even though we don't have
-	// a periodic func.
-	_, err := pki.CBWrite(b, s, "config/crl", map[string]interface{}{
-		"auto_rebuild": true,
-		"enable_delta": true,
-	})
-
-	// Create a root and intermediate, setting the intermediate as default.
-	resp, err := pki.CBWrite(b, s, "root/generate/internal", map[string]interface{}{
-		"common_name":  "Root X1" + testSuffix,
-		"country":      "US",
-		"organization": "Dadgarcorp",
-		"ou":           "QA",
-		"key_type":     caKeyType,
-		"key_bits":     caKeyBits,
-		"use_pss":      caUsePSS,
-		"issuer_name":  "root",
-	})
-	requireSuccessNonNilResponse(t, resp, err, "failed to create root cert")
-	rootCert := resp.Data["certificate"].(string)
-	resp, err = pki.CBWrite(b, s, "intermediate/generate/internal", map[string]interface{}{
-		"common_name":  "Intermediate I1" + testSuffix,
-		"country":      "US",
-		"organization": "Dadgarcorp",
-		"ou":           "QA",
-		"key_type":     caKeyType,
-		"key_bits":     caKeyBits,
-		"use_pss":      caUsePSS,
-	})
-	requireSuccessNonNilResponse(t, resp, err, "failed to create intermediate csr")
-	resp, err = pki.CBWrite(b, s, "issuer/default/sign-intermediate", map[string]interface{}{
-		"common_name":  "Intermediate I1",
-		"country":      "US",
-		"organization": "Dadgarcorp",
-		"ou":           "QA",
-		"key_type":     caKeyType,
-		"csr":          resp.Data["csr"],
-	})
-	requireSuccessNonNilResponse(t, resp, err, "failed to sign intermediate csr")
-	intCert := resp.Data["certificate"].(string)
-	resp, err = pki.CBWrite(b, s, "issuers/import/bundle", map[string]interface{}{
-		"pem_bundle": intCert,
-	})
-	requireSuccessNonNilResponse(t, resp, err, "failed to sign intermediate csr")
-	_, err = pki.CBWrite(b, s, "config/issuers", map[string]interface{}{
-		"default": resp.Data["imported_issuers"].([]string)[0],
-	})
-
-	// Create a role+certificate valid for localhost only.
-	_, err = pki.CBWrite(b, s, "roles/testing", map[string]interface{}{
-		"allow_any_name": true,
-		"key_type":       roleKeyType,
-		"key_bits":       roleKeyBits,
-		"use_pss":        roleUsePSS,
-		"ttl":            "60m",
-	})
-	require.NoError(t, err)
-	resp, err = pki.CBWrite(b, s, "issue/testing", map[string]interface{}{
-		"common_name": uniqueHostname,
-		"ip_sans":     "127.0.0.1,::1",
-		"sans":        uniqueHostname + ",localhost,localhost4,localhost6,localhost.localdomain",
-	})
-	requireSuccessNonNilResponse(t, resp, err, "failed to create server leaf cert")
-	leafCert := resp.Data["certificate"].(string)
-	leafPrivateKey := resp.Data["private_key"].(string) + "\n"
-	fullChain := leafCert + "\n"
-	for _, cert := range resp.Data["ca_chain"].([]string) {
-		fullChain += cert + "\n"
-	}
-
-	// Issue a client leaf certificate.
-	resp, err = pki.CBWrite(b, s, "issue/testing", map[string]interface{}{
-		"common_name": "testing.client.dadgarcorp.com",
-	})
-	requireSuccessNonNilResponse(t, resp, err, "failed to create client leaf cert")
-	clientCert := resp.Data["certificate"].(string)
-	clientKey := resp.Data["private_key"].(string) + "\n"
-	clientWireChain := clientCert + "\n" + resp.Data["issuing_ca"].(string) + "\n"
-	clientTrustChain := resp.Data["issuing_ca"].(string) + "\n" + rootCert + "\n"
-	clientCAChain := resp.Data["ca_chain"].([]string)
-
-	// Issue a client leaf cert and revoke it, placing it on the main CRL
-	// via rotation.
-	resp, err = pki.CBWrite(b, s, "issue/testing", map[string]interface{}{
-		"common_name": "revoked-crl.client.dadgarcorp.com",
-	})
-	requireSuccessNonNilResponse(t, resp, err, "failed to create revoked client leaf cert")
-	revokedCert := resp.Data["certificate"].(string)
-	revokedKey := resp.Data["private_key"].(string) + "\n"
-	// revokedFullChain := revokedCert + "\n" + resp.Data["issuing_ca"].(string) + "\n"
-	// revokedTrustChain := resp.Data["issuing_ca"].(string) + "\n" + rootCert + "\n"
-	revokedCAChain := resp.Data["ca_chain"].([]string)
-	_, err = pki.CBWrite(b, s, "revoke", map[string]interface{}{
-		"certificate": revokedCert,
-	})
-	require.NoError(t, err)
-	_, err = pki.CBRead(b, s, "crl/rotate")
-	require.NoError(t, err)
-
-	// Issue a client leaf cert and revoke it, placing it on the delta CRL
-	// via rotation.
-	/*resp, err = pki.CBWrite(b, s, "issue/testing", map[string]interface{}{
-	      "common_name": "revoked-delta-crl.client.dadgarcorp.com",
-	  })
-	  requireSuccessNonNilResponse(t, resp, err, "failed to create delta CRL revoked client leaf cert")
-	  deltaCert := resp.Data["certificate"].(string)
-	  deltaKey := resp.Data["private_key"].(string) + "\n"
-	  //deltaFullChain := deltaCert + "\n" + resp.Data["issuing_ca"].(string) + "\n"
-	  //deltaTrustChain := resp.Data["issuing_ca"].(string) + "\n" + rootCert + "\n"
-	  deltaCAChain := resp.Data["ca_chain"].([]string)
-	  _, err = pki.CBWrite(b, s, "revoke", map[string]interface{}{
-	      "certificate": deltaCert,
-	  })
-	  require.NoError(t, err)
-	  _, err = pki.CBRead(b, s, "crl/rotate-delta")
-	  require.NoError(t, err)*/
-
-	// Get the CRL and Delta CRLs.
-	resp, err = pki.CBRead(b, s, "issuer/root/crl")
-	require.NoError(t, err)
-	rootCRL := resp.Data["crl"].(string) + "\n"
-	resp, err = pki.CBRead(b, s, "issuer/default/crl")
-	require.NoError(t, err)
-	intCRL := resp.Data["crl"].(string) + "\n"
-
-	// No need to fetch root Delta CRL as we've not revoked anything on it.
-	resp, err = pki.CBRead(b, s, "issuer/default/crl/delta")
-	require.NoError(t, err)
-	deltaCRL := resp.Data["crl"].(string) + "\n"
-
-	crls := rootCRL + intCRL + deltaCRL
-
-	cleanup, host, port, networkName, networkAddr, networkPort := buildNginxContainer(t, rootCert, crls, fullChain, leafPrivateKey)
-	defer cleanup()
-
-	if host != "127.0.0.1" && host != "::1" && strings.HasPrefix(host, containerName) {
-		t.Logf("Assuming %v:%v is a container name rather than localhost reference.", host, port)
-		host = uniqueHostname
-		port = networkPort
-	}
-
-	localBase := "https://" + host + ":" + strconv.Itoa(port)
-	localURL := localBase + "/index.html"
-	localProtectedURL := localBase + "/protected.html"
-	containerBase := "https://" + uniqueHostname + ":" + strconv.Itoa(networkPort)
-	containerURL := containerBase + "/index.html"
-	containerProtectedURL := containerBase + "/protected.html"
-
-	t.Logf("Spawned nginx container:\nhost: %v\nport: %v\nnetworkName: %v\nnetworkAddr: %v\nnetworkPort: %v\nlocalURL: %v\ncontainerURL: %v\n", host, port, networkName, networkAddr, networkPort, localBase, containerBase)
-
-	// Ensure we can connect with Go. We do our checks for revocation here,
-	// as this behavior is server-controlled and shouldn't matter based on
-	// client type.
-	CheckWithGo(t, rootCert, "", nil, "", host, port, networkAddr, networkPort, localURL, unprotectedFile, false)
-	CheckWithGo(t, rootCert, "", nil, "", host, port, networkAddr, networkPort, localProtectedURL, failureIndicator, true)
-	CheckWithGo(t, rootCert, clientCert, clientCAChain, clientKey, host, port, networkAddr, networkPort, localProtectedURL, protectedFile, false)
-	CheckWithGo(t, rootCert, revokedCert, revokedCAChain, revokedKey, host, port, networkAddr, networkPort, localProtectedURL, protectedFile, true)
-	// CheckWithGo(t, rootCert, deltaCert, deltaCAChain, deltaKey, host, port, networkAddr, networkPort, localProtectedURL, protectedFile, true)
-
-	// Ensure we can connect with wget/curl.
-	CheckWithClients(t, networkName, networkAddr, containerURL, rootCert, "", "")
-	CheckWithClients(t, networkName, networkAddr, containerProtectedURL, clientTrustChain, clientWireChain, clientKey)
-
-	// Ensure OpenSSL will validate the delta CRL by revoking our server leaf
-	// and then using it with wget2. This will land on the intermediate's
-	// Delta CRL.
-	_, err = pki.CBWrite(b, s, "revoke", map[string]interface{}{
-		"certificate": leafCert,
-	})
-	require.NoError(t, err)
-	_, err = pki.CBRead(b, s, "crl/rotate-delta")
-	require.NoError(t, err)
-	resp, err = pki.CBRead(b, s, "issuer/default/crl/delta")
-	require.NoError(t, err)
-	deltaCRL = resp.Data["crl"].(string) + "\n"
-	crls = rootCRL + intCRL + deltaCRL
-
-	CheckDeltaCRL(t, networkName, networkAddr, containerURL, rootCert, crls)
-}
-
-func Test_NginxRSAPure(t *testing.T) {
-	t.Parallel()
-	RunNginxRootTest(t, "rsa", 2048, false, "rsa", 2048, false)
-}
-
-func Test_NginxRSAPurePSS(t *testing.T) {
-	t.Parallel()
-	RunNginxRootTest(t, "rsa", 2048, false, "rsa", 2048, true)
-}
-
-func Test_NginxRSAPSSPure(t *testing.T) {
-	t.Parallel()
-	RunNginxRootTest(t, "rsa", 2048, true, "rsa", 2048, false)
-}
-
-func Test_NginxRSAPSSPurePSS(t *testing.T) {
-	t.Parallel()
-	RunNginxRootTest(t, "rsa", 2048, true, "rsa", 2048, true)
-}
-
-func Test_NginxECDSA256Pure(t *testing.T) {
-	t.Parallel()
-	RunNginxRootTest(t, "ec", 256, false, "ec", 256, false)
-}
-
-func Test_NginxECDSAHybrid(t *testing.T) {
-	t.Parallel()
-	RunNginxRootTest(t, "ec", 256, false, "rsa", 2048, false)
-}
-
-func Test_NginxECDSAHybridPSS(t *testing.T) {
-	t.Parallel()
-	RunNginxRootTest(t, "ec", 256, false, "rsa", 2048, true)
-}
-
-func Test_NginxRSAHybrid(t *testing.T) {
-	t.Parallel()
-	RunNginxRootTest(t, "rsa", 2048, false, "ec", 256, false)
-}
-
-func Test_NginxRSAPSSHybrid(t *testing.T) {
-	t.Parallel()
-	RunNginxRootTest(t, "rsa", 2048, true, "ec", 256, false)
-}
diff --git a/builtin/logical/pkiext/pkiext_binary/acme_test.go b/builtin/logical/pkiext/pkiext_binary/acme_test.go
deleted file mode 100644
index 5cdd146964cfb..0000000000000
--- a/builtin/logical/pkiext/pkiext_binary/acme_test.go
+++ /dev/null
@@ -1,937 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package pkiext_binary
-
-import (
-	"context"
-	"crypto/ecdsa"
-	"crypto/elliptic"
-	"crypto/rand"
-	"crypto/rsa"
-	"crypto/tls"
-	"crypto/x509"
-	"crypto/x509/pkix"
-	"encoding/hex"
-	"errors"
-	"fmt"
-	"net"
-	"net/http"
-	"path"
-	"testing"
-	"time"
-
-	"golang.org/x/crypto/acme"
-
-	"github.com/hashicorp/vault/builtin/logical/pkiext"
-	"github.com/hashicorp/vault/helper/testhelpers"
-	"github.com/hashicorp/vault/sdk/helper/certutil"
-	hDocker "github.com/hashicorp/vault/sdk/helper/docker"
-	"github.com/stretchr/testify/require"
-)
-
-// Test_ACME will start a Vault cluster using the docker based binary, and execute
-// a bunch of sub-tests against that cluster. It is up to each sub-test to run/configure
-// a new pki mount within the cluster to not interfere with each other.
-func Test_ACME(t *testing.T) {
-	cluster := NewVaultPkiClusterWithDNS(t)
-	defer cluster.Cleanup()
-
-	tc := map[string]func(t *testing.T, cluster *VaultPkiCluster){
-		"certbot":           SubtestACMECertbot,
-		"certbot eab":       SubtestACMECertbotEab,
-		"acme ip sans":      SubtestACMEIPAndDNS,
-		"acme wildcard":     SubtestACMEWildcardDNS,
-		"acme prevents ica": SubtestACMEPreventsICADNS,
-	}
-
-	// Wrap the tests within an outer group, so that we run all tests
-	// in parallel, but still wait for all tests to finish before completing
-	// and running the cleanup of the Vault cluster.
-	t.Run("group", func(gt *testing.T) {
-		for testName := range tc {
-			// Trap the function to be embedded later in the run so it
-			// doesn't get clobbered on the next for iteration
-			testFunc := tc[testName]
-
-			gt.Run(testName, func(st *testing.T) {
-				st.Parallel()
-				testFunc(st, cluster)
-			})
-		}
-	})
-
-	// Do not run these tests in parallel.
-	t.Run("step down", func(gt *testing.T) { SubtestACMEStepDownNode(gt, cluster) })
-}
-
-func SubtestACMECertbot(t *testing.T, cluster *VaultPkiCluster) {
-	pki, err := cluster.CreateAcmeMount("pki")
-	require.NoError(t, err, "failed setting up acme mount")
-
-	directory := "https://" + pki.GetActiveContainerIP() + ":8200/v1/pki/acme/directory"
-	vaultNetwork := pki.GetContainerNetworkName()
-
-	logConsumer, logStdout, logStderr := getDockerLog(t)
-
-	// Default to 45 second timeout, but bump to 120 when running locally or if nightly regression
-	// flag is provided.
-	sleepTimer := "45"
-	if testhelpers.IsLocalOrRegressionTests() {
-		sleepTimer = "120"
-	}
-
-	t.Logf("creating on network: %v", vaultNetwork)
-	runner, err := hDocker.NewServiceRunner(hDocker.RunOptions{
-		ImageRepo:     "docker.mirror.hashicorp.services/certbot/certbot",
-		ImageTag:      "latest",
-		ContainerName: "vault_pki_certbot_test",
-		NetworkName:   vaultNetwork,
-		Entrypoint:    []string{"sleep", sleepTimer},
-		LogConsumer:   logConsumer,
-		LogStdout:     logStdout,
-		LogStderr:     logStderr,
-	})
-	require.NoError(t, err, "failed creating service runner")
-
-	ctx := context.Background()
-	result, err := runner.Start(ctx, true, false)
-	require.NoError(t, err, "could not start container")
-	require.NotNil(t, result, "could not start container")
-
-	defer runner.Stop(context.Background(), result.Container.ID)
-
-	networks, err := runner.GetNetworkAndAddresses(result.Container.ID)
-	require.NoError(t, err, "could not read container's IP address")
-	require.Contains(t, networks, vaultNetwork, "expected to contain vault network")
-
-	ipAddr := networks[vaultNetwork]
-	hostname := "certbot-acme-client.dadgarcorp.com"
-
-	err = pki.AddHostname(hostname, ipAddr)
-	require.NoError(t, err, "failed to update vault host files")
-
-	// Sinkhole a domain that's invalid just in case it's registered in the future.
-	cluster.Dns.AddDomain("armoncorp.com")
-	cluster.Dns.AddRecord("armoncorp.com", "A", "127.0.0.1")
-
-	certbotCmd := []string{
-		"certbot",
-		"certonly",
-		"--no-eff-email",
-		"--email", "certbot.client@dadgarcorp.com",
-		"--agree-tos",
-		"--no-verify-ssl",
-		"--standalone",
-		"--non-interactive",
-		"--server", directory,
-		"-d", hostname,
-	}
-	logCatCmd := []string{"cat", "/var/log/letsencrypt/letsencrypt.log"}
-
-	stdout, stderr, retcode, err := runner.RunCmdWithOutput(ctx, result.Container.ID, certbotCmd)
-	t.Logf("Certbot Issue Command: %v\nstdout: %v\nstderr: %v\n", certbotCmd, string(stdout), string(stderr))
-	if err != nil || retcode != 0 {
-		logsStdout, logsStderr, _, _ := runner.RunCmdWithOutput(ctx, result.Container.ID, logCatCmd)
-		t.Logf("Certbot logs\nstdout: %v\nstderr: %v\n", string(logsStdout), string(logsStderr))
-	}
-	require.NoError(t, err, "got error running issue command")
-	require.Equal(t, 0, retcode, "expected zero retcode issue command result")
-
-	// N.B. We're using the `certonly` subcommand here because it seems as though the `renew` command
-	// attempts to install the cert for you. This ends up hanging and getting killed by docker, but is
-	// also not desired behavior. The certbot docs suggest using `certonly` to renew as seen here:
-	// https://eff-certbot.readthedocs.io/en/stable/using.html#renewing-certificates
-	certbotRenewCmd := []string{
-		"certbot",
-		"certonly",
-		"--no-eff-email",
-		"--email", "certbot.client@dadgarcorp.com",
-		"--agree-tos",
-		"--no-verify-ssl",
-		"--standalone",
-		"--non-interactive",
-		"--server", directory,
-		"-d", hostname,
-		"--cert-name", hostname,
-		"--force-renewal",
-	}
-
-	stdout, stderr, retcode, err = runner.RunCmdWithOutput(ctx, result.Container.ID, certbotRenewCmd)
-	t.Logf("Certbot Renew Command: %v\nstdout: %v\nstderr: %v\n", certbotRenewCmd, string(stdout), string(stderr))
-	if err != nil || retcode != 0 {
-		logsStdout, logsStderr, _, _ := runner.RunCmdWithOutput(ctx, result.Container.ID, logCatCmd)
-		t.Logf("Certbot logs\nstdout: %v\nstderr: %v\n", string(logsStdout), string(logsStderr))
-	}
-	require.NoError(t, err, "got error running renew command")
-	require.Equal(t, 0, retcode, "expected zero retcode renew command result")
-
-	certbotRevokeCmd := []string{
-		"certbot",
-		"revoke",
-		"--no-eff-email",
-		"--email", "certbot.client@dadgarcorp.com",
-		"--agree-tos",
-		"--no-verify-ssl",
-		"--non-interactive",
-		"--no-delete-after-revoke",
-		"--cert-name", hostname,
-	}
-
-	stdout, stderr, retcode, err = runner.RunCmdWithOutput(ctx, result.Container.ID, certbotRevokeCmd)
-	t.Logf("Certbot Revoke Command: %v\nstdout: %v\nstderr: %v\n", certbotRevokeCmd, string(stdout), string(stderr))
-	if err != nil || retcode != 0 {
-		logsStdout, logsStderr, _, _ := runner.RunCmdWithOutput(ctx, result.Container.ID, logCatCmd)
-		t.Logf("Certbot logs\nstdout: %v\nstderr: %v\n", string(logsStdout), string(logsStderr))
-	}
-	require.NoError(t, err, "got error running revoke command")
-	require.Equal(t, 0, retcode, "expected zero retcode revoke command result")
-
-	// Revoking twice should fail.
-	stdout, stderr, retcode, err = runner.RunCmdWithOutput(ctx, result.Container.ID, certbotRevokeCmd)
-	t.Logf("Certbot Double Revoke Command: %v\nstdout: %v\nstderr: %v\n", certbotRevokeCmd, string(stdout), string(stderr))
-	if err != nil || retcode == 0 {
-		logsStdout, logsStderr, _, _ := runner.RunCmdWithOutput(ctx, result.Container.ID, logCatCmd)
-		t.Logf("Certbot logs\nstdout: %v\nstderr: %v\n", string(logsStdout), string(logsStderr))
-	}
-
-	require.NoError(t, err, "got error running double revoke command")
-	require.NotEqual(t, 0, retcode, "expected non-zero retcode double revoke command result")
-
-	// Attempt to issue against a domain that doesn't match the challenge.
-	// N.B. This test only runs locally or when the nightly regression env var is provided to CI.
-	if testhelpers.IsLocalOrRegressionTests() {
-		certbotInvalidIssueCmd := []string{
-			"certbot",
-			"certonly",
-			"--no-eff-email",
-			"--email", "certbot.client@dadgarcorp.com",
-			"--agree-tos",
-			"--no-verify-ssl",
-			"--standalone",
-			"--non-interactive",
-			"--server", directory,
-			"-d", "armoncorp.com",
-			"--issuance-timeout", "10",
-		}
-
-		stdout, stderr, retcode, err = runner.RunCmdWithOutput(ctx, result.Container.ID, certbotInvalidIssueCmd)
-		t.Logf("Certbot Invalid Issue Command: %v\nstdout: %v\nstderr: %v\n", certbotInvalidIssueCmd, string(stdout), string(stderr))
-		if err != nil || retcode != 0 {
-			logsStdout, logsStderr, _, _ := runner.RunCmdWithOutput(ctx, result.Container.ID, logCatCmd)
-			t.Logf("Certbot logs\nstdout: %v\nstderr: %v\n", string(logsStdout), string(logsStderr))
-		}
-		require.NoError(t, err, "got error running issue command")
-		require.NotEqual(t, 0, retcode, "expected non-zero retcode issue command result")
-	}
-
-	// Attempt to close out our ACME account
-	certbotUnregisterCmd := []string{
-		"certbot",
-		"unregister",
-		"--no-verify-ssl",
-		"--non-interactive",
-		"--server", directory,
-	}
-
-	stdout, stderr, retcode, err = runner.RunCmdWithOutput(ctx, result.Container.ID, certbotUnregisterCmd)
-	t.Logf("Certbot Unregister Command: %v\nstdout: %v\nstderr: %v\n", certbotUnregisterCmd, string(stdout), string(stderr))
-	if err != nil || retcode != 0 {
-		logsStdout, logsStderr, _, _ := runner.RunCmdWithOutput(ctx, result.Container.ID, logCatCmd)
-		t.Logf("Certbot logs\nstdout: %v\nstderr: %v\n", string(logsStdout), string(logsStderr))
-	}
-	require.NoError(t, err, "got error running unregister command")
-	require.Equal(t, 0, retcode, "expected zero retcode unregister command result")
-
-	// Attempting to close out our ACME account twice should fail
-	stdout, stderr, retcode, err = runner.RunCmdWithOutput(ctx, result.Container.ID, certbotUnregisterCmd)
-	t.Logf("Certbot double Unregister Command: %v\nstdout: %v\nstderr: %v\n", certbotUnregisterCmd, string(stdout), string(stderr))
-	if err != nil || retcode != 0 {
-		logsStdout, logsStderr, _, _ := runner.RunCmdWithOutput(ctx, result.Container.ID, logCatCmd)
-		t.Logf("Certbot double logs\nstdout: %v\nstderr: %v\n", string(logsStdout), string(logsStderr))
-	}
-	require.NoError(t, err, "got error running double unregister command")
-	require.Equal(t, 1, retcode, "expected non-zero retcode double unregister command result")
-}
-
-func SubtestACMECertbotEab(t *testing.T, cluster *VaultPkiCluster) {
-	mountName := "pki-certbot-eab"
-	pki, err := cluster.CreateAcmeMount(mountName)
-	require.NoError(t, err, "failed setting up acme mount")
-
-	err = pki.UpdateAcmeConfig(true, map[string]interface{}{
-		"eab_policy": "new-account-required",
-	})
-	require.NoError(t, err)
-
-	eabId, base64EabKey, err := pki.GetEabKey("acme/")
-
-	directory := "https://" + pki.GetActiveContainerIP() + ":8200/v1/" + mountName + "/acme/directory"
-	vaultNetwork := pki.GetContainerNetworkName()
-
-	logConsumer, logStdout, logStderr := getDockerLog(t)
-
-	t.Logf("creating on network: %v", vaultNetwork)
-	runner, err := hDocker.NewServiceRunner(hDocker.RunOptions{
-		ImageRepo:     "docker.mirror.hashicorp.services/certbot/certbot",
-		ImageTag:      "latest",
-		ContainerName: "vault_pki_certbot_eab_test",
-		NetworkName:   vaultNetwork,
-		Entrypoint:    []string{"sleep", "45"},
-		LogConsumer:   logConsumer,
-		LogStdout:     logStdout,
-		LogStderr:     logStderr,
-	})
-	require.NoError(t, err, "failed creating service runner")
-
-	ctx := context.Background()
-	result, err := runner.Start(ctx, true, false)
-	require.NoError(t, err, "could not start container")
-	require.NotNil(t, result, "could not start container")
-
-	defer runner.Stop(context.Background(), result.Container.ID)
-
-	networks, err := runner.GetNetworkAndAddresses(result.Container.ID)
-	require.NoError(t, err, "could not read container's IP address")
-	require.Contains(t, networks, vaultNetwork, "expected to contain vault network")
-
-	ipAddr := networks[vaultNetwork]
-	hostname := "certbot-eab-acme-client.dadgarcorp.com"
-
-	err = pki.AddHostname(hostname, ipAddr)
-	require.NoError(t, err, "failed to update vault host files")
-
-	certbotCmd := []string{
-		"certbot",
-		"certonly",
-		"--no-eff-email",
-		"--email", "certbot.client@dadgarcorp.com",
-		"--eab-kid", eabId,
-		"--eab-hmac-key='" + base64EabKey + "'",
-		"--agree-tos",
-		"--no-verify-ssl",
-		"--standalone",
-		"--non-interactive",
-		"--server", directory,
-		"-d", hostname,
-	}
-	logCatCmd := []string{"cat", "/var/log/letsencrypt/letsencrypt.log"}
-
-	stdout, stderr, retcode, err := runner.RunCmdWithOutput(ctx, result.Container.ID, certbotCmd)
-	t.Logf("Certbot Issue Command: %v\nstdout: %v\nstderr: %v\n", certbotCmd, string(stdout), string(stderr))
-	if err != nil || retcode != 0 {
-		logsStdout, logsStderr, _, _ := runner.RunCmdWithOutput(ctx, result.Container.ID, logCatCmd)
-		t.Logf("Certbot logs\nstdout: %v\nstderr: %v\n", string(logsStdout), string(logsStderr))
-	}
-	require.NoError(t, err, "got error running issue command")
-	require.Equal(t, 0, retcode, "expected zero retcode issue command result")
-
-	certbotRenewCmd := []string{
-		"certbot",
-		"certonly",
-		"--no-eff-email",
-		"--email", "certbot.client@dadgarcorp.com",
-		"--agree-tos",
-		"--no-verify-ssl",
-		"--standalone",
-		"--non-interactive",
-		"--server", directory,
-		"-d", hostname,
-		"--cert-name", hostname,
-		"--force-renewal",
-	}
-
-	stdout, stderr, retcode, err = runner.RunCmdWithOutput(ctx, result.Container.ID, certbotRenewCmd)
-	t.Logf("Certbot Renew Command: %v\nstdout: %v\nstderr: %v\n", certbotRenewCmd, string(stdout), string(stderr))
-	if err != nil || retcode != 0 {
-		logsStdout, logsStderr, _, _ := runner.RunCmdWithOutput(ctx, result.Container.ID, logCatCmd)
-		t.Logf("Certbot logs\nstdout: %v\nstderr: %v\n", string(logsStdout), string(logsStderr))
-	}
-	require.NoError(t, err, "got error running renew command")
-	require.Equal(t, 0, retcode, "expected zero retcode renew command result")
-
-	certbotRevokeCmd := []string{
-		"certbot",
-		"revoke",
-		"--no-eff-email",
-		"--email", "certbot.client@dadgarcorp.com",
-		"--agree-tos",
-		"--no-verify-ssl",
-		"--non-interactive",
-		"--no-delete-after-revoke",
-		"--cert-name", hostname,
-	}
-
-	stdout, stderr, retcode, err = runner.RunCmdWithOutput(ctx, result.Container.ID, certbotRevokeCmd)
-	t.Logf("Certbot Revoke Command: %v\nstdout: %v\nstderr: %v\n", certbotRevokeCmd, string(stdout), string(stderr))
-	if err != nil || retcode != 0 {
-		logsStdout, logsStderr, _, _ := runner.RunCmdWithOutput(ctx, result.Container.ID, logCatCmd)
-		t.Logf("Certbot logs\nstdout: %v\nstderr: %v\n", string(logsStdout), string(logsStderr))
-	}
-	require.NoError(t, err, "got error running revoke command")
-	require.Equal(t, 0, retcode, "expected zero retcode revoke command result")
-
-	// Revoking twice should fail.
-	stdout, stderr, retcode, err = runner.RunCmdWithOutput(ctx, result.Container.ID, certbotRevokeCmd)
-	t.Logf("Certbot Double Revoke Command: %v\nstdout: %v\nstderr: %v\n", certbotRevokeCmd, string(stdout), string(stderr))
-	if err != nil || retcode == 0 {
-		logsStdout, logsStderr, _, _ := runner.RunCmdWithOutput(ctx, result.Container.ID, logCatCmd)
-		t.Logf("Certbot logs\nstdout: %v\nstderr: %v\n", string(logsStdout), string(logsStderr))
-	}
-
-	require.NoError(t, err, "got error running double revoke command")
-	require.NotEqual(t, 0, retcode, "expected non-zero retcode double revoke command result")
-}
-
-func SubtestACMEIPAndDNS(t *testing.T, cluster *VaultPkiCluster) {
-	pki, err := cluster.CreateAcmeMount("pki-ip-dns-sans")
-	require.NoError(t, err, "failed setting up acme mount")
-
-	// Since we interact with ACME from outside the container network the ACME
-	// configuration needs to be updated to use the host port and not the internal
-	// docker ip.
-	basePath, err := pki.UpdateClusterConfigLocalAddr()
-	require.NoError(t, err, "failed updating cluster config")
-
-	logConsumer, logStdout, logStderr := getDockerLog(t)
-
-	// Setup an nginx container that we can have respond the queries for ips
-	runner, err := hDocker.NewServiceRunner(hDocker.RunOptions{
-		ImageRepo:     "docker.mirror.hashicorp.services/nginx",
-		ImageTag:      "latest",
-		ContainerName: "vault_pki_ipsans_test",
-		NetworkName:   pki.GetContainerNetworkName(),
-		LogConsumer:   logConsumer,
-		LogStdout:     logStdout,
-		LogStderr:     logStderr,
-	})
-	require.NoError(t, err, "failed creating service runner")
-
-	ctx := context.Background()
-	result, err := runner.Start(ctx, true, false)
-	require.NoError(t, err, "could not start container")
-	require.NotNil(t, result, "could not start container")
-
-	nginxContainerId := result.Container.ID
-	defer runner.Stop(context.Background(), nginxContainerId)
-	networks, err := runner.GetNetworkAndAddresses(nginxContainerId)
-
-	challengeFolder := "/usr/share/nginx/html/.well-known/acme-challenge/"
-	createChallengeFolderCmd := []string{
-		"sh", "-c",
-		"mkdir -p '" + challengeFolder + "'",
-	}
-	stdout, stderr, retcode, err := runner.RunCmdWithOutput(ctx, nginxContainerId, createChallengeFolderCmd)
-	require.NoError(t, err, "failed to create folder in nginx container")
-	t.Logf("Update host file command: %v\nstdout: %v\nstderr: %v", createChallengeFolderCmd, string(stdout), string(stderr))
-	require.Equal(t, 0, retcode, "expected zero retcode from mkdir in nginx container")
-
-	ipAddr := networks[pki.GetContainerNetworkName()]
-	hostname := "go-lang-acme-client.dadgarcorp.com"
-
-	err = pki.AddHostname(hostname, ipAddr)
-	require.NoError(t, err, "failed to update vault host files")
-
-	// Perform an ACME lifecycle with an order that contains both an IP and a DNS name identifier
-	err = pki.UpdateRole("ip-dns-sans", map[string]interface{}{
-		"key_type":                    "any",
-		"allowed_domains":             "dadgarcorp.com",
-		"allow_subdomains":            true,
-		"allow_wildcard_certificates": false,
-	})
-	require.NoError(t, err, "failed creating role ip-dns-sans")
-
-	directoryUrl := basePath + "/roles/ip-dns-sans/acme/directory"
-	acmeOrderIdentifiers := []acme.AuthzID{
-		{Type: "ip", Value: ipAddr},
-		{Type: "dns", Value: hostname},
-	}
-	cr := &x509.CertificateRequest{
-		Subject:     pkix.Name{CommonName: hostname},
-		DNSNames:    []string{hostname},
-		IPAddresses: []net.IP{net.ParseIP(ipAddr)},
-	}
-
-	provisioningFunc := func(acmeClient *acme.Client, auths []*acme.Authorization) []*acme.Challenge {
-		// For each http-01 challenge, generate the file to place underneath the nginx challenge folder
-		acmeCtx := hDocker.NewBuildContext()
-		var challengesToAccept []*acme.Challenge
-		for _, auth := range auths {
-			for _, challenge := range auth.Challenges {
-				if challenge.Status != acme.StatusPending {
-					t.Logf("ignoring challenge not in status pending: %v", challenge)
-					continue
-				}
-
-				if challenge.Type == "http-01" {
-					challengeBody, err := acmeClient.HTTP01ChallengeResponse(challenge.Token)
-					require.NoError(t, err, "failed generating challenge response")
-
-					challengePath := acmeClient.HTTP01ChallengePath(challenge.Token)
-					require.NoError(t, err, "failed generating challenge path")
-
-					challengeFile := path.Base(challengePath)
-
-					acmeCtx[challengeFile] = hDocker.PathContentsFromString(challengeBody)
-
-					challengesToAccept = append(challengesToAccept, challenge)
-				}
-			}
-		}
-
-		require.GreaterOrEqual(t, len(challengesToAccept), 1, "Need at least one challenge, got none")
-
-		// Copy all challenges within the nginx container
-		err = runner.CopyTo(nginxContainerId, challengeFolder, acmeCtx)
-		require.NoError(t, err, "failed copying challenges to container")
-
-		return challengesToAccept
-	}
-
-	acmeCert := doAcmeValidationWithGoLibrary(t, directoryUrl, acmeOrderIdentifiers, cr, provisioningFunc, "")
-
-	require.Len(t, acmeCert.IPAddresses, 1, "expected only a single ip address in cert")
-	require.Equal(t, ipAddr, acmeCert.IPAddresses[0].String())
-	require.Equal(t, []string{hostname}, acmeCert.DNSNames)
-	require.Equal(t, hostname, acmeCert.Subject.CommonName)
-
-	// Perform an ACME lifecycle with an order that contains just an IP identifier
-	err = pki.UpdateRole("ip-sans", map[string]interface{}{
-		"key_type":            "any",
-		"use_csr_common_name": false,
-		"require_cn":          false,
-		"client_flag":         false,
-	})
-	require.NoError(t, err, "failed creating role ip-sans")
-
-	directoryUrl = basePath + "/roles/ip-sans/acme/directory"
-	acmeOrderIdentifiers = []acme.AuthzID{
-		{Type: "ip", Value: ipAddr},
-	}
-	cr = &x509.CertificateRequest{
-		IPAddresses: []net.IP{net.ParseIP(ipAddr)},
-	}
-
-	acmeCert = doAcmeValidationWithGoLibrary(t, directoryUrl, acmeOrderIdentifiers, cr, provisioningFunc, "")
-
-	require.Len(t, acmeCert.IPAddresses, 1, "expected only a single ip address in cert")
-	require.Equal(t, ipAddr, acmeCert.IPAddresses[0].String())
-	require.Empty(t, acmeCert.DNSNames, "acme cert dns name field should have been empty")
-	require.Equal(t, "", acmeCert.Subject.CommonName)
-}
-
-type acmeGoValidatorProvisionerFunc func(acmeClient *acme.Client, auths []*acme.Authorization) []*acme.Challenge
-
-func doAcmeValidationWithGoLibrary(t *testing.T, directoryUrl string, acmeOrderIdentifiers []acme.AuthzID, cr *x509.CertificateRequest, provisioningFunc acmeGoValidatorProvisionerFunc, expectedFailure string) *x509.Certificate {
-	// Since we are contacting Vault through the host ip/port, the certificate will not validate properly
-	tr := &http.Transport{
-		TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
-	}
-	httpClient := &http.Client{Transport: tr}
-
-	accountKey, err := rsa.GenerateKey(rand.Reader, 2048)
-	require.NoError(t, err, "failed creating rsa account key")
-
-	t.Logf("Using the following url for the ACME directory: %s", directoryUrl)
-	acmeClient := &acme.Client{
-		Key:          accountKey,
-		HTTPClient:   httpClient,
-		DirectoryURL: directoryUrl,
-	}
-
-	testCtx, cancelFunc := context.WithTimeout(context.Background(), 2*time.Minute)
-	defer cancelFunc()
-
-	// Create new account
-	_, err = acmeClient.Register(testCtx, &acme.Account{Contact: []string{"mailto:ipsans@dadgarcorp.com"}},
-		func(tosURL string) bool { return true })
-	require.NoError(t, err, "failed registering account")
-
-	// Create an ACME order
-	order, err := acmeClient.AuthorizeOrder(testCtx, acmeOrderIdentifiers)
-	require.NoError(t, err, "failed creating ACME order")
-
-	var auths []*acme.Authorization
-	for _, authUrl := range order.AuthzURLs {
-		authorization, err := acmeClient.GetAuthorization(testCtx, authUrl)
-		require.NoError(t, err, "failed to lookup authorization at url: %s", authUrl)
-		auths = append(auths, authorization)
-	}
-
-	// Handle the validation using the external validation mechanism.
-	challengesToAccept := provisioningFunc(acmeClient, auths)
-	require.NotEmpty(t, challengesToAccept, "provisioning function failed to return any challenges to accept")
-
-	// Tell the ACME server, that they can now validate those challenges.
-	for _, challenge := range challengesToAccept {
-		_, err = acmeClient.Accept(testCtx, challenge)
-		require.NoError(t, err, "failed to accept challenge: %v", challenge)
-	}
-
-	// Wait for the order/challenges to be validated.
-	_, err = acmeClient.WaitOrder(testCtx, order.URI)
-	require.NoError(t, err, "failed waiting for order to be ready")
-
-	// Create/sign the CSR and ask ACME server to sign it returning us the final certificate
-	csrKey, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
-	csr, err := x509.CreateCertificateRequest(rand.Reader, cr, csrKey)
-	require.NoError(t, err, "failed generating csr")
-
-	t.Logf("[TEST-LOG] Created CSR: %v", hex.EncodeToString(csr))
-
-	certs, _, err := acmeClient.CreateOrderCert(testCtx, order.FinalizeURL, csr, false)
-	if err != nil {
-		if expectedFailure != "" {
-			require.Contains(t, err.Error(), expectedFailure, "got a unexpected failure not matching expected value")
-			return nil
-		}
-
-		require.NoError(t, err, "failed to get a certificate back from ACME")
-	} else if expectedFailure != "" {
-		t.Fatalf("expected failure containing: %s got none", expectedFailure)
-	}
-
-	acmeCert, err := x509.ParseCertificate(certs[0])
-	require.NoError(t, err, "failed parsing acme cert bytes")
-
-	return acmeCert
-}
-
-func SubtestACMEWildcardDNS(t *testing.T, cluster *VaultPkiCluster) {
-	pki, err := cluster.CreateAcmeMount("pki-dns-wildcards")
-	require.NoError(t, err, "failed setting up acme mount")
-
-	// Since we interact with ACME from outside the container network the ACME
-	// configuration needs to be updated to use the host port and not the internal
-	// docker ip.
-	basePath, err := pki.UpdateClusterConfigLocalAddr()
-	require.NoError(t, err, "failed updating cluster config")
-
-	hostname := "go-lang-wildcard-client.dadgarcorp.com"
-	wildcard := "*." + hostname
-
-	// Do validation without a role first.
-	directoryUrl := basePath + "/acme/directory"
-	acmeOrderIdentifiers := []acme.AuthzID{
-		{Type: "dns", Value: hostname},
-		{Type: "dns", Value: wildcard},
-	}
-	cr := &x509.CertificateRequest{
-		Subject:  pkix.Name{CommonName: wildcard},
-		DNSNames: []string{hostname, wildcard},
-	}
-
-	provisioningFunc := func(acmeClient *acme.Client, auths []*acme.Authorization) []*acme.Challenge {
-		// For each dns-01 challenge, place the record in the associated DNS resolver.
-		var challengesToAccept []*acme.Challenge
-		for _, auth := range auths {
-			for _, challenge := range auth.Challenges {
-				if challenge.Status != acme.StatusPending {
-					t.Logf("ignoring challenge not in status pending: %v", challenge)
-					continue
-				}
-
-				if challenge.Type == "dns-01" {
-					challengeBody, err := acmeClient.DNS01ChallengeRecord(challenge.Token)
-					require.NoError(t, err, "failed generating challenge response")
-
-					err = pki.AddDNSRecord("_acme-challenge."+auth.Identifier.Value, "TXT", challengeBody)
-					require.NoError(t, err, "failed setting DNS record")
-
-					challengesToAccept = append(challengesToAccept, challenge)
-				}
-			}
-		}
-
-		require.GreaterOrEqual(t, len(challengesToAccept), 1, "Need at least one challenge, got none")
-		return challengesToAccept
-	}
-
-	acmeCert := doAcmeValidationWithGoLibrary(t, directoryUrl, acmeOrderIdentifiers, cr, provisioningFunc, "")
-	require.Contains(t, acmeCert.DNSNames, hostname)
-	require.Contains(t, acmeCert.DNSNames, wildcard)
-	require.Equal(t, wildcard, acmeCert.Subject.CommonName)
-	pki.RemoveDNSRecordsForDomain(hostname)
-
-	// Redo validation with a role this time.
-	err = pki.UpdateRole("wildcard", map[string]interface{}{
-		"key_type":                    "any",
-		"allowed_domains":             "go-lang-wildcard-client.dadgarcorp.com",
-		"allow_subdomains":            true,
-		"allow_bare_domains":          true,
-		"allow_wildcard_certificates": true,
-		"client_flag":                 false,
-	})
-	require.NoError(t, err, "failed creating role wildcard")
-	directoryUrl = basePath + "/roles/wildcard/acme/directory"
-
-	acmeCert = doAcmeValidationWithGoLibrary(t, directoryUrl, acmeOrderIdentifiers, cr, provisioningFunc, "")
-	require.Contains(t, acmeCert.DNSNames, hostname)
-	require.Contains(t, acmeCert.DNSNames, wildcard)
-	require.Equal(t, wildcard, acmeCert.Subject.CommonName)
-	pki.RemoveDNSRecordsForDomain(hostname)
-}
-
-func SubtestACMEPreventsICADNS(t *testing.T, cluster *VaultPkiCluster) {
-	pki, err := cluster.CreateAcmeMount("pki-dns-ica")
-	require.NoError(t, err, "failed setting up acme mount")
-
-	// Since we interact with ACME from outside the container network the ACME
-	// configuration needs to be updated to use the host port and not the internal
-	// docker ip.
-	basePath, err := pki.UpdateClusterConfigLocalAddr()
-	require.NoError(t, err, "failed updating cluster config")
-
-	hostname := "go-lang-intermediate-ca-cert.dadgarcorp.com"
-
-	// Do validation without a role first.
-	directoryUrl := basePath + "/acme/directory"
-	acmeOrderIdentifiers := []acme.AuthzID{
-		{Type: "dns", Value: hostname},
-	}
-	cr := &x509.CertificateRequest{
-		Subject:  pkix.Name{CommonName: hostname},
-		DNSNames: []string{hostname},
-		ExtraExtensions: []pkix.Extension{
-			// Basic Constraint with IsCA asserted to true.
-			{
-				Id:       certutil.ExtensionBasicConstraintsOID,
-				Critical: true,
-				Value:    []byte{0x30, 0x03, 0x01, 0x01, 0xFF},
-			},
-		},
-	}
-
-	provisioningFunc := func(acmeClient *acme.Client, auths []*acme.Authorization) []*acme.Challenge {
-		// For each dns-01 challenge, place the record in the associated DNS resolver.
-		var challengesToAccept []*acme.Challenge
-		for _, auth := range auths {
-			for _, challenge := range auth.Challenges {
-				if challenge.Status != acme.StatusPending {
-					t.Logf("ignoring challenge not in status pending: %v", challenge)
-					continue
-				}
-
-				if challenge.Type == "dns-01" {
-					challengeBody, err := acmeClient.DNS01ChallengeRecord(challenge.Token)
-					require.NoError(t, err, "failed generating challenge response")
-
-					err = pki.AddDNSRecord("_acme-challenge."+auth.Identifier.Value, "TXT", challengeBody)
-					require.NoError(t, err, "failed setting DNS record")
-
-					challengesToAccept = append(challengesToAccept, challenge)
-				}
-			}
-		}
-
-		require.GreaterOrEqual(t, len(challengesToAccept), 1, "Need at least one challenge, got none")
-		return challengesToAccept
-	}
-
-	doAcmeValidationWithGoLibrary(t, directoryUrl, acmeOrderIdentifiers, cr, provisioningFunc, "refusing to accept CSR with Basic Constraints extension")
-	pki.RemoveDNSRecordsForDomain(hostname)
-
-	// Redo validation with a role this time.
-	err = pki.UpdateRole("ica", map[string]interface{}{
-		"key_type":                    "any",
-		"allowed_domains":             "go-lang-intermediate-ca-cert.dadgarcorp.com",
-		"allow_subdomains":            true,
-		"allow_bare_domains":          true,
-		"allow_wildcard_certificates": true,
-		"client_flag":                 false,
-	})
-	require.NoError(t, err, "failed creating role wildcard")
-	directoryUrl = basePath + "/roles/ica/acme/directory"
-
-	doAcmeValidationWithGoLibrary(t, directoryUrl, acmeOrderIdentifiers, cr, provisioningFunc, "refusing to accept CSR with Basic Constraints extension")
-	pki.RemoveDNSRecordsForDomain(hostname)
-}
-
-// SubtestACMEStepDownNode Verify that we can properly run an ACME session through a
-// secondary node, and midway through the challenge verification process, seal the
-// active node and make sure we can complete the ACME session on the new active node.
-func SubtestACMEStepDownNode(t *testing.T, cluster *VaultPkiCluster) {
-	pki, err := cluster.CreateAcmeMount("stepdown-test")
-	require.NoError(t, err)
-
-	// Since we interact with ACME from outside the container network the ACME
-	// configuration needs to be updated to use the host port and not the internal
-	// docker ip. We also grab the non-active node here on purpose to verify
-	// ACME related APIs are properly forwarded across standby hosts.
-	nonActiveNodes := pki.GetNonActiveNodes()
-	require.GreaterOrEqual(t, len(nonActiveNodes), 1, "Need at least one non-active node")
-
-	nonActiveNode := nonActiveNodes[0]
-
-	basePath := fmt.Sprintf("https://%s/v1/%s", nonActiveNode.HostPort, pki.mount)
-	err = pki.UpdateClusterConfig(map[string]interface{}{
-		"path": basePath,
-	})
-
-	hostname := "go-lang-stepdown-client.dadgarcorp.com"
-
-	acmeOrderIdentifiers := []acme.AuthzID{
-		{Type: "dns", Value: hostname},
-	}
-	cr := &x509.CertificateRequest{
-		DNSNames: []string{hostname, hostname},
-	}
-
-	accountKey, err := rsa.GenerateKey(rand.Reader, 2048)
-	require.NoError(t, err, "failed creating rsa account key")
-
-	acmeClient := &acme.Client{
-		Key: accountKey,
-		HTTPClient: &http.Client{Transport: &http.Transport{
-			TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
-		}},
-		DirectoryURL: basePath + "/acme/directory",
-	}
-
-	testCtx, cancelFunc := context.WithTimeout(context.Background(), 2*time.Minute)
-	defer cancelFunc()
-
-	// Create new account
-	_, err = acmeClient.Register(testCtx, &acme.Account{Contact: []string{"mailto:ipsans@dadgarcorp.com"}},
-		func(tosURL string) bool { return true })
-	require.NoError(t, err, "failed registering account")
-
-	// Create an ACME order
-	order, err := acmeClient.AuthorizeOrder(testCtx, acmeOrderIdentifiers)
-	require.NoError(t, err, "failed creating ACME order")
-
-	require.Len(t, order.AuthzURLs, 1, "expected a single authz url")
-	authUrl := order.AuthzURLs[0]
-
-	authorization, err := acmeClient.GetAuthorization(testCtx, authUrl)
-	require.NoError(t, err, "failed to lookup authorization at url: %s", authUrl)
-
-	dnsTxtRecordsToAdd := map[string]string{}
-
-	var challengesToAccept []*acme.Challenge
-	for _, challenge := range authorization.Challenges {
-		if challenge.Status != acme.StatusPending {
-			t.Logf("ignoring challenge not in status pending: %v", challenge)
-			continue
-		}
-
-		if challenge.Type == "dns-01" {
-			challengeBody, err := acmeClient.DNS01ChallengeRecord(challenge.Token)
-			require.NoError(t, err, "failed generating challenge response")
-
-			// Collect the challenges for us to add the DNS records after step-down
-			dnsTxtRecordsToAdd["_acme-challenge."+authorization.Identifier.Value] = challengeBody
-			challengesToAccept = append(challengesToAccept, challenge)
-		}
-	}
-
-	// Tell the ACME server, that they can now validate those challenges, this will cause challenge
-	// verification failures on the main node as the DNS records do not exist.
-	for _, challenge := range challengesToAccept {
-		_, err = acmeClient.Accept(testCtx, challenge)
-		require.NoError(t, err, "failed to accept challenge: %v", challenge)
-	}
-
-	// Now wait till we start seeing the challenge engine start failing the lookups.
-	testhelpers.RetryUntil(t, 10*time.Second, func() error {
-		myAuth, err := acmeClient.GetAuthorization(testCtx, authUrl)
-		require.NoError(t, err, "failed to lookup authorization at url: %s", authUrl)
-
-		for _, challenge := range myAuth.Challenges {
-			if challenge.Error != nil {
-				// The engine failed on one of the challenges, we are done waiting
-				return nil
-			}
-		}
-
-		return fmt.Errorf("no challenges for auth %v contained any errors", myAuth.Identifier)
-	})
-
-	// Seal the active node now and wait for the next node to appear
-	previousActiveNode := pki.GetActiveClusterNode()
-	t.Logf("Stepping down node id: %s", previousActiveNode.NodeID)
-
-	haStatus, _ := previousActiveNode.APIClient().Sys().HAStatus()
-	t.Logf("Node: %v HaStatus: %v\n", previousActiveNode.NodeID, haStatus)
-
-	testhelpers.RetryUntil(t, 2*time.Minute, func() error {
-		state, err := previousActiveNode.APIClient().Sys().RaftAutopilotState()
-		if err != nil {
-			return err
-		}
-
-		t.Logf("Node: %v Raft AutoPilotState: %v\n", previousActiveNode.NodeID, state)
-
-		if !state.Healthy {
-			return fmt.Errorf("raft auto pilot state is not healthy")
-		}
-
-		// Make sure that we have at least one node that can take over prior to sealing the current active node.
-		if state.FailureTolerance < 1 {
-			msg := fmt.Sprintf("there is no fault tolerance within raft state yet: %d", state.FailureTolerance)
-			t.Log(msg)
-			return errors.New(msg)
-		}
-
-		return nil
-	})
-
-	t.Logf("Sealing active node")
-	err = previousActiveNode.APIClient().Sys().Seal()
-	require.NoError(t, err, "failed stepping down node")
-
-	// Add our DNS records now
-	t.Logf("Adding DNS records")
-	for dnsHost, dnsValue := range dnsTxtRecordsToAdd {
-		err = pki.AddDNSRecord(dnsHost, "TXT", dnsValue)
-		require.NoError(t, err, "failed adding DNS record: %s:%s", dnsHost, dnsValue)
-	}
-
-	// Wait for our new active node to come up
-	testhelpers.RetryUntil(t, 2*time.Minute, func() error {
-		newNode := pki.GetActiveClusterNode()
-		if newNode.NodeID == previousActiveNode.NodeID {
-			return fmt.Errorf("existing node is still the leader after stepdown: %s", newNode.NodeID)
-		}
-
-		t.Logf("New active node has node id: %v", newNode.NodeID)
-		return nil
-	})
-
-	// Wait for the order/challenges to be validated.
-	_, err = acmeClient.WaitOrder(testCtx, order.URI)
-	if err != nil {
-		// We failed waiting for the order to become ready, lets print out current challenge statuses to help debugging
-		myAuth, authErr := acmeClient.GetAuthorization(testCtx, authUrl)
-		require.NoError(t, authErr, "failed to lookup authorization at url: %s and wait order failed with: %v", authUrl, err)
-
-		t.Logf("Authorization Status: %s", myAuth.Status)
-		for _, challenge := range myAuth.Challenges {
-			// The engine failed on one of the challenges, we are done waiting
-			t.Logf("challenge: %v state: %v Error: %v", challenge.Type, challenge.Status, challenge.Error)
-		}
-
-		require.NoError(t, err, "failed waiting for order to be ready")
-	}
-
-	// Create/sign the CSR and ask ACME server to sign it returning us the final certificate
-	csrKey, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
-	csr, err := x509.CreateCertificateRequest(rand.Reader, cr, csrKey)
-	require.NoError(t, err, "failed generating csr")
-
-	certs, _, err := acmeClient.CreateOrderCert(testCtx, order.FinalizeURL, csr, false)
-	require.NoError(t, err, "failed to get a certificate back from ACME")
-
-	_, err = x509.ParseCertificate(certs[0])
-	require.NoError(t, err, "failed parsing acme cert bytes")
-}
-
-func getDockerLog(t *testing.T) (func(s string), *pkiext.LogConsumerWriter, *pkiext.LogConsumerWriter) {
-	logConsumer := func(s string) {
-		t.Logf(s)
-	}
-
-	logStdout := &pkiext.LogConsumerWriter{logConsumer}
-	logStderr := &pkiext.LogConsumerWriter{logConsumer}
-	return logConsumer, logStdout, logStderr
-}
diff --git a/builtin/logical/pkiext/pkiext_binary/pki_cluster.go b/builtin/logical/pkiext/pkiext_binary/pki_cluster.go
deleted file mode 100644
index da33300934baa..0000000000000
--- a/builtin/logical/pkiext/pkiext_binary/pki_cluster.go
+++ /dev/null
@@ -1,311 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package pkiext_binary
-
-import (
-	"context"
-	"fmt"
-	"os"
-	"testing"
-	"time"
-
-	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/builtin/logical/pki/dnstest"
-	dockhelper "github.com/hashicorp/vault/sdk/helper/docker"
-	"github.com/hashicorp/vault/sdk/helper/testcluster"
-	"github.com/hashicorp/vault/sdk/helper/testcluster/docker"
-)
-
-type VaultPkiCluster struct {
-	cluster *docker.DockerCluster
-	Dns     *dnstest.TestServer
-}
-
-func NewVaultPkiCluster(t *testing.T) *VaultPkiCluster {
-	binary := os.Getenv("VAULT_BINARY")
-	if binary == "" {
-		t.Skip("only running docker test when $VAULT_BINARY present")
-	}
-
-	opts := &docker.DockerClusterOptions{
-		ImageRepo: "docker.mirror.hashicorp.services/hashicorp/vault",
-		// We're replacing the binary anyway, so we're not too particular about
-		// the docker image version tag.
-		ImageTag:    "latest",
-		VaultBinary: binary,
-		ClusterOptions: testcluster.ClusterOptions{
-			VaultNodeConfig: &testcluster.VaultNodeConfig{
-				LogLevel: "TRACE",
-			},
-			NumCores: 3,
-		},
-	}
-
-	cluster := docker.NewTestDockerCluster(t, opts)
-
-	return &VaultPkiCluster{cluster: cluster}
-}
-
-func NewVaultPkiClusterWithDNS(t *testing.T) *VaultPkiCluster {
-	cluster := NewVaultPkiCluster(t)
-	dns := dnstest.SetupResolverOnNetwork(t, "dadgarcorp.com", cluster.GetContainerNetworkName())
-	cluster.Dns = dns
-	return cluster
-}
-
-func (vpc *VaultPkiCluster) Cleanup() {
-	vpc.cluster.Cleanup()
-	if vpc.Dns != nil {
-		vpc.Dns.Cleanup()
-	}
-}
-
-func (vpc *VaultPkiCluster) GetActiveClusterNode() *docker.DockerClusterNode {
-	ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
-	defer cancel()
-
-	node, err := testcluster.WaitForActiveNode(ctx, vpc.cluster)
-	if err != nil {
-		panic(fmt.Sprintf("no cluster node became active in timeout window: %v", err))
-	}
-
-	return vpc.cluster.ClusterNodes[node]
-}
-
-func (vpc *VaultPkiCluster) GetNonActiveNodes() []*docker.DockerClusterNode {
-	nodes := []*docker.DockerClusterNode{}
-	for _, node := range vpc.cluster.ClusterNodes {
-		leader, err := node.APIClient().Sys().Leader()
-		if err != nil {
-			continue
-		}
-
-		if !leader.IsSelf {
-			nodes = append(nodes, node)
-		}
-	}
-
-	return nodes
-}
-
-func (vpc *VaultPkiCluster) GetActiveContainerHostPort() string {
-	return vpc.GetActiveClusterNode().HostPort
-}
-
-func (vpc *VaultPkiCluster) GetContainerNetworkName() string {
-	return vpc.cluster.ClusterNodes[0].ContainerNetworkName
-}
-
-func (vpc *VaultPkiCluster) GetActiveContainerIP() string {
-	return vpc.GetActiveClusterNode().ContainerIPAddress
-}
-
-func (vpc *VaultPkiCluster) GetActiveContainerID() string {
-	return vpc.GetActiveClusterNode().Container.ID
-}
-
-func (vpc *VaultPkiCluster) GetActiveNode() *api.Client {
-	return vpc.GetActiveClusterNode().APIClient()
-}
-
-func (vpc *VaultPkiCluster) AddHostname(hostname, ip string) error {
-	if vpc.Dns != nil {
-		vpc.Dns.AddRecord(hostname, "A", ip)
-		vpc.Dns.PushConfig()
-		return nil
-	} else {
-		return vpc.AddNameToHostFiles(hostname, ip)
-	}
-}
-
-func (vpc *VaultPkiCluster) AddNameToHostFiles(hostname, ip string) error {
-	updateHostsCmd := []string{
-		"sh", "-c",
-		"echo '" + ip + " " + hostname + "' >> /etc/hosts",
-	}
-	for _, node := range vpc.cluster.ClusterNodes {
-		containerID := node.Container.ID
-		_, _, retcode, err := dockhelper.RunCmdWithOutput(vpc.cluster.DockerAPI, context.Background(), containerID, updateHostsCmd)
-		if err != nil {
-			return fmt.Errorf("failed updating container %s host file: %w", containerID, err)
-		}
-
-		if retcode != 0 {
-			return fmt.Errorf("expected zero retcode from updating vault host file in container %s got: %d", containerID, retcode)
-		}
-	}
-
-	return nil
-}
-
-func (vpc *VaultPkiCluster) AddDNSRecord(hostname, recordType, ip string) error {
-	if vpc.Dns == nil {
-		return fmt.Errorf("no DNS server was provisioned on this cluster group; unable to provision custom records")
-	}
-
-	vpc.Dns.AddRecord(hostname, recordType, ip)
-	vpc.Dns.PushConfig()
-	return nil
-}
-
-func (vpc *VaultPkiCluster) RemoveDNSRecord(domain string, record string, value string) error {
-	if vpc.Dns == nil {
-		return fmt.Errorf("no DNS server was provisioned on this cluster group; unable to remove specific record")
-	}
-
-	vpc.Dns.RemoveRecord(domain, record, value)
-	return nil
-}
-
-func (vpc *VaultPkiCluster) RemoveDNSRecordsOfTypeForDomain(domain string, record string) error {
-	if vpc.Dns == nil {
-		return fmt.Errorf("no DNS server was provisioned on this cluster group; unable to remove all records of type")
-	}
-
-	vpc.Dns.RemoveRecordsOfTypeForDomain(domain, record)
-	return nil
-}
-
-func (vpc *VaultPkiCluster) RemoveDNSRecordsForDomain(domain string) error {
-	if vpc.Dns == nil {
-		return fmt.Errorf("no DNS server was provisioned on this cluster group; unable to remove records for domain")
-	}
-
-	vpc.Dns.RemoveRecordsForDomain(domain)
-	return nil
-}
-
-func (vpc *VaultPkiCluster) RemoveAllDNSRecords() error {
-	if vpc.Dns == nil {
-		return fmt.Errorf("no DNS server was provisioned on this cluster group; unable to remove all records")
-	}
-
-	vpc.Dns.RemoveAllRecords()
-	return nil
-}
-
-func (vpc *VaultPkiCluster) CreateMount(name string) (*VaultPkiMount, error) {
-	err := vpc.GetActiveNode().Sys().Mount(name, &api.MountInput{
-		Type: "pki",
-		Config: api.MountConfigInput{
-			DefaultLeaseTTL: "16h",
-			MaxLeaseTTL:     "32h",
-			AllowedResponseHeaders: []string{
-				"Last-Modified", "Replay-Nonce",
-				"Link", "Location",
-			},
-		},
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	return &VaultPkiMount{
-		vpc,
-		name,
-	}, nil
-}
-
-func (vpc *VaultPkiCluster) CreateAcmeMount(mountName string) (*VaultPkiMount, error) {
-	pki, err := vpc.CreateMount(mountName)
-	if err != nil {
-		return nil, fmt.Errorf("failed creating mount %s: %w", mountName, err)
-	}
-
-	err = pki.UpdateClusterConfig(nil)
-	if err != nil {
-		return nil, fmt.Errorf("failed updating cluster config: %w", err)
-	}
-
-	cfg := map[string]interface{}{
-		"eab_policy": "not-required",
-	}
-	if vpc.Dns != nil {
-		cfg["dns_resolver"] = vpc.Dns.GetRemoteAddr()
-	}
-
-	err = pki.UpdateAcmeConfig(true, cfg)
-	if err != nil {
-		return nil, fmt.Errorf("failed updating acme config: %w", err)
-	}
-
-	// Setup root+intermediate CA hierarchy within this mount.
-	resp, err := pki.GenerateRootInternal(map[string]interface{}{
-		"common_name":  "Root X1",
-		"country":      "US",
-		"organization": "Dadgarcorp",
-		"ou":           "QA",
-		"key_type":     "ec",
-		"key_bits":     256,
-		"use_pss":      false,
-		"issuer_name":  "root",
-	})
-	if err != nil {
-		return nil, fmt.Errorf("failed generating root internal: %w", err)
-	}
-	if resp == nil || len(resp.Data) == 0 {
-		return nil, fmt.Errorf("failed generating root internal: nil or empty response but no error")
-	}
-
-	resp, err = pki.GenerateIntermediateInternal(map[string]interface{}{
-		"common_name":  "Intermediate I1",
-		"country":      "US",
-		"organization": "Dadgarcorp",
-		"ou":           "QA",
-		"key_type":     "ec",
-		"key_bits":     256,
-		"use_pss":      false,
-	})
-	if err != nil {
-		return nil, fmt.Errorf("failed generating int csr: %w", err)
-	}
-	if resp == nil || len(resp.Data) == 0 {
-		return nil, fmt.Errorf("failed generating int csr: nil or empty response but no error")
-	}
-
-	resp, err = pki.SignIntermediary("default", resp.Data["csr"], map[string]interface{}{
-		"common_name":  "Intermediate I1",
-		"country":      "US",
-		"organization": "Dadgarcorp",
-		"ou":           "QA",
-		"key_type":     "ec",
-		"csr":          resp.Data["csr"],
-	})
-	if err != nil {
-		return nil, fmt.Errorf("failed signing int csr: %w", err)
-	}
-	if resp == nil || len(resp.Data) == 0 {
-		return nil, fmt.Errorf("failed signing int csr: nil or empty response but no error")
-	}
-	intCert := resp.Data["certificate"].(string)
-
-	resp, err = pki.ImportBundle(intCert, nil)
-	if err != nil {
-		return nil, fmt.Errorf("failed importing signed cert: %w", err)
-	}
-	if resp == nil || len(resp.Data) == 0 {
-		return nil, fmt.Errorf("failed importing signed cert: nil or empty response but no error")
-	}
-
-	err = pki.UpdateDefaultIssuer(resp.Data["imported_issuers"].([]interface{})[0].(string), nil)
-	if err != nil {
-		return nil, fmt.Errorf("failed to set intermediate as default: %w", err)
-	}
-
-	err = pki.UpdateIssuer("default", map[string]interface{}{
-		"leaf_not_after_behavior": "truncate",
-	})
-	if err != nil {
-		return nil, fmt.Errorf("failed to update intermediate ttl behavior: %w", err)
-	}
-
-	err = pki.UpdateIssuer("root", map[string]interface{}{
-		"leaf_not_after_behavior": "truncate",
-	})
-	if err != nil {
-		return nil, fmt.Errorf("failed to update root ttl behavior: %w", err)
-	}
-
-	return pki, nil
-}
diff --git a/builtin/logical/pkiext/pkiext_binary/pki_mount.go b/builtin/logical/pkiext/pkiext_binary/pki_mount.go
deleted file mode 100644
index f949cb6ae56a6..0000000000000
--- a/builtin/logical/pkiext/pkiext_binary/pki_mount.go
+++ /dev/null
@@ -1,150 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package pkiext_binary
-
-import (
-	"context"
-	"encoding/base64"
-	"fmt"
-	"path"
-
-	"github.com/hashicorp/vault/api"
-)
-
-type VaultPkiMount struct {
-	*VaultPkiCluster
-	mount string
-}
-
-func (vpm *VaultPkiMount) UpdateClusterConfig(config map[string]interface{}) error {
-	defaultPath := "https://" + vpm.cluster.ClusterNodes[0].ContainerIPAddress + ":8200/v1/" + vpm.mount
-	defaults := map[string]interface{}{
-		"path":     defaultPath,
-		"aia_path": defaultPath,
-	}
-
-	_, err := vpm.GetActiveNode().Logical().WriteWithContext(context.Background(),
-		vpm.mount+"/config/cluster", mergeWithDefaults(config, defaults))
-	return err
-}
-
-func (vpm *VaultPkiMount) UpdateClusterConfigLocalAddr() (string, error) {
-	basePath := fmt.Sprintf("https://%s/v1/%s", vpm.GetActiveContainerHostPort(), vpm.mount)
-	return basePath, vpm.UpdateClusterConfig(map[string]interface{}{
-		"path": basePath,
-	})
-}
-
-func (vpm *VaultPkiMount) UpdateAcmeConfig(enable bool, config map[string]interface{}) error {
-	defaults := map[string]interface{}{
-		"enabled": enable,
-	}
-
-	_, err := vpm.GetActiveNode().Logical().WriteWithContext(context.Background(),
-		vpm.mount+"/config/acme", mergeWithDefaults(config, defaults))
-	return err
-}
-
-func (vpm *VaultPkiMount) GenerateRootInternal(props map[string]interface{}) (*api.Secret, error) {
-	defaults := map[string]interface{}{
-		"common_name": "root-test.com",
-		"key_type":    "ec",
-		"issuer_name": "root",
-	}
-
-	return vpm.GetActiveNode().Logical().WriteWithContext(context.Background(),
-		vpm.mount+"/root/generate/internal", mergeWithDefaults(props, defaults))
-}
-
-func (vpm *VaultPkiMount) GenerateIntermediateInternal(props map[string]interface{}) (*api.Secret, error) {
-	defaults := map[string]interface{}{
-		"common_name": "intermediary-test.com",
-		"key_type":    "ec",
-		"issuer_name": "intermediary",
-	}
-
-	return vpm.GetActiveNode().Logical().WriteWithContext(context.Background(),
-		vpm.mount+"/intermediate/generate/internal", mergeWithDefaults(props, defaults))
-}
-
-func (vpm *VaultPkiMount) SignIntermediary(signingIssuer string, csr interface{}, props map[string]interface{}) (*api.Secret, error) {
-	defaults := map[string]interface{}{
-		"csr": csr,
-	}
-
-	return vpm.GetActiveNode().Logical().WriteWithContext(context.Background(),
-		vpm.mount+"/issuer/"+signingIssuer+"/sign-intermediate",
-		mergeWithDefaults(props, defaults))
-}
-
-func (vpm *VaultPkiMount) ImportBundle(pemBundle interface{}, props map[string]interface{}) (*api.Secret, error) {
-	defaults := map[string]interface{}{
-		"pem_bundle": pemBundle,
-	}
-
-	return vpm.GetActiveNode().Logical().WriteWithContext(context.Background(),
-		vpm.mount+"/issuers/import/bundle", mergeWithDefaults(props, defaults))
-}
-
-func (vpm *VaultPkiMount) UpdateDefaultIssuer(issuerId string, props map[string]interface{}) error {
-	defaults := map[string]interface{}{
-		"default": issuerId,
-	}
-
-	_, err := vpm.GetActiveNode().Logical().WriteWithContext(context.Background(),
-		vpm.mount+"/config/issuers", mergeWithDefaults(props, defaults))
-
-	return err
-}
-
-func (vpm *VaultPkiMount) UpdateIssuer(issuerRef string, props map[string]interface{}) error {
-	defaults := map[string]interface{}{}
-
-	_, err := vpm.GetActiveNode().Logical().JSONMergePatch(context.Background(),
-		vpm.mount+"/issuer/"+issuerRef, mergeWithDefaults(props, defaults))
-
-	return err
-}
-
-func (vpm *VaultPkiMount) UpdateRole(roleName string, config map[string]interface{}) error {
-	defaults := map[string]interface{}{}
-
-	_, err := vpm.GetActiveNode().Logical().WriteWithContext(context.Background(),
-		vpm.mount+"/roles/"+roleName, mergeWithDefaults(config, defaults))
-
-	return err
-}
-
-func (vpm *VaultPkiMount) GetEabKey(acmeDirectory string) (string, string, error) {
-	eabPath := path.Join(vpm.mount, acmeDirectory, "/new-eab")
-	resp, err := vpm.GetActiveNode().Logical().WriteWithContext(context.Background(), eabPath, map[string]interface{}{})
-	if err != nil {
-		return "", "", fmt.Errorf("failed fetching eab from %s: %w", eabPath, err)
-	}
-	eabId := resp.Data["id"].(string)
-	base64EabKey := resp.Data["key"].(string)
-	// just make sure we get something valid back from the server, we still want to pass back the base64 version
-	// to the caller...
-	_, err = base64.RawURLEncoding.DecodeString(base64EabKey)
-	if err != nil {
-		return "", "", fmt.Errorf("failed decoding key response field: %s: %w", base64EabKey, err)
-	}
-	return eabId, base64EabKey, nil
-}
-
-func mergeWithDefaults(config map[string]interface{}, defaults map[string]interface{}) map[string]interface{} {
-	myConfig := config
-	if myConfig == nil {
-		myConfig = map[string]interface{}{}
-	}
-	for key, value := range defaults {
-		if origVal, exists := config[key]; !exists {
-			myConfig[key] = value
-		} else {
-			myConfig[key] = origVal
-		}
-	}
-
-	return myConfig
-}
diff --git a/builtin/logical/pkiext/test_helpers.go b/builtin/logical/pkiext/test_helpers.go
deleted file mode 100644
index 38bbdfe112b55..0000000000000
--- a/builtin/logical/pkiext/test_helpers.go
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package pkiext
-
-import (
-	"bufio"
-	"bytes"
-	"crypto"
-	"crypto/x509"
-	"encoding/pem"
-	"fmt"
-	"testing"
-
-	"github.com/hashicorp/vault/sdk/helper/certutil"
-	"github.com/hashicorp/vault/sdk/logical"
-
-	"github.com/stretchr/testify/require"
-)
-
-func requireFieldsSetInResp(t *testing.T, resp *logical.Response, fields ...string) {
-	var missingFields []string
-	for _, field := range fields {
-		value, ok := resp.Data[field]
-		if !ok || value == nil {
-			missingFields = append(missingFields, field)
-		}
-	}
-
-	require.Empty(t, missingFields, "The following fields were required but missing from response:\n%v", resp.Data)
-}
-
-func requireSuccessNonNilResponse(t *testing.T, resp *logical.Response, err error, msgAndArgs ...interface{}) {
-	require.NoError(t, err, msgAndArgs...)
-	if resp.IsError() {
-		errContext := fmt.Sprintf("Expected successful response but got error: %v", resp.Error())
-		require.Falsef(t, resp.IsError(), errContext, msgAndArgs...)
-	}
-	require.NotNil(t, resp, msgAndArgs...)
-}
-
-func requireSuccessNilResponse(t *testing.T, resp *logical.Response, err error, msgAndArgs ...interface{}) {
-	require.NoError(t, err, msgAndArgs...)
-	if resp.IsError() {
-		errContext := fmt.Sprintf("Expected successful response but got error: %v", resp.Error())
-		require.Falsef(t, resp.IsError(), errContext, msgAndArgs...)
-	}
-	if resp != nil {
-		msg := fmt.Sprintf("expected nil response but got: %v", resp)
-		require.Nilf(t, resp, msg, msgAndArgs...)
-	}
-}
-
-func parseCert(t *testing.T, pemCert string) *x509.Certificate {
-	block, _ := pem.Decode([]byte(pemCert))
-	require.NotNil(t, block, "failed to decode PEM block")
-
-	cert, err := x509.ParseCertificate(block.Bytes)
-	require.NoError(t, err)
-	return cert
-}
-
-func parseKey(t *testing.T, pemKey string) crypto.Signer {
-	block, _ := pem.Decode([]byte(pemKey))
-	require.NotNil(t, block, "failed to decode PEM block")
-
-	key, _, err := certutil.ParseDERKey(block.Bytes)
-	require.NoError(t, err)
-	return key
-}
-
-type LogConsumerWriter struct {
-	Consumer func(string)
-}
-
-func (l LogConsumerWriter) Write(p []byte) (n int, err error) {
-	// TODO this assumes that we're never passed partial log lines, which
-	// seems a safe assumption for now based on how docker looks to implement
-	// logging, but might change in the future.
-	scanner := bufio.NewScanner(bytes.NewReader(p))
-	scanner.Buffer(make([]byte, 64*1024), bufio.MaxScanTokenSize)
-	for scanner.Scan() {
-		l.Consumer(scanner.Text())
-	}
-	return len(p), nil
-}
diff --git a/builtin/logical/pkiext/zlint_test.go b/builtin/logical/pkiext/zlint_test.go
deleted file mode 100644
index 2f20152605823..0000000000000
--- a/builtin/logical/pkiext/zlint_test.go
+++ /dev/null
@@ -1,192 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package pkiext
-
-import (
-	"context"
-	"encoding/json"
-	"sync"
-	"testing"
-
-	"github.com/hashicorp/vault/builtin/logical/pki"
-	"github.com/hashicorp/vault/sdk/helper/docker"
-	"github.com/stretchr/testify/require"
-)
-
-var (
-	zRunner        *docker.Runner
-	buildZLintOnce sync.Once
-)
-
-func buildZLintContainer(t *testing.T) {
-	containerfile := `
-FROM docker.mirror.hashicorp.services/library/golang:latest
-
-RUN go install github.com/zmap/zlint/v3/cmd/zlint@latest
-`
-
-	bCtx := docker.NewBuildContext()
-
-	imageName := "vault_pki_zlint_validator"
-	imageTag := "latest"
-
-	var err error
-	zRunner, err = docker.NewServiceRunner(docker.RunOptions{
-		ImageRepo:     imageName,
-		ImageTag:      imageTag,
-		ContainerName: "pki_zlint",
-		// We want to run sleep in the background so we're not stuck waiting
-		// for the default golang container's shell to prompt for input.
-		Entrypoint: []string{"sleep", "45"},
-		LogConsumer: func(s string) {
-			if t.Failed() {
-				t.Logf("container logs: %s", s)
-			}
-		},
-	})
-	if err != nil {
-		t.Fatalf("Could not provision docker service runner: %s", err)
-	}
-
-	ctx := context.Background()
-	output, err := zRunner.BuildImage(ctx, containerfile, bCtx,
-		docker.BuildRemove(true), docker.BuildForceRemove(true),
-		docker.BuildPullParent(true),
-		docker.BuildTags([]string{imageName + ":" + imageTag}))
-	if err != nil {
-		t.Fatalf("Could not build new image: %v", err)
-	}
-
-	t.Logf("Image build output: %v", string(output))
-}
-
-func RunZLintContainer(t *testing.T, certificate string) []byte {
-	buildZLintOnce.Do(func() {
-		buildZLintContainer(t)
-	})
-
-	ctx := context.Background()
-	// We don't actually care about the address, we just want to start the
-	// container so we can run commands in it. We'd ideally like to skip this
-	// step and only build a new image, but the zlint output would be
-	// intermingled with container build stages, so its not that useful.
-	result, err := zRunner.Start(ctx, true, false)
-	if err != nil {
-		t.Fatalf("Could not start golang container for zlint: %s", err)
-	}
-
-	// Copy the cert into the newly running container.
-	certCtx := docker.NewBuildContext()
-	certCtx["cert.pem"] = docker.PathContentsFromBytes([]byte(certificate))
-	if err := zRunner.CopyTo(result.Container.ID, "/go/", certCtx); err != nil {
-		t.Fatalf("Could not copy certificate into container: %v", err)
-	}
-
-	// Run the zlint command and save the output.
-	cmd := []string{"/go/bin/zlint", "/go/cert.pem"}
-	stdout, stderr, retcode, err := zRunner.RunCmdWithOutput(ctx, result.Container.ID, cmd)
-	if err != nil {
-		t.Fatalf("Could not run command in container: %v", err)
-	}
-
-	if len(stderr) != 0 {
-		t.Logf("Got stderr from command:\n%v\n", string(stderr))
-	}
-
-	if retcode != 0 {
-		t.Logf("Got stdout from command:\n%v\n", string(stdout))
-		t.Fatalf("Got unexpected non-zero retcode from zlint: %v\n", retcode)
-	}
-
-	// Clean up after ourselves.
-	if err := zRunner.Stop(context.Background(), result.Container.ID); err != nil {
-		t.Fatalf("failed to stop container: %v", err)
-	}
-
-	return stdout
-}
-
-func RunZLintRootTest(t *testing.T, keyType string, keyBits int, usePSS bool, ignored []string) {
-	b, s := pki.CreateBackendWithStorage(t)
-
-	resp, err := pki.CBWrite(b, s, "root/generate/internal", map[string]interface{}{
-		"common_name":  "Root X1",
-		"country":      "US",
-		"organization": "Dadgarcorp",
-		"ou":           "QA",
-		"key_type":     keyType,
-		"key_bits":     keyBits,
-		"use_pss":      usePSS,
-	})
-	require.NoError(t, err)
-	rootCert := resp.Data["certificate"].(string)
-
-	var parsed map[string]interface{}
-	output := RunZLintContainer(t, rootCert)
-
-	if err := json.Unmarshal(output, &parsed); err != nil {
-		t.Fatalf("failed to parse zlint output as JSON: %v\nOutput:\n%v\n\n", err, string(output))
-	}
-
-	for key, rawValue := range parsed {
-		value := rawValue.(map[string]interface{})
-		result, ok := value["result"]
-		if !ok || result == "NA" {
-			continue
-		}
-
-		if result == "error" {
-			skip := false
-			for _, allowedFailures := range ignored {
-				if allowedFailures == key {
-					skip = true
-					break
-				}
-			}
-
-			if !skip {
-				t.Fatalf("got unexpected error from test %v: %v", key, value)
-			}
-		}
-	}
-}
-
-func Test_ZLintRSA2048(t *testing.T) {
-	t.Parallel()
-	RunZLintRootTest(t, "rsa", 2048, false, nil)
-}
-
-func Test_ZLintRSA2048PSS(t *testing.T) {
-	t.Parallel()
-	RunZLintRootTest(t, "rsa", 2048, true, nil)
-}
-
-func Test_ZLintRSA3072(t *testing.T) {
-	t.Parallel()
-	RunZLintRootTest(t, "rsa", 3072, false, nil)
-}
-
-func Test_ZLintRSA3072PSS(t *testing.T) {
-	t.Parallel()
-	RunZLintRootTest(t, "rsa", 3072, true, nil)
-}
-
-func Test_ZLintECDSA256(t *testing.T) {
-	t.Parallel()
-	RunZLintRootTest(t, "ec", 256, false, nil)
-}
-
-func Test_ZLintECDSA384(t *testing.T) {
-	t.Parallel()
-	RunZLintRootTest(t, "ec", 384, false, nil)
-}
-
-func Test_ZLintECDSA521(t *testing.T) {
-	t.Parallel()
-	// Mozilla doesn't allow P-521 ECDSA keys.
-	RunZLintRootTest(t, "ec", 521, false, []string{
-		"e_mp_ecdsa_pub_key_encoding_correct",
-		"e_mp_ecdsa_signature_encoding_correct",
-	})
-}
diff --git a/builtin/logical/postgresql/backend.go b/builtin/logical/postgresql/backend.go
new file mode 100644
index 0000000000000..8763cbda4ef36
--- /dev/null
+++ b/builtin/logical/postgresql/backend.go
@@ -0,0 +1,171 @@
+package postgresql
+
+import (
+	"context"
+	"database/sql"
+	"fmt"
+	"strings"
+	"sync"
+
+	log "github.com/hashicorp/go-hclog"
+	"github.com/hashicorp/vault/sdk/framework"
+	"github.com/hashicorp/vault/sdk/logical"
+)
+
+func Factory(ctx context.Context, conf *logical.BackendConfig) (logical.Backend, error) {
+	b := Backend(conf)
+	if err := b.Setup(ctx, conf); err != nil {
+		return nil, err
+	}
+	return b, nil
+}
+
+func Backend(conf *logical.BackendConfig) *backend {
+	var b backend
+	b.Backend = &framework.Backend{
+		Help: strings.TrimSpace(backendHelp),
+
+		PathsSpecial: &logical.Paths{
+			SealWrapStorage: []string{
+				"config/connection",
+			},
+		},
+
+		Paths: []*framework.Path{
+			pathConfigConnection(&b),
+			pathConfigLease(&b),
+			pathListRoles(&b),
+			pathRoles(&b),
+			pathRoleCreate(&b),
+		},
+
+		Secrets: []*framework.Secret{
+			secretCreds(&b),
+		},
+
+		Clean:       b.ResetDB,
+		Invalidate:  b.invalidate,
+		BackendType: logical.TypeLogical,
+	}
+
+	b.logger = conf.Logger
+	return &b
+}
+
+type backend struct {
+	*framework.Backend
+
+	db   *sql.DB
+	lock sync.Mutex
+
+	logger log.Logger
+}
+
+// DB returns the database connection.
+func (b *backend) DB(ctx context.Context, s logical.Storage) (*sql.DB, error) {
+	b.logger.Debug("postgres/db: enter")
+	defer b.logger.Debug("postgres/db: exit")
+
+	b.lock.Lock()
+	defer b.lock.Unlock()
+
+	// If we already have a DB, we got it!
+	if b.db != nil {
+		if err := b.db.Ping(); err == nil {
+			return b.db, nil
+		}
+		// If the ping was unsuccessful, close it and ignore errors as we'll be
+		// reestablishing anyways
+		b.db.Close()
+	}
+
+	// Otherwise, attempt to make connection
+	entry, err := s.Get(ctx, "config/connection")
+	if err != nil {
+		return nil, err
+	}
+	if entry == nil {
+		return nil,
+			fmt.Errorf("configure the DB connection with config/connection first")
+	}
+
+	var connConfig connectionConfig
+	if err := entry.DecodeJSON(&connConfig); err != nil {
+		return nil, err
+	}
+
+	conn := connConfig.ConnectionURL
+	if len(conn) == 0 {
+		conn = connConfig.ConnectionString
+	}
+
+	// Ensure timezone is set to UTC for all the connections
+	if strings.HasPrefix(conn, "postgres://") || strings.HasPrefix(conn, "postgresql://") {
+		if strings.Contains(conn, "?") {
+			conn += "&timezone=utc"
+		} else {
+			conn += "?timezone=utc"
+		}
+	} else {
+		conn += "&timezone=utc"
+	}
+
+	b.db, err = sql.Open("pgx", conn)
+	if err != nil {
+		return nil, err
+	}
+
+	// Set some connection pool settings. We don't need much of this,
+	// since the request rate shouldn't be high.
+	b.db.SetMaxOpenConns(connConfig.MaxOpenConnections)
+	b.db.SetMaxIdleConns(connConfig.MaxIdleConnections)
+
+	return b.db, nil
+}
+
+// ResetDB forces a connection next time DB() is called.
+func (b *backend) ResetDB(_ context.Context) {
+	b.logger.Debug("postgres/db: enter")
+	defer b.logger.Debug("postgres/db: exit")
+
+	b.lock.Lock()
+	defer b.lock.Unlock()
+
+	if b.db != nil {
+		b.db.Close()
+	}
+
+	b.db = nil
+}
+
+func (b *backend) invalidate(ctx context.Context, key string) {
+	switch key {
+	case "config/connection":
+		b.ResetDB(ctx)
+	}
+}
+
+// Lease returns the lease information
+func (b *backend) Lease(ctx context.Context, s logical.Storage) (*configLease, error) {
+	entry, err := s.Get(ctx, "config/lease")
+	if err != nil {
+		return nil, err
+	}
+	if entry == nil {
+		return nil, nil
+	}
+
+	var result configLease
+	if err := entry.DecodeJSON(&result); err != nil {
+		return nil, err
+	}
+
+	return &result, nil
+}
+
+const backendHelp = `
+The PostgreSQL backend dynamically generates database users.
+
+After mounting this backend, configure it using the endpoints within
+the "config/" path.
+`
diff --git a/builtin/logical/postgresql/backend_test.go b/builtin/logical/postgresql/backend_test.go
new file mode 100644
index 0000000000000..0c1dd46111d09
--- /dev/null
+++ b/builtin/logical/postgresql/backend_test.go
@@ -0,0 +1,532 @@
+package postgresql
+
+import (
+	"context"
+	"database/sql"
+	"encoding/json"
+	"fmt"
+	"log"
+	"path"
+	"reflect"
+	"testing"
+
+	logicaltest "github.com/hashicorp/vault/helper/testhelpers/logical"
+	postgreshelper "github.com/hashicorp/vault/helper/testhelpers/postgresql"
+	"github.com/hashicorp/vault/sdk/logical"
+	"github.com/mitchellh/mapstructure"
+)
+
+func TestBackend_config_connection(t *testing.T) {
+	var resp *logical.Response
+	var err error
+	config := logical.TestBackendConfig()
+	config.StorageView = &logical.InmemStorage{}
+	b, err := Factory(context.Background(), config)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	configData := map[string]interface{}{
+		"connection_url":       "sample_connection_url",
+		"max_open_connections": 9,
+		"max_idle_connections": 7,
+		"verify_connection":    false,
+	}
+
+	configReq := &logical.Request{
+		Operation: logical.UpdateOperation,
+		Path:      "config/connection",
+		Storage:   config.StorageView,
+		Data:      configData,
+	}
+	resp, err = b.HandleRequest(context.Background(), configReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%s resp:%#v\n", err, resp)
+	}
+
+	configReq.Operation = logical.ReadOperation
+	resp, err = b.HandleRequest(context.Background(), configReq)
+	if err != nil || (resp != nil && resp.IsError()) {
+		t.Fatalf("err:%s resp:%#v\n", err, resp)
+	}
+
+	delete(configData, "verify_connection")
+	delete(configData, "connection_url")
+	if !reflect.DeepEqual(configData, resp.Data) {
+		t.Fatalf("bad: expected:%#v\nactual:%#v\n", configData, resp.Data)
+	}
+}
+
+func TestBackend_basic(t *testing.T) {
+	config := logical.TestBackendConfig()
+	config.StorageView = &logical.InmemStorage{}
+	b, err := Factory(context.Background(), config)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	cleanup, connURL := postgreshelper.PrepareTestContainer(t, "")
+	defer cleanup()
+
+	connData := map[string]interface{}{
+		"connection_url": connURL,
+	}
+	logicaltest.Test(t, logicaltest.TestCase{
+		LogicalBackend: b,
+		Steps: []logicaltest.TestStep{
+			testAccStepConfig(t, connData, false),
+			testAccStepCreateRole(t, "web", testRole, false),
+			testAccStepReadCreds(t, b, config.StorageView, "web", connURL),
+		},
+	})
+}
+
+func TestBackend_roleCrud(t *testing.T) {
+	config := logical.TestBackendConfig()
+	config.StorageView = &logical.InmemStorage{}
+	b, err := Factory(context.Background(), config)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	cleanup, connURL := postgreshelper.PrepareTestContainer(t, "")
+	defer cleanup()
+
+	connData := map[string]interface{}{
+		"connection_url": connURL,
+	}
+	logicaltest.Test(t, logicaltest.TestCase{
+		LogicalBackend: b,
+		Steps: []logicaltest.TestStep{
+			testAccStepConfig(t, connData, false),
+			testAccStepCreateRole(t, "web", testRole, false),
+			testAccStepReadRole(t, "web", testRole),
+			testAccStepDeleteRole(t, "web"),
+			testAccStepReadRole(t, "web", ""),
+		},
+	})
+}
+
+func TestBackend_BlockStatements(t *testing.T) {
+	config := logical.TestBackendConfig()
+	config.StorageView = &logical.InmemStorage{}
+	b, err := Factory(context.Background(), config)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	cleanup, connURL := postgreshelper.PrepareTestContainer(t, "")
+	defer cleanup()
+
+	connData := map[string]interface{}{
+		"connection_url": connURL,
+	}
+	jsonBlockStatement, err := json.Marshal(testBlockStatementRoleSlice)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	logicaltest.Test(t, logicaltest.TestCase{
+		LogicalBackend: b,
+		Steps: []logicaltest.TestStep{
+			testAccStepConfig(t, connData, false),
+			// This will also validate the query
+			testAccStepCreateRole(t, "web-block", testBlockStatementRole, true),
+			testAccStepCreateRole(t, "web-block", string(jsonBlockStatement), false),
+		},
+	})
+}
+
+func TestBackend_roleReadOnly(t *testing.T) {
+	config := logical.TestBackendConfig()
+	config.StorageView = &logical.InmemStorage{}
+	b, err := Factory(context.Background(), config)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	cleanup, connURL := postgreshelper.PrepareTestContainer(t, "")
+	defer cleanup()
+
+	connData := map[string]interface{}{
+		"connection_url": connURL,
+	}
+	logicaltest.Test(t, logicaltest.TestCase{
+		LogicalBackend: b,
+		Steps: []logicaltest.TestStep{
+			testAccStepConfig(t, connData, false),
+			testAccStepCreateRole(t, "web", testRole, false),
+			testAccStepCreateRole(t, "web-readonly", testReadOnlyRole, false),
+			testAccStepReadRole(t, "web-readonly", testReadOnlyRole),
+			testAccStepCreateTable(t, b, config.StorageView, "web", connURL),
+			testAccStepReadCreds(t, b, config.StorageView, "web-readonly", connURL),
+			testAccStepDropTable(t, b, config.StorageView, "web", connURL),
+			testAccStepDeleteRole(t, "web-readonly"),
+			testAccStepDeleteRole(t, "web"),
+			testAccStepReadRole(t, "web-readonly", ""),
+		},
+	})
+}
+
+func TestBackend_roleReadOnly_revocationSQL(t *testing.T) {
+	config := logical.TestBackendConfig()
+	config.StorageView = &logical.InmemStorage{}
+	b, err := Factory(context.Background(), config)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	cleanup, connURL := postgreshelper.PrepareTestContainer(t, "")
+	defer cleanup()
+
+	connData := map[string]interface{}{
+		"connection_url": connURL,
+	}
+	logicaltest.Test(t, logicaltest.TestCase{
+		LogicalBackend: b,
+		Steps: []logicaltest.TestStep{
+			testAccStepConfig(t, connData, false),
+			testAccStepCreateRoleWithRevocationSQL(t, "web", testRole, defaultRevocationSQL, false),
+			testAccStepCreateRoleWithRevocationSQL(t, "web-readonly", testReadOnlyRole, defaultRevocationSQL, false),
+			testAccStepReadRole(t, "web-readonly", testReadOnlyRole),
+			testAccStepCreateTable(t, b, config.StorageView, "web", connURL),
+			testAccStepReadCreds(t, b, config.StorageView, "web-readonly", connURL),
+			testAccStepDropTable(t, b, config.StorageView, "web", connURL),
+			testAccStepDeleteRole(t, "web-readonly"),
+			testAccStepDeleteRole(t, "web"),
+			testAccStepReadRole(t, "web-readonly", ""),
+		},
+	})
+}
+
+func testAccStepConfig(t *testing.T, d map[string]interface{}, expectError bool) logicaltest.TestStep {
+	return logicaltest.TestStep{
+		Operation: logical.UpdateOperation,
+		Path:      "config/connection",
+		Data:      d,
+		ErrorOk:   true,
+		Check: func(resp *logical.Response) error {
+			if expectError {
+				if resp.Data == nil {
+					return fmt.Errorf("data is nil")
+				}
+				var e struct {
+					Error string `mapstructure:"error"`
+				}
+				if err := mapstructure.Decode(resp.Data, &e); err != nil {
+					return err
+				}
+				if len(e.Error) == 0 {
+					return fmt.Errorf("expected error, but write succeeded")
+				}
+				return nil
+			} else if resp != nil && resp.IsError() {
+				return fmt.Errorf("got an error response: %v", resp.Error())
+			}
+			return nil
+		},
+	}
+}
+
+func testAccStepCreateRole(t *testing.T, name string, sql string, expectFail bool) logicaltest.TestStep {
+	return logicaltest.TestStep{
+		Operation: logical.UpdateOperation,
+		Path:      path.Join("roles", name),
+		Data: map[string]interface{}{
+			"sql": sql,
+		},
+		ErrorOk: expectFail,
+	}
+}
+
+func testAccStepCreateRoleWithRevocationSQL(t *testing.T, name, sql, revocationSQL string, expectFail bool) logicaltest.TestStep {
+	return logicaltest.TestStep{
+		Operation: logical.UpdateOperation,
+		Path:      path.Join("roles", name),
+		Data: map[string]interface{}{
+			"sql":            sql,
+			"revocation_sql": revocationSQL,
+		},
+		ErrorOk: expectFail,
+	}
+}
+
+func testAccStepDeleteRole(t *testing.T, name string) logicaltest.TestStep {
+	return logicaltest.TestStep{
+		Operation: logical.DeleteOperation,
+		Path:      path.Join("roles", name),
+	}
+}
+
+func testAccStepReadCreds(t *testing.T, b logical.Backend, s logical.Storage, name string, connURL string) logicaltest.TestStep {
+	return logicaltest.TestStep{
+		Operation: logical.ReadOperation,
+		Path:      path.Join("creds", name),
+		Check: func(resp *logical.Response) error {
+			var d struct {
+				Username string `mapstructure:"username"`
+				Password string `mapstructure:"password"`
+			}
+			if err := mapstructure.Decode(resp.Data, &d); err != nil {
+				return err
+			}
+			log.Printf("[TRACE] Generated credentials: %v", d)
+
+			db, err := sql.Open("pgx", connURL+"&timezone=utc")
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			returnedRows := func() int {
+				stmt, err := db.Prepare("SELECT DISTINCT schemaname FROM pg_tables WHERE has_table_privilege($1, 'information_schema.role_column_grants', 'select');")
+				if err != nil {
+					return -1
+				}
+				defer stmt.Close()
+
+				rows, err := stmt.Query(d.Username)
+				if err != nil {
+					return -1
+				}
+				defer rows.Close()
+
+				i := 0
+				for rows.Next() {
+					i++
+				}
+				return i
+			}
+
+			// minNumPermissions is the minimum number of permissions that will always be present.
+			const minNumPermissions = 2
+
+			userRows := returnedRows()
+			if userRows < minNumPermissions {
+				t.Fatalf("did not get expected number of rows, got %d", userRows)
+			}
+
+			resp, err = b.HandleRequest(context.Background(), &logical.Request{
+				Operation: logical.RevokeOperation,
+				Storage:   s,
+				Secret: &logical.Secret{
+					InternalData: map[string]interface{}{
+						"secret_type": "creds",
+						"username":    d.Username,
+						"role":        name,
+					},
+				},
+			})
+			if err != nil {
+				return err
+			}
+			if resp != nil {
+				if resp.IsError() {
+					return fmt.Errorf("error on resp: %#v", *resp)
+				}
+			}
+
+			userRows = returnedRows()
+			// User shouldn't exist so returnedRows() should encounter an error and exit with -1
+			if userRows != -1 {
+				t.Fatalf("did not get expected number of rows, got %d", userRows)
+			}
+
+			return nil
+		},
+	}
+}
+
+func testAccStepCreateTable(t *testing.T, b logical.Backend, s logical.Storage, name string, connURL string) logicaltest.TestStep {
+	return logicaltest.TestStep{
+		Operation: logical.ReadOperation,
+		Path:      path.Join("creds", name),
+		Check: func(resp *logical.Response) error {
+			var d struct {
+				Username string `mapstructure:"username"`
+				Password string `mapstructure:"password"`
+			}
+			if err := mapstructure.Decode(resp.Data, &d); err != nil {
+				return err
+			}
+			log.Printf("[TRACE] Generated credentials: %v", d)
+
+			db, err := sql.Open("pgx", connURL+"&timezone=utc")
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			_, err = db.Exec("CREATE TABLE test (id SERIAL PRIMARY KEY);")
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			resp, err = b.HandleRequest(context.Background(), &logical.Request{
+				Operation: logical.RevokeOperation,
+				Storage:   s,
+				Secret: &logical.Secret{
+					InternalData: map[string]interface{}{
+						"secret_type": "creds",
+						"username":    d.Username,
+					},
+				},
+			})
+			if err != nil {
+				return err
+			}
+			if resp != nil {
+				if resp.IsError() {
+					return fmt.Errorf("error on resp: %#v", *resp)
+				}
+			}
+
+			return nil
+		},
+	}
+}
+
+func testAccStepDropTable(t *testing.T, b logical.Backend, s logical.Storage, name string, connURL string) logicaltest.TestStep {
+	return logicaltest.TestStep{
+		Operation: logical.ReadOperation,
+		Path:      path.Join("creds", name),
+		Check: func(resp *logical.Response) error {
+			var d struct {
+				Username string `mapstructure:"username"`
+				Password string `mapstructure:"password"`
+			}
+			if err := mapstructure.Decode(resp.Data, &d); err != nil {
+				return err
+			}
+			log.Printf("[TRACE] Generated credentials: %v", d)
+
+			db, err := sql.Open("pgx", connURL+"&timezone=utc")
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			_, err = db.Exec("DROP TABLE test;")
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			resp, err = b.HandleRequest(context.Background(), &logical.Request{
+				Operation: logical.RevokeOperation,
+				Storage:   s,
+				Secret: &logical.Secret{
+					InternalData: map[string]interface{}{
+						"secret_type": "creds",
+						"username":    d.Username,
+					},
+				},
+			})
+			if err != nil {
+				return err
+			}
+			if resp != nil {
+				if resp.IsError() {
+					return fmt.Errorf("error on resp: %#v", *resp)
+				}
+			}
+
+			return nil
+		},
+	}
+}
+
+func testAccStepReadRole(t *testing.T, name string, sql string) logicaltest.TestStep {
+	return logicaltest.TestStep{
+		Operation: logical.ReadOperation,
+		Path:      "roles/" + name,
+		Check: func(resp *logical.Response) error {
+			if resp == nil {
+				if sql == "" {
+					return nil
+				}
+
+				return fmt.Errorf("bad: %#v", resp)
+			}
+
+			var d struct {
+				SQL string `mapstructure:"sql"`
+			}
+			if err := mapstructure.Decode(resp.Data, &d); err != nil {
+				return err
+			}
+
+			if d.SQL != sql {
+				return fmt.Errorf("bad: %#v", resp)
+			}
+
+			return nil
+		},
+	}
+}
+
+const testRole = `
+CREATE ROLE "{{name}}" WITH
+  LOGIN
+  PASSWORD '{{password}}'
+  VALID UNTIL '{{expiration}}';
+GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO "{{name}}";
+`
+
+const testReadOnlyRole = `
+CREATE ROLE "{{name}}" WITH
+  LOGIN
+  PASSWORD '{{password}}'
+  VALID UNTIL '{{expiration}}';
+GRANT SELECT ON ALL TABLES IN SCHEMA public TO "{{name}}";
+GRANT SELECT ON ALL SEQUENCES IN SCHEMA public TO "{{name}}";
+`
+
+const testBlockStatementRole = `
+DO $$
+BEGIN
+   IF NOT EXISTS (SELECT * FROM pg_catalog.pg_roles WHERE rolname='foo-role') THEN
+      CREATE ROLE "foo-role";
+      CREATE SCHEMA IF NOT EXISTS foo AUTHORIZATION "foo-role";
+      ALTER ROLE "foo-role" SET search_path = foo;
+      GRANT TEMPORARY ON DATABASE "postgres" TO "foo-role";
+      GRANT ALL PRIVILEGES ON SCHEMA foo TO "foo-role";
+      GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA foo TO "foo-role";
+      GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA foo TO "foo-role";
+      GRANT ALL PRIVILEGES ON ALL FUNCTIONS IN SCHEMA foo TO "foo-role";
+   END IF;
+END
+$$
+
+CREATE ROLE "{{name}}" WITH LOGIN PASSWORD '{{password}}' VALID UNTIL '{{expiration}}';
+GRANT "foo-role" TO "{{name}}";
+ALTER ROLE "{{name}}" SET search_path = foo;
+GRANT CONNECT ON DATABASE "postgres" TO "{{name}}";
+`
+
+var testBlockStatementRoleSlice = []string{
+	`
+DO $$
+BEGIN
+   IF NOT EXISTS (SELECT * FROM pg_catalog.pg_roles WHERE rolname='foo-role') THEN
+      CREATE ROLE "foo-role";
+      CREATE SCHEMA IF NOT EXISTS foo AUTHORIZATION "foo-role";
+      ALTER ROLE "foo-role" SET search_path = foo;
+      GRANT TEMPORARY ON DATABASE "postgres" TO "foo-role";
+      GRANT ALL PRIVILEGES ON SCHEMA foo TO "foo-role";
+      GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA foo TO "foo-role";
+      GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA foo TO "foo-role";
+      GRANT ALL PRIVILEGES ON ALL FUNCTIONS IN SCHEMA foo TO "foo-role";
+   END IF;
+END
+$$
+`,
+	`CREATE ROLE "{{name}}" WITH LOGIN PASSWORD '{{password}}' VALID UNTIL '{{expiration}}';`,
+	`GRANT "foo-role" TO "{{name}}";`,
+	`ALTER ROLE "{{name}}" SET search_path = foo;`,
+	`GRANT CONNECT ON DATABASE "postgres" TO "{{name}}";`,
+}
+
+const defaultRevocationSQL = `
+REVOKE ALL PRIVILEGES ON ALL TABLES IN SCHEMA public FROM {{name}};
+REVOKE ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA public FROM {{name}};
+REVOKE USAGE ON SCHEMA public FROM {{name}};
+
+DROP ROLE IF EXISTS {{name}};
+`
diff --git a/builtin/logical/postgresql/cmd/postgresql/main.go b/builtin/logical/postgresql/cmd/postgresql/main.go
new file mode 100644
index 0000000000000..6610b975769d3
--- /dev/null
+++ b/builtin/logical/postgresql/cmd/postgresql/main.go
@@ -0,0 +1,29 @@
+package main
+
+import (
+	"os"
+
+	hclog "github.com/hashicorp/go-hclog"
+	"github.com/hashicorp/vault/api"
+	"github.com/hashicorp/vault/builtin/logical/postgresql"
+	"github.com/hashicorp/vault/sdk/plugin"
+)
+
+func main() {
+	apiClientMeta := &api.PluginAPIClientMeta{}
+	flags := apiClientMeta.FlagSet()
+	flags.Parse(os.Args[1:])
+
+	tlsConfig := apiClientMeta.GetTLSConfig()
+	tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig)
+
+	if err := plugin.Serve(&plugin.ServeOpts{
+		BackendFactoryFunc: postgresql.Factory,
+		TLSProviderFunc:    tlsProviderFunc,
+	}); err != nil {
+		logger := hclog.New(&hclog.LoggerOptions{})
+
+		logger.Error("plugin shutting down", "error", err)
+		os.Exit(1)
+	}
+}
diff --git a/builtin/logical/postgresql/path_config_connection.go b/builtin/logical/postgresql/path_config_connection.go
new file mode 100644
index 0000000000000..6f7b0f719e340
--- /dev/null
+++ b/builtin/logical/postgresql/path_config_connection.go
@@ -0,0 +1,168 @@
+package postgresql
+
+import (
+	"context"
+	"database/sql"
+	"fmt"
+
+	"github.com/hashicorp/vault/sdk/framework"
+	"github.com/hashicorp/vault/sdk/logical"
+	_ "github.com/jackc/pgx/v4/stdlib"
+)
+
+func pathConfigConnection(b *backend) *framework.Path {
+	return &framework.Path{
+		Pattern: "config/connection",
+		Fields: map[string]*framework.FieldSchema{
+			"connection_url": {
+				Type:        framework.TypeString,
+				Description: "DB connection string",
+			},
+
+			"value": {
+				Type: framework.TypeString,
+				Description: `DB connection string. Use 'connection_url' instead.
+This will be deprecated.`,
+			},
+
+			"verify_connection": {
+				Type:        framework.TypeBool,
+				Default:     true,
+				Description: `If set, connection_url is verified by actually connecting to the database`,
+			},
+
+			"max_open_connections": {
+				Type: framework.TypeInt,
+				Description: `Maximum number of open connections to the database;
+a zero uses the default value of two and a
+negative value means unlimited`,
+			},
+
+			"max_idle_connections": {
+				Type: framework.TypeInt,
+				Description: `Maximum number of idle connections to the database;
+a zero uses the value of max_open_connections
+and a negative value disables idle connections.
+If larger than max_open_connections it will be
+reduced to the same size.`,
+			},
+		},
+
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.UpdateOperation: b.pathConnectionWrite,
+			logical.ReadOperation:   b.pathConnectionRead,
+		},
+
+		HelpSynopsis:    pathConfigConnectionHelpSyn,
+		HelpDescription: pathConfigConnectionHelpDesc,
+	}
+}
+
+// pathConnectionRead reads out the connection configuration
+func (b *backend) pathConnectionRead(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
+	entry, err := req.Storage.Get(ctx, "config/connection")
+	if err != nil {
+		return nil, fmt.Errorf("failed to read connection configuration")
+	}
+	if entry == nil {
+		return nil, nil
+	}
+
+	var config connectionConfig
+	if err := entry.DecodeJSON(&config); err != nil {
+		return nil, err
+	}
+
+	return &logical.Response{
+		Data: map[string]interface{}{
+			"max_open_connections": config.MaxOpenConnections,
+			"max_idle_connections": config.MaxIdleConnections,
+		},
+	}, nil
+}
+
+func (b *backend) pathConnectionWrite(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
+	connValue := data.Get("value").(string)
+	connURL := data.Get("connection_url").(string)
+	if connURL == "" {
+		if connValue == "" {
+			return logical.ErrorResponse("connection_url parameter must be supplied"), nil
+		} else {
+			connURL = connValue
+		}
+	}
+
+	maxOpenConns := data.Get("max_open_connections").(int)
+	if maxOpenConns == 0 {
+		maxOpenConns = 2
+	}
+
+	maxIdleConns := data.Get("max_idle_connections").(int)
+	if maxIdleConns == 0 {
+		maxIdleConns = maxOpenConns
+	}
+	if maxIdleConns > maxOpenConns {
+		maxIdleConns = maxOpenConns
+	}
+
+	// Don't check the connection_url if verification is disabled
+	verifyConnection := data.Get("verify_connection").(bool)
+	if verifyConnection {
+		// Verify the string
+		db, err := sql.Open("pgx", connURL)
+		if err != nil {
+			return logical.ErrorResponse(fmt.Sprintf(
+				"Error validating connection info: %s", err)), nil
+		}
+		defer db.Close()
+		if err := db.Ping(); err != nil {
+			return logical.ErrorResponse(fmt.Sprintf(
+				"Error validating connection info: %s", err)), nil
+		}
+	}
+
+	// Store it
+	entry, err := logical.StorageEntryJSON("config/connection", connectionConfig{
+		ConnectionString:   connValue,
+		ConnectionURL:      connURL,
+		MaxOpenConnections: maxOpenConns,
+		MaxIdleConnections: maxIdleConns,
+	})
+	if err != nil {
+		return nil, err
+	}
+	if err := req.Storage.Put(ctx, entry); err != nil {
+		return nil, err
+	}
+
+	// Reset the DB connection
+	b.ResetDB(ctx)
+
+	resp := &logical.Response{}
+	resp.AddWarning("Read access to this endpoint should be controlled via ACLs as it will return the connection string or URL as it is, including passwords, if any.")
+
+	return resp, nil
+}
+
+type connectionConfig struct {
+	ConnectionURL string `json:"connection_url" structs:"connection_url" mapstructure:"connection_url"`
+	// Deprecate "value" in coming releases
+	ConnectionString   string `json:"value" structs:"value" mapstructure:"value"`
+	MaxOpenConnections int    `json:"max_open_connections" structs:"max_open_connections" mapstructure:"max_open_connections"`
+	MaxIdleConnections int    `json:"max_idle_connections" structs:"max_idle_connections" mapstructure:"max_idle_connections"`
+}
+
+const pathConfigConnectionHelpSyn = `
+Configure the connection string to talk to PostgreSQL.
+`
+
+const pathConfigConnectionHelpDesc = `
+This path configures the connection string used to connect to PostgreSQL.
+The value of the string can be a URL, or a PG style string in the
+format of "user=foo host=bar" etc.
+
+The URL looks like:
+"postgresql://user:pass@host:port/dbname"
+
+When configuring the connection string, the backend will verify its validity.
+`
diff --git a/builtin/logical/postgresql/path_config_lease.go b/builtin/logical/postgresql/path_config_lease.go
new file mode 100644
index 0000000000000..1a86059260226
--- /dev/null
+++ b/builtin/logical/postgresql/path_config_lease.go
@@ -0,0 +1,101 @@
+package postgresql
+
+import (
+	"context"
+	"fmt"
+	"time"
+
+	"github.com/hashicorp/vault/sdk/framework"
+	"github.com/hashicorp/vault/sdk/logical"
+)
+
+func pathConfigLease(b *backend) *framework.Path {
+	return &framework.Path{
+		Pattern: "config/lease",
+		Fields: map[string]*framework.FieldSchema{
+			"lease": {
+				Type:        framework.TypeString,
+				Description: "Default lease for roles.",
+			},
+
+			"lease_max": {
+				Type:        framework.TypeString,
+				Description: "Maximum time a credential is valid for.",
+			},
+		},
+
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.ReadOperation:   b.pathLeaseRead,
+			logical.UpdateOperation: b.pathLeaseWrite,
+		},
+
+		HelpSynopsis:    pathConfigLeaseHelpSyn,
+		HelpDescription: pathConfigLeaseHelpDesc,
+	}
+}
+
+func (b *backend) pathLeaseWrite(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
+	leaseRaw := d.Get("lease").(string)
+	leaseMaxRaw := d.Get("lease_max").(string)
+
+	lease, err := time.ParseDuration(leaseRaw)
+	if err != nil {
+		return logical.ErrorResponse(fmt.Sprintf(
+			"Invalid lease: %s", err)), nil
+	}
+	leaseMax, err := time.ParseDuration(leaseMaxRaw)
+	if err != nil {
+		return logical.ErrorResponse(fmt.Sprintf(
+			"Invalid lease: %s", err)), nil
+	}
+
+	// Store it
+	entry, err := logical.StorageEntryJSON("config/lease", &configLease{
+		Lease:    lease,
+		LeaseMax: leaseMax,
+	})
+	if err != nil {
+		return nil, err
+	}
+	if err := req.Storage.Put(ctx, entry); err != nil {
+		return nil, err
+	}
+
+	return nil, nil
+}
+
+func (b *backend) pathLeaseRead(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
+	lease, err := b.Lease(ctx, req.Storage)
+	if err != nil {
+		return nil, err
+	}
+	if lease == nil {
+		return nil, nil
+	}
+
+	return &logical.Response{
+		Data: map[string]interface{}{
+			"lease":     lease.Lease.String(),
+			"lease_max": lease.LeaseMax.String(),
+		},
+	}, nil
+}
+
+type configLease struct {
+	Lease    time.Duration
+	LeaseMax time.Duration
+}
+
+const pathConfigLeaseHelpSyn = `
+Configure the default lease information for generated credentials.
+`
+
+const pathConfigLeaseHelpDesc = `
+This configures the default lease information used for credentials
+generated by this backend. The lease specifies the duration that a
+credential will be valid for, as well as the maximum session for
+a set of credentials.
+
+The format for the lease is "1h" or integer and then unit. The longest
+unit is hour.
+`
diff --git a/builtin/logical/postgresql/path_role_create.go b/builtin/logical/postgresql/path_role_create.go
new file mode 100644
index 0000000000000..18162db1733a4
--- /dev/null
+++ b/builtin/logical/postgresql/path_role_create.go
@@ -0,0 +1,149 @@
+package postgresql
+
+import (
+	"context"
+	"fmt"
+	"strings"
+	"time"
+
+	"github.com/hashicorp/go-secure-stdlib/strutil"
+	uuid "github.com/hashicorp/go-uuid"
+	"github.com/hashicorp/vault/sdk/framework"
+	"github.com/hashicorp/vault/sdk/helper/dbtxn"
+	"github.com/hashicorp/vault/sdk/logical"
+	_ "github.com/jackc/pgx/v4/stdlib"
+)
+
+func pathRoleCreate(b *backend) *framework.Path {
+	return &framework.Path{
+		Pattern: "creds/" + framework.GenericNameRegex("name"),
+		Fields: map[string]*framework.FieldSchema{
+			"name": {
+				Type:        framework.TypeString,
+				Description: "Name of the role.",
+			},
+		},
+
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.ReadOperation: b.pathRoleCreateRead,
+		},
+
+		HelpSynopsis:    pathRoleCreateReadHelpSyn,
+		HelpDescription: pathRoleCreateReadHelpDesc,
+	}
+}
+
+func (b *backend) pathRoleCreateRead(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
+	name := data.Get("name").(string)
+
+	// Get the role
+	role, err := b.Role(ctx, req.Storage, name)
+	if err != nil {
+		return nil, err
+	}
+	if role == nil {
+		return logical.ErrorResponse(fmt.Sprintf("unknown role: %s", name)), nil
+	}
+
+	// Determine if we have a lease
+	lease, err := b.Lease(ctx, req.Storage)
+	if err != nil {
+		return nil, err
+	}
+	// Unlike some other backends we need a lease here (can't leave as 0 and
+	// let core fill it in) because Postgres also expires users as a safety
+	// measure, so cannot be zero
+	if lease == nil {
+		lease = &configLease{
+			Lease: b.System().DefaultLeaseTTL(),
+		}
+	}
+
+	// Generate the username, password and expiration. PG limits user to 63 characters
+	displayName := req.DisplayName
+	if len(displayName) > 26 {
+		displayName = displayName[:26]
+	}
+	userUUID, err := uuid.GenerateUUID()
+	if err != nil {
+		return nil, err
+	}
+	username := fmt.Sprintf("%s-%s", displayName, userUUID)
+	if len(username) > 63 {
+		username = username[:63]
+	}
+	password, err := uuid.GenerateUUID()
+	if err != nil {
+		return nil, err
+	}
+
+	ttl, _, err := framework.CalculateTTL(b.System(), 0, lease.Lease, 0, lease.LeaseMax, 0, time.Time{})
+	if err != nil {
+		return nil, err
+	}
+	expiration := time.Now().
+		Add(ttl).
+		Format("2006-01-02 15:04:05-0700")
+
+	// Get our handle
+	db, err := b.DB(ctx, req.Storage)
+	if err != nil {
+		return nil, err
+	}
+
+	// Start a transaction
+	tx, err := db.Begin()
+	if err != nil {
+		return nil, err
+	}
+	defer func() {
+		tx.Rollback()
+	}()
+
+	// Execute each query
+	for _, query := range strutil.ParseArbitraryStringSlice(role.SQL, ";") {
+		query = strings.TrimSpace(query)
+		if len(query) == 0 {
+			continue
+		}
+
+		m := map[string]string{
+			"name":       username,
+			"password":   password,
+			"expiration": expiration,
+		}
+
+		if err := dbtxn.ExecuteTxQueryDirect(ctx, tx, m, query); err != nil {
+			return nil, err
+		}
+	}
+
+	// Commit the transaction
+
+	if err := tx.Commit(); err != nil {
+		return nil, err
+	}
+
+	// Return the secret
+
+	resp := b.Secret(SecretCredsType).Response(map[string]interface{}{
+		"username": username,
+		"password": password,
+	}, map[string]interface{}{
+		"username": username,
+		"role":     name,
+	})
+	resp.Secret.TTL = lease.Lease
+	resp.Secret.MaxTTL = lease.LeaseMax
+	return resp, nil
+}
+
+const pathRoleCreateReadHelpSyn = `
+Request database credentials for a certain role.
+`
+
+const pathRoleCreateReadHelpDesc = `
+This path reads database credentials for a certain role. The
+database credentials will be generated on demand and will be automatically
+revoked when the lease is up.
+`
diff --git a/builtin/logical/postgresql/path_roles.go b/builtin/logical/postgresql/path_roles.go
new file mode 100644
index 0000000000000..b1af8328f928d
--- /dev/null
+++ b/builtin/logical/postgresql/path_roles.go
@@ -0,0 +1,197 @@
+package postgresql
+
+import (
+	"context"
+	"fmt"
+	"strings"
+
+	"github.com/hashicorp/go-secure-stdlib/strutil"
+	"github.com/hashicorp/vault/sdk/framework"
+	"github.com/hashicorp/vault/sdk/logical"
+)
+
+func pathListRoles(b *backend) *framework.Path {
+	return &framework.Path{
+		Pattern: "roles/?$",
+
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.ListOperation: b.pathRoleList,
+		},
+
+		HelpSynopsis:    pathRoleHelpSyn,
+		HelpDescription: pathRoleHelpDesc,
+	}
+}
+
+func pathRoles(b *backend) *framework.Path {
+	return &framework.Path{
+		Pattern: "roles/" + framework.GenericNameRegex("name"),
+		Fields: map[string]*framework.FieldSchema{
+			"name": {
+				Type:        framework.TypeString,
+				Description: "Name of the role.",
+			},
+
+			"sql": {
+				Type:        framework.TypeString,
+				Description: "SQL string to create a user. See help for more info.",
+			},
+
+			"revocation_sql": {
+				Type: framework.TypeString,
+				Description: `SQL statements to be executed to revoke a user. Must be a semicolon-separated
+string, a base64-encoded semicolon-separated string, a serialized JSON string
+array, or a base64-encoded serialized JSON string array. The '{{name}}' value
+will be substituted.`,
+			},
+		},
+
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.ReadOperation:   b.pathRoleRead,
+			logical.UpdateOperation: b.pathRoleCreate,
+			logical.DeleteOperation: b.pathRoleDelete,
+		},
+
+		HelpSynopsis:    pathRoleHelpSyn,
+		HelpDescription: pathRoleHelpDesc,
+	}
+}
+
+func (b *backend) Role(ctx context.Context, s logical.Storage, n string) (*roleEntry, error) {
+	entry, err := s.Get(ctx, "role/"+n)
+	if err != nil {
+		return nil, err
+	}
+	if entry == nil {
+		return nil, nil
+	}
+
+	var result roleEntry
+	if err := entry.DecodeJSON(&result); err != nil {
+		return nil, err
+	}
+
+	return &result, nil
+}
+
+func (b *backend) pathRoleDelete(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
+	err := req.Storage.Delete(ctx, "role/"+data.Get("name").(string))
+	if err != nil {
+		return nil, err
+	}
+
+	return nil, nil
+}
+
+func (b *backend) pathRoleRead(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
+	role, err := b.Role(ctx, req.Storage, data.Get("name").(string))
+	if err != nil {
+		return nil, err
+	}
+	if role == nil {
+		return nil, nil
+	}
+
+	return &logical.Response{
+		Data: map[string]interface{}{
+			"sql":            role.SQL,
+			"revocation_sql": role.RevocationSQL,
+		},
+	}, nil
+}
+
+func (b *backend) pathRoleList(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
+	entries, err := req.Storage.List(ctx, "role/")
+	if err != nil {
+		return nil, err
+	}
+
+	return logical.ListResponse(entries), nil
+}
+
+func (b *backend) pathRoleCreate(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
+	name := data.Get("name").(string)
+	sql := data.Get("sql").(string)
+
+	// Get our connection
+	db, err := b.DB(ctx, req.Storage)
+	if err != nil {
+		return nil, err
+	}
+
+	// Test the query by trying to prepare it
+	for _, query := range strutil.ParseArbitraryStringSlice(sql, ";") {
+		query = strings.TrimSpace(query)
+		if len(query) == 0 {
+			continue
+		}
+
+		stmt, err := db.Prepare(Query(query, map[string]string{
+			"name":       "foo",
+			"password":   "bar",
+			"expiration": "",
+		}))
+		if err != nil {
+			return logical.ErrorResponse(fmt.Sprintf(
+				"Error testing query: %s", err)), nil
+		}
+		stmt.Close()
+	}
+
+	// Store it
+	entry, err := logical.StorageEntryJSON("role/"+name, &roleEntry{
+		SQL:           sql,
+		RevocationSQL: data.Get("revocation_sql").(string),
+	})
+	if err != nil {
+		return nil, err
+	}
+	if err := req.Storage.Put(ctx, entry); err != nil {
+		return nil, err
+	}
+
+	return nil, nil
+}
+
+type roleEntry struct {
+	SQL           string `json:"sql" mapstructure:"sql" structs:"sql"`
+	RevocationSQL string `json:"revocation_sql" mapstructure:"revocation_sql" structs:"revocation_sql"`
+}
+
+const pathRoleHelpSyn = `
+Manage the roles that can be created with this backend.
+`
+
+const pathRoleHelpDesc = `
+This path lets you manage the roles that can be created with this backend.
+
+The "sql" parameter customizes the SQL string used to create the role.
+This can be a sequence of SQL queries. Some substitution will be done to the
+SQL string for certain keys. The names of the variables must be surrounded
+by "{{" and "}}" to be replaced.
+
+  * "name" - The random username generated for the DB user.
+
+  * "password" - The random password generated for the DB user.
+
+  * "expiration" - The timestamp when this user will expire.
+
+Example of a decent SQL query to use:
+
+	CREATE ROLE "{{name}}" WITH
+	  LOGIN
+	  PASSWORD '{{password}}'
+	  VALID UNTIL '{{expiration}}';
+	GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO "{{name}}";
+
+Note the above user would be able to access everything in schema public.
+For more complex GRANT clauses, see the PostgreSQL manual.
+
+The "revocation_sql" parameter customizes the SQL string used to revoke a user.
+Example of a decent revocation SQL query to use:
+
+	REVOKE ALL PRIVILEGES ON ALL TABLES IN SCHEMA public FROM {{name}};
+	REVOKE ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA public FROM {{name}};
+	REVOKE USAGE ON SCHEMA public FROM {{name}};
+	DROP ROLE IF EXISTS {{name}};
+`
diff --git a/builtin/logical/postgresql/query.go b/builtin/logical/postgresql/query.go
new file mode 100644
index 0000000000000..e250a6fe3bda0
--- /dev/null
+++ b/builtin/logical/postgresql/query.go
@@ -0,0 +1,15 @@
+package postgresql
+
+import (
+	"fmt"
+	"strings"
+)
+
+// Query templates a query for us.
+func Query(tpl string, data map[string]string) string {
+	for k, v := range data {
+		tpl = strings.ReplaceAll(tpl, fmt.Sprintf("{{%s}}", k), v)
+	}
+
+	return tpl
+}
diff --git a/builtin/logical/postgresql/secret_creds.go b/builtin/logical/postgresql/secret_creds.go
new file mode 100644
index 0000000000000..74e8f2fffd922
--- /dev/null
+++ b/builtin/logical/postgresql/secret_creds.go
@@ -0,0 +1,269 @@
+package postgresql
+
+import (
+	"context"
+	"database/sql"
+	"fmt"
+	"strings"
+	"time"
+
+	"github.com/hashicorp/vault/sdk/database/helper/dbutil"
+
+	"github.com/hashicorp/go-secure-stdlib/strutil"
+	"github.com/hashicorp/vault/sdk/framework"
+	"github.com/hashicorp/vault/sdk/helper/dbtxn"
+	"github.com/hashicorp/vault/sdk/logical"
+)
+
+const SecretCredsType = "creds"
+
+func secretCreds(b *backend) *framework.Secret {
+	return &framework.Secret{
+		Type: SecretCredsType,
+		Fields: map[string]*framework.FieldSchema{
+			"username": {
+				Type:        framework.TypeString,
+				Description: "Username",
+			},
+
+			"password": {
+				Type:        framework.TypeString,
+				Description: "Password",
+			},
+		},
+
+		Renew:  b.secretCredsRenew,
+		Revoke: b.secretCredsRevoke,
+	}
+}
+
+func (b *backend) secretCredsRenew(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
+	// Get the username from the internal data
+	usernameRaw, ok := req.Secret.InternalData["username"]
+	if !ok {
+		return nil, fmt.Errorf("secret is missing username internal data")
+	}
+	username, ok := usernameRaw.(string)
+	if !ok {
+		return nil, fmt.Errorf("usernameRaw is not a string")
+	}
+	// Get our connection
+	db, err := b.DB(ctx, req.Storage)
+	if err != nil {
+		return nil, err
+	}
+
+	// Get the lease information
+	lease, err := b.Lease(ctx, req.Storage)
+	if err != nil {
+		return nil, err
+	}
+	if lease == nil {
+		lease = &configLease{}
+	}
+
+	// Make sure we increase the VALID UNTIL endpoint for this user.
+	ttl, _, err := framework.CalculateTTL(b.System(), req.Secret.Increment, lease.Lease, 0, lease.LeaseMax, 0, req.Secret.IssueTime)
+	if err != nil {
+		return nil, err
+	}
+	if ttl > 0 {
+		expireTime := time.Now().Add(ttl)
+		// Adding a small buffer since the TTL will be calculated again afeter this call
+		// to ensure the database credential does not expire before the lease
+		expireTime = expireTime.Add(5 * time.Second)
+		expiration := expireTime.Format("2006-01-02 15:04:05-0700")
+
+		query := fmt.Sprintf(
+			"ALTER ROLE %s VALID UNTIL '%s';",
+			dbutil.QuoteIdentifier(username),
+			expiration)
+		stmt, err := db.Prepare(query)
+		if err != nil {
+			return nil, err
+		}
+		defer stmt.Close()
+		if _, err := stmt.Exec(); err != nil {
+			return nil, err
+		}
+	}
+
+	resp := &logical.Response{Secret: req.Secret}
+	resp.Secret.TTL = lease.Lease
+	resp.Secret.MaxTTL = lease.LeaseMax
+	return resp, nil
+}
+
+func (b *backend) secretCredsRevoke(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
+	// Get the username from the internal data
+	usernameRaw, ok := req.Secret.InternalData["username"]
+	if !ok {
+		return nil, fmt.Errorf("secret is missing username internal data")
+	}
+	username, ok := usernameRaw.(string)
+	if !ok {
+		return nil, fmt.Errorf("usernameRaw is not a string")
+	}
+	var revocationSQL string
+	var resp *logical.Response
+
+	roleNameRaw, ok := req.Secret.InternalData["role"]
+	if ok {
+		role, err := b.Role(ctx, req.Storage, roleNameRaw.(string))
+		if err != nil {
+			return nil, err
+		}
+		if role == nil {
+			if resp == nil {
+				resp = &logical.Response{}
+			}
+			resp.AddWarning(fmt.Sprintf("Role %q cannot be found. Using default revocation SQL.", roleNameRaw.(string)))
+		} else {
+			revocationSQL = role.RevocationSQL
+		}
+	}
+
+	// Get our connection
+	db, err := b.DB(ctx, req.Storage)
+	if err != nil {
+		return nil, err
+	}
+
+	switch revocationSQL {
+
+	// This is the default revocation logic. If revocation SQL is provided it
+	// is simply executed as-is.
+	case "":
+		// Check if the role exists
+		var exists bool
+		err = db.QueryRow("SELECT exists (SELECT rolname FROM pg_roles WHERE rolname=$1);", username).Scan(&exists)
+		if err != nil && err != sql.ErrNoRows {
+			return nil, err
+		}
+
+		if !exists {
+			return resp, nil
+		}
+
+		// Query for permissions; we need to revoke permissions before we can drop
+		// the role
+		// This isn't done in a transaction because even if we fail along the way,
+		// we want to remove as much access as possible
+		stmt, err := db.Prepare("SELECT DISTINCT table_schema FROM information_schema.role_column_grants WHERE grantee=$1;")
+		if err != nil {
+			return nil, err
+		}
+		defer stmt.Close()
+
+		rows, err := stmt.Query(username)
+		if err != nil {
+			return nil, err
+		}
+		defer rows.Close()
+
+		const initialNumRevocations = 16
+		revocationStmts := make([]string, 0, initialNumRevocations)
+		for rows.Next() {
+			var schema string
+			err = rows.Scan(&schema)
+			if err != nil {
+				// keep going; remove as many permissions as possible right now
+				continue
+			}
+			revocationStmts = append(revocationStmts, fmt.Sprintf(
+				`REVOKE ALL PRIVILEGES ON ALL TABLES IN SCHEMA %s FROM %s;`,
+				dbutil.QuoteIdentifier(schema),
+				dbutil.QuoteIdentifier(username)))
+
+			revocationStmts = append(revocationStmts, fmt.Sprintf(
+				`REVOKE USAGE ON SCHEMA %s FROM %s;`,
+				dbutil.QuoteIdentifier(schema),
+				dbutil.QuoteIdentifier(username)))
+		}
+
+		// for good measure, revoke all privileges and usage on schema public
+		revocationStmts = append(revocationStmts, fmt.Sprintf(
+			`REVOKE ALL PRIVILEGES ON ALL TABLES IN SCHEMA public FROM %s;`,
+			dbutil.QuoteIdentifier(username)))
+
+		revocationStmts = append(revocationStmts, fmt.Sprintf(
+			"REVOKE ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA public FROM %s;",
+			dbutil.QuoteIdentifier(username)))
+
+		revocationStmts = append(revocationStmts, fmt.Sprintf(
+			"REVOKE USAGE ON SCHEMA public FROM %s;",
+			dbutil.QuoteIdentifier(username)))
+
+		// get the current database name so we can issue a REVOKE CONNECT for
+		// this username
+		var dbname sql.NullString
+		if err := db.QueryRow("SELECT current_database();").Scan(&dbname); err != nil {
+			return nil, err
+		}
+
+		if dbname.Valid {
+			revocationStmts = append(revocationStmts, fmt.Sprintf(
+				`REVOKE CONNECT ON DATABASE %s FROM %s;`,
+				dbutil.QuoteIdentifier(dbname.String),
+				dbutil.QuoteIdentifier(username)))
+		}
+
+		// again, here, we do not stop on error, as we want to remove as
+		// many permissions as possible right now
+		var lastStmtError error
+		for _, query := range revocationStmts {
+			if err := dbtxn.ExecuteDBQueryDirect(ctx, db, nil, query); err != nil {
+				lastStmtError = err
+			}
+		}
+
+		// can't drop if not all privileges are revoked
+		if rows.Err() != nil {
+			return nil, fmt.Errorf("could not generate revocation statements for all rows: %w", rows.Err())
+		}
+		if lastStmtError != nil {
+			return nil, fmt.Errorf("could not perform all revocation statements: %w", lastStmtError)
+		}
+
+		// Drop this user
+		stmt, err = db.Prepare(fmt.Sprintf(
+			`DROP ROLE IF EXISTS %s;`, dbutil.QuoteIdentifier(username)))
+		if err != nil {
+			return nil, err
+		}
+		defer stmt.Close()
+		if _, err := stmt.Exec(); err != nil {
+			return nil, err
+		}
+
+	// We have revocation SQL, execute directly, within a transaction
+	default:
+		tx, err := db.Begin()
+		if err != nil {
+			return nil, err
+		}
+		defer func() {
+			tx.Rollback()
+		}()
+
+		for _, query := range strutil.ParseArbitraryStringSlice(revocationSQL, ";") {
+			query = strings.TrimSpace(query)
+			if len(query) == 0 {
+				continue
+			}
+
+			m := map[string]string{
+				"name": username,
+			}
+			if err := dbtxn.ExecuteTxQueryDirect(ctx, tx, m, query); err != nil {
+				return nil, err
+			}
+		}
+
+		if err := tx.Commit(); err != nil {
+			return nil, err
+		}
+	}
+
+	return resp, nil
+}
diff --git a/builtin/logical/rabbitmq/backend.go b/builtin/logical/rabbitmq/backend.go
index 20ad1afd18f1e..d1f223810a65a 100644
--- a/builtin/logical/rabbitmq/backend.go
+++ b/builtin/logical/rabbitmq/backend.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package rabbitmq
 
 import (
@@ -14,8 +11,6 @@ import (
 	rabbithole "github.com/michaelklishin/rabbit-hole/v2"
 )
 
-const operationPrefixRabbitMQ = "rabbit-mq"
-
 // Factory creates and configures the backend
 func Factory(ctx context.Context, conf *logical.BackendConfig) (logical.Backend, error) {
 	b := Backend()
diff --git a/builtin/logical/rabbitmq/backend_test.go b/builtin/logical/rabbitmq/backend_test.go
index 61b18dac9d1ce..89659796b5e5c 100644
--- a/builtin/logical/rabbitmq/backend_test.go
+++ b/builtin/logical/rabbitmq/backend_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package rabbitmq
 
 import (
@@ -11,8 +8,8 @@ import (
 	"testing"
 
 	"github.com/hashicorp/go-secure-stdlib/base62"
+	"github.com/hashicorp/vault/helper/testhelpers/docker"
 	logicaltest "github.com/hashicorp/vault/helper/testhelpers/logical"
-	"github.com/hashicorp/vault/sdk/helper/docker"
 	"github.com/hashicorp/vault/sdk/helper/jsonutil"
 	"github.com/hashicorp/vault/sdk/logical"
 	rabbithole "github.com/michaelklishin/rabbit-hole/v2"
@@ -39,7 +36,7 @@ func prepareRabbitMQTestContainer(t *testing.T) (func(), string) {
 	}
 
 	runner, err := docker.NewServiceRunner(docker.RunOptions{
-		ImageRepo:     "docker.mirror.hashicorp.services/library/rabbitmq",
+		ImageRepo:     "rabbitmq",
 		ImageTag:      "3-management",
 		ContainerName: "rabbitmq",
 		Ports:         []string{"15672/tcp"},
diff --git a/builtin/logical/rabbitmq/cmd/rabbitmq/main.go b/builtin/logical/rabbitmq/cmd/rabbitmq/main.go
index 2cb62daca51ab..516f699eaee6c 100644
--- a/builtin/logical/rabbitmq/cmd/rabbitmq/main.go
+++ b/builtin/logical/rabbitmq/cmd/rabbitmq/main.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package main
 
 import (
@@ -20,11 +17,9 @@ func main() {
 	tlsConfig := apiClientMeta.GetTLSConfig()
 	tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig)
 
-	if err := plugin.ServeMultiplex(&plugin.ServeOpts{
+	if err := plugin.Serve(&plugin.ServeOpts{
 		BackendFactoryFunc: rabbitmq.Factory,
-		// set the TLSProviderFunc so that the plugin maintains backwards
-		// compatibility with Vault versions that don’t support plugin AutoMTLS
-		TLSProviderFunc: tlsProviderFunc,
+		TLSProviderFunc:    tlsProviderFunc,
 	}); err != nil {
 		logger := hclog.New(&hclog.LoggerOptions{})
 
diff --git a/builtin/logical/rabbitmq/passwords.go b/builtin/logical/rabbitmq/passwords.go
index 8ba08a0afa4b5..01bfd41f0db2b 100644
--- a/builtin/logical/rabbitmq/passwords.go
+++ b/builtin/logical/rabbitmq/passwords.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package rabbitmq
 
 import (
diff --git a/builtin/logical/rabbitmq/path_config_connection.go b/builtin/logical/rabbitmq/path_config_connection.go
index 897945512338a..51abe2547aa19 100644
--- a/builtin/logical/rabbitmq/path_config_connection.go
+++ b/builtin/logical/rabbitmq/path_config_connection.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package rabbitmq
 
 import (
@@ -20,13 +17,6 @@ const (
 func pathConfigConnection(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "config/connection",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixRabbitMQ,
-			OperationVerb:   "configure",
-			OperationSuffix: "connection",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"connection_uri": {
 				Type:        framework.TypeString,
diff --git a/builtin/logical/rabbitmq/path_config_connection_test.go b/builtin/logical/rabbitmq/path_config_connection_test.go
index 55e6b2cd042cb..dddee8f0c9b88 100644
--- a/builtin/logical/rabbitmq/path_config_connection_test.go
+++ b/builtin/logical/rabbitmq/path_config_connection_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package rabbitmq
 
 import (
diff --git a/builtin/logical/rabbitmq/path_config_lease.go b/builtin/logical/rabbitmq/path_config_lease.go
index 9436f3f4924fa..0b6bb572188d5 100644
--- a/builtin/logical/rabbitmq/path_config_lease.go
+++ b/builtin/logical/rabbitmq/path_config_lease.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package rabbitmq
 
 import (
@@ -15,11 +12,6 @@ import (
 func pathConfigLease(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "config/lease",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixRabbitMQ,
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"ttl": {
 				Type:        framework.TypeDurationSecond,
@@ -33,21 +25,9 @@ func pathConfigLease(b *backend) *framework.Path {
 			},
 		},
 
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.ReadOperation: &framework.PathOperation{
-				Callback: b.pathLeaseRead,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb:   "read",
-					OperationSuffix: "lease-configuration",
-				},
-			},
-			logical.UpdateOperation: &framework.PathOperation{
-				Callback: b.pathLeaseUpdate,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb:   "configure",
-					OperationSuffix: "lease",
-				},
-			},
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.ReadOperation:   b.pathLeaseRead,
+			logical.UpdateOperation: b.pathLeaseUpdate,
 		},
 
 		HelpSynopsis:    pathConfigLeaseHelpSyn,
diff --git a/builtin/logical/rabbitmq/path_config_lease_test.go b/builtin/logical/rabbitmq/path_config_lease_test.go
index 9e565c56f69b1..ec7e7e169c087 100644
--- a/builtin/logical/rabbitmq/path_config_lease_test.go
+++ b/builtin/logical/rabbitmq/path_config_lease_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package rabbitmq
 
 import (
diff --git a/builtin/logical/rabbitmq/path_role_create.go b/builtin/logical/rabbitmq/path_role_create.go
index fd3f256ffbfc1..5ad1ff6bdf417 100644
--- a/builtin/logical/rabbitmq/path_role_create.go
+++ b/builtin/logical/rabbitmq/path_role_create.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package rabbitmq
 
 import (
@@ -21,13 +18,6 @@ const (
 func pathCreds(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "creds/" + framework.GenericNameRegex("name"),
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixRabbitMQ,
-			OperationVerb:   "request",
-			OperationSuffix: "credentials",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"name": {
 				Type:        framework.TypeString,
diff --git a/builtin/logical/rabbitmq/path_role_create_test.go b/builtin/logical/rabbitmq/path_role_create_test.go
index ecb9746872513..2c3d5f4b86d66 100644
--- a/builtin/logical/rabbitmq/path_role_create_test.go
+++ b/builtin/logical/rabbitmq/path_role_create_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package rabbitmq
 
 import (
diff --git a/builtin/logical/rabbitmq/path_roles.go b/builtin/logical/rabbitmq/path_roles.go
index 98c2f3d1f487d..2031c7d99ec59 100644
--- a/builtin/logical/rabbitmq/path_roles.go
+++ b/builtin/logical/rabbitmq/path_roles.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package rabbitmq
 
 import (
@@ -16,10 +13,6 @@ import (
 func pathListRoles(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "roles/?$",
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixRabbitMQ,
-			OperationSuffix: "roles",
-		},
 		Callbacks: map[logical.Operation]framework.OperationFunc{
 			logical.ListOperation: b.pathRoleList,
 		},
@@ -31,10 +24,6 @@ func pathListRoles(b *backend) *framework.Path {
 func pathRoles(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "roles/" + framework.GenericNameRegex("name"),
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixRabbitMQ,
-			OperationSuffix: "role",
-		},
 		Fields: map[string]*framework.FieldSchema{
 			"name": {
 				Type:        framework.TypeString,
diff --git a/builtin/logical/rabbitmq/secret_creds.go b/builtin/logical/rabbitmq/secret_creds.go
index 2d0cce30858b6..b31dfc7188aa5 100644
--- a/builtin/logical/rabbitmq/secret_creds.go
+++ b/builtin/logical/rabbitmq/secret_creds.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package rabbitmq
 
 import (
diff --git a/builtin/logical/ssh/backend.go b/builtin/logical/ssh/backend.go
index 0606b3eae56f4..fe4f40b334c97 100644
--- a/builtin/logical/ssh/backend.go
+++ b/builtin/logical/ssh/backend.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package ssh
 
 import (
@@ -13,8 +10,6 @@ import (
 	"github.com/hashicorp/vault/sdk/logical"
 )
 
-const operationPrefixSSH = "ssh"
-
 type backend struct {
 	*framework.Backend
 	view      logical.Storage
@@ -52,12 +47,13 @@ func Backend(conf *logical.BackendConfig) (*backend, error) {
 			SealWrapStorage: []string{
 				caPrivateKey,
 				caPrivateKeyStoragePath,
-				keysStoragePrefix,
+				"keys/",
 			},
 		},
 
 		Paths: []*framework.Path{
 			pathConfigZeroAddress(&b),
+			pathKeys(&b),
 			pathListRoles(&b),
 			pathRoles(&b),
 			pathCredsCreate(&b),
@@ -67,10 +63,10 @@ func Backend(conf *logical.BackendConfig) (*backend, error) {
 			pathSign(&b),
 			pathIssue(&b),
 			pathFetchPublicKey(&b),
-			pathCleanupKeys(&b),
 		},
 
 		Secrets: []*framework.Secret{
+			secretDynamicKey(&b),
 			secretOTP(&b),
 		},
 
@@ -116,8 +112,8 @@ const backendHelp = `
 The SSH backend generates credentials allowing clients to establish SSH
 connections to remote hosts.
 
-There are two variants of the backend, which generate different types of
-credentials: One-Time Passwords (OTPs) and certificate authority. The desired behavior
+There are three variants of the backend, which generate different types of
+credentials: dynamic keys, One-Time Passwords (OTPs) and certificate authority. The desired behavior
 is role-specific and chosen at role creation time with the 'key_type'
 parameter.
 
diff --git a/builtin/logical/ssh/backend_test.go b/builtin/logical/ssh/backend_test.go
index 13f9f73624af4..27934d42af17f 100644
--- a/builtin/logical/ssh/backend_test.go
+++ b/builtin/logical/ssh/backend_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package ssh
 
 import (
@@ -16,28 +13,29 @@ import (
 	"time"
 
 	"github.com/hashicorp/vault/api"
+	"github.com/hashicorp/vault/sdk/logical"
+
+	"golang.org/x/crypto/ssh"
+
 	"github.com/hashicorp/vault/builtin/credential/userpass"
-	"github.com/hashicorp/vault/helper/testhelpers/corehelpers"
+	"github.com/hashicorp/vault/helper/testhelpers/docker"
 	logicaltest "github.com/hashicorp/vault/helper/testhelpers/logical"
 	vaulthttp "github.com/hashicorp/vault/http"
-	"github.com/hashicorp/vault/sdk/helper/docker"
-	"github.com/hashicorp/vault/sdk/logical"
 	"github.com/hashicorp/vault/vault"
 	"github.com/mitchellh/mapstructure"
-	"github.com/stretchr/testify/require"
-	"golang.org/x/crypto/ssh"
 )
 
 const (
-	testIP            = "127.0.0.1"
-	testUserName      = "vaultssh"
-	testMultiUserName = "vaultssh,otherssh"
-	testAdminUser     = "vaultssh"
-	testCaKeyType     = "ca"
-	testOTPKeyType    = "otp"
-	testCIDRList      = "127.0.0.1/32"
-	testAtRoleName    = "test@RoleName"
-	testOTPRoleName   = "testOTPRoleName"
+	testIP              = "127.0.0.1"
+	testUserName        = "vaultssh"
+	testAdminUser       = "vaultssh"
+	testCaKeyType       = "ca"
+	testOTPKeyType      = "otp"
+	testDynamicKeyType  = "dynamic"
+	testCIDRList        = "127.0.0.1/32"
+	testAtRoleName      = "test@RoleName"
+	testDynamicRoleName = "testDynamicRoleName"
+	testOTPRoleName     = "testOTPRoleName"
 	// testKeyName is the name of the entry that will be written to SSHMOUNTPOINT/ssh/keys
 	testKeyName = "testKeyName"
 	// testSharedPrivateKey is the value of the entry that will be written to SSHMOUNTPOINT/ssh/keys
@@ -132,15 +130,13 @@ SjOQL/GkH1nkRcDS9++aAAAAAmNhAQID
 	dockerImageTagSupportsNoRSA1 = "8.4_p1-r3-ls48"
 )
 
-var ctx = context.Background()
-
 func prepareTestContainer(t *testing.T, tag, caPublicKeyPEM string) (func(), string) {
 	if tag == "" {
 		tag = dockerImageTagSupportsNoRSA1
 	}
 	runner, err := docker.NewServiceRunner(docker.RunOptions{
 		ContainerName: "openssh",
-		ImageRepo:     "docker.mirror.hashicorp.services/linuxserver/openssh-server",
+		ImageRepo:     "linuxserver/openssh-server",
 		ImageTag:      tag,
 		Env: []string{
 			"DOCKER_MODS=linuxserver/mods:openssh-server-openssh-client",
@@ -360,15 +356,6 @@ func TestBackend_AllowedUsersTemplate(t *testing.T) {
 	)
 }
 
-func TestBackend_MultipleAllowedUsersTemplate(t *testing.T) {
-	testAllowedUsersTemplate(t,
-		"{{ identity.entity.metadata.ssh_username }}",
-		testUserName, map[string]string{
-			"ssh_username": testMultiUserName,
-		},
-	)
-}
-
 func TestBackend_AllowedUsersTemplate_WithStaticPrefix(t *testing.T) {
 	testAllowedUsersTemplate(t,
 		"ssh-{{ identity.entity.metadata.ssh_username }}",
@@ -524,7 +511,7 @@ func newTestingFactory(t *testing.T) func(ctx context.Context, conf *logical.Bac
 		defaultLeaseTTLVal := 2 * time.Minute
 		maxLeaseTTLVal := 10 * time.Minute
 		return Factory(context.Background(), &logical.BackendConfig{
-			Logger:      corehelpers.NewTestLogger(t),
+			Logger:      vault.NewTestLogger(t),
 			StorageView: &logical.InmemStorage{},
 			System: &logical.StaticSystemView{
 				DefaultLeaseTTLVal: defaultLeaseTTLVal,
@@ -540,22 +527,36 @@ func TestSSHBackend_Lookup(t *testing.T) {
 		"default_user": testUserName,
 		"cidr_list":    testCIDRList,
 	}
+	testDynamicRoleData := map[string]interface{}{
+		"key_type":     testDynamicKeyType,
+		"key":          testKeyName,
+		"admin_user":   testAdminUser,
+		"default_user": testAdminUser,
+		"cidr_list":    testCIDRList,
+	}
 	data := map[string]interface{}{
 		"ip": testIP,
 	}
 	resp1 := []string(nil)
 	resp2 := []string{testOTPRoleName}
-	resp3 := []string{testAtRoleName}
+	resp3 := []string{testDynamicRoleName, testOTPRoleName}
+	resp4 := []string{testDynamicRoleName}
+	resp5 := []string{testAtRoleName}
 	logicaltest.Test(t, logicaltest.TestCase{
 		LogicalFactory: newTestingFactory(t),
 		Steps: []logicaltest.TestStep{
 			testLookupRead(t, data, resp1),
 			testRoleWrite(t, testOTPRoleName, testOTPRoleData),
 			testLookupRead(t, data, resp2),
+			testNamedKeysWrite(t, testKeyName, testSharedPrivateKey),
+			testRoleWrite(t, testDynamicRoleName, testDynamicRoleData),
+			testLookupRead(t, data, resp3),
 			testRoleDelete(t, testOTPRoleName),
+			testLookupRead(t, data, resp4),
+			testRoleDelete(t, testDynamicRoleName),
 			testLookupRead(t, data, resp1),
-			testRoleWrite(t, testAtRoleName, testOTPRoleData),
-			testLookupRead(t, data, resp3),
+			testRoleWrite(t, testAtRoleName, testDynamicRoleData),
+			testLookupRead(t, data, resp5),
 			testRoleDelete(t, testAtRoleName),
 			testLookupRead(t, data, resp1),
 		},
@@ -604,6 +605,39 @@ func TestSSHBackend_RoleList(t *testing.T) {
 	})
 }
 
+func TestSSHBackend_DynamicKeyCreate(t *testing.T) {
+	cleanup, sshAddress := prepareTestContainer(t, "", "")
+	defer cleanup()
+
+	host, port, err := net.SplitHostPort(sshAddress)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	testDynamicRoleData := map[string]interface{}{
+		"key_type":     testDynamicKeyType,
+		"key":          testKeyName,
+		"admin_user":   testAdminUser,
+		"default_user": testAdminUser,
+		"cidr_list":    host + "/32",
+		"port":         port,
+	}
+	data := map[string]interface{}{
+		"username": testUserName,
+		"ip":       host,
+	}
+	logicaltest.Test(t, logicaltest.TestCase{
+		LogicalFactory: newTestingFactory(t),
+		Steps: []logicaltest.TestStep{
+			testNamedKeysWrite(t, testKeyName, testSharedPrivateKey),
+			testRoleWrite(t, testDynamicRoleName, testDynamicRoleData),
+			testCredsWrite(t, testDynamicRoleName, data, false, sshAddress),
+			testRoleWrite(t, testAtRoleName, testDynamicRoleData),
+			testCredsWrite(t, testAtRoleName, data, false, sshAddress),
+		},
+	})
+}
+
 func TestSSHBackend_OTPRoleCrud(t *testing.T) {
 	testOTPRoleData := map[string]interface{}{
 		"key_type":     testOTPKeyType,
@@ -631,6 +665,50 @@ func TestSSHBackend_OTPRoleCrud(t *testing.T) {
 	})
 }
 
+func TestSSHBackend_DynamicRoleCrud(t *testing.T) {
+	testDynamicRoleData := map[string]interface{}{
+		"key_type":     testDynamicKeyType,
+		"key":          testKeyName,
+		"admin_user":   testAdminUser,
+		"default_user": testAdminUser,
+		"cidr_list":    testCIDRList,
+	}
+	respDynamicRoleData := map[string]interface{}{
+		"cidr_list":      testCIDRList,
+		"port":           22,
+		"install_script": DefaultPublicKeyInstallScript,
+		"key_bits":       1024,
+		"key":            testKeyName,
+		"admin_user":     testUserName,
+		"default_user":   testUserName,
+		"key_type":       testDynamicKeyType,
+	}
+	logicaltest.Test(t, logicaltest.TestCase{
+		LogicalFactory: newTestingFactory(t),
+		Steps: []logicaltest.TestStep{
+			testNamedKeysWrite(t, testKeyName, testSharedPrivateKey),
+			testRoleWrite(t, testDynamicRoleName, testDynamicRoleData),
+			testRoleRead(t, testDynamicRoleName, respDynamicRoleData),
+			testRoleDelete(t, testDynamicRoleName),
+			testRoleRead(t, testDynamicRoleName, nil),
+			testRoleWrite(t, testAtRoleName, testDynamicRoleData),
+			testRoleRead(t, testAtRoleName, respDynamicRoleData),
+			testRoleDelete(t, testAtRoleName),
+			testRoleRead(t, testAtRoleName, nil),
+		},
+	})
+}
+
+func TestSSHBackend_NamedKeysCrud(t *testing.T) {
+	logicaltest.Test(t, logicaltest.TestCase{
+		LogicalFactory: newTestingFactory(t),
+		Steps: []logicaltest.TestStep{
+			testNamedKeysWrite(t, testKeyName, testSharedPrivateKey),
+			testNamedKeysDelete(t),
+		},
+	})
+}
+
 func TestSSHBackend_OTPCreate(t *testing.T) {
 	cleanup, sshAddress := prepareTestContainer(t, "", "")
 	defer func() {
@@ -684,14 +762,24 @@ func TestSSHBackend_ConfigZeroAddressCRUD(t *testing.T) {
 		"default_user": testUserName,
 		"cidr_list":    testCIDRList,
 	}
+	testDynamicRoleData := map[string]interface{}{
+		"key_type":     testDynamicKeyType,
+		"key":          testKeyName,
+		"admin_user":   testAdminUser,
+		"default_user": testAdminUser,
+		"cidr_list":    testCIDRList,
+	}
 	req1 := map[string]interface{}{
 		"roles": testOTPRoleName,
 	}
 	resp1 := map[string]interface{}{
 		"roles": []string{testOTPRoleName},
 	}
+	req2 := map[string]interface{}{
+		"roles": fmt.Sprintf("%s,%s", testOTPRoleName, testDynamicRoleName),
+	}
 	resp2 := map[string]interface{}{
-		"roles": []string{testOTPRoleName},
+		"roles": []string{testOTPRoleName, testDynamicRoleName},
 	}
 	resp3 := map[string]interface{}{
 		"roles": []string{},
@@ -703,7 +791,11 @@ func TestSSHBackend_ConfigZeroAddressCRUD(t *testing.T) {
 			testRoleWrite(t, testOTPRoleName, testOTPRoleData),
 			testConfigZeroAddressWrite(t, req1),
 			testConfigZeroAddressRead(t, resp1),
+			testNamedKeysWrite(t, testKeyName, testSharedPrivateKey),
+			testRoleWrite(t, testDynamicRoleName, testDynamicRoleData),
+			testConfigZeroAddressWrite(t, req2),
 			testConfigZeroAddressRead(t, resp2),
+			testRoleDelete(t, testDynamicRoleName),
 			testConfigZeroAddressRead(t, resp1),
 			testRoleDelete(t, testOTPRoleName),
 			testConfigZeroAddressRead(t, resp3),
@@ -737,6 +829,43 @@ func TestSSHBackend_CredsForZeroAddressRoles_otp(t *testing.T) {
 	})
 }
 
+func TestSSHBackend_CredsForZeroAddressRoles_dynamic(t *testing.T) {
+	cleanup, sshAddress := prepareTestContainer(t, "", "")
+	defer cleanup()
+
+	host, port, err := net.SplitHostPort(sshAddress)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	dynamicRoleData := map[string]interface{}{
+		"key_type":     testDynamicKeyType,
+		"key":          testKeyName,
+		"admin_user":   testAdminUser,
+		"default_user": testAdminUser,
+		"port":         port,
+	}
+	data := map[string]interface{}{
+		"username": testUserName,
+		"ip":       host,
+	}
+	req2 := map[string]interface{}{
+		"roles": testDynamicRoleName,
+	}
+	logicaltest.Test(t, logicaltest.TestCase{
+		LogicalFactory: newTestingFactory(t),
+		Steps: []logicaltest.TestStep{
+			testNamedKeysWrite(t, testKeyName, testSharedPrivateKey),
+			testRoleWrite(t, testDynamicRoleName, dynamicRoleData),
+			testCredsWrite(t, testDynamicRoleName, data, true, sshAddress),
+			testConfigZeroAddressWrite(t, req2),
+			testCredsWrite(t, testDynamicRoleName, data, false, sshAddress),
+			testConfigZeroAddressDelete(t),
+			testCredsWrite(t, testDynamicRoleName, data, true, sshAddress),
+		},
+	})
+}
+
 func TestSSHBackend_CA(t *testing.T) {
 	testCases := []struct {
 		name         string
@@ -948,63 +1077,12 @@ cKumubUxOfFdy1ZvAAAAEm5jY0BtYnAudWJudC5sb2NhbA==
 					return nil
 				},
 			},
-			testIssueCert("testcarole", "ec", testUserName, sshAddress, expectError),
-			testIssueCert("testcarole", "ed25519", testUserName, sshAddress, expectError),
-			testIssueCert("testcarole", "rsa", testUserName, sshAddress, expectError),
 		},
 	}
 
 	logicaltest.Test(t, testCase)
 }
 
-func testIssueCert(role string, keyType string, testUserName string, sshAddress string, expectError bool) logicaltest.TestStep {
-	return logicaltest.TestStep{
-		Operation: logical.UpdateOperation,
-		Path:      "issue/" + role,
-		ErrorOk:   expectError,
-		Data: map[string]interface{}{
-			"key_type":         keyType,
-			"valid_principals": testUserName,
-		},
-
-		Check: func(resp *logical.Response) error {
-			// Tolerate nil response if an error was expected
-			if expectError && resp == nil {
-				return nil
-			}
-
-			signedKey := strings.TrimSpace(resp.Data["signed_key"].(string))
-			if signedKey == "" {
-				return errors.New("no signed key in response")
-			}
-
-			privKey, err := ssh.ParsePrivateKey([]byte(resp.Data["private_key"].(string)))
-			if err != nil {
-				return fmt.Errorf("error parsing private key: %v", err)
-			}
-
-			parsedKey, _, _, _, err := ssh.ParseAuthorizedKey([]byte(signedKey))
-			if err != nil {
-				return fmt.Errorf("error parsing signed key: %v", err)
-			}
-			certSigner, err := ssh.NewCertSigner(parsedKey.(*ssh.Certificate), privKey)
-			if err != nil {
-				return err
-			}
-
-			err = testSSH(testUserName, sshAddress, ssh.PublicKeys(certSigner), "date")
-			if expectError && err == nil {
-				return fmt.Errorf("expected error but got none")
-			}
-			if !expectError && err != nil {
-				return err
-			}
-
-			return nil
-		},
-	}
-}
-
 func TestSSHBackend_CAUpgradeAlgorithmSigner(t *testing.T) {
 	cleanup, sshAddress := prepareTestContainer(t, dockerImageTagSupportsRSA1, testCAPublicKey)
 	defer cleanup()
@@ -2326,6 +2404,23 @@ func testVerifyWrite(t *testing.T, data map[string]interface{}, expected map[str
 	}
 }
 
+func testNamedKeysWrite(t *testing.T, name, key string) logicaltest.TestStep {
+	return logicaltest.TestStep{
+		Operation: logical.UpdateOperation,
+		Path:      fmt.Sprintf("keys/%s", name),
+		Data: map[string]interface{}{
+			"key": key,
+		},
+	}
+}
+
+func testNamedKeysDelete(t *testing.T) logicaltest.TestStep {
+	return logicaltest.TestStep{
+		Operation: logical.DeleteOperation,
+		Path:      fmt.Sprintf("keys/%s", testKeyName),
+	}
+}
+
 func testLookupRead(t *testing.T, data map[string]interface{}, expected []string) logicaltest.TestStep {
 	return logicaltest.TestStep{
 		Operation: logical.UpdateOperation,
@@ -2390,6 +2485,10 @@ func testRoleRead(t *testing.T, roleName string, expected map[string]interface{}
 				if d.KeyType != expected["key_type"] || d.DefaultUser != expected["default_user"] || d.CIDRList != expected["cidr_list"] {
 					return fmt.Errorf("data mismatch. bad: %#v", resp)
 				}
+			case "dynamic":
+				if d.AdminUser != expected["admin_user"] || d.CIDRList != expected["cidr_list"] || d.KeyName != expected["key"] || d.KeyType != expected["key_type"] {
+					return fmt.Errorf("data mismatch. bad: %#v", resp)
+				}
 			default:
 				return fmt.Errorf("unknown key type. bad: %#v", resp)
 			}
@@ -2430,7 +2529,7 @@ func testCredsWrite(t *testing.T, roleName string, data map[string]interface{},
 				}
 				return nil
 			}
-			if roleName == testAtRoleName {
+			if roleName == testDynamicRoleName || roleName == testAtRoleName {
 				var d struct {
 					Key string `mapstructure:"key"`
 				}
@@ -2460,382 +2559,3 @@ func testCredsWrite(t *testing.T, roleName string, data map[string]interface{},
 		},
 	}
 }
-
-func TestBackend_CleanupDynamicHostKeys(t *testing.T) {
-	config := logical.TestBackendConfig()
-	config.StorageView = &logical.InmemStorage{}
-
-	b, err := Backend(config)
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = b.Setup(context.Background(), config)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Running on a clean mount shouldn't do anything.
-	cleanRequest := &logical.Request{
-		Operation: logical.DeleteOperation,
-		Path:      "tidy/dynamic-keys",
-		Storage:   config.StorageView,
-	}
-
-	resp, err := b.HandleRequest(context.Background(), cleanRequest)
-	require.NoError(t, err)
-	require.NotNil(t, resp)
-	require.NotNil(t, resp.Data)
-	require.NotNil(t, resp.Data["message"])
-	require.Contains(t, resp.Data["message"], "0 of 0")
-
-	// Write a bunch of bogus entries.
-	for i := 0; i < 15; i++ {
-		data := map[string]interface{}{
-			"host": "localhost",
-			"key":  "nothing-to-see-here",
-		}
-		entry, err := logical.StorageEntryJSON(fmt.Sprintf("%vexample-%v", keysStoragePrefix, i), &data)
-		require.NoError(t, err)
-		err = config.StorageView.Put(context.Background(), entry)
-		require.NoError(t, err)
-	}
-
-	// Should now have 15
-	resp, err = b.HandleRequest(context.Background(), cleanRequest)
-	require.NoError(t, err)
-	require.NotNil(t, resp)
-	require.NotNil(t, resp.Data)
-	require.NotNil(t, resp.Data["message"])
-	require.Contains(t, resp.Data["message"], "15 of 15")
-
-	// Should have none left.
-	resp, err = b.HandleRequest(context.Background(), cleanRequest)
-	require.NoError(t, err)
-	require.NotNil(t, resp)
-	require.NotNil(t, resp.Data)
-	require.NotNil(t, resp.Data["message"])
-	require.Contains(t, resp.Data["message"], "0 of 0")
-}
-
-type pathAuthCheckerFunc func(t *testing.T, client *api.Client, path string, token string)
-
-func isPermDenied(err error) bool {
-	return strings.Contains(err.Error(), "permission denied")
-}
-
-func isUnsupportedPathOperation(err error) bool {
-	return strings.Contains(err.Error(), "unsupported path") || strings.Contains(err.Error(), "unsupported operation")
-}
-
-func isDeniedOp(err error) bool {
-	return isPermDenied(err) || isUnsupportedPathOperation(err)
-}
-
-func pathShouldBeAuthed(t *testing.T, client *api.Client, path string, token string) {
-	client.SetToken("")
-	resp, err := client.Logical().ReadWithContext(ctx, path)
-	if err == nil || !isPermDenied(err) {
-		t.Fatalf("expected failure to read %v while unauthed: %v / %v", path, err, resp)
-	}
-	resp, err = client.Logical().ListWithContext(ctx, path)
-	if err == nil || !isPermDenied(err) {
-		t.Fatalf("expected failure to list %v while unauthed: %v / %v", path, err, resp)
-	}
-	resp, err = client.Logical().WriteWithContext(ctx, path, map[string]interface{}{})
-	if err == nil || !isPermDenied(err) {
-		t.Fatalf("expected failure to write %v while unauthed: %v / %v", path, err, resp)
-	}
-	resp, err = client.Logical().DeleteWithContext(ctx, path)
-	if err == nil || !isPermDenied(err) {
-		t.Fatalf("expected failure to delete %v while unauthed: %v / %v", path, err, resp)
-	}
-	resp, err = client.Logical().JSONMergePatch(ctx, path, map[string]interface{}{})
-	if err == nil || !isPermDenied(err) {
-		t.Fatalf("expected failure to patch %v while unauthed: %v / %v", path, err, resp)
-	}
-}
-
-func pathShouldBeUnauthedReadList(t *testing.T, client *api.Client, path string, token string) {
-	// Should be able to read both with and without a token.
-	client.SetToken("")
-	resp, err := client.Logical().ReadWithContext(ctx, path)
-	if err != nil && isPermDenied(err) {
-		// Read will sometimes return permission denied, when the handler
-		// does not support the given operation. Retry with the token.
-		client.SetToken(token)
-		resp2, err2 := client.Logical().ReadWithContext(ctx, path)
-		if err2 != nil && !isUnsupportedPathOperation(err2) {
-			t.Fatalf("unexpected failure to read %v while unauthed: %v / %v\nWhile authed: %v / %v", path, err, resp, err2, resp2)
-		}
-		client.SetToken("")
-	}
-	resp, err = client.Logical().ListWithContext(ctx, path)
-	if err != nil && isPermDenied(err) {
-		// List will sometimes return permission denied, when the handler
-		// does not support the given operation. Retry with the token.
-		client.SetToken(token)
-		resp2, err2 := client.Logical().ListWithContext(ctx, path)
-		if err2 != nil && !isUnsupportedPathOperation(err2) {
-			t.Fatalf("unexpected failure to list %v while unauthed: %v / %v\nWhile authed: %v / %v", path, err, resp, err2, resp2)
-		}
-		client.SetToken("")
-	}
-
-	// These should all be denied.
-	resp, err = client.Logical().WriteWithContext(ctx, path, map[string]interface{}{})
-	if err == nil || !isDeniedOp(err) {
-		t.Fatalf("unexpected failure during write on read-only path %v while unauthed: %v / %v", path, err, resp)
-	}
-	resp, err = client.Logical().DeleteWithContext(ctx, path)
-	if err == nil || !isDeniedOp(err) {
-		t.Fatalf("unexpected failure during delete on read-only path %v while unauthed: %v / %v", path, err, resp)
-	}
-	resp, err = client.Logical().JSONMergePatch(ctx, path, map[string]interface{}{})
-	if err == nil || !isDeniedOp(err) {
-		t.Fatalf("unexpected failure during patch on read-only path %v while unauthed: %v / %v", path, err, resp)
-	}
-
-	// Retrying with token should allow read/list, but not modification still.
-	client.SetToken(token)
-	resp, err = client.Logical().ReadWithContext(ctx, path)
-	if err != nil && isPermDenied(err) {
-		t.Fatalf("unexpected failure to read %v while authed: %v / %v", path, err, resp)
-	}
-	resp, err = client.Logical().ListWithContext(ctx, path)
-	if err != nil && isPermDenied(err) {
-		t.Fatalf("unexpected failure to list %v while authed: %v / %v", path, err, resp)
-	}
-
-	// Should all be denied.
-	resp, err = client.Logical().WriteWithContext(ctx, path, map[string]interface{}{})
-	if err == nil || !isDeniedOp(err) {
-		t.Fatalf("unexpected failure during write on read-only path %v while authed: %v / %v", path, err, resp)
-	}
-	resp, err = client.Logical().DeleteWithContext(ctx, path)
-	if err == nil || !isDeniedOp(err) {
-		t.Fatalf("unexpected failure during delete on read-only path %v while authed: %v / %v", path, err, resp)
-	}
-	resp, err = client.Logical().JSONMergePatch(ctx, path, map[string]interface{}{})
-	if err == nil || !isDeniedOp(err) {
-		t.Fatalf("unexpected failure during patch on read-only path %v while authed: %v / %v", path, err, resp)
-	}
-}
-
-func pathShouldBeUnauthedWriteOnly(t *testing.T, client *api.Client, path string, token string) {
-	client.SetToken("")
-	resp, err := client.Logical().WriteWithContext(ctx, path, map[string]interface{}{})
-	if err != nil && isPermDenied(err) {
-		t.Fatalf("unexpected failure to write %v while unauthed: %v / %v", path, err, resp)
-	}
-
-	// These should all be denied.
-	resp, err = client.Logical().ReadWithContext(ctx, path)
-	if err == nil || !isDeniedOp(err) {
-		t.Fatalf("unexpected failure during read on write-only path %v while unauthed: %v / %v", path, err, resp)
-	}
-	resp, err = client.Logical().ListWithContext(ctx, path)
-	if err == nil || !isDeniedOp(err) {
-		t.Fatalf("unexpected failure during list on write-only path %v while unauthed: %v / %v", path, err, resp)
-	}
-	resp, err = client.Logical().DeleteWithContext(ctx, path)
-	if err == nil || !isDeniedOp(err) {
-		t.Fatalf("unexpected failure during delete on write-only path %v while unauthed: %v / %v", path, err, resp)
-	}
-	resp, err = client.Logical().JSONMergePatch(ctx, path, map[string]interface{}{})
-	if err == nil || !isDeniedOp(err) {
-		t.Fatalf("unexpected failure during patch on write-only path %v while unauthed: %v / %v", path, err, resp)
-	}
-
-	// Retrying with token should allow writing, but nothing else.
-	client.SetToken(token)
-	resp, err = client.Logical().WriteWithContext(ctx, path, map[string]interface{}{})
-	if err != nil && isPermDenied(err) {
-		t.Fatalf("unexpected failure to write %v while unauthed: %v / %v", path, err, resp)
-	}
-
-	// These should all be denied.
-	resp, err = client.Logical().ReadWithContext(ctx, path)
-	if err == nil || !isDeniedOp(err) {
-		t.Fatalf("unexpected failure during read on write-only path %v while authed: %v / %v", path, err, resp)
-	}
-	resp, err = client.Logical().ListWithContext(ctx, path)
-	if err == nil || !isDeniedOp(err) {
-		if resp != nil || err != nil {
-			t.Fatalf("unexpected failure during list on write-only path %v while authed: %v / %v", path, err, resp)
-		}
-	}
-	resp, err = client.Logical().DeleteWithContext(ctx, path)
-	if err == nil || !isDeniedOp(err) {
-		t.Fatalf("unexpected failure during delete on write-only path %v while authed: %v / %v", path, err, resp)
-	}
-	resp, err = client.Logical().JSONMergePatch(ctx, path, map[string]interface{}{})
-	if err == nil || !isDeniedOp(err) {
-		t.Fatalf("unexpected failure during patch on write-only path %v while authed: %v / %v", path, err, resp)
-	}
-}
-
-type pathAuthChecker int
-
-const (
-	shouldBeAuthed pathAuthChecker = iota
-	shouldBeUnauthedReadList
-	shouldBeUnauthedWriteOnly
-)
-
-var pathAuthChckerMap = map[pathAuthChecker]pathAuthCheckerFunc{
-	shouldBeAuthed:            pathShouldBeAuthed,
-	shouldBeUnauthedReadList:  pathShouldBeUnauthedReadList,
-	shouldBeUnauthedWriteOnly: pathShouldBeUnauthedWriteOnly,
-}
-
-func TestProperAuthing(t *testing.T) {
-	t.Parallel()
-	coreConfig := &vault.CoreConfig{
-		LogicalBackends: map[string]logical.Factory{
-			"ssh": Factory,
-		},
-	}
-	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
-		HandlerFunc: vaulthttp.Handler,
-	})
-	cluster.Start()
-	defer cluster.Cleanup()
-	client := cluster.Cores[0].Client
-	token := client.Token()
-
-	// Mount SSH.
-	err := client.Sys().MountWithContext(ctx, "ssh", &api.MountInput{
-		Type: "ssh",
-		Config: api.MountConfigInput{
-			DefaultLeaseTTL: "16h",
-			MaxLeaseTTL:     "60h",
-		},
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Setup basic configuration.
-	_, err = client.Logical().WriteWithContext(ctx, "ssh/config/ca", map[string]interface{}{
-		"generate_signing_key": true,
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = client.Logical().WriteWithContext(ctx, "ssh/roles/test-ca", map[string]interface{}{
-		"key_type":                "ca",
-		"allow_user_certificates": true,
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = client.Logical().WriteWithContext(ctx, "ssh/issue/test-ca", map[string]interface{}{
-		"username": "toor",
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = client.Logical().WriteWithContext(ctx, "ssh/roles/test-otp", map[string]interface{}{
-		"key_type":     "otp",
-		"default_user": "toor",
-		"cidr_list":    "127.0.0.0/24",
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	resp, err := client.Logical().WriteWithContext(ctx, "ssh/creds/test-otp", map[string]interface{}{
-		"username": "toor",
-		"ip":       "127.0.0.1",
-	})
-	if err != nil || resp == nil {
-		t.Fatal(err)
-	}
-	// key := resp.Data["key"].(string)
-
-	paths := map[string]pathAuthChecker{
-		"config/ca":          shouldBeAuthed,
-		"config/zeroaddress": shouldBeAuthed,
-		"creds/test-otp":     shouldBeAuthed,
-		"issue/test-ca":      shouldBeAuthed,
-		"lookup":             shouldBeAuthed,
-		"public_key":         shouldBeUnauthedReadList,
-		"roles/test-ca":      shouldBeAuthed,
-		"roles/test-otp":     shouldBeAuthed,
-		"roles":              shouldBeAuthed,
-		"sign/test-ca":       shouldBeAuthed,
-		"tidy/dynamic-keys":  shouldBeAuthed,
-		"verify":             shouldBeUnauthedWriteOnly,
-	}
-	for path, checkerType := range paths {
-		checker := pathAuthChckerMap[checkerType]
-		checker(t, client, "ssh/"+path, token)
-	}
-
-	client.SetToken(token)
-	openAPIResp, err := client.Logical().ReadWithContext(ctx, "sys/internal/specs/openapi")
-	if err != nil {
-		t.Fatalf("failed to get openapi data: %v", err)
-	}
-
-	if len(openAPIResp.Data["paths"].(map[string]interface{})) == 0 {
-		t.Fatalf("expected to get response from OpenAPI; got empty path list")
-	}
-
-	validatedPath := false
-	for openapi_path, raw_data := range openAPIResp.Data["paths"].(map[string]interface{}) {
-		if !strings.HasPrefix(openapi_path, "/ssh/") {
-			t.Logf("Skipping path: %v", openapi_path)
-			continue
-		}
-
-		t.Logf("Validating path: %v", openapi_path)
-		validatedPath = true
-
-		// Substitute values in from our testing map.
-		raw_path := openapi_path[5:]
-		if strings.Contains(raw_path, "{role}") && strings.Contains(raw_path, "roles/") {
-			raw_path = strings.ReplaceAll(raw_path, "{role}", "test-ca")
-		}
-		if strings.Contains(raw_path, "{role}") && (strings.Contains(raw_path, "sign/") || strings.Contains(raw_path, "issue/")) {
-			raw_path = strings.ReplaceAll(raw_path, "{role}", "test-ca")
-		}
-		if strings.Contains(raw_path, "{role}") && strings.Contains(raw_path, "creds") {
-			raw_path = strings.ReplaceAll(raw_path, "{role}", "test-otp")
-		}
-
-		handler, present := paths[raw_path]
-		if !present {
-			t.Fatalf("OpenAPI reports SSH mount contains %v->%v  but was not tested to be authed or authed.", openapi_path, raw_path)
-		}
-
-		openapi_data := raw_data.(map[string]interface{})
-		hasList := false
-		rawGetData, hasGet := openapi_data["get"]
-		if hasGet {
-			getData := rawGetData.(map[string]interface{})
-			getParams, paramsPresent := getData["parameters"].(map[string]interface{})
-			if getParams != nil && paramsPresent {
-				if _, hasList = getParams["list"]; hasList {
-					// LIST is exclusive from GET on the same endpoint usually.
-					hasGet = false
-				}
-			}
-		}
-		_, hasPost := openapi_data["post"]
-		_, hasDelete := openapi_data["delete"]
-
-		if handler == shouldBeUnauthedReadList {
-			if hasPost || hasDelete {
-				t.Fatalf("Unauthed read-only endpoints should not have POST/DELETE capabilities")
-			}
-		}
-	}
-
-	if !validatedPath {
-		t.Fatalf("Expected to have validated at least one path.")
-	}
-}
diff --git a/builtin/logical/ssh/cmd/ssh/main.go b/builtin/logical/ssh/cmd/ssh/main.go
index a9cf8b2696968..d04bd30af67e2 100644
--- a/builtin/logical/ssh/cmd/ssh/main.go
+++ b/builtin/logical/ssh/cmd/ssh/main.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package main
 
 import (
@@ -20,11 +17,9 @@ func main() {
 	tlsConfig := apiClientMeta.GetTLSConfig()
 	tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig)
 
-	if err := plugin.ServeMultiplex(&plugin.ServeOpts{
+	if err := plugin.Serve(&plugin.ServeOpts{
 		BackendFactoryFunc: ssh.Factory,
-		// set the TLSProviderFunc so that the plugin maintains backwards
-		// compatibility with Vault versions that don’t support plugin AutoMTLS
-		TLSProviderFunc: tlsProviderFunc,
+		TLSProviderFunc:    tlsProviderFunc,
 	}); err != nil {
 		logger := hclog.New(&hclog.LoggerOptions{})
 
diff --git a/builtin/logical/ssh/communicator.go b/builtin/logical/ssh/communicator.go
new file mode 100644
index 0000000000000..8950c41e1cec4
--- /dev/null
+++ b/builtin/logical/ssh/communicator.go
@@ -0,0 +1,350 @@
+package ssh
+
+import (
+	"bufio"
+	"bytes"
+	"errors"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"net"
+	"os"
+	"path/filepath"
+
+	log "github.com/hashicorp/go-hclog"
+
+	"golang.org/x/crypto/ssh"
+	"golang.org/x/crypto/ssh/agent"
+)
+
+type comm struct {
+	client  *ssh.Client
+	config  *SSHCommConfig
+	conn    net.Conn
+	address string
+}
+
+// SSHCommConfig is the structure used to configure the SSH communicator.
+type SSHCommConfig struct {
+	// The configuration of the Go SSH connection
+	SSHConfig *ssh.ClientConfig
+
+	// Connection returns a new connection. The current connection
+	// in use will be closed as part of the Close method, or in the
+	// case an error occurs.
+	Connection func() (net.Conn, error)
+
+	// Pty, if true, will request a pty from the remote end.
+	Pty bool
+
+	// DisableAgent, if true, will not forward the SSH agent.
+	DisableAgent bool
+
+	// Logger for output
+	Logger log.Logger
+}
+
+// Creates a new communicator implementation over SSH. This takes
+// an already existing TCP connection and SSH configuration.
+func SSHCommNew(address string, config *SSHCommConfig) (result *comm, err error) {
+	// Establish an initial connection and connect
+	result = &comm{
+		config:  config,
+		address: address,
+	}
+
+	if err = result.reconnect(); err != nil {
+		result = nil
+		return
+	}
+
+	return
+}
+
+func (c *comm) Close() error {
+	var err error
+	if c.conn != nil {
+		err = c.conn.Close()
+	}
+	c.conn = nil
+	c.client = nil
+	return err
+}
+
+func (c *comm) Upload(path string, input io.Reader, fi *os.FileInfo) error {
+	// The target directory and file for talking the SCP protocol
+	target_dir := filepath.Dir(path)
+	target_file := filepath.Base(path)
+
+	// On windows, filepath.Dir uses backslash separators (ie. "\tmp").
+	// This does not work when the target host is unix.  Switch to forward slash
+	// which works for unix and windows
+	target_dir = filepath.ToSlash(target_dir)
+
+	scpFunc := func(w io.Writer, stdoutR *bufio.Reader) error {
+		return scpUploadFile(target_file, input, w, stdoutR, fi)
+	}
+
+	return c.scpSession("scp -vt "+target_dir, scpFunc)
+}
+
+func (c *comm) NewSession() (session *ssh.Session, err error) {
+	if c.client == nil {
+		err = errors.New("client not available")
+	} else {
+		session, err = c.client.NewSession()
+	}
+
+	if err != nil {
+		c.config.Logger.Error("ssh session open error, attempting reconnect", "error", err)
+		if err := c.reconnect(); err != nil {
+			c.config.Logger.Error("reconnect attempt failed", "error", err)
+			return nil, err
+		}
+
+		return c.client.NewSession()
+	}
+
+	return session, nil
+}
+
+func (c *comm) reconnect() error {
+	// Close previous connection.
+	if c.conn != nil {
+		c.Close()
+	}
+
+	var err error
+	c.conn, err = c.config.Connection()
+	if err != nil {
+		// Explicitly set this to the REAL nil. Connection() can return
+		// a nil implementation of net.Conn which will make the
+		// "if c.conn == nil" check fail above. Read here for more information
+		// on this psychotic language feature:
+		//
+		// http://golang.org/doc/faq#nil_error
+		c.conn = nil
+		c.config.Logger.Error("reconnection error", "error", err)
+		return err
+	}
+
+	sshConn, sshChan, req, err := ssh.NewClientConn(c.conn, c.address, c.config.SSHConfig)
+	if err != nil {
+		c.config.Logger.Error("handshake error", "error", err)
+		c.Close()
+		return err
+	}
+	if sshConn != nil {
+		c.client = ssh.NewClient(sshConn, sshChan, req)
+	}
+	c.connectToAgent()
+
+	return nil
+}
+
+func (c *comm) connectToAgent() {
+	if c.client == nil {
+		return
+	}
+
+	if c.config.DisableAgent {
+		return
+	}
+
+	// open connection to the local agent
+	socketLocation := os.Getenv("SSH_AUTH_SOCK")
+	if socketLocation == "" {
+		return
+	}
+	agentConn, err := net.Dial("unix", socketLocation)
+	if err != nil {
+		c.config.Logger.Error("could not connect to local agent socket", "socket_path", socketLocation)
+		return
+	}
+	defer agentConn.Close()
+
+	// create agent and add in auth
+	forwardingAgent := agent.NewClient(agentConn)
+	if forwardingAgent == nil {
+		c.config.Logger.Error("could not create agent client")
+		return
+	}
+
+	// add callback for forwarding agent to SSH config
+	// XXX - might want to handle reconnects appending multiple callbacks
+	auth := ssh.PublicKeysCallback(forwardingAgent.Signers)
+	c.config.SSHConfig.Auth = append(c.config.SSHConfig.Auth, auth)
+	agent.ForwardToAgent(c.client, forwardingAgent)
+
+	// Setup a session to request agent forwarding
+	session, err := c.NewSession()
+	if err != nil {
+		return
+	}
+	defer session.Close()
+
+	err = agent.RequestAgentForwarding(session)
+	if err != nil {
+		c.config.Logger.Error("error requesting agent forwarding", "error", err)
+		return
+	}
+	return
+}
+
+func (c *comm) scpSession(scpCommand string, f func(io.Writer, *bufio.Reader) error) error {
+	session, err := c.NewSession()
+	if err != nil {
+		return err
+	}
+	defer session.Close()
+
+	// Get a pipe to stdin so that we can send data down
+	stdinW, err := session.StdinPipe()
+	if err != nil {
+		return err
+	}
+
+	// We only want to close once, so we nil w after we close it,
+	// and only close in the defer if it hasn't been closed already.
+	defer func() {
+		if stdinW != nil {
+			stdinW.Close()
+		}
+	}()
+
+	// Get a pipe to stdout so that we can get responses back
+	stdoutPipe, err := session.StdoutPipe()
+	if err != nil {
+		return err
+	}
+	stdoutR := bufio.NewReader(stdoutPipe)
+
+	// Set stderr to a bytes buffer
+	stderr := new(bytes.Buffer)
+	session.Stderr = stderr
+
+	// Start the sink mode on the other side
+	if err := session.Start(scpCommand); err != nil {
+		return err
+	}
+
+	// Call our callback that executes in the context of SCP. We ignore
+	// EOF errors if they occur because it usually means that SCP prematurely
+	// ended on the other side.
+	if err := f(stdinW, stdoutR); err != nil && err != io.EOF {
+		return err
+	}
+
+	// Close the stdin, which sends an EOF, and then set w to nil so that
+	// our defer func doesn't close it again since that is unsafe with
+	// the Go SSH package.
+	stdinW.Close()
+	stdinW = nil
+
+	// Wait for the SCP connection to close, meaning it has consumed all
+	// our data and has completed. Or has errored.
+	err = session.Wait()
+	if err != nil {
+		if exitErr, ok := err.(*ssh.ExitError); ok {
+			// Otherwise, we have an ExitErorr, meaning we can just read
+			// the exit status
+			c.config.Logger.Error("got non-zero exit status", "exit_status", exitErr.ExitStatus())
+
+			// If we exited with status 127, it means SCP isn't available.
+			// Return a more descriptive error for that.
+			if exitErr.ExitStatus() == 127 {
+				return errors.New(
+					"SCP failed to start. This usually means that SCP is not\n" +
+						"properly installed on the remote system.")
+			}
+		}
+
+		return err
+	}
+	return nil
+}
+
+// checkSCPStatus checks that a prior command sent to SCP completed
+// successfully. If it did not complete successfully, an error will
+// be returned.
+func checkSCPStatus(r *bufio.Reader) error {
+	code, err := r.ReadByte()
+	if err != nil {
+		return err
+	}
+
+	if code != 0 {
+		// Treat any non-zero (really 1 and 2) as fatal errors
+		message, _, err := r.ReadLine()
+		if err != nil {
+			return fmt.Errorf("error reading error message: %w", err)
+		}
+
+		return errors.New(string(message))
+	}
+
+	return nil
+}
+
+func scpUploadFile(dst string, src io.Reader, w io.Writer, r *bufio.Reader, fi *os.FileInfo) error {
+	var mode os.FileMode
+	var size int64
+
+	if fi != nil && (*fi).Mode().IsRegular() {
+		mode = (*fi).Mode().Perm()
+		size = (*fi).Size()
+	} else {
+		// Create a temporary file where we can copy the contents of the src
+		// so that we can determine the length, since SCP is length-prefixed.
+		tf, err := ioutil.TempFile("", "vault-ssh-upload")
+		if err != nil {
+			return fmt.Errorf("error creating temporary file for upload: %w", err)
+		}
+		defer os.Remove(tf.Name())
+		defer tf.Close()
+
+		mode = 0o644
+
+		if _, err := io.Copy(tf, src); err != nil {
+			return err
+		}
+
+		// Sync the file so that the contents are definitely on disk, then
+		// read the length of it.
+		if err := tf.Sync(); err != nil {
+			return fmt.Errorf("error creating temporary file for upload: %w", err)
+		}
+
+		// Seek the file to the beginning so we can re-read all of it
+		if _, err := tf.Seek(0, 0); err != nil {
+			return fmt.Errorf("error creating temporary file for upload: %w", err)
+		}
+
+		tfi, err := tf.Stat()
+		if err != nil {
+			return fmt.Errorf("error creating temporary file for upload: %w", err)
+		}
+
+		size = tfi.Size()
+		src = tf
+	}
+
+	// Start the protocol
+	perms := fmt.Sprintf("C%04o", mode)
+
+	fmt.Fprintln(w, perms, size, dst)
+	if err := checkSCPStatus(r); err != nil {
+		return err
+	}
+
+	if _, err := io.CopyN(w, src, size); err != nil {
+		return err
+	}
+
+	fmt.Fprint(w, "\x00")
+	if err := checkSCPStatus(r); err != nil {
+		return err
+	}
+
+	return nil
+}
diff --git a/builtin/logical/ssh/linux_install_script.go b/builtin/logical/ssh/linux_install_script.go
new file mode 100644
index 0000000000000..a2228b2fc2e05
--- /dev/null
+++ b/builtin/logical/ssh/linux_install_script.go
@@ -0,0 +1,71 @@
+package ssh
+
+const (
+	// This is a constant representing a script to install and uninstall public
+	// key in remote hosts.
+	DefaultPublicKeyInstallScript = `
+#!/bin/bash
+#
+# This is a default script which installs or uninstalls an RSA public key to/from
+# authorized_keys file in a typical linux machine.
+#
+# If the platform differs or if the binaries used in this script are not available
+# in target machine, use the 'install_script' parameter with 'roles/' endpoint to
+# register a custom script (applicable for Dynamic type only).
+#
+# Vault server runs this script on the target machine with the following params:
+#
+# $1:INSTALL_OPTION: "install" or "uninstall"
+#
+# $2:PUBLIC_KEY_FILE: File name containing public key to be installed. Vault server
+# uses UUID as name to avoid collisions with public keys generated for other requests.
+#
+# $3:AUTH_KEYS_FILE: Absolute path of the authorized_keys file.
+# Currently, vault uses /home/<username>/.ssh/authorized_keys as the path.
+#
+# [Note: This script will be run by Vault using the registered admin username.
+# Notice that some commands below are run as 'sudo'. For graceful execution of
+# this script there should not be any password prompts. So, disable password
+# prompt for the admin username registered with Vault.
+
+set -e
+
+# Storing arguments into variables, to increase readability of the script.
+INSTALL_OPTION=$1
+PUBLIC_KEY_FILE=$2
+AUTH_KEYS_FILE=$3
+
+# Delete the public key file and the temporary file
+function cleanup
+{
+	rm -f "$PUBLIC_KEY_FILE" temp_$PUBLIC_KEY_FILE
+}
+
+# 'cleanup' will be called if the script ends or if any command fails.
+trap cleanup EXIT
+
+# Return if the option is anything other than 'install' or 'uninstall'.
+if [ "$INSTALL_OPTION" != "install" ] && [ "$INSTALL_OPTION" != "uninstall" ]; then
+	exit 1
+fi
+
+# use locking to avoid parallel script execution
+(
+	flock --timeout 10 200
+	# Create the .ssh directory and authorized_keys file if it does not exist
+	SSH_DIR=$(dirname $AUTH_KEYS_FILE)
+	sudo mkdir -p "$SSH_DIR"
+	sudo touch "$AUTH_KEYS_FILE"
+	# Remove the key from authorized_keys file if it is already present.
+	# This step is common for both install and uninstall.  Note that grep's
+	# return code is ignored, thus if grep fails all keys will be removed
+	# rather than none and it fails secure
+	sudo grep -vFf "$PUBLIC_KEY_FILE" "$AUTH_KEYS_FILE" > temp_$PUBLIC_KEY_FILE || true
+	cat temp_$PUBLIC_KEY_FILE | sudo tee "$AUTH_KEYS_FILE"
+	# Append the new public key to authorized_keys file
+	if [ "$INSTALL_OPTION" == "install" ]; then
+		cat "$PUBLIC_KEY_FILE" | sudo tee --append "$AUTH_KEYS_FILE"
+	fi
+) 200> ${AUTH_KEYS_FILE}.lock
+`
+)
diff --git a/builtin/logical/ssh/path_cleanup_dynamic_host_keys.go b/builtin/logical/ssh/path_cleanup_dynamic_host_keys.go
deleted file mode 100644
index 5ae2afc8e88d3..0000000000000
--- a/builtin/logical/ssh/path_cleanup_dynamic_host_keys.go
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package ssh
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/hashicorp/vault/sdk/framework"
-	"github.com/hashicorp/vault/sdk/logical"
-)
-
-const keysStoragePrefix = "keys/"
-
-func pathCleanupKeys(b *backend) *framework.Path {
-	return &framework.Path{
-		Pattern: "tidy/dynamic-keys",
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixSSH,
-			OperationVerb:   "tidy",
-			OperationSuffix: "dynamic-host-keys",
-		},
-		Callbacks: map[logical.Operation]framework.OperationFunc{
-			logical.DeleteOperation: b.handleCleanupKeys,
-		},
-		HelpSynopsis:    `This endpoint removes the stored host keys used for the removed Dynamic Key feature, if present.`,
-		HelpDescription: `For more information, refer to the API documentation.`,
-	}
-}
-
-func (b *backend) handleCleanupKeys(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
-	names, err := req.Storage.List(ctx, keysStoragePrefix)
-	if err != nil {
-		return nil, fmt.Errorf("unable to list keys for removal: %w", err)
-	}
-
-	for index, name := range names {
-		keyPath := keysStoragePrefix + name
-		if err := req.Storage.Delete(ctx, keyPath); err != nil {
-			return nil, fmt.Errorf("unable to delete key %v of %v: %w", index+1, len(names), err)
-		}
-	}
-
-	return &logical.Response{
-		Data: map[string]interface{}{
-			"message": fmt.Sprintf("Removed %v of %v host keys.", len(names), len(names)),
-		},
-	}, nil
-}
diff --git a/builtin/logical/ssh/path_config_ca.go b/builtin/logical/ssh/path_config_ca.go
index 3fa890c29358d..2fd76c12f9109 100644
--- a/builtin/logical/ssh/path_config_ca.go
+++ b/builtin/logical/ssh/path_config_ca.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package ssh
 
 import (
@@ -41,11 +38,6 @@ type keyStorageEntry struct {
 func pathConfigCA(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "config/ca",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixSSH,
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"private_key": {
 				Type:        framework.TypeString,
@@ -72,26 +64,10 @@ func pathConfigCA(b *backend) *framework.Path {
 			},
 		},
 
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.UpdateOperation: &framework.PathOperation{
-				Callback: b.pathConfigCAUpdate,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb:   "configure",
-					OperationSuffix: "ca",
-				},
-			},
-			logical.DeleteOperation: &framework.PathOperation{
-				Callback: b.pathConfigCADelete,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationSuffix: "ca-configuration",
-				},
-			},
-			logical.ReadOperation: &framework.PathOperation{
-				Callback: b.pathConfigCARead,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationSuffix: "ca-configuration",
-				},
-			},
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.UpdateOperation: b.pathConfigCAUpdate,
+			logical.DeleteOperation: b.pathConfigCADelete,
+			logical.ReadOperation:   b.pathConfigCARead,
 		},
 
 		HelpSynopsis: `Set the SSH private key used for signing certificates.`,
diff --git a/builtin/logical/ssh/path_config_ca_test.go b/builtin/logical/ssh/path_config_ca_test.go
index 4c33fc80892dc..651ed42ce0fb0 100644
--- a/builtin/logical/ssh/path_config_ca_test.go
+++ b/builtin/logical/ssh/path_config_ca_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package ssh
 
 import (
diff --git a/builtin/logical/ssh/path_config_zeroaddress.go b/builtin/logical/ssh/path_config_zeroaddress.go
index 773e9b36fbe0a..d1e31e234df12 100644
--- a/builtin/logical/ssh/path_config_zeroaddress.go
+++ b/builtin/logical/ssh/path_config_zeroaddress.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package ssh
 
 import (
@@ -21,11 +18,6 @@ type zeroAddressRoles struct {
 func pathConfigZeroAddress(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "config/zeroaddress",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixSSH,
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"roles": {
 				Type: framework.TypeCommaStringSlice,
@@ -34,27 +26,10 @@ func pathConfigZeroAddress(b *backend) *framework.Path {
 				previously registered under these roles will be ignored.`,
 			},
 		},
-
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.UpdateOperation: &framework.PathOperation{
-				Callback: b.pathConfigZeroAddressWrite,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb:   "configure",
-					OperationSuffix: "zero-address",
-				},
-			},
-			logical.ReadOperation: &framework.PathOperation{
-				Callback: b.pathConfigZeroAddressRead,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationSuffix: "zero-address-configuration",
-				},
-			},
-			logical.DeleteOperation: &framework.PathOperation{
-				Callback: b.pathConfigZeroAddressDelete,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationSuffix: "zero-address-configuration",
-				},
-			},
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.UpdateOperation: b.pathConfigZeroAddressWrite,
+			logical.ReadOperation:   b.pathConfigZeroAddressRead,
+			logical.DeleteOperation: b.pathConfigZeroAddressDelete,
 		},
 		HelpSynopsis:    pathConfigZeroAddressSyn,
 		HelpDescription: pathConfigZeroAddressDesc,
diff --git a/builtin/logical/ssh/path_creds_create.go b/builtin/logical/ssh/path_creds_create.go
index b95c1f3752e17..6a644ab881f92 100644
--- a/builtin/logical/ssh/path_creds_create.go
+++ b/builtin/logical/ssh/path_creds_create.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package ssh
 
 import (
@@ -23,13 +20,6 @@ type sshOTP struct {
 func pathCredsCreate(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "creds/" + framework.GenericNameWithAtRegex("role"),
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixSSH,
-			OperationVerb:   "generate",
-			OperationSuffix: "credentials",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"role": {
 				Type:        framework.TypeString,
@@ -44,11 +34,9 @@ func pathCredsCreate(b *backend) *framework.Path {
 				Description: "[Required] IP of the remote host",
 			},
 		},
-
 		Callbacks: map[logical.Operation]framework.OperationFunc{
 			logical.UpdateOperation: b.pathCredsCreateWrite,
 		},
-
 		HelpSynopsis:    pathCredsCreateHelpSyn,
 		HelpDescription: pathCredsCreateHelpDesc,
 	}
@@ -147,7 +135,30 @@ func (b *backend) pathCredsCreateWrite(ctx context.Context, req *logical.Request
 			"otp": otp,
 		})
 	} else if role.KeyType == KeyTypeDynamic {
-		return nil, fmt.Errorf("dynamic key types have been removed")
+		// Generate an RSA key pair. This also installs the newly generated
+		// public key in the remote host.
+		dynamicPublicKey, dynamicPrivateKey, err := b.GenerateDynamicCredential(ctx, req, role, username, ip)
+		if err != nil {
+			return nil, err
+		}
+
+		// Return the information relevant to user of dynamic type and save
+		// information required for later use in internal section of secret.
+		result = b.Secret(SecretDynamicKeyType).Response(map[string]interface{}{
+			"key":      dynamicPrivateKey,
+			"key_type": role.KeyType,
+			"username": username,
+			"ip":       ip,
+			"port":     role.Port,
+		}, map[string]interface{}{
+			"admin_user":         role.AdminUser,
+			"username":           username,
+			"ip":                 ip,
+			"host_key_name":      role.KeyName,
+			"dynamic_public_key": dynamicPublicKey,
+			"port":               role.Port,
+			"install_script":     role.InstallScript,
+		})
 	} else {
 		return nil, fmt.Errorf("key type unknown")
 	}
@@ -155,6 +166,41 @@ func (b *backend) pathCredsCreateWrite(ctx context.Context, req *logical.Request
 	return result, nil
 }
 
+// Generates a RSA key pair and installs it in the remote target
+func (b *backend) GenerateDynamicCredential(ctx context.Context, req *logical.Request, role *sshRole, username, ip string) (string, string, error) {
+	// Fetch the host key to be used for dynamic key installation
+	keyEntry, err := req.Storage.Get(ctx, fmt.Sprintf("keys/%s", role.KeyName))
+	if err != nil {
+		return "", "", fmt.Errorf("key %q not found: %w", role.KeyName, err)
+	}
+
+	if keyEntry == nil {
+		return "", "", fmt.Errorf("key %q not found", role.KeyName)
+	}
+
+	var hostKey sshHostKey
+	if err := keyEntry.DecodeJSON(&hostKey); err != nil {
+		return "", "", fmt.Errorf("error reading the host key: %w", err)
+	}
+
+	// Generate a new RSA key pair with the given key length.
+	dynamicPublicKey, dynamicPrivateKey, err := generateRSAKeys(role.KeyBits)
+	if err != nil {
+		return "", "", fmt.Errorf("error generating key: %w", err)
+	}
+
+	if len(role.KeyOptionSpecs) != 0 {
+		dynamicPublicKey = fmt.Sprintf("%s %s", role.KeyOptionSpecs, dynamicPublicKey)
+	}
+
+	// Add the public key to authorized_keys file in target machine
+	err = b.installPublicKeyInTarget(ctx, role.AdminUser, username, ip, role.Port, hostKey.Key, dynamicPublicKey, role.InstallScript, true)
+	if err != nil {
+		return "", "", fmt.Errorf("failed to add public key to authorized_keys file in target: %w", err)
+	}
+	return dynamicPublicKey, dynamicPrivateKey, nil
+}
+
 // Generates a UUID OTP and its salted value based on the salt of the backend.
 func (b *backend) GenerateSaltedOTP(ctx context.Context) (string, string, error) {
 	str, err := uuid.GenerateUUID()
@@ -273,8 +319,12 @@ Creates a credential for establishing SSH connection with the remote host.
 
 const pathCredsCreateHelpDesc = `
 This path will generate a new key for establishing SSH session with
-target host. The key can be a One Time Password (OTP) using 'key_type'
-being 'otp'.
+target host. The key can either be a long lived dynamic key or a One
+Time Password (OTP), using 'key_type' parameter being 'dynamic' or
+'otp' respectively. For dynamic keys, a named key should be supplied.
+Create named key using the 'keys/' endpoint, and this represents the
+shared SSH key of target host. If this backend is mounted at 'ssh',
+then "ssh/creds/web" would generate a key for 'web' role.
 
 Keys will have a lease associated with them. The access keys can be
 revoked by using the lease ID.
diff --git a/builtin/logical/ssh/path_fetch.go b/builtin/logical/ssh/path_fetch.go
index 3a1fa5f297d4e..a04481e45573d 100644
--- a/builtin/logical/ssh/path_fetch.go
+++ b/builtin/logical/ssh/path_fetch.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package ssh
 
 import (
@@ -14,17 +11,12 @@ func pathFetchPublicKey(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: `public_key`,
 
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixSSH,
-			OperationSuffix: "public-key",
-		},
-
 		Callbacks: map[logical.Operation]framework.OperationFunc{
 			logical.ReadOperation: b.pathFetchPublicKey,
 		},
 
 		HelpSynopsis:    `Retrieve the public key.`,
-		HelpDescription: `This allows the public key of the SSH CA certificate that this backend has been configured with to be fetched. This is a raw response endpoint without JSON encoding; use -format=raw or an external tool (e.g., curl) to fetch this value.`,
+		HelpDescription: `This allows the public key, that this backend has been configured with, to be fetched.`,
 	}
 }
 
diff --git a/builtin/logical/ssh/path_issue.go b/builtin/logical/ssh/path_issue.go
index b50e03ed77711..77b644590fd04 100644
--- a/builtin/logical/ssh/path_issue.go
+++ b/builtin/logical/ssh/path_issue.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package ssh
 
 import (
@@ -22,12 +19,6 @@ func pathIssue(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "issue/" + framework.GenericNameWithAtRegex("role"),
 
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixSSH,
-			OperationVerb:   "issue",
-			OperationSuffix: "certificate",
-		},
-
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.UpdateOperation: &framework.PathOperation{
 				Callback: b.pathIssue,
diff --git a/builtin/logical/ssh/path_issue_sign.go b/builtin/logical/ssh/path_issue_sign.go
index c4e68e4721f09..e6f225ffdc6ff 100644
--- a/builtin/logical/ssh/path_issue_sign.go
+++ b/builtin/logical/ssh/path_issue_sign.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package ssh
 
 import (
@@ -96,7 +93,7 @@ func (b *backend) pathSignIssueCertificateHelper(ctx context.Context, req *logic
 		return logical.ErrorResponse(err.Error()), nil
 	}
 
-	extensions, addExtTemplatingWarning, err := b.calculateExtensions(data, req, role)
+	extensions, err := b.calculateExtensions(data, req, role)
 	if err != nil {
 		return logical.ErrorResponse(err.Error()), nil
 	}
@@ -143,10 +140,6 @@ func (b *backend) pathSignIssueCertificateHelper(ctx context.Context, req *logic
 		},
 	}
 
-	if addExtTemplatingWarning {
-		response.AddWarning("default_extension templating enabled with at least one extension requiring identity templating. However, this request lacked identity entity information, causing one or more extensions to be skipped from the generated certificate.")
-	}
-
 	return response, nil
 }
 
@@ -179,14 +172,18 @@ func (b *backend) calculateValidPrincipals(data *framework.FieldData, req *logic
 	parsedPrincipals := strutil.RemoveDuplicates(strutil.ParseStringSlice(validPrincipals, ","), false)
 	// Build list of allowed Principals from template and static principalsAllowedByRole
 	var allowedPrincipals []string
-	if enableTemplating {
-		rendered, err := b.renderPrincipal(principalsAllowedByRole, req)
-		if err != nil {
-			return nil, err
+	for _, principal := range strutil.RemoveDuplicates(strutil.ParseStringSlice(principalsAllowedByRole, ","), false) {
+		if enableTemplating {
+			rendered, err := b.renderPrincipal(principal, req)
+			if err != nil {
+				return nil, err
+			}
+			// Template returned a principal
+			allowedPrincipals = append(allowedPrincipals, rendered)
+		} else {
+			// Static principal
+			allowedPrincipals = append(allowedPrincipals, principal)
 		}
-		allowedPrincipals = strutil.RemoveDuplicates(strutil.ParseStringSlice(rendered, ","), false)
-	} else {
-		allowedPrincipals = strutil.RemoveDuplicates(strutil.ParseStringSlice(principalsAllowedByRole, ","), false)
 	}
 
 	switch {
@@ -303,7 +300,7 @@ func (b *backend) calculateCriticalOptions(data *framework.FieldData, role *sshR
 	return criticalOptions, nil
 }
 
-func (b *backend) calculateExtensions(data *framework.FieldData, req *logical.Request, role *sshRole) (map[string]string, bool, error) {
+func (b *backend) calculateExtensions(data *framework.FieldData, req *logical.Request, role *sshRole) (map[string]string, error) {
 	unparsedExtensions := data.Get("extensions").(map[string]interface{})
 	extensions := make(map[string]string)
 
@@ -311,7 +308,7 @@ func (b *backend) calculateExtensions(data *framework.FieldData, req *logical.Re
 		extensions := convertMapToStringValue(unparsedExtensions)
 		if role.AllowedExtensions == "*" {
 			// Allowed extensions was configured to allow all
-			return extensions, false, nil
+			return extensions, nil
 		}
 
 		notAllowed := []string{}
@@ -323,13 +320,11 @@ func (b *backend) calculateExtensions(data *framework.FieldData, req *logical.Re
 		}
 
 		if len(notAllowed) != 0 {
-			return nil, false, fmt.Errorf("extensions %v are not on allowed list", notAllowed)
+			return nil, fmt.Errorf("extensions %v are not on allowed list", notAllowed)
 		}
-		return extensions, false, nil
+		return extensions, nil
 	}
 
-	haveMissingEntityInfoWithTemplatedExt := false
-
 	if role.DefaultExtensionsTemplate {
 		for extensionKey, extensionValue := range role.DefaultExtensions {
 			// Look for templating markers {{ .* }}
@@ -342,10 +337,8 @@ func (b *backend) calculateExtensions(data *framework.FieldData, req *logical.Re
 						// Template returned an extension value that we can use
 						extensions[extensionKey] = templateExtensionValue
 					} else {
-						return nil, false, fmt.Errorf("template '%s' could not be rendered -> %s", extensionValue, err)
+						return nil, fmt.Errorf("template '%s' could not be rendered -> %s", extensionValue, err)
 					}
-				} else {
-					haveMissingEntityInfoWithTemplatedExt = true
 				}
 			} else {
 				// Static extension value or err template
@@ -356,7 +349,7 @@ func (b *backend) calculateExtensions(data *framework.FieldData, req *logical.Re
 		extensions = role.DefaultExtensions
 	}
 
-	return extensions, haveMissingEntityInfoWithTemplatedExt, nil
+	return extensions, nil
 }
 
 func (b *backend) calculateTTL(data *framework.FieldData, role *sshRole) (time.Duration, error) {
@@ -501,7 +494,7 @@ func (b *creationBundle) sign() (retCert *ssh.Certificate, retErr error) {
 	// prepare certificate for signing
 	nonce := make([]byte, 32)
 	if _, err := io.ReadFull(rand.Reader, nonce); err != nil {
-		return nil, fmt.Errorf("failed to generate signed SSH key: error generating random nonce: %w", err)
+		return nil, fmt.Errorf("failed to generate signed SSH key: error generating random nonce")
 	}
 	certificate := &ssh.Certificate{
 		Serial:          serialNumber.Uint64(),
diff --git a/builtin/logical/ssh/path_keys.go b/builtin/logical/ssh/path_keys.go
new file mode 100644
index 0000000000000..6f0f7c9b2bdb0
--- /dev/null
+++ b/builtin/logical/ssh/path_keys.go
@@ -0,0 +1,110 @@
+package ssh
+
+import (
+	"context"
+	"fmt"
+
+	"golang.org/x/crypto/ssh"
+
+	"github.com/hashicorp/vault/sdk/framework"
+	"github.com/hashicorp/vault/sdk/logical"
+)
+
+type sshHostKey struct {
+	Key string `json:"key"`
+}
+
+func pathKeys(b *backend) *framework.Path {
+	return &framework.Path{
+		Pattern: "keys/" + framework.GenericNameRegex("key_name"),
+		Fields: map[string]*framework.FieldSchema{
+			"key_name": {
+				Type:        framework.TypeString,
+				Description: "[Required] Name of the key",
+			},
+			"key": {
+				Type:        framework.TypeString,
+				Description: "[Required] SSH private key with super user privileges in host",
+			},
+		},
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.UpdateOperation: b.pathKeysWrite,
+			logical.DeleteOperation: b.pathKeysDelete,
+		},
+		HelpSynopsis:    pathKeysSyn,
+		HelpDescription: pathKeysDesc,
+	}
+}
+
+func (b *backend) getKey(ctx context.Context, s logical.Storage, n string) (*sshHostKey, error) {
+	entry, err := s.Get(ctx, "keys/"+n)
+	if err != nil {
+		return nil, err
+	}
+	if entry == nil {
+		return nil, nil
+	}
+
+	var result sshHostKey
+	if err := entry.DecodeJSON(&result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+func (b *backend) pathKeysDelete(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
+	keyName := d.Get("key_name").(string)
+	keyPath := fmt.Sprintf("keys/%s", keyName)
+	err := req.Storage.Delete(ctx, keyPath)
+	if err != nil {
+		return nil, err
+	}
+	return nil, nil
+}
+
+func (b *backend) pathKeysWrite(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
+	keyName := d.Get("key_name").(string)
+	if keyName == "" {
+		return logical.ErrorResponse("Missing key_name"), nil
+	}
+
+	keyString := d.Get("key").(string)
+
+	// Check if the key provided is infact a private key
+	signer, err := ssh.ParsePrivateKey([]byte(keyString))
+	if err != nil || signer == nil {
+		return logical.ErrorResponse("Invalid key"), nil
+	}
+
+	if keyString == "" {
+		return logical.ErrorResponse("Missing key"), nil
+	}
+
+	keyPath := fmt.Sprintf("keys/%s", keyName)
+
+	// Store the key
+	entry, err := logical.StorageEntryJSON(keyPath, map[string]interface{}{
+		"key": keyString,
+	})
+	if err != nil {
+		return nil, err
+	}
+	if err := req.Storage.Put(ctx, entry); err != nil {
+		return nil, err
+	}
+	return nil, nil
+}
+
+const pathKeysSyn = `
+Register a shared private key with Vault.
+`
+
+const pathKeysDesc = `
+Vault uses this key to install and uninstall dynamic keys in remote hosts. This
+key should have sudoer privileges in remote hosts. This enables installing keys
+for unprivileged usernames.
+
+If this backend is mounted as "ssh", then the endpoint for registering shared
+key is "ssh/keys/<name>". The name given here can be associated with any number
+of roles via the endpoint "ssh/roles/".
+`
diff --git a/builtin/logical/ssh/path_lookup.go b/builtin/logical/ssh/path_lookup.go
index 8ea0b53ac127c..05b62af96afd7 100644
--- a/builtin/logical/ssh/path_lookup.go
+++ b/builtin/logical/ssh/path_lookup.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package ssh
 
 import (
@@ -15,24 +12,15 @@ import (
 func pathLookup(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "lookup",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixSSH,
-			OperationVerb:   "list",
-			OperationSuffix: "roles-by-ip",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"ip": {
 				Type:        framework.TypeString,
 				Description: "[Required] IP address of remote host",
 			},
 		},
-
 		Callbacks: map[logical.Operation]framework.OperationFunc{
 			logical.UpdateOperation: b.pathLookupWrite,
 		},
-
 		HelpSynopsis:    pathLookupSyn,
 		HelpDescription: pathLookupDesc,
 	}
diff --git a/builtin/logical/ssh/path_roles.go b/builtin/logical/ssh/path_roles.go
index b16c1d762cdec..595839301b86c 100644
--- a/builtin/logical/ssh/path_roles.go
+++ b/builtin/logical/ssh/path_roles.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package ssh
 
 import (
@@ -20,7 +17,7 @@ import (
 const (
 	// KeyTypeOTP is an key of type OTP
 	KeyTypeOTP = "otp"
-	// KeyTypeDynamic is dynamic key type; removed.
+	// KeyTypeDynamic is dynamic key type
 	KeyTypeDynamic = "dynamic"
 	// KeyTypeCA is an key of type CA
 	KeyTypeCA = "ca"
@@ -35,19 +32,24 @@ const (
 )
 
 // Structure that represents a role in SSH backend. This is a common role structure
-// for both OTP and CA roles. Not all the fields are mandatory for both type.
+// for both OTP and Dynamic roles. Not all the fields are mandatory for both type.
 // Some are applicable for one and not for other. It doesn't matter.
 type sshRole struct {
 	KeyType                    string            `mapstructure:"key_type" json:"key_type"`
+	KeyName                    string            `mapstructure:"key" json:"key"`
+	KeyBits                    int               `mapstructure:"key_bits" json:"key_bits"`
+	AdminUser                  string            `mapstructure:"admin_user" json:"admin_user"`
 	DefaultUser                string            `mapstructure:"default_user" json:"default_user"`
 	DefaultUserTemplate        bool              `mapstructure:"default_user_template" json:"default_user_template"`
 	CIDRList                   string            `mapstructure:"cidr_list" json:"cidr_list"`
 	ExcludeCIDRList            string            `mapstructure:"exclude_cidr_list" json:"exclude_cidr_list"`
 	Port                       int               `mapstructure:"port" json:"port"`
+	InstallScript              string            `mapstructure:"install_script" json:"install_script"`
 	AllowedUsers               string            `mapstructure:"allowed_users" json:"allowed_users"`
 	AllowedUsersTemplate       bool              `mapstructure:"allowed_users_template" json:"allowed_users_template"`
 	AllowedDomains             string            `mapstructure:"allowed_domains" json:"allowed_domains"`
 	AllowedDomainsTemplate     bool              `mapstructure:"allowed_domains_template" json:"allowed_domains_template"`
+	KeyOptionSpecs             string            `mapstructure:"key_option_specs" json:"key_option_specs"`
 	MaxTTL                     string            `mapstructure:"max_ttl" json:"max_ttl"`
 	TTL                        string            `mapstructure:"ttl" json:"ttl"`
 	DefaultCriticalOptions     map[string]string `mapstructure:"default_critical_options" json:"default_critical_options"`
@@ -72,11 +74,6 @@ func pathListRoles(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "roles/?$",
 
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixSSH,
-			OperationSuffix: "roles",
-		},
-
 		Callbacks: map[logical.Operation]framework.OperationFunc{
 			logical.ListOperation: b.pathRoleList,
 		},
@@ -89,12 +86,6 @@ func pathListRoles(b *backend) *framework.Path {
 func pathRoles(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "roles/" + framework.GenericNameWithAtRegex("role"),
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixSSH,
-			OperationSuffix: "role",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"role": {
 				Type: framework.TypeString,
@@ -102,10 +93,30 @@ func pathRoles(b *backend) *framework.Path {
 				[Required for all types]
 				Name of the role being created.`,
 			},
+			"key": {
+				Type: framework.TypeString,
+				Description: `
+				[Required for Dynamic type] [Not applicable for OTP type] [Not applicable for CA type]
+				Name of the registered key in Vault. Before creating the role, use the
+				'keys/' endpoint to create a named key.`,
+			},
+			"admin_user": {
+				Type: framework.TypeString,
+				Description: `
+				[Required for Dynamic type] [Not applicable for OTP type] [Not applicable for CA type]
+				Admin user at remote host. The shared key being registered should be
+				for this user and should have root privileges. Everytime a dynamic
+				credential is being generated for other users, Vault uses this admin
+				username to login to remote host and install the generated credential
+				for the other user.`,
+				DisplayAttrs: &framework.DisplayAttributes{
+					Name: "Admin Username",
+				},
+			},
 			"default_user": {
 				Type: framework.TypeString,
 				Description: `
-				[Required for OTP type] [Optional for CA type]
+				[Required for Dynamic type] [Required for OTP type] [Optional for CA type]
 				Default username for which a credential will be generated.
 				When the endpoint 'creds/' is used without a username, this
 				value will be used as default username.`,
@@ -116,7 +127,7 @@ func pathRoles(b *backend) *framework.Path {
 			"default_user_template": {
 				Type: framework.TypeBool,
 				Description: `
-				[Not applicable for OTP type] [Optional for CA type]
+				[Not applicable for Dynamic type] [Not applicable for OTP type] [Optional for CA type]
 				If set, Default user can be specified using identity template policies.
 				Non-templated users are also permitted.
 				`,
@@ -125,7 +136,7 @@ func pathRoles(b *backend) *framework.Path {
 			"cidr_list": {
 				Type: framework.TypeString,
 				Description: `
-				[Optional for OTP type] [Not applicable for CA type]
+				[Optional for Dynamic type] [Optional for OTP type] [Not applicable for CA type]
 				Comma separated list of CIDR blocks for which the role is applicable for.
 				CIDR blocks can belong to more than one role.`,
 				DisplayAttrs: &framework.DisplayAttributes{
@@ -135,7 +146,7 @@ func pathRoles(b *backend) *framework.Path {
 			"exclude_cidr_list": {
 				Type: framework.TypeString,
 				Description: `
-				[Optional for OTP type] [Not applicable for CA type]
+				[Optional for Dynamic type] [Optional for OTP type] [Not applicable for CA type]
 				Comma separated list of CIDR blocks. IP addresses belonging to these blocks are not
 				accepted by the role. This is particularly useful when big CIDR blocks are being used
 				by the role and certain parts of it needs to be kept out.`,
@@ -146,7 +157,7 @@ func pathRoles(b *backend) *framework.Path {
 			"port": {
 				Type: framework.TypeInt,
 				Description: `
-				[Optional for OTP type] [Not applicable for CA type]
+				[Optional for Dynamic type] [Optional for OTP type] [Not applicable for CA type]
 				Port number for SSH connection. Default is '22'. Port number does not
 				play any role in creation of OTP. For 'otp' type, this is just a way
 				to inform client about the port number to use. Port number will be
@@ -159,13 +170,27 @@ func pathRoles(b *backend) *framework.Path {
 				Type: framework.TypeString,
 				Description: `
 				[Required for all types]
-				Type of key used to login to hosts. It can be either 'otp' or 'ca'.
+				Type of key used to login to hosts. It can be either 'otp', 'dynamic' or 'ca'.
 				'otp' type requires agent to be installed in remote hosts.`,
-				AllowedValues: []interface{}{"otp", "ca"},
+				AllowedValues: []interface{}{"otp", "dynamic", "ca"},
 				DisplayAttrs: &framework.DisplayAttributes{
 					Value: "ca",
 				},
 			},
+			"key_bits": {
+				Type: framework.TypeInt,
+				Description: `
+				[Optional for Dynamic type] [Not applicable for OTP type] [Not applicable for CA type]
+				Length of the RSA dynamic key in bits. It is 1024 by default or it can be 2048.`,
+			},
+			"install_script": {
+				Type: framework.TypeString,
+				Description: `
+				[Optional for Dynamic type] [Not-applicable for OTP type] [Not applicable for CA type]
+				Script used to install and uninstall public keys in the target machine.
+				The inbuilt default install script will be for Linux hosts. For sample
+				script, refer the project documentation website.`,
+			},
 			"allowed_users": {
 				Type: framework.TypeString,
 				Description: `
@@ -185,7 +210,7 @@ func pathRoles(b *backend) *framework.Path {
 			"allowed_users_template": {
 				Type: framework.TypeBool,
 				Description: `
-				[Not applicable for OTP type] [Optional for CA type]
+				[Not applicable for Dynamic type] [Not applicable for OTP type] [Optional for CA type]
 				If set, Allowed users can be specified using identity template policies.
 				Non-templated users are also permitted.
 				`,
@@ -194,7 +219,7 @@ func pathRoles(b *backend) *framework.Path {
 			"allowed_domains": {
 				Type: framework.TypeString,
 				Description: `
-				[Not applicable for OTP type] [Optional for CA type]
+				[Not applicable for Dynamic type] [Not applicable for OTP type] [Optional for CA type]
 				If this option is not specified, client can request for a signed certificate for any
 				valid host. If only certain domains are allowed, then this list enforces it.
 				`,
@@ -202,16 +227,25 @@ func pathRoles(b *backend) *framework.Path {
 			"allowed_domains_template": {
 				Type: framework.TypeBool,
 				Description: `
-				[Not applicable for OTP type] [Optional for CA type]
+				[Not applicable for Dynamic type] [Not applicable for OTP type] [Optional for CA type]
 				If set, Allowed domains can be specified using identity template policies.
 				Non-templated domains are also permitted.
 				`,
 				Default: false,
 			},
+			"key_option_specs": {
+				Type: framework.TypeString,
+				Description: `
+				[Optional for Dynamic type] [Not applicable for OTP type] [Not applicable for CA type]
+				Comma separated option specifications which will be prefixed to RSA key in
+				authorized_keys file. Options should be valid and comply with authorized_keys
+				file format and should not contain spaces.
+				`,
+			},
 			"ttl": {
 				Type: framework.TypeDurationSecond,
 				Description: `
-				[Not applicable for OTP type] [Optional for CA type]
+				[Not applicable for Dynamic type] [Not applicable for OTP type] [Optional for CA type]
 				The lease duration if no specific lease duration is
 				requested. The lease duration controls the expiration
 				of certificates issued by this backend. Defaults to
@@ -223,7 +257,7 @@ func pathRoles(b *backend) *framework.Path {
 			"max_ttl": {
 				Type: framework.TypeDurationSecond,
 				Description: `
-				[Not applicable for OTP type] [Optional for CA type]
+				[Not applicable for Dynamic type] [Not applicable for OTP type] [Optional for CA type]
 				The maximum allowed lease duration
 				`,
 				DisplayAttrs: &framework.DisplayAttributes{
@@ -233,7 +267,7 @@ func pathRoles(b *backend) *framework.Path {
 			"allowed_critical_options": {
 				Type: framework.TypeString,
 				Description: `
-				[Not applicable for OTP type] [Optional for CA type]
+				[Not applicable for Dynamic type] [Not applicable for OTP type] [Optional for CA type]
 				A comma-separated list of critical options that certificates can have when signed.
  				To allow any critical options, set this to an empty string.
 				 `,
@@ -241,7 +275,7 @@ func pathRoles(b *backend) *framework.Path {
 			"allowed_extensions": {
 				Type: framework.TypeString,
 				Description: `
-				[Not applicable for OTP type] [Optional for CA type]
+				[Not applicable for Dynamic type] [Not applicable for OTP type] [Optional for CA type]
 				A comma-separated list of extensions that certificates can have when signed.
 				An empty list means that no extension overrides are allowed by an end-user; explicitly
 				specify '*' to allow any extensions to be set.
@@ -250,8 +284,8 @@ func pathRoles(b *backend) *framework.Path {
 			"default_critical_options": {
 				Type: framework.TypeMap,
 				Description: `
-				[Not applicable for OTP type] [Optional for CA type]
-				Critical options certificates should
+				[Not applicable for Dynamic type] [Not applicable for OTP type]
+				[Optional for CA type] Critical options certificates should
 				have if none are provided when signing. This field takes in key
 				value pairs in JSON format.  Note that these are not restricted
 				by "allowed_critical_options". Defaults to none.
@@ -260,8 +294,8 @@ func pathRoles(b *backend) *framework.Path {
 			"default_extensions": {
 				Type: framework.TypeMap,
 				Description: `
-				[Not applicable for OTP type] [Optional for CA type]
-				Extensions certificates should have if
+				[Not applicable for Dynamic type] [Not applicable for OTP type]
+				[Optional for CA type] Extensions certificates should have if
 				none are provided when signing. This field takes in key value
 				pairs in JSON format. Note that these are not restricted by
 				"allowed_extensions". Defaults to none.
@@ -270,7 +304,7 @@ func pathRoles(b *backend) *framework.Path {
 			"default_extensions_template": {
 				Type: framework.TypeBool,
 				Description: `
-				[Not applicable for OTP type] [Optional for CA type]
+				[Not applicable for Dynamic type] [Not applicable for OTP type] [Optional for CA type]
 				If set, Default extension values can be specified using identity template policies.
 				Non-templated extension values are also permitted.
 				`,
@@ -279,7 +313,7 @@ func pathRoles(b *backend) *framework.Path {
 			"allow_user_certificates": {
 				Type: framework.TypeBool,
 				Description: `
-				[Not applicable for OTP type] [Optional for CA type]
+				[Not applicable for Dynamic type] [Not applicable for OTP type] [Optional for CA type]
 				If set, certificates are allowed to be signed for use as a 'user'.
 				`,
 				Default: false,
@@ -287,7 +321,7 @@ func pathRoles(b *backend) *framework.Path {
 			"allow_host_certificates": {
 				Type: framework.TypeBool,
 				Description: `
-				[Not applicable for OTP type] [Optional for CA type]
+				[Not applicable for Dynamic type] [Not applicable for OTP type] [Optional for CA type]
 				If set, certificates are allowed to be signed for use as a 'host'.
 				`,
 				Default: false,
@@ -295,7 +329,7 @@ func pathRoles(b *backend) *framework.Path {
 			"allow_bare_domains": {
 				Type: framework.TypeBool,
 				Description: `
-				[Not applicable for OTP type] [Optional for CA type]
+				[Not applicable for Dynamic type] [Not applicable for OTP type] [Optional for CA type]
 				If set, host certificates that are requested are allowed to use the base domains listed in
 				"allowed_domains", e.g. "example.com".
 				This is a separate option as in some cases this can be considered a security threat.
@@ -304,14 +338,14 @@ func pathRoles(b *backend) *framework.Path {
 			"allow_subdomains": {
 				Type: framework.TypeBool,
 				Description: `
-				[Not applicable for OTP type] [Optional for CA type]
+				[Not applicable for Dynamic type] [Not applicable for OTP type] [Optional for CA type]
 				If set, host certificates that are requested are allowed to use subdomains of those listed in "allowed_domains".
 				`,
 			},
 			"allow_user_key_ids": {
 				Type: framework.TypeBool,
 				Description: `
-				[Not applicable for OTP type] [Optional for CA type]
+				[Not applicable for Dynamic type] [Not applicable for OTP type] [Optional for CA type]
 				If true, users can override the key ID for a signed certificate with the "key_id" field.
 				When false, the key ID will always be the token display name.
 				The key ID is logged by the SSH server and can be useful for auditing.
@@ -323,7 +357,7 @@ func pathRoles(b *backend) *framework.Path {
 			"key_id_format": {
 				Type: framework.TypeString,
 				Description: `
-				[Not applicable for OTP type] [Optional for CA type]
+				[Not applicable for Dynamic type] [Not applicable for OTP type] [Optional for CA type]
 				When supplied, this value specifies a custom format for the key id of a signed certificate.
 				The following variables are available for use: '{{token_display_name}}' - The display name of
 				the token used to make the request. '{{role_name}}' - The name of the role signing the request.
@@ -336,18 +370,16 @@ func pathRoles(b *backend) *framework.Path {
 			"allowed_user_key_lengths": {
 				Type: framework.TypeMap,
 				Description: `
-				[Not applicable for OTP type] [Optional for CA type]
-				If set, allows the enforcement of key types and minimum key sizes to be signed.
-				`,
+                                [Not applicable for Dynamic type] [Not applicable for OTP type] [Optional for CA type]
+                                If set, allows the enforcement of key types and minimum key sizes to be signed.
+                                `,
 			},
 			"algorithm_signer": {
 				Type: framework.TypeString,
 				Description: `
-				[Not applicable for OTP type] [Optional for CA type]
 				When supplied, this value specifies a signing algorithm for the key. Possible values:
 				ssh-rsa, rsa-sha2-256, rsa-sha2-512, default, or the empty string.
 				`,
-				AllowedValues: []interface{}{"", DefaultAlgorithmSigner, ssh.SigAlgoRSA, ssh.SigAlgoRSASHA2256, ssh.SigAlgoRSASHA2512},
 				DisplayAttrs: &framework.DisplayAttributes{
 					Name: "Signing Algorithm",
 				},
@@ -356,7 +388,6 @@ func pathRoles(b *backend) *framework.Path {
 				Type:    framework.TypeDurationSecond,
 				Default: 30,
 				Description: `
-				[Not applicable for OTP type] [Optional for CA type]
    				The duration that the SSH certificate should be backdated by at issuance.`,
 				DisplayAttrs: &framework.DisplayAttributes{
 					Name:  "Not before duration",
@@ -382,7 +413,7 @@ func (b *backend) pathRoleWrite(ctx context.Context, req *logical.Request, d *fr
 		return logical.ErrorResponse("missing role name"), nil
 	}
 
-	// Allowed users is an optional field, applicable for both OTP and CA types.
+	// Allowed users is an optional field, applicable for both OTP and Dynamic types.
 	allowedUsers := d.Get("allowed_users").(string)
 
 	// Validate the CIDR blocks
@@ -427,6 +458,13 @@ func (b *backend) pathRoleWrite(ctx context.Context, req *logical.Request, d *fr
 			return logical.ErrorResponse("missing default user"), nil
 		}
 
+		// Admin user is not used if OTP key type is used because there is
+		// no need to login to remote machine.
+		adminUser := d.Get("admin_user").(string)
+		if adminUser != "" {
+			return logical.ErrorResponse("admin user not required for OTP type"), nil
+		}
+
 		// Below are the only fields used from the role structure for OTP type.
 		roleEntry = sshRole{
 			DefaultUser:     defaultUser,
@@ -438,7 +476,59 @@ func (b *backend) pathRoleWrite(ctx context.Context, req *logical.Request, d *fr
 			Version:         roleEntryVersion,
 		}
 	} else if keyType == KeyTypeDynamic {
-		return logical.ErrorResponse("dynamic key type roles are no longer supported"), nil
+		defaultUser := d.Get("default_user").(string)
+		if defaultUser == "" {
+			return logical.ErrorResponse("missing default user"), nil
+		}
+		// Key name is required by dynamic type and not by OTP type.
+		keyName := d.Get("key").(string)
+		if keyName == "" {
+			return logical.ErrorResponse("missing key name"), nil
+		}
+		keyEntry, err := req.Storage.Get(ctx, fmt.Sprintf("keys/%s", keyName))
+		if err != nil || keyEntry == nil {
+			return logical.ErrorResponse(fmt.Sprintf("invalid 'key': %q", keyName)), nil
+		}
+
+		installScript := d.Get("install_script").(string)
+		keyOptionSpecs := d.Get("key_option_specs").(string)
+
+		// Setting the default script here. The script will install the
+		// generated public key in the authorized_keys file of linux host.
+		if installScript == "" {
+			installScript = DefaultPublicKeyInstallScript
+		}
+
+		adminUser := d.Get("admin_user").(string)
+		if adminUser == "" {
+			return logical.ErrorResponse("missing admin username"), nil
+		}
+
+		// This defaults to 2048, but it can also be 1024, 3072, 4096, or 8192.
+		// In the near future, we should disallow 1024-bit SSH keys.
+		keyBits := d.Get("key_bits").(int)
+		if keyBits == 0 {
+			keyBits = 2048
+		}
+		if keyBits != 1024 && keyBits != 2048 && keyBits != 3072 && keyBits != 4096 && keyBits != 8192 {
+			return logical.ErrorResponse("invalid key_bits field"), nil
+		}
+
+		// Store all the fields required by dynamic key type
+		roleEntry = sshRole{
+			KeyName:         keyName,
+			AdminUser:       adminUser,
+			DefaultUser:     defaultUser,
+			CIDRList:        cidrList,
+			ExcludeCIDRList: excludeCidrList,
+			Port:            port,
+			KeyType:         KeyTypeDynamic,
+			KeyBits:         keyBits,
+			InstallScript:   installScript,
+			AllowedUsers:    allowedUsers,
+			KeyOptionSpecs:  keyOptionSpecs,
+			Version:         roleEntryVersion,
+		}
 	} else if keyType == KeyTypeCA {
 		algorithmSigner := DefaultAlgorithmSigner
 		algorithmSignerRaw, ok := d.GetOk("algorithm_signer")
@@ -685,6 +775,7 @@ func (b *backend) parseRole(role *sshRole) (map[string]interface{}, error) {
 			"allow_user_key_ids":          role.AllowUserKeyIDs,
 			"key_id_format":               role.KeyIDFormat,
 			"key_type":                    role.KeyType,
+			"key_bits":                    role.KeyBits,
 			"default_critical_options":    role.DefaultCriticalOptions,
 			"default_extensions":          role.DefaultExtensions,
 			"default_extensions_template": role.DefaultExtensionsTemplate,
@@ -693,7 +784,23 @@ func (b *backend) parseRole(role *sshRole) (map[string]interface{}, error) {
 			"not_before_duration":         int64(role.NotBeforeDuration.Seconds()),
 		}
 	case KeyTypeDynamic:
-		return nil, fmt.Errorf("dynamic key type roles are no longer supported")
+		result = map[string]interface{}{
+			"key":               role.KeyName,
+			"admin_user":        role.AdminUser,
+			"default_user":      role.DefaultUser,
+			"cidr_list":         role.CIDRList,
+			"exclude_cidr_list": role.ExcludeCIDRList,
+			"port":              role.Port,
+			"key_type":          role.KeyType,
+			"key_bits":          role.KeyBits,
+			"allowed_users":     role.AllowedUsers,
+			"key_option_specs":  role.KeyOptionSpecs,
+			// Returning install script will make the output look messy.
+			// But this is one way for clients to see the script that is
+			// being used to install the key. If there is some problem,
+			// the script can be modified and configured by clients.
+			"install_script": role.InstallScript,
+		}
 	default:
 		return nil, fmt.Errorf("invalid key type: %v", role.KeyType)
 	}
diff --git a/builtin/logical/ssh/path_sign.go b/builtin/logical/ssh/path_sign.go
index 36971ebf4933d..19196013e6d50 100644
--- a/builtin/logical/ssh/path_sign.go
+++ b/builtin/logical/ssh/path_sign.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package ssh
 
 import (
@@ -15,12 +12,6 @@ func pathSign(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "sign/" + framework.GenericNameWithAtRegex("role"),
 
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixSSH,
-			OperationVerb:   "sign",
-			OperationSuffix: "certificate",
-		},
-
 		Callbacks: map[logical.Operation]framework.OperationFunc{
 			logical.UpdateOperation: b.pathSign,
 		},
diff --git a/builtin/logical/ssh/path_verify.go b/builtin/logical/ssh/path_verify.go
index 906272281e568..7d9814751fd12 100644
--- a/builtin/logical/ssh/path_verify.go
+++ b/builtin/logical/ssh/path_verify.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package ssh
 
 import (
@@ -14,11 +11,6 @@ import (
 func pathVerify(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "verify",
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixSSH,
-			OperationVerb:   "verify",
-			OperationSuffix: "otp",
-		},
 		Fields: map[string]*framework.FieldSchema{
 			"otp": {
 				Type:        framework.TypeString,
diff --git a/builtin/logical/ssh/secret_dynamic_key.go b/builtin/logical/ssh/secret_dynamic_key.go
new file mode 100644
index 0000000000000..80b9c5ca0e7c2
--- /dev/null
+++ b/builtin/logical/ssh/secret_dynamic_key.go
@@ -0,0 +1,70 @@
+package ssh
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/hashicorp/vault/sdk/framework"
+	"github.com/hashicorp/vault/sdk/logical"
+	"github.com/mitchellh/mapstructure"
+)
+
+const SecretDynamicKeyType = "secret_dynamic_key_type"
+
+func secretDynamicKey(b *backend) *framework.Secret {
+	return &framework.Secret{
+		Type: SecretDynamicKeyType,
+		Fields: map[string]*framework.FieldSchema{
+			"username": {
+				Type:        framework.TypeString,
+				Description: "Username in host",
+			},
+			"ip": {
+				Type:        framework.TypeString,
+				Description: "IP address of host",
+			},
+		},
+
+		Renew:  b.secretDynamicKeyRenew,
+		Revoke: b.secretDynamicKeyRevoke,
+	}
+}
+
+func (b *backend) secretDynamicKeyRenew(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
+	return &logical.Response{Secret: req.Secret}, nil
+}
+
+func (b *backend) secretDynamicKeyRevoke(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
+	type sec struct {
+		AdminUser        string `mapstructure:"admin_user"`
+		Username         string `mapstructure:"username"`
+		IP               string `mapstructure:"ip"`
+		HostKeyName      string `mapstructure:"host_key_name"`
+		DynamicPublicKey string `mapstructure:"dynamic_public_key"`
+		InstallScript    string `mapstructure:"install_script"`
+		Port             int    `mapstructure:"port"`
+	}
+
+	intSec := &sec{}
+	err := mapstructure.Decode(req.Secret.InternalData, intSec)
+	if err != nil {
+		return nil, fmt.Errorf("secret internal data could not be decoded: %w", err)
+	}
+
+	// Fetch the host key using the key name
+	hostKey, err := b.getKey(ctx, req.Storage, intSec.HostKeyName)
+	if err != nil {
+		return nil, fmt.Errorf("key %q not found error: %w", intSec.HostKeyName, err)
+	}
+	if hostKey == nil {
+		return nil, fmt.Errorf("key %q not found", intSec.HostKeyName)
+	}
+
+	// Remove the public key from authorized_keys file in target machine
+	// The last param 'false' indicates that the key should be uninstalled.
+	err = b.installPublicKeyInTarget(ctx, intSec.AdminUser, intSec.Username, intSec.IP, intSec.Port, hostKey.Key, intSec.DynamicPublicKey, intSec.InstallScript, false)
+	if err != nil {
+		return nil, fmt.Errorf("error removing public key from authorized_keys file in target")
+	}
+	return nil, nil
+}
diff --git a/builtin/logical/ssh/secret_otp.go b/builtin/logical/ssh/secret_otp.go
index a70cf601cfe50..72e9903f16bb1 100644
--- a/builtin/logical/ssh/secret_otp.go
+++ b/builtin/logical/ssh/secret_otp.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package ssh
 
 import (
diff --git a/builtin/logical/ssh/util.go b/builtin/logical/ssh/util.go
index b886750679076..1923caa346b3d 100644
--- a/builtin/logical/ssh/util.go
+++ b/builtin/logical/ssh/util.go
@@ -1,9 +1,7 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package ssh
 
 import (
+	"bytes"
 	"context"
 	"crypto/rand"
 	"crypto/rsa"
@@ -13,7 +11,9 @@ import (
 	"fmt"
 	"net"
 	"strings"
+	"time"
 
+	log "github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/go-secure-stdlib/parseutil"
 	"github.com/hashicorp/vault/sdk/logical"
 	"golang.org/x/crypto/ssh"
@@ -40,6 +40,69 @@ func generateRSAKeys(keyBits int) (publicKeyRsa string, privateKeyRsa string, er
 	return
 }
 
+// Public key and the script to install the key are uploaded to remote machine.
+// Public key is either added or removed from authorized_keys file using the
+// script. Default script is for a Linux machine and hence the path of the
+// authorized_keys file is hard coded to resemble Linux.
+//
+// The last param 'install' if false, uninstalls the key.
+func (b *backend) installPublicKeyInTarget(ctx context.Context, adminUser, username, ip string, port int, hostkey, dynamicPublicKey, installScript string, install bool) error {
+	// Transfer the newly generated public key to remote host under a random
+	// file name. This is to avoid name collisions from other requests.
+	_, publicKeyFileName, err := b.GenerateSaltedOTP(ctx)
+	if err != nil {
+		return err
+	}
+
+	comm, err := createSSHComm(b.Logger(), adminUser, ip, port, hostkey)
+	if err != nil {
+		return err
+	}
+	defer comm.Close()
+
+	err = comm.Upload(publicKeyFileName, bytes.NewBufferString(dynamicPublicKey), nil)
+	if err != nil {
+		return fmt.Errorf("error uploading public key: %w", err)
+	}
+
+	// Transfer the script required to install or uninstall the key to the remote
+	// host under a random file name as well. This is to avoid name collisions
+	// from other requests.
+	scriptFileName := fmt.Sprintf("%s.sh", publicKeyFileName)
+	err = comm.Upload(scriptFileName, bytes.NewBufferString(installScript), nil)
+	if err != nil {
+		return fmt.Errorf("error uploading install script: %w", err)
+	}
+
+	// Create a session to run remote command that triggers the script to install
+	// or uninstall the key.
+	session, err := comm.NewSession()
+	if err != nil {
+		return fmt.Errorf("unable to create SSH Session using public keys: %w", err)
+	}
+	if session == nil {
+		return fmt.Errorf("invalid session object")
+	}
+	defer session.Close()
+
+	authKeysFileName := fmt.Sprintf("/home/%s/.ssh/authorized_keys", username)
+
+	var installOption string
+	if install {
+		installOption = "install"
+	} else {
+		installOption = "uninstall"
+	}
+
+	// Give execute permissions to install script, run and delete it.
+	chmodCmd := fmt.Sprintf("chmod +x %s", scriptFileName)
+	scriptCmd := fmt.Sprintf("./%s %s %s %s", scriptFileName, installOption, publicKeyFileName, authKeysFileName)
+	rmCmd := fmt.Sprintf("rm -f %s", scriptFileName)
+	targetCmd := fmt.Sprintf("%s;%s;%s", chmodCmd, scriptCmd, rmCmd)
+
+	return session.Run(targetCmd)
+}
+
 // Takes an IP address and role name and checks if the IP is part
 // of CIDR blocks belonging to the role.
 func roleContainsIP(ctx context.Context, s logical.Storage, roleName string, ip string) (bool, error) {
@@ -89,6 +152,52 @@ func cidrListContainsIP(ip, cidrList string) (bool, error) {
 	return false, nil
 }
 
+func insecureIgnoreHostWarning(logger log.Logger) ssh.HostKeyCallback {
+	return func(hostname string, remote net.Addr, key ssh.PublicKey) error {
+		logger.Warn("cannot verify server key: host key validation disabled")
+		return nil
+	}
+}
+
+func createSSHComm(logger log.Logger, username, ip string, port int, hostkey string) (*comm, error) {
+	signer, err := ssh.ParsePrivateKey([]byte(hostkey))
+	if err != nil {
+		return nil, err
+	}
+
+	clientConfig := &ssh.ClientConfig{
+		User: username,
+		Auth: []ssh.AuthMethod{
+			ssh.PublicKeys(signer),
+		},
+		HostKeyCallback: insecureIgnoreHostWarning(logger),
+		Timeout:         1 * time.Minute,
+	}
+
+	connfunc := func() (net.Conn, error) {
+		c, err := net.DialTimeout("tcp", fmt.Sprintf("%s:%d", ip, port), 15*time.Second)
+		if err != nil {
+			return nil, err
+		}
+
+		if tcpConn, ok := c.(*net.TCPConn); ok {
+			tcpConn.SetKeepAlive(true)
+			tcpConn.SetKeepAlivePeriod(5 * time.Second)
+		}
+
+		return c, nil
+	}
+	config := &SSHCommConfig{
+		SSHConfig:    clientConfig,
+		Connection:   connfunc,
+		Pty:          false,
+		DisableAgent: true,
+		Logger:       logger,
+	}
+
+	return SSHCommNew(fmt.Sprintf("%s:%d", ip, port), config)
+}
+
 func parsePublicSSHKey(key string) (ssh.PublicKey, error) {
 	keyParts := strings.Split(key, " ")
 	if len(keyParts) > 1 {
diff --git a/builtin/logical/totp/backend.go b/builtin/logical/totp/backend.go
index 5f0cb52c51752..d2494b499549c 100644
--- a/builtin/logical/totp/backend.go
+++ b/builtin/logical/totp/backend.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package totp
 
 import (
@@ -13,8 +10,6 @@ import (
 	cache "github.com/patrickmn/go-cache"
 )
 
-const operationPrefixTOTP = "totp"
-
 func Factory(ctx context.Context, conf *logical.BackendConfig) (logical.Backend, error) {
 	b := Backend()
 	if err := b.Setup(ctx, conf); err != nil {
diff --git a/builtin/logical/totp/backend_test.go b/builtin/logical/totp/backend_test.go
index 12600427f27f0..0b68599df64c7 100644
--- a/builtin/logical/totp/backend_test.go
+++ b/builtin/logical/totp/backend_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package totp
 
 import (
diff --git a/builtin/logical/totp/cmd/totp/main.go b/builtin/logical/totp/cmd/totp/main.go
index 9a2a49bd27551..4c96df7f31466 100644
--- a/builtin/logical/totp/cmd/totp/main.go
+++ b/builtin/logical/totp/cmd/totp/main.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package main
 
 import (
@@ -20,11 +17,9 @@ func main() {
 	tlsConfig := apiClientMeta.GetTLSConfig()
 	tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig)
 
-	if err := plugin.ServeMultiplex(&plugin.ServeOpts{
+	if err := plugin.Serve(&plugin.ServeOpts{
 		BackendFactoryFunc: totp.Factory,
-		// set the TLSProviderFunc so that the plugin maintains backwards
-		// compatibility with Vault versions that don’t support plugin AutoMTLS
-		TLSProviderFunc: tlsProviderFunc,
+		TLSProviderFunc:    tlsProviderFunc,
 	}); err != nil {
 		logger := hclog.New(&hclog.LoggerOptions{})
 
diff --git a/builtin/logical/totp/path_code.go b/builtin/logical/totp/path_code.go
index c792a2905ef01..af56f37da689d 100644
--- a/builtin/logical/totp/path_code.go
+++ b/builtin/logical/totp/path_code.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package totp
 
 import (
@@ -17,12 +14,6 @@ import (
 func pathCode(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "code/" + framework.GenericNameWithAtRegex("name"),
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixTOTP,
-			OperationSuffix: "code",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"name": {
 				Type:        framework.TypeString,
@@ -34,19 +25,9 @@ func pathCode(b *backend) *framework.Path {
 			},
 		},
 
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.ReadOperation: &framework.PathOperation{
-				Callback: b.pathReadCode,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb: "generate",
-				},
-			},
-			logical.UpdateOperation: &framework.PathOperation{
-				Callback: b.pathValidateCode,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb: "validate",
-				},
-			},
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.ReadOperation:   b.pathReadCode,
+			logical.UpdateOperation: b.pathValidateCode,
 		},
 
 		HelpSynopsis:    pathCodeHelpSyn,
diff --git a/builtin/logical/totp/path_keys.go b/builtin/logical/totp/path_keys.go
index 05e8e5aecf5b5..d7f7f2abe323b 100644
--- a/builtin/logical/totp/path_keys.go
+++ b/builtin/logical/totp/path_keys.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package totp
 
 import (
@@ -24,11 +21,6 @@ func pathListKeys(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "keys/?$",
 
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixTOTP,
-			OperationSuffix: "keys",
-		},
-
 		Callbacks: map[logical.Operation]framework.OperationFunc{
 			logical.ListOperation: b.pathKeyList,
 		},
@@ -41,12 +33,6 @@ func pathListKeys(b *backend) *framework.Path {
 func pathKeys(b *backend) *framework.Path {
 	return &framework.Path{
 		Pattern: "keys/" + framework.GenericNameWithAtRegex("name"),
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixTOTP,
-			OperationSuffix: "key",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"name": {
 				Type:        framework.TypeString,
@@ -122,25 +108,10 @@ func pathKeys(b *backend) *framework.Path {
 			},
 		},
 
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.ReadOperation: &framework.PathOperation{
-				Callback: b.pathKeyRead,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb: "read",
-				},
-			},
-			logical.UpdateOperation: &framework.PathOperation{
-				Callback: b.pathKeyCreate,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb: "create",
-				},
-			},
-			logical.DeleteOperation: &framework.PathOperation{
-				Callback: b.pathKeyDelete,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb: "delete",
-				},
-			},
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.ReadOperation:   b.pathKeyRead,
+			logical.UpdateOperation: b.pathKeyCreate,
+			logical.DeleteOperation: b.pathKeyDelete,
 		},
 
 		HelpSynopsis:    pathKeyHelpSyn,
diff --git a/builtin/logical/transit/backend.go b/builtin/logical/transit/backend.go
index 03c3b2fda4e42..391b392c69b0c 100644
--- a/builtin/logical/transit/backend.go
+++ b/builtin/logical/transit/backend.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package transit
 
 import (
@@ -19,12 +16,8 @@ import (
 	"github.com/hashicorp/vault/sdk/logical"
 )
 
-const (
-	operationPrefixTransit = "transit"
-
-	// Minimum cache size for transit backend
-	minCacheSize = 10
-)
+// Minimum cache size for transit backend
+const minCacheSize = 10
 
 func Factory(ctx context.Context, conf *logical.BackendConfig) (logical.Backend, error) {
 	b, err := Backend(ctx, conf)
@@ -50,6 +43,7 @@ func Backend(ctx context.Context, conf *logical.BackendConfig) (*backend, error)
 		Paths: []*framework.Path{
 			// Rotate/Config needs to come before Keys
 			// as the handler is greedy
+			b.pathConfig(),
 			b.pathRotate(),
 			b.pathRewrap(),
 			b.pathWrappingKey(),
@@ -57,9 +51,7 @@ func Backend(ctx context.Context, conf *logical.BackendConfig) (*backend, error)
 			b.pathImportVersion(),
 			b.pathKeys(),
 			b.pathListKeys(),
-			b.pathBYOKExportKeys(),
 			b.pathExportKeys(),
-			b.pathKeysConfig(),
 			b.pathEncrypt(),
 			b.pathDecrypt(),
 			b.pathDatakey(),
@@ -72,7 +64,6 @@ func Backend(ctx context.Context, conf *logical.BackendConfig) (*backend, error)
 			b.pathRestore(),
 			b.pathTrim(),
 			b.pathCacheConfig(),
-			b.pathConfigKeys(),
 		},
 
 		Secrets:      []*framework.Secret{},
@@ -81,8 +72,6 @@ func Backend(ctx context.Context, conf *logical.BackendConfig) (*backend, error)
 		PeriodicFunc: b.periodicFunc,
 	}
 
-	b.backendUUID = conf.BackendUUID
-
 	// determine cacheSize to use. Defaults to 0 which means unlimited
 	cacheSize := 0
 	useCache := !conf.System.CachingDisabled()
@@ -116,7 +105,6 @@ type backend struct {
 	cacheSizeChanged     bool
 	checkAutoRotateAfter time.Time
 	autoRotateOnce       sync.Once
-	backendUUID          string
 }
 
 func GetCacheSizeFromStorage(ctx context.Context, s logical.Storage) (int, error) {
diff --git a/builtin/logical/transit/backend_test.go b/builtin/logical/transit/backend_test.go
index d23c19465ff7f..c4d92a3ddbf57 100644
--- a/builtin/logical/transit/backend_test.go
+++ b/builtin/logical/transit/backend_test.go
@@ -1,18 +1,10 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package transit
 
 import (
 	"context"
-	"crypto"
-	"crypto/ed25519"
 	cryptoRand "crypto/rand"
-	"crypto/x509"
 	"encoding/base64"
-	"encoding/pem"
 	"fmt"
-	"io"
 	"math/rand"
 	"os"
 	"path"
@@ -23,20 +15,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/builtin/logical/pki"
+	uuid "github.com/hashicorp/go-uuid"
 	logicaltest "github.com/hashicorp/vault/helper/testhelpers/logical"
-	vaulthttp "github.com/hashicorp/vault/http"
 	"github.com/hashicorp/vault/sdk/framework"
 	"github.com/hashicorp/vault/sdk/helper/consts"
 	"github.com/hashicorp/vault/sdk/helper/keysutil"
 	"github.com/hashicorp/vault/sdk/logical"
-	"github.com/hashicorp/vault/vault"
-
-	uuid "github.com/hashicorp/go-uuid"
 	"github.com/mitchellh/mapstructure"
-
-	"github.com/stretchr/testify/require"
 )
 
 const (
@@ -304,35 +289,6 @@ func testTransit_RSA(t *testing.T, keyType string) {
 	if !resp.Data["valid"].(bool) {
 		t.Fatalf("failed to verify the RSA signature")
 	}
-
-	// Take a random hash and sign it using PKCSv1_5_NoOID.
-	hash := "P8m2iUWdc4+MiKOkiqnjNUIBa3pAUuABqqU2/KdIE8s="
-	signReq.Data = map[string]interface{}{
-		"input":               hash,
-		"hash_algorithm":      "none",
-		"signature_algorithm": "pkcs1v15",
-		"prehashed":           true,
-	}
-	resp, err = b.HandleRequest(context.Background(), signReq)
-	if err != nil || (resp != nil && resp.IsError()) {
-		t.Fatalf("bad: err: %v\nresp: %#v", err, resp)
-	}
-	signature = resp.Data["signature"].(string)
-
-	verifyReq.Data = map[string]interface{}{
-		"input":               hash,
-		"signature":           signature,
-		"hash_algorithm":      "none",
-		"signature_algorithm": "pkcs1v15",
-		"prehashed":           true,
-	}
-	resp, err = b.HandleRequest(context.Background(), verifyReq)
-	if err != nil || (resp != nil && resp.IsError()) {
-		t.Fatalf("bad: err: %v\nresp: %#v", err, resp)
-	}
-	if !resp.Data["valid"].(bool) {
-		t.Fatalf("failed to verify the RSA signature")
-	}
 }
 
 func TestBackend_basic(t *testing.T) {
@@ -1072,7 +1028,9 @@ func testConvergentEncryptionCommon(t *testing.T, ver int, keyType keysutil.KeyT
 	if err != nil {
 		t.Fatal(err)
 	}
-	require.NotNil(t, resp, "expected populated request")
+	if resp != nil {
+		t.Fatal("expected nil response")
+	}
 
 	p, err := keysutil.LoadPolicy(context.Background(), storage, path.Join("policy", "testkey"))
 	if err != nil {
@@ -1526,8 +1484,8 @@ func testPolicyFuzzingCommon(t *testing.T, be *backend) {
 				// keys start at version 1 so we want [1, latestVersion] not [0, latestVersion)
 				setVersion := (rand.Int() % latestVersion) + 1
 				fd.Raw["min_decryption_version"] = setVersion
-				fd.Schema = be.pathKeysConfig().Fields
-				resp, err = be.pathKeysConfigWrite(context.Background(), req, fd)
+				fd.Schema = be.pathConfig().Fields
+				resp, err = be.pathConfigWrite(context.Background(), req, fd)
 				if err != nil {
 					t.Errorf("got an error setting min decryption version: %v", err)
 				}
@@ -1558,7 +1516,9 @@ func TestBadInput(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	require.NotNil(t, resp, "expected populated request")
+	if resp != nil {
+		t.Fatal("expected nil response")
+	}
 
 	req.Path = "decrypt/test"
 	req.Data = map[string]interface{}{
@@ -1647,7 +1607,9 @@ func TestTransit_AutoRotateKeys(t *testing.T) {
 				if err != nil {
 					t.Fatal(err)
 				}
-				require.NotNil(t, resp, "expected populated request")
+				if resp != nil {
+					t.Fatal("expected nil response")
+				}
 
 				// Write a key with an auto rotate value one day in the future
 				req = &logical.Request{
@@ -1662,7 +1624,9 @@ func TestTransit_AutoRotateKeys(t *testing.T) {
 				if err != nil {
 					t.Fatal(err)
 				}
-				require.NotNil(t, resp, "expected populated request")
+				if resp != nil {
+					t.Fatal("expected nil response")
+				}
 
 				// Run the rotation check and ensure none of the keys have rotated
 				b.checkAutoRotateAfter = time.Now()
@@ -1753,546 +1717,3 @@ func TestTransit_AutoRotateKeys(t *testing.T) {
 		)
 	}
 }
-
-func TestTransit_AEAD(t *testing.T) {
-	testTransit_AEAD(t, "aes128-gcm96")
-	testTransit_AEAD(t, "aes256-gcm96")
-	testTransit_AEAD(t, "chacha20-poly1305")
-}
-
-func testTransit_AEAD(t *testing.T, keyType string) {
-	var resp *logical.Response
-	var err error
-	b, storage := createBackendWithStorage(t)
-
-	keyReq := &logical.Request{
-		Path:      "keys/aead",
-		Operation: logical.UpdateOperation,
-		Data: map[string]interface{}{
-			"type": keyType,
-		},
-		Storage: storage,
-	}
-
-	resp, err = b.HandleRequest(context.Background(), keyReq)
-	if err != nil || (resp != nil && resp.IsError()) {
-		t.Fatalf("bad: err: %v\nresp: %#v", err, resp)
-	}
-
-	plaintext := "dGhlIHF1aWNrIGJyb3duIGZveA=="                          // "the quick brown fox"
-	associated := "U3BoaW54IG9mIGJsYWNrIHF1YXJ0eiwganVkZ2UgbXkgdm93Lgo=" // "Sphinx of black quartz, judge my vow."
-
-	// Basic encrypt/decrypt should work.
-	encryptReq := &logical.Request{
-		Path:      "encrypt/aead",
-		Operation: logical.UpdateOperation,
-		Storage:   storage,
-		Data: map[string]interface{}{
-			"plaintext": plaintext,
-		},
-	}
-
-	resp, err = b.HandleRequest(context.Background(), encryptReq)
-	if err != nil || (resp != nil && resp.IsError()) {
-		t.Fatalf("bad: err: %v\nresp: %#v", err, resp)
-	}
-
-	ciphertext1 := resp.Data["ciphertext"].(string)
-
-	decryptReq := &logical.Request{
-		Path:      "decrypt/aead",
-		Operation: logical.UpdateOperation,
-		Storage:   storage,
-		Data: map[string]interface{}{
-			"ciphertext": ciphertext1,
-		},
-	}
-
-	resp, err = b.HandleRequest(context.Background(), decryptReq)
-	if err != nil || (resp != nil && resp.IsError()) {
-		t.Fatalf("bad: err: %v\nresp: %#v", err, resp)
-	}
-
-	decryptedPlaintext := resp.Data["plaintext"]
-
-	if plaintext != decryptedPlaintext {
-		t.Fatalf("bad: plaintext; expected: %q\nactual: %q", plaintext, decryptedPlaintext)
-	}
-
-	// Using associated as ciphertext should fail.
-	decryptReq.Data["ciphertext"] = associated
-	resp, err = b.HandleRequest(context.Background(), decryptReq)
-	if err == nil || (resp != nil && !resp.IsError()) {
-		t.Fatalf("bad expected error: err: %v\nresp: %#v", err, resp)
-	}
-
-	// Redoing the above with additional data should work.
-	encryptReq.Data["associated_data"] = associated
-	resp, err = b.HandleRequest(context.Background(), encryptReq)
-	if err != nil || (resp != nil && resp.IsError()) {
-		t.Fatalf("bad: err: %v\nresp: %#v", err, resp)
-	}
-
-	ciphertext2 := resp.Data["ciphertext"].(string)
-	decryptReq.Data["ciphertext"] = ciphertext2
-	decryptReq.Data["associated_data"] = associated
-
-	resp, err = b.HandleRequest(context.Background(), decryptReq)
-	if err != nil || (resp != nil && resp.IsError()) {
-		t.Fatalf("bad: err: %v\nresp: %#v", err, resp)
-	}
-
-	decryptedPlaintext = resp.Data["plaintext"]
-	if plaintext != decryptedPlaintext {
-		t.Fatalf("bad: plaintext; expected: %q\nactual: %q", plaintext, decryptedPlaintext)
-	}
-
-	// Removing the associated_data should break the decryption.
-	decryptReq.Data = map[string]interface{}{
-		"ciphertext": ciphertext2,
-	}
-	resp, err = b.HandleRequest(context.Background(), decryptReq)
-	if err == nil || (resp != nil && !resp.IsError()) {
-		t.Fatalf("bad expected error: err: %v\nresp: %#v", err, resp)
-	}
-
-	// Using a valid ciphertext with associated_data should also break the
-	// decryption.
-	decryptReq.Data["ciphertext"] = ciphertext1
-	decryptReq.Data["associated_data"] = associated
-	resp, err = b.HandleRequest(context.Background(), decryptReq)
-	if err == nil || (resp != nil && !resp.IsError()) {
-		t.Fatalf("bad expected error: err: %v\nresp: %#v", err, resp)
-	}
-}
-
-// Hack: use Transit as a signer.
-type transitKey struct {
-	public any
-	mount  string
-	name   string
-	t      *testing.T
-	client *api.Client
-}
-
-func (k *transitKey) Public() crypto.PublicKey {
-	return k.public
-}
-
-func (k *transitKey) Sign(_ io.Reader, digest []byte, opts crypto.SignerOpts) (signature []byte, err error) {
-	hash := opts.(crypto.Hash)
-	if hash.String() != "SHA-256" {
-		return nil, fmt.Errorf("unknown hash algorithm: %v", opts)
-	}
-
-	resp, err := k.client.Logical().Write(k.mount+"/sign/"+k.name, map[string]interface{}{
-		"hash_algorithm":      "sha2-256",
-		"input":               base64.StdEncoding.EncodeToString(digest),
-		"prehashed":           true,
-		"signature_algorithm": "pkcs1v15",
-	})
-	if err != nil {
-		return nil, fmt.Errorf("failed to sign data: %w", err)
-	}
-	require.NotNil(k.t, resp)
-	require.NotNil(k.t, resp.Data)
-	require.NotNil(k.t, resp.Data["signature"])
-	rawSig := resp.Data["signature"].(string)
-	sigParts := strings.Split(rawSig, ":")
-
-	decoded, err := base64.StdEncoding.DecodeString(sigParts[2])
-	if err != nil {
-		return nil, fmt.Errorf("failed to decode signature (%v): %w", rawSig, err)
-	}
-
-	return decoded, nil
-}
-
-func TestTransitPKICSR(t *testing.T) {
-	coreConfig := &vault.CoreConfig{
-		LogicalBackends: map[string]logical.Factory{
-			"transit": Factory,
-			"pki":     pki.Factory,
-		},
-	}
-
-	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
-		HandlerFunc: vaulthttp.Handler,
-	})
-	cluster.Start()
-	defer cluster.Cleanup()
-
-	cores := cluster.Cores
-
-	vault.TestWaitActive(t, cores[0].Core)
-
-	client := cores[0].Client
-
-	// Mount transit, write a key.
-	err := client.Sys().Mount("transit", &api.MountInput{
-		Type: "transit",
-	})
-	require.NoError(t, err)
-
-	_, err = client.Logical().Write("transit/keys/leaf", map[string]interface{}{
-		"type": "rsa-2048",
-	})
-	require.NoError(t, err)
-
-	resp, err := client.Logical().Read("transit/keys/leaf")
-	require.NoError(t, err)
-	require.NotNil(t, resp)
-
-	keys := resp.Data["keys"].(map[string]interface{})
-	require.NotNil(t, keys)
-	keyData := keys["1"].(map[string]interface{})
-	require.NotNil(t, keyData)
-	keyPublic := keyData["public_key"].(string)
-	require.NotEmpty(t, keyPublic)
-
-	pemBlock, _ := pem.Decode([]byte(keyPublic))
-	require.NotNil(t, pemBlock)
-	pubKey, err := x509.ParsePKIXPublicKey(pemBlock.Bytes)
-	require.NoError(t, err)
-	require.NotNil(t, pubKey)
-
-	// Setup a new CSR...
-	var reqTemplate x509.CertificateRequest
-	reqTemplate.PublicKey = pubKey
-	reqTemplate.PublicKeyAlgorithm = x509.RSA
-	reqTemplate.Subject.CommonName = "dadgarcorp.com"
-
-	var k transitKey
-	k.public = pubKey
-	k.mount = "transit"
-	k.name = "leaf"
-	k.t = t
-	k.client = client
-
-	req, err := x509.CreateCertificateRequest(cryptoRand.Reader, &reqTemplate, &k)
-	require.NoError(t, err)
-	require.NotNil(t, req)
-
-	reqPEM := pem.EncodeToMemory(&pem.Block{
-		Type:  "CERTIFICATE REQUEST",
-		Bytes: req,
-	})
-	t.Logf("csr: %v", string(reqPEM))
-
-	// Mount PKI, generate a root, sign this CSR.
-	err = client.Sys().Mount("pki", &api.MountInput{
-		Type: "pki",
-	})
-	require.NoError(t, err)
-
-	resp, err = client.Logical().Write("pki/root/generate/internal", map[string]interface{}{
-		"common_name": "PKI Root X1",
-	})
-	require.NoError(t, err)
-	require.NotNil(t, resp)
-	rootCertPEM := resp.Data["certificate"].(string)
-
-	pemBlock, _ = pem.Decode([]byte(rootCertPEM))
-	require.NotNil(t, pemBlock)
-
-	rootCert, err := x509.ParseCertificate(pemBlock.Bytes)
-	require.NoError(t, err)
-
-	resp, err = client.Logical().Write("pki/issuer/default/sign-verbatim", map[string]interface{}{
-		"csr": string(reqPEM),
-		"ttl": "10m",
-	})
-	require.NoError(t, err)
-	require.NotNil(t, resp)
-
-	leafCertPEM := resp.Data["certificate"].(string)
-	pemBlock, _ = pem.Decode([]byte(leafCertPEM))
-	require.NotNil(t, pemBlock)
-
-	leafCert, err := x509.ParseCertificate(pemBlock.Bytes)
-	require.NoError(t, err)
-	require.NoError(t, leafCert.CheckSignatureFrom(rootCert))
-	t.Logf("root: %v", rootCertPEM)
-	t.Logf("leaf: %v", leafCertPEM)
-}
-
-func TestTransit_ReadPublicKeyImported(t *testing.T) {
-	testTransit_ReadPublicKeyImported(t, "rsa-2048")
-	testTransit_ReadPublicKeyImported(t, "ecdsa-p256")
-	testTransit_ReadPublicKeyImported(t, "ed25519")
-}
-
-func testTransit_ReadPublicKeyImported(t *testing.T, keyType string) {
-	generateKeys(t)
-	b, s := createBackendWithStorage(t)
-	keyID, err := uuid.GenerateUUID()
-	if err != nil {
-		t.Fatalf("failed to generate key ID: %s", err)
-	}
-
-	// Get key
-	privateKey := getKey(t, keyType)
-	publicKeyBytes, err := getPublicKey(privateKey, keyType)
-	if err != nil {
-		t.Fatalf("failed to extract the public key: %s", err)
-	}
-
-	// Import key
-	importReq := &logical.Request{
-		Storage:   s,
-		Operation: logical.UpdateOperation,
-		Path:      fmt.Sprintf("keys/%s/import", keyID),
-		Data: map[string]interface{}{
-			"public_key": publicKeyBytes,
-			"type":       keyType,
-		},
-	}
-	importResp, err := b.HandleRequest(context.Background(), importReq)
-	if err != nil || (importResp != nil && importResp.IsError()) {
-		t.Fatalf("failed to import public key. err: %s\nresp: %#v", err, importResp)
-	}
-
-	// Read key
-	readReq := &logical.Request{
-		Operation: logical.ReadOperation,
-		Path:      "keys/" + keyID,
-		Storage:   s,
-	}
-
-	readResp, err := b.HandleRequest(context.Background(), readReq)
-	if err != nil || (readResp != nil && readResp.IsError()) {
-		t.Fatalf("failed to read key. err: %s\nresp: %#v", err, readResp)
-	}
-}
-
-func TestTransit_SignWithImportedPublicKey(t *testing.T) {
-	testTransit_SignWithImportedPublicKey(t, "rsa-2048")
-	testTransit_SignWithImportedPublicKey(t, "ecdsa-p256")
-	testTransit_SignWithImportedPublicKey(t, "ed25519")
-}
-
-func testTransit_SignWithImportedPublicKey(t *testing.T, keyType string) {
-	generateKeys(t)
-	b, s := createBackendWithStorage(t)
-	keyID, err := uuid.GenerateUUID()
-	if err != nil {
-		t.Fatalf("failed to generate key ID: %s", err)
-	}
-
-	// Get key
-	privateKey := getKey(t, keyType)
-	publicKeyBytes, err := getPublicKey(privateKey, keyType)
-	if err != nil {
-		t.Fatalf("failed to extract the public key: %s", err)
-	}
-
-	// Import key
-	importReq := &logical.Request{
-		Storage:   s,
-		Operation: logical.UpdateOperation,
-		Path:      fmt.Sprintf("keys/%s/import", keyID),
-		Data: map[string]interface{}{
-			"public_key": publicKeyBytes,
-			"type":       keyType,
-		},
-	}
-	importResp, err := b.HandleRequest(context.Background(), importReq)
-	if err != nil || (importResp != nil && importResp.IsError()) {
-		t.Fatalf("failed to import public key. err: %s\nresp: %#v", err, importResp)
-	}
-
-	// Sign text
-	signReq := &logical.Request{
-		Path:      "sign/" + keyID,
-		Operation: logical.UpdateOperation,
-		Storage:   s,
-		Data: map[string]interface{}{
-			"plaintext": base64.StdEncoding.EncodeToString([]byte(testPlaintext)),
-		},
-	}
-
-	_, err = b.HandleRequest(context.Background(), signReq)
-	if err == nil {
-		t.Fatalf("expected error, should have failed to sign input")
-	}
-}
-
-func TestTransit_VerifyWithImportedPublicKey(t *testing.T) {
-	generateKeys(t)
-	keyType := "rsa-2048"
-	b, s := createBackendWithStorage(t)
-	keyID, err := uuid.GenerateUUID()
-	if err != nil {
-		t.Fatalf("failed to generate key ID: %s", err)
-	}
-
-	// Get key
-	privateKey := getKey(t, keyType)
-	publicKeyBytes, err := getPublicKey(privateKey, keyType)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Retrieve public wrapping key
-	wrappingKey, err := b.getWrappingKey(context.Background(), s)
-	if err != nil || wrappingKey == nil {
-		t.Fatalf("failed to retrieve public wrapping key: %s", err)
-	}
-
-	privWrappingKey := wrappingKey.Keys[strconv.Itoa(wrappingKey.LatestVersion)].RSAKey
-	pubWrappingKey := &privWrappingKey.PublicKey
-
-	// generate ciphertext
-	importBlob := wrapTargetKeyForImport(t, pubWrappingKey, privateKey, keyType, "SHA256")
-
-	// Import private key
-	importReq := &logical.Request{
-		Storage:   s,
-		Operation: logical.UpdateOperation,
-		Path:      fmt.Sprintf("keys/%s/import", keyID),
-		Data: map[string]interface{}{
-			"ciphertext": importBlob,
-			"type":       keyType,
-		},
-	}
-	importResp, err := b.HandleRequest(context.Background(), importReq)
-	if err != nil || (importResp != nil && importResp.IsError()) {
-		t.Fatalf("failed to import key. err: %s\nresp: %#v", err, importResp)
-	}
-
-	// Sign text
-	signReq := &logical.Request{
-		Storage:   s,
-		Path:      "sign/" + keyID,
-		Operation: logical.UpdateOperation,
-		Data: map[string]interface{}{
-			"plaintext": base64.StdEncoding.EncodeToString([]byte(testPlaintext)),
-		},
-	}
-
-	signResp, err := b.HandleRequest(context.Background(), signReq)
-	if err != nil || (signResp != nil && signResp.IsError()) {
-		t.Fatalf("failed to sign plaintext. err: %s\nresp: %#v", err, signResp)
-	}
-
-	// Get signature
-	signature := signResp.Data["signature"].(string)
-
-	// Import new key as public key
-	importPubReq := &logical.Request{
-		Storage:   s,
-		Operation: logical.UpdateOperation,
-		Path:      fmt.Sprintf("keys/%s/import", "public-key-rsa"),
-		Data: map[string]interface{}{
-			"public_key": publicKeyBytes,
-			"type":       keyType,
-		},
-	}
-	importPubResp, err := b.HandleRequest(context.Background(), importPubReq)
-	if err != nil || (importPubResp != nil && importPubResp.IsError()) {
-		t.Fatalf("failed to import public key. err: %s\nresp: %#v", err, importPubResp)
-	}
-
-	// Verify signed text
-	verifyReq := &logical.Request{
-		Path:      "verify/public-key-rsa",
-		Operation: logical.UpdateOperation,
-		Storage:   s,
-		Data: map[string]interface{}{
-			"input":     base64.StdEncoding.EncodeToString([]byte(testPlaintext)),
-			"signature": signature,
-		},
-	}
-
-	verifyResp, err := b.HandleRequest(context.Background(), verifyReq)
-	if err != nil || (importResp != nil && verifyResp.IsError()) {
-		t.Fatalf("failed to verify signed data. err: %s\nresp: %#v", err, importResp)
-	}
-}
-
-func TestTransit_ExportPublicKeyImported(t *testing.T) {
-	testTransit_ExportPublicKeyImported(t, "rsa-2048")
-	testTransit_ExportPublicKeyImported(t, "ecdsa-p256")
-	testTransit_ExportPublicKeyImported(t, "ed25519")
-}
-
-func testTransit_ExportPublicKeyImported(t *testing.T, keyType string) {
-	generateKeys(t)
-	b, s := createBackendWithStorage(t)
-	keyID, err := uuid.GenerateUUID()
-	if err != nil {
-		t.Fatalf("failed to generate key ID: %s", err)
-	}
-
-	// Get key
-	privateKey := getKey(t, keyType)
-	publicKeyBytes, err := getPublicKey(privateKey, keyType)
-	if err != nil {
-		t.Fatalf("failed to extract the public key: %s", err)
-	}
-
-	t.Logf("generated key: %v", string(publicKeyBytes))
-
-	// Import key
-	importReq := &logical.Request{
-		Storage:   s,
-		Operation: logical.UpdateOperation,
-		Path:      fmt.Sprintf("keys/%s/import", keyID),
-		Data: map[string]interface{}{
-			"public_key": publicKeyBytes,
-			"type":       keyType,
-			"exportable": true,
-		},
-	}
-	importResp, err := b.HandleRequest(context.Background(), importReq)
-	if err != nil || (importResp != nil && importResp.IsError()) {
-		t.Fatalf("failed to import public key. err: %s\nresp: %#v", err, importResp)
-	}
-
-	t.Logf("importing key: %v", importResp)
-
-	// Export key
-	exportReq := &logical.Request{
-		Operation: logical.ReadOperation,
-		Path:      fmt.Sprintf("export/public-key/%s/latest", keyID),
-		Storage:   s,
-	}
-
-	exportResp, err := b.HandleRequest(context.Background(), exportReq)
-	if err != nil || (exportResp != nil && exportResp.IsError()) {
-		t.Fatalf("failed to export key. err: %v\nresp: %#v", err, exportResp)
-	}
-
-	t.Logf("exporting key: %v", exportResp)
-
-	responseKeys, exist := exportResp.Data["keys"]
-	if !exist {
-		t.Fatal("expected response data to hold a 'keys' field")
-	}
-
-	exportedKeyBytes := responseKeys.(map[string]string)["1"]
-
-	if keyType != "ed25519" {
-		exportedKeyBlock, _ := pem.Decode([]byte(exportedKeyBytes))
-		publicKeyBlock, _ := pem.Decode(publicKeyBytes)
-
-		if !reflect.DeepEqual(publicKeyBlock.Bytes, exportedKeyBlock.Bytes) {
-			t.Fatalf("exported key bytes should have matched with imported key for key type: %v\nexported: %v\nimported: %v", keyType, exportedKeyBlock.Bytes, publicKeyBlock.Bytes)
-		}
-	} else {
-		exportedKey, err := base64.StdEncoding.DecodeString(exportedKeyBytes)
-		if err != nil {
-			t.Fatalf("error decoding exported key bytes (%v) to base64 for key type %v: %v", exportedKeyBytes, keyType, err)
-		}
-
-		publicKeyBlock, _ := pem.Decode(publicKeyBytes)
-		publicKeyParsed, err := x509.ParsePKIXPublicKey(publicKeyBlock.Bytes)
-		if err != nil {
-			t.Fatalf("error decoding source key bytes (%v) from PKIX marshaling for key type %v: %v", publicKeyBlock.Bytes, keyType, err)
-		}
-
-		if !reflect.DeepEqual([]byte(publicKeyParsed.(ed25519.PublicKey)), exportedKey) {
-			t.Fatalf("exported key bytes should have matched with imported key for key type: %v\nexported: %v\nimported: %v", keyType, exportedKey, publicKeyParsed)
-		}
-	}
-}
diff --git a/builtin/logical/transit/cmd/transit/main.go b/builtin/logical/transit/cmd/transit/main.go
index 7e2ae8777bdc5..25d4675b90830 100644
--- a/builtin/logical/transit/cmd/transit/main.go
+++ b/builtin/logical/transit/cmd/transit/main.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package main
 
 import (
@@ -20,11 +17,9 @@ func main() {
 	tlsConfig := apiClientMeta.GetTLSConfig()
 	tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig)
 
-	if err := plugin.ServeMultiplex(&plugin.ServeOpts{
+	if err := plugin.Serve(&plugin.ServeOpts{
 		BackendFactoryFunc: transit.Factory,
-		// set the TLSProviderFunc so that the plugin maintains backwards
-		// compatibility with Vault versions that don’t support plugin AutoMTLS
-		TLSProviderFunc: tlsProviderFunc,
+		TLSProviderFunc:    tlsProviderFunc,
 	}); err != nil {
 		logger := hclog.New(&hclog.LoggerOptions{})
 
diff --git a/builtin/logical/transit/managed_key_util.go b/builtin/logical/transit/managed_key_util.go
deleted file mode 100644
index c4dc1e9fe0d37..0000000000000
--- a/builtin/logical/transit/managed_key_util.go
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-//go:build !enterprise
-
-package transit
-
-import (
-	"context"
-	"errors"
-)
-
-var errEntOnly = errors.New("managed keys are supported within enterprise edition only")
-
-func GetManagedKeyUUID(ctx context.Context, b *backend, keyName string, keyId string) (uuid string, err error) {
-	return "", errEntOnly
-}
diff --git a/builtin/logical/transit/path_backup.go b/builtin/logical/transit/path_backup.go
index 93833423387d7..ef13f0aab88cd 100644
--- a/builtin/logical/transit/path_backup.go
+++ b/builtin/logical/transit/path_backup.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package transit
 
 import (
@@ -13,13 +10,6 @@ import (
 func (b *backend) pathBackup() *framework.Path {
 	return &framework.Path{
 		Pattern: "backup/" + framework.GenericNameRegex("name"),
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixTransit,
-			OperationVerb:   "back-up",
-			OperationSuffix: "key",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"name": {
 				Type:        framework.TypeString,
diff --git a/builtin/logical/transit/path_backup_test.go b/builtin/logical/transit/path_backup_test.go
index 3627d6b702a77..d8a54d70fcc13 100644
--- a/builtin/logical/transit/path_backup_test.go
+++ b/builtin/logical/transit/path_backup_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package transit
 
 import (
diff --git a/builtin/logical/transit/path_byok.go b/builtin/logical/transit/path_byok.go
deleted file mode 100644
index 40f7cac1a472e..0000000000000
--- a/builtin/logical/transit/path_byok.go
+++ /dev/null
@@ -1,206 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package transit
-
-import (
-	"context"
-	"crypto/ecdsa"
-	"crypto/ed25519"
-	"crypto/elliptic"
-	"errors"
-	"fmt"
-	"strconv"
-	"strings"
-
-	"github.com/hashicorp/vault/sdk/framework"
-	"github.com/hashicorp/vault/sdk/helper/keysutil"
-	"github.com/hashicorp/vault/sdk/logical"
-)
-
-func (b *backend) pathBYOKExportKeys() *framework.Path {
-	return &framework.Path{
-		Pattern: "byok-export/" + framework.GenericNameRegex("destination") + "/" + framework.GenericNameRegex("source") + framework.OptionalParamRegex("version"),
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixTransit,
-			OperationVerb:   "byok",
-			OperationSuffix: "key|key-version",
-		},
-
-		Fields: map[string]*framework.FieldSchema{
-			"destination": {
-				Type:        framework.TypeString,
-				Description: "Destination key to export to; usually the public wrapping key of another Transit instance.",
-			},
-			"source": {
-				Type:        framework.TypeString,
-				Description: "Source key to export; could be any present key within Transit.",
-			},
-			"version": {
-				Type:        framework.TypeString,
-				Description: "Optional version of the key to export, else all key versions are exported.",
-			},
-			"hash": {
-				Type:        framework.TypeString,
-				Description: "Hash function to use for inner OAEP encryption. Defaults to SHA256.",
-				Default:     "SHA256",
-			},
-		},
-
-		Callbacks: map[logical.Operation]framework.OperationFunc{
-			logical.ReadOperation: b.pathPolicyBYOKExportRead,
-		},
-
-		HelpSynopsis:    pathBYOKExportHelpSyn,
-		HelpDescription: pathBYOKExportHelpDesc,
-	}
-}
-
-func (b *backend) pathPolicyBYOKExportRead(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
-	dst := d.Get("destination").(string)
-	src := d.Get("source").(string)
-	version := d.Get("version").(string)
-	hash := d.Get("hash").(string)
-
-	dstP, _, err := b.GetPolicy(ctx, keysutil.PolicyRequest{
-		Storage: req.Storage,
-		Name:    dst,
-	}, b.GetRandomReader())
-	if err != nil {
-		return nil, err
-	}
-	if dstP == nil {
-		return nil, fmt.Errorf("no such destination key to export to")
-	}
-	if !b.System().CachingDisabled() {
-		dstP.Lock(false)
-	}
-	defer dstP.Unlock()
-
-	srcP, _, err := b.GetPolicy(ctx, keysutil.PolicyRequest{
-		Storage: req.Storage,
-		Name:    src,
-	}, b.GetRandomReader())
-	if err != nil {
-		return nil, err
-	}
-	if srcP == nil {
-		return nil, fmt.Errorf("no such source key for export")
-	}
-	if !b.System().CachingDisabled() {
-		srcP.Lock(false)
-	}
-	defer srcP.Unlock()
-
-	if !srcP.Exportable {
-		return logical.ErrorResponse("key is not exportable"), nil
-	}
-
-	retKeys := map[string]string{}
-	switch version {
-	case "":
-		for k, v := range srcP.Keys {
-			exportKey, err := getBYOKExportKey(dstP, srcP, &v, hash)
-			if err != nil {
-				return nil, err
-			}
-			retKeys[k] = exportKey
-		}
-
-	default:
-		var versionValue int
-		if version == "latest" {
-			versionValue = srcP.LatestVersion
-		} else {
-			version = strings.TrimPrefix(version, "v")
-			versionValue, err = strconv.Atoi(version)
-			if err != nil {
-				return logical.ErrorResponse("invalid key version"), logical.ErrInvalidRequest
-			}
-		}
-
-		if versionValue < srcP.MinDecryptionVersion {
-			return logical.ErrorResponse("version for export is below minimum decryption version"), logical.ErrInvalidRequest
-		}
-		key, ok := srcP.Keys[strconv.Itoa(versionValue)]
-		if !ok {
-			return logical.ErrorResponse("version does not exist or cannot be found"), logical.ErrInvalidRequest
-		}
-
-		exportKey, err := getBYOKExportKey(dstP, srcP, &key, hash)
-		if err != nil {
-			return nil, err
-		}
-
-		retKeys[strconv.Itoa(versionValue)] = exportKey
-	}
-
-	resp := &logical.Response{
-		Data: map[string]interface{}{
-			"name": srcP.Name,
-			"type": srcP.Type.String(),
-			"keys": retKeys,
-		},
-	}
-
-	return resp, nil
-}
-
-func getBYOKExportKey(dstP *keysutil.Policy, srcP *keysutil.Policy, key *keysutil.KeyEntry, hash string) (string, error) {
-	if dstP == nil || srcP == nil {
-		return "", errors.New("nil policy provided")
-	}
-
-	var targetKey interface{}
-	switch srcP.Type {
-	case keysutil.KeyType_AES128_GCM96, keysutil.KeyType_AES256_GCM96, keysutil.KeyType_ChaCha20_Poly1305, keysutil.KeyType_HMAC:
-		targetKey = key.Key
-	case keysutil.KeyType_RSA2048, keysutil.KeyType_RSA3072, keysutil.KeyType_RSA4096:
-		targetKey = key.RSAKey
-	case keysutil.KeyType_ECDSA_P256, keysutil.KeyType_ECDSA_P384, keysutil.KeyType_ECDSA_P521:
-		var curve elliptic.Curve
-		switch srcP.Type {
-		case keysutil.KeyType_ECDSA_P384:
-			curve = elliptic.P384()
-		case keysutil.KeyType_ECDSA_P521:
-			curve = elliptic.P521()
-		default:
-			curve = elliptic.P256()
-		}
-		pubKey := ecdsa.PublicKey{
-			Curve: curve,
-			X:     key.EC_X,
-			Y:     key.EC_Y,
-		}
-		targetKey = &ecdsa.PrivateKey{
-			PublicKey: pubKey,
-			D:         key.EC_D,
-		}
-	case keysutil.KeyType_ED25519:
-		targetKey = ed25519.PrivateKey(key.Key)
-	default:
-		return "", fmt.Errorf("unable to export to unknown key type: %v", srcP.Type)
-	}
-
-	hasher, err := parseHashFn(hash)
-	if err != nil {
-		return "", err
-	}
-
-	return dstP.WrapKey(0, targetKey, srcP.Type, hasher)
-}
-
-const pathBYOKExportHelpSyn = `Securely export named encryption or signing key`
-
-const pathBYOKExportHelpDesc = `
-This path is used to export the named keys that are configured as
-exportable.
-
-Unlike the regular /export/:name[/:version] paths, this path uses
-the same encryption specification /import, allowing secure migration
-of keys between clusters to enable workloads to communicate between
-them.
-
-Presently this only works for RSA destination keys.
-`
diff --git a/builtin/logical/transit/path_byok_test.go b/builtin/logical/transit/path_byok_test.go
deleted file mode 100644
index a05a719ea4f21..0000000000000
--- a/builtin/logical/transit/path_byok_test.go
+++ /dev/null
@@ -1,229 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package transit
-
-import (
-	"context"
-	"testing"
-
-	"github.com/hashicorp/vault/sdk/logical"
-)
-
-func TestTransit_BYOKExportImport(t *testing.T) {
-	// Test encryption/decryption after a restore for supported keys
-	testBYOKExportImport(t, "aes128-gcm96", "encrypt-decrypt")
-	testBYOKExportImport(t, "aes256-gcm96", "encrypt-decrypt")
-	testBYOKExportImport(t, "chacha20-poly1305", "encrypt-decrypt")
-	testBYOKExportImport(t, "rsa-2048", "encrypt-decrypt")
-	testBYOKExportImport(t, "rsa-3072", "encrypt-decrypt")
-	testBYOKExportImport(t, "rsa-4096", "encrypt-decrypt")
-
-	// Test signing/verification after a restore for supported keys
-	testBYOKExportImport(t, "ecdsa-p256", "sign-verify")
-	testBYOKExportImport(t, "ecdsa-p384", "sign-verify")
-	testBYOKExportImport(t, "ecdsa-p521", "sign-verify")
-	testBYOKExportImport(t, "ed25519", "sign-verify")
-	testBYOKExportImport(t, "rsa-2048", "sign-verify")
-	testBYOKExportImport(t, "rsa-3072", "sign-verify")
-	testBYOKExportImport(t, "rsa-4096", "sign-verify")
-
-	// Test HMAC sign/verify after a restore for supported keys.
-	testBYOKExportImport(t, "hmac", "hmac-verify")
-}
-
-func testBYOKExportImport(t *testing.T, keyType, feature string) {
-	var resp *logical.Response
-	var err error
-
-	b, s := createBackendWithStorage(t)
-
-	// Create a key
-	keyReq := &logical.Request{
-		Path:      "keys/test-source",
-		Operation: logical.UpdateOperation,
-		Storage:   s,
-		Data: map[string]interface{}{
-			"type":       keyType,
-			"exportable": true,
-		},
-	}
-	if keyType == "hmac" {
-		keyReq.Data["key_size"] = 32
-	}
-	resp, err = b.HandleRequest(context.Background(), keyReq)
-	if err != nil || (resp != nil && resp.IsError()) {
-		t.Fatalf("resp: %#v\nerr: %v", resp, err)
-	}
-
-	// Read the wrapping key.
-	wrapKeyReq := &logical.Request{
-		Path:      "wrapping_key",
-		Operation: logical.ReadOperation,
-		Storage:   s,
-	}
-	resp, err = b.HandleRequest(context.Background(), wrapKeyReq)
-	if err != nil || (resp != nil && resp.IsError()) {
-		t.Fatalf("resp: %#v\nerr: %v", resp, err)
-	}
-
-	// Import the wrapping key.
-	wrapKeyImportReq := &logical.Request{
-		Path:      "keys/wrapper/import",
-		Operation: logical.UpdateOperation,
-		Storage:   s,
-		Data: map[string]interface{}{
-			"public_key": resp.Data["public_key"],
-			"type":       "rsa-4096",
-		},
-	}
-	resp, err = b.HandleRequest(context.Background(), wrapKeyImportReq)
-	if err != nil || (resp != nil && resp.IsError()) {
-		t.Fatalf("resp: %#v\nerr: %v", resp, err)
-	}
-
-	// Export the key
-	backupReq := &logical.Request{
-		Path:      "byok-export/wrapper/test-source",
-		Operation: logical.ReadOperation,
-		Storage:   s,
-	}
-	resp, err = b.HandleRequest(context.Background(), backupReq)
-	if err != nil || (resp != nil && resp.IsError()) {
-		t.Fatalf("resp: %#v\nerr: %v", resp, err)
-	}
-	keys := resp.Data["keys"].(map[string]string)
-
-	// Import the key to a new name.
-	restoreReq := &logical.Request{
-		Path:      "keys/test/import",
-		Operation: logical.UpdateOperation,
-		Storage:   s,
-		Data: map[string]interface{}{
-			"ciphertext": keys["1"],
-			"type":       keyType,
-		},
-	}
-	resp, err = b.HandleRequest(context.Background(), restoreReq)
-	if err != nil || (resp != nil && resp.IsError()) {
-		t.Fatalf("resp: %#v\nerr: %v", resp, err)
-	}
-
-	plaintextB64 := "dGhlIHF1aWNrIGJyb3duIGZveA==" // "the quick brown fox"
-	// Perform encryption, signing or hmac-ing based on the set 'feature'
-	var encryptReq, signReq, hmacReq *logical.Request
-	var ciphertext, signature, hmac string
-	switch feature {
-	case "encrypt-decrypt":
-		encryptReq = &logical.Request{
-			Path:      "encrypt/test-source",
-			Operation: logical.UpdateOperation,
-			Storage:   s,
-			Data: map[string]interface{}{
-				"plaintext": plaintextB64,
-			},
-		}
-		resp, err = b.HandleRequest(context.Background(), encryptReq)
-		if err != nil || (resp != nil && resp.IsError()) {
-			t.Fatalf("resp: %#v\nerr: %v", resp, err)
-		}
-		ciphertext = resp.Data["ciphertext"].(string)
-
-	case "sign-verify":
-		signReq = &logical.Request{
-			Path:      "sign/test-source",
-			Operation: logical.UpdateOperation,
-			Storage:   s,
-			Data: map[string]interface{}{
-				"input": plaintextB64,
-			},
-		}
-		resp, err = b.HandleRequest(context.Background(), signReq)
-		if err != nil || (resp != nil && resp.IsError()) {
-			t.Fatalf("resp: %#v\nerr: %v", resp, err)
-		}
-		signature = resp.Data["signature"].(string)
-
-	case "hmac-verify":
-		hmacReq = &logical.Request{
-			Path:      "hmac/test-source",
-			Operation: logical.UpdateOperation,
-			Storage:   s,
-			Data: map[string]interface{}{
-				"input": plaintextB64,
-			},
-		}
-		resp, err = b.HandleRequest(context.Background(), hmacReq)
-		if err != nil || (resp != nil && resp.IsError()) {
-			t.Fatalf("resp: %#v\nerr: %v", resp, err)
-		}
-		hmac = resp.Data["hmac"].(string)
-	}
-
-	// validationFunc verifies the ciphertext, signature or hmac based on the
-	// set 'feature'
-	validationFunc := func(keyName string) {
-		var decryptReq *logical.Request
-		var verifyReq *logical.Request
-		switch feature {
-		case "encrypt-decrypt":
-			decryptReq = &logical.Request{
-				Path:      "decrypt/" + keyName,
-				Operation: logical.UpdateOperation,
-				Storage:   s,
-				Data: map[string]interface{}{
-					"ciphertext": ciphertext,
-				},
-			}
-			resp, err = b.HandleRequest(context.Background(), decryptReq)
-			if err != nil || (resp != nil && resp.IsError()) {
-				t.Fatalf("resp: %#v\nerr: %v", resp, err)
-			}
-
-			if resp.Data["plaintext"].(string) != plaintextB64 {
-				t.Fatalf("bad: plaintext; expected: %q, actual: %q", plaintextB64, resp.Data["plaintext"].(string))
-			}
-		case "sign-verify":
-			verifyReq = &logical.Request{
-				Path:      "verify/" + keyName,
-				Operation: logical.UpdateOperation,
-				Storage:   s,
-				Data: map[string]interface{}{
-					"signature": signature,
-					"input":     plaintextB64,
-				},
-			}
-			resp, err = b.HandleRequest(context.Background(), verifyReq)
-			if err != nil || (resp != nil && resp.IsError()) {
-				t.Fatalf("resp: %#v\nerr: %v", resp, err)
-			}
-			if resp.Data["valid"].(bool) != true {
-				t.Fatalf("bad: signature verification failed for key type %q", keyType)
-			}
-
-		case "hmac-verify":
-			verifyReq = &logical.Request{
-				Path:      "verify/" + keyName,
-				Operation: logical.UpdateOperation,
-				Storage:   s,
-				Data: map[string]interface{}{
-					"hmac":  hmac,
-					"input": plaintextB64,
-				},
-			}
-			resp, err = b.HandleRequest(context.Background(), verifyReq)
-			if err != nil || (resp != nil && resp.IsError()) {
-				t.Fatalf("resp: %#v\nerr: %v", resp, err)
-			}
-			if resp.Data["valid"].(bool) != true {
-				t.Fatalf("bad: HMAC verification failed for key type %q", keyType)
-			}
-		}
-	}
-
-	// Ensure that the restored key is functional
-	validationFunc("test")
-
-	// Ensure the original key is functional
-	validationFunc("test-source")
-}
diff --git a/builtin/logical/transit/path_cache_config.go b/builtin/logical/transit/path_cache_config.go
index f8f0cea551eed..e7692997668df 100644
--- a/builtin/logical/transit/path_cache_config.go
+++ b/builtin/logical/transit/path_cache_config.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package transit
 
 import (
@@ -14,11 +11,6 @@ import (
 func (b *backend) pathCacheConfig() *framework.Path {
 	return &framework.Path{
 		Pattern: "cache-config",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixTransit,
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"size": {
 				Type:        framework.TypeInt,
@@ -32,27 +24,16 @@ func (b *backend) pathCacheConfig() *framework.Path {
 			logical.ReadOperation: &framework.PathOperation{
 				Callback: b.pathCacheConfigRead,
 				Summary:  "Returns the size of the active cache",
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationSuffix: "cache-configuration",
-				},
 			},
 
 			logical.UpdateOperation: &framework.PathOperation{
 				Callback: b.pathCacheConfigWrite,
 				Summary:  "Configures a new cache of the specified size",
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb:   "configure",
-					OperationSuffix: "cache",
-				},
 			},
 
 			logical.CreateOperation: &framework.PathOperation{
 				Callback: b.pathCacheConfigWrite,
 				Summary:  "Configures a new cache of the specified size",
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb:   "configure",
-					OperationSuffix: "cache",
-				},
 			},
 		},
 
@@ -84,11 +65,7 @@ func (b *backend) pathCacheConfigWrite(ctx context.Context, req *logical.Request
 		return nil, err
 	}
 
-	return &logical.Response{
-		Data: map[string]interface{}{
-			"size": cacheSize,
-		},
-	}, nil
+	return nil, nil
 }
 
 type configCache struct {
diff --git a/builtin/logical/transit/path_cache_config_test.go b/builtin/logical/transit/path_cache_config_test.go
index f5c8316d87892..d8e0a7b56d87a 100644
--- a/builtin/logical/transit/path_cache_config_test.go
+++ b/builtin/logical/transit/path_cache_config_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package transit
 
 import (
diff --git a/builtin/logical/transit/path_config.go b/builtin/logical/transit/path_config.go
new file mode 100644
index 0000000000000..a3d72731b773e
--- /dev/null
+++ b/builtin/logical/transit/path_config.go
@@ -0,0 +1,237 @@
+package transit
+
+import (
+	"context"
+	"fmt"
+	"time"
+
+	"github.com/hashicorp/vault/sdk/framework"
+	"github.com/hashicorp/vault/sdk/helper/keysutil"
+	"github.com/hashicorp/vault/sdk/logical"
+)
+
+func (b *backend) pathConfig() *framework.Path {
+	return &framework.Path{
+		Pattern: "keys/" + framework.GenericNameRegex("name") + "/config",
+		Fields: map[string]*framework.FieldSchema{
+			"name": {
+				Type:        framework.TypeString,
+				Description: "Name of the key",
+			},
+
+			"min_decryption_version": {
+				Type: framework.TypeInt,
+				Description: `If set, the minimum version of the key allowed
+to be decrypted. For signing keys, the minimum
+version allowed to be used for verification.`,
+			},
+
+			"min_encryption_version": {
+				Type: framework.TypeInt,
+				Description: `If set, the minimum version of the key allowed
+to be used for encryption; or for signing keys,
+to be used for signing. If set to zero, only
+the latest version of the key is allowed.`,
+			},
+
+			"deletion_allowed": {
+				Type:        framework.TypeBool,
+				Description: "Whether to allow deletion of the key",
+			},
+
+			"exportable": {
+				Type:        framework.TypeBool,
+				Description: `Enables export of the key. Once set, this cannot be disabled.`,
+			},
+
+			"allow_plaintext_backup": {
+				Type:        framework.TypeBool,
+				Description: `Enables taking a backup of the named key in plaintext format. Once set, this cannot be disabled.`,
+			},
+
+			"auto_rotate_period": {
+				Type: framework.TypeDurationSecond,
+				Description: `Amount of time the key should live before
+being automatically rotated. A value of 0
+disables automatic rotation for the key.`,
+			},
+		},
+
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.UpdateOperation: b.pathConfigWrite,
+		},
+
+		HelpSynopsis:    pathConfigHelpSyn,
+		HelpDescription: pathConfigHelpDesc,
+	}
+}
+
+func (b *backend) pathConfigWrite(ctx context.Context, req *logical.Request, d *framework.FieldData) (resp *logical.Response, retErr error) {
+	name := d.Get("name").(string)
+
+	// Check if the policy already exists before we lock everything
+	p, _, err := b.GetPolicy(ctx, keysutil.PolicyRequest{
+		Storage: req.Storage,
+		Name:    name,
+	}, b.GetRandomReader())
+	if err != nil {
+		return nil, err
+	}
+	if p == nil {
+		return logical.ErrorResponse(
+				fmt.Sprintf("no existing key named %s could be found", name)),
+			logical.ErrInvalidRequest
+	}
+	if !b.System().CachingDisabled() {
+		p.Lock(true)
+	}
+	defer p.Unlock()
+
+	originalMinDecryptionVersion := p.MinDecryptionVersion
+	originalMinEncryptionVersion := p.MinEncryptionVersion
+	originalDeletionAllowed := p.DeletionAllowed
+	originalExportable := p.Exportable
+	originalAllowPlaintextBackup := p.AllowPlaintextBackup
+
+	defer func() {
+		if retErr != nil || (resp != nil && resp.IsError()) {
+			p.MinDecryptionVersion = originalMinDecryptionVersion
+			p.MinEncryptionVersion = originalMinEncryptionVersion
+			p.DeletionAllowed = originalDeletionAllowed
+			p.Exportable = originalExportable
+			p.AllowPlaintextBackup = originalAllowPlaintextBackup
+		}
+	}()
+
+	resp = &logical.Response{}
+
+	persistNeeded := false
+
+	minDecryptionVersionRaw, ok := d.GetOk("min_decryption_version")
+	if ok {
+		minDecryptionVersion := minDecryptionVersionRaw.(int)
+
+		if minDecryptionVersion < 0 {
+			return logical.ErrorResponse("min decryption version cannot be negative"), nil
+		}
+
+		if minDecryptionVersion == 0 {
+			minDecryptionVersion = 1
+			resp.AddWarning("since Vault 0.3, transit key numbering starts at 1; forcing minimum to 1")
+		}
+
+		if minDecryptionVersion != p.MinDecryptionVersion {
+			if minDecryptionVersion > p.LatestVersion {
+				return logical.ErrorResponse(
+					fmt.Sprintf("cannot set min decryption version of %d, latest key version is %d", minDecryptionVersion, p.LatestVersion)), nil
+			}
+			p.MinDecryptionVersion = minDecryptionVersion
+			persistNeeded = true
+		}
+	}
+
+	minEncryptionVersionRaw, ok := d.GetOk("min_encryption_version")
+	if ok {
+		minEncryptionVersion := minEncryptionVersionRaw.(int)
+
+		if minEncryptionVersion < 0 {
+			return logical.ErrorResponse("min encryption version cannot be negative"), nil
+		}
+
+		if minEncryptionVersion != p.MinEncryptionVersion {
+			if minEncryptionVersion > p.LatestVersion {
+				return logical.ErrorResponse(
+					fmt.Sprintf("cannot set min encryption version of %d, latest key version is %d", minEncryptionVersion, p.LatestVersion)), nil
+			}
+			p.MinEncryptionVersion = minEncryptionVersion
+			persistNeeded = true
+		}
+	}
+
+	// Check here to get the final picture after the logic on each
+	// individually. MinDecryptionVersion will always be 1 or above.
+	if p.MinEncryptionVersion > 0 &&
+		p.MinEncryptionVersion < p.MinDecryptionVersion {
+		return logical.ErrorResponse(
+			fmt.Sprintf("cannot set min encryption/decryption values; min encryption version of %d must be greater than or equal to min decryption version of %d", p.MinEncryptionVersion, p.MinDecryptionVersion)), nil
+	}
+
+	allowDeletionInt, ok := d.GetOk("deletion_allowed")
+	if ok {
+		allowDeletion := allowDeletionInt.(bool)
+		if allowDeletion != p.DeletionAllowed {
+			p.DeletionAllowed = allowDeletion
+			persistNeeded = true
+		}
+	}
+
+	// Add this as a guard here before persisting since we now require the min
+	// decryption version to start at 1; even if it's not explicitly set here,
+	// force the upgrade
+	if p.MinDecryptionVersion == 0 {
+		p.MinDecryptionVersion = 1
+		persistNeeded = true
+	}
+
+	exportableRaw, ok := d.GetOk("exportable")
+	if ok {
+		exportable := exportableRaw.(bool)
+		// Don't unset the already set value
+		if exportable && !p.Exportable {
+			p.Exportable = exportable
+			persistNeeded = true
+		}
+	}
+
+	allowPlaintextBackupRaw, ok := d.GetOk("allow_plaintext_backup")
+	if ok {
+		allowPlaintextBackup := allowPlaintextBackupRaw.(bool)
+		// Don't unset the already set value
+		if allowPlaintextBackup && !p.AllowPlaintextBackup {
+			p.AllowPlaintextBackup = allowPlaintextBackup
+			persistNeeded = true
+		}
+	}
+
+	autoRotatePeriodRaw, ok, err := d.GetOkErr("auto_rotate_period")
+	if err != nil {
+		return nil, err
+	}
+	if ok {
+		autoRotatePeriod := time.Second * time.Duration(autoRotatePeriodRaw.(int))
+		// Provided value must be 0 to disable or at least an hour
+		if autoRotatePeriod != 0 && autoRotatePeriod < time.Hour {
+			return logical.ErrorResponse("auto rotate period must be 0 to disable or at least an hour"), nil
+		}
+
+		if autoRotatePeriod != p.AutoRotatePeriod {
+			p.AutoRotatePeriod = autoRotatePeriod
+			persistNeeded = true
+		}
+	}
+
+	if !persistNeeded {
+		return nil, nil
+	}
+
+	switch {
+	case p.MinAvailableVersion > p.MinEncryptionVersion:
+		return logical.ErrorResponse("min encryption version should not be less than min available version"), nil
+	case p.MinAvailableVersion > p.MinDecryptionVersion:
+		return logical.ErrorResponse("min decryption version should not be less then min available version"), nil
+	}
+
+	if len(resp.Warnings) == 0 {
+		return nil, p.Persist(ctx, req.Storage)
+	}
+
+	return resp, p.Persist(ctx, req.Storage)
+}
+
+const pathConfigHelpSyn = `Configure a named encryption key`
+
+const pathConfigHelpDesc = `
+This path is used to configure the named key. Currently, this
+supports adjusting the minimum version of the key allowed to
+be used for decryption via the min_decryption_version parameter.
+`
diff --git a/builtin/logical/transit/path_config_keys.go b/builtin/logical/transit/path_config_keys.go
deleted file mode 100644
index bbf2cc4c07a85..0000000000000
--- a/builtin/logical/transit/path_config_keys.go
+++ /dev/null
@@ -1,136 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package transit
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/hashicorp/vault/sdk/framework"
-	"github.com/hashicorp/vault/sdk/logical"
-)
-
-const keysConfigPath = "config/keys"
-
-type keysConfig struct {
-	DisableUpsert bool `json:"disable_upsert"`
-}
-
-var defaultKeysConfig = keysConfig{
-	DisableUpsert: false,
-}
-
-func (b *backend) pathConfigKeys() *framework.Path {
-	return &framework.Path{
-		Pattern: "config/keys",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixTransit,
-		},
-
-		Fields: map[string]*framework.FieldSchema{
-			"disable_upsert": {
-				Type: framework.TypeBool,
-				Description: `Whether to allow automatic upserting (creation) of
-keys on the encrypt endpoint.`,
-			},
-		},
-
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.UpdateOperation: &framework.PathOperation{
-				Callback: b.pathConfigKeysWrite,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb:   "configure",
-					OperationSuffix: "keys",
-				},
-			},
-			logical.ReadOperation: &framework.PathOperation{
-				Callback: b.pathConfigKeysRead,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationSuffix: "keys-configuration",
-				},
-			},
-		},
-
-		HelpSynopsis:    pathConfigKeysHelpSyn,
-		HelpDescription: pathConfigKeysHelpDesc,
-	}
-}
-
-func (b *backend) readConfigKeys(ctx context.Context, req *logical.Request) (*keysConfig, error) {
-	entry, err := req.Storage.Get(ctx, keysConfigPath)
-	if err != nil {
-		return nil, fmt.Errorf("failed to fetch keys configuration: %w", err)
-	}
-
-	var cfg keysConfig
-	if entry == nil {
-		cfg = defaultKeysConfig
-		return &cfg, nil
-	}
-
-	if err := entry.DecodeJSON(&cfg); err != nil {
-		return nil, fmt.Errorf("failed to decode keys configuration: %w", err)
-	}
-
-	return &cfg, nil
-}
-
-func (b *backend) writeConfigKeys(ctx context.Context, req *logical.Request, cfg *keysConfig) error {
-	entry, err := logical.StorageEntryJSON(keysConfigPath, cfg)
-	if err != nil {
-		return fmt.Errorf("failed to marshal keys configuration: %w", err)
-	}
-
-	return req.Storage.Put(ctx, entry)
-}
-
-func respondConfigKeys(cfg *keysConfig) *logical.Response {
-	return &logical.Response{
-		Data: map[string]interface{}{
-			"disable_upsert": cfg.DisableUpsert,
-		},
-	}
-}
-
-func (b *backend) pathConfigKeysWrite(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
-	upsert := d.Get("disable_upsert").(bool)
-
-	cfg, err := b.readConfigKeys(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	modified := false
-
-	if cfg.DisableUpsert != upsert {
-		cfg.DisableUpsert = upsert
-		modified = true
-	}
-
-	if modified {
-		if err := b.writeConfigKeys(ctx, req, cfg); err != nil {
-			return nil, err
-		}
-	}
-
-	return respondConfigKeys(cfg), nil
-}
-
-func (b *backend) pathConfigKeysRead(ctx context.Context, req *logical.Request, _ *framework.FieldData) (*logical.Response, error) {
-	cfg, err := b.readConfigKeys(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	return respondConfigKeys(cfg), nil
-}
-
-const pathConfigKeysHelpSyn = `Configuration common across all keys`
-
-const pathConfigKeysHelpDesc = `
-This path is used to configure common functionality across all keys. Currently,
-this supports limiting the ability to automatically create new keys when an
-unknown key is used for encryption (upsert).
-`
diff --git a/builtin/logical/transit/path_config_keys_test.go b/builtin/logical/transit/path_config_keys_test.go
deleted file mode 100644
index dde7c58a0a946..0000000000000
--- a/builtin/logical/transit/path_config_keys_test.go
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package transit
-
-import (
-	"context"
-	"testing"
-
-	"github.com/hashicorp/vault/sdk/logical"
-)
-
-func TestTransit_ConfigKeys(t *testing.T) {
-	b, s := createBackendWithSysView(t)
-
-	doReq := func(req *logical.Request) *logical.Response {
-		resp, err := b.HandleRequest(context.Background(), req)
-		if err != nil || (resp != nil && resp.IsError()) {
-			t.Fatalf("got err:\n%#v\nreq:\n%#v\n", err, *req)
-		}
-		return resp
-	}
-	doErrReq := func(req *logical.Request) {
-		resp, err := b.HandleRequest(context.Background(), req)
-		if err == nil {
-			if resp == nil || !resp.IsError() {
-				t.Fatalf("expected error; req:\n%#v\n", *req)
-			}
-		}
-	}
-
-	// First read the global config
-	req := &logical.Request{
-		Storage:   s,
-		Operation: logical.ReadOperation,
-		Path:      "config/keys",
-	}
-	resp := doReq(req)
-	if resp.Data["disable_upsert"].(bool) != false {
-		t.Fatalf("expected disable_upsert to be false; got: %v", resp)
-	}
-
-	// Ensure we can upsert.
-	req.Operation = logical.CreateOperation
-	req.Path = "encrypt/upsert-1"
-	req.Data = map[string]interface{}{
-		"plaintext": "aGVsbG8K",
-	}
-	doReq(req)
-
-	// Disable upserting.
-	req.Operation = logical.UpdateOperation
-	req.Path = "config/keys"
-	req.Data = map[string]interface{}{
-		"disable_upsert": true,
-	}
-	doReq(req)
-
-	// Attempt upserting again, it should fail.
-	req.Operation = logical.CreateOperation
-	req.Path = "encrypt/upsert-2"
-	req.Data = map[string]interface{}{
-		"plaintext": "aGVsbG8K",
-	}
-	doErrReq(req)
-
-	// Redoing this with the first key should succeed.
-	req.Path = "encrypt/upsert-1"
-	doReq(req)
-}
diff --git a/builtin/logical/transit/path_config_test.go b/builtin/logical/transit/path_config_test.go
new file mode 100644
index 0000000000000..f6dee45090dc4
--- /dev/null
+++ b/builtin/logical/transit/path_config_test.go
@@ -0,0 +1,405 @@
+package transit
+
+import (
+	"context"
+	"encoding/hex"
+	"encoding/json"
+	"fmt"
+	"strconv"
+	"strings"
+	"testing"
+	"time"
+
+	uuid "github.com/hashicorp/go-uuid"
+	"github.com/hashicorp/vault/api"
+	vaulthttp "github.com/hashicorp/vault/http"
+	"github.com/hashicorp/vault/sdk/logical"
+	"github.com/hashicorp/vault/vault"
+)
+
+func TestTransit_ConfigSettings(t *testing.T) {
+	b, storage := createBackendWithSysView(t)
+
+	doReq := func(req *logical.Request) *logical.Response {
+		resp, err := b.HandleRequest(context.Background(), req)
+		if err != nil || (resp != nil && resp.IsError()) {
+			t.Fatalf("got err:\n%#v\nreq:\n%#v\n", err, *req)
+		}
+		return resp
+	}
+	doErrReq := func(req *logical.Request) {
+		resp, err := b.HandleRequest(context.Background(), req)
+		if err == nil {
+			if resp == nil || !resp.IsError() {
+				t.Fatalf("expected error; req:\n%#v\n", *req)
+			}
+		}
+	}
+
+	// First create a key
+	req := &logical.Request{
+		Storage:   storage,
+		Operation: logical.UpdateOperation,
+		Path:      "keys/aes256",
+		Data: map[string]interface{}{
+			"derived": true,
+		},
+	}
+	doReq(req)
+
+	req.Path = "keys/aes128"
+	req.Data["type"] = "aes128-gcm96"
+	doReq(req)
+
+	req.Path = "keys/ed"
+	req.Data["type"] = "ed25519"
+	doReq(req)
+
+	delete(req.Data, "derived")
+
+	req.Path = "keys/p256"
+	req.Data["type"] = "ecdsa-p256"
+	doReq(req)
+
+	req.Path = "keys/p384"
+	req.Data["type"] = "ecdsa-p384"
+	doReq(req)
+
+	req.Path = "keys/p521"
+	req.Data["type"] = "ecdsa-p521"
+	doReq(req)
+
+	delete(req.Data, "type")
+
+	req.Path = "keys/aes128/rotate"
+	doReq(req)
+	doReq(req)
+	doReq(req)
+	doReq(req)
+
+	req.Path = "keys/aes256/rotate"
+	doReq(req)
+	doReq(req)
+	doReq(req)
+	doReq(req)
+
+	req.Path = "keys/ed/rotate"
+	doReq(req)
+	doReq(req)
+	doReq(req)
+	doReq(req)
+
+	req.Path = "keys/p256/rotate"
+	doReq(req)
+	doReq(req)
+	doReq(req)
+	doReq(req)
+
+	req.Path = "keys/p384/rotate"
+	doReq(req)
+	doReq(req)
+	doReq(req)
+	doReq(req)
+
+	req.Path = "keys/p521/rotate"
+	doReq(req)
+	doReq(req)
+	doReq(req)
+	doReq(req)
+
+	req.Path = "keys/aes256/config"
+	// Too high
+	req.Data["min_decryption_version"] = 7
+	doErrReq(req)
+	// Too low
+	req.Data["min_decryption_version"] = -1
+	doErrReq(req)
+
+	delete(req.Data, "min_decryption_version")
+	// Too high
+	req.Data["min_encryption_version"] = 7
+	doErrReq(req)
+	// Too low
+	req.Data["min_encryption_version"] = 7
+	doErrReq(req)
+
+	// Not allowed, cannot decrypt
+	req.Data["min_decryption_version"] = 3
+	req.Data["min_encryption_version"] = 2
+	doErrReq(req)
+
+	// Allowed
+	req.Data["min_decryption_version"] = 2
+	req.Data["min_encryption_version"] = 3
+	doReq(req)
+	req.Path = "keys/aes128/config"
+	doReq(req)
+	req.Path = "keys/ed/config"
+	doReq(req)
+	req.Path = "keys/p256/config"
+	doReq(req)
+	req.Path = "keys/p384/config"
+	doReq(req)
+
+	req.Path = "keys/p521/config"
+	doReq(req)
+
+	req.Data = map[string]interface{}{
+		"plaintext": "abcd",
+		"input":     "abcd",
+		"context":   "abcd",
+	}
+
+	maxKeyVersion := 5
+	key := "aes256"
+
+	testHMAC := func(ver int, valid bool) {
+		req.Path = "hmac/" + key
+		delete(req.Data, "hmac")
+		if ver == maxKeyVersion {
+			delete(req.Data, "key_version")
+		} else {
+			req.Data["key_version"] = ver
+		}
+
+		if !valid {
+			doErrReq(req)
+			return
+		}
+
+		resp := doReq(req)
+		ct := resp.Data["hmac"].(string)
+		if strings.Split(ct, ":")[1] != "v"+strconv.Itoa(ver) {
+			t.Fatal("wrong hmac version")
+		}
+
+		req.Path = "verify/" + key
+		delete(req.Data, "key_version")
+		req.Data["hmac"] = resp.Data["hmac"]
+		doReq(req)
+	}
+
+	testEncryptDecrypt := func(ver int, valid bool) {
+		req.Path = "encrypt/" + key
+		delete(req.Data, "ciphertext")
+		if ver == maxKeyVersion {
+			delete(req.Data, "key_version")
+		} else {
+			req.Data["key_version"] = ver
+		}
+
+		if !valid {
+			doErrReq(req)
+			return
+		}
+
+		resp := doReq(req)
+		ct := resp.Data["ciphertext"].(string)
+		if strings.Split(ct, ":")[1] != "v"+strconv.Itoa(ver) {
+			t.Fatal("wrong encryption version")
+		}
+
+		req.Path = "decrypt/" + key
+		delete(req.Data, "key_version")
+		req.Data["ciphertext"] = resp.Data["ciphertext"]
+		doReq(req)
+	}
+	testEncryptDecrypt(5, true)
+	testEncryptDecrypt(4, true)
+	testEncryptDecrypt(3, true)
+	testEncryptDecrypt(2, false)
+	testHMAC(5, true)
+	testHMAC(4, true)
+	testHMAC(3, true)
+	testHMAC(2, false)
+
+	key = "aes128"
+	testEncryptDecrypt(5, true)
+	testEncryptDecrypt(4, true)
+	testEncryptDecrypt(3, true)
+	testEncryptDecrypt(2, false)
+	testHMAC(5, true)
+	testHMAC(4, true)
+	testHMAC(3, true)
+	testHMAC(2, false)
+
+	delete(req.Data, "plaintext")
+	req.Data["input"] = "abcd"
+	key = "ed"
+	testSignVerify := func(ver int, valid bool) {
+		req.Path = "sign/" + key
+		delete(req.Data, "signature")
+		if ver == maxKeyVersion {
+			delete(req.Data, "key_version")
+		} else {
+			req.Data["key_version"] = ver
+		}
+
+		if !valid {
+			doErrReq(req)
+			return
+		}
+
+		resp := doReq(req)
+		ct := resp.Data["signature"].(string)
+		if strings.Split(ct, ":")[1] != "v"+strconv.Itoa(ver) {
+			t.Fatal("wrong signature version")
+		}
+
+		req.Path = "verify/" + key
+		delete(req.Data, "key_version")
+		req.Data["signature"] = resp.Data["signature"]
+		doReq(req)
+	}
+	testSignVerify(5, true)
+	testSignVerify(4, true)
+	testSignVerify(3, true)
+	testSignVerify(2, false)
+	testHMAC(5, true)
+	testHMAC(4, true)
+	testHMAC(3, true)
+	testHMAC(2, false)
+
+	delete(req.Data, "context")
+	key = "p256"
+	testSignVerify(5, true)
+	testSignVerify(4, true)
+	testSignVerify(3, true)
+	testSignVerify(2, false)
+	testHMAC(5, true)
+	testHMAC(4, true)
+	testHMAC(3, true)
+	testHMAC(2, false)
+
+	key = "p384"
+	testSignVerify(5, true)
+	testSignVerify(4, true)
+	testSignVerify(3, true)
+	testSignVerify(2, false)
+	testHMAC(5, true)
+	testHMAC(4, true)
+	testHMAC(3, true)
+	testHMAC(2, false)
+
+	key = "p521"
+	testSignVerify(5, true)
+	testSignVerify(4, true)
+	testSignVerify(3, true)
+	testSignVerify(2, false)
+	testHMAC(5, true)
+	testHMAC(4, true)
+	testHMAC(3, true)
+	testHMAC(2, false)
+}
+
+func TestTransit_UpdateKeyConfigWithAutorotation(t *testing.T) {
+	tests := map[string]struct {
+		initialAutoRotatePeriod interface{}
+		newAutoRotatePeriod     interface{}
+		shouldError             bool
+		expectedValue           time.Duration
+	}{
+		"default (no value)": {
+			initialAutoRotatePeriod: "5h",
+			shouldError:             false,
+			expectedValue:           5 * time.Hour,
+		},
+		"0 (int)": {
+			initialAutoRotatePeriod: "5h",
+			newAutoRotatePeriod:     0,
+			shouldError:             false,
+			expectedValue:           0,
+		},
+		"0 (string)": {
+			initialAutoRotatePeriod: "5h",
+			newAutoRotatePeriod:     0,
+			shouldError:             false,
+			expectedValue:           0,
+		},
+		"5 seconds": {
+			newAutoRotatePeriod: "5s",
+			shouldError:         true,
+		},
+		"5 hours": {
+			newAutoRotatePeriod: "5h",
+			shouldError:         false,
+			expectedValue:       5 * time.Hour,
+		},
+		"negative value": {
+			newAutoRotatePeriod: "-1800s",
+			shouldError:         true,
+		},
+		"invalid string": {
+			newAutoRotatePeriod: "this shouldn't work",
+			shouldError:         true,
+		},
+	}
+
+	coreConfig := &vault.CoreConfig{
+		LogicalBackends: map[string]logical.Factory{
+			"transit": Factory,
+		},
+	}
+	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+	})
+	cluster.Start()
+	defer cluster.Cleanup()
+	cores := cluster.Cores
+	vault.TestWaitActive(t, cores[0].Core)
+	client := cores[0].Client
+	err := client.Sys().Mount("transit", &api.MountInput{
+		Type: "transit",
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	for name, test := range tests {
+		t.Run(name, func(t *testing.T) {
+			keyNameBytes, err := uuid.GenerateRandomBytes(16)
+			if err != nil {
+				t.Fatal(err)
+			}
+			keyName := hex.EncodeToString(keyNameBytes)
+
+			_, err = client.Logical().Write(fmt.Sprintf("transit/keys/%s", keyName), map[string]interface{}{
+				"auto_rotate_period": test.initialAutoRotatePeriod,
+			})
+			if err != nil {
+				t.Fatal(err)
+			}
+			resp, err := client.Logical().Write(fmt.Sprintf("transit/keys/%s/config", keyName), map[string]interface{}{
+				"auto_rotate_period": test.newAutoRotatePeriod,
+			})
+			switch {
+			case test.shouldError && err == nil:
+				t.Fatal("expected non-nil error")
+			case !test.shouldError && err != nil:
+				t.Fatal(err)
+			}
+
+			if !test.shouldError {
+				resp, err = client.Logical().Read(fmt.Sprintf("transit/keys/%s", keyName))
+				if err != nil {
+					t.Fatal(err)
+				}
+				if resp == nil {
+					t.Fatal("expected non-nil response")
+				}
+				gotRaw, ok := resp.Data["auto_rotate_period"].(json.Number)
+				if !ok {
+					t.Fatal("returned value is of unexpected type")
+				}
+				got, err := gotRaw.Int64()
+				if err != nil {
+					t.Fatal(err)
+				}
+				want := int64(test.expectedValue.Seconds())
+				if got != want {
+					t.Fatalf("incorrect auto_rotate_period returned, got: %d, want: %d", got, want)
+				}
+			}
+		})
+	}
+}
diff --git a/builtin/logical/transit/path_datakey.go b/builtin/logical/transit/path_datakey.go
index 1c607d0e2f88e..42da161916392 100644
--- a/builtin/logical/transit/path_datakey.go
+++ b/builtin/logical/transit/path_datakey.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package transit
 
 import (
@@ -19,13 +16,6 @@ import (
 func (b *backend) pathDatakey() *framework.Path {
 	return &framework.Path{
 		Pattern: "datakey/" + framework.GenericNameRegex("plaintext") + "/" + framework.GenericNameRegex("name"),
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixTransit,
-			OperationVerb:   "generate",
-			OperationSuffix: "data-key",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"name": {
 				Type:        framework.TypeString,
diff --git a/builtin/logical/transit/path_decrypt.go b/builtin/logical/transit/path_decrypt.go
index 116732b7f4573..f95e33621e798 100644
--- a/builtin/logical/transit/path_decrypt.go
+++ b/builtin/logical/transit/path_decrypt.go
@@ -1,12 +1,8 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package transit
 
 import (
 	"context"
 	"encoding/base64"
-	"errors"
 	"fmt"
 
 	"github.com/hashicorp/vault/sdk/framework"
@@ -23,21 +19,11 @@ type DecryptBatchResponseItem struct {
 	// Error, if set represents a failure encountered while encrypting a
 	// corresponding batch request item
 	Error string `json:"error,omitempty" structs:"error" mapstructure:"error"`
-
-	// Reference is an arbitrary caller supplied string value that will be placed on the
-	// batch response to ease correlation between inputs and outputs
-	Reference string `json:"reference" structs:"reference" mapstructure:"reference"`
 }
 
 func (b *backend) pathDecrypt() *framework.Path {
 	return &framework.Path{
 		Pattern: "decrypt/" + framework.GenericNameRegex("name"),
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixTransit,
-			OperationVerb:   "decrypt",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"name": {
 				Type:        framework.TypeString,
@@ -74,17 +60,6 @@ Providing the parameter returns the given response code integer instead of a 400
 HTTP 400 is still returned.`,
 			},
 
-			"associated_data": {
-				Type: framework.TypeString,
-				Description: `
-When using an AEAD cipher mode, such as AES-GCM, this parameter allows
-passing associated data (AD/AAD) into the encryption function; this data
-must be passed on subsequent decryption requests but can be transited in
-plaintext. On successful decryption, both the ciphertext and the associated
-data are attested not to have been tampered with.
-                `,
-			},
-
 			"batch_input": {
 				Type: framework.TypeSlice,
 				Description: `
@@ -125,10 +100,9 @@ func (b *backend) pathDecryptWrite(ctx context.Context, req *logical.Request, d
 
 		batchInputItems = make([]BatchRequestItem, 1)
 		batchInputItems[0] = BatchRequestItem{
-			Ciphertext:     ciphertext,
-			Context:        d.Get("context").(string),
-			Nonce:          d.Get("nonce").(string),
-			AssociatedData: d.Get("associated_data").(string),
+			Ciphertext: ciphertext,
+			Context:    d.Get("context").(string),
+			Nonce:      d.Get("nonce").(string),
 		}
 	}
 
@@ -191,33 +165,7 @@ func (b *backend) pathDecryptWrite(ctx context.Context, req *logical.Request, d
 			continue
 		}
 
-		var factory interface{}
-		if item.AssociatedData != "" {
-			if !p.Type.AssociatedDataSupported() {
-				batchResponseItems[i].Error = fmt.Sprintf("'[%d].associated_data' provided for non-AEAD cipher suite %v", i, p.Type.String())
-				continue
-			}
-
-			factory = AssocDataFactory{item.AssociatedData}
-		}
-
-		var managedKeyFactory ManagedKeyFactory
-		if p.Type == keysutil.KeyType_MANAGED_KEY {
-			managedKeySystemView, ok := b.System().(logical.ManagedKeySystemView)
-			if !ok {
-				batchResponseItems[i].Error = errors.New("unsupported system view").Error()
-			}
-
-			managedKeyFactory = ManagedKeyFactory{
-				managedKeyParams: keysutil.ManagedKeyParameters{
-					ManagedKeySystemView: managedKeySystemView,
-					BackendUUID:          b.backendUUID,
-					Context:              ctx,
-				},
-			}
-		}
-
-		plaintext, err := p.DecryptWithFactory(item.DecodedContext, item.DecodedNonce, item.Ciphertext, factory, managedKeyFactory)
+		plaintext, err := p.Decrypt(item.DecodedContext, item.DecodedNonce, item.Ciphertext)
 		if err != nil {
 			switch err.(type) {
 			case errutil.InternalError:
@@ -234,10 +182,6 @@ func (b *backend) pathDecryptWrite(ctx context.Context, req *logical.Request, d
 
 	resp := &logical.Response{}
 	if batchInputRaw != nil {
-		// Copy the references
-		for i := range batchInputItems {
-			batchResponseItems[i].Reference = batchInputItems[i].Reference
-		}
 		resp.Data = map[string]interface{}{
 			"batch_results": batchResponseItems,
 		}
diff --git a/builtin/logical/transit/path_decrypt_bench_test.go b/builtin/logical/transit/path_decrypt_bench_test.go
index c4dc72837ab67..67d4bc3b5d5a2 100644
--- a/builtin/logical/transit/path_decrypt_bench_test.go
+++ b/builtin/logical/transit/path_decrypt_bench_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package transit
 
 import (
diff --git a/builtin/logical/transit/path_decrypt_test.go b/builtin/logical/transit/path_decrypt_test.go
index e69402c7d514f..9a6b21aa12dde 100644
--- a/builtin/logical/transit/path_decrypt_test.go
+++ b/builtin/logical/transit/path_decrypt_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package transit
 
 import (
@@ -22,9 +19,9 @@ func TestTransit_BatchDecryption(t *testing.T) {
 	b, s := createBackendWithStorage(t)
 
 	batchEncryptionInput := []interface{}{
-		map[string]interface{}{"plaintext": "", "reference": "foo"},     // empty string
-		map[string]interface{}{"plaintext": "Cg==", "reference": "bar"}, // newline
-		map[string]interface{}{"plaintext": "dGhlIHF1aWNrIGJyb3duIGZveA==", "reference": "baz"},
+		map[string]interface{}{"plaintext": ""},     // empty string
+		map[string]interface{}{"plaintext": "Cg=="}, // newline
+		map[string]interface{}{"plaintext": "dGhlIHF1aWNrIGJyb3duIGZveA=="},
 	}
 	batchEncryptionData := map[string]interface{}{
 		"batch_input": batchEncryptionInput,
@@ -44,7 +41,7 @@ func TestTransit_BatchDecryption(t *testing.T) {
 	batchResponseItems := resp.Data["batch_results"].([]EncryptBatchResponseItem)
 	batchDecryptionInput := make([]interface{}, len(batchResponseItems))
 	for i, item := range batchResponseItems {
-		batchDecryptionInput[i] = map[string]interface{}{"ciphertext": item.Ciphertext, "reference": item.Reference}
+		batchDecryptionInput[i] = map[string]interface{}{"ciphertext": item.Ciphertext}
 	}
 	batchDecryptionData := map[string]interface{}{
 		"batch_input": batchDecryptionInput,
@@ -62,8 +59,7 @@ func TestTransit_BatchDecryption(t *testing.T) {
 	}
 
 	batchDecryptionResponseItems := resp.Data["batch_results"].([]DecryptBatchResponseItem)
-	// This seems fragile
-	expectedResult := "[{\"plaintext\":\"\",\"reference\":\"foo\"},{\"plaintext\":\"Cg==\",\"reference\":\"bar\"},{\"plaintext\":\"dGhlIHF1aWNrIGJyb3duIGZveA==\",\"reference\":\"baz\"}]"
+	expectedResult := "[{\"plaintext\":\"\"},{\"plaintext\":\"Cg==\"},{\"plaintext\":\"dGhlIHF1aWNrIGJyb3duIGZveA==\"}]"
 
 	jsonResponse, err := json.Marshal(batchDecryptionResponseItems)
 	if err != nil || err == nil && string(jsonResponse) != expectedResult {
diff --git a/builtin/logical/transit/path_encrypt.go b/builtin/logical/transit/path_encrypt.go
index 78b43a64c91ca..3d8a103f5f49d 100644
--- a/builtin/logical/transit/path_encrypt.go
+++ b/builtin/logical/transit/path_encrypt.go
@@ -1,13 +1,9 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package transit
 
 import (
 	"context"
 	"encoding/base64"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"net/http"
 	"reflect"
@@ -43,13 +39,6 @@ type BatchRequestItem struct {
 
 	// DecodedNonce is the base64 decoded version of Nonce
 	DecodedNonce []byte
-
-	// Associated Data for AEAD ciphers
-	AssociatedData string `json:"associated_data" struct:"associated_data" mapstructure:"associated_data"`
-
-	// Reference is an arbitrary caller supplied string value that will be placed on the
-	// batch response to ease correlation between inputs and outputs
-	Reference string `json:"reference" structs:"reference" mapstructure:"reference"`
 }
 
 // EncryptBatchResponseItem represents a response item for batch processing
@@ -64,37 +53,11 @@ type EncryptBatchResponseItem struct {
 	// Error, if set represents a failure encountered while encrypting a
 	// corresponding batch request item
 	Error string `json:"error,omitempty" structs:"error" mapstructure:"error"`
-
-	// Reference is an arbitrary caller supplied string value that will be placed on the
-	// batch response to ease correlation between inputs and outputs
-	Reference string `json:"reference"`
-}
-
-type AssocDataFactory struct {
-	Encoded string
-}
-
-func (a AssocDataFactory) GetAssociatedData() ([]byte, error) {
-	return base64.StdEncoding.DecodeString(a.Encoded)
-}
-
-type ManagedKeyFactory struct {
-	managedKeyParams keysutil.ManagedKeyParameters
-}
-
-func (m ManagedKeyFactory) GetManagedKeyParameters() keysutil.ManagedKeyParameters {
-	return m.managedKeyParams
 }
 
 func (b *backend) pathEncrypt() *framework.Path {
 	return &framework.Path{
 		Pattern: "encrypt/" + framework.GenericNameRegex("name"),
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixTransit,
-			OperationVerb:   "encrypt",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"name": {
 				Type:        framework.TypeString,
@@ -160,17 +123,6 @@ Providing the parameter returns the given response code integer instead of a 400
 HTTP 400 is still returned.`,
 			},
 
-			"associated_data": {
-				Type: framework.TypeString,
-				Description: `
-When using an AEAD cipher mode, such as AES-GCM, this parameter allows
-passing associated data (AD/AAD) into the encryption function; this data
-must be passed on subsequent decryption requests but can be transited in
-plaintext. On successful decryption, both the ciphertext and the associated
-data are attested not to have been tampered with.
-				`,
-			},
-
 			"batch_input": {
 				Type: framework.TypeSlice,
 				Description: `
@@ -286,23 +238,6 @@ func decodeBatchRequestItems(src interface{}, requirePlaintext bool, requireCiph
 				errs.Errors = append(errs.Errors, fmt.Sprintf("'[%d].key_version' expected type 'int', got unconvertible type '%T'", i, item["key_version"]))
 			}
 		}
-
-		if v, has := item["associated_data"]; has {
-			if !reflect.ValueOf(v).IsValid() {
-			} else if casted, ok := v.(string); ok {
-				(*dst)[i].AssociatedData = casted
-			} else {
-				errs.Errors = append(errs.Errors, fmt.Sprintf("'[%d].associated_data' expected type 'string', got unconvertible type '%T'", i, item["associated_data"]))
-			}
-		}
-		if v, has := item["reference"]; has {
-			if !reflect.ValueOf(v).IsValid() {
-			} else if casted, ok := v.(string); ok {
-				(*dst)[i].Reference = casted
-			} else {
-				errs.Errors = append(errs.Errors, fmt.Sprintf("'[%d].reference' expected type 'string', got unconvertible type '%T'", i, item["reference"]))
-			}
-		}
 	}
 
 	if len(errs.Errors) > 0 {
@@ -353,11 +288,10 @@ func (b *backend) pathEncryptWrite(ctx context.Context, req *logical.Request, d
 
 		batchInputItems = make([]BatchRequestItem, 1)
 		batchInputItems[0] = BatchRequestItem{
-			Plaintext:      valueRaw.(string),
-			Context:        d.Get("context").(string),
-			Nonce:          d.Get("nonce").(string),
-			KeyVersion:     d.Get("key_version").(int),
-			AssociatedData: d.Get("associated_data").(string),
+			Plaintext:  valueRaw.(string),
+			Context:    d.Get("context").(string),
+			Nonce:      d.Get("nonce").(string),
+			KeyVersion: d.Get("key_version").(int),
 		}
 	}
 
@@ -415,13 +349,8 @@ func (b *backend) pathEncryptWrite(ctx context.Context, req *logical.Request, d
 			return logical.ErrorResponse("convergent encryption requires derivation to be enabled, so context is required"), nil
 		}
 
-		cfg, err := b.readConfigKeys(ctx, req)
-		if err != nil {
-			return nil, err
-		}
-
 		polReq = keysutil.PolicyRequest{
-			Upsert:     !cfg.DisableUpsert,
+			Upsert:     true,
 			Storage:    req.Storage,
 			Name:       name,
 			Derived:    contextSet,
@@ -438,8 +367,6 @@ func (b *backend) pathEncryptWrite(ctx context.Context, req *logical.Request, d
 			polReq.KeyType = keysutil.KeyType_ChaCha20_Poly1305
 		case "ecdsa-p256", "ecdsa-p384", "ecdsa-p521":
 			return logical.ErrorResponse(fmt.Sprintf("key type %v not supported for this operation", keyType)), logical.ErrInvalidRequest
-		case "managed_key":
-			polReq.KeyType = keysutil.KeyType_MANAGED_KEY
 		default:
 			return logical.ErrorResponse(fmt.Sprintf("unknown key type %v", keyType)), logical.ErrInvalidRequest
 		}
@@ -475,33 +402,7 @@ func (b *backend) pathEncryptWrite(ctx context.Context, req *logical.Request, d
 			warnAboutNonceUsage = true
 		}
 
-		var factory interface{}
-		if item.AssociatedData != "" {
-			if !p.Type.AssociatedDataSupported() {
-				batchResponseItems[i].Error = fmt.Sprintf("'[%d].associated_data' provided for non-AEAD cipher suite %v", i, p.Type.String())
-				continue
-			}
-
-			factory = AssocDataFactory{item.AssociatedData}
-		}
-
-		var managedKeyFactory ManagedKeyFactory
-		if p.Type == keysutil.KeyType_MANAGED_KEY {
-			managedKeySystemView, ok := b.System().(logical.ManagedKeySystemView)
-			if !ok {
-				batchResponseItems[i].Error = errors.New("unsupported system view").Error()
-			}
-
-			managedKeyFactory = ManagedKeyFactory{
-				managedKeyParams: keysutil.ManagedKeyParameters{
-					ManagedKeySystemView: managedKeySystemView,
-					BackendUUID:          b.backendUUID,
-					Context:              ctx,
-				},
-			}
-		}
-
-		ciphertext, err := p.EncryptWithFactory(item.KeyVersion, item.DecodedContext, item.DecodedNonce, item.Plaintext, factory, managedKeyFactory)
+		ciphertext, err := p.Encrypt(item.KeyVersion, item.DecodedContext, item.DecodedNonce, item.Plaintext)
 		if err != nil {
 			switch err.(type) {
 			case errutil.InternalError:
@@ -531,10 +432,6 @@ func (b *backend) pathEncryptWrite(ctx context.Context, req *logical.Request, d
 
 	resp := &logical.Response{}
 	if batchInputRaw != nil {
-		// Copy the references
-		for i := range batchInputItems {
-			batchResponseItems[i].Reference = batchInputItems[i].Reference
-		}
 		resp.Data = map[string]interface{}{
 			"batch_results": batchResponseItems,
 		}
diff --git a/builtin/logical/transit/path_encrypt_bench_test.go b/builtin/logical/transit/path_encrypt_bench_test.go
index 8aef39dd4b724..e648c6e02fc32 100644
--- a/builtin/logical/transit/path_encrypt_bench_test.go
+++ b/builtin/logical/transit/path_encrypt_bench_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package transit
 
 import (
diff --git a/builtin/logical/transit/path_encrypt_test.go b/builtin/logical/transit/path_encrypt_test.go
index b886d4fefd8f6..734a92524b558 100644
--- a/builtin/logical/transit/path_encrypt_test.go
+++ b/builtin/logical/transit/path_encrypt_test.go
@@ -1,19 +1,14 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package transit
 
 import (
 	"context"
 	"encoding/json"
-	"fmt"
 	"reflect"
 	"strings"
 	"testing"
 
 	"github.com/hashicorp/vault/sdk/helper/keysutil"
 
-	uuid "github.com/hashicorp/go-uuid"
 	"github.com/hashicorp/vault/sdk/logical"
 	"github.com/mitchellh/mapstructure"
 )
@@ -230,7 +225,7 @@ func TestTransit_BatchEncryptionCase3(t *testing.T) {
 	}
 }
 
-// Case4: Test batch encryption with an existing key (and test references)
+// Case4: Test batch encryption with an existing key
 func TestTransit_BatchEncryptionCase4(t *testing.T) {
 	var resp *logical.Response
 	var err error
@@ -248,8 +243,8 @@ func TestTransit_BatchEncryptionCase4(t *testing.T) {
 	}
 
 	batchInput := []interface{}{
-		map[string]interface{}{"plaintext": "dGhlIHF1aWNrIGJyb3duIGZveA==", "reference": "b"},
-		map[string]interface{}{"plaintext": "dGhlIHF1aWNrIGJyb3duIGZveA==", "reference": "a"},
+		map[string]interface{}{"plaintext": "dGhlIHF1aWNrIGJyb3duIGZveA=="},
+		map[string]interface{}{"plaintext": "dGhlIHF1aWNrIGJyb3duIGZveA=="},
 	}
 
 	batchData := map[string]interface{}{
@@ -276,7 +271,7 @@ func TestTransit_BatchEncryptionCase4(t *testing.T) {
 
 	plaintext := "dGhlIHF1aWNrIGJyb3duIGZveA=="
 
-	for i, item := range batchResponseItems {
+	for _, item := range batchResponseItems {
 		if item.KeyVersion != 1 {
 			t.Fatalf("unexpected key version; got: %d, expected: %d", item.KeyVersion, 1)
 		}
@@ -292,10 +287,6 @@ func TestTransit_BatchEncryptionCase4(t *testing.T) {
 		if resp.Data["plaintext"] != plaintext {
 			t.Fatalf("bad: plaintext. Expected: %q, Actual: %q", plaintext, resp.Data["plaintext"])
 		}
-		inputItem := batchInput[i].(map[string]interface{})
-		if item.Reference != inputItem["reference"] {
-			t.Fatalf("reference mismatch.  Expected %s, Actual: %s", inputItem["reference"], item.Reference)
-		}
 	}
 }
 
@@ -946,48 +937,3 @@ func TestShouldWarnAboutNonceUsage(t *testing.T) {
 		}
 	}
 }
-
-func TestTransit_EncryptWithRSAPublicKey(t *testing.T) {
-	generateKeys(t)
-	b, s := createBackendWithStorage(t)
-	keyType := "rsa-2048"
-	keyID, err := uuid.GenerateUUID()
-	if err != nil {
-		t.Fatalf("failed to generate key ID: %s", err)
-	}
-
-	// Get key
-	privateKey := getKey(t, keyType)
-	publicKeyBytes, err := getPublicKey(privateKey, keyType)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Import key
-	req := &logical.Request{
-		Storage:   s,
-		Operation: logical.UpdateOperation,
-		Path:      fmt.Sprintf("keys/%s/import", keyID),
-		Data: map[string]interface{}{
-			"public_key": publicKeyBytes,
-			"type":       keyType,
-		},
-	}
-	_, err = b.HandleRequest(context.Background(), req)
-	if err != nil {
-		t.Fatalf("failed to import public key: %s", err)
-	}
-
-	req = &logical.Request{
-		Operation: logical.CreateOperation,
-		Path:      fmt.Sprintf("encrypt/%s", keyID),
-		Storage:   s,
-		Data: map[string]interface{}{
-			"plaintext": "bXkgc2VjcmV0IGRhdGE=",
-		},
-	}
-	_, err = b.HandleRequest(context.Background(), req)
-	if err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/builtin/logical/transit/path_export.go b/builtin/logical/transit/path_export.go
index 9239aee94bd4d..61bb5e595ca66 100644
--- a/builtin/logical/transit/path_export.go
+++ b/builtin/logical/transit/path_export.go
@@ -1,12 +1,10 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package transit
 
 import (
 	"context"
 	"crypto/ecdsa"
 	"crypto/elliptic"
+	"crypto/rsa"
 	"crypto/x509"
 	"encoding/base64"
 	"encoding/pem"
@@ -24,23 +22,15 @@ const (
 	exportTypeEncryptionKey = "encryption-key"
 	exportTypeSigningKey    = "signing-key"
 	exportTypeHMACKey       = "hmac-key"
-	exportTypePublicKey     = "public-key"
 )
 
 func (b *backend) pathExportKeys() *framework.Path {
 	return &framework.Path{
 		Pattern: "export/" + framework.GenericNameRegex("type") + "/" + framework.GenericNameRegex("name") + framework.OptionalParamRegex("version"),
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixTransit,
-			OperationVerb:   "export",
-			OperationSuffix: "key|key-version",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"type": {
 				Type:        framework.TypeString,
-				Description: "Type of key to export (encryption-key, signing-key, hmac-key, public-key)",
+				Description: "Type of key to export (encryption-key, signing-key, hmac-key)",
 			},
 			"name": {
 				Type:        framework.TypeString,
@@ -70,7 +60,6 @@ func (b *backend) pathPolicyExportRead(ctx context.Context, req *logical.Request
 	case exportTypeEncryptionKey:
 	case exportTypeSigningKey:
 	case exportTypeHMACKey:
-	case exportTypePublicKey:
 	default:
 		return logical.ErrorResponse(fmt.Sprintf("invalid export type: %s", exportType)), logical.ErrInvalidRequest
 	}
@@ -90,8 +79,8 @@ func (b *backend) pathPolicyExportRead(ctx context.Context, req *logical.Request
 	}
 	defer p.Unlock()
 
-	if !p.Exportable && exportType != exportTypePublicKey {
-		return logical.ErrorResponse("private key material is not exportable"), nil
+	if !p.Exportable {
+		return logical.ErrorResponse("key is not exportable"), nil
 	}
 
 	switch exportType {
@@ -174,11 +163,7 @@ func getExportKey(policy *keysutil.Policy, key *keysutil.KeyEntry, exportType st
 			return strings.TrimSpace(base64.StdEncoding.EncodeToString(key.Key)), nil
 
 		case keysutil.KeyType_RSA2048, keysutil.KeyType_RSA3072, keysutil.KeyType_RSA4096:
-			rsaKey, err := encodeRSAPrivateKey(key)
-			if err != nil {
-				return "", err
-			}
-			return rsaKey, nil
+			return encodeRSAPrivateKey(key.RSAKey), nil
 		}
 
 	case exportTypeSigningKey:
@@ -200,92 +185,26 @@ func getExportKey(policy *keysutil.Policy, key *keysutil.KeyEntry, exportType st
 			return ecKey, nil
 
 		case keysutil.KeyType_ED25519:
-			if len(key.Key) == 0 {
-				return "", nil
-			}
-
 			return strings.TrimSpace(base64.StdEncoding.EncodeToString(key.Key)), nil
 
 		case keysutil.KeyType_RSA2048, keysutil.KeyType_RSA3072, keysutil.KeyType_RSA4096:
-			rsaKey, err := encodeRSAPrivateKey(key)
-			if err != nil {
-				return "", err
-			}
-			return rsaKey, nil
-		}
-	case exportTypePublicKey:
-		switch policy.Type {
-		case keysutil.KeyType_ECDSA_P256, keysutil.KeyType_ECDSA_P384, keysutil.KeyType_ECDSA_P521:
-			var curve elliptic.Curve
-			switch policy.Type {
-			case keysutil.KeyType_ECDSA_P384:
-				curve = elliptic.P384()
-			case keysutil.KeyType_ECDSA_P521:
-				curve = elliptic.P521()
-			default:
-				curve = elliptic.P256()
-			}
-			ecKey, err := keyEntryToECPublicKey(key, curve)
-			if err != nil {
-				return "", err
-			}
-			return ecKey, nil
-
-		case keysutil.KeyType_ED25519:
-			return strings.TrimSpace(key.FormattedPublicKey), nil
-
-		case keysutil.KeyType_RSA2048, keysutil.KeyType_RSA3072, keysutil.KeyType_RSA4096:
-			rsaKey, err := encodeRSAPublicKey(key)
-			if err != nil {
-				return "", err
-			}
-			return rsaKey, nil
+			return encodeRSAPrivateKey(key.RSAKey), nil
 		}
 	}
 
-	return "", fmt.Errorf("unknown key type %v for export type %v", policy.Type, exportType)
+	return "", fmt.Errorf("unknown key type %v", policy.Type)
 }
 
-func encodeRSAPrivateKey(key *keysutil.KeyEntry) (string, error) {
-	if key == nil {
-		return "", errors.New("nil KeyEntry provided")
-	}
-
-	if key.IsPrivateKeyMissing() {
-		return "", nil
-	}
-
+func encodeRSAPrivateKey(key *rsa.PrivateKey) string {
 	// When encoding PKCS1, the PEM header should be `RSA PRIVATE KEY`. When Go
 	// has PKCS8 encoding support, we may want to change this.
-	blockType := "RSA PRIVATE KEY"
-	derBytes := x509.MarshalPKCS1PrivateKey(key.RSAKey)
-	pemBlock := pem.Block{
-		Type:  blockType,
+	derBytes := x509.MarshalPKCS1PrivateKey(key)
+	pemBlock := &pem.Block{
+		Type:  "RSA PRIVATE KEY",
 		Bytes: derBytes,
 	}
-
-	pemBytes := pem.EncodeToMemory(&pemBlock)
-	return string(pemBytes), nil
-}
-
-func encodeRSAPublicKey(key *keysutil.KeyEntry) (string, error) {
-	if key == nil {
-		return "", errors.New("nil KeyEntry provided")
-	}
-
-	blockType := "RSA PUBLIC KEY"
-	derBytes, err := x509.MarshalPKIXPublicKey(key.RSAPublicKey)
-	if err != nil {
-		return "", err
-	}
-
-	pemBlock := pem.Block{
-		Type:  blockType,
-		Bytes: derBytes,
-	}
-
-	pemBytes := pem.EncodeToMemory(&pemBlock)
-	return string(pemBytes), nil
+	pemBytes := pem.EncodeToMemory(pemBlock)
+	return string(pemBytes)
 }
 
 func keyEntryToECPrivateKey(k *keysutil.KeyEntry, curve elliptic.Curve) (string, error) {
@@ -293,57 +212,27 @@ func keyEntryToECPrivateKey(k *keysutil.KeyEntry, curve elliptic.Curve) (string,
 		return "", errors.New("nil KeyEntry provided")
 	}
 
-	if k.IsPrivateKeyMissing() {
-		return "", nil
-	}
-
-	pubKey := ecdsa.PublicKey{
-		Curve: curve,
-		X:     k.EC_X,
-		Y:     k.EC_Y,
-	}
-
-	blockType := "EC PRIVATE KEY"
 	privKey := &ecdsa.PrivateKey{
-		PublicKey: pubKey,
-		D:         k.EC_D,
+		PublicKey: ecdsa.PublicKey{
+			Curve: curve,
+			X:     k.EC_X,
+			Y:     k.EC_Y,
+		},
+		D: k.EC_D,
 	}
-	derBytes, err := x509.MarshalECPrivateKey(privKey)
+	ecder, err := x509.MarshalECPrivateKey(privKey)
 	if err != nil {
 		return "", err
 	}
-
-	pemBlock := pem.Block{
-		Type:  blockType,
-		Bytes: derBytes,
-	}
-
-	return strings.TrimSpace(string(pem.EncodeToMemory(&pemBlock))), nil
-}
-
-func keyEntryToECPublicKey(k *keysutil.KeyEntry, curve elliptic.Curve) (string, error) {
-	if k == nil {
-		return "", errors.New("nil KeyEntry provided")
-	}
-
-	pubKey := ecdsa.PublicKey{
-		Curve: curve,
-		X:     k.EC_X,
-		Y:     k.EC_Y,
+	if ecder == nil {
+		return "", errors.New("no data returned when marshalling to private key")
 	}
 
-	blockType := "PUBLIC KEY"
-	derBytes, err := x509.MarshalPKIXPublicKey(&pubKey)
-	if err != nil {
-		return "", err
+	block := pem.Block{
+		Type:  "EC PRIVATE KEY",
+		Bytes: ecder,
 	}
-
-	pemBlock := pem.Block{
-		Type:  blockType,
-		Bytes: derBytes,
-	}
-
-	return strings.TrimSpace(string(pem.EncodeToMemory(&pemBlock))), nil
+	return strings.TrimSpace(string(pem.EncodeToMemory(&block))), nil
 }
 
 const pathExportHelpSyn = `Export named encryption or signing key`
diff --git a/builtin/logical/transit/path_export_test.go b/builtin/logical/transit/path_export_test.go
index cd25383f2b060..b44a4e7e0fe26 100644
--- a/builtin/logical/transit/path_export_test.go
+++ b/builtin/logical/transit/path_export_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package transit
 
 import (
diff --git a/builtin/logical/transit/path_hash.go b/builtin/logical/transit/path_hash.go
index ecf619a52e448..51ca37daa2317 100644
--- a/builtin/logical/transit/path_hash.go
+++ b/builtin/logical/transit/path_hash.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package transit
 
 import (
@@ -21,13 +18,6 @@ import (
 func (b *backend) pathHash() *framework.Path {
 	return &framework.Path{
 		Pattern: "hash" + framework.OptionalParamRegex("urlalgorithm"),
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixTransit,
-			OperationVerb:   "hash",
-			OperationSuffix: "|with-algorithm",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"input": {
 				Type:        framework.TypeString,
diff --git a/builtin/logical/transit/path_hash_test.go b/builtin/logical/transit/path_hash_test.go
index 084012dd4bafe..3e5dce95c2999 100644
--- a/builtin/logical/transit/path_hash_test.go
+++ b/builtin/logical/transit/path_hash_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package transit
 
 import (
diff --git a/builtin/logical/transit/path_hmac.go b/builtin/logical/transit/path_hmac.go
index 704a1b866cfff..6639231174ba5 100644
--- a/builtin/logical/transit/path_hmac.go
+++ b/builtin/logical/transit/path_hmac.go
@@ -1,13 +1,9 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package transit
 
 import (
 	"context"
 	"crypto/hmac"
 	"encoding/base64"
-	"errors"
 	"fmt"
 	"strconv"
 	"strings"
@@ -39,22 +35,11 @@ type batchResponseHMACItem struct {
 	// For batch processing to successfully mimic previous handling for simple 'input',
 	// both output values are needed - though 'err' should never be serialized.
 	err error
-
-	// Reference is an arbitrary caller supplied string value that will be placed on the
-	// batch response to ease correlation between inputs and outputs
-	Reference string `json:"reference" mapstructure:"reference"`
 }
 
 func (b *backend) pathHMAC() *framework.Path {
 	return &framework.Path{
 		Pattern: "hmac/" + framework.GenericNameRegex("name") + framework.OptionalParamRegex("urlalgorithm"),
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixTransit,
-			OperationVerb:   "generate",
-			OperationSuffix: "hmac|hmac-with-algorithm",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"name": {
 				Type:        framework.TypeString,
@@ -154,7 +139,7 @@ func (b *backend) pathHMACWrite(ctx context.Context, req *logical.Request, d *fr
 		p.Unlock()
 		return logical.ErrorResponse(err.Error()), logical.ErrInvalidRequest
 	}
-	if key == nil && p.Type != keysutil.KeyType_MANAGED_KEY {
+	if key == nil {
 		p.Unlock()
 		return nil, fmt.Errorf("HMAC key value could not be computed")
 	}
@@ -210,23 +195,9 @@ func (b *backend) pathHMACWrite(ctx context.Context, req *logical.Request, d *fr
 			continue
 		}
 
-		var retBytes []byte
-
-		if p.Type == keysutil.KeyType_MANAGED_KEY {
-			managedKeySystemView, ok := b.System().(logical.ManagedKeySystemView)
-			if !ok {
-				response[i].err = errors.New("unsupported system view")
-			}
-
-			retBytes, err = p.HMACWithManagedKey(ctx, ver, managedKeySystemView, b.backendUUID, algorithm, input)
-			if err != nil {
-				response[i].err = err
-			}
-		} else {
-			hf := hmac.New(hashAlg, key)
-			hf.Write(input)
-			retBytes = hf.Sum(nil)
-		}
+		hf := hmac.New(hashAlg, key)
+		hf.Write(input)
+		retBytes := hf.Sum(nil)
 
 		retStr := base64.StdEncoding.EncodeToString(retBytes)
 		retStr = fmt.Sprintf("vault:v%s:%s", strconv.Itoa(ver), retStr)
@@ -238,10 +209,6 @@ func (b *backend) pathHMACWrite(ctx context.Context, req *logical.Request, d *fr
 	// Generate the response
 	resp := &logical.Response{}
 	if batchInputRaw != nil {
-		// Copy the references
-		for i := range batchInputItems {
-			response[i].Reference = batchInputItems[i]["reference"]
-		}
 		resp.Data = map[string]interface{}{
 			"batch_results": response,
 		}
@@ -403,10 +370,6 @@ func (b *backend) pathHMACVerify(ctx context.Context, req *logical.Request, d *f
 	// Generate the response
 	resp := &logical.Response{}
 	if batchInputRaw != nil {
-		// Copy the references
-		for i := range batchInputItems {
-			response[i].Reference = batchInputItems[i]["reference"]
-		}
 		resp.Data = map[string]interface{}{
 			"batch_results": response,
 		}
diff --git a/builtin/logical/transit/path_hmac_test.go b/builtin/logical/transit/path_hmac_test.go
index af98dd2ca081a..16dbb1a4903b1 100644
--- a/builtin/logical/transit/path_hmac_test.go
+++ b/builtin/logical/transit/path_hmac_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package transit
 
 import (
@@ -251,18 +248,18 @@ func TestTransit_batchHMAC(t *testing.T) {
 
 	req.Path = "hmac/foo"
 	batchInput := []batchRequestHMACItem{
-		{"input": "dGhlIHF1aWNrIGJyb3duIGZveA==", "reference": "one"},
-		{"input": "dGhlIHF1aWNrIGJyb3duIGZveA==", "reference": "two"},
-		{"input": "", "reference": "three"},
-		{"input": ":;.?", "reference": "four"},
+		{"input": "dGhlIHF1aWNrIGJyb3duIGZveA=="},
+		{"input": "dGhlIHF1aWNrIGJyb3duIGZveA=="},
+		{"input": ""},
+		{"input": ":;.?"},
 		{},
 	}
 
 	expected := []batchResponseHMACItem{
-		{HMAC: "vault:v1:UcBvm5VskkukzZHlPgm3p5P/Yr/PV6xpuOGZISya3A4=", Reference: "one"},
-		{HMAC: "vault:v1:UcBvm5VskkukzZHlPgm3p5P/Yr/PV6xpuOGZISya3A4=", Reference: "two"},
-		{HMAC: "vault:v1:BCfVv6rlnRsIKpjCZCxWvh5iYwSSabRXpX9XJniuNgc=", Reference: "three"},
-		{Error: "unable to decode input as base64: illegal base64 data at input byte 0", Reference: "four"},
+		{HMAC: "vault:v1:UcBvm5VskkukzZHlPgm3p5P/Yr/PV6xpuOGZISya3A4="},
+		{HMAC: "vault:v1:UcBvm5VskkukzZHlPgm3p5P/Yr/PV6xpuOGZISya3A4="},
+		{HMAC: "vault:v1:BCfVv6rlnRsIKpjCZCxWvh5iYwSSabRXpX9XJniuNgc="},
+		{Error: "unable to decode input as base64: illegal base64 data at input byte 0"},
 		{Error: "missing input for HMAC"},
 	}
 
@@ -289,9 +286,6 @@ func TestTransit_batchHMAC(t *testing.T) {
 		if expected[i].Error != "" && expected[i].Error != m.Error {
 			t.Fatalf("Expected Error %q got %q in result %d", expected[i].Error, m.Error, i)
 		}
-		if expected[i].Reference != m.Reference {
-			t.Fatalf("Expected references to match, Got %s, Expected %s", m.Reference, expected[i].Reference)
-		}
 	}
 
 	// Verify a previous version
diff --git a/builtin/logical/transit/path_import.go b/builtin/logical/transit/path_import.go
index 45cb4dd108f22..817cf5fc5ddf2 100644
--- a/builtin/logical/transit/path_import.go
+++ b/builtin/logical/transit/path_import.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package transit
 
 import (
@@ -28,13 +25,6 @@ const EncryptedKeyBytes = 512
 func (b *backend) pathImport() *framework.Path {
 	return &framework.Path{
 		Pattern: "keys/" + framework.GenericNameRegex("name") + "/import",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixTransit,
-			OperationVerb:   "import",
-			OperationSuffix: "key",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"name": {
 				Type:        framework.TypeString,
@@ -59,10 +49,6 @@ ephemeral AES key. Can be one of "SHA1", "SHA224", "SHA256" (default), "SHA384",
 				Description: `The base64-encoded ciphertext of the keys. The AES key should be encrypted using OAEP 
 with the wrapping key and then concatenated with the import key, wrapped by the AES key.`,
 			},
-			"public_key": {
-				Type:        framework.TypeString,
-				Description: `The plaintext PEM public key to be imported. If "ciphertext" is set, this field is ignored.`,
-			},
 			"allow_rotation": {
 				Type:        framework.TypeBool,
 				Description: "True if the imported key may be rotated within Vault; false otherwise.",
@@ -115,13 +101,6 @@ key.`,
 func (b *backend) pathImportVersion() *framework.Path {
 	return &framework.Path{
 		Pattern: "keys/" + framework.GenericNameRegex("name") + "/import_version",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixTransit,
-			OperationVerb:   "import",
-			OperationSuffix: "key-version",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"name": {
 				Type:        framework.TypeString,
@@ -132,21 +111,12 @@ func (b *backend) pathImportVersion() *framework.Path {
 				Description: `The base64-encoded ciphertext of the keys. The AES key should be encrypted using OAEP 
 with the wrapping key and then concatenated with the import key, wrapped by the AES key.`,
 			},
-			"public_key": {
-				Type:        framework.TypeString,
-				Description: `The plaintext public key to be imported. If "ciphertext" is set, this field is ignored.`,
-			},
 			"hash_function": {
 				Type:    framework.TypeString,
 				Default: "SHA256",
 				Description: `The hash function used as a random oracle in the OAEP wrapping of the user-generated,
 ephemeral AES key. Can be one of "SHA1", "SHA224", "SHA256" (default), "SHA384", or "SHA512"`,
 			},
-			"version": {
-				Type: framework.TypeInt,
-				Description: `Key version to be updated, if left empty, a new version will be created unless
-a private key is specified and the 'Latest' key is missing a private key.`,
-			},
 		},
 		Callbacks: map[logical.Operation]framework.OperationFunc{
 			logical.UpdateOperation: b.pathImportVersionWrite,
@@ -160,9 +130,11 @@ func (b *backend) pathImportWrite(ctx context.Context, req *logical.Request, d *
 	name := d.Get("name").(string)
 	derived := d.Get("derived").(bool)
 	keyType := d.Get("type").(string)
+	hashFnStr := d.Get("hash_function").(string)
 	exportable := d.Get("exportable").(bool)
 	allowPlaintextBackup := d.Get("allow_plaintext_backup").(bool)
 	autoRotatePeriod := time.Second * time.Duration(d.Get("auto_rotate_period").(int))
+	ciphertextString := d.Get("ciphertext").(string)
 	allowRotation := d.Get("allow_rotation").(bool)
 
 	// Ensure the caller didn't supply "convergent_encryption" as a field, since it's not supported on import.
@@ -174,12 +146,6 @@ func (b *backend) pathImportWrite(ctx context.Context, req *logical.Request, d *
 		return nil, errors.New("allow_rotation must be set to true if auto-rotation is enabled")
 	}
 
-	// Ensure that at least on `key` field has been set
-	isCiphertextSet, err := checkKeyFieldsSet(d)
-	if err != nil {
-		return nil, err
-	}
-
 	polReq := keysutil.PolicyRequest{
 		Storage:                  req.Storage,
 		Name:                     name,
@@ -188,7 +154,6 @@ func (b *backend) pathImportWrite(ctx context.Context, req *logical.Request, d *
 		AllowPlaintextBackup:     allowPlaintextBackup,
 		AutoRotatePeriod:         autoRotatePeriod,
 		AllowImportedKeyRotation: allowRotation,
-		IsPrivateKey:             isCiphertextSet,
 	}
 
 	switch strings.ToLower(keyType) {
@@ -218,6 +183,11 @@ func (b *backend) pathImportWrite(ctx context.Context, req *logical.Request, d *
 		return logical.ErrorResponse(fmt.Sprintf("unknown key type: %v", keyType)), logical.ErrInvalidRequest
 	}
 
+	hashFn, err := parseHashFn(hashFnStr)
+	if err != nil {
+		return logical.ErrorResponse(err.Error()), logical.ErrInvalidRequest
+	}
+
 	p, _, err := b.GetPolicy(ctx, polReq, b.GetRandomReader())
 	if err != nil {
 		return nil, err
@@ -230,9 +200,14 @@ func (b *backend) pathImportWrite(ctx context.Context, req *logical.Request, d *
 		return nil, errors.New("the import path cannot be used with an existing key; use import-version to rotate an existing imported key")
 	}
 
-	key, resp, err := b.extractKeyFromFields(ctx, req, d, polReq.KeyType, isCiphertextSet)
+	ciphertext, err := base64.StdEncoding.DecodeString(ciphertextString)
 	if err != nil {
-		return resp, err
+		return nil, err
+	}
+
+	key, err := b.decryptImportedKey(ctx, req.Storage, ciphertext, hashFn)
+	if err != nil {
+		return nil, err
 	}
 
 	err = b.lm.ImportPolicy(ctx, polReq, key, b.GetRandomReader())
@@ -245,18 +220,20 @@ func (b *backend) pathImportWrite(ctx context.Context, req *logical.Request, d *
 
 func (b *backend) pathImportVersionWrite(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
 	name := d.Get("name").(string)
+	hashFnStr := d.Get("hash_function").(string)
+	ciphertextString := d.Get("ciphertext").(string)
 
-	isCiphertextSet, err := checkKeyFieldsSet(d)
-	if err != nil {
-		return nil, err
+	polReq := keysutil.PolicyRequest{
+		Storage: req.Storage,
+		Name:    name,
+		Upsert:  false,
 	}
 
-	polReq := keysutil.PolicyRequest{
-		Storage:      req.Storage,
-		Name:         name,
-		Upsert:       false,
-		IsPrivateKey: isCiphertextSet,
+	hashFn, err := parseHashFn(hashFnStr)
+	if err != nil {
+		return logical.ErrorResponse(err.Error()), logical.ErrInvalidRequest
 	}
+
 	p, _, err := b.GetPolicy(ctx, polReq, b.GetRandomReader())
 	if err != nil {
 		return nil, err
@@ -276,24 +253,15 @@ func (b *backend) pathImportVersionWrite(ctx context.Context, req *logical.Reque
 	}
 	defer p.Unlock()
 
-	key, resp, err := b.extractKeyFromFields(ctx, req, d, p.Type, isCiphertextSet)
+	ciphertext, err := base64.StdEncoding.DecodeString(ciphertextString)
 	if err != nil {
-		return resp, err
+		return nil, err
 	}
-
-	// Get param version if set else import a new version.
-	if version, ok := d.GetOk("version"); ok {
-		versionToUpdate := version.(int)
-
-		// Check if given version can be updated given input
-		err = p.KeyVersionCanBeUpdated(versionToUpdate, isCiphertextSet)
-		if err == nil {
-			err = p.ImportPrivateKeyForVersion(ctx, req.Storage, versionToUpdate, key)
-		}
-	} else {
-		err = p.ImportPublicOrPrivate(ctx, req.Storage, key, isCiphertextSet, b.GetRandomReader())
+	importKey, err := b.decryptImportedKey(ctx, req.Storage, ciphertext, hashFn)
+	if err != nil {
+		return nil, err
 	}
-
+	err = p.Import(ctx, req.Storage, importKey, b.GetRandomReader())
 	if err != nil {
 		return nil, err
 	}
@@ -351,36 +319,6 @@ func (b *backend) decryptImportedKey(ctx context.Context, storage logical.Storag
 	return importKey, nil
 }
 
-func (b *backend) extractKeyFromFields(ctx context.Context, req *logical.Request, d *framework.FieldData, keyType keysutil.KeyType, isPrivateKey bool) ([]byte, *logical.Response, error) {
-	var key []byte
-	if isPrivateKey {
-		hashFnStr := d.Get("hash_function").(string)
-		hashFn, err := parseHashFn(hashFnStr)
-		if err != nil {
-			return key, logical.ErrorResponse(err.Error()), logical.ErrInvalidRequest
-		}
-
-		ciphertextString := d.Get("ciphertext").(string)
-		ciphertext, err := base64.StdEncoding.DecodeString(ciphertextString)
-		if err != nil {
-			return key, nil, err
-		}
-
-		key, err = b.decryptImportedKey(ctx, req.Storage, ciphertext, hashFn)
-		if err != nil {
-			return key, nil, err
-		}
-	} else {
-		publicKeyString := d.Get("public_key").(string)
-		if !keyType.ImportPublicKeySupported() {
-			return key, nil, errors.New("provided type does not support public_key import")
-		}
-		key = []byte(publicKeyString)
-	}
-
-	return key, nil, nil
-}
-
 func parseHashFn(hashFn string) (hash.Hash, error) {
 	switch strings.ToUpper(hashFn) {
 	case "SHA1":
@@ -398,29 +336,6 @@ func parseHashFn(hashFn string) (hash.Hash, error) {
 	}
 }
 
-// checkKeyFieldsSet: Checks which key fields are set. If both are set, an error is returned
-func checkKeyFieldsSet(d *framework.FieldData) (bool, error) {
-	ciphertextSet := isFieldSet("ciphertext", d)
-	publicKeySet := isFieldSet("publicKey", d)
-
-	if ciphertextSet && publicKeySet {
-		return false, errors.New("only one of the following fields, ciphertext and public_key, can be set")
-	} else if ciphertextSet {
-		return true, nil
-	} else {
-		return false, nil
-	}
-}
-
-func isFieldSet(fieldName string, d *framework.FieldData) bool {
-	_, fieldSet := d.Raw[fieldName]
-	if !fieldSet {
-		return false
-	}
-
-	return true
-}
-
 const (
 	pathImportWriteSyn  = "Imports an externally-generated key into a new transit key"
 	pathImportWriteDesc = "This path is used to import an externally-generated " +
diff --git a/builtin/logical/transit/path_import_test.go b/builtin/logical/transit/path_import_test.go
index cb59e8de27d7a..d31b12b454e4c 100644
--- a/builtin/logical/transit/path_import_test.go
+++ b/builtin/logical/transit/path_import_test.go
@@ -1,11 +1,7 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package transit
 
 import (
 	"context"
-	"crypto"
 	"crypto/ecdsa"
 	"crypto/ed25519"
 	"crypto/elliptic"
@@ -13,7 +9,6 @@ import (
 	"crypto/rsa"
 	"crypto/x509"
 	"encoding/base64"
-	"encoding/pem"
 	"fmt"
 	"strconv"
 	"sync"
@@ -51,10 +46,7 @@ var (
 	keys     = map[string]interface{}{}
 )
 
-const (
-	nssFormattedEd25519Key = "MGcCAQAwFAYHKoZIzj0CAQYJKwYBBAHaRw8BBEwwSgIBAQQgfJm5R+LK4FMwGzOpemTBXksimEVOVCE8QeC+XBBfNU+hIwMhADaif7IhYx46IHcRTy1z8LeyhABep+UB8Da6olMZGx0i"
-	rsaPSSFormattedKey     = "MIIEvAIBADALBgkqhkiG9w0BAQoEggSoMIIEpAIBAAKCAQEAiFXSBaicB534+2qMZTVzQHMjuhb4NM9hi5H4EAFiYHEBuvm2BAk58NdBK3wiMq/p7Ewu5NQI0gJ7GlcV1MBU94U6MEmWNd0ztmlz37esEDuaCDhmLEBHKRzs8Om0bY9vczcNwcnRIYusP2KMxon3Gv2C86M2Jahig70AIq0E9C7esfrlYxFnoxUfO09XyYfiHlZY59+/dhyULp/RDIvaQ0/DqSSnYmXw8vRQ1gp6DqIzxx3j8ikUrpE7MK6348keFQj1eb83Z5w8qgIdceHHH4wbIAW7qWCPJ/vIJp8Pe1NEanlef61pDut2YcljvN79ccjX/QyqwqYv6xX2uzSlpQIDAQABAoIBACtpBCAoIVJtkv9e3EhHniR55PjWYn7SP5GEz3MtNalWokHqS/H6DBhrOcWCV5NDHx1N3qqe9xYDkzX+X6Wn/gX4RmBkte79uX8OEca8wY1DpRaT+riBWQc2vh0xlPFDuC177KX1QGFJi3V9SCzZdjSCXyV7pPyVopSm4/mmlMq5ANfN8bcHAtcArP7vPzEdckJqurjwHyzsUZJa9sk3OL3rBkKy5bmoPebE1ZQ7C+9eA4u9MKSy95WpTiqMe3rRhvr6zj4bzEvzS9M4r2EdwgAn4FyDwtGdOqtfbtSLTikb73f4MSINnWbt3YPBfRC4PGjWXIN2sMG5XYC3KH+RKbsCgYEAu0HOFInH8OtWiUY0aqRKZuo7lrBczNa5gnce3ZYnNkfrPlu1Xp0SjUkEWukznBLO0N9lvG9j3ksUDTQlPoKarJb9uf/1H0tYHhHm6mP8mH87yfVn2bLb3VPeIQYb+MXnDrwNVCAtxhuHlpnXJPldeuVKeRigHUNIEs76UMiiLqMCgYEAumJxm5NrKk0LXUQmeZolLh0lM/shg8zW7Vi3Ksz5Pe4Pcmg+hTbHjZuJwK6HesljEA0JDNkS0+5hkqiS5UDnj94XfDbi08/kKbPYA12GPVSRNTJxL8q70rFnEUZuMBeL0SKMPhEfR2z5TDDZUBoO6HBUUwgJAij1EsXrBAb0BxcCgYBKS3eKKohLi/PPjy0oynpCjtiJlvuawe7kVoLGg9aW8L3jBdvV6Bf+OmQh9bhmSggIUzo4IzHKdptECdZlEMhxhY6xh14nxmr1s0Cc6oLDtmdwX4+OjioxjB7rl1Ltxwc/j1jycbn3ieCn3e3AW7e9FNARb7XHJnSoEbq65n+CZQKBgQChLPozYAL/HIrkR0fCRmM6gmemkNeFo0CFFP+oWoJ6ZIAlHjJafmmIcmVoI0TzEG3C9pLJ8nmOnYjxCyekakEUryi9+LSkGBWlXmlBV8H7DUNYrlskyfssEs8fKDmnCuWUn3yJO8NBv+HBWkjCNRaJOIIjH0KzBHoRludJnz2tVwKBgQCsQF5lvcXefNfQojbhF+9NfyhvAc7EsMTXQhP9HEj0wVqTuuqyGyu8meXEkcQPRl6yD/yZKuMREDNNck4KV2fdGekBsh8zBgpxdHQ2DcbfxZfNgv3yoX3f0grb/ApQNJb3DVW9FVRigue8XPzFOFX/demJmkUnTg3zGFnXLXjgxg=="
-)
+const nssFormattedEd25519Key = "MGcCAQAwFAYHKoZIzj0CAQYJKwYBBAHaRw8BBEwwSgIBAQQgfJm5R+LK4FMwGzOpemTBXksimEVOVCE8QeC+XBBfNU+hIwMhADaif7IhYx46IHcRTy1z8LeyhABep+UB8Da6olMZGx0i"
 
 func generateKeys(t *testing.T) {
 	t.Helper()
@@ -122,39 +114,6 @@ func TestTransit_ImportNSSEd25519Key(t *testing.T) {
 	}
 }
 
-func TestTransit_ImportRSAPSS(t *testing.T) {
-	generateKeys(t)
-	b, s := createBackendWithStorage(t)
-
-	wrappingKey, err := b.getWrappingKey(context.Background(), s)
-	if err != nil || wrappingKey == nil {
-		t.Fatalf("failed to retrieve public wrapping key: %s", err)
-	}
-	privWrappingKey := wrappingKey.Keys[strconv.Itoa(wrappingKey.LatestVersion)].RSAKey
-	pubWrappingKey := &privWrappingKey.PublicKey
-
-	rawPKCS8, err := base64.StdEncoding.DecodeString(rsaPSSFormattedKey)
-	if err != nil {
-		t.Fatalf("failed to parse rsa-pss base64: %v", err)
-	}
-
-	blob := wrapTargetPKCS8ForImport(t, pubWrappingKey, rawPKCS8, "SHA256")
-	req := &logical.Request{
-		Storage:   s,
-		Operation: logical.UpdateOperation,
-		Path:      "keys/rsa-pss/import",
-		Data: map[string]interface{}{
-			"ciphertext": blob,
-			"type":       "rsa-2048",
-		},
-	}
-
-	_, err = b.HandleRequest(context.Background(), req)
-	if err != nil {
-		t.Fatalf("failed to import RSA-PSS private key: %v", err)
-	}
-}
-
 func TestTransit_Import(t *testing.T) {
 	generateKeys(t)
 	b, s := createBackendWithStorage(t)
@@ -429,70 +388,6 @@ func TestTransit_Import(t *testing.T) {
 			}
 		},
 	)
-
-	t.Run(
-		"import public key ed25519",
-		func(t *testing.T) {
-			keyType := "ed25519"
-			keyID, err := uuid.GenerateUUID()
-			if err != nil {
-				t.Fatalf("failed to generate key ID: %s", err)
-			}
-
-			// Get keys
-			privateKey := getKey(t, keyType)
-			publicKeyBytes, err := getPublicKey(privateKey, keyType)
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			// Import key
-			req := &logical.Request{
-				Storage:   s,
-				Operation: logical.UpdateOperation,
-				Path:      fmt.Sprintf("keys/%s/import", keyID),
-				Data: map[string]interface{}{
-					"public_key": publicKeyBytes,
-					"type":       keyType,
-				},
-			}
-			_, err = b.HandleRequest(context.Background(), req)
-			if err != nil {
-				t.Fatalf("failed to import ed25519 key: %v", err)
-			}
-		})
-
-	t.Run(
-		"import public key ecdsa",
-		func(t *testing.T) {
-			keyType := "ecdsa-p256"
-			keyID, err := uuid.GenerateUUID()
-			if err != nil {
-				t.Fatalf("failed to generate key ID: %s", err)
-			}
-
-			// Get keys
-			privateKey := getKey(t, keyType)
-			publicKeyBytes, err := getPublicKey(privateKey, keyType)
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			// Import key
-			req := &logical.Request{
-				Storage:   s,
-				Operation: logical.UpdateOperation,
-				Path:      fmt.Sprintf("keys/%s/import", keyID),
-				Data: map[string]interface{}{
-					"public_key": publicKeyBytes,
-					"type":       keyType,
-				},
-			}
-			_, err = b.HandleRequest(context.Background(), req)
-			if err != nil {
-				t.Fatalf("failed to import public key: %s", err)
-			}
-		})
 }
 
 func TestTransit_ImportVersion(t *testing.T) {
@@ -639,313 +534,6 @@ func TestTransit_ImportVersion(t *testing.T) {
 			}
 		},
 	)
-
-	t.Run(
-		"import rsa public key and update version with private counterpart",
-		func(t *testing.T) {
-			keyType := "rsa-2048"
-			keyID, err := uuid.GenerateUUID()
-			if err != nil {
-				t.Fatalf("failed to generate key ID: %s", err)
-			}
-
-			// Get keys
-			privateKey := getKey(t, keyType)
-			importBlob := wrapTargetKeyForImport(t, pubWrappingKey, privateKey, keyType, "SHA256")
-			publicKeyBytes, err := getPublicKey(privateKey, keyType)
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			// Import RSA public key
-			req := &logical.Request{
-				Storage:   s,
-				Operation: logical.UpdateOperation,
-				Path:      fmt.Sprintf("keys/%s/import", keyID),
-				Data: map[string]interface{}{
-					"public_key": publicKeyBytes,
-					"type":       keyType,
-				},
-			}
-			_, err = b.HandleRequest(context.Background(), req)
-			if err != nil {
-				t.Fatalf("failed to import public key: %s", err)
-			}
-
-			// Update version - import RSA private key
-			req = &logical.Request{
-				Storage:   s,
-				Operation: logical.UpdateOperation,
-				Path:      fmt.Sprintf("keys/%s/import_version", keyID),
-				Data: map[string]interface{}{
-					"ciphertext": importBlob,
-				},
-			}
-			_, err = b.HandleRequest(context.Background(), req)
-			if err != nil {
-				t.Fatalf("failed to update key: %s", err)
-			}
-		},
-	)
-}
-
-func TestTransit_ImportVersionWithPublicKeys(t *testing.T) {
-	generateKeys(t)
-	b, s := createBackendWithStorage(t)
-
-	// Retrieve public wrapping key
-	wrappingKey, err := b.getWrappingKey(context.Background(), s)
-	if err != nil || wrappingKey == nil {
-		t.Fatalf("failed to retrieve public wrapping key: %s", err)
-	}
-	privWrappingKey := wrappingKey.Keys[strconv.Itoa(wrappingKey.LatestVersion)].RSAKey
-	pubWrappingKey := &privWrappingKey.PublicKey
-
-	// Import a public key then import private should give us one key
-	t.Run(
-		"import rsa public key and update version with private counterpart",
-		func(t *testing.T) {
-			keyType := "ecdsa-p256"
-			keyID, err := uuid.GenerateUUID()
-			if err != nil {
-				t.Fatalf("failed to generate key ID: %s", err)
-			}
-
-			// Get keys
-			privateKey := getKey(t, keyType)
-			importBlob := wrapTargetKeyForImport(t, pubWrappingKey, privateKey, keyType, "SHA256")
-			publicKeyBytes, err := getPublicKey(privateKey, keyType)
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			// Import EC public key
-			req := &logical.Request{
-				Storage:   s,
-				Operation: logical.UpdateOperation,
-				Path:      fmt.Sprintf("keys/%s/import", keyID),
-				Data: map[string]interface{}{
-					"public_key": publicKeyBytes,
-					"type":       keyType,
-				},
-			}
-			_, err = b.HandleRequest(context.Background(), req)
-			if err != nil {
-				t.Fatalf("failed to import public key: %s", err)
-			}
-
-			// Update version - import EC private key
-			req = &logical.Request{
-				Storage:   s,
-				Operation: logical.UpdateOperation,
-				Path:      fmt.Sprintf("keys/%s/import_version", keyID),
-				Data: map[string]interface{}{
-					"ciphertext": importBlob,
-				},
-			}
-			_, err = b.HandleRequest(context.Background(), req)
-			if err != nil {
-				t.Fatalf("failed to update key: %s", err)
-			}
-
-			// We should have one key on export
-			req = &logical.Request{
-				Storage:   s,
-				Operation: logical.ReadOperation,
-				Path:      fmt.Sprintf("export/public-key/%s", keyID),
-			}
-			resp, err := b.HandleRequest(context.Background(), req)
-			if err != nil {
-				t.Fatalf("failed to export key: %s", err)
-			}
-
-			if len(resp.Data["keys"].(map[string]string)) != 1 {
-				t.Fatalf("expected 1 key but got %v: %v", len(resp.Data["keys"].(map[string]string)), resp)
-			}
-		},
-	)
-
-	// Import a private and then public should give us two keys
-	t.Run(
-		"import ec private key and then its public counterpart",
-		func(t *testing.T) {
-			keyType := "ecdsa-p256"
-			keyID, err := uuid.GenerateUUID()
-			if err != nil {
-				t.Fatalf("failed to generate key ID: %s", err)
-			}
-
-			// Get keys
-			privateKey := getKey(t, keyType)
-			importBlob := wrapTargetKeyForImport(t, pubWrappingKey, privateKey, keyType, "SHA256")
-			publicKeyBytes, err := getPublicKey(privateKey, keyType)
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			// Import EC private key
-			req := &logical.Request{
-				Storage:   s,
-				Operation: logical.UpdateOperation,
-				Path:      fmt.Sprintf("keys/%s/import", keyID),
-				Data: map[string]interface{}{
-					"ciphertext": importBlob,
-					"type":       keyType,
-				},
-			}
-			_, err = b.HandleRequest(context.Background(), req)
-			if err != nil {
-				t.Fatalf("failed to update key: %s", err)
-			}
-
-			// Update version - Import EC public key
-			req = &logical.Request{
-				Storage:   s,
-				Operation: logical.UpdateOperation,
-				Path:      fmt.Sprintf("keys/%s/import_version", keyID),
-				Data: map[string]interface{}{
-					"public_key": publicKeyBytes,
-				},
-			}
-			_, err = b.HandleRequest(context.Background(), req)
-			if err != nil {
-				t.Fatalf("failed to import public key: %s", err)
-			}
-
-			// We should have two keys on export
-			req = &logical.Request{
-				Storage:   s,
-				Operation: logical.ReadOperation,
-				Path:      fmt.Sprintf("export/public-key/%s", keyID),
-			}
-			resp, err := b.HandleRequest(context.Background(), req)
-			if err != nil {
-				t.Fatalf("failed to export key: %s", err)
-			}
-
-			if len(resp.Data["keys"].(map[string]string)) != 2 {
-				t.Fatalf("expected 2 key but got %v: %v", len(resp.Data["keys"].(map[string]string)), resp)
-			}
-		},
-	)
-
-	// Import a public and another public should allow us to insert two private key.
-	t.Run(
-		"import two public keys and two private keys in reverse order",
-		func(t *testing.T) {
-			keyType := "ecdsa-p256"
-			keyID, err := uuid.GenerateUUID()
-			if err != nil {
-				t.Fatalf("failed to generate key ID: %s", err)
-			}
-
-			// Get keys
-			privateKey1 := getKey(t, keyType)
-			importBlob1 := wrapTargetKeyForImport(t, pubWrappingKey, privateKey1, keyType, "SHA256")
-			publicKeyBytes1, err := getPublicKey(privateKey1, keyType)
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			privateKey2, err := generateKey(keyType)
-			if err != nil {
-				t.Fatal(err)
-			}
-			importBlob2 := wrapTargetKeyForImport(t, pubWrappingKey, privateKey2, keyType, "SHA256")
-			publicKeyBytes2, err := getPublicKey(privateKey2, keyType)
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			// Import EC public key
-			req := &logical.Request{
-				Storage:   s,
-				Operation: logical.UpdateOperation,
-				Path:      fmt.Sprintf("keys/%s/import", keyID),
-				Data: map[string]interface{}{
-					"public_key": publicKeyBytes1,
-					"type":       keyType,
-				},
-			}
-			_, err = b.HandleRequest(context.Background(), req)
-			if err != nil {
-				t.Fatalf("failed to update key: %s", err)
-			}
-
-			// Update version - Import second EC public key
-			req = &logical.Request{
-				Storage:   s,
-				Operation: logical.UpdateOperation,
-				Path:      fmt.Sprintf("keys/%s/import_version", keyID),
-				Data: map[string]interface{}{
-					"public_key": publicKeyBytes2,
-				},
-			}
-			_, err = b.HandleRequest(context.Background(), req)
-			if err != nil {
-				t.Fatalf("failed to import public key: %s", err)
-			}
-
-			// We should have two keys on export
-			req = &logical.Request{
-				Storage:   s,
-				Operation: logical.ReadOperation,
-				Path:      fmt.Sprintf("export/public-key/%s", keyID),
-			}
-			resp, err := b.HandleRequest(context.Background(), req)
-			if err != nil {
-				t.Fatalf("failed to export key: %s", err)
-			}
-
-			if len(resp.Data["keys"].(map[string]string)) != 2 {
-				t.Fatalf("expected 2 key but got %v: %v", len(resp.Data["keys"].(map[string]string)), resp)
-			}
-
-			// Import second private key first, with no options.
-			req = &logical.Request{
-				Storage:   s,
-				Operation: logical.UpdateOperation,
-				Path:      fmt.Sprintf("keys/%s/import_version", keyID),
-				Data: map[string]interface{}{
-					"ciphertext": importBlob2,
-				},
-			}
-			_, err = b.HandleRequest(context.Background(), req)
-			if err != nil {
-				t.Fatalf("failed to import private key: %s", err)
-			}
-
-			// Import first private key second, with a version
-			req = &logical.Request{
-				Storage:   s,
-				Operation: logical.UpdateOperation,
-				Path:      fmt.Sprintf("keys/%s/import_version", keyID),
-				Data: map[string]interface{}{
-					"ciphertext": importBlob1,
-					"version":    1,
-				},
-			}
-			_, err = b.HandleRequest(context.Background(), req)
-			if err != nil {
-				t.Fatalf("failed to import private key: %s", err)
-			}
-
-			// We should still have two keys on export
-			req = &logical.Request{
-				Storage:   s,
-				Operation: logical.ReadOperation,
-				Path:      fmt.Sprintf("export/public-key/%s", keyID),
-			}
-			resp, err = b.HandleRequest(context.Background(), req)
-			if err != nil {
-				t.Fatalf("failed to export key: %s", err)
-			}
-
-			if len(resp.Data["keys"].(map[string]string)) != 2 {
-				t.Fatalf("expected 2 key but got %v: %v", len(resp.Data["keys"].(map[string]string)), resp)
-			}
-		},
-	)
 }
 
 func wrapTargetKeyForImport(t *testing.T, wrappingKey *rsa.PublicKey, targetKey interface{}, targetKeyType string, hashFnName string) string {
@@ -1036,40 +624,3 @@ func generateKey(keyType string) (interface{}, error) {
 		return nil, fmt.Errorf("failed to generate unsupported key type: %s", keyType)
 	}
 }
-
-func getPublicKey(privateKey crypto.PrivateKey, keyType string) ([]byte, error) {
-	var publicKey crypto.PublicKey
-	var publicKeyBytes []byte
-	switch keyType {
-	case "rsa-2048", "rsa-3072", "rsa-4096":
-		publicKey = privateKey.(*rsa.PrivateKey).Public()
-	case "ecdsa-p256", "ecdsa-p384", "ecdsa-p521":
-		publicKey = privateKey.(*ecdsa.PrivateKey).Public()
-	case "ed25519":
-		publicKey = privateKey.(ed25519.PrivateKey).Public()
-	default:
-		return publicKeyBytes, fmt.Errorf("failed to get public key from %s key", keyType)
-	}
-
-	publicKeyBytes, err := publicKeyToBytes(publicKey)
-	if err != nil {
-		return publicKeyBytes, err
-	}
-
-	return publicKeyBytes, nil
-}
-
-func publicKeyToBytes(publicKey crypto.PublicKey) ([]byte, error) {
-	var publicKeyBytesPem []byte
-	publicKeyBytes, err := x509.MarshalPKIXPublicKey(publicKey)
-	if err != nil {
-		return publicKeyBytesPem, fmt.Errorf("failed to marshal public key: %s", err)
-	}
-
-	pemBlock := &pem.Block{
-		Type:  "PUBLIC KEY",
-		Bytes: publicKeyBytes,
-	}
-
-	return pem.EncodeToMemory(pemBlock), nil
-}
diff --git a/builtin/logical/transit/path_keys.go b/builtin/logical/transit/path_keys.go
index 285f32d33cdce..e8edabc1769c5 100644
--- a/builtin/logical/transit/path_keys.go
+++ b/builtin/logical/transit/path_keys.go
@@ -1,11 +1,7 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package transit
 
 import (
 	"context"
-	"crypto"
 	"crypto/elliptic"
 	"crypto/x509"
 	"encoding/base64"
@@ -26,11 +22,6 @@ func (b *backend) pathListKeys() *framework.Path {
 	return &framework.Path{
 		Pattern: "keys/?$",
 
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixTransit,
-			OperationSuffix: "keys",
-		},
-
 		Callbacks: map[logical.Operation]framework.OperationFunc{
 			logical.ListOperation: b.pathKeysList,
 		},
@@ -43,12 +34,6 @@ func (b *backend) pathListKeys() *framework.Path {
 func (b *backend) pathKeys() *framework.Path {
 	return &framework.Path{
 		Pattern: "keys/" + framework.GenericNameRegex("name"),
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixTransit,
-			OperationSuffix: "key",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"name": {
 				Type:        framework.TypeString,
@@ -123,35 +108,12 @@ key.`,
 				Default:     0,
 				Description: fmt.Sprintf("The key size in bytes for the algorithm.  Only applies to HMAC and must be no fewer than %d bytes and no more than %d", keysutil.HmacMinKeySize, keysutil.HmacMaxKeySize),
 			},
-			"managed_key_name": {
-				Type:        framework.TypeString,
-				Description: "The name of the managed key to use for this transit key",
-			},
-			"managed_key_id": {
-				Type:        framework.TypeString,
-				Description: "The UUID of the managed key to use for this transit key",
-			},
 		},
 
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.UpdateOperation: &framework.PathOperation{
-				Callback: b.pathPolicyWrite,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb: "create",
-				},
-			},
-			logical.DeleteOperation: &framework.PathOperation{
-				Callback: b.pathPolicyDelete,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb: "delete",
-				},
-			},
-			logical.ReadOperation: &framework.PathOperation{
-				Callback: b.pathPolicyRead,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb: "read",
-				},
-			},
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.UpdateOperation: b.pathPolicyWrite,
+			logical.DeleteOperation: b.pathPolicyDelete,
+			logical.ReadOperation:   b.pathPolicyRead,
 		},
 
 		HelpSynopsis:    pathPolicyHelpSyn,
@@ -177,8 +139,6 @@ func (b *backend) pathPolicyWrite(ctx context.Context, req *logical.Request, d *
 	exportable := d.Get("exportable").(bool)
 	allowPlaintextBackup := d.Get("allow_plaintext_backup").(bool)
 	autoRotatePeriod := time.Second * time.Duration(d.Get("auto_rotate_period").(int))
-	managedKeyName := d.Get("managed_key_name").(string)
-	managedKeyId := d.Get("managed_key_id").(string)
 
 	if autoRotatePeriod != 0 && autoRotatePeriod < time.Hour {
 		return logical.ErrorResponse("auto rotate period must be 0 to disable or at least an hour"), nil
@@ -222,8 +182,6 @@ func (b *backend) pathPolicyWrite(ctx context.Context, req *logical.Request, d *
 		polReq.KeyType = keysutil.KeyType_RSA4096
 	case "hmac":
 		polReq.KeyType = keysutil.KeyType_HMAC
-	case "managed_key":
-		polReq.KeyType = keysutil.KeyType_MANAGED_KEY
 	default:
 		return logical.ErrorResponse(fmt.Sprintf("unknown key type %v", keyType)), logical.ErrInvalidRequest
 	}
@@ -237,15 +195,6 @@ func (b *backend) pathPolicyWrite(ctx context.Context, req *logical.Request, d *
 		polReq.KeySize = keySize
 	}
 
-	if polReq.KeyType == keysutil.KeyType_MANAGED_KEY {
-		keyId, err := GetManagedKeyUUID(ctx, b, managedKeyName, managedKeyId)
-		if err != nil {
-			return nil, err
-		}
-
-		polReq.ManagedKeyUUID = keyId
-	}
-
 	p, upserted, err := b.GetPolicy(ctx, polReq, b.GetRandomReader())
 	if err != nil {
 		return nil, err
@@ -257,14 +206,12 @@ func (b *backend) pathPolicyWrite(ctx context.Context, req *logical.Request, d *
 		p.Unlock()
 	}
 
-	resp, err := b.formatKeyPolicy(p, nil)
-	if err != nil {
-		return nil, err
-	}
+	resp := &logical.Response{}
 	if !upserted {
 		resp.AddWarning(fmt.Sprintf("key %s already existed", name))
 	}
-	return resp, nil
+
+	return nil, nil
 }
 
 // Built-in helper type for returning asymmetric keys
@@ -292,19 +239,6 @@ func (b *backend) pathPolicyRead(ctx context.Context, req *logical.Request, d *f
 	}
 	defer p.Unlock()
 
-	contextRaw := d.Get("context").(string)
-	var context []byte
-	if len(contextRaw) != 0 {
-		context, err = base64.StdEncoding.DecodeString(contextRaw)
-		if err != nil {
-			return logical.ErrorResponse("failed to base64-decode context"), logical.ErrInvalidRequest
-		}
-	}
-
-	return b.formatKeyPolicy(p, context)
-}
-
-func (b *backend) formatKeyPolicy(p *keysutil.Policy, context []byte) (*logical.Response, error) {
 	// Return the response
 	resp := &logical.Response{
 		Data: map[string]interface{}{
@@ -361,6 +295,15 @@ func (b *backend) formatKeyPolicy(p *keysutil.Policy, context []byte) (*logical.
 		}
 	}
 
+	contextRaw := d.Get("context").(string)
+	var context []byte
+	if len(contextRaw) != 0 {
+		context, err = base64.StdEncoding.DecodeString(contextRaw)
+		if err != nil {
+			return logical.ErrorResponse("failed to base64-decode context"), logical.ErrInvalidRequest
+		}
+	}
+
 	switch p.Type {
 	case keysutil.KeyType_AES128_GCM96, keysutil.KeyType_AES256_GCM96, keysutil.KeyType_ChaCha20_Poly1305:
 		retKeys := map[string]int64{}
@@ -398,7 +341,7 @@ func (b *backend) formatKeyPolicy(p *keysutil.Policy, context []byte) (*logical.
 						}
 						derived, err := p.GetKey(context, ver, 32)
 						if err != nil {
-							return nil, fmt.Errorf("failed to derive key to return public component: %w", err)
+							return nil, fmt.Errorf("failed to derive key to return public component")
 						}
 						pubKey := ed25519.PrivateKey(derived).Public().(ed25519.PublicKey)
 						key.PublicKey = base64.StdEncoding.EncodeToString(pubKey)
@@ -415,15 +358,9 @@ func (b *backend) formatKeyPolicy(p *keysutil.Policy, context []byte) (*logical.
 					key.Name = "rsa-4096"
 				}
 
-				var publicKey crypto.PublicKey
-				publicKey = v.RSAPublicKey
-				if !v.IsPrivateKeyMissing() {
-					publicKey = v.RSAKey.Public()
-				}
-
 				// Encode the RSA public key in PEM format to return over the
 				// API
-				derBytes, err := x509.MarshalPKIXPublicKey(publicKey)
+				derBytes, err := x509.MarshalPKIXPublicKey(v.RSAKey.Public())
 				if err != nil {
 					return nil, fmt.Errorf("error marshaling RSA public key: %w", err)
 				}
diff --git a/builtin/logical/transit/path_keys_config.go b/builtin/logical/transit/path_keys_config.go
deleted file mode 100644
index 722d39c1e3b5f..0000000000000
--- a/builtin/logical/transit/path_keys_config.go
+++ /dev/null
@@ -1,261 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package transit
-
-import (
-	"context"
-	"fmt"
-	"time"
-
-	"github.com/hashicorp/vault/sdk/framework"
-	"github.com/hashicorp/vault/sdk/helper/keysutil"
-	"github.com/hashicorp/vault/sdk/logical"
-)
-
-func (b *backend) pathKeysConfig() *framework.Path {
-	return &framework.Path{
-		Pattern: "keys/" + framework.GenericNameRegex("name") + "/config",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixTransit,
-			OperationVerb:   "configure",
-			OperationSuffix: "key",
-		},
-
-		Fields: map[string]*framework.FieldSchema{
-			"name": {
-				Type:        framework.TypeString,
-				Description: "Name of the key",
-			},
-
-			"min_decryption_version": {
-				Type: framework.TypeInt,
-				Description: `If set, the minimum version of the key allowed
-to be decrypted. For signing keys, the minimum
-version allowed to be used for verification.`,
-			},
-
-			"min_encryption_version": {
-				Type: framework.TypeInt,
-				Description: `If set, the minimum version of the key allowed
-to be used for encryption; or for signing keys,
-to be used for signing. If set to zero, only
-the latest version of the key is allowed.`,
-			},
-
-			"deletion_allowed": {
-				Type:        framework.TypeBool,
-				Description: "Whether to allow deletion of the key",
-			},
-
-			"exportable": {
-				Type:        framework.TypeBool,
-				Description: `Enables export of the key. Once set, this cannot be disabled.`,
-			},
-
-			"allow_plaintext_backup": {
-				Type:        framework.TypeBool,
-				Description: `Enables taking a backup of the named key in plaintext format. Once set, this cannot be disabled.`,
-			},
-
-			"auto_rotate_period": {
-				Type: framework.TypeDurationSecond,
-				Description: `Amount of time the key should live before
-being automatically rotated. A value of 0
-disables automatic rotation for the key.`,
-			},
-		},
-
-		Callbacks: map[logical.Operation]framework.OperationFunc{
-			logical.UpdateOperation: b.pathKeysConfigWrite,
-		},
-
-		HelpSynopsis:    pathKeysConfigHelpSyn,
-		HelpDescription: pathKeysConfigHelpDesc,
-	}
-}
-
-func (b *backend) pathKeysConfigWrite(ctx context.Context, req *logical.Request, d *framework.FieldData) (resp *logical.Response, retErr error) {
-	name := d.Get("name").(string)
-
-	// Check if the policy already exists before we lock everything
-	p, _, err := b.GetPolicy(ctx, keysutil.PolicyRequest{
-		Storage: req.Storage,
-		Name:    name,
-	}, b.GetRandomReader())
-	if err != nil {
-		return nil, err
-	}
-	if p == nil {
-		return logical.ErrorResponse(
-				fmt.Sprintf("no existing key named %s could be found", name)),
-			logical.ErrInvalidRequest
-	}
-	if !b.System().CachingDisabled() {
-		p.Lock(true)
-	}
-	defer p.Unlock()
-
-	var warning string
-
-	originalMinDecryptionVersion := p.MinDecryptionVersion
-	originalMinEncryptionVersion := p.MinEncryptionVersion
-	originalDeletionAllowed := p.DeletionAllowed
-	originalExportable := p.Exportable
-	originalAllowPlaintextBackup := p.AllowPlaintextBackup
-
-	defer func() {
-		if retErr != nil || (resp != nil && resp.IsError()) {
-			p.MinDecryptionVersion = originalMinDecryptionVersion
-			p.MinEncryptionVersion = originalMinEncryptionVersion
-			p.DeletionAllowed = originalDeletionAllowed
-			p.Exportable = originalExportable
-			p.AllowPlaintextBackup = originalAllowPlaintextBackup
-		}
-	}()
-
-	persistNeeded := false
-
-	minDecryptionVersionRaw, ok := d.GetOk("min_decryption_version")
-	if ok {
-		minDecryptionVersion := minDecryptionVersionRaw.(int)
-
-		if minDecryptionVersion < 0 {
-			return logical.ErrorResponse("min decryption version cannot be negative"), nil
-		}
-
-		if minDecryptionVersion == 0 {
-			minDecryptionVersion = 1
-			warning = "since Vault 0.3, transit key numbering starts at 1; forcing minimum to 1"
-		}
-
-		if minDecryptionVersion != p.MinDecryptionVersion {
-			if minDecryptionVersion > p.LatestVersion {
-				return logical.ErrorResponse(
-					fmt.Sprintf("cannot set min decryption version of %d, latest key version is %d", minDecryptionVersion, p.LatestVersion)), nil
-			}
-			p.MinDecryptionVersion = minDecryptionVersion
-			persistNeeded = true
-		}
-	}
-
-	minEncryptionVersionRaw, ok := d.GetOk("min_encryption_version")
-	if ok {
-		minEncryptionVersion := minEncryptionVersionRaw.(int)
-
-		if minEncryptionVersion < 0 {
-			return logical.ErrorResponse("min encryption version cannot be negative"), nil
-		}
-
-		if minEncryptionVersion != p.MinEncryptionVersion {
-			if minEncryptionVersion > p.LatestVersion {
-				return logical.ErrorResponse(
-					fmt.Sprintf("cannot set min encryption version of %d, latest key version is %d", minEncryptionVersion, p.LatestVersion)), nil
-			}
-			p.MinEncryptionVersion = minEncryptionVersion
-			persistNeeded = true
-		}
-	}
-
-	// Check here to get the final picture after the logic on each
-	// individually. MinDecryptionVersion will always be 1 or above.
-	if p.MinEncryptionVersion > 0 &&
-		p.MinEncryptionVersion < p.MinDecryptionVersion {
-		return logical.ErrorResponse(
-			fmt.Sprintf("cannot set min encryption/decryption values; min encryption version of %d must be greater than or equal to min decryption version of %d", p.MinEncryptionVersion, p.MinDecryptionVersion)), nil
-	}
-
-	allowDeletionInt, ok := d.GetOk("deletion_allowed")
-	if ok {
-		allowDeletion := allowDeletionInt.(bool)
-		if allowDeletion != p.DeletionAllowed {
-			p.DeletionAllowed = allowDeletion
-			persistNeeded = true
-		}
-	}
-
-	// Add this as a guard here before persisting since we now require the min
-	// decryption version to start at 1; even if it's not explicitly set here,
-	// force the upgrade
-	if p.MinDecryptionVersion == 0 {
-		p.MinDecryptionVersion = 1
-		persistNeeded = true
-	}
-
-	exportableRaw, ok := d.GetOk("exportable")
-	if ok {
-		exportable := exportableRaw.(bool)
-		// Don't unset the already set value
-		if exportable && !p.Exportable {
-			p.Exportable = exportable
-			persistNeeded = true
-		}
-	}
-
-	allowPlaintextBackupRaw, ok := d.GetOk("allow_plaintext_backup")
-	if ok {
-		allowPlaintextBackup := allowPlaintextBackupRaw.(bool)
-		// Don't unset the already set value
-		if allowPlaintextBackup && !p.AllowPlaintextBackup {
-			p.AllowPlaintextBackup = allowPlaintextBackup
-			persistNeeded = true
-		}
-	}
-
-	autoRotatePeriodRaw, ok, err := d.GetOkErr("auto_rotate_period")
-	if err != nil {
-		return nil, err
-	}
-	if ok {
-		autoRotatePeriod := time.Second * time.Duration(autoRotatePeriodRaw.(int))
-		// Provided value must be 0 to disable or at least an hour
-		if autoRotatePeriod != 0 && autoRotatePeriod < time.Hour {
-			return logical.ErrorResponse("auto rotate period must be 0 to disable or at least an hour"), nil
-		}
-
-		if autoRotatePeriod != p.AutoRotatePeriod {
-			p.AutoRotatePeriod = autoRotatePeriod
-			persistNeeded = true
-		}
-	}
-
-	if !persistNeeded {
-		resp, err := b.formatKeyPolicy(p, nil)
-		if err != nil {
-			return nil, err
-		}
-		if warning != "" {
-			resp.AddWarning(warning)
-		}
-		return resp, nil
-	}
-
-	switch {
-	case p.MinAvailableVersion > p.MinEncryptionVersion:
-		return logical.ErrorResponse("min encryption version should not be less than min available version"), nil
-	case p.MinAvailableVersion > p.MinDecryptionVersion:
-		return logical.ErrorResponse("min decryption version should not be less then min available version"), nil
-	}
-
-	if err := p.Persist(ctx, req.Storage); err != nil {
-		return nil, err
-	}
-
-	resp, err = b.formatKeyPolicy(p, nil)
-	if err != nil {
-		return nil, err
-	}
-	if warning != "" {
-		resp.AddWarning(warning)
-	}
-	return resp, nil
-}
-
-const pathKeysConfigHelpSyn = `Configure a named encryption key`
-
-const pathKeysConfigHelpDesc = `
-This path is used to configure the named key. Currently, this
-supports adjusting the minimum version of the key allowed to
-be used for decryption via the min_decryption_version parameter.
-`
diff --git a/builtin/logical/transit/path_keys_config_test.go b/builtin/logical/transit/path_keys_config_test.go
deleted file mode 100644
index 335607c3b0e1d..0000000000000
--- a/builtin/logical/transit/path_keys_config_test.go
+++ /dev/null
@@ -1,408 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package transit
-
-import (
-	"context"
-	"encoding/hex"
-	"encoding/json"
-	"fmt"
-	"strconv"
-	"strings"
-	"testing"
-	"time"
-
-	uuid "github.com/hashicorp/go-uuid"
-	"github.com/hashicorp/vault/api"
-	vaulthttp "github.com/hashicorp/vault/http"
-	"github.com/hashicorp/vault/sdk/logical"
-	"github.com/hashicorp/vault/vault"
-)
-
-func TestTransit_ConfigSettings(t *testing.T) {
-	b, storage := createBackendWithSysView(t)
-
-	doReq := func(req *logical.Request) *logical.Response {
-		resp, err := b.HandleRequest(context.Background(), req)
-		if err != nil || (resp != nil && resp.IsError()) {
-			t.Fatalf("got err:\n%#v\nreq:\n%#v\n", err, *req)
-		}
-		return resp
-	}
-	doErrReq := func(req *logical.Request) {
-		resp, err := b.HandleRequest(context.Background(), req)
-		if err == nil {
-			if resp == nil || !resp.IsError() {
-				t.Fatalf("expected error; req:\n%#v\n", *req)
-			}
-		}
-	}
-
-	// First create a key
-	req := &logical.Request{
-		Storage:   storage,
-		Operation: logical.UpdateOperation,
-		Path:      "keys/aes256",
-		Data: map[string]interface{}{
-			"derived": true,
-		},
-	}
-	doReq(req)
-
-	req.Path = "keys/aes128"
-	req.Data["type"] = "aes128-gcm96"
-	doReq(req)
-
-	req.Path = "keys/ed"
-	req.Data["type"] = "ed25519"
-	doReq(req)
-
-	delete(req.Data, "derived")
-
-	req.Path = "keys/p256"
-	req.Data["type"] = "ecdsa-p256"
-	doReq(req)
-
-	req.Path = "keys/p384"
-	req.Data["type"] = "ecdsa-p384"
-	doReq(req)
-
-	req.Path = "keys/p521"
-	req.Data["type"] = "ecdsa-p521"
-	doReq(req)
-
-	delete(req.Data, "type")
-
-	req.Path = "keys/aes128/rotate"
-	doReq(req)
-	doReq(req)
-	doReq(req)
-	doReq(req)
-
-	req.Path = "keys/aes256/rotate"
-	doReq(req)
-	doReq(req)
-	doReq(req)
-	doReq(req)
-
-	req.Path = "keys/ed/rotate"
-	doReq(req)
-	doReq(req)
-	doReq(req)
-	doReq(req)
-
-	req.Path = "keys/p256/rotate"
-	doReq(req)
-	doReq(req)
-	doReq(req)
-	doReq(req)
-
-	req.Path = "keys/p384/rotate"
-	doReq(req)
-	doReq(req)
-	doReq(req)
-	doReq(req)
-
-	req.Path = "keys/p521/rotate"
-	doReq(req)
-	doReq(req)
-	doReq(req)
-	doReq(req)
-
-	req.Path = "keys/aes256/config"
-	// Too high
-	req.Data["min_decryption_version"] = 7
-	doErrReq(req)
-	// Too low
-	req.Data["min_decryption_version"] = -1
-	doErrReq(req)
-
-	delete(req.Data, "min_decryption_version")
-	// Too high
-	req.Data["min_encryption_version"] = 7
-	doErrReq(req)
-	// Too low
-	req.Data["min_encryption_version"] = 7
-	doErrReq(req)
-
-	// Not allowed, cannot decrypt
-	req.Data["min_decryption_version"] = 3
-	req.Data["min_encryption_version"] = 2
-	doErrReq(req)
-
-	// Allowed
-	req.Data["min_decryption_version"] = 2
-	req.Data["min_encryption_version"] = 3
-	doReq(req)
-	req.Path = "keys/aes128/config"
-	doReq(req)
-	req.Path = "keys/ed/config"
-	doReq(req)
-	req.Path = "keys/p256/config"
-	doReq(req)
-	req.Path = "keys/p384/config"
-	doReq(req)
-
-	req.Path = "keys/p521/config"
-	doReq(req)
-
-	req.Data = map[string]interface{}{
-		"plaintext": "abcd",
-		"input":     "abcd",
-		"context":   "abcd",
-	}
-
-	maxKeyVersion := 5
-	key := "aes256"
-
-	testHMAC := func(ver int, valid bool) {
-		req.Path = "hmac/" + key
-		delete(req.Data, "hmac")
-		if ver == maxKeyVersion {
-			delete(req.Data, "key_version")
-		} else {
-			req.Data["key_version"] = ver
-		}
-
-		if !valid {
-			doErrReq(req)
-			return
-		}
-
-		resp := doReq(req)
-		ct := resp.Data["hmac"].(string)
-		if strings.Split(ct, ":")[1] != "v"+strconv.Itoa(ver) {
-			t.Fatal("wrong hmac version")
-		}
-
-		req.Path = "verify/" + key
-		delete(req.Data, "key_version")
-		req.Data["hmac"] = resp.Data["hmac"]
-		doReq(req)
-	}
-
-	testEncryptDecrypt := func(ver int, valid bool) {
-		req.Path = "encrypt/" + key
-		delete(req.Data, "ciphertext")
-		if ver == maxKeyVersion {
-			delete(req.Data, "key_version")
-		} else {
-			req.Data["key_version"] = ver
-		}
-
-		if !valid {
-			doErrReq(req)
-			return
-		}
-
-		resp := doReq(req)
-		ct := resp.Data["ciphertext"].(string)
-		if strings.Split(ct, ":")[1] != "v"+strconv.Itoa(ver) {
-			t.Fatal("wrong encryption version")
-		}
-
-		req.Path = "decrypt/" + key
-		delete(req.Data, "key_version")
-		req.Data["ciphertext"] = resp.Data["ciphertext"]
-		doReq(req)
-	}
-	testEncryptDecrypt(5, true)
-	testEncryptDecrypt(4, true)
-	testEncryptDecrypt(3, true)
-	testEncryptDecrypt(2, false)
-	testHMAC(5, true)
-	testHMAC(4, true)
-	testHMAC(3, true)
-	testHMAC(2, false)
-
-	key = "aes128"
-	testEncryptDecrypt(5, true)
-	testEncryptDecrypt(4, true)
-	testEncryptDecrypt(3, true)
-	testEncryptDecrypt(2, false)
-	testHMAC(5, true)
-	testHMAC(4, true)
-	testHMAC(3, true)
-	testHMAC(2, false)
-
-	delete(req.Data, "plaintext")
-	req.Data["input"] = "abcd"
-	key = "ed"
-	testSignVerify := func(ver int, valid bool) {
-		req.Path = "sign/" + key
-		delete(req.Data, "signature")
-		if ver == maxKeyVersion {
-			delete(req.Data, "key_version")
-		} else {
-			req.Data["key_version"] = ver
-		}
-
-		if !valid {
-			doErrReq(req)
-			return
-		}
-
-		resp := doReq(req)
-		ct := resp.Data["signature"].(string)
-		if strings.Split(ct, ":")[1] != "v"+strconv.Itoa(ver) {
-			t.Fatal("wrong signature version")
-		}
-
-		req.Path = "verify/" + key
-		delete(req.Data, "key_version")
-		req.Data["signature"] = resp.Data["signature"]
-		doReq(req)
-	}
-	testSignVerify(5, true)
-	testSignVerify(4, true)
-	testSignVerify(3, true)
-	testSignVerify(2, false)
-	testHMAC(5, true)
-	testHMAC(4, true)
-	testHMAC(3, true)
-	testHMAC(2, false)
-
-	delete(req.Data, "context")
-	key = "p256"
-	testSignVerify(5, true)
-	testSignVerify(4, true)
-	testSignVerify(3, true)
-	testSignVerify(2, false)
-	testHMAC(5, true)
-	testHMAC(4, true)
-	testHMAC(3, true)
-	testHMAC(2, false)
-
-	key = "p384"
-	testSignVerify(5, true)
-	testSignVerify(4, true)
-	testSignVerify(3, true)
-	testSignVerify(2, false)
-	testHMAC(5, true)
-	testHMAC(4, true)
-	testHMAC(3, true)
-	testHMAC(2, false)
-
-	key = "p521"
-	testSignVerify(5, true)
-	testSignVerify(4, true)
-	testSignVerify(3, true)
-	testSignVerify(2, false)
-	testHMAC(5, true)
-	testHMAC(4, true)
-	testHMAC(3, true)
-	testHMAC(2, false)
-}
-
-func TestTransit_UpdateKeyConfigWithAutorotation(t *testing.T) {
-	tests := map[string]struct {
-		initialAutoRotatePeriod interface{}
-		newAutoRotatePeriod     interface{}
-		shouldError             bool
-		expectedValue           time.Duration
-	}{
-		"default (no value)": {
-			initialAutoRotatePeriod: "5h",
-			shouldError:             false,
-			expectedValue:           5 * time.Hour,
-		},
-		"0 (int)": {
-			initialAutoRotatePeriod: "5h",
-			newAutoRotatePeriod:     0,
-			shouldError:             false,
-			expectedValue:           0,
-		},
-		"0 (string)": {
-			initialAutoRotatePeriod: "5h",
-			newAutoRotatePeriod:     0,
-			shouldError:             false,
-			expectedValue:           0,
-		},
-		"5 seconds": {
-			newAutoRotatePeriod: "5s",
-			shouldError:         true,
-		},
-		"5 hours": {
-			newAutoRotatePeriod: "5h",
-			shouldError:         false,
-			expectedValue:       5 * time.Hour,
-		},
-		"negative value": {
-			newAutoRotatePeriod: "-1800s",
-			shouldError:         true,
-		},
-		"invalid string": {
-			newAutoRotatePeriod: "this shouldn't work",
-			shouldError:         true,
-		},
-	}
-
-	coreConfig := &vault.CoreConfig{
-		LogicalBackends: map[string]logical.Factory{
-			"transit": Factory,
-		},
-	}
-	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
-		HandlerFunc: vaulthttp.Handler,
-	})
-	cluster.Start()
-	defer cluster.Cleanup()
-	cores := cluster.Cores
-	vault.TestWaitActive(t, cores[0].Core)
-	client := cores[0].Client
-	err := client.Sys().Mount("transit", &api.MountInput{
-		Type: "transit",
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	for name, test := range tests {
-		t.Run(name, func(t *testing.T) {
-			keyNameBytes, err := uuid.GenerateRandomBytes(16)
-			if err != nil {
-				t.Fatal(err)
-			}
-			keyName := hex.EncodeToString(keyNameBytes)
-
-			_, err = client.Logical().Write(fmt.Sprintf("transit/keys/%s", keyName), map[string]interface{}{
-				"auto_rotate_period": test.initialAutoRotatePeriod,
-			})
-			if err != nil {
-				t.Fatal(err)
-			}
-			resp, err := client.Logical().Write(fmt.Sprintf("transit/keys/%s/config", keyName), map[string]interface{}{
-				"auto_rotate_period": test.newAutoRotatePeriod,
-			})
-			switch {
-			case test.shouldError && err == nil:
-				t.Fatal("expected non-nil error")
-			case !test.shouldError && err != nil:
-				t.Fatal(err)
-			}
-
-			if !test.shouldError {
-				resp, err = client.Logical().Read(fmt.Sprintf("transit/keys/%s", keyName))
-				if err != nil {
-					t.Fatal(err)
-				}
-				if resp == nil {
-					t.Fatal("expected non-nil response")
-				}
-				gotRaw, ok := resp.Data["auto_rotate_period"].(json.Number)
-				if !ok {
-					t.Fatal("returned value is of unexpected type")
-				}
-				got, err := gotRaw.Int64()
-				if err != nil {
-					t.Fatal(err)
-				}
-				want := int64(test.expectedValue.Seconds())
-				if got != want {
-					t.Fatalf("incorrect auto_rotate_period returned, got: %d, want: %d", got, want)
-				}
-			}
-		})
-	}
-}
diff --git a/builtin/logical/transit/path_keys_test.go b/builtin/logical/transit/path_keys_test.go
index 4b3303988eed5..04c1d8da092de 100644
--- a/builtin/logical/transit/path_keys_test.go
+++ b/builtin/logical/transit/path_keys_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package transit_test
 
 import (
diff --git a/builtin/logical/transit/path_random.go b/builtin/logical/transit/path_random.go
index 3fc5abef286c3..3b903e0b37fe3 100644
--- a/builtin/logical/transit/path_random.go
+++ b/builtin/logical/transit/path_random.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package transit
 
 import (
@@ -14,13 +11,6 @@ import (
 func (b *backend) pathRandom() *framework.Path {
 	return &framework.Path{
 		Pattern: "random(/" + framework.GenericNameRegex("source") + ")?" + framework.OptionalParamRegex("urlbytes"),
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixTransit,
-			OperationVerb:   "generate",
-			OperationSuffix: "random|random-with-source|random-with-bytes|random-with-source-and-bytes",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"urlbytes": {
 				Type:        framework.TypeString,
diff --git a/builtin/logical/transit/path_random_test.go b/builtin/logical/transit/path_random_test.go
index 35782ec3eadc8..037a00b55f087 100644
--- a/builtin/logical/transit/path_random_test.go
+++ b/builtin/logical/transit/path_random_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package transit
 
 import (
diff --git a/builtin/logical/transit/path_restore.go b/builtin/logical/transit/path_restore.go
index 4df9d69226ed6..fa8c142bbab36 100644
--- a/builtin/logical/transit/path_restore.go
+++ b/builtin/logical/transit/path_restore.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package transit
 
 import (
@@ -15,13 +12,6 @@ import (
 func (b *backend) pathRestore() *framework.Path {
 	return &framework.Path{
 		Pattern: "restore" + framework.OptionalParamRegex("name"),
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixTransit,
-			OperationVerb:   "restore",
-			OperationSuffix: "key|and-rename-key",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"backup": {
 				Type:        framework.TypeString,
diff --git a/builtin/logical/transit/path_restore_test.go b/builtin/logical/transit/path_restore_test.go
index 3dcc552d98b8a..6e13b985ee65d 100644
--- a/builtin/logical/transit/path_restore_test.go
+++ b/builtin/logical/transit/path_restore_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package transit
 
 import (
diff --git a/builtin/logical/transit/path_rewrap.go b/builtin/logical/transit/path_rewrap.go
index 35d5c68a38882..1bdf282f7f438 100644
--- a/builtin/logical/transit/path_rewrap.go
+++ b/builtin/logical/transit/path_rewrap.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package transit
 
 import (
@@ -19,12 +16,6 @@ import (
 func (b *backend) pathRewrap() *framework.Path {
 	return &framework.Path{
 		Pattern: "rewrap/" + framework.GenericNameRegex("name"),
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixTransit,
-			OperationVerb:   "rewrap",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"name": {
 				Type:        framework.TypeString,
@@ -199,10 +190,6 @@ func (b *backend) pathRewrapWrite(ctx context.Context, req *logical.Request, d *
 
 	resp := &logical.Response{}
 	if batchInputRaw != nil {
-		// Copy the references
-		for i := range batchInputItems {
-			batchResponseItems[i].Reference = batchInputItems[i].Reference
-		}
 		resp.Data = map[string]interface{}{
 			"batch_results": batchResponseItems,
 		}
diff --git a/builtin/logical/transit/path_rewrap_test.go b/builtin/logical/transit/path_rewrap_test.go
index 097626c1c28ae..535133ac5cac4 100644
--- a/builtin/logical/transit/path_rewrap_test.go
+++ b/builtin/logical/transit/path_rewrap_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package transit
 
 import (
@@ -227,8 +224,8 @@ func TestTransit_BatchRewrapCase3(t *testing.T) {
 	b, s := createBackendWithStorage(t)
 
 	batchEncryptionInput := []interface{}{
-		map[string]interface{}{"plaintext": "dmlzaGFsCg==", "reference": "ek"},
-		map[string]interface{}{"plaintext": "dGhlIHF1aWNrIGJyb3duIGZveA==", "reference": "do"},
+		map[string]interface{}{"plaintext": "dmlzaGFsCg=="},
+		map[string]interface{}{"plaintext": "dGhlIHF1aWNrIGJyb3duIGZveA=="},
 	}
 	batchEncryptionData := map[string]interface{}{
 		"batch_input": batchEncryptionInput,
@@ -248,7 +245,7 @@ func TestTransit_BatchRewrapCase3(t *testing.T) {
 
 	batchRewrapInput := make([]interface{}, len(batchEncryptionResponseItems))
 	for i, item := range batchEncryptionResponseItems {
-		batchRewrapInput[i] = map[string]interface{}{"ciphertext": item.Ciphertext, "reference": item.Reference}
+		batchRewrapInput[i] = map[string]interface{}{"ciphertext": item.Ciphertext}
 	}
 
 	batchRewrapData := map[string]interface{}{
@@ -292,11 +289,6 @@ func TestTransit_BatchRewrapCase3(t *testing.T) {
 	for i, eItem := range batchEncryptionResponseItems {
 		rItem := batchRewrapResponseItems[i]
 
-		inputRef := batchEncryptionInput[i].(map[string]interface{})["reference"]
-		if eItem.Reference != inputRef {
-			t.Fatalf("bad: reference mismatch. Expected %s, Actual: %s", inputRef, eItem.Reference)
-		}
-
 		if eItem.Ciphertext == rItem.Ciphertext {
 			t.Fatalf("bad: rewrap input and output are the same")
 		}
@@ -323,6 +315,5 @@ func TestTransit_BatchRewrapCase3(t *testing.T) {
 		if resp.Data["plaintext"] != plaintext1 && resp.Data["plaintext"] != plaintext2 {
 			t.Fatalf("bad: plaintext. Expected: %q or %q, Actual: %q", plaintext1, plaintext2, resp.Data["plaintext"])
 		}
-
 	}
 }
diff --git a/builtin/logical/transit/path_rotate.go b/builtin/logical/transit/path_rotate.go
index 0035dcfbb9768..a74e69980512e 100644
--- a/builtin/logical/transit/path_rotate.go
+++ b/builtin/logical/transit/path_rotate.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package transit
 
 import (
@@ -14,26 +11,11 @@ import (
 func (b *backend) pathRotate() *framework.Path {
 	return &framework.Path{
 		Pattern: "keys/" + framework.GenericNameRegex("name") + "/rotate",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixTransit,
-			OperationVerb:   "rotate",
-			OperationSuffix: "key",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"name": {
 				Type:        framework.TypeString,
 				Description: "Name of the key",
 			},
-			"managed_key_name": {
-				Type:        framework.TypeString,
-				Description: "The name of the managed key to use for the new version of this transit key",
-			},
-			"managed_key_id": {
-				Type:        framework.TypeString,
-				Description: "The UUID of the managed key to use for the new version of this transit key",
-			},
 		},
 
 		Callbacks: map[logical.Operation]framework.OperationFunc{
@@ -47,8 +29,6 @@ func (b *backend) pathRotate() *framework.Path {
 
 func (b *backend) pathRotateWrite(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
 	name := d.Get("name").(string)
-	managedKeyName := d.Get("managed_key_name").(string)
-	managedKeyId := d.Get("managed_key_id").(string)
 
 	// Get the policy
 	p, _, err := b.GetPolicy(ctx, keysutil.PolicyRequest{
@@ -64,26 +44,12 @@ func (b *backend) pathRotateWrite(ctx context.Context, req *logical.Request, d *
 	if !b.System().CachingDisabled() {
 		p.Lock(true)
 	}
-	defer p.Unlock()
-
-	if p.Type == keysutil.KeyType_MANAGED_KEY {
-		var keyId string
-		keyId, err = GetManagedKeyUUID(ctx, b, managedKeyName, managedKeyId)
-		if err != nil {
-			p.Unlock()
-			return nil, err
-		}
-		err = p.RotateManagedKey(ctx, req.Storage, keyId)
-	} else {
-		// Rotate the policy
-		err = p.Rotate(ctx, req.Storage, b.GetRandomReader())
-	}
 
-	if err != nil {
-		return nil, err
-	}
+	// Rotate the policy
+	err = p.Rotate(ctx, req.Storage, b.GetRandomReader())
 
-	return b.formatKeyPolicy(p, nil)
+	p.Unlock()
+	return nil, err
 }
 
 const pathRotateHelpSyn = `Rotate named encryption key`
diff --git a/builtin/logical/transit/path_sign_verify.go b/builtin/logical/transit/path_sign_verify.go
index 98ced3812ab9f..b56ef192fe102 100644
--- a/builtin/logical/transit/path_sign_verify.go
+++ b/builtin/logical/transit/path_sign_verify.go
@@ -1,13 +1,9 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package transit
 
 import (
 	"context"
 	"crypto/rsa"
 	"encoding/base64"
-	"errors"
 	"fmt"
 	"strconv"
 	"strings"
@@ -29,12 +25,12 @@ type batchResponseSignItem struct {
 	// request item
 	Signature string `json:"signature,omitempty" mapstructure:"signature"`
 
-	// The key version to be used for signing
+	// The key version to be used for encryption
 	KeyVersion int `json:"key_version" mapstructure:"key_version"`
 
 	PublicKey []byte `json:"publickey,omitempty" mapstructure:"publickey"`
 
-	// Error, if set represents a failure encountered while signing a
+	// Error, if set represents a failure encountered while encrypting a
 	// corresponding batch request item
 	Error string `json:"error,omitempty" mapstructure:"error"`
 
@@ -43,10 +39,6 @@ type batchResponseSignItem struct {
 	// For batch processing to successfully mimic previous handling for simple 'input',
 	// both output values are needed - though 'err' should never be serialized.
 	err error
-
-	// Reference is an arbitrary caller supplied string value that will be placed on the
-	// batch response to ease correlation between inputs and outputs
-	Reference string `json:"reference" mapstructure:"reference"`
 }
 
 // BatchRequestVerifyItem represents a request item for batch processing.
@@ -58,7 +50,7 @@ type batchResponseVerifyItem struct {
 	// Valid indicates whether signature matches the signature derived from the input string
 	Valid bool `json:"valid" mapstructure:"valid"`
 
-	// Error, if set represents a failure encountered while verifying a
+	// Error, if set represents a failure encountered while encrypting a
 	// corresponding batch request item
 	Error string `json:"error,omitempty" mapstructure:"error"`
 
@@ -67,24 +59,11 @@ type batchResponseVerifyItem struct {
 	// For batch processing to successfully mimic previous handling for simple 'input',
 	// both output values are needed - though 'err' should never be serialized.
 	err error
-
-	// Reference is an arbitrary caller supplied string value that will be placed on the
-	// batch response to ease correlation between inputs and outputs
-	Reference string `json:"reference" mapstructure:"reference"`
 }
 
-const defaultHashAlgorithm = "sha2-256"
-
 func (b *backend) pathSign() *framework.Path {
 	return &framework.Path{
 		Pattern: "sign/" + framework.GenericNameRegex("name") + framework.OptionalParamRegex("urlalgorithm"),
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixTransit,
-			OperationVerb:   "sign",
-			OperationSuffix: "|with-algorithm",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"name": {
 				Type:        framework.TypeString,
@@ -104,7 +83,7 @@ derivation is enabled; currently only available with ed25519 keys.`,
 
 			"hash_algorithm": {
 				Type:    framework.TypeString,
-				Default: defaultHashAlgorithm,
+				Default: "sha2-256",
 				Description: `Hash algorithm to use (POST body parameter). Valid values are:
 
 * sha1
@@ -116,17 +95,14 @@ derivation is enabled; currently only available with ed25519 keys.`,
 * sha3-256
 * sha3-384
 * sha3-512
-* none
 
 Defaults to "sha2-256". Not valid for all key types,
-including ed25519. Using none requires setting prehashed=true and
-signature_algorithm=pkcs1v15, yielding a PKCSv1_5_NoOID instead of
-the usual PKCSv1_5_DERnull signature.`,
+including ed25519.`,
 			},
 
 			"algorithm": {
 				Type:        framework.TypeString,
-				Default:     defaultHashAlgorithm,
+				Default:     "sha2-256",
 				Description: `Deprecated: use "hash_algorithm" instead.`,
 			},
 
@@ -187,13 +163,6 @@ preserve the order of the batch input`,
 func (b *backend) pathVerify() *framework.Path {
 	return &framework.Path{
 		Pattern: "verify/" + framework.GenericNameRegex("name") + framework.OptionalParamRegex("urlalgorithm"),
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixTransit,
-			OperationVerb:   "verify",
-			OperationSuffix: "|with-algorithm",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"name": {
 				Type:        framework.TypeString,
@@ -228,7 +197,7 @@ derivation is enabled; currently only available with ed25519 keys.`,
 
 			"hash_algorithm": {
 				Type:    framework.TypeString,
-				Default: defaultHashAlgorithm,
+				Default: "sha2-256",
 				Description: `Hash algorithm to use (POST body parameter). Valid values are:
 
 * sha1
@@ -240,15 +209,13 @@ derivation is enabled; currently only available with ed25519 keys.`,
 * sha3-256
 * sha3-384
 * sha3-512
-* none
 
-Defaults to "sha2-256". Not valid for all key types. See note about
-none on signing path.`,
+Defaults to "sha2-256". Not valid for all key types.`,
 			},
 
 			"algorithm": {
 				Type:        framework.TypeString,
-				Default:     defaultHashAlgorithm,
+				Default:     "sha2-256",
 				Description: `Deprecated: use "hash_algorithm" instead.`,
 			},
 
@@ -259,7 +226,7 @@ none on signing path.`,
 
 			"signature_algorithm": {
 				Type: framework.TypeString,
-				Description: `The signature algorithm to use for signature verification. Currently only applies to RSA key types.
+				Description: `The signature algorithm to use for signature verification. Currently only applies to RSA key types. 
 Options are 'pss' or 'pkcs1v15'. Defaults to 'pss'`,
 			},
 
@@ -329,9 +296,6 @@ func (b *backend) pathSignWrite(ctx context.Context, req *logical.Request, d *fr
 		hashAlgorithmStr = d.Get("hash_algorithm").(string)
 		if hashAlgorithmStr == "" {
 			hashAlgorithmStr = d.Get("algorithm").(string)
-			if hashAlgorithmStr == "" {
-				hashAlgorithmStr = defaultHashAlgorithm
-			}
 		}
 	}
 
@@ -353,10 +317,6 @@ func (b *backend) pathSignWrite(ctx context.Context, req *logical.Request, d *fr
 		return logical.ErrorResponse(err.Error()), logical.ErrInvalidRequest
 	}
 
-	if hashAlgorithm == keysutil.HashTypeNone && (!prehashed || sigAlgorithm != "pkcs1v15") {
-		return logical.ErrorResponse("hash_algorithm=none requires both prehashed=true and signature_algorithm=pkcs1v15"), logical.ErrInvalidRequest
-	}
-
 	// Get the policy
 	p, _, err := b.GetPolicy(ctx, keysutil.PolicyRequest{
 		Storage: req.Storage,
@@ -366,7 +326,7 @@ func (b *backend) pathSignWrite(ctx context.Context, req *logical.Request, d *fr
 		return nil, err
 	}
 	if p == nil {
-		return logical.ErrorResponse("signing key not found"), logical.ErrInvalidRequest
+		return logical.ErrorResponse("encryption key not found"), logical.ErrInvalidRequest
 	}
 	if !b.System().CachingDisabled() {
 		p.Lock(false)
@@ -434,26 +394,11 @@ func (b *backend) pathSignWrite(ctx context.Context, req *logical.Request, d *fr
 			}
 		}
 
-		var managedKeyParameters keysutil.ManagedKeyParameters
-		if p.Type == keysutil.KeyType_MANAGED_KEY {
-			managedKeySystemView, ok := b.System().(logical.ManagedKeySystemView)
-			if !ok {
-				return nil, errors.New("unsupported system view")
-			}
-
-			managedKeyParameters = keysutil.ManagedKeyParameters{
-				ManagedKeySystemView: managedKeySystemView,
-				BackendUUID:          b.backendUUID,
-				Context:              ctx,
-			}
-		}
-
 		sig, err := p.SignWithOptions(ver, context, input, &keysutil.SigningOptions{
-			HashAlgorithm:    hashAlgorithm,
-			Marshaling:       marshaling,
-			SaltLength:       saltLength,
-			SigAlgorithm:     sigAlgorithm,
-			ManagedKeyParams: managedKeyParameters,
+			HashAlgorithm: hashAlgorithm,
+			Marshaling:    marshaling,
+			SaltLength:    saltLength,
+			SigAlgorithm:  sigAlgorithm,
 		})
 		if err != nil {
 			if batchInputRaw != nil {
@@ -477,10 +422,6 @@ func (b *backend) pathSignWrite(ctx context.Context, req *logical.Request, d *fr
 	// Generate the response
 	resp := &logical.Response{}
 	if batchInputRaw != nil {
-		// Copy the references
-		for i := range batchInputItems {
-			response[i].Reference = batchInputItems[i]["reference"]
-		}
 		resp.Data = map[string]interface{}{
 			"batch_results": response,
 		}
@@ -582,9 +523,6 @@ func (b *backend) pathVerifyWrite(ctx context.Context, req *logical.Request, d *
 		hashAlgorithmStr = d.Get("hash_algorithm").(string)
 		if hashAlgorithmStr == "" {
 			hashAlgorithmStr = d.Get("algorithm").(string)
-			if hashAlgorithmStr == "" {
-				hashAlgorithmStr = defaultHashAlgorithm
-			}
 		}
 	}
 
@@ -606,10 +544,6 @@ func (b *backend) pathVerifyWrite(ctx context.Context, req *logical.Request, d *
 		return logical.ErrorResponse(err.Error()), logical.ErrInvalidRequest
 	}
 
-	if hashAlgorithm == keysutil.HashTypeNone && (!prehashed || sigAlgorithm != "pkcs1v15") {
-		return logical.ErrorResponse("hash_algorithm=none requires both prehashed=true and signature_algorithm=pkcs1v15"), logical.ErrInvalidRequest
-	}
-
 	// Get the policy
 	p, _, err := b.GetPolicy(ctx, keysutil.PolicyRequest{
 		Storage: req.Storage,
@@ -619,7 +553,7 @@ func (b *backend) pathVerifyWrite(ctx context.Context, req *logical.Request, d *
 		return nil, err
 	}
 	if p == nil {
-		return logical.ErrorResponse("signature verification key not found"), logical.ErrInvalidRequest
+		return logical.ErrorResponse("encryption key not found"), logical.ErrInvalidRequest
 	}
 	if !b.System().CachingDisabled() {
 		p.Lock(false)
@@ -671,29 +605,13 @@ func (b *backend) pathVerifyWrite(ctx context.Context, req *logical.Request, d *
 				continue
 			}
 		}
-		var managedKeyParameters keysutil.ManagedKeyParameters
-		if p.Type == keysutil.KeyType_MANAGED_KEY {
-			managedKeySystemView, ok := b.System().(logical.ManagedKeySystemView)
-			if !ok {
-				return nil, errors.New("unsupported system view")
-			}
 
-			managedKeyParameters = keysutil.ManagedKeyParameters{
-				ManagedKeySystemView: managedKeySystemView,
-				BackendUUID:          b.backendUUID,
-				Context:              ctx,
-			}
-		}
-
-		signingOptions := &keysutil.SigningOptions{
-			HashAlgorithm:    hashAlgorithm,
-			Marshaling:       marshaling,
-			SaltLength:       saltLength,
-			SigAlgorithm:     sigAlgorithm,
-			ManagedKeyParams: managedKeyParameters,
-		}
-
-		valid, err := p.VerifySignatureWithOptions(context, input, sig, signingOptions)
+		valid, err := p.VerifySignatureWithOptions(context, input, sig, &keysutil.SigningOptions{
+			HashAlgorithm: hashAlgorithm,
+			Marshaling:    marshaling,
+			SaltLength:    saltLength,
+			SigAlgorithm:  sigAlgorithm,
+		})
 		if err != nil {
 			switch err.(type) {
 			case errutil.UserError:
@@ -713,10 +631,6 @@ func (b *backend) pathVerifyWrite(ctx context.Context, req *logical.Request, d *
 	// Generate the response
 	resp := &logical.Response{}
 	if batchInputRaw != nil {
-		// Copy the references
-		for i := range batchInputItems {
-			response[i].Reference = batchInputItems[i]["reference"]
-		}
 		resp.Data = map[string]interface{}{
 			"batch_results": response,
 		}
diff --git a/builtin/logical/transit/path_sign_verify_test.go b/builtin/logical/transit/path_sign_verify_test.go
index 63aef9c80b6f1..fa411b0a2c8c2 100644
--- a/builtin/logical/transit/path_sign_verify_test.go
+++ b/builtin/logical/transit/path_sign_verify_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package transit
 
 import (
@@ -28,7 +25,6 @@ type signOutcome struct {
 	requestOk bool
 	valid     bool
 	keyValid  bool
-	reference string
 }
 
 func TestTransit_SignVerify_ECDSA(t *testing.T) {
@@ -158,7 +154,7 @@ func testTransit_SignVerify_ECDSA(t *testing.T, bits int) {
 		req.Path = "sign/foo" + postpath
 		resp, err := b.HandleRequest(context.Background(), req)
 		if err != nil && !errExpected {
-			t.Fatalf("request: %v\nerror: %v", req, err)
+			t.Fatal(err)
 		}
 		if resp == nil {
 			t.Fatal("expected non-nil response")
@@ -487,7 +483,6 @@ func TestTransit_SignVerify_ED25519(t *testing.T) {
 			}
 			for i, v := range sig {
 				batchRequestItems[i]["signature"] = v
-				batchRequestItems[i]["reference"] = outcome[i].reference
 			}
 		} else if attachSig {
 			req.Data["signature"] = sig[0]
@@ -540,9 +535,6 @@ func TestTransit_SignVerify_ED25519(t *testing.T) {
 				if pubKeyRaw, ok := req.Data["public_key"]; ok {
 					validatePublicKey(t, batchRequestItems[i]["input"], sig[i], pubKeyRaw.([]byte), outcome[i].keyValid, postpath, b)
 				}
-				if v.Reference != outcome[i].reference {
-					t.Fatalf("verification failed, mismatched references %s vs %s", v.Reference, outcome[i].reference)
-				}
 			}
 			return
 		}
@@ -642,18 +634,15 @@ func TestTransit_SignVerify_ED25519(t *testing.T) {
 
 	// Test Batch Signing
 	batchInput := []batchRequestSignItem{
-		{"context": "abcd", "input": "dGhlIHF1aWNrIGJyb3duIGZveA==", "reference": "uno"},
-		{"context": "efgh", "input": "dGhlIHF1aWNrIGJyb3duIGZveA==", "reference": "dos"},
+		{"context": "abcd", "input": "dGhlIHF1aWNrIGJyb3duIGZveA=="},
+		{"context": "efgh", "input": "dGhlIHF1aWNrIGJyb3duIGZveA=="},
 	}
 
 	req.Data = map[string]interface{}{
 		"batch_input": batchInput,
 	}
 
-	outcome = []signOutcome{
-		{requestOk: true, valid: true, keyValid: true, reference: "uno"},
-		{requestOk: true, valid: true, keyValid: true, reference: "dos"},
-	}
+	outcome = []signOutcome{{requestOk: true, valid: true, keyValid: true}, {requestOk: true, valid: true, keyValid: true}}
 
 	sig = signRequest(req, false, "foo")
 	verifyRequest(req, false, outcome, "foo", sig, true)
@@ -961,9 +950,6 @@ func testTransit_SignVerify_RSA_PSS(t *testing.T, bits int) {
 
 	for hashAlgorithm := range keysutil.HashTypeMap {
 		t.Log("Hash algorithm:", hashAlgorithm)
-		if hashAlgorithm == "none" {
-			continue
-		}
 
 		for marshalingName := range keysutil.MarshalingTypeMap {
 			t.Log("\t", "Marshaling type:", marshalingName)
diff --git a/builtin/logical/transit/path_trim.go b/builtin/logical/transit/path_trim.go
index 71f4181db859a..60d6ef9dda6d8 100644
--- a/builtin/logical/transit/path_trim.go
+++ b/builtin/logical/transit/path_trim.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package transit
 
 import (
@@ -14,13 +11,6 @@ import (
 func (b *backend) pathTrim() *framework.Path {
 	return &framework.Path{
 		Pattern: "keys/" + framework.GenericNameRegex("name") + "/trim",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixTransit,
-			OperationVerb:   "trim",
-			OperationSuffix: "key",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"name": {
 				Type:        framework.TypeString,
@@ -100,7 +90,7 @@ func (b *backend) pathTrimUpdate() framework.OperationFunc {
 			return nil, err
 		}
 
-		return b.formatKeyPolicy(p, nil)
+		return nil, nil
 	}
 }
 
diff --git a/builtin/logical/transit/path_trim_test.go b/builtin/logical/transit/path_trim_test.go
index b63d644cba8ce..db38aad938ad0 100644
--- a/builtin/logical/transit/path_trim_test.go
+++ b/builtin/logical/transit/path_trim_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package transit
 
 import (
diff --git a/builtin/logical/transit/path_wrapping_key.go b/builtin/logical/transit/path_wrapping_key.go
index f27a32ade5045..1a08318db339d 100644
--- a/builtin/logical/transit/path_wrapping_key.go
+++ b/builtin/logical/transit/path_wrapping_key.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package transit
 
 import (
@@ -20,10 +17,6 @@ const WrappingKeyName = "wrapping-key"
 func (b *backend) pathWrappingKey() *framework.Path {
 	return &framework.Path{
 		Pattern: "wrapping_key",
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixTransit,
-			OperationSuffix: "wrapping-key",
-		},
 		Callbacks: map[logical.Operation]framework.OperationFunc{
 			logical.ReadOperation: b.pathWrappingKeyRead,
 		},
diff --git a/builtin/logical/transit/path_wrapping_key_test.go b/builtin/logical/transit/path_wrapping_key_test.go
index 468c3f4de7ee2..da90585a4ac99 100644
--- a/builtin/logical/transit/path_wrapping_key_test.go
+++ b/builtin/logical/transit/path_wrapping_key_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package transit
 
 import (
diff --git a/builtin/logical/transit/stepwise_test.go b/builtin/logical/transit/stepwise_test.go
index 2b40cea213226..b64aca9861e99 100644
--- a/builtin/logical/transit/stepwise_test.go
+++ b/builtin/logical/transit/stepwise_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package transit
 
 import (
@@ -21,7 +18,7 @@ func TestAccBackend_basic_docker(t *testing.T) {
 	decryptData := make(map[string]interface{})
 	envOptions := stepwise.MountOptions{
 		RegistryName:    "updatedtransit",
-		PluginType:      api.PluginTypeSecrets,
+		PluginType:      stepwise.PluginTypeSecrets,
 		PluginName:      "transit",
 		MountPathPrefix: "transit_temp",
 	}
diff --git a/builtin/plugin/backend.go b/builtin/plugin/backend.go
index 04606bcbd2883..b165a10c1ec11 100644
--- a/builtin/plugin/backend.go
+++ b/builtin/plugin/backend.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package plugin
 
 import (
@@ -86,15 +83,23 @@ func Backend(ctx context.Context, conf *logical.BackendConfig) (*PluginBackend,
 		runningVersion = versioner.PluginVersion().Version
 	}
 
+	external := false
+	if externaler, ok := raw.(logical.Externaler); ok {
+		external = externaler.IsExternal()
+	}
+
 	// Cleanup meta plugin backend
 	raw.Cleanup(ctx)
 
 	// Initialize b.Backend with placeholder backend since plugin
 	// backends will need to be lazy loaded.
-	b.Backend = &framework.Backend{
-		PathsSpecial:   paths,
-		BackendType:    btype,
-		RunningVersion: runningVersion,
+	b.Backend = &placeholderBackend{
+		Backend: framework.Backend{
+			PathsSpecial:   paths,
+			BackendType:    btype,
+			RunningVersion: runningVersion,
+		},
+		external: external,
 	}
 
 	b.config = conf
@@ -102,6 +107,23 @@ func Backend(ctx context.Context, conf *logical.BackendConfig) (*PluginBackend,
 	return &b, nil
 }
 
+// placeholderBackend is used a placeholder before a backend is lazy-loaded.
+// It is mostly used to mark that the backend is an external backend.
+type placeholderBackend struct {
+	framework.Backend
+
+	external bool
+}
+
+func (p *placeholderBackend) IsExternal() bool {
+	return p.external
+}
+
+var (
+	_ logical.Externaler      = (*placeholderBackend)(nil)
+	_ logical.PluginVersioner = (*placeholderBackend)(nil)
+)
+
 // PluginBackend is a thin wrapper around plugin.BackendPluginClient
 type PluginBackend struct {
 	Backend logical.Backend
@@ -301,4 +323,14 @@ func (b *PluginBackend) PluginVersion() logical.PluginVersion {
 	return logical.EmptyPluginVersion
 }
 
-var _ logical.PluginVersioner = (*PluginBackend)(nil)
+func (b *PluginBackend) IsExternal() bool {
+	if externaler, ok := b.Backend.(logical.Externaler); ok {
+		return externaler.IsExternal()
+	}
+	return false
+}
+
+var (
+	_ logical.PluginVersioner = (*PluginBackend)(nil)
+	_ logical.Externaler      = (*PluginBackend)(nil)
+)
diff --git a/builtin/plugin/backend_lazyLoad_test.go b/builtin/plugin/backend_lazyLoad_test.go
index b2f6303ba6ac9..4d2727037adca 100644
--- a/builtin/plugin/backend_lazyLoad_test.go
+++ b/builtin/plugin/backend_lazyLoad_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package plugin
 
 import (
diff --git a/builtin/plugin/backend_test.go b/builtin/plugin/backend_test.go
index 28dd1e348331e..d7a678ba1f6b6 100644
--- a/builtin/plugin/backend_test.go
+++ b/builtin/plugin/backend_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package plugin_test
 
 import (
diff --git a/builtin/plugin/mock_plugin_test.go b/builtin/plugin/mock_plugin_test.go
index 9279c828f1da3..532b7c763286d 100644
--- a/builtin/plugin/mock_plugin_test.go
+++ b/builtin/plugin/mock_plugin_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package plugin
 
 import (
diff --git a/builtin/plugin/v5/backend.go b/builtin/plugin/v5/backend.go
index eac311b4ad60d..3f7a9a884ce77 100644
--- a/builtin/plugin/v5/backend.go
+++ b/builtin/plugin/v5/backend.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package plugin
 
 import (
diff --git a/changelog/10299.txt b/changelog/10299.txt
deleted file mode 100644
index db135b64e7945..0000000000000
--- a/changelog/10299.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-ui: Add algorithm-signer as a SSH Secrets Engine UI field
-```
diff --git a/changelog/14229.txt b/changelog/14229.txt
deleted file mode 100644
index 5fa7a2d2301ae..0000000000000
--- a/changelog/14229.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-```release-note:change
-core: Vault version has been moved out of sdk and into main vault module.
-Plugins using sdk/useragent.String must instead use sdk/useragent.PluginString.
-```
diff --git a/changelog/14945.txt b/changelog/14945.txt
deleted file mode 100644
index 50dea7159f4ec..0000000000000
--- a/changelog/14945.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-cli: Support the -format=raw option, to read non-JSON Vault endpoints and original response bodies.
-```
diff --git a/changelog/15869.txt b/changelog/15869.txt
deleted file mode 100644
index bb0278dccf98a..0000000000000
--- a/changelog/15869.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:change
-secrets/aws: do not create leases for non-renewable/non-revocable STS credentials to reduce storage calls
-```
\ No newline at end of file
diff --git a/changelog/16224.txt b/changelog/16224.txt
deleted file mode 100644
index 822b24504df59..0000000000000
--- a/changelog/16224.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-core: fix GPG encryption to support subkeys.
-```
diff --git a/changelog/16622.txt b/changelog/16622.txt
deleted file mode 100644
index 37ae5abb5a884..0000000000000
--- a/changelog/16622.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-secrets/ssh: Evaluate ssh validprincipals user template before splitting
-```
diff --git a/changelog/16688.txt b/changelog/16688.txt
index c7310fd3127d6..ce192d5f220f8 100644
--- a/changelog/16688.txt
+++ b/changelog/16688.txt
@@ -4,3 +4,6 @@ plugins: `GET /sys/plugins/catalog` endpoint now returns an additional `detailed
 ```release-note:change
 plugins: `GET /sys/plugins/catalog/:type/:name` endpoint now returns an additional `version` field in the response data.
 ```
+```release-note:improvement
+plugins: Plugin catalog supports registering and managing plugins with semantic version information.
+```
diff --git a/changelog/16700.txt b/changelog/16700.txt
deleted file mode 100644
index 9dc8d1e2d199e..0000000000000
--- a/changelog/16700.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-secrets/pki: Fixes duplicate otherName in certificates created by the sign-verbatim endpoint.
-```
diff --git a/changelog/16872.txt b/changelog/16872.txt
deleted file mode 100644
index 5bbad14067bd5..0000000000000
--- a/changelog/16872.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-agent: fix incorrectly used loop variables in parallel tests and when finalizing seals
-```
diff --git a/changelog/16982.txt b/changelog/16982.txt
deleted file mode 100644
index 70d2521a54b8f..0000000000000
--- a/changelog/16982.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:change
-plugins: `GET /database/config/:name` endpoint now returns an additional `plugin_version` field in the response data.
-```
\ No newline at end of file
diff --git a/changelog/17086.txt b/changelog/17086.txt
deleted file mode 100644
index ce221ad32c925..0000000000000
--- a/changelog/17086.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:change
-ui: Upgrade Ember to version 4.4.0
-```
\ No newline at end of file
diff --git a/changelog/17093.txt b/changelog/17093.txt
deleted file mode 100644
index a51f3de8ff4be..0000000000000
--- a/changelog/17093.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-auth/cert: Add configurable support for validating client certs with OCSP.
-```
\ No newline at end of file
diff --git a/changelog/17104.txt b/changelog/17104.txt
deleted file mode 100644
index 00c5eebf39d85..0000000000000
--- a/changelog/17104.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-```release-note:change
-auth: Returns invalid credentials for ldap, userpass and approle when wrong credentials are provided for existent users.
-This will only be used internally for implementing user lockout. 
-```
\ No newline at end of file
diff --git a/changelog/17167.txt b/changelog/17167.txt
deleted file mode 100644
index 89b8905490632..0000000000000
--- a/changelog/17167.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-```release-note:change
-plugins: `GET /sys/auth/:path/tune` and `GET /sys/mounts/:path/tune` endpoints may now return an additional `plugin_version` field in the response data if set.
-```
-```release-note:change
-plugins: `GET` for `/sys/auth`, `/sys/auth/:path`, `/sys/mounts`, and `/sys/mounts/:path` paths now return additional `plugin_version`, `running_plugin_version` and `running_sha256` fields in the response data for each mount.
-```
\ No newline at end of file
diff --git a/changelog/17186.txt b/changelog/17186.txt
deleted file mode 100644
index d086dd0ef0aab..0000000000000
--- a/changelog/17186.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-core: fix race when using SystemView.ReplicationState outside of a request context
-```
\ No newline at end of file
diff --git a/changelog/17187.txt b/changelog/17187.txt
deleted file mode 100644
index 71476ef3169e6..0000000000000
--- a/changelog/17187.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-core: Refactor lock grabbing code to simplify stateLock deadlock investigations
-```
\ No newline at end of file
diff --git a/changelog/17265.txt b/changelog/17265.txt
deleted file mode 100644
index fe2d3b9a00aa7..0000000000000
--- a/changelog/17265.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-core: License location is no longer cache exempt, meaning sys/health will not contribute as greatly to storage load when using consul as a storage backend.
-```
diff --git a/changelog/17289.txt b/changelog/17289.txt
deleted file mode 100644
index e8df6cab99ab9..0000000000000
--- a/changelog/17289.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-plugins: Allow selecting builtin plugins by their reported semantic version of the form `vX.Y.Z+builtin` or `vX.Y.Z+builtin.vault`.
-```
\ No newline at end of file
diff --git a/changelog/17308.txt b/changelog/17308.txt
deleted file mode 100644
index 5a2bf8bace9a3..0000000000000
--- a/changelog/17308.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement:
-cli: User-requested -help text now appears on stdout for paging rather than stderr
-```
diff --git a/changelog/17338.txt b/changelog/17338.txt
deleted file mode 100644
index 00b537bffb9dc..0000000000000
--- a/changelog/17338.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-core: Add user lockout field to config and configuring this for auth mount using auth tune to prevent brute forcing in auth methods 
-```
\ No newline at end of file
diff --git a/changelog/17339.txt b/changelog/17339.txt
deleted file mode 100644
index 4ab14210ecb41..0000000000000
--- a/changelog/17339.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-plugins/kv: KV v2 returns 404 instead of 500 for request paths that incorrectly include a trailing slash.
-```
diff --git a/changelog/17376.txt b/changelog/17376.txt
deleted file mode 100644
index 0b2f4e40dd4c9..0000000000000
--- a/changelog/17376.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-ui: Remove default value of 30 to TtlPicker2 if no value is passed in.
-```
diff --git a/changelog/17395.txt b/changelog/17395.txt
deleted file mode 100644
index f7ce602949af6..0000000000000
--- a/changelog/17395.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug:
-api: Fix to account for older versions of Vault with no `custom_metadata` support
-```
diff --git a/changelog/17459.txt b/changelog/17459.txt
deleted file mode 100644
index fd240c5376758..0000000000000
--- a/changelog/17459.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-core/identity: Add machine-readable output to body of response upon alias clash during entity merge
-```
\ No newline at end of file
diff --git a/changelog/17499.txt b/changelog/17499.txt
deleted file mode 100644
index f3b1831d62774..0000000000000
--- a/changelog/17499.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-core: Update protoc from 3.21.5 to 3.21.7
-```
\ No newline at end of file
diff --git a/changelog/17514.txt b/changelog/17514.txt
deleted file mode 100644
index 215ea83295d07..0000000000000
--- a/changelog/17514.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-core: Fix vault operator init command to show the right curl string with -output-curl-string and right policy hcl with -output-policy
-```
\ No newline at end of file
diff --git a/changelog/17540.txt b/changelog/17540.txt
deleted file mode 100644
index 3915eae2af6cd..0000000000000
--- a/changelog/17540.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-```release-note:improvement
-auth/azure: Adds support for authentication with Managed Service Identity (MSI) from a 
-Virtual Machine Scale Set (VMSS) in flexible orchestration mode.
-```
\ No newline at end of file
diff --git a/changelog/17575.txt b/changelog/17575.txt
deleted file mode 100644
index f08b53ff851cd..0000000000000
--- a/changelog/17575.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-ui: use the combined activity log (partial + historic) API for client count dashboard and remove use of monthly endpoint
-```
diff --git a/changelog/17636.txt b/changelog/17636.txt
deleted file mode 100644
index 0668f21874511..0000000000000
--- a/changelog/17636.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-secrets/transit: Add support for PKCSv1_5_NoOID RSA signatures
-```
diff --git a/changelog/17638.txt b/changelog/17638.txt
deleted file mode 100644
index 37e0575397194..0000000000000
--- a/changelog/17638.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-secrets/transit: Add associated_data parameter for additional authenticated data in AEAD ciphers
-```
diff --git a/changelog/17650.txt b/changelog/17650.txt
deleted file mode 100644
index 79e76692bb4f0..0000000000000
--- a/changelog/17650.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-cli: Add support for creating requests to existing non-KVv2 PATCH-capable endpoints.
-```
diff --git a/changelog/17678.txt b/changelog/17678.txt
deleted file mode 100644
index bddf213d565f2..0000000000000
--- a/changelog/17678.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-Reduced binary size
-```
diff --git a/changelog/17747.txt b/changelog/17747.txt
deleted file mode 100644
index 53ceafa807fbd..0000000000000
--- a/changelog/17747.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-secrets/aws: Update dependencies [[PR-17747](https://github.com/hashicorp/vault/pull/17747)]
-```
diff --git a/changelog/17749.txt b/changelog/17749.txt
deleted file mode 100644
index aac49467c40ef..0000000000000
--- a/changelog/17749.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-ui: Add inline policy creation when creating an identity entity or group
-```
diff --git a/changelog/17750.txt b/changelog/17750.txt
deleted file mode 100644
index af12458f45a8a..0000000000000
--- a/changelog/17750.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-cli/pki: Add health-check subcommand to evaluate the health of a PKI instance.
-```
diff --git a/changelog/17752.txt b/changelog/17752.txt
deleted file mode 100644
index 628eed8e68318..0000000000000
--- a/changelog/17752.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-openapi: fix gen_openapi.sh script to correctly load vault plugins
-```
diff --git a/changelog/17768.txt b/changelog/17768.txt
deleted file mode 100644
index 25246ea08ea4d..0000000000000
--- a/changelog/17768.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:change
-auth/approle: Add maximum length of 4096 for approle role_names, as this value results in HMAC calculation
-```
\ No newline at end of file
diff --git a/changelog/17774.txt b/changelog/17774.txt
deleted file mode 100644
index f6103ec60a369..0000000000000
--- a/changelog/17774.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-secrets/pki: Return new fields revocation_time_rfc3339 and issuer_id to existing certificate serial lookup api if it is revoked
-```
diff --git a/changelog/17779.txt b/changelog/17779.txt
deleted file mode 100644
index a0b3bd6c373ba..0000000000000
--- a/changelog/17779.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-secrets/pki: Add a new API that returns the serial numbers of revoked certificates on the local cluster
-```
diff --git a/changelog/17789.txt b/changelog/17789.txt
deleted file mode 100644
index fd6f3b0883c1e..0000000000000
--- a/changelog/17789.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-sys/internal/inspect: Creates an endpoint to look to inspect internal subsystems.
-```
\ No newline at end of file
diff --git a/changelog/17822.txt b/changelog/17822.txt
deleted file mode 100644
index 5c39b3c531328..0000000000000
--- a/changelog/17822.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:change
-logging: Removed legacy environment variable for log format ('LOGXI_FORMAT'), should use 'VAULT_LOG_FORMAT' instead
-```
diff --git a/changelog/17823.txt b/changelog/17823.txt
deleted file mode 100644
index d999c879450ea..0000000000000
--- a/changelog/17823.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-secrets/pki: Allow tidying of expired issuer certificates.
-```
diff --git a/changelog/17835.txt b/changelog/17835.txt
deleted file mode 100644
index 3c48884364c5a..0000000000000
--- a/changelog/17835.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-ui: mfa: use proper request id generation
-```
diff --git a/changelog/17836.txt b/changelog/17836.txt
deleted file mode 100644
index 66bc2369e07c5..0000000000000
--- a/changelog/17836.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-core: trying to unseal with the wrong key now returns HTTP 400
-```
\ No newline at end of file
diff --git a/changelog/17841.txt b/changelog/17841.txt
deleted file mode 100644
index 6234bbba0b8c8..0000000000000
--- a/changelog/17841.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-logging: Vault Agent supports logging to a specified file path via environment variable, CLI or config
-```
\ No newline at end of file
diff --git a/changelog/17855.txt b/changelog/17855.txt
deleted file mode 100644
index c73838ae3642b..0000000000000
--- a/changelog/17855.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-core: Added warning to /sys/seal-status and vault status command if potentially dangerous behaviour overrides are being used.
-```
\ No newline at end of file
diff --git a/changelog/17856.txt b/changelog/17856.txt
deleted file mode 100644
index f039794857ab5..0000000000000
--- a/changelog/17856.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-core/activity: fix the end_date returned from the activity log endpoint when partial counts are computed
-```
diff --git a/changelog/17857.txt b/changelog/17857.txt
deleted file mode 100644
index 7c07f4e3d4301..0000000000000
--- a/changelog/17857.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-auth/azure: upgrades dependencies
-```
\ No newline at end of file
diff --git a/changelog/17858.txt b/changelog/17858.txt
deleted file mode 100644
index 2b1a76e34c61c..0000000000000
--- a/changelog/17858.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-auth/gcp: Upgrades dependencies
-```
\ No newline at end of file
diff --git a/changelog/17866.txt b/changelog/17866.txt
deleted file mode 100644
index 7e173f8de7375..0000000000000
--- a/changelog/17866.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-ui: consolidate all <a> tag usage
-```
\ No newline at end of file
diff --git a/changelog/17871.txt b/changelog/17871.txt
deleted file mode 100644
index b4fb2b0ead3fa..0000000000000
--- a/changelog/17871.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-secrets/gcp: Upgrades dependencies
-```
\ No newline at end of file
diff --git a/changelog/17893.txt b/changelog/17893.txt
deleted file mode 100644
index 3dddc7659b8d8..0000000000000
--- a/changelog/17893.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:feature
-**Kubernetes Secrets Engine UI**: Kubernetes is now available in the UI as a supported secrets engine.
-```
\ No newline at end of file
diff --git a/changelog/17894.txt b/changelog/17894.txt
deleted file mode 100644
index bd056cdf34e65..0000000000000
--- a/changelog/17894.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-ui: allow selection of "default" for ssh algorithm_signer in web interface
-```
diff --git a/changelog/17904.txt b/changelog/17904.txt
deleted file mode 100644
index aa654046b89cd..0000000000000
--- a/changelog/17904.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-credential/cert: adds error message if no tls connection is found during the AliasLookahead operation
-```
\ No newline at end of file
diff --git a/changelog/17909.txt b/changelog/17909.txt
deleted file mode 100644
index 3f19f94398ee3..0000000000000
--- a/changelog/17909.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-openapi: Mark request body objects as required 
-```
diff --git a/changelog/17919.txt b/changelog/17919.txt
deleted file mode 100644
index 8fbb41db44a3b..0000000000000
--- a/changelog/17919.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-api: property based testing for LifetimeWatcher sleep duration calculation
-```
diff --git a/changelog/17927.txt b/changelog/17927.txt
deleted file mode 100644
index 946c5355e0239..0000000000000
--- a/changelog/17927.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-ui: Enable typescript for future development
-```
\ No newline at end of file
diff --git a/changelog/17929.txt b/changelog/17929.txt
deleted file mode 100644
index 72b639c18d1c7..0000000000000
--- a/changelog/17929.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-```release-note:improvement
-core/server: Added an environment variable to write goroutine stacktraces to a 
-temporary file for SIGUSR2 signals.
-```
diff --git a/changelog/17932.txt b/changelog/17932.txt
deleted file mode 100644
index 09dd01c1b775e..0000000000000
--- a/changelog/17932.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug:
-UI: Fix "MFA-Setup permission denied error" by using user-token specific MFA generate endpoint instead of admin-generate
-```
diff --git a/changelog/17934.txt b/changelog/17934.txt
deleted file mode 100644
index 7f087a915a285..0000000000000
--- a/changelog/17934.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-secrets/transit: Add support to import public keys in transit engine and allow encryption and verification of signed data
-```
diff --git a/changelog/17935.txt b/changelog/17935.txt
deleted file mode 100644
index c16ffdfe332eb..0000000000000
--- a/changelog/17935.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-core/activity: return partial month counts when querying a historical date range and no historical data exists.
-```
diff --git a/changelog/17951.txt b/changelog/17951.txt
deleted file mode 100644
index 06dd7a4a5d341..0000000000000
--- a/changelog/17951.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-core: added changes for user lockout workflow.
-```
\ No newline at end of file
diff --git a/changelog/17964.txt b/changelog/17964.txt
deleted file mode 100644
index 605100f8148c9..0000000000000
--- a/changelog/17964.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-secrets/azure: upgrades dependencies
-```
diff --git a/changelog/18021.txt b/changelog/18021.txt
deleted file mode 100644
index 69a6df1a6ab72..0000000000000
--- a/changelog/18021.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-auth/alicloud: upgrades dependencies
-```
diff --git a/changelog/18031.txt b/changelog/18031.txt
deleted file mode 100644
index 74d659fb13e9c..0000000000000
--- a/changelog/18031.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-logging: Vault agent and server commands support log file and log rotation.
-```
\ No newline at end of file
diff --git a/changelog/18039.txt b/changelog/18039.txt
deleted file mode 100644
index ea522a7539b22..0000000000000
--- a/changelog/18039.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-```release-note:improvement
-plugins: Mark logical database plugins Removed and remove the plugin code.
-```
-```release-note:improvement
-plugins: Mark app-id auth method Removed and remove the plugin code.
-```
diff --git a/changelog/18040.txt b/changelog/18040.txt
deleted file mode 100644
index cb4eaf81161d7..0000000000000
--- a/changelog/18040.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-secrets/pki: Added a new API that allows external actors to craft a CRL through JSON parameters
-```
diff --git a/changelog/18043.txt b/changelog/18043.txt
deleted file mode 100644
index 564574c7f2edf..0000000000000
--- a/changelog/18043.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-auth/cert: Support listing provisioned CRLs within the mount.
-```
diff --git a/changelog/18067.txt b/changelog/18067.txt
deleted file mode 100644
index 2c86305d96d55..0000000000000
--- a/changelog/18067.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-cli/kv: improve kv CLI to remove data or custom metadata using kv patch
-```
diff --git a/changelog/18086.txt b/changelog/18086.txt
new file mode 100644
index 0000000000000..7d8d879503255
--- /dev/null
+++ b/changelog/18086.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+secrets/azure: add WAL to clean up role assignments if errors occur
+```
diff --git a/changelog/18101.txt b/changelog/18101.txt
deleted file mode 100644
index 97ece748d659f..0000000000000
--- a/changelog/18101.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-agent: Agent listeners can now be to be the `metrics_only` role, serving only metrics, as part of the listener's new top level `role` option.
-```
diff --git a/changelog/18111.txt b/changelog/18111.txt
new file mode 100644
index 0000000000000..bc3a0e5cd66fb
--- /dev/null
+++ b/changelog/18111.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+secrets/gcp: Fixes duplicate service account key for rotate root on standby or secondary
+```
\ No newline at end of file
diff --git a/changelog/18128.txt b/changelog/18128.txt
deleted file mode 100644
index 32dc537664718..0000000000000
--- a/changelog/18128.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-audit: Add `elide_list_responses` option, providing a countermeasure for a common source of oversized audit log entries
-```
diff --git a/changelog/18137.txt b/changelog/18137.txt
deleted file mode 100644
index f262f96f35212..0000000000000
--- a/changelog/18137.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-agent: Configured Vault Agent listeners now listen without the need for caching to be configured.
-```
diff --git a/changelog/18186.txt b/changelog/18186.txt
deleted file mode 100644
index 13710826284e8..0000000000000
--- a/changelog/18186.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-```release-note:breaking-change
-secrets/pki: Maintaining running count of certificates will be turned off by default.
-To re-enable keeping these metrics available on the tidy status endpoint, enable
-maintain_stored_certificate_counts on tidy-config, to also publish them to the
-metrics consumer, enable publish_stored_certificate_count_metrics .
-```
\ No newline at end of file
diff --git a/changelog/18192.txt b/changelog/18192.txt
deleted file mode 100644
index 56e377e47a055..0000000000000
--- a/changelog/18192.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-openapi: Add logic to generate openapi response structures
-```
diff --git a/changelog/18198.txt b/changelog/18198.txt
deleted file mode 100644
index ed03e74eb1664..0000000000000
--- a/changelog/18198.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-openapi: Add openapi response definitions to approle/path_role.go
-```
diff --git a/changelog/18199.txt b/changelog/18199.txt
deleted file mode 100644
index 706a5568ccf1c..0000000000000
--- a/changelog/18199.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-secrets/pki: Allow templating performance replication cluster- and issuer-specific AIA URLs.
-```
diff --git a/changelog/18207.txt b/changelog/18207.txt
new file mode 100644
index 0000000000000..00c6d9ac26d74
--- /dev/null
+++ b/changelog/18207.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+secrets/ad: Fix bug where config couldn't be updated unless binddn/bindpass were included in the update.
+```
diff --git a/changelog/18222.txt b/changelog/18222.txt
deleted file mode 100644
index a7f822aa73a3e..0000000000000
--- a/changelog/18222.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-secrets/pki: Respond with written data to `config/auto-tidy`, `config/crl`, and `roles/:role`.
-```
diff --git a/changelog/18225.txt b/changelog/18225.txt
deleted file mode 100644
index 567c3c78da95e..0000000000000
--- a/changelog/18225.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-auth/ldap: allow providing the LDAP password via an env var when authenticating via the CLI
-```
diff --git a/changelog/18227.txt b/changelog/18227.txt
deleted file mode 100644
index 477915982d03d..0000000000000
--- a/changelog/18227.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:feature
-**Server UDS Listener**: Adding listener to Vault server to serve http request via unix domain socket
-```
\ No newline at end of file
diff --git a/changelog/18228.txt b/changelog/18228.txt
deleted file mode 100644
index 4f1b6d1046c36..0000000000000
--- a/changelog/18228.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-hcp/connectivity: Add foundational OSS support for opt-in secure communication between self-managed Vault nodes and [HashiCorp Cloud Platform](https://cloud.hashicorp.com)
-```
diff --git a/changelog/18230.txt b/changelog/18230.txt
deleted file mode 100644
index 335f9670db2ae..0000000000000
--- a/changelog/18230.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-auth/ldap: allow configuration of alias dereferencing in LDAP search
-```
diff --git a/changelog/18243.txt b/changelog/18243.txt
deleted file mode 100644
index f187579aa7833..0000000000000
--- a/changelog/18243.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-```release-note:improvement
-secrets/transit: Add an optional reference field to batch operation items
-which is repeated on batch responses to help more easily correlate inputs with outputs.
-```
\ No newline at end of file
diff --git a/changelog/18244.txt b/changelog/18244.txt
deleted file mode 100644
index b81de038dc0f1..0000000000000
--- a/changelog/18244.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-core: parallelize backend initialization to improve startup time for large numbers of mounts.
-```
\ No newline at end of file
diff --git a/changelog/18272.txt b/changelog/18272.txt
deleted file mode 100644
index 168913be811b8..0000000000000
--- a/changelog/18272.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-secrets/transit: Allow configuring whether upsert of keys is allowed.
-```
diff --git a/changelog/18279.txt b/changelog/18279.txt
deleted file mode 100644
index 9823a1f19b7a4..0000000000000
--- a/changelog/18279.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-```release-note:improvement
-core: Added sys/lockedusers/[mount_accessor]/unlock/[alias_identifier] endpoint to unlock an user
-with given mount_accessor and alias_identifier if locked 
-```
\ No newline at end of file
diff --git a/changelog/18302.txt b/changelog/18302.txt
deleted file mode 100644
index 1f4b69dc863a7..0000000000000
--- a/changelog/18302.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-hcp/status: Expand node-level status information
-```
diff --git a/changelog/18315.txt b/changelog/18315.txt
deleted file mode 100644
index dc6984749ae9c..0000000000000
--- a/changelog/18315.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-hcp/connectivity: Include HCP organization, project, and resource ID in server startup logs
-```
diff --git a/changelog/18351.txt b/changelog/18351.txt
deleted file mode 100644
index 07faa06d13560..0000000000000
--- a/changelog/18351.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-hcp/status: Add cluster-level status information 
-```
diff --git a/changelog/18374.txt b/changelog/18374.txt
deleted file mode 100644
index eaa57980d2230..0000000000000
--- a/changelog/18374.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-ui: update DocLink component to use new host url: developer.hashicorp.com
-```
diff --git a/changelog/18376.txt b/changelog/18376.txt
deleted file mode 100644
index 1edc3df5a1ad1..0000000000000
--- a/changelog/18376.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-openapi: Add openapi response definitions to pki/config_*.go
-```
diff --git a/changelog/18397.txt b/changelog/18397.txt
deleted file mode 100644
index aafb9d71e6fd2..0000000000000
--- a/changelog/18397.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-secrets/pki: Allow UserID Field (https://www.rfc-editor.org/rfc/rfc1274#section-9.3.1) to be set on Certificates when
-allowed by role```
diff --git a/changelog/18401.txt b/changelog/18401.txt
index 8f1c148fd13a0..441e9a08b0df8 100644
--- a/changelog/18401.txt
+++ b/changelog/18401.txt
@@ -1,3 +1,3 @@
 ```release-note:bug
-expiration: Prevent panics on perf standbys when an irrevocable lease gets deleted.
+expiration: Prevent panics on perf standbys when an irrevocable release gets deleted.
 ```
diff --git a/changelog/18403.txt b/changelog/18403.txt
deleted file mode 100644
index 458f6c92633f6..0000000000000
--- a/changelog/18403.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-agent/config: Allow config directories to be specified with -config, and allow multiple -configs to be supplied.
-```
diff --git a/changelog/18437.txt b/changelog/18437.txt
deleted file mode 100644
index 9ca8a8dc3bb3c..0000000000000
--- a/changelog/18437.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-client/pki: Add a new command verify-sign which checks the relationship between two certificates.
-```
diff --git a/changelog/18452.txt b/changelog/18452.txt
deleted file mode 100644
index 6d4566667ee49..0000000000000
--- a/changelog/18452.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-core/activity: de-duplicate namespaces when historical and current month data are mixed
-```
diff --git a/changelog/18456.txt b/changelog/18456.txt
deleted file mode 100644
index ee297508f2a4b..0000000000000
--- a/changelog/18456.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-openapi: add openapi response defintions to /sys/audit endpoints
-```
\ No newline at end of file
diff --git a/changelog/18463.txt b/changelog/18463.txt
deleted file mode 100644
index 538f66eb1dc73..0000000000000
--- a/changelog/18463.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-cli/pki: Add List-Intermediates functionality to pki client.
-```
diff --git a/changelog/18465.txt b/changelog/18465.txt
deleted file mode 100644
index 928da99bc4fef..0000000000000
--- a/changelog/18465.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-openapi: add openapi response defintions to /sys/auth endpoints
-```
\ No newline at end of file
diff --git a/changelog/18467.txt b/changelog/18467.txt
deleted file mode 100644
index 55a85a6487a29..0000000000000
--- a/changelog/18467.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-cli/pki: Add pki issue command, which creates a CSR, has a vault mount sign it, then reimports it.
-```
\ No newline at end of file
diff --git a/changelog/18468.txt b/changelog/18468.txt
deleted file mode 100644
index 362bf05018c5b..0000000000000
--- a/changelog/18468.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-openapi: add openapi response defintions to /sys/capabilities endpoints
-```
\ No newline at end of file
diff --git a/changelog/18472.txt b/changelog/18472.txt
deleted file mode 100644
index e34d53afc2f68..0000000000000
--- a/changelog/18472.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-openapi: add openapi response defintions to /sys/config and /sys/generate-root endpoints
-```
\ No newline at end of file
diff --git a/changelog/18482.txt b/changelog/18482.txt
deleted file mode 100644
index f51abb675c4a6..0000000000000
--- a/changelog/18482.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-secrets/pki: Return issuer_id and issuer_name on /issuer/:issuer_ref/json endpoint.
-```
diff --git a/changelog/18499.txt b/changelog/18499.txt
deleted file mode 100644
index b329ed0db08b8..0000000000000
--- a/changelog/18499.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-cli/pki: Added "Reissue" command which allows extracting fields from an existing certificate to create a new certificate.
-```
\ No newline at end of file
diff --git a/changelog/18515.txt b/changelog/18515.txt
deleted file mode 100644
index 86eb71b191677..0000000000000
--- a/changelog/18515.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-openapi: Add openapi response definitions to vault/logical_system_paths.go defined endpoints.
-```
diff --git a/changelog/18521.txt b/changelog/18521.txt
deleted file mode 100644
index 4111aea2c98e4..0000000000000
--- a/changelog/18521.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-ui: wait for wanted message event during OIDC callback instead of using the first message event
-```
diff --git a/changelog/18542.txt b/changelog/18542.txt
deleted file mode 100644
index ff4674010f4b7..0000000000000
--- a/changelog/18542.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-openapi: add openapi response definitions to /sys/internal endpoints
-```
diff --git a/changelog/18568.txt b/changelog/18568.txt
deleted file mode 100644
index a1fbabf2545a0..0000000000000
--- a/changelog/18568.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-core: Fix spurious `permission denied` for all HelpOperations on sudo-protected paths
-```
diff --git a/changelog/18585.txt b/changelog/18585.txt
deleted file mode 100644
index a0832e2d415e0..0000000000000
--- a/changelog/18585.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-hcp/connectivity: Only update SCADA session metadata if status changes
-```
diff --git a/changelog/18587.txt b/changelog/18587.txt
deleted file mode 100644
index 7471d9a4c0251..0000000000000
--- a/changelog/18587.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-secrets/kubernetes: Add /check endpoint to determine if environment variables are set [[GH-18](https://github.com/hashicorp/vault-plugin-secrets-kubernetes/pull/18)]
-```
diff --git a/changelog/18589.txt b/changelog/18589.txt
deleted file mode 100644
index 2e1ef4878dab1..0000000000000
--- a/changelog/18589.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-vault/diagnose: Upgrade `go.opentelemetry.io/otel`, `go.opentelemetry.io/otel/sdk`, `go.opentelemetry.io/otel/trace` to v1.11.2
-```
\ No newline at end of file
diff --git a/changelog/18598.txt b/changelog/18598.txt
deleted file mode 100644
index 62d13d0e705f6..0000000000000
--- a/changelog/18598.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-core/activity: include mount counts when de-duplicating current and historical month data
-```
diff --git a/changelog/18604.txt b/changelog/18604.txt
deleted file mode 100644
index 7645cbb40394d..0000000000000
--- a/changelog/18604.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-core: add `detect_deadlocks` config to optionally detect core state deadlocks
-```
\ No newline at end of file
diff --git a/changelog/18610.txt b/changelog/18610.txt
deleted file mode 100644
index bac3add5a1a3c..0000000000000
--- a/changelog/18610.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-```release-note:improvement
-auth: Allow naming login MFA methods and using those names instead of IDs in satisfying MFA requirement for requests.
-Make passcode arguments consistent across login MFA method types.
-```
\ No newline at end of file
diff --git a/changelog/18624.txt b/changelog/18624.txt
deleted file mode 100644
index 91209bb46d9e2..0000000000000
--- a/changelog/18624.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-openapi: add openapi response definitions to /sys/rotate endpoints
-```
diff --git a/changelog/18625.txt b/changelog/18625.txt
deleted file mode 100644
index 526d6b63e6f6b..0000000000000
--- a/changelog/18625.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-openapi: add openapi response definitions to /sys/seal endpoints
-```
\ No newline at end of file
diff --git a/changelog/18626.txt b/changelog/18626.txt
deleted file mode 100644
index 6bb2ba0f4d89b..0000000000000
--- a/changelog/18626.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-openapi: add openapi response definitions to /sys/tool endpoints
-```
\ No newline at end of file
diff --git a/changelog/18627.txt b/changelog/18627.txt
deleted file mode 100644
index e2a4dfb5f2e61..0000000000000
--- a/changelog/18627.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-openapi: add openapi response definitions to /sys/wrapping endpoints
-```
\ No newline at end of file
diff --git a/changelog/18628.txt b/changelog/18628.txt
deleted file mode 100644
index 0722856c93b93..0000000000000
--- a/changelog/18628.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-openapi: add openapi response definitions to /sys/version-history, /sys/leader, /sys/ha-status, /sys/host-info, /sys/in-flight-req
-```
\ No newline at end of file
diff --git a/changelog/18632.txt b/changelog/18632.txt
deleted file mode 100644
index 535961367a3a8..0000000000000
--- a/changelog/18632.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-database/postgres: Support multiline strings for revocation statements.
-```
diff --git a/changelog/18633.txt b/changelog/18633.txt
deleted file mode 100644
index 2048c46d914ec..0000000000000
--- a/changelog/18633.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-openapi: Add openapi response definitions to /sys defined endpoints.
-```
\ No newline at end of file
diff --git a/changelog/18635.txt b/changelog/18635.txt
deleted file mode 100644
index 43f3fdf673653..0000000000000
--- a/changelog/18635.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-sdk: Add response schema validation method framework/FieldData.ValidateStrict and two test helpers (ValidateResponse, ValidateResponseData)
-```
diff --git a/changelog/18636.txt b/changelog/18636.txt
deleted file mode 100644
index 9f260e2e86fc0..0000000000000
--- a/changelog/18636.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-sdk: Adding FindResponseSchema test helper to assist with response schema validation in tests
-```
diff --git a/changelog/18638.txt b/changelog/18638.txt
deleted file mode 100644
index 727c85a669967..0000000000000
--- a/changelog/18638.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-agent: allows some parts of config to be reloaded without requiring a restart.
-```
\ No newline at end of file
diff --git a/changelog/18645.txt b/changelog/18645.txt
deleted file mode 100644
index 0122111bae42a..0000000000000
--- a/changelog/18645.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-secrets/pki: Allow tidying of the legacy ca_bundle, improving startup on post-migrated, seal-wrapped PKI mounts.
-```
diff --git a/changelog/18663.txt b/changelog/18663.txt
deleted file mode 100644
index 941b2715ef75a..0000000000000
--- a/changelog/18663.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-openapi: generic_mount_paths: Move implementation fully into server, rather than partially in plugin framework; recognize all 4 singleton mounts (auth/token, cubbyhole, identity, system) rather than just 2; change parameter from `{mountPath}` to `{<type>_mount_path}`
-```
diff --git a/changelog/18673.txt b/changelog/18673.txt
deleted file mode 100644
index 73a2a8f43925f..0000000000000
--- a/changelog/18673.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-core: Implemented background thread to update locked user entries every 15 minutes to prevent brute forcing in auth methods. 
-```
\ No newline at end of file
diff --git a/changelog/18675.txt b/changelog/18675.txt
deleted file mode 100644
index 90a8ed64d21cb..0000000000000
--- a/changelog/18675.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-```release-note:improvement
-core: Added sys/locked-users endpoint to list locked users. Changed api endpoint from
-sys/lockedusers/[mount_accessor]/unlock/[alias_identifier] to sys/locked-users/[mount_accessor]/unlock/[alias_identifier]. 
-```
\ No newline at end of file
diff --git a/changelog/18682.txt b/changelog/18682.txt
deleted file mode 100644
index 9042109033511..0000000000000
--- a/changelog/18682.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-```release-note:improvement
-core: Add experiments system and `events.alpha1` experiment.
-```
-
diff --git a/changelog/18684.txt b/changelog/18684.txt
deleted file mode 100644
index 803c7cc571f94..0000000000000
--- a/changelog/18684.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-agent: Add note in logs when starting Vault Agent indicating if the version differs to the Vault Server.
-```
diff --git a/changelog/18704.txt b/changelog/18704.txt
deleted file mode 100644
index bc76db9ba9230..0000000000000
--- a/changelog/18704.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-storage/raft: Fix race with follower heartbeat tracker during teardown.
-```
\ No newline at end of file
diff --git a/changelog/18708.txt b/changelog/18708.txt
deleted file mode 100644
index 1db2ba6239f0f..0000000000000
--- a/changelog/18708.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-api: Remove timeout logic from ReadRaw functions and add ReadRawWithContext
-```
diff --git a/changelog/18718.txt b/changelog/18718.txt
deleted file mode 100644
index a5b9b133421c9..0000000000000
--- a/changelog/18718.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-core: Add vault.core.locked_users telemetry metric to emit information about total number of locked users.
-```
\ No newline at end of file
diff --git a/changelog/18729.txt b/changelog/18729.txt
deleted file mode 100644
index 975d0274bc6f9..0000000000000
--- a/changelog/18729.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-sdk/backend: prevent panic when computing the zero value for a `TypeInt64` schema field.
-```
\ No newline at end of file
diff --git a/changelog/18740.txt b/changelog/18740.txt
deleted file mode 100644
index f493995d48a69..0000000000000
--- a/changelog/18740.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-agent: Added `token_file` auto-auth configuration to allow using a pre-existing token for Vault Agent.
-```
diff --git a/changelog/18752.txt b/changelog/18752.txt
deleted file mode 100644
index 95346e0431d12..0000000000000
--- a/changelog/18752.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-**Redis ElastiCache DB Engine**: Renamed configuration parameters for disambiguation; old parameters still supported for compatibility.
-```
\ No newline at end of file
diff --git a/changelog/18766.txt b/changelog/18766.txt
deleted file mode 100644
index 50743b3916f11..0000000000000
--- a/changelog/18766.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-core/activity: add namespace breakdown for new clients when date range spans multiple months, including the current month.
-```
diff --git a/changelog/18772.txt b/changelog/18772.txt
deleted file mode 100644
index 55c0696de1ba5..0000000000000
--- a/changelog/18772.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-openapi: Add openapi response definitions to approle/path_login.go & approle/path_tidy_user_id.go
-```
diff --git a/changelog/18811.txt b/changelog/18811.txt
deleted file mode 100644
index 34a155dda5a4d..0000000000000
--- a/changelog/18811.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-auth: Provide an IP address of the requests from Vault to a Duo challenge after successful authentication.
-```
diff --git a/changelog/18817.txt b/changelog/18817.txt
deleted file mode 100644
index 17c93aab75c80..0000000000000
--- a/changelog/18817.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-migration: allow parallelization of key migration for `vault operator migrate` in order to speed up a migration.
-```
\ No newline at end of file
diff --git a/changelog/18842.txt b/changelog/18842.txt
deleted file mode 100644
index 9a69ff66f1269..0000000000000
--- a/changelog/18842.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:feature
-**New PKI UI**: Add beta support for new and improved PKI UI
-```
\ No newline at end of file
diff --git a/changelog/18859.txt b/changelog/18859.txt
deleted file mode 100644
index 0ee2c361e2919..0000000000000
--- a/changelog/18859.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-core/auth: Return a 403 instead of a 500 for wrapping requests when token is not provided
-```
diff --git a/changelog/18863.txt b/changelog/18863.txt
deleted file mode 100644
index c1f2800c28904..0000000000000
--- a/changelog/18863.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-agent: JWT auto-auth has a new config option, `remove_jwt_follows_symlinks` (default: false), that, if set to true will now remove the JWT, instead of the symlink to the JWT, if a symlink to a JWT has been provided in the `path` option, and the `remove_jwt_after_reading` config option is set to true (default).
-```
\ No newline at end of file
diff --git a/changelog/18870.txt b/changelog/18870.txt
deleted file mode 100644
index 1b694895fec61..0000000000000
--- a/changelog/18870.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-core:provide more descriptive error message when calling enterprise feature paths in open-source
-```
\ No newline at end of file
diff --git a/changelog/18874.txt b/changelog/18874.txt
deleted file mode 100644
index 7483c43f90601..0000000000000
--- a/changelog/18874.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:security
-secrets/ssh: removal of the deprecated dynamic keys mode. **When any remaining dynamic key leases expire**, an error stating `secret is unsupported by this backend` will be thrown by the lease manager.
-```
diff --git a/changelog/18885.txt b/changelog/18885.txt
deleted file mode 100644
index 99878c89c1034..0000000000000
--- a/changelog/18885.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:enhancement
-auth/cert: Load config, crls from InitializeFunc to allow parallel processing.
-```
diff --git a/changelog/18887.txt b/changelog/18887.txt
deleted file mode 100644
index 55e8600878df5..0000000000000
--- a/changelog/18887.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-cli: Add transit import key helper commands for BYOK to Transit/Transform.
-```
\ No newline at end of file
diff --git a/changelog/18890.txt b/changelog/18890.txt
deleted file mode 100644
index 056e585996980..0000000000000
--- a/changelog/18890.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-```release-note:bug
-core: removes strings.ToLower for alias name from pathLoginAliasLookahead function in userpass. This fixes
-the storage entry for locked users by having the correct alias name in path. 
-``
\ No newline at end of file
diff --git a/changelog/18892.txt b/changelog/18892.txt
deleted file mode 100644
index 65b6ebf246a7b..0000000000000
--- a/changelog/18892.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-cli: updated `vault operator rekey` prompts to describe recovery keys when `-target=recovery`
-```
diff --git a/changelog/18916.txt b/changelog/18916.txt
deleted file mode 100644
index eb2792b31e407..0000000000000
--- a/changelog/18916.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-core/activity: report mount paths (rather than mount accessors) in current month activity log counts and include deleted mount paths in precomputed queries.
-```
diff --git a/changelog/18934.txt b/changelog/18934.txt
deleted file mode 100644
index e84f6667ccb2b..0000000000000
--- a/changelog/18934.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-openapi: Change gen_openapi.sh to generate schema with generic mount paths
-```
diff --git a/changelog/18935.txt b/changelog/18935.txt
deleted file mode 100644
index c55cda115cd8f..0000000000000
--- a/changelog/18935.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-openapi: Add default values to thing_mount_path parameters
-```
diff --git a/changelog/18939.txt b/changelog/18939.txt
deleted file mode 100644
index aa7f8e7c6658f..0000000000000
--- a/changelog/18939.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-secrets/ssh: Allow removing SSH host keys from the dynamic keys feature.
-```
diff --git a/changelog/18962.txt b/changelog/18962.txt
deleted file mode 100644
index 322c34780a2e0..0000000000000
--- a/changelog/18962.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-api: Remove dependency on sdk module.
-```
diff --git a/changelog/18984.txt b/changelog/18984.txt
deleted file mode 100644
index 4652bf299bfef..0000000000000
--- a/changelog/18984.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-secrets/pki: consistently use UTC for CA's notAfter exceeded error message
-```
diff --git a/changelog/19002.txt b/changelog/19002.txt
deleted file mode 100644
index d1a1ff5371ab4..0000000000000
--- a/changelog/19002.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-agent: Added `reload` option to cert auth configuration in case of external renewals of local x509 key-pairs.
-```
\ No newline at end of file
diff --git a/changelog/19005.txt b/changelog/19005.txt
deleted file mode 100644
index 27e251e193dd5..0000000000000
--- a/changelog/19005.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-```release-note:change
-auth/alicloud: require the `role` field on login
-```
-
-```release-note:bug
-auth/alicloud: fix regression in vault login command that caused login to fail
-```
diff --git a/changelog/19018.txt b/changelog/19018.txt
deleted file mode 100644
index bd79dbd15911d..0000000000000
--- a/changelog/19018.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-```release-note:feature
-**GCP Secrets Impersonated Account Support**: Add support for GCP service account impersonation, allowing callers to generate a GCP access token without requiring Vault to store or retrieve a GCP service account key for each role.
-```
-
-```release-note:bug
-secrets/gcp: fix issue where IAM bindings were not preserved during policy update
-```
diff --git a/changelog/19043.txt b/changelog/19043.txt
deleted file mode 100644
index 20a1a77bb7890..0000000000000
--- a/changelog/19043.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-openapi: added ability to validate response structures against openapi schema for test clusters
-```
\ No newline at end of file
diff --git a/changelog/19044.txt b/changelog/19044.txt
deleted file mode 100644
index 7926bb66c9a71..0000000000000
--- a/changelog/19044.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-database/redis-elasticache: changed config argument names for disambiguation
-```
\ No newline at end of file
diff --git a/changelog/19056.txt b/changelog/19056.txt
deleted file mode 100644
index b5b1ae3520307..0000000000000
--- a/changelog/19056.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-secrets/kv: make upgrade synchronous when no keys to upgrade
-```
\ No newline at end of file
diff --git a/changelog/19061.txt b/changelog/19061.txt
deleted file mode 100644
index ddf794358def2..0000000000000
--- a/changelog/19061.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-secrets/ad: Fix bug where updates to config would fail if password isn't provided 
-```
diff --git a/changelog/19063.txt b/changelog/19063.txt
deleted file mode 100644
index df361111bd9f9..0000000000000
--- a/changelog/19063.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:change
-secrets/gcpkms: Updated plugin from v0.13.0 to v0.14.0
-```
diff --git a/changelog/19068.txt b/changelog/19068.txt
deleted file mode 100644
index 6edb29fe11039..0000000000000
--- a/changelog/19068.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:change
-sdk: Remove version package, make useragent.String versionless.
-```
diff --git a/changelog/19076.txt b/changelog/19076.txt
deleted file mode 100644
index c206f44e82c3b..0000000000000
--- a/changelog/19076.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-```release-note:improvement
-auth/oidc: Adds ability to set Google Workspace domain for groups search
-```
-```release-note:improvement
-auth/oidc: Adds `abort_on_error` parameter to CLI login command to help in non-interactive contexts
-```
\ No newline at end of file
diff --git a/changelog/19077.txt b/changelog/19077.txt
deleted file mode 100644
index 604cea57b5c6d..0000000000000
--- a/changelog/19077.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-```release-note:feature
-**Azure Auth Rotate Root**: Add support for rotate root in Azure Auth engine
-```
-
-```release-note:feature
-**Azure Auth Managed Identities**: Allow any Azure resource that supports managed identities to authenticate with Vault
-```
-
-```release-note:feature
-**VMSS Flex Authentication**: Adds support for Virtual Machine Scale Set Flex Authentication
-```
\ No newline at end of file
diff --git a/changelog/19084.txt b/changelog/19084.txt
deleted file mode 100644
index 97896d3d27bc3..0000000000000
--- a/changelog/19084.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-secrets/kubernetes: add /check endpoint to determine if environment variables are set
-```
diff --git a/changelog/19094.txt b/changelog/19094.txt
deleted file mode 100644
index d3d872d91c965..0000000000000
--- a/changelog/19094.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-auth/kubernetes: fixes and dep updates for the auth-kubernetes plugin (see plugin changelog for details)
-```
diff --git a/changelog/19096.txt b/changelog/19096.txt
deleted file mode 100644
index 2cb0bbf04a685..0000000000000
--- a/changelog/19096.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-secrets/azure: Adds ability to persist an application for the lifetime of a role.
-```
\ No newline at end of file
diff --git a/changelog/19098.txt b/changelog/19098.txt
deleted file mode 100644
index df0f9c11ca3bd..0000000000000
--- a/changelog/19098.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-auth/cf: Remove incorrect usage of CreateOperation from path_config
-```
diff --git a/changelog/19100.txt b/changelog/19100.txt
deleted file mode 100644
index a2f1b72e18df1..0000000000000
--- a/changelog/19100.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-```release-note:improvement
-Bump github.com/hashicorp/go-plugin version from 1.4.5 to 1.4.8
-```
-
diff --git a/changelog/19111.txt b/changelog/19111.txt
deleted file mode 100644
index 35b7803d69740..0000000000000
--- a/changelog/19111.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-secrets/mongodb-atlas: Fix a bug that did not allow WAL rollback to handle partial failures when creating API keys
-```
diff --git a/changelog/19116.txt b/changelog/19116.txt
deleted file mode 100644
index 5dfcd9ecfadab..0000000000000
--- a/changelog/19116.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-ui: Allows license-banners to be dismissed. Saves preferences in localStorage.
-```
\ No newline at end of file
diff --git a/changelog/19139.txt b/changelog/19139.txt
deleted file mode 100644
index 75e9a7847e17f..0000000000000
--- a/changelog/19139.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-ui: fixes bug in kmip role form that caused `operation_all` to persist after deselecting all operation checkboxes
-```
diff --git a/changelog/19145.txt b/changelog/19145.txt
deleted file mode 100644
index 9cca8e85d6344..0000000000000
--- a/changelog/19145.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-```release-note:improvement
-secrets/kv: Emit events on write if events system enabled
-```
-
diff --git a/changelog/19160.txt b/changelog/19160.txt
deleted file mode 100644
index 66a3baa157583..0000000000000
--- a/changelog/19160.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-api: Addressed a couple of issues that arose as edge cases for the -output-policy flag. Specifically around properly handling list commands, distinguishing kv V1/V2, and correctly recognizing protected paths.
-```
\ No newline at end of file
diff --git a/changelog/19170.txt b/changelog/19170.txt
deleted file mode 100644
index 9a421dd183a2d..0000000000000
--- a/changelog/19170.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-website/docs: fix database static-user sample payload
-```
diff --git a/changelog/19187.txt b/changelog/19187.txt
deleted file mode 100644
index c04234a1bb9ba..0000000000000
--- a/changelog/19187.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-website/docs: Add rotate root documentation for azure secrets engine
-```
diff --git a/changelog/19194.txt b/changelog/19194.txt
deleted file mode 100644
index b2a5ff383f126..0000000000000
--- a/changelog/19194.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-```release-note:feature
-**Event System (Alpha)**: Vault has a new opt-in experimental event system. Not yet suitable for production use. Events are currently only generated on writes to the KV secrets engine, but external plugins can also be updated to start generating events.
-```
-
diff --git a/changelog/19196.txt b/changelog/19196.txt
deleted file mode 100644
index aab2638ceac79..0000000000000
--- a/changelog/19196.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-```release-note:feature
-**PKI Cross-Cluster Revocations**: Revocation information can now be
-synchronized across primary and performance replica clusters offering
-a unified CRL/OCSP view of revocations across cluster boundaries.
-```
diff --git a/changelog/19215.txt b/changelog/19215.txt
deleted file mode 100644
index 33fea94666bd1..0000000000000
--- a/changelog/19215.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-```release-note:feature
-**Secrets/Auth Plugin Multiplexing**: The plugin will be multiplexed when run
-as an external plugin by vault versions that support secrets/auth plugin
-multiplexing (> 1.12)
-```
diff --git a/changelog/19216.txt b/changelog/19216.txt
deleted file mode 100644
index e03e866e08b45..0000000000000
--- a/changelog/19216.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-ui: adds allowed_response_headers as param for secret engine mount config
-```
diff --git a/changelog/19247.txt b/changelog/19247.txt
deleted file mode 100644
index f51e8479c97f1..0000000000000
--- a/changelog/19247.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-auth/oidc: Adds support for group membership parsing when using IBM ISAM as an OIDC provider.
-```
diff --git a/changelog/19252.txt b/changelog/19252.txt
deleted file mode 100644
index 99121351d98ca..0000000000000
--- a/changelog/19252.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-openapi: Consistently stop Vault server on exit in gen_openapi.sh
-```
diff --git a/changelog/19260.txt b/changelog/19260.txt
deleted file mode 100644
index 77138a38607cb..0000000000000
--- a/changelog/19260.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:feature
-**agent/auto-auth:**: Add OCI (Oracle Cloud Infrastructure) auto-auth method
-```
diff --git a/changelog/19265.txt b/changelog/19265.txt
deleted file mode 100644
index 23d957e2d5940..0000000000000
--- a/changelog/19265.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-cli/pki: Decode integer values properly in health-check configuration file
-```
diff --git a/changelog/19269.txt b/changelog/19269.txt
deleted file mode 100644
index 57ff2072a18c3..0000000000000
--- a/changelog/19269.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-cli/pki: Change the pki health-check --list default config output to JSON so it's a usable configuration file
-```
diff --git a/changelog/19274.txt b/changelog/19274.txt
deleted file mode 100644
index a7f5d8c292934..0000000000000
--- a/changelog/19274.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-cli/pki: Fix path for role health-check warning messages
-```
diff --git a/changelog/19276.txt b/changelog/19276.txt
deleted file mode 100644
index 373199478f921..0000000000000
--- a/changelog/19276.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-cli/pki: Properly report permission issues within health-check mount tune checks
-```
diff --git a/changelog/19290.txt b/changelog/19290.txt
deleted file mode 100644
index 1a4511590c695..0000000000000
--- a/changelog/19290.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-ui: Remove `default` and add `default-service` and `default-batch` to UI token_type for auth mount and tuning. 
-```
diff --git a/changelog/19296.txt b/changelog/19296.txt
deleted file mode 100644
index 1ef62a0cde2e6..0000000000000
--- a/changelog/19296.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:feature
-**Sidebar Navigation in UI**: A new sidebar navigation panel has been added in the UI to replace the top navigation bar.
-```
\ No newline at end of file
diff --git a/changelog/19319.txt b/changelog/19319.txt
deleted file mode 100644
index 4702344afb081..0000000000000
--- a/changelog/19319.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-openapi: Improve operationId/request/response naming strategy
-```
diff --git a/changelog/19334.txt b/changelog/19334.txt
deleted file mode 100644
index 7df68268aabe8..0000000000000
--- a/changelog/19334.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:deprecation
-secrets/ad: Marks the Active Directory (AD) secrets engine as deprecated.
-```
\ No newline at end of file
diff --git a/changelog/19365.txt b/changelog/19365.txt
deleted file mode 100644
index 774c750f49513..0000000000000
--- a/changelog/19365.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-```release-note: enhancement
-auth/aws: Support request cancellation with AWS requests
-```
-
-```release-note: enhancement
-secrets/aws: Support request cancellation with AWS requests
-```
diff --git a/changelog/19373.txt b/changelog/19373.txt
deleted file mode 100644
index 87751805e7d80..0000000000000
--- a/changelog/19373.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-cli/transit: Fix import, import-version command invocation
-```
diff --git a/changelog/19378.txt b/changelog/19378.txt
deleted file mode 100644
index 40a1e82fcb642..0000000000000
--- a/changelog/19378.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-cli/kv: add -mount flag to kv list
-```
diff --git a/changelog/19410.txt b/changelog/19410.txt
new file mode 100644
index 0000000000000..1a4fd85c8fb16
--- /dev/null
+++ b/changelog/19410.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+ui: fixes reliance on secure context (https) by removing methods using the Crypto interface
+```
diff --git a/changelog/19416.txt b/changelog/19416.txt
deleted file mode 100644
index f2a7d3275b64a..0000000000000
--- a/changelog/19416.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-auth/token: Fix cubbyhole and revocation for legacy service tokens
-```
diff --git a/changelog/19428.txt b/changelog/19428.txt
deleted file mode 100644
index c1ae6d54bbcba..0000000000000
--- a/changelog/19428.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-ui: Fixes crypto.randomUUID error in unsecure contexts from third party ember-data library
-```
\ No newline at end of file
diff --git a/changelog/19448.txt b/changelog/19448.txt
deleted file mode 100644
index 8c75b79f140c5..0000000000000
--- a/changelog/19448.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-ui: fixes SSH engine config deletion
-```
diff --git a/changelog/19468.txt b/changelog/19468.txt
deleted file mode 100644
index 5afce90eb65f3..0000000000000
--- a/changelog/19468.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-plugin/reload:  Fix a possible data race with rollback manager and plugin reload
-```
diff --git a/changelog/19472.txt b/changelog/19472.txt
deleted file mode 100644
index db9ec7276550e..0000000000000
--- a/changelog/19472.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-autopilot: Update version to v0.2.0 to add better support for respecting min quorum
-```
diff --git a/changelog/19483.txt b/changelog/19483.txt
deleted file mode 100644
index c7ba6f66d97d7..0000000000000
--- a/changelog/19483.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-agent: Fix panic when SIGHUP is issued to Agent while it has a non-TLS listener.
-```
diff --git a/changelog/19495.txt b/changelog/19495.txt
deleted file mode 100644
index dac2ca00dfb87..0000000000000
--- a/changelog/19495.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-shamir: change mul and div implementations to be constant-time
-```
\ No newline at end of file
diff --git a/changelog/19519.txt b/changelog/19519.txt
deleted file mode 100644
index 6756f62b2d47a..0000000000000
--- a/changelog/19519.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-secrets/transit: Allow importing RSA-PSS OID (1.2.840.113549.1.1.10) private keys via BYOK.
-```
diff --git a/changelog/19520.txt b/changelog/19520.txt
deleted file mode 100644
index 726be2c13a60b..0000000000000
--- a/changelog/19520.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-http: Support responding to HEAD operation from plugins
-```
diff --git a/changelog/19541.txt b/changelog/19541.txt
deleted file mode 100644
index 9bdecc35832d3..0000000000000
--- a/changelog/19541.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-ui: fixes oidc tabs in auth form submitting with the root's default_role value after a namespace has been inputted
-```
diff --git a/changelog/19545.txt b/changelog/19545.txt
deleted file mode 100644
index 615742cd32655..0000000000000
--- a/changelog/19545.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-database/elasticsearch: Update error messages resulting from Elasticsearch API errors
-```
\ No newline at end of file
diff --git a/changelog/19593.txt b/changelog/19593.txt
deleted file mode 100644
index 8f170578ec07f..0000000000000
--- a/changelog/19593.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-```release-note:improvement
-events: Suppress log warnings triggered when events are sent but the events system is not enabled.
-```
-
diff --git a/changelog/19616.txt b/changelog/19616.txt
deleted file mode 100644
index 3afcc608d19a9..0000000000000
--- a/changelog/19616.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-secrets/postgresql: Add configuration to scram-sha-256 encrypt passwords on Vault before sending them to PostgreSQL
-```
\ No newline at end of file
diff --git a/changelog/19624.txt b/changelog/19624.txt
deleted file mode 100644
index 7bc2df63ea858..0000000000000
--- a/changelog/19624.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-secrets/pki: Fix PKI revocation request forwarding from standby nodes due to an error wrapping bug
-```
diff --git a/changelog/19640.txt b/changelog/19640.txt
deleted file mode 100644
index 8dcf59bf87fbd..0000000000000
--- a/changelog/19640.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
- secrets/ldap: Invalidates WAL entry for static role if `password_policy` has changed.
-```
diff --git a/changelog/19641.txt b/changelog/19641.txt
new file mode 100644
index 0000000000000..01c1bcf3d3f9a
--- /dev/null
+++ b/changelog/19641.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+ secrets/ldap: Invalidates WAL entry for static role if `password_policy` has changed.
+```
\ No newline at end of file
diff --git a/changelog/19776.txt b/changelog/19776.txt
deleted file mode 100644
index 786cfd321673f..0000000000000
--- a/changelog/19776.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-agent: Vault Agent now reports its name and version as part of the User-Agent header in all requests issued.
-```
diff --git a/changelog/19791.txt b/changelog/19791.txt
deleted file mode 100644
index 26722cde31334..0000000000000
--- a/changelog/19791.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-ui: add allowed_managed_keys field to secret engine mount options
-```
diff --git a/changelog/19798.txt b/changelog/19798.txt
deleted file mode 100644
index 4bae8b637897b..0000000000000
--- a/changelog/19798.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-secrets/terraform: upgrades dependencies
-```
\ No newline at end of file
diff --git a/changelog/19814.txt b/changelog/19814.txt
deleted file mode 100644
index 687527efca8a8..0000000000000
--- a/changelog/19814.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-audit: add plugin metadata, including plugin name, type, version, sha256, and whether plugin is external, to audit logging
-```
\ No newline at end of file
diff --git a/changelog/19829.txt b/changelog/19829.txt
deleted file mode 100644
index e8472b2717edb..0000000000000
--- a/changelog/19829.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-secrets/ad: upgrades dependencies
-```
\ No newline at end of file
diff --git a/changelog/19846.txt b/changelog/19846.txt
deleted file mode 100644
index 269b11797b9e8..0000000000000
--- a/changelog/19846.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-secrets/alicloud: upgrades dependencies
-```
diff --git a/changelog/19861.txt b/changelog/19861.txt
deleted file mode 100644
index ee5bc703e9cbe..0000000000000
--- a/changelog/19861.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-secrets/mongodbatlas: upgrades dependencies
-```
\ No newline at end of file
diff --git a/changelog/19862.txt b/changelog/19862.txt
deleted file mode 100644
index c1ce6d8bb7105..0000000000000
--- a/changelog/19862.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-build: Prefer GOBIN when set over GOPATH/bin when building the binary
-```
diff --git a/changelog/19878.txt b/changelog/19878.txt
deleted file mode 100644
index 4135434b79238..0000000000000
--- a/changelog/19878.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-ui: Remove the Bulma CSS framework.
-```
\ No newline at end of file
diff --git a/changelog/19891.txt b/changelog/19891.txt
deleted file mode 100644
index b030151e858b2..0000000000000
--- a/changelog/19891.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-core (enterprise): add configuration for license reporting 
-```
\ No newline at end of file
diff --git a/changelog/19901.txt b/changelog/19901.txt
deleted file mode 100644
index 8e0bbbddb5ec6..0000000000000
--- a/changelog/19901.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-ui: Updates UI javascript dependencies
-```
\ No newline at end of file
diff --git a/changelog/19913.txt b/changelog/19913.txt
deleted file mode 100644
index eccdec6533ad2..0000000000000
--- a/changelog/19913.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-ui: Adds whitespace warning to secrets engine and auth method path inputs
-```
\ No newline at end of file
diff --git a/changelog/19954.txt b/changelog/19954.txt
deleted file mode 100644
index e0ff45f87d22c..0000000000000
--- a/changelog/19954.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-database/mongodb: upgrade mongo driver to 1.11
-```
diff --git a/changelog/19993.txt b/changelog/19993.txt
deleted file mode 100644
index 90650863ab887..0000000000000
--- a/changelog/19993.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-secrets/openldap: upgrades dependencies
-```
\ No newline at end of file
diff --git a/changelog/20034.txt b/changelog/20034.txt
deleted file mode 100644
index c1050795bdc4d..0000000000000
--- a/changelog/20034.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note: bug
-secrets/aws: Revert changes that removed the lease on STS credentials, while leaving the new ttl field in place.
-```
diff --git a/changelog/20057.txt b/changelog/20057.txt
deleted file mode 100644
index 585a07d91b3a2..0000000000000
--- a/changelog/20057.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note: bug
-secrets/pki: Ensure cross-cluster delta WAL write failure only logs to avoid unattended forwarding.
-```
diff --git a/changelog/20058.txt b/changelog/20058.txt
deleted file mode 100644
index e43a1f4adf934..0000000000000
--- a/changelog/20058.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-secrets/pki: Fix building of unified delta CRLs and recovery during unified delta WAL write failures.
-```
diff --git a/changelog/20070.txt b/changelog/20070.txt
deleted file mode 100644
index 34e6e5540d695..0000000000000
--- a/changelog/20070.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-ui: fixes remaining doc links to include /vault in path
-```
\ No newline at end of file
diff --git a/changelog/20073.txt b/changelog/20073.txt
deleted file mode 100644
index 10c21a58ba522..0000000000000
--- a/changelog/20073.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-core/activity: refactor the activity log's generation of precomputed queries 
-```
\ No newline at end of file
diff --git a/changelog/20078.txt b/changelog/20078.txt
deleted file mode 100644
index 8749354b315d7..0000000000000
--- a/changelog/20078.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-core/activity: error when attempting to update retention configuration below the minimum 
-```
\ No newline at end of file
diff --git a/changelog/20086.txt b/changelog/20086.txt
deleted file mode 100644
index 9511c97b66e31..0000000000000
--- a/changelog/20086.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-```release-note:improvement
-api: `/sys/internal/counters/config` endpoint now contains read-only
-`reporting_enabled` and `billing_start_timestamp` fields.
-```
diff --git a/changelog/20109.txt b/changelog/20109.txt
deleted file mode 100644
index 8c7cb3b32de14..0000000000000
--- a/changelog/20109.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-sys/wrapping: Add example how to unwrap without authentication in Vault
-```
diff --git a/changelog/20125.txt b/changelog/20125.txt
deleted file mode 100644
index 07dd8201dba89..0000000000000
--- a/changelog/20125.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-ui: updates clients configuration edit form state based on census reporting configuration
-```
\ No newline at end of file
diff --git a/changelog/20150.txt b/changelog/20150.txt
deleted file mode 100644
index 0ea8259f9e663..0000000000000
--- a/changelog/20150.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-```release-note:improvement
-api: `/sys/internal/counters/config` endpoint now contains read-only
-`minimum_retention_months`.
-```
diff --git a/changelog/20154.txt b/changelog/20154.txt
deleted file mode 100644
index 7bda3624fba18..0000000000000
--- a/changelog/20154.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-```release-note:bug
-auth/cert: Include OCSP parameters in read CA certificate role response.
diff --git a/changelog/20163.txt b/changelog/20163.txt
deleted file mode 100644
index 0b845fbae0db7..0000000000000
--- a/changelog/20163.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-ui: adds warning for commas in stringArray inputs and updates tooltip help text to remove references to comma separation 
-```
diff --git a/changelog/20181.txt b/changelog/20181.txt
deleted file mode 100644
index 121c869e4aaf8..0000000000000
--- a/changelog/20181.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-```release-note:bug
-sdk/helper/ocsp: Workaround bug in Go's ocsp.ParseResponse(...), causing validation to fail with embedded CA certificates.
-auth/cert: Fix OCSP validation against Vault's PKI engine.
-```
diff --git a/changelog/20216.txt b/changelog/20216.txt
deleted file mode 100644
index 59ee78c889e33..0000000000000
--- a/changelog/20216.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-website/docs: Fix Kubernetes Auth Code Example to use the correct whitespace in import.
-```
diff --git a/changelog/20224.txt b/changelog/20224.txt
deleted file mode 100644
index 7ec5bf612177d..0000000000000
--- a/changelog/20224.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-command/server: New -dev-cluster-json writes a file describing the dev cluster in -dev and -dev-three-node modes, plus -dev-three-node now enables unauthenticated metrics and pprof requests.
-```
diff --git a/changelog/20234.txt b/changelog/20234.txt
deleted file mode 100644
index 1f20bdc5a9209..0000000000000
--- a/changelog/20234.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-auth/cert: Better return OCSP validation errors during login to the caller.
-```
diff --git a/changelog/20247.txt b/changelog/20247.txt
deleted file mode 100644
index 91f2f0d23fcdf..0000000000000
--- a/changelog/20247.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-sdk: Add new docker-based cluster testing framework to the sdk.
-```
diff --git a/changelog/20253.txt b/changelog/20253.txt
deleted file mode 100644
index 19edae1bc4f2e..0000000000000
--- a/changelog/20253.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-secrets/pki: Add warning when issuer lacks KeyUsage during CRL rebuilds; expose in logs and on rotation.
-```
diff --git a/changelog/20261.txt b/changelog/20261.txt
deleted file mode 100644
index 5f4eb977cce1f..0000000000000
--- a/changelog/20261.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-* physical/etcd: Upgrade etcd3 client to v3.5.7
-```
\ No newline at end of file
diff --git a/changelog/20265.txt b/changelog/20265.txt
deleted file mode 100644
index 8e27875f627f3..0000000000000
--- a/changelog/20265.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-* api: Add Config.TLSConfig method to fetch the TLS configuration from a client config.
-```
\ No newline at end of file
diff --git a/changelog/20276.txt b/changelog/20276.txt
deleted file mode 100644
index 71f288ab9a0d6..0000000000000
--- a/changelog/20276.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-secrets/pki: Include CA serial number, key UUID on issuers list endpoint.
-```
diff --git a/changelog/20285.txt b/changelog/20285.txt
deleted file mode 100644
index 2bc2241dfe0ba..0000000000000
--- a/changelog/20285.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-openapi: Small fixes for OpenAPI display attributes. Changed "log-in" to "login"
-```
diff --git a/changelog/20294.txt b/changelog/20294.txt
deleted file mode 100644
index 92f7c291892be..0000000000000
--- a/changelog/20294.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-Add debug symbols back to builds to fix Dynatrace support
-```
diff --git a/changelog/20354.txt b/changelog/20354.txt
deleted file mode 100644
index abdacb7dac457..0000000000000
--- a/changelog/20354.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-secrets/pki: Include per-issuer enable_aia_url_templating in issuer read endpoint.
-```
diff --git a/changelog/20368.txt b/changelog/20368.txt
deleted file mode 100644
index bca5957d1d290..0000000000000
--- a/changelog/20368.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-core/identity: Allow updates of only the custom-metadata for entity alias.
-```
\ No newline at end of file
diff --git a/changelog/20418.txt b/changelog/20418.txt
deleted file mode 100644
index 596b7e461d23c..0000000000000
--- a/changelog/20418.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-command/server: fixes panic in Vault server command when running in recovery mode
-```
\ No newline at end of file
diff --git a/changelog/20425.txt b/changelog/20425.txt
deleted file mode 100644
index 20869fc19f708..0000000000000
--- a/changelog/20425.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:feature
-**MongoDB Atlas Database Secrets**: Adds support for client certificate credentials
-```
diff --git a/changelog/20430.txt b/changelog/20430.txt
deleted file mode 100644
index 5ac95f104cdb5..0000000000000
--- a/changelog/20430.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-ui: Fix secret render when path includes %. Resolves #11616.
-```
diff --git a/changelog/20431.txt b/changelog/20431.txt
deleted file mode 100644
index a0083d879ecd0..0000000000000
--- a/changelog/20431.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-ui: Add download button for each secret value in KV v2
-```
diff --git a/changelog/20441.txt b/changelog/20441.txt
deleted file mode 100644
index 628784883f8c4..0000000000000
--- a/changelog/20441.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-secrets/pki: Allow determining existing issuers and keys on import.
-```
diff --git a/changelog/20442.txt b/changelog/20442.txt
deleted file mode 100644
index 09636b69b0602..0000000000000
--- a/changelog/20442.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-secrets/pki: Add missing fields to tidy-status, include new last_auto_tidy_finished field.
-```
diff --git a/changelog/20464.txt b/changelog/20464.txt
deleted file mode 100644
index 6b58153fccf61..0000000000000
--- a/changelog/20464.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-cli: Add walkSecretsTree helper function, which recursively walks secrets rooted at the given path
-```
diff --git a/changelog/20481.txt b/changelog/20481.txt
deleted file mode 100644
index c6f27116311b5..0000000000000
--- a/changelog/20481.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-ui: Add filtering by engine type and engine name to the Secret Engine list view.
-```
diff --git a/changelog/20488.txt b/changelog/20488.txt
deleted file mode 100644
index 5ea0f78b39285..0000000000000
--- a/changelog/20488.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-cli: Improve addPrefixToKVPath helper
-```
diff --git a/changelog/20519.txt b/changelog/20519.txt
deleted file mode 100644
index 92f7c291892be..0000000000000
--- a/changelog/20519.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-Add debug symbols back to builds to fix Dynatrace support
-```
diff --git a/changelog/20530.txt b/changelog/20530.txt
deleted file mode 100644
index 6f6d04bf17e82..0000000000000
--- a/changelog/20530.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:feature
-**Environment Variables through Vault Agent**: Introducing a new process-supervisor mode for Vault Agent which allows injecting secrets as environment variables into a child process using a new `env_template` configuration stanza. The process-supervisor configuration can be generated with a new `vault agent generate-config` helper tool. 
-```
diff --git a/changelog/20536.txt b/changelog/20536.txt
deleted file mode 100644
index 62aa93605c380..0000000000000
--- a/changelog/20536.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:feature
-**AWS Static Roles**: The AWS Secrets Engine can manage static roles configured by users.
-```
diff --git a/changelog/20548.txt b/changelog/20548.txt
deleted file mode 100644
index fed5d2b4506e2..0000000000000
--- a/changelog/20548.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:feature
-**Vault Proxy**: Introduced Vault Proxy, a new subcommand of the Vault binary that can be invoked using `vault proxy -config=config.hcl`. It currently has the same feature set as Vault Agent's API proxy, but the two may diverge in the future. We plan to deprecate the API proxy functionality of Vault Agent in a future release.
-```
diff --git a/changelog/20559.txt b/changelog/20559.txt
deleted file mode 100644
index 2ff6422db0dbe..0000000000000
--- a/changelog/20559.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-core, secrets/pki, audit: Update dependency go-jose to v3 due to v2 deprecation.
-```
diff --git a/changelog/20569.txt b/changelog/20569.txt
deleted file mode 100644
index e10a4643ea7fd..0000000000000
--- a/changelog/20569.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-agent: Add logic to validate env_template entries in configuration
-```
diff --git a/changelog/20590.txt b/changelog/20590.txt
deleted file mode 100644
index c1c7c9e2b5265..0000000000000
--- a/changelog/20590.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-ui: Update Web CLI with examples and a new `kv-get` command for reading kv v2 data and metadata
-```
diff --git a/changelog/20595.txt b/changelog/20595.txt
deleted file mode 100644
index 982f41498f13b..0000000000000
--- a/changelog/20595.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-core: Add possibility to decode a generated encoded root token via the rest API
-```
diff --git a/changelog/20603.txt b/changelog/20603.txt
deleted file mode 100644
index c3e7e2bbe7db0..0000000000000
--- a/changelog/20603.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-ui: fixes issue creating mfa login enforcement from method enforcements tab
-```
\ No newline at end of file
diff --git a/changelog/20626.txt b/changelog/20626.txt
deleted file mode 100644
index 2a13cee1735da..0000000000000
--- a/changelog/20626.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-```release-note:improvement
-activitylog: EntityRecord protobufs now contain a ClientType field for
-distinguishing client sources.
-```
diff --git a/changelog/20628.txt b/changelog/20628.txt
deleted file mode 100644
index 978814601a30e..0000000000000
--- a/changelog/20628.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-agent: initial implementation of a process runner for injecting secrets via environment variables via vault agent
-```
\ No newline at end of file
diff --git a/changelog/20629.txt b/changelog/20629.txt
deleted file mode 100644
index f5692f7691e08..0000000000000
--- a/changelog/20629.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-command/server (enterprise): -dev-three-node now creates perf standbys instead of regular standbys.
-```
\ No newline at end of file
diff --git a/changelog/20643.txt b/changelog/20643.txt
deleted file mode 100644
index 340ec5b547ff4..0000000000000
--- a/changelog/20643.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-core: report intermediate error messages during request forwarding
-```
diff --git a/changelog/20652.txt b/changelog/20652.txt
deleted file mode 100644
index c41e750c04721..0000000000000
--- a/changelog/20652.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-secrets/transit: Respond to writes with updated key policy, cache configuration.
-```
diff --git a/changelog/20654.txt b/changelog/20654.txt
deleted file mode 100644
index 91e567477b5b9..0000000000000
--- a/changelog/20654.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:change
-secrets/pki: Warning when issuing leafs from CSRs with basic constraints. In the future, issuance of non-CA leaf certs from CSRs with asserted IsCA Basic Constraints will be prohibited.
-```
diff --git a/changelog/20664.txt b/changelog/20664.txt
deleted file mode 100644
index 6f2b4abe61ae3..0000000000000
--- a/changelog/20664.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-secrets/pki: Support setting both maintain_stored_certificate_counts=false and publish_stored_certificate_count_metrics=false explicitly in tidy config.
-```
diff --git a/changelog/20668.txt b/changelog/20668.txt
deleted file mode 100644
index f3f840c47d1db..0000000000000
--- a/changelog/20668.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-secrets/transform: Added importing of keys and key versions into the Transform secrets engine using the command 'vault transform import' and 'vault transform import-version'.
-```
diff --git a/changelog/20680.txt b/changelog/20680.txt
deleted file mode 100644
index ff80ac4660924..0000000000000
--- a/changelog/20680.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-```release-note:improvement
-core (enterprise): support reloading configuration for automated reporting via SIGHUP
-```
-```release-note:improvement
-core (enterprise): license updates trigger a reload of reporting and the activity log 
-```
\ No newline at end of file
diff --git a/changelog/20694.txt b/changelog/20694.txt
deleted file mode 100644
index 07f790a666ddf..0000000000000
--- a/changelog/20694.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-```release-note:improvement
-api: GET ... /sys/internal/counters/activity?current_billing_period=true now
-results in a response which contains the full billing period
-```
diff --git a/changelog/20697.txt b/changelog/20697.txt
deleted file mode 100644
index be80443714dae..0000000000000
--- a/changelog/20697.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-ui: update detail views that render ttl durations to display full unit instead of letter (i.e. 'days' instead of 'd')
-```
diff --git a/changelog/20701.txt b/changelog/20701.txt
deleted file mode 100644
index 24942d5d066cc..0000000000000
--- a/changelog/20701.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-notes:bug
-secrets/pki: Fix race during runUnifiedTransfer when deciding to skip re-running a test within a short window.
-```
diff --git a/changelog/20725.txt b/changelog/20725.txt
deleted file mode 100644
index 04399cca8f63e..0000000000000
--- a/changelog/20725.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:change
-auth/gcp: Updated plugin from v0.15.0 to v0.16.0
-```
diff --git a/changelog/20731.txt b/changelog/20731.txt
deleted file mode 100644
index 1896c199add9c..0000000000000
--- a/changelog/20731.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-ui: fixes auto_rotate_period ttl input for transit keys
-```
diff --git a/changelog/20736.txt b/changelog/20736.txt
deleted file mode 100644
index 1c4c3d4d256e0..0000000000000
--- a/changelog/20736.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-secrets/transit: Support BYOK-encrypted export of keys to securely allow synchronizing specific keys and version across clusters.
-```
diff --git a/changelog/20741.txt b/changelog/20741.txt
deleted file mode 100644
index 8034e456e0c67..0000000000000
--- a/changelog/20741.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-agent: Add integration tests for agent running in process supervisor mode
-```
diff --git a/changelog/20742.txt b/changelog/20742.txt
deleted file mode 100644
index d91237e1d3912..0000000000000
--- a/changelog/20742.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:change
-secrets/mongodbatlas: Updated plugin from v0.9.1 to v0.10.0
-```
diff --git a/changelog/20745.txt b/changelog/20745.txt
deleted file mode 100644
index 57a4391ba22de..0000000000000
--- a/changelog/20745.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:change
-auth/centrify: Updated plugin from v0.14.0 to v0.15.1
-```
diff --git a/changelog/20747.txt b/changelog/20747.txt
deleted file mode 100644
index 4c600d203fb3a..0000000000000
--- a/changelog/20747.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-ui: Add filtering by auth type and auth name to the Authentication Method list view.
-```
diff --git a/changelog/20750.txt b/changelog/20750.txt
deleted file mode 100644
index 75a3e1da364e9..0000000000000
--- a/changelog/20750.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:change
-secrets/ad: Updated plugin from v0.10.1-0.20230329210417-0b2cdb26cf5d to v0.16.0
-```
\ No newline at end of file
diff --git a/changelog/20751.txt b/changelog/20751.txt
deleted file mode 100644
index 9b78b3dfe5a29..0000000000000
--- a/changelog/20751.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:change
-database/redis-elasticache: Updated plugin from v0.2.0 to v0.2.1
-```
diff --git a/changelog/20752.txt b/changelog/20752.txt
deleted file mode 100644
index 667bc37f37b38..0000000000000
--- a/changelog/20752.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:feature
-**Vault PKI ACME Server**: Support for the ACME certificate lifecycle management protocol has been added to the Vault PKI Plugin. This allows standard ACME clients, such as the EFF's certbot and the CNCF's k8s cert-manager, to request certificates from a Vault server with no knowledge of Vault APIs or authentication mechanisms. For public-facing Vault instances, we recommend requiring External Account Bindings (EAB) to limit the ability to request certificates to only authenticated clients.
-```
diff --git a/changelog/20758.txt b/changelog/20758.txt
deleted file mode 100644
index 7eed0b075191a..0000000000000
--- a/changelog/20758.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:change
-auth/alicloud: Updated plugin from v0.14.0 to v0.15.0
-```
\ No newline at end of file
diff --git a/changelog/20763.txt b/changelog/20763.txt
deleted file mode 100644
index 311dcb0a62f42..0000000000000
--- a/changelog/20763.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-database/redis: Upgrade plugin dependencies
-```
diff --git a/changelog/20764.txt b/changelog/20764.txt
deleted file mode 100644
index adc14e07f152f..0000000000000
--- a/changelog/20764.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:change
-database/couchbase: Updated plugin from v0.9.0 to v0.9.2
-```
diff --git a/changelog/20767.txt b/changelog/20767.txt
deleted file mode 100644
index b6d853a63903f..0000000000000
--- a/changelog/20767.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-database/elasticsearch: Upgrade plugin dependencies
-```
diff --git a/changelog/20771.txt b/changelog/20771.txt
deleted file mode 100644
index 5cc1ee2d472c8..0000000000000
--- a/changelog/20771.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-```release-note:improvement
-auth/kerberos: Enable plugin multiplexing
-auth/kerberos: Upgrade plugin dependencies
-```
diff --git a/changelog/20777.txt b/changelog/20777.txt
deleted file mode 100644
index ec3c9e42b58ba..0000000000000
--- a/changelog/20777.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:change
-secrets/aure: Updated plugin from v0.15.0 to v0.16.0
-```
\ No newline at end of file
diff --git a/changelog/20783.txt b/changelog/20783.txt
deleted file mode 100644
index 372d36cb7b1e4..0000000000000
--- a/changelog/20783.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-core: Fix writes to readonly storage on performance standbys when user lockout feature is enabled.
-```
\ No newline at end of file
diff --git a/changelog/20784.txt b/changelog/20784.txt
deleted file mode 100644
index b24a857a20020..0000000000000
--- a/changelog/20784.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-```release-note:improvement
-secrets/gcpkms: Enable plugin multiplexing
-secrets/gcpkms: Upgrade plugin dependencies
-```
diff --git a/changelog/20787.txt b/changelog/20787.txt
deleted file mode 100644
index a69b90d7de82b..0000000000000
--- a/changelog/20787.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:change
-secrets/alicloud: Updated plugin from v0.5.4-beta1.0.20230330124709-3fcfc5914a22 to v0.15.0
-```
\ No newline at end of file
diff --git a/changelog/20799.txt b/changelog/20799.txt
deleted file mode 100644
index 2e17ff921d7b5..0000000000000
--- a/changelog/20799.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:change
-auth/jwt: Updated plugin from v0.15.0 to v0.16.0
-```
diff --git a/changelog/20802.txt b/changelog/20802.txt
deleted file mode 100644
index de8e1b90dc068..0000000000000
--- a/changelog/20802.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-```release-note:change
-secrets/kubernetes: Update plugin to v0.5.0
-```
-```release-note:change
-auth/kubernetes: Update plugin to v0.16.0
-```
diff --git a/changelog/20807.txt b/changelog/20807.txt
deleted file mode 100644
index 3a3c1f4cdad31..0000000000000
--- a/changelog/20807.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:change
-secrets/database/snowflake: Updated plugin from v0.7.0 to v0.8.0
-```
\ No newline at end of file
diff --git a/changelog/20816.txt b/changelog/20816.txt
deleted file mode 100644
index aae4b59c48dc1..0000000000000
--- a/changelog/20816.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:change
-auth/azure: Updated plugin from v0.13.0 to v0.15.0
-```
diff --git a/changelog/20818.txt b/changelog/20818.txt
deleted file mode 100644
index 885ee92ce8aa4..0000000000000
--- a/changelog/20818.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:change
-secrets/gcp: Updated plugin from v0.15.0 to v0.16.0
-```
diff --git a/changelog/20825.txt b/changelog/20825.txt
deleted file mode 100644
index da993696b0480..0000000000000
--- a/changelog/20825.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:change
-storage/aerospike: Aerospike storage shouldn't be used on 32-bit architectures and is now unsupported on them.
-```
\ No newline at end of file
diff --git a/changelog/20834.txt b/changelog/20834.txt
deleted file mode 100644
index f17f1d326b584..0000000000000
--- a/changelog/20834.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:change
-core: Remove feature toggle for SSCTs, i.e. the env var VAULT_DISABLE_SERVER_SIDE_CONSISTENT_TOKENS.
-```
\ No newline at end of file
diff --git a/changelog/20882.txt b/changelog/20882.txt
deleted file mode 100644
index 3694468641da6..0000000000000
--- a/changelog/20882.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-```release-note:change
-secrets/database/mongodbatlas: Updated plugin from v0.9.0 to v0.10.0
-```
-```release-note:feature
-**MongoDB Atlas Database Secrets**: Adds support for generating X.509 certificates on dynamic roles for user authentication
-```
\ No newline at end of file
diff --git a/changelog/20891.txt b/changelog/20891.txt
deleted file mode 100644
index 3057ec56f40dc..0000000000000
--- a/changelog/20891.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-```release-note:improvement
-secrets/consul: Improve error message when ACL bootstrapping fails.
-```
-
diff --git a/changelog/20907.txt b/changelog/20907.txt
deleted file mode 100644
index 3f13a659de2b2..0000000000000
--- a/changelog/20907.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-ui: fixes key_bits and signature_bits reverting to default values when editing a pki role
-```
\ No newline at end of file
diff --git a/changelog/20933.txt b/changelog/20933.txt
deleted file mode 100644
index 580475e2b5d52..0000000000000
--- a/changelog/20933.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-core: remove unnecessary *BarrierView field from backendEntry struct
-```
\ No newline at end of file
diff --git a/changelog/20934.txt b/changelog/20934.txt
deleted file mode 100644
index 72c22574d615a..0000000000000
--- a/changelog/20934.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-agent: Fix bug with 'cache' stanza validation
-```
diff --git a/changelog/20943.txt b/changelog/20943.txt
deleted file mode 100644
index 7cf186d18420d..0000000000000
--- a/changelog/20943.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-secrets/pki: Support TLS-ALPN-01 challenge type in ACME for DNS certificate identifiers.
-```
diff --git a/changelog/20981.txt b/changelog/20981.txt
deleted file mode 100644
index 26a5304c5d3da..0000000000000
--- a/changelog/20981.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-secrets/pki: Limit ACME issued certificates NotAfter TTL to a maximum of 90 days 
-```
diff --git a/changelog/20995.txt b/changelog/20995.txt
deleted file mode 100644
index 76653d4d54334..0000000000000
--- a/changelog/20995.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-api: adding a new api sys method for replication status
-```
diff --git a/changelog/21010.txt b/changelog/21010.txt
deleted file mode 100644
index bcd218794df9c..0000000000000
--- a/changelog/21010.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-core: Add a new periodic metric to track the number of available policies, `vault.policy.configured.count`.
-```
\ No newline at end of file
diff --git a/changelog/21100.txt b/changelog/21100.txt
deleted file mode 100644
index 50024c9c2d3a4..0000000000000
--- a/changelog/21100.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-```release-note:bug
-replication (enterprise): Fix regression causing token creation against a role
-with a new entity alias to be incorrectly forwarded from perf standbys.
-```
diff --git a/changelog/_go-ver-1122.txt b/changelog/_go-ver-1122.txt
new file mode 100644
index 0000000000000..c7744e1497577
--- /dev/null
+++ b/changelog/_go-ver-1122.txt
@@ -0,0 +1,3 @@
+```release-note:change
+core: Bump Go version to 1.19.3.
+```
diff --git a/changelog/_go-ver-1123.txt b/changelog/_go-ver-1123.txt
new file mode 100644
index 0000000000000..588b90c052da3
--- /dev/null
+++ b/changelog/_go-ver-1123.txt
@@ -0,0 +1,3 @@
+```release-note:change
+core: Bump Go version to 1.19.4.
+```
diff --git a/changelog/_go-ver-1124.txt b/changelog/_go-ver-1124.txt
new file mode 100644
index 0000000000000..afd57943ede15
--- /dev/null
+++ b/changelog/_go-ver-1124.txt
@@ -0,0 +1,3 @@
+```release-note:change
+core: Bump Go version to 1.19.6.
+```
diff --git a/changelog/_go-ver-1126.txt b/changelog/_go-ver-1126.txt
new file mode 100644
index 0000000000000..7fd5dbd734289
--- /dev/null
+++ b/changelog/_go-ver-1126.txt
@@ -0,0 +1,3 @@
+```release-note:change
+core: Bump Go version to 1.19.8.
+```
diff --git a/changelog/_go-ver-1127.txt b/changelog/_go-ver-1127.txt
new file mode 100644
index 0000000000000..b6c1fc18b6529
--- /dev/null
+++ b/changelog/_go-ver-1127.txt
@@ -0,0 +1,3 @@
+```release-note:change
+core: Bump Go version to 1.19.9.
+```
diff --git a/changelog/_go-ver-1130.txt b/changelog/_go-ver-1130.txt
deleted file mode 100644
index c63e249c45883..0000000000000
--- a/changelog/_go-ver-1130.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:change
-core: Bump Go version to 1.20.
-```
diff --git a/changelog/_go-ver-1140.txt b/changelog/_go-ver-1140.txt
deleted file mode 100644
index b57fd6478d0b6..0000000000000
--- a/changelog/_go-ver-1140.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:change
-core: Bump Go version to 1.20.4.
-```
diff --git a/changelog/pki-ui-improvements.txt b/changelog/pki-ui-improvements.txt
deleted file mode 100644
index d824033f2e3c4..0000000000000
--- a/changelog/pki-ui-improvements.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:feature
-**NEW PKI Workflow in UI**: Completes generally available rollout of new PKI UI that provides smoother mount configuration and a more guided user experience
-```
\ No newline at end of file
diff --git a/changelog/plugin-versioning.txt b/changelog/plugin-versioning.txt
deleted file mode 100644
index cfd77a4778ede..0000000000000
--- a/changelog/plugin-versioning.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:feature
-**Plugin Versioning**: Vault supports registering, managing, and running plugins with semantic versions specified.
-```
\ No newline at end of file
diff --git a/command/agent.go b/command/agent.go
index 11942ce533775..b90665683cc1c 100644
--- a/command/agent.go
+++ b/command/agent.go
@@ -1,57 +1,59 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
 	"context"
 	"crypto/tls"
-	"errors"
 	"flag"
 	"fmt"
 	"io"
+	"io/ioutil"
 	"net"
 	"net/http"
 	"os"
+	"path/filepath"
 	"sort"
 	"strings"
 	"sync"
 	"time"
 
 	systemd "github.com/coreos/go-systemd/daemon"
-	ctconfig "github.com/hashicorp/consul-template/config"
 	log "github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/go-multierror"
 	"github.com/hashicorp/go-secure-stdlib/gatedwriter"
-	"github.com/hashicorp/go-secure-stdlib/parseutil"
-	"github.com/hashicorp/go-secure-stdlib/reloadutil"
-	"github.com/kr/pretty"
-	"github.com/mitchellh/cli"
-	"github.com/oklog/run"
-	"github.com/posener/complete"
-	"golang.org/x/text/cases"
-	"golang.org/x/text/language"
-	"google.golang.org/grpc/test/bufconn"
-
 	"github.com/hashicorp/vault/api"
+	"github.com/hashicorp/vault/command/agent/auth"
+	"github.com/hashicorp/vault/command/agent/auth/alicloud"
+	"github.com/hashicorp/vault/command/agent/auth/approle"
+	"github.com/hashicorp/vault/command/agent/auth/aws"
+	"github.com/hashicorp/vault/command/agent/auth/azure"
+	"github.com/hashicorp/vault/command/agent/auth/cert"
+	"github.com/hashicorp/vault/command/agent/auth/cf"
+	"github.com/hashicorp/vault/command/agent/auth/gcp"
+	"github.com/hashicorp/vault/command/agent/auth/jwt"
+	"github.com/hashicorp/vault/command/agent/auth/kerberos"
+	"github.com/hashicorp/vault/command/agent/auth/kubernetes"
+	"github.com/hashicorp/vault/command/agent/cache"
+	"github.com/hashicorp/vault/command/agent/cache/cacheboltdb"
+	"github.com/hashicorp/vault/command/agent/cache/cachememdb"
+	"github.com/hashicorp/vault/command/agent/cache/keymanager"
 	agentConfig "github.com/hashicorp/vault/command/agent/config"
-	"github.com/hashicorp/vault/command/agent/exec"
+	"github.com/hashicorp/vault/command/agent/sink"
+	"github.com/hashicorp/vault/command/agent/sink/file"
+	"github.com/hashicorp/vault/command/agent/sink/inmem"
 	"github.com/hashicorp/vault/command/agent/template"
-	"github.com/hashicorp/vault/command/agentproxyshared"
-	"github.com/hashicorp/vault/command/agentproxyshared/auth"
-	cache "github.com/hashicorp/vault/command/agentproxyshared/cache"
-	"github.com/hashicorp/vault/command/agentproxyshared/sink"
-	"github.com/hashicorp/vault/command/agentproxyshared/sink/file"
-	"github.com/hashicorp/vault/command/agentproxyshared/sink/inmem"
-	"github.com/hashicorp/vault/command/agentproxyshared/winsvc"
-	"github.com/hashicorp/vault/helper/logging"
+	"github.com/hashicorp/vault/command/agent/winsvc"
 	"github.com/hashicorp/vault/helper/metricsutil"
-	"github.com/hashicorp/vault/helper/useragent"
 	"github.com/hashicorp/vault/internalshared/configutil"
 	"github.com/hashicorp/vault/internalshared/listenerutil"
 	"github.com/hashicorp/vault/sdk/helper/consts"
+	"github.com/hashicorp/vault/sdk/helper/logging"
+	"github.com/hashicorp/vault/sdk/helper/useragent"
 	"github.com/hashicorp/vault/sdk/logical"
-	"github.com/hashicorp/vault/version"
+	"github.com/hashicorp/vault/sdk/version"
+	"github.com/kr/pretty"
+	"github.com/mitchellh/cli"
+	"github.com/oklog/run"
+	"github.com/posener/complete"
+	"google.golang.org/grpc/test/bufconn"
 )
 
 var (
@@ -59,24 +61,12 @@ var (
 	_ cli.CommandAutocomplete = (*AgentCommand)(nil)
 )
 
-const (
-	// flagNameAgentExitAfterAuth is used as an Agent specific flag to indicate
-	// that agent should exit after a single successful auth
-	flagNameAgentExitAfterAuth = "exit-after-auth"
-)
-
 type AgentCommand struct {
 	*BaseCommand
-	logFlags logFlags
-
-	config *agentConfig.Config
 
 	ShutdownCh chan struct{}
 	SighupCh   chan struct{}
 
-	tlsReloadFuncsLock sync.RWMutex
-	tlsReloadFuncs     []reloadutil.ReloadFunc
-
 	logWriter io.Writer
 	logGate   *gatedwriter.Writer
 	logger    log.Logger
@@ -86,12 +76,14 @@ type AgentCommand struct {
 
 	cleanupGuard sync.Once
 
-	startedCh  chan struct{} // for tests
-	reloadedCh chan struct{} // for tests
+	startedCh chan (struct{}) // for tests
+
+	flagConfigs       []string
+	flagLogLevel      string
+	flagExitAfterAuth bool
 
-	flagConfigs        []string
-	flagExitAfterAuth  bool
 	flagTestVerifyOnly bool
+	flagCombineLogs    bool
 }
 
 func (c *AgentCommand) Synopsis() string {
@@ -102,7 +94,7 @@ func (c *AgentCommand) Help() string {
 	helpText := `
 Usage: vault agent [options]
 
-  This command starts a Vault Agent that can perform automatic authentication
+  This command starts a Vault agent that can perform automatic authentication
   in certain environments.
 
   Start an agent with a configuration file:
@@ -120,9 +112,6 @@ func (c *AgentCommand) Flags() *FlagSets {
 
 	f := set.NewFlagSet("Command Options")
 
-	// Augment with the log flags
-	f.addLogFlags(&c.logFlags)
-
 	f.StringSliceVar(&StringSliceVar{
 		Name:   "config",
 		Target: &c.flagConfigs,
@@ -134,8 +123,18 @@ func (c *AgentCommand) Flags() *FlagSets {
 			"contain only agent directives.",
 	})
 
+	f.StringVar(&StringVar{
+		Name:       "log-level",
+		Target:     &c.flagLogLevel,
+		Default:    "info",
+		EnvVar:     "VAULT_LOG_LEVEL",
+		Completion: complete.PredictSet("trace", "debug", "info", "warn", "error"),
+		Usage: "Log verbosity level. Supported values (in order of detail) are " +
+			"\"trace\", \"debug\", \"info\", \"warn\", and \"error\".",
+	})
+
 	f.BoolVar(&BoolVar{
-		Name:    flagNameAgentExitAfterAuth,
+		Name:    "exit-after-auth",
 		Target:  &c.flagExitAfterAuth,
 		Default: false,
 		Usage: "If set to true, the agent will exit with code 0 after a single " +
@@ -150,6 +149,15 @@ func (c *AgentCommand) Flags() *FlagSets {
 	// no warranty or backwards-compatibility promise. Do not use these flags
 	// in production. Do not build automation using these flags. Unless you are
 	// developing against Vault, you should not need any of these flags.
+
+	// TODO: should the below flags be public?
+	f.BoolVar(&BoolVar{
+		Name:    "combine-logs",
+		Target:  &c.flagCombineLogs,
+		Default: false,
+		Hidden:  true,
+	})
+
 	f.BoolVar(&BoolVar{
 		Name:    "test-verify-only",
 		Target:  &c.flagTestVerifyOnly,
@@ -182,40 +190,119 @@ func (c *AgentCommand) Run(args []string) int {
 	// start logging too early.
 	c.logGate = gatedwriter.NewWriter(os.Stderr)
 	c.logWriter = c.logGate
-
-	if c.logFlags.flagCombineLogs {
+	if c.flagCombineLogs {
 		c.logWriter = os.Stdout
 	}
+	var level log.Level
+	c.flagLogLevel = strings.ToLower(strings.TrimSpace(c.flagLogLevel))
+	switch c.flagLogLevel {
+	case "trace":
+		level = log.Trace
+	case "debug":
+		level = log.Debug
+	case "notice", "info", "":
+		level = log.Info
+	case "warn", "warning":
+		level = log.Warn
+	case "err", "error":
+		level = log.Error
+	default:
+		c.UI.Error(fmt.Sprintf("Unknown log level: %s", c.flagLogLevel))
+		return 1
+	}
+
+	if c.logger == nil {
+		c.logger = logging.NewVaultLoggerWithWriter(c.logWriter, level)
+	}
 
 	// Validation
-	if len(c.flagConfigs) < 1 {
-		c.UI.Error("Must specify exactly at least one config path using -config")
+	if len(c.flagConfigs) != 1 {
+		c.UI.Error("Must specify exactly one config path using -config")
 		return 1
 	}
 
-	config, err := c.loadConfig(c.flagConfigs)
+	// Load the configuration
+	config, err := agentConfig.LoadConfig(c.flagConfigs[0])
 	if err != nil {
-		c.outputErrors(err)
+		c.UI.Error(fmt.Sprintf("Error loading configuration from %s: %s", c.flagConfigs[0], err))
 		return 1
 	}
 
+	// Ensure at least one config was found.
+	if config == nil {
+		c.UI.Output(wrapAtLength(
+			"No configuration read. Please provide the configuration with the " +
+				"-config flag."))
+		return 1
+	}
+	if config.AutoAuth == nil && config.Cache == nil {
+		c.UI.Error("No auto_auth or cache block found in config file")
+		return 1
+	}
 	if config.AutoAuth == nil {
-		c.UI.Info("No auto_auth block found in config, the automatic authentication feature will not be started")
+		c.UI.Info("No auto_auth block found in config file, not starting automatic authentication feature")
 	}
 
-	c.applyConfigOverrides(f, config) // This only needs to happen on start-up to aggregate config from flags and env vars
-	c.config = config
+	exitAfterAuth := config.ExitAfterAuth
+	f.Visit(func(fl *flag.Flag) {
+		if fl.Name == "exit-after-auth" {
+			exitAfterAuth = c.flagExitAfterAuth
+		}
+	})
 
-	l, err := c.newLogger()
-	if err != nil {
-		c.outputErrors(err)
-		return 1
-	}
-	c.logger = l
+	c.setStringFlag(f, config.Vault.Address, &StringVar{
+		Name:    flagNameAddress,
+		Target:  &c.flagAddress,
+		Default: "https://127.0.0.1:8200",
+		EnvVar:  api.EnvVaultAddress,
+	})
+	config.Vault.Address = c.flagAddress
+	c.setStringFlag(f, config.Vault.CACert, &StringVar{
+		Name:    flagNameCACert,
+		Target:  &c.flagCACert,
+		Default: "",
+		EnvVar:  api.EnvVaultCACert,
+	})
+	config.Vault.CACert = c.flagCACert
+	c.setStringFlag(f, config.Vault.CAPath, &StringVar{
+		Name:    flagNameCAPath,
+		Target:  &c.flagCAPath,
+		Default: "",
+		EnvVar:  api.EnvVaultCAPath,
+	})
+	config.Vault.CAPath = c.flagCAPath
+	c.setStringFlag(f, config.Vault.ClientCert, &StringVar{
+		Name:    flagNameClientCert,
+		Target:  &c.flagClientCert,
+		Default: "",
+		EnvVar:  api.EnvVaultClientCert,
+	})
+	config.Vault.ClientCert = c.flagClientCert
+	c.setStringFlag(f, config.Vault.ClientKey, &StringVar{
+		Name:    flagNameClientKey,
+		Target:  &c.flagClientKey,
+		Default: "",
+		EnvVar:  api.EnvVaultClientKey,
+	})
+	config.Vault.ClientKey = c.flagClientKey
+	c.setBoolFlag(f, config.Vault.TLSSkipVerify, &BoolVar{
+		Name:    flagNameTLSSkipVerify,
+		Target:  &c.flagTLSSkipVerify,
+		Default: false,
+		EnvVar:  api.EnvVaultSkipVerify,
+	})
+	config.Vault.TLSSkipVerify = c.flagTLSSkipVerify
+	c.setStringFlag(f, config.Vault.TLSServerName, &StringVar{
+		Name:    flagTLSServerName,
+		Target:  &c.flagTLSServerName,
+		Default: "",
+		EnvVar:  api.EnvVaultTLSServerName,
+	})
+	config.Vault.TLSServerName = c.flagTLSServerName
 
 	infoKeys := make([]string, 0, 10)
 	info := make(map[string]string)
-	info["log level"] = config.LogLevel
+	info["log level"] = c.flagLogLevel
 	infoKeys = append(infoKeys, "log level")
 
 	infoKeys = append(infoKeys, "version")
@@ -237,14 +324,14 @@ func (c *AgentCommand) Run(args []string) int {
 		if os.Getenv("VAULT_TEST_VERIFY_ONLY_DUMP_CONFIG") != "" {
 			c.UI.Output(fmt.Sprintf(
 				"\nConfiguration:\n%s\n",
-				pretty.Sprint(*c.config)))
+				pretty.Sprint(*config)))
 		}
 		return 0
 	}
 
-	// Ignore any setting of Agent's address. This client is used by the Agent
+	// Ignore any setting of agent's address. This client is used by the agent
 	// to reach out to Vault. This should never loop back to agent.
-	c.flagAgentProxyAddress = ""
+	c.flagAgentAddress = ""
 	client, err := c.Client()
 	if err != nil {
 		c.UI.Error(fmt.Sprintf(
@@ -253,28 +340,7 @@ func (c *AgentCommand) Run(args []string) int {
 		return 1
 	}
 
-	serverHealth, err := client.Sys().Health()
-	if err == nil {
-		// We don't exit on error here, as this is not worth stopping Agent over
-		serverVersion := serverHealth.Version
-		agentVersion := version.GetVersion().VersionNumber()
-		if serverVersion != agentVersion {
-			c.UI.Info("==> Note: Vault Agent version does not match Vault server version. " +
-				fmt.Sprintf("Vault Agent version: %s, Vault server version: %s", agentVersion, serverVersion))
-		}
-	}
-
-	if config.IsDefaultListerDefined() {
-		// Notably, we cannot know for sure if they are using the API proxy functionality unless
-		// we log on each API proxy call, which would be too noisy.
-		// A customer could have a listener defined but only be using e.g. the cache-clear API,
-		// even though the API proxy is something they have available.
-		c.UI.Warn("==> Note: Vault Agent will be deprecating API proxy functionality in a future " +
-			"release, and this functionality has moved to a new subcommand, vault proxy. If you rely on this " +
-			"functionality, plan to move to Vault Proxy instead.")
-	}
-
-	// ctx and cancelFunc are passed to the AuthHandler, SinkServer, ExecServer and
+	// ctx and cancelFunc are passed to the AuthHandler, SinkServer, and
 	// TemplateServer that periodically listen for ctx.Done() to fire and shut
 	// down accordingly.
 	ctx, cancelFunc := context.WithCancel(context.Background())
@@ -286,7 +352,7 @@ func (c *AgentCommand) Run(args []string) int {
 		Ui:          c.UI,
 		ServiceName: "vault",
 		DisplayName: "Vault",
-		UserAgent:   useragent.AgentString(),
+		UserAgent:   useragent.String(),
 		ClusterName: config.ClusterName,
 	})
 	if err != nil {
@@ -333,7 +399,7 @@ func (c *AgentCommand) Run(args []string) int {
 				}
 				s, err := file.NewFileSink(config)
 				if err != nil {
-					c.UI.Error(fmt.Errorf("error creating file sink: %w", err).Error())
+					c.UI.Error(fmt.Errorf("Error creating file sink: %w", err).Error())
 					return 1
 				}
 				config.Sink = s
@@ -349,9 +415,35 @@ func (c *AgentCommand) Run(args []string) int {
 			MountPath: config.AutoAuth.Method.MountPath,
 			Config:    config.AutoAuth.Method.Config,
 		}
-		method, err = agentproxyshared.GetAutoAuthMethodFromConfig(config.AutoAuth.Method.Type, authConfig, config.Vault.Address)
+		switch config.AutoAuth.Method.Type {
+		case "alicloud":
+			method, err = alicloud.NewAliCloudAuthMethod(authConfig)
+		case "aws":
+			method, err = aws.NewAWSAuthMethod(authConfig)
+		case "azure":
+			method, err = azure.NewAzureAuthMethod(authConfig)
+		case "cert":
+			method, err = cert.NewCertAuthMethod(authConfig)
+		case "cf":
+			method, err = cf.NewCFAuthMethod(authConfig)
+		case "gcp":
+			method, err = gcp.NewGCPAuthMethod(authConfig)
+		case "jwt":
+			method, err = jwt.NewJWTAuthMethod(authConfig)
+		case "kerberos":
+			method, err = kerberos.NewKerberosAuthMethod(authConfig)
+		case "kubernetes":
+			method, err = kubernetes.NewKubernetesAuthMethod(authConfig)
+		case "approle":
+			method, err = approle.NewApproleAuthMethod(authConfig)
+		case "pcf": // Deprecated.
+			method, err = cf.NewCFAuthMethod(authConfig)
+		default:
+			c.UI.Error(fmt.Sprintf("Unknown auth method %q", config.AutoAuth.Method.Type))
+			return 1
+		}
 		if err != nil {
-			c.UI.Error(fmt.Sprintf("Error creating %s auth method: %v", config.AutoAuth.Method.Type, err))
+			c.UI.Error(fmt.Errorf("Error creating %s auth method: %w", config.AutoAuth.Method.Type, err).Error())
 			return 1
 		}
 	}
@@ -360,47 +452,15 @@ func (c *AgentCommand) Run(args []string) int {
 	// confuse the issue of retries for auth failures which have their own
 	// config and are handled a bit differently.
 	if os.Getenv(api.EnvVaultMaxRetries) == "" {
-		client.SetMaxRetries(ctconfig.DefaultRetryAttempts)
-		if config.Vault != nil {
-			if config.Vault.Retry != nil {
-				client.SetMaxRetries(config.Vault.Retry.NumRetries)
-			}
-		}
+		client.SetMaxRetries(config.Vault.Retry.NumRetries)
 	}
 
 	enforceConsistency := cache.EnforceConsistencyNever
 	whenInconsistent := cache.WhenInconsistentFail
-	if config.APIProxy != nil {
-		switch config.APIProxy.EnforceConsistency {
-		case "always":
-			enforceConsistency = cache.EnforceConsistencyAlways
-		case "never", "":
-		default:
-			c.UI.Error(fmt.Sprintf("Unknown api_proxy setting for enforce_consistency: %q", config.APIProxy.EnforceConsistency))
-			return 1
-		}
-
-		switch config.APIProxy.WhenInconsistent {
-		case "retry":
-			whenInconsistent = cache.WhenInconsistentRetry
-		case "forward":
-			whenInconsistent = cache.WhenInconsistentForward
-		case "fail", "":
-		default:
-			c.UI.Error(fmt.Sprintf("Unknown api_proxy setting for when_inconsistent: %q", config.APIProxy.WhenInconsistent))
-			return 1
-		}
-	}
-	// Keep Cache configuration for legacy reasons, but error if defined alongside API Proxy
 	if config.Cache != nil {
 		switch config.Cache.EnforceConsistency {
 		case "always":
-			if enforceConsistency != cache.EnforceConsistencyNever {
-				c.UI.Error("enforce_consistency configured in both api_proxy and cache blocks. Please remove this configuration from the cache block.")
-				return 1
-			} else {
-				enforceConsistency = cache.EnforceConsistencyAlways
-			}
+			enforceConsistency = cache.EnforceConsistencyAlways
 		case "never", "":
 		default:
 			c.UI.Error(fmt.Sprintf("Unknown cache setting for enforce_consistency: %q", config.Cache.EnforceConsistency))
@@ -409,19 +469,9 @@ func (c *AgentCommand) Run(args []string) int {
 
 		switch config.Cache.WhenInconsistent {
 		case "retry":
-			if whenInconsistent != cache.WhenInconsistentFail {
-				c.UI.Error("when_inconsistent configured in both api_proxy and cache blocks. Please remove this configuration from the cache block.")
-				return 1
-			} else {
-				whenInconsistent = cache.WhenInconsistentRetry
-			}
+			whenInconsistent = cache.WhenInconsistentRetry
 		case "forward":
-			if whenInconsistent != cache.WhenInconsistentFail {
-				c.UI.Error("when_inconsistent configured in both api_proxy and cache blocks. Please remove this configuration from the cache block.")
-				return 1
-			} else {
-				whenInconsistent = cache.WhenInconsistentForward
-			}
+			whenInconsistent = cache.WhenInconsistentForward
 		case "fail", "":
 		default:
 			c.UI.Error(fmt.Sprintf("Unknown cache setting for when_inconsistent: %q", config.Cache.WhenInconsistent))
@@ -446,46 +496,41 @@ func (c *AgentCommand) Run(args []string) int {
 	}
 
 	// Output the header that the agent has started
-	if !c.logFlags.flagCombineLogs {
-		c.UI.Output("==> Vault Agent started! Log data will stream in below:\n")
+	if !c.flagCombineLogs {
+		c.UI.Output("==> Vault agent started! Log data will stream in below:\n")
 	}
 
 	var leaseCache *cache.LeaseCache
 	var previousToken string
+	// Parse agent listener configurations
+	if config.Cache != nil {
+		cacheLogger := c.logger.Named("cache")
 
-	proxyClient, err := client.CloneWithHeaders()
-	if err != nil {
-		c.UI.Error(fmt.Sprintf("Error cloning client for proxying: %v", err))
-		return 1
-	}
-
-	if config.DisableIdleConnsAPIProxy {
-		proxyClient.SetMaxIdleConnections(-1)
-	}
-
-	if config.DisableKeepAlivesAPIProxy {
-		proxyClient.SetDisableKeepAlives(true)
-	}
+		proxyClient, err := client.CloneWithHeaders()
+		if err != nil {
+			c.UI.Error(fmt.Sprintf("Error cloning client for caching: %v", err))
+			return 1
+		}
 
-	apiProxyLogger := c.logger.Named("apiproxy")
+		if config.DisableIdleConnsCaching {
+			proxyClient.SetMaxIdleConnections(-1)
+		}
 
-	// The API proxy to be used, if listeners are configured
-	apiProxy, err := cache.NewAPIProxy(&cache.APIProxyConfig{
-		Client:                  proxyClient,
-		Logger:                  apiProxyLogger,
-		EnforceConsistency:      enforceConsistency,
-		WhenInconsistentAction:  whenInconsistent,
-		UserAgentStringFunction: useragent.AgentProxyStringWithProxiedUserAgent,
-		UserAgentString:         useragent.AgentProxyString(),
-	})
-	if err != nil {
-		c.UI.Error(fmt.Sprintf("Error creating API proxy: %v", err))
-		return 1
-	}
+		if config.DisableKeepAlivesCaching {
+			proxyClient.SetDisableKeepAlives(true)
+		}
 
-	// Parse agent cache configurations
-	if config.Cache != nil {
-		cacheLogger := c.logger.Named("cache")
+		// Create the API proxier
+		apiProxy, err := cache.NewAPIProxy(&cache.APIProxyConfig{
+			Client:                 proxyClient,
+			Logger:                 cacheLogger.Named("apiproxy"),
+			EnforceConsistency:     enforceConsistency,
+			WhenInconsistentAction: whenInconsistent,
+		})
+		if err != nil {
+			c.UI.Error(fmt.Sprintf("Error creating API proxy: %v", err))
+			return 1
+		}
 
 		// Create the lease cache proxier and set its underlying proxier to
 		// the API proxier.
@@ -502,175 +547,272 @@ func (c *AgentCommand) Run(args []string) int {
 
 		// Configure persistent storage and add to LeaseCache
 		if config.Cache.Persist != nil {
-			deferFunc, oldToken, err := agentproxyshared.AddPersistentStorageToLeaseCache(ctx, leaseCache, config.Cache.Persist, cacheLogger)
-			if err != nil {
-				c.UI.Error(fmt.Sprintf("Error creating persistent cache: %v", err))
+			if config.Cache.Persist.Path == "" {
+				c.UI.Error("must specify persistent cache path")
 				return 1
 			}
-			previousToken = oldToken
-			if deferFunc != nil {
-				defer deferFunc()
+
+			// Set AAD based on key protection type
+			var aad string
+			switch config.Cache.Persist.Type {
+			case "kubernetes":
+				aad, err = getServiceAccountJWT(config.Cache.Persist.ServiceAccountTokenFile)
+				if err != nil {
+					c.UI.Error(fmt.Sprintf("failed to read service account token from %s: %s", config.Cache.Persist.ServiceAccountTokenFile, err))
+					return 1
+				}
+			default:
+				c.UI.Error(fmt.Sprintf("persistent key protection type %q not supported", config.Cache.Persist.Type))
+				return 1
 			}
-		}
-	}
 
-	var listeners []net.Listener
+			// Check if bolt file exists already
+			dbFileExists, err := cacheboltdb.DBFileExists(config.Cache.Persist.Path)
+			if err != nil {
+				c.UI.Error(fmt.Sprintf("failed to check if bolt file exists at path %s: %s", config.Cache.Persist.Path, err))
+				return 1
+			}
+			if dbFileExists {
+				// Open the bolt file, but wait to setup Encryption
+				ps, err := cacheboltdb.NewBoltStorage(&cacheboltdb.BoltStorageConfig{
+					Path:   config.Cache.Persist.Path,
+					Logger: cacheLogger.Named("cacheboltdb"),
+				})
+				if err != nil {
+					c.UI.Error(fmt.Sprintf("Error opening persistent cache: %v", err))
+					return 1
+				}
 
-	// If there are templates, add an in-process listener
-	if len(config.Templates) > 0 || len(config.EnvTemplates) > 0 {
-		config.Listeners = append(config.Listeners, &configutil.Listener{Type: listenerutil.BufConnType})
-	}
+				// Get the token from bolt for retrieving the encryption key,
+				// then setup encryption so that restore is possible
+				token, err := ps.GetRetrievalToken()
+				if err != nil {
+					c.UI.Error(fmt.Sprintf("Error getting retrieval token from persistent cache: %v", err))
+				}
 
-	// Ensure we've added all the reload funcs for TLS before anyone triggers a reload.
-	c.tlsReloadFuncsLock.Lock()
+				if err := ps.Close(); err != nil {
+					c.UI.Warn(fmt.Sprintf("Failed to close persistent cache file after getting retrieval token: %s", err))
+				}
 
-	for i, lnConfig := range config.Listeners {
-		var ln net.Listener
-		var tlsCfg *tls.Config
+				km, err := keymanager.NewPassthroughKeyManager(ctx, token)
+				if err != nil {
+					c.UI.Error(fmt.Sprintf("failed to configure persistence encryption for cache: %s", err))
+					return 1
+				}
 
-		if lnConfig.Type == listenerutil.BufConnType {
-			inProcListener := bufconn.Listen(1024 * 1024)
-			if config.Cache != nil {
-				config.Cache.InProcDialer = listenerutil.NewBufConnWrapper(inProcListener)
+				// Open the bolt file with the wrapper provided
+				ps, err = cacheboltdb.NewBoltStorage(&cacheboltdb.BoltStorageConfig{
+					Path:    config.Cache.Persist.Path,
+					Logger:  cacheLogger.Named("cacheboltdb"),
+					Wrapper: km.Wrapper(),
+					AAD:     aad,
+				})
+				if err != nil {
+					c.UI.Error(fmt.Sprintf("Error opening persistent cache with wrapper: %v", err))
+					return 1
+				}
+
+				// Restore anything in the persistent cache to the memory cache
+				if err := leaseCache.Restore(ctx, ps); err != nil {
+					c.UI.Error(fmt.Sprintf("Error restoring in-memory cache from persisted file: %v", err))
+					if config.Cache.Persist.ExitOnErr {
+						return 1
+					}
+				}
+				cacheLogger.Info("loaded memcache from persistent storage")
+
+				// Check for previous auto-auth token
+				oldTokenBytes, err := ps.GetAutoAuthToken(ctx)
+				if err != nil {
+					c.UI.Error(fmt.Sprintf("Error in fetching previous auto-auth token: %s", err))
+					if config.Cache.Persist.ExitOnErr {
+						return 1
+					}
+				}
+				if len(oldTokenBytes) > 0 {
+					oldToken, err := cachememdb.Deserialize(oldTokenBytes)
+					if err != nil {
+						c.UI.Error(fmt.Sprintf("Error in deserializing previous auto-auth token cache entry: %s", err))
+						if config.Cache.Persist.ExitOnErr {
+							return 1
+						}
+					}
+					previousToken = oldToken.Token
+				}
+
+				// If keep_after_import true, set persistent storage layer in
+				// leaseCache, else remove db file
+				if config.Cache.Persist.KeepAfterImport {
+					defer ps.Close()
+					leaseCache.SetPersistentStorage(ps)
+				} else {
+					if err := ps.Close(); err != nil {
+						c.UI.Warn(fmt.Sprintf("failed to close persistent cache file: %s", err))
+					}
+					dbFile := filepath.Join(config.Cache.Persist.Path, cacheboltdb.DatabaseFileName)
+					if err := os.Remove(dbFile); err != nil {
+						c.UI.Error(fmt.Sprintf("failed to remove persistent storage file %s: %s", dbFile, err))
+						if config.Cache.Persist.ExitOnErr {
+							return 1
+						}
+					}
+				}
+			} else {
+				km, err := keymanager.NewPassthroughKeyManager(ctx, nil)
+				if err != nil {
+					c.UI.Error(fmt.Sprintf("failed to configure persistence encryption for cache: %s", err))
+					return 1
+				}
+				ps, err := cacheboltdb.NewBoltStorage(&cacheboltdb.BoltStorageConfig{
+					Path:    config.Cache.Persist.Path,
+					Logger:  cacheLogger.Named("cacheboltdb"),
+					Wrapper: km.Wrapper(),
+					AAD:     aad,
+				})
+				if err != nil {
+					c.UI.Error(fmt.Sprintf("Error creating persistent cache: %v", err))
+					return 1
+				}
+				cacheLogger.Info("configured persistent storage", "path", config.Cache.Persist.Path)
+
+				// Stash the key material in bolt
+				token, err := km.RetrievalToken(ctx)
+				if err != nil {
+					c.UI.Error(fmt.Sprintf("Error getting persistent key: %s", err))
+					return 1
+				}
+				if err := ps.StoreRetrievalToken(token); err != nil {
+					c.UI.Error(fmt.Sprintf("Error setting key in persistent cache: %v", err))
+					return 1
+				}
+
+				defer ps.Close()
+				leaseCache.SetPersistentStorage(ps)
 			}
-			ln = inProcListener
-		} else {
-			lnBundle, err := cache.StartListener(lnConfig)
+		}
+
+		var inmemSink sink.Sink
+		if config.Cache.UseAutoAuthToken {
+			cacheLogger.Debug("auto-auth token is allowed to be used; configuring inmem sink")
+			inmemSink, err = inmem.New(&sink.SinkConfig{
+				Logger: cacheLogger,
+			}, leaseCache)
 			if err != nil {
-				c.UI.Error(fmt.Sprintf("Error starting listener: %v", err))
+				c.UI.Error(fmt.Sprintf("Error creating inmem sink for cache: %v", err))
 				return 1
 			}
+			sinks = append(sinks, &sink.SinkConfig{
+				Logger: cacheLogger,
+				Sink:   inmemSink,
+			})
+		}
 
-			tlsCfg = lnBundle.TLSConfig
-			ln = lnBundle.Listener
+		proxyVaultToken := !config.Cache.ForceAutoAuthToken
 
-			// Track the reload func, so we can reload later if needed.
-			c.tlsReloadFuncs = append(c.tlsReloadFuncs, lnBundle.TLSReloadFunc)
-		}
+		// Create the request handler
+		cacheHandler := cache.Handler(ctx, cacheLogger, leaseCache, inmemSink, proxyVaultToken)
 
-		listeners = append(listeners, ln)
+		var listeners []net.Listener
 
-		proxyVaultToken := true
-		var inmemSink sink.Sink
-		if config.APIProxy != nil {
-			if config.APIProxy.UseAutoAuthToken {
-				apiProxyLogger.Debug("auto-auth token is allowed to be used; configuring inmem sink")
-				inmemSink, err = inmem.New(&sink.SinkConfig{
-					Logger: apiProxyLogger,
-				}, leaseCache)
+		// If there are templates, add an in-process listener
+		if len(config.Templates) > 0 {
+			config.Listeners = append(config.Listeners, &configutil.Listener{Type: listenerutil.BufConnType})
+		}
+		for i, lnConfig := range config.Listeners {
+			var ln net.Listener
+			var tlsConf *tls.Config
+
+			if lnConfig.Type == listenerutil.BufConnType {
+				inProcListener := bufconn.Listen(1024 * 1024)
+				config.Cache.InProcDialer = listenerutil.NewBufConnWrapper(inProcListener)
+				ln = inProcListener
+			} else {
+				ln, tlsConf, err = cache.StartListener(lnConfig)
 				if err != nil {
-					c.UI.Error(fmt.Sprintf("Error creating inmem sink for cache: %v", err))
+					c.UI.Error(fmt.Sprintf("Error starting listener: %v", err))
 					return 1
 				}
-				sinks = append(sinks, &sink.SinkConfig{
-					Logger: apiProxyLogger,
-					Sink:   inmemSink,
-				})
 			}
-			proxyVaultToken = !config.APIProxy.ForceAutoAuthToken
-		}
 
-		var muxHandler http.Handler
-		if leaseCache != nil {
-			muxHandler = cache.ProxyHandler(ctx, apiProxyLogger, leaseCache, inmemSink, proxyVaultToken)
-		} else {
-			muxHandler = cache.ProxyHandler(ctx, apiProxyLogger, apiProxy, inmemSink, proxyVaultToken)
-		}
+			listeners = append(listeners, ln)
 
-		// Parse 'require_request_header' listener config option, and wrap
-		// the request handler if necessary
-		if lnConfig.RequireRequestHeader && ("metrics_only" != lnConfig.Role) {
-			muxHandler = verifyRequestHeader(muxHandler)
-		}
+			// Parse 'require_request_header' listener config option, and wrap
+			// the request handler if necessary
+			muxHandler := cacheHandler
+			if lnConfig.RequireRequestHeader {
+				muxHandler = verifyRequestHeader(muxHandler)
+			}
 
-		// Create a muxer and add paths relevant for the lease cache layer
-		mux := http.NewServeMux()
-		quitEnabled := lnConfig.AgentAPI != nil && lnConfig.AgentAPI.EnableQuit
+			// Create a muxer and add paths relevant for the lease cache layer
+			mux := http.NewServeMux()
+			quitEnabled := lnConfig.AgentAPI != nil && lnConfig.AgentAPI.EnableQuit
 
-		mux.Handle(consts.AgentPathMetrics, c.handleMetrics())
-		if "metrics_only" != lnConfig.Role {
 			mux.Handle(consts.AgentPathCacheClear, leaseCache.HandleCacheClear(ctx))
 			mux.Handle(consts.AgentPathQuit, c.handleQuit(quitEnabled))
+			mux.Handle(consts.AgentPathMetrics, c.handleMetrics())
 			mux.Handle("/", muxHandler)
-		}
-
-		scheme := "https://"
-		if tlsCfg == nil {
-			scheme = "http://"
-		}
-		if ln.Addr().Network() == "unix" {
-			scheme = "unix://"
-		}
 
-		infoKey := fmt.Sprintf("api address %d", i+1)
-		info[infoKey] = scheme + ln.Addr().String()
-		infoKeys = append(infoKeys, infoKey)
-
-		server := &http.Server{
-			Addr:              ln.Addr().String(),
-			TLSConfig:         tlsCfg,
-			Handler:           mux,
-			ReadHeaderTimeout: 10 * time.Second,
-			ReadTimeout:       30 * time.Second,
-			IdleTimeout:       5 * time.Minute,
-			ErrorLog:          apiProxyLogger.StandardLogger(nil),
-		}
+			scheme := "https://"
+			if tlsConf == nil {
+				scheme = "http://"
+			}
+			if ln.Addr().Network() == "unix" {
+				scheme = "unix://"
+			}
 
-		go server.Serve(ln)
-	}
+			infoKey := fmt.Sprintf("api address %d", i+1)
+			info[infoKey] = scheme + ln.Addr().String()
+			infoKeys = append(infoKeys, infoKey)
+
+			server := &http.Server{
+				Addr:              ln.Addr().String(),
+				TLSConfig:         tlsConf,
+				Handler:           mux,
+				ReadHeaderTimeout: 10 * time.Second,
+				ReadTimeout:       30 * time.Second,
+				IdleTimeout:       5 * time.Minute,
+				ErrorLog:          cacheLogger.StandardLogger(nil),
+			}
 
-	c.tlsReloadFuncsLock.Unlock()
+			go server.Serve(ln)
+		}
 
-	// Ensure that listeners are closed at all the exits
-	listenerCloseFunc := func() {
-		for _, ln := range listeners {
-			ln.Close()
+		// Ensure that listeners are closed at all the exits
+		listenerCloseFunc := func() {
+			for _, ln := range listeners {
+				ln.Close()
+			}
 		}
+		defer c.cleanupGuard.Do(listenerCloseFunc)
 	}
-	defer c.cleanupGuard.Do(listenerCloseFunc)
 
 	// Inform any tests that the server is ready
 	if c.startedCh != nil {
 		close(c.startedCh)
 	}
 
-	var g run.Group
+	// Listen for signals
+	// TODO: implement support for SIGHUP reloading of configuration
+	// signal.Notify(c.signalCh)
 
-	g.Add(func() error {
-		for {
-			select {
-			case <-c.SighupCh:
-				c.UI.Output("==> Vault Agent config reload triggered")
-				err := c.reloadConfig(c.flagConfigs)
-				if err != nil {
-					c.outputErrors(err)
-				}
-				// Send the 'reloaded' message on the relevant channel
-				select {
-				case c.reloadedCh <- struct{}{}:
-				default:
-				}
-			case <-ctx.Done():
-				return nil
-			}
-		}
-	}, func(error) {
-		cancelFunc()
-	})
+	var g run.Group
 
 	// This run group watches for signal termination
 	g.Add(func() error {
 		for {
 			select {
 			case <-c.ShutdownCh:
-				c.UI.Output("==> Vault Agent shutdown triggered")
+				c.UI.Output("==> Vault agent shutdown triggered")
 				// Notify systemd that the server is shutting down
-				// Let the lease cache know this is a shutdown; no need to evict everything
+				c.notifySystemd(systemd.SdNotifyStopping)
+				// Let the lease cache know this is a shutdown; no need to evict
+				// everything
 				if leaseCache != nil {
 					leaseCache.SetShuttingDown(true)
 				}
 				return nil
 			case <-ctx.Done():
+				c.notifySystemd(systemd.SdNotifyStopping)
 				return nil
 			case <-winsvc.ShutdownChannel():
 				return nil
@@ -680,8 +822,7 @@ func (c *AgentCommand) Run(args []string) int {
 
 	// Start auto-auth and sink servers
 	if method != nil {
-		enableTemplateTokenCh := len(config.Templates) > 0
-		enableEnvTemplateTokenCh := len(config.EnvTemplates) > 0
+		enableTokenCh := len(config.Templates) > 0
 
 		// Auth Handler is going to set its own retry values, so we want to
 		// work on a copy of the client to not affect other subsystems.
@@ -706,35 +847,24 @@ func (c *AgentCommand) Run(args []string) int {
 			MinBackoff:                   config.AutoAuth.Method.MinBackoff,
 			MaxBackoff:                   config.AutoAuth.Method.MaxBackoff,
 			EnableReauthOnNewCredentials: config.AutoAuth.EnableReauthOnNewCredentials,
-			EnableTemplateTokenCh:        enableTemplateTokenCh,
-			EnableExecTokenCh:            enableEnvTemplateTokenCh,
+			EnableTemplateTokenCh:        enableTokenCh,
 			Token:                        previousToken,
 			ExitOnError:                  config.AutoAuth.Method.ExitOnError,
-			UserAgent:                    useragent.AgentAutoAuthString(),
-			MetricsSignifier:             "agent",
 		})
 
 		ss := sink.NewSinkServer(&sink.SinkServerConfig{
 			Logger:        c.logger.Named("sink.server"),
 			Client:        ahClient,
-			ExitAfterAuth: config.ExitAfterAuth,
+			ExitAfterAuth: exitAfterAuth,
 		})
 
 		ts := template.NewServer(&template.ServerConfig{
 			Logger:        c.logger.Named("template.server"),
-			LogLevel:      c.logger.GetLevel(),
+			LogLevel:      level,
 			LogWriter:     c.logWriter,
-			AgentConfig:   c.config,
+			AgentConfig:   config,
 			Namespace:     templateNamespace,
-			ExitAfterAuth: config.ExitAfterAuth,
-		})
-
-		es := exec.NewServer(&exec.ServerConfig{
-			AgentConfig: c.config,
-			Namespace:   templateNamespace,
-			Logger:      c.logger.Named("exec.server"),
-			LogLevel:    c.logger.GetLevel(),
-			LogWriter:   c.logWriter,
+			ExitAfterAuth: exitAfterAuth,
 		})
 
 		g.Add(func() error {
@@ -791,29 +921,17 @@ func (c *AgentCommand) Run(args []string) int {
 			ts.Stop()
 		})
 
-		g.Add(func() error {
-			return es.Run(ctx, ah.ExecTokenCh)
-		}, func(err error) {
-			// Let the lease cache know this is a shutdown; no need to evict
-			// everything
-			if leaseCache != nil {
-				leaseCache.SetShuttingDown(true)
-			}
-			cancelFunc()
-		})
-
 	}
 
 	// Server configuration output
 	padding := 24
 	sort.Strings(infoKeys)
-	caser := cases.Title(language.English)
-	c.UI.Output("==> Vault Agent configuration:\n")
+	c.UI.Output("==> Vault agent configuration:\n")
 	for _, k := range infoKeys {
 		c.UI.Output(fmt.Sprintf(
 			"%s%s: %s",
 			strings.Repeat(" ", padding-len(k)),
-			caser.String(k),
+			strings.Title(k),
 			info[k]))
 	}
 	c.UI.Output("")
@@ -836,92 +954,13 @@ func (c *AgentCommand) Run(args []string) int {
 		}
 	}()
 
-	var exitCode int
 	if err := g.Run(); err != nil {
-		var processExitError *exec.ProcessExitError
-		if errors.As(err, &processExitError) {
-			exitCode = processExitError.ExitCode
-		} else {
-			exitCode = 1
-		}
-
-		if exitCode != 0 {
-			c.logger.Error("runtime error encountered", "error", err, "exitCode", exitCode)
-			c.UI.Error("Error encountered during run, refer to logs for more details.")
-		}
-	}
-
-	c.notifySystemd(systemd.SdNotifyStopping)
-
-	return exitCode
-}
-
-// applyConfigOverrides ensures that the config object accurately reflects the desired
-// settings as configured by the user. It applies the relevant config setting based
-// on the precedence (env var overrides file config, cli overrides env var).
-// It mutates the config object supplied.
-func (c *AgentCommand) applyConfigOverrides(f *FlagSets, config *agentConfig.Config) {
-	if config.Vault == nil {
-		config.Vault = &agentConfig.Vault{}
+		c.logger.Error("runtime error encountered", "error", err)
+		c.UI.Error("Error encountered during run, refer to logs for more details.")
+		return 1
 	}
 
-	f.applyLogConfigOverrides(config.SharedConfig)
-
-	f.Visit(func(fl *flag.Flag) {
-		if fl.Name == flagNameAgentExitAfterAuth {
-			config.ExitAfterAuth = c.flagExitAfterAuth
-		}
-	})
-
-	c.setStringFlag(f, config.Vault.Address, &StringVar{
-		Name:    flagNameAddress,
-		Target:  &c.flagAddress,
-		Default: "https://127.0.0.1:8200",
-		EnvVar:  api.EnvVaultAddress,
-	})
-	config.Vault.Address = c.flagAddress
-	c.setStringFlag(f, config.Vault.CACert, &StringVar{
-		Name:    flagNameCACert,
-		Target:  &c.flagCACert,
-		Default: "",
-		EnvVar:  api.EnvVaultCACert,
-	})
-	config.Vault.CACert = c.flagCACert
-	c.setStringFlag(f, config.Vault.CAPath, &StringVar{
-		Name:    flagNameCAPath,
-		Target:  &c.flagCAPath,
-		Default: "",
-		EnvVar:  api.EnvVaultCAPath,
-	})
-	config.Vault.CAPath = c.flagCAPath
-	c.setStringFlag(f, config.Vault.ClientCert, &StringVar{
-		Name:    flagNameClientCert,
-		Target:  &c.flagClientCert,
-		Default: "",
-		EnvVar:  api.EnvVaultClientCert,
-	})
-	config.Vault.ClientCert = c.flagClientCert
-	c.setStringFlag(f, config.Vault.ClientKey, &StringVar{
-		Name:    flagNameClientKey,
-		Target:  &c.flagClientKey,
-		Default: "",
-		EnvVar:  api.EnvVaultClientKey,
-	})
-	config.Vault.ClientKey = c.flagClientKey
-	c.setBoolFlag(f, config.Vault.TLSSkipVerify, &BoolVar{
-		Name:    flagNameTLSSkipVerify,
-		Target:  &c.flagTLSSkipVerify,
-		Default: false,
-		EnvVar:  api.EnvVaultSkipVerify,
-	})
-	config.Vault.TLSSkipVerify = c.flagTLSSkipVerify
-	c.setStringFlag(f, config.Vault.TLSServerName, &StringVar{
-		Name:    flagTLSServerName,
-		Target:  &c.flagTLSServerName,
-		Default: "",
-		EnvVar:  api.EnvVaultTLSServerName,
-	})
-	config.Vault.TLSServerName = c.flagTLSServerName
+	return 0
 }
 
 // verifyRequestHeader wraps an http.Handler inside a Handler that checks for
@@ -1031,6 +1070,19 @@ func (c *AgentCommand) removePidFile(pidPath string) error {
 	return os.Remove(pidPath)
 }
 
+// GetServiceAccountJWT reads the service account jwt from `tokenFile`. Default is
+// the default service account file path in kubernetes.
+func getServiceAccountJWT(tokenFile string) (string, error) {
+	if len(tokenFile) == 0 {
+		tokenFile = "/var/run/secrets/kubernetes.io/serviceaccount/token"
+	}
+	token, err := ioutil.ReadFile(tokenFile)
+	if err != nil {
+		return "", err
+	}
+	return strings.TrimSpace(string(token)), nil
+}
+
 func (c *AgentCommand) handleMetrics() http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		if r.Method != http.MethodGet {
@@ -1056,7 +1108,7 @@ func (c *AgentCommand) handleMetrics() http.Handler {
 		w.Header().Set("Content-Type", resp.Data[logical.HTTPContentType].(string))
 		switch v := resp.Data[logical.HTTPRawBody].(type) {
 		case string:
-			w.WriteHeader(status)
+			w.WriteHeader((status))
 			w.Write([]byte(v))
 		case []byte:
 			w.WriteHeader(status)
@@ -1085,163 +1137,3 @@ func (c *AgentCommand) handleQuit(enabled bool) http.Handler {
 		close(c.ShutdownCh)
 	})
 }
-
-// newLogger creates a logger based on parsed config field on the Agent Command struct.
-func (c *AgentCommand) newLogger() (log.InterceptLogger, error) {
-	if c.config == nil {
-		return nil, fmt.Errorf("cannot create logger, no config")
-	}
-
-	var errors error
-
-	// Parse all the log related config
-	logLevel, err := logging.ParseLogLevel(c.config.LogLevel)
-	if err != nil {
-		errors = multierror.Append(errors, err)
-	}
-
-	logFormat, err := logging.ParseLogFormat(c.config.LogFormat)
-	if err != nil {
-		errors = multierror.Append(errors, err)
-	}
-
-	logRotateDuration, err := parseutil.ParseDurationSecond(c.config.LogRotateDuration)
-	if err != nil {
-		errors = multierror.Append(errors, err)
-	}
-
-	if errors != nil {
-		return nil, errors
-	}
-
-	logCfg := &logging.LogConfig{
-		Name:              "agent",
-		LogLevel:          logLevel,
-		LogFormat:         logFormat,
-		LogFilePath:       c.config.LogFile,
-		LogRotateDuration: logRotateDuration,
-		LogRotateBytes:    c.config.LogRotateBytes,
-		LogRotateMaxFiles: c.config.LogRotateMaxFiles,
-	}
-
-	l, err := logging.Setup(logCfg, c.logWriter)
-	if err != nil {
-		return nil, err
-	}
-
-	return l, nil
-}
-
-// loadConfig attempts to generate an Agent config from the file(s) specified.
-func (c *AgentCommand) loadConfig(paths []string) (*agentConfig.Config, error) {
-	var errors error
-	cfg := agentConfig.NewConfig()
-
-	for _, configPath := range paths {
-		configFromPath, err := agentConfig.LoadConfig(configPath)
-		if err != nil {
-			errors = multierror.Append(errors, fmt.Errorf("error loading configuration from %s: %w", configPath, err))
-		} else {
-			cfg = cfg.Merge(configFromPath)
-		}
-	}
-
-	if errors != nil {
-		return nil, errors
-	}
-
-	if err := cfg.ValidateConfig(); err != nil {
-		return nil, fmt.Errorf("error validating configuration: %w", err)
-	}
-
-	return cfg, nil
-}
-
-// reloadConfig will attempt to reload the config from file(s) and adjust certain
-// config values without requiring a restart of the Vault Agent.
-// If config is retrieved without error it is stored in the config field of the AgentCommand.
-// This operation is not atomic and could result in updated config but partially applied config settings.
-// The error returned from this func may be a multierror.
-// This function will most likely be called due to Vault Agent receiving a SIGHUP signal.
-// Currently only reloading the following are supported:
-// * log level
-// * TLS certs for listeners
-func (c *AgentCommand) reloadConfig(paths []string) error {
-	// Notify systemd that the server is reloading
-	c.notifySystemd(systemd.SdNotifyReloading)
-	defer c.notifySystemd(systemd.SdNotifyReady)
-
-	var errors error
-
-	// Reload the config
-	cfg, err := c.loadConfig(paths)
-	if err != nil {
-		// Returning single error as we won't continue with bad config and won't 'commit' it.
-		return err
-	}
-	c.config = cfg
-
-	// Update the log level
-	err = c.reloadLogLevel()
-	if err != nil {
-		errors = multierror.Append(errors, err)
-	}
-
-	// Update certs
-	err = c.reloadCerts()
-	if err != nil {
-		errors = multierror.Append(errors, err)
-	}
-
-	return errors
-}
-
-// reloadLogLevel will attempt to update the log level for the logger attached
-// to the AgentComment struct using the value currently set in config.
-func (c *AgentCommand) reloadLogLevel() error {
-	logLevel, err := logging.ParseLogLevel(c.config.LogLevel)
-	if err != nil {
-		return err
-	}
-
-	c.logger.SetLevel(logLevel)
-
-	return nil
-}
-
-// reloadCerts will attempt to reload certificates using a reload func which
-// was provided when the listeners were configured, only funcs that were appended
-// to the AgentCommand slice will be invoked.
-// This function returns a multierror type so that every func can report an error
-// if it encounters one.
-func (c *AgentCommand) reloadCerts() error {
-	var errors error
-
-	c.tlsReloadFuncsLock.RLock()
-	defer c.tlsReloadFuncsLock.RUnlock()
-
-	for _, reloadFunc := range c.tlsReloadFuncs {
-		// Non-TLS listeners will have a nil reload func.
-		if reloadFunc != nil {
-			err := reloadFunc()
-			if err != nil {
-				errors = multierror.Append(errors, err)
-			}
-		}
-	}
-
-	return errors
-}
-
-// outputErrors will take an error or multierror and handle outputting each to the UI
-func (c *AgentCommand) outputErrors(err error) {
-	if err != nil {
-		if me, ok := err.(*multierror.Error); ok {
-			for _, err := range me.Errors {
-				c.UI.Error(err.Error())
-			}
-		} else {
-			c.UI.Error(err.Error())
-		}
-	}
-}
diff --git a/command/agent/alicloud_end_to_end_test.go b/command/agent/alicloud_end_to_end_test.go
index 0f5cdfbe4ecbe..948f9fa5accf4 100644
--- a/command/agent/alicloud_end_to_end_test.go
+++ b/command/agent/alicloud_end_to_end_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package agent
 
 import (
@@ -19,11 +16,10 @@ import (
 	uuid "github.com/hashicorp/go-uuid"
 	vaultalicloud "github.com/hashicorp/vault-plugin-auth-alicloud"
 	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/command/agentproxyshared/auth"
-	agentalicloud "github.com/hashicorp/vault/command/agentproxyshared/auth/alicloud"
-	"github.com/hashicorp/vault/command/agentproxyshared/sink"
-	"github.com/hashicorp/vault/command/agentproxyshared/sink/file"
-	"github.com/hashicorp/vault/helper/testhelpers"
+	"github.com/hashicorp/vault/command/agent/auth"
+	agentalicloud "github.com/hashicorp/vault/command/agent/auth/alicloud"
+	"github.com/hashicorp/vault/command/agent/sink"
+	"github.com/hashicorp/vault/command/agent/sink/file"
 	vaulthttp "github.com/hashicorp/vault/http"
 	"github.com/hashicorp/vault/sdk/helper/logging"
 	"github.com/hashicorp/vault/sdk/logical"
@@ -41,14 +37,6 @@ func TestAliCloudEndToEnd(t *testing.T) {
 		t.SkipNow()
 	}
 
-	// Ensure each cred is populated.
-	credNames := []string{
-		envVarAlicloudAccessKey,
-		envVarAlicloudSecretKey,
-		envVarAlicloudRoleArn,
-	}
-	testhelpers.SkipUnlessEnvVarsSet(t, credNames)
-
 	logger := logging.NewVaultLogger(hclog.Trace)
 	coreConfig := &vault.CoreConfig{
 		Logger: logger,
diff --git a/command/agent/approle_end_to_end_test.go b/command/agent/approle_end_to_end_test.go
index 515a13ec52f8d..35186cd8e606e 100644
--- a/command/agent/approle_end_to_end_test.go
+++ b/command/agent/approle_end_to_end_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package agent
 
 import (
@@ -9,17 +6,16 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
-	"strings"
 	"testing"
 	"time"
 
 	log "github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/vault/api"
 	credAppRole "github.com/hashicorp/vault/builtin/credential/approle"
-	"github.com/hashicorp/vault/command/agentproxyshared/auth"
-	agentapprole "github.com/hashicorp/vault/command/agentproxyshared/auth/approle"
-	"github.com/hashicorp/vault/command/agentproxyshared/sink"
-	"github.com/hashicorp/vault/command/agentproxyshared/sink/file"
+	"github.com/hashicorp/vault/command/agent/auth"
+	agentapprole "github.com/hashicorp/vault/command/agent/auth/approle"
+	"github.com/hashicorp/vault/command/agent/sink"
+	"github.com/hashicorp/vault/command/agent/sink/file"
 	vaulthttp "github.com/hashicorp/vault/http"
 	"github.com/hashicorp/vault/sdk/helper/logging"
 	"github.com/hashicorp/vault/sdk/logical"
@@ -58,7 +54,6 @@ func TestAppRoleEndToEnd(t *testing.T) {
 		if tc.removeSecretIDFile {
 			secretFileAction = "remove"
 		}
-		tc := tc // capture range variable
 		t.Run(fmt.Sprintf("%s_secret_id_file bindSecretID=%v secretIDLess=%v expectToken=%v", secretFileAction, tc.bindSecretID, tc.secretIDLess, tc.expectToken), func(t *testing.T) {
 			t.Parallel()
 			testAppRoleEndToEnd(t, tc.removeSecretIDFile, tc.bindSecretID, tc.secretIDLess, tc.expectToken)
@@ -404,52 +399,6 @@ func testAppRoleEndToEnd(t *testing.T, removeSecretIDFile bool, bindSecretID boo
 	}
 }
 
-// TestAppRoleLongRoleName tests that the creation of an approle is a maximum of 4096 bytes
-// Prior to VAULT-8518 being fixed, you were unable to delete an approle value longer than 1024 bytes
-// due to a restriction put into place by PR #14746, to prevent unbounded HMAC creation.
-func TestAppRoleLongRoleName(t *testing.T) {
-	approleName := strings.Repeat("a", 5000)
-
-	coreConfig := &vault.CoreConfig{
-		DisableMlock: true,
-		DisableCache: true,
-		Logger:       log.NewNullLogger(),
-		CredentialBackends: map[string]logical.Factory{
-			"approle": credAppRole.Factory,
-		},
-	}
-
-	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
-		HandlerFunc: vaulthttp.Handler,
-	})
-
-	cluster.Start()
-	defer cluster.Cleanup()
-
-	cores := cluster.Cores
-
-	vault.TestWaitActive(t, cores[0].Core)
-
-	client := cores[0].Client
-
-	err := client.Sys().EnableAuthWithOptions("approle", &api.EnableAuthOptions{
-		Type: "approle",
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = client.Logical().Write(fmt.Sprintf("auth/approle/role/%s", approleName), map[string]interface{}{
-		"token_ttl":     "6s",
-		"token_max_ttl": "10s",
-	})
-	if err != nil {
-		if !strings.Contains(err.Error(), "role_name is longer than maximum") {
-			t.Fatal(err)
-		}
-	}
-}
-
 func TestAppRoleWithWrapping(t *testing.T) {
 	testCases := []struct {
 		bindSecretID bool
diff --git a/command/agentproxyshared/auth/alicloud/alicloud.go b/command/agent/auth/alicloud/alicloud.go
similarity index 98%
rename from command/agentproxyshared/auth/alicloud/alicloud.go
rename to command/agent/auth/alicloud/alicloud.go
index 724597682a1f3..6fc640c290e0a 100644
--- a/command/agentproxyshared/auth/alicloud/alicloud.go
+++ b/command/agent/auth/alicloud/alicloud.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package alicloud
 
 import (
@@ -17,7 +14,7 @@ import (
 	hclog "github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/vault-plugin-auth-alicloud/tools"
 	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/command/agentproxyshared/auth"
+	"github.com/hashicorp/vault/command/agent/auth"
 )
 
 /*
diff --git a/command/agentproxyshared/auth/approle/approle.go b/command/agent/auth/approle/approle.go
similarity index 98%
rename from command/agentproxyshared/auth/approle/approle.go
rename to command/agent/auth/approle/approle.go
index 9f33980a9f546..e58299ad7b2e8 100644
--- a/command/agentproxyshared/auth/approle/approle.go
+++ b/command/agent/auth/approle/approle.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package approle
 
 import (
@@ -15,7 +12,7 @@ import (
 	hclog "github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/go-secure-stdlib/parseutil"
 	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/command/agentproxyshared/auth"
+	"github.com/hashicorp/vault/command/agent/auth"
 )
 
 type approleMethod struct {
diff --git a/command/agent/auth/auth.go b/command/agent/auth/auth.go
new file mode 100644
index 0000000000000..854052adc5cbd
--- /dev/null
+++ b/command/agent/auth/auth.go
@@ -0,0 +1,445 @@
+package auth
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"math/rand"
+	"net/http"
+	"time"
+
+	"github.com/armon/go-metrics"
+	"github.com/hashicorp/go-hclog"
+	"github.com/hashicorp/vault/api"
+	"github.com/hashicorp/vault/sdk/helper/jsonutil"
+)
+
+const (
+	defaultMinBackoff = 1 * time.Second
+	defaultMaxBackoff = 5 * time.Minute
+)
+
+// AuthMethod is the interface that auto-auth methods implement for the agent
+// to use.
+type AuthMethod interface {
+	// Authenticate returns a mount path, header, request body, and error.
+	// The header may be nil if no special header is needed.
+	Authenticate(context.Context, *api.Client) (string, http.Header, map[string]interface{}, error)
+	NewCreds() chan struct{}
+	CredSuccess()
+	Shutdown()
+}
+
+// AuthMethodWithClient is an extended interface that can return an API client
+// for use during the authentication call.
+type AuthMethodWithClient interface {
+	AuthMethod
+	AuthClient(client *api.Client) (*api.Client, error)
+}
+
+type AuthConfig struct {
+	Logger    hclog.Logger
+	MountPath string
+	WrapTTL   time.Duration
+	Config    map[string]interface{}
+}
+
+// AuthHandler is responsible for keeping a token alive and renewed and passing
+// new tokens to the sink server
+type AuthHandler struct {
+	OutputCh                     chan string
+	TemplateTokenCh              chan string
+	token                        string
+	logger                       hclog.Logger
+	client                       *api.Client
+	random                       *rand.Rand
+	wrapTTL                      time.Duration
+	maxBackoff                   time.Duration
+	minBackoff                   time.Duration
+	enableReauthOnNewCredentials bool
+	enableTemplateTokenCh        bool
+	exitOnError                  bool
+}
+
+type AuthHandlerConfig struct {
+	Logger                       hclog.Logger
+	Client                       *api.Client
+	WrapTTL                      time.Duration
+	MaxBackoff                   time.Duration
+	MinBackoff                   time.Duration
+	Token                        string
+	EnableReauthOnNewCredentials bool
+	EnableTemplateTokenCh        bool
+	ExitOnError                  bool
+}
+
+func NewAuthHandler(conf *AuthHandlerConfig) *AuthHandler {
+	ah := &AuthHandler{
+		// This is buffered so that if we try to output after the sink server
+		// has been shut down, during agent shutdown, we won't block
+		OutputCh:                     make(chan string, 1),
+		TemplateTokenCh:              make(chan string, 1),
+		token:                        conf.Token,
+		logger:                       conf.Logger,
+		client:                       conf.Client,
+		random:                       rand.New(rand.NewSource(int64(time.Now().Nanosecond()))),
+		wrapTTL:                      conf.WrapTTL,
+		minBackoff:                   conf.MinBackoff,
+		maxBackoff:                   conf.MaxBackoff,
+		enableReauthOnNewCredentials: conf.EnableReauthOnNewCredentials,
+		enableTemplateTokenCh:        conf.EnableTemplateTokenCh,
+		exitOnError:                  conf.ExitOnError,
+	}
+
+	return ah
+}
+
+func backoff(ctx context.Context, backoff *agentBackoff) bool {
+	if backoff.exitOnErr {
+		return false
+	}
+
+	select {
+	case <-time.After(backoff.current):
+	case <-ctx.Done():
+	}
+
+	// Increase exponential backoff for the next time if we don't
+	// successfully auth/renew/etc.
+	backoff.next()
+	return true
+}
+
+func (ah *AuthHandler) Run(ctx context.Context, am AuthMethod) error {
+	if am == nil {
+		return errors.New("auth handler: nil auth method")
+	}
+
+	if ah.minBackoff <= 0 {
+		ah.minBackoff = defaultMinBackoff
+	}
+
+	backoffCfg := newAgentBackoff(ah.minBackoff, ah.maxBackoff, ah.exitOnError)
+
+	if backoffCfg.min >= backoffCfg.max {
+		return errors.New("auth handler: min_backoff cannot be greater than max_backoff")
+	}
+
+	ah.logger.Info("starting auth handler")
+	defer func() {
+		am.Shutdown()
+		close(ah.OutputCh)
+		close(ah.TemplateTokenCh)
+		ah.logger.Info("auth handler stopped")
+	}()
+
+	credCh := am.NewCreds()
+	if !ah.enableReauthOnNewCredentials {
+		realCredCh := credCh
+		credCh = nil
+		if realCredCh != nil {
+			go func() {
+				for {
+					select {
+					case <-ctx.Done():
+						return
+					case <-realCredCh:
+					}
+				}
+			}()
+		}
+	}
+	if credCh == nil {
+		credCh = make(chan struct{})
+	}
+
+	var watcher *api.LifetimeWatcher
+	first := true
+
+	for {
+		select {
+		case <-ctx.Done():
+			return nil
+
+		default:
+		}
+
+		var clientToUse *api.Client
+		var err error
+		var path string
+		var data map[string]interface{}
+		var header http.Header
+
+		switch am.(type) {
+		case AuthMethodWithClient:
+			clientToUse, err = am.(AuthMethodWithClient).AuthClient(ah.client)
+			if err != nil {
+				ah.logger.Error("error creating client for authentication call", "error", err, "backoff", backoff)
+				metrics.IncrCounter([]string{"agent", "auth", "failure"}, 1)
+
+				if backoff(ctx, backoffCfg) {
+					continue
+				}
+
+				return err
+			}
+		default:
+			clientToUse = ah.client
+		}
+
+		// Disable retry on the client to ensure our backoffOrQuit function is
+		// the only source of retry/backoff.
+		clientToUse.SetMaxRetries(0)
+
+		var secret *api.Secret = new(api.Secret)
+		if first && ah.token != "" {
+			ah.logger.Debug("using preloaded token")
+
+			first = false
+			ah.logger.Debug("lookup-self with preloaded token")
+			clientToUse.SetToken(ah.token)
+
+			secret, err = clientToUse.Auth().Token().LookupSelfWithContext(ctx)
+			if err != nil {
+				ah.logger.Error("could not look up token", "err", err, "backoff", backoffCfg)
+				metrics.IncrCounter([]string{"agent", "auth", "failure"}, 1)
+
+				if backoff(ctx, backoffCfg) {
+					continue
+				}
+				return err
+			}
+
+			duration, _ := secret.Data["ttl"].(json.Number).Int64()
+			secret.Auth = &api.SecretAuth{
+				ClientToken:   secret.Data["id"].(string),
+				LeaseDuration: int(duration),
+				Renewable:     secret.Data["renewable"].(bool),
+			}
+		} else {
+			ah.logger.Info("authenticating")
+
+			path, header, data, err = am.Authenticate(ctx, ah.client)
+			if err != nil {
+				ah.logger.Error("error getting path or data from method", "error", err, "backoff", backoffCfg)
+				metrics.IncrCounter([]string{"agent", "auth", "failure"}, 1)
+
+				if backoff(ctx, backoffCfg) {
+					continue
+				}
+				return err
+			}
+		}
+
+		if ah.wrapTTL > 0 {
+			wrapClient, err := clientToUse.Clone()
+			if err != nil {
+				ah.logger.Error("error creating client for wrapped call", "error", err, "backoff", backoffCfg)
+				metrics.IncrCounter([]string{"agent", "auth", "failure"}, 1)
+
+				if backoff(ctx, backoffCfg) {
+					continue
+				}
+				return err
+			}
+			wrapClient.SetWrappingLookupFunc(func(string, string) string {
+				return ah.wrapTTL.String()
+			})
+			clientToUse = wrapClient
+		}
+		for key, values := range header {
+			for _, value := range values {
+				clientToUse.AddHeader(key, value)
+			}
+		}
+
+		// This should only happen if there's no preloaded token (regular auto-auth login)
+		//  or if a preloaded token has expired and is now switching to auto-auth.
+		if secret.Auth == nil {
+			secret, err = clientToUse.Logical().WriteWithContext(ctx, path, data)
+			// Check errors/sanity
+			if err != nil {
+				ah.logger.Error("error authenticating", "error", err, "backoff", backoffCfg)
+				metrics.IncrCounter([]string{"agent", "auth", "failure"}, 1)
+
+				if backoff(ctx, backoffCfg) {
+					continue
+				}
+				return err
+			}
+		}
+
+		switch {
+		case ah.wrapTTL > 0:
+			if secret.WrapInfo == nil {
+				ah.logger.Error("authentication returned nil wrap info", "backoff", backoffCfg)
+				metrics.IncrCounter([]string{"agent", "auth", "failure"}, 1)
+
+				if backoff(ctx, backoffCfg) {
+					continue
+				}
+				return err
+			}
+			if secret.WrapInfo.Token == "" {
+				ah.logger.Error("authentication returned empty wrapped client token", "backoff", backoffCfg)
+				metrics.IncrCounter([]string{"agent", "auth", "failure"}, 1)
+
+				if backoff(ctx, backoffCfg) {
+					continue
+				}
+				return err
+			}
+			wrappedResp, err := jsonutil.EncodeJSON(secret.WrapInfo)
+			if err != nil {
+				ah.logger.Error("failed to encode wrapinfo", "error", err, "backoff", backoffCfg)
+				metrics.IncrCounter([]string{"agent", "auth", "failure"}, 1)
+
+				if backoff(ctx, backoffCfg) {
+					continue
+				}
+				return err
+			}
+			ah.logger.Info("authentication successful, sending wrapped token to sinks and pausing")
+			ah.OutputCh <- string(wrappedResp)
+			if ah.enableTemplateTokenCh {
+				ah.TemplateTokenCh <- string(wrappedResp)
+			}
+
+			am.CredSuccess()
+			backoffCfg.reset()
+
+			select {
+			case <-ctx.Done():
+				ah.logger.Info("shutdown triggered")
+				continue
+
+			case <-credCh:
+				ah.logger.Info("auth method found new credentials, re-authenticating")
+				continue
+			}
+
+		default:
+			if secret == nil || secret.Auth == nil {
+				ah.logger.Error("authentication returned nil auth info", "backoff", backoffCfg)
+				metrics.IncrCounter([]string{"agent", "auth", "failure"}, 1)
+
+				if backoff(ctx, backoffCfg) {
+					continue
+				}
+				return err
+			}
+			if secret.Auth.ClientToken == "" {
+				ah.logger.Error("authentication returned empty client token", "backoff", backoffCfg)
+				metrics.IncrCounter([]string{"agent", "auth", "failure"}, 1)
+
+				if backoff(ctx, backoffCfg) {
+					continue
+				}
+				return err
+			}
+			ah.logger.Info("authentication successful, sending token to sinks")
+			ah.OutputCh <- secret.Auth.ClientToken
+			if ah.enableTemplateTokenCh {
+				ah.TemplateTokenCh <- secret.Auth.ClientToken
+			}
+
+			am.CredSuccess()
+			backoffCfg.reset()
+		}
+
+		if watcher != nil {
+			watcher.Stop()
+		}
+
+		watcher, err = clientToUse.NewLifetimeWatcher(&api.LifetimeWatcherInput{
+			Secret: secret,
+		})
+		if err != nil {
+			ah.logger.Error("error creating lifetime watcher", "error", err, "backoff", backoffCfg)
+			metrics.IncrCounter([]string{"agent", "auth", "failure"}, 1)
+
+			if backoff(ctx, backoffCfg) {
+				continue
+			}
+			return err
+		}
+
+		// Start the renewal process
+		ah.logger.Info("starting renewal process")
+		metrics.IncrCounter([]string{"agent", "auth", "success"}, 1)
+		go watcher.Renew()
+
+	LifetimeWatcherLoop:
+		for {
+			select {
+			case <-ctx.Done():
+				ah.logger.Info("shutdown triggered, stopping lifetime watcher")
+				watcher.Stop()
+				break LifetimeWatcherLoop
+
+			case err := <-watcher.DoneCh():
+				ah.logger.Info("lifetime watcher done channel triggered")
+				if err != nil {
+					metrics.IncrCounter([]string{"agent", "auth", "failure"}, 1)
+					ah.logger.Error("error renewing token", "error", err)
+				}
+				break LifetimeWatcherLoop
+
+			case <-watcher.RenewCh():
+				metrics.IncrCounter([]string{"agent", "auth", "success"}, 1)
+				ah.logger.Info("renewed auth token")
+
+			case <-credCh:
+				ah.logger.Info("auth method found new credentials, re-authenticating")
+				break LifetimeWatcherLoop
+			}
+		}
+	}
+}
+
+// agentBackoff tracks exponential backoff state.
+type agentBackoff struct {
+	min       time.Duration
+	max       time.Duration
+	current   time.Duration
+	exitOnErr bool
+}
+
+func newAgentBackoff(min, max time.Duration, exitErr bool) *agentBackoff {
+	if max <= 0 {
+		max = defaultMaxBackoff
+	}
+
+	if min <= 0 {
+		min = defaultMinBackoff
+	}
+
+	return &agentBackoff{
+		current:   min,
+		max:       max,
+		min:       min,
+		exitOnErr: exitErr,
+	}
+}
+
+// next determines the next backoff duration that is roughly twice
+// the current value, capped to a max value, with a measure of randomness.
+func (b *agentBackoff) next() {
+	maxBackoff := 2 * b.current
+
+	if maxBackoff > b.max {
+		maxBackoff = b.max
+	}
+
+	// Trim a random amount (0-25%) off the doubled duration
+	trim := rand.Int63n(int64(maxBackoff) / 4)
+	b.current = maxBackoff - time.Duration(trim)
+}
+
+func (b *agentBackoff) reset() {
+	b.current = b.min
+}
+
+func (b agentBackoff) String() string {
+	return b.current.Truncate(10 * time.Millisecond).String()
+}
diff --git a/command/agentproxyshared/auth/auth_test.go b/command/agent/auth/auth_test.go
similarity index 95%
rename from command/agentproxyshared/auth/auth_test.go
rename to command/agent/auth/auth_test.go
index 5729435020fba..9501342749bb4 100644
--- a/command/agentproxyshared/auth/auth_test.go
+++ b/command/agent/auth/auth_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package auth
 
 import (
@@ -112,7 +109,7 @@ consumption:
 
 func TestAgentBackoff(t *testing.T) {
 	max := 1024 * time.Second
-	backoff := newAutoAuthBackoff(defaultMinBackoff, max, false)
+	backoff := newAgentBackoff(defaultMinBackoff, max, false)
 
 	// Test initial value
 	if backoff.current != defaultMinBackoff {
@@ -162,7 +159,7 @@ func TestAgentMinBackoffCustom(t *testing.T) {
 
 	for _, test := range tests {
 		max := 1024 * time.Second
-		backoff := newAutoAuthBackoff(test.minBackoff, max, false)
+		backoff := newAgentBackoff(test.minBackoff, max, false)
 
 		// Test initial value
 		if backoff.current != test.want {
diff --git a/command/agentproxyshared/auth/aws/aws.go b/command/agent/auth/aws/aws.go
similarity index 98%
rename from command/agentproxyshared/auth/aws/aws.go
rename to command/agent/auth/aws/aws.go
index 53d1623be8a4c..b9dbdd5499c82 100644
--- a/command/agentproxyshared/auth/aws/aws.go
+++ b/command/agent/auth/aws/aws.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package aws
 
 import (
@@ -20,7 +17,7 @@ import (
 	"github.com/hashicorp/go-secure-stdlib/awsutil"
 	"github.com/hashicorp/go-uuid"
 	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/command/agentproxyshared/auth"
+	"github.com/hashicorp/vault/command/agent/auth"
 )
 
 const (
diff --git a/command/agentproxyshared/auth/azure/azure.go b/command/agent/auth/azure/azure.go
similarity index 96%
rename from command/agentproxyshared/auth/azure/azure.go
rename to command/agent/auth/azure/azure.go
index 77e6613971b37..528e82ffe6cc2 100644
--- a/command/agentproxyshared/auth/azure/azure.go
+++ b/command/agent/auth/azure/azure.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package azure
 
 import (
@@ -13,9 +10,9 @@ import (
 	cleanhttp "github.com/hashicorp/go-cleanhttp"
 	hclog "github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/command/agentproxyshared/auth"
-	"github.com/hashicorp/vault/helper/useragent"
+	"github.com/hashicorp/vault/command/agent/auth"
 	"github.com/hashicorp/vault/sdk/helper/jsonutil"
+	"github.com/hashicorp/vault/sdk/helper/useragent"
 )
 
 const (
diff --git a/command/agent/auth/cert/cert.go b/command/agent/auth/cert/cert.go
new file mode 100644
index 0000000000000..2703aa8ecd589
--- /dev/null
+++ b/command/agent/auth/cert/cert.go
@@ -0,0 +1,146 @@
+package cert
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"net/http"
+
+	"github.com/hashicorp/go-hclog"
+	"github.com/hashicorp/vault/api"
+	"github.com/hashicorp/vault/command/agent/auth"
+	"github.com/hashicorp/vault/sdk/helper/consts"
+)
+
+type certMethod struct {
+	logger    hclog.Logger
+	mountPath string
+	name      string
+
+	caCert     string
+	clientCert string
+	clientKey  string
+
+	// Client is the cached client to use if cert info was provided.
+	client *api.Client
+}
+
+var _ auth.AuthMethodWithClient = &certMethod{}
+
+func NewCertAuthMethod(conf *auth.AuthConfig) (auth.AuthMethod, error) {
+	if conf == nil {
+		return nil, errors.New("empty config")
+	}
+
+	// Not concerned if the conf.Config is empty as the 'name'
+	// parameter is optional when using TLS Auth
+
+	c := &certMethod{
+		logger:    conf.Logger,
+		mountPath: conf.MountPath,
+	}
+
+	if conf.Config != nil {
+		nameRaw, ok := conf.Config["name"]
+		if !ok {
+			nameRaw = ""
+		}
+		c.name, ok = nameRaw.(string)
+		if !ok {
+			return nil, errors.New("could not convert 'name' config value to string")
+		}
+
+		caCertRaw, ok := conf.Config["ca_cert"]
+		if ok {
+			c.caCert, ok = caCertRaw.(string)
+			if !ok {
+				return nil, errors.New("could not convert 'ca_cert' config value to string")
+			}
+		}
+
+		clientCertRaw, ok := conf.Config["client_cert"]
+		if ok {
+			c.clientCert, ok = clientCertRaw.(string)
+			if !ok {
+				return nil, errors.New("could not convert 'cert_file' config value to string")
+			}
+		}
+
+		clientKeyRaw, ok := conf.Config["client_key"]
+		if ok {
+			c.clientKey, ok = clientKeyRaw.(string)
+			if !ok {
+				return nil, errors.New("could not convert 'cert_key' config value to string")
+			}
+		}
+	}
+
+	return c, nil
+}
+
+func (c *certMethod) Authenticate(_ context.Context, client *api.Client) (string, http.Header, map[string]interface{}, error) {
+	c.logger.Trace("beginning authentication")
+
+	authMap := map[string]interface{}{}
+
+	if c.name != "" {
+		authMap["name"] = c.name
+	}
+
+	return fmt.Sprintf("%s/login", c.mountPath), nil, authMap, nil
+}
+
+func (c *certMethod) NewCreds() chan struct{} {
+	return nil
+}
+
+func (c *certMethod) CredSuccess() {}
+
+func (c *certMethod) Shutdown() {}
+
+// AuthClient uses the existing client's address and returns a new client with
+// the auto-auth method's certificate information if that's provided in its
+// config map.
+func (c *certMethod) AuthClient(client *api.Client) (*api.Client, error) {
+	c.logger.Trace("deriving auth client to use")
+
+	clientToAuth := client
+
+	if c.caCert != "" || (c.clientKey != "" && c.clientCert != "") {
+		// Return cached client if present
+		if c.client != nil {
+			return c.client, nil
+		}
+
+		config := api.DefaultConfig()
+		if config.Error != nil {
+			return nil, config.Error
+		}
+		config.Address = client.Address()
+
+		t := &api.TLSConfig{
+			CACert:     c.caCert,
+			ClientCert: c.clientCert,
+			ClientKey:  c.clientKey,
+		}
+
+		// Setup TLS config
+		if err := config.ConfigureTLS(t); err != nil {
+			return nil, err
+		}
+
+		var err error
+		clientToAuth, err = api.NewClient(config)
+		if err != nil {
+			return nil, err
+		}
+		if ns := client.Headers().Get(consts.NamespaceHeaderName); ns != "" {
+			clientToAuth.SetNamespace(ns)
+		}
+
+		// Cache the client for future use
+		c.client = clientToAuth
+	}
+
+	return clientToAuth, nil
+}
diff --git a/command/agent/auth/cert/cert_test.go b/command/agent/auth/cert/cert_test.go
new file mode 100644
index 0000000000000..15ff8f4327f37
--- /dev/null
+++ b/command/agent/auth/cert/cert_test.go
@@ -0,0 +1,132 @@
+package cert
+
+import (
+	"context"
+	"os"
+	"path"
+	"reflect"
+	"testing"
+
+	"github.com/hashicorp/go-hclog"
+	"github.com/hashicorp/vault/api"
+	"github.com/hashicorp/vault/command/agent/auth"
+)
+
+func TestCertAuthMethod_Authenticate(t *testing.T) {
+	config := &auth.AuthConfig{
+		Logger:    hclog.NewNullLogger(),
+		MountPath: "cert-test",
+		Config: map[string]interface{}{
+			"name": "foo",
+		},
+	}
+
+	method, err := NewCertAuthMethod(config)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	client, err := api.NewClient(nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	loginPath, _, authMap, err := method.Authenticate(context.Background(), client)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	expectedLoginPath := path.Join(config.MountPath, "/login")
+	if loginPath != expectedLoginPath {
+		t.Fatalf("mismatch on login path: got: %s, expected: %s", loginPath, expectedLoginPath)
+	}
+
+	expectedAuthMap := map[string]interface{}{
+		"name": config.Config["name"],
+	}
+	if !reflect.DeepEqual(authMap, expectedAuthMap) {
+		t.Fatalf("mismatch on login path:\ngot:\n\t%v\nexpected:\n\t%v", authMap, expectedAuthMap)
+	}
+}
+
+func TestCertAuthMethod_AuthClient_withoutCerts(t *testing.T) {
+	config := &auth.AuthConfig{
+		Logger:    hclog.NewNullLogger(),
+		MountPath: "cert-test",
+		Config: map[string]interface{}{
+			"name": "without-certs",
+		},
+	}
+
+	method, err := NewCertAuthMethod(config)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	client, err := api.NewClient(api.DefaultConfig())
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	clientToUse, err := method.(auth.AuthMethodWithClient).AuthClient(client)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if client != clientToUse {
+		t.Fatal("error: expected AuthClient to return back original client")
+	}
+}
+
+func TestCertAuthMethod_AuthClient_withCerts(t *testing.T) {
+	clientCert, err := os.Open("./test-fixtures/keys/cert.pem")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer clientCert.Close()
+
+	clientKey, err := os.Open("./test-fixtures/keys/key.pem")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer clientKey.Close()
+
+	config := &auth.AuthConfig{
+		Logger:    hclog.NewNullLogger(),
+		MountPath: "cert-test",
+		Config: map[string]interface{}{
+			"name":        "with-certs",
+			"client_cert": clientCert.Name(),
+			"client_key":  clientKey.Name(),
+		},
+	}
+
+	method, err := NewCertAuthMethod(config)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	client, err := api.NewClient(nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	clientToUse, err := method.(auth.AuthMethodWithClient).AuthClient(client)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if client == clientToUse {
+		t.Fatal("expected client from AuthClient to be different from original client")
+	}
+
+	// Call AuthClient again to get back the cached client
+	cachedClient, err := method.(auth.AuthMethodWithClient).AuthClient(client)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if cachedClient != clientToUse {
+		t.Fatal("expected client from AuthClient to return back a cached client")
+	}
+}
diff --git a/command/agentproxyshared/auth/cert/test-fixtures/keys/cert.pem b/command/agent/auth/cert/test-fixtures/keys/cert.pem
similarity index 100%
rename from command/agentproxyshared/auth/cert/test-fixtures/keys/cert.pem
rename to command/agent/auth/cert/test-fixtures/keys/cert.pem
diff --git a/command/agentproxyshared/auth/cert/test-fixtures/keys/key.pem b/command/agent/auth/cert/test-fixtures/keys/key.pem
similarity index 100%
rename from command/agentproxyshared/auth/cert/test-fixtures/keys/key.pem
rename to command/agent/auth/cert/test-fixtures/keys/key.pem
diff --git a/command/agentproxyshared/auth/cert/test-fixtures/keys/pkioutput b/command/agent/auth/cert/test-fixtures/keys/pkioutput
similarity index 100%
rename from command/agentproxyshared/auth/cert/test-fixtures/keys/pkioutput
rename to command/agent/auth/cert/test-fixtures/keys/pkioutput
diff --git a/command/agentproxyshared/auth/cert/test-fixtures/root/pkioutput b/command/agent/auth/cert/test-fixtures/root/pkioutput
similarity index 100%
rename from command/agentproxyshared/auth/cert/test-fixtures/root/pkioutput
rename to command/agent/auth/cert/test-fixtures/root/pkioutput
diff --git a/command/agentproxyshared/auth/cert/test-fixtures/root/root.crl b/command/agent/auth/cert/test-fixtures/root/root.crl
similarity index 100%
rename from command/agentproxyshared/auth/cert/test-fixtures/root/root.crl
rename to command/agent/auth/cert/test-fixtures/root/root.crl
diff --git a/command/agentproxyshared/auth/cert/test-fixtures/root/rootcacert.pem b/command/agent/auth/cert/test-fixtures/root/rootcacert.pem
similarity index 100%
rename from command/agentproxyshared/auth/cert/test-fixtures/root/rootcacert.pem
rename to command/agent/auth/cert/test-fixtures/root/rootcacert.pem
diff --git a/command/agentproxyshared/auth/cert/test-fixtures/root/rootcakey.pem b/command/agent/auth/cert/test-fixtures/root/rootcakey.pem
similarity index 100%
rename from command/agentproxyshared/auth/cert/test-fixtures/root/rootcakey.pem
rename to command/agent/auth/cert/test-fixtures/root/rootcakey.pem
diff --git a/command/agentproxyshared/auth/cf/cf.go b/command/agent/auth/cf/cf.go
similarity index 94%
rename from command/agentproxyshared/auth/cf/cf.go
rename to command/agent/auth/cf/cf.go
index 3ee2077fb7132..9508b7164f2be 100644
--- a/command/agentproxyshared/auth/cf/cf.go
+++ b/command/agent/auth/cf/cf.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package cf
 
 import (
@@ -15,7 +12,7 @@ import (
 	cf "github.com/hashicorp/vault-plugin-auth-cf"
 	"github.com/hashicorp/vault-plugin-auth-cf/signatures"
 	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/command/agentproxyshared/auth"
+	"github.com/hashicorp/vault/command/agent/auth"
 )
 
 type cfMethod struct {
diff --git a/command/agentproxyshared/auth/gcp/gcp.go b/command/agent/auth/gcp/gcp.go
similarity index 97%
rename from command/agentproxyshared/auth/gcp/gcp.go
rename to command/agent/auth/gcp/gcp.go
index bb7c6bab6d57f..45d9b74f9497b 100644
--- a/command/agentproxyshared/auth/gcp/gcp.go
+++ b/command/agent/auth/gcp/gcp.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package gcp
 
 import (
@@ -17,7 +14,7 @@ import (
 	hclog "github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/go-secure-stdlib/parseutil"
 	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/command/agentproxyshared/auth"
+	"github.com/hashicorp/vault/command/agent/auth"
 	"golang.org/x/oauth2"
 	"google.golang.org/api/iamcredentials/v1"
 )
diff --git a/command/agent/auth/jwt/jwt.go b/command/agent/auth/jwt/jwt.go
new file mode 100644
index 0000000000000..8f088eb199e5e
--- /dev/null
+++ b/command/agent/auth/jwt/jwt.go
@@ -0,0 +1,214 @@
+package jwt
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"io/fs"
+	"net/http"
+	"os"
+	"sync"
+	"sync/atomic"
+	"time"
+
+	hclog "github.com/hashicorp/go-hclog"
+	"github.com/hashicorp/vault/api"
+	"github.com/hashicorp/vault/command/agent/auth"
+	"github.com/hashicorp/vault/sdk/helper/parseutil"
+)
+
+type jwtMethod struct {
+	logger                hclog.Logger
+	path                  string
+	mountPath             string
+	role                  string
+	removeJWTAfterReading bool
+	credsFound            chan struct{}
+	watchCh               chan string
+	stopCh                chan struct{}
+	doneCh                chan struct{}
+	credSuccessGate       chan struct{}
+	ticker                *time.Ticker
+	once                  *sync.Once
+	latestToken           *atomic.Value
+}
+
+// NewJWTAuthMethod returns an implementation of Agent's auth.AuthMethod
+// interface for JWT auth.
+func NewJWTAuthMethod(conf *auth.AuthConfig) (auth.AuthMethod, error) {
+	if conf == nil {
+		return nil, errors.New("empty config")
+	}
+	if conf.Config == nil {
+		return nil, errors.New("empty config data")
+	}
+
+	j := &jwtMethod{
+		logger:                conf.Logger,
+		mountPath:             conf.MountPath,
+		removeJWTAfterReading: true,
+		credsFound:            make(chan struct{}),
+		watchCh:               make(chan string),
+		stopCh:                make(chan struct{}),
+		doneCh:                make(chan struct{}),
+		credSuccessGate:       make(chan struct{}),
+		once:                  new(sync.Once),
+		latestToken:           new(atomic.Value),
+	}
+	j.latestToken.Store("")
+
+	pathRaw, ok := conf.Config["path"]
+	if !ok {
+		return nil, errors.New("missing 'path' value")
+	}
+	j.path, ok = pathRaw.(string)
+	if !ok {
+		return nil, errors.New("could not convert 'path' config value to string")
+	}
+
+	roleRaw, ok := conf.Config["role"]
+	if !ok {
+		return nil, errors.New("missing 'role' value")
+	}
+	j.role, ok = roleRaw.(string)
+	if !ok {
+		return nil, errors.New("could not convert 'role' config value to string")
+	}
+
+	if removeJWTAfterReadingRaw, ok := conf.Config["remove_jwt_after_reading"]; ok {
+		removeJWTAfterReading, err := parseutil.ParseBool(removeJWTAfterReadingRaw)
+		if err != nil {
+			return nil, fmt.Errorf("error parsing 'remove_jwt_after_reading' value: %w", err)
+		}
+		j.removeJWTAfterReading = removeJWTAfterReading
+	}
+
+	switch {
+	case j.path == "":
+		return nil, errors.New("'path' value is empty")
+	case j.role == "":
+		return nil, errors.New("'role' value is empty")
+	}
+
+	// If we don't delete the JWT after reading, use a slower reload period,
+	// otherwise we would re-read the whole file every 500ms, instead of just
+	// doing a stat on the file every 500ms.
+	readPeriod := 1 * time.Minute
+	if j.removeJWTAfterReading {
+		readPeriod = 500 * time.Millisecond
+	}
+	j.ticker = time.NewTicker(readPeriod)
+
+	go j.runWatcher()
+
+	j.logger.Info("jwt auth method created", "path", j.path)
+
+	return j, nil
+}
+
+func (j *jwtMethod) Authenticate(_ context.Context, _ *api.Client) (string, http.Header, map[string]interface{}, error) {
+	j.logger.Trace("beginning authentication")
+
+	j.ingressToken()
+
+	latestToken := j.latestToken.Load().(string)
+	if latestToken == "" {
+		return "", nil, nil, errors.New("latest known jwt is empty, cannot authenticate")
+	}
+
+	return fmt.Sprintf("%s/login", j.mountPath), nil, map[string]interface{}{
+		"role": j.role,
+		"jwt":  latestToken,
+	}, nil
+}
+
+func (j *jwtMethod) NewCreds() chan struct{} {
+	return j.credsFound
+}
+
+func (j *jwtMethod) CredSuccess() {
+	j.once.Do(func() {
+		close(j.credSuccessGate)
+	})
+}
+
+func (j *jwtMethod) Shutdown() {
+	j.ticker.Stop()
+	close(j.stopCh)
+	<-j.doneCh
+}
+
+func (j *jwtMethod) runWatcher() {
+	defer close(j.doneCh)
+
+	select {
+	case <-j.stopCh:
+		return
+
+	case <-j.credSuccessGate:
+		// We only start the next loop once we're initially successful,
+		// since at startup Authenticate will be called and we don't want
+		// to end up immediately reauthenticating by having found a new
+		// value
+	}
+
+	for {
+		select {
+		case <-j.stopCh:
+			return
+
+		case <-j.ticker.C:
+			latestToken := j.latestToken.Load().(string)
+			j.ingressToken()
+			newToken := j.latestToken.Load().(string)
+			if newToken != latestToken {
+				j.logger.Debug("new jwt file found")
+				j.credsFound <- struct{}{}
+			}
+		}
+	}
+}
+
+func (j *jwtMethod) ingressToken() {
+	fi, err := os.Lstat(j.path)
+	if err != nil {
+		if os.IsNotExist(err) {
+			return
+		}
+		j.logger.Error("error encountered stat'ing jwt file", "error", err)
+		return
+	}
+
+	// Check that the path refers to a file.
+	// If it's a symlink, it could still be a symlink to a directory,
+	// but os.ReadFile below will return a descriptive error.
+	switch mode := fi.Mode(); {
+	case mode.IsRegular():
+		// regular file
+	case mode&fs.ModeSymlink != 0:
+		// symlink
+	default:
+		j.logger.Error("jwt file is not a regular file or symlink")
+		return
+	}
+
+	token, err := os.ReadFile(j.path)
+	if err != nil {
+		j.logger.Error("failed to read jwt file", "error", err)
+		return
+	}
+
+	switch len(token) {
+	case 0:
+		j.logger.Warn("empty jwt file read")
+
+	default:
+		j.latestToken.Store(string(token))
+	}
+
+	if j.removeJWTAfterReading {
+		if err := os.Remove(j.path); err != nil {
+			j.logger.Error("error removing jwt file", "error", err)
+		}
+	}
+}
diff --git a/command/agent/auth/jwt/jwt_test.go b/command/agent/auth/jwt/jwt_test.go
new file mode 100644
index 0000000000000..8e9a2ae86c136
--- /dev/null
+++ b/command/agent/auth/jwt/jwt_test.go
@@ -0,0 +1,167 @@
+package jwt
+
+import (
+	"bytes"
+	"os"
+	"path"
+	"strings"
+	"sync/atomic"
+	"testing"
+
+	"github.com/hashicorp/go-hclog"
+	"github.com/hashicorp/vault/command/agent/auth"
+)
+
+func TestIngressToken(t *testing.T) {
+	const (
+		dir       = "dir"
+		file      = "file"
+		empty     = "empty"
+		missing   = "missing"
+		symlinked = "symlinked"
+	)
+
+	rootDir, err := os.MkdirTemp("", "vault-agent-jwt-auth-test")
+	if err != nil {
+		t.Fatalf("failed to create temp dir: %s", err)
+	}
+	defer os.RemoveAll(rootDir)
+
+	setupTestDir := func() string {
+		testDir, err := os.MkdirTemp(rootDir, "")
+		if err != nil {
+			t.Fatal(err)
+		}
+		err = os.WriteFile(path.Join(testDir, file), []byte("test"), 0o644)
+		if err != nil {
+			t.Fatal(err)
+		}
+		_, err = os.Create(path.Join(testDir, empty))
+		if err != nil {
+			t.Fatal(err)
+		}
+		err = os.Mkdir(path.Join(testDir, dir), 0o755)
+		if err != nil {
+			t.Fatal(err)
+		}
+		err = os.Symlink(path.Join(testDir, file), path.Join(testDir, symlinked))
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		return testDir
+	}
+
+	for _, tc := range []struct {
+		name      string
+		path      string
+		errString string
+	}{
+		{
+			"happy path",
+			file,
+			"",
+		},
+		{
+			"path is directory",
+			dir,
+			"[ERROR] jwt file is not a regular file or symlink",
+		},
+		{
+			"path is symlink",
+			symlinked,
+			"",
+		},
+		{
+			"path is missing (implies nothing for ingressToken to do)",
+			missing,
+			"",
+		},
+		{
+			"path is empty file",
+			empty,
+			"[WARN]  empty jwt file read",
+		},
+	} {
+		testDir := setupTestDir()
+		logBuffer := bytes.Buffer{}
+		jwtAuth := &jwtMethod{
+			logger: hclog.New(&hclog.LoggerOptions{
+				Output: &logBuffer,
+			}),
+			latestToken: new(atomic.Value),
+			path:        path.Join(testDir, tc.path),
+		}
+
+		jwtAuth.ingressToken()
+
+		if tc.errString != "" {
+			if !strings.Contains(logBuffer.String(), tc.errString) {
+				t.Fatal("logs did no contain expected error", tc.errString, logBuffer.String())
+			}
+		} else {
+			if strings.Contains(logBuffer.String(), "[ERROR]") || strings.Contains(logBuffer.String(), "[WARN]") {
+				t.Fatal("logs contained unexpected error", logBuffer.String())
+			}
+		}
+	}
+}
+
+func TestDeleteAfterReading(t *testing.T) {
+	for _, tc := range map[string]struct {
+		configValue  string
+		shouldDelete bool
+	}{
+		"default": {
+			"",
+			true,
+		},
+		"explicit true": {
+			"true",
+			true,
+		},
+		"false": {
+			"false",
+			false,
+		},
+	} {
+		rootDir, err := os.MkdirTemp("", "vault-agent-jwt-auth-test")
+		if err != nil {
+			t.Fatalf("failed to create temp dir: %s", err)
+		}
+		defer os.RemoveAll(rootDir)
+		tokenPath := path.Join(rootDir, "token")
+		err = os.WriteFile(tokenPath, []byte("test"), 0o644)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		config := &auth.AuthConfig{
+			Config: map[string]interface{}{
+				"path": tokenPath,
+				"role": "unusedrole",
+			},
+			Logger: hclog.Default(),
+		}
+		if tc.configValue != "" {
+			config.Config["remove_jwt_after_reading"] = tc.configValue
+		}
+
+		jwtAuth, err := NewJWTAuthMethod(config)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		jwtAuth.(*jwtMethod).ingressToken()
+
+		if _, err := os.Lstat(tokenPath); tc.shouldDelete {
+			if err == nil || !os.IsNotExist(err) {
+				t.Fatal(err)
+			}
+		} else {
+			if err != nil {
+				t.Fatal(err)
+			}
+		}
+	}
+}
diff --git a/command/agentproxyshared/auth/kerberos/integtest/integrationtest.sh b/command/agent/auth/kerberos/integtest/integrationtest.sh
similarity index 98%
rename from command/agentproxyshared/auth/kerberos/integtest/integrationtest.sh
rename to command/agent/auth/kerberos/integtest/integrationtest.sh
index b3d9edf65db9e..28da55f599cf6 100755
--- a/command/agentproxyshared/auth/kerberos/integtest/integrationtest.sh
+++ b/command/agent/auth/kerberos/integtest/integrationtest.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 # Instructions
 # This integration test is for the Vault Kerberos agent.
 # Before running, execute:
diff --git a/command/agentproxyshared/auth/kerberos/kerberos.go b/command/agent/auth/kerberos/kerberos.go
similarity index 95%
rename from command/agentproxyshared/auth/kerberos/kerberos.go
rename to command/agent/auth/kerberos/kerberos.go
index 67a3109f5f5ec..894c177d5c8a9 100644
--- a/command/agentproxyshared/auth/kerberos/kerberos.go
+++ b/command/agent/auth/kerberos/kerberos.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package kerberos
 
 import (
@@ -13,7 +10,7 @@ import (
 	"github.com/hashicorp/go-secure-stdlib/parseutil"
 	kerberos "github.com/hashicorp/vault-plugin-auth-kerberos"
 	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/command/agentproxyshared/auth"
+	"github.com/hashicorp/vault/command/agent/auth"
 	"github.com/jcmturner/gokrb5/v8/spnego"
 )
 
diff --git a/command/agentproxyshared/auth/kerberos/kerberos_test.go b/command/agent/auth/kerberos/kerberos_test.go
similarity index 94%
rename from command/agentproxyshared/auth/kerberos/kerberos_test.go
rename to command/agent/auth/kerberos/kerberos_test.go
index 070893d758767..4cfe3479ed4ce 100644
--- a/command/agentproxyshared/auth/kerberos/kerberos_test.go
+++ b/command/agent/auth/kerberos/kerberos_test.go
@@ -1,13 +1,10 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package kerberos
 
 import (
 	"testing"
 
 	"github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/vault/command/agentproxyshared/auth"
+	"github.com/hashicorp/vault/command/agent/auth"
 )
 
 func TestNewKerberosAuthMethod(t *testing.T) {
diff --git a/command/agentproxyshared/auth/kubernetes/kubernetes.go b/command/agent/auth/kubernetes/kubernetes.go
similarity index 95%
rename from command/agentproxyshared/auth/kubernetes/kubernetes.go
rename to command/agent/auth/kubernetes/kubernetes.go
index acbb8c044cb58..c30f3cb5a68b1 100644
--- a/command/agentproxyshared/auth/kubernetes/kubernetes.go
+++ b/command/agent/auth/kubernetes/kubernetes.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package kubernetes
 
 import (
@@ -15,7 +12,7 @@ import (
 
 	hclog "github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/command/agentproxyshared/auth"
+	"github.com/hashicorp/vault/command/agent/auth"
 )
 
 const (
diff --git a/command/agentproxyshared/auth/kubernetes/kubernetes_test.go b/command/agent/auth/kubernetes/kubernetes_test.go
similarity index 97%
rename from command/agentproxyshared/auth/kubernetes/kubernetes_test.go
rename to command/agent/auth/kubernetes/kubernetes_test.go
index cbf617029c6ab..34f965c770960 100644
--- a/command/agentproxyshared/auth/kubernetes/kubernetes_test.go
+++ b/command/agent/auth/kubernetes/kubernetes_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package kubernetes
 
 import (
@@ -12,7 +9,7 @@ import (
 
 	"github.com/hashicorp/errwrap"
 	hclog "github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/vault/command/agentproxyshared/auth"
+	"github.com/hashicorp/vault/command/agent/auth"
 	"github.com/hashicorp/vault/sdk/helper/logging"
 )
 
diff --git a/command/agent/auto_auth_preload_token_end_to_end_test.go b/command/agent/auto_auth_preload_token_end_to_end_test.go
index 004e817dac129..3f8d972a32cf7 100644
--- a/command/agent/auto_auth_preload_token_end_to_end_test.go
+++ b/command/agent/auto_auth_preload_token_end_to_end_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package agent
 
 import (
@@ -13,10 +10,10 @@ import (
 	hclog "github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/vault/api"
 	credAppRole "github.com/hashicorp/vault/builtin/credential/approle"
-	"github.com/hashicorp/vault/command/agentproxyshared/auth"
-	agentAppRole "github.com/hashicorp/vault/command/agentproxyshared/auth/approle"
-	"github.com/hashicorp/vault/command/agentproxyshared/sink"
-	"github.com/hashicorp/vault/command/agentproxyshared/sink/file"
+	"github.com/hashicorp/vault/command/agent/auth"
+	agentAppRole "github.com/hashicorp/vault/command/agent/auth/approle"
+	"github.com/hashicorp/vault/command/agent/sink"
+	"github.com/hashicorp/vault/command/agent/sink/file"
 	vaulthttp "github.com/hashicorp/vault/http"
 	"github.com/hashicorp/vault/sdk/helper/logging"
 	"github.com/hashicorp/vault/sdk/logical"
diff --git a/command/agent/aws_end_to_end_test.go b/command/agent/aws_end_to_end_test.go
index 08644bdc1d2e5..ca7b419648c75 100644
--- a/command/agent/aws_end_to_end_test.go
+++ b/command/agent/aws_end_to_end_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package agent
 
 import (
@@ -18,11 +15,10 @@ import (
 	uuid "github.com/hashicorp/go-uuid"
 	"github.com/hashicorp/vault/api"
 	vaultaws "github.com/hashicorp/vault/builtin/credential/aws"
-	"github.com/hashicorp/vault/command/agentproxyshared/auth"
-	agentaws "github.com/hashicorp/vault/command/agentproxyshared/auth/aws"
-	"github.com/hashicorp/vault/command/agentproxyshared/sink"
-	"github.com/hashicorp/vault/command/agentproxyshared/sink/file"
-	"github.com/hashicorp/vault/helper/testhelpers"
+	"github.com/hashicorp/vault/command/agent/auth"
+	agentaws "github.com/hashicorp/vault/command/agent/auth/aws"
+	"github.com/hashicorp/vault/command/agent/sink"
+	"github.com/hashicorp/vault/command/agent/sink/file"
 	vaulthttp "github.com/hashicorp/vault/http"
 	"github.com/hashicorp/vault/sdk/helper/logging"
 	"github.com/hashicorp/vault/sdk/logical"
@@ -51,14 +47,6 @@ func TestAWSEndToEnd(t *testing.T) {
 		t.SkipNow()
 	}
 
-	// Ensure each cred is populated.
-	credNames := []string{
-		envVarAwsTestAccessKey,
-		envVarAwsTestSecretKey,
-		envVarAwsTestRoleArn,
-	}
-	testhelpers.SkipUnlessEnvVarsSet(t, credNames)
-
 	logger := logging.NewVaultLogger(hclog.Trace)
 	coreConfig := &vault.CoreConfig{
 		Logger: logger,
diff --git a/command/agent/cache/api_proxy.go b/command/agent/cache/api_proxy.go
new file mode 100644
index 0000000000000..1a754e064ec16
--- /dev/null
+++ b/command/agent/cache/api_proxy.go
@@ -0,0 +1,146 @@
+package cache
+
+import (
+	"context"
+	"fmt"
+	"sync"
+
+	hclog "github.com/hashicorp/go-hclog"
+	"github.com/hashicorp/go-retryablehttp"
+	"github.com/hashicorp/vault/api"
+	"github.com/hashicorp/vault/http"
+)
+
+type EnforceConsistency int
+
+const (
+	EnforceConsistencyNever EnforceConsistency = iota
+	EnforceConsistencyAlways
+)
+
+type WhenInconsistentAction int
+
+const (
+	WhenInconsistentFail WhenInconsistentAction = iota
+	WhenInconsistentRetry
+	WhenInconsistentForward
+)
+
+// APIProxy is an implementation of the proxier interface that is used to
+// forward the request to Vault and get the response.
+type APIProxy struct {
+	client                 *api.Client
+	logger                 hclog.Logger
+	enforceConsistency     EnforceConsistency
+	whenInconsistentAction WhenInconsistentAction
+	l                      sync.RWMutex
+	lastIndexStates        []string
+}
+
+var _ Proxier = &APIProxy{}
+
+type APIProxyConfig struct {
+	Client                 *api.Client
+	Logger                 hclog.Logger
+	EnforceConsistency     EnforceConsistency
+	WhenInconsistentAction WhenInconsistentAction
+}
+
+func NewAPIProxy(config *APIProxyConfig) (Proxier, error) {
+	if config.Client == nil {
+		return nil, fmt.Errorf("nil API client")
+	}
+	return &APIProxy{
+		client:                 config.Client,
+		logger:                 config.Logger,
+		enforceConsistency:     config.EnforceConsistency,
+		whenInconsistentAction: config.WhenInconsistentAction,
+	}, nil
+}
+
+func (ap *APIProxy) Send(ctx context.Context, req *SendRequest) (*SendResponse, error) {
+	client, err := ap.client.Clone()
+	if err != nil {
+		return nil, err
+	}
+	client.SetToken(req.Token)
+
+	// Derive and set a logger for the client
+	clientLogger := ap.logger.Named("client")
+	client.SetLogger(clientLogger)
+
+	// http.Transport will transparently request gzip and decompress the response, but only if
+	// the client doesn't manually set the header. Removing any Accept-Encoding header allows the
+	// transparent compression to occur.
+	req.Request.Header.Del("Accept-Encoding")
+	client.SetHeaders(req.Request.Header)
+
+	fwReq := client.NewRequest(req.Request.Method, req.Request.URL.Path)
+	fwReq.BodyBytes = req.RequestBody
+
+	query := req.Request.URL.Query()
+	if len(query) != 0 {
+		fwReq.Params = query
+	}
+
+	var newState string
+	manageState := ap.enforceConsistency == EnforceConsistencyAlways &&
+		req.Request.Header.Get(http.VaultIndexHeaderName) == "" &&
+		req.Request.Header.Get(http.VaultForwardHeaderName) == "" &&
+		req.Request.Header.Get(http.VaultInconsistentHeaderName) == ""
+
+	if manageState {
+		client = client.WithResponseCallbacks(api.RecordState(&newState))
+		ap.l.RLock()
+		lastStates := ap.lastIndexStates
+		ap.l.RUnlock()
+		if len(lastStates) != 0 {
+			client = client.WithRequestCallbacks(api.RequireState(lastStates...))
+			switch ap.whenInconsistentAction {
+			case WhenInconsistentFail:
+				// In this mode we want to delegate handling of inconsistency
+				// failures to the external client talking to Agent.
+				client.SetCheckRetry(retryablehttp.DefaultRetryPolicy)
+			case WhenInconsistentRetry:
+				// In this mode we want to handle retries due to inconsistency
+				// internally.  This is the default api.Client behaviour so
+				// we needn't do anything.
+			case WhenInconsistentForward:
+				fwReq.Headers.Set(http.VaultInconsistentHeaderName, http.VaultInconsistentForward)
+			}
+		}
+	}
+
+	// Make the request to Vault and get the response
+	ap.logger.Info("forwarding request to Vault", "method", req.Request.Method, "path", req.Request.URL.Path)
+
+	resp, err := client.RawRequestWithContext(ctx, fwReq)
+	if resp == nil && err != nil {
+		// We don't want to cache nil responses, so we simply return the error
+		return nil, err
+	}
+
+	if newState != "" {
+		ap.l.Lock()
+		// We want to be using the "newest" states seen, but newer isn't well
+		// defined here.  There can be two states S1 and S2 which aren't strictly ordered:
+		// S1 could have a newer localindex and S2 could have a newer replicatedindex.  So
+		// we need to merge them.  But we can't merge them because we wouldn't be able to
+		// "sign" the resulting header because we don't have access to the HMAC key that
+		// Vault uses to do so.  So instead we compare any of the 0-2 saved states
+		// we have to the new header, keeping the newest 1-2 of these, and sending
+		// them to Vault to evaluate.
+		ap.lastIndexStates = api.MergeReplicationStates(ap.lastIndexStates, newState)
+		ap.l.Unlock()
+	}
+
+	// Before error checking from the request call, we'd want to initialize a SendResponse to
+	// potentially return
+	sendResponse, newErr := NewSendResponse(resp, nil)
+	if newErr != nil {
+		return nil, newErr
+	}
+
+	// Bubble back the api.Response as well for error checking/handling at the handler layer.
+	return sendResponse, err
+}
diff --git a/command/agent/cache/api_proxy_test.go b/command/agent/cache/api_proxy_test.go
new file mode 100644
index 0000000000000..b90f579c3f000
--- /dev/null
+++ b/command/agent/cache/api_proxy_test.go
@@ -0,0 +1,95 @@
+package cache
+
+import (
+	"net/http"
+	"testing"
+
+	"github.com/hashicorp/go-hclog"
+	"github.com/hashicorp/vault/api"
+	"github.com/hashicorp/vault/helper/namespace"
+	"github.com/hashicorp/vault/sdk/helper/jsonutil"
+	"github.com/hashicorp/vault/sdk/helper/logging"
+)
+
+func TestAPIProxy(t *testing.T) {
+	cleanup, client, _, _ := setupClusterAndAgent(namespace.RootContext(nil), t, nil)
+	defer cleanup()
+
+	proxier, err := NewAPIProxy(&APIProxyConfig{
+		Client: client,
+		Logger: logging.NewVaultLogger(hclog.Trace),
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	r := client.NewRequest("GET", "/v1/sys/health")
+	req, err := r.ToHTTP()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	resp, err := proxier.Send(namespace.RootContext(nil), &SendRequest{
+		Request: req,
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	var result api.HealthResponse
+	err = jsonutil.DecodeJSONFromReader(resp.Response.Body, &result)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if !result.Initialized || result.Sealed || result.Standby {
+		t.Fatalf("bad sys/health response: %#v", result)
+	}
+}
+
+func TestAPIProxy_queryParams(t *testing.T) {
+	// Set up an agent that points to a standby node for this particular test
+	// since it needs to proxy a /sys/health?standbyok=true request to a standby
+	cleanup, client, _, _ := setupClusterAndAgentOnStandby(namespace.RootContext(nil), t, nil)
+	defer cleanup()
+
+	proxier, err := NewAPIProxy(&APIProxyConfig{
+		Client: client,
+		Logger: logging.NewVaultLogger(hclog.Trace),
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	r := client.NewRequest("GET", "/v1/sys/health")
+	req, err := r.ToHTTP()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Add a query parameter for testing
+	q := req.URL.Query()
+	q.Add("standbyok", "true")
+	req.URL.RawQuery = q.Encode()
+
+	resp, err := proxier.Send(namespace.RootContext(nil), &SendRequest{
+		Request: req,
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	var result api.HealthResponse
+	err = jsonutil.DecodeJSONFromReader(resp.Response.Body, &result)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if !result.Initialized || result.Sealed || !result.Standby {
+		t.Fatalf("bad sys/health response: %#v", result)
+	}
+
+	if resp.Response.StatusCode != http.StatusOK {
+		t.Fatalf("exptected standby to return 200, got: %v", resp.Response.StatusCode)
+	}
+}
diff --git a/command/agentproxyshared/cache/cache_test.go b/command/agent/cache/cache_test.go
similarity index 84%
rename from command/agentproxyshared/cache/cache_test.go
rename to command/agent/cache/cache_test.go
index 4786950bd5a01..8b2e1caa7155f 100644
--- a/command/agentproxyshared/cache/cache_test.go
+++ b/command/agent/cache/cache_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package cache
 
 import (
@@ -11,6 +8,7 @@ import (
 	"math/rand"
 	"net"
 	"net/http"
+	"os"
 	"sync"
 	"testing"
 	"time"
@@ -19,8 +17,9 @@ import (
 	"github.com/hashicorp/go-hclog"
 	kv "github.com/hashicorp/vault-plugin-secrets-kv"
 	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/command/agentproxyshared/cache/cachememdb"
-	"github.com/hashicorp/vault/command/agentproxyshared/sink/mock"
+	"github.com/hashicorp/vault/builtin/credential/userpass"
+	"github.com/hashicorp/vault/command/agent/cache/cachememdb"
+	"github.com/hashicorp/vault/command/agent/sink/mock"
 	"github.com/hashicorp/vault/helper/namespace"
 	vaulthttp "github.com/hashicorp/vault/http"
 	"github.com/hashicorp/vault/sdk/helper/consts"
@@ -29,6 +28,174 @@ import (
 	"github.com/hashicorp/vault/vault"
 )
 
+const policyAdmin = `
+path "*" {
+	capabilities = ["sudo", "create", "read", "update", "delete", "list"]
+}
+`
+
+// setupClusterAndAgent is a helper func used to set up a test cluster and
+// caching agent against the active node. It returns a cleanup func that should
+// be deferred immediately along with two clients, one for direct cluster
+// communication and another to talk to the caching agent.
+func setupClusterAndAgent(ctx context.Context, t *testing.T, coreConfig *vault.CoreConfig) (func(), *api.Client, *api.Client, *LeaseCache) {
+	return setupClusterAndAgentCommon(ctx, t, coreConfig, false)
+}
+
+// setupClusterAndAgentOnStandby is a helper func used to set up a test cluster
+// and caching agent against a standby node. It returns a cleanup func that
+// should be deferred immediately along with two clients, one for direct cluster
+// communication and another to talk to the caching agent.
+func setupClusterAndAgentOnStandby(ctx context.Context, t *testing.T, coreConfig *vault.CoreConfig) (func(), *api.Client, *api.Client, *LeaseCache) {
+	return setupClusterAndAgentCommon(ctx, t, coreConfig, true)
+}
+
+func setupClusterAndAgentCommon(ctx context.Context, t *testing.T, coreConfig *vault.CoreConfig, onStandby bool) (func(), *api.Client, *api.Client, *LeaseCache) {
+	t.Helper()
+
+	if ctx == nil {
+		ctx = context.Background()
+	}
+
+	// Handle sane defaults
+	if coreConfig == nil {
+		coreConfig = &vault.CoreConfig{
+			DisableMlock: true,
+			DisableCache: true,
+			Logger:       logging.NewVaultLogger(hclog.Trace),
+		}
+	}
+
+	// Always set up the userpass backend since we use that to generate an admin
+	// token for the client that will make proxied requests to through the agent.
+	if coreConfig.CredentialBackends == nil || coreConfig.CredentialBackends["userpass"] == nil {
+		coreConfig.CredentialBackends = map[string]logical.Factory{
+			"userpass": userpass.Factory,
+		}
+	}
+
+	// Init new test cluster
+	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+	})
+	cluster.Start()
+
+	cores := cluster.Cores
+	vault.TestWaitActive(t, cores[0].Core)
+
+	activeClient := cores[0].Client
+	standbyClient := cores[1].Client
+
+	// clienToUse is the client for the agent to point to.
+	clienToUse := activeClient
+	if onStandby {
+		clienToUse = standbyClient
+	}
+
+	// Add an admin policy
+	if err := activeClient.Sys().PutPolicy("admin", policyAdmin); err != nil {
+		t.Fatal(err)
+	}
+
+	// Set up the userpass auth backend and an admin user. Used for getting a token
+	// for the agent later down in this func.
+	err := activeClient.Sys().EnableAuthWithOptions("userpass", &api.EnableAuthOptions{
+		Type: "userpass",
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	_, err = activeClient.Logical().Write("auth/userpass/users/foo", map[string]interface{}{
+		"password": "bar",
+		"policies": []string{"admin"},
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Set up env vars for agent consumption
+	origEnvVaultAddress := os.Getenv(api.EnvVaultAddress)
+	os.Setenv(api.EnvVaultAddress, clienToUse.Address())
+
+	origEnvVaultCACert := os.Getenv(api.EnvVaultCACert)
+	os.Setenv(api.EnvVaultCACert, fmt.Sprintf("%s/ca_cert.pem", cluster.TempDir))
+
+	cacheLogger := logging.NewVaultLogger(hclog.Trace).Named("cache")
+
+	listener, err := net.Listen("tcp", "127.0.0.1:0")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Create the API proxier
+	apiProxy, err := NewAPIProxy(&APIProxyConfig{
+		Client: clienToUse,
+		Logger: cacheLogger.Named("apiproxy"),
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Create the lease cache proxier and set its underlying proxier to
+	// the API proxier.
+	leaseCache, err := NewLeaseCache(&LeaseCacheConfig{
+		Client:      clienToUse,
+		BaseContext: ctx,
+		Proxier:     apiProxy,
+		Logger:      cacheLogger.Named("leasecache"),
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Create a muxer and add paths relevant for the lease cache layer
+	mux := http.NewServeMux()
+	mux.Handle("/agent/v1/cache-clear", leaseCache.HandleCacheClear(ctx))
+
+	mux.Handle("/", Handler(ctx, cacheLogger, leaseCache, nil, true))
+	server := &http.Server{
+		Handler:           mux,
+		ReadHeaderTimeout: 10 * time.Second,
+		ReadTimeout:       30 * time.Second,
+		IdleTimeout:       5 * time.Minute,
+		ErrorLog:          cacheLogger.StandardLogger(nil),
+	}
+	go server.Serve(listener)
+
+	// testClient is the client that is used to talk to the agent for proxying/caching behavior.
+	testClient, err := activeClient.Clone()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if err := testClient.SetAddress("http://" + listener.Addr().String()); err != nil {
+		t.Fatal(err)
+	}
+
+	// Login via userpass method to derive a managed token. Set that token as the
+	// testClient's token
+	resp, err := testClient.Logical().Write("auth/userpass/login/foo", map[string]interface{}{
+		"password": "bar",
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	testClient.SetToken(resp.Auth.ClientToken)
+
+	cleanup := func() {
+		// We wait for a tiny bit for things such as agent renewal to exit properly
+		time.Sleep(50 * time.Millisecond)
+
+		cluster.Cleanup()
+		os.Setenv(api.EnvVaultAddress, origEnvVaultAddress)
+		os.Setenv(api.EnvVaultCACert, origEnvVaultCACert)
+		listener.Close()
+	}
+
+	return cleanup, clienToUse, testClient, leaseCache
+}
+
 func tokenRevocationValidation(t *testing.T, sampleSpace map[string]string, expected map[string]string, leaseCache *LeaseCache) {
 	t.Helper()
 	for val, valType := range sampleSpace {
@@ -81,7 +248,7 @@ func TestCache_AutoAuthTokenStripping(t *testing.T) {
 	mux := http.NewServeMux()
 	mux.Handle(consts.AgentPathCacheClear, leaseCache.HandleCacheClear(ctx))
 
-	mux.Handle("/", ProxyHandler(ctx, cacheLogger, leaseCache, mock.NewSink("testid"), true))
+	mux.Handle("/", Handler(ctx, cacheLogger, leaseCache, mock.NewSink("testid"), true))
 	server := &http.Server{
 		Handler:           mux,
 		ReadHeaderTimeout: 10 * time.Second,
@@ -170,7 +337,7 @@ func TestCache_AutoAuthClientTokenProxyStripping(t *testing.T) {
 	mux := http.NewServeMux()
 	// mux.Handle(consts.AgentPathCacheClear, leaseCache.HandleCacheClear(ctx))
 
-	mux.Handle("/", ProxyHandler(ctx, cacheLogger, leaseCache, mock.NewSink(realToken), false))
+	mux.Handle("/", Handler(ctx, cacheLogger, leaseCache, mock.NewSink(realToken), false))
 	server := &http.Server{
 		Handler:           mux,
 		ReadHeaderTimeout: 10 * time.Second,
diff --git a/command/agentproxyshared/cache/cacheboltdb/bolt.go b/command/agent/cache/cacheboltdb/bolt.go
similarity index 99%
rename from command/agentproxyshared/cache/cacheboltdb/bolt.go
rename to command/agent/cache/cacheboltdb/bolt.go
index 434b4116542a4..72cb7f3b82464 100644
--- a/command/agentproxyshared/cache/cacheboltdb/bolt.go
+++ b/command/agent/cache/cacheboltdb/bolt.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package cacheboltdb
 
 import (
diff --git a/command/agentproxyshared/cache/cacheboltdb/bolt_test.go b/command/agent/cache/cacheboltdb/bolt_test.go
similarity index 98%
rename from command/agentproxyshared/cache/cacheboltdb/bolt_test.go
rename to command/agent/cache/cacheboltdb/bolt_test.go
index 95aacd27cef03..d6f5a742ef34a 100644
--- a/command/agentproxyshared/cache/cacheboltdb/bolt_test.go
+++ b/command/agent/cache/cacheboltdb/bolt_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package cacheboltdb
 
 import (
@@ -16,7 +13,7 @@ import (
 
 	"github.com/golang/protobuf/proto"
 	"github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/vault/command/agentproxyshared/cache/keymanager"
+	"github.com/hashicorp/vault/command/agent/cache/keymanager"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	bolt "go.etcd.io/bbolt"
diff --git a/command/agentproxyshared/cache/cachememdb/cache_memdb.go b/command/agent/cache/cachememdb/cache_memdb.go
similarity index 98%
rename from command/agentproxyshared/cache/cachememdb/cache_memdb.go
rename to command/agent/cache/cachememdb/cache_memdb.go
index 93aa2bf78faf8..7fdad303bb569 100644
--- a/command/agentproxyshared/cache/cachememdb/cache_memdb.go
+++ b/command/agent/cache/cachememdb/cache_memdb.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package cachememdb
 
 import (
diff --git a/command/agentproxyshared/cache/cachememdb/cache_memdb_test.go b/command/agent/cache/cachememdb/cache_memdb_test.go
similarity index 99%
rename from command/agentproxyshared/cache/cachememdb/cache_memdb_test.go
rename to command/agent/cache/cachememdb/cache_memdb_test.go
index 87b8eee798b2f..4162fed0daf7b 100644
--- a/command/agentproxyshared/cache/cachememdb/cache_memdb_test.go
+++ b/command/agent/cache/cachememdb/cache_memdb_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package cachememdb
 
 import (
diff --git a/command/agentproxyshared/cache/cachememdb/index.go b/command/agent/cache/cachememdb/index.go
similarity index 98%
rename from command/agentproxyshared/cache/cachememdb/index.go
rename to command/agent/cache/cachememdb/index.go
index a7da2edc2514c..546a528cb2e40 100644
--- a/command/agentproxyshared/cache/cachememdb/index.go
+++ b/command/agent/cache/cachememdb/index.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package cachememdb
 
 import (
diff --git a/command/agentproxyshared/cache/cachememdb/index_test.go b/command/agent/cache/cachememdb/index_test.go
similarity index 94%
rename from command/agentproxyshared/cache/cachememdb/index_test.go
rename to command/agent/cache/cachememdb/index_test.go
index c59ec5cba3344..577e37d647cdc 100644
--- a/command/agentproxyshared/cache/cachememdb/index_test.go
+++ b/command/agent/cache/cachememdb/index_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package cachememdb
 
 import (
diff --git a/command/agentproxyshared/cache/handler.go b/command/agent/cache/handler.go
similarity index 94%
rename from command/agentproxyshared/cache/handler.go
rename to command/agent/cache/handler.go
index bfb4434dc22f1..60f9e046a0fa1 100644
--- a/command/agentproxyshared/cache/handler.go
+++ b/command/agent/cache/handler.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package cache
 
 import (
@@ -18,12 +15,12 @@ import (
 	"github.com/armon/go-metrics"
 	"github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/command/agentproxyshared/sink"
+	"github.com/hashicorp/vault/command/agent/sink"
 	"github.com/hashicorp/vault/sdk/helper/consts"
 	"github.com/hashicorp/vault/sdk/logical"
 )
 
-func ProxyHandler(ctx context.Context, logger hclog.Logger, proxier Proxier, inmemSink sink.Sink, proxyVaultToken bool) http.Handler {
+func Handler(ctx context.Context, logger hclog.Logger, proxier Proxier, inmemSink sink.Sink, proxyVaultToken bool) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		logger.Info("received request", "method", r.Method, "path", r.URL.Path)
 
@@ -39,7 +36,7 @@ func ProxyHandler(ctx context.Context, logger hclog.Logger, proxier Proxier, inm
 		}
 
 		// Parse and reset body.
-		reqBody, err := io.ReadAll(r.Body)
+		reqBody, err := ioutil.ReadAll(r.Body)
 		if err != nil {
 			logger.Error("failed to read request body")
 			logical.RespondError(w, http.StatusInternalServerError, errors.New("failed to read request body"))
@@ -48,7 +45,7 @@ func ProxyHandler(ctx context.Context, logger hclog.Logger, proxier Proxier, inm
 		if r.Body != nil {
 			r.Body.Close()
 		}
-		r.Body = io.NopCloser(bytes.NewReader(reqBody))
+		r.Body = ioutil.NopCloser(bytes.NewReader(reqBody))
 		req := &SendRequest{
 			Token:       token,
 			Request:     r,
diff --git a/command/agentproxyshared/cache/keymanager/manager.go b/command/agent/cache/keymanager/manager.go
similarity index 88%
rename from command/agentproxyshared/cache/keymanager/manager.go
rename to command/agent/cache/keymanager/manager.go
index 0cecc03a11f7d..ff4d0f2c00fa8 100644
--- a/command/agentproxyshared/cache/keymanager/manager.go
+++ b/command/agent/cache/keymanager/manager.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package keymanager
 
 import (
diff --git a/command/agentproxyshared/cache/keymanager/passthrough.go b/command/agent/cache/keymanager/passthrough.go
similarity index 96%
rename from command/agentproxyshared/cache/keymanager/passthrough.go
rename to command/agent/cache/keymanager/passthrough.go
index cda6b6e5db349..68a1fc221b623 100644
--- a/command/agentproxyshared/cache/keymanager/passthrough.go
+++ b/command/agent/cache/keymanager/passthrough.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package keymanager
 
 import (
diff --git a/command/agentproxyshared/cache/keymanager/passthrough_test.go b/command/agent/cache/keymanager/passthrough_test.go
similarity index 93%
rename from command/agentproxyshared/cache/keymanager/passthrough_test.go
rename to command/agent/cache/keymanager/passthrough_test.go
index 9327ee3f0ec63..084a71a143f26 100644
--- a/command/agentproxyshared/cache/keymanager/passthrough_test.go
+++ b/command/agent/cache/keymanager/passthrough_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package keymanager
 
 import (
diff --git a/command/agentproxyshared/cache/lease_cache.go b/command/agent/cache/lease_cache.go
similarity index 97%
rename from command/agentproxyshared/cache/lease_cache.go
rename to command/agent/cache/lease_cache.go
index 3bcb58002a6d6..9bc79d4a2713b 100644
--- a/command/agentproxyshared/cache/lease_cache.go
+++ b/command/agent/cache/lease_cache.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package cache
 
 import (
@@ -23,11 +20,10 @@ import (
 	"github.com/hashicorp/go-multierror"
 	"github.com/hashicorp/go-secure-stdlib/base62"
 	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/command/agentproxyshared/cache/cacheboltdb"
-	"github.com/hashicorp/vault/command/agentproxyshared/cache/cachememdb"
+	"github.com/hashicorp/vault/command/agent/cache/cacheboltdb"
+	"github.com/hashicorp/vault/command/agent/cache/cachememdb"
 	"github.com/hashicorp/vault/helper/namespace"
 	nshelper "github.com/hashicorp/vault/helper/namespace"
-	"github.com/hashicorp/vault/helper/useragent"
 	vaulthttp "github.com/hashicorp/vault/http"
 	"github.com/hashicorp/vault/sdk/helper/consts"
 	"github.com/hashicorp/vault/sdk/helper/cryptoutil"
@@ -174,12 +170,6 @@ func (c *LeaseCache) SetPersistentStorage(storageIn *cacheboltdb.BoltStorage) {
 	c.ps = storageIn
 }
 
-// PersistentStorage is a getter for the persistent storage field in
-// LeaseCache
-func (c *LeaseCache) PersistentStorage() *cacheboltdb.BoltStorage {
-	return c.ps
-}
-
 // checkCacheForRequest checks the cache for a particular request based on its
 // computed ID. It returns a non-nil *SendResponse  if an entry is found.
 func (c *LeaseCache) checkCacheForRequest(id string) (*SendResponse, error) {
@@ -484,18 +474,7 @@ func (c *LeaseCache) startRenewing(ctx context.Context, index *cachememdb.Index,
 		return
 	}
 	client.SetToken(req.Token)
-
-	headers := client.Headers()
-	if headers == nil {
-		headers = make(http.Header)
-	}
-
-	// We do not preserve the initial User-Agent here (i.e. use
-	// AgentProxyStringWithProxiedUserAgent) since these requests are from
-	// the proxy subsystem, but are made by Agent's lifetime watcher,
-	// not triggered by a specific request.
-	headers.Set("User-Agent", useragent.AgentProxyString())
-	client.SetHeaders(headers)
+	client.SetHeaders(req.Request.Header)
 
 	watcher, err := client.NewLifetimeWatcher(&api.LifetimeWatcherInput{
 		Secret: secret,
@@ -589,11 +568,6 @@ func computeIndexID(req *SendRequest) (string, error) {
 // HandleCacheClear returns a handlerFunc that can perform cache clearing operations.
 func (c *LeaseCache) HandleCacheClear(ctx context.Context) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		// If the cache is not enabled, return a 200
-		if c == nil {
-			return
-		}
-
 		// Only handle POST/PUT requests
 		switch r.Method {
 		case http.MethodPost:
diff --git a/command/agentproxyshared/cache/lease_cache_test.go b/command/agent/cache/lease_cache_test.go
similarity index 97%
rename from command/agentproxyshared/cache/lease_cache_test.go
rename to command/agent/cache/lease_cache_test.go
index 2de4c56b09bb5..1501fcfe56db0 100644
--- a/command/agentproxyshared/cache/lease_cache_test.go
+++ b/command/agent/cache/lease_cache_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package cache
 
 import (
@@ -21,10 +18,9 @@ import (
 	hclog "github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/go-multierror"
 	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/command/agentproxyshared/cache/cacheboltdb"
-	"github.com/hashicorp/vault/command/agentproxyshared/cache/cachememdb"
-	"github.com/hashicorp/vault/command/agentproxyshared/cache/keymanager"
-	"github.com/hashicorp/vault/helper/useragent"
+	"github.com/hashicorp/vault/command/agent/cache/cacheboltdb"
+	"github.com/hashicorp/vault/command/agent/cache/cachememdb"
+	"github.com/hashicorp/vault/command/agent/cache/keymanager"
 	vaulthttp "github.com/hashicorp/vault/http"
 	"github.com/hashicorp/vault/sdk/helper/consts"
 	"github.com/hashicorp/vault/sdk/helper/logging"
@@ -43,7 +39,7 @@ func testNewLeaseCache(t *testing.T, responses []*SendResponse) *LeaseCache {
 	lc, err := NewLeaseCache(&LeaseCacheConfig{
 		Client:      client,
 		BaseContext: context.Background(),
-		Proxier:     NewMockProxier(responses),
+		Proxier:     newMockProxier(responses),
 		Logger:      logging.NewVaultLogger(hclog.Trace).Named("cache.leasecache"),
 	})
 	if err != nil {
@@ -82,7 +78,7 @@ func testNewLeaseCacheWithPersistence(t *testing.T, responses []*SendResponse, s
 	lc, err := NewLeaseCache(&LeaseCacheConfig{
 		Client:      client,
 		BaseContext: context.Background(),
-		Proxier:     NewMockProxier(responses),
+		Proxier:     newMockProxier(responses),
 		Logger:      logging.NewVaultLogger(hclog.Trace).Named("cache.leasecache"),
 		Storage:     storage,
 	})
@@ -738,7 +734,7 @@ func compareBeforeAndAfter(t *testing.T, before, after *LeaseCache, beforeLen, a
 		assert.Equal(t, cachedItem.Lease, restoredItem.Lease)
 		assert.Equal(t, cachedItem.LeaseToken, restoredItem.LeaseToken)
 		assert.Equal(t, cachedItem.Namespace, restoredItem.Namespace)
-		assert.EqualValues(t, cachedItem.RequestHeader, restoredItem.RequestHeader)
+		assert.Equal(t, cachedItem.RequestHeader, restoredItem.RequestHeader)
 		assert.Equal(t, cachedItem.RequestMethod, restoredItem.RequestMethod)
 		assert.Equal(t, cachedItem.RequestPath, restoredItem.RequestPath)
 		assert.Equal(t, cachedItem.RequestToken, restoredItem.RequestToken)
@@ -843,21 +839,16 @@ func TestLeaseCache_PersistAndRestore(t *testing.T) {
 	var deleteIDs []string
 	for i, ct := range cacheTests {
 		// Send once to cache
-		req := httptest.NewRequest(ct.method, ct.urlPath, strings.NewReader(ct.body))
-		req.Header.Set("User-Agent", useragent.AgentProxyString())
-
 		sendReq := &SendRequest{
 			Token:   ct.token,
-			Request: req,
+			Request: httptest.NewRequest(ct.method, ct.urlPath, strings.NewReader(ct.body)),
 		}
 		if ct.deleteFromPersistentStore {
 			deleteID, err := computeIndexID(sendReq)
 			require.NoError(t, err)
 			deleteIDs = append(deleteIDs, deleteID)
 			// Now reset the body after calculating the index
-			req = httptest.NewRequest(ct.method, ct.urlPath, strings.NewReader(ct.body))
-			req.Header.Set("User-Agent", useragent.AgentProxyString())
-			sendReq.Request = req
+			sendReq.Request = httptest.NewRequest(ct.method, ct.urlPath, strings.NewReader(ct.body))
 		}
 		resp, err := lc.Send(context.Background(), sendReq)
 		require.NoError(t, err)
@@ -866,11 +857,9 @@ func TestLeaseCache_PersistAndRestore(t *testing.T) {
 
 		// Send again to test cache. If this isn't cached, the response returned
 		// will be the next in the list and the status code will not match.
-		req = httptest.NewRequest(ct.method, ct.urlPath, strings.NewReader(ct.body))
-		req.Header.Set("User-Agent", useragent.AgentProxyString())
 		sendCacheReq := &SendRequest{
 			Token:   ct.token,
-			Request: req,
+			Request: httptest.NewRequest(ct.method, ct.urlPath, strings.NewReader(ct.body)),
 		}
 		respCached, err := lc.Send(context.Background(), sendCacheReq)
 		require.NoError(t, err, "failed to send request %+v", ct)
@@ -902,11 +891,9 @@ func TestLeaseCache_PersistAndRestore(t *testing.T) {
 	// And finally send the cache requests once to make sure they're all being
 	// served from the restoredCache unless they were intended to be missing after restore.
 	for i, ct := range cacheTests {
-		req := httptest.NewRequest(ct.method, ct.urlPath, strings.NewReader(ct.body))
-		req.Header.Set("User-Agent", useragent.AgentProxyString())
 		sendCacheReq := &SendRequest{
 			Token:   ct.token,
-			Request: req,
+			Request: httptest.NewRequest(ct.method, ct.urlPath, strings.NewReader(ct.body)),
 		}
 		respCached, err := restoredCache.Send(context.Background(), sendCacheReq)
 		require.NoError(t, err, "failed to send request %+v", ct)
diff --git a/command/agent/cache/listener.go b/command/agent/cache/listener.go
new file mode 100644
index 0000000000000..c11867ac13a53
--- /dev/null
+++ b/command/agent/cache/listener.go
@@ -0,0 +1,68 @@
+package cache
+
+import (
+	"crypto/tls"
+	"fmt"
+	"net"
+	"strings"
+
+	"github.com/hashicorp/vault/command/server"
+	"github.com/hashicorp/vault/internalshared/configutil"
+	"github.com/hashicorp/vault/internalshared/listenerutil"
+)
+
+func StartListener(lnConfig *configutil.Listener) (net.Listener, *tls.Config, error) {
+	addr := lnConfig.Address
+
+	var ln net.Listener
+	var err error
+	switch lnConfig.Type {
+	case "tcp":
+		if addr == "" {
+			addr = "127.0.0.1:8200"
+		}
+
+		bindProto := "tcp"
+		// If they've passed 0.0.0.0, we only want to bind on IPv4
+		// rather than golang's dual stack default
+		if strings.HasPrefix(addr, "0.0.0.0:") {
+			bindProto = "tcp4"
+		}
+
+		ln, err = net.Listen(bindProto, addr)
+		if err != nil {
+			return nil, nil, err
+		}
+		ln = &server.TCPKeepAliveListener{ln.(*net.TCPListener)}
+
+	case "unix":
+		var uConfig *listenerutil.UnixSocketsConfig
+		if lnConfig.SocketMode != "" &&
+			lnConfig.SocketUser != "" &&
+			lnConfig.SocketGroup != "" {
+			uConfig = &listenerutil.UnixSocketsConfig{
+				Mode:  lnConfig.SocketMode,
+				User:  lnConfig.SocketUser,
+				Group: lnConfig.SocketGroup,
+			}
+		}
+		ln, err = listenerutil.UnixSocketListener(addr, uConfig)
+		if err != nil {
+			return nil, nil, err
+		}
+
+	default:
+		return nil, nil, fmt.Errorf("invalid listener type: %q", lnConfig.Type)
+	}
+
+	props := map[string]string{"addr": ln.Addr().String()}
+	tlsConf, _, err := listenerutil.TLSConfig(lnConfig, props, nil)
+	if err != nil {
+		return nil, nil, err
+	}
+	if tlsConf != nil {
+		ln = tls.NewListener(ln, tlsConf)
+	}
+
+	return ln, tlsConf, nil
+}
diff --git a/command/agent/cache/proxy.go b/command/agent/cache/proxy.go
new file mode 100644
index 0000000000000..ef7a83711f378
--- /dev/null
+++ b/command/agent/cache/proxy.go
@@ -0,0 +1,76 @@
+package cache
+
+import (
+	"bytes"
+	"context"
+	"io/ioutil"
+	"net/http"
+	"time"
+
+	"github.com/hashicorp/vault/api"
+)
+
+// SendRequest is the input for Proxier.Send.
+type SendRequest struct {
+	Token   string
+	Request *http.Request
+
+	// RequestBody is the stored body bytes from Request.Body. It is set here to
+	// avoid reading and re-setting the stream multiple times.
+	RequestBody []byte
+}
+
+// SendResponse is the output from Proxier.Send.
+type SendResponse struct {
+	Response *api.Response
+
+	// ResponseBody is the stored body bytes from Response.Body. It is set here to
+	// avoid reading and re-setting the stream multiple times.
+	ResponseBody []byte
+	CacheMeta    *CacheMeta
+}
+
+// CacheMeta contains metadata information about the response,
+// such as whether it was a cache hit or miss, and the age of the
+// cached entry.
+type CacheMeta struct {
+	Hit bool
+	Age time.Duration
+}
+
+// Proxier is the interface implemented by different components that are
+// responsible for performing specific tasks, such as caching and proxying. All
+// these tasks combined together would serve the request received by the agent.
+type Proxier interface {
+	Send(ctx context.Context, req *SendRequest) (*SendResponse, error)
+}
+
+// NewSendResponse creates a new SendResponse and takes care of initializing its
+// fields properly.
+func NewSendResponse(apiResponse *api.Response, responseBody []byte) (*SendResponse, error) {
+	resp := &SendResponse{
+		Response:  apiResponse,
+		CacheMeta: &CacheMeta{},
+	}
+
+	// If a response body is separately provided we set that as the SendResponse.ResponseBody,
+	// otherwise we will do an ioutil.ReadAll to extract the response body from apiResponse.
+	switch {
+	case len(responseBody) > 0:
+		resp.ResponseBody = responseBody
+	case apiResponse.Body != nil:
+		respBody, err := ioutil.ReadAll(apiResponse.Body)
+		if err != nil {
+			return nil, err
+		}
+		// Close the old body
+		apiResponse.Body.Close()
+
+		// Re-set the response body after reading from the Reader
+		apiResponse.Body = ioutil.NopCloser(bytes.NewReader(respBody))
+
+		resp.ResponseBody = respBody
+	}
+
+	return resp, nil
+}
diff --git a/command/agent/cache/testing.go b/command/agent/cache/testing.go
new file mode 100644
index 0000000000000..9ec637be4e0e5
--- /dev/null
+++ b/command/agent/cache/testing.go
@@ -0,0 +1,107 @@
+package cache
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"math/rand"
+	"net/http"
+	"strings"
+	"time"
+
+	"github.com/hashicorp/vault/api"
+)
+
+// mockProxier is a mock implementation of the Proxier interface, used for testing purposes.
+// The mock will return the provided responses every time it reaches its Send method, up to
+// the last provided response. This lets tests control what the next/underlying Proxier layer
+// might expect to return.
+type mockProxier struct {
+	proxiedResponses []*SendResponse
+	responseIndex    int
+}
+
+func newMockProxier(responses []*SendResponse) *mockProxier {
+	return &mockProxier{
+		proxiedResponses: responses,
+	}
+}
+
+func (p *mockProxier) Send(ctx context.Context, req *SendRequest) (*SendResponse, error) {
+	if p.responseIndex >= len(p.proxiedResponses) {
+		return nil, fmt.Errorf("index out of bounds: responseIndex = %d, responses = %d", p.responseIndex, len(p.proxiedResponses))
+	}
+	resp := p.proxiedResponses[p.responseIndex]
+
+	p.responseIndex++
+
+	return resp, nil
+}
+
+func (p *mockProxier) ResponseIndex() int {
+	return p.responseIndex
+}
+
+func newTestSendResponse(status int, body string) *SendResponse {
+	resp := &SendResponse{
+		Response: &api.Response{
+			Response: &http.Response{
+				StatusCode: status,
+				Header:     http.Header{},
+			},
+		},
+	}
+	resp.Response.Header.Set("Date", time.Now().Format(http.TimeFormat))
+
+	if body != "" {
+		resp.Response.Body = ioutil.NopCloser(strings.NewReader(body))
+		resp.ResponseBody = []byte(body)
+	}
+
+	if json.Valid([]byte(body)) {
+		resp.Response.Header.Set("content-type", "application/json")
+	}
+
+	return resp
+}
+
+type mockTokenVerifierProxier struct {
+	currentToken string
+}
+
+func (p *mockTokenVerifierProxier) Send(ctx context.Context, req *SendRequest) (*SendResponse, error) {
+	p.currentToken = req.Token
+	resp := newTestSendResponse(http.StatusOK,
+		`{"data": {"id": "`+p.currentToken+`"}}`)
+
+	return resp, nil
+}
+
+func (p *mockTokenVerifierProxier) GetCurrentRequestToken() string {
+	return p.currentToken
+}
+
+type mockDelayProxier struct {
+	cacheableResp bool
+	delay         int
+}
+
+func (p *mockDelayProxier) Send(ctx context.Context, req *SendRequest) (*SendResponse, error) {
+	if p.delay > 0 {
+		select {
+		case <-ctx.Done():
+			return nil, ctx.Err()
+		case <-time.After(time.Duration(p.delay) * time.Millisecond):
+		}
+	}
+
+	// If this is a cacheable response, we return a unique response every time
+	if p.cacheableResp {
+		rand.Seed(time.Now().Unix())
+		s := fmt.Sprintf(`{"lease_id": "%d", "renewable": true, "data": {"foo": "bar"}}`, rand.Int())
+		return newTestSendResponse(http.StatusOK, s), nil
+	}
+
+	return newTestSendResponse(http.StatusOK, `{"value": "output"}`), nil
+}
diff --git a/command/agent/cache_end_to_end_test.go b/command/agent/cache_end_to_end_test.go
index a2a359abc9bd9..4ad056a850ccf 100644
--- a/command/agent/cache_end_to_end_test.go
+++ b/command/agent/cache_end_to_end_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package agent
 
 import (
@@ -17,13 +14,12 @@ import (
 	log "github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/vault/api"
 	credAppRole "github.com/hashicorp/vault/builtin/credential/approle"
-	"github.com/hashicorp/vault/command/agentproxyshared/auth"
-	agentapprole "github.com/hashicorp/vault/command/agentproxyshared/auth/approle"
-	cache "github.com/hashicorp/vault/command/agentproxyshared/cache"
-	"github.com/hashicorp/vault/command/agentproxyshared/sink"
-	"github.com/hashicorp/vault/command/agentproxyshared/sink/file"
-	"github.com/hashicorp/vault/command/agentproxyshared/sink/inmem"
-	"github.com/hashicorp/vault/helper/useragent"
+	"github.com/hashicorp/vault/command/agent/auth"
+	agentapprole "github.com/hashicorp/vault/command/agent/auth/approle"
+	"github.com/hashicorp/vault/command/agent/cache"
+	"github.com/hashicorp/vault/command/agent/sink"
+	"github.com/hashicorp/vault/command/agent/sink/file"
+	"github.com/hashicorp/vault/command/agent/sink/inmem"
 	vaulthttp "github.com/hashicorp/vault/http"
 	"github.com/hashicorp/vault/sdk/helper/consts"
 	"github.com/hashicorp/vault/sdk/helper/logging"
@@ -167,10 +163,8 @@ func TestCache_UsingAutoAuthToken(t *testing.T) {
 
 	// Create the API proxier
 	apiProxy, err := cache.NewAPIProxy(&cache.APIProxyConfig{
-		Client:                  client,
-		Logger:                  cacheLogger.Named("apiproxy"),
-		UserAgentStringFunction: useragent.ProxyStringWithProxiedUserAgent,
-		UserAgentString:         useragent.ProxyAPIProxyString(),
+		Client: client,
+		Logger: cacheLogger.Named("apiproxy"),
 	})
 	if err != nil {
 		t.Fatal(err)
@@ -321,7 +315,7 @@ func TestCache_UsingAutoAuthToken(t *testing.T) {
 	mux.Handle(consts.AgentPathCacheClear, leaseCache.HandleCacheClear(ctx))
 
 	// Passing a non-nil inmemsink tells the agent to use the auto-auth token
-	mux.Handle("/", cache.ProxyHandler(ctx, cacheLogger, leaseCache, inmemSink, true))
+	mux.Handle("/", cache.Handler(ctx, cacheLogger, leaseCache, inmemSink, true))
 	server := &http.Server{
 		Handler:           mux,
 		ReadHeaderTimeout: 10 * time.Second,
diff --git a/command/agent/cert_end_to_end_test.go b/command/agent/cert_end_to_end_test.go
index 12ea933ed60e6..bacb188021cda 100644
--- a/command/agent/cert_end_to_end_test.go
+++ b/command/agent/cert_end_to_end_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package agent
 
 import (
@@ -12,14 +9,16 @@ import (
 	"testing"
 	"time"
 
+	"github.com/hashicorp/vault/builtin/logical/pki"
+
 	hclog "github.com/hashicorp/go-hclog"
+
 	"github.com/hashicorp/vault/api"
 	vaultcert "github.com/hashicorp/vault/builtin/credential/cert"
-	"github.com/hashicorp/vault/builtin/logical/pki"
-	"github.com/hashicorp/vault/command/agentproxyshared/auth"
-	agentcert "github.com/hashicorp/vault/command/agentproxyshared/auth/cert"
-	"github.com/hashicorp/vault/command/agentproxyshared/sink"
-	"github.com/hashicorp/vault/command/agentproxyshared/sink/file"
+	"github.com/hashicorp/vault/command/agent/auth"
+	agentcert "github.com/hashicorp/vault/command/agent/auth/cert"
+	"github.com/hashicorp/vault/command/agent/sink"
+	"github.com/hashicorp/vault/command/agent/sink/file"
 	"github.com/hashicorp/vault/helper/dhutil"
 	vaulthttp "github.com/hashicorp/vault/http"
 	"github.com/hashicorp/vault/sdk/helper/jsonutil"
diff --git a/command/agent/cf_end_to_end_test.go b/command/agent/cf_end_to_end_test.go
index e143223af1d96..6bc1fa8b6a077 100644
--- a/command/agent/cf_end_to_end_test.go
+++ b/command/agent/cf_end_to_end_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package agent
 
 import (
@@ -15,10 +12,10 @@ import (
 	"github.com/hashicorp/vault-plugin-auth-cf/testing/certificates"
 	cfAPI "github.com/hashicorp/vault-plugin-auth-cf/testing/cf"
 	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/command/agentproxyshared/auth"
-	agentcf "github.com/hashicorp/vault/command/agentproxyshared/auth/cf"
-	"github.com/hashicorp/vault/command/agentproxyshared/sink"
-	"github.com/hashicorp/vault/command/agentproxyshared/sink/file"
+	"github.com/hashicorp/vault/command/agent/auth"
+	agentcf "github.com/hashicorp/vault/command/agent/auth/cf"
+	"github.com/hashicorp/vault/command/agent/sink"
+	"github.com/hashicorp/vault/command/agent/sink/file"
 	vaulthttp "github.com/hashicorp/vault/http"
 	"github.com/hashicorp/vault/sdk/helper/logging"
 	"github.com/hashicorp/vault/sdk/logical"
diff --git a/command/agent/config/config.go b/command/agent/config/config.go
index eea108b9fab3a..b32772564b3ca 100644
--- a/command/agent/config/config.go
+++ b/command/agent/config/config.go
@@ -1,56 +1,43 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package config
 
 import (
 	"context"
 	"errors"
 	"fmt"
-	"io"
+	"io/ioutil"
 	"net"
 	"os"
-	"path/filepath"
 	"strings"
-	"syscall"
 	"time"
 
 	ctconfig "github.com/hashicorp/consul-template/config"
-	ctsignals "github.com/hashicorp/consul-template/signals"
 	"github.com/hashicorp/go-multierror"
 	"github.com/hashicorp/go-secure-stdlib/parseutil"
 	"github.com/hashicorp/hcl"
 	"github.com/hashicorp/hcl/hcl/ast"
-	"github.com/mitchellh/mapstructure"
-	"k8s.io/utils/strings/slices"
-
-	"github.com/hashicorp/vault/command/agentproxyshared"
 	"github.com/hashicorp/vault/helper/namespace"
 	"github.com/hashicorp/vault/internalshared/configutil"
-	"github.com/hashicorp/vault/sdk/helper/pointerutil"
+	"github.com/mitchellh/mapstructure"
 )
 
-// Config is the configuration for Vault Agent.
+// Config is the configuration for the vault server.
 type Config struct {
 	*configutil.SharedConfig `hcl:"-"`
 
 	AutoAuth                    *AutoAuth                  `hcl:"auto_auth"`
 	ExitAfterAuth               bool                       `hcl:"exit_after_auth"`
 	Cache                       *Cache                     `hcl:"cache"`
-	APIProxy                    *APIProxy                  `hcl:"api_proxy"`
 	Vault                       *Vault                     `hcl:"vault"`
 	TemplateConfig              *TemplateConfig            `hcl:"template_config"`
 	Templates                   []*ctconfig.TemplateConfig `hcl:"templates"`
 	DisableIdleConns            []string                   `hcl:"disable_idle_connections"`
-	DisableIdleConnsAPIProxy    bool                       `hcl:"-"`
+	DisableIdleConnsCaching     bool                       `hcl:"-"`
 	DisableIdleConnsTemplating  bool                       `hcl:"-"`
 	DisableIdleConnsAutoAuth    bool                       `hcl:"-"`
 	DisableKeepAlives           []string                   `hcl:"disable_keep_alives"`
-	DisableKeepAlivesAPIProxy   bool                       `hcl:"-"`
+	DisableKeepAlivesCaching    bool                       `hcl:"-"`
 	DisableKeepAlivesTemplating bool                       `hcl:"-"`
 	DisableKeepAlivesAutoAuth   bool                       `hcl:"-"`
-	Exec                        *ExecConfig                `hcl:"exec,optional"`
-	EnvTemplates                []*ctconfig.TemplateConfig `hcl:"env_template,optional"`
 }
 
 const (
@@ -102,24 +89,24 @@ type transportDialer interface {
 	DialContext(ctx context.Context, network, address string) (net.Conn, error)
 }
 
-// APIProxy contains any configuration needed for proxy mode
-type APIProxy struct {
-	UseAutoAuthTokenRaw interface{} `hcl:"use_auto_auth_token"`
-	UseAutoAuthToken    bool        `hcl:"-"`
-	ForceAutoAuthToken  bool        `hcl:"-"`
-	EnforceConsistency  string      `hcl:"enforce_consistency"`
-	WhenInconsistent    string      `hcl:"when_inconsistent"`
-}
-
 // Cache contains any configuration needed for Cache mode
 type Cache struct {
-	UseAutoAuthTokenRaw interface{}                     `hcl:"use_auto_auth_token"`
-	UseAutoAuthToken    bool                            `hcl:"-"`
-	ForceAutoAuthToken  bool                            `hcl:"-"`
-	EnforceConsistency  string                          `hcl:"enforce_consistency"`
-	WhenInconsistent    string                          `hcl:"when_inconsistent"`
-	Persist             *agentproxyshared.PersistConfig `hcl:"persist"`
-	InProcDialer        transportDialer                 `hcl:"-"`
+	UseAutoAuthTokenRaw interface{}     `hcl:"use_auto_auth_token"`
+	UseAutoAuthToken    bool            `hcl:"-"`
+	ForceAutoAuthToken  bool            `hcl:"-"`
+	EnforceConsistency  string          `hcl:"enforce_consistency"`
+	WhenInconsistent    string          `hcl:"when_inconsistent"`
+	Persist             *Persist        `hcl:"persist"`
+	InProcDialer        transportDialer `hcl:"-"`
+}
+
+// Persist contains configuration needed for persistent caching
+type Persist struct {
+	Type                    string
+	Path                    string `hcl:"path"`
+	KeepAfterImport         bool   `hcl:"keep_after_import"`
+	ExitOnErr               bool   `hcl:"exit_on_err"`
+	ServiceAccountTokenFile string `hcl:"service_account_token_file"`
 }
 
 // AutoAuth is the configured authentication method and sinks
@@ -167,416 +154,26 @@ type TemplateConfig struct {
 	StaticSecretRenderInt    time.Duration `hcl:"-"`
 }
 
-type ExecConfig struct {
-	Command                []string  `hcl:"command,attr" mapstructure:"command"`
-	RestartOnSecretChanges string    `hcl:"restart_on_secret_changes,optional" mapstructure:"restart_on_secret_changes"`
-	RestartStopSignal      os.Signal `hcl:"-" mapstructure:"restart_stop_signal"`
-}
-
 func NewConfig() *Config {
 	return &Config{
 		SharedConfig: new(configutil.SharedConfig),
 	}
 }
 
-// Merge merges two Agent configurations.
-func (c *Config) Merge(c2 *Config) *Config {
-	if c2 == nil {
-		return c
-	}
-
-	result := NewConfig()
-
-	result.SharedConfig = c.SharedConfig
-	if c2.SharedConfig != nil {
-		result.SharedConfig = c.SharedConfig.Merge(c2.SharedConfig)
-	}
-
-	result.AutoAuth = c.AutoAuth
-	if c2.AutoAuth != nil {
-		result.AutoAuth = c2.AutoAuth
-	}
-
-	result.Cache = c.Cache
-	if c2.Cache != nil {
-		result.Cache = c2.Cache
-	}
-
-	result.APIProxy = c.APIProxy
-	if c2.APIProxy != nil {
-		result.APIProxy = c2.APIProxy
-	}
-
-	result.DisableMlock = c.DisableMlock
-	if c2.DisableMlock {
-		result.DisableMlock = c2.DisableMlock
-	}
-
-	// For these, ignore the non-specific one and overwrite them all
-	result.DisableIdleConnsAutoAuth = c.DisableIdleConnsAutoAuth
-	if c2.DisableIdleConnsAutoAuth {
-		result.DisableIdleConnsAutoAuth = c2.DisableIdleConnsAutoAuth
-	}
-
-	result.DisableIdleConnsAPIProxy = c.DisableIdleConnsAPIProxy
-	if c2.DisableIdleConnsAPIProxy {
-		result.DisableIdleConnsAPIProxy = c2.DisableIdleConnsAPIProxy
-	}
-
-	result.DisableIdleConnsTemplating = c.DisableIdleConnsTemplating
-	if c2.DisableIdleConnsTemplating {
-		result.DisableIdleConnsTemplating = c2.DisableIdleConnsTemplating
-	}
-
-	result.DisableKeepAlivesAutoAuth = c.DisableKeepAlivesAutoAuth
-	if c2.DisableKeepAlivesAutoAuth {
-		result.DisableKeepAlivesAutoAuth = c2.DisableKeepAlivesAutoAuth
-	}
-
-	result.DisableKeepAlivesAPIProxy = c.DisableKeepAlivesAPIProxy
-	if c2.DisableKeepAlivesAPIProxy {
-		result.DisableKeepAlivesAPIProxy = c2.DisableKeepAlivesAPIProxy
-	}
-
-	result.DisableKeepAlivesTemplating = c.DisableKeepAlivesTemplating
-	if c2.DisableKeepAlivesTemplating {
-		result.DisableKeepAlivesTemplating = c2.DisableKeepAlivesTemplating
-	}
-
-	result.TemplateConfig = c.TemplateConfig
-	if c2.TemplateConfig != nil {
-		result.TemplateConfig = c2.TemplateConfig
-	}
-
-	for _, l := range c.Templates {
-		result.Templates = append(result.Templates, l)
-	}
-	for _, l := range c2.Templates {
-		result.Templates = append(result.Templates, l)
-	}
-
-	result.ExitAfterAuth = c.ExitAfterAuth
-	if c2.ExitAfterAuth {
-		result.ExitAfterAuth = c2.ExitAfterAuth
-	}
-
-	result.Vault = c.Vault
-	if c2.Vault != nil {
-		result.Vault = c2.Vault
-	}
-
-	result.PidFile = c.PidFile
-	if c2.PidFile != "" {
-		result.PidFile = c2.PidFile
-	}
-
-	result.Exec = c.Exec
-	if c2.Exec != nil {
-		result.Exec = c2.Exec
-	}
-
-	for _, envTmpl := range c.EnvTemplates {
-		result.EnvTemplates = append(result.EnvTemplates, envTmpl)
-	}
-
-	for _, envTmpl := range c2.EnvTemplates {
-		result.EnvTemplates = append(result.EnvTemplates, envTmpl)
-	}
-
-	return result
-}
-
-// IsDefaultListerDefined returns true if a default listener has been defined
-// in this config
-func (c *Config) IsDefaultListerDefined() bool {
-	for _, l := range c.Listeners {
-		if l.Role != "metrics_only" {
-			return true
-		}
-	}
-	return false
-}
-
-// ValidateConfig validates an Agent configuration after it has been fully merged together, to
-// ensure that required combinations of configs are there
-func (c *Config) ValidateConfig() error {
-	if c.APIProxy != nil && c.Cache != nil {
-		if c.Cache.UseAutoAuthTokenRaw != nil {
-			if c.APIProxy.UseAutoAuthTokenRaw != nil {
-				return fmt.Errorf("use_auto_auth_token defined in both api_proxy and cache config. Please remove this configuration from the cache block")
-			} else {
-				c.APIProxy.ForceAutoAuthToken = c.Cache.ForceAutoAuthToken
-			}
-		}
-	}
-
-	if c.Cache != nil {
-		if len(c.Listeners) < 1 && len(c.Templates) < 1 && len(c.EnvTemplates) < 1 {
-			return fmt.Errorf("enabling the cache requires at least 1 template or 1 listener to be defined")
-		}
-
-		if c.Cache.UseAutoAuthToken {
-			if c.AutoAuth == nil {
-				return fmt.Errorf("cache.use_auto_auth_token is true but auto_auth not configured")
-			}
-			if c.AutoAuth != nil && c.AutoAuth.Method != nil && c.AutoAuth.Method.WrapTTL > 0 {
-				return fmt.Errorf("cache.use_auto_auth_token is true and auto_auth uses wrapping")
-			}
-		}
-	}
-
-	if c.APIProxy != nil {
-		if len(c.Listeners) < 1 {
-			return fmt.Errorf("configuring the api_proxy requires at least 1 listener to be defined")
-		}
-
-		if c.APIProxy.UseAutoAuthToken {
-			if c.AutoAuth == nil {
-				return fmt.Errorf("api_proxy.use_auto_auth_token is true but auto_auth not configured")
-			}
-			if c.AutoAuth != nil && c.AutoAuth.Method != nil && c.AutoAuth.Method.WrapTTL > 0 {
-				return fmt.Errorf("api_proxy.use_auto_auth_token is true and auto_auth uses wrapping")
-			}
-		}
-	}
-
-	if c.AutoAuth != nil {
-		if len(c.AutoAuth.Sinks) == 0 &&
-			(c.APIProxy == nil || !c.APIProxy.UseAutoAuthToken) &&
-			len(c.Templates) == 0 &&
-			len(c.EnvTemplates) == 0 {
-			return fmt.Errorf("auto_auth requires at least one sink or at least one template or api_proxy.use_auto_auth_token=true")
-		}
-	}
-
-	if c.AutoAuth == nil && c.Cache == nil && len(c.Listeners) == 0 {
-		return fmt.Errorf("no auto_auth, cache, or listener block found in config")
-	}
-
-	return c.validateEnvTemplateConfig()
-}
-
-func (c *Config) validateEnvTemplateConfig() error {
-	// if we are not in env-template mode, exit early
-	if c.Exec == nil && len(c.EnvTemplates) == 0 {
-		return nil
-	}
-
-	if c.Exec == nil {
-		return fmt.Errorf("a top-level 'exec' element must be specified with 'env_template' entries")
-	}
-
-	if len(c.EnvTemplates) == 0 {
-		return fmt.Errorf("must specify at least one 'env_template' element with a top-level 'exec' element")
-	}
-
-	if c.APIProxy != nil {
-		return fmt.Errorf("'api_proxy' cannot be specified with 'env_template' entries")
-	}
-
-	if len(c.Templates) > 0 {
-		return fmt.Errorf("'template' cannot be specified with 'env_template' entries")
-	}
-
-	if len(c.Exec.Command) == 0 {
-		return fmt.Errorf("'exec' requires a non-empty 'command' field")
-	}
-
-	if !slices.Contains([]string{"always", "never"}, c.Exec.RestartOnSecretChanges) {
-		return fmt.Errorf("'exec.restart_on_secret_changes' unexpected value: %q", c.Exec.RestartOnSecretChanges)
-	}
-
-	uniqueKeys := make(map[string]struct{})
-
-	for _, template := range c.EnvTemplates {
-		// Required:
-		//   - the key (environment variable name)
-		//   - either "contents" or "source"
-		// Optional / permitted:
-		//   - error_on_missing_key
-		//   - error_fatal
-		//   - left_delimiter
-		//   - right_delimiter
-		//   - ExtFuncMap
-		//   - function_denylist / function_blacklist
-
-		if template.MapToEnvironmentVariable == nil {
-			return fmt.Errorf("env_template: an environment variable name is required")
-		}
-
-		key := *template.MapToEnvironmentVariable
-
-		if _, exists := uniqueKeys[key]; exists {
-			return fmt.Errorf("env_template: duplicate environment variable name: %q", key)
-		}
-
-		uniqueKeys[key] = struct{}{}
-
-		if template.Contents == nil && template.Source == nil {
-			return fmt.Errorf("env_template[%s]: either 'contents' or 'source' must be specified", key)
-		}
-
-		if template.Contents != nil && template.Source != nil {
-			return fmt.Errorf("env_template[%s]: 'contents' and 'source' cannot be specified together", key)
-		}
-
-		if template.Backup != nil {
-			return fmt.Errorf("env_template[%s]: 'backup' is not allowed", key)
-		}
-
-		if template.Command != nil {
-			return fmt.Errorf("env_template[%s]: 'command' is not allowed", key)
-		}
-
-		if template.CommandTimeout != nil {
-			return fmt.Errorf("env_template[%s]: 'command_timeout' is not allowed", key)
-		}
-
-		if template.CreateDestDirs != nil {
-			return fmt.Errorf("env_template[%s]: 'create_dest_dirs' is not allowed", key)
-		}
-
-		if template.Destination != nil {
-			return fmt.Errorf("env_template[%s]: 'destination' is not allowed", key)
-		}
-
-		if template.Exec != nil {
-			return fmt.Errorf("env_template[%s]: 'exec' is not allowed", key)
-		}
-
-		if template.Perms != nil {
-			return fmt.Errorf("env_template[%s]: 'perms' is not allowed", key)
-		}
-
-		if template.User != nil {
-			return fmt.Errorf("env_template[%s]: 'user' is not allowed", key)
-		}
-
-		if template.Uid != nil {
-			return fmt.Errorf("env_template[%s]: 'uid' is not allowed", key)
-		}
-
-		if template.Group != nil {
-			return fmt.Errorf("env_template[%s]: 'group' is not allowed", key)
-		}
-
-		if template.Gid != nil {
-			return fmt.Errorf("env_template[%s]: 'gid' is not allowed", key)
-		}
-
-		if template.Wait != nil {
-			return fmt.Errorf("env_template[%s]: 'wait' is not allowed", key)
-		}
-
-		if template.SandboxPath != nil {
-			return fmt.Errorf("env_template[%s]: 'sandbox_path' is not allowed", key)
-		}
-	}
-
-	return nil
-}
-
 // LoadConfig loads the configuration at the given path, regardless if
-// it's a file or directory.
+// its a file or directory.
 func LoadConfig(path string) (*Config, error) {
 	fi, err := os.Stat(path)
 	if err != nil {
 		return nil, err
 	}
 
-	if fi.IsDir() {
-		return LoadConfigDir(path)
-	}
-	return LoadConfigFile(path)
-}
-
-// LoadConfigDir loads the configuration at the given path if it's a directory
-func LoadConfigDir(dir string) (*Config, error) {
-	f, err := os.Open(dir)
-	if err != nil {
-		return nil, err
-	}
-	defer f.Close()
-
-	fi, err := f.Stat()
-	if err != nil {
-		return nil, err
-	}
-	if !fi.IsDir() {
-		return nil, fmt.Errorf("configuration path must be a directory: %q", dir)
-	}
-
-	var files []string
-	err = nil
-	for err != io.EOF {
-		var fis []os.FileInfo
-		fis, err = f.Readdir(128)
-		if err != nil && err != io.EOF {
-			return nil, err
-		}
-
-		for _, fi := range fis {
-			// Ignore directories
-			if fi.IsDir() {
-				continue
-			}
-
-			// Only care about files that are valid to load.
-			name := fi.Name()
-			skip := true
-			if strings.HasSuffix(name, ".hcl") {
-				skip = false
-			} else if strings.HasSuffix(name, ".json") {
-				skip = false
-			}
-			if skip || isTemporaryFile(name) {
-				continue
-			}
-
-			path := filepath.Join(dir, name)
-			files = append(files, path)
-		}
-	}
-
-	result := NewConfig()
-	for _, f := range files {
-		config, err := LoadConfigFile(f)
-		if err != nil {
-			return nil, fmt.Errorf("error loading %q: %w", f, err)
-		}
-
-		if result == nil {
-			result = config
-		} else {
-			result = result.Merge(config)
-		}
-	}
-
-	return result, nil
-}
-
-// isTemporaryFile returns true or false depending on whether the
-// provided file name is a temporary file for the following editors:
-// emacs or vim.
-func isTemporaryFile(name string) bool {
-	return strings.HasSuffix(name, "~") || // vim
-		strings.HasPrefix(name, ".#") || // emacs
-		(strings.HasPrefix(name, "#") && strings.HasSuffix(name, "#")) // emacs
-}
-
-// LoadConfigFile loads the configuration at the given path if it's a file
-func LoadConfigFile(path string) (*Config, error) {
-	fi, err := os.Stat(path)
-	if err != nil {
-		return nil, err
-	}
-
 	if fi.IsDir() {
 		return nil, fmt.Errorf("location is a directory, not a file")
 	}
 
 	// Read the file
-	d, err := os.ReadFile(path)
+	d, err := ioutil.ReadFile(path)
 	if err != nil {
 		return nil, err
 	}
@@ -626,10 +223,6 @@ func LoadConfigFile(path string) (*Config, error) {
 		return nil, fmt.Errorf("error parsing 'cache':%w", err)
 	}
 
-	if err := parseAPIProxy(result, list); err != nil {
-		return nil, fmt.Errorf("error parsing 'api_proxy':%w", err)
-	}
-
 	if err := parseTemplateConfig(result, list); err != nil {
 		return nil, fmt.Errorf("error parsing 'template_config': %w", err)
 	}
@@ -638,18 +231,26 @@ func LoadConfigFile(path string) (*Config, error) {
 		return nil, fmt.Errorf("error parsing 'template': %w", err)
 	}
 
-	if err := parseExec(result, list); err != nil {
-		return nil, fmt.Errorf("error parsing 'exec': %w", err)
-	}
+	if result.Cache != nil {
+		if len(result.Listeners) < 1 && len(result.Templates) < 1 {
+			return nil, fmt.Errorf("enabling the cache requires at least 1 template or 1 listener to be defined")
+		}
 
-	if err := parseEnvTemplates(result, list); err != nil {
-		return nil, fmt.Errorf("error parsing 'env_template': %w", err)
+		if result.Cache.UseAutoAuthToken {
+			if result.AutoAuth == nil {
+				return nil, fmt.Errorf("cache.use_auto_auth_token is true but auto_auth not configured")
+			}
+			if result.AutoAuth.Method.WrapTTL > 0 {
+				return nil, fmt.Errorf("cache.use_auto_auth_token is true and auto_auth uses wrapping")
+			}
+		}
 	}
 
-	if result.Cache != nil && result.APIProxy == nil && (result.Cache.UseAutoAuthToken || result.Cache.ForceAutoAuthToken) {
-		result.APIProxy = &APIProxy{
-			UseAutoAuthToken:   result.Cache.UseAutoAuthToken,
-			ForceAutoAuthToken: result.Cache.ForceAutoAuthToken,
+	if result.AutoAuth != nil {
+		if len(result.AutoAuth.Sinks) == 0 &&
+			(result.Cache == nil || !result.Cache.UseAutoAuthToken) &&
+			len(result.Templates) == 0 {
+			return nil, fmt.Errorf("auto_auth requires at least one sink or at least one template or cache.use_auto_auth_token=true")
 		}
 	}
 
@@ -658,17 +259,19 @@ func LoadConfigFile(path string) (*Config, error) {
 		return nil, fmt.Errorf("error parsing 'vault':%w", err)
 	}
 
-	if result.Vault != nil {
-		// Set defaults
-		if result.Vault.Retry == nil {
-			result.Vault.Retry = &Retry{}
-		}
-		switch result.Vault.Retry.NumRetries {
-		case 0:
-			result.Vault.Retry.NumRetries = ctconfig.DefaultRetryAttempts
-		case -1:
-			result.Vault.Retry.NumRetries = 0
-		}
+	if result.Vault == nil {
+		result.Vault = &Vault{}
+	}
+
+	// Set defaults
+	if result.Vault.Retry == nil {
+		result.Vault.Retry = &Retry{}
+	}
+	switch result.Vault.Retry.NumRetries {
+	case 0:
+		result.Vault.Retry.NumRetries = ctconfig.DefaultRetryAttempts
+	case -1:
+		result.Vault.Retry.NumRetries = 0
 	}
 
 	if disableIdleConnsEnv := os.Getenv(DisableIdleConnsEnv); disableIdleConnsEnv != "" {
@@ -682,8 +285,8 @@ func LoadConfigFile(path string) (*Config, error) {
 		switch subsystem {
 		case "auto-auth":
 			result.DisableIdleConnsAutoAuth = true
-		case "caching", "proxying":
-			result.DisableIdleConnsAPIProxy = true
+		case "caching":
+			result.DisableIdleConnsCaching = true
 		case "templating":
 			result.DisableIdleConnsTemplating = true
 		case "":
@@ -704,8 +307,8 @@ func LoadConfigFile(path string) (*Config, error) {
 		switch subsystem {
 		case "auto-auth":
 			result.DisableKeepAlivesAutoAuth = true
-		case "caching", "proxying":
-			result.DisableKeepAlivesAPIProxy = true
+		case "caching":
+			result.DisableKeepAlivesCaching = true
 		case "templating":
 			result.DisableKeepAlivesTemplating = true
 		case "":
@@ -784,50 +387,6 @@ func parseRetry(result *Config, list *ast.ObjectList) error {
 	return nil
 }
 
-func parseAPIProxy(result *Config, list *ast.ObjectList) error {
-	name := "api_proxy"
-
-	apiProxyList := list.Filter(name)
-	if len(apiProxyList.Items) == 0 {
-		return nil
-	}
-
-	if len(apiProxyList.Items) > 1 {
-		return fmt.Errorf("one and only one %q block is required", name)
-	}
-
-	item := apiProxyList.Items[0]
-
-	var apiProxy APIProxy
-	err := hcl.DecodeObject(&apiProxy, item.Val)
-	if err != nil {
-		return err
-	}
-
-	if apiProxy.UseAutoAuthTokenRaw != nil {
-		apiProxy.UseAutoAuthToken, err = parseutil.ParseBool(apiProxy.UseAutoAuthTokenRaw)
-		if err != nil {
-			// Could be a value of "force" instead of "true"/"false"
-			switch apiProxy.UseAutoAuthTokenRaw.(type) {
-			case string:
-				v := apiProxy.UseAutoAuthTokenRaw.(string)
-
-				if !strings.EqualFold(v, "force") {
-					return fmt.Errorf("value of 'use_auto_auth_token' can be either true/false/force, %q is an invalid option", apiProxy.UseAutoAuthTokenRaw)
-				}
-				apiProxy.UseAutoAuthToken = true
-				apiProxy.ForceAutoAuthToken = true
-
-			default:
-				return err
-			}
-		}
-	}
-	result.APIProxy = &apiProxy
-
-	return nil
-}
-
 func parseCache(result *Config, list *ast.ObjectList) error {
 	name := "cache"
 
@@ -895,7 +454,7 @@ func parsePersist(result *Config, list *ast.ObjectList) error {
 
 	item := persistList.Items[0]
 
-	var p agentproxyshared.PersistConfig
+	var p Persist
 	err := hcl.DecodeObject(&p, item.Val)
 	if err != nil {
 		return err
@@ -1193,121 +752,3 @@ func parseTemplates(result *Config, list *ast.ObjectList) error {
 	result.Templates = tcs
 	return nil
 }
-
-func parseExec(result *Config, list *ast.ObjectList) error {
-	name := "exec"
-
-	execList := list.Filter(name)
-	if len(execList.Items) == 0 {
-		return nil
-	}
-
-	if len(execList.Items) > 1 {
-		return fmt.Errorf("at most one %q block is allowed", name)
-	}
-
-	item := execList.Items[0]
-	var shadow interface{}
-	if err := hcl.DecodeObject(&shadow, item.Val); err != nil {
-		return fmt.Errorf("error decoding config: %s", err)
-	}
-
-	parsed, ok := shadow.(map[string]interface{})
-	if !ok {
-		return errors.New("error converting config")
-	}
-
-	var execConfig ExecConfig
-	var md mapstructure.Metadata
-	decoder, err := mapstructure.NewDecoder(&mapstructure.DecoderConfig{
-		DecodeHook: mapstructure.ComposeDecodeHookFunc(
-			ctconfig.StringToFileModeFunc(),
-			ctconfig.StringToWaitDurationHookFunc(),
-			mapstructure.StringToSliceHookFunc(","),
-			mapstructure.StringToTimeDurationHookFunc(),
-			ctsignals.StringToSignalFunc(),
-		),
-		ErrorUnused: true,
-		Metadata:    &md,
-		Result:      &execConfig,
-	})
-	if err != nil {
-		return errors.New("mapstructure decoder creation failed")
-	}
-	if err := decoder.Decode(parsed); err != nil {
-		return err
-	}
-
-	// if the user does not specify a restart signal, default to SIGTERM
-	if execConfig.RestartStopSignal == nil {
-		execConfig.RestartStopSignal = syscall.SIGTERM
-	}
-
-	if execConfig.RestartOnSecretChanges == "" {
-		execConfig.RestartOnSecretChanges = "always"
-	}
-
-	result.Exec = &execConfig
-	return nil
-}
-
-func parseEnvTemplates(result *Config, list *ast.ObjectList) error {
-	name := "env_template"
-
-	envTemplateList := list.Filter(name)
-
-	if len(envTemplateList.Items) < 1 {
-		return nil
-	}
-
-	envTemplates := make([]*ctconfig.TemplateConfig, 0, len(envTemplateList.Items))
-
-	for _, item := range envTemplateList.Items {
-		var shadow interface{}
-		if err := hcl.DecodeObject(&shadow, item.Val); err != nil {
-			return fmt.Errorf("error decoding config: %s", err)
-		}
-
-		// Convert to a map and flatten the keys we want to flatten
-		parsed, ok := shadow.(map[string]any)
-		if !ok {
-			return errors.New("error converting config")
-		}
-
-		var templateConfig ctconfig.TemplateConfig
-		var md mapstructure.Metadata
-		decoder, err := mapstructure.NewDecoder(&mapstructure.DecoderConfig{
-			DecodeHook: mapstructure.ComposeDecodeHookFunc(
-				ctconfig.StringToFileModeFunc(),
-				ctconfig.StringToWaitDurationHookFunc(),
-				mapstructure.StringToSliceHookFunc(","),
-				mapstructure.StringToTimeDurationHookFunc(),
-				ctsignals.StringToSignalFunc(),
-			),
-			ErrorUnused: true,
-			Metadata:    &md,
-			Result:      &templateConfig,
-		})
-		if err != nil {
-			return errors.New("mapstructure decoder creation failed")
-		}
-		if err := decoder.Decode(parsed); err != nil {
-			return err
-		}
-
-		// parse the keys in the item for the environment variable name
-		if numberOfKeys := len(item.Keys); numberOfKeys != 1 {
-			return fmt.Errorf("expected one and only one environment variable name, got %d", numberOfKeys)
-		}
-
-		// hcl parses this with extra quotes if quoted in config file
-		environmentVariableName := strings.Trim(item.Keys[0].Token.Text, `"`)
-
-		templateConfig.MapToEnvironmentVariable = pointerutil.StringPtr(environmentVariableName)
-
-		envTemplates = append(envTemplates, &templateConfig)
-	}
-
-	result.EnvTemplates = envTemplates
-	return nil
-}
diff --git a/command/agent/config/config_test.go b/command/agent/config/config_test.go
index 3be1ab33ab3e5..8a5491891ff68 100644
--- a/command/agent/config/config_test.go
+++ b/command/agent/config/config_test.go
@@ -1,25 +1,18 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package config
 
 import (
 	"os"
-	"syscall"
 	"testing"
 	"time"
 
 	"github.com/go-test/deep"
 	ctconfig "github.com/hashicorp/consul-template/config"
-	"golang.org/x/exp/slices"
-
-	"github.com/hashicorp/vault/command/agentproxyshared"
 	"github.com/hashicorp/vault/internalshared/configutil"
 	"github.com/hashicorp/vault/sdk/helper/pointerutil"
 )
 
 func TestLoadConfigFile_AgentCache(t *testing.T) {
-	config, err := LoadConfigFile("./test-fixtures/config-cache.hcl")
+	config, err := LoadConfig("./test-fixtures/config-cache.hcl")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -41,15 +34,8 @@ func TestLoadConfigFile_AgentCache(t *testing.T) {
 					Address:    "127.0.0.1:8300",
 					TLSDisable: true,
 				},
-				{
-					Type:       "tcp",
-					Address:    "127.0.0.1:3000",
-					Role:       "metrics_only",
-					TLSDisable: true,
-				},
 				{
 					Type:        "tcp",
-					Role:        "default",
 					Address:     "127.0.0.1:8400",
 					TLSKeyFile:  "/path/to/cakey.pem",
 					TLSCertFile: "/path/to/cacert.pem",
@@ -76,15 +62,11 @@ func TestLoadConfigFile_AgentCache(t *testing.T) {
 				},
 			},
 		},
-		APIProxy: &APIProxy{
-			UseAutoAuthToken:   true,
-			ForceAutoAuthToken: false,
-		},
 		Cache: &Cache{
 			UseAutoAuthToken:    true,
 			UseAutoAuthTokenRaw: true,
 			ForceAutoAuthToken:  false,
-			Persist: &agentproxyshared.PersistConfig{
+			Persist: &Persist{
 				Type:                    "kubernetes",
 				Path:                    "/vault/agent-cache/",
 				KeepAfterImport:         true,
@@ -111,7 +93,7 @@ func TestLoadConfigFile_AgentCache(t *testing.T) {
 		t.Fatal(diff)
 	}
 
-	config, err = LoadConfigFile("./test-fixtures/config-cache-embedded-type.hcl")
+	config, err = LoadConfig("./test-fixtures/config-cache-embedded-type.hcl")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -123,236 +105,8 @@ func TestLoadConfigFile_AgentCache(t *testing.T) {
 	}
 }
 
-func TestLoadConfigDir_AgentCache(t *testing.T) {
-	config, err := LoadConfig("./test-fixtures/config-dir-cache/")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	expected := &Config{
-		SharedConfig: &configutil.SharedConfig{
-			PidFile: "./pidfile",
-			Listeners: []*configutil.Listener{
-				{
-					Type:        "unix",
-					Address:     "/path/to/socket",
-					TLSDisable:  true,
-					SocketMode:  "configmode",
-					SocketUser:  "configuser",
-					SocketGroup: "configgroup",
-				},
-				{
-					Type:       "tcp",
-					Address:    "127.0.0.1:8300",
-					TLSDisable: true,
-				},
-				{
-					Type:       "tcp",
-					Address:    "127.0.0.1:3000",
-					Role:       "metrics_only",
-					TLSDisable: true,
-				},
-				{
-					Type:        "tcp",
-					Role:        "default",
-					Address:     "127.0.0.1:8400",
-					TLSKeyFile:  "/path/to/cakey.pem",
-					TLSCertFile: "/path/to/cacert.pem",
-				},
-			},
-		},
-		AutoAuth: &AutoAuth{
-			Method: &Method{
-				Type:      "aws",
-				MountPath: "auth/aws",
-				Config: map[string]interface{}{
-					"role": "foobar",
-				},
-			},
-			Sinks: []*Sink{
-				{
-					Type:   "file",
-					DHType: "curve25519",
-					DHPath: "/tmp/file-foo-dhpath",
-					AAD:    "foobar",
-					Config: map[string]interface{}{
-						"path": "/tmp/file-foo",
-					},
-				},
-			},
-		},
-		APIProxy: &APIProxy{
-			UseAutoAuthToken:   true,
-			ForceAutoAuthToken: false,
-		},
-		Cache: &Cache{
-			UseAutoAuthToken:    true,
-			UseAutoAuthTokenRaw: true,
-			ForceAutoAuthToken:  false,
-			Persist: &agentproxyshared.PersistConfig{
-				Type:                    "kubernetes",
-				Path:                    "/vault/agent-cache/",
-				KeepAfterImport:         true,
-				ExitOnErr:               true,
-				ServiceAccountTokenFile: "/tmp/serviceaccount/token",
-			},
-		},
-		Vault: &Vault{
-			Address:          "http://127.0.0.1:1111",
-			CACert:           "config_ca_cert",
-			CAPath:           "config_ca_path",
-			TLSSkipVerifyRaw: interface{}("true"),
-			TLSSkipVerify:    true,
-			ClientCert:       "config_client_cert",
-			ClientKey:        "config_client_key",
-			Retry: &Retry{
-				NumRetries: 12,
-			},
-		},
-	}
-
-	config.Prune()
-	if diff := deep.Equal(config, expected); diff != nil {
-		t.Fatal(diff)
-	}
-
-	config, err = LoadConfigFile("./test-fixtures/config-dir-cache/config-cache1.hcl")
-	if err != nil {
-		t.Fatal(err)
-	}
-	config2, err := LoadConfigFile("./test-fixtures/config-dir-cache/config-cache2.hcl")
-
-	mergedConfig := config.Merge(config2)
-
-	mergedConfig.Prune()
-	if diff := deep.Equal(mergedConfig, expected); diff != nil {
-		t.Fatal(diff)
-	}
-}
-
-func TestLoadConfigDir_AutoAuthAndListener(t *testing.T) {
-	config, err := LoadConfig("./test-fixtures/config-dir-auto-auth-and-listener/")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	expected := &Config{
-		SharedConfig: &configutil.SharedConfig{
-			PidFile: "./pidfile",
-			Listeners: []*configutil.Listener{
-				{
-					Type:       "tcp",
-					Address:    "127.0.0.1:8300",
-					TLSDisable: true,
-				},
-			},
-		},
-		AutoAuth: &AutoAuth{
-			Method: &Method{
-				Type:      "aws",
-				MountPath: "auth/aws",
-				Config: map[string]interface{}{
-					"role": "foobar",
-				},
-			},
-			Sinks: []*Sink{
-				{
-					Type:   "file",
-					DHType: "curve25519",
-					DHPath: "/tmp/file-foo-dhpath",
-					AAD:    "foobar",
-					Config: map[string]interface{}{
-						"path": "/tmp/file-foo",
-					},
-				},
-			},
-		},
-	}
-
-	config.Prune()
-	if diff := deep.Equal(config, expected); diff != nil {
-		t.Fatal(diff)
-	}
-
-	config, err = LoadConfigFile("./test-fixtures/config-dir-auto-auth-and-listener/config1.hcl")
-	if err != nil {
-		t.Fatal(err)
-	}
-	config2, err := LoadConfigFile("./test-fixtures/config-dir-auto-auth-and-listener/config2.hcl")
-
-	mergedConfig := config.Merge(config2)
-
-	mergedConfig.Prune()
-	if diff := deep.Equal(mergedConfig, expected); diff != nil {
-		t.Fatal(diff)
-	}
-}
-
-func TestLoadConfigDir_VaultBlock(t *testing.T) {
-	config, err := LoadConfig("./test-fixtures/config-dir-vault-block/")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	expected := &Config{
-		SharedConfig: &configutil.SharedConfig{
-			PidFile: "./pidfile",
-		},
-		Vault: &Vault{
-			Address:          "http://127.0.0.1:1111",
-			CACert:           "config_ca_cert",
-			CAPath:           "config_ca_path",
-			TLSSkipVerifyRaw: interface{}("true"),
-			TLSSkipVerify:    true,
-			ClientCert:       "config_client_cert",
-			ClientKey:        "config_client_key",
-			Retry: &Retry{
-				NumRetries: 12,
-			},
-		},
-		AutoAuth: &AutoAuth{
-			Method: &Method{
-				Type:      "aws",
-				MountPath: "auth/aws",
-				Config: map[string]interface{}{
-					"role": "foobar",
-				},
-			},
-			Sinks: []*Sink{
-				{
-					Type:   "file",
-					DHType: "curve25519",
-					DHPath: "/tmp/file-foo-dhpath",
-					AAD:    "foobar",
-					Config: map[string]interface{}{
-						"path": "/tmp/file-foo",
-					},
-				},
-			},
-		},
-	}
-
-	config.Prune()
-	if diff := deep.Equal(config, expected); diff != nil {
-		t.Fatal(diff)
-	}
-
-	config, err = LoadConfigFile("./test-fixtures/config-dir-vault-block/config1.hcl")
-	if err != nil {
-		t.Fatal(err)
-	}
-	config2, err := LoadConfigFile("./test-fixtures/config-dir-vault-block/config2.hcl")
-
-	mergedConfig := config.Merge(config2)
-
-	mergedConfig.Prune()
-	if diff := deep.Equal(mergedConfig, expected); diff != nil {
-		t.Fatal(diff)
-	}
-}
-
 func TestLoadConfigFile_AgentCache_NoListeners(t *testing.T) {
-	config, err := LoadConfigFile("./test-fixtures/config-cache-no-listeners.hcl")
+	config, err := LoadConfig("./test-fixtures/config-cache-no-listeners.hcl")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -381,15 +135,11 @@ func TestLoadConfigFile_AgentCache_NoListeners(t *testing.T) {
 				},
 			},
 		},
-		APIProxy: &APIProxy{
-			UseAutoAuthToken:   true,
-			ForceAutoAuthToken: false,
-		},
 		Cache: &Cache{
 			UseAutoAuthToken:    true,
 			UseAutoAuthTokenRaw: true,
 			ForceAutoAuthToken:  false,
-			Persist: &agentproxyshared.PersistConfig{
+			Persist: &Persist{
 				Type:                    "kubernetes",
 				Path:                    "/vault/agent-cache/",
 				KeepAfterImport:         true,
@@ -433,7 +183,7 @@ func TestLoadConfigFile(t *testing.T) {
 		}
 	}()
 
-	config, err := LoadConfigFile("./test-fixtures/config.hcl")
+	config, err := LoadConfig("./test-fixtures/config.hcl")
 	if err != nil {
 		t.Fatalf("err: %s", err)
 	}
@@ -441,7 +191,6 @@ func TestLoadConfigFile(t *testing.T) {
 	expected := &Config{
 		SharedConfig: &configutil.SharedConfig{
 			PidFile: "./pidfile",
-			LogFile: "/var/log/vault/vault-agent.log",
 		},
 		AutoAuth: &AutoAuth{
 			Method: &Method{
@@ -476,6 +225,11 @@ func TestLoadConfigFile(t *testing.T) {
 				},
 			},
 		},
+		Vault: &Vault{
+			Retry: &Retry{
+				NumRetries: 12,
+			},
+		},
 	}
 
 	config.Prune()
@@ -483,7 +237,7 @@ func TestLoadConfigFile(t *testing.T) {
 		t.Fatal(diff)
 	}
 
-	config, err = LoadConfigFile("./test-fixtures/config-embedded-type.hcl")
+	config, err = LoadConfig("./test-fixtures/config-embedded-type.hcl")
 	if err != nil {
 		t.Fatalf("err: %s", err)
 	}
@@ -495,7 +249,7 @@ func TestLoadConfigFile(t *testing.T) {
 }
 
 func TestLoadConfigFile_Method_Wrapping(t *testing.T) {
-	config, err := LoadConfigFile("./test-fixtures/config-method-wrapping.hcl")
+	config, err := LoadConfig("./test-fixtures/config-method-wrapping.hcl")
 	if err != nil {
 		t.Fatalf("err: %s", err)
 	}
@@ -524,6 +278,11 @@ func TestLoadConfigFile_Method_Wrapping(t *testing.T) {
 				},
 			},
 		},
+		Vault: &Vault{
+			Retry: &Retry{
+				NumRetries: 12,
+			},
+		},
 	}
 
 	config.Prune()
@@ -533,7 +292,7 @@ func TestLoadConfigFile_Method_Wrapping(t *testing.T) {
 }
 
 func TestLoadConfigFile_Method_InitialBackoff(t *testing.T) {
-	config, err := LoadConfigFile("./test-fixtures/config-method-initial-backoff.hcl")
+	config, err := LoadConfig("./test-fixtures/config-method-initial-backoff.hcl")
 	if err != nil {
 		t.Fatalf("err: %s", err)
 	}
@@ -563,6 +322,11 @@ func TestLoadConfigFile_Method_InitialBackoff(t *testing.T) {
 				},
 			},
 		},
+		Vault: &Vault{
+			Retry: &Retry{
+				NumRetries: 12,
+			},
+		},
 	}
 
 	config.Prune()
@@ -572,7 +336,7 @@ func TestLoadConfigFile_Method_InitialBackoff(t *testing.T) {
 }
 
 func TestLoadConfigFile_Method_ExitOnErr(t *testing.T) {
-	config, err := LoadConfigFile("./test-fixtures/config-method-exit-on-err.hcl")
+	config, err := LoadConfig("./test-fixtures/config-method-exit-on-err.hcl")
 	if err != nil {
 		t.Fatalf("err: %s", err)
 	}
@@ -602,6 +366,11 @@ func TestLoadConfigFile_Method_ExitOnErr(t *testing.T) {
 				},
 			},
 		},
+		Vault: &Vault{
+			Retry: &Retry{
+				NumRetries: 12,
+			},
+		},
 	}
 
 	config.Prune()
@@ -611,7 +380,7 @@ func TestLoadConfigFile_Method_ExitOnErr(t *testing.T) {
 }
 
 func TestLoadConfigFile_AgentCache_NoAutoAuth(t *testing.T) {
-	config, err := LoadConfigFile("./test-fixtures/config-cache-no-auto_auth.hcl")
+	config, err := LoadConfig("./test-fixtures/config-cache-no-auto_auth.hcl")
 	if err != nil {
 		t.Fatalf("err: %s", err)
 	}
@@ -628,6 +397,11 @@ func TestLoadConfigFile_AgentCache_NoAutoAuth(t *testing.T) {
 				},
 			},
 		},
+		Vault: &Vault{
+			Retry: &Retry{
+				NumRetries: 12,
+			},
+		},
 	}
 
 	config.Prune()
@@ -637,98 +411,56 @@ func TestLoadConfigFile_AgentCache_NoAutoAuth(t *testing.T) {
 }
 
 func TestLoadConfigFile_Bad_AgentCache_InconsisentAutoAuth(t *testing.T) {
-	config, err := LoadConfigFile("./test-fixtures/bad-config-cache-inconsistent-auto_auth.hcl")
-	if err != nil {
-		t.Fatalf("LoadConfigFile should not return an error for this config, err: %v", err)
-	}
-	if config == nil {
-		t.Fatal("config was nil")
-	}
-	err = config.ValidateConfig()
+	_, err := LoadConfig("./test-fixtures/bad-config-cache-inconsistent-auto_auth.hcl")
 	if err == nil {
-		t.Fatal("ValidateConfig should return an error when use_auto_auth_token=true and no auto_auth section present")
+		t.Fatal("LoadConfig should return an error when use_auto_auth_token=true and no auto_auth section present")
 	}
 }
 
 func TestLoadConfigFile_Bad_AgentCache_ForceAutoAuthNoMethod(t *testing.T) {
-	config, err := LoadConfigFile("./test-fixtures/bad-config-cache-force-token-no-auth-method.hcl")
-	if err != nil {
-		t.Fatalf("LoadConfigFile should not return an error for this config, err: %v", err)
-	}
-	if config == nil {
-		t.Fatal("config was nil")
-	}
-	err = config.ValidateConfig()
+	_, err := LoadConfig("./test-fixtures/bad-config-cache-force-auto_auth.hcl")
 	if err == nil {
-		t.Fatal("ValidateConfig should return an error when use_auto_auth_token=force and no auto_auth section present")
+		t.Fatal("LoadConfig should return an error when use_auto_auth_token=force and no auto_auth section present")
 	}
 }
 
 func TestLoadConfigFile_Bad_AgentCache_NoListeners(t *testing.T) {
-	_, err := LoadConfigFile("./test-fixtures/bad-config-cache-no-listeners.hcl")
-	if err != nil {
-		t.Fatalf("LoadConfigFile should return an error for this config")
+	_, err := LoadConfig("./test-fixtures/bad-config-cache-no-listeners.hcl")
+	if err == nil {
+		t.Fatal("LoadConfig should return an error when cache section present and no listeners present and no templates defined")
 	}
 }
 
 func TestLoadConfigFile_Bad_AutoAuth_Wrapped_Multiple_Sinks(t *testing.T) {
-	_, err := LoadConfigFile("./test-fixtures/bad-config-auto_auth-wrapped-multiple-sinks.hcl")
+	_, err := LoadConfig("./test-fixtures/bad-config-auto_auth-wrapped-multiple-sinks")
 	if err == nil {
-		t.Fatalf("LoadConfigFile should return an error for this config, err: %v", err)
+		t.Fatal("LoadConfig should return an error when auth_auth.method.wrap_ttl nonzero and multiple sinks defined")
 	}
 }
 
 func TestLoadConfigFile_Bad_AutoAuth_Nosinks_Nocache_Notemplates(t *testing.T) {
-	config, err := LoadConfigFile("./test-fixtures/bad-config-auto_auth-nosinks-nocache-notemplates.hcl")
-	if err != nil {
-		t.Fatalf("LoadConfigFile should not return an error for this config, err: %v", err)
-	}
-	if config == nil {
-		t.Fatal("config was nil")
-	}
-	err = config.ValidateConfig()
+	_, err := LoadConfig("./test-fixtures/bad-config-auto_auth-nosinks-nocache-notemplates.hcl")
 	if err == nil {
-		t.Fatal("ValidateConfig should return an error when auto_auth configured and there are no sinks, caches or templates")
+		t.Fatal("LoadConfig should return an error when auto_auth configured and there are no sinks, caches or templates")
 	}
 }
 
 func TestLoadConfigFile_Bad_AutoAuth_Both_Wrapping_Types(t *testing.T) {
-	_, err := LoadConfigFile("./test-fixtures/bad-config-method-wrapping-and-sink-wrapping.hcl")
+	_, err := LoadConfig("./test-fixtures/bad-config-method-wrapping-and-sink-wrapping.hcl")
 	if err == nil {
-		t.Fatalf("LoadConfigFile should return an error for this config")
+		t.Fatal("LoadConfig should return an error when auth_auth.method.wrap_ttl nonzero and sinks.wrap_ttl nonzero")
 	}
 }
 
 func TestLoadConfigFile_Bad_AgentCache_AutoAuth_Method_wrapping(t *testing.T) {
-	config, err := LoadConfigFile("./test-fixtures/bad-config-cache-auto_auth-method-wrapping.hcl")
-	if err != nil {
-		t.Fatalf("LoadConfigFile should not return an error for this config, err: %v", err)
-	}
-	if config == nil {
-		t.Fatal("config was nil")
-	}
-	err = config.ValidateConfig()
-	if err == nil {
-		t.Fatal("ValidateConfig should return an error when auth_auth.method.wrap_ttl nonzero and cache.use_auto_auth_token=true")
-	}
-}
-
-func TestLoadConfigFile_Bad_APIProxy_And_Cache_Same_Config(t *testing.T) {
-	config, err := LoadConfigFile("./test-fixtures/bad-config-api_proxy-cache.hcl")
-	if err != nil {
-		t.Fatalf("LoadConfigFile should not return an error for this config, err: %v", err)
-	}
-	if config == nil {
-		t.Fatal("config was nil")
-	}
-	err = config.ValidateConfig()
+	_, err := LoadConfig("./test-fixtures/bad-config-cache-auto_auth-method-wrapping.hcl")
 	if err == nil {
-		t.Fatal("ValidateConfig should return an error when cache and api_proxy try and configure the same value")
+		t.Fatal("LoadConfig should return an error when auth_auth.method.wrap_ttl nonzero and cache.use_auto_auth_token=true")
 	}
 }
 
 func TestLoadConfigFile_AgentCache_AutoAuth_NoSink(t *testing.T) {
-	config, err := LoadConfigFile("./test-fixtures/config-cache-auto_auth-no-sink.hcl")
+	config, err := LoadConfig("./test-fixtures/config-cache-auto_auth-no-sink.hcl")
 	if err != nil {
 		t.Fatalf("err: %s", err)
 	}
@@ -753,15 +485,16 @@ func TestLoadConfigFile_AgentCache_AutoAuth_NoSink(t *testing.T) {
 				},
 			},
 		},
-		APIProxy: &APIProxy{
-			UseAutoAuthToken:   true,
-			ForceAutoAuthToken: false,
-		},
 		Cache: &Cache{
 			UseAutoAuthToken:    true,
 			UseAutoAuthTokenRaw: true,
 			ForceAutoAuthToken:  false,
 		},
+		Vault: &Vault{
+			Retry: &Retry{
+				NumRetries: 12,
+			},
+		},
 	}
 
 	config.Prune()
@@ -771,7 +504,7 @@ func TestLoadConfigFile_AgentCache_AutoAuth_NoSink(t *testing.T) {
 }
 
 func TestLoadConfigFile_AgentCache_AutoAuth_Force(t *testing.T) {
-	config, err := LoadConfigFile("./test-fixtures/config-cache-auto_auth-force.hcl")
+	config, err := LoadConfig("./test-fixtures/config-cache-auto_auth-force.hcl")
 	if err != nil {
 		t.Fatalf("err: %s", err)
 	}
@@ -796,15 +529,16 @@ func TestLoadConfigFile_AgentCache_AutoAuth_Force(t *testing.T) {
 				},
 			},
 		},
-		APIProxy: &APIProxy{
-			UseAutoAuthToken:   true,
-			ForceAutoAuthToken: true,
-		},
 		Cache: &Cache{
 			UseAutoAuthToken:    true,
 			UseAutoAuthTokenRaw: "force",
 			ForceAutoAuthToken:  true,
 		},
+		Vault: &Vault{
+			Retry: &Retry{
+				NumRetries: 12,
+			},
+		},
 	}
 
 	config.Prune()
@@ -814,7 +548,7 @@ func TestLoadConfigFile_AgentCache_AutoAuth_Force(t *testing.T) {
 }
 
 func TestLoadConfigFile_AgentCache_AutoAuth_True(t *testing.T) {
-	config, err := LoadConfigFile("./test-fixtures/config-cache-auto_auth-true.hcl")
+	config, err := LoadConfig("./test-fixtures/config-cache-auto_auth-true.hcl")
 	if err != nil {
 		t.Fatalf("err: %s", err)
 	}
@@ -839,56 +573,16 @@ func TestLoadConfigFile_AgentCache_AutoAuth_True(t *testing.T) {
 				},
 			},
 		},
-		APIProxy: &APIProxy{
-			UseAutoAuthToken:   true,
-			ForceAutoAuthToken: false,
-		},
 		Cache: &Cache{
 			UseAutoAuthToken:    true,
 			UseAutoAuthTokenRaw: "true",
 			ForceAutoAuthToken:  false,
 		},
-	}
-
-	config.Prune()
-	if diff := deep.Equal(config, expected); diff != nil {
-		t.Fatal(diff)
-	}
-}
-
-func TestLoadConfigFile_Agent_AutoAuth_APIProxyAllConfig(t *testing.T) {
-	config, err := LoadConfigFile("./test-fixtures/config-api_proxy-auto_auth-all-api_proxy-config.hcl")
-	if err != nil {
-		t.Fatalf("err: %s", err)
-	}
-
-	expected := &Config{
-		SharedConfig: &configutil.SharedConfig{
-			Listeners: []*configutil.Listener{
-				{
-					Type:       "tcp",
-					Address:    "127.0.0.1:8300",
-					TLSDisable: true,
-				},
-			},
-			PidFile: "./pidfile",
-		},
-		AutoAuth: &AutoAuth{
-			Method: &Method{
-				Type:      "aws",
-				MountPath: "auth/aws",
-				Config: map[string]interface{}{
-					"role": "foobar",
-				},
+		Vault: &Vault{
+			Retry: &Retry{
+				NumRetries: 12,
 			},
 		},
-		APIProxy: &APIProxy{
-			UseAutoAuthToken:    true,
-			UseAutoAuthTokenRaw: "force",
-			ForceAutoAuthToken:  true,
-			EnforceConsistency:  "always",
-			WhenInconsistent:    "forward",
-		},
 	}
 
 	config.Prune()
@@ -898,7 +592,7 @@ func TestLoadConfigFile_Agent_AutoAuth_APIProxyAllConfig(t *testing.T) {
 }
 
 func TestLoadConfigFile_AgentCache_AutoAuth_False(t *testing.T) {
-	config, err := LoadConfigFile("./test-fixtures/config-cache-auto_auth-false.hcl")
+	config, err := LoadConfig("./test-fixtures/config-cache-auto_auth-false.hcl")
 	if err != nil {
 		t.Fatalf("err: %s", err)
 	}
@@ -939,6 +633,11 @@ func TestLoadConfigFile_AgentCache_AutoAuth_False(t *testing.T) {
 			UseAutoAuthTokenRaw: "false",
 			ForceAutoAuthToken:  false,
 		},
+		Vault: &Vault{
+			Retry: &Retry{
+				NumRetries: 12,
+			},
+		},
 	}
 
 	config.Prune()
@@ -948,14 +647,14 @@ func TestLoadConfigFile_AgentCache_AutoAuth_False(t *testing.T) {
 }
 
 func TestLoadConfigFile_AgentCache_Persist(t *testing.T) {
-	config, err := LoadConfigFile("./test-fixtures/config-cache-persist-false.hcl")
+	config, err := LoadConfig("./test-fixtures/config-cache-persist-false.hcl")
 	if err != nil {
 		t.Fatalf("err: %s", err)
 	}
 
 	expected := &Config{
 		Cache: &Cache{
-			Persist: &agentproxyshared.PersistConfig{
+			Persist: &Persist{
 				Type:                    "kubernetes",
 				Path:                    "/vault/agent-cache/",
 				KeepAfterImport:         false,
@@ -973,6 +672,11 @@ func TestLoadConfigFile_AgentCache_Persist(t *testing.T) {
 				},
 			},
 		},
+		Vault: &Vault{
+			Retry: &Retry{
+				NumRetries: 12,
+			},
+		},
 	}
 
 	config.Prune()
@@ -982,7 +686,7 @@ func TestLoadConfigFile_AgentCache_Persist(t *testing.T) {
 }
 
 func TestLoadConfigFile_AgentCache_PersistMissingType(t *testing.T) {
-	_, err := LoadConfigFile("./test-fixtures/config-cache-persist-empty-type.hcl")
+	_, err := LoadConfig("./test-fixtures/config-cache-persist-empty-type.hcl")
 	if err == nil || os.IsNotExist(err) {
 		t.Fatal("expected error or file is missing")
 	}
@@ -1010,7 +714,7 @@ func TestLoadConfigFile_TemplateConfig(t *testing.T) {
 
 	for name, tc := range testCases {
 		t.Run(name, func(t *testing.T) {
-			config, err := LoadConfigFile(tc.fixturePath)
+			config, err := LoadConfig(tc.fixturePath)
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -1109,7 +813,7 @@ func TestLoadConfigFile_Template(t *testing.T) {
 
 	for name, tc := range testCases {
 		t.Run(name, func(t *testing.T) {
-			config, err := LoadConfigFile(tc.fixturePath)
+			config, err := LoadConfig(tc.fixturePath)
 			if err != nil {
 				t.Fatalf("err: %s", err)
 			}
@@ -1139,6 +843,11 @@ func TestLoadConfigFile_Template(t *testing.T) {
 						},
 					},
 				},
+				Vault: &Vault{
+					Retry: &Retry{
+						NumRetries: 12,
+					},
+				},
 				Templates: tc.expectedTemplates,
 			}
 
@@ -1215,7 +924,7 @@ func TestLoadConfigFile_Template_NoSinks(t *testing.T) {
 
 	for name, tc := range testCases {
 		t.Run(name, func(t *testing.T) {
-			config, err := LoadConfigFile(tc.fixturePath)
+			config, err := LoadConfig(tc.fixturePath)
 			if err != nil {
 				t.Fatalf("err: %s", err)
 			}
@@ -1236,6 +945,11 @@ func TestLoadConfigFile_Template_NoSinks(t *testing.T) {
 					Sinks: nil,
 				},
 				Templates: tc.expectedTemplates,
+				Vault: &Vault{
+					Retry: &Retry{
+						NumRetries: 12,
+					},
+				},
 			}
 
 			config.Prune()
@@ -1246,45 +960,8 @@ func TestLoadConfigFile_Template_NoSinks(t *testing.T) {
 	}
 }
 
-// TestLoadConfigFile_Template_WithCache tests ensures that cache {} stanza is
-// permitted in vault agent configuration with template(s)
-func TestLoadConfigFile_Template_WithCache(t *testing.T) {
-	config, err := LoadConfigFile("./test-fixtures/config-template-with-cache.hcl")
-	if err != nil {
-		t.Fatalf("err: %s", err)
-	}
-
-	expected := &Config{
-		SharedConfig: &configutil.SharedConfig{
-			PidFile: "./pidfile",
-		},
-		AutoAuth: &AutoAuth{
-			Method: &Method{
-				Type:      "aws",
-				MountPath: "auth/aws",
-				Namespace: "my-namespace/",
-				Config: map[string]interface{}{
-					"role": "foobar",
-				},
-			},
-		},
-		Cache: &Cache{},
-		Templates: []*ctconfig.TemplateConfig{
-			{
-				Source:      pointerutil.StringPtr("/path/on/disk/to/template.ctmpl"),
-				Destination: pointerutil.StringPtr("/path/on/disk/where/template/will/render.txt"),
-			},
-		},
-	}
-
-	config.Prune()
-	if diff := deep.Equal(config, expected); diff != nil {
-		t.Fatal(diff)
-	}
-}
-
 func TestLoadConfigFile_Vault_Retry(t *testing.T) {
-	config, err := LoadConfigFile("./test-fixtures/config-vault-retry.hcl")
+	config, err := LoadConfig("./test-fixtures/config-vault-retry.hcl")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -1329,7 +1006,7 @@ func TestLoadConfigFile_Vault_Retry(t *testing.T) {
 }
 
 func TestLoadConfigFile_Vault_Retry_Empty(t *testing.T) {
-	config, err := LoadConfigFile("./test-fixtures/config-vault-retry-empty.hcl")
+	config, err := LoadConfig("./test-fixtures/config-vault-retry-empty.hcl")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -1374,7 +1051,7 @@ func TestLoadConfigFile_Vault_Retry_Empty(t *testing.T) {
 }
 
 func TestLoadConfigFile_EnforceConsistency(t *testing.T) {
-	config, err := LoadConfigFile("./test-fixtures/config-consistency.hcl")
+	config, err := LoadConfig("./test-fixtures/config-consistency.hcl")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -1394,34 +1071,10 @@ func TestLoadConfigFile_EnforceConsistency(t *testing.T) {
 			EnforceConsistency: "always",
 			WhenInconsistent:   "retry",
 		},
-	}
-
-	config.Prune()
-	if diff := deep.Equal(config, expected); diff != nil {
-		t.Fatal(diff)
-	}
-}
-
-func TestLoadConfigFile_EnforceConsistency_APIProxy(t *testing.T) {
-	config, err := LoadConfigFile("./test-fixtures/config-consistency-apiproxy.hcl")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	expected := &Config{
-		SharedConfig: &configutil.SharedConfig{
-			Listeners: []*configutil.Listener{
-				{
-					Type:       "tcp",
-					Address:    "127.0.0.1:8300",
-					TLSDisable: true,
-				},
+		Vault: &Vault{
+			Retry: &Retry{
+				NumRetries: 12,
 			},
-			PidFile: "",
-		},
-		APIProxy: &APIProxy{
-			EnforceConsistency: "always",
-			WhenInconsistent:   "retry",
 		},
 	}
 
@@ -1432,7 +1085,7 @@ func TestLoadConfigFile_EnforceConsistency_APIProxy(t *testing.T) {
 }
 
 func TestLoadConfigFile_Disable_Idle_Conns_All(t *testing.T) {
-	config, err := LoadConfigFile("./test-fixtures/config-disable-idle-connections-all.hcl")
+	config, err := LoadConfig("./test-fixtures/config-disable-idle-connections-all.hcl")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -1441,8 +1094,8 @@ func TestLoadConfigFile_Disable_Idle_Conns_All(t *testing.T) {
 		SharedConfig: &configutil.SharedConfig{
 			PidFile: "./pidfile",
 		},
-		DisableIdleConns:           []string{"auto-auth", "caching", "templating", "proxying"},
-		DisableIdleConnsAPIProxy:   true,
+		DisableIdleConns:           []string{"auto-auth", "caching", "templating"},
+		DisableIdleConnsCaching:    true,
 		DisableIdleConnsAutoAuth:   true,
 		DisableIdleConnsTemplating: true,
 		AutoAuth: &AutoAuth{
@@ -1481,7 +1134,7 @@ func TestLoadConfigFile_Disable_Idle_Conns_All(t *testing.T) {
 }
 
 func TestLoadConfigFile_Disable_Idle_Conns_Auto_Auth(t *testing.T) {
-	config, err := LoadConfigFile("./test-fixtures/config-disable-idle-connections-auto-auth.hcl")
+	config, err := LoadConfig("./test-fixtures/config-disable-idle-connections-auto-auth.hcl")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -1491,7 +1144,7 @@ func TestLoadConfigFile_Disable_Idle_Conns_Auto_Auth(t *testing.T) {
 			PidFile: "./pidfile",
 		},
 		DisableIdleConns:           []string{"auto-auth"},
-		DisableIdleConnsAPIProxy:   false,
+		DisableIdleConnsCaching:    false,
 		DisableIdleConnsAutoAuth:   true,
 		DisableIdleConnsTemplating: false,
 		AutoAuth: &AutoAuth{
@@ -1530,7 +1183,7 @@ func TestLoadConfigFile_Disable_Idle_Conns_Auto_Auth(t *testing.T) {
 }
 
 func TestLoadConfigFile_Disable_Idle_Conns_Templating(t *testing.T) {
-	config, err := LoadConfigFile("./test-fixtures/config-disable-idle-connections-templating.hcl")
+	config, err := LoadConfig("./test-fixtures/config-disable-idle-connections-templating.hcl")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -1540,7 +1193,7 @@ func TestLoadConfigFile_Disable_Idle_Conns_Templating(t *testing.T) {
 			PidFile: "./pidfile",
 		},
 		DisableIdleConns:           []string{"templating"},
-		DisableIdleConnsAPIProxy:   false,
+		DisableIdleConnsCaching:    false,
 		DisableIdleConnsAutoAuth:   false,
 		DisableIdleConnsTemplating: true,
 		AutoAuth: &AutoAuth{
@@ -1579,7 +1232,7 @@ func TestLoadConfigFile_Disable_Idle_Conns_Templating(t *testing.T) {
 }
 
 func TestLoadConfigFile_Disable_Idle_Conns_Caching(t *testing.T) {
-	config, err := LoadConfigFile("./test-fixtures/config-disable-idle-connections-caching.hcl")
+	config, err := LoadConfig("./test-fixtures/config-disable-idle-connections-caching.hcl")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -1589,56 +1242,7 @@ func TestLoadConfigFile_Disable_Idle_Conns_Caching(t *testing.T) {
 			PidFile: "./pidfile",
 		},
 		DisableIdleConns:           []string{"caching"},
-		DisableIdleConnsAPIProxy:   true,
-		DisableIdleConnsAutoAuth:   false,
-		DisableIdleConnsTemplating: false,
-		AutoAuth: &AutoAuth{
-			Method: &Method{
-				Type:      "aws",
-				MountPath: "auth/aws",
-				Namespace: "my-namespace/",
-				Config: map[string]interface{}{
-					"role": "foobar",
-				},
-			},
-			Sinks: []*Sink{
-				{
-					Type:   "file",
-					DHType: "curve25519",
-					DHPath: "/tmp/file-foo-dhpath",
-					AAD:    "foobar",
-					Config: map[string]interface{}{
-						"path": "/tmp/file-foo",
-					},
-				},
-			},
-		},
-		Vault: &Vault{
-			Address: "http://127.0.0.1:1111",
-			Retry: &Retry{
-				ctconfig.DefaultRetryAttempts,
-			},
-		},
-	}
-
-	config.Prune()
-	if diff := deep.Equal(config, expected); diff != nil {
-		t.Fatal(diff)
-	}
-}
-
-func TestLoadConfigFile_Disable_Idle_Conns_Proxying(t *testing.T) {
-	config, err := LoadConfigFile("./test-fixtures/config-disable-idle-connections-proxying.hcl")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	expected := &Config{
-		SharedConfig: &configutil.SharedConfig{
-			PidFile: "./pidfile",
-		},
-		DisableIdleConns:           []string{"proxying"},
-		DisableIdleConnsAPIProxy:   true,
+		DisableIdleConnsCaching:    true,
 		DisableIdleConnsAutoAuth:   false,
 		DisableIdleConnsTemplating: false,
 		AutoAuth: &AutoAuth{
@@ -1677,7 +1281,7 @@ func TestLoadConfigFile_Disable_Idle_Conns_Proxying(t *testing.T) {
 }
 
 func TestLoadConfigFile_Disable_Idle_Conns_Empty(t *testing.T) {
-	config, err := LoadConfigFile("./test-fixtures/config-disable-idle-connections-empty.hcl")
+	config, err := LoadConfig("./test-fixtures/config-disable-idle-connections-empty.hcl")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -1687,7 +1291,7 @@ func TestLoadConfigFile_Disable_Idle_Conns_Empty(t *testing.T) {
 			PidFile: "./pidfile",
 		},
 		DisableIdleConns:           []string{},
-		DisableIdleConnsAPIProxy:   false,
+		DisableIdleConnsCaching:    false,
 		DisableIdleConnsAutoAuth:   false,
 		DisableIdleConnsTemplating: false,
 		AutoAuth: &AutoAuth{
@@ -1732,7 +1336,7 @@ func TestLoadConfigFile_Disable_Idle_Conns_Env(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	config, err := LoadConfigFile("./test-fixtures/config-disable-idle-connections-empty.hcl")
+	config, err := LoadConfig("./test-fixtures/config-disable-idle-connections-empty.hcl")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -1742,7 +1346,7 @@ func TestLoadConfigFile_Disable_Idle_Conns_Env(t *testing.T) {
 			PidFile: "./pidfile",
 		},
 		DisableIdleConns:           []string{"auto-auth", "caching", "templating"},
-		DisableIdleConnsAPIProxy:   true,
+		DisableIdleConnsCaching:    true,
 		DisableIdleConnsAutoAuth:   true,
 		DisableIdleConnsTemplating: true,
 		AutoAuth: &AutoAuth{
@@ -1781,14 +1385,14 @@ func TestLoadConfigFile_Disable_Idle_Conns_Env(t *testing.T) {
 }
 
 func TestLoadConfigFile_Bad_Value_Disable_Idle_Conns(t *testing.T) {
-	_, err := LoadConfigFile("./test-fixtures/bad-config-disable-idle-connections.hcl")
+	_, err := LoadConfig("./test-fixtures/bad-config-disable-idle-connections.hcl")
 	if err == nil {
 		t.Fatal("should have error, it didn't")
 	}
 }
 
 func TestLoadConfigFile_Disable_Keep_Alives_All(t *testing.T) {
-	config, err := LoadConfigFile("./test-fixtures/config-disable-keep-alives-all.hcl")
+	config, err := LoadConfig("./test-fixtures/config-disable-keep-alives-all.hcl")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -1797,8 +1401,8 @@ func TestLoadConfigFile_Disable_Keep_Alives_All(t *testing.T) {
 		SharedConfig: &configutil.SharedConfig{
 			PidFile: "./pidfile",
 		},
-		DisableKeepAlives:           []string{"auto-auth", "caching", "templating", "proxying"},
-		DisableKeepAlivesAPIProxy:   true,
+		DisableKeepAlives:           []string{"auto-auth", "caching", "templating"},
+		DisableKeepAlivesCaching:    true,
 		DisableKeepAlivesAutoAuth:   true,
 		DisableKeepAlivesTemplating: true,
 		AutoAuth: &AutoAuth{
@@ -1837,7 +1441,7 @@ func TestLoadConfigFile_Disable_Keep_Alives_All(t *testing.T) {
 }
 
 func TestLoadConfigFile_Disable_Keep_Alives_Auto_Auth(t *testing.T) {
-	config, err := LoadConfigFile("./test-fixtures/config-disable-keep-alives-auto-auth.hcl")
+	config, err := LoadConfig("./test-fixtures/config-disable-keep-alives-auto-auth.hcl")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -1847,7 +1451,7 @@ func TestLoadConfigFile_Disable_Keep_Alives_Auto_Auth(t *testing.T) {
 			PidFile: "./pidfile",
 		},
 		DisableKeepAlives:           []string{"auto-auth"},
-		DisableKeepAlivesAPIProxy:   false,
+		DisableKeepAlivesCaching:    false,
 		DisableKeepAlivesAutoAuth:   true,
 		DisableKeepAlivesTemplating: false,
 		AutoAuth: &AutoAuth{
@@ -1886,7 +1490,7 @@ func TestLoadConfigFile_Disable_Keep_Alives_Auto_Auth(t *testing.T) {
 }
 
 func TestLoadConfigFile_Disable_Keep_Alives_Templating(t *testing.T) {
-	config, err := LoadConfigFile("./test-fixtures/config-disable-keep-alives-templating.hcl")
+	config, err := LoadConfig("./test-fixtures/config-disable-keep-alives-templating.hcl")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -1896,7 +1500,7 @@ func TestLoadConfigFile_Disable_Keep_Alives_Templating(t *testing.T) {
 			PidFile: "./pidfile",
 		},
 		DisableKeepAlives:           []string{"templating"},
-		DisableKeepAlivesAPIProxy:   false,
+		DisableKeepAlivesCaching:    false,
 		DisableKeepAlivesAutoAuth:   false,
 		DisableKeepAlivesTemplating: true,
 		AutoAuth: &AutoAuth{
@@ -1935,7 +1539,7 @@ func TestLoadConfigFile_Disable_Keep_Alives_Templating(t *testing.T) {
 }
 
 func TestLoadConfigFile_Disable_Keep_Alives_Caching(t *testing.T) {
-	config, err := LoadConfigFile("./test-fixtures/config-disable-keep-alives-caching.hcl")
+	config, err := LoadConfig("./test-fixtures/config-disable-keep-alives-caching.hcl")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -1945,56 +1549,7 @@ func TestLoadConfigFile_Disable_Keep_Alives_Caching(t *testing.T) {
 			PidFile: "./pidfile",
 		},
 		DisableKeepAlives:           []string{"caching"},
-		DisableKeepAlivesAPIProxy:   true,
-		DisableKeepAlivesAutoAuth:   false,
-		DisableKeepAlivesTemplating: false,
-		AutoAuth: &AutoAuth{
-			Method: &Method{
-				Type:      "aws",
-				MountPath: "auth/aws",
-				Namespace: "my-namespace/",
-				Config: map[string]interface{}{
-					"role": "foobar",
-				},
-			},
-			Sinks: []*Sink{
-				{
-					Type:   "file",
-					DHType: "curve25519",
-					DHPath: "/tmp/file-foo-dhpath",
-					AAD:    "foobar",
-					Config: map[string]interface{}{
-						"path": "/tmp/file-foo",
-					},
-				},
-			},
-		},
-		Vault: &Vault{
-			Address: "http://127.0.0.1:1111",
-			Retry: &Retry{
-				ctconfig.DefaultRetryAttempts,
-			},
-		},
-	}
-
-	config.Prune()
-	if diff := deep.Equal(config, expected); diff != nil {
-		t.Fatal(diff)
-	}
-}
-
-func TestLoadConfigFile_Disable_Keep_Alives_Proxying(t *testing.T) {
-	config, err := LoadConfigFile("./test-fixtures/config-disable-keep-alives-proxying.hcl")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	expected := &Config{
-		SharedConfig: &configutil.SharedConfig{
-			PidFile: "./pidfile",
-		},
-		DisableKeepAlives:           []string{"proxying"},
-		DisableKeepAlivesAPIProxy:   true,
+		DisableKeepAlivesCaching:    true,
 		DisableKeepAlivesAutoAuth:   false,
 		DisableKeepAlivesTemplating: false,
 		AutoAuth: &AutoAuth{
@@ -2033,7 +1588,7 @@ func TestLoadConfigFile_Disable_Keep_Alives_Proxying(t *testing.T) {
 }
 
 func TestLoadConfigFile_Disable_Keep_Alives_Empty(t *testing.T) {
-	config, err := LoadConfigFile("./test-fixtures/config-disable-keep-alives-empty.hcl")
+	config, err := LoadConfig("./test-fixtures/config-disable-keep-alives-empty.hcl")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -2043,7 +1598,7 @@ func TestLoadConfigFile_Disable_Keep_Alives_Empty(t *testing.T) {
 			PidFile: "./pidfile",
 		},
 		DisableKeepAlives:           []string{},
-		DisableKeepAlivesAPIProxy:   false,
+		DisableKeepAlivesCaching:    false,
 		DisableKeepAlivesAutoAuth:   false,
 		DisableKeepAlivesTemplating: false,
 		AutoAuth: &AutoAuth{
@@ -2088,7 +1643,7 @@ func TestLoadConfigFile_Disable_Keep_Alives_Env(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	config, err := LoadConfigFile("./test-fixtures/config-disable-keep-alives-empty.hcl")
+	config, err := LoadConfig("./test-fixtures/config-disable-keep-alives-empty.hcl")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -2098,7 +1653,7 @@ func TestLoadConfigFile_Disable_Keep_Alives_Env(t *testing.T) {
 			PidFile: "./pidfile",
 		},
 		DisableKeepAlives:           []string{"auto-auth", "caching", "templating"},
-		DisableKeepAlivesAPIProxy:   true,
+		DisableKeepAlivesCaching:    true,
 		DisableKeepAlivesAutoAuth:   true,
 		DisableKeepAlivesTemplating: true,
 		AutoAuth: &AutoAuth{
@@ -2137,194 +1692,8 @@ func TestLoadConfigFile_Disable_Keep_Alives_Env(t *testing.T) {
 }
 
 func TestLoadConfigFile_Bad_Value_Disable_Keep_Alives(t *testing.T) {
-	_, err := LoadConfigFile("./test-fixtures/bad-config-disable-keep-alives.hcl")
+	_, err := LoadConfig("./test-fixtures/bad-config-disable-keep-alives.hcl")
 	if err == nil {
 		t.Fatal("should have error, it didn't")
 	}
 }
-
-// TestLoadConfigFile_EnvTemplates_Simple loads and validates an env_template config
-func TestLoadConfigFile_EnvTemplates_Simple(t *testing.T) {
-	cfg, err := LoadConfigFile("./test-fixtures/config-env-templates-simple.hcl")
-	if err != nil {
-		t.Fatalf("error loading config file: %s", err)
-	}
-
-	if err := cfg.ValidateConfig(); err != nil {
-		t.Fatalf("validation error: %s", err)
-	}
-
-	expectedKey := "MY_DATABASE_USER"
-	found := false
-	for _, envTemplate := range cfg.EnvTemplates {
-		if *envTemplate.MapToEnvironmentVariable == expectedKey {
-			found = true
-		}
-	}
-	if !found {
-		t.Fatalf("expected environment variable name to be populated")
-	}
-}
-
-// TestLoadConfigFile_EnvTemplates_Complex loads and validates an env_template config
-func TestLoadConfigFile_EnvTemplates_Complex(t *testing.T) {
-	cfg, err := LoadConfigFile("./test-fixtures/config-env-templates-complex.hcl")
-	if err != nil {
-		t.Fatalf("error loading config file: %s", err)
-	}
-
-	if err := cfg.ValidateConfig(); err != nil {
-		t.Fatalf("validation error: %s", err)
-	}
-
-	expectedKeys := []string{
-		"FOO_PASSWORD",
-		"FOO_USER",
-	}
-
-	envExists := func(key string) bool {
-		for _, envTmpl := range cfg.EnvTemplates {
-			if *envTmpl.MapToEnvironmentVariable == key {
-				return true
-			}
-		}
-		return false
-	}
-
-	for _, expected := range expectedKeys {
-		if !envExists(expected) {
-			t.Fatalf("expected environment variable %s", expected)
-		}
-	}
-}
-
-// TestLoadConfigFile_EnvTemplates_WithSource loads and validates an
-// env_template config with "source" instead of "contents"
-func TestLoadConfigFile_EnvTemplates_WithSource(t *testing.T) {
-	cfg, err := LoadConfigFile("./test-fixtures/config-env-templates-with-source.hcl")
-	if err != nil {
-		t.Fatalf("error loading config file: %s", err)
-	}
-
-	if err := cfg.ValidateConfig(); err != nil {
-		t.Fatalf("validation error: %s", err)
-	}
-}
-
-// TestLoadConfigFile_EnvTemplates_NoName ensures that env_template with no name triggers an error
-func TestLoadConfigFile_EnvTemplates_NoName(t *testing.T) {
-	_, err := LoadConfigFile("./test-fixtures/bad-config-env-templates-no-name.hcl")
-	if err == nil {
-		t.Fatalf("expected error")
-	}
-}
-
-// TestLoadConfigFile_EnvTemplates_ExecInvalidSignal ensures that an invalid signal triggers an error
-func TestLoadConfigFile_EnvTemplates_ExecInvalidSignal(t *testing.T) {
-	_, err := LoadConfigFile("./test-fixtures/bad-config-env-templates-invalid-signal.hcl")
-	if err == nil {
-		t.Fatalf("expected error")
-	}
-}
-
-// TestLoadConfigFile_EnvTemplates_ExecSimple validates the exec section with default parameters
-func TestLoadConfigFile_EnvTemplates_ExecSimple(t *testing.T) {
-	cfg, err := LoadConfigFile("./test-fixtures/config-env-templates-simple.hcl")
-	if err != nil {
-		t.Fatalf("error loading config file: %s", err)
-	}
-
-	if err := cfg.ValidateConfig(); err != nil {
-		t.Fatalf("validation error: %s", err)
-	}
-
-	expectedCmd := []string{"/path/to/my/app", "arg1", "arg2"}
-	if !slices.Equal(cfg.Exec.Command, expectedCmd) {
-		t.Fatal("exec.command does not have expected value")
-	}
-
-	// check defaults
-	if cfg.Exec.RestartOnSecretChanges != "always" {
-		t.Fatalf("expected cfg.Exec.RestartOnSecretChanges to be 'always', got '%s'", cfg.Exec.RestartOnSecretChanges)
-	}
-
-	if cfg.Exec.RestartStopSignal != syscall.SIGTERM {
-		t.Fatalf("expected cfg.Exec.RestartStopSignal to be 'syscall.SIGTERM', got '%s'", cfg.Exec.RestartStopSignal)
-	}
-}
-
-// TestLoadConfigFile_EnvTemplates_ExecComplex validates the exec section with non-default parameters
-func TestLoadConfigFile_EnvTemplates_ExecComplex(t *testing.T) {
-	cfg, err := LoadConfigFile("./test-fixtures/config-env-templates-complex.hcl")
-	if err != nil {
-		t.Fatalf("error loading config file: %s", err)
-	}
-
-	if err := cfg.ValidateConfig(); err != nil {
-		t.Fatalf("validation error: %s", err)
-	}
-
-	if !slices.Equal(cfg.Exec.Command, []string{"env"}) {
-		t.Fatal("exec.command does not have expected value")
-	}
-
-	if cfg.Exec.RestartOnSecretChanges != "never" {
-		t.Fatalf("expected cfg.Exec.RestartOnSecretChanges to be 'never', got %q", cfg.Exec.RestartOnSecretChanges)
-	}
-
-	if cfg.Exec.RestartStopSignal != syscall.SIGINT {
-		t.Fatalf("expected cfg.Exec.RestartStopSignal to be 'syscall.SIGINT', got %q", cfg.Exec.RestartStopSignal)
-	}
-}
-
-// TestLoadConfigFile_Bad_EnvTemplates_MissingExec ensures that ValidateConfig
-// errors when "env_template" stanza(s) are specified but "exec" is missing
-func TestLoadConfigFile_Bad_EnvTemplates_MissingExec(t *testing.T) {
-	config, err := LoadConfigFile("./test-fixtures/bad-config-env-templates-missing-exec.hcl")
-	if err != nil {
-		t.Fatalf("error loading config file: %s", err)
-	}
-
-	if err := config.ValidateConfig(); err == nil {
-		t.Fatal("expected an error from ValidateConfig: exec section is missing")
-	}
-}
-
-// TestLoadConfigFile_Bad_EnvTemplates_WithProxy ensures that ValidateConfig
-// errors when both env_template and api_proxy stanzas are present
-func TestLoadConfigFile_Bad_EnvTemplates_WithProxy(t *testing.T) {
-	config, err := LoadConfigFile("./test-fixtures/bad-config-env-templates-with-proxy.hcl")
-	if err != nil {
-		t.Fatalf("error loading config file: %s", err)
-	}
-
-	if err := config.ValidateConfig(); err == nil {
-		t.Fatal("expected an error from ValidateConfig: listener / api_proxy are not compatible with env_template")
-	}
-}
-
-// TestLoadConfigFile_Bad_EnvTemplates_WithFileTemplates ensures that
-// ValidateConfig errors when both env_template and template stanzas are present
-func TestLoadConfigFile_Bad_EnvTemplates_WithFileTemplates(t *testing.T) {
-	config, err := LoadConfigFile("./test-fixtures/bad-config-env-templates-with-file-templates.hcl")
-	if err != nil {
-		t.Fatalf("error loading config file: %s", err)
-	}
-
-	if err := config.ValidateConfig(); err == nil {
-		t.Fatal("expected an error from ValidateConfig: file template stanza is not compatible with env_template")
-	}
-}
-
-// TestLoadConfigFile_Bad_EnvTemplates_DisalowedFields ensure that
-// ValidateConfig errors for disalowed env_template fields
-func TestLoadConfigFile_Bad_EnvTemplates_DisalowedFields(t *testing.T) {
-	config, err := LoadConfigFile("./test-fixtures/bad-config-env-templates-disalowed-fields.hcl")
-	if err != nil {
-		t.Fatalf("error loading config file: %s", err)
-	}
-
-	if err := config.ValidateConfig(); err == nil {
-		t.Fatal("expected an error from ValidateConfig: disallowed fields specified in env_template")
-	}
-}
diff --git a/command/agent/config/test-fixtures/bad-config-api_proxy-cache.hcl b/command/agent/config/test-fixtures/bad-config-api_proxy-cache.hcl
deleted file mode 100644
index 7d2bf5c2d3a96..0000000000000
--- a/command/agent/config/test-fixtures/bad-config-api_proxy-cache.hcl
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
-pid_file = "./pidfile"
-
-auto_auth {
-	method {
-		type = "aws"
-		config = {
-			role = "foobar"
-		}
-	}
-}
-
-cache {
-    use_auto_auth_token = true
-}
-
-api_proxy {
-	use_auto_auth_token = "force"
-}
-
-listener "tcp" {
-    address = "127.0.0.1:8300"
-    tls_disable = true
-}
diff --git a/command/agent/config/test-fixtures/bad-config-auto_auth-nosinks-nocache-notemplates.hcl b/command/agent/config/test-fixtures/bad-config-auto_auth-nosinks-nocache-notemplates.hcl
index d3d5d426695ae..93e31aad4d737 100644
--- a/command/agent/config/test-fixtures/bad-config-auto_auth-nosinks-nocache-notemplates.hcl
+++ b/command/agent/config/test-fixtures/bad-config-auto_auth-nosinks-nocache-notemplates.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 pid_file = "./pidfile"
 
 auto_auth {
diff --git a/command/agent/config/test-fixtures/bad-config-auto_auth-wrapped-multiple-sinks.hcl b/command/agent/config/test-fixtures/bad-config-auto_auth-wrapped-multiple-sinks.hcl
index 5c2b3fb79a792..9a491fa4efc25 100644
--- a/command/agent/config/test-fixtures/bad-config-auto_auth-wrapped-multiple-sinks.hcl
+++ b/command/agent/config/test-fixtures/bad-config-auto_auth-wrapped-multiple-sinks.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 pid_file = "./pidfile"
 
 auto_auth {
diff --git a/command/agent/config/test-fixtures/bad-config-cache-auto_auth-method-wrapping.hcl b/command/agent/config/test-fixtures/bad-config-cache-auto_auth-method-wrapping.hcl
index 8a39837fa721b..5821c1b59f839 100644
--- a/command/agent/config/test-fixtures/bad-config-cache-auto_auth-method-wrapping.hcl
+++ b/command/agent/config/test-fixtures/bad-config-cache-auto_auth-method-wrapping.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 pid_file = "./pidfile"
 
 auto_auth {
diff --git a/command/agent/config/test-fixtures/bad-config-cache-force-token-no-auth-method.hcl b/command/agent/config/test-fixtures/bad-config-cache-force-token-no-auth-method.hcl
index d1cae75129707..e2c8b328eb02d 100644
--- a/command/agent/config/test-fixtures/bad-config-cache-force-token-no-auth-method.hcl
+++ b/command/agent/config/test-fixtures/bad-config-cache-force-token-no-auth-method.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 pid_file = "./pidfile"
 
 cache {
diff --git a/command/agent/config/test-fixtures/bad-config-cache-inconsistent-auto_auth.hcl b/command/agent/config/test-fixtures/bad-config-cache-inconsistent-auto_auth.hcl
index 38b9c2c12207b..5029b8d376416 100644
--- a/command/agent/config/test-fixtures/bad-config-cache-inconsistent-auto_auth.hcl
+++ b/command/agent/config/test-fixtures/bad-config-cache-inconsistent-auto_auth.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 pid_file = "./pidfile"
 
 cache {
diff --git a/command/agent/config/test-fixtures/bad-config-cache-no-listeners.hcl b/command/agent/config/test-fixtures/bad-config-cache-no-listeners.hcl
index 9112183ea8427..9d8110e2d67c6 100644
--- a/command/agent/config/test-fixtures/bad-config-cache-no-listeners.hcl
+++ b/command/agent/config/test-fixtures/bad-config-cache-no-listeners.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 pid_file = "./pidfile"
 
 cache {
diff --git a/command/agent/config/test-fixtures/bad-config-disable-idle-connections.hcl b/command/agent/config/test-fixtures/bad-config-disable-idle-connections.hcl
index 34c292e74f9bb..c13c82520ee6b 100644
--- a/command/agent/config/test-fixtures/bad-config-disable-idle-connections.hcl
+++ b/command/agent/config/test-fixtures/bad-config-disable-idle-connections.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 pid_file = "./pidfile"
 disable_idle_connections = ["foo","caching","templating"]
 
diff --git a/command/agent/config/test-fixtures/bad-config-disable-keep-alives.hcl b/command/agent/config/test-fixtures/bad-config-disable-keep-alives.hcl
index 087e2ffa010d2..3f1b9f0a198ef 100644
--- a/command/agent/config/test-fixtures/bad-config-disable-keep-alives.hcl
+++ b/command/agent/config/test-fixtures/bad-config-disable-keep-alives.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 pid_file = "./pidfile"
 disable_keep_alives = ["foo","caching","templating"]
 
diff --git a/command/agent/config/test-fixtures/bad-config-env-templates-disalowed-fields.hcl b/command/agent/config/test-fixtures/bad-config-env-templates-disalowed-fields.hcl
deleted file mode 100644
index 22ad96c5cf930..0000000000000
--- a/command/agent/config/test-fixtures/bad-config-env-templates-disalowed-fields.hcl
+++ /dev/null
@@ -1,33 +0,0 @@
-auto_auth {
-
-  method {
-    type = "token_file"
-
-    config {
-      token_file_path = "/Users/avean/.vault-token"
-    }
-  }
-}
-
-template_config {
-  static_secret_render_interval = "5m"
-  exit_on_retry_failure         = true
-}
-
-vault {
-  address = "http://localhost:8200"
-}
-
-env_template "FOO_PASSWORD" {
-  contents    = "{{ with secret \"secret/data/foo\" }}{{ .Data.data.password }}{{ end }}"
-
-  # Error: destination and create_dest_dirs are not allowed in env_template
-  destination      = "/path/on/disk/where/template/will/render.txt"
-  create_dest_dirs = true
-}
-
-exec {
-  command                   = ["./my-app", "arg1", "arg2"]
-  restart_on_secret_changes = "always"
-  restart_stop_signal       = "SIGTERM"
-}
diff --git a/command/agent/config/test-fixtures/bad-config-env-templates-invalid-signal.hcl b/command/agent/config/test-fixtures/bad-config-env-templates-invalid-signal.hcl
deleted file mode 100644
index e8d822d64b0d4..0000000000000
--- a/command/agent/config/test-fixtures/bad-config-env-templates-invalid-signal.hcl
+++ /dev/null
@@ -1,26 +0,0 @@
-auto_auth {
-
-  method {
-    type = "token_file"
-
-    config {
-      token_file_path = "/home/username/.vault-token"
-    }
-  }
-}
-
-vault {
-  address = "http://localhost:8200"
-}
-
-env_template "FOO" {
-  contents             = "{{ with secret \"secret/data/foo\" }}{{ .Data.data.lock }}{{ end }}"
-  error_on_missing_key = false
-}
-
-
-exec {
-  command                   = ["env"]
-  restart_on_secret_changes = "never"
-  restart_stop_signal       = "notasignal"
-}
diff --git a/command/agent/config/test-fixtures/bad-config-env-templates-missing-exec.hcl b/command/agent/config/test-fixtures/bad-config-env-templates-missing-exec.hcl
deleted file mode 100644
index 6283e56a9a467..0000000000000
--- a/command/agent/config/test-fixtures/bad-config-env-templates-missing-exec.hcl
+++ /dev/null
@@ -1,30 +0,0 @@
-auto_auth {
-
-  method {
-    type = "token_file"
-
-    config {
-      token_file_path = "/Users/avean/.vault-token"
-    }
-  }
-}
-
-template_config {
-  static_secret_render_interval = "5m"
-  exit_on_retry_failure         = true
-}
-
-vault {
-  address = "http://localhost:8200"
-}
-
-env_template "FOO_PASSWORD" {
-  contents             = "{{ with secret \"secret/data/foo\" }}{{ .Data.data.password }}{{ end }}"
-  error_on_missing_key = false
-}
-env_template "FOO_USER" {
-  contents             = "{{ with secret \"secret/data/foo\" }}{{ .Data.data.user }}{{ end }}"
-  error_on_missing_key = false
-}
-
-# Error: missing a required "exec" section!
diff --git a/command/agent/config/test-fixtures/bad-config-env-templates-no-name.hcl b/command/agent/config/test-fixtures/bad-config-env-templates-no-name.hcl
deleted file mode 100644
index f77f20c11227e..0000000000000
--- a/command/agent/config/test-fixtures/bad-config-env-templates-no-name.hcl
+++ /dev/null
@@ -1,26 +0,0 @@
-auto_auth {
-
-  method {
-    type = "token_file"
-
-    config {
-      token_file_path = "/home/username/.vault-token"
-    }
-  }
-}
-
-vault {
-  address = "http://localhost:8200"
-}
-
-env_template {
-  contents             = "{{ with secret \"secret/data/foo\" }}{{ .Data.data.lock }}{{ end }}"
-  error_on_missing_key = false
-}
-
-
-exec {
-  command                   = ["env"]
-  restart_on_secret_changes = "never"
-  restart_stop_signal       = "SIGTERM"
-}
diff --git a/command/agent/config/test-fixtures/bad-config-env-templates-with-file-templates.hcl b/command/agent/config/test-fixtures/bad-config-env-templates-with-file-templates.hcl
deleted file mode 100644
index 811b10d5208f2..0000000000000
--- a/command/agent/config/test-fixtures/bad-config-env-templates-with-file-templates.hcl
+++ /dev/null
@@ -1,40 +0,0 @@
-auto_auth {
-
-  method {
-    type = "token_file"
-
-    config {
-      token_file_path = "/Users/avean/.vault-token"
-    }
-  }
-}
-
-template_config {
-  static_secret_render_interval = "5m"
-  exit_on_retry_failure         = true
-}
-
-vault {
-  address = "http://localhost:8200"
-}
-
-# Error: template is incompatible with env_template!
-template {
-  source      = "/path/on/disk/to/template.ctmpl"
-  destination = "/path/on/disk/where/template/will/render.txt"
-}
-
-env_template "FOO_PASSWORD" {
-  contents             = "{{ with secret \"secret/data/foo\" }}{{ .Data.data.password }}{{ end }}"
-  error_on_missing_key = false
-}
-env_template "FOO_USER" {
-  contents             = "{{ with secret \"secret/data/foo\" }}{{ .Data.data.user }}{{ end }}"
-  error_on_missing_key = false
-}
-
-exec {
-  command                   = ["./my-app", "arg1", "arg2"]
-  restart_on_secret_changes = "always"
-  restart_stop_signal       = "SIGTERM"
-}
diff --git a/command/agent/config/test-fixtures/bad-config-env-templates-with-proxy.hcl b/command/agent/config/test-fixtures/bad-config-env-templates-with-proxy.hcl
deleted file mode 100644
index 3c6095ddeae82..0000000000000
--- a/command/agent/config/test-fixtures/bad-config-env-templates-with-proxy.hcl
+++ /dev/null
@@ -1,47 +0,0 @@
-auto_auth {
-
-  method {
-    type = "token_file"
-
-    config {
-      token_file_path = "/Users/avean/.vault-token"
-    }
-  }
-}
-
-template_config {
-  static_secret_render_interval = "5m"
-  exit_on_retry_failure         = true
-}
-
-vault {
-  address = "http://localhost:8200"
-}
-
-env_template "FOO_PASSWORD" {
-  contents             = "{{ with secret \"secret/data/foo\" }}{{ .Data.data.password }}{{ end }}"
-  error_on_missing_key = false
-}
-env_template "FOO_USER" {
-  contents             = "{{ with secret \"secret/data/foo\" }}{{ .Data.data.user }}{{ end }}"
-  error_on_missing_key = false
-}
-
-exec {
-  command                   = ["./my-app", "arg1", "arg2"]
-  restart_on_secret_changes = "always"
-  restart_stop_signal       = "SIGTERM"
-}
-
-# Error: api_proxy is incompatible with env_template
-api_proxy {
-	use_auto_auth_token = "force"
-	enforce_consistency = "always"
-	when_inconsistent   = "forward"
-}
-
-# Error: listener is incompatible with env_template
-listener "tcp" {
-    address = "127.0.0.1:8300"
-    tls_disable = true
-}
diff --git a/command/agent/config/test-fixtures/bad-config-method-wrapping-and-sink-wrapping.hcl b/command/agent/config/test-fixtures/bad-config-method-wrapping-and-sink-wrapping.hcl
index cb9696dfb3f16..7a375737161a8 100644
--- a/command/agent/config/test-fixtures/bad-config-method-wrapping-and-sink-wrapping.hcl
+++ b/command/agent/config/test-fixtures/bad-config-method-wrapping-and-sink-wrapping.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 pid_file = "./pidfile"
 
 auto_auth {
diff --git a/command/agent/config/test-fixtures/config-api_proxy-auto_auth-all-api_proxy-config.hcl b/command/agent/config/test-fixtures/config-api_proxy-auto_auth-all-api_proxy-config.hcl
deleted file mode 100644
index a3e4e5b99a2a9..0000000000000
--- a/command/agent/config/test-fixtures/config-api_proxy-auto_auth-all-api_proxy-config.hcl
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
-pid_file = "./pidfile"
-
-auto_auth {
-	method {
-		type = "aws"
-		config = {
-			role = "foobar"
-		}
-	}
-}
-
-api_proxy {
-	use_auto_auth_token = "force"
-	enforce_consistency = "always"
-	when_inconsistent = "forward"
-}
-
-listener "tcp" {
-    address = "127.0.0.1:8300"
-    tls_disable = true
-}
diff --git a/command/agent/config/test-fixtures/config-cache-auto_auth-false.hcl b/command/agent/config/test-fixtures/config-cache-auto_auth-false.hcl
index 252216e21d7fc..1a2fd91d6c70e 100644
--- a/command/agent/config/test-fixtures/config-cache-auto_auth-false.hcl
+++ b/command/agent/config/test-fixtures/config-cache-auto_auth-false.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 pid_file = "./pidfile"
 
 auto_auth {
diff --git a/command/agent/config/test-fixtures/config-cache-auto_auth-force.hcl b/command/agent/config/test-fixtures/config-cache-auto_auth-force.hcl
index 429645527a15a..9aad89cdd2aa4 100644
--- a/command/agent/config/test-fixtures/config-cache-auto_auth-force.hcl
+++ b/command/agent/config/test-fixtures/config-cache-auto_auth-force.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 pid_file = "./pidfile"
 
 auto_auth {
diff --git a/command/agent/config/test-fixtures/config-cache-auto_auth-no-sink.hcl b/command/agent/config/test-fixtures/config-cache-auto_auth-no-sink.hcl
index 80486b346b1c2..b3dc1383f6762 100644
--- a/command/agent/config/test-fixtures/config-cache-auto_auth-no-sink.hcl
+++ b/command/agent/config/test-fixtures/config-cache-auto_auth-no-sink.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 pid_file = "./pidfile"
 
 auto_auth {
diff --git a/command/agent/config/test-fixtures/config-cache-auto_auth-true.hcl b/command/agent/config/test-fixtures/config-cache-auto_auth-true.hcl
index cebcdfbc58682..ccadc501d07c9 100644
--- a/command/agent/config/test-fixtures/config-cache-auto_auth-true.hcl
+++ b/command/agent/config/test-fixtures/config-cache-auto_auth-true.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 pid_file = "./pidfile"
 
 auto_auth {
@@ -14,10 +11,10 @@ auto_auth {
 
 cache {
 	use_auto_auth_token = "true"
-	force_auto_auth_token = false
 }
 
 listener "tcp" {
     address = "127.0.0.1:8300"
     tls_disable = true
 }
+
diff --git a/command/agent/config/test-fixtures/config-cache-embedded-type.hcl b/command/agent/config/test-fixtures/config-cache-embedded-type.hcl
index 4ea525753b6c8..3c56153157cac 100644
--- a/command/agent/config/test-fixtures/config-cache-embedded-type.hcl
+++ b/command/agent/config/test-fixtures/config-cache-embedded-type.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 pid_file = "./pidfile"
 
 auto_auth {
@@ -49,14 +46,6 @@ listener {
 
 listener {
     type = "tcp"
-    address = "127.0.0.1:3000"
-    tls_disable = true
-    role = "metrics_only"
-}
-
-listener {
-    type = "tcp"
-    role = "default"
     address = "127.0.0.1:8400"
     tls_key_file = "/path/to/cakey.pem"
     tls_cert_file = "/path/to/cacert.pem"
diff --git a/command/agent/config/test-fixtures/config-cache-no-auto_auth.hcl b/command/agent/config/test-fixtures/config-cache-no-auto_auth.hcl
index 45c71412bdd5e..7a2a57f683aec 100644
--- a/command/agent/config/test-fixtures/config-cache-no-auto_auth.hcl
+++ b/command/agent/config/test-fixtures/config-cache-no-auto_auth.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 pid_file = "./pidfile"
 
 cache {
diff --git a/command/agent/config/test-fixtures/config-cache-no-listeners.hcl b/command/agent/config/test-fixtures/config-cache-no-listeners.hcl
index 3e0abfb6b9eb7..d7176e0aa539a 100644
--- a/command/agent/config/test-fixtures/config-cache-no-listeners.hcl
+++ b/command/agent/config/test-fixtures/config-cache-no-listeners.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 pid_file = "./pidfile"
 
 auto_auth {
diff --git a/command/agent/config/test-fixtures/config-cache-persist-empty-type.hcl b/command/agent/config/test-fixtures/config-cache-persist-empty-type.hcl
index f40715e6e418f..55f1d64801612 100644
--- a/command/agent/config/test-fixtures/config-cache-persist-empty-type.hcl
+++ b/command/agent/config/test-fixtures/config-cache-persist-empty-type.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 pid_file = "./pidfile"
 
 cache {
diff --git a/command/agent/config/test-fixtures/config-cache-persist-false.hcl b/command/agent/config/test-fixtures/config-cache-persist-false.hcl
index 77bb926cffdfc..5ab7f04499118 100644
--- a/command/agent/config/test-fixtures/config-cache-persist-false.hcl
+++ b/command/agent/config/test-fixtures/config-cache-persist-false.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 pid_file = "./pidfile"
 
 cache {
diff --git a/command/agent/config/test-fixtures/config-cache.hcl b/command/agent/config/test-fixtures/config-cache.hcl
index 87fa5afad8618..b468e9a077b28 100644
--- a/command/agent/config/test-fixtures/config-cache.hcl
+++ b/command/agent/config/test-fixtures/config-cache.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 pid_file = "./pidfile"
 
 auto_auth {
@@ -46,15 +43,7 @@ listener "tcp" {
     tls_disable = true
 }
 
-listener {
-    type = "tcp"
-    address = "127.0.0.1:3000"
-    tls_disable = true
-    role = "metrics_only"
-}
-
 listener "tcp" {
-    role = "default"
     address = "127.0.0.1:8400"
     tls_key_file = "/path/to/cakey.pem"
     tls_cert_file = "/path/to/cacert.pem"
diff --git a/command/agent/config/test-fixtures/config-consistency-apiproxy.hcl b/command/agent/config/test-fixtures/config-consistency-apiproxy.hcl
deleted file mode 100644
index c2e662a67206a..0000000000000
--- a/command/agent/config/test-fixtures/config-consistency-apiproxy.hcl
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
-api_proxy {
-	enforce_consistency = "always"
-	when_inconsistent = "retry"
-}
-
-listener "tcp" {
-	address = "127.0.0.1:8300"
-	tls_disable = true
-}
diff --git a/command/agent/config/test-fixtures/config-consistency.hcl b/command/agent/config/test-fixtures/config-consistency.hcl
index 535181197c6c1..d57e0557362e1 100644
--- a/command/agent/config/test-fixtures/config-consistency.hcl
+++ b/command/agent/config/test-fixtures/config-consistency.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 cache {
 	enforce_consistency = "always"
 	when_inconsistent = "retry"
diff --git a/command/agent/config/test-fixtures/config-dir-auto-auth-and-listener/config1.hcl b/command/agent/config/test-fixtures/config-dir-auto-auth-and-listener/config1.hcl
deleted file mode 100644
index c900df6b1aa3f..0000000000000
--- a/command/agent/config/test-fixtures/config-dir-auto-auth-and-listener/config1.hcl
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
-pid_file = "./pidfile"
-
-auto_auth {
-	method {
-		type = "aws"
-		config = {
-			role = "foobar"
-		}
-	}
-
-	sink {
-		type = "file"
-		config = {
-			path = "/tmp/file-foo"
-		}
-		aad = "foobar"
-		dh_type = "curve25519"
-		dh_path = "/tmp/file-foo-dhpath"
-	}
-}
\ No newline at end of file
diff --git a/command/agent/config/test-fixtures/config-dir-auto-auth-and-listener/config2.hcl b/command/agent/config/test-fixtures/config-dir-auto-auth-and-listener/config2.hcl
deleted file mode 100644
index 2e942da663818..0000000000000
--- a/command/agent/config/test-fixtures/config-dir-auto-auth-and-listener/config2.hcl
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
-pid_file = "./pidfile"
-
-listener "tcp" {
-    address = "127.0.0.1:8300"
-    tls_disable = true
-}
\ No newline at end of file
diff --git a/command/agent/config/test-fixtures/config-dir-cache/config-cache1.hcl b/command/agent/config/test-fixtures/config-dir-cache/config-cache1.hcl
deleted file mode 100644
index 767cdd9e4a5f2..0000000000000
--- a/command/agent/config/test-fixtures/config-dir-cache/config-cache1.hcl
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
-pid_file = "./pidfile"
-
-auto_auth {
-	method {
-		type = "aws"
-		config = {
-			role = "foobar"
-		}
-	}
-
-	sink {
-		type = "file"
-		config = {
-			path = "/tmp/file-foo"
-		}
-		aad = "foobar"
-		dh_type = "curve25519"
-		dh_path = "/tmp/file-foo-dhpath"
-	}
-}
-
-listener "unix" {
-    address = "/path/to/socket"
-    tls_disable = true
-    socket_mode = "configmode"
-    socket_user = "configuser"
-    socket_group = "configgroup"
-}
-
-listener "tcp" {
-    address = "127.0.0.1:8300"
-    tls_disable = true
-}
-
-listener {
-    type = "tcp"
-    address = "127.0.0.1:3000"
-    tls_disable = true
-    role = "metrics_only"
-}
-
-listener "tcp" {
-    role = "default"
-    address = "127.0.0.1:8400"
-    tls_key_file = "/path/to/cakey.pem"
-    tls_cert_file = "/path/to/cacert.pem"
-}
\ No newline at end of file
diff --git a/command/agent/config/test-fixtures/config-dir-cache/config-cache2.hcl b/command/agent/config/test-fixtures/config-dir-cache/config-cache2.hcl
deleted file mode 100644
index f4d0f47f96120..0000000000000
--- a/command/agent/config/test-fixtures/config-dir-cache/config-cache2.hcl
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
-cache {
-	use_auto_auth_token = true
-	persist = {
-		type = "kubernetes"
-		path = "/vault/agent-cache/"
-		keep_after_import = true
-		exit_on_err = true
-		service_account_token_file = "/tmp/serviceaccount/token"
-	}
-}
-
-vault {
-	address = "http://127.0.0.1:1111"
-	ca_cert = "config_ca_cert"
-	ca_path = "config_ca_path"
-	tls_skip_verify = "true"
-	client_cert = "config_client_cert"
-	client_key = "config_client_key"
-}
diff --git a/command/agent/config/test-fixtures/config-dir-vault-block/config1.hcl b/command/agent/config/test-fixtures/config-dir-vault-block/config1.hcl
deleted file mode 100644
index 18729533f4414..0000000000000
--- a/command/agent/config/test-fixtures/config-dir-vault-block/config1.hcl
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
-vault {
-	address = "http://127.0.0.1:1111"
-	ca_cert = "config_ca_cert"
-	ca_path = "config_ca_path"
-	tls_skip_verify = "true"
-	client_cert = "config_client_cert"
-	client_key = "config_client_key"
-}
diff --git a/command/agent/config/test-fixtures/config-dir-vault-block/config2.hcl b/command/agent/config/test-fixtures/config-dir-vault-block/config2.hcl
deleted file mode 100644
index c900df6b1aa3f..0000000000000
--- a/command/agent/config/test-fixtures/config-dir-vault-block/config2.hcl
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
-pid_file = "./pidfile"
-
-auto_auth {
-	method {
-		type = "aws"
-		config = {
-			role = "foobar"
-		}
-	}
-
-	sink {
-		type = "file"
-		config = {
-			path = "/tmp/file-foo"
-		}
-		aad = "foobar"
-		dh_type = "curve25519"
-		dh_path = "/tmp/file-foo-dhpath"
-	}
-}
\ No newline at end of file
diff --git a/command/agent/config/test-fixtures/config-disable-idle-connections-all.hcl b/command/agent/config/test-fixtures/config-disable-idle-connections-all.hcl
index f312d420c8e78..69ff548f55614 100644
--- a/command/agent/config/test-fixtures/config-disable-idle-connections-all.hcl
+++ b/command/agent/config/test-fixtures/config-disable-idle-connections-all.hcl
@@ -1,8 +1,5 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 pid_file = "./pidfile"
-disable_idle_connections = ["auto-auth","caching","templating","proxying"]
+disable_idle_connections = ["auto-auth","caching","templating"]
 
 auto_auth {
   method {
diff --git a/command/agent/config/test-fixtures/config-disable-idle-connections-auto-auth.hcl b/command/agent/config/test-fixtures/config-disable-idle-connections-auto-auth.hcl
index abb1756697fa3..1a63b20480d4f 100644
--- a/command/agent/config/test-fixtures/config-disable-idle-connections-auto-auth.hcl
+++ b/command/agent/config/test-fixtures/config-disable-idle-connections-auto-auth.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 pid_file = "./pidfile"
 disable_idle_connections = ["auto-auth"]
 
diff --git a/command/agent/config/test-fixtures/config-disable-idle-connections-caching.hcl b/command/agent/config/test-fixtures/config-disable-idle-connections-caching.hcl
index 95a36e925a58b..30d0806c03371 100644
--- a/command/agent/config/test-fixtures/config-disable-idle-connections-caching.hcl
+++ b/command/agent/config/test-fixtures/config-disable-idle-connections-caching.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 pid_file = "./pidfile"
 disable_idle_connections = ["caching"]
 
diff --git a/command/agent/config/test-fixtures/config-disable-idle-connections-empty.hcl b/command/agent/config/test-fixtures/config-disable-idle-connections-empty.hcl
index 3e490bfbc4c2f..eb95310cedfff 100644
--- a/command/agent/config/test-fixtures/config-disable-idle-connections-empty.hcl
+++ b/command/agent/config/test-fixtures/config-disable-idle-connections-empty.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 pid_file = "./pidfile"
 disable_idle_connections = []
 
diff --git a/command/agent/config/test-fixtures/config-disable-idle-connections-proxying.hcl b/command/agent/config/test-fixtures/config-disable-idle-connections-proxying.hcl
deleted file mode 100644
index 88da2effcc718..0000000000000
--- a/command/agent/config/test-fixtures/config-disable-idle-connections-proxying.hcl
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
-pid_file = "./pidfile"
-disable_idle_connections = ["proxying"]
-
-auto_auth {
-  method {
-    type      = "aws"
-    namespace = "my-namespace/"
-
-    config = {
-      role = "foobar"
-    }
-  }
-
-  sink {
-    type = "file"
-    config = {
-      path = "/tmp/file-foo"
-    }
-    aad = "foobar"
-    dh_type = "curve25519"
-    dh_path = "/tmp/file-foo-dhpath"
-  }
-}
-
-vault {
-  address = "http://127.0.0.1:1111"
-}
diff --git a/command/agent/config/test-fixtures/config-disable-idle-connections-templating.hcl b/command/agent/config/test-fixtures/config-disable-idle-connections-templating.hcl
index 6e51c91a0e4b4..922377fc82a96 100644
--- a/command/agent/config/test-fixtures/config-disable-idle-connections-templating.hcl
+++ b/command/agent/config/test-fixtures/config-disable-idle-connections-templating.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 pid_file = "./pidfile"
 disable_idle_connections = ["templating"]
 
diff --git a/command/agent/config/test-fixtures/config-disable-keep-alives-all.hcl b/command/agent/config/test-fixtures/config-disable-keep-alives-all.hcl
index 8c1c6d58282ab..9b22cfd8be67d 100644
--- a/command/agent/config/test-fixtures/config-disable-keep-alives-all.hcl
+++ b/command/agent/config/test-fixtures/config-disable-keep-alives-all.hcl
@@ -1,8 +1,5 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 pid_file = "./pidfile"
-disable_keep_alives = ["auto-auth","caching","templating","proxying"]
+disable_keep_alives = ["auto-auth","caching","templating"]
 
 auto_auth {
   method {
diff --git a/command/agent/config/test-fixtures/config-disable-keep-alives-auto-auth.hcl b/command/agent/config/test-fixtures/config-disable-keep-alives-auto-auth.hcl
index d77dfb2783785..11393bfb57a60 100644
--- a/command/agent/config/test-fixtures/config-disable-keep-alives-auto-auth.hcl
+++ b/command/agent/config/test-fixtures/config-disable-keep-alives-auto-auth.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 pid_file = "./pidfile"
 disable_keep_alives = ["auto-auth"]
 
diff --git a/command/agent/config/test-fixtures/config-disable-keep-alives-caching.hcl b/command/agent/config/test-fixtures/config-disable-keep-alives-caching.hcl
index 386267e3e8014..5712296924edf 100644
--- a/command/agent/config/test-fixtures/config-disable-keep-alives-caching.hcl
+++ b/command/agent/config/test-fixtures/config-disable-keep-alives-caching.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 pid_file = "./pidfile"
 disable_keep_alives = ["caching"]
 
diff --git a/command/agent/config/test-fixtures/config-disable-keep-alives-empty.hcl b/command/agent/config/test-fixtures/config-disable-keep-alives-empty.hcl
index b4239a5261ed5..8cddcebd8f106 100644
--- a/command/agent/config/test-fixtures/config-disable-keep-alives-empty.hcl
+++ b/command/agent/config/test-fixtures/config-disable-keep-alives-empty.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 pid_file = "./pidfile"
 disable_keep_alives = []
 
diff --git a/command/agent/config/test-fixtures/config-disable-keep-alives-proxying.hcl b/command/agent/config/test-fixtures/config-disable-keep-alives-proxying.hcl
deleted file mode 100644
index 8c82a92b6e157..0000000000000
--- a/command/agent/config/test-fixtures/config-disable-keep-alives-proxying.hcl
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
-pid_file = "./pidfile"
-disable_keep_alives = ["proxying"]
-
-auto_auth {
-  method {
-    type      = "aws"
-    namespace = "my-namespace/"
-
-    config = {
-      role = "foobar"
-    }
-  }
-
-  sink {
-    type = "file"
-    config = {
-      path = "/tmp/file-foo"
-    }
-    aad = "foobar"
-    dh_type = "curve25519"
-    dh_path = "/tmp/file-foo-dhpath"
-  }
-}
-
-vault {
-  address = "http://127.0.0.1:1111"
-}
diff --git a/command/agent/config/test-fixtures/config-disable-keep-alives-templating.hcl b/command/agent/config/test-fixtures/config-disable-keep-alives-templating.hcl
index 01ec09504544d..d4731cbd90e2e 100644
--- a/command/agent/config/test-fixtures/config-disable-keep-alives-templating.hcl
+++ b/command/agent/config/test-fixtures/config-disable-keep-alives-templating.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 pid_file = "./pidfile"
 disable_keep_alives = ["templating"]
 
diff --git a/command/agent/config/test-fixtures/config-embedded-type.hcl b/command/agent/config/test-fixtures/config-embedded-type.hcl
index 2ce3b401ca7ed..919bfd907757a 100644
--- a/command/agent/config/test-fixtures/config-embedded-type.hcl
+++ b/command/agent/config/test-fixtures/config-embedded-type.hcl
@@ -1,8 +1,4 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 pid_file = "./pidfile"
-log_file = "/var/log/vault/vault-agent.log"
 
 auto_auth {
 	method "aws" {
diff --git a/command/agent/config/test-fixtures/config-env-templates-complex.hcl b/command/agent/config/test-fixtures/config-env-templates-complex.hcl
deleted file mode 100644
index 639b1288f24c0..0000000000000
--- a/command/agent/config/test-fixtures/config-env-templates-complex.hcl
+++ /dev/null
@@ -1,36 +0,0 @@
-auto_auth {
-
-  method {
-    type = "token_file"
-
-    config {
-      token_file_path = "/home/username/.vault-token"
-    }
-  }
-}
-
-cache {}
-
-template_config {
-  static_secret_render_interval = "5m"
-  exit_on_retry_failure         = true
-}
-
-vault {
-  address = "http://localhost:8200"
-}
-
-env_template "FOO_PASSWORD" {
-  contents             = "{{ with secret \"secret/data/foo\" }}{{ .Data.data.password }}{{ end }}"
-  error_on_missing_key = false
-}
-env_template "FOO_USER" {
-  contents             = "{{ with secret \"secret/data/foo\" }}{{ .Data.data.user }}{{ end }}"
-  error_on_missing_key = false
-}
-
-exec {
-  command                   = ["env"]
-  restart_on_secret_changes = "never"
-  restart_stop_signal       = "SIGINT"
-}
diff --git a/command/agent/config/test-fixtures/config-env-templates-simple.hcl b/command/agent/config/test-fixtures/config-env-templates-simple.hcl
deleted file mode 100644
index 441563b1e9f0a..0000000000000
--- a/command/agent/config/test-fixtures/config-env-templates-simple.hcl
+++ /dev/null
@@ -1,18 +0,0 @@
-auto_auth {
-
-  method {
-    type = "token_file"
-
-    config {
-      token_file_path = "/Users/avean/.vault-token"
-    }
-  }
-}
-
-env_template "MY_DATABASE_USER" {
-  contents = "{{ with secret \"secret/db-secret\" }}{{ .Data.data.user }}{{ end }}"
-}
-
-exec {
-  command = ["/path/to/my/app", "arg1", "arg2"]
-}
diff --git a/command/agent/config/test-fixtures/config-env-templates-with-source.hcl b/command/agent/config/test-fixtures/config-env-templates-with-source.hcl
deleted file mode 100644
index d51cb5553a917..0000000000000
--- a/command/agent/config/test-fixtures/config-env-templates-with-source.hcl
+++ /dev/null
@@ -1,16 +0,0 @@
-auto_auth {
-  method {
-    type = "token_file"
-    config {
-      token_file_path = "/home/username/.vault-token"
-    }
-  }
-}
-
-env_template "MY_PASSWORD" {
-  source = "/path/on/disk/to/template.ctmpl"
-}
-
-exec {
-  command = ["/path/to/my/app", "arg1", "arg2"]
-}
diff --git a/command/agent/config/test-fixtures/config-method-exit-on-err.hcl b/command/agent/config/test-fixtures/config-method-exit-on-err.hcl
index bbda08c01b63a..c52140102f1c8 100644
--- a/command/agent/config/test-fixtures/config-method-exit-on-err.hcl
+++ b/command/agent/config/test-fixtures/config-method-exit-on-err.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 pid_file = "./pidfile"
 
 auto_auth {
diff --git a/command/agent/config/test-fixtures/config-method-initial-backoff.hcl b/command/agent/config/test-fixtures/config-method-initial-backoff.hcl
index b166dabde4183..6b9343aa4ba62 100644
--- a/command/agent/config/test-fixtures/config-method-initial-backoff.hcl
+++ b/command/agent/config/test-fixtures/config-method-initial-backoff.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 pid_file = "./pidfile"
 
 auto_auth {
diff --git a/command/agent/config/test-fixtures/config-method-wrapping.hcl b/command/agent/config/test-fixtures/config-method-wrapping.hcl
index 8142a19dd80f0..cbafc5a245937 100644
--- a/command/agent/config/test-fixtures/config-method-wrapping.hcl
+++ b/command/agent/config/test-fixtures/config-method-wrapping.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 pid_file = "./pidfile"
 
 auto_auth {
diff --git a/command/agent/config/test-fixtures/config-template-full-nosink.hcl b/command/agent/config/test-fixtures/config-template-full-nosink.hcl
index 579aae1e86ca6..84edf6f11e3c7 100644
--- a/command/agent/config/test-fixtures/config-template-full-nosink.hcl
+++ b/command/agent/config/test-fixtures/config-template-full-nosink.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 pid_file = "./pidfile"
 
 auto_auth {
diff --git a/command/agent/config/test-fixtures/config-template-full.hcl b/command/agent/config/test-fixtures/config-template-full.hcl
index b7641cd66403f..5e5cbc62cd7b7 100644
--- a/command/agent/config/test-fixtures/config-template-full.hcl
+++ b/command/agent/config/test-fixtures/config-template-full.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 pid_file = "./pidfile"
 
 auto_auth {
diff --git a/command/agent/config/test-fixtures/config-template-many-nosink.hcl b/command/agent/config/test-fixtures/config-template-many-nosink.hcl
index 2f8352d1b0008..e04f77da263e2 100644
--- a/command/agent/config/test-fixtures/config-template-many-nosink.hcl
+++ b/command/agent/config/test-fixtures/config-template-many-nosink.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 pid_file = "./pidfile"
 
 auto_auth {
diff --git a/command/agent/config/test-fixtures/config-template-many.hcl b/command/agent/config/test-fixtures/config-template-many.hcl
index 3a3ce77f1f462..2f6fe7b70b6d9 100644
--- a/command/agent/config/test-fixtures/config-template-many.hcl
+++ b/command/agent/config/test-fixtures/config-template-many.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 pid_file = "./pidfile"
 
 auto_auth {
diff --git a/command/agent/config/test-fixtures/config-template-min-nosink.hcl b/command/agent/config/test-fixtures/config-template-min-nosink.hcl
index 064b7a452f699..12c5a82c5385c 100644
--- a/command/agent/config/test-fixtures/config-template-min-nosink.hcl
+++ b/command/agent/config/test-fixtures/config-template-min-nosink.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 pid_file = "./pidfile"
 
 auto_auth {
diff --git a/command/agent/config/test-fixtures/config-template-min.hcl b/command/agent/config/test-fixtures/config-template-min.hcl
index 34435da638c5b..5d37dbefbab1e 100644
--- a/command/agent/config/test-fixtures/config-template-min.hcl
+++ b/command/agent/config/test-fixtures/config-template-min.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 pid_file = "./pidfile"
 
 auto_auth {
diff --git a/command/agent/config/test-fixtures/config-template-with-cache.hcl b/command/agent/config/test-fixtures/config-template-with-cache.hcl
deleted file mode 100644
index 8f43b8311eeeb..0000000000000
--- a/command/agent/config/test-fixtures/config-template-with-cache.hcl
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
-pid_file = "./pidfile"
-
-auto_auth {
-  method {
-    type      = "aws"
-    namespace = "/my-namespace"
-
-    config = {
-      role = "foobar"
-    }
-  }
-}
-
-cache {}
-
-template {
-  source      = "/path/on/disk/to/template.ctmpl"
-  destination = "/path/on/disk/where/template/will/render.txt"
-}
diff --git a/command/agent/config/test-fixtures/config-template_config-empty.hcl b/command/agent/config/test-fixtures/config-template_config-empty.hcl
index ac22dcc5cd6cf..a4f5b3a0938f5 100644
--- a/command/agent/config/test-fixtures/config-template_config-empty.hcl
+++ b/command/agent/config/test-fixtures/config-template_config-empty.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 vault {
   address = "http://127.0.0.1:1111"
   retry {
diff --git a/command/agent/config/test-fixtures/config-template_config.hcl b/command/agent/config/test-fixtures/config-template_config.hcl
index b550890018d4a..5da0e2b9127b9 100644
--- a/command/agent/config/test-fixtures/config-template_config.hcl
+++ b/command/agent/config/test-fixtures/config-template_config.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 vault {
   address = "http://127.0.0.1:1111"
   retry {
diff --git a/command/agent/config/test-fixtures/config-vault-retry-empty.hcl b/command/agent/config/test-fixtures/config-vault-retry-empty.hcl
index 72c44e1f97bdc..e7ab4aa0017f2 100644
--- a/command/agent/config/test-fixtures/config-vault-retry-empty.hcl
+++ b/command/agent/config/test-fixtures/config-vault-retry-empty.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 pid_file = "./pidfile"
 
 auto_auth {
diff --git a/command/agent/config/test-fixtures/config-vault-retry.hcl b/command/agent/config/test-fixtures/config-vault-retry.hcl
index 5e4ee234304ec..0c1cfa19b0646 100644
--- a/command/agent/config/test-fixtures/config-vault-retry.hcl
+++ b/command/agent/config/test-fixtures/config-vault-retry.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 pid_file = "./pidfile"
 
 auto_auth {
diff --git a/command/agent/config/test-fixtures/config.hcl b/command/agent/config/test-fixtures/config.hcl
index 18ec360309c99..b02170736a8ef 100644
--- a/command/agent/config/test-fixtures/config.hcl
+++ b/command/agent/config/test-fixtures/config.hcl
@@ -1,8 +1,4 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 pid_file = "./pidfile"
-log_file = "/var/log/vault/vault-agent.log"
 
 auto_auth {
 	method {
diff --git a/command/agent/doc.go b/command/agent/doc.go
index e9f0f0b98fe3c..0786f5c1d3949 100644
--- a/command/agent/doc.go
+++ b/command/agent/doc.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 /*
 Package agent implements a daemon mode of Vault designed to provide helper
 features like auto-auth, caching, and templating.
diff --git a/command/agent/exec/exec.go b/command/agent/exec/exec.go
deleted file mode 100644
index b22e5eb9302af..0000000000000
--- a/command/agent/exec/exec.go
+++ /dev/null
@@ -1,332 +0,0 @@
-package exec
-
-import (
-	"context"
-	"fmt"
-	"io"
-	"os"
-	"sort"
-	"sync"
-	"time"
-
-	"github.com/hashicorp/consul-template/child"
-	ctconfig "github.com/hashicorp/consul-template/config"
-	"github.com/hashicorp/consul-template/manager"
-	"github.com/hashicorp/go-hclog"
-	"golang.org/x/exp/slices"
-
-	"github.com/hashicorp/vault/command/agent/config"
-	"github.com/hashicorp/vault/command/agent/internal/ctmanager"
-	"github.com/hashicorp/vault/helper/useragent"
-	"github.com/hashicorp/vault/sdk/helper/pointerutil"
-)
-
-type childProcessState uint8
-
-const (
-	childProcessStateNotStarted childProcessState = iota
-	childProcessStateRunning
-	childProcessStateRestarting
-	childProcessStateStopped
-)
-
-type ServerConfig struct {
-	Logger      hclog.Logger
-	AgentConfig *config.Config
-
-	Namespace string
-
-	// LogLevel is needed to set the internal Consul Template Runner's log level
-	// to match the log level of Vault Agent. The internal Runner creates it's own
-	// logger and can't be set externally or copied from the Template Server.
-	//
-	// LogWriter is needed to initialize Consul Template's internal logger to use
-	// the same io.Writer that Vault Agent itself is using.
-	LogLevel  hclog.Level
-	LogWriter io.Writer
-}
-
-type Server struct {
-	// config holds the ServerConfig used to create it. It's passed along in other
-	// methods
-	config *ServerConfig
-
-	// runner is the consul-template runner
-	runner *manager.Runner
-
-	// numberOfTemplates is the count of templates determined by consul-template,
-	// we keep the value to ensure all templates have been rendered before
-	// starting the child process
-	// NOTE: each template may have more than one TemplateConfig, so the numbers may not match up
-	numberOfTemplates int
-
-	logger hclog.Logger
-
-	childProcess      *child.Child
-	childProcessState childProcessState
-	childProcessLock  sync.Mutex
-
-	// exit channel of the child process
-	childProcessExitCh chan int
-
-	// lastRenderedEnvVars is the cached value of all environment variables
-	// rendered by the templating engine; it is used for detecting changes
-	lastRenderedEnvVars []string
-}
-
-type ProcessExitError struct {
-	ExitCode int
-}
-
-func (e *ProcessExitError) Error() string {
-	return fmt.Sprintf("process exited with %d", e.ExitCode)
-}
-
-func NewServer(cfg *ServerConfig) *Server {
-	server := Server{
-		logger:             cfg.Logger,
-		config:             cfg,
-		childProcessState:  childProcessStateNotStarted,
-		childProcessExitCh: make(chan int),
-	}
-
-	return &server
-}
-
-func (s *Server) Run(ctx context.Context, incomingVaultToken chan string) error {
-	latestToken := new(string)
-	s.logger.Info("starting exec server")
-	defer func() {
-		s.logger.Info("exec server stopped")
-	}()
-
-	if len(s.config.AgentConfig.EnvTemplates) == 0 || s.config.AgentConfig.Exec == nil {
-		s.logger.Info("no env templates or exec config, exiting")
-		<-ctx.Done()
-		return nil
-	}
-
-	managerConfig := ctmanager.ManagerConfig{
-		AgentConfig: s.config.AgentConfig,
-		Namespace:   s.config.Namespace,
-		LogLevel:    s.config.LogLevel,
-		LogWriter:   s.config.LogWriter,
-	}
-
-	runnerConfig, err := ctmanager.NewConfig(managerConfig, s.config.AgentConfig.EnvTemplates)
-	if err != nil {
-		return fmt.Errorf("template server failed to generate runner config: %w", err)
-	}
-
-	// We leave this in "dry" mode, as there are no files to render;
-	// we will get the environment variables rendered contents from the incoming events
-	s.runner, err = manager.NewRunner(runnerConfig, true)
-	if err != nil {
-		return fmt.Errorf("template server failed to create: %w", err)
-	}
-
-	// prevent the templates from being rendered to stdout in "dry" mode
-	s.runner.SetOutStream(io.Discard)
-
-	s.numberOfTemplates = len(s.runner.TemplateConfigMapping())
-
-	// We receive multiple events every staticSecretRenderInterval
-	// from <-s.runner.TemplateRenderedCh(), one for each secret. Only the last
-	// event in a batch will contain the latest set of all secrets and the
-	// corresponding environment variables. This timer will fire after 2 seconds
-	// unless an event comes in which resets the timer back to 2 seconds.
-	var debounceTimer *time.Timer
-
-	// capture the errors related to restarting the child process
-	restartChildProcessErrCh := make(chan error)
-
-	for {
-		select {
-		case <-ctx.Done():
-			s.runner.Stop()
-			s.childProcessLock.Lock()
-			if s.childProcess != nil {
-				s.childProcess.Stop()
-			}
-			s.childProcessState = childProcessStateStopped
-			s.childProcessLock.Unlock()
-			return nil
-
-		case token := <-incomingVaultToken:
-			if token != *latestToken {
-				s.logger.Info("exec server received new token")
-
-				s.runner.Stop()
-				*latestToken = token
-				newTokenConfig := ctconfig.Config{
-					Vault: &ctconfig.VaultConfig{
-						Token:           latestToken,
-						ClientUserAgent: pointerutil.StringPtr(useragent.AgentTemplatingString()),
-					},
-				}
-
-				// got a new auth token, merge it in with the existing config
-				runnerConfig = runnerConfig.Merge(&newTokenConfig)
-				s.runner, err = manager.NewRunner(runnerConfig, true)
-				if err != nil {
-					s.logger.Error("template server failed with new Vault token", "error", err)
-					continue
-				}
-
-				// prevent the templates from being rendered to stdout in "dry" mode
-				s.runner.SetOutStream(io.Discard)
-
-				go s.runner.Start()
-			}
-
-		case err := <-s.runner.ErrCh:
-			s.logger.Error("template server error", "error", err.Error())
-			s.runner.StopImmediately()
-
-			// Return after stopping the runner if exit on retry failure was specified
-			if s.config.AgentConfig.TemplateConfig != nil && s.config.AgentConfig.TemplateConfig.ExitOnRetryFailure {
-				return fmt.Errorf("template server: %w", err)
-			}
-
-			s.runner, err = manager.NewRunner(runnerConfig, true)
-			if err != nil {
-				return fmt.Errorf("template server failed to create: %w", err)
-			}
-			go s.runner.Start()
-
-		case <-s.runner.TemplateRenderedCh():
-			// A template has been rendered, figure out what to do
-			s.logger.Trace("template rendered")
-			events := s.runner.RenderEvents()
-
-			// This checks if we've finished rendering the initial set of templates,
-			// for every consecutive re-render len(events) should equal s.numberOfTemplates
-			if len(events) < s.numberOfTemplates {
-				// Not all templates have been rendered yet
-				continue
-			}
-
-			// assume the renders are finished, until we find otherwise
-			doneRendering := true
-			var renderedEnvVars []string
-			for _, event := range events {
-				// This template hasn't been rendered
-				if event.LastWouldRender.IsZero() {
-					doneRendering = false
-					break
-				} else {
-					for _, tcfg := range event.TemplateConfigs {
-						envVar := fmt.Sprintf("%s=%s", *tcfg.MapToEnvironmentVariable, event.Contents)
-						renderedEnvVars = append(renderedEnvVars, envVar)
-					}
-				}
-			}
-			if !doneRendering {
-				continue
-			}
-
-			// sort the environment variables for a deterministic output and easy comparison
-			sort.Strings(renderedEnvVars)
-
-			s.logger.Trace("done rendering templates")
-
-			// don't restart the process unless a change is detected
-			if slices.Equal(s.lastRenderedEnvVars, renderedEnvVars) {
-				continue
-			}
-
-			s.lastRenderedEnvVars = renderedEnvVars
-
-			s.logger.Debug("detected a change in the environment variables: restarting the child process")
-
-			// if a timer exists, stop it
-			if debounceTimer != nil {
-				debounceTimer.Stop()
-			}
-			debounceTimer = time.AfterFunc(2*time.Second, func() {
-				if err := s.restartChildProcess(renderedEnvVars); err != nil {
-					restartChildProcessErrCh <- fmt.Errorf("unable to restart the child process: %w", err)
-				}
-			})
-
-		case err := <-restartChildProcessErrCh:
-			// catch the error from restarting
-			return err
-
-		case exitCode := <-s.childProcessExitCh:
-			// process exited on its own
-			return &ProcessExitError{ExitCode: exitCode}
-		}
-	}
-}
-
-func (s *Server) restartChildProcess(newEnvVars []string) error {
-	s.childProcessLock.Lock()
-	defer s.childProcessLock.Unlock()
-
-	switch s.config.AgentConfig.Exec.RestartOnSecretChanges {
-	case "always":
-		if s.childProcessState == childProcessStateRunning {
-			// process is running, need to kill it first
-			s.logger.Info("stopping process", "process_id", s.childProcess.Pid())
-			s.childProcessState = childProcessStateRestarting
-			s.childProcess.Stop()
-		}
-	case "never":
-		if s.childProcessState == childProcessStateRunning {
-			s.logger.Info("detected update, but not restarting process", "process_id", s.childProcess.Pid())
-			return nil
-		}
-	default:
-		return fmt.Errorf("invalid value for restart-on-secret-changes: %q", s.config.AgentConfig.Exec.RestartOnSecretChanges)
-	}
-
-	args, subshell, err := child.CommandPrep(s.config.AgentConfig.Exec.Command)
-	if err != nil {
-		return fmt.Errorf("unable to parse command: %w", err)
-	}
-
-	childInput := &child.NewInput{
-		Stdin:        os.Stdin,
-		Stdout:       os.Stdout,
-		Stderr:       os.Stderr,
-		Command:      args[0],
-		Args:         args[1:],
-		Timeout:      0, // let it run forever
-		Env:          append(os.Environ(), newEnvVars...),
-		ReloadSignal: nil, // can't reload w/ new env vars
-		KillSignal:   s.config.AgentConfig.Exec.RestartStopSignal,
-		KillTimeout:  30 * time.Second,
-		Splay:        0,
-		Setpgid:      subshell,
-		Logger:       s.logger.StandardLogger(nil),
-	}
-
-	proc, err := child.New(childInput)
-	if err != nil {
-		return err
-	}
-	s.childProcess = proc
-
-	if err := s.childProcess.Start(); err != nil {
-		return fmt.Errorf("error starting the child process: %w", err)
-	}
-
-	s.childProcessState = childProcessStateRunning
-
-	// Listen if the child process exits and bubble it up to the main loop.
-	//
-	// NOTE: this must be invoked after child.Start() to avoid a potential
-	// race condition with ExitCh not being initialized.
-	go func() {
-		select {
-		case exitCode, ok := <-proc.ExitCh():
-			// ignore ExitCh channel closures caused by our restarts
-			if ok {
-				s.childProcessExitCh <- exitCode
-			}
-		}
-	}()
-
-	return nil
-}
diff --git a/command/agent/exec/exec_test.go b/command/agent/exec/exec_test.go
deleted file mode 100644
index 3c13c34a9f516..0000000000000
--- a/command/agent/exec/exec_test.go
+++ /dev/null
@@ -1,379 +0,0 @@
-package exec
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"net/http"
-	"net/http/httptest"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strconv"
-	"syscall"
-	"testing"
-	"time"
-
-	ctconfig "github.com/hashicorp/consul-template/config"
-	"github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/go-retryablehttp"
-
-	"github.com/hashicorp/vault/command/agent/config"
-	"github.com/hashicorp/vault/sdk/helper/logging"
-	"github.com/hashicorp/vault/sdk/helper/pointerutil"
-)
-
-func fakeVaultServer(t *testing.T) *httptest.Server {
-	t.Helper()
-
-	firstRequest := true
-
-	mux := http.NewServeMux()
-	mux.HandleFunc("/v1/kv/my-app/creds", func(w http.ResponseWriter, r *http.Request) {
-		// change the password on the second request to re-render the template
-		var password string
-
-		if firstRequest {
-			password = "s3cr3t"
-		} else {
-			password = "s3cr3t-two"
-		}
-
-		firstRequest = false
-
-		fmt.Fprintf(w, `{
-                "request_id": "8af096e9-518c-7351-eff5-5ba20554b21f",
-                "lease_id": "",
-                "renewable": false,
-                "lease_duration": 0,
-                "data": {
-                    "data": {
-                        "password": "%s",
-                        "user": "app-user"
-                    },
-                    "metadata": {
-                        "created_time": "2019-10-07T22:18:44.233247Z",
-                        "deletion_time": "",
-                        "destroyed": false,
-                        "version": 3
-                    }
-                },
-                "wrap_info": null,
-                "warnings": null,
-                "auth": null
-            }`,
-			password,
-		)
-	})
-
-	return httptest.NewServer(mux)
-}
-
-// TestExecServer_Run tests various scenarios of using vault agent as a process
-// supervisor. At its core is a sample application referred to as 'test app',
-// compiled from ./test-app/main.go. Each test case verifies that the test app
-// is started and/or stopped correctly by exec.Server.Run(). There are 3
-// high-level scenarios we want to test for:
-//
-//  1. test app is started and is injected with environment variables
-//  2. test app exits early (either with zero or non-zero extit code)
-//  3. test app needs to be stopped (and restarted) by exec.Server
-func TestExecServer_Run(t *testing.T) {
-	// we must build a test-app binary since 'go run' does not propagate signals correctly
-	goBinary, err := exec.LookPath("go")
-	if err != nil {
-		t.Fatalf("could not find go binary on path: %s", err)
-	}
-
-	testAppBinary := filepath.Join(os.TempDir(), "test-app")
-
-	if err := exec.Command(goBinary, "build", "-o", testAppBinary, "./test-app").Run(); err != nil {
-		t.Fatalf("could not build the test application: %s", err)
-	}
-	defer func() {
-		if err := os.Remove(testAppBinary); err != nil {
-			t.Fatalf("could not remove %q test application: %s", testAppBinary, err)
-		}
-	}()
-
-	testCases := map[string]struct {
-		// skip this test case
-		skip       bool
-		skipReason string
-
-		// inputs to the exec server
-		envTemplates               []*ctconfig.TemplateConfig
-		staticSecretRenderInterval time.Duration
-
-		// test app parameters
-		testAppArgs       []string
-		testAppStopSignal os.Signal
-		testAppPort       int
-
-		// simulate a shutdown of agent, which, in turn stops the test app
-		simulateShutdown             bool
-		simulateShutdownWaitDuration time.Duration
-
-		// expected results
-		expected             map[string]string
-		expectedTestDuration time.Duration
-		expectedError        error
-	}{
-		"ensure_environment_variables_are_injected": {
-			skip: true,
-			envTemplates: []*ctconfig.TemplateConfig{{
-				Contents:                 pointerutil.StringPtr(`{{ with secret "kv/my-app/creds" }}{{ .Data.data.user }}{{ end }}`),
-				MapToEnvironmentVariable: pointerutil.StringPtr("MY_USER"),
-			}, {
-				Contents:                 pointerutil.StringPtr(`{{ with secret "kv/my-app/creds" }}{{ .Data.data.password }}{{ end }}`),
-				MapToEnvironmentVariable: pointerutil.StringPtr("MY_PASSWORD"),
-			}},
-			testAppArgs:       []string{"--stop-after", "10s"},
-			testAppStopSignal: syscall.SIGTERM,
-			testAppPort:       34001,
-			expected: map[string]string{
-				"MY_USER":     "app-user",
-				"MY_PASSWORD": "s3cr3t",
-			},
-			expectedTestDuration: 15 * time.Second,
-			expectedError:        nil,
-		},
-
-		"password_changes_test_app_should_restart": {
-			envTemplates: []*ctconfig.TemplateConfig{{
-				Contents:                 pointerutil.StringPtr(`{{ with secret "kv/my-app/creds" }}{{ .Data.data.user }}{{ end }}`),
-				MapToEnvironmentVariable: pointerutil.StringPtr("MY_USER"),
-			}, {
-				Contents:                 pointerutil.StringPtr(`{{ with secret "kv/my-app/creds" }}{{ .Data.data.password }}{{ end }}`),
-				MapToEnvironmentVariable: pointerutil.StringPtr("MY_PASSWORD"),
-			}},
-			staticSecretRenderInterval: 5 * time.Second,
-			testAppArgs:                []string{"--stop-after", "15s", "--sleep-after-stop-signal", "0s"},
-			testAppStopSignal:          syscall.SIGTERM,
-			testAppPort:                34002,
-			expected: map[string]string{
-				"MY_USER":     "app-user",
-				"MY_PASSWORD": "s3cr3t-two",
-			},
-			expectedTestDuration: 15 * time.Second,
-			expectedError:        nil,
-		},
-
-		"test_app_exits_early": {
-			skip: true,
-			envTemplates: []*ctconfig.TemplateConfig{{
-				Contents:                 pointerutil.StringPtr(`{{ with secret "kv/my-app/creds" }}{{ .Data.data.user }}{{ end }}`),
-				MapToEnvironmentVariable: pointerutil.StringPtr("MY_USER"),
-			}},
-			testAppArgs:          []string{"--stop-after", "1s"},
-			testAppStopSignal:    syscall.SIGTERM,
-			testAppPort:          34003,
-			expectedTestDuration: 15 * time.Second,
-			expectedError:        &ProcessExitError{0},
-		},
-
-		"test_app_exits_early_non_zero": {
-			skip: true,
-			envTemplates: []*ctconfig.TemplateConfig{{
-				Contents:                 pointerutil.StringPtr(`{{ with secret "kv/my-app/creds" }}{{ .Data.data.user }}{{ end }}`),
-				MapToEnvironmentVariable: pointerutil.StringPtr("MY_USER"),
-			}},
-			testAppArgs:          []string{"--stop-after", "1s", "--exit-code", "5"},
-			testAppStopSignal:    syscall.SIGTERM,
-			testAppPort:          34004,
-			expectedTestDuration: 15 * time.Second,
-			expectedError:        &ProcessExitError{5},
-		},
-
-		"send_sigterm_expect_test_app_exit": {
-			skip: true,
-			envTemplates: []*ctconfig.TemplateConfig{{
-				Contents:                 pointerutil.StringPtr(`{{ with secret "kv/my-app/creds" }}{{ .Data.data.user }}{{ end }}`),
-				MapToEnvironmentVariable: pointerutil.StringPtr("MY_USER"),
-			}},
-			testAppArgs:                  []string{"--stop-after", "30s", "--sleep-after-stop-signal", "1s"},
-			testAppStopSignal:            syscall.SIGTERM,
-			testAppPort:                  34005,
-			simulateShutdown:             true,
-			simulateShutdownWaitDuration: 3 * time.Second,
-			expectedTestDuration:         15 * time.Second,
-			expectedError:                nil,
-		},
-
-		"send_sigusr1_expect_test_app_exit": {
-			skip: true,
-			envTemplates: []*ctconfig.TemplateConfig{{
-				Contents:                 pointerutil.StringPtr(`{{ with secret "kv/my-app/creds" }}{{ .Data.data.user }}{{ end }}`),
-				MapToEnvironmentVariable: pointerutil.StringPtr("MY_USER"),
-			}},
-			testAppArgs:                  []string{"--stop-after", "30s", "--sleep-after-stop-signal", "1s", "--use-sigusr1"},
-			testAppStopSignal:            syscall.SIGUSR1,
-			testAppPort:                  34006,
-			simulateShutdown:             true,
-			simulateShutdownWaitDuration: 3 * time.Second,
-			expectedTestDuration:         15 * time.Second,
-			expectedError:                nil,
-		},
-
-		"test_app_ignores_stop_signal": {
-			skip:       true,
-			skipReason: "This test currently fails with 'go test -race' (see hashicorp/consul-template/issues/1753).",
-			envTemplates: []*ctconfig.TemplateConfig{{
-				Contents:                 pointerutil.StringPtr(`{{ with secret "kv/my-app/creds" }}{{ .Data.data.user }}{{ end }}`),
-				MapToEnvironmentVariable: pointerutil.StringPtr("MY_USER"),
-			}},
-			testAppArgs:                  []string{"--stop-after", "60s", "--sleep-after-stop-signal", "60s"},
-			testAppStopSignal:            syscall.SIGTERM,
-			testAppPort:                  34007,
-			simulateShutdown:             true,
-			simulateShutdownWaitDuration: 32 * time.Second, // the test app should be stopped immediately after 30s
-			expectedTestDuration:         45 * time.Second,
-			expectedError:                nil,
-		},
-	}
-
-	for name, testCase := range testCases {
-		t.Run(name, func(t *testing.T) {
-			if testCase.skip {
-				t.Skip(testCase.skipReason)
-			}
-
-			t.Logf("test case %s: begin", name)
-			defer t.Logf("test case %s: end", name)
-
-			fakeVault := fakeVaultServer(t)
-			defer fakeVault.Close()
-
-			ctx, cancelContextFunc := context.WithTimeout(context.Background(), testCase.expectedTestDuration)
-			defer cancelContextFunc()
-
-			testAppCommand := []string{
-				testAppBinary,
-				"--port",
-				strconv.Itoa(testCase.testAppPort),
-			}
-
-			execServer := NewServer(&ServerConfig{
-				Logger: logging.NewVaultLogger(hclog.Trace),
-				AgentConfig: &config.Config{
-					Vault: &config.Vault{
-						Address: fakeVault.URL,
-						Retry: &config.Retry{
-							NumRetries: 3,
-						},
-					},
-					Exec: &config.ExecConfig{
-						RestartOnSecretChanges: "always",
-						Command:                append(testAppCommand, testCase.testAppArgs...),
-						RestartStopSignal:      testCase.testAppStopSignal,
-					},
-					EnvTemplates: testCase.envTemplates,
-					TemplateConfig: &config.TemplateConfig{
-						ExitOnRetryFailure:    true,
-						StaticSecretRenderInt: testCase.staticSecretRenderInterval,
-					},
-				},
-				LogLevel:  hclog.Trace,
-				LogWriter: hclog.DefaultOutput,
-			})
-
-			// start the exec server
-			var (
-				execServerErrCh   = make(chan error)
-				execServerTokenCh = make(chan string, 1)
-			)
-			go func() {
-				execServerErrCh <- execServer.Run(ctx, execServerTokenCh)
-			}()
-
-			// send a dummy token to kick off the server
-			execServerTokenCh <- "my-token"
-
-			// ensure the test app is running after 3 seconds
-			var (
-				testAppAddr      = fmt.Sprintf("http://localhost:%d", testCase.testAppPort)
-				testAppStartedCh = make(chan error)
-			)
-			if testCase.expectedError == nil {
-				time.AfterFunc(500*time.Millisecond, func() {
-					_, err := retryablehttp.Head(testAppAddr)
-					testAppStartedCh <- err
-				})
-			}
-
-			select {
-			case <-ctx.Done():
-				t.Fatal("timeout reached before templates were rendered")
-
-			case err := <-execServerErrCh:
-				if testCase.expectedError == nil && err != nil {
-					t.Fatalf("exec server did not expect an error, got: %v", err)
-				}
-
-				if errors.Is(err, testCase.expectedError) {
-					t.Fatalf("exec server expected error %v; got %v", testCase.expectedError, err)
-				}
-
-				t.Log("exec server exited without an error")
-
-				return
-
-			case err := <-testAppStartedCh:
-				if testCase.expectedError == nil && err != nil {
-					t.Fatalf("test app could not be started")
-				}
-
-				t.Log("test app started successfully")
-			}
-
-			// expect the test app to restart after staticSecretRenderInterval + debounce timer due to a password change
-			if testCase.staticSecretRenderInterval != 0 {
-				t.Logf("sleeping for %v to wait for application restart", testCase.staticSecretRenderInterval+5*time.Second)
-				time.Sleep(testCase.staticSecretRenderInterval + 5*time.Second)
-			}
-
-			// simulate a shutdown of agent, which, in turn stops the test app
-			if testCase.simulateShutdown {
-				cancelContextFunc()
-
-				time.Sleep(testCase.simulateShutdownWaitDuration)
-
-				// check if the test app is still alive
-				if _, err := http.Head(testAppAddr); err == nil {
-					t.Fatalf("the test app is still alive %v after a simulated shutdown!", testCase.simulateShutdownWaitDuration)
-				}
-
-				return
-			}
-
-			// verify the environment variables
-			t.Logf("verifying test-app's environment variables")
-
-			resp, err := retryablehttp.Get(testAppAddr)
-			if err != nil {
-				t.Fatalf("error making request to the test app: %s", err)
-			}
-			defer resp.Body.Close()
-
-			decoder := json.NewDecoder(resp.Body)
-			var response struct {
-				EnvironmentVariables map[string]string `json:"environment_variables"`
-				ProcessID            int               `json:"process_id"`
-			}
-			if err := decoder.Decode(&response); err != nil {
-				t.Fatalf("unable to parse response from test app: %s", err)
-			}
-
-			for key, expectedValue := range testCase.expected {
-				actualValue, ok := response.EnvironmentVariables[key]
-				if !ok {
-					t.Fatalf("expected the test app to return %q environment variable", key)
-				}
-				if expectedValue != actualValue {
-					t.Fatalf("expected environment variable %s to have a value of %q but it has a value of %q", key, expectedValue, actualValue)
-				}
-			}
-		})
-	}
-}
diff --git a/command/agent/exec/test-app/main.go b/command/agent/exec/test-app/main.go
deleted file mode 100644
index 311ac7eb657b6..0000000000000
--- a/command/agent/exec/test-app/main.go
+++ /dev/null
@@ -1,150 +0,0 @@
-package main
-
-// This is a test application that is used by TestExecServer_Run to verify
-// the behavior of vault agent running as a process supervisor.
-//
-// The app will automatically exit after 1 minute or the --stop-after interval,
-// whichever comes first. It also can serve its loaded environment variables on
-// the given --port. This app will also return the given --exit-code and
-// terminate on SIGTERM unless --use-sigusr1 is specified.
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"errors"
-	"flag"
-	"fmt"
-	"log"
-	"net/http"
-	"os"
-	"os/signal"
-	"strings"
-	"syscall"
-	"time"
-)
-
-var (
-	port                 uint
-	ignoreStopSignal     bool
-	sleepAfterStopSignal time.Duration
-	useSigusr1StopSignal bool
-	stopAfter            time.Duration
-	exitCode             int
-)
-
-func init() {
-	flag.UintVar(&port, "port", 34000, "port to run the test app on")
-	flag.DurationVar(&sleepAfterStopSignal, "sleep-after-stop-signal", 1*time.Second, "time to sleep after getting the signal before exiting")
-	flag.BoolVar(&useSigusr1StopSignal, "use-sigusr1", false, "use SIGUSR1 as the stop signal, instead of the default SIGTERM")
-	flag.DurationVar(&stopAfter, "stop-after", 0, "stop the process after duration (overrides all other flags if set)")
-	flag.IntVar(&exitCode, "exit-code", 0, "exit code to return when this script exits")
-}
-
-type Response struct {
-	EnvironmentVariables map[string]string `json:"environment_variables"`
-	ProcessID            int               `json:"process_id"`
-}
-
-func newResponse() Response {
-	respEnv := make(map[string]string, len(os.Environ()))
-	for _, envVar := range os.Environ() {
-		tokens := strings.Split(envVar, "=")
-		respEnv[tokens[0]] = tokens[1]
-	}
-
-	return Response{
-		EnvironmentVariables: respEnv,
-		ProcessID:            os.Getpid(),
-	}
-}
-
-func handler(w http.ResponseWriter, r *http.Request) {
-	var buf bytes.Buffer
-	encoder := json.NewEncoder(&buf)
-	if r.URL.Query().Get("pretty") == "1" {
-		encoder.SetIndent("", "  ")
-	}
-	if err := encoder.Encode(newResponse()); err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		return
-	}
-	w.Header().Set("Content-Type", "application/json")
-	w.WriteHeader(http.StatusOK)
-	_, _ = w.Write(buf.Bytes())
-}
-
-func main() {
-	logger := log.New(os.Stderr, "test-app: ", log.LstdFlags)
-
-	if err := run(logger); err != nil {
-		log.Fatalf("error: %v\n", err)
-	}
-
-	logger.Printf("exit code: %d\n", exitCode)
-
-	os.Exit(exitCode)
-}
-
-func run(logger *log.Logger) error {
-	/* */ logger.Println("run: started")
-	defer logger.Println("run: done")
-
-	ctx, cancelContextFunc := context.WithTimeout(context.Background(), 60*time.Second)
-	defer cancelContextFunc()
-
-	flag.Parse()
-
-	server := http.Server{
-		Addr:         fmt.Sprintf(":%d", port),
-		Handler:      http.HandlerFunc(handler),
-		ReadTimeout:  20 * time.Second,
-		WriteTimeout: 20 * time.Second,
-		IdleTimeout:  20 * time.Second,
-	}
-
-	doneCh := make(chan struct{})
-
-	go func() {
-		defer close(doneCh)
-
-		stopSignal := make(chan os.Signal, 1)
-		if useSigusr1StopSignal {
-			signal.Notify(stopSignal, syscall.SIGUSR1)
-		} else {
-			signal.Notify(stopSignal, syscall.SIGTERM)
-		}
-
-		select {
-		case <-ctx.Done():
-			logger.Println("context done: exiting")
-
-		case s := <-stopSignal:
-			logger.Printf("signal %q: received\n", s)
-
-			if sleepAfterStopSignal > 0 {
-				logger.Printf("signal %q: sleeping for %v simulate cleanup\n", s, sleepAfterStopSignal)
-				time.Sleep(sleepAfterStopSignal)
-			}
-
-		case <-time.After(stopAfter):
-			logger.Printf("stopping after: %v\n", stopAfter)
-		}
-
-		if err := server.Shutdown(context.Background()); err != nil {
-			log.Printf("server shutdown error: %v", err)
-		}
-	}()
-
-	logger.Printf("server %s: started\n", server.Addr)
-
-	if err := server.ListenAndServe(); !errors.Is(err, http.ErrServerClosed) {
-		return fmt.Errorf("could not start the server: %v", err)
-	}
-
-	logger.Printf("server %s: done\n", server.Addr)
-
-	<-doneCh
-
-	return nil
-}
diff --git a/command/agent/internal/ctmanager/runner_config.go b/command/agent/internal/ctmanager/runner_config.go
deleted file mode 100644
index 90974981771e8..0000000000000
--- a/command/agent/internal/ctmanager/runner_config.go
+++ /dev/null
@@ -1,149 +0,0 @@
-package ctmanager
-
-import (
-	"fmt"
-	"io"
-	"strings"
-
-	ctconfig "github.com/hashicorp/consul-template/config"
-	ctlogging "github.com/hashicorp/consul-template/logging"
-	"github.com/hashicorp/go-hclog"
-
-	"github.com/hashicorp/vault/command/agent/config"
-	"github.com/hashicorp/vault/sdk/helper/pointerutil"
-)
-
-type ManagerConfig struct {
-	AgentConfig *config.Config
-	Namespace   string
-	LogLevel    hclog.Level
-	LogWriter   io.Writer
-}
-
-// NewConfig returns a consul-template runner configuration, setting the
-// Vault and Consul configurations based on the clients configs.
-func NewConfig(mc ManagerConfig, templates ctconfig.TemplateConfigs) (*ctconfig.Config, error) {
-	conf := ctconfig.DefaultConfig()
-	conf.Templates = templates.Copy()
-
-	// Setup the Vault config
-	// Always set these to ensure nothing is picked up from the environment
-	conf.Vault.RenewToken = pointerutil.BoolPtr(false)
-	conf.Vault.Token = pointerutil.StringPtr("")
-	conf.Vault.Address = &mc.AgentConfig.Vault.Address
-
-	if mc.Namespace != "" {
-		conf.Vault.Namespace = &mc.Namespace
-	}
-
-	if mc.AgentConfig.TemplateConfig != nil && mc.AgentConfig.TemplateConfig.StaticSecretRenderInt != 0 {
-		conf.Vault.DefaultLeaseDuration = &mc.AgentConfig.TemplateConfig.StaticSecretRenderInt
-	}
-
-	if mc.AgentConfig.DisableIdleConnsTemplating {
-		idleConns := -1
-		conf.Vault.Transport.MaxIdleConns = &idleConns
-	}
-
-	if mc.AgentConfig.DisableKeepAlivesTemplating {
-		conf.Vault.Transport.DisableKeepAlives = pointerutil.BoolPtr(true)
-	}
-
-	conf.Vault.SSL = &ctconfig.SSLConfig{
-		Enabled:    pointerutil.BoolPtr(false),
-		Verify:     pointerutil.BoolPtr(false),
-		Cert:       pointerutil.StringPtr(""),
-		Key:        pointerutil.StringPtr(""),
-		CaCert:     pointerutil.StringPtr(""),
-		CaPath:     pointerutil.StringPtr(""),
-		ServerName: pointerutil.StringPtr(""),
-	}
-
-	// If Vault.Retry isn't specified, use the default of 12 retries.
-	// This retry value will be respected regardless of if we use the cache.
-	attempts := ctconfig.DefaultRetryAttempts
-	if mc.AgentConfig.Vault != nil && mc.AgentConfig.Vault.Retry != nil {
-		attempts = mc.AgentConfig.Vault.Retry.NumRetries
-	}
-
-	// Use the cache if available or fallback to the Vault server values.
-	if mc.AgentConfig.Cache != nil {
-		if mc.AgentConfig.Cache.InProcDialer == nil {
-			return nil, fmt.Errorf("missing in-process dialer configuration")
-		}
-		if conf.Vault.Transport == nil {
-			conf.Vault.Transport = &ctconfig.TransportConfig{}
-		}
-		conf.Vault.Transport.CustomDialer = mc.AgentConfig.Cache.InProcDialer
-		// The in-process dialer ignores the address passed in, but we're still
-		// setting it here to override the setting at the top of this function,
-		// and to prevent the vault/http client from defaulting to https.
-		conf.Vault.Address = pointerutil.StringPtr("http://127.0.0.1:8200")
-	} else if strings.HasPrefix(mc.AgentConfig.Vault.Address, "https") || mc.AgentConfig.Vault.CACert != "" {
-		skipVerify := mc.AgentConfig.Vault.TLSSkipVerify
-		verify := !skipVerify
-		conf.Vault.SSL = &ctconfig.SSLConfig{
-			Enabled:    pointerutil.BoolPtr(true),
-			Verify:     &verify,
-			Cert:       &mc.AgentConfig.Vault.ClientCert,
-			Key:        &mc.AgentConfig.Vault.ClientKey,
-			CaCert:     &mc.AgentConfig.Vault.CACert,
-			CaPath:     &mc.AgentConfig.Vault.CAPath,
-			ServerName: &mc.AgentConfig.Vault.TLSServerName,
-		}
-	}
-	enabled := attempts > 0
-	conf.Vault.Retry = &ctconfig.RetryConfig{
-		Attempts: &attempts,
-		Enabled:  &enabled,
-	}
-
-	// Sync Consul Template's retry with user set auto-auth initial backoff value.
-	// This is helpful if Auto Auth cannot get a new token and CT is trying to fetch
-	// secrets.
-	if mc.AgentConfig.AutoAuth != nil && mc.AgentConfig.AutoAuth.Method != nil {
-		if mc.AgentConfig.AutoAuth.Method.MinBackoff > 0 {
-			conf.Vault.Retry.Backoff = &mc.AgentConfig.AutoAuth.Method.MinBackoff
-		}
-
-		if mc.AgentConfig.AutoAuth.Method.MaxBackoff > 0 {
-			conf.Vault.Retry.MaxBackoff = &mc.AgentConfig.AutoAuth.Method.MaxBackoff
-		}
-	}
-
-	conf.Finalize()
-
-	// setup log level from TemplateServer config
-	conf.LogLevel = logLevelToStringPtr(mc.LogLevel)
-
-	if err := ctlogging.Setup(&ctlogging.Config{
-		Level:  *conf.LogLevel,
-		Writer: mc.LogWriter,
-	}); err != nil {
-		return nil, err
-	}
-	return conf, nil
-}
-
-// logLevelToString converts a go-hclog level to a matching, uppercase string
-// value. It's used to convert Vault Agent's hclog level to a string version
-// suitable for use in Consul Template's runner configuration input.
-func logLevelToStringPtr(level hclog.Level) *string {
-	// consul template's default level is WARN, but Vault Agent's default is INFO,
-	// so we use that for the Runner's default.
-	var levelStr string
-
-	switch level {
-	case hclog.Trace:
-		levelStr = "TRACE"
-	case hclog.Debug:
-		levelStr = "DEBUG"
-	case hclog.Warn:
-		levelStr = "WARN"
-	case hclog.Error:
-		levelStr = "ERR"
-	default:
-		levelStr = "INFO"
-	}
-	return pointerutil.StringPtr(levelStr)
-}
diff --git a/command/agent/jwt_end_to_end_test.go b/command/agent/jwt_end_to_end_test.go
index 4739a65c314a4..c2d74d9f37dc0 100644
--- a/command/agent/jwt_end_to_end_test.go
+++ b/command/agent/jwt_end_to_end_test.go
@@ -1,12 +1,9 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package agent
 
 import (
 	"context"
 	"encoding/json"
-	"fmt"
+	"io/ioutil"
 	"os"
 	"testing"
 	"time"
@@ -14,10 +11,10 @@ import (
 	hclog "github.com/hashicorp/go-hclog"
 	vaultjwt "github.com/hashicorp/vault-plugin-auth-jwt"
 	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/command/agentproxyshared/auth"
-	agentjwt "github.com/hashicorp/vault/command/agentproxyshared/auth/jwt"
-	"github.com/hashicorp/vault/command/agentproxyshared/sink"
-	"github.com/hashicorp/vault/command/agentproxyshared/sink/file"
+	"github.com/hashicorp/vault/command/agent/auth"
+	agentjwt "github.com/hashicorp/vault/command/agent/auth/jwt"
+	"github.com/hashicorp/vault/command/agent/sink"
+	"github.com/hashicorp/vault/command/agent/sink/file"
 	"github.com/hashicorp/vault/helper/dhutil"
 	vaulthttp "github.com/hashicorp/vault/http"
 	"github.com/hashicorp/vault/sdk/helper/jsonutil"
@@ -27,32 +24,11 @@ import (
 )
 
 func TestJWTEndToEnd(t *testing.T) {
-	t.Parallel()
-	testCases := []struct {
-		ahWrapping            bool
-		useSymlink            bool
-		removeJWTAfterReading bool
-	}{
-		{false, false, false},
-		{true, false, false},
-		{false, true, false},
-		{true, true, false},
-		{false, false, true},
-		{true, false, true},
-		{false, true, true},
-		{true, true, true},
-	}
-
-	for _, tc := range testCases {
-		tc := tc // capture range variable
-		t.Run(fmt.Sprintf("ahWrapping=%v, useSymlink=%v, removeJWTAfterReading=%v", tc.ahWrapping, tc.useSymlink, tc.removeJWTAfterReading), func(t *testing.T) {
-			t.Parallel()
-			testJWTEndToEnd(t, tc.ahWrapping, tc.useSymlink, tc.removeJWTAfterReading)
-		})
-	}
+	testJWTEndToEnd(t, false)
+	testJWTEndToEnd(t, true)
 }
 
-func testJWTEndToEnd(t *testing.T, ahWrapping, useSymlink, removeJWTAfterReading bool) {
+func testJWTEndToEnd(t *testing.T, ahWrapping bool) {
 	logger := logging.NewVaultLogger(hclog.Trace)
 	coreConfig := &vault.CoreConfig{
 		Logger: logger,
@@ -107,24 +83,16 @@ func testJWTEndToEnd(t *testing.T, ahWrapping, useSymlink, removeJWTAfterReading
 
 	// We close these right away because we're just basically testing
 	// permissions and finding a usable file name
-	inf, err := os.CreateTemp("", "auth.jwt.test.")
+	inf, err := ioutil.TempFile("", "auth.jwt.test.")
 	if err != nil {
 		t.Fatal(err)
 	}
 	in := inf.Name()
 	inf.Close()
 	os.Remove(in)
-	symlink, err := os.CreateTemp("", "auth.jwt.symlink.test.")
-	if err != nil {
-		t.Fatal(err)
-	}
-	symlinkName := symlink.Name()
-	symlink.Close()
-	os.Remove(symlinkName)
-	os.Symlink(in, symlinkName)
 	t.Logf("input: %s", in)
 
-	ouf, err := os.CreateTemp("", "auth.tokensink.test.")
+	ouf, err := ioutil.TempFile("", "auth.tokensink.test.")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -133,7 +101,7 @@ func testJWTEndToEnd(t *testing.T, ahWrapping, useSymlink, removeJWTAfterReading
 	os.Remove(out)
 	t.Logf("output: %s", out)
 
-	dhpathf, err := os.CreateTemp("", "auth.dhpath.test.")
+	dhpathf, err := ioutil.TempFile("", "auth.dhpath.test.")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -148,7 +116,7 @@ func testJWTEndToEnd(t *testing.T, ahWrapping, useSymlink, removeJWTAfterReading
 	if err != nil {
 		t.Fatal(err)
 	}
-	if err := os.WriteFile(dhpath, mPubKey, 0o600); err != nil {
+	if err := ioutil.WriteFile(dhpath, mPubKey, 0o600); err != nil {
 		t.Fatal(err)
 	} else {
 		logger.Trace("wrote dh param file", "path", dhpath)
@@ -156,21 +124,12 @@ func testJWTEndToEnd(t *testing.T, ahWrapping, useSymlink, removeJWTAfterReading
 
 	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
 
-	var fileNameToUseAsPath string
-	if useSymlink {
-		fileNameToUseAsPath = symlinkName
-	} else {
-		fileNameToUseAsPath = in
-	}
 	am, err := agentjwt.NewJWTAuthMethod(&auth.AuthConfig{
 		Logger:    logger.Named("auth.jwt"),
 		MountPath: "auth/jwt",
 		Config: map[string]interface{}{
-			"path":                        fileNameToUseAsPath,
-			"role":                        "test",
-			"remove_jwt_after_reading":    removeJWTAfterReading,
-			"remove_jwt_follows_symlinks": true,
-			"jwt_read_period":             "0.5s",
+			"path": in,
+			"role": "test",
 		},
 	})
 	if err != nil {
@@ -266,8 +225,7 @@ func testJWTEndToEnd(t *testing.T, ahWrapping, useSymlink, removeJWTAfterReading
 
 	// Get a token
 	jwtToken, _ := GetTestJWT(t)
-
-	if err := os.WriteFile(in, []byte(jwtToken), 0o600); err != nil {
+	if err := ioutil.WriteFile(in, []byte(jwtToken), 0o600); err != nil {
 		t.Fatal(err)
 	} else {
 		logger.Trace("wrote test jwt", "path", in)
@@ -279,29 +237,13 @@ func testJWTEndToEnd(t *testing.T, ahWrapping, useSymlink, removeJWTAfterReading
 			if time.Now().After(timeout) {
 				t.Fatal("did not find a written token after timeout")
 			}
-			val, err := os.ReadFile(out)
+			val, err := ioutil.ReadFile(out)
 			if err == nil {
 				os.Remove(out)
 				if len(val) == 0 {
 					t.Fatal("written token was empty")
 				}
 
-				// First, ensure JWT has been removed
-				if removeJWTAfterReading {
-					_, err = os.Stat(in)
-					if err == nil {
-						t.Fatal("no error returned from stat, indicating the jwt is still present")
-					}
-					if !os.IsNotExist(err) {
-						t.Fatalf("unexpected error: %v", err)
-					}
-				} else {
-					_, err := os.Stat(in)
-					if err != nil {
-						t.Fatal("JWT file removed despite removeJWTAfterReading being set to false")
-					}
-				}
-
 				// First decrypt it
 				resp := new(dhutil.Envelope)
 				if err := jsonutil.DecodeJSON(val, resp); err != nil {
@@ -394,7 +336,7 @@ func testJWTEndToEnd(t *testing.T, ahWrapping, useSymlink, removeJWTAfterReading
 	// Get another token to test the backend pushing the need to authenticate
 	// to the handler
 	jwtToken, _ = GetTestJWT(t)
-	if err := os.WriteFile(in, []byte(jwtToken), 0o600); err != nil {
+	if err := ioutil.WriteFile(in, []byte(jwtToken), 0o600); err != nil {
 		t.Fatal(err)
 	}
 
diff --git a/command/agent/oci_end_to_end_test.go b/command/agent/oci_end_to_end_test.go
deleted file mode 100644
index 2349f09abe8d1..0000000000000
--- a/command/agent/oci_end_to_end_test.go
+++ /dev/null
@@ -1,231 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package agent
-
-import (
-	"context"
-	"io/ioutil"
-	"os"
-	"testing"
-	"time"
-
-	hclog "github.com/hashicorp/go-hclog"
-	vaultoci "github.com/hashicorp/vault-plugin-auth-oci"
-	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/command/agentproxyshared/auth"
-	agentoci "github.com/hashicorp/vault/command/agentproxyshared/auth/oci"
-	"github.com/hashicorp/vault/command/agentproxyshared/sink"
-	"github.com/hashicorp/vault/command/agentproxyshared/sink/file"
-	"github.com/hashicorp/vault/helper/testhelpers"
-	vaulthttp "github.com/hashicorp/vault/http"
-	"github.com/hashicorp/vault/sdk/helper/logging"
-	"github.com/hashicorp/vault/sdk/logical"
-	"github.com/hashicorp/vault/vault"
-)
-
-const (
-	envVarOCITestTenancyOCID    = "OCI_TEST_TENANCY_OCID"
-	envVarOCITestUserOCID       = "OCI_TEST_USER_OCID"
-	envVarOCITestFingerprint    = "OCI_TEST_FINGERPRINT"
-	envVarOCITestPrivateKeyPath = "OCI_TEST_PRIVATE_KEY_PATH"
-	envVAROCITestOCIDList       = "OCI_TEST_OCID_LIST"
-
-	// The OCI SDK doesn't export its standard env vars so they're captured here.
-	// These are used for the duration of the test to make sure the agent is able to
-	// pick up creds from the env.
-	//
-	// To run this test, do not set these. Only the above ones need to be set.
-	envVarOCITenancyOCID    = "OCI_tenancy_ocid"
-	envVarOCIUserOCID       = "OCI_user_ocid"
-	envVarOCIFingerprint    = "OCI_fingerprint"
-	envVarOCIPrivateKeyPath = "OCI_private_key_path"
-)
-
-func TestOCIEndToEnd(t *testing.T) {
-	if !runAcceptanceTests {
-		t.SkipNow()
-	}
-
-	// Ensure each cred is populated.
-	credNames := []string{
-		envVarOCITestTenancyOCID,
-		envVarOCITestUserOCID,
-		envVarOCITestFingerprint,
-		envVarOCITestPrivateKeyPath,
-		envVAROCITestOCIDList,
-	}
-	testhelpers.SkipUnlessEnvVarsSet(t, credNames)
-
-	logger := logging.NewVaultLogger(hclog.Trace)
-	coreConfig := &vault.CoreConfig{
-		Logger: logger,
-		CredentialBackends: map[string]logical.Factory{
-			"oci": vaultoci.Factory,
-		},
-	}
-	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
-		HandlerFunc: vaulthttp.Handler,
-	})
-	cluster.Start()
-	defer cluster.Cleanup()
-
-	vault.TestWaitActive(t, cluster.Cores[0].Core)
-	client := cluster.Cores[0].Client
-
-	// Setup Vault
-	if err := client.Sys().EnableAuthWithOptions("oci", &api.EnableAuthOptions{
-		Type: "oci",
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	if _, err := client.Logical().Write("auth/oci/config", map[string]interface{}{
-		"home_tenancy_id": os.Getenv(envVarOCITestTenancyOCID),
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	if _, err := client.Logical().Write("auth/oci/role/test", map[string]interface{}{
-		"ocid_list": os.Getenv(envVAROCITestOCIDList),
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
-
-	// We're going to feed oci auth creds via env variables.
-	if err := setOCIEnvCreds(); err != nil {
-		t.Fatal(err)
-	}
-	defer func() {
-		if err := unsetOCIEnvCreds(); err != nil {
-			t.Fatal(err)
-		}
-	}()
-
-	vaultAddr := "http://" + cluster.Cores[0].Listeners[0].Addr().String()
-
-	am, err := agentoci.NewOCIAuthMethod(&auth.AuthConfig{
-		Logger:    logger.Named("auth.oci"),
-		MountPath: "auth/oci",
-		Config: map[string]interface{}{
-			"type": "apikey",
-			"role": "test",
-		},
-	}, vaultAddr)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	ahConfig := &auth.AuthHandlerConfig{
-		Logger: logger.Named("auth.handler"),
-		Client: client,
-	}
-
-	ah := auth.NewAuthHandler(ahConfig)
-	errCh := make(chan error)
-	go func() {
-		errCh <- ah.Run(ctx, am)
-	}()
-	defer func() {
-		select {
-		case <-ctx.Done():
-		case err := <-errCh:
-			if err != nil {
-				t.Fatal(err)
-			}
-		}
-	}()
-
-	tmpFile, err := ioutil.TempFile("", "auth.tokensink.test.")
-	if err != nil {
-		t.Fatal(err)
-	}
-	tokenSinkFileName := tmpFile.Name()
-	tmpFile.Close()
-	os.Remove(tokenSinkFileName)
-	t.Logf("output: %s", tokenSinkFileName)
-
-	config := &sink.SinkConfig{
-		Logger: logger.Named("sink.file"),
-		Config: map[string]interface{}{
-			"path": tokenSinkFileName,
-		},
-		WrapTTL: 10 * time.Second,
-	}
-
-	fs, err := file.NewFileSink(config)
-	if err != nil {
-		t.Fatal(err)
-	}
-	config.Sink = fs
-
-	ss := sink.NewSinkServer(&sink.SinkServerConfig{
-		Logger: logger.Named("sink.server"),
-		Client: client,
-	})
-	go func() {
-		errCh <- ss.Run(ctx, ah.OutputCh, []*sink.SinkConfig{config})
-	}()
-	defer func() {
-		select {
-		case <-ctx.Done():
-		case err := <-errCh:
-			if err != nil {
-				t.Fatal(err)
-			}
-		}
-	}()
-
-	// This has to be after the other defers so it happens first. It allows
-	// successful test runs to immediately cancel all of the runner goroutines
-	// and unblock any of the blocking defer calls by the runner's DoneCh that
-	// comes before this and avoid successful tests from taking the entire
-	// timeout duration.
-	defer cancel()
-
-	if stat, err := os.Lstat(tokenSinkFileName); err == nil {
-		t.Fatalf("expected err but got %s", stat)
-	} else if !os.IsNotExist(err) {
-		t.Fatal("expected notexist err")
-	}
-
-	// Wait 2 seconds for the env variables to be detected and an auth to be generated.
-	time.Sleep(time.Second * 2)
-
-	token, err := readToken(tokenSinkFileName)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if token.Token == "" {
-		t.Fatal("expected token but didn't receive it")
-	}
-}
-
-func setOCIEnvCreds() error {
-	if err := os.Setenv(envVarOCITenancyOCID, os.Getenv(envVarOCITestTenancyOCID)); err != nil {
-		return err
-	}
-	if err := os.Setenv(envVarOCIUserOCID, os.Getenv(envVarOCITestUserOCID)); err != nil {
-		return err
-	}
-	if err := os.Setenv(envVarOCIFingerprint, os.Getenv(envVarOCITestFingerprint)); err != nil {
-		return err
-	}
-	return os.Setenv(envVarOCIPrivateKeyPath, os.Getenv(envVarOCITestPrivateKeyPath))
-}
-
-func unsetOCIEnvCreds() error {
-	if err := os.Unsetenv(envVarOCITenancyOCID); err != nil {
-		return err
-	}
-	if err := os.Unsetenv(envVarOCIUserOCID); err != nil {
-		return err
-	}
-	if err := os.Unsetenv(envVarOCIFingerprint); err != nil {
-		return err
-	}
-	return os.Unsetenv(envVarOCIPrivateKeyPath)
-}
diff --git a/command/agentproxyshared/sink/file/file_sink.go b/command/agent/sink/file/file_sink.go
similarity index 96%
rename from command/agentproxyshared/sink/file/file_sink.go
rename to command/agent/sink/file/file_sink.go
index c25d99169aa01..f2faf5641797d 100644
--- a/command/agentproxyshared/sink/file/file_sink.go
+++ b/command/agent/sink/file/file_sink.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package file
 
 import (
@@ -12,7 +9,7 @@ import (
 
 	hclog "github.com/hashicorp/go-hclog"
 	uuid "github.com/hashicorp/go-uuid"
-	"github.com/hashicorp/vault/command/agentproxyshared/sink"
+	"github.com/hashicorp/vault/command/agent/sink"
 )
 
 // fileSink is a Sink implementation that writes a token to a file
diff --git a/command/agentproxyshared/sink/file/file_sink_test.go b/command/agent/sink/file/file_sink_test.go
similarity index 95%
rename from command/agentproxyshared/sink/file/file_sink_test.go
rename to command/agent/sink/file/file_sink_test.go
index 95db8df19b72b..9749522b49310 100644
--- a/command/agentproxyshared/sink/file/file_sink_test.go
+++ b/command/agent/sink/file/file_sink_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package file
 
 import (
@@ -12,7 +9,7 @@ import (
 
 	hclog "github.com/hashicorp/go-hclog"
 	uuid "github.com/hashicorp/go-uuid"
-	"github.com/hashicorp/vault/command/agentproxyshared/sink"
+	"github.com/hashicorp/vault/command/agent/sink"
 	"github.com/hashicorp/vault/sdk/helper/logging"
 )
 
diff --git a/command/agentproxyshared/sink/file/sink_test.go b/command/agent/sink/file/sink_test.go
similarity index 95%
rename from command/agentproxyshared/sink/file/sink_test.go
rename to command/agent/sink/file/sink_test.go
index de074003bfd37..839340f0c88d9 100644
--- a/command/agentproxyshared/sink/file/sink_test.go
+++ b/command/agent/sink/file/sink_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package file
 
 import (
@@ -15,7 +12,7 @@ import (
 
 	hclog "github.com/hashicorp/go-hclog"
 	uuid "github.com/hashicorp/go-uuid"
-	"github.com/hashicorp/vault/command/agentproxyshared/sink"
+	"github.com/hashicorp/vault/command/agent/sink"
 	"github.com/hashicorp/vault/sdk/helper/logging"
 )
 
diff --git a/command/agentproxyshared/sink/inmem/inmem_sink.go b/command/agent/sink/inmem/inmem_sink.go
similarity index 81%
rename from command/agentproxyshared/sink/inmem/inmem_sink.go
rename to command/agent/sink/inmem/inmem_sink.go
index e5804d884bad4..2dfa09115ca73 100644
--- a/command/agentproxyshared/sink/inmem/inmem_sink.go
+++ b/command/agent/sink/inmem/inmem_sink.go
@@ -1,14 +1,11 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package inmem
 
 import (
 	"errors"
 
 	hclog "github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/vault/command/agentproxyshared/cache"
-	"github.com/hashicorp/vault/command/agentproxyshared/sink"
+	"github.com/hashicorp/vault/command/agent/cache"
+	"github.com/hashicorp/vault/command/agent/sink"
 	"go.uber.org/atomic"
 )
 
diff --git a/command/agent/sink/mock/mock_sink.go b/command/agent/sink/mock/mock_sink.go
new file mode 100644
index 0000000000000..fb4720cc17ab2
--- /dev/null
+++ b/command/agent/sink/mock/mock_sink.go
@@ -0,0 +1,24 @@
+package mock
+
+import (
+	"github.com/hashicorp/vault/command/agent/sink"
+)
+
+type mockSink struct {
+	token string
+}
+
+func NewSink(token string) sink.Sink {
+	return &mockSink{
+		token: token,
+	}
+}
+
+func (m *mockSink) WriteToken(token string) error {
+	m.token = token
+	return nil
+}
+
+func (m *mockSink) Token() string {
+	return m.token
+}
diff --git a/command/agentproxyshared/sink/sink.go b/command/agent/sink/sink.go
similarity index 97%
rename from command/agentproxyshared/sink/sink.go
rename to command/agent/sink/sink.go
index 2b64c1762781c..75ea91dc306b6 100644
--- a/command/agentproxyshared/sink/sink.go
+++ b/command/agent/sink/sink.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package sink
 
 import (
@@ -154,12 +151,10 @@ func (ss *SinkServer) Run(ctx context.Context, incoming chan string, sinks []*Si
 			if err := writeSink(st.sink, st.token); err != nil {
 				backoff := 2*time.Second + time.Duration(ss.random.Int63()%int64(time.Second*2)-int64(time.Second))
 				ss.logger.Error("error returned by sink function, retrying", "error", err, "backoff", backoff.String())
-				timer := time.NewTimer(backoff)
 				select {
 				case <-ctx.Done():
-					timer.Stop()
 					return nil
-				case <-timer.C:
+				case <-time.After(backoff):
 					atomic.AddInt32(ss.remaining, 1)
 					sinkCh <- st
 				}
diff --git a/command/agent/template/template.go b/command/agent/template/template.go
index be3ccc4eab64d..32e9022bb78bd 100644
--- a/command/agent/template/template.go
+++ b/command/agent/template/template.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 // Package template is responsible for rendering user supplied templates to
 // disk. The Server type accepts configuration to communicate to a Vault server
 // and a Vault token for authentication. Internally, the Server creates a Consul
@@ -13,16 +10,15 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"strings"
 
 	"go.uber.org/atomic"
 
 	ctconfig "github.com/hashicorp/consul-template/config"
+	ctlogging "github.com/hashicorp/consul-template/logging"
 	"github.com/hashicorp/consul-template/manager"
 	"github.com/hashicorp/go-hclog"
-
 	"github.com/hashicorp/vault/command/agent/config"
-	"github.com/hashicorp/vault/command/agent/internal/ctmanager"
-	"github.com/hashicorp/vault/helper/useragent"
 	"github.com/hashicorp/vault/sdk/helper/pointerutil"
 )
 
@@ -111,14 +107,8 @@ func (ts *Server) Run(ctx context.Context, incoming chan string, templates []*ct
 	// configuration
 	var runnerConfig *ctconfig.Config
 	var runnerConfigErr error
-	managerConfig := ctmanager.ManagerConfig{
-		AgentConfig: ts.config.AgentConfig,
-		Namespace:   ts.config.Namespace,
-		LogLevel:    ts.config.LogLevel,
-		LogWriter:   ts.config.LogWriter,
-	}
-	runnerConfig, runnerConfigErr = ctmanager.NewConfig(managerConfig, templates)
-	if runnerConfigErr != nil {
+
+	if runnerConfig, runnerConfigErr = newRunnerConfig(ts.config, templates); runnerConfigErr != nil {
 		return fmt.Errorf("template server failed to runner generate config: %w", runnerConfigErr)
 	}
 
@@ -167,8 +157,7 @@ func (ts *Server) Run(ctx context.Context, incoming chan string, templates []*ct
 				*latestToken = token
 				ctv := ctconfig.Config{
 					Vault: &ctconfig.VaultConfig{
-						Token:           latestToken,
-						ClientUserAgent: pointerutil.StringPtr(useragent.AgentTemplatingString()),
+						Token: latestToken,
 					},
 				}
 
@@ -235,3 +224,131 @@ func (ts *Server) Stop() {
 		close(ts.DoneCh)
 	}
 }
+
+// newRunnerConfig returns a consul-template runner configuration, setting the
+// Vault and Consul configurations based on the clients configs.
+func newRunnerConfig(sc *ServerConfig, templates ctconfig.TemplateConfigs) (*ctconfig.Config, error) {
+	conf := ctconfig.DefaultConfig()
+	conf.Templates = templates.Copy()
+
+	// Setup the Vault config
+	// Always set these to ensure nothing is picked up from the environment
+	conf.Vault.RenewToken = pointerutil.BoolPtr(false)
+	conf.Vault.Token = pointerutil.StringPtr("")
+	conf.Vault.Address = &sc.AgentConfig.Vault.Address
+
+	if sc.Namespace != "" {
+		conf.Vault.Namespace = &sc.Namespace
+	}
+
+	if sc.AgentConfig.TemplateConfig != nil && sc.AgentConfig.TemplateConfig.StaticSecretRenderInt != 0 {
+		conf.Vault.DefaultLeaseDuration = &sc.AgentConfig.TemplateConfig.StaticSecretRenderInt
+	}
+
+	if sc.AgentConfig.DisableIdleConnsTemplating {
+		idleConns := -1
+		conf.Vault.Transport.MaxIdleConns = &idleConns
+	}
+
+	if sc.AgentConfig.DisableKeepAlivesTemplating {
+		conf.Vault.Transport.DisableKeepAlives = pointerutil.BoolPtr(true)
+	}
+
+	conf.Vault.SSL = &ctconfig.SSLConfig{
+		Enabled:    pointerutil.BoolPtr(false),
+		Verify:     pointerutil.BoolPtr(false),
+		Cert:       pointerutil.StringPtr(""),
+		Key:        pointerutil.StringPtr(""),
+		CaCert:     pointerutil.StringPtr(""),
+		CaPath:     pointerutil.StringPtr(""),
+		ServerName: pointerutil.StringPtr(""),
+	}
+
+	// We need to assign something to Vault.Retry or it will use its default of 12 retries.
+	// This retry value will be respected regardless of if we use the cache.
+	var attempts int
+	if sc.AgentConfig.Vault != nil && sc.AgentConfig.Vault.Retry != nil {
+		attempts = sc.AgentConfig.Vault.Retry.NumRetries
+	}
+
+	// Use the cache if available or fallback to the Vault server values.
+	if sc.AgentConfig.Cache != nil {
+		if sc.AgentConfig.Cache.InProcDialer == nil {
+			return nil, fmt.Errorf("missing in-process dialer configuration")
+		}
+		if conf.Vault.Transport == nil {
+			conf.Vault.Transport = &ctconfig.TransportConfig{}
+		}
+		conf.Vault.Transport.CustomDialer = sc.AgentConfig.Cache.InProcDialer
+		// The in-process dialer ignores the address passed in, but we're still
+		// setting it here to override the setting at the top of this function,
+		// and to prevent the vault/http client from defaulting to https.
+		conf.Vault.Address = pointerutil.StringPtr("http://127.0.0.1:8200")
+	} else if strings.HasPrefix(sc.AgentConfig.Vault.Address, "https") || sc.AgentConfig.Vault.CACert != "" {
+		skipVerify := sc.AgentConfig.Vault.TLSSkipVerify
+		verify := !skipVerify
+		conf.Vault.SSL = &ctconfig.SSLConfig{
+			Enabled:    pointerutil.BoolPtr(true),
+			Verify:     &verify,
+			Cert:       &sc.AgentConfig.Vault.ClientCert,
+			Key:        &sc.AgentConfig.Vault.ClientKey,
+			CaCert:     &sc.AgentConfig.Vault.CACert,
+			CaPath:     &sc.AgentConfig.Vault.CAPath,
+			ServerName: &sc.AgentConfig.Vault.TLSServerName,
+		}
+	}
+	enabled := attempts > 0
+	conf.Vault.Retry = &ctconfig.RetryConfig{
+		Attempts: &attempts,
+		Enabled:  &enabled,
+	}
+
+	// Sync Consul Template's retry with user set auto-auth initial backoff value.
+	// This is helpful if Auto Auth cannot get a new token and CT is trying to fetch
+	// secrets.
+	if sc.AgentConfig.AutoAuth != nil && sc.AgentConfig.AutoAuth.Method != nil {
+		if sc.AgentConfig.AutoAuth.Method.MinBackoff > 0 {
+			conf.Vault.Retry.Backoff = &sc.AgentConfig.AutoAuth.Method.MinBackoff
+		}
+
+		if sc.AgentConfig.AutoAuth.Method.MaxBackoff > 0 {
+			conf.Vault.Retry.MaxBackoff = &sc.AgentConfig.AutoAuth.Method.MaxBackoff
+		}
+	}
+
+	conf.Finalize()
+
+	// setup log level from TemplateServer config
+	conf.LogLevel = logLevelToStringPtr(sc.LogLevel)
+
+	if err := ctlogging.Setup(&ctlogging.Config{
+		Level:  *conf.LogLevel,
+		Writer: sc.LogWriter,
+	}); err != nil {
+		return nil, err
+	}
+	return conf, nil
+}
+
+// logLevelToString converts a go-hclog level to a matching, uppercase string
+// value. It's used to convert Vault Agent's hclog level to a string version
+// suitable for use in Consul Template's runner configuration input.
+func logLevelToStringPtr(level hclog.Level) *string {
+	// consul template's default level is WARN, but Vault Agent's default is INFO,
+	// so we use that for the Runner's default.
+	var levelStr string
+
+	switch level {
+	case hclog.Trace:
+		levelStr = "TRACE"
+	case hclog.Debug:
+		levelStr = "DEBUG"
+	case hclog.Warn:
+		levelStr = "WARN"
+	case hclog.Error:
+		levelStr = "ERR"
+	default:
+		levelStr = "INFO"
+	}
+	return pointerutil.StringPtr(levelStr)
+}
diff --git a/command/agent/template/template_test.go b/command/agent/template/template_test.go
index 61822bc5bd3b0..25999945f99d3 100644
--- a/command/agent/template/template_test.go
+++ b/command/agent/template/template_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package template
 
 import (
@@ -17,8 +14,6 @@ import (
 	ctconfig "github.com/hashicorp/consul-template/config"
 	"github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/vault/command/agent/config"
-	"github.com/hashicorp/vault/command/agent/internal/ctmanager"
-	"github.com/hashicorp/vault/command/agentproxyshared"
 	"github.com/hashicorp/vault/internalshared/configutil"
 	"github.com/hashicorp/vault/internalshared/listenerutil"
 	"github.com/hashicorp/vault/sdk/helper/logging"
@@ -28,14 +23,6 @@ import (
 	"google.golang.org/grpc/test/bufconn"
 )
 
-func newRunnerConfig(s *ServerConfig, configs ctconfig.TemplateConfigs) (*ctconfig.Config, error) {
-	managerCfg := ctmanager.ManagerConfig{
-		AgentConfig: s.AgentConfig,
-	}
-	cfg, err := ctmanager.NewConfig(managerCfg, configs)
-	return cfg, err
-}
-
 // TestNewServer is a simple test to make sure NewServer returns a Server and
 // channel
 func TestNewServer(t *testing.T) {
@@ -88,7 +75,7 @@ func newAgentConfig(listeners []*configutil.Listener, enableCache, enablePersise
 	}
 
 	if enablePersisentCache {
-		agentConfig.Cache.Persist = &agentproxyshared.PersistConfig{Type: "kubernetes"}
+		agentConfig.Cache.Persist = &config.Persist{Type: "kubernetes"}
 	}
 
 	return agentConfig
diff --git a/command/agent/test-fixtures/reload/reload_bar.key b/command/agent/test-fixtures/reload/reload_bar.key
deleted file mode 100644
index 10849fbe1d7f3..0000000000000
--- a/command/agent/test-fixtures/reload/reload_bar.key
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAwF7sRAyUiLcd6es6VeaTRUBOusFFGkmKJ5lU351waCJqXFju
-Z6i/SQYNAAnnRgotXSTE1fIPjE2kZNH1hvqE5IpTGgAwy50xpjJrrBBI6e9lyKqj
-7T8gLVNBvtC0cpQi+pGrszEI0ckDQCSZHqi/PAzcpmLUgh2KMrgagT+YlN35KHtl
-/bQ/Fsn+kqykVqNw69n/CDKNKdDHn1qPwiX9q/fTMj3EG6g+3ntKrUOh8V/gHKPz
-q8QGP/wIud2K+tTSorVXr/4zx7xgzlbJkCakzcQQiP6K+paPnDRlE8fK+1gRRyR7
-XCzyp0irUl8G1NjYAR/tVWxiUhlk/jZutb8PpwIDAQABAoIBAEOzJELuindyujxQ
-ZD9G3h1I/GwNCFyv9Mbq10u7BIwhUH0fbwdcA7WXQ4v38ERd4IkfH4aLoZ0m1ewF
-V/sgvxQO+h/0YTfHImny5KGxOXfaoF92bipYROKuojydBmQsbgLwsRRm9UufCl3Q
-g3KewG5JuH112oPQEYq379v8nZ4FxC3Ano1OFBTm9UhHIAX1Dn22kcHOIIw8jCsQ
-zp7TZOW+nwtkS41cBwhvV4VIeL6yse2UgbOfRVRwI7B0OtswS5VgW3wysO2mTDKt
-V/WCmeht1il/6ZogEHgi/mvDCKpj20wQ1EzGnPdFLdiFJFylf0oufQD/7N/uezbC
-is0qJEECgYEA3AE7SeLpe3SZApj2RmE2lcD9/Saj1Y30PznxB7M7hK0sZ1yXEbtS
-Qf894iDDD/Cn3ufA4xk/K52CXgAcqvH/h2geG4pWLYsT1mdWhGftprtOMCIvJvzU
-8uWJzKdOGVMG7R59wNgEpPDZDpBISjexwQsFo3aw1L/H1/Sa8cdY3a0CgYEA39hB
-1oLmGRyE32Q4GF/srG4FqKL1EsbISGDUEYTnaYg2XiM43gu3tC/ikfclk27Jwc2L
-m7cA5FxxaEyfoOgfAizfU/uWTAbx9GoXgWsO0hWSN9+YNq61gc5WKoHyrJ/rfrti
-y5d7k0OCeBxckLqGDuJqICQ0myiz0El6FU8h5SMCgYEAuhigmiNC9JbwRu40g9v/
-XDVfox9oPmBRVpogdC78DYKeqN/9OZaGQiUxp3GnDni2xyqqUm8srCwT9oeJuF/z
-kgpUTV96/hNCuH25BU8UC5Es1jJUSFpdlwjqwx5SRcGhfjnojZMseojwUg1h2MW7
-qls0bc0cTxnaZaYW2qWRWhECgYBrT0cwyQv6GdvxJCBoPwQ9HXmFAKowWC+H0zOX
-Onmd8/jsZEJM4J0uuo4Jn8vZxBDg4eL9wVuiHlcXwzP7dYv4BP8DSechh2rS21Ft
-b59pQ4IXWw+jl1nYYsyYEDgAXaIN3VNder95N7ICVsZhc6n01MI/qlu1zmt1fOQT
-9x2utQKBgHI9SbsfWfbGiu6oLS3+9V1t4dORhj8D8b7z3trvECrD6tPhxoZqtfrH
-4apKr3OKRSXk3K+1K6pkMHJHunspucnA1ChXLhzfNF08BSRJkQDGYuaRLS6VGgab
-JZTl54bGvO1GkszEBE/9QFcqNVtWGMWXnUPwNNv8t//yJT5rvQil
------END RSA PRIVATE KEY-----
diff --git a/command/agent/test-fixtures/reload/reload_bar.pem b/command/agent/test-fixtures/reload/reload_bar.pem
deleted file mode 100644
index a8217be5c7dfd..0000000000000
--- a/command/agent/test-fixtures/reload/reload_bar.pem
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDQzCCAiugAwIBAgIULLCz3mZKmg2xy3rWCud0f1zcmBwwDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAxMLZXhhbXBsZS5jb20wHhcNMTYwMzEwMDIzNjQ0WhcNMzYw
-MzA1MDEzNzE0WjAaMRgwFgYDVQQDEw9iYXIuZXhhbXBsZS5jb20wggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAXuxEDJSItx3p6zpV5pNFQE66wUUaSYon
-mVTfnXBoImpcWO5nqL9JBg0ACedGCi1dJMTV8g+MTaRk0fWG+oTkilMaADDLnTGm
-MmusEEjp72XIqqPtPyAtU0G+0LRylCL6kauzMQjRyQNAJJkeqL88DNymYtSCHYoy
-uBqBP5iU3fkoe2X9tD8Wyf6SrKRWo3Dr2f8IMo0p0MefWo/CJf2r99MyPcQbqD7e
-e0qtQ6HxX+Aco/OrxAY//Ai53Yr61NKitVev/jPHvGDOVsmQJqTNxBCI/or6lo+c
-NGUTx8r7WBFHJHtcLPKnSKtSXwbU2NgBH+1VbGJSGWT+Nm61vw+nAgMBAAGjgYQw
-gYEwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB0GA1UdDgQWBBSVoF8F
-7qbzSryIFrldurAG78LvSjAfBgNVHSMEGDAWgBRzDNvqF/Tq21OgWs13B5YydZjl
-vzAgBgNVHREEGTAXgg9iYXIuZXhhbXBsZS5jb22HBH8AAAEwDQYJKoZIhvcNAQEL
-BQADggEBAGmz2N282iT2IaEZvOmzIE4znHGkvoxZmrr/2byq5PskBg9ysyCHfUvw
-SFA8U7jWjezKTnGRUu5blB+yZdjrMtB4AePWyEqtkJwVsZ2SPeP+9V2gNYK4iktP
-UF3aIgBbAbw8rNuGIIB0T4D+6Zyo9Y3MCygs6/N4bRPZgLhewWn1ilklfnl3eqaC
-a+JY1NBuTgCMa28NuC+Hy3mCveqhI8tFNiOthlLdgAEbuQaOuNutAG73utZ2aq6Q
-W4pajFm3lEf5zt7Lo6ZCFtY/Q8jjURJ9e4O7VjXcqIhBM5bSMI6+fgQyOH0SLboj
-RNanJ2bcyF1iPVyPBGzV3dF0ngYzxEY=
------END CERTIFICATE-----
diff --git a/command/agent/test-fixtures/reload/reload_ca.pem b/command/agent/test-fixtures/reload/reload_ca.pem
deleted file mode 100644
index 72a74440c4820..0000000000000
--- a/command/agent/test-fixtures/reload/reload_ca.pem
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDNTCCAh2gAwIBAgIUBeVo+Ce2BrdRT1cogKvJLtdOky8wDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAxMLZXhhbXBsZS5jb20wHhcNMTYwMzEwMDIzNTM4WhcNMzYw
-MzA1MDIzNjA4WjAWMRQwEgYDVQQDEwtleGFtcGxlLmNvbTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAPTQGWPRIOECGeJB6tR/ftvvtioC9f84fY2QdJ5k
-JBupXjPAGYKgS4MGzyT5bz9yY400tCtmh6h7p9tZwHl/TElTugtLQ/8ilMbJTiOM
-SiyaMDPHiMJJYKTjm9bu6bKeU1qPZ0Cryes4rygbqs7w2XPgA2RxNmDh7JdX7/h+
-VB5onBmv8g4WFSayowGyDcJWWCbu5yv6ZdH1bqQjgRzQ5xp17WXNmvlzdp2vate/
-9UqPdA8sdJzW/91Gvmros0o/FnG7c2pULhk22wFqO8t2HRjKb3nuxALEJvqoPvad
-KjpDTaq1L1ZzxcB7wvWyhy/lNLZL7jiNWy0mN1YB0UpSWdECAwEAAaN7MHkwDgYD
-VR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFHMM2+oX9Orb
-U6BazXcHljJ1mOW/MB8GA1UdIwQYMBaAFHMM2+oX9OrbU6BazXcHljJ1mOW/MBYG
-A1UdEQQPMA2CC2V4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQAp17XsOaT9
-hculRqrFptn3+zkH3HrIckHm+28R5xYT8ASFXFcLFugGizJAXVL5lvsRVRIwCoOX
-Nhi8XSNEFP640VbHcEl81I84bbRIIDS+Yheu6JDZGemTaDYLv1J3D5SHwgoM+nyf
-oTRgotUCIXcwJHmTpWEUkZFKuqBxsoTGzk0jO8wOP6xoJkzxVVG5PvNxs924rxY8
-Y8iaLdDfMeT7Pi0XIliBa/aSp/iqSW8XKyJl5R5vXg9+DOgZUrVzIxObaF5RBl/a
-mJOeklJBdNVzQm5+iMpO42lu0TA9eWtpP+YiUEXU17XDvFeQWOocFbQ1Peo0W895
-XRz2GCwCNyvW
------END CERTIFICATE-----
diff --git a/command/agent/test-fixtures/reload/reload_foo.key b/command/agent/test-fixtures/reload/reload_foo.key
deleted file mode 100644
index 86e6cce63e647..0000000000000
--- a/command/agent/test-fixtures/reload/reload_foo.key
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpgIBAAKCAQEAzNyVieSti9XBb5/celB5u8YKRJv3mQS9A4/X0mqY1ePznt1i
-ilG7OmG0yM2VAk0ceIAQac3Bsn74jxn2cDlrrVniPXcNgYtMtW0kRqNEo4doo4EX
-xZguS9vNBu29useHhif1TGX/pA3dgvaVycUCjzTEVk6qI8UEehMK6gEGZb7nOr0A
-A9nipSqoeHpDLe3a4KVqj1vtlJKUvD2i1MuBuQ130cB1K9rufLCShGu7mEgzEosc
-gr+K3Bf03IejbeVRyIfLtgj1zuvV1katec75UqRA/bsvt5G9JfJqiZ9mwFN0vp3g
-Cr7pdQBSBQ2q4yf9s8CuY5c5w9fl3F8f5QFQoQIDAQABAoIBAQCbCb1qNFRa5ZSV
-I8i6ELlwMDqJHfhOJ9XcIjpVljLAfNlcu3Ld92jYkCU/asaAjVckotbJG9yhd5Io
-yp9E40/oS4P6vGTOS1vsWgMAKoPBtrKsOwCAm+E9q8UIn1fdSS/5ibgM74x+3bds
-a62Em8KKGocUQkhk9a+jq1GxMsFisbHRxEHvClLmDMgGnW3FyGmWwT6yZLPSC0ey
-szmmjt3ouP8cLAOmSjzcQBMmEZpQMCgR6Qckg6nrLQAGzZyTdCd875wbGA57DpWX
-Lssn95+A5EFvr/6b7DkXeIFCrYBFFa+UQN3PWGEQ6Zjmiw4VgV2vO8yX2kCLlUhU
-02bL393ZAoGBAPXPD/0yWINbKUPcRlx/WfWQxfz0bu50ytwIXzVK+pRoAMuNqehK
-BJ6kNzTTBq40u+IZ4f5jbLDulymR+4zSkirLE7CyWFJOLNI/8K4Pf5DJUgNdrZjJ
-LCtP9XRdxiPatQF0NGfdgHlSJh+/CiRJP4AgB17AnB/4z9/M0ZlJGVrzAoGBANVa
-69P3Rp/WPBQv0wx6f0tWppJolWekAHKcDIdQ5HdOZE5CPAYSlTrTUW3uJuqMwU2L
-M0Er2gIPKWIR5X+9r7Fvu9hQW6l2v3xLlcrGPiapp3STJvuMxzhRAmXmu3bZfVn1
-Vn7Vf1jPULHtTFSlNFEvYG5UJmygK9BeyyVO5KMbAoGBAMCyAibLQPg4jrDUDZSV
-gUAwrgUO2ae1hxHWvkxY6vdMUNNByuB+pgB3W4/dnm8Sh/dHsxJpftt1Lqs39ar/
-p/ZEHLt4FCTxg9GOrm7FV4t5RwG8fko36phJpnIC0UFqQltRbYO+8OgqrhhU+u5X
-PaCDe0OcWsf1lYAsYGN6GpZhAoGBAMJ5Ksa9+YEODRs1cIFKUyd/5ztC2xRqOAI/
-3WemQ2nAacuvsfizDZVeMzYpww0+maAuBt0btI719PmwaGmkpDXvK+EDdlmkpOwO
-FY6MXvBs6fdnfjwCWUErDi2GQFAX9Jt/9oSL5JU1+08DhvUM1QA/V/2Y9KFE6kr3
-bOIn5F4LAoGBAKQzH/AThDGhT3hwr4ktmReF3qKxBgxzjVa8veXtkY5VWwyN09iT
-jnTTt6N1CchZoK5WCETjdzNYP7cuBTcV4d3bPNRiJmxXaNVvx3Tlrk98OiffT8Qa
-5DO/Wfb43rNHYXBjU6l0n2zWcQ4PUSSbu0P0bM2JTQPRCqSthXvSHw2P
------END RSA PRIVATE KEY-----
diff --git a/command/agent/test-fixtures/reload/reload_foo.pem b/command/agent/test-fixtures/reload/reload_foo.pem
deleted file mode 100644
index c8b868bcd0f08..0000000000000
--- a/command/agent/test-fixtures/reload/reload_foo.pem
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDQzCCAiugAwIBAgIUFVW6i/M+yJUsDrXWgRKO/Dnb+L4wDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAxMLZXhhbXBsZS5jb20wHhcNMTYwMzEwMDIzNjA1WhcNMzYw
-MzA1MDEzNjM1WjAaMRgwFgYDVQQDEw9mb28uZXhhbXBsZS5jb20wggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDM3JWJ5K2L1cFvn9x6UHm7xgpEm/eZBL0D
-j9fSapjV4/Oe3WKKUbs6YbTIzZUCTRx4gBBpzcGyfviPGfZwOWutWeI9dw2Bi0y1
-bSRGo0Sjh2ijgRfFmC5L280G7b26x4eGJ/VMZf+kDd2C9pXJxQKPNMRWTqojxQR6
-EwrqAQZlvuc6vQAD2eKlKqh4ekMt7drgpWqPW+2UkpS8PaLUy4G5DXfRwHUr2u58
-sJKEa7uYSDMSixyCv4rcF/Tch6Nt5VHIh8u2CPXO69XWRq15zvlSpED9uy+3kb0l
-8mqJn2bAU3S+neAKvul1AFIFDarjJ/2zwK5jlznD1+XcXx/lAVChAgMBAAGjgYQw
-gYEwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB0GA1UdDgQWBBRNJoOJ
-dnazDiuqLhV6truQ4cRe9jAfBgNVHSMEGDAWgBRzDNvqF/Tq21OgWs13B5YydZjl
-vzAgBgNVHREEGTAXgg9mb28uZXhhbXBsZS5jb22HBH8AAAEwDQYJKoZIhvcNAQEL
-BQADggEBAHzv67mtbxMWcuMsxCFBN1PJNAyUDZVCB+1gWhk59EySbVg81hWJDCBy
-fl3TKjz3i7wBGAv+C2iTxmwsSJbda22v8JQbuscXIfLFbNALsPzF+J0vxAgJs5Gc
-sDbfJ7EQOIIOVKQhHLYnQoLnigSSPc1kd0JjYyHEBjgIaSuXgRRTBAeqLiBMx0yh
-RKL1lQ+WoBU/9SXUZZkwokqWt5G7khi5qZkNxVXZCm8VGPg0iywf6gGyhI1SU5S2
-oR219S6kA4JY/stw1qne85/EmHmoImHGt08xex3GoU72jKAjsIpqRWopcD/+uene
-Tc9nn3fTQW/Z9fsoJ5iF5OdJnDEswqE=
------END CERTIFICATE-----
diff --git a/command/agent/testing.go b/command/agent/testing.go
index 04a2f0608a6c6..d4de988a98575 100644
--- a/command/agent/testing.go
+++ b/command/agent/testing.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package agent
 
 import (
@@ -9,14 +6,14 @@ import (
 	"crypto/x509"
 	"encoding/json"
 	"encoding/pem"
+	"io/ioutil"
 	"os"
 	"testing"
 	"time"
 
-	"github.com/go-jose/go-jose/v3"
-	"github.com/go-jose/go-jose/v3/jwt"
-
 	"github.com/hashicorp/vault/sdk/logical"
+	jose "gopkg.in/square/go-jose.v2"
+	"gopkg.in/square/go-jose.v2/jwt"
 )
 
 const envVarRunAccTests = "VAULT_ACC"
@@ -64,7 +61,7 @@ func GetTestJWT(t *testing.T) (string, *ecdsa.PrivateKey) {
 }
 
 func readToken(fileName string) (*logical.HTTPWrapInfo, error) {
-	b, err := os.ReadFile(fileName)
+	b, err := ioutil.ReadFile(fileName)
 	if err != nil {
 		return nil, err
 	}
diff --git a/command/agent/token_file_end_to_end_test.go b/command/agent/token_file_end_to_end_test.go
deleted file mode 100644
index dc7115cb18f4c..0000000000000
--- a/command/agent/token_file_end_to_end_test.go
+++ /dev/null
@@ -1,162 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package agent
-
-import (
-	"context"
-	"os"
-	"path/filepath"
-	"testing"
-	"time"
-
-	log "github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/vault/command/agentproxyshared/auth"
-	token_file "github.com/hashicorp/vault/command/agentproxyshared/auth/token-file"
-	"github.com/hashicorp/vault/command/agentproxyshared/sink"
-	"github.com/hashicorp/vault/command/agentproxyshared/sink/file"
-	vaulthttp "github.com/hashicorp/vault/http"
-	"github.com/hashicorp/vault/sdk/helper/logging"
-	"github.com/hashicorp/vault/vault"
-)
-
-func TestTokenFileEndToEnd(t *testing.T) {
-	var err error
-	logger := logging.NewVaultLogger(log.Trace)
-	coreConfig := &vault.CoreConfig{
-		DisableMlock: true,
-		DisableCache: true,
-		Logger:       log.NewNullLogger(),
-	}
-
-	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
-		HandlerFunc: vaulthttp.Handler,
-	})
-
-	cluster.Start()
-	defer cluster.Cleanup()
-
-	cores := cluster.Cores
-
-	vault.TestWaitActive(t, cores[0].Core)
-
-	client := cores[0].Client
-
-	secret, err := client.Auth().Token().Create(nil)
-	if err != nil || secret == nil {
-		t.Fatal(err)
-	}
-
-	tokenFile, err := os.Create(filepath.Join(t.TempDir(), "token_file"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	tokenFileName := tokenFile.Name()
-	tokenFile.Close() // WriteFile doesn't need it open
-	os.WriteFile(tokenFileName, []byte(secret.Auth.ClientToken), 0o666)
-	defer os.Remove(tokenFileName)
-
-	ahConfig := &auth.AuthHandlerConfig{
-		Logger: logger.Named("auth.handler"),
-		Client: client,
-	}
-
-	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
-
-	am, err := token_file.NewTokenFileAuthMethod(&auth.AuthConfig{
-		Logger: logger.Named("auth.method"),
-		Config: map[string]interface{}{
-			"token_file_path": tokenFileName,
-		},
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	ah := auth.NewAuthHandler(ahConfig)
-	errCh := make(chan error)
-	go func() {
-		errCh <- ah.Run(ctx, am)
-	}()
-	defer func() {
-		select {
-		case <-ctx.Done():
-		case err := <-errCh:
-			if err != nil {
-				t.Fatal(err)
-			}
-		}
-	}()
-
-	// We close these right away because we're just basically testing
-	// permissions and finding a usable file name
-	sinkFile, err := os.Create(filepath.Join(t.TempDir(), "auth.tokensink.test."))
-	if err != nil {
-		t.Fatal(err)
-	}
-	tokenSinkFileName := sinkFile.Name()
-	sinkFile.Close()
-	os.Remove(tokenSinkFileName)
-	t.Logf("output: %s", tokenSinkFileName)
-
-	config := &sink.SinkConfig{
-		Logger: logger.Named("sink.file"),
-		Config: map[string]interface{}{
-			"path": tokenSinkFileName,
-		},
-		WrapTTL: 10 * time.Second,
-	}
-
-	fs, err := file.NewFileSink(config)
-	if err != nil {
-		t.Fatal(err)
-	}
-	config.Sink = fs
-
-	ss := sink.NewSinkServer(&sink.SinkServerConfig{
-		Logger: logger.Named("sink.server"),
-		Client: client,
-	})
-	go func() {
-		errCh <- ss.Run(ctx, ah.OutputCh, []*sink.SinkConfig{config})
-	}()
-	defer func() {
-		select {
-		case <-ctx.Done():
-		case err := <-errCh:
-			if err != nil {
-				t.Fatal(err)
-			}
-		}
-	}()
-
-	// This has to be after the other defers, so it happens first. It allows
-	// successful test runs to immediately cancel all of the runner goroutines
-	// and unblock any of the blocking defer calls by the runner's DoneCh that
-	// comes before this and avoid successful tests from taking the entire
-	// timeout duration.
-	defer cancel()
-
-	if stat, err := os.Lstat(tokenSinkFileName); err == nil {
-		t.Fatalf("expected err but got %s", stat)
-	} else if !os.IsNotExist(err) {
-		t.Fatal("expected notexist err")
-	}
-
-	// Wait 2 seconds for the env variables to be detected and an auth to be generated.
-	time.Sleep(time.Second * 2)
-
-	token, err := readToken(tokenSinkFileName)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if token.Token == "" {
-		t.Fatal("expected token but didn't receive it")
-	}
-
-	_, err = os.Stat(tokenFileName)
-	if err != nil {
-		t.Fatal("Token file removed")
-	}
-}
diff --git a/command/agentproxyshared/winsvc/service.go b/command/agent/winsvc/service.go
similarity index 76%
rename from command/agentproxyshared/winsvc/service.go
rename to command/agent/winsvc/service.go
index edd234e0c57d2..c8d21f5c7d0af 100644
--- a/command/agentproxyshared/winsvc/service.go
+++ b/command/agent/winsvc/service.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package winsvc
 
 var chanGraceExit = make(chan int)
diff --git a/command/agentproxyshared/winsvc/service_windows.go b/command/agent/winsvc/service_windows.go
similarity index 93%
rename from command/agentproxyshared/winsvc/service_windows.go
rename to command/agent/winsvc/service_windows.go
index bb16bf97aeea2..69177e01fd66d 100644
--- a/command/agentproxyshared/winsvc/service_windows.go
+++ b/command/agent/winsvc/service_windows.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build windows
 
 package winsvc
diff --git a/command/agent_generate_config.go b/command/agent_generate_config.go
deleted file mode 100644
index 5c42d0e59cf8c..0000000000000
--- a/command/agent_generate_config.go
+++ /dev/null
@@ -1,441 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package command
-
-import (
-	"context"
-	"fmt"
-	"io"
-	"os"
-	paths "path"
-	"sort"
-	"strings"
-	"unicode"
-
-	"github.com/hashicorp/hcl/v2/gohcl"
-	"github.com/hashicorp/hcl/v2/hclwrite"
-	"github.com/hashicorp/vault/api"
-	"github.com/mitchellh/cli"
-	"github.com/mitchellh/go-homedir"
-	"github.com/posener/complete"
-)
-
-var (
-	_ cli.Command             = (*AgentGenerateConfigCommand)(nil)
-	_ cli.CommandAutocomplete = (*AgentGenerateConfigCommand)(nil)
-)
-
-type AgentGenerateConfigCommand struct {
-	*BaseCommand
-
-	flagType  string
-	flagPaths []string
-	flagExec  string
-}
-
-func (c *AgentGenerateConfigCommand) Synopsis() string {
-	return "Generate a Vault Agent configuration file."
-}
-
-func (c *AgentGenerateConfigCommand) Help() string {
-	helpText := `
-Usage: vault agent generate-config [options] [path/to/config.hcl]
-
-  Generates a simple Vault Agent configuration file from the given parameters.
-
-  Currently, the only supported configuration type is 'env-template', which
-  helps you generate a configuration file with environment variable templates
-  for running Vault Agent in process supervisor mode.
-
-  For every specified secret -path, the command will attempt to generate one or
-  multiple 'env_template' entries based on the JSON key(s) stored in the
-  specified secret. If the secret -path ends with '/*', the command will
-  attempt to recurse through the secrets tree rooted at the given path,
-  generating 'env_template' entries for each encountered secret. Currently,
-  only kv-v1 and kv-v2 paths are supported.
-
-  The command specified in the '-exec' option will be used to generate an
-  'exec' entry, which will tell Vault Agent which child process to run.
-
-  In addition to env_template entries, the command generates an 'auto_auth'
-  section with 'token_file' authentication method. While this method is very
-  convenient for local testing, it should NOT be used in production. Please
-  see https://developer.hashicorp.com/vault/docs/agentandproxy/autoauth for
-  a list of production-ready auto_auth methods that you can use instead.
-
-  By default, the file will be generated in the local directory as 'agent.hcl'
-  unless a path is specified as an argument.
-
-  Generate a simple environment variable template configuration:
-
-      $ vault agent generate-config -type="env-template" \
-                    -exec="./my-app arg1 arg2" \
-                    -path="secret/foo"
-
-  Generate an environment variable template configuration for multiple secrets:
-
-      $ vault agent generate-config -type="env-template" \
-                    -exec="./my-app arg1 arg2" \
-                    -path="secret/foo" \
-                    -path="secret/bar" \
-                    -path="secret/my-app/*"
-
-` + c.Flags().Help()
-
-	return strings.TrimSpace(helpText)
-}
-
-func (c *AgentGenerateConfigCommand) Flags() *FlagSets {
-	set := NewFlagSets(c.UI)
-
-	// Common Options
-	f := set.NewFlagSet("Command Options")
-
-	f.StringVar(&StringVar{
-		Name:   "type",
-		Target: &c.flagType,
-		Usage:  "Type of configuration file to generate; currently, only 'env-template' is supported.",
-		Completion: complete.PredictSet(
-			"env-template",
-		),
-	})
-
-	f.StringSliceVar(&StringSliceVar{
-		Name:       "path",
-		Target:     &c.flagPaths,
-		Usage:      "Path to a kv-v1 or kv-v2 secret (e.g. secret/data/foo, kv-v2/prefix/*); multiple secrets and tail '*' wildcards are allowed.",
-		Completion: c.PredictVaultFolders(),
-	})
-
-	f.StringVar(&StringVar{
-		Name:    "exec",
-		Target:  &c.flagExec,
-		Default: "env",
-		Usage:   "The command to execute in agent process supervisor mode.",
-	})
-
-	return set
-}
-
-func (c *AgentGenerateConfigCommand) AutocompleteArgs() complete.Predictor {
-	return complete.PredictNothing
-}
-
-func (c *AgentGenerateConfigCommand) AutocompleteFlags() complete.Flags {
-	return c.Flags().Completions()
-}
-
-func (c *AgentGenerateConfigCommand) Run(args []string) int {
-	flags := c.Flags()
-
-	if err := flags.Parse(args); err != nil {
-		c.UI.Error(err.Error())
-		return 1
-	}
-
-	args = flags.Args()
-
-	if len(args) > 1 {
-		c.UI.Error(fmt.Sprintf("Too many arguments (expected at most 1, got %d)", len(args)))
-		return 1
-	}
-
-	if c.flagType == "" {
-		c.UI.Error(`Please specify a -type flag; currently only -type="env-template" is supported.`)
-		return 1
-	}
-
-	if c.flagType != "env-template" {
-		c.UI.Error(fmt.Sprintf(`%q is not a supported configuration type; currently only -type="env-template" is supported.`, c.flagType))
-		return 1
-	}
-
-	client, err := c.Client()
-	if err != nil {
-		c.UI.Error(err.Error())
-		return 2
-	}
-
-	config, err := generateConfiguration(context.Background(), client, c.flagExec, c.flagPaths)
-	if err != nil {
-		c.UI.Error(fmt.Sprintf("Error: %v", err))
-		return 2
-	}
-
-	var configPath string
-	if len(args) == 1 {
-		configPath = args[0]
-	} else {
-		configPath = "agent.hcl"
-	}
-
-	f, err := os.Create(configPath)
-	if err != nil {
-		c.UI.Error(fmt.Sprintf("Could not create configuration file %q: %v", configPath, err))
-		return 3
-	}
-	defer func() {
-		if err := f.Close(); err != nil {
-			c.UI.Error(fmt.Sprintf("Could not close configuration file %q: %v", configPath, err))
-		}
-	}()
-
-	if _, err := config.WriteTo(f); err != nil {
-		c.UI.Error(fmt.Sprintf("Could not write to configuration file %q: %v", configPath, err))
-		return 3
-	}
-
-	c.UI.Info(fmt.Sprintf("Successfully generated %q configuration file!", configPath))
-
-	c.UI.Warn("Warning: the generated file uses 'token_file' authentication method, which is not suitable for production environments.")
-
-	return 0
-}
-
-func generateConfiguration(ctx context.Context, client *api.Client, flagExec string, flagPaths []string) (io.WriterTo, error) {
-	var execCommand []string
-	if flagExec != "" {
-		execCommand = strings.Split(flagExec, " ")
-	} else {
-		execCommand = []string{"env"}
-	}
-
-	tokenPath, err := homedir.Expand("~/.vault-token")
-	if err != nil {
-		return nil, fmt.Errorf("could not expand home directory: %w", err)
-	}
-
-	templates, err := constructTemplates(ctx, client, flagPaths)
-	if err != nil {
-		return nil, fmt.Errorf("could not generate templates: %w", err)
-	}
-
-	config := generatedConfig{
-		AutoAuth: generatedConfigAutoAuth{
-			Method: generatedConfigAutoAuthMethod{
-				Type: "token_file",
-				Config: generatedConfigAutoAuthMethodConfig{
-					TokenFilePath: tokenPath,
-				},
-			},
-		},
-		TemplateConfig: generatedConfigTemplateConfig{
-			StaticSecretRenderInterval: "5m",
-			ExitOnRetryFailure:         true,
-		},
-		Vault: generatedConfigVault{
-			Address: client.Address(),
-		},
-		Exec: generatedConfigExec{
-			Command:                execCommand,
-			RestartOnSecretChanges: "always",
-			RestartStopSignal:      "SIGTERM",
-		},
-		EnvTemplates: templates,
-	}
-
-	contents := hclwrite.NewEmptyFile()
-
-	gohcl.EncodeIntoBody(&config, contents.Body())
-
-	return contents, nil
-}
-
-func constructTemplates(ctx context.Context, client *api.Client, paths []string) ([]generatedConfigEnvTemplate, error) {
-	var templates []generatedConfigEnvTemplate
-
-	for _, path := range paths {
-		path = sanitizePath(path)
-
-		mountPath, v2, err := isKVv2(path, client)
-		if err != nil {
-			return nil, fmt.Errorf("could not validate secret path %q: %w", path, err)
-		}
-
-		switch {
-		case strings.HasSuffix(path, "/*"):
-			// this path contains a tail wildcard, attempt to walk the tree
-			t, err := constructTemplatesFromTree(ctx, client, path[:len(path)-2], mountPath, v2)
-			if err != nil {
-				return nil, fmt.Errorf("could not traverse sercet at %q: %w", path, err)
-			}
-			templates = append(templates, t...)
-
-		case strings.Contains(path, "*"):
-			// don't allow any other wildcards
-			return nil, fmt.Errorf("the path %q cannot contain '*' wildcard characters except as the last element of the path", path)
-
-		default:
-			// regular secret path
-			t, err := constructTemplatesFromSecret(ctx, client, path, mountPath, v2)
-			if err != nil {
-				return nil, fmt.Errorf("could not read secret at %q: %v", path, err)
-			}
-			templates = append(templates, t...)
-		}
-	}
-
-	return templates, nil
-}
-
-func constructTemplatesFromTree(ctx context.Context, client *api.Client, path, mountPath string, v2 bool) ([]generatedConfigEnvTemplate, error) {
-	var templates []generatedConfigEnvTemplate
-
-	if v2 {
-		metadataPath := strings.Replace(
-			path,
-			paths.Join(mountPath, "data"),
-			paths.Join(mountPath, "metadata"),
-			1,
-		)
-		if path != metadataPath {
-			path = metadataPath
-		} else {
-			path = addPrefixToKVPath(path, mountPath, "metadata", true)
-		}
-	}
-
-	err := walkSecretsTree(ctx, client, path, func(child string, directory bool) error {
-		if directory {
-			return nil
-		}
-
-		dataPath := strings.Replace(
-			child,
-			paths.Join(mountPath, "metadata"),
-			paths.Join(mountPath, "data"),
-			1,
-		)
-
-		t, err := constructTemplatesFromSecret(ctx, client, dataPath, mountPath, v2)
-		if err != nil {
-			return err
-		}
-		templates = append(templates, t...)
-
-		return nil
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	return templates, nil
-}
-
-func constructTemplatesFromSecret(ctx context.Context, client *api.Client, path, mountPath string, v2 bool) ([]generatedConfigEnvTemplate, error) {
-	var templates []generatedConfigEnvTemplate
-
-	if v2 {
-		path = addPrefixToKVPath(path, mountPath, "data", true)
-	}
-
-	resp, err := client.Logical().ReadWithContext(ctx, path)
-	if err != nil {
-		return nil, fmt.Errorf("error querying: %w", err)
-	}
-	if resp == nil {
-		return nil, fmt.Errorf("secret not found")
-	}
-
-	var data map[string]interface{}
-	if v2 {
-		internal, ok := resp.Data["data"]
-		if !ok {
-			return nil, fmt.Errorf("secret.Data not found")
-		}
-		data = internal.(map[string]interface{})
-	} else {
-		data = resp.Data
-	}
-
-	fields := make([]string, 0, len(data))
-
-	for field := range data {
-		fields = append(fields, field)
-	}
-
-	// sort for a deterministic output
-	sort.Strings(fields)
-
-	var dataContents string
-	if v2 {
-		dataContents = ".Data.data"
-	} else {
-		dataContents = ".Data"
-	}
-
-	for _, field := range fields {
-		templates = append(templates, generatedConfigEnvTemplate{
-			Name:              constructDefaultEnvironmentKey(path, field),
-			Contents:          fmt.Sprintf(`{{ with secret "%s" }}{{ %s.%s }}{{ end }}`, path, dataContents, field),
-			ErrorOnMissingKey: true,
-		})
-	}
-
-	return templates, nil
-}
-
-func constructDefaultEnvironmentKey(path string, field string) string {
-	pathParts := strings.Split(path, "/")
-	pathPartsLast := pathParts[len(pathParts)-1]
-
-	notLetterOrNumber := func(r rune) bool {
-		return !unicode.IsLetter(r) && !unicode.IsNumber(r)
-	}
-
-	p1 := strings.FieldsFunc(pathPartsLast, notLetterOrNumber)
-	p2 := strings.FieldsFunc(field, notLetterOrNumber)
-
-	keyParts := append(p1, p2...)
-
-	return strings.ToUpper(strings.Join(keyParts, "_"))
-}
-
-// Below, we are redefining a subset of the configuration-related structures
-// defined under command/agent/config. Using these structures we can tailor the
-// output of the generated config, while using the original structures would
-// have produced an HCL document with many empty fields. The structures below
-// should not be used for anything other than generation.
-
-type generatedConfig struct {
-	AutoAuth       generatedConfigAutoAuth       `hcl:"auto_auth,block"`
-	TemplateConfig generatedConfigTemplateConfig `hcl:"template_config,block"`
-	Vault          generatedConfigVault          `hcl:"vault,block"`
-	EnvTemplates   []generatedConfigEnvTemplate  `hcl:"env_template,block"`
-	Exec           generatedConfigExec           `hcl:"exec,block"`
-}
-
-type generatedConfigTemplateConfig struct {
-	StaticSecretRenderInterval string `hcl:"static_secret_render_interval"`
-	ExitOnRetryFailure         bool   `hcl:"exit_on_retry_failure"`
-}
-
-type generatedConfigExec struct {
-	Command                []string `hcl:"command"`
-	RestartOnSecretChanges string   `hcl:"restart_on_secret_changes"`
-	RestartStopSignal      string   `hcl:"restart_stop_signal"`
-}
-
-type generatedConfigEnvTemplate struct {
-	Name              string `hcl:"name,label"`
-	Contents          string `hcl:"contents,attr"`
-	ErrorOnMissingKey bool   `hcl:"error_on_missing_key"`
-}
-
-type generatedConfigVault struct {
-	Address string `hcl:"address"`
-}
-
-type generatedConfigAutoAuth struct {
-	Method generatedConfigAutoAuthMethod `hcl:"method,block"`
-}
-
-type generatedConfigAutoAuthMethod struct {
-	Type   string                              `hcl:"type"`
-	Config generatedConfigAutoAuthMethodConfig `hcl:"config,block"`
-}
-
-type generatedConfigAutoAuthMethodConfig struct {
-	TokenFilePath string `hcl:"token_file_path"`
-}
diff --git a/command/agent_generate_config_test.go b/command/agent_generate_config_test.go
deleted file mode 100644
index f225a7c9e8cb4..0000000000000
--- a/command/agent_generate_config_test.go
+++ /dev/null
@@ -1,274 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package command
-
-import (
-	"bytes"
-	"context"
-	"reflect"
-	"regexp"
-	"testing"
-	"time"
-)
-
-// TestConstructTemplates tests the construcTemplates helper function
-func TestConstructTemplates(t *testing.T) {
-	ctx, cancelContextFunc := context.WithTimeout(context.Background(), 5*time.Second)
-	defer cancelContextFunc()
-
-	client, closer := testVaultServerWithSecrets(ctx, t)
-	defer closer()
-
-	cases := map[string]struct {
-		paths         []string
-		expected      []generatedConfigEnvTemplate
-		expectedError bool
-	}{
-		"kv-v1-simple": {
-			paths: []string{"kv-v1/foo"},
-			expected: []generatedConfigEnvTemplate{
-				{Contents: `{{ with secret "kv-v1/foo" }}{{ .Data.password }}{{ end }}`, ErrorOnMissingKey: true, Name: "FOO_PASSWORD"},
-				{Contents: `{{ with secret "kv-v1/foo" }}{{ .Data.user }}{{ end }}`, ErrorOnMissingKey: true, Name: "FOO_USER"},
-			},
-			expectedError: false,
-		},
-
-		"kv-v2-simple": {
-			paths: []string{"kv-v2/foo"},
-			expected: []generatedConfigEnvTemplate{
-				{Contents: `{{ with secret "kv-v2/data/foo" }}{{ .Data.data.password }}{{ end }}`, ErrorOnMissingKey: true, Name: "FOO_PASSWORD"},
-				{Contents: `{{ with secret "kv-v2/data/foo" }}{{ .Data.data.user }}{{ end }}`, ErrorOnMissingKey: true, Name: "FOO_USER"},
-			},
-			expectedError: false,
-		},
-
-		"kv-v2-data-in-path": {
-			paths: []string{"kv-v2/data/foo"},
-			expected: []generatedConfigEnvTemplate{
-				{Contents: `{{ with secret "kv-v2/data/foo" }}{{ .Data.data.password }}{{ end }}`, ErrorOnMissingKey: true, Name: "FOO_PASSWORD"},
-				{Contents: `{{ with secret "kv-v2/data/foo" }}{{ .Data.data.user }}{{ end }}`, ErrorOnMissingKey: true, Name: "FOO_USER"},
-			},
-			expectedError: false,
-		},
-
-		"kv-v1-nested": {
-			paths: []string{"kv-v1/app-1/*"},
-			expected: []generatedConfigEnvTemplate{
-				{Contents: `{{ with secret "kv-v1/app-1/bar" }}{{ .Data.password }}{{ end }}`, ErrorOnMissingKey: true, Name: "BAR_PASSWORD"},
-				{Contents: `{{ with secret "kv-v1/app-1/bar" }}{{ .Data.user }}{{ end }}`, ErrorOnMissingKey: true, Name: "BAR_USER"},
-				{Contents: `{{ with secret "kv-v1/app-1/foo" }}{{ .Data.password }}{{ end }}`, ErrorOnMissingKey: true, Name: "FOO_PASSWORD"},
-				{Contents: `{{ with secret "kv-v1/app-1/foo" }}{{ .Data.user }}{{ end }}`, ErrorOnMissingKey: true, Name: "FOO_USER"},
-				{Contents: `{{ with secret "kv-v1/app-1/nested/baz" }}{{ .Data.password }}{{ end }}`, ErrorOnMissingKey: true, Name: "BAZ_PASSWORD"},
-				{Contents: `{{ with secret "kv-v1/app-1/nested/baz" }}{{ .Data.user }}{{ end }}`, ErrorOnMissingKey: true, Name: "BAZ_USER"},
-			},
-			expectedError: false,
-		},
-
-		"kv-v2-nested": {
-			paths: []string{"kv-v2/app-1/*"},
-			expected: []generatedConfigEnvTemplate{
-				{Contents: `{{ with secret "kv-v2/data/app-1/bar" }}{{ .Data.data.password }}{{ end }}`, ErrorOnMissingKey: true, Name: "BAR_PASSWORD"},
-				{Contents: `{{ with secret "kv-v2/data/app-1/bar" }}{{ .Data.data.user }}{{ end }}`, ErrorOnMissingKey: true, Name: "BAR_USER"},
-				{Contents: `{{ with secret "kv-v2/data/app-1/foo" }}{{ .Data.data.password }}{{ end }}`, ErrorOnMissingKey: true, Name: "FOO_PASSWORD"},
-				{Contents: `{{ with secret "kv-v2/data/app-1/foo" }}{{ .Data.data.user }}{{ end }}`, ErrorOnMissingKey: true, Name: "FOO_USER"},
-				{Contents: `{{ with secret "kv-v2/data/app-1/nested/baz" }}{{ .Data.data.password }}{{ end }}`, ErrorOnMissingKey: true, Name: "BAZ_PASSWORD"},
-				{Contents: `{{ with secret "kv-v2/data/app-1/nested/baz" }}{{ .Data.data.user }}{{ end }}`, ErrorOnMissingKey: true, Name: "BAZ_USER"},
-			},
-			expectedError: false,
-		},
-
-		"kv-v1-multi-path": {
-			paths: []string{"kv-v1/foo", "kv-v1/app-1/bar"},
-			expected: []generatedConfigEnvTemplate{
-				{Contents: `{{ with secret "kv-v1/foo" }}{{ .Data.password }}{{ end }}`, ErrorOnMissingKey: true, Name: "FOO_PASSWORD"},
-				{Contents: `{{ with secret "kv-v1/foo" }}{{ .Data.user }}{{ end }}`, ErrorOnMissingKey: true, Name: "FOO_USER"},
-				{Contents: `{{ with secret "kv-v1/app-1/bar" }}{{ .Data.password }}{{ end }}`, ErrorOnMissingKey: true, Name: "BAR_PASSWORD"},
-				{Contents: `{{ with secret "kv-v1/app-1/bar" }}{{ .Data.user }}{{ end }}`, ErrorOnMissingKey: true, Name: "BAR_USER"},
-			},
-			expectedError: false,
-		},
-
-		"kv-v2-multi-path": {
-			paths: []string{"kv-v2/foo", "kv-v2/app-1/bar"},
-			expected: []generatedConfigEnvTemplate{
-				{Contents: `{{ with secret "kv-v2/data/foo" }}{{ .Data.data.password }}{{ end }}`, ErrorOnMissingKey: true, Name: "FOO_PASSWORD"},
-				{Contents: `{{ with secret "kv-v2/data/foo" }}{{ .Data.data.user }}{{ end }}`, ErrorOnMissingKey: true, Name: "FOO_USER"},
-				{Contents: `{{ with secret "kv-v2/data/app-1/bar" }}{{ .Data.data.password }}{{ end }}`, ErrorOnMissingKey: true, Name: "BAR_PASSWORD"},
-				{Contents: `{{ with secret "kv-v2/data/app-1/bar" }}{{ .Data.data.user }}{{ end }}`, ErrorOnMissingKey: true, Name: "BAR_USER"},
-			},
-			expectedError: false,
-		},
-
-		"kv-v1-path-not-found": {
-			paths:         []string{"kv-v1/does/not/exist"},
-			expected:      nil,
-			expectedError: true,
-		},
-
-		"kv-v2-path-not-found": {
-			paths:         []string{"kv-v2/does/not/exist"},
-			expected:      nil,
-			expectedError: true,
-		},
-
-		"kv-v1-early-wildcard": {
-			paths:         []string{"kv-v1/*/foo"},
-			expected:      nil,
-			expectedError: true,
-		},
-
-		"kv-v2-early-wildcard": {
-			paths:         []string{"kv-v2/*/foo"},
-			expected:      nil,
-			expectedError: true,
-		},
-	}
-
-	for name, tc := range cases {
-		name, tc := name, tc
-
-		t.Run(name, func(t *testing.T) {
-			templates, err := constructTemplates(ctx, client, tc.paths)
-
-			if tc.expectedError {
-				if err == nil {
-					t.Fatal("an error was expected but the test succeeded")
-				}
-			} else {
-				if err != nil {
-					t.Fatal(err)
-				}
-
-				if !reflect.DeepEqual(tc.expected, templates) {
-					t.Fatalf("unexpected output; want: %v, got: %v", tc.expected, templates)
-				}
-			}
-		})
-	}
-}
-
-// TestGenerateConfiguration tests the generateConfiguration helper function
-func TestGenerateConfiguration(t *testing.T) {
-	ctx, cancelContextFunc := context.WithTimeout(context.Background(), 5*time.Second)
-	defer cancelContextFunc()
-
-	client, closer := testVaultServerWithSecrets(ctx, t)
-	defer closer()
-
-	cases := map[string]struct {
-		flagExec      string
-		flagPaths     []string
-		expected      *regexp.Regexp
-		expectedError bool
-	}{
-		"kv-v1-simple": {
-			flagExec:  "./my-app arg1 arg2",
-			flagPaths: []string{"kv-v1/foo"},
-			expected: regexp.MustCompile(`
-auto_auth \{
-
-  method \{
-    type = "token_file"
-
-    config \{
-      token_file_path = ".*/.vault-token"
-    }
-  }
-}
-
-template_config \{
-  static_secret_render_interval = "5m"
-  exit_on_retry_failure         = true
-}
-
-vault \{
-  address = "https://127.0.0.1:[0-9]{5}"
-}
-
-env_template "FOO_PASSWORD" \{
-  contents             = "\{\{ with secret \\"kv-v1/foo\\" }}\{\{ .Data.password }}\{\{ end }}"
-  error_on_missing_key = true
-}
-env_template "FOO_USER" \{
-  contents             = "\{\{ with secret \\"kv-v1/foo\\" }}\{\{ .Data.user }}\{\{ end }}"
-  error_on_missing_key = true
-}
-
-exec \{
-  command                   = \["./my-app", "arg1", "arg2"\]
-  restart_on_secret_changes = "always"
-  restart_stop_signal       = "SIGTERM"
-}
-`),
-			expectedError: false,
-		},
-
-		"kv-v2-default-exec": {
-			flagExec:  "",
-			flagPaths: []string{"kv-v2/foo"},
-			expected: regexp.MustCompile(`
-auto_auth \{
-
-  method \{
-    type = "token_file"
-
-    config \{
-      token_file_path = ".*/.vault-token"
-    }
-  }
-}
-
-template_config \{
-  static_secret_render_interval = "5m"
-  exit_on_retry_failure         = true
-}
-
-vault \{
-  address = "https://127.0.0.1:[0-9]{5}"
-}
-
-env_template "FOO_PASSWORD" \{
-  contents             = "\{\{ with secret \\"kv-v2/data/foo\\" }}\{\{ .Data.data.password }}\{\{ end }}"
-  error_on_missing_key = true
-}
-env_template "FOO_USER" \{
-  contents             = "\{\{ with secret \\"kv-v2/data/foo\\" }}\{\{ .Data.data.user }}\{\{ end }}"
-  error_on_missing_key = true
-}
-
-exec \{
-  command                   = \["env"\]
-  restart_on_secret_changes = "always"
-  restart_stop_signal       = "SIGTERM"
-}
-`),
-			expectedError: false,
-		},
-	}
-
-	for name, tc := range cases {
-		name, tc := name, tc
-
-		t.Run(name, func(t *testing.T) {
-			var config bytes.Buffer
-
-			c, err := generateConfiguration(ctx, client, tc.flagExec, tc.flagPaths)
-			c.WriteTo(&config)
-
-			if tc.expectedError {
-				if err == nil {
-					t.Fatal("an error was expected but the test succeeded")
-				}
-			} else {
-				if err != nil {
-					t.Fatal(err)
-				}
-
-				if !tc.expected.MatchString(config.String()) {
-					t.Fatalf("unexpected output; want: %v, got: %v", tc.expected.String(), config.String())
-				}
-			}
-		})
-	}
-}
diff --git a/command/agent_test.go b/command/agent_test.go
index 406bdf6ac0ab3..c5138144ef9c0 100644
--- a/command/agent_test.go
+++ b/command/agent_test.go
@@ -1,14 +1,9 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
-	"crypto/tls"
-	"crypto/x509"
 	"encoding/json"
 	"fmt"
-	"io"
+	"io/ioutil"
 	"net"
 	"net/http"
 	"os"
@@ -19,15 +14,12 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/go-hclog"
+	hclog "github.com/hashicorp/go-hclog"
 	vaultjwt "github.com/hashicorp/vault-plugin-auth-jwt"
 	logicalKv "github.com/hashicorp/vault-plugin-secrets-kv"
 	"github.com/hashicorp/vault/api"
 	credAppRole "github.com/hashicorp/vault/builtin/credential/approle"
 	"github.com/hashicorp/vault/command/agent"
-	agentConfig "github.com/hashicorp/vault/command/agent/config"
-	"github.com/hashicorp/vault/helper/testhelpers/minimal"
-	"github.com/hashicorp/vault/helper/useragent"
 	vaulthttp "github.com/hashicorp/vault/http"
 	"github.com/hashicorp/vault/sdk/helper/consts"
 	"github.com/hashicorp/vault/sdk/helper/logging"
@@ -35,49 +27,9 @@ import (
 	"github.com/hashicorp/vault/sdk/logical"
 	"github.com/hashicorp/vault/vault"
 	"github.com/mitchellh/cli"
-	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
-const (
-	BasicHclConfig = `
-log_file = "TMPDIR/juan.log"
-log_level="warn"
-log_rotate_max_files=2
-log_rotate_bytes=1048576
-vault {
-	address = "http://127.0.0.1:8200"
-	retry {
-		num_retries = 5
-	}
-}
-
-listener "tcp" {
-	address = "127.0.0.1:8100"
-	tls_disable = false
-	tls_cert_file = "TMPDIR/reload_cert.pem"
-  	tls_key_file  = "TMPDIR/reload_key.pem"
-}`
-	BasicHclConfig2 = `
-log_file = "TMPDIR/juan.log"
-log_level="debug"
-log_rotate_max_files=-1
-log_rotate_bytes=1048576
-vault {
-	address = "http://127.0.0.1:8200"
-	retry {
-		num_retries = 5
-	}
-}
-
-listener "tcp" {
-	address = "127.0.0.1:8100"
-	tls_disable = false
-	tls_cert_file = "TMPDIR/reload_cert.pem"
-  	tls_key_file  = "TMPDIR/reload_key.pem"
-}`
-)
-
 func testAgentCommand(tb testing.TB, logger hclog.Logger) (*cli.MockUi, *AgentCommand) {
 	tb.Helper()
 
@@ -87,13 +39,195 @@ func testAgentCommand(tb testing.TB, logger hclog.Logger) (*cli.MockUi, *AgentCo
 			UI: ui,
 		},
 		ShutdownCh: MakeShutdownCh(),
-		SighupCh:   MakeSighupCh(),
 		logger:     logger,
-		startedCh:  make(chan struct{}, 5),
-		reloadedCh: make(chan struct{}, 5),
 	}
 }
 
+/*
+func TestAgent_Cache_UnixListener(t *testing.T) {
+	logger := logging.NewVaultLogger(hclog.Trace)
+	coreConfig := &vault.CoreConfig{
+		Logger: logger.Named("core"),
+		CredentialBackends: map[string]logical.Factory{
+			"jwt": vaultjwt.Factory,
+		},
+	}
+	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+	})
+	cluster.Start()
+	defer cluster.Cleanup()
+
+	vault.TestWaitActive(t, cluster.Cores[0].Core)
+	client := cluster.Cores[0].Client
+
+	defer os.Setenv(api.EnvVaultAddress, os.Getenv(api.EnvVaultAddress))
+	os.Setenv(api.EnvVaultAddress, client.Address())
+
+	defer os.Setenv(api.EnvVaultCACert, os.Getenv(api.EnvVaultCACert))
+	os.Setenv(api.EnvVaultCACert, fmt.Sprintf("%s/ca_cert.pem", cluster.TempDir))
+
+	// Setup Vault
+	err := client.Sys().EnableAuthWithOptions("jwt", &api.EnableAuthOptions{
+		Type: "jwt",
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	_, err = client.Logical().Write("auth/jwt/config", map[string]interface{}{
+		"bound_issuer":           "https://team-vault.auth0.com/",
+		"jwt_validation_pubkeys": agent.TestECDSAPubKey,
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	_, err = client.Logical().Write("auth/jwt/role/test", map[string]interface{}{
+		"role_type":       "jwt",
+		"bound_subject":   "r3qXcK2bix9eFECzsU3Sbmh0K16fatW6@clients",
+		"bound_audiences": "https://vault.plugin.auth.jwt.test",
+		"user_claim":      "https://vault/user",
+		"groups_claim":    "https://vault/groups",
+		"policies":        "test",
+		"period":          "3s",
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	inf, err := ioutil.TempFile("", "auth.jwt.test.")
+	if err != nil {
+		t.Fatal(err)
+	}
+	in := inf.Name()
+	inf.Close()
+	os.Remove(in)
+	t.Logf("input: %s", in)
+
+	sink1f, err := ioutil.TempFile("", "sink1.jwt.test.")
+	if err != nil {
+		t.Fatal(err)
+	}
+	sink1 := sink1f.Name()
+	sink1f.Close()
+	os.Remove(sink1)
+	t.Logf("sink1: %s", sink1)
+
+	sink2f, err := ioutil.TempFile("", "sink2.jwt.test.")
+	if err != nil {
+		t.Fatal(err)
+	}
+	sink2 := sink2f.Name()
+	sink2f.Close()
+	os.Remove(sink2)
+	t.Logf("sink2: %s", sink2)
+
+	conff, err := ioutil.TempFile("", "conf.jwt.test.")
+	if err != nil {
+		t.Fatal(err)
+	}
+	conf := conff.Name()
+	conff.Close()
+	os.Remove(conf)
+	t.Logf("config: %s", conf)
+
+	jwtToken, _ := agent.GetTestJWT(t)
+	if err := ioutil.WriteFile(in, []byte(jwtToken), 0600); err != nil {
+		t.Fatal(err)
+	} else {
+		logger.Trace("wrote test jwt", "path", in)
+	}
+
+	socketff, err := ioutil.TempFile("", "cache.socket.")
+	if err != nil {
+		t.Fatal(err)
+	}
+	socketf := socketff.Name()
+	socketff.Close()
+	os.Remove(socketf)
+	t.Logf("socketf: %s", socketf)
+
+	config := `
+auto_auth {
+        method {
+                type = "jwt"
+                config = {
+                        role = "test"
+                        path = "%s"
+                }
+        }
+
+        sink {
+                type = "file"
+                config = {
+                        path = "%s"
+                }
+        }
+
+        sink "file" {
+                config = {
+                        path = "%s"
+                }
+        }
+}
+
+cache {
+	use_auto_auth_token = true
+
+	listener "unix" {
+		address = "%s"
+		tls_disable = true
+	}
+}
+`
+
+	config = fmt.Sprintf(config, in, sink1, sink2, socketf)
+	if err := ioutil.WriteFile(conf, []byte(config), 0600); err != nil {
+		t.Fatal(err)
+	} else {
+		logger.Trace("wrote test config", "path", conf)
+	}
+
+	_, cmd := testAgentCommand(t, logger)
+	cmd.client = client
+
+	// Kill the command 5 seconds after it starts
+	go func() {
+		select {
+		case <-cmd.ShutdownCh:
+		case <-time.After(5 * time.Second):
+			cmd.ShutdownCh <- struct{}{}
+		}
+	}()
+
+	originalVaultAgentAddress := os.Getenv(api.EnvVaultAgentAddr)
+
+	// Create a client that talks to the agent
+	os.Setenv(api.EnvVaultAgentAddr, socketf)
+	testClient, err := api.NewClient(api.DefaultConfig())
+	if err != nil {
+		t.Fatal(err)
+	}
+	os.Setenv(api.EnvVaultAgentAddr, originalVaultAgentAddress)
+
+	// Start the agent
+	go cmd.Run([]string{"-config", conf})
+
+	// Give some time for the auto-auth to complete
+	time.Sleep(1 * time.Second)
+
+	// Invoke lookup self through the agent
+	secret, err := testClient.Auth().Token().LookupSelf()
+	if err != nil {
+		t.Fatal(err)
+	}
+	if secret == nil || secret.Data == nil || secret.Data["id"].(string) == "" {
+		t.Fatalf("failed to perform lookup self through agent")
+	}
+}
+*/
+
 func TestAgent_ExitAfterAuth(t *testing.T) {
 	t.Run("via_config", func(t *testing.T) {
 		testAgentExitAfterAuth(t, false)
@@ -151,7 +285,7 @@ func testAgentExitAfterAuth(t *testing.T, viaFlag bool) {
 		t.Fatal(err)
 	}
 
-	inf, err := os.CreateTemp("", "auth.jwt.test.")
+	inf, err := ioutil.TempFile("", "auth.jwt.test.")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -160,7 +294,7 @@ func testAgentExitAfterAuth(t *testing.T, viaFlag bool) {
 	os.Remove(in)
 	t.Logf("input: %s", in)
 
-	sink1f, err := os.CreateTemp("", "sink1.jwt.test.")
+	sink1f, err := ioutil.TempFile("", "sink1.jwt.test.")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -169,7 +303,7 @@ func testAgentExitAfterAuth(t *testing.T, viaFlag bool) {
 	os.Remove(sink1)
 	t.Logf("sink1: %s", sink1)
 
-	sink2f, err := os.CreateTemp("", "sink2.jwt.test.")
+	sink2f, err := ioutil.TempFile("", "sink2.jwt.test.")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -178,7 +312,7 @@ func testAgentExitAfterAuth(t *testing.T, viaFlag bool) {
 	os.Remove(sink2)
 	t.Logf("sink2: %s", sink2)
 
-	conff, err := os.CreateTemp("", "conf.jwt.test.")
+	conff, err := ioutil.TempFile("", "conf.jwt.test.")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -188,7 +322,7 @@ func testAgentExitAfterAuth(t *testing.T, viaFlag bool) {
 	t.Logf("config: %s", conf)
 
 	jwtToken, _ := agent.GetTestJWT(t)
-	if err := os.WriteFile(in, []byte(jwtToken), 0o600); err != nil {
+	if err := ioutil.WriteFile(in, []byte(jwtToken), 0o600); err != nil {
 		t.Fatal(err)
 	} else {
 		logger.Trace("wrote test jwt", "path", in)
@@ -227,7 +361,7 @@ auto_auth {
 `
 
 	config = fmt.Sprintf(config, exitAfterAuthTemplText, in, sink1, sink2)
-	if err := os.WriteFile(conf, []byte(config), 0o600); err != nil {
+	if err := ioutil.WriteFile(conf, []byte(config), 0o600); err != nil {
 		t.Fatal(err)
 	} else {
 		logger.Trace("wrote test config", "path", conf)
@@ -259,7 +393,7 @@ auto_auth {
 		t.Fatal("timeout reached while waiting for agent to exit")
 	}
 
-	sink1Bytes, err := os.ReadFile(sink1)
+	sink1Bytes, err := ioutil.ReadFile(sink1)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -267,7 +401,7 @@ auto_auth {
 		t.Fatal("got no output from sink 1")
 	}
 
-	sink2Bytes, err := os.ReadFile(sink2)
+	sink2Bytes, err := ioutil.ReadFile(sink2)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -516,16 +650,12 @@ listener "tcp" {
 	}
 }
 
-// TestAgent_Template_UserAgent Validates that the User-Agent sent to Vault
-// as part of Templating requests is correct. Uses the custom handler
-// userAgentHandler struct defined in this test package, so that Vault validates the
-// User-Agent on requests sent by Agent.
-func TestAgent_Template_UserAgent(t *testing.T) {
+// TestAgent_Template tests rendering templates
+func TestAgent_Template_Basic(t *testing.T) {
 	//----------------------------------------------------
 	// Start the server and agent
 	//----------------------------------------------------
 	logger := logging.NewVaultLogger(hclog.Trace)
-	var h userAgentHandler
 	cluster := vault.NewTestCluster(t,
 		&vault.CoreConfig{
 			Logger: logger,
@@ -537,16 +667,7 @@ func TestAgent_Template_UserAgent(t *testing.T) {
 			},
 		},
 		&vault.TestClusterOptions{
-			NumCores: 1,
-			HandlerFunc: vaulthttp.HandlerFunc(
-				func(properties *vault.HandlerProperties) http.Handler {
-					h.props = properties
-					h.userAgentToCheckFor = useragent.AgentTemplatingString()
-					h.pathToCheck = "/v1/secret/data"
-					h.requestMethodToCheck = "GET"
-					h.t = t
-					return &h
-				}),
+			HandlerFunc: vaulthttp.Handler,
 		})
 	cluster.Start()
 	defer cluster.Cleanup()
@@ -630,35 +751,61 @@ func TestAgent_Template_UserAgent(t *testing.T) {
 
 	// make a temp directory to hold renders. Each test will create a temp dir
 	// inside this one
-	tmpDirRoot, err := os.MkdirTemp("", "agent-test-renders")
+	tmpDirRoot, err := ioutil.TempDir("", "agent-test-renders")
 	if err != nil {
 		t.Fatal(err)
 	}
 	defer os.RemoveAll(tmpDirRoot)
-	// create temp dir for this test run
-	tmpDir, err := os.MkdirTemp(tmpDirRoot, "TestAgent_Template_UserAgent")
-	if err != nil {
-		t.Fatal(err)
-	}
 
-	// make some template files
-	var templatePaths []string
-	fileName := filepath.Join(tmpDir, "render_0.tmpl")
-	if err := os.WriteFile(fileName, []byte(templateContents(0)), 0o600); err != nil {
-		t.Fatal(err)
+	// start test cases here
+	testCases := map[string]struct {
+		templateCount int
+		exitAfterAuth bool
+	}{
+		"one": {
+			templateCount: 1,
+		},
+		"one_with_exit": {
+			templateCount: 1,
+			exitAfterAuth: true,
+		},
+		"many": {
+			templateCount: 15,
+		},
+		"many_with_exit": {
+			templateCount: 13,
+			exitAfterAuth: true,
+		},
 	}
-	templatePaths = append(templatePaths, fileName)
 
-	// build up the template config to be added to the Agent config.hcl file
-	var templateConfigStrings []string
-	for i, t := range templatePaths {
-		index := fmt.Sprintf("render_%d.json", i)
-		s := fmt.Sprintf(templateConfigString, t, tmpDir, index)
-		templateConfigStrings = append(templateConfigStrings, s)
-	}
+	for tcname, tc := range testCases {
+		t.Run(tcname, func(t *testing.T) {
+			// create temp dir for this test run
+			tmpDir, err := ioutil.TempDir(tmpDirRoot, tcname)
+			if err != nil {
+				t.Fatal(err)
+			}
 
-	// Create a config file
-	config := `
+			// make some template files
+			var templatePaths []string
+			for i := 0; i < tc.templateCount; i++ {
+				fileName := filepath.Join(tmpDir, fmt.Sprintf("render_%d.tmpl", i))
+				if err := ioutil.WriteFile(fileName, []byte(templateContents(i)), 0o600); err != nil {
+					t.Fatal(err)
+				}
+				templatePaths = append(templatePaths, fileName)
+			}
+
+			// build up the template config to be added to the Agent config.hcl file
+			var templateConfigStrings []string
+			for i, t := range templatePaths {
+				index := fmt.Sprintf("render_%d.json", i)
+				s := fmt.Sprintf(templateConfigString, t, tmpDir, index)
+				templateConfigStrings = append(templateConfigStrings, s)
+			}
+
+			// Create a config file
+			config := `
 vault {
   address = "%s"
 	tls_skip_verify = true
@@ -676,292 +823,27 @@ auto_auth {
 }
 
 %s
-`
 
-	// flatten the template configs
-	templateConfig := strings.Join(templateConfigStrings, " ")
+%s
+`
 
-	config = fmt.Sprintf(config, serverClient.Address(), roleIDPath, secretIDPath, templateConfig)
-	configPath := makeTempFile(t, "config.hcl", config)
-	defer os.Remove(configPath)
+			// conditionally set the exit_after_auth flag
+			exitAfterAuth := ""
+			if tc.exitAfterAuth {
+				exitAfterAuth = "exit_after_auth = true"
+			}
 
-	// Start the agent
-	ui, cmd := testAgentCommand(t, logger)
-	cmd.client = serverClient
-	cmd.startedCh = make(chan struct{})
+			// flatten the template configs
+			templateConfig := strings.Join(templateConfigStrings, " ")
 
-	wg := &sync.WaitGroup{}
-	wg.Add(1)
-	go func() {
-		code := cmd.Run([]string{"-config", configPath})
-		if code != 0 {
-			t.Errorf("non-zero return code when running agent: %d", code)
-			t.Logf("STDOUT from agent:\n%s", ui.OutputWriter.String())
-			t.Logf("STDERR from agent:\n%s", ui.ErrorWriter.String())
-		}
-		wg.Done()
-	}()
+			config = fmt.Sprintf(config, serverClient.Address(), roleIDPath, secretIDPath, templateConfig, exitAfterAuth)
+			configPath := makeTempFile(t, "config.hcl", config)
+			defer os.Remove(configPath)
 
-	select {
-	case <-cmd.startedCh:
-	case <-time.After(5 * time.Second):
-		t.Errorf("timeout")
-	}
-
-	// We need to shut down the Agent command
-	defer func() {
-		cmd.ShutdownCh <- struct{}{}
-		wg.Wait()
-	}()
-
-	verify := func(suffix string) {
-		t.Helper()
-		// We need to poll for a bit to give Agent time to render the
-		// templates. Without this, the test will attempt to read
-		// the temp dir before Agent has had time to render and will
-		// likely fail the test
-		tick := time.Tick(1 * time.Second)
-		timeout := time.After(10 * time.Second)
-		var err error
-		for {
-			select {
-			case <-timeout:
-				t.Fatalf("timed out waiting for templates to render, last error: %v", err)
-			case <-tick:
-			}
-			// Check for files rendered in the directory and break
-			// early for shutdown if we do have all the files
-			// rendered
-
-			//----------------------------------------------------
-			// Perform the tests
-			//----------------------------------------------------
-
-			if numFiles := testListFiles(t, tmpDir, ".json"); numFiles != len(templatePaths) {
-				err = fmt.Errorf("expected (%d) templates, got (%d)", len(templatePaths), numFiles)
-				continue
-			}
-
-			for i := range templatePaths {
-				fileName := filepath.Join(tmpDir, fmt.Sprintf("render_%d.json", i))
-				var c []byte
-				c, err = os.ReadFile(fileName)
-				if err != nil {
-					continue
-				}
-				if string(c) != templateRendered(i)+suffix {
-					err = fmt.Errorf("expected=%q, got=%q", templateRendered(i)+suffix, string(c))
-					continue
-				}
-			}
-			return
-		}
-	}
-
-	verify("")
-
-	fileName = filepath.Join(tmpDir, "render_0.tmpl")
-	if err := os.WriteFile(fileName, []byte(templateContents(0)+"{}"), 0o600); err != nil {
-		t.Fatal(err)
-	}
-
-	verify("{}")
-}
-
-// TestAgent_Template tests rendering templates
-func TestAgent_Template_Basic(t *testing.T) {
-	//----------------------------------------------------
-	// Start the server and agent
-	//----------------------------------------------------
-	logger := logging.NewVaultLogger(hclog.Trace)
-	cluster := vault.NewTestCluster(t,
-		&vault.CoreConfig{
-			Logger: logger,
-			CredentialBackends: map[string]logical.Factory{
-				"approle": credAppRole.Factory,
-			},
-			LogicalBackends: map[string]logical.Factory{
-				"kv": logicalKv.Factory,
-			},
-		},
-		&vault.TestClusterOptions{
-			HandlerFunc: vaulthttp.Handler,
-		})
-	cluster.Start()
-	defer cluster.Cleanup()
-
-	vault.TestWaitActive(t, cluster.Cores[0].Core)
-	serverClient := cluster.Cores[0].Client
-
-	// Unset the environment variable so that agent picks up the right test
-	// cluster address
-	defer os.Setenv(api.EnvVaultAddress, os.Getenv(api.EnvVaultAddress))
-	os.Setenv(api.EnvVaultAddress, serverClient.Address())
-
-	// Enable the approle auth method
-	req := serverClient.NewRequest("POST", "/v1/sys/auth/approle")
-	req.BodyBytes = []byte(`{
-		"type": "approle"
-	}`)
-	request(t, serverClient, req, 204)
-
-	// give test-role permissions to read the kv secret
-	req = serverClient.NewRequest("PUT", "/v1/sys/policy/myapp-read")
-	req.BodyBytes = []byte(`{
-	  "policy": "path \"secret/*\" { capabilities = [\"read\", \"list\"] }"
-	}`)
-	request(t, serverClient, req, 204)
-
-	// Create a named role
-	req = serverClient.NewRequest("PUT", "/v1/auth/approle/role/test-role")
-	req.BodyBytes = []byte(`{
-	  "token_ttl": "5m",
-		"token_policies":"default,myapp-read",
-		"policies":"default,myapp-read"
-	}`)
-	request(t, serverClient, req, 204)
-
-	// Fetch the RoleID of the named role
-	req = serverClient.NewRequest("GET", "/v1/auth/approle/role/test-role/role-id")
-	body := request(t, serverClient, req, 200)
-	data := body["data"].(map[string]interface{})
-	roleID := data["role_id"].(string)
-
-	// Get a SecretID issued against the named role
-	req = serverClient.NewRequest("PUT", "/v1/auth/approle/role/test-role/secret-id")
-	body = request(t, serverClient, req, 200)
-	data = body["data"].(map[string]interface{})
-	secretID := data["secret_id"].(string)
-
-	// Write the RoleID and SecretID to temp files
-	roleIDPath := makeTempFile(t, "role_id.txt", roleID+"\n")
-	secretIDPath := makeTempFile(t, "secret_id.txt", secretID+"\n")
-	defer os.Remove(roleIDPath)
-	defer os.Remove(secretIDPath)
-
-	// setup the kv secrets
-	req = serverClient.NewRequest("POST", "/v1/sys/mounts/secret/tune")
-	req.BodyBytes = []byte(`{
-	"options": {"version": "2"}
-	}`)
-	request(t, serverClient, req, 200)
-
-	// populate a secret
-	req = serverClient.NewRequest("POST", "/v1/secret/data/myapp")
-	req.BodyBytes = []byte(`{
-	  "data": {
-      "username": "bar",
-      "password": "zap"
-    }
-	}`)
-	request(t, serverClient, req, 200)
-
-	// populate another secret
-	req = serverClient.NewRequest("POST", "/v1/secret/data/otherapp")
-	req.BodyBytes = []byte(`{
-	  "data": {
-      "username": "barstuff",
-      "password": "zap",
-			"cert": "something"
-    }
-	}`)
-	request(t, serverClient, req, 200)
-
-	// make a temp directory to hold renders. Each test will create a temp dir
-	// inside this one
-	tmpDirRoot, err := os.MkdirTemp("", "agent-test-renders")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpDirRoot)
-
-	// start test cases here
-	testCases := map[string]struct {
-		templateCount int
-		exitAfterAuth bool
-	}{
-		"one": {
-			templateCount: 1,
-		},
-		"one_with_exit": {
-			templateCount: 1,
-			exitAfterAuth: true,
-		},
-		"many": {
-			templateCount: 15,
-		},
-		"many_with_exit": {
-			templateCount: 13,
-			exitAfterAuth: true,
-		},
-	}
-
-	for tcname, tc := range testCases {
-		t.Run(tcname, func(t *testing.T) {
-			// create temp dir for this test run
-			tmpDir, err := os.MkdirTemp(tmpDirRoot, tcname)
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			// make some template files
-			var templatePaths []string
-			for i := 0; i < tc.templateCount; i++ {
-				fileName := filepath.Join(tmpDir, fmt.Sprintf("render_%d.tmpl", i))
-				if err := os.WriteFile(fileName, []byte(templateContents(i)), 0o600); err != nil {
-					t.Fatal(err)
-				}
-				templatePaths = append(templatePaths, fileName)
-			}
-
-			// build up the template config to be added to the Agent config.hcl file
-			var templateConfigStrings []string
-			for i, t := range templatePaths {
-				index := fmt.Sprintf("render_%d.json", i)
-				s := fmt.Sprintf(templateConfigString, t, tmpDir, index)
-				templateConfigStrings = append(templateConfigStrings, s)
-			}
-
-			// Create a config file
-			config := `
-vault {
-  address = "%s"
-	tls_skip_verify = true
-}
-
-auto_auth {
-    method "approle" {
-        mount_path = "auth/approle"
-        config = {
-            role_id_file_path = "%s"
-            secret_id_file_path = "%s"
-						remove_secret_id_file_after_reading = false
-        }
-    }
-}
-
-%s
-
-%s
-`
-
-			// conditionally set the exit_after_auth flag
-			exitAfterAuth := ""
-			if tc.exitAfterAuth {
-				exitAfterAuth = "exit_after_auth = true"
-			}
-
-			// flatten the template configs
-			templateConfig := strings.Join(templateConfigStrings, " ")
-
-			config = fmt.Sprintf(config, serverClient.Address(), roleIDPath, secretIDPath, templateConfig, exitAfterAuth)
-			configPath := makeTempFile(t, "config.hcl", config)
-			defer os.Remove(configPath)
-
-			// Start the agent
-			ui, cmd := testAgentCommand(t, logger)
-			cmd.client = serverClient
-			cmd.startedCh = make(chan struct{})
+			// Start the agent
+			ui, cmd := testAgentCommand(t, logger)
+			cmd.client = serverClient
+			cmd.startedCh = make(chan struct{})
 
 			wg := &sync.WaitGroup{}
 			wg.Add(1)
@@ -1022,7 +904,7 @@ auto_auth {
 					for i := range templatePaths {
 						fileName := filepath.Join(tmpDir, fmt.Sprintf("render_%d.json", i))
 						var c []byte
-						c, err = os.ReadFile(fileName)
+						c, err = ioutil.ReadFile(fileName)
 						if err != nil {
 							continue
 						}
@@ -1039,7 +921,7 @@ auto_auth {
 
 			for i := 0; i < tc.templateCount; i++ {
 				fileName := filepath.Join(tmpDir, fmt.Sprintf("render_%d.tmpl", i))
-				if err := os.WriteFile(fileName, []byte(templateContents(i)+"{}"), 0o600); err != nil {
+				if err := ioutil.WriteFile(fileName, []byte(templateContents(i)+"{}"), 0o600); err != nil {
 					t.Fatal(err)
 				}
 			}
@@ -1052,7 +934,7 @@ auto_auth {
 func testListFiles(t *testing.T, dir, extension string) int {
 	t.Helper()
 
-	files, err := os.ReadDir(dir)
+	files, err := ioutil.ReadDir(dir)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -1182,14 +1064,14 @@ func TestAgent_Template_ExitCounter(t *testing.T) {
 
 	// make a temp directory to hold renders. Each test will create a temp dir
 	// inside this one
-	tmpDirRoot, err := os.MkdirTemp("", "agent-test-renders")
+	tmpDirRoot, err := ioutil.TempDir("", "agent-test-renders")
 	if err != nil {
 		t.Fatal(err)
 	}
 	defer os.RemoveAll(tmpDirRoot)
 
 	// create temp dir for this test run
-	tmpDir, err := os.MkdirTemp(tmpDirRoot, "agent-test")
+	tmpDir, err := ioutil.TempDir(tmpDirRoot, "agent-test")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -1271,7 +1153,7 @@ exit_after_auth = true
 	// Perform the tests
 	//----------------------------------------------------
 
-	files, err := os.ReadDir(tmpDir)
+	files, err := ioutil.ReadDir(tmpDir)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -1334,7 +1216,7 @@ func request(t *testing.T, client *api.Client, req *api.Request, expectedStatusC
 		t.Fatalf("expected status code %d, not %d", expectedStatusCode, resp.StatusCode)
 	}
 
-	bytes, err := io.ReadAll(resp.Body)
+	bytes, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
 		t.Fatalf("err: %s", err)
 	}
@@ -1353,7 +1235,7 @@ func request(t *testing.T, client *api.Client, req *api.Request, expectedStatusC
 // makeTempFile creates a temp file and populates it.
 func makeTempFile(t *testing.T, name, contents string) string {
 	t.Helper()
-	f, err := os.CreateTemp("", name)
+	f, err := ioutil.TempFile("", name)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -1363,27 +1245,6 @@ func makeTempFile(t *testing.T, name, contents string) string {
 	return path
 }
 
-func populateTempFile(t *testing.T, name, contents string) *os.File {
-	t.Helper()
-
-	file, err := os.CreateTemp(t.TempDir(), name)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = file.WriteString(contents)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = file.Close()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	return file
-}
-
 // handler makes 500 errors happen for reads on /v1/secret.
 // Definitely not thread-safe, do not use t.Parallel with this.
 type handler struct {
@@ -1402,28 +1263,7 @@ func (h *handler) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
 		}
 		h.t.Logf("passing GET request on %s", req.URL.Path)
 	}
-	vaulthttp.Handler.Handler(h.props).ServeHTTP(resp, req)
-}
-
-// userAgentHandler makes it easy to test the User-Agent header received
-// by Vault
-type userAgentHandler struct {
-	props                *vault.HandlerProperties
-	failCount            int
-	userAgentToCheckFor  string
-	pathToCheck          string
-	requestMethodToCheck string
-	t                    *testing.T
-}
-
-func (h *userAgentHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
-	if req.Method == h.requestMethodToCheck && strings.Contains(req.RequestURI, h.pathToCheck) {
-		userAgent := req.UserAgent()
-		if !(userAgent == h.userAgentToCheckFor) {
-			h.t.Fatalf("User-Agent string not as expected. Expected to find %s, got %s", h.userAgentToCheckFor, userAgent)
-		}
-	}
-	vaulthttp.Handler.Handler(h.props).ServeHTTP(w, req)
+	vaulthttp.Handler(h.props).ServeHTTP(resp, req)
 }
 
 // TestAgent_Template_Retry verifies that the template server retries requests
@@ -1446,12 +1286,11 @@ func TestAgent_Template_Retry(t *testing.T) {
 		},
 		&vault.TestClusterOptions{
 			NumCores: 1,
-			HandlerFunc: vaulthttp.HandlerFunc(
-				func(properties *vault.HandlerProperties) http.Handler {
-					h.props = properties
-					h.t = t
-					return &h
-				}),
+			HandlerFunc: func(properties *vault.HandlerProperties) http.Handler {
+				h.props = properties
+				h.t = t
+				return &h
+			},
 		})
 	cluster.Start()
 	defer cluster.Cleanup()
@@ -1489,7 +1328,7 @@ func TestAgent_Template_Retry(t *testing.T) {
 
 	// make a temp directory to hold renders. Each test will create a temp dir
 	// inside this one
-	tmpDirRoot, err := os.MkdirTemp("", "agent-test-renders")
+	tmpDirRoot, err := ioutil.TempDir("", "agent-test-renders")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -1537,14 +1376,14 @@ func TestAgent_Template_Retry(t *testing.T) {
 			h.failCount = 6
 
 			// create temp dir for this test run
-			tmpDir, err := os.MkdirTemp(tmpDirRoot, tcname)
+			tmpDir, err := ioutil.TempDir(tmpDirRoot, tcname)
 			if err != nil {
 				t.Fatal(err)
 			}
 
 			// make some template files
 			templatePath := filepath.Join(tmpDir, "render_0.tmpl")
-			if err := os.WriteFile(templatePath, []byte(templateContents(0)), 0o600); err != nil {
+			if err := ioutil.WriteFile(templatePath, []byte(templateContents(0)), 0o600); err != nil {
 				t.Fatal(err)
 			}
 			templateConfig := fmt.Sprintf(templateConfigString, templatePath, tmpDir, "render_0.json")
@@ -1618,7 +1457,7 @@ template_config {
 
 					fileName := filepath.Join(tmpDir, "render_0.json")
 					var c []byte
-					c, err = os.ReadFile(fileName)
+					c, err = ioutil.ReadFile(fileName)
 					if err != nil {
 						continue
 					}
@@ -1627,540 +1466,96 @@ template_config {
 						continue
 					}
 					return nil
-				}
-			}
-
-			err = verify()
-			close(cmd.ShutdownCh)
-			wg.Wait()
-
-			switch {
-			case (code != 0 || err != nil) && tc.expectError:
-			case code == 0 && err == nil && !tc.expectError:
-			default:
-				t.Fatalf("%s expectError=%v error=%v code=%d", tcname, tc.expectError, err, code)
-			}
-		})
-	}
-}
-
-// prepAgentApproleKV configures a Vault instance for approle authentication,
-// such that the resulting token will have global permissions across /kv
-// and /secret mounts.  Returns the auto_auth config stanza to setup an Agent
-// to connect using approle.
-func prepAgentApproleKV(t *testing.T, client *api.Client) (string, func()) {
-	t.Helper()
-
-	policyAutoAuthAppRole := `
-path "/kv/*" {
-	capabilities = ["create", "read", "update", "delete", "list"]
-}
-path "/secret/*" {
-	capabilities = ["create", "read", "update", "delete", "list"]
-}
-`
-	// Add an kv-admin policy
-	if err := client.Sys().PutPolicy("test-autoauth", policyAutoAuthAppRole); err != nil {
-		t.Fatal(err)
-	}
-
-	// Enable approle
-	err := client.Sys().EnableAuthWithOptions("approle", &api.EnableAuthOptions{
-		Type: "approle",
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = client.Logical().Write("auth/approle/role/test1", map[string]interface{}{
-		"bind_secret_id": "true",
-		"token_ttl":      "1h",
-		"token_max_ttl":  "2h",
-		"policies":       []string{"test-autoauth"},
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	resp, err := client.Logical().Write("auth/approle/role/test1/secret-id", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	secretID := resp.Data["secret_id"].(string)
-	secretIDFile := makeTempFile(t, "secret_id.txt", secretID+"\n")
-
-	resp, err = client.Logical().Read("auth/approle/role/test1/role-id")
-	if err != nil {
-		t.Fatal(err)
-	}
-	roleID := resp.Data["role_id"].(string)
-	roleIDFile := makeTempFile(t, "role_id.txt", roleID+"\n")
-
-	config := fmt.Sprintf(`
-auto_auth {
-    method "approle" {
-        mount_path = "auth/approle"
-        config = {
-            role_id_file_path = "%s"
-            secret_id_file_path = "%s"
-			remove_secret_id_file_after_reading = false
-        }
-    }
-}
-`, roleIDFile, secretIDFile)
-
-	cleanup := func() {
-		_ = os.Remove(roleIDFile)
-		_ = os.Remove(secretIDFile)
-	}
-	return config, cleanup
-}
-
-// TestAgent_AutoAuth_UserAgent tests that the User-Agent sent
-// to Vault by Vault Agent is correct when performing Auto-Auth.
-// Uses the custom handler userAgentHandler (defined above) so
-// that Vault validates the User-Agent on requests sent by Agent.
-func TestAgent_AutoAuth_UserAgent(t *testing.T) {
-	logger := logging.NewVaultLogger(hclog.Trace)
-	var h userAgentHandler
-	cluster := vault.NewTestCluster(t, &vault.CoreConfig{
-		Logger: logger,
-		CredentialBackends: map[string]logical.Factory{
-			"approle": credAppRole.Factory,
-		},
-	}, &vault.TestClusterOptions{
-		NumCores: 1,
-		HandlerFunc: vaulthttp.HandlerFunc(
-			func(properties *vault.HandlerProperties) http.Handler {
-				h.props = properties
-				h.userAgentToCheckFor = useragent.AgentAutoAuthString()
-				h.requestMethodToCheck = "PUT"
-				h.pathToCheck = "auth/approle/login"
-				h.t = t
-				return &h
-			}),
-	})
-	cluster.Start()
-	defer cluster.Cleanup()
-
-	serverClient := cluster.Cores[0].Client
-
-	// Enable the approle auth method
-	req := serverClient.NewRequest("POST", "/v1/sys/auth/approle")
-	req.BodyBytes = []byte(`{
-		"type": "approle"
-	}`)
-	request(t, serverClient, req, 204)
-
-	// Create a named role
-	req = serverClient.NewRequest("PUT", "/v1/auth/approle/role/test-role")
-	req.BodyBytes = []byte(`{
-	  "secret_id_num_uses": "10",
-	  "secret_id_ttl": "1m",
-	  "token_max_ttl": "1m",
-	  "token_num_uses": "10",
-	  "token_ttl": "1m",
-	  "policies": "default"
-	}`)
-	request(t, serverClient, req, 204)
-
-	// Fetch the RoleID of the named role
-	req = serverClient.NewRequest("GET", "/v1/auth/approle/role/test-role/role-id")
-	body := request(t, serverClient, req, 200)
-	data := body["data"].(map[string]interface{})
-	roleID := data["role_id"].(string)
-
-	// Get a SecretID issued against the named role
-	req = serverClient.NewRequest("PUT", "/v1/auth/approle/role/test-role/secret-id")
-	body = request(t, serverClient, req, 200)
-	data = body["data"].(map[string]interface{})
-	secretID := data["secret_id"].(string)
-
-	// Write the RoleID and SecretID to temp files
-	roleIDPath := makeTempFile(t, "role_id.txt", roleID+"\n")
-	secretIDPath := makeTempFile(t, "secret_id.txt", secretID+"\n")
-	defer os.Remove(roleIDPath)
-	defer os.Remove(secretIDPath)
-
-	sinkf, err := os.CreateTemp("", "sink.test.")
-	if err != nil {
-		t.Fatal(err)
-	}
-	sink := sinkf.Name()
-	sinkf.Close()
-	os.Remove(sink)
-
-	autoAuthConfig := fmt.Sprintf(`
-auto_auth {
-    method "approle" {
-        mount_path = "auth/approle"
-        config = {
-            role_id_file_path = "%s"
-            secret_id_file_path = "%s"
-        }
-    }
-
-	sink "file" {
-		config = {
-			path = "%s"
-		}
-	}
-}`, roleIDPath, secretIDPath, sink)
-
-	listenAddr := generateListenerAddress(t)
-	listenConfig := fmt.Sprintf(`
-listener "tcp" {
-  address = "%s"
-  tls_disable = true
-}
-`, listenAddr)
-
-	config := fmt.Sprintf(`
-vault {
-  address = "%s"
-  tls_skip_verify = true
-}
-api_proxy {
-  use_auto_auth_token = true
-}
-%s
-%s
-`, serverClient.Address(), listenConfig, autoAuthConfig)
-	configPath := makeTempFile(t, "config.hcl", config)
-	defer os.Remove(configPath)
-
-	// Unset the environment variable so that agent picks up the right test
-	// cluster address
-	defer os.Setenv(api.EnvVaultAddress, os.Getenv(api.EnvVaultAddress))
-	os.Unsetenv(api.EnvVaultAddress)
-
-	// Start the agent
-	_, cmd := testAgentCommand(t, logger)
-	cmd.startedCh = make(chan struct{})
-
-	wg := &sync.WaitGroup{}
-	wg.Add(1)
-	go func() {
-		cmd.Run([]string{"-config", configPath})
-		wg.Done()
-	}()
-
-	select {
-	case <-cmd.startedCh:
-	case <-time.After(5 * time.Second):
-		t.Errorf("timeout")
-	}
-
-	// Validate that the auto-auth token has been correctly attained
-	// and works for LookupSelf
-	conf := api.DefaultConfig()
-	conf.Address = "http://" + listenAddr
-	agentClient, err := api.NewClient(conf)
-	if err != nil {
-		t.Fatalf("err: %s", err)
-	}
-
-	agentClient.SetToken("")
-	err = agentClient.SetAddress("http://" + listenAddr)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Wait for the token to be sent to syncs and be available to be used
-	time.Sleep(5 * time.Second)
-
-	req = agentClient.NewRequest("GET", "/v1/auth/token/lookup-self")
-	body = request(t, agentClient, req, 200)
-
-	close(cmd.ShutdownCh)
-	wg.Wait()
-}
-
-// TestAgent_APIProxyWithoutCache_UserAgent tests that the User-Agent sent
-// to Vault by Vault Agent is correct using the API proxy without
-// the cache configured. Uses the custom handler
-// userAgentHandler struct defined in this test package, so that Vault validates the
-// User-Agent on requests sent by Agent.
-func TestAgent_APIProxyWithoutCache_UserAgent(t *testing.T) {
-	logger := logging.NewVaultLogger(hclog.Trace)
-	userAgentForProxiedClient := "proxied-client"
-	var h userAgentHandler
-	cluster := vault.NewTestCluster(t, nil, &vault.TestClusterOptions{
-		NumCores: 1,
-		HandlerFunc: vaulthttp.HandlerFunc(
-			func(properties *vault.HandlerProperties) http.Handler {
-				h.props = properties
-				h.userAgentToCheckFor = useragent.AgentProxyStringWithProxiedUserAgent(userAgentForProxiedClient)
-				h.pathToCheck = "/v1/auth/token/lookup-self"
-				h.requestMethodToCheck = "GET"
-				h.t = t
-				return &h
-			}),
-	})
-	cluster.Start()
-	defer cluster.Cleanup()
-
-	serverClient := cluster.Cores[0].Client
-
-	// Unset the environment variable so that agent picks up the right test
-	// cluster address
-	defer os.Setenv(api.EnvVaultAddress, os.Getenv(api.EnvVaultAddress))
-	os.Unsetenv(api.EnvVaultAddress)
-
-	listenAddr := generateListenerAddress(t)
-	listenConfig := fmt.Sprintf(`
-listener "tcp" {
-  address = "%s"
-  tls_disable = true
-}
-`, listenAddr)
-
-	config := fmt.Sprintf(`
-vault {
-  address = "%s"
-  tls_skip_verify = true
-}
-%s
-`, serverClient.Address(), listenConfig)
-	configPath := makeTempFile(t, "config.hcl", config)
-	defer os.Remove(configPath)
-
-	// Start the agent
-	_, cmd := testAgentCommand(t, logger)
-	cmd.startedCh = make(chan struct{})
-
-	wg := &sync.WaitGroup{}
-	wg.Add(1)
-	go func() {
-		cmd.Run([]string{"-config", configPath})
-		wg.Done()
-	}()
-
-	select {
-	case <-cmd.startedCh:
-	case <-time.After(5 * time.Second):
-		t.Errorf("timeout")
-	}
-
-	agentClient, err := api.NewClient(api.DefaultConfig())
-	if err != nil {
-		t.Fatal(err)
-	}
-	agentClient.AddHeader("User-Agent", userAgentForProxiedClient)
-	agentClient.SetToken(serverClient.Token())
-	agentClient.SetMaxRetries(0)
-	err = agentClient.SetAddress("http://" + listenAddr)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = agentClient.Auth().Token().LookupSelf()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	close(cmd.ShutdownCh)
-	wg.Wait()
-}
-
-// TestAgent_APIProxyWithCache_UserAgent tests that the User-Agent sent
-// to Vault by Vault Agent is correct using the API proxy with
-// the cache configured.  Uses the custom handler
-// userAgentHandler struct defined in this test package, so that Vault validates the
-// User-Agent on requests sent by Agent.
-func TestAgent_APIProxyWithCache_UserAgent(t *testing.T) {
-	logger := logging.NewVaultLogger(hclog.Trace)
-	userAgentForProxiedClient := "proxied-client"
-	var h userAgentHandler
-	cluster := vault.NewTestCluster(t, nil, &vault.TestClusterOptions{
-		NumCores: 1,
-		HandlerFunc: vaulthttp.HandlerFunc(
-			func(properties *vault.HandlerProperties) http.Handler {
-				h.props = properties
-				h.userAgentToCheckFor = useragent.AgentProxyStringWithProxiedUserAgent(userAgentForProxiedClient)
-				h.pathToCheck = "/v1/auth/token/lookup-self"
-				h.requestMethodToCheck = "GET"
-				h.t = t
-				return &h
-			}),
-	})
-	cluster.Start()
-	defer cluster.Cleanup()
-
-	serverClient := cluster.Cores[0].Client
-
-	// Unset the environment variable so that agent picks up the right test
-	// cluster address
-	defer os.Setenv(api.EnvVaultAddress, os.Getenv(api.EnvVaultAddress))
-	os.Unsetenv(api.EnvVaultAddress)
-
-	listenAddr := generateListenerAddress(t)
-	listenConfig := fmt.Sprintf(`
-listener "tcp" {
-  address = "%s"
-  tls_disable = true
-}
-`, listenAddr)
-
-	cacheConfig := `
-cache {
-}`
-
-	config := fmt.Sprintf(`
-vault {
-  address = "%s"
-  tls_skip_verify = true
-}
-%s
-%s
-`, serverClient.Address(), listenConfig, cacheConfig)
-	configPath := makeTempFile(t, "config.hcl", config)
-	defer os.Remove(configPath)
-
-	// Start the agent
-	_, cmd := testAgentCommand(t, logger)
-	cmd.startedCh = make(chan struct{})
-
-	wg := &sync.WaitGroup{}
-	wg.Add(1)
-	go func() {
-		cmd.Run([]string{"-config", configPath})
-		wg.Done()
-	}()
-
-	select {
-	case <-cmd.startedCh:
-	case <-time.After(5 * time.Second):
-		t.Errorf("timeout")
-	}
-
-	agentClient, err := api.NewClient(api.DefaultConfig())
-	if err != nil {
-		t.Fatal(err)
-	}
-	agentClient.AddHeader("User-Agent", userAgentForProxiedClient)
-	agentClient.SetToken(serverClient.Token())
-	agentClient.SetMaxRetries(0)
-	err = agentClient.SetAddress("http://" + listenAddr)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = agentClient.Auth().Token().LookupSelf()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	close(cmd.ShutdownCh)
-	wg.Wait()
-}
-
-func TestAgent_Cache_DynamicSecret(t *testing.T) {
-	logger := logging.NewVaultLogger(hclog.Trace)
-	cluster := vault.NewTestCluster(t, nil, &vault.TestClusterOptions{
-		HandlerFunc: vaulthttp.Handler,
-	})
-	cluster.Start()
-	defer cluster.Cleanup()
-
-	serverClient := cluster.Cores[0].Client
-
-	// Unset the environment variable so that agent picks up the right test
-	// cluster address
-	defer os.Setenv(api.EnvVaultAddress, os.Getenv(api.EnvVaultAddress))
-	os.Unsetenv(api.EnvVaultAddress)
-
-	cacheConfig := `
-cache {
-}
-`
-	listenAddr := generateListenerAddress(t)
-	listenConfig := fmt.Sprintf(`
-listener "tcp" {
-  address = "%s"
-  tls_disable = true
-}
-`, listenAddr)
-
-	config := fmt.Sprintf(`
-vault {
-  address = "%s"
-  tls_skip_verify = true
-}
-%s
-%s
-`, serverClient.Address(), cacheConfig, listenConfig)
-	configPath := makeTempFile(t, "config.hcl", config)
-	defer os.Remove(configPath)
-
-	// Start the agent
-	_, cmd := testAgentCommand(t, logger)
-	cmd.startedCh = make(chan struct{})
+				}
+			}
 
-	wg := &sync.WaitGroup{}
-	wg.Add(1)
-	go func() {
-		cmd.Run([]string{"-config", configPath})
-		wg.Done()
-	}()
+			err = verify()
+			close(cmd.ShutdownCh)
+			wg.Wait()
 
-	select {
-	case <-cmd.startedCh:
-	case <-time.After(5 * time.Second):
-		t.Errorf("timeout")
+			switch {
+			case (code != 0 || err != nil) && tc.expectError:
+			case code == 0 && err == nil && !tc.expectError:
+			default:
+				t.Fatalf("%s expectError=%v error=%v code=%d", tcname, tc.expectError, err, code)
+			}
+		})
 	}
+}
 
-	agentClient, err := api.NewClient(api.DefaultConfig())
-	if err != nil {
+// prepAgentApproleKV configures a Vault instance for approle authentication,
+// such that the resulting token will have global permissions across /kv
+// and /secret mounts.  Returns the auto_auth config stanza to setup an Agent
+// to connect using approle.
+func prepAgentApproleKV(t *testing.T, client *api.Client) (string, func()) {
+	t.Helper()
+
+	policyAutoAuthAppRole := `
+path "/kv/*" {
+	capabilities = ["create", "read", "update", "delete", "list"]
+}
+path "/secret/*" {
+	capabilities = ["create", "read", "update", "delete", "list"]
+}
+`
+	// Add an kv-admin policy
+	if err := client.Sys().PutPolicy("test-autoauth", policyAutoAuthAppRole); err != nil {
 		t.Fatal(err)
 	}
-	agentClient.SetToken(serverClient.Token())
-	agentClient.SetMaxRetries(0)
-	err = agentClient.SetAddress("http://" + listenAddr)
+
+	// Enable approle
+	err := client.Sys().EnableAuthWithOptions("approle", &api.EnableAuthOptions{
+		Type: "approle",
+	})
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	renewable := true
-	tokenCreateRequest := &api.TokenCreateRequest{
-		Policies:  []string{"default"},
-		TTL:       "30m",
-		Renewable: &renewable,
+	_, err = client.Logical().Write("auth/approle/role/test1", map[string]interface{}{
+		"bind_secret_id": "true",
+		"token_ttl":      "1h",
+		"token_max_ttl":  "2h",
+		"policies":       []string{"test-autoauth"},
+	})
+	if err != nil {
+		t.Fatal(err)
 	}
 
-	// This was the simplest test I could find to trigger the caching behaviour,
-	// i.e. the most concise I could make the test that I can tell
-	// creating an orphan token returns Auth, is renewable, and isn't a token
-	// that's managed elsewhere (since it's an orphan)
-	secret, err := agentClient.Auth().Token().CreateOrphan(tokenCreateRequest)
+	resp, err := client.Logical().Write("auth/approle/role/test1/secret-id", nil)
 	if err != nil {
 		t.Fatal(err)
 	}
-	if secret == nil || secret.Auth == nil {
-		t.Fatalf("secret not as expected: %v", secret)
-	}
-
-	token := secret.Auth.ClientToken
+	secretID := resp.Data["secret_id"].(string)
+	secretIDFile := makeTempFile(t, "secret_id.txt", secretID+"\n")
 
-	secret, err = agentClient.Auth().Token().CreateOrphan(tokenCreateRequest)
+	resp, err = client.Logical().Read("auth/approle/role/test1/role-id")
 	if err != nil {
 		t.Fatal(err)
 	}
-	if secret == nil || secret.Auth == nil {
-		t.Fatalf("secret not as expected: %v", secret)
-	}
+	roleID := resp.Data["role_id"].(string)
+	roleIDFile := makeTempFile(t, "role_id.txt", roleID+"\n")
 
-	token2 := secret.Auth.ClientToken
+	config := fmt.Sprintf(`
+auto_auth {
+    method "approle" {
+        mount_path = "auth/approle"
+        config = {
+            role_id_file_path = "%s"
+            secret_id_file_path = "%s"
+			remove_secret_id_file_after_reading = false
+        }
+    }
+}
+`, roleIDFile, secretIDFile)
 
-	if token != token2 {
-		t.Fatalf("token create response not cached when it should have been, as tokens differ")
+	cleanup := func() {
+		_ = os.Remove(roleIDFile)
+		_ = os.Remove(secretIDFile)
 	}
-
-	close(cmd.ShutdownCh)
-	wg.Wait()
+	return config, cleanup
 }
 
-func TestAgent_ApiProxy_Retry(t *testing.T) {
+func TestAgent_Cache_Retry(t *testing.T) {
 	//----------------------------------------------------
 	// Start the server and agent
 	//----------------------------------------------------
@@ -2178,11 +1573,11 @@ func TestAgent_ApiProxy_Retry(t *testing.T) {
 		},
 		&vault.TestClusterOptions{
 			NumCores: 1,
-			HandlerFunc: vaulthttp.HandlerFunc(func(properties *vault.HandlerProperties) http.Handler {
+			HandlerFunc: func(properties *vault.HandlerProperties) http.Handler {
 				h.props = properties
 				h.t = t
 				return &h
-			}),
+			},
 		})
 	cluster.Start()
 	defer cluster.Cleanup()
@@ -2262,6 +1657,7 @@ vault {
 %s
 %s
 `, serverClient.Address(), retryConf, cacheConfig, listenConfig)
+
 			configPath := makeTempFile(t, "config.hcl", config)
 			defer os.Remove(configPath)
 
@@ -2368,7 +1764,7 @@ func TestAgent_TemplateConfig_ExitOnRetryFailure(t *testing.T) {
 
 	// make a temp directory to hold renders. Each test will create a temp dir
 	// inside this one
-	tmpDirRoot, err := os.MkdirTemp("", "agent-test-renders")
+	tmpDirRoot, err := ioutil.TempDir("", "agent-test-renders")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -2472,7 +1868,7 @@ func TestAgent_TemplateConfig_ExitOnRetryFailure(t *testing.T) {
 	for tcName, tc := range testCases {
 		t.Run(tcName, func(t *testing.T) {
 			// create temp dir for this test run
-			tmpDir, err := os.MkdirTemp(tmpDirRoot, tcName)
+			tmpDir, err := ioutil.TempDir(tmpDirRoot, tcName)
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -2581,7 +1977,7 @@ vault {
 
 					fileName := filepath.Join(tmpDir, "render_0.json")
 					var c []byte
-					c, err = os.ReadFile(fileName)
+					c, err = ioutil.ReadFile(fileName)
 					if err != nil {
 						continue
 					}
@@ -2704,7 +2100,24 @@ func TestAgent_Quit(t *testing.T) {
 	//----------------------------------------------------
 	// Start the server and agent
 	//----------------------------------------------------
-	cluster := minimal.NewTestSoloCluster(t, nil)
+	logger := logging.NewVaultLogger(hclog.Error)
+	cluster := vault.NewTestCluster(t,
+		&vault.CoreConfig{
+			Logger: logger,
+			CredentialBackends: map[string]logical.Factory{
+				"approle": credAppRole.Factory,
+			},
+			LogicalBackends: map[string]logical.Factory{
+				"kv": logicalKv.Factory,
+			},
+		},
+		&vault.TestClusterOptions{
+			NumCores: 1,
+		})
+	cluster.Start()
+	defer cluster.Cleanup()
+
+	vault.TestWaitActive(t, cluster.Cores[0].Core)
 	serverClient := cluster.Cores[0].Client
 
 	// Unset the environment variable so that agent picks up the right test
@@ -2743,7 +2156,7 @@ cache {}
 	defer os.Remove(configPath)
 
 	// Start the agent
-	_, cmd := testAgentCommand(t, nil)
+	_, cmd := testAgentCommand(t, logger)
 	cmd.startedCh = make(chan struct{})
 
 	wg := &sync.WaitGroup{}
@@ -2798,305 +2211,6 @@ cache {}
 	wg.Wait()
 }
 
-func TestAgent_LogFile_CliOverridesConfig(t *testing.T) {
-	// Create basic config
-	configFile := populateTempFile(t, "agent-config.hcl", BasicHclConfig)
-	cfg, err := agentConfig.LoadConfigFile(configFile.Name())
-	if err != nil {
-		t.Fatal("Cannot load config to test update/merge", err)
-	}
-
-	// Sanity check that the config value is the current value
-	assert.Equal(t, "TMPDIR/juan.log", cfg.LogFile)
-
-	// Initialize the command and parse any flags
-	cmd := &AgentCommand{BaseCommand: &BaseCommand{}}
-	f := cmd.Flags()
-	// Simulate the flag being specified
-	err = f.Parse([]string{"-log-file=/foo/bar/test.log"})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Update the config based on the inputs.
-	cmd.applyConfigOverrides(f, cfg)
-
-	assert.NotEqual(t, "TMPDIR/juan.log", cfg.LogFile)
-	assert.NotEqual(t, "/squiggle/logs.txt", cfg.LogFile)
-	assert.Equal(t, "/foo/bar/test.log", cfg.LogFile)
-}
-
-func TestAgent_LogFile_Config(t *testing.T) {
-	configFile := populateTempFile(t, "agent-config.hcl", BasicHclConfig)
-
-	cfg, err := agentConfig.LoadConfigFile(configFile.Name())
-	if err != nil {
-		t.Fatal("Cannot load config to test update/merge", err)
-	}
-
-	// Sanity check that the config value is the current value
-	assert.Equal(t, "TMPDIR/juan.log", cfg.LogFile, "sanity check on log config failed")
-	assert.Equal(t, 2, cfg.LogRotateMaxFiles)
-	assert.Equal(t, 1048576, cfg.LogRotateBytes)
-
-	// Parse the cli flags (but we pass in an empty slice)
-	cmd := &AgentCommand{BaseCommand: &BaseCommand{}}
-	f := cmd.Flags()
-	err = f.Parse([]string{})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Should change nothing...
-	cmd.applyConfigOverrides(f, cfg)
-
-	assert.Equal(t, "TMPDIR/juan.log", cfg.LogFile, "actual config check")
-	assert.Equal(t, 2, cfg.LogRotateMaxFiles)
-	assert.Equal(t, 1048576, cfg.LogRotateBytes)
-}
-
-func TestAgent_Config_NewLogger_Default(t *testing.T) {
-	cmd := &AgentCommand{BaseCommand: &BaseCommand{}}
-	cmd.config = agentConfig.NewConfig()
-	logger, err := cmd.newLogger()
-
-	assert.NoError(t, err)
-	assert.NotNil(t, logger)
-	assert.Equal(t, hclog.Info.String(), logger.GetLevel().String())
-}
-
-func TestAgent_Config_ReloadLogLevel(t *testing.T) {
-	cmd := &AgentCommand{BaseCommand: &BaseCommand{}}
-	var err error
-	tempDir := t.TempDir()
-
-	// Load an initial config
-	hcl := strings.ReplaceAll(BasicHclConfig, "TMPDIR", tempDir)
-	configFile := populateTempFile(t, "agent-config.hcl", hcl)
-	cmd.config, err = agentConfig.LoadConfigFile(configFile.Name())
-	if err != nil {
-		t.Fatal("Cannot load config to test update/merge", err)
-	}
-
-	// Tweak the loaded config to make sure we can put log files into a temp dir
-	// and systemd log attempts work fine, this would usually happen during Run.
-	cmd.logWriter = os.Stdout
-	cmd.logger, err = cmd.newLogger()
-	if err != nil {
-		t.Fatal("logger required for systemd log messages", err)
-	}
-
-	// Sanity check
-	assert.Equal(t, "warn", cmd.config.LogLevel)
-
-	// Load a new config
-	hcl = strings.ReplaceAll(BasicHclConfig2, "TMPDIR", tempDir)
-	configFile = populateTempFile(t, "agent-config.hcl", hcl)
-	err = cmd.reloadConfig([]string{configFile.Name()})
-	assert.NoError(t, err)
-	assert.Equal(t, "debug", cmd.config.LogLevel)
-}
-
-func TestAgent_Config_ReloadTls(t *testing.T) {
-	var wg sync.WaitGroup
-	wd, err := os.Getwd()
-	if err != nil {
-		t.Fatal("unable to get current working directory")
-	}
-	workingDir := filepath.Join(wd, "/agent/test-fixtures/reload")
-	fooCert := "reload_foo.pem"
-	fooKey := "reload_foo.key"
-
-	barCert := "reload_bar.pem"
-	barKey := "reload_bar.key"
-
-	reloadCert := "reload_cert.pem"
-	reloadKey := "reload_key.pem"
-	caPem := "reload_ca.pem"
-
-	tempDir := t.TempDir()
-
-	// Set up initial 'foo' certs
-	inBytes, err := os.ReadFile(filepath.Join(workingDir, fooCert))
-	if err != nil {
-		t.Fatal("unable to read cert required for test", fooCert, err)
-	}
-	err = os.WriteFile(filepath.Join(tempDir, reloadCert), inBytes, 0o777)
-	if err != nil {
-		t.Fatal("unable to write temp cert required for test", reloadCert, err)
-	}
-
-	inBytes, err = os.ReadFile(filepath.Join(workingDir, fooKey))
-	if err != nil {
-		t.Fatal("unable to read cert key required for test", fooKey, err)
-	}
-	err = os.WriteFile(filepath.Join(tempDir, reloadKey), inBytes, 0o777)
-	if err != nil {
-		t.Fatal("unable to write temp cert key required for test", reloadKey, err)
-	}
-
-	inBytes, err = os.ReadFile(filepath.Join(workingDir, caPem))
-	if err != nil {
-		t.Fatal("unable to read CA pem required for test", caPem, err)
-	}
-	certPool := x509.NewCertPool()
-	ok := certPool.AppendCertsFromPEM(inBytes)
-	if !ok {
-		t.Fatal("not ok when appending CA cert")
-	}
-
-	replacedHcl := strings.ReplaceAll(BasicHclConfig, "TMPDIR", tempDir)
-	configFile := populateTempFile(t, "agent-config.hcl", replacedHcl)
-
-	// Set up Agent/cmd
-	logger := logging.NewVaultLogger(hclog.Trace)
-	ui, cmd := testAgentCommand(t, logger)
-
-	wg.Add(1)
-	args := []string{"-config", configFile.Name()}
-	go func() {
-		if code := cmd.Run(args); code != 0 {
-			output := ui.ErrorWriter.String() + ui.OutputWriter.String()
-			t.Errorf("got a non-zero exit status: %s", output)
-		}
-		wg.Done()
-	}()
-
-	testCertificateName := func(cn string) error {
-		conn, err := tls.Dial("tcp", "127.0.0.1:8100", &tls.Config{
-			RootCAs: certPool,
-		})
-		if err != nil {
-			return err
-		}
-		defer conn.Close()
-		if err = conn.Handshake(); err != nil {
-			return err
-		}
-		servName := conn.ConnectionState().PeerCertificates[0].Subject.CommonName
-		if servName != cn {
-			return fmt.Errorf("expected %s, got %s", cn, servName)
-		}
-		return nil
-	}
-
-	// Start
-	select {
-	case <-cmd.startedCh:
-	case <-time.After(5 * time.Second):
-		t.Fatalf("timeout")
-	}
-
-	if err := testCertificateName("foo.example.com"); err != nil {
-		t.Fatalf("certificate name didn't check out: %s", err)
-	}
-
-	// Swap out certs
-	inBytes, err = os.ReadFile(filepath.Join(workingDir, barCert))
-	if err != nil {
-		t.Fatal("unable to read cert required for test", barCert, err)
-	}
-	err = os.WriteFile(filepath.Join(tempDir, reloadCert), inBytes, 0o777)
-	if err != nil {
-		t.Fatal("unable to write temp cert required for test", reloadCert, err)
-	}
-
-	inBytes, err = os.ReadFile(filepath.Join(workingDir, barKey))
-	if err != nil {
-		t.Fatal("unable to read cert key required for test", barKey, err)
-	}
-	err = os.WriteFile(filepath.Join(tempDir, reloadKey), inBytes, 0o777)
-	if err != nil {
-		t.Fatal("unable to write temp cert key required for test", reloadKey, err)
-	}
-
-	// Reload
-	cmd.SighupCh <- struct{}{}
-	select {
-	case <-cmd.reloadedCh:
-	case <-time.After(5 * time.Second):
-		t.Fatalf("timeout")
-	}
-
-	if err := testCertificateName("bar.example.com"); err != nil {
-		t.Fatalf("certificate name didn't check out: %s", err)
-	}
-
-	// Shut down
-	cmd.ShutdownCh <- struct{}{}
-
-	wg.Wait()
-}
-
-// TestAgent_NonTLSListener_SIGHUP tests giving a SIGHUP signal to a listener
-// without a TLS configuration. Prior to fixing GitHub issue #19480, this
-// would cause a panic.
-func TestAgent_NonTLSListener_SIGHUP(t *testing.T) {
-	logger := logging.NewVaultLogger(hclog.Trace)
-	cluster := vault.NewTestCluster(t, nil, &vault.TestClusterOptions{
-		HandlerFunc: vaulthttp.Handler,
-	})
-	cluster.Start()
-	defer cluster.Cleanup()
-
-	serverClient := cluster.Cores[0].Client
-
-	// Unset the environment variable so that agent picks up the right test
-	// cluster address
-	defer os.Setenv(api.EnvVaultAddress, os.Getenv(api.EnvVaultAddress))
-	os.Unsetenv(api.EnvVaultAddress)
-
-	listenAddr := generateListenerAddress(t)
-	listenConfig := fmt.Sprintf(`
-listener "tcp" {
-  address = "%s"
-  tls_disable = true
-}
-`, listenAddr)
-
-	config := fmt.Sprintf(`
-vault {
-  address = "%s"
-  tls_skip_verify = true
-}
-%s
-`, serverClient.Address(), listenConfig)
-	configPath := makeTempFile(t, "config.hcl", config)
-	defer os.Remove(configPath)
-
-	// Start the agent
-	ui, cmd := testAgentCommand(t, logger)
-
-	cmd.startedCh = make(chan struct{})
-
-	wg := &sync.WaitGroup{}
-	wg.Add(1)
-	go func() {
-		if code := cmd.Run([]string{"-config", configPath}); code != 0 {
-			output := ui.ErrorWriter.String() + ui.OutputWriter.String()
-			t.Errorf("got a non-zero exit status: %s", output)
-		}
-		wg.Done()
-	}()
-
-	select {
-	case <-cmd.startedCh:
-	case <-time.After(5 * time.Second):
-		t.Errorf("timeout")
-	}
-
-	// Reload
-	cmd.SighupCh <- struct{}{}
-	select {
-	case <-cmd.reloadedCh:
-	case <-time.After(5 * time.Second):
-		t.Fatalf("timeout")
-	}
-
-	close(cmd.ShutdownCh)
-	wg.Wait()
-}
-
 // Get a randomly assigned port and then free it again before returning it.
 // There is still a race when trying to use it, but should work better
 // than a static port.
diff --git a/command/agentproxyshared/auth/auth.go b/command/agentproxyshared/auth/auth.go
deleted file mode 100644
index fdcf12f947e22..0000000000000
--- a/command/agentproxyshared/auth/auth.go
+++ /dev/null
@@ -1,553 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package auth
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"math/rand"
-	"net/http"
-	"time"
-
-	"github.com/armon/go-metrics"
-	"github.com/hashicorp/go-hclog"
-
-	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/sdk/helper/jsonutil"
-)
-
-const (
-	defaultMinBackoff = 1 * time.Second
-	defaultMaxBackoff = 5 * time.Minute
-)
-
-// AuthMethod is the interface that auto-auth methods implement for the agent/proxy
-// to use.
-type AuthMethod interface {
-	// Authenticate returns a mount path, header, request body, and error.
-	// The header may be nil if no special header is needed.
-	Authenticate(context.Context, *api.Client) (string, http.Header, map[string]interface{}, error)
-	NewCreds() chan struct{}
-	CredSuccess()
-	Shutdown()
-}
-
-// AuthMethodWithClient is an extended interface that can return an API client
-// for use during the authentication call.
-type AuthMethodWithClient interface {
-	AuthMethod
-	AuthClient(client *api.Client) (*api.Client, error)
-}
-
-type AuthConfig struct {
-	Logger    hclog.Logger
-	MountPath string
-	WrapTTL   time.Duration
-	Config    map[string]interface{}
-}
-
-// AuthHandler is responsible for keeping a token alive and renewed and passing
-// new tokens to the sink server
-type AuthHandler struct {
-	OutputCh                     chan string
-	TemplateTokenCh              chan string
-	ExecTokenCh                  chan string
-	token                        string
-	userAgent                    string
-	metricsSignifier             string
-	logger                       hclog.Logger
-	client                       *api.Client
-	random                       *rand.Rand
-	wrapTTL                      time.Duration
-	maxBackoff                   time.Duration
-	minBackoff                   time.Duration
-	enableReauthOnNewCredentials bool
-	enableTemplateTokenCh        bool
-	enableExecTokenCh            bool
-	exitOnError                  bool
-}
-
-type AuthHandlerConfig struct {
-	Logger     hclog.Logger
-	Client     *api.Client
-	WrapTTL    time.Duration
-	MaxBackoff time.Duration
-	MinBackoff time.Duration
-	Token      string
-	// UserAgent is the HTTP UserAgent header auto-auth will use when
-	// communicating with Vault.
-	UserAgent string
-	// MetricsSignifier is the first argument we will give to
-	// metrics.IncrCounter, signifying what the name of the application is
-	MetricsSignifier             string
-	EnableReauthOnNewCredentials bool
-	EnableTemplateTokenCh        bool
-	EnableExecTokenCh            bool
-	ExitOnError                  bool
-}
-
-func NewAuthHandler(conf *AuthHandlerConfig) *AuthHandler {
-	ah := &AuthHandler{
-		// This is buffered so that if we try to output after the sink server
-		// has been shut down, during agent/proxy shutdown, we won't block
-		OutputCh:                     make(chan string, 1),
-		TemplateTokenCh:              make(chan string, 1),
-		ExecTokenCh:                  make(chan string, 1),
-		token:                        conf.Token,
-		logger:                       conf.Logger,
-		client:                       conf.Client,
-		random:                       rand.New(rand.NewSource(int64(time.Now().Nanosecond()))),
-		wrapTTL:                      conf.WrapTTL,
-		minBackoff:                   conf.MinBackoff,
-		maxBackoff:                   conf.MaxBackoff,
-		enableReauthOnNewCredentials: conf.EnableReauthOnNewCredentials,
-		enableTemplateTokenCh:        conf.EnableTemplateTokenCh,
-		enableExecTokenCh:            conf.EnableExecTokenCh,
-		exitOnError:                  conf.ExitOnError,
-		userAgent:                    conf.UserAgent,
-		metricsSignifier:             conf.MetricsSignifier,
-	}
-
-	return ah
-}
-
-func backoff(ctx context.Context, backoff *autoAuthBackoff) bool {
-	if backoff.exitOnErr {
-		return false
-	}
-
-	select {
-	case <-time.After(backoff.current):
-	case <-ctx.Done():
-	}
-
-	// Increase exponential backoff for the next time if we don't
-	// successfully auth/renew/etc.
-	backoff.next()
-	return true
-}
-
-func (ah *AuthHandler) Run(ctx context.Context, am AuthMethod) error {
-	if am == nil {
-		return errors.New("auth handler: nil auth method")
-	}
-
-	if ah.minBackoff <= 0 {
-		ah.minBackoff = defaultMinBackoff
-	}
-
-	backoffCfg := newAutoAuthBackoff(ah.minBackoff, ah.maxBackoff, ah.exitOnError)
-
-	if backoffCfg.min >= backoffCfg.max {
-		return errors.New("auth handler: min_backoff cannot be greater than max_backoff")
-	}
-
-	ah.logger.Info("starting auth handler")
-	defer func() {
-		am.Shutdown()
-		close(ah.OutputCh)
-		close(ah.TemplateTokenCh)
-		close(ah.ExecTokenCh)
-		ah.logger.Info("auth handler stopped")
-	}()
-
-	credCh := am.NewCreds()
-	if !ah.enableReauthOnNewCredentials {
-		realCredCh := credCh
-		credCh = nil
-		if realCredCh != nil {
-			go func() {
-				for {
-					select {
-					case <-ctx.Done():
-						return
-					case <-realCredCh:
-					}
-				}
-			}()
-		}
-	}
-	if credCh == nil {
-		credCh = make(chan struct{})
-	}
-
-	if ah.client != nil {
-		headers := ah.client.Headers()
-		if headers == nil {
-			headers = make(http.Header)
-		}
-		headers.Set("User-Agent", ah.userAgent)
-		ah.client.SetHeaders(headers)
-	}
-
-	var watcher *api.LifetimeWatcher
-	first := true
-
-	for {
-		select {
-		case <-ctx.Done():
-			return nil
-
-		default:
-		}
-
-		var clientToUse *api.Client
-		var err error
-		var path string
-		var data map[string]interface{}
-		var header http.Header
-		var isTokenFileMethod bool
-
-		switch am.(type) {
-		case AuthMethodWithClient:
-			clientToUse, err = am.(AuthMethodWithClient).AuthClient(ah.client)
-			if err != nil {
-				ah.logger.Error("error creating client for authentication call", "error", err, "backoff", backoff)
-				metrics.IncrCounter([]string{ah.metricsSignifier, "auth", "failure"}, 1)
-
-				if backoff(ctx, backoffCfg) {
-					continue
-				}
-
-				return err
-			}
-		default:
-			clientToUse = ah.client
-		}
-
-		// Disable retry on the client to ensure our backoffOrQuit function is
-		// the only source of retry/backoff.
-		clientToUse.SetMaxRetries(0)
-
-		var secret *api.Secret = new(api.Secret)
-		if first && ah.token != "" {
-			ah.logger.Debug("using preloaded token")
-
-			first = false
-			ah.logger.Debug("lookup-self with preloaded token")
-			clientToUse.SetToken(ah.token)
-
-			secret, err = clientToUse.Auth().Token().LookupSelfWithContext(ctx)
-			if err != nil {
-				ah.logger.Error("could not look up token", "err", err, "backoff", backoffCfg)
-				metrics.IncrCounter([]string{ah.metricsSignifier, "auth", "failure"}, 1)
-
-				if backoff(ctx, backoffCfg) {
-					continue
-				}
-				return err
-			}
-
-			duration, _ := secret.Data["ttl"].(json.Number).Int64()
-			secret.Auth = &api.SecretAuth{
-				ClientToken:   secret.Data["id"].(string),
-				LeaseDuration: int(duration),
-				Renewable:     secret.Data["renewable"].(bool),
-			}
-		} else {
-			ah.logger.Info("authenticating")
-
-			path, header, data, err = am.Authenticate(ctx, ah.client)
-			if err != nil {
-				ah.logger.Error("error getting path or data from method", "error", err, "backoff", backoffCfg)
-				metrics.IncrCounter([]string{ah.metricsSignifier, "auth", "failure"}, 1)
-
-				if backoff(ctx, backoffCfg) {
-					continue
-				}
-				return err
-			}
-		}
-
-		if ah.wrapTTL > 0 {
-			wrapClient, err := clientToUse.Clone()
-			if err != nil {
-				ah.logger.Error("error creating client for wrapped call", "error", err, "backoff", backoffCfg)
-				metrics.IncrCounter([]string{ah.metricsSignifier, "auth", "failure"}, 1)
-
-				if backoff(ctx, backoffCfg) {
-					continue
-				}
-				return err
-			}
-			wrapClient.SetWrappingLookupFunc(func(string, string) string {
-				return ah.wrapTTL.String()
-			})
-			clientToUse = wrapClient
-		}
-		for key, values := range header {
-			for _, value := range values {
-				clientToUse.AddHeader(key, value)
-			}
-		}
-
-		// This should only happen if there's no preloaded token (regular auto-auth login)
-		// or if a preloaded token has expired and is now switching to auto-auth.
-		if secret.Auth == nil {
-			isTokenFileMethod = path == "auth/token/lookup-self"
-			if isTokenFileMethod {
-				token, _ := data["token"].(string)
-				lookupSelfClient, err := clientToUse.Clone()
-				if err != nil {
-					ah.logger.Error("failed to clone client to perform token lookup")
-					return err
-				}
-				lookupSelfClient.SetToken(token)
-				secret, err = lookupSelfClient.Auth().Token().LookupSelf()
-			} else {
-				secret, err = clientToUse.Logical().WriteWithContext(ctx, path, data)
-			}
-
-			// Check errors/sanity
-			if err != nil {
-				ah.logger.Error("error authenticating", "error", err, "backoff", backoffCfg)
-				metrics.IncrCounter([]string{ah.metricsSignifier, "auth", "failure"}, 1)
-
-				if backoff(ctx, backoffCfg) {
-					continue
-				}
-				return err
-			}
-		}
-
-		var leaseDuration int
-
-		switch {
-		case ah.wrapTTL > 0:
-			if secret.WrapInfo == nil {
-				ah.logger.Error("authentication returned nil wrap info", "backoff", backoffCfg)
-				metrics.IncrCounter([]string{ah.metricsSignifier, "auth", "failure"}, 1)
-
-				if backoff(ctx, backoffCfg) {
-					continue
-				}
-				return err
-			}
-			if secret.WrapInfo.Token == "" {
-				ah.logger.Error("authentication returned empty wrapped client token", "backoff", backoffCfg)
-				metrics.IncrCounter([]string{ah.metricsSignifier, "auth", "failure"}, 1)
-
-				if backoff(ctx, backoffCfg) {
-					continue
-				}
-				return err
-			}
-			wrappedResp, err := jsonutil.EncodeJSON(secret.WrapInfo)
-			if err != nil {
-				ah.logger.Error("failed to encode wrapinfo", "error", err, "backoff", backoffCfg)
-				metrics.IncrCounter([]string{ah.metricsSignifier, "auth", "failure"}, 1)
-
-				if backoff(ctx, backoffCfg) {
-					continue
-				}
-				return err
-			}
-			ah.logger.Info("authentication successful, sending wrapped token to sinks and pausing")
-			ah.OutputCh <- string(wrappedResp)
-			if ah.enableTemplateTokenCh {
-				ah.TemplateTokenCh <- string(wrappedResp)
-			}
-			if ah.enableExecTokenCh {
-				ah.ExecTokenCh <- string(wrappedResp)
-			}
-
-			am.CredSuccess()
-			backoffCfg.reset()
-
-			select {
-			case <-ctx.Done():
-				ah.logger.Info("shutdown triggered")
-				continue
-
-			case <-credCh:
-				ah.logger.Info("auth method found new credentials, re-authenticating")
-				continue
-			}
-
-		default:
-			// We handle the token_file method specially, as it's the only
-			// auth method that isn't actually authenticating, i.e. the secret
-			// returned does not have an Auth struct attached
-			isTokenFileMethod := path == "auth/token/lookup-self"
-			if isTokenFileMethod {
-				// We still check the response of the request to ensure the token is valid
-				// i.e. if the token is invalid, we will fail in the authentication step
-				if secret == nil || secret.Data == nil {
-					ah.logger.Error("token file validation failed, token may be invalid", "backoff", backoffCfg)
-					metrics.IncrCounter([]string{ah.metricsSignifier, "auth", "failure"}, 1)
-
-					if backoff(ctx, backoffCfg) {
-						continue
-					}
-					return err
-				}
-				token, ok := secret.Data["id"].(string)
-				if !ok || token == "" {
-					ah.logger.Error("token file validation returned empty client token", "backoff", backoffCfg)
-					metrics.IncrCounter([]string{ah.metricsSignifier, "auth", "failure"}, 1)
-
-					if backoff(ctx, backoffCfg) {
-						continue
-					}
-					return err
-				}
-
-				duration, _ := secret.Data["ttl"].(json.Number).Int64()
-				leaseDuration = int(duration)
-				renewable, _ := secret.Data["renewable"].(bool)
-				secret.Auth = &api.SecretAuth{
-					ClientToken:   token,
-					LeaseDuration: int(duration),
-					Renewable:     renewable,
-				}
-				ah.logger.Info("authentication successful, sending token to sinks")
-				ah.OutputCh <- token
-				if ah.enableTemplateTokenCh {
-					ah.TemplateTokenCh <- token
-				}
-				if ah.enableExecTokenCh {
-					ah.ExecTokenCh <- token
-				}
-
-				tokenType := secret.Data["type"].(string)
-				if tokenType == "batch" {
-					ah.logger.Info("note that this token type is batch, and batch tokens cannot be renewed", "ttl", leaseDuration)
-				}
-			} else {
-				if secret == nil || secret.Auth == nil {
-					ah.logger.Error("authentication returned nil auth info", "backoff", backoffCfg)
-					metrics.IncrCounter([]string{ah.metricsSignifier, "auth", "failure"}, 1)
-
-					if backoff(ctx, backoffCfg) {
-						continue
-					}
-					return err
-				}
-				if secret.Auth.ClientToken == "" {
-					ah.logger.Error("authentication returned empty client token", "backoff", backoffCfg)
-					metrics.IncrCounter([]string{ah.metricsSignifier, "auth", "failure"}, 1)
-
-					if backoff(ctx, backoffCfg) {
-						continue
-					}
-					return err
-				}
-
-				leaseDuration = secret.LeaseDuration
-				ah.logger.Info("authentication successful, sending token to sinks")
-				ah.OutputCh <- secret.Auth.ClientToken
-				if ah.enableTemplateTokenCh {
-					ah.TemplateTokenCh <- secret.Auth.ClientToken
-				}
-				if ah.enableExecTokenCh {
-					ah.ExecTokenCh <- secret.Auth.ClientToken
-				}
-			}
-
-			am.CredSuccess()
-			backoffCfg.reset()
-		}
-
-		if watcher != nil {
-			watcher.Stop()
-		}
-
-		watcher, err = clientToUse.NewLifetimeWatcher(&api.LifetimeWatcherInput{
-			Secret: secret,
-		})
-		if err != nil {
-			ah.logger.Error("error creating lifetime watcher", "error", err, "backoff", backoffCfg)
-			metrics.IncrCounter([]string{ah.metricsSignifier, "auth", "failure"}, 1)
-
-			if backoff(ctx, backoffCfg) {
-				continue
-			}
-			return err
-		}
-
-		metrics.IncrCounter([]string{ah.metricsSignifier, "auth", "success"}, 1)
-		// We don't want to trigger the renewal process for tokens with
-		// unlimited TTL, such as the root token.
-		if leaseDuration == 0 && isTokenFileMethod {
-			ah.logger.Info("not starting token renewal process, as token has unlimited TTL")
-		} else {
-			ah.logger.Info("starting renewal process")
-			go watcher.Renew()
-		}
-
-	LifetimeWatcherLoop:
-		for {
-			select {
-			case <-ctx.Done():
-				ah.logger.Info("shutdown triggered, stopping lifetime watcher")
-				watcher.Stop()
-				break LifetimeWatcherLoop
-
-			case err := <-watcher.DoneCh():
-				ah.logger.Info("lifetime watcher done channel triggered")
-				if err != nil {
-					metrics.IncrCounter([]string{ah.metricsSignifier, "auth", "failure"}, 1)
-					ah.logger.Error("error renewing token", "error", err)
-				}
-				break LifetimeWatcherLoop
-
-			case <-watcher.RenewCh():
-				metrics.IncrCounter([]string{ah.metricsSignifier, "auth", "success"}, 1)
-				ah.logger.Info("renewed auth token")
-
-			case <-credCh:
-				ah.logger.Info("auth method found new credentials, re-authenticating")
-				break LifetimeWatcherLoop
-			}
-		}
-	}
-}
-
-// autoAuthBackoff tracks exponential backoff state.
-type autoAuthBackoff struct {
-	min       time.Duration
-	max       time.Duration
-	current   time.Duration
-	exitOnErr bool
-}
-
-func newAutoAuthBackoff(min, max time.Duration, exitErr bool) *autoAuthBackoff {
-	if max <= 0 {
-		max = defaultMaxBackoff
-	}
-
-	if min <= 0 {
-		min = defaultMinBackoff
-	}
-
-	return &autoAuthBackoff{
-		current:   min,
-		max:       max,
-		min:       min,
-		exitOnErr: exitErr,
-	}
-}
-
-// next determines the next backoff duration that is roughly twice
-// the current value, capped to a max value, with a measure of randomness.
-func (b *autoAuthBackoff) next() {
-	maxBackoff := 2 * b.current
-
-	if maxBackoff > b.max {
-		maxBackoff = b.max
-	}
-
-	// Trim a random amount (0-25%) off the doubled duration
-	trim := rand.Int63n(int64(maxBackoff) / 4)
-	b.current = maxBackoff - time.Duration(trim)
-}
-
-func (b *autoAuthBackoff) reset() {
-	b.current = b.min
-}
-
-func (b autoAuthBackoff) String() string {
-	return b.current.Truncate(10 * time.Millisecond).String()
-}
diff --git a/command/agentproxyshared/auth/cert/cert.go b/command/agentproxyshared/auth/cert/cert.go
deleted file mode 100644
index 5270dcb1b4a27..0000000000000
--- a/command/agentproxyshared/auth/cert/cert.go
+++ /dev/null
@@ -1,158 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package cert
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"net/http"
-
-	"github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/command/agentproxyshared/auth"
-	"github.com/hashicorp/vault/sdk/helper/consts"
-)
-
-type certMethod struct {
-	logger    hclog.Logger
-	mountPath string
-	name      string
-
-	caCert     string
-	clientCert string
-	clientKey  string
-	reload     bool
-
-	// Client is the cached client to use if cert info was provided.
-	client *api.Client
-}
-
-var _ auth.AuthMethodWithClient = &certMethod{}
-
-func NewCertAuthMethod(conf *auth.AuthConfig) (auth.AuthMethod, error) {
-	if conf == nil {
-		return nil, errors.New("empty config")
-	}
-
-	// Not concerned if the conf.Config is empty as the 'name'
-	// parameter is optional when using TLS Auth
-
-	c := &certMethod{
-		logger:    conf.Logger,
-		mountPath: conf.MountPath,
-	}
-
-	if conf.Config != nil {
-		nameRaw, ok := conf.Config["name"]
-		if !ok {
-			nameRaw = ""
-		}
-		c.name, ok = nameRaw.(string)
-		if !ok {
-			return nil, errors.New("could not convert 'name' config value to string")
-		}
-
-		caCertRaw, ok := conf.Config["ca_cert"]
-		if ok {
-			c.caCert, ok = caCertRaw.(string)
-			if !ok {
-				return nil, errors.New("could not convert 'ca_cert' config value to string")
-			}
-		}
-
-		clientCertRaw, ok := conf.Config["client_cert"]
-		if ok {
-			c.clientCert, ok = clientCertRaw.(string)
-			if !ok {
-				return nil, errors.New("could not convert 'cert_file' config value to string")
-			}
-		}
-
-		clientKeyRaw, ok := conf.Config["client_key"]
-		if ok {
-			c.clientKey, ok = clientKeyRaw.(string)
-			if !ok {
-				return nil, errors.New("could not convert 'cert_key' config value to string")
-			}
-		}
-
-		reload, ok := conf.Config["reload"]
-		if ok {
-			c.reload, ok = reload.(bool)
-			if !ok {
-				return nil, errors.New("could not convert 'reload' config value to bool")
-			}
-		}
-	}
-
-	return c, nil
-}
-
-func (c *certMethod) Authenticate(_ context.Context, client *api.Client) (string, http.Header, map[string]interface{}, error) {
-	c.logger.Trace("beginning authentication")
-
-	authMap := map[string]interface{}{}
-
-	if c.name != "" {
-		authMap["name"] = c.name
-	}
-
-	return fmt.Sprintf("%s/login", c.mountPath), nil, authMap, nil
-}
-
-func (c *certMethod) NewCreds() chan struct{} {
-	return nil
-}
-
-func (c *certMethod) CredSuccess() {}
-
-func (c *certMethod) Shutdown() {}
-
-// AuthClient uses the existing client's address and returns a new client with
-// the auto-auth method's certificate information if that's provided in its
-// config map.
-func (c *certMethod) AuthClient(client *api.Client) (*api.Client, error) {
-	c.logger.Trace("deriving auth client to use")
-
-	clientToAuth := client
-
-	if c.caCert != "" || (c.clientKey != "" && c.clientCert != "") {
-		// Return cached client if present
-		if c.client != nil && !c.reload {
-			return c.client, nil
-		}
-
-		config := api.DefaultConfig()
-		if config.Error != nil {
-			return nil, config.Error
-		}
-		config.Address = client.Address()
-
-		t := &api.TLSConfig{
-			CACert:     c.caCert,
-			ClientCert: c.clientCert,
-			ClientKey:  c.clientKey,
-		}
-
-		// Setup TLS config
-		if err := config.ConfigureTLS(t); err != nil {
-			return nil, err
-		}
-
-		var err error
-		clientToAuth, err = api.NewClient(config)
-		if err != nil {
-			return nil, err
-		}
-		if ns := client.Headers().Get(consts.NamespaceHeaderName); ns != "" {
-			clientToAuth.SetNamespace(ns)
-		}
-
-		// Cache the client for future use
-		c.client = clientToAuth
-	}
-
-	return clientToAuth, nil
-}
diff --git a/command/agentproxyshared/auth/cert/cert_test.go b/command/agentproxyshared/auth/cert/cert_test.go
deleted file mode 100644
index 43a5f83f4c29d..0000000000000
--- a/command/agentproxyshared/auth/cert/cert_test.go
+++ /dev/null
@@ -1,191 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package cert
-
-import (
-	"context"
-	"os"
-	"path"
-	"reflect"
-	"testing"
-
-	"github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/command/agentproxyshared/auth"
-)
-
-func TestCertAuthMethod_Authenticate(t *testing.T) {
-	config := &auth.AuthConfig{
-		Logger:    hclog.NewNullLogger(),
-		MountPath: "cert-test",
-		Config: map[string]interface{}{
-			"name": "foo",
-		},
-	}
-
-	method, err := NewCertAuthMethod(config)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	client, err := api.NewClient(nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	loginPath, _, authMap, err := method.Authenticate(context.Background(), client)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	expectedLoginPath := path.Join(config.MountPath, "/login")
-	if loginPath != expectedLoginPath {
-		t.Fatalf("mismatch on login path: got: %s, expected: %s", loginPath, expectedLoginPath)
-	}
-
-	expectedAuthMap := map[string]interface{}{
-		"name": config.Config["name"],
-	}
-	if !reflect.DeepEqual(authMap, expectedAuthMap) {
-		t.Fatalf("mismatch on login path:\ngot:\n\t%v\nexpected:\n\t%v", authMap, expectedAuthMap)
-	}
-}
-
-func TestCertAuthMethod_AuthClient_withoutCerts(t *testing.T) {
-	config := &auth.AuthConfig{
-		Logger:    hclog.NewNullLogger(),
-		MountPath: "cert-test",
-		Config: map[string]interface{}{
-			"name": "without-certs",
-		},
-	}
-
-	method, err := NewCertAuthMethod(config)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	client, err := api.NewClient(api.DefaultConfig())
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	clientToUse, err := method.(auth.AuthMethodWithClient).AuthClient(client)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if client != clientToUse {
-		t.Fatal("error: expected AuthClient to return back original client")
-	}
-}
-
-func TestCertAuthMethod_AuthClient_withCerts(t *testing.T) {
-	clientCert, err := os.Open("./test-fixtures/keys/cert.pem")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer clientCert.Close()
-
-	clientKey, err := os.Open("./test-fixtures/keys/key.pem")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer clientKey.Close()
-
-	config := &auth.AuthConfig{
-		Logger:    hclog.NewNullLogger(),
-		MountPath: "cert-test",
-		Config: map[string]interface{}{
-			"name":        "with-certs",
-			"client_cert": clientCert.Name(),
-			"client_key":  clientKey.Name(),
-		},
-	}
-
-	method, err := NewCertAuthMethod(config)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	client, err := api.NewClient(nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	clientToUse, err := method.(auth.AuthMethodWithClient).AuthClient(client)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if client == clientToUse {
-		t.Fatal("expected client from AuthClient to be different from original client")
-	}
-
-	// Call AuthClient again to get back the cached client
-	cachedClient, err := method.(auth.AuthMethodWithClient).AuthClient(client)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if cachedClient != clientToUse {
-		t.Fatal("expected client from AuthClient to return back a cached client")
-	}
-}
-
-func TestCertAuthMethod_AuthClient_withCertsReload(t *testing.T) {
-	clientCert, err := os.Open("./test-fixtures/keys/cert.pem")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	defer clientCert.Close()
-
-	clientKey, err := os.Open("./test-fixtures/keys/key.pem")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	defer clientKey.Close()
-
-	config := &auth.AuthConfig{
-		Logger:    hclog.NewNullLogger(),
-		MountPath: "cert-test",
-		Config: map[string]interface{}{
-			"name":        "with-certs-reloaded",
-			"client_cert": clientCert.Name(),
-			"client_key":  clientKey.Name(),
-			"reload":      true,
-		},
-	}
-
-	method, err := NewCertAuthMethod(config)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	client, err := api.NewClient(nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	clientToUse, err := method.(auth.AuthMethodWithClient).AuthClient(client)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if client == clientToUse {
-		t.Fatal("expected client from AuthClient to be different from original client")
-	}
-
-	// Call AuthClient again to get back a new client with reloaded certificates
-	reloadedClient, err := method.(auth.AuthMethodWithClient).AuthClient(client)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if reloadedClient == clientToUse {
-		t.Fatal("expected client from AuthClient to return back a new client")
-	}
-}
diff --git a/command/agentproxyshared/auth/jwt/jwt.go b/command/agentproxyshared/auth/jwt/jwt.go
deleted file mode 100644
index fa878274344ff..0000000000000
--- a/command/agentproxyshared/auth/jwt/jwt.go
+++ /dev/null
@@ -1,260 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package jwt
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"io/fs"
-	"net/http"
-	"os"
-	"path/filepath"
-	"sync"
-	"sync/atomic"
-	"time"
-
-	hclog "github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/command/agentproxyshared/auth"
-	"github.com/hashicorp/vault/sdk/helper/parseutil"
-)
-
-type jwtMethod struct {
-	logger                   hclog.Logger
-	path                     string
-	mountPath                string
-	role                     string
-	removeJWTAfterReading    bool
-	removeJWTFollowsSymlinks bool
-	credsFound               chan struct{}
-	watchCh                  chan string
-	stopCh                   chan struct{}
-	doneCh                   chan struct{}
-	credSuccessGate          chan struct{}
-	ticker                   *time.Ticker
-	once                     *sync.Once
-	latestToken              *atomic.Value
-}
-
-// NewJWTAuthMethod returns an implementation of Agent's auth.AuthMethod
-// interface for JWT auth.
-func NewJWTAuthMethod(conf *auth.AuthConfig) (auth.AuthMethod, error) {
-	if conf == nil {
-		return nil, errors.New("empty config")
-	}
-	if conf.Config == nil {
-		return nil, errors.New("empty config data")
-	}
-
-	j := &jwtMethod{
-		logger:                conf.Logger,
-		mountPath:             conf.MountPath,
-		removeJWTAfterReading: true,
-		credsFound:            make(chan struct{}),
-		watchCh:               make(chan string),
-		stopCh:                make(chan struct{}),
-		doneCh:                make(chan struct{}),
-		credSuccessGate:       make(chan struct{}),
-		once:                  new(sync.Once),
-		latestToken:           new(atomic.Value),
-	}
-	j.latestToken.Store("")
-
-	pathRaw, ok := conf.Config["path"]
-	if !ok {
-		return nil, errors.New("missing 'path' value")
-	}
-	j.path, ok = pathRaw.(string)
-	if !ok {
-		return nil, errors.New("could not convert 'path' config value to string")
-	}
-
-	roleRaw, ok := conf.Config["role"]
-	if !ok {
-		return nil, errors.New("missing 'role' value")
-	}
-	j.role, ok = roleRaw.(string)
-	if !ok {
-		return nil, errors.New("could not convert 'role' config value to string")
-	}
-
-	if removeJWTAfterReadingRaw, ok := conf.Config["remove_jwt_after_reading"]; ok {
-		removeJWTAfterReading, err := parseutil.ParseBool(removeJWTAfterReadingRaw)
-		if err != nil {
-			return nil, fmt.Errorf("error parsing 'remove_jwt_after_reading' value: %w", err)
-		}
-		j.removeJWTAfterReading = removeJWTAfterReading
-	}
-
-	if removeJWTFollowsSymlinksRaw, ok := conf.Config["remove_jwt_follows_symlinks"]; ok {
-		removeJWTFollowsSymlinks, err := parseutil.ParseBool(removeJWTFollowsSymlinksRaw)
-		if err != nil {
-			return nil, fmt.Errorf("error parsing 'remove_jwt_follows_symlinks' value: %w", err)
-		}
-		j.removeJWTFollowsSymlinks = removeJWTFollowsSymlinks
-	}
-
-	switch {
-	case j.path == "":
-		return nil, errors.New("'path' value is empty")
-	case j.role == "":
-		return nil, errors.New("'role' value is empty")
-	}
-
-	// Default readPeriod
-	readPeriod := 1 * time.Minute
-
-	if jwtReadPeriodRaw, ok := conf.Config["jwt_read_period"]; ok {
-		jwtReadPeriod, err := parseutil.ParseDurationSecond(jwtReadPeriodRaw)
-		if err != nil {
-			return nil, fmt.Errorf("error parsing 'jwt_read_period' value: %w", err)
-		}
-		readPeriod = jwtReadPeriod
-	} else {
-		// If we don't delete the JWT after reading, use a slower reload period,
-		// otherwise we would re-read the whole file every 500ms, instead of just
-		// doing a stat on the file every 500ms.
-		if j.removeJWTAfterReading {
-			readPeriod = 500 * time.Millisecond
-		}
-	}
-
-	j.ticker = time.NewTicker(readPeriod)
-
-	go j.runWatcher()
-
-	j.logger.Info("jwt auth method created", "path", j.path)
-
-	return j, nil
-}
-
-func (j *jwtMethod) Authenticate(_ context.Context, _ *api.Client) (string, http.Header, map[string]interface{}, error) {
-	j.logger.Trace("beginning authentication")
-
-	j.ingressToken()
-
-	latestToken := j.latestToken.Load().(string)
-	if latestToken == "" {
-		return "", nil, nil, errors.New("latest known jwt is empty, cannot authenticate")
-	}
-
-	return fmt.Sprintf("%s/login", j.mountPath), nil, map[string]interface{}{
-		"role": j.role,
-		"jwt":  latestToken,
-	}, nil
-}
-
-func (j *jwtMethod) NewCreds() chan struct{} {
-	return j.credsFound
-}
-
-func (j *jwtMethod) CredSuccess() {
-	j.once.Do(func() {
-		close(j.credSuccessGate)
-	})
-}
-
-func (j *jwtMethod) Shutdown() {
-	j.ticker.Stop()
-	close(j.stopCh)
-	<-j.doneCh
-}
-
-func (j *jwtMethod) runWatcher() {
-	defer close(j.doneCh)
-
-	select {
-	case <-j.stopCh:
-		return
-
-	case <-j.credSuccessGate:
-		// We only start the next loop once we're initially successful,
-		// since at startup Authenticate will be called, and we don't want
-		// to end up immediately re-authenticating by having found a new
-		// value
-	}
-
-	for {
-		select {
-		case <-j.stopCh:
-			return
-
-		case <-j.ticker.C:
-			latestToken := j.latestToken.Load().(string)
-			j.ingressToken()
-			newToken := j.latestToken.Load().(string)
-			if newToken != latestToken {
-				j.logger.Debug("new jwt file found")
-				j.credsFound <- struct{}{}
-			}
-		}
-	}
-}
-
-func (j *jwtMethod) ingressToken() {
-	fi, err := os.Lstat(j.path)
-	if err != nil {
-		if os.IsNotExist(err) {
-			return
-		}
-		j.logger.Error("error encountered stat'ing jwt file", "error", err)
-		return
-	}
-
-	// Check that the path refers to a file.
-	// If it's a symlink, it could still be a symlink to a directory,
-	// but os.ReadFile below will return a descriptive error.
-	evalSymlinkPath := j.path
-	switch mode := fi.Mode(); {
-	case mode.IsRegular():
-		// regular file
-	case mode&fs.ModeSymlink != 0:
-		// If our file path is a symlink, we should also return early (like above) without error
-		// if the file that is linked to is not present, otherwise we will error when trying
-		// to read that file by following the link in the os.ReadFile call.
-		evalSymlinkPath, err = filepath.EvalSymlinks(j.path)
-		if err != nil {
-			j.logger.Error("error encountered evaluating symlinks", "error", err)
-			return
-		}
-		_, err := os.Stat(evalSymlinkPath)
-		if err != nil {
-			if os.IsNotExist(err) {
-				return
-			}
-			j.logger.Error("error encountered stat'ing jwt file after evaluating symlinks", "error", err)
-			return
-		}
-	default:
-		j.logger.Error("jwt file is not a regular file or symlink")
-		return
-	}
-
-	token, err := os.ReadFile(j.path)
-	if err != nil {
-		j.logger.Error("failed to read jwt file", "error", err)
-		return
-	}
-
-	switch len(token) {
-	case 0:
-		j.logger.Warn("empty jwt file read")
-
-	default:
-		j.latestToken.Store(string(token))
-	}
-
-	if j.removeJWTAfterReading {
-		pathToRemove := j.path
-		if j.removeJWTFollowsSymlinks {
-			// If removeJWTFollowsSymlinks is set, we follow the symlink and delete the jwt,
-			// not just the symlink that links to the jwt
-			pathToRemove = evalSymlinkPath
-		}
-		if err := os.Remove(pathToRemove); err != nil {
-			j.logger.Error("error removing jwt file", "error", err)
-		}
-	}
-}
diff --git a/command/agentproxyshared/auth/jwt/jwt_test.go b/command/agentproxyshared/auth/jwt/jwt_test.go
deleted file mode 100644
index 3e0db40902478..0000000000000
--- a/command/agentproxyshared/auth/jwt/jwt_test.go
+++ /dev/null
@@ -1,262 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package jwt
-
-import (
-	"bytes"
-	"os"
-	"path"
-	"strings"
-	"sync/atomic"
-	"testing"
-
-	"github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/vault/command/agentproxyshared/auth"
-)
-
-func TestIngressToken(t *testing.T) {
-	const (
-		dir       = "dir"
-		file      = "file"
-		empty     = "empty"
-		missing   = "missing"
-		symlinked = "symlinked"
-	)
-
-	rootDir, err := os.MkdirTemp("", "vault-agent-jwt-auth-test")
-	if err != nil {
-		t.Fatalf("failed to create temp dir: %s", err)
-	}
-	defer os.RemoveAll(rootDir)
-
-	setupTestDir := func() string {
-		testDir, err := os.MkdirTemp(rootDir, "")
-		if err != nil {
-			t.Fatal(err)
-		}
-		err = os.WriteFile(path.Join(testDir, file), []byte("test"), 0o644)
-		if err != nil {
-			t.Fatal(err)
-		}
-		_, err = os.Create(path.Join(testDir, empty))
-		if err != nil {
-			t.Fatal(err)
-		}
-		err = os.Mkdir(path.Join(testDir, dir), 0o755)
-		if err != nil {
-			t.Fatal(err)
-		}
-		err = os.Symlink(path.Join(testDir, file), path.Join(testDir, symlinked))
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		return testDir
-	}
-
-	for _, tc := range []struct {
-		name      string
-		path      string
-		errString string
-	}{
-		{
-			"happy path",
-			file,
-			"",
-		},
-		{
-			"path is directory",
-			dir,
-			"[ERROR] jwt file is not a regular file or symlink",
-		},
-		{
-			"path is symlink",
-			symlinked,
-			"",
-		},
-		{
-			"path is missing (implies nothing for ingressToken to do)",
-			missing,
-			"",
-		},
-		{
-			"path is empty file",
-			empty,
-			"[WARN]  empty jwt file read",
-		},
-	} {
-		testDir := setupTestDir()
-		logBuffer := bytes.Buffer{}
-		jwtAuth := &jwtMethod{
-			logger: hclog.New(&hclog.LoggerOptions{
-				Output: &logBuffer,
-			}),
-			latestToken: new(atomic.Value),
-			path:        path.Join(testDir, tc.path),
-		}
-
-		jwtAuth.ingressToken()
-
-		if tc.errString != "" {
-			if !strings.Contains(logBuffer.String(), tc.errString) {
-				t.Fatal("logs did no contain expected error", tc.errString, logBuffer.String())
-			}
-		} else {
-			if strings.Contains(logBuffer.String(), "[ERROR]") || strings.Contains(logBuffer.String(), "[WARN]") {
-				t.Fatal("logs contained unexpected error", logBuffer.String())
-			}
-		}
-	}
-}
-
-func TestDeleteAfterReading(t *testing.T) {
-	for _, tc := range map[string]struct {
-		configValue  string
-		shouldDelete bool
-	}{
-		"default": {
-			"",
-			true,
-		},
-		"explicit true": {
-			"true",
-			true,
-		},
-		"false": {
-			"false",
-			false,
-		},
-	} {
-		rootDir, err := os.MkdirTemp("", "vault-agent-jwt-auth-test")
-		if err != nil {
-			t.Fatalf("failed to create temp dir: %s", err)
-		}
-		defer os.RemoveAll(rootDir)
-		tokenPath := path.Join(rootDir, "token")
-		err = os.WriteFile(tokenPath, []byte("test"), 0o644)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		config := &auth.AuthConfig{
-			Config: map[string]interface{}{
-				"path": tokenPath,
-				"role": "unusedrole",
-			},
-			Logger: hclog.Default(),
-		}
-		if tc.configValue != "" {
-			config.Config["remove_jwt_after_reading"] = tc.configValue
-		}
-
-		jwtAuth, err := NewJWTAuthMethod(config)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		jwtAuth.(*jwtMethod).ingressToken()
-
-		if _, err := os.Lstat(tokenPath); tc.shouldDelete {
-			if err == nil || !os.IsNotExist(err) {
-				t.Fatal(err)
-			}
-		} else {
-			if err != nil {
-				t.Fatal(err)
-			}
-		}
-	}
-}
-
-func TestDeleteAfterReadingSymlink(t *testing.T) {
-	for _, tc := range map[string]struct {
-		configValue              string
-		shouldDelete             bool
-		removeJWTFollowsSymlinks bool
-	}{
-		"default": {
-			"",
-			true,
-			false,
-		},
-		"explicit true": {
-			"true",
-			true,
-			false,
-		},
-		"false": {
-			"false",
-			false,
-			false,
-		},
-		"default + removeJWTFollowsSymlinks": {
-			"",
-			true,
-			true,
-		},
-		"explicit true + removeJWTFollowsSymlinks": {
-			"true",
-			true,
-			true,
-		},
-		"false + removeJWTFollowsSymlinks": {
-			"false",
-			false,
-			true,
-		},
-	} {
-		rootDir, err := os.MkdirTemp("", "vault-agent-jwt-auth-test")
-		if err != nil {
-			t.Fatalf("failed to create temp dir: %s", err)
-		}
-		defer os.RemoveAll(rootDir)
-		tokenPath := path.Join(rootDir, "token")
-		err = os.WriteFile(tokenPath, []byte("test"), 0o644)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		symlink, err := os.CreateTemp("", "auth.jwt.symlink.test.")
-		if err != nil {
-			t.Fatal(err)
-		}
-		symlinkName := symlink.Name()
-		symlink.Close()
-		os.Remove(symlinkName)
-		os.Symlink(tokenPath, symlinkName)
-
-		config := &auth.AuthConfig{
-			Config: map[string]interface{}{
-				"path": symlinkName,
-				"role": "unusedrole",
-			},
-			Logger: hclog.Default(),
-		}
-		if tc.configValue != "" {
-			config.Config["remove_jwt_after_reading"] = tc.configValue
-		}
-		config.Config["remove_jwt_follows_symlinks"] = tc.removeJWTFollowsSymlinks
-
-		jwtAuth, err := NewJWTAuthMethod(config)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		jwtAuth.(*jwtMethod).ingressToken()
-
-		pathToCheck := symlinkName
-		if tc.removeJWTFollowsSymlinks {
-			pathToCheck = tokenPath
-		}
-		if _, err := os.Lstat(pathToCheck); tc.shouldDelete {
-			if err == nil || !os.IsNotExist(err) {
-				t.Fatal(err)
-			}
-		} else {
-			if err != nil {
-				t.Fatal(err)
-			}
-		}
-	}
-}
diff --git a/command/agentproxyshared/auth/oci/oci.go b/command/agentproxyshared/auth/oci/oci.go
deleted file mode 100644
index ec4d9ebf750b5..0000000000000
--- a/command/agentproxyshared/auth/oci/oci.go
+++ /dev/null
@@ -1,265 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package oci
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"net/http"
-	"net/url"
-	"os"
-	"os/user"
-	"path"
-	"sync"
-	"time"
-
-	"github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/go-secure-stdlib/parseutil"
-	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/command/agentproxyshared/auth"
-	"github.com/oracle/oci-go-sdk/common"
-	ociAuth "github.com/oracle/oci-go-sdk/common/auth"
-)
-
-const (
-	typeAPIKey   = "apikey"
-	typeInstance = "instance"
-
-	/*
-
-		IAM creds can be inferred from instance metadata or the container
-		identity service, and those creds expire at varying intervals with
-		new creds becoming available at likewise varying intervals. Let's
-		default to polling once a minute so all changes can be picked up
-		rather quickly. This is configurable, however.
-
-	*/
-	defaultCredCheckFreqSeconds = 60 * time.Second
-
-	defaultConfigFileName    = "config"
-	defaultConfigDirName     = ".oci"
-	configFilePathEnvVarName = "OCI_CONFIG_FILE"
-	secondaryConfigDirName   = ".oraclebmc"
-)
-
-func NewOCIAuthMethod(conf *auth.AuthConfig, vaultAddress string) (auth.AuthMethod, error) {
-	if conf == nil {
-		return nil, errors.New("empty config")
-	}
-	if conf.Config == nil {
-		return nil, errors.New("empty config data")
-	}
-
-	a := &ociMethod{
-		logger:       conf.Logger,
-		vaultAddress: vaultAddress,
-		mountPath:    conf.MountPath,
-		credsFound:   make(chan struct{}),
-		stopCh:       make(chan struct{}),
-	}
-
-	typeRaw, ok := conf.Config["type"]
-	if !ok {
-		return nil, errors.New("missing 'type' value")
-	}
-	authType, ok := typeRaw.(string)
-	if !ok {
-		return nil, errors.New("could not convert 'type' config value to string")
-	}
-
-	roleRaw, ok := conf.Config["role"]
-	if !ok {
-		return nil, errors.New("missing 'role' value")
-	}
-	a.role, ok = roleRaw.(string)
-	if !ok {
-		return nil, errors.New("could not convert 'role' config value to string")
-	}
-
-	// Check for an optional custom frequency at which we should poll for creds.
-	credCheckFreqSec := defaultCredCheckFreqSeconds
-	if checkFreqRaw, ok := conf.Config["credential_poll_interval"]; ok {
-		checkFreq, err := parseutil.ParseDurationSecond(checkFreqRaw)
-		if err != nil {
-			return nil, fmt.Errorf("could not parse credential_poll_interval: %v", err)
-		}
-		credCheckFreqSec = checkFreq
-	}
-
-	switch {
-	case a.role == "":
-		return nil, errors.New("'role' value is empty")
-	case authType == "":
-		return nil, errors.New("'type' value is empty")
-	case authType != typeAPIKey && authType != typeInstance:
-		return nil, errors.New("'type' value is invalid")
-	case authType == typeAPIKey:
-		defaultConfigFile := getDefaultConfigFilePath()
-		homeFolder := getHomeFolder()
-		secondaryConfigFile := path.Join(homeFolder, secondaryConfigDirName, defaultConfigFileName)
-
-		environmentProvider := common.ConfigurationProviderEnvironmentVariables("OCI", "")
-		defaultFileProvider, _ := common.ConfigurationProviderFromFile(defaultConfigFile, "")
-		secondaryFileProvider, _ := common.ConfigurationProviderFromFile(secondaryConfigFile, "")
-
-		provider, _ := common.ComposingConfigurationProvider([]common.ConfigurationProvider{environmentProvider, defaultFileProvider, secondaryFileProvider})
-		a.configurationProvider = provider
-	case authType == typeInstance:
-		configurationProvider, err := ociAuth.InstancePrincipalConfigurationProvider()
-		if err != nil {
-			return nil, fmt.Errorf("failed to create instance principal configuration provider: %v", err)
-		}
-		a.configurationProvider = configurationProvider
-	}
-
-	// Do an initial population of the creds because we want to err right away if we can't
-	// even get a first set.
-	creds, err := a.configurationProvider.KeyID()
-	if err != nil {
-		return nil, err
-	}
-	a.lastCreds = creds
-
-	go a.pollForCreds(credCheckFreqSec)
-
-	return a, nil
-}
-
-type ociMethod struct {
-	logger       hclog.Logger
-	vaultAddress string
-	mountPath    string
-
-	configurationProvider common.ConfigurationProvider
-	role                  string
-
-	// These are used to share the latest creds safely across goroutines.
-	credLock  sync.Mutex
-	lastCreds string
-
-	// Notifies the outer environment that it should call Authenticate again.
-	credsFound chan struct{}
-
-	// Detects that the outer environment is closing.
-	stopCh chan struct{}
-}
-
-func (a *ociMethod) Authenticate(context.Context, *api.Client) (string, http.Header, map[string]interface{}, error) {
-	a.credLock.Lock()
-	defer a.credLock.Unlock()
-
-	a.logger.Trace("beginning authentication")
-
-	requestPath := fmt.Sprintf("/v1/%s/login/%s", a.mountPath, a.role)
-	requestURL := fmt.Sprintf("%s%s", a.vaultAddress, requestPath)
-
-	request, err := http.NewRequest("GET", requestURL, nil)
-	if err != nil {
-		return "", nil, nil, fmt.Errorf("error creating authentication request: %w", err)
-	}
-
-	request.Header.Set("Date", time.Now().UTC().Format(http.TimeFormat))
-
-	signer := common.DefaultRequestSigner(a.configurationProvider)
-
-	err = signer.Sign(request)
-
-	if err != nil {
-		return "", nil, nil, fmt.Errorf("error signing authentication request: %w", err)
-	}
-
-	parsedVaultAddress, err := url.Parse(a.vaultAddress)
-	if err != nil {
-		return "", nil, nil, fmt.Errorf("unable to parse vault address: %w", err)
-	}
-
-	request.Header.Set("Host", parsedVaultAddress.Host)
-	request.Header.Set("(request-target)", fmt.Sprintf("%s %s", "get", requestPath))
-
-	data := map[string]interface{}{
-		"request_headers": request.Header,
-	}
-
-	return fmt.Sprintf("%s/login/%s", a.mountPath, a.role), nil, data, nil
-}
-
-func (a *ociMethod) NewCreds() chan struct{} {
-	return a.credsFound
-}
-
-func (a *ociMethod) CredSuccess() {}
-
-func (a *ociMethod) Shutdown() {
-	close(a.credsFound)
-	close(a.stopCh)
-}
-
-func (a *ociMethod) pollForCreds(frequency time.Duration) {
-	ticker := time.NewTicker(frequency)
-	defer ticker.Stop()
-	for {
-		select {
-		case <-a.stopCh:
-			a.logger.Trace("shutdown triggered, stopping OCI auth handler")
-			return
-		case <-ticker.C:
-			if err := a.checkCreds(); err != nil {
-				a.logger.Warn("unable to retrieve current creds, retaining last creds", "error", err)
-			}
-		}
-	}
-}
-
-func (a *ociMethod) checkCreds() error {
-	a.credLock.Lock()
-	defer a.credLock.Unlock()
-
-	a.logger.Trace("checking for new credentials")
-	currentCreds, err := a.configurationProvider.KeyID()
-	if err != nil {
-		return err
-	}
-	// These will always have different pointers regardless of whether their
-	// values are identical, hence the use of DeepEqual.
-	if currentCreds == a.lastCreds {
-		a.logger.Trace("credentials are unchanged")
-		return nil
-	}
-	a.lastCreds = currentCreds
-	a.logger.Trace("new credentials detected, triggering Authenticate")
-	a.credsFound <- struct{}{}
-	return nil
-}
-
-func getHomeFolder() string {
-	current, e := user.Current()
-	if e != nil {
-		// Give up and try to return something sensible
-		home, err := os.UserHomeDir()
-		if err != nil {
-			return ""
-		}
-		return home
-	}
-	return current.HomeDir
-}
-
-func getDefaultConfigFilePath() string {
-	homeFolder := getHomeFolder()
-	defaultConfigFile := path.Join(homeFolder, defaultConfigDirName, defaultConfigFileName)
-	if _, err := os.Stat(defaultConfigFile); err == nil {
-		return defaultConfigFile
-	}
-
-	// Read configuration file path from OCI_CONFIG_FILE env var
-	fallbackConfigFile, existed := os.LookupEnv(configFilePathEnvVarName)
-	if !existed {
-		return defaultConfigFile
-	}
-	if _, err := os.Stat(fallbackConfigFile); os.IsNotExist(err) {
-		return defaultConfigFile
-	}
-	return fallbackConfigFile
-}
diff --git a/command/agentproxyshared/auth/token-file/token_file.go b/command/agentproxyshared/auth/token-file/token_file.go
deleted file mode 100644
index 4c7eaa22aba4a..0000000000000
--- a/command/agentproxyshared/auth/token-file/token_file.go
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package token_file
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"net/http"
-	"os"
-	"strings"
-
-	"github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/command/agentproxyshared/auth"
-)
-
-type tokenFileMethod struct {
-	logger    hclog.Logger
-	mountPath string
-
-	cachedToken   string
-	tokenFilePath string
-}
-
-func NewTokenFileAuthMethod(conf *auth.AuthConfig) (auth.AuthMethod, error) {
-	if conf == nil {
-		return nil, errors.New("empty config")
-	}
-	if conf.Config == nil {
-		return nil, errors.New("empty config data")
-	}
-
-	a := &tokenFileMethod{
-		logger:    conf.Logger,
-		mountPath: "auth/token",
-	}
-
-	tokenFilePathRaw, ok := conf.Config["token_file_path"]
-	if !ok {
-		return nil, errors.New("missing 'token_file_path' value")
-	}
-	a.tokenFilePath, ok = tokenFilePathRaw.(string)
-	if !ok {
-		return nil, errors.New("could not convert 'token_file_path' config value to string")
-	}
-	if a.tokenFilePath == "" {
-		return nil, errors.New("'token_file_path' value is empty")
-	}
-
-	return a, nil
-}
-
-func (a *tokenFileMethod) Authenticate(ctx context.Context, client *api.Client) (string, http.Header, map[string]interface{}, error) {
-	token, err := os.ReadFile(a.tokenFilePath)
-	if err != nil {
-		if a.cachedToken == "" {
-			return "", nil, nil, fmt.Errorf("error reading token file and no cached token known: %w", err)
-		}
-		a.logger.Warn("error reading token file", "error", err)
-	}
-	if len(token) == 0 {
-		if a.cachedToken == "" {
-			return "", nil, nil, errors.New("token file empty and no cached token known")
-		}
-		a.logger.Warn("token file exists but read empty value, re-using cached value")
-	} else {
-		a.cachedToken = strings.TrimSpace(string(token))
-	}
-
-	// i.e. auth/token/lookup-self
-	return fmt.Sprintf("%s/lookup-self", a.mountPath), nil, map[string]interface{}{
-		"token": a.cachedToken,
-	}, nil
-}
-
-func (a *tokenFileMethod) NewCreds() chan struct{} {
-	return nil
-}
-
-func (a *tokenFileMethod) CredSuccess() {
-}
-
-func (a *tokenFileMethod) Shutdown() {
-}
diff --git a/command/agentproxyshared/auth/token-file/token_file_test.go b/command/agentproxyshared/auth/token-file/token_file_test.go
deleted file mode 100644
index eb89fc02350e1..0000000000000
--- a/command/agentproxyshared/auth/token-file/token_file_test.go
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package token_file
-
-import (
-	"os"
-	"path/filepath"
-	"testing"
-
-	log "github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/vault/command/agentproxyshared/auth"
-	"github.com/hashicorp/vault/sdk/helper/logging"
-)
-
-func TestNewTokenFileAuthMethodEmptyConfig(t *testing.T) {
-	logger := logging.NewVaultLogger(log.Trace)
-	_, err := NewTokenFileAuthMethod(&auth.AuthConfig{
-		Logger: logger.Named("auth.method"),
-		Config: map[string]interface{}{},
-	})
-	if err == nil {
-		t.Fatal("Expected error due to empty config")
-	}
-}
-
-func TestNewTokenFileEmptyFilePath(t *testing.T) {
-	logger := logging.NewVaultLogger(log.Trace)
-	_, err := NewTokenFileAuthMethod(&auth.AuthConfig{
-		Logger: logger.Named("auth.method"),
-		Config: map[string]interface{}{
-			"token_file_path": "",
-		},
-	})
-	if err == nil {
-		t.Fatalf("Expected error when giving empty file path")
-	}
-}
-
-func TestNewTokenFileAuthenticate(t *testing.T) {
-	tokenFile, err := os.Create(filepath.Join(t.TempDir(), "token_file"))
-	tokenFileContents := "super-secret-token"
-	if err != nil {
-		t.Fatal(err)
-	}
-	tokenFileName := tokenFile.Name()
-	tokenFile.Close() // WriteFile doesn't need it open
-	os.WriteFile(tokenFileName, []byte(tokenFileContents), 0o666)
-	defer os.Remove(tokenFileName)
-
-	logger := logging.NewVaultLogger(log.Trace)
-	am, err := NewTokenFileAuthMethod(&auth.AuthConfig{
-		Logger: logger.Named("auth.method"),
-		Config: map[string]interface{}{
-			"token_file_path": tokenFileName,
-		},
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	path, headers, data, err := am.Authenticate(nil, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if path != "auth/token/lookup-self" {
-		t.Fatalf("Incorrect path, was %s", path)
-	}
-	if headers != nil {
-		t.Fatalf("Expected no headers, instead got %v", headers)
-	}
-	if data == nil {
-		t.Fatal("Data was nil")
-	}
-	tokenDataFromAuthMethod := data["token"].(string)
-	if tokenDataFromAuthMethod != tokenFileContents {
-		t.Fatalf("Incorrect token file contents return by auth method, expected %s, got %s", tokenFileContents, tokenDataFromAuthMethod)
-	}
-
-	_, err = os.Stat(tokenFileName)
-	if err != nil {
-		t.Fatal("Token file removed")
-	}
-}
diff --git a/command/agentproxyshared/cache/api_proxy.go b/command/agentproxyshared/cache/api_proxy.go
deleted file mode 100644
index e03bc1570b3c6..0000000000000
--- a/command/agentproxyshared/cache/api_proxy.go
+++ /dev/null
@@ -1,174 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package cache
-
-import (
-	"context"
-	"fmt"
-	gohttp "net/http"
-	"sync"
-
-	hclog "github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/go-retryablehttp"
-	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/http"
-)
-
-type EnforceConsistency int
-
-const (
-	EnforceConsistencyNever EnforceConsistency = iota
-	EnforceConsistencyAlways
-)
-
-type WhenInconsistentAction int
-
-const (
-	WhenInconsistentFail WhenInconsistentAction = iota
-	WhenInconsistentRetry
-	WhenInconsistentForward
-)
-
-// APIProxy is an implementation of the proxier interface that is used to
-// forward the request to Vault and get the response.
-type APIProxy struct {
-	client                  *api.Client
-	logger                  hclog.Logger
-	enforceConsistency      EnforceConsistency
-	whenInconsistentAction  WhenInconsistentAction
-	l                       sync.RWMutex
-	lastIndexStates         []string
-	userAgentString         string
-	userAgentStringFunction func(string) string
-}
-
-var _ Proxier = &APIProxy{}
-
-type APIProxyConfig struct {
-	Client                 *api.Client
-	Logger                 hclog.Logger
-	EnforceConsistency     EnforceConsistency
-	WhenInconsistentAction WhenInconsistentAction
-	// UserAgentString is used as the User Agent when the proxied client
-	// does not have a user agent of its own.
-	UserAgentString string
-	// UserAgentStringFunction is the function to transform the proxied client's
-	// user agent into one that includes Vault-specific information.
-	UserAgentStringFunction func(string) string
-}
-
-func NewAPIProxy(config *APIProxyConfig) (Proxier, error) {
-	if config.Client == nil {
-		return nil, fmt.Errorf("nil API client")
-	}
-	return &APIProxy{
-		client:                  config.Client,
-		logger:                  config.Logger,
-		enforceConsistency:      config.EnforceConsistency,
-		whenInconsistentAction:  config.WhenInconsistentAction,
-		userAgentString:         config.UserAgentString,
-		userAgentStringFunction: config.UserAgentStringFunction,
-	}, nil
-}
-
-func (ap *APIProxy) Send(ctx context.Context, req *SendRequest) (*SendResponse, error) {
-	client, err := ap.client.Clone()
-	if err != nil {
-		return nil, err
-	}
-	client.SetToken(req.Token)
-
-	// Derive and set a logger for the client
-	clientLogger := ap.logger.Named("client")
-	client.SetLogger(clientLogger)
-
-	// http.Transport will transparently request gzip and decompress the response, but only if
-	// the client doesn't manually set the header. Removing any Accept-Encoding header allows the
-	// transparent compression to occur.
-	req.Request.Header.Del("Accept-Encoding")
-
-	if req.Request.Header == nil {
-		req.Request.Header = make(gohttp.Header)
-	}
-
-	// Set our User-Agent to be one indicating we are Vault Agent's API proxy.
-	// If the sending client had one, preserve it.
-	if req.Request.Header.Get("User-Agent") != "" {
-		initialUserAgent := req.Request.Header.Get("User-Agent")
-		req.Request.Header.Set("User-Agent", ap.userAgentStringFunction(initialUserAgent))
-	} else {
-		req.Request.Header.Set("User-Agent", ap.userAgentString)
-	}
-
-	client.SetHeaders(req.Request.Header)
-
-	fwReq := client.NewRequest(req.Request.Method, req.Request.URL.Path)
-	fwReq.BodyBytes = req.RequestBody
-
-	query := req.Request.URL.Query()
-	if len(query) != 0 {
-		fwReq.Params = query
-	}
-
-	var newState string
-	manageState := ap.enforceConsistency == EnforceConsistencyAlways &&
-		req.Request.Header.Get(http.VaultIndexHeaderName) == "" &&
-		req.Request.Header.Get(http.VaultForwardHeaderName) == "" &&
-		req.Request.Header.Get(http.VaultInconsistentHeaderName) == ""
-
-	if manageState {
-		client = client.WithResponseCallbacks(api.RecordState(&newState))
-		ap.l.RLock()
-		lastStates := ap.lastIndexStates
-		ap.l.RUnlock()
-		if len(lastStates) != 0 {
-			client = client.WithRequestCallbacks(api.RequireState(lastStates...))
-			switch ap.whenInconsistentAction {
-			case WhenInconsistentFail:
-				// In this mode we want to delegate handling of inconsistency
-				// failures to the external client talking to Agent.
-				client.SetCheckRetry(retryablehttp.DefaultRetryPolicy)
-			case WhenInconsistentRetry:
-				// In this mode we want to handle retries due to inconsistency
-				// internally.  This is the default api.Client behaviour so
-				// we needn't do anything.
-			case WhenInconsistentForward:
-				fwReq.Headers.Set(http.VaultInconsistentHeaderName, http.VaultInconsistentForward)
-			}
-		}
-	}
-
-	// Make the request to Vault and get the response
-	ap.logger.Info("forwarding request to Vault", "method", req.Request.Method, "path", req.Request.URL.Path)
-
-	resp, err := client.RawRequestWithContext(ctx, fwReq)
-	if resp == nil && err != nil {
-		// We don't want to cache nil responses, so we simply return the error
-		return nil, err
-	}
-
-	if newState != "" {
-		ap.l.Lock()
-		// We want to be using the "newest" states seen, but newer isn't well
-		// defined here.  There can be two states S1 and S2 which aren't strictly ordered:
-		// S1 could have a newer localindex and S2 could have a newer replicatedindex.  So
-		// we need to merge them.  But we can't merge them because we wouldn't be able to
-		// "sign" the resulting header because we don't have access to the HMAC key that
-		// Vault uses to do so.  So instead we compare any of the 0-2 saved states
-		// we have to the new header, keeping the newest 1-2 of these, and sending
-		// them to Vault to evaluate.
-		ap.lastIndexStates = api.MergeReplicationStates(ap.lastIndexStates, newState)
-		ap.l.Unlock()
-	}
-
-	// Before error checking from the request call, we'd want to initialize a SendResponse to
-	// potentially return
-	sendResponse, newErr := NewSendResponse(resp, nil)
-	if newErr != nil {
-		return nil, newErr
-	}
-
-	// Bubble back the api.Response as well for error checking/handling at the handler layer.
-	return sendResponse, err
-}
diff --git a/command/agentproxyshared/cache/api_proxy_test.go b/command/agentproxyshared/cache/api_proxy_test.go
deleted file mode 100644
index 6671b17fdaa83..0000000000000
--- a/command/agentproxyshared/cache/api_proxy_test.go
+++ /dev/null
@@ -1,339 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package cache
-
-import (
-	"context"
-	"fmt"
-	"net"
-	"net/http"
-	"os"
-	"testing"
-	"time"
-
-	"github.com/hashicorp/vault/helper/useragent"
-
-	"github.com/hashicorp/vault/builtin/credential/userpass"
-	vaulthttp "github.com/hashicorp/vault/http"
-	"github.com/hashicorp/vault/sdk/logical"
-	"github.com/hashicorp/vault/vault"
-
-	"github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/helper/namespace"
-	"github.com/hashicorp/vault/sdk/helper/jsonutil"
-	"github.com/hashicorp/vault/sdk/helper/logging"
-)
-
-const policyAdmin = `
-path "*" {
-	capabilities = ["sudo", "create", "read", "update", "delete", "list"]
-}
-`
-
-func TestAPIProxy(t *testing.T) {
-	cleanup, client, _, _ := setupClusterAndAgent(namespace.RootContext(nil), t, nil)
-	defer cleanup()
-
-	proxier, err := NewAPIProxy(&APIProxyConfig{
-		Client:                  client,
-		Logger:                  logging.NewVaultLogger(hclog.Trace),
-		UserAgentStringFunction: useragent.ProxyStringWithProxiedUserAgent,
-		UserAgentString:         useragent.ProxyAPIProxyString(),
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	r := client.NewRequest("GET", "/v1/sys/health")
-	req, err := r.ToHTTP()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	resp, err := proxier.Send(namespace.RootContext(nil), &SendRequest{
-		Request: req,
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	var result api.HealthResponse
-	err = jsonutil.DecodeJSONFromReader(resp.Response.Body, &result)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if !result.Initialized || result.Sealed || result.Standby {
-		t.Fatalf("bad sys/health response: %#v", result)
-	}
-}
-
-func TestAPIProxyNoCache(t *testing.T) {
-	cleanup, client, _, _ := setupClusterAndAgentNoCache(namespace.RootContext(nil), t, nil)
-	defer cleanup()
-
-	proxier, err := NewAPIProxy(&APIProxyConfig{
-		Client:                  client,
-		Logger:                  logging.NewVaultLogger(hclog.Trace),
-		UserAgentStringFunction: useragent.ProxyStringWithProxiedUserAgent,
-		UserAgentString:         useragent.ProxyAPIProxyString(),
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	r := client.NewRequest("GET", "/v1/sys/health")
-	req, err := r.ToHTTP()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	resp, err := proxier.Send(namespace.RootContext(nil), &SendRequest{
-		Request: req,
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	var result api.HealthResponse
-	err = jsonutil.DecodeJSONFromReader(resp.Response.Body, &result)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if !result.Initialized || result.Sealed || result.Standby {
-		t.Fatalf("bad sys/health response: %#v", result)
-	}
-}
-
-func TestAPIProxy_queryParams(t *testing.T) {
-	// Set up an agent that points to a standby node for this particular test
-	// since it needs to proxy a /sys/health?standbyok=true request to a standby
-	cleanup, client, _, _ := setupClusterAndAgentOnStandby(namespace.RootContext(nil), t, nil)
-	defer cleanup()
-
-	proxier, err := NewAPIProxy(&APIProxyConfig{
-		Client:                  client,
-		Logger:                  logging.NewVaultLogger(hclog.Trace),
-		UserAgentStringFunction: useragent.ProxyStringWithProxiedUserAgent,
-		UserAgentString:         useragent.ProxyAPIProxyString(),
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	r := client.NewRequest("GET", "/v1/sys/health")
-	req, err := r.ToHTTP()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Add a query parameter for testing
-	q := req.URL.Query()
-	q.Add("standbyok", "true")
-	req.URL.RawQuery = q.Encode()
-
-	resp, err := proxier.Send(namespace.RootContext(nil), &SendRequest{
-		Request: req,
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	var result api.HealthResponse
-	err = jsonutil.DecodeJSONFromReader(resp.Response.Body, &result)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if !result.Initialized || result.Sealed || !result.Standby {
-		t.Fatalf("bad sys/health response: %#v", result)
-	}
-
-	if resp.Response.StatusCode != http.StatusOK {
-		t.Fatalf("exptected standby to return 200, got: %v", resp.Response.StatusCode)
-	}
-}
-
-// setupClusterAndAgent is a helper func used to set up a test cluster and
-// caching agent against the active node. It returns a cleanup func that should
-// be deferred immediately along with two clients, one for direct cluster
-// communication and another to talk to the caching agent.
-func setupClusterAndAgent(ctx context.Context, t *testing.T, coreConfig *vault.CoreConfig) (func(), *api.Client, *api.Client, *LeaseCache) {
-	return setupClusterAndAgentCommon(ctx, t, coreConfig, false, true)
-}
-
-// setupClusterAndAgentNoCache is a helper func used to set up a test cluster and
-// proxying agent against the active node. It returns a cleanup func that should
-// be deferred immediately along with two clients, one for direct cluster
-// communication and another to talk to the caching agent.
-func setupClusterAndAgentNoCache(ctx context.Context, t *testing.T, coreConfig *vault.CoreConfig) (func(), *api.Client, *api.Client, *LeaseCache) {
-	return setupClusterAndAgentCommon(ctx, t, coreConfig, false, false)
-}
-
-// setupClusterAndAgentOnStandby is a helper func used to set up a test cluster
-// and caching agent against a standby node. It returns a cleanup func that
-// should be deferred immediately along with two clients, one for direct cluster
-// communication and another to talk to the caching agent.
-func setupClusterAndAgentOnStandby(ctx context.Context, t *testing.T, coreConfig *vault.CoreConfig) (func(), *api.Client, *api.Client, *LeaseCache) {
-	return setupClusterAndAgentCommon(ctx, t, coreConfig, true, true)
-}
-
-func setupClusterAndAgentCommon(ctx context.Context, t *testing.T, coreConfig *vault.CoreConfig, onStandby bool, useCache bool) (func(), *api.Client, *api.Client, *LeaseCache) {
-	t.Helper()
-
-	if ctx == nil {
-		ctx = context.Background()
-	}
-
-	// Handle sane defaults
-	if coreConfig == nil {
-		coreConfig = &vault.CoreConfig{
-			DisableMlock: true,
-			DisableCache: true,
-			Logger:       logging.NewVaultLogger(hclog.Trace),
-		}
-	}
-
-	// Always set up the userpass backend since we use that to generate an admin
-	// token for the client that will make proxied requests to through the agent.
-	if coreConfig.CredentialBackends == nil || coreConfig.CredentialBackends["userpass"] == nil {
-		coreConfig.CredentialBackends = map[string]logical.Factory{
-			"userpass": userpass.Factory,
-		}
-	}
-
-	// Init new test cluster
-	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
-		HandlerFunc: vaulthttp.Handler,
-	})
-	cluster.Start()
-
-	cores := cluster.Cores
-	vault.TestWaitActive(t, cores[0].Core)
-
-	activeClient := cores[0].Client
-	standbyClient := cores[1].Client
-
-	// clienToUse is the client for the agent to point to.
-	clienToUse := activeClient
-	if onStandby {
-		clienToUse = standbyClient
-	}
-
-	// Add an admin policy
-	if err := activeClient.Sys().PutPolicy("admin", policyAdmin); err != nil {
-		t.Fatal(err)
-	}
-
-	// Set up the userpass auth backend and an admin user. Used for getting a token
-	// for the agent later down in this func.
-	err := activeClient.Sys().EnableAuthWithOptions("userpass", &api.EnableAuthOptions{
-		Type: "userpass",
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = activeClient.Logical().Write("auth/userpass/users/foo", map[string]interface{}{
-		"password": "bar",
-		"policies": []string{"admin"},
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Set up env vars for agent consumption
-	origEnvVaultAddress := os.Getenv(api.EnvVaultAddress)
-	os.Setenv(api.EnvVaultAddress, clienToUse.Address())
-
-	origEnvVaultCACert := os.Getenv(api.EnvVaultCACert)
-	os.Setenv(api.EnvVaultCACert, fmt.Sprintf("%s/ca_cert.pem", cluster.TempDir))
-
-	listener, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	apiProxyLogger := logging.NewVaultLogger(hclog.Trace).Named("apiproxy")
-
-	// Create the API proxier
-	apiProxy, err := NewAPIProxy(&APIProxyConfig{
-		Client:                  clienToUse,
-		Logger:                  apiProxyLogger,
-		UserAgentStringFunction: useragent.ProxyStringWithProxiedUserAgent,
-		UserAgentString:         useragent.ProxyAPIProxyString(),
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Create a muxer and add paths relevant for the lease cache layer and API proxy layer
-	mux := http.NewServeMux()
-
-	var leaseCache *LeaseCache
-	if useCache {
-		cacheLogger := logging.NewVaultLogger(hclog.Trace).Named("cache")
-
-		// Create the lease cache proxier and set its underlying proxier to
-		// the API proxier.
-		leaseCache, err = NewLeaseCache(&LeaseCacheConfig{
-			Client:      clienToUse,
-			BaseContext: ctx,
-			Proxier:     apiProxy,
-			Logger:      cacheLogger.Named("leasecache"),
-		})
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		mux.Handle("/agent/v1/cache-clear", leaseCache.HandleCacheClear(ctx))
-
-		mux.Handle("/", ProxyHandler(ctx, cacheLogger, leaseCache, nil, true))
-	} else {
-		mux.Handle("/", ProxyHandler(ctx, apiProxyLogger, apiProxy, nil, true))
-	}
-
-	server := &http.Server{
-		Handler:           mux,
-		ReadHeaderTimeout: 10 * time.Second,
-		ReadTimeout:       30 * time.Second,
-		IdleTimeout:       5 * time.Minute,
-		ErrorLog:          apiProxyLogger.StandardLogger(nil),
-	}
-	go server.Serve(listener)
-
-	// testClient is the client that is used to talk to the agent for proxying/caching behavior.
-	testClient, err := activeClient.Clone()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if err := testClient.SetAddress("http://" + listener.Addr().String()); err != nil {
-		t.Fatal(err)
-	}
-
-	// Login via userpass method to derive a managed token. Set that token as the
-	// testClient's token
-	resp, err := testClient.Logical().Write("auth/userpass/login/foo", map[string]interface{}{
-		"password": "bar",
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-	testClient.SetToken(resp.Auth.ClientToken)
-
-	cleanup := func() {
-		// We wait for a tiny bit for things such as agent renewal to exit properly
-		time.Sleep(50 * time.Millisecond)
-
-		cluster.Cleanup()
-		os.Setenv(api.EnvVaultAddress, origEnvVaultAddress)
-		os.Setenv(api.EnvVaultCACert, origEnvVaultCACert)
-		listener.Close()
-	}
-
-	return cleanup, clienToUse, testClient, leaseCache
-}
diff --git a/command/agentproxyshared/cache/listener.go b/command/agentproxyshared/cache/listener.go
deleted file mode 100644
index c8ed722191480..0000000000000
--- a/command/agentproxyshared/cache/listener.go
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package cache
-
-import (
-	"crypto/tls"
-	"fmt"
-	"net"
-	"strings"
-
-	"github.com/hashicorp/go-secure-stdlib/reloadutil"
-	"github.com/hashicorp/vault/command/server"
-	"github.com/hashicorp/vault/internalshared/configutil"
-	"github.com/hashicorp/vault/internalshared/listenerutil"
-)
-
-type ListenerBundle struct {
-	Listener      net.Listener
-	TLSConfig     *tls.Config
-	TLSReloadFunc reloadutil.ReloadFunc
-}
-
-func StartListener(lnConfig *configutil.Listener) (*ListenerBundle, error) {
-	addr := lnConfig.Address
-
-	var ln net.Listener
-	var err error
-	switch lnConfig.Type {
-	case "tcp":
-		if addr == "" {
-			addr = "127.0.0.1:8200"
-		}
-
-		bindProto := "tcp"
-		// If they've passed 0.0.0.0, we only want to bind on IPv4
-		// rather than golang's dual stack default
-		if strings.HasPrefix(addr, "0.0.0.0:") {
-			bindProto = "tcp4"
-		}
-
-		ln, err = net.Listen(bindProto, addr)
-		if err != nil {
-			return nil, err
-		}
-		ln = &server.TCPKeepAliveListener{ln.(*net.TCPListener)}
-
-	case "unix":
-		var uConfig *listenerutil.UnixSocketsConfig
-		if lnConfig.SocketMode != "" &&
-			lnConfig.SocketUser != "" &&
-			lnConfig.SocketGroup != "" {
-			uConfig = &listenerutil.UnixSocketsConfig{
-				Mode:  lnConfig.SocketMode,
-				User:  lnConfig.SocketUser,
-				Group: lnConfig.SocketGroup,
-			}
-		}
-		ln, err = listenerutil.UnixSocketListener(addr, uConfig)
-		if err != nil {
-			return nil, err
-		}
-
-	default:
-		return nil, fmt.Errorf("invalid listener type: %q", lnConfig.Type)
-	}
-
-	props := map[string]string{"addr": ln.Addr().String()}
-	tlsConf, reloadFunc, err := listenerutil.TLSConfig(lnConfig, props, nil)
-	if err != nil {
-		return nil, err
-	}
-	if tlsConf != nil {
-		ln = tls.NewListener(ln, tlsConf)
-	}
-
-	cfg := &ListenerBundle{
-		Listener:      ln,
-		TLSConfig:     tlsConf,
-		TLSReloadFunc: reloadFunc,
-	}
-
-	return cfg, nil
-}
diff --git a/command/agentproxyshared/cache/proxy.go b/command/agentproxyshared/cache/proxy.go
deleted file mode 100644
index 4dcd1803389fb..0000000000000
--- a/command/agentproxyshared/cache/proxy.go
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package cache
-
-import (
-	"bytes"
-	"context"
-	"io"
-	"net/http"
-	"time"
-
-	"github.com/hashicorp/vault/api"
-)
-
-// SendRequest is the input for Proxier.Send.
-type SendRequest struct {
-	Token   string
-	Request *http.Request
-
-	// RequestBody is the stored body bytes from Request.Body. It is set here to
-	// avoid reading and re-setting the stream multiple times.
-	RequestBody []byte
-}
-
-// SendResponse is the output from Proxier.Send.
-type SendResponse struct {
-	Response *api.Response
-
-	// ResponseBody is the stored body bytes from Response.Body. It is set here to
-	// avoid reading and re-setting the stream multiple times.
-	ResponseBody []byte
-	CacheMeta    *CacheMeta
-}
-
-// CacheMeta contains metadata information about the response,
-// such as whether it was a cache hit or miss, and the age of the
-// cached entry.
-type CacheMeta struct {
-	Hit bool
-	Age time.Duration
-}
-
-// Proxier is the interface implemented by different components that are
-// responsible for performing specific tasks, such as caching and proxying. All
-// these tasks combined together would serve the request received by the agent.
-type Proxier interface {
-	Send(ctx context.Context, req *SendRequest) (*SendResponse, error)
-}
-
-// NewSendResponse creates a new SendResponse and takes care of initializing its
-// fields properly.
-func NewSendResponse(apiResponse *api.Response, responseBody []byte) (*SendResponse, error) {
-	resp := &SendResponse{
-		Response:  apiResponse,
-		CacheMeta: &CacheMeta{},
-	}
-
-	// If a response body is separately provided we set that as the SendResponse.ResponseBody,
-	// otherwise we will do an ioutil.ReadAll to extract the response body from apiResponse.
-	switch {
-	case len(responseBody) > 0:
-		resp.ResponseBody = responseBody
-	case apiResponse.Body != nil:
-		respBody, err := io.ReadAll(apiResponse.Body)
-		if err != nil {
-			return nil, err
-		}
-		// Close the old body
-		apiResponse.Body.Close()
-
-		// Re-set the response body after reading from the Reader
-		apiResponse.Body = io.NopCloser(bytes.NewReader(respBody))
-
-		resp.ResponseBody = respBody
-	}
-
-	return resp, nil
-}
diff --git a/command/agentproxyshared/cache/testing.go b/command/agentproxyshared/cache/testing.go
deleted file mode 100644
index 9fe9e6f1345c0..0000000000000
--- a/command/agentproxyshared/cache/testing.go
+++ /dev/null
@@ -1,114 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package cache
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"math/rand"
-	"net/http"
-	"strings"
-	"time"
-
-	"github.com/hashicorp/vault/helper/useragent"
-
-	"github.com/hashicorp/vault/api"
-)
-
-// mockProxier is a mock implementation of the Proxier interface, used for testing purposes.
-// The mock will return the provided responses every time it reaches its Send method, up to
-// the last provided response. This lets tests control what the next/underlying Proxier layer
-// might expect to return.
-type mockProxier struct {
-	proxiedResponses []*SendResponse
-	responseIndex    int
-}
-
-func NewMockProxier(responses []*SendResponse) *mockProxier {
-	return &mockProxier{
-		proxiedResponses: responses,
-	}
-}
-
-func (p *mockProxier) Send(ctx context.Context, req *SendRequest) (*SendResponse, error) {
-	if p.responseIndex >= len(p.proxiedResponses) {
-		return nil, fmt.Errorf("index out of bounds: responseIndex = %d, responses = %d", p.responseIndex, len(p.proxiedResponses))
-	}
-	resp := p.proxiedResponses[p.responseIndex]
-
-	p.responseIndex++
-
-	return resp, nil
-}
-
-func (p *mockProxier) ResponseIndex() int {
-	return p.responseIndex
-}
-
-func newTestSendResponse(status int, body string) *SendResponse {
-	headers := make(http.Header)
-	headers.Add("User-Agent", useragent.AgentProxyString())
-	resp := &SendResponse{
-		Response: &api.Response{
-			Response: &http.Response{
-				StatusCode: status,
-				Header:     headers,
-			},
-		},
-	}
-	resp.Response.Header.Set("Date", time.Now().Format(http.TimeFormat))
-
-	if body != "" {
-		resp.Response.Body = ioutil.NopCloser(strings.NewReader(body))
-		resp.ResponseBody = []byte(body)
-	}
-
-	if json.Valid([]byte(body)) {
-		resp.Response.Header.Set("content-type", "application/json")
-	}
-
-	return resp
-}
-
-type mockTokenVerifierProxier struct {
-	currentToken string
-}
-
-func (p *mockTokenVerifierProxier) Send(ctx context.Context, req *SendRequest) (*SendResponse, error) {
-	p.currentToken = req.Token
-	resp := newTestSendResponse(http.StatusOK,
-		`{"data": {"id": "`+p.currentToken+`"}}`)
-
-	return resp, nil
-}
-
-func (p *mockTokenVerifierProxier) GetCurrentRequestToken() string {
-	return p.currentToken
-}
-
-type mockDelayProxier struct {
-	cacheableResp bool
-	delay         int
-}
-
-func (p *mockDelayProxier) Send(ctx context.Context, req *SendRequest) (*SendResponse, error) {
-	if p.delay > 0 {
-		select {
-		case <-ctx.Done():
-			return nil, ctx.Err()
-		case <-time.After(time.Duration(p.delay) * time.Millisecond):
-		}
-	}
-
-	// If this is a cacheable response, we return a unique response every time
-	if p.cacheableResp {
-		rand.Seed(time.Now().Unix())
-		s := fmt.Sprintf(`{"lease_id": "%d", "renewable": true, "data": {"foo": "bar"}}`, rand.Int())
-		return newTestSendResponse(http.StatusOK, s), nil
-	}
-
-	return newTestSendResponse(http.StatusOK, `{"value": "output"}`), nil
-}
diff --git a/command/agentproxyshared/helpers.go b/command/agentproxyshared/helpers.go
deleted file mode 100644
index d1487174bdf1a..0000000000000
--- a/command/agentproxyshared/helpers.go
+++ /dev/null
@@ -1,237 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package agentproxyshared
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"os"
-	"path/filepath"
-	"strings"
-
-	log "github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/vault/command/agentproxyshared/auth"
-	"github.com/hashicorp/vault/command/agentproxyshared/auth/alicloud"
-	"github.com/hashicorp/vault/command/agentproxyshared/auth/approle"
-	"github.com/hashicorp/vault/command/agentproxyshared/auth/aws"
-	"github.com/hashicorp/vault/command/agentproxyshared/auth/azure"
-	"github.com/hashicorp/vault/command/agentproxyshared/auth/cert"
-	"github.com/hashicorp/vault/command/agentproxyshared/auth/cf"
-	"github.com/hashicorp/vault/command/agentproxyshared/auth/gcp"
-	"github.com/hashicorp/vault/command/agentproxyshared/auth/jwt"
-	"github.com/hashicorp/vault/command/agentproxyshared/auth/kerberos"
-	"github.com/hashicorp/vault/command/agentproxyshared/auth/kubernetes"
-	"github.com/hashicorp/vault/command/agentproxyshared/auth/oci"
-	token_file "github.com/hashicorp/vault/command/agentproxyshared/auth/token-file"
-	"github.com/hashicorp/vault/command/agentproxyshared/cache"
-	"github.com/hashicorp/vault/command/agentproxyshared/cache/cacheboltdb"
-	"github.com/hashicorp/vault/command/agentproxyshared/cache/cachememdb"
-	"github.com/hashicorp/vault/command/agentproxyshared/cache/keymanager"
-)
-
-// GetAutoAuthMethodFromConfig Calls the appropriate NewAutoAuthMethod function, initializing
-// the auto-auth method, based on the auto-auth method type. Returns an error if one happens or
-// the method type is invalid.
-func GetAutoAuthMethodFromConfig(autoAuthMethodType string, authConfig *auth.AuthConfig, vaultAddress string) (auth.AuthMethod, error) {
-	switch autoAuthMethodType {
-	case "alicloud":
-		return alicloud.NewAliCloudAuthMethod(authConfig)
-	case "aws":
-		return aws.NewAWSAuthMethod(authConfig)
-	case "azure":
-		return azure.NewAzureAuthMethod(authConfig)
-	case "cert":
-		return cert.NewCertAuthMethod(authConfig)
-	case "cf":
-		return cf.NewCFAuthMethod(authConfig)
-	case "gcp":
-		return gcp.NewGCPAuthMethod(authConfig)
-	case "jwt":
-		return jwt.NewJWTAuthMethod(authConfig)
-	case "kerberos":
-		return kerberos.NewKerberosAuthMethod(authConfig)
-	case "kubernetes":
-		return kubernetes.NewKubernetesAuthMethod(authConfig)
-	case "approle":
-		return approle.NewApproleAuthMethod(authConfig)
-	case "oci":
-		return oci.NewOCIAuthMethod(authConfig, vaultAddress)
-	case "token_file":
-		return token_file.NewTokenFileAuthMethod(authConfig)
-	case "pcf": // Deprecated.
-		return cf.NewCFAuthMethod(authConfig)
-	default:
-		return nil, errors.New(fmt.Sprintf("unknown auth method %q", autoAuthMethodType))
-	}
-}
-
-// PersistConfig contains configuration needed for persistent caching
-type PersistConfig struct {
-	Type                    string
-	Path                    string `hcl:"path"`
-	KeepAfterImport         bool   `hcl:"keep_after_import"`
-	ExitOnErr               bool   `hcl:"exit_on_err"`
-	ServiceAccountTokenFile string `hcl:"service_account_token_file"`
-}
-
-// AddPersistentStorageToLeaseCache adds persistence to a lease cache, based on a given PersistConfig
-// Returns a close function to be deferred and the old token, if found, or an error
-func AddPersistentStorageToLeaseCache(ctx context.Context, leaseCache *cache.LeaseCache, persistConfig *PersistConfig, logger log.Logger) (func() error, string, error) {
-	if persistConfig == nil {
-		return nil, "", errors.New("persist config was nil")
-	}
-
-	if persistConfig.Path == "" {
-		return nil, "", errors.New("must specify persistent cache path")
-	}
-
-	// Set AAD based on key protection type
-	var aad string
-	var err error
-	switch persistConfig.Type {
-	case "kubernetes":
-		aad, err = getServiceAccountJWT(persistConfig.ServiceAccountTokenFile)
-		if err != nil {
-			tokenFileName := persistConfig.ServiceAccountTokenFile
-			if len(tokenFileName) == 0 {
-				tokenFileName = "/var/run/secrets/kubernetes.io/serviceaccount/token"
-			}
-			return nil, "", fmt.Errorf("failed to read service account token from %s: %w", tokenFileName, err)
-		}
-	default:
-		return nil, "", fmt.Errorf("persistent key protection type %q not supported", persistConfig.Type)
-	}
-
-	// Check if bolt file exists already
-	dbFileExists, err := cacheboltdb.DBFileExists(persistConfig.Path)
-	if err != nil {
-		return nil, "", fmt.Errorf("failed to check if bolt file exists at path %s: %w", persistConfig.Path, err)
-	}
-	if dbFileExists {
-		// Open the bolt file, but wait to setup Encryption
-		ps, err := cacheboltdb.NewBoltStorage(&cacheboltdb.BoltStorageConfig{
-			Path:   persistConfig.Path,
-			Logger: logger.Named("cacheboltdb"),
-		})
-		if err != nil {
-			return nil, "", fmt.Errorf("error opening persistent cache %v", err)
-		}
-
-		// Get the token from bolt for retrieving the encryption key,
-		// then setup encryption so that restore is possible
-		token, err := ps.GetRetrievalToken()
-		if err != nil {
-			return nil, "", fmt.Errorf("error getting retrieval token from persistent cache: %w", err)
-		}
-
-		if err := ps.Close(); err != nil {
-			return nil, "", fmt.Errorf("failed to close persistent cache file after getting retrieval token: %w", err)
-		}
-
-		km, err := keymanager.NewPassthroughKeyManager(ctx, token)
-		if err != nil {
-			return nil, "", fmt.Errorf("failed to configure persistence encryption for cache: %w", err)
-		}
-
-		// Open the bolt file with the wrapper provided
-		ps, err = cacheboltdb.NewBoltStorage(&cacheboltdb.BoltStorageConfig{
-			Path:    persistConfig.Path,
-			Logger:  logger.Named("cacheboltdb"),
-			Wrapper: km.Wrapper(),
-			AAD:     aad,
-		})
-		if err != nil {
-			return nil, "", fmt.Errorf("error opening persistent cache with wrapper: %w", err)
-		}
-
-		// Restore anything in the persistent cache to the memory cache
-		if err := leaseCache.Restore(ctx, ps); err != nil {
-			logger.Error(fmt.Sprintf("error restoring in-memory cache from persisted file: %v", err))
-			if persistConfig.ExitOnErr {
-				return nil, "", fmt.Errorf("exiting with error as exit_on_err is set to true")
-			}
-		}
-		logger.Info("loaded memcache from persistent storage")
-
-		// Check for previous auto-auth token
-		oldTokenBytes, err := ps.GetAutoAuthToken(ctx)
-		if err != nil {
-			logger.Error(fmt.Sprintf("error in fetching previous auto-auth token: %v", err))
-			if persistConfig.ExitOnErr {
-				return nil, "", fmt.Errorf("exiting with error as exit_on_err is set to true")
-			}
-		}
-		var previousToken string
-		if len(oldTokenBytes) > 0 {
-			oldToken, err := cachememdb.Deserialize(oldTokenBytes)
-			if err != nil {
-				logger.Error(fmt.Sprintf("error in deserializing previous auto-auth token cache entryn: %v", err))
-				if persistConfig.ExitOnErr {
-					return nil, "", fmt.Errorf("exiting with error as exit_on_err is set to true")
-				}
-			}
-			previousToken = oldToken.Token
-		}
-
-		// If keep_after_import true, set persistent storage layer in
-		// leaseCache, else remove db file
-		if persistConfig.KeepAfterImport {
-			leaseCache.SetPersistentStorage(ps)
-			return ps.Close, previousToken, nil
-		} else {
-			if err := ps.Close(); err != nil {
-				logger.Warn(fmt.Sprintf("failed to close persistent cache file: %s", err))
-			}
-			dbFile := filepath.Join(persistConfig.Path, cacheboltdb.DatabaseFileName)
-			if err := os.Remove(dbFile); err != nil {
-				logger.Error(fmt.Sprintf("failed to remove persistent storage file %s: %v", dbFile, err))
-				if persistConfig.ExitOnErr {
-					return nil, "", fmt.Errorf("exiting with error as exit_on_err is set to true")
-				}
-			}
-			return nil, previousToken, nil
-		}
-	} else {
-		km, err := keymanager.NewPassthroughKeyManager(ctx, nil)
-		if err != nil {
-			return nil, "", fmt.Errorf("failed to configure persistence encryption for cache: %w", err)
-		}
-		ps, err := cacheboltdb.NewBoltStorage(&cacheboltdb.BoltStorageConfig{
-			Path:    persistConfig.Path,
-			Logger:  logger.Named("cacheboltdb"),
-			Wrapper: km.Wrapper(),
-			AAD:     aad,
-		})
-		if err != nil {
-			return nil, "", fmt.Errorf("error creating persistent cache: %w", err)
-		}
-		logger.Info("configured persistent storage", "path", persistConfig.Path)
-
-		// Stash the key material in bolt
-		token, err := km.RetrievalToken(ctx)
-		if err != nil {
-			return nil, "", fmt.Errorf("error getting persistence key: %w", err)
-		}
-		if err := ps.StoreRetrievalToken(token); err != nil {
-			return nil, "", fmt.Errorf("error setting key in persistent cache: %w", err)
-		}
-
-		leaseCache.SetPersistentStorage(ps)
-		return ps.Close, "", nil
-	}
-}
-
-// getServiceAccountJWT attempts to read the service account JWT from the specified token file path.
-// Defaults to using the Kubernetes default service account file path if token file path is empty.
-func getServiceAccountJWT(tokenFile string) (string, error) {
-	if len(tokenFile) == 0 {
-		tokenFile = "/var/run/secrets/kubernetes.io/serviceaccount/token"
-	}
-	token, err := os.ReadFile(tokenFile)
-	if err != nil {
-		return "", err
-	}
-	return strings.TrimSpace(string(token)), nil
-}
diff --git a/command/agentproxyshared/helpers_test.go b/command/agentproxyshared/helpers_test.go
deleted file mode 100644
index 24fdf1d9db533..0000000000000
--- a/command/agentproxyshared/helpers_test.go
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package agentproxyshared
-
-import (
-	"context"
-	"os"
-	"testing"
-
-	hclog "github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/command/agentproxyshared/cache"
-	"github.com/hashicorp/vault/sdk/helper/logging"
-)
-
-func testNewLeaseCache(t *testing.T, responses []*cache.SendResponse) *cache.LeaseCache {
-	t.Helper()
-
-	client, err := api.NewClient(api.DefaultConfig())
-	if err != nil {
-		t.Fatal(err)
-	}
-	lc, err := cache.NewLeaseCache(&cache.LeaseCacheConfig{
-		Client:      client,
-		BaseContext: context.Background(),
-		Proxier:     cache.NewMockProxier(responses),
-		Logger:      logging.NewVaultLogger(hclog.Trace).Named("cache.leasecache"),
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-	return lc
-}
-
-func populateTempFile(t *testing.T, name, contents string) *os.File {
-	t.Helper()
-
-	file, err := os.CreateTemp(t.TempDir(), name)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = file.WriteString(contents)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = file.Close()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	return file
-}
-
-// Test_AddPersistentStorageToLeaseCache Tests that AddPersistentStorageToLeaseCache() correctly
-// adds persistent storage to a lease cache
-func Test_AddPersistentStorageToLeaseCache(t *testing.T) {
-	tempDir := t.TempDir()
-	serviceAccountTokenFile := populateTempFile(t, "proxy-config.hcl", "token")
-
-	persistConfig := &PersistConfig{
-		Type:                    "kubernetes",
-		Path:                    tempDir,
-		KeepAfterImport:         false,
-		ExitOnErr:               false,
-		ServiceAccountTokenFile: serviceAccountTokenFile.Name(),
-	}
-
-	leaseCache := testNewLeaseCache(t, nil)
-	if leaseCache.PersistentStorage() != nil {
-		t.Fatal("persistent storage was available before ours was added")
-	}
-
-	deferFunc, token, err := AddPersistentStorageToLeaseCache(context.Background(), leaseCache, persistConfig, logging.NewVaultLogger(hclog.Info))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if leaseCache.PersistentStorage() == nil {
-		t.Fatal("persistent storage was not added")
-	}
-
-	if token != "" {
-		t.Fatal("expected token to be empty")
-	}
-
-	if deferFunc == nil {
-		t.Fatal("expected deferFunc to not be nil")
-	}
-}
diff --git a/command/agentproxyshared/sink/mock/mock_sink.go b/command/agentproxyshared/sink/mock/mock_sink.go
deleted file mode 100644
index c39baf9c8b28f..0000000000000
--- a/command/agentproxyshared/sink/mock/mock_sink.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package mock
-
-import (
-	"github.com/hashicorp/vault/command/agentproxyshared/sink"
-)
-
-type mockSink struct {
-	token string
-}
-
-func NewSink(token string) sink.Sink {
-	return &mockSink{
-		token: token,
-	}
-}
-
-func (m *mockSink) WriteToken(token string) error {
-	m.token = token
-	return nil
-}
-
-func (m *mockSink) Token() string {
-	return m.token
-}
diff --git a/command/approle_concurrency_integ_test.go b/command/approle_concurrency_integ_test.go
index 934f8b33fd455..5dbcce064c8dd 100644
--- a/command/approle_concurrency_integ_test.go
+++ b/command/approle_concurrency_integ_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/audit.go b/command/audit.go
index 606de73eef810..8acea78f36c49 100644
--- a/command/audit.go
+++ b/command/audit.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/audit_disable.go b/command/audit_disable.go
index ef9288b0859c2..ddebfcbeda1b1 100644
--- a/command/audit_disable.go
+++ b/command/audit_disable.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/audit_disable_test.go b/command/audit_disable_test.go
index 44b782f4dbe6b..0a7e8e4dcd99e 100644
--- a/command/audit_disable_test.go
+++ b/command/audit_disable_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/audit_enable.go b/command/audit_enable.go
index 652c3c27efefc..9ed7d5d30694a 100644
--- a/command/audit_enable.go
+++ b/command/audit_enable.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/audit_enable_test.go b/command/audit_enable_test.go
index e7dc4ae786044..7d19f086ad586 100644
--- a/command/audit_enable_test.go
+++ b/command/audit_enable_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/audit_list.go b/command/audit_list.go
index e5af8525eef3e..a2dde2180a844 100644
--- a/command/audit_list.go
+++ b/command/audit_list.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/audit_list_test.go b/command/audit_list_test.go
index c2e6eacf47b63..9cbb0af5eee31 100644
--- a/command/audit_list_test.go
+++ b/command/audit_list_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/auth.go b/command/auth.go
index e2bdb81c1ea2e..3c47b2b889c46 100644
--- a/command/auth.go
+++ b/command/auth.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/auth_disable.go b/command/auth_disable.go
index 735103bdab601..773486107a513 100644
--- a/command/auth_disable.go
+++ b/command/auth_disable.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/auth_disable_test.go b/command/auth_disable_test.go
index 385bc4ec73ac9..51419b86637a9 100644
--- a/command/auth_disable_test.go
+++ b/command/auth_disable_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/auth_enable.go b/command/auth_enable.go
index 7c7af550dbadf..bddf11cb56aa5 100644
--- a/command/auth_enable.go
+++ b/command/auth_enable.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -11,6 +8,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/vault/api"
+	"github.com/hashicorp/vault/sdk/helper/consts"
 	"github.com/mitchellh/cli"
 	"github.com/posener/complete"
 )
@@ -154,7 +152,7 @@ func (c *AuthEnableCommand) Flags() *FlagSets {
 	f.StringVar(&StringVar{
 		Name:       "plugin-name",
 		Target:     &c.flagPluginName,
-		Completion: c.PredictVaultPlugins(api.PluginTypeCredential),
+		Completion: c.PredictVaultPlugins(consts.PluginTypeCredential),
 		Usage: "Name of the auth method plugin. This plugin name must already " +
 			"exist in the Vault server's plugin catalog.",
 	})
diff --git a/command/auth_enable_test.go b/command/auth_enable_test.go
index 4a4292ce80b5b..211c1da7ddb4a 100644
--- a/command/auth_enable_test.go
+++ b/command/auth_enable_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -52,6 +49,18 @@ func TestAuthEnableCommand_Run(t *testing.T) {
 			"",
 			2,
 		},
+		{
+			"deprecated builtin with standard mount",
+			[]string{"app-id"},
+			"mount entry associated with pending removal builtin",
+			2,
+		},
+		{
+			"deprecated builtin with different mount",
+			[]string{"-path=/tmp", "app-id"},
+			"mount entry associated with pending removal builtin",
+			2,
+		},
 	}
 
 	for _, tc := range cases {
diff --git a/command/auth_help.go b/command/auth_help.go
index 34b6b9ffa930b..41ea7be5f5d11 100644
--- a/command/auth_help.go
+++ b/command/auth_help.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/auth_help_test.go b/command/auth_help_test.go
index a83695ee3e8f7..0c0d36f168f2e 100644
--- a/command/auth_help_test.go
+++ b/command/auth_help_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/auth_list.go b/command/auth_list.go
index 25103a14dc5ac..f8b53d1518f30 100644
--- a/command/auth_list.go
+++ b/command/auth_list.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/auth_list_test.go b/command/auth_list_test.go
index 2e96f9f2ca078..decf6e9b06f0a 100644
--- a/command/auth_list_test.go
+++ b/command/auth_list_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/auth_move.go b/command/auth_move.go
index 2af5ab65130a1..9e591ba64f0de 100644
--- a/command/auth_move.go
+++ b/command/auth_move.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/auth_move_test.go b/command/auth_move_test.go
index 877afd27bfee5..035938efe5aa5 100644
--- a/command/auth_move_test.go
+++ b/command/auth_move_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/auth_test.go b/command/auth_test.go
index dd8abb07f7e62..f0fd5d065d8bc 100644
--- a/command/auth_test.go
+++ b/command/auth_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/auth_tune.go b/command/auth_tune.go
index a7a09797f9067..de4c198273147 100644
--- a/command/auth_tune.go
+++ b/command/auth_tune.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -23,22 +20,18 @@ var (
 type AuthTuneCommand struct {
 	*BaseCommand
 
-	flagAuditNonHMACRequestKeys         []string
-	flagAuditNonHMACResponseKeys        []string
-	flagDefaultLeaseTTL                 time.Duration
-	flagDescription                     string
-	flagListingVisibility               string
-	flagMaxLeaseTTL                     time.Duration
-	flagPassthroughRequestHeaders       []string
-	flagAllowedResponseHeaders          []string
-	flagOptions                         map[string]string
-	flagTokenType                       string
-	flagVersion                         int
-	flagPluginVersion                   string
-	flagUserLockoutThreshold            uint
-	flagUserLockoutDuration             time.Duration
-	flagUserLockoutCounterResetDuration time.Duration
-	flagUserLockoutDisable              bool
+	flagAuditNonHMACRequestKeys   []string
+	flagAuditNonHMACResponseKeys  []string
+	flagDefaultLeaseTTL           time.Duration
+	flagDescription               string
+	flagListingVisibility         string
+	flagMaxLeaseTTL               time.Duration
+	flagPassthroughRequestHeaders []string
+	flagAllowedResponseHeaders    []string
+	flagOptions                   map[string]string
+	flagTokenType                 string
+	flagVersion                   int
+	flagPluginVersion             string
 }
 
 func (c *AuthTuneCommand) Synopsis() string {
@@ -152,41 +145,6 @@ func (c *AuthTuneCommand) Flags() *FlagSets {
 		Usage:   "Select the version of the auth method to run. Not supported by all auth methods.",
 	})
 
-	f.UintVar(&UintVar{
-		Name:   flagNameUserLockoutThreshold,
-		Target: &c.flagUserLockoutThreshold,
-		Usage: "The threshold for user lockout for this auth method. If unspecified, this " +
-			"defaults to the Vault server's globally configured user lockout threshold, " +
-			"or a previously configured value for the auth method.",
-	})
-
-	f.DurationVar(&DurationVar{
-		Name:       flagNameUserLockoutDuration,
-		Target:     &c.flagUserLockoutDuration,
-		Completion: complete.PredictAnything,
-		Usage: "The user lockout duration for this auth method. If unspecified, this " +
-			"defaults to the Vault server's globally configured user lockout duration, " +
-			"or a previously configured value for the auth method.",
-	})
-
-	f.DurationVar(&DurationVar{
-		Name:       flagNameUserLockoutCounterResetDuration,
-		Target:     &c.flagUserLockoutCounterResetDuration,
-		Completion: complete.PredictAnything,
-		Usage: "The user lockout counter reset duration for this auth method. If unspecified, this " +
-			"defaults to the Vault server's globally configured user lockout counter reset duration, " +
-			"or a previously configured value for the auth method.",
-	})
-
-	f.BoolVar(&BoolVar{
-		Name:    flagNameUserLockoutDisable,
-		Target:  &c.flagUserLockoutDisable,
-		Default: false,
-		Usage: "Disable user lockout for this auth method. If unspecified, this " +
-			"defaults to the Vault server's globally configured user lockout disable, " +
-			"or a previously configured value for the auth method.",
-	})
-
 	f.StringVar(&StringVar{
 		Name:    flagNamePluginVersion,
 		Target:  &c.flagPluginVersion,
@@ -272,24 +230,6 @@ func (c *AuthTuneCommand) Run(args []string) int {
 		if fl.Name == flagNameTokenType {
 			mountConfigInput.TokenType = c.flagTokenType
 		}
-		switch fl.Name {
-		case flagNameUserLockoutThreshold, flagNameUserLockoutDuration, flagNameUserLockoutCounterResetDuration, flagNameUserLockoutDisable:
-			if mountConfigInput.UserLockoutConfig == nil {
-				mountConfigInput.UserLockoutConfig = &api.UserLockoutConfigInput{}
-			}
-		}
-		if fl.Name == flagNameUserLockoutThreshold {
-			mountConfigInput.UserLockoutConfig.LockoutThreshold = strconv.FormatUint(uint64(c.flagUserLockoutThreshold), 10)
-		}
-		if fl.Name == flagNameUserLockoutDuration {
-			mountConfigInput.UserLockoutConfig.LockoutDuration = ttlToAPI(c.flagUserLockoutDuration)
-		}
-		if fl.Name == flagNameUserLockoutCounterResetDuration {
-			mountConfigInput.UserLockoutConfig.LockoutCounterResetDuration = ttlToAPI(c.flagUserLockoutCounterResetDuration)
-		}
-		if fl.Name == flagNameUserLockoutDisable {
-			mountConfigInput.UserLockoutConfig.DisableLockout = &c.flagUserLockoutDisable
-		}
 
 		if fl.Name == flagNamePluginVersion {
 			mountConfigInput.PluginVersion = c.flagPluginVersion
diff --git a/command/auth_tune_test.go b/command/auth_tune_test.go
index aabcd8396020e..635a70f44be85 100644
--- a/command/auth_tune_test.go
+++ b/command/auth_tune_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -9,7 +6,8 @@ import (
 
 	"github.com/go-test/deep"
 	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/helper/testhelpers/corehelpers"
+	"github.com/hashicorp/vault/sdk/helper/consts"
+	"github.com/hashicorp/vault/vault"
 	"github.com/mitchellh/cli"
 )
 
@@ -78,7 +76,7 @@ func TestAuthTuneCommand_Run(t *testing.T) {
 	t.Run("integration", func(t *testing.T) {
 		t.Run("flags_all", func(t *testing.T) {
 			t.Parallel()
-			pluginDir, cleanup := corehelpers.MakeTestPluginDir(t)
+			pluginDir, cleanup := vault.MakeTestPluginDir(t)
 			defer cleanup(t)
 
 			client, _, closer := testVaultServerPluginDir(t, pluginDir)
@@ -107,7 +105,7 @@ func TestAuthTuneCommand_Run(t *testing.T) {
 				t.Errorf("expected %q to be %q", mountInfo.PluginVersion, exp)
 			}
 
-			_, _, version := testPluginCreateAndRegisterVersioned(t, client, pluginDir, "userpass", api.PluginTypeCredential)
+			_, _, version := testPluginCreateAndRegisterVersioned(t, client, pluginDir, "userpass", consts.PluginTypeCredential)
 
 			code := cmd.Run([]string{
 				"-description", "new description",
diff --git a/command/base.go b/command/base.go
index 641fcb34e9458..62560ccf58067 100644
--- a/command/base.go
+++ b/command/base.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -42,20 +39,20 @@ type BaseCommand struct {
 	flags     *FlagSets
 	flagsOnce sync.Once
 
-	flagAddress           string
-	flagAgentProxyAddress string
-	flagCACert            string
-	flagCAPath            string
-	flagClientCert        string
-	flagClientKey         string
-	flagNamespace         string
-	flagNS                string
-	flagPolicyOverride    bool
-	flagTLSServerName     string
-	flagTLSSkipVerify     bool
-	flagDisableRedirects  bool
-	flagWrapTTL           time.Duration
-	flagUnlockKey         string
+	flagAddress          string
+	flagAgentAddress     string
+	flagCACert           string
+	flagCAPath           string
+	flagClientCert       string
+	flagClientKey        string
+	flagNamespace        string
+	flagNS               string
+	flagPolicyOverride   bool
+	flagTLSServerName    string
+	flagTLSSkipVerify    bool
+	flagDisableRedirects bool
+	flagWrapTTL          time.Duration
+	flagUnlockKey        string
 
 	flagFormat           string
 	flagField            string
@@ -90,8 +87,8 @@ func (c *BaseCommand) Client() (*api.Client, error) {
 	if c.flagAddress != "" {
 		config.Address = c.flagAddress
 	}
-	if c.flagAgentProxyAddress != "" {
-		config.Address = c.flagAgentProxyAddress
+	if c.flagAgentAddress != "" {
+		config.Address = c.flagAgentAddress
 	}
 
 	if c.flagOutputCurlString {
@@ -330,7 +327,7 @@ func (c *BaseCommand) flagSet(bit FlagSetBit) *FlagSets {
 
 			agentAddrStringVar := &StringVar{
 				Name:       "agent-address",
-				Target:     &c.flagAgentProxyAddress,
+				Target:     &c.flagAgentAddress,
 				EnvVar:     api.EnvVaultAgentAddr,
 				Completion: complete.PredictAnything,
 				Usage:      "Address of the Agent.",
@@ -521,10 +518,9 @@ func (c *BaseCommand) flagSet(bit FlagSetBit) *FlagSets {
 					Target:     &c.flagFormat,
 					Default:    "table",
 					EnvVar:     EnvVaultFormat,
-					Completion: complete.PredictSet("table", "json", "yaml", "pretty", "raw"),
+					Completion: complete.PredictSet("table", "json", "yaml", "pretty"),
 					Usage: `Print the output in the given format. Valid formats
-						are "table", "json", "yaml", or "pretty". "raw" is allowed
-						for 'vault read' operations only.`,
+						are "table", "json", "yaml", or "pretty".`,
 				})
 			}
 
@@ -587,7 +583,6 @@ func (f *FlagSets) Completions() complete.Flags {
 
 type (
 	ParseOptions              interface{}
-	ParseOptionAllowRawFormat bool
 	DisableDisplayFlagWarning bool
 )
 
@@ -609,12 +604,7 @@ func (f *FlagSets) Parse(args []string, opts ...ParseOptions) error {
 		}
 	}
 
-	if err != nil {
-		return err
-	}
-
-	// Now surface any other errors.
-	return generateFlagErrors(f, opts...)
+	return err
 }
 
 // Parsed reports whether the command-line flags have been parsed.
diff --git a/command/base_flags.go b/command/base_flags.go
index 3fe069fbb457a..4944454b78668 100644
--- a/command/base_flags.go
+++ b/command/base_flags.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -252,14 +249,14 @@ func (i *intValue) Set(s string) error {
 		return err
 	}
 	if v >= math.MinInt && v <= math.MaxInt {
-		*i.target = v
+		*i.target = int(v)
 		return nil
 	}
 	return fmt.Errorf("Incorrect conversion of a 64-bit integer to a lower bit size. Value %d is not within bounds for int32", v)
 }
 
-func (i *intValue) Get() interface{} { return *i.target }
-func (i *intValue) String() string   { return strconv.Itoa(*i.target) }
+func (i *intValue) Get() interface{} { return int(*i.target) }
+func (i *intValue) String() string   { return strconv.Itoa(int(*i.target)) }
 func (i *intValue) Example() string  { return "int" }
 func (i *intValue) Hidden() bool     { return i.hidden }
 
diff --git a/command/base_flags_test.go b/command/base_flags_test.go
index 580e163de1f93..39777d24a9537 100644
--- a/command/base_flags_test.go
+++ b/command/base_flags_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/base_helpers.go b/command/base_helpers.go
index 2595dc56a6a55..b2a9f8c7fbd28 100644
--- a/command/base_helpers.go
+++ b/command/base_helpers.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -325,20 +322,3 @@ func generateFlagWarnings(args []string) string {
 		return ""
 	}
 }
-
-func generateFlagErrors(f *FlagSets, opts ...ParseOptions) error {
-	if Format(f.ui) == "raw" {
-		canUseRaw := false
-		for _, opt := range opts {
-			if value, ok := opt.(ParseOptionAllowRawFormat); ok {
-				canUseRaw = bool(value)
-			}
-		}
-
-		if !canUseRaw {
-			return fmt.Errorf("This command does not support the -format=raw option.")
-		}
-	}
-
-	return nil
-}
diff --git a/command/base_helpers_test.go b/command/base_helpers_test.go
index 50cd26441ffa7..dee93b4bf44a1 100644
--- a/command/base_helpers_test.go
+++ b/command/base_helpers_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/base_predict.go b/command/base_predict.go
index ee2a771c7a968..61cbe092d61da 100644
--- a/command/base_predict.go
+++ b/command/base_predict.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -10,6 +7,7 @@ import (
 	"sync"
 
 	"github.com/hashicorp/vault/api"
+	"github.com/hashicorp/vault/sdk/helper/consts"
 	"github.com/posener/complete"
 )
 
@@ -157,7 +155,7 @@ func (b *BaseCommand) PredictVaultAuths() complete.Predictor {
 }
 
 // PredictVaultPlugins returns a predictor for installed plugins.
-func (b *BaseCommand) PredictVaultPlugins(pluginTypes ...api.PluginType) complete.Predictor {
+func (b *BaseCommand) PredictVaultPlugins(pluginTypes ...consts.PluginType) complete.Predictor {
 	return NewPredict().VaultPlugins(pluginTypes...)
 }
 
@@ -220,7 +218,7 @@ func (p *Predict) VaultAuths() complete.Predictor {
 // VaultPlugins returns a predictor for Vault's plugin catalog. This is a public
 // API for consumers, but you probably want BaseCommand.PredictVaultPlugins
 // instead.
-func (p *Predict) VaultPlugins(pluginTypes ...api.PluginType) complete.Predictor {
+func (p *Predict) VaultPlugins(pluginTypes ...consts.PluginType) complete.Predictor {
 	filterFunc := func() []string {
 		return p.plugins(pluginTypes...)
 	}
@@ -397,12 +395,12 @@ func (p *Predict) auths() []string {
 }
 
 // plugins returns a sorted list of the plugins in the catalog.
-func (p *Predict) plugins(pluginTypes ...api.PluginType) []string {
+func (p *Predict) plugins(pluginTypes ...consts.PluginType) []string {
 	// This method's signature doesn't enforce that a pluginType must be passed in.
 	// If it's not, it's likely the caller's intent is go get a list of all of them,
 	// so let's help them out.
 	if len(pluginTypes) == 0 {
-		pluginTypes = append(pluginTypes, api.PluginTypeUnknown)
+		pluginTypes = append(pluginTypes, consts.PluginTypeUnknown)
 	}
 
 	client := p.Client()
@@ -413,7 +411,7 @@ func (p *Predict) plugins(pluginTypes ...api.PluginType) []string {
 	var plugins []string
 	pluginsAdded := make(map[string]bool)
 	for _, pluginType := range pluginTypes {
-		result, err := client.Sys().ListPlugins(&api.ListPluginsInput{Type: api.PluginType(pluginType)})
+		result, err := client.Sys().ListPlugins(&api.ListPluginsInput{Type: pluginType})
 		if err != nil {
 			return nil
 		}
diff --git a/command/base_predict_test.go b/command/base_predict_test.go
index 20af0f68810f9..644a366673d4e 100644
--- a/command/base_predict_test.go
+++ b/command/base_predict_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -346,9 +343,11 @@ func TestPredict_Plugins(t *testing.T) {
 			[]string{
 				"ad",
 				"alicloud",
+				"app-id",
 				"approle",
 				"aws",
 				"azure",
+				"cassandra",
 				"cassandra-database-plugin",
 				"centrify",
 				"cert",
@@ -368,10 +367,13 @@ func TestPredict_Plugins(t *testing.T) {
 				"kubernetes",
 				"kv",
 				"ldap",
+				"mongodb",
 				"mongodb-database-plugin",
 				"mongodbatlas",
 				"mongodbatlas-database-plugin",
+				"mssql",
 				"mssql-database-plugin",
+				"mysql",
 				"mysql-aurora-database-plugin",
 				"mysql-database-plugin",
 				"mysql-legacy-database-plugin",
@@ -383,6 +385,7 @@ func TestPredict_Plugins(t *testing.T) {
 				"openldap",
 				"pcf", // Deprecated.
 				"pki",
+				"postgresql",
 				"postgresql-database-plugin",
 				"rabbitmq",
 				"radius",
@@ -436,7 +439,7 @@ func TestPredict_Plugins(t *testing.T) {
 					}
 				}
 				if !reflect.DeepEqual(act, tc.exp) {
-					t.Errorf("expected: %q, got: %q, diff: %v", tc.exp, act, strutil.Difference(act, tc.exp, true))
+					t.Errorf("expected:%q, got: %q", tc.exp, act)
 				}
 			})
 		}
diff --git a/command/base_test.go b/command/base_test.go
index af4f0a4d3b62a..b3f75e0eb05d7 100644
--- a/command/base_test.go
+++ b/command/base_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/command_test.go b/command/command_test.go
index f1a5269b9f5fb..f4b8c7fd251ad 100644
--- a/command/command_test.go
+++ b/command/command_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -25,7 +22,6 @@ import (
 	"github.com/hashicorp/vault/sdk/logical"
 	"github.com/hashicorp/vault/sdk/physical/inmem"
 	"github.com/hashicorp/vault/vault"
-	"github.com/hashicorp/vault/vault/seal"
 	"github.com/mitchellh/cli"
 
 	auditFile "github.com/hashicorp/vault/builtin/audit/file"
@@ -71,54 +67,10 @@ func testVaultServer(tb testing.TB) (*api.Client, func()) {
 	return client, closer
 }
 
-func testVaultServerWithSecrets(ctx context.Context, tb testing.TB) (*api.Client, func()) {
-	tb.Helper()
-
-	client, _, closer := testVaultServerUnseal(tb)
-
-	// enable kv-v1 backend
-	if err := client.Sys().Mount("kv-v1/", &api.MountInput{
-		Type: "kv-v1",
-	}); err != nil {
-		tb.Fatal(err)
-	}
-
-	// enable kv-v2 backend
-	if err := client.Sys().Mount("kv-v2/", &api.MountInput{
-		Type: "kv-v2",
-	}); err != nil {
-		tb.Fatal(err)
-	}
-
-	// populate dummy secrets
-	for _, path := range []string{
-		"foo",
-		"app-1/foo",
-		"app-1/bar",
-		"app-1/nested/baz",
-	} {
-		if err := client.KVv1("kv-v1").Put(ctx, path, map[string]interface{}{
-			"user":     "test",
-			"password": "Hashi123",
-		}); err != nil {
-			tb.Fatal(err)
-		}
-
-		if _, err := client.KVv2("kv-v2").Put(ctx, path, map[string]interface{}{
-			"user":     "test",
-			"password": "Hashi123",
-		}); err != nil {
-			tb.Fatal(err)
-		}
-	}
-
-	return client, closer
-}
-
 func testVaultServerWithKVVersion(tb testing.TB, kvVersion string) (*api.Client, func()) {
 	tb.Helper()
 
-	client, _, closer := testVaultServerUnsealWithKVVersionWithSeal(tb, kvVersion, nil)
+	client, _, closer := testVaultServerUnsealWithKVVersion(tb, kvVersion)
 	return client, closer
 }
 
@@ -137,24 +89,13 @@ func testVaultServerAllBackends(tb testing.TB) (*api.Client, func()) {
 	return client, closer
 }
 
-// testVaultServerAutoUnseal creates a test vault cluster and sets it up with auto unseal
-// the function returns a client, the recovery keys, and a closer function
-func testVaultServerAutoUnseal(tb testing.TB) (*api.Client, []string, func()) {
-	testSeal, _ := seal.NewTestSeal(nil)
-	autoSeal, err := vault.NewAutoSeal(testSeal)
-	if err != nil {
-		tb.Fatal("unable to create autoseal", err)
-	}
-	return testVaultServerUnsealWithKVVersionWithSeal(tb, "1", autoSeal)
-}
-
 // testVaultServerUnseal creates a test vault cluster and returns a configured
 // API client, list of unseal keys (as strings), and a closer function.
 func testVaultServerUnseal(tb testing.TB) (*api.Client, []string, func()) {
-	return testVaultServerUnsealWithKVVersionWithSeal(tb, "1", nil)
+	return testVaultServerUnsealWithKVVersion(tb, "1")
 }
 
-func testVaultServerUnsealWithKVVersionWithSeal(tb testing.TB, kvVersion string, seal vault.Seal) (*api.Client, []string, func()) {
+func testVaultServerUnsealWithKVVersion(tb testing.TB, kvVersion string) (*api.Client, []string, func()) {
 	tb.Helper()
 	logger := log.NewInterceptLogger(&log.LoggerOptions{
 		Output:     log.DefaultOutput,
@@ -170,7 +111,6 @@ func testVaultServerUnsealWithKVVersionWithSeal(tb testing.TB, kvVersion string,
 		AuditBackends:      defaultVaultAuditBackends,
 		LogicalBackends:    defaultVaultLogicalBackends,
 		BuiltinRegistry:    builtinplugins.Registry,
-		Seal:               seal,
 	}, &vault.TestClusterOptions{
 		HandlerFunc: vaulthttp.Handler,
 		NumCores:    1,
@@ -204,8 +144,7 @@ func testVaultServerCoreConfig(tb testing.TB, coreConfig *vault.CoreConfig) (*ap
 }
 
 // testVaultServerCoreConfig creates a new vault cluster with the given core
-// configuration. This is a lower-level test helper. If the seal config supports recovery keys, then
-// recovery keys are returned. Otherwise, unseal keys are returned
+// configuration. This is a lower-level test helper.
 func testVaultServerCoreConfigWithOpts(tb testing.TB, coreConfig *vault.CoreConfig, opts *vault.TestClusterOptions) (*api.Client, []string, func()) {
 	tb.Helper()
 
@@ -220,24 +159,14 @@ func testVaultServerCoreConfigWithOpts(tb testing.TB, coreConfig *vault.CoreConf
 	client := cluster.Cores[0].Client
 	client.SetToken(cluster.RootToken)
 
-	var keys [][]byte
-	if coreConfig.Seal != nil && coreConfig.Seal.RecoveryKeySupported() {
-		keys = cluster.RecoveryKeys
-	} else {
-		keys = cluster.BarrierKeys
+	// Convert the unseal keys to base64 encoded, since these are how the user
+	// will get them.
+	unsealKeys := make([]string, len(cluster.BarrierKeys))
+	for i := range unsealKeys {
+		unsealKeys[i] = base64.StdEncoding.EncodeToString(cluster.BarrierKeys[i])
 	}
 
-	return client, encodeKeys(keys), cluster.Cleanup
-}
-
-// Convert the unseal keys to base64 encoded, since these are how the user
-// will get them.
-func encodeKeys(rawKeys [][]byte) []string {
-	keys := make([]string, len(rawKeys))
-	for i := range rawKeys {
-		keys[i] = base64.StdEncoding.EncodeToString(rawKeys[i])
-	}
-	return keys
+	return client, unsealKeys, func() { defer cluster.Cleanup() }
 }
 
 // testVaultServerUninit creates an uninitialized server.
diff --git a/command/commands.go b/command/commands.go
index 68e2542b06db2..82b4919e05b95 100644
--- a/command/commands.go
+++ b/command/commands.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -12,7 +9,7 @@ import (
 	"github.com/hashicorp/vault/builtin/plugin"
 	"github.com/hashicorp/vault/sdk/logical"
 	"github.com/hashicorp/vault/sdk/physical"
-	"github.com/hashicorp/vault/version"
+	"github.com/hashicorp/vault/sdk/version"
 	"github.com/mitchellh/cli"
 
 	/*
@@ -85,17 +82,10 @@ const (
 	EnvVaultLicensePath = "VAULT_LICENSE_PATH"
 	// EnvVaultDetailed is to output detailed information (e.g., ListResponseWithInfo).
 	EnvVaultDetailed = `VAULT_DETAILED`
-	// EnvVaultLogFormat is used to specify the log format. Supported values are "standard" and "json"
-	EnvVaultLogFormat = "VAULT_LOG_FORMAT"
-	// EnvVaultLogLevel is used to specify the log level applied to logging
-	// Supported log levels: Trace, Debug, Error, Warn, Info
-	EnvVaultLogLevel = "VAULT_LOG_LEVEL"
-	// EnvVaultExperiments defines the experiments to enable for a server as a
-	// comma separated list. See experiments.ValidExperiments() for the list of
-	// valid experiments. Not mutable or persisted in storage, only read and
-	// logged at startup _per node_. This was initially introduced for the events
-	// system being developed over multiple release cycles.
-	EnvVaultExperiments = "VAULT_EXPERIMENTS"
+
+	// DisableSSCTokens is an env var used to disable index bearing
+	// token functionality
+	DisableSSCTokens = "VAULT_DISABLE_SERVER_SIDE_CONSISTENT_TOKENS"
 
 	// flagNameAddress is the flag used in the base command to read in the
 	// address of the Vault server.
@@ -136,31 +126,8 @@ const (
 	flagNameAllowedManagedKeys = "allowed-managed-keys"
 	// flagNamePluginVersion selects what version of a plugin should be used.
 	flagNamePluginVersion = "plugin-version"
-	// flagNameUserLockoutThreshold is the flag name used for tuning the auth mount lockout threshold parameter
-	flagNameUserLockoutThreshold = "user-lockout-threshold"
-	// flagNameUserLockoutDuration is the flag name used for tuning the auth mount lockout duration parameter
-	flagNameUserLockoutDuration = "user-lockout-duration"
-	// flagNameUserLockoutCounterResetDuration is the flag name used for tuning the auth mount lockout counter reset parameter
-	flagNameUserLockoutCounterResetDuration = "user-lockout-counter-reset-duration"
-	// flagNameUserLockoutDisable is the flag name used for tuning the auth mount disable lockout parameter
-	flagNameUserLockoutDisable = "user-lockout-disable"
 	// flagNameDisableRedirects is used to prevent the client from honoring a single redirect as a response to a request
 	flagNameDisableRedirects = "disable-redirects"
-	// flagNameCombineLogs is used to specify whether log output should be combined and sent to stdout
-	flagNameCombineLogs = "combine-logs"
-	// flagNameLogFile is used to specify the path to the log file that Vault should use for logging
-	flagNameLogFile = "log-file"
-	// flagNameLogRotateBytes is the flag used to specify the number of bytes a log file should be before it is rotated.
-	flagNameLogRotateBytes = "log-rotate-bytes"
-	// flagNameLogRotateDuration is the flag used to specify the duration after which a log file should be rotated.
-	flagNameLogRotateDuration = "log-rotate-duration"
-	// flagNameLogRotateMaxFiles is the flag used to specify the maximum number of older/archived log files to keep.
-	flagNameLogRotateMaxFiles = "log-rotate-max-files"
-	// flagNameLogFormat is the flag used to specify the log format. Supported values are "standard" and "json"
-	flagNameLogFormat = "log-format"
-	// flagNameLogLevel is used to specify the log level applied to logging
-	// Supported log levels: Trace, Debug, Error, Warn, Info
-	flagNameLogLevel = "log-level"
 )
 
 var (
@@ -218,10 +185,13 @@ var (
 		"kubernetes": ksr.NewServiceRegistration,
 	}
 
-	initCommandsEnt = func(ui, serverCmdUi cli.Ui, runOpts *RunOptions, commands map[string]cli.CommandFactory) {}
+	initCommandsEnt = func(ui, serverCmdUi cli.Ui, runOpts *RunOptions) {}
 )
 
-func initCommands(ui, serverCmdUi cli.Ui, runOpts *RunOptions) map[string]cli.CommandFactory {
+// Commands is the mapping of all the available commands.
+var Commands map[string]cli.CommandFactory
+
+func initCommands(ui, serverCmdUi cli.Ui, runOpts *RunOptions) {
 	loginHandlers := map[string]LoginHandler{
 		"alicloud": &credAliCloud.CLIHandler{},
 		"aws":      &credAws.CLIHandler{},
@@ -254,19 +224,13 @@ func initCommands(ui, serverCmdUi cli.Ui, runOpts *RunOptions) map[string]cli.Co
 		}
 	}
 
-	commands := map[string]cli.CommandFactory{
+	Commands = map[string]cli.CommandFactory{
 		"agent": func() (cli.Command, error) {
 			return &AgentCommand{
 				BaseCommand: &BaseCommand{
 					UI: serverCmdUi,
 				},
 				ShutdownCh: MakeShutdownCh(),
-				SighupCh:   MakeSighupCh(),
-			}, nil
-		},
-		"agent generate-config": func() (cli.Command, error) {
-			return &AgentGenerateConfigCommand{
-				BaseCommand: getBaseCommand(),
 			}, nil
 		},
 		"audit": func() (cli.Command, error) {
@@ -336,11 +300,6 @@ func initCommands(ui, serverCmdUi cli.Ui, runOpts *RunOptions) map[string]cli.Co
 				BaseCommand: getBaseCommand(),
 			}, nil
 		},
-		"events subscribe": func() (cli.Command, error) {
-			return &EventsSubscribeCommands{
-				BaseCommand: getBaseCommand(),
-			}, nil
-		},
 		"lease": func() (cli.Command, error) {
 			return &LeaseCommand{
 				BaseCommand: getBaseCommand(),
@@ -529,46 +488,11 @@ func initCommands(ui, serverCmdUi cli.Ui, runOpts *RunOptions) map[string]cli.Co
 				BaseCommand: getBaseCommand(),
 			}, nil
 		},
-		"patch": func() (cli.Command, error) {
-			return &PatchCommand{
-				BaseCommand: getBaseCommand(),
-			}, nil
-		},
 		"path-help": func() (cli.Command, error) {
 			return &PathHelpCommand{
 				BaseCommand: getBaseCommand(),
 			}, nil
 		},
-		"pki": func() (cli.Command, error) {
-			return &PKICommand{
-				BaseCommand: getBaseCommand(),
-			}, nil
-		},
-		"pki health-check": func() (cli.Command, error) {
-			return &PKIHealthCheckCommand{
-				BaseCommand: getBaseCommand(),
-			}, nil
-		},
-		"pki issue": func() (cli.Command, error) {
-			return &PKIIssueCACommand{
-				BaseCommand: getBaseCommand(),
-			}, nil
-		},
-		"pki list-intermediates": func() (cli.Command, error) {
-			return &PKIListIntermediateCommand{
-				BaseCommand: getBaseCommand(),
-			}, nil
-		},
-		"pki reissue": func() (cli.Command, error) {
-			return &PKIReIssueCACommand{
-				BaseCommand: getBaseCommand(),
-			}, nil
-		},
-		"pki verify-sign": func() (cli.Command, error) {
-			return &PKIVerifySignCommand{
-				BaseCommand: getBaseCommand(),
-			}, nil
-		},
 		"plugin": func() (cli.Command, error) {
 			return &PluginCommand{
 				BaseCommand: getBaseCommand(),
@@ -604,15 +528,6 @@ func initCommands(ui, serverCmdUi cli.Ui, runOpts *RunOptions) map[string]cli.Co
 				BaseCommand: getBaseCommand(),
 			}, nil
 		},
-		"proxy": func() (cli.Command, error) {
-			return &ProxyCommand{
-				BaseCommand: &BaseCommand{
-					UI: serverCmdUi,
-				},
-				ShutdownCh: MakeShutdownCh(),
-				SighupCh:   MakeSighupCh(),
-			}, nil
-		},
 		"policy": func() (cli.Command, error) {
 			return &PolicyCommand{
 				BaseCommand: getBaseCommand(),
@@ -717,36 +632,6 @@ func initCommands(ui, serverCmdUi cli.Ui, runOpts *RunOptions) map[string]cli.Co
 				BaseCommand: getBaseCommand(),
 			}, nil
 		},
-		"transform": func() (cli.Command, error) {
-			return &TransformCommand{
-				BaseCommand: getBaseCommand(),
-			}, nil
-		},
-		"transform import": func() (cli.Command, error) {
-			return &TransformImportCommand{
-				BaseCommand: getBaseCommand(),
-			}, nil
-		},
-		"transform import-version": func() (cli.Command, error) {
-			return &TransformImportVersionCommand{
-				BaseCommand: getBaseCommand(),
-			}, nil
-		},
-		"transit": func() (cli.Command, error) {
-			return &TransitCommand{
-				BaseCommand: getBaseCommand(),
-			}, nil
-		},
-		"transit import": func() (cli.Command, error) {
-			return &TransitImportCommand{
-				BaseCommand: getBaseCommand(),
-			}, nil
-		},
-		"transit import-version": func() (cli.Command, error) {
-			return &TransitImportVersionCommand{
-				BaseCommand: getBaseCommand(),
-			}, nil
-		},
 		"token": func() (cli.Command, error) {
 			return &TokenCommand{
 				BaseCommand: getBaseCommand(),
@@ -881,8 +766,16 @@ func initCommands(ui, serverCmdUi cli.Ui, runOpts *RunOptions) map[string]cli.Co
 		},
 	}
 
-	initCommandsEnt(ui, serverCmdUi, runOpts, commands)
-	return commands
+	// Disabled by default until functional
+	if os.Getenv(OperatorDiagnoseEnableEnv) != "" {
+		Commands["operator diagnose"] = func() (cli.Command, error) {
+			return &OperatorDiagnoseCommand{
+				BaseCommand: getBaseCommand(),
+			}, nil
+		}
+	}
+
+	initCommandsEnt(ui, serverCmdUi, runOpts)
 }
 
 // MakeShutdownCh returns a channel that can be used for shutdown
diff --git a/command/commands_nonwindows.go b/command/commands_nonwindows.go
index f8d128c3fd425..c94c485f49075 100644
--- a/command/commands_nonwindows.go
+++ b/command/commands_nonwindows.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !windows
 
 package command
diff --git a/command/commands_windows.go b/command/commands_windows.go
index 541a6e4aea8ec..ed06a07406f63 100644
--- a/command/commands_windows.go
+++ b/command/commands_windows.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build windows
 
 package command
diff --git a/command/config.go b/command/config.go
index 3fbc53a966707..b46581fc80b70 100644
--- a/command/config.go
+++ b/command/config.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/config/config.go b/command/config/config.go
index 71f9127887d7a..ef0c4adf6dcd8 100644
--- a/command/config/config.go
+++ b/command/config/config.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package config
 
 import (
diff --git a/command/config/config_test.go b/command/config/config_test.go
index fef151622259a..b5d41361e9b71 100644
--- a/command/config/config_test.go
+++ b/command/config/config_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package config
 
 import (
diff --git a/command/config/util.go b/command/config/util.go
index f295f462ae503..1ac47df7e0533 100644
--- a/command/config/util.go
+++ b/command/config/util.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package config
 
 import (
diff --git a/command/config/validate_listener.go b/command/config/validate_listener.go
index e2d27166a04db..7a56ec6998508 100644
--- a/command/config/validate_listener.go
+++ b/command/config/validate_listener.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !fips_140_3
 
 package config
diff --git a/command/config_test.go b/command/config_test.go
index 787c6795765a0..0ed34992f3a4c 100644
--- a/command/config_test.go
+++ b/command/config_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/debug.go b/command/debug.go
index e5440b3b88881..71e1a97c8da7e 100644
--- a/command/debug.go
+++ b/command/debug.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -24,7 +21,7 @@ import (
 	"github.com/hashicorp/vault/helper/osutil"
 	"github.com/hashicorp/vault/sdk/helper/jsonutil"
 	"github.com/hashicorp/vault/sdk/helper/logging"
-	"github.com/hashicorp/vault/version"
+	"github.com/hashicorp/vault/sdk/version"
 	"github.com/mholt/archiver/v3"
 	"github.com/mitchellh/cli"
 	"github.com/oklog/run"
diff --git a/command/debug_test.go b/command/debug_test.go
index e63e1ebed0585..de51c770f5acb 100644
--- a/command/debug_test.go
+++ b/command/debug_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/delete.go b/command/delete.go
index 7da6dd2d98479..78d786f11756c 100644
--- a/command/delete.go
+++ b/command/delete.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/delete_test.go b/command/delete_test.go
index 629be7abb42c2..e26d393b16fea 100644
--- a/command/delete_test.go
+++ b/command/delete_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/events.go b/command/events.go
deleted file mode 100644
index 353c97947d96d..0000000000000
--- a/command/events.go
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package command
-
-import (
-	"context"
-	"fmt"
-	"net/http"
-	"os"
-	"strings"
-
-	"github.com/hashicorp/vault/api"
-	"github.com/mitchellh/cli"
-	"github.com/posener/complete"
-	"nhooyr.io/websocket"
-)
-
-var (
-	_ cli.Command             = (*EventsSubscribeCommands)(nil)
-	_ cli.CommandAutocomplete = (*EventsSubscribeCommands)(nil)
-)
-
-type EventsSubscribeCommands struct {
-	*BaseCommand
-}
-
-func (c *EventsSubscribeCommands) Synopsis() string {
-	return "Subscribe to events"
-}
-
-func (c *EventsSubscribeCommands) Help() string {
-	helpText := `
-Usage: vault events subscribe [-format=json] [-timeout=XYZs] eventType
-
-  Subscribe to events of the given event type (topic). The events will be
-  output to standard out.
-
-  The output will be a JSON object serialized using the default protobuf
-  JSON serialization format, with one line per event received.
-` + c.Flags().Help()
-	return strings.TrimSpace(helpText)
-}
-
-func (c *EventsSubscribeCommands) Flags() *FlagSets {
-	set := c.flagSet(FlagSetHTTP)
-
-	return set
-}
-
-func (c *EventsSubscribeCommands) AutocompleteArgs() complete.Predictor {
-	return nil
-}
-
-func (c *EventsSubscribeCommands) AutocompleteFlags() complete.Flags {
-	return c.Flags().Completions()
-}
-
-func (c *EventsSubscribeCommands) Run(args []string) int {
-	f := c.Flags()
-
-	if err := f.Parse(args); err != nil {
-		c.UI.Error(err.Error())
-		return 1
-	}
-
-	args = f.Args()
-	switch {
-	case len(args) < 1:
-		c.UI.Error(fmt.Sprintf("Not enough arguments (expected 1, got %d)", len(args)))
-		return 1
-	case len(args) > 1:
-		c.UI.Error(fmt.Sprintf("Too many arguments (expected 1, got %d)", len(args)))
-		return 1
-	}
-
-	client, err := c.Client()
-	if err != nil {
-		c.UI.Error(err.Error())
-		return 2
-	}
-
-	err = c.subscribeRequest(client, "sys/events/subscribe/"+args[0])
-	if err != nil {
-		c.UI.Error(err.Error())
-		return 1
-	}
-	return 0
-}
-
-func (c *EventsSubscribeCommands) subscribeRequest(client *api.Client, path string) error {
-	r := client.NewRequest("GET", "/v1/"+path)
-	u := r.URL
-	if u.Scheme == "http" {
-		u.Scheme = "ws"
-	} else {
-		u.Scheme = "wss"
-	}
-	q := u.Query()
-	q.Set("json", "true")
-	u.RawQuery = q.Encode()
-	client.AddHeader("X-Vault-Token", client.Token())
-	client.AddHeader("X-Vault-Namesapce", client.Namespace())
-	ctx := context.Background()
-	conn, resp, err := websocket.Dial(ctx, u.String(), &websocket.DialOptions{
-		HTTPClient: client.CloneConfig().HttpClient,
-		HTTPHeader: client.Headers(),
-	})
-	if err != nil {
-		if resp != nil && resp.StatusCode == http.StatusNotFound {
-			return fmt.Errorf("events endpoint not found; check `vault read sys/experiments` to see if an events experiment is available but disabled")
-		}
-		return err
-	}
-	defer conn.Close(websocket.StatusNormalClosure, "")
-
-	for {
-		_, message, err := conn.Read(ctx)
-		if err != nil {
-			return err
-		}
-		_, err = os.Stdout.Write(message)
-		if err != nil {
-			return err
-		}
-	}
-}
diff --git a/command/events_test.go b/command/events_test.go
deleted file mode 100644
index bb2aef0b37baa..0000000000000
--- a/command/events_test.go
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package command
-
-import (
-	"strings"
-	"testing"
-
-	"github.com/mitchellh/cli"
-)
-
-func testEventsSubscribeCommand(tb testing.TB) (*cli.MockUi, *EventsSubscribeCommands) {
-	tb.Helper()
-
-	ui := cli.NewMockUi()
-	return ui, &EventsSubscribeCommands{
-		BaseCommand: &BaseCommand{
-			UI: ui,
-		},
-	}
-}
-
-// TestEventsSubscribeCommand_Run tests that the command argument parsing is working as expected.
-func TestEventsSubscribeCommand_Run(t *testing.T) {
-	t.Parallel()
-
-	cases := []struct {
-		name string
-		args []string
-		out  string
-		code int
-	}{
-		{
-			"not_enough_args",
-			[]string{},
-			"Not enough arguments",
-			1,
-		},
-		{
-			"too_many_args",
-			[]string{"foo", "bar"},
-			"Too many arguments",
-			1,
-		},
-	}
-
-	for _, tc := range cases {
-		tc := tc
-
-		t.Run(tc.name, func(t *testing.T) {
-			t.Parallel()
-
-			client, closer := testVaultServer(t)
-			defer closer()
-
-			ui, cmd := testEventsSubscribeCommand(t)
-			cmd.client = client
-
-			code := cmd.Run(tc.args)
-			if code != tc.code {
-				t.Errorf("expected %d to be %d", code, tc.code)
-			}
-
-			combined := ui.OutputWriter.String() + ui.ErrorWriter.String()
-			if !strings.Contains(combined, tc.out) {
-				t.Errorf("expected %q to contain %q", combined, tc.out)
-			}
-		})
-	}
-}
diff --git a/command/format.go b/command/format.go
index 5e42d31d1f9ab..4dffed6463592 100644
--- a/command/format.go
+++ b/command/format.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -73,7 +70,6 @@ var Formatters = map[string]Formatter{
 	"yaml":   YamlFormatter{},
 	"yml":    YamlFormatter{},
 	"pretty": PrettyFormatter{},
-	"raw":    RawFormatter{},
 }
 
 func Format(ui cli.Ui) string {
@@ -129,27 +125,6 @@ func (j JsonFormatter) Output(ui cli.Ui, secret *api.Secret, data interface{}) e
 	return nil
 }
 
-// An output formatter for raw output of the original request object
-type RawFormatter struct{}
-
-func (r RawFormatter) Format(data interface{}) ([]byte, error) {
-	byte_data, ok := data.([]byte)
-	if !ok {
-		return nil, fmt.Errorf("This command does not support the -format=raw option; only `vault read` does.")
-	}
-
-	return byte_data, nil
-}
-
-func (r RawFormatter) Output(ui cli.Ui, secret *api.Secret, data interface{}) error {
-	b, err := r.Format(data)
-	if err != nil {
-		return err
-	}
-	ui.Output(string(b))
-	return nil
-}
-
 // An output formatter for yaml output format of an object
 type YamlFormatter struct{}
 
@@ -405,9 +380,6 @@ func (t TableFormatter) OutputSealStatusStruct(ui cli.Ui, secret *api.Secret, da
 	if status.LastWAL != 0 {
 		out = append(out, fmt.Sprintf("Last WAL | %d", status.LastWAL))
 	}
-	if len(status.Warnings) > 0 {
-		out = append(out, fmt.Sprintf("Warnings | %v", status.Warnings))
-	}
 
 	ui.Output(tableOutput(out, &columnize.Config{
 		Delim: "|",
@@ -560,9 +532,6 @@ func (t TableFormatter) OutputSecret(ui cli.Ui, secret *api.Secret) error {
 				for _, constraint := range constraintSet.Any {
 					out = append(out, fmt.Sprintf("mfa_constraint_%s_%s_id %s %s", k, constraint.Type, hopeDelim, constraint.ID))
 					out = append(out, fmt.Sprintf("mfa_constraint_%s_%s_uses_passcode %s %t", k, constraint.Type, hopeDelim, constraint.UsesPasscode))
-					if constraint.Name != "" {
-						out = append(out, fmt.Sprintf("mfa_constraint_%s_%s_name %s %s", k, constraint.Type, hopeDelim, constraint.Name))
-					}
 				}
 			}
 		} else { // Token information only makes sense if no further MFA requirement (i.e. if we actually have a token)
diff --git a/command/format_test.go b/command/format_test.go
index 2bdc45ebe57ae..3d1a3333ca594 100644
--- a/command/format_test.go
+++ b/command/format_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -16,10 +13,11 @@ import (
 	"github.com/hashicorp/vault/sdk/helper/jsonutil"
 )
 
+var output string
+
 type mockUi struct {
 	t          *testing.T
 	SampleData string
-	outputData *string
 }
 
 func (m mockUi) Ask(_ string) (string, error) {
@@ -31,15 +29,14 @@ func (m mockUi) AskSecret(_ string) (string, error) {
 	m.t.FailNow()
 	return "", nil
 }
-func (m mockUi) Output(s string) { *m.outputData = s }
+func (m mockUi) Output(s string) { output = s }
 func (m mockUi) Info(s string)   { m.t.Log(s) }
 func (m mockUi) Error(s string)  { m.t.Log(s) }
 func (m mockUi) Warn(s string)   { m.t.Log(s) }
 
 func TestJsonFormatter(t *testing.T) {
 	os.Setenv(EnvVaultFormat, "json")
-	var output string
-	ui := mockUi{t: t, SampleData: "something", outputData: &output}
+	ui := mockUi{t: t, SampleData: "something"}
 	if err := outputWithFormat(ui, nil, ui); err != 0 {
 		t.Fatal(err)
 	}
@@ -56,8 +53,7 @@ func TestJsonFormatter(t *testing.T) {
 
 func TestYamlFormatter(t *testing.T) {
 	os.Setenv(EnvVaultFormat, "yaml")
-	var output string
-	ui := mockUi{t: t, SampleData: "something", outputData: &output}
+	ui := mockUi{t: t, SampleData: "something"}
 	if err := outputWithFormat(ui, nil, ui); err != 0 {
 		t.Fatal(err)
 	}
@@ -75,8 +71,7 @@ func TestYamlFormatter(t *testing.T) {
 
 func TestTableFormatter(t *testing.T) {
 	os.Setenv(EnvVaultFormat, "table")
-	var output string
-	ui := mockUi{t: t, outputData: &output}
+	ui := mockUi{t: t}
 
 	// Testing secret formatting
 	s := api.Secret{Data: map[string]interface{}{"k": "something"}}
@@ -93,8 +88,7 @@ func TestTableFormatter(t *testing.T) {
 // fields in the embedded struct explicitly. It also checks the spacing,
 // indentation, and delimiters of table formatting explicitly.
 func TestStatusFormat(t *testing.T) {
-	var output string
-	ui := mockUi{t: t, outputData: &output}
+	ui := mockUi{t: t}
 	os.Setenv(EnvVaultFormat, "table")
 
 	statusHA := getMockStatusData(false)
@@ -124,8 +118,7 @@ Cluster ID                    cluster id
 HA Enabled                    true
 Raft Committed Index          3
 Raft Applied Index            4
-Last WAL                      2
-Warnings                      [warning]`
+Last WAL                      2`
 
 	if expectedOutputString != output {
 		fmt.Printf("%s\n%+v\n %s\n%+v\n", "output found was: ", output, "versus", expectedOutputString)
@@ -181,7 +174,6 @@ func getMockStatusData(emptyFields bool) SealStatusOutput {
 			ClusterID:    "cluster id",
 			RecoverySeal: true,
 			StorageType:  "storage type",
-			Warnings:     []string{"warning"},
 		}
 
 		// must initialize this struct without explicit field names due to embedding
diff --git a/command/healthcheck/healthcheck.go b/command/healthcheck/healthcheck.go
deleted file mode 100644
index a6fb2040eedbc..0000000000000
--- a/command/healthcheck/healthcheck.go
+++ /dev/null
@@ -1,292 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-/*
- * The healthcheck package attempts to allow generic checks of arbitrary
- * engines, while providing a common framework with some performance
- * efficiencies in mind.
- *
- * The core of this package is the Executor context; a caller would
- * provision a set of checks, an API client, and a configuration,
- * which the executor would use to decide which checks to execute
- * and how.
- *
- * Checks are based around a series of remote paths that are fetched by
- * the client; these are broken into two categories: static paths, which
- * can always be fetched; and dynamic paths, which the check fetches based
- * on earlier results.
- *
- * For instance, a basic PKI CA lifetime check will have static fetch against
- * the list of CAs, and a dynamic fetch, using that earlier list, to fetch the
- * PEMs of all CAs.
- *
- * This allows health checks to share data: many PKI checks will need the
- * issuer list and so repeatedly fetching this may result in a performance
- * impact.
- */
-
-package healthcheck
-
-import (
-	"context"
-	"fmt"
-	"strings"
-
-	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/sdk/logical"
-)
-
-type Executor struct {
-	Client         *api.Client
-	Mount          string
-	DefaultEnabled bool
-
-	Config map[string]map[string]interface{}
-
-	Resources map[string]map[logical.Operation]*PathFetch
-
-	Checkers []Check
-}
-
-func NewExecutor(client *api.Client, mount string) *Executor {
-	return &Executor{
-		Client:         client,
-		DefaultEnabled: true,
-		Mount:          mount,
-		Config:         make(map[string]map[string]interface{}),
-		Resources:      make(map[string]map[logical.Operation]*PathFetch),
-	}
-}
-
-func (e *Executor) AddCheck(c Check) {
-	e.Checkers = append(e.Checkers, c)
-}
-
-func (e *Executor) BuildConfig(external map[string]interface{}) error {
-	merged := e.Config
-
-	for index, checker := range e.Checkers {
-		name := checker.Name()
-		if _, present := merged[name]; name == "" || present {
-			return fmt.Errorf("bad checker %v: name is empty or already present: %v", index, name)
-		}
-
-		// Fetch the default configuration; if the check returns enabled
-		// status, verify it matches our expectations (in the event it should
-		// be disabled by default), otherwise, add it in.
-		config := checker.DefaultConfig()
-		enabled, present := config["enabled"]
-		if !present {
-			config["enabled"] = e.DefaultEnabled
-		} else if enabled.(bool) && !e.DefaultEnabled {
-			config["enabled"] = e.DefaultEnabled
-		}
-
-		// Now apply any external config for this check.
-		if econfig, present := external[name]; present {
-			for param, evalue := range econfig.(map[string]interface{}) {
-				if _, ok := config[param]; !ok {
-					// Assumption: default configs have all possible
-					// configuration options. This external config has
-					// an unknown option, so we want to error out.
-					return fmt.Errorf("unknown configuration option for %v: %v", name, param)
-				}
-
-				config[param] = evalue
-			}
-		}
-
-		// Now apply it and save it.
-		if err := checker.LoadConfig(config); err != nil {
-			return fmt.Errorf("error saving merged config for %v: %w", name, err)
-		}
-		merged[name] = config
-	}
-
-	return nil
-}
-
-func (e *Executor) Execute() (map[string][]*Result, error) {
-	ret := make(map[string][]*Result)
-	for _, checker := range e.Checkers {
-		if !checker.IsEnabled() {
-			continue
-		}
-
-		if err := checker.FetchResources(e); err != nil {
-			return nil, fmt.Errorf("failed to fetch resources %v: %w", checker.Name(), err)
-		}
-
-		results, err := checker.Evaluate(e)
-		if err != nil {
-			return nil, fmt.Errorf("failed to evaluate %v: %w", checker.Name(), err)
-		}
-
-		if results == nil {
-			results = []*Result{}
-		}
-
-		for _, result := range results {
-			result.Endpoint = e.templatePath(result.Endpoint)
-			result.StatusDisplay = ResultStatusNameMap[result.Status]
-		}
-
-		ret[checker.Name()] = results
-	}
-
-	return ret, nil
-}
-
-func (e *Executor) templatePath(path string) string {
-	return strings.ReplaceAll(path, "{{mount}}", e.Mount)
-}
-
-func (e *Executor) FetchIfNotFetched(op logical.Operation, rawPath string) (*PathFetch, error) {
-	path := e.templatePath(rawPath)
-
-	byOp, present := e.Resources[path]
-	if present && byOp != nil {
-		result, present := byOp[op]
-		if present && result != nil {
-			return result, result.FetchSurfaceError()
-		}
-	}
-
-	// Must not exist in cache; create it.
-	if byOp == nil {
-		e.Resources[path] = make(map[logical.Operation]*PathFetch)
-	}
-
-	ret := &PathFetch{
-		Operation:   op,
-		Path:        path,
-		ParsedCache: make(map[string]interface{}),
-	}
-
-	data := map[string][]string{}
-	if op == logical.ListOperation {
-		data["list"] = []string{"true"}
-	} else if op != logical.ReadOperation {
-		return nil, fmt.Errorf("unknown operation: %v on %v", op, path)
-	}
-
-	// client.ReadRaw* methods require a manual timeout override
-	ctx, cancel := context.WithTimeout(context.Background(), e.Client.ClientTimeout())
-	defer cancel()
-
-	response, err := e.Client.Logical().ReadRawWithDataWithContext(ctx, path, data)
-	ret.Response = response
-	if err != nil {
-		ret.FetchError = err
-	} else {
-		// Not all secrets will parse correctly. Sometimes we really want
-		// to fetch a raw endpoint, sometimes we're run with a bad mount
-		// or missing permissions.
-		secret, secretErr := e.Client.Logical().ParseRawResponseAndCloseBody(response, err)
-		if secretErr != nil {
-			ret.SecretParseError = secretErr
-		} else {
-			ret.Secret = secret
-		}
-	}
-
-	e.Resources[path][op] = ret
-	return ret, ret.FetchSurfaceError()
-}
-
-type PathFetch struct {
-	Operation        logical.Operation
-	Path             string
-	Response         *api.Response
-	FetchError       error
-	Secret           *api.Secret
-	SecretParseError error
-	ParsedCache      map[string]interface{}
-}
-
-func (p *PathFetch) IsOK() bool {
-	return p.FetchError == nil && p.Response != nil
-}
-
-func (p *PathFetch) IsSecretOK() bool {
-	return p.IsOK() && p.SecretParseError == nil && p.Secret != nil
-}
-
-func (p *PathFetch) FetchSurfaceError() error {
-	if p.IsOK() || p.IsSecretPermissionsError() || p.IsUnsupportedPathError() || p.IsMissingResource() || p.Is404NotFound() {
-		return nil
-	}
-
-	if strings.Contains(p.FetchError.Error(), "route entry not found") {
-		return fmt.Errorf("Error making API request: was a bad mount given?\n\nOperation: %v\nPath: %v\nOriginal Error:\n%w", p.Operation, p.Path, p.FetchError)
-	}
-
-	return p.FetchError
-}
-
-func (p *PathFetch) IsSecretPermissionsError() bool {
-	return !p.IsOK() && strings.Contains(p.FetchError.Error(), "permission denied")
-}
-
-func (p *PathFetch) IsUnsupportedPathError() bool {
-	return !p.IsOK() && strings.Contains(p.FetchError.Error(), "unsupported path")
-}
-
-func (p *PathFetch) IsMissingResource() bool {
-	return !p.IsOK() && strings.Contains(p.FetchError.Error(), "unable to find")
-}
-
-func (p *PathFetch) Is404NotFound() bool {
-	return !p.IsOK() && strings.HasSuffix(strings.TrimSpace(p.FetchError.Error()), "Code: 404. Errors:")
-}
-
-type Check interface {
-	Name() string
-	IsEnabled() bool
-
-	DefaultConfig() map[string]interface{}
-	LoadConfig(config map[string]interface{}) error
-
-	FetchResources(e *Executor) error
-
-	Evaluate(e *Executor) ([]*Result, error)
-}
-
-type ResultStatus int
-
-const (
-	ResultNotApplicable ResultStatus = iota
-	ResultOK
-	ResultInformational
-	ResultWarning
-	ResultCritical
-	ResultInvalidVersion
-	ResultInsufficientPermissions
-)
-
-var ResultStatusNameMap = map[ResultStatus]string{
-	ResultNotApplicable:           "not_applicable",
-	ResultOK:                      "ok",
-	ResultInformational:           "informational",
-	ResultWarning:                 "warning",
-	ResultCritical:                "critical",
-	ResultInvalidVersion:          "invalid_version",
-	ResultInsufficientPermissions: "insufficient_permissions",
-}
-
-var NameResultStatusMap = map[string]ResultStatus{
-	"not_applicable":           ResultNotApplicable,
-	"ok":                       ResultOK,
-	"informational":            ResultInformational,
-	"warning":                  ResultWarning,
-	"critical":                 ResultCritical,
-	"invalid_version":          ResultInvalidVersion,
-	"insufficient_permissions": ResultInsufficientPermissions,
-}
-
-type Result struct {
-	Status        ResultStatus `json:"status_code"`
-	StatusDisplay string       `json:"status"`
-	Endpoint      string       `json:"endpoint,omitempty"`
-	Message       string       `json:"message,omitempty"`
-}
diff --git a/command/healthcheck/pki.go b/command/healthcheck/pki.go
deleted file mode 100644
index 42f4fc485865f..0000000000000
--- a/command/healthcheck/pki.go
+++ /dev/null
@@ -1,283 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package healthcheck
-
-import (
-	"crypto/x509"
-	"encoding/pem"
-	"fmt"
-
-	"github.com/hashicorp/vault/sdk/logical"
-)
-
-func pkiFetchIssuersList(e *Executor, versionError func()) (bool, *PathFetch, []string, error) {
-	issuersRet, err := e.FetchIfNotFetched(logical.ListOperation, "/{{mount}}/issuers")
-	if err != nil {
-		return true, issuersRet, nil, err
-	}
-
-	if !issuersRet.IsSecretOK() {
-		if issuersRet.IsUnsupportedPathError() {
-			versionError()
-		}
-
-		if issuersRet.Is404NotFound() {
-			return true, issuersRet, nil, fmt.Errorf("this mount lacks any configured issuers, limiting health check usefulness")
-		}
-
-		return true, issuersRet, nil, nil
-	}
-
-	if len(issuersRet.ParsedCache) == 0 {
-		var issuers []string
-		for _, rawIssuerId := range issuersRet.Secret.Data["keys"].([]interface{}) {
-			issuers = append(issuers, rawIssuerId.(string))
-		}
-		issuersRet.ParsedCache["issuers"] = issuers
-	}
-
-	return false, issuersRet, issuersRet.ParsedCache["issuers"].([]string), nil
-}
-
-func parsePEM(contents string) ([]byte, error) {
-	// Need to parse out the issuer from its PEM format.
-	pemBlock, _ := pem.Decode([]byte(contents))
-	if pemBlock == nil {
-		return nil, fmt.Errorf("invalid PEM block")
-	}
-
-	return pemBlock.Bytes, nil
-}
-
-func ParsePEMCert(contents string) (*x509.Certificate, error) {
-	parsed, err := parsePEM(contents)
-	if err != nil {
-		return nil, err
-	}
-
-	cert, err := x509.ParseCertificate(parsed)
-	if err != nil {
-		return nil, fmt.Errorf("invalid certificate: %w", err)
-	}
-
-	return cert, nil
-}
-
-func parsePEMCRL(contents string) (*x509.RevocationList, error) {
-	parsed, err := parsePEM(contents)
-	if err != nil {
-		return nil, err
-	}
-
-	crl, err := x509.ParseRevocationList(parsed)
-	if err != nil {
-		return nil, fmt.Errorf("invalid CRL: %w", err)
-	}
-
-	return crl, nil
-}
-
-func pkiFetchIssuer(e *Executor, issuer string, versionError func()) (bool, *PathFetch, *x509.Certificate, error) {
-	issuerRet, err := e.FetchIfNotFetched(logical.ReadOperation, "/{{mount}}/issuer/"+issuer+"/json")
-	if err != nil {
-		return true, issuerRet, nil, err
-	}
-
-	if !issuerRet.IsSecretOK() {
-		if issuerRet.IsUnsupportedPathError() {
-			versionError()
-		}
-		return true, issuerRet, nil, nil
-	}
-
-	if len(issuerRet.ParsedCache) == 0 {
-		cert, err := ParsePEMCert(issuerRet.Secret.Data["certificate"].(string))
-		if err != nil {
-			return true, issuerRet, nil, fmt.Errorf("unable to parse issuer %v's certificate: %w", issuer, err)
-		}
-
-		issuerRet.ParsedCache["certificate"] = cert
-	}
-
-	return false, issuerRet, issuerRet.ParsedCache["certificate"].(*x509.Certificate), nil
-}
-
-func pkiFetchIssuerEntry(e *Executor, issuer string, versionError func()) (bool, *PathFetch, map[string]interface{}, error) {
-	issuerRet, err := e.FetchIfNotFetched(logical.ReadOperation, "/{{mount}}/issuer/"+issuer)
-	if err != nil {
-		return true, issuerRet, nil, err
-	}
-
-	if !issuerRet.IsSecretOK() {
-		if issuerRet.IsUnsupportedPathError() {
-			versionError()
-		}
-		return true, issuerRet, nil, nil
-	}
-
-	if len(issuerRet.ParsedCache) == 0 {
-		cert, err := ParsePEMCert(issuerRet.Secret.Data["certificate"].(string))
-		if err != nil {
-			return true, issuerRet, nil, fmt.Errorf("unable to parse issuer %v's certificate: %w", issuer, err)
-		}
-
-		issuerRet.ParsedCache["certificate"] = cert
-	}
-
-	var data map[string]interface{} = nil
-	if issuerRet.Secret != nil && len(issuerRet.Secret.Data) > 0 {
-		data = issuerRet.Secret.Data
-	}
-
-	return false, issuerRet, data, nil
-}
-
-func pkiFetchIssuerCRL(e *Executor, issuer string, delta bool, versionError func()) (bool, *PathFetch, *x509.RevocationList, error) {
-	path := "/{{mount}}/issuer/" + issuer + "/crl"
-	name := "CRL"
-	if delta {
-		path += "/delta"
-		name = "Delta CRL"
-	}
-
-	crlRet, err := e.FetchIfNotFetched(logical.ReadOperation, path)
-	if err != nil {
-		return true, crlRet, nil, err
-	}
-
-	if !crlRet.IsSecretOK() {
-		if crlRet.IsUnsupportedPathError() {
-			versionError()
-		}
-		return true, crlRet, nil, nil
-	}
-
-	if len(crlRet.ParsedCache) == 0 {
-		crl, err := parsePEMCRL(crlRet.Secret.Data["crl"].(string))
-		if err != nil {
-			return true, crlRet, nil, fmt.Errorf("unable to parse issuer %v's %v: %w", issuer, name, err)
-		}
-		crlRet.ParsedCache["crl"] = crl
-	}
-
-	return false, crlRet, crlRet.ParsedCache["crl"].(*x509.RevocationList), nil
-}
-
-func pkiFetchKeyEntry(e *Executor, key string, versionError func()) (bool, *PathFetch, map[string]interface{}, error) {
-	keyRet, err := e.FetchIfNotFetched(logical.ReadOperation, "/{{mount}}/key/"+key)
-	if err != nil {
-		return true, keyRet, nil, err
-	}
-
-	if !keyRet.IsSecretOK() {
-		if keyRet.IsUnsupportedPathError() {
-			versionError()
-		}
-		return true, keyRet, nil, nil
-	}
-
-	var data map[string]interface{} = nil
-	if keyRet.Secret != nil && len(keyRet.Secret.Data) > 0 {
-		data = keyRet.Secret.Data
-	}
-
-	return false, keyRet, data, nil
-}
-
-func pkiFetchLeavesList(e *Executor, versionError func()) (bool, *PathFetch, []string, error) {
-	leavesRet, err := e.FetchIfNotFetched(logical.ListOperation, "/{{mount}}/certs")
-	if err != nil {
-		return true, leavesRet, nil, err
-	}
-
-	if !leavesRet.IsSecretOK() {
-		if leavesRet.IsUnsupportedPathError() {
-			versionError()
-		}
-
-		return true, leavesRet, nil, nil
-	}
-
-	if len(leavesRet.ParsedCache) == 0 {
-		var leaves []string
-		for _, rawSerial := range leavesRet.Secret.Data["keys"].([]interface{}) {
-			leaves = append(leaves, rawSerial.(string))
-		}
-		leavesRet.ParsedCache["leaves"] = leaves
-		leavesRet.ParsedCache["count"] = len(leaves)
-	}
-
-	return false, leavesRet, leavesRet.ParsedCache["leaves"].([]string), nil
-}
-
-func pkiFetchLeaf(e *Executor, serial string, versionError func()) (bool, *PathFetch, *x509.Certificate, error) {
-	leafRet, err := e.FetchIfNotFetched(logical.ReadOperation, "/{{mount}}/cert/"+serial)
-	if err != nil {
-		return true, leafRet, nil, err
-	}
-
-	if !leafRet.IsSecretOK() {
-		if leafRet.IsUnsupportedPathError() {
-			versionError()
-		}
-		return true, leafRet, nil, nil
-	}
-
-	if len(leafRet.ParsedCache) == 0 {
-		cert, err := ParsePEMCert(leafRet.Secret.Data["certificate"].(string))
-		if err != nil {
-			return true, leafRet, nil, fmt.Errorf("unable to parse leaf %v's certificate: %w", serial, err)
-		}
-
-		leafRet.ParsedCache["certificate"] = cert
-	}
-
-	return false, leafRet, leafRet.ParsedCache["certificate"].(*x509.Certificate), nil
-}
-
-func pkiFetchRolesList(e *Executor, versionError func()) (bool, *PathFetch, []string, error) {
-	rolesRet, err := e.FetchIfNotFetched(logical.ListOperation, "/{{mount}}/roles")
-	if err != nil {
-		return true, rolesRet, nil, err
-	}
-
-	if !rolesRet.IsSecretOK() {
-		if rolesRet.IsUnsupportedPathError() {
-			versionError()
-		}
-
-		return true, rolesRet, nil, nil
-	}
-
-	if len(rolesRet.ParsedCache) == 0 {
-		var roles []string
-		for _, roleName := range rolesRet.Secret.Data["keys"].([]interface{}) {
-			roles = append(roles, roleName.(string))
-		}
-		rolesRet.ParsedCache["roles"] = roles
-	}
-
-	return false, rolesRet, rolesRet.ParsedCache["roles"].([]string), nil
-}
-
-func pkiFetchRole(e *Executor, name string, versionError func()) (bool, *PathFetch, map[string]interface{}, error) {
-	roleRet, err := e.FetchIfNotFetched(logical.ReadOperation, "/{{mount}}/roles/"+name)
-	if err != nil {
-		return true, roleRet, nil, err
-	}
-
-	if !roleRet.IsSecretOK() {
-		if roleRet.IsUnsupportedPathError() {
-			versionError()
-		}
-		return true, roleRet, nil, nil
-	}
-
-	var data map[string]interface{} = nil
-	if roleRet.Secret != nil && len(roleRet.Secret.Data) > 0 {
-		data = roleRet.Secret.Data
-	}
-
-	return false, roleRet, data, nil
-}
diff --git a/command/healthcheck/pki_allow_acme_headers.go b/command/healthcheck/pki_allow_acme_headers.go
deleted file mode 100644
index 2015ac276c02d..0000000000000
--- a/command/healthcheck/pki_allow_acme_headers.go
+++ /dev/null
@@ -1,155 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package healthcheck
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/hashicorp/go-secure-stdlib/parseutil"
-	"github.com/hashicorp/go-secure-stdlib/strutil"
-	"github.com/hashicorp/vault/sdk/logical"
-)
-
-type AllowAcmeHeaders struct {
-	Enabled            bool
-	UnsupportedVersion bool
-
-	TuneFetcher *PathFetch
-	TuneData    map[string]interface{}
-
-	AcmeConfigFetcher *PathFetch
-}
-
-func NewAllowAcmeHeaders() Check {
-	return &AllowAcmeHeaders{}
-}
-
-func (h *AllowAcmeHeaders) Name() string {
-	return "allow_acme_headers"
-}
-
-func (h *AllowAcmeHeaders) IsEnabled() bool {
-	return h.Enabled
-}
-
-func (h *AllowAcmeHeaders) DefaultConfig() map[string]interface{} {
-	return map[string]interface{}{}
-}
-
-func (h *AllowAcmeHeaders) LoadConfig(config map[string]interface{}) error {
-	enabled, err := parseutil.ParseBool(config["enabled"])
-	if err != nil {
-		return fmt.Errorf("error parsing %v.enabled: %w", h.Name(), err)
-	}
-	h.Enabled = enabled
-
-	return nil
-}
-
-func (h *AllowAcmeHeaders) FetchResources(e *Executor) error {
-	var err error
-	h.AcmeConfigFetcher, err = e.FetchIfNotFetched(logical.ReadOperation, "/{{mount}}/config/acme")
-	if err != nil {
-		return err
-	}
-
-	if h.AcmeConfigFetcher.IsUnsupportedPathError() {
-		h.UnsupportedVersion = true
-	}
-
-	_, h.TuneFetcher, h.TuneData, err = fetchMountTune(e, func() {
-		h.UnsupportedVersion = true
-	})
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (h *AllowAcmeHeaders) Evaluate(e *Executor) ([]*Result, error) {
-	if h.UnsupportedVersion {
-		ret := Result{
-			Status:   ResultInvalidVersion,
-			Endpoint: h.AcmeConfigFetcher.Path,
-			Message:  "This health check requires Vault 1.14+ but an earlier version of Vault Server was contacted, preventing this health check from running.",
-		}
-		return []*Result{&ret}, nil
-	}
-
-	if h.AcmeConfigFetcher.IsSecretPermissionsError() {
-		msg := "Without read access to ACME configuration, this health check is unable to function."
-		return craftInsufficientPermissionResult(e, h.AcmeConfigFetcher.Path, msg), nil
-	}
-
-	acmeEnabled, err := isAcmeEnabled(h.AcmeConfigFetcher)
-	if err != nil {
-		return nil, err
-	}
-
-	if !acmeEnabled {
-		ret := Result{
-			Status:   ResultNotApplicable,
-			Endpoint: h.AcmeConfigFetcher.Path,
-			Message:  "ACME is not enabled, no additional response headers required.",
-		}
-		return []*Result{&ret}, nil
-	}
-
-	if h.TuneFetcher.IsSecretPermissionsError() {
-		msg := "Without access to mount tune information, this health check is unable to function."
-		return craftInsufficientPermissionResult(e, h.TuneFetcher.Path, msg), nil
-	}
-
-	resp, err := StringList(h.TuneData["allowed_response_headers"])
-	if err != nil {
-		return nil, fmt.Errorf("unable to parse value from server for allowed_response_headers: %w", err)
-	}
-
-	requiredResponseHeaders := []string{"Replay-Nonce", "Link", "Location"}
-	foundResponseHeaders := []string{}
-	for _, param := range resp {
-		for _, reqHeader := range requiredResponseHeaders {
-			if strings.EqualFold(param, reqHeader) {
-				foundResponseHeaders = append(foundResponseHeaders, reqHeader)
-				break
-			}
-		}
-	}
-
-	foundAllHeaders := strutil.EquivalentSlices(requiredResponseHeaders, foundResponseHeaders)
-
-	if !foundAllHeaders {
-		ret := Result{
-			Status:   ResultWarning,
-			Endpoint: "/sys/mounts/{{mount}}/tune",
-			Message:  "Mount hasn't enabled 'Replay-Nonce', 'Link', 'Location' response headers, these are required for ACME to function.",
-		}
-		return []*Result{&ret}, nil
-	}
-
-	ret := Result{
-		Status:   ResultOK,
-		Endpoint: "/sys/mounts/{{mount}}/tune",
-		Message:  "Mount has enabled 'Replay-Nonce', 'Link', 'Location' response headers.",
-	}
-	return []*Result{&ret}, nil
-}
-
-func craftInsufficientPermissionResult(e *Executor, path, errorMsg string) []*Result {
-	ret := Result{
-		Status:   ResultInsufficientPermissions,
-		Endpoint: path,
-		Message:  errorMsg,
-	}
-
-	if e.Client.Token() == "" {
-		ret.Message = "No token available so unable read the tune endpoint for this mount. " + ret.Message
-	} else {
-		ret.Message = "This token lacks permission to read the tune endpoint for this mount. " + ret.Message
-	}
-
-	return []*Result{&ret}
-}
diff --git a/command/healthcheck/pki_allow_if_modified_since.go b/command/healthcheck/pki_allow_if_modified_since.go
deleted file mode 100644
index bb5306e054188..0000000000000
--- a/command/healthcheck/pki_allow_if_modified_since.go
+++ /dev/null
@@ -1,132 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package healthcheck
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/hashicorp/go-secure-stdlib/parseutil"
-)
-
-type AllowIfModifiedSince struct {
-	Enabled            bool
-	UnsupportedVersion bool
-
-	TuneData map[string]interface{}
-	Fetcher  *PathFetch
-}
-
-func NewAllowIfModifiedSinceCheck() Check {
-	return &AllowIfModifiedSince{}
-}
-
-func (h *AllowIfModifiedSince) Name() string {
-	return "allow_if_modified_since"
-}
-
-func (h *AllowIfModifiedSince) IsEnabled() bool {
-	return h.Enabled
-}
-
-func (h *AllowIfModifiedSince) DefaultConfig() map[string]interface{} {
-	return map[string]interface{}{}
-}
-
-func (h *AllowIfModifiedSince) LoadConfig(config map[string]interface{}) error {
-	var err error
-
-	h.Enabled, err = parseutil.ParseBool(config["enabled"])
-	if err != nil {
-		return fmt.Errorf("error parsing %v.enabled: %w", h.Name(), err)
-	}
-
-	return nil
-}
-
-func (h *AllowIfModifiedSince) FetchResources(e *Executor) error {
-	var exit bool
-	var err error
-
-	exit, h.Fetcher, h.TuneData, err = fetchMountTune(e, func() {
-		h.UnsupportedVersion = true
-	})
-
-	if exit || err != nil {
-		return err
-	}
-	return nil
-}
-
-func (h *AllowIfModifiedSince) Evaluate(e *Executor) (results []*Result, err error) {
-	if h.UnsupportedVersion {
-		ret := Result{
-			Status:   ResultInvalidVersion,
-			Endpoint: "/sys/mounts/{{mount}}/tune",
-			Message:  "This health check requires Vault 1.12+ but an earlier version of Vault Server was contacted, preventing this health check from running.",
-		}
-		return []*Result{&ret}, nil
-	}
-
-	if h.Fetcher.IsSecretPermissionsError() {
-		ret := Result{
-			Status:   ResultInsufficientPermissions,
-			Endpoint: "/sys/mounts/{{mount}}/tune",
-			Message:  "Without this information, this health check is unable to function.",
-		}
-
-		if e.Client.Token() == "" {
-			ret.Message = "No token available so unable read the tune endpoint for this mount. " + ret.Message
-		} else {
-			ret.Message = "This token lacks permission to read the tune endpoint for this mount. " + ret.Message
-		}
-
-		results = append(results, &ret)
-		return
-	}
-
-	req, err := StringList(h.TuneData["passthrough_request_headers"])
-	if err != nil {
-		return nil, fmt.Errorf("unable to parse value from server for passthrough_request_headers: %w", err)
-	}
-
-	resp, err := StringList(h.TuneData["allowed_response_headers"])
-	if err != nil {
-		return nil, fmt.Errorf("unable to parse value from server for allowed_response_headers: %w", err)
-	}
-
-	foundIMS := false
-	for _, param := range req {
-		if strings.EqualFold(param, "If-Modified-Since") {
-			foundIMS = true
-			break
-		}
-	}
-
-	foundLM := false
-	for _, param := range resp {
-		if strings.EqualFold(param, "Last-Modified") {
-			foundLM = true
-			break
-		}
-	}
-
-	if !foundIMS || !foundLM {
-		ret := Result{
-			Status:   ResultInformational,
-			Endpoint: "/sys/mounts/{{mount}}/tune",
-			Message:  "Mount hasn't enabled If-Modified-Since Request or Last-Modified Response headers; consider enabling these headers to allow clients to fetch CAs and CRLs only when they've changed, reducing total bandwidth.",
-		}
-		results = append(results, &ret)
-	} else {
-		ret := Result{
-			Status:   ResultOK,
-			Endpoint: "/sys/mounts/{{mount}}/tune",
-			Message:  "Mount allows the If-Modified-Since request header and Last-Modified response header.",
-		}
-		results = append(results, &ret)
-	}
-
-	return
-}
diff --git a/command/healthcheck/pki_audit_visibility.go b/command/healthcheck/pki_audit_visibility.go
deleted file mode 100644
index 6b3834fb0c9e7..0000000000000
--- a/command/healthcheck/pki_audit_visibility.go
+++ /dev/null
@@ -1,216 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package healthcheck
-
-import (
-	"fmt"
-
-	"github.com/hashicorp/go-secure-stdlib/parseutil"
-)
-
-var VisibleReqParams = []string{
-	"csr",
-	"certificate",
-	"issuer_ref",
-	"common_name",
-	"alt_names",
-	"other_sans",
-	"ip_sans",
-	"uri_sans",
-	"ttl",
-	"not_after",
-	"serial_number",
-	"key_type",
-	"private_key_format",
-	"managed_key_name",
-	"managed_key_id",
-	"ou",
-	"organization",
-	"country",
-	"locality",
-	"province",
-	"street_address",
-	"postal_code",
-	"permitted_dns_domains",
-	"policy_identifiers",
-	"ext_key_usage_oids",
-}
-
-var VisibleRespParams = []string{
-	"certificate",
-	"issuing_ca",
-	"serial_number",
-	"error",
-	"ca_chain",
-}
-
-var HiddenReqParams = []string{
-	"private_key",
-	"pem_bundle",
-}
-
-var HiddenRespParams = []string{
-	"private_key",
-	"pem_bundle",
-}
-
-type AuditVisibility struct {
-	Enabled            bool
-	UnsupportedVersion bool
-
-	IgnoredParameters map[string]bool
-	TuneData          map[string]interface{}
-	Fetcher           *PathFetch
-}
-
-func NewAuditVisibilityCheck() Check {
-	return &AuditVisibility{
-		IgnoredParameters: make(map[string]bool),
-	}
-}
-
-func (h *AuditVisibility) Name() string {
-	return "audit_visibility"
-}
-
-func (h *AuditVisibility) IsEnabled() bool {
-	return h.Enabled
-}
-
-func (h *AuditVisibility) DefaultConfig() map[string]interface{} {
-	return map[string]interface{}{
-		"ignored_parameters": []string{},
-	}
-}
-
-func (h *AuditVisibility) LoadConfig(config map[string]interface{}) error {
-	var err error
-
-	coerced, err := StringList(config["ignored_parameters"])
-	if err != nil {
-		return fmt.Errorf("error parsing %v.ignored_parameters: %v", h.Name(), err)
-	}
-	for _, ignored := range coerced {
-		h.IgnoredParameters[ignored] = true
-	}
-
-	h.Enabled, err = parseutil.ParseBool(config["enabled"])
-	if err != nil {
-		return fmt.Errorf("error parsing %v.enabled: %w", h.Name(), err)
-	}
-
-	return nil
-}
-
-func (h *AuditVisibility) FetchResources(e *Executor) error {
-	var exit bool
-	var err error
-
-	exit, h.Fetcher, h.TuneData, err = fetchMountTune(e, func() {
-		h.UnsupportedVersion = true
-	})
-
-	if exit || err != nil {
-		return err
-	}
-	return nil
-}
-
-func (h *AuditVisibility) Evaluate(e *Executor) (results []*Result, err error) {
-	if h.UnsupportedVersion {
-		ret := Result{
-			Status:   ResultInvalidVersion,
-			Endpoint: "/sys/mounts/{{mount}}/tune",
-			Message:  "This health check requires Vault 1.9+ but an earlier version of Vault Server was contacted, preventing this health check from running.",
-		}
-		return []*Result{&ret}, nil
-	}
-
-	if h.Fetcher.IsSecretPermissionsError() {
-		ret := Result{
-			Status:   ResultInsufficientPermissions,
-			Endpoint: "/sys/mounts/{{mount}}/tune",
-			Message:  "Without this information, this health check is unable to function.",
-		}
-
-		if e.Client.Token() == "" {
-			ret.Message = "No token available so unable read the tune endpoint for this mount. " + ret.Message
-		} else {
-			ret.Message = "This token lacks permission to read the tune endpoint for this mount. " + ret.Message
-		}
-
-		results = append(results, &ret)
-		return
-	}
-
-	sourceMap := map[string][]string{
-		"audit_non_hmac_request_keys":  VisibleReqParams,
-		"audit_non_hmac_response_keys": VisibleRespParams,
-	}
-	for source, visibleList := range sourceMap {
-		actual, err := StringList(h.TuneData[source])
-		if err != nil {
-			return nil, fmt.Errorf("error parsing %v from server: %v", source, err)
-		}
-
-		for _, param := range visibleList {
-			found := false
-			for _, tuned := range actual {
-				if param == tuned {
-					found = true
-					break
-				}
-			}
-
-			if !found {
-				ret := Result{
-					Status:   ResultInformational,
-					Endpoint: "/sys/mounts/{{mount}}/tune",
-					Message:  fmt.Sprintf("Mount currently HMACs %v because it is not in %v; as this is not a sensitive security parameter, it is encouraged to disable HMACing to allow better auditing of the PKI engine.", param, source),
-				}
-				results = append(results, &ret)
-			}
-		}
-	}
-
-	sourceMap = map[string][]string{
-		"audit_non_hmac_request_keys":  HiddenReqParams,
-		"audit_non_hmac_response_keys": HiddenRespParams,
-	}
-	for source, hiddenList := range sourceMap {
-		actual, err := StringList(h.TuneData[source])
-		if err != nil {
-			return nil, fmt.Errorf("error parsing %v from server: %v", source, err)
-		}
-		for _, param := range hiddenList {
-			found := false
-			for _, tuned := range actual {
-				if param == tuned {
-					found = true
-					break
-				}
-			}
-
-			if found {
-				ret := Result{
-					Status:   ResultWarning,
-					Endpoint: "/sys/mounts/{{mount}}/tune",
-					Message:  fmt.Sprintf("Mount currently doesn't HMAC %v because it is in %v; as this is a sensitive security parameter it is encouraged to HMAC it in the Audit logs.", param, source),
-				}
-				results = append(results, &ret)
-			}
-		}
-	}
-
-	if len(results) == 0 {
-		ret := Result{
-			Status:   ResultOK,
-			Endpoint: "/sys/mounts/{{mount}}/tune",
-			Message:  "Mount audit information is configured appropriately.",
-		}
-		results = append(results, &ret)
-	}
-
-	return
-}
diff --git a/command/healthcheck/pki_ca_validity_period.go b/command/healthcheck/pki_ca_validity_period.go
deleted file mode 100644
index 511de757061d8..0000000000000
--- a/command/healthcheck/pki_ca_validity_period.go
+++ /dev/null
@@ -1,169 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package healthcheck
-
-import (
-	"bytes"
-	"crypto/x509"
-	"fmt"
-	"strings"
-	"time"
-
-	"github.com/hashicorp/go-secure-stdlib/parseutil"
-)
-
-type CAValidityPeriod struct {
-	Enabled bool
-
-	RootExpiries          map[ResultStatus]time.Duration
-	IntermediateExpieries map[ResultStatus]time.Duration
-
-	UnsupportedVersion bool
-
-	Issuers map[string]*x509.Certificate
-}
-
-func NewCAValidityPeriodCheck() Check {
-	return &CAValidityPeriod{
-		RootExpiries:          make(map[ResultStatus]time.Duration, 3),
-		IntermediateExpieries: make(map[ResultStatus]time.Duration, 3),
-		Issuers:               make(map[string]*x509.Certificate),
-	}
-}
-
-func (h *CAValidityPeriod) Name() string {
-	return "ca_validity_period"
-}
-
-func (h *CAValidityPeriod) IsEnabled() bool {
-	return h.Enabled
-}
-
-func (h *CAValidityPeriod) DefaultConfig() map[string]interface{} {
-	return map[string]interface{}{
-		"root_expiry_critical":              "180d",
-		"intermediate_expiry_critical":      "30d",
-		"root_expiry_warning":               "365d",
-		"intermediate_expiry_warning":       "60d",
-		"root_expiry_informational":         "730d",
-		"intermediate_expiry_informational": "180d",
-	}
-}
-
-func (h *CAValidityPeriod) LoadConfig(config map[string]interface{}) error {
-	parameters := []string{
-		"root_expiry_critical",
-		"intermediate_expiry_critical",
-		"root_expiry_warning",
-		"intermediate_expiry_warning",
-		"root_expiry_informational",
-		"intermediate_expiry_informational",
-	}
-	for _, parameter := range parameters {
-		name_split := strings.Split(parameter, "_")
-		if len(name_split) != 3 || name_split[1] != "expiry" {
-			return fmt.Errorf("bad parameter: %v / %v / %v", parameter, len(name_split), name_split[1])
-		}
-
-		status, present := NameResultStatusMap[name_split[2]]
-		if !present {
-			return fmt.Errorf("bad parameter: %v's type %v isn't in name map", parameter, name_split[2])
-		}
-
-		value_raw, present := config[parameter]
-		if !present {
-			return fmt.Errorf("parameter not present in config; Executor should've handled this for us: %v", parameter)
-		}
-
-		value, err := parseutil.ParseDurationSecond(value_raw)
-		if err != nil {
-			return fmt.Errorf("failed to parse parameter (%v=%v): %w", parameter, value_raw, err)
-		}
-
-		if name_split[0] == "root" {
-			h.RootExpiries[status] = value
-		} else if name_split[0] == "intermediate" {
-			h.IntermediateExpieries[status] = value
-		} else {
-			return fmt.Errorf("bad parameter: %v's CA type isn't root/intermediate: %v", parameters, name_split[0])
-		}
-	}
-
-	enabled, err := parseutil.ParseBool(config["enabled"])
-	if err != nil {
-		return fmt.Errorf("error parsing %v.enabled: %w", h.Name(), err)
-	}
-	h.Enabled = enabled
-
-	return nil
-}
-
-func (h *CAValidityPeriod) FetchResources(e *Executor) error {
-	exit, _, issuers, err := pkiFetchIssuersList(e, func() {
-		h.UnsupportedVersion = true
-	})
-	if exit || err != nil {
-		return err
-	}
-
-	for _, issuer := range issuers {
-		skip, _, cert, err := pkiFetchIssuer(e, issuer, func() {
-			h.UnsupportedVersion = true
-		})
-		if skip || err != nil {
-			if err != nil {
-				return err
-			}
-			continue
-		}
-
-		h.Issuers[issuer] = cert
-	}
-
-	return nil
-}
-
-func (h *CAValidityPeriod) Evaluate(e *Executor) (results []*Result, err error) {
-	if h.UnsupportedVersion {
-		ret := Result{
-			Status:   ResultInvalidVersion,
-			Endpoint: "/{{mount}}/issuers",
-			Message:  "This health check requires Vault 1.11+ but an earlier version of Vault Server was contacted, preventing this health check from running.",
-		}
-		return []*Result{&ret}, nil
-	}
-
-	now := time.Now()
-
-	for name, cert := range h.Issuers {
-		var ret Result
-		ret.Status = ResultOK
-		ret.Endpoint = "/{{mount}}/issuer/" + name
-		ret.Message = fmt.Sprintf("Issuer's validity (%v) is OK", cert.NotAfter.Format("2006-01-02"))
-
-		hasSelfReference := bytes.Equal(cert.RawSubject, cert.RawIssuer)
-		isSelfSigned := cert.CheckSignatureFrom(cert) == nil
-		isRoot := hasSelfReference && isSelfSigned
-
-		for _, criticality := range []ResultStatus{ResultCritical, ResultWarning, ResultInformational} {
-			var d time.Duration
-			if isRoot {
-				d = h.RootExpiries[criticality]
-			} else {
-				d = h.IntermediateExpieries[criticality]
-			}
-
-			windowExpiry := now.Add(d)
-			if cert.NotAfter.Before(windowExpiry) {
-				ret.Status = criticality
-				ret.Message = fmt.Sprintf("Issuer's validity is outside of the suggested rotation window: issuer is valid until %v but expires within %v (ending on %v). It is suggested to start rotating this issuer to new key material to avoid future downtime caused by this current issuer expiring.", cert.NotAfter.Format("2006-01-02"), FormatDuration(d), windowExpiry.Format("2006-01-02"))
-				break
-			}
-		}
-
-		results = append(results, &ret)
-	}
-
-	return
-}
diff --git a/command/healthcheck/pki_crl_validity_period.go b/command/healthcheck/pki_crl_validity_period.go
deleted file mode 100644
index 8450a058f994d..0000000000000
--- a/command/healthcheck/pki_crl_validity_period.go
+++ /dev/null
@@ -1,208 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package healthcheck
-
-import (
-	"crypto/x509"
-	"fmt"
-	"time"
-
-	"github.com/hashicorp/vault/sdk/logical"
-
-	"github.com/hashicorp/go-secure-stdlib/parseutil"
-)
-
-type CRLValidityPeriod struct {
-	Enabled bool
-
-	CRLExpiryPercentage      int
-	DeltaCRLExpiryPercentage int
-
-	UnsupportedVersion bool
-	NoDeltas           bool
-
-	CRLs      map[string]*x509.RevocationList
-	DeltaCRLs map[string]*x509.RevocationList
-
-	CRLConfig *PathFetch
-}
-
-func NewCRLValidityPeriodCheck() Check {
-	return &CRLValidityPeriod{
-		CRLs:      make(map[string]*x509.RevocationList),
-		DeltaCRLs: make(map[string]*x509.RevocationList),
-	}
-}
-
-func (h *CRLValidityPeriod) Name() string {
-	return "crl_validity_period"
-}
-
-func (h *CRLValidityPeriod) IsEnabled() bool {
-	return h.Enabled
-}
-
-func (h *CRLValidityPeriod) DefaultConfig() map[string]interface{} {
-	return map[string]interface{}{
-		"crl_expiry_pct_critical":       "95",
-		"delta_crl_expiry_pct_critical": "95",
-	}
-}
-
-func (h *CRLValidityPeriod) LoadConfig(config map[string]interface{}) error {
-	value, err := parseutil.SafeParseIntRange(config["crl_expiry_pct_critical"], 1, 99)
-	if err != nil {
-		return fmt.Errorf("error parsing %v.crl_expiry_pct_critical=%v: %w", h.Name(), config["crl_expiry_pct_critical"], err)
-	}
-	h.CRLExpiryPercentage = int(value)
-
-	value, err = parseutil.SafeParseIntRange(config["delta_crl_expiry_pct_critical"], 1, 99)
-	if err != nil {
-		return fmt.Errorf("error parsing %v.delta_crl_expiry_pct_critical=%v: %w", h.Name(), config["delta_crl_expiry_pct_critical"], err)
-	}
-	h.DeltaCRLExpiryPercentage = int(value)
-
-	enabled, err := parseutil.ParseBool(config["enabled"])
-	if err != nil {
-		return fmt.Errorf("error parsing %v.enabled: %w", h.Name(), err)
-	}
-	h.Enabled = enabled
-
-	return nil
-}
-
-func (h *CRLValidityPeriod) FetchResources(e *Executor) error {
-	exit, _, issuers, err := pkiFetchIssuersList(e, func() {
-		h.UnsupportedVersion = true
-	})
-	if exit || err != nil {
-		return err
-	}
-
-	for _, issuer := range issuers {
-		exit, _, crl, err := pkiFetchIssuerCRL(e, issuer, false, func() {
-			h.UnsupportedVersion = true
-		})
-		if exit || err != nil {
-			if err != nil {
-				return err
-			}
-			continue
-		}
-
-		h.CRLs[issuer] = crl
-
-		exit, _, delta, err := pkiFetchIssuerCRL(e, issuer, true, func() {
-			h.NoDeltas = true
-		})
-		if exit || err != nil {
-			if err != nil {
-				return err
-			}
-			continue
-		}
-
-		h.DeltaCRLs[issuer] = delta
-	}
-
-	// Check if the issuer is fetched yet.
-	configRet, err := e.FetchIfNotFetched(logical.ReadOperation, "/{{mount}}/config/crl")
-	if err != nil {
-		return err
-	}
-
-	h.CRLConfig = configRet
-
-	return nil
-}
-
-func (h *CRLValidityPeriod) Evaluate(e *Executor) (results []*Result, err error) {
-	if h.UnsupportedVersion {
-		ret := Result{
-			Status:   ResultInvalidVersion,
-			Endpoint: "/{{mount}}/issuers",
-			Message:  "This health check requires Vault 1.11+ but an earlier version of Vault Server was contacted, preventing this health check from running.",
-		}
-		return []*Result{&ret}, nil
-	}
-
-	now := time.Now()
-	crlDisabled := false
-	if h.CRLConfig != nil {
-		if h.CRLConfig.IsSecretPermissionsError() {
-			ret := Result{
-				Status:   ResultInsufficientPermissions,
-				Endpoint: "/{{mount}}/config/crl",
-				Message:  "This prevents the health check from seeing if the CRL is disabled and dropping the severity of this check accordingly.",
-			}
-
-			if e.Client.Token() == "" {
-				ret.Message = "No token available so unable read authenticated CRL configuration for this mount. " + ret.Message
-			} else {
-				ret.Message = "This token lacks permission to read the CRL configuration for this mount. " + ret.Message
-			}
-
-			results = append(results, &ret)
-		} else if h.CRLConfig.Secret != nil && h.CRLConfig.Secret.Data["disabled"] != nil {
-			crlDisabled = h.CRLConfig.Secret.Data["disabled"].(bool)
-		}
-	}
-
-	if h.NoDeltas && len(h.DeltaCRLs) == 0 {
-		ret := Result{
-			Status:   ResultInvalidVersion,
-			Endpoint: "/{{mount}}/issuer/*/crl/delta",
-			Message:  "This health check validates Delta CRLs on Vault 1.12+, but an earlier version of Vault was used. No results about delta CRL validity will be returned.",
-		}
-		results = append(results, &ret)
-	}
-
-	for name, crl := range h.CRLs {
-		var ret Result
-		ret.Status = ResultOK
-		ret.Endpoint = "/{{mount}}/issuer/" + name + "/crl"
-		ret.Message = fmt.Sprintf("CRL's validity (%v to %v) is OK.", crl.ThisUpdate.Format("2006-01-02"), crl.NextUpdate.Format("2006-01-02"))
-
-		used := now.Sub(crl.ThisUpdate)
-		total := crl.NextUpdate.Sub(crl.ThisUpdate)
-		ratio := time.Duration((int64(total) * int64(h.CRLExpiryPercentage)) / int64(100))
-		if used >= ratio {
-			expWhen := crl.ThisUpdate.Add(ratio)
-			ret.Status = ResultCritical
-			ret.Message = fmt.Sprintf("CRL's validity is outside of suggested rotation window: CRL's next update is expected at %v, but expires within %v%% of validity window (starting on %v and ending on %v). It is suggested to rotate this CRL and start propagating it to hosts to avoid any issues caused by stale CRLs.", crl.NextUpdate.Format("2006-01-02"), h.CRLExpiryPercentage, crl.ThisUpdate.Format("2006-01-02"), expWhen.Format("2006-01-02"))
-
-			if crlDisabled {
-				ret.Status = ResultInformational
-				ret.Message += " Because the CRL is disabled, this is less of a concern."
-			}
-		}
-
-		results = append(results, &ret)
-	}
-
-	for name, crl := range h.DeltaCRLs {
-		var ret Result
-		ret.Status = ResultOK
-		ret.Endpoint = "/{{mount}}/issuer/" + name + "/crl/delta"
-		ret.Message = fmt.Sprintf("Delta CRL's validity (%v to %v) is OK.", crl.ThisUpdate.Format("2006-01-02"), crl.NextUpdate.Format("2006-01-02"))
-
-		used := now.Sub(crl.ThisUpdate)
-		total := crl.NextUpdate.Sub(crl.ThisUpdate)
-		ratio := time.Duration((int64(total) * int64(h.DeltaCRLExpiryPercentage)) / int64(100))
-		if used >= ratio {
-			expWhen := crl.ThisUpdate.Add(ratio)
-			ret.Status = ResultCritical
-			ret.Message = fmt.Sprintf("Delta CRL's validity is outside of suggested rotation window: Delta CRL's next update is expected at %v, but expires within %v%% of validity window (starting on %v and ending on %v). It is suggested to rotate this Delta CRL and start propagating it to hosts to avoid any issues caused by stale CRLs.", crl.NextUpdate.Format("2006-01-02"), h.CRLExpiryPercentage, crl.ThisUpdate.Format("2006-01-02"), expWhen.Format("2006-01-02"))
-
-			if crlDisabled {
-				ret.Status = ResultInformational
-				ret.Message += " Because the CRL is disabled, this is less of a concern."
-			}
-		}
-
-		results = append(results, &ret)
-	}
-
-	return
-}
diff --git a/command/healthcheck/pki_enable_acme_issuance.go b/command/healthcheck/pki_enable_acme_issuance.go
deleted file mode 100644
index 986165d0e253e..0000000000000
--- a/command/healthcheck/pki_enable_acme_issuance.go
+++ /dev/null
@@ -1,237 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package healthcheck
-
-import (
-	"bytes"
-	"context"
-	"crypto/tls"
-	"fmt"
-	"net/http"
-	"net/url"
-
-	"github.com/hashicorp/go-secure-stdlib/parseutil"
-	"github.com/hashicorp/vault/sdk/logical"
-
-	"golang.org/x/crypto/acme"
-)
-
-type EnableAcmeIssuance struct {
-	Enabled            bool
-	UnsupportedVersion bool
-
-	AcmeConfigFetcher    *PathFetch
-	ClusterConfigFetcher *PathFetch
-	TotalIssuers         int
-	RootIssuers          int
-}
-
-func NewEnableAcmeIssuance() Check {
-	return &EnableAcmeIssuance{}
-}
-
-func (h *EnableAcmeIssuance) Name() string {
-	return "enable_acme_issuance"
-}
-
-func (h *EnableAcmeIssuance) IsEnabled() bool {
-	return h.Enabled
-}
-
-func (h *EnableAcmeIssuance) DefaultConfig() map[string]interface{} {
-	return map[string]interface{}{}
-}
-
-func (h *EnableAcmeIssuance) LoadConfig(config map[string]interface{}) error {
-	enabled, err := parseutil.ParseBool(config["enabled"])
-	if err != nil {
-		return fmt.Errorf("error parsing %v.enabled: %w", h.Name(), err)
-	}
-	h.Enabled = enabled
-
-	return nil
-}
-
-func (h *EnableAcmeIssuance) FetchResources(e *Executor) error {
-	var err error
-	h.AcmeConfigFetcher, err = e.FetchIfNotFetched(logical.ReadOperation, "/{{mount}}/config/acme")
-	if err != nil {
-		return err
-	}
-
-	if h.AcmeConfigFetcher.IsUnsupportedPathError() {
-		h.UnsupportedVersion = true
-	}
-
-	h.ClusterConfigFetcher, err = e.FetchIfNotFetched(logical.ReadOperation, "/{{mount}}/config/cluster")
-	if err != nil {
-		return err
-	}
-
-	if h.ClusterConfigFetcher.IsUnsupportedPathError() {
-		h.UnsupportedVersion = true
-	}
-
-	h.TotalIssuers, h.RootIssuers, err = doesMountContainOnlyRootIssuers(e)
-
-	return nil
-}
-
-func doesMountContainOnlyRootIssuers(e *Executor) (int, int, error) {
-	exit, _, issuers, err := pkiFetchIssuersList(e, func() {})
-	if exit || err != nil {
-		return 0, 0, err
-	}
-
-	totalIssuers := 0
-	rootIssuers := 0
-
-	for _, issuer := range issuers {
-		skip, _, cert, err := pkiFetchIssuer(e, issuer, func() {})
-
-		if skip || err != nil {
-			if err != nil {
-				return 0, 0, err
-			}
-			continue
-		}
-		totalIssuers++
-
-		if !bytes.Equal(cert.RawSubject, cert.RawIssuer) {
-			continue
-		}
-		if err := cert.CheckSignatureFrom(cert); err != nil {
-			continue
-		}
-		rootIssuers++
-	}
-
-	return totalIssuers, rootIssuers, nil
-}
-
-func isAcmeEnabled(fetcher *PathFetch) (bool, error) {
-	isEnabledRaw, ok := fetcher.Secret.Data["enabled"]
-	if !ok {
-		return false, fmt.Errorf("enabled configuration field missing from acme config")
-	}
-
-	parseBool, err := parseutil.ParseBool(isEnabledRaw)
-	if err != nil {
-		return false, fmt.Errorf("failed parsing 'enabled' field from ACME config: %w", err)
-	}
-
-	return parseBool, nil
-}
-
-func verifyLocalPathUrl(h *EnableAcmeIssuance) error {
-	localPathRaw, ok := h.ClusterConfigFetcher.Secret.Data["path"]
-	if !ok {
-		return fmt.Errorf("'path' field missing from config")
-	}
-
-	localPath, err := parseutil.ParseString(localPathRaw)
-	if err != nil {
-		return fmt.Errorf("failed converting 'path' field from local config: %w", err)
-	}
-
-	if localPath == "" {
-		return fmt.Errorf("'path' field not configured within /{{mount}}/config/cluster")
-	}
-
-	parsedUrl, err := url.Parse(localPath)
-	if err != nil {
-		return fmt.Errorf("failed to parse URL from path config: %v: %w", localPathRaw, err)
-	}
-
-	if parsedUrl.Scheme != "https" {
-		return fmt.Errorf("the configured 'path' field in /{{mount}}/config/cluster was not using an https scheme")
-	}
-
-	// Avoid issues with SSL certificates for this check, we just want to validate that we would
-	// hit an ACME server with the path they specified in configuration
-	tr := &http.Transport{
-		TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
-	}
-	client := &http.Client{Transport: tr}
-	acmeDirectoryUrl := parsedUrl.JoinPath("/acme/", "directory")
-	acmeClient := acme.Client{HTTPClient: client, DirectoryURL: acmeDirectoryUrl.String()}
-	_, err = acmeClient.Discover(context.Background())
-	if err != nil {
-		return fmt.Errorf("using configured 'path' field ('%s') in /{{mount}}/config/cluster failed to reach the ACME"+
-			" directory: %s: %w", parsedUrl.String(), acmeDirectoryUrl.String(), err)
-	}
-
-	return nil
-}
-
-func (h *EnableAcmeIssuance) Evaluate(e *Executor) (results []*Result, err error) {
-	if h.UnsupportedVersion {
-		ret := Result{
-			Status:   ResultInvalidVersion,
-			Endpoint: h.AcmeConfigFetcher.Path,
-			Message:  "This health check requires Vault 1.14+ but an earlier version of Vault Server was contacted, preventing this health check from running.",
-		}
-		return []*Result{&ret}, nil
-	}
-
-	if h.AcmeConfigFetcher.IsSecretPermissionsError() {
-		msg := "Without this information, this health check is unable to function."
-		return craftInsufficientPermissionResult(e, h.AcmeConfigFetcher.Path, msg), nil
-	}
-
-	acmeEnabled, err := isAcmeEnabled(h.AcmeConfigFetcher)
-	if err != nil {
-		return nil, err
-	}
-
-	if !acmeEnabled {
-		if h.TotalIssuers == 0 {
-			ret := Result{
-				Status:   ResultNotApplicable,
-				Endpoint: h.AcmeConfigFetcher.Path,
-				Message:  "No issuers in mount, ACME is not required.",
-			}
-			return []*Result{&ret}, nil
-		}
-
-		if h.TotalIssuers == h.RootIssuers {
-			ret := Result{
-				Status:   ResultNotApplicable,
-				Endpoint: h.AcmeConfigFetcher.Path,
-				Message:  "Mount contains only root issuers, ACME is not required.",
-			}
-			return []*Result{&ret}, nil
-		}
-
-		ret := Result{
-			Status:   ResultInformational,
-			Endpoint: h.AcmeConfigFetcher.Path,
-			Message:  "Consider enabling ACME support to support a self-rotating PKI infrastructure.",
-		}
-		return []*Result{&ret}, nil
-	}
-
-	if h.ClusterConfigFetcher.IsSecretPermissionsError() {
-		msg := "Without this information, this health check is unable to function."
-		return craftInsufficientPermissionResult(e, h.ClusterConfigFetcher.Path, msg), nil
-	}
-
-	localPathIssue := verifyLocalPathUrl(h)
-
-	if localPathIssue != nil {
-		ret := Result{
-			Status:   ResultWarning,
-			Endpoint: h.ClusterConfigFetcher.Path,
-			Message:  "ACME enabled in config but not functional: " + localPathIssue.Error(),
-		}
-		return []*Result{&ret}, nil
-	}
-
-	ret := Result{
-		Status:   ResultOK,
-		Endpoint: h.ClusterConfigFetcher.Path,
-		Message:  "ACME enabled and successfully connected to the ACME directory.",
-	}
-	return []*Result{&ret}, nil
-}
diff --git a/command/healthcheck/pki_enable_auto_tidy.go b/command/healthcheck/pki_enable_auto_tidy.go
deleted file mode 100644
index 1734d1adcbf15..0000000000000
--- a/command/healthcheck/pki_enable_auto_tidy.go
+++ /dev/null
@@ -1,197 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package healthcheck
-
-import (
-	"fmt"
-	"time"
-
-	"github.com/hashicorp/vault/sdk/logical"
-
-	"github.com/hashicorp/go-secure-stdlib/parseutil"
-)
-
-type EnableAutoTidy struct {
-	Enabled            bool
-	UnsupportedVersion bool
-
-	IntervalDurationCritical time.Duration
-	IntervalDurationWarning  time.Duration
-	PauseDurationCritical    time.Duration
-	PauseDurationWarning     time.Duration
-
-	TidyConfig *PathFetch
-}
-
-func NewEnableAutoTidyCheck() Check {
-	return &EnableAutoTidy{}
-}
-
-func (h *EnableAutoTidy) Name() string {
-	return "enable_auto_tidy"
-}
-
-func (h *EnableAutoTidy) IsEnabled() bool {
-	return h.Enabled
-}
-
-func (h *EnableAutoTidy) DefaultConfig() map[string]interface{} {
-	return map[string]interface{}{
-		"interval_duration_critical": "7d",
-		"interval_duration_warning":  "2d",
-		"pause_duration_critical":    "1s",
-		"pause_duration_warning":     "200ms",
-	}
-}
-
-func (h *EnableAutoTidy) fromConfig(config map[string]interface{}, param string) (time.Duration, error) {
-	value, err := parseutil.ParseDurationSecond(config[param])
-	if err != nil {
-		return time.Duration(0), fmt.Errorf("failed to parse parameter %v.%v=%v: %w", h.Name(), param, config[param], err)
-	}
-
-	return value, nil
-}
-
-func (h *EnableAutoTidy) LoadConfig(config map[string]interface{}) error {
-	var err error
-
-	h.IntervalDurationCritical, err = h.fromConfig(config, "interval_duration_critical")
-	if err != nil {
-		return err
-	}
-
-	h.IntervalDurationWarning, err = h.fromConfig(config, "interval_duration_warning")
-	if err != nil {
-		return err
-	}
-
-	h.PauseDurationCritical, err = h.fromConfig(config, "pause_duration_critical")
-	if err != nil {
-		return err
-	}
-
-	h.PauseDurationWarning, err = h.fromConfig(config, "pause_duration_warning")
-	if err != nil {
-		return err
-	}
-
-	enabled, err := parseutil.ParseBool(config["enabled"])
-	if err != nil {
-		return fmt.Errorf("error parsing %v.enabled: %w", h.Name(), err)
-	}
-	h.Enabled = enabled
-
-	return nil
-}
-
-func (h *EnableAutoTidy) FetchResources(e *Executor) error {
-	var err error
-	h.TidyConfig, err = e.FetchIfNotFetched(logical.ReadOperation, "/{{mount}}/config/auto-tidy")
-	if err != nil {
-		return err
-	}
-
-	if h.TidyConfig.IsUnsupportedPathError() {
-		h.UnsupportedVersion = true
-	}
-
-	return nil
-}
-
-func (h *EnableAutoTidy) Evaluate(e *Executor) (results []*Result, err error) {
-	if h.UnsupportedVersion {
-		ret := Result{
-			Status:   ResultInvalidVersion,
-			Endpoint: "/{{mount}}/config/auto-tidy",
-			Message:  "This health check requires Vault 1.12+, but an earlier version of Vault Server was contacted, preventing this health check from running.",
-		}
-		return []*Result{&ret}, nil
-	}
-
-	if h.TidyConfig == nil {
-		return
-	}
-
-	if h.TidyConfig.IsSecretPermissionsError() {
-		ret := Result{
-			Status:   ResultInsufficientPermissions,
-			Endpoint: "/{{mount}}/config/auto-tidy",
-			Message:  "This prevents the health check from functioning at all, as it cannot .",
-		}
-
-		if e.Client.Token() == "" {
-			ret.Message = "No token available so unable read authenticated auto-tidy configuration for this mount. " + ret.Message
-		} else {
-			ret.Message = "This token lacks permission to read the auto-tidy configuration for this mount. " + ret.Message
-		}
-
-		return []*Result{&ret}, nil
-	}
-
-	isEnabled := h.TidyConfig.Secret.Data["enabled"].(bool)
-	intervalDuration, err := parseutil.ParseDurationSecond(h.TidyConfig.Secret.Data["interval_duration"])
-	if err != nil {
-		return nil, fmt.Errorf("error parsing API response from server for interval_duration: %w", err)
-	}
-
-	pauseDuration, err := parseutil.ParseDurationSecond(h.TidyConfig.Secret.Data["pause_duration"])
-	if err != nil {
-		return nil, fmt.Errorf("error parsing API response from server for pause_duration: %w", err)
-	}
-
-	if !isEnabled {
-		ret := Result{
-			Status:   ResultInformational,
-			Endpoint: "/{{mount}}/config/auto-tidy",
-			Message:  "Auto-tidy is currently disabled; consider enabling auto-tidy to execute tidy operations periodically. This helps the health and performance of a mount.",
-		}
-		results = append(results, &ret)
-	} else {
-		baseMsg := "Auto-tidy is configured with too long of a value for %v (%v); this could impact performance as tidies run too infrequently or take too long to execute."
-
-		if intervalDuration >= h.IntervalDurationCritical {
-			ret := Result{
-				Status:   ResultCritical,
-				Endpoint: "/{{mount}}/config/auto-tidy",
-				Message:  fmt.Sprintf(baseMsg, "interval_duration", intervalDuration),
-			}
-			results = append(results, &ret)
-		} else if intervalDuration >= h.IntervalDurationWarning {
-			ret := Result{
-				Status:   ResultWarning,
-				Endpoint: "/{{mount}}/config/auto-tidy",
-				Message:  fmt.Sprintf(baseMsg, "interval_duration", intervalDuration),
-			}
-			results = append(results, &ret)
-		}
-
-		if pauseDuration >= h.PauseDurationCritical {
-			ret := Result{
-				Status:   ResultCritical,
-				Endpoint: "/{{mount}}/config/auto-tidy",
-				Message:  fmt.Sprintf(baseMsg, "pause_duration", pauseDuration),
-			}
-			results = append(results, &ret)
-		} else if pauseDuration >= h.PauseDurationWarning {
-			ret := Result{
-				Status:   ResultWarning,
-				Endpoint: "/{{mount}}/config/auto-tidy",
-				Message:  fmt.Sprintf(baseMsg, "pause_duration", pauseDuration),
-			}
-			results = append(results, &ret)
-		}
-
-		if len(results) == 0 {
-			ret := Result{
-				Status:   ResultOK,
-				Endpoint: "/{{mount}}/config/auto-tidy",
-				Message:  "Auto-tidy is enabled and configured appropriately.",
-			}
-			results = append(results, &ret)
-		}
-	}
-
-	return
-}
diff --git a/command/healthcheck/pki_hardware_backed_root.go b/command/healthcheck/pki_hardware_backed_root.go
deleted file mode 100644
index 2fdda6e4a62fb..0000000000000
--- a/command/healthcheck/pki_hardware_backed_root.go
+++ /dev/null
@@ -1,158 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package healthcheck
-
-import (
-	"bytes"
-	"crypto/x509"
-	"fmt"
-
-	"github.com/hashicorp/go-secure-stdlib/parseutil"
-)
-
-type HardwareBackedRoot struct {
-	Enabled bool
-
-	UnsupportedVersion bool
-
-	FetchIssues  map[string]*PathFetch
-	IssuerKeyMap map[string]string
-	KeyIsManaged map[string]string
-}
-
-func NewHardwareBackedRootCheck() Check {
-	return &HardwareBackedRoot{
-		FetchIssues:  make(map[string]*PathFetch),
-		IssuerKeyMap: make(map[string]string),
-		KeyIsManaged: make(map[string]string),
-	}
-}
-
-func (h *HardwareBackedRoot) Name() string {
-	return "hardware_backed_root"
-}
-
-func (h *HardwareBackedRoot) IsEnabled() bool {
-	return h.Enabled
-}
-
-func (h *HardwareBackedRoot) DefaultConfig() map[string]interface{} {
-	return map[string]interface{}{
-		"enabled": false,
-	}
-}
-
-func (h *HardwareBackedRoot) LoadConfig(config map[string]interface{}) error {
-	enabled, err := parseutil.ParseBool(config["enabled"])
-	if err != nil {
-		return fmt.Errorf("error parsing %v.enabled: %w", h.Name(), err)
-	}
-	h.Enabled = enabled
-
-	return nil
-}
-
-func (h *HardwareBackedRoot) FetchResources(e *Executor) error {
-	exit, _, issuers, err := pkiFetchIssuersList(e, func() {
-		h.UnsupportedVersion = true
-	})
-	if exit || err != nil {
-		return err
-	}
-
-	for _, issuer := range issuers {
-		skip, ret, entry, err := pkiFetchIssuerEntry(e, issuer, func() {
-			h.UnsupportedVersion = true
-		})
-		if skip || err != nil || entry == nil {
-			if err != nil {
-				return err
-			}
-			h.FetchIssues[issuer] = ret
-			continue
-		}
-
-		// Ensure we only check Root CAs.
-		cert := ret.ParsedCache["certificate"].(*x509.Certificate)
-		if !bytes.Equal(cert.RawSubject, cert.RawIssuer) {
-			continue
-		}
-		if err := cert.CheckSignatureFrom(cert); err != nil {
-			continue
-		}
-
-		// Ensure we only check issuers with keys.
-		keyId, present := entry["key_id"].(string)
-		if !present || len(keyId) == 0 {
-			continue
-		}
-
-		h.IssuerKeyMap[issuer] = keyId
-		skip, ret, keyEntry, err := pkiFetchKeyEntry(e, keyId, func() {
-			h.UnsupportedVersion = true
-		})
-		if skip || err != nil || keyEntry == nil {
-			if err != nil {
-				return err
-			}
-
-			h.FetchIssues[issuer] = ret
-			continue
-		}
-
-		uuid, present := keyEntry["managed_key_id"].(string)
-		if present {
-			h.KeyIsManaged[keyId] = uuid
-		}
-	}
-
-	return nil
-}
-
-func (h *HardwareBackedRoot) Evaluate(e *Executor) (results []*Result, err error) {
-	if h.UnsupportedVersion {
-		ret := Result{
-			Status:   ResultInvalidVersion,
-			Endpoint: "/{{mount}}/issuers",
-			Message:  "This health check requires Vault 1.11+ but an earlier version of Vault Server was contacted, preventing this health check from running.",
-		}
-		return []*Result{&ret}, nil
-	}
-
-	for issuer, fetchPath := range h.FetchIssues {
-		if fetchPath != nil && fetchPath.IsSecretPermissionsError() {
-			delete(h.IssuerKeyMap, issuer)
-			ret := Result{
-				Status:   ResultInsufficientPermissions,
-				Endpoint: fetchPath.Path,
-				Message:  "Without this information, this health check is unable to function.",
-			}
-
-			if e.Client.Token() == "" {
-				ret.Message = "No token available so unable for the endpoint for this mount. " + ret.Message
-			} else {
-				ret.Message = "This token lacks permission for the endpoint for this mount. " + ret.Message
-			}
-
-			results = append(results, &ret)
-		}
-	}
-
-	for name, keyId := range h.IssuerKeyMap {
-		var ret Result
-		ret.Status = ResultInformational
-		ret.Endpoint = "/{{mount}}/issuer/" + name
-		ret.Message = "Root issuer was created using Vault-backed software keys; for added safety of long-lived, important root CAs, you may wish to consider using a HSM or KSM Managed Key to store key material for this issuer."
-
-		uuid, present := h.KeyIsManaged[keyId]
-		if present {
-			ret.Status = ResultOK
-			ret.Message = fmt.Sprintf("Root issuer was backed by a HSM or KMS Managed Key: %v.", uuid)
-		}
-
-		results = append(results, &ret)
-	}
-
-	return
-}
diff --git a/command/healthcheck/pki_role_allows_glob_wildcards.go b/command/healthcheck/pki_role_allows_glob_wildcards.go
deleted file mode 100644
index 83c55c23856d5..0000000000000
--- a/command/healthcheck/pki_role_allows_glob_wildcards.go
+++ /dev/null
@@ -1,186 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package healthcheck
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/hashicorp/go-secure-stdlib/parseutil"
-)
-
-type RoleAllowsGlobWildcards struct {
-	Enabled            bool
-	UnsupportedVersion bool
-
-	RoleListFetchIssue *PathFetch
-	RoleFetchIssues    map[string]*PathFetch
-	RoleEntryMap       map[string]map[string]interface{}
-}
-
-func NewRoleAllowsGlobWildcardsCheck() Check {
-	return &RoleAllowsGlobWildcards{
-		RoleFetchIssues: make(map[string]*PathFetch),
-		RoleEntryMap:    make(map[string]map[string]interface{}),
-	}
-}
-
-func (h *RoleAllowsGlobWildcards) Name() string {
-	return "role_allows_glob_wildcards"
-}
-
-func (h *RoleAllowsGlobWildcards) IsEnabled() bool {
-	return h.Enabled
-}
-
-func (h *RoleAllowsGlobWildcards) DefaultConfig() map[string]interface{} {
-	return map[string]interface{}{}
-}
-
-func (h *RoleAllowsGlobWildcards) LoadConfig(config map[string]interface{}) error {
-	enabled, err := parseutil.ParseBool(config["enabled"])
-	if err != nil {
-		return fmt.Errorf("error parsing %v.enabled: %w", h.Name(), err)
-	}
-	h.Enabled = enabled
-
-	return nil
-}
-
-func (h *RoleAllowsGlobWildcards) FetchResources(e *Executor) error {
-	exit, f, roles, err := pkiFetchRolesList(e, func() {
-		h.UnsupportedVersion = true
-	})
-	if exit || err != nil {
-		if f != nil && f.IsSecretPermissionsError() {
-			h.RoleListFetchIssue = f
-		}
-		return err
-	}
-
-	for _, role := range roles {
-		skip, f, entry, err := pkiFetchRole(e, role, func() {
-			h.UnsupportedVersion = true
-		})
-		if skip || err != nil || entry == nil {
-			if f != nil && f.IsSecretPermissionsError() {
-				h.RoleFetchIssues[role] = f
-			}
-			if err != nil {
-				return err
-			}
-			continue
-		}
-
-		h.RoleEntryMap[role] = entry
-	}
-
-	return nil
-}
-
-func (h *RoleAllowsGlobWildcards) Evaluate(e *Executor) (results []*Result, err error) {
-	if h.UnsupportedVersion {
-		// Shouldn't happen; roles have been around forever.
-		ret := Result{
-			Status:   ResultInvalidVersion,
-			Endpoint: "/{{mount}}/roles",
-			Message:  "This health check requires Vault 1.11+ but an earlier version of Vault Server was contacted, preventing this health check from running.",
-		}
-		return []*Result{&ret}, nil
-	}
-	if h.RoleListFetchIssue != nil && h.RoleListFetchIssue.IsSecretPermissionsError() {
-		ret := Result{
-			Status:   ResultInsufficientPermissions,
-			Endpoint: h.RoleListFetchIssue.Path,
-			Message:  "lacks permission either to list the roles. This restricts the ability to fully execute this health check.",
-		}
-		if e.Client.Token() == "" {
-			ret.Message = "No token available and so this health check " + ret.Message
-		} else {
-			ret.Message = "This token " + ret.Message
-		}
-		return []*Result{&ret}, nil
-	}
-
-	for role, fetchPath := range h.RoleFetchIssues {
-		if fetchPath != nil && fetchPath.IsSecretPermissionsError() {
-			delete(h.RoleEntryMap, role)
-			ret := Result{
-				Status:   ResultInsufficientPermissions,
-				Endpoint: fetchPath.Path,
-				Message:  "Without this information, this health check is unable to function.",
-			}
-
-			if e.Client.Token() == "" {
-				ret.Message = "No token available so unable for the endpoint for this mount. " + ret.Message
-			} else {
-				ret.Message = "This token lacks permission the endpoint for this mount. " + ret.Message
-			}
-
-			results = append(results, &ret)
-		}
-	}
-
-	for role, entry := range h.RoleEntryMap {
-		allowsWildcards, present := entry["allow_wildcard_certificates"]
-		if !present {
-			ret := Result{
-				Status:   ResultInvalidVersion,
-				Endpoint: "/{{mount}}/roles",
-				Message:  "This health check requires a version of Vault with allow_wildcard_certificates (Vault 1.8.9+, 1.9.4+, or 1.10.0+), but an earlier version of Vault Server was contacted, preventing this health check from running.",
-			}
-			return []*Result{&ret}, nil
-		}
-		if !allowsWildcards.(bool) {
-			continue
-		}
-
-		allowsGlobs := entry["allow_glob_domains"].(bool)
-		if !allowsGlobs {
-			continue
-		}
-
-		rawAllowedDomains := entry["allowed_domains"].([]interface{})
-		var allowedDomains []string
-		for _, rawDomain := range rawAllowedDomains {
-			allowedDomains = append(allowedDomains, rawDomain.(string))
-		}
-
-		if len(allowedDomains) == 0 {
-			continue
-		}
-
-		hasGlobbedDomain := false
-		for _, domain := range allowedDomains {
-			if strings.Contains(domain, "*") {
-				hasGlobbedDomain = true
-				break
-			}
-		}
-
-		if !hasGlobbedDomain {
-			continue
-		}
-
-		ret := Result{
-			Status:   ResultWarning,
-			Endpoint: "/{{mount}}/roles/" + role,
-			Message:  fmt.Sprintf("Role currently allows wildcard issuance while allowing globs in allowed_domains (%v). Because globs can expand to one or more wildcard character, including wildcards under additional subdomains, these options are dangerous to enable together. If glob domains are required to be enabled, it is suggested to either disable wildcard issuance if not desired, or create two separate roles -- one with wildcard issuance for specified domains and one with glob matching enabled for concrete domain identifiers.", allowedDomains),
-		}
-
-		results = append(results, &ret)
-	}
-
-	if len(results) == 0 && len(h.RoleEntryMap) > 0 {
-		ret := Result{
-			Status:   ResultOK,
-			Endpoint: "/{{mount}}/roles",
-			Message:  "Roles follow best practices regarding restricting wildcard certificate issuance in roles.",
-		}
-
-		results = append(results, &ret)
-	}
-
-	return
-}
diff --git a/command/healthcheck/pki_role_allows_localhost.go b/command/healthcheck/pki_role_allows_localhost.go
deleted file mode 100644
index 0c9b780abef78..0000000000000
--- a/command/healthcheck/pki_role_allows_localhost.go
+++ /dev/null
@@ -1,161 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package healthcheck
-
-import (
-	"fmt"
-
-	"github.com/hashicorp/go-secure-stdlib/parseutil"
-)
-
-type RoleAllowsLocalhost struct {
-	Enabled            bool
-	UnsupportedVersion bool
-
-	RoleListFetchIssue *PathFetch
-	RoleFetchIssues    map[string]*PathFetch
-	RoleEntryMap       map[string]map[string]interface{}
-}
-
-func NewRoleAllowsLocalhostCheck() Check {
-	return &RoleAllowsLocalhost{
-		RoleFetchIssues: make(map[string]*PathFetch),
-		RoleEntryMap:    make(map[string]map[string]interface{}),
-	}
-}
-
-func (h *RoleAllowsLocalhost) Name() string {
-	return "role_allows_localhost"
-}
-
-func (h *RoleAllowsLocalhost) IsEnabled() bool {
-	return h.Enabled
-}
-
-func (h *RoleAllowsLocalhost) DefaultConfig() map[string]interface{} {
-	return map[string]interface{}{}
-}
-
-func (h *RoleAllowsLocalhost) LoadConfig(config map[string]interface{}) error {
-	enabled, err := parseutil.ParseBool(config["enabled"])
-	if err != nil {
-		return fmt.Errorf("error parsing %v.enabled: %w", h.Name(), err)
-	}
-	h.Enabled = enabled
-
-	return nil
-}
-
-func (h *RoleAllowsLocalhost) FetchResources(e *Executor) error {
-	exit, f, roles, err := pkiFetchRolesList(e, func() {
-		h.UnsupportedVersion = true
-	})
-	if exit || err != nil {
-		if f != nil && f.IsSecretPermissionsError() {
-			h.RoleListFetchIssue = f
-		}
-		return err
-	}
-
-	for _, role := range roles {
-		skip, f, entry, err := pkiFetchRole(e, role, func() {
-			h.UnsupportedVersion = true
-		})
-		if skip || err != nil || entry == nil {
-			if f != nil && f.IsSecretPermissionsError() {
-				h.RoleFetchIssues[role] = f
-			}
-			if err != nil {
-				return err
-			}
-			continue
-		}
-
-		h.RoleEntryMap[role] = entry
-	}
-
-	return nil
-}
-
-func (h *RoleAllowsLocalhost) Evaluate(e *Executor) (results []*Result, err error) {
-	if h.UnsupportedVersion {
-		// Shouldn't happen; roles have been around forever.
-		ret := Result{
-			Status:   ResultInvalidVersion,
-			Endpoint: "/{{mount}}/roles",
-			Message:  "This health check requires Vault 1.11+ but an earlier version of Vault Server was contacted, preventing this health check from running.",
-		}
-		return []*Result{&ret}, nil
-	}
-
-	if h.RoleListFetchIssue != nil && h.RoleListFetchIssue.IsSecretPermissionsError() {
-		ret := Result{
-			Status:   ResultInsufficientPermissions,
-			Endpoint: h.RoleListFetchIssue.Path,
-			Message:  "lacks permission either to list the roles. This restricts the ability to fully execute this health check.",
-		}
-		if e.Client.Token() == "" {
-			ret.Message = "No token available and so this health check " + ret.Message
-		} else {
-			ret.Message = "This token " + ret.Message
-		}
-		return []*Result{&ret}, nil
-	}
-
-	for role, fetchPath := range h.RoleFetchIssues {
-		if fetchPath != nil && fetchPath.IsSecretPermissionsError() {
-			delete(h.RoleEntryMap, role)
-			ret := Result{
-				Status:   ResultInsufficientPermissions,
-				Endpoint: fetchPath.Path,
-				Message:  "Without this information, this health check is unable to function.",
-			}
-
-			if e.Client.Token() == "" {
-				ret.Message = "No token available so unable for the endpoint for this mount. " + ret.Message
-			} else {
-				ret.Message = "This token lacks permission the endpoint for this mount. " + ret.Message
-			}
-
-			results = append(results, &ret)
-		}
-	}
-
-	for role, entry := range h.RoleEntryMap {
-		allowsLocalhost := entry["allow_localhost"].(bool)
-		if !allowsLocalhost {
-			continue
-		}
-
-		rawAllowedDomains := entry["allowed_domains"].([]interface{})
-		var allowedDomains []string
-		for _, rawDomain := range rawAllowedDomains {
-			allowedDomains = append(allowedDomains, rawDomain.(string))
-		}
-
-		if len(allowedDomains) == 0 {
-			continue
-		}
-
-		ret := Result{
-			Status:   ResultWarning,
-			Endpoint: "/{{mount}}/roles/" + role,
-			Message:  fmt.Sprintf("Role currently allows localhost issuance with a non-empty allowed_domains (%v): this role is intended for issuing other hostnames and the allow_localhost=true option may be overlooked by operators. If this role is intended to issue certificates valid for localhost, consider setting allow_localhost=false and explicitly adding localhost to the list of allowed domains.", allowedDomains),
-		}
-
-		results = append(results, &ret)
-	}
-
-	if len(results) == 0 && len(h.RoleEntryMap) > 0 {
-		ret := Result{
-			Status:   ResultOK,
-			Endpoint: "/{{mount}}/roles",
-			Message:  "Roles follow best practices regarding allowing issuance for localhost domains.",
-		}
-
-		results = append(results, &ret)
-	}
-
-	return
-}
diff --git a/command/healthcheck/pki_role_no_store_false.go b/command/healthcheck/pki_role_no_store_false.go
deleted file mode 100644
index 882955e2bd571..0000000000000
--- a/command/healthcheck/pki_role_no_store_false.go
+++ /dev/null
@@ -1,200 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package healthcheck
-
-import (
-	"fmt"
-
-	"github.com/hashicorp/vault/sdk/logical"
-
-	"github.com/hashicorp/go-secure-stdlib/parseutil"
-)
-
-type RoleNoStoreFalse struct {
-	Enabled            bool
-	UnsupportedVersion bool
-
-	AllowedRoles map[string]bool
-
-	RoleListFetchIssue *PathFetch
-	RoleFetchIssues    map[string]*PathFetch
-	RoleEntryMap       map[string]map[string]interface{}
-	CRLConfig          *PathFetch
-}
-
-func NewRoleNoStoreFalseCheck() Check {
-	return &RoleNoStoreFalse{
-		RoleFetchIssues: make(map[string]*PathFetch),
-		AllowedRoles:    make(map[string]bool),
-		RoleEntryMap:    make(map[string]map[string]interface{}),
-	}
-}
-
-func (h *RoleNoStoreFalse) Name() string {
-	return "role_no_store_false"
-}
-
-func (h *RoleNoStoreFalse) IsEnabled() bool {
-	return h.Enabled
-}
-
-func (h *RoleNoStoreFalse) DefaultConfig() map[string]interface{} {
-	return map[string]interface{}{
-		"allowed_roles": []string{},
-	}
-}
-
-func (h *RoleNoStoreFalse) LoadConfig(config map[string]interface{}) error {
-	value, present := config["allowed_roles"].([]interface{})
-	if present {
-		for _, rawValue := range value {
-			h.AllowedRoles[rawValue.(string)] = true
-		}
-	}
-
-	enabled, err := parseutil.ParseBool(config["enabled"])
-	if err != nil {
-		return fmt.Errorf("error parsing %v.enabled: %w", h.Name(), err)
-	}
-	h.Enabled = enabled
-
-	return nil
-}
-
-func (h *RoleNoStoreFalse) FetchResources(e *Executor) error {
-	exit, f, roles, err := pkiFetchRolesList(e, func() {
-		h.UnsupportedVersion = true
-	})
-	if exit || err != nil {
-		if f != nil && f.IsSecretPermissionsError() {
-			h.RoleListFetchIssue = f
-		}
-		return err
-	}
-
-	for _, role := range roles {
-		skip, f, entry, err := pkiFetchRole(e, role, func() {
-			h.UnsupportedVersion = true
-		})
-		if skip || err != nil || entry == nil {
-			if f != nil && f.IsSecretPermissionsError() {
-				h.RoleFetchIssues[role] = f
-			}
-			if err != nil {
-				return err
-			}
-			continue
-		}
-
-		h.RoleEntryMap[role] = entry
-	}
-
-	// Check if the issuer is fetched yet.
-	configRet, err := e.FetchIfNotFetched(logical.ReadOperation, "/{{mount}}/config/crl")
-	if err != nil {
-		return err
-	}
-
-	h.CRLConfig = configRet
-
-	return nil
-}
-
-func (h *RoleNoStoreFalse) Evaluate(e *Executor) (results []*Result, err error) {
-	if h.UnsupportedVersion {
-		// Shouldn't happen; roles have been around forever.
-		ret := Result{
-			Status:   ResultInvalidVersion,
-			Endpoint: "/{{mount}}/roles",
-			Message:  "This health check requires Vault 1.11+ but an earlier version of Vault Server was contacted, preventing this health check from running.",
-		}
-		return []*Result{&ret}, nil
-	}
-
-	if h.RoleListFetchIssue != nil && h.RoleListFetchIssue.IsSecretPermissionsError() {
-		ret := Result{
-			Status:   ResultInsufficientPermissions,
-			Endpoint: h.RoleListFetchIssue.Path,
-			Message:  "lacks permission either to list the roles. This restricts the ability to fully execute this health check.",
-		}
-		if e.Client.Token() == "" {
-			ret.Message = "No token available and so this health check " + ret.Message
-		} else {
-			ret.Message = "This token " + ret.Message
-		}
-		return []*Result{&ret}, nil
-	}
-
-	for role, fetchPath := range h.RoleFetchIssues {
-		if fetchPath != nil && fetchPath.IsSecretPermissionsError() {
-			delete(h.RoleEntryMap, role)
-			ret := Result{
-				Status:   ResultInsufficientPermissions,
-				Endpoint: fetchPath.Path,
-				Message:  "Without this information, this health check is unable to function.",
-			}
-
-			if e.Client.Token() == "" {
-				ret.Message = "No token available so unable for the endpoint for this mount. " + ret.Message
-			} else {
-				ret.Message = "This token lacks permission the endpoint for this mount. " + ret.Message
-			}
-
-			results = append(results, &ret)
-		}
-	}
-
-	crlAutoRebuild := false
-	if h.CRLConfig != nil {
-		if h.CRLConfig.IsSecretPermissionsError() {
-			ret := Result{
-				Status:   ResultInsufficientPermissions,
-				Endpoint: "/{{mount}}/config/crl",
-				Message:  "This prevents the health check from seeing if the CRL is set to auto_rebuild=true and lowering the severity of check results appropriately.",
-			}
-
-			if e.Client.Token() == "" {
-				ret.Message = "No token available so unable read authenticated CRL configuration for this mount. " + ret.Message
-			} else {
-				ret.Message = "This token lacks so permission to read the CRL configuration for this mount. " + ret.Message
-			}
-
-			results = append(results, &ret)
-		} else if h.CRLConfig.Secret != nil && h.CRLConfig.Secret.Data["auto_rebuild"] != nil {
-			crlAutoRebuild = h.CRLConfig.Secret.Data["auto_rebuild"].(bool)
-		}
-	}
-
-	for role, entry := range h.RoleEntryMap {
-		noStore := entry["no_store"].(bool)
-		if noStore {
-			continue
-		}
-
-		ret := Result{
-			Status:   ResultWarning,
-			Endpoint: "/{{mount}}/roles/" + role,
-			Message:  "Role currently stores every issued certificate (no_store=false). Too many issued and/or revoked certificates can exceed Vault's storage limits and make operations slow. It is encouraged to enable auto-rebuild of CRLs to prevent every revocation from creating a new CRL, and to limit the number of certificates issued under roles with no_store=false: use shorter lifetimes and/or BYOC revocation instead.",
-		}
-
-		if crlAutoRebuild {
-			ret.Status = ResultInformational
-			ret.Message = "Role currently stores every issued certificate (no_store=false). With auto-rebuild CRL enabled, less performance impact occur on CRL rebuilding, but note that too many issued and/or revoked certificates can exceed Vault's storage limits and make operations slow. It is suggested to limit the number of certificates issued under roles with no_store=false: use shorter lifetimes to avoid revocation and/or BYOC revocation instead."
-		}
-
-		results = append(results, &ret)
-	}
-
-	if len(results) == 0 && len(h.RoleEntryMap) > 0 {
-		ret := Result{
-			Status:   ResultOK,
-			Endpoint: "/{{mount}}/roles",
-			Message:  "Roles follow best practices regarding certificate storage.",
-		}
-
-		results = append(results, &ret)
-	}
-
-	return
-}
diff --git a/command/healthcheck/pki_root_issued_leaves.go b/command/healthcheck/pki_root_issued_leaves.go
deleted file mode 100644
index 615684b0df494..0000000000000
--- a/command/healthcheck/pki_root_issued_leaves.go
+++ /dev/null
@@ -1,205 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package healthcheck
-
-import (
-	"bytes"
-	"crypto/x509"
-	"fmt"
-
-	"github.com/hashicorp/go-secure-stdlib/parseutil"
-)
-
-type RootIssuedLeaves struct {
-	Enabled            bool
-	UnsupportedVersion bool
-
-	CertsToFetch int
-
-	FetchIssues map[string]*PathFetch
-	RootCertMap map[string]*x509.Certificate
-	LeafCertMap map[string]*x509.Certificate
-}
-
-func NewRootIssuedLeavesCheck() Check {
-	return &RootIssuedLeaves{
-		FetchIssues: make(map[string]*PathFetch),
-		RootCertMap: make(map[string]*x509.Certificate),
-		LeafCertMap: make(map[string]*x509.Certificate),
-	}
-}
-
-func (h *RootIssuedLeaves) Name() string {
-	return "root_issued_leaves"
-}
-
-func (h *RootIssuedLeaves) IsEnabled() bool {
-	return h.Enabled
-}
-
-func (h *RootIssuedLeaves) DefaultConfig() map[string]interface{} {
-	return map[string]interface{}{
-		"certs_to_fetch": 100,
-	}
-}
-
-func (h *RootIssuedLeaves) LoadConfig(config map[string]interface{}) error {
-	count, err := parseutil.SafeParseIntRange(config["certs_to_fetch"], 1, 100000)
-	if err != nil {
-		return fmt.Errorf("error parsing %v.certs_to_fetch: %w", h.Name(), err)
-	}
-	h.CertsToFetch = int(count)
-
-	enabled, err := parseutil.ParseBool(config["enabled"])
-	if err != nil {
-		return fmt.Errorf("error parsing %v.enabled: %w", h.Name(), err)
-	}
-	h.Enabled = enabled
-
-	return nil
-}
-
-func (h *RootIssuedLeaves) FetchResources(e *Executor) error {
-	exit, _, issuers, err := pkiFetchIssuersList(e, func() {
-		h.UnsupportedVersion = true
-	})
-	if exit || err != nil {
-		return err
-	}
-
-	for _, issuer := range issuers {
-		skip, pathFetch, cert, err := pkiFetchIssuer(e, issuer, func() {
-			h.UnsupportedVersion = true
-		})
-		h.FetchIssues[issuer] = pathFetch
-		if skip || err != nil {
-			if err != nil {
-				return err
-			}
-			continue
-		}
-
-		// Ensure we only check Root CAs.
-		if !bytes.Equal(cert.RawSubject, cert.RawIssuer) {
-			continue
-		}
-		if err := cert.CheckSignatureFrom(cert); err != nil {
-			continue
-		}
-
-		h.RootCertMap[issuer] = cert
-	}
-
-	exit, f, leaves, err := pkiFetchLeavesList(e, func() {
-		h.UnsupportedVersion = true
-	})
-	if exit || err != nil {
-		if f != nil && f.IsSecretPermissionsError() {
-			for _, issuer := range issuers {
-				h.FetchIssues[issuer] = f
-			}
-		}
-		return err
-	}
-
-	var leafCount int
-	for _, serial := range leaves {
-		if leafCount >= h.CertsToFetch {
-			break
-		}
-
-		skip, _, cert, err := pkiFetchLeaf(e, serial, func() {
-			h.UnsupportedVersion = true
-		})
-		if skip || err != nil {
-			if err != nil {
-				return err
-			}
-			continue
-		}
-
-		// Ignore other CAs.
-		if cert.BasicConstraintsValid && cert.IsCA {
-			continue
-		}
-
-		leafCount += 1
-		h.LeafCertMap[serial] = cert
-	}
-
-	return nil
-}
-
-func (h *RootIssuedLeaves) Evaluate(e *Executor) (results []*Result, err error) {
-	if h.UnsupportedVersion {
-		ret := Result{
-			Status:   ResultInvalidVersion,
-			Endpoint: "/{{mount}}/issuers",
-			Message:  "This health check requires Vault 1.11+ but an earlier version of Vault Server was contacted, preventing this health check from running.",
-		}
-		return []*Result{&ret}, nil
-	}
-
-	for issuer, fetchPath := range h.FetchIssues {
-		if fetchPath != nil && fetchPath.IsSecretPermissionsError() {
-			delete(h.RootCertMap, issuer)
-			ret := Result{
-				Status:   ResultInsufficientPermissions,
-				Endpoint: fetchPath.Path,
-				Message:  "Without this information, this health check is unable to function.",
-			}
-
-			if e.Client.Token() == "" {
-				ret.Message = "No token available so unable for the endpoint for this mount. " + ret.Message
-			} else {
-				ret.Message = "This token lacks permission for the endpoint for this mount. " + ret.Message
-			}
-
-			results = append(results, &ret)
-		}
-	}
-
-	issuerHasLeaf := make(map[string]bool)
-	for serial, leaf := range h.LeafCertMap {
-		if len(issuerHasLeaf) == len(h.RootCertMap) {
-			break
-		}
-
-		for issuer, root := range h.RootCertMap {
-			if issuerHasLeaf[issuer] {
-				continue
-			}
-
-			if !bytes.Equal(leaf.RawIssuer, root.RawSubject) {
-				continue
-			}
-
-			if err := leaf.CheckSignatureFrom(root); err != nil {
-				continue
-			}
-
-			ret := Result{
-				Status:   ResultWarning,
-				Endpoint: "/{{mount}}/issuer/" + issuer,
-				Message:  fmt.Sprintf("Root issuer has directly issued non-CA leaf certificates (%v) instead of via an intermediate CA. This can make rotating the root CA harder as direct cross-signing of the roots must be used, rather than cross-signing of the intermediates. It is encouraged to set up and use an intermediate CA and tidy the mount when all directly issued leaves have expired.", serial),
-			}
-
-			issuerHasLeaf[issuer] = true
-
-			results = append(results, &ret)
-		}
-	}
-
-	if len(results) == 0 && len(h.RootCertMap) > 0 {
-		ret := Result{
-			Status:   ResultOK,
-			Endpoint: "/{{mount}}/certs",
-			Message:  "Root certificate(s) in this mount have not directly issued non-CA leaf certificates.",
-		}
-
-		results = append(results, &ret)
-	}
-
-	return
-}
diff --git a/command/healthcheck/pki_tidy_last_run.go b/command/healthcheck/pki_tidy_last_run.go
deleted file mode 100644
index 9d07369c877d8..0000000000000
--- a/command/healthcheck/pki_tidy_last_run.go
+++ /dev/null
@@ -1,147 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package healthcheck
-
-import (
-	"fmt"
-	"time"
-
-	"github.com/hashicorp/vault/sdk/logical"
-
-	"github.com/hashicorp/go-secure-stdlib/parseutil"
-)
-
-type TidyLastRun struct {
-	Enabled            bool
-	UnsupportedVersion bool
-
-	LastRunCritical time.Duration
-	LastRunWarning  time.Duration
-
-	TidyStatus *PathFetch
-}
-
-func NewTidyLastRunCheck() Check {
-	return &TidyLastRun{}
-}
-
-func (h *TidyLastRun) Name() string {
-	return "tidy_last_run"
-}
-
-func (h *TidyLastRun) IsEnabled() bool {
-	return h.Enabled
-}
-
-func (h *TidyLastRun) DefaultConfig() map[string]interface{} {
-	return map[string]interface{}{
-		"last_run_critical": "7d",
-		"last_run_warning":  "2d",
-	}
-}
-
-func (h *TidyLastRun) LoadConfig(config map[string]interface{}) error {
-	var err error
-	h.LastRunCritical, err = parseutil.ParseDurationSecond(config["last_run_critical"])
-	if err != nil {
-		return fmt.Errorf("failed to parse parameter %v.%v=%v: %w", h.Name(), "last_run_critical", config["last_run_critical"], err)
-	}
-
-	h.LastRunWarning, err = parseutil.ParseDurationSecond(config["last_run_warning"])
-	if err != nil {
-		return fmt.Errorf("failed to parse parameter %v.%v=%v: %w", h.Name(), "last_run_warning", config["last_run_warning"], err)
-	}
-
-	enabled, err := parseutil.ParseBool(config["enabled"])
-	if err != nil {
-		return fmt.Errorf("error parsing %v.enabled: %w", h.Name(), err)
-	}
-	h.Enabled = enabled
-
-	return nil
-}
-
-func (h *TidyLastRun) FetchResources(e *Executor) error {
-	var err error
-
-	h.TidyStatus, err = e.FetchIfNotFetched(logical.ReadOperation, "/{{mount}}/tidy-status")
-	if err != nil {
-		return fmt.Errorf("failed to fetch mount's tidy-status value: %v", err)
-	}
-
-	if h.TidyStatus.IsUnsupportedPathError() {
-		h.UnsupportedVersion = true
-	}
-
-	return nil
-}
-
-func (h *TidyLastRun) Evaluate(e *Executor) (results []*Result, err error) {
-	if h.UnsupportedVersion {
-		// Shouldn't happen; roles have been around forever.
-		ret := Result{
-			Status:   ResultInvalidVersion,
-			Endpoint: "/{{mount}}/tidy-status",
-			Message:  "This health check requires Vault 1.10+ but an earlier version of Vault Server was contacted, preventing this health check from running.",
-		}
-		return []*Result{&ret}, nil
-	}
-
-	if h.TidyStatus == nil {
-		return nil, nil
-	}
-
-	if h.TidyStatus.IsSecretPermissionsError() {
-		ret := Result{
-			Status:   ResultInsufficientPermissions,
-			Endpoint: "/{{mount}}/tidy-status",
-			Message:  "Without this information, this health check is unable to function.",
-		}
-
-		if e.Client.Token() == "" {
-			ret.Message = "No token available so unable read tidy status endpoint for this mount. " + ret.Message
-		} else {
-			ret.Message = "This token lacks permission to read the tidy status endpoint for this mount. " + ret.Message
-		}
-
-		results = append(results, &ret)
-	}
-
-	baseMsg := "Tidy hasn't run in the last %v; this can point to problems with the mount's auto-tidy configuration or an external tidy executor; this can impact PKI's and Vault's performance if not run regularly."
-
-	if h.TidyStatus.Secret != nil && h.TidyStatus.Secret.Data != nil {
-		ret := Result{
-			Status:   ResultOK,
-			Endpoint: "/{{mount}}/tidy-status",
-			Message:  "Tidy has run recently on this mount.",
-		}
-
-		when := h.TidyStatus.Secret.Data["time_finished"]
-		if when == nil {
-			ret.Status = ResultCritical
-			ret.Message = "Tidy hasn't run since this mount was created; this can point to problems with the mount's auto-tidy configuration or an external tidy executor; this can impact PKI's and Vault's performance if not run regularly. It is suggested to enable auto-tidy on this mount."
-		} else {
-			now := time.Now()
-			lastRunCritical := now.Add(-1 * h.LastRunCritical)
-			lastRunWarning := now.Add(-1 * h.LastRunWarning)
-
-			whenT, err := parseutil.ParseAbsoluteTime(when)
-			if err != nil {
-				return nil, fmt.Errorf("error parsing time value (%v): %w", when, err)
-			}
-
-			if whenT.Before(lastRunCritical) {
-				ret.Status = ResultCritical
-				ret.Message = fmt.Sprintf(baseMsg, h.LastRunCritical)
-			} else if whenT.Before(lastRunWarning) {
-				ret.Status = ResultWarning
-				ret.Message = fmt.Sprintf(baseMsg, h.LastRunWarning)
-			}
-		}
-
-		results = append(results, &ret)
-	}
-
-	return
-}
diff --git a/command/healthcheck/pki_too_many_certs.go b/command/healthcheck/pki_too_many_certs.go
deleted file mode 100644
index 59722ab2eff01..0000000000000
--- a/command/healthcheck/pki_too_many_certs.go
+++ /dev/null
@@ -1,124 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package healthcheck
-
-import (
-	"fmt"
-
-	"github.com/hashicorp/go-secure-stdlib/parseutil"
-)
-
-type TooManyCerts struct {
-	Enabled            bool
-	UnsupportedVersion bool
-
-	CountCritical int
-	CountWarning  int
-
-	CertCounts int
-	FetchIssue *PathFetch
-}
-
-func NewTooManyCertsCheck() Check {
-	return &TooManyCerts{}
-}
-
-func (h *TooManyCerts) Name() string {
-	return "too_many_certs"
-}
-
-func (h *TooManyCerts) IsEnabled() bool {
-	return h.Enabled
-}
-
-func (h *TooManyCerts) DefaultConfig() map[string]interface{} {
-	return map[string]interface{}{
-		"count_critical": 250000,
-		"count_warning":  50000,
-	}
-}
-
-func (h *TooManyCerts) LoadConfig(config map[string]interface{}) error {
-	value, err := parseutil.SafeParseIntRange(config["count_critical"], 1, 15000000)
-	if err != nil {
-		return fmt.Errorf("error parsing %v.count_critical: %w", h.Name(), err)
-	}
-	h.CountCritical = int(value)
-
-	value, err = parseutil.SafeParseIntRange(config["count_warning"], 1, 15000000)
-	if err != nil {
-		return fmt.Errorf("error parsing %v.count_warning: %w", h.Name(), err)
-	}
-	h.CountWarning = int(value)
-
-	h.Enabled, err = parseutil.ParseBool(config["enabled"])
-	if err != nil {
-		return fmt.Errorf("error parsing %v.enabled: %w", h.Name(), err)
-	}
-
-	return nil
-}
-
-func (h *TooManyCerts) FetchResources(e *Executor) error {
-	exit, leavesRet, _, err := pkiFetchLeavesList(e, func() {
-		h.UnsupportedVersion = true
-	})
-	h.FetchIssue = leavesRet
-
-	if exit || err != nil {
-		return err
-	}
-
-	h.CertCounts = leavesRet.ParsedCache["count"].(int)
-
-	return nil
-}
-
-func (h *TooManyCerts) Evaluate(e *Executor) (results []*Result, err error) {
-	if h.UnsupportedVersion {
-		// Shouldn't happen; /certs has been around forever.
-		ret := Result{
-			Status:   ResultInvalidVersion,
-			Endpoint: "/{{mount}}/certs",
-			Message:  "This health check requires Vault 1.11+ but an earlier version of Vault Server was contacted, preventing this health check from running.",
-		}
-		return []*Result{&ret}, nil
-	}
-
-	if h.FetchIssue != nil && h.FetchIssue.IsSecretPermissionsError() {
-		ret := Result{
-			Status:   ResultInsufficientPermissions,
-			Endpoint: h.FetchIssue.Path,
-			Message:  "Without this information, this health check is unable to function.",
-		}
-
-		if e.Client.Token() == "" {
-			ret.Message = "No token available so unable to list the endpoint for this mount. " + ret.Message
-		} else {
-			ret.Message = "This token lacks permission to list the endpoint for this mount. " + ret.Message
-		}
-
-		results = append(results, &ret)
-		return
-	}
-
-	ret := Result{
-		Status:   ResultOK,
-		Endpoint: "/{{mount}}/certs",
-		Message:  "This mount has an OK number of stored certificates.",
-	}
-
-	baseMsg := "This PKI mount has %v outstanding stored certificates; consider using no_store=false on roles, running tidy operations periodically, and using shorter certificate lifetimes to reduce the storage pressure on this mount."
-	if h.CertCounts >= h.CountCritical {
-		ret.Status = ResultCritical
-		ret.Message = fmt.Sprintf(baseMsg, h.CertCounts)
-	} else if h.CertCounts >= h.CountWarning {
-		ret.Status = ResultWarning
-		ret.Message = fmt.Sprintf(baseMsg, h.CertCounts)
-	}
-
-	results = append(results, &ret)
-
-	return
-}
diff --git a/command/healthcheck/shared.go b/command/healthcheck/shared.go
deleted file mode 100644
index 4097704da2c49..0000000000000
--- a/command/healthcheck/shared.go
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package healthcheck
-
-import (
-	"fmt"
-
-	"github.com/hashicorp/vault/sdk/logical"
-)
-
-func StringList(source interface{}) ([]string, error) {
-	if source == nil {
-		return nil, nil
-	}
-
-	if value, ok := source.([]string); ok {
-		return value, nil
-	}
-
-	if rValues, ok := source.([]interface{}); ok {
-		var result []string
-		for index, rValue := range rValues {
-			value, ok := rValue.(string)
-			if !ok {
-				return nil, fmt.Errorf("unknown source type for []string coercion at index %v: %T", index, rValue)
-			}
-
-			result = append(result, value)
-		}
-
-		return result, nil
-	}
-
-	return nil, fmt.Errorf("unknown source type for []string coercion: %T", source)
-}
-
-func fetchMountTune(e *Executor, versionError func()) (bool, *PathFetch, map[string]interface{}, error) {
-	tuneRet, err := e.FetchIfNotFetched(logical.ReadOperation, "/sys/mounts/{{mount}}/tune")
-	if err != nil {
-		return true, nil, nil, fmt.Errorf("failed to fetch mount tune information: %w", err)
-	}
-
-	if !tuneRet.IsSecretOK() {
-		if tuneRet.IsUnsupportedPathError() {
-			versionError()
-		}
-
-		return true, tuneRet, nil, nil
-	}
-
-	var data map[string]interface{} = nil
-	if len(tuneRet.Secret.Data) > 0 {
-		data = tuneRet.Secret.Data
-	}
-
-	return false, tuneRet, data, nil
-}
diff --git a/command/healthcheck/util.go b/command/healthcheck/util.go
deleted file mode 100644
index dd5d66e88573d..0000000000000
--- a/command/healthcheck/util.go
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package healthcheck
-
-import (
-	"fmt"
-	"time"
-)
-
-var (
-	oneDay   = 24 * time.Hour
-	oneWeek  = 7 * oneDay
-	oneMonth = 30 * oneDay
-	oneYear  = 365 * oneDay
-)
-
-var suffixDurationMap = map[string]time.Duration{
-	"y":  oneYear,
-	"mo": oneMonth,
-	"w":  oneWeek,
-	"d":  oneDay,
-}
-var orderedSuffixes = []string{"y", "mo", "w", "d"}
-
-func FormatDuration(d time.Duration) string {
-	var result string
-	for _, suffix := range orderedSuffixes {
-		unit := suffixDurationMap[suffix]
-		if d > unit {
-			quantity := int64(d / unit)
-			result = fmt.Sprintf("%v%v%v", quantity, suffix, result)
-			d = d - (time.Duration(quantity) * unit)
-		}
-	}
-
-	if d > 0 {
-		result = d.String() + result
-	}
-
-	return result
-}
diff --git a/command/kv.go b/command/kv.go
index b0834c78c71dc..2172576dbd6fa 100644
--- a/command/kv.go
+++ b/command/kv.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/kv_delete.go b/command/kv_delete.go
index a365c89163082..5555b9c71a895 100644
--- a/command/kv_delete.go
+++ b/command/kv_delete.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -156,7 +153,7 @@ func (c *KVDeleteCommand) Run(args []string) int {
 	var fullPath string
 	if v2 {
 		secret, err = c.deleteV2(partialPath, mountPath, client)
-		fullPath = addPrefixToKVPath(partialPath, mountPath, "data", false)
+		fullPath = addPrefixToKVPath(partialPath, mountPath, "data")
 	} else {
 		// v1
 		if mountFlagSyntax {
@@ -195,13 +192,13 @@ func (c *KVDeleteCommand) deleteV2(path, mountPath string, client *api.Client) (
 	var secret *api.Secret
 	switch {
 	case len(c.flagVersions) > 0:
-		path = addPrefixToKVPath(path, mountPath, "delete", false)
+		path = addPrefixToKVPath(path, mountPath, "delete")
 		data := map[string]interface{}{
 			"versions": kvParseVersionsFlags(c.flagVersions),
 		}
 		secret, err = client.Logical().Write(path, data)
 	default:
-		path = addPrefixToKVPath(path, mountPath, "data", false)
+		path = addPrefixToKVPath(path, mountPath, "data")
 		secret, err = client.Logical().Delete(path)
 	}
 
diff --git a/command/kv_destroy.go b/command/kv_destroy.go
index 1167ec814838e..45cbca02518bc 100644
--- a/command/kv_destroy.go
+++ b/command/kv_destroy.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -155,7 +152,7 @@ func (c *KVDestroyCommand) Run(args []string) int {
 		c.UI.Error("Destroy not supported on KV Version 1")
 		return 1
 	}
-	destroyPath := addPrefixToKVPath(partialPath, mountPath, "destroy", false)
+	destroyPath := addPrefixToKVPath(partialPath, mountPath, "destroy")
 	if err != nil {
 		c.UI.Error(err.Error())
 		return 2
diff --git a/command/kv_enable_versioning.go b/command/kv_enable_versioning.go
index 8282dd296ff50..9c2a601432847 100644
--- a/command/kv_enable_versioning.go
+++ b/command/kv_enable_versioning.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/kv_get.go b/command/kv_get.go
index 1d0e330e71c49..057a787c4e286 100644
--- a/command/kv_get.go
+++ b/command/kv_get.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -152,7 +149,7 @@ func (c *KVGetCommand) Run(args []string) int {
 	var fullPath string
 	// Add /data to v2 paths only
 	if v2 {
-		fullPath = addPrefixToKVPath(partialPath, mountPath, "data", false)
+		fullPath = addPrefixToKVPath(partialPath, mountPath, "data")
 
 		if c.flagVersion > 0 {
 			versionParam = map[string]string{
diff --git a/command/kv_helpers.go b/command/kv_helpers.go
index adf2ec3fdcedc..b362c3bb07136 100644
--- a/command/kv_helpers.go
+++ b/command/kv_helpers.go
@@ -1,15 +1,10 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
-	"context"
 	"errors"
 	"fmt"
 	"io"
-	paths "path"
-	"sort"
+	"path"
 	"strings"
 
 	"github.com/hashicorp/go-secure-stdlib/strutil"
@@ -80,9 +75,7 @@ func kvPreflightVersionRequest(client *api.Client, path string) (string, int, er
 				err = fmt.Errorf(
 					`This output flag requires the success of a preflight request 
 to determine the version of a KV secrets engine. Please 
-re-run this command with a token with read access to %s. 
-Note that if the path you are trying to reach is a KV v2 path, your token's policy must 
-allow read access to that path in the format 'mount-path/data/foo', not just 'mount-path/foo'.`, path)
+re-run this command with a token with read access to %s`, path)
 			}
 		}
 
@@ -128,15 +121,15 @@ func isKVv2(path string, client *api.Client) (string, bool, error) {
 	return mountPath, version == 2, nil
 }
 
-func addPrefixToKVPath(path, mountPath, apiPrefix string, skipIfExists bool) string {
-	if path == mountPath || path == strings.TrimSuffix(mountPath, "/") {
-		return paths.Join(mountPath, apiPrefix)
+func addPrefixToKVPath(p, mountPath, apiPrefix string) string {
+	if p == mountPath || p == strings.TrimSuffix(mountPath, "/") {
+		return path.Join(mountPath, apiPrefix)
 	}
 
-	pathSuffix := strings.TrimPrefix(path, mountPath)
+	tp := strings.TrimPrefix(p, mountPath)
 	for {
 		// If the entire mountPath is included in the path, we are done
-		if pathSuffix != path {
+		if tp != p {
 			break
 		}
 		// Trim the parts of the mountPath that are not included in the
@@ -147,16 +140,10 @@ func addPrefixToKVPath(path, mountPath, apiPrefix string, skipIfExists bool) str
 			break
 		}
 		mountPath = strings.TrimSuffix(partialMountPath[1], "/")
-		pathSuffix = strings.TrimPrefix(pathSuffix, mountPath)
-	}
-
-	if skipIfExists {
-		if strings.HasPrefix(pathSuffix, apiPrefix) || strings.HasPrefix(pathSuffix, "/"+apiPrefix) {
-			return paths.Join(mountPath, pathSuffix)
-		}
+		tp = strings.TrimPrefix(tp, mountPath)
 	}
 
-	return paths.Join(mountPath, apiPrefix, pathSuffix)
+	return path.Join(mountPath, apiPrefix, tp)
 }
 
 func getHeaderForMap(header string, data map[string]interface{}) string {
@@ -205,65 +192,3 @@ func padEqualSigns(header string, totalLen int) string {
 
 	return fmt.Sprintf("%s %s %s", strings.Repeat("=", equalSigns/2), header, strings.Repeat("=", equalSigns/2))
 }
-
-// walkSecretsTree dfs-traverses the secrets tree rooted at the given path
-// and calls the `visit` functor for each of the directory and leaf paths.
-// Note: for kv-v2, a "metadata" path is expected and "metadata" paths will be
-// returned in the visit functor.
-func walkSecretsTree(ctx context.Context, client *api.Client, path string, visit func(path string, directory bool) error) error {
-	resp, err := client.Logical().ListWithContext(ctx, path)
-	if err != nil {
-		return fmt.Errorf("could not list %q path: %w", path, err)
-	}
-
-	if resp == nil || resp.Data == nil {
-		return fmt.Errorf("no value found at %q: %w", path, err)
-	}
-
-	keysRaw, ok := resp.Data["keys"]
-	if !ok {
-		return fmt.Errorf("unexpected list response at %q", path)
-	}
-
-	keysRawSlice, ok := keysRaw.([]interface{})
-	if !ok {
-		return fmt.Errorf("unexpected list response type %T at %q", keysRaw, path)
-	}
-
-	keys := make([]string, 0, len(keysRawSlice))
-
-	for _, keyRaw := range keysRawSlice {
-		key, ok := keyRaw.(string)
-		if !ok {
-			return fmt.Errorf("unexpected key type %T at %q", keyRaw, path)
-		}
-		keys = append(keys, key)
-	}
-
-	// sort the keys for a deterministic output
-	sort.Strings(keys)
-
-	for _, key := range keys {
-		// the keys are relative to the current path: combine them
-		child := paths.Join(path, key)
-
-		if strings.HasSuffix(key, "/") {
-			// visit the directory
-			if err := visit(child, true); err != nil {
-				return err
-			}
-
-			// this is not a leaf node: we need to go deeper...
-			if err := walkSecretsTree(ctx, client, child, visit); err != nil {
-				return err
-			}
-		} else {
-			// this is a leaf node: add it to the list
-			if err := visit(child, false); err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}
diff --git a/command/kv_helpers_test.go b/command/kv_helpers_test.go
deleted file mode 100644
index ca5f7e8c5ac64..0000000000000
--- a/command/kv_helpers_test.go
+++ /dev/null
@@ -1,272 +0,0 @@
-package command
-
-import (
-	"context"
-	"reflect"
-	"testing"
-	"time"
-
-	"github.com/hashicorp/vault/api"
-)
-
-// TestAddPrefixToKVPath tests the addPrefixToKVPath helper function
-func TestAddPrefixToKVPath(t *testing.T) {
-	cases := map[string]struct {
-		path         string
-		mountPath    string
-		apiPrefix    string
-		skipIfExists bool
-		expected     string
-	}{
-		"simple": {
-			path:         "kv-v2/foo",
-			mountPath:    "kv-v2/",
-			apiPrefix:    "data",
-			skipIfExists: false,
-			expected:     "kv-v2/data/foo",
-		},
-
-		"multi-part": {
-			path:         "my/kv-v2/mount/path/foo/bar/baz",
-			mountPath:    "my/kv-v2/mount/path",
-			apiPrefix:    "metadata",
-			skipIfExists: false,
-			expected:     "my/kv-v2/mount/path/metadata/foo/bar/baz",
-		},
-
-		"with-namespace": {
-			path:         "my/kv-v2/mount/path/foo/bar/baz",
-			mountPath:    "my/ns1/my/kv-v2/mount/path",
-			apiPrefix:    "metadata",
-			skipIfExists: false,
-			expected:     "my/kv-v2/mount/path/metadata/foo/bar/baz",
-		},
-
-		"skip-if-exists-true": {
-			path:         "kv-v2/data/foo",
-			mountPath:    "kv-v2/",
-			apiPrefix:    "data",
-			skipIfExists: true,
-			expected:     "kv-v2/data/foo",
-		},
-
-		"skip-if-exists-false": {
-			path:         "kv-v2/data/foo",
-			mountPath:    "kv-v2",
-			apiPrefix:    "data",
-			skipIfExists: false,
-			expected:     "kv-v2/data/data/foo",
-		},
-
-		"skip-if-exists-with-namespace": {
-			path:         "my/kv-v2/mount/path/metadata/foo/bar/baz",
-			mountPath:    "my/ns1/my/kv-v2/mount/path",
-			apiPrefix:    "metadata",
-			skipIfExists: true,
-			expected:     "my/kv-v2/mount/path/metadata/foo/bar/baz",
-		},
-	}
-
-	for name, tc := range cases {
-		name, tc := name, tc
-		t.Run(name, func(t *testing.T) {
-			t.Parallel()
-
-			actual := addPrefixToKVPath(
-				tc.path,
-				tc.mountPath,
-				tc.apiPrefix,
-				tc.skipIfExists,
-			)
-
-			if tc.expected != actual {
-				t.Fatalf("unexpected output; want: %v, got: %v", tc.expected, actual)
-			}
-		})
-	}
-}
-
-// TestWalkSecretsTree tests the walkSecretsTree helper function
-func TestWalkSecretsTree(t *testing.T) {
-	// test setup
-	client, closer := testVaultServer(t)
-	defer closer()
-
-	// enable kv-v1 backend
-	if err := client.Sys().Mount("kv-v1/", &api.MountInput{
-		Type: "kv-v1",
-	}); err != nil {
-		t.Fatal(err)
-	}
-	time.Sleep(time.Second)
-
-	// enable kv-v2 backend
-	if err := client.Sys().Mount("kv-v2/", &api.MountInput{
-		Type: "kv-v2",
-	}); err != nil {
-		t.Fatal(err)
-	}
-	time.Sleep(time.Second)
-
-	ctx, cancelContextFunc := context.WithTimeout(context.Background(), 5*time.Second)
-	defer cancelContextFunc()
-
-	// populate secrets
-	for _, path := range []string{
-		"foo",
-		"app-1/foo",
-		"app-1/bar",
-		"app-1/nested/x/y/z",
-		"app-1/nested/x/y",
-		"app-1/nested/bar",
-	} {
-		if err := client.KVv1("kv-v1").Put(ctx, path, map[string]interface{}{
-			"password": "Hashi123",
-		}); err != nil {
-			t.Fatal(err)
-		}
-
-		if _, err := client.KVv2("kv-v2").Put(ctx, path, map[string]interface{}{
-			"password": "Hashi123",
-		}); err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	type treePath struct {
-		path      string
-		directory bool
-	}
-
-	cases := map[string]struct {
-		path          string
-		expected      []treePath
-		expectedError bool
-	}{
-		"kv-v1-simple": {
-			path: "kv-v1/app-1/nested/x/y",
-			expected: []treePath{
-				{path: "kv-v1/app-1/nested/x/y/z", directory: false},
-			},
-			expectedError: false,
-		},
-
-		"kv-v2-simple": {
-			path: "kv-v2/metadata/app-1/nested/x/y",
-			expected: []treePath{
-				{path: "kv-v2/metadata/app-1/nested/x/y/z", directory: false},
-			},
-			expectedError: false,
-		},
-
-		"kv-v1-nested": {
-			path: "kv-v1/app-1/nested/",
-			expected: []treePath{
-				{path: "kv-v1/app-1/nested/bar", directory: false},
-				{path: "kv-v1/app-1/nested/x", directory: true},
-				{path: "kv-v1/app-1/nested/x/y", directory: false},
-				{path: "kv-v1/app-1/nested/x/y", directory: true},
-				{path: "kv-v1/app-1/nested/x/y/z", directory: false},
-			},
-			expectedError: false,
-		},
-
-		"kv-v2-nested": {
-			path: "kv-v2/metadata/app-1/nested/",
-			expected: []treePath{
-				{path: "kv-v2/metadata/app-1/nested/bar", directory: false},
-				{path: "kv-v2/metadata/app-1/nested/x", directory: true},
-				{path: "kv-v2/metadata/app-1/nested/x/y", directory: false},
-				{path: "kv-v2/metadata/app-1/nested/x/y", directory: true},
-				{path: "kv-v2/metadata/app-1/nested/x/y/z", directory: false},
-			},
-			expectedError: false,
-		},
-
-		"kv-v1-all": {
-			path: "kv-v1",
-			expected: []treePath{
-				{path: "kv-v1/app-1", directory: true},
-				{path: "kv-v1/app-1/bar", directory: false},
-				{path: "kv-v1/app-1/foo", directory: false},
-				{path: "kv-v1/app-1/nested", directory: true},
-				{path: "kv-v1/app-1/nested/bar", directory: false},
-				{path: "kv-v1/app-1/nested/x", directory: true},
-				{path: "kv-v1/app-1/nested/x/y", directory: false},
-				{path: "kv-v1/app-1/nested/x/y", directory: true},
-				{path: "kv-v1/app-1/nested/x/y/z", directory: false},
-				{path: "kv-v1/foo", directory: false},
-			},
-			expectedError: false,
-		},
-
-		"kv-v2-all": {
-			path: "kv-v2/metadata",
-			expected: []treePath{
-				{path: "kv-v2/metadata/app-1", directory: true},
-				{path: "kv-v2/metadata/app-1/bar", directory: false},
-				{path: "kv-v2/metadata/app-1/foo", directory: false},
-				{path: "kv-v2/metadata/app-1/nested", directory: true},
-				{path: "kv-v2/metadata/app-1/nested/bar", directory: false},
-				{path: "kv-v2/metadata/app-1/nested/x", directory: true},
-				{path: "kv-v2/metadata/app-1/nested/x/y", directory: false},
-				{path: "kv-v2/metadata/app-1/nested/x/y", directory: true},
-				{path: "kv-v2/metadata/app-1/nested/x/y/z", directory: false},
-				{path: "kv-v2/metadata/foo", directory: false},
-			},
-			expectedError: false,
-		},
-
-		"kv-v1-not-found": {
-			path:          "kv-v1/does/not/exist",
-			expected:      nil,
-			expectedError: true,
-		},
-
-		"kv-v2-not-found": {
-			path:          "kv-v2/metadata/does/not/exist",
-			expected:      nil,
-			expectedError: true,
-		},
-
-		"kv-v1-not-listable-leaf-node": {
-			path:          "kv-v1/foo",
-			expected:      nil,
-			expectedError: true,
-		},
-
-		"kv-v2-not-listable-leaf-node": {
-			path:          "kv-v2/metadata/foo",
-			expected:      nil,
-			expectedError: true,
-		},
-	}
-
-	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			var descendants []treePath
-
-			err := walkSecretsTree(ctx, client, tc.path, func(path string, directory bool) error {
-				descendants = append(descendants, treePath{
-					path:      path,
-					directory: directory,
-				})
-				return nil
-			})
-
-			if tc.expectedError {
-				if err == nil {
-					t.Fatal("an error was expected but the test succeeded")
-				}
-			} else {
-				if err != nil {
-					t.Fatal(err)
-				}
-
-				if !reflect.DeepEqual(tc.expected, descendants) {
-					t.Fatalf("unexpected list output; want: %v, got: %v", tc.expected, descendants)
-				}
-			}
-		})
-	}
-}
diff --git a/command/kv_list.go b/command/kv_list.go
index 25ad4d2a7058b..b6b665c6f55ed 100644
--- a/command/kv_list.go
+++ b/command/kv_list.go
@@ -1,11 +1,7 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
 	"fmt"
-	"path"
 	"strings"
 
 	"github.com/mitchellh/cli"
@@ -19,7 +15,6 @@ var (
 
 type KVListCommand struct {
 	*BaseCommand
-	flagMount string
 }
 
 func (c *KVListCommand) Synopsis() string {
@@ -45,23 +40,7 @@ Usage: vault kv list [options] PATH
 }
 
 func (c *KVListCommand) Flags() *FlagSets {
-	set := c.flagSet(FlagSetHTTP | FlagSetOutputFormat)
-
-	// Common Options
-	f := set.NewFlagSet("Common Options")
-
-	f.StringVar(&StringVar{
-		Name:    "mount",
-		Target:  &c.flagMount,
-		Default: "", // no default, because the handling of the next arg is determined by whether this flag has a value
-		Usage: `Specifies the path where the KV backend is mounted. If specified, 
-		the next argument will be interpreted as the secret path. If this flag is 
-		not specified, the next argument will be interpreted as the combined mount 
-		path and secret path, with /data/ automatically appended between KV 
-		v2 secrets.`,
-	})
-
-	return set
+	return c.flagSet(FlagSetHTTP | FlagSetOutputFormat)
 }
 
 func (c *KVListCommand) AutocompleteArgs() complete.Predictor {
@@ -83,11 +62,8 @@ func (c *KVListCommand) Run(args []string) int {
 	args = f.Args()
 	switch {
 	case len(args) < 1:
-		if c.flagMount == "" {
-			c.UI.Error(fmt.Sprintf("Not enough arguments (expected 1, got %d)", len(args)))
-			return 1
-		}
-		args = []string{""}
+		c.UI.Error(fmt.Sprintf("Not enough arguments (expected 1, got %d)", len(args)))
+		return 1
 	case len(args) > 1:
 		c.UI.Error(fmt.Sprintf("Too many arguments (expected 1, got %d)", len(args)))
 		return 1
@@ -99,56 +75,31 @@ func (c *KVListCommand) Run(args []string) int {
 		return 2
 	}
 
-	// If true, we're working with "-mount=secret foo" syntax.
-	// If false, we're using "secret/foo" syntax.
-	mountFlagSyntax := c.flagMount != ""
-
-	var (
-		mountPath   string
-		partialPath string
-		v2          bool
-	)
-
-	// Parse the paths and grab the KV version
-	if mountFlagSyntax {
-		// In this case, this arg is the secret path (e.g. "foo").
-		partialPath = sanitizePath(args[0])
-		mountPath, v2, err = isKVv2(sanitizePath(c.flagMount), client)
-		if err != nil {
-			c.UI.Error(err.Error())
-			return 2
-		}
+	// Append trailing slash
+	path := args[0]
+	if !strings.HasSuffix(path, "/") {
+		path += "/"
+	}
 
-		if v2 {
-			partialPath = path.Join(mountPath, partialPath)
-		}
-	} else {
-		// In this case, this arg is a path-like combination of mountPath/secretPath.
-		// (e.g. "secret/foo")
-		partialPath = sanitizePath(args[0])
-		mountPath, v2, err = isKVv2(partialPath, client)
-		if err != nil {
-			c.UI.Error(err.Error())
-			return 2
-		}
+	// Sanitize path
+	path = sanitizePath(path)
+	mountPath, v2, err := isKVv2(path, client)
+	if err != nil {
+		c.UI.Error(err.Error())
+		return 2
 	}
 
-	// Add /metadata to v2 paths only
-	var fullPath string
 	if v2 {
-		fullPath = addPrefixToKVPath(partialPath, mountPath, "metadata", false)
-	} else {
-		// v1
-		if mountFlagSyntax {
-			fullPath = path.Join(mountPath, partialPath)
-		} else {
-			fullPath = partialPath
+		path = addPrefixToKVPath(path, mountPath, "metadata")
+		if err != nil {
+			c.UI.Error(err.Error())
+			return 2
 		}
 	}
 
-	secret, err := client.Logical().List(fullPath)
+	secret, err := client.Logical().List(path)
 	if err != nil {
-		c.UI.Error(fmt.Sprintf("Error listing %s: %s", fullPath, err))
+		c.UI.Error(fmt.Sprintf("Error listing %s: %s", path, err))
 		return 2
 	}
 
@@ -166,12 +117,12 @@ func (c *KVListCommand) Run(args []string) int {
 	}
 
 	if secret == nil || secret.Data == nil {
-		c.UI.Error(fmt.Sprintf("No value found at %s", fullPath))
+		c.UI.Error(fmt.Sprintf("No value found at %s", path))
 		return 2
 	}
 
 	if !ok {
-		c.UI.Error(fmt.Sprintf("No entries found at %s", fullPath))
+		c.UI.Error(fmt.Sprintf("No entries found at %s", path))
 		return 2
 	}
 
diff --git a/command/kv_metadata.go b/command/kv_metadata.go
index 4350311aff326..c4ab37910555a 100644
--- a/command/kv_metadata.go
+++ b/command/kv_metadata.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/kv_metadata_delete.go b/command/kv_metadata_delete.go
index 6217506f23b07..cff16f21c6fe2 100644
--- a/command/kv_metadata_delete.go
+++ b/command/kv_metadata_delete.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -138,7 +135,7 @@ func (c *KVMetadataDeleteCommand) Run(args []string) int {
 		return 1
 	}
 
-	fullPath := addPrefixToKVPath(partialPath, mountPath, "metadata", false)
+	fullPath := addPrefixToKVPath(partialPath, mountPath, "metadata")
 	if secret, err := client.Logical().Delete(fullPath); err != nil {
 		c.UI.Error(fmt.Sprintf("Error deleting %s: %s", fullPath, err))
 		if secret != nil {
diff --git a/command/kv_metadata_get.go b/command/kv_metadata_get.go
index 8d17210741f94..8920340752d5a 100644
--- a/command/kv_metadata_get.go
+++ b/command/kv_metadata_get.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -140,7 +137,7 @@ func (c *KVMetadataGetCommand) Run(args []string) int {
 		return 1
 	}
 
-	fullPath := addPrefixToKVPath(partialPath, mountPath, "metadata", false)
+	fullPath := addPrefixToKVPath(partialPath, mountPath, "metadata")
 	secret, err := client.Logical().Read(fullPath)
 	if err != nil {
 		c.UI.Error(fmt.Sprintf("Error reading %s: %s", fullPath, err))
diff --git a/command/kv_metadata_patch.go b/command/kv_metadata_patch.go
index 60d1a3e8b20fe..3a51d8db12154 100644
--- a/command/kv_metadata_patch.go
+++ b/command/kv_metadata_patch.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -23,13 +20,12 @@ var (
 type KVMetadataPatchCommand struct {
 	*BaseCommand
 
-	flagMaxVersions          int
-	flagCASRequired          BoolPtr
-	flagDeleteVersionAfter   time.Duration
-	flagCustomMetadata       map[string]string
-	flagRemoveCustomMetadata []string
-	flagMount                string
-	testStdin                io.Reader // for tests
+	flagMaxVersions        int
+	flagCASRequired        BoolPtr
+	flagDeleteVersionAfter time.Duration
+	flagCustomMetadata     map[string]string
+	flagMount              string
+	testStdin              io.Reader // for tests
 }
 
 func (c *KVMetadataPatchCommand) Synopsis() string {
@@ -38,7 +34,7 @@ func (c *KVMetadataPatchCommand) Synopsis() string {
 
 func (c *KVMetadataPatchCommand) Help() string {
 	helpText := `
-Usage: vault kv metadata patch [options] KEY
+Usage: vault metadata kv patch [options] KEY
 
   This command can be used to create a blank key in the key-value store or to
   update key configuration for a specified key.
@@ -69,10 +65,6 @@ Usage: vault kv metadata patch [options] KEY
 
       $ vault kv metadata patch -mount=secret -custom-metadata=foo=abc -custom-metadata=bar=123 foo
 
-  To remove custom meta data from the corresponding path in the key-value store, kv metadata patch can be used.
-
-      $ vault kv metadata patch -mount=secret -remove-custom-metadata=bar foo
-
   Additional flags and more advanced use cases are detailed below.
 
 ` + c.Flags().Help()
@@ -119,13 +111,6 @@ func (c *KVMetadataPatchCommand) Flags() *FlagSets {
 		This can be specified multiple times to add multiple pieces of metadata.`,
 	})
 
-	f.StringSliceVar(&StringSliceVar{
-		Name:    "remove-custom-metadata",
-		Target:  &c.flagRemoveCustomMetadata,
-		Default: []string{},
-		Usage:   "Key to remove from custom metadata. To specify multiple values, specify this flag multiple times.",
-	})
-
 	f.StringVar(&StringVar{
 		Name:    "mount",
 		Target:  &c.flagMount,
@@ -211,9 +196,9 @@ func (c *KVMetadataPatchCommand) Run(args []string) int {
 		return 1
 	}
 
-	fullPath := addPrefixToKVPath(partialPath, mountPath, "metadata", false)
+	fullPath := addPrefixToKVPath(partialPath, mountPath, "metadata")
 
-	data := make(map[string]interface{}, 0)
+	data := map[string]interface{}{}
 
 	if c.flagMaxVersions >= 0 {
 		data["max_versions"] = c.flagMaxVersions
@@ -227,19 +212,10 @@ func (c *KVMetadataPatchCommand) Run(args []string) int {
 		data["delete_version_after"] = c.flagDeleteVersionAfter.String()
 	}
 
-	customMetadata := make(map[string]interface{})
-
-	for key, value := range c.flagCustomMetadata {
-		customMetadata[key] = value
-	}
-
-	for _, key := range c.flagRemoveCustomMetadata {
-		// A null in a JSON merge patch payload will remove the associated key
-		customMetadata[key] = nil
+	if len(c.flagCustomMetadata) > 0 {
+		data["custom_metadata"] = c.flagCustomMetadata
 	}
 
-	data["custom_metadata"] = customMetadata
-
 	secret, err := client.Logical().JSONMergePatch(context.Background(), fullPath, data)
 	if err != nil {
 		c.UI.Error(fmt.Sprintf("Error writing data to %s: %s", fullPath, err))
diff --git a/command/kv_metadata_patch_test.go b/command/kv_metadata_patch_test.go
index 58f4f91523321..40b74dc8d9ee5 100644
--- a/command/kv_metadata_patch_test.go
+++ b/command/kv_metadata_patch_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -125,29 +122,6 @@ func TestKvMetadataPatchCommand_Flags(t *testing.T) {
 				},
 			},
 		},
-		{
-			"remove-custom_metadata",
-			[]string{"-custom-metadata=baz=ghi", "-remove-custom-metadata=foo"},
-			"Success!",
-			0,
-			map[string]interface{}{
-				"custom_metadata": map[string]interface{}{
-					"bar": "def",
-					"baz": "ghi",
-				},
-			},
-		},
-		{
-			"remove-custom_metadata-multiple",
-			[]string{"-custom-metadata=baz=ghi", "-remove-custom-metadata=foo", "-remove-custom-metadata=bar"},
-			"Success!",
-			0,
-			map[string]interface{}{
-				"custom_metadata": map[string]interface{}{
-					"baz": "ghi",
-				},
-			},
-		},
 		{
 			"delete_version_after_success",
 			[]string{"-delete-version-after=5s"},
diff --git a/command/kv_metadata_put.go b/command/kv_metadata_put.go
index 9ec43e0baec18..7494204f436b8 100644
--- a/command/kv_metadata_put.go
+++ b/command/kv_metadata_put.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -36,7 +33,7 @@ func (c *KVMetadataPutCommand) Synopsis() string {
 
 func (c *KVMetadataPutCommand) Help() string {
 	helpText := `
-Usage: vault kv metadata put [options] KEY
+Usage: vault metadata kv put [options] KEY
 
   This command can be used to create a blank key in the key-value store or to
   update key configuration for a specified key.
@@ -199,7 +196,7 @@ func (c *KVMetadataPutCommand) Run(args []string) int {
 		return 1
 	}
 
-	fullPath := addPrefixToKVPath(partialPath, mountPath, "metadata", false)
+	fullPath := addPrefixToKVPath(partialPath, mountPath, "metadata")
 	data := map[string]interface{}{}
 
 	if c.flagMaxVersions >= 0 {
diff --git a/command/kv_metadata_put_test.go b/command/kv_metadata_put_test.go
index 008ded9fdb8d8..a952802cc4699 100644
--- a/command/kv_metadata_put_test.go
+++ b/command/kv_metadata_put_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/kv_patch.go b/command/kv_patch.go
index 3f5080d4de70a..37fca84510ad9 100644
--- a/command/kv_patch.go
+++ b/command/kv_patch.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -24,11 +21,10 @@ var (
 type KVPatchCommand struct {
 	*BaseCommand
 
-	flagCAS        int
-	flagMethod     string
-	flagMount      string
-	testStdin      io.Reader // for tests
-	flagRemoveData []string
+	flagCAS    int
+	flagMethod string
+	flagMount  string
+	testStdin  io.Reader // for tests
 }
 
 func (c *KVPatchCommand) Synopsis() string {
@@ -80,10 +76,6 @@ Usage: vault kv patch [options] KEY [DATA]
 
       $ vault kv patch -mount=secret -method=rw foo bar=baz
 
-  To remove data from the corresponding path in the key-value store, kv patch can be used.
-
-      $ vault kv patch -mount=secret -remove-data=bar foo
-
   Additional flags and more advanced use cases are detailed below.
 
 ` + c.Flags().Help()
@@ -125,13 +117,6 @@ func (c *KVPatchCommand) Flags() *FlagSets {
 		v2 secrets.`,
 	})
 
-	f.StringSliceVar(&StringSliceVar{
-		Name:    "remove-data",
-		Target:  &c.flagRemoveData,
-		Default: []string{},
-		Usage:   "Key to remove from data. To specify multiple values, specify this flag multiple times.",
-	})
-
 	return set
 }
 
@@ -162,7 +147,7 @@ func (c *KVPatchCommand) Run(args []string) int {
 	case len(args) < 1:
 		c.UI.Error(fmt.Sprintf("Not enough arguments (expected >1, got %d)", len(args)))
 		return 1
-	case len(c.flagRemoveData) == 0 && len(args) == 1:
+	case len(args) == 1:
 		c.UI.Error("Must supply data")
 		return 1
 	}
@@ -220,22 +205,12 @@ func (c *KVPatchCommand) Run(args []string) int {
 		return 2
 	}
 
-	fullPath := addPrefixToKVPath(partialPath, mountPath, "data", false)
+	fullPath := addPrefixToKVPath(partialPath, mountPath, "data")
 	if err != nil {
 		c.UI.Error(err.Error())
 		return 2
 	}
 
-	// collecting data to be removed
-	if newData == nil {
-		newData = make(map[string]interface{})
-	}
-
-	for _, key := range c.flagRemoveData {
-		// A null in a JSON merge patch payload will remove the associated key
-		newData[key] = nil
-	}
-
 	// Check the method and behave accordingly
 	var secret *api.Secret
 	var code int
diff --git a/command/kv_put.go b/command/kv_put.go
index 77c0c6a1129e2..5cc7b6fbc67b8 100644
--- a/command/kv_put.go
+++ b/command/kv_put.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -181,7 +178,7 @@ func (c *KVPutCommand) Run(args []string) int {
 	// Add /data to v2 paths only
 	var fullPath string
 	if v2 {
-		fullPath = addPrefixToKVPath(partialPath, mountPath, "data", false)
+		fullPath = addPrefixToKVPath(partialPath, mountPath, "data")
 		data = map[string]interface{}{
 			"data":    data,
 			"options": map[string]interface{}{},
diff --git a/command/kv_rollback.go b/command/kv_rollback.go
index c54d7bc2f6352..0d782619a8320 100644
--- a/command/kv_rollback.go
+++ b/command/kv_rollback.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -164,7 +161,7 @@ func (c *KVRollbackCommand) Run(args []string) int {
 		return 2
 	}
 
-	fullPath := addPrefixToKVPath(partialPath, mountPath, "data", false)
+	fullPath := addPrefixToKVPath(partialPath, mountPath, "data")
 	if err != nil {
 		c.UI.Error(err.Error())
 		return 2
diff --git a/command/kv_test.go b/command/kv_test.go
index 6564208ed3353..162113b8b5a95 100644
--- a/command/kv_test.go
+++ b/command/kv_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -593,131 +590,6 @@ func TestKVGetCommand(t *testing.T) {
 	})
 }
 
-func testKVListCommand(tb testing.TB) (*cli.MockUi, *KVListCommand) {
-	tb.Helper()
-	ui := cli.NewMockUi()
-	cmd := &KVListCommand{
-		BaseCommand: &BaseCommand{
-			UI: ui,
-		},
-	}
-
-	return ui, cmd
-}
-
-// TestKVListCommand runs tests for `vault kv list`
-func TestKVListCommand(t *testing.T) {
-	testCases := []struct {
-		name       string
-		args       []string
-		outStrings []string
-		code       int
-	}{
-		{
-			name:       "default",
-			args:       []string{"kv/my-prefix"},
-			outStrings: []string{"secret-0", "secret-1", "secret-2"},
-			code:       0,
-		},
-		{
-			name:       "not_enough_args",
-			args:       []string{},
-			outStrings: []string{"Not enough arguments"},
-			code:       1,
-		},
-		{
-			name:       "v2_default_with_mount",
-			args:       []string{"-mount", "kv", "my-prefix"},
-			outStrings: []string{"secret-0", "secret-1", "secret-2"},
-			code:       0,
-		},
-		{
-			name:       "v1_default_with_mount",
-			args:       []string{"kv/my-prefix"},
-			outStrings: []string{"secret-0", "secret-1", "secret-2"},
-			code:       0,
-		},
-		{
-			name:       "v2_not_found",
-			args:       []string{"kv/nope/not/once/never"},
-			outStrings: []string{"No value found at kv/metadata/nope/not/once/never"},
-			code:       2,
-		},
-		{
-			name:       "v1_mount_only",
-			args:       []string{"kv"},
-			outStrings: []string{"my-prefix"},
-			code:       0,
-		},
-		{
-			name:       "v2_mount_only",
-			args:       []string{"-mount", "kv"},
-			outStrings: []string{"my-prefix"},
-			code:       0,
-		},
-		{
-			// this is behavior that should be tested
-			// `kv` here is an explicit mount
-			// `my-prefix` is not
-			// the current kv code will ignore `my-prefix`
-			name:       "ignore_multi_part_mounts",
-			args:       []string{"-mount", "kv/my-prefix"},
-			outStrings: []string{"my-prefix"},
-			code:       0,
-		},
-	}
-
-	t.Run("validations", func(t *testing.T) {
-		t.Parallel()
-
-		for _, testCase := range testCases {
-			testCase := testCase
-
-			t.Run(testCase.name, func(t *testing.T) {
-				t.Parallel()
-
-				// test setup
-				client, closer := testVaultServer(t)
-				defer closer()
-
-				// enable kv-v2 backend
-				if err := client.Sys().Mount("kv/", &api.MountInput{
-					Type: "kv-v2",
-				}); err != nil {
-					t.Fatal(err)
-				}
-				time.Sleep(time.Second)
-
-				ctx := context.Background()
-				for i := 0; i < 3; i++ {
-					path := fmt.Sprintf("my-prefix/secret-%d", i)
-					_, err := client.KVv2("kv/").Put(ctx, path, map[string]interface{}{
-						"foo": "bar",
-					})
-					if err != nil {
-						t.Fatal(err)
-					}
-				}
-
-				ui, cmd := testKVListCommand(t)
-				cmd.client = client
-
-				code := cmd.Run(testCase.args)
-				if code != testCase.code {
-					t.Errorf("expected %d to be %d", code, testCase.code)
-				}
-
-				combined := ui.OutputWriter.String() + ui.ErrorWriter.String()
-				for _, str := range testCase.outStrings {
-					if !strings.Contains(combined, str) {
-						t.Errorf("expected %q to contain %q", combined, str)
-					}
-				}
-			})
-		}
-	})
-}
-
 func testKVMetadataGetCommand(tb testing.TB) (*cli.MockUi, *KVMetadataGetCommand) {
 	tb.Helper()
 
@@ -898,7 +770,6 @@ func TestKVPatchCommand_ArgValidation(t *testing.T) {
 	}
 
 	for _, tc := range cases {
-		tc := tc // capture range variable
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 
diff --git a/command/kv_undelete.go b/command/kv_undelete.go
index 25de58835f0bd..90ea608a73165 100644
--- a/command/kv_undelete.go
+++ b/command/kv_undelete.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -150,7 +147,7 @@ func (c *KVUndeleteCommand) Run(args []string) int {
 		return 1
 	}
 
-	undeletePath := addPrefixToKVPath(partialPath, mountPath, "undelete", false)
+	undeletePath := addPrefixToKVPath(partialPath, mountPath, "undelete")
 	data := map[string]interface{}{
 		"versions": kvParseVersionsFlags(c.flagVersions),
 	}
diff --git a/command/lease.go b/command/lease.go
index 29ef79fc2d8cd..76f6cc174c41b 100644
--- a/command/lease.go
+++ b/command/lease.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/lease_lookup.go b/command/lease_lookup.go
index ef53ce5286353..c72c6a174f2ce 100644
--- a/command/lease_lookup.go
+++ b/command/lease_lookup.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/lease_lookup_test.go b/command/lease_lookup_test.go
index 536c29c58eeeb..4de63200f5ce7 100644
--- a/command/lease_lookup_test.go
+++ b/command/lease_lookup_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/lease_renew.go b/command/lease_renew.go
index aad41d66b7952..13eb95ed00934 100644
--- a/command/lease_renew.go
+++ b/command/lease_renew.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/lease_renew_test.go b/command/lease_renew_test.go
index c24b812b911ac..aa3b32d0d8b34 100644
--- a/command/lease_renew_test.go
+++ b/command/lease_renew_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/lease_revoke.go b/command/lease_revoke.go
index 5efd5ecf198b5..1fc90eff7cb50 100644
--- a/command/lease_revoke.go
+++ b/command/lease_revoke.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/lease_revoke_test.go b/command/lease_revoke_test.go
index 261041e2331a8..1aa58c38ac765 100644
--- a/command/lease_revoke_test.go
+++ b/command/lease_revoke_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/list.go b/command/list.go
index 028f0d391c6c0..9831b6633c8c2 100644
--- a/command/list.go
+++ b/command/list.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -81,7 +78,13 @@ func (c *ListCommand) Run(args []string) int {
 		return 2
 	}
 
-	path := sanitizePath(args[0])
+	// Append trailing slash
+	path := args[0]
+	if !strings.HasSuffix(path, "/") {
+		path += "/"
+	}
+
+	path = sanitizePath(path)
 	secret, err := client.Logical().List(path)
 	if err != nil {
 		c.UI.Error(fmt.Sprintf("Error listing %s: %s", path, err))
diff --git a/command/list_test.go b/command/list_test.go
index 070184bd91b4a..b1b6680507f16 100644
--- a/command/list_test.go
+++ b/command/list_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/log_flags.go b/command/log_flags.go
deleted file mode 100644
index 5213d06377ef7..0000000000000
--- a/command/log_flags.go
+++ /dev/null
@@ -1,178 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package command
-
-import (
-	"flag"
-	"os"
-	"strconv"
-
-	"github.com/hashicorp/vault/internalshared/configutil"
-	"github.com/posener/complete"
-)
-
-// logFlags are the 'log' related flags that can be shared across commands.
-type logFlags struct {
-	flagCombineLogs       bool
-	flagLogLevel          string
-	flagLogFormat         string
-	flagLogFile           string
-	flagLogRotateBytes    int
-	flagLogRotateDuration string
-	flagLogRotateMaxFiles int
-}
-
-// valuesProvider has the intention of providing a way to supply a func with a
-// way to retrieve values for flags and environment variables without having to
-// directly call a specific implementation.
-// The reasoning for its existence is to facilitate testing.
-type valuesProvider struct {
-	flagProvider   func(string) (flag.Value, bool)
-	envVarProvider func(string) (string, bool)
-}
-
-// addLogFlags will add the set of 'log' related flags to a flag set.
-func (f *FlagSet) addLogFlags(l *logFlags) {
-	f.BoolVar(&BoolVar{
-		Name:    flagNameCombineLogs,
-		Target:  &l.flagCombineLogs,
-		Default: false,
-		Hidden:  true,
-	})
-
-	f.StringVar(&StringVar{
-		Name:       flagNameLogLevel,
-		Target:     &l.flagLogLevel,
-		Default:    notSetValue,
-		EnvVar:     EnvVaultLogLevel,
-		Completion: complete.PredictSet("trace", "debug", "info", "warn", "error"),
-		Usage: "Log verbosity level. Supported values (in order of detail) are " +
-			"\"trace\", \"debug\", \"info\", \"warn\", and \"error\".",
-	})
-
-	f.StringVar(&StringVar{
-		Name:       flagNameLogFormat,
-		Target:     &l.flagLogFormat,
-		Default:    notSetValue,
-		EnvVar:     EnvVaultLogFormat,
-		Completion: complete.PredictSet("standard", "json"),
-		Usage:      `Log format. Supported values are "standard" and "json".`,
-	})
-
-	f.StringVar(&StringVar{
-		Name:   flagNameLogFile,
-		Target: &l.flagLogFile,
-		Usage:  "Path to the log file that Vault should use for logging",
-	})
-
-	f.IntVar(&IntVar{
-		Name:   flagNameLogRotateBytes,
-		Target: &l.flagLogRotateBytes,
-		Usage: "Number of bytes that should be written to a log before it needs to be rotated. " +
-			"Unless specified, there is no limit to the number of bytes that can be written to a log file",
-	})
-
-	f.StringVar(&StringVar{
-		Name:   flagNameLogRotateDuration,
-		Target: &l.flagLogRotateDuration,
-		Usage: "The maximum duration a log should be written to before it needs to be rotated. " +
-			"Must be a duration value such as 30s",
-	})
-
-	f.IntVar(&IntVar{
-		Name:   flagNameLogRotateMaxFiles,
-		Target: &l.flagLogRotateMaxFiles,
-		Usage:  "The maximum number of older log file archives to keep",
-	})
-}
-
-// envVarValue attempts to get a named value from the environment variables.
-// The value will be returned as a string along with a boolean value indiciating
-// to the caller whether the named env var existed.
-func envVarValue(key string) (string, bool) {
-	if key == "" {
-		return "", false
-	}
-	return os.LookupEnv(key)
-}
-
-// flagValue attempts to find the named flag in a set of FlagSets.
-// The flag.Value is returned if it was specified, and the boolean value indicates
-// to the caller if the flag was specified by the end user.
-func (f *FlagSets) flagValue(flagName string) (flag.Value, bool) {
-	var result flag.Value
-	var isFlagSpecified bool
-
-	if f != nil {
-		f.Visit(func(fl *flag.Flag) {
-			if fl.Name == flagName {
-				result = fl.Value
-				isFlagSpecified = true
-			}
-		})
-	}
-
-	return result, isFlagSpecified
-}
-
-// overrideValue uses the provided keys to check CLI flags and environment
-// variables for values that may be used to override any specified configuration.
-func (p *valuesProvider) overrideValue(flagKey, envVarKey string) (string, bool) {
-	var result string
-	found := true
-
-	flg, flgFound := p.flagProvider(flagKey)
-	env, envFound := p.envVarProvider(envVarKey)
-
-	switch {
-	case flgFound:
-		result = flg.String()
-	case envFound:
-		result = env
-	default:
-		found = false
-	}
-
-	return result, found
-}
-
-// applyLogConfigOverrides will accept a shared config and specifically attempt to update the 'log' related config keys.
-// For each 'log' key, we aggregate file config, env vars and CLI flags to select the one with the highest precedence.
-// This method mutates the config object passed into it.
-func (f *FlagSets) applyLogConfigOverrides(config *configutil.SharedConfig) {
-	p := &valuesProvider{
-		flagProvider:   f.flagValue,
-		envVarProvider: envVarValue,
-	}
-
-	// Update log level
-	if val, found := p.overrideValue(flagNameLogLevel, EnvVaultLogLevel); found {
-		config.LogLevel = val
-	}
-
-	// Update log format
-	if val, found := p.overrideValue(flagNameLogFormat, EnvVaultLogFormat); found {
-		config.LogFormat = val
-	}
-
-	// Update log file name
-	if val, found := p.overrideValue(flagNameLogFile, ""); found {
-		config.LogFile = val
-	}
-
-	// Update log rotation duration
-	if val, found := p.overrideValue(flagNameLogRotateDuration, ""); found {
-		config.LogRotateDuration = val
-	}
-
-	// Update log max files
-	if val, found := p.overrideValue(flagNameLogRotateMaxFiles, ""); found {
-		config.LogRotateMaxFiles, _ = strconv.Atoi(val)
-	}
-
-	// Update log rotation max bytes
-	if val, found := p.overrideValue(flagNameLogRotateBytes, ""); found {
-		config.LogRotateBytes, _ = strconv.Atoi(val)
-	}
-}
diff --git a/command/log_flags_test.go b/command/log_flags_test.go
deleted file mode 100644
index 38bfa52e95a39..0000000000000
--- a/command/log_flags_test.go
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package command
-
-import (
-	"flag"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestLogFlags_ValuesProvider(t *testing.T) {
-	cases := map[string]struct {
-		flagKey   string
-		envVarKey string
-		wantValue string
-		wantFound bool
-	}{
-		"flag-missing": {
-			flagKey:   "invalid",
-			envVarKey: "valid-env-var",
-			wantValue: "envVarValue",
-			wantFound: true,
-		},
-		"envVar-missing": {
-			flagKey:   "valid-flag",
-			envVarKey: "invalid",
-			wantValue: "flagValue",
-			wantFound: true,
-		},
-		"all-present": {
-			flagKey:   "valid-flag",
-			envVarKey: "valid-env-var",
-			wantValue: "flagValue",
-			wantFound: true,
-		},
-		"all-missing": {
-			flagKey:   "invalid",
-			envVarKey: "invalid",
-			wantValue: "",
-			wantFound: false,
-		},
-	}
-
-	// Sneaky little fake providers
-	flagFaker := func(key string) (flag.Value, bool) {
-		var result fakeFlag
-		var found bool
-
-		if key == "valid-flag" {
-			result.Set("flagValue")
-			found = true
-		}
-
-		return &result, found
-	}
-
-	envFaker := func(key string) (string, bool) {
-		var found bool
-		var result string
-
-		if key == "valid-env-var" {
-			result = "envVarValue"
-			found = true
-		}
-
-		return result, found
-	}
-
-	vp := valuesProvider{
-		flagProvider:   flagFaker,
-		envVarProvider: envFaker,
-	}
-
-	for name, tc := range cases {
-		val, found := vp.overrideValue(tc.flagKey, tc.envVarKey)
-		assert.Equal(t, tc.wantFound, found, name)
-		assert.Equal(t, tc.wantValue, val, name)
-	}
-}
-
-type fakeFlag struct {
-	value string
-}
-
-func (v *fakeFlag) String() string {
-	return v.value
-}
-
-func (v *fakeFlag) Set(raw string) error {
-	v.value = raw
-	return nil
-}
diff --git a/command/login.go b/command/login.go
index c8bc23254c29a..30352abbb4e59 100644
--- a/command/login.go
+++ b/command/login.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/login_test.go b/command/login_test.go
index 3d41d8e881470..56ed790f3427f 100644
--- a/command/login_test.go
+++ b/command/login_test.go
@@ -1,14 +1,8 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
-	"context"
-	"regexp"
 	"strings"
 	"testing"
-	"time"
 
 	"github.com/mitchellh/cli"
 
@@ -43,445 +37,414 @@ func testLoginCommand(tb testing.TB) (*cli.MockUi, *LoginCommand) {
 	}
 }
 
-func TestCustomPath(t *testing.T) {
+func TestLoginCommand_Run(t *testing.T) {
 	t.Parallel()
 
-	client, closer := testVaultServer(t)
-	defer closer()
+	t.Run("custom_path", func(t *testing.T) {
+		t.Parallel()
 
-	if err := client.Sys().EnableAuth("my-auth", "userpass", ""); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := client.Logical().Write("auth/my-auth/users/test", map[string]interface{}{
-		"password": "test",
-		"policies": "default",
-	}); err != nil {
-		t.Fatal(err)
-	}
+		client, closer := testVaultServer(t)
+		defer closer()
 
-	ui, cmd := testLoginCommand(t)
-	cmd.client = client
-
-	tokenHelper, err := cmd.TokenHelper()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Emulate an unknown token format present in ~/.vault-token, for example
-	client.SetToken("a.a")
+		if err := client.Sys().EnableAuth("my-auth", "userpass", ""); err != nil {
+			t.Fatal(err)
+		}
+		if _, err := client.Logical().Write("auth/my-auth/users/test", map[string]interface{}{
+			"password": "test",
+			"policies": "default",
+		}); err != nil {
+			t.Fatal(err)
+		}
 
-	code := cmd.Run([]string{
-		"-method", "userpass",
-		"-path", "my-auth",
-		"username=test",
-		"password=test",
-	})
-	if exp := 0; code != exp {
-		t.Errorf("expected %d to be %d", code, exp)
-	}
+		ui, cmd := testLoginCommand(t)
+		cmd.client = client
 
-	expected := "Success! You are now authenticated."
-	combined := ui.OutputWriter.String() + ui.ErrorWriter.String()
-	if !strings.Contains(combined, expected) {
-		t.Errorf("expected %q to be %q", combined, expected)
-	}
+		tokenHelper, err := cmd.TokenHelper()
+		if err != nil {
+			t.Fatal(err)
+		}
 
-	storedToken, err := tokenHelper.Get()
-	if err != nil {
-		t.Fatal(err)
-	}
+		// Emulate an unknown token format present in ~/.vault-token, for example
+		client.SetToken("a.a")
 
-	if l, exp := len(storedToken), minTokenLengthExternal+vault.TokenPrefixLength; l < exp {
-		t.Errorf("expected token to be %d characters, was %d: %q", exp, l, storedToken)
-	}
-}
+		code := cmd.Run([]string{
+			"-method", "userpass",
+			"-path", "my-auth",
+			"username=test",
+			"password=test",
+		})
+		if exp := 0; code != exp {
+			t.Errorf("expected %d to be %d", code, exp)
+		}
 
-// Do not persist the token to the token helper
-func TestNoStore(t *testing.T) {
-	t.Parallel()
+		expected := "Success! You are now authenticated."
+		combined := ui.OutputWriter.String() + ui.ErrorWriter.String()
+		if !strings.Contains(combined, expected) {
+			t.Errorf("expected %q to be %q", combined, expected)
+		}
 
-	client, closer := testVaultServer(t)
-	defer closer()
+		storedToken, err := tokenHelper.Get()
+		if err != nil {
+			t.Fatal(err)
+		}
 
-	secret, err := client.Auth().Token().Create(&api.TokenCreateRequest{
-		Policies: []string{"default"},
-		TTL:      "30m",
+		if l, exp := len(storedToken), minTokenLengthExternal+vault.TokenPrefixLength; l < exp {
+			t.Errorf("expected token to be %d characters, was %d: %q", exp, l, storedToken)
+		}
 	})
-	if err != nil {
-		t.Fatal(err)
-	}
-	token := secret.Auth.ClientToken
 
-	_, cmd := testLoginCommand(t)
-	cmd.client = client
+	t.Run("no_store", func(t *testing.T) {
+		t.Parallel()
 
-	tokenHelper, err := cmd.TokenHelper()
-	if err != nil {
-		t.Fatal(err)
-	}
+		client, closer := testVaultServer(t)
+		defer closer()
 
-	// Ensure we have no token to start
-	if storedToken, err := tokenHelper.Get(); err != nil || storedToken != "" {
-		t.Errorf("expected token helper to be empty: %s: %q", err, storedToken)
-	}
+		secret, err := client.Auth().Token().Create(&api.TokenCreateRequest{
+			Policies: []string{"default"},
+			TTL:      "30m",
+		})
+		if err != nil {
+			t.Fatal(err)
+		}
+		token := secret.Auth.ClientToken
 
-	code := cmd.Run([]string{
-		"-no-store",
-		token,
-	})
-	if exp := 0; code != exp {
-		t.Errorf("expected %d to be %d", code, exp)
-	}
+		_, cmd := testLoginCommand(t)
+		cmd.client = client
 
-	storedToken, err := tokenHelper.Get()
-	if err != nil {
-		t.Fatal(err)
-	}
+		tokenHelper, err := cmd.TokenHelper()
+		if err != nil {
+			t.Fatal(err)
+		}
 
-	if exp := ""; storedToken != exp {
-		t.Errorf("expected %q to be %q", storedToken, exp)
-	}
-}
+		// Ensure we have no token to start
+		if storedToken, err := tokenHelper.Get(); err != nil || storedToken != "" {
+			t.Errorf("expected token helper to be empty: %s: %q", err, storedToken)
+		}
 
-func TestStores(t *testing.T) {
-	t.Parallel()
+		code := cmd.Run([]string{
+			"-no-store",
+			token,
+		})
+		if exp := 0; code != exp {
+			t.Errorf("expected %d to be %d", code, exp)
+		}
 
-	client, closer := testVaultServer(t)
-	defer closer()
+		storedToken, err := tokenHelper.Get()
+		if err != nil {
+			t.Fatal(err)
+		}
 
-	secret, err := client.Auth().Token().Create(&api.TokenCreateRequest{
-		Policies: []string{"default"},
-		TTL:      "30m",
+		if exp := ""; storedToken != exp {
+			t.Errorf("expected %q to be %q", storedToken, exp)
+		}
 	})
-	if err != nil {
-		t.Fatal(err)
-	}
-	token := secret.Auth.ClientToken
 
-	_, cmd := testLoginCommand(t)
-	cmd.client = client
+	t.Run("stores", func(t *testing.T) {
+		t.Parallel()
 
-	tokenHelper, err := cmd.TokenHelper()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	code := cmd.Run([]string{
-		token,
-	})
-	if exp := 0; code != exp {
-		t.Errorf("expected %d to be %d", code, exp)
-	}
+		client, closer := testVaultServer(t)
+		defer closer()
 
-	storedToken, err := tokenHelper.Get()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if storedToken != token {
-		t.Errorf("expected %q to be %q", storedToken, token)
-	}
-}
-
-func TestTokenOnly(t *testing.T) {
-	t.Parallel()
+		secret, err := client.Auth().Token().Create(&api.TokenCreateRequest{
+			Policies: []string{"default"},
+			TTL:      "30m",
+		})
+		if err != nil {
+			t.Fatal(err)
+		}
+		token := secret.Auth.ClientToken
 
-	client, closer := testVaultServer(t)
-	defer closer()
+		_, cmd := testLoginCommand(t)
+		cmd.client = client
 
-	if err := client.Sys().EnableAuth("userpass", "userpass", ""); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := client.Logical().Write("auth/userpass/users/test", map[string]interface{}{
-		"password": "test",
-		"policies": "default",
-	}); err != nil {
-		t.Fatal(err)
-	}
+		tokenHelper, err := cmd.TokenHelper()
+		if err != nil {
+			t.Fatal(err)
+		}
 
-	ui, cmd := testLoginCommand(t)
-	cmd.client = client
+		code := cmd.Run([]string{
+			token,
+		})
+		if exp := 0; code != exp {
+			t.Errorf("expected %d to be %d", code, exp)
+		}
 
-	tokenHelper, err := cmd.TokenHelper()
-	if err != nil {
-		t.Fatal(err)
-	}
+		storedToken, err := tokenHelper.Get()
+		if err != nil {
+			t.Fatal(err)
+		}
 
-	code := cmd.Run([]string{
-		"-token-only",
-		"-method", "userpass",
-		"username=test",
-		"password=test",
+		if storedToken != token {
+			t.Errorf("expected %q to be %q", storedToken, token)
+		}
 	})
-	if exp := 0; code != exp {
-		t.Errorf("expected %d to be %d", code, exp)
-	}
 
-	// Verify only the token was printed
-	token := ui.OutputWriter.String()
-	if l, exp := len(token), minTokenLengthExternal+vault.TokenPrefixLength; l != exp {
-		t.Errorf("expected token to be %d characters, was %d: %q", exp, l, token)
-	}
+	t.Run("token_only", func(t *testing.T) {
+		t.Parallel()
 
-	// Verify the token was not stored
-	if storedToken, err := tokenHelper.Get(); err != nil || storedToken != "" {
-		t.Fatalf("expected token to not be stored: %s: %q", err, storedToken)
-	}
-}
+		client, closer := testVaultServer(t)
+		defer closer()
 
-func TestFailureNoStore(t *testing.T) {
-	t.Parallel()
+		if err := client.Sys().EnableAuth("userpass", "userpass", ""); err != nil {
+			t.Fatal(err)
+		}
+		if _, err := client.Logical().Write("auth/userpass/users/test", map[string]interface{}{
+			"password": "test",
+			"policies": "default",
+		}); err != nil {
+			t.Fatal(err)
+		}
+
+		ui, cmd := testLoginCommand(t)
+		cmd.client = client
 
-	client, closer := testVaultServer(t)
-	defer closer()
+		tokenHelper, err := cmd.TokenHelper()
+		if err != nil {
+			t.Fatal(err)
+		}
 
-	ui, cmd := testLoginCommand(t)
-	cmd.client = client
+		code := cmd.Run([]string{
+			"-token-only",
+			"-method", "userpass",
+			"username=test",
+			"password=test",
+		})
+		if exp := 0; code != exp {
+			t.Errorf("expected %d to be %d", code, exp)
+		}
 
-	tokenHelper, err := cmd.TokenHelper()
-	if err != nil {
-		t.Fatal(err)
-	}
+		// Verify only the token was printed
+		token := ui.OutputWriter.String()
+		if l, exp := len(token), minTokenLengthExternal+vault.TokenPrefixLength; l != exp {
+			t.Errorf("expected token to be %d characters, was %d: %q", exp, l, token)
+		}
 
-	code := cmd.Run([]string{
-		"not-a-real-token",
+		// Verify the token was not stored
+		if storedToken, err := tokenHelper.Get(); err != nil || storedToken != "" {
+			t.Fatalf("expected token to not be stored: %s: %q", err, storedToken)
+		}
 	})
-	if exp := 2; code != exp {
-		t.Errorf("expected %d to be %d", code, exp)
-	}
 
-	expected := "Error authenticating: "
-	combined := ui.OutputWriter.String() + ui.ErrorWriter.String()
-	if !strings.Contains(combined, expected) {
-		t.Errorf("expected %q to contain %q", combined, expected)
-	}
+	t.Run("failure_no_store", func(t *testing.T) {
+		t.Parallel()
 
-	if storedToken, err := tokenHelper.Get(); err != nil || storedToken != "" {
-		t.Fatalf("expected token to not be stored: %s: %q", err, storedToken)
-	}
-}
-
-func TestWrapAutoUnwrap(t *testing.T) {
-	t.Parallel()
+		client, closer := testVaultServer(t)
+		defer closer()
 
-	client, closer := testVaultServer(t)
-	defer closer()
+		ui, cmd := testLoginCommand(t)
+		cmd.client = client
 
-	if err := client.Sys().EnableAuth("userpass", "userpass", ""); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := client.Logical().Write("auth/userpass/users/test", map[string]interface{}{
-		"password": "test",
-		"policies": "default",
-	}); err != nil {
-		t.Fatal(err)
-	}
+		tokenHelper, err := cmd.TokenHelper()
+		if err != nil {
+			t.Fatal(err)
+		}
 
-	_, cmd := testLoginCommand(t)
-	cmd.client = client
+		code := cmd.Run([]string{
+			"not-a-real-token",
+		})
+		if exp := 2; code != exp {
+			t.Errorf("expected %d to be %d", code, exp)
+		}
 
-	// Set the wrapping ttl to 5s. We can't set this via the flag because we
-	// override the client object before that particular flag is parsed.
-	client.SetWrappingLookupFunc(func(string, string) string { return "5m" })
+		expected := "Error authenticating: "
+		combined := ui.OutputWriter.String() + ui.ErrorWriter.String()
+		if !strings.Contains(combined, expected) {
+			t.Errorf("expected %q to contain %q", combined, expected)
+		}
 
-	code := cmd.Run([]string{
-		"-method", "userpass",
-		"username=test",
-		"password=test",
+		if storedToken, err := tokenHelper.Get(); err != nil || storedToken != "" {
+			t.Fatalf("expected token to not be stored: %s: %q", err, storedToken)
+		}
 	})
-	if exp := 0; code != exp {
-		t.Errorf("expected %d to be %d", code, exp)
-	}
 
-	// Unset the wrapping
-	client.SetWrappingLookupFunc(func(string, string) string { return "" })
+	t.Run("wrap_auto_unwrap", func(t *testing.T) {
+		t.Parallel()
 
-	tokenHelper, err := cmd.TokenHelper()
-	if err != nil {
-		t.Fatal(err)
-	}
-	token, err := tokenHelper.Get()
-	if err != nil || token == "" {
-		t.Fatalf("expected token from helper: %s: %q", err, token)
-	}
-	client.SetToken(token)
+		client, closer := testVaultServer(t)
+		defer closer()
 
-	// Ensure the resulting token is unwrapped
-	secret, err := client.Auth().Token().LookupSelf()
-	if err != nil {
-		t.Error(err)
-	}
-	if secret == nil {
-		t.Fatal("secret was nil")
-	}
+		if err := client.Sys().EnableAuth("userpass", "userpass", ""); err != nil {
+			t.Fatal(err)
+		}
+		if _, err := client.Logical().Write("auth/userpass/users/test", map[string]interface{}{
+			"password": "test",
+			"policies": "default",
+		}); err != nil {
+			t.Fatal(err)
+		}
 
-	if secret.WrapInfo != nil {
-		t.Errorf("expected to be unwrapped: %#v", secret)
-	}
-}
+		_, cmd := testLoginCommand(t)
+		cmd.client = client
 
-func TestWrapTokenOnly(t *testing.T) {
-	t.Parallel()
+		// Set the wrapping ttl to 5s. We can't set this via the flag because we
+		// override the client object before that particular flag is parsed.
+		client.SetWrappingLookupFunc(func(string, string) string { return "5m" })
 
-	client, closer := testVaultServer(t)
-	defer closer()
+		code := cmd.Run([]string{
+			"-method", "userpass",
+			"username=test",
+			"password=test",
+		})
+		if exp := 0; code != exp {
+			t.Errorf("expected %d to be %d", code, exp)
+		}
 
-	if err := client.Sys().EnableAuth("userpass", "userpass", ""); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := client.Logical().Write("auth/userpass/users/test", map[string]interface{}{
-		"password": "test",
-		"policies": "default",
-	}); err != nil {
-		t.Fatal(err)
-	}
+		// Unset the wrapping
+		client.SetWrappingLookupFunc(func(string, string) string { return "" })
 
-	ui, cmd := testLoginCommand(t)
-	cmd.client = client
+		tokenHelper, err := cmd.TokenHelper()
+		if err != nil {
+			t.Fatal(err)
+		}
+		token, err := tokenHelper.Get()
+		if err != nil || token == "" {
+			t.Fatalf("expected token from helper: %s: %q", err, token)
+		}
+		client.SetToken(token)
 
-	// Set the wrapping ttl to 5s. We can't set this via the flag because we
-	// override the client object before that particular flag is parsed.
-	client.SetWrappingLookupFunc(func(string, string) string { return "5m" })
+		// Ensure the resulting token is unwrapped
+		secret, err := client.Auth().Token().LookupSelf()
+		if err != nil {
+			t.Error(err)
+		}
+		if secret == nil {
+			t.Fatal("secret was nil")
+		}
 
-	code := cmd.Run([]string{
-		"-token-only",
-		"-method", "userpass",
-		"username=test",
-		"password=test",
+		if secret.WrapInfo != nil {
+			t.Errorf("expected to be unwrapped: %#v", secret)
+		}
 	})
-	if exp := 0; code != exp {
-		t.Errorf("expected %d to be %d", code, exp)
-	}
 
-	// Unset the wrapping
-	client.SetWrappingLookupFunc(func(string, string) string { return "" })
+	t.Run("wrap_token_only", func(t *testing.T) {
+		t.Parallel()
 
-	tokenHelper, err := cmd.TokenHelper()
-	if err != nil {
-		t.Fatal(err)
-	}
-	storedToken, err := tokenHelper.Get()
-	if err != nil || storedToken != "" {
-		t.Fatalf("expected token to not be stored: %s: %q", err, storedToken)
-	}
+		client, closer := testVaultServer(t)
+		defer closer()
 
-	token := strings.TrimSpace(ui.OutputWriter.String())
-	if token == "" {
-		t.Errorf("expected %q to not be %q", token, "")
-	}
+		if err := client.Sys().EnableAuth("userpass", "userpass", ""); err != nil {
+			t.Fatal(err)
+		}
+		if _, err := client.Logical().Write("auth/userpass/users/test", map[string]interface{}{
+			"password": "test",
+			"policies": "default",
+		}); err != nil {
+			t.Fatal(err)
+		}
 
-	// Ensure the resulting token is, in fact, still wrapped.
-	client.SetToken(token)
-	secret, err := client.Logical().Unwrap("")
-	if err != nil {
-		t.Error(err)
-	}
-	if secret == nil || secret.Auth == nil || secret.Auth.ClientToken == "" {
-		t.Fatalf("expected secret to have auth: %#v", secret)
-	}
-}
+		ui, cmd := testLoginCommand(t)
+		cmd.client = client
 
-func TestWrapNoStore(t *testing.T) {
-	t.Parallel()
+		// Set the wrapping ttl to 5s. We can't set this via the flag because we
+		// override the client object before that particular flag is parsed.
+		client.SetWrappingLookupFunc(func(string, string) string { return "5m" })
 
-	client, closer := testVaultServer(t)
-	defer closer()
+		code := cmd.Run([]string{
+			"-token-only",
+			"-method", "userpass",
+			"username=test",
+			"password=test",
+		})
+		if exp := 0; code != exp {
+			t.Errorf("expected %d to be %d", code, exp)
+		}
 
-	if err := client.Sys().EnableAuth("userpass", "userpass", ""); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := client.Logical().Write("auth/userpass/users/test", map[string]interface{}{
-		"password": "test",
-		"policies": "default",
-	}); err != nil {
-		t.Fatal(err)
-	}
+		// Unset the wrapping
+		client.SetWrappingLookupFunc(func(string, string) string { return "" })
 
-	ui, cmd := testLoginCommand(t)
-	cmd.client = client
+		tokenHelper, err := cmd.TokenHelper()
+		if err != nil {
+			t.Fatal(err)
+		}
+		storedToken, err := tokenHelper.Get()
+		if err != nil || storedToken != "" {
+			t.Fatalf("expected token to not be stored: %s: %q", err, storedToken)
+		}
 
-	// Set the wrapping ttl to 5s. We can't set this via the flag because we
-	// override the client object before that particular flag is parsed.
-	client.SetWrappingLookupFunc(func(string, string) string { return "5m" })
+		token := strings.TrimSpace(ui.OutputWriter.String())
+		if token == "" {
+			t.Errorf("expected %q to not be %q", token, "")
+		}
 
-	code := cmd.Run([]string{
-		"-no-store",
-		"-method", "userpass",
-		"username=test",
-		"password=test",
+		// Ensure the resulting token is, in fact, still wrapped.
+		client.SetToken(token)
+		secret, err := client.Logical().Unwrap("")
+		if err != nil {
+			t.Error(err)
+		}
+		if secret == nil || secret.Auth == nil || secret.Auth.ClientToken == "" {
+			t.Fatalf("expected secret to have auth: %#v", secret)
+		}
 	})
-	if exp := 0; code != exp {
-		t.Errorf("expected %d to be %d", code, exp)
-	}
 
-	// Unset the wrapping
-	client.SetWrappingLookupFunc(func(string, string) string { return "" })
+	t.Run("wrap_no_store", func(t *testing.T) {
+		t.Parallel()
 
-	tokenHelper, err := cmd.TokenHelper()
-	if err != nil {
-		t.Fatal(err)
-	}
-	storedToken, err := tokenHelper.Get()
-	if err != nil || storedToken != "" {
-		t.Fatalf("expected token to not be stored: %s: %q", err, storedToken)
-	}
+		client, closer := testVaultServer(t)
+		defer closer()
 
-	expected := "wrapping_token"
-	output := ui.OutputWriter.String() + ui.ErrorWriter.String()
-	if !strings.Contains(output, expected) {
-		t.Errorf("expected %q to contain %q", output, expected)
-	}
-}
+		if err := client.Sys().EnableAuth("userpass", "userpass", ""); err != nil {
+			t.Fatal(err)
+		}
+		if _, err := client.Logical().Write("auth/userpass/users/test", map[string]interface{}{
+			"password": "test",
+			"policies": "default",
+		}); err != nil {
+			t.Fatal(err)
+		}
 
-func TestCommunicationFailure(t *testing.T) {
-	t.Parallel()
+		ui, cmd := testLoginCommand(t)
+		cmd.client = client
 
-	client, closer := testVaultServerBad(t)
-	defer closer()
+		// Set the wrapping ttl to 5s. We can't set this via the flag because we
+		// override the client object before that particular flag is parsed.
+		client.SetWrappingLookupFunc(func(string, string) string { return "5m" })
 
-	ui, cmd := testLoginCommand(t)
-	cmd.client = client
+		code := cmd.Run([]string{
+			"-no-store",
+			"-method", "userpass",
+			"username=test",
+			"password=test",
+		})
+		if exp := 0; code != exp {
+			t.Errorf("expected %d to be %d", code, exp)
+		}
 
-	code := cmd.Run([]string{
-		"token",
-	})
-	if exp := 2; code != exp {
-		t.Errorf("expected %d to be %d", code, exp)
-	}
+		// Unset the wrapping
+		client.SetWrappingLookupFunc(func(string, string) string { return "" })
 
-	expected := "Error authenticating: "
-	combined := ui.OutputWriter.String() + ui.ErrorWriter.String()
-	if !strings.Contains(combined, expected) {
-		t.Errorf("expected %q to contain %q", combined, expected)
-	}
-}
+		tokenHelper, err := cmd.TokenHelper()
+		if err != nil {
+			t.Fatal(err)
+		}
+		storedToken, err := tokenHelper.Get()
+		if err != nil || storedToken != "" {
+			t.Fatalf("expected token to not be stored: %s: %q", err, storedToken)
+		}
 
-func TestNoTabs(t *testing.T) {
-	t.Parallel()
+		expected := "wrapping_token"
+		output := ui.OutputWriter.String() + ui.ErrorWriter.String()
+		if !strings.Contains(output, expected) {
+			t.Errorf("expected %q to contain %q", output, expected)
+		}
+	})
 
-	_, cmd := testLoginCommand(t)
-	assertNoTabs(t, cmd)
-}
+	t.Run("login_mfa_single_phase", func(t *testing.T) {
+		t.Parallel()
 
-func TestLoginMFASinglePhase(t *testing.T) {
-	t.Parallel()
+		client, closer := testVaultServer(t)
+		defer closer()
 
-	client, closer := testVaultServer(t)
-	defer closer()
+		ui, cmd := testLoginCommand(t)
 
-	methodName := "foo"
-	waitPeriod := 5
-	userClient, entityID, methodID := testhelpers.SetupLoginMFATOTP(t, client, methodName, waitPeriod)
-	enginePath := testhelpers.RegisterEntityInTOTPEngine(t, client, entityID, methodID)
+		userclient, entityID, methodID := testhelpers.SetupLoginMFATOTP(t, client)
+		cmd.client = userclient
 
-	runCommand := func(methodIdentifier string) {
-		// the time required for the totp engine to generate a new code
-		time.Sleep(time.Duration(waitPeriod) * time.Second)
+		enginePath := testhelpers.RegisterEntityInTOTPEngine(t, client, entityID, methodID)
 		totpCode := testhelpers.GetTOTPCodeFromEngine(t, client, enginePath)
-		ui, cmd := testLoginCommand(t)
-		cmd.client = userClient
+
 		// login command bails early for test clients, so we have to explicitly set this
-		cmd.client.SetMFACreds([]string{methodIdentifier + ":" + totpCode})
+		cmd.client.SetMFACreds([]string{methodID + ":" + totpCode})
 		code := cmd.Run([]string{
 			"-method", "userpass",
 			"username=testuser1",
@@ -499,118 +462,85 @@ func TestLoginMFASinglePhase(t *testing.T) {
 		if err != nil {
 			t.Fatal(err)
 		}
-		if storedToken == "" {
-			t.Fatal("expected non-empty stored token")
-		}
-		output := ui.OutputWriter.String()
+		output = ui.OutputWriter.String() + ui.ErrorWriter.String()
+		t.Logf("\n%+v", output)
 		if !strings.Contains(output, storedToken) {
 			t.Fatalf("expected stored token: %q, got: %q", storedToken, output)
 		}
-	}
-	runCommand(methodID)
-	runCommand(methodName)
-}
-
-func TestLoginMFATwoPhase(t *testing.T) {
-	t.Parallel()
-
-	client, closer := testVaultServer(t)
-	defer closer()
-
-	ui, cmd := testLoginCommand(t)
-
-	userclient, entityID, methodID := testhelpers.SetupLoginMFATOTP(t, client, "", 5)
-	cmd.client = userclient
-
-	_ = testhelpers.RegisterEntityInTOTPEngine(t, client, entityID, methodID)
-
-	// clear the MFA creds just to be sure
-	cmd.client.SetMFACreds([]string{})
-
-	code := cmd.Run([]string{
-		"-method", "userpass",
-		"username=testuser1",
-		"password=testpassword",
 	})
-	if exp := 0; code != exp {
-		t.Errorf("expected %d to be %d", code, exp)
-	}
 
-	expected := methodID
-	output := ui.OutputWriter.String()
-	if !strings.Contains(output, expected) {
-		t.Fatalf("expected stored token: %q, got: %q", expected, output)
-	}
+	t.Run("login_mfa_two_phase", func(t *testing.T) {
+		t.Parallel()
 
-	tokenHelper, err := cmd.TokenHelper()
-	if err != nil {
-		t.Fatal(err)
-	}
-	storedToken, err := tokenHelper.Get()
-	if storedToken != "" {
-		t.Fatal("expected empty stored token")
-	}
-	if err != nil {
-		t.Fatal(err)
-	}
-}
+		client, closer := testVaultServer(t)
+		defer closer()
 
-func TestLoginMFATwoPhaseNonInteractiveMethodName(t *testing.T) {
-	t.Parallel()
+		ui, cmd := testLoginCommand(t)
 
-	client, closer := testVaultServer(t)
-	defer closer()
+		userclient, entityID, methodID := testhelpers.SetupLoginMFATOTP(t, client)
+		cmd.client = userclient
 
-	ui, cmd := testLoginCommand(t)
+		_ = testhelpers.RegisterEntityInTOTPEngine(t, client, entityID, methodID)
 
-	methodName := "foo"
-	waitPeriod := 5
-	userclient, entityID, methodID := testhelpers.SetupLoginMFATOTP(t, client, methodName, waitPeriod)
-	cmd.client = userclient
+		// clear the MFA creds just to be sure
+		cmd.client.SetMFACreds([]string{})
 
-	engineName := testhelpers.RegisterEntityInTOTPEngine(t, client, entityID, methodID)
+		code := cmd.Run([]string{
+			"-method", "userpass",
+			"username=testuser1",
+			"password=testpassword",
+		})
+		if exp := 0; code != exp {
+			t.Errorf("expected %d to be %d", code, exp)
+		}
 
-	// clear the MFA creds just to be sure
-	cmd.client.SetMFACreds([]string{})
+		expected := methodID
+		output = ui.OutputWriter.String() + ui.ErrorWriter.String()
+		t.Logf("\n%+v", output)
+		if !strings.Contains(output, expected) {
+			t.Fatalf("expected stored token: %q, got: %q", expected, output)
+		}
 
-	code := cmd.Run([]string{
-		"-method", "userpass",
-		"-non-interactive",
-		"username=testuser1",
-		"password=testpassword",
+		tokenHelper, err := cmd.TokenHelper()
+		if err != nil {
+			t.Fatal(err)
+		}
+		storedToken, err := tokenHelper.Get()
+		if storedToken != "" {
+			t.Fatal("expected empty stored token")
+		}
+		if err != nil {
+			t.Fatal(err)
+		}
 	})
-	if exp := 0; code != exp {
-		t.Errorf("expected %d to be %d", code, exp)
-	}
 
-	output := ui.OutputWriter.String()
+	t.Run("communication_failure", func(t *testing.T) {
+		t.Parallel()
 
-	reqIdReg := regexp.MustCompile(`mfa_request_id\s+([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})\s+mfa_constraint`)
-	reqIDRaw := reqIdReg.FindAllStringSubmatch(output, -1)
-	if len(reqIDRaw) == 0 || len(reqIDRaw[0]) < 2 {
-		t.Fatal("failed to MFA request ID from output")
-	}
-	mfaReqID := reqIDRaw[0][1]
-
-	validateFunc := func(methodIdentifier string) {
-		// the time required for the totp engine to generate a new code
-		time.Sleep(time.Duration(waitPeriod) * time.Second)
-		totpPasscode1 := "passcode=" + testhelpers.GetTOTPCodeFromEngine(t, client, engineName)
-
-		secret, err := cmd.client.Logical().WriteWithContext(context.Background(), "sys/mfa/validate", map[string]interface{}{
-			"mfa_request_id": mfaReqID,
-			"mfa_payload": map[string][]string{
-				methodIdentifier: {totpPasscode1},
-			},
+		client, closer := testVaultServerBad(t)
+		defer closer()
+
+		ui, cmd := testLoginCommand(t)
+		cmd.client = client
+
+		code := cmd.Run([]string{
+			"token",
 		})
-		if err != nil {
-			t.Fatalf("mfa validation failed: %v", err)
+		if exp := 2; code != exp {
+			t.Errorf("expected %d to be %d", code, exp)
 		}
 
-		if secret.Auth == nil || secret.Auth.ClientToken == "" {
-			t.Fatalf("mfa validation did not return a client token")
+		expected := "Error authenticating: "
+		combined := ui.OutputWriter.String() + ui.ErrorWriter.String()
+		if !strings.Contains(combined, expected) {
+			t.Errorf("expected %q to contain %q", combined, expected)
 		}
-	}
+	})
 
-	validateFunc(methodName)
+	t.Run("no_tabs", func(t *testing.T) {
+		t.Parallel()
+
+		_, cmd := testLoginCommand(t)
+		assertNoTabs(t, cmd)
+	})
 }
diff --git a/command/main.go b/command/main.go
index 13fbe2181822d..4a5e8028214e6 100644
--- a/command/main.go
+++ b/command/main.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -220,19 +217,18 @@ func RunCustom(args []string, runOpts *RunOptions) int {
 		return 1
 	}
 
-	commands := initCommands(ui, serverCmdUi, runOpts)
+	initCommands(ui, serverCmdUi, runOpts)
 
 	hiddenCommands := []string{"version"}
 
 	cli := &cli.CLI{
 		Name:     "vault",
 		Args:     args,
-		Commands: commands,
+		Commands: Commands,
 		HelpFunc: groupedHelpFunc(
 			cli.BasicHelpFunc("vault"),
 		),
-		HelpWriter:                 runOpts.Stdout,
-		ErrorWriter:                runOpts.Stderr,
+		HelpWriter:                 runOpts.Stderr,
 		HiddenCommands:             hiddenCommands,
 		Autocomplete:               true,
 		AutocompleteNoDefaultFlags: true,
diff --git a/command/monitor.go b/command/monitor.go
index 7545b82da71a3..e6309258973f1 100644
--- a/command/monitor.go
+++ b/command/monitor.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/monitor_test.go b/command/monitor_test.go
index 0cc722c98d91f..d10547a8c8734 100644
--- a/command/monitor_test.go
+++ b/command/monitor_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -9,6 +6,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/hashicorp/vault/helper/testhelpers"
 	"github.com/mitchellh/cli"
 )
 
@@ -74,11 +72,14 @@ func TestMonitorCommand_Run(t *testing.T) {
 			cmd.client = client
 			cmd.ShutdownCh = shutdownCh
 
+			stopCh := testhelpers.GenerateDebugLogs(t, client)
+
 			go func() {
 				atomic.StoreInt64(&code, int64(cmd.Run(tc.args)))
 			}()
 
 			<-time.After(3 * time.Second)
+			stopCh <- struct{}{}
 			close(shutdownCh)
 
 			if atomic.LoadInt64(&code) != tc.code {
@@ -89,6 +90,8 @@ func TestMonitorCommand_Run(t *testing.T) {
 			if !strings.Contains(combined, tc.out) {
 				t.Fatalf("expected %q to contain %q", combined, tc.out)
 			}
+
+			<-stopCh
 		})
 	}
 }
diff --git a/command/namespace.go b/command/namespace.go
index 18bc6e92eb552..702395753da8a 100644
--- a/command/namespace.go
+++ b/command/namespace.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/namespace_api_lock.go b/command/namespace_api_lock.go
index 57b196992c945..48fec344c7416 100644
--- a/command/namespace_api_lock.go
+++ b/command/namespace_api_lock.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/namespace_api_unlock.go b/command/namespace_api_unlock.go
index 77e829147afb2..38f4a764d4d52 100644
--- a/command/namespace_api_unlock.go
+++ b/command/namespace_api_unlock.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/namespace_create.go b/command/namespace_create.go
index 60df834d739a8..7d1f52fa8c9ba 100644
--- a/command/namespace_create.go
+++ b/command/namespace_create.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/namespace_delete.go b/command/namespace_delete.go
index 5c79c35b1050b..a5d18929368b8 100644
--- a/command/namespace_delete.go
+++ b/command/namespace_delete.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/namespace_list.go b/command/namespace_list.go
index 6394daedf36c6..2be2a3874df5b 100644
--- a/command/namespace_list.go
+++ b/command/namespace_list.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/namespace_lookup.go b/command/namespace_lookup.go
index ee18736633a54..98d710ea536e2 100644
--- a/command/namespace_lookup.go
+++ b/command/namespace_lookup.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/namespace_patch.go b/command/namespace_patch.go
index 2a4a6dc699a80..3ae6f6bc8b31b 100644
--- a/command/namespace_patch.go
+++ b/command/namespace_patch.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/operator.go b/command/operator.go
index a79f7bff84060..ad1bb439fc7d5 100644
--- a/command/operator.go
+++ b/command/operator.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/operator_diagnose.go b/command/operator_diagnose.go
index 5abddb7c980d6..9518fdf2b8c8a 100644
--- a/command/operator_diagnose.go
+++ b/command/operator_diagnose.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -30,16 +27,18 @@ import (
 	physconsul "github.com/hashicorp/vault/physical/consul"
 	"github.com/hashicorp/vault/physical/raft"
 	"github.com/hashicorp/vault/sdk/physical"
+	"github.com/hashicorp/vault/sdk/version"
 	sr "github.com/hashicorp/vault/serviceregistration"
 	srconsul "github.com/hashicorp/vault/serviceregistration/consul"
 	"github.com/hashicorp/vault/vault"
 	"github.com/hashicorp/vault/vault/diagnose"
 	"github.com/hashicorp/vault/vault/hcp_link"
-	"github.com/hashicorp/vault/version"
 	"github.com/mitchellh/cli"
 	"github.com/posener/complete"
 )
 
+const OperatorDiagnoseEnableEnv = "VAULT_DIAGNOSE"
+
 const CoreConfigUninitializedErr = "Diagnose cannot attempt this step because core config could not be set."
 
 var (
@@ -447,25 +446,26 @@ func (c *OperatorDiagnoseCommand) offlineDiagnostics(ctx context.Context) error
 		goto SEALFAIL
 	}
 
-	for _, seal := range seals {
-		// There is always one nil seal. We need to skip it so we don't start an empty Finalize-Seal-Shamir
-		// section.
-		if seal == nil {
-			continue
-		}
-		seal := seal // capture range variable
-		// Ensure that the seal finalizer is called, even if using verify-only
-		defer func(seal *vault.Seal) {
-			sealType := diagnose.CapitalizeFirstLetter((*seal).BarrierType().String())
-			finalizeSealContext, finalizeSealSpan := diagnose.StartSpan(ctx, "Finalize "+sealType+" Seal")
-			err = (*seal).Finalize(finalizeSealContext)
-			if err != nil {
-				diagnose.Fail(finalizeSealContext, "Error finalizing seal.")
-				diagnose.Advise(finalizeSealContext, "This likely means that the barrier is still in use; therefore, finalizing the seal timed out.")
-				finalizeSealSpan.End()
+	if seals != nil {
+		for _, seal := range seals {
+			// There is always one nil seal. We need to skip it so we don't start an empty Finalize-Seal-Shamir
+			// section.
+			if seal == nil {
+				continue
 			}
-			finalizeSealSpan.End()
-		}(&seal)
+			// Ensure that the seal finalizer is called, even if using verify-only
+			defer func(seal *vault.Seal) {
+				sealType := diagnose.CapitalizeFirstLetter((*seal).BarrierType().String())
+				finalizeSealContext, finalizeSealSpan := diagnose.StartSpan(ctx, "Finalize "+sealType+" Seal")
+				err = (*seal).Finalize(finalizeSealContext)
+				if err != nil {
+					diagnose.Fail(finalizeSealContext, "Error finalizing seal.")
+					diagnose.Advise(finalizeSealContext, "This likely means that the barrier is still in use; therefore, finalizing the seal timed out.")
+					finalizeSealSpan.End()
+				}
+				finalizeSealSpan.End()
+			}(&seal)
+		}
 	}
 
 	if barrierSeal == nil {
diff --git a/command/operator_diagnose_test.go b/command/operator_diagnose_test.go
index 2c9a1a0363e3c..99834b9d48bcd 100644
--- a/command/operator_diagnose_test.go
+++ b/command/operator_diagnose_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !race
 
 package command
diff --git a/command/operator_generate_root.go b/command/operator_generate_root.go
index 6665e8bdbf8ce..ece541683be1d 100644
--- a/command/operator_generate_root.go
+++ b/command/operator_generate_root.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/operator_generate_root_test.go b/command/operator_generate_root_test.go
index 1436ab2ddfae5..b4489718efbea 100644
--- a/command/operator_generate_root_test.go
+++ b/command/operator_generate_root_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !race
 
 package command
diff --git a/command/operator_init.go b/command/operator_init.go
index 080f5853def56..6d67dcd9b6a45 100644
--- a/command/operator_init.go
+++ b/command/operator_init.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -240,15 +237,6 @@ func (c *OperatorInitCommand) Run(args []string) int {
 		return 2
 	}
 
-	// -output-curl string returns curl command for seal status
-	// setting this to false and then setting actual value after reading seal status
-	currentOutputCurlString := client.OutputCurlString()
-	client.SetOutputCurlString(false)
-	// -output-policy string returns minimum required policy HCL for seal status
-	// setting this to false and then setting actual value after reading seal status
-	outputPolicy := client.OutputPolicy()
-	client.SetOutputPolicy(false)
-
 	// Set defaults based on use of auto unseal seal
 	sealInfo, err := client.Sys().SealStatus()
 	if err != nil {
@@ -256,9 +244,6 @@ func (c *OperatorInitCommand) Run(args []string) int {
 		return 2
 	}
 
-	client.SetOutputCurlString(currentOutputCurlString)
-	client.SetOutputPolicy(outputPolicy)
-
 	switch sealInfo.RecoverySeal {
 	case true:
 		if c.flagRecoveryShares == 0 {
diff --git a/command/operator_init_test.go b/command/operator_init_test.go
index 06647d7278248..ec02873587dfc 100644
--- a/command/operator_init_test.go
+++ b/command/operator_init_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !race
 
 package command
diff --git a/command/operator_key_status.go b/command/operator_key_status.go
index 412a00cd20e6c..e015fb0e32f74 100644
--- a/command/operator_key_status.go
+++ b/command/operator_key_status.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/operator_key_status_test.go b/command/operator_key_status_test.go
index 9f8fbb0f6dc49..01cb9136286b1 100644
--- a/command/operator_key_status_test.go
+++ b/command/operator_key_status_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/operator_members.go b/command/operator_members.go
index 986313a3201b0..d4bd1fbe4389f 100644
--- a/command/operator_members.go
+++ b/command/operator_members.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/operator_migrate.go b/command/operator_migrate.go
index 01e8bbb21322e..a974f58d6cb61 100644
--- a/command/operator_migrate.go
+++ b/command/operator_migrate.go
@@ -1,13 +1,9 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
 	"context"
 	"fmt"
 	"io/ioutil"
-	"math"
 	"net/url"
 	"os"
 	"sort"
@@ -26,7 +22,6 @@ import (
 	"github.com/mitchellh/cli"
 	"github.com/pkg/errors"
 	"github.com/posener/complete"
-	"golang.org/x/sync/errgroup"
 )
 
 var (
@@ -44,7 +39,6 @@ type OperatorMigrateCommand struct {
 	flagLogLevel     string
 	flagStart        string
 	flagReset        bool
-	flagMaxParallel  int
 	logger           log.Logger
 	ShutdownCh       chan struct{}
 }
@@ -104,14 +98,6 @@ func (c *OperatorMigrateCommand) Flags() *FlagSets {
 		Usage:  "Reset the migration lock. No migration will occur.",
 	})
 
-	f.IntVar(&IntVar{
-		Name:    "max-parallel",
-		Default: 10,
-		Target:  &c.flagMaxParallel,
-		Usage: "Specifies the maximum number of parallel migration threads (goroutines) that may be used when migrating. " +
-			"This can speed up the migration process on slow backends but uses more resources.",
-	})
-
 	f.StringVar(&StringVar{
 		Name:       "log-level",
 		Target:     &c.flagLogLevel,
@@ -140,6 +126,7 @@ func (c *OperatorMigrateCommand) Run(args []string) int {
 		c.UI.Error(err.Error())
 		return 1
 	}
+
 	c.flagLogLevel = strings.ToLower(c.flagLogLevel)
 	validLevels := []string{"trace", "debug", "info", "warn", "error"}
 	if !strutil.StrListContains(validLevels, c.flagLogLevel) {
@@ -148,11 +135,6 @@ func (c *OperatorMigrateCommand) Run(args []string) int {
 	}
 	c.logger = logging.NewVaultLogger(log.LevelFromString(c.flagLogLevel))
 
-	if c.flagMaxParallel < 1 {
-		c.UI.Error(fmt.Sprintf("Argument to flag -max-parallel must be between 1 and %d", math.MaxInt))
-		return 1
-	}
-
 	if c.flagConfig == "" {
 		c.UI.Error("Must specify exactly one config path using -config")
 		return 1
@@ -182,7 +164,7 @@ func (c *OperatorMigrateCommand) Run(args []string) int {
 }
 
 // migrate attempts to instantiate the source and destinations backends,
-// and then invoke the migration the root of the keyspace.
+// and then invoke the migration the the root of the keyspace.
 func (c *OperatorMigrateCommand) migrate(config *migratorConfig) error {
 	from, err := c.newBackend(config.StorageSource.Type, config.StorageSource.Config)
 	if err != nil {
@@ -227,7 +209,7 @@ func (c *OperatorMigrateCommand) migrate(config *migratorConfig) error {
 
 	doneCh := make(chan error)
 	go func() {
-		doneCh <- c.migrateAll(ctx, from, to, c.flagMaxParallel)
+		doneCh <- c.migrateAll(ctx, from, to)
 	}()
 
 	select {
@@ -243,8 +225,8 @@ func (c *OperatorMigrateCommand) migrate(config *migratorConfig) error {
 }
 
 // migrateAll copies all keys in lexicographic order.
-func (c *OperatorMigrateCommand) migrateAll(ctx context.Context, from physical.Backend, to physical.Backend, maxParallel int) error {
-	return dfsScan(ctx, from, maxParallel, func(ctx context.Context, path string) error {
+func (c *OperatorMigrateCommand) migrateAll(ctx context.Context, from physical.Backend, to physical.Backend) error {
+	return dfsScan(ctx, from, func(ctx context.Context, path string) error {
 		if path < c.flagStart || path == storageMigrationLock || path == vault.CoreLockPath {
 			return nil
 		}
@@ -383,20 +365,10 @@ func parseStorage(result *migratorConfig, list *ast.ObjectList, name string) err
 
 // dfsScan will invoke cb with every key from source.
 // Keys will be traversed in lexicographic, depth-first order.
-func dfsScan(ctx context.Context, source physical.Backend, maxParallel int, cb func(ctx context.Context, path string) error) error {
+func dfsScan(ctx context.Context, source physical.Backend, cb func(ctx context.Context, path string) error) error {
 	dfs := []string{""}
 
-	eg, ctx := errgroup.WithContext(ctx)
-	eg.SetLimit(maxParallel)
-
 	for l := len(dfs); l > 0; l = len(dfs) {
-		// Check for cancellation
-		select {
-		case <-ctx.Done():
-			return ctx.Err()
-		default:
-		}
-
 		key := dfs[len(dfs)-1]
 		if key == "" || strings.HasSuffix(key, "/") {
 			children, err := source.List(ctx, key)
@@ -413,14 +385,19 @@ func dfsScan(ctx context.Context, source physical.Backend, maxParallel int, cb f
 				}
 			}
 		} else {
-			// Pooling
-			eg.Go(func() error {
-				return cb(ctx, key)
-			})
+			err := cb(ctx, key)
+			if err != nil {
+				return err
+			}
 
 			dfs = dfs[:len(dfs)-1]
 		}
-	}
 
-	return eg.Wait()
+		select {
+		case <-ctx.Done():
+			return nil
+		default:
+		}
+	}
+	return nil
 }
diff --git a/command/operator_migrate_test.go b/command/operator_migrate_test.go
index 3d28430914846..5db53ebbfcb97 100644
--- a/command/operator_migrate_test.go
+++ b/command/operator_migrate_test.go
@@ -1,19 +1,16 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
 	"bytes"
 	"context"
 	"fmt"
+	"io/ioutil"
 	"math/rand"
 	"os"
 	"path/filepath"
 	"reflect"
 	"sort"
 	"strings"
-	"sync"
 	"testing"
 	"time"
 
@@ -21,6 +18,7 @@ import (
 	log "github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/go-secure-stdlib/base62"
 	"github.com/hashicorp/vault/command/server"
+	"github.com/hashicorp/vault/helper/testhelpers"
 	"github.com/hashicorp/vault/sdk/physical"
 	"github.com/hashicorp/vault/vault"
 )
@@ -37,45 +35,8 @@ func TestMigration(t *testing.T) {
 
 		fromFactory := physicalBackends["file"]
 
-		folder := t.TempDir()
-
-		confFrom := map[string]string{
-			"path": folder,
-		}
-
-		from, err := fromFactory(confFrom, nil)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if err := storeData(from, data); err != nil {
-			t.Fatal(err)
-		}
-
-		toFactory := physicalBackends["inmem"]
-		confTo := map[string]string{}
-		to, err := toFactory(confTo, nil)
-		if err != nil {
-			t.Fatal(err)
-		}
-		cmd := OperatorMigrateCommand{
-			logger: log.NewNullLogger(),
-		}
-		if err := cmd.migrateAll(context.Background(), from, to, 1); err != nil {
-			t.Fatal(err)
-		}
-
-		if err := compareStoredData(to, data, ""); err != nil {
-			t.Fatal(err)
-		}
-	})
-
-	t.Run("Concurrent migration", func(t *testing.T) {
-		data := generateData()
-
-		fromFactory := physicalBackends["file"]
-
-		folder := t.TempDir()
-
+		folder := filepath.Join(os.TempDir(), testhelpers.RandomWithPrefix("migrator"))
+		defer os.RemoveAll(folder)
 		confFrom := map[string]string{
 			"path": folder,
 		}
@@ -98,10 +59,10 @@ func TestMigration(t *testing.T) {
 		cmd := OperatorMigrateCommand{
 			logger: log.NewNullLogger(),
 		}
-
-		if err := cmd.migrateAll(context.Background(), from, to, 10); err != nil {
+		if err := cmd.migrateAll(context.Background(), from, to); err != nil {
 			t.Fatal(err)
 		}
+
 		if err := compareStoredData(to, data, ""); err != nil {
 			t.Fatal(err)
 		}
@@ -121,46 +82,8 @@ func TestMigration(t *testing.T) {
 		}
 
 		toFactory := physicalBackends["file"]
-		folder := t.TempDir()
-		confTo := map[string]string{
-			"path": folder,
-		}
-
-		to, err := toFactory(confTo, nil)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		const start = "m"
-
-		cmd := OperatorMigrateCommand{
-			logger:    log.NewNullLogger(),
-			flagStart: start,
-		}
-		if err := cmd.migrateAll(context.Background(), from, to, 1); err != nil {
-			t.Fatal(err)
-		}
-
-		if err := compareStoredData(to, data, start); err != nil {
-			t.Fatal(err)
-		}
-	})
-
-	t.Run("Start option (parallel)", func(t *testing.T) {
-		data := generateData()
-
-		fromFactory := physicalBackends["inmem"]
-		confFrom := map[string]string{}
-		from, err := fromFactory(confFrom, nil)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if err := storeData(from, data); err != nil {
-			t.Fatal(err)
-		}
-
-		toFactory := physicalBackends["file"]
-		folder := t.TempDir()
+		folder := filepath.Join(os.TempDir(), testhelpers.RandomWithPrefix("migrator"))
+		defer os.RemoveAll(folder)
 		confTo := map[string]string{
 			"path": folder,
 		}
@@ -176,7 +99,7 @@ func TestMigration(t *testing.T) {
 			logger:    log.NewNullLogger(),
 			flagStart: start,
 		}
-		if err := cmd.migrateAll(context.Background(), from, to, 10); err != nil {
+		if err := cmd.migrateAll(context.Background(), from, to); err != nil {
 			t.Fatal(err)
 		}
 
@@ -187,8 +110,9 @@ func TestMigration(t *testing.T) {
 
 	t.Run("Config parsing", func(t *testing.T) {
 		cmd := new(OperatorMigrateCommand)
-		cfgName := filepath.Join(t.TempDir(), "migrator")
-		os.WriteFile(cfgName, []byte(`
+
+		cfgName := filepath.Join(os.TempDir(), testhelpers.RandomWithPrefix("migrator"))
+		ioutil.WriteFile(cfgName, []byte(`
 storage_source "src_type" {
   path = "src_path"
 }
@@ -196,6 +120,7 @@ storage_source "src_type" {
 storage_destination "dest_type" {
   path = "dest_path"
 }`), 0o644)
+		defer os.Remove(cfgName)
 
 		expCfg := &migratorConfig{
 			StorageSource: &server.Storage{
@@ -220,7 +145,7 @@ storage_destination "dest_type" {
 		}
 
 		verifyBad := func(cfg string) {
-			os.WriteFile(cfgName, []byte(cfg), 0o644)
+			ioutil.WriteFile(cfgName, []byte(cfg), 0o644)
 			_, err := cmd.loadMigratorConfig(cfgName)
 			if err == nil {
 				t.Fatalf("expected error but none received from: %v", cfg)
@@ -267,7 +192,6 @@ storage_destination "dest_type2" {
   path = "dest_path"
 }`)
 	})
-
 	t.Run("DFS Scan", func(t *testing.T) {
 		s, _ := physicalBackends["inmem"](map[string]string{}, nil)
 
@@ -280,16 +204,9 @@ storage_destination "dest_type2" {
 
 		l := randomLister{s}
 
-		type SafeAppend struct {
-			out  []string
-			lock sync.Mutex
-		}
-		outKeys := SafeAppend{}
-		dfsScan(context.Background(), l, 10, func(ctx context.Context, path string) error {
-			outKeys.lock.Lock()
-			defer outKeys.lock.Unlock()
-
-			outKeys.out = append(outKeys.out, path)
+		var out []string
+		dfsScan(context.Background(), l, func(ctx context.Context, path string) error {
+			out = append(out, path)
 			return nil
 		})
 
@@ -301,11 +218,8 @@ storage_destination "dest_type2" {
 			keys = append(keys, key)
 		}
 		sort.Strings(keys)
-		outKeys.lock.Lock()
-		sort.Strings(outKeys.out)
-		outKeys.lock.Unlock()
-		if !reflect.DeepEqual(keys, outKeys.out) {
-			t.Fatalf("expected equal: %v, %v", keys, outKeys.out)
+		if !reflect.DeepEqual(keys, out) {
+			t.Fatalf("expected equal: %v, %v", keys, out)
 		}
 	})
 }
diff --git a/command/operator_raft.go b/command/operator_raft.go
index 8720b78ce7cb7..34107dbb59535 100644
--- a/command/operator_raft.go
+++ b/command/operator_raft.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/operator_raft_autopilot_get_config.go b/command/operator_raft_autopilot_get_config.go
index 11d7da87d8950..1462e354c5590 100644
--- a/command/operator_raft_autopilot_get_config.go
+++ b/command/operator_raft_autopilot_get_config.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/operator_raft_autopilot_set_config.go b/command/operator_raft_autopilot_set_config.go
index 0d9a5f3362951..4a839c5fae3ab 100644
--- a/command/operator_raft_autopilot_set_config.go
+++ b/command/operator_raft_autopilot_set_config.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/operator_raft_autopilot_state.go b/command/operator_raft_autopilot_state.go
index 99f188aae78f0..8a530dc75e0f9 100644
--- a/command/operator_raft_autopilot_state.go
+++ b/command/operator_raft_autopilot_state.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/operator_raft_join.go b/command/operator_raft_join.go
index 57e14a827edcb..466ab84142b41 100644
--- a/command/operator_raft_join.go
+++ b/command/operator_raft_join.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/operator_raft_listpeers.go b/command/operator_raft_listpeers.go
index 4e82c15da98ed..2c80112ec3faa 100644
--- a/command/operator_raft_listpeers.go
+++ b/command/operator_raft_listpeers.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/operator_raft_remove_peer.go b/command/operator_raft_remove_peer.go
index 84b516cf62947..6f7e837474fac 100644
--- a/command/operator_raft_remove_peer.go
+++ b/command/operator_raft_remove_peer.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/operator_raft_snapshot.go b/command/operator_raft_snapshot.go
index 036c6ebae09f6..5e3b042877363 100644
--- a/command/operator_raft_snapshot.go
+++ b/command/operator_raft_snapshot.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/operator_raft_snapshot_restore.go b/command/operator_raft_snapshot_restore.go
index 6067adca79049..3755d6cbfd0d9 100644
--- a/command/operator_raft_snapshot_restore.go
+++ b/command/operator_raft_snapshot_restore.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/operator_raft_snapshot_save.go b/command/operator_raft_snapshot_save.go
index 2abbb0ad2234e..496b0a7b52c48 100644
--- a/command/operator_raft_snapshot_save.go
+++ b/command/operator_raft_snapshot_save.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/operator_rekey.go b/command/operator_rekey.go
index dde0e5800528a..b73349405daaf 100644
--- a/command/operator_rekey.go
+++ b/command/operator_rekey.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -23,11 +20,6 @@ var (
 	_ cli.CommandAutocomplete = (*OperatorRekeyCommand)(nil)
 )
 
-const (
-	keyTypeRecovery = "Recovery"
-	keyTypeUnseal   = "Unseal"
-)
-
 type OperatorRekeyCommand struct {
 	*BaseCommand
 
@@ -66,9 +58,6 @@ Usage: vault operator rekey [options] [KEY]
   the command. If key is specified as "-", the command will read from stdin. If
   a TTY is available, the command will prompt for text.
 
-  If the flag -target=recovery is supplied, then this operation will require a
-  quorum of recovery keys in order to generate a new set of recovery keys. 
-
   Initialize a rekey:
 
       $ vault operator rekey \
@@ -123,7 +112,7 @@ func (c *OperatorRekeyCommand) Flags() *FlagSets {
 		Target:  &c.flagCancel,
 		Default: false,
 		Usage: "Reset the rekeying progress. This will discard any submitted " +
-			"unseal keys, recovery keys, or configuration.",
+			"unseal keys or configuration.",
 	})
 
 	f.BoolVar(&BoolVar{
@@ -131,7 +120,7 @@ func (c *OperatorRekeyCommand) Flags() *FlagSets {
 		Target:  &c.flagStatus,
 		Default: false,
 		Usage: "Print the status of the current attempt without providing an " +
-			"unseal or recovery key.",
+			"unseal key.",
 	})
 
 	f.IntVar(&IntVar{
@@ -141,7 +130,7 @@ func (c *OperatorRekeyCommand) Flags() *FlagSets {
 		Default:    5,
 		Completion: complete.PredictAnything,
 		Usage: "Number of key shares to split the generated root key into. " +
-			"This is the number of \"unseal keys\" or \"recovery keys\" to generate.",
+			"This is the number of \"unseal keys\" to generate.",
 	})
 
 	f.IntVar(&IntVar{
@@ -161,7 +150,7 @@ func (c *OperatorRekeyCommand) Flags() *FlagSets {
 		EnvVar:     "",
 		Completion: complete.PredictAnything,
 		Usage: "Nonce value provided at initialization. The same nonce value " +
-			"must be provided with each unseal or recovery key.",
+			"must be provided with each unseal key.",
 	})
 
 	f.StringVar(&StringVar{
@@ -190,7 +179,7 @@ func (c *OperatorRekeyCommand) Flags() *FlagSets {
 		Usage: "Comma-separated list of paths to files on disk containing " +
 			"public PGP keys OR a comma-separated list of Keybase usernames using " +
 			"the format \"keybase:<username>\". When supplied, the generated " +
-			"unseal or recovery keys will be encrypted and base64-encoded in the order " +
+			"unseal keys will be encrypted and base64-encoded in the order " +
 			"specified in this list.",
 	})
 
@@ -200,25 +189,25 @@ func (c *OperatorRekeyCommand) Flags() *FlagSets {
 		Name:    "backup",
 		Target:  &c.flagBackup,
 		Default: false,
-		Usage: "Store a backup of the current PGP encrypted unseal or recovery keys in " +
+		Usage: "Store a backup of the current PGP encrypted unseal keys in " +
 			"Vault's core. The encrypted values can be recovered in the event of " +
 			"failure or discarded after success. See the -backup-delete and " +
 			"-backup-retrieve options for more information. This option only " +
-			"applies when the existing unseal or recovery keys were PGP encrypted.",
+			"applies when the existing unseal keys were PGP encrypted.",
 	})
 
 	f.BoolVar(&BoolVar{
 		Name:    "backup-delete",
 		Target:  &c.flagBackupDelete,
 		Default: false,
-		Usage:   "Delete any stored backup unseal or recovery keys.",
+		Usage:   "Delete any stored backup unseal keys.",
 	})
 
 	f.BoolVar(&BoolVar{
 		Name:    "backup-retrieve",
 		Target:  &c.flagBackupRetrieve,
 		Default: false,
-		Usage: "Retrieve the backed-up unseal or recovery keys. This option is only available " +
+		Usage: "Retrieve the backed-up unseal keys. This option is only available " +
 			"if the PGP keys were provided and the backup has not been deleted.",
 	})
 
@@ -279,12 +268,10 @@ func (c *OperatorRekeyCommand) Run(args []string) int {
 func (c *OperatorRekeyCommand) init(client *api.Client) int {
 	// Handle the different API requests
 	var fn func(*api.RekeyInitRequest) (*api.RekeyStatusResponse, error)
-	keyTypeRequired := keyTypeUnseal
 	switch strings.ToLower(strings.TrimSpace(c.flagTarget)) {
 	case "barrier":
 		fn = client.Sys().RekeyInit
 	case "recovery", "hsm":
-		keyTypeRequired = keyTypeRecovery
 		fn = client.Sys().RekeyRecoveryKeyInit
 	default:
 		c.UI.Error(fmt.Sprintf("Unknown target: %s", c.flagTarget))
@@ -308,25 +295,25 @@ func (c *OperatorRekeyCommand) init(client *api.Client) int {
 	if len(c.flagPGPKeys) == 0 {
 		if Format(c.UI) == "table" {
 			c.UI.Warn(wrapAtLength(
-				fmt.Sprintf("WARNING! If you lose the keys after they are returned, there is no "+
-					"recovery. Consider canceling this operation and re-initializing "+
-					"with the -pgp-keys flag to protect the returned %s keys along "+
-					"with -backup to allow recovery of the encrypted keys in case of "+
-					"emergency. You can delete the stored keys later using the -delete "+
-					"flag.", strings.ToLower(keyTypeRequired))))
+				"WARNING! If you lose the keys after they are returned, there is no " +
+					"recovery. Consider canceling this operation and re-initializing " +
+					"with the -pgp-keys flag to protect the returned unseal keys along " +
+					"with -backup to allow recovery of the encrypted keys in case of " +
+					"emergency. You can delete the stored keys later using the -delete " +
+					"flag."))
 			c.UI.Output("")
 		}
 	}
 	if len(c.flagPGPKeys) > 0 && !c.flagBackup {
 		if Format(c.UI) == "table" {
 			c.UI.Warn(wrapAtLength(
-				fmt.Sprintf("WARNING! You are using PGP keys for encrypted the resulting %s "+
-					"keys, but you did not enable the option to backup the keys to "+
-					"Vault's core. If you lose the encrypted keys after they are "+
-					"returned, you will not be able to recover them. Consider canceling "+
-					"this operation and re-running with -backup to allow recovery of the "+
-					"encrypted unseal keys in case of emergency. You can delete the "+
-					"stored keys later using the -delete flag.", strings.ToLower(keyTypeRequired))))
+				"WARNING! You are using PGP keys for encrypted the resulting unseal " +
+					"keys, but you did not enable the option to backup the keys to " +
+					"Vault's core. If you lose the encrypted keys after they are " +
+					"returned, you will not be able to recover them. Consider canceling " +
+					"this operation and re-running with -backup to allow recovery of the " +
+					"encrypted unseal keys in case of emergency. You can delete the " +
+					"stored keys later using the -delete flag."))
 			c.UI.Output("")
 		}
 	}
@@ -371,7 +358,7 @@ func (c *OperatorRekeyCommand) cancel(client *api.Client) int {
 func (c *OperatorRekeyCommand) provide(client *api.Client, key string) int {
 	var statusFn func() (interface{}, error)
 	var updateFn func(string, string) (interface{}, error)
-	keyTypeRequired := keyTypeUnseal
+
 	switch strings.ToLower(strings.TrimSpace(c.flagTarget)) {
 	case "barrier":
 		statusFn = func() (interface{}, error) {
@@ -389,7 +376,6 @@ func (c *OperatorRekeyCommand) provide(client *api.Client, key string) int {
 			}
 		}
 	case "recovery", "hsm":
-		keyTypeRequired = keyTypeRecovery
 		statusFn = func() (interface{}, error) {
 			return client.Sys().RekeyRecoveryKeyStatus()
 		}
@@ -462,7 +448,7 @@ func (c *OperatorRekeyCommand) provide(client *api.Client, key string) int {
 		// Nonce value is not required if we are prompting via the terminal
 		w := getWriterFromUI(c.UI)
 		fmt.Fprintf(w, "Rekey operation nonce: %s\n", nonce)
-		fmt.Fprintf(w, "%s Key (will be hidden): ", keyTypeRequired)
+		fmt.Fprintf(w, "Unseal Key (will be hidden): ")
 		key, err = password.Read(os.Stdin)
 		fmt.Fprintf(w, "\n")
 		if err != nil {
@@ -472,11 +458,11 @@ func (c *OperatorRekeyCommand) provide(client *api.Client, key string) int {
 			}
 
 			c.UI.Error(wrapAtLength(fmt.Sprintf("An error occurred attempting to "+
-				"ask for the %s key. The raw error message is shown below, but "+
+				"ask for the unseal key. The raw error message is shown below, but "+
 				"usually this is because you attempted to pipe a value into the "+
 				"command or you are executing outside of a terminal (tty). If you "+
 				"want to pipe the value, pass \"-\" as the argument to read from "+
-				"stdin. The raw error was: %s", strings.ToLower(keyTypeRequired), err)))
+				"stdin. The raw error was: %s", err)))
 			return 1
 		}
 	default: // Supplied directly as an arg
@@ -711,7 +697,7 @@ func (c *OperatorRekeyCommand) printUnsealKeys(client *api.Client, status *api.R
 			)))
 		case "recovery", "hsm":
 			c.UI.Output(wrapAtLength(fmt.Sprintf(
-				"The encrypted recovery keys are backed up to \"core/recovery-keys-backup\" " +
+				"The encrypted unseal keys are backed up to \"core/recovery-keys-backup\" " +
 					"in the storage backend. Remove these keys at any time using " +
 					"\"vault operator rekey -backup-delete -target=recovery\". Vault does not automatically " +
 					"remove these keys.",
@@ -722,56 +708,33 @@ func (c *OperatorRekeyCommand) printUnsealKeys(client *api.Client, status *api.R
 	switch status.VerificationRequired {
 	case false:
 		c.UI.Output("")
-		switch strings.ToLower(strings.TrimSpace(c.flagTarget)) {
-		case "barrier":
-			c.UI.Output(wrapAtLength(fmt.Sprintf(
-				"Vault unseal keys rekeyed with %d key shares and a key threshold of %d. Please "+
-					"securely distribute the key shares printed above. When Vault is "+
-					"re-sealed, restarted, or stopped, you must supply at least %d of "+
-					"these keys to unseal it before it can start servicing requests.",
-				status.N,
-				status.T,
-				status.T)))
-		case "recovery", "hsm":
-			c.UI.Output(wrapAtLength(fmt.Sprintf(
-				"Vault recovery keys rekeyed with %d key shares and a key threshold of %d. Please "+
-					"securely distribute the key shares printed above.",
-				status.N,
-				status.T)))
-		}
-
+		c.UI.Output(wrapAtLength(fmt.Sprintf(
+			"Vault rekeyed with %d key shares and a key threshold of %d. Please "+
+				"securely distribute the key shares printed above. When Vault is "+
+				"re-sealed, restarted, or stopped, you must supply at least %d of "+
+				"these keys to unseal it before it can start servicing requests.",
+			status.N,
+			status.T,
+			status.T)))
 	default:
 		c.UI.Output("")
-		var warningText string
-		switch strings.ToLower(strings.TrimSpace(c.flagTarget)) {
-		case "barrier":
-			c.UI.Output(wrapAtLength(fmt.Sprintf(
-				"Vault has created a new unseal key, split into %d key shares and a key threshold "+
-					"of %d. These will not be active until after verification is complete. "+
-					"Please securely distribute the key shares printed above. When Vault "+
-					"is re-sealed, restarted, or stopped, you must supply at least %d of "+
-					"these keys to unseal it before it can start servicing requests.",
-				status.N,
-				status.T,
-				status.T)))
-			warningText = "unseal"
-		case "recovery", "hsm":
-			c.UI.Output(wrapAtLength(fmt.Sprintf(
-				"Vault has created a new recovery key, split into %d key shares and a key threshold "+
-					"of %d. These will not be active until after verification is complete. "+
-					"Please securely distribute the key shares printed above.",
-				status.N,
-				status.T)))
-			warningText = "authenticate with"
-
-		}
+		c.UI.Output(wrapAtLength(fmt.Sprintf(
+			"Vault has created a new key, split into %d key shares and a key threshold "+
+				"of %d. These will not be active until after verification is complete. "+
+				"Please securely distribute the key shares printed above. When Vault "+
+				"is re-sealed, restarted, or stopped, you must supply at least %d of "+
+				"these keys to unseal it before it can start servicing requests.",
+			status.N,
+			status.T,
+			status.T)))
 		c.UI.Output("")
-		c.UI.Warn(wrapAtLength(fmt.Sprintf(
-			"Again, these key shares are _not_ valid until verification is performed. "+
-				"Do not lose or discard your current key shares until after verification "+
-				"is complete or you will be unable to %s Vault. If you cancel the "+
-				"rekey process or seal Vault before verification is complete the new "+
-				"shares will be discarded and the current shares will remain valid.", warningText)))
+		c.UI.Warn(wrapAtLength(
+			"Again, these key shares are _not_ valid until verification is performed. " +
+				"Do not lose or discard your current key shares until after verification " +
+				"is complete or you will be unable to unseal Vault. If you cancel the " +
+				"rekey process or seal Vault before verification is complete the new " +
+				"shares will be discarded and the current shares will remain valid.",
+		))
 		c.UI.Output("")
 		c.UI.Warn(wrapAtLength(
 			"The current verification status, including initial nonce, is shown below.",
diff --git a/command/operator_rekey_test.go b/command/operator_rekey_test.go
index 570cfe447e69e..31617e5ac4bc7 100644
--- a/command/operator_rekey_test.go
+++ b/command/operator_rekey_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !race
 
 package command
@@ -12,8 +9,6 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/hashicorp/vault/sdk/helper/roottoken"
-
 	"github.com/hashicorp/vault/api"
 	"github.com/mitchellh/cli"
 )
@@ -259,83 +254,6 @@ func TestOperatorRekeyCommand_Run(t *testing.T) {
 		}
 	})
 
-	t.Run("provide_arg_recovery_keys", func(t *testing.T) {
-		t.Parallel()
-
-		client, keys, closer := testVaultServerAutoUnseal(t)
-		defer closer()
-
-		// Initialize a rekey
-		status, err := client.Sys().RekeyRecoveryKeyInit(&api.RekeyInitRequest{
-			SecretShares:    1,
-			SecretThreshold: 1,
-		})
-		if err != nil {
-			t.Fatal(err)
-		}
-		nonce := status.Nonce
-
-		// Supply the first n-1 recovery keys
-		for _, key := range keys[:len(keys)-1] {
-			ui, cmd := testOperatorRekeyCommand(t)
-			cmd.client = client
-
-			code := cmd.Run([]string{
-				"-nonce", nonce,
-				"-target", "recovery",
-				key,
-			})
-			if exp := 0; code != exp {
-				t.Errorf("expected %d to be %d: %s", code, exp, ui.ErrorWriter.String())
-			}
-		}
-
-		ui, cmd := testOperatorRekeyCommand(t)
-		cmd.client = client
-
-		code := cmd.Run([]string{
-			"-nonce", nonce,
-			"-target", "recovery",
-			keys[len(keys)-1], // the last recovery key
-		})
-		if exp := 0; code != exp {
-			t.Errorf("expected %d to be %d: %s", code, exp, ui.ErrorWriter.String())
-		}
-
-		re := regexp.MustCompile(`Key 1: (.+)`)
-		output := ui.OutputWriter.String()
-		match := re.FindAllStringSubmatch(output, -1)
-		if len(match) < 1 || len(match[0]) < 2 {
-			t.Fatalf("bad match: %#v", match)
-		}
-		recoveryKey := match[0][1]
-
-		if strings.Contains(strings.ToLower(output), "unseal key") {
-			t.Fatalf(`output %s shouldn't contain "unseal key"`, output)
-		}
-
-		// verify that we can perform operations with the recovery key
-		// below we generate a root token using the recovery key
-		rootStatus, err := client.Sys().GenerateRootStatus()
-		if err != nil {
-			t.Fatal(err)
-		}
-		otp, err := roottoken.GenerateOTP(rootStatus.OTPLength)
-		if err != nil {
-			t.Fatal(err)
-		}
-		genRoot, err := client.Sys().GenerateRootInit(otp, "")
-		if err != nil {
-			t.Fatal(err)
-		}
-		r, err := client.Sys().GenerateRootUpdate(recoveryKey, genRoot.Nonce)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if !r.Complete {
-			t.Fatal("expected root update to be complete")
-		}
-	})
 	t.Run("provide_arg", func(t *testing.T) {
 		t.Parallel()
 
@@ -474,94 +392,6 @@ func TestOperatorRekeyCommand_Run(t *testing.T) {
 		}
 	})
 
-	t.Run("provide_stdin_recovery_keys", func(t *testing.T) {
-		t.Parallel()
-
-		client, keys, closer := testVaultServerAutoUnseal(t)
-		defer closer()
-
-		// Initialize a rekey
-		status, err := client.Sys().RekeyRecoveryKeyInit(&api.RekeyInitRequest{
-			SecretShares:    1,
-			SecretThreshold: 1,
-		})
-		if err != nil {
-			t.Fatal(err)
-		}
-		nonce := status.Nonce
-		for _, key := range keys[:len(keys)-1] {
-			stdinR, stdinW := io.Pipe()
-			go func() {
-				_, _ = stdinW.Write([]byte(key))
-				_ = stdinW.Close()
-			}()
-
-			ui, cmd := testOperatorRekeyCommand(t)
-			cmd.client = client
-			cmd.testStdin = stdinR
-
-			code := cmd.Run([]string{
-				"-target", "recovery",
-				"-nonce", nonce,
-				"-",
-			})
-			if exp := 0; code != exp {
-				t.Errorf("expected %d to be %d: %s", code, exp, ui.ErrorWriter.String())
-			}
-		}
-
-		stdinR, stdinW := io.Pipe()
-		go func() {
-			_, _ = stdinW.Write([]byte(keys[len(keys)-1])) // the last recovery key
-			_ = stdinW.Close()
-		}()
-
-		ui, cmd := testOperatorRekeyCommand(t)
-		cmd.client = client
-		cmd.testStdin = stdinR
-
-		code := cmd.Run([]string{
-			"-nonce", nonce,
-			"-target", "recovery",
-			"-",
-		})
-		if exp := 0; code != exp {
-			t.Errorf("expected %d to be %d: %s", code, exp, ui.ErrorWriter.String())
-		}
-
-		re := regexp.MustCompile(`Key 1: (.+)`)
-		output := ui.OutputWriter.String()
-		match := re.FindAllStringSubmatch(output, -1)
-		if len(match) < 1 || len(match[0]) < 2 {
-			t.Fatalf("bad match: %#v", match)
-		}
-		recoveryKey := match[0][1]
-
-		if strings.Contains(strings.ToLower(output), "unseal key") {
-			t.Fatalf(`output %s shouldn't contain "unseal key"`, output)
-		}
-		// verify that we can perform operations with the recovery key
-		// below we generate a root token using the recovery key
-		rootStatus, err := client.Sys().GenerateRootStatus()
-		if err != nil {
-			t.Fatal(err)
-		}
-		otp, err := roottoken.GenerateOTP(rootStatus.OTPLength)
-		if err != nil {
-			t.Fatal(err)
-		}
-		genRoot, err := client.Sys().GenerateRootInit(otp, "")
-		if err != nil {
-			t.Fatal(err)
-		}
-		r, err := client.Sys().GenerateRootUpdate(recoveryKey, genRoot.Nonce)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if !r.Complete {
-			t.Fatal("expected root update to be complete")
-		}
-	})
 	t.Run("backup", func(t *testing.T) {
 		t.Parallel()
 
diff --git a/command/operator_seal.go b/command/operator_seal.go
index f52665fd08b10..369ec3215d66f 100644
--- a/command/operator_seal.go
+++ b/command/operator_seal.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/operator_seal_test.go b/command/operator_seal_test.go
index 43e150f7e37fc..86722d2e84dd7 100644
--- a/command/operator_seal_test.go
+++ b/command/operator_seal_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/operator_step_down.go b/command/operator_step_down.go
index bfa2d893f18fb..dea2c97178da8 100644
--- a/command/operator_step_down.go
+++ b/command/operator_step_down.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/operator_step_down_test.go b/command/operator_step_down_test.go
index fbe07794d2971..93117a856b665 100644
--- a/command/operator_step_down_test.go
+++ b/command/operator_step_down_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/operator_unseal.go b/command/operator_unseal.go
index 32d9140900a51..8cdd06d384087 100644
--- a/command/operator_unseal.go
+++ b/command/operator_unseal.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/operator_unseal_test.go b/command/operator_unseal_test.go
index cb4d19603ba4f..867b17a03c01e 100644
--- a/command/operator_unseal_test.go
+++ b/command/operator_unseal_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/operator_usage.go b/command/operator_usage.go
index 8db538a298c54..1df42091ccc31 100644
--- a/command/operator_usage.go
+++ b/command/operator_usage.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/patch.go b/command/patch.go
deleted file mode 100644
index 9a4cd58862875..0000000000000
--- a/command/patch.go
+++ /dev/null
@@ -1,138 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package command
-
-import (
-	"context"
-	"fmt"
-	"io"
-	"os"
-	"strings"
-
-	"github.com/mitchellh/cli"
-	"github.com/posener/complete"
-)
-
-var (
-	_ cli.Command             = (*PatchCommand)(nil)
-	_ cli.CommandAutocomplete = (*PatchCommand)(nil)
-)
-
-// PatchCommand is a Command that puts data into the Vault.
-type PatchCommand struct {
-	*BaseCommand
-
-	flagForce bool
-
-	testStdin io.Reader // for tests
-}
-
-func (c *PatchCommand) Synopsis() string {
-	return "Patch data, configuration, and secrets"
-}
-
-func (c *PatchCommand) Help() string {
-	helpText := `
-Usage: vault patch [options] PATH [DATA K=V...]
-
-  Patches data in Vault at the given path. The data can be credentials, secrets,
-  configuration, or arbitrary data. The specific behavior of this command is
-  determined at the thing mounted at the path.
-
-  Data is specified as "key=value" pairs. If the value begins with an "@", then
-  it is loaded from a file. If the value is "-", Vault will read the value from
-  stdin.
-
-  Unlike write, patch will only modify specified fields.
-
-  Persist data in the generic secrets engine without modifying any other fields:
-
-      $ vault patch pki/roles/example allow_localhost=false
-
-  The data can also be consumed from a file on disk by prefixing with the "@"
-  symbol. For example:
-
-      $ vault patch pki/roles/example @role.json
-
-  Or it can be read from stdin using the "-" symbol:
-
-      $ echo "example.com" | vault patch pki/roles/example allowed_domains=-
-
-  For a full list of examples and paths, please see the documentation that
-  corresponds to the secret engines in use.
-
-` + c.Flags().Help()
-
-	return strings.TrimSpace(helpText)
-}
-
-func (c *PatchCommand) Flags() *FlagSets {
-	set := c.flagSet(FlagSetHTTP | FlagSetOutputField | FlagSetOutputFormat)
-	f := set.NewFlagSet("Command Options")
-
-	f.BoolVar(&BoolVar{
-		Name:       "force",
-		Aliases:    []string{"f"},
-		Target:     &c.flagForce,
-		Default:    false,
-		EnvVar:     "",
-		Completion: complete.PredictNothing,
-		Usage: "Allow the operation to continue with no key=value pairs. This " +
-			"allows writing to keys that do not need or expect data.",
-	})
-
-	return set
-}
-
-func (c *PatchCommand) AutocompleteArgs() complete.Predictor {
-	// Return an anything predictor here. Without a way to access help
-	// information, we don't know what paths we could patch.
-	return complete.PredictAnything
-}
-
-func (c *PatchCommand) AutocompleteFlags() complete.Flags {
-	return c.Flags().Completions()
-}
-
-func (c *PatchCommand) Run(args []string) int {
-	f := c.Flags()
-
-	if err := f.Parse(args); err != nil {
-		c.UI.Error(err.Error())
-		return 1
-	}
-
-	args = f.Args()
-	switch {
-	case len(args) < 1:
-		c.UI.Error(fmt.Sprintf("Not enough arguments (expected 1, got %d)", len(args)))
-		return 1
-	case len(args) == 1 && !c.flagForce:
-		c.UI.Error("Must supply data or use -force")
-		return 1
-	}
-
-	// Pull our fake stdin if needed
-	stdin := (io.Reader)(os.Stdin)
-	if c.testStdin != nil {
-		stdin = c.testStdin
-	}
-
-	path := sanitizePath(args[0])
-
-	data, err := parseArgsData(stdin, args[1:])
-	if err != nil {
-		c.UI.Error(fmt.Sprintf("Failed to parse K=V data: %s", err))
-		return 1
-	}
-
-	client, err := c.Client()
-	if err != nil {
-		c.UI.Error(err.Error())
-		return 2
-	}
-
-	secret, err := client.Logical().JSONMergePatch(context.Background(), path, data)
-	return handleWriteSecretOutput(c.BaseCommand, path, secret, err)
-}
diff --git a/command/patch_test.go b/command/patch_test.go
deleted file mode 100644
index 410e644656184..0000000000000
--- a/command/patch_test.go
+++ /dev/null
@@ -1,205 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package command
-
-import (
-	"io"
-	"strings"
-	"testing"
-
-	"github.com/hashicorp/vault/api"
-	"github.com/mitchellh/cli"
-)
-
-func testPatchCommand(tb testing.TB) (*cli.MockUi, *PatchCommand) {
-	tb.Helper()
-
-	ui := cli.NewMockUi()
-	return ui, &PatchCommand{
-		BaseCommand: &BaseCommand{
-			UI: ui,
-		},
-	}
-}
-
-func TestPatchCommand_Run(t *testing.T) {
-	t.Parallel()
-
-	cases := []struct {
-		name string
-		args []string
-		out  string
-		code int
-	}{
-		{
-			"not_enough_args",
-			[]string{},
-			"Not enough arguments",
-			1,
-		},
-		{
-			"empty_kvs",
-			[]string{"secret/write/foo"},
-			"Must supply data or use -force",
-			1,
-		},
-		{
-			"force_kvs",
-			[]string{"-force", "pki/roles/example"},
-			"allow_localhost",
-			0,
-		},
-		{
-			"force_f_kvs",
-			[]string{"-f", "pki/roles/example"},
-			"allow_localhost",
-			0,
-		},
-		{
-			"kvs_no_value",
-			[]string{"pki/roles/example", "foo"},
-			"Failed to parse K=V data",
-			1,
-		},
-		{
-			"single_value",
-			[]string{"pki/roles/example", "allow_localhost=true"},
-			"allow_localhost",
-			0,
-		},
-		{
-			"multi_value",
-			[]string{"pki/roles/example", "allow_localhost=true", "allowed_domains=true"},
-			"allow_localhost",
-			0,
-		},
-	}
-
-	for _, tc := range cases {
-		tc := tc
-
-		t.Run(tc.name, func(t *testing.T) {
-			t.Parallel()
-
-			client, closer := testVaultServer(t)
-			defer closer()
-
-			if err := client.Sys().Mount("pki", &api.MountInput{
-				Type: "pki",
-			}); err != nil {
-				t.Fatalf("pki mount error: %#v", err)
-			}
-
-			if _, err := client.Logical().Write("pki/roles/example", nil); err != nil {
-				t.Fatalf("failed to prime role: %v", err)
-			}
-
-			if _, err := client.Logical().Write("pki/root/generate/internal", map[string]interface{}{
-				"key_type":    "ec",
-				"common_name": "Root X1",
-			}); err != nil {
-				t.Fatalf("failed to prime CA: %v", err)
-			}
-
-			ui, cmd := testPatchCommand(t)
-			cmd.client = client
-
-			code := cmd.Run(tc.args)
-			if code != tc.code {
-				t.Errorf("expected %d to be %d", code, tc.code)
-			}
-
-			combined := ui.OutputWriter.String() + ui.ErrorWriter.String()
-			if !strings.Contains(combined, tc.out) {
-				t.Errorf("expected %q to contain %q", combined, tc.out)
-			}
-		})
-	}
-
-	t.Run("stdin_full", func(t *testing.T) {
-		t.Parallel()
-
-		client, closer := testVaultServer(t)
-		defer closer()
-
-		if err := client.Sys().Mount("pki", &api.MountInput{
-			Type: "pki",
-		}); err != nil {
-			t.Fatalf("pki mount error: %#v", err)
-		}
-
-		if _, err := client.Logical().Write("pki/roles/example", nil); err != nil {
-			t.Fatalf("failed to prime role: %v", err)
-		}
-
-		if _, err := client.Logical().Write("pki/root/generate/internal", map[string]interface{}{
-			"key_type":    "ec",
-			"common_name": "Root X1",
-		}); err != nil {
-			t.Fatalf("failed to prime CA: %v", err)
-		}
-
-		stdinR, stdinW := io.Pipe()
-		go func() {
-			stdinW.Write([]byte(`{"allow_localhost":"false","allow_wildcard_certificates":"false"}`))
-			stdinW.Close()
-		}()
-
-		ui, cmd := testPatchCommand(t)
-		cmd.client = client
-		cmd.testStdin = stdinR
-
-		code := cmd.Run([]string{
-			"pki/roles/example", "-",
-		})
-		if code != 0 {
-			combined := ui.OutputWriter.String() + ui.ErrorWriter.String()
-			t.Fatalf("expected retcode=%d to be 0\nOutput:\n%v", code, combined)
-		}
-
-		secret, err := client.Logical().Read("pki/roles/example")
-		if err != nil {
-			t.Fatal(err)
-		}
-		if secret == nil || secret.Data == nil {
-			t.Fatal("expected secret to have data")
-		}
-		if exp, act := false, secret.Data["allow_localhost"].(bool); exp != act {
-			t.Errorf("expected allowed_localhost=%v to be %v", act, exp)
-		}
-		if exp, act := false, secret.Data["allow_wildcard_certificates"].(bool); exp != act {
-			t.Errorf("expected allow_wildcard_certificates=%v to be %v", act, exp)
-		}
-	})
-
-	t.Run("communication_failure", func(t *testing.T) {
-		t.Parallel()
-
-		client, closer := testVaultServerBad(t)
-		defer closer()
-
-		ui, cmd := testPatchCommand(t)
-		cmd.client = client
-
-		code := cmd.Run([]string{
-			"foo/bar", "a=b",
-		})
-		if exp := 2; code != exp {
-			t.Errorf("expected %d to be %d", code, exp)
-		}
-
-		expected := "Error writing data to foo/bar: "
-		combined := ui.OutputWriter.String() + ui.ErrorWriter.String()
-		if !strings.Contains(combined, expected) {
-			t.Errorf("expected %q to contain %q", combined, expected)
-		}
-	})
-
-	t.Run("no_tabs", func(t *testing.T) {
-		t.Parallel()
-
-		_, cmd := testPatchCommand(t)
-		assertNoTabs(t, cmd)
-	})
-}
diff --git a/command/path_help.go b/command/path_help.go
index 41f3bcee66a6e..1f540a5c6ab00 100644
--- a/command/path_help.go
+++ b/command/path_help.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/path_help_test.go b/command/path_help_test.go
index eaf4fe8a9f239..688bcf09cef3c 100644
--- a/command/path_help_test.go
+++ b/command/path_help_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/path_map_upgrade_api_test.go b/command/path_map_upgrade_api_test.go
new file mode 100644
index 0000000000000..b9e573b2797ea
--- /dev/null
+++ b/command/path_map_upgrade_api_test.go
@@ -0,0 +1,92 @@
+package command
+
+import (
+	"testing"
+
+	"github.com/hashicorp/vault/api"
+	vaulthttp "github.com/hashicorp/vault/http"
+	"github.com/hashicorp/vault/sdk/logical"
+	"github.com/hashicorp/vault/vault"
+
+	credAppId "github.com/hashicorp/vault/builtin/credential/app-id"
+)
+
+func TestPathMap_Upgrade_API(t *testing.T) {
+	var err error
+	coreConfig := &vault.CoreConfig{
+		DisableMlock: true,
+		DisableCache: true,
+		CredentialBackends: map[string]logical.Factory{
+			"app-id": credAppId.Factory,
+		},
+		PendingRemovalMountsAllowed: true,
+	}
+
+	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+	})
+
+	cluster.Start()
+	defer cluster.Cleanup()
+
+	cores := cluster.Cores
+
+	vault.TestWaitActive(t, cores[0].Core)
+
+	client := cores[0].Client
+
+	// Enable the app-id method
+	err = client.Sys().EnableAuthWithOptions("app-id", &api.EnableAuthOptions{
+		Type: "app-id",
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Create an app-id
+	_, err = client.Logical().Write("auth/app-id/map/app-id/test-app-id", map[string]interface{}{
+		"policy": "test-policy",
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Create a user-id
+	_, err = client.Logical().Write("auth/app-id/map/user-id/test-user-id", map[string]interface{}{
+		"value": "test-app-id",
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Perform a login. It should succeed.
+	_, err = client.Logical().Write("auth/app-id/login", map[string]interface{}{
+		"app_id":  "test-app-id",
+		"user_id": "test-user-id",
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// List the hashed app-ids in the storage
+	secret, err := client.Logical().List("auth/app-id/map/app-id")
+	if err != nil {
+		t.Fatal(err)
+	}
+	hashedAppID := secret.Data["keys"].([]interface{})[0].(string)
+
+	// Try reading it. This used to cause an issue which is fixed in [GH-3806].
+	_, err = client.Logical().Read("auth/app-id/map/app-id/" + hashedAppID)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Ensure that there was no issue by performing another login
+	_, err = client.Logical().Write("auth/app-id/login", map[string]interface{}{
+		"app_id":  "test-app-id",
+		"user_id": "test-user-id",
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+}
diff --git a/command/pgp_test.go b/command/pgp_test.go
index f37e488ed6865..8d0b5d6a0474a 100644
--- a/command/pgp_test.go
+++ b/command/pgp_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -16,8 +13,8 @@ import (
 	"github.com/hashicorp/vault/helper/pgpkeys"
 	"github.com/hashicorp/vault/vault"
 
-	"github.com/ProtonMail/go-crypto/openpgp"
-	"github.com/ProtonMail/go-crypto/openpgp/packet"
+	"github.com/keybase/go-crypto/openpgp"
+	"github.com/keybase/go-crypto/openpgp/packet"
 )
 
 func getPubKeyFiles(t *testing.T) (string, []string, error) {
diff --git a/command/pki.go b/command/pki.go
deleted file mode 100644
index 89770fa448516..0000000000000
--- a/command/pki.go
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package command
-
-import (
-	"strings"
-
-	"github.com/mitchellh/cli"
-)
-
-var _ cli.Command = (*PKICommand)(nil)
-
-type PKICommand struct {
-	*BaseCommand
-}
-
-func (c *PKICommand) Synopsis() string {
-	return "Interact with Vault's PKI Secrets Engine"
-}
-
-func (c *PKICommand) Help() string {
-	helpText := `
-Usage: vault pki <subcommand> [options] [args]
-
-  This command has subcommands for interacting with Vault's PKI Secrets
-  Engine. Here are some simple examples, and more detailed examples are
-  available in the subcommands or the documentation.
-
-  Check the health of a PKI mount, to the best of this token's abilities:
-
-      $ vault pki health-check pki
-
-  Please see the individual subcommand help for detailed usage information.
-`
-
-	return strings.TrimSpace(helpText)
-}
-
-func (c *PKICommand) Run(args []string) int {
-	return cli.RunResultHelp
-}
diff --git a/command/pki_health_check.go b/command/pki_health_check.go
deleted file mode 100644
index 188c95c99e93a..0000000000000
--- a/command/pki_health_check.go
+++ /dev/null
@@ -1,384 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package command
-
-import (
-	"encoding/json"
-	"fmt"
-	"os"
-	"strings"
-
-	"github.com/hashicorp/vault/command/healthcheck"
-
-	"github.com/ghodss/yaml"
-	"github.com/mitchellh/cli"
-	"github.com/posener/complete"
-	"github.com/ryanuber/columnize"
-)
-
-const (
-	pkiRetOK int = iota
-	pkiRetUsage
-	pkiRetInformational
-	pkiRetWarning
-	pkiRetCritical
-	pkiRetInvalidVersion
-	pkiRetInsufficientPermissions
-)
-
-var (
-	_ cli.Command             = (*PKIHealthCheckCommand)(nil)
-	_ cli.CommandAutocomplete = (*PKIHealthCheckCommand)(nil)
-
-	// Ensure the above return codes match (outside of OK/Usage) the values in
-	// the healthcheck package.
-	_ = pkiRetInformational == int(healthcheck.ResultInformational)
-	_ = pkiRetWarning == int(healthcheck.ResultWarning)
-	_ = pkiRetCritical == int(healthcheck.ResultCritical)
-	_ = pkiRetInvalidVersion == int(healthcheck.ResultInvalidVersion)
-	_ = pkiRetInsufficientPermissions == int(healthcheck.ResultInsufficientPermissions)
-)
-
-type PKIHealthCheckCommand struct {
-	*BaseCommand
-
-	flagConfig          string
-	flagReturnIndicator string
-	flagDefaultDisabled bool
-	flagList            bool
-}
-
-func (c *PKIHealthCheckCommand) Synopsis() string {
-	return "Check a PKI Secrets Engine mount's health and operational status"
-}
-
-func (c *PKIHealthCheckCommand) Help() string {
-	helpText := `
-Usage: vault pki health-check [options] MOUNT
-
-  Reports status of the specified mount against best practices and pending
-  failures. This is an informative command and not all recommendations will
-  apply to all mounts; consider using a configuration file to tune the
-  executed health checks.
-
-  To check the pki-root mount with default configuration:
-
-      $ vault pki health-check pki-root
-
-  To specify a configuration:
-
-      $ vault pki health-check -health-config=mycorp-root.json /pki-root
-
-  Return codes indicate failure type:
-
-      0 - Everything is good.
-      1 - Usage error (check CLI parameters).
-	  2 - Informational message from a health check.
-	  3 - Warning message from a health check.
-	  4 - Critical message from a health check.
-	  5 - A version mismatch between health check and Vault Server occurred,
-	      preventing one or more health checks from being run.
-      6 - A permission denied message was returned from Vault Server for
-	      one or more health checks.
-
-For more detailed information, refer to the online documentation about the
-vault pki health-check command.
-
-` + c.Flags().Help()
-
-	return strings.TrimSpace(helpText)
-}
-
-func (c *PKIHealthCheckCommand) Flags() *FlagSets {
-	set := c.flagSet(FlagSetHTTP | FlagSetOutputFormat)
-	f := set.NewFlagSet("Command Options")
-
-	f.StringVar(&StringVar{
-		Name:    "health-config",
-		Target:  &c.flagConfig,
-		Default: "",
-		EnvVar:  "",
-		Usage:   "Path to JSON configuration file to modify health check execution and parameters.",
-	})
-
-	f.StringVar(&StringVar{
-		Name:       "return-indicator",
-		Target:     &c.flagReturnIndicator,
-		Default:    "default",
-		EnvVar:     "",
-		Completion: complete.PredictSet("default", "informational", "warning", "critical", "permission"),
-		Usage: `Behavior of the return value:
- - permission, for exiting with a non-zero code when the tool lacks
-               permissions or has a version mismatch with the server;
- - critical, for exiting with a non-zero code when a check returns a
-             critical status in addition to the above;
- - warning, for exiting with a non-zero status when a check returns a
-            warning status in addition to the above;
- - informational, for exiting with a non-zero status when a check returns
-                  an informational status in addition to the above;
- - default, for the default behavior based on severity of message and
-            only returning a zero exit status when all checks have passed
-			and no execution errors have occurred.
-		`,
-	})
-
-	f.BoolVar(&BoolVar{
-		Name:    "default-disabled",
-		Target:  &c.flagDefaultDisabled,
-		Default: false,
-		EnvVar:  "",
-		Usage: `When specified, results in all health checks being disabled by
-default unless enabled by the configuration file explicitly.`,
-	})
-
-	f.BoolVar(&BoolVar{
-		Name:    "list",
-		Target:  &c.flagList,
-		Default: false,
-		EnvVar:  "",
-		Usage: `When specified, no health checks are run, but all known health
-checks are printed.`,
-	})
-
-	return set
-}
-
-func (c *PKIHealthCheckCommand) isValidRetIndicator() bool {
-	switch c.flagReturnIndicator {
-	case "", "default", "informational", "warning", "critical", "permission":
-		return true
-	default:
-		return false
-	}
-}
-
-func (c *PKIHealthCheckCommand) AutocompleteArgs() complete.Predictor {
-	// Return an anything predictor here, similar to `vault write`. We
-	// don't know what values are valid for the mount path.
-	return complete.PredictAnything
-}
-
-func (c *PKIHealthCheckCommand) AutocompleteFlags() complete.Flags {
-	return c.Flags().Completions()
-}
-
-func (c *PKIHealthCheckCommand) Run(args []string) int {
-	// Parse and validate the arguments.
-	f := c.Flags()
-
-	if err := f.Parse(args); err != nil {
-		c.UI.Error(err.Error())
-		return pkiRetUsage
-	}
-
-	args = f.Args()
-	if !c.flagList && len(args) < 1 {
-		c.UI.Error("Not enough arguments (expected mount path, got nothing)")
-		return pkiRetUsage
-	} else if !c.flagList && len(args) > 1 {
-		c.UI.Error(fmt.Sprintf("Too many arguments (expected only mount path, got %d arguments)", len(args)))
-		for _, arg := range args {
-			if strings.HasPrefix(arg, "-") {
-				c.UI.Warn(fmt.Sprintf("Options (%v) must be specified before positional arguments (%v)", arg, args[0]))
-				break
-			}
-		}
-		return pkiRetUsage
-	}
-
-	if !c.isValidRetIndicator() {
-		c.UI.Error(fmt.Sprintf("Invalid flag -return-indicator=%v; known options are default, informational, warning, critical, and permission", c.flagReturnIndicator))
-		return pkiRetUsage
-	}
-
-	// Setup the client and the executor.
-	client, err := c.Client()
-	if err != nil {
-		c.UI.Error(err.Error())
-		return pkiRetUsage
-	}
-
-	// When listing is enabled, we lack an argument here, but do not contact
-	// the server at all, so we're safe to use a hard-coded default here.
-	pkiPath := "<mount>"
-	if len(args) == 1 {
-		pkiPath = args[0]
-	}
-
-	mount := sanitizePath(pkiPath)
-	executor := healthcheck.NewExecutor(client, mount)
-	executor.AddCheck(healthcheck.NewCAValidityPeriodCheck())
-	executor.AddCheck(healthcheck.NewCRLValidityPeriodCheck())
-	executor.AddCheck(healthcheck.NewHardwareBackedRootCheck())
-	executor.AddCheck(healthcheck.NewRootIssuedLeavesCheck())
-	executor.AddCheck(healthcheck.NewRoleAllowsLocalhostCheck())
-	executor.AddCheck(healthcheck.NewRoleAllowsGlobWildcardsCheck())
-	executor.AddCheck(healthcheck.NewRoleNoStoreFalseCheck())
-	executor.AddCheck(healthcheck.NewAuditVisibilityCheck())
-	executor.AddCheck(healthcheck.NewAllowIfModifiedSinceCheck())
-	executor.AddCheck(healthcheck.NewEnableAutoTidyCheck())
-	executor.AddCheck(healthcheck.NewTidyLastRunCheck())
-	executor.AddCheck(healthcheck.NewTooManyCertsCheck())
-	executor.AddCheck(healthcheck.NewEnableAcmeIssuance())
-	executor.AddCheck(healthcheck.NewAllowAcmeHeaders())
-	if c.flagDefaultDisabled {
-		executor.DefaultEnabled = false
-	}
-
-	// Handle listing, if necessary.
-	if c.flagList {
-		uiFormat := Format(c.UI)
-		if uiFormat == "yaml" {
-			c.UI.Error("YAML output format is not supported by the --list command")
-			return pkiRetUsage
-		}
-
-		if uiFormat != "json" {
-			c.UI.Output("Default health check config:")
-		}
-		config := map[string]map[string]interface{}{}
-		for _, checker := range executor.Checkers {
-			config[checker.Name()] = checker.DefaultConfig()
-		}
-
-		marshaled, err := json.MarshalIndent(config, "", "  ")
-		if err != nil {
-			c.UI.Error(fmt.Sprintf("Failed to marshal default config for check: %v", err))
-			return pkiRetUsage
-		}
-
-		c.UI.Output(string(marshaled))
-		return pkiRetOK
-	}
-
-	// Handle config merging.
-	external_config := map[string]interface{}{}
-	if c.flagConfig != "" {
-		contents, err := os.Open(c.flagConfig)
-		if err != nil {
-			c.UI.Error(fmt.Sprintf("Failed to read configuration file %v: %v", c.flagConfig, err))
-			return pkiRetUsage
-		}
-
-		decoder := json.NewDecoder(contents)
-		decoder.UseNumber() // Use json.Number instead of float64 values as we are decoding to an interface{}.
-
-		if err := decoder.Decode(&external_config); err != nil {
-			c.UI.Error(fmt.Sprintf("Failed to parse configuration file %v: %v", c.flagConfig, err))
-			return pkiRetUsage
-		}
-	}
-
-	if err := executor.BuildConfig(external_config); err != nil {
-		c.UI.Error(fmt.Sprintf("Failed to build health check configuration: %v", err))
-		return pkiRetUsage
-	}
-
-	// Run the health checks.
-	results, err := executor.Execute()
-	if err != nil {
-		c.UI.Error(fmt.Sprintf("Failed to run health check: %v", err))
-		return pkiRetUsage
-	}
-
-	// Display the output.
-	if err := c.outputResults(executor, results); err != nil {
-		c.UI.Error(fmt.Sprintf("Failed to render results for display: %v", err))
-	}
-
-	// Select an appropriate return code.
-	return c.selectRetCode(results)
-}
-
-func (c *PKIHealthCheckCommand) outputResults(e *healthcheck.Executor, results map[string][]*healthcheck.Result) error {
-	switch Format(c.UI) {
-	case "", "table":
-		return c.outputResultsTable(e, results)
-	case "json":
-		return c.outputResultsJSON(results)
-	case "yaml":
-		return c.outputResultsYAML(results)
-	default:
-		return fmt.Errorf("unknown output format: %v", Format(c.UI))
-	}
-}
-
-func (c *PKIHealthCheckCommand) outputResultsTable(e *healthcheck.Executor, results map[string][]*healthcheck.Result) error {
-	// Iterate in checker order to ensure stable output.
-	for _, checker := range e.Checkers {
-		if !checker.IsEnabled() {
-			continue
-		}
-
-		scanner := checker.Name()
-		findings := results[scanner]
-
-		c.UI.Output(scanner)
-		c.UI.Output(strings.Repeat("-", len(scanner)))
-		data := []string{"status" + hopeDelim + "endpoint" + hopeDelim + "message"}
-		for _, finding := range findings {
-			row := []string{
-				finding.StatusDisplay,
-				finding.Endpoint,
-				finding.Message,
-			}
-			data = append(data, strings.Join(row, hopeDelim))
-		}
-
-		c.UI.Output(tableOutput(data, &columnize.Config{
-			Delim: hopeDelim,
-		}))
-		c.UI.Output("\n")
-	}
-
-	return nil
-}
-
-func (c *PKIHealthCheckCommand) outputResultsJSON(results map[string][]*healthcheck.Result) error {
-	bytes, err := json.MarshalIndent(results, "", "  ")
-	if err != nil {
-		return err
-	}
-
-	c.UI.Output(string(bytes))
-	return nil
-}
-
-func (c *PKIHealthCheckCommand) outputResultsYAML(results map[string][]*healthcheck.Result) error {
-	bytes, err := yaml.Marshal(results)
-	if err != nil {
-		return err
-	}
-
-	c.UI.Output(string(bytes))
-	return nil
-}
-
-func (c *PKIHealthCheckCommand) selectRetCode(results map[string][]*healthcheck.Result) int {
-	var highestResult healthcheck.ResultStatus = healthcheck.ResultNotApplicable
-	for _, findings := range results {
-		for _, finding := range findings {
-			if finding.Status > highestResult {
-				highestResult = finding.Status
-			}
-		}
-	}
-
-	cutOff := healthcheck.ResultInformational
-	switch c.flagReturnIndicator {
-	case "", "default", "informational":
-	case "permission":
-		cutOff = healthcheck.ResultInvalidVersion
-	case "critical":
-		cutOff = healthcheck.ResultCritical
-	case "warning":
-		cutOff = healthcheck.ResultWarning
-	}
-
-	if highestResult >= cutOff {
-		return int(highestResult)
-	}
-
-	return pkiRetOK
-}
diff --git a/command/pki_health_check_test.go b/command/pki_health_check_test.go
deleted file mode 100644
index 93d231593ee78..0000000000000
--- a/command/pki_health_check_test.go
+++ /dev/null
@@ -1,694 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package command
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"net/url"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/command/healthcheck"
-
-	"github.com/mitchellh/cli"
-	"github.com/stretchr/testify/require"
-)
-
-func TestPKIHC_AllGood(t *testing.T) {
-	t.Parallel()
-
-	client, closer := testVaultServer(t)
-	defer closer()
-
-	if err := client.Sys().Mount("pki", &api.MountInput{
-		Type: "pki",
-		Config: api.MountConfigInput{
-			AuditNonHMACRequestKeys:   healthcheck.VisibleReqParams,
-			AuditNonHMACResponseKeys:  healthcheck.VisibleRespParams,
-			PassthroughRequestHeaders: []string{"If-Modified-Since"},
-			AllowedResponseHeaders:    []string{"Last-Modified", "Replay-Nonce", "Link", "Location"},
-			MaxLeaseTTL:               "36500d",
-		},
-	}); err != nil {
-		t.Fatalf("pki mount error: %#v", err)
-	}
-
-	if resp, err := client.Logical().Write("pki/root/generate/internal", map[string]interface{}{
-		"key_type":    "ec",
-		"common_name": "Root X1",
-		"ttl":         "3650d",
-	}); err != nil || resp == nil {
-		t.Fatalf("failed to prime CA: %v", err)
-	}
-
-	if _, err := client.Logical().Read("pki/crl/rotate"); err != nil {
-		t.Fatalf("failed to rotate CRLs: %v", err)
-	}
-
-	if _, err := client.Logical().Write("pki/roles/testing", map[string]interface{}{
-		"allow_any_name": true,
-		"no_store":       true,
-	}); err != nil {
-		t.Fatalf("failed to write role: %v", err)
-	}
-
-	if _, err := client.Logical().Write("pki/config/auto-tidy", map[string]interface{}{
-		"enabled":         true,
-		"tidy_cert_store": true,
-	}); err != nil {
-		t.Fatalf("failed to write auto-tidy config: %v", err)
-	}
-
-	if _, err := client.Logical().Write("pki/tidy", map[string]interface{}{
-		"tidy_cert_store": true,
-	}); err != nil {
-		t.Fatalf("failed to run tidy: %v", err)
-	}
-
-	path, err := url.Parse(client.Address())
-	require.NoError(t, err, "failed parsing client address")
-
-	if _, err := client.Logical().Write("pki/config/cluster", map[string]interface{}{
-		"path": path.JoinPath("/v1/", "pki/").String(),
-	}); err != nil {
-		t.Fatalf("failed to update local cluster: %v", err)
-	}
-
-	if _, err := client.Logical().Write("pki/config/acme", map[string]interface{}{
-		"enabled": "true",
-	}); err != nil {
-		t.Fatalf("failed to update acme config: %v", err)
-	}
-
-	_, _, results := execPKIHC(t, client, true)
-
-	validateExpectedPKIHC(t, expectedAllGood, results)
-}
-
-func TestPKIHC_AllBad(t *testing.T) {
-	t.Parallel()
-
-	client, closer := testVaultServer(t)
-	defer closer()
-
-	if err := client.Sys().Mount("pki", &api.MountInput{
-		Type: "pki",
-	}); err != nil {
-		t.Fatalf("pki mount error: %#v", err)
-	}
-
-	if resp, err := client.Logical().Write("pki/root/generate/internal", map[string]interface{}{
-		"key_type":    "ec",
-		"common_name": "Root X1",
-		"ttl":         "35d",
-	}); err != nil || resp == nil {
-		t.Fatalf("failed to prime CA: %v", err)
-	}
-
-	if _, err := client.Logical().Write("pki/config/crl", map[string]interface{}{
-		"expiry": "5s",
-	}); err != nil {
-		t.Fatalf("failed to issue leaf cert: %v", err)
-	}
-
-	if _, err := client.Logical().Read("pki/crl/rotate"); err != nil {
-		t.Fatalf("failed to rotate CRLs: %v", err)
-	}
-
-	time.Sleep(5 * time.Second)
-
-	if _, err := client.Logical().Write("pki/roles/testing", map[string]interface{}{
-		"allow_localhost":             true,
-		"allowed_domains":             "*.example.com",
-		"allow_glob_domains":          true,
-		"allow_wildcard_certificates": true,
-		"no_store":                    false,
-		"key_type":                    "ec",
-		"ttl":                         "30d",
-	}); err != nil {
-		t.Fatalf("failed to write role: %v", err)
-	}
-
-	if _, err := client.Logical().Write("pki/issue/testing", map[string]interface{}{
-		"common_name": "something.example.com",
-	}); err != nil {
-		t.Fatalf("failed to issue leaf cert: %v", err)
-	}
-
-	if _, err := client.Logical().Write("pki/config/auto-tidy", map[string]interface{}{
-		"enabled":         false,
-		"tidy_cert_store": false,
-	}); err != nil {
-		t.Fatalf("failed to write auto-tidy config: %v", err)
-	}
-
-	_, _, results := execPKIHC(t, client, true)
-
-	validateExpectedPKIHC(t, expectedAllBad, results)
-}
-
-func TestPKIHC_OnlyIssuer(t *testing.T) {
-	t.Parallel()
-
-	client, closer := testVaultServer(t)
-	defer closer()
-
-	if err := client.Sys().Mount("pki", &api.MountInput{
-		Type: "pki",
-	}); err != nil {
-		t.Fatalf("pki mount error: %#v", err)
-	}
-
-	if resp, err := client.Logical().Write("pki/root/generate/internal", map[string]interface{}{
-		"key_type":    "ec",
-		"common_name": "Root X1",
-		"ttl":         "35d",
-	}); err != nil || resp == nil {
-		t.Fatalf("failed to prime CA: %v", err)
-	}
-
-	_, _, results := execPKIHC(t, client, true)
-	validateExpectedPKIHC(t, expectedEmptyWithIssuer, results)
-}
-
-func TestPKIHC_NoMount(t *testing.T) {
-	t.Parallel()
-
-	client, closer := testVaultServer(t)
-	defer closer()
-
-	code, message, _ := execPKIHC(t, client, false)
-	if code != 1 {
-		t.Fatalf("Expected return code 1 from invocation on non-existent mount, got %v\nOutput: %v", code, message)
-	}
-
-	if !strings.Contains(message, "route entry not found") {
-		t.Fatalf("Expected failure to talk about missing route entry, got exit code %v\nOutput: %v", code, message)
-	}
-}
-
-func TestPKIHC_ExpectedEmptyMount(t *testing.T) {
-	t.Parallel()
-
-	client, closer := testVaultServer(t)
-	defer closer()
-
-	if err := client.Sys().Mount("pki", &api.MountInput{
-		Type: "pki",
-	}); err != nil {
-		t.Fatalf("pki mount error: %#v", err)
-	}
-
-	code, message, _ := execPKIHC(t, client, false)
-	if code != 1 {
-		t.Fatalf("Expected return code 1 from invocation on empty mount, got %v\nOutput: %v", code, message)
-	}
-
-	if !strings.Contains(message, "lacks any configured issuers,") {
-		t.Fatalf("Expected failure to talk about no issuers, got exit code %v\nOutput: %v", code, message)
-	}
-}
-
-func TestPKIHC_NoPerm(t *testing.T) {
-	t.Parallel()
-
-	client, closer := testVaultServer(t)
-	defer closer()
-
-	if err := client.Sys().Mount("pki", &api.MountInput{
-		Type: "pki",
-	}); err != nil {
-		t.Fatalf("pki mount error: %#v", err)
-	}
-
-	if resp, err := client.Logical().Write("pki/root/generate/internal", map[string]interface{}{
-		"key_type":    "ec",
-		"common_name": "Root X1",
-		"ttl":         "35d",
-	}); err != nil || resp == nil {
-		t.Fatalf("failed to prime CA: %v", err)
-	}
-
-	if _, err := client.Logical().Write("pki/config/crl", map[string]interface{}{
-		"expiry": "5s",
-	}); err != nil {
-		t.Fatalf("failed to issue leaf cert: %v", err)
-	}
-
-	if _, err := client.Logical().Read("pki/crl/rotate"); err != nil {
-		t.Fatalf("failed to rotate CRLs: %v", err)
-	}
-
-	time.Sleep(5 * time.Second)
-
-	if _, err := client.Logical().Write("pki/roles/testing", map[string]interface{}{
-		"allow_localhost":             true,
-		"allowed_domains":             "*.example.com",
-		"allow_glob_domains":          true,
-		"allow_wildcard_certificates": true,
-		"no_store":                    false,
-		"key_type":                    "ec",
-		"ttl":                         "30d",
-	}); err != nil {
-		t.Fatalf("failed to write role: %v", err)
-	}
-
-	if _, err := client.Logical().Write("pki/issue/testing", map[string]interface{}{
-		"common_name": "something.example.com",
-	}); err != nil {
-		t.Fatalf("failed to issue leaf cert: %v", err)
-	}
-
-	if _, err := client.Logical().Write("pki/config/auto-tidy", map[string]interface{}{
-		"enabled":         false,
-		"tidy_cert_store": false,
-	}); err != nil {
-		t.Fatalf("failed to write auto-tidy config: %v", err)
-	}
-
-	// Remove client token.
-	client.ClearToken()
-
-	_, _, results := execPKIHC(t, client, true)
-	validateExpectedPKIHC(t, expectedNoPerm, results)
-}
-
-func testPKIHealthCheckCommand(tb testing.TB) (*cli.MockUi, *PKIHealthCheckCommand) {
-	tb.Helper()
-
-	ui := cli.NewMockUi()
-	return ui, &PKIHealthCheckCommand{
-		BaseCommand: &BaseCommand{
-			UI: ui,
-		},
-	}
-}
-
-func execPKIHC(t *testing.T, client *api.Client, ok bool) (int, string, map[string][]map[string]interface{}) {
-	t.Helper()
-
-	stdout := bytes.NewBuffer(nil)
-	stderr := bytes.NewBuffer(nil)
-	runOpts := &RunOptions{
-		Stdout: stdout,
-		Stderr: stderr,
-		Client: client,
-	}
-
-	code := RunCustom([]string{"pki", "health-check", "-format=json", "pki"}, runOpts)
-	combined := stdout.String() + stderr.String()
-
-	var results map[string][]map[string]interface{}
-	if err := json.Unmarshal([]byte(combined), &results); err != nil {
-		if ok {
-			t.Fatalf("failed to decode json (ret %v): %v\njson:\n%v", code, err, combined)
-		}
-	}
-
-	t.Log(combined)
-
-	return code, combined, results
-}
-
-func validateExpectedPKIHC(t *testing.T, expected, results map[string][]map[string]interface{}) {
-	t.Helper()
-
-	for test, subtest := range expected {
-		actual, ok := results[test]
-		require.True(t, ok, fmt.Sprintf("expected top-level test %v to be present", test))
-
-		if subtest == nil {
-			continue
-		}
-
-		require.NotNil(t, actual, fmt.Sprintf("expected top-level test %v to be non-empty; wanted wireframe format %v", test, subtest))
-		require.Equal(t, len(subtest), len(actual), fmt.Sprintf("top-level test %v has different number of results %v in wireframe, %v in test output\nwireframe: %v\noutput: %v\n", test, len(subtest), len(actual), subtest, actual))
-
-		for index, subset := range subtest {
-			for key, value := range subset {
-				a_value, present := actual[index][key]
-				require.True(t, present)
-				if value != nil {
-					require.Equal(t, value, a_value, fmt.Sprintf("in test: %v / result %v - when validating key %v\nWanted: %v\nGot: %v", test, index, key, subset, actual[index]))
-				}
-			}
-		}
-	}
-
-	for name := range results {
-		if _, present := expected[name]; !present {
-			t.Fatalf("got unexpected health check: %v\n%v", name, results[name])
-		}
-	}
-}
-
-var expectedAllGood = map[string][]map[string]interface{}{
-	"ca_validity_period": {
-		{
-			"status": "ok",
-		},
-	},
-	"crl_validity_period": {
-		{
-			"status": "ok",
-		},
-		{
-			"status": "ok",
-		},
-	},
-	"allow_acme_headers": {
-		{
-			"status": "ok",
-		},
-	},
-	"allow_if_modified_since": {
-		{
-			"status": "ok",
-		},
-	},
-	"audit_visibility": {
-		{
-			"status": "ok",
-		},
-	},
-	"enable_acme_issuance": {
-		{
-			"status": "ok",
-		},
-	},
-	"enable_auto_tidy": {
-		{
-			"status": "ok",
-		},
-	},
-	"role_allows_glob_wildcards": {
-		{
-			"status": "ok",
-		},
-	},
-	"role_allows_localhost": {
-		{
-			"status": "ok",
-		},
-	},
-	"role_no_store_false": {
-		{
-			"status": "ok",
-		},
-	},
-	"root_issued_leaves": {
-		{
-			"status": "ok",
-		},
-	},
-	"tidy_last_run": {
-		{
-			"status": "ok",
-		},
-	},
-	"too_many_certs": {
-		{
-			"status": "ok",
-		},
-	},
-}
-
-var expectedAllBad = map[string][]map[string]interface{}{
-	"ca_validity_period": {
-		{
-			"status": "critical",
-		},
-	},
-	"crl_validity_period": {
-		{
-			"status": "critical",
-		},
-		{
-			"status": "critical",
-		},
-	},
-	"allow_acme_headers": {
-		{
-			"status": "not_applicable",
-		},
-	},
-	"allow_if_modified_since": {
-		{
-			"status": "informational",
-		},
-	},
-	"audit_visibility": {
-		{
-			"status": "informational",
-		},
-		{
-			"status": "informational",
-		},
-		{
-			"status": "informational",
-		},
-		{
-			"status": "informational",
-		},
-		{
-			"status": "informational",
-		},
-		{
-			"status": "informational",
-		},
-		{
-			"status": "informational",
-		},
-		{
-			"status": "informational",
-		},
-		{
-			"status": "informational",
-		},
-		{
-			"status": "informational",
-		},
-		{
-			"status": "informational",
-		},
-		{
-			"status": "informational",
-		},
-		{
-			"status": "informational",
-		},
-		{
-			"status": "informational",
-		},
-		{
-			"status": "informational",
-		},
-		{
-			"status": "informational",
-		},
-		{
-			"status": "informational",
-		},
-		{
-			"status": "informational",
-		},
-		{
-			"status": "informational",
-		},
-		{
-			"status": "informational",
-		},
-		{
-			"status": "informational",
-		},
-		{
-			"status": "informational",
-		},
-		{
-			"status": "informational",
-		},
-		{
-			"status": "informational",
-		},
-		{
-			"status": "informational",
-		},
-		{
-			"status": "informational",
-		},
-		{
-			"status": "informational",
-		},
-		{
-			"status": "informational",
-		},
-		{
-			"status": "informational",
-		},
-		{
-			"status": "informational",
-		},
-	},
-	"enable_acme_issuance": {
-		{
-			"status": "not_applicable",
-		},
-	},
-	"enable_auto_tidy": {
-		{
-			"status": "informational",
-		},
-	},
-	"role_allows_glob_wildcards": {
-		{
-			"status": "warning",
-		},
-	},
-	"role_allows_localhost": {
-		{
-			"status": "warning",
-		},
-	},
-	"role_no_store_false": {
-		{
-			"status": "warning",
-		},
-	},
-	"root_issued_leaves": {
-		{
-			"status": "warning",
-		},
-	},
-	"tidy_last_run": {
-		{
-			"status": "critical",
-		},
-	},
-	"too_many_certs": {
-		{
-			"status": "ok",
-		},
-	},
-}
-
-var expectedEmptyWithIssuer = map[string][]map[string]interface{}{
-	"ca_validity_period": {
-		{
-			"status": "critical",
-		},
-	},
-	"crl_validity_period": {
-		{
-			"status": "ok",
-		},
-		{
-			"status": "ok",
-		},
-	},
-	"allow_acme_headers": {
-		{
-			"status": "not_applicable",
-		},
-	},
-	"allow_if_modified_since": nil,
-	"audit_visibility":        nil,
-	"enable_acme_issuance": {
-		{
-			"status": "not_applicable",
-		},
-	},
-	"enable_auto_tidy": {
-		{
-			"status": "informational",
-		},
-	},
-	"role_allows_glob_wildcards": nil,
-	"role_allows_localhost":      nil,
-	"role_no_store_false":        nil,
-	"root_issued_leaves": {
-		{
-			"status": "ok",
-		},
-	},
-	"tidy_last_run": {
-		{
-			"status": "critical",
-		},
-	},
-	"too_many_certs": {
-		{
-			"status": "ok",
-		},
-	},
-}
-
-var expectedNoPerm = map[string][]map[string]interface{}{
-	"ca_validity_period": {
-		{
-			"status": "critical",
-		},
-	},
-	"crl_validity_period": {
-		{
-			"status": "insufficient_permissions",
-		},
-		{
-			"status": "critical",
-		},
-		{
-			"status": "critical",
-		},
-	},
-	"allow_acme_headers": {
-		{
-			"status": "insufficient_permissions",
-		},
-	},
-	"allow_if_modified_since": nil,
-	"audit_visibility":        nil,
-	"enable_acme_issuance": {
-		{
-			"status": "insufficient_permissions",
-		},
-	},
-	"enable_auto_tidy": {
-		{
-			"status": "insufficient_permissions",
-		},
-	},
-	"role_allows_glob_wildcards": {
-		{
-			"status": "insufficient_permissions",
-		},
-	},
-	"role_allows_localhost": {
-		{
-			"status": "insufficient_permissions",
-		},
-	},
-	"role_no_store_false": {
-		{
-			"status": "insufficient_permissions",
-		},
-	},
-	"root_issued_leaves": {
-		{
-			"status": "insufficient_permissions",
-		},
-	},
-	"tidy_last_run": {
-		{
-			"status": "insufficient_permissions",
-		},
-	},
-	"too_many_certs": {
-		{
-			"status": "insufficient_permissions",
-		},
-	},
-}
diff --git a/command/pki_issue_intermediate.go b/command/pki_issue_intermediate.go
deleted file mode 100644
index fe16fdaaca91a..0000000000000
--- a/command/pki_issue_intermediate.go
+++ /dev/null
@@ -1,367 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package command
-
-import (
-	"context"
-	"fmt"
-	"io"
-	"os"
-	paths "path"
-	"strings"
-
-	"github.com/hashicorp/vault/api"
-	"github.com/posener/complete"
-)
-
-type PKIIssueCACommand struct {
-	*BaseCommand
-
-	flagConfig          string
-	flagReturnIndicator string
-	flagDefaultDisabled bool
-	flagList            bool
-
-	flagKeyStorageSource string
-	flagNewIssuerName    string
-}
-
-func (c *PKIIssueCACommand) Synopsis() string {
-	return "Given a parent certificate, and a list of generation parameters, creates an issuer on a specified mount"
-}
-
-func (c *PKIIssueCACommand) Help() string {
-	helpText := `
-Usage: vault pki issue PARENT CHILD_MOUNT options
-
-PARENT is the fully qualified path of the Certificate Authority in vault which will issue the new intermediate certificate.
-
-CHILD_MOUNT is the path of the mount in vault where the new issuer is saved.
-
-options are the superset of the options passed to generate/intermediate and sign-intermediate commands.  At least one option must be set.
-
-This command creates a intermediate certificate authority certificate signed by the parent in the CHILD_MOUNT.
-
-` + c.Flags().Help()
-	return strings.TrimSpace(helpText)
-}
-
-func (c *PKIIssueCACommand) Flags() *FlagSets {
-	set := c.flagSet(FlagSetHTTP | FlagSetOutputFormat)
-	f := set.NewFlagSet("Command Options")
-
-	f.StringVar(&StringVar{
-		Name:       "type",
-		Target:     &c.flagKeyStorageSource,
-		Default:    "internal",
-		EnvVar:     "",
-		Usage:      `Options are "existing" - to use an existing key inside vault, "internal" - to generate a new key inside vault, or "kms" - to link to an external key.  Exported keys are not available through this API.`,
-		Completion: complete.PredictSet("internal", "existing", "kms"),
-	})
-
-	f.StringVar(&StringVar{
-		Name:    "issuer_name",
-		Target:  &c.flagNewIssuerName,
-		Default: "",
-		EnvVar:  "",
-		Usage:   `If present, the newly created issuer will be given this name.`,
-	})
-
-	return set
-}
-
-func (c *PKIIssueCACommand) Run(args []string) int {
-	// Parse Args
-	f := c.Flags()
-	if err := f.Parse(args); err != nil {
-		c.UI.Error(err.Error())
-		return 1
-	}
-	args = f.Args()
-
-	if len(args) < 3 {
-		c.UI.Error("Not enough arguments expected parent issuer and child-mount location and some key_value argument")
-		return 1
-	}
-
-	stdin := (io.Reader)(os.Stdin)
-	data, err := parseArgsData(stdin, args[2:])
-	if err != nil {
-		c.UI.Error(fmt.Sprintf("Failed to parse K=V data: %s", err))
-		return 1
-	}
-
-	parentMountIssuer := sanitizePath(args[0]) // /pki/issuer/default
-
-	intermediateMount := sanitizePath(args[1])
-
-	return pkiIssue(c.BaseCommand, parentMountIssuer, intermediateMount, c.flagNewIssuerName, c.flagKeyStorageSource, data)
-}
-
-func pkiIssue(c *BaseCommand, parentMountIssuer string, intermediateMount string, flagNewIssuerName string, flagKeyStorageSource string, data map[string]interface{}) int {
-	// Check We Have a Client
-	client, err := c.Client()
-	if err != nil {
-		c.UI.Error(fmt.Sprintf("Failed to obtain client: %v", err))
-		return 1
-	}
-
-	// Sanity Check the Parent Issuer
-	if !strings.Contains(parentMountIssuer, "/issuer/") {
-		c.UI.Error(fmt.Sprintf("Parent Issuer %v is Not a PKI Issuer Path of the format /mount/issuer/issuer-ref", parentMountIssuer))
-		return 1
-	}
-	_, err = readIssuer(client, parentMountIssuer)
-	if err != nil {
-		c.UI.Error(fmt.Sprintf("Unable to access parent issuer %v: %v", parentMountIssuer, err))
-		return 1
-	}
-
-	// Set-up Failure State (Immediately Before First Write Call)
-	failureState := inCaseOfFailure{
-		intermediateMount: intermediateMount,
-		parentMount:       strings.Split(parentMountIssuer, "/issuer/")[0],
-		parentIssuer:      parentMountIssuer,
-		newName:           flagNewIssuerName,
-	}
-
-	// Generate Certificate Signing Request
-	csrResp, err := client.Logical().Write(intermediateMount+"/intermediate/generate/"+flagKeyStorageSource, data)
-	if err != nil {
-		if strings.Contains(err.Error(), "no handler for route") { // Mount Given Does Not Exist
-			c.UI.Error(fmt.Sprintf("Given Intermediate Mount %v Does Not Exist: %v", intermediateMount, err))
-		} else if strings.Contains(err.Error(), "unsupported path") { // Expected if Not a PKI Mount
-			c.UI.Error(fmt.Sprintf("Given Intermeidate Mount %v Is Not a PKI Mount: %v", intermediateMount, err))
-		} else {
-			c.UI.Error(fmt.Sprintf("Failled to Generate Intermediate CSR on %v: %v", intermediateMount, err))
-		}
-		return 1
-	}
-	// Parse CSR Response, Also Verifies that this is a PKI Mount
-	// (e.g. calling the above call on cubbyhole/ won't return an error response)
-	csrPemRaw, present := csrResp.Data["csr"]
-	if !present {
-		c.UI.Error(fmt.Sprintf("Failed to Generate Intermediate CSR on %v, got response: %v", intermediateMount, csrResp))
-		return 1
-	}
-	keyIdRaw, present := csrResp.Data["key_id"]
-	if !present && flagKeyStorageSource == "internal" {
-		c.UI.Error(fmt.Sprintf("Failed to Generate Key on %v, got response: %v", intermediateMount, csrResp))
-		return 1
-	}
-
-	// If that all Parses, then we've successfully generated a CSR!  Save It (and the Key-ID)
-	failureState.csrGenerated = true
-	if flagKeyStorageSource == "internal" {
-		failureState.createdKeyId = keyIdRaw.(string)
-	}
-	csr := csrPemRaw.(string)
-	failureState.csr = csr
-	data["csr"] = csr
-
-	// Next, Sign the CSR
-	rootResp, err := client.Logical().Write(parentMountIssuer+"/sign-intermediate", data)
-	if err != nil {
-		c.UI.Error(failureState.generateFailureMessage())
-		c.UI.Error(fmt.Sprintf("Error Signing Intermiate On %v", err))
-		return 1
-	}
-	// Success!  Save Our Progress (and Parse the Response)
-	failureState.csrSigned = true
-	serialNumber := rootResp.Data["serial_number"].(string)
-	failureState.certSerialNumber = serialNumber
-
-	caChain := rootResp.Data["ca_chain"].([]interface{})
-	caChainPemBundle := ""
-	for _, cert := range caChain {
-		caChainPemBundle += cert.(string) + "\n"
-	}
-	failureState.caChain = caChainPemBundle
-
-	// Next Import Certificate
-	certificate := rootResp.Data["certificate"].(string)
-	issuerId, err := importIssuerWithName(client, intermediateMount, certificate, flagNewIssuerName)
-	failureState.certIssuerId = issuerId
-	if err != nil {
-		if strings.Contains(err.Error(), "error naming issuer") {
-			failureState.certImported = true
-			c.UI.Error(failureState.generateFailureMessage())
-			c.UI.Error(fmt.Sprintf("Error Naming Newly Imported Issuer: %v", err))
-			return 1
-		} else {
-			c.UI.Error(failureState.generateFailureMessage())
-			c.UI.Error(fmt.Sprintf("Error Importing Into %v Newly Created Issuer %v: %v", intermediateMount, certificate, err))
-			return 1
-		}
-	}
-	failureState.certImported = true
-
-	// Then Import Issuing Certificate
-	issuingCa := rootResp.Data["issuing_ca"].(string)
-	_, parentIssuerName := paths.Split(parentMountIssuer)
-	_, err = importIssuerWithName(client, intermediateMount, issuingCa, parentIssuerName)
-	if err != nil {
-		if strings.Contains(err.Error(), "error naming issuer") {
-			c.UI.Warn(fmt.Sprintf("Unable to Set Name on Parent Cert from %v Imported Into %v with serial %v, err: %v", parentIssuerName, intermediateMount, serialNumber, err))
-		} else {
-			c.UI.Error(failureState.generateFailureMessage())
-			c.UI.Error(fmt.Sprintf("Error Importing Into %v Newly Created Issuer %v: %v", intermediateMount, certificate, err))
-			return 1
-		}
-	}
-
-	// Finally Import CA_Chain (just in case there's more information)
-	if len(caChain) > 2 { // We've already imported parent cert and newly issued cert above
-		importData := map[string]interface{}{
-			"pem_bundle": caChainPemBundle,
-		}
-		_, err := client.Logical().Write(intermediateMount+"/issuers/import/cert", importData)
-		if err != nil {
-			c.UI.Error(failureState.generateFailureMessage())
-			c.UI.Error(fmt.Sprintf("Error Importing CaChain into %v: %v", intermediateMount, err))
-			return 1
-		}
-	}
-	failureState.caChainImported = true
-
-	// Finally we read our newly issued certificate in order to tell our caller about it
-	readAndOutputNewCertificate(client, intermediateMount, issuerId, c)
-
-	return 0
-}
-
-func readAndOutputNewCertificate(client *api.Client, intermediateMount string, issuerId string, c *BaseCommand) {
-	resp, err := client.Logical().Read(sanitizePath(intermediateMount + "/issuer/" + issuerId))
-	if err != nil || resp == nil {
-		c.UI.Error(fmt.Sprintf("Error Reading Fully Imported Certificate from %v : %v",
-			intermediateMount+"/issuer/"+issuerId, err))
-		return
-	}
-
-	OutputSecret(c.UI, resp)
-}
-
-func importIssuerWithName(client *api.Client, mount string, bundle string, name string) (issuerUUID string, err error) {
-	importData := map[string]interface{}{
-		"pem_bundle": bundle,
-	}
-	writeResp, err := client.Logical().Write(mount+"/issuers/import/cert", importData)
-	if err != nil {
-		return "", err
-	}
-	mapping := writeResp.Data["mapping"].(map[string]interface{})
-	if len(mapping) > 1 {
-		return "", fmt.Errorf("multiple issuers returned, while expected one, got %v", writeResp)
-	}
-	for issuerId := range mapping {
-		issuerUUID = issuerId
-	}
-	if name != "" && name != "default" {
-		nameReq := map[string]interface{}{
-			"issuer_name": name,
-		}
-		ctx := context.Background()
-		_, err = client.Logical().JSONMergePatch(ctx, mount+"/issuer/"+issuerUUID, nameReq)
-		if err != nil {
-			return issuerUUID, fmt.Errorf("error naming issuer %v to %v: %v", issuerUUID, name, err)
-		}
-	}
-	return issuerUUID, nil
-}
-
-type inCaseOfFailure struct {
-	csrGenerated    bool
-	csrSigned       bool
-	certImported    bool
-	certNamed       bool
-	caChainImported bool
-
-	intermediateMount string
-	createdKeyId      string
-	csr               string
-	caChain           string
-	parentMount       string
-	parentIssuer      string
-	certSerialNumber  string
-	certIssuerId      string
-	newName           string
-}
-
-func (state inCaseOfFailure) generateFailureMessage() string {
-	message := "A failure has occurred"
-
-	if state.csrGenerated {
-		message += fmt.Sprintf(" after \n a Certificate Signing Request was successfully generated on mount %v", state.intermediateMount)
-	}
-	if state.csrSigned {
-		message += fmt.Sprintf(" and after \n that Certificate Signing Request was successfully signed by mount %v", state.parentMount)
-	}
-	if state.certImported {
-		message += fmt.Sprintf(" and after \n the signed certificate was reimported into mount %v , with issuerID %v", state.intermediateMount, state.certIssuerId)
-	}
-
-	if state.csrGenerated {
-		message += "\n\nTO CONTINUE: \n" + state.toContinue()
-	}
-	if state.csrGenerated && !state.certImported {
-		message += "\n\nTO ABORT: \n" + state.toAbort()
-	}
-
-	message += "\n"
-
-	return message
-}
-
-func (state inCaseOfFailure) toContinue() string {
-	message := ""
-	if !state.csrSigned {
-		message += fmt.Sprintf("You can continue to work with this Certificate Signing Request CSR PEM, by saving"+
-			" it as `pki_int.csr`: %v \n Then call `vault write %v/sign-intermediate csr=@pki_int.csr ...` adding the "+
-			"same key-value arguements as to `pki issue` (except key_type and issuer_name) to generate the certificate "+
-			"and ca_chain", state.csr, state.parentIssuer)
-	}
-	if !state.certImported {
-		if state.caChain != "" {
-			message += fmt.Sprintf("The certificate chain, signed by %v, for this new certificate is: %v", state.parentIssuer, state.caChain)
-		}
-		message += fmt.Sprintf("You can continue to work with this Certificate (and chain) by saving it as "+
-			"chain.pem and importing it as `vault write %v/issuers/import/cert pem_bundle=@chain.pem`",
-			state.intermediateMount)
-	}
-	if !state.certNamed {
-		issuerId := state.certIssuerId
-		if issuerId == "" {
-			message += fmt.Sprintf("The issuer_id is returned as the key in a key_value map from importing the " +
-				"certificate chain.")
-			issuerId = "<issuer-uuid>"
-		}
-		message += fmt.Sprintf("You can name the newly imported issuer by calling `vault patch %v/issuer/%v "+
-			"issuer_name=%v`", state.intermediateMount, issuerId, state.newName)
-	}
-	return message
-}
-
-func (state inCaseOfFailure) toAbort() string {
-	if !state.csrGenerated || (!state.csrSigned && state.createdKeyId == "") {
-		return "No state was created by running this command.  Try rerunning this command after resolving the error."
-	}
-	message := ""
-	if state.csrGenerated && state.createdKeyId != "" {
-		message += fmt.Sprintf(" A key, with key ID %v was created on mount %v as part of this command."+
-			"  If you do not with to use this key and corresponding CSR/cert, you can delete that information by calling"+
-			" `vault delete %v/key/%v`", state.createdKeyId, state.intermediateMount, state.intermediateMount, state.createdKeyId)
-	}
-	if state.csrSigned {
-		message += fmt.Sprintf("A certificate with serial number %v was signed by mount %v as part of this command."+
-			" If you do not want to use this certificate, consider revoking it by calling `vault write %v/revoke/%v`",
-			state.certSerialNumber, state.parentMount, state.parentMount, state.certSerialNumber)
-	}
-	//if state.certImported {
-	//	message += fmt.Sprintf("An issuer with UUID %v was created on mount %v as part of this command.  " +
-	//		"If you do not wish to use this issuer, consider deleting it by calling `vault delete %v/issuer/%v`",
-	//		state.certIssuerId, state.intermediateMount, state.intermediateMount, state.certIssuerId)
-	//}
-
-	return message
-}
diff --git a/command/pki_issue_intermediate_test.go b/command/pki_issue_intermediate_test.go
deleted file mode 100644
index 58f9e6271105d..0000000000000
--- a/command/pki_issue_intermediate_test.go
+++ /dev/null
@@ -1,208 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package command
-
-import (
-	"bytes"
-	"encoding/json"
-	"testing"
-
-	"github.com/hashicorp/vault/api"
-)
-
-func TestPKIIssueIntermediate(t *testing.T) {
-	t.Parallel()
-
-	client, closer := testVaultServer(t)
-	defer closer()
-
-	// Relationship Map to Create
-	//          pki-root			| pki-newroot | pki-empty
-	// RootX1    RootX2    RootX4     RootX3
-	//   |								 |
-	// ----------------------------------------------
-	//   v								 v
-	// IntX1					  	   IntX2       pki-int
-	//   |								 |
-	//   v								 v
-	// IntX3 (-----------------------) IntX3
-	//
-	// Here X1,X2 have the same name (same mount)
-	// RootX4 uses the same key as RootX1 (but a different common_name/subject)
-	// RootX3 has the same name, and is on a different mount
-	// RootX1 has issued IntX1; RootX3 has issued IntX2
-	createComplicatedIssuerSetUpWithIssueIntermediate(t, client)
-
-	runPkiVerifySignTests(t, client)
-
-	runPkiListIntermediateTests(t, client)
-}
-
-func createComplicatedIssuerSetUpWithIssueIntermediate(t *testing.T, client *api.Client) {
-	// Relationship Map to Create
-	//          pki-root			| pki-newroot  | pki-empty
-	// RootX1    RootX2    RootX4     RootX3
-	//   |								 |
-	// ----------------------------------------------
-	//   v								 v
-	// IntX1					  	   IntX2       pki-int
-	//   |								 |
-	//   v								 v
-	// IntX3 (-----------------------) IntX3
-	//
-	// Here X1,X2 have the same name (same mount)
-	// RootX4 uses the same key as RootX1 (but a different common_name/subject)
-	// RootX3 has the same name, and is on a different mount
-	// RootX1 has issued IntX1; RootX3 has issued IntX2
-
-	if err := client.Sys().Mount("pki-root", &api.MountInput{
-		Type: "pki",
-		Config: api.MountConfigInput{
-			MaxLeaseTTL: "36500d",
-		},
-	}); err != nil {
-		t.Fatalf("pki mount error: %#v", err)
-	}
-
-	if err := client.Sys().Mount("pki-newroot", &api.MountInput{
-		Type: "pki",
-		Config: api.MountConfigInput{
-			MaxLeaseTTL: "36500d",
-		},
-	}); err != nil {
-		t.Fatalf("pki mount error: %#v", err)
-	}
-
-	if err := client.Sys().Mount("pki-int", &api.MountInput{
-		Type: "pki",
-		Config: api.MountConfigInput{
-			MaxLeaseTTL: "36500d",
-		},
-	}); err != nil {
-		t.Fatalf("pki mount error: %#v", err)
-	}
-
-	// Used to check handling empty list responses: Not Used for Any Issuers / Certificates
-	if err := client.Sys().Mount("pki-empty", &api.MountInput{
-		Type:   "pki",
-		Config: api.MountConfigInput{},
-	}); err != nil {
-		t.Fatalf("pki mount error: %#v", err)
-	}
-
-	resp, err := client.Logical().Write("pki-root/root/generate/internal", map[string]interface{}{
-		"key_type":    "ec",
-		"common_name": "Root X",
-		"ttl":         "3650d",
-		"issuer_name": "rootX1",
-		"key_name":    "rootX1",
-	})
-	if err != nil || resp == nil {
-		t.Fatalf("failed to prime CA: %v", err)
-	}
-
-	resp, err = client.Logical().Write("pki-root/root/generate/internal", map[string]interface{}{
-		"key_type":    "ec",
-		"common_name": "Root X",
-		"ttl":         "3650d",
-		"issuer_name": "rootX2",
-	})
-	if err != nil || resp == nil {
-		t.Fatalf("failed to prime CA: %v", err)
-	}
-
-	if resp, err := client.Logical().Write("pki-newroot/root/generate/internal", map[string]interface{}{
-		"key_type":    "ec",
-		"common_name": "Root X",
-		"ttl":         "3650d",
-		"issuer_name": "rootX3",
-	}); err != nil || resp == nil {
-		t.Fatalf("failed to prime CA: %v", err)
-	}
-
-	if resp, err := client.Logical().Write("pki-root/root/generate/existing", map[string]interface{}{
-		"common_name": "Root X4",
-		"ttl":         "3650d",
-		"issuer_name": "rootX4",
-		"key_ref":     "rootX1",
-	}); err != nil || resp == nil {
-		t.Fatalf("failed to prime CA: %v", err)
-	}
-
-	// Next we create the Intermediates Using the Issue Intermediate Command
-	stdout := bytes.NewBuffer(nil)
-	stderr := bytes.NewBuffer(nil)
-	runOpts := &RunOptions{
-		Stdout: stdout,
-		Stderr: stderr,
-		Client: client,
-	}
-
-	// Intermediate X1
-	intX1CallArgs := []string{
-		"pki", "issue", "-format=json", "-issuer_name=intX1",
-		"pki-root/issuer/rootX1",
-		"pki-int/",
-		"key_type=rsa",
-		"common_name=Int X1",
-		"ttl=3650d",
-	}
-	codeOut := RunCustom(intX1CallArgs, runOpts)
-	if codeOut != 0 {
-		t.Fatalf("error issuing intermediate X1, code: %d \n stdout: %v \n stderr: %v", codeOut, stdout, stderr)
-	}
-
-	// Intermediate X2
-	intX2CallArgs := []string{
-		"pki", "issue", "-format=json", "-issuer_name=intX2",
-		"pki-newroot/issuer/rootX3",
-		"pki-int/",
-		"key_type=ec",
-		"common_name=Int X2",
-		"ttl=3650d",
-	}
-	codeOut = RunCustom(intX2CallArgs, runOpts)
-	if codeOut != 0 {
-		t.Fatalf("error issuing intermediate X2, code: %d \n stdout: %v \n stderr: %v", codeOut, stdout, stderr)
-	}
-
-	// Intermediate X3
-	// Clear Buffers so that we can unmarshall json of just this call
-	stdout = bytes.NewBuffer(nil)
-	stderr = bytes.NewBuffer(nil)
-	runOpts = &RunOptions{
-		Stdout: stdout,
-		Stderr: stderr,
-		Client: client,
-	}
-	intX3OriginalCallArgs := []string{
-		"pki", "issue", "-format=json", "-issuer_name=intX3",
-		"pki-int/issuer/intX1",
-		"pki-int/",
-		"key_type=rsa",
-		"common_name=Int X3",
-		"ttl=3650d",
-	}
-	codeOut = RunCustom(intX3OriginalCallArgs, runOpts)
-	if codeOut != 0 {
-		t.Fatalf("error issuing intermediate X3, code: %d \n stdout: %v \n stderr: %v", codeOut, stdout, stderr)
-	}
-	var intX3Resp map[string]interface{}
-	json.Unmarshal(stdout.Bytes(), &intX3Resp)
-	intX3Data := intX3Resp["data"].(map[string]interface{})
-	keyId := intX3Data["key_id"].(string)
-
-	intX3AdaptedCallArgs := []string{
-		"pki", "issue", "-format=json", "-issuer_name=intX3also", "-type=existing",
-		"pki-int/issuer/intX2",
-		"pki-int/",
-		"key_ref=" + keyId,
-		"common_name=Int X3",
-		"ttl=3650d",
-	}
-	codeOut = RunCustom(intX3AdaptedCallArgs, runOpts)
-	if codeOut != 0 {
-		t.Fatalf("error issuing intermediate X3also, code: %d \n stdout: %v \n stderr: %v", codeOut, stdout, stderr)
-	}
-}
diff --git a/command/pki_list_intermediate.go b/command/pki_list_intermediate.go
deleted file mode 100644
index c62c580806919..0000000000000
--- a/command/pki_list_intermediate.go
+++ /dev/null
@@ -1,304 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package command
-
-import (
-	"encoding/json"
-	"fmt"
-	"strconv"
-	"strings"
-
-	"github.com/hashicorp/vault/api"
-
-	"github.com/ghodss/yaml"
-	"github.com/ryanuber/columnize"
-)
-
-type PKIListIntermediateCommand struct {
-	*BaseCommand
-
-	flagConfig          string
-	flagReturnIndicator string
-	flagDefaultDisabled bool
-	flagList            bool
-
-	flagUseNames bool
-
-	flagSignatureMatch    bool
-	flagIndirectSignMatch bool
-	flagKeyIdMatch        bool
-	flagSubjectMatch      bool
-	flagPathMatch         bool
-}
-
-func (c *PKIListIntermediateCommand) Synopsis() string {
-	return "Determine which of a list of certificates, were issued by a given parent certificate"
-}
-
-func (c *PKIListIntermediateCommand) Help() string {
-	helpText := `
-Usage: vault pki list-intermediates PARENT [CHILD] [CHILD] [CHILD] ...
-
-  Lists the set of intermediate CAs issued by this parent issuer.
-
-  PARENT is the certificate that might be the issuer that everything should
-  be verified against.
-
-  CHILD is an optional list of paths to certificates to be compared to the
-  PARENT, or pki mounts to look for certificates on. If CHILD is omitted
-  entirely, the list will be constructed from all accessible pki mounts.
-
-  This returns a list of issuing certificates, and whether they are a match.
-  By default, the type of match required is whether the PARENT has the
-  expected subject, key_id, and could have (directly) signed this issuer. 
-  The match criteria can be updated by changed the corresponding flag.
-
-` + c.Flags().Help()
-	return strings.TrimSpace(helpText)
-}
-
-func (c *PKIListIntermediateCommand) Flags() *FlagSets {
-	set := c.flagSet(FlagSetHTTP | FlagSetOutputFormat)
-	f := set.NewFlagSet("Command Options")
-
-	f.BoolVar(&BoolVar{
-		Name:    "subject_match",
-		Target:  &c.flagSubjectMatch,
-		Default: true,
-		EnvVar:  "",
-		Usage:   `Whether the subject name of the potential parent cert matches the issuer name of the child cert.`,
-	})
-
-	f.BoolVar(&BoolVar{
-		Name:    "key_id_match",
-		Target:  &c.flagKeyIdMatch,
-		Default: true,
-		EnvVar:  "",
-		Usage:   `Whether the subject key id (SKID) of the potential parent cert matches the authority key id (AKID) of the child cert.`,
-	})
-
-	f.BoolVar(&BoolVar{
-		Name:    "path_match",
-		Target:  &c.flagPathMatch,
-		Default: false,
-		EnvVar:  "",
-		Usage:   `Whether the potential parent appears in the certificate chain field (ca_chain) of the issued cert.`,
-	})
-
-	f.BoolVar(&BoolVar{
-		Name:    "direct_sign",
-		Target:  &c.flagSignatureMatch,
-		Default: true,
-		EnvVar:  "",
-		Usage:   `Whether the key of the potential parent directly signed this issued certificate.`,
-	})
-
-	f.BoolVar(&BoolVar{
-		Name:    "indirect_sign",
-		Target:  &c.flagIndirectSignMatch,
-		Default: true,
-		EnvVar:  "",
-		Usage:   `Whether trusting the parent certificate is sufficient to trust the child certificate.`,
-	})
-
-	f.BoolVar(&BoolVar{
-		Name:    "use_names",
-		Target:  &c.flagUseNames,
-		Default: false,
-		EnvVar:  "",
-		Usage:   `Whether the list of issuers returned is referred to by name (when it exists) rather than by uuid.`,
-	})
-
-	return set
-}
-
-func (c *PKIListIntermediateCommand) Run(args []string) int {
-	f := c.Flags()
-	if err := f.Parse(args); err != nil {
-		c.UI.Error(err.Error())
-		return 1
-	}
-
-	args = f.Args()
-
-	if len(args) < 1 {
-		c.UI.Error("Not enough arguments (expected potential parent, got nothing)")
-		return 1
-	} else if len(args) > 2 {
-		for _, arg := range args {
-			if strings.HasPrefix(arg, "-") {
-				c.UI.Warn(fmt.Sprintf("Options (%v) must be specified before positional arguments (%v)", arg, args[0]))
-				break
-			}
-		}
-	}
-
-	client, err := c.Client()
-	if err != nil {
-		c.UI.Error(fmt.Sprintf("Failed to obtain client: %s", err))
-		return 1
-	}
-
-	issuer := sanitizePath(args[0])
-	var issued []string
-	if len(args) > 1 {
-		for _, arg := range args[1:] {
-			cleanPath := sanitizePath(arg)
-			// Arg Might be a Fully Qualified Path
-			if strings.Contains(cleanPath, "/issuer/") ||
-				strings.Contains(cleanPath, "/certs/") ||
-				strings.Contains(cleanPath, "/revoked/") {
-				issued = append(issued, cleanPath)
-			} else { // Or Arg Might be a Mount
-				mountCaList, err := c.getIssuerListFromMount(client, arg)
-				if err != nil {
-					c.UI.Error(err.Error())
-					return 1
-				}
-				issued = append(issued, mountCaList...)
-			}
-		}
-	} else {
-		mountListRaw, err := client.Logical().Read("/sys/mounts/")
-		if err != nil {
-			c.UI.Error(fmt.Sprintf("Failed to Read List of Mounts With Potential Issuers: %v", err))
-			return 1
-		}
-		for path, rawValueMap := range mountListRaw.Data {
-			valueMap := rawValueMap.(map[string]interface{})
-			if valueMap["type"].(string) == "pki" {
-				mountCaList, err := c.getIssuerListFromMount(client, sanitizePath(path))
-				if err != nil {
-					c.UI.Error(err.Error())
-					return 1
-				}
-				issued = append(issued, mountCaList...)
-			}
-		}
-	}
-
-	childrenMatches := make(map[string]bool)
-
-	constraintMap := map[string]bool{
-		// This comparison isn't strictly correct, despite a standard ordering these are sets
-		"subject_match":   c.flagSubjectMatch,
-		"path_match":      c.flagPathMatch,
-		"trust_match":     c.flagIndirectSignMatch,
-		"key_id_match":    c.flagKeyIdMatch,
-		"signature_match": c.flagSignatureMatch,
-	}
-
-	issuerResp, err := readIssuer(client, issuer)
-	if err != nil {
-		c.UI.Error(fmt.Sprintf("Failed to read parent issuer on path %s: %s", issuer, err.Error()))
-		return 1
-	}
-
-	for _, child := range issued {
-		path := sanitizePath(child)
-		if path != "" {
-			verifyResults, err := verifySignBetween(client, issuerResp, path)
-			if err != nil {
-				c.UI.Error(fmt.Sprintf("Failed to run verification on path %v: %v", path, err))
-				return 1
-			}
-			childrenMatches[path] = checkIfResultsMatchFilters(verifyResults, constraintMap)
-		}
-	}
-
-	err = c.outputResults(childrenMatches)
-	if err != nil {
-		c.UI.Error(err.Error())
-		return 1
-	}
-
-	return 0
-}
-
-func (c *PKIListIntermediateCommand) getIssuerListFromMount(client *api.Client, mountString string) ([]string, error) {
-	var issuerList []string
-	issuerListEndpoint := sanitizePath(mountString) + "/issuers"
-	rawIssuersResp, err := client.Logical().List(issuerListEndpoint)
-	if err != nil {
-		return issuerList, fmt.Errorf("failed to read list of issuers within mount %v: %v", mountString, err)
-	}
-	if rawIssuersResp == nil { // No Issuers (Empty Mount)
-		return issuerList, nil
-	}
-	issuersMap := rawIssuersResp.Data["keys"]
-	certList := issuersMap.([]interface{})
-	for _, certId := range certList {
-		identifier := certId.(string)
-		if c.flagUseNames {
-			issuerReadResp, err := client.Logical().Read(sanitizePath(mountString) + "/issuer/" + identifier)
-			if err != nil {
-				c.UI.Warn(fmt.Sprintf("Unable to Fetch Issuer to Recover Name at: %v", sanitizePath(mountString)+"/issuer/"+identifier))
-			}
-			if issuerReadResp != nil {
-				issuerName := issuerReadResp.Data["issuer_name"].(string)
-				if issuerName != "" {
-					identifier = issuerName
-				}
-			}
-		}
-		issuerList = append(issuerList, sanitizePath(mountString)+"/issuer/"+identifier)
-	}
-	return issuerList, nil
-}
-
-func checkIfResultsMatchFilters(verifyResults, constraintMap map[string]bool) bool {
-	for key, required := range constraintMap {
-		if required && !verifyResults[key] {
-			return false
-		}
-	}
-	return true
-}
-
-func (c *PKIListIntermediateCommand) outputResults(results map[string]bool) error {
-	switch Format(c.UI) {
-	case "", "table":
-		return c.outputResultsTable(results)
-	case "json":
-		return c.outputResultsJSON(results)
-	case "yaml":
-		return c.outputResultsYAML(results)
-	default:
-		return fmt.Errorf("unknown output format: %v", Format(c.UI))
-	}
-}
-
-func (c *PKIListIntermediateCommand) outputResultsTable(results map[string]bool) error {
-	data := []string{"intermediate" + hopeDelim + "match?"}
-	for field, finding := range results {
-		row := field + hopeDelim + strconv.FormatBool(finding)
-		data = append(data, row)
-	}
-	c.UI.Output(tableOutput(data, &columnize.Config{
-		Delim: hopeDelim,
-	}))
-	c.UI.Output("\n")
-
-	return nil
-}
-
-func (c *PKIListIntermediateCommand) outputResultsJSON(results map[string]bool) error {
-	bytes, err := json.MarshalIndent(results, "", "  ")
-	if err != nil {
-		return err
-	}
-
-	c.UI.Output(string(bytes))
-	return nil
-}
-
-func (c *PKIListIntermediateCommand) outputResultsYAML(results map[string]bool) error {
-	bytes, err := yaml.Marshal(results)
-	if err != nil {
-		return err
-	}
-
-	c.UI.Output(string(bytes))
-	return nil
-}
diff --git a/command/pki_list_intermediate_test.go b/command/pki_list_intermediate_test.go
deleted file mode 100644
index d494c193387ac..0000000000000
--- a/command/pki_list_intermediate_test.go
+++ /dev/null
@@ -1,246 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package command
-
-import (
-	"strings"
-	"testing"
-
-	"github.com/hashicorp/vault/api"
-)
-
-func TestPKIListIntermediate(t *testing.T) {
-	t.Parallel()
-
-	client, closer := testVaultServer(t)
-	defer closer()
-
-	// Relationship Map to Create
-	//          pki-root			| pki-newroot  | pki-empty
-	// RootX1    RootX2    RootX4     RootX3
-	//   |								 |
-	// ----------------------------------------------
-	//   v								 v
-	// IntX1					  	   IntX2       pki-int
-	//   |								 |
-	//   v								 v
-	// IntX3 (-----------------------) IntX3(also)
-	//
-	// Here X1,X2 have the same name (same mount)
-	// RootX4 uses the same key as RootX1 (but a different common_name/subject)
-	// RootX3 has the same name, and is on a different mount
-	// RootX1 has issued IntX1; RootX3 has issued IntX2
-	createComplicatedIssuerSetUp(t, client)
-
-	runPkiListIntermediateTests(t, client)
-}
-
-func runPkiListIntermediateTests(t *testing.T, client *api.Client) {
-	cases := []struct {
-		name               string
-		args               []string
-		expectedMatches    map[string]bool
-		jsonOut            bool
-		shouldError        bool
-		expectErrorCont    string
-		expectErrorNotCont string
-		nonJsonOutputCont  string
-	}{
-		{
-			"rootX1-match-everything-no-constraints",
-			[]string{
-				"pki", "list-intermediates", "-format=json", "-use_names=true",
-				"-subject_match=false", "-key_id_match=false", "-direct_sign=false", "-indirect_sign=false", "-path_match=false",
-				"pki-root/issuer/rootX1",
-			},
-			map[string]bool{
-				"pki-root/issuer/rootX1":    true,
-				"pki-root/issuer/rootX2":    true,
-				"pki-newroot/issuer/rootX3": true,
-				"pki-root/issuer/rootX4":    true,
-				"pki-int/issuer/intX1":      true,
-				"pki-int/issuer/intX2":      true,
-				"pki-int/issuer/intX3":      true,
-				"pki-int/issuer/intX3also":  true,
-				"pki-int/issuer/rootX1":     true,
-				"pki-int/issuer/rootX3":     true,
-			},
-			true,
-			false,
-			"",
-			"",
-			"",
-		},
-		{
-			"rootX1-default-children",
-			[]string{"pki", "list-intermediates", "-format=json", "-use_names=true", "pki-root/issuer/rootX1"},
-			map[string]bool{
-				"pki-root/issuer/rootX1":    true,
-				"pki-root/issuer/rootX2":    false,
-				"pki-newroot/issuer/rootX3": false,
-				"pki-root/issuer/rootX4":    false,
-				"pki-int/issuer/intX1":      true,
-				"pki-int/issuer/intX2":      false,
-				"pki-int/issuer/intX3":      false,
-				"pki-int/issuer/intX3also":  false,
-				"pki-int/issuer/rootX1":     true,
-				"pki-int/issuer/rootX3":     false,
-			},
-			true,
-			false,
-			"",
-			"",
-			"",
-		},
-		{
-			"rootX1-subject-match-only",
-			[]string{
-				"pki", "list-intermediates", "-format=json", "-use_names=true",
-				"-key_id_match=false", "-direct_sign=false", "-indirect_sign=false",
-				"pki-root/issuer/rootX1",
-			},
-			map[string]bool{
-				"pki-root/issuer/rootX1":    true,
-				"pki-root/issuer/rootX2":    true,
-				"pki-newroot/issuer/rootX3": true,
-				"pki-root/issuer/rootX4":    false,
-				"pki-int/issuer/intX1":      true,
-				"pki-int/issuer/intX2":      true,
-				"pki-int/issuer/intX3":      false,
-				"pki-int/issuer/intX3also":  false,
-				"pki-int/issuer/rootX1":     true,
-				"pki-int/issuer/rootX3":     true,
-			},
-			true,
-			false,
-			"",
-			"",
-			"",
-		},
-		{
-			"rootX1-in-path",
-			[]string{
-				"pki", "list-intermediates", "-format=json", "-use_names=true",
-				"-subject_match=false", "-key_id_match=false", "-direct_sign=false", "-indirect_sign=false", "-path_match=true",
-				"pki-root/issuer/rootX1",
-			},
-			map[string]bool{
-				"pki-root/issuer/rootX1":    true,
-				"pki-root/issuer/rootX2":    false,
-				"pki-newroot/issuer/rootX3": false,
-				"pki-root/issuer/rootX4":    false,
-				"pki-int/issuer/intX1":      true,
-				"pki-int/issuer/intX2":      false,
-				"pki-int/issuer/intX3":      true,
-				"pki-int/issuer/intX3also":  false,
-				"pki-int/issuer/rootX1":     true,
-				"pki-int/issuer/rootX3":     false,
-			},
-			true,
-			false,
-			"",
-			"",
-			"",
-		},
-		{
-			"rootX1-only-int-mount",
-			[]string{
-				"pki", "list-intermediates", "-format=json", "-use_names=true",
-				"-subject_match=false", "-key_id_match=false", "-direct_sign=false", "-indirect_sign=false", "-path_match=true",
-				"pki-root/issuer/rootX1", "pki-int/",
-			},
-			map[string]bool{
-				"pki-int/issuer/intX1":     true,
-				"pki-int/issuer/intX2":     false,
-				"pki-int/issuer/intX3":     true,
-				"pki-int/issuer/intX3also": false,
-				"pki-int/issuer/rootX1":    true,
-				"pki-int/issuer/rootX3":    false,
-			},
-			true,
-			false,
-			"",
-			"",
-			"",
-		},
-		{
-			"rootX1-subject-match-root-mounts-only",
-			[]string{
-				"pki", "list-intermediates", "-format=json", "-use_names=true",
-				"-key_id_match=false", "-direct_sign=false", "-indirect_sign=false",
-				"pki-root/issuer/rootX1", "pki-root/", "pki-newroot", "pki-empty",
-			},
-			map[string]bool{
-				"pki-root/issuer/rootX1":    true,
-				"pki-root/issuer/rootX2":    true,
-				"pki-newroot/issuer/rootX3": true,
-				"pki-root/issuer/rootX4":    false,
-			},
-			true,
-			false,
-			"",
-			"",
-			"",
-		},
-		{
-			"rootX1-subject-match-these-certs-only",
-			[]string{
-				"pki", "list-intermediates", "-format=json", "-use_names=true",
-				"-key_id_match=false", "-direct_sign=false", "-indirect_sign=false",
-				"pki-root/issuer/rootX1", "pki-root/issuer/rootX2", "pki-newroot/issuer/rootX3", "pki-root/issuer/rootX4",
-			},
-			map[string]bool{
-				"pki-root/issuer/rootX2":    true,
-				"pki-newroot/issuer/rootX3": true,
-				"pki-root/issuer/rootX4":    false,
-			},
-			true,
-			false,
-			"",
-			"",
-			"",
-		},
-	}
-	for _, testCase := range cases {
-		var errString string
-		var results map[string]interface{}
-		var stdOut string
-
-		if testCase.jsonOut {
-			results, errString = execPKIVerifyJson(t, client, false, testCase.shouldError, testCase.args)
-		} else {
-			stdOut, errString = execPKIVerifyNonJson(t, client, testCase.shouldError, testCase.args)
-		}
-
-		// Verify Error Behavior
-		if testCase.shouldError {
-			if errString == "" {
-				t.Fatalf("Expected error in Testcase %s : no error produced, got results %s", testCase.name, results)
-			}
-			if testCase.expectErrorCont != "" && !strings.Contains(errString, testCase.expectErrorCont) {
-				t.Fatalf("Expected error in Testcase %s to contain %s, but got error %s", testCase.name, testCase.expectErrorCont, errString)
-			}
-			if testCase.expectErrorNotCont != "" && strings.Contains(errString, testCase.expectErrorNotCont) {
-				t.Fatalf("Expected error in Testcase %s to not contain %s, but got error %s", testCase.name, testCase.expectErrorNotCont, errString)
-			}
-		} else {
-			if errString != "" {
-				t.Fatalf("Error in Testcase %s : no error expected, but got error: %s", testCase.name, errString)
-			}
-		}
-
-		// Verify Output
-		if testCase.jsonOut {
-			isMatch, errString := verifyExpectedJson(testCase.expectedMatches, results)
-			if !isMatch {
-				t.Fatalf("Expected Results for Testcase %s, do not match returned results %s", testCase.name, errString)
-			}
-		} else {
-			if !strings.Contains(stdOut, testCase.nonJsonOutputCont) {
-				t.Fatalf("Expected standard output for Testcase %s to contain %s, but got %s", testCase.name, testCase.nonJsonOutputCont, stdOut)
-			}
-		}
-
-	}
-}
diff --git a/command/pki_reissue_intermediate.go b/command/pki_reissue_intermediate.go
deleted file mode 100644
index 852c0c0f1d24b..0000000000000
--- a/command/pki_reissue_intermediate.go
+++ /dev/null
@@ -1,293 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package command
-
-import (
-	"crypto/ecdsa"
-	"crypto/elliptic"
-	"crypto/rsa"
-	"crypto/x509"
-	"encoding/hex"
-	"fmt"
-	"io"
-	"net"
-	"net/url"
-	"os"
-	"strings"
-
-	"github.com/posener/complete"
-)
-
-type PKIReIssueCACommand struct {
-	*BaseCommand
-
-	flagConfig          string
-	flagReturnIndicator string
-	flagDefaultDisabled bool
-	flagList            bool
-
-	flagKeyStorageSource string
-	flagNewIssuerName    string
-}
-
-func (c *PKIReIssueCACommand) Synopsis() string {
-	return "Uses a parent certificate and a template certificate to create a new issuer on a child mount"
-}
-
-func (c *PKIReIssueCACommand) Help() string {
-	helpText := `
-Usage: vault pki reissue PARENT TEMPLATE CHILD_MOUNT options
-`
-	return strings.TrimSpace(helpText)
-}
-
-func (c *PKIReIssueCACommand) Flags() *FlagSets {
-	set := c.flagSet(FlagSetHTTP | FlagSetOutputFormat)
-	f := set.NewFlagSet("Command Options")
-
-	f.StringVar(&StringVar{
-		Name:       "type",
-		Target:     &c.flagKeyStorageSource,
-		Default:    "internal",
-		EnvVar:     "",
-		Usage:      `Options are “existing” - to use an existing key inside vault, “internal” - to generate a new key inside vault, or “kms” - to link to an external key.  Exported keys are not available through this API.`,
-		Completion: complete.PredictSet("internal", "existing", "kms"),
-	})
-
-	f.StringVar(&StringVar{
-		Name:    "issuer_name",
-		Target:  &c.flagNewIssuerName,
-		Default: "",
-		EnvVar:  "",
-		Usage:   `If present, the newly created issuer will be given this name`,
-	})
-
-	return set
-}
-
-func (c *PKIReIssueCACommand) Run(args []string) int {
-	// Parse Args
-	f := c.Flags()
-	if err := f.Parse(args); err != nil {
-		c.UI.Error(err.Error())
-		return 1
-	}
-	args = f.Args()
-
-	if len(args) < 3 {
-		c.UI.Error("Not enough arguments: expected parent issuer and child-mount location and some key_value argument")
-		return 1
-	}
-
-	stdin := (io.Reader)(os.Stdin)
-	userData, err := parseArgsData(stdin, args[3:])
-	if err != nil {
-		c.UI.Error(fmt.Sprintf("Failed to parse K=V data: %s", err))
-		return 1
-	}
-
-	// Check We Have a Client
-	client, err := c.Client()
-	if err != nil {
-		c.UI.Error(fmt.Sprintf("Failed to obtain client: %v", err))
-		return 1
-	}
-
-	parentIssuer := sanitizePath(args[0]) // /pki/issuer/default
-	templateIssuer := sanitizePath(args[1])
-	intermediateMount := sanitizePath(args[2])
-
-	templateIssuerBundle, err := readIssuer(client, templateIssuer)
-	if err != nil {
-		c.UI.Error(fmt.Sprintf("Error fetching template certificate %v : %v", templateIssuer, err))
-		return 1
-	}
-	certificate := templateIssuerBundle.certificate
-
-	useExistingKey := c.flagKeyStorageSource == "existing"
-	keyRef := ""
-	if useExistingKey {
-		keyRef = templateIssuerBundle.keyId
-
-		if keyRef == "" {
-			c.UI.Error(fmt.Sprintf("Template issuer %s did not have a key id field set in response which is required", templateIssuer))
-			return 1
-		}
-	}
-
-	templateData, err := parseTemplateCertificate(*certificate, useExistingKey, keyRef)
-	data := updateTemplateWithData(templateData, userData)
-
-	return pkiIssue(c.BaseCommand, parentIssuer, intermediateMount, c.flagNewIssuerName, c.flagKeyStorageSource, data)
-}
-
-func updateTemplateWithData(template map[string]interface{}, changes map[string]interface{}) map[string]interface{} {
-	data := map[string]interface{}{}
-
-	for key, value := range template {
-		data[key] = value
-	}
-
-	// ttl and not_after set the same thing.  Delete template ttl if using not_after:
-	if _, ok := changes["not_after"]; ok {
-		delete(data, "ttl")
-	}
-
-	// If we are updating the key_type, do not set key_bits
-	if _, ok := changes["key_type"]; ok && changes["key_type"] != template["key_type"] {
-		delete(data, "key_bits")
-	}
-
-	for key, value := range changes {
-		data[key] = value
-	}
-
-	return data
-}
-
-func parseTemplateCertificate(certificate x509.Certificate, useExistingKey bool, keyRef string) (templateData map[string]interface{}, err error) {
-	// Generate Certificate Signing Parameters
-	templateData = map[string]interface{}{
-		"common_name": certificate.Subject.CommonName,
-		"alt_names":   makeAltNamesCommaSeparatedString(certificate.DNSNames, certificate.EmailAddresses),
-		"ip_sans":     makeIpAddressCommaSeparatedString(certificate.IPAddresses),
-		"uri_sans":    makeUriCommaSeparatedString(certificate.URIs),
-		// other_sans (string: "") - Specifies custom OID/UTF8-string SANs. These must match values specified on the role in allowed_other_sans (see role creation for allowed_other_sans globbing rules). The format is the same as OpenSSL: <oid>;<type>:<value> where the only current valid type is UTF8. This can be a comma-delimited list or a JSON string slice.
-		// Punting on Other_SANs, shouldn't really be on CAs
-		"signature_bits":        findSignatureBits(certificate.SignatureAlgorithm),
-		"exclude_cn_from_sans":  determineExcludeCnFromSans(certificate),
-		"ou":                    certificate.Subject.OrganizationalUnit,
-		"organization":          certificate.Subject.Organization,
-		"country":               certificate.Subject.Country,
-		"locality":              certificate.Subject.Locality,
-		"province":              certificate.Subject.Province,
-		"street_address":        certificate.Subject.StreetAddress,
-		"postal_code":           certificate.Subject.PostalCode,
-		"serial_number":         certificate.Subject.SerialNumber,
-		"ttl":                   (certificate.NotAfter.Sub(certificate.NotBefore)).String(),
-		"max_path_length":       certificate.MaxPathLen,
-		"permitted_dns_domains": strings.Join(certificate.PermittedDNSDomains, ","),
-		"use_pss":               isPSS(certificate.SignatureAlgorithm),
-	}
-
-	if useExistingKey {
-		templateData["skid"] = hex.EncodeToString(certificate.SubjectKeyId) // TODO: Double Check this with someone
-		if keyRef == "" {
-			return nil, fmt.Errorf("unable to create certificate template for existing key without a key_id")
-		}
-		templateData["key_ref"] = keyRef
-	} else {
-		templateData["key_type"] = getKeyType(certificate.PublicKeyAlgorithm.String())
-		templateData["key_bits"] = findBitLength(certificate.PublicKey)
-	}
-
-	return templateData, nil
-}
-
-func isPSS(algorithm x509.SignatureAlgorithm) bool {
-	switch algorithm {
-	case x509.SHA384WithRSAPSS, x509.SHA512WithRSAPSS, x509.SHA256WithRSAPSS:
-		return true
-	default:
-		return false
-	}
-}
-
-func makeAltNamesCommaSeparatedString(names []string, emails []string) string {
-	return strings.Join(names, ",") + "," + strings.Join(emails, ",")
-}
-
-func makeUriCommaSeparatedString(uris []*url.URL) string {
-	stringAddresses := make([]string, len(uris))
-	for i, uri := range uris {
-		stringAddresses[i] = uri.String()
-	}
-	return strings.Join(stringAddresses, ",")
-}
-
-func makeIpAddressCommaSeparatedString(addresses []net.IP) string {
-	stringAddresses := make([]string, len(addresses))
-	for i, address := range addresses {
-		stringAddresses[i] = address.String()
-	}
-	return strings.Join(stringAddresses, ",")
-}
-
-func determineExcludeCnFromSans(certificate x509.Certificate) bool {
-	cn := certificate.Subject.CommonName
-	if cn == "" {
-		return false
-	}
-
-	emails := certificate.EmailAddresses
-	for _, email := range emails {
-		if email == cn {
-			return false
-		}
-	}
-
-	dnses := certificate.DNSNames
-	for _, dns := range dnses {
-		if dns == cn {
-			return false
-		}
-	}
-
-	return true
-}
-
-func findBitLength(publicKey any) int {
-	if publicKey == nil {
-		return 0
-	}
-	switch pub := publicKey.(type) {
-	case *rsa.PublicKey:
-		return pub.N.BitLen()
-	case *ecdsa.PublicKey:
-		switch pub.Curve {
-		case elliptic.P224():
-			return 224
-		case elliptic.P256():
-			return 256
-		case elliptic.P384():
-			return 384
-		case elliptic.P521():
-			return 521
-		default:
-			return 0
-		}
-	default:
-		return 0
-	}
-}
-
-func findSignatureBits(algo x509.SignatureAlgorithm) int {
-	switch algo {
-	case x509.MD2WithRSA, x509.MD5WithRSA, x509.SHA1WithRSA, x509.DSAWithSHA1, x509.ECDSAWithSHA1:
-		return -1
-	case x509.SHA256WithRSA, x509.DSAWithSHA256, x509.ECDSAWithSHA256, x509.SHA256WithRSAPSS:
-		return 256
-	case x509.SHA384WithRSA, x509.ECDSAWithSHA384, x509.SHA384WithRSAPSS:
-		return 384
-	case x509.SHA512WithRSA, x509.SHA512WithRSAPSS, x509.ECDSAWithSHA512:
-		return 512
-	case x509.PureEd25519:
-		return 0
-	default:
-		return -1
-	}
-}
-
-func getKeyType(goKeyType string) string {
-	switch goKeyType {
-	case "RSA":
-		return "rsa"
-	case "ECDSA":
-		return "ec"
-	case "Ed25519":
-		return "ed25519"
-	default:
-		return ""
-	}
-}
diff --git a/command/pki_reissue_intermediate_test.go b/command/pki_reissue_intermediate_test.go
deleted file mode 100644
index e485f04d322b2..0000000000000
--- a/command/pki_reissue_intermediate_test.go
+++ /dev/null
@@ -1,198 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package command
-
-import (
-	"bytes"
-	"testing"
-
-	"github.com/hashicorp/vault/api"
-)
-
-// TestPKIReIssueIntermediate tests that the pki reissue command line tool accurately copies information from the
-// template certificate to the newly issued certificate, by issuing and reissuing several certificates and seeing how
-// they related to each other.
-func TestPKIReIssueIntermediate(t *testing.T) {
-	t.Parallel()
-
-	client, closer := testVaultServer(t)
-	defer closer()
-
-	// Relationship Map to Create
-	//          pki-root			| pki-newroot | pki-empty
-	// RootX1    RootX2    RootX4     RootX3
-	//   |								 |
-	// ----------------------------------------------
-	//   v								 v
-	// IntX1					  	   IntX2       pki-int
-	//   |								 |
-	//   v								 v
-	// IntX3 (-----------------------) IntX3
-	//
-	// Here X1,X2 have the same name (same mount)
-	// RootX4 uses the same key as RootX1 (but a different common_name/subject)
-	// RootX3 has the same name, and is on a different mount
-	// RootX1 has issued IntX1; RootX3 has issued IntX2
-	createComplicatedIssuerSetUpWithReIssueIntermediate(t, client)
-
-	runPkiVerifySignTests(t, client)
-
-	runPkiListIntermediateTests(t, client)
-}
-
-func createComplicatedIssuerSetUpWithReIssueIntermediate(t *testing.T, client *api.Client) {
-	// Relationship Map to Create
-	//          pki-root			| pki-newroot  | pki-empty
-	// RootX1    RootX2    RootX4     RootX3
-	//   |								 |
-	// ----------------------------------------------
-	//   v								 v
-	// IntX1					  	   IntX2       pki-int
-	//   |								 |
-	//   v								 v
-	// IntX3 (-----------------------) IntX3
-	//
-	// Here X1,X2 have the same name (same mount)
-	// RootX4 uses the same key as RootX1 (but a different common_name/subject)
-	// RootX3 has the same name, and is on a different mount
-	// RootX1 has issued IntX1; RootX3 has issued IntX2
-
-	if err := client.Sys().Mount("pki-root", &api.MountInput{
-		Type: "pki",
-		Config: api.MountConfigInput{
-			MaxLeaseTTL: "36500d",
-		},
-	}); err != nil {
-		t.Fatalf("pki mount error: %#v", err)
-	}
-
-	if err := client.Sys().Mount("pki-newroot", &api.MountInput{
-		Type: "pki",
-		Config: api.MountConfigInput{
-			MaxLeaseTTL: "36500d",
-		},
-	}); err != nil {
-		t.Fatalf("pki mount error: %#v", err)
-	}
-
-	if err := client.Sys().Mount("pki-int", &api.MountInput{
-		Type: "pki",
-		Config: api.MountConfigInput{
-			MaxLeaseTTL: "36500d",
-		},
-	}); err != nil {
-		t.Fatalf("pki mount error: %#v", err)
-	}
-
-	// Used to check handling empty list responses: Not Used for Any Issuers / Certificates
-	if err := client.Sys().Mount("pki-empty", &api.MountInput{
-		Type:   "pki",
-		Config: api.MountConfigInput{},
-	}); err != nil {
-		t.Fatalf("pki mount error: %#v", err)
-	}
-
-	resp, err := client.Logical().Write("pki-root/root/generate/internal", map[string]interface{}{
-		"key_type":    "ec",
-		"common_name": "Root X",
-		"ttl":         "3650d",
-		"issuer_name": "rootX1",
-		"key_name":    "rootX1",
-	})
-	if err != nil || resp == nil {
-		t.Fatalf("failed to prime CA: %v", err)
-	}
-
-	resp, err = client.Logical().Write("pki-root/root/generate/internal", map[string]interface{}{
-		"key_type":    "ec",
-		"common_name": "Root X",
-		"ttl":         "3650d",
-		"issuer_name": "rootX2",
-	})
-	if err != nil || resp == nil {
-		t.Fatalf("failed to prime CA: %v", err)
-	}
-
-	if resp, err := client.Logical().Write("pki-newroot/root/generate/internal", map[string]interface{}{
-		"key_type":    "ec",
-		"common_name": "Root X",
-		"ttl":         "3650d",
-		"issuer_name": "rootX3",
-	}); err != nil || resp == nil {
-		t.Fatalf("failed to prime CA: %v", err)
-	}
-
-	if resp, err := client.Logical().Write("pki-root/root/generate/existing", map[string]interface{}{
-		"common_name": "Root X4",
-		"ttl":         "3650d",
-		"issuer_name": "rootX4",
-		"key_ref":     "rootX1",
-	}); err != nil || resp == nil {
-		t.Fatalf("failed to prime CA: %v", err)
-	}
-
-	stdout := bytes.NewBuffer(nil)
-	stderr := bytes.NewBuffer(nil)
-	runOpts := &RunOptions{
-		Stdout: stdout,
-		Stderr: stderr,
-		Client: client,
-	}
-
-	// Intermediate X1
-	intX1CallArgs := []string{
-		"pki", "issue", "-format=json", "-issuer_name=intX1",
-		"pki-root/issuer/rootX1",
-		"pki-int/",
-		"key_type=rsa",
-		"common_name=Int X1",
-		"ou=thing",
-		"ttl=3650d",
-	}
-	codeOut := RunCustom(intX1CallArgs, runOpts)
-	if codeOut != 0 {
-		t.Fatalf("error issuing intermediate X1, code: %d \n stdout: %v \n stderr: %v", codeOut, stdout, stderr)
-	}
-
-	// Intermediate X2 - using ReIssue
-	intX2CallArgs := []string{
-		"pki", "reissue", "-format=json", "-issuer_name=intX2",
-		"pki-newroot/issuer/rootX3",
-		"pki-int/issuer/intX1",
-		"pki-int/",
-		"key_type=ec",
-		"common_name=Int X2",
-	}
-	codeOut = RunCustom(intX2CallArgs, runOpts)
-	if codeOut != 0 {
-		t.Fatalf("error issuing intermediate X2, code: %d \n stdout: %v \n stderr: %v", codeOut, stdout, stderr)
-	}
-
-	// Intermediate X3
-	intX3OriginalCallArgs := []string{
-		"pki", "issue", "-format=json", "-issuer_name=intX3",
-		"pki-int/issuer/intX1",
-		"pki-int/",
-		"key_type=ec",
-		"use_pss=true", // This is meaningful because rootX1 is an RSA key
-		"signature_bits=512",
-		"common_name=Int X3",
-		"ttl=3650d",
-	}
-	codeOut = RunCustom(intX3OriginalCallArgs, runOpts)
-	if codeOut != 0 {
-		t.Fatalf("error issuing intermediate X3, code: %d \n stdout: %v \n stderr: %v", codeOut, stdout, stderr)
-	}
-
-	intX3AdaptedCallArgs := []string{
-		"pki", "reissue", "-format=json", "-issuer_name=intX3also", "-type=existing",
-		"pki-int/issuer/intX2", // This is a EC key
-		"pki-int/issuer/intX3", // This template includes use_pss = true which can't be accomodated
-		"pki-int/",
-	}
-	codeOut = RunCustom(intX3AdaptedCallArgs, runOpts)
-	if codeOut != 0 {
-		t.Fatalf("error issuing intermediate X3also, code: %d \n stdout: %v \n stderr: %v", codeOut, stdout, stderr)
-	}
-}
diff --git a/command/pki_verify_sign.go b/command/pki_verify_sign.go
deleted file mode 100644
index b5a864f12c9ff..0000000000000
--- a/command/pki_verify_sign.go
+++ /dev/null
@@ -1,309 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package command
-
-import (
-	"bytes"
-	"crypto/x509"
-	"encoding/json"
-	"fmt"
-	"strconv"
-	"strings"
-
-	"github.com/hashicorp/vault/command/healthcheck"
-
-	"github.com/ghodss/yaml"
-	"github.com/hashicorp/vault/api"
-	"github.com/ryanuber/columnize"
-)
-
-type PKIVerifySignCommand struct {
-	*BaseCommand
-
-	flagConfig          string
-	flagReturnIndicator string
-	flagDefaultDisabled bool
-	flagList            bool
-}
-
-func (c *PKIVerifySignCommand) Synopsis() string {
-	return "Check whether one certificate validates another specified certificate"
-}
-
-func (c *PKIVerifySignCommand) Help() string {
-	helpText := `
-Usage: vault pki verify-sign POSSIBLE-ISSUER POSSIBLE-ISSUED
-
-  Verifies whether the listed issuer has signed the listed issued certificate.
-
-  POSSIBLE-ISSUER and POSSIBLE-ISSUED are the fully name-spaced path to
-  an issuer certificate, for instance: 'ns1/mount1/issuer/issuerName/json'.
-
-  Returns five fields of information:
-
-    - signature_match: was the key of the issuer used to sign the issued.
-    - path_match: the possible issuer appears in the valid certificate chain
-	  of the issued.
-    - key_id_match: does the key-id of the issuer match the key_id of the
-	  subject.
-    - subject_match: does the subject name of the issuer match the issuer
-	  subject of the issued.
-    - trust_match: if someone trusted the parent issuer, is the chain
-	  provided sufficient to trust the child issued.
-
-` + c.Flags().Help()
-	return strings.TrimSpace(helpText)
-}
-
-func (c *PKIVerifySignCommand) Flags() *FlagSets {
-	set := c.flagSet(FlagSetHTTP | FlagSetOutputFormat)
-	return set
-}
-
-func (c *PKIVerifySignCommand) Run(args []string) int {
-	f := c.Flags()
-	if err := f.Parse(args); err != nil {
-		c.UI.Error(err.Error())
-		return 1
-	}
-
-	args = f.Args()
-
-	if len(args) < 2 {
-		if len(args) == 0 {
-			c.UI.Error("Not enough arguments (expected potential issuer and issued, got nothing)")
-		} else {
-			c.UI.Error("Not enough arguments (expected both potential issuer and issued, got only one)")
-		}
-		return 1
-	} else if len(args) > 2 {
-		c.UI.Error(fmt.Sprintf("Too many arguments (expected only potential issuer and issued, got %d arguments)", len(args)))
-		for _, arg := range args {
-			if strings.HasPrefix(arg, "-") {
-				c.UI.Warn(fmt.Sprintf("Options (%v) must be specified before positional arguments (%v)", arg, args[0]))
-				break
-			}
-		}
-		return 1
-	}
-
-	issuer := sanitizePath(args[0])
-	issued := sanitizePath(args[1])
-
-	client, err := c.Client()
-	if err != nil {
-		c.UI.Error(fmt.Sprintf("Failed to obtain client: %s", err))
-		return 1
-	}
-
-	issuerResp, err := readIssuer(client, issuer)
-	if err != nil {
-		c.UI.Error(fmt.Sprintf("Failed to read issuer: %s: %s", issuer, err.Error()))
-		return 1
-	}
-
-	results, err := verifySignBetween(client, issuerResp, issued)
-	if err != nil {
-		c.UI.Error(fmt.Sprintf("Failed to run verification: %v", err))
-		return pkiRetUsage
-	}
-
-	c.outputResults(results, issuer, issued)
-
-	return 0
-}
-
-func verifySignBetween(client *api.Client, issuerResp *issuerResponse, issuedPath string) (map[string]bool, error) {
-	// Note that this eats warnings
-
-	issuerCert := issuerResp.certificate
-	issuerKeyId := issuerCert.SubjectKeyId
-
-	// Fetch and Parse the Potential Issued Cert
-	issuedCertBundle, err := readIssuer(client, issuedPath)
-	if err != nil {
-		return nil, fmt.Errorf("error: unable to fetch issuer %v: %w", issuedPath, err)
-	}
-	parentKeyId := issuedCertBundle.certificate.AuthorityKeyId
-
-	// Check the Chain-Match
-	rootCertPool := x509.NewCertPool()
-	rootCertPool.AddCert(issuerCert)
-	checkTrustPathOptions := x509.VerifyOptions{
-		Roots: rootCertPool,
-	}
-	trust := false
-	trusts, err := issuedCertBundle.certificate.Verify(checkTrustPathOptions)
-	if err != nil && !strings.Contains(err.Error(), "certificate signed by unknown authority") {
-		return nil, err
-	} else if err == nil {
-		for _, chain := range trusts {
-			// Output of this Should Only Have One Trust with Chain of Length Two (Child followed by Parent)
-			for _, cert := range chain {
-				if issuedCertBundle.certificate.Equal(cert) {
-					trust = true
-					break
-				}
-			}
-		}
-	}
-
-	pathMatch := false
-	for _, cert := range issuedCertBundle.caChain {
-		if bytes.Equal(cert.Raw, issuerCert.Raw) {
-			pathMatch = true
-			break
-		}
-	}
-
-	signatureMatch := false
-	err = issuedCertBundle.certificate.CheckSignatureFrom(issuerCert)
-	if err == nil {
-		signatureMatch = true
-	}
-
-	result := map[string]bool{
-		// This comparison isn't strictly correct, despite a standard ordering these are sets
-		"subject_match":   bytes.Equal(issuerCert.RawSubject, issuedCertBundle.certificate.RawIssuer),
-		"path_match":      pathMatch,
-		"trust_match":     trust, // TODO: Refactor into a reasonable function
-		"key_id_match":    bytes.Equal(parentKeyId, issuerKeyId),
-		"signature_match": signatureMatch,
-	}
-
-	return result, nil
-}
-
-type issuerResponse struct {
-	keyId       string
-	certificate *x509.Certificate
-	caChain     []*x509.Certificate
-}
-
-func readIssuer(client *api.Client, issuerPath string) (*issuerResponse, error) {
-	issuerResp, err := client.Logical().Read(issuerPath)
-	if err != nil {
-		return nil, err
-	}
-	issuerCertPem, err := requireStrRespField(issuerResp, "certificate")
-	if err != nil {
-		return nil, err
-	}
-	issuerCert, err := healthcheck.ParsePEMCert(issuerCertPem)
-	if err != nil {
-		return nil, fmt.Errorf("unable to parse issuer %v's certificate: %w", issuerPath, err)
-	}
-
-	caChainPem, err := requireStrListRespField(issuerResp, "ca_chain")
-	if err != nil {
-		return nil, fmt.Errorf("unable to parse issuer %v's CA chain: %w", issuerPath, err)
-	}
-
-	var caChain []*x509.Certificate
-	for _, pem := range caChainPem {
-		trimmedPem := strings.TrimSpace(pem)
-		if trimmedPem == "" {
-			continue
-		}
-		cert, err := healthcheck.ParsePEMCert(trimmedPem)
-		if err != nil {
-			return nil, err
-		}
-		caChain = append(caChain, cert)
-	}
-
-	keyId := optStrRespField(issuerResp, "key_id")
-
-	return &issuerResponse{
-		keyId:       keyId,
-		certificate: issuerCert,
-		caChain:     caChain,
-	}, nil
-}
-
-func optStrRespField(resp *api.Secret, reqField string) string {
-	if resp == nil || resp.Data == nil {
-		return ""
-	}
-	if val, present := resp.Data[reqField]; !present {
-		return ""
-	} else if strVal, castOk := val.(string); !castOk || strVal == "" {
-		return ""
-	} else {
-		return strVal
-	}
-}
-
-func requireStrRespField(resp *api.Secret, reqField string) (string, error) {
-	if resp == nil || resp.Data == nil {
-		return "", fmt.Errorf("nil response received, %s field unavailable", reqField)
-	}
-	if val, present := resp.Data[reqField]; !present {
-		return "", fmt.Errorf("response did not contain field: %s", reqField)
-	} else if strVal, castOk := val.(string); !castOk || strVal == "" {
-		return "", fmt.Errorf("field %s value was blank or not a string: %v", reqField, val)
-	} else {
-		return strVal, nil
-	}
-}
-
-func requireStrListRespField(resp *api.Secret, reqField string) ([]string, error) {
-	if resp == nil || resp.Data == nil {
-		return nil, fmt.Errorf("nil response received, %s field unavailable", reqField)
-	}
-	if val, present := resp.Data[reqField]; !present {
-		return nil, fmt.Errorf("response did not contain field: %s", reqField)
-	} else {
-		return healthcheck.StringList(val)
-	}
-}
-
-func (c *PKIVerifySignCommand) outputResults(results map[string]bool, potentialParent, potentialChild string) error {
-	switch Format(c.UI) {
-	case "", "table":
-		return c.outputResultsTable(results, potentialParent, potentialChild)
-	case "json":
-		return c.outputResultsJSON(results)
-	case "yaml":
-		return c.outputResultsYAML(results)
-	default:
-		return fmt.Errorf("unknown output format: %v", Format(c.UI))
-	}
-}
-
-func (c *PKIVerifySignCommand) outputResultsTable(results map[string]bool, potentialParent, potentialChild string) error {
-	c.UI.Output("issuer:" + potentialParent)
-	c.UI.Output("issued:" + potentialChild + "\n")
-	data := []string{"field" + hopeDelim + "value"}
-	for field, finding := range results {
-		row := field + hopeDelim + strconv.FormatBool(finding)
-		data = append(data, row)
-	}
-	c.UI.Output(tableOutput(data, &columnize.Config{
-		Delim: hopeDelim,
-	}))
-	c.UI.Output("\n")
-
-	return nil
-}
-
-func (c *PKIVerifySignCommand) outputResultsJSON(results map[string]bool) error {
-	bytes, err := json.MarshalIndent(results, "", "  ")
-	if err != nil {
-		return err
-	}
-
-	c.UI.Output(string(bytes))
-	return nil
-}
-
-func (c *PKIVerifySignCommand) outputResultsYAML(results map[string]bool) error {
-	bytes, err := yaml.Marshal(results)
-	if err != nil {
-		return err
-	}
-
-	c.UI.Output(string(bytes))
-	return nil
-}
diff --git a/command/pki_verify_sign_test.go b/command/pki_verify_sign_test.go
deleted file mode 100644
index 3f8986a5b6b16..0000000000000
--- a/command/pki_verify_sign_test.go
+++ /dev/null
@@ -1,468 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package command
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"fmt"
-	"strings"
-	"testing"
-
-	"github.com/hashicorp/vault/api"
-)
-
-func TestPKIVerifySign(t *testing.T) {
-	t.Parallel()
-
-	client, closer := testVaultServer(t)
-	defer closer()
-
-	// Relationship Map to Create
-	//          pki-root			| pki-newroot | pki-empty
-	// RootX1    RootX2    RootX4     RootX3
-	//   |								 |
-	// ----------------------------------------------
-	//   v								 v
-	// IntX1					  	   IntX2       pki-int
-	//   |								 |
-	//   v								 v
-	// IntX3 (-----------------------) IntX3
-	//
-	// Here X1,X2 have the same name (same mount)
-	// RootX4 uses the same key as RootX1 (but a different common_name/subject)
-	// RootX3 has the same name, and is on a different mount
-	// RootX1 has issued IntX1; RootX3 has issued IntX2
-	createComplicatedIssuerSetUp(t, client)
-
-	runPkiVerifySignTests(t, client)
-}
-
-func runPkiVerifySignTests(t *testing.T, client *api.Client) {
-	cases := []struct {
-		name               string
-		args               []string
-		expectedMatches    map[string]bool
-		jsonOut            bool
-		shouldError        bool
-		expectErrorCont    string
-		expectErrorNotCont string
-		nonJsonOutputCont  string
-	}{
-		{
-			"rootX1-matches-rootX1",
-			[]string{"pki", "verify-sign", "-format=json", "pki-root/issuer/rootX1", "pki-root/issuer/rootX1"},
-			map[string]bool{
-				"key_id_match":    true,
-				"path_match":      true,
-				"signature_match": true,
-				"subject_match":   true,
-				"trust_match":     true,
-			},
-			true,
-			false,
-			"",
-			"",
-			"",
-		},
-		{
-			"rootX1-on-rootX2-onlySameName",
-			[]string{"pki", "verify-sign", "-format=json", "pki-root/issuer/rootX1", "pki-root/issuer/rootX2"},
-			map[string]bool{
-				"key_id_match":    false,
-				"path_match":      false,
-				"signature_match": false,
-				"subject_match":   true,
-				"trust_match":     false,
-			},
-			true,
-			false,
-			"",
-			"",
-			"",
-		},
-	}
-	for _, testCase := range cases {
-		var errString string
-		var results map[string]interface{}
-		var stdOut string
-
-		if testCase.jsonOut {
-			results, errString = execPKIVerifyJson(t, client, false, testCase.shouldError, testCase.args)
-		} else {
-			stdOut, errString = execPKIVerifyNonJson(t, client, testCase.shouldError, testCase.args)
-		}
-
-		// Verify Error Behavior
-		if testCase.shouldError {
-			if errString == "" {
-				t.Fatalf("Expected error in Testcase %s : no error produced, got results %s", testCase.name, results)
-			}
-			if testCase.expectErrorCont != "" && !strings.Contains(errString, testCase.expectErrorCont) {
-				t.Fatalf("Expected error in Testcase %s to contain %s, but got error %s", testCase.name, testCase.expectErrorCont, errString)
-			}
-			if testCase.expectErrorNotCont != "" && strings.Contains(errString, testCase.expectErrorNotCont) {
-				t.Fatalf("Expected error in Testcase %s to not contain %s, but got error %s", testCase.name, testCase.expectErrorNotCont, errString)
-			}
-		} else {
-			if errString != "" {
-				t.Fatalf("Error in Testcase %s : no error expected, but got error: %s", testCase.name, errString)
-			}
-		}
-
-		// Verify Output
-		if testCase.jsonOut {
-			isMatch, errString := verifyExpectedJson(testCase.expectedMatches, results)
-			if !isMatch {
-				t.Fatalf("Expected Results for Testcase %s, do not match returned results %s", testCase.name, errString)
-			}
-		} else {
-			if !strings.Contains(stdOut, testCase.nonJsonOutputCont) {
-				t.Fatalf("Expected standard output for Testcase %s to contain %s, but got %s", testCase.name, testCase.nonJsonOutputCont, stdOut)
-			}
-		}
-
-	}
-}
-
-func execPKIVerifyJson(t *testing.T, client *api.Client, expectErrorUnmarshalling bool, expectErrorOut bool, callArgs []string) (map[string]interface{}, string) {
-	stdout, stderr := execPKIVerifyNonJson(t, client, expectErrorOut, callArgs)
-
-	var results map[string]interface{}
-	if err := json.Unmarshal([]byte(stdout), &results); err != nil && !expectErrorUnmarshalling {
-		t.Fatalf("failed to decode json response : %v \n json: \n%v", err, stdout)
-	}
-
-	return results, stderr
-}
-
-func execPKIVerifyNonJson(t *testing.T, client *api.Client, expectErrorOut bool, callArgs []string) (string, string) {
-	stdout := bytes.NewBuffer(nil)
-	stderr := bytes.NewBuffer(nil)
-	runOpts := &RunOptions{
-		Stdout: stdout,
-		Stderr: stderr,
-		Client: client,
-	}
-
-	code := RunCustom(callArgs, runOpts)
-	if !expectErrorOut && code != 0 {
-		t.Fatalf("running command `%v` unsuccessful (ret %v)\nerr: %v", strings.Join(callArgs, " "), code, stderr.String())
-	}
-
-	t.Log(stdout.String() + stderr.String())
-
-	return stdout.String(), stderr.String()
-}
-
-func convertListOfInterfaceToString(list []interface{}, sep string) string {
-	newList := make([]string, len(list))
-	for i, interfa := range list {
-		newList[i] = interfa.(string)
-	}
-	return strings.Join(newList, sep)
-}
-
-func createComplicatedIssuerSetUp(t *testing.T, client *api.Client) {
-	// Relationship Map to Create
-	//          pki-root			| pki-newroot  | pki-empty
-	// RootX1    RootX2    RootX4     RootX3
-	//   |								 |
-	// ----------------------------------------------
-	//   v								 v
-	// IntX1					  	   IntX2       pki-int
-	//   |								 |
-	//   v								 v
-	// IntX3 (-----------------------) IntX3
-	//
-	// Here X1,X2 have the same name (same mount)
-	// RootX4 uses the same key as RootX1 (but a different common_name/subject)
-	// RootX3 has the same name, and is on a different mount
-	// RootX1 has issued IntX1; RootX3 has issued IntX2
-
-	if err := client.Sys().Mount("pki-root", &api.MountInput{
-		Type: "pki",
-		Config: api.MountConfigInput{
-			MaxLeaseTTL: "36500d",
-		},
-	}); err != nil {
-		t.Fatalf("pki mount error: %#v", err)
-	}
-
-	if err := client.Sys().Mount("pki-newroot", &api.MountInput{
-		Type: "pki",
-		Config: api.MountConfigInput{
-			MaxLeaseTTL: "36500d",
-		},
-	}); err != nil {
-		t.Fatalf("pki mount error: %#v", err)
-	}
-
-	if err := client.Sys().Mount("pki-int", &api.MountInput{
-		Type: "pki",
-		Config: api.MountConfigInput{
-			MaxLeaseTTL: "36500d",
-		},
-	}); err != nil {
-		t.Fatalf("pki mount error: %#v", err)
-	}
-
-	// Used to check handling empty list responses: Not Used for Any Issuers / Certificates
-	if err := client.Sys().Mount("pki-empty", &api.MountInput{
-		Type:   "pki",
-		Config: api.MountConfigInput{},
-	}); err != nil {
-		t.Fatalf("pki mount error: %#v", err)
-	}
-
-	resp, err := client.Logical().Write("pki-root/root/generate/internal", map[string]interface{}{
-		"key_type":    "ec",
-		"common_name": "Root X",
-		"ttl":         "3650d",
-		"issuer_name": "rootX1",
-		"key_name":    "rootX1",
-	})
-	if err != nil || resp == nil {
-		t.Fatalf("failed to prime CA: %v", err)
-	}
-
-	resp, err = client.Logical().Write("pki-root/root/generate/internal", map[string]interface{}{
-		"key_type":    "ec",
-		"common_name": "Root X",
-		"ttl":         "3650d",
-		"issuer_name": "rootX2",
-	})
-	if err != nil || resp == nil {
-		t.Fatalf("failed to prime CA: %v", err)
-	}
-
-	if resp, err := client.Logical().Write("pki-newroot/root/generate/internal", map[string]interface{}{
-		"key_type":    "ec",
-		"common_name": "Root X",
-		"ttl":         "3650d",
-		"issuer_name": "rootX3",
-	}); err != nil || resp == nil {
-		t.Fatalf("failed to prime CA: %v", err)
-	}
-
-	if resp, err := client.Logical().Write("pki-root/root/generate/existing", map[string]interface{}{
-		"common_name": "Root X4",
-		"ttl":         "3650d",
-		"issuer_name": "rootX4",
-		"key_ref":     "rootX1",
-	}); err != nil || resp == nil {
-		t.Fatalf("failed to prime CA: %v", err)
-	}
-
-	// Intermediate X1
-	int1CsrResp, err := client.Logical().Write("pki-int/intermediate/generate/internal", map[string]interface{}{
-		"key_type":    "rsa",
-		"common_name": "Int X1",
-		"ttl":         "3650d",
-	})
-	if err != nil || int1CsrResp == nil {
-		t.Fatalf("failed to generate CSR: %v", err)
-	}
-	int1KeyId, ok := int1CsrResp.Data["key_id"]
-	if !ok {
-		t.Fatalf("no key_id produced when generating csr, response %v", int1CsrResp.Data)
-	}
-	int1CsrRaw, ok := int1CsrResp.Data["csr"]
-	if !ok {
-		t.Fatalf("no csr produced when generating intermediate, resp: %v", int1CsrResp)
-	}
-	int1Csr := int1CsrRaw.(string)
-	int1CertResp, err := client.Logical().Write("pki-root/issuer/rootX1/sign-intermediate", map[string]interface{}{
-		"csr": int1Csr,
-	})
-	if err != nil || int1CertResp == nil {
-		t.Fatalf("failed to sign CSR: %v", err)
-	}
-	int1CertChainRaw, ok := int1CertResp.Data["ca_chain"]
-	if !ok {
-		t.Fatalf("no ca_chain produced when signing intermediate, resp: %v", int1CertResp)
-	}
-	int1CertChain := convertListOfInterfaceToString(int1CertChainRaw.([]interface{}), "\n")
-	importInt1Resp, err := client.Logical().Write("pki-int/issuers/import/cert", map[string]interface{}{
-		"pem_bundle": int1CertChain,
-	})
-	if err != nil || importInt1Resp == nil {
-		t.Fatalf("failed to import certificate: %v", err)
-	}
-	importIssuerIdMap, ok := importInt1Resp.Data["mapping"]
-	if !ok {
-		t.Fatalf("no mapping data returned on issuer import: %v", importInt1Resp)
-	}
-	for key, value := range importIssuerIdMap.(map[string]interface{}) {
-		if value != nil && len(value.(string)) > 0 {
-			if value != int1KeyId {
-				t.Fatalf("Expected exactly one key_match to %v, got multiple: %v", int1KeyId, importIssuerIdMap)
-			}
-			if resp, err := client.Logical().JSONMergePatch(context.Background(), "pki-int/issuer/"+key, map[string]interface{}{
-				"issuer_name": "intX1",
-			}); err != nil || resp == nil {
-				t.Fatalf("error naming issuer %v", err)
-			}
-		} else {
-			if resp, err := client.Logical().JSONMergePatch(context.Background(), "pki-int/issuer/"+key, map[string]interface{}{
-				"issuer_name": "rootX1",
-			}); err != nil || resp == nil {
-				t.Fatalf("error naming issuer parent %v", err)
-			}
-		}
-	}
-
-	// Intermediate X2
-	int2CsrResp, err := client.Logical().Write("pki-int/intermediate/generate/internal", map[string]interface{}{
-		"key_type":    "ec",
-		"common_name": "Int X2",
-		"ttl":         "3650d",
-	})
-	if err != nil || int2CsrResp == nil {
-		t.Fatalf("failed to generate CSR: %v", err)
-	}
-	int2KeyId, ok := int2CsrResp.Data["key_id"]
-	if !ok {
-		t.Fatalf("no key material returned from producing csr, resp: %v", int2CsrResp)
-	}
-	int2CsrRaw, ok := int2CsrResp.Data["csr"]
-	if !ok {
-		t.Fatalf("no csr produced when generating intermediate, resp: %v", int2CsrResp)
-	}
-	int2Csr := int2CsrRaw.(string)
-	int2CertResp, err := client.Logical().Write("pki-newroot/issuer/rootX3/sign-intermediate", map[string]interface{}{
-		"csr": int2Csr,
-	})
-	if err != nil || int2CertResp == nil {
-		t.Fatalf("failed to sign CSR: %v", err)
-	}
-	int2CertChainRaw, ok := int2CertResp.Data["ca_chain"]
-	if !ok {
-		t.Fatalf("no ca_chain produced when signing intermediate, resp: %v", int2CertResp)
-	}
-	int2CertChain := convertListOfInterfaceToString(int2CertChainRaw.([]interface{}), "\n")
-	importInt2Resp, err := client.Logical().Write("pki-int/issuers/import/cert", map[string]interface{}{
-		"pem_bundle": int2CertChain,
-	})
-	if err != nil || importInt2Resp == nil {
-		t.Fatalf("failed to import certificate: %v", err)
-	}
-	importIssuer2IdMap, ok := importInt2Resp.Data["mapping"]
-	if !ok {
-		t.Fatalf("no mapping data returned on issuer import: %v", importInt2Resp)
-	}
-	for key, value := range importIssuer2IdMap.(map[string]interface{}) {
-		if value != nil && len(value.(string)) > 0 {
-			if value != int2KeyId {
-				t.Fatalf("unexpected key_match with ca_chain, expected only %v, got %v", int2KeyId, importIssuer2IdMap)
-			}
-			if resp, err := client.Logical().JSONMergePatch(context.Background(), "pki-int/issuer/"+key, map[string]interface{}{
-				"issuer_name": "intX2",
-			}); err != nil || resp == nil {
-				t.Fatalf("error naming issuer %v", err)
-			}
-		} else {
-			if resp, err := client.Logical().Write("pki-int/issuer/"+key, map[string]interface{}{
-				"issuer_name": "rootX3",
-			}); err != nil || resp == nil {
-				t.Fatalf("error naming parent issuer %v", err)
-			}
-		}
-	}
-
-	// Intermediate X3
-	int3CsrResp, err := client.Logical().Write("pki-int/intermediate/generate/internal", map[string]interface{}{
-		"key_type":    "rsa",
-		"common_name": "Int X3",
-		"ttl":         "3650d",
-	})
-	if err != nil || int3CsrResp == nil {
-		t.Fatalf("failed to generate CSR: %v", err)
-	}
-	int3KeyId, ok := int3CsrResp.Data["key_id"]
-	int3CsrRaw, ok := int3CsrResp.Data["csr"]
-	if !ok {
-		t.Fatalf("no csr produced when generating intermediate, resp: %v", int3CsrResp)
-	}
-	int3Csr := int3CsrRaw.(string)
-	// sign by intX1 and import
-	int3CertResp1, err := client.Logical().Write("pki-int/issuer/intX1/sign-intermediate", map[string]interface{}{
-		"csr": int3Csr,
-	})
-	if err != nil || int3CertResp1 == nil {
-		t.Fatalf("failed to sign CSR: %v", err)
-	}
-	int3CertChainRaw1, ok := int3CertResp1.Data["ca_chain"]
-	if !ok {
-		t.Fatalf("no ca_chain produced when signing intermediate, resp: %v", int3CertResp1)
-	}
-	int3CertChain1 := convertListOfInterfaceToString(int3CertChainRaw1.([]interface{}), "\n")
-	importInt3Resp1, err := client.Logical().Write("pki-int/issuers/import/cert", map[string]interface{}{
-		"pem_bundle": int3CertChain1,
-	})
-	if err != nil || importInt3Resp1 == nil {
-		t.Fatalf("failed to import certificate: %v", err)
-	}
-	importIssuer3IdMap1, ok := importInt3Resp1.Data["mapping"]
-	if !ok {
-		t.Fatalf("no mapping data returned on issuer import: %v", importInt2Resp)
-	}
-	for key, value := range importIssuer3IdMap1.(map[string]interface{}) {
-		if value != nil && len(value.(string)) > 0 && value == int3KeyId {
-			if resp, err := client.Logical().JSONMergePatch(context.Background(), "pki-int/issuer/"+key, map[string]interface{}{
-				"issuer_name": "intX3",
-			}); err != nil || resp == nil {
-				t.Fatalf("error naming issuer %v", err)
-			}
-			break
-		}
-	}
-
-	// sign by intX2 and import
-	int3CertResp2, err := client.Logical().Write("pki-int/issuer/intX2/sign-intermediate", map[string]interface{}{
-		"csr": int3Csr,
-	})
-	if err != nil || int3CertResp2 == nil {
-		t.Fatalf("failed to sign CSR: %v", err)
-	}
-	int3CertChainRaw2, ok := int3CertResp2.Data["ca_chain"]
-	if !ok {
-		t.Fatalf("no ca_chain produced when signing intermediate, resp: %v", int3CertResp2)
-	}
-	int3CertChain2 := convertListOfInterfaceToString(int3CertChainRaw2.([]interface{}), "\n")
-	importInt3Resp2, err := client.Logical().Write("pki-int/issuers/import/cert", map[string]interface{}{
-		"pem_bundle": int3CertChain2,
-	})
-	if err != nil || importInt3Resp2 == nil {
-		t.Fatalf("failed to import certificate: %v", err)
-	}
-	importIssuer3IdMap2, ok := importInt3Resp2.Data["mapping"]
-	if !ok {
-		t.Fatalf("no mapping data returned on issuer import: %v", importInt2Resp)
-	}
-	for key, value := range importIssuer3IdMap2.(map[string]interface{}) {
-		if value != nil && len(value.(string)) > 0 && value == int3KeyId {
-			if resp, err := client.Logical().JSONMergePatch(context.Background(), "pki-int/issuer/"+key, map[string]interface{}{
-				"issuer_name": "intX3also",
-			}); err != nil || resp == nil {
-				t.Fatalf("error naming issuer %v", err)
-			}
-			break // Parent Certs Already Named
-		}
-	}
-}
-
-func verifyExpectedJson(expectedResults map[string]bool, results map[string]interface{}) (isMatch bool, error string) {
-	if len(expectedResults) != len(results) {
-		return false, fmt.Sprintf("Different Number of Keys in Expected Results (%d), than results (%d)",
-			len(expectedResults), len(results))
-	}
-	for key, value := range expectedResults {
-		if results[key].(bool) != value {
-			return false, fmt.Sprintf("Different value for key %s : expected %t got %s", key, value, results[key])
-		}
-	}
-	return true, ""
-}
diff --git a/command/plugin.go b/command/plugin.go
index ca55a4bf73172..cf0a5009f6260 100644
--- a/command/plugin.go
+++ b/command/plugin.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/plugin_deregister.go b/command/plugin_deregister.go
index 86b329f1063d1..a65bf6702a96d 100644
--- a/command/plugin_deregister.go
+++ b/command/plugin_deregister.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -9,6 +6,7 @@ import (
 
 	semver "github.com/hashicorp/go-version"
 	"github.com/hashicorp/vault/api"
+	"github.com/hashicorp/vault/sdk/helper/consts"
 	"github.com/mitchellh/cli"
 	"github.com/posener/complete"
 )
@@ -66,7 +64,7 @@ func (c *PluginDeregisterCommand) Flags() *FlagSets {
 }
 
 func (c *PluginDeregisterCommand) AutocompleteArgs() complete.Predictor {
-	return c.PredictVaultPlugins(api.PluginTypeUnknown)
+	return c.PredictVaultPlugins(consts.PluginTypeUnknown)
 }
 
 func (c *PluginDeregisterCommand) AutocompleteFlags() complete.Flags {
@@ -104,7 +102,7 @@ func (c *PluginDeregisterCommand) Run(args []string) int {
 		return 2
 	}
 
-	pluginType, err := api.ParsePluginType(strings.TrimSpace(pluginTypeRaw))
+	pluginType, err := consts.ParsePluginType(strings.TrimSpace(pluginTypeRaw))
 	if err != nil {
 		c.UI.Error(err.Error())
 		return 2
diff --git a/command/plugin_deregister_test.go b/command/plugin_deregister_test.go
index b05644e46d4fe..fc3bc5801ebc5 100644
--- a/command/plugin_deregister_test.go
+++ b/command/plugin_deregister_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -8,8 +5,8 @@ import (
 	"testing"
 
 	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/helper/testhelpers/corehelpers"
 	"github.com/hashicorp/vault/sdk/helper/consts"
+	"github.com/hashicorp/vault/vault"
 	"github.com/mitchellh/cli"
 )
 
@@ -80,21 +77,21 @@ func TestPluginDeregisterCommand_Run(t *testing.T) {
 	t.Run("integration", func(t *testing.T) {
 		t.Parallel()
 
-		pluginDir, cleanup := corehelpers.MakeTestPluginDir(t)
+		pluginDir, cleanup := vault.MakeTestPluginDir(t)
 		defer cleanup(t)
 
 		client, _, closer := testVaultServerPluginDir(t, pluginDir)
 		defer closer()
 
 		pluginName := "my-plugin"
-		_, sha256Sum := testPluginCreateAndRegister(t, client, pluginDir, pluginName, api.PluginTypeCredential, "")
+		_, sha256Sum := testPluginCreateAndRegister(t, client, pluginDir, pluginName, consts.PluginTypeCredential, "")
 
 		ui, cmd := testPluginDeregisterCommand(t)
 		cmd.client = client
 
 		if err := client.Sys().RegisterPlugin(&api.RegisterPluginInput{
 			Name:    pluginName,
-			Type:    api.PluginTypeCredential,
+			Type:    consts.PluginTypeCredential,
 			Command: pluginName,
 			SHA256:  sha256Sum,
 		}); err != nil {
@@ -116,7 +113,7 @@ func TestPluginDeregisterCommand_Run(t *testing.T) {
 		}
 
 		resp, err := client.Sys().ListPlugins(&api.ListPluginsInput{
-			Type: api.PluginTypeCredential,
+			Type: consts.PluginTypeCredential,
 		})
 		if err != nil {
 			t.Fatal(err)
@@ -138,14 +135,14 @@ func TestPluginDeregisterCommand_Run(t *testing.T) {
 	t.Run("integration with version", func(t *testing.T) {
 		t.Parallel()
 
-		pluginDir, cleanup := corehelpers.MakeTestPluginDir(t)
+		pluginDir, cleanup := vault.MakeTestPluginDir(t)
 		defer cleanup(t)
 
 		client, _, closer := testVaultServerPluginDir(t, pluginDir)
 		defer closer()
 
 		pluginName := "my-plugin"
-		_, _, version := testPluginCreateAndRegisterVersioned(t, client, pluginDir, pluginName, api.PluginTypeCredential)
+		_, _, version := testPluginCreateAndRegisterVersioned(t, client, pluginDir, pluginName, consts.PluginTypeCredential)
 
 		ui, cmd := testPluginDeregisterCommand(t)
 		cmd.client = client
@@ -166,7 +163,7 @@ func TestPluginDeregisterCommand_Run(t *testing.T) {
 		}
 
 		resp, err := client.Sys().ListPlugins(&api.ListPluginsInput{
-			Type: api.PluginTypeUnknown,
+			Type: consts.PluginTypeUnknown,
 		})
 		if err != nil {
 			t.Fatal(err)
@@ -186,14 +183,14 @@ func TestPluginDeregisterCommand_Run(t *testing.T) {
 	t.Run("integration with missing version", func(t *testing.T) {
 		t.Parallel()
 
-		pluginDir, cleanup := corehelpers.MakeTestPluginDir(t)
+		pluginDir, cleanup := vault.MakeTestPluginDir(t)
 		defer cleanup(t)
 
 		client, _, closer := testVaultServerPluginDir(t, pluginDir)
 		defer closer()
 
 		pluginName := "my-plugin"
-		testPluginCreateAndRegisterVersioned(t, client, pluginDir, pluginName, api.PluginTypeCredential)
+		testPluginCreateAndRegisterVersioned(t, client, pluginDir, pluginName, consts.PluginTypeCredential)
 
 		ui, cmd := testPluginDeregisterCommand(t)
 		cmd.client = client
@@ -213,7 +210,7 @@ func TestPluginDeregisterCommand_Run(t *testing.T) {
 		}
 
 		resp, err := client.Sys().ListPlugins(&api.ListPluginsInput{
-			Type: api.PluginTypeUnknown,
+			Type: consts.PluginTypeUnknown,
 		})
 		if err != nil {
 			t.Fatal(err)
diff --git a/command/plugin_info.go b/command/plugin_info.go
index 1fa9555ba9c27..8fedb98315358 100644
--- a/command/plugin_info.go
+++ b/command/plugin_info.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -8,6 +5,7 @@ import (
 	"strings"
 
 	"github.com/hashicorp/vault/api"
+	"github.com/hashicorp/vault/sdk/helper/consts"
 	"github.com/mitchellh/cli"
 	"github.com/posener/complete"
 )
@@ -60,7 +58,7 @@ func (c *PluginInfoCommand) Flags() *FlagSets {
 }
 
 func (c *PluginInfoCommand) AutocompleteArgs() complete.Predictor {
-	return c.PredictVaultPlugins(api.PluginTypeUnknown)
+	return c.PredictVaultPlugins(consts.PluginTypeUnknown)
 }
 
 func (c *PluginInfoCommand) AutocompleteFlags() complete.Flags {
@@ -100,7 +98,7 @@ func (c *PluginInfoCommand) Run(args []string) int {
 		return 2
 	}
 
-	pluginType, err := api.ParsePluginType(strings.TrimSpace(pluginTypeRaw))
+	pluginType, err := consts.ParsePluginType(strings.TrimSpace(pluginTypeRaw))
 	if err != nil {
 		c.UI.Error(err.Error())
 		return 2
diff --git a/command/plugin_info_test.go b/command/plugin_info_test.go
index 921014cec538a..714ac1e59b812 100644
--- a/command/plugin_info_test.go
+++ b/command/plugin_info_test.go
@@ -1,16 +1,12 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
 	"strings"
 	"testing"
 
-	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/helper/testhelpers/corehelpers"
 	"github.com/hashicorp/vault/helper/versions"
 	"github.com/hashicorp/vault/sdk/helper/consts"
+	"github.com/hashicorp/vault/vault"
 	"github.com/mitchellh/cli"
 )
 
@@ -42,7 +38,7 @@ func TestPluginInfoCommand_Run(t *testing.T) {
 		},
 		{
 			"no_plugin_exist",
-			[]string{api.PluginTypeCredential.String(), "not-a-real-plugin-like-ever"},
+			[]string{consts.PluginTypeCredential.String(), "not-a-real-plugin-like-ever"},
 			"Error reading plugin",
 			2,
 		},
@@ -79,20 +75,20 @@ func TestPluginInfoCommand_Run(t *testing.T) {
 	t.Run("default", func(t *testing.T) {
 		t.Parallel()
 
-		pluginDir, cleanup := corehelpers.MakeTestPluginDir(t)
+		pluginDir, cleanup := vault.MakeTestPluginDir(t)
 		defer cleanup(t)
 
 		client, _, closer := testVaultServerPluginDir(t, pluginDir)
 		defer closer()
 
 		pluginName := "my-plugin"
-		_, sha256Sum := testPluginCreateAndRegister(t, client, pluginDir, pluginName, api.PluginTypeCredential, "")
+		_, sha256Sum := testPluginCreateAndRegister(t, client, pluginDir, pluginName, consts.PluginTypeCredential, "")
 
 		ui, cmd := testPluginInfoCommand(t)
 		cmd.client = client
 
 		code := cmd.Run([]string{
-			api.PluginTypeCredential.String(), pluginName,
+			consts.PluginTypeCredential.String(), pluginName,
 		})
 		if exp := 0; code != exp {
 			t.Errorf("expected %d to be %d", code, exp)
@@ -110,14 +106,14 @@ func TestPluginInfoCommand_Run(t *testing.T) {
 	t.Run("version flag", func(t *testing.T) {
 		t.Parallel()
 
-		pluginDir, cleanup := corehelpers.MakeTestPluginDir(t)
+		pluginDir, cleanup := vault.MakeTestPluginDir(t)
 		defer cleanup(t)
 
 		client, _, closer := testVaultServerPluginDir(t, pluginDir)
 		defer closer()
 
 		const pluginName = "azure"
-		_, sha256Sum := testPluginCreateAndRegister(t, client, pluginDir, pluginName, api.PluginTypeCredential, "v1.0.0")
+		_, sha256Sum := testPluginCreateAndRegister(t, client, pluginDir, pluginName, consts.PluginTypeCredential, "v1.0.0")
 
 		for name, tc := range map[string]struct {
 			version     string
@@ -132,7 +128,7 @@ func TestPluginInfoCommand_Run(t *testing.T) {
 
 				code := cmd.Run([]string{
 					"-version=" + tc.version,
-					api.PluginTypeCredential.String(), pluginName,
+					consts.PluginTypeCredential.String(), pluginName,
 				})
 
 				combined := ui.OutputWriter.String() + ui.ErrorWriter.String()
@@ -156,21 +152,21 @@ func TestPluginInfoCommand_Run(t *testing.T) {
 	t.Run("field", func(t *testing.T) {
 		t.Parallel()
 
-		pluginDir, cleanup := corehelpers.MakeTestPluginDir(t)
+		pluginDir, cleanup := vault.MakeTestPluginDir(t)
 		defer cleanup(t)
 
 		client, _, closer := testVaultServerPluginDir(t, pluginDir)
 		defer closer()
 
 		pluginName := "my-plugin"
-		testPluginCreateAndRegister(t, client, pluginDir, pluginName, api.PluginTypeCredential, "")
+		testPluginCreateAndRegister(t, client, pluginDir, pluginName, consts.PluginTypeCredential, "")
 
 		ui, cmd := testPluginInfoCommand(t)
 		cmd.client = client
 
 		code := cmd.Run([]string{
 			"-field", "builtin",
-			api.PluginTypeCredential.String(), pluginName,
+			consts.PluginTypeCredential.String(), pluginName,
 		})
 		if exp := 0; code != exp {
 			t.Errorf("expected %d to be %d", code, exp)
@@ -192,7 +188,7 @@ func TestPluginInfoCommand_Run(t *testing.T) {
 		cmd.client = client
 
 		code := cmd.Run([]string{
-			api.PluginTypeCredential.String(), "my-plugin",
+			consts.PluginTypeCredential.String(), "my-plugin",
 		})
 		if exp := 2; code != exp {
 			t.Errorf("expected %d to be %d", code, exp)
diff --git a/command/plugin_list.go b/command/plugin_list.go
index f1b0e5ebfa04b..641c5e2bae982 100644
--- a/command/plugin_list.go
+++ b/command/plugin_list.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -8,6 +5,7 @@ import (
 	"strings"
 
 	"github.com/hashicorp/vault/api"
+	"github.com/hashicorp/vault/sdk/helper/consts"
 	"github.com/mitchellh/cli"
 	"github.com/posener/complete"
 )
@@ -92,12 +90,12 @@ func (c *PluginListCommand) Run(args []string) int {
 		return 1
 	}
 
-	pluginType := api.PluginTypeUnknown
+	pluginType := consts.PluginTypeUnknown
 	if len(args) > 0 {
 		pluginTypeStr := strings.TrimSpace(args[0])
 		if pluginTypeStr != "" {
 			var err error
-			pluginType, err = api.ParsePluginType(pluginTypeStr)
+			pluginType, err = consts.ParsePluginType(pluginTypeStr)
 			if err != nil {
 				c.UI.Error(fmt.Sprintf("Error parsing type: %s", err))
 				return 2
@@ -141,10 +139,10 @@ func (c *PluginListCommand) Run(args []string) int {
 	}
 }
 
-func (c *PluginListCommand) simpleResponse(plugins *api.ListPluginsResponse, pluginType api.PluginType) []string {
+func (c *PluginListCommand) simpleResponse(plugins *api.ListPluginsResponse, pluginType consts.PluginType) []string {
 	var out []string
 	switch pluginType {
-	case api.PluginTypeUnknown:
+	case consts.PluginTypeUnknown:
 		out = []string{"Name | Type | Version"}
 		for _, plugin := range plugins.Details {
 			out = append(out, fmt.Sprintf("%s | %s | %s", plugin.Name, plugin.Type, plugin.Version))
diff --git a/command/plugin_list_test.go b/command/plugin_list_test.go
index edae76558f374..8e4bbbff83e67 100644
--- a/command/plugin_list_test.go
+++ b/command/plugin_list_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/plugin_register.go b/command/plugin_register.go
index e9d2e5b7c6773..0c4510e3b99b2 100644
--- a/command/plugin_register.go
+++ b/command/plugin_register.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -8,6 +5,7 @@ import (
 	"strings"
 
 	"github.com/hashicorp/vault/api"
+	"github.com/hashicorp/vault/sdk/helper/consts"
 	"github.com/mitchellh/cli"
 	"github.com/posener/complete"
 )
@@ -94,7 +92,7 @@ func (c *PluginRegisterCommand) Flags() *FlagSets {
 }
 
 func (c *PluginRegisterCommand) AutocompleteArgs() complete.Predictor {
-	return c.PredictVaultPlugins(api.PluginTypeUnknown)
+	return c.PredictVaultPlugins(consts.PluginTypeUnknown)
 }
 
 func (c *PluginRegisterCommand) AutocompleteFlags() complete.Flags {
@@ -137,7 +135,7 @@ func (c *PluginRegisterCommand) Run(args []string) int {
 		return 2
 	}
 
-	pluginType, err := api.ParsePluginType(strings.TrimSpace(pluginTypeRaw))
+	pluginType, err := consts.ParsePluginType(strings.TrimSpace(pluginTypeRaw))
 	if err != nil {
 		c.UI.Error(err.Error())
 		return 2
diff --git a/command/plugin_register_test.go b/command/plugin_register_test.go
index eccd5c1f00145..c2047d070f55a 100644
--- a/command/plugin_register_test.go
+++ b/command/plugin_register_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -10,8 +7,8 @@ import (
 	"testing"
 
 	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/helper/testhelpers/corehelpers"
 	"github.com/hashicorp/vault/sdk/helper/consts"
+	"github.com/hashicorp/vault/vault"
 	"github.com/mitchellh/cli"
 )
 
@@ -83,7 +80,7 @@ func TestPluginRegisterCommand_Run(t *testing.T) {
 	t.Run("integration", func(t *testing.T) {
 		t.Parallel()
 
-		pluginDir, cleanup := corehelpers.MakeTestPluginDir(t)
+		pluginDir, cleanup := vault.MakeTestPluginDir(t)
 		defer cleanup(t)
 
 		client, _, closer := testVaultServerPluginDir(t, pluginDir)
@@ -110,7 +107,7 @@ func TestPluginRegisterCommand_Run(t *testing.T) {
 		}
 
 		resp, err := client.Sys().ListPlugins(&api.ListPluginsInput{
-			Type: api.PluginTypeCredential,
+			Type: consts.PluginTypeCredential,
 		})
 		if err != nil {
 			t.Fatal(err)
@@ -132,7 +129,7 @@ func TestPluginRegisterCommand_Run(t *testing.T) {
 	t.Run("integration with version", func(t *testing.T) {
 		t.Parallel()
 
-		pluginDir, cleanup := corehelpers.MakeTestPluginDir(t)
+		pluginDir, cleanup := vault.MakeTestPluginDir(t)
 		defer cleanup(t)
 
 		client, _, closer := testVaultServerPluginDir(t, pluginDir)
@@ -141,7 +138,7 @@ func TestPluginRegisterCommand_Run(t *testing.T) {
 		const pluginName = "my-plugin"
 		versions := []string{"v1.0.0", "v2.0.1"}
 		_, sha256Sum := testPluginCreate(t, pluginDir, pluginName)
-		types := []api.PluginType{api.PluginTypeCredential, api.PluginTypeDatabase, api.PluginTypeSecrets}
+		types := []consts.PluginType{consts.PluginTypeCredential, consts.PluginTypeDatabase, consts.PluginTypeSecrets}
 
 		for _, typ := range types {
 			for _, version := range versions {
@@ -167,17 +164,17 @@ func TestPluginRegisterCommand_Run(t *testing.T) {
 		}
 
 		resp, err := client.Sys().ListPlugins(&api.ListPluginsInput{
-			Type: api.PluginTypeUnknown,
+			Type: consts.PluginTypeUnknown,
 		})
 		if err != nil {
 			t.Fatal(err)
 		}
 
-		found := make(map[api.PluginType]int)
-		versionsFound := make(map[api.PluginType][]string)
+		found := make(map[consts.PluginType]int)
+		versionsFound := make(map[consts.PluginType][]string)
 		for _, p := range resp.Details {
 			if p.Name == pluginName {
-				typ, err := api.ParsePluginType(p.Type)
+				typ, err := consts.ParsePluginType(p.Type)
 				if err != nil {
 					t.Fatal(err)
 				}
diff --git a/command/plugin_reload.go b/command/plugin_reload.go
index 2e95fdd1430db..ae3c663869fe5 100644
--- a/command/plugin_reload.go
+++ b/command/plugin_reload.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/plugin_reload_status.go b/command/plugin_reload_status.go
index e527a07d1bfba..319d539c15468 100644
--- a/command/plugin_reload_status.go
+++ b/command/plugin_reload_status.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/plugin_reload_test.go b/command/plugin_reload_test.go
index 646fda9245057..5713d1a1507b7 100644
--- a/command/plugin_reload_test.go
+++ b/command/plugin_reload_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -8,7 +5,8 @@ import (
 	"testing"
 
 	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/helper/testhelpers/corehelpers"
+	"github.com/hashicorp/vault/sdk/helper/consts"
+	"github.com/hashicorp/vault/vault"
 	"github.com/mitchellh/cli"
 )
 
@@ -85,21 +83,21 @@ func TestPluginReloadCommand_Run(t *testing.T) {
 	t.Run("integration", func(t *testing.T) {
 		t.Parallel()
 
-		pluginDir, cleanup := corehelpers.MakeTestPluginDir(t)
+		pluginDir, cleanup := vault.MakeTestPluginDir(t)
 		defer cleanup(t)
 
 		client, _, closer := testVaultServerPluginDir(t, pluginDir)
 		defer closer()
 
 		pluginName := "my-plugin"
-		_, sha256Sum := testPluginCreateAndRegister(t, client, pluginDir, pluginName, api.PluginTypeCredential, "")
+		_, sha256Sum := testPluginCreateAndRegister(t, client, pluginDir, pluginName, consts.PluginTypeCredential, "")
 
 		ui, cmd := testPluginReloadCommand(t)
 		cmd.client = client
 
 		if err := client.Sys().RegisterPlugin(&api.RegisterPluginInput{
 			Name:    pluginName,
-			Type:    api.PluginTypeCredential,
+			Type:    consts.PluginTypeCredential,
 			Command: pluginName,
 			SHA256:  sha256Sum,
 		}); err != nil {
diff --git a/command/plugin_test.go b/command/plugin_test.go
index 08c350cbd0882..cc83efc772a9c 100644
--- a/command/plugin_test.go
+++ b/command/plugin_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -12,6 +9,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/vault/api"
+	"github.com/hashicorp/vault/sdk/helper/consts"
 )
 
 // testPluginCreate creates a sample plugin in a tempdir and returns the shasum
@@ -40,7 +38,7 @@ func testPluginCreate(tb testing.TB, dir, name string) (string, string) {
 }
 
 // testPluginCreateAndRegister creates a plugin and registers it in the catalog.
-func testPluginCreateAndRegister(tb testing.TB, client *api.Client, dir, name string, pluginType api.PluginType, version string) (string, string) {
+func testPluginCreateAndRegister(tb testing.TB, client *api.Client, dir, name string, pluginType consts.PluginType, version string) (string, string) {
 	tb.Helper()
 
 	pth, sha256Sum := testPluginCreate(tb, dir, name)
@@ -59,7 +57,7 @@ func testPluginCreateAndRegister(tb testing.TB, client *api.Client, dir, name st
 }
 
 // testPluginCreateAndRegisterVersioned creates a versioned plugin and registers it in the catalog.
-func testPluginCreateAndRegisterVersioned(tb testing.TB, client *api.Client, dir, name string, pluginType api.PluginType) (string, string, string) {
+func testPluginCreateAndRegisterVersioned(tb testing.TB, client *api.Client, dir, name string, pluginType consts.PluginType) (string, string, string) {
 	tb.Helper()
 
 	pth, sha256Sum := testPluginCreate(tb, dir, name)
diff --git a/command/policy.go b/command/policy.go
index 289aae134a4ff..59ffdf0bfb3d4 100644
--- a/command/policy.go
+++ b/command/policy.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/policy_delete.go b/command/policy_delete.go
index 199fb74a96636..76fa9a21d0f86 100644
--- a/command/policy_delete.go
+++ b/command/policy_delete.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/policy_delete_test.go b/command/policy_delete_test.go
index 008cd59766da3..2c822de9d4fdd 100644
--- a/command/policy_delete_test.go
+++ b/command/policy_delete_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/policy_fmt.go b/command/policy_fmt.go
index 75a91791327c5..7912c10643d9c 100644
--- a/command/policy_fmt.go
+++ b/command/policy_fmt.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/policy_fmt_test.go b/command/policy_fmt_test.go
index 89ed5215b6dad..2ae92ff6947e0 100644
--- a/command/policy_fmt_test.go
+++ b/command/policy_fmt_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/policy_list.go b/command/policy_list.go
index 7b5bfc12c98e7..53e85df0fdb9b 100644
--- a/command/policy_list.go
+++ b/command/policy_list.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/policy_list_test.go b/command/policy_list_test.go
index 19766978c7330..70defe54ead7a 100644
--- a/command/policy_list_test.go
+++ b/command/policy_list_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/policy_read.go b/command/policy_read.go
index 4f226444bea80..31777c5d5ae9e 100644
--- a/command/policy_read.go
+++ b/command/policy_read.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/policy_read_test.go b/command/policy_read_test.go
index f091749176b50..8cd7c066b8ce2 100644
--- a/command/policy_read_test.go
+++ b/command/policy_read_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/policy_write.go b/command/policy_write.go
index 81ff2b3e1993c..538414bc50fa8 100644
--- a/command/policy_write.go
+++ b/command/policy_write.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/policy_write_test.go b/command/policy_write_test.go
index 8294ef1934dbb..c8db7dc9ddc23 100644
--- a/command/policy_write_test.go
+++ b/command/policy_write_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/print.go b/command/print.go
index 19ac0a674dbc3..dace6ac951d68 100644
--- a/command/print.go
+++ b/command/print.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/print_token.go b/command/print_token.go
index 862af23e0b2d3..efe5aeedd3efd 100644
--- a/command/print_token.go
+++ b/command/print_token.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/proxy.go b/command/proxy.go
deleted file mode 100644
index 0eee175af9703..0000000000000
--- a/command/proxy.go
+++ /dev/null
@@ -1,1116 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package command
-
-import (
-	"context"
-	"crypto/tls"
-	"flag"
-	"fmt"
-	"io"
-	"net"
-	"net/http"
-	"os"
-	"sort"
-	"strings"
-	"sync"
-	"time"
-
-	systemd "github.com/coreos/go-systemd/daemon"
-	ctconfig "github.com/hashicorp/consul-template/config"
-	log "github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/go-multierror"
-	"github.com/hashicorp/go-secure-stdlib/gatedwriter"
-	"github.com/hashicorp/go-secure-stdlib/parseutil"
-	"github.com/hashicorp/go-secure-stdlib/reloadutil"
-	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/command/agentproxyshared"
-	"github.com/hashicorp/vault/command/agentproxyshared/auth"
-	cache "github.com/hashicorp/vault/command/agentproxyshared/cache"
-	"github.com/hashicorp/vault/command/agentproxyshared/sink"
-	"github.com/hashicorp/vault/command/agentproxyshared/sink/file"
-	"github.com/hashicorp/vault/command/agentproxyshared/sink/inmem"
-	"github.com/hashicorp/vault/command/agentproxyshared/winsvc"
-	proxyConfig "github.com/hashicorp/vault/command/proxy/config"
-	"github.com/hashicorp/vault/helper/logging"
-	"github.com/hashicorp/vault/helper/metricsutil"
-	"github.com/hashicorp/vault/helper/useragent"
-	"github.com/hashicorp/vault/internalshared/configutil"
-	"github.com/hashicorp/vault/internalshared/listenerutil"
-	"github.com/hashicorp/vault/sdk/helper/consts"
-	"github.com/hashicorp/vault/sdk/logical"
-	"github.com/hashicorp/vault/version"
-	"github.com/kr/pretty"
-	"github.com/mitchellh/cli"
-	"github.com/oklog/run"
-	"github.com/posener/complete"
-	"golang.org/x/text/cases"
-	"golang.org/x/text/language"
-	"google.golang.org/grpc/test/bufconn"
-)
-
-var (
-	_ cli.Command             = (*ProxyCommand)(nil)
-	_ cli.CommandAutocomplete = (*ProxyCommand)(nil)
-)
-
-const (
-	// flagNameProxyExitAfterAuth is used as a Proxy specific flag to indicate
-	// that proxy should exit after a single successful auth
-	flagNameProxyExitAfterAuth = "exit-after-auth"
-)
-
-type ProxyCommand struct {
-	*BaseCommand
-	logFlags logFlags
-
-	config *proxyConfig.Config
-
-	ShutdownCh chan struct{}
-	SighupCh   chan struct{}
-
-	tlsReloadFuncsLock sync.RWMutex
-	tlsReloadFuncs     []reloadutil.ReloadFunc
-
-	logWriter io.Writer
-	logGate   *gatedwriter.Writer
-	logger    log.Logger
-
-	// Telemetry object
-	metricsHelper *metricsutil.MetricsHelper
-
-	cleanupGuard sync.Once
-
-	startedCh  chan struct{} // for tests
-	reloadedCh chan struct{} // for tests
-
-	flagConfigs        []string
-	flagExitAfterAuth  bool
-	flagTestVerifyOnly bool
-}
-
-func (c *ProxyCommand) Synopsis() string {
-	return "Start a Vault Proxy"
-}
-
-func (c *ProxyCommand) Help() string {
-	helpText := `
-Usage: vault proxy [options]
-
-  This command starts a Vault Proxy that can perform automatic authentication
-  in certain environments.
-
-  Start a proxy with a configuration file:
-
-      $ vault proxy -config=/etc/vault/config.hcl
-
-  For a full list of examples, please see the documentation.
-
-` + c.Flags().Help()
-	return strings.TrimSpace(helpText)
-}
-
-func (c *ProxyCommand) Flags() *FlagSets {
-	set := c.flagSet(FlagSetHTTP)
-
-	f := set.NewFlagSet("Command Options")
-
-	// Augment with the log flags
-	f.addLogFlags(&c.logFlags)
-
-	f.StringSliceVar(&StringSliceVar{
-		Name:   "config",
-		Target: &c.flagConfigs,
-		Completion: complete.PredictOr(
-			complete.PredictFiles("*.hcl"),
-			complete.PredictFiles("*.json"),
-		),
-		Usage: "Path to a configuration file. This configuration file should " +
-			"contain only proxy directives.",
-	})
-
-	f.BoolVar(&BoolVar{
-		Name:    flagNameProxyExitAfterAuth,
-		Target:  &c.flagExitAfterAuth,
-		Default: false,
-		Usage: "If set to true, the proxy will exit with code 0 after a single " +
-			"successful auth, where success means that a token was retrieved and " +
-			"all sinks successfully wrote it",
-	})
-
-	// Internal-only flags to follow.
-	//
-	// Why hello there little source code reader! Welcome to the Vault source
-	// code. The remaining options are intentionally undocumented and come with
-	// no warranty or backwards-compatibility promise. Do not use these flags
-	// in production. Do not build automation using these flags. Unless you are
-	// developing against Vault, you should not need any of these flags.
-	f.BoolVar(&BoolVar{
-		Name:    "test-verify-only",
-		Target:  &c.flagTestVerifyOnly,
-		Default: false,
-		Hidden:  true,
-	})
-
-	// End internal-only flags.
-
-	return set
-}
-
-func (c *ProxyCommand) AutocompleteArgs() complete.Predictor {
-	return complete.PredictNothing
-}
-
-func (c *ProxyCommand) AutocompleteFlags() complete.Flags {
-	return c.Flags().Completions()
-}
-
-func (c *ProxyCommand) Run(args []string) int {
-	f := c.Flags()
-
-	if err := f.Parse(args); err != nil {
-		c.UI.Error(err.Error())
-		return 1
-	}
-
-	// Create a logger. We wrap it in a gated writer so that it doesn't
-	// start logging too early.
-	c.logGate = gatedwriter.NewWriter(os.Stderr)
-	c.logWriter = c.logGate
-
-	if c.logFlags.flagCombineLogs {
-		c.logWriter = os.Stdout
-	}
-
-	// Validation
-	if len(c.flagConfigs) < 1 {
-		c.UI.Error("Must specify exactly at least one config path using -config")
-		return 1
-	}
-
-	config, err := c.loadConfig(c.flagConfigs)
-	if err != nil {
-		c.outputErrors(err)
-		return 1
-	}
-
-	if config.AutoAuth == nil {
-		c.UI.Info("No auto_auth block found in config, the automatic authentication feature will not be started")
-	}
-
-	c.applyConfigOverrides(f, config) // This only needs to happen on start-up to aggregate config from flags and env vars
-	c.config = config
-
-	l, err := c.newLogger()
-	if err != nil {
-		c.outputErrors(err)
-		return 1
-	}
-	c.logger = l
-
-	infoKeys := make([]string, 0, 10)
-	info := make(map[string]string)
-	info["log level"] = config.LogLevel
-	infoKeys = append(infoKeys, "log level")
-
-	infoKeys = append(infoKeys, "version")
-	verInfo := version.GetVersion()
-	info["version"] = verInfo.FullVersionNumber(false)
-	if verInfo.Revision != "" {
-		info["version sha"] = strings.Trim(verInfo.Revision, "'")
-		infoKeys = append(infoKeys, "version sha")
-	}
-	infoKeys = append(infoKeys, "cgo")
-	info["cgo"] = "disabled"
-	if version.CgoEnabled {
-		info["cgo"] = "enabled"
-	}
-
-	// Tests might not want to start a vault server and just want to verify
-	// the configuration.
-	if c.flagTestVerifyOnly {
-		if os.Getenv("VAULT_TEST_VERIFY_ONLY_DUMP_CONFIG") != "" {
-			c.UI.Output(fmt.Sprintf(
-				"\nConfiguration:\n%s\n",
-				pretty.Sprint(*c.config)))
-		}
-		return 0
-	}
-
-	// Ignore any setting of Agent/Proxy's address. This client is used by the Proxy
-	// to reach out to Vault. This should never loop back to the proxy.
-	c.flagAgentProxyAddress = ""
-	client, err := c.Client()
-	if err != nil {
-		c.UI.Error(fmt.Sprintf(
-			"Error fetching client: %v",
-			err))
-		return 1
-	}
-
-	serverHealth, err := client.Sys().Health()
-	// We don't have any special behaviour if the error != nil, as this
-	// is not worth stopping the Proxy process over.
-	if err == nil {
-		// Note that we don't exit if the versions don't match, as this is a valid
-		// configuration, but we should still let the user know.
-		serverVersion := serverHealth.Version
-		proxyVersion := version.GetVersion().VersionNumber()
-		if serverVersion != proxyVersion {
-			c.UI.Info("==> Note: Vault Proxy version does not match Vault server version. " +
-				fmt.Sprintf("Vault Proxy version: %s, Vault server version: %s", proxyVersion, serverVersion))
-		}
-	}
-
-	// telemetry configuration
-	inmemMetrics, _, prometheusEnabled, err := configutil.SetupTelemetry(&configutil.SetupTelemetryOpts{
-		Config:      config.Telemetry,
-		Ui:          c.UI,
-		ServiceName: "vault",
-		DisplayName: "Vault",
-		UserAgent:   useragent.ProxyString(),
-		ClusterName: config.ClusterName,
-	})
-	if err != nil {
-		c.UI.Error(fmt.Sprintf("Error initializing telemetry: %s", err))
-		return 1
-	}
-	c.metricsHelper = metricsutil.NewMetricsHelper(inmemMetrics, prometheusEnabled)
-
-	var method auth.AuthMethod
-	var sinks []*sink.SinkConfig
-	if config.AutoAuth != nil {
-		if client.Headers().Get(consts.NamespaceHeaderName) == "" && config.AutoAuth.Method.Namespace != "" {
-			client.SetNamespace(config.AutoAuth.Method.Namespace)
-		}
-
-		sinkClient, err := client.CloneWithHeaders()
-		if err != nil {
-			c.UI.Error(fmt.Sprintf("Error cloning client for file sink: %v", err))
-			return 1
-		}
-
-		if config.DisableIdleConnsAutoAuth {
-			sinkClient.SetMaxIdleConnections(-1)
-		}
-
-		if config.DisableKeepAlivesAutoAuth {
-			sinkClient.SetDisableKeepAlives(true)
-		}
-
-		for _, sc := range config.AutoAuth.Sinks {
-			switch sc.Type {
-			case "file":
-				config := &sink.SinkConfig{
-					Logger:    c.logger.Named("sink.file"),
-					Config:    sc.Config,
-					Client:    sinkClient,
-					WrapTTL:   sc.WrapTTL,
-					DHType:    sc.DHType,
-					DeriveKey: sc.DeriveKey,
-					DHPath:    sc.DHPath,
-					AAD:       sc.AAD,
-				}
-				s, err := file.NewFileSink(config)
-				if err != nil {
-					c.UI.Error(fmt.Errorf("error creating file sink: %w", err).Error())
-					return 1
-				}
-				config.Sink = s
-				sinks = append(sinks, config)
-			default:
-				c.UI.Error(fmt.Sprintf("Unknown sink type %q", sc.Type))
-				return 1
-			}
-		}
-
-		authConfig := &auth.AuthConfig{
-			Logger:    c.logger.Named(fmt.Sprintf("auth.%s", config.AutoAuth.Method.Type)),
-			MountPath: config.AutoAuth.Method.MountPath,
-			Config:    config.AutoAuth.Method.Config,
-		}
-		method, err = agentproxyshared.GetAutoAuthMethodFromConfig(config.AutoAuth.Method.Type, authConfig, config.Vault.Address)
-		if err != nil {
-			c.UI.Error(fmt.Sprintf("Error creating %s auth method: %v", config.AutoAuth.Method.Type, err))
-			return 1
-		}
-	}
-
-	// We do this after auto-auth has been configured, because we don't want to
-	// confuse the issue of retries for auth failures which have their own
-	// config and are handled a bit differently.
-	if os.Getenv(api.EnvVaultMaxRetries) == "" {
-		client.SetMaxRetries(ctconfig.DefaultRetryAttempts)
-		if config.Vault != nil {
-			if config.Vault.Retry != nil {
-				client.SetMaxRetries(config.Vault.Retry.NumRetries)
-			}
-		}
-	}
-
-	enforceConsistency := cache.EnforceConsistencyNever
-	whenInconsistent := cache.WhenInconsistentFail
-	if config.APIProxy != nil {
-		switch config.APIProxy.EnforceConsistency {
-		case "always":
-			enforceConsistency = cache.EnforceConsistencyAlways
-		case "never", "":
-		default:
-			c.UI.Error(fmt.Sprintf("Unknown api_proxy setting for enforce_consistency: %q", config.APIProxy.EnforceConsistency))
-			return 1
-		}
-
-		switch config.APIProxy.WhenInconsistent {
-		case "retry":
-			whenInconsistent = cache.WhenInconsistentRetry
-		case "forward":
-			whenInconsistent = cache.WhenInconsistentForward
-		case "fail", "":
-		default:
-			c.UI.Error(fmt.Sprintf("Unknown api_proxy setting for when_inconsistent: %q", config.APIProxy.WhenInconsistent))
-			return 1
-		}
-	}
-
-	// Warn if cache _and_ cert auto-auth is enabled but certificates were not
-	// provided in the auto_auth.method["cert"].config stanza.
-	if config.Cache != nil && (config.AutoAuth != nil && config.AutoAuth.Method != nil && config.AutoAuth.Method.Type == "cert") {
-		_, okCertFile := config.AutoAuth.Method.Config["client_cert"]
-		_, okCertKey := config.AutoAuth.Method.Config["client_key"]
-
-		// If neither of these exists in the cert stanza, proxy will use the
-		// certs from the vault stanza.
-		if !okCertFile && !okCertKey {
-			c.UI.Warn(wrapAtLength("WARNING! Cache is enabled and using the same certificates " +
-				"from the 'cert' auto-auth method specified in the 'vault' stanza. Consider " +
-				"specifying certificate information in the 'cert' auto-auth's config stanza."))
-		}
-
-	}
-
-	// Output the header that the proxy has started
-	if !c.logFlags.flagCombineLogs {
-		c.UI.Output("==> Vault Proxy started! Log data will stream in below:\n")
-	}
-
-	var leaseCache *cache.LeaseCache
-	var previousToken string
-
-	proxyClient, err := client.CloneWithHeaders()
-	if err != nil {
-		c.UI.Error(fmt.Sprintf("Error cloning client for proxying: %v", err))
-		return 1
-	}
-
-	if config.DisableIdleConnsAPIProxy {
-		proxyClient.SetMaxIdleConnections(-1)
-	}
-
-	if config.DisableKeepAlivesAPIProxy {
-		proxyClient.SetDisableKeepAlives(true)
-	}
-
-	apiProxyLogger := c.logger.Named("apiproxy")
-
-	// The API proxy to be used, if listeners are configured
-	apiProxy, err := cache.NewAPIProxy(&cache.APIProxyConfig{
-		Client:                  proxyClient,
-		Logger:                  apiProxyLogger,
-		EnforceConsistency:      enforceConsistency,
-		WhenInconsistentAction:  whenInconsistent,
-		UserAgentStringFunction: useragent.ProxyStringWithProxiedUserAgent,
-		UserAgentString:         useragent.ProxyAPIProxyString(),
-	})
-	if err != nil {
-		c.UI.Error(fmt.Sprintf("Error creating API proxy: %v", err))
-		return 1
-	}
-
-	// ctx and cancelFunc are passed to the AuthHandler, SinkServer,
-	// and other subsystems, so that they can listen for ctx.Done() to
-	// fire and shut down accordingly.
-	ctx, cancelFunc := context.WithCancel(context.Background())
-	defer cancelFunc()
-
-	// Parse proxy cache configurations
-	if config.Cache != nil {
-		cacheLogger := c.logger.Named("cache")
-
-		// Create the lease cache proxier and set its underlying proxier to
-		// the API proxier.
-		leaseCache, err = cache.NewLeaseCache(&cache.LeaseCacheConfig{
-			Client:      proxyClient,
-			BaseContext: ctx,
-			Proxier:     apiProxy,
-			Logger:      cacheLogger.Named("leasecache"),
-		})
-		if err != nil {
-			c.UI.Error(fmt.Sprintf("Error creating lease cache: %v", err))
-			return 1
-		}
-
-		// Configure persistent storage and add to LeaseCache
-		if config.Cache.Persist != nil {
-			deferFunc, oldToken, err := agentproxyshared.AddPersistentStorageToLeaseCache(ctx, leaseCache, config.Cache.Persist, cacheLogger)
-			if err != nil {
-				c.UI.Error(fmt.Sprintf("Error creating persistent cache: %v", err))
-				return 1
-			}
-			previousToken = oldToken
-			if deferFunc != nil {
-				defer deferFunc()
-			}
-		}
-	}
-
-	var listeners []net.Listener
-
-	// Ensure we've added all the reload funcs for TLS before anyone triggers a reload.
-	c.tlsReloadFuncsLock.Lock()
-
-	for i, lnConfig := range config.Listeners {
-		var ln net.Listener
-		var tlsCfg *tls.Config
-
-		if lnConfig.Type == listenerutil.BufConnType {
-			inProcListener := bufconn.Listen(1024 * 1024)
-			if config.Cache != nil {
-				config.Cache.InProcDialer = listenerutil.NewBufConnWrapper(inProcListener)
-			}
-			ln = inProcListener
-		} else {
-			lnBundle, err := cache.StartListener(lnConfig)
-			if err != nil {
-				c.UI.Error(fmt.Sprintf("Error starting listener: %v", err))
-				return 1
-			}
-
-			tlsCfg = lnBundle.TLSConfig
-			ln = lnBundle.Listener
-
-			// Track the reload func, so we can reload later if needed.
-			c.tlsReloadFuncs = append(c.tlsReloadFuncs, lnBundle.TLSReloadFunc)
-		}
-
-		listeners = append(listeners, ln)
-
-		proxyVaultToken := true
-		var inmemSink sink.Sink
-		if config.APIProxy != nil {
-			if config.APIProxy.UseAutoAuthToken {
-				apiProxyLogger.Debug("auto-auth token is allowed to be used; configuring inmem sink")
-				inmemSink, err = inmem.New(&sink.SinkConfig{
-					Logger: apiProxyLogger,
-				}, leaseCache)
-				if err != nil {
-					c.UI.Error(fmt.Sprintf("Error creating inmem sink for cache: %v", err))
-					return 1
-				}
-				sinks = append(sinks, &sink.SinkConfig{
-					Logger: apiProxyLogger,
-					Sink:   inmemSink,
-				})
-			}
-			proxyVaultToken = !config.APIProxy.ForceAutoAuthToken
-		}
-
-		var muxHandler http.Handler
-		if leaseCache != nil {
-			muxHandler = cache.ProxyHandler(ctx, apiProxyLogger, leaseCache, inmemSink, proxyVaultToken)
-		} else {
-			muxHandler = cache.ProxyHandler(ctx, apiProxyLogger, apiProxy, inmemSink, proxyVaultToken)
-		}
-
-		// Parse 'require_request_header' listener config option, and wrap
-		// the request handler if necessary
-		if lnConfig.RequireRequestHeader && ("metrics_only" != lnConfig.Role) {
-			muxHandler = verifyRequestHeader(muxHandler)
-		}
-
-		// Create a muxer and add paths relevant for the lease cache layer
-		mux := http.NewServeMux()
-		quitEnabled := lnConfig.ProxyAPI != nil && lnConfig.ProxyAPI.EnableQuit
-
-		mux.Handle(consts.ProxyPathMetrics, c.handleMetrics())
-		if "metrics_only" != lnConfig.Role {
-			mux.Handle(consts.ProxyPathCacheClear, leaseCache.HandleCacheClear(ctx))
-			mux.Handle(consts.ProxyPathQuit, c.handleQuit(quitEnabled))
-			mux.Handle("/", muxHandler)
-		}
-
-		scheme := "https://"
-		if tlsCfg == nil {
-			scheme = "http://"
-		}
-		if ln.Addr().Network() == "unix" {
-			scheme = "unix://"
-		}
-
-		infoKey := fmt.Sprintf("api address %d", i+1)
-		info[infoKey] = scheme + ln.Addr().String()
-		infoKeys = append(infoKeys, infoKey)
-
-		server := &http.Server{
-			Addr:              ln.Addr().String(),
-			TLSConfig:         tlsCfg,
-			Handler:           mux,
-			ReadHeaderTimeout: 10 * time.Second,
-			ReadTimeout:       30 * time.Second,
-			IdleTimeout:       5 * time.Minute,
-			ErrorLog:          apiProxyLogger.StandardLogger(nil),
-		}
-
-		go server.Serve(ln)
-	}
-
-	c.tlsReloadFuncsLock.Unlock()
-
-	// Ensure that listeners are closed at all the exits
-	listenerCloseFunc := func() {
-		for _, ln := range listeners {
-			ln.Close()
-		}
-	}
-	defer c.cleanupGuard.Do(listenerCloseFunc)
-
-	// Inform any tests that the server is ready
-	if c.startedCh != nil {
-		close(c.startedCh)
-	}
-
-	var g run.Group
-
-	g.Add(func() error {
-		for {
-			select {
-			case <-c.SighupCh:
-				c.UI.Output("==> Vault Proxy config reload triggered")
-				err := c.reloadConfig(c.flagConfigs)
-				if err != nil {
-					c.outputErrors(err)
-				}
-				// Send the 'reloaded' message on the relevant channel
-				select {
-				case c.reloadedCh <- struct{}{}:
-				default:
-				}
-			case <-ctx.Done():
-				return nil
-			}
-		}
-	}, func(error) {
-		cancelFunc()
-	})
-
-	// This run group watches for signal termination
-	g.Add(func() error {
-		for {
-			select {
-			case <-c.ShutdownCh:
-				c.UI.Output("==> Vault Proxy shutdown triggered")
-				// Notify systemd that the server is shutting down
-				// Let the lease cache know this is a shutdown; no need to evict everything
-				if leaseCache != nil {
-					leaseCache.SetShuttingDown(true)
-				}
-				return nil
-			case <-ctx.Done():
-				return nil
-			case <-winsvc.ShutdownChannel():
-				return nil
-			}
-		}
-	}, func(error) {})
-
-	// Start auto-auth and sink servers
-	if method != nil {
-		// Auth Handler is going to set its own retry values, so we want to
-		// work on a copy of the client to not affect other subsystems.
-		ahClient, err := c.client.CloneWithHeaders()
-		if err != nil {
-			c.UI.Error(fmt.Sprintf("Error cloning client for auth handler: %v", err))
-			return 1
-		}
-
-		if config.DisableIdleConnsAutoAuth {
-			ahClient.SetMaxIdleConnections(-1)
-		}
-
-		if config.DisableKeepAlivesAutoAuth {
-			ahClient.SetDisableKeepAlives(true)
-		}
-
-		ah := auth.NewAuthHandler(&auth.AuthHandlerConfig{
-			Logger:                       c.logger.Named("auth.handler"),
-			Client:                       ahClient,
-			WrapTTL:                      config.AutoAuth.Method.WrapTTL,
-			MinBackoff:                   config.AutoAuth.Method.MinBackoff,
-			MaxBackoff:                   config.AutoAuth.Method.MaxBackoff,
-			EnableReauthOnNewCredentials: config.AutoAuth.EnableReauthOnNewCredentials,
-			Token:                        previousToken,
-			ExitOnError:                  config.AutoAuth.Method.ExitOnError,
-			UserAgent:                    useragent.ProxyAutoAuthString(),
-			MetricsSignifier:             "proxy",
-		})
-
-		ss := sink.NewSinkServer(&sink.SinkServerConfig{
-			Logger:        c.logger.Named("sink.server"),
-			Client:        ahClient,
-			ExitAfterAuth: config.ExitAfterAuth,
-		})
-
-		g.Add(func() error {
-			return ah.Run(ctx, method)
-		}, func(error) {
-			// Let the lease cache know this is a shutdown; no need to evict
-			// everything
-			if leaseCache != nil {
-				leaseCache.SetShuttingDown(true)
-			}
-			cancelFunc()
-		})
-
-		g.Add(func() error {
-			err := ss.Run(ctx, ah.OutputCh, sinks)
-			c.logger.Info("sinks finished, exiting")
-
-			// Start goroutine to drain from ah.OutputCh from this point onward
-			// to prevent ah.Run from being blocked.
-			go func() {
-				for {
-					select {
-					case <-ctx.Done():
-						return
-					case <-ah.OutputCh:
-					}
-				}
-			}()
-
-			return err
-		}, func(error) {
-			// Let the lease cache know this is a shutdown; no need to evict
-			// everything
-			if leaseCache != nil {
-				leaseCache.SetShuttingDown(true)
-			}
-			cancelFunc()
-		})
-	}
-
-	// Server configuration output
-	padding := 24
-	sort.Strings(infoKeys)
-	caser := cases.Title(language.English)
-	c.UI.Output("==> Vault Proxy configuration:\n")
-	for _, k := range infoKeys {
-		c.UI.Output(fmt.Sprintf(
-			"%s%s: %s",
-			strings.Repeat(" ", padding-len(k)),
-			caser.String(k),
-			info[k]))
-	}
-	c.UI.Output("")
-
-	// Release the log gate.
-	c.logGate.Flush()
-
-	// Write out the PID to the file now that server has successfully started
-	if err := c.storePidFile(config.PidFile); err != nil {
-		c.UI.Error(fmt.Sprintf("Error storing PID: %s", err))
-		return 1
-	}
-
-	// Notify systemd that the server is ready (if applicable)
-	c.notifySystemd(systemd.SdNotifyReady)
-
-	defer func() {
-		if err := c.removePidFile(config.PidFile); err != nil {
-			c.UI.Error(fmt.Sprintf("Error deleting the PID file: %s", err))
-		}
-	}()
-
-	var exitCode int
-	if err := g.Run(); err != nil {
-		c.logger.Error("runtime error encountered", "error", err)
-		c.UI.Error("Error encountered during run, refer to logs for more details.")
-		exitCode = 1
-	}
-	c.notifySystemd(systemd.SdNotifyStopping)
-	return exitCode
-}
-
-// applyConfigOverrides ensures that the config object accurately reflects the desired
-// settings as configured by the user. It applies the relevant config setting based
-// on the precedence (env var overrides file config, cli overrides env var).
-// It mutates the config object supplied.
-func (c *ProxyCommand) applyConfigOverrides(f *FlagSets, config *proxyConfig.Config) {
-	if config.Vault == nil {
-		config.Vault = &proxyConfig.Vault{}
-	}
-
-	f.applyLogConfigOverrides(config.SharedConfig)
-
-	f.Visit(func(fl *flag.Flag) {
-		if fl.Name == flagNameProxyExitAfterAuth {
-			config.ExitAfterAuth = c.flagExitAfterAuth
-		}
-	})
-
-	c.setStringFlag(f, config.Vault.Address, &StringVar{
-		Name:    flagNameAddress,
-		Target:  &c.flagAddress,
-		Default: "https://127.0.0.1:8200",
-		EnvVar:  api.EnvVaultAddress,
-	})
-	config.Vault.Address = c.flagAddress
-	c.setStringFlag(f, config.Vault.CACert, &StringVar{
-		Name:    flagNameCACert,
-		Target:  &c.flagCACert,
-		Default: "",
-		EnvVar:  api.EnvVaultCACert,
-	})
-	config.Vault.CACert = c.flagCACert
-	c.setStringFlag(f, config.Vault.CAPath, &StringVar{
-		Name:    flagNameCAPath,
-		Target:  &c.flagCAPath,
-		Default: "",
-		EnvVar:  api.EnvVaultCAPath,
-	})
-	config.Vault.CAPath = c.flagCAPath
-	c.setStringFlag(f, config.Vault.ClientCert, &StringVar{
-		Name:    flagNameClientCert,
-		Target:  &c.flagClientCert,
-		Default: "",
-		EnvVar:  api.EnvVaultClientCert,
-	})
-	config.Vault.ClientCert = c.flagClientCert
-	c.setStringFlag(f, config.Vault.ClientKey, &StringVar{
-		Name:    flagNameClientKey,
-		Target:  &c.flagClientKey,
-		Default: "",
-		EnvVar:  api.EnvVaultClientKey,
-	})
-	config.Vault.ClientKey = c.flagClientKey
-	c.setBoolFlag(f, config.Vault.TLSSkipVerify, &BoolVar{
-		Name:    flagNameTLSSkipVerify,
-		Target:  &c.flagTLSSkipVerify,
-		Default: false,
-		EnvVar:  api.EnvVaultSkipVerify,
-	})
-	config.Vault.TLSSkipVerify = c.flagTLSSkipVerify
-	c.setStringFlag(f, config.Vault.TLSServerName, &StringVar{
-		Name:    flagTLSServerName,
-		Target:  &c.flagTLSServerName,
-		Default: "",
-		EnvVar:  api.EnvVaultTLSServerName,
-	})
-	config.Vault.TLSServerName = c.flagTLSServerName
-}
-
-func (c *ProxyCommand) notifySystemd(status string) {
-	sent, err := systemd.SdNotify(false, status)
-	if err != nil {
-		c.logger.Error("error notifying systemd", "error", err)
-	} else {
-		if sent {
-			c.logger.Debug("sent systemd notification", "notification", status)
-		} else {
-			c.logger.Debug("would have sent systemd notification (systemd not present)", "notification", status)
-		}
-	}
-}
-
-func (c *ProxyCommand) setStringFlag(f *FlagSets, configVal string, fVar *StringVar) {
-	var isFlagSet bool
-	f.Visit(func(f *flag.Flag) {
-		if f.Name == fVar.Name {
-			isFlagSet = true
-		}
-	})
-
-	flagEnvValue, flagEnvSet := os.LookupEnv(fVar.EnvVar)
-	switch {
-	case isFlagSet:
-		// Don't do anything as the flag is already set from the command line
-	case flagEnvSet:
-		// Use value from env var
-		*fVar.Target = flagEnvValue
-	case configVal != "":
-		// Use value from config
-		*fVar.Target = configVal
-	default:
-		// Use the default value
-		*fVar.Target = fVar.Default
-	}
-}
-
-func (c *ProxyCommand) setBoolFlag(f *FlagSets, configVal bool, fVar *BoolVar) {
-	var isFlagSet bool
-	f.Visit(func(f *flag.Flag) {
-		if f.Name == fVar.Name {
-			isFlagSet = true
-		}
-	})
-
-	flagEnvValue, flagEnvSet := os.LookupEnv(fVar.EnvVar)
-	switch {
-	case isFlagSet:
-		// Don't do anything as the flag is already set from the command line
-	case flagEnvSet:
-		// Use value from env var
-		*fVar.Target = flagEnvValue != ""
-	case configVal:
-		// Use value from config
-		*fVar.Target = configVal
-	default:
-		// Use the default value
-		*fVar.Target = fVar.Default
-	}
-}
-
-// storePidFile is used to write out our PID to a file if necessary
-func (c *ProxyCommand) storePidFile(pidPath string) error {
-	// Quit fast if no pidfile
-	if pidPath == "" {
-		return nil
-	}
-
-	// Open the PID file
-	pidFile, err := os.OpenFile(pidPath, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0o600)
-	if err != nil {
-		return fmt.Errorf("could not open pid file: %w", err)
-	}
-	defer pidFile.Close()
-
-	// Write out the PID
-	pid := os.Getpid()
-	_, err = pidFile.WriteString(fmt.Sprintf("%d", pid))
-	if err != nil {
-		return fmt.Errorf("could not write to pid file: %w", err)
-	}
-	return nil
-}
-
-// removePidFile is used to cleanup the PID file if necessary
-func (c *ProxyCommand) removePidFile(pidPath string) error {
-	if pidPath == "" {
-		return nil
-	}
-	return os.Remove(pidPath)
-}
-
-func (c *ProxyCommand) handleMetrics() http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if r.Method != http.MethodGet {
-			logical.RespondError(w, http.StatusMethodNotAllowed, nil)
-			return
-		}
-
-		if err := r.ParseForm(); err != nil {
-			logical.RespondError(w, http.StatusBadRequest, err)
-			return
-		}
-
-		format := r.Form.Get("format")
-		if format == "" {
-			format = metricsutil.FormatFromRequest(&logical.Request{
-				Headers: r.Header,
-			})
-		}
-
-		resp := c.metricsHelper.ResponseForFormat(format)
-
-		status := resp.Data[logical.HTTPStatusCode].(int)
-		w.Header().Set("Content-Type", resp.Data[logical.HTTPContentType].(string))
-		switch v := resp.Data[logical.HTTPRawBody].(type) {
-		case string:
-			w.WriteHeader(status)
-			w.Write([]byte(v))
-		case []byte:
-			w.WriteHeader(status)
-			w.Write(v)
-		default:
-			logical.RespondError(w, http.StatusInternalServerError, fmt.Errorf("wrong response returned"))
-		}
-	})
-}
-
-func (c *ProxyCommand) handleQuit(enabled bool) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if !enabled {
-			w.WriteHeader(http.StatusNotFound)
-			return
-		}
-
-		switch r.Method {
-		case http.MethodPost:
-		default:
-			w.WriteHeader(http.StatusMethodNotAllowed)
-			return
-		}
-
-		c.logger.Debug("received quit request")
-		close(c.ShutdownCh)
-	})
-}
-
-// newLogger creates a logger based on parsed config field on the Proxy Command struct.
-func (c *ProxyCommand) newLogger() (log.InterceptLogger, error) {
-	if c.config == nil {
-		return nil, fmt.Errorf("cannot create logger, no config")
-	}
-
-	var errors error
-
-	// Parse all the log related config
-	logLevel, err := logging.ParseLogLevel(c.config.LogLevel)
-	if err != nil {
-		errors = multierror.Append(errors, err)
-	}
-
-	logFormat, err := logging.ParseLogFormat(c.config.LogFormat)
-	if err != nil {
-		errors = multierror.Append(errors, err)
-	}
-
-	logRotateDuration, err := parseutil.ParseDurationSecond(c.config.LogRotateDuration)
-	if err != nil {
-		errors = multierror.Append(errors, err)
-	}
-
-	if errors != nil {
-		return nil, errors
-	}
-
-	logCfg := &logging.LogConfig{
-		Name:              "proxy",
-		LogLevel:          logLevel,
-		LogFormat:         logFormat,
-		LogFilePath:       c.config.LogFile,
-		LogRotateDuration: logRotateDuration,
-		LogRotateBytes:    c.config.LogRotateBytes,
-		LogRotateMaxFiles: c.config.LogRotateMaxFiles,
-	}
-
-	l, err := logging.Setup(logCfg, c.logWriter)
-	if err != nil {
-		return nil, err
-	}
-
-	return l, nil
-}
-
-// loadConfig attempts to generate a Proxy config from the file(s) specified.
-func (c *ProxyCommand) loadConfig(paths []string) (*proxyConfig.Config, error) {
-	var errors error
-	cfg := proxyConfig.NewConfig()
-
-	for _, configPath := range paths {
-		configFromPath, err := proxyConfig.LoadConfig(configPath)
-		if err != nil {
-			errors = multierror.Append(errors, fmt.Errorf("error loading configuration from %s: %w", configPath, err))
-		} else {
-			cfg = cfg.Merge(configFromPath)
-		}
-	}
-
-	if errors != nil {
-		return nil, errors
-	}
-
-	if err := cfg.ValidateConfig(); err != nil {
-		return nil, fmt.Errorf("error validating configuration: %w", err)
-	}
-
-	return cfg, nil
-}
-
-// reloadConfig will attempt to reload the config from file(s) and adjust certain
-// config values without requiring a restart of the Vault Proxy.
-// If config is retrieved without error it is stored in the config field of the ProxyCommand.
-// This operation is not atomic and could result in updated config but partially applied config settings.
-// The error returned from this func may be a multierror.
-// This function will most likely be called due to Vault Proxy receiving a SIGHUP signal.
-// Currently only reloading the following are supported:
-// * log level
-// * TLS certs for listeners
-func (c *ProxyCommand) reloadConfig(paths []string) error {
-	// Notify systemd that the server is reloading
-	c.notifySystemd(systemd.SdNotifyReloading)
-	defer c.notifySystemd(systemd.SdNotifyReady)
-
-	var errors error
-
-	// Reload the config
-	cfg, err := c.loadConfig(paths)
-	if err != nil {
-		// Returning single error as we won't continue with bad config and won't 'commit' it.
-		return err
-	}
-	c.config = cfg
-
-	// Update the log level
-	err = c.reloadLogLevel()
-	if err != nil {
-		errors = multierror.Append(errors, err)
-	}
-
-	// Update certs
-	err = c.reloadCerts()
-	if err != nil {
-		errors = multierror.Append(errors, err)
-	}
-
-	return errors
-}
-
-// reloadLogLevel will attempt to update the log level for the logger attached
-// to the ProxyCommand struct using the value currently set in config.
-func (c *ProxyCommand) reloadLogLevel() error {
-	logLevel, err := logging.ParseLogLevel(c.config.LogLevel)
-	if err != nil {
-		return err
-	}
-
-	c.logger.SetLevel(logLevel)
-
-	return nil
-}
-
-// reloadCerts will attempt to reload certificates using a reload func which
-// was provided when the listeners were configured, only funcs that were appended
-// to the ProxyCommand slice will be invoked.
-// This function returns a multierror type so that every func can report an error
-// if it encounters one.
-func (c *ProxyCommand) reloadCerts() error {
-	var errors error
-
-	c.tlsReloadFuncsLock.RLock()
-	defer c.tlsReloadFuncsLock.RUnlock()
-
-	for _, reloadFunc := range c.tlsReloadFuncs {
-		// Non-TLS listeners will have a nil reload func.
-		if reloadFunc != nil {
-			err := reloadFunc()
-			if err != nil {
-				errors = multierror.Append(errors, err)
-			}
-		}
-	}
-
-	return errors
-}
-
-// outputErrors will take an error or multierror and handle outputting each to the UI
-func (c *ProxyCommand) outputErrors(err error) {
-	if err != nil {
-		if me, ok := err.(*multierror.Error); ok {
-			for _, err := range me.Errors {
-				c.UI.Error(err.Error())
-			}
-		} else {
-			c.UI.Error(err.Error())
-		}
-	}
-}
diff --git a/command/proxy/config/config.go b/command/proxy/config/config.go
deleted file mode 100644
index f760f1eb04731..0000000000000
--- a/command/proxy/config/config.go
+++ /dev/null
@@ -1,832 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package config
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"io"
-	"net"
-	"os"
-	"path/filepath"
-	"strings"
-	"time"
-
-	ctconfig "github.com/hashicorp/consul-template/config"
-	"github.com/hashicorp/go-multierror"
-	"github.com/hashicorp/go-secure-stdlib/parseutil"
-	"github.com/hashicorp/hcl"
-	"github.com/hashicorp/hcl/hcl/ast"
-	"github.com/hashicorp/vault/command/agentproxyshared"
-	"github.com/hashicorp/vault/helper/namespace"
-	"github.com/hashicorp/vault/internalshared/configutil"
-)
-
-// Config is the configuration for Vault Proxy.
-type Config struct {
-	*configutil.SharedConfig `hcl:"-"`
-
-	AutoAuth                  *AutoAuth `hcl:"auto_auth"`
-	ExitAfterAuth             bool      `hcl:"exit_after_auth"`
-	Cache                     *Cache    `hcl:"cache"`
-	APIProxy                  *APIProxy `hcl:"api_proxy""`
-	Vault                     *Vault    `hcl:"vault"`
-	DisableIdleConns          []string  `hcl:"disable_idle_connections"`
-	DisableIdleConnsAPIProxy  bool      `hcl:"-"`
-	DisableIdleConnsAutoAuth  bool      `hcl:"-"`
-	DisableKeepAlives         []string  `hcl:"disable_keep_alives"`
-	DisableKeepAlivesAPIProxy bool      `hcl:"-"`
-	DisableKeepAlivesAutoAuth bool      `hcl:"-"`
-}
-
-const (
-	DisableIdleConnsEnv  = "VAULT_PROXY_DISABLE_IDLE_CONNECTIONS"
-	DisableKeepAlivesEnv = "VAULT_PROXY_DISABLE_KEEP_ALIVES"
-)
-
-func (c *Config) Prune() {
-	for _, l := range c.Listeners {
-		l.RawConfig = nil
-		l.Profiling.UnusedKeys = nil
-		l.Telemetry.UnusedKeys = nil
-		l.CustomResponseHeaders = nil
-	}
-	c.FoundKeys = nil
-	c.UnusedKeys = nil
-	c.SharedConfig.FoundKeys = nil
-	c.SharedConfig.UnusedKeys = nil
-	if c.Telemetry != nil {
-		c.Telemetry.FoundKeys = nil
-		c.Telemetry.UnusedKeys = nil
-	}
-}
-
-type Retry struct {
-	NumRetries int `hcl:"num_retries"`
-}
-
-// Vault contains configuration for connecting to Vault servers
-type Vault struct {
-	Address          string      `hcl:"address"`
-	CACert           string      `hcl:"ca_cert"`
-	CAPath           string      `hcl:"ca_path"`
-	TLSSkipVerify    bool        `hcl:"-"`
-	TLSSkipVerifyRaw interface{} `hcl:"tls_skip_verify"`
-	ClientCert       string      `hcl:"client_cert"`
-	ClientKey        string      `hcl:"client_key"`
-	TLSServerName    string      `hcl:"tls_server_name"`
-	Retry            *Retry      `hcl:"retry"`
-}
-
-// transportDialer is an interface that allows passing a custom dialer function
-// to an HTTP client's transport config
-type transportDialer interface {
-	// Dial is intended to match https://pkg.go.dev/net#Dialer.Dial
-	Dial(network, address string) (net.Conn, error)
-
-	// DialContext is intended to match https://pkg.go.dev/net#Dialer.DialContext
-	DialContext(ctx context.Context, network, address string) (net.Conn, error)
-}
-
-// APIProxy contains any configuration needed for proxy mode
-type APIProxy struct {
-	UseAutoAuthTokenRaw interface{} `hcl:"use_auto_auth_token"`
-	UseAutoAuthToken    bool        `hcl:"-"`
-	ForceAutoAuthToken  bool        `hcl:"-"`
-	EnforceConsistency  string      `hcl:"enforce_consistency"`
-	WhenInconsistent    string      `hcl:"when_inconsistent"`
-}
-
-// Cache contains any configuration needed for Cache mode
-type Cache struct {
-	Persist      *agentproxyshared.PersistConfig `hcl:"persist"`
-	InProcDialer transportDialer                 `hcl:"-"`
-}
-
-// AutoAuth is the configured authentication method and sinks
-type AutoAuth struct {
-	Method *Method `hcl:"-"`
-	Sinks  []*Sink `hcl:"sinks"`
-
-	// NOTE: This is unsupported outside of testing and may disappear at any
-	// time.
-	EnableReauthOnNewCredentials bool `hcl:"enable_reauth_on_new_credentials"`
-}
-
-// Method represents the configuration for the authentication backend
-type Method struct {
-	Type          string
-	MountPath     string        `hcl:"mount_path"`
-	WrapTTLRaw    interface{}   `hcl:"wrap_ttl"`
-	WrapTTL       time.Duration `hcl:"-"`
-	MinBackoffRaw interface{}   `hcl:"min_backoff"`
-	MinBackoff    time.Duration `hcl:"-"`
-	MaxBackoffRaw interface{}   `hcl:"max_backoff"`
-	MaxBackoff    time.Duration `hcl:"-"`
-	Namespace     string        `hcl:"namespace"`
-	ExitOnError   bool          `hcl:"exit_on_err"`
-	Config        map[string]interface{}
-}
-
-// Sink defines a location to write the authenticated token
-type Sink struct {
-	Type       string
-	WrapTTLRaw interface{}   `hcl:"wrap_ttl"`
-	WrapTTL    time.Duration `hcl:"-"`
-	DHType     string        `hcl:"dh_type"`
-	DeriveKey  bool          `hcl:"derive_key"`
-	DHPath     string        `hcl:"dh_path"`
-	AAD        string        `hcl:"aad"`
-	AADEnvVar  string        `hcl:"aad_env_var"`
-	Config     map[string]interface{}
-}
-
-func NewConfig() *Config {
-	return &Config{
-		SharedConfig: new(configutil.SharedConfig),
-	}
-}
-
-// Merge merges two Proxy configurations.
-func (c *Config) Merge(c2 *Config) *Config {
-	if c2 == nil {
-		return c
-	}
-
-	result := NewConfig()
-
-	result.SharedConfig = c.SharedConfig
-	if c2.SharedConfig != nil {
-		result.SharedConfig = c.SharedConfig.Merge(c2.SharedConfig)
-	}
-
-	result.AutoAuth = c.AutoAuth
-	if c2.AutoAuth != nil {
-		result.AutoAuth = c2.AutoAuth
-	}
-
-	result.Cache = c.Cache
-	if c2.Cache != nil {
-		result.Cache = c2.Cache
-	}
-
-	result.APIProxy = c.APIProxy
-	if c2.APIProxy != nil {
-		result.APIProxy = c2.APIProxy
-	}
-
-	result.DisableMlock = c.DisableMlock
-	if c2.DisableMlock {
-		result.DisableMlock = c2.DisableMlock
-	}
-
-	// For these, ignore the non-specific one and overwrite them all
-	result.DisableIdleConnsAutoAuth = c.DisableIdleConnsAutoAuth
-	if c2.DisableIdleConnsAutoAuth {
-		result.DisableIdleConnsAutoAuth = c2.DisableIdleConnsAutoAuth
-	}
-
-	result.DisableIdleConnsAPIProxy = c.DisableIdleConnsAPIProxy
-	if c2.DisableIdleConnsAPIProxy {
-		result.DisableIdleConnsAPIProxy = c2.DisableIdleConnsAPIProxy
-	}
-
-	result.DisableKeepAlivesAutoAuth = c.DisableKeepAlivesAutoAuth
-	if c2.DisableKeepAlivesAutoAuth {
-		result.DisableKeepAlivesAutoAuth = c2.DisableKeepAlivesAutoAuth
-	}
-
-	result.DisableKeepAlivesAPIProxy = c.DisableKeepAlivesAPIProxy
-	if c2.DisableKeepAlivesAPIProxy {
-		result.DisableKeepAlivesAPIProxy = c2.DisableKeepAlivesAPIProxy
-	}
-
-	result.ExitAfterAuth = c.ExitAfterAuth
-	if c2.ExitAfterAuth {
-		result.ExitAfterAuth = c2.ExitAfterAuth
-	}
-
-	result.Vault = c.Vault
-	if c2.Vault != nil {
-		result.Vault = c2.Vault
-	}
-
-	result.PidFile = c.PidFile
-	if c2.PidFile != "" {
-		result.PidFile = c2.PidFile
-	}
-
-	return result
-}
-
-// ValidateConfig validates a Vault configuration after it has been fully merged together, to
-// ensure that required combinations of configs are there
-func (c *Config) ValidateConfig() error {
-	if c.Cache != nil {
-		if len(c.Listeners) < 1 {
-			return fmt.Errorf("enabling the cache requires at least 1 listener to be defined")
-		}
-	}
-
-	if c.APIProxy != nil {
-		if len(c.Listeners) < 1 {
-			return fmt.Errorf("configuring the api_proxy requires at least 1 listener to be defined")
-		}
-
-		if c.APIProxy.UseAutoAuthToken {
-			if c.AutoAuth == nil {
-				return fmt.Errorf("api_proxy.use_auto_auth_token is true but auto_auth not configured")
-			}
-			if c.AutoAuth != nil && c.AutoAuth.Method != nil && c.AutoAuth.Method.WrapTTL > 0 {
-				return fmt.Errorf("api_proxy.use_auto_auth_token is true and auto_auth uses wrapping")
-			}
-		}
-	}
-
-	if c.AutoAuth != nil {
-		if len(c.AutoAuth.Sinks) == 0 &&
-			(c.APIProxy == nil || !c.APIProxy.UseAutoAuthToken) {
-			return fmt.Errorf("auto_auth requires at least one sink or api_proxy.use_auto_auth_token=true")
-		}
-	}
-
-	if c.AutoAuth == nil && c.Cache == nil && len(c.Listeners) == 0 {
-		return fmt.Errorf("no auto_auth, cache, or listener block found in config")
-	}
-
-	return nil
-}
-
-// LoadConfig loads the configuration at the given path, regardless if
-// it's a file or directory.
-func LoadConfig(path string) (*Config, error) {
-	fi, err := os.Stat(path)
-	if err != nil {
-		return nil, err
-	}
-
-	if fi.IsDir() {
-		return LoadConfigDir(path)
-	}
-	return LoadConfigFile(path)
-}
-
-// LoadConfigDir loads the configuration at the given path if it's a directory
-func LoadConfigDir(dir string) (*Config, error) {
-	f, err := os.Open(dir)
-	if err != nil {
-		return nil, err
-	}
-	defer f.Close()
-
-	fi, err := f.Stat()
-	if err != nil {
-		return nil, err
-	}
-	if !fi.IsDir() {
-		return nil, fmt.Errorf("configuration path must be a directory: %q", dir)
-	}
-
-	var files []string
-	err = nil
-	for err != io.EOF {
-		var fis []os.FileInfo
-		fis, err = f.Readdir(128)
-		if err != nil && err != io.EOF {
-			return nil, err
-		}
-
-		for _, fi := range fis {
-			// Ignore directories
-			if fi.IsDir() {
-				continue
-			}
-
-			// Only care about files that are valid to load.
-			name := fi.Name()
-			skip := true
-			if strings.HasSuffix(name, ".hcl") {
-				skip = false
-			} else if strings.HasSuffix(name, ".json") {
-				skip = false
-			}
-			if skip || isTemporaryFile(name) {
-				continue
-			}
-
-			path := filepath.Join(dir, name)
-			files = append(files, path)
-		}
-	}
-
-	result := NewConfig()
-	for _, f := range files {
-		config, err := LoadConfigFile(f)
-		if err != nil {
-			return nil, fmt.Errorf("error loading %q: %w", f, err)
-		}
-
-		if result == nil {
-			result = config
-		} else {
-			result = result.Merge(config)
-		}
-	}
-
-	return result, nil
-}
-
-// isTemporaryFile returns true or false depending on whether the
-// provided file name is a temporary file for the following editors:
-// emacs or vim.
-func isTemporaryFile(name string) bool {
-	return strings.HasSuffix(name, "~") || // vim
-		strings.HasPrefix(name, ".#") || // emacs
-		(strings.HasPrefix(name, "#") && strings.HasSuffix(name, "#")) // emacs
-}
-
-// LoadConfigFile loads the configuration at the given path if it's a file
-func LoadConfigFile(path string) (*Config, error) {
-	fi, err := os.Stat(path)
-	if err != nil {
-		return nil, err
-	}
-
-	if fi.IsDir() {
-		return nil, fmt.Errorf("location is a directory, not a file")
-	}
-
-	// Read the file
-	d, err := os.ReadFile(path)
-	if err != nil {
-		return nil, err
-	}
-
-	// Parse!
-	obj, err := hcl.Parse(string(d))
-	if err != nil {
-		return nil, err
-	}
-
-	// Attribute
-	ast.Walk(obj, func(n ast.Node) (ast.Node, bool) {
-		if k, ok := n.(*ast.ObjectKey); ok {
-			k.Token.Pos.Filename = path
-		}
-		return n, true
-	})
-
-	// Start building the result
-	result := NewConfig()
-	if err := hcl.DecodeObject(result, obj); err != nil {
-		return nil, err
-	}
-
-	sharedConfig, err := configutil.ParseConfig(string(d))
-	if err != nil {
-		return nil, err
-	}
-
-	// Pruning custom headers for Vault for now
-	for _, ln := range sharedConfig.Listeners {
-		ln.CustomResponseHeaders = nil
-	}
-
-	result.SharedConfig = sharedConfig
-
-	list, ok := obj.Node.(*ast.ObjectList)
-	if !ok {
-		return nil, fmt.Errorf("error parsing: file doesn't contain a root object")
-	}
-
-	if err := parseAutoAuth(result, list); err != nil {
-		return nil, fmt.Errorf("error parsing 'auto_auth': %w", err)
-	}
-
-	if err := parseCache(result, list); err != nil {
-		return nil, fmt.Errorf("error parsing 'cache':%w", err)
-	}
-
-	if err := parseAPIProxy(result, list); err != nil {
-		return nil, fmt.Errorf("error parsing 'api_proxy':%w", err)
-	}
-
-	err = parseVault(result, list)
-	if err != nil {
-		return nil, fmt.Errorf("error parsing 'vault':%w", err)
-	}
-
-	if result.Vault != nil {
-		// Set defaults
-		if result.Vault.Retry == nil {
-			result.Vault.Retry = &Retry{}
-		}
-		switch result.Vault.Retry.NumRetries {
-		case 0:
-			result.Vault.Retry.NumRetries = ctconfig.DefaultRetryAttempts
-		case -1:
-			result.Vault.Retry.NumRetries = 0
-		}
-	}
-
-	if disableIdleConnsEnv := os.Getenv(DisableIdleConnsEnv); disableIdleConnsEnv != "" {
-		result.DisableIdleConns, err = parseutil.ParseCommaStringSlice(strings.ToLower(disableIdleConnsEnv))
-		if err != nil {
-			return nil, fmt.Errorf("error parsing environment variable %s: %v", DisableIdleConnsEnv, err)
-		}
-	}
-
-	for _, subsystem := range result.DisableIdleConns {
-		switch subsystem {
-		case "auto-auth":
-			result.DisableIdleConnsAutoAuth = true
-		case "caching", "proxying":
-			result.DisableIdleConnsAPIProxy = true
-		case "":
-			continue
-		default:
-			return nil, fmt.Errorf("unknown disable_idle_connections value: %s", subsystem)
-		}
-	}
-
-	if disableKeepAlivesEnv := os.Getenv(DisableKeepAlivesEnv); disableKeepAlivesEnv != "" {
-		result.DisableKeepAlives, err = parseutil.ParseCommaStringSlice(strings.ToLower(disableKeepAlivesEnv))
-		if err != nil {
-			return nil, fmt.Errorf("error parsing environment variable %s: %v", DisableKeepAlivesEnv, err)
-		}
-	}
-
-	for _, subsystem := range result.DisableKeepAlives {
-		switch subsystem {
-		case "auto-auth":
-			result.DisableKeepAlivesAutoAuth = true
-		case "caching", "proxying":
-			result.DisableKeepAlivesAPIProxy = true
-		case "":
-			continue
-		default:
-			return nil, fmt.Errorf("unknown disable_keep_alives value: %s", subsystem)
-		}
-	}
-
-	return result, nil
-}
-
-func parseVault(result *Config, list *ast.ObjectList) error {
-	name := "vault"
-
-	vaultList := list.Filter(name)
-	if len(vaultList.Items) == 0 {
-		return nil
-	}
-
-	if len(vaultList.Items) > 1 {
-		return fmt.Errorf("one and only one %q block is required", name)
-	}
-
-	item := vaultList.Items[0]
-
-	var v Vault
-	err := hcl.DecodeObject(&v, item.Val)
-	if err != nil {
-		return err
-	}
-
-	if v.TLSSkipVerifyRaw != nil {
-		v.TLSSkipVerify, err = parseutil.ParseBool(v.TLSSkipVerifyRaw)
-		if err != nil {
-			return err
-		}
-	}
-
-	result.Vault = &v
-
-	subs, ok := item.Val.(*ast.ObjectType)
-	if !ok {
-		return fmt.Errorf("could not parse %q as an object", name)
-	}
-
-	if err := parseRetry(result, subs.List); err != nil {
-		return fmt.Errorf("error parsing 'retry': %w", err)
-	}
-
-	return nil
-}
-
-func parseRetry(result *Config, list *ast.ObjectList) error {
-	name := "retry"
-
-	retryList := list.Filter(name)
-	if len(retryList.Items) == 0 {
-		return nil
-	}
-
-	if len(retryList.Items) > 1 {
-		return fmt.Errorf("one and only one %q block is required", name)
-	}
-
-	item := retryList.Items[0]
-
-	var r Retry
-	err := hcl.DecodeObject(&r, item.Val)
-	if err != nil {
-		return err
-	}
-
-	result.Vault.Retry = &r
-
-	return nil
-}
-
-func parseAPIProxy(result *Config, list *ast.ObjectList) error {
-	name := "api_proxy"
-
-	apiProxyList := list.Filter(name)
-	if len(apiProxyList.Items) == 0 {
-		return nil
-	}
-
-	if len(apiProxyList.Items) > 1 {
-		return fmt.Errorf("one and only one %q block is required", name)
-	}
-
-	item := apiProxyList.Items[0]
-
-	var apiProxy APIProxy
-	err := hcl.DecodeObject(&apiProxy, item.Val)
-	if err != nil {
-		return err
-	}
-
-	if apiProxy.UseAutoAuthTokenRaw != nil {
-		apiProxy.UseAutoAuthToken, err = parseutil.ParseBool(apiProxy.UseAutoAuthTokenRaw)
-		if err != nil {
-			// Could be a value of "force" instead of "true"/"false"
-			switch apiProxy.UseAutoAuthTokenRaw.(type) {
-			case string:
-				v := apiProxy.UseAutoAuthTokenRaw.(string)
-
-				if !strings.EqualFold(v, "force") {
-					return fmt.Errorf("value of 'use_auto_auth_token' can be either true/false/force, %q is an invalid option", apiProxy.UseAutoAuthTokenRaw)
-				}
-				apiProxy.UseAutoAuthToken = true
-				apiProxy.ForceAutoAuthToken = true
-
-			default:
-				return err
-			}
-		}
-	}
-	result.APIProxy = &apiProxy
-
-	return nil
-}
-
-func parseCache(result *Config, list *ast.ObjectList) error {
-	name := "cache"
-
-	cacheList := list.Filter(name)
-	if len(cacheList.Items) == 0 {
-		return nil
-	}
-
-	if len(cacheList.Items) > 1 {
-		return fmt.Errorf("one and only one %q block is required", name)
-	}
-
-	item := cacheList.Items[0]
-
-	var c Cache
-	err := hcl.DecodeObject(&c, item.Val)
-	if err != nil {
-		return err
-	}
-
-	result.Cache = &c
-
-	subs, ok := item.Val.(*ast.ObjectType)
-	if !ok {
-		return fmt.Errorf("could not parse %q as an object", name)
-	}
-	subList := subs.List
-	if err := parsePersist(result, subList); err != nil {
-		return fmt.Errorf("error parsing persist: %w", err)
-	}
-
-	return nil
-}
-
-func parsePersist(result *Config, list *ast.ObjectList) error {
-	name := "persist"
-
-	persistList := list.Filter(name)
-	if len(persistList.Items) == 0 {
-		return nil
-	}
-
-	if len(persistList.Items) > 1 {
-		return fmt.Errorf("only one %q block is required", name)
-	}
-
-	item := persistList.Items[0]
-
-	var p agentproxyshared.PersistConfig
-	err := hcl.DecodeObject(&p, item.Val)
-	if err != nil {
-		return err
-	}
-
-	if p.Type == "" {
-		if len(item.Keys) == 1 {
-			p.Type = strings.ToLower(item.Keys[0].Token.Value().(string))
-		}
-		if p.Type == "" {
-			return errors.New("persist type must be specified")
-		}
-	}
-
-	result.Cache.Persist = &p
-
-	return nil
-}
-
-func parseAutoAuth(result *Config, list *ast.ObjectList) error {
-	name := "auto_auth"
-
-	autoAuthList := list.Filter(name)
-	if len(autoAuthList.Items) == 0 {
-		return nil
-	}
-	if len(autoAuthList.Items) > 1 {
-		return fmt.Errorf("at most one %q block is allowed", name)
-	}
-
-	// Get our item
-	item := autoAuthList.Items[0]
-
-	var a AutoAuth
-	if err := hcl.DecodeObject(&a, item.Val); err != nil {
-		return err
-	}
-
-	result.AutoAuth = &a
-
-	subs, ok := item.Val.(*ast.ObjectType)
-	if !ok {
-		return fmt.Errorf("could not parse %q as an object", name)
-	}
-	subList := subs.List
-
-	if err := parseMethod(result, subList); err != nil {
-		return fmt.Errorf("error parsing 'method': %w", err)
-	}
-	if a.Method == nil {
-		return fmt.Errorf("no 'method' block found")
-	}
-
-	if err := parseSinks(result, subList); err != nil {
-		return fmt.Errorf("error parsing 'sink' stanzas: %w", err)
-	}
-
-	if result.AutoAuth.Method.WrapTTL > 0 {
-		if len(result.AutoAuth.Sinks) != 1 {
-			return fmt.Errorf("error parsing auto_auth: wrapping enabled on auth method and 0 or many sinks defined")
-		}
-
-		if result.AutoAuth.Sinks[0].WrapTTL > 0 {
-			return fmt.Errorf("error parsing auto_auth: wrapping enabled both on auth method and sink")
-		}
-	}
-
-	if result.AutoAuth.Method.MaxBackoffRaw != nil {
-		var err error
-		if result.AutoAuth.Method.MaxBackoff, err = parseutil.ParseDurationSecond(result.AutoAuth.Method.MaxBackoffRaw); err != nil {
-			return err
-		}
-		result.AutoAuth.Method.MaxBackoffRaw = nil
-	}
-
-	if result.AutoAuth.Method.MinBackoffRaw != nil {
-		var err error
-		if result.AutoAuth.Method.MinBackoff, err = parseutil.ParseDurationSecond(result.AutoAuth.Method.MinBackoffRaw); err != nil {
-			return err
-		}
-		result.AutoAuth.Method.MinBackoffRaw = nil
-	}
-
-	return nil
-}
-
-func parseMethod(result *Config, list *ast.ObjectList) error {
-	name := "method"
-
-	methodList := list.Filter(name)
-	if len(methodList.Items) != 1 {
-		return fmt.Errorf("one and only one %q block is required", name)
-	}
-
-	// Get our item
-	item := methodList.Items[0]
-
-	var m Method
-	if err := hcl.DecodeObject(&m, item.Val); err != nil {
-		return err
-	}
-
-	if m.Type == "" {
-		if len(item.Keys) == 1 {
-			m.Type = strings.ToLower(item.Keys[0].Token.Value().(string))
-		}
-		if m.Type == "" {
-			return errors.New("method type must be specified")
-		}
-	}
-
-	// Default to Vault's default
-	if m.MountPath == "" {
-		m.MountPath = fmt.Sprintf("auth/%s", m.Type)
-	}
-	// Standardize on no trailing slash
-	m.MountPath = strings.TrimSuffix(m.MountPath, "/")
-
-	if m.WrapTTLRaw != nil {
-		var err error
-		if m.WrapTTL, err = parseutil.ParseDurationSecond(m.WrapTTLRaw); err != nil {
-			return err
-		}
-		m.WrapTTLRaw = nil
-	}
-
-	// Canonicalize namespace path if provided
-	m.Namespace = namespace.Canonicalize(m.Namespace)
-
-	result.AutoAuth.Method = &m
-	return nil
-}
-
-func parseSinks(result *Config, list *ast.ObjectList) error {
-	name := "sink"
-
-	sinkList := list.Filter(name)
-	if len(sinkList.Items) < 1 {
-		return nil
-	}
-
-	var ts []*Sink
-
-	for _, item := range sinkList.Items {
-		var s Sink
-		if err := hcl.DecodeObject(&s, item.Val); err != nil {
-			return err
-		}
-
-		if s.Type == "" {
-			if len(item.Keys) == 1 {
-				s.Type = strings.ToLower(item.Keys[0].Token.Value().(string))
-			}
-			if s.Type == "" {
-				return errors.New("sink type must be specified")
-			}
-		}
-
-		if s.WrapTTLRaw != nil {
-			var err error
-			if s.WrapTTL, err = parseutil.ParseDurationSecond(s.WrapTTLRaw); err != nil {
-				return multierror.Prefix(err, fmt.Sprintf("sink.%s", s.Type))
-			}
-			s.WrapTTLRaw = nil
-		}
-
-		switch s.DHType {
-		case "":
-		case "curve25519":
-		default:
-			return multierror.Prefix(errors.New("invalid value for 'dh_type'"), fmt.Sprintf("sink.%s", s.Type))
-		}
-
-		if s.AADEnvVar != "" {
-			s.AAD = os.Getenv(s.AADEnvVar)
-			s.AADEnvVar = ""
-		}
-
-		switch {
-		case s.DHPath == "" && s.DHType == "":
-			if s.AAD != "" {
-				return multierror.Prefix(errors.New("specifying AAD data without 'dh_type' does not make sense"), fmt.Sprintf("sink.%s", s.Type))
-			}
-			if s.DeriveKey {
-				return multierror.Prefix(errors.New("specifying 'derive_key' data without 'dh_type' does not make sense"), fmt.Sprintf("sink.%s", s.Type))
-			}
-		case s.DHPath != "" && s.DHType != "":
-		default:
-			return multierror.Prefix(errors.New("'dh_type' and 'dh_path' must be specified together"), fmt.Sprintf("sink.%s", s.Type))
-		}
-
-		ts = append(ts, &s)
-	}
-
-	result.AutoAuth.Sinks = ts
-	return nil
-}
diff --git a/command/proxy/config/config_test.go b/command/proxy/config/config_test.go
deleted file mode 100644
index 612d7a6865085..0000000000000
--- a/command/proxy/config/config_test.go
+++ /dev/null
@@ -1,119 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package config
-
-import (
-	"testing"
-
-	"github.com/go-test/deep"
-	"github.com/hashicorp/vault/command/agentproxyshared"
-	"github.com/hashicorp/vault/internalshared/configutil"
-)
-
-// TestLoadConfigFile_ProxyCache tests loading a config file containing a cache
-// as well as a valid proxy config.
-func TestLoadConfigFile_ProxyCache(t *testing.T) {
-	config, err := LoadConfigFile("./test-fixtures/config-cache.hcl")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	expected := &Config{
-		SharedConfig: &configutil.SharedConfig{
-			PidFile: "./pidfile",
-			Listeners: []*configutil.Listener{
-				{
-					Type:        "unix",
-					Address:     "/path/to/socket",
-					TLSDisable:  true,
-					SocketMode:  "configmode",
-					SocketUser:  "configuser",
-					SocketGroup: "configgroup",
-				},
-				{
-					Type:       "tcp",
-					Address:    "127.0.0.1:8300",
-					TLSDisable: true,
-				},
-				{
-					Type:       "tcp",
-					Address:    "127.0.0.1:3000",
-					Role:       "metrics_only",
-					TLSDisable: true,
-				},
-				{
-					Type:        "tcp",
-					Role:        "default",
-					Address:     "127.0.0.1:8400",
-					TLSKeyFile:  "/path/to/cakey.pem",
-					TLSCertFile: "/path/to/cacert.pem",
-				},
-			},
-		},
-		AutoAuth: &AutoAuth{
-			Method: &Method{
-				Type:      "aws",
-				MountPath: "auth/aws",
-				Config: map[string]interface{}{
-					"role": "foobar",
-				},
-			},
-			Sinks: []*Sink{
-				{
-					Type:   "file",
-					DHType: "curve25519",
-					DHPath: "/tmp/file-foo-dhpath",
-					AAD:    "foobar",
-					Config: map[string]interface{}{
-						"path": "/tmp/file-foo",
-					},
-				},
-			},
-		},
-		APIProxy: &APIProxy{
-			EnforceConsistency:  "always",
-			WhenInconsistent:    "retry",
-			UseAutoAuthTokenRaw: true,
-			UseAutoAuthToken:    true,
-			ForceAutoAuthToken:  false,
-		},
-		Cache: &Cache{
-			Persist: &agentproxyshared.PersistConfig{
-				Type:                    "kubernetes",
-				Path:                    "/vault/agent-cache/",
-				KeepAfterImport:         true,
-				ExitOnErr:               true,
-				ServiceAccountTokenFile: "/tmp/serviceaccount/token",
-			},
-		},
-		Vault: &Vault{
-			Address:          "http://127.0.0.1:1111",
-			CACert:           "config_ca_cert",
-			CAPath:           "config_ca_path",
-			TLSSkipVerifyRaw: interface{}("true"),
-			TLSSkipVerify:    true,
-			ClientCert:       "config_client_cert",
-			ClientKey:        "config_client_key",
-			Retry: &Retry{
-				NumRetries: 12,
-			},
-		},
-	}
-
-	config.Prune()
-	if diff := deep.Equal(config, expected); diff != nil {
-		t.Fatal(diff)
-	}
-
-	config, err = LoadConfigFile("./test-fixtures/config-cache-embedded-type.hcl")
-	if err != nil {
-		t.Fatal(err)
-	}
-	expected.Vault.TLSSkipVerifyRaw = interface{}(true)
-
-	config.Prune()
-	if diff := deep.Equal(config, expected); diff != nil {
-		t.Fatal(diff)
-	}
-}
diff --git a/command/proxy/config/test-fixtures/config-cache-embedded-type.hcl b/command/proxy/config/test-fixtures/config-cache-embedded-type.hcl
deleted file mode 100644
index a7d8ef44c59e2..0000000000000
--- a/command/proxy/config/test-fixtures/config-cache-embedded-type.hcl
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
-pid_file = "./pidfile"
-
-auto_auth {
-	method {
-		type = "aws"
-		config = {
-			role = "foobar"
-		}
-	}
-
-	sink {
-		type = "file"
-		config = {
-			path = "/tmp/file-foo"
-		}
-		aad = "foobar"
-		dh_type = "curve25519"
-		dh_path = "/tmp/file-foo-dhpath"
-	}
-}
-
-api_proxy {
-	use_auto_auth_token = true
-	enforce_consistency = "always"
-	when_inconsistent = "retry"
-}
-
-cache {
-	persist "kubernetes" {
-		path = "/vault/agent-cache/"
-		keep_after_import = true
-		exit_on_err = true
-		service_account_token_file = "/tmp/serviceaccount/token"
-	}
-}
-
-listener {
-    type = "unix"
-    address = "/path/to/socket"
-    tls_disable = true
-    socket_mode = "configmode"
-    socket_user = "configuser"
-    socket_group = "configgroup"
-}
-
-listener {
-    type = "tcp"
-    address = "127.0.0.1:8300"
-    tls_disable = true
-}
-
-listener {
-    type = "tcp"
-    address = "127.0.0.1:3000"
-    tls_disable = true
-    role = "metrics_only"
-}
-
-listener {
-    type = "tcp"
-    role = "default"
-    address = "127.0.0.1:8400"
-    tls_key_file = "/path/to/cakey.pem"
-    tls_cert_file = "/path/to/cacert.pem"
-}
-
-vault {
-	address = "http://127.0.0.1:1111"
-	ca_cert = "config_ca_cert"
-	ca_path = "config_ca_path"
-	tls_skip_verify = true
-	client_cert = "config_client_cert"
-	client_key = "config_client_key"
-}
diff --git a/command/proxy/config/test-fixtures/config-cache.hcl b/command/proxy/config/test-fixtures/config-cache.hcl
deleted file mode 100644
index d770391fe5b09..0000000000000
--- a/command/proxy/config/test-fixtures/config-cache.hcl
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
-pid_file = "./pidfile"
-
-auto_auth {
-	method {
-		type = "aws"
-		config = {
-			role = "foobar"
-		}
-	}
-
-	sink {
-		type = "file"
-		config = {
-			path = "/tmp/file-foo"
-		}
-		aad = "foobar"
-		dh_type = "curve25519"
-		dh_path = "/tmp/file-foo-dhpath"
-	}
-}
-
-api_proxy {
-	use_auto_auth_token = true
-	enforce_consistency = "always"
-	when_inconsistent = "retry"
-}
-
-cache {
-	persist = {
-		type = "kubernetes"
-		path = "/vault/agent-cache/"
-		keep_after_import = true
-		exit_on_err = true
-		service_account_token_file = "/tmp/serviceaccount/token"
-	}
-}
-
-listener "unix" {
-    address = "/path/to/socket"
-    tls_disable = true
-    socket_mode = "configmode"
-    socket_user = "configuser"
-    socket_group = "configgroup"
-}
-
-listener "tcp" {
-    address = "127.0.0.1:8300"
-    tls_disable = true
-}
-
-listener {
-    type = "tcp"
-    address = "127.0.0.1:3000"
-    tls_disable = true
-    role = "metrics_only"
-}
-
-listener "tcp" {
-    role = "default"
-    address = "127.0.0.1:8400"
-    tls_key_file = "/path/to/cakey.pem"
-    tls_cert_file = "/path/to/cacert.pem"
-}
-
-vault {
-	address = "http://127.0.0.1:1111"
-	ca_cert = "config_ca_cert"
-	ca_path = "config_ca_path"
-	tls_skip_verify = "true"
-	client_cert = "config_client_cert"
-	client_key = "config_client_key"
-}
diff --git a/command/proxy/test-fixtures/reload/reload_bar.key b/command/proxy/test-fixtures/reload/reload_bar.key
deleted file mode 100644
index 10849fbe1d7f3..0000000000000
--- a/command/proxy/test-fixtures/reload/reload_bar.key
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAwF7sRAyUiLcd6es6VeaTRUBOusFFGkmKJ5lU351waCJqXFju
-Z6i/SQYNAAnnRgotXSTE1fIPjE2kZNH1hvqE5IpTGgAwy50xpjJrrBBI6e9lyKqj
-7T8gLVNBvtC0cpQi+pGrszEI0ckDQCSZHqi/PAzcpmLUgh2KMrgagT+YlN35KHtl
-/bQ/Fsn+kqykVqNw69n/CDKNKdDHn1qPwiX9q/fTMj3EG6g+3ntKrUOh8V/gHKPz
-q8QGP/wIud2K+tTSorVXr/4zx7xgzlbJkCakzcQQiP6K+paPnDRlE8fK+1gRRyR7
-XCzyp0irUl8G1NjYAR/tVWxiUhlk/jZutb8PpwIDAQABAoIBAEOzJELuindyujxQ
-ZD9G3h1I/GwNCFyv9Mbq10u7BIwhUH0fbwdcA7WXQ4v38ERd4IkfH4aLoZ0m1ewF
-V/sgvxQO+h/0YTfHImny5KGxOXfaoF92bipYROKuojydBmQsbgLwsRRm9UufCl3Q
-g3KewG5JuH112oPQEYq379v8nZ4FxC3Ano1OFBTm9UhHIAX1Dn22kcHOIIw8jCsQ
-zp7TZOW+nwtkS41cBwhvV4VIeL6yse2UgbOfRVRwI7B0OtswS5VgW3wysO2mTDKt
-V/WCmeht1il/6ZogEHgi/mvDCKpj20wQ1EzGnPdFLdiFJFylf0oufQD/7N/uezbC
-is0qJEECgYEA3AE7SeLpe3SZApj2RmE2lcD9/Saj1Y30PznxB7M7hK0sZ1yXEbtS
-Qf894iDDD/Cn3ufA4xk/K52CXgAcqvH/h2geG4pWLYsT1mdWhGftprtOMCIvJvzU
-8uWJzKdOGVMG7R59wNgEpPDZDpBISjexwQsFo3aw1L/H1/Sa8cdY3a0CgYEA39hB
-1oLmGRyE32Q4GF/srG4FqKL1EsbISGDUEYTnaYg2XiM43gu3tC/ikfclk27Jwc2L
-m7cA5FxxaEyfoOgfAizfU/uWTAbx9GoXgWsO0hWSN9+YNq61gc5WKoHyrJ/rfrti
-y5d7k0OCeBxckLqGDuJqICQ0myiz0El6FU8h5SMCgYEAuhigmiNC9JbwRu40g9v/
-XDVfox9oPmBRVpogdC78DYKeqN/9OZaGQiUxp3GnDni2xyqqUm8srCwT9oeJuF/z
-kgpUTV96/hNCuH25BU8UC5Es1jJUSFpdlwjqwx5SRcGhfjnojZMseojwUg1h2MW7
-qls0bc0cTxnaZaYW2qWRWhECgYBrT0cwyQv6GdvxJCBoPwQ9HXmFAKowWC+H0zOX
-Onmd8/jsZEJM4J0uuo4Jn8vZxBDg4eL9wVuiHlcXwzP7dYv4BP8DSechh2rS21Ft
-b59pQ4IXWw+jl1nYYsyYEDgAXaIN3VNder95N7ICVsZhc6n01MI/qlu1zmt1fOQT
-9x2utQKBgHI9SbsfWfbGiu6oLS3+9V1t4dORhj8D8b7z3trvECrD6tPhxoZqtfrH
-4apKr3OKRSXk3K+1K6pkMHJHunspucnA1ChXLhzfNF08BSRJkQDGYuaRLS6VGgab
-JZTl54bGvO1GkszEBE/9QFcqNVtWGMWXnUPwNNv8t//yJT5rvQil
------END RSA PRIVATE KEY-----
diff --git a/command/proxy/test-fixtures/reload/reload_bar.pem b/command/proxy/test-fixtures/reload/reload_bar.pem
deleted file mode 100644
index a8217be5c7dfd..0000000000000
--- a/command/proxy/test-fixtures/reload/reload_bar.pem
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDQzCCAiugAwIBAgIULLCz3mZKmg2xy3rWCud0f1zcmBwwDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAxMLZXhhbXBsZS5jb20wHhcNMTYwMzEwMDIzNjQ0WhcNMzYw
-MzA1MDEzNzE0WjAaMRgwFgYDVQQDEw9iYXIuZXhhbXBsZS5jb20wggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAXuxEDJSItx3p6zpV5pNFQE66wUUaSYon
-mVTfnXBoImpcWO5nqL9JBg0ACedGCi1dJMTV8g+MTaRk0fWG+oTkilMaADDLnTGm
-MmusEEjp72XIqqPtPyAtU0G+0LRylCL6kauzMQjRyQNAJJkeqL88DNymYtSCHYoy
-uBqBP5iU3fkoe2X9tD8Wyf6SrKRWo3Dr2f8IMo0p0MefWo/CJf2r99MyPcQbqD7e
-e0qtQ6HxX+Aco/OrxAY//Ai53Yr61NKitVev/jPHvGDOVsmQJqTNxBCI/or6lo+c
-NGUTx8r7WBFHJHtcLPKnSKtSXwbU2NgBH+1VbGJSGWT+Nm61vw+nAgMBAAGjgYQw
-gYEwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB0GA1UdDgQWBBSVoF8F
-7qbzSryIFrldurAG78LvSjAfBgNVHSMEGDAWgBRzDNvqF/Tq21OgWs13B5YydZjl
-vzAgBgNVHREEGTAXgg9iYXIuZXhhbXBsZS5jb22HBH8AAAEwDQYJKoZIhvcNAQEL
-BQADggEBAGmz2N282iT2IaEZvOmzIE4znHGkvoxZmrr/2byq5PskBg9ysyCHfUvw
-SFA8U7jWjezKTnGRUu5blB+yZdjrMtB4AePWyEqtkJwVsZ2SPeP+9V2gNYK4iktP
-UF3aIgBbAbw8rNuGIIB0T4D+6Zyo9Y3MCygs6/N4bRPZgLhewWn1ilklfnl3eqaC
-a+JY1NBuTgCMa28NuC+Hy3mCveqhI8tFNiOthlLdgAEbuQaOuNutAG73utZ2aq6Q
-W4pajFm3lEf5zt7Lo6ZCFtY/Q8jjURJ9e4O7VjXcqIhBM5bSMI6+fgQyOH0SLboj
-RNanJ2bcyF1iPVyPBGzV3dF0ngYzxEY=
------END CERTIFICATE-----
diff --git a/command/proxy/test-fixtures/reload/reload_ca.pem b/command/proxy/test-fixtures/reload/reload_ca.pem
deleted file mode 100644
index 72a74440c4820..0000000000000
--- a/command/proxy/test-fixtures/reload/reload_ca.pem
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDNTCCAh2gAwIBAgIUBeVo+Ce2BrdRT1cogKvJLtdOky8wDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAxMLZXhhbXBsZS5jb20wHhcNMTYwMzEwMDIzNTM4WhcNMzYw
-MzA1MDIzNjA4WjAWMRQwEgYDVQQDEwtleGFtcGxlLmNvbTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAPTQGWPRIOECGeJB6tR/ftvvtioC9f84fY2QdJ5k
-JBupXjPAGYKgS4MGzyT5bz9yY400tCtmh6h7p9tZwHl/TElTugtLQ/8ilMbJTiOM
-SiyaMDPHiMJJYKTjm9bu6bKeU1qPZ0Cryes4rygbqs7w2XPgA2RxNmDh7JdX7/h+
-VB5onBmv8g4WFSayowGyDcJWWCbu5yv6ZdH1bqQjgRzQ5xp17WXNmvlzdp2vate/
-9UqPdA8sdJzW/91Gvmros0o/FnG7c2pULhk22wFqO8t2HRjKb3nuxALEJvqoPvad
-KjpDTaq1L1ZzxcB7wvWyhy/lNLZL7jiNWy0mN1YB0UpSWdECAwEAAaN7MHkwDgYD
-VR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFHMM2+oX9Orb
-U6BazXcHljJ1mOW/MB8GA1UdIwQYMBaAFHMM2+oX9OrbU6BazXcHljJ1mOW/MBYG
-A1UdEQQPMA2CC2V4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQAp17XsOaT9
-hculRqrFptn3+zkH3HrIckHm+28R5xYT8ASFXFcLFugGizJAXVL5lvsRVRIwCoOX
-Nhi8XSNEFP640VbHcEl81I84bbRIIDS+Yheu6JDZGemTaDYLv1J3D5SHwgoM+nyf
-oTRgotUCIXcwJHmTpWEUkZFKuqBxsoTGzk0jO8wOP6xoJkzxVVG5PvNxs924rxY8
-Y8iaLdDfMeT7Pi0XIliBa/aSp/iqSW8XKyJl5R5vXg9+DOgZUrVzIxObaF5RBl/a
-mJOeklJBdNVzQm5+iMpO42lu0TA9eWtpP+YiUEXU17XDvFeQWOocFbQ1Peo0W895
-XRz2GCwCNyvW
------END CERTIFICATE-----
diff --git a/command/proxy/test-fixtures/reload/reload_foo.key b/command/proxy/test-fixtures/reload/reload_foo.key
deleted file mode 100644
index 86e6cce63e647..0000000000000
--- a/command/proxy/test-fixtures/reload/reload_foo.key
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpgIBAAKCAQEAzNyVieSti9XBb5/celB5u8YKRJv3mQS9A4/X0mqY1ePznt1i
-ilG7OmG0yM2VAk0ceIAQac3Bsn74jxn2cDlrrVniPXcNgYtMtW0kRqNEo4doo4EX
-xZguS9vNBu29useHhif1TGX/pA3dgvaVycUCjzTEVk6qI8UEehMK6gEGZb7nOr0A
-A9nipSqoeHpDLe3a4KVqj1vtlJKUvD2i1MuBuQ130cB1K9rufLCShGu7mEgzEosc
-gr+K3Bf03IejbeVRyIfLtgj1zuvV1katec75UqRA/bsvt5G9JfJqiZ9mwFN0vp3g
-Cr7pdQBSBQ2q4yf9s8CuY5c5w9fl3F8f5QFQoQIDAQABAoIBAQCbCb1qNFRa5ZSV
-I8i6ELlwMDqJHfhOJ9XcIjpVljLAfNlcu3Ld92jYkCU/asaAjVckotbJG9yhd5Io
-yp9E40/oS4P6vGTOS1vsWgMAKoPBtrKsOwCAm+E9q8UIn1fdSS/5ibgM74x+3bds
-a62Em8KKGocUQkhk9a+jq1GxMsFisbHRxEHvClLmDMgGnW3FyGmWwT6yZLPSC0ey
-szmmjt3ouP8cLAOmSjzcQBMmEZpQMCgR6Qckg6nrLQAGzZyTdCd875wbGA57DpWX
-Lssn95+A5EFvr/6b7DkXeIFCrYBFFa+UQN3PWGEQ6Zjmiw4VgV2vO8yX2kCLlUhU
-02bL393ZAoGBAPXPD/0yWINbKUPcRlx/WfWQxfz0bu50ytwIXzVK+pRoAMuNqehK
-BJ6kNzTTBq40u+IZ4f5jbLDulymR+4zSkirLE7CyWFJOLNI/8K4Pf5DJUgNdrZjJ
-LCtP9XRdxiPatQF0NGfdgHlSJh+/CiRJP4AgB17AnB/4z9/M0ZlJGVrzAoGBANVa
-69P3Rp/WPBQv0wx6f0tWppJolWekAHKcDIdQ5HdOZE5CPAYSlTrTUW3uJuqMwU2L
-M0Er2gIPKWIR5X+9r7Fvu9hQW6l2v3xLlcrGPiapp3STJvuMxzhRAmXmu3bZfVn1
-Vn7Vf1jPULHtTFSlNFEvYG5UJmygK9BeyyVO5KMbAoGBAMCyAibLQPg4jrDUDZSV
-gUAwrgUO2ae1hxHWvkxY6vdMUNNByuB+pgB3W4/dnm8Sh/dHsxJpftt1Lqs39ar/
-p/ZEHLt4FCTxg9GOrm7FV4t5RwG8fko36phJpnIC0UFqQltRbYO+8OgqrhhU+u5X
-PaCDe0OcWsf1lYAsYGN6GpZhAoGBAMJ5Ksa9+YEODRs1cIFKUyd/5ztC2xRqOAI/
-3WemQ2nAacuvsfizDZVeMzYpww0+maAuBt0btI719PmwaGmkpDXvK+EDdlmkpOwO
-FY6MXvBs6fdnfjwCWUErDi2GQFAX9Jt/9oSL5JU1+08DhvUM1QA/V/2Y9KFE6kr3
-bOIn5F4LAoGBAKQzH/AThDGhT3hwr4ktmReF3qKxBgxzjVa8veXtkY5VWwyN09iT
-jnTTt6N1CchZoK5WCETjdzNYP7cuBTcV4d3bPNRiJmxXaNVvx3Tlrk98OiffT8Qa
-5DO/Wfb43rNHYXBjU6l0n2zWcQ4PUSSbu0P0bM2JTQPRCqSthXvSHw2P
------END RSA PRIVATE KEY-----
diff --git a/command/proxy/test-fixtures/reload/reload_foo.pem b/command/proxy/test-fixtures/reload/reload_foo.pem
deleted file mode 100644
index c8b868bcd0f08..0000000000000
--- a/command/proxy/test-fixtures/reload/reload_foo.pem
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDQzCCAiugAwIBAgIUFVW6i/M+yJUsDrXWgRKO/Dnb+L4wDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAxMLZXhhbXBsZS5jb20wHhcNMTYwMzEwMDIzNjA1WhcNMzYw
-MzA1MDEzNjM1WjAaMRgwFgYDVQQDEw9mb28uZXhhbXBsZS5jb20wggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDM3JWJ5K2L1cFvn9x6UHm7xgpEm/eZBL0D
-j9fSapjV4/Oe3WKKUbs6YbTIzZUCTRx4gBBpzcGyfviPGfZwOWutWeI9dw2Bi0y1
-bSRGo0Sjh2ijgRfFmC5L280G7b26x4eGJ/VMZf+kDd2C9pXJxQKPNMRWTqojxQR6
-EwrqAQZlvuc6vQAD2eKlKqh4ekMt7drgpWqPW+2UkpS8PaLUy4G5DXfRwHUr2u58
-sJKEa7uYSDMSixyCv4rcF/Tch6Nt5VHIh8u2CPXO69XWRq15zvlSpED9uy+3kb0l
-8mqJn2bAU3S+neAKvul1AFIFDarjJ/2zwK5jlznD1+XcXx/lAVChAgMBAAGjgYQw
-gYEwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB0GA1UdDgQWBBRNJoOJ
-dnazDiuqLhV6truQ4cRe9jAfBgNVHSMEGDAWgBRzDNvqF/Tq21OgWs13B5YydZjl
-vzAgBgNVHREEGTAXgg9mb28uZXhhbXBsZS5jb22HBH8AAAEwDQYJKoZIhvcNAQEL
-BQADggEBAHzv67mtbxMWcuMsxCFBN1PJNAyUDZVCB+1gWhk59EySbVg81hWJDCBy
-fl3TKjz3i7wBGAv+C2iTxmwsSJbda22v8JQbuscXIfLFbNALsPzF+J0vxAgJs5Gc
-sDbfJ7EQOIIOVKQhHLYnQoLnigSSPc1kd0JjYyHEBjgIaSuXgRRTBAeqLiBMx0yh
-RKL1lQ+WoBU/9SXUZZkwokqWt5G7khi5qZkNxVXZCm8VGPg0iywf6gGyhI1SU5S2
-oR219S6kA4JY/stw1qne85/EmHmoImHGt08xex3GoU72jKAjsIpqRWopcD/+uene
-Tc9nn3fTQW/Z9fsoJ5iF5OdJnDEswqE=
------END CERTIFICATE-----
diff --git a/command/proxy_test.go b/command/proxy_test.go
deleted file mode 100644
index 01aba59dbc8f3..0000000000000
--- a/command/proxy_test.go
+++ /dev/null
@@ -1,1254 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package command
-
-import (
-	"crypto/tls"
-	"crypto/x509"
-	"fmt"
-	"net/http"
-	"os"
-	"path/filepath"
-	"reflect"
-	"strings"
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/hashicorp/go-hclog"
-	vaultjwt "github.com/hashicorp/vault-plugin-auth-jwt"
-	logicalKv "github.com/hashicorp/vault-plugin-secrets-kv"
-	"github.com/hashicorp/vault/api"
-	credAppRole "github.com/hashicorp/vault/builtin/credential/approle"
-	"github.com/hashicorp/vault/command/agent"
-	proxyConfig "github.com/hashicorp/vault/command/proxy/config"
-	"github.com/hashicorp/vault/helper/testhelpers/minimal"
-	"github.com/hashicorp/vault/helper/useragent"
-	vaulthttp "github.com/hashicorp/vault/http"
-	"github.com/hashicorp/vault/sdk/helper/logging"
-	"github.com/hashicorp/vault/sdk/logical"
-	"github.com/hashicorp/vault/vault"
-	"github.com/mitchellh/cli"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func testProxyCommand(tb testing.TB, logger hclog.Logger) (*cli.MockUi, *ProxyCommand) {
-	tb.Helper()
-
-	ui := cli.NewMockUi()
-	return ui, &ProxyCommand{
-		BaseCommand: &BaseCommand{
-			UI: ui,
-		},
-		ShutdownCh: MakeShutdownCh(),
-		SighupCh:   MakeSighupCh(),
-		logger:     logger,
-		startedCh:  make(chan struct{}, 5),
-		reloadedCh: make(chan struct{}, 5),
-	}
-}
-
-// TestProxy_ExitAfterAuth tests the exit_after_auth flag, provided both
-// as config and via -exit-after-auth.
-func TestProxy_ExitAfterAuth(t *testing.T) {
-	t.Run("via_config", func(t *testing.T) {
-		testProxyExitAfterAuth(t, false)
-	})
-
-	t.Run("via_flag", func(t *testing.T) {
-		testProxyExitAfterAuth(t, true)
-	})
-}
-
-func testProxyExitAfterAuth(t *testing.T, viaFlag bool) {
-	logger := logging.NewVaultLogger(hclog.Trace)
-	coreConfig := &vault.CoreConfig{
-		Logger: logger,
-		CredentialBackends: map[string]logical.Factory{
-			"jwt": vaultjwt.Factory,
-		},
-	}
-	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
-		HandlerFunc: vaulthttp.Handler,
-	})
-	cluster.Start()
-	defer cluster.Cleanup()
-
-	vault.TestWaitActive(t, cluster.Cores[0].Core)
-	client := cluster.Cores[0].Client
-
-	// Setup Vault
-	err := client.Sys().EnableAuthWithOptions("jwt", &api.EnableAuthOptions{
-		Type: "jwt",
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = client.Logical().Write("auth/jwt/config", map[string]interface{}{
-		"bound_issuer":           "https://team-vault.auth0.com/",
-		"jwt_validation_pubkeys": agent.TestECDSAPubKey,
-		"jwt_supported_algs":     "ES256",
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = client.Logical().Write("auth/jwt/role/test", map[string]interface{}{
-		"role_type":       "jwt",
-		"bound_subject":   "r3qXcK2bix9eFECzsU3Sbmh0K16fatW6@clients",
-		"bound_audiences": "https://vault.plugin.auth.jwt.test",
-		"user_claim":      "https://vault/user",
-		"groups_claim":    "https://vault/groups",
-		"policies":        "test",
-		"period":          "3s",
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	dir := t.TempDir()
-	inf, err := os.CreateTemp(dir, "auth.jwt.test.")
-	if err != nil {
-		t.Fatal(err)
-	}
-	in := inf.Name()
-	inf.Close()
-	// We remove these files in this test since we don't need the files, we just need
-	// a non-conflicting file name for the config.
-	os.Remove(in)
-	t.Logf("input: %s", in)
-
-	sink1f, err := os.CreateTemp(dir, "sink1.jwt.test.")
-	if err != nil {
-		t.Fatal(err)
-	}
-	sink1 := sink1f.Name()
-	sink1f.Close()
-	os.Remove(sink1)
-	t.Logf("sink1: %s", sink1)
-
-	sink2f, err := os.CreateTemp(dir, "sink2.jwt.test.")
-	if err != nil {
-		t.Fatal(err)
-	}
-	sink2 := sink2f.Name()
-	sink2f.Close()
-	os.Remove(sink2)
-	t.Logf("sink2: %s", sink2)
-
-	conff, err := os.CreateTemp(dir, "conf.jwt.test.")
-	if err != nil {
-		t.Fatal(err)
-	}
-	conf := conff.Name()
-	conff.Close()
-	os.Remove(conf)
-	t.Logf("config: %s", conf)
-
-	jwtToken, _ := agent.GetTestJWT(t)
-	if err := os.WriteFile(in, []byte(jwtToken), 0o600); err != nil {
-		t.Fatal(err)
-	} else {
-		logger.Trace("wrote test jwt", "path", in)
-	}
-
-	exitAfterAuthTemplText := "exit_after_auth = true"
-	if viaFlag {
-		exitAfterAuthTemplText = ""
-	}
-
-	config := `
-%s
-
-auto_auth {
-        method {
-                type = "jwt"
-                config = {
-                        role = "test"
-                        path = "%s"
-                }
-        }
-
-        sink {
-                type = "file"
-                config = {
-                        path = "%s"
-                }
-        }
-
-        sink "file" {
-                config = {
-                        path = "%s"
-                }
-        }
-}
-`
-
-	config = fmt.Sprintf(config, exitAfterAuthTemplText, in, sink1, sink2)
-	if err := os.WriteFile(conf, []byte(config), 0o600); err != nil {
-		t.Fatal(err)
-	} else {
-		logger.Trace("wrote test config", "path", conf)
-	}
-
-	doneCh := make(chan struct{})
-	go func() {
-		ui, cmd := testProxyCommand(t, logger)
-		cmd.client = client
-
-		args := []string{"-config", conf}
-		if viaFlag {
-			args = append(args, "-exit-after-auth")
-		}
-
-		code := cmd.Run(args)
-		if code != 0 {
-			t.Errorf("expected %d to be %d", code, 0)
-			t.Logf("output from proxy:\n%s", ui.OutputWriter.String())
-			t.Logf("error from proxy:\n%s", ui.ErrorWriter.String())
-		}
-		close(doneCh)
-	}()
-
-	select {
-	case <-doneCh:
-		break
-	case <-time.After(1 * time.Minute):
-		t.Fatal("timeout reached while waiting for proxy to exit")
-	}
-
-	sink1Bytes, err := os.ReadFile(sink1)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(sink1Bytes) == 0 {
-		t.Fatal("got no output from sink 1")
-	}
-
-	sink2Bytes, err := os.ReadFile(sink2)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(sink2Bytes) == 0 {
-		t.Fatal("got no output from sink 2")
-	}
-
-	if string(sink1Bytes) != string(sink2Bytes) {
-		t.Fatal("sink 1/2 values don't match")
-	}
-}
-
-// TestProxy_AutoAuth_UserAgent tests that the User-Agent sent
-// to Vault by Vault Proxy is correct when performing Auto-Auth.
-// Uses the custom handler userAgentHandler (defined above) so
-// that Vault validates the User-Agent on requests sent by Proxy.
-func TestProxy_AutoAuth_UserAgent(t *testing.T) {
-	logger := logging.NewVaultLogger(hclog.Trace)
-	var h userAgentHandler
-	cluster := vault.NewTestCluster(t, &vault.CoreConfig{
-		Logger: logger,
-		CredentialBackends: map[string]logical.Factory{
-			"approle": credAppRole.Factory,
-		},
-	}, &vault.TestClusterOptions{
-		NumCores: 1,
-		HandlerFunc: vaulthttp.HandlerFunc(
-			func(properties *vault.HandlerProperties) http.Handler {
-				h.props = properties
-				h.userAgentToCheckFor = useragent.ProxyAutoAuthString()
-				h.requestMethodToCheck = "PUT"
-				h.pathToCheck = "auth/approle/login"
-				h.t = t
-				return &h
-			}),
-	})
-	cluster.Start()
-	defer cluster.Cleanup()
-
-	serverClient := cluster.Cores[0].Client
-
-	// Enable the approle auth method
-	req := serverClient.NewRequest("POST", "/v1/sys/auth/approle")
-	req.BodyBytes = []byte(`{
-		"type": "approle"
-	}`)
-	request(t, serverClient, req, 204)
-
-	// Create a named role
-	req = serverClient.NewRequest("PUT", "/v1/auth/approle/role/test-role")
-	req.BodyBytes = []byte(`{
-	  "secret_id_num_uses": "10",
-	  "secret_id_ttl": "1m",
-	  "token_max_ttl": "1m",
-	  "token_num_uses": "10",
-	  "token_ttl": "1m",
-	  "policies": "default"
-	}`)
-	request(t, serverClient, req, 204)
-
-	// Fetch the RoleID of the named role
-	req = serverClient.NewRequest("GET", "/v1/auth/approle/role/test-role/role-id")
-	body := request(t, serverClient, req, 200)
-	data := body["data"].(map[string]interface{})
-	roleID := data["role_id"].(string)
-
-	// Get a SecretID issued against the named role
-	req = serverClient.NewRequest("PUT", "/v1/auth/approle/role/test-role/secret-id")
-	body = request(t, serverClient, req, 200)
-	data = body["data"].(map[string]interface{})
-	secretID := data["secret_id"].(string)
-
-	// Write the RoleID and SecretID to temp files
-	roleIDPath := makeTempFile(t, "role_id.txt", roleID+"\n")
-	secretIDPath := makeTempFile(t, "secret_id.txt", secretID+"\n")
-	defer os.Remove(roleIDPath)
-	defer os.Remove(secretIDPath)
-
-	sinkf, err := os.CreateTemp("", "sink.test.")
-	if err != nil {
-		t.Fatal(err)
-	}
-	sink := sinkf.Name()
-	sinkf.Close()
-	os.Remove(sink)
-
-	autoAuthConfig := fmt.Sprintf(`
-auto_auth {
-    method "approle" {
-        mount_path = "auth/approle"
-        config = {
-            role_id_file_path = "%s"
-            secret_id_file_path = "%s"
-        }
-    }
-
-	sink "file" {
-		config = {
-			path = "%s"
-		}
-	}
-}`, roleIDPath, secretIDPath, sink)
-
-	listenAddr := generateListenerAddress(t)
-	listenConfig := fmt.Sprintf(`
-listener "tcp" {
-  address = "%s"
-  tls_disable = true
-}
-`, listenAddr)
-
-	config := fmt.Sprintf(`
-vault {
-  address = "%s"
-  tls_skip_verify = true
-}
-api_proxy {
-  use_auto_auth_token = true
-}
-%s
-%s
-`, serverClient.Address(), listenConfig, autoAuthConfig)
-	configPath := makeTempFile(t, "config.hcl", config)
-	defer os.Remove(configPath)
-
-	// Unset the environment variable so that proxy picks up the right test
-	// cluster address
-	defer os.Setenv(api.EnvVaultAddress, os.Getenv(api.EnvVaultAddress))
-	os.Unsetenv(api.EnvVaultAddress)
-
-	// Start proxy
-	_, cmd := testProxyCommand(t, logger)
-	cmd.startedCh = make(chan struct{})
-
-	wg := &sync.WaitGroup{}
-	wg.Add(1)
-	go func() {
-		cmd.Run([]string{"-config", configPath})
-		wg.Done()
-	}()
-
-	select {
-	case <-cmd.startedCh:
-	case <-time.After(5 * time.Second):
-		t.Errorf("timeout")
-	}
-
-	// Validate that the auto-auth token has been correctly attained
-	// and works for LookupSelf
-	conf := api.DefaultConfig()
-	conf.Address = "http://" + listenAddr
-	proxyClient, err := api.NewClient(conf)
-	if err != nil {
-		t.Fatalf("err: %s", err)
-	}
-
-	proxyClient.SetToken("")
-	err = proxyClient.SetAddress("http://" + listenAddr)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Wait for the token to be sent to syncs and be available to be used
-	time.Sleep(5 * time.Second)
-
-	req = proxyClient.NewRequest("GET", "/v1/auth/token/lookup-self")
-	body = request(t, proxyClient, req, 200)
-
-	close(cmd.ShutdownCh)
-	wg.Wait()
-}
-
-// TestProxy_APIProxyWithoutCache_UserAgent tests that the User-Agent sent
-// to Vault by Vault Proxy is correct using the API proxy without
-// the cache configured. Uses the custom handler
-// userAgentHandler struct defined in this test package, so that Vault validates the
-// User-Agent on requests sent by Proxy.
-func TestProxy_APIProxyWithoutCache_UserAgent(t *testing.T) {
-	logger := logging.NewVaultLogger(hclog.Trace)
-	userAgentForProxiedClient := "proxied-client"
-	var h userAgentHandler
-	cluster := vault.NewTestCluster(t, nil, &vault.TestClusterOptions{
-		NumCores: 1,
-		HandlerFunc: vaulthttp.HandlerFunc(
-			func(properties *vault.HandlerProperties) http.Handler {
-				h.props = properties
-				h.userAgentToCheckFor = useragent.ProxyStringWithProxiedUserAgent(userAgentForProxiedClient)
-				h.pathToCheck = "/v1/auth/token/lookup-self"
-				h.requestMethodToCheck = "GET"
-				h.t = t
-				return &h
-			}),
-	})
-	cluster.Start()
-	defer cluster.Cleanup()
-
-	serverClient := cluster.Cores[0].Client
-
-	// Unset the environment variable so that proxy picks up the right test
-	// cluster address
-	defer os.Setenv(api.EnvVaultAddress, os.Getenv(api.EnvVaultAddress))
-	os.Unsetenv(api.EnvVaultAddress)
-
-	listenAddr := generateListenerAddress(t)
-	listenConfig := fmt.Sprintf(`
-listener "tcp" {
-  address = "%s"
-  tls_disable = true
-}
-`, listenAddr)
-
-	config := fmt.Sprintf(`
-vault {
-  address = "%s"
-  tls_skip_verify = true
-}
-%s
-`, serverClient.Address(), listenConfig)
-	configPath := makeTempFile(t, "config.hcl", config)
-	defer os.Remove(configPath)
-
-	// Start the proxy
-	_, cmd := testProxyCommand(t, logger)
-	cmd.startedCh = make(chan struct{})
-
-	wg := &sync.WaitGroup{}
-	wg.Add(1)
-	go func() {
-		cmd.Run([]string{"-config", configPath})
-		wg.Done()
-	}()
-
-	select {
-	case <-cmd.startedCh:
-	case <-time.After(5 * time.Second):
-		t.Errorf("timeout")
-	}
-
-	proxyClient, err := api.NewClient(api.DefaultConfig())
-	if err != nil {
-		t.Fatal(err)
-	}
-	proxyClient.AddHeader("User-Agent", userAgentForProxiedClient)
-	proxyClient.SetToken(serverClient.Token())
-	proxyClient.SetMaxRetries(0)
-	err = proxyClient.SetAddress("http://" + listenAddr)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = proxyClient.Auth().Token().LookupSelf()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	close(cmd.ShutdownCh)
-	wg.Wait()
-}
-
-// TestProxy_APIProxyWithCache_UserAgent tests that the User-Agent sent
-// to Vault by Vault Proxy is correct using the API proxy with
-// the cache configured.  Uses the custom handler
-// userAgentHandler struct defined in this test package, so that Vault validates the
-// User-Agent on requests sent by Proxy.
-func TestProxy_APIProxyWithCache_UserAgent(t *testing.T) {
-	logger := logging.NewVaultLogger(hclog.Trace)
-	userAgentForProxiedClient := "proxied-client"
-	var h userAgentHandler
-	cluster := vault.NewTestCluster(t, nil, &vault.TestClusterOptions{
-		NumCores: 1,
-		HandlerFunc: vaulthttp.HandlerFunc(
-			func(properties *vault.HandlerProperties) http.Handler {
-				h.props = properties
-				h.userAgentToCheckFor = useragent.ProxyStringWithProxiedUserAgent(userAgentForProxiedClient)
-				h.pathToCheck = "/v1/auth/token/lookup-self"
-				h.requestMethodToCheck = "GET"
-				h.t = t
-				return &h
-			}),
-	})
-	cluster.Start()
-	defer cluster.Cleanup()
-
-	serverClient := cluster.Cores[0].Client
-
-	// Unset the environment variable so that proxy picks up the right test
-	// cluster address
-	defer os.Setenv(api.EnvVaultAddress, os.Getenv(api.EnvVaultAddress))
-	os.Unsetenv(api.EnvVaultAddress)
-
-	listenAddr := generateListenerAddress(t)
-	listenConfig := fmt.Sprintf(`
-listener "tcp" {
-  address = "%s"
-  tls_disable = true
-}
-`, listenAddr)
-
-	cacheConfig := `
-cache {
-}`
-
-	config := fmt.Sprintf(`
-vault {
-  address = "%s"
-  tls_skip_verify = true
-}
-%s
-%s
-`, serverClient.Address(), listenConfig, cacheConfig)
-	configPath := makeTempFile(t, "config.hcl", config)
-	defer os.Remove(configPath)
-
-	// Start the proxy
-	_, cmd := testProxyCommand(t, logger)
-	cmd.startedCh = make(chan struct{})
-
-	wg := &sync.WaitGroup{}
-	wg.Add(1)
-	go func() {
-		cmd.Run([]string{"-config", configPath})
-		wg.Done()
-	}()
-
-	select {
-	case <-cmd.startedCh:
-	case <-time.After(5 * time.Second):
-		t.Errorf("timeout")
-	}
-
-	proxyClient, err := api.NewClient(api.DefaultConfig())
-	if err != nil {
-		t.Fatal(err)
-	}
-	proxyClient.AddHeader("User-Agent", userAgentForProxiedClient)
-	proxyClient.SetToken(serverClient.Token())
-	proxyClient.SetMaxRetries(0)
-	err = proxyClient.SetAddress("http://" + listenAddr)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = proxyClient.Auth().Token().LookupSelf()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	close(cmd.ShutdownCh)
-	wg.Wait()
-}
-
-// TestProxy_Cache_DynamicSecret Tests that the cache successfully caches a dynamic secret
-// going through the Proxy,
-func TestProxy_Cache_DynamicSecret(t *testing.T) {
-	logger := logging.NewVaultLogger(hclog.Trace)
-	cluster := vault.NewTestCluster(t, nil, &vault.TestClusterOptions{
-		HandlerFunc: vaulthttp.Handler,
-	})
-	cluster.Start()
-	defer cluster.Cleanup()
-
-	serverClient := cluster.Cores[0].Client
-
-	// Unset the environment variable so that proxy picks up the right test
-	// cluster address
-	defer os.Setenv(api.EnvVaultAddress, os.Getenv(api.EnvVaultAddress))
-	os.Unsetenv(api.EnvVaultAddress)
-
-	cacheConfig := `
-cache {
-}
-`
-	listenAddr := generateListenerAddress(t)
-	listenConfig := fmt.Sprintf(`
-listener "tcp" {
-  address = "%s"
-  tls_disable = true
-}
-`, listenAddr)
-
-	config := fmt.Sprintf(`
-vault {
-  address = "%s"
-  tls_skip_verify = true
-}
-%s
-%s
-`, serverClient.Address(), cacheConfig, listenConfig)
-	configPath := makeTempFile(t, "config.hcl", config)
-	defer os.Remove(configPath)
-
-	// Start proxy
-	_, cmd := testProxyCommand(t, logger)
-	cmd.startedCh = make(chan struct{})
-
-	wg := &sync.WaitGroup{}
-	wg.Add(1)
-	go func() {
-		cmd.Run([]string{"-config", configPath})
-		wg.Done()
-	}()
-
-	select {
-	case <-cmd.startedCh:
-	case <-time.After(5 * time.Second):
-		t.Errorf("timeout")
-	}
-
-	proxyClient, err := api.NewClient(api.DefaultConfig())
-	if err != nil {
-		t.Fatal(err)
-	}
-	proxyClient.SetToken(serverClient.Token())
-	proxyClient.SetMaxRetries(0)
-	err = proxyClient.SetAddress("http://" + listenAddr)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	renewable := true
-	tokenCreateRequest := &api.TokenCreateRequest{
-		Policies:  []string{"default"},
-		TTL:       "30m",
-		Renewable: &renewable,
-	}
-
-	// This was the simplest test I could find to trigger the caching behaviour,
-	// i.e. the most concise I could make the test that I can tell
-	// creating an orphan token returns Auth, is renewable, and isn't a token
-	// that's managed elsewhere (since it's an orphan)
-	secret, err := proxyClient.Auth().Token().CreateOrphan(tokenCreateRequest)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if secret == nil || secret.Auth == nil {
-		t.Fatalf("secret not as expected: %v", secret)
-	}
-
-	token := secret.Auth.ClientToken
-
-	secret, err = proxyClient.Auth().Token().CreateOrphan(tokenCreateRequest)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if secret == nil || secret.Auth == nil {
-		t.Fatalf("secret not as expected: %v", secret)
-	}
-
-	token2 := secret.Auth.ClientToken
-
-	if token != token2 {
-		t.Fatalf("token create response not cached when it should have been, as tokens differ")
-	}
-
-	close(cmd.ShutdownCh)
-	wg.Wait()
-}
-
-// TestProxy_ApiProxy_Retry Tests the retry functionalities of Vault Proxy's API Proxy
-func TestProxy_ApiProxy_Retry(t *testing.T) {
-	//----------------------------------------------------
-	// Start the server and proxy
-	//----------------------------------------------------
-	logger := logging.NewVaultLogger(hclog.Trace)
-	var h handler
-	cluster := vault.NewTestCluster(t,
-		&vault.CoreConfig{
-			Logger: logger,
-			CredentialBackends: map[string]logical.Factory{
-				"approle": credAppRole.Factory,
-			},
-			LogicalBackends: map[string]logical.Factory{
-				"kv": logicalKv.Factory,
-			},
-		},
-		&vault.TestClusterOptions{
-			NumCores: 1,
-			HandlerFunc: vaulthttp.HandlerFunc(func(properties *vault.HandlerProperties) http.Handler {
-				h.props = properties
-				h.t = t
-				return &h
-			}),
-		})
-	cluster.Start()
-	defer cluster.Cleanup()
-
-	vault.TestWaitActive(t, cluster.Cores[0].Core)
-	serverClient := cluster.Cores[0].Client
-
-	// Unset the environment variable so that proxy picks up the right test
-	// cluster address
-	defer os.Setenv(api.EnvVaultAddress, os.Getenv(api.EnvVaultAddress))
-	os.Unsetenv(api.EnvVaultAddress)
-
-	_, err := serverClient.Logical().Write("secret/foo", map[string]interface{}{
-		"bar": "baz",
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	intRef := func(i int) *int {
-		return &i
-	}
-	// start test cases here
-	testCases := map[string]struct {
-		retries     *int
-		expectError bool
-	}{
-		"none": {
-			retries:     intRef(-1),
-			expectError: true,
-		},
-		"one": {
-			retries:     intRef(1),
-			expectError: true,
-		},
-		"two": {
-			retries:     intRef(2),
-			expectError: false,
-		},
-		"missing": {
-			retries:     nil,
-			expectError: false,
-		},
-		"default": {
-			retries:     intRef(0),
-			expectError: false,
-		},
-	}
-
-	for tcname, tc := range testCases {
-		t.Run(tcname, func(t *testing.T) {
-			h.failCount = 2
-
-			cacheConfig := `
-cache {
-}
-`
-			listenAddr := generateListenerAddress(t)
-			listenConfig := fmt.Sprintf(`
-listener "tcp" {
-  address = "%s"
-  tls_disable = true
-}
-`, listenAddr)
-
-			var retryConf string
-			if tc.retries != nil {
-				retryConf = fmt.Sprintf("retry { num_retries = %d }", *tc.retries)
-			}
-
-			config := fmt.Sprintf(`
-vault {
-  address = "%s"
-  %s
-  tls_skip_verify = true
-}
-%s
-%s
-`, serverClient.Address(), retryConf, cacheConfig, listenConfig)
-			configPath := makeTempFile(t, "config.hcl", config)
-			defer os.Remove(configPath)
-
-			_, cmd := testProxyCommand(t, logger)
-			cmd.startedCh = make(chan struct{})
-
-			wg := &sync.WaitGroup{}
-			wg.Add(1)
-			go func() {
-				cmd.Run([]string{"-config", configPath})
-				wg.Done()
-			}()
-
-			select {
-			case <-cmd.startedCh:
-			case <-time.After(5 * time.Second):
-				t.Errorf("timeout")
-			}
-
-			client, err := api.NewClient(api.DefaultConfig())
-			if err != nil {
-				t.Fatal(err)
-			}
-			client.SetToken(serverClient.Token())
-			client.SetMaxRetries(0)
-			err = client.SetAddress("http://" + listenAddr)
-			if err != nil {
-				t.Fatal(err)
-			}
-			secret, err := client.Logical().Read("secret/foo")
-			switch {
-			case (err != nil || secret == nil) && tc.expectError:
-			case (err == nil || secret != nil) && !tc.expectError:
-			default:
-				t.Fatalf("%s expectError=%v error=%v secret=%v", tcname, tc.expectError, err, secret)
-			}
-			if secret != nil && secret.Data["foo"] != nil {
-				val := secret.Data["foo"].(map[string]interface{})
-				if !reflect.DeepEqual(val, map[string]interface{}{"bar": "baz"}) {
-					t.Fatalf("expected key 'foo' to yield bar=baz, got: %v", val)
-				}
-			}
-			time.Sleep(time.Second)
-
-			close(cmd.ShutdownCh)
-			wg.Wait()
-		})
-	}
-}
-
-// TestProxy_Metrics tests that metrics are being properly reported.
-func TestProxy_Metrics(t *testing.T) {
-	// Start a vault server
-	logger := logging.NewVaultLogger(hclog.Trace)
-	cluster := vault.NewTestCluster(t,
-		&vault.CoreConfig{
-			Logger: logger,
-		},
-		&vault.TestClusterOptions{
-			HandlerFunc: vaulthttp.Handler,
-		})
-	cluster.Start()
-	defer cluster.Cleanup()
-	vault.TestWaitActive(t, cluster.Cores[0].Core)
-	serverClient := cluster.Cores[0].Client
-
-	// Create a config file
-	listenAddr := generateListenerAddress(t)
-	config := fmt.Sprintf(`
-cache {}
-
-listener "tcp" {
-    address = "%s"
-    tls_disable = true
-}
-`, listenAddr)
-	configPath := makeTempFile(t, "config.hcl", config)
-	defer os.Remove(configPath)
-
-	ui, cmd := testProxyCommand(t, logger)
-	cmd.client = serverClient
-	cmd.startedCh = make(chan struct{})
-
-	wg := &sync.WaitGroup{}
-	wg.Add(1)
-	go func() {
-		code := cmd.Run([]string{"-config", configPath})
-		if code != 0 {
-			t.Errorf("non-zero return code when running proxy: %d", code)
-			t.Logf("STDOUT from proxy:\n%s", ui.OutputWriter.String())
-			t.Logf("STDERR from proxy:\n%s", ui.ErrorWriter.String())
-		}
-		wg.Done()
-	}()
-
-	select {
-	case <-cmd.startedCh:
-	case <-time.After(5 * time.Second):
-		t.Errorf("timeout")
-	}
-
-	// defer proxy shutdown
-	defer func() {
-		cmd.ShutdownCh <- struct{}{}
-		wg.Wait()
-	}()
-
-	conf := api.DefaultConfig()
-	conf.Address = "http://" + listenAddr
-	proxyClient, err := api.NewClient(conf)
-	if err != nil {
-		t.Fatalf("err: %s", err)
-	}
-
-	req := proxyClient.NewRequest("GET", "/proxy/v1/metrics")
-	body := request(t, proxyClient, req, 200)
-	keys := []string{}
-	for k := range body {
-		keys = append(keys, k)
-	}
-	require.ElementsMatch(t, keys, []string{
-		"Counters",
-		"Samples",
-		"Timestamp",
-		"Gauges",
-		"Points",
-	})
-}
-
-// TestProxy_QuitAPI Tests the /proxy/v1/quit API that can be enabled for the proxy.
-func TestProxy_QuitAPI(t *testing.T) {
-	cluster := minimal.NewTestSoloCluster(t, nil)
-	serverClient := cluster.Cores[0].Client
-
-	// Unset the environment variable so that proxy picks up the right test
-	// cluster address
-	defer os.Setenv(api.EnvVaultAddress, os.Getenv(api.EnvVaultAddress))
-	err := os.Unsetenv(api.EnvVaultAddress)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	listenAddr := generateListenerAddress(t)
-	listenAddr2 := generateListenerAddress(t)
-	config := fmt.Sprintf(`
-vault {
-  address = "%s"
-  tls_skip_verify = true
-}
-
-listener "tcp" {
-	address = "%s"
-	tls_disable = true
-}
-
-listener "tcp" {
-	address = "%s"
-	tls_disable = true
-	proxy_api {
-		enable_quit = true
-	}
-}
-
-cache {}
-`, serverClient.Address(), listenAddr, listenAddr2)
-
-	configPath := makeTempFile(t, "config.hcl", config)
-	defer os.Remove(configPath)
-
-	_, cmd := testProxyCommand(t, nil)
-	cmd.startedCh = make(chan struct{})
-
-	wg := &sync.WaitGroup{}
-	wg.Add(1)
-	go func() {
-		cmd.Run([]string{"-config", configPath})
-		wg.Done()
-	}()
-
-	select {
-	case <-cmd.startedCh:
-	case <-time.After(5 * time.Second):
-		t.Errorf("timeout")
-	}
-	client, err := api.NewClient(api.DefaultConfig())
-	if err != nil {
-		t.Fatal(err)
-	}
-	client.SetToken(serverClient.Token())
-	client.SetMaxRetries(0)
-	err = client.SetAddress("http://" + listenAddr)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// First try on listener 1 where the API should be disabled.
-	resp, err := client.RawRequest(client.NewRequest(http.MethodPost, "/proxy/v1/quit"))
-	if err == nil {
-		t.Fatalf("expected error")
-	}
-	if resp != nil && resp.StatusCode != http.StatusNotFound {
-		t.Fatalf("expected %d but got: %d", http.StatusNotFound, resp.StatusCode)
-	}
-
-	// Now try on listener 2 where the quit API should be enabled.
-	err = client.SetAddress("http://" + listenAddr2)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = client.RawRequest(client.NewRequest(http.MethodPost, "/proxy/v1/quit"))
-	if err != nil {
-		t.Fatalf("unexpected error: %s", err)
-	}
-
-	select {
-	case <-cmd.ShutdownCh:
-	case <-time.After(5 * time.Second):
-		t.Errorf("timeout")
-	}
-
-	wg.Wait()
-}
-
-// TestProxy_LogFile_CliOverridesConfig tests that the CLI values
-// override the config for log files
-func TestProxy_LogFile_CliOverridesConfig(t *testing.T) {
-	// Create basic config
-	configFile := populateTempFile(t, "proxy-config.hcl", BasicHclConfig)
-	cfg, err := proxyConfig.LoadConfigFile(configFile.Name())
-	if err != nil {
-		t.Fatal("Cannot load config to test update/merge", err)
-	}
-
-	// Sanity check that the config value is the current value
-	assert.Equal(t, "TMPDIR/juan.log", cfg.LogFile)
-
-	// Initialize the command and parse any flags
-	cmd := &ProxyCommand{BaseCommand: &BaseCommand{}}
-	f := cmd.Flags()
-	// Simulate the flag being specified
-	err = f.Parse([]string{"-log-file=/foo/bar/test.log"})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Update the config based on the inputs.
-	cmd.applyConfigOverrides(f, cfg)
-
-	assert.NotEqual(t, "TMPDIR/juan.log", cfg.LogFile)
-	assert.NotEqual(t, "/squiggle/logs.txt", cfg.LogFile)
-	assert.Equal(t, "/foo/bar/test.log", cfg.LogFile)
-}
-
-// TestProxy_LogFile_Config tests log file config when loaded from config
-func TestProxy_LogFile_Config(t *testing.T) {
-	configFile := populateTempFile(t, "proxy-config.hcl", BasicHclConfig)
-
-	cfg, err := proxyConfig.LoadConfigFile(configFile.Name())
-	if err != nil {
-		t.Fatal("Cannot load config to test update/merge", err)
-	}
-
-	// Sanity check that the config value is the current value
-	assert.Equal(t, "TMPDIR/juan.log", cfg.LogFile, "sanity check on log config failed")
-	assert.Equal(t, 2, cfg.LogRotateMaxFiles)
-	assert.Equal(t, 1048576, cfg.LogRotateBytes)
-
-	// Parse the cli flags (but we pass in an empty slice)
-	cmd := &ProxyCommand{BaseCommand: &BaseCommand{}}
-	f := cmd.Flags()
-	err = f.Parse([]string{})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Should change nothing...
-	cmd.applyConfigOverrides(f, cfg)
-
-	assert.Equal(t, "TMPDIR/juan.log", cfg.LogFile, "actual config check")
-	assert.Equal(t, 2, cfg.LogRotateMaxFiles)
-	assert.Equal(t, 1048576, cfg.LogRotateBytes)
-}
-
-// TestProxy_Config_NewLogger_Default Tests defaults for log level and
-// specifically cmd.newLogger()
-func TestProxy_Config_NewLogger_Default(t *testing.T) {
-	cmd := &ProxyCommand{BaseCommand: &BaseCommand{}}
-	cmd.config = proxyConfig.NewConfig()
-	logger, err := cmd.newLogger()
-
-	assert.NoError(t, err)
-	assert.NotNil(t, logger)
-	assert.Equal(t, hclog.Info.String(), logger.GetLevel().String())
-}
-
-// TestProxy_Config_ReloadLogLevel Tests reloading updates the log
-// level as expected.
-func TestProxy_Config_ReloadLogLevel(t *testing.T) {
-	cmd := &ProxyCommand{BaseCommand: &BaseCommand{}}
-	var err error
-	tempDir := t.TempDir()
-
-	// Load an initial config
-	hcl := strings.ReplaceAll(BasicHclConfig, "TMPDIR", tempDir)
-	configFile := populateTempFile(t, "proxy-config.hcl", hcl)
-	cmd.config, err = proxyConfig.LoadConfigFile(configFile.Name())
-	if err != nil {
-		t.Fatal("Cannot load config to test update/merge", err)
-	}
-
-	// Tweak the loaded config to make sure we can put log files into a temp dir
-	// and systemd log attempts work fine, this would usually happen during Run.
-	cmd.logWriter = os.Stdout
-	cmd.logger, err = cmd.newLogger()
-	if err != nil {
-		t.Fatal("logger required for systemd log messages", err)
-	}
-
-	// Sanity check
-	assert.Equal(t, "warn", cmd.config.LogLevel)
-
-	// Load a new config
-	hcl = strings.ReplaceAll(BasicHclConfig2, "TMPDIR", tempDir)
-	configFile = populateTempFile(t, "proxy-config.hcl", hcl)
-	err = cmd.reloadConfig([]string{configFile.Name()})
-	assert.NoError(t, err)
-	assert.Equal(t, "debug", cmd.config.LogLevel)
-}
-
-// TestProxy_Config_ReloadTls Tests that the TLS certs for the listener are
-// correctly reloaded.
-func TestProxy_Config_ReloadTls(t *testing.T) {
-	var wg sync.WaitGroup
-	wd, err := os.Getwd()
-	if err != nil {
-		t.Fatal("unable to get current working directory")
-	}
-	workingDir := filepath.Join(wd, "/proxy/test-fixtures/reload")
-	fooCert := "reload_foo.pem"
-	fooKey := "reload_foo.key"
-
-	barCert := "reload_bar.pem"
-	barKey := "reload_bar.key"
-
-	reloadCert := "reload_cert.pem"
-	reloadKey := "reload_key.pem"
-	caPem := "reload_ca.pem"
-
-	tempDir := t.TempDir()
-
-	// Set up initial 'foo' certs
-	inBytes, err := os.ReadFile(filepath.Join(workingDir, fooCert))
-	if err != nil {
-		t.Fatal("unable to read cert required for test", fooCert, err)
-	}
-	err = os.WriteFile(filepath.Join(tempDir, reloadCert), inBytes, 0o777)
-	if err != nil {
-		t.Fatal("unable to write temp cert required for test", reloadCert, err)
-	}
-
-	inBytes, err = os.ReadFile(filepath.Join(workingDir, fooKey))
-	if err != nil {
-		t.Fatal("unable to read cert key required for test", fooKey, err)
-	}
-	err = os.WriteFile(filepath.Join(tempDir, reloadKey), inBytes, 0o777)
-	if err != nil {
-		t.Fatal("unable to write temp cert key required for test", reloadKey, err)
-	}
-
-	inBytes, err = os.ReadFile(filepath.Join(workingDir, caPem))
-	if err != nil {
-		t.Fatal("unable to read CA pem required for test", caPem, err)
-	}
-	certPool := x509.NewCertPool()
-	ok := certPool.AppendCertsFromPEM(inBytes)
-	if !ok {
-		t.Fatal("not ok when appending CA cert")
-	}
-
-	replacedHcl := strings.ReplaceAll(BasicHclConfig, "TMPDIR", tempDir)
-	configFile := populateTempFile(t, "proxy-config.hcl", replacedHcl)
-
-	// Set up Proxy
-	logger := logging.NewVaultLogger(hclog.Trace)
-	ui, cmd := testProxyCommand(t, logger)
-
-	wg.Add(1)
-	args := []string{"-config", configFile.Name()}
-	go func() {
-		if code := cmd.Run(args); code != 0 {
-			output := ui.ErrorWriter.String() + ui.OutputWriter.String()
-			t.Errorf("got a non-zero exit status: %s", output)
-		}
-		wg.Done()
-	}()
-
-	testCertificateName := func(cn string) error {
-		conn, err := tls.Dial("tcp", "127.0.0.1:8100", &tls.Config{
-			RootCAs: certPool,
-		})
-		if err != nil {
-			return err
-		}
-		defer conn.Close()
-		if err = conn.Handshake(); err != nil {
-			return err
-		}
-		servName := conn.ConnectionState().PeerCertificates[0].Subject.CommonName
-		if servName != cn {
-			return fmt.Errorf("expected %s, got %s", cn, servName)
-		}
-		return nil
-	}
-
-	// Start
-	select {
-	case <-cmd.startedCh:
-	case <-time.After(5 * time.Second):
-		t.Fatalf("timeout")
-	}
-
-	if err := testCertificateName("foo.example.com"); err != nil {
-		t.Fatalf("certificate name didn't check out: %s", err)
-	}
-
-	// Swap out certs
-	inBytes, err = os.ReadFile(filepath.Join(workingDir, barCert))
-	if err != nil {
-		t.Fatal("unable to read cert required for test", barCert, err)
-	}
-	err = os.WriteFile(filepath.Join(tempDir, reloadCert), inBytes, 0o777)
-	if err != nil {
-		t.Fatal("unable to write temp cert required for test", reloadCert, err)
-	}
-
-	inBytes, err = os.ReadFile(filepath.Join(workingDir, barKey))
-	if err != nil {
-		t.Fatal("unable to read cert key required for test", barKey, err)
-	}
-	err = os.WriteFile(filepath.Join(tempDir, reloadKey), inBytes, 0o777)
-	if err != nil {
-		t.Fatal("unable to write temp cert key required for test", reloadKey, err)
-	}
-
-	// Reload
-	cmd.SighupCh <- struct{}{}
-	select {
-	case <-cmd.reloadedCh:
-	case <-time.After(5 * time.Second):
-		t.Fatalf("timeout")
-	}
-
-	if err := testCertificateName("bar.example.com"); err != nil {
-		t.Fatalf("certificate name didn't check out: %s", err)
-	}
-
-	// Shut down
-	cmd.ShutdownCh <- struct{}{}
-
-	wg.Wait()
-}
diff --git a/command/read.go b/command/read.go
index 17b85529e12df..b12eb3f60ae1e 100644
--- a/command/read.go
+++ b/command/read.go
@@ -1,10 +1,6 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
-	"context"
 	"fmt"
 	"io"
 	"os"
@@ -63,7 +59,7 @@ func (c *ReadCommand) AutocompleteFlags() complete.Flags {
 func (c *ReadCommand) Run(args []string) int {
 	f := c.Flags()
 
-	if err := f.Parse(args, ParseOptionAllowRawFormat(true)); err != nil {
+	if err := f.Parse(args); err != nil {
 		c.UI.Error(err.Error())
 		return 1
 	}
@@ -81,10 +77,6 @@ func (c *ReadCommand) Run(args []string) int {
 		return 2
 	}
 
-	// client.ReadRaw* methods require a manual timeout override
-	ctx, cancel := context.WithTimeout(context.Background(), client.ClientTimeout())
-	defer cancel()
-
 	// Pull our fake stdin if needed
 	stdin := (io.Reader)(os.Stdin)
 	if c.testStdin != nil {
@@ -99,40 +91,19 @@ func (c *ReadCommand) Run(args []string) int {
 		return 1
 	}
 
-	if Format(c.UI) != "raw" {
-		secret, err := client.Logical().ReadWithDataWithContext(ctx, path, data)
-		if err != nil {
-			c.UI.Error(fmt.Sprintf("Error reading %s: %s", path, err))
-			return 2
-		}
-		if secret == nil {
-			c.UI.Error(fmt.Sprintf("No value found at %s", path))
-			return 2
-		}
-
-		if c.flagField != "" {
-			return PrintRawField(c.UI, secret, c.flagField)
-		}
-
-		return OutputSecret(c.UI, secret)
-	}
-
-	resp, err := client.Logical().ReadRawWithDataWithContext(ctx, path, data)
+	secret, err := client.Logical().ReadWithData(path, data)
 	if err != nil {
-		c.UI.Error(fmt.Sprintf("Error reading: %s: %s", path, err))
+		c.UI.Error(fmt.Sprintf("Error reading %s: %s", path, err))
 		return 2
 	}
-	if resp == nil || resp.Body == nil {
+	if secret == nil {
 		c.UI.Error(fmt.Sprintf("No value found at %s", path))
 		return 2
 	}
-	defer resp.Body.Close()
 
-	contents, err := io.ReadAll(resp.Body)
-	if err != nil {
-		c.UI.Error(fmt.Sprintf("Error reading: %s: %s", path, err))
-		return 2
+	if c.flagField != "" {
+		return PrintRawField(c.UI, secret, c.flagField)
 	}
 
-	return OutputData(c.UI, contents)
+	return OutputSecret(c.UI, secret)
 }
diff --git a/command/read_test.go b/command/read_test.go
index fbe7ab414fa56..4a8ec877aa0f8 100644
--- a/command/read_test.go
+++ b/command/read_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/rotate.go b/command/rotate.go
index 7a174f34eb9c0..f366a6133b105 100644
--- a/command/rotate.go
+++ b/command/rotate.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/rotate_test.go b/command/rotate_test.go
index bfd48f7b026cb..37ac323405908 100644
--- a/command/rotate_test.go
+++ b/command/rotate_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/secrets.go b/command/secrets.go
index 320167226c20c..06e63bec281fa 100644
--- a/command/secrets.go
+++ b/command/secrets.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/secrets_disable.go b/command/secrets_disable.go
index 8d782a524577b..47a61c5fe094c 100644
--- a/command/secrets_disable.go
+++ b/command/secrets_disable.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/secrets_disable_test.go b/command/secrets_disable_test.go
index d7c7da713bd79..567c8956d6308 100644
--- a/command/secrets_disable_test.go
+++ b/command/secrets_disable_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/secrets_enable.go b/command/secrets_enable.go
index 39ce3bf1b8802..8be62953dca99 100644
--- a/command/secrets_enable.go
+++ b/command/secrets_enable.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -11,6 +8,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/vault/api"
+	"github.com/hashicorp/vault/sdk/helper/consts"
 	"github.com/mitchellh/cli"
 	"github.com/posener/complete"
 )
@@ -171,7 +169,7 @@ func (c *SecretsEnableCommand) Flags() *FlagSets {
 	f.StringVar(&StringVar{
 		Name:       "plugin-name",
 		Target:     &c.flagPluginName,
-		Completion: c.PredictVaultPlugins(api.PluginTypeSecrets, api.PluginTypeDatabase),
+		Completion: c.PredictVaultPlugins(consts.PluginTypeSecrets, consts.PluginTypeDatabase),
 		Usage: "Name of the secrets engine plugin. This plugin name must already " +
 			"exist in Vault's plugin catalog.",
 	})
diff --git a/command/secrets_enable_test.go b/command/secrets_enable_test.go
index 93984b3c33dda..4e8a9d1fc9520 100644
--- a/command/secrets_enable_test.go
+++ b/command/secrets_enable_test.go
@@ -1,12 +1,7 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
-	"errors"
 	"io/ioutil"
-	"os"
 	"strings"
 	"testing"
 
@@ -221,10 +216,6 @@ func TestSecretsEnableCommand_Run(t *testing.T) {
 				if f.Name() == "plugin" {
 					continue
 				}
-				if _, err := os.Stat("../builtin/logical/" + f.Name() + "/backend.go"); errors.Is(err, os.ErrNotExist) {
-					// Skip ext test packages (fake plugins without backends).
-					continue
-				}
 				backends = append(backends, f.Name())
 			}
 		}
diff --git a/command/secrets_list.go b/command/secrets_list.go
index 90a8fe8ed973c..998620f0964a4 100644
--- a/command/secrets_list.go
+++ b/command/secrets_list.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/secrets_list_test.go b/command/secrets_list_test.go
index 95b60e34071af..1aeee5bf67294 100644
--- a/command/secrets_list_test.go
+++ b/command/secrets_list_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/secrets_move.go b/command/secrets_move.go
index b74adcd6af7bd..458e3bbece7ad 100644
--- a/command/secrets_move.go
+++ b/command/secrets_move.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/secrets_move_test.go b/command/secrets_move_test.go
index 3aabaa179bbe3..153fbeb2cdc0b 100644
--- a/command/secrets_move_test.go
+++ b/command/secrets_move_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/secrets_tune.go b/command/secrets_tune.go
index 74753e29d333d..bf8fa3d593784 100644
--- a/command/secrets_tune.go
+++ b/command/secrets_tune.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/secrets_tune_test.go b/command/secrets_tune_test.go
index 25b8a7ce791fb..41c6bd2f6fd1d 100644
--- a/command/secrets_tune_test.go
+++ b/command/secrets_tune_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -9,7 +6,8 @@ import (
 
 	"github.com/go-test/deep"
 	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/helper/testhelpers/corehelpers"
+	"github.com/hashicorp/vault/sdk/helper/consts"
+	"github.com/hashicorp/vault/vault"
 	"github.com/mitchellh/cli"
 )
 
@@ -152,7 +150,7 @@ func TestSecretsTuneCommand_Run(t *testing.T) {
 	t.Run("integration", func(t *testing.T) {
 		t.Run("flags_all", func(t *testing.T) {
 			t.Parallel()
-			pluginDir, cleanup := corehelpers.MakeTestPluginDir(t)
+			pluginDir, cleanup := vault.MakeTestPluginDir(t)
 			defer cleanup(t)
 
 			client, _, closer := testVaultServerPluginDir(t, pluginDir)
@@ -181,7 +179,7 @@ func TestSecretsTuneCommand_Run(t *testing.T) {
 				t.Errorf("expected %q to be %q", mountInfo.PluginVersion, exp)
 			}
 
-			_, _, version := testPluginCreateAndRegisterVersioned(t, client, pluginDir, "pki", api.PluginTypeSecrets)
+			_, _, version := testPluginCreateAndRegisterVersioned(t, client, pluginDir, "pki", consts.PluginTypeSecrets)
 
 			code := cmd.Run([]string{
 				"-description", "new description",
diff --git a/command/server.go b/command/server.go
index 73b6659e906a3..69ffe9efc0f4e 100644
--- a/command/server.go
+++ b/command/server.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -32,33 +29,29 @@ import (
 	"github.com/hashicorp/go-multierror"
 	"github.com/hashicorp/go-secure-stdlib/gatedwriter"
 	"github.com/hashicorp/go-secure-stdlib/mlock"
-	"github.com/hashicorp/go-secure-stdlib/parseutil"
 	"github.com/hashicorp/go-secure-stdlib/reloadutil"
 	"github.com/hashicorp/vault/audit"
 	config2 "github.com/hashicorp/vault/command/config"
 	"github.com/hashicorp/vault/command/server"
 	"github.com/hashicorp/vault/helper/builtinplugins"
 	"github.com/hashicorp/vault/helper/constants"
-	"github.com/hashicorp/vault/helper/experiments"
-	loghelper "github.com/hashicorp/vault/helper/logging"
 	"github.com/hashicorp/vault/helper/metricsutil"
 	"github.com/hashicorp/vault/helper/namespace"
-	"github.com/hashicorp/vault/helper/testhelpers/teststorage"
-	"github.com/hashicorp/vault/helper/useragent"
 	vaulthttp "github.com/hashicorp/vault/http"
 	"github.com/hashicorp/vault/internalshared/configutil"
 	"github.com/hashicorp/vault/internalshared/listenerutil"
 	"github.com/hashicorp/vault/sdk/helper/consts"
 	"github.com/hashicorp/vault/sdk/helper/jsonutil"
+	"github.com/hashicorp/vault/sdk/helper/logging"
 	"github.com/hashicorp/vault/sdk/helper/strutil"
-	"github.com/hashicorp/vault/sdk/helper/testcluster"
+	"github.com/hashicorp/vault/sdk/helper/useragent"
 	"github.com/hashicorp/vault/sdk/logical"
 	"github.com/hashicorp/vault/sdk/physical"
+	"github.com/hashicorp/vault/sdk/version"
 	sr "github.com/hashicorp/vault/serviceregistration"
 	"github.com/hashicorp/vault/vault"
 	"github.com/hashicorp/vault/vault/hcp_link"
 	vaultseal "github.com/hashicorp/vault/vault/seal"
-	"github.com/hashicorp/vault/version"
 	"github.com/mitchellh/cli"
 	"github.com/mitchellh/go-testing-interface"
 	"github.com/pkg/errors"
@@ -91,7 +84,6 @@ const (
 
 type ServerCommand struct {
 	*BaseCommand
-	logFlags logFlags
 
 	AuditBackends      map[string]audit.Factory
 	CredentialBackends map[string]logical.Factory
@@ -106,9 +98,9 @@ type ServerCommand struct {
 
 	WaitGroup *sync.WaitGroup
 
-	logWriter io.Writer
-	logGate   *gatedwriter.Writer
-	logger    hclog.InterceptLogger
+	logOutput   io.Writer
+	gatedWriter *gatedwriter.Writer
+	logger      hclog.InterceptLogger
 
 	cleanupGuard sync.Once
 
@@ -120,9 +112,11 @@ type ServerCommand struct {
 
 	allLoggers []hclog.Logger
 
+	// new stuff
 	flagConfigs            []string
+	flagLogLevel           string
+	flagLogFormat          string
 	flagRecovery           bool
-	flagExperiments        []string
 	flagDev                bool
 	flagDevTLS             bool
 	flagDevTLSCertDir      string
@@ -141,11 +135,12 @@ type ServerCommand struct {
 	flagDevFourCluster     bool
 	flagDevTransactional   bool
 	flagDevAutoSeal        bool
-	flagDevClusterJson     string
 	flagTestVerifyOnly     bool
+	flagCombineLogs        bool
 	flagTestServerConfig   bool
 	flagDevConsul          bool
 	flagExitOnCoreShutdown bool
+	flagDiagnose           string
 }
 
 func (c *ServerCommand) Synopsis() string {
@@ -181,9 +176,6 @@ func (c *ServerCommand) Flags() *FlagSets {
 
 	f := set.NewFlagSet("Command Options")
 
-	// Augment with the log flags
-	f.addLogFlags(&c.logFlags)
-
 	f.StringSliceVar(&StringSliceVar{
 		Name:   "config",
 		Target: &c.flagConfigs,
@@ -198,6 +190,27 @@ func (c *ServerCommand) Flags() *FlagSets {
 			".hcl or .json are loaded.",
 	})
 
+	f.StringVar(&StringVar{
+		Name:       "log-level",
+		Target:     &c.flagLogLevel,
+		Default:    notSetValue,
+		EnvVar:     "VAULT_LOG_LEVEL",
+		Completion: complete.PredictSet("trace", "debug", "info", "warn", "error"),
+		Usage: "Log verbosity level. Supported values (in order of detail) are " +
+			"\"trace\", \"debug\", \"info\", \"warn\", and \"error\".",
+	})
+
+	f.StringVar(&StringVar{
+		Name:    "log-format",
+		Target:  &c.flagLogFormat,
+		Default: notSetValue,
+		// EnvVar can't be just "VAULT_LOG_FORMAT", because more than one env var name is supported
+		// for backwards compatibility reasons.
+		// See github.com/hashicorp/vault/sdk/helper/logging.ParseEnvLogFormat()
+		Completion: complete.PredictSet("standard", "json"),
+		Usage:      `Log format. Supported values are "standard" and "json".`,
+	})
+
 	f.BoolVar(&BoolVar{
 		Name:    "exit-on-core-shutdown",
 		Target:  &c.flagExitOnCoreShutdown,
@@ -212,16 +225,18 @@ func (c *ServerCommand) Flags() *FlagSets {
 			"Using a recovery operation token, \"sys/raw\" API can be used to manipulate the storage.",
 	})
 
-	f.StringSliceVar(&StringSliceVar{
-		Name:       "experiment",
-		Target:     &c.flagExperiments,
-		Completion: complete.PredictSet(experiments.ValidExperiments()...),
-		Usage: "Name of an experiment to enable. Experiments should NOT be used in production, and " +
-			"the associated APIs may have backwards incompatible changes between releases. This " +
-			"flag can be specified multiple times to specify multiple experiments. This can also be " +
-			fmt.Sprintf("specified via the %s environment variable as a comma-separated list. ", EnvVaultExperiments) +
-			"Valid experiments are: " + strings.Join(experiments.ValidExperiments(), ", "),
-	})
+	// Disabled by default until functional
+	if os.Getenv(OperatorDiagnoseEnableEnv) != "" {
+		f.StringVar(&StringVar{
+			Name:    "diagnose",
+			Target:  &c.flagDiagnose,
+			Default: notSetValue,
+			Usage:   "Run diagnostics before starting Vault. Specify a filename to direct output to that file.",
+		})
+	} else {
+		// Ensure diagnose is *not* run when feature flag is off.
+		c.flagDiagnose = notSetValue
+	}
 
 	f = set.NewFlagSet("Dev Options")
 
@@ -373,13 +388,14 @@ func (c *ServerCommand) Flags() *FlagSets {
 		Hidden:  true,
 	})
 
-	f.StringVar(&StringVar{
-		Name:   "dev-cluster-json",
-		Target: &c.flagDevClusterJson,
-		Usage:  "File to write cluster definition to",
+	// TODO: should the below flags be public?
+	f.BoolVar(&BoolVar{
+		Name:    "combine-logs",
+		Target:  &c.flagCombineLogs,
+		Default: false,
+		Hidden:  true,
 	})
 
-	// TODO: should the below flags be public?
 	f.BoolVar(&BoolVar{
 		Name:    "test-verify-only",
 		Target:  &c.flagTestVerifyOnly,
@@ -409,8 +425,8 @@ func (c *ServerCommand) AutocompleteFlags() complete.Flags {
 
 func (c *ServerCommand) flushLog() {
 	c.logger.(hclog.OutputResettable).ResetOutputWithFlush(&hclog.LoggerOptions{
-		Output: c.logWriter,
-	}, c.logGate)
+		Output: c.logOutput,
+	}, c.gatedWriter)
 }
 
 func (c *ServerCommand) parseConfig() (*server.Config, []configutil.ConfigError, error) {
@@ -457,15 +473,20 @@ func (c *ServerCommand) runRecoveryMode() int {
 		return 1
 	}
 
-	// Update the 'log' related aspects of shared config based on config/env var/cli
-	c.flags.applyLogConfigOverrides(config.SharedConfig)
-	l, err := c.configureLogging(config)
+	level, logLevelString, logLevelWasNotSet, logFormat, err := c.processLogLevelAndFormat(config)
 	if err != nil {
 		c.UI.Error(err.Error())
 		return 1
 	}
-	c.logger = l
-	c.allLoggers = append(c.allLoggers, l)
+
+	c.logger = hclog.NewInterceptLogger(&hclog.LoggerOptions{
+		Output:            c.gatedWriter,
+		Level:             level,
+		IndependentLevels: true,
+		// Note that if logFormat is either unspecified or standard, then
+		// the resulting logger's format will be standard.
+		JSONFormat: logFormat == logging.JSONFormat,
+	})
 
 	// reporting Errors found in the config
 	for _, cErr := range configErrors {
@@ -475,6 +496,15 @@ func (c *ServerCommand) runRecoveryMode() int {
 	// Ensure logging is flushed if initialization fails
 	defer c.flushLog()
 
+	logLevelStr, err := c.adjustLogLevel(config, logLevelWasNotSet)
+	if err != nil {
+		c.UI.Error(err.Error())
+		return 1
+	}
+	if logLevelStr != "" {
+		logLevelString = logLevelStr
+	}
+
 	// create GRPC logger
 	namedGRPCLogFaker := c.logger.Named("grpclogfaker")
 	grpclog.SetLogger(&grpclogFaker{
@@ -519,7 +549,7 @@ func (c *ServerCommand) runRecoveryMode() int {
 
 	infoKeys := make([]string, 0, 10)
 	info := make(map[string]string)
-	info["log level"] = config.LogLevel
+	info["log level"] = logLevelString
 	infoKeys = append(infoKeys, "log level")
 
 	var barrierSeal vault.Seal
@@ -548,7 +578,9 @@ func (c *ServerCommand) runRecoveryMode() int {
 	info["Seal Type"] = sealType
 
 	var seal vault.Seal
-	defaultSeal := vault.NewDefaultSeal(vaultseal.NewAccess(aeadwrapper.NewShamirWrapper()))
+	defaultSeal := vault.NewDefaultSeal(&vaultseal.Access{
+		Wrapper: aeadwrapper.NewShamirWrapper(),
+	})
 	sealLogger := c.logger.ResetNamed(fmt.Sprintf("seal.%s", sealType))
 	wrapper, sealConfigError = configutil.ConfigureWrapper(configSeal, &infoKeys, &info, sealLogger)
 	if sealConfigError != nil {
@@ -561,7 +593,9 @@ func (c *ServerCommand) runRecoveryMode() int {
 	if wrapper == nil {
 		seal = defaultSeal
 	} else {
-		seal, err = vault.NewAutoSeal(vaultseal.NewAccess(wrapper))
+		seal, err = vault.NewAutoSeal(&vaultseal.Access{
+			Wrapper: wrapper,
+		})
 		if err != nil {
 			c.UI.Error(fmt.Sprintf("error creating auto seal: %v", err))
 		}
@@ -580,7 +614,7 @@ func (c *ServerCommand) runRecoveryMode() int {
 		Physical:     backend,
 		StorageType:  config.Storage.Type,
 		Seal:         barrierSeal,
-		LogLevel:     config.LogLevel,
+		LogLevel:     logLevelString,
 		Logger:       c.logger,
 		DisableMlock: config.DisableMlock,
 		RecoveryMode: c.flagRecovery,
@@ -612,7 +646,7 @@ func (c *ServerCommand) runRecoveryMode() int {
 	// Initialize the listeners
 	lns := make([]listenerutil.Listener, 0, len(config.Listeners))
 	for _, lnConfig := range config.Listeners {
-		ln, _, _, err := server.NewListener(lnConfig, c.logGate, c.UI)
+		ln, _, _, err := server.NewListener(lnConfig, c.gatedWriter, c.UI)
 		if err != nil {
 			c.UI.Error(fmt.Sprintf("Error initializing listener of type %s: %s", lnConfig.Type, err))
 			return 1
@@ -669,14 +703,8 @@ func (c *ServerCommand) runRecoveryMode() int {
 
 	c.UI.Output("")
 
-	// Tests might not want to start a vault server and just want to verify
-	// the configuration.
-	if c.flagTestVerifyOnly {
-		return 0
-	}
-
 	for _, ln := range lns {
-		handler := vaulthttp.Handler.Handler(&vault.HandlerProperties{
+		handler := vaulthttp.Handler(&vault.HandlerProperties{
 			Core:                  core,
 			ListenerConfig:        ln.Config,
 			DisablePrintableCheck: config.DisablePrintableCheck,
@@ -714,7 +742,7 @@ func (c *ServerCommand) runRecoveryMode() int {
 		c.UI.Warn("")
 	}
 
-	if !c.logFlags.flagCombineLogs {
+	if !c.flagCombineLogs {
 		c.UI.Output("==> Vault server started! Log data will stream in below:\n")
 	}
 
@@ -766,6 +794,82 @@ func logProxyEnvironmentVariables(logger hclog.Logger) {
 		"https_proxy", cfgMap["https_proxy"], "no_proxy", cfgMap["no_proxy"])
 }
 
+func (c *ServerCommand) adjustLogLevel(config *server.Config, logLevelWasNotSet bool) (string, error) {
+	var logLevelString string
+	if config.LogLevel != "" && logLevelWasNotSet {
+		configLogLevel := strings.ToLower(strings.TrimSpace(config.LogLevel))
+		logLevelString = configLogLevel
+		switch configLogLevel {
+		case "trace":
+			c.logger.SetLevel(hclog.Trace)
+		case "debug":
+			c.logger.SetLevel(hclog.Debug)
+		case "notice", "info", "":
+			c.logger.SetLevel(hclog.Info)
+		case "warn", "warning":
+			c.logger.SetLevel(hclog.Warn)
+		case "err", "error":
+			c.logger.SetLevel(hclog.Error)
+		default:
+			return "", fmt.Errorf("unknown log level: %s", config.LogLevel)
+		}
+	}
+	return logLevelString, nil
+}
+
+func (c *ServerCommand) processLogLevelAndFormat(config *server.Config) (hclog.Level, string, bool, logging.LogFormat, error) {
+	// Create a logger. We wrap it in a gated writer so that it doesn't
+	// start logging too early.
+	c.logOutput = os.Stderr
+	if c.flagCombineLogs {
+		c.logOutput = os.Stdout
+	}
+	c.gatedWriter = gatedwriter.NewWriter(c.logOutput)
+	var level hclog.Level
+	var logLevelWasNotSet bool
+	logFormat := logging.UnspecifiedFormat
+	logLevelString := c.flagLogLevel
+	c.flagLogLevel = strings.ToLower(strings.TrimSpace(c.flagLogLevel))
+	switch c.flagLogLevel {
+	case notSetValue, "":
+		logLevelWasNotSet = true
+		logLevelString = "info"
+		level = hclog.Info
+	case "trace":
+		level = hclog.Trace
+	case "debug":
+		level = hclog.Debug
+	case "notice", "info":
+		level = hclog.Info
+	case "warn", "warning":
+		level = hclog.Warn
+	case "err", "error":
+		level = hclog.Error
+	default:
+		return level, logLevelString, logLevelWasNotSet, logFormat, fmt.Errorf("unknown log level: %s", c.flagLogLevel)
+	}
+
+	if c.flagLogFormat != notSetValue {
+		var err error
+		logFormat, err = logging.ParseLogFormat(c.flagLogFormat)
+		if err != nil {
+			return level, logLevelString, logLevelWasNotSet, logFormat, err
+		}
+	}
+	if logFormat == logging.UnspecifiedFormat {
+		logFormat = logging.ParseEnvLogFormat()
+	}
+	if logFormat == logging.UnspecifiedFormat {
+		var err error
+		logFormat, err = logging.ParseLogFormat(config.LogFormat)
+		if err != nil {
+			return level, logLevelString, logLevelWasNotSet, logFormat, err
+		}
+	}
+
+	return level, logLevelString, logLevelWasNotSet, logFormat, nil
+}
+
 type quiescenceSink struct {
 	t *time.Timer
 }
@@ -857,7 +961,7 @@ func (c *ServerCommand) InitListeners(config *server.Config, disableClustering b
 
 	var errMsg error
 	for i, lnConfig := range config.Listeners {
-		ln, props, reloadFunc, err := server.NewListener(lnConfig, c.logGate, c.UI)
+		ln, props, reloadFunc, err := server.NewListener(lnConfig, c.gatedWriter, c.UI)
 		if err != nil {
 			errMsg = fmt.Errorf("Error initializing listener of type %s: %s", lnConfig.Type, err)
 			return 1, nil, nil, errMsg
@@ -930,69 +1034,6 @@ func (c *ServerCommand) InitListeners(config *server.Config, disableClustering b
 	return 0, lns, clusterAddrs, nil
 }
 
-func configureDevTLS(c *ServerCommand) (func(), *server.Config, string, error) {
-	var devStorageType string
-
-	switch {
-	case c.flagDevConsul:
-		devStorageType = "consul"
-	case c.flagDevHA && c.flagDevTransactional:
-		devStorageType = "inmem_transactional_ha"
-	case !c.flagDevHA && c.flagDevTransactional:
-		devStorageType = "inmem_transactional"
-	case c.flagDevHA && !c.flagDevTransactional:
-		devStorageType = "inmem_ha"
-	default:
-		devStorageType = "inmem"
-	}
-
-	var certDir string
-	var err error
-	var config *server.Config
-	var f func()
-
-	if c.flagDevTLS {
-		if c.flagDevTLSCertDir != "" {
-			if _, err = os.Stat(c.flagDevTLSCertDir); err != nil {
-				return nil, nil, "", err
-			}
-
-			certDir = c.flagDevTLSCertDir
-		} else {
-			if certDir, err = os.MkdirTemp("", "vault-tls"); err != nil {
-				return nil, nil, certDir, err
-			}
-		}
-		config, err = server.DevTLSConfig(devStorageType, certDir)
-
-		f = func() {
-			if err := os.Remove(fmt.Sprintf("%s/%s", certDir, server.VaultDevCAFilename)); err != nil {
-				c.UI.Error(err.Error())
-			}
-
-			if err := os.Remove(fmt.Sprintf("%s/%s", certDir, server.VaultDevCertFilename)); err != nil {
-				c.UI.Error(err.Error())
-			}
-
-			if err := os.Remove(fmt.Sprintf("%s/%s", certDir, server.VaultDevKeyFilename)); err != nil {
-				c.UI.Error(err.Error())
-			}
-
-			// Only delete temp directories we made.
-			if c.flagDevTLSCertDir == "" {
-				if err := os.Remove(certDir); err != nil {
-					c.UI.Error(err.Error())
-				}
-			}
-		}
-
-	} else {
-		config, err = server.DevConfig(devStorageType)
-	}
-
-	return f, config, certDir, err
-}
-
 func (c *ServerCommand) Run(args []string) int {
 	f := c.Flags()
 
@@ -1001,13 +1042,6 @@ func (c *ServerCommand) Run(args []string) int {
 		return 1
 	}
 
-	c.logGate = gatedwriter.NewWriter(os.Stderr)
-	c.logWriter = c.logGate
-
-	if c.logFlags.flagCombineLogs {
-		c.logWriter = os.Stdout
-	}
-
 	if c.flagRecovery {
 		return c.runRecoveryMode()
 	}
@@ -1031,13 +1065,85 @@ func (c *ServerCommand) Run(args []string) int {
 		}
 	}
 
+	if c.flagDiagnose != notSetValue {
+		if c.flagDev {
+			c.UI.Error("Cannot run diagnose on Vault in dev mode.")
+			return 1
+		}
+		// TODO: add a file output flag to Diagnose
+		diagnose := &OperatorDiagnoseCommand{
+			BaseCommand: c.BaseCommand,
+			flagDebug:   false,
+			flagSkips:   []string{},
+			flagConfigs: c.flagConfigs,
+		}
+		diagnose.RunWithParsedFlags()
+	}
+
 	// Load the configuration
 	var config *server.Config
+	var err error
 	var certDir string
 	if c.flagDev {
-		df, cfg, dir, err := configureDevTLS(c)
-		if df != nil {
-			defer df()
+		var devStorageType string
+		switch {
+		case c.flagDevConsul:
+			devStorageType = "consul"
+		case c.flagDevHA && c.flagDevTransactional:
+			devStorageType = "inmem_transactional_ha"
+		case !c.flagDevHA && c.flagDevTransactional:
+			devStorageType = "inmem_transactional"
+		case c.flagDevHA && !c.flagDevTransactional:
+			devStorageType = "inmem_ha"
+		default:
+			devStorageType = "inmem"
+		}
+
+		if c.flagDevTLS {
+			if c.flagDevTLSCertDir != "" {
+				_, err := os.Stat(c.flagDevTLSCertDir)
+				if err != nil {
+					c.UI.Error(err.Error())
+					return 1
+				}
+
+				certDir = c.flagDevTLSCertDir
+			} else {
+				certDir, err = os.MkdirTemp("", "vault-tls")
+				if err != nil {
+					c.UI.Error(err.Error())
+					return 1
+				}
+			}
+			config, err = server.DevTLSConfig(devStorageType, certDir)
+
+			defer func() {
+				err := os.Remove(fmt.Sprintf("%s/%s", certDir, server.VaultDevCAFilename))
+				if err != nil {
+					c.UI.Error(err.Error())
+				}
+
+				err = os.Remove(fmt.Sprintf("%s/%s", certDir, server.VaultDevCertFilename))
+				if err != nil {
+					c.UI.Error(err.Error())
+				}
+
+				err = os.Remove(fmt.Sprintf("%s/%s", certDir, server.VaultDevKeyFilename))
+				if err != nil {
+					c.UI.Error(err.Error())
+				}
+
+				// Only delete temp directories we made.
+				if c.flagDevTLSCertDir == "" {
+					err = os.Remove(certDir)
+					if err != nil {
+						c.UI.Error(err.Error())
+					}
+				}
+			}()
+
+		} else {
+			config, err = server.DevConfig(devStorageType)
 		}
 
 		if err != nil {
@@ -1045,9 +1151,6 @@ func (c *ServerCommand) Run(args []string) int {
 			return 1
 		}
 
-		config = cfg
-		certDir = dir
-
 		if c.flagDevListenAddr != "" {
 			config.Listeners[0].Address = c.flagDevListenAddr
 		}
@@ -1075,20 +1178,31 @@ func (c *ServerCommand) Run(args []string) int {
 		return 1
 	}
 
-	f.applyLogConfigOverrides(config.SharedConfig)
-
-	// Set 'trace' log level for the following 'dev' clusters
-	if c.flagDevThreeNode || c.flagDevFourCluster {
-		config.LogLevel = "trace"
-	}
-
-	l, err := c.configureLogging(config)
+	level, logLevelString, logLevelWasNotSet, logFormat, err := c.processLogLevelAndFormat(config)
 	if err != nil {
 		c.UI.Error(err.Error())
 		return 1
 	}
-	c.logger = l
-	c.allLoggers = append(c.allLoggers, l)
+
+	config.LogFormat = logFormat.String()
+
+	if c.flagDevThreeNode || c.flagDevFourCluster {
+		c.logger = hclog.NewInterceptLogger(&hclog.LoggerOptions{
+			Mutex:             &sync.Mutex{},
+			Output:            c.gatedWriter,
+			Level:             hclog.Trace,
+			IndependentLevels: true,
+		})
+	} else {
+		c.logger = hclog.NewInterceptLogger(&hclog.LoggerOptions{
+			Output:            c.gatedWriter,
+			Level:             level,
+			IndependentLevels: true,
+			// Note that if logFormat is either unspecified or standard, then
+			// the resulting logger's format will be standard.
+			JSONFormat: logFormat == logging.JSONFormat,
+		})
+	}
 
 	// reporting Errors found in the config
 	for _, cErr := range configErrors {
@@ -1098,6 +1212,17 @@ func (c *ServerCommand) Run(args []string) int {
 	// Ensure logging is flushed if initialization fails
 	defer c.flushLog()
 
+	c.allLoggers = []hclog.Logger{c.logger}
+
+	logLevelStr, err := c.adjustLogLevel(config, logLevelWasNotSet)
+	if err != nil {
+		c.UI.Error(err.Error())
+		return 1
+	}
+	if logLevelStr != "" {
+		logLevelString = logLevelStr
+	}
+
 	// create GRPC logger
 	namedGRPCLogFaker := c.logger.Named("grpclogfaker")
 	c.allLoggers = append(c.allLoggers, namedGRPCLogFaker)
@@ -1131,10 +1256,14 @@ func (c *ServerCommand) Run(args []string) int {
 	if envLicense := os.Getenv(EnvVaultLicense); envLicense != "" {
 		config.License = envLicense
 	}
-
-	if err := server.ExperimentsFromEnvAndCLI(config, EnvVaultExperiments, c.flagExperiments); err != nil {
-		c.UI.Error(err.Error())
-		return 1
+	if disableSSC := os.Getenv(DisableSSCTokens); disableSSC != "" {
+		var err error
+		config.DisableSSCTokens, err = strconv.ParseBool(disableSSC)
+		if err != nil {
+			c.UI.Warn(wrapAtLength("WARNING! failed to parse " +
+				"VAULT_DISABLE_SERVER_SIDE_CONSISTENT_TOKENS env var: " +
+				"setting to default value false"))
+		}
 	}
 
 	// If mlockall(2) isn't supported, show a warning. We disable this in dev
@@ -1164,18 +1293,16 @@ func (c *ServerCommand) Run(args []string) int {
 	metricsHelper := metricsutil.NewMetricsHelper(inmemMetrics, prometheusEnabled)
 
 	// Initialize the storage backend
-	var backend physical.Backend
-	if !c.flagDev || config.Storage != nil {
-		backend, err = c.setupStorage(config)
-		if err != nil {
-			c.UI.Error(err.Error())
-			return 1
-		}
-		// Prevent server startup if migration is active
-		// TODO: Use OpenTelemetry to integrate this into Diagnose
-		if c.storageMigrationActive(backend) {
-			return 1
-		}
+	backend, err := c.setupStorage(config)
+	if err != nil {
+		c.UI.Error(err.Error())
+		return 1
+	}
+
+	// Prevent server startup if migration is active
+	// TODO: Use OpenTelemetry to integrate this into Diagnose
+	if c.storageMigrationActive(backend) {
+		return 1
 	}
 
 	// Initialize the Service Discovery, if there is one
@@ -1190,7 +1317,7 @@ func (c *ServerCommand) Run(args []string) int {
 
 	infoKeys := make([]string, 0, 10)
 	info := make(map[string]string)
-	info["log level"] = config.LogLevel
+	info["log level"] = logLevelString
 	infoKeys = append(infoKeys, "log level")
 
 	// returns a slice of env vars formatted as "key=value"
@@ -1207,12 +1334,6 @@ func (c *ServerCommand) Run(args []string) int {
 	info[key] = strings.Join(envVarKeys, ", ")
 	infoKeys = append(infoKeys, key)
 
-	if len(config.Experiments) != 0 {
-		expKey := "experiments"
-		info[expKey] = strings.Join(config.Experiments, ", ")
-		infoKeys = append(infoKeys, expKey)
-	}
-
 	barrierSeal, barrierWrapper, unwrapSeal, seals, sealConfigError, err := setSeal(c, config, infoKeys, info)
 	// Check error here
 	if err != nil {
@@ -1220,20 +1341,16 @@ func (c *ServerCommand) Run(args []string) int {
 		return 1
 	}
 
-	for _, seal := range seals {
-		// There is always one nil seal. We need to skip it so we don't start an empty Finalize-Seal-Shamir
-		// section.
-		if seal == nil {
-			continue
+	if seals != nil {
+		for _, seal := range seals {
+			// Ensure that the seal finalizer is called, even if using verify-only
+			defer func(seal *vault.Seal) {
+				err = (*seal).Finalize(context.Background())
+				if err != nil {
+					c.UI.Error(fmt.Sprintf("Error finalizing seals: %v", err))
+				}
+			}(&seal)
 		}
-		seal := seal // capture range variable
-		// Ensure that the seal finalizer is called, even if using verify-only
-		defer func(seal *vault.Seal) {
-			err = (*seal).Finalize(context.Background())
-			if err != nil {
-				c.UI.Error(fmt.Sprintf("Error finalizing seals: %v", err))
-			}
-		}(&seal)
 	}
 
 	if barrierSeal == nil {
@@ -1417,17 +1534,6 @@ func (c *ServerCommand) Run(args []string) int {
 		info["fips"] = fipsStatus
 	}
 
-	if config.HCPLinkConf != nil {
-		infoKeys = append(infoKeys, "HCP organization")
-		info["HCP organization"] = config.HCPLinkConf.Resource.Organization
-
-		infoKeys = append(infoKeys, "HCP project")
-		info["HCP project"] = config.HCPLinkConf.Resource.Project
-
-		infoKeys = append(infoKeys, "HCP resource ID")
-		info["HCP resource ID"] = config.HCPLinkConf.Resource.ID
-	}
-
 	sort.Strings(infoKeys)
 	c.UI.Output("==> Vault server configuration:\n")
 
@@ -1449,7 +1555,7 @@ func (c *ServerCommand) Run(args []string) int {
 	// This needs to happen before we first unseal, so before we trigger dev
 	// mode if it's set
 	core.SetClusterListenerAddrs(clusterAddrs)
-	core.SetClusterHandler(vaulthttp.Handler.Handler(&vault.HandlerProperties{
+	core.SetClusterHandler(vaulthttp.Handler(&vault.HandlerProperties{
 		Core: core,
 	}))
 
@@ -1484,8 +1590,7 @@ func (c *ServerCommand) Run(args []string) int {
 	}
 
 	// If we're in Dev mode, then initialize the core
-	clusterJson := &testcluster.ClusterJson{}
-	err = initDevCore(c, &coreConfig, config, core, certDir, clusterJson)
+	err = initDevCore(c, &coreConfig, config, core, certDir)
 	if err != nil {
 		c.UI.Error(err.Error())
 		return 1
@@ -1498,12 +1603,12 @@ func (c *ServerCommand) Run(args []string) int {
 		return 1
 	}
 
-	hcpLogger := c.logger.Named("hcp-connectivity")
+	hcpLogger := c.logger.Named("hcpLink")
 	hcpLink, err := hcp_link.NewHCPLink(config.HCPLinkConf, core, hcpLogger)
 	if err != nil {
-		c.logger.Error("failed to establish HCP connection", "error", err)
+		c.logger.Error("failed to start HCP Link", "error", err)
 	} else if hcpLink != nil {
-		c.logger.Trace("established HCP connection")
+		c.logger.Trace("started HCP link")
 	}
 
 	if c.flagTestServerConfig {
@@ -1523,7 +1628,7 @@ func (c *ServerCommand) Run(args []string) int {
 	}
 
 	// Output the header that the server has started
-	if !c.logFlags.flagCombineLogs {
+	if !c.flagCombineLogs {
 		c.UI.Output("==> Vault server started! Log data will stream in below:\n")
 	}
 
@@ -1545,34 +1650,6 @@ func (c *ServerCommand) Run(args []string) int {
 	// Notify systemd that the server is ready (if applicable)
 	c.notifySystemd(systemd.SdNotifyReady)
 
-	if c.flagDev {
-		protocol := "http://"
-		if c.flagDevTLS {
-			protocol = "https://"
-		}
-		clusterJson.Nodes = []testcluster.ClusterNode{
-			{
-				APIAddress: protocol + config.Listeners[0].Address,
-			},
-		}
-		if c.flagDevTLS {
-			clusterJson.CACertPath = fmt.Sprintf("%s/%s", certDir, server.VaultDevCAFilename)
-		}
-
-		if c.flagDevClusterJson != "" && !c.flagDevThreeNode {
-			b, err := jsonutil.EncodeJSON(clusterJson)
-			if err != nil {
-				c.UI.Error(fmt.Sprintf("Error encoding cluster.json: %s", err))
-				return 1
-			}
-			err = os.WriteFile(c.flagDevClusterJson, b, 0o600)
-			if err != nil {
-				c.UI.Error(fmt.Sprintf("Error writing cluster.json %q: %s", c.flagDevClusterJson, err))
-				return 1
-			}
-		}
-	}
-
 	defer func() {
 		if err := c.removePidFile(config.PidFile); err != nil {
 			c.UI.Error(fmt.Sprintf("Error deleting the PID file: %s", err))
@@ -1605,6 +1682,7 @@ func (c *ServerCommand) Run(args []string) int {
 
 			// Check for new log level
 			var config *server.Config
+			var level hclog.Level
 			var configErrors []configutil.ConfigError
 			for _, path := range c.flagConfigs {
 				current, err := server.LoadConfig(path)
@@ -1650,10 +1728,20 @@ func (c *ServerCommand) Run(args []string) int {
 				c.logger.Error(err.Error())
 			}
 
-			// Reload log level for loggers
 			if config.LogLevel != "" {
-				level, err := loghelper.ParseLogLevel(config.LogLevel)
-				if err != nil {
+				configLogLevel := strings.ToLower(strings.TrimSpace(config.LogLevel))
+				switch configLogLevel {
+				case "trace":
+					level = hclog.Trace
+				case "debug":
+					level = hclog.Debug
+				case "notice", "info", "":
+					level = hclog.Info
+				case "warn", "warning":
+					level = hclog.Warn
+				case "err", "error":
+					level = hclog.Error
+				default:
 					c.logger.Error("unknown log level found on reload", "level", config.LogLevel)
 					goto RUNRELOADFUNCS
 				}
@@ -1661,7 +1749,7 @@ func (c *ServerCommand) Run(args []string) int {
 			}
 
 		RUNRELOADFUNCS:
-			if err := c.Reload(c.reloadFuncsLock, c.reloadFuncs, c.flagConfigs, core); err != nil {
+			if err := c.Reload(c.reloadFuncsLock, c.reloadFuncs, c.flagConfigs); err != nil {
 				c.UI.Error(fmt.Sprintf("Error(s) were encountered during reload: %s", err))
 			}
 
@@ -1670,9 +1758,6 @@ func (c *ServerCommand) Run(args []string) int {
 				c.UI.Error(err.Error())
 			}
 
-			if err := core.ReloadCensus(); err != nil {
-				c.UI.Error(err.Error())
-			}
 			select {
 			case c.licenseReloadedCh <- err:
 			default:
@@ -1787,38 +1872,7 @@ func (c *ServerCommand) Run(args []string) int {
 	return retCode
 }
 
-// configureLogging takes the configuration and attempts to parse config values into 'log' friendly configuration values
-// If all goes to plan, a logger is created and setup.
-func (c *ServerCommand) configureLogging(config *server.Config) (hclog.InterceptLogger, error) {
-	// Parse all the log related config
-	logLevel, err := loghelper.ParseLogLevel(config.LogLevel)
-	if err != nil {
-		return nil, err
-	}
-
-	logFormat, err := loghelper.ParseLogFormat(config.LogFormat)
-	if err != nil {
-		return nil, err
-	}
-
-	logRotateDuration, err := parseutil.ParseDurationSecond(config.LogRotateDuration)
-	if err != nil {
-		return nil, err
-	}
-
-	logCfg := &loghelper.LogConfig{
-		LogLevel:          logLevel,
-		LogFormat:         logFormat,
-		LogFilePath:       config.LogFile,
-		LogRotateDuration: logRotateDuration,
-		LogRotateBytes:    config.LogRotateBytes,
-		LogRotateMaxFiles: config.LogRotateMaxFiles,
-	}
-
-	return loghelper.Setup(logCfg, c.logWriter)
-}
-
-func (c *ServerCommand) reloadHCPLink(hcpLinkVault *hcp_link.HCPLinkVault, conf *server.Config, core *vault.Core, hcpLogger hclog.Logger) (*hcp_link.HCPLinkVault, error) {
+func (c *ServerCommand) reloadHCPLink(hcpLinkVault *hcp_link.WrappedHCPLinkVault, conf *server.Config, core *vault.Core, hcpLogger hclog.Logger) (*hcp_link.WrappedHCPLinkVault, error) {
 	// trigger a shutdown
 	if hcpLinkVault != nil {
 		err := hcpLinkVault.Shutdown()
@@ -2003,33 +2057,14 @@ func (c *ServerCommand) enableDev(core *vault.Core, coreConfig *vault.CoreConfig
 }
 
 func (c *ServerCommand) enableThreeNodeDevCluster(base *vault.CoreConfig, info map[string]string, infoKeys []string, devListenAddress, tempDir string) int {
-	conf, opts := teststorage.ClusterSetup(base, &vault.TestClusterOptions{
+	testCluster := vault.NewTestCluster(&testing.RuntimeT{}, base, &vault.TestClusterOptions{
 		HandlerFunc:       vaulthttp.Handler,
 		BaseListenAddress: c.flagDevListenAddr,
 		Logger:            c.logger,
 		TempDir:           tempDir,
-		DefaultHandlerProperties: vault.HandlerProperties{
-			ListenerConfig: &configutil.Listener{
-				Profiling: configutil.ListenerProfiling{
-					UnauthenticatedPProfAccess: true,
-				},
-				Telemetry: configutil.ListenerTelemetry{
-					UnauthenticatedMetricsAccess: true,
-				},
-			},
-		},
-	}, nil)
-	testCluster := vault.NewTestCluster(&testing.RuntimeT{}, conf, opts)
+	})
 	defer c.cleanupGuard.Do(testCluster.Cleanup)
 
-	if constants.IsEnterprise {
-		err := testcluster.WaitForActiveNodeAndPerfStandbys(context.Background(), testCluster)
-		if err != nil {
-			c.UI.Error(fmt.Sprintf("perf standbys didn't become ready: %v", err))
-			return 1
-		}
-	}
-
 	info["cluster parameters path"] = testCluster.TempDir
 	infoKeys = append(infoKeys, "cluster parameters path")
 
@@ -2078,7 +2113,7 @@ func (c *ServerCommand) enableThreeNodeDevCluster(base *vault.CoreConfig, info m
 	c.UI.Output("")
 
 	for _, core := range testCluster.Cores {
-		core.Server.Handler = vaulthttp.Handler.Handler(&vault.HandlerProperties{
+		core.Server.Handler = vaulthttp.Handler(&vault.HandlerProperties{
 			Core: core.Core,
 		})
 		core.SetClusterHandler(core.Server.Handler)
@@ -2170,29 +2205,6 @@ func (c *ServerCommand) enableThreeNodeDevCluster(base *vault.CoreConfig, info m
 		testCluster.TempDir,
 	))
 
-	if c.flagDevClusterJson != "" {
-		clusterJson := testcluster.ClusterJson{
-			Nodes:      []testcluster.ClusterNode{},
-			CACertPath: filepath.Join(testCluster.TempDir, "ca_cert.pem"),
-			RootToken:  testCluster.RootToken,
-		}
-		for _, core := range testCluster.Cores {
-			clusterJson.Nodes = append(clusterJson.Nodes, testcluster.ClusterNode{
-				APIAddress: core.Client.Address(),
-			})
-		}
-		b, err := jsonutil.EncodeJSON(clusterJson)
-		if err != nil {
-			c.UI.Error(fmt.Sprintf("Error encoding cluster.json: %s", err))
-			return 1
-		}
-		err = os.WriteFile(c.flagDevClusterJson, b, 0o600)
-		if err != nil {
-			c.UI.Error(fmt.Sprintf("Error writing cluster.json %q: %s", c.flagDevClusterJson, err))
-			return 1
-		}
-	}
-
 	// Output the header that the server has started
 	c.UI.Output("==> Vault server started! Log data will stream in below:\n")
 
@@ -2230,7 +2242,7 @@ func (c *ServerCommand) enableThreeNodeDevCluster(base *vault.CoreConfig, info m
 		case <-c.SighupCh:
 			c.UI.Output("==> Vault reload triggered")
 			for _, core := range testCluster.Cores {
-				if err := c.Reload(core.ReloadFuncsLock, core.ReloadFuncs, nil, core.Core); err != nil {
+				if err := c.Reload(core.ReloadFuncsLock, core.ReloadFuncs, nil); err != nil {
 					c.UI.Error(fmt.Sprintf("Error(s) were encountered during reload: %s", err))
 				}
 			}
@@ -2348,7 +2360,7 @@ func (c *ServerCommand) detectRedirect(detect physical.RedirectDetect,
 	return url.String(), nil
 }
 
-func (c *ServerCommand) Reload(lock *sync.RWMutex, reloadFuncs *map[string][]reloadutil.ReloadFunc, configPath []string, core *vault.Core) error {
+func (c *ServerCommand) Reload(lock *sync.RWMutex, reloadFuncs *map[string][]reloadutil.ReloadFunc, configPath []string) error {
 	lock.RLock()
 	defer lock.RUnlock()
 
@@ -2376,9 +2388,6 @@ func (c *ServerCommand) Reload(lock *sync.RWMutex, reloadFuncs *map[string][]rel
 		}
 	}
 
-	// Set Introspection Endpoint to enabled with new value in the config after reload
-	core.ReloadIntrospectionEndpointEnabled()
-
 	// Send a message that we reloaded. This prevents "guessing" sleep times
 	// in tests.
 	select {
@@ -2446,11 +2455,9 @@ func (c *ServerCommand) storageMigrationActive(backend physical.Backend) bool {
 		}
 		c.logger.Warn("storage migration check error", "error", err.Error())
 
-		timer := time.NewTimer(2 * time.Second)
 		select {
-		case <-timer.C:
+		case <-time.After(2 * time.Second):
 		case <-c.ShutdownCh:
-			timer.Stop()
 			return true
 		}
 	}
@@ -2489,8 +2496,7 @@ func setSeal(c *ServerCommand, config *server.Config, infoKeys []string, info ma
 	var barrierWrapper wrapping.Wrapper
 	if c.flagDevAutoSeal {
 		var err error
-		access, _ := vaultseal.NewTestSeal(nil)
-		barrierSeal, err = vault.NewAutoSeal(access)
+		barrierSeal, err = vault.NewAutoSeal(vaultseal.NewTestSeal(nil))
 		if err != nil {
 			return nil, nil, nil, nil, nil, err
 		}
@@ -2521,7 +2527,9 @@ func setSeal(c *ServerCommand, config *server.Config, infoKeys []string, info ma
 		var seal vault.Seal
 		sealLogger := c.logger.ResetNamed(fmt.Sprintf("seal.%s", sealType))
 		c.allLoggers = append(c.allLoggers, sealLogger)
-		defaultSeal := vault.NewDefaultSeal(vaultseal.NewAccess(aeadwrapper.NewShamirWrapper()))
+		defaultSeal := vault.NewDefaultSeal(&vaultseal.Access{
+			Wrapper: aeadwrapper.NewShamirWrapper(),
+		})
 		var sealInfoKeys []string
 		sealInfoMap := map[string]string{}
 		wrapper, sealConfigError = configutil.ConfigureWrapper(configSeal, &sealInfoKeys, &sealInfoMap, sealLogger)
@@ -2535,7 +2543,9 @@ func setSeal(c *ServerCommand, config *server.Config, infoKeys []string, info ma
 			seal = defaultSeal
 		} else {
 			var err error
-			seal, err = vault.NewAutoSeal(vaultseal.NewAccess(wrapper))
+			seal, err = vault.NewAutoSeal(&vaultseal.Access{
+				Wrapper: wrapper,
+			})
 			if err != nil {
 				return nil, nil, nil, nil, nil, err
 			}
@@ -2735,12 +2745,10 @@ func runUnseal(c *ServerCommand, core *vault.Core, ctx context.Context) {
 		}
 		c.logger.Warn("failed to unseal core", "error", err)
 
-		timer := time.NewTimer(5 * time.Second)
 		select {
 		case <-c.ShutdownCh:
-			timer.Stop()
 			return
-		case <-timer.C:
+		case <-time.After(5 * time.Second):
 		}
 	}
 }
@@ -2761,7 +2769,6 @@ func createCoreConfig(c *ServerCommand, config *server.Config, backend physical.
 		CredentialBackends:             c.CredentialBackends,
 		LogicalBackends:                c.LogicalBackends,
 		Logger:                         c.logger,
-		DetectDeadlocks:                config.DetectDeadlocks,
 		DisableSentinelTrace:           config.DisableSentinelTrace,
 		DisableCache:                   config.DisableCache,
 		DisableMlock:                   config.DisableMlock,
@@ -2774,7 +2781,6 @@ func createCoreConfig(c *ServerCommand, config *server.Config, backend physical.
 		PluginFilePermissions:          config.PluginFilePermissions,
 		EnableUI:                       config.EnableUI,
 		EnableRaw:                      config.EnableRawEndpoint,
-		EnableIntrospection:            config.EnableIntrospectionEndpoint,
 		DisableSealWrap:                config.DisableSealWrap,
 		DisablePerformanceStandby:      config.DisablePerformanceStandby,
 		DisableIndexing:                config.DisableIndexing,
@@ -2789,12 +2795,10 @@ func createCoreConfig(c *ServerCommand, config *server.Config, backend physical.
 		License:                        config.License,
 		LicensePath:                    config.LicensePath,
 		DisableSSCTokens:               config.DisableSSCTokens,
-		Experiments:                    config.Experiments,
 	}
 
 	if c.flagDev {
 		coreConfig.EnableRaw = true
-		coreConfig.EnableIntrospection = true
 		coreConfig.DevToken = c.flagDevRootTokenID
 		if c.flagDevLeasedKV {
 			coreConfig.LogicalBackends["kv"] = vault.LeasedPassthroughBackendFactory
@@ -2823,7 +2827,7 @@ func runListeners(c *ServerCommand, coreConfig *vault.CoreConfig, config *server
 	return nil
 }
 
-func initDevCore(c *ServerCommand, coreConfig *vault.CoreConfig, config *server.Config, core *vault.Core, certDir string, clusterJSON *testcluster.ClusterJson) error {
+func initDevCore(c *ServerCommand, coreConfig *vault.CoreConfig, config *server.Config, core *vault.Core, certDir string) error {
 	if c.flagDev && !c.flagDevSkipInit {
 
 		init, err := c.enableDev(core, coreConfig)
@@ -2831,10 +2835,6 @@ func initDevCore(c *ServerCommand, coreConfig *vault.CoreConfig, config *server.
 			return fmt.Errorf("Error initializing Dev mode: %s", err)
 		}
 
-		if clusterJSON != nil {
-			clusterJSON.RootToken = init.RootToken
-		}
-
 		var plugins, pluginsNotLoaded []string
 		if c.flagDevPluginDir != "" && c.flagDevPluginInit {
 
@@ -2970,7 +2970,7 @@ func startHttpServers(c *ServerCommand, core *vault.Core, config *server.Config,
 			return err
 		}
 
-		handler := vaulthttp.Handler.Handler(&vault.HandlerProperties{
+		handler := vaulthttp.Handler(&vault.HandlerProperties{
 			Core:                  core,
 			ListenerConfig:        ln.Config,
 			DisablePrintableCheck: config.DisablePrintableCheck,
diff --git a/command/server/config.go b/command/server/config.go
index 34e4848004b72..d71a3ad236426 100644
--- a/command/server/config.go
+++ b/command/server/config.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package server
 
 import (
@@ -19,13 +16,9 @@ import (
 	"github.com/hashicorp/go-secure-stdlib/parseutil"
 	"github.com/hashicorp/hcl"
 	"github.com/hashicorp/hcl/hcl/ast"
-	"github.com/hashicorp/vault/helper/experiments"
 	"github.com/hashicorp/vault/helper/osutil"
 	"github.com/hashicorp/vault/internalshared/configutil"
 	"github.com/hashicorp/vault/sdk/helper/consts"
-	"github.com/hashicorp/vault/sdk/helper/strutil"
-	"github.com/hashicorp/vault/sdk/helper/testcluster"
-	"github.com/mitchellh/mapstructure"
 )
 
 const (
@@ -34,14 +27,9 @@ const (
 	VaultDevKeyFilename  = "vault-key.pem"
 )
 
-var (
-	entConfigValidate = func(_ *Config, _ string) []configutil.ConfigError {
-		return nil
-	}
-
-	// Modified internally for testing.
-	validExperiments = experiments.ValidExperiments()
-)
+var entConfigValidate = func(_ *Config, _ string) []configutil.ConfigError {
+	return nil
+}
 
 // Config is the configuration for the vault server.
 type Config struct {
@@ -56,8 +44,6 @@ type Config struct {
 
 	ServiceRegistration *ServiceRegistration `hcl:"-"`
 
-	Experiments []string `hcl:"experiments"`
-
 	CacheSize                int         `hcl:"cache_size"`
 	DisableCache             bool        `hcl:"-"`
 	DisableCacheRaw          interface{} `hcl:"disable_cache"`
@@ -81,9 +67,6 @@ type Config struct {
 	PluginFilePermissions    int         `hcl:"-"`
 	PluginFilePermissionsRaw interface{} `hcl:"plugin_file_permissions,alias:PluginFilePermissions"`
 
-	EnableIntrospectionEndpoint    bool        `hcl:"-"`
-	EnableIntrospectionEndpointRaw interface{} `hcl:"introspection_endpoint,alias:EnableIntrospectionEndpoint"`
-
 	EnableRawEndpoint    bool        `hcl:"-"`
 	EnableRawEndpointRaw interface{} `hcl:"raw_storage_endpoint,alias:EnableRawEndpoint"`
 
@@ -110,8 +93,6 @@ type Config struct {
 	LogRequestsLevel    string      `hcl:"-"`
 	LogRequestsLevelRaw interface{} `hcl:"log_requests_level"`
 
-	DetectDeadlocks string `hcl:"detect_deadlocks"`
-
 	EnableResponseHeaderRaftNodeID    bool        `hcl:"-"`
 	EnableResponseHeaderRaftNodeIDRaw interface{} `hcl:"enable_response_header_raft_node_id"`
 
@@ -343,11 +324,6 @@ func (c *Config) Merge(c2 *Config) *Config {
 		result.EnableRawEndpoint = c2.EnableRawEndpoint
 	}
 
-	result.EnableIntrospectionEndpoint = c.EnableIntrospectionEndpoint
-	if c2.EnableIntrospectionEndpoint {
-		result.EnableIntrospectionEndpoint = c2.EnableIntrospectionEndpoint
-	}
-
 	result.APIAddr = c.APIAddr
 	if c2.APIAddr != "" {
 		result.APIAddr = c2.APIAddr
@@ -407,11 +383,6 @@ func (c *Config) Merge(c2 *Config) *Config {
 		result.LogRequestsLevel = c2.LogRequestsLevel
 	}
 
-	result.DetectDeadlocks = c.DetectDeadlocks
-	if c2.DetectDeadlocks != "" {
-		result.DetectDeadlocks = c2.DetectDeadlocks
-	}
-
 	result.EnableResponseHeaderRaftNodeID = c.EnableResponseHeaderRaftNodeID
 	if c2.EnableResponseHeaderRaftNodeID {
 		result.EnableResponseHeaderRaftNodeID = c2.EnableResponseHeaderRaftNodeID
@@ -449,8 +420,6 @@ func (c *Config) Merge(c2 *Config) *Config {
 
 	result.entConfig = c.entConfig.Merge(c2.entConfig)
 
-	result.Experiments = mergeExperiments(c.Experiments, c2.Experiments)
-
 	return result
 }
 
@@ -617,12 +586,6 @@ func ParseConfig(d, source string) (*Config, error) {
 		}
 	}
 
-	if result.EnableIntrospectionEndpointRaw != nil {
-		if result.EnableIntrospectionEndpoint, err = parseutil.ParseBool(result.EnableIntrospectionEndpointRaw); err != nil {
-			return nil, err
-		}
-	}
-
 	if result.DisableClusteringRaw != nil {
 		if result.DisableClustering, err = parseutil.ParseBool(result.DisableClusteringRaw); err != nil {
 			return nil, err
@@ -728,10 +691,6 @@ func ParseConfig(d, source string) (*Config, error) {
 		}
 	}
 
-	if err := validateExperiments(result.Experiments); err != nil {
-		return nil, fmt.Errorf("error validating experiment(s) from config: %w", err)
-	}
-
 	if err := result.parseConfig(list); err != nil {
 		return nil, fmt.Errorf("error parsing enterprise config: %w", err)
 	}
@@ -748,69 +707,6 @@ func ParseConfig(d, source string) (*Config, error) {
 	return result, nil
 }
 
-func ExperimentsFromEnvAndCLI(config *Config, envKey string, flagExperiments []string) error {
-	if envExperimentsRaw := os.Getenv(envKey); envExperimentsRaw != "" {
-		envExperiments := strings.Split(envExperimentsRaw, ",")
-		err := validateExperiments(envExperiments)
-		if err != nil {
-			return fmt.Errorf("error validating experiment(s) from environment variable %q: %w", envKey, err)
-		}
-
-		config.Experiments = mergeExperiments(config.Experiments, envExperiments)
-	}
-
-	if len(flagExperiments) != 0 {
-		err := validateExperiments(flagExperiments)
-		if err != nil {
-			return fmt.Errorf("error validating experiment(s) from command line flag: %w", err)
-		}
-
-		config.Experiments = mergeExperiments(config.Experiments, flagExperiments)
-	}
-
-	return nil
-}
-
-// Validate checks each experiment is a known experiment.
-func validateExperiments(experiments []string) error {
-	var invalid []string
-
-	for _, experiment := range experiments {
-		if !strutil.StrListContains(validExperiments, experiment) {
-			invalid = append(invalid, experiment)
-		}
-	}
-
-	if len(invalid) != 0 {
-		return fmt.Errorf("valid experiment(s) are %s, but received the following invalid experiment(s): %s",
-			strings.Join(validExperiments, ", "),
-			strings.Join(invalid, ", "))
-	}
-
-	return nil
-}
-
-// mergeExperiments returns the logical OR of the two sets.
-func mergeExperiments(left, right []string) []string {
-	processed := map[string]struct{}{}
-	var result []string
-	for _, l := range left {
-		if _, seen := processed[l]; !seen {
-			result = append(result, l)
-		}
-		processed[l] = struct{}{}
-	}
-
-	for _, r := range right {
-		if _, seen := processed[r]; !seen {
-			result = append(result, r)
-			processed[r] = struct{}{}
-		}
-	}
-
-	return result
-}
-
 // LoadConfigDir loads all the configurations in the given directory
 // in alphabetical order.
 func LoadConfigDir(dir string) (*Config, error) {
@@ -1111,8 +1007,6 @@ func (c *Config) Sanitized() map[string]interface{} {
 
 		"raw_storage_endpoint": c.EnableRawEndpoint,
 
-		"introspection_endpoint": c.EnableIntrospectionEndpoint,
-
 		"api_addr":           c.APIAddr,
 		"cluster_addr":       c.ClusterAddr,
 		"disable_clustering": c.DisableClustering,
@@ -1128,9 +1022,6 @@ func (c *Config) Sanitized() map[string]interface{} {
 		"enable_response_header_raft_node_id": c.EnableResponseHeaderRaftNodeID,
 
 		"log_requests_level": c.LogRequestsLevel,
-		"experiments":        c.Experiments,
-
-		"detect_deadlocks": c.DetectDeadlocks,
 	}
 	for k, v := range sharedResult {
 		result[k] = v
@@ -1209,12 +1100,3 @@ func (c *Config) found(s, k string) {
 	delete(c.UnusedKeys, s)
 	c.FoundKeys = append(c.FoundKeys, k)
 }
-
-func (c *Config) ToVaultNodeConfig() (*testcluster.VaultNodeConfig, error) {
-	var vnc testcluster.VaultNodeConfig
-	err := mapstructure.Decode(c, &vnc)
-	if err != nil {
-		return nil, err
-	}
-	return &vnc, nil
-}
diff --git a/command/server/config_custom_response_headers_test.go b/command/server/config_custom_response_headers_test.go
index 11c4300b4160a..5380568c25107 100644
--- a/command/server/config_custom_response_headers_test.go
+++ b/command/server/config_custom_response_headers_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package server
 
 import (
diff --git a/command/server/config_oss_test.go b/command/server/config_oss_test.go
index 4a08ddf78ad03..f64670e03a556 100644
--- a/command/server/config_oss_test.go
+++ b/command/server/config_oss_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !enterprise
 
 package server
diff --git a/command/server/config_telemetry_test.go b/command/server/config_telemetry_test.go
index 54245d05151a1..581710f565a7e 100644
--- a/command/server/config_telemetry_test.go
+++ b/command/server/config_telemetry_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package server
 
 import (
diff --git a/command/server/config_test.go b/command/server/config_test.go
index b570f1e766256..60a0910e13a6e 100644
--- a/command/server/config_test.go
+++ b/command/server/config_test.go
@@ -1,12 +1,7 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package server
 
 import (
 	"fmt"
-	"reflect"
-	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -44,10 +39,6 @@ func TestParseListeners(t *testing.T) {
 	testParseListeners(t)
 }
 
-func TestParseUserLockouts(t *testing.T) {
-	testParseUserLockouts(t)
-}
-
 func TestParseSockaddrTemplate(t *testing.T) {
 	testParseSockaddrTemplate(t)
 }
@@ -80,115 +71,6 @@ func TestUnknownFieldValidationListenerAndStorage(t *testing.T) {
 	testUnknownFieldValidationStorageAndListener(t)
 }
 
-func TestExperimentsConfigParsing(t *testing.T) {
-	const envKey = "VAULT_EXPERIMENTS"
-	originalValue := validExperiments
-	validExperiments = []string{"foo", "bar", "baz"}
-	t.Cleanup(func() {
-		validExperiments = originalValue
-	})
-
-	for name, tc := range map[string]struct {
-		fromConfig    []string
-		fromEnv       []string
-		fromCLI       []string
-		expected      []string
-		expectedError string
-	}{
-		// Multiple sources.
-		"duplication":  {[]string{"foo"}, []string{"foo"}, []string{"foo"}, []string{"foo"}, ""},
-		"disjoint set": {[]string{"foo"}, []string{"bar"}, []string{"baz"}, []string{"foo", "bar", "baz"}, ""},
-
-		// Single source.
-		"config only": {[]string{"foo"}, nil, nil, []string{"foo"}, ""},
-		"env only":    {nil, []string{"foo"}, nil, []string{"foo"}, ""},
-		"CLI only":    {nil, nil, []string{"foo"}, []string{"foo"}, ""},
-
-		// Validation errors.
-		"config invalid": {[]string{"invalid"}, nil, nil, nil, "from config"},
-		"env invalid":    {nil, []string{"invalid"}, nil, nil, "from environment variable"},
-		"CLI invalid":    {nil, nil, []string{"invalid"}, nil, "from command line flag"},
-	} {
-		t.Run(name, func(t *testing.T) {
-			var configString string
-			t.Setenv(envKey, strings.Join(tc.fromEnv, ","))
-			if len(tc.fromConfig) != 0 {
-				configString = fmt.Sprintf("experiments = [\"%s\"]", strings.Join(tc.fromConfig, "\", \""))
-			}
-			config, err := ParseConfig(configString, "")
-			if err == nil {
-				err = ExperimentsFromEnvAndCLI(config, envKey, tc.fromCLI)
-			}
-
-			switch tc.expectedError {
-			case "":
-				if err != nil {
-					t.Fatal(err)
-				}
-
-			default:
-				if err == nil || !strings.Contains(err.Error(), tc.expectedError) {
-					t.Fatalf("Expected error to contain %q, but got: %s", tc.expectedError, err)
-				}
-			}
-		})
-	}
-}
-
-func TestValidate(t *testing.T) {
-	originalValue := validExperiments
-	for name, tc := range map[string]struct {
-		validSet    []string
-		input       []string
-		expectError bool
-	}{
-		// Valid cases
-		"minimal valid": {[]string{"foo"}, []string{"foo"}, false},
-		"valid subset":  {[]string{"foo", "bar"}, []string{"bar"}, false},
-		"repeated":      {[]string{"foo"}, []string{"foo", "foo"}, false},
-
-		// Error cases
-		"partially valid":      {[]string{"foo", "bar"}, []string{"foo", "baz"}, true},
-		"empty":                {[]string{"foo"}, []string{""}, true},
-		"no valid experiments": {[]string{}, []string{"foo"}, true},
-	} {
-		t.Run(name, func(t *testing.T) {
-			t.Cleanup(func() {
-				validExperiments = originalValue
-			})
-
-			validExperiments = tc.validSet
-			err := validateExperiments(tc.input)
-			if tc.expectError && err == nil {
-				t.Fatal("Expected error but got none")
-			}
-			if !tc.expectError && err != nil {
-				t.Fatal("Did not expect error but got", err)
-			}
-		})
-	}
-}
-
-func TestMerge(t *testing.T) {
-	for name, tc := range map[string]struct {
-		left     []string
-		right    []string
-		expected []string
-	}{
-		"disjoint":    {[]string{"foo"}, []string{"bar"}, []string{"foo", "bar"}},
-		"empty left":  {[]string{}, []string{"foo"}, []string{"foo"}},
-		"empty right": {[]string{"foo"}, []string{}, []string{"foo"}},
-		"overlapping": {[]string{"foo", "bar"}, []string{"foo", "baz"}, []string{"foo", "bar", "baz"}},
-	} {
-		t.Run(name, func(t *testing.T) {
-			result := mergeExperiments(tc.left, tc.right)
-			if !reflect.DeepEqual(tc.expected, result) {
-				t.Fatalf("Expected %v but got %v", tc.expected, result)
-			}
-		})
-	}
-}
-
 // Test_parseDevTLSConfig verifies that both Windows and Unix directories are correctly escaped when creating a dev TLS
 // configuration in HCL
 func Test_parseDevTLSConfig(t *testing.T) {
diff --git a/command/server/config_test_helpers.go b/command/server/config_test_helpers.go
index f5136449cef49..bb6e273a6a469 100644
--- a/command/server/config_test_helpers.go
+++ b/command/server/config_test_helpers.go
@@ -1,12 +1,8 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package server
 
 import (
 	"fmt"
 	"reflect"
-	"sort"
 	"strings"
 	"testing"
 	"time"
@@ -455,9 +451,6 @@ func testLoadConfigFile(t *testing.T) {
 		EnableRawEndpoint:    true,
 		EnableRawEndpointRaw: true,
 
-		EnableIntrospectionEndpoint:    true,
-		EnableIntrospectionEndpointRaw: true,
-
 		DisableSealWrap:    true,
 		DisableSealWrapRaw: true,
 
@@ -503,8 +496,8 @@ func testUnknownFieldValidation(t *testing.T) {
 			Problem: "unknown or unsupported field bad_value found in configuration",
 			Position: token.Pos{
 				Filename: "./test-fixtures/config.hcl",
-				Offset:   651,
-				Line:     37,
+				Offset:   583,
+				Line:     34,
 				Column:   5,
 			},
 		},
@@ -741,15 +734,12 @@ func testConfig_Sanitized(t *testing.T) {
 		"disable_indexing":                    false,
 		"disable_mlock":                       true,
 		"disable_performance_standby":         false,
-		"experiments":                         []string(nil),
 		"plugin_file_uid":                     0,
 		"plugin_file_permissions":             0,
 		"disable_printable_check":             false,
 		"disable_sealwrap":                    true,
 		"raw_storage_endpoint":                true,
-		"introspection_endpoint":              false,
 		"disable_sentinel_trace":              true,
-		"detect_deadlocks":                    "",
 		"enable_ui":                           true,
 		"enable_response_header_hostname":     false,
 		"enable_response_header_raft_node_id": false,
@@ -851,9 +841,6 @@ listener "tcp" {
   agent_api {
     enable_quit = true
   }
-  proxy_api {
-    enable_quit = true
-  }
 }`))
 
 	config := Config{
@@ -894,9 +881,6 @@ listener "tcp" {
 					AgentAPI: &configutil.AgentAPI{
 						EnableQuit: true,
 					},
-					ProxyAPI: &configutil.ProxyAPI{
-						EnableQuit: true,
-					},
 					CustomResponseHeaders: DefaultCustomHeaders,
 				},
 			},
@@ -908,67 +892,6 @@ listener "tcp" {
 	}
 }
 
-func testParseUserLockouts(t *testing.T) {
-	obj, _ := hcl.Parse(strings.TrimSpace(`
-	user_lockout "all" {
-		lockout_duration = "40m"
-		lockout_counter_reset = "45m"
-		disable_lockout = "false"
-	}
-	  user_lockout "userpass" {
-	     lockout_threshold = "100"
-	     lockout_duration = "20m"
-	  }
-	  user_lockout "ldap" {
-		disable_lockout = "true"
-	 }`))
-
-	config := Config{
-		SharedConfig: &configutil.SharedConfig{},
-	}
-	list, _ := obj.Node.(*ast.ObjectList)
-	objList := list.Filter("user_lockout")
-	configutil.ParseUserLockouts(config.SharedConfig, objList)
-
-	sort.Slice(config.SharedConfig.UserLockouts[:], func(i, j int) bool {
-		return config.SharedConfig.UserLockouts[i].Type < config.SharedConfig.UserLockouts[j].Type
-	})
-
-	expected := &Config{
-		SharedConfig: &configutil.SharedConfig{
-			UserLockouts: []*configutil.UserLockout{
-				{
-					Type:                "all",
-					LockoutThreshold:    5,
-					LockoutDuration:     2400000000000,
-					LockoutCounterReset: 2700000000000,
-					DisableLockout:      false,
-				},
-				{
-					Type:                "userpass",
-					LockoutThreshold:    100,
-					LockoutDuration:     1200000000000,
-					LockoutCounterReset: 2700000000000,
-					DisableLockout:      false,
-				},
-				{
-					Type:                "ldap",
-					LockoutThreshold:    5,
-					LockoutDuration:     2400000000000,
-					LockoutCounterReset: 2700000000000,
-					DisableLockout:      true,
-				},
-			},
-		},
-	}
-
-	sort.Slice(expected.SharedConfig.UserLockouts[:], func(i, j int) bool {
-		return expected.SharedConfig.UserLockouts[i].Type < expected.SharedConfig.UserLockouts[j].Type
-	})
-	config.Prune()
-	require.Equal(t, config, *expected)
-}
-
 func testParseSockaddrTemplate(t *testing.T) {
 	config, err := ParseConfig(`
 api_addr = <<EOF
@@ -1106,7 +1029,6 @@ func testParseSeals(t *testing.T) {
 			},
 		},
 	}
-	addExpectedDefaultEntConfig(expected)
 	config.Prune()
 	require.Equal(t, config, expected)
 }
diff --git a/command/server/config_test_helpers_util.go b/command/server/config_test_helpers_util.go
index 7f8c02e1c6a03..63fa3cfe6a80e 100644
--- a/command/server/config_test_helpers_util.go
+++ b/command/server/config_test_helpers_util.go
@@ -1,10 +1,6 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !enterprise
 
 package server
 
 func addExpectedEntConfig(c *Config, sentinelModules []string)                         {}
-func addExpectedDefaultEntConfig(c *Config)                                            {}
 func addExpectedEntSanitizedConfig(c map[string]interface{}, sentinelModules []string) {}
diff --git a/command/server/config_util.go b/command/server/config_util.go
index 3570b9a59bb27..feefc6092aac3 100644
--- a/command/server/config_util.go
+++ b/command/server/config_util.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !enterprise
 
 package server
diff --git a/command/server/hcp_link_config_test.go b/command/server/hcp_link_config_test.go
deleted file mode 100644
index 121b855138c34..0000000000000
--- a/command/server/hcp_link_config_test.go
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package server
-
-import (
-	"testing"
-
-	"github.com/go-test/deep"
-	sdkResource "github.com/hashicorp/hcp-sdk-go/resource"
-	"github.com/hashicorp/vault/internalshared/configutil"
-)
-
-func TestHCPLinkConfig(t *testing.T) {
-	t.Setenv("HCP_CLIENT_ID", "")
-	t.Setenv("HCP_CLIENT_SECRET", "")
-	t.Setenv("HCP_RESOURCE_ID", "")
-
-	config, err := LoadConfigFile("./test-fixtures/hcp_link_config.hcl")
-	if err != nil {
-		t.Fatalf("err: %s", err)
-	}
-	resIDRaw := "organization/bc58b3d0-2eab-4ab8-abf4-f61d3c9975ff/project/1c78e888-2142-4000-8918-f933bbbc7690/hashicorp.example.resource/example"
-	res, _ := sdkResource.FromString(resIDRaw)
-
-	expected := &Config{
-		Storage: &Storage{
-			Type:   "inmem",
-			Config: map[string]string{},
-		},
-		SharedConfig: &configutil.SharedConfig{
-			Listeners: []*configutil.Listener{
-				{
-					Type:                  "tcp",
-					Address:               "127.0.0.1:8200",
-					TLSDisable:            true,
-					CustomResponseHeaders: DefaultCustomHeaders,
-				},
-			},
-			HCPLinkConf: &configutil.HCPLinkConfig{
-				ResourceIDRaw: resIDRaw,
-				Resource:      &res,
-				ClientID:      "J2TtcSYOyPUkPV2z0mSyDtvitxLVjJmu",
-				ClientSecret:  "N9JtHZyOnHrIvJZs82pqa54vd4jnkyU3xCcqhFXuQKJZZuxqxxbP1xCfBZVB82vY",
-			},
-			DisableMlock: true,
-		},
-	}
-
-	config.Prune()
-	if diff := deep.Equal(config, expected); diff != nil {
-		t.Fatal(diff)
-	}
-}
diff --git a/command/server/listener.go b/command/server/listener.go
index 19b89565ab5c9..4d36a41ebba09 100644
--- a/command/server/listener.go
+++ b/command/server/listener.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package server
 
 import (
@@ -23,8 +20,7 @@ type ListenerFactory func(*configutil.Listener, io.Writer, cli.Ui) (net.Listener
 
 // BuiltinListeners is the list of built-in listener types.
 var BuiltinListeners = map[string]ListenerFactory{
-	"tcp":  tcpListenerFactory,
-	"unix": unixListenerFactory,
+	"tcp": tcpListenerFactory,
 }
 
 // NewListener creates a new listener of the given type with the given
diff --git a/command/server/listener_tcp.go b/command/server/listener_tcp.go
index 29b601c4bfaad..dbba4b40e88cc 100644
--- a/command/server/listener_tcp.go
+++ b/command/server/listener_tcp.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package server
 
 import (
diff --git a/command/server/listener_tcp_test.go b/command/server/listener_tcp_test.go
index 6d73cf2cb32dd..5ebf6111413ee 100644
--- a/command/server/listener_tcp_test.go
+++ b/command/server/listener_tcp_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package server
 
 import (
diff --git a/command/server/listener_test.go b/command/server/listener_test.go
index f4d555c5c2ca2..e36ced7e76032 100644
--- a/command/server/listener_test.go
+++ b/command/server/listener_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package server
 
 import (
@@ -29,9 +26,6 @@ func testListenerImpl(t *testing.T, ln net.Listener, connFn testListenerConnFn,
 			tlsConn.Handshake()
 		}
 		serverCh <- server
-		if expectedAddr == "" {
-			return
-		}
 		addr, _, err := net.SplitHostPort(server.RemoteAddr().String())
 		if err != nil {
 			t.Error(err)
diff --git a/command/server/listener_unix.go b/command/server/listener_unix.go
deleted file mode 100644
index d5ea772eb476a..0000000000000
--- a/command/server/listener_unix.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package server
-
-import (
-	"io"
-	"net"
-
-	"github.com/hashicorp/go-secure-stdlib/reloadutil"
-	"github.com/hashicorp/vault/internalshared/configutil"
-	"github.com/hashicorp/vault/internalshared/listenerutil"
-	"github.com/mitchellh/cli"
-)
-
-func unixListenerFactory(l *configutil.Listener, _ io.Writer, ui cli.Ui) (net.Listener, map[string]string, reloadutil.ReloadFunc, error) {
-	addr := l.Address
-	if addr == "" {
-		addr = "/run/vault.sock"
-	}
-
-	var cfg *listenerutil.UnixSocketsConfig
-	if l.SocketMode != "" &&
-		l.SocketUser != "" &&
-		l.SocketGroup != "" {
-		cfg = &listenerutil.UnixSocketsConfig{
-			Mode:  l.SocketMode,
-			User:  l.SocketUser,
-			Group: l.SocketGroup,
-		}
-	}
-
-	ln, err := listenerutil.UnixSocketListener(addr, cfg)
-	if err != nil {
-		return nil, nil, nil, err
-	}
-
-	return ln, map[string]string{}, nil, nil
-}
diff --git a/command/server/listener_unix_test.go b/command/server/listener_unix_test.go
deleted file mode 100644
index 91eaf121ccde8..0000000000000
--- a/command/server/listener_unix_test.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package server
-
-import (
-	"net"
-	"path/filepath"
-	"testing"
-
-	"github.com/hashicorp/vault/internalshared/configutil"
-	"github.com/mitchellh/cli"
-)
-
-func TestUnixListener(t *testing.T) {
-	ln, _, _, err := unixListenerFactory(&configutil.Listener{
-		Address: filepath.Join(t.TempDir(), "/vault.sock"),
-	}, nil, cli.NewMockUi())
-	if err != nil {
-		t.Fatalf("err: %s", err)
-	}
-
-	connFn := func(lnReal net.Listener) (net.Conn, error) {
-		return net.Dial("unix", ln.Addr().String())
-	}
-
-	testListenerImpl(t, ln, connFn, "", 0, "", false)
-}
diff --git a/command/server/server_seal_transit_acc_test.go b/command/server/server_seal_transit_acc_test.go
index 074893fcfb88c..3f13aee938c01 100644
--- a/command/server/server_seal_transit_acc_test.go
+++ b/command/server/server_seal_transit_acc_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package server
 
 import (
@@ -14,8 +11,8 @@ import (
 
 	"github.com/hashicorp/go-uuid"
 	"github.com/hashicorp/vault/api"
+	"github.com/hashicorp/vault/helper/testhelpers/docker"
 	"github.com/hashicorp/vault/internalshared/configutil"
-	"github.com/hashicorp/vault/sdk/helper/docker"
 )
 
 func TestTransitWrapper_Lifecycle(t *testing.T) {
@@ -134,9 +131,8 @@ func prepareTestContainer(t *testing.T) (func(), *DockerVaultConfig) {
 	}
 
 	runner, err := docker.NewServiceRunner(docker.RunOptions{
-		ContainerName: "vault",
-		ImageRepo:     "docker.mirror.hashicorp.services/hashicorp/vault",
-		ImageTag:      "latest",
+		ImageRepo: "vault",
+		ImageTag:  "latest",
 		Cmd: []string{
 			"server", "-log-level=trace", "-dev", fmt.Sprintf("-dev-root-token-id=%s", rootToken),
 			"-dev-listen-address=0.0.0.0:8200",
diff --git a/command/server/test-fixtures/config-dir/baz.hcl b/command/server/test-fixtures/config-dir/baz.hcl
index 171a07dd7a99d..47146c717c172 100644
--- a/command/server/test-fixtures/config-dir/baz.hcl
+++ b/command/server/test-fixtures/config-dir/baz.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 telemetry {
     statsd_address = "baz"
     statsite_address = "qux"
diff --git a/command/server/test-fixtures/config-dir/foo.hcl b/command/server/test-fixtures/config-dir/foo.hcl
index 0ef439a8037ea..f538ede1ba4af 100644
--- a/command/server/test-fixtures/config-dir/foo.hcl
+++ b/command/server/test-fixtures/config-dir/foo.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 disable_cache = true
 disable_mlock = true
 
diff --git a/command/server/test-fixtures/config.hcl b/command/server/test-fixtures/config.hcl
index 2a53289bf4c59..3b4123faeacc2 100644
--- a/command/server/test-fixtures/config.hcl
+++ b/command/server/test-fixtures/config.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 disable_cache = true
 disable_mlock = true
 
@@ -46,7 +43,6 @@ default_lease_ttl = "10h"
 cluster_name = "testcluster"
 pid_file = "./pidfile"
 raw_storage_endpoint = true
-introspection_endpoint = true
 disable_sealwrap = true
 disable_printable_check = true
 enable_response_header_hostname = true
diff --git a/command/server/test-fixtures/config2.hcl b/command/server/test-fixtures/config2.hcl
index 4d9cdf7cba1a1..7b1dbfd56faa8 100644
--- a/command/server/test-fixtures/config2.hcl
+++ b/command/server/test-fixtures/config2.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 disable_cache = true
 disable_mlock = true
 
diff --git a/command/server/test-fixtures/config3.hcl b/command/server/test-fixtures/config3.hcl
index 96b93318ffdad..1023284e09e51 100644
--- a/command/server/test-fixtures/config3.hcl
+++ b/command/server/test-fixtures/config3.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 disable_cache = true
 disable_mlock = true
 log_requests_level = "Basic"
diff --git a/command/server/test-fixtures/config4.hcl b/command/server/test-fixtures/config4.hcl
index be49453da03fa..b620f3c7e75f6 100644
--- a/command/server/test-fixtures/config4.hcl
+++ b/command/server/test-fixtures/config4.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 disable_cache = true
 disable_mlock = true
 ui = true
diff --git a/command/server/test-fixtures/config5.hcl b/command/server/test-fixtures/config5.hcl
index 3f5b2460822f2..3b3c64c7e0af9 100644
--- a/command/server/test-fixtures/config5.hcl
+++ b/command/server/test-fixtures/config5.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 disable_cache = true
  disable_mlock = true
 
diff --git a/command/server/test-fixtures/config_bad_https_storage.hcl b/command/server/test-fixtures/config_bad_https_storage.hcl
index b53673c353955..f8b5d7734be2e 100644
--- a/command/server/test-fixtures/config_bad_https_storage.hcl
+++ b/command/server/test-fixtures/config_bad_https_storage.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 disable_cache = true
 disable_mlock = true
 
diff --git a/command/server/test-fixtures/config_custom_response_headers_1.hcl b/command/server/test-fixtures/config_custom_response_headers_1.hcl
index bc458da53a252..c2f868c2f146c 100644
--- a/command/server/test-fixtures/config_custom_response_headers_1.hcl
+++ b/command/server/test-fixtures/config_custom_response_headers_1.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 storage "inmem" {}
 listener "tcp" {
   address = "127.0.0.1:8200"
diff --git a/command/server/test-fixtures/config_custom_response_headers_multiple_listeners.hcl b/command/server/test-fixtures/config_custom_response_headers_multiple_listeners.hcl
index 9ae5b408d647f..11aa099232f91 100644
--- a/command/server/test-fixtures/config_custom_response_headers_multiple_listeners.hcl
+++ b/command/server/test-fixtures/config_custom_response_headers_multiple_listeners.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 storage "inmem" {}
 listener "tcp" {
   address = "127.0.0.1:8200"
diff --git a/command/server/test-fixtures/config_diagnose_hastorage_bad_https.hcl b/command/server/test-fixtures/config_diagnose_hastorage_bad_https.hcl
index 9e1ac5e10bd6c..deded2ddf1708 100644
--- a/command/server/test-fixtures/config_diagnose_hastorage_bad_https.hcl
+++ b/command/server/test-fixtures/config_diagnose_hastorage_bad_https.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 disable_cache = true
 disable_mlock = true
 
diff --git a/command/server/test-fixtures/config_diagnose_ok.hcl b/command/server/test-fixtures/config_diagnose_ok.hcl
index 0b903ee6e0ee9..a3f70540bf4d3 100644
--- a/command/server/test-fixtures/config_diagnose_ok.hcl
+++ b/command/server/test-fixtures/config_diagnose_ok.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 disable_cache = true
 disable_mlock = true
 
diff --git a/command/server/test-fixtures/config_raft.hcl b/command/server/test-fixtures/config_raft.hcl
index 7cb585b39b5cb..c23a434744ba5 100644
--- a/command/server/test-fixtures/config_raft.hcl
+++ b/command/server/test-fixtures/config_raft.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 disable_cache = true
 disable_mlock = true
 
diff --git a/command/server/test-fixtures/config_seals.hcl b/command/server/test-fixtures/config_seals.hcl
index 6fdd13381843d..7917dc1b79c38 100644
--- a/command/server/test-fixtures/config_seals.hcl
+++ b/command/server/test-fixtures/config_seals.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 listener "tcp" {
   address = "127.0.0.1:443"
 }
diff --git a/command/server/test-fixtures/config_small.hcl b/command/server/test-fixtures/config_small.hcl
index a8e3c7a605c63..cfbc28db8fdde 100644
--- a/command/server/test-fixtures/config_small.hcl
+++ b/command/server/test-fixtures/config_small.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 storage "raft" {
   path = "/path/to/raft"
   node_id = "raft_node_1"
diff --git a/command/server/test-fixtures/diagnose_bad_https_consul_sr.hcl b/command/server/test-fixtures/diagnose_bad_https_consul_sr.hcl
index bc5a71e13a586..6faecaab73fbf 100644
--- a/command/server/test-fixtures/diagnose_bad_https_consul_sr.hcl
+++ b/command/server/test-fixtures/diagnose_bad_https_consul_sr.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 disable_cache = true
 disable_mlock = true
 
diff --git a/command/server/test-fixtures/diagnose_bad_telemetry1.hcl b/command/server/test-fixtures/diagnose_bad_telemetry1.hcl
index a634b162ebc50..f7629bdd02d26 100644
--- a/command/server/test-fixtures/diagnose_bad_telemetry1.hcl
+++ b/command/server/test-fixtures/diagnose_bad_telemetry1.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 disable_cache = true
 disable_mlock = true
 ui = true
diff --git a/command/server/test-fixtures/diagnose_bad_telemetry2.hcl b/command/server/test-fixtures/diagnose_bad_telemetry2.hcl
index afb195d553836..5c967e3ef926d 100644
--- a/command/server/test-fixtures/diagnose_bad_telemetry2.hcl
+++ b/command/server/test-fixtures/diagnose_bad_telemetry2.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 disable_cache = true
 disable_mlock = true
 ui = true
diff --git a/command/server/test-fixtures/diagnose_bad_telemetry3.hcl b/command/server/test-fixtures/diagnose_bad_telemetry3.hcl
index 422351febc332..f9669258460b3 100644
--- a/command/server/test-fixtures/diagnose_bad_telemetry3.hcl
+++ b/command/server/test-fixtures/diagnose_bad_telemetry3.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 disable_cache = true
 disable_mlock = true
 ui = true
diff --git a/command/server/test-fixtures/diagnose_ok_storage_direct_access.hcl b/command/server/test-fixtures/diagnose_ok_storage_direct_access.hcl
index cda9e2a2da93e..3b6a9abf290ab 100644
--- a/command/server/test-fixtures/diagnose_ok_storage_direct_access.hcl
+++ b/command/server/test-fixtures/diagnose_ok_storage_direct_access.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 disable_cache = true
 disable_mlock = true
 
diff --git a/command/server/test-fixtures/diagnose_raft_no_bolt_folder.hcl b/command/server/test-fixtures/diagnose_raft_no_bolt_folder.hcl
index e28c1bcb1ae40..d92186f2642d8 100644
--- a/command/server/test-fixtures/diagnose_raft_no_bolt_folder.hcl
+++ b/command/server/test-fixtures/diagnose_raft_no_bolt_folder.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 storage "raft" {
   path = "/path/to/raft/data"
   node_id = "raft_node_1"
diff --git a/command/server/test-fixtures/diagnose_seal_transit_tls_check.hcl b/command/server/test-fixtures/diagnose_seal_transit_tls_check.hcl
index 0c0edcfce22b3..a51c27b37a86f 100644
--- a/command/server/test-fixtures/diagnose_seal_transit_tls_check.hcl
+++ b/command/server/test-fixtures/diagnose_seal_transit_tls_check.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 disable_cache = true
 disable_mlock = true
 
diff --git a/command/server/test-fixtures/hcp_link_config.hcl b/command/server/test-fixtures/hcp_link_config.hcl
deleted file mode 100644
index 1a909e3b48a41..0000000000000
--- a/command/server/test-fixtures/hcp_link_config.hcl
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
-storage "inmem" {}
-listener "tcp" {
-    address = "127.0.0.1:8200"
-    tls_disable = true
-}
-cloud {
-    resource_id = "organization/bc58b3d0-2eab-4ab8-abf4-f61d3c9975ff/project/1c78e888-2142-4000-8918-f933bbbc7690/hashicorp.example.resource/example"
-    client_id = "J2TtcSYOyPUkPV2z0mSyDtvitxLVjJmu"
-    client_secret = "N9JtHZyOnHrIvJZs82pqa54vd4jnkyU3xCcqhFXuQKJZZuxqxxbP1xCfBZVB82vY"
-}
-disable_mlock = true
\ No newline at end of file
diff --git a/command/server/test-fixtures/nostore_config.hcl b/command/server/test-fixtures/nostore_config.hcl
index a80e385b3d6cf..667570cb0c1c0 100644
--- a/command/server/test-fixtures/nostore_config.hcl
+++ b/command/server/test-fixtures/nostore_config.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 disable_cache = true
 disable_mlock = true
 
diff --git a/command/server/test-fixtures/raft_retry_join.hcl b/command/server/test-fixtures/raft_retry_join.hcl
index 6f7fe9e4771c0..a4f1f3df0139b 100644
--- a/command/server/test-fixtures/raft_retry_join.hcl
+++ b/command/server/test-fixtures/raft_retry_join.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 storage "raft" {
 	path = "/storage/path/raft"
 	node_id = "raft1"
diff --git a/command/server/test-fixtures/telemetry/filter_default_override.hcl b/command/server/test-fixtures/telemetry/filter_default_override.hcl
index 4fc70e9ebf09f..04e55f646cb12 100644
--- a/command/server/test-fixtures/telemetry/filter_default_override.hcl
+++ b/command/server/test-fixtures/telemetry/filter_default_override.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 disable_mlock = true
 ui            = true
 
diff --git a/command/server/test-fixtures/telemetry/valid_prefix_filter.hcl b/command/server/test-fixtures/telemetry/valid_prefix_filter.hcl
index 055f12259e466..814dd1c825f9e 100644
--- a/command/server/test-fixtures/telemetry/valid_prefix_filter.hcl
+++ b/command/server/test-fixtures/telemetry/valid_prefix_filter.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 disable_mlock = true
 ui            = true
 
diff --git a/command/server/test-fixtures/tls_config_ok.hcl b/command/server/test-fixtures/tls_config_ok.hcl
index 4cbd4fa4644c9..0dee4b4836039 100644
--- a/command/server/test-fixtures/tls_config_ok.hcl
+++ b/command/server/test-fixtures/tls_config_ok.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 disable_cache = true
 disable_mlock = true
 
diff --git a/command/server/test-fixtures/unauth_in_flight_access.hcl b/command/server/test-fixtures/unauth_in_flight_access.hcl
index c191f139b35b7..eda6641276f1d 100644
--- a/command/server/test-fixtures/unauth_in_flight_access.hcl
+++ b/command/server/test-fixtures/unauth_in_flight_access.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 storage "inmem" {}
 listener "tcp" {
   address = "127.0.0.1:8200"
diff --git a/command/server/tls_util.go b/command/server/tls_util.go
index a038c2ae62905..d327006332511 100644
--- a/command/server/tls_util.go
+++ b/command/server/tls_util.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package server
 
 import (
@@ -69,18 +66,6 @@ func GenerateCert(caCertTemplate *x509.Certificate, caSigner crypto.Signer) (str
 		SubjectKeyId:   signerKeyId,
 	}
 
-	// Only add our hostname to SANs if it isn't found.
-	foundHostname := false
-	for _, value := range template.DNSNames {
-		if value == hostname {
-			foundHostname = true
-			break
-		}
-	}
-	if !foundHostname {
-		template.DNSNames = append(template.DNSNames, hostname)
-	}
-
 	bs, err := x509.CreateCertificate(
 		rand.Reader, &template, caCertTemplate, signer.Public(), caSigner)
 	if err != nil {
@@ -128,6 +113,7 @@ func GenerateCA() (*CaCert, error) {
 		NotBefore:             time.Now().Add(-1 * time.Minute),
 		AuthorityKeyId:        signerKeyId,
 		SubjectKeyId:          signerKeyId,
+		IPAddresses:           []net.IP{net.ParseIP("127.0.0.1")},
 	}
 
 	bs, err := x509.CreateCertificate(
diff --git a/command/server_noprofile.go b/command/server_noprofile.go
index 1cf516a1aaf3d..edaebeb13c05c 100644
--- a/command/server_noprofile.go
+++ b/command/server_noprofile.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !memprofiler
 
 package command
diff --git a/command/server_profile.go b/command/server_profile.go
index 42f07d2e8519f..1ce87a6841532 100644
--- a/command/server_profile.go
+++ b/command/server_profile.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build memprofiler
 
 package command
diff --git a/command/server_test.go b/command/server_test.go
index bfe5b14ddebfe..68ee21481523f 100644
--- a/command/server_test.go
+++ b/command/server_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !race && !hsm && !fips_140_3
 
 // NOTE: we can't use this with HSM. We can't set testing mode on and it's not
@@ -80,13 +77,6 @@ listener "tcp" {
   tls_cert_file = "TMPDIR/reload_cert.pem"
   tls_key_file  = "TMPDIR/reload_key.pem"
 }
-`
-	cloudHCL = `
-cloud {
-      resource_id = "organization/bc58b3d0-2eab-4ab8-abf4-f61d3c9975ff/project/1c78e888-2142-4000-8918-f933bbbc7690/hashicorp.example.resource/example"
-    client_id = "J2TtcSYOyPUkPV2z0mSyDtvitxLVjJmu"
-    client_secret = "N9JtHZyOnHrIvJZs82pqa54vd4jnkyU3xCcqhFXuQKJZZuxqxxbP1xCfBZVB82vY"
-}
 `
 )
 
@@ -279,20 +269,6 @@ func TestServer(t *testing.T) {
 			0,
 			[]string{"-test-verify-only"},
 		},
-		{
-			"cloud_config",
-			testBaseHCL(t, "") + inmemHCL + cloudHCL,
-			"HCP Organization: bc58b3d0-2eab-4ab8-abf4-f61d3c9975ff",
-			0,
-			[]string{"-test-verify-only"},
-		},
-		{
-			"recovery_mode",
-			testBaseHCL(t, "") + inmemHCL,
-			"",
-			0,
-			[]string{"-test-verify-only", "-recovery"},
-		},
 	}
 
 	for _, tc := range cases {
@@ -302,21 +278,26 @@ func TestServer(t *testing.T) {
 			t.Parallel()
 
 			ui, cmd := testServerCommand(t)
-
-			f, err := os.CreateTemp(t.TempDir(), "")
-			require.NoErrorf(t, err, "error creating temp dir: %v", err)
-
-			_, err = f.WriteString(tc.contents)
-			require.NoErrorf(t, err, "cannot write temp file contents")
-
-			err = f.Close()
-			require.NoErrorf(t, err, "unable to close temp file")
+			f, err := ioutil.TempFile("", "")
+			if err != nil {
+				t.Fatalf("error creating temp dir: %v", err)
+			}
+			f.WriteString(tc.contents)
+			f.Close()
+			defer os.Remove(f.Name())
 
 			args := append(tc.args, "-config", f.Name())
+
 			code := cmd.Run(args)
 			output := ui.ErrorWriter.String() + ui.OutputWriter.String()
-			require.Equal(t, tc.code, code, "expected %d to be %d: %s", code, tc.code, output)
-			require.Contains(t, output, tc.exp, "expected %q to contain %q", output, tc.exp)
+
+			if code != tc.code {
+				t.Errorf("expected %d to be %d: %s", code, tc.code, output)
+			}
+
+			if !strings.Contains(output, tc.exp) {
+				t.Fatalf("expected %q to contain %q", output, tc.exp)
+			}
 		})
 	}
 }
@@ -330,66 +311,3 @@ func TestServer_DevTLS(t *testing.T) {
 	require.Equal(t, 0, retCode, output)
 	require.Contains(t, output, `tls: "enabled"`)
 }
-
-// TestConfigureDevTLS verifies the various logic paths that flow through the
-// configureDevTLS function.
-func TestConfigureDevTLS(t *testing.T) {
-	testcases := []struct {
-		ServerCommand   *ServerCommand
-		DeferFuncNotNil bool
-		ConfigNotNil    bool
-		TLSDisable      bool
-		CertPathEmpty   bool
-		ErrNotNil       bool
-		TestDescription string
-	}{
-		{
-			ServerCommand: &ServerCommand{
-				flagDevTLS: false,
-			},
-			ConfigNotNil:    true,
-			TLSDisable:      true,
-			CertPathEmpty:   true,
-			ErrNotNil:       false,
-			TestDescription: "flagDev is false, nothing will be configured",
-		},
-		{
-			ServerCommand: &ServerCommand{
-				flagDevTLS:        true,
-				flagDevTLSCertDir: "",
-			},
-			DeferFuncNotNil: true,
-			ConfigNotNil:    true,
-			ErrNotNil:       false,
-			TestDescription: "flagDevTLSCertDir is empty",
-		},
-		{
-			ServerCommand: &ServerCommand{
-				flagDevTLS:        true,
-				flagDevTLSCertDir: "@/#",
-			},
-			CertPathEmpty:   true,
-			ErrNotNil:       true,
-			TestDescription: "flagDevTLSCertDir is set to something invalid",
-		},
-	}
-
-	for _, testcase := range testcases {
-		fun, cfg, certPath, err := configureDevTLS(testcase.ServerCommand)
-		if fun != nil {
-			// If a function is returned, call it right away to clean up
-			// files created in the temporary directory before anything else has
-			// a chance to fail this test.
-			fun()
-		}
-
-		require.Equal(t, testcase.DeferFuncNotNil, (fun != nil), "test description %s", testcase.TestDescription)
-		require.Equal(t, testcase.ConfigNotNil, cfg != nil, "test description %s", testcase.TestDescription)
-		if testcase.ConfigNotNil {
-			require.True(t, len(cfg.Listeners) > 0, "test description %s", testcase.TestDescription)
-			require.Equal(t, testcase.TLSDisable, cfg.Listeners[0].TLSDisable, "test description %s", testcase.TestDescription)
-		}
-		require.Equal(t, testcase.CertPathEmpty, len(certPath) == 0, "test description %s", testcase.TestDescription)
-		require.Equal(t, testcase.ErrNotNil, (err != nil), "test description %s", testcase.TestDescription)
-	}
-}
diff --git a/command/server_util.go b/command/server_util.go
index 7bf3196fc8d57..d5d9c8f4f3341 100644
--- a/command/server_util.go
+++ b/command/server_util.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/ssh.go b/command/ssh.go
index 90bb03080118c..5ac2a3dd1484c 100644
--- a/command/ssh.go
+++ b/command/ssh.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/ssh_test.go b/command/ssh_test.go
index 137e541a8681f..3d2c8e0c886ef 100644
--- a/command/ssh_test.go
+++ b/command/ssh_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/status.go b/command/status.go
index 0b7c619742567..770adfcf3d48e 100644
--- a/command/status.go
+++ b/command/status.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/status_test.go b/command/status_test.go
index 5731945ae78f2..e34a72c578d10 100644
--- a/command/status_test.go
+++ b/command/status_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/test-fixtures/config.hcl b/command/test-fixtures/config.hcl
index 164acd29cc802..31de773909c9a 100644
--- a/command/test-fixtures/config.hcl
+++ b/command/test-fixtures/config.hcl
@@ -1,4 +1 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 token_helper = "foo"
diff --git a/command/test-fixtures/policy.hcl b/command/test-fixtures/policy.hcl
index 267fc5cecdc59..7d46bdeabe16f 100644
--- a/command/test-fixtures/policy.hcl
+++ b/command/test-fixtures/policy.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 path "secret/foo" {
   policy = "write"
 }
diff --git a/command/token.go b/command/token.go
index 7b15275283bc1..20af230a5b308 100644
--- a/command/token.go
+++ b/command/token.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/token/helper.go b/command/token/helper.go
index c8ce76326a7b7..ff559e40d447d 100644
--- a/command/token/helper.go
+++ b/command/token/helper.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package token
 
 // TokenHelper is an interface that contains basic operations that must be
diff --git a/command/token/helper_external.go b/command/token/helper_external.go
index 12557a4b30609..83f5f8907291d 100644
--- a/command/token/helper_external.go
+++ b/command/token/helper_external.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package token
 
 import (
diff --git a/command/token/helper_external_test.go b/command/token/helper_external_test.go
index d95c8890eaf34..b49dd93343ccd 100644
--- a/command/token/helper_external_test.go
+++ b/command/token/helper_external_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package token
 
 import (
diff --git a/command/token/helper_internal.go b/command/token/helper_internal.go
index aeb4faa9bef39..c5f35721ee9e2 100644
--- a/command/token/helper_internal.go
+++ b/command/token/helper_internal.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package token
 
 import (
diff --git a/command/token/helper_internal_test.go b/command/token/helper_internal_test.go
index e68359c820086..18f3abae56f6c 100644
--- a/command/token/helper_internal_test.go
+++ b/command/token/helper_internal_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package token
 
 import (
diff --git a/command/token/helper_testing.go b/command/token/helper_testing.go
index e95ff35580479..93465931b7890 100644
--- a/command/token/helper_testing.go
+++ b/command/token/helper_testing.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package token
 
 import (
diff --git a/command/token/testing.go b/command/token/testing.go
index 85da0840c84ac..725f1276a052a 100644
--- a/command/token/testing.go
+++ b/command/token/testing.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package token
 
 import (
diff --git a/command/token_capabilities.go b/command/token_capabilities.go
index f7e359c06f13f..093765630d664 100644
--- a/command/token_capabilities.go
+++ b/command/token_capabilities.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/token_capabilities_test.go b/command/token_capabilities_test.go
index 14b0f27658341..874db49129af4 100644
--- a/command/token_capabilities_test.go
+++ b/command/token_capabilities_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/token_create.go b/command/token_create.go
index 1efee5ebff062..a8dc2f03ea7a3 100644
--- a/command/token_create.go
+++ b/command/token_create.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/token_create_test.go b/command/token_create_test.go
index 31bbd244b2e6b..a7e767926ae6a 100644
--- a/command/token_create_test.go
+++ b/command/token_create_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/token_lookup.go b/command/token_lookup.go
index 24161399a2c9b..55284a29d1bc6 100644
--- a/command/token_lookup.go
+++ b/command/token_lookup.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/token_lookup_test.go b/command/token_lookup_test.go
index 3f5636527661e..e027b3f7c97bf 100644
--- a/command/token_lookup_test.go
+++ b/command/token_lookup_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/token_renew.go b/command/token_renew.go
index 7a61487b5a25e..88d6fa20fb2c2 100644
--- a/command/token_renew.go
+++ b/command/token_renew.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/token_renew_test.go b/command/token_renew_test.go
index 29d9292018cf4..c958d4d55af67 100644
--- a/command/token_renew_test.go
+++ b/command/token_renew_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/token_revoke.go b/command/token_revoke.go
index 48ccc27ac261b..f6eb72101bb37 100644
--- a/command/token_revoke.go
+++ b/command/token_revoke.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/token_revoke_test.go b/command/token_revoke_test.go
index 6ff8898301a18..7f66e9d4a0d88 100644
--- a/command/token_revoke_test.go
+++ b/command/token_revoke_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/transform.go b/command/transform.go
deleted file mode 100644
index 27345a441171c..0000000000000
--- a/command/transform.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package command
-
-import (
-	"strings"
-
-	"github.com/mitchellh/cli"
-)
-
-var _ cli.Command = (*TransformCommand)(nil)
-
-type TransformCommand struct {
-	*BaseCommand
-}
-
-func (c *TransformCommand) Synopsis() string {
-	return "Interact with Vault's Transform Secrets Engine"
-}
-
-func (c *TransformCommand) Help() string {
-	helpText := `
-Usage: vault transform <subcommand> [options] [args]
-
-  This command has subcommands for interacting with Vault's Transform Secrets
-  Engine. Here are some simple examples, and more detailed examples are
-  available in the subcommands or the documentation.
-
-  To import a key into a new FPE transformation:
-
-  $ vault transform import transform/transformations/fpe/new-transformation @path/to/key \
-      template=identifier \
-	  allowed_roles=physical-access 
-
-  Please see the individual subcommand help for detailed usage information.
-`
-
-	return strings.TrimSpace(helpText)
-}
-
-func (c *TransformCommand) Run(args []string) int {
-	return cli.RunResultHelp
-}
diff --git a/command/transform_import_key.go b/command/transform_import_key.go
deleted file mode 100644
index e41fa625ed052..0000000000000
--- a/command/transform_import_key.go
+++ /dev/null
@@ -1,76 +0,0 @@
-package command
-
-import (
-	"errors"
-	"regexp"
-	"strings"
-
-	"github.com/mitchellh/cli"
-	"github.com/posener/complete"
-)
-
-var (
-	_                cli.Command             = (*TransformImportCommand)(nil)
-	_                cli.CommandAutocomplete = (*TransformImportCommand)(nil)
-	transformKeyPath                         = regexp.MustCompile("^(.*)/transformations/(fpe|tokenization)/([^/]*)$")
-)
-
-type TransformImportCommand struct {
-	*BaseCommand
-}
-
-func (c *TransformImportCommand) Synopsis() string {
-	return "Import a key into the Transform secrets engines."
-}
-
-func (c *TransformImportCommand) Help() string {
-	helpText := `
-Usage: vault transform import PATH KEY [options...]
-
-  Using the Transform key wrapping system, imports key material from
-  the base64 encoded KEY (either directly on the CLI or via @path notation),
-  into a new FPE or tokenization transformation whose API path is PATH. 
-
-  To import a new key version into an existing tokenization transformation, 
-  use import_version. 
-  
-  The remaining options after KEY (key=value style) are passed on to 
-  Create/Update FPE Transformation or Create/Update Tokenization Transformation 
-  API endpoints.
-
-  For example:
-  $ vault transform import transform/transformations/tokenization/application-form @path/to/key \        
-       allowed_roles=legacy-system 
-` + c.Flags().Help()
-
-	return strings.TrimSpace(helpText)
-}
-
-func (c *TransformImportCommand) Flags() *FlagSets {
-	return c.flagSet(FlagSetHTTP)
-}
-
-func (c *TransformImportCommand) AutocompleteArgs() complete.Predictor {
-	return nil
-}
-
-func (c *TransformImportCommand) AutocompleteFlags() complete.Flags {
-	return c.Flags().Completions()
-}
-
-func (c *TransformImportCommand) Run(args []string) int {
-	return ImportKey(c.BaseCommand, "import", transformImportKeyPath, c.Flags(), args)
-}
-
-func transformImportKeyPath(s string, operation string) (path string, apiPath string, err error) {
-	parts := transformKeyPath.FindStringSubmatch(s)
-	if len(parts) != 4 {
-		return "", "", errors.New("expected transform path and key name in the form :path:/transformations/fpe|tokenization/:name:")
-	}
-	path = parts[1]
-	transformation := parts[2]
-	keyName := parts[3]
-	apiPath = path + "/transformations/" + transformation + "/" + keyName + "/" + operation
-
-	return path, apiPath, nil
-}
diff --git a/command/transform_import_key_version.go b/command/transform_import_key_version.go
deleted file mode 100644
index 6ed8cb18bd02e..0000000000000
--- a/command/transform_import_key_version.go
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package command
-
-import (
-	"strings"
-
-	"github.com/mitchellh/cli"
-	"github.com/posener/complete"
-)
-
-var (
-	_ cli.Command             = (*TransformImportVersionCommand)(nil)
-	_ cli.CommandAutocomplete = (*TransformImportVersionCommand)(nil)
-)
-
-type TransformImportVersionCommand struct {
-	*BaseCommand
-}
-
-func (c *TransformImportVersionCommand) Synopsis() string {
-	return "Import key material into a new key version in the Transform secrets engines."
-}
-
-func (c *TransformImportVersionCommand) Help() string {
-	helpText := `
-Usage: vault transform import-version PATH KEY [...]
-
-  Using the Transform key wrapping system, imports new key material from
-  the base64 encoded KEY (either directly on the CLI or via @path notation),
-  into an existing tokenization transformation whose API path is PATH. 
-
-  The remaining options after KEY (key=value style) are passed on to 
-  Create/Update Tokenization Transformation API endpoint.
-
-  For example:
-  $ vault transform import-version transform/transformations/tokenization/application-form @path/to/new_version \        
-       allowed_roles=legacy-system
-` + c.Flags().Help()
-
-	return strings.TrimSpace(helpText)
-}
-
-func (c *TransformImportVersionCommand) Flags() *FlagSets {
-	return c.flagSet(FlagSetHTTP)
-}
-
-func (c *TransformImportVersionCommand) AutocompleteArgs() complete.Predictor {
-	return nil
-}
-
-func (c *TransformImportVersionCommand) AutocompleteFlags() complete.Flags {
-	return c.Flags().Completions()
-}
-
-func (c *TransformImportVersionCommand) Run(args []string) int {
-	return ImportKey(c.BaseCommand, "import_version", transformImportKeyPath, c.Flags(), args)
-}
diff --git a/command/transit.go b/command/transit.go
deleted file mode 100644
index a48fef7852638..0000000000000
--- a/command/transit.go
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package command
-
-import (
-	"strings"
-
-	"github.com/mitchellh/cli"
-)
-
-var _ cli.Command = (*TransitCommand)(nil)
-
-type TransitCommand struct {
-	*BaseCommand
-}
-
-func (c *TransitCommand) Synopsis() string {
-	return "Interact with Vault's Transit Secrets Engine"
-}
-
-func (c *TransitCommand) Help() string {
-	helpText := `
-Usage: vault transit <subcommand> [options] [args]
-
-  This command has subcommands for interacting with Vault's Transit Secrets
-  Engine. Here are some simple examples, and more detailed examples are
-  available in the subcommands or the documentation.
-
-  To import a key into the specified Transit mount:
-
-  $ vault transit import transit/keys/newly-imported @path/to/key type=rsa-2048
-
-  Please see the individual subcommand help for detailed usage information.
-`
-
-	return strings.TrimSpace(helpText)
-}
-
-func (c *TransitCommand) Run(args []string) int {
-	return cli.RunResultHelp
-}
diff --git a/command/transit_import_key.go b/command/transit_import_key.go
deleted file mode 100644
index 3eea70093bc1e..0000000000000
--- a/command/transit_import_key.go
+++ /dev/null
@@ -1,211 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package command
-
-import (
-	"crypto/rand"
-	"crypto/rsa"
-	"crypto/sha256"
-	"crypto/x509"
-	"encoding/base64"
-	"encoding/pem"
-	"errors"
-	"fmt"
-	"os"
-	"regexp"
-	"strings"
-
-	"github.com/hashicorp/vault/api"
-
-	"github.com/google/tink/go/kwp/subtle"
-
-	"github.com/mitchellh/cli"
-	"github.com/posener/complete"
-)
-
-var (
-	_       cli.Command             = (*TransitImportCommand)(nil)
-	_       cli.CommandAutocomplete = (*TransitImportCommand)(nil)
-	keyPath                         = regexp.MustCompile("^(.*)/keys/([^/]*)$")
-)
-
-type TransitImportCommand struct {
-	*BaseCommand
-}
-
-func (c *TransitImportCommand) Synopsis() string {
-	return "Import a key into the Transit secrets engines."
-}
-
-func (c *TransitImportCommand) Help() string {
-	helpText := `
-Usage: vault transit import PATH KEY [options...]
-
-  Using the Transit key wrapping system, imports key material from
-  the base64 encoded KEY (either directly on the CLI or via @path notation),
-  into a new key whose API path is PATH.  To import a new version into an
-  existing key, use import_version.  The remaining options after KEY (key=value
-  style) are passed on to the Transit create key endpoint.  If your
-  system or device natively supports the RSA AES key wrap mechanism (such as
-  the PKCS#11 mechanism CKM_RSA_AES_KEY_WRAP), you should use it directly
-  rather than this command.
-
-` + c.Flags().Help()
-
-	return strings.TrimSpace(helpText)
-}
-
-func (c *TransitImportCommand) Flags() *FlagSets {
-	return c.flagSet(FlagSetHTTP)
-}
-
-func (c *TransitImportCommand) AutocompleteArgs() complete.Predictor {
-	return nil
-}
-
-func (c *TransitImportCommand) AutocompleteFlags() complete.Flags {
-	return c.Flags().Completions()
-}
-
-func (c *TransitImportCommand) Run(args []string) int {
-	return ImportKey(c.BaseCommand, "import", transitImportKeyPath, c.Flags(), args)
-}
-
-func transitImportKeyPath(s string, operation string) (path string, apiPath string, err error) {
-	parts := keyPath.FindStringSubmatch(s)
-	if len(parts) != 3 {
-		return "", "", errors.New("expected transit path and key name in the form :path:/keys/:name:")
-	}
-	path = parts[1]
-	keyName := parts[2]
-	apiPath = path + "/keys/" + keyName + "/" + operation
-
-	return path, apiPath, nil
-}
-
-type ImportKeyFunc func(s string, operation string) (path string, apiPath string, err error)
-
-// error codes: 1: user error, 2: internal computation error, 3: remote api call error
-func ImportKey(c *BaseCommand, operation string, pathFunc ImportKeyFunc, flags *FlagSets, args []string) int {
-	// Parse and validate the arguments.
-	if err := flags.Parse(args); err != nil {
-		c.UI.Error(err.Error())
-		return 1
-	}
-
-	args = flags.Args()
-	if len(args) < 2 {
-		c.UI.Error(fmt.Sprintf("Incorrect argument count (expected 2+, got %d). Wanted PATH to import into and KEY material.", len(args)))
-		return 1
-	}
-
-	client, err := c.Client()
-	if err != nil {
-		c.UI.Error(err.Error())
-		return 2
-	}
-
-	ephemeralAESKey := make([]byte, 32)
-	_, err = rand.Read(ephemeralAESKey)
-	if err != nil {
-		c.UI.Error(fmt.Sprintf("failed to generate ephemeral key: %v", err))
-	}
-	path, apiPath, err := pathFunc(args[0], operation)
-	if err != nil {
-		c.UI.Error(err.Error())
-		return 1
-	}
-	keyMaterial := args[1]
-	if keyMaterial[0] == '@' {
-		keyMaterialBytes, err := os.ReadFile(keyMaterial[1:])
-		if err != nil {
-			c.UI.Error(fmt.Sprintf("error reading key material file: %v", err))
-			return 1
-		}
-
-		keyMaterial = string(keyMaterialBytes)
-	}
-
-	key, err := base64.StdEncoding.DecodeString(keyMaterial)
-	if err != nil {
-		c.UI.Error(fmt.Sprintf("error base64 decoding source key material: %v", err))
-		return 1
-	}
-	// Fetch the wrapping key
-	c.UI.Output("Retrieving wrapping key.")
-	wrappingKey, err := fetchWrappingKey(c, client, path)
-	if err != nil {
-		c.UI.Error(fmt.Sprintf("failed to fetch wrapping key: %v", err))
-		return 3
-	}
-	c.UI.Output("Wrapping source key with ephemeral key.")
-	wrapKWP, err := subtle.NewKWP(ephemeralAESKey)
-	if err != nil {
-		c.UI.Error(fmt.Sprintf("failure building key wrapping key: %v", err))
-		return 2
-	}
-	wrappedTargetKey, err := wrapKWP.Wrap(key)
-	if err != nil {
-		c.UI.Error(fmt.Sprintf("failure wrapping source key: %v", err))
-		return 2
-	}
-	c.UI.Output("Encrypting ephemeral key with wrapping key.")
-	wrappedAESKey, err := rsa.EncryptOAEP(
-		sha256.New(),
-		rand.Reader,
-		wrappingKey.(*rsa.PublicKey),
-		ephemeralAESKey,
-		[]byte{},
-	)
-	if err != nil {
-		c.UI.Error(fmt.Sprintf("failure encrypting wrapped key: %v", err))
-		return 2
-	}
-	combinedCiphertext := append(wrappedAESKey, wrappedTargetKey...)
-	importCiphertext := base64.StdEncoding.EncodeToString(combinedCiphertext)
-
-	// Parse all the key options
-	data, err := parseArgsData(os.Stdin, args[2:])
-	if err != nil {
-		c.UI.Error(fmt.Sprintf("Failed to parse extra K=V data: %s", err))
-		return 1
-	}
-	if data == nil {
-		data = make(map[string]interface{}, 1)
-	}
-
-	data["ciphertext"] = importCiphertext
-
-	c.UI.Output("Submitting wrapped key.")
-	// Finally, call import
-
-	_, err = client.Logical().Write(apiPath, data)
-	if err != nil {
-		c.UI.Error(fmt.Sprintf("failed to call import:%v", err))
-		return 3
-	} else {
-		c.UI.Output("Success!")
-		return 0
-	}
-}
-
-func fetchWrappingKey(c *BaseCommand, client *api.Client, path string) (any, error) {
-	resp, err := client.Logical().Read(path + "/wrapping_key")
-	if err != nil {
-		return nil, fmt.Errorf("error fetching wrapping key: %w", err)
-	}
-	if resp == nil {
-		return nil, fmt.Errorf("no mount found at %s: %v", path, err)
-	}
-	key, ok := resp.Data["public_key"]
-	if !ok {
-		c.UI.Error("could not find wrapping key")
-	}
-	keyBlock, _ := pem.Decode([]byte(key.(string)))
-	parsedKey, err := x509.ParsePKIXPublicKey(keyBlock.Bytes)
-	if err != nil {
-		return nil, fmt.Errorf("error parsing wrapping key: %w", err)
-	}
-	return parsedKey, nil
-}
diff --git a/command/transit_import_key_test.go b/command/transit_import_key_test.go
deleted file mode 100644
index e01c03fa00bb6..0000000000000
--- a/command/transit_import_key_test.go
+++ /dev/null
@@ -1,189 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package command
-
-import (
-	"bytes"
-	"crypto/rand"
-	"crypto/rsa"
-	"crypto/x509"
-	"encoding/base64"
-	"testing"
-
-	"github.com/hashicorp/vault/api"
-
-	"github.com/stretchr/testify/require"
-)
-
-// Validate the `vault transit import` command works.
-func TestTransitImport(t *testing.T) {
-	t.Parallel()
-
-	client, closer := testVaultServer(t)
-	defer closer()
-
-	if err := client.Sys().Mount("transit", &api.MountInput{
-		Type: "transit",
-	}); err != nil {
-		t.Fatalf("transit mount error: %#v", err)
-	}
-
-	rsa1, rsa2, aes128, aes256 := generateKeys(t)
-
-	type testCase struct {
-		variant    string
-		path       string
-		key        []byte
-		args       []string
-		shouldFail bool
-	}
-	tests := []testCase{
-		{
-			"import",
-			"transit/keys/rsa1",
-			rsa1,
-			[]string{"type=rsa-2048"},
-			false, /* first import */
-		},
-		{
-			"import",
-			"transit/keys/rsa1",
-			rsa2,
-			[]string{"type=rsa-2048"},
-			true, /* already exists */
-		},
-		{
-			"import-version",
-			"transit/keys/rsa1",
-			rsa2,
-			[]string{"type=rsa-2048"},
-			false, /* new version */
-		},
-		{
-			"import",
-			"transit/keys/rsa2",
-			rsa2,
-			[]string{"type=rsa-4096"},
-			true, /* wrong type */
-		},
-		{
-			"import",
-			"transit/keys/rsa2",
-			rsa2,
-			[]string{"type=rsa-2048"},
-			false, /* new name */
-		},
-		{
-			"import",
-			"transit/keys/aes1",
-			aes128,
-			[]string{"type=aes128-gcm96"},
-			false, /* first import */
-		},
-		{
-			"import",
-			"transit/keys/aes1",
-			aes256,
-			[]string{"type=aes256-gcm96"},
-			true, /* already exists */
-		},
-		{
-			"import-version",
-			"transit/keys/aes1",
-			aes256,
-			[]string{"type=aes256-gcm96"},
-			true, /* new version, different type */
-		},
-		{
-			"import-version",
-			"transit/keys/aes1",
-			aes128,
-			[]string{"type=aes128-gcm96"},
-			false, /* new version */
-		},
-		{
-			"import",
-			"transit/keys/aes2",
-			aes256,
-			[]string{"type=aes128-gcm96"},
-			true, /* wrong type */
-		},
-		{
-			"import",
-			"transit/keys/aes2",
-			aes256,
-			[]string{"type=aes256-gcm96"},
-			false, /* new name */
-		},
-	}
-
-	for index, tc := range tests {
-		t.Logf("Running test case %d: %v", index, tc)
-		execTransitImport(t, client, tc.variant, tc.path, tc.key, tc.args, tc.shouldFail)
-	}
-}
-
-func execTransitImport(t *testing.T, client *api.Client, method string, path string, key []byte, data []string, expectFailure bool) {
-	t.Helper()
-
-	keyBase64 := base64.StdEncoding.EncodeToString(key)
-
-	var args []string
-	args = append(args, "transit")
-	args = append(args, method)
-	args = append(args, path)
-	args = append(args, keyBase64)
-	args = append(args, data...)
-
-	stdout := bytes.NewBuffer(nil)
-	stderr := bytes.NewBuffer(nil)
-	runOpts := &RunOptions{
-		Stdout: stdout,
-		Stderr: stderr,
-		Client: client,
-	}
-
-	code := RunCustom(args, runOpts)
-	combined := stdout.String() + stderr.String()
-
-	if code != 0 {
-		if !expectFailure {
-			t.Fatalf("Got unexpected failure from test (ret %d): %v", code, combined)
-		}
-	} else {
-		if expectFailure {
-			t.Fatalf("Expected failure, got success from test (ret %d): %v", code, combined)
-		}
-	}
-}
-
-func generateKeys(t *testing.T) (rsa1 []byte, rsa2 []byte, aes128 []byte, aes256 []byte) {
-	t.Helper()
-
-	priv1, err := rsa.GenerateKey(rand.Reader, 2048)
-	require.NotNil(t, priv1, "failed generating RSA 1 key")
-	require.NoError(t, err, "failed generating RSA 1 key")
-
-	rsa1, err = x509.MarshalPKCS8PrivateKey(priv1)
-	require.NotNil(t, rsa1, "failed marshaling RSA 1 key")
-	require.NoError(t, err, "failed marshaling RSA 1 key")
-
-	priv2, err := rsa.GenerateKey(rand.Reader, 2048)
-	require.NotNil(t, priv2, "failed generating RSA 2 key")
-	require.NoError(t, err, "failed generating RSA 2 key")
-
-	rsa2, err = x509.MarshalPKCS8PrivateKey(priv2)
-	require.NotNil(t, rsa2, "failed marshaling RSA 2 key")
-	require.NoError(t, err, "failed marshaling RSA 2 key")
-
-	aes128 = make([]byte, 128/8)
-	_, err = rand.Read(aes128)
-	require.NoError(t, err, "failed generating AES 128 key")
-
-	aes256 = make([]byte, 256/8)
-	_, err = rand.Read(aes256)
-	require.NoError(t, err, "failed generating AES 256 key")
-
-	return
-}
diff --git a/command/transit_import_key_version.go b/command/transit_import_key_version.go
deleted file mode 100644
index 1a25078923bb8..0000000000000
--- a/command/transit_import_key_version.go
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package command
-
-import (
-	"strings"
-
-	"github.com/mitchellh/cli"
-	"github.com/posener/complete"
-)
-
-var (
-	_ cli.Command             = (*TransitImportVersionCommand)(nil)
-	_ cli.CommandAutocomplete = (*TransitImportVersionCommand)(nil)
-)
-
-type TransitImportVersionCommand struct {
-	*BaseCommand
-}
-
-func (c *TransitImportVersionCommand) Synopsis() string {
-	return "Import key material into a new key version in the Transit secrets engines."
-}
-
-func (c *TransitImportVersionCommand) Help() string {
-	helpText := `
-Usage: vault transit import-version PATH KEY [...]
-
-  Using the Transit key wrapping system, imports key material from
-  the base64 encoded KEY (either directly on the CLI or via @path notation),
-  into a new key whose API path is PATH.  To import a new Transit
-  key, use the import command instead.  The remaining options after KEY
-  (key=value style) are passed on to the Transit create key endpoint.
-  If your system or device natively supports the RSA AES key wrap mechanism
-  (such as the PKCS#11 mechanism CKM_RSA_AES_KEY_WRAP), you should use it
-  directly rather than this command.
-
-` + c.Flags().Help()
-
-	return strings.TrimSpace(helpText)
-}
-
-func (c *TransitImportVersionCommand) Flags() *FlagSets {
-	return c.flagSet(FlagSetHTTP)
-}
-
-func (c *TransitImportVersionCommand) AutocompleteArgs() complete.Predictor {
-	return nil
-}
-
-func (c *TransitImportVersionCommand) AutocompleteFlags() complete.Flags {
-	return c.Flags().Completions()
-}
-
-func (c *TransitImportVersionCommand) Run(args []string) int {
-	return ImportKey(c.BaseCommand, "import_version", transitImportKeyPath, c.Flags(), args)
-}
diff --git a/command/unwrap.go b/command/unwrap.go
index 1f920e7806eb3..53ff0787de280 100644
--- a/command/unwrap.go
+++ b/command/unwrap.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/unwrap_test.go b/command/unwrap_test.go
index 608edff51778e..4a06418b027ce 100644
--- a/command/unwrap_test.go
+++ b/command/unwrap_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/util.go b/command/util.go
index e24d65d7259f1..4f9614e234fb3 100644
--- a/command/util.go
+++ b/command/util.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -107,7 +104,7 @@ func PrintRawField(ui cli.Ui, data interface{}, field string) int {
 	}
 
 	format := Format(ui)
-	if format == "" || format == "table" || format == "raw" {
+	if format == "" || format == "table" {
 		return PrintRaw(ui, fmt.Sprintf("%v", val))
 	}
 
diff --git a/command/version.go b/command/version.go
index e9b17227b0bfe..ad366601b736c 100644
--- a/command/version.go
+++ b/command/version.go
@@ -1,12 +1,9 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
 	"strings"
 
-	"github.com/hashicorp/vault/version"
+	"github.com/hashicorp/vault/sdk/version"
 	"github.com/mitchellh/cli"
 	"github.com/posener/complete"
 )
diff --git a/command/version_history.go b/command/version_history.go
index b2dfbae425d9a..56d3deb963547 100644
--- a/command/version_history.go
+++ b/command/version_history.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/command/version_history_test.go b/command/version_history_test.go
index c011a4bf4d7b7..ba02626a40215 100644
--- a/command/version_history_test.go
+++ b/command/version_history_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -9,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/hashicorp/vault/version"
+	"github.com/hashicorp/vault/sdk/version"
 	"github.com/mitchellh/cli"
 )
 
diff --git a/command/version_test.go b/command/version_test.go
index ede21e62a9cf7..b952cef01c3ed 100644
--- a/command/version_test.go
+++ b/command/version_test.go
@@ -1,13 +1,10 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
 	"strings"
 	"testing"
 
-	"github.com/hashicorp/vault/version"
+	"github.com/hashicorp/vault/sdk/version"
 	"github.com/mitchellh/cli"
 )
 
diff --git a/command/write.go b/command/write.go
index 2cc93b8a35049..15629052f7c2d 100644
--- a/command/write.go
+++ b/command/write.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
@@ -9,7 +6,6 @@ import (
 	"os"
 	"strings"
 
-	"github.com/hashicorp/vault/api"
 	"github.com/mitchellh/cli"
 	"github.com/posener/complete"
 )
@@ -142,10 +138,6 @@ func (c *WriteCommand) Run(args []string) int {
 	}
 
 	secret, err := client.Logical().Write(path, data)
-	return handleWriteSecretOutput(c.BaseCommand, path, secret, err)
-}
-
-func handleWriteSecretOutput(c *BaseCommand, path string, secret *api.Secret, err error) int {
 	if err != nil {
 		c.UI.Error(fmt.Sprintf("Error writing data to %s: %s", path, err))
 		if secret != nil {
diff --git a/command/write_test.go b/command/write_test.go
index 9b76d391c8540..03aab4c79af2c 100644
--- a/command/write_test.go
+++ b/command/write_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package command
 
 import (
diff --git a/enos/ci/aws-nuke.yml b/enos/ci/aws-nuke.yml
index 50a567704925e..6089d0d30573d 100644
--- a/enos/ci/aws-nuke.yml
+++ b/enos/ci/aws-nuke.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 regions:
 - eu-north-1
 - ap-south-1
diff --git a/enos/ci/bootstrap/main.tf b/enos/ci/bootstrap/main.tf
index c5ce812d90b24..804f1e66bfa4e 100644
--- a/enos/ci/bootstrap/main.tf
+++ b/enos/ci/bootstrap/main.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 terraform {
   required_providers {
     aws = {
diff --git a/enos/ci/bootstrap/outputs.tf b/enos/ci/bootstrap/outputs.tf
index e6ff37270bd54..858318e4cd5cf 100644
--- a/enos/ci/bootstrap/outputs.tf
+++ b/enos/ci/bootstrap/outputs.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 output "keys" {
   value = {
     "us-east-1" = {
diff --git a/enos/ci/bootstrap/variables.tf b/enos/ci/bootstrap/variables.tf
index 3fb53bc517775..3aab3449f368d 100644
--- a/enos/ci/bootstrap/variables.tf
+++ b/enos/ci/bootstrap/variables.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 variable "aws_ssh_public_key" {
   description = "The public key to use for the ssh key"
   type        = string
diff --git a/enos/ci/service-user-iam/main.tf b/enos/ci/service-user-iam/main.tf
index c70dbaa13be50..bea2d46a43096 100644
--- a/enos/ci/service-user-iam/main.tf
+++ b/enos/ci/service-user-iam/main.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 terraform {
   required_providers {
     aws = {
diff --git a/enos/ci/service-user-iam/outputs.tf b/enos/ci/service-user-iam/outputs.tf
index ba980d59d076b..d4ba89910df9e 100644
--- a/enos/ci/service-user-iam/outputs.tf
+++ b/enos/ci/service-user-iam/outputs.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 output "ci_role" {
   value = {
     name = aws_iam_role.role.name
diff --git a/enos/ci/service-user-iam/providers.tf b/enos/ci/service-user-iam/providers.tf
index 7baba3344006b..09c86d7bae4e2 100644
--- a/enos/ci/service-user-iam/providers.tf
+++ b/enos/ci/service-user-iam/providers.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 provider "aws" {
   region = "us-east-1"
   alias  = "us_east_1"
diff --git a/enos/ci/service-user-iam/service-quotas.tf b/enos/ci/service-user-iam/service-quotas.tf
index 3044d41778c42..544f311504e7d 100644
--- a/enos/ci/service-user-iam/service-quotas.tf
+++ b/enos/ci/service-user-iam/service-quotas.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 locals {
   // This is the code of the service quota to request a change for. Each adjustable limit has a
   // unique code. See, https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/servicequotas_service_quota#quota_code
@@ -9,35 +6,35 @@ locals {
 }
 
 resource "aws_servicequotas_service_quota" "vpcs_per_region_us_east_1" {
-  provider     = aws.us_east_1
+  provider     = aws.us_east_2
   quota_code   = local.subnets_per_vpcs_quota
   service_code = "vpc"
-  value        = 100
+  value        = 50
 }
 
 resource "aws_servicequotas_service_quota" "vpcs_per_region_us_east_2" {
   provider     = aws.us_east_2
   quota_code   = local.subnets_per_vpcs_quota
   service_code = "vpc"
-  value        = 100
+  value        = 50
 }
 
 resource "aws_servicequotas_service_quota" "vpcs_per_region_us_west_1" {
   provider     = aws.us_west_1
   quota_code   = local.subnets_per_vpcs_quota
   service_code = "vpc"
-  value        = 100
+  value        = 50
 }
 
 resource "aws_servicequotas_service_quota" "vpcs_per_region_us_west_2" {
   provider     = aws.us_west_2
   quota_code   = local.subnets_per_vpcs_quota
   service_code = "vpc"
-  value        = 100
+  value        = 50
 }
 
 resource "aws_servicequotas_service_quota" "spot_requests_per_region_us_east_1" {
-  provider     = aws.us_east_1
+  provider     = aws.us_east_2
   quota_code   = local.standard_spot_instance_requests_quota
   service_code = "ec2"
   value        = 640
diff --git a/enos/ci/service-user-iam/variables.tf b/enos/ci/service-user-iam/variables.tf
index a80d83ca98c33..6cc7efd6bd9bc 100644
--- a/enos/ci/service-user-iam/variables.tf
+++ b/enos/ci/service-user-iam/variables.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 variable "repository" {
   description = "The GitHub repository, either vault or vault-enterprise"
   type        = string
diff --git a/enos/enos-modules.hcl b/enos/enos-modules.hcl
index 0886b46a061b6..19116dd51ca09 100644
--- a/enos/enos-modules.hcl
+++ b/enos/enos-modules.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 module "autopilot_upgrade_storageconfig" {
   source = "./modules/autopilot_upgrade_storageconfig"
 }
diff --git a/enos/enos-providers.hcl b/enos/enos-providers.hcl
index f277c57e29f03..9301b55037d06 100644
--- a/enos/enos-providers.hcl
+++ b/enos/enos-providers.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 provider "aws" "default" {
   region = var.aws_region
 }
diff --git a/enos/enos-scenario-agent.hcl b/enos/enos-scenario-agent.hcl
index dd10112ceacb5..d7b4cc3994f6c 100644
--- a/enos/enos-scenario-agent.hcl
+++ b/enos/enos-scenario-agent.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 scenario "agent" {
   matrix {
     arch            = ["amd64", "arm64"]
diff --git a/enos/enos-scenario-autopilot.hcl b/enos/enos-scenario-autopilot.hcl
index 234451872acba..4e86348edf67b 100644
--- a/enos/enos-scenario-autopilot.hcl
+++ b/enos/enos-scenario-autopilot.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 scenario "autopilot" {
   matrix {
     arch            = ["amd64", "arm64"]
diff --git a/enos/enos-scenario-replication.hcl b/enos/enos-scenario-replication.hcl
index aebfd849b9ee4..4324c01ce2ceb 100644
--- a/enos/enos-scenario-replication.hcl
+++ b/enos/enos-scenario-replication.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 // The replication scenario configures performance replication between two Vault clusters and verifies
 // known_primary_cluster_addrs are updated on secondary Vault cluster with the IP addresses of replaced
 // nodes on primary Vault cluster
diff --git a/enos/enos-scenario-smoke.hcl b/enos/enos-scenario-smoke.hcl
index 3e5c313f02e63..0d2ebed5f581f 100644
--- a/enos/enos-scenario-smoke.hcl
+++ b/enos/enos-scenario-smoke.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 scenario "smoke" {
   matrix {
     arch            = ["amd64", "arm64"]
diff --git a/enos/enos-scenario-ui.hcl b/enos/enos-scenario-ui.hcl
index 9cd734a751a52..619cd73efc214 100644
--- a/enos/enos-scenario-ui.hcl
+++ b/enos/enos-scenario-ui.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 scenario "ui" {
   matrix {
     edition = ["oss", "ent"]
diff --git a/enos/enos-scenario-upgrade.hcl b/enos/enos-scenario-upgrade.hcl
index adc97dc584567..e6e719e800a14 100644
--- a/enos/enos-scenario-upgrade.hcl
+++ b/enos/enos-scenario-upgrade.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 scenario "upgrade" {
   matrix {
     arch            = ["amd64", "arm64"]
diff --git a/enos/enos-terraform.hcl b/enos/enos-terraform.hcl
index 4048f5e181c2a..e45ccaa888f28 100644
--- a/enos/enos-terraform.hcl
+++ b/enos/enos-terraform.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 terraform_cli "default" {
   plugin_cache_dir = var.terraform_plugin_cache_dir != null ? abspath(var.terraform_plugin_cache_dir) : null
 
diff --git a/enos/enos-variables.hcl b/enos/enos-variables.hcl
index ef445d0a2b09a..1d0aea6ebd6b3 100644
--- a/enos/enos-variables.hcl
+++ b/enos/enos-variables.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 variable "artifact_path" {
   type        = string
   description = "The local path for dev artifact to test"
diff --git a/enos/enos.vars.hcl b/enos/enos.vars.hcl
index d63af4452c806..d157c7b92650e 100644
--- a/enos/enos.vars.hcl
+++ b/enos/enos.vars.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 # aws_region is the AWS region where we'll create infrastructure
 # for the smoke scenario
 # aws_region = "us-west-1"
diff --git a/enos/k8s/enos-modules-k8s.hcl b/enos/k8s/enos-modules-k8s.hcl
index 76518403b750c..75bfd7856461d 100644
--- a/enos/k8s/enos-modules-k8s.hcl
+++ b/enos/k8s/enos-modules-k8s.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 module "create_kind_cluster" {
   source = "../modules/local_kind_cluster"
 }
diff --git a/enos/k8s/enos-providers-k8s.hcl b/enos/k8s/enos-providers-k8s.hcl
index 7e3d7a7743157..2a0cf2be34841 100644
--- a/enos/k8s/enos-providers-k8s.hcl
+++ b/enos/k8s/enos-providers-k8s.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 provider "enos" "default" {}
 
 provider "helm" "default" {
diff --git a/enos/k8s/enos-scenario-k8s.hcl b/enos/k8s/enos-scenario-k8s.hcl
index 8953d5c37e596..cc4769dd4f645 100644
--- a/enos/k8s/enos-scenario-k8s.hcl
+++ b/enos/k8s/enos-scenario-k8s.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 scenario "k8s" {
   matrix {
     edition = ["oss", "ent"]
diff --git a/enos/k8s/enos-terraform-k8s.hcl b/enos/k8s/enos-terraform-k8s.hcl
index 5b68bcada61e8..a389153d24f25 100644
--- a/enos/k8s/enos-terraform-k8s.hcl
+++ b/enos/k8s/enos-terraform-k8s.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 terraform "k8s" {
   required_version = ">= 1.2.0"
 
diff --git a/enos/k8s/enos-variables-k8s.hcl b/enos/k8s/enos-variables-k8s.hcl
index 86bf9d5e3642b..fb8983f218429 100644
--- a/enos/k8s/enos-variables-k8s.hcl
+++ b/enos/k8s/enos-variables-k8s.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 variable "vault_image_repository" {
   description = "The repository for the docker image to load, i.e. hashicorp/vault"
   type        = string
diff --git a/enos/modules/autopilot_upgrade_storageconfig/main.tf b/enos/modules/autopilot_upgrade_storageconfig/main.tf
index 68f47d19dd716..6093b8b1066de 100644
--- a/enos/modules/autopilot_upgrade_storageconfig/main.tf
+++ b/enos/modules/autopilot_upgrade_storageconfig/main.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 variable "vault_product_version" {}
 
 output "storage_addl_config" {
diff --git a/enos/modules/az_finder/main.tf b/enos/modules/az_finder/main.tf
index 3508ff0cc39c7..b55975578c61c 100644
--- a/enos/modules/az_finder/main.tf
+++ b/enos/modules/az_finder/main.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 terraform {
   required_providers {
     aws = {
diff --git a/enos/modules/backend_raft/main.tf b/enos/modules/backend_raft/main.tf
index 2e6afa215e9eb..4cb8e58a592bf 100644
--- a/enos/modules/backend_raft/main.tf
+++ b/enos/modules/backend_raft/main.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 // Shim module to handle the fact that Vault doesn't actually need a backend module
 terraform {
   required_providers {
diff --git a/enos/modules/build_crt/main.tf b/enos/modules/build_crt/main.tf
index 1e125763a16d5..cffa44b17a001 100644
--- a/enos/modules/build_crt/main.tf
+++ b/enos/modules/build_crt/main.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 # Shim module since CRT provided things will use the crt_bundle_path variable
 variable "bundle_path" {
   default = "/tmp/vault.zip"
diff --git a/enos/modules/build_local/main.tf b/enos/modules/build_local/main.tf
index a55850076ed3c..11f29585eca77 100644
--- a/enos/modules/build_local/main.tf
+++ b/enos/modules/build_local/main.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 terraform {
   required_providers {
     enos = {
diff --git a/enos/modules/build_local/scripts/build.sh b/enos/modules/build_local/scripts/build.sh
index 64f1bbd8d7d6e..385a3af557040 100755
--- a/enos/modules/build_local/scripts/build.sh
+++ b/enos/modules/build_local/scripts/build.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 set -eux -o pipefail
 
 # Install yarn so we can build the UI
diff --git a/enos/modules/generate_secondary_token/main.tf b/enos/modules/generate_secondary_token/main.tf
index 49a4a15e24c0e..fbba304bd7cb4 100644
--- a/enos/modules/generate_secondary_token/main.tf
+++ b/enos/modules/generate_secondary_token/main.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 terraform {
   required_providers {
     enos = {
diff --git a/enos/modules/get_local_metadata/main.tf b/enos/modules/get_local_metadata/main.tf
index 1c5dc84be9cbc..fd33673470efe 100644
--- a/enos/modules/get_local_metadata/main.tf
+++ b/enos/modules/get_local_metadata/main.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 terraform {
   required_providers {
     enos = {
diff --git a/enos/modules/get_local_metadata/scripts/build_date.sh b/enos/modules/get_local_metadata/scripts/build_date.sh
index fc763fd4e91a9..917888eb1cbfa 100755
--- a/enos/modules/get_local_metadata/scripts/build_date.sh
+++ b/enos/modules/get_local_metadata/scripts/build_date.sh
@@ -1,7 +1,4 @@
 #!/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 set -eu -o pipefail
 
 pushd "$(git rev-parse --show-toplevel)" > /dev/null
diff --git a/enos/modules/get_local_metadata/scripts/version.sh b/enos/modules/get_local_metadata/scripts/version.sh
index 74a561f11bd8e..6921d772ea467 100755
--- a/enos/modules/get_local_metadata/scripts/version.sh
+++ b/enos/modules/get_local_metadata/scripts/version.sh
@@ -1,7 +1,4 @@
 #!/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 set -eu -o pipefail
 
 pushd "$(git rev-parse --show-toplevel)" > /dev/null
diff --git a/enos/modules/get_local_version_from_make/main.tf b/enos/modules/get_local_version_from_make/main.tf
new file mode 100644
index 0000000000000..a7dcf6be7f2ab
--- /dev/null
+++ b/enos/modules/get_local_version_from_make/main.tf
@@ -0,0 +1,15 @@
+terraform {
+  required_providers {
+    enos = {
+      source = "app.terraform.io/hashicorp-qti/enos"
+    }
+  }
+}
+
+resource "enos_local_exec" "get_version" {
+  scripts = ["${path.module}/scripts/version.sh"]
+}
+
+output "version" {
+  value = trimspace(enos_local_exec.get_version.stdout)
+}
diff --git a/enos/modules/get_local_version_from_make/scripts/version.sh b/enos/modules/get_local_version_from_make/scripts/version.sh
new file mode 100755
index 0000000000000..13970ead9752c
--- /dev/null
+++ b/enos/modules/get_local_version_from_make/scripts/version.sh
@@ -0,0 +1,10 @@
+#!/bin/env bash
+set -eu -o pipefail
+
+# Set up the environment for building Vault.
+root_dir="$(git rev-parse --show-toplevel)"
+
+pushd "$root_dir" > /dev/null
+
+IFS="-" read -r VAULT_VERSION _other <<< "$(make version)"
+echo $VAULT_VERSION
diff --git a/enos/modules/k8s_deploy_vault/main.tf b/enos/modules/k8s_deploy_vault/main.tf
index 72f4f4700354f..1878ebeb72596 100644
--- a/enos/modules/k8s_deploy_vault/main.tf
+++ b/enos/modules/k8s_deploy_vault/main.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 terraform {
   required_version = ">= 1.0"
 
diff --git a/enos/modules/k8s_deploy_vault/variables.tf b/enos/modules/k8s_deploy_vault/variables.tf
index 55fa6f1da6b9a..e9867d7fa0fb7 100644
--- a/enos/modules/k8s_deploy_vault/variables.tf
+++ b/enos/modules/k8s_deploy_vault/variables.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 variable "context_name" {
   type        = string
   description = "The name of the k8s context for Vault"
diff --git a/enos/modules/k8s_vault_verify_build_date/main.tf b/enos/modules/k8s_vault_verify_build_date/main.tf
index 366497d08475c..38f17fbc9e797 100644
--- a/enos/modules/k8s_vault_verify_build_date/main.tf
+++ b/enos/modules/k8s_vault_verify_build_date/main.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 terraform {
   required_providers {
diff --git a/enos/modules/k8s_vault_verify_build_date/variables.tf b/enos/modules/k8s_vault_verify_build_date/variables.tf
index d960b7840e3e4..7bba75ba68d82 100644
--- a/enos/modules/k8s_vault_verify_build_date/variables.tf
+++ b/enos/modules/k8s_vault_verify_build_date/variables.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 variable "vault_instance_count" {
   type        = number
   description = "How many vault instances are in the cluster"
diff --git a/enos/modules/k8s_vault_verify_replication/main.tf b/enos/modules/k8s_vault_verify_replication/main.tf
index 27824dc7676b6..804b934591f1c 100644
--- a/enos/modules/k8s_vault_verify_replication/main.tf
+++ b/enos/modules/k8s_vault_verify_replication/main.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 terraform {
   required_providers {
diff --git a/enos/modules/k8s_vault_verify_replication/scripts/smoke-verify-replication.sh b/enos/modules/k8s_vault_verify_replication/scripts/smoke-verify-replication.sh
index 5786502cbcdd2..363ce7185845b 100755
--- a/enos/modules/k8s_vault_verify_replication/scripts/smoke-verify-replication.sh
+++ b/enos/modules/k8s_vault_verify_replication/scripts/smoke-verify-replication.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/env bash 
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 # The Vault replication smoke test, documented in
 # https://docs.google.com/document/d/16sjIk3hzFDPyY5A9ncxTZV_9gnpYSF1_Vx6UA1iiwgI/edit#heading=h.kgrxf0f1et25
diff --git a/enos/modules/k8s_vault_verify_replication/variables.tf b/enos/modules/k8s_vault_verify_replication/variables.tf
index 7d4337801defa..42ab38aa572bb 100644
--- a/enos/modules/k8s_vault_verify_replication/variables.tf
+++ b/enos/modules/k8s_vault_verify_replication/variables.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 variable "vault_instance_count" {
   type        = number
   description = "How many vault instances are in the cluster"
diff --git a/enos/modules/k8s_vault_verify_ui/main.tf b/enos/modules/k8s_vault_verify_ui/main.tf
index ce5796096771f..faccb7085870d 100644
--- a/enos/modules/k8s_vault_verify_ui/main.tf
+++ b/enos/modules/k8s_vault_verify_ui/main.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 terraform {
   required_providers {
diff --git a/enos/modules/k8s_vault_verify_ui/scripts/smoke-verify-ui.sh b/enos/modules/k8s_vault_verify_ui/scripts/smoke-verify-ui.sh
index f6b8a278dce72..b85d4da124737 100755
--- a/enos/modules/k8s_vault_verify_ui/scripts/smoke-verify-ui.sh
+++ b/enos/modules/k8s_vault_verify_ui/scripts/smoke-verify-ui.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 set -e
 
diff --git a/enos/modules/k8s_vault_verify_ui/variables.tf b/enos/modules/k8s_vault_verify_ui/variables.tf
index c39f24e1fa2e5..6c06d5de792ec 100644
--- a/enos/modules/k8s_vault_verify_ui/variables.tf
+++ b/enos/modules/k8s_vault_verify_ui/variables.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 variable "vault_instance_count" {
   type        = number
   description = "How many vault instances are in the cluster"
diff --git a/enos/modules/k8s_vault_verify_version/main.tf b/enos/modules/k8s_vault_verify_version/main.tf
index 8decaaa778489..693abf97910f2 100644
--- a/enos/modules/k8s_vault_verify_version/main.tf
+++ b/enos/modules/k8s_vault_verify_version/main.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 terraform {
   required_providers {
diff --git a/enos/modules/k8s_vault_verify_version/scripts/get-status.sh b/enos/modules/k8s_vault_verify_version/scripts/get-status.sh
index a799ebc66f3fb..3d2d1fe97506a 100755
--- a/enos/modules/k8s_vault_verify_version/scripts/get-status.sh
+++ b/enos/modules/k8s_vault_verify_version/scripts/get-status.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/env sh
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 set -e
 
diff --git a/enos/modules/k8s_vault_verify_version/scripts/smoke-verify-version.sh b/enos/modules/k8s_vault_verify_version/scripts/smoke-verify-version.sh
index 514969cf50985..d5c439a9b264c 100755
--- a/enos/modules/k8s_vault_verify_version/scripts/smoke-verify-version.sh
+++ b/enos/modules/k8s_vault_verify_version/scripts/smoke-verify-version.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 # The Vault smoke test to verify the Vault version installed
 
diff --git a/enos/modules/k8s_vault_verify_version/variables.tf b/enos/modules/k8s_vault_verify_version/variables.tf
index 58940a8551bda..ed487831a3c06 100644
--- a/enos/modules/k8s_vault_verify_version/variables.tf
+++ b/enos/modules/k8s_vault_verify_version/variables.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 variable "vault_instance_count" {
   type        = number
   description = "How many vault instances are in the cluster"
diff --git a/enos/modules/k8s_vault_verify_write_data/main.tf b/enos/modules/k8s_vault_verify_write_data/main.tf
index 5606b89883521..01caeaba4c158 100644
--- a/enos/modules/k8s_vault_verify_write_data/main.tf
+++ b/enos/modules/k8s_vault_verify_write_data/main.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 terraform {
   required_providers {
diff --git a/enos/modules/k8s_vault_verify_write_data/variables.tf b/enos/modules/k8s_vault_verify_write_data/variables.tf
index d960b7840e3e4..7bba75ba68d82 100644
--- a/enos/modules/k8s_vault_verify_write_data/variables.tf
+++ b/enos/modules/k8s_vault_verify_write_data/variables.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 variable "vault_instance_count" {
   type        = number
   description = "How many vault instances are in the cluster"
diff --git a/enos/modules/load_docker_image/main.tf b/enos/modules/load_docker_image/main.tf
index 4e5f293f90843..854c52f9ea690 100644
--- a/enos/modules/load_docker_image/main.tf
+++ b/enos/modules/load_docker_image/main.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 terraform {
   required_providers {
     enos = {
diff --git a/enos/modules/local_kind_cluster/main.tf b/enos/modules/local_kind_cluster/main.tf
index 5a351679b2e25..c5da14daf770a 100644
--- a/enos/modules/local_kind_cluster/main.tf
+++ b/enos/modules/local_kind_cluster/main.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 terraform {
   required_providers {
     enos = {
diff --git a/enos/modules/read_license/main.tf b/enos/modules/read_license/main.tf
index a1358b3e293d9..1b645272abe7c 100644
--- a/enos/modules/read_license/main.tf
+++ b/enos/modules/read_license/main.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 variable "file_name" {}
 
 output "license" {
diff --git a/enos/modules/shutdown_multiple_nodes/main.tf b/enos/modules/shutdown_multiple_nodes/main.tf
index 86045db0bc255..df0d1fb876001 100644
--- a/enos/modules/shutdown_multiple_nodes/main.tf
+++ b/enos/modules/shutdown_multiple_nodes/main.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 terraform {
   required_providers {
     enos = {
diff --git a/enos/modules/shutdown_node/main.tf b/enos/modules/shutdown_node/main.tf
index f27de68534e84..0ab4617e16300 100644
--- a/enos/modules/shutdown_node/main.tf
+++ b/enos/modules/shutdown_node/main.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 terraform {
   required_providers {
     enos = {
diff --git a/enos/modules/vault-verify-replication/main.tf b/enos/modules/vault-verify-replication/main.tf
new file mode 100644
index 0000000000000..57a97f9ddd1b7
--- /dev/null
+++ b/enos/modules/vault-verify-replication/main.tf
@@ -0,0 +1,31 @@
+
+terraform {
+  required_providers {
+    enos = {
+      source = "app.terraform.io/hashicorp-qti/enos"
+    }
+  }
+}
+
+locals {
+  instances = {
+    for idx in range(var.vault_instance_count) : idx => {
+      public_ip  = values(var.vault_instances)[idx].public_ip
+      private_ip = values(var.vault_instances)[idx].private_ip
+    }
+  }
+}
+
+resource "enos_remote_exec" "smoke-verify-replication" {
+  for_each = local.instances
+
+  content = templatefile("${path.module}/templates/smoke-verify-replication.sh", {
+    vault_edition = var.vault_edition
+  })
+
+  transport = {
+    ssh = {
+      host = each.value.public_ip
+    }
+  }
+}
diff --git a/enos/modules/vault-verify-replication/templates/smoke-verify-replication.sh b/enos/modules/vault-verify-replication/templates/smoke-verify-replication.sh
new file mode 100644
index 0000000000000..d7bc72f23c246
--- /dev/null
+++ b/enos/modules/vault-verify-replication/templates/smoke-verify-replication.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+
+# The Vault replication smoke test, documented in
+# https://docs.google.com/document/d/16sjIk3hzFDPyY5A9ncxTZV_9gnpYSF1_Vx6UA1iiwgI/edit#heading=h.kgrxf0f1et25
+
+set -e
+
+edition=${vault_edition}
+
+function fail() {
+	echo "$1" 1>&2
+	exit 1
+}
+
+# Replication status endpoint should have data.mode disabled for OSS release
+status=$(curl -s http://localhost:8200/v1/sys/replication/status)
+if [ "$edition" == "oss" ]; then
+  if [ "$(jq -r '.data.mode' <<< "$status")" != "disabled" ]; then
+    fail "replication data mode is not disabled for OSS release!"
+  fi
+else
+  if [ "$(jq -r '.data.dr' <<< "$status")" == "" ]; then
+    fail "DR replication should be available for an ENT release!"
+  fi
+  if [ "$(jq -r '.data.performance' <<< "$status")" == "" ]; then
+    fail "Performance replication should be available for an ENT release!"
+  fi
+fi
diff --git a/enos/modules/vault-verify-replication/variables.tf b/enos/modules/vault-verify-replication/variables.tf
new file mode 100644
index 0000000000000..b335ee45efcef
--- /dev/null
+++ b/enos/modules/vault-verify-replication/variables.tf
@@ -0,0 +1,24 @@
+
+variable "vault_edition" {
+  type        = string
+  description = "The vault product edition"
+  default     = null
+}
+
+variable "vault_install_dir" {
+  type        = string
+  description = "The directory where the Vault binary will be installed"
+}
+
+variable "vault_instance_count" {
+  type        = number
+  description = "How many vault instances are in the cluster"
+}
+
+variable "vault_instances" {
+  type = map(object({
+    private_ip = string
+    public_ip  = string
+  }))
+  description = "The vault cluster instances that were created"
+}
diff --git a/enos/modules/vault-verify-ui/main.tf b/enos/modules/vault-verify-ui/main.tf
new file mode 100644
index 0000000000000..5703326d1a510
--- /dev/null
+++ b/enos/modules/vault-verify-ui/main.tf
@@ -0,0 +1,31 @@
+
+terraform {
+  required_providers {
+    enos = {
+      source = "app.terraform.io/hashicorp-qti/enos"
+    }
+  }
+}
+
+locals {
+  instances = {
+    for idx in range(var.vault_instance_count) : idx => {
+      public_ip  = values(var.vault_instances)[idx].public_ip
+      private_ip = values(var.vault_instances)[idx].private_ip
+    }
+  }
+}
+
+resource "enos_remote_exec" "smoke-verify-ui" {
+  for_each = local.instances
+
+  content = templatefile("${path.module}/templates/smoke-verify-ui.sh", {
+    vault_install_dir = var.vault_install_dir,
+  })
+
+  transport = {
+    ssh = {
+      host = each.value.public_ip
+    }
+  }
+}
diff --git a/enos/modules/vault-verify-ui/templates/smoke-verify-ui.sh b/enos/modules/vault-verify-ui/templates/smoke-verify-ui.sh
new file mode 100644
index 0000000000000..bcd7e1cc3055e
--- /dev/null
+++ b/enos/modules/vault-verify-ui/templates/smoke-verify-ui.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+set -e
+
+fail() {
+	echo "$1" 1>&2
+	exit 1
+}
+if [ "$(curl -s -o /dev/null -w "%%{redirect_url}" http://localhost:8200/)" != "http://localhost:8200/ui/" ]; then
+    fail "Port 8200 not redirecting to UI"
+fi
+if curl -s http://localhost:8200/ui/ | grep -q 'Vault UI is not available'; then
+    fail "Vault UI is not available"
+fi
diff --git a/enos/modules/vault-verify-ui/variables.tf b/enos/modules/vault-verify-ui/variables.tf
new file mode 100644
index 0000000000000..7eaf5d1bf7f4a
--- /dev/null
+++ b/enos/modules/vault-verify-ui/variables.tf
@@ -0,0 +1,19 @@
+
+variable "vault_install_dir" {
+  type        = string
+  description = "The directory where the Vault binary will be installed"
+  default     = null
+}
+
+variable "vault_instance_count" {
+  type        = number
+  description = "How many vault instances are in the cluster"
+}
+
+variable "vault_instances" {
+  type = map(object({
+    private_ip = string
+    public_ip  = string
+  }))
+  description = "The vault cluster instances that were created"
+}
diff --git a/enos/modules/vault-verify-write-data/main.tf b/enos/modules/vault-verify-write-data/main.tf
new file mode 100644
index 0000000000000..966e833f740b0
--- /dev/null
+++ b/enos/modules/vault-verify-write-data/main.tf
@@ -0,0 +1,50 @@
+
+terraform {
+  required_providers {
+    enos = {
+      source = "app.terraform.io/hashicorp-qti/enos"
+    }
+  }
+}
+
+locals {
+  instances = {
+    for idx in range(var.vault_instance_count) : idx => {
+      public_ip  = values(var.vault_instances)[idx].public_ip
+      private_ip = values(var.vault_instances)[idx].private_ip
+    }
+  }
+}
+
+resource "enos_remote_exec" "smoke-enable-secrets-kv" {
+
+  content = templatefile("${path.module}/templates/smoke-enable-secrets-kv.sh", {
+    vault_install_dir = var.vault_install_dir,
+    vault_token       = var.vault_root_token,
+  })
+
+  transport = {
+    ssh = {
+      host = local.instances[0].public_ip
+    }
+  }
+}
+
+# Verify that we can enable the k/v secrets engine and write data to it.
+resource "enos_remote_exec" "smoke-write-test-data" {
+  depends_on = [enos_remote_exec.smoke-enable-secrets-kv]
+  for_each   = local.instances
+
+  content = templatefile("${path.module}/templates/smoke-write-test-data.sh", {
+    test_key          = "smoke${each.key}"
+    test_value        = "fire"
+    vault_install_dir = var.vault_install_dir,
+    vault_token       = var.vault_root_token,
+  })
+
+  transport = {
+    ssh = {
+      host = each.value.public_ip
+    }
+  }
+}
diff --git a/enos/modules/vault-verify-write-data/templates/smoke-enable-secrets-kv.sh b/enos/modules/vault-verify-write-data/templates/smoke-enable-secrets-kv.sh
new file mode 100644
index 0000000000000..fb28fd9a8240e
--- /dev/null
+++ b/enos/modules/vault-verify-write-data/templates/smoke-enable-secrets-kv.sh
@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+set -e
+
+function retry {
+  local retries=$1
+  shift
+  local count=0
+
+  until "$@"; do
+    exit=$?
+    wait=$((2 ** count))
+    count=$((count + 1))
+    if [ "$count" -lt "$retries" ]; then
+      sleep "$wait"
+    else
+      return "$exit"
+    fi
+  done
+
+  return 0
+}
+
+function fail {
+	echo "$1" 1>&2
+	exit 1
+}
+
+binpath=${vault_install_dir}/vault
+
+test -x "$binpath" || fail "unable to locate vault binary at $binpath"
+
+export VAULT_ADDR='http://127.0.0.1:8200'
+export VAULT_TOKEN='${vault_token}'
+
+retry 5 "$binpath" status > /dev/null 2>&1
+retry 5 $binpath secrets enable -path="secret" kv
diff --git a/enos/modules/vault-verify-write-data/templates/smoke-write-test-data.sh b/enos/modules/vault-verify-write-data/templates/smoke-write-test-data.sh
new file mode 100644
index 0000000000000..d514881425a1e
--- /dev/null
+++ b/enos/modules/vault-verify-write-data/templates/smoke-write-test-data.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+
+set -e
+
+function retry {
+  local retries=$1
+  shift
+  local count=0
+
+  until "$@"; do
+    exit=$?
+    wait=$((2 ** count))
+    count=$((count + 1))
+    if [ "$count" -lt "$retries" ]; then
+      sleep "$wait"
+    else
+      return "$exit"
+    fi
+  done
+
+  return 0
+}
+
+function fail {
+	echo "$1" 1>&2
+	exit 1
+}
+
+binpath=${vault_install_dir}/vault
+testkey=${test_key}
+testvalue=${test_value}
+
+test -x "$binpath" || fail "unable to locate vault binary at $binpath"
+
+export VAULT_ADDR='http://127.0.0.1:8200'
+export VAULT_TOKEN='${vault_token}'
+
+retry 5 "$binpath" status > /dev/null 2>&1
+retry 5 $binpath kv put secret/test $testkey=$testvalue
diff --git a/enos/modules/vault-verify-write-data/variables.tf b/enos/modules/vault-verify-write-data/variables.tf
new file mode 100644
index 0000000000000..ac00f1091fcba
--- /dev/null
+++ b/enos/modules/vault-verify-write-data/variables.tf
@@ -0,0 +1,25 @@
+
+variable "vault_install_dir" {
+  type        = string
+  description = "The directory where the Vault binary will be installed"
+  default     = null
+}
+
+variable "vault_instance_count" {
+  type        = number
+  description = "How many vault instances are in the cluster"
+}
+
+variable "vault_instances" {
+  type = map(object({
+    private_ip = string
+    public_ip  = string
+  }))
+  description = "The vault cluster instances that were created"
+}
+
+variable "vault_root_token" {
+  type        = string
+  description = "The vault root token"
+  default     = null
+}
diff --git a/enos/modules/vault_agent/main.tf b/enos/modules/vault_agent/main.tf
index cb112020b3903..001a53278a27a 100644
--- a/enos/modules/vault_agent/main.tf
+++ b/enos/modules/vault_agent/main.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 terraform {
   required_providers {
     aws = {
diff --git a/enos/modules/vault_agent/templates/set-up-approle-and-agent.sh b/enos/modules/vault_agent/templates/set-up-approle-and-agent.sh
index 42a0976416423..5444508de3036 100644
--- a/enos/modules/vault_agent/templates/set-up-approle-and-agent.sh
+++ b/enos/modules/vault_agent/templates/set-up-approle-and-agent.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 set -e
 
diff --git a/enos/modules/vault_artifactory_artifact/locals.tf b/enos/modules/vault_artifactory_artifact/locals.tf
index 708813faa4541..e022a62c3966e 100644
--- a/enos/modules/vault_artifactory_artifact/locals.tf
+++ b/enos/modules/vault_artifactory_artifact/locals.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 locals {
 
   // file name extensions for the install packages of vault for the various architectures, distributions and editions
diff --git a/enos/modules/vault_artifactory_artifact/main.tf b/enos/modules/vault_artifactory_artifact/main.tf
index 0f0df3865c7ad..ebc517030ba1e 100644
--- a/enos/modules/vault_artifactory_artifact/main.tf
+++ b/enos/modules/vault_artifactory_artifact/main.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 terraform {
   required_providers {
     enos = {
diff --git a/enos/modules/vault_artifactory_artifact/outputs.tf b/enos/modules/vault_artifactory_artifact/outputs.tf
index c100c45ddd979..827b2e7734158 100644
--- a/enos/modules/vault_artifactory_artifact/outputs.tf
+++ b/enos/modules/vault_artifactory_artifact/outputs.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 output "url" {
   value       = data.enos_artifactory_item.vault.results[0].url
diff --git a/enos/modules/vault_artifactory_artifact/variables.tf b/enos/modules/vault_artifactory_artifact/variables.tf
index 7b641ce98f957..778354e7deeab 100644
--- a/enos/modules/vault_artifactory_artifact/variables.tf
+++ b/enos/modules/vault_artifactory_artifact/variables.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 variable "artifactory_username" {
   type        = string
diff --git a/enos/modules/vault_get_cluster_ips/main.tf b/enos/modules/vault_get_cluster_ips/main.tf
index 25a8902108e13..a288798e60d7d 100644
--- a/enos/modules/vault_get_cluster_ips/main.tf
+++ b/enos/modules/vault_get_cluster_ips/main.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 terraform {
   required_providers {
     enos = {
diff --git a/enos/modules/vault_get_cluster_ips/scripts/get-leader-private-ip.sh b/enos/modules/vault_get_cluster_ips/scripts/get-leader-private-ip.sh
index 98b2d21fdda6c..360e9d79d6a84 100644
--- a/enos/modules/vault_get_cluster_ips/scripts/get-leader-private-ip.sh
+++ b/enos/modules/vault_get_cluster_ips/scripts/get-leader-private-ip.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 set -e
 
diff --git a/enos/modules/vault_raft_remove_peer/main.tf b/enos/modules/vault_raft_remove_peer/main.tf
index a0da72249e1fd..f1d33d9c0337b 100644
--- a/enos/modules/vault_raft_remove_peer/main.tf
+++ b/enos/modules/vault_raft_remove_peer/main.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 terraform {
   required_providers {
     enos = {
diff --git a/enos/modules/vault_raft_remove_peer/templates/raft-remove-peer.sh b/enos/modules/vault_raft_remove_peer/templates/raft-remove-peer.sh
index ab49f76ba8204..6d967ee30d5e6 100644
--- a/enos/modules/vault_raft_remove_peer/templates/raft-remove-peer.sh
+++ b/enos/modules/vault_raft_remove_peer/templates/raft-remove-peer.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 set -e
 
diff --git a/enos/modules/vault_setup_perf_primary/main.tf b/enos/modules/vault_setup_perf_primary/main.tf
index 268a5323ccf1d..85f5cc910c764 100644
--- a/enos/modules/vault_setup_perf_primary/main.tf
+++ b/enos/modules/vault_setup_perf_primary/main.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 terraform {
   required_providers {
     enos = {
diff --git a/enos/modules/vault_setup_perf_primary/scripts/configure-vault-pr-primary.sh b/enos/modules/vault_setup_perf_primary/scripts/configure-vault-pr-primary.sh
index d15699c4b9667..679729f3f5a3d 100644
--- a/enos/modules/vault_setup_perf_primary/scripts/configure-vault-pr-primary.sh
+++ b/enos/modules/vault_setup_perf_primary/scripts/configure-vault-pr-primary.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 set -e
 
diff --git a/enos/modules/vault_setup_perf_secondary/main.tf b/enos/modules/vault_setup_perf_secondary/main.tf
index 3be3ca8897f7f..1fac54b94d2c6 100644
--- a/enos/modules/vault_setup_perf_secondary/main.tf
+++ b/enos/modules/vault_setup_perf_secondary/main.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 terraform {
   required_providers {
     enos = {
diff --git a/enos/modules/vault_test_ui/main.tf b/enos/modules/vault_test_ui/main.tf
index 0e051bdf48cff..2af426232e46b 100644
--- a/enos/modules/vault_test_ui/main.tf
+++ b/enos/modules/vault_test_ui/main.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 terraform {
   required_providers {
     enos = {
diff --git a/enos/modules/vault_test_ui/outputs.tf b/enos/modules/vault_test_ui/outputs.tf
index 887d030a7899d..abe4924cebe7d 100644
--- a/enos/modules/vault_test_ui/outputs.tf
+++ b/enos/modules/vault_test_ui/outputs.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 output "ui_test_stderr" {
   value = var.ui_run_tests ? enos_local_exec.test_ui[0].stderr : "No std out tests where not run"
 }
diff --git a/enos/modules/vault_test_ui/scripts/test_ui.sh b/enos/modules/vault_test_ui/scripts/test_ui.sh
index e7cf7e9564ed9..f84cb929f878d 100755
--- a/enos/modules/vault_test_ui/scripts/test_ui.sh
+++ b/enos/modules/vault_test_ui/scripts/test_ui.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 set -eux -o pipefail
 
diff --git a/enos/modules/vault_test_ui/variables.tf b/enos/modules/vault_test_ui/variables.tf
index c2db5c57b9bba..807cf01aea7fa 100644
--- a/enos/modules/vault_test_ui/variables.tf
+++ b/enos/modules/vault_test_ui/variables.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 variable "vault_addr" {
   description = "The host address for the vault instance to test"
   type        = string
diff --git a/enos/modules/vault_unseal_nodes/main.tf b/enos/modules/vault_unseal_nodes/main.tf
index b8b86b3ba9900..2bd1c6c0fbf38 100644
--- a/enos/modules/vault_unseal_nodes/main.tf
+++ b/enos/modules/vault_unseal_nodes/main.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 # This module unseals the replication secondary follower nodes
 terraform {
   required_providers {
diff --git a/enos/modules/vault_unseal_nodes/scripts/unseal-node.sh b/enos/modules/vault_unseal_nodes/scripts/unseal-node.sh
index b3f77de5041cf..6fe00a93de295 100755
--- a/enos/modules/vault_unseal_nodes/scripts/unseal-node.sh
+++ b/enos/modules/vault_unseal_nodes/scripts/unseal-node.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 binpath=${VAULT_INSTALL_DIR}/vault
 
diff --git a/enos/modules/vault_unseal_nodes/scripts/wait-until-sealed.sh b/enos/modules/vault_unseal_nodes/scripts/wait-until-sealed.sh
index af935578781ac..d0ebb1f067caf 100644
--- a/enos/modules/vault_unseal_nodes/scripts/wait-until-sealed.sh
+++ b/enos/modules/vault_unseal_nodes/scripts/wait-until-sealed.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 binpath=${VAULT_INSTALL_DIR}/vault
 
diff --git a/enos/modules/vault_upgrade/main.tf b/enos/modules/vault_upgrade/main.tf
index 5502212d51518..07e65bf197f96 100644
--- a/enos/modules/vault_upgrade/main.tf
+++ b/enos/modules/vault_upgrade/main.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 terraform {
   required_providers {
     aws = {
diff --git a/enos/modules/vault_upgrade/templates/get-follower-public-ips.sh b/enos/modules/vault_upgrade/templates/get-follower-public-ips.sh
index 127be64499cf3..e424aa44406ce 100644
--- a/enos/modules/vault_upgrade/templates/get-follower-public-ips.sh
+++ b/enos/modules/vault_upgrade/templates/get-follower-public-ips.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 set -e
 
diff --git a/enos/modules/vault_upgrade/templates/get-leader-public-ip.sh b/enos/modules/vault_upgrade/templates/get-leader-public-ip.sh
index d64a6c16ed366..5c36dae336f5c 100644
--- a/enos/modules/vault_upgrade/templates/get-leader-public-ip.sh
+++ b/enos/modules/vault_upgrade/templates/get-leader-public-ip.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 set -e
 
diff --git a/enos/modules/vault_upgrade/templates/restart-vault.sh b/enos/modules/vault_upgrade/templates/restart-vault.sh
index fc6b007a35097..aa68536430560 100644
--- a/enos/modules/vault_upgrade/templates/restart-vault.sh
+++ b/enos/modules/vault_upgrade/templates/restart-vault.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 set -eux
 
diff --git a/enos/modules/vault_verify_agent_output/main.tf b/enos/modules/vault_verify_agent_output/main.tf
index 850ea5366c1e6..6643c8b626620 100644
--- a/enos/modules/vault_verify_agent_output/main.tf
+++ b/enos/modules/vault_verify_agent_output/main.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 terraform {
   required_providers {
     enos = {
diff --git a/enos/modules/vault_verify_agent_output/templates/verify-vault-agent-output.sh b/enos/modules/vault_verify_agent_output/templates/verify-vault-agent-output.sh
index cd25a01c8d021..3c434ba972762 100644
--- a/enos/modules/vault_verify_agent_output/templates/verify-vault-agent-output.sh
+++ b/enos/modules/vault_verify_agent_output/templates/verify-vault-agent-output.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 set -e
 
diff --git a/enos/modules/vault_verify_autopilot/main.tf b/enos/modules/vault_verify_autopilot/main.tf
index b1d050af29595..ca03ea6f6f29c 100644
--- a/enos/modules/vault_verify_autopilot/main.tf
+++ b/enos/modules/vault_verify_autopilot/main.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 terraform {
   required_providers {
     enos = {
diff --git a/enos/modules/vault_verify_autopilot/templates/smoke-verify-autopilot.sh b/enos/modules/vault_verify_autopilot/templates/smoke-verify-autopilot.sh
index 129288a3cd212..1dd5d90147100 100755
--- a/enos/modules/vault_verify_autopilot/templates/smoke-verify-autopilot.sh
+++ b/enos/modules/vault_verify_autopilot/templates/smoke-verify-autopilot.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 token="${vault_token}"
 autopilot_version="${vault_autopilot_upgrade_version}"
diff --git a/enos/modules/vault_verify_performance_replication/main.tf b/enos/modules/vault_verify_performance_replication/main.tf
index 6604f8c126eaf..a44eec5b0dc6b 100644
--- a/enos/modules/vault_verify_performance_replication/main.tf
+++ b/enos/modules/vault_verify_performance_replication/main.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 terraform {
   required_providers {
     enos = {
diff --git a/enos/modules/vault_verify_raft_auto_join_voter/main.tf b/enos/modules/vault_verify_raft_auto_join_voter/main.tf
index 44df4496ab9e5..ded9c3cc7007f 100644
--- a/enos/modules/vault_verify_raft_auto_join_voter/main.tf
+++ b/enos/modules/vault_verify_raft_auto_join_voter/main.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 terraform {
   required_providers {
     enos = {
diff --git a/enos/modules/vault_verify_raft_auto_join_voter/templates/verify-raft-auto-join-voter.sh b/enos/modules/vault_verify_raft_auto_join_voter/templates/verify-raft-auto-join-voter.sh
index 3187ac69fbf00..e1172d7158f61 100644
--- a/enos/modules/vault_verify_raft_auto_join_voter/templates/verify-raft-auto-join-voter.sh
+++ b/enos/modules/vault_verify_raft_auto_join_voter/templates/verify-raft-auto-join-voter.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 set -e
 
diff --git a/enos/modules/vault_verify_read_data/main.tf b/enos/modules/vault_verify_read_data/main.tf
index 8a4d7ea7ace5f..a104e1d677a06 100644
--- a/enos/modules/vault_verify_read_data/main.tf
+++ b/enos/modules/vault_verify_read_data/main.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 terraform {
   required_providers {
     enos = {
diff --git a/enos/modules/vault_verify_read_data/scripts/verify-data.sh b/enos/modules/vault_verify_read_data/scripts/verify-data.sh
index 5c095c58caf8e..d150d8f7efc41 100644
--- a/enos/modules/vault_verify_read_data/scripts/verify-data.sh
+++ b/enos/modules/vault_verify_read_data/scripts/verify-data.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 set -e
 
diff --git a/enos/modules/vault_verify_replication/main.tf b/enos/modules/vault_verify_replication/main.tf
index fbb360a38da4c..57a97f9ddd1b7 100644
--- a/enos/modules/vault_verify_replication/main.tf
+++ b/enos/modules/vault_verify_replication/main.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 terraform {
   required_providers {
diff --git a/enos/modules/vault_verify_replication/templates/smoke-verify-replication.sh b/enos/modules/vault_verify_replication/templates/smoke-verify-replication.sh
index 1ef6207a37eb8..d7bc72f23c246 100644
--- a/enos/modules/vault_verify_replication/templates/smoke-verify-replication.sh
+++ b/enos/modules/vault_verify_replication/templates/smoke-verify-replication.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 # The Vault replication smoke test, documented in
 # https://docs.google.com/document/d/16sjIk3hzFDPyY5A9ncxTZV_9gnpYSF1_Vx6UA1iiwgI/edit#heading=h.kgrxf0f1et25
diff --git a/enos/modules/vault_verify_replication/variables.tf b/enos/modules/vault_verify_replication/variables.tf
index 26ac75c912916..b335ee45efcef 100644
--- a/enos/modules/vault_verify_replication/variables.tf
+++ b/enos/modules/vault_verify_replication/variables.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 variable "vault_edition" {
   type        = string
diff --git a/enos/modules/vault_verify_ui/main.tf b/enos/modules/vault_verify_ui/main.tf
index 32986072cba77..5703326d1a510 100644
--- a/enos/modules/vault_verify_ui/main.tf
+++ b/enos/modules/vault_verify_ui/main.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 terraform {
   required_providers {
diff --git a/enos/modules/vault_verify_ui/templates/smoke-verify-ui.sh b/enos/modules/vault_verify_ui/templates/smoke-verify-ui.sh
index 2ec23a107332b..bcd7e1cc3055e 100644
--- a/enos/modules/vault_verify_ui/templates/smoke-verify-ui.sh
+++ b/enos/modules/vault_verify_ui/templates/smoke-verify-ui.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 set -e
 
diff --git a/enos/modules/vault_verify_ui/variables.tf b/enos/modules/vault_verify_ui/variables.tf
index 344f0d8077d7b..7eaf5d1bf7f4a 100644
--- a/enos/modules/vault_verify_ui/variables.tf
+++ b/enos/modules/vault_verify_ui/variables.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 variable "vault_install_dir" {
   type        = string
diff --git a/enos/modules/vault_verify_undo_logs/main.tf b/enos/modules/vault_verify_undo_logs/main.tf
index 717d90735fd07..c856ca4c92c59 100644
--- a/enos/modules/vault_verify_undo_logs/main.tf
+++ b/enos/modules/vault_verify_undo_logs/main.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 terraform {
   required_providers {
     enos = {
diff --git a/enos/modules/vault_verify_undo_logs/scripts/smoke-verify-undo-logs.sh b/enos/modules/vault_verify_undo_logs/scripts/smoke-verify-undo-logs.sh
index ec308dd8bbaf0..5761ea1d74741 100644
--- a/enos/modules/vault_verify_undo_logs/scripts/smoke-verify-undo-logs.sh
+++ b/enos/modules/vault_verify_undo_logs/scripts/smoke-verify-undo-logs.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 function fail() {
 	echo "$1" 1>&2
diff --git a/enos/modules/vault_verify_unsealed/main.tf b/enos/modules/vault_verify_unsealed/main.tf
index 45d15418a6327..0b615295cea69 100644
--- a/enos/modules/vault_verify_unsealed/main.tf
+++ b/enos/modules/vault_verify_unsealed/main.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 terraform {
   required_providers {
     enos = {
diff --git a/enos/modules/vault_verify_unsealed/templates/verify-vault-node-unsealed.sh b/enos/modules/vault_verify_unsealed/templates/verify-vault-node-unsealed.sh
index c69c253ba4c1a..aefc75ec117a0 100644
--- a/enos/modules/vault_verify_unsealed/templates/verify-vault-node-unsealed.sh
+++ b/enos/modules/vault_verify_unsealed/templates/verify-vault-node-unsealed.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 set -e
 
diff --git a/enos/modules/vault_verify_version/main.tf b/enos/modules/vault_verify_version/main.tf
index 88b4e7a00d42d..9e80f456c3b5a 100644
--- a/enos/modules/vault_verify_version/main.tf
+++ b/enos/modules/vault_verify_version/main.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 terraform {
   required_providers {
     enos = {
diff --git a/enos/modules/vault_verify_version/templates/verify-cluster-version.sh b/enos/modules/vault_verify_version/templates/verify-cluster-version.sh
index ba5df7488580f..3fd2102351714 100644
--- a/enos/modules/vault_verify_version/templates/verify-cluster-version.sh
+++ b/enos/modules/vault_verify_version/templates/verify-cluster-version.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 # Verify the Vault "version" includes the correct base version, build date,
 # revision SHA, and edition metadata.
diff --git a/enos/modules/vault_verify_write_data/main.tf b/enos/modules/vault_verify_write_data/main.tf
index 2369e51dd4046..afb2cf2bc28cc 100644
--- a/enos/modules/vault_verify_write_data/main.tf
+++ b/enos/modules/vault_verify_write_data/main.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 terraform {
   required_providers {
     enos = {
diff --git a/enos/modules/vault_verify_write_data/scripts/smoke-enable-secrets-kv.sh b/enos/modules/vault_verify_write_data/scripts/smoke-enable-secrets-kv.sh
index 2d3e81c2161a3..0e32060810bef 100644
--- a/enos/modules/vault_verify_write_data/scripts/smoke-enable-secrets-kv.sh
+++ b/enos/modules/vault_verify_write_data/scripts/smoke-enable-secrets-kv.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 set -e
 
diff --git a/enos/modules/vault_verify_write_data/scripts/smoke-write-test-data.sh b/enos/modules/vault_verify_write_data/scripts/smoke-write-test-data.sh
index 98b6392c580cb..62b357cc897b9 100644
--- a/enos/modules/vault_verify_write_data/scripts/smoke-write-test-data.sh
+++ b/enos/modules/vault_verify_write_data/scripts/smoke-write-test-data.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 set -e
 
diff --git a/go.mod b/go.mod
index 04b5cdbbaede2..fe34e6dc9568d 100644
--- a/go.mod
+++ b/go.mod
@@ -1,16 +1,6 @@
 module github.com/hashicorp/vault
 
-// The go version directive value isn't consulted when building our production binaries,
-// and the vault module isn't intended to be imported into other projects.  As such the
-// impact of this setting is usually rather limited.  Note however that in some cases the
-// Go project introduces new semantics for handling of go.mod depending on the value.
-//
-// The general policy for updating it is: when the Go major version used on the branch is
-// updated. If we choose not to do so at some point (e.g. because we don't want some new
-// semantic related to Go module handling), this comment should be updated to explain that.
-//
-// Whenever this value gets updated, sdk/go.mod should be updated to the same value.
-go 1.20
+go 1.19
 
 replace github.com/hashicorp/vault/api => ./api
 
@@ -22,26 +12,26 @@ replace github.com/hashicorp/vault/api/auth/userpass => ./api/auth/userpass
 
 replace github.com/hashicorp/vault/sdk => ./sdk
 
+replace go.etcd.io/etcd/client/pkg/v3 v3.5.0 => go.etcd.io/etcd/client/pkg/v3 v3.0.0-20210928084031-3df272774672
+
 require (
-	cloud.google.com/go/monitoring v1.13.0
-	cloud.google.com/go/spanner v1.45.0
-	cloud.google.com/go/storage v1.28.1
-	github.com/Azure/azure-storage-blob-go v0.15.0
-	github.com/Azure/go-autorest/autorest v0.11.29
-	github.com/Azure/go-autorest/autorest/adal v0.9.22
+	cloud.google.com/go/monitoring v1.2.0
+	cloud.google.com/go/spanner v1.5.1
+	cloud.google.com/go/storage v1.10.0
+	github.com/Azure/azure-storage-blob-go v0.14.0
+	github.com/Azure/go-autorest/autorest v0.11.24
+	github.com/Azure/go-autorest/autorest/adal v0.9.18
 	github.com/NYTimes/gziphandler v1.1.1
-	github.com/ProtonMail/go-crypto v0.0.0-20220824120805-4b6e5c587895
 	github.com/SAP/go-hdb v0.14.1
 	github.com/Sectorbob/mlab-ns2 v0.0.0-20171030222938-d3aa0c295a8a
 	github.com/aerospike/aerospike-client-go/v5 v5.6.0
-	github.com/aliyun/alibaba-cloud-sdk-go v1.62.301
+	github.com/aliyun/alibaba-cloud-sdk-go v1.61.1499
 	github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190307165228-86c17b95fcd5
 	github.com/apple/foundationdb/bindings/go v0.0.0-20190411004307-cd5c9d91fad2
-	github.com/armon/go-metrics v0.4.1
+	github.com/armon/go-metrics v0.4.0
 	github.com/armon/go-radix v1.0.0
 	github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef
-	github.com/aws/aws-sdk-go v1.44.268
-	github.com/aws/aws-sdk-go-v2/config v1.18.19
+	github.com/aws/aws-sdk-go v1.44.95
 	github.com/axiomhq/hyperloglog v0.0.0-20220105174342-98591331716a
 	github.com/cenkalti/backoff/v3 v3.2.2
 	github.com/chrismalek/oktasdk-go v0.0.0-20181212195951-3430665dfaa0
@@ -49,57 +39,53 @@ require (
 	github.com/cockroachdb/cockroach-go v0.0.0-20181001143604-e0a95dfd547c
 	github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf
 	github.com/denisenkom/go-mssqldb v0.12.2
+	github.com/docker/docker v20.10.18+incompatible
+	github.com/docker/go-connections v0.4.0
 	github.com/duosecurity/duo_api_golang v0.0.0-20190308151101-6c680f768e74
 	github.com/dustin/go-humanize v1.0.0
-	github.com/fatih/color v1.15.0
+	github.com/fatih/color v1.13.0
 	github.com/fatih/structs v1.1.0
-	github.com/favadi/protoc-go-inject-tag v1.4.0
+	github.com/favadi/protoc-go-inject-tag v1.3.0
 	github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
-	github.com/go-errors/errors v1.4.2
-	github.com/go-jose/go-jose/v3 v3.0.0
-	github.com/go-ldap/ldap/v3 v3.4.4
+	github.com/go-errors/errors v1.4.1
+	github.com/go-ldap/ldap/v3 v3.4.1
 	github.com/go-sql-driver/mysql v1.6.0
-	github.com/go-test/deep v1.1.0
-	github.com/go-zookeeper/zk v1.0.3
+	github.com/go-test/deep v1.0.8
 	github.com/gocql/gocql v1.0.0
-	github.com/golang-jwt/jwt/v4 v4.5.0
-	github.com/golang/protobuf v1.5.3
-	github.com/golangci/revgrep v0.0.0-20220804021717-745bb2f7c2e6
-	github.com/google/go-cmp v0.5.9
+	github.com/golang-jwt/jwt/v4 v4.3.0
+	github.com/golang/protobuf v1.5.2
+	github.com/google/go-cmp v0.5.8
 	github.com/google/go-github v17.0.0+incompatible
 	github.com/google/go-metrics-stackdriver v0.2.0
-	github.com/google/tink/go v1.7.0
-	github.com/hashicorp/cap v0.3.1
-	github.com/hashicorp/consul-template v0.32.0
-	github.com/hashicorp/consul/api v1.20.0
+	github.com/google/tink/go v1.6.1
+	github.com/hashicorp/cap v0.2.1-0.20220727210936-60cd1534e220
+	github.com/hashicorp/consul-template v0.29.5
+	github.com/hashicorp/consul/api v1.15.2
 	github.com/hashicorp/errwrap v1.1.0
-	github.com/hashicorp/eventlogger v0.1.1
 	github.com/hashicorp/go-cleanhttp v0.5.2
 	github.com/hashicorp/go-discover v0.0.0-20210818145131-c573d69da192
 	github.com/hashicorp/go-gcp-common v0.8.0
-	github.com/hashicorp/go-hclog v1.5.0
-	github.com/hashicorp/go-kms-wrapping/entropy/v2 v2.0.0
-	github.com/hashicorp/go-kms-wrapping/v2 v2.0.9
-	github.com/hashicorp/go-kms-wrapping/wrappers/aead/v2 v2.0.7-1
+	github.com/hashicorp/go-hclog v1.3.1
+	github.com/hashicorp/go-kms-wrapping/v2 v2.0.5
+	github.com/hashicorp/go-kms-wrapping/wrappers/aead/v2 v2.0.4
 	github.com/hashicorp/go-kms-wrapping/wrappers/alicloudkms/v2 v2.0.1
-	github.com/hashicorp/go-kms-wrapping/wrappers/awskms/v2 v2.0.7
-	github.com/hashicorp/go-kms-wrapping/wrappers/azurekeyvault/v2 v2.0.7
-	github.com/hashicorp/go-kms-wrapping/wrappers/gcpckms/v2 v2.0.8
-	github.com/hashicorp/go-kms-wrapping/wrappers/ocikms/v2 v2.0.7
-	github.com/hashicorp/go-kms-wrapping/wrappers/transit/v2 v2.0.7
+	github.com/hashicorp/go-kms-wrapping/wrappers/awskms/v2 v2.0.1
+	github.com/hashicorp/go-kms-wrapping/wrappers/azurekeyvault/v2 v2.0.1
+	github.com/hashicorp/go-kms-wrapping/wrappers/gcpckms/v2 v2.0.1
+	github.com/hashicorp/go-kms-wrapping/wrappers/ocikms/v2 v2.0.0
+	github.com/hashicorp/go-kms-wrapping/wrappers/transit/v2 v2.0.1
 	github.com/hashicorp/go-memdb v1.3.3
 	github.com/hashicorp/go-msgpack v1.1.5
 	github.com/hashicorp/go-multierror v1.1.1
-	github.com/hashicorp/go-plugin v1.4.9
+	github.com/hashicorp/go-plugin v1.4.5
 	github.com/hashicorp/go-raftchunking v0.6.3-0.20191002164813-7e9e8525653a
-	github.com/hashicorp/go-retryablehttp v0.7.2
+	github.com/hashicorp/go-retryablehttp v0.7.1
 	github.com/hashicorp/go-rootcerts v1.0.2
-	github.com/hashicorp/go-secure-stdlib/awsutil v0.2.2
+	github.com/hashicorp/go-secure-stdlib/awsutil v0.1.6
 	github.com/hashicorp/go-secure-stdlib/base62 v0.1.2
 	github.com/hashicorp/go-secure-stdlib/gatedwriter v0.1.1
 	github.com/hashicorp/go-secure-stdlib/kv-builder v0.1.2
-	github.com/hashicorp/go-secure-stdlib/mlock v0.1.3
-	github.com/hashicorp/go-secure-stdlib/nonceutil v0.1.0
+	github.com/hashicorp/go-secure-stdlib/mlock v0.1.2
 	github.com/hashicorp/go-secure-stdlib/parseutil v0.1.7
 	github.com/hashicorp/go-secure-stdlib/password v0.1.1
 	github.com/hashicorp/go-secure-stdlib/reloadutil v0.1.1
@@ -111,57 +97,54 @@ require (
 	github.com/hashicorp/go-version v1.6.0
 	github.com/hashicorp/golang-lru v0.5.4
 	github.com/hashicorp/hcl v1.0.1-vault-5
-	github.com/hashicorp/hcl/v2 v2.16.2
-	github.com/hashicorp/hcp-link v0.1.0
-	github.com/hashicorp/hcp-scada-provider v0.2.1
-	github.com/hashicorp/hcp-sdk-go v0.23.0
-	github.com/hashicorp/nomad/api v0.0.0-20230519153805-2275a83cbfdf
+	github.com/hashicorp/hcp-sdk-go v0.22.0
+	github.com/hashicorp/nomad/api v0.0.0-20220707195938-75f4c2237b28
 	github.com/hashicorp/raft v1.3.10
-	github.com/hashicorp/raft-autopilot v0.2.0
+	github.com/hashicorp/raft-autopilot v0.1.6
 	github.com/hashicorp/raft-boltdb/v2 v2.0.0-20210421194847-a7e34179d62c
 	github.com/hashicorp/raft-snapshot v1.0.4
-	github.com/hashicorp/vault-plugin-auth-alicloud v0.15.0
-	github.com/hashicorp/vault-plugin-auth-azure v0.15.0
-	github.com/hashicorp/vault-plugin-auth-centrify v0.15.1
-	github.com/hashicorp/vault-plugin-auth-cf v0.15.0
-	github.com/hashicorp/vault-plugin-auth-gcp v0.16.0
-	github.com/hashicorp/vault-plugin-auth-jwt v0.16.0
-	github.com/hashicorp/vault-plugin-auth-kerberos v0.10.0
-	github.com/hashicorp/vault-plugin-auth-kubernetes v0.16.0
-	github.com/hashicorp/vault-plugin-auth-oci v0.14.0
-	github.com/hashicorp/vault-plugin-database-couchbase v0.9.2
-	github.com/hashicorp/vault-plugin-database-elasticsearch v0.13.2
-	github.com/hashicorp/vault-plugin-database-mongodbatlas v0.10.0
-	github.com/hashicorp/vault-plugin-database-redis v0.2.1
-	github.com/hashicorp/vault-plugin-database-redis-elasticache v0.2.1
-	github.com/hashicorp/vault-plugin-database-snowflake v0.8.0
+	github.com/hashicorp/vault-plugin-auth-alicloud v0.13.0
+	github.com/hashicorp/vault-plugin-auth-azure v0.12.0
+	github.com/hashicorp/vault-plugin-auth-centrify v0.13.0
+	github.com/hashicorp/vault-plugin-auth-cf v0.13.0
+	github.com/hashicorp/vault-plugin-auth-gcp v0.14.0
+	github.com/hashicorp/vault-plugin-auth-jwt v0.14.2
+	github.com/hashicorp/vault-plugin-auth-kerberos v0.8.0
+	github.com/hashicorp/vault-plugin-auth-kubernetes v0.14.1
+	github.com/hashicorp/vault-plugin-auth-oci v0.12.0
+	github.com/hashicorp/vault-plugin-database-couchbase v0.8.0
+	github.com/hashicorp/vault-plugin-database-elasticsearch v0.12.0
+	github.com/hashicorp/vault-plugin-database-mongodbatlas v0.8.0
+	github.com/hashicorp/vault-plugin-database-redis v0.1.0
+	github.com/hashicorp/vault-plugin-database-redis-elasticache v0.1.0
+	github.com/hashicorp/vault-plugin-database-snowflake v0.6.1
 	github.com/hashicorp/vault-plugin-mock v0.16.1
-	github.com/hashicorp/vault-plugin-secrets-ad v0.16.0
-	github.com/hashicorp/vault-plugin-secrets-alicloud v0.15.0
-	github.com/hashicorp/vault-plugin-secrets-azure v0.16.0
-	github.com/hashicorp/vault-plugin-secrets-gcp v0.16.0
-	github.com/hashicorp/vault-plugin-secrets-gcpkms v0.15.0
-	github.com/hashicorp/vault-plugin-secrets-kubernetes v0.5.0
-	github.com/hashicorp/vault-plugin-secrets-kv v0.15.0
-	github.com/hashicorp/vault-plugin-secrets-mongodbatlas v0.10.0
-	github.com/hashicorp/vault-plugin-secrets-openldap v0.11.0
-	github.com/hashicorp/vault-plugin-secrets-terraform v0.7.1
-	github.com/hashicorp/vault-testing-stepwise v0.1.3
-	github.com/hashicorp/vault/api v1.9.2
+	github.com/hashicorp/vault-plugin-secrets-ad v0.14.1
+	github.com/hashicorp/vault-plugin-secrets-alicloud v0.13.0
+	github.com/hashicorp/vault-plugin-secrets-azure v0.14.1
+	github.com/hashicorp/vault-plugin-secrets-gcp v0.14.1
+	github.com/hashicorp/vault-plugin-secrets-gcpkms v0.13.0
+	github.com/hashicorp/vault-plugin-secrets-kubernetes v0.2.0
+	github.com/hashicorp/vault-plugin-secrets-kv v0.13.3
+	github.com/hashicorp/vault-plugin-secrets-mongodbatlas v0.8.0
+	github.com/hashicorp/vault-plugin-secrets-openldap v0.9.1
+	github.com/hashicorp/vault-plugin-secrets-terraform v0.6.0
+	github.com/hashicorp/vault-testing-stepwise v0.1.2
+	github.com/hashicorp/vault/api v1.8.0
 	github.com/hashicorp/vault/api/auth/approle v0.1.0
 	github.com/hashicorp/vault/api/auth/userpass v0.1.0
-	github.com/hashicorp/vault/sdk v0.9.2-0.20230530190758-08ee474850e0
-	github.com/hashicorp/vault/vault/hcp_link/proto v0.0.0-20230201201504-b741fa893d77
+	github.com/hashicorp/vault/sdk v0.6.1-0.20230427140652-b4b396ffc14f
 	github.com/influxdata/influxdb1-client v0.0.0-20200827194710-b269163b24ab
 	github.com/jackc/pgx/v4 v4.15.0
-	github.com/jcmturner/gokrb5/v8 v8.4.4
+	github.com/jcmturner/gokrb5/v8 v8.4.2
 	github.com/jefferai/isbadcipher v0.0.0-20190226160619-51d2077c035f
 	github.com/jefferai/jsonx v1.0.0
 	github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f
-	github.com/kr/pretty v0.3.1
+	github.com/keybase/go-crypto v0.0.0-20190403132359-d65b6b94177f
+	github.com/kr/pretty v0.3.0
 	github.com/kr/text v0.2.0
-	github.com/mattn/go-colorable v0.1.13
-	github.com/mattn/go-isatty v0.0.19
+	github.com/mattn/go-colorable v0.1.12
+	github.com/mattn/go-isatty v0.0.14
 	github.com/mholt/archiver/v3 v3.5.1
 	github.com/michaelklishin/rabbit-hole/v2 v2.12.0
 	github.com/mikesmitty/edkey v0.0.0-20170222072505-3356ea4e686a
@@ -176,214 +159,175 @@ require (
 	github.com/ncw/swift v1.0.47
 	github.com/oklog/run v1.1.0
 	github.com/okta/okta-sdk-golang/v2 v2.12.1
-	github.com/oracle/oci-go-sdk v24.3.0+incompatible
+	github.com/oracle/oci-go-sdk v13.1.0+incompatible
 	github.com/ory/dockertest v3.3.5+incompatible
-	github.com/ory/dockertest/v3 v3.10.0
+	github.com/ory/dockertest/v3 v3.9.1
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/pires/go-proxyproto v0.6.1
 	github.com/pkg/errors v0.9.1
 	github.com/posener/complete v1.2.3
 	github.com/pquerna/otp v1.2.1-0.20191009055518-468c2dd2b58d
-	github.com/prometheus/client_golang v1.14.0
-	github.com/prometheus/common v0.37.0
+	github.com/prometheus/client_golang v1.11.1
+	github.com/prometheus/common v0.26.0
 	github.com/rboyer/safeio v0.2.1
 	github.com/ryanuber/columnize v2.1.0+incompatible
 	github.com/ryanuber/go-glob v1.0.0
+	github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da
 	github.com/sasha-s/go-deadlock v0.2.0
 	github.com/sethvargo/go-limiter v0.7.1
 	github.com/shirou/gopsutil/v3 v3.22.6
-	github.com/stretchr/testify v1.8.4
-	go.etcd.io/bbolt v1.3.7
-	go.etcd.io/etcd/client/pkg/v3 v3.5.7
-	go.etcd.io/etcd/client/v2 v2.305.5
-	go.etcd.io/etcd/client/v3 v3.5.7
-	go.mongodb.org/atlas v0.28.0
-	go.mongodb.org/mongo-driver v1.11.6
-	go.opentelemetry.io/otel v1.14.0
-	go.opentelemetry.io/otel/sdk v1.14.0
-	go.opentelemetry.io/otel/trace v1.14.0
-	go.uber.org/atomic v1.11.0
-	go.uber.org/goleak v1.2.1
-	golang.org/x/crypto v0.9.0
-	golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1
-	golang.org/x/net v0.10.0
-	golang.org/x/oauth2 v0.8.0
-	golang.org/x/sync v0.2.0
-	golang.org/x/sys v0.8.0
-	golang.org/x/term v0.8.0
-	golang.org/x/text v0.9.0
-	golang.org/x/tools v0.7.0
-	google.golang.org/api v0.124.0
-	google.golang.org/grpc v1.55.0
+	github.com/stretchr/testify v1.8.0
+	go.etcd.io/bbolt v1.3.6
+	go.etcd.io/etcd/client/pkg/v3 v3.5.0
+	go.etcd.io/etcd/client/v2 v2.305.0
+	go.etcd.io/etcd/client/v3 v3.5.0
+	go.mongodb.org/atlas v0.15.0
+	go.mongodb.org/mongo-driver v1.7.3
+	go.opentelemetry.io/otel v0.20.0
+	go.opentelemetry.io/otel/sdk v0.20.0
+	go.opentelemetry.io/otel/trace v0.20.0
+	go.uber.org/atomic v1.9.0
+	go.uber.org/goleak v1.1.12
+	golang.org/x/crypto v0.8.0
+	golang.org/x/net v0.9.0
+	golang.org/x/oauth2 v0.0.0-20220524215830-622c5d57e401
+	golang.org/x/sys v0.7.0
+	golang.org/x/term v0.7.0
+	golang.org/x/tools v0.6.0
+	google.golang.org/api v0.83.0
+	google.golang.org/grpc v1.47.0
 	google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0
-	google.golang.org/protobuf v1.30.0
+	google.golang.org/protobuf v1.28.1
+	gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce
 	gopkg.in/ory-am/dockertest.v3 v3.3.4
+	gopkg.in/square/go-jose.v2 v2.6.0
 	gotest.tools/gotestsum v1.9.0
-	honnef.co/go/tools v0.4.3
-	k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5
+	k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
 	layeh.com/radius v0.0.0-20190322222518-890bc1058917
-	mvdan.cc/gofumpt v0.3.1
-	nhooyr.io/websocket v1.8.7
+	mvdan.cc/gofumpt v0.1.1
 )
 
 require (
-	cloud.google.com/go v0.110.0 // indirect
-	cloud.google.com/go/compute v1.19.3 // indirect
-	cloud.google.com/go/compute/metadata v0.2.3 // indirect
-	cloud.google.com/go/iam v1.0.1 // indirect
-	cloud.google.com/go/kms v1.10.2 // indirect
+	cloud.google.com/go v0.100.2 // indirect
+	cloud.google.com/go/compute v1.6.1 // indirect
+	cloud.google.com/go/iam v0.3.0 // indirect
+	cloud.google.com/go/kms v1.4.0 // indirect
 	code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f // indirect
-	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
-	github.com/99designs/keyring v1.2.2 // indirect
 	github.com/Azure/azure-pipeline-go v0.2.3 // indirect
-	github.com/Azure/azure-sdk-for-go v67.2.0+incompatible // indirect
-	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.6.0 // indirect
-	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0 // indirect
-	github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect
-	github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v4 v4.2.1 // indirect
-	github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/msi/armmsi v1.1.0 // indirect
-	github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.1.1 // indirect
-	github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
+	github.com/Azure/azure-sdk-for-go v62.0.0+incompatible // indirect
+	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
 	github.com/Azure/go-autorest v14.2.0+incompatible // indirect
-	github.com/Azure/go-autorest/autorest/azure/auth v0.5.12 // indirect
+	github.com/Azure/go-autorest/autorest/azure/auth v0.5.11 // indirect
 	github.com/Azure/go-autorest/autorest/azure/cli v0.4.5 // indirect
 	github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
 	github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect
 	github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect
 	github.com/Azure/go-autorest/logger v0.2.1 // indirect
 	github.com/Azure/go-autorest/tracing v0.6.0 // indirect
-	github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
-	github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0 // indirect
-	github.com/BurntSushi/toml v1.2.1 // indirect
+	github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c // indirect
+	github.com/BurntSushi/toml v1.2.0 // indirect
 	github.com/DataDog/datadog-go v3.2.0+incompatible // indirect
 	github.com/Jeffail/gabs v1.1.1 // indirect
 	github.com/Masterminds/goutils v1.1.1 // indirect
 	github.com/Masterminds/semver v1.5.0 // indirect
-	github.com/Masterminds/semver/v3 v3.2.1 // indirect
 	github.com/Masterminds/sprig v2.22.0+incompatible // indirect
-	github.com/Masterminds/sprig/v3 v3.2.3 // indirect
-	github.com/Microsoft/go-winio v0.6.1 // indirect
+	github.com/Microsoft/go-winio v0.5.2 // indirect
+	github.com/Microsoft/hcsshim v0.9.0 // indirect
 	github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
-	github.com/agext/levenshtein v1.2.1 // indirect
+	github.com/PuerkitoBio/purell v1.1.1 // indirect
+	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
 	github.com/andybalholm/brotli v1.0.4 // indirect
-	github.com/apache/arrow/go/arrow v0.0.0-20211112161151-bc219186db40 // indirect
-	github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
-	github.com/aws/aws-sdk-go-v2 v1.17.7 // indirect
-	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 // indirect
-	github.com/aws/aws-sdk-go-v2/credentials v1.13.18 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.1 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.59 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.31 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.25 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/ini v1.3.32 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.23 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.26 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.25 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/s3 v1.31.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.12.6 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.6 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.18.7 // indirect
-	github.com/aws/smithy-go v1.13.5 // indirect
-	github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f // indirect
+	github.com/apache/arrow/go/arrow v0.0.0-20210818145353-234c94e4ce64 // indirect
+	github.com/aws/aws-sdk-go-v2 v1.8.0 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.3.2 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.4.0 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.2.2 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.2.2 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.5.2 // indirect
+	github.com/aws/aws-sdk-go-v2/service/s3 v1.12.0 // indirect
+	github.com/aws/smithy-go v1.7.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bgentry/speakeasy v0.1.0 // indirect
-	github.com/boombuler/barcode v1.0.1 // indirect
+	github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc // indirect
 	github.com/cenkalti/backoff v2.2.1+incompatible // indirect
-	github.com/cenkalti/backoff/v4 v4.2.0 // indirect
-	github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
+	github.com/cenkalti/backoff/v4 v4.1.3 // indirect
 	github.com/centrify/cloud-golang-sdk v0.0.0-20210923165758-a8c48d049166 // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/cespare/xxhash/v2 v2.1.1 // indirect
 	github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible // indirect
 	github.com/circonus-labs/circonusllhist v0.1.3 // indirect
-	github.com/cloudflare/circl v1.1.0 // indirect
 	github.com/cloudfoundry-community/go-cfclient v0.0.0-20210823134051-721f0e559306 // indirect
-	github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe // indirect
-	github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195 // indirect
-	github.com/containerd/containerd v1.7.0 // indirect
+	github.com/containerd/cgroups v1.0.3 // indirect
+	github.com/containerd/containerd v1.5.13 // indirect
 	github.com/containerd/continuity v0.3.0 // indirect
 	github.com/coreos/go-oidc v2.2.1+incompatible // indirect
-	github.com/coreos/go-oidc/v3 v3.5.0 // indirect
+	github.com/coreos/go-oidc/v3 v3.1.0 // indirect
 	github.com/coreos/go-semver v0.3.0 // indirect
-	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
-	github.com/couchbase/gocb/v2 v2.6.3 // indirect
-	github.com/couchbase/gocbcore/v10 v10.2.3 // indirect
-	github.com/danieljoos/wincred v1.1.2 // indirect
+	github.com/coreos/go-systemd/v22 v22.3.2 // indirect
+	github.com/couchbase/gocb/v2 v2.3.3 // indirect
+	github.com/couchbase/gocbcore/v10 v10.0.4 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba // indirect
 	github.com/dgryski/go-metro v0.0.0-20180109044635-280f6062b5bc // indirect
 	github.com/digitalocean/godo v1.7.5 // indirect
 	github.com/dimchansky/utfbom v1.1.1 // indirect
 	github.com/dnephin/pflag v1.0.7 // indirect
-	github.com/docker/cli v20.10.20+incompatible // indirect
-	github.com/docker/distribution v2.8.2+incompatible // indirect
-	github.com/docker/docker v23.0.4+incompatible // indirect
-	github.com/docker/go-connections v0.4.0 // indirect
+	github.com/docker/cli v20.10.18+incompatible // indirect
+	github.com/docker/distribution v2.7.1+incompatible // indirect
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect
-	github.com/dvsekhvalnov/jose2go v1.5.0 // indirect
-	github.com/emicklei/go-restful/v3 v3.10.1 // indirect
-	github.com/envoyproxy/go-control-plane v0.11.0 // indirect
-	github.com/envoyproxy/protoc-gen-validate v0.10.0 // indirect
 	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
 	github.com/form3tech-oss/jwt-go v3.2.5+incompatible // indirect
-	github.com/fsnotify/fsnotify v1.6.0 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
-	github.com/gammazero/deque v0.2.1 // indirect
-	github.com/gammazero/workerpool v1.1.3 // indirect
-	github.com/go-asn1-ber/asn1-ber v1.5.4 // indirect
+	github.com/fsnotify/fsnotify v1.5.4 // indirect
+	github.com/gabriel-vasile/mimetype v1.3.1 // indirect
+	github.com/gammazero/deque v0.0.0-20190130191400-2afb3858e9c7 // indirect
+	github.com/gammazero/workerpool v0.0.0-20190406235159-88d534f22b56 // indirect
+	github.com/go-asn1-ber/asn1-ber v1.5.1 // indirect
 	github.com/go-ldap/ldif v0.0.0-20200320164324-fd88d9b715b3 // indirect
-	github.com/go-logr/logr v1.2.3 // indirect
-	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/go-logr/logr v1.2.0 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
 	github.com/go-openapi/analysis v0.20.0 // indirect
-	github.com/go-openapi/errors v0.20.1 // indirect
-	github.com/go-openapi/jsonpointer v0.19.6 // indirect
-	github.com/go-openapi/jsonreference v0.20.1 // indirect
+	github.com/go-openapi/errors v0.19.9 // indirect
+	github.com/go-openapi/jsonpointer v0.19.5 // indirect
+	github.com/go-openapi/jsonreference v0.19.5 // indirect
 	github.com/go-openapi/loads v0.20.2 // indirect
 	github.com/go-openapi/runtime v0.19.24 // indirect
 	github.com/go-openapi/spec v0.20.3 // indirect
 	github.com/go-openapi/strfmt v0.20.0 // indirect
-	github.com/go-openapi/swag v0.22.3 // indirect
+	github.com/go-openapi/swag v0.19.14 // indirect
 	github.com/go-openapi/validate v0.20.2 // indirect
 	github.com/go-ozzo/ozzo-validation v3.6.0+incompatible // indirect
-	github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
-	github.com/gofrs/uuid v4.3.0+incompatible // indirect
+	github.com/go-stack/stack v1.8.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe // indirect
 	github.com/golang-sql/sqlexp v0.1.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+	github.com/golang/mock v1.6.0 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
-	github.com/google/flatbuffers v23.1.21+incompatible // indirect
-	github.com/google/gnostic v0.5.7-v3refs // indirect
+	github.com/google/flatbuffers v2.0.0+incompatible // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
-	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/s2a-go v0.1.4 // indirect
+	github.com/google/gofuzz v1.1.0 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
 	github.com/google/uuid v1.3.0 // indirect
-	github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
-	github.com/googleapis/gax-go/v2 v2.9.1 // indirect
+	github.com/googleapis/gax-go/v2 v2.4.0 // indirect
+	github.com/googleapis/gnostic v0.5.5 // indirect
 	github.com/gophercloud/gophercloud v0.1.0 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
-	github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
 	github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
 	github.com/hashicorp/cronexpr v1.1.1 // indirect
 	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
-	github.com/hashicorp/go-msgpack/v2 v2.0.0 // indirect
+	github.com/hashicorp/go-kms-wrapping/entropy/v2 v2.0.0 // indirect
 	github.com/hashicorp/go-secure-stdlib/fileutil v0.1.0 // indirect
-	github.com/hashicorp/go-slug v0.11.1 // indirect
-	github.com/hashicorp/go-tfe v1.25.1 // indirect
+	github.com/hashicorp/go-slug v0.7.0 // indirect
+	github.com/hashicorp/go-tfe v0.20.0 // indirect
 	github.com/hashicorp/jsonapi v0.0.0-20210826224640-ee7dae0fb22d // indirect
 	github.com/hashicorp/logutils v1.0.0 // indirect
 	github.com/hashicorp/mdns v1.0.4 // indirect
-	github.com/hashicorp/net-rpc-msgpackrpc/v2 v2.0.0 // indirect
-	github.com/hashicorp/serf v0.10.1 // indirect
-	github.com/hashicorp/vault/api/auth/kubernetes v0.4.0 // indirect
+	github.com/hashicorp/serf v0.9.7 // indirect
+	github.com/hashicorp/vault/api/auth/kubernetes v0.3.0 // indirect
 	github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443 // indirect
-	github.com/hashicorp/yamux v0.1.1 // indirect
-	github.com/huandu/xstrings v1.4.0 // indirect
-	github.com/imdario/mergo v0.3.15 // indirect
+	github.com/hashicorp/yamux v0.0.0-20211028200310-0bc27b27de87 // indirect
+	github.com/huandu/xstrings v1.3.2 // indirect
+	github.com/imdario/mergo v0.3.13 // indirect
 	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
 	github.com/jackc/pgconn v1.11.0 // indirect
 	github.com/jackc/pgio v1.0.0 // indirect
@@ -394,7 +338,7 @@ require (
 	github.com/jackc/pgx v3.3.0+incompatible // indirect
 	github.com/jcmturner/aescts/v2 v2.0.0 // indirect
 	github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect
-	github.com/jcmturner/gofork v1.7.6 // indirect
+	github.com/jcmturner/gofork v1.0.0 // indirect
 	github.com/jcmturner/goidentity/v6 v6.0.1 // indirect
 	github.com/jcmturner/rpc/v2 v2.0.3 // indirect
 	github.com/jeffchao/backoff v0.0.0-20140404060208-9d7fd7aa17f2 // indirect
@@ -402,67 +346,59 @@ require (
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/kelseyhightower/envconfig v1.4.0 // indirect
-	github.com/klauspost/compress v1.16.5 // indirect
+	github.com/klauspost/compress v1.13.6 // indirect
 	github.com/klauspost/pgzip v1.2.5 // indirect
-	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/lib/pq v1.10.6 // indirect
 	github.com/linode/linodego v0.7.1 // indirect
 	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/mailru/easyjson v0.7.6 // indirect
 	github.com/mattn/go-ieproxy v0.0.1 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
-	github.com/mediocregopher/radix/v4 v4.1.2 // indirect
-	github.com/miekg/dns v1.1.43 // indirect
-	github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
+	github.com/mediocregopher/radix/v4 v4.1.1 // indirect
+	github.com/miekg/dns v1.1.41 // indirect
 	github.com/mitchellh/hashstructure v1.1.0 // indirect
-	github.com/mitchellh/pointerstructure v1.2.1 // indirect
-	github.com/moby/patternmatcher v0.5.0 // indirect
-	github.com/moby/sys/sequential v0.5.0 // indirect
-	github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
+	github.com/mitchellh/pointerstructure v1.2.0 // indirect
+	github.com/moby/sys/mount v0.2.0 // indirect
+	github.com/moby/sys/mountinfo v0.5.0 // indirect
+	github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/mongodb-forks/digest v1.0.4 // indirect
-	github.com/montanaflynn/stats v0.7.0 // indirect
-	github.com/mtibben/percent v0.2.1 // indirect
-	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/mongodb-forks/digest v1.0.3 // indirect
 	github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2 // indirect
 	github.com/nwaples/rardecode v1.1.2 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b // indirect
-	github.com/opencontainers/runc v1.1.6 // indirect
-	github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b // indirect
+	github.com/opencontainers/image-spec v1.0.2 // indirect
+	github.com/opencontainers/runc v1.1.4 // indirect
+	github.com/openlyinc/pointy v1.1.2 // indirect
 	github.com/oracle/oci-go-sdk/v60 v60.0.0 // indirect
 	github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c // indirect
 	github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
 	github.com/pierrec/lz4 v2.6.1+incompatible // indirect
-	github.com/pierrec/lz4/v4 v4.1.17 // indirect
+	github.com/pierrec/lz4/v4 v4.1.8 // indirect
 	github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
 	github.com/pquerna/cachecontrol v0.1.0 // indirect
-	github.com/prometheus/client_model v0.3.0 // indirect
-	github.com/prometheus/procfs v0.8.0 // indirect
+	github.com/prometheus/client_model v0.2.0 // indirect
+	github.com/prometheus/procfs v0.6.0 // indirect
 	github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03 // indirect
-	github.com/rogpeppe/go-internal v1.10.0 // indirect
-	github.com/shopspring/decimal v1.3.1 // indirect
+	github.com/rogpeppe/go-internal v1.8.1 // indirect
 	github.com/sirupsen/logrus v1.9.0 // indirect
-	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 // indirect
-	github.com/snowflakedb/gosnowflake v1.6.18 // indirect
+	github.com/snowflakedb/gosnowflake v1.6.3 // indirect
 	github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d // indirect
 	github.com/sony/gobreaker v0.4.2-0.20210216022020-dd874f9dd33b // indirect
-	github.com/spf13/cast v1.5.1 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/stretchr/objx v0.5.0 // indirect
+	github.com/stretchr/objx v0.4.0 // indirect
 	github.com/tencentcloud/tencentcloud-sdk-go v1.0.162 // indirect
-	github.com/tilinna/clock v1.1.0 // indirect
+	github.com/tilinna/clock v1.0.2 // indirect
 	github.com/tklauser/go-sysconf v0.3.10 // indirect
 	github.com/tklauser/numcpus v0.4.0 // indirect
 	github.com/tv42/httpunix v0.0.0-20191220191345-2ba4b9c3382c // indirect
 	github.com/ulikunitz/xz v0.5.10 // indirect
 	github.com/vmware/govmomi v0.18.0 // indirect
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
-	github.com/xdg-go/scram v1.1.1 // indirect
-	github.com/xdg-go/stringprep v1.0.3 // indirect
+	github.com/xdg-go/scram v1.0.2 // indirect
+	github.com/xdg-go/stringprep v1.0.2 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
 	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
@@ -470,30 +406,28 @@ require (
 	github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
 	github.com/yuin/gopher-lua v0.0.0-20210529063254-f4c35e4016d9 // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
-	github.com/zclconf/go-cty v1.12.1 // indirect
-	go.etcd.io/etcd/api/v3 v3.5.7 // indirect
-	go.opencensus.io v0.24.0 // indirect
+	go.etcd.io/etcd/api/v3 v3.5.0 // indirect
+	go.opencensus.io v0.23.0 // indirect
+	go.opentelemetry.io/otel/metric v0.20.0 // indirect
 	go.uber.org/multierr v1.7.0 // indirect
 	go.uber.org/zap v1.19.1 // indirect
-	golang.org/x/exp/typeparams v0.0.0-20221208152030-732eee02a75a // indirect
-	golang.org/x/mod v0.9.0 // indirect
-	golang.org/x/time v0.3.0 // indirect
-	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
+	golang.org/x/mod v0.8.0 // indirect
+	golang.org/x/sync v0.1.0 // indirect
+	golang.org/x/text v0.9.0 // indirect
+	golang.org/x/time v0.0.0-20220411224347-583f2d630306 // indirect
+	golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20230525154841-bd750badd5c6 // indirect
+	google.golang.org/genproto v0.0.0-20220602131408-e326c6e8e9c8 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.66.2 // indirect
 	gopkg.in/jcmturner/goidentity.v3 v3.0.0 // indirect
 	gopkg.in/resty.v1 v1.12.0 // indirect
-	gopkg.in/square/go-jose.v2 v2.6.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/api v0.27.2 // indirect
-	k8s.io/apimachinery v0.27.2 // indirect
-	k8s.io/client-go v0.27.2 // indirect
-	k8s.io/klog/v2 v2.90.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
-	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
-	sigs.k8s.io/yaml v1.3.0 // indirect
+	k8s.io/api v0.22.2 // indirect
+	k8s.io/apimachinery v0.22.2 // indirect
+	k8s.io/client-go v0.22.2 // indirect
+	k8s.io/klog/v2 v2.60.1 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
+	sigs.k8s.io/yaml v1.2.0 // indirect
 )
diff --git a/go.sum b/go.sum
index 1a065c57ff6da..474e1c61dd613 100644
--- a/go.sum
+++ b/go.sum
@@ -6,7 +6,6 @@ cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSR
 cloud.google.com/go v0.39.0/go.mod h1:rVLT6fkc8chs9sfPtFc1SBH6em7n+ZoXaG+87tDISts=
 cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
 cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
-cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
 cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
 cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
 cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
@@ -19,7 +18,6 @@ cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOY
 cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
 cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI=
 cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk=
-cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY=
 cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg=
 cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8=
 cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0=
@@ -32,567 +30,85 @@ cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW
 cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc=
 cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA=
 cloud.google.com/go v0.100.1/go.mod h1:fs4QogzfH5n2pBXBP9vRiU+eCny7lD2vmFZy79Iuw1U=
+cloud.google.com/go v0.100.2 h1:t9Iw5QH5v4XtlEQaCtUY7x6sCABps8sW0acw7e2WQ6Y=
 cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A=
-cloud.google.com/go v0.102.0/go.mod h1:oWcCzKlqJ5zgHQt9YsaeTY9KzIvjyy0ArmiBUgpQ+nc=
-cloud.google.com/go v0.102.1/go.mod h1:XZ77E9qnTEnrgEOvr4xzfdX5TRo7fB4T2F4O6+34hIU=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
-cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
-cloud.google.com/go v0.107.0/go.mod h1:wpc2eNrD7hXUTy8EKS10jkxpZBjASrORK7goS+3YX2I=
-cloud.google.com/go v0.110.0 h1:Zc8gqp3+a9/Eyph2KDmcGaPtbKRIoqq4YTlL4NMD0Ys=
-cloud.google.com/go v0.110.0/go.mod h1:SJnCLqQ0FCFGSZMUNUf84MV3Aia54kn7pi8st7tMzaY=
-cloud.google.com/go/accessapproval v1.4.0/go.mod h1:zybIuC3KpDOvotz59lFe5qxRZx6C75OtwbisN56xYB4=
-cloud.google.com/go/accessapproval v1.5.0/go.mod h1:HFy3tuiGvMdcd/u+Cu5b9NkO1pEICJ46IR82PoUdplw=
-cloud.google.com/go/accessapproval v1.6.0/go.mod h1:R0EiYnwV5fsRFiKZkPHr6mwyk2wxUJ30nL4j2pcFY2E=
-cloud.google.com/go/accesscontextmanager v1.3.0/go.mod h1:TgCBehyr5gNMz7ZaH9xubp+CE8dkrszb4oK9CWyvD4o=
-cloud.google.com/go/accesscontextmanager v1.4.0/go.mod h1:/Kjh7BBu/Gh83sv+K60vN9QE5NJcd80sU33vIe2IFPE=
-cloud.google.com/go/accesscontextmanager v1.6.0/go.mod h1:8XCvZWfYw3K/ji0iVnp+6pu7huxoQTLmxAbVjbloTtM=
-cloud.google.com/go/aiplatform v1.22.0/go.mod h1:ig5Nct50bZlzV6NvKaTwmplLLddFx0YReh9WfTO5jKw=
-cloud.google.com/go/aiplatform v1.24.0/go.mod h1:67UUvRBKG6GTayHKV8DBv2RtR1t93YRu5B1P3x99mYY=
-cloud.google.com/go/aiplatform v1.27.0/go.mod h1:Bvxqtl40l0WImSb04d0hXFU7gDOiq9jQmorivIiWcKg=
-cloud.google.com/go/aiplatform v1.35.0/go.mod h1:7MFT/vCaOyZT/4IIFfxH4ErVg/4ku6lKv3w0+tFTgXQ=
-cloud.google.com/go/analytics v0.11.0/go.mod h1:DjEWCu41bVbYcKyvlws9Er60YE4a//bK6mnhWvQeFNI=
-cloud.google.com/go/analytics v0.12.0/go.mod h1:gkfj9h6XRf9+TS4bmuhPEShsh3hH8PAZzm/41OOhQd4=
-cloud.google.com/go/analytics v0.18.0/go.mod h1:ZkeHGQlcIPkw0R/GW+boWHhCOR43xz9RN/jn7WcqfIE=
-cloud.google.com/go/apigateway v1.3.0/go.mod h1:89Z8Bhpmxu6AmUxuVRg/ECRGReEdiP3vQtk4Z1J9rJk=
-cloud.google.com/go/apigateway v1.4.0/go.mod h1:pHVY9MKGaH9PQ3pJ4YLzoj6U5FUDeDFBllIz7WmzJoc=
-cloud.google.com/go/apigateway v1.5.0/go.mod h1:GpnZR3Q4rR7LVu5951qfXPJCHquZt02jf7xQx7kpqN8=
-cloud.google.com/go/apigeeconnect v1.3.0/go.mod h1:G/AwXFAKo0gIXkPTVfZDd2qA1TxBXJ3MgMRBQkIi9jc=
-cloud.google.com/go/apigeeconnect v1.4.0/go.mod h1:kV4NwOKqjvt2JYR0AoIWo2QGfoRtn/pkS3QlHp0Ni04=
-cloud.google.com/go/apigeeconnect v1.5.0/go.mod h1:KFaCqvBRU6idyhSNyn3vlHXc8VMDJdRmwDF6JyFRqZ8=
-cloud.google.com/go/apigeeregistry v0.4.0/go.mod h1:EUG4PGcsZvxOXAdyEghIdXwAEi/4MEaoqLMLDMIwKXY=
-cloud.google.com/go/apigeeregistry v0.5.0/go.mod h1:YR5+s0BVNZfVOUkMa5pAR2xGd0A473vA5M7j247o1wM=
-cloud.google.com/go/apikeys v0.4.0/go.mod h1:XATS/yqZbaBK0HOssf+ALHp8jAlNHUgyfprvNcBIszU=
-cloud.google.com/go/apikeys v0.5.0/go.mod h1:5aQfwY4D+ewMMWScd3hm2en3hCj+BROlyrt3ytS7KLI=
-cloud.google.com/go/appengine v1.4.0/go.mod h1:CS2NhuBuDXM9f+qscZ6V86m1MIIqPj3WC/UoEuR1Sno=
-cloud.google.com/go/appengine v1.5.0/go.mod h1:TfasSozdkFI0zeoxW3PTBLiNqRmzraodCWatWI9Dmak=
-cloud.google.com/go/appengine v1.6.0/go.mod h1:hg6i0J/BD2cKmDJbaFSYHFyZkgBEfQrDg/X0V5fJn84=
-cloud.google.com/go/area120 v0.5.0/go.mod h1:DE/n4mp+iqVyvxHN41Vf1CR602GiHQjFPusMFW6bGR4=
-cloud.google.com/go/area120 v0.6.0/go.mod h1:39yFJqWVgm0UZqWTOdqkLhjoC7uFfgXRC8g/ZegeAh0=
-cloud.google.com/go/area120 v0.7.1/go.mod h1:j84i4E1RboTWjKtZVWXPqvK5VHQFJRF2c1Nm69pWm9k=
-cloud.google.com/go/artifactregistry v1.6.0/go.mod h1:IYt0oBPSAGYj/kprzsBjZ/4LnG/zOcHyFHjWPCi6SAQ=
-cloud.google.com/go/artifactregistry v1.7.0/go.mod h1:mqTOFOnGZx8EtSqK/ZWcsm/4U8B77rbcLP6ruDU2Ixk=
-cloud.google.com/go/artifactregistry v1.8.0/go.mod h1:w3GQXkJX8hiKN0v+at4b0qotwijQbYUqF2GWkZzAhC0=
-cloud.google.com/go/artifactregistry v1.9.0/go.mod h1:2K2RqvA2CYvAeARHRkLDhMDJ3OXy26h3XW+3/Jh2uYc=
-cloud.google.com/go/artifactregistry v1.11.2/go.mod h1:nLZns771ZGAwVLzTX/7Al6R9ehma4WUEhZGWV6CeQNQ=
-cloud.google.com/go/asset v1.5.0/go.mod h1:5mfs8UvcM5wHhqtSv8J1CtxxaQq3AdBxxQi2jGW/K4o=
-cloud.google.com/go/asset v1.7.0/go.mod h1:YbENsRK4+xTiL+Ofoj5Ckf+O17kJtgp3Y3nn4uzZz5s=
-cloud.google.com/go/asset v1.8.0/go.mod h1:mUNGKhiqIdbr8X7KNayoYvyc4HbbFO9URsjbytpUaW0=
-cloud.google.com/go/asset v1.9.0/go.mod h1:83MOE6jEJBMqFKadM9NLRcs80Gdw76qGuHn8m3h8oHQ=
-cloud.google.com/go/asset v1.10.0/go.mod h1:pLz7uokL80qKhzKr4xXGvBQXnzHn5evJAEAtZiIb0wY=
-cloud.google.com/go/asset v1.11.1/go.mod h1:fSwLhbRvC9p9CXQHJ3BgFeQNM4c9x10lqlrdEUYXlJo=
-cloud.google.com/go/assuredworkloads v1.5.0/go.mod h1:n8HOZ6pff6re5KYfBXcFvSViQjDwxFkAkmUFffJRbbY=
-cloud.google.com/go/assuredworkloads v1.6.0/go.mod h1:yo2YOk37Yc89Rsd5QMVECvjaMKymF9OP+QXWlKXUkXw=
-cloud.google.com/go/assuredworkloads v1.7.0/go.mod h1:z/736/oNmtGAyU47reJgGN+KVoYoxeLBoj4XkKYscNI=
-cloud.google.com/go/assuredworkloads v1.8.0/go.mod h1:AsX2cqyNCOvEQC8RMPnoc0yEarXQk6WEKkxYfL6kGIo=
-cloud.google.com/go/assuredworkloads v1.9.0/go.mod h1:kFuI1P78bplYtT77Tb1hi0FMxM0vVpRC7VVoJC3ZoT0=
-cloud.google.com/go/assuredworkloads v1.10.0/go.mod h1:kwdUQuXcedVdsIaKgKTp9t0UJkE5+PAVNhdQm4ZVq2E=
-cloud.google.com/go/automl v1.5.0/go.mod h1:34EjfoFGMZ5sgJ9EoLsRtdPSNZLcfflJR39VbVNS2M0=
-cloud.google.com/go/automl v1.6.0/go.mod h1:ugf8a6Fx+zP0D59WLhqgTDsQI9w07o64uf/Is3Nh5p8=
-cloud.google.com/go/automl v1.7.0/go.mod h1:RL9MYCCsJEOmt0Wf3z9uzG0a7adTT1fe+aObgSpkCt8=
-cloud.google.com/go/automl v1.8.0/go.mod h1:xWx7G/aPEe/NP+qzYXktoBSDfjO+vnKMGgsApGJJquM=
-cloud.google.com/go/automl v1.12.0/go.mod h1:tWDcHDp86aMIuHmyvjuKeeHEGq76lD7ZqfGLN6B0NuU=
-cloud.google.com/go/baremetalsolution v0.3.0/go.mod h1:XOrocE+pvK1xFfleEnShBlNAXf+j5blPPxrhjKgnIFc=
-cloud.google.com/go/baremetalsolution v0.4.0/go.mod h1:BymplhAadOO/eBa7KewQ0Ppg4A4Wplbn+PsFKRLo0uI=
-cloud.google.com/go/baremetalsolution v0.5.0/go.mod h1:dXGxEkmR9BMwxhzBhV0AioD0ULBmuLZI8CdwalUxuss=
-cloud.google.com/go/batch v0.3.0/go.mod h1:TR18ZoAekj1GuirsUsR1ZTKN3FC/4UDnScjT8NXImFE=
-cloud.google.com/go/batch v0.4.0/go.mod h1:WZkHnP43R/QCGQsZ+0JyG4i79ranE2u8xvjq/9+STPE=
-cloud.google.com/go/batch v0.7.0/go.mod h1:vLZN95s6teRUqRQ4s3RLDsH8PvboqBK+rn1oevL159g=
-cloud.google.com/go/beyondcorp v0.2.0/go.mod h1:TB7Bd+EEtcw9PCPQhCJtJGjk/7TC6ckmnSFS+xwTfm4=
-cloud.google.com/go/beyondcorp v0.3.0/go.mod h1:E5U5lcrcXMsCuoDNyGrpyTm/hn7ne941Jz2vmksAxW8=
-cloud.google.com/go/beyondcorp v0.4.0/go.mod h1:3ApA0mbhHx6YImmuubf5pyW8srKnCEPON32/5hj+RmM=
 cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
 cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
 cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
 cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
+cloud.google.com/go/bigquery v1.6.0/go.mod h1:hyFDG0qSGdHNz8Q6nDN8rYIkld0q/+5uBZaelxiDLfE=
 cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
 cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
-cloud.google.com/go/bigquery v1.42.0/go.mod h1:8dRTJxhtG+vwBKzE5OseQn/hiydoQN3EedCaOdYmxRA=
-cloud.google.com/go/bigquery v1.43.0/go.mod h1:ZMQcXHsl+xmU1z36G2jNGZmKp9zNY5BUua5wDgmNCfw=
-cloud.google.com/go/bigquery v1.44.0/go.mod h1:0Y33VqXTEsbamHJvJHdFmtqHvMIY28aK1+dFsvaChGc=
-cloud.google.com/go/bigquery v1.48.0/go.mod h1:QAwSz+ipNgfL5jxiaK7weyOhzdoAy1zFm0Nf1fysJac=
-cloud.google.com/go/billing v1.4.0/go.mod h1:g9IdKBEFlItS8bTtlrZdVLWSSdSyFUZKXNS02zKMOZY=
-cloud.google.com/go/billing v1.5.0/go.mod h1:mztb1tBc3QekhjSgmpf/CV4LzWXLzCArwpLmP2Gm88s=
-cloud.google.com/go/billing v1.6.0/go.mod h1:WoXzguj+BeHXPbKfNWkqVtDdzORazmCjraY+vrxcyvI=
-cloud.google.com/go/billing v1.7.0/go.mod h1:q457N3Hbj9lYwwRbnlD7vUpyjq6u5U1RAOArInEiD5Y=
-cloud.google.com/go/billing v1.12.0/go.mod h1:yKrZio/eu+okO/2McZEbch17O5CB5NpZhhXG6Z766ss=
-cloud.google.com/go/binaryauthorization v1.1.0/go.mod h1:xwnoWu3Y84jbuHa0zd526MJYmtnVXn0syOjaJgy4+dM=
-cloud.google.com/go/binaryauthorization v1.2.0/go.mod h1:86WKkJHtRcv5ViNABtYMhhNWRrD1Vpi//uKEy7aYEfI=
-cloud.google.com/go/binaryauthorization v1.3.0/go.mod h1:lRZbKgjDIIQvzYQS1p99A7/U1JqvqeZg0wiI5tp6tg0=
-cloud.google.com/go/binaryauthorization v1.4.0/go.mod h1:tsSPQrBd77VLplV70GUhBf/Zm3FsKmgSqgm4UmiDItk=
-cloud.google.com/go/binaryauthorization v1.5.0/go.mod h1:OSe4OU1nN/VswXKRBmciKpo9LulY41gch5c68htf3/Q=
-cloud.google.com/go/certificatemanager v1.3.0/go.mod h1:n6twGDvcUBFu9uBgt4eYvvf3sQ6My8jADcOVwHmzadg=
-cloud.google.com/go/certificatemanager v1.4.0/go.mod h1:vowpercVFyqs8ABSmrdV+GiFf2H/ch3KyudYQEMM590=
-cloud.google.com/go/certificatemanager v1.6.0/go.mod h1:3Hh64rCKjRAX8dXgRAyOcY5vQ/fE1sh8o+Mdd6KPgY8=
-cloud.google.com/go/channel v1.8.0/go.mod h1:W5SwCXDJsq/rg3tn3oG0LOxpAo6IMxNa09ngphpSlnk=
-cloud.google.com/go/channel v1.9.0/go.mod h1:jcu05W0my9Vx4mt3/rEHpfxc9eKi9XwsdDL8yBMbKUk=
-cloud.google.com/go/channel v1.11.0/go.mod h1:IdtI0uWGqhEeatSB62VOoJ8FSUhJ9/+iGkJVqp74CGE=
-cloud.google.com/go/cloudbuild v1.3.0/go.mod h1:WequR4ULxlqvMsjDEEEFnOG5ZSRSgWOywXYDb1vPE6U=
-cloud.google.com/go/cloudbuild v1.4.0/go.mod h1:5Qwa40LHiOXmz3386FrjrYM93rM/hdRr7b53sySrTqA=
-cloud.google.com/go/cloudbuild v1.7.0/go.mod h1:zb5tWh2XI6lR9zQmsm1VRA+7OCuve5d8S+zJUul8KTg=
-cloud.google.com/go/clouddms v1.3.0/go.mod h1:oK6XsCDdW4Ib3jCCBugx+gVjevp2TMXFtgxvPSee3OM=
-cloud.google.com/go/clouddms v1.4.0/go.mod h1:Eh7sUGCC+aKry14O1NRljhjyrr0NFC0G2cjwX0cByRk=
-cloud.google.com/go/clouddms v1.5.0/go.mod h1:QSxQnhikCLUw13iAbffF2CZxAER3xDGNHjsTAkQJcQA=
-cloud.google.com/go/cloudtasks v1.5.0/go.mod h1:fD92REy1x5woxkKEkLdvavGnPJGEn8Uic9nWuLzqCpY=
-cloud.google.com/go/cloudtasks v1.6.0/go.mod h1:C6Io+sxuke9/KNRkbQpihnW93SWDU3uXt92nu85HkYI=
-cloud.google.com/go/cloudtasks v1.7.0/go.mod h1:ImsfdYWwlWNJbdgPIIGJWC+gemEGTBK/SunNQQNCAb4=
-cloud.google.com/go/cloudtasks v1.8.0/go.mod h1:gQXUIwCSOI4yPVK7DgTVFiiP0ZW/eQkydWzwVMdHxrI=
-cloud.google.com/go/cloudtasks v1.9.0/go.mod h1:w+EyLsVkLWHcOaqNEyvcKAsWp9p29dL6uL9Nst1cI7Y=
 cloud.google.com/go/compute v0.1.0/go.mod h1:GAesmwr110a34z04OlxYkATPBEfVhkymfTBXtfbBFow=
 cloud.google.com/go/compute v1.3.0/go.mod h1:cCZiE1NHEtai4wiufUhW8I8S1JKkAnhnQJWM7YD99wM=
 cloud.google.com/go/compute v1.5.0/go.mod h1:9SMHyhJlzhlkJqrPAc839t2BZFTSk6Jdj6mkzQJeu0M=
 cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz/FMzPu0s=
+cloud.google.com/go/compute v1.6.1 h1:2sMmt8prCn7DPaG4Pmh0N3Inmc8cT8ae5k1M6VJ9Wqc=
 cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU=
-cloud.google.com/go/compute v1.7.0/go.mod h1:435lt8av5oL9P3fv1OEzSbSUe+ybHXGMPQHHZWZxy9U=
-cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
-cloud.google.com/go/compute v1.12.0/go.mod h1:e8yNOBcBONZU1vJKCvCoDw/4JQsA0dpM4x/6PIIOocU=
-cloud.google.com/go/compute v1.12.1/go.mod h1:e8yNOBcBONZU1vJKCvCoDw/4JQsA0dpM4x/6PIIOocU=
-cloud.google.com/go/compute v1.13.0/go.mod h1:5aPTS0cUNMIc1CE546K+Th6weJUNQErARyZtRXDJ8GE=
-cloud.google.com/go/compute v1.14.0/go.mod h1:YfLtxrj9sU4Yxv+sXzZkyPjEyPBZfXHUvjxega5vAdo=
-cloud.google.com/go/compute v1.15.1/go.mod h1:bjjoF/NtFUrkD/urWfdHaKuOPDR5nWIs63rR+SXhcpA=
-cloud.google.com/go/compute v1.18.0/go.mod h1:1X7yHxec2Ga+Ss6jPyjxRxpu2uu7PLgsOVXvgU0yacs=
-cloud.google.com/go/compute v1.19.3 h1:DcTwsFgGev/wV5+q8o2fzgcHOaac+DKGC91ZlvpsQds=
-cloud.google.com/go/compute v1.19.3/go.mod h1:qxvISKp/gYnXkSAD1ppcSOveRAmzxicEv/JlizULFrI=
-cloud.google.com/go/compute/metadata v0.1.0/go.mod h1:Z1VN+bulIf6bt4P/C37K4DyZYZEXYonfTBHHFPO/4UU=
-cloud.google.com/go/compute/metadata v0.2.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=
-cloud.google.com/go/compute/metadata v0.2.1/go.mod h1:jgHgmJd2RKBGzXqF5LR2EZMGxBkeanZ9wwa75XHJgOM=
-cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY=
-cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA=
-cloud.google.com/go/contactcenterinsights v1.3.0/go.mod h1:Eu2oemoePuEFc/xKFPjbTuPSj0fYJcPls9TFlPNnHHY=
-cloud.google.com/go/contactcenterinsights v1.4.0/go.mod h1:L2YzkGbPsv+vMQMCADxJoT9YiTTnSEd6fEvCeHTYVck=
-cloud.google.com/go/contactcenterinsights v1.6.0/go.mod h1:IIDlT6CLcDoyv79kDv8iWxMSTZhLxSCofVV5W6YFM/w=
-cloud.google.com/go/container v1.6.0/go.mod h1:Xazp7GjJSeUYo688S+6J5V+n/t+G5sKBTFkKNudGRxg=
-cloud.google.com/go/container v1.7.0/go.mod h1:Dp5AHtmothHGX3DwwIHPgq45Y8KmNsgN3amoYfxVkLo=
-cloud.google.com/go/container v1.13.1/go.mod h1:6wgbMPeQRw9rSnKBCAJXnds3Pzj03C4JHamr8asWKy4=
-cloud.google.com/go/containeranalysis v0.5.1/go.mod h1:1D92jd8gRR/c0fGMlymRgxWD3Qw9C1ff6/T7mLgVL8I=
-cloud.google.com/go/containeranalysis v0.6.0/go.mod h1:HEJoiEIu+lEXM+k7+qLCci0h33lX3ZqoYFdmPcoO7s4=
-cloud.google.com/go/containeranalysis v0.7.0/go.mod h1:9aUL+/vZ55P2CXfuZjS4UjQ9AgXoSw8Ts6lemfmxBxI=
-cloud.google.com/go/datacatalog v1.3.0/go.mod h1:g9svFY6tuR+j+hrTw3J2dNcmI0dzmSiyOzm8kpLq0a0=
-cloud.google.com/go/datacatalog v1.5.0/go.mod h1:M7GPLNQeLfWqeIm3iuiruhPzkt65+Bx8dAKvScX8jvs=
-cloud.google.com/go/datacatalog v1.6.0/go.mod h1:+aEyF8JKg+uXcIdAmmaMUmZ3q1b/lKLtXCmXdnc0lbc=
-cloud.google.com/go/datacatalog v1.7.0/go.mod h1:9mEl4AuDYWw81UGc41HonIHH7/sn52H0/tc8f8ZbZIE=
-cloud.google.com/go/datacatalog v1.8.0/go.mod h1:KYuoVOv9BM8EYz/4eMFxrr4DUKhGIOXxZoKYF5wdISM=
-cloud.google.com/go/datacatalog v1.8.1/go.mod h1:RJ58z4rMp3gvETA465Vg+ag8BGgBdnRPEMMSTr5Uv+M=
-cloud.google.com/go/datacatalog v1.12.0/go.mod h1:CWae8rFkfp6LzLumKOnmVh4+Zle4A3NXLzVJ1d1mRm0=
-cloud.google.com/go/dataflow v0.6.0/go.mod h1:9QwV89cGoxjjSR9/r7eFDqqjtvbKxAK2BaYU6PVk9UM=
-cloud.google.com/go/dataflow v0.7.0/go.mod h1:PX526vb4ijFMesO1o202EaUmouZKBpjHsTlCtB4parQ=
-cloud.google.com/go/dataflow v0.8.0/go.mod h1:Rcf5YgTKPtQyYz8bLYhFoIV/vP39eL7fWNcSOyFfLJE=
-cloud.google.com/go/dataform v0.3.0/go.mod h1:cj8uNliRlHpa6L3yVhDOBrUXH+BPAO1+KFMQQNSThKo=
-cloud.google.com/go/dataform v0.4.0/go.mod h1:fwV6Y4Ty2yIFL89huYlEkwUPtS7YZinZbzzj5S9FzCE=
-cloud.google.com/go/dataform v0.5.0/go.mod h1:GFUYRe8IBa2hcomWplodVmUx/iTL0FrsauObOM3Ipr0=
-cloud.google.com/go/dataform v0.6.0/go.mod h1:QPflImQy33e29VuapFdf19oPbE4aYTJxr31OAPV+ulA=
-cloud.google.com/go/datafusion v1.4.0/go.mod h1:1Zb6VN+W6ALo85cXnM1IKiPw+yQMKMhB9TsTSRDo/38=
-cloud.google.com/go/datafusion v1.5.0/go.mod h1:Kz+l1FGHB0J+4XF2fud96WMmRiq/wj8N9u007vyXZ2w=
-cloud.google.com/go/datafusion v1.6.0/go.mod h1:WBsMF8F1RhSXvVM8rCV3AeyWVxcC2xY6vith3iw3S+8=
-cloud.google.com/go/datalabeling v0.5.0/go.mod h1:TGcJ0G2NzcsXSE/97yWjIZO0bXj0KbVlINXMG9ud42I=
-cloud.google.com/go/datalabeling v0.6.0/go.mod h1:WqdISuk/+WIGeMkpw/1q7bK/tFEZxsrFJOJdY2bXvTQ=
-cloud.google.com/go/datalabeling v0.7.0/go.mod h1:WPQb1y08RJbmpM3ww0CSUAGweL0SxByuW2E+FU+wXcM=
-cloud.google.com/go/dataplex v1.3.0/go.mod h1:hQuRtDg+fCiFgC8j0zV222HvzFQdRd+SVX8gdmFcZzA=
-cloud.google.com/go/dataplex v1.4.0/go.mod h1:X51GfLXEMVJ6UN47ESVqvlsRplbLhcsAt0kZCCKsU0A=
-cloud.google.com/go/dataplex v1.5.2/go.mod h1:cVMgQHsmfRoI5KFYq4JtIBEUbYwc3c7tXmIDhRmNNVQ=
-cloud.google.com/go/dataproc v1.7.0/go.mod h1:CKAlMjII9H90RXaMpSxQ8EU6dQx6iAYNPcYPOkSbi8s=
-cloud.google.com/go/dataproc v1.8.0/go.mod h1:5OW+zNAH0pMpw14JVrPONsxMQYMBqJuzORhIBfBn9uI=
-cloud.google.com/go/dataproc v1.12.0/go.mod h1:zrF3aX0uV3ikkMz6z4uBbIKyhRITnxvr4i3IjKsKrw4=
-cloud.google.com/go/dataqna v0.5.0/go.mod h1:90Hyk596ft3zUQ8NkFfvICSIfHFh1Bc7C4cK3vbhkeo=
-cloud.google.com/go/dataqna v0.6.0/go.mod h1:1lqNpM7rqNLVgWBJyk5NF6Uen2PHym0jtVJonplVsDA=
-cloud.google.com/go/dataqna v0.7.0/go.mod h1:Lx9OcIIeqCrw1a6KdO3/5KMP1wAmTc0slZWwP12Qq3c=
 cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
 cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
-cloud.google.com/go/datastore v1.10.0/go.mod h1:PC5UzAmDEkAmkfaknstTYbNpgE49HAgW2J1gcgUfmdM=
-cloud.google.com/go/datastream v1.2.0/go.mod h1:i/uTP8/fZwgATHS/XFu0TcNUhuA0twZxxQ3EyCUQMwo=
-cloud.google.com/go/datastream v1.3.0/go.mod h1:cqlOX8xlyYF/uxhiKn6Hbv6WjwPPuI9W2M9SAXwaLLQ=
-cloud.google.com/go/datastream v1.4.0/go.mod h1:h9dpzScPhDTs5noEMQVWP8Wx8AFBRyS0s8KWPx/9r0g=
-cloud.google.com/go/datastream v1.5.0/go.mod h1:6TZMMNPwjUqZHBKPQ1wwXpb0d5VDVPl2/XoS5yi88q4=
-cloud.google.com/go/datastream v1.6.0/go.mod h1:6LQSuswqLa7S4rPAOZFVjHIG3wJIjZcZrw8JDEDJuIs=
-cloud.google.com/go/deploy v1.4.0/go.mod h1:5Xghikd4VrmMLNaF6FiRFDlHb59VM59YoDQnOUdsH/c=
-cloud.google.com/go/deploy v1.5.0/go.mod h1:ffgdD0B89tToyW/U/D2eL0jN2+IEV/3EMuXHA0l4r+s=
-cloud.google.com/go/deploy v1.6.0/go.mod h1:f9PTHehG/DjCom3QH0cntOVRm93uGBDt2vKzAPwpXQI=
-cloud.google.com/go/dialogflow v1.15.0/go.mod h1:HbHDWs33WOGJgn6rfzBW1Kv807BE3O1+xGbn59zZWI4=
-cloud.google.com/go/dialogflow v1.16.1/go.mod h1:po6LlzGfK+smoSmTBnbkIZY2w8ffjz/RcGSS+sh1el0=
-cloud.google.com/go/dialogflow v1.17.0/go.mod h1:YNP09C/kXA1aZdBgC/VtXX74G/TKn7XVCcVumTflA+8=
-cloud.google.com/go/dialogflow v1.18.0/go.mod h1:trO7Zu5YdyEuR+BhSNOqJezyFQ3aUzz0njv7sMx/iek=
-cloud.google.com/go/dialogflow v1.19.0/go.mod h1:JVmlG1TwykZDtxtTXujec4tQ+D8SBFMoosgy+6Gn0s0=
-cloud.google.com/go/dialogflow v1.29.0/go.mod h1:b+2bzMe+k1s9V+F2jbJwpHPzrnIyHihAdRFMtn2WXuM=
-cloud.google.com/go/dialogflow v1.31.0/go.mod h1:cuoUccuL1Z+HADhyIA7dci3N5zUssgpBJmCzI6fNRB4=
-cloud.google.com/go/dlp v1.6.0/go.mod h1:9eyB2xIhpU0sVwUixfBubDoRwP+GjeUoxxeueZmqvmM=
-cloud.google.com/go/dlp v1.7.0/go.mod h1:68ak9vCiMBjbasxeVD17hVPxDEck+ExiHavX8kiHG+Q=
-cloud.google.com/go/dlp v1.9.0/go.mod h1:qdgmqgTyReTz5/YNSSuueR8pl7hO0o9bQ39ZhtgkWp4=
-cloud.google.com/go/documentai v1.7.0/go.mod h1:lJvftZB5NRiFSX4moiye1SMxHx0Bc3x1+p9e/RfXYiU=
-cloud.google.com/go/documentai v1.8.0/go.mod h1:xGHNEB7CtsnySCNrCFdCyyMz44RhFEEX2Q7UD0c5IhU=
-cloud.google.com/go/documentai v1.9.0/go.mod h1:FS5485S8R00U10GhgBC0aNGrJxBP8ZVpEeJ7PQDZd6k=
-cloud.google.com/go/documentai v1.10.0/go.mod h1:vod47hKQIPeCfN2QS/jULIvQTugbmdc0ZvxxfQY1bg4=
-cloud.google.com/go/documentai v1.16.0/go.mod h1:o0o0DLTEZ+YnJZ+J4wNfTxmDVyrkzFvttBXXtYRMHkM=
-cloud.google.com/go/domains v0.6.0/go.mod h1:T9Rz3GasrpYk6mEGHh4rymIhjlnIuB4ofT1wTxDeT4Y=
-cloud.google.com/go/domains v0.7.0/go.mod h1:PtZeqS1xjnXuRPKE/88Iru/LdfoRyEHYA9nFQf4UKpg=
-cloud.google.com/go/domains v0.8.0/go.mod h1:M9i3MMDzGFXsydri9/vW+EWz9sWb4I6WyHqdlAk0idE=
-cloud.google.com/go/edgecontainer v0.1.0/go.mod h1:WgkZ9tp10bFxqO8BLPqv2LlfmQF1X8lZqwW4r1BTajk=
-cloud.google.com/go/edgecontainer v0.2.0/go.mod h1:RTmLijy+lGpQ7BXuTDa4C4ssxyXT34NIuHIgKuP4s5w=
-cloud.google.com/go/edgecontainer v0.3.0/go.mod h1:FLDpP4nykgwwIfcLt6zInhprzw0lEi2P1fjO6Ie0qbc=
-cloud.google.com/go/errorreporting v0.3.0/go.mod h1:xsP2yaAp+OAW4OIm60An2bbLpqIhKXdWR/tawvl7QzU=
-cloud.google.com/go/essentialcontacts v1.3.0/go.mod h1:r+OnHa5jfj90qIfZDO/VztSFqbQan7HV75p8sA+mdGI=
-cloud.google.com/go/essentialcontacts v1.4.0/go.mod h1:8tRldvHYsmnBCHdFpvU+GL75oWiBKl80BiqlFh9tp+8=
-cloud.google.com/go/essentialcontacts v1.5.0/go.mod h1:ay29Z4zODTuwliK7SnX8E86aUF2CTzdNtvv42niCX0M=
-cloud.google.com/go/eventarc v1.7.0/go.mod h1:6ctpF3zTnaQCxUjHUdcfgcA1A2T309+omHZth7gDfmc=
-cloud.google.com/go/eventarc v1.8.0/go.mod h1:imbzxkyAU4ubfsaKYdQg04WS1NvncblHEup4kvF+4gw=
-cloud.google.com/go/eventarc v1.10.0/go.mod h1:u3R35tmZ9HvswGRBnF48IlYgYeBcPUCjkr4BTdem2Kw=
-cloud.google.com/go/filestore v1.3.0/go.mod h1:+qbvHGvXU1HaKX2nD0WEPo92TP/8AQuCVEBXNY9z0+w=
-cloud.google.com/go/filestore v1.4.0/go.mod h1:PaG5oDfo9r224f8OYXURtAsY+Fbyq/bLYoINEK8XQAI=
-cloud.google.com/go/filestore v1.5.0/go.mod h1:FqBXDWBp4YLHqRnVGveOkHDf8svj9r5+mUDLupOWEDs=
-cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk=
-cloud.google.com/go/firestore v1.9.0/go.mod h1:HMkjKHNTtRyZNiMzu7YAsLr9K3X2udY2AMwDaMEQiiE=
-cloud.google.com/go/functions v1.6.0/go.mod h1:3H1UA3qiIPRWD7PeZKLvHZ9SaQhR26XIJcC0A5GbvAk=
-cloud.google.com/go/functions v1.7.0/go.mod h1:+d+QBcWM+RsrgZfV9xo6KfA1GlzJfxcfZcRPEhDDfzg=
-cloud.google.com/go/functions v1.8.0/go.mod h1:RTZ4/HsQjIqIYP9a9YPbU+QFoQsAlYgrwOXJWHn1POY=
-cloud.google.com/go/functions v1.9.0/go.mod h1:Y+Dz8yGguzO3PpIjhLTbnqV1CWmgQ5UwtlpzoyquQ08=
-cloud.google.com/go/functions v1.10.0/go.mod h1:0D3hEOe3DbEvCXtYOZHQZmD+SzYsi1YbI7dGvHfldXw=
-cloud.google.com/go/gaming v1.5.0/go.mod h1:ol7rGcxP/qHTRQE/RO4bxkXq+Fix0j6D4LFPzYTIrDM=
-cloud.google.com/go/gaming v1.6.0/go.mod h1:YMU1GEvA39Qt3zWGyAVA9bpYz/yAhTvaQ1t2sK4KPUA=
-cloud.google.com/go/gaming v1.7.0/go.mod h1:LrB8U7MHdGgFG851iHAfqUdLcKBdQ55hzXy9xBJz0+w=
-cloud.google.com/go/gaming v1.8.0/go.mod h1:xAqjS8b7jAVW0KFYeRUxngo9My3f33kFmua++Pi+ggM=
-cloud.google.com/go/gaming v1.9.0/go.mod h1:Fc7kEmCObylSWLO334NcO+O9QMDyz+TKC4v1D7X+Bc0=
-cloud.google.com/go/gkebackup v0.2.0/go.mod h1:XKvv/4LfG829/B8B7xRkk8zRrOEbKtEam6yNfuQNH60=
-cloud.google.com/go/gkebackup v0.3.0/go.mod h1:n/E671i1aOQvUxT541aTkCwExO/bTer2HDlj4TsBRAo=
-cloud.google.com/go/gkebackup v0.4.0/go.mod h1:byAyBGUwYGEEww7xsbnUTBHIYcOPy/PgUWUtOeRm9Vg=
-cloud.google.com/go/gkeconnect v0.5.0/go.mod h1:c5lsNAg5EwAy7fkqX/+goqFsU1Da/jQFqArp+wGNr/o=
-cloud.google.com/go/gkeconnect v0.6.0/go.mod h1:Mln67KyU/sHJEBY8kFZ0xTeyPtzbq9StAVvEULYK16A=
-cloud.google.com/go/gkeconnect v0.7.0/go.mod h1:SNfmVqPkaEi3bF/B3CNZOAYPYdg7sU+obZ+QTky2Myw=
-cloud.google.com/go/gkehub v0.9.0/go.mod h1:WYHN6WG8w9bXU0hqNxt8rm5uxnk8IH+lPY9J2TV7BK0=
-cloud.google.com/go/gkehub v0.10.0/go.mod h1:UIPwxI0DsrpsVoWpLB0stwKCP+WFVG9+y977wO+hBH0=
-cloud.google.com/go/gkehub v0.11.0/go.mod h1:JOWHlmN+GHyIbuWQPl47/C2RFhnFKH38jH9Ascu3n0E=
-cloud.google.com/go/gkemulticloud v0.3.0/go.mod h1:7orzy7O0S+5kq95e4Hpn7RysVA7dPs8W/GgfUtsPbrA=
-cloud.google.com/go/gkemulticloud v0.4.0/go.mod h1:E9gxVBnseLWCk24ch+P9+B2CoDFJZTyIgLKSalC7tuI=
-cloud.google.com/go/gkemulticloud v0.5.0/go.mod h1:W0JDkiyi3Tqh0TJr//y19wyb1yf8llHVto2Htf2Ja3Y=
-cloud.google.com/go/grafeas v0.2.0/go.mod h1:KhxgtF2hb0P191HlY5besjYm6MqTSTj3LSI+M+ByZHc=
-cloud.google.com/go/gsuiteaddons v1.3.0/go.mod h1:EUNK/J1lZEZO8yPtykKxLXI6JSVN2rg9bN8SXOa0bgM=
-cloud.google.com/go/gsuiteaddons v1.4.0/go.mod h1:rZK5I8hht7u7HxFQcFei0+AtfS9uSushomRlg+3ua1o=
-cloud.google.com/go/gsuiteaddons v1.5.0/go.mod h1:TFCClYLd64Eaa12sFVmUyG62tk4mdIsI7pAnSXRkcFo=
 cloud.google.com/go/iam v0.1.0/go.mod h1:vcUNEa0pEm0qRVpmWepWaFMIAI8/hjB9mO8rNCJtF6c=
+cloud.google.com/go/iam v0.3.0 h1:exkAomrVUuzx9kWFI1wm3KI0uoDeUFPB4kKGzx6x+Gc=
 cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY=
-cloud.google.com/go/iam v0.5.0/go.mod h1:wPU9Vt0P4UmCux7mqtRu6jcpPAb74cP1fh50J3QpkUc=
-cloud.google.com/go/iam v0.6.0/go.mod h1:+1AH33ueBne5MzYccyMHtEKqLE4/kJOibtffMHDMFMc=
-cloud.google.com/go/iam v0.7.0/go.mod h1:H5Br8wRaDGNc8XP3keLc4unfUUZeyH3Sfl9XpQEYOeg=
-cloud.google.com/go/iam v0.8.0/go.mod h1:lga0/y3iH6CX7sYqypWJ33hf7kkfXJag67naqGESjkE=
-cloud.google.com/go/iam v0.11.0/go.mod h1:9PiLDanza5D+oWFZiH1uG+RnRCfEGKoyl6yo4cgWZGY=
-cloud.google.com/go/iam v0.12.0/go.mod h1:knyHGviacl11zrtZUoDuYpDgLjvr28sLQaG0YB2GYAY=
-cloud.google.com/go/iam v1.0.1 h1:lyeCAU6jpnVNrE9zGQkTl3WgNgK/X+uWwaw0kynZJMU=
-cloud.google.com/go/iam v1.0.1/go.mod h1:yR3tmSL8BcZB4bxByRv2jkSIahVmCtfKZwLYGBalRE8=
-cloud.google.com/go/iap v1.4.0/go.mod h1:RGFwRJdihTINIe4wZ2iCP0zF/qu18ZwyKxrhMhygBEc=
-cloud.google.com/go/iap v1.5.0/go.mod h1:UH/CGgKd4KyohZL5Pt0jSKE4m3FR51qg6FKQ/z/Ix9A=
-cloud.google.com/go/iap v1.6.0/go.mod h1:NSuvI9C/j7UdjGjIde7t7HBz+QTwBcapPE07+sSRcLk=
-cloud.google.com/go/ids v1.1.0/go.mod h1:WIuwCaYVOzHIj2OhN9HAwvW+DBdmUAdcWlFxRl+KubM=
-cloud.google.com/go/ids v1.2.0/go.mod h1:5WXvp4n25S0rA/mQWAg1YEEBBq6/s+7ml1RDCW1IrcY=
-cloud.google.com/go/ids v1.3.0/go.mod h1:JBdTYwANikFKaDP6LtW5JAi4gubs57SVNQjemdt6xV4=
-cloud.google.com/go/iot v1.3.0/go.mod h1:r7RGh2B61+B8oz0AGE+J72AhA0G7tdXItODWsaA2oLs=
-cloud.google.com/go/iot v1.4.0/go.mod h1:dIDxPOn0UvNDUMD8Ger7FIaTuvMkj+aGk94RPP0iV+g=
-cloud.google.com/go/iot v1.5.0/go.mod h1:mpz5259PDl3XJthEmh9+ap0affn/MqNSP4My77Qql9o=
+cloud.google.com/go/kms v1.4.0 h1:iElbfoE61VeLhnZcGOltqL8HIly8Nhbe5t6JlH9GXjo=
 cloud.google.com/go/kms v1.4.0/go.mod h1:fajBHndQ+6ubNw6Ss2sSd+SWvjL26RNo/dr7uxsnnOA=
-cloud.google.com/go/kms v1.5.0/go.mod h1:QJS2YY0eJGBg3mnDfuaCyLauWwBJiHRboYxJ++1xJNg=
-cloud.google.com/go/kms v1.6.0/go.mod h1:Jjy850yySiasBUDi6KFUwUv2n1+o7QZFyuUJg6OgjA0=
-cloud.google.com/go/kms v1.9.0/go.mod h1:qb1tPTgfF9RQP8e1wq4cLFErVuTJv7UsSC915J8dh3w=
-cloud.google.com/go/kms v1.10.2 h1:8UePKEypK3SQ6g+4mn/s/VgE5L7XOh+FwGGRUqvY3Hw=
-cloud.google.com/go/kms v1.10.2/go.mod h1:9mX3Q6pdroWzL20pbK6RaOdBbXBEhMNgK4Pfz2bweb4=
-cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx5iDdxbWic=
-cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI=
-cloud.google.com/go/language v1.7.0/go.mod h1:DJ6dYN/W+SQOjF8e1hLQXMF21AkH2w9wiPzPCJa2MIE=
-cloud.google.com/go/language v1.8.0/go.mod h1:qYPVHf7SPoNNiCL2Dr0FfEFNil1qi3pQEyygwpgVKB8=
-cloud.google.com/go/language v1.9.0/go.mod h1:Ns15WooPM5Ad/5no/0n81yUetis74g3zrbeJBE+ptUY=
-cloud.google.com/go/lifesciences v0.5.0/go.mod h1:3oIKy8ycWGPUyZDR/8RNnTOYevhaMLqh5vLUXs9zvT8=
-cloud.google.com/go/lifesciences v0.6.0/go.mod h1:ddj6tSX/7BOnhxCSd3ZcETvtNr8NZ6t/iPhY2Tyfu08=
-cloud.google.com/go/lifesciences v0.8.0/go.mod h1:lFxiEOMqII6XggGbOnKiyZ7IBwoIqA84ClvoezaA/bo=
-cloud.google.com/go/logging v1.6.1/go.mod h1:5ZO0mHHbvm8gEmeEUHrmDlTDSu5imF6MUP9OfilNXBw=
-cloud.google.com/go/logging v1.7.0/go.mod h1:3xjP2CjkM3ZkO73aj4ASA5wRPGGCRrPIAeNqVNkzY8M=
-cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
-cloud.google.com/go/longrunning v0.3.0/go.mod h1:qth9Y41RRSUE69rDcOn6DdK3HfQfsUI0YSmW3iIlLJc=
-cloud.google.com/go/longrunning v0.4.1 h1:v+yFJOfKC3yZdY6ZUI933pIYdhyhV8S3NpWrXWmg7jM=
-cloud.google.com/go/longrunning v0.4.1/go.mod h1:4iWDqhBZ70CvZ6BfETbvam3T8FMvLK+eFj0E6AaRQTo=
-cloud.google.com/go/managedidentities v1.3.0/go.mod h1:UzlW3cBOiPrzucO5qWkNkh0w33KFtBJU281hacNvsdE=
-cloud.google.com/go/managedidentities v1.4.0/go.mod h1:NWSBYbEMgqmbZsLIyKvxrYbtqOsxY1ZrGM+9RgDqInM=
-cloud.google.com/go/managedidentities v1.5.0/go.mod h1:+dWcZ0JlUmpuxpIDfyP5pP5y0bLdRwOS4Lp7gMni/LA=
-cloud.google.com/go/maps v0.1.0/go.mod h1:BQM97WGyfw9FWEmQMpZ5T6cpovXXSd1cGmFma94eubI=
-cloud.google.com/go/maps v0.6.0/go.mod h1:o6DAMMfb+aINHz/p/jbcY+mYeXBoZoxTfdSQ8VAJaCw=
-cloud.google.com/go/mediatranslation v0.5.0/go.mod h1:jGPUhGTybqsPQn91pNXw0xVHfuJ3leR1wj37oU3y1f4=
-cloud.google.com/go/mediatranslation v0.6.0/go.mod h1:hHdBCTYNigsBxshbznuIMFNe5QXEowAuNmmC7h8pu5w=
-cloud.google.com/go/mediatranslation v0.7.0/go.mod h1:LCnB/gZr90ONOIQLgSXagp8XUW1ODs2UmUMvcgMfI2I=
-cloud.google.com/go/memcache v1.4.0/go.mod h1:rTOfiGZtJX1AaFUrOgsMHX5kAzaTQ8azHiuDoTPzNsE=
-cloud.google.com/go/memcache v1.5.0/go.mod h1:dk3fCK7dVo0cUU2c36jKb4VqKPS22BTkf81Xq617aWM=
-cloud.google.com/go/memcache v1.6.0/go.mod h1:XS5xB0eQZdHtTuTF9Hf8eJkKtR3pVRCcvJwtm68T3rA=
-cloud.google.com/go/memcache v1.7.0/go.mod h1:ywMKfjWhNtkQTxrWxCkCFkoPjLHPW6A7WOTVI8xy3LY=
-cloud.google.com/go/memcache v1.9.0/go.mod h1:8oEyzXCu+zo9RzlEaEjHl4KkgjlNDaXbCQeQWlzNFJM=
-cloud.google.com/go/metastore v1.5.0/go.mod h1:2ZNrDcQwghfdtCwJ33nM0+GrBGlVuh8rakL3vdPY3XY=
-cloud.google.com/go/metastore v1.6.0/go.mod h1:6cyQTls8CWXzk45G55x57DVQ9gWg7RiH65+YgPsNh9s=
-cloud.google.com/go/metastore v1.7.0/go.mod h1:s45D0B4IlsINu87/AsWiEVYbLaIMeUSoxlKKDqBGFS8=
-cloud.google.com/go/metastore v1.8.0/go.mod h1:zHiMc4ZUpBiM7twCIFQmJ9JMEkDSyZS9U12uf7wHqSI=
-cloud.google.com/go/metastore v1.10.0/go.mod h1:fPEnH3g4JJAk+gMRnrAnoqyv2lpUCqJPWOodSaf45Eo=
-cloud.google.com/go/monitoring v1.7.0/go.mod h1:HpYse6kkGo//7p6sT0wsIC6IBDET0RhIsnmlA53dvEk=
-cloud.google.com/go/monitoring v1.8.0/go.mod h1:E7PtoMJ1kQXWxPjB6mv2fhC5/15jInuulFdYYtlcvT4=
-cloud.google.com/go/monitoring v1.12.0/go.mod h1:yx8Jj2fZNEkL/GYZyTLS4ZtZEZN8WtDEiEqG4kLK50w=
-cloud.google.com/go/monitoring v1.13.0 h1:2qsrgXGVoRXpP7otZ14eE1I568zAa92sJSDPyOJvwjM=
-cloud.google.com/go/monitoring v1.13.0/go.mod h1:k2yMBAB1H9JT/QETjNkgdCGD9bPF712XiLTVr+cBrpw=
-cloud.google.com/go/networkconnectivity v1.4.0/go.mod h1:nOl7YL8odKyAOtzNX73/M5/mGZgqqMeryi6UPZTk/rA=
-cloud.google.com/go/networkconnectivity v1.5.0/go.mod h1:3GzqJx7uhtlM3kln0+x5wyFvuVH1pIBJjhCpjzSt75o=
-cloud.google.com/go/networkconnectivity v1.6.0/go.mod h1:OJOoEXW+0LAxHh89nXd64uGG+FbQoeH8DtxCHVOMlaM=
-cloud.google.com/go/networkconnectivity v1.7.0/go.mod h1:RMuSbkdbPwNMQjB5HBWD5MpTBnNm39iAVpC3TmsExt8=
-cloud.google.com/go/networkconnectivity v1.10.0/go.mod h1:UP4O4sWXJG13AqrTdQCD9TnLGEbtNRqjuaaA7bNjF5E=
-cloud.google.com/go/networkmanagement v1.4.0/go.mod h1:Q9mdLLRn60AsOrPc8rs8iNV6OHXaGcDdsIQe1ohekq8=
-cloud.google.com/go/networkmanagement v1.5.0/go.mod h1:ZnOeZ/evzUdUsnvRt792H0uYEnHQEMaz+REhhzJRcf4=
-cloud.google.com/go/networkmanagement v1.6.0/go.mod h1:5pKPqyXjB/sgtvB5xqOemumoQNB7y95Q7S+4rjSOPYY=
-cloud.google.com/go/networksecurity v0.5.0/go.mod h1:xS6fOCoqpVC5zx15Z/MqkfDwH4+m/61A3ODiDV1xmiQ=
-cloud.google.com/go/networksecurity v0.6.0/go.mod h1:Q5fjhTr9WMI5mbpRYEbiexTzROf7ZbDzvzCrNl14nyU=
-cloud.google.com/go/networksecurity v0.7.0/go.mod h1:mAnzoxx/8TBSyXEeESMy9OOYwo1v+gZ5eMRnsT5bC8k=
-cloud.google.com/go/notebooks v1.2.0/go.mod h1:9+wtppMfVPUeJ8fIWPOq1UnATHISkGXGqTkxeieQ6UY=
-cloud.google.com/go/notebooks v1.3.0/go.mod h1:bFR5lj07DtCPC7YAAJ//vHskFBxA5JzYlH68kXVdk34=
-cloud.google.com/go/notebooks v1.4.0/go.mod h1:4QPMngcwmgb6uw7Po99B2xv5ufVoIQ7nOGDyL4P8AgA=
-cloud.google.com/go/notebooks v1.5.0/go.mod h1:q8mwhnP9aR8Hpfnrc5iN5IBhrXUy8S2vuYs+kBJ/gu0=
-cloud.google.com/go/notebooks v1.7.0/go.mod h1:PVlaDGfJgj1fl1S3dUwhFMXFgfYGhYQt2164xOMONmE=
-cloud.google.com/go/optimization v1.1.0/go.mod h1:5po+wfvX5AQlPznyVEZjGJTMr4+CAkJf2XSTQOOl9l4=
-cloud.google.com/go/optimization v1.2.0/go.mod h1:Lr7SOHdRDENsh+WXVmQhQTrzdu9ybg0NecjHidBq6xs=
-cloud.google.com/go/optimization v1.3.1/go.mod h1:IvUSefKiwd1a5p0RgHDbWCIbDFgKuEdB+fPPuP0IDLI=
-cloud.google.com/go/orchestration v1.3.0/go.mod h1:Sj5tq/JpWiB//X/q3Ngwdl5K7B7Y0KZ7bfv0wL6fqVA=
-cloud.google.com/go/orchestration v1.4.0/go.mod h1:6W5NLFWs2TlniBphAViZEVhrXRSMgUGDfW7vrWKvsBk=
-cloud.google.com/go/orchestration v1.6.0/go.mod h1:M62Bevp7pkxStDfFfTuCOaXgaaqRAga1yKyoMtEoWPQ=
-cloud.google.com/go/orgpolicy v1.4.0/go.mod h1:xrSLIV4RePWmP9P3tBl8S93lTmlAxjm06NSm2UTmKvE=
-cloud.google.com/go/orgpolicy v1.5.0/go.mod h1:hZEc5q3wzwXJaKrsx5+Ewg0u1LxJ51nNFlext7Tanwc=
-cloud.google.com/go/orgpolicy v1.10.0/go.mod h1:w1fo8b7rRqlXlIJbVhOMPrwVljyuW5mqssvBtU18ONc=
-cloud.google.com/go/osconfig v1.7.0/go.mod h1:oVHeCeZELfJP7XLxcBGTMBvRO+1nQ5tFG9VQTmYS2Fs=
-cloud.google.com/go/osconfig v1.8.0/go.mod h1:EQqZLu5w5XA7eKizepumcvWx+m8mJUhEwiPqWiZeEdg=
-cloud.google.com/go/osconfig v1.9.0/go.mod h1:Yx+IeIZJ3bdWmzbQU4fxNl8xsZ4amB+dygAwFPlvnNo=
-cloud.google.com/go/osconfig v1.10.0/go.mod h1:uMhCzqC5I8zfD9zDEAfvgVhDS8oIjySWh+l4WK6GnWw=
-cloud.google.com/go/osconfig v1.11.0/go.mod h1:aDICxrur2ogRd9zY5ytBLV89KEgT2MKB2L/n6x1ooPw=
-cloud.google.com/go/oslogin v1.4.0/go.mod h1:YdgMXWRaElXz/lDk1Na6Fh5orF7gvmJ0FGLIs9LId4E=
-cloud.google.com/go/oslogin v1.5.0/go.mod h1:D260Qj11W2qx/HVF29zBg+0fd6YCSjSqLUkY/qEenQU=
-cloud.google.com/go/oslogin v1.6.0/go.mod h1:zOJ1O3+dTU8WPlGEkFSh7qeHPPSoxrcMbbK1Nm2iX70=
-cloud.google.com/go/oslogin v1.7.0/go.mod h1:e04SN0xO1UNJ1M5GP0vzVBFicIe4O53FOfcixIqTyXo=
-cloud.google.com/go/oslogin v1.9.0/go.mod h1:HNavntnH8nzrn8JCTT5fj18FuJLFJc4NaZJtBnQtKFs=
-cloud.google.com/go/phishingprotection v0.5.0/go.mod h1:Y3HZknsK9bc9dMi+oE8Bim0lczMU6hrX0UpADuMefr0=
-cloud.google.com/go/phishingprotection v0.6.0/go.mod h1:9Y3LBLgy0kDTcYET8ZH3bq/7qni15yVUoAxiFxnlSUA=
-cloud.google.com/go/phishingprotection v0.7.0/go.mod h1:8qJI4QKHoda/sb/7/YmMQ2omRLSLYSu9bU0EKCNI+Lk=
-cloud.google.com/go/policytroubleshooter v1.3.0/go.mod h1:qy0+VwANja+kKrjlQuOzmlvscn4RNsAc0e15GGqfMxg=
-cloud.google.com/go/policytroubleshooter v1.4.0/go.mod h1:DZT4BcRw3QoO8ota9xw/LKtPa8lKeCByYeKTIf/vxdE=
-cloud.google.com/go/policytroubleshooter v1.5.0/go.mod h1:Rz1WfV+1oIpPdN2VvvuboLVRsB1Hclg3CKQ53j9l8vw=
-cloud.google.com/go/privatecatalog v0.5.0/go.mod h1:XgosMUvvPyxDjAVNDYxJ7wBW8//hLDDYmnsNcMGq1K0=
-cloud.google.com/go/privatecatalog v0.6.0/go.mod h1:i/fbkZR0hLN29eEWiiwue8Pb+GforiEIBnV9yrRUOKI=
-cloud.google.com/go/privatecatalog v0.7.0/go.mod h1:2s5ssIFO69F5csTXcwBP7NPFTZvps26xGzvQ2PQaBYg=
+cloud.google.com/go/monitoring v1.2.0 h1:fEvQITrhVcPM6vuDQcgPMbU5kZFeQFwZmE7v6+S8BPo=
+cloud.google.com/go/monitoring v1.2.0/go.mod h1:tE8I08OzjWmXLhCopnPaUDpfGOEJOonfWXGR9E9SsFo=
 cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
 cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
 cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
 cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
-cloud.google.com/go/pubsub v1.26.0/go.mod h1:QgBH3U/jdJy/ftjPhTkyXNj543Tin1pRYcdcPRnFIRI=
-cloud.google.com/go/pubsub v1.27.1/go.mod h1:hQN39ymbV9geqBnfQq6Xf63yNhUAhv9CZhzp5O6qsW0=
-cloud.google.com/go/pubsub v1.28.0/go.mod h1:vuXFpwaVoIPQMGXqRyUQigu/AX1S3IWugR9xznmcXX8=
-cloud.google.com/go/pubsublite v1.5.0/go.mod h1:xapqNQ1CuLfGi23Yda/9l4bBCKz/wC3KIJ5gKcxveZg=
-cloud.google.com/go/pubsublite v1.6.0/go.mod h1:1eFCS0U11xlOuMFV/0iBqw3zP12kddMeCbj/F3FSj9k=
-cloud.google.com/go/recaptchaenterprise v1.3.1/go.mod h1:OdD+q+y4XGeAlxRaMn1Y7/GveP6zmq76byL6tjPE7d4=
-cloud.google.com/go/recaptchaenterprise/v2 v2.1.0/go.mod h1:w9yVqajwroDNTfGuhmOjPDN//rZGySaf6PtFVcSCa7o=
-cloud.google.com/go/recaptchaenterprise/v2 v2.2.0/go.mod h1:/Zu5jisWGeERrd5HnlS3EUGb/D335f9k51B/FVil0jk=
-cloud.google.com/go/recaptchaenterprise/v2 v2.3.0/go.mod h1:O9LwGCjrhGHBQET5CA7dd5NwwNQUErSgEDit1DLNTdo=
-cloud.google.com/go/recaptchaenterprise/v2 v2.4.0/go.mod h1:Am3LHfOuBstrLrNCBrlI5sbwx9LBg3te2N6hGvHn2mE=
-cloud.google.com/go/recaptchaenterprise/v2 v2.5.0/go.mod h1:O8LzcHXN3rz0j+LBC91jrwI3R+1ZSZEWrfL7XHgNo9U=
-cloud.google.com/go/recaptchaenterprise/v2 v2.6.0/go.mod h1:RPauz9jeLtB3JVzg6nCbe12qNoaa8pXc4d/YukAmcnA=
-cloud.google.com/go/recommendationengine v0.5.0/go.mod h1:E5756pJcVFeVgaQv3WNpImkFP8a+RptV6dDLGPILjvg=
-cloud.google.com/go/recommendationengine v0.6.0/go.mod h1:08mq2umu9oIqc7tDy8sx+MNJdLG0fUi3vaSVbztHgJ4=
-cloud.google.com/go/recommendationengine v0.7.0/go.mod h1:1reUcE3GIu6MeBz/h5xZJqNLuuVjNg1lmWMPyjatzac=
-cloud.google.com/go/recommender v1.5.0/go.mod h1:jdoeiBIVrJe9gQjwd759ecLJbxCDED4A6p+mqoqDvTg=
-cloud.google.com/go/recommender v1.6.0/go.mod h1:+yETpm25mcoiECKh9DEScGzIRyDKpZ0cEhWGo+8bo+c=
-cloud.google.com/go/recommender v1.7.0/go.mod h1:XLHs/W+T8olwlGOgfQenXBTbIseGclClff6lhFVe9Bs=
-cloud.google.com/go/recommender v1.8.0/go.mod h1:PkjXrTT05BFKwxaUxQmtIlrtj0kph108r02ZZQ5FE70=
-cloud.google.com/go/recommender v1.9.0/go.mod h1:PnSsnZY7q+VL1uax2JWkt/UegHssxjUVVCrX52CuEmQ=
-cloud.google.com/go/redis v1.7.0/go.mod h1:V3x5Jq1jzUcg+UNsRvdmsfuFnit1cfe3Z/PGyq/lm4Y=
-cloud.google.com/go/redis v1.8.0/go.mod h1:Fm2szCDavWzBk2cDKxrkmWBqoCiL1+Ctwq7EyqBCA/A=
-cloud.google.com/go/redis v1.9.0/go.mod h1:HMYQuajvb2D0LvMgZmLDZW8V5aOC/WxstZHiy4g8OiA=
-cloud.google.com/go/redis v1.10.0/go.mod h1:ThJf3mMBQtW18JzGgh41/Wld6vnDDc/F/F35UolRZPM=
-cloud.google.com/go/redis v1.11.0/go.mod h1:/X6eicana+BWcUda5PpwZC48o37SiFVTFSs0fWAJ7uQ=
-cloud.google.com/go/resourcemanager v1.3.0/go.mod h1:bAtrTjZQFJkiWTPDb1WBjzvc6/kifjj4QBYuKCCoqKA=
-cloud.google.com/go/resourcemanager v1.4.0/go.mod h1:MwxuzkumyTX7/a3n37gmsT3py7LIXwrShilPh3P1tR0=
-cloud.google.com/go/resourcemanager v1.5.0/go.mod h1:eQoXNAiAvCf5PXxWxXjhKQoTMaUSNrEfg+6qdf/wots=
-cloud.google.com/go/resourcesettings v1.3.0/go.mod h1:lzew8VfESA5DQ8gdlHwMrqZs1S9V87v3oCnKCWoOuQU=
-cloud.google.com/go/resourcesettings v1.4.0/go.mod h1:ldiH9IJpcrlC3VSuCGvjR5of/ezRrOxFtpJoJo5SmXg=
-cloud.google.com/go/resourcesettings v1.5.0/go.mod h1:+xJF7QSG6undsQDfsCJyqWXyBwUoJLhetkRMDRnIoXA=
-cloud.google.com/go/retail v1.8.0/go.mod h1:QblKS8waDmNUhghY2TI9O3JLlFk8jybHeV4BF19FrE4=
-cloud.google.com/go/retail v1.9.0/go.mod h1:g6jb6mKuCS1QKnH/dpu7isX253absFl6iE92nHwlBUY=
-cloud.google.com/go/retail v1.10.0/go.mod h1:2gDk9HsL4HMS4oZwz6daui2/jmKvqShXKQuB2RZ+cCc=
-cloud.google.com/go/retail v1.11.0/go.mod h1:MBLk1NaWPmh6iVFSz9MeKG/Psyd7TAgm6y/9L2B4x9Y=
-cloud.google.com/go/retail v1.12.0/go.mod h1:UMkelN/0Z8XvKymXFbD4EhFJlYKRx1FGhQkVPU5kF14=
-cloud.google.com/go/run v0.2.0/go.mod h1:CNtKsTA1sDcnqqIFR3Pb5Tq0usWxJJvsWOCPldRU3Do=
-cloud.google.com/go/run v0.3.0/go.mod h1:TuyY1+taHxTjrD0ZFk2iAR+xyOXEA0ztb7U3UNA0zBo=
-cloud.google.com/go/run v0.8.0/go.mod h1:VniEnuBwqjigv0A7ONfQUaEItaiCRVujlMqerPPiktM=
-cloud.google.com/go/scheduler v1.4.0/go.mod h1:drcJBmxF3aqZJRhmkHQ9b3uSSpQoltBPGPxGAWROx6s=
-cloud.google.com/go/scheduler v1.5.0/go.mod h1:ri073ym49NW3AfT6DZi21vLZrG07GXr5p3H1KxN5QlI=
-cloud.google.com/go/scheduler v1.6.0/go.mod h1:SgeKVM7MIwPn3BqtcBntpLyrIJftQISRrYB5ZtT+KOk=
-cloud.google.com/go/scheduler v1.7.0/go.mod h1:jyCiBqWW956uBjjPMMuX09n3x37mtyPJegEWKxRsn44=
-cloud.google.com/go/scheduler v1.8.0/go.mod h1:TCET+Y5Gp1YgHT8py4nlg2Sew8nUHMqcpousDgXJVQc=
-cloud.google.com/go/secretmanager v1.6.0/go.mod h1:awVa/OXF6IiyaU1wQ34inzQNc4ISIDIrId8qE5QGgKA=
-cloud.google.com/go/secretmanager v1.8.0/go.mod h1:hnVgi/bN5MYHd3Gt0SPuTPPp5ENina1/LxM+2W9U9J4=
-cloud.google.com/go/secretmanager v1.9.0/go.mod h1:b71qH2l1yHmWQHt9LC80akm86mX8AL6X1MA01dW8ht4=
-cloud.google.com/go/secretmanager v1.10.0/go.mod h1:MfnrdvKMPNra9aZtQFvBcvRU54hbPD8/HayQdlUgJpU=
-cloud.google.com/go/security v1.5.0/go.mod h1:lgxGdyOKKjHL4YG3/YwIL2zLqMFCKs0UbQwgyZmfJl4=
-cloud.google.com/go/security v1.7.0/go.mod h1:mZklORHl6Bg7CNnnjLH//0UlAlaXqiG7Lb9PsPXLfD0=
-cloud.google.com/go/security v1.8.0/go.mod h1:hAQOwgmaHhztFhiQ41CjDODdWP0+AE1B3sX4OFlq+GU=
-cloud.google.com/go/security v1.9.0/go.mod h1:6Ta1bO8LXI89nZnmnsZGp9lVoVWXqsVbIq/t9dzI+2Q=
-cloud.google.com/go/security v1.10.0/go.mod h1:QtOMZByJVlibUT2h9afNDWRZ1G96gVywH8T5GUSb9IA=
-cloud.google.com/go/security v1.12.0/go.mod h1:rV6EhrpbNHrrxqlvW0BWAIawFWq3X90SduMJdFwtLB8=
-cloud.google.com/go/securitycenter v1.13.0/go.mod h1:cv5qNAqjY84FCN6Y9z28WlkKXyWsgLO832YiWwkCWcU=
-cloud.google.com/go/securitycenter v1.14.0/go.mod h1:gZLAhtyKv85n52XYWt6RmeBdydyxfPeTrpToDPw4Auc=
-cloud.google.com/go/securitycenter v1.15.0/go.mod h1:PeKJ0t8MoFmmXLXWm41JidyzI3PJjd8sXWaVqg43WWk=
-cloud.google.com/go/securitycenter v1.16.0/go.mod h1:Q9GMaLQFUD+5ZTabrbujNWLtSLZIZF7SAR0wWECrjdk=
-cloud.google.com/go/securitycenter v1.18.1/go.mod h1:0/25gAzCM/9OL9vVx4ChPeM/+DlfGQJDwBy/UC8AKK0=
-cloud.google.com/go/servicecontrol v1.4.0/go.mod h1:o0hUSJ1TXJAmi/7fLJAedOovnujSEvjKCAFNXPQ1RaU=
-cloud.google.com/go/servicecontrol v1.5.0/go.mod h1:qM0CnXHhyqKVuiZnGKrIurvVImCs8gmqWsDoqe9sU1s=
-cloud.google.com/go/servicecontrol v1.11.0/go.mod h1:kFmTzYzTUIuZs0ycVqRHNaNhgR+UMUpw9n02l/pY+mc=
-cloud.google.com/go/servicedirectory v1.4.0/go.mod h1:gH1MUaZCgtP7qQiI+F+A+OpeKF/HQWgtAddhTbhL2bs=
-cloud.google.com/go/servicedirectory v1.5.0/go.mod h1:QMKFL0NUySbpZJ1UZs3oFAmdvVxhhxB6eJ/Vlp73dfg=
-cloud.google.com/go/servicedirectory v1.6.0/go.mod h1:pUlbnWsLH9c13yGkxCmfumWEPjsRs1RlmJ4pqiNjVL4=
-cloud.google.com/go/servicedirectory v1.7.0/go.mod h1:5p/U5oyvgYGYejufvxhgwjL8UVXjkuw7q5XcG10wx1U=
-cloud.google.com/go/servicedirectory v1.8.0/go.mod h1:srXodfhY1GFIPvltunswqXpVxFPpZjf8nkKQT7XcXaY=
-cloud.google.com/go/servicemanagement v1.4.0/go.mod h1:d8t8MDbezI7Z2R1O/wu8oTggo3BI2GKYbdG4y/SJTco=
-cloud.google.com/go/servicemanagement v1.5.0/go.mod h1:XGaCRe57kfqu4+lRxaFEAuqmjzF0r+gWHjWqKqBvKFo=
-cloud.google.com/go/servicemanagement v1.6.0/go.mod h1:aWns7EeeCOtGEX4OvZUWCCJONRZeFKiptqKf1D0l/Jc=
-cloud.google.com/go/serviceusage v1.3.0/go.mod h1:Hya1cozXM4SeSKTAgGXgj97GlqUvF5JaoXacR1JTP/E=
-cloud.google.com/go/serviceusage v1.4.0/go.mod h1:SB4yxXSaYVuUBYUml6qklyONXNLt83U0Rb+CXyhjEeU=
-cloud.google.com/go/serviceusage v1.5.0/go.mod h1:w8U1JvqUqwJNPEOTQjrMHkw3IaIFLoLsPLvsE3xueec=
-cloud.google.com/go/shell v1.3.0/go.mod h1:VZ9HmRjZBsjLGXusm7K5Q5lzzByZmJHf1d0IWHEN5X4=
-cloud.google.com/go/shell v1.4.0/go.mod h1:HDxPzZf3GkDdhExzD/gs8Grqk+dmYcEjGShZgYa9URw=
-cloud.google.com/go/shell v1.6.0/go.mod h1:oHO8QACS90luWgxP3N9iZVuEiSF84zNyLytb+qE2f9A=
-cloud.google.com/go/spanner v1.41.0/go.mod h1:MLYDBJR/dY4Wt7ZaMIQ7rXOTLjYrmxLE/5ve9vFfWos=
-cloud.google.com/go/spanner v1.44.0/go.mod h1:G8XIgYdOK+Fbcpbs7p2fiprDw4CaZX63whnSMLVBxjk=
-cloud.google.com/go/spanner v1.45.0 h1:7VdjZ8zj4sHbDw55atp5dfY6kn1j9sam9DRNpPQhqR4=
-cloud.google.com/go/spanner v1.45.0/go.mod h1:FIws5LowYz8YAE1J8fOS7DJup8ff7xJeetWEo5REA2M=
-cloud.google.com/go/speech v1.6.0/go.mod h1:79tcr4FHCimOp56lwC01xnt/WPJZc4v3gzyT7FoBkCM=
-cloud.google.com/go/speech v1.7.0/go.mod h1:KptqL+BAQIhMsj1kOP2la5DSEEerPDuOP/2mmkhHhZQ=
-cloud.google.com/go/speech v1.8.0/go.mod h1:9bYIl1/tjsAnMgKGHKmBZzXKEkGgtU+MpdDPTE9f7y0=
-cloud.google.com/go/speech v1.9.0/go.mod h1:xQ0jTcmnRFFM2RfX/U+rk6FQNUF6DQlydUSyoooSpco=
-cloud.google.com/go/speech v1.14.1/go.mod h1:gEosVRPJ9waG7zqqnsHpYTOoAS4KouMRLDFMekpJ0J0=
+cloud.google.com/go/spanner v1.5.1 h1:dWyj10TLlaxH2No6+tXsSCaq9oWgrRbXy1N3x/bhMGU=
+cloud.google.com/go/spanner v1.5.1/go.mod h1:e1+8M6PF3ntV9Xr57X2Gf+UhylXXYF6gI4WRZ1kfu2A=
 cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
 cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
 cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
+cloud.google.com/go/storage v1.10.0 h1:STgFzyU5/8miMl0//zKh2aQeTyeaUH3WN9bSUiJ09bA=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
-cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
-cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq6kuBTW58Y=
-cloud.google.com/go/storage v1.23.0/go.mod h1:vOEEDNFnciUMhBeT6hsJIn3ieU5cFRmzeLgDvXzfIXc=
-cloud.google.com/go/storage v1.27.0/go.mod h1:x9DOL8TK/ygDUMieqwfhdpQryTeEkhGKMi80i/iqR2s=
-cloud.google.com/go/storage v1.28.1 h1:F5QDG5ChchaAVQhINh24U99OWHURqrW8OmQcGKXcbgI=
-cloud.google.com/go/storage v1.28.1/go.mod h1:Qnisd4CqDdo6BGs2AD5LLnEsmSQ80wQ5ogcBBKhU86Y=
-cloud.google.com/go/storagetransfer v1.5.0/go.mod h1:dxNzUopWy7RQevYFHewchb29POFv3/AaBgnhqzqiK0w=
-cloud.google.com/go/storagetransfer v1.6.0/go.mod h1:y77xm4CQV/ZhFZH75PLEXY0ROiS7Gh6pSKrM8dJyg6I=
-cloud.google.com/go/storagetransfer v1.7.0/go.mod h1:8Giuj1QNb1kfLAiWM1bN6dHzfdlDAVC9rv9abHot2W4=
-cloud.google.com/go/talent v1.1.0/go.mod h1:Vl4pt9jiHKvOgF9KoZo6Kob9oV4lwd/ZD5Cto54zDRw=
-cloud.google.com/go/talent v1.2.0/go.mod h1:MoNF9bhFQbiJ6eFD3uSsg0uBALw4n4gaCaEjBw9zo8g=
-cloud.google.com/go/talent v1.3.0/go.mod h1:CmcxwJ/PKfRgd1pBjQgU6W3YBwiewmUzQYH5HHmSCmM=
-cloud.google.com/go/talent v1.4.0/go.mod h1:ezFtAgVuRf8jRsvyE6EwmbTK5LKciD4KVnHuDEFmOOA=
-cloud.google.com/go/talent v1.5.0/go.mod h1:G+ODMj9bsasAEJkQSzO2uHQWXHHXUomArjWQQYkqK6c=
-cloud.google.com/go/texttospeech v1.4.0/go.mod h1:FX8HQHA6sEpJ7rCMSfXuzBcysDAuWusNNNvN9FELDd8=
-cloud.google.com/go/texttospeech v1.5.0/go.mod h1:oKPLhR4n4ZdQqWKURdwxMy0uiTS1xU161C8W57Wkea4=
-cloud.google.com/go/texttospeech v1.6.0/go.mod h1:YmwmFT8pj1aBblQOI3TfKmwibnsfvhIBzPXcW4EBovc=
-cloud.google.com/go/tpu v1.3.0/go.mod h1:aJIManG0o20tfDQlRIej44FcwGGl/cD0oiRyMKG19IQ=
-cloud.google.com/go/tpu v1.4.0/go.mod h1:mjZaX8p0VBgllCzF6wcU2ovUXN9TONFLd7iz227X2Xg=
-cloud.google.com/go/tpu v1.5.0/go.mod h1:8zVo1rYDFuW2l4yZVY0R0fb/v44xLh3llq7RuV61fPM=
-cloud.google.com/go/trace v1.3.0/go.mod h1:FFUE83d9Ca57C+K8rDl/Ih8LwOzWIV1krKgxg6N0G28=
-cloud.google.com/go/trace v1.4.0/go.mod h1:UG0v8UBqzusp+z63o7FK74SdFE+AXpCLdFb1rshXG+Y=
-cloud.google.com/go/trace v1.8.0/go.mod h1:zH7vcsbAhklH8hWFig58HvxcxyQbaIqMarMg9hn5ECA=
-cloud.google.com/go/translate v1.3.0/go.mod h1:gzMUwRjvOqj5i69y/LYLd8RrNQk+hOmIXTi9+nb3Djs=
-cloud.google.com/go/translate v1.4.0/go.mod h1:06Dn/ppvLD6WvA5Rhdp029IX2Mi3Mn7fpMRLPvXT5Wg=
-cloud.google.com/go/translate v1.6.0/go.mod h1:lMGRudH1pu7I3n3PETiOB2507gf3HnfLV8qlkHZEyos=
-cloud.google.com/go/video v1.8.0/go.mod h1:sTzKFc0bUSByE8Yoh8X0mn8bMymItVGPfTuUBUyRgxk=
-cloud.google.com/go/video v1.9.0/go.mod h1:0RhNKFRF5v92f8dQt0yhaHrEuH95m068JYOvLZYnJSw=
-cloud.google.com/go/video v1.13.0/go.mod h1:ulzkYlYgCp15N2AokzKjy7MQ9ejuynOJdf1tR5lGthk=
-cloud.google.com/go/videointelligence v1.6.0/go.mod h1:w0DIDlVRKtwPCn/C4iwZIJdvC69yInhW0cfi+p546uU=
-cloud.google.com/go/videointelligence v1.7.0/go.mod h1:k8pI/1wAhjznARtVT9U1llUaFNPh7muw8QyOUpavru4=
-cloud.google.com/go/videointelligence v1.8.0/go.mod h1:dIcCn4gVDdS7yte/w+koiXn5dWVplOZkE+xwG9FgK+M=
-cloud.google.com/go/videointelligence v1.9.0/go.mod h1:29lVRMPDYHikk3v8EdPSaL8Ku+eMzDljjuvRs105XoU=
-cloud.google.com/go/videointelligence v1.10.0/go.mod h1:LHZngX1liVtUhZvi2uNS0VQuOzNi2TkY1OakiuoUOjU=
-cloud.google.com/go/vision v1.2.0/go.mod h1:SmNwgObm5DpFBme2xpyOyasvBc1aPdjvMk2bBk0tKD0=
-cloud.google.com/go/vision/v2 v2.2.0/go.mod h1:uCdV4PpN1S0jyCyq8sIM42v2Y6zOLkZs+4R9LrGYwFo=
-cloud.google.com/go/vision/v2 v2.3.0/go.mod h1:UO61abBx9QRMFkNBbf1D8B1LXdS2cGiiCRx0vSpZoUo=
-cloud.google.com/go/vision/v2 v2.4.0/go.mod h1:VtI579ll9RpVTrdKdkMzckdnwMyX2JILb+MhPqRbPsY=
-cloud.google.com/go/vision/v2 v2.5.0/go.mod h1:MmaezXOOE+IWa+cS7OhRRLK2cNv1ZL98zhqFFZaaH2E=
-cloud.google.com/go/vision/v2 v2.6.0/go.mod h1:158Hes0MvOS9Z/bDMSFpjwsUrZ5fPrdwuyyvKSGAGMY=
-cloud.google.com/go/vmmigration v1.2.0/go.mod h1:IRf0o7myyWFSmVR1ItrBSFLFD/rJkfDCUTO4vLlJvsE=
-cloud.google.com/go/vmmigration v1.3.0/go.mod h1:oGJ6ZgGPQOFdjHuocGcLqX4lc98YQ7Ygq8YQwHh9A7g=
-cloud.google.com/go/vmmigration v1.5.0/go.mod h1:E4YQ8q7/4W9gobHjQg4JJSgXXSgY21nA5r8swQV+Xxc=
-cloud.google.com/go/vmwareengine v0.1.0/go.mod h1:RsdNEf/8UDvKllXhMz5J40XxDrNJNN4sagiox+OI208=
-cloud.google.com/go/vmwareengine v0.2.2/go.mod h1:sKdctNJxb3KLZkE/6Oui94iw/xs9PRNC2wnNLXsHvH8=
-cloud.google.com/go/vpcaccess v1.4.0/go.mod h1:aQHVbTWDYUR1EbTApSVvMq1EnT57ppDmQzZ3imqIk4w=
-cloud.google.com/go/vpcaccess v1.5.0/go.mod h1:drmg4HLk9NkZpGfCmZ3Tz0Bwnm2+DKqViEpeEpOq0m8=
-cloud.google.com/go/vpcaccess v1.6.0/go.mod h1:wX2ILaNhe7TlVa4vC5xce1bCnqE3AeH27RV31lnmZes=
-cloud.google.com/go/webrisk v1.4.0/go.mod h1:Hn8X6Zr+ziE2aNd8SliSDWpEnSS1u4R9+xXZmFiHmGE=
-cloud.google.com/go/webrisk v1.5.0/go.mod h1:iPG6fr52Tv7sGk0H6qUFzmL3HHZev1htXuWDEEsqMTg=
-cloud.google.com/go/webrisk v1.6.0/go.mod h1:65sW9V9rOosnc9ZY7A7jsy1zoHS5W9IAXv6dGqhMQMc=
-cloud.google.com/go/webrisk v1.7.0/go.mod h1:mVMHgEYH0r337nmt1JyLthzMr6YxwN1aAIEc2fTcq7A=
-cloud.google.com/go/webrisk v1.8.0/go.mod h1:oJPDuamzHXgUc+b8SiHRcVInZQuybnvEW72PqTc7sSg=
-cloud.google.com/go/websecurityscanner v1.3.0/go.mod h1:uImdKm2wyeXQevQJXeh8Uun/Ym1VqworNDlBXQevGMo=
-cloud.google.com/go/websecurityscanner v1.4.0/go.mod h1:ebit/Fp0a+FWu5j4JOmJEV8S8CzdTkAS77oDsiSqYWQ=
-cloud.google.com/go/websecurityscanner v1.5.0/go.mod h1:Y6xdCPy81yi0SQnDY1xdNTNpfY1oAgXUlcfN3B3eSng=
-cloud.google.com/go/workflows v1.6.0/go.mod h1:6t9F5h/unJz41YqfBmqSASJSXccBLtD1Vwf+KmJENM0=
-cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoISEXH2bcHC3M=
-cloud.google.com/go/workflows v1.8.0/go.mod h1:ysGhmEajwZxGn1OhGOGKsTXc5PyxOc0vfKf5Af+to4M=
-cloud.google.com/go/workflows v1.9.0/go.mod h1:ZGkj1aFIOd9c8Gerkjjq7OW7I5+l6cSvT3ujaO/WwSA=
-cloud.google.com/go/workflows v1.10.0/go.mod h1:fZ8LmRmZQWacon9UCX1r/g/DfAXx5VcPALq2CxzdePw=
 code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f h1:UrKzEwTgeiff9vxdrfdqxibzpWjxLnuXDI5m6z3GJAk=
 code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f/go.mod h1:sk5LnIjB/nIEU7yP5sDQExVm62wu0pBh3yrElngUisI=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8=
-git.sr.ht/~sbinet/gg v0.3.1/go.mod h1:KGYtlADtqsqANL9ueOFkWymvzUvLMQllU5Ixo+8v3pc=
-github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 h1:/vQbFIOMbk2FiG/kXiLl8BRyzTWDw7gX/Hz7Dd5eDMs=
-github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4/go.mod h1:hN7oaIRCjzsZ2dE+yG5k+rsdt3qcwykqK6HVGcKwsw4=
-github.com/99designs/keyring v1.2.1/go.mod h1:fc+wB5KTk9wQ9sDx0kFXB3A0MaeGHM9AwRStKOQ5vOA=
-github.com/99designs/keyring v1.2.2 h1:pZd3neh/EmUzWONb35LxQfvuY7kiSXAq3HQd97+XBn0=
-github.com/99designs/keyring v1.2.2/go.mod h1:wes/FrByc8j7lFOAGLGSNEg8f/PaI3cgTBqhFkHUrPk=
-github.com/AdaLogics/go-fuzz-headers v0.0.0-20210715213245-6c3934b029d8/go.mod h1:CzsSbkDixRphAF5hS6wbMKq0eI6ccJRb7/A0M6JBnwg=
-github.com/AdaLogics/go-fuzz-headers v0.0.0-20221206110420-d395f97c4830/go.mod h1:VzwV+t+dZ9j/H867F1M2ziD+yLHtB46oM35FxxMJ4d0=
-github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1/go.mod h1:VzwV+t+dZ9j/H867F1M2ziD+yLHtB46oM35FxxMJ4d0=
-github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20221215162035-5330a85ea652/go.mod h1:OahwfttHWG6eJ0clwcfBAHoDI6X/LV/15hx/wlMZSrU=
 github.com/Azure/azure-pipeline-go v0.2.3 h1:7U9HBg1JFK3jHl5qmo4CTZKFTVgMwdFHMVtCdfBE21U=
 github.com/Azure/azure-pipeline-go v0.2.3/go.mod h1:x841ezTBIMG6O3lAcl8ATHnsOPVl2bqk7S3ta6S6u4k=
 github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/azure-sdk-for-go v44.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
-github.com/Azure/azure-sdk-for-go v56.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
-github.com/Azure/azure-sdk-for-go v67.2.0+incompatible h1:Uu/Ww6ernvPTrpq31kITVTIm/I5jlJ1wjtEH/bmSB2k=
-github.com/Azure/azure-sdk-for-go v67.2.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
+github.com/Azure/azure-sdk-for-go v58.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
+github.com/Azure/azure-sdk-for-go v62.0.0+incompatible h1:8N2k27SYtc12qj5nTsuFMFJPZn5CGmgMWqTy4y9I7Jw=
+github.com/Azure/azure-sdk-for-go v62.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v0.19.0/go.mod h1:h6H6c8enJmmocHUbLiiGY6sx7f9i+X3m1CHdd5c6Rdw=
-github.com/Azure/azure-sdk-for-go/sdk/azcore v1.6.0 h1:8kDqDngH+DmVBiCtIjCFTGa7MBnsIOkF9IccInFEbjk=
-github.com/Azure/azure-sdk-for-go/sdk/azcore v1.6.0/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q=
 github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.11.0/go.mod h1:HcM1YX14R7CJcghJGOYCgdezslRSVzqwLf/q+4Y2r/0=
-github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0 h1:vcYCAze6p19qBW7MhZybIsqD8sMV8js0NyQM8JDnVtg=
-github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0/go.mod h1:OQeznEEkTZ9OrhHJoDD8ZDq51FHgXjqtP9z6bEwBq9U=
 github.com/Azure/azure-sdk-for-go/sdk/internal v0.7.0/go.mod h1:yqy467j36fJxcRV2TzfVZ1pCb5vxm4BtZPUdYWe/Xo8=
-github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 h1:sXr+ck84g/ZlZUOZiNELInmMgOsuGwdjjVkEIde0OtY=
-github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0/go.mod h1:okt5dMMTOFjX/aovMlrjvvXoPMBVSPzk9185BT0+eZM=
-github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v4 v4.2.1 h1:UPeCRD+XY7QlaGQte2EVI2iOcWvUYA2XY8w5T/8v0NQ=
-github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v4 v4.2.1/go.mod h1:oGV6NlB0cvi1ZbYRR2UN44QHxWFyGk+iylgD0qaMXjA=
-github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/internal v1.1.2 h1:mLY+pNLjCUeKhgnAJWAKhEUQM+RJQo2H1fuGSw1Ky1E=
-github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/managementgroups/armmanagementgroups v1.0.0 h1:pPvTJ1dY0sA35JOeFq6TsY2xj6Z85Yo23Pj4wCCvu4o=
-github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/msi/armmsi v1.1.0 h1:Q707jfTFqfunSnh73YkCBDXR3GQJKno3chPRxXw//ho=
-github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/msi/armmsi v1.1.0/go.mod h1:vjoxsjVnPwhjHZw4PuuhpgYlcxWl5tyNedLHUl0ulFA=
-github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork v1.0.0 h1:nBy98uKOIfun5z6wx6jwWLrULcM0+cjBalBFZlEZ7CA=
-github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.1.1 h1:7CBQ+Ei8SP2c6ydQTGCCrS35bDxgTMfoP2miAwK++OU=
-github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.1.1/go.mod h1:c/wcGeGx5FUPbM/JltUYHZcKmigwyVLJlDq+4HdtXaw=
-github.com/Azure/azure-storage-blob-go v0.15.0 h1:rXtgp8tN1p29GvpGgfJetavIG0V7OgcSXPpwp3tx6qk=
-github.com/Azure/azure-storage-blob-go v0.15.0/go.mod h1:vbjsVbX0dlxnRc4FFMPsS9BsJWPcne7GB7onqlPvz58=
+github.com/Azure/azure-storage-blob-go v0.14.0 h1:1BCg74AmVdYwO3dlKwtFU1V0wU2PZdREkXvAmZJRUlM=
+github.com/Azure/azure-storage-blob-go v0.14.0/go.mod h1:SMqIBi+SuiQH32bvyjngEewEeXoPfKMgWlBDaYf6fck=
 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
-github.com/Azure/go-ansiterm v0.0.0-20210608223527-2377c96fe795/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
+github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8=
 github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
-github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0=
-github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
 github.com/Azure/go-autorest v10.8.1+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
 github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs=
 github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
 github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
 github.com/Azure/go-autorest/autorest v0.11.0/go.mod h1:JFgpikqFJ/MleTTxwepExTKnFUKKszPS8UavbQYUMuw=
 github.com/Azure/go-autorest/autorest v0.11.1/go.mod h1:JFgpikqFJ/MleTTxwepExTKnFUKKszPS8UavbQYUMuw=
+github.com/Azure/go-autorest/autorest v0.11.17/go.mod h1:eipySxLmqSyC5s5k1CLupqet0PSENBEDP93LQ9a8QYw=
 github.com/Azure/go-autorest/autorest v0.11.18/go.mod h1:dSiJPy22c3u0OtOKDNttNgqpNFY/GeWa7GH/Pz56QRA=
+github.com/Azure/go-autorest/autorest v0.11.21/go.mod h1:Do/yuMSW/13ayUkcVREpsMHGG+MvV81uzSCFgYPj4tM=
+github.com/Azure/go-autorest/autorest v0.11.24 h1:1fIGgHKqVm54KIPT+q8Zmd1QlVsmHqeUGso5qm2BqqE=
 github.com/Azure/go-autorest/autorest v0.11.24/go.mod h1:G6kyRlFnTuSbEYkQGawPfsCswgme4iYf6rfSKUDzbCc=
-github.com/Azure/go-autorest/autorest v0.11.29 h1:I4+HL/JDvErx2LjyzaVxllw2lRDB5/BT2Bm4g20iqYw=
-github.com/Azure/go-autorest/autorest v0.11.29/go.mod h1:ZtEzC4Jy2JDrZLxvWs8LrBWEBycl1hbT1eknI8MtfAs=
 github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0=
 github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod h1:/c022QCutn2P7uY+/oQWWNcK9YU+MH96NgK+jErpbcg=
 github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A=
+github.com/Azure/go-autorest/autorest/adal v0.9.11/go.mod h1:nBKAnTomx8gDtl+3ZCJv2v0KACFHWTB2drffI1B68Pk=
 github.com/Azure/go-autorest/autorest/adal v0.9.13/go.mod h1:W/MM4U6nLxnIskrw4UwWzlHfGjwUS50aOsc/I3yuU8M=
+github.com/Azure/go-autorest/autorest/adal v0.9.14/go.mod h1:W/MM4U6nLxnIskrw4UwWzlHfGjwUS50aOsc/I3yuU8M=
+github.com/Azure/go-autorest/autorest/adal v0.9.18 h1:kLnPsRjzZZUF3K5REu/Kc+qMQrvuza2bwSnNdhmzLfQ=
 github.com/Azure/go-autorest/autorest/adal v0.9.18/go.mod h1:XVVeme+LZwABT8K5Lc3hA4nAe8LDBVle26gTrguhhPQ=
-github.com/Azure/go-autorest/autorest/adal v0.9.22 h1:/GblQdIudfEM3AWWZ0mrYJQSd7JS4S/Mbzh6F0ov0Xc=
-github.com/Azure/go-autorest/autorest/adal v0.9.22/go.mod h1:XuAbAEUv2Tta//+voMI038TrJBqjKam0me7qR+L8Cmk=
 github.com/Azure/go-autorest/autorest/azure/auth v0.5.0/go.mod h1:QRTvSZQpxqm8mSErhnbI+tANIBAKP7B+UIE2z4ypUO0=
-github.com/Azure/go-autorest/autorest/azure/auth v0.5.12 h1:wkAZRgT/pn8HhFyzfe9UnqOjJYqlembgCTi72Bm/xKk=
-github.com/Azure/go-autorest/autorest/azure/auth v0.5.12/go.mod h1:84w/uV8E37feW2NCJ08uT9VBfjfUHpgLVnG2InYD6cg=
+github.com/Azure/go-autorest/autorest/azure/auth v0.5.8/go.mod h1:kxyKZTSfKh8OVFWPAgOgQ/frrJgeYQJPyR5fLFmXko4=
+github.com/Azure/go-autorest/autorest/azure/auth v0.5.11 h1:P6bYXFoao05z5uhOQzbC3Qd8JqF3jUoocoTeIxkp2cA=
+github.com/Azure/go-autorest/autorest/azure/auth v0.5.11/go.mod h1:84w/uV8E37feW2NCJ08uT9VBfjfUHpgLVnG2InYD6cg=
 github.com/Azure/go-autorest/autorest/azure/cli v0.4.0/go.mod h1:JljT387FplPzBA31vUcvsetLKF3pec5bdAxjVU4kI2s=
+github.com/Azure/go-autorest/autorest/azure/cli v0.4.2/go.mod h1:7qkJkT+j6b+hIpzMOwPChJhTqS8VbsqqgULzMNRugoM=
 github.com/Azure/go-autorest/autorest/azure/cli v0.4.5 h1:0W/yGmFdTIT77fvdlGZ0LMISoLHFJ7Tx4U0yeB+uFs4=
 github.com/Azure/go-autorest/autorest/azure/cli v0.4.5/go.mod h1:ADQAXrkgm7acgWVUNamOgh8YNrv4p27l3Wc55oVfpzg=
 github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA=
@@ -601,11 +117,11 @@ github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSY
 github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
 github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
 github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k=
+github.com/Azure/go-autorest/autorest/mocks v0.4.1 h1:K0laFcLE6VLTOwNgSxaGbUcLPuGXlNkbVvq4cW4nIHk=
 github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k=
-github.com/Azure/go-autorest/autorest/mocks v0.4.2 h1:PGN4EDXnuQbojHbU0UWoNvmu9AGVwYHG9/fkDYhtAfw=
-github.com/Azure/go-autorest/autorest/mocks v0.4.2/go.mod h1:Vy7OitM9Kei0i1Oj+LvyAWMXJHeKH1MVlzFugfVrmyU=
 github.com/Azure/go-autorest/autorest/to v0.4.0 h1:oXVqrxakqqV1UZdSazDOPOLvOIz+XA683u8EctwboHk=
 github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod h1:fE8iZBn7LQR7zH/9XU2NcPR4o9jEImooCeWJcYV/zLE=
+github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod h1:3EEqHnBxQGHXRYq3HT1WyXAvT7LLY3tl70hw6tQIbjI=
 github.com/Azure/go-autorest/autorest/validation v0.3.0/go.mod h1:yhLgjC0Wda5DYXl6JAsWyUe4KVNffhoDhG0zVzUMo3E=
 github.com/Azure/go-autorest/autorest/validation v0.3.1 h1:AgyqjAd94fwNAoTjl/WQXg4VvFeRFpO+UhNyRXqF1ac=
 github.com/Azure/go-autorest/autorest/validation v0.3.1/go.mod h1:yhLgjC0Wda5DYXl6JAsWyUe4KVNffhoDhG0zVzUMo3E=
@@ -616,36 +132,27 @@ github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZ
 github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk=
 github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo=
 github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
+github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c h1:/IBSNwUN8+eKzUzbJPqhK839ygXJ82sde8x3ogr6R28=
 github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU=
-github.com/Azure/go-ntlmssp v0.0.0-20220621081337-cb9428e4ac1e/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU=
-github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 h1:mFRzDkZVAjdal+s7s0MwaRv9igoPqLRdzOLzw/8Xvq8=
-github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU=
-github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0 h1:OBhqkivkhkMqLPymWEppkm7vgPQY2XsHoEkaMQ0AdZY=
-github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0/go.mod h1:kgDmCTgBzIEPFElEF+FK0SdjAor06dRq2Go927dnQ6o=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak=
-github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
+github.com/BurntSushi/toml v1.2.0 h1:Rt8g24XnyGTyglgET/PRUNlrUeu9F5L+7FilkXfZgs0=
+github.com/BurntSushi/toml v1.2.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
 github.com/DataDog/datadog-go v3.2.0+incompatible h1:qSG2N4FghB1He/r2mFrWKCaL7dXCilEuNEeAn20fdD4=
 github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
 github.com/Jeffail/gabs v1.1.1 h1:V0uzR08Hj22EX8+8QMhyI9sX2hwRu+/RJhJUmnwda/E=
 github.com/Jeffail/gabs v1.1.1/go.mod h1:6xMvQMK4k33lb7GUUpaAPh6nKMmemQeg5d4gn7/bOXc=
-github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c/go.mod h1:X0CRv0ky0k6m906ixxpzmDRLvX58TFUKS2eePweuyxk=
 github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
 github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
 github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
 github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
 github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
 github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
+github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc=
 github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
-github.com/Masterminds/semver/v3 v3.2.0/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=
-github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0=
-github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=
 github.com/Masterminds/sprig v2.22.0+incompatible h1:z4yfnGrZ7netVz+0EDJ0Wi+5VZCSYp4Z0m2dk6cEM60=
 github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o=
-github.com/Masterminds/sprig/v3 v3.2.3 h1:eL2fZNezLomi0uOLqjQoN6BfsDD+fyLtgbJMAj9n6YA=
-github.com/Masterminds/sprig/v3 v3.2.3/go.mod h1:rXcFaZ2zZbLRJv/xSysmlgIM1u11eBaRMhvYXJNkGuM=
 github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
 github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
 github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw=
@@ -654,11 +161,10 @@ github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugX
 github.com/Microsoft/go-winio v0.4.17-0.20210211115548-6eac466e5fa3/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
 github.com/Microsoft/go-winio v0.4.17-0.20210324224401-5516f17a5958/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
 github.com/Microsoft/go-winio v0.4.17/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
+github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
 github.com/Microsoft/go-winio v0.5.1/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
+github.com/Microsoft/go-winio v0.5.2 h1:a9IhgEQBCUEk6QCdml9CiJGhAws+YwffDHEMp1VMrpA=
 github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
-github.com/Microsoft/go-winio v0.6.0/go.mod h1:cTAf44im0RAYeL23bpB+fzCyDH2MJiz2BO69KH/soAE=
-github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
-github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
 github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg=
 github.com/Microsoft/hcsshim v0.8.7-0.20190325164909-8abdbb8205e4/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg=
 github.com/Microsoft/hcsshim v0.8.7/go.mod h1:OHd7sQqRFrYd3RmSgbgji+ctCwkbq2wbEYNSzOYtcBQ=
@@ -666,15 +172,9 @@ github.com/Microsoft/hcsshim v0.8.9/go.mod h1:5692vkUqntj1idxauYlpoINNKeqCiG6Sg3
 github.com/Microsoft/hcsshim v0.8.14/go.mod h1:NtVKoYxQuTLx6gEq0L96c9Ju4JbRJ4nY2ow3VK6a9Lg=
 github.com/Microsoft/hcsshim v0.8.15/go.mod h1:x38A4YbHbdxJtc0sF6oIz+RG0npwSCAvn69iY6URG00=
 github.com/Microsoft/hcsshim v0.8.16/go.mod h1:o5/SZqmR7x9JNKsW3pu+nqHm0MF8vbA+VxGOoXdC600=
-github.com/Microsoft/hcsshim v0.8.20/go.mod h1:+w2gRZ5ReXQhFOrvSQeNfhrYB/dg3oDwTOcER2fw4I4=
 github.com/Microsoft/hcsshim v0.8.21/go.mod h1:+w2gRZ5ReXQhFOrvSQeNfhrYB/dg3oDwTOcER2fw4I4=
-github.com/Microsoft/hcsshim v0.8.23/go.mod h1:4zegtUJth7lAvFyc6cH2gGQ5B3OFQim01nnU2M8jKDg=
-github.com/Microsoft/hcsshim v0.9.2/go.mod h1:7pLA8lDk46WKDWlVsENo92gC0XFa8rbKfyFRBqxEbCc=
-github.com/Microsoft/hcsshim v0.9.3/go.mod h1:7pLA8lDk46WKDWlVsENo92gC0XFa8rbKfyFRBqxEbCc=
-github.com/Microsoft/hcsshim v0.9.4/go.mod h1:7pLA8lDk46WKDWlVsENo92gC0XFa8rbKfyFRBqxEbCc=
-github.com/Microsoft/hcsshim v0.9.6/go.mod h1:7pLA8lDk46WKDWlVsENo92gC0XFa8rbKfyFRBqxEbCc=
-github.com/Microsoft/hcsshim v0.10.0-rc.7 h1:HBytQPxcv8Oy4244zbQbe6hnOnx544eL5QPUqhJldz8=
-github.com/Microsoft/hcsshim v0.10.0-rc.7/go.mod h1:ILuwjA+kNW+MrN/w5un7n3mTqkwsFu4Bp05/okFUZlE=
+github.com/Microsoft/hcsshim v0.9.0 h1:BBgYMxl5YZDZVIijz02AlDINpYZOzQqRNCl9CZM13vk=
+github.com/Microsoft/hcsshim v0.9.0/go.mod h1:VBJWdC71NSWPlEo7lwde1aL21748J8B6Sdgno7NqEGE=
 github.com/Microsoft/hcsshim/test v0.0.0-20201218223536-d3e5debf77da/go.mod h1:5hlzMzRKMLyo42nCZ9oml8AdTlq/0cvIaBv6tK1RehU=
 github.com/Microsoft/hcsshim/test v0.0.0-20210227013316-43a75bb4edd3/go.mod h1:mw7qgWloBUl75W/gVH3cQszUg1+gUITj7D6NY7ywVnY=
 github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
@@ -683,13 +183,12 @@ github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMo
 github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw=
 github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/OneOfOne/xxhash v1.2.8/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q=
-github.com/ProtonMail/go-crypto v0.0.0-20220824120805-4b6e5c587895 h1:NsReiLpErIPzRrnogAXYwSoU7txA977LjDGrbkewJbg=
-github.com/ProtonMail/go-crypto v0.0.0-20220824120805-4b6e5c587895/go.mod h1:UBYPn8k0D56RtnR8RFQMjmh4KrZzWJ5o7Z9SYjossQ8=
 github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
+github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI=
 github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
+github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/SAP/go-hdb v0.14.1 h1:hkw4ozGZ/i4eak7ZuGkY5e0hxiXFdNUBNhr4AvZVNFE=
 github.com/SAP/go-hdb v0.14.1/go.mod h1:7fdQLVC2lER3urZLjZCm0AuMQfApof92n3aylBPEkMo=
@@ -700,23 +199,16 @@ github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af h1:DBNMBMuMiWYu0b+8KM
 github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod h1:5Jv4cbFiHJMsVxt52+i0Ha45fjshj6wxYr1r19tB9bw=
 github.com/aerospike/aerospike-client-go/v5 v5.6.0 h1:tRxcUq0HY8fFPQEzF3EgrknF+w1xFO0YDfUb9Nm8yRI=
 github.com/aerospike/aerospike-client-go/v5 v5.6.0/go.mod h1:rJ/KpmClE7kiBPfvAPrGw9WuNOiz8v2uKbQaUyYPXtI=
-github.com/agext/levenshtein v1.2.1 h1:QmvMAjj2aEICytGiWzmxoE0x2KZvE0fvmqMOfy2tjT8=
-github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
 github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM=
-github.com/ajstarks/deck v0.0.0-20200831202436-30c9fc6549a9/go.mod h1:JynElWSGnm/4RlzPXRlREEwqTHAN3T56Bv2ITsFT3gY=
-github.com/ajstarks/deck/generate v0.0.0-20210309230005-c3f852c02e19/go.mod h1:T13YZdzov6OU0A1+RfKZiZN9ca6VeKdBdyDV+BY97Tk=
-github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw=
-github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b/go.mod h1:1KcenG0jGWcpt8ov532z81sp/kMMUG485J2InIOyADM=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
 github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:CgnQgUtFrFz9mxFNtED3jI5tLDjKlOM+oUF/sTk6ps0=
-github.com/alexflint/go-filemutex v1.1.0/go.mod h1:7P4iRhttt/nUvUOrYIhcpMzv2G6CY9UnI16Z+UJqRyk=
-github.com/alexflint/go-filemutex v1.2.0/go.mod h1:mYyQSWvw9Tx2/H2n9qXPb52tTYfE0pZAWcBq5mK025c=
-github.com/aliyun/alibaba-cloud-sdk-go v1.62.301 h1:8mgvCpqsv3mQAcqZ/baAaMGUBj5J6MKMhxLd+K8L27Q=
-github.com/aliyun/alibaba-cloud-sdk-go v1.62.301/go.mod h1:Api2AkmMgGaSUAhmk76oaFObkoeCPc/bKAqcyplPODs=
+github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190620160927-9418d7b0cd0f/go.mod h1:myCDvQSzCW+wB1WAlocEru4wMGJxy+vlxHdhegi1CDQ=
+github.com/aliyun/alibaba-cloud-sdk-go v1.61.1499 h1:P2FUu1/xkj4abuHcqdRQO9ZAYc9hSWG5c5gifsU/Ogc=
+github.com/aliyun/alibaba-cloud-sdk-go v1.61.1499/go.mod h1:RcDobYh8k5VP6TNybz9m++gL3ijVI5wueVr0EM10VsU=
 github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190307165228-86c17b95fcd5 h1:nWDRPCyCltiTsANwC/n3QZH7Vww33Npq9MKqlwRzI/c=
 github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190307165228-86c17b95fcd5/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8=
 github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
@@ -724,14 +216,8 @@ github.com/andybalholm/brotli v1.0.1/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu
 github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY=
 github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
-github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20220418222510-f25a4f6275ed/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY=
-github.com/antlr/antlr4/runtime/Go/antlr v1.4.10/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY=
-github.com/apache/arrow/go/arrow v0.0.0-20211112161151-bc219186db40 h1:q4dksr6ICHXqG5hm0ZW5IHyeEJXoIJSOZeBLmWPNeIQ=
-github.com/apache/arrow/go/arrow v0.0.0-20211112161151-bc219186db40/go.mod h1:Q7yQnSMnLvcXlZ8RV+jwz/6y1rQTqbX6C82SndT52Zs=
-github.com/apache/arrow/go/v10 v10.0.1/go.mod h1:YvhnlEePVnBS4+0z3fhPfUy7W1Ikj0Ih0vcRo/gZ1M0=
-github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU=
-github.com/apparentlymart/go-textseg/v13 v13.0.0 h1:Y+KvPE1NYz0xl601PVImeQfFyEy6iT90AvPUL1NNfNw=
-github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo=
+github.com/apache/arrow/go/arrow v0.0.0-20210818145353-234c94e4ce64 h1:ZsPrlYPY/v1PR7pGrmYD/rq5BFiSPalH8i9eEkSfnnI=
+github.com/apache/arrow/go/arrow v0.0.0-20210818145353-234c94e4ce64/go.mod h1:2qMFB56yOP3KzkB3PbYZ4AlUFg3a88F67TIx5lB/WwY=
 github.com/apple/foundationdb/bindings/go v0.0.0-20190411004307-cd5c9d91fad2 h1:VoHKYIXEQU5LWoambPBOvYxyLqZYHuj+rj5DVnMUc3k=
 github.com/apple/foundationdb/bindings/go v0.0.0-20190411004307-cd5c9d91fad2/go.mod h1:OMVSB21p9+xQUIqlGizHPZfjK+SHws1ht+ZytVDoz9U=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
@@ -740,12 +226,12 @@ github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmV
 github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod h1:3AMJUQhVx52RsWOnlkpikZr01T/yAVN2gn0861vByNg=
 github.com/armon/go-metrics v0.3.0/go.mod h1:zXjbSimjXTd7vOpY8B0/2LpvNvDoXBuplAD+gJD3GYs=
 github.com/armon/go-metrics v0.3.9/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc=
-github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJA=
-github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4=
+github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc=
+github.com/armon/go-metrics v0.4.0 h1:yCQqn7dwca4ITXb+CbubHmedzaQYHhNhrEXLYUeEe8Q=
+github.com/armon/go-metrics v0.4.0/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
 github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI=
 github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
-github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
 github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
 github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
 github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg=
@@ -754,74 +240,41 @@ github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef h1:46PFijGL
 github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
 github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0=
 github.com/aws/aws-sdk-go v1.25.41/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
-github.com/aws/aws-sdk-go v1.34.0/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
+github.com/aws/aws-sdk-go v1.30.27/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
 github.com/aws/aws-sdk-go v1.34.28/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48=
-github.com/aws/aws-sdk-go v1.43.9/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
-github.com/aws/aws-sdk-go v1.43.16/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
-github.com/aws/aws-sdk-go v1.44.268 h1:WoK20tlAvsvQzTcE6TajoprbXmTbcud6MjhErL4P/38=
-github.com/aws/aws-sdk-go v1.44.268/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
-github.com/aws/aws-sdk-go-v2 v1.16.16/go.mod h1:SwiyXi/1zTUZ6KIAmLK5V5ll8SiURNUYOqTerZPaF9k=
-github.com/aws/aws-sdk-go-v2 v1.17.7 h1:CLSjnhJSTSogvqUGhIC6LqFKATMRexcxLZ0i/Nzk9Eg=
-github.com/aws/aws-sdk-go-v2 v1.17.7/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw=
-github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.8/go.mod h1:JTnlBSot91steJeti4ryyu/tLd4Sk84O5W22L7O2EQU=
-github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 h1:dK82zF6kkPeCo8J1e+tGx4JdvDIQzj7ygIoLg8WMuGs=
-github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10/go.mod h1:VeTZetY5KRJLuD/7fkQXMU6Mw7H5m/KP2J5Iy9osMno=
-github.com/aws/aws-sdk-go-v2/config v1.17.7/go.mod h1:dN2gja/QXxFF15hQreyrqYhLBaQo1d9ZKe/v/uplQoI=
-github.com/aws/aws-sdk-go-v2/config v1.18.19 h1:AqFK6zFNtq4i1EYu+eC7lcKHYnZagMn6SW171la0bGw=
-github.com/aws/aws-sdk-go-v2/config v1.18.19/go.mod h1:XvTmGMY8d52ougvakOv1RpiTLPz9dlG/OQHsKU/cMmY=
-github.com/aws/aws-sdk-go-v2/credentials v1.12.20/go.mod h1:UKY5HyIux08bbNA7Blv4PcXQ8cTkGh7ghHMFklaviR4=
-github.com/aws/aws-sdk-go-v2/credentials v1.13.18 h1:EQMdtHwz0ILTW1hoP+EwuWhwCG1hD6l3+RWFQABET4c=
-github.com/aws/aws-sdk-go-v2/credentials v1.13.18/go.mod h1:vnwlwjIe+3XJPBYKu1et30ZPABG3VaXJYr8ryohpIyM=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.17/go.mod h1:yIkQcCDYNsZfXpd5UX2Cy+sWA1jPgIhGTw9cOBzfVnQ=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.1 h1:gt57MN3liKiyGopcqgNzJb2+d9MJaKT/q1OksHNXVE4=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.1/go.mod h1:lfUx8puBRdM5lVVMQlwt2v+ofiG/X6Ms+dy0UkG/kXw=
-github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.33/go.mod h1:84XgODVR8uRhmOnUkKGUZKqIMxmjmLOR8Uyp7G/TPwc=
-github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.59 h1:E3Y+OfzOK1+rmRo/K2G0ml8Vs+Xqk0kOnf4nS0kUtBc=
-github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.59/go.mod h1:1M4PLSBUVfBI0aP+C9XI7SM6kZPCGYyI6izWz0TGprE=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.23/go.mod h1:2DFxAQ9pfIRy0imBCJv+vZ2X6RKxves6fbnEuSry6b4=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.31 h1:sJLYcS+eZn5EeNINGHSCRAwUJMFVqklwkH36Vbyai7M=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.31/go.mod h1:QT0BqUvX1Bh2ABdTGnjqEjvjzrCfIniM9Sc8zn9Yndo=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.17/go.mod h1:pRwaTYCJemADaqCbUAxltMoHKata7hmB5PjEXeu0kfg=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.25 h1:1mnRASEKnkqsntcxHaysxwgVoUUp5dkiB+l3llKnqyg=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.25/go.mod h1:zBHOPwhBc3FlQjQJE/D3IfPWiWaQmT06Vq9aNukDo0k=
-github.com/aws/aws-sdk-go-v2/internal/ini v1.3.24/go.mod h1:jULHjqqjDlbyTa7pfM7WICATnOv+iOhjletM3N0Xbu8=
-github.com/aws/aws-sdk-go-v2/internal/ini v1.3.32 h1:p5luUImdIqywn6JpQsW3tq5GNOxKmOnEpybzPx+d1lk=
-github.com/aws/aws-sdk-go-v2/internal/ini v1.3.32/go.mod h1:XGhIBZDEgfqmFIugclZ6FU7v75nHhBDtzuB4xB/tEi4=
-github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.14/go.mod h1:AyGgqiKv9ECM6IZeNQtdT8NnMvUb3/2wokeq2Fgryto=
-github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.23 h1:DWYZIsyqagnWL00f8M/SOr9fN063OEQWn9LLTbdYXsk=
-github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.23/go.mod h1:uIiFgURZbACBEQJfqTZPb/jxO7R+9LeoHUFudtIdeQI=
-github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.9/go.mod h1:a9j48l6yL5XINLHLcOKInjdvknN+vWqPBxqeIDw7ktw=
-github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11 h1:y2+VQzC6Zh2ojtV2LoC0MNwHWc6qXv/j2vrQtlftkdA=
-github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11/go.mod h1:iV4q2hsqtNECrfmlXyord9u4zyuFEJX9eLgLpSPzWA8=
-github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.18/go.mod h1:NS55eQ4YixUJPTC+INxi2/jCqe1y2Uw3rnh9wEOVJxY=
-github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.26 h1:CeuSeq/8FnYpPtnuIeLQEEvDv9zUjneuYi8EghMBdwQ=
-github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.26/go.mod h1:2UqAAwMUXKeRkAHIlDJqvMVgOWkUi/AUXPk/YIe+Dg4=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.17/go.mod h1:4nYOrY41Lrbk2170/BGkcJKBhws9Pfn8MG3aGqjjeFI=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.25 h1:5LHn8JQ0qvjD9L9JhMtylnkcw7j05GDZqM9Oin6hpr0=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.25/go.mod h1:/95IA+0lMnzW6XzqYJRpjjsAbKEORVeO0anQqjd2CNU=
-github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.17/go.mod h1:YqMdV+gEKCQ59NrB7rzrJdALeBIsYiVi8Inj3+KcqHI=
-github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.0 h1:e2ooMhpYGhDnBfSvIyusvAwX7KexuZaHbQY2Dyei7VU=
-github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.0/go.mod h1:bh2E0CXKZsQN+faiKVqC40vfNMAWheoULBCnEgO9K+8=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.27.11/go.mod h1:fmgDANqTUCxciViKl9hb/zD5LFbvPINFRgWhDbR+vZo=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.31.0 h1:B1G2pSPvbAtQjilPq+Y7jLIzCOwKzuVEl+aBBaNG0AQ=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.31.0/go.mod h1:ncltU6n4Nof5uJttDtcNQ537uNuwYqsZZQcpkd2/GUQ=
-github.com/aws/aws-sdk-go-v2/service/sso v1.11.23/go.mod h1:/w0eg9IhFGjGyyncHIQrXtU8wvNsTJOP0R6PPj0wf80=
-github.com/aws/aws-sdk-go-v2/service/sso v1.12.6 h1:5V7DWLBd7wTELVz5bPpwzYy/sikk0gsgZfj40X+l5OI=
-github.com/aws/aws-sdk-go-v2/service/sso v1.12.6/go.mod h1:Y1VOmit/Fn6Tz1uFAeCO6Q7M2fmfXSCLeL5INVYsLuY=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.13.5/go.mod h1:csZuQY65DAdFBt1oIjO5hhBR49kQqop4+lcuCjf2arA=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.6 h1:B8cauxOH1W1v7rd8RdI/MWnoR4Ze0wIHWrb90qczxj4=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.6/go.mod h1:Lh/bc9XUf8CfOY6Jp5aIkQtN+j1mc+nExc+KXj9jx2s=
-github.com/aws/aws-sdk-go-v2/service/sts v1.16.19/go.mod h1:h4J3oPZQbxLhzGnk+j9dfYHi5qIOVJ5kczZd658/ydM=
-github.com/aws/aws-sdk-go-v2/service/sts v1.18.7 h1:bWNgNdRko2x6gqa0blfATqAZKZokPIeM1vfmQt2pnvM=
-github.com/aws/aws-sdk-go-v2/service/sts v1.18.7/go.mod h1:JuTnSoeePXmMVe9G8NcjjwgOKEfZ4cOjMuT2IBT/2eI=
-github.com/aws/smithy-go v1.13.3/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA=
-github.com/aws/smithy-go v1.13.5 h1:hgz0X/DX0dGqTYpGALqXJoRKRj5oQ7150i5FdTePzO8=
-github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA=
+github.com/aws/aws-sdk-go v1.36.29/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
+github.com/aws/aws-sdk-go v1.44.95 h1:QwmA+PeR6v4pF0f/dPHVPWGAshAhb9TnGZBTM5uKuI8=
+github.com/aws/aws-sdk-go v1.44.95/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
+github.com/aws/aws-sdk-go-v2 v1.8.0 h1:HcN6yDnHV9S7D69E7To0aUppJhiJNEzQSNcUxc7r3qo=
+github.com/aws/aws-sdk-go-v2 v1.8.0/go.mod h1:xEFuWz+3TYdlPRuo+CqATbeDWIWyaT5uAPwPaWtgse0=
+github.com/aws/aws-sdk-go-v2/config v1.6.0 h1:rtoCnNObhVm7me+v9sA2aY+NtHNZjjWWC3ifXVci+wE=
+github.com/aws/aws-sdk-go-v2/config v1.6.0/go.mod h1:TNtBVmka80lRPk5+S9ZqVfFszOQAGJJ9KbT3EM3CHNU=
+github.com/aws/aws-sdk-go-v2/credentials v1.3.2 h1:Uud/fZzm0lqqhE8kvXYJFAJ3PGnagKoUcvHq1hXfBZw=
+github.com/aws/aws-sdk-go-v2/credentials v1.3.2/go.mod h1:PACKuTJdt6AlXvEq8rFI4eDmoqDFC5DpVKQbWysaDgM=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.4.0 h1:SGqDJun6tydgsSIFxv9+EYBJVqVUwg2QMJp6PbNq8C8=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.4.0/go.mod h1:Mj/U8OpDbcVcoctrYwA2bak8k/HFPdcLzI/vaiXMwuM=
+github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.4.0 h1:Iqp2aHeRF3kaaNuDS82bHBzER285NM6lLPAgsxHCR2A=
+github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.4.0/go.mod h1:eHwXu2+uE/T6gpnYWwBwqoeqRf9IXyCcolyOWDRAErQ=
+github.com/aws/aws-sdk-go-v2/internal/ini v1.2.0 h1:xu45foJnwMwBqSkIMKyJP9kbyHi5hdhZ/WiJ7D2sHZ0=
+github.com/aws/aws-sdk-go-v2/internal/ini v1.2.0/go.mod h1:Q5jATQc+f1MfZp3PDMhn6ry18hGvE0i8yvbXoKbnZaE=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.2.2 h1:YcGVEqLQGHDa81776C3daai6ZkkRGf/8RAQ07hV0QcU=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.2.2/go.mod h1:EASdTcM1lGhUe1/p4gkojHwlGJkeoRjjr1sRCzup3Is=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.2.2 h1:Xv1rGYgsRRn0xw9JFNnfpBMZam54PrWpC4rJOJ9koA8=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.2.2/go.mod h1:NXmNI41bdEsJMrD0v9rUvbGCB5GwdBEpKvUvIY3vTFg=
+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.5.2 h1:ewIpdVz12MDinJJB/nu1uUiFIWFnvtd3iV7cEW7lR+M=
+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.5.2/go.mod h1:QuL2Ym8BkrLmN4lUofXYq6000/i5jPjosCNK//t6gak=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.12.0 h1:cxZbzTYXgiQrZ6u2/RJZAkkgZssqYOdydvJPBgIHlsM=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.12.0/go.mod h1:6J++A5xpo7QDsIeSqPK4UHqMSyPOCopa+zKtqAMhqVQ=
+github.com/aws/aws-sdk-go-v2/service/sso v1.3.2 h1:b+U3WrF9ON3f32FH19geqmiod4uKcMv/q+wosQjjyyM=
+github.com/aws/aws-sdk-go-v2/service/sso v1.3.2/go.mod h1:J21I6kF+d/6XHVk7kp/cx9YVD2TMD2TbLwtRGVcinXo=
+github.com/aws/aws-sdk-go-v2/service/sts v1.6.1 h1:1Pls85C5CFjhE3aH+h85/hyAk89kQNlAWlEQtIkaFyc=
+github.com/aws/aws-sdk-go-v2/service/sts v1.6.1/go.mod h1:hLZ/AnkIKHLuPGjEiyghNEdvJ2PP0MgOxcmv9EBJ4xs=
+github.com/aws/smithy-go v1.7.0 h1:+cLHMRrDZvQ4wk+KuQ9yH6eEg6KZEJ9RI2IkDqnygCg=
+github.com/aws/smithy-go v1.7.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E=
 github.com/axiomhq/hyperloglog v0.0.0-20220105174342-98591331716a h1:eqjiAL3qooftPm8b9C1GsSSRcmlw7iOva8vdBTmV2PY=
 github.com/axiomhq/hyperloglog v0.0.0-20220105174342-98591331716a/go.mod h1:2stgcRjl6QmW+gU2h5E7BQXg4HU0gzxKWDuT5HviN9s=
 github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f h1:ZNv7On9kyUzm7fvRZumSyy/IUiSC7AzL0I1jKKtwooA=
 github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod h1:AuiFmCCPBSrqvVMvuqFuk0qogytodnVFVSN5CeJB8Gc=
-github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
 github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
 github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
@@ -835,49 +288,32 @@ github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932 h1:mXoPYz/Ul5HYE
 github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932/go.mod h1:NOuUCSz6Q9T7+igc/hlvDOUdtWKryOrtFyIVABv/p7k=
 github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA=
 github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA=
-github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84=
 github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
 github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
-github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
 github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY=
 github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
 github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
-github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
+github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc h1:biVzkmvwrH8WK8raXaxBx6fRVTlJILwEwQGL1I/ByEI=
 github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
-github.com/boombuler/barcode v1.0.1 h1:NDBbPmhS+EqABEs5Kg3n/5ZNjy73Pz7SIV+KCeqyXcs=
-github.com/boombuler/barcode v1.0.1/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
 github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk=
-github.com/bshuster-repo/logrus-logstash-hook v1.0.0/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk=
 github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s=
-github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
 github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8=
 github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod h1:obH5gd0BsqsP2LwDJ9aOkm/6J86V6lyAXCoQWGw3K50=
 github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE=
-github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
-github.com/bytecodealliance/wasmtime-go v0.36.0/go.mod h1:q320gUxqyI8yB+ZqRuaJOEnGkAnHh6WtJjMaT2CW4wI=
 github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4=
 github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
 github.com/cenkalti/backoff/v3 v3.0.0/go.mod h1:cIeZDE3IrqwwJl6VUwCN6trj1oXrTS4rc0ij+ULvLYs=
 github.com/cenkalti/backoff/v3 v3.2.2 h1:cfUAAO3yvKMYKPrvhDuHSwQnhZNk/RMHKdZqKTxfm6M=
 github.com/cenkalti/backoff/v3 v3.2.2/go.mod h1:cIeZDE3IrqwwJl6VUwCN6trj1oXrTS4rc0ij+ULvLYs=
 github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw=
-github.com/cenkalti/backoff/v4 v4.1.2/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw=
+github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4=
 github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw=
-github.com/cenkalti/backoff/v4 v4.2.0 h1:HN5dHm3WBOgndBH6E8V0q2jIYIR3s9yglV8k/+MN3u4=
-github.com/cenkalti/backoff/v4 v4.2.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/census-instrumentation/opencensus-proto v0.4.1 h1:iKLQ0xPNFxR/2hzXZMrBo8f1j86j5WHzznCCQxV/b8g=
-github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw=
 github.com/centrify/cloud-golang-sdk v0.0.0-20210923165758-a8c48d049166 h1:jQ93fKqb/wRmK/KiHpa7Tk9rmHeKXhp4j+5Sg/tENiY=
 github.com/centrify/cloud-golang-sdk v0.0.0-20210923165758-a8c48d049166/go.mod h1:c/gmvyN8lq6lYtHvrqqoXrg2xyN65N0mBmbikxFWXNE=
-github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
-github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
+github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
-github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod h1:xUQBLp4RLc5zJtWY++yjOoMoB5lihDt7fai+75m+rGw=
 github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod h1:cfwC0EG7HMUenopBsUf9d89JlCLQIfgVcNsNN0t6T2M=
 github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAcn+zUUwWxqcaKZlF54wK8E=
@@ -892,43 +328,30 @@ github.com/cilium/ebpf v0.2.0/go.mod h1:To2CFviqOWL/M0gIMsvSMlqe7em/l1ALkX1PyjrX
 github.com/cilium/ebpf v0.4.0/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs=
 github.com/cilium/ebpf v0.6.2/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs=
 github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA=
-github.com/cilium/ebpf v0.9.1/go.mod h1:+OhNOIXx/Fnu1IE8bJz2dzOA+VSfyTfdNUVdlQnxUFY=
 github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible h1:C29Ae4G5GtYyYMm1aztcyj/J5ckgJm2zwdDajFbx1NY=
 github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
 github.com/circonus-labs/circonusllhist v0.1.3 h1:TJH+oke8D16535+jHExHj4nQvzlZrj7ug5D7I/orNUA=
 github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
 github.com/client9/misspell v0.3.4 h1:ta993UF76GwbvJcIo3Y68y/M3WxlpEHPWIGDkJYwzJI=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cloudflare/circl v1.1.0 h1:bZgT/A+cikZnKIwn7xL2OBj012Bmvho/o6RpRvv3GKY=
-github.com/cloudflare/circl v1.1.0/go.mod h1:prBCrKB9DV4poKZY1l9zBXg2QJY7mvgRvtMxxK7fi4I=
 github.com/cloudfoundry-community/go-cfclient v0.0.0-20210823134051-721f0e559306 h1:k8q2Nsz7kNaUlysVCnWIFLMUSqiKXaGLdIf9P0GsX2Y=
 github.com/cloudfoundry-community/go-cfclient v0.0.0-20210823134051-721f0e559306/go.mod h1:0FdHblxw7g3M2PPICOw9i8YZOHP9dZTHbJUtoxL7Z/E=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
-github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe h1:QQ3GSy+MqSHxm/d8nCtnAiZdYFd45cYZPs8vOOIYKfk=
-github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
 github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20220314180256-7f1daf1720fc/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20230105202645-06c439db220b/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195 h1:58f1tJ1ra+zFINPlwLWvQsR9CzAKt2e+EWV2yX9oXQ4=
-github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I=
 github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
 github.com/cockroachdb/cockroach-go v0.0.0-20181001143604-e0a95dfd547c h1:2zRrJWIt/f9c9HhNHAgrRgq0San5gRRUJTBXLkchal0=
 github.com/cockroachdb/cockroach-go v0.0.0-20181001143604-e0a95dfd547c/go.mod h1:XGLbWH/ujMcbPbhZq52Nv6UrCghb1yGn//133kEsvDk=
 github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
-github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h6jFvWxBdQXxjopDMZyH2UVceIRfR84bdzbkoKrsWNo=
-github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA=
-github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI=
 github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0 h1:sDMmm+q/3+BukdIpxwO365v/Rbspp2Nt5XntgQRXq8Q=
 github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM=
-github.com/container-orchestrated-devices/container-device-interface v0.5.4/go.mod h1:DjE95rfPiiSmG7uVXtg0z6MnPm/Lx4wxKCIts0ZE0vg=
 github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE=
 github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod h1:AkGGQs9NM2vtYHaUen+NljV0/baGCAPELGm2q9ZXpWU=
 github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU=
@@ -936,7 +359,6 @@ github.com/containerd/aufs v1.0.0/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj
 github.com/containerd/btrfs v0.0.0-20201111183144-404b9149801e/go.mod h1:jg2QkJcsabfHugurUvvPhS3E08Oxiuh5W/g1ybB4e0E=
 github.com/containerd/btrfs v0.0.0-20210316141732-918d888fb676/go.mod h1:zMcX3qkXTAi9GI50+0HOeuV8LU2ryCE/V2vG/ZBiTss=
 github.com/containerd/btrfs v1.0.0/go.mod h1:zMcX3qkXTAi9GI50+0HOeuV8LU2ryCE/V2vG/ZBiTss=
-github.com/containerd/btrfs/v2 v2.0.0/go.mod h1:swkD/7j9HApWpzl8OHfrHNxppPd9l44DFZdF94BUj9k=
 github.com/containerd/cgroups v0.0.0-20190717030353-c4b9ac5c7601/go.mod h1:X9rLEHIqSf/wfK8NsPqxJmeZgW4pcfzdXITDrUSJ6uI=
 github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod h1:OApqhQ4XNSNC13gXIwDjhOQxjWa/NxkwZXJ1EvqT0ko=
 github.com/containerd/cgroups v0.0.0-20200531161412-0dbf7f05ba59/go.mod h1:pA0z1pT8KYB3TCXK/ocprsh7MAkoW8bZVzPdih9snmM=
@@ -944,9 +366,8 @@ github.com/containerd/cgroups v0.0.0-20200710171044-318312a37340/go.mod h1:s5q4S
 github.com/containerd/cgroups v0.0.0-20200824123100-0b889c03f102/go.mod h1:s5q4SojHctfxANBDvMeIaIovkq29IP48TKAxnhYRxvo=
 github.com/containerd/cgroups v0.0.0-20210114181951-8a68de567b68/go.mod h1:ZJeTFisyysqgcCdecO57Dj79RfL0LNeGiFUqLYQRYLE=
 github.com/containerd/cgroups v1.0.1/go.mod h1:0SJrPIenamHDcZhEcJMNBB85rHcUsw4f25ZfBiPYRkU=
+github.com/containerd/cgroups v1.0.3 h1:ADZftAkglvCiD44c77s5YmMqaP2pzVCFZvBmAlBdAP4=
 github.com/containerd/cgroups v1.0.3/go.mod h1:/ofk34relqNjSGyqPrmEULrO4Sc8LJhvJmWbUCUKqj8=
-github.com/containerd/cgroups v1.1.0/go.mod h1:6ppBcbh/NOOUU+dMKrykgaBnK9lCIBxHqJDGwsa1mIw=
-github.com/containerd/cgroups/v3 v3.0.1/go.mod h1:/vtwk1VXrtoa5AaZLkypuOJgA/6DyPMZHJPGQNtlHnw=
 github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw=
 github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw=
 github.com/containerd/console v0.0.0-20191206165004-02ecf6a7291e/go.mod h1:8Pf4gM6VEbTNRIT26AyyU7hxdQU3MvAvxVI0sc00XBE=
@@ -961,28 +382,24 @@ github.com/containerd/containerd v1.3.2/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMX
 github.com/containerd/containerd v1.4.0-beta.2.0.20200729163537-40b22ef07410/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
 github.com/containerd/containerd v1.4.1/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
 github.com/containerd/containerd v1.4.3/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
-github.com/containerd/containerd v1.4.9/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
 github.com/containerd/containerd v1.5.0-beta.1/go.mod h1:5HfvG1V2FsKesEGQ17k5/T7V960Tmcumvqn8Mc+pCYQ=
 github.com/containerd/containerd v1.5.0-beta.3/go.mod h1:/wr9AVtEM7x9c+n0+stptlo/uBBoBORwEx6ardVcmKU=
 github.com/containerd/containerd v1.5.0-beta.4/go.mod h1:GmdgZd2zA2GYIBZ0w09ZvgqEq8EfBp/m3lcVZIvPHhI=
 github.com/containerd/containerd v1.5.0-rc.0/go.mod h1:V/IXoMqNGgBlabz3tHD2TWDoTJseu1FGOKuoA4nNb2s=
 github.com/containerd/containerd v1.5.1/go.mod h1:0DOxVqwDy2iZvrZp2JUx/E+hS0UNTVn7dJnIOwtYR4g=
 github.com/containerd/containerd v1.5.7/go.mod h1:gyvv6+ugqY25TiXxcZC3L5yOeYgEw0QMhscqVp1AR9c=
-github.com/containerd/containerd v1.5.8/go.mod h1:YdFSv5bTFLpG2HIYmfqDpSYYTDX+mc5qtSuYx1YUb/s=
-github.com/containerd/containerd v1.6.1/go.mod h1:1nJz5xCZPusx6jJU8Frfct988y0NpumIq9ODB0kLtoE=
-github.com/containerd/containerd v1.6.6/go.mod h1:ZoP1geJldzCVY3Tonoz7b1IXk8rIX0Nltt5QE4OMNk0=
-github.com/containerd/containerd v1.6.8/go.mod h1:By6p5KqPK0/7/CgO/A6t/Gz+CUYUu2zf1hUaaymVXB0=
-github.com/containerd/containerd v1.6.9/go.mod h1:XVicUvkxOrftE2Q1YWUXgZwkkAxwQYNOFzYWvfVfEfQ=
-github.com/containerd/containerd v1.7.0 h1:G/ZQr3gMZs6ZT0qPUZ15znx5QSdQdASW11nXTLTM2Pg=
-github.com/containerd/containerd v1.7.0/go.mod h1:QfR7Efgb/6X2BDpTPJRvPTYDE9rsF0FsXX9J8sIs/sc=
+github.com/containerd/containerd v1.5.13 h1:XqvKw9i4P7/mFrC3TSM7yV5cwFZ9avXe6M3YANKnzEE=
+github.com/containerd/containerd v1.5.13/go.mod h1:3AlCrzKROjIuP3JALsY14n8YtntaUDBu7vek+rPN5Vc=
 github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
 github.com/containerd/continuity v0.0.0-20190815185530-f2a389ac0a02/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
+github.com/containerd/continuity v0.0.0-20190827140505-75bee3e2ccb6/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
 github.com/containerd/continuity v0.0.0-20191127005431-f65d91d395eb/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
 github.com/containerd/continuity v0.0.0-20200710164510-efbc4488d8fe/go.mod h1:cECdGN1O8G9bgKTlLhuPJimka6Xb/Gg7vYzCTNVxhvo=
 github.com/containerd/continuity v0.0.0-20201208142359-180525291bb7/go.mod h1:kR3BEg7bDFaEddKm54WSmrol1fKWDU1nKYkgrcgZT7Y=
 github.com/containerd/continuity v0.0.0-20210208174643-50096c924a4e/go.mod h1:EXlVlkqNba9rJe3j7w3Xa924itAMLgZH4UD/Q4PExuQ=
 github.com/containerd/continuity v0.1.0/go.mod h1:ICJu0PwR54nI0yPEnJ6jcS+J7CZAUXrLh8lPo2knzsM=
-github.com/containerd/continuity v0.2.2/go.mod h1:pWygW9u7LtS1o4N/Tn0FoCFDIXZ7rxcMX7HX1Dmibvk=
+github.com/containerd/continuity v0.2.0/go.mod h1:wCYX+dRqZdImhGucXOqTQn05AhX6EUDaGEMUzTFFpLg=
+github.com/containerd/continuity v0.2.1/go.mod h1:wCYX+dRqZdImhGucXOqTQn05AhX6EUDaGEMUzTFFpLg=
 github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg=
 github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM=
 github.com/containerd/fifo v0.0.0-20180307165137-3d5202aec260/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI=
@@ -991,13 +408,8 @@ github.com/containerd/fifo v0.0.0-20200410184934-f15a3290365b/go.mod h1:jPQ2IAeZ
 github.com/containerd/fifo v0.0.0-20201026212402-0724c46b320c/go.mod h1:jPQ2IAeZRCYxpS/Cm1495vGFww6ecHmMk1YJH2Q5ln0=
 github.com/containerd/fifo v0.0.0-20210316144830-115abcc95a1d/go.mod h1:ocF/ME1SX5b1AOlWi9r677YJmCPSwwWnQ9O123vzpE4=
 github.com/containerd/fifo v1.0.0/go.mod h1:ocF/ME1SX5b1AOlWi9r677YJmCPSwwWnQ9O123vzpE4=
-github.com/containerd/fifo v1.1.0/go.mod h1:bmC4NWMbXlt2EZ0Hc7Fx7QzTFxgPID13eH0Qu+MAb2o=
 github.com/containerd/go-cni v1.0.1/go.mod h1:+vUpYxKvAF72G9i1WoDOiPGRtQpqsNW/ZHtSlv++smU=
 github.com/containerd/go-cni v1.0.2/go.mod h1:nrNABBHzu0ZwCug9Ije8hL2xBCYh/pjfMb1aZGrrohk=
-github.com/containerd/go-cni v1.1.0/go.mod h1:Rflh2EJ/++BA2/vY5ao3K6WJRR/bZKsX123aPk+kUtA=
-github.com/containerd/go-cni v1.1.3/go.mod h1:Rflh2EJ/++BA2/vY5ao3K6WJRR/bZKsX123aPk+kUtA=
-github.com/containerd/go-cni v1.1.6/go.mod h1:BWtoWl5ghVymxu6MBjg79W9NZrCRyHIdUtk4cauMe34=
-github.com/containerd/go-cni v1.1.9/go.mod h1:XYrZJ1d5W6E2VOvjffL3IZq0Dz6bsVlERHbekNK90PM=
 github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod h1:IV7qH3hrUgRmyYrtgEeGWJfWbgcHL9CSRruz2Vqcph0=
 github.com/containerd/go-runc v0.0.0-20190911050354-e029b79d8cda/go.mod h1:IV7qH3hrUgRmyYrtgEeGWJfWbgcHL9CSRruz2Vqcph0=
 github.com/containerd/go-runc v0.0.0-20200220073739-7016d3ce2328/go.mod h1:PpyHrqVs8FTi9vpyHwPwiNEGaACDxT/N/pLcvMSRA9g=
@@ -1007,28 +419,19 @@ github.com/containerd/imgcrypt v1.0.1/go.mod h1:mdd8cEPW7TPgNG4FpuP3sGBiQ7Yi/zak
 github.com/containerd/imgcrypt v1.0.4-0.20210301171431-0ae5c75f59ba/go.mod h1:6TNsg0ctmizkrOgXRNQjAPFWpMYRWuiB6dSF4Pfa5SA=
 github.com/containerd/imgcrypt v1.1.1-0.20210312161619-7ed62a527887/go.mod h1:5AZJNI6sLHJljKuI9IHnw1pWqo/F0nGDOuR9zgTs7ow=
 github.com/containerd/imgcrypt v1.1.1/go.mod h1:xpLnwiQmEUJPvQoAapeb2SNCxz7Xr6PJrXQb0Dpc4ms=
-github.com/containerd/imgcrypt v1.1.3/go.mod h1:/TPA1GIDXMzbj01yd8pIbQiLdQxed5ue1wb8bP7PQu4=
-github.com/containerd/imgcrypt v1.1.4/go.mod h1:LorQnPtzL/T0IyCeftcsMEO7AqxUDbdO8j/tSUpgxvo=
-github.com/containerd/imgcrypt v1.1.7/go.mod h1:FD8gqIcX5aTotCtOmjeCsi3A1dHmTZpnMISGKSczt4k=
 github.com/containerd/nri v0.0.0-20201007170849-eb1350a75164/go.mod h1:+2wGSDGFYfE5+So4M5syatU0N0f0LbWpuqyMi4/BE8c=
 github.com/containerd/nri v0.0.0-20210316161719-dbaa18c31c14/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY=
 github.com/containerd/nri v0.1.0/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY=
-github.com/containerd/nri v0.3.0/go.mod h1:Zw9q2lP16sdg0zYybemZ9yTDy8g7fPCIB3KXOGlggXI=
 github.com/containerd/stargz-snapshotter/estargz v0.4.1/go.mod h1:x7Q9dg9QYb4+ELgxmo4gBUeJB0tl5dqH1Sdz0nJU1QM=
-github.com/containerd/stargz-snapshotter/estargz v0.12.1/go.mod h1:12VUuCq3qPq4y8yUW+l5w3+oXV3cx2Po3KSe/SmPGqw=
 github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o=
 github.com/containerd/ttrpc v0.0.0-20190828172938-92c8520ef9f8/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o=
 github.com/containerd/ttrpc v0.0.0-20191028202541-4f1b8fe65a5c/go.mod h1:LPm1u0xBw8r8NOKoOdNMeVHSawSsltak+Ihv+etqsE8=
 github.com/containerd/ttrpc v1.0.1/go.mod h1:UAxOpgT9ziI0gJrmKvgcZivgxOp8iFPSk8httJEt98Y=
 github.com/containerd/ttrpc v1.0.2/go.mod h1:UAxOpgT9ziI0gJrmKvgcZivgxOp8iFPSk8httJEt98Y=
-github.com/containerd/ttrpc v1.1.0/go.mod h1:XX4ZTnoOId4HklF4edwc4DcqskFZuvXB1Evzy5KFQpQ=
-github.com/containerd/ttrpc v1.1.1-0.20220420014843-944ef4a40df3/go.mod h1:YYyNVhZrTMiaf51Vj6WhAJqJw+vl/nzABhj8pWrzle4=
-github.com/containerd/ttrpc v1.2.1/go.mod h1:sIT6l32Ph/H9cvnJsfXM5drIVzTr5A2flTf1G5tYZak=
 github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc=
 github.com/containerd/typeurl v0.0.0-20190911142611-5eb25027c9fd/go.mod h1:GeKYzf2pQcqv7tJ0AoCuuhtnqhva5LNU3U+OyKxxJpk=
 github.com/containerd/typeurl v1.0.1/go.mod h1:TB1hUtrpaiO88KEK56ijojHS1+NeF0izUACaJW2mdXg=
 github.com/containerd/typeurl v1.0.2/go.mod h1:9trJWW2sRlGub4wZJRTW83VtbOLS6hwcDZXTn6oPz9s=
-github.com/containerd/typeurl/v2 v2.1.0/go.mod h1:IDp2JFvbwZ31H8dQbEIY7sDl2L3o3HZj1hsSQlywkQ0=
 github.com/containerd/zfs v0.0.0-20200918131355-0a33824f23a2/go.mod h1:8IgZOBdv8fAgXddBT4dBXJPtxyRsejFIpXoklgxgEjw=
 github.com/containerd/zfs v0.0.0-20210301145711-11e8f1707f62/go.mod h1:A9zfAbMlQwE+/is6hi0Xw8ktpL+6glmqZYtevJgaB8Y=
 github.com/containerd/zfs v0.0.0-20210315114300-dde8f0fda960/go.mod h1:m+m51S1DvAP6r3FcmYCp54bQ34pyOwTieQDNRIRHsFY=
@@ -1037,32 +440,21 @@ github.com/containerd/zfs v1.0.0/go.mod h1:m+m51S1DvAP6r3FcmYCp54bQ34pyOwTieQDNR
 github.com/containernetworking/cni v0.7.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY=
 github.com/containernetworking/cni v0.8.0/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY=
 github.com/containernetworking/cni v0.8.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY=
-github.com/containernetworking/cni v1.0.1/go.mod h1:AKuhXbN5EzmD4yTNtfSsX3tPcmtrBI6QcRV0NiNt15Y=
-github.com/containernetworking/cni v1.1.1/go.mod h1:sDpYKmGVENF3s6uvMvGgldDWeG8dMxakj/u+i9ht9vw=
-github.com/containernetworking/cni v1.1.2/go.mod h1:sDpYKmGVENF3s6uvMvGgldDWeG8dMxakj/u+i9ht9vw=
 github.com/containernetworking/plugins v0.8.6/go.mod h1:qnw5mN19D8fIwkqW7oHHYDHVlzhJpcY6TQxn/fUyDDM=
 github.com/containernetworking/plugins v0.9.1/go.mod h1:xP/idU2ldlzN6m4p5LmGiwRDjeJr6FLK6vuiUwoH7P8=
-github.com/containernetworking/plugins v1.0.1/go.mod h1:QHCfGpaTwYTbbH+nZXKVTxNBDZcxSOplJT5ico8/FLE=
-github.com/containernetworking/plugins v1.1.1/go.mod h1:Sr5TH/eBsGLXK/h71HeLfX19sZPp3ry5uHSkI4LPxV8=
-github.com/containernetworking/plugins v1.2.0/go.mod h1:/VjX4uHecW5vVimFa1wkG4s+r/s9qIfPdqlLF4TW8c4=
 github.com/containers/ocicrypt v1.0.1/go.mod h1:MeJDzk1RJHv89LjsH0Sp5KTY3ZYkjXO/C+bKAeWFIrc=
 github.com/containers/ocicrypt v1.1.0/go.mod h1:b8AOe0YR67uU8OqfVNcznfFpAzu3rdgUV4GP9qXPfu4=
 github.com/containers/ocicrypt v1.1.1/go.mod h1:Dm55fwWm1YZAjYRaJ94z2mfZikIyIN4B0oB3dj3jFxY=
-github.com/containers/ocicrypt v1.1.2/go.mod h1:Dm55fwWm1YZAjYRaJ94z2mfZikIyIN4B0oB3dj3jFxY=
-github.com/containers/ocicrypt v1.1.3/go.mod h1:xpdkbVAuaH3WzbEabUd5yDsl9SwJA5pABH85425Es2g=
-github.com/containers/ocicrypt v1.1.6/go.mod h1:WgjxPWdTJMqYMjf3M6cuIFFA1/MpyyhIM99YInA+Rvc=
 github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
-github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
 github.com/coreos/go-iptables v0.4.5/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU=
 github.com/coreos/go-iptables v0.5.0/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU=
-github.com/coreos/go-iptables v0.6.0/go.mod h1:Qe8Bv2Xik5FyTXwgIbLAnv2sWSBmvWdFETJConOQ//Q=
 github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc=
 github.com/coreos/go-oidc v2.2.1+incompatible h1:mh48q/BqXqgjVHpy2ZY7WnWAbenxRjsz9N1i1YxjHAk=
 github.com/coreos/go-oidc v2.2.1+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc=
-github.com/coreos/go-oidc/v3 v3.5.0 h1:VxKtbccHZxs8juq7RdJntSqtXFtde9YpNpGn0yqgEHw=
-github.com/coreos/go-oidc/v3 v3.5.0/go.mod h1:ecXRtV4romGPeO6ieExAsUK9cb/3fp9hXNz1tlv8PIM=
+github.com/coreos/go-oidc/v3 v3.1.0 h1:6avEvcdvTa1qYsOZ6I5PRkSYHzpTNWgKYmaJfaYbrRw=
+github.com/coreos/go-oidc/v3 v3.1.0/go.mod h1:rEJ/idjfUyfkBit1eI1fvyr+64/g9dcKpAm8MJMesvo=
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM=
 github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
@@ -1074,54 +466,38 @@ github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf h1:iW4rZ826su+pq
 github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/go-systemd/v22 v22.0.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk=
 github.com/coreos/go-systemd/v22 v22.1.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk=
+github.com/coreos/go-systemd/v22 v22.3.2 h1:D9/bQk5vlXQFZ6Kwuu6zaiXJ9oTPe68++AzAJc1DzSI=
 github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
-github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
-github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
-github.com/couchbase/gocb/v2 v2.6.3 h1:5RsMo+RRfK0mVxHLAfpBz3/tHlgXZb1WBNItLk9Ab+c=
-github.com/couchbase/gocb/v2 v2.6.3/go.mod h1:yF5F6BHTZ/ZowhEuZbySbXrlI4rHd1TIhm5azOaMbJU=
-github.com/couchbase/gocbcore/v10 v10.2.3 h1:PEkRSNSkKjUBXx82Ucr094+anoiCG5GleOOQZOHo6D4=
-github.com/couchbase/gocbcore/v10 v10.2.3/go.mod h1:lYQIIk+tzoMcwtwU5GzPbDdqEkwkH3isI2rkSpfL0oM=
-github.com/couchbaselabs/gocaves/client v0.0.0-20230307083111-cc3960c624b1/go.mod h1:AVekAZwIY2stsJOMWLAS/0uA/+qdp7pjO8EHnl61QkY=
-github.com/couchbaselabs/gocaves/client v0.0.0-20230404095311-05e3ba4f0259 h1:2TXy68EGEzIMHOx9UvczR5ApVecwCfQZ0LjkmwMI6g4=
-github.com/couchbaselabs/gocaves/client v0.0.0-20230404095311-05e3ba4f0259/go.mod h1:AVekAZwIY2stsJOMWLAS/0uA/+qdp7pjO8EHnl61QkY=
+github.com/couchbase/gocb/v2 v2.3.3 h1:OItaIrFqXR1ba9J77E2YOU+CSF9G9FHYivV26Xgoi98=
+github.com/couchbase/gocb/v2 v2.3.3/go.mod h1:h4b3UYDnGI89hMW9VypVjAr+EE0Ki4jjlXJrVdmSZhQ=
+github.com/couchbase/gocbcore/v10 v10.0.4 h1:RJ+dSXxMUbrpfgYEEUhMYwPH1S5KvcQYve3D2aKHP28=
+github.com/couchbase/gocbcore/v10 v10.0.4/go.mod h1:s6dwBFs4c3+cAzZbo1q0VW+QasudhHJuehE8b8U2YNg=
 github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
-github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw=
 github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
-github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
 github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=
 github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
 github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod h1:Ct2BUK8SB0YC1SMSibvLzxjeJLnrYEVLULFNiHY9YfQ=
 github.com/d2g/dhcp4client v1.0.0/go.mod h1:j0hNfjhrt2SxUOw55nL0ATM/z4Yt3t2Kd1mW34z5W5s=
 github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5/go.mod h1:Eo87+Kg/IX2hfWJfwxMzLyuSZyxSoAug2nGa1G2QAi8=
 github.com/d2g/hardwareaddr v0.0.0-20190221164911-e7d9fbe030e4/go.mod h1:bMl4RjIciD2oAxI7DmWRx6gbeqrkoLqv3MV0vzNad+I=
-github.com/danieljoos/wincred v1.1.0/go.mod h1:XYlo+eRTsVA9aHGp7NGjFkPla4m+DCL7hqDjlFjiygg=
-github.com/danieljoos/wincred v1.1.2 h1:QLdCxFs1/Yl4zduvBdcHB8goaYk9RARS2SgLLRuAyr0=
-github.com/danieljoos/wincred v1.1.2/go.mod h1:GijpziifJoIBfYh+S7BbkdUTU4LfM+QnGqR5Vl2tAx0=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc=
-github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.0-20210816181553-5444fa50b93d/go.mod h1:tmAIfUFEirG/Y8jhZ9M+h36obRZAk/1fcSpXwAVlfqE=
 github.com/denisenkom/go-mssqldb v0.12.2 h1:1OcPn5GBIobjWNd+8yjfHNIaFX14B1pWI3F9HZy5KXw=
 github.com/denisenkom/go-mssqldb v0.12.2/go.mod h1:lnIw1mZukFRZDJYQ0Pb833QS2IaC3l5HkEfra2LJ+sk=
 github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0=
 github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba h1:p6poVbjHDkKa+wtC8frBMwQtT3BmqGYBjzMwJ63tuR4=
 github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0=
-github.com/dgraph-io/badger/v3 v3.2103.2/go.mod h1:RHo4/GmYcKKh5Lxu63wLEMHJ70Pac2JqZRYGhlyAo2M=
-github.com/dgraph-io/ristretto v0.1.0/go.mod h1:fux0lOrBhrVCJd3lcTHsIJhq1T2rokOu6v9Vcb3Q9ug=
 github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
-github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
-github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
 github.com/dgryski/go-metro v0.0.0-20180109044635-280f6062b5bc h1:8WFBn63wegobsYAX0YjD+8suexZDga5CctH4CCTx2+8=
 github.com/dgryski/go-metro v0.0.0-20180109044635-280f6062b5bc/go.mod h1:c9O8+fpSOX1DM8cPNSkX/qsBWdkD4yd2dpciOWQjpBw=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
@@ -1130,31 +506,28 @@ github.com/digitalocean/godo v1.7.5/go.mod h1:h6faOIcZ8lWIwNQ+DN7b3CgX4Kwby5T+nb
 github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8=
 github.com/dimchansky/utfbom v1.1.1 h1:vV6w1AhK4VMnhBno/TPVCoK9U/LP0PkLCS9tbxHdi/U=
 github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/j0mACtrfE=
-github.com/distribution/distribution/v3 v3.0.0-20220526142353-ffbd94cbe269/go.mod h1:28YO/VJk9/64+sTGNuYaBjWxrXTPrj0C0XmgTIOjxX4=
 github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=
 github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
 github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
 github.com/dnephin/pflag v1.0.7 h1:oxONGlWxhmUct0YzKTgrpQv9AUA1wtPBn7zuSjJqptk=
 github.com/dnephin/pflag v1.0.7/go.mod h1:uxE91IoWURlOiTUIA8Mq5ZZkAv3dPUfZNaT80Zm7OQE=
 github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
-github.com/docker/cli v20.10.17+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
-github.com/docker/cli v20.10.20+incompatible h1:lWQbHSHUFs7KraSN2jOJK7zbMS2jNCHI4mt4xUFUVQ4=
-github.com/docker/cli v20.10.20+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
+github.com/docker/cli v20.10.8+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
+github.com/docker/cli v20.10.9+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
+github.com/docker/cli v20.10.18+incompatible h1:f/GQLsVpo10VvToRay2IraVA1wHz9KktZyjev3SIVDU=
+github.com/docker/cli v20.10.18+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
 github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY=
 github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
+github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug=
 github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
-github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
-github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=
-github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v1.4.2-0.20200319182547-c7ad2b866182/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker v20.10.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
-github.com/docker/docker v20.10.17+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
-github.com/docker/docker v20.10.20+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
-github.com/docker/docker v23.0.4+incompatible h1:Kd3Bh9V/rO+XpTP/BLqM+gx8z7+Yb0AA2Ibj+nNo4ek=
-github.com/docker/docker v23.0.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v20.10.9+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v20.10.10+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v20.10.18+incompatible h1:SN84VYXTBNGn92T/QwIRPlum9zfemfitN7pbsp26WSc=
+github.com/docker/docker v20.10.18+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y=
-github.com/docker/docker-credential-helpers v0.6.4/go.mod h1:ofX3UI0Gz1TteYBjtgs07O36Pyasyp66D2uKT7H8W1c=
-github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0=
 github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
 github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
 github.com/docker/go-events v0.0.0-20170721190031-9461782956ad/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA=
@@ -1176,15 +549,9 @@ github.com/duosecurity/duo_api_golang v0.0.0-20190308151101-6c680f768e74/go.mod
 github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
-github.com/dvsekhvalnov/jose2go v1.5.0 h1:3j8ya4Z4kMCwT5nXIKFSV84YS+HdqSSO0VsTQxaLAeM=
-github.com/dvsekhvalnov/jose2go v1.5.0/go.mod h1:QsHjhyTlD/lAVqn/NSbVZmSCGeDehTB/mPZadG+mhXU=
 github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
 github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
 github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
-github.com/emicklei/go-restful/v3 v3.8.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
-github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
-github.com/emicklei/go-restful/v3 v3.10.1 h1:rc42Y5YTp7Am7CS630D7JmhRjq4UlEUuEKfrDac4bSQ=
-github.com/emicklei/go-restful/v3 v3.10.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -1194,119 +561,75 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.m
 github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
 github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
 github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE=
-github.com/envoyproxy/go-control-plane v0.10.3/go.mod h1:fJJn/j26vwOu972OllsvAgJJM//w9BV6Fxbg2LuVd34=
-github.com/envoyproxy/go-control-plane v0.11.0 h1:jtLewhRR2vMRNnq2ZZUoCjUlgut+Y0+sDDWPOfwOi1o=
-github.com/envoyproxy/go-control-plane v0.11.0/go.mod h1:VnHyVMpzcLvCFt9yUz1UnCwHLhwx1WguiVDV7pTG/tI=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/envoyproxy/protoc-gen-validate v0.6.7/go.mod h1:dyJXwwfPK2VSqiB9Klm1J6romD608Ba7Hij42vrOBCo=
-github.com/envoyproxy/protoc-gen-validate v0.9.1/go.mod h1:OKNgG7TCp5pF4d6XftA0++PMirau2/yoOwVac3AbF2w=
-github.com/envoyproxy/protoc-gen-validate v0.10.0 h1:oIfnZFdC0YhpNNEX+SuIqko4cqqVZeN9IGTrhZje83Y=
-github.com/envoyproxy/protoc-gen-validate v0.10.0/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss=
 github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/evanphx/json-patch v4.11.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
-github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
+github.com/evanphx/json-patch/v5 v5.5.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4=
 github.com/evanphx/json-patch/v5 v5.6.0 h1:b91NhWfaz02IuVxO9faSllyAtNXHMPkC5J8sJCLunww=
 github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
+github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
-github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
-github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
 github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
 github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
-github.com/favadi/protoc-go-inject-tag v1.4.0 h1:K3KXxbgRw5WT4f43LbglARGz/8jVsDOS7uMjG4oNvXY=
-github.com/favadi/protoc-go-inject-tag v1.4.0/go.mod h1:AZ+PK+QDKUOLlBRG0rYiKkUX5Hw7+7GTFzlU99GFSbQ=
-github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
-github.com/felixge/httpsnoop v1.0.2/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
-github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
-github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
-github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
+github.com/favadi/protoc-go-inject-tag v1.3.0 h1:JPrmsmc/uBShG85uY5xGZIa5WJ0IaNZn6LZhQR9tIQE=
+github.com/favadi/protoc-go-inject-tag v1.3.0/go.mod h1:SSkUBgfqw2IJ2p7NPNKWk0Idwxt/qIt2LQgFPUgRGtc=
 github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
 github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
 github.com/form3tech-oss/jwt-go v3.2.5+incompatible h1:/l4kBbb4/vGSsdtB5nUe8L7B9mImVMaBPw9L/0TBHU8=
 github.com/form3tech-oss/jwt-go v3.2.5+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
-github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
-github.com/foxcpp/go-mockdns v0.0.0-20210729171921-fb145fc6f897/go.mod h1:lgRN6+KxQBawyIghpnl5CezHFGS9VLzvtVlwxvzXTQ4=
+github.com/frankban/quicktest v1.10.0/go.mod h1:ui7WezCLWMWxVWr1GETZY3smRy0G4KWq9vcPtJmFl7Y=
 github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=
 github.com/frankban/quicktest v1.13.0/go.mod h1:qLE0fzW0VuyUAJgPU19zByoIr0HtCHN/r/VLSOOIySU=
-github.com/frankban/quicktest v1.14.0/go.mod h1:NeW+ay9A/U67EYXNFA1nPE8e/tnQv/09mUdL/ijj8og=
-github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY=
+github.com/frankban/quicktest v1.14.2 h1:SPb1KFFmM+ybpEjPUhCCkZOM5xlovT5UbrMvWnXyBns=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
+github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI=
 github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=
-github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
-github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
 github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod h1:KnogPXtdwXqoenmZCw6S+25EAm2MkxbG0deNDu4cbSA=
-github.com/fxamacker/cbor/v2 v2.4.0/go.mod h1:TA1xS00nchWmaBnEIxPSE5oHLuJBAVvqrtAnWBwBCVo=
-github.com/gabriel-vasile/mimetype v1.4.1/go.mod h1:05Vi0w3Y9c/lNvJOdmIwvrrAhX3rYhfQQCaf9VJcv7M=
-github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU=
-github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA=
-github.com/gammazero/deque v0.2.1 h1:qSdsbG6pgp6nL7A0+K/B7s12mcCY/5l5SIUpMOl+dC0=
-github.com/gammazero/deque v0.2.1/go.mod h1:LFroj8x4cMYCukHJDbxFCkT+r9AndaJnFMuZDV34tuU=
-github.com/gammazero/workerpool v1.1.3 h1:WixN4xzukFoN0XSeXF6puqEqFTl2mECI9S6W44HWy9Q=
-github.com/gammazero/workerpool v1.1.3/go.mod h1:wPjyBLDbyKnUn2XwwyD3EEwo9dHutia9/fwNmSHWACc=
+github.com/gabriel-vasile/mimetype v1.3.1 h1:qevA6c2MtE1RorlScnixeG0VA1H4xrXyhyX3oWBynNQ=
+github.com/gabriel-vasile/mimetype v1.3.1/go.mod h1:fA8fi6KUiG7MgQQ+mEWotXoEOvmxRtOJlERCzSmRvr8=
+github.com/gammazero/deque v0.0.0-20190130191400-2afb3858e9c7 h1:D2LrfOPgGHQprIxmsTpxtzhpmF66HoM6rXSmcqaX7h8=
+github.com/gammazero/deque v0.0.0-20190130191400-2afb3858e9c7/go.mod h1:GeIq9qoE43YdGnDXURnmKTnGg15pQz4mYkXSTChbneI=
+github.com/gammazero/workerpool v0.0.0-20190406235159-88d534f22b56 h1:VzbudKn/nvxYKOdzgkEBS6SSreRjAgoJ+ZeS4wPFkgc=
+github.com/gammazero/workerpool v0.0.0-20190406235159-88d534f22b56/go.mod h1:w9RqFVO2BM3xwWEcAB8Fwp0OviTBBEiRmSBDfbXnd3w=
 github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
-github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg=
-github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ=
 github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 h1:Mn26/9ZMNWSw9C9ERFA1PUxfmGpolnw2v0bKOREu5ew=
 github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32/go.mod h1:GIjDIg/heH5DOkXY3YJ/wNhfHsQHoXGjl8G8amsYQ1I=
-github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
-github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
-github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14=
-github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
 github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
 github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
 github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
 github.com/go-asn1-ber/asn1-ber v1.4.1/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
+github.com/go-asn1-ber/asn1-ber v1.5.1 h1:pDbRAunXzIUXfx4CB2QJFv5IuPiuoW+sWvr/Us009o8=
 github.com/go-asn1-ber/asn1-ber v1.5.1/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
-github.com/go-asn1-ber/asn1-ber v1.5.4 h1:vXT6d/FNDiELJnLb6hGNa309LMsrCoYFvpwHDF0+Y1A=
-github.com/go-asn1-ber/asn1-ber v1.5.4/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
-github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
-github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
-github.com/go-fonts/dejavu v0.1.0/go.mod h1:4Wt4I4OU2Nq9asgDCteaAaWZOV24E+0/Pwo0gppep4g=
-github.com/go-fonts/latin-modern v0.2.0/go.mod h1:rQVLdDMK+mK1xscDwsqM5J8U2jrRa3T0ecnM9pNujks=
-github.com/go-fonts/liberation v0.1.1/go.mod h1:K6qoJYypsmfVjWg8KOVDQhLc8UDgIK2HYqyqAO9z7GY=
-github.com/go-fonts/liberation v0.2.0/go.mod h1:K6qoJYypsmfVjWg8KOVDQhLc8UDgIK2HYqyqAO9z7GY=
-github.com/go-fonts/stix v0.1.0/go.mod h1:w/c1f0ldAUlJmLBvlbkvVXLAD+tAMqobIIQpmnUIzUY=
+github.com/go-errors/errors v1.4.1 h1:IvVlgbzSsaUNudsw5dcXSzF3EWyXTi5XrAdngnuhRyg=
+github.com/go-errors/errors v1.4.1/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
-github.com/go-ini/ini v1.66.6/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
-github.com/go-jose/go-jose/v3 v3.0.0 h1:s6rrhirfEP/CGIoc6p+PZAeogN2SxKav6Wp7+dyMWVo=
-github.com/go-jose/go-jose/v3 v3.0.0/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxFMht0mSX+u8=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
-github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
-github.com/go-latex/latex v0.0.0-20210118124228-b3d85cf34e07/go.mod h1:CO1AlKB2CSIqUrmQPqA0gdRIlnLEY0gK5JGjh37zN5U=
-github.com/go-latex/latex v0.0.0-20210823091927-c0d11ff05a81/go.mod h1:SX0U8uGpxhq9o2S/CELCSUxEWWAuoCUcVCQWv7G2OCk=
 github.com/go-ldap/ldap/v3 v3.1.7/go.mod h1:5Zun81jBTabRaI8lzN7E1JjyEl1g6zI6u9pd8luAK4Q=
+github.com/go-ldap/ldap/v3 v3.1.10/go.mod h1:5Zun81jBTabRaI8lzN7E1JjyEl1g6zI6u9pd8luAK4Q=
+github.com/go-ldap/ldap/v3 v3.4.1 h1:fU/0xli6HY02ocbMuozHAYsaHLcnkLjvho2r5a34BUU=
 github.com/go-ldap/ldap/v3 v3.4.1/go.mod h1:iYS1MdmrmceOJ1QOTnRXrIs7i3kloqtmGQjRvjKpyMg=
-github.com/go-ldap/ldap/v3 v3.4.4 h1:qPjipEpt+qDa6SI/h1fzuGWoRUY+qqQ9sOZq67/PYUs=
-github.com/go-ldap/ldap/v3 v3.4.4/go.mod h1:fe1MsuN5eJJ1FeLT/LEBVdWfNWKh459R7aXgXtJC+aI=
 github.com/go-ldap/ldif v0.0.0-20200320164324-fd88d9b715b3 h1:sfz1YppV05y4sYaW7kXZtrocU/+vimnIWt4cxAYh7+o=
 github.com/go-ldap/ldif v0.0.0-20200320164324-fd88d9b715b3/go.mod h1:ZXFhGda43Z2TVbfGZefXyMJzsDHhCh0go3bZUcwTx7o=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
-github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
 github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
 github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
 github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
+github.com/go-logr/logr v1.2.0 h1:QK40JKJyMdUDz+h+xvCsru/bJhvG0UxvePV0ufL/AcE=
 github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.2.1/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
-github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/stdr v1.2.0/go.mod h1:YkVgnZu1ZjjL7xTxrfm/LLZBfkhTqSR1ydtm6jTKKwI=
-github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
-github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
-github.com/go-logr/zapr v1.2.3/go.mod h1:eIauM6P8qSvTw5o2ez6UEAfGjQKrxQTl5EoK+Qa2oG4=
 github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab h1:xveKWz2iaueeTaUgdetzel+U7exyigDYBryyVfV/rZk=
 github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8=
 github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
@@ -1328,26 +651,22 @@ github.com/go-openapi/errors v0.19.3/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA
 github.com/go-openapi/errors v0.19.6/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M=
 github.com/go-openapi/errors v0.19.7/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M=
 github.com/go-openapi/errors v0.19.8/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M=
+github.com/go-openapi/errors v0.19.9 h1:9SnKdGhiPZHF3ttwFMiCBEb8jQ4IDdrK+5+a0oTygA4=
 github.com/go-openapi/errors v0.19.9/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M=
-github.com/go-openapi/errors v0.20.1 h1:j23mMDtRxMwIobkpId7sWh7Ddcx4ivaoqUbfXx5P+a8=
-github.com/go-openapi/errors v0.20.1/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M=
 github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0=
 github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
 github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
 github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
 github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
+github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY=
 github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
-github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE=
-github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs=
 github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg=
 github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
 github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
 github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc=
 github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8=
+github.com/go-openapi/jsonreference v0.19.5 h1:1WJP/wi4OjB4iV8KVbH73rQaoialJrqv8gitZLxGLtM=
 github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg=
-github.com/go-openapi/jsonreference v0.20.0/go.mod h1:Ag74Ico3lPc+zR+qjn4XBUmXymS4zJbYVCZmcgkasdo=
-github.com/go-openapi/jsonreference v0.20.1 h1:FBLnyygC4/IZZr893oiomc9XaghoveYTrLC1F86HID8=
-github.com/go-openapi/jsonreference v0.20.1/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k=
 github.com/go-openapi/loads v0.17.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
 github.com/go-openapi/loads v0.18.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
 github.com/go-openapi/loads v0.19.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
@@ -1397,9 +716,8 @@ github.com/go-openapi/swag v0.19.7/go.mod h1:ao+8BpOPyKdpQz3AOJfbeEVpLmWAvlT1IfT
 github.com/go-openapi/swag v0.19.9/go.mod h1:ao+8BpOPyKdpQz3AOJfbeEVpLmWAvlT1IfTe5McPyhY=
 github.com/go-openapi/swag v0.19.12/go.mod h1:eFdyEBkTdoAf/9RXBvj4cr1nH7GD8Kzo5HTt47gr72M=
 github.com/go-openapi/swag v0.19.13/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
+github.com/go-openapi/swag v0.19.14 h1:gm3vOOXfiuw5i9p5N9xJvfjvuofpyvLA9Wr6QfK5Fng=
 github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
-github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g=
-github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
 github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4=
 github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA=
 github.com/go-openapi/validate v0.19.3/go.mod h1:90Vh6jjkTn+OT1Eefm0ZixWNFjhtOH7vS9k0lo6zwJo=
@@ -1411,27 +729,16 @@ github.com/go-openapi/validate v0.20.2 h1:AhqDegYV3J3iQkMPJSXkvzymHKMTw0BST3RK3h
 github.com/go-openapi/validate v0.20.2/go.mod h1:e7OJoKNgd0twXZwIn0A43tHbvIcr/rZIVCbJBpTUoY0=
 github.com/go-ozzo/ozzo-validation v3.6.0+incompatible h1:msy24VGS42fKO9K1vLz82/GeYW1cILu7Nuuj1N3BBkE=
 github.com/go-ozzo/ozzo-validation v3.6.0+incompatible/go.mod h1:gsEKFIVnabGBt6mXmxK0MoFy+cZoTJY6mu5Ll3LVLBU=
-github.com/go-pdf/fpdf v0.5.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M=
-github.com/go-pdf/fpdf v0.6.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M=
-github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
-github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
-github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
-github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
-github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
-github.com/go-playground/validator/v10 v10.2.0 h1:KgJ0snyC2R9VXYN2rneOtQcw5aHQB1Vv0sFl1UcHBOY=
-github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
+github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/go-test/deep v1.0.2/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
-github.com/go-test/deep v1.0.4/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
-github.com/go-test/deep v1.1.0 h1:WOcxcdHcvdgThNXjw0t76K42FXTU7HpNQWHpA2HHNlg=
-github.com/go-test/deep v1.1.0/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
-github.com/go-zookeeper/zk v1.0.3 h1:7M2kwOsc//9VeeFiPtf+uSJlVpU66x9Ba5+8XK7/TDg=
-github.com/go-zookeeper/zk v1.0.3/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw=
+github.com/go-test/deep v1.0.7/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8=
+github.com/go-test/deep v1.0.8 h1:TDsG77qcSprGbC6vTN8OuXp5g+J+b5Pcguhf7Zt61VM=
+github.com/go-test/deep v1.0.8/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
 github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0=
 github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod h1:3STtPUQYuzV0gBVOY3vy6CfMm/ljR4pABfrTeHNLHUY=
 github.com/gobuffalo/depgen v0.1.0/go.mod h1:+ifsuy7fhi15RWncXQQKjWS9JPkdah5sZvtHc2RXGlg=
@@ -1456,29 +763,16 @@ github.com/gobuffalo/packd v0.1.0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWe
 github.com/gobuffalo/packr/v2 v2.0.9/go.mod h1:emmyGweYTm6Kdper+iywB6YK5YzuKchGtJQZ0Odn4pQ=
 github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/VCm/3ptBN+0=
 github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw=
-github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
-github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0=
-github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
-github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8=
-github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
-github.com/gobwas/ws v1.0.2 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo=
-github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
-github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
-github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
 github.com/gocql/gocql v1.0.0 h1:UnbTERpP72VZ/viKE1Q1gPtmLvyTZTvuAstvSRydw/c=
 github.com/gocql/gocql v1.0.0/go.mod h1:3gM2c4D3AnkISwBxGnMMsS8Oy4y2lhbPRsH4xnJrHG8=
 github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
 github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
 github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4=
-github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+Hoeu/iUR3ruzNvZ+yQfO03a0=
-github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4=
 github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
+github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw=
 github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
-github.com/gofrs/uuid v4.3.0+incompatible h1:CaSVZxm5B+7o45rtab4jC2G37WGYX1zQfuU2i6DSvnc=
-github.com/gofrs/uuid v4.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gogo/googleapis v1.2.0/go.mod h1:Njal3psf3qN6dwBtQfUmBZh2ybovJ0tlu3o/AC7HYjU=
 github.com/gogo/googleapis v1.4.0/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
@@ -1491,15 +785,13 @@ github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69
 github.com/goji/httpauth v0.0.0-20160601135302-2da839ab0f4d/go.mod h1:nnjvkQ9ptGaCkuDUx6wNykzzlUixGxvkme+H/lnzb+A=
 github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
 github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
-github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=
-github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
+github.com/golang-jwt/jwt/v4 v4.3.0 h1:kHL1vqdqWNfATmA0FNMdmZNMyZI1U6O31X4rlIPoBog=
+github.com/golang-jwt/jwt/v4 v4.3.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
 github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A=
 github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI=
-github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4=
 github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -1534,29 +826,19 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
+github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
-github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.2/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/golangci/revgrep v0.0.0-20220804021717-745bb2f7c2e6 h1:DIPQnGy2Gv2FSA4B/hh8Q7xx3B7AIDk3DAMeHclH1vQ=
-github.com/golangci/revgrep v0.0.0-20220804021717-745bb2f7c2e6/go.mod h1:0AKcRCkMoKvUvlf89F6O7H2LYdhr1zBh736mBItOdRs=
-github.com/gomodule/redigo v1.8.2/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4=
 github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA=
-github.com/google/cel-go v0.12.6/go.mod h1:Jk7ljRzLBhkmiAwBoUxB1sZSCVBAzkqPF25olK/iRDw=
-github.com/google/flatbuffers v1.12.1/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
+github.com/google/flatbuffers v2.0.0+incompatible h1:dicJ2oXwypfwUGnB2/TYWYEKiuk9eYQlQO/AnOHl5mI=
 github.com/google/flatbuffers v2.0.0+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
-github.com/google/flatbuffers v2.0.8+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
-github.com/google/flatbuffers v23.1.21+incompatible h1:bUqzx/MXCDxuS0hRJL2EfjyZL3uQrPbMocUa8zGqsTA=
-github.com/google/flatbuffers v23.1.21+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
-github.com/google/gnostic v0.5.7-v3refs h1:FhTMOKj2VhjpouxvWJAV1TL304uMlb9zcDqkl6cEI54=
-github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
@@ -1570,11 +852,9 @@ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
+github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
 github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-containerregistry v0.5.1/go.mod h1:Ct15B4yir3PLOP5jsy0GNeYVaIZs/MK/Jz5any1wFW0=
-github.com/google/go-containerregistry v0.13.0/go.mod h1:J9FQ+eSS4a1aC2GNZxvNpbWhgp0487v+cgiilB4FqDo=
 github.com/google/go-github v17.0.0+incompatible h1:N0LgJ1j65A7kfXrZnUDaYCs/Sf4rEjNlfyDHW9dolSY=
 github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
 github.com/google/go-metrics-stackdriver v0.2.0 h1:rbs2sxHAPn2OtUj9JdR/Gij1YKGl0BTVD0augB+HEjE=
@@ -1583,16 +863,14 @@ github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod h1:od
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
 github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g=
 github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
-github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
 github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
+github.com/google/martian/v3 v3.2.1 h1:d8MncMlErDFTwQGBK1xhv026j9kqhvw1Qv9IbWT1VLQ=
 github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=
-github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw=
-github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
@@ -1602,69 +880,50 @@ github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hf
 github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec=
 github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc=
-github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
-github.com/google/tink/go v1.7.0 h1:6Eox8zONGebBFcCBqkVmt60LaWZa6xg1cl/DwAh/J1w=
-github.com/google/tink/go v1.7.0/go.mod h1:GAUOd+QE3pgj9q8VKIGTCP33c/B7eb4NhxLcgTJZStM=
+github.com/google/tink/go v1.6.1 h1:t7JHqO8Ath2w2ig5vjwQYJzhGEZymedQc90lQXUBa4I=
+github.com/google/tink/go v1.6.1/go.mod h1:IGW53kTgag+st5yPhKKwJ6u2l+SSp5/v9XF7spovjlY=
 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8=
-github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8=
-github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg=
-github.com/googleapis/enterprise-certificate-proxy v0.2.1/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k=
-github.com/googleapis/enterprise-certificate-proxy v0.2.3 h1:yk9/cqRKtT9wXZSsRH9aurXEpJX+U6FLtpYTdC3R06k=
-github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0=
 github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM=
 github.com/googleapis/gax-go/v2 v2.2.0/go.mod h1:as02EH8zWkzwUoLbBaFeQ+arQaj/OthfcblKl4IGNaM=
 github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99EXz9pXxye9YM=
+github.com/googleapis/gax-go/v2 v2.4.0 h1:dS9eYAjhrE2RjmzYw2XAPvcXfmcQLtFEQWn0CR82awk=
 github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c=
-github.com/googleapis/gax-go/v2 v2.5.1/go.mod h1:h6B0KMMFNtI2ddbGJn3T3ZbwkeT6yqEF02fYlzkUCyo=
-github.com/googleapis/gax-go/v2 v2.6.0/go.mod h1:1mjbznJAPHFpesgE5ucqfYEscaz5kMdcIDwU/6+DDoY=
-github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8=
-github.com/googleapis/gax-go/v2 v2.9.1 h1:DpTpJqzZ3NvX9zqjhIuI1oVzYZMvboZe+3LoeEIJjHM=
-github.com/googleapis/gax-go/v2 v2.9.1/go.mod h1:4FG3gMrVZlyMp5itSYKMU9z/lBE7+SbnUOvzH2HqbEY=
 github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
 github.com/googleapis/gnostic v0.1.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
 github.com/googleapis/gnostic v0.2.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
 github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg=
 github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU=
+github.com/googleapis/gnostic v0.5.5 h1:9fHAtK0uDfpveeqqo1hkEZJcFvYXAiCN3UutL8F9xHw=
 github.com/googleapis/gnostic v0.5.5/go.mod h1:7+EbHbldMins07ALC74bsA81Ovc97DwqyJO1AENw9kA=
-github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4=
-github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
 github.com/gophercloud/gophercloud v0.1.0 h1:P/nh25+rzXouhytV2pUHBb65fnds26Ghl8/391+sT5o=
 github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
-github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q=
 github.com/gorilla/mux v1.7.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
-github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
 github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ=
 github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
 github.com/gorilla/sessions v1.2.1 h1:DHd3rPN5lE3Ts3D8rKkQ8x/0kqfeNmBAaiSi+o7FsgI=
 github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
 github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
-github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
 github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
@@ -1672,34 +931,27 @@ github.com/gotestyourself/gotestyourself v2.2.0+incompatible h1:AQwinXlbQR2HvPjQ
 github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
-github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3/go.mod h1:o//XUCC/F+yRGJoPO/VU0GSB0f8Nhgmxx0VIRUvaC0w=
-github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c h1:6rhixN/i8ZofjG1Y75iExal34USq5p+wiN1tpie8IrU=
-github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c/go.mod h1:NMPJylDgVpX0MLRlPy15sqSwOFv/U1GZ2m21JhFfek0=
 github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed h1:5upAirOpQc1Q53c0bnx2ufif5kANL7bfZWcc6VJWJd8=
 github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4=
-github.com/hashicorp/cap v0.3.1 h1:JwX2vg3KIl2+ka4VIPB0yWB9PoPvHL3ACmVrLJLCHDQ=
-github.com/hashicorp/cap v0.3.1/go.mod h1:dHTmyMIVbzT981XxRoci5G//dfWmd/HhuNiCH6J5+IA=
-github.com/hashicorp/consul-template v0.32.0 h1:VIfKjoJLkBYLgHdLH4mR7RstPc549qqHJiecqPwYTis=
-github.com/hashicorp/consul-template v0.32.0/go.mod h1:r9mcCoHVkTeVln7aL4Ky+RfKupOtbEW70i8n9YuEe+w=
-github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=
-github.com/hashicorp/consul/api v1.20.0 h1:9IHTjNVSZ7MIwjlW3N3a7iGiykCMDpxZu8jsxFJh0yc=
-github.com/hashicorp/consul/api v1.20.0/go.mod h1:nR64eD44KQ59Of/ECwt2vUmIK2DKsDzAwTmwmLl8Wpo=
+github.com/hashicorp/cap v0.2.1-0.20220727210936-60cd1534e220 h1:Vgv3jG0kicczshK+lOHWJ9OososZjnjSu1YslqofFYY=
+github.com/hashicorp/cap v0.2.1-0.20220727210936-60cd1534e220/go.mod h1:zb3VvIFA0lM2lbmO69NjowV9dJzJnZS89TaM9blXPJA=
+github.com/hashicorp/consul-template v0.29.5 h1:tzEo93RqODAX2cgOe/ke8xcpdPdxg5rxl6d22wE3f6c=
+github.com/hashicorp/consul-template v0.29.5/go.mod h1:SZGBPz/t0JaBwMOqM6q/mG66cBRA8IeDUjOwjO0Pa5M=
+github.com/hashicorp/consul/api v1.15.2 h1:3Q/pDqvJ7udgt/60QOOW/p/PeKioQN+ncYzzCdN2av0=
+github.com/hashicorp/consul/api v1.15.2/go.mod h1:v6nvB10borjOuIwNRZYPZiHKrTM/AyrGtd0WVVodKM8=
 github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
-github.com/hashicorp/consul/sdk v0.13.1 h1:EygWVWWMczTzXGpO93awkHFzfUka6hLYJ0qhETd+6lY=
+github.com/hashicorp/consul/sdk v0.11.0 h1:HRzj8YSCln2yGgCumN5CL8lYlD3gBurnervJRJAZyC4=
+github.com/hashicorp/consul/sdk v0.11.0/go.mod h1:yPkX5Q6CsxTFMjQQDJwzeNmUUF5NUGGbrDsv9wTb8cw=
 github.com/hashicorp/cronexpr v1.1.1 h1:NJZDd87hGXjoZBdvyCF9mX4DCq5Wy7+A/w+A7q0wn6c=
 github.com/hashicorp/cronexpr v1.1.1/go.mod h1:P4wA0KBl9C5q2hABiMO7cp6jcIg96CDh1Efb3g1PWA4=
 github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
 github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
-github.com/hashicorp/eventlogger v0.1.1 h1:zyCjxsy7KunFsMPZKU5PnwWEakSrp1zjj2vPFmrDaeo=
-github.com/hashicorp/eventlogger v0.1.1/go.mod h1://CHt6/j+Q2lc0NlUB5af4aS2M0c0aVBg9/JfcpAyhM=
 github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
@@ -1711,64 +963,59 @@ github.com/hashicorp/go-gcp-common v0.8.0 h1:/2vGAbCU1v+BZ3YHXTCzTvxqma9WOJHYtAD
 github.com/hashicorp/go-gcp-common v0.8.0/go.mod h1:Q7zYRy9ue9SuaEN2s9YLIQs4SoKHdoRmKRcImY3SLgs=
 github.com/hashicorp/go-hclog v0.9.1/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
 github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
+github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
 github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
 github.com/hashicorp/go-hclog v0.16.2/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
 github.com/hashicorp/go-hclog v1.0.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
-github.com/hashicorp/go-hclog v1.4.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
-github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c=
-github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
+github.com/hashicorp/go-hclog v1.3.1 h1:vDwF1DFNZhntP4DAjuTpOw3uEgMUpXh1pB5fW9DqHpo=
+github.com/hashicorp/go-hclog v1.3.1/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
 github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
 github.com/hashicorp/go-immutable-radix v1.3.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
 github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc=
 github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
 github.com/hashicorp/go-kms-wrapping/entropy/v2 v2.0.0 h1:pSjQfW3vPtrOTcasTUKgCTQT7OGPPTTMVRrOfU6FJD8=
 github.com/hashicorp/go-kms-wrapping/entropy/v2 v2.0.0/go.mod h1:xvb32K2keAc+R8DSFG2IwDcydK9DBQE+fGA5fsw6hSk=
-github.com/hashicorp/go-kms-wrapping/v2 v2.0.8/go.mod h1:qTCjxGig/kjuj3hk1z8pOUrzbse/GxB1tGfbrq8tGJg=
-github.com/hashicorp/go-kms-wrapping/v2 v2.0.9 h1:JpCvi97NMA+saNqO8ovQcGoRbBq6P5ZZlJqvOsW5ick=
-github.com/hashicorp/go-kms-wrapping/v2 v2.0.9/go.mod h1:NtMaPhqSlfQ72XWDD2g80o8HI8RKkowIB8/WZHMyPY4=
-github.com/hashicorp/go-kms-wrapping/wrappers/aead/v2 v2.0.7-1 h1:ZV26VJYcITBom0QqYSUOIj4HOHCVPEFjLqjxyXV/AbA=
-github.com/hashicorp/go-kms-wrapping/wrappers/aead/v2 v2.0.7-1/go.mod h1:b99cDSA+OzcyRoBZroSf174/ss/e6gUuS45wue9ZQfc=
+github.com/hashicorp/go-kms-wrapping/v2 v2.0.5 h1:rOFDv+3k05mnW0oaDLffhVUwg03Csn0mvfO98Wdd2bE=
+github.com/hashicorp/go-kms-wrapping/v2 v2.0.5/go.mod h1:sDQAfwJGv25uGPZA04x87ERglCG6avnRcBT9wYoMII8=
+github.com/hashicorp/go-kms-wrapping/wrappers/aead/v2 v2.0.4 h1:ws2CPDuXMKwaBb2z/duBCdnB9pSxlN2nuDZWXcVj6RU=
+github.com/hashicorp/go-kms-wrapping/wrappers/aead/v2 v2.0.4/go.mod h1:dDxt3GXi5QONVHYrJi2+EjsJLCUs59FktZQA8ZMnm+U=
 github.com/hashicorp/go-kms-wrapping/wrappers/alicloudkms/v2 v2.0.1 h1:ydUCtmr8f9F+mHZ1iCsvzqFTXqNVpewX3s9zcYipMKI=
 github.com/hashicorp/go-kms-wrapping/wrappers/alicloudkms/v2 v2.0.1/go.mod h1:Sl/ffzV57UAyjtSg1h5Km0rN5+dtzZJm1CUztkoCW2c=
-github.com/hashicorp/go-kms-wrapping/wrappers/awskms/v2 v2.0.7 h1:E3eEWpkofgPNrYyYznfS1+drq4/jFcqHQVNcL7WhUCo=
-github.com/hashicorp/go-kms-wrapping/wrappers/awskms/v2 v2.0.7/go.mod h1:j5vefRoguQUG7iM4reS/hKIZssU1lZRqNPM5Wow6UnM=
-github.com/hashicorp/go-kms-wrapping/wrappers/azurekeyvault/v2 v2.0.7 h1:X27JWuPW6Gmi2l7NMm0pvnp7z7hhtns2TeIOQU93mqI=
-github.com/hashicorp/go-kms-wrapping/wrappers/azurekeyvault/v2 v2.0.7/go.mod h1:i7Dt9mDsVUQG/I639jtdQerliaO2SvvPnpYPhZ8CGZ4=
-github.com/hashicorp/go-kms-wrapping/wrappers/gcpckms/v2 v2.0.8 h1:16I8OqBEuxZIowwn3jiLvhlx+z+ia4dJc9stvz0yUBU=
-github.com/hashicorp/go-kms-wrapping/wrappers/gcpckms/v2 v2.0.8/go.mod h1:6QUMo5BrXAtbzSuZilqmx0A4px2u6PeFK7vfp2WIzeM=
-github.com/hashicorp/go-kms-wrapping/wrappers/ocikms/v2 v2.0.7 h1:KeG3QGrbxbr2qAqCJdf3NR4ijAYwdcWLTmwSbR0yusM=
-github.com/hashicorp/go-kms-wrapping/wrappers/ocikms/v2 v2.0.7/go.mod h1:rXxYzjjGw4HltEwxPp9zYSRIo6R+rBf1MSPk01bvodc=
-github.com/hashicorp/go-kms-wrapping/wrappers/transit/v2 v2.0.7 h1:G25tZFw/LrAzJWxvS0/BFI7V1xAP/UsAIsgBwiE0mwo=
-github.com/hashicorp/go-kms-wrapping/wrappers/transit/v2 v2.0.7/go.mod h1:hxNA5oTfAvwPacWVg1axtF/lvTafwlAa6a6K4uzWHhw=
+github.com/hashicorp/go-kms-wrapping/wrappers/awskms/v2 v2.0.1 h1:WxpTuafkDjdeeu0Xtk9y3m9YAJhfFMb8+y6eTnxvV8A=
+github.com/hashicorp/go-kms-wrapping/wrappers/awskms/v2 v2.0.1/go.mod h1:3D5UB9fjot4oUTYGQ5gGmhLJKreyLZeI0XB+NxcLTKs=
+github.com/hashicorp/go-kms-wrapping/wrappers/azurekeyvault/v2 v2.0.1 h1:6joKpqCFveaNMEwC3qna67usws6DjdxqfCuQEHSM0aM=
+github.com/hashicorp/go-kms-wrapping/wrappers/azurekeyvault/v2 v2.0.1/go.mod h1:sDmsWR/W2LqwU217o32RzdHMb/FywGLF72PVIhpZ3hE=
+github.com/hashicorp/go-kms-wrapping/wrappers/gcpckms/v2 v2.0.1 h1:+paf/3ompzaXe07BdxkV1vTnqvhwtmZPE4yQnMPTThI=
+github.com/hashicorp/go-kms-wrapping/wrappers/gcpckms/v2 v2.0.1/go.mod h1:YRtkersQ2N3iHlPDG5B3xBQtBsNZ3bjmlCwnrl26jVE=
+github.com/hashicorp/go-kms-wrapping/wrappers/ocikms/v2 v2.0.0 h1:FnWV2E0NLj+yYdhToUQjU81ayCMgURiL2WbJ0V7u/XY=
+github.com/hashicorp/go-kms-wrapping/wrappers/ocikms/v2 v2.0.0/go.mod h1:17twrc0lM8IpfGqIv69WQvwgDiu3nRwWlk5YfCSQduY=
+github.com/hashicorp/go-kms-wrapping/wrappers/transit/v2 v2.0.1 h1:72zlIBTJd2pvYmINqotpvcI4ZXLxhRq2cVPTuqv0xqY=
+github.com/hashicorp/go-kms-wrapping/wrappers/transit/v2 v2.0.1/go.mod h1:JytRAxdJViV+unUUWedb7uzEy5pgu7OurbqX0eHEikE=
 github.com/hashicorp/go-memdb v1.3.3 h1:oGfEWrFuxtIUF3W2q/Jzt6G85TrMk9ey6XfYLvVe1Wo=
 github.com/hashicorp/go-memdb v1.3.3/go.mod h1:uBTr1oQbtuMgd1SSGoR8YV27eT3sBHbYiNm53bMpgSg=
 github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
 github.com/hashicorp/go-msgpack v0.5.5/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
 github.com/hashicorp/go-msgpack v1.1.5 h1:9byZdVjKTe5mce63pRVNP1L7UAmdHOTEMGehn6KvJWs=
 github.com/hashicorp/go-msgpack v1.1.5/go.mod h1:gWVc3sv/wbDmR3rQsj1CAktEZzoz1YNK9NfGLXJ69/4=
-github.com/hashicorp/go-msgpack/v2 v2.0.0 h1:c1fiLq1LNghmLOry1ipGhvLDi+/zEoaEP2JrE1oFJ9s=
-github.com/hashicorp/go-msgpack/v2 v2.0.0/go.mod h1:JIxYkkFJRDDRSoWQBSh7s9QAVThq+82iWmUpmE4jKak=
 github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I=
 github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
 github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA=
 github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
 github.com/hashicorp/go-plugin v1.4.3/go.mod h1:5fGEH17QVwTTcR0zV7yhDPLLmFX9YSZ38b18Udy6vYQ=
-github.com/hashicorp/go-plugin v1.4.8/go.mod h1:viDMjcLJuDui6pXb8U4HVfb8AamCWhHGUjr2IrTF67s=
-github.com/hashicorp/go-plugin v1.4.9 h1:ESiK220/qE0aGxWdzKIvRH69iLiuN/PjoLTm69RoWtU=
-github.com/hashicorp/go-plugin v1.4.9/go.mod h1:viDMjcLJuDui6pXb8U4HVfb8AamCWhHGUjr2IrTF67s=
+github.com/hashicorp/go-plugin v1.4.5 h1:oTE/oQR4eghggRg8VY7PAz3dr++VwDNBGCcOfIvHpBo=
+github.com/hashicorp/go-plugin v1.4.5/go.mod h1:viDMjcLJuDui6pXb8U4HVfb8AamCWhHGUjr2IrTF67s=
 github.com/hashicorp/go-raftchunking v0.6.3-0.20191002164813-7e9e8525653a h1:FmnBDwGwlTgugDGbVxwV8UavqSMACbGrUpfc98yFLR4=
 github.com/hashicorp/go-raftchunking v0.6.3-0.20191002164813-7e9e8525653a/go.mod h1:xbXnmKqX9/+RhPkJ4zrEx4738HacP72aaUPlT2RZ4sU=
 github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
 github.com/hashicorp/go-retryablehttp v0.6.6/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
+github.com/hashicorp/go-retryablehttp v0.7.0/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
+github.com/hashicorp/go-retryablehttp v0.7.1 h1:sUiuQAnLlbvmExtFQs72iFW/HXeUn8Z1aJLQ4LJJbTQ=
 github.com/hashicorp/go-retryablehttp v0.7.1/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
-github.com/hashicorp/go-retryablehttp v0.7.2 h1:AcYqCvkpalPnPF2pn0KamgwamS42TqUDDYFRKq/RAd0=
-github.com/hashicorp/go-retryablehttp v0.7.2/go.mod h1:Jy/gPYAdjqffZ/yFGCFV2doI5wjtH1ewM9u8iYVjtX8=
-github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU=
 github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc=
 github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
-github.com/hashicorp/go-secure-stdlib/awsutil v0.2.2 h1:kWg2vyKl7BRXrNxYziqDJ55n+vtOQ1QsGORjzoeB+uM=
-github.com/hashicorp/go-secure-stdlib/awsutil v0.2.2/go.mod h1:oKHSQs4ivIfZ3fbXGQOop1XuDfdSb8RIsWTGaAanSfg=
+github.com/hashicorp/go-secure-stdlib/awsutil v0.1.6 h1:W9WN8p6moV1fjKLkeqEgkAMu5rauy9QeYDAmIaPuuiA=
+github.com/hashicorp/go-secure-stdlib/awsutil v0.1.6/go.mod h1:MpCPSPGLDILGb4JMm94/mMi3YysIqsXzGCzkEZjcjXg=
 github.com/hashicorp/go-secure-stdlib/base62 v0.1.1/go.mod h1:EdWO6czbmthiwZ3/PUsDV+UD1D5IRU4ActiaWGwt0Yw=
 github.com/hashicorp/go-secure-stdlib/base62 v0.1.2 h1:ET4pqyjiGmY09R5y+rSd70J2w45CtbWDNvGqWp/R3Ng=
 github.com/hashicorp/go-secure-stdlib/base62 v0.1.2/go.mod h1:EdWO6czbmthiwZ3/PUsDV+UD1D5IRU4ActiaWGwt0Yw=
@@ -1779,11 +1026,8 @@ github.com/hashicorp/go-secure-stdlib/gatedwriter v0.1.1/go.mod h1:6RoRTSMDK2H/r
 github.com/hashicorp/go-secure-stdlib/kv-builder v0.1.2 h1:NS6BHieb/pDfx3M9jDdaPpGyyVp+aD4A3DjX3dgRmzs=
 github.com/hashicorp/go-secure-stdlib/kv-builder v0.1.2/go.mod h1:rf5JPE13wi+NwjgsmGkbg4b2CgHq8v7Htn/F0nDe/hg=
 github.com/hashicorp/go-secure-stdlib/mlock v0.1.1/go.mod h1:zq93CJChV6L9QTfGKtfBxKqD7BqqXx5O04A/ns2p5+I=
+github.com/hashicorp/go-secure-stdlib/mlock v0.1.2 h1:p4AKXPPS24tO8Wc8i1gLvSKdmkiSY5xuju57czJ/IJQ=
 github.com/hashicorp/go-secure-stdlib/mlock v0.1.2/go.mod h1:zq93CJChV6L9QTfGKtfBxKqD7BqqXx5O04A/ns2p5+I=
-github.com/hashicorp/go-secure-stdlib/mlock v0.1.3 h1:kH3Rhiht36xhAfhuHyWJDgdXXEx9IIZhDGRk24CDhzg=
-github.com/hashicorp/go-secure-stdlib/mlock v0.1.3/go.mod h1:ov1Q0oEDjC3+A4BwsG2YdKltrmEw8sf9Pau4V9JQ4Vo=
-github.com/hashicorp/go-secure-stdlib/nonceutil v0.1.0 h1:iJG9Q3iUme12yH+wzBMGYrw/Am4CfX3sDcA8m5OGfhQ=
-github.com/hashicorp/go-secure-stdlib/nonceutil v0.1.0/go.mod h1:s28ohJ0kU6tersf0it/WsBCyZSdziPlP+G1FRA3ar28=
 github.com/hashicorp/go-secure-stdlib/parseutil v0.1.1/go.mod h1:QmrqtbKuxxSWTN3ETMPuB+VtEiBJ/A9XhoYGv8E1uD8=
 github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6/go.mod h1:QmrqtbKuxxSWTN3ETMPuB+VtEiBJ/A9XhoYGv8E1uD8=
 github.com/hashicorp/go-secure-stdlib/parseutil v0.1.7 h1:UpiO20jno/eV1eVZcxqWnUohyKRe1g8FPV/xH1s/2qs=
@@ -1797,24 +1041,24 @@ github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 h1:kes8mmyCpxJsI7FTwtzRqEy9
 github.com/hashicorp/go-secure-stdlib/strutil v0.1.2/go.mod h1:Gou2R9+il93BqX25LAKCLuM+y9U2T4hlwvT1yprcna4=
 github.com/hashicorp/go-secure-stdlib/tlsutil v0.1.2 h1:phcbL8urUzF/kxA/Oj6awENaRwfWsjP59GW7u2qlDyY=
 github.com/hashicorp/go-secure-stdlib/tlsutil v0.1.2/go.mod h1:l8slYwnJA26yBz+ErHpp2IRCLr0vuOMGBORIz4rRiAs=
-github.com/hashicorp/go-slug v0.11.1 h1:c6lLdQnlhUWbS5I7hw8SvfymoFuy6EmiFDedy6ir994=
-github.com/hashicorp/go-slug v0.11.1/go.mod h1:Ib+IWBYfEfJGI1ZyXMGNbu2BU+aa3Dzu41RKLH301v4=
+github.com/hashicorp/go-slug v0.7.0 h1:8HIi6oreWPtnhpYd8lIGQBgp4rXzDWQTOhfILZm+nok=
+github.com/hashicorp/go-slug v0.7.0/go.mod h1:Ib+IWBYfEfJGI1ZyXMGNbu2BU+aa3Dzu41RKLH301v4=
 github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
 github.com/hashicorp/go-sockaddr v1.0.2 h1:ztczhD1jLxIRjVejw8gFomI1BQZOe2WoVOu0SyteCQc=
 github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A=
 github.com/hashicorp/go-syslog v1.0.0 h1:KaodqZuhUoZereWVIYmpUgZysurB1kBLX2j0MwMrUAE=
 github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
-github.com/hashicorp/go-tfe v1.25.1 h1:OxjDhY8Rj36n/uTSmhdFRLcnhXFfRTsopiovYSkJjak=
-github.com/hashicorp/go-tfe v1.25.1/go.mod h1:1Y6nsdMuJ14lYdc1VMLl/erlthvMzUsJn+WYWaAdSc4=
+github.com/hashicorp/go-tfe v0.20.0 h1:XUAhKoCX8ZUQfwBebC8hz7nkSSnqgNkaablIfxnZ0PQ=
+github.com/hashicorp/go-tfe v0.20.0/go.mod h1:gyXLXbpBVxA2F/6opah8XBsOkZJxHYQmghl0OWi8keI=
 github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
 github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
+github.com/hashicorp/go-version v1.3.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek=
 github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
-github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
@@ -1822,114 +1066,99 @@ github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uG
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/hashicorp/hcl v1.0.1-vault-5 h1:kI3hhbbyzr4dldA8UdTb7ZlVVlI2DACdCfz31RPDgJM=
 github.com/hashicorp/hcl v1.0.1-vault-5/go.mod h1:XYhtn6ijBSAj6n4YqAaf7RBPS4I06AItNorpy+MoQNM=
-github.com/hashicorp/hcl/v2 v2.16.2 h1:mpkHZh/Tv+xet3sy3F9Ld4FyI2tUpWe9x3XtPx9f1a0=
-github.com/hashicorp/hcl/v2 v2.16.2/go.mod h1:JRmR89jycNkrrqnMmvPDMd56n1rQJ2Q6KocSLCMCXng=
-github.com/hashicorp/hcp-link v0.1.0 h1:F6F1cpADc+o5EBI5CbJn5RX4qdFSLpuA4fN69eeE5lQ=
-github.com/hashicorp/hcp-link v0.1.0/go.mod h1:BWVDuJDHrKJtWc5qI07bX5xlLjSgWq6kYLQUeG1g5dM=
-github.com/hashicorp/hcp-scada-provider v0.2.1 h1:yr+Uxini7SWTZ2t49d3Xi+6+X/rbsSFx8gq6WVcC91c=
-github.com/hashicorp/hcp-scada-provider v0.2.1/go.mod h1:Q0WpS2RyhBKOPD4X/8oW7AJe7jA2HXB09EwDzwRTao0=
-github.com/hashicorp/hcp-sdk-go v0.23.0 h1:3WarkQSK0VzxJaH6psHIGQagag3ujL+NjWagZZHpiZM=
-github.com/hashicorp/hcp-sdk-go v0.23.0/go.mod h1:/9UoDY2FYYA8lFaKBb2HmM/jKYZGANmf65q9QRc/cVw=
+github.com/hashicorp/hcp-sdk-go v0.22.0 h1:LWkLOkJFYWSojBM3IkwvYK6nrwrL+p4Fw8zEaoCQG10=
+github.com/hashicorp/hcp-sdk-go v0.22.0/go.mod h1:mM3nYdVHuv2X2tv88MGVKRf/o2k3zF8jUZSMkwICQ28=
 github.com/hashicorp/jsonapi v0.0.0-20210826224640-ee7dae0fb22d h1:9ARUJJ1VVynB176G1HCwleORqCaXm/Vx0uUi0dL26I0=
 github.com/hashicorp/jsonapi v0.0.0-20210826224640-ee7dae0fb22d/go.mod h1:Yog5+CPEM3c99L1CL2CFCYoSzgWm5vTU58idbRUaLik=
 github.com/hashicorp/logutils v1.0.0 h1:dLEQVugN8vlakKOUE3ihGLTZJRB4j+M2cdTm/ORI65Y=
 github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
-github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ=
 github.com/hashicorp/mdns v1.0.1/go.mod h1:4gW7WsVCke5TE7EPeYliwHlRUyBtfCwuFwuMg2DmyNY=
 github.com/hashicorp/mdns v1.0.4 h1:sY0CMhFmjIPDMlTB+HfymFHCaYLhgifZ0QhjaYKD/UQ=
 github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc=
-github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I=
-github.com/hashicorp/memberlist v0.5.0 h1:EtYPN8DpAURiapus508I4n9CzHs2W+8NZGbmmR/prTM=
-github.com/hashicorp/memberlist v0.5.0/go.mod h1:yvyXLpo0QaGE59Y7hDTsTzDD25JYBZ4mHgHUZ8lrOI0=
-github.com/hashicorp/net-rpc-msgpackrpc/v2 v2.0.0 h1:kBpVVl1sl3MaSrs97e0+pDQhSrqJv9gVbSUrPpVfl1w=
-github.com/hashicorp/net-rpc-msgpackrpc/v2 v2.0.0/go.mod h1:6pdNz0vo0mF0GvhwDG56O3N18qBrAz/XRIcfINfTbwo=
-github.com/hashicorp/nomad/api v0.0.0-20230519153805-2275a83cbfdf h1:cKXVf1UJqwdkGiTF3idqCOLApAql0310OSmJxeiaMWg=
-github.com/hashicorp/nomad/api v0.0.0-20230519153805-2275a83cbfdf/go.mod h1:rb38DqjaaIfhJRiLeCAGgIt+wV7o78rB+liyFE3mVzE=
+github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE=
+github.com/hashicorp/memberlist v0.3.1 h1:MXgUXLqva1QvpVEDQW1IQLG0wivQAtmFlHRQ+1vWZfM=
+github.com/hashicorp/memberlist v0.3.1/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE=
+github.com/hashicorp/nomad/api v0.0.0-20220707195938-75f4c2237b28 h1:fo8EbQ6tc9hYqxik9CAdFMqy48TW8hh2I3znysPqf+0=
+github.com/hashicorp/nomad/api v0.0.0-20220707195938-75f4c2237b28/go.mod h1:FslB+3eLbZgkuPWffqO1GeNzBFw1SuVqN2PXsMNe0Fg=
 github.com/hashicorp/raft v1.0.1/go.mod h1:DVSAWItjLjTOkVbSpWQ0j0kUADIvDaCtBxIcbNAQLkI=
 github.com/hashicorp/raft v1.1.0/go.mod h1:4Ak7FSPnuvmb0GV6vgIAJ4vYT4bek9bb6Q+7HVbyzqM=
 github.com/hashicorp/raft v1.1.2-0.20191002163536-9c6bd3e3eb17/go.mod h1:vPAJM8Asw6u8LxC3eJCUZmRP/E4QmUGE1R7g7k8sG/8=
 github.com/hashicorp/raft v1.2.0/go.mod h1:vPAJM8Asw6u8LxC3eJCUZmRP/E4QmUGE1R7g7k8sG/8=
 github.com/hashicorp/raft v1.3.10 h1:LR5QZX1VQd0DFWZfeCwWawyeKfpS/Tm1yjnJIY5X4Tw=
 github.com/hashicorp/raft v1.3.10/go.mod h1:J8naEwc6XaaCfts7+28whSeRvCqTd6e20BlCU3LtEO4=
-github.com/hashicorp/raft-autopilot v0.2.0 h1:2/R2RPgamgRKgNWGQioULZvjeKXQZmDuw5Ty+6c+H7Y=
-github.com/hashicorp/raft-autopilot v0.2.0/go.mod h1:q6tZ8UAZ5xio2gv2JvjgmtOlh80M6ic8xQYBe2Egkg8=
+github.com/hashicorp/raft-autopilot v0.1.6 h1:C1q3RNF2FfXNZfHWbvVAu0QixaQK8K5pX4O5lh+9z4I=
+github.com/hashicorp/raft-autopilot v0.1.6/go.mod h1:Af4jZBwaNOI+tXfIqIdbcAnh/UyyqIMj/pOISIfhArw=
 github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod h1:pNv7Wc3ycL6F5oOWn+tPGo2gWD4a5X+yp/ntwdKLjRk=
 github.com/hashicorp/raft-boltdb/v2 v2.0.0-20210421194847-a7e34179d62c h1:oiKun9QlrOz5yQxMZJ3tf1kWtFYuKSJzxzEDxDPevj4=
 github.com/hashicorp/raft-boltdb/v2 v2.0.0-20210421194847-a7e34179d62c/go.mod h1:kiPs9g148eLShc2TYagUAyKDnD+dH9U+CQKsXzlY9xo=
 github.com/hashicorp/raft-snapshot v1.0.4 h1:EuDuayAJPdiDmVk1ygTDnG2zDzrs0/6/yBuma1IYSow=
 github.com/hashicorp/raft-snapshot v1.0.4/go.mod h1:5sL9eUn72lH5DzsFIJ9jaysITbHksSSszImWSOTC8Ic=
-github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
-github.com/hashicorp/serf v0.10.1 h1:Z1H2J60yRKvfDYAOZLd2MU0ND4AH/WDz7xYHDWQsIPY=
-github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4=
-github.com/hashicorp/vault-plugin-auth-alicloud v0.15.0 h1:R2SVwOeVLG5DXzUx42UWhjfFqS0Z9+ncfebPu+gO9VA=
-github.com/hashicorp/vault-plugin-auth-alicloud v0.15.0/go.mod h1:YQXpa2s4rGYKm3Oa/Nkgh5SuGVfHFNEIUwDDYWyhloE=
-github.com/hashicorp/vault-plugin-auth-azure v0.15.0 h1:OPK3rpRsWUQm/oo8l4N+YS7dka+lUHDT/qxTafSFPzY=
-github.com/hashicorp/vault-plugin-auth-azure v0.15.0/go.mod h1:qRCibAYC0AV4s2+HxEwmLMPNLENK1kx2mrq9ldnGdkY=
-github.com/hashicorp/vault-plugin-auth-centrify v0.15.1 h1:6StAr5tltpySNgyUwWC8czm9ZqkO7NIZfcRmxxtFwQ8=
-github.com/hashicorp/vault-plugin-auth-centrify v0.15.1/go.mod h1:xXs4I5yLxbQ5VHcpvSxkRhShCTXd8Zyrni8qnFrfQ4Y=
-github.com/hashicorp/vault-plugin-auth-cf v0.15.0 h1:zIVGlYXCRBY/ElucWdFC9xF27d2QMGMQPm9wSezGREI=
-github.com/hashicorp/vault-plugin-auth-cf v0.15.0/go.mod h1:FEIjQkYmzno4MfU36MAjFUG9/JUWeMPxvBG5DRTMYVM=
-github.com/hashicorp/vault-plugin-auth-gcp v0.16.0 h1:DA/ZDLCrUsbHS/7Xqkkw7l2SgbQE9rWEHLLWYTGu8rw=
-github.com/hashicorp/vault-plugin-auth-gcp v0.16.0/go.mod h1:R0z/qdyxn0uq6hkKgux8KwenjV/n/CCaEz+qOF9GdPg=
-github.com/hashicorp/vault-plugin-auth-jwt v0.16.0 h1:BUk03WDSGZuB+kEq3HTOQ7ecEH2Z1Idit42jfB5EnpE=
-github.com/hashicorp/vault-plugin-auth-jwt v0.16.0/go.mod h1:Ve3r228afZOShwNvp+MGEKtm+ROskv10GG7bMXZb5OA=
-github.com/hashicorp/vault-plugin-auth-kerberos v0.10.0 h1:YH2x9kIV0jKXk22tVkpydhmPeEgprC7IOfN8l0pjF6c=
-github.com/hashicorp/vault-plugin-auth-kerberos v0.10.0/go.mod h1:I6ulXug4oxx77DFYjqI1kVl+72TgXEo3Oju4tTOVfU4=
-github.com/hashicorp/vault-plugin-auth-kubernetes v0.16.0 h1:vuXNJvtMyoqQ01Sfwf2TNcJNkGcxP1vD3C7gpvuVkCU=
-github.com/hashicorp/vault-plugin-auth-kubernetes v0.16.0/go.mod h1:onx9W/rDwENQkN+1yEnJvS51PVkkGAPOBXasne7lnnk=
-github.com/hashicorp/vault-plugin-auth-oci v0.14.0 h1:B7uyigqgUAO3gebvi8mMmsq7l4QAG0bLEP6rAKyDVuw=
-github.com/hashicorp/vault-plugin-auth-oci v0.14.0/go.mod h1:SYdTtQhzMxqOCbdC0E0UOrkc4eGXXcJmXXbe1MHVPtE=
-github.com/hashicorp/vault-plugin-database-couchbase v0.9.2 h1:UWPWUADWUE08a3qeZixd/diIcNIm0NTqdPNTNbUljuQ=
-github.com/hashicorp/vault-plugin-database-couchbase v0.9.2/go.mod h1:BvyZMbDEhvT4chbb7lgnL8xsVy9rF+hbDWuJ/eKkgpI=
-github.com/hashicorp/vault-plugin-database-elasticsearch v0.13.2 h1:N81xJfdVjAo49dUu5Wo95C0fv5scpbYL9z4ykWeHxJg=
-github.com/hashicorp/vault-plugin-database-elasticsearch v0.13.2/go.mod h1:P4cUbvtXgvfWZassvJzyXC4nIGRUO72ds9rE5WpQnuw=
-github.com/hashicorp/vault-plugin-database-mongodbatlas v0.10.0 h1:fgsiuSq3AeFcYnbPkXOLSkKDrS2blaS/6MAmHEIAH28=
-github.com/hashicorp/vault-plugin-database-mongodbatlas v0.10.0/go.mod h1:jH0OvjQ3Otg0HoOR5NugTqC3JA1KJ+J5OL0NdAzgSb4=
-github.com/hashicorp/vault-plugin-database-redis v0.2.1 h1:E+UeZcpNtQO8nMfVebwE5ZS2sJpNjzbKwYJX1y8FFNk=
-github.com/hashicorp/vault-plugin-database-redis v0.2.1/go.mod h1:T0i639Xnh2DY5ij8ofS83ZauBh8N0drKzqXYDrH87tM=
-github.com/hashicorp/vault-plugin-database-redis-elasticache v0.2.1 h1:D8mdwkB6CyC37wkpdW9mgJNNrqral956bFoVj3AoQoE=
-github.com/hashicorp/vault-plugin-database-redis-elasticache v0.2.1/go.mod h1:1RdJ0uxD8Mquzx9DBfoFKkmHgeZrPTN5nZHGyDrVCuY=
-github.com/hashicorp/vault-plugin-database-snowflake v0.8.0 h1:Ec7gxxWIhxTmbKNXpmPgREra2go4H7QgDByIvtUwfFw=
-github.com/hashicorp/vault-plugin-database-snowflake v0.8.0/go.mod h1:Qq2xNOGOOdHcX9Nr8H0CR4cNfanaGW3ANDrytpMjT1E=
+github.com/hashicorp/serf v0.9.7 h1:hkdgbqizGQHuU5IPqYM1JdSMV8nKfpuOnZYXssk9muY=
+github.com/hashicorp/serf v0.9.7/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4=
+github.com/hashicorp/vault-plugin-auth-alicloud v0.13.0 h1:qQTzTw5qrnQurdE5nuXebltQ0JLJprxm5X8Lg4tCfd4=
+github.com/hashicorp/vault-plugin-auth-alicloud v0.13.0/go.mod h1:UO140aqMmOpWVfot9kpowLHhbbJ1alBJBjctIxKtpkY=
+github.com/hashicorp/vault-plugin-auth-azure v0.12.0 h1:hhL5qOgIvzIYwROp6Sgg4KNBJPu6bbIdKtdIKpZp2tE=
+github.com/hashicorp/vault-plugin-auth-azure v0.12.0/go.mod h1:r0Wlg9xgS7dOx/H2rgkVgXS77m289ON291g+/txFdv8=
+github.com/hashicorp/vault-plugin-auth-centrify v0.13.0 h1:IbtgJAY3EFyY+8n9A3QMn3MDGsvfQKDdH60r8G/C0nA=
+github.com/hashicorp/vault-plugin-auth-centrify v0.13.0/go.mod h1:3fDbIVdwA/hkOVhwktKHDX5lo4DqIUUVbBdwQNNvxHw=
+github.com/hashicorp/vault-plugin-auth-cf v0.13.0 h1:Iu4nRoZrkaLbW4vJ8t/wYS8z5BG4VQI7nKpBuwPTpOU=
+github.com/hashicorp/vault-plugin-auth-cf v0.13.0/go.mod h1:Tktv1OXUjFobzjAU5qNJA8t1KC0109eu6Pcgm1uiwHg=
+github.com/hashicorp/vault-plugin-auth-gcp v0.14.0 h1:9qjpx7fJcz7WoFiazIktaJSvuqscR2v/drc+euW8v2M=
+github.com/hashicorp/vault-plugin-auth-gcp v0.14.0/go.mod h1:WNwaZN7NWy14xcy3otm1OXp5blcKgblUfvE16eYeUoQ=
+github.com/hashicorp/vault-plugin-auth-jwt v0.14.2 h1:1lMqkBb8evQqbC7sj+TP9bUd+MLRP6OrSl7xJX5N/30=
+github.com/hashicorp/vault-plugin-auth-jwt v0.14.2/go.mod h1:76ygfLIPnzlEHC6/hbzl42B3a91jpMF776iHmX9dcKc=
+github.com/hashicorp/vault-plugin-auth-kerberos v0.8.0 h1:5PiNahpVYFnQIg0Np3wLiFnfhHfnAHcWTl3VSzUVu/Y=
+github.com/hashicorp/vault-plugin-auth-kerberos v0.8.0/go.mod h1:eqjae8tMBpAWgJNk1NjV/vtJYXQRZnYudUkBFowz3bY=
+github.com/hashicorp/vault-plugin-auth-kubernetes v0.14.1 h1:P5PR9MXiZVdDz0YnE2XAbsXmytFAu1SzEk2JrFO0gE0=
+github.com/hashicorp/vault-plugin-auth-kubernetes v0.14.1/go.mod h1:rouq4XoBoCzXtECtxGCWHS++g6Nzw2HOms6p6N+Uzkw=
+github.com/hashicorp/vault-plugin-auth-oci v0.12.0 h1:7Tuj5q+rwyPm1aS1rsLg2TRo2QIrPTz1qNHGDkUvz18=
+github.com/hashicorp/vault-plugin-auth-oci v0.12.0/go.mod h1:oj2gh7qH2VzjelFeul8FzDmmYrJXnCuLUUeQAA6fMN8=
+github.com/hashicorp/vault-plugin-database-couchbase v0.8.0 h1:lDZ1OazKfSPIb1DXLbq7NCf1BZwB1cFN3OG3NedXB/s=
+github.com/hashicorp/vault-plugin-database-couchbase v0.8.0/go.mod h1:skmG6MgIG6fjIOlOEgVKOcNlr1PcgHPUb9q1YQ5+Q9k=
+github.com/hashicorp/vault-plugin-database-elasticsearch v0.12.0 h1:g+jD35qUZlDcS2YWQBqXbfpMNBTvGEvRzSYjwLgWOK4=
+github.com/hashicorp/vault-plugin-database-elasticsearch v0.12.0/go.mod h1:wO8EPQs5bsBERD6MSQ+7Az+YJ4TFclCNxBo3r3VKeao=
+github.com/hashicorp/vault-plugin-database-mongodbatlas v0.8.0 h1:wx/9Dh9YGGU7GiijwRfwPFBlWdmBEdf6n2VhgTdRtJU=
+github.com/hashicorp/vault-plugin-database-mongodbatlas v0.8.0/go.mod h1:eWwd1Ba7aLU1tIAtmFsEhu9E023jkkypHawxhnAbZfc=
+github.com/hashicorp/vault-plugin-database-redis v0.1.0 h1:fDT32ZphGdvVdenvieWb+ZjWmCOHFtZ1Qjv581BloHw=
+github.com/hashicorp/vault-plugin-database-redis v0.1.0/go.mod h1:bzrD2dQUClKcl89yYsaZqboFDEzst+TpXROWuhVxLEM=
+github.com/hashicorp/vault-plugin-database-redis-elasticache v0.1.0 h1:qwDcp1vdlT0Io0x5YjtvhXtndfQB66jnDICg7NHxKQk=
+github.com/hashicorp/vault-plugin-database-redis-elasticache v0.1.0/go.mod h1:gB/SMtnIf0NdDyPSIo0KgSNp1ajTvLDiwP+lIAy8uHs=
+github.com/hashicorp/vault-plugin-database-snowflake v0.6.1 h1:jnWNKqRmRXNpXOC4FvAOXHxPKAmDZRVS+d5fcbRQ/Xw=
+github.com/hashicorp/vault-plugin-database-snowflake v0.6.1/go.mod h1:QJ8IL/Qlu4Me1KkL0OpaWO7aMFL0TNoSEKVB5F+lCiM=
 github.com/hashicorp/vault-plugin-mock v0.16.1 h1:5QQvSUHxDjEEbrd2REOeacqyJnCLPD51IQzy71hx8P0=
 github.com/hashicorp/vault-plugin-mock v0.16.1/go.mod h1:83G4JKlOwUtxVourn5euQfze3ZWyXcUiLj2wqrKSDIM=
-github.com/hashicorp/vault-plugin-secrets-ad v0.16.0 h1:6RCpd2PbBvmi5xmxXhggE0Xv+/Gag896/NNZeMKH+8A=
-github.com/hashicorp/vault-plugin-secrets-ad v0.16.0/go.mod h1:6IeXly3xi+dVodzFSx6aVZjdhd3syboPyhxr1/WMcyo=
-github.com/hashicorp/vault-plugin-secrets-alicloud v0.15.0 h1:uVpcx2s3PwYXSOHmjA/Ai6+V0c3wgvSApELZez8b9mI=
-github.com/hashicorp/vault-plugin-secrets-alicloud v0.15.0/go.mod h1:wMTkhPGxDa2PCdSBqd6A8SMcRrltu3NRbwX8m8W1MCU=
-github.com/hashicorp/vault-plugin-secrets-azure v0.16.0 h1:4Y2LG2P6XUy4HLlObJtHiveJBQwZ4kazs0EpxDmAal0=
-github.com/hashicorp/vault-plugin-secrets-azure v0.16.0/go.mod h1:tNzshPyCxkuOL4PLF3cybN/XaSlWgvfl6dwEbCARybY=
-github.com/hashicorp/vault-plugin-secrets-gcp v0.16.0 h1:5ozLtt38Bw/DLt37dbccT8j56A+2T7CWFfYecKleGl4=
-github.com/hashicorp/vault-plugin-secrets-gcp v0.16.0/go.mod h1:Ax9/ALmpzyjU8mcqHVYR9lwjcyazdmimrShDYeK9CHc=
-github.com/hashicorp/vault-plugin-secrets-gcpkms v0.15.0 h1:CueteKXEuO52qGu1nUaDc/euSTSfQD9MONkXuvWdZQw=
-github.com/hashicorp/vault-plugin-secrets-gcpkms v0.15.0/go.mod h1:a0Z2DVGd2SPPwLb8edXeHyer3CXei/Y0cb7EFkiFMfA=
-github.com/hashicorp/vault-plugin-secrets-kubernetes v0.5.0 h1:g0W1ybHjO945jDtuDEFcqTINyW/s06wxZarE/7aLumc=
-github.com/hashicorp/vault-plugin-secrets-kubernetes v0.5.0/go.mod h1:2wobeIypBESGQYmhv12vuAorCvfETHpBoMyrb+6QTmQ=
-github.com/hashicorp/vault-plugin-secrets-kv v0.15.0 h1:S2d1t4m4ilDNJRdMUzNUimvyu/+ll8huq5QncVgYz+s=
-github.com/hashicorp/vault-plugin-secrets-kv v0.15.0/go.mod h1:xu/eiT+BB2b2Gh/AZFJ1xCS8E7S29gOQcuh9VMxros8=
-github.com/hashicorp/vault-plugin-secrets-mongodbatlas v0.10.0 h1:FB860wKclwLBvBHkQb5nq8bGMUAsuw0khrYT1RM0NR0=
-github.com/hashicorp/vault-plugin-secrets-mongodbatlas v0.10.0/go.mod h1:6YPhFm57C3DvPueHEGdTLK94g3gZI/gdiRrSwO5Fym8=
-github.com/hashicorp/vault-plugin-secrets-openldap v0.11.0 h1:8J8u7uWLifj3uF5tot9Qj74H8vEwPMNKN+XTLLgSmDw=
-github.com/hashicorp/vault-plugin-secrets-openldap v0.11.0/go.mod h1:JVulYJNiG7s3pjwo9HAnq07ViWtGWkz2WAw8ytle+0w=
-github.com/hashicorp/vault-plugin-secrets-terraform v0.7.1 h1:Icb3EDpNvb4ltnGff2Zrm3JVNDDdbbL2wdA2LouD2KQ=
-github.com/hashicorp/vault-plugin-secrets-terraform v0.7.1/go.mod h1:JHHo1nWOgYPsbTqE/PVwkTKRkLSlPSqo9RBqZ7NLKB8=
-github.com/hashicorp/vault-testing-stepwise v0.1.3 h1:GYvm98EB4nUKUntkBcLicnKsebeV89KPHmAGJUCPU/c=
-github.com/hashicorp/vault-testing-stepwise v0.1.3/go.mod h1:Ym1T/kMM2sT6qgCIIJ3an7uaSWCJ8O7ohsWB9UiB5tI=
-github.com/hashicorp/vault/vault/hcp_link/proto v0.0.0-20230201201504-b741fa893d77 h1:Y/+BtwxmRak3Us9jrByARvYW6uNeqZlEpMylIdXVIjY=
-github.com/hashicorp/vault/vault/hcp_link/proto v0.0.0-20230201201504-b741fa893d77/go.mod h1:a2crHoMWwY6aiL8GWT8hYj7vKD64uX0EdRPbnsHF5wU=
+github.com/hashicorp/vault-plugin-secrets-ad v0.14.1 h1:XAkEJ9iFJoBwYFYv3wTcdVFq7DejwXARybSui/LG42Y=
+github.com/hashicorp/vault-plugin-secrets-ad v0.14.1/go.mod h1:5XIn6cw1+gG+WWxK0SdEAKCDOXTp+MX90PzZ7f3Eks0=
+github.com/hashicorp/vault-plugin-secrets-alicloud v0.13.0 h1:eWDAAvZsKHhnXF8uCiyF/wDqT57fflCs54PTIolONBo=
+github.com/hashicorp/vault-plugin-secrets-alicloud v0.13.0/go.mod h1:F4KWrlCQZbhP2dFXCkRvbHX2J6CTydlaY0cH+OrLHCE=
+github.com/hashicorp/vault-plugin-secrets-azure v0.14.1 h1:Dh4b7sILU+O17K+g2tWGdeGq9djPw5rqFCOX69JxJbA=
+github.com/hashicorp/vault-plugin-secrets-azure v0.14.1/go.mod h1:Xw8CQPkyZSJRK9BXKBruf6kOO8rLyXEf40o19ClK9kY=
+github.com/hashicorp/vault-plugin-secrets-gcp v0.14.1 h1:e9uQuKQ4hJWwa19IUSNMolhT0BczyoDryMN83gr3dhY=
+github.com/hashicorp/vault-plugin-secrets-gcp v0.14.1/go.mod h1:kRgZfXRD9qUHoGclaR09tKXXwkwNrkY+D76ahetsaB8=
+github.com/hashicorp/vault-plugin-secrets-gcpkms v0.13.0 h1:R36pNaaN4tJyIrPJej7/355Qt5+Q5XUTB+Az6rGs5xg=
+github.com/hashicorp/vault-plugin-secrets-gcpkms v0.13.0/go.mod h1:n2VKlYDCuO8+OXN4S1Im8esIL53/ENRFa4gXrvhCVIM=
+github.com/hashicorp/vault-plugin-secrets-kubernetes v0.2.0 h1:iPue19f7LW63lAo8YFsm0jmo49gox0oIYFPAtVtnzGg=
+github.com/hashicorp/vault-plugin-secrets-kubernetes v0.2.0/go.mod h1:WO0wUxGh1PxhwdBHD7mXU5XQTqLwMZiJrUwVuzx3tIg=
+github.com/hashicorp/vault-plugin-secrets-kv v0.13.3 h1:TUKpQY6fmTiUhaZ71/WTamEuK2JH7ESB92T4VZsq4+g=
+github.com/hashicorp/vault-plugin-secrets-kv v0.13.3/go.mod h1:ikPuEWi2rHaGQCHZuPdn/6D3Bq/25ElX3G9pGeDr0Yg=
+github.com/hashicorp/vault-plugin-secrets-mongodbatlas v0.8.0 h1:VREm+cJGUXcPCakaYVxQt8wTVqTwJclsIIk2XuqpPbs=
+github.com/hashicorp/vault-plugin-secrets-mongodbatlas v0.8.0/go.mod h1:PLx2vxXukfsKsDRo/PlG4fxmJ1d+H2h82wT3vf4buuI=
+github.com/hashicorp/vault-plugin-secrets-openldap v0.9.1 h1:qgxKfXQ2WaBohjBr0m4EWYNQJTBO6dkhtqJJZ372YQw=
+github.com/hashicorp/vault-plugin-secrets-openldap v0.9.1/go.mod h1:o7mF9tWgDkAD5OvvXWM3bOCqN+n/cCpaMm1CrEUZkHc=
+github.com/hashicorp/vault-plugin-secrets-terraform v0.6.0 h1:N5s1ojXyG8gBZlx6BdqE04LviR0rw4vX1dDDMdnEzX8=
+github.com/hashicorp/vault-plugin-secrets-terraform v0.6.0/go.mod h1:GzYAJYytgbNNyT3S7rspz1cLE53E1oajFbEtaDUlVGU=
+github.com/hashicorp/vault-testing-stepwise v0.1.1/go.mod h1:3vUYn6D0ZadvstNO3YQQlIcp7u1a19MdoOC0NQ0yaOE=
+github.com/hashicorp/vault-testing-stepwise v0.1.2 h1:3obC/ziAPGnsz2IQxr5e4Ayb7tu7WL6pm6mmZ5gwhhs=
+github.com/hashicorp/vault-testing-stepwise v0.1.2/go.mod h1:TeU6B+5NqxUjto+Zey+QQEH1iywuHn0ciHZNYh4q3uI=
 github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443 h1:O/pT5C1Q3mVXMyuqg7yuAWUg/jMZR1/0QTzTRdNR6Uw=
 github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443/go.mod h1:bEpDU35nTu0ey1EXjwNwPjI9xErAsoOCmcMb9GKvyxo=
 github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
 github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
+github.com/hashicorp/yamux v0.0.0-20211028200310-0bc27b27de87 h1:xixZ2bWeofWV68J+x6AzmKuVM/JWCQwkWm6GW/MUR6I=
 github.com/hashicorp/yamux v0.0.0-20211028200310-0bc27b27de87/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ=
-github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE=
-github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/huandu/xstrings v1.3.2 h1:L18LIDzqlW6xN2rEkpdV8+oL/IXWJ1APd+vsdYy4Wdw=
 github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
-github.com/huandu/xstrings v1.3.3/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
-github.com/huandu/xstrings v1.4.0 h1:D17IlohoQq4UcpqD7fDk80P7l+lwAmlFaBHgOipl2FU=
-github.com/huandu/xstrings v1.4.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
-github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
@@ -1938,18 +1167,13 @@ github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJ
 github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
+github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk=
 github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg=
-github.com/imdario/mergo v0.3.15 h1:M8XP7IuFNsqUx6VPK2P9OSmsYsI/YFaGil0uD21V3dM=
-github.com/imdario/mergo v0.3.15/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
-github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/influxdata/influxdb v1.7.6/go.mod h1:qZna6X/4elxqT3yI9iZYdZrWWdeFOOprn86kgg4+IzY=
 github.com/influxdata/influxdb1-client v0.0.0-20200827194710-b269163b24ab h1:HqW4xhhynfjrtEiiSGcQUd6vrK23iMam1FO8rI7mwig=
 github.com/influxdata/influxdb1-client v0.0.0-20200827194710-b269163b24ab/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
-github.com/intel/goresctrl v0.2.0/go.mod h1:+CZdzouYFn5EsxgqAQTEzMfwKwuc0fVdMrT9FCCAVRQ=
-github.com/intel/goresctrl v0.3.0/go.mod h1:fdz3mD85cmP9sHD8JUlrNWAxvwM86CrbmVXltEKd7zk=
 github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod h1:ymszkNOg6tORTn+6F6j+Jc8TOr5osrynvN6ivFWZ2GA=
-github.com/j-keck/arping v1.0.2/go.mod h1:aJbELhR92bSk7tp79AWM/ftfc90EfEi2bQJrbBFOsPw=
 github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo=
 github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
 github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8=
@@ -2007,12 +1231,12 @@ github.com/jcmturner/aescts/v2 v2.0.0 h1:9YKLH6ey7H4eDBXW8khjYslgyqG2xZikXP0EQFK
 github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs=
 github.com/jcmturner/dnsutils/v2 v2.0.0 h1:lltnkeZGL0wILNvrNiVCR6Ro5PGU/SeBvVO/8c/iPbo=
 github.com/jcmturner/dnsutils/v2 v2.0.0/go.mod h1:b0TnjGOvI/n42bZa+hmXL+kFJZsFT7G4t3HTlQ184QM=
-github.com/jcmturner/gofork v1.7.6 h1:QH0l3hzAU1tfT3rZCnW5zXl+orbkNMMRGJfdJjHVETg=
-github.com/jcmturner/gofork v1.7.6/go.mod h1:1622LH6i/EZqLloHfE7IeZ0uEJwMSUyQ/nDd82IeqRo=
+github.com/jcmturner/gofork v1.0.0 h1:J7uCkflzTEhUZ64xqKnkDxq3kzc96ajM1Gli5ktUem8=
+github.com/jcmturner/gofork v1.0.0/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o=
 github.com/jcmturner/goidentity/v6 v6.0.1 h1:VKnZd2oEIMorCTsFBnJWbExfNN7yZr3EhJAxwOkZg6o=
 github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg=
-github.com/jcmturner/gokrb5/v8 v8.4.4 h1:x1Sv4HaTpepFkXbt2IkL29DXRf8sOfZXo8eRKh687T8=
-github.com/jcmturner/gokrb5/v8 v8.4.4/go.mod h1:1btQEpgT6k+unzCwX1KdWMEwPPkkgBtP+F6aCACiMrs=
+github.com/jcmturner/gokrb5/v8 v8.4.2 h1:6ZIM6b/JJN0X8UM43ZOM6Z4SJzla+a/u7scXFJzodkA=
+github.com/jcmturner/gokrb5/v8 v8.4.2/go.mod h1:sb+Xq/fTY5yktf/VxLsE3wlfPqQjp0aWNYyvBVK62bc=
 github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY=
 github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc=
 github.com/jeffchao/backoff v0.0.0-20140404060208-9d7fd7aa17f2 h1:mex1izRBCD+7WjieGgRdy7e651vD/lvB1bD9vNE/3K4=
@@ -2035,7 +1259,6 @@ github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfC
 github.com/joefitzgerald/rainbow-reporter v0.1.0/go.mod h1:481CNgqmVHQZzdIbN52CupLJyoVwB10FQ/IQlF1pdL8=
 github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
-github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62/go.mod h1:U+RSyWxWd04xTqnuOQxnai7XGS2PrPY2cfGoDKtMHjA=
@@ -2057,70 +1280,49 @@ github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
-github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
-github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
 github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4=
 github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA=
-github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
 github.com/kelseyhightower/envconfig v1.4.0 h1:Im6hONhd3pLkfDFsbRgu68RDNkGF1r3dvMUtDTo2cv8=
 github.com/kelseyhightower/envconfig v1.4.0/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg=
+github.com/keybase/go-crypto v0.0.0-20190403132359-d65b6b94177f h1:Gsc9mVHLRqBjMgdQCghN9NObCcRncDqxJvBvEaIIQEo=
+github.com/keybase/go-crypto v0.0.0-20190403132359-d65b6b94177f/go.mod h1:ghbZscTyKdM07+Fw3KSi0hcJm+AlEUWj8QLlPtijN/M=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/klauspost/asmfmt v1.3.2/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j0HLHbNSE=
 github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
 github.com/klauspost/compress v1.9.5/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
-github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/klauspost/compress v1.11.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/klauspost/compress v1.11.4/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/klauspost/compress v1.11.13/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
-github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
 github.com/klauspost/compress v1.13.1/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
+github.com/klauspost/compress v1.13.4/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
+github.com/klauspost/compress v1.13.6 h1:P76CopJELS0TiO2mebmnzgWaajssP/EszplttgQxcgc=
 github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
-github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU=
-github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM=
-github.com/klauspost/compress v1.15.15/go.mod h1:ZcK2JAFqKOpnBlxcLsJzYfrS9X1akm9fHZNnD9+Vo/4=
-github.com/klauspost/compress v1.16.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
-github.com/klauspost/compress v1.16.5 h1:IFV2oUNUzZaz+XyusxpLzpzS8Pt5rh0Z16For/djlyI=
-github.com/klauspost/compress v1.16.5/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
 github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
-github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/pgzip v1.2.5 h1:qnWYvvKqedOF2ulHpMG72XQol4ILEJ8k2wwRl/Km8oE=
 github.com/klauspost/pgzip v1.2.5/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
 github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
-github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
-github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
 github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
-github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
-github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
-github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
-github.com/lestrrat-go/backoff/v2 v2.0.8/go.mod h1:rHP/q/r9aT27n24JQLa7JhSQZCKBBOiM/uP402WwN8Y=
-github.com/lestrrat-go/blackmagic v1.0.0/go.mod h1:TNgH//0vYSs8VXDCfkZLgIrVTTXQELZffUV0tz3MtdQ=
-github.com/lestrrat-go/httpcc v1.0.1/go.mod h1:qiltp3Mt56+55GPVCbTdM9MlqhvzyuL6W/NMDA8vA5E=
-github.com/lestrrat-go/iter v1.0.1/go.mod h1:zIdgO1mRKhn8l9vrZJZz9TUMMFbQbLeTsbqPDrJ/OJc=
-github.com/lestrrat-go/jwx v1.2.25/go.mod h1:zoNuZymNl5lgdcu6P7K6ie2QRll5HVfF4xwxBBK1NxY=
-github.com/lestrrat-go/option v1.0.0/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I=
 github.com/lib/pq v0.0.0-20180327071824-d34b9ff171c2/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/lib/pq v1.8.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lib/pq v1.10.6 h1:jbk+ZieJ0D7EVGJYpL9QTz7/YW6UHbmdnZWYyK5cdBs=
 github.com/lib/pq v1.10.6/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
@@ -2129,10 +1331,7 @@ github.com/linode/linodego v0.7.1/go.mod h1:ga11n3ivecUrPCHN0rANxKmfWBJVkOXfLMZi
 github.com/linuxkit/virtsock v0.0.0-20201010232012-f8cee7dfc7a3/go.mod h1:3r6x7q95whyfWQpmGZTu3gk3v2YkMi05HEzl7Tf7YEo=
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
-github.com/lyft/protoc-gen-star v0.6.0/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA=
-github.com/lyft/protoc-gen-star v0.6.1/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
-github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
@@ -2140,9 +1339,8 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN
 github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
 github.com/mailru/easyjson v0.7.1/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
+github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA=
 github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
-github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
-github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE=
 github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0=
 github.com/marstr/guid v1.1.0/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHefzho=
@@ -2153,9 +1351,8 @@ github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcncea
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
+github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
 github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
-github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
-github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-ieproxy v0.0.1 h1:qiyop7gCflfhwCzGyeT0gro3sF9AIg9HU98JORTkqfI=
 github.com/mattn/go-ieproxy v0.0.1/go.mod h1:pYabZ6IHcRpFh7vIaLfK7rdcWgFEb3SFJ6/gNWuh88E=
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
@@ -2166,54 +1363,37 @@ github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd
 github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
 github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
-github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
-github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/mattn/go-shellwords v1.0.3/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o=
 github.com/mattn/go-shellwords v1.0.6/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o=
-github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y=
-github.com/mattn/go-sqlite3 v1.14.14/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI=
 github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
-github.com/matttproud/golang_protobuf_extensions v1.0.2/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
-github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
-github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
 github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2/go.mod h1:eD9eIE7cdwcMi9rYluz88Jz2VyhSmden33/aXg4oVIY=
-github.com/mediocregopher/radix/v4 v4.1.2 h1:Pj7XnNK5WuzzFy63g98pnccainAePK+aZNQRvxSvj2I=
-github.com/mediocregopher/radix/v4 v4.1.2/go.mod h1:ajchozX/6ELmydxWeWM6xCFHVpZ4+67LXHOTOVR0nCE=
+github.com/mediocregopher/radix/v4 v4.1.1 h1:JkZBEp0y8pWGNZkmO3RR5oEO5huwd4zKKt4rh1C+P8s=
+github.com/mediocregopher/radix/v4 v4.1.1/go.mod h1:ajchozX/6ELmydxWeWM6xCFHVpZ4+67LXHOTOVR0nCE=
 github.com/mholt/archiver/v3 v3.5.1 h1:rDjOBX9JSF5BvoJGvjqK479aL70qh9DIpZCl+k7Clwo=
 github.com/mholt/archiver/v3 v3.5.1/go.mod h1:e3dqJ7H78uzsRSEACH1joayhuSyhnonssnDhppzS1L4=
 github.com/michaelklishin/rabbit-hole/v2 v2.12.0 h1:946p6jOYFcVJdtBBX8MwXvuBkpPjwm1Nm2Qg8oX+uFk=
 github.com/michaelklishin/rabbit-hole/v2 v2.12.0/go.mod h1:AN/3zyz7d++OHf+4WUo/LR0+Q5nlPHMaXasIsG/mPY0=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
-github.com/miekg/dns v1.1.25/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
 github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
+github.com/miekg/dns v1.1.41 h1:WMszZWJG0XmzbK9FEmzH2TVcqYzFesusSIB41b8KHxY=
 github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI=
-github.com/miekg/dns v1.1.43 h1:JKfpVSCB84vrAmHzyrsxB5NAr5kLoMXZArPSw7Qlgyg=
-github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4=
 github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs=
-github.com/miekg/pkcs11 v1.1.1/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs=
 github.com/mikesmitty/edkey v0.0.0-20170222072505-3356ea4e686a h1:eU8j/ClY2Ty3qdHnn0TyW3ivFoPC/0F1gQZz8yTxbbE=
 github.com/mikesmitty/edkey v0.0.0-20170222072505-3356ea4e686a/go.mod h1:v8eSC2SMp9/7FTKUncp7fH9IwPfw+ysMObcEz5FWheQ=
-github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8/go.mod h1:mC1jAcsrzbxHt8iiaC+zU4b1ylILSosueou12R++wfY=
-github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3/go.mod h1:RagcQ7I8IeTMnF8JTXieKnO4Z6JCsikNEzj0DwauVzE=
-github.com/minio/sha256-simd v1.0.0/go.mod h1:OuYzVNI5vcoYIAmbIvHPl3N3jUzVedXbKy5RFepssQM=
 github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
 github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI=
 github.com/mitchellh/cli v1.1.2 h1:PvH+lL2B7IQ101xQL63Of8yFS2y+aDlsFcsqNc+u/Kw=
 github.com/mitchellh/cli v1.1.2/go.mod h1:6iaV0fGdElS6dPBx0EApTxHrcWvmJphyh2n8YBLPPZ4=
-github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db h1:62I3jR2EmQ4l5rM/4FEfDWcRD+abF5XlKShorW5LRoQ=
-github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod h1:l0dey0ia/Uv7NcFFVbCLtqEBQbrT4OCwCSKTEv6enCw=
 github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
 github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
 github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
-github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
@@ -2222,10 +1402,8 @@ github.com/mitchellh/go-testing-interface v1.14.1 h1:jrgshOhYAUVNMAJiKbEu7EqAwgJ
 github.com/mitchellh/go-testing-interface v1.14.1/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8=
 github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4=
 github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
-github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg=
 github.com/mitchellh/hashstructure v1.1.0 h1:P6P1hdjqAAknpY/M1CGipelZgp+4y9ja9kmUZPXP+H0=
 github.com/mitchellh/hashstructure v1.1.0/go.mod h1:xUDAozZz0Wmdiufv0uyhnHkUTN6/6d8ulp4AwfLKrmA=
-github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
 github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v1.3.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
@@ -2236,32 +1414,25 @@ github.com/mitchellh/mapstructure v1.4.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A=
-github.com/mitchellh/pointerstructure v1.2.1 h1:ZhBBeX8tSlRpu/FFhXH4RC4OJzFlqsQhoHZAz4x7TIw=
-github.com/mitchellh/pointerstructure v1.2.1/go.mod h1:BRAsLI5zgXmw97Lf6s25bs8ohIXc3tViBH44KcwB2g4=
+github.com/mitchellh/pointerstructure v1.2.0 h1:O+i9nHnXS3l/9Wu7r4NrEdwA2VFTicjUEN1uBnDo34A=
+github.com/mitchellh/pointerstructure v1.2.0/go.mod h1:BRAsLI5zgXmw97Lf6s25bs8ohIXc3tViBH44KcwB2g4=
 github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
 github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
 github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
-github.com/mndrix/tap-go v0.0.0-20171203230836-629fa407e90b/go.mod h1:pzzDgJWZ34fGzaAZGFW22KVZDfyrYW+QABMrWnJBnSs=
 github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc=
-github.com/moby/patternmatcher v0.5.0 h1:YCZgJOeULcxLw1Q+sVR636pmS7sPEn1Qo2iAN6M7DBo=
-github.com/moby/patternmatcher v0.5.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
 github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c=
+github.com/moby/sys/mount v0.2.0 h1:WhCW5B355jtxndN5ovugJlMFJawbUODuW8fSnEH6SSM=
+github.com/moby/sys/mount v0.2.0/go.mod h1:aAivFE2LB3W4bACsUXChRHQ0qKWsetY4Y9V7sxOougM=
 github.com/moby/sys/mountinfo v0.4.0/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A=
 github.com/moby/sys/mountinfo v0.4.1/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A=
+github.com/moby/sys/mountinfo v0.5.0 h1:2Ks8/r6lopsxWi9m58nlwjaeSzUX9iiL1vj5qB/9ObI=
 github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU=
-github.com/moby/sys/mountinfo v0.6.2/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI=
-github.com/moby/sys/sequential v0.5.0 h1:OPvI35Lzn9K04PBbCLW0g4LcFAJgHsvXsRyewg5lXtc=
-github.com/moby/sys/sequential v0.5.0/go.mod h1:tH2cOOs5V9MlPiXcQzRC+eEyab644PWKGRYaaV5ZZlo=
-github.com/moby/sys/signal v0.6.0/go.mod h1:GQ6ObYZfqacOwTtlXvcmh9A26dVRul/hbOZn88Kg8Tg=
-github.com/moby/sys/signal v0.7.0/go.mod h1:GQ6ObYZfqacOwTtlXvcmh9A26dVRul/hbOZn88Kg8Tg=
 github.com/moby/sys/symlink v0.1.0/go.mod h1:GGDODQmbFOjFsXvfLVn3+ZRxkch54RkSiGqsZeMYowQ=
-github.com/moby/sys/symlink v0.2.0/go.mod h1:7uZVF2dqJjG/NsClqul95CqKOBRQyYSNnJ6BMgR/gFs=
 github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod h1:DdlQx2hp0Ss5/fLikoLlEeIYiATotOjgB//nb973jeo=
 github.com/moby/term v0.0.0-20201216013528-df9cb8a40635/go.mod h1:FBS0z0QWA44HXygs7VXDUOGoN/1TV3RuWkLO04am3wc=
-github.com/moby/term v0.0.0-20210610120745-9d4ed1856297/go.mod h1:vgPCkQMyxTZ7IDy8SXRufE172gr8+K/JE/7hHFxHW3A=
+github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw=
+github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae h1:O4SWKdcHVCvYqyDV+9CJA1fcDN2L11Bule0iFy3YlAI=
 github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw=
-github.com/moby/term v0.0.0-20221205130635-1aeaba878587 h1:HfkjXDfhgVaN5rmueG8cL8KKeFNecRCXFhaJ2qZ5SKA=
-github.com/moby/term v0.0.0-20221205130635-1aeaba878587/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -2270,19 +1441,13 @@ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3Rllmb
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8=
-github.com/mongodb-forks/digest v1.0.4 h1:9FrGTc7MGAchgaQBcXBnEwUM/Oo8obW7OGWxnsSvZ64=
-github.com/mongodb-forks/digest v1.0.4/go.mod h1:eHRfgovT+dvSFfltrOa27hy1oR/rcwyDdp5H1ZQxEMA=
+github.com/mongodb-forks/digest v1.0.3 h1:ZUK1vyZnBiRMvET0O1SzmnBmv935CkcOTjhfR4zIQ2s=
+github.com/mongodb-forks/digest v1.0.3/go.mod h1:eHRfgovT+dvSFfltrOa27hy1oR/rcwyDdp5H1ZQxEMA=
 github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
-github.com/montanaflynn/stats v0.7.0 h1:r3y12KyNxj/Sb/iOE46ws+3mS1+MZca1wlHQFPsY/JU=
-github.com/montanaflynn/stats v0.7.0/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
 github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
 github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
-github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
 github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ=
-github.com/mtibben/percent v0.2.1 h1:5gssi8Nqo8QU/r2pynCm+hBQHpkB/uNK7BJCFogWdzs=
-github.com/mtibben/percent v0.2.1/go.mod h1:KG9uO+SZkUp+VkRHsCdYQV3XSZrrSpR3O9ibNBTZrns=
 github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
@@ -2291,7 +1456,6 @@ github.com/natefinch/atomic v0.0.0-20150920032501-a62ce929ffcc h1:7xGrl4tTpBQu5Z
 github.com/natefinch/atomic v0.0.0-20150920032501-a62ce929ffcc/go.mod h1:1rLVY/DWf3U6vSZgH16S7pymfrhK2lcUlXjgGglw/lY=
 github.com/ncw/swift v1.0.47 h1:4DQRPj35Y41WogBxyhOXlrI37nzGlyEcsforeudyYPQ=
 github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM=
-github.com/networkplumbing/go-nft v0.2.0/go.mod h1:HnnM+tYvlGAsMU7yoYwXEVLLiDW9gdMmb5HoGcwpuQs=
 github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2 h1:BQ1HW7hr4IVovMwWg0E0PYcyW8CzqDcVmaew9cujU4s=
 github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2/go.mod h1:TLb2Sg7HQcgGdloNxkrmtgDNR9uVYF3lfdFIN4Ro6Sk=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
@@ -2309,7 +1473,6 @@ github.com/okta/okta-sdk-golang/v2 v2.12.1 h1:U+smE7trkHSZO8Mval3Ow85dbxawO+pMAr
 github.com/okta/okta-sdk-golang/v2 v2.12.1/go.mod h1:KRoAArk1H216oiRnQT77UN6JAhBOnOWkK27yA1SM7FQ=
 github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
 github.com/olekukonko/tablewriter v0.0.0-20180130162743-b8a9be070da4/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
-github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
 github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
@@ -2319,19 +1482,10 @@ github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+
 github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg=
 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
-github.com/onsi/ginkgo v1.13.0/go.mod h1:+REjRxOmWfHCjfv9TTWB1jD1Frx4XydAD3zm1lskyM0=
 github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
 github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
 github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
 github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
-github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
-github.com/onsi/ginkgo/v2 v2.1.4/go.mod h1:um6tUpWM/cxCK3/FK8BXqEiUMUwRgSM4JXG47RKZmLU=
-github.com/onsi/ginkgo/v2 v2.1.6/go.mod h1:MEH45j8TBi6u9BMogfbp0stKC5cdGjumZj5Y7AG4VIk=
-github.com/onsi/ginkgo/v2 v2.3.0/go.mod h1:Eew0uilEqZmIEZr8JrvYlvOM7Rr6xzTmMV8AyFNU9d0=
-github.com/onsi/ginkgo/v2 v2.4.0/go.mod h1:iHkDK1fKGcBoEHT5W7YBq4RFWaQulw+caOMkAt4OrFo=
-github.com/onsi/ginkgo/v2 v2.5.0/go.mod h1:Luc4sArBICYCS8THh8v3i3i5CuSZO+RaQRaJoeNwomw=
-github.com/onsi/ginkgo/v2 v2.6.1/go.mod h1:yjiuMwPokqY1XauOgju45q3sJt6VzQ/Fict1LFVcsAo=
-github.com/onsi/ginkgo/v2 v2.9.1 h1:zie5Ly042PD3bsCvsSOPvRnFwyo3rKe64TJlD6nu0mk=
 github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
@@ -2342,18 +1496,8 @@ github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoT
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc=
 github.com/onsi/gomega v1.15.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0=
+github.com/onsi/gomega v1.16.0 h1:6gjqkI8iiRHMvdccRJM8rVKjCWk6ZIm6FTm3ddIe4/c=
 github.com/onsi/gomega v1.16.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
-github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
-github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro=
-github.com/onsi/gomega v1.20.1/go.mod h1:DtrZpjmvpn2mPm4YWQa0/ALMDj9v4YxLgojwPeREyVo=
-github.com/onsi/gomega v1.21.1/go.mod h1:iYAIXgPSaDHak0LCMA+AWBpIKBr8WZicMxnE8luStNc=
-github.com/onsi/gomega v1.22.1/go.mod h1:x6n7VNe4hw0vkyYUM4mjIXx3JbLiPaBPNgB7PRQ1tuM=
-github.com/onsi/gomega v1.23.0/go.mod h1:Z/NWtiqwBrwUt4/2loMmHL63EDLnYHmVbuBpDr2vQAg=
-github.com/onsi/gomega v1.24.0/go.mod h1:Z/NWtiqwBrwUt4/2loMmHL63EDLnYHmVbuBpDr2vQAg=
-github.com/onsi/gomega v1.24.1/go.mod h1:3AOiACssS3/MajrniINInwbfOOtfZvplPzuRSmvt1jM=
-github.com/onsi/gomega v1.24.2/go.mod h1:gs3J10IS7Z7r7eXRoNJIrNqU4ToQukCJhFtKrWgHWnk=
-github.com/onsi/gomega v1.27.4 h1:Z2AnStgsdSayCMDiCU42qIz+HLqEPcgiOCXjAU/w+8E=
-github.com/open-policy-agent/opa v0.42.2/go.mod h1:MrmoTi/BsKWT58kXlVayBb+rYVeaMwuBm3nYAN3923s=
 github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
 github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
 github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
@@ -2362,53 +1506,39 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/opencontainers/image-spec v1.0.0/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
 github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
-github.com/opencontainers/image-spec v1.0.2-0.20211117181255-693428a734f5/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
+github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM=
 github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
-github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
-github.com/opencontainers/image-spec v1.1.0-rc2/go.mod h1:3OVijpioIKYWTqjiG0zfF6wvoJ4fAXGbjdZuI2NgsRQ=
-github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b h1:YWuSjZCQAPM8UUBLkYUk1e+rZcvWHJmFb6i6rM44Xs8=
-github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b/go.mod h1:3OVijpioIKYWTqjiG0zfF6wvoJ4fAXGbjdZuI2NgsRQ=
 github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
 github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
 github.com/opencontainers/runc v1.0.0-rc8.0.20190926000215-3e425f80a8c9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
 github.com/opencontainers/runc v1.0.0-rc9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
 github.com/opencontainers/runc v1.0.0-rc93/go.mod h1:3NOsor4w32B2tC0Zbl8Knk4Wg84SM2ImC1fxBuqJ/H0=
 github.com/opencontainers/runc v1.0.2/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0=
-github.com/opencontainers/runc v1.1.0/go.mod h1:Tj1hFw6eFWp/o33uxGf5yF2BX5yz2Z6iptFpuvbbKqc=
-github.com/opencontainers/runc v1.1.2/go.mod h1:Tj1hFw6eFWp/o33uxGf5yF2BX5yz2Z6iptFpuvbbKqc=
+github.com/opencontainers/runc v1.1.4 h1:nRCz/8sKg6K6jgYAFLDlXzPeITBZJyX28DBVhWD+5dg=
 github.com/opencontainers/runc v1.1.4/go.mod h1:1J5XiS+vdZ3wCyZybsuxXZWGrgSr8fFJHLXuG2PsnNg=
-github.com/opencontainers/runc v1.1.5/go.mod h1:1J5XiS+vdZ3wCyZybsuxXZWGrgSr8fFJHLXuG2PsnNg=
-github.com/opencontainers/runc v1.1.6 h1:XbhB8IfG/EsnhNvZtNdLB0GBw92GYEFvKlhaJk9jUgA=
-github.com/opencontainers/runc v1.1.6/go.mod h1:CbUumNnWCuTGFukNXahoo/RFBZvDAgRh/smNYNOhA50=
 github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
 github.com/opencontainers/runtime-spec v1.0.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
 github.com/opencontainers/runtime-spec v1.0.2-0.20190207185410-29686dbc5559/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
 github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
 github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
 github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
-github.com/opencontainers/runtime-spec v1.0.3-0.20220825212826-86290f6a00fb/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
-github.com/opencontainers/runtime-spec v1.1.0-rc.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
 github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod h1:r3f7wjNzSs2extwzU3Y+6pKfobzPh+kKFJ3ofN+3nfs=
-github.com/opencontainers/runtime-tools v0.9.0/go.mod h1:r3f7wjNzSs2extwzU3Y+6pKfobzPh+kKFJ3ofN+3nfs=
-github.com/opencontainers/runtime-tools v0.9.1-0.20221107090550-2e043c6bd626/go.mod h1:BRHJJd0E+cx42OybVYSgUvZmU0B8P9gZuRXlZUP7TKI=
 github.com/opencontainers/selinux v1.6.0/go.mod h1:VVGKuOLlE7v4PJyT6h7mNWvq1rzqiriPsEqVhc+svHE=
 github.com/opencontainers/selinux v1.8.0/go.mod h1:RScLhm78qiWa2gbVCcGkC7tCGdgk3ogry1nUQF8Evvo=
 github.com/opencontainers/selinux v1.8.2/go.mod h1:MUIHuUEvKB1wtJjQdOyYRgOnLD2xAPP8dBsCoU0KuF8=
-github.com/opencontainers/selinux v1.9.1/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI=
 github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI=
-github.com/opencontainers/selinux v1.10.1/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI=
-github.com/opencontainers/selinux v1.11.0/go.mod h1:E5dMC3VPuVvVHDYmi78qvhJp8+M586T4DlDRYpFkyec=
-github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
-github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b h1:FfH+VrHHk6Lxt9HdVS0PXzSXFyS2NbZKXv33FYPol0A=
-github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b/go.mod h1:AC62GU6hc0BrNm+9RK9VSiwa/EUe1bkIeFORAMcHvJU=
-github.com/oracle/oci-go-sdk v24.3.0+incompatible h1:x4mcfb4agelf1O4/1/auGlZ1lr97jXRSSN5MxTgG/zU=
-github.com/oracle/oci-go-sdk v24.3.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
+github.com/openlyinc/pointy v1.1.2 h1:LywVV2BWC5Sp5v7FoP4bUD+2Yn5k0VNeRbU5vq9jUMY=
+github.com/openlyinc/pointy v1.1.2/go.mod h1:w2Sytx+0FVuMKn37xpXIAyBNhFNBIJGR/v2m7ik1WtM=
+github.com/oracle/oci-go-sdk v7.0.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
+github.com/oracle/oci-go-sdk v13.1.0+incompatible h1:inwbT0b/mMbnTfzYoW2xcU1cCMIlU6Fz973at5phRXM=
+github.com/oracle/oci-go-sdk v13.1.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
 github.com/oracle/oci-go-sdk/v60 v60.0.0 h1:EJAWjEi4SY5Raha6iUzq4LTQ0uM5YFw/wat/L1ehIEM=
 github.com/oracle/oci-go-sdk/v60 v60.0.0/go.mod h1:krz+2gkSzlSL/L4PvP0Z9pZpag9HYLNtsMd1PmxlA2w=
 github.com/ory/dockertest v3.3.5+incompatible h1:iLLK6SQwIhcbrG783Dghaaa3WPzGc+4Emza6EbVUUGA=
 github.com/ory/dockertest v3.3.5+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnhNrne+V0E6LAcBILJdPs=
-github.com/ory/dockertest/v3 v3.10.0 h1:4K3z2VMe8Woe++invjaTB7VRyQXQy5UY+loujO4aNE4=
-github.com/ory/dockertest/v3 v3.10.0/go.mod h1:nr57ZbRWMqfsdGdFNLHz5jjNdDb7VVFnzAeW1n5N1Lg=
+github.com/ory/dockertest/v3 v3.8.0/go.mod h1:9zPATATlWQru+ynXP+DytBQrsXV7Tmlx7K86H6fQaDo=
+github.com/ory/dockertest/v3 v3.9.1 h1:v4dkG+dlu76goxMiTT2j8zV7s4oPPEppKT8K8p2f1kY=
+github.com/ory/dockertest/v3 v3.9.1/go.mod h1:42Ir9hmvaAPm0Mgibk6mBPi7SFvTXxEcnztDYOJ//uM=
 github.com/oxtoacart/bpool v0.0.0-20150712133111-4e1c5567d7c2 h1:CXwSGu/LYmbjEab5aMCs5usQRVBGThelUKBNnoSOuso=
 github.com/oxtoacart/bpool v0.0.0-20150712133111-4e1c5567d7c2/go.mod h1:L3UMQOThbttwfYRNFOWLLVXMhk5Lkio4GGOtw5UrxS0=
 github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c h1:vwpFWvAO8DeIZfFeqASzZfsxuWPno9ncAebBEP0N3uE=
@@ -2423,38 +1553,28 @@ github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/9
 github.com/pelletier/go-toml v1.4.0/go.mod h1:PN7xzY2wHTK0K9p34ErDQMlFxa51Fk0OUruD3k1mMwo=
 github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE=
 github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc=
-github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
-github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
-github.com/peterh/liner v0.0.0-20170211195444-bf27d3ba8e1d/go.mod h1:xIteQHvHuaLYG9IFj6mSxM0fCKrs34IrEQUhOYuGPHc=
 github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 h1:q2e307iGHPdTGp0hoxKjt1H5pDo6utceo3dQVK3I5XQ=
 github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o=
-github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5/go.mod h1:iIss55rKnNBTvrwdmkUpLnDpZoAHvWaiq5+iMmen4AE=
-github.com/phpdave11/gofpdf v1.4.2/go.mod h1:zpO6xFn9yxo3YLyMvW8HcKWVdbNqgIfOOp2dXMnm1mY=
-github.com/phpdave11/gofpdi v1.0.12/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI=
-github.com/phpdave11/gofpdi v1.0.13/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI=
 github.com/pierrec/lz4 v2.5.2+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pierrec/lz4 v2.6.1+incompatible h1:9UY3+iC23yxF0UfGaYrGplQ+79Rg+h/q9FV9ix19jjM=
 github.com/pierrec/lz4 v2.6.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pierrec/lz4/v4 v4.1.2/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
+github.com/pierrec/lz4/v4 v4.1.8 h1:ieHkV+i2BRzngO4Wd/3HGowuZStgq6QkPsD1eolNAO4=
 github.com/pierrec/lz4/v4 v4.1.8/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
-github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
-github.com/pierrec/lz4/v4 v4.1.16/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
-github.com/pierrec/lz4/v4 v4.1.17 h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc=
-github.com/pierrec/lz4/v4 v4.1.17/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pires/go-proxyproto v0.6.1 h1:EBupykFmo22SDjv4fQVQd2J9NOoLPmyZA/15ldOGkPw=
 github.com/pires/go-proxyproto v0.6.1/go.mod h1:Odh9VFOZJCf9G8cLW5o435Xf1J95Jw9Gw5rnCjcwzAY=
 github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA=
+github.com/pkg/browser v0.0.0-20210706143420-7d21f8c997e2/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI=
 github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU=
 github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI=
+github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e h1:aoZm08cpOy4WuID//EZDgcC4zIxODThtZNPirFr42+A=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI=
-github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -2468,7 +1588,6 @@ github.com/pquerna/cachecontrol v0.1.0 h1:yJMy84ti9h/+OEWa752kBTKv4XC30OtVVHYv/8
 github.com/pquerna/cachecontrol v0.1.0/go.mod h1:NrUG3Z7Rdu85UNR3vm7SOsl1nFIeSiQnrHV5K9mBcUI=
 github.com/pquerna/otp v1.2.1-0.20191009055518-468c2dd2b58d h1:PinQItctnaL2LtkaSM678+ZLLy5TajwOeXzWvYC7tII=
 github.com/pquerna/otp v1.2.1-0.20191009055518-468c2dd2b58d/go.mod h1:dkJfzwRKNiegxyNb54X/3fLwhCynbMspSyWKnvi1AEg=
-github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
 github.com/prometheus/client_golang v0.0.0-20180209125602-c332b6f63c06/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM=
@@ -2478,19 +1597,14 @@ github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQ
 github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
 github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
 github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
+github.com/prometheus/client_golang v1.11.1 h1:+4eQaD7vAZ6DsfsxB15hbE0odUjGI5ARs9yskGu1v4s=
 github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
-github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
-github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
-github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ=
-github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw=
-github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y=
 github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M=
 github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4=
-github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w=
 github.com/prometheus/common v0.0.0-20180110214958-89604d197083/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
@@ -2499,11 +1613,8 @@ github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8
 github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc=
 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
 github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
+github.com/prometheus/common v0.26.0 h1:iMAkS2TDoNWnKM+Kopnx/8tnEStIfpYA0ur0xQzzhMQ=
 github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
-github.com/prometheus/common v0.30.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
-github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
-github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8pXE=
-github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA=
 github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
@@ -2515,15 +1626,11 @@ github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDa
 github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
 github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
 github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
+github.com/prometheus/procfs v0.6.0 h1:mxy4L2jP6qMonqmq+aTtOx1ifVWUgG/TAmntgbh3xv4=
 github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
-github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
-github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo=
-github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
 github.com/rboyer/safeio v0.2.1 h1:05xhhdRNAdS3apYm7JRjOqngf4xruaW959jmRxGDuSU=
 github.com/rboyer/safeio v0.2.1/go.mod h1:Cq/cEPK+YXFn622lsQ0K4KsPZSPtaptHHEldsy7Fmig=
-github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
-github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03 h1:Wdi9nwnhFNAlseAOekn6B5G/+GMtks9UKbvRU/CMM/o=
 github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03/go.mod h1:gRAiPF5C5Nd0eyyRdqIu9qTiFSoZzpTq727b5B8fkkU=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
@@ -2533,53 +1640,41 @@ github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rogpeppe/go-internal v1.6.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
+github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg=
 github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o=
-github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
-github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
-github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
 github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
 github.com/rs/zerolog v1.4.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
 github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
 github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
-github.com/russross/blackfriday v1.6.0/go.mod h1:ti0ldHuxg49ri4ksnFxlkCfN+hvslNlmVHqNRXXJNAY=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfFZQK844Gfx8o5WFuvpxWRwnSoipWe/p622j1v06w=
-github.com/ruudk/golang-pdf417 v0.0.0-20201230142125-a7e3863a1245/go.mod h1:pQAZKsJ8yyVxGRWYNEm9oFB8ieLgKFnamEyDmSA0BRk=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/ryanuber/columnize v2.1.0+incompatible h1:j1Wcmh8OrK4Q7GXY+V7SVSY8nUWQxHW5TkBe7YUl+2s=
 github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk=
 github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc=
 github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4=
-github.com/safchain/ethtool v0.0.0-20210803160452-9aa261dae9b1/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4=
-github.com/safchain/ethtool v0.2.0/go.mod h1:WkKB1DnNtvsMlDmQ50sgwowDJV/hGbJSOvJoEXs1AJQ=
+github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da h1:p3Vo3i64TCLY7gIfzeQaUJ+kppEO5WQG3cL8iE8tGHU=
+github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E=
 github.com/sasha-s/go-deadlock v0.2.0 h1:lMqc+fUb7RrFS3gQLtoQsJ7/6TV/pAIFvBsqX73DK8Y=
 github.com/sasha-s/go-deadlock v0.2.0/go.mod h1:StQn567HiB1fF2yJ44N9au7wOhrPS3iZqiDbRupzT10=
 github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
-github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw=
 github.com/sclevine/spec v1.2.0/go.mod h1:W4J29eT/Kzv7/b9IWLB055Z+qvVC9vt0Arko24q7p+U=
 github.com/sean-/conswriter v0.0.0-20180208195008-f5ae3917a627/go.mod h1:7zjs06qF79/FKAJpBvFx3P8Ww4UTIMAe+lpNXDHziac=
 github.com/sean-/pager v0.0.0-20180208200047-666be9bf53b5/go.mod h1:BeybITEsBEg6qbIiqJ6/Bqeq25bCLbL7YFmpaFfJDuM=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
 github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo=
-github.com/seccomp/libseccomp-golang v0.9.2-0.20210429002308-3879420cc921/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg=
 github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
-github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
-github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
 github.com/sethvargo/go-limiter v0.7.1 h1:wWNhTj0pxjyJ7wuJHpRJpYwJn+bUnjYfw2a85eu5w9U=
 github.com/sethvargo/go-limiter v0.7.1/go.mod h1:C0kbSFbiriE5k2FFOe18M1YZbAR2Fiwf72uGu0CXCcU=
 github.com/shirou/gopsutil/v3 v3.22.6 h1:FnHOFOh+cYAM0C30P+zysPISzlknLC5Z1G4EAElznfQ=
 github.com/shirou/gopsutil/v3 v3.22.6/go.mod h1:EdIubSnZhbAvBS1yJ7Xi+AShB/hxwLHOMz4MCYz7yMs=
-github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
+github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ=
 github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
-github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8=
-github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
 github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
@@ -2592,41 +1687,27 @@ github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic
 github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
 github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 h1:JIAuq3EEf9cgbU6AtGPK4CTG3Zf6CKMNqf0MHTggAUA=
-github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
-github.com/snowflakedb/gosnowflake v1.6.18 h1:mm4KYvp3LWGHIuACwX/tHv9qDs2NdLDXuK0Rep+vfJc=
-github.com/snowflakedb/gosnowflake v1.6.18/go.mod h1:BhNDWNSUY+t4T8GBuOg3ckWC4v5hhGlLovqGcF8Rkac=
+github.com/snowflakedb/gosnowflake v1.6.3 h1:EJDdDi74YbYt1ty164ge3fMZ0eVZ6KA7b1zmAa/wnRo=
+github.com/snowflakedb/gosnowflake v1.6.3/go.mod h1:6hLajn6yxuJ4xUHZegMekpq9rnQbGJ7TMwXjgTmA6lg=
 github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d h1:bVQRCxQvfjNUeRqaY/uT0tFuvuFY0ulgnczuR684Xic=
 github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d/go.mod h1:Cw4GTlQccdRGSEf6KiMju767x0NEHE0YIVPJSaXjlsw=
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
-github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0=
 github.com/sony/gobreaker v0.4.2-0.20210216022020-dd874f9dd33b h1:br+bPNZsJWKicw/5rALEo67QHs5weyD5tf8WST+4sJ0=
 github.com/sony/gobreaker v0.4.2-0.20210216022020-dd874f9dd33b/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
-github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
 github.com/spf13/afero v1.2.1/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
 github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
-github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4=
-github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
-github.com/spf13/afero v1.9.2/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y=
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
-github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
-github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA=
-github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48=
 github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
 github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE=
-github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo=
-github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g=
-github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJoUM=
-github.com/spf13/cobra v1.6.0/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY=
 github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
 github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
@@ -2636,7 +1717,6 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
-github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
 github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod h1:AO3tvPzVZ/ayst6UlUKUv6rcPQInYe3IknH3jYhAKu8=
 github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
 github.com/streadway/amqp v1.0.0 h1:kuuDrUJFZL1QYL9hUNuCxNObNzB0bV/ZG5jV3RWAQgo=
@@ -2645,10 +1725,8 @@ github.com/stretchr/objx v0.0.0-20180129172003-8a3f7159479f/go.mod h1:HFkY916IF+
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
-github.com/stretchr/objx v0.3.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
+github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v0.0.0-20180303142811-b89eecf5ca5d/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
@@ -2659,79 +1737,54 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
 github.com/stretchr/testify v1.7.5/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
 github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
 github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
 github.com/tchap/go-patricia v2.2.6+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I=
-github.com/tchap/go-patricia/v2 v2.3.1/go.mod h1:VZRHKAb53DLaG+nA9EaYYiaEx6YztwDlLElMsnSHD4k=
 github.com/tencentcloud/tencentcloud-sdk-go v1.0.162 h1:8fDzz4GuVg4skjY2B0nMN7h6uN61EDVkuLyI2+qGHhI=
 github.com/tencentcloud/tencentcloud-sdk-go v1.0.162/go.mod h1:asUz5BPXxgoPGaRgZaVm1iGcUAuHyYUo1nXqKa83cvI=
 github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4=
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
+github.com/tilinna/clock v1.0.2 h1:6BO2tyAC9JbPExKH/z9zl44FLu1lImh3nDNKA0kgrkI=
 github.com/tilinna/clock v1.0.2/go.mod h1:ZsP7BcY7sEEz7ktc0IVy8Us6boDrK8VradlKRUGfOao=
-github.com/tilinna/clock v1.1.0 h1:6IQQQCo6KoBxVudv6gwtY8o4eDfhHo8ojA5dP0MfhSs=
-github.com/tilinna/clock v1.1.0/go.mod h1:ZsP7BcY7sEEz7ktc0IVy8Us6boDrK8VradlKRUGfOao=
 github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw=
 github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk=
 github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o=
 github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
-github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
 github.com/tv42/httpunix v0.0.0-20191220191345-2ba4b9c3382c h1:u6SKchux2yDvFQnDHS3lPnIRmfVJ5Sxy3ao2SIdysLQ=
 github.com/tv42/httpunix v0.0.0-20191220191345-2ba4b9c3382c/go.mod h1:hzIxponao9Kjc7aWznkXaL4U4TWaDSs8zcsY4Ka08nM=
-github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaOOb6ThwMmTEbhRwtKR97o=
-github.com/uber/jaeger-client-go v2.30.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk=
-github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVKhn2Um6rjCsSsg=
-github.com/uber/jaeger-lib v2.4.1+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U=
 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
-github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
-github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
-github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
-github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
 github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/ulikunitz/xz v0.5.9/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/ulikunitz/xz v0.5.10 h1:t92gobL9l3HE202wg3rlk19F6X+JOxl9BBrCCMYEYd8=
 github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
-github.com/urfave/cli v1.19.1/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
 github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
 github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
-github.com/urfave/cli v1.22.4/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
-github.com/urfave/cli v1.22.12/go.mod h1:sSBEIC79qR6OvcmsD4U3KABeOTxDqQtdDnaFuUN30b8=
-github.com/vbatts/tar-split v0.11.2/go.mod h1:vV3ZuO2yWSVsz+pfFzDG/upWH1JhjOiEaWq6kXyQ3VI=
 github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv3vaXspKw=
-github.com/vektah/gqlparser/v2 v2.4.5/go.mod h1:flJWIR04IMQPGz+BXLrORkrARBxv/rtyIAFvd/MceW0=
-github.com/veraison/go-cose v1.0.0-rc.1/go.mod h1:7ziE85vSq4ScFTg6wyoMXjucIGOf4JkFEZi/an96Ct4=
 github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk=
 github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE=
 github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho=
-github.com/vishvananda/netlink v1.1.1-0.20210330154013-f5de75959ad5/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho=
-github.com/vishvananda/netlink v1.2.1-beta.2/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho=
 github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI=
 github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU=
 github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
-github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
 github.com/vmware/govmomi v0.18.0 h1:f7QxSmP7meCtoAmiKZogvVbLInT+CZx6Px6K5rYsJZo=
 github.com/vmware/govmomi v0.18.0/go.mod h1:URlwyTFZX72RmxtxuaFL2Uj3fD1JTvZdx59bHWk6aFU=
 github.com/willf/bitset v1.1.11-0.20200630133818-d5bec3311243/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4=
 github.com/willf/bitset v1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr3+MjI=
-github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
 github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
 github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
-github.com/xdg-go/scram v1.1.1 h1:VOMT+81stJgXW3CpHyqHN3AXDYIMsx56mEFrB37Mb/E=
-github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g=
-github.com/xdg-go/stringprep v1.0.3 h1:kdwGpVNwPFtjs98xCGkHjQtGKh86rDcRZN17QEMCOIs=
-github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8=
+github.com/xdg-go/scram v1.0.2 h1:akYIkZ28e6A96dkWNJQu3nmCzH3YfwMPQExUYDaRv7w=
+github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs=
+github.com/xdg-go/stringprep v1.0.2 h1:6iq84/ryjjeRmMJwxutI51F2GIPlP5BfTvXHeYjyhBc=
+github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM=
 github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
 github.com/xdg/stringprep v0.0.0-20180714160509-73f8eece6fdc/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
@@ -2746,7 +1799,7 @@ github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofm
 github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
-github.com/yashtewari/glob-intersection v0.1.0/go.mod h1:LK7pIC3piUjovexikBbJ26Yml7g8xa5bsjfx2v1fwok=
+github.com/yhat/scrape v0.0.0-20161128144610-24b7890b0945/go.mod h1:4vRFPPNYllgCacoj+0FoKOjTW68rUhEfqPLiEJaK2w8=
 github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d h1:splanxYIlg+5LfHAM6xpdFEAYOk8iySO56hMFq6uLyA=
 github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -2764,42 +1817,24 @@ github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQ
 github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs=
 github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA=
 github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg=
-github.com/zclconf/go-cty v1.12.1 h1:PcupnljUm9EIvbgSHQnHhUr3fO6oFmkOrvs2BAFNXXY=
-github.com/zclconf/go-cty v1.12.1/go.mod h1:s9IfD1LK5ccNMSWCVFCE2rJfHiZgi7JijgeWIMfhLvA=
-github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0=
-github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA=
 github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
+go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU=
 go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4=
-go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ=
-go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw=
 go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489/go.mod h1:yVHk9ub3CSBatqGNg7GRmsnfLWtoW60w4eDYfh7vHDg=
+go.etcd.io/etcd/api/v3 v3.5.0 h1:GsV3S+OfZEOCNXdtNkBSR7kgLobAa/SO6tCxRa0GAYw=
 go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
-go.etcd.io/etcd/api/v3 v3.5.5/go.mod h1:KFtNaxGDw4Yx/BA4iPPwevUTAuqcsPxzyX8PHydchN8=
-go.etcd.io/etcd/api/v3 v3.5.7 h1:sbcmosSVesNrWOJ58ZQFitHMdncusIifYcrBfwrlJSY=
-go.etcd.io/etcd/api/v3 v3.5.7/go.mod h1:9qew1gCdDDLu+VwmeG+iFpL+QlpHTo7iubavdVDgCAA=
-go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
-go.etcd.io/etcd/client/pkg/v3 v3.5.5/go.mod h1:ggrwbk069qxpKPq8/FKkQ3Xq9y39kbFR4LnKszpRXeQ=
-go.etcd.io/etcd/client/pkg/v3 v3.5.7 h1:y3kf5Gbp4e4q7egZdn5T7W9TSHUvkClN6u+Rq9mEOmg=
-go.etcd.io/etcd/client/pkg/v3 v3.5.7/go.mod h1:o0Abi1MK86iad3YrWhgUsbGx1pmTS+hrORWc2CamuhY=
+go.etcd.io/etcd/client/pkg/v3 v3.0.0-20210928084031-3df272774672 h1:19vOZe7geDEympjWIVidGi6/psR5Y+aaKnF17PSpdXA=
+go.etcd.io/etcd/client/pkg/v3 v3.0.0-20210928084031-3df272774672/go.mod h1:wSVAyLiSU4JOBlqGr29lZeKbllk31oCAXAdTa6MioWQ=
+go.etcd.io/etcd/client/v2 v2.305.0 h1:ftQ0nOOHMcbMS3KIaDQ0g5Qcd6bhaBrQT6b89DfwLTs=
 go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ=
-go.etcd.io/etcd/client/v2 v2.305.5 h1:DktRP60//JJpnPC0VBymAN/7V71GHMdjDCBt4ZPXDjI=
-go.etcd.io/etcd/client/v2 v2.305.5/go.mod h1:zQjKllfqfBVyVStbt4FaosoX2iYd8fV/GRy/PbowgP4=
+go.etcd.io/etcd/client/v3 v3.5.0 h1:62Eh0XOro+rDwkrypAGDfgmNh5Joq+z+W9HZdlXMzek=
 go.etcd.io/etcd/client/v3 v3.5.0/go.mod h1:AIKXXVX/DQXtfTEqBryiLTUXwON+GuvO6Z7lLS/oTh0=
-go.etcd.io/etcd/client/v3 v3.5.5/go.mod h1:aApjR4WGlSumpnJ2kloS75h6aHUmAyaPLjHMxpc7E7c=
-go.etcd.io/etcd/client/v3 v3.5.7 h1:u/OhpiuCgYY8awOHlhIhmGIGpxfBU/GZBUP3m/3/Iz4=
-go.etcd.io/etcd/client/v3 v3.5.7/go.mod h1:sOWmj9DZUMyAngS7QQwCyAXXAL6WhgTOPLNS/NabQgw=
-go.etcd.io/etcd/pkg/v3 v3.5.0/go.mod h1:UzJGatBQ1lXChBkQF0AuAtkRQMYnHubxAEYIrC3MSsE=
-go.etcd.io/etcd/pkg/v3 v3.5.5/go.mod h1:6ksYFxttiUGzC2uxyqiyOEvhAiD0tuIqSZkX3TyPdaE=
-go.etcd.io/etcd/raft/v3 v3.5.0/go.mod h1:UFOHSIvO/nKwd4lhkwabrTD3cqW5yVyYYf/KlD00Szc=
-go.etcd.io/etcd/raft/v3 v3.5.5/go.mod h1:76TA48q03g1y1VpTue92jZLr9lIHKUNcYdZOOGyx8rI=
-go.etcd.io/etcd/server/v3 v3.5.0/go.mod h1:3Ah5ruV+M+7RZr0+Y/5mNLwC+eQlni+mQmOVdCRJoS4=
-go.etcd.io/etcd/server/v3 v3.5.5/go.mod h1:rZ95vDw/jrvsbj9XpTqPrTAB9/kzchVdhRirySPkUBc=
-go.etcd.io/gofail v0.1.0/go.mod h1:VZBCXYGZhHAinaBiiqYvuDynvahNsAyLFwB3kEHKz1M=
-go.mongodb.org/atlas v0.28.0 h1:CelAXtmiM36tdifSDwWdDH1nNbdvq0M2XfUR8208JxA=
-go.mongodb.org/atlas v0.28.0/go.mod h1:L4BKwVx/OeEhOVjCSdgo90KJm4469iv7ZLzQms/EPTg=
+go.mongodb.org/atlas v0.13.0/go.mod h1:wVCnHcm/7/IfTjEB6K8K35PLG70yGz8BdkRwX0oK9/M=
+go.mongodb.org/atlas v0.15.0 h1:YyOBdBIuI//krRITf4r7PSirJ3YDNNUfNmapxwSyDow=
+go.mongodb.org/atlas v0.15.0/go.mod h1:lQhRHIxc6jQHEK3/q9WLu/SdBkPj2fQYhjLGUF6Z3U8=
 go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
 go.mongodb.org/mongo-driver v1.1.1/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
 go.mongodb.org/mongo-driver v1.3.0/go.mod h1:MSWZXKOynuguX+JSvwP8i+58jYCXxbia8HS3gZBapIE=
@@ -2807,8 +1842,8 @@ go.mongodb.org/mongo-driver v1.3.4/go.mod h1:MSWZXKOynuguX+JSvwP8i+58jYCXxbia8HS
 go.mongodb.org/mongo-driver v1.4.3/go.mod h1:WcMNYLx/IlOxLe6JRJiv2uXuCz6zBLndR4SoGjYphSc=
 go.mongodb.org/mongo-driver v1.4.4/go.mod h1:WcMNYLx/IlOxLe6JRJiv2uXuCz6zBLndR4SoGjYphSc=
 go.mongodb.org/mongo-driver v1.4.6/go.mod h1:WcMNYLx/IlOxLe6JRJiv2uXuCz6zBLndR4SoGjYphSc=
-go.mongodb.org/mongo-driver v1.11.6 h1:XM7G6PjiGAO5betLF13BIa5TlLUUE3uJ/2Ox3Lz1K+o=
-go.mongodb.org/mongo-driver v1.11.6/go.mod h1:G9TgswdsWjX4tmDA5zfs2+6AEPpYJwqblyjsfuh8oXY=
+go.mongodb.org/mongo-driver v1.7.3 h1:G4l/eYY9VrQAK/AUgkV0koQKzQnyddnWxrd/Etf0jIs=
+go.mongodb.org/mongo-driver v1.7.3/go.mod h1:NqaYOwnXWr5Pm7AOpO5QFxKJ503nbMse/R79oO62zWg=
 go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1/go.mod h1:SNgMg+EgDFwmvSmLRTNKC5fegJjB7v23qTQ0XLGUNHk=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
@@ -2816,86 +1851,30 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
+go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
-go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
-go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0/go.mod h1:oVGt1LRbBOBq1A5BQLlUg9UaU/54aiHw8cgjV3aWZ/E=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0/go.mod h1:vEhqr0m4eTc+DWxfsXoXue2GBgV2uUwVznkGIHW/e5w=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0/go.mod h1:h8TWwRAhQpOd0aM5nYsRD8+flnkj+526GEIVlarH7eY=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.40.0/go.mod h1:UMklln0+MRhZC4e3PwmN3pCtq4DyIadWw4yikh6bNrw=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.32.0/go.mod h1:5eCOqeGphOyz6TsY3ZDNjE33SM/TFAK3RGuCL2naTgY=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.0/go.mod h1:9NiG9I2aHTKkcxqCILhjtyNA1QEiCjdBACv4IvrFQ+c=
+go.opentelemetry.io/otel v0.20.0 h1:eaP0Fqu7SXHwvjiqDq83zImeehOHX8doTvU9AwXON8g=
 go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo=
-go.opentelemetry.io/otel v1.0.1/go.mod h1:OPEOD4jIT2SlZPMmwT6FqZz2C0ZNdQqiWcoK6M0SNFU=
-go.opentelemetry.io/otel v1.3.0/go.mod h1:PWIKzi6JCp7sM0k9yZ43VX+T345uNbAkDKwHVjb2PTs=
-go.opentelemetry.io/otel v1.7.0/go.mod h1:5BdUoMIz5WEs0vt0CUEMtSSaTSHBBVwrhnz7+nrD5xk=
-go.opentelemetry.io/otel v1.8.0/go.mod h1:2pkj+iMj0o03Y+cW6/m8Y4WkRdYN3AvCXCnzRMp9yvM=
-go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ=
-go.opentelemetry.io/otel v1.14.0 h1:/79Huy8wbf5DnIPhemGB+zEPVwnN6fuQybr/SRXa6hM=
-go.opentelemetry.io/otel v1.14.0/go.mod h1:o4buv+dJzx8rohcUeRmWUZhqupFvzWis188WlggnNeU=
-go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM=
-go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.3.0/go.mod h1:VpP4/RMn8bv8gNo9uK7/IMY4mtWLELsS+JIP0inH0h4=
-go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.7.0/go.mod h1:M1hVZHNxcbkAlcvrOMlpQ4YOO3Awf+4N2dxkZL3xm04=
-go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0/go.mod h1:78XhIg8Ht9vR4tbLNUhXsiOnE2HOuSeKAiAcoVQEpOY=
-go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.14.0/go.mod h1:UFG7EBMRdXyFstOwH028U0sVf+AvukSGhF0g8+dmNG8=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.0.1/go.mod h1:Kv8liBeVNFkkkbilbgWRpV+wWuu+H5xdOT6HAgd30iw=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.3.0/go.mod h1:hO1KLR7jcKaDDKDkvI9dP/FIhpmna5lkqPUQdEjFAM8=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.7.0/go.mod h1:ceUgdyfNv4h4gLxHR0WNfDiiVmZFodZhZSbOLhpxqXE=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0/go.mod h1:Krqnjl22jUJ0HgMzw5eveuCvFDXY4nSYb4F8t5gdrag=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.14.0/go.mod h1:HrbCVv40OOLTABmOn1ZWty6CHXkU8DK/Urc43tHug70=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.0.1/go.mod h1:xOvWoTOrQjxjW61xtOmD/WKGRYb/P4NzRo3bs65U6Rk=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.3.0/go.mod h1:keUU7UfnwWTWpJ+FWnyqmogPa82nuU5VUANFq49hlMY=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.7.0/go.mod h1:E+/KKhwOSw8yoPxSSuUHG6vKppkvhN+S1Jc7Nib3k3o=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0/go.mod h1:OfUCyyIiDvNXHWpcWgbF+MWvqPZiNa3YDEnivcnYsV0=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.14.0/go.mod h1:5w41DY6S9gZrbjuq6Y+753e96WfPha5IcsOSZTtullM=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.3.0/go.mod h1:QNX1aly8ehqqX1LEa6YniTU7VY9I6R3X/oPxhGdTceE=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.14.0/go.mod h1:+N7zNjIJv4K+DeX67XXET0P+eIciESgaFDBqh+ZJFS4=
+go.opentelemetry.io/otel/metric v0.20.0 h1:4kzhXFP+btKm4jwxpjIqjs41A7MakRFUS86bqLHTIw8=
 go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU=
-go.opentelemetry.io/otel/metric v0.30.0/go.mod h1:/ShZ7+TS4dHzDFmfi1kSXMhMVubNoP0oIaBp70J6UXU=
-go.opentelemetry.io/otel/metric v0.31.0/go.mod h1:ohmwj9KTSIeBnDBm/ZwH2PSZxZzoOaG2xZeekTRzL5A=
-go.opentelemetry.io/otel/metric v0.37.0/go.mod h1:DmdaHfGt54iV6UKxsV9slj2bBRJcKC1B1uvDLIioc1s=
+go.opentelemetry.io/otel/oteltest v0.20.0 h1:HiITxCawalo5vQzdHfKeZurV8x7ljcqAgiWzF6Vaeaw=
 go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw=
+go.opentelemetry.io/otel/sdk v0.20.0 h1:JsxtGXd06J8jrnya7fdI/U/MR6yXA5DtbZy+qoHQlr8=
 go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc=
-go.opentelemetry.io/otel/sdk v1.0.1/go.mod h1:HrdXne+BiwsOHYYkBE5ysIcv2bvdZstxzmCQhxTcZkI=
-go.opentelemetry.io/otel/sdk v1.3.0/go.mod h1:rIo4suHNhQwBIPg9axF8V9CA72Wz2mKF1teNrup8yzs=
-go.opentelemetry.io/otel/sdk v1.7.0/go.mod h1:uTEOTwaqIVuTGiJN7ii13Ibp75wJmYUDe374q6cZwUU=
-go.opentelemetry.io/otel/sdk v1.10.0/go.mod h1:vO06iKzD5baltJz1zarxMCNHFpUlUiOy4s65ECtn6kE=
-go.opentelemetry.io/otel/sdk v1.14.0 h1:PDCppFRDq8A1jL9v6KMI6dYesaq+DFcDZvjsoGvxGzY=
-go.opentelemetry.io/otel/sdk v1.14.0/go.mod h1:bwIC5TjrNG6QDCHNWvW4HLHtUQ4I+VQDsnjhvyZCALM=
-go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod h1:h7RBNMsDJ5pmI1zExLi+bJK+Dr8NQCh0qGhm1KDnNlE=
-go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE=
+go.opentelemetry.io/otel/trace v0.20.0 h1:1DL6EXUdcg95gukhuRRvLDO/4X5THh/5dIV52lqtnbw=
 go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16gUEi0Nf1iBdgw=
-go.opentelemetry.io/otel/trace v1.0.1/go.mod h1:5g4i4fKLaX2BQpSBsxw8YYcgKpMMSW3x7ZTuYBr3sUk=
-go.opentelemetry.io/otel/trace v1.3.0/go.mod h1:c/VDhno8888bvQYmbYLqe41/Ldmr/KKunbvWM4/fEjk=
-go.opentelemetry.io/otel/trace v1.7.0/go.mod h1:fzLSB9nqR2eXzxPXb2JW9IKE+ScyXA48yyE4TNvoHqU=
-go.opentelemetry.io/otel/trace v1.8.0/go.mod h1:0Bt3PXY8w+3pheS3hQUt+wow8b1ojPaTBoTCh2zIFI4=
-go.opentelemetry.io/otel/trace v1.10.0/go.mod h1:Sij3YYczqAdz+EhmGhE6TpTxUO5/F/AzrK+kxfGqySM=
-go.opentelemetry.io/otel/trace v1.14.0 h1:wp2Mmvj41tDsyAJXiWDWpfNsOiIyd38fy85pyKcFq/M=
-go.opentelemetry.io/otel/trace v1.14.0/go.mod h1:8avnQLK+CG77yNLUae4ea2JDQ6iT+gozhnZjy/rw9G8=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
-go.opentelemetry.io/proto/otlp v0.9.0/go.mod h1:1vKfU9rv61e9EVGthD1zNvUbiwPcimSsOPU9brfSHJg=
-go.opentelemetry.io/proto/otlp v0.11.0/go.mod h1:QpEjXPrNQzrFDZgoTo49dgHR9RYRSrg3NAKnUGl9YpQ=
-go.opentelemetry.io/proto/otlp v0.15.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
-go.opentelemetry.io/proto/otlp v0.16.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
-go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
 go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
-go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
-go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
-go.uber.org/automaxprocs v1.5.1/go.mod h1:BF4eumQw0P9GtnuxxovUd06vwm1o18oMzFtK66vU6XU=
-go.uber.org/goleak v1.0.0/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
 go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
 go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
+go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA=
 go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
-go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=
-go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
 go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
@@ -2907,7 +1886,6 @@ go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=
 go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
-go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI=
 go.uber.org/zap v1.19.1 h1:ue41HOKd1vGURxrmeKIgELGb3jPW9DMUDGtsinblHwI=
 go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI=
 golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -2927,75 +1905,41 @@ golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
-golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
+golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
 golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20220313003712-b769efc7c000/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
-golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
 golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
-golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
-golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g=
-golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
-golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/crypto v0.8.0 h1:pd9TJtTueMTVQXzk8E2XESSMQDj/U7OUu0PqJqPXQjQ=
+golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
 golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
-golang.org/x/exp v0.0.0-20191002040644-a1355ae1e2c3/go.mod h1:NOZ3BPKG0ec/BKJQgnvsSFpcKLM5xXVWnvZS97DWHgE=
 golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
 golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/exp v0.0.0-20220827204233-334a2380cb91/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
-golang.org/x/exp v0.0.0-20230206171751-46f607a40771/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
-golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 h1:k/i9J1pBpvlfR+9QsetwPyERsqu1GIbi967PQMq3Ivc=
-golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w=
-golang.org/x/exp/typeparams v0.0.0-20221208152030-732eee02a75a h1:Jw5wfR+h9mnIYH+OtGT2im5wV1YGGDora5vTv/aa5bE=
-golang.org/x/exp/typeparams v0.0.0-20221208152030-732eee02a75a/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
-golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.0.0-20190910094157-69e4b8554b2a/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.0.0-20200119044424-58c23975cae1/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.0.0-20200430140353-33d19683fad8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.0.0-20200618115811-c13761719519/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.0.0-20201208152932-35266b937fa6/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.0.0-20210216034530-4410531fe030/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.0.0-20210607152325-775e3b0c77b9/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
-golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
-golang.org/x/image v0.0.0-20211028202545-6944b10bf410/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
-golang.org/x/image v0.0.0-20220302094943-723b81ca9867/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -3007,6 +1951,7 @@ golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRu
 golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug=
 golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
 golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
@@ -3019,15 +1964,9 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
-golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
-golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI=
-golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=
-golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -3066,6 +2005,7 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200505041828-1ed23360d12c/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
@@ -3088,16 +2028,17 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b
 golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8=
 golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
 golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20210505024714-0287a6fb4125/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20211008194852-3b03d305991f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20211020060615-d418f374d309/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
@@ -3105,22 +2046,11 @@ golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su
 golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.0.0-20220617184016-355a448f1bc9/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
-golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
-golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
-golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
-golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
-golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
-golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
-golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
-golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM=
+golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190130055435-99b60b757ec1/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -3141,18 +2071,8 @@ golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ
 golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
 golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
 golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
-golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE=
-golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE=
-golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
-golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
-golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
-golang.org/x/oauth2 v0.1.0/go.mod h1:G9FE4dLTsbXUu90h/Pf85g4w1D+SSAgR+q46nJZ8M4A=
-golang.org/x/oauth2 v0.3.0/go.mod h1:rQrIauxkUhJ6CuwEXwymO2/eh4xz2ZWF1nBkcxS+tGk=
-golang.org/x/oauth2 v0.4.0/go.mod h1:RznEsdpjGAINPTOF0UH/t+xJ75L18YO3Ho6Pyn+uRec=
-golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I=
-golang.org/x/oauth2 v0.8.0 h1:6dkIjl3j3LtZ/O3sTgZTMsLKSftL/B8Zgq4huOIIUu8=
-golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE=
+golang.org/x/oauth2 v0.0.0-20220524215830-622c5d57e401 h1:zwrSfklXn0gxyLRX/aR+q6cgHbV/ItVyzbPlbA+dkAw=
+golang.org/x/oauth2 v0.0.0-20220524215830-622c5d57e401/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -3167,11 +2087,8 @@ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI=
-golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -3237,17 +2154,21 @@ golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200409092240-59c9f1ba88fa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200817155316-9781c653f443/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200828194041-157a740278f4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -3266,17 +2187,13 @@ golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210304124612-50617c2ba197/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -3288,68 +2205,43 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210818153620-00dd8d7831e7/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210903071746-97244b99971b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211025112917-711f33c9992c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211031064116-611d5d643895/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220204135822-1c1b9b1eba6a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220405210540-1e041c57c461/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220825204002-c680a09ffe64/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
 golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
-golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
-golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
-golang.org/x/term v0.8.0 h1:n5xxQn2i3PC0yLAbjTpNT85q/Kgzcr2gIoX9OrJUols=
-golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
+golang.org/x/term v0.7.0 h1:BEvjmm5fURWqcfbSKTdpkDXYBrUS1c0m8agp14W48vQ=
+golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY=
 golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -3360,12 +2252,7 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
-golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -3374,22 +2261,15 @@ golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxb
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20220411224347-583f2d630306 h1:+gHMid33q6pen7kv9xvT+JRinntgeXO2AeZVd0AWD3w=
 golang.org/x/time v0.0.0-20220411224347-583f2d630306/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20220922220347-f3bd1da661af/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.1.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
-golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
@@ -3415,12 +2295,10 @@ golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20190927191325-030b2cf1153e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
@@ -3440,6 +2318,8 @@ golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapK
 golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
 golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
 golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
+golang.org/x/tools v0.0.0-20200409170454-77362c5149f0/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200416214402-fc959738d646/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
@@ -3453,31 +2333,22 @@ golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc
 golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
 golang.org/x/tools v0.0.0-20200916195026-c9a70fc28ce3/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
 golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210101214203-2dba1e4ea05c/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
-golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
 golang.org/x/tools v0.1.11/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA=
-golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k=
-golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ=
-golang.org/x/tools v0.5.0/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k=
+golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4=
-golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -3485,19 +2356,8 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df h1:5Pf6pFKu98ODmgnpvkJ3kFUOQGGLIzLIkbzUHp47618=
 golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
-golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
-golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk=
-golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
-gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo=
-gonum.org/v1/gonum v0.8.2/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0=
-gonum.org/v1/gonum v0.9.3/go.mod h1:TZumC3NeyVQskjXqmyWt4S3bINhy7B4eYwW69EbyX+0=
-gonum.org/v1/gonum v0.11.0 h1:f1IJhK4Km5tBJmaiJXtk/PkL4cdVX6J+tGiM187uT5E=
-gonum.org/v1/gonum v0.11.0/go.mod h1:fSG4YDCxxUZQJ7rKsQrj0gMOg00Il0Z96/qMA4bVQhA=
-gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=
-gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc=
-gonum.org/v1/plot v0.9.0/go.mod h1:3Pcqqmp6RHvJI72kgb8fThyUnav364FOsdDo2aGW5lY=
-gonum.org/v1/plot v0.10.1/go.mod h1:VZW5OlhkL1mysU9vaqNHnsy86inf6Ot+jB3r+BczCEo=
 google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
 google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
 google.golang.org/api v0.5.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
@@ -3511,11 +2371,13 @@ google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/
 google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
 google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
 google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.21.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
 google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
 google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
 google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
 google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
 google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
+google.golang.org/api v0.32.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
 google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
 google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE=
 google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8=
@@ -3536,27 +2398,9 @@ google.golang.org/api v0.70.0/go.mod h1:Bs4ZM2HGifEvXwd50TtW70ovgJffJYw2oRCOFU/S
 google.golang.org/api v0.71.0/go.mod h1:4PyU6e6JogV1f9eA4voyrTY2batOLdgZ5qZ5HOCc4j8=
 google.golang.org/api v0.74.0/go.mod h1:ZpfMZOVRMywNyvJFeqL9HRWBgAuRfSjJFpe9QtRRyDs=
 google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA=
-google.golang.org/api v0.77.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA=
 google.golang.org/api v0.78.0/go.mod h1:1Sg78yoMLOhlQTeF+ARBoytAcH1NNyyl390YMy6rKmw=
-google.golang.org/api v0.80.0/go.mod h1:xY3nI94gbvBrE0J6NHXhxOmW97HG7Khjkku6AFB3Hyg=
-google.golang.org/api v0.84.0/go.mod h1:NTsGnUFJMYROtiquksZHBWtHfeMC7iYthki7Eq3pa8o=
-google.golang.org/api v0.85.0/go.mod h1:AqZf8Ep9uZ2pyTvgL+x0D3Zt0eoT9b5E8fmzfu6FO2g=
-google.golang.org/api v0.90.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw=
-google.golang.org/api v0.93.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw=
-google.golang.org/api v0.95.0/go.mod h1:eADj+UBuxkh5zlrSntJghuNeg8HwQ1w5lTKkuqaETEI=
-google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s=
-google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s=
-google.golang.org/api v0.98.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
-google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
-google.golang.org/api v0.102.0/go.mod h1:3VFl6/fzoA+qNuS1N1/VfXY4LjoXN/wzeIp7TweWwGo=
-google.golang.org/api v0.103.0/go.mod h1:hGtW6nK1AC+d9si/UBhw8Xli+QMOf6xyNAyJw4qU9w0=
-google.golang.org/api v0.106.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/O9MY=
-google.golang.org/api v0.107.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/O9MY=
-google.golang.org/api v0.108.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/O9MY=
-google.golang.org/api v0.110.0/go.mod h1:7FC4Vvx1Mooxh8C5HWjzZHcavuS2f6pmJpZx60ca7iI=
-google.golang.org/api v0.124.0 h1:dP6Ef1VgOGqQ8eiv4GiY8RhmeyqzovcXBYPDUYG8Syo=
-google.golang.org/api v0.124.0/go.mod h1:xu2HQurE5gi/3t1aFCvhPD781p0a3p11sdunTJ2BlP4=
+google.golang.org/api v0.83.0 h1:pMvST+6v+46Gabac4zlJlalxZjCeRcepwg2EdBU+nCc=
+google.golang.org/api v0.83.0/go.mod h1:CNywQoj/AfhTw26ZWAa6LwOv+6WFxHmeLPZq2uncLZk=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -3591,7 +2435,8 @@ google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfG
 google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200409111301-baae70f3302d/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200416231807-8751e049a2a0/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
@@ -3609,13 +2454,10 @@ google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a/go.mod h1:FWY/as6D
 google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210329143202-679c6ae281ee/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A=
 google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A=
 google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A=
 google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
@@ -3638,7 +2480,6 @@ google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ6
 google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
 google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
 google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
 google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
 google.golang.org/genproto v0.0.0-20220207164111-0872dc986b00/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
 google.golang.org/genproto v0.0.0-20220218161850-94dd64e39d7c/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
@@ -3646,63 +2487,14 @@ google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf/go.mod h1:kGP+zUP2
 google.golang.org/genproto v0.0.0-20220304144024-325a89244dc8/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
 google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
 google.golang.org/genproto v0.0.0-20220324131243-acbaeb5b85eb/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E=
-google.golang.org/genproto v0.0.0-20220329172620-7be39ac1afc7/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
 google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
 google.golang.org/genproto v0.0.0-20220413183235-5e96e2839df9/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
 google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
 google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
 google.golang.org/genproto v0.0.0-20220429170224-98d788798c3e/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
-google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4=
 google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4=
-google.golang.org/genproto v0.0.0-20220518221133-4f43b3371335/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4=
-google.golang.org/genproto v0.0.0-20220523171625-347a074981d8/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4=
-google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
-google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
-google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
-google.golang.org/genproto v0.0.0-20220624142145-8cd45d7dbd1f/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
-google.golang.org/genproto v0.0.0-20220628213854-d9e0b6570c03/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
-google.golang.org/genproto v0.0.0-20220722212130-b98a9ff5e252/go.mod h1:GkXuJDJ6aQ7lnJcRF+SJVgFdQhypqgl3LB1C9vabdRE=
-google.golang.org/genproto v0.0.0-20220801145646-83ce21fca29f/go.mod h1:iHe1svFLAZg9VWz891+QbRMwUv9O/1Ww+/mngYeThbc=
-google.golang.org/genproto v0.0.0-20220815135757-37a418bb8959/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk=
-google.golang.org/genproto v0.0.0-20220817144833-d7fd3f11b9b1/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk=
-google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk=
-google.golang.org/genproto v0.0.0-20220829144015-23454907ede3/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk=
-google.golang.org/genproto v0.0.0-20220829175752-36a9c930ecbf/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk=
-google.golang.org/genproto v0.0.0-20220913154956-18f8339a66a5/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo=
-google.golang.org/genproto v0.0.0-20220914142337-ca0e39ece12f/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo=
-google.golang.org/genproto v0.0.0-20220915135415-7fd63a7952de/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo=
-google.golang.org/genproto v0.0.0-20220916172020-2692e8806bfa/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo=
-google.golang.org/genproto v0.0.0-20220919141832-68c03719ef51/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo=
-google.golang.org/genproto v0.0.0-20220920201722-2b89144ce006/go.mod h1:ht8XFiar2npT/g4vkk7O0WYS1sHOHbdujxbEp7CJWbw=
-google.golang.org/genproto v0.0.0-20220926165614-551eb538f295/go.mod h1:woMGP53BroOrRY3xTxlbr8Y3eB/nzAvvFM83q7kG2OI=
-google.golang.org/genproto v0.0.0-20220926220553-6981cbe3cfce/go.mod h1:woMGP53BroOrRY3xTxlbr8Y3eB/nzAvvFM83q7kG2OI=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
-google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM=
-google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM=
-google.golang.org/genproto v0.0.0-20221024153911-1573dae28c9c/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s=
-google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s=
-google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
-google.golang.org/genproto v0.0.0-20221109142239-94d6d90a7d66/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg=
-google.golang.org/genproto v0.0.0-20221114212237-e4508ebdbee1/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg=
-google.golang.org/genproto v0.0.0-20221117204609-8f9c96812029/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg=
-google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg=
-google.golang.org/genproto v0.0.0-20221201164419-0e50fba7f41c/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg=
-google.golang.org/genproto v0.0.0-20221201204527-e3fa12d562f3/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg=
-google.golang.org/genproto v0.0.0-20221202195650-67e5cbc046fd/go.mod h1:cTsE614GARnxrLsqKREzmNYJACSWWpAWdNMwnD7c2BE=
-google.golang.org/genproto v0.0.0-20221227171554-f9683d7f8bef/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
-google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
-google.golang.org/genproto v0.0.0-20230112194545-e10362b5ecf9/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
-google.golang.org/genproto v0.0.0-20230113154510-dbe35b8444a5/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
-google.golang.org/genproto v0.0.0-20230123190316-2c411cf9d197/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
-google.golang.org/genproto v0.0.0-20230124163310-31e0e69b6fc2/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
-google.golang.org/genproto v0.0.0-20230125152338-dcaf20b6aeaa/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
-google.golang.org/genproto v0.0.0-20230127162408-596548ed4efa/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
-google.golang.org/genproto v0.0.0-20230209215440-0dfe4f8abfcc/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
-google.golang.org/genproto v0.0.0-20230216225411-c8e22ba71e44/go.mod h1:8B0gmkoRebU8ukX6HP+4wrVQUY1+6PkQ44BSyIlflHA=
-google.golang.org/genproto v0.0.0-20230222225845-10f96fb3dbec/go.mod h1:3Dl5ZL0q0isWJt+FVcfpQyirqemEuLAK/iFvg1UP1Hw=
-google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s=
-google.golang.org/genproto v0.0.0-20230525154841-bd750badd5c6 h1:62QuyPXKEkZpjZesyj5K5jABl6MnSnWl+vNuT5oz90E=
-google.golang.org/genproto v0.0.0-20230525154841-bd750badd5c6/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU=
+google.golang.org/genproto v0.0.0-20220602131408-e326c6e8e9c8 h1:qRu95HZ148xXw+XeZ3dvqe85PxH4X8+jIo0iRPKcEnM=
+google.golang.org/genproto v0.0.0-20220602131408-e326c6e8e9c8/go.mod h1:yKyY4AMRwFiC8yMMNaMi+RkCnjZJt9LoWuvhXjMs+To=
 google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
@@ -3718,6 +2510,7 @@ google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
+google.golang.org/grpc v1.28.1/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
 google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
 google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
@@ -3736,21 +2529,12 @@ google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnD
 google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
 google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
 google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k=
-google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
-google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
 google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
 google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ=
 google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
 google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
+google.golang.org/grpc v1.47.0 h1:9n77onPX5F3qfFCqjy9dhn8PbNQsIKeVU04J9G7umt8=
 google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
-google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
-google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
-google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
-google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
-google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsAIPww=
-google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw=
-google.golang.org/grpc v1.55.0 h1:3Oj82/tFSCeUrRTg/5E/7d/W5A1tj6Ky1ABAuZuv5ag=
-google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8=
 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0 h1:M1YKkFIboKNieVO5DLUEVzQfGwJD30Nv2jfUgzb5UcE=
 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
@@ -3767,9 +2551,8 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
 google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
-google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -3777,21 +2560,24 @@ gopkg.in/check.v1 v1.0.0-20141024133853-64131543e789/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
+gopkg.in/errgo.v2 v2.1.0 h1:0vLT13EuvQ0hNvakwLuFZ/jYrLp5F3kcWHXdRggjCE8=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo=
 gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s=
 gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
-gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/ini.v1 v1.66.2 h1:XfR1dOYubytKy4Shzc2LHrrGhU0lDCfDGG1yLPmpgsI=
 gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/jcmturner/goidentity.v3 v3.0.0 h1:1duIyWiTaYvVx3YX2CYtpJbUFd7/UuPYCfgXtQ3VTbI=
 gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod h1:oG2kH0IvSYNIu80dVAyu/yoefjq1mNfM5bm88whjWx4=
+gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce h1:xcEWjVhvbDy+nHP67nPDDpbYrY+ILlfndk4bRioVHaU=
+gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
 gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
 gopkg.in/ory-am/dockertest.v3 v3.3.4 h1:oen8RiwxVNxtQ1pRoV4e4jqh6UjNsOuIZ1NXns6jdcw=
 gopkg.in/ory-am/dockertest.v3 v3.3.4/go.mod h1:s9mmoLkaGeAh97qygnNj4xWkiN7e1SKekYC6CovU+ek=
@@ -3827,9 +2613,8 @@ gotest.tools/gotestsum v1.9.0 h1:Jbo/0k/sIOXIJu51IZxEAt27n77xspFEfL6SqKUR72A=
 gotest.tools/gotestsum v1.9.0/go.mod h1:6JHCiN6TEjA7Kaz23q1bH0e2Dc3YJjDUZ0DmctFZf+w=
 gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
 gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8=
+gotest.tools/v3 v3.3.0 h1:MfDY1b1/0xN1CyMlQDac0ziEy9zJQd9CXBRRDHw2jJo=
 gotest.tools/v3 v3.3.0/go.mod h1:Mcr9QNxkg0uMvy/YElmo4SpXgJKWgQvYrT7Kw5RzJ1A=
-gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o=
-gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
@@ -3837,59 +2622,39 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las=
-honnef.co/go/tools v0.4.3 h1:o/n5/K5gXqk8Gozvs2cnL0F2S1/g1vcGCAx2vETjITw=
-honnef.co/go/tools v0.4.3/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA=
 k8s.io/api v0.18.2/go.mod h1:SJCWI7OLzhZSvbY7U8zwNl9UA4o1fizoug34OV/2r78=
 k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo=
 k8s.io/api v0.20.4/go.mod h1:++lNL1AJMkDymriNniQsWRkMDzRaX2Y/POTUi8yvqYQ=
 k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8=
-k8s.io/api v0.22.5/go.mod h1:mEhXyLaSD1qTOf40rRiKXkc+2iCem09rWLlFwhCEiAs=
-k8s.io/api v0.26.2/go.mod h1:1kjMQsFE+QHPfskEcVNgL3+Hp88B80uj0QtSOlj8itU=
-k8s.io/api v0.27.2 h1:+H17AJpUMvl+clT+BPnKf0E3ksMAzoBBg7CntpSuADo=
-k8s.io/api v0.27.2/go.mod h1:ENmbocXfBT2ADujUXcBhHV55RIT31IIEvkntP6vZKS4=
+k8s.io/api v0.22.2 h1:M8ZzAD0V6725Fjg53fKeTJxGsJvRbk4TEm/fexHMtfw=
+k8s.io/api v0.22.2/go.mod h1:y3ydYpLJAaDI+BbSe2xmGcqxiWHmWjkEeIbiwHvnPR8=
 k8s.io/apimachinery v0.18.2/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA=
 k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
 k8s.io/apimachinery v0.20.4/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
 k8s.io/apimachinery v0.20.6/go.mod h1:ejZXtW1Ra6V1O5H8xPBGz+T3+4gfkTCeExAHKU57MAc=
-k8s.io/apimachinery v0.22.1/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ0=
-k8s.io/apimachinery v0.22.5/go.mod h1:xziclGKwuuJ2RM5/rSFQSYAj0zdbci3DH8kj+WvyN0U=
-k8s.io/apimachinery v0.25.0/go.mod h1:qMx9eAk0sZQGsXGu86fab8tZdffHbwUfsvzqKn4mfB0=
-k8s.io/apimachinery v0.26.2/go.mod h1:ats7nN1LExKHvJ9TmwootT00Yz05MuYqPXEXaVeOy5I=
-k8s.io/apimachinery v0.27.2 h1:vBjGaKKieaIreI+oQwELalVG4d8f3YAMNpWLzDXkxeg=
-k8s.io/apimachinery v0.27.2/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E=
+k8s.io/apimachinery v0.22.2 h1:ejz6y/zNma8clPVfNDLnPbleBo6MpoFy/HBiBqCouVk=
+k8s.io/apimachinery v0.22.2/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ0=
 k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU=
 k8s.io/apiserver v0.20.4/go.mod h1:Mc80thBKOyy7tbvFtB4kJv1kbdD0eIH8k8vianJcbFM=
 k8s.io/apiserver v0.20.6/go.mod h1:QIJXNt6i6JB+0YQRNcS0hdRHJlMhflFmsBDeSgT1r8Q=
-k8s.io/apiserver v0.22.5/go.mod h1:s2WbtgZAkTKt679sYtSudEQrTGWUSQAPe6MupLnlmaQ=
-k8s.io/apiserver v0.26.2/go.mod h1:GHcozwXgXsPuOJ28EnQ/jXEM9QeG6HT22YxSNmpYNh8=
 k8s.io/client-go v0.18.2/go.mod h1:Xcm5wVGXX9HAA2JJ2sSBUn3tCJ+4SVlCbl2MNNv+CIU=
 k8s.io/client-go v0.20.1/go.mod h1:/zcHdt1TeWSd5HoUe6elJmHSQ6uLLgp4bIJHVEuy+/Y=
 k8s.io/client-go v0.20.4/go.mod h1:LiMv25ND1gLUdBeYxBIwKpkSC5IsozMMmOOeSJboP+k=
 k8s.io/client-go v0.20.6/go.mod h1:nNQMnOvEUEsOzRRFIIkdmYOjAZrC8bgq0ExboWSU1I0=
-k8s.io/client-go v0.22.5/go.mod h1:cs6yf/61q2T1SdQL5Rdcjg9J1ElXSwbjSrW2vFImM4Y=
-k8s.io/client-go v0.26.2/go.mod h1:u5EjOuSyBa09yqqyY7m3abZeovO/7D/WehVVlZ2qcqU=
-k8s.io/client-go v0.27.2 h1:vDLSeuYvCHKeoQRhCXjxXO45nHVv2Ip4Fe0MfioMrhE=
-k8s.io/client-go v0.27.2/go.mod h1:tY0gVmUsHrAmjzHX9zs7eCjxcBsf8IiNe7KQ52biTcQ=
+k8s.io/client-go v0.22.2 h1:DaSQgs02aCC1QcwUdkKZWOeaVsQjYvWv8ZazcZ6JcHc=
+k8s.io/client-go v0.22.2/go.mod h1:sAlhrkVDf50ZHx6z4K0S40wISNTarf1r800F+RlCF6U=
 k8s.io/code-generator v0.19.7/go.mod h1:lwEq3YnLYb/7uVXLorOJfxg+cUu2oihFhHZ0n9NIla0=
 k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeYNLk=
 k8s.io/component-base v0.20.4/go.mod h1:t4p9EdiagbVCJKrQ1RsA5/V4rFQNDfRlevJajlGwgjI=
 k8s.io/component-base v0.20.6/go.mod h1:6f1MPBAeI+mvuts3sIdtpjljHWBQ2cIy38oBIWMYnrM=
-k8s.io/component-base v0.22.5/go.mod h1:VK3I+TjuF9eaa+Ln67dKxhGar5ynVbwnGrUiNF4MqCI=
-k8s.io/component-base v0.26.2/go.mod h1:DxbuIe9M3IZPRxPIzhch2m1eT7uFrSBJUBuVCQEBivs=
 k8s.io/cri-api v0.17.3/go.mod h1:X1sbHmuXhwaHs9xxYffLqJogVsnI+f6cPRcgPel7ywM=
 k8s.io/cri-api v0.20.1/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI=
 k8s.io/cri-api v0.20.4/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI=
 k8s.io/cri-api v0.20.6/go.mod h1:ew44AjNXwyn1s0U4xCKGodU7J1HzBeZ1MpGrpa5r8Yc=
-k8s.io/cri-api v0.23.1/go.mod h1:REJE3PSU0h/LOV1APBrupxrEJqnoxZC8KWzkBUHwrK4=
-k8s.io/cri-api v0.25.0/go.mod h1:J1rAyQkSJ2Q6I+aBMOVgg2/cbbebso6FNa0UagiR0kc=
-k8s.io/cri-api v0.25.3/go.mod h1:riC/P0yOGUf2K1735wW+CXs1aY2ctBgePtnnoFLd0dU=
-k8s.io/cri-api v0.26.2/go.mod h1:Oo8O7MKFPNDxfDf2LmrF/3Hf30q1C6iliGuv3la3tIA=
 k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
-k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
 k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
@@ -3897,93 +2662,35 @@ k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
 k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
 k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
 k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
-k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
-k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
-k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
-k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
-k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
-k8s.io/kms v0.26.2/go.mod h1:69qGnf1NsFOQP07fBYqNLZklqEHSJF024JqYCaeVxHg=
+k8s.io/klog/v2 v2.60.1 h1:VW25q3bZx9uE3vvdL6M8ezOX79vA2Aq1nEWLqNQclHc=
+k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
 k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E=
 k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o=
 k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM=
 k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw=
-k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw=
-k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1/go.mod h1:C/N6wCaBHeBHkHUesQOQy2/MZqGgMAFPqGsGQLdbZBU=
-k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4=
-k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5FJ2kxm1WrQFanWchyKuqGg=
-k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f/go.mod h1:byini6yhqGC14c3ebc/QwanvYwhuMWF6yz2F8uwW8eg=
 k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk=
 k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
 k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
-k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
 k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
-k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
-k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
-k8s.io/utils v0.0.0-20221107191617-1a15be271d1d/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5 h1:kmDqav+P+/5e1i9tFfHq1qcF3sOrDp+YEkVDAHu7Jwk=
-k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
+k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 h1:HNSDgDCrr/6Ly3WEGKZftiE7IY19Vz2GdbOCyI4qqhc=
+k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
 layeh.com/radius v0.0.0-20190322222518-890bc1058917 h1:BDXFaFzUt5EIqe/4wrTc4AcYZWP6iC6Ult+jQWLh5eU=
 layeh.com/radius v0.0.0-20190322222518-890bc1058917/go.mod h1:fywZKyu//X7iRzaxLgPWsvc0L26IUpVvE/aeIL2JtIQ=
-lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
-lukechampine.com/uint128 v1.2.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
-modernc.org/cc/v3 v3.36.0/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI=
-modernc.org/cc/v3 v3.36.2/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI=
-modernc.org/cc/v3 v3.36.3/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI=
-modernc.org/ccgo/v3 v3.0.0-20220428102840-41399a37e894/go.mod h1:eI31LL8EwEBKPpNpA4bU1/i+sKOwOrQy8D87zWUcRZc=
-modernc.org/ccgo/v3 v3.0.0-20220430103911-bc99d88307be/go.mod h1:bwdAnOoaIt8Ax9YdWGjxWsdkPcZyRPHqrOvJxaKAKGw=
-modernc.org/ccgo/v3 v3.16.4/go.mod h1:tGtX0gE9Jn7hdZFeU88slbTh1UtCYKusWOoCJuvkWsQ=
-modernc.org/ccgo/v3 v3.16.6/go.mod h1:tGtX0gE9Jn7hdZFeU88slbTh1UtCYKusWOoCJuvkWsQ=
-modernc.org/ccgo/v3 v3.16.8/go.mod h1:zNjwkizS+fIFDrDjIAgBSCLkWbJuHF+ar3QRn+Z9aws=
-modernc.org/ccgo/v3 v3.16.9/go.mod h1:zNMzC9A9xeNUepy6KuZBbugn3c0Mc9TeiJO4lgvkJDo=
-modernc.org/ccorpus v1.11.6/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ=
-modernc.org/httpfs v1.0.6/go.mod h1:7dosgurJGp0sPaRanU53W4xZYKh14wfzX420oZADeHM=
-modernc.org/libc v0.0.0-20220428101251-2d5f3daf273b/go.mod h1:p7Mg4+koNjc8jkqwcoFBJx7tXkpj00G77X7A72jXPXA=
-modernc.org/libc v1.16.0/go.mod h1:N4LD6DBE9cf+Dzf9buBlzVJndKr/iJHG97vGLHYnb5A=
-modernc.org/libc v1.16.1/go.mod h1:JjJE0eu4yeK7tab2n4S1w8tlWd9MxXLRzheaRnAKymU=
-modernc.org/libc v1.16.17/go.mod h1:hYIV5VZczAmGZAnG15Vdngn5HSF5cSkbvfz2B7GRuVU=
-modernc.org/libc v1.16.19/go.mod h1:p7Mg4+koNjc8jkqwcoFBJx7tXkpj00G77X7A72jXPXA=
-modernc.org/libc v1.17.0/go.mod h1:XsgLldpP4aWlPlsjqKRdHPqCxCjISdHfM/yeWC5GyW0=
-modernc.org/libc v1.17.1/go.mod h1:FZ23b+8LjxZs7XtFMbSzL/EhPxNbfZbErxEHc7cbD9s=
-modernc.org/mathutil v1.2.2/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
-modernc.org/mathutil v1.4.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
-modernc.org/mathutil v1.5.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
-modernc.org/memory v1.1.1/go.mod h1:/0wo5ibyrQiaoUoH7f9D8dnglAmILJ5/cxZlRECf+Nw=
-modernc.org/memory v1.2.0/go.mod h1:/0wo5ibyrQiaoUoH7f9D8dnglAmILJ5/cxZlRECf+Nw=
-modernc.org/memory v1.2.1/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU=
-modernc.org/opt v0.1.1/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
-modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
-modernc.org/sqlite v1.18.1/go.mod h1:6ho+Gow7oX5V+OiOQ6Tr4xeqbx13UZ6t+Fw9IRUG4d4=
-modernc.org/strutil v1.1.1/go.mod h1:DE+MQQ/hjKBZS2zNInV5hhcipt5rLPWkmpbGeW5mmdw=
-modernc.org/strutil v1.1.3/go.mod h1:MEHNA7PdEnEwLvspRMtWTNnp2nnyvMfkimT1NKNAGbw=
-modernc.org/tcl v1.13.1/go.mod h1:XOLfOwzhkljL4itZkK6T72ckMgvj0BDsnKNdZVUOecw=
-modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
-modernc.org/z v1.5.1/go.mod h1:eWFB510QWW5Th9YGZT81s+LwvaAs3Q2yr4sP0rmLkv8=
+mvdan.cc/gofumpt v0.1.1 h1:bi/1aS/5W00E2ny5q65w9SnKpWEF/UIOqDYBILpo9rA=
 mvdan.cc/gofumpt v0.1.1/go.mod h1:yXG1r1WqZVKWbVRtBWKWX9+CxGYfA51nSomhM0woR48=
-mvdan.cc/gofumpt v0.3.1 h1:avhhrOmv0IuvQVK7fvwV91oFSGAk5/6Po8GXTzICeu8=
-mvdan.cc/gofumpt v0.3.1/go.mod h1:w3ymliuxvzVx8DAutBnVyDqYb1Niy/yCJt/lk821YCE=
-nhooyr.io/websocket v1.8.7 h1:usjR2uOr/zjjkVMy0lW+PPohFok7PCow5sDjLgX4P4g=
-nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=
-oras.land/oras-go v1.2.0/go.mod h1:pFNs7oHp2dYsYMSS82HaX5l4mpnGO7hbpPN6EWH2ltc=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
-rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
-sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
-sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35/go.mod h1:WxjusMwXlKzfAs4p9km6XJRndVt2FROgMVCE4cdohFo=
-sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
-sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
-sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
 sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw=
 sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw=
 sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
 sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
 sigs.k8s.io/structured-merge-diff/v4 v4.0.3/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
 sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4=
-sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
-sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
+sigs.k8s.io/structured-merge-diff/v4 v4.2.1 h1:bKCqE9GvQ5tiVHn5rfn1r+yao3aLQEaLzkkmAkf+A6Y=
+sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4=
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
+sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
 sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
-sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
-sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
diff --git a/helper/benchhelpers/benchhelpers.go b/helper/benchhelpers/benchhelpers.go
index 06dcde604e618..9c0feac15c83d 100644
--- a/helper/benchhelpers/benchhelpers.go
+++ b/helper/benchhelpers/benchhelpers.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package benchhelpers
 
 import (
diff --git a/helper/builtinplugins/registry.go b/helper/builtinplugins/registry.go
index b4d3da5937f01..9bd5c7c0289c9 100644
--- a/helper/builtinplugins/registry.go
+++ b/helper/builtinplugins/registry.go
@@ -1,11 +1,6 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package builtinplugins
 
 import (
-	"context"
-
 	credAliCloud "github.com/hashicorp/vault-plugin-auth-alicloud"
 	credAzure "github.com/hashicorp/vault-plugin-auth-azure"
 	credCentrify "github.com/hashicorp/vault-plugin-auth-centrify"
@@ -31,6 +26,7 @@ import (
 	logicalMongoAtlas "github.com/hashicorp/vault-plugin-secrets-mongodbatlas"
 	logicalLDAP "github.com/hashicorp/vault-plugin-secrets-openldap"
 	logicalTerraform "github.com/hashicorp/vault-plugin-secrets-terraform"
+	credAppId "github.com/hashicorp/vault/builtin/credential/app-id"
 	credAppRole "github.com/hashicorp/vault/builtin/credential/approle"
 	credAws "github.com/hashicorp/vault/builtin/credential/aws"
 	credCert "github.com/hashicorp/vault/builtin/credential/cert"
@@ -40,9 +36,14 @@ import (
 	credRadius "github.com/hashicorp/vault/builtin/credential/radius"
 	credUserpass "github.com/hashicorp/vault/builtin/credential/userpass"
 	logicalAws "github.com/hashicorp/vault/builtin/logical/aws"
+	logicalCass "github.com/hashicorp/vault/builtin/logical/cassandra"
 	logicalConsul "github.com/hashicorp/vault/builtin/logical/consul"
+	logicalMongo "github.com/hashicorp/vault/builtin/logical/mongodb"
+	logicalMssql "github.com/hashicorp/vault/builtin/logical/mssql"
+	logicalMysql "github.com/hashicorp/vault/builtin/logical/mysql"
 	logicalNomad "github.com/hashicorp/vault/builtin/logical/nomad"
 	logicalPki "github.com/hashicorp/vault/builtin/logical/pki"
+	logicalPostgres "github.com/hashicorp/vault/builtin/logical/postgresql"
 	logicalRabbit "github.com/hashicorp/vault/builtin/logical/rabbitmq"
 	logicalSsh "github.com/hashicorp/vault/builtin/logical/ssh"
 	logicalTotp "github.com/hashicorp/vault/builtin/logical/totp"
@@ -55,7 +56,6 @@ import (
 	dbMysql "github.com/hashicorp/vault/plugins/database/mysql"
 	dbPostgres "github.com/hashicorp/vault/plugins/database/postgresql"
 	dbRedshift "github.com/hashicorp/vault/plugins/database/redshift"
-	"github.com/hashicorp/vault/sdk/framework"
 	"github.com/hashicorp/vault/sdk/helper/consts"
 	"github.com/hashicorp/vault/sdk/logical"
 )
@@ -86,23 +86,13 @@ type logicalBackend struct {
 	consts.DeprecationStatus
 }
 
-type removedBackend struct {
-	*framework.Backend
-}
-
-func removedFactory(ctx context.Context, config *logical.BackendConfig) (logical.Backend, error) {
-	removedBackend := &removedBackend{}
-	removedBackend.Backend = &framework.Backend{}
-	return removedBackend, nil
-}
-
 func newRegistry() *registry {
 	reg := &registry{
 		credentialBackends: map[string]credentialBackend{
 			"alicloud": {Factory: credAliCloud.Factory},
 			"app-id": {
-				Factory:           removedFactory,
-				DeprecationStatus: consts.Removed,
+				Factory:           credAppId.Factory,
+				DeprecationStatus: consts.PendingRemoval,
 			},
 			"approle":    {Factory: credAppRole.Factory},
 			"aws":        {Factory: credAws.Factory},
@@ -149,16 +139,13 @@ func newRegistry() *registry {
 			"snowflake-database-plugin":         {Factory: dbSnowflake.New},
 		},
 		logicalBackends: map[string]logicalBackend{
-			"ad": {
-				Factory:           logicalAd.Factory,
-				DeprecationStatus: consts.Deprecated,
-			},
+			"ad":       {Factory: logicalAd.Factory},
 			"alicloud": {Factory: logicalAlicloud.Factory},
 			"aws":      {Factory: logicalAws.Factory},
 			"azure":    {Factory: logicalAzure.Factory},
 			"cassandra": {
-				Factory:           removedFactory,
-				DeprecationStatus: consts.Removed,
+				Factory:           logicalCass.Factory,
+				DeprecationStatus: consts.PendingRemoval,
 			},
 			"consul":     {Factory: logicalConsul.Factory},
 			"gcp":        {Factory: logicalGcp.Factory},
@@ -166,27 +153,25 @@ func newRegistry() *registry {
 			"kubernetes": {Factory: logicalKube.Factory},
 			"kv":         {Factory: logicalKv.Factory},
 			"mongodb": {
-				Factory:           removedFactory,
-				DeprecationStatus: consts.Removed,
+				Factory:           logicalMongo.Factory,
+				DeprecationStatus: consts.PendingRemoval,
 			},
-			// The mongodbatlas secrets engine is not the same as the database plugin equivalent
-			// (`mongodbatlas-database-plugin`), and thus will not be deprecated at this time.
 			"mongodbatlas": {Factory: logicalMongoAtlas.Factory},
 			"mssql": {
-				Factory:           removedFactory,
-				DeprecationStatus: consts.Removed,
+				Factory:           logicalMssql.Factory,
+				DeprecationStatus: consts.PendingRemoval,
 			},
 			"mysql": {
-				Factory:           removedFactory,
-				DeprecationStatus: consts.Removed,
+				Factory:           logicalMysql.Factory,
+				DeprecationStatus: consts.PendingRemoval,
 			},
 			"nomad":    {Factory: logicalNomad.Factory},
 			"openldap": {Factory: logicalLDAP.Factory},
 			"ldap":     {Factory: logicalLDAP.Factory},
 			"pki":      {Factory: logicalPki.Factory},
 			"postgresql": {
-				Factory:           removedFactory,
-				DeprecationStatus: consts.Removed,
+				Factory:           logicalPostgres.Factory,
+				DeprecationStatus: consts.PendingRemoval,
 			},
 			"rabbitmq":  {Factory: logicalRabbit.Factory},
 			"ssh":       {Factory: logicalSsh.Factory},
@@ -237,16 +222,16 @@ func (r *registry) Keys(pluginType consts.PluginType) []string {
 	var keys []string
 	switch pluginType {
 	case consts.PluginTypeDatabase:
-		for key, backend := range r.databasePlugins {
-			keys = appendIfNotRemoved(keys, key, backend.DeprecationStatus)
+		for key := range r.databasePlugins {
+			keys = append(keys, key)
 		}
 	case consts.PluginTypeCredential:
-		for key, backend := range r.credentialBackends {
-			keys = appendIfNotRemoved(keys, key, backend.DeprecationStatus)
+		for key := range r.credentialBackends {
+			keys = append(keys, key)
 		}
 	case consts.PluginTypeSecrets:
-		for key, backend := range r.logicalBackends {
-			keys = appendIfNotRemoved(keys, key, backend.DeprecationStatus)
+		for key := range r.logicalBackends {
+			keys = append(keys, key)
 		}
 	}
 	return keys
@@ -288,10 +273,3 @@ func toFunc(ifc interface{}) func() (interface{}, error) {
 		return ifc, nil
 	}
 }
-
-func appendIfNotRemoved(keys []string, name string, status consts.DeprecationStatus) []string {
-	if status != consts.Removed {
-		return append(keys, name)
-	}
-	return keys
-}
diff --git a/helper/builtinplugins/registry_test.go b/helper/builtinplugins/registry_test.go
index cfaec51814477..5e63ba3e701f3 100644
--- a/helper/builtinplugins/registry_test.go
+++ b/helper/builtinplugins/registry_test.go
@@ -1,21 +1,12 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package builtinplugins
 
 import (
-	"bufio"
-	"fmt"
-	"os"
 	"reflect"
-	"regexp"
 	"testing"
 
-	credUserpass "github.com/hashicorp/vault/builtin/credential/userpass"
+	credAppId "github.com/hashicorp/vault/builtin/credential/app-id"
 	dbMysql "github.com/hashicorp/vault/plugins/database/mysql"
 	"github.com/hashicorp/vault/sdk/helper/consts"
-
-	"golang.org/x/exp/slices"
 )
 
 // Test_RegistryGet exercises the (registry).Get functionality by comparing
@@ -44,16 +35,9 @@ func Test_RegistryGet(t *testing.T) {
 		},
 		{
 			name:       "known builtin lookup",
-			builtin:    "userpass",
-			pluginType: consts.PluginTypeCredential,
-			want:       toFunc(credUserpass.Factory),
-			wantOk:     true,
-		},
-		{
-			name:       "removed builtin lookup",
 			builtin:    "app-id",
 			pluginType: consts.PluginTypeCredential,
-			want:       nil,
+			want:       toFunc(credAppId.Factory),
 			wantOk:     true,
 		},
 		{
@@ -97,7 +81,7 @@ func Test_RegistryKeyCounts(t *testing.T) {
 		{
 			name:       "number of auth plugins",
 			pluginType: consts.PluginTypeCredential,
-			want:       19,
+			want:       20,
 		},
 		{
 			name:       "number of database plugins",
@@ -107,7 +91,7 @@ func Test_RegistryKeyCounts(t *testing.T) {
 		{
 			name:       "number of secrets plugins",
 			pluginType: consts.PluginTypeSecrets,
-			want:       19,
+			want:       24,
 		},
 	}
 	for _, tt := range tests {
@@ -142,15 +126,9 @@ func Test_RegistryContains(t *testing.T) {
 		},
 		{
 			name:       "known builtin lookup",
-			builtin:    "approle",
-			pluginType: consts.PluginTypeCredential,
-			want:       true,
-		},
-		{
-			name:       "removed builtin lookup",
 			builtin:    "app-id",
 			pluginType: consts.PluginTypeCredential,
-			want:       false,
+			want:       true,
 		},
 	}
 	for _, tt := range tests {
@@ -208,10 +186,10 @@ func Test_RegistryStatus(t *testing.T) {
 			wantOk:     true,
 		},
 		{
-			name:       "removed builtin lookup",
+			name:       "pending removal builtin lookup",
 			builtin:    "app-id",
 			pluginType: consts.PluginTypeCredential,
-			want:       consts.Removed,
+			want:       consts.PendingRemoval,
 			wantOk:     true,
 		},
 	}
@@ -227,108 +205,3 @@ func Test_RegistryStatus(t *testing.T) {
 		})
 	}
 }
-
-// Test_RegistryMatchesGenOpenapi ensures that the plugins mounted in gen_openapi.sh match registry.go
-func Test_RegistryMatchesGenOpenapi(t *testing.T) {
-	const scriptPath = "../../scripts/gen_openapi.sh"
-
-	// parseScript fetches the contents of gen_openapi.sh script & extract the relevant lines
-	parseScript := func(path string) ([]string, []string, error) {
-		f, err := os.Open(scriptPath)
-		if err != nil {
-			return nil, nil, fmt.Errorf("could not open gen_openapi.sh script: %w", err)
-		}
-		defer f.Close()
-
-		var (
-			credentialBackends   []string
-			credentialBackendsRe = regexp.MustCompile(`^vault auth enable (?:"([a-zA-Z]+)"|([a-zA-Z]+))$`)
-
-			secretsBackends   []string
-			secretsBackendsRe = regexp.MustCompile(`^vault secrets enable (?:"([a-zA-Z]+)"|([a-zA-Z]+))$`)
-		)
-
-		scanner := bufio.NewScanner(f)
-
-		for scanner.Scan() {
-			line := scanner.Text()
-
-			if m := credentialBackendsRe.FindStringSubmatch(line); m != nil {
-				credentialBackends = append(credentialBackends, m[1])
-			}
-			if m := secretsBackendsRe.FindStringSubmatch(line); m != nil {
-				secretsBackends = append(secretsBackends, m[1])
-			}
-		}
-
-		if err := scanner.Err(); err != nil {
-			return nil, nil, fmt.Errorf("error scanning gen_openapi.sh: %v", err)
-		}
-
-		return credentialBackends, secretsBackends, nil
-	}
-
-	// ensureInRegistry ensures that the given plugin is in registry and marked as "supported"
-	ensureInRegistry := func(t *testing.T, name string, pluginType consts.PluginType) {
-		t.Helper()
-
-		// "database" will not be present in registry, it is represented as
-		// a list of database plugins instead
-		if name == "database" && pluginType == consts.PluginTypeSecrets {
-			return
-		}
-
-		deprecationStatus, ok := Registry.DeprecationStatus(name, pluginType)
-		if !ok {
-			t.Fatalf("%q %s backend is missing from registry.go; please remove it from gen_openapi.sh", name, pluginType)
-		}
-
-		if deprecationStatus == consts.Removed {
-			t.Fatalf("%q %s backend is marked 'removed' in registry.go; please remove it from gen_openapi.sh", name, pluginType)
-		}
-	}
-
-	// ensureInScript ensures that the given plugin name in in gen_openapi.sh script
-	ensureInScript := func(t *testing.T, scriptBackends []string, name string) {
-		t.Helper()
-
-		for _, excluded := range []string{
-			"oidc",     // alias for "jwt"
-			"openldap", // alias for "ldap"
-		} {
-			if name == excluded {
-				return
-			}
-		}
-
-		if !slices.Contains(scriptBackends, name) {
-			t.Fatalf("%q backend could not be found in gen_openapi.sh, please add it there", name)
-		}
-	}
-
-	// test starts here
-	scriptCredentialBackends, scriptSecretsBackends, err := parseScript(scriptPath)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	for _, name := range scriptCredentialBackends {
-		ensureInRegistry(t, name, consts.PluginTypeCredential)
-	}
-
-	for _, name := range scriptSecretsBackends {
-		ensureInRegistry(t, name, consts.PluginTypeSecrets)
-	}
-
-	for name, backend := range Registry.credentialBackends {
-		if backend.DeprecationStatus == consts.Supported {
-			ensureInScript(t, scriptCredentialBackends, name)
-		}
-	}
-
-	for name, backend := range Registry.logicalBackends {
-		if backend.DeprecationStatus == consts.Supported {
-			ensureInScript(t, scriptSecretsBackends, name)
-		}
-	}
-}
diff --git a/helper/constants/constants_oss.go b/helper/constants/constants_oss.go
index 8675f7030658a..22b9928fd3c41 100644
--- a/helper/constants/constants_oss.go
+++ b/helper/constants/constants_oss.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !enterprise
 
 package constants
diff --git a/helper/constants/fips.go b/helper/constants/fips.go
index 9632d014a5496..2a9f7ee7aae6b 100644
--- a/helper/constants/fips.go
+++ b/helper/constants/fips.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !fips
 
 package constants
diff --git a/helper/constants/fips_build_check.go b/helper/constants/fips_build_check.go
index 10e07e583f98e..1e865b499f62e 100644
--- a/helper/constants/fips_build_check.go
+++ b/helper/constants/fips_build_check.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build (!fips && (fips_140_2 || fips_140_3)) || (fips && !fips_140_2 && !fips_140_3) || (fips_140_2 && fips_140_3)
 
 package constants
diff --git a/helper/constants/fips_cgo_check.go b/helper/constants/fips_cgo_check.go
index 6de7d9f0d0315..56eabb6c81e5f 100644
--- a/helper/constants/fips_cgo_check.go
+++ b/helper/constants/fips_cgo_check.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build (fips || fips_140_2 || fips_140_3) && !cgo
 
 package constants
diff --git a/helper/dhutil/dhutil.go b/helper/dhutil/dhutil.go
index 97552d4cc4c69..a0ddde25bd43a 100644
--- a/helper/dhutil/dhutil.go
+++ b/helper/dhutil/dhutil.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package dhutil
 
 import (
diff --git a/helper/dhutil/dhutil_test.go b/helper/dhutil/dhutil_test.go
index 4b94f601d92d6..46e90196d15e7 100644
--- a/helper/dhutil/dhutil_test.go
+++ b/helper/dhutil/dhutil_test.go
@@ -1,4 +1 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package dhutil
diff --git a/helper/experiments/experiments.go b/helper/experiments/experiments.go
deleted file mode 100644
index 538430e64cccf..0000000000000
--- a/helper/experiments/experiments.go
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package experiments
-
-const VaultExperimentEventsAlpha1 = "events.alpha1"
-
-var validExperiments = []string{
-	VaultExperimentEventsAlpha1,
-}
-
-// ValidExperiments exposes the list without exposing a mutable global variable.
-// Experiments can only be enabled when starting a server, and will typically
-// enable pre-GA API functionality.
-func ValidExperiments() []string {
-	result := make([]string, len(validExperiments))
-	copy(result, validExperiments)
-	return result
-}
diff --git a/helper/fairshare/fairshare_testing_util.go b/helper/fairshare/fairshare_testing_util.go
index 8061795947d82..1f65acd94d903 100644
--- a/helper/fairshare/fairshare_testing_util.go
+++ b/helper/fairshare/fairshare_testing_util.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package fairshare
 
 import (
diff --git a/helper/fairshare/jobmanager.go b/helper/fairshare/jobmanager.go
index dc9a6198af256..75c7662fc7656 100644
--- a/helper/fairshare/jobmanager.go
+++ b/helper/fairshare/jobmanager.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package fairshare
 
 import (
diff --git a/helper/fairshare/jobmanager_test.go b/helper/fairshare/jobmanager_test.go
index 3d6638a4a766f..d90314782294e 100644
--- a/helper/fairshare/jobmanager_test.go
+++ b/helper/fairshare/jobmanager_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package fairshare
 
 import (
diff --git a/helper/fairshare/workerpool.go b/helper/fairshare/workerpool.go
index e655a9084dd6c..f5179ba4e408c 100644
--- a/helper/fairshare/workerpool.go
+++ b/helper/fairshare/workerpool.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package fairshare
 
 import (
diff --git a/helper/fairshare/workerpool_test.go b/helper/fairshare/workerpool_test.go
index eb563140374b2..a3c3f68a1e3fe 100644
--- a/helper/fairshare/workerpool_test.go
+++ b/helper/fairshare/workerpool_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package fairshare
 
 import (
diff --git a/helper/flag-kv/flag.go b/helper/flag-kv/flag.go
index a3b04cec11ae6..06ae27111a8a1 100644
--- a/helper/flag-kv/flag.go
+++ b/helper/flag-kv/flag.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package kvFlag
 
 import (
diff --git a/helper/flag-kv/flag_test.go b/helper/flag-kv/flag_test.go
index b083d52e74e35..2fc88aa5f3ed7 100644
--- a/helper/flag-kv/flag_test.go
+++ b/helper/flag-kv/flag_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package kvFlag
 
 import (
diff --git a/helper/flag-slice/flag.go b/helper/flag-slice/flag.go
index b8234385ef03c..da75149dc488e 100644
--- a/helper/flag-slice/flag.go
+++ b/helper/flag-slice/flag.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package sliceflag
 
 import "strings"
diff --git a/helper/flag-slice/flag_test.go b/helper/flag-slice/flag_test.go
index 7973d57926a21..f72e1d9605d66 100644
--- a/helper/flag-slice/flag_test.go
+++ b/helper/flag-slice/flag_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package sliceflag
 
 import (
diff --git a/helper/forwarding/types.pb.go b/helper/forwarding/types.pb.go
index bf579d0382c2c..c610a3e3e4023 100644
--- a/helper/forwarding/types.pb.go
+++ b/helper/forwarding/types.pb.go
@@ -1,10 +1,7 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc        v3.21.5
 // source: helper/forwarding/types.proto
 
 package forwarding
diff --git a/helper/forwarding/types.proto b/helper/forwarding/types.proto
index 7624257919dea..8f1376a180044 100644
--- a/helper/forwarding/types.proto
+++ b/helper/forwarding/types.proto
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 syntax = "proto3";
 
 option go_package = "github.com/hashicorp/vault/helper/forwarding";
diff --git a/helper/forwarding/util.go b/helper/forwarding/util.go
index 8361235432221..de92639afbee1 100644
--- a/helper/forwarding/util.go
+++ b/helper/forwarding/util.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package forwarding
 
 import (
diff --git a/helper/forwarding/util_test.go b/helper/forwarding/util_test.go
index 192646a15f4d2..0af2b89e989b2 100644
--- a/helper/forwarding/util_test.go
+++ b/helper/forwarding/util_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package forwarding
 
 import (
diff --git a/helper/hostutil/hostinfo.go b/helper/hostutil/hostinfo.go
index 25c11e0b0753b..d35afb57d900a 100644
--- a/helper/hostutil/hostinfo.go
+++ b/helper/hostutil/hostinfo.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !openbsd
 
 package hostutil
diff --git a/helper/hostutil/hostinfo_error.go b/helper/hostutil/hostinfo_error.go
index afbec28fa262d..ca5d8a2941c03 100644
--- a/helper/hostutil/hostinfo_error.go
+++ b/helper/hostutil/hostinfo_error.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package hostutil
 
 import "fmt"
diff --git a/helper/hostutil/hostinfo_openbsd.go b/helper/hostutil/hostinfo_openbsd.go
index dbe1655e90dc8..8f01458afe1ae 100644
--- a/helper/hostutil/hostinfo_openbsd.go
+++ b/helper/hostutil/hostinfo_openbsd.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build openbsd
 
 package hostutil
diff --git a/helper/hostutil/hostinfo_test.go b/helper/hostutil/hostinfo_test.go
index 0f53744adc1e3..c54893b17dbb9 100644
--- a/helper/hostutil/hostinfo_test.go
+++ b/helper/hostutil/hostinfo_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package hostutil
 
 import (
diff --git a/helper/identity/identity.go b/helper/identity/identity.go
index a7769f08e0186..9a28be7156791 100644
--- a/helper/identity/identity.go
+++ b/helper/identity/identity.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package identity
 
 import (
diff --git a/helper/identity/mfa/mfa.go b/helper/identity/mfa/mfa.go
index 1f8af4f4c20b2..d4bbf10b48463 100644
--- a/helper/identity/mfa/mfa.go
+++ b/helper/identity/mfa/mfa.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package mfa
 
 import (
diff --git a/helper/identity/mfa/sentinel.go b/helper/identity/mfa/sentinel.go
index a587aa70b699c..f6d8c7b994224 100644
--- a/helper/identity/mfa/sentinel.go
+++ b/helper/identity/mfa/sentinel.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package mfa
 
 func (c *Config) SentinelGet(key string) (interface{}, error) {
diff --git a/helper/identity/mfa/types.pb.go b/helper/identity/mfa/types.pb.go
index 57dbab0da60c8..59d989e86e3a7 100644
--- a/helper/identity/mfa/types.pb.go
+++ b/helper/identity/mfa/types.pb.go
@@ -1,10 +1,7 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc        v3.21.5
 // source: helper/identity/mfa/types.proto
 
 package mfa
diff --git a/helper/identity/mfa/types.proto b/helper/identity/mfa/types.proto
index 65eb853be2461..decade25b9af7 100644
--- a/helper/identity/mfa/types.proto
+++ b/helper/identity/mfa/types.proto
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 syntax = "proto3";
 
 option go_package = "github.com/hashicorp/vault/helper/identity/mfa";
diff --git a/helper/identity/sentinel.go b/helper/identity/sentinel.go
index 4f65e62c848de..2c2bc4b940f25 100644
--- a/helper/identity/sentinel.go
+++ b/helper/identity/sentinel.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package identity
 
 import "github.com/golang/protobuf/ptypes"
diff --git a/helper/identity/types.pb.go b/helper/identity/types.pb.go
index 91b4c0ff20d78..7a88a74773104 100644
--- a/helper/identity/types.pb.go
+++ b/helper/identity/types.pb.go
@@ -1,10 +1,7 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc        v3.21.5
 // source: helper/identity/types.proto
 
 package identity
diff --git a/helper/identity/types.proto b/helper/identity/types.proto
index a34d715acf340..0ea7525eb0f5b 100644
--- a/helper/identity/types.proto
+++ b/helper/identity/types.proto
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 syntax = "proto3";
 
 option go_package = "github.com/hashicorp/vault/helper/identity";
diff --git a/helper/locking/lock.go b/helper/locking/lock.go
deleted file mode 100644
index a9bff4c0f06c7..0000000000000
--- a/helper/locking/lock.go
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package locking
-
-import (
-	"sync"
-
-	"github.com/sasha-s/go-deadlock"
-)
-
-// Common mutex interface to allow either built-in or imported deadlock use
-type Mutex interface {
-	Lock()
-	Unlock()
-}
-
-// Common r/w mutex interface to allow either built-in or imported deadlock use
-type RWMutex interface {
-	Lock()
-	RLock()
-	RLocker() sync.Locker
-	RUnlock()
-	Unlock()
-}
-
-// DeadlockMutex (used when requested via config option `detact_deadlocks`),
-// behaves like a sync.Mutex but does periodic checking to see if outstanding
-// locks and requests look like a deadlock.  If it finds a deadlock candidate it
-// will output it prefixed with "POTENTIAL DEADLOCK", as described at
-// https://github.com/sasha-s/go-deadlock
-type DeadlockMutex struct {
-	deadlock.Mutex
-}
-
-// DeadlockRWMutex is the RW version of DeadlockMutex.
-type DeadlockRWMutex struct {
-	deadlock.RWMutex
-}
-
-// Regular sync/mutex.
-type SyncMutex struct {
-	sync.Mutex
-}
-
-// DeadlockRWMutex is the RW version of SyncMutex.
-type SyncRWMutex struct {
-	sync.RWMutex
-}
diff --git a/helper/logging/logfile.go b/helper/logging/logfile.go
index 9417e9ca8233d..b1fd46cbaff43 100644
--- a/helper/logging/logfile.go
+++ b/helper/logging/logfile.go
@@ -1,23 +1,12 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package logging
 
 import (
-	"fmt"
 	"os"
 	"path/filepath"
-	"sort"
-	"strconv"
 	"strings"
 	"sync"
-	"time"
-
-	"github.com/hashicorp/go-multierror"
 )
 
-var now = time.Now
-
 type LogFile struct {
 	// Name of the log file
 	fileName string
@@ -25,126 +14,43 @@ type LogFile struct {
 	// Path to the log file
 	logPath string
 
-	// duration between each file rotation operation
-	duration time.Duration
-
-	// lastCreated represents the creation time of the latest log
-	lastCreated time.Time
-
 	// fileInfo is the pointer to the current file being written to
 	fileInfo *os.File
 
-	// maxBytes is the maximum number of desired bytes for a log file
-	maxBytes int
-
-	// bytesWritten is the number of bytes written in the current log file
-	bytesWritten int64
-
-	// Max rotated files to keep before removing them.
-	maxArchivedFiles int
-
 	// acquire is the mutex utilized to ensure we have no concurrency issues
 	acquire sync.Mutex
 }
 
+func NewLogFile(logPath string, fileName string) *LogFile {
+	return &LogFile{
+		fileName: strings.TrimSpace(fileName),
+		logPath:  strings.TrimSpace(logPath),
+	}
+}
+
 // Write is used to implement io.Writer
 func (l *LogFile) Write(b []byte) (n int, err error) {
 	l.acquire.Lock()
 	defer l.acquire.Unlock()
-
 	// Create a new file if we have no file to write to
 	if l.fileInfo == nil {
 		if err := l.openNew(); err != nil {
 			return 0, err
 		}
-	} else if err := l.rotate(); err != nil { // Check for the last contact and rotate if necessary
-		return 0, err
-	}
-
-	bytesWritten, err := l.fileInfo.Write(b)
-
-	if bytesWritten > 0 {
-		l.bytesWritten += int64(bytesWritten)
 	}
 
-	return bytesWritten, err
-}
-
-func (l *LogFile) fileNamePattern() string {
-	// Extract the file extension
-	fileExt := filepath.Ext(l.fileName)
-	// If we have no file extension we append .log
-	if fileExt == "" {
-		fileExt = ".log"
-	}
-	// Remove the file extension from the filename
-	return strings.TrimSuffix(l.fileName, fileExt) + "-%s" + fileExt
+	return l.fileInfo.Write(b)
 }
 
 func (l *LogFile) openNew() error {
-	fileNamePattern := l.fileNamePattern()
+	newFilePath := filepath.Join(l.logPath, l.fileName)
 
-	createTime := now()
-	newFileName := fmt.Sprintf(fileNamePattern, strconv.FormatInt(createTime.UnixNano(), 10))
-	newFilePath := filepath.Join(l.logPath, newFileName)
-
-	// Try creating a file. We truncate the file because we are the only authority to write the logs
-	filePointer, err := os.OpenFile(newFilePath, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0o640)
+	// Try to open an existing file or create a new one if it doesn't exist.
+	filePointer, err := os.OpenFile(newFilePath, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0o640)
 	if err != nil {
 		return err
 	}
 
-	// New file, new 'bytes' tracker, new creation time :) :)
 	l.fileInfo = filePointer
-	l.lastCreated = createTime
-	l.bytesWritten = 0
 	return nil
 }
-
-func (l *LogFile) rotate() error {
-	// Get the time from the last point of contact
-	timeElapsed := time.Since(l.lastCreated)
-	// Rotate if we hit the byte file limit or the time limit
-	if (l.bytesWritten >= int64(l.maxBytes) && (l.maxBytes > 0)) || timeElapsed >= l.duration {
-		if err := l.fileInfo.Close(); err != nil {
-			return err
-		}
-		if err := l.pruneFiles(); err != nil {
-			return err
-		}
-		return l.openNew()
-	}
-	return nil
-}
-
-func (l *LogFile) pruneFiles() error {
-	if l.maxArchivedFiles == 0 {
-		return nil
-	}
-
-	pattern := filepath.Join(l.logPath, fmt.Sprintf(l.fileNamePattern(), "*"))
-	matches, err := filepath.Glob(pattern)
-	if err != nil {
-		return err
-	}
-
-	switch {
-	case l.maxArchivedFiles < 0:
-		return removeFiles(matches)
-	case len(matches) < l.maxArchivedFiles:
-		return nil
-	}
-
-	sort.Strings(matches)
-	last := len(matches) - l.maxArchivedFiles
-	return removeFiles(matches[:last])
-}
-
-func removeFiles(files []string) (err error) {
-	for _, file := range files {
-		if fileError := os.Remove(file); fileError != nil {
-			err = multierror.Append(err, fmt.Errorf("error removing file %s: %v", file, fileError))
-		}
-	}
-	return err
-}
diff --git a/helper/logging/logfile_test.go b/helper/logging/logfile_test.go
deleted file mode 100644
index a0cae986aadcb..0000000000000
--- a/helper/logging/logfile_test.go
+++ /dev/null
@@ -1,157 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package logging
-
-import (
-	"os"
-	"path/filepath"
-	"sort"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func TestLogFile_openNew(t *testing.T) {
-	logFile := &LogFile{
-		fileName: "vault.log",
-		logPath:  t.TempDir(),
-		duration: defaultRotateDuration,
-	}
-
-	err := logFile.openNew()
-	require.NoError(t, err)
-
-	msg := "[INFO] Something"
-	_, err = logFile.Write([]byte(msg))
-	require.NoError(t, err)
-
-	content, err := os.ReadFile(logFile.fileInfo.Name())
-	require.NoError(t, err)
-	require.Contains(t, string(content), msg)
-}
-
-func TestLogFile_Rotation_MaxDuration(t *testing.T) {
-	if testing.Short() {
-		t.Skip("too slow for testing.Short")
-	}
-
-	tempDir := t.TempDir()
-	logFile := LogFile{
-		fileName: "vault.log",
-		logPath:  tempDir,
-		duration: 50 * time.Millisecond,
-	}
-
-	_, err := logFile.Write([]byte("Hello World"))
-	assert.NoError(t, err, "error writing rotation max duration part 1")
-
-	time.Sleep(3 * logFile.duration)
-
-	_, err = logFile.Write([]byte("Second File"))
-	assert.NoError(t, err, "error writing rotation max duration part 2")
-
-	require.Len(t, listDir(t, tempDir), 2)
-}
-
-func TestLogFile_Rotation_MaxBytes(t *testing.T) {
-	tempDir := t.TempDir()
-	logFile := LogFile{
-		fileName: "somefile.log",
-		logPath:  tempDir,
-		maxBytes: 10,
-		duration: defaultRotateDuration,
-	}
-	_, err := logFile.Write([]byte("Hello World"))
-	assert.NoError(t, err, "error writing rotation max bytes part 1")
-
-	_, err = logFile.Write([]byte("Second File"))
-	assert.NoError(t, err, "error writing rotation max bytes part 2")
-
-	require.Len(t, listDir(t, tempDir), 2)
-}
-
-func TestLogFile_PruneFiles(t *testing.T) {
-	tempDir := t.TempDir()
-	logFile := LogFile{
-		fileName:         "vault.log",
-		logPath:          tempDir,
-		maxBytes:         10,
-		duration:         defaultRotateDuration,
-		maxArchivedFiles: 1,
-	}
-	_, err := logFile.Write([]byte("[INFO] Hello World"))
-	assert.NoError(t, err, "error writing during prune files test part 1")
-
-	_, err = logFile.Write([]byte("[INFO] Second File"))
-	assert.NoError(t, err, "error writing during prune files test part 1")
-
-	_, err = logFile.Write([]byte("[INFO] Third File"))
-	assert.NoError(t, err, "error writing during prune files test part 1")
-
-	logFiles := listDir(t, tempDir)
-	sort.Strings(logFiles)
-	require.Len(t, logFiles, 2)
-
-	content, err := os.ReadFile(filepath.Join(tempDir, logFiles[0]))
-	require.NoError(t, err)
-	require.Contains(t, string(content), "Second File")
-
-	content, err = os.ReadFile(filepath.Join(tempDir, logFiles[1]))
-	require.NoError(t, err)
-	require.Contains(t, string(content), "Third File")
-}
-
-func TestLogFile_PruneFiles_Disabled(t *testing.T) {
-	tempDir := t.TempDir()
-	logFile := LogFile{
-		fileName:         "somename.log",
-		logPath:          tempDir,
-		maxBytes:         10,
-		duration:         defaultRotateDuration,
-		maxArchivedFiles: 0,
-	}
-
-	_, err := logFile.Write([]byte("[INFO] Hello World"))
-	assert.NoError(t, err, "error writing during prune files - disabled test part 1")
-
-	_, err = logFile.Write([]byte("[INFO] Second File"))
-	assert.NoError(t, err, "error writing during prune files - disabled test part 2")
-
-	_, err = logFile.Write([]byte("[INFO] Third File"))
-	assert.NoError(t, err, "error writing during prune files - disabled test part 3")
-
-	require.Len(t, listDir(t, tempDir), 3)
-}
-
-func TestLogFile_FileRotation_Disabled(t *testing.T) {
-	tempDir := t.TempDir()
-	logFile := LogFile{
-		fileName:         "vault.log",
-		logPath:          tempDir,
-		maxBytes:         10,
-		maxArchivedFiles: -1,
-	}
-
-	_, err := logFile.Write([]byte("[INFO] Hello World"))
-	assert.NoError(t, err, "error writing during rotation disabled test part 1")
-
-	_, err = logFile.Write([]byte("[INFO] Second File"))
-	assert.NoError(t, err, "error writing during rotation disabled test part 2")
-
-	_, err = logFile.Write([]byte("[INFO] Third File"))
-	assert.NoError(t, err, "error writing during rotation disabled test part 3")
-
-	require.Len(t, listDir(t, tempDir), 1)
-}
-
-func listDir(t *testing.T, name string) []string {
-	t.Helper()
-	fh, err := os.Open(name)
-	require.NoError(t, err)
-	files, err := fh.Readdirnames(100)
-	require.NoError(t, err)
-	return files
-}
diff --git a/helper/logging/logger.go b/helper/logging/logger.go
index 1efac27bedfd2..6e87fde5387bd 100644
--- a/helper/logging/logger.go
+++ b/helper/logging/logger.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package logging
 
 import (
@@ -9,10 +6,8 @@ import (
 	"io"
 	"path/filepath"
 	"strings"
-	"time"
 
 	log "github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/go-multierror"
 )
 
 const (
@@ -21,41 +16,27 @@ const (
 	JSONFormat
 )
 
-// defaultRotateDuration is the default time taken by the agent to rotate logs
-const defaultRotateDuration = 24 * time.Hour
-
 type LogFormat int
 
 // LogConfig should be used to supply configuration when creating a new Vault logger
 type LogConfig struct {
-	// Name is the name the returned logger will use to prefix log lines.
-	Name string
-
-	// LogLevel is the minimum level to be logged.
-	LogLevel log.Level
-
-	// LogFormat is the log format to use, supported formats are 'standard' and 'json'.
-	LogFormat LogFormat
-
-	// LogFilePath is the path to write the logs to the user specified file.
-	LogFilePath string
-
-	// LogRotateDuration is the user specified time to rotate logs
-	LogRotateDuration time.Duration
-
-	// LogRotateBytes is the user specified byte limit to rotate logs
-	LogRotateBytes int
-
-	// LogRotateMaxFiles is the maximum number of past archived log files to keep
-	LogRotateMaxFiles int
+	name        string
+	logLevel    log.Level
+	logFormat   LogFormat
+	logFilePath string
 }
 
-func (c *LogConfig) isLevelInvalid() bool {
-	return c.LogLevel == log.NoLevel || c.LogLevel == log.Off || c.LogLevel.String() == "unknown"
+func NewLogConfig(name string, logLevel log.Level, logFormat LogFormat, logFilePath string) LogConfig {
+	return LogConfig{
+		name:        name,
+		logLevel:    logLevel,
+		logFormat:   logFormat,
+		logFilePath: strings.TrimSpace(logFilePath),
+	}
 }
 
-func (c *LogConfig) isFormatJson() bool {
-	return c.LogFormat == JSONFormat
+func (c LogConfig) IsFormatJson() bool {
+	return c.logFormat == JSONFormat
 }
 
 // Stringer implementation
@@ -84,30 +65,11 @@ func (w noErrorWriter) Write(p []byte) (n int, err error) {
 	return len(p), nil
 }
 
-// parseFullPath takes a full path intended to be the location for log files and
-// breaks it down into a directory and a file name. It checks both of these for
-// the common globbing character '*' and returns an error if it is present.
-func parseFullPath(fullPath string) (directory, fileName string, err error) {
-	directory, fileName = filepath.Split(fullPath)
-
-	globChars := "*?["
-	if strings.ContainsAny(directory, globChars) {
-		err = multierror.Append(err, fmt.Errorf("directory contains glob character"))
-	}
-	if fileName == "" {
-		fileName = "vault.log"
-	} else if strings.ContainsAny(fileName, globChars) {
-		err = multierror.Append(err, fmt.Errorf("file name contains globbing character"))
-	}
-
-	return directory, fileName, err
-}
-
 // Setup creates a new logger with the specified configuration and writer
-func Setup(config *LogConfig, w io.Writer) (log.InterceptLogger, error) {
+func Setup(config LogConfig, w io.Writer) (log.InterceptLogger, error) {
 	// Validate the log level
-	if config.isLevelInvalid() {
-		return nil, fmt.Errorf("invalid log level: %v", config.LogLevel)
+	if config.logLevel.String() == "unknown" {
+		return nil, fmt.Errorf("invalid log level: %v", config.logLevel)
 	}
 
 	// If out is os.Stdout and Vault is being run as a Windows Service, writes will
@@ -115,41 +77,24 @@ func Setup(config *LogConfig, w io.Writer) (log.InterceptLogger, error) {
 	// noErrorWriter is used as a wrapper to suppress any errors when writing to out.
 	writers := []io.Writer{noErrorWriter{w: w}}
 
-	// Create a file logger if the user has specified the path to the log file
-	if config.LogFilePath != "" {
-		dir, fileName, err := parseFullPath(config.LogFilePath)
-		if err != nil {
-			return nil, err
-		}
-
-		if config.LogRotateDuration == 0 {
-			config.LogRotateDuration = defaultRotateDuration
-		}
-
-		logFile := &LogFile{
-			fileName:         fileName,
-			logPath:          dir,
-			duration:         config.LogRotateDuration,
-			maxBytes:         config.LogRotateBytes,
-			maxArchivedFiles: config.LogRotateMaxFiles,
-		}
-		if err := logFile.pruneFiles(); err != nil {
-			return nil, fmt.Errorf("failed to prune log files: %w", err)
+	if config.logFilePath != "" {
+		dir, fileName := filepath.Split(config.logFilePath)
+		if fileName == "" {
+			fileName = "vault-agent.log"
 		}
+		logFile := NewLogFile(dir, fileName)
 		if err := logFile.openNew(); err != nil {
-			return nil, fmt.Errorf("failed to setup logging: %w", err)
+			return nil, fmt.Errorf("failed to set up file logging: %w", err)
 		}
 		writers = append(writers, logFile)
 	}
 
 	logger := log.NewInterceptLogger(&log.LoggerOptions{
-		Name:              config.Name,
-		Level:             config.LogLevel,
-		IndependentLevels: true,
-		Output:            io.MultiWriter(writers...),
-		JSONFormat:        config.isFormatJson(),
+		Name:       config.name,
+		Level:      config.logLevel,
+		Output:     io.MultiWriter(writers...),
+		JSONFormat: config.IsFormatJson(),
 	})
-
 	return logger, nil
 }
 
@@ -193,12 +138,21 @@ func ParseLogLevel(logLevel string) (log.Level, error) {
 
 // TranslateLoggerLevel returns the string that corresponds with logging level of the hclog.Logger.
 func TranslateLoggerLevel(logger log.Logger) (string, error) {
-	logLevel := logger.GetLevel()
-
-	switch logLevel {
-	case log.Trace, log.Debug, log.Info, log.Warn, log.Error:
-		return logLevel.String(), nil
-	default:
+	var result string
+
+	if logger.IsTrace() {
+		result = "trace"
+	} else if logger.IsDebug() {
+		result = "debug"
+	} else if logger.IsInfo() {
+		result = "info"
+	} else if logger.IsWarn() {
+		result = "warn"
+	} else if logger.IsError() {
+		result = "error"
+	} else {
 		return "", fmt.Errorf("unknown log level")
 	}
+
+	return result, nil
 }
diff --git a/helper/logging/logger_test.go b/helper/logging/logger_test.go
deleted file mode 100644
index 30ff1783a776f..0000000000000
--- a/helper/logging/logger_test.go
+++ /dev/null
@@ -1,224 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package logging
-
-import (
-	"bytes"
-	"encoding/json"
-	"errors"
-	"os"
-	"testing"
-
-	log "github.com/hashicorp/go-hclog"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func TestLogger_SetupBasic(t *testing.T) {
-	cfg := &LogConfig{Name: "test-system", LogLevel: log.Info}
-
-	logger, err := Setup(cfg, nil)
-	require.NoError(t, err)
-	require.NotNil(t, logger)
-	require.Equal(t, logger.Name(), "test-system")
-	require.True(t, logger.IsInfo())
-}
-
-func TestLogger_SetupInvalidLogLevel(t *testing.T) {
-	cfg := &LogConfig{}
-
-	_, err := Setup(cfg, nil)
-	assert.Containsf(t, err.Error(), "invalid log level", "expected error %s", err)
-}
-
-func TestLogger_SetupLoggerErrorLevel(t *testing.T) {
-	cfg := &LogConfig{
-		LogLevel: log.Error,
-	}
-
-	var buf bytes.Buffer
-
-	logger, err := Setup(cfg, &buf)
-	require.NoError(t, err)
-	require.NotNil(t, logger)
-
-	logger.Error("test error msg")
-	logger.Info("test info msg")
-
-	output := buf.String()
-
-	require.Contains(t, output, "[ERROR] test error msg")
-	require.NotContains(t, output, "[INFO]  test info msg")
-}
-
-func TestLogger_SetupLoggerDebugLevel(t *testing.T) {
-	cfg := LogConfig{LogLevel: log.Debug}
-	var buf bytes.Buffer
-
-	logger, err := Setup(&cfg, &buf)
-	require.NoError(t, err)
-	require.NotNil(t, logger)
-
-	logger.Info("test info msg")
-	logger.Debug("test debug msg")
-
-	output := buf.String()
-
-	require.Contains(t, output, "[INFO]  test info msg")
-	require.Contains(t, output, "[DEBUG] test debug msg")
-}
-
-func TestLogger_SetupLoggerWithName(t *testing.T) {
-	cfg := &LogConfig{
-		LogLevel: log.Debug,
-		Name:     "test-system",
-	}
-	var buf bytes.Buffer
-
-	logger, err := Setup(cfg, &buf)
-	require.NoError(t, err)
-	require.NotNil(t, logger)
-
-	logger.Warn("test warn msg")
-
-	require.Contains(t, buf.String(), "[WARN]  test-system: test warn msg")
-}
-
-func TestLogger_SetupLoggerWithJSON(t *testing.T) {
-	cfg := &LogConfig{
-		LogLevel:  log.Debug,
-		LogFormat: JSONFormat,
-		Name:      "test-system",
-	}
-	var buf bytes.Buffer
-
-	logger, err := Setup(cfg, &buf)
-	require.NoError(t, err)
-	require.NotNil(t, logger)
-
-	logger.Warn("test warn msg")
-
-	var jsonOutput map[string]string
-	err = json.Unmarshal(buf.Bytes(), &jsonOutput)
-	require.NoError(t, err)
-	require.Contains(t, jsonOutput, "@level")
-	require.Equal(t, jsonOutput["@level"], "warn")
-	require.Contains(t, jsonOutput, "@message")
-	require.Equal(t, jsonOutput["@message"], "test warn msg")
-}
-
-func TestLogger_SetupLoggerWithValidLogPath(t *testing.T) {
-	tmpDir := t.TempDir()
-
-	cfg := &LogConfig{
-		LogLevel:    log.Info,
-		LogFilePath: tmpDir, //+ "/",
-	}
-	var buf bytes.Buffer
-
-	logger, err := Setup(cfg, &buf)
-	require.NoError(t, err)
-	require.NotNil(t, logger)
-}
-
-func TestLogger_SetupLoggerWithInValidLogPath(t *testing.T) {
-	cfg := &LogConfig{
-		LogLevel:    log.Info,
-		LogFilePath: "nonexistentdir/",
-	}
-	var buf bytes.Buffer
-
-	logger, err := Setup(cfg, &buf)
-	require.Error(t, err)
-	require.True(t, errors.Is(err, os.ErrNotExist))
-	require.Nil(t, logger)
-}
-
-func TestLogger_SetupLoggerWithInValidLogPathPermission(t *testing.T) {
-	tmpDir := "/tmp/" + t.Name()
-
-	err := os.Mkdir(tmpDir, 0o000)
-	assert.NoError(t, err, "unexpected error testing with invalid log path permission")
-	defer os.RemoveAll(tmpDir)
-
-	cfg := &LogConfig{
-		LogLevel:    log.Info,
-		LogFilePath: tmpDir + "/",
-	}
-	var buf bytes.Buffer
-
-	logger, err := Setup(cfg, &buf)
-	require.Error(t, err)
-	require.True(t, errors.Is(err, os.ErrPermission))
-	require.Nil(t, logger)
-}
-
-func TestLogger_SetupLoggerWithInvalidLogFilePath(t *testing.T) {
-	cases := map[string]struct {
-		path    string
-		message string
-	}{
-		"file name *": {
-			path:    "/this/isnt/ok/juan*.log",
-			message: "file name contains globbing character",
-		},
-		"file name ?": {
-			path:    "/this/isnt/ok/juan?.log",
-			message: "file name contains globbing character",
-		},
-		"file name [": {
-			path:    "/this/isnt/ok/[juan].log",
-			message: "file name contains globbing character",
-		},
-		"directory path *": {
-			path:    "/this/isnt/ok/*/qwerty.log",
-			message: "directory contains glob character",
-		},
-		"directory path ?": {
-			path:    "/this/isnt/ok/?/qwerty.log",
-			message: "directory contains glob character",
-		},
-		"directory path [": {
-			path:    "/this/isnt/ok/[foo]/qwerty.log",
-			message: "directory contains glob character",
-		},
-	}
-
-	for name, tc := range cases {
-		name := name
-		tc := tc
-		cfg := &LogConfig{
-			LogLevel:    log.Info,
-			LogFilePath: tc.path,
-		}
-		_, err := Setup(cfg, &bytes.Buffer{})
-		assert.Error(t, err, "%s: expected error due to *", name)
-		assert.Contains(t, err.Error(), tc.message, "%s: error message does not match: %s", name, err.Error())
-	}
-}
-
-func TestLogger_ChangeLogLevels(t *testing.T) {
-	cfg := &LogConfig{
-		LogLevel: log.Debug,
-		Name:     "test-system",
-	}
-	var buf bytes.Buffer
-
-	logger, err := Setup(cfg, &buf)
-	require.NoError(t, err)
-	require.NotNil(t, logger)
-
-	assert.Equal(t, log.Debug, logger.GetLevel())
-
-	// Create new named loggers from the base logger and change the levels
-	logger2 := logger.Named("test2")
-	logger3 := logger.Named("test3")
-
-	logger2.SetLevel(log.Info)
-	logger3.SetLevel(log.Error)
-
-	assert.Equal(t, log.Debug, logger.GetLevel())
-	assert.Equal(t, log.Info, logger2.GetLevel())
-	assert.Equal(t, log.Error, logger3.GetLevel())
-}
diff --git a/helper/metricsutil/bucket.go b/helper/metricsutil/bucket.go
index 0f602e22ad153..9cbb2cdc2dafd 100644
--- a/helper/metricsutil/bucket.go
+++ b/helper/metricsutil/bucket.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package metricsutil
 
 import (
diff --git a/helper/metricsutil/bucket_test.go b/helper/metricsutil/bucket_test.go
index 1179e4dbdcef7..f37584781627f 100644
--- a/helper/metricsutil/bucket_test.go
+++ b/helper/metricsutil/bucket_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package metricsutil
 
 import (
diff --git a/helper/metricsutil/gauge_process.go b/helper/metricsutil/gauge_process.go
index c6fcd56639a2a..0ad0e9d876cf9 100644
--- a/helper/metricsutil/gauge_process.go
+++ b/helper/metricsutil/gauge_process.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package metricsutil
 
 import (
@@ -11,9 +8,24 @@ import (
 
 	"github.com/armon/go-metrics"
 	log "github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/vault/helper/timeutil"
 )
 
+// This interface allows unit tests to substitute in a simulated clock.
+type clock interface {
+	Now() time.Time
+	NewTicker(time.Duration) *time.Ticker
+}
+
+type defaultClock struct{}
+
+func (_ defaultClock) Now() time.Time {
+	return time.Now()
+}
+
+func (_ defaultClock) NewTicker(d time.Duration) *time.Ticker {
+	return time.NewTicker(d)
+}
+
 // GaugeLabelValues is one gauge in a set sharing a single key, that
 // are measured in a batch.
 type GaugeLabelValues struct {
@@ -61,7 +73,7 @@ type GaugeCollectionProcess struct {
 	maxGaugeCardinality int
 
 	// time source
-	clock timeutil.Clock
+	clock clock
 }
 
 // NewGaugeCollectionProcess creates a new collection process for the callback
@@ -86,7 +98,7 @@ func NewGaugeCollectionProcess(
 		gaugeInterval,
 		maxGaugeCardinality,
 		logger,
-		timeutil.DefaultClock{},
+		defaultClock{},
 	)
 }
 
@@ -109,7 +121,7 @@ func (m *ClusterMetricSink) NewGaugeCollectionProcess(
 		m.GaugeInterval,
 		m.MaxGaugeCardinality,
 		logger,
-		timeutil.DefaultClock{},
+		defaultClock{},
 	)
 }
 
@@ -122,7 +134,7 @@ func newGaugeCollectionProcessWithClock(
 	gaugeInterval time.Duration,
 	maxGaugeCardinality int,
 	logger log.Logger,
-	clock timeutil.Clock,
+	clock clock,
 ) (*GaugeCollectionProcess, error) {
 	process := &GaugeCollectionProcess{
 		stop:                make(chan struct{}, 1),
diff --git a/helper/metricsutil/gauge_process_test.go b/helper/metricsutil/gauge_process_test.go
index efd74e707df80..9971714e04e30 100644
--- a/helper/metricsutil/gauge_process_test.go
+++ b/helper/metricsutil/gauge_process_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package metricsutil
 
 import (
@@ -15,7 +12,6 @@ import (
 
 	"github.com/armon/go-metrics"
 	log "github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/vault/helper/timeutil"
 )
 
 // SimulatedTime maintains a virtual clock so the test isn't
@@ -25,10 +21,9 @@ import (
 type SimulatedTime struct {
 	now           time.Time
 	tickerBarrier chan *SimulatedTicker
-	timeutil.DefaultClock
 }
 
-var _ timeutil.Clock = &SimulatedTime{}
+var _ clock = &SimulatedTime{}
 
 type SimulatedTicker struct {
 	ticker   *time.Ticker
@@ -123,7 +118,7 @@ func TestGauge_Creation(t *testing.T) {
 		t.Fatalf("Error creating collection process: %v", err)
 	}
 
-	if _, ok := p.clock.(timeutil.DefaultClock); !ok {
+	if _, ok := p.clock.(defaultClock); !ok {
 		t.Error("Default clock not installed.")
 	}
 
diff --git a/helper/metricsutil/metricsutil.go b/helper/metricsutil/metricsutil.go
index cfc2e1109655f..de85c7e4628e9 100644
--- a/helper/metricsutil/metricsutil.go
+++ b/helper/metricsutil/metricsutil.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package metricsutil
 
 import (
diff --git a/helper/metricsutil/metricsutil_test.go b/helper/metricsutil/metricsutil_test.go
index f8f17fedb3611..1b817ddad192d 100644
--- a/helper/metricsutil/metricsutil_test.go
+++ b/helper/metricsutil/metricsutil_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package metricsutil
 
 import (
diff --git a/helper/metricsutil/wrapped_metrics.go b/helper/metricsutil/wrapped_metrics.go
index e3df058e11659..67deb3bee1cd1 100644
--- a/helper/metricsutil/wrapped_metrics.go
+++ b/helper/metricsutil/wrapped_metrics.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package metricsutil
 
 import (
diff --git a/helper/metricsutil/wrapped_metrics_test.go b/helper/metricsutil/wrapped_metrics_test.go
index b65809b46109a..c0fb2c386677d 100644
--- a/helper/metricsutil/wrapped_metrics_test.go
+++ b/helper/metricsutil/wrapped_metrics_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package metricsutil
 
 import (
diff --git a/helper/monitor/monitor.go b/helper/monitor/monitor.go
index 28ecf0eee5710..490e2fa08bbaf 100644
--- a/helper/monitor/monitor.go
+++ b/helper/monitor/monitor.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package monitor
 
 import (
diff --git a/helper/monitor/monitor_test.go b/helper/monitor/monitor_test.go
index 06e1e01777827..0133a351b99d5 100644
--- a/helper/monitor/monitor_test.go
+++ b/helper/monitor/monitor_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package monitor
 
 import (
diff --git a/helper/namespace/namespace.go b/helper/namespace/namespace.go
index 04a5b79dbec81..c1226a5547f9a 100644
--- a/helper/namespace/namespace.go
+++ b/helper/namespace/namespace.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package namespace
 
 import (
diff --git a/helper/namespace/namespace_test.go b/helper/namespace/namespace_test.go
index fd4c4c2f9988c..442b46b904470 100644
--- a/helper/namespace/namespace_test.go
+++ b/helper/namespace/namespace_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package namespace
 
 import (
diff --git a/helper/osutil/fileinfo.go b/helper/osutil/fileinfo.go
index f14db6b9c8bf1..59b99859ebae4 100644
--- a/helper/osutil/fileinfo.go
+++ b/helper/osutil/fileinfo.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package osutil
 
 import (
diff --git a/helper/osutil/fileinfo_test.go b/helper/osutil/fileinfo_test.go
index 8c3316bc91abd..febd11966a35b 100644
--- a/helper/osutil/fileinfo_test.go
+++ b/helper/osutil/fileinfo_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package osutil
 
 import (
diff --git a/helper/osutil/fileinfo_unix.go b/helper/osutil/fileinfo_unix.go
index bb60c498797de..c49a591ce9c66 100644
--- a/helper/osutil/fileinfo_unix.go
+++ b/helper/osutil/fileinfo_unix.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !windows
 
 package osutil
diff --git a/helper/osutil/fileinfo_unix_test.go b/helper/osutil/fileinfo_unix_test.go
index 302bd9e16847b..c31ca5bdc3722 100644
--- a/helper/osutil/fileinfo_unix_test.go
+++ b/helper/osutil/fileinfo_unix_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !windows
 
 package osutil
diff --git a/helper/osutil/fileinfo_windows.go b/helper/osutil/fileinfo_windows.go
index 193fe3ff8420c..0869c97e7d98a 100644
--- a/helper/osutil/fileinfo_windows.go
+++ b/helper/osutil/fileinfo_windows.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build windows
 
 package osutil
diff --git a/helper/parseip/parseip.go b/helper/parseip/parseip.go
index 95579633b5092..414a3f05c81be 100644
--- a/helper/parseip/parseip.go
+++ b/helper/parseip/parseip.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package parseip
 
 import (
diff --git a/helper/parseip/parseip_test.go b/helper/parseip/parseip_test.go
index e26c810be677f..5d2b3645b853d 100644
--- a/helper/parseip/parseip_test.go
+++ b/helper/parseip/parseip_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package parseip
 
 import (
diff --git a/helper/pgpkeys/encrypt_decrypt.go b/helper/pgpkeys/encrypt_decrypt.go
index c7a8027cd2ce8..31678df69f4c1 100644
--- a/helper/pgpkeys/encrypt_decrypt.go
+++ b/helper/pgpkeys/encrypt_decrypt.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pgpkeys
 
 import (
@@ -8,8 +5,8 @@ import (
 	"encoding/base64"
 	"fmt"
 
-	"github.com/ProtonMail/go-crypto/openpgp"
-	"github.com/ProtonMail/go-crypto/openpgp/packet"
+	"github.com/keybase/go-crypto/openpgp"
+	"github.com/keybase/go-crypto/openpgp/packet"
 )
 
 // EncryptShares takes an ordered set of byte slices to encrypt and the
diff --git a/helper/pgpkeys/flag.go b/helper/pgpkeys/flag.go
index 79d114b4d9cc1..4490d891dc9ed 100644
--- a/helper/pgpkeys/flag.go
+++ b/helper/pgpkeys/flag.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pgpkeys
 
 import (
@@ -11,7 +8,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/ProtonMail/go-crypto/openpgp"
+	"github.com/keybase/go-crypto/openpgp"
 )
 
 // PubKeyFileFlag implements flag.Value and command.Example to receive exactly
diff --git a/helper/pgpkeys/flag_test.go b/helper/pgpkeys/flag_test.go
index 9ea25d44d5898..86e04611f1cfe 100644
--- a/helper/pgpkeys/flag_test.go
+++ b/helper/pgpkeys/flag_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pgpkeys
 
 import (
@@ -15,8 +12,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ProtonMail/go-crypto/openpgp"
-	"github.com/ProtonMail/go-crypto/openpgp/packet"
+	"github.com/keybase/go-crypto/openpgp"
+	"github.com/keybase/go-crypto/openpgp/packet"
 )
 
 func TestPubKeyFilesFlag_implements(t *testing.T) {
diff --git a/helper/pgpkeys/keybase.go b/helper/pgpkeys/keybase.go
index b24e4bf231c8a..a9dde2bdd7aed 100644
--- a/helper/pgpkeys/keybase.go
+++ b/helper/pgpkeys/keybase.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pgpkeys
 
 import (
@@ -9,9 +6,9 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/ProtonMail/go-crypto/openpgp"
 	cleanhttp "github.com/hashicorp/go-cleanhttp"
 	"github.com/hashicorp/vault/sdk/helper/jsonutil"
+	"github.com/keybase/go-crypto/openpgp"
 )
 
 const (
diff --git a/helper/pgpkeys/keybase_test.go b/helper/pgpkeys/keybase_test.go
index 7d59899fd9e53..c261e6f14c421 100644
--- a/helper/pgpkeys/keybase_test.go
+++ b/helper/pgpkeys/keybase_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pgpkeys
 
 import (
@@ -10,8 +7,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/ProtonMail/go-crypto/openpgp"
-	"github.com/ProtonMail/go-crypto/openpgp/packet"
+	"github.com/keybase/go-crypto/openpgp"
+	"github.com/keybase/go-crypto/openpgp/packet"
 )
 
 func TestFetchKeybasePubkeys(t *testing.T) {
diff --git a/helper/pgpkeys/test_keys.go b/helper/pgpkeys/test_keys.go
index be97698d1216e..c10a9055ed00e 100644
--- a/helper/pgpkeys/test_keys.go
+++ b/helper/pgpkeys/test_keys.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pgpkeys
 
 const (
diff --git a/helper/policies/policies.go b/helper/policies/policies.go
index 2a34602057980..729ce10b2fc65 100644
--- a/helper/policies/policies.go
+++ b/helper/policies/policies.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package policies
 
 import "sort"
diff --git a/helper/policies/policies_test.go b/helper/policies/policies_test.go
index 6356dee18a043..ba9b0a8f70b05 100644
--- a/helper/policies/policies_test.go
+++ b/helper/policies/policies_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package policies
 
 import "testing"
diff --git a/helper/proxyutil/proxyutil.go b/helper/proxyutil/proxyutil.go
index b0f06d6b9f260..fdb20973e003f 100644
--- a/helper/proxyutil/proxyutil.go
+++ b/helper/proxyutil/proxyutil.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package proxyutil
 
 import (
diff --git a/helper/random/parser.go b/helper/random/parser.go
index c5e82c8c1e5a1..3184db8aa5c62 100644
--- a/helper/random/parser.go
+++ b/helper/random/parser.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package random
 
 import (
diff --git a/helper/random/parser_test.go b/helper/random/parser_test.go
index f8af5a5eb920b..59cdb81430438 100644
--- a/helper/random/parser_test.go
+++ b/helper/random/parser_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package random
 
 import (
diff --git a/helper/random/random_api.go b/helper/random/random_api.go
index 5bb9316b15be5..9bc89f9af7e54 100644
--- a/helper/random/random_api.go
+++ b/helper/random/random_api.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package random
 
 import (
diff --git a/helper/random/registry.go b/helper/random/registry.go
index 334df734e24ef..efdcf5c302f58 100644
--- a/helper/random/registry.go
+++ b/helper/random/registry.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package random
 
 import (
diff --git a/helper/random/registry_test.go b/helper/random/registry_test.go
index 21297aaf21f59..3d7060650b4fd 100644
--- a/helper/random/registry_test.go
+++ b/helper/random/registry_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package random
 
 import (
diff --git a/helper/random/rules.go b/helper/random/rules.go
index 05cc800c91e88..fead5b4ffe65d 100644
--- a/helper/random/rules.go
+++ b/helper/random/rules.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package random
 
 import (
diff --git a/helper/random/rules_test.go b/helper/random/rules_test.go
index e85df503b0a13..18aa008798265 100644
--- a/helper/random/rules_test.go
+++ b/helper/random/rules_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package random
 
 import (
diff --git a/helper/random/serializing.go b/helper/random/serializing.go
index 5b68d32758740..93371df028784 100644
--- a/helper/random/serializing.go
+++ b/helper/random/serializing.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package random
 
 import (
diff --git a/helper/random/serializing_test.go b/helper/random/serializing_test.go
index bfa17ae266e70..171053742993e 100644
--- a/helper/random/serializing_test.go
+++ b/helper/random/serializing_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package random
 
 import (
diff --git a/helper/random/string_generator.go b/helper/random/string_generator.go
index 48f08ed8924af..96dd69ec60e3b 100644
--- a/helper/random/string_generator.go
+++ b/helper/random/string_generator.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package random
 
 import (
@@ -70,7 +67,7 @@ func sortCharset(chars string) string {
 	return string(r)
 }
 
-// StringGenerator generates random strings from the provided charset & adhering to a set of rules. The set of rules
+// StringGenerator generats random strings from the provided charset & adhering to a set of rules. The set of rules
 // are things like CharsetRule which requires a certain number of characters from a sub-charset.
 type StringGenerator struct {
 	// Length of the string to generate.
diff --git a/helper/random/string_generator_test.go b/helper/random/string_generator_test.go
index 8307ff73a485c..af4e7da149626 100644
--- a/helper/random/string_generator_test.go
+++ b/helper/random/string_generator_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package random
 
 import (
diff --git a/helper/storagepacker/storagepacker.go b/helper/storagepacker/storagepacker.go
index 2e69f3a27d7a3..4633d523bea53 100644
--- a/helper/storagepacker/storagepacker.go
+++ b/helper/storagepacker/storagepacker.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package storagepacker
 
 import (
diff --git a/helper/storagepacker/storagepacker_test.go b/helper/storagepacker/storagepacker_test.go
index ad76107afbf42..cc2448b2bc90a 100644
--- a/helper/storagepacker/storagepacker_test.go
+++ b/helper/storagepacker/storagepacker_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package storagepacker
 
 import (
diff --git a/helper/storagepacker/types.pb.go b/helper/storagepacker/types.pb.go
index 6dd58b96d37d6..6bed81c48a152 100644
--- a/helper/storagepacker/types.pb.go
+++ b/helper/storagepacker/types.pb.go
@@ -1,10 +1,7 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc        v3.21.5
 // source: helper/storagepacker/types.proto
 
 package storagepacker
diff --git a/helper/storagepacker/types.proto b/helper/storagepacker/types.proto
index 7efb0a11ef983..4edfaf4f85721 100644
--- a/helper/storagepacker/types.proto
+++ b/helper/storagepacker/types.proto
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 syntax = "proto3";
 
 option go_package = "github.com/hashicorp/vault/helper/storagepacker";
diff --git a/helper/testhelpers/azurite/azurite.go b/helper/testhelpers/azurite/azurite.go
index a538e5c87eb03..13d65750d4cec 100644
--- a/helper/testhelpers/azurite/azurite.go
+++ b/helper/testhelpers/azurite/azurite.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package azurite
 
 import (
@@ -10,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/Azure/azure-storage-blob-go/azblob"
-	"github.com/hashicorp/vault/sdk/helper/docker"
+	"github.com/hashicorp/vault/helper/testhelpers/docker"
 )
 
 type Config struct {
diff --git a/helper/testhelpers/cassandra/cassandrahelper.go b/helper/testhelpers/cassandra/cassandrahelper.go
index 8e970e836a9cc..9d8ceeea8c1f6 100644
--- a/helper/testhelpers/cassandra/cassandrahelper.go
+++ b/helper/testhelpers/cassandra/cassandrahelper.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package cassandra
 
 import (
@@ -9,13 +6,11 @@ import (
 	"net"
 	"os"
 	"path/filepath"
-	"runtime"
-	"strings"
 	"testing"
 	"time"
 
 	"github.com/gocql/gocql"
-	"github.com/hashicorp/vault/sdk/helper/docker"
+	"github.com/hashicorp/vault/helper/testhelpers/docker"
 )
 
 type containerConfig struct {
@@ -82,12 +77,6 @@ func (h Host) ConnectionURL() string {
 
 func PrepareTestContainer(t *testing.T, opts ...ContainerOpt) (Host, func()) {
 	t.Helper()
-
-	// Skipping on ARM, as this image can't run on ARM architecture
-	if strings.Contains(runtime.GOARCH, "arm") {
-		t.Skip("Skipping, as this image is not supported on ARM architectures")
-	}
-
 	if os.Getenv("CASSANDRA_HOSTS") != "" {
 		host, port, err := net.SplitHostPort(os.Getenv("CASSANDRA_HOSTS"))
 		if err != nil {
@@ -101,10 +90,9 @@ func PrepareTestContainer(t *testing.T, opts ...ContainerOpt) (Host, func()) {
 	}
 
 	containerCfg := &containerConfig{
-		imageName:     "docker.mirror.hashicorp.services/library/cassandra",
-		containerName: "cassandra",
-		version:       "3.11",
-		env:           []string{"CASSANDRA_BROADCAST_ADDRESS=127.0.0.1"},
+		imageName: "cassandra",
+		version:   "3.11",
+		env:       []string{"CASSANDRA_BROADCAST_ADDRESS=127.0.0.1"},
 	}
 
 	for _, opt := range opts {
diff --git a/helper/testhelpers/certhelpers/cert_helpers.go b/helper/testhelpers/certhelpers/cert_helpers.go
index 42692d01f6a6c..b84bbf961e5a2 100644
--- a/helper/testhelpers/certhelpers/cert_helpers.go
+++ b/helper/testhelpers/certhelpers/cert_helpers.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package certhelpers
 
 import (
diff --git a/helper/testhelpers/consul/consulhelper.go b/helper/testhelpers/consul/consulhelper.go
index e8c160b8f6aa5..e88ead2bfad56 100644
--- a/helper/testhelpers/consul/consulhelper.go
+++ b/helper/testhelpers/consul/consulhelper.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package consul
 
 import (
@@ -11,7 +8,7 @@ import (
 
 	consulapi "github.com/hashicorp/consul/api"
 	goversion "github.com/hashicorp/go-version"
-	"github.com/hashicorp/vault/sdk/helper/docker"
+	"github.com/hashicorp/vault/helper/testhelpers/docker"
 )
 
 type Config struct {
@@ -61,7 +58,7 @@ func PrepareTestContainer(t *testing.T, version string, isEnterprise bool, doBoo
 	if isEnterprise {
 		version += "-ent"
 		name = "consul-enterprise"
-		repo = "docker.mirror.hashicorp.services/hashicorp/consul-enterprise"
+		repo = "hashicorp/consul-enterprise"
 		license, hasLicense := os.LookupEnv("CONSUL_LICENSE")
 		envVars = append(envVars, "CONSUL_LICENSE="+license)
 
diff --git a/helper/testhelpers/corehelpers/corehelpers.go b/helper/testhelpers/corehelpers/corehelpers.go
deleted file mode 100644
index 846db21da17a9..0000000000000
--- a/helper/testhelpers/corehelpers/corehelpers.go
+++ /dev/null
@@ -1,423 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-// Package corehelpers contains testhelpers that don't depend on package vault,
-// and thus can be used within vault (as well as elsewhere.)
-package corehelpers
-
-import (
-	"bytes"
-	"context"
-	"crypto/sha256"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"sync"
-	"time"
-
-	"github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/vault/audit"
-	"github.com/hashicorp/vault/builtin/credential/approle"
-	"github.com/hashicorp/vault/plugins/database/mysql"
-	"github.com/hashicorp/vault/sdk/framework"
-	"github.com/hashicorp/vault/sdk/helper/consts"
-	"github.com/hashicorp/vault/sdk/helper/salt"
-	"github.com/hashicorp/vault/sdk/logical"
-	"github.com/mitchellh/go-testing-interface"
-)
-
-// RetryUntil runs f until it returns a nil result or the timeout is reached.
-// If a nil result hasn't been obtained by timeout, calls t.Fatal.
-func RetryUntil(t testing.T, timeout time.Duration, f func() error) {
-	t.Helper()
-	deadline := time.Now().Add(timeout)
-	var err error
-	for time.Now().Before(deadline) {
-		if err = f(); err == nil {
-			return
-		}
-		time.Sleep(100 * time.Millisecond)
-	}
-	t.Fatalf("did not complete before deadline, err: %v", err)
-}
-
-// MakeTestPluginDir creates a temporary directory suitable for holding plugins.
-// This helper also resolves symlinks to make tests happy on OS X.
-func MakeTestPluginDir(t testing.T) (string, func(t testing.T)) {
-	if t != nil {
-		t.Helper()
-	}
-
-	dir, err := os.MkdirTemp("", "")
-	if err != nil {
-		if t == nil {
-			panic(err)
-		}
-		t.Fatal(err)
-	}
-
-	// OSX tempdir are /var, but actually symlinked to /private/var
-	dir, err = filepath.EvalSymlinks(dir)
-	if err != nil {
-		if t == nil {
-			panic(err)
-		}
-		t.Fatal(err)
-	}
-
-	return dir, func(t testing.T) {
-		if err := os.RemoveAll(dir); err != nil {
-			if t == nil {
-				panic(err)
-			}
-			t.Fatal(err)
-		}
-	}
-}
-
-func NewMockBuiltinRegistry() *mockBuiltinRegistry {
-	return &mockBuiltinRegistry{
-		forTesting: map[string]mockBackend{
-			"mysql-database-plugin":      {PluginType: consts.PluginTypeDatabase},
-			"postgresql-database-plugin": {PluginType: consts.PluginTypeDatabase},
-			"approle":                    {PluginType: consts.PluginTypeCredential},
-			"pending-removal-test-plugin": {
-				PluginType:        consts.PluginTypeCredential,
-				DeprecationStatus: consts.PendingRemoval,
-			},
-			"aws":    {PluginType: consts.PluginTypeCredential},
-			"consul": {PluginType: consts.PluginTypeSecrets},
-		},
-	}
-}
-
-type mockBackend struct {
-	consts.PluginType
-	consts.DeprecationStatus
-}
-
-type mockBuiltinRegistry struct {
-	forTesting map[string]mockBackend
-}
-
-func toFunc(f logical.Factory) func() (interface{}, error) {
-	return func() (interface{}, error) {
-		return f, nil
-	}
-}
-
-func (m *mockBuiltinRegistry) Get(name string, pluginType consts.PluginType) (func() (interface{}, error), bool) {
-	testBackend, ok := m.forTesting[name]
-	if !ok {
-		return nil, false
-	}
-	testPluginType := testBackend.PluginType
-	if pluginType != testPluginType {
-		return nil, false
-	}
-
-	switch name {
-	case "approle", "pending-removal-test-plugin":
-		return toFunc(approle.Factory), true
-	case "aws":
-		return toFunc(func(ctx context.Context, config *logical.BackendConfig) (logical.Backend, error) {
-			b := new(framework.Backend)
-			b.Setup(ctx, config)
-			b.BackendType = logical.TypeCredential
-			return b, nil
-		}), true
-	case "postgresql-database-plugin":
-		return toFunc(func(ctx context.Context, config *logical.BackendConfig) (logical.Backend, error) {
-			b := new(framework.Backend)
-			b.Setup(ctx, config)
-			b.BackendType = logical.TypeLogical
-			return b, nil
-		}), true
-	case "mysql-database-plugin":
-		return mysql.New(mysql.DefaultUserNameTemplate), true
-	case "consul":
-		return toFunc(func(ctx context.Context, config *logical.BackendConfig) (logical.Backend, error) {
-			b := new(framework.Backend)
-			b.Setup(ctx, config)
-			b.BackendType = logical.TypeLogical
-			return b, nil
-		}), true
-	default:
-		return nil, false
-	}
-}
-
-// Keys only supports getting a realistic list of the keys for database plugins,
-// and approle
-func (m *mockBuiltinRegistry) Keys(pluginType consts.PluginType) []string {
-	switch pluginType {
-	case consts.PluginTypeDatabase:
-		// This is a hard-coded reproduction of the db plugin keys in
-		// helper/builtinplugins/registry.go. The registry isn't directly used
-		// because it causes import cycles.
-		return []string{
-			"mysql-database-plugin",
-			"mysql-aurora-database-plugin",
-			"mysql-rds-database-plugin",
-			"mysql-legacy-database-plugin",
-
-			"cassandra-database-plugin",
-			"couchbase-database-plugin",
-			"elasticsearch-database-plugin",
-			"hana-database-plugin",
-			"influxdb-database-plugin",
-			"mongodb-database-plugin",
-			"mongodbatlas-database-plugin",
-			"mssql-database-plugin",
-			"postgresql-database-plugin",
-			"redis-elasticache-database-plugin",
-			"redshift-database-plugin",
-			"redis-database-plugin",
-			"snowflake-database-plugin",
-		}
-	case consts.PluginTypeCredential:
-		return []string{
-			"pending-removal-test-plugin",
-			"approle",
-		}
-	}
-	return []string{}
-}
-
-func (m *mockBuiltinRegistry) Contains(name string, pluginType consts.PluginType) bool {
-	for _, key := range m.Keys(pluginType) {
-		if key == name {
-			return true
-		}
-	}
-	return false
-}
-
-func (m *mockBuiltinRegistry) DeprecationStatus(name string, pluginType consts.PluginType) (consts.DeprecationStatus, bool) {
-	if m.Contains(name, pluginType) {
-		return m.forTesting[name].DeprecationStatus, true
-	}
-
-	return consts.Unknown, false
-}
-
-func TestNoopAudit(t testing.T, config map[string]string) *NoopAudit {
-	n, err := NewNoopAudit(config)
-	if err != nil {
-		t.Fatal(err)
-	}
-	return n
-}
-
-func NewNoopAudit(config map[string]string) (*NoopAudit, error) {
-	view := &logical.InmemStorage{}
-	err := view.Put(context.Background(), &logical.StorageEntry{
-		Key:   "salt",
-		Value: []byte("foo"),
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	n := &NoopAudit{
-		Config: &audit.BackendConfig{
-			SaltView: view,
-			SaltConfig: &salt.Config{
-				HMAC:     sha256.New,
-				HMACType: "hmac-sha256",
-			},
-			Config: config,
-		},
-	}
-	n.formatter.AuditFormatWriter = &audit.JSONFormatWriter{
-		SaltFunc: n.Salt,
-	}
-	return n, nil
-}
-
-func NoopAuditFactory(records **[][]byte) audit.Factory {
-	return func(_ context.Context, config *audit.BackendConfig) (audit.Backend, error) {
-		n, err := NewNoopAudit(config.Config)
-		if err != nil {
-			return nil, err
-		}
-		if records != nil {
-			*records = &n.records
-		}
-		return n, nil
-	}
-}
-
-type NoopAudit struct {
-	Config         *audit.BackendConfig
-	ReqErr         error
-	ReqAuth        []*logical.Auth
-	Req            []*logical.Request
-	ReqHeaders     []map[string][]string
-	ReqNonHMACKeys []string
-	ReqErrs        []error
-
-	RespErr            error
-	RespAuth           []*logical.Auth
-	RespReq            []*logical.Request
-	Resp               []*logical.Response
-	RespNonHMACKeys    [][]string
-	RespReqNonHMACKeys [][]string
-	RespErrs           []error
-
-	formatter audit.AuditFormatter
-	records   [][]byte
-	l         sync.RWMutex
-	salt      *salt.Salt
-	saltMutex sync.RWMutex
-}
-
-func (n *NoopAudit) LogRequest(ctx context.Context, in *logical.LogInput) error {
-	n.l.Lock()
-	defer n.l.Unlock()
-	if n.formatter.AuditFormatWriter != nil {
-		var w bytes.Buffer
-		err := n.formatter.FormatRequest(ctx, &w, audit.FormatterConfig{}, in)
-		if err != nil {
-			return err
-		}
-		n.records = append(n.records, w.Bytes())
-	}
-
-	n.ReqAuth = append(n.ReqAuth, in.Auth)
-	n.Req = append(n.Req, in.Request)
-	n.ReqHeaders = append(n.ReqHeaders, in.Request.Headers)
-	n.ReqNonHMACKeys = in.NonHMACReqDataKeys
-	n.ReqErrs = append(n.ReqErrs, in.OuterErr)
-
-	return n.ReqErr
-}
-
-func (n *NoopAudit) LogResponse(ctx context.Context, in *logical.LogInput) error {
-	n.l.Lock()
-	defer n.l.Unlock()
-
-	if n.formatter.AuditFormatWriter != nil {
-		var w bytes.Buffer
-		err := n.formatter.FormatResponse(ctx, &w, audit.FormatterConfig{}, in)
-		if err != nil {
-			return err
-		}
-		n.records = append(n.records, w.Bytes())
-	}
-
-	n.RespAuth = append(n.RespAuth, in.Auth)
-	n.RespReq = append(n.RespReq, in.Request)
-	n.Resp = append(n.Resp, in.Response)
-	n.RespErrs = append(n.RespErrs, in.OuterErr)
-
-	if in.Response != nil {
-		n.RespNonHMACKeys = append(n.RespNonHMACKeys, in.NonHMACRespDataKeys)
-		n.RespReqNonHMACKeys = append(n.RespReqNonHMACKeys, in.NonHMACReqDataKeys)
-	}
-
-	return n.RespErr
-}
-
-func (n *NoopAudit) LogTestMessage(ctx context.Context, in *logical.LogInput, config map[string]string) error {
-	n.l.Lock()
-	defer n.l.Unlock()
-	var w bytes.Buffer
-	tempFormatter := audit.NewTemporaryFormatter(config["format"], config["prefix"])
-	err := tempFormatter.FormatResponse(ctx, &w, audit.FormatterConfig{}, in)
-	if err != nil {
-		return err
-	}
-	n.records = append(n.records, w.Bytes())
-	return nil
-}
-
-func (n *NoopAudit) Salt(ctx context.Context) (*salt.Salt, error) {
-	n.saltMutex.RLock()
-	if n.salt != nil {
-		defer n.saltMutex.RUnlock()
-		return n.salt, nil
-	}
-	n.saltMutex.RUnlock()
-	n.saltMutex.Lock()
-	defer n.saltMutex.Unlock()
-	if n.salt != nil {
-		return n.salt, nil
-	}
-	salt, err := salt.NewSalt(ctx, n.Config.SaltView, n.Config.SaltConfig)
-	if err != nil {
-		return nil, err
-	}
-	n.salt = salt
-	return salt, nil
-}
-
-func (n *NoopAudit) GetHash(ctx context.Context, data string) (string, error) {
-	salt, err := n.Salt(ctx)
-	if err != nil {
-		return "", err
-	}
-	return salt.GetIdentifiedHMAC(data), nil
-}
-
-func (n *NoopAudit) Reload(ctx context.Context) error {
-	return nil
-}
-
-func (n *NoopAudit) Invalidate(ctx context.Context) {
-	n.saltMutex.Lock()
-	defer n.saltMutex.Unlock()
-	n.salt = nil
-}
-
-type TestLogger struct {
-	hclog.Logger
-	Path string
-	File *os.File
-	sink hclog.SinkAdapter
-}
-
-func NewTestLogger(t testing.T) *TestLogger {
-	var logFile *os.File
-	var logPath string
-	output := os.Stderr
-
-	logDir := os.Getenv("VAULT_TEST_LOG_DIR")
-	if logDir != "" {
-		logPath = filepath.Join(logDir, t.Name()+".log")
-		// t.Name may include slashes.
-		dir, _ := filepath.Split(logPath)
-		err := os.MkdirAll(dir, 0o755)
-		if err != nil {
-			t.Fatal(err)
-		}
-		logFile, err = os.Create(logPath)
-		if err != nil {
-			t.Fatal(err)
-		}
-		output = logFile
-	}
-
-	// We send nothing on the regular logger, that way we can later deregister
-	// the sink to stop logging during cluster cleanup.
-	logger := hclog.NewInterceptLogger(&hclog.LoggerOptions{
-		Output:            ioutil.Discard,
-		IndependentLevels: true,
-	})
-	sink := hclog.NewSinkAdapter(&hclog.LoggerOptions{
-		Output:            output,
-		Level:             hclog.Trace,
-		IndependentLevels: true,
-	})
-	logger.RegisterSink(sink)
-	return &TestLogger{
-		Path:   logPath,
-		File:   logFile,
-		Logger: logger,
-		sink:   sink,
-	}
-}
-
-func (tl *TestLogger) StopLogging() {
-	tl.Logger.(hclog.InterceptLogger).DeregisterSink(tl.sink)
-}
diff --git a/helper/testhelpers/docker/testhelpers.go b/helper/testhelpers/docker/testhelpers.go
new file mode 100644
index 0000000000000..88f377d573033
--- /dev/null
+++ b/helper/testhelpers/docker/testhelpers.go
@@ -0,0 +1,333 @@
+package docker
+
+import (
+	"bytes"
+	"context"
+	"encoding/base64"
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"net/url"
+	"os"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/cenkalti/backoff/v3"
+	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/api/types/container"
+	"github.com/docker/docker/api/types/network"
+	"github.com/docker/docker/api/types/strslice"
+	"github.com/docker/docker/client"
+	"github.com/docker/docker/pkg/archive"
+	"github.com/docker/go-connections/nat"
+	"github.com/hashicorp/go-uuid"
+)
+
+type Runner struct {
+	DockerAPI  *client.Client
+	RunOptions RunOptions
+}
+
+type RunOptions struct {
+	ImageRepo       string
+	ImageTag        string
+	ContainerName   string
+	Cmd             []string
+	Entrypoint      []string
+	Env             []string
+	NetworkID       string
+	CopyFromTo      map[string]string
+	Ports           []string
+	DoNotAutoRemove bool
+	AuthUsername    string
+	AuthPassword    string
+	LogConsumer     func(string)
+}
+
+func NewServiceRunner(opts RunOptions) (*Runner, error) {
+	dapi, err := client.NewClientWithOpts(client.FromEnv, client.WithVersion("1.39"))
+	if err != nil {
+		return nil, err
+	}
+
+	if opts.NetworkID == "" {
+		opts.NetworkID = os.Getenv("TEST_DOCKER_NETWORK_ID")
+	}
+	if opts.ContainerName == "" {
+		if strings.Contains(opts.ImageRepo, "/") {
+			return nil, fmt.Errorf("ContainerName is required for non-library images")
+		}
+		// If there's no slash in the repo it's almost certainly going to be
+		// a good container name.
+		opts.ContainerName = opts.ImageRepo
+	}
+	return &Runner{
+		DockerAPI:  dapi,
+		RunOptions: opts,
+	}, nil
+}
+
+type ServiceConfig interface {
+	Address() string
+	URL() *url.URL
+}
+
+func NewServiceHostPort(host string, port int) *ServiceHostPort {
+	return &ServiceHostPort{address: fmt.Sprintf("%s:%d", host, port)}
+}
+
+func NewServiceHostPortParse(s string) (*ServiceHostPort, error) {
+	pieces := strings.Split(s, ":")
+	if len(pieces) != 2 {
+		return nil, fmt.Errorf("address must be of the form host:port, got: %v", s)
+	}
+
+	port, err := strconv.Atoi(pieces[1])
+	if err != nil || port < 1 {
+		return nil, fmt.Errorf("address must be of the form host:port, got: %v", s)
+	}
+
+	return &ServiceHostPort{s}, nil
+}
+
+type ServiceHostPort struct {
+	address string
+}
+
+func (s ServiceHostPort) Address() string {
+	return s.address
+}
+
+func (s ServiceHostPort) URL() *url.URL {
+	return &url.URL{Host: s.address}
+}
+
+func NewServiceURLParse(s string) (*ServiceURL, error) {
+	u, err := url.Parse(s)
+	if err != nil {
+		return nil, err
+	}
+	return &ServiceURL{u: *u}, nil
+}
+
+func NewServiceURL(u url.URL) *ServiceURL {
+	return &ServiceURL{u: u}
+}
+
+type ServiceURL struct {
+	u url.URL
+}
+
+func (s ServiceURL) Address() string {
+	return s.u.Host
+}
+
+func (s ServiceURL) URL() *url.URL {
+	return &s.u
+}
+
+// ServiceAdapter verifies connectivity to the service, then returns either the
+// connection string (typically a URL) and nil, or empty string and an error.
+type ServiceAdapter func(ctx context.Context, host string, port int) (ServiceConfig, error)
+
+func (d *Runner) StartService(ctx context.Context, connect ServiceAdapter) (*Service, error) {
+	container, hostIPs, err := d.Start(context.Background())
+	if err != nil {
+		return nil, err
+	}
+
+	cleanup := func() {
+		if d.RunOptions.LogConsumer != nil {
+			rc, err := d.DockerAPI.ContainerLogs(ctx, container.ID, types.ContainerLogsOptions{
+				ShowStdout: true,
+				ShowStderr: true,
+				Timestamps: true,
+				Details:    true,
+			})
+			if err == nil {
+				b, err := ioutil.ReadAll(rc)
+				if err != nil {
+					d.RunOptions.LogConsumer(fmt.Sprintf("error reading container logs, err=%v, read: %s", err, string(b)))
+				} else {
+					d.RunOptions.LogConsumer(string(b))
+				}
+			}
+		}
+
+		for i := 0; i < 10; i++ {
+			err := d.DockerAPI.ContainerRemove(ctx, container.ID, types.ContainerRemoveOptions{Force: true})
+			if err == nil {
+				return
+			}
+			time.Sleep(1 * time.Second)
+		}
+	}
+
+	bo := backoff.NewExponentialBackOff()
+	bo.MaxInterval = time.Second * 5
+	bo.MaxElapsedTime = 2 * time.Minute
+
+	pieces := strings.Split(hostIPs[0], ":")
+	portInt, err := strconv.Atoi(pieces[1])
+	if err != nil {
+		return nil, err
+	}
+
+	var config ServiceConfig
+	err = backoff.Retry(func() error {
+		c, err := connect(ctx, pieces[0], portInt)
+		if err != nil {
+			return err
+		}
+		if c == nil {
+			return fmt.Errorf("service adapter returned nil error and config")
+		}
+		config = c
+		return nil
+	}, bo)
+
+	if err != nil {
+		if !d.RunOptions.DoNotAutoRemove {
+			cleanup()
+		}
+		return nil, err
+	}
+
+	return &Service{
+		Config:    config,
+		Cleanup:   cleanup,
+		Container: container,
+	}, nil
+}
+
+type Service struct {
+	Config    ServiceConfig
+	Cleanup   func()
+	Container *types.ContainerJSON
+}
+
+func (d *Runner) Start(ctx context.Context) (*types.ContainerJSON, []string, error) {
+	suffix, err := uuid.GenerateUUID()
+	if err != nil {
+		return nil, nil, err
+	}
+	name := d.RunOptions.ContainerName + "-" + suffix
+
+	cfg := &container.Config{
+		Hostname: name,
+		Image:    fmt.Sprintf("%s:%s", d.RunOptions.ImageRepo, d.RunOptions.ImageTag),
+		Env:      d.RunOptions.Env,
+		Cmd:      d.RunOptions.Cmd,
+	}
+	if len(d.RunOptions.Ports) > 0 {
+		cfg.ExposedPorts = make(map[nat.Port]struct{})
+		for _, p := range d.RunOptions.Ports {
+			cfg.ExposedPorts[nat.Port(p)] = struct{}{}
+		}
+	}
+	if len(d.RunOptions.Entrypoint) > 0 {
+		cfg.Entrypoint = strslice.StrSlice(d.RunOptions.Entrypoint)
+	}
+
+	hostConfig := &container.HostConfig{
+		AutoRemove:      !d.RunOptions.DoNotAutoRemove,
+		PublishAllPorts: true,
+	}
+
+	netConfig := &network.NetworkingConfig{}
+	if d.RunOptions.NetworkID != "" {
+		netConfig.EndpointsConfig = map[string]*network.EndpointSettings{
+			d.RunOptions.NetworkID: {},
+		}
+	}
+
+	// best-effort pull
+	var opts types.ImageCreateOptions
+	if d.RunOptions.AuthUsername != "" && d.RunOptions.AuthPassword != "" {
+		var buf bytes.Buffer
+		auth := map[string]string{
+			"username": d.RunOptions.AuthUsername,
+			"password": d.RunOptions.AuthPassword,
+		}
+		if err := json.NewEncoder(&buf).Encode(auth); err != nil {
+			return nil, nil, err
+		}
+		opts.RegistryAuth = base64.URLEncoding.EncodeToString(buf.Bytes())
+	}
+	resp, _ := d.DockerAPI.ImageCreate(ctx, cfg.Image, opts)
+	if resp != nil {
+		_, _ = ioutil.ReadAll(resp)
+	}
+
+	c, err := d.DockerAPI.ContainerCreate(ctx, cfg, hostConfig, netConfig, nil, cfg.Hostname)
+	if err != nil {
+		return nil, nil, fmt.Errorf("container create failed: %v", err)
+	}
+
+	for from, to := range d.RunOptions.CopyFromTo {
+		if err := copyToContainer(ctx, d.DockerAPI, c.ID, from, to); err != nil {
+			_ = d.DockerAPI.ContainerRemove(ctx, c.ID, types.ContainerRemoveOptions{})
+			return nil, nil, err
+		}
+	}
+
+	err = d.DockerAPI.ContainerStart(ctx, c.ID, types.ContainerStartOptions{})
+	if err != nil {
+		_ = d.DockerAPI.ContainerRemove(ctx, c.ID, types.ContainerRemoveOptions{})
+		return nil, nil, fmt.Errorf("container start failed: %v", err)
+	}
+
+	inspect, err := d.DockerAPI.ContainerInspect(ctx, c.ID)
+	if err != nil {
+		_ = d.DockerAPI.ContainerRemove(ctx, c.ID, types.ContainerRemoveOptions{})
+		return nil, nil, err
+	}
+
+	var addrs []string
+	for _, port := range d.RunOptions.Ports {
+		pieces := strings.Split(port, "/")
+		if len(pieces) < 2 {
+			return nil, nil, fmt.Errorf("expected port of the form 1234/tcp, got: %s", port)
+		}
+		if d.RunOptions.NetworkID != "" {
+			addrs = append(addrs, fmt.Sprintf("%s:%s", cfg.Hostname, pieces[0]))
+		} else {
+			mapped, ok := inspect.NetworkSettings.Ports[nat.Port(port)]
+			if !ok || len(mapped) == 0 {
+				return nil, nil, fmt.Errorf("no port mapping found for %s", port)
+			}
+
+			addrs = append(addrs, fmt.Sprintf("127.0.0.1:%s", mapped[0].HostPort))
+		}
+	}
+
+	return &inspect, addrs, nil
+}
+
+func copyToContainer(ctx context.Context, dapi *client.Client, containerID, from, to string) error {
+	srcInfo, err := archive.CopyInfoSourcePath(from, false)
+	if err != nil {
+		return fmt.Errorf("error copying from source %q: %v", from, err)
+	}
+
+	srcArchive, err := archive.TarResource(srcInfo)
+	if err != nil {
+		return fmt.Errorf("error creating tar from source %q: %v", from, err)
+	}
+	defer srcArchive.Close()
+
+	dstInfo := archive.CopyInfo{Path: to}
+
+	dstDir, content, err := archive.PrepareArchiveCopy(srcArchive, srcInfo, dstInfo)
+	if err != nil {
+		return fmt.Errorf("error preparing copy from %q -> %q: %v", from, to, err)
+	}
+	defer content.Close()
+	err = dapi.CopyToContainer(ctx, containerID, dstDir, content, types.CopyToContainerOptions{})
+	if err != nil {
+		return fmt.Errorf("error copying from %q -> %q: %v", from, to, err)
+	}
+
+	return nil
+}
diff --git a/helper/testhelpers/etcd/etcdhelper.go b/helper/testhelpers/etcd/etcdhelper.go
index a5b2578439c98..1051dd1405a44 100644
--- a/helper/testhelpers/etcd/etcdhelper.go
+++ b/helper/testhelpers/etcd/etcdhelper.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package etcd
 
 import (
@@ -11,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/vault/sdk/helper/docker"
+	"github.com/hashicorp/vault/helper/testhelpers/docker"
 	clientv3 "go.etcd.io/etcd/client/v3"
 )
 
diff --git a/helper/testhelpers/fakegcsserver/fake-gcs-server.go b/helper/testhelpers/fakegcsserver/fake-gcs-server.go
index 503824e99e2df..59c9001adc292 100644
--- a/helper/testhelpers/fakegcsserver/fake-gcs-server.go
+++ b/helper/testhelpers/fakegcsserver/fake-gcs-server.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package fakegcsserver
 
 import (
@@ -12,7 +9,7 @@ import (
 	"testing"
 
 	"cloud.google.com/go/storage"
-	"github.com/hashicorp/vault/sdk/helper/docker"
+	"github.com/hashicorp/vault/helper/testhelpers/docker"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 )
@@ -30,7 +27,7 @@ func PrepareTestContainer(t *testing.T, version string) (func(), docker.ServiceC
 	}
 	runner, err := docker.NewServiceRunner(docker.RunOptions{
 		ContainerName: "fake-gcs-server",
-		ImageRepo:     "docker.mirror.hashicorp.services/fsouza/fake-gcs-server",
+		ImageRepo:     "fsouza/fake-gcs-server",
 		ImageTag:      version,
 		Cmd:           []string{"-scheme", "http", "-public-host", "storage.gcs.127.0.0.1.nip.io:4443"},
 		Ports:         []string{"4443/tcp"},
diff --git a/helper/testhelpers/ldap/ldaphelper.go b/helper/testhelpers/ldap/ldaphelper.go
index 7eebc134d5815..2bfb487c49ba9 100644
--- a/helper/testhelpers/ldap/ldaphelper.go
+++ b/helper/testhelpers/ldap/ldaphelper.go
@@ -1,30 +1,20 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package ldap
 
 import (
 	"context"
 	"fmt"
-	"runtime"
-	"strings"
 	"testing"
 
 	hclog "github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/vault/sdk/helper/docker"
+	"github.com/hashicorp/vault/helper/testhelpers/docker"
 	"github.com/hashicorp/vault/sdk/helper/ldaputil"
 )
 
 func PrepareTestContainer(t *testing.T, version string) (cleanup func(), cfg *ldaputil.ConfigEntry) {
-	// Skipping on ARM, as this image can't run on ARM architecture
-	if strings.Contains(runtime.GOARCH, "arm") {
-		t.Skip("Skipping, as this image is not supported on ARM architectures")
-	}
-
 	runner, err := docker.NewServiceRunner(docker.RunOptions{
 		// Currently set to "michelvocks" until https://github.com/rroemhild/docker-test-openldap/pull/14
 		// has been merged.
-		ImageRepo:     "docker.mirror.hashicorp.services/michelvocks/docker-test-openldap",
+		ImageRepo:     "michelvocks/docker-test-openldap",
 		ImageTag:      version,
 		ContainerName: "ldap",
 		Ports:         []string{"389/tcp"},
diff --git a/helper/testhelpers/logical/testing.go b/helper/testhelpers/logical/testing.go
index f634be2f39b84..4740ff6be370a 100644
--- a/helper/testhelpers/logical/testing.go
+++ b/helper/testhelpers/logical/testing.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package testing
 
 import (
@@ -12,11 +9,11 @@ import (
 	"sort"
 	"testing"
 
-	"github.com/hashicorp/errwrap"
 	log "github.com/hashicorp/go-hclog"
+
+	"github.com/hashicorp/errwrap"
 	"github.com/hashicorp/vault/api"
 	"github.com/hashicorp/vault/helper/namespace"
-	"github.com/hashicorp/vault/helper/testhelpers/corehelpers"
 	"github.com/hashicorp/vault/http"
 	"github.com/hashicorp/vault/sdk/helper/logging"
 	"github.com/hashicorp/vault/sdk/logical"
@@ -169,7 +166,7 @@ func Test(tt TestT, c TestCase) {
 	config := &vault.CoreConfig{
 		Physical:        phys,
 		DisableMlock:    true,
-		BuiltinRegistry: corehelpers.NewMockBuiltinRegistry(),
+		BuiltinRegistry: vault.NewMockBuiltinRegistry(),
 	}
 
 	if c.LogicalBackend != nil || c.LogicalFactory != nil {
diff --git a/helper/testhelpers/logical/testing_test.go b/helper/testhelpers/logical/testing_test.go
index 9f2d74b72f10b..5a4096bfc74b5 100644
--- a/helper/testhelpers/logical/testing_test.go
+++ b/helper/testhelpers/logical/testing_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package testing
 
 import (
diff --git a/helper/testhelpers/minimal/minimal.go b/helper/testhelpers/minimal/minimal.go
deleted file mode 100644
index a13ddf0c01411..0000000000000
--- a/helper/testhelpers/minimal/minimal.go
+++ /dev/null
@@ -1,81 +0,0 @@
-package minimal
-
-import (
-	"github.com/hashicorp/go-hclog"
-	logicalKv "github.com/hashicorp/vault-plugin-secrets-kv"
-	"github.com/hashicorp/vault/audit"
-	auditFile "github.com/hashicorp/vault/builtin/audit/file"
-	auditSocket "github.com/hashicorp/vault/builtin/audit/socket"
-	auditSyslog "github.com/hashicorp/vault/builtin/audit/syslog"
-	logicalDb "github.com/hashicorp/vault/builtin/logical/database"
-	"github.com/hashicorp/vault/builtin/plugin"
-	"github.com/hashicorp/vault/helper/builtinplugins"
-	"github.com/hashicorp/vault/http"
-	"github.com/hashicorp/vault/sdk/helper/logging"
-	"github.com/hashicorp/vault/sdk/logical"
-	"github.com/hashicorp/vault/sdk/physical/inmem"
-	"github.com/hashicorp/vault/vault"
-	"github.com/mitchellh/copystructure"
-	"github.com/mitchellh/go-testing-interface"
-)
-
-// NewTestSoloCluster is a simpler version of NewTestCluster that only creates
-// single-node clusters.  It is intentionally minimalist, if you need something
-// from vault.TestClusterOptions, use NewTestCluster instead.  It should work fine
-// with a nil config argument.  There is no need to call Start or Cleanup or
-// TestWaitActive on the resulting cluster.
-func NewTestSoloCluster(t testing.T, config *vault.CoreConfig) *vault.TestCluster {
-	logger := logging.NewVaultLogger(hclog.Trace).Named(t.Name())
-
-	mycfg := &vault.CoreConfig{}
-
-	if config != nil {
-		// It's rude to modify an input argument as a side-effect
-		copy, err := copystructure.Copy(config)
-		if err != nil {
-			t.Fatal(err)
-		}
-		mycfg = copy.(*vault.CoreConfig)
-	}
-	if mycfg.Physical == nil {
-		// Don't use NewTransactionalInmem because that would enable replication,
-		// which we don't care about in our case (use NewTestCluster for that.)
-		inm, err := inmem.NewInmem(nil, logger)
-		if err != nil {
-			t.Fatal(err)
-		}
-		mycfg.Physical = inm
-	}
-	if mycfg.CredentialBackends == nil {
-		mycfg.CredentialBackends = map[string]logical.Factory{
-			"plugin": plugin.Factory,
-		}
-	}
-	if mycfg.LogicalBackends == nil {
-		mycfg.LogicalBackends = map[string]logical.Factory{
-			"plugin":   plugin.Factory,
-			"database": logicalDb.Factory,
-			// This is also available in the plugin catalog, but is here due to the need to
-			// automatically mount it.
-			"kv": logicalKv.Factory,
-		}
-	}
-	if mycfg.AuditBackends == nil {
-		mycfg.AuditBackends = map[string]audit.Factory{
-			"file":   auditFile.Factory,
-			"socket": auditSocket.Factory,
-			"syslog": auditSyslog.Factory,
-		}
-	}
-	if mycfg.BuiltinRegistry == nil {
-		mycfg.BuiltinRegistry = builtinplugins.Registry
-	}
-
-	cluster := vault.NewTestCluster(t, mycfg, &vault.TestClusterOptions{
-		NumCores:    1,
-		HandlerFunc: http.Handler,
-		Logger:      logger,
-	})
-	t.Cleanup(cluster.Cleanup)
-	return cluster
-}
diff --git a/helper/testhelpers/minio/miniohelper.go b/helper/testhelpers/minio/miniohelper.go
index 5550a12106a36..c537585059931 100644
--- a/helper/testhelpers/minio/miniohelper.go
+++ b/helper/testhelpers/minio/miniohelper.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package minio
 
 import (
@@ -14,7 +11,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws/defaults"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/s3"
-	"github.com/hashicorp/vault/sdk/helper/docker"
+	"github.com/hashicorp/vault/helper/testhelpers/docker"
 )
 
 type Config struct {
@@ -35,7 +32,7 @@ func PrepareTestContainer(t *testing.T, version string) (func(), *Config) {
 	}
 	runner, err := docker.NewServiceRunner(docker.RunOptions{
 		ContainerName: "minio",
-		ImageRepo:     "docker.mirror.hashicorp.services/minio/minio",
+		ImageRepo:     "minio/minio",
 		ImageTag:      version,
 		Env: []string{
 			"MINIO_ACCESS_KEY=" + accessKeyID,
diff --git a/helper/testhelpers/mongodb/mongodbhelper.go b/helper/testhelpers/mongodb/mongodbhelper.go
index 1f7afe30c3139..3dff8484b343c 100644
--- a/helper/testhelpers/mongodb/mongodbhelper.go
+++ b/helper/testhelpers/mongodb/mongodbhelper.go
@@ -1,19 +1,20 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package mongodb
 
 import (
 	"context"
+	"crypto/tls"
+	"errors"
 	"fmt"
+	"net"
+	"net/url"
 	"os"
+	"strconv"
+	"strings"
 	"testing"
 	"time"
 
-	"github.com/hashicorp/vault/sdk/helper/docker"
-	"go.mongodb.org/mongo-driver/mongo"
-	"go.mongodb.org/mongo-driver/mongo/options"
-	"go.mongodb.org/mongo-driver/mongo/readpref"
+	"github.com/hashicorp/vault/helper/testhelpers/docker"
+	"gopkg.in/mgo.v2"
 )
 
 // PrepareTestContainer calls PrepareTestContainerWithDatabase without a
@@ -30,10 +31,9 @@ func PrepareTestContainerWithDatabase(t *testing.T, version, dbName string) (fun
 	}
 
 	runner, err := docker.NewServiceRunner(docker.RunOptions{
-		ContainerName: "mongo",
-		ImageRepo:     "docker.mirror.hashicorp.services/library/mongo",
-		ImageTag:      version,
-		Ports:         []string{"27017/tcp"},
+		ImageRepo: "mongo",
+		ImageTag:  version,
+		Ports:     []string{"27017/tcp"},
 	})
 	if err != nil {
 		t.Fatalf("could not start docker mongo: %s", err)
@@ -44,16 +44,22 @@ func PrepareTestContainerWithDatabase(t *testing.T, version, dbName string) (fun
 		if dbName != "" {
 			connURL = fmt.Sprintf("%s/%s", connURL, dbName)
 		}
+		dialInfo, err := ParseMongoURL(connURL)
+		if err != nil {
+			return nil, err
+		}
 
-		ctx, _ = context.WithTimeout(context.Background(), 1*time.Minute)
-		client, err := mongo.Connect(ctx, options.Client().ApplyURI(connURL))
+		session, err := mgo.DialWithInfo(dialInfo)
 		if err != nil {
 			return nil, err
 		}
+		defer session.Close()
 
-		err = client.Ping(ctx, readpref.Primary())
-		if err = client.Disconnect(ctx); err != nil {
-			t.Fatal()
+		session.SetSyncTimeout(1 * time.Minute)
+		session.SetSocketTimeout(1 * time.Minute)
+		err = session.Ping()
+		if err != nil {
+			return nil, err
 		}
 
 		return docker.NewServiceURLParse(connURL)
@@ -64,3 +70,72 @@ func PrepareTestContainerWithDatabase(t *testing.T, version, dbName string) (fun
 
 	return svc.Cleanup, svc.Config.URL().String()
 }
+
+// ParseMongoURL will parse a connection string and return a configured dialer
+func ParseMongoURL(rawURL string) (*mgo.DialInfo, error) {
+	url, err := url.Parse(rawURL)
+	if err != nil {
+		return nil, err
+	}
+
+	info := mgo.DialInfo{
+		Addrs:    strings.Split(url.Host, ","),
+		Database: strings.TrimPrefix(url.Path, "/"),
+		Timeout:  10 * time.Second,
+	}
+
+	if url.User != nil {
+		info.Username = url.User.Username()
+		info.Password, _ = url.User.Password()
+	}
+
+	query := url.Query()
+	for key, values := range query {
+		var value string
+		if len(values) > 0 {
+			value = values[0]
+		}
+
+		switch key {
+		case "authSource":
+			info.Source = value
+		case "authMechanism":
+			info.Mechanism = value
+		case "gssapiServiceName":
+			info.Service = value
+		case "replicaSet":
+			info.ReplicaSetName = value
+		case "maxPoolSize":
+			poolLimit, err := strconv.Atoi(value)
+			if err != nil {
+				return nil, errors.New("bad value for maxPoolSize: " + value)
+			}
+			info.PoolLimit = poolLimit
+		case "ssl":
+			// Unfortunately, mgo doesn't support the ssl parameter in its MongoDB URI parsing logic, so we have to handle that
+			// ourselves. See https://github.com/go-mgo/mgo/issues/84
+			ssl, err := strconv.ParseBool(value)
+			if err != nil {
+				return nil, errors.New("bad value for ssl: " + value)
+			}
+			if ssl {
+				info.DialServer = func(addr *mgo.ServerAddr) (net.Conn, error) {
+					return tls.Dial("tcp", addr.String(), &tls.Config{})
+				}
+			}
+		case "connect":
+			if value == "direct" {
+				info.Direct = true
+				break
+			}
+			if value == "replicaSet" {
+				break
+			}
+			fallthrough
+		default:
+			return nil, errors.New("unsupported connection URL option: " + key + "=" + value)
+		}
+	}
+
+	return &info, nil
+}
diff --git a/helper/testhelpers/mssql/mssqlhelper.go b/helper/testhelpers/mssql/mssqlhelper.go
index 908e0277cc2d5..01bfd54b53872 100644
--- a/helper/testhelpers/mssql/mssqlhelper.go
+++ b/helper/testhelpers/mssql/mssqlhelper.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package mssqlhelper
 
 import (
@@ -9,11 +6,9 @@ import (
 	"fmt"
 	"net/url"
 	"os"
-	"runtime"
-	"strings"
 	"testing"
 
-	"github.com/hashicorp/vault/sdk/helper/docker"
+	"github.com/hashicorp/vault/helper/testhelpers/docker"
 )
 
 const mssqlPassword = "yourStrong(!)Password"
@@ -24,10 +19,6 @@ const mssqlPassword = "yourStrong(!)Password"
 const numRetries = 3
 
 func PrepareMSSQLTestContainer(t *testing.T) (cleanup func(), retURL string) {
-	if strings.Contains(runtime.GOARCH, "arm") {
-		t.Skip("Skipping, as this image is not supported on ARM architectures")
-	}
-
 	if os.Getenv("MSSQL_URL") != "" {
 		return func() {}, os.Getenv("MSSQL_URL")
 	}
diff --git a/helper/testhelpers/mysql/mysqlhelper.go b/helper/testhelpers/mysql/mysqlhelper.go
index 19887a93e2ce9..145c91e253c1e 100644
--- a/helper/testhelpers/mysql/mysqlhelper.go
+++ b/helper/testhelpers/mysql/mysqlhelper.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package mysqlhelper
 
 import (
@@ -8,11 +5,10 @@ import (
 	"database/sql"
 	"fmt"
 	"os"
-	"runtime"
 	"strings"
 	"testing"
 
-	"github.com/hashicorp/vault/sdk/helper/docker"
+	"github.com/hashicorp/vault/helper/testhelpers/docker"
 )
 
 type Config struct {
@@ -27,23 +23,16 @@ func PrepareTestContainer(t *testing.T, legacy bool, pw string) (func(), string)
 		return func() {}, os.Getenv("MYSQL_URL")
 	}
 
-	// ARM64 is only supported on MySQL 8.0 and above. If we update
-	// our image and support to 8.0, we can unskip these tests.
-	if strings.Contains(runtime.GOARCH, "arm") {
-		t.Skip("Skipping, as MySQL 5.7 is not supported on ARM architectures")
-	}
-
 	imageVersion := "5.7"
 	if legacy {
 		imageVersion = "5.6"
 	}
 
 	runner, err := docker.NewServiceRunner(docker.RunOptions{
-		ContainerName: "mysql",
-		ImageRepo:     "docker.mirror.hashicorp.services/library/mysql",
-		ImageTag:      imageVersion,
-		Ports:         []string{"3306/tcp"},
-		Env:           []string{"MYSQL_ROOT_PASSWORD=" + pw},
+		ImageRepo: "mysql",
+		ImageTag:  imageVersion,
+		Ports:     []string{"3306/tcp"},
+		Env:       []string{"MYSQL_ROOT_PASSWORD=" + pw},
 	})
 	if err != nil {
 		t.Fatalf("could not start docker mysql: %s", err)
diff --git a/helper/testhelpers/pluginhelpers/pluginhelpers.go b/helper/testhelpers/pluginhelpers/pluginhelpers.go
deleted file mode 100644
index e9a0067044927..0000000000000
--- a/helper/testhelpers/pluginhelpers/pluginhelpers.go
+++ /dev/null
@@ -1,146 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-// Package pluginhelpers contains testhelpers that don't depend on package
-// vault, and thus can be used within vault (as well as elsewhere.)
-package pluginhelpers
-
-import (
-	"crypto/sha256"
-	"fmt"
-	"os"
-	"os/exec"
-	"path"
-	"path/filepath"
-	"sync"
-
-	"github.com/hashicorp/vault/sdk/helper/consts"
-	"github.com/mitchellh/go-testing-interface"
-)
-
-var (
-	testPluginCacheLock sync.Mutex
-	testPluginCache     = map[string][]byte{}
-)
-
-type TestPlugin struct {
-	Name     string
-	Typ      consts.PluginType
-	Version  string
-	FileName string
-	Sha256   string
-}
-
-func GetPlugin(t testing.T, typ consts.PluginType) (string, string, string, string) {
-	t.Helper()
-	var pluginName string
-	var pluginType string
-	var pluginMain string
-	var pluginVersionLocation string
-
-	switch typ {
-	case consts.PluginTypeCredential:
-		pluginType = "approle"
-		pluginName = "vault-plugin-auth-" + pluginType
-		pluginMain = filepath.Join("builtin", "credential", pluginType, "cmd", pluginType, "main.go")
-		pluginVersionLocation = fmt.Sprintf("github.com/hashicorp/vault/builtin/credential/%s.ReportedVersion", pluginType)
-	case consts.PluginTypeSecrets:
-		pluginType = "consul"
-		pluginName = "vault-plugin-secrets-" + pluginType
-		pluginMain = filepath.Join("builtin", "logical", pluginType, "cmd", pluginType, "main.go")
-		pluginVersionLocation = fmt.Sprintf("github.com/hashicorp/vault/builtin/logical/%s.ReportedVersion", pluginType)
-	case consts.PluginTypeDatabase:
-		pluginType = "postgresql"
-		pluginName = "vault-plugin-database-" + pluginType
-		pluginMain = filepath.Join("plugins", "database", pluginType, fmt.Sprintf("%s-database-plugin", pluginType), "main.go")
-		pluginVersionLocation = fmt.Sprintf("github.com/hashicorp/vault/plugins/database/%s.ReportedVersion", pluginType)
-	default:
-		t.Fatal(typ.String())
-	}
-	return pluginName, pluginType, pluginMain, pluginVersionLocation
-}
-
-// to mount a plugin, we need a working binary plugin, so we compile one here.
-// pluginVersion is used to override the plugin's self-reported version
-func CompilePlugin(t testing.T, typ consts.PluginType, pluginVersion string, pluginDir string) TestPlugin {
-	t.Helper()
-
-	pluginName, pluginType, pluginMain, pluginVersionLocation := GetPlugin(t, typ)
-
-	testPluginCacheLock.Lock()
-	defer testPluginCacheLock.Unlock()
-
-	var pluginBytes []byte
-
-	dir := ""
-	var err error
-	pluginRootDir := "builtin"
-	if typ == consts.PluginTypeDatabase {
-		pluginRootDir = "plugins"
-	}
-	for {
-		dir, err = os.Getwd()
-		if err != nil {
-			t.Fatal(err)
-		}
-		// detect if we are in a subdirectory or the root directory and compensate
-		if _, err := os.Stat(pluginRootDir); os.IsNotExist(err) {
-			err := os.Chdir("..")
-			if err != nil {
-				t.Fatal(err)
-			}
-		} else {
-			break
-		}
-	}
-
-	pluginPath := path.Join(pluginDir, pluginName)
-	if pluginVersion != "" {
-		pluginPath += "-" + pluginVersion
-	}
-
-	key := fmt.Sprintf("%s %s %s", pluginName, pluginType, pluginVersion)
-	// cache the compilation to only run once
-	var ok bool
-	pluginBytes, ok = testPluginCache[key]
-	if !ok {
-		// we need to compile
-		line := []string{"build"}
-		if pluginVersion != "" {
-			line = append(line, "-ldflags", fmt.Sprintf("-X %s=%s", pluginVersionLocation, pluginVersion))
-		}
-		line = append(line, "-o", pluginPath, pluginMain)
-		cmd := exec.Command("go", line...)
-		cmd.Dir = dir
-		output, err := cmd.CombinedOutput()
-		if err != nil {
-			t.Fatal(fmt.Errorf("error running go build %v output: %s", err, output))
-		}
-		testPluginCache[key], err = os.ReadFile(pluginPath)
-		if err != nil {
-			t.Fatal(err)
-		}
-		pluginBytes = testPluginCache[key]
-	}
-
-	// write the cached plugin if necessary
-	if _, err := os.Stat(pluginPath); os.IsNotExist(err) {
-		err = os.WriteFile(pluginPath, pluginBytes, 0o755)
-	}
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	sha := sha256.New()
-	_, err = sha.Write(pluginBytes)
-	if err != nil {
-		t.Fatal(err)
-	}
-	return TestPlugin{
-		Name:     pluginName,
-		Typ:      typ,
-		Version:  pluginVersion,
-		FileName: path.Base(pluginPath),
-		Sha256:   fmt.Sprintf("%x", sha.Sum(nil)),
-	}
-}
diff --git a/helper/testhelpers/postgresql/postgresqlhelper.go b/helper/testhelpers/postgresql/postgresqlhelper.go
index 4f90177cc2cbd..2f9b2c2a1472c 100644
--- a/helper/testhelpers/postgresql/postgresqlhelper.go
+++ b/helper/testhelpers/postgresql/postgresqlhelper.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package postgresql
 
 import (
@@ -11,98 +8,48 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hashicorp/vault/sdk/helper/docker"
+	"github.com/hashicorp/vault/helper/testhelpers/docker"
 )
 
 func PrepareTestContainer(t *testing.T, version string) (func(), string) {
-	env := []string{
-		"POSTGRES_PASSWORD=secret",
-		"POSTGRES_DB=database",
-	}
-
-	_, cleanup, url, _ := prepareTestContainer(t, "postgres", "docker.mirror.hashicorp.services/postgres", version, "secret", true, false, false, env)
-
-	return cleanup, url
-}
-
-// PrepareTestContainerWithVaultUser will setup a test container with a Vault
-// admin user configured so that we can safely call rotate-root without
-// rotating the root DB credentials
-func PrepareTestContainerWithVaultUser(t *testing.T, ctx context.Context, version string) (func(), string) {
-	env := []string{
-		"POSTGRES_PASSWORD=secret",
-		"POSTGRES_DB=database",
-	}
-
-	runner, cleanup, url, id := prepareTestContainer(t, "postgres", "docker.mirror.hashicorp.services/postgres", version, "secret", true, false, false, env)
-
-	cmd := []string{"psql", "-U", "postgres", "-c", "CREATE USER vaultadmin WITH LOGIN PASSWORD 'vaultpass' SUPERUSER"}
-	_, err := runner.RunCmdInBackground(ctx, id, cmd)
-	if err != nil {
-		t.Fatalf("Could not run command (%v) in container: %v", cmd, err)
-	}
-
-	return cleanup, url
+	return prepareTestContainer(t, version, "secret", "database")
 }
 
 func PrepareTestContainerWithPassword(t *testing.T, version, password string) (func(), string) {
-	env := []string{
-		"POSTGRES_PASSWORD=" + password,
-		"POSTGRES_DB=database",
-	}
-
-	_, cleanup, url, _ := prepareTestContainer(t, "postgres", "docker.mirror.hashicorp.services/postgres", version, password, true, false, false, env)
-
-	return cleanup, url
-}
-
-func PrepareTestContainerRepmgr(t *testing.T, name, version string, envVars []string) (*docker.Runner, func(), string, string) {
-	env := append(envVars,
-		"REPMGR_PARTNER_NODES=psql-repl-node-0,psql-repl-node-1",
-		"REPMGR_PRIMARY_HOST=psql-repl-node-0",
-		"REPMGR_PASSWORD=repmgrpass",
-		"POSTGRESQL_PASSWORD=secret")
-
-	return prepareTestContainer(t, name, "docker.mirror.hashicorp.services/bitnami/postgresql-repmgr", version, "secret", false, true, true, env)
+	return prepareTestContainer(t, version, password, "database")
 }
 
-func prepareTestContainer(t *testing.T, name, repo, version, password string,
-	addSuffix, forceLocalAddr, doNotAutoRemove bool, envVars []string,
-) (*docker.Runner, func(), string, string) {
+func prepareTestContainer(t *testing.T, version, password, db string) (func(), string) {
 	if os.Getenv("PG_URL") != "" {
-		return nil, func() {}, "", os.Getenv("PG_URL")
+		return func() {}, os.Getenv("PG_URL")
 	}
 
 	if version == "" {
 		version = "11"
 	}
 
-	runOpts := docker.RunOptions{
-		ContainerName:   name,
-		ImageRepo:       repo,
-		ImageTag:        version,
-		Env:             envVars,
-		Ports:           []string{"5432/tcp"},
-		DoNotAutoRemove: doNotAutoRemove,
-	}
-	if repo == "bitnami/postgresql-repmgr" {
-		runOpts.NetworkID = os.Getenv("POSTGRES_MULTIHOST_NET")
-	}
-
-	runner, err := docker.NewServiceRunner(runOpts)
+	runner, err := docker.NewServiceRunner(docker.RunOptions{
+		ImageRepo: "postgres",
+		ImageTag:  version,
+		Env: []string{
+			"POSTGRES_PASSWORD=" + password,
+			"POSTGRES_DB=" + db,
+		},
+		Ports: []string{"5432/tcp"},
+	})
 	if err != nil {
 		t.Fatalf("Could not start docker Postgres: %s", err)
 	}
 
-	svc, containerID, err := runner.StartNewService(context.Background(), addSuffix, forceLocalAddr, connectPostgres(password, repo))
+	svc, err := runner.StartService(context.Background(), connectPostgres(password))
 	if err != nil {
 		t.Fatalf("Could not start docker Postgres: %s", err)
 	}
 
-	return runner, svc.Cleanup, svc.Config.URL().String(), containerID
+	return svc.Cleanup, svc.Config.URL().String()
 }
 
-func connectPostgres(password, repo string) docker.ServiceAdapter {
+func connectPostgres(password string) docker.ServiceAdapter {
 	return func(ctx context.Context, host string, port int) (docker.ServiceConfig, error) {
 		u := url.URL{
 			Scheme:   "postgres",
@@ -118,21 +65,10 @@ func connectPostgres(password, repo string) docker.ServiceAdapter {
 		}
 		defer db.Close()
 
-		if err = db.Ping(); err != nil {
+		err = db.Ping()
+		if err != nil {
 			return nil, err
 		}
 		return docker.NewServiceURL(u), nil
 	}
 }
-
-func StopContainer(t *testing.T, ctx context.Context, runner *docker.Runner, containerID string) {
-	if err := runner.Stop(ctx, containerID); err != nil {
-		t.Fatalf("Could not stop docker Postgres: %s", err)
-	}
-}
-
-func RestartContainer(t *testing.T, ctx context.Context, runner *docker.Runner, containerID string) {
-	if err := runner.Restart(ctx, containerID); err != nil {
-		t.Fatalf("Could not restart docker Postgres: %s", err)
-	}
-}
diff --git a/helper/testhelpers/seal/sealhelper.go b/helper/testhelpers/seal/sealhelper.go
index b05401f1cdbf6..4087f6fc0d926 100644
--- a/helper/testhelpers/seal/sealhelper.go
+++ b/helper/testhelpers/seal/sealhelper.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package sealhelper
 
 import (
@@ -74,5 +71,7 @@ func (tss *TransitSealServer) MakeSeal(t testing.T, key string) (vault.Seal, err
 		t.Fatalf("error setting wrapper config: %v", err)
 	}
 
-	return vault.NewAutoSeal(seal.NewAccess(transitSeal))
+	return vault.NewAutoSeal(&seal.Access{
+		Wrapper: transitSeal,
+	})
 }
diff --git a/helper/testhelpers/testhelpers.go b/helper/testhelpers/testhelpers.go
index 6ae51602bfdd8..f47ba435ca369 100644
--- a/helper/testhelpers/testhelpers.go
+++ b/helper/testhelpers/testhelpers.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package testhelpers
 
 import (
@@ -12,8 +9,6 @@ import (
 	"io/ioutil"
 	"math/rand"
 	"net/url"
-	"os"
-	"strings"
 	"sync/atomic"
 	"time"
 
@@ -36,7 +31,7 @@ const (
 	GenerateRecovery
 )
 
-// GenerateRoot generates a root token on the target cluster.
+// Generates a root token on the target cluster.
 func GenerateRoot(t testing.T, cluster *vault.TestCluster, kind GenerateRootKind) string {
 	t.Helper()
 	token, err := GenerateRootWithError(t, cluster, kind)
@@ -56,9 +51,6 @@ func GenerateRootWithError(t testing.T, cluster *vault.TestCluster, kind Generat
 		keys = cluster.BarrierKeys
 	}
 	client := cluster.Cores[0].Client
-	oldNS := client.Namespace()
-	defer client.SetNamespace(oldNS)
-	client.ClearNamespace()
 
 	var err error
 	var status *api.GenerateRootStatusResponse
@@ -180,10 +172,6 @@ func AttemptUnsealCore(c *vault.TestCluster, core *vault.TestClusterCore) error
 	}
 
 	client := core.Client
-	oldNS := client.Namespace()
-	defer client.SetNamespace(oldNS)
-	client.ClearNamespace()
-
 	client.Sys().ResetUnsealProcess()
 	for j := 0; j < len(c.BarrierKeys); j++ {
 		statusResp, err := client.Sys().Unseal(base64.StdEncoding.EncodeToString(c.BarrierKeys[j]))
@@ -252,10 +240,7 @@ func DeriveActiveCore(t testing.T, cluster *vault.TestCluster) *vault.TestCluste
 	t.Helper()
 	for i := 0; i < 60; i++ {
 		for _, core := range cluster.Cores {
-			oldNS := core.Client.Namespace()
-			core.Client.ClearNamespace()
 			leaderResp, err := core.Client.Sys().Leader()
-			core.Client.SetNamespace(oldNS)
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -273,10 +258,7 @@ func DeriveStandbyCores(t testing.T, cluster *vault.TestCluster) []*vault.TestCl
 	t.Helper()
 	cores := make([]*vault.TestClusterCore, 0, 2)
 	for _, core := range cluster.Cores {
-		oldNS := core.Client.Namespace()
-		core.Client.ClearNamespace()
 		leaderResp, err := core.Client.Sys().Leader()
-		core.Client.SetNamespace(oldNS)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -478,7 +460,7 @@ func RaftClusterJoinNodes(t testing.T, cluster *vault.TestCluster) {
 	leaderInfos := []*raft.LeaderJoinInfo{
 		{
 			LeaderAPIAddr: leader.Client.Address(),
-			TLSConfig:     leader.TLSConfig(),
+			TLSConfig:     leader.TLSConfig,
 		},
 	}
 
@@ -612,16 +594,18 @@ func GenerateDebugLogs(t testing.T, client *api.Client) chan struct{} {
 	t.Helper()
 
 	stopCh := make(chan struct{})
+	ticker := time.NewTicker(time.Second)
+	var err error
 
 	go func() {
-		ticker := time.NewTicker(time.Second)
-		defer ticker.Stop()
 		for {
 			select {
 			case <-stopCh:
+				ticker.Stop()
+				stopCh <- struct{}{}
 				return
 			case <-ticker.C:
-				err := client.Sys().Mount("foo", &api.MountInput{
+				err = client.Sys().Mount("foo", &api.MountInput{
 					Type: "kv",
 					Options: map[string]string{
 						"version": "1",
@@ -781,21 +765,6 @@ func SetNonRootToken(client *api.Client) error {
 	return nil
 }
 
-// RetryUntilAtCadence runs f until it returns a nil result or the timeout is reached.
-// If a nil result hasn't been obtained by timeout, calls t.Fatal.
-func RetryUntilAtCadence(t testing.T, timeout, sleepTime time.Duration, f func() error) {
-	t.Helper()
-	deadline := time.Now().Add(timeout)
-	var err error
-	for time.Now().Before(deadline) {
-		if err = f(); err == nil {
-			return
-		}
-		time.Sleep(sleepTime)
-	}
-	t.Fatalf("did not complete before deadline, err: %v", err)
-}
-
 // RetryUntil runs f until it returns a nil result or the timeout is reached.
 // If a nil result hasn't been obtained by timeout, calls t.Fatal.
 func RetryUntil(t testing.T, timeout time.Duration, f func() error) {
@@ -971,7 +940,7 @@ func GetTOTPCodeFromEngine(t testing.T, client *api.Client, enginePath string) s
 
 // SetupLoginMFATOTP setups up a TOTP MFA using some basic configuration and
 // returns all relevant information to the client.
-func SetupLoginMFATOTP(t testing.T, client *api.Client, methodName string, waitPeriod int) (*api.Client, string, string) {
+func SetupLoginMFATOTP(t testing.T, client *api.Client) (*api.Client, string, string) {
 	t.Helper()
 	// Mount the totp secrets engine
 	SetupTOTPMount(t, client)
@@ -985,14 +954,13 @@ func SetupLoginMFATOTP(t testing.T, client *api.Client, methodName string, waitP
 	// Configure a default TOTP method
 	totpConfig := map[string]interface{}{
 		"issuer":                  "yCorp",
-		"period":                  waitPeriod,
+		"period":                  20,
 		"algorithm":               "SHA256",
 		"digits":                  6,
 		"skew":                    1,
 		"key_size":                20,
 		"qr_size":                 200,
 		"max_validation_attempts": 5,
-		"method_name":             methodName,
 	}
 	methodID := SetupTOTPMethod(t, client, totpConfig)
 
@@ -1006,50 +974,3 @@ func SetupLoginMFATOTP(t testing.T, client *api.Client, methodName string, waitP
 	SetupMFALoginEnforcement(t, client, enforcementConfig)
 	return entityClient, entityID, methodID
 }
-
-func SkipUnlessEnvVarsSet(t testing.T, envVars []string) {
-	t.Helper()
-
-	for _, i := range envVars {
-		if os.Getenv(i) == "" {
-			t.Skipf("%s must be set for this test to run", strings.Join(envVars, " "))
-		}
-	}
-}
-
-// WaitForNodesExcludingSelectedStandbys is variation on WaitForActiveNodeAndStandbys.
-// It waits for the active node before waiting for standby nodes, however
-// it will not wait for cores with indexes that match those specified as arguments.
-// Whilst you could specify index 0 which is likely to be the leader node, the function
-// checks for the leader first regardless of the indexes to skip, so it would be redundant to do so.
-// The intention/use case for this function is to allow a cluster to start and become active with one
-// or more nodes not joined, so that we can test scenarios where a node joins later.
-// e.g. 4 nodes in the cluster, only 3 nodes in cluster 'active', 1 node can be joined later in tests.
-func WaitForNodesExcludingSelectedStandbys(t testing.T, cluster *vault.TestCluster, indexesToSkip ...int) {
-	WaitForActiveNode(t, cluster)
-
-	contains := func(elems []int, e int) bool {
-		for _, v := range elems {
-			if v == e {
-				return true
-			}
-		}
-
-		return false
-	}
-	for i, core := range cluster.Cores {
-		if contains(indexesToSkip, i) {
-			continue
-		}
-
-		if standby, _ := core.Core.Standby(); standby {
-			WaitForStandbyNode(t, core)
-		}
-	}
-}
-
-// IsLocalOrRegressionTests returns true when the tests are running locally (not in CI), or when
-// the regression test env var (VAULT_REGRESSION_TESTS) is provided.
-func IsLocalOrRegressionTests() bool {
-	return os.Getenv("CI") == "" || os.Getenv("VAULT_REGRESSION_TESTS") == "true"
-}
diff --git a/helper/testhelpers/testhelpers_oss.go b/helper/testhelpers/testhelpers_oss.go
index fc55e9b52c736..912d50fdec3b0 100644
--- a/helper/testhelpers/testhelpers_oss.go
+++ b/helper/testhelpers/testhelpers_oss.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !enterprise
 
 package testhelpers
diff --git a/helper/testhelpers/teststorage/consul/consul.go b/helper/testhelpers/teststorage/consul/consul.go
index bfea5ddbb4aeb..47ec99f294b76 100644
--- a/helper/testhelpers/teststorage/consul/consul.go
+++ b/helper/testhelpers/teststorage/consul/consul.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package consul
 
 import (
diff --git a/helper/testhelpers/teststorage/teststorage.go b/helper/testhelpers/teststorage/teststorage.go
index f065e187d2c28..7a2f220ed7e82 100644
--- a/helper/testhelpers/teststorage/teststorage.go
+++ b/helper/testhelpers/teststorage/teststorage.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package teststorage
 
 import (
diff --git a/helper/testhelpers/teststorage/teststorage_reusable.go b/helper/testhelpers/teststorage/teststorage_reusable.go
index ff9fd2b55668b..257a5a0184c5f 100644
--- a/helper/testhelpers/teststorage/teststorage_reusable.go
+++ b/helper/testhelpers/teststorage/teststorage_reusable.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package teststorage
 
 import (
diff --git a/helper/timeutil/timeutil.go b/helper/timeutil/timeutil.go
index 16f8343513e90..a65d3cf908bcb 100644
--- a/helper/timeutil/timeutil.go
+++ b/helper/timeutil/timeutil.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package timeutil
 
 import (
@@ -142,26 +139,3 @@ func SkipAtEndOfMonth(t *testing.T) {
 		t.Skip("too close to end of month")
 	}
 }
-
-// This interface allows unit tests to substitute in a simulated Clock.
-type Clock interface {
-	Now() time.Time
-	NewTicker(time.Duration) *time.Ticker
-	NewTimer(time.Duration) *time.Timer
-}
-
-type DefaultClock struct{}
-
-var _ Clock = (*DefaultClock)(nil)
-
-func (_ DefaultClock) Now() time.Time {
-	return time.Now()
-}
-
-func (_ DefaultClock) NewTicker(d time.Duration) *time.Ticker {
-	return time.NewTicker(d)
-}
-
-func (_ DefaultClock) NewTimer(d time.Duration) *time.Timer {
-	return time.NewTimer(d)
-}
diff --git a/helper/timeutil/timeutil_test.go b/helper/timeutil/timeutil_test.go
index b9ccdbd5ba226..5cef2d2061fe9 100644
--- a/helper/timeutil/timeutil_test.go
+++ b/helper/timeutil/timeutil_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package timeutil
 
 import (
diff --git a/helper/useragent/useragent.go b/helper/useragent/useragent.go
deleted file mode 100644
index a16b8716e352e..0000000000000
--- a/helper/useragent/useragent.go
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package useragent
-
-import (
-	"fmt"
-	"runtime"
-
-	"github.com/hashicorp/vault/version"
-)
-
-var (
-	// projectURL is the project URL.
-	projectURL = "https://www.vaultproject.io/"
-
-	// rt is the runtime - variable for tests.
-	rt = runtime.Version()
-
-	// versionFunc is the func that returns the current version. This is a
-	// function to take into account the different build processes and distinguish
-	// between enterprise and oss builds.
-	versionFunc = func() string {
-		return version.GetVersion().VersionNumber()
-	}
-)
-
-// String returns the consistent user-agent string for Vault.
-//
-// e.g. Vault/0.10.4 (+https://www.vaultproject.io/; go1.10.1)
-func String() string {
-	return fmt.Sprintf("Vault/%s (+%s; %s)",
-		versionFunc(), projectURL, rt)
-}
-
-// AgentString returns the consistent user-agent string for Vault Agent.
-//
-// e.g. Vault Agent/0.10.4 (+https://www.vaultproject.io/; go1.10.1)
-func AgentString() string {
-	return fmt.Sprintf("Vault Agent/%s (+%s; %s)",
-		versionFunc(), projectURL, rt)
-}
-
-// AgentTemplatingString returns the consistent user-agent string for Vault Agent Templating.
-//
-// e.g. Vault Agent Templating/0.10.4 (+https://www.vaultproject.io/; go1.10.1)
-func AgentTemplatingString() string {
-	return fmt.Sprintf("Vault Agent Templating/%s (+%s; %s)",
-		versionFunc(), projectURL, rt)
-}
-
-// AgentProxyString returns the consistent user-agent string for Vault Agent API Proxying.
-//
-// e.g. Vault Agent API Proxy/0.10.4 (+https://www.vaultproject.io/; go1.10.1)
-func AgentProxyString() string {
-	return fmt.Sprintf("Vault Agent API Proxy/%s (+%s; %s)",
-		versionFunc(), projectURL, rt)
-}
-
-// AgentProxyStringWithProxiedUserAgent returns the consistent user-agent
-// string for Vault Agent API Proxying, keeping the User-Agent of the proxied
-// client as an extension to this UserAgent
-//
-// e.g. Vault Agent API Proxy/0.10.4 (+https://www.vaultproject.io/; go1.10.1); proxiedUserAgent
-func AgentProxyStringWithProxiedUserAgent(proxiedUserAgent string) string {
-	return fmt.Sprintf("Vault Agent API Proxy/%s (+%s; %s); %s",
-		versionFunc(), projectURL, rt, proxiedUserAgent)
-}
-
-// AgentAutoAuthString returns the consistent user-agent string for Vault Agent Auto-Auth.
-//
-// e.g. Vault Agent Auto-Auth/0.10.4 (+https://www.vaultproject.io/; go1.10.1)
-func AgentAutoAuthString() string {
-	return fmt.Sprintf("Vault Agent Auto-Auth/%s (+%s; %s)",
-		versionFunc(), projectURL, rt)
-}
-
-// ProxyString returns the consistent user-agent string for Vault Proxy.
-//
-// e.g. Vault Proxy/0.10.4 (+https://www.vaultproject.io/; go1.10.1)
-func ProxyString() string {
-	return fmt.Sprintf("Vault Proxy/%s (+%s; %s)",
-		versionFunc(), projectURL, rt)
-}
-
-// ProxyAPIProxyString returns the consistent user-agent string for Vault Proxy API Proxying.
-//
-// e.g. Vault Proxy API Proxy/0.10.4 (+https://www.vaultproject.io/; go1.10.1)
-func ProxyAPIProxyString() string {
-	return fmt.Sprintf("Vault Proxy API Proxy/%s (+%s; %s)",
-		versionFunc(), projectURL, rt)
-}
-
-// ProxyStringWithProxiedUserAgent returns the consistent user-agent
-// string for Vault Proxy API Proxying, keeping the User-Agent of the proxied
-// client as an extension to this UserAgent
-//
-// e.g. Vault Proxy API Proxy/0.10.4 (+https://www.vaultproject.io/; go1.10.1); proxiedUserAgent
-func ProxyStringWithProxiedUserAgent(proxiedUserAgent string) string {
-	return fmt.Sprintf("Vault Proxy API Proxy/%s (+%s; %s); %s",
-		versionFunc(), projectURL, rt, proxiedUserAgent)
-}
-
-// ProxyAutoAuthString returns the consistent user-agent string for Vault Agent Auto-Auth.
-//
-// e.g. Vault Proxy Auto-Auth/0.10.4 (+https://www.vaultproject.io/; go1.10.1)
-func ProxyAutoAuthString() string {
-	return fmt.Sprintf("Vault Proxy Auto-Auth/%s (+%s; %s)",
-		versionFunc(), projectURL, rt)
-}
diff --git a/helper/useragent/useragent_test.go b/helper/useragent/useragent_test.go
deleted file mode 100644
index af5e2f0622745..0000000000000
--- a/helper/useragent/useragent_test.go
+++ /dev/null
@@ -1,140 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package useragent
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestUserAgent(t *testing.T) {
-	projectURL = "https://vault-test.com"
-	rt = "go5.0"
-	versionFunc = func() string { return "1.2.3" }
-
-	act := String()
-
-	exp := "Vault/1.2.3 (+https://vault-test.com; go5.0)"
-	require.Equal(t, exp, act)
-}
-
-// TestUserAgent_VaultAgent tests the AgentString() function works
-// as expected
-func TestUserAgent_VaultAgent(t *testing.T) {
-	projectURL = "https://vault-test.com"
-	rt = "go5.0"
-	versionFunc = func() string { return "1.2.3" }
-
-	act := AgentString()
-
-	exp := "Vault Agent/1.2.3 (+https://vault-test.com; go5.0)"
-	require.Equal(t, exp, act)
-}
-
-// TestUserAgent_VaultAgentTemplating tests the AgentTemplatingString() function works
-// as expected
-func TestUserAgent_VaultAgentTemplating(t *testing.T) {
-	projectURL = "https://vault-test.com"
-	rt = "go5.0"
-	versionFunc = func() string { return "1.2.3" }
-
-	act := AgentTemplatingString()
-
-	exp := "Vault Agent Templating/1.2.3 (+https://vault-test.com; go5.0)"
-	require.Equal(t, exp, act)
-}
-
-// TestUserAgent_VaultAgentProxy tests the AgentProxyString() function works
-// as expected
-func TestUserAgent_VaultAgentProxy(t *testing.T) {
-	projectURL = "https://vault-test.com"
-	rt = "go5.0"
-	versionFunc = func() string { return "1.2.3" }
-
-	act := AgentProxyString()
-
-	exp := "Vault Agent API Proxy/1.2.3 (+https://vault-test.com; go5.0)"
-	require.Equal(t, exp, act)
-}
-
-// TestUserAgent_VaultAgentProxyWithProxiedUserAgent tests the AgentProxyStringWithProxiedUserAgent()
-// function works as expected
-func TestUserAgent_VaultAgentProxyWithProxiedUserAgent(t *testing.T) {
-	projectURL = "https://vault-test.com"
-	rt = "go5.0"
-	versionFunc = func() string { return "1.2.3" }
-	userAgent := "my-user-agent"
-
-	act := AgentProxyStringWithProxiedUserAgent(userAgent)
-
-	exp := "Vault Agent API Proxy/1.2.3 (+https://vault-test.com; go5.0); my-user-agent"
-	require.Equal(t, exp, act)
-}
-
-// TestUserAgent_VaultAgentAutoAuth tests the AgentAutoAuthString() function works
-// as expected
-func TestUserAgent_VaultAgentAutoAuth(t *testing.T) {
-	projectURL = "https://vault-test.com"
-	rt = "go5.0"
-	versionFunc = func() string { return "1.2.3" }
-
-	act := AgentAutoAuthString()
-
-	exp := "Vault Agent Auto-Auth/1.2.3 (+https://vault-test.com; go5.0)"
-	require.Equal(t, exp, act)
-}
-
-// TestUserAgent_VaultProxy tests the ProxyString() function works
-// as expected
-func TestUserAgent_VaultProxy(t *testing.T) {
-	projectURL = "https://vault-test.com"
-	rt = "go5.0"
-	versionFunc = func() string { return "1.2.3" }
-
-	act := ProxyString()
-
-	exp := "Vault Proxy/1.2.3 (+https://vault-test.com; go5.0)"
-	require.Equal(t, exp, act)
-}
-
-// TestUserAgent_VaultProxyAPIProxy tests the ProxyAPIProxyString() function works
-// as expected
-func TestUserAgent_VaultProxyAPIProxy(t *testing.T) {
-	projectURL = "https://vault-test.com"
-	rt = "go5.0"
-	versionFunc = func() string { return "1.2.3" }
-
-	act := ProxyAPIProxyString()
-
-	exp := "Vault Proxy API Proxy/1.2.3 (+https://vault-test.com; go5.0)"
-	require.Equal(t, exp, act)
-}
-
-// TestUserAgent_VaultProxyWithProxiedUserAgent tests the ProxyStringWithProxiedUserAgent()
-// function works as expected
-func TestUserAgent_VaultProxyWithProxiedUserAgent(t *testing.T) {
-	projectURL = "https://vault-test.com"
-	rt = "go5.0"
-	versionFunc = func() string { return "1.2.3" }
-	userAgent := "my-user-agent"
-
-	act := ProxyStringWithProxiedUserAgent(userAgent)
-
-	exp := "Vault Proxy API Proxy/1.2.3 (+https://vault-test.com; go5.0); my-user-agent"
-	require.Equal(t, exp, act)
-}
-
-// TestUserAgent_VaultProxyAutoAuth tests the ProxyAPIProxyString() function works
-// as expected
-func TestUserAgent_VaultProxyAutoAuth(t *testing.T) {
-	projectURL = "https://vault-test.com"
-	rt = "go5.0"
-	versionFunc = func() string { return "1.2.3" }
-
-	act := ProxyAutoAuthString()
-
-	exp := "Vault Proxy Auto-Auth/1.2.3 (+https://vault-test.com; go5.0)"
-	require.Equal(t, exp, act)
-}
diff --git a/helper/versions/version.go b/helper/versions/version.go
index 9eb8077b89230..6bbd186984148 100644
--- a/helper/versions/version.go
+++ b/helper/versions/version.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package versions
 
 import (
@@ -11,7 +8,7 @@ import (
 
 	semver "github.com/hashicorp/go-version"
 	"github.com/hashicorp/vault/sdk/helper/consts"
-	"github.com/hashicorp/vault/version"
+	"github.com/hashicorp/vault/sdk/version"
 )
 
 const (
diff --git a/helper/versions/version_test.go b/helper/versions/version_test.go
index 85b46cdd3fbf6..cc1b3e1c20f2f 100644
--- a/helper/versions/version_test.go
+++ b/helper/versions/version_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package versions
 
 import "testing"
diff --git a/http/assets.go b/http/assets.go
index b60a594942c7d..c401f94910872 100644
--- a/http/assets.go
+++ b/http/assets.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build ui
 
 package http
diff --git a/http/assets_stub.go b/http/assets_stub.go
index e1b4daf3991e1..1989a09d9860c 100644
--- a/http/assets_stub.go
+++ b/http/assets_stub.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !ui
 
 package http
diff --git a/http/auth_token_test.go b/http/auth_token_test.go
index d96e18383ac71..552a32cbdd937 100644
--- a/http/auth_token_test.go
+++ b/http/auth_token_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
diff --git a/http/cors.go b/http/cors.go
index 7e8c311e624f5..74cfeeaef072e 100644
--- a/http/cors.go
+++ b/http/cors.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
diff --git a/http/custom_header_test.go b/http/custom_header_test.go
index 289379a84cb6d..8c204584aeb78 100644
--- a/http/custom_header_test.go
+++ b/http/custom_header_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
diff --git a/http/events.go b/http/events.go
deleted file mode 100644
index 072fcd60ea04a..0000000000000
--- a/http/events.go
+++ /dev/null
@@ -1,165 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package http
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"net/http"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/golang/protobuf/proto"
-	"github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/vault/helper/namespace"
-	"github.com/hashicorp/vault/sdk/logical"
-	"github.com/hashicorp/vault/vault"
-	"github.com/hashicorp/vault/vault/eventbus"
-	"nhooyr.io/websocket"
-)
-
-type eventSubscribeArgs struct {
-	ctx     context.Context
-	logger  hclog.Logger
-	events  *eventbus.EventBus
-	ns      *namespace.Namespace
-	pattern string
-	conn    *websocket.Conn
-	json    bool
-}
-
-// handleEventsSubscribeWebsocket runs forever, returning a websocket error code and reason
-// only if the connection closes or there was an error.
-func handleEventsSubscribeWebsocket(args eventSubscribeArgs) (websocket.StatusCode, string, error) {
-	ctx := args.ctx
-	logger := args.logger
-	ch, cancel, err := args.events.Subscribe(ctx, args.ns, args.pattern)
-	if err != nil {
-		logger.Info("Error subscribing", "error", err)
-		return websocket.StatusUnsupportedData, "Error subscribing", nil
-	}
-	defer cancel()
-
-	for {
-		select {
-		case <-ctx.Done():
-			logger.Info("Websocket context is done, closing the connection")
-			return websocket.StatusNormalClosure, "", nil
-		case message := <-ch:
-			logger.Debug("Sending message to websocket", "message", message.Payload)
-			var messageBytes []byte
-			var messageType websocket.MessageType
-			if args.json {
-				var ok bool
-				messageBytes, ok = message.Format("cloudevents-json")
-				if !ok {
-					logger.Warn("Could not get cloudevents JSON format")
-					return 0, "", errors.New("could not get cloudevents JSON format")
-				}
-				messageType = websocket.MessageText
-			} else {
-				messageBytes, err = proto.Marshal(message.Payload.(*logical.EventReceived))
-				messageType = websocket.MessageBinary
-			}
-			if err != nil {
-				logger.Warn("Could not serialize websocket event", "error", err)
-				return 0, "", err
-			}
-			err = args.conn.Write(ctx, messageType, messageBytes)
-			if err != nil {
-				return 0, "", err
-			}
-		}
-	}
-}
-
-func handleEventsSubscribe(core *vault.Core, req *logical.Request) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		logger := core.Logger().Named("events-subscribe")
-		logger.Debug("Got request to", "url", r.URL, "version", r.Proto)
-
-		ctx := r.Context()
-
-		// ACL check
-		_, _, err := core.CheckToken(ctx, req, false)
-		if err != nil {
-			if errors.Is(err, logical.ErrPermissionDenied) {
-				respondError(w, http.StatusForbidden, logical.ErrPermissionDenied)
-				return
-			}
-			logger.Debug("Error validating token", "error", err)
-			respondError(w, http.StatusInternalServerError, fmt.Errorf("error validating token"))
-			return
-		}
-
-		ns, err := namespace.FromContext(ctx)
-		if err != nil {
-			logger.Info("Could not find namespace", "error", err)
-			respondError(w, http.StatusInternalServerError, fmt.Errorf("could not find namespace"))
-			return
-		}
-
-		prefix := "/v1/sys/events/subscribe/"
-		if ns.ID != namespace.RootNamespaceID {
-			prefix = fmt.Sprintf("/v1/%ssys/events/subscribe/", ns.Path)
-		}
-		pattern := strings.TrimSpace(strings.TrimPrefix(r.URL.Path, prefix))
-		if pattern == "" {
-			respondError(w, http.StatusBadRequest, fmt.Errorf("did not specify eventType to subscribe to"))
-			return
-		}
-
-		json := false
-		jsonRaw := r.URL.Query().Get("json")
-		if jsonRaw != "" {
-			var err error
-			json, err = strconv.ParseBool(jsonRaw)
-			if err != nil {
-				respondError(w, http.StatusBadRequest, fmt.Errorf("invalid parameter for JSON: %v", jsonRaw))
-				return
-			}
-		}
-
-		conn, err := websocket.Accept(w, r, nil)
-		if err != nil {
-			logger.Info("Could not accept as websocket", "error", err)
-			respondError(w, http.StatusInternalServerError, fmt.Errorf("could not accept as websocket"))
-			return
-		}
-
-		// we don't expect any incoming messages
-		ctx = conn.CloseRead(ctx)
-		// start the pinger
-		go func() {
-			for {
-				time.Sleep(30 * time.Second) // not too aggressive, but keep the HTTP connection alive
-				err := conn.Ping(ctx)
-				if err != nil {
-					return
-				}
-			}
-		}()
-
-		closeStatus, closeReason, err := handleEventsSubscribeWebsocket(eventSubscribeArgs{ctx, logger, core.Events(), ns, pattern, conn, json})
-		if err != nil {
-			closeStatus = websocket.CloseStatus(err)
-			if closeStatus == -1 {
-				closeStatus = websocket.StatusInternalError
-			}
-			closeReason = fmt.Sprintf("Internal error: %v", err)
-			logger.Debug("Error from websocket handler", "error", err)
-		}
-		// Close() will panic if the reason is greater than this length
-		if len(closeReason) > 123 {
-			logger.Debug("Truncated close reason", "closeReason", closeReason)
-			closeReason = closeReason[:123]
-		}
-		err = conn.Close(closeStatus, closeReason)
-		if err != nil {
-			logger.Debug("Error closing websocket", "error", err)
-		}
-	})
-}
diff --git a/http/events_test.go b/http/events_test.go
deleted file mode 100644
index b5ce0a1a3581c..0000000000000
--- a/http/events_test.go
+++ /dev/null
@@ -1,199 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package http
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"net/http"
-	"strings"
-	"sync/atomic"
-	"testing"
-	"time"
-
-	"github.com/hashicorp/go-uuid"
-	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/helper/namespace"
-	"github.com/hashicorp/vault/sdk/logical"
-	"github.com/hashicorp/vault/vault"
-	"nhooyr.io/websocket"
-)
-
-// TestEventsSubscribe tests the websocket endpoint for subscribing to events
-// by generating some events.
-func TestEventsSubscribe(t *testing.T) {
-	core := vault.TestCore(t)
-	ln, addr := TestServer(t, core)
-	defer ln.Close()
-
-	// unseal the core
-	keys, token := vault.TestCoreInit(t, core)
-	for _, key := range keys {
-		_, err := core.Unseal(key)
-		if err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	stop := atomic.Bool{}
-
-	const eventType = "abc"
-
-	// send some events
-	go func() {
-		for !stop.Load() {
-			id, err := uuid.GenerateUUID()
-			if err != nil {
-				core.Logger().Info("Error generating UUID, exiting sender", "error", err)
-			}
-			pluginInfo := &logical.EventPluginInfo{
-				MountPath: "secret",
-			}
-			err = core.Events().SendInternal(namespace.RootContext(context.Background()), namespace.RootNamespace, pluginInfo, logical.EventType(eventType), &logical.EventData{
-				Id:        id,
-				Metadata:  nil,
-				EntityIds: nil,
-				Note:      "testing",
-			})
-			if err != nil {
-				core.Logger().Info("Error sending event, exiting sender", "error", err)
-			}
-			time.Sleep(100 * time.Millisecond)
-		}
-	}()
-
-	t.Cleanup(func() {
-		stop.Store(true)
-	})
-
-	ctx := context.Background()
-	wsAddr := strings.Replace(addr, "http", "ws", 1)
-
-	testCases := []struct {
-		json bool
-	}{{true}, {false}}
-
-	for _, testCase := range testCases {
-		url := fmt.Sprintf("%s/v1/sys/events/subscribe/%s?json=%v", wsAddr, eventType, testCase.json)
-		conn, _, err := websocket.Dial(ctx, url, &websocket.DialOptions{
-			HTTPHeader: http.Header{"x-vault-token": []string{token}},
-		})
-		if err != nil {
-			t.Fatal(err)
-		}
-		t.Cleanup(func() {
-			conn.Close(websocket.StatusNormalClosure, "")
-		})
-
-		_, msg, err := conn.Read(ctx)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if testCase.json {
-			event := map[string]interface{}{}
-			err = json.Unmarshal(msg, &event)
-			if err != nil {
-				t.Fatal(err)
-			}
-			t.Log(string(msg))
-			data := event["data"].(map[string]interface{})
-			if actualType := data["event_type"].(string); actualType != eventType {
-				t.Fatalf("Expeced event type %s, got %s", eventType, actualType)
-			}
-			pluginInfo, ok := data["plugin_info"].(map[string]interface{})
-			if !ok || pluginInfo == nil {
-				t.Fatalf("No plugin_info object: %v", data)
-			}
-			mountPath, ok := pluginInfo["mount_path"].(string)
-			if !ok || mountPath != "secret" {
-				t.Fatalf("Wrong mount_path: %v", data)
-			}
-			innerEvent := data["event"].(map[string]interface{})
-			if innerEvent["id"].(string) != event["id"].(string) {
-				t.Fatalf("IDs don't match, expected %s, got %s", innerEvent["id"].(string), event["id"].(string))
-			}
-			if innerEvent["note"].(string) != "testing" {
-				t.Fatalf("Expected 'testing', got %s", innerEvent["note"].(string))
-			}
-
-			checkRequiredCloudEventsFields(t, event)
-		}
-	}
-}
-
-func checkRequiredCloudEventsFields(t *testing.T, event map[string]interface{}) {
-	t.Helper()
-	for _, attr := range []string{"id", "source", "specversion", "type"} {
-		if v, ok := event[attr]; !ok {
-			t.Errorf("Missing attribute %s", attr)
-		} else if str, ok := v.(string); !ok {
-			t.Errorf("Expected %s to be string but got %T", attr, v)
-		} else if str == "" {
-			t.Errorf("%s was empty string", attr)
-		}
-	}
-}
-
-// TestEventsSubscribeAuth tests that unauthenticated and unauthorized subscriptions
-// fail correctly.
-func TestEventsSubscribeAuth(t *testing.T) {
-	core := vault.TestCore(t)
-	ln, addr := TestServer(t, core)
-	defer ln.Close()
-
-	// unseal the core
-	keys, root := vault.TestCoreInit(t, core)
-	for _, key := range keys {
-		_, err := core.Unseal(key)
-		if err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	var nonPrivilegedToken string
-	// Fetch a valid non privileged token.
-	{
-		config := api.DefaultConfig()
-		config.Address = addr
-
-		client, err := api.NewClient(config)
-		if err != nil {
-			t.Fatal(err)
-		}
-		client.SetToken(root)
-
-		secret, err := client.Auth().Token().Create(&api.TokenCreateRequest{Policies: []string{"default"}})
-		if err != nil {
-			t.Fatal(err)
-		}
-		if secret.Auth.ClientToken == "" {
-			t.Fatal("Failed to fetch a non privileged token")
-		}
-		nonPrivilegedToken = secret.Auth.ClientToken
-	}
-
-	ctx := context.Background()
-	wsAddr := strings.Replace(addr, "http", "ws", 1)
-
-	// Get a 403 with no token.
-	_, resp, err := websocket.Dial(ctx, wsAddr+"/v1/sys/events/subscribe/abc", nil)
-	if err == nil {
-		t.Error("Expected websocket error but got none")
-	}
-	if resp == nil || resp.StatusCode != http.StatusForbidden {
-		t.Errorf("Expected 403 but got %+v", resp)
-	}
-
-	// Get a 403 with a non privileged token.
-	_, resp, err = websocket.Dial(ctx, wsAddr+"/v1/sys/events/subscribe/abc", &websocket.DialOptions{
-		HTTPHeader: http.Header{"x-vault-token": []string{nonPrivilegedToken}},
-	})
-	if err == nil {
-		t.Error("Expected websocket error but got none")
-	}
-	if resp == nil || resp.StatusCode != http.StatusForbidden {
-		t.Errorf("Expected 403 but got %+v", resp)
-	}
-}
diff --git a/http/forwarded_for_test.go b/http/forwarded_for_test.go
index 89bc62acc2653..9323f5bf1c728 100644
--- a/http/forwarded_for_test.go
+++ b/http/forwarded_for_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
@@ -49,7 +46,7 @@ func TestHandler_XForwardedFor(t *testing.T) {
 		}
 
 		cluster := vault.NewTestCluster(t, nil, &vault.TestClusterOptions{
-			HandlerFunc: HandlerFunc(testHandler),
+			HandlerFunc: testHandler,
 		})
 		cluster.Start()
 		defer cluster.Cleanup()
@@ -92,7 +89,7 @@ func TestHandler_XForwardedFor(t *testing.T) {
 		}
 
 		cluster := vault.NewTestCluster(t, nil, &vault.TestClusterOptions{
-			HandlerFunc: HandlerFunc(testHandler),
+			HandlerFunc: testHandler,
 		})
 		cluster.Start()
 		defer cluster.Cleanup()
@@ -128,7 +125,7 @@ func TestHandler_XForwardedFor(t *testing.T) {
 		}
 
 		cluster := vault.NewTestCluster(t, nil, &vault.TestClusterOptions{
-			HandlerFunc: HandlerFunc(testHandler),
+			HandlerFunc: testHandler,
 		})
 		cluster.Start()
 		defer cluster.Cleanup()
@@ -162,7 +159,7 @@ func TestHandler_XForwardedFor(t *testing.T) {
 		}
 
 		cluster := vault.NewTestCluster(t, nil, &vault.TestClusterOptions{
-			HandlerFunc: HandlerFunc(testHandler),
+			HandlerFunc: testHandler,
 		})
 		cluster.Start()
 		defer cluster.Cleanup()
@@ -196,7 +193,7 @@ func TestHandler_XForwardedFor(t *testing.T) {
 		}
 
 		cluster := vault.NewTestCluster(t, nil, &vault.TestClusterOptions{
-			HandlerFunc: HandlerFunc(testHandler),
+			HandlerFunc: testHandler,
 		})
 		cluster.Start()
 		defer cluster.Cleanup()
@@ -233,7 +230,7 @@ func TestHandler_XForwardedFor(t *testing.T) {
 		}
 
 		cluster := vault.NewTestCluster(t, nil, &vault.TestClusterOptions{
-			HandlerFunc: HandlerFunc(testHandler),
+			HandlerFunc: testHandler,
 		})
 		cluster.Start()
 		defer cluster.Cleanup()
diff --git a/http/forwarding_bench_test.go b/http/forwarding_bench_test.go
index 0c3f5e2a286d2..f7334058d6a8f 100644
--- a/http/forwarding_bench_test.go
+++ b/http/forwarding_bench_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
@@ -48,7 +45,7 @@ func BenchmarkHTTP_Forwarding_Stress(b *testing.B) {
 	host := fmt.Sprintf("https://127.0.0.1:%d/v1/transit/", cores[0].Listeners[0].Address.Port)
 
 	transport := &http.Transport{
-		TLSClientConfig: cores[0].TLSConfig(),
+		TLSClientConfig: cores[0].TLSConfig,
 	}
 	if err := http2.ConfigureTransport(transport); err != nil {
 		b.Fatal(err)
diff --git a/http/forwarding_test.go b/http/forwarding_test.go
index 51cc2c0e01812..f0225a42230e0 100644
--- a/http/forwarding_test.go
+++ b/http/forwarding_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
@@ -56,7 +53,7 @@ func TestHTTP_Fallback_Bad_Address(t *testing.T) {
 	for _, addr := range addrs {
 		config := api.DefaultConfig()
 		config.Address = addr
-		config.HttpClient.Transport.(*http.Transport).TLSClientConfig = cores[0].TLSConfig()
+		config.HttpClient.Transport.(*http.Transport).TLSClientConfig = cores[0].TLSConfig
 
 		client, err := api.NewClient(config)
 		if err != nil {
@@ -104,7 +101,7 @@ func TestHTTP_Fallback_Disabled(t *testing.T) {
 	for _, addr := range addrs {
 		config := api.DefaultConfig()
 		config.Address = addr
-		config.HttpClient.Transport.(*http.Transport).TLSClientConfig = cores[0].TLSConfig()
+		config.HttpClient.Transport.(*http.Transport).TLSClientConfig = cores[0].TLSConfig
 
 		client, err := api.NewClient(config)
 		if err != nil {
@@ -164,7 +161,7 @@ func testHTTP_Forwarding_Stress_Common(t *testing.T, parallel bool, num uint32)
 	}
 
 	transport := &http.Transport{
-		TLSClientConfig: cores[0].TLSConfig(),
+		TLSClientConfig: cores[0].TLSConfig,
 	}
 	if err := http2.ConfigureTransport(transport); err != nil {
 		t.Fatal(err)
@@ -462,7 +459,7 @@ func TestHTTP_Forwarding_ClientTLS(t *testing.T) {
 	vault.TestWaitActive(t, core)
 
 	transport := cleanhttp.DefaultTransport()
-	transport.TLSClientConfig = cores[0].TLSConfig()
+	transport.TLSClientConfig = cores[0].TLSConfig
 	if err := http2.ConfigureTransport(transport); err != nil {
 		t.Fatal(err)
 	}
@@ -514,7 +511,7 @@ func TestHTTP_Forwarding_ClientTLS(t *testing.T) {
 		// be to a different address
 		transport = cleanhttp.DefaultTransport()
 		// i starts at zero but cores in addrs start at 1
-		transport.TLSClientConfig = cores[i+1].TLSConfig()
+		transport.TLSClientConfig = cores[i+1].TLSConfig
 		if err := http2.ConfigureTransport(transport); err != nil {
 			t.Fatal(err)
 		}
diff --git a/http/handler.go b/http/handler.go
index a91a0514ffd0a..5bf848db2d678 100644
--- a/http/handler.go
+++ b/http/handler.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
@@ -121,25 +118,9 @@ func init() {
 	})
 }
 
-type HandlerAnchor struct{}
-
-func (h HandlerAnchor) Handler(props *vault.HandlerProperties) http.Handler {
-	return handler(props)
-}
-
-var Handler vault.HandlerHandler = HandlerAnchor{}
-
-type HandlerFunc func(props *vault.HandlerProperties) http.Handler
-
-func (h HandlerFunc) Handler(props *vault.HandlerProperties) http.Handler {
-	return h(props)
-}
-
-var _ vault.HandlerHandler = HandlerFunc(func(props *vault.HandlerProperties) http.Handler { return nil })
-
-// handler returns an http.Handler for the API. This can be used on
+// Handler returns an http.Handler for the API. This can be used on
 // its own to mount the Vault API within another web server.
-func handler(props *vault.HandlerProperties) http.Handler {
+func Handler(props *vault.HandlerProperties) http.Handler {
 	core := props.Core
 
 	// Create the muxer to handle the actual endpoints
@@ -178,7 +159,6 @@ func handler(props *vault.HandlerProperties) http.Handler {
 		mux.Handle("/v1/sys/storage/raft/bootstrap", handleSysRaftBootstrap(core))
 		mux.Handle("/v1/sys/storage/raft/join", handleSysRaftJoin(core))
 		mux.Handle("/v1/sys/internal/ui/feature-flags", handleSysInternalFeatureFlags(core))
-
 		for _, path := range injectDataIntoTopRoutes {
 			mux.Handle(path, handleRequestForwarding(core, handleLogicalWithInjector(core)))
 		}
@@ -352,8 +332,8 @@ func wrapGenericHandler(core *vault.Core, h http.Handler, props *vault.HandlerPr
 		// Start with the request context
 		ctx := r.Context()
 		var cancelFunc context.CancelFunc
-		// Add our timeout, but not for the monitor or events endpoints, as they are streaming
-		if strings.HasSuffix(r.URL.Path, "sys/monitor") || strings.Contains(r.URL.Path, "sys/events") {
+		// Add our timeout, but not for the monitor endpoint, as it's streaming
+		if strings.HasSuffix(r.URL.Path, "sys/monitor") {
 			ctx, cancelFunc = context.WithCancel(ctx)
 		} else {
 			ctx, cancelFunc = context.WithTimeout(ctx, maxRequestDuration)
@@ -832,9 +812,16 @@ func handleRequestForwarding(core *vault.Core, handler http.Handler) http.Handle
 				return
 			}
 			path := ns.TrimmedPath(r.URL.Path[len("/v1/"):])
-			if !perfStandbyAlwaysForwardPaths.HasPath(path) && !alwaysRedirectPaths.HasPath(path) {
+			switch {
+			case !perfStandbyAlwaysForwardPaths.HasPath(path) && !alwaysRedirectPaths.HasPath(path):
 				handler.ServeHTTP(w, r)
 				return
+			case strings.HasPrefix(path, "auth/token/create/"):
+				isBatch, err := core.IsBatchTokenCreationRequest(r.Context(), path)
+				if err == nil && isBatch {
+					handler.ServeHTTP(w, r)
+					return
+				}
 			}
 		}
 
@@ -1191,10 +1178,6 @@ func respondError(w http.ResponseWriter, status int, err error) {
 	logical.RespondError(w, status, err)
 }
 
-func respondErrorAndData(w http.ResponseWriter, status int, data interface{}, err error) {
-	logical.RespondErrorAndData(w, status, data, err)
-}
-
 func respondErrorCommon(w http.ResponseWriter, req *logical.Request, resp *logical.Response, err error) bool {
 	statusCode, newErr := logical.RespondErrorCommon(req, resp, err)
 	if newErr == nil && statusCode == 0 {
@@ -1210,12 +1193,6 @@ func respondErrorCommon(w http.ResponseWriter, req *logical.Request, resp *logic
 		return true
 	}
 
-	if resp != nil {
-		if data := resp.Data["data"]; data != nil {
-			respondErrorAndData(w, statusCode, data, newErr)
-			return true
-		}
-	}
 	respondError(w, statusCode, newErr)
 	return true
 }
diff --git a/http/handler_test.go b/http/handler_test.go
index 244fe41772575..49565b41e2356 100644
--- a/http/handler_test.go
+++ b/http/handler_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
diff --git a/http/help.go b/http/help.go
index 64085f1e38b6b..7ec6fb6131aae 100644
--- a/http/help.go
+++ b/http/help.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
diff --git a/http/help_test.go b/http/help_test.go
index d02c26a9521e9..ec9a67dd1c58c 100644
--- a/http/help_test.go
+++ b/http/help_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
diff --git a/http/http_test.go b/http/http_test.go
index 5e51ce7d0fe31..692aef0d82877 100644
--- a/http/http_test.go
+++ b/http/http_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
diff --git a/http/logical.go b/http/logical.go
index 8a681d9107d48..6cdf6bb071105 100644
--- a/http/logical.go
+++ b/http/logical.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
@@ -16,8 +13,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/hashicorp/go-uuid"
-	"github.com/hashicorp/vault/helper/experiments"
+	uuid "github.com/hashicorp/go-uuid"
 	"github.com/hashicorp/vault/helper/namespace"
 	"github.com/hashicorp/vault/sdk/helper/consts"
 	"github.com/hashicorp/vault/sdk/logical"
@@ -183,10 +179,8 @@ func buildLogicalRequestNoAuth(perfStandby bool, w http.ResponseWriter, r *http.
 		}
 
 		data = parseQuery(r.URL.Query())
-	case "HEAD":
-		op = logical.HeaderOperation
-		data = parseQuery(r.URL.Query())
-	case "OPTIONS":
+
+	case "OPTIONS", "HEAD":
 	default:
 		return nil, nil, http.StatusMethodNotAllowed, nil
 	}
@@ -352,24 +346,6 @@ func handleLogicalInternal(core *vault.Core, injectDataIntoTopLevel bool, noForw
 			return
 		}
 
-		// Websockets need to be handled at HTTP layer instead of logical requests.
-		if core.IsExperimentEnabled(experiments.VaultExperimentEventsAlpha1) {
-			ns, err := namespace.FromContext(r.Context())
-			if err != nil {
-				respondError(w, http.StatusInternalServerError, err)
-				return
-			}
-			nsPath := ns.Path
-			if ns.ID == namespace.RootNamespaceID {
-				nsPath = ""
-			}
-			if strings.HasPrefix(r.URL.Path, fmt.Sprintf("/v1/%ssys/events/subscribe/", nsPath)) {
-				handler := handleEventsSubscribe(core, req)
-				handler.ServeHTTP(w, r)
-				return
-			}
-		}
-
 		// Make the internal request. We attach the connection info
 		// as well in case this is an authentication request that requires
 		// it. Vault core handles stripping this if we need to. This also
diff --git a/http/logical_test.go b/http/logical_test.go
index a9ccdff0525f1..fc6fc765811e5 100644
--- a/http/logical_test.go
+++ b/http/logical_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
@@ -11,7 +8,6 @@ import (
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
-	"os"
 	"reflect"
 	"strconv"
 	"strings"
@@ -22,7 +18,6 @@ import (
 	"github.com/hashicorp/vault/api"
 	auditFile "github.com/hashicorp/vault/builtin/audit/file"
 	credUserpass "github.com/hashicorp/vault/builtin/credential/userpass"
-	"github.com/hashicorp/vault/helper/testhelpers/corehelpers"
 	"github.com/hashicorp/vault/internalshared/configutil"
 	"github.com/hashicorp/vault/sdk/helper/consts"
 	"github.com/hashicorp/vault/sdk/helper/logging"
@@ -479,10 +474,13 @@ func TestLogical_RespondWithStatusCode(t *testing.T) {
 
 func TestLogical_Audit_invalidWrappingToken(t *testing.T) {
 	// Create a noop audit backend
-	noop := corehelpers.TestNoopAudit(t, nil)
+	var noop *vault.NoopAudit
 	c, _, root := vault.TestCoreUnsealedWithConfig(t, &vault.CoreConfig{
 		AuditBackends: map[string]audit.Factory{
 			"noop": func(ctx context.Context, config *audit.BackendConfig) (audit.Backend, error) {
+				noop = &vault.NoopAudit{
+					Config: config,
+				}
 				return noop, nil
 			},
 		},
@@ -638,7 +636,7 @@ func TestLogical_AuditPort(t *testing.T) {
 
 	// workaround kv-v2 initialization upgrade errors
 	numFailures := 0
-	corehelpers.RetryUntil(t, 10*time.Second, func() error {
+	vault.RetryUntil(t, 10*time.Second, func() error {
 		resp, err := c.Logical().Write("kv/data/foo", writeData)
 		if err != nil {
 			if strings.Contains(err.Error(), "Upgrading from non-versioned to versioned data") {
@@ -761,180 +759,3 @@ func TestLogical_ErrRelativePath(t *testing.T) {
 		t.Errorf("expected response for write to include %q", logical.ErrRelativePath.Error())
 	}
 }
-
-func testBuiltinPluginMetadataAuditLog(t *testing.T, log map[string]interface{}, expectedMountClass string) {
-	if mountClass, ok := log["mount_class"].(string); !ok {
-		t.Fatalf("mount_class should be a string, not %T", log["mount_class"])
-	} else if mountClass != expectedMountClass {
-		t.Fatalf("bad: mount_class should be %s, not %s", expectedMountClass, mountClass)
-	}
-
-	if _, ok := log["mount_running_version"].(string); !ok {
-		t.Fatalf("mount_running_version should be a string, not %T", log["mount_running_version"])
-	}
-
-	if _, ok := log["mount_running_sha256"].(string); ok {
-		t.Fatalf("mount_running_sha256 should be nil, not %T", log["mount_running_sha256"])
-	}
-
-	if mountIsExternalPlugin, ok := log["mount_is_external_plugin"].(bool); ok && mountIsExternalPlugin {
-		t.Fatalf("mount_is_external_plugin should be nil or false, not %T", log["mount_is_external_plugin"])
-	}
-}
-
-// TestLogical_AuditEnabled_ShouldLogPluginMetadata_Auth tests that we have plugin metadata of a builtin auth plugin
-// in audit log when it is enabled
-func TestLogical_AuditEnabled_ShouldLogPluginMetadata_Auth(t *testing.T) {
-	coreConfig := &vault.CoreConfig{
-		AuditBackends: map[string]audit.Factory{
-			"file": auditFile.Factory,
-		},
-	}
-
-	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
-		HandlerFunc: Handler,
-	})
-
-	cluster.Start()
-	defer cluster.Cleanup()
-
-	cores := cluster.Cores
-
-	core := cores[0].Core
-	c := cluster.Cores[0].Client
-	vault.TestWaitActive(t, core)
-
-	// Enable the audit backend
-	tempDir := t.TempDir()
-	auditLogFile, err := os.CreateTemp(tempDir, "")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = c.Sys().EnableAuditWithOptions("file", &api.EnableAuditOptions{
-		Type: "file",
-		Options: map[string]string{
-			"file_path": auditLogFile.Name(),
-		},
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = c.Logical().Write("auth/token/create", map[string]interface{}{
-		"ttl": "10s",
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Check the audit trail on request and response
-	decoder := json.NewDecoder(auditLogFile)
-	var auditRecord map[string]interface{}
-	for decoder.Decode(&auditRecord) == nil {
-		auditRequest := map[string]interface{}{}
-		if req, ok := auditRecord["request"]; ok {
-			auditRequest = req.(map[string]interface{})
-			if auditRequest["path"] != "auth/token/create" {
-				continue
-			}
-		}
-		testBuiltinPluginMetadataAuditLog(t, auditRequest, consts.PluginTypeCredential.String())
-
-		auditResponse := map[string]interface{}{}
-		if req, ok := auditRecord["response"]; ok {
-			auditRequest = req.(map[string]interface{})
-			if auditResponse["path"] != "auth/token/create" {
-				continue
-			}
-		}
-		testBuiltinPluginMetadataAuditLog(t, auditResponse, consts.PluginTypeCredential.String())
-	}
-}
-
-// TestLogical_AuditEnabled_ShouldLogPluginMetadata_Secret tests that we have plugin metadata of a builtin secret plugin
-// in audit log when it is enabled
-func TestLogical_AuditEnabled_ShouldLogPluginMetadata_Secret(t *testing.T) {
-	coreConfig := &vault.CoreConfig{
-		LogicalBackends: map[string]logical.Factory{
-			"kv": kv.VersionedKVFactory,
-		},
-		AuditBackends: map[string]audit.Factory{
-			"file": auditFile.Factory,
-		},
-	}
-
-	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
-		HandlerFunc: Handler,
-	})
-
-	cluster.Start()
-	defer cluster.Cleanup()
-
-	cores := cluster.Cores
-
-	core := cores[0].Core
-	c := cluster.Cores[0].Client
-	vault.TestWaitActive(t, core)
-
-	if err := c.Sys().Mount("kv/", &api.MountInput{
-		Type: "kv-v2",
-	}); err != nil {
-		t.Fatalf("kv-v2 mount attempt failed - err: %#v\n", err)
-	}
-
-	// Enable the audit backend
-	tempDir := t.TempDir()
-	auditLogFile, err := os.CreateTemp(tempDir, "")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = c.Sys().EnableAuditWithOptions("file", &api.EnableAuditOptions{
-		Type: "file",
-		Options: map[string]string{
-			"file_path": auditLogFile.Name(),
-		},
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	{
-		writeData := map[string]interface{}{
-			"data": map[string]interface{}{
-				"bar": "a",
-			},
-		}
-		corehelpers.RetryUntil(t, 10*time.Second, func() error {
-			resp, err := c.Logical().Write("kv/data/foo", writeData)
-			if err != nil {
-				t.Fatalf("write request failed, err: %#v, resp: %#v\n", err, resp)
-			}
-			return nil
-		})
-	}
-
-	// Check the audit trail on request and response
-	decoder := json.NewDecoder(auditLogFile)
-	var auditRecord map[string]interface{}
-	for decoder.Decode(&auditRecord) == nil {
-		auditRequest := map[string]interface{}{}
-		if req, ok := auditRecord["request"]; ok {
-			auditRequest = req.(map[string]interface{})
-			if auditRequest["path"] != "kv/data/foo" {
-				continue
-			}
-		}
-		testBuiltinPluginMetadataAuditLog(t, auditRequest, consts.PluginTypeSecrets.String())
-
-		auditResponse := map[string]interface{}{}
-		if req, ok := auditRecord["response"]; ok {
-			auditRequest = req.(map[string]interface{})
-			if auditResponse["path"] != "kv/data/foo" {
-				continue
-			}
-		}
-		testBuiltinPluginMetadataAuditLog(t, auditResponse, consts.PluginTypeSecrets.String())
-	}
-}
diff --git a/http/plugin_test.go b/http/plugin_test.go
index b0d85be6d1734..164a3d25f664d 100644
--- a/http/plugin_test.go
+++ b/http/plugin_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
diff --git a/http/sys_audit_test.go b/http/sys_audit_test.go
index 2ec4ffc30c51b..58873bfb12aa1 100644
--- a/http/sys_audit_test.go
+++ b/http/sys_audit_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
diff --git a/http/sys_auth_test.go b/http/sys_auth_test.go
index 3bd0a009dda84..2d1fdf8144cb5 100644
--- a/http/sys_auth_test.go
+++ b/http/sys_auth_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
@@ -11,7 +8,6 @@ import (
 	"time"
 
 	"github.com/go-test/deep"
-	"github.com/hashicorp/vault/helper/testhelpers/corehelpers"
 	"github.com/hashicorp/vault/helper/versions"
 	"github.com/hashicorp/vault/sdk/helper/consts"
 	"github.com/hashicorp/vault/vault"
@@ -489,7 +485,7 @@ func TestSysRemountAuth(t *testing.T) {
 	// Poll until the remount succeeds
 	var remountResp map[string]interface{}
 	testResponseBody(t, resp, &remountResp)
-	corehelpers.RetryUntil(t, 5*time.Second, func() error {
+	vault.RetryUntil(t, 5*time.Second, func() error {
 		resp = testHttpGet(t, token, addr+"/v1/sys/remount/status/"+remountResp["migration_id"].(string))
 		testResponseStatus(t, resp, 200)
 
diff --git a/http/sys_config_cors_test.go b/http/sys_config_cors_test.go
index 2f4a29a49e066..3ad0e810a2c5a 100644
--- a/http/sys_config_cors_test.go
+++ b/http/sys_config_cors_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
diff --git a/http/sys_config_state_test.go b/http/sys_config_state_test.go
index c8f6c402bddb8..b8d7dc27c7539 100644
--- a/http/sys_config_state_test.go
+++ b/http/sys_config_state_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
@@ -151,10 +148,7 @@ func TestSysConfigState_Sanitized(t *testing.T) {
 				"disable_performance_standby":         false,
 				"disable_printable_check":             false,
 				"disable_sealwrap":                    false,
-				"experiments":                         nil,
 				"raw_storage_endpoint":                false,
-				"detect_deadlocks":                    "",
-				"introspection_endpoint":              false,
 				"disable_sentinel_trace":              false,
 				"enable_ui":                           false,
 				"log_format":                          "",
diff --git a/http/sys_feature_flags.go b/http/sys_feature_flags.go
index 9f654b7febda6..11ece32795b77 100644
--- a/http/sys_feature_flags.go
+++ b/http/sys_feature_flags.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
diff --git a/http/sys_generate_root.go b/http/sys_generate_root.go
index 7f953e4d449a7..db2da6f7f3b17 100644
--- a/http/sys_generate_root.go
+++ b/http/sys_generate_root.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
diff --git a/http/sys_generate_root_test.go b/http/sys_generate_root_test.go
index dbd7796315a6c..f226d0042b1d7 100644
--- a/http/sys_generate_root_test.go
+++ b/http/sys_generate_root_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
@@ -15,10 +12,8 @@ import (
 	"testing"
 
 	"github.com/go-test/deep"
-	"github.com/hashicorp/vault/audit"
 	"github.com/hashicorp/vault/helper/namespace"
 	"github.com/hashicorp/vault/helper/pgpkeys"
-	"github.com/hashicorp/vault/helper/testhelpers/corehelpers"
 	"github.com/hashicorp/vault/sdk/helper/xor"
 	"github.com/hashicorp/vault/sdk/logical"
 	"github.com/hashicorp/vault/vault"
@@ -229,11 +224,9 @@ func enableNoopAudit(t *testing.T, token string, core *vault.Core) {
 
 func testCoreUnsealedWithAudit(t *testing.T, records **[][]byte) (*vault.Core, [][]byte, string) {
 	conf := &vault.CoreConfig{
-		BuiltinRegistry: corehelpers.NewMockBuiltinRegistry(),
-		AuditBackends: map[string]audit.Factory{
-			"noop": corehelpers.NoopAuditFactory(records),
-		},
+		BuiltinRegistry: vault.NewMockBuiltinRegistry(),
 	}
+	vault.AddNoopAudit(conf, records)
 	core, keys, token := vault.TestCoreUnsealedWithConfig(t, conf)
 	return core, keys, token
 }
diff --git a/http/sys_health.go b/http/sys_health.go
index b3f29d4dd5e68..fcaf4e1590999 100644
--- a/http/sys_health.go
+++ b/http/sys_health.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
@@ -13,8 +10,8 @@ import (
 
 	"github.com/hashicorp/go-secure-stdlib/parseutil"
 	"github.com/hashicorp/vault/sdk/helper/consts"
+	"github.com/hashicorp/vault/sdk/version"
 	"github.com/hashicorp/vault/vault"
-	"github.com/hashicorp/vault/version"
 )
 
 func handleSysHealth(core *vault.Core) http.Handler {
diff --git a/http/sys_health_test.go b/http/sys_health_test.go
index 9761ec16c98ca..68ef11b9e2f57 100644
--- a/http/sys_health_test.go
+++ b/http/sys_health_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
diff --git a/http/sys_hostinfo_test.go b/http/sys_hostinfo_test.go
index 756841e724f73..af313a382b2b2 100644
--- a/http/sys_hostinfo_test.go
+++ b/http/sys_hostinfo_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
diff --git a/http/sys_in_flight_requests.go b/http/sys_in_flight_requests.go
index bdf3ebaf9d20a..b38156f38ebc4 100644
--- a/http/sys_in_flight_requests.go
+++ b/http/sys_in_flight_requests.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
diff --git a/http/sys_in_flight_requests_test.go b/http/sys_in_flight_requests_test.go
index 93c92c5398355..de64d708c68f2 100644
--- a/http/sys_in_flight_requests_test.go
+++ b/http/sys_in_flight_requests_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
diff --git a/http/sys_init.go b/http/sys_init.go
index 905916bef6283..ae3059462bef4 100644
--- a/http/sys_init.go
+++ b/http/sys_init.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
diff --git a/http/sys_init_test.go b/http/sys_init_test.go
index 79dd275824bd1..4953c4244ce82 100644
--- a/http/sys_init_test.go
+++ b/http/sys_init_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
@@ -153,11 +150,12 @@ func TestSysInit_Put_ValidateParams(t *testing.T) {
 }
 
 func TestSysInit_Put_ValidateParams_AutoUnseal(t *testing.T) {
-	testSeal, _ := seal.NewTestSeal(&seal.TestSealOpts{Name: "transit"})
+	testSeal := seal.NewTestSeal(nil)
 	autoSeal, err := vault.NewAutoSeal(testSeal)
 	if err != nil {
 		t.Fatal(err)
 	}
+	autoSeal.SetType("transit")
 
 	// Create the transit server.
 	conf := &vault.CoreConfig{
diff --git a/http/sys_internal_test.go b/http/sys_internal_test.go
index 11d9376248c56..d3c066f70c847 100644
--- a/http/sys_internal_test.go
+++ b/http/sys_internal_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
diff --git a/http/sys_leader.go b/http/sys_leader.go
index 6b39c4401af3f..8c2ce21e5001d 100644
--- a/http/sys_leader.go
+++ b/http/sys_leader.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
diff --git a/http/sys_leader_test.go b/http/sys_leader_test.go
index 3292b7f2407bc..974b3a7b7e40f 100644
--- a/http/sys_leader_test.go
+++ b/http/sys_leader_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
diff --git a/http/sys_lease_test.go b/http/sys_lease_test.go
index 6b069ca37cedb..a254be71c211c 100644
--- a/http/sys_lease_test.go
+++ b/http/sys_lease_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
diff --git a/http/sys_metrics.go b/http/sys_metrics.go
index 2bb819b34fd81..012417282e5f5 100644
--- a/http/sys_metrics.go
+++ b/http/sys_metrics.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
diff --git a/http/sys_metrics_test.go b/http/sys_metrics_test.go
index 167347b4f7006..241caac2db8fa 100644
--- a/http/sys_metrics_test.go
+++ b/http/sys_metrics_test.go
@@ -1,14 +1,9 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/vault/helper/testhelpers/corehelpers"
-
 	"github.com/armon/go-metrics"
 	"github.com/hashicorp/vault/helper/metricsutil"
 	"github.com/hashicorp/vault/internalshared/configutil"
@@ -19,7 +14,7 @@ func TestSysMetricsUnauthenticated(t *testing.T) {
 	inm := metrics.NewInmemSink(10*time.Second, time.Minute)
 	metrics.DefaultInmemSignal(inm)
 	conf := &vault.CoreConfig{
-		BuiltinRegistry: corehelpers.NewMockBuiltinRegistry(),
+		BuiltinRegistry: vault.NewMockBuiltinRegistry(),
 		MetricsHelper:   metricsutil.NewMetricsHelper(inm, true),
 	}
 	core, _, token := vault.TestCoreUnsealedWithConfig(t, conf)
diff --git a/http/sys_monitor_test.go b/http/sys_monitor_test.go
index 5d428c419a9cd..733862ec448f4 100644
--- a/http/sys_monitor_test.go
+++ b/http/sys_monitor_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
@@ -10,16 +7,15 @@ import (
 	"testing"
 	"time"
 
+	log "github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/vault/helper/testhelpers"
+	"github.com/hashicorp/vault/sdk/helper/logging"
 	"github.com/hashicorp/vault/vault"
 )
 
 func TestSysMonitorUnknownLogLevel(t *testing.T) {
-	t.Parallel()
-	cluster := vault.NewTestCluster(t, nil, &vault.TestClusterOptions{
-		HandlerFunc: Handler,
-		NumCores:    1,
-	})
+	cluster := vault.NewTestCluster(t, nil, &vault.TestClusterOptions{HandlerFunc: Handler})
+	cluster.Start()
 	defer cluster.Cleanup()
 
 	client := cluster.Cores[0].Client
@@ -41,11 +37,8 @@ func TestSysMonitorUnknownLogLevel(t *testing.T) {
 }
 
 func TestSysMonitorUnknownLogFormat(t *testing.T) {
-	t.Parallel()
-	cluster := vault.NewTestCluster(t, nil, &vault.TestClusterOptions{
-		HandlerFunc: Handler,
-		NumCores:    1,
-	})
+	cluster := vault.NewTestCluster(t, nil, &vault.TestClusterOptions{HandlerFunc: Handler})
+	cluster.Start()
 	defer cluster.Cleanup()
 
 	client := cluster.Cores[0].Client
@@ -67,61 +60,64 @@ func TestSysMonitorUnknownLogFormat(t *testing.T) {
 }
 
 func TestSysMonitorStreamingLogs(t *testing.T) {
-	t.Parallel()
-	cluster := vault.NewTestCluster(t, nil, &vault.TestClusterOptions{
-		HandlerFunc: Handler,
-		NumCores:    1,
+	logger := log.NewInterceptLogger(&log.LoggerOptions{
+		Output:     log.DefaultOutput,
+		Level:      log.Debug,
+		JSONFormat: logging.ParseEnvLogFormat() == logging.JSONFormat,
 	})
+
+	lf := logging.ParseEnvLogFormat().String()
+
+	cluster := vault.NewTestCluster(t, nil, &vault.TestClusterOptions{HandlerFunc: Handler, Logger: logger})
+	cluster.Start()
 	defer cluster.Cleanup()
 
 	client := cluster.Cores[0].Client
 	stopCh := testhelpers.GenerateDebugLogs(t, client)
-	defer close(stopCh)
 
-	for _, lf := range []string{"standard", "json"} {
-		t.Run(lf, func(t *testing.T) {
-			debugCount := 0
+	debugCount := 0
+	ctx, cancel := context.WithTimeout(context.Background(), 90*time.Second)
+	defer cancel()
+	logCh, err := client.Sys().Monitor(ctx, "DEBUG", lf)
+	if err != nil {
+		t.Fatal(err)
+	}
 
-			ctx, cancel := context.WithCancel(context.Background())
-			defer cancel()
+	type jsonlog struct {
+		Level     string `json:"@level"`
+		Message   string `json:"@message"`
+		TimeStamp string `json:"@timestamp"`
+	}
+	jsonLog := &jsonlog{}
 
-			logCh, err := client.Sys().Monitor(ctx, "DEBUG", lf)
-			if err != nil {
-				t.Fatal(err)
-			}
+	timeCh := time.After(5 * time.Second)
 
-			type jsonlog struct {
-				Level     string `json:"@level"`
-				Message   string `json:"@message"`
-				TimeStamp string `json:"@timestamp"`
-			}
-			jsonLog := &jsonlog{}
-
-			timeCh := time.After(5 * time.Second)
-
-			for {
-				select {
-				case log := <-logCh:
-					if lf == "json" {
-						err := json.Unmarshal([]byte(log), jsonLog)
-						if err != nil {
-							t.Fatal("Expected JSON log from channel")
-						}
-						if strings.Contains(jsonLog.Level, "debug") {
-							debugCount++
-						}
-					} else if strings.Contains(log, "[DEBUG]") {
-						debugCount++
-					}
-					if debugCount > 3 {
-						// If we've seen multiple lines that match what we want,
-						// it's probably safe to assume streaming is working
-						return
-					}
-				case <-timeCh:
-					t.Fatal("Failed to get a DEBUG message after 5 seconds")
+	for {
+		select {
+		case log := <-logCh:
+			if lf == "json" {
+				err := json.Unmarshal([]byte(log), jsonLog)
+				if err != nil {
+					t.Fatal("Expected JSON log from channel")
+				}
+				if strings.Contains(jsonLog.Level, "debug") {
+					debugCount++
 				}
 			}
-		})
+			if strings.Contains(log, "[DEBUG]") {
+				debugCount++
+			}
+		case <-timeCh:
+			t.Fatal("Failed to get a DEBUG message after 5 seconds")
+		}
+
+		// If we've seen multiple lines that match what we want,
+		// it's probably safe to assume streaming is working
+		if debugCount > 3 {
+			stopCh <- struct{}{}
+			break
+		}
 	}
+
+	<-stopCh
 }
diff --git a/http/sys_mount_test.go b/http/sys_mount_test.go
index 384f5bf810bf9..420abcc87234e 100644
--- a/http/sys_mount_test.go
+++ b/http/sys_mount_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
@@ -12,7 +9,6 @@ import (
 
 	"github.com/fatih/structs"
 	"github.com/go-test/deep"
-	"github.com/hashicorp/vault/helper/testhelpers/corehelpers"
 	"github.com/hashicorp/vault/helper/versions"
 	"github.com/hashicorp/vault/sdk/helper/consts"
 	"github.com/hashicorp/vault/vault"
@@ -506,7 +502,7 @@ func TestSysRemount(t *testing.T) {
 	// Poll until the remount succeeds
 	var remountResp map[string]interface{}
 	testResponseBody(t, resp, &remountResp)
-	corehelpers.RetryUntil(t, 5*time.Second, func() error {
+	vault.RetryUntil(t, 5*time.Second, func() error {
 		resp = testHttpGet(t, token, addr+"/v1/sys/remount/status/"+remountResp["migration_id"].(string))
 		testResponseStatus(t, resp, 200)
 
diff --git a/http/sys_mounts_test.go b/http/sys_mounts_test.go
index 5f2218514ec07..7c113d9879509 100644
--- a/http/sys_mounts_test.go
+++ b/http/sys_mounts_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
diff --git a/http/sys_policy_test.go b/http/sys_policy_test.go
index 1ab1e85bb7acc..6844a5321d6a6 100644
--- a/http/sys_policy_test.go
+++ b/http/sys_policy_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
diff --git a/http/sys_raft.go b/http/sys_raft.go
index 1e00ebe5d90cd..428aad4f7da3a 100644
--- a/http/sys_raft.go
+++ b/http/sys_raft.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
diff --git a/http/sys_rekey.go b/http/sys_rekey.go
index c05dc83976531..d1cec653a6283 100644
--- a/http/sys_rekey.go
+++ b/http/sys_rekey.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
diff --git a/http/sys_rekey_test.go b/http/sys_rekey_test.go
index eaef4dd7a1f3b..fd068ba48bda1 100644
--- a/http/sys_rekey_test.go
+++ b/http/sys_rekey_test.go
@@ -1,57 +1,46 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
+	"net/http"
 	"reflect"
 	"testing"
 
 	"github.com/go-test/deep"
-	"github.com/hashicorp/vault/sdk/helper/testhelpers/schema"
 	"github.com/hashicorp/vault/vault"
 )
 
 // Test to check if the API errors out when wrong number of PGP keys are
 // supplied for rekey
 func TestSysRekey_Init_pgpKeysEntriesForRekey(t *testing.T) {
-	cluster := vault.NewTestCluster(t, nil, &vault.TestClusterOptions{
-		HandlerFunc:             Handler,
-		RequestResponseCallback: schema.ResponseValidatingCallback(t),
-	})
-	cluster.Start()
-	defer cluster.Cleanup()
-	cl := cluster.Cores[0].Client
+	core, _, token := vault.TestCoreUnsealed(t)
+	ln, addr := TestServer(t, core)
+	defer ln.Close()
+	TestServerAuth(t, addr, token)
 
-	_, err := cl.Logical().Write("sys/rekey/init", map[string]interface{}{
+	resp := testHttpPut(t, token, addr+"/v1/sys/rekey/init", map[string]interface{}{
 		"secret_shares":    5,
 		"secret_threshold": 3,
 		"pgp_keys":         []string{"pgpkey1"},
 	})
-	if err == nil {
-		t.Fatal("should have failed to write pgp key entry due to mismatched keys", err)
-	}
+	testResponseStatus(t, resp, 400)
 }
 
 func TestSysRekey_Init_Status(t *testing.T) {
 	t.Run("status-barrier-default", func(t *testing.T) {
-		cluster := vault.NewTestCluster(t, nil, &vault.TestClusterOptions{
-			HandlerFunc:             Handler,
-			RequestResponseCallback: schema.ResponseValidatingCallback(t),
-		})
-		cluster.Start()
-		defer cluster.Cleanup()
-		cl := cluster.Cores[0].Client
+		core, _, token := vault.TestCoreUnsealed(t)
+		ln, addr := TestServer(t, core)
+		defer ln.Close()
+		TestServerAuth(t, addr, token)
 
-		resp, err := cl.Logical().Read("sys/rekey/init")
+		resp, err := http.Get(addr + "/v1/sys/rekey/init")
 		if err != nil {
 			t.Fatalf("err: %s", err)
 		}
 
-		actual := resp.Data
+		var actual map[string]interface{}
 		expected := map[string]interface{}{
 			"started":               false,
 			"t":                     json.Number("0"),
@@ -63,7 +52,8 @@ func TestSysRekey_Init_Status(t *testing.T) {
 			"nonce":                 "",
 			"verification_required": false,
 		}
-
+		testResponseStatus(t, resp, 200)
+		testResponseBody(t, resp, &actual)
 		if !reflect.DeepEqual(actual, expected) {
 			t.Fatalf("\nexpected: %#v\nactual: %#v", expected, actual)
 		}
@@ -72,24 +62,19 @@ func TestSysRekey_Init_Status(t *testing.T) {
 
 func TestSysRekey_Init_Setup(t *testing.T) {
 	t.Run("init-barrier-barrier-key", func(t *testing.T) {
-		cluster := vault.NewTestCluster(t, nil, &vault.TestClusterOptions{
-			HandlerFunc:             Handler,
-			RequestResponseCallback: schema.ResponseValidatingCallback(t),
-		})
-		cluster.Start()
-		defer cluster.Cleanup()
-		cl := cluster.Cores[0].Client
+		core, _, token := vault.TestCoreUnsealed(t)
+		ln, addr := TestServer(t, core)
+		defer ln.Close()
+		TestServerAuth(t, addr, token)
 
 		// Start rekey
-		resp, err := cl.Logical().Write("sys/rekey/init", map[string]interface{}{
+		resp := testHttpPut(t, token, addr+"/v1/sys/rekey/init", map[string]interface{}{
 			"secret_shares":    5,
 			"secret_threshold": 3,
 		})
-		if err != nil {
-			t.Fatalf("err: %s", err)
-		}
+		testResponseStatus(t, resp, 200)
 
-		actual := resp.Data
+		var actual map[string]interface{}
 		expected := map[string]interface{}{
 			"started":               true,
 			"t":                     json.Number("3"),
@@ -100,7 +85,8 @@ func TestSysRekey_Init_Setup(t *testing.T) {
 			"backup":                false,
 			"verification_required": false,
 		}
-
+		testResponseStatus(t, resp, 200)
+		testResponseBody(t, resp, &actual)
 		if actual["nonce"].(string) == "" {
 			t.Fatalf("nonce was empty")
 		}
@@ -110,12 +96,9 @@ func TestSysRekey_Init_Setup(t *testing.T) {
 		}
 
 		// Get rekey status
-		resp, err = cl.Logical().Read("sys/rekey/init")
-		if err != nil {
-			t.Fatalf("err: %s", err)
-		}
+		resp = testHttpGet(t, token, addr+"/v1/sys/rekey/init")
 
-		actual = resp.Data
+		actual = map[string]interface{}{}
 		expected = map[string]interface{}{
 			"started":               true,
 			"t":                     json.Number("3"),
@@ -126,6 +109,8 @@ func TestSysRekey_Init_Setup(t *testing.T) {
 			"backup":                false,
 			"verification_required": false,
 		}
+		testResponseStatus(t, resp, 200)
+		testResponseBody(t, resp, &actual)
 		if actual["nonce"].(string) == "" {
 			t.Fatalf("nonce was empty")
 		}
@@ -141,33 +126,26 @@ func TestSysRekey_Init_Setup(t *testing.T) {
 
 func TestSysRekey_Init_Cancel(t *testing.T) {
 	t.Run("cancel-barrier-barrier-key", func(t *testing.T) {
-		cluster := vault.NewTestCluster(t, nil, &vault.TestClusterOptions{
-			HandlerFunc:             Handler,
-			RequestResponseCallback: schema.ResponseValidatingCallback(t),
-		})
-		cluster.Start()
-		defer cluster.Cleanup()
-		cl := cluster.Cores[0].Client
+		core, _, token := vault.TestCoreUnsealed(t)
+		ln, addr := TestServer(t, core)
+		defer ln.Close()
+		TestServerAuth(t, addr, token)
 
-		_, err := cl.Logical().Write("sys/rekey/init", map[string]interface{}{
+		resp := testHttpPut(t, token, addr+"/v1/sys/rekey/init", map[string]interface{}{
 			"secret_shares":    5,
 			"secret_threshold": 3,
 		})
-		if err != nil {
-			t.Fatalf("err: %s", err)
-		}
+		testResponseStatus(t, resp, 200)
 
-		_, err = cl.Logical().Delete("sys/rekey/init")
-		if err != nil {
-			t.Fatalf("err: %s", err)
-		}
+		resp = testHttpDelete(t, token, addr+"/v1/sys/rekey/init")
+		testResponseStatus(t, resp, 204)
 
-		resp, err := cl.Logical().Read("sys/rekey/init")
+		resp, err := http.Get(addr + "/v1/sys/rekey/init")
 		if err != nil {
 			t.Fatalf("err: %s", err)
 		}
 
-		actual := resp.Data
+		var actual map[string]interface{}
 		expected := map[string]interface{}{
 			"started":               false,
 			"t":                     json.Number("0"),
@@ -179,6 +157,8 @@ func TestSysRekey_Init_Cancel(t *testing.T) {
 			"nonce":                 "",
 			"verification_required": false,
 		}
+		testResponseStatus(t, resp, 200)
+		testResponseBody(t, resp, &actual)
 		if !reflect.DeepEqual(actual, expected) {
 			t.Fatalf("\nexpected: %#v\nactual: %#v", expected, actual)
 		}
diff --git a/http/sys_rotate_test.go b/http/sys_rotate_test.go
index dfc28a257c559..81597c7008e01 100644
--- a/http/sys_rotate_test.go
+++ b/http/sys_rotate_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
diff --git a/http/sys_seal.go b/http/sys_seal.go
index 5d32828e70f9d..24f491b65d1d6 100644
--- a/http/sys_seal.go
+++ b/http/sys_seal.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
diff --git a/http/sys_seal_test.go b/http/sys_seal_test.go
index ef5922d52220f..e991f44163c73 100644
--- a/http/sys_seal_test.go
+++ b/http/sys_seal_test.go
@@ -1,25 +1,18 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
-	"context"
-	"encoding/base64"
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
 	"net/http"
 	"strconv"
-	"strings"
 	"testing"
 
 	"github.com/go-test/deep"
 	"github.com/hashicorp/vault/helper/namespace"
 	"github.com/hashicorp/vault/sdk/logical"
+	"github.com/hashicorp/vault/sdk/version"
 	"github.com/hashicorp/vault/vault"
-	"github.com/hashicorp/vault/vault/seal"
-	"github.com/hashicorp/vault/version"
 )
 
 func TestSysSealStatus(t *testing.T) {
@@ -162,173 +155,16 @@ func TestSysUnseal(t *testing.T) {
 	}
 }
 
-func subtestBadSingleKey(t *testing.T, seal vault.Seal) {
-	core := vault.TestCoreWithSeal(t, seal, false)
-	_, err := core.Initialize(context.Background(), &vault.InitParams{
-		BarrierConfig: &vault.SealConfig{
-			SecretShares:    1,
-			SecretThreshold: 1,
-		},
-		RecoveryConfig: &vault.SealConfig{
-			SecretShares:    1,
-			SecretThreshold: 1,
-		},
-	})
-	if err != nil {
-		t.Fatalf("err: %s", err)
-	}
-
+func TestSysUnseal_badKey(t *testing.T) {
+	core := vault.TestCore(t)
+	vault.TestCoreInit(t, core)
 	ln, addr := TestServer(t, core)
 	defer ln.Close()
 
-	testCases := []struct {
-		description string
-		key         string
-	}{
-		// hex key tests
-		// hexadecimal strings have 2 symbols per byte; size(0xAA) == 1 byte
-		{
-			"short hex key",
-			strings.Repeat("AA", 8),
-		},
-		{
-			"long hex key",
-			strings.Repeat("AA", 34),
-		},
-		{
-			"uneven hex key byte length",
-			strings.Repeat("AA", 33),
-		},
-		{
-			"valid hex key but wrong cluster",
-			"4482691dd3a710723c4f77c4920ee21b96c226bf4829fa6eb8e8262c180ae933",
-		},
-
-		// base64 key tests
-		// base64 strings have min. 1 character per byte; size("m") == 1 byte
-		{
-			"short b64 key",
-			base64.StdEncoding.EncodeToString([]byte(strings.Repeat("m", 8))),
-		},
-		{
-			"long b64 key",
-			base64.StdEncoding.EncodeToString([]byte(strings.Repeat("m", 34))),
-		},
-		{
-			"uneven b64 key byte length",
-			base64.StdEncoding.EncodeToString([]byte(strings.Repeat("m", 33))),
-		},
-		{
-			"valid b64 key but wrong cluster",
-			"RIJpHdOnEHI8T3fEkg7iG5bCJr9IKfpuuOgmLBgK6TM=",
-		},
-
-		// other key tests
-		{
-			"empty key",
-			"",
-		},
-		{
-			"key with bad format",
-			"ThisKeyIsNeitherB64NorHex",
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.description, func(t *testing.T) {
-			resp := testHttpPut(t, "", addr+"/v1/sys/unseal", map[string]interface{}{
-				"key": tc.key,
-			})
-
-			testResponseStatus(t, resp, 400)
-		})
-	}
-}
-
-func subtestBadMultiKey(t *testing.T, seal vault.Seal) {
-	numKeys := 3
-
-	core := vault.TestCoreWithSeal(t, seal, false)
-	_, err := core.Initialize(context.Background(), &vault.InitParams{
-		BarrierConfig: &vault.SealConfig{
-			SecretShares:    numKeys,
-			SecretThreshold: numKeys,
-		},
-		RecoveryConfig: &vault.SealConfig{
-			SecretShares:    numKeys,
-			SecretThreshold: numKeys,
-		},
+	resp := testHttpPut(t, "", addr+"/v1/sys/unseal", map[string]interface{}{
+		"key": "0123",
 	})
-	if err != nil {
-		t.Fatalf("err: %s", err)
-	}
-	ln, addr := TestServer(t, core)
-	defer ln.Close()
-
-	testCases := []struct {
-		description string
-		keys        []string
-	}{
-		{
-			"all unseal keys from another cluster",
-			[]string{
-				"b189d98fdec3a15bed9b1cce5088f82b92896696b788c07bdf03c73da08279a5e8",
-				"0fa98232f034177d8d9c2824899a2ac1e55dc6799348533e10510b856aef99f61a",
-				"5344f5caa852f9ba1967d9623ed286a45ea7c4a529522d25f05d29ff44f17930ac",
-			},
-		},
-		{
-			"mixing unseal keys from different cluster, different share config",
-			[]string{
-				"b189d98fdec3a15bed9b1cce5088f82b92896696b788c07bdf03c73da08279a5e8",
-				"0fa98232f034177d8d9c2824899a2ac1e55dc6799348533e10510b856aef99f61a",
-				"e04ea3020838c2050c4a169d7ba4d30e034eec8e83e8bed9461bf2646ee412c0",
-			},
-		},
-		{
-			"mixing unseal keys from different clusters, similar share config",
-			[]string{
-				"b189d98fdec3a15bed9b1cce5088f82b92896696b788c07bdf03c73da08279a5e8",
-				"0fa98232f034177d8d9c2824899a2ac1e55dc6799348533e10510b856aef99f61a",
-				"413f80521b393aa6c4e42e9a3a3ab7f00c2002b2c3bf1e273fc6f363f35f2a378b",
-			},
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.description, func(t *testing.T) {
-			for i, key := range tc.keys {
-				resp := testHttpPut(t, "", addr+"/v1/sys/unseal", map[string]interface{}{
-					"key": key,
-				})
-
-				if i == numKeys-1 {
-					// last key
-					testResponseStatus(t, resp, 400)
-				} else {
-					// unseal in progress
-					testResponseStatus(t, resp, 200)
-				}
-
-			}
-		})
-	}
-}
-
-func TestSysUnseal_BadKeyNewShamir(t *testing.T) {
-	seal := vault.NewTestSeal(t,
-		&seal.TestSealOpts{StoredKeys: seal.StoredKeysSupportedShamirRoot})
-
-	subtestBadSingleKey(t, seal)
-	subtestBadMultiKey(t, seal)
-}
-
-func TestSysUnseal_BadKeyAutoUnseal(t *testing.T) {
-	seal := vault.NewTestSeal(t,
-		&seal.TestSealOpts{StoredKeys: seal.StoredKeysSupportedGeneric})
-
-	subtestBadSingleKey(t, seal)
-	subtestBadMultiKey(t, seal)
+	testResponseStatus(t, resp, 400)
 }
 
 func TestSysUnseal_Reset(t *testing.T) {
diff --git a/http/sys_wrapping_test.go b/http/sys_wrapping_test.go
index c991bd2304800..17520e78cf324 100644
--- a/http/sys_wrapping_test.go
+++ b/http/sys_wrapping_test.go
@@ -1,11 +1,7 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
 	"encoding/json"
-	"errors"
 	"reflect"
 	"testing"
 	"time"
@@ -370,20 +366,4 @@ func TestHTTP_Wrapping(t *testing.T) {
 	}) {
 		t.Fatalf("secret data did not match expected: %#v", secret.Data)
 	}
-
-	// Ensure that wrapping lookup without a client token responds correctly
-	client.ClearToken()
-	secret, err = client.Logical().Read("sys/wrapping/lookup")
-	if secret != nil {
-		t.Fatalf("expected no response: %#v", secret)
-	}
-
-	if err == nil {
-		t.Fatal("expected error")
-	}
-
-	var respError *api.ResponseError
-	if errors.As(err, &respError); respError.StatusCode != 403 {
-		t.Fatalf("expected 403 response, actual: %d", respError.StatusCode)
-	}
 }
diff --git a/http/testing.go b/http/testing.go
index 95153991e7667..0d2c58a619885 100644
--- a/http/testing.go
+++ b/http/testing.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
@@ -34,7 +31,7 @@ func TestServerWithListenerAndProperties(tb testing.TB, ln net.Listener, addr st
 	// for tests.
 	mux := http.NewServeMux()
 	mux.Handle("/_test/auth", http.HandlerFunc(testHandleAuth))
-	mux.Handle("/", Handler.Handler(props))
+	mux.Handle("/", Handler(props))
 
 	server := &http.Server{
 		Addr:     ln.Addr().String(),
diff --git a/http/unwrapping_raw_body_test.go b/http/unwrapping_raw_body_test.go
index e1ad0df9c297a..6ba24b7c9098d 100644
--- a/http/unwrapping_raw_body_test.go
+++ b/http/unwrapping_raw_body_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
diff --git a/http/util.go b/http/util.go
index f714efa54f3bb..b4c8923cc3eea 100644
--- a/http/util.go
+++ b/http/util.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package http
 
 import (
diff --git a/internal/go118_sha1_patch.go b/internal/go118_sha1_patch.go
index fc2ccf238266e..f3b3cea68847d 100644
--- a/internal/go118_sha1_patch.go
+++ b/internal/go118_sha1_patch.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package internal
 
 import (
@@ -10,7 +7,7 @@ import (
 	_ "unsafe" // for go:linkname
 
 	goversion "github.com/hashicorp/go-version"
-	"github.com/hashicorp/vault/version"
+	"github.com/hashicorp/vault/sdk/version"
 )
 
 const sha1PatchVersionsBefore = "1.12.0"
diff --git a/internalshared/configutil/config.go b/internalshared/configutil/config.go
index 99777229f0d49..5c12e03b949f1 100644
--- a/internalshared/configutil/config.go
+++ b/internalshared/configutil/config.go
@@ -1,10 +1,8 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package configutil
 
 import (
 	"fmt"
+	"io/ioutil"
 	"time"
 
 	"github.com/hashicorp/go-secure-stdlib/parseutil"
@@ -23,8 +21,6 @@ type SharedConfig struct {
 
 	Listeners []*Listener `hcl:"-"`
 
-	UserLockouts []*UserLockout `hcl:"-"`
-
 	Seals   []*KMS   `hcl:"-"`
 	Entropy *Entropy `hcl:"-"`
 
@@ -41,20 +37,33 @@ type SharedConfig struct {
 	// LogFormat specifies the log format. Valid values are "standard" and
 	// "json". The values are case-insenstive. If no log format is specified,
 	// then standard format will be used.
-	LogFormat            string      `hcl:"log_format"`
-	LogLevel             string      `hcl:"log_level"`
-	LogFile              string      `hcl:"log_file"`
-	LogRotateDuration    string      `hcl:"log_rotate_duration"`
-	LogRotateBytes       int         `hcl:"log_rotate_bytes"`
-	LogRotateBytesRaw    interface{} `hcl:"log_rotate_bytes"`
-	LogRotateMaxFiles    int         `hcl:"log_rotate_max_files"`
-	LogRotateMaxFilesRaw interface{} `hcl:"log_rotate_max_files"`
+	LogFormat string `hcl:"log_format"`
+	LogLevel  string `hcl:"log_level"`
 
 	PidFile string `hcl:"pid_file"`
 
 	ClusterName string `hcl:"cluster_name"`
 }
 
+// LoadConfigFile loads the configuration from the given file.
+func LoadConfigFile(path string) (*SharedConfig, error) {
+	// Read the file
+	d, err := ioutil.ReadFile(path)
+	if err != nil {
+		return nil, err
+	}
+	return ParseConfig(string(d))
+}
+
+func LoadConfigKMSes(path string) ([]*KMS, error) {
+	// Read the file
+	d, err := ioutil.ReadFile(path)
+	if err != nil {
+		return nil, err
+	}
+	return ParseKMSes(string(d))
+}
+
 func ParseConfig(d string) (*SharedConfig, error) {
 	// Parse!
 	obj, err := hcl.Parse(d)
@@ -125,13 +134,6 @@ func ParseConfig(d string) (*SharedConfig, error) {
 		}
 	}
 
-	if o := list.Filter("user_lockout"); len(o.Items) > 0 {
-		result.found("user_lockout", "UserLockout")
-		if err := ParseUserLockouts(&result, o); err != nil {
-			return nil, fmt.Errorf("error parsing 'user_lockout': %w", err)
-		}
-	}
-
 	if o := list.Filter("telemetry"); len(o.Items) > 0 {
 		result.found("telemetry", "Telemetry")
 		if err := parseTelemetry(&result, o); err != nil {
@@ -192,22 +194,6 @@ func (c *SharedConfig) Sanitized() map[string]interface{} {
 		result["listeners"] = sanitizedListeners
 	}
 
-	// Sanitize user lockout stanza
-	if len(c.UserLockouts) != 0 {
-		var sanitizedUserLockouts []interface{}
-		for _, userlockout := range c.UserLockouts {
-			cleanUserLockout := map[string]interface{}{
-				"type":                  userlockout.Type,
-				"lockout_threshold":     userlockout.LockoutThreshold,
-				"lockout_duration":      userlockout.LockoutDuration,
-				"lockout_counter_reset": userlockout.LockoutCounterReset,
-				"disable_lockout":       userlockout.DisableLockout,
-			}
-			sanitizedUserLockouts = append(sanitizedUserLockouts, cleanUserLockout)
-		}
-		result["user_lockout_configs"] = sanitizedUserLockouts
-	}
-
 	// Sanitize seals stanza
 	if len(c.Seals) != 0 {
 		var sanitizedSeals []interface{}
diff --git a/internalshared/configutil/config_util.go b/internalshared/configutil/config_util.go
index 3fd4bb9487130..05cb061e7e9b6 100644
--- a/internalshared/configutil/config_util.go
+++ b/internalshared/configutil/config_util.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !enterprise
 
 package configutil
diff --git a/internalshared/configutil/encrypt_decrypt.go b/internalshared/configutil/encrypt_decrypt.go
index f0e5fcc04270b..1e9f830901c44 100644
--- a/internalshared/configutil/encrypt_decrypt.go
+++ b/internalshared/configutil/encrypt_decrypt.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package configutil
 
 import (
diff --git a/internalshared/configutil/encrypt_decrypt_test.go b/internalshared/configutil/encrypt_decrypt_test.go
index 19bf6858338b8..b9257bb6c2b2d 100644
--- a/internalshared/configutil/encrypt_decrypt_test.go
+++ b/internalshared/configutil/encrypt_decrypt_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package configutil
 
 import (
diff --git a/internalshared/configutil/hcp_link.go b/internalshared/configutil/hcp_link.go
index fd8d6b6ca8539..a46c3bb1f5530 100644
--- a/internalshared/configutil/hcp_link.go
+++ b/internalshared/configutil/hcp_link.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package configutil
 
 import (
diff --git a/internalshared/configutil/http_response_headers.go b/internalshared/configutil/http_response_headers.go
index b808f9e6522c9..2db3034e588b6 100644
--- a/internalshared/configutil/http_response_headers.go
+++ b/internalshared/configutil/http_response_headers.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package configutil
 
 import (
diff --git a/internalshared/configutil/kms.go b/internalshared/configutil/kms.go
index 025018124984d..614a6ec8e5712 100644
--- a/internalshared/configutil/kms.go
+++ b/internalshared/configutil/kms.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package configutil
 
 import (
diff --git a/internalshared/configutil/lint.go b/internalshared/configutil/lint.go
index 24b968e6b96b0..2b5b634156b3c 100644
--- a/internalshared/configutil/lint.go
+++ b/internalshared/configutil/lint.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package configutil
 
 import (
diff --git a/internalshared/configutil/listener.go b/internalshared/configutil/listener.go
index 5e9373a169c77..3f3c5993025c8 100644
--- a/internalshared/configutil/listener.go
+++ b/internalshared/configutil/listener.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package configutil
 
 import (
@@ -47,7 +44,6 @@ type Listener struct {
 	Type       string
 	Purpose    []string    `hcl:"-"`
 	PurposeRaw interface{} `hcl:"purpose"`
-	Role       string      `hcl:"role"`
 
 	Address                 string        `hcl:"address"`
 	ClusterAddress          string        `hcl:"cluster_address"`
@@ -100,8 +96,6 @@ type Listener struct {
 
 	AgentAPI *AgentAPI `hcl:"agent_api"`
 
-	ProxyAPI *ProxyAPI `hcl:"proxy_api"`
-
 	Telemetry              ListenerTelemetry              `hcl:"telemetry"`
 	Profiling              ListenerProfiling              `hcl:"profiling"`
 	InFlightRequestLogging ListenerInFlightRequestLogging `hcl:"inflight_requests_logging"`
@@ -125,11 +119,6 @@ type AgentAPI struct {
 	EnableQuit bool `hcl:"enable_quit"`
 }
 
-// ProxyAPI allows users to select which parts of the Vault Proxy API they want enabled.
-type ProxyAPI struct {
-	EnableQuit bool `hcl:"enable_quit"`
-}
-
 func (l *Listener) GoString() string {
 	return fmt.Sprintf("*%#v", *l)
 }
@@ -193,13 +182,6 @@ func ParseListeners(result *SharedConfig, list *ast.ObjectList) error {
 
 				l.PurposeRaw = nil
 			}
-
-			switch l.Role {
-			case "default", "metrics_only", "":
-				result.found(l.Type, l.Type)
-			default:
-				return multierror.Prefix(fmt.Errorf("unsupported listener role %q", l.Role), fmt.Sprintf("listeners.%d:", i))
-			}
 		}
 
 		// Request Parameters
diff --git a/internalshared/configutil/listener_test.go b/internalshared/configutil/listener_test.go
index da7d76596b6fe..803086e483e23 100644
--- a/internalshared/configutil/listener_test.go
+++ b/internalshared/configutil/listener_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package configutil
 
 import (
diff --git a/internalshared/configutil/merge.go b/internalshared/configutil/merge.go
index 940e8bfcfb2cc..8ae99ca4879d7 100644
--- a/internalshared/configutil/merge.go
+++ b/internalshared/configutil/merge.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package configutil
 
 func (c *SharedConfig) Merge(c2 *SharedConfig) *SharedConfig {
@@ -17,13 +14,6 @@ func (c *SharedConfig) Merge(c2 *SharedConfig) *SharedConfig {
 		result.Listeners = append(result.Listeners, l)
 	}
 
-	for _, userlockout := range c.UserLockouts {
-		result.UserLockouts = append(result.UserLockouts, userlockout)
-	}
-	for _, userlockout := range c2.UserLockouts {
-		result.UserLockouts = append(result.UserLockouts, userlockout)
-	}
-
 	result.HCPLinkConf = c.HCPLinkConf
 	if c2.HCPLinkConf != nil {
 		result.HCPLinkConf = c2.HCPLinkConf
@@ -66,28 +56,6 @@ func (c *SharedConfig) Merge(c2 *SharedConfig) *SharedConfig {
 		result.LogFormat = c2.LogFormat
 	}
 
-	result.LogFile = c.LogFile
-	if c2.LogFile != "" {
-		result.LogFile = c2.LogFile
-	}
-
-	result.LogRotateBytes = c.LogRotateBytes
-	if c2.LogRotateBytesRaw != nil {
-		result.LogRotateBytes = c2.LogRotateBytes
-		result.LogRotateBytesRaw = c2.LogRotateBytesRaw
-	}
-
-	result.LogRotateMaxFiles = c.LogRotateMaxFiles
-	if c2.LogRotateMaxFilesRaw != nil {
-		result.LogRotateMaxFiles = c2.LogRotateMaxFiles
-		result.LogRotateMaxFilesRaw = c2.LogRotateMaxFilesRaw
-	}
-
-	result.LogRotateDuration = c.LogRotateDuration
-	if c2.LogRotateDuration != "" {
-		result.LogRotateDuration = c2.LogRotateDuration
-	}
-
 	result.PidFile = c.PidFile
 	if c2.PidFile != "" {
 		result.PidFile = c2.PidFile
diff --git a/internalshared/configutil/telemetry.go b/internalshared/configutil/telemetry.go
index 270eb493d5ee7..77620770db3e6 100644
--- a/internalshared/configutil/telemetry.go
+++ b/internalshared/configutil/telemetry.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package configutil
 
 import (
diff --git a/internalshared/configutil/telemetry_test.go b/internalshared/configutil/telemetry_test.go
index aaeb808171ab7..dda74711dcb55 100644
--- a/internalshared/configutil/telemetry_test.go
+++ b/internalshared/configutil/telemetry_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package configutil
 
 import (
diff --git a/internalshared/configutil/userlockout.go b/internalshared/configutil/userlockout.go
deleted file mode 100644
index df76308ddb5ab..0000000000000
--- a/internalshared/configutil/userlockout.go
+++ /dev/null
@@ -1,193 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package configutil
-
-import (
-	"errors"
-	"fmt"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/hashicorp/go-multierror"
-	"github.com/hashicorp/go-secure-stdlib/parseutil"
-	"github.com/hashicorp/hcl"
-	"github.com/hashicorp/hcl/hcl/ast"
-)
-
-const (
-	UserLockoutThresholdDefault    = 5
-	UserLockoutDurationDefault     = 15 * time.Minute
-	UserLockoutCounterResetDefault = 15 * time.Minute
-	DisableUserLockoutDefault      = false
-)
-
-type UserLockout struct {
-	Type                   string
-	LockoutThreshold       uint64        `hcl:"-"`
-	LockoutThresholdRaw    interface{}   `hcl:"lockout_threshold"`
-	LockoutDuration        time.Duration `hcl:"-"`
-	LockoutDurationRaw     interface{}   `hcl:"lockout_duration"`
-	LockoutCounterReset    time.Duration `hcl:"-"`
-	LockoutCounterResetRaw interface{}   `hcl:"lockout_counter_reset"`
-	DisableLockout         bool          `hcl:"-"`
-	DisableLockoutRaw      interface{}   `hcl:"disable_lockout"`
-}
-
-func GetSupportedUserLockoutsAuthMethods() []string {
-	return []string{"userpass", "approle", "ldap"}
-}
-
-func ParseUserLockouts(result *SharedConfig, list *ast.ObjectList) error {
-	var err error
-	result.UserLockouts = make([]*UserLockout, 0, len(list.Items))
-	userLockoutsMap := make(map[string]*UserLockout)
-	for i, item := range list.Items {
-		var userLockoutConfig UserLockout
-		if err := hcl.DecodeObject(&userLockoutConfig, item.Val); err != nil {
-			return multierror.Prefix(err, fmt.Sprintf("userLockouts.%d:", i))
-		}
-
-		// Base values
-		{
-			switch {
-			case userLockoutConfig.Type != "":
-			case len(item.Keys) == 1:
-				userLockoutConfig.Type = strings.ToLower(item.Keys[0].Token.Value().(string))
-			default:
-				return multierror.Prefix(errors.New("auth type for user lockout must be specified, if it applies to all auth methods specify \"all\" "), fmt.Sprintf("user_lockouts.%d:", i))
-			}
-
-			userLockoutConfig.Type = strings.ToLower(userLockoutConfig.Type)
-			// Supported auth methods for user lockout configuration: ldap, approle, userpass
-			// "all" is used to apply the configuration to all supported auth methods
-			switch userLockoutConfig.Type {
-			case "all", "ldap", "approle", "userpass":
-				result.found(userLockoutConfig.Type, userLockoutConfig.Type)
-			default:
-				return multierror.Prefix(fmt.Errorf("unsupported auth type %q", userLockoutConfig.Type), fmt.Sprintf("user_lockouts.%d:", i))
-			}
-		}
-
-		// Lockout Parameters
-
-		// Not setting raw entries to nil here as soon as they are parsed
-		// as they are used to set the missing user lockout configuration values later.
-		{
-			if userLockoutConfig.LockoutThresholdRaw != nil {
-				userLockoutThresholdString := fmt.Sprintf("%v", userLockoutConfig.LockoutThresholdRaw)
-				if userLockoutConfig.LockoutThreshold, err = strconv.ParseUint(userLockoutThresholdString, 10, 64); err != nil {
-					return multierror.Prefix(fmt.Errorf("error parsing lockout_threshold: %w", err), fmt.Sprintf("user_lockouts.%d", i))
-				}
-			}
-
-			if userLockoutConfig.LockoutDurationRaw != nil {
-				if userLockoutConfig.LockoutDuration, err = parseutil.ParseDurationSecond(userLockoutConfig.LockoutDurationRaw); err != nil {
-					return multierror.Prefix(fmt.Errorf("error parsing lockout_duration: %w", err), fmt.Sprintf("user_lockouts.%d", i))
-				}
-				if userLockoutConfig.LockoutDuration < 0 {
-					return multierror.Prefix(errors.New("lockout_duration cannot be negative"), fmt.Sprintf("user_lockouts.%d", i))
-				}
-
-			}
-
-			if userLockoutConfig.LockoutCounterResetRaw != nil {
-				if userLockoutConfig.LockoutCounterReset, err = parseutil.ParseDurationSecond(userLockoutConfig.LockoutCounterResetRaw); err != nil {
-					return multierror.Prefix(fmt.Errorf("error parsing lockout_counter_reset: %w", err), fmt.Sprintf("user_lockouts.%d", i))
-				}
-				if userLockoutConfig.LockoutCounterReset < 0 {
-					return multierror.Prefix(errors.New("lockout_counter_reset cannot be negative"), fmt.Sprintf("user_lockouts.%d", i))
-				}
-
-			}
-			if userLockoutConfig.DisableLockoutRaw != nil {
-				if userLockoutConfig.DisableLockout, err = parseutil.ParseBool(userLockoutConfig.DisableLockoutRaw); err != nil {
-					return multierror.Prefix(fmt.Errorf("invalid value for disable_lockout: %w", err), fmt.Sprintf("user_lockouts.%d", i))
-				}
-			}
-		}
-		userLockoutsMap[userLockoutConfig.Type] = &userLockoutConfig
-	}
-
-	// Use raw entries to set values for user lockout configurations fields
-	// that were not configured using config file.
-	// The raw entries would mean that the entry was configured by the user using the config file.
-	// If any of these fields are not configured using the config file (missing fields),
-	// we set values for these fields with defaults
-	// The issue with not being able to use non-raw entries is because of fields lockout threshold
-	// and disable lockout. We cannot differentiate using non-raw entries if the user configured these fields
-	// with values (0 and false) or if the the user did not configure these values in config file at all.
-	// The raw fields are set to nil after setting missing values in setNilValuesForRawUserLockoutFields function
-	userLockoutsMap = setMissingUserLockoutValuesInMap(userLockoutsMap)
-	for _, userLockoutValues := range userLockoutsMap {
-		result.UserLockouts = append(result.UserLockouts, userLockoutValues)
-	}
-	return nil
-}
-
-// setUserLockoutValueAllInMap sets default user lockout values for key "all" (all auth methods)
-// for user lockout fields that are not configured using config file
-func setUserLockoutValueAllInMap(userLockoutAll *UserLockout) *UserLockout {
-	if userLockoutAll.Type == "" {
-		userLockoutAll.Type = "all"
-	}
-	if userLockoutAll.LockoutThresholdRaw == nil {
-		userLockoutAll.LockoutThreshold = UserLockoutThresholdDefault
-	}
-	if userLockoutAll.LockoutDurationRaw == nil {
-		userLockoutAll.LockoutDuration = UserLockoutDurationDefault
-	}
-	if userLockoutAll.LockoutCounterResetRaw == nil {
-		userLockoutAll.LockoutCounterReset = UserLockoutCounterResetDefault
-	}
-	if userLockoutAll.DisableLockoutRaw == nil {
-		userLockoutAll.DisableLockout = DisableUserLockoutDefault
-	}
-	return setNilValuesForRawUserLockoutFields(userLockoutAll)
-}
-
-// setDefaultUserLockoutValuesInMap sets missing user lockout fields for auth methods
-// with default values (from key "all") that are not configured using config file
-func setMissingUserLockoutValuesInMap(userLockoutsMap map[string]*UserLockout) map[string]*UserLockout {
-	// set values for "all" key with default values for "all" user lockout fields that are not configured
-	// the "all" key values will be used as default values for other auth methods
-	userLockoutAll, ok := userLockoutsMap["all"]
-	switch ok {
-	case true:
-		userLockoutsMap["all"] = setUserLockoutValueAllInMap(userLockoutAll)
-	default:
-		userLockoutsMap["all"] = setUserLockoutValueAllInMap(&UserLockout{})
-	}
-
-	for _, userLockoutAuth := range userLockoutsMap {
-		if userLockoutAuth.Type == "all" {
-			continue
-		}
-		// set missing values
-		if userLockoutAuth.LockoutThresholdRaw == nil {
-			userLockoutAuth.LockoutThreshold = userLockoutsMap["all"].LockoutThreshold
-		}
-		if userLockoutAuth.LockoutDurationRaw == nil {
-			userLockoutAuth.LockoutDuration = userLockoutsMap["all"].LockoutDuration
-		}
-		if userLockoutAuth.LockoutCounterResetRaw == nil {
-			userLockoutAuth.LockoutCounterReset = userLockoutsMap["all"].LockoutCounterReset
-		}
-		if userLockoutAuth.DisableLockoutRaw == nil {
-			userLockoutAuth.DisableLockout = userLockoutsMap["all"].DisableLockout
-		}
-		userLockoutAuth = setNilValuesForRawUserLockoutFields(userLockoutAuth)
-		userLockoutsMap[userLockoutAuth.Type] = userLockoutAuth
-	}
-	return userLockoutsMap
-}
-
-// setNilValuesForRawUserLockoutFields sets nil values for user lockout Raw fields
-func setNilValuesForRawUserLockoutFields(userLockout *UserLockout) *UserLockout {
-	userLockout.LockoutThresholdRaw = nil
-	userLockout.LockoutDurationRaw = nil
-	userLockout.LockoutCounterResetRaw = nil
-	userLockout.DisableLockoutRaw = nil
-	return userLockout
-}
diff --git a/internalshared/configutil/userlockout_test.go b/internalshared/configutil/userlockout_test.go
deleted file mode 100644
index db05441c684d4..0000000000000
--- a/internalshared/configutil/userlockout_test.go
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package configutil
-
-import (
-	"reflect"
-	"testing"
-	"time"
-)
-
-func TestParseUserLockout(t *testing.T) {
-	t.Parallel()
-	t.Run("Missing user lockout block in config file", func(t *testing.T) {
-		t.Parallel()
-		inputConfig := make(map[string]*UserLockout)
-		expectedConfig := make(map[string]*UserLockout)
-		expectedConfigall := &UserLockout{}
-		expectedConfigall.Type = "all"
-		expectedConfigall.LockoutThreshold = UserLockoutThresholdDefault
-		expectedConfigall.LockoutDuration = UserLockoutDurationDefault
-		expectedConfigall.LockoutCounterReset = UserLockoutCounterResetDefault
-		expectedConfigall.DisableLockout = DisableUserLockoutDefault
-		expectedConfig["all"] = expectedConfigall
-
-		outputConfig := setMissingUserLockoutValuesInMap(inputConfig)
-		if !reflect.DeepEqual(expectedConfig["all"], outputConfig["all"]) {
-			t.Errorf("user lockout config: expected %#v\nactual %#v", expectedConfig["all"], outputConfig["all"])
-		}
-	})
-	t.Run("setting default lockout counter reset and lockout duration for userpass in config ", func(t *testing.T) {
-		t.Parallel()
-		// input user lockout in config file
-		inputConfig := make(map[string]*UserLockout)
-		configAll := &UserLockout{}
-		configAll.Type = "all"
-		configAll.LockoutCounterReset = 20 * time.Minute
-		configAll.LockoutCounterResetRaw = "1200000000000"
-		inputConfig["all"] = configAll
-		configUserpass := &UserLockout{}
-		configUserpass.Type = "userpass"
-		configUserpass.LockoutDuration = 10 * time.Minute
-		configUserpass.LockoutDurationRaw = "600000000000"
-		inputConfig["userpass"] = configUserpass
-
-		expectedConfig := make(map[string]*UserLockout)
-		expectedConfigall := &UserLockout{}
-		expectedConfigUserpass := &UserLockout{}
-		// expected default values
-		expectedConfigall.Type = "all"
-		expectedConfigall.LockoutThreshold = UserLockoutThresholdDefault
-		expectedConfigall.LockoutDuration = UserLockoutDurationDefault
-		expectedConfigall.LockoutCounterReset = 20 * time.Minute
-		expectedConfigall.DisableLockout = DisableUserLockoutDefault
-		// expected values for userpass
-		expectedConfigUserpass.Type = "userpass"
-		expectedConfigUserpass.LockoutThreshold = UserLockoutThresholdDefault
-		expectedConfigUserpass.LockoutDuration = 10 * time.Minute
-		expectedConfigUserpass.LockoutCounterReset = 20 * time.Minute
-		expectedConfigUserpass.DisableLockout = DisableUserLockoutDefault
-		expectedConfig["all"] = expectedConfigall
-		expectedConfig["userpass"] = expectedConfigUserpass
-
-		outputConfig := setMissingUserLockoutValuesInMap(inputConfig)
-		if !reflect.DeepEqual(expectedConfig["all"], outputConfig["all"]) {
-			t.Errorf("user lockout config: expected %#v\nactual %#v", expectedConfig["all"], outputConfig["all"])
-		}
-		if !reflect.DeepEqual(expectedConfig["userpass"], outputConfig["userpass"]) {
-			t.Errorf("user lockout config: expected %#v\nactual %#v", expectedConfig["userpass"], outputConfig["userpass"])
-		}
-	})
-}
diff --git a/internalshared/listenerutil/bufconn.go b/internalshared/listenerutil/bufconn.go
index 54af0a783e20d..d3d9d653c576d 100644
--- a/internalshared/listenerutil/bufconn.go
+++ b/internalshared/listenerutil/bufconn.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package listenerutil
 
 import (
diff --git a/internalshared/listenerutil/listener.go b/internalshared/listenerutil/listener.go
index 9a4edb45dcdce..6095713be5d24 100644
--- a/internalshared/listenerutil/listener.go
+++ b/internalshared/listenerutil/listener.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package listenerutil
 
 import (
diff --git a/internalshared/listenerutil/listener_test.go b/internalshared/listenerutil/listener_test.go
index 6219727e19075..3c2afa593aed5 100644
--- a/internalshared/listenerutil/listener_test.go
+++ b/internalshared/listenerutil/listener_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package listenerutil
 
 import (
diff --git a/main.go b/main.go
index 0417bd98773be..bc8a8651f8f9c 100644
--- a/main.go
+++ b/main.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package main // import "github.com/hashicorp/vault"
 
 import (
diff --git a/main_test.go b/main_test.go
index 36398339dfcf2..4c4c79a2cb8e2 100644
--- a/main_test.go
+++ b/main_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package main // import "github.com/hashicorp/vault"
 
 // This file is intentionally empty to force early versions of Go
diff --git a/physical/aerospike/aerospike.go b/physical/aerospike/aerospike.go
index 81aab224ac24e..b323ccd344d40 100644
--- a/physical/aerospike/aerospike.go
+++ b/physical/aerospike/aerospike.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package aerospike
 
 import (
diff --git a/physical/aerospike/aerospike_test.go b/physical/aerospike/aerospike_test.go
index 6324b5e6d28b8..653f00ff6c5c4 100644
--- a/physical/aerospike/aerospike_test.go
+++ b/physical/aerospike/aerospike_test.go
@@ -1,27 +1,18 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package aerospike
 
 import (
 	"context"
-	"math/bits"
-	"runtime"
-	"strings"
 	"testing"
 	"time"
 
 	aero "github.com/aerospike/aerospike-client-go/v5"
 	log "github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/vault/sdk/helper/docker"
+	"github.com/hashicorp/vault/helper/testhelpers/docker"
 	"github.com/hashicorp/vault/sdk/helper/logging"
 	"github.com/hashicorp/vault/sdk/physical"
 )
 
 func TestAerospikeBackend(t *testing.T) {
-	if bits.UintSize == 32 {
-		t.Skip("Aerospike storage is only supported on 64-bit architectures")
-	}
 	cleanup, config := prepareAerospikeContainer(t)
 	defer cleanup()
 
@@ -49,13 +40,8 @@ type aerospikeConfig struct {
 }
 
 func prepareAerospikeContainer(t *testing.T) (func(), *aerospikeConfig) {
-	// Skipping on ARM, as this image can't run on ARM architecture
-	if strings.Contains(runtime.GOARCH, "arm") {
-		t.Skip("Skipping, as this image is not supported on ARM architectures")
-	}
-
 	runner, err := docker.NewServiceRunner(docker.RunOptions{
-		ImageRepo:     "docker.mirror.hashicorp.services/aerospike/aerospike-server",
+		ImageRepo:     "aerospike/aerospike-server",
 		ContainerName: "aerospikedb",
 		ImageTag:      "5.6.0.5",
 		Ports:         []string{"3000/tcp", "3001/tcp", "3002/tcp", "3003/tcp"},
diff --git a/physical/alicloudoss/alicloudoss.go b/physical/alicloudoss/alicloudoss.go
index d32d14b3b00ac..40f3da6d5643c 100644
--- a/physical/alicloudoss/alicloudoss.go
+++ b/physical/alicloudoss/alicloudoss.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package alicloudoss
 
 import (
diff --git a/physical/alicloudoss/alicloudoss_test.go b/physical/alicloudoss/alicloudoss_test.go
index 1b098bd344051..ad292da4f6b7b 100644
--- a/physical/alicloudoss/alicloudoss_test.go
+++ b/physical/alicloudoss/alicloudoss_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package alicloudoss
 
 import (
diff --git a/physical/azure/azure.go b/physical/azure/azure.go
index fe884491dbf5f..eb158a993d8a2 100644
--- a/physical/azure/azure.go
+++ b/physical/azure/azure.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package azure
 
 import (
diff --git a/physical/azure/azure_test.go b/physical/azure/azure_test.go
index a004c83357637..20392a21c688b 100644
--- a/physical/azure/azure_test.go
+++ b/physical/azure/azure_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package azure
 
 import (
diff --git a/physical/cassandra/cassandra.go b/physical/cassandra/cassandra.go
index fc9261a550276..84c2ab149db23 100644
--- a/physical/cassandra/cassandra.go
+++ b/physical/cassandra/cassandra.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package cassandra
 
 import (
diff --git a/physical/cassandra/cassandra_test.go b/physical/cassandra/cassandra_test.go
index 9466d0a708452..e9fe7bc059a5b 100644
--- a/physical/cassandra/cassandra_test.go
+++ b/physical/cassandra/cassandra_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package cassandra
 
 import (
diff --git a/physical/cockroachdb/cockroachdb.go b/physical/cockroachdb/cockroachdb.go
index 38f935cdebd5c..385074d917cbd 100644
--- a/physical/cockroachdb/cockroachdb.go
+++ b/physical/cockroachdb/cockroachdb.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package cockroachdb
 
 import (
diff --git a/physical/cockroachdb/cockroachdb_ha.go b/physical/cockroachdb/cockroachdb_ha.go
index 39b617546a87d..1f22465d0810d 100644
--- a/physical/cockroachdb/cockroachdb_ha.go
+++ b/physical/cockroachdb/cockroachdb_ha.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package cockroachdb
 
 import (
diff --git a/physical/cockroachdb/cockroachdb_test.go b/physical/cockroachdb/cockroachdb_test.go
index ab652554ae380..69a3c565323f3 100644
--- a/physical/cockroachdb/cockroachdb_test.go
+++ b/physical/cockroachdb/cockroachdb_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package cockroachdb
 
 import (
@@ -9,12 +6,10 @@ import (
 	"fmt"
 	"net/url"
 	"os"
-	"runtime"
-	"strings"
 	"testing"
 
 	log "github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/vault/sdk/helper/docker"
+	"github.com/hashicorp/vault/helper/testhelpers/docker"
 	"github.com/hashicorp/vault/sdk/helper/logging"
 	"github.com/hashicorp/vault/sdk/physical"
 )
@@ -28,11 +23,6 @@ type Config struct {
 var _ docker.ServiceConfig = &Config{}
 
 func prepareCockroachDBTestContainer(t *testing.T) (func(), *Config) {
-	// Skipping, as this image can't run on arm architecture
-	if strings.Contains(runtime.GOARCH, "arm") {
-		t.Skip("Skipping, as CockroachDB 1.0 is not supported on ARM architectures")
-	}
-
 	if retURL := os.Getenv("CR_URL"); retURL != "" {
 		s, err := docker.NewServiceURLParse(retURL)
 		if err != nil {
@@ -46,7 +36,7 @@ func prepareCockroachDBTestContainer(t *testing.T) (func(), *Config) {
 	}
 
 	runner, err := docker.NewServiceRunner(docker.RunOptions{
-		ImageRepo:     "docker.mirror.hashicorp.services/cockroachdb/cockroach",
+		ImageRepo:     "cockroachdb/cockroach",
 		ImageTag:      "release-1.0",
 		ContainerName: "cockroachdb",
 		Cmd:           []string{"start", "--insecure"},
diff --git a/physical/cockroachdb/keywords.go b/physical/cockroachdb/keywords.go
index f44089f9f76f7..390dc63f8dfca 100644
--- a/physical/cockroachdb/keywords.go
+++ b/physical/cockroachdb/keywords.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package cockroachdb
 
 // sqlKeywords is a reference of all of the keywords that we do not allow for use as the table name
diff --git a/physical/consul/consul.go b/physical/consul/consul.go
index b17dbc4c16930..f30403468c6bb 100644
--- a/physical/consul/consul.go
+++ b/physical/consul/consul.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package consul
 
 import (
@@ -10,7 +7,6 @@ import (
 	"net/http"
 	"strconv"
 	"strings"
-	"sync/atomic"
 	"time"
 
 	"github.com/armon/go-metrics"
@@ -33,9 +29,6 @@ const (
 	// consistencyModeStrong is the configuration value used to tell
 	// consul to use strong consistency.
 	consistencyModeStrong = "strong"
-
-	// nonExistentKey is used as part of a capabilities check against Consul
-	nonExistentKey = "F35C28E1-7035-40BB-B865-6BED9E3A1B28"
 )
 
 // Verify ConsulBackend satisfies the correct interfaces
@@ -44,14 +37,11 @@ var (
 	_ physical.HABackend     = (*ConsulBackend)(nil)
 	_ physical.Lock          = (*ConsulLock)(nil)
 	_ physical.Transactional = (*ConsulBackend)(nil)
-
-	GetInTxnDisabledError = errors.New("get operations inside transactions are disabled in consul backend")
 )
 
 // ConsulBackend is a physical backend that stores data at specific
 // prefix within Consul. It is used for most production situations as
 // it allows Vault to run on multiple machines in a highly-available manner.
-// failGetInTxn is only used in tests.
 type ConsulBackend struct {
 	client          *api.Client
 	path            string
@@ -61,7 +51,6 @@ type ConsulBackend struct {
 	consistencyMode string
 	sessionTTL      string
 	lockWaitTime    time.Duration
-	failGetInTxn    *uint32
 }
 
 // NewConsulBackend constructs a Consul backend using the given API client
@@ -158,9 +147,9 @@ func NewConsulBackend(conf map[string]string, logger log.Logger) (physical.Backe
 		txn:             client.Txn(),
 		permitPool:      physical.NewPermitPool(maxParInt),
 		consistencyMode: consistencyMode,
-		sessionTTL:      sessionTTL,
-		lockWaitTime:    lockWaitTime,
-		failGetInTxn:    new(uint32),
+
+		sessionTTL:   sessionTTL,
+		lockWaitTime: lockWaitTime,
 	}
 
 	return c, nil
@@ -235,33 +224,6 @@ func SetupSecureTLS(ctx context.Context, consulConf *api.Config, conf map[string
 	return nil
 }
 
-// ExpandedCapabilitiesAvailable tests to see if Consul has KVGetOrEmpty and 128 entries per transaction available
-func (c *ConsulBackend) ExpandedCapabilitiesAvailable(ctx context.Context) bool {
-	available := false
-
-	maxEntries := 128
-	ops := make([]*api.TxnOp, maxEntries)
-	for i := 0; i < maxEntries; i++ {
-		ops[i] = &api.TxnOp{KV: &api.KVTxnOp{
-			Key:  c.path + nonExistentKey,
-			Verb: api.KVGetOrEmpty,
-		}}
-	}
-
-	c.permitPool.Acquire()
-	defer c.permitPool.Release()
-
-	queryOpts := &api.QueryOptions{}
-	queryOpts = queryOpts.WithContext(ctx)
-
-	ok, resp, _, err := c.txn.Txn(ops, queryOpts)
-	if ok && len(resp.Errors) == 0 && err == nil {
-		available = true
-	}
-
-	return available
-}
-
 // Transaction is used to run multiple entries via a transaction.
 func (c *ConsulBackend) Transaction(ctx context.Context, txns []*physical.TxnEntry) error {
 	if len(txns) == 0 {
@@ -269,13 +231,6 @@ func (c *ConsulBackend) Transaction(ctx context.Context, txns []*physical.TxnEnt
 	}
 	defer metrics.MeasureSince([]string{"consul", "transaction"}, time.Now())
 
-	failGetInTxn := atomic.LoadUint32(c.failGetInTxn)
-	for _, t := range txns {
-		if t.Operation == physical.GetOperation && failGetInTxn != 0 {
-			return GetInTxnDisabledError
-		}
-	}
-
 	ops := make([]*api.TxnOp, 0, len(txns))
 	for _, t := range txns {
 		o, err := c.makeApiTxn(t)
@@ -346,7 +301,8 @@ func (c *ConsulBackend) makeApiTxn(txn *physical.TxnEntry) (*api.TxnOp, error) {
 	}
 	switch txn.Operation {
 	case physical.GetOperation:
-		op.Verb = api.KVGetOrEmpty
+		// TODO: This is currently broken. Once Consul releases 1.14, this should be updated to use api.KVGetOrEmpty
+		op.Verb = api.KVGet
 	case physical.DeleteOperation:
 		op.Verb = api.KVDelete
 	case physical.PutOperation:
@@ -453,14 +409,6 @@ func (c *ConsulBackend) List(ctx context.Context, prefix string) ([]string, erro
 	return out, err
 }
 
-func (c *ConsulBackend) FailGetInTxn(fail bool) {
-	var val uint32
-	if fail {
-		val = 1
-	}
-	atomic.StoreUint32(c.failGetInTxn, val)
-}
-
 // LockWith is used for mutual exclusion based on the given key.
 func (c *ConsulBackend) LockWith(key, value string) (physical.Lock, error) {
 	// Create the lock
diff --git a/physical/consul/consul_test.go b/physical/consul/consul_test.go
index b0a16ce85a37f..b2a06e612520b 100644
--- a/physical/consul/consul_test.go
+++ b/physical/consul/consul_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package consul
 
 import (
@@ -254,41 +251,11 @@ func TestConsul_TooLarge(t *testing.T) {
 	}
 }
 
-func TestConsul_ExpandedCapabilitiesAvailable(t *testing.T) {
-	testCases := map[string]bool{
-		"1.13.5": false,
-		"1.14.3": true,
-	}
-
-	for version, shouldBeAvailable := range testCases {
-		t.Run(version, func(t *testing.T) {
-			cleanup, config := consul.PrepareTestContainer(t, version, false, true)
-			defer cleanup()
-
-			logger := logging.NewVaultLogger(log.Debug)
-			backendConfig := map[string]string{
-				"address":      config.Address(),
-				"token":        config.Token,
-				"path":         "vault/",
-				"max_parallel": "-1",
-			}
-
-			be, err := NewConsulBackend(backendConfig, logger)
-			if err != nil {
-				t.Fatal(err)
-			}
-			b := be.(*ConsulBackend)
-
-			isAvailable := b.ExpandedCapabilitiesAvailable(context.Background())
-			if isAvailable != shouldBeAvailable {
-				t.Errorf("%t != %t, version %s\n", isAvailable, shouldBeAvailable, version)
-			}
-		})
-	}
-}
-
 func TestConsul_TransactionalBackend_GetTransactionsForNonExistentValues(t *testing.T) {
-	cleanup, config := consul.PrepareTestContainer(t, "1.14.2", false, true)
+	// TODO: unskip this after Consul releases 1.14 and we update our API dep. It currently fails but should pass with Consul 1.14
+	t.SkipNow()
+
+	cleanup, config := consul.PrepareTestContainer(t, "1.4.4", false, true)
 	defer cleanup()
 
 	client, err := api.NewClient(config.APIConfig())
@@ -349,7 +316,10 @@ func TestConsul_TransactionalBackend_GetTransactionsForNonExistentValues(t *test
 // TestConsul_TransactionalBackend_GetTransactions tests that passing a slice of transactions to the
 // consul backend will populate values for any transactions that are Get operations.
 func TestConsul_TransactionalBackend_GetTransactions(t *testing.T) {
-	cleanup, config := consul.PrepareTestContainer(t, "1.14.2", false, true)
+	// TODO: unskip this after Consul releases 1.14 and we update our API dep. It currently fails but should pass with Consul 1.14
+	t.SkipNow()
+
+	cleanup, config := consul.PrepareTestContainer(t, "1.4.4", false, true)
 	defer cleanup()
 
 	client, err := api.NewClient(config.APIConfig())
diff --git a/physical/consul/helpers.go b/physical/consul/helpers.go
index ce7c47fdcc9d9..71c30b310068e 100644
--- a/physical/consul/helpers.go
+++ b/physical/consul/helpers.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package consul
 
 import (
diff --git a/physical/couchdb/couchdb.go b/physical/couchdb/couchdb.go
index 9c54b0494ae79..86fc139ed92d0 100644
--- a/physical/couchdb/couchdb.go
+++ b/physical/couchdb/couchdb.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package couchdb
 
 import (
diff --git a/physical/couchdb/couchdb_test.go b/physical/couchdb/couchdb_test.go
index d7ae4be27766e..4205f8e64b1ee 100644
--- a/physical/couchdb/couchdb_test.go
+++ b/physical/couchdb/couchdb_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package couchdb
 
 import (
@@ -10,13 +7,12 @@ import (
 	"net/http"
 	"net/url"
 	"os"
-	"runtime"
 	"strings"
 	"testing"
 	"time"
 
 	log "github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/vault/sdk/helper/docker"
+	"github.com/hashicorp/vault/helper/testhelpers/docker"
 	"github.com/hashicorp/vault/sdk/helper/logging"
 	"github.com/hashicorp/vault/sdk/physical"
 )
@@ -79,13 +75,6 @@ func (c couchDB) URL() *url.URL {
 var _ docker.ServiceConfig = &couchDB{}
 
 func prepareCouchdbDBTestContainer(t *testing.T) (func(), *couchDB) {
-	// ARM64 is only supported on CouchDB 2 and above. If we update
-	// our image and support to 2 and above, we can unskip these:
-	// https://hub.docker.com/r/arm64v8/couchdb/
-	if strings.Contains(runtime.GOARCH, "arm") {
-		t.Skip("Skipping, as CouchDB 1.6 is not supported on ARM architectures")
-	}
-
 	// If environment variable is set, assume caller wants to target a real
 	// DynamoDB.
 	if os.Getenv("COUCHDB_ENDPOINT") != "" {
@@ -97,8 +86,7 @@ func prepareCouchdbDBTestContainer(t *testing.T) (func(), *couchDB) {
 	}
 
 	runner, err := docker.NewServiceRunner(docker.RunOptions{
-		ContainerName:   "couchdb",
-		ImageRepo:       "docker.mirror.hashicorp.services/library/couchdb",
+		ImageRepo:       "couchdb",
 		ImageTag:        "1.6",
 		Ports:           []string{"5984/tcp"},
 		DoNotAutoRemove: true,
diff --git a/physical/dynamodb/dynamodb.go b/physical/dynamodb/dynamodb.go
index 591c65cf710a6..18c2bbf50a4d1 100644
--- a/physical/dynamodb/dynamodb.go
+++ b/physical/dynamodb/dynamodb.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package dynamodb
 
 import (
diff --git a/physical/dynamodb/dynamodb_test.go b/physical/dynamodb/dynamodb_test.go
index c4d25b9d7cb61..ae6722e245a46 100644
--- a/physical/dynamodb/dynamodb_test.go
+++ b/physical/dynamodb/dynamodb_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package dynamodb
 
 import (
@@ -10,14 +7,12 @@ import (
 	"net/http"
 	"net/url"
 	"os"
-	"runtime"
-	"strings"
 	"testing"
 	"time"
 
 	"github.com/go-test/deep"
 	log "github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/vault/sdk/helper/docker"
+	"github.com/hashicorp/vault/helper/testhelpers/docker"
 	"github.com/hashicorp/vault/sdk/helper/logging"
 	"github.com/hashicorp/vault/sdk/physical"
 
@@ -375,11 +370,6 @@ type Config struct {
 var _ docker.ServiceConfig = &Config{}
 
 func prepareDynamoDBTestContainer(t *testing.T) (func(), *Config) {
-	// Skipping on ARM, as this image can't run on ARM architecture
-	if strings.Contains(runtime.GOARCH, "arm") {
-		t.Skip("Skipping, as this image is not supported on ARM architectures")
-	}
-
 	// If environment variable is set, assume caller wants to target a real
 	// DynamoDB.
 	if endpoint := os.Getenv("AWS_DYNAMODB_ENDPOINT"); endpoint != "" {
@@ -391,7 +381,7 @@ func prepareDynamoDBTestContainer(t *testing.T) (func(), *Config) {
 	}
 
 	runner, err := docker.NewServiceRunner(docker.RunOptions{
-		ImageRepo:     "docker.mirror.hashicorp.services/cnadiminti/dynamodb-local",
+		ImageRepo:     "cnadiminti/dynamodb-local",
 		ImageTag:      "latest",
 		ContainerName: "dynamodb",
 		Ports:         []string{"8000/tcp"},
diff --git a/physical/etcd/etcd.go b/physical/etcd/etcd.go
index f17a552b54c9a..5bb8d4a31c1b8 100644
--- a/physical/etcd/etcd.go
+++ b/physical/etcd/etcd.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package etcd
 
 import (
diff --git a/physical/etcd/etcd3.go b/physical/etcd/etcd3.go
index 57a838a697431..486d448febf7a 100644
--- a/physical/etcd/etcd3.go
+++ b/physical/etcd/etcd3.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package etcd
 
 import (
diff --git a/physical/etcd/etcd3_test.go b/physical/etcd/etcd3_test.go
index a2de6314dd6f3..71150a698c637 100644
--- a/physical/etcd/etcd3_test.go
+++ b/physical/etcd/etcd3_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package etcd
 
 import (
diff --git a/physical/foundationdb/fdb-go-install.sh b/physical/foundationdb/fdb-go-install.sh
index 4b2c125223144..550d5cf4d14e7 100755
--- a/physical/foundationdb/fdb-go-install.sh
+++ b/physical/foundationdb/fdb-go-install.sh
@@ -1,7 +1,4 @@
 #!/bin/bash -eu
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 #
 # fdb-go-install.sh
 #
diff --git a/physical/foundationdb/foundationdb.go b/physical/foundationdb/foundationdb.go
index 03f984f560392..56305b2fbf7df 100644
--- a/physical/foundationdb/foundationdb.go
+++ b/physical/foundationdb/foundationdb.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build foundationdb
 
 package foundationdb
diff --git a/physical/foundationdb/foundationdb_test.go b/physical/foundationdb/foundationdb_test.go
index ecd6aa8234e7e..c6fe75d5ebfd2 100644
--- a/physical/foundationdb/foundationdb_test.go
+++ b/physical/foundationdb/foundationdb_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build foundationdb
 
 package foundationdb
diff --git a/physical/foundationdb/foundationdbstub.go b/physical/foundationdb/foundationdbstub.go
index 283ca0969f0f5..4fc2734e50b1f 100644
--- a/physical/foundationdb/foundationdbstub.go
+++ b/physical/foundationdb/foundationdbstub.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !foundationdb
 
 package foundationdb
diff --git a/physical/gcs/gcs.go b/physical/gcs/gcs.go
index 4a3f5bdf4961a..f38ffa53d3fa7 100644
--- a/physical/gcs/gcs.go
+++ b/physical/gcs/gcs.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package gcs
 
 import (
@@ -15,12 +12,13 @@ import (
 	"strings"
 	"time"
 
-	"cloud.google.com/go/storage"
 	metrics "github.com/armon/go-metrics"
 	log "github.com/hashicorp/go-hclog"
 	multierror "github.com/hashicorp/go-multierror"
-	"github.com/hashicorp/vault/helper/useragent"
+	"github.com/hashicorp/vault/sdk/helper/useragent"
 	"github.com/hashicorp/vault/sdk/physical"
+
+	"cloud.google.com/go/storage"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 )
diff --git a/physical/gcs/gcs_ha.go b/physical/gcs/gcs_ha.go
index 2e4e762a7469a..3a8e45d981905 100644
--- a/physical/gcs/gcs_ha.go
+++ b/physical/gcs/gcs_ha.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package gcs
 
 import (
diff --git a/physical/gcs/gcs_ha_test.go b/physical/gcs/gcs_ha_test.go
index cdd59e731da9f..8e1b91e777939 100644
--- a/physical/gcs/gcs_ha_test.go
+++ b/physical/gcs/gcs_ha_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package gcs
 
 import (
diff --git a/physical/gcs/gcs_test.go b/physical/gcs/gcs_test.go
index 332ba35d79ba5..4caab730faa72 100644
--- a/physical/gcs/gcs_test.go
+++ b/physical/gcs/gcs_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package gcs
 
 import (
diff --git a/physical/manta/manta.go b/physical/manta/manta.go
index cfb0770144abb..390683d3695fc 100644
--- a/physical/manta/manta.go
+++ b/physical/manta/manta.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package manta
 
 import (
diff --git a/physical/manta/manta_test.go b/physical/manta/manta_test.go
index 67d50fe71b14c..8db52c53ab0e0 100644
--- a/physical/manta/manta_test.go
+++ b/physical/manta/manta_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package manta
 
 import (
diff --git a/physical/mssql/mssql.go b/physical/mssql/mssql.go
index 2859a65ef3243..acce4b2b9fd1e 100644
--- a/physical/mssql/mssql.go
+++ b/physical/mssql/mssql.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package mssql
 
 import (
@@ -21,8 +18,10 @@ import (
 )
 
 // Verify MSSQLBackend satisfies the correct interfaces
-var _ physical.Backend = (*MSSQLBackend)(nil)
-var identifierRegex = regexp.MustCompile(`^[\p{L}_][\p{L}\p{Nd}@#$_]*$`)
+var (
+	_               physical.Backend = (*MSSQLBackend)(nil)
+	identifierRegex                  = regexp.MustCompile(`^[\p{L}_][\p{L}\p{Nd}@#$_]*$`)
+)
 
 type MSSQLBackend struct {
 	dbTable    string
diff --git a/physical/mssql/mssql_test.go b/physical/mssql/mssql_test.go
index 2324ff5c03f28..e026ff6fa2fd5 100644
--- a/physical/mssql/mssql_test.go
+++ b/physical/mssql/mssql_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package mssql
 
 import (
diff --git a/physical/mysql/mysql.go b/physical/mysql/mysql.go
index 225882f7575b1..29bb3928ab814 100644
--- a/physical/mysql/mysql.go
+++ b/physical/mysql/mysql.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package mysql
 
 import (
diff --git a/physical/mysql/mysql_test.go b/physical/mysql/mysql_test.go
index b13c7e4a57c4e..86373e91629e2 100644
--- a/physical/mysql/mysql_test.go
+++ b/physical/mysql/mysql_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package mysql
 
 import (
diff --git a/physical/oci/oci_ha_test.go b/physical/oci/oci_ha_test.go
index b7213b9ceb28e..6dfaba9768c38 100644
--- a/physical/oci/oci_ha_test.go
+++ b/physical/oci/oci_ha_test.go
@@ -16,11 +16,6 @@ func TestOCIHABackend(t *testing.T) {
 	if os.Getenv("VAULT_ACC") == "" {
 		t.SkipNow()
 	}
-
-	if !hasOCICredentials() {
-		t.Skip("Skipping because OCI credentials could not be resolved. See https://pkg.go.dev/github.com/oracle/oci-go-sdk/common#DefaultConfigProvider for information on how to set up OCI credentials.")
-	}
-
 	bucketName, _ := uuid.GenerateUUID()
 	configProvider := common.DefaultConfigProvider()
 	objectStorageClient, _ := objectstorage.NewObjectStorageClientWithConfigurationProvider(configProvider)
diff --git a/physical/oci/oci_test.go b/physical/oci/oci_test.go
index e20b808fdc60e..46edcb8c7247e 100644
--- a/physical/oci/oci_test.go
+++ b/physical/oci/oci_test.go
@@ -19,11 +19,6 @@ func TestOCIBackend(t *testing.T) {
 	if os.Getenv("VAULT_ACC") == "" {
 		t.SkipNow()
 	}
-
-	if !hasOCICredentials() {
-		t.Skip("Skipping because OCI credentials could not be resolved. See https://pkg.go.dev/github.com/oracle/oci-go-sdk/common#DefaultConfigProvider for information on how to set up OCI credentials.")
-	}
-
 	bucketName, _ := uuid.GenerateUUID()
 	configProvider := common.DefaultConfigProvider()
 	objectStorageClient, _ := objectstorage.NewObjectStorageClientWithConfigurationProvider(configProvider)
@@ -92,14 +87,3 @@ func getNamespaceName(objectStorageClient objectstorage.ObjectStorageClient, t *
 	nameSpaceName := *response.Value
 	return nameSpaceName
 }
-
-func hasOCICredentials() bool {
-	configProvider := common.DefaultConfigProvider()
-
-	_, err := configProvider.KeyID()
-	if err != nil {
-		return false
-	}
-
-	return true
-}
diff --git a/physical/postgresql/postgresql.go b/physical/postgresql/postgresql.go
index a70133066750f..ed4c883440cab 100644
--- a/physical/postgresql/postgresql.go
+++ b/physical/postgresql/postgresql.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package postgresql
 
 import (
diff --git a/physical/postgresql/postgresql_test.go b/physical/postgresql/postgresql_test.go
index 5dec40aba5d9d..15d1ab35076d9 100644
--- a/physical/postgresql/postgresql_test.go
+++ b/physical/postgresql/postgresql_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package postgresql
 
 import (
diff --git a/physical/raft/bolt_32bit_test.go b/physical/raft/bolt_32bit_test.go
index 7694d82f5cabe..ccb1641ea299b 100644
--- a/physical/raft/bolt_32bit_test.go
+++ b/physical/raft/bolt_32bit_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build 386 || arm
 
 package raft
diff --git a/physical/raft/bolt_64bit_test.go b/physical/raft/bolt_64bit_test.go
index c4b89b8cdc145..d88c01eed5947 100644
--- a/physical/raft/bolt_64bit_test.go
+++ b/physical/raft/bolt_64bit_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !386 && !arm
 
 package raft
diff --git a/physical/raft/bolt_linux.go b/physical/raft/bolt_linux.go
index b7774c61eaa89..4ea13e2a39860 100644
--- a/physical/raft/bolt_linux.go
+++ b/physical/raft/bolt_linux.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package raft
 
 import (
diff --git a/physical/raft/chunking_test.go b/physical/raft/chunking_test.go
index 64f83e6b8daa0..bdd950b566d27 100644
--- a/physical/raft/chunking_test.go
+++ b/physical/raft/chunking_test.go
@@ -1,19 +1,16 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package raft
 
 import (
 	"bytes"
 	"context"
-	"fmt"
+	fmt "fmt"
 	"os"
 	"testing"
 
-	"github.com/golang/protobuf/proto"
+	proto "github.com/golang/protobuf/proto"
 	"github.com/hashicorp/go-raftchunking"
 	raftchunkingtypes "github.com/hashicorp/go-raftchunking/types"
-	"github.com/hashicorp/go-uuid"
+	uuid "github.com/hashicorp/go-uuid"
 	"github.com/hashicorp/raft"
 	"github.com/hashicorp/raft-boltdb/v2"
 	"github.com/hashicorp/vault/sdk/physical"
@@ -29,7 +26,7 @@ func TestRaft_Chunking_Lifecycle(t *testing.T) {
 	require := require.New(t)
 	assert := assert.New(t)
 
-	b, dir := GetRaft(t, true, false)
+	b, dir := getRaft(t, true, false)
 	defer os.RemoveAll(dir)
 
 	t.Log("applying configuration")
@@ -114,7 +111,7 @@ func TestFSM_Chunking_TermChange(t *testing.T) {
 	require := require.New(t)
 	assert := assert.New(t)
 
-	b, dir := GetRaft(t, true, false)
+	b, dir := getRaft(t, true, false)
 	defer os.RemoveAll(dir)
 
 	t.Log("applying configuration")
@@ -188,7 +185,7 @@ func TestFSM_Chunking_TermChange(t *testing.T) {
 func TestRaft_Chunking_AppliedIndex(t *testing.T) {
 	t.Parallel()
 
-	raft, dir := GetRaft(t, true, false)
+	raft, dir := getRaft(t, true, false)
 	defer os.RemoveAll(dir)
 
 	// Lower the size for tests
diff --git a/physical/raft/fsm.go b/physical/raft/fsm.go
index a8882812665ec..c2d9953ce3f43 100644
--- a/physical/raft/fsm.go
+++ b/physical/raft/fsm.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package raft
 
 import (
diff --git a/physical/raft/fsm_test.go b/physical/raft/fsm_test.go
index ba0e382f09775..e80a6ce5573ff 100644
--- a/physical/raft/fsm_test.go
+++ b/physical/raft/fsm_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package raft
 
 import (
diff --git a/physical/raft/msgpack.go b/physical/raft/msgpack.go
index 88ac74d594984..299dd8e0a98df 100644
--- a/physical/raft/msgpack.go
+++ b/physical/raft/msgpack.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package raft
 
 // If we downgrade msgpack from v1.1.5 to v0.5.5, everything will still
diff --git a/physical/raft/raft.go b/physical/raft/raft.go
index 1060eda7aa6e1..1b052595d80ec 100644
--- a/physical/raft/raft.go
+++ b/physical/raft/raft.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package raft
 
 import (
@@ -15,7 +12,6 @@ import (
 	"path/filepath"
 	"strconv"
 	"sync"
-	"sync/atomic"
 	"time"
 
 	"github.com/armon/go-metrics"
@@ -35,9 +31,9 @@ import (
 	"github.com/hashicorp/vault/sdk/helper/jsonutil"
 	"github.com/hashicorp/vault/sdk/logical"
 	"github.com/hashicorp/vault/sdk/physical"
+	"github.com/hashicorp/vault/sdk/version"
 	"github.com/hashicorp/vault/vault/cluster"
 	"github.com/hashicorp/vault/vault/seal"
-	"github.com/hashicorp/vault/version"
 	bolt "go.etcd.io/bbolt"
 )
 
@@ -68,12 +64,12 @@ var (
 	// This is used to reduce disk I/O for the recently committed entries.
 	raftLogCacheSize = 512
 
-	raftState              = "raft/"
-	peersFileName          = "peers.json"
+	raftState     = "raft/"
+	peersFileName = "peers.json"
+
 	restoreOpDelayDuration = 5 * time.Second
-	defaultMaxEntrySize    = uint64(2 * raftchunking.ChunkSize)
 
-	GetInTxnDisabledError = errors.New("get operations inside transactions are disabled in raft backend")
+	defaultMaxEntrySize = uint64(2 * raftchunking.ChunkSize)
 )
 
 // RaftBackend implements the backend interfaces and uses the raft protocol to
@@ -185,7 +181,6 @@ type RaftBackend struct {
 	nonVoter bool
 
 	effectiveSDKVersion string
-	failGetInTxn        *uint32
 }
 
 // LeaderJoinInfo contains information required by a node to join itself as a
@@ -520,7 +515,6 @@ func NewRaftBackend(conf map[string]string, logger log.Logger) (physical.Backend
 		redundancyZone:             conf["autopilot_redundancy_zone"],
 		nonVoter:                   nonVoter,
 		upgradeVersion:             upgradeVersion,
-		failGetInTxn:               new(uint32),
 	}, nil
 }
 
@@ -572,14 +566,6 @@ func (b *RaftBackend) Close() error {
 	return nil
 }
 
-func (b *RaftBackend) FailGetInTxn(fail bool) {
-	var val uint32
-	if fail {
-		val = 1
-	}
-	atomic.StoreUint32(b.failGetInTxn, val)
-}
-
 func (b *RaftBackend) SetEffectiveSDKVersion(sdkVersion string) {
 	b.l.Lock()
 	b.effectiveSDKVersion = sdkVersion
@@ -1367,7 +1353,7 @@ func (b *RaftBackend) Peers(ctx context.Context) ([]Peer, error) {
 
 // SnapshotHTTP is a wrapper for Snapshot that sends the snapshot as an HTTP
 // response.
-func (b *RaftBackend) SnapshotHTTP(out *logical.HTTPResponseWriter, access seal.Access) error {
+func (b *RaftBackend) SnapshotHTTP(out *logical.HTTPResponseWriter, access *seal.Access) error {
 	out.Header().Add("Content-Disposition", "attachment")
 	out.Header().Add("Content-Type", "application/gzip")
 
@@ -1377,7 +1363,7 @@ func (b *RaftBackend) SnapshotHTTP(out *logical.HTTPResponseWriter, access seal.
 // Snapshot takes a raft snapshot, packages it into a archive file and writes it
 // to the provided writer. Seal access is used to encrypt the SHASUM file so we
 // can validate the snapshot was taken using the same root keys or not.
-func (b *RaftBackend) Snapshot(out io.Writer, access seal.Access) error {
+func (b *RaftBackend) Snapshot(out io.Writer, access *seal.Access) error {
 	b.l.RLock()
 	defer b.l.RUnlock()
 
@@ -1401,7 +1387,7 @@ func (b *RaftBackend) Snapshot(out io.Writer, access seal.Access) error {
 // access is used to decrypt the SHASUM file in the archive to ensure this
 // snapshot has the same root key as the running instance. If the provided
 // access is nil then it will skip that validation.
-func (b *RaftBackend) WriteSnapshotToTemp(in io.ReadCloser, access seal.Access) (*os.File, func(), raft.SnapshotMeta, error) {
+func (b *RaftBackend) WriteSnapshotToTemp(in io.ReadCloser, access *seal.Access) (*os.File, func(), raft.SnapshotMeta, error) {
 	b.l.RLock()
 	defer b.l.RUnlock()
 
@@ -1577,13 +1563,6 @@ func (b *RaftBackend) Transaction(ctx context.Context, txns []*physical.TxnEntry
 		return err
 	}
 
-	failGetInTxn := atomic.LoadUint32(b.failGetInTxn)
-	for _, t := range txns {
-		if t.Operation == physical.GetOperation && failGetInTxn != 0 {
-			return GetInTxnDisabledError
-		}
-	}
-
 	txnMap := make(map[string]*physical.TxnEntry)
 
 	command := &LogData{
@@ -1894,7 +1873,7 @@ func (l *RaftLock) Value() (bool, string, error) {
 // sealer implements the snapshot.Sealer interface and is used in the snapshot
 // process for encrypting/decrypting the SHASUM file in snapshot archives.
 type sealer struct {
-	access seal.Access
+	access *seal.Access
 }
 
 // Seal encrypts the data with using the seal access object.
diff --git a/physical/raft/raft_autopilot.go b/physical/raft/raft_autopilot.go
index ca0ee759e93ac..a67683f2b0dbf 100644
--- a/physical/raft/raft_autopilot.go
+++ b/physical/raft/raft_autopilot.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package raft
 
 import (
@@ -296,7 +293,7 @@ type Delegate struct {
 	emptyVersionLogs map[raft.ServerID]struct{}
 }
 
-func NewDelegate(b *RaftBackend) *Delegate {
+func newDelegate(b *RaftBackend) *Delegate {
 	return &Delegate{
 		RaftBackend:      b,
 		inflightRemovals: make(map[raft.ServerID]bool),
@@ -389,7 +386,6 @@ func (d *Delegate) KnownServers() map[raft.ServerID]*autopilot.Server {
 		return nil
 	}
 
-	apServerStates := d.autopilot.GetState().Servers
 	servers := future.Configuration().Servers
 	serverIDs := make([]string, 0, len(servers))
 	for _, server := range servers {
@@ -433,19 +429,6 @@ func (d *Delegate) KnownServers() map[raft.ServerID]*autopilot.Server {
 			Ext:         d.autopilotServerExt(state),
 		}
 
-		// As KnownServers is a delegate called by autopilot let's check if we already
-		// had this data in the correct format and use it. If we don't (which sounds a
-		// bit sad, unless this ISN'T a voter) then as a fail-safe, let's try what we've
-		// done elsewhere in code to check the desired suffrage and manually set NodeType
-		// based on whether that's a voter or not. If we don't  do either of these
-		// things, NodeType isn't set which means technically it's not a voter.
-		// It shouldn't be a voter and end up in this state.
-		if apServerState, found := apServerStates[raft.ServerID(id)]; found && apServerState.Server.NodeType != "" {
-			server.NodeType = apServerState.Server.NodeType
-		} else if state.DesiredSuffrage == "voter" {
-			server.NodeType = autopilot.NodeVoter
-		}
-
 		switch state.IsDead.Load() {
 		case true:
 			d.logger.Debug("informing autopilot that the node left", "id", id)
@@ -463,7 +446,6 @@ func (d *Delegate) KnownServers() map[raft.ServerID]*autopilot.Server {
 		Name:        d.localID,
 		RaftVersion: raft.ProtocolVersionMax,
 		NodeStatus:  autopilot.NodeAlive,
-		NodeType:    autopilot.NodeVoter, // The leader must be a voter
 		Meta: d.meta(&FollowerState{
 			UpgradeVersion: d.EffectiveVersion(),
 			RedundancyZone: d.RedundancyZone(),
@@ -573,13 +555,6 @@ func (b *RaftBackend) startFollowerHeartbeatTracker() {
 	}
 	for range tickerCh {
 		b.l.RLock()
-		if b.raft == nil {
-			// We could be racing with teardown, which will stop the ticker
-			// but that doesn't guarantee that we won't reach this line with a nil
-			// b.raft.
-			b.l.RUnlock()
-			return
-		}
 		b.followerStates.l.RLock()
 		myAppliedIndex := b.raft.AppliedIndex()
 		for peerID, state := range b.followerStates.followers {
@@ -839,7 +814,7 @@ func (b *RaftBackend) SetupAutopilot(ctx context.Context, storageConfig *Autopil
 	if b.autopilotUpdateInterval != 0 {
 		options = append(options, autopilot.WithUpdateInterval(b.autopilotUpdateInterval))
 	}
-	b.autopilot = autopilot.New(b.raft, NewDelegate(b), options...)
+	b.autopilot = autopilot.New(b.raft, newDelegate(b), options...)
 	b.followerStates = followerStates
 	b.followerHeartbeatTicker = time.NewTicker(1 * time.Second)
 
diff --git a/physical/raft/raft_test.go b/physical/raft/raft_test.go
index 73d0ce32c5434..50171fd68c3df 100644
--- a/physical/raft/raft_test.go
+++ b/physical/raft/raft_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package raft
 
 import (
@@ -30,6 +27,73 @@ import (
 	bolt "go.etcd.io/bbolt"
 )
 
+func getRaft(t testing.TB, bootstrap bool, noStoreState bool) (*RaftBackend, string) {
+	raftDir, err := ioutil.TempDir("", "vault-raft-")
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Logf("raft dir: %s", raftDir)
+
+	return getRaftWithDir(t, bootstrap, noStoreState, raftDir)
+}
+
+func getRaftWithDir(t testing.TB, bootstrap bool, noStoreState bool, raftDir string) (*RaftBackend, string) {
+	id, err := uuid.GenerateUUID()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	logger := hclog.New(&hclog.LoggerOptions{
+		Name:  fmt.Sprintf("raft-%s", id),
+		Level: hclog.Trace,
+	})
+	logger.Info("raft dir", "dir", raftDir)
+
+	conf := map[string]string{
+		"path":          raftDir,
+		"trailing_logs": "100",
+		"node_id":       id,
+	}
+
+	if noStoreState {
+		conf["doNotStoreLatestState"] = ""
+	}
+
+	backendRaw, err := NewRaftBackend(conf, logger)
+	if err != nil {
+		t.Fatal(err)
+	}
+	backend := backendRaw.(*RaftBackend)
+
+	if bootstrap {
+		err = backend.Bootstrap([]Peer{
+			{
+				ID:      backend.NodeID(),
+				Address: backend.NodeID(),
+			},
+		})
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		err = backend.SetupCluster(context.Background(), SetupOpts{})
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		for {
+			if backend.raft.AppliedIndex() >= 2 {
+				break
+			}
+		}
+
+	}
+
+	backend.DisableAutopilot()
+
+	return backend, raftDir
+}
+
 func connectPeers(nodes ...*RaftBackend) {
 	for _, node := range nodes {
 		for _, peer := range nodes {
@@ -156,7 +220,7 @@ func compareDBs(t *testing.T, boltDB1, boltDB2 *bolt.DB, dataOnly bool) error {
 }
 
 func TestRaft_Backend(t *testing.T) {
-	b, dir := GetRaft(t, true, true)
+	b, dir := getRaft(t, true, true)
 	defer os.RemoveAll(dir)
 
 	physical.ExerciseBackend(t, b)
@@ -252,7 +316,7 @@ func TestRaft_ParseNonVoter(t *testing.T) {
 }
 
 func TestRaft_Backend_LargeKey(t *testing.T) {
-	b, dir := GetRaft(t, true, true)
+	b, dir := getRaft(t, true, true)
 	defer os.RemoveAll(dir)
 
 	key, err := base62.Random(bolt.MaxKeySize + 1)
@@ -280,7 +344,7 @@ func TestRaft_Backend_LargeKey(t *testing.T) {
 }
 
 func TestRaft_Backend_LargeValue(t *testing.T) {
-	b, dir := GetRaft(t, true, true)
+	b, dir := getRaft(t, true, true)
 	defer os.RemoveAll(dir)
 
 	value := make([]byte, defaultMaxEntrySize+1)
@@ -308,7 +372,7 @@ func TestRaft_Backend_LargeValue(t *testing.T) {
 // TestRaft_TransactionalBackend_GetTransactions tests that passing a slice of transactions to the
 // raft backend will populate values for any transactions that are Get operations.
 func TestRaft_TransactionalBackend_GetTransactions(t *testing.T) {
-	b, dir := GetRaft(t, true, true)
+	b, dir := getRaft(t, true, true)
 	defer os.RemoveAll(dir)
 
 	ctx := context.Background()
@@ -365,7 +429,7 @@ func TestRaft_TransactionalBackend_GetTransactions(t *testing.T) {
 }
 
 func TestRaft_TransactionalBackend_LargeKey(t *testing.T) {
-	b, dir := GetRaft(t, true, true)
+	b, dir := getRaft(t, true, true)
 	defer os.RemoveAll(dir)
 
 	value := make([]byte, defaultMaxEntrySize+1)
@@ -404,7 +468,7 @@ func TestRaft_TransactionalBackend_LargeKey(t *testing.T) {
 }
 
 func TestRaft_TransactionalBackend_LargeValue(t *testing.T) {
-	b, dir := GetRaft(t, true, true)
+	b, dir := getRaft(t, true, true)
 	defer os.RemoveAll(dir)
 
 	value := make([]byte, defaultMaxEntrySize+1)
@@ -439,14 +503,14 @@ func TestRaft_TransactionalBackend_LargeValue(t *testing.T) {
 }
 
 func TestRaft_Backend_ListPrefix(t *testing.T) {
-	b, dir := GetRaft(t, true, true)
+	b, dir := getRaft(t, true, true)
 	defer os.RemoveAll(dir)
 
 	physical.ExerciseBackend_ListPrefix(t, b)
 }
 
 func TestRaft_TransactionalBackend(t *testing.T) {
-	b, dir := GetRaft(t, true, true)
+	b, dir := getRaft(t, true, true)
 	defer os.RemoveAll(dir)
 
 	physical.ExerciseTransactionalBackend(t, b)
@@ -454,9 +518,9 @@ func TestRaft_TransactionalBackend(t *testing.T) {
 
 func TestRaft_HABackend(t *testing.T) {
 	t.Skip()
-	raft, dir := GetRaft(t, true, true)
+	raft, dir := getRaft(t, true, true)
 	defer os.RemoveAll(dir)
-	raft2, dir2 := GetRaft(t, false, true)
+	raft2, dir2 := getRaft(t, false, true)
 	defer os.RemoveAll(dir2)
 
 	// Add raft2 to the cluster
@@ -466,9 +530,9 @@ func TestRaft_HABackend(t *testing.T) {
 }
 
 func TestRaft_Backend_ThreeNode(t *testing.T) {
-	raft1, dir := GetRaft(t, true, true)
-	raft2, dir2 := GetRaft(t, false, true)
-	raft3, dir3 := GetRaft(t, false, true)
+	raft1, dir := getRaft(t, true, true)
+	raft2, dir2 := getRaft(t, false, true)
+	raft3, dir3 := getRaft(t, false, true)
 	defer os.RemoveAll(dir)
 	defer os.RemoveAll(dir2)
 	defer os.RemoveAll(dir3)
@@ -489,9 +553,9 @@ func TestRaft_Backend_ThreeNode(t *testing.T) {
 
 func TestRaft_GetOfflineConfig(t *testing.T) {
 	// Create 3 raft nodes
-	raft1, dir1 := GetRaft(t, true, true)
-	raft2, dir2 := GetRaft(t, false, true)
-	raft3, dir3 := GetRaft(t, false, true)
+	raft1, dir1 := getRaft(t, true, true)
+	raft2, dir2 := getRaft(t, false, true)
+	raft3, dir3 := getRaft(t, false, true)
 	defer os.RemoveAll(dir1)
 	defer os.RemoveAll(dir2)
 	defer os.RemoveAll(dir3)
@@ -527,10 +591,10 @@ func TestRaft_GetOfflineConfig(t *testing.T) {
 
 func TestRaft_Recovery(t *testing.T) {
 	// Create 4 raft nodes
-	raft1, dir1 := GetRaft(t, true, true)
-	raft2, dir2 := GetRaft(t, false, true)
-	raft3, dir3 := GetRaft(t, false, true)
-	raft4, dir4 := GetRaft(t, false, true)
+	raft1, dir1 := getRaft(t, true, true)
+	raft2, dir2 := getRaft(t, false, true)
+	raft3, dir3 := getRaft(t, false, true)
+	raft4, dir4 := getRaft(t, false, true)
 	defer os.RemoveAll(dir1)
 	defer os.RemoveAll(dir2)
 	defer os.RemoveAll(dir3)
@@ -614,9 +678,9 @@ func TestRaft_Recovery(t *testing.T) {
 }
 
 func TestRaft_TransactionalBackend_ThreeNode(t *testing.T) {
-	raft1, dir := GetRaft(t, true, true)
-	raft2, dir2 := GetRaft(t, false, true)
-	raft3, dir3 := GetRaft(t, false, true)
+	raft1, dir := getRaft(t, true, true)
+	raft2, dir2 := getRaft(t, false, true)
+	raft3, dir3 := getRaft(t, false, true)
 	defer os.RemoveAll(dir)
 	defer os.RemoveAll(dir2)
 	defer os.RemoveAll(dir3)
@@ -636,7 +700,7 @@ func TestRaft_TransactionalBackend_ThreeNode(t *testing.T) {
 }
 
 func TestRaft_Backend_Performance(t *testing.T) {
-	b, dir := GetRaft(t, true, false)
+	b, dir := getRaft(t, true, false)
 	defer os.RemoveAll(dir)
 
 	defaultConfig := raft.DefaultConfig()
@@ -692,9 +756,9 @@ func TestRaft_Backend_Performance(t *testing.T) {
 }
 
 func BenchmarkDB_Puts(b *testing.B) {
-	raft, dir := GetRaft(b, true, false)
+	raft, dir := getRaft(b, true, false)
 	defer os.RemoveAll(dir)
-	raft2, dir2 := GetRaft(b, true, false)
+	raft2, dir2 := getRaft(b, true, false)
 	defer os.RemoveAll(dir2)
 
 	bench := func(b *testing.B, s physical.Backend, dataSize int) {
@@ -724,7 +788,7 @@ func BenchmarkDB_Puts(b *testing.B) {
 }
 
 func BenchmarkDB_Snapshot(b *testing.B) {
-	raft, dir := GetRaft(b, true, false)
+	raft, dir := getRaft(b, true, false)
 	defer os.RemoveAll(dir)
 
 	data, err := uuid.GenerateRandomBytes(256 * 1024)
diff --git a/physical/raft/raft_util.go b/physical/raft/raft_util.go
index bd496dfac64bd..34570fba678f5 100644
--- a/physical/raft/raft_util.go
+++ b/physical/raft/raft_util.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !enterprise
 
 package raft
diff --git a/physical/raft/snapshot.go b/physical/raft/snapshot.go
index 68d9c953f8199..cebcdb0a4a82f 100644
--- a/physical/raft/snapshot.go
+++ b/physical/raft/snapshot.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package raft
 
 import (
diff --git a/physical/raft/snapshot_test.go b/physical/raft/snapshot_test.go
index 3472c8d53981e..53757c5683d77 100644
--- a/physical/raft/snapshot_test.go
+++ b/physical/raft/snapshot_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package raft
 
 import (
@@ -18,7 +15,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/go-hclog"
+	hclog "github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/raft"
 	"github.com/hashicorp/vault/sdk/logical"
 	"github.com/hashicorp/vault/sdk/physical"
@@ -58,7 +55,7 @@ func addPeer(t *testing.T, leader, follower *RaftBackend) {
 }
 
 func TestRaft_Snapshot_Loading(t *testing.T) {
-	raft, dir := GetRaft(t, true, false)
+	raft, dir := getRaft(t, true, false)
 	defer os.RemoveAll(dir)
 
 	// Write some data
@@ -142,7 +139,7 @@ func TestRaft_Snapshot_Loading(t *testing.T) {
 }
 
 func TestRaft_Snapshot_Index(t *testing.T) {
-	raft, dir := GetRaft(t, true, false)
+	raft, dir := getRaft(t, true, false)
 	defer os.RemoveAll(dir)
 
 	err := raft.Put(context.Background(), &physical.Entry{
@@ -229,9 +226,9 @@ func TestRaft_Snapshot_Index(t *testing.T) {
 }
 
 func TestRaft_Snapshot_Peers(t *testing.T) {
-	raft1, dir := GetRaft(t, true, false)
-	raft2, dir2 := GetRaft(t, false, false)
-	raft3, dir3 := GetRaft(t, false, false)
+	raft1, dir := getRaft(t, true, false)
+	raft2, dir2 := getRaft(t, false, false)
+	raft3, dir3 := getRaft(t, false, false)
 	defer os.RemoveAll(dir)
 	defer os.RemoveAll(dir2)
 	defer os.RemoveAll(dir3)
@@ -312,9 +309,9 @@ func ensureCommitApplied(t *testing.T, leaderCommitIdx uint64, backend *RaftBack
 }
 
 func TestRaft_Snapshot_Restart(t *testing.T) {
-	raft1, dir := GetRaft(t, true, false)
+	raft1, dir := getRaft(t, true, false)
 	defer os.RemoveAll(dir)
-	raft2, dir2 := GetRaft(t, false, false)
+	raft2, dir2 := getRaft(t, false, false)
 	defer os.RemoveAll(dir2)
 
 	// Write some data
@@ -376,9 +373,9 @@ func TestRaft_Snapshot_Restart(t *testing.T) {
 
 /*
 func TestRaft_Snapshot_ErrorRecovery(t *testing.T) {
-	raft1, dir := GetRaft(t, true, false)
-	raft2, dir2 := GetRaft(t, false, false)
-	raft3, dir3 := GetRaft(t, false, false)
+	raft1, dir := getRaft(t, true, false)
+	raft2, dir2 := getRaft(t, false, false)
+	raft3, dir3 := getRaft(t, false, false)
 	defer os.RemoveAll(dir)
 	defer os.RemoveAll(dir2)
 	defer os.RemoveAll(dir3)
@@ -458,9 +455,9 @@ func TestRaft_Snapshot_ErrorRecovery(t *testing.T) {
 }*/
 
 func TestRaft_Snapshot_Take_Restore(t *testing.T) {
-	raft1, dir := GetRaft(t, true, false)
+	raft1, dir := getRaft(t, true, false)
 	defer os.RemoveAll(dir)
-	raft2, dir2 := GetRaft(t, false, false)
+	raft2, dir2 := getRaft(t, false, false)
 	defer os.RemoveAll(dir2)
 
 	addPeer(t, raft1, raft2)
diff --git a/physical/raft/streamlayer.go b/physical/raft/streamlayer.go
index 90d8e495cbaf2..ed154f8bcdaf4 100644
--- a/physical/raft/streamlayer.go
+++ b/physical/raft/streamlayer.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package raft
 
 import (
diff --git a/physical/raft/streamlayer_test.go b/physical/raft/streamlayer_test.go
index d826eaadca759..51a26f832266a 100644
--- a/physical/raft/streamlayer_test.go
+++ b/physical/raft/streamlayer_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package raft
 
 import (
diff --git a/physical/raft/testing.go b/physical/raft/testing.go
deleted file mode 100644
index ea6847911f2bb..0000000000000
--- a/physical/raft/testing.go
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package raft
-
-import (
-	"context"
-	"fmt"
-	"io/ioutil"
-	"testing"
-
-	"github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/go-uuid"
-)
-
-func GetRaft(t testing.TB, bootstrap bool, noStoreState bool) (*RaftBackend, string) {
-	raftDir, err := ioutil.TempDir("", "vault-raft-")
-	if err != nil {
-		t.Fatal(err)
-	}
-	t.Logf("raft dir: %s", raftDir)
-
-	return getRaftWithDir(t, bootstrap, noStoreState, raftDir)
-}
-
-func getRaftWithDir(t testing.TB, bootstrap bool, noStoreState bool, raftDir string) (*RaftBackend, string) {
-	id, err := uuid.GenerateUUID()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	logger := hclog.New(&hclog.LoggerOptions{
-		Name:  fmt.Sprintf("raft-%s", id),
-		Level: hclog.Trace,
-	})
-	logger.Info("raft dir", "dir", raftDir)
-
-	conf := map[string]string{
-		"path":          raftDir,
-		"trailing_logs": "100",
-		"node_id":       id,
-	}
-
-	if noStoreState {
-		conf["doNotStoreLatestState"] = ""
-	}
-
-	backendRaw, err := NewRaftBackend(conf, logger)
-	if err != nil {
-		t.Fatal(err)
-	}
-	backend := backendRaw.(*RaftBackend)
-
-	if bootstrap {
-		err = backend.Bootstrap([]Peer{
-			{
-				ID:      backend.NodeID(),
-				Address: backend.NodeID(),
-			},
-		})
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		err = backend.SetupCluster(context.Background(), SetupOpts{})
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		for {
-			if backend.raft.AppliedIndex() >= 2 {
-				break
-			}
-		}
-
-	}
-
-	backend.DisableAutopilot()
-
-	return backend, raftDir
-}
diff --git a/physical/raft/types.pb.go b/physical/raft/types.pb.go
index 2835e1f17d968..6b9e4c4b3659d 100644
--- a/physical/raft/types.pb.go
+++ b/physical/raft/types.pb.go
@@ -1,10 +1,7 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc        v3.21.5
 // source: physical/raft/types.proto
 
 package raft
diff --git a/physical/raft/types.proto b/physical/raft/types.proto
index bb3d136e10ebf..0b1d189ef6e5d 100644
--- a/physical/raft/types.proto
+++ b/physical/raft/types.proto
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 syntax = "proto3";
 
 option go_package = "github.com/hashicorp/vault/physical/raft";
diff --git a/physical/raft/vars_32bit.go b/physical/raft/vars_32bit.go
index 6e5c51fe93529..c9662e796c563 100644
--- a/physical/raft/vars_32bit.go
+++ b/physical/raft/vars_32bit.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build 386 || arm || windows
 
 package raft
diff --git a/physical/raft/vars_64bit.go b/physical/raft/vars_64bit.go
index a1eea0febc08d..40efb4c08910a 100644
--- a/physical/raft/vars_64bit.go
+++ b/physical/raft/vars_64bit.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !386 && !arm && !windows
 
 package raft
diff --git a/physical/s3/s3.go b/physical/s3/s3.go
index 0cb8e0af3552e..e9e1fd33789a9 100644
--- a/physical/s3/s3.go
+++ b/physical/s3/s3.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package s3
 
 import (
diff --git a/physical/s3/s3_test.go b/physical/s3/s3_test.go
index 139e41dfad98f..794f557e0f39f 100644
--- a/physical/s3/s3_test.go
+++ b/physical/s3/s3_test.go
@@ -1,17 +1,12 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package s3
 
 import (
-	"context"
 	"fmt"
 	"math/rand"
 	"os"
 	"testing"
 	"time"
 
-	"github.com/aws/aws-sdk-go-v2/config"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/s3"
@@ -34,10 +29,6 @@ func DoS3BackendTest(t *testing.T, kmsKeyId string) {
 		t.Skip()
 	}
 
-	if !hasAWSCredentials() {
-		t.Skip("Skipping because AWS credentials could not be resolved. See https://docs.aws.amazon.com/sdk-for-go/v1/developer-guide/configuring-sdk.html#specifying-credentials for information on how to set up AWS credentials.")
-	}
-
 	logger := logging.NewVaultLogger(log.Debug)
 
 	credsConfig := &awsutil.CredentialsConfig{Logger: logger}
@@ -118,20 +109,3 @@ func DoS3BackendTest(t *testing.T, kmsKeyId string) {
 	physical.ExerciseBackend(t, b)
 	physical.ExerciseBackend_ListPrefix(t, b)
 }
-
-func hasAWSCredentials() bool {
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-	defer cancel()
-
-	cfg, err := config.LoadDefaultConfig(ctx)
-	if err != nil {
-		return false
-	}
-
-	creds, err := cfg.Credentials.Retrieve(ctx)
-	if err != nil {
-		return false
-	}
-
-	return creds.HasKeys()
-}
diff --git a/physical/spanner/spanner.go b/physical/spanner/spanner.go
index b84e0d4637b4c..09634da53c8dd 100644
--- a/physical/spanner/spanner.go
+++ b/physical/spanner/spanner.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package spanner
 
 import (
@@ -12,16 +9,17 @@ import (
 	"strings"
 	"time"
 
-	"cloud.google.com/go/spanner"
 	metrics "github.com/armon/go-metrics"
 	log "github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/go-secure-stdlib/strutil"
-	"github.com/hashicorp/vault/helper/useragent"
+	"github.com/hashicorp/vault/sdk/helper/useragent"
 	"github.com/hashicorp/vault/sdk/physical"
-	"github.com/pkg/errors"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/grpc/codes"
+
+	"cloud.google.com/go/spanner"
+	"github.com/pkg/errors"
 )
 
 // Verify Backend satisfies the correct interfaces
diff --git a/physical/spanner/spanner_ha.go b/physical/spanner/spanner_ha.go
index d116be0ba34e4..7aa4f8986dbd8 100644
--- a/physical/spanner/spanner_ha.go
+++ b/physical/spanner/spanner_ha.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package spanner
 
 import (
diff --git a/physical/spanner/spanner_ha_test.go b/physical/spanner/spanner_ha_test.go
index dad39ad4c95b4..49a818b393cc5 100644
--- a/physical/spanner/spanner_ha_test.go
+++ b/physical/spanner/spanner_ha_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package spanner
 
 import (
diff --git a/physical/spanner/spanner_test.go b/physical/spanner/spanner_test.go
index 4b7c1c46b1149..d484dd316cb58 100644
--- a/physical/spanner/spanner_test.go
+++ b/physical/spanner/spanner_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package spanner
 
 import (
diff --git a/physical/swift/swift.go b/physical/swift/swift.go
index d616bfe35b320..2155d44c8aba3 100644
--- a/physical/swift/swift.go
+++ b/physical/swift/swift.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package swift
 
 import (
diff --git a/physical/swift/swift_test.go b/physical/swift/swift_test.go
index 8f8af160fefd2..0e569c5a9fae9 100644
--- a/physical/swift/swift_test.go
+++ b/physical/swift/swift_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package swift
 
 import (
diff --git a/physical/zookeeper/zookeeper.go b/physical/zookeeper/zookeeper.go
index e52ac9b630338..26c09fb165c70 100644
--- a/physical/zookeeper/zookeeper.go
+++ b/physical/zookeeper/zookeeper.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package zookeeper
 
 import (
@@ -16,12 +13,13 @@ import (
 	"sync"
 	"time"
 
-	metrics "github.com/armon/go-metrics"
-	"github.com/go-zookeeper/zk"
 	log "github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/go-secure-stdlib/parseutil"
-	"github.com/hashicorp/go-secure-stdlib/tlsutil"
 	"github.com/hashicorp/vault/sdk/physical"
+
+	metrics "github.com/armon/go-metrics"
+	"github.com/hashicorp/go-secure-stdlib/tlsutil"
+	"github.com/samuel/go-zookeeper/zk"
 )
 
 const (
@@ -644,9 +642,8 @@ func (i *ZooKeeperHALock) Unlock() error {
 					return
 				}
 
-				timer := time.NewTimer(time.Second)
 				select {
-				case <-timer.C:
+				case <-time.After(time.Second):
 					attempts := attempts + 1
 					if attempts >= 10 {
 						i.logger.Error("release lock max attempts reached. Lock may not be released", "error", err)
@@ -654,7 +651,6 @@ func (i *ZooKeeperHALock) Unlock() error {
 					}
 					continue
 				case <-i.stopCh:
-					timer.Stop()
 					return
 				}
 			}
diff --git a/physical/zookeeper/zookeeper_test.go b/physical/zookeeper/zookeeper_test.go
index e4448bf73ab7c..baaa41fdbf53c 100644
--- a/physical/zookeeper/zookeeper_test.go
+++ b/physical/zookeeper/zookeeper_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package zookeeper
 
 import (
@@ -9,10 +6,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/go-zookeeper/zk"
 	log "github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/vault/sdk/helper/logging"
 	"github.com/hashicorp/vault/sdk/physical"
+
+	"github.com/samuel/go-zookeeper/zk"
 )
 
 func TestZooKeeperBackend(t *testing.T) {
diff --git a/plugins/database/cassandra/cassandra-database-plugin/main.go b/plugins/database/cassandra/cassandra-database-plugin/main.go
index 8a91d1b50c7f3..4ee0903642e08 100644
--- a/plugins/database/cassandra/cassandra-database-plugin/main.go
+++ b/plugins/database/cassandra/cassandra-database-plugin/main.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package main
 
 import (
diff --git a/plugins/database/cassandra/cassandra.go b/plugins/database/cassandra/cassandra.go
index 8118fa06171bd..de549261fd60f 100644
--- a/plugins/database/cassandra/cassandra.go
+++ b/plugins/database/cassandra/cassandra.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package cassandra
 
 import (
diff --git a/plugins/database/cassandra/cassandra_test.go b/plugins/database/cassandra/cassandra_test.go
index 7a3260935b7c4..ec8b42290d30b 100644
--- a/plugins/database/cassandra/cassandra_test.go
+++ b/plugins/database/cassandra/cassandra_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package cassandra
 
 import (
diff --git a/plugins/database/cassandra/connection_producer.go b/plugins/database/cassandra/connection_producer.go
index a63ed27d5eb3f..72f7bb878e162 100644
--- a/plugins/database/cassandra/connection_producer.go
+++ b/plugins/database/cassandra/connection_producer.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package cassandra
 
 import (
diff --git a/plugins/database/cassandra/connection_producer_test.go b/plugins/database/cassandra/connection_producer_test.go
index e2f4ba0fc59f6..3f99c1d65a009 100644
--- a/plugins/database/cassandra/connection_producer_test.go
+++ b/plugins/database/cassandra/connection_producer_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package cassandra
 
 import (
diff --git a/plugins/database/cassandra/test-fixtures/no_tls/cassandra.yaml b/plugins/database/cassandra/test-fixtures/no_tls/cassandra.yaml
index 481996968866b..71fdead51f238 100644
--- a/plugins/database/cassandra/test-fixtures/no_tls/cassandra.yaml
+++ b/plugins/database/cassandra/test-fixtures/no_tls/cassandra.yaml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 # Cassandra storage config YAML
 
 # NOTE:
diff --git a/plugins/database/cassandra/tls.go b/plugins/database/cassandra/tls.go
index 17e148d7496d5..cc64d3c3b5f48 100644
--- a/plugins/database/cassandra/tls.go
+++ b/plugins/database/cassandra/tls.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package cassandra
 
 import (
diff --git a/plugins/database/hana/hana-database-plugin/main.go b/plugins/database/hana/hana-database-plugin/main.go
index 9ec568b66db40..2057c36c08d40 100644
--- a/plugins/database/hana/hana-database-plugin/main.go
+++ b/plugins/database/hana/hana-database-plugin/main.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package main
 
 import (
diff --git a/plugins/database/hana/hana.go b/plugins/database/hana/hana.go
index 987cc1af2f812..bca437c369a69 100644
--- a/plugins/database/hana/hana.go
+++ b/plugins/database/hana/hana.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package hana
 
 import (
diff --git a/plugins/database/hana/hana_test.go b/plugins/database/hana/hana_test.go
index 6a3c1dbe07d4b..67c1088834897 100644
--- a/plugins/database/hana/hana_test.go
+++ b/plugins/database/hana/hana_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package hana
 
 import (
diff --git a/plugins/database/influxdb/connection_producer.go b/plugins/database/influxdb/connection_producer.go
index b9f18c5433863..a9a6964ea2101 100644
--- a/plugins/database/influxdb/connection_producer.go
+++ b/plugins/database/influxdb/connection_producer.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package influxdb
 
 import (
diff --git a/plugins/database/influxdb/influxdb-database-plugin/main.go b/plugins/database/influxdb/influxdb-database-plugin/main.go
index bfc94f75fd31f..c8f6c5fa1e3fd 100644
--- a/plugins/database/influxdb/influxdb-database-plugin/main.go
+++ b/plugins/database/influxdb/influxdb-database-plugin/main.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package main
 
 import (
diff --git a/plugins/database/influxdb/influxdb.go b/plugins/database/influxdb/influxdb.go
index f216319a6c13c..4a8225e52b3be 100644
--- a/plugins/database/influxdb/influxdb.go
+++ b/plugins/database/influxdb/influxdb.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package influxdb
 
 import (
diff --git a/plugins/database/influxdb/influxdb_test.go b/plugins/database/influxdb/influxdb_test.go
index 1fc858bfc5c85..4ecdac51bcbd4 100644
--- a/plugins/database/influxdb/influxdb_test.go
+++ b/plugins/database/influxdb/influxdb_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package influxdb
 
 import (
@@ -9,15 +6,14 @@ import (
 	"net/url"
 	"os"
 	"reflect"
-	"runtime"
 	"strconv"
 	"strings"
 	"testing"
 	"time"
 
-	"github.com/hashicorp/vault/sdk/database/dbplugin/v5"
+	"github.com/hashicorp/vault/helper/testhelpers/docker"
+	dbplugin "github.com/hashicorp/vault/sdk/database/dbplugin/v5"
 	dbtesting "github.com/hashicorp/vault/sdk/database/dbplugin/v5/testing"
-	"github.com/hashicorp/vault/sdk/helper/docker"
 	influx "github.com/influxdata/influxdb1-client/v2"
 	"github.com/stretchr/testify/require"
 )
@@ -52,11 +48,6 @@ func (c *Config) connectionParams() map[string]interface{} {
 }
 
 func prepareInfluxdbTestContainer(t *testing.T) (func(), *Config) {
-	// Skipping on ARM, as this image can't run on ARM architecture
-	if strings.Contains(runtime.GOARCH, "arm") {
-		t.Skip("Skipping, as this image is not supported on ARM architectures")
-	}
-
 	c := &Config{
 		Username: "influx-root",
 		Password: "influx-root",
@@ -67,9 +58,8 @@ func prepareInfluxdbTestContainer(t *testing.T) (func(), *Config) {
 	}
 
 	runner, err := docker.NewServiceRunner(docker.RunOptions{
-		ImageRepo:     "docker.mirror.hashicorp.services/influxdb",
-		ContainerName: "influxdb",
-		ImageTag:      "1.8-alpine",
+		ImageRepo: "influxdb",
+		ImageTag:  "1.8-alpine",
 		Env: []string{
 			"INFLUXDB_DB=vault",
 			"INFLUXDB_ADMIN_USER=" + c.Username,
diff --git a/plugins/database/mongodb/cert_helpers_test.go b/plugins/database/mongodb/cert_helpers_test.go
index 9f9388b1cf2b4..deb04ab9c4e42 100644
--- a/plugins/database/mongodb/cert_helpers_test.go
+++ b/plugins/database/mongodb/cert_helpers_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package mongodb
 
 import (
diff --git a/plugins/database/mongodb/connection_producer.go b/plugins/database/mongodb/connection_producer.go
index 4686c3b13f119..348fb6bd4d435 100644
--- a/plugins/database/mongodb/connection_producer.go
+++ b/plugins/database/mongodb/connection_producer.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package mongodb
 
 import (
diff --git a/plugins/database/mongodb/connection_producer_test.go b/plugins/database/mongodb/connection_producer_test.go
index 2ce3872c597f3..4b0ccaf2514a7 100644
--- a/plugins/database/mongodb/connection_producer_test.go
+++ b/plugins/database/mongodb/connection_producer_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package mongodb
 
 import (
@@ -17,11 +14,13 @@ import (
 	"time"
 
 	"github.com/hashicorp/vault/helper/testhelpers/certhelpers"
+	"github.com/hashicorp/vault/helper/testhelpers/mongodb"
 	dbplugin "github.com/hashicorp/vault/sdk/database/dbplugin/v5"
 	"github.com/ory/dockertest"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
 	"go.mongodb.org/mongo-driver/mongo/readpref"
+	"gopkg.in/mgo.v2"
 )
 
 func TestInit_clientTLS(t *testing.T) {
@@ -216,12 +215,19 @@ func startMongoWithTLS(t *testing.T, version string, confDir string) (retURL str
 	// exponential backoff-retry
 	err = pool.Retry(func() error {
 		var err error
-		ctx, _ := context.WithTimeout(context.Background(), 1*time.Minute)
-		client, err := mongo.Connect(ctx, options.Client().ApplyURI(retURL))
-		if err = client.Disconnect(ctx); err != nil {
-			t.Fatal()
+		dialInfo, err := mongodb.ParseMongoURL(retURL)
+		if err != nil {
+			return err
+		}
+
+		session, err := mgo.DialWithInfo(dialInfo)
+		if err != nil {
+			return err
 		}
-		return client.Ping(ctx, readpref.Primary())
+		defer session.Close()
+		session.SetSyncTimeout(1 * time.Minute)
+		session.SetSocketTimeout(1 * time.Minute)
+		return session.Ping()
 	})
 	if err != nil {
 		cleanup()
diff --git a/plugins/database/mongodb/mongodb-database-plugin/main.go b/plugins/database/mongodb/mongodb-database-plugin/main.go
index fe68659eca633..30dd5fdd7cff7 100644
--- a/plugins/database/mongodb/mongodb-database-plugin/main.go
+++ b/plugins/database/mongodb/mongodb-database-plugin/main.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package main
 
 import (
diff --git a/plugins/database/mongodb/mongodb.go b/plugins/database/mongodb/mongodb.go
index 4026fbc693da4..6cb511b89f8e4 100644
--- a/plugins/database/mongodb/mongodb.go
+++ b/plugins/database/mongodb/mongodb.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package mongodb
 
 import (
diff --git a/plugins/database/mongodb/mongodb_test.go b/plugins/database/mongodb/mongodb_test.go
index 4f36e36179ec4..d647a264f184a 100644
--- a/plugins/database/mongodb/mongodb_test.go
+++ b/plugins/database/mongodb/mongodb_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package mongodb
 
 import (
@@ -8,7 +5,6 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"fmt"
-	"net/http"
 	"reflect"
 	"strings"
 	"sync"
@@ -17,6 +13,7 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
+
 	"github.com/hashicorp/vault/helper/testhelpers/certhelpers"
 	"github.com/hashicorp/vault/helper/testhelpers/mongodb"
 	dbplugin "github.com/hashicorp/vault/sdk/database/dbplugin/v5"
@@ -30,7 +27,7 @@ import (
 const mongoAdminRole = `{ "db": "admin", "roles": [ { "role": "readWrite" } ] }`
 
 func TestMongoDB_Initialize(t *testing.T) {
-	cleanup, connURL := mongodb.PrepareTestContainer(t, "latest")
+	cleanup, connURL := mongodb.PrepareTestContainer(t, "5.0.10")
 	defer cleanup()
 
 	db := new()
@@ -123,7 +120,7 @@ func TestNewUser_usernameTemplate(t *testing.T) {
 
 	for name, test := range tests {
 		t.Run(name, func(t *testing.T) {
-			cleanup, connURL := mongodb.PrepareTestContainer(t, "latest")
+			cleanup, connURL := mongodb.PrepareTestContainer(t, "5.0.10")
 			defer cleanup()
 
 			db := new()
@@ -149,7 +146,7 @@ func TestNewUser_usernameTemplate(t *testing.T) {
 }
 
 func TestMongoDB_CreateUser(t *testing.T) {
-	cleanup, connURL := mongodb.PrepareTestContainer(t, "latest")
+	cleanup, connURL := mongodb.PrepareTestContainer(t, "5.0.10")
 	defer cleanup()
 
 	db := new()
@@ -181,7 +178,7 @@ func TestMongoDB_CreateUser(t *testing.T) {
 }
 
 func TestMongoDB_CreateUser_writeConcern(t *testing.T) {
-	cleanup, connURL := mongodb.PrepareTestContainer(t, "latest")
+	cleanup, connURL := mongodb.PrepareTestContainer(t, "5.0.10")
 	defer cleanup()
 
 	initReq := dbplugin.InitializeRequest{
@@ -215,7 +212,7 @@ func TestMongoDB_CreateUser_writeConcern(t *testing.T) {
 }
 
 func TestMongoDB_DeleteUser(t *testing.T) {
-	cleanup, connURL := mongodb.PrepareTestContainer(t, "latest")
+	cleanup, connURL := mongodb.PrepareTestContainer(t, "5.0.10")
 	defer cleanup()
 
 	db := new()
@@ -255,7 +252,7 @@ func TestMongoDB_DeleteUser(t *testing.T) {
 }
 
 func TestMongoDB_UpdateUser_Password(t *testing.T) {
-	cleanup, connURL := mongodb.PrepareTestContainer(t, "latest")
+	cleanup, connURL := mongodb.PrepareTestContainer(t, "5.0.10")
 	defer cleanup()
 
 	// The docker test method PrepareTestContainer defaults to a database "test"
@@ -386,8 +383,6 @@ func appendToCertPool(t *testing.T, pool *x509.CertPool, caPem []byte) *x509.Cer
 }
 
 var cmpClientOptionsOpts = cmp.Options{
-	cmpopts.IgnoreTypes(http.Transport{}),
-
 	cmp.AllowUnexported(options.ClientOptions{}),
 
 	cmp.AllowUnexported(tls.Config{}),
diff --git a/plugins/database/mongodb/util.go b/plugins/database/mongodb/util.go
index be5842136bb63..a12828f503b8c 100644
--- a/plugins/database/mongodb/util.go
+++ b/plugins/database/mongodb/util.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package mongodb
 
 import "go.mongodb.org/mongo-driver/mongo/writeconcern"
diff --git a/plugins/database/mssql/mssql-database-plugin/main.go b/plugins/database/mssql/mssql-database-plugin/main.go
index 2a57b5746ec61..37a81a660012f 100644
--- a/plugins/database/mssql/mssql-database-plugin/main.go
+++ b/plugins/database/mssql/mssql-database-plugin/main.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package main
 
 import (
diff --git a/plugins/database/mssql/mssql.go b/plugins/database/mssql/mssql.go
index 7c7a4c27b3b7c..7915732b4d00a 100644
--- a/plugins/database/mssql/mssql.go
+++ b/plugins/database/mssql/mssql.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package mssql
 
 import (
diff --git a/plugins/database/mssql/mssql_test.go b/plugins/database/mssql/mssql_test.go
index 385c5f0b69ff0..2292490d88a7a 100644
--- a/plugins/database/mssql/mssql_test.go
+++ b/plugins/database/mssql/mssql_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package mssql
 
 import (
diff --git a/plugins/database/mysql/connection_producer.go b/plugins/database/mysql/connection_producer.go
index 5c59792131660..208debe519de5 100644
--- a/plugins/database/mysql/connection_producer.go
+++ b/plugins/database/mysql/connection_producer.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package mysql
 
 import (
diff --git a/plugins/database/mysql/connection_producer_test.go b/plugins/database/mysql/connection_producer_test.go
index a3f0bc7ef56e0..eacf18fabe8c8 100644
--- a/plugins/database/mysql/connection_producer_test.go
+++ b/plugins/database/mysql/connection_producer_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package mysql
 
 import (
diff --git a/plugins/database/mysql/mysql-database-plugin/main.go b/plugins/database/mysql/mysql-database-plugin/main.go
index 56640b2f7b13f..6b1505aff194c 100644
--- a/plugins/database/mysql/mysql-database-plugin/main.go
+++ b/plugins/database/mysql/mysql-database-plugin/main.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package main
 
 import (
diff --git a/plugins/database/mysql/mysql-legacy-database-plugin/main.go b/plugins/database/mysql/mysql-legacy-database-plugin/main.go
index 8aeba0b36bdc4..ea6b9839a77e3 100644
--- a/plugins/database/mysql/mysql-legacy-database-plugin/main.go
+++ b/plugins/database/mysql/mysql-legacy-database-plugin/main.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package main
 
 import (
diff --git a/plugins/database/mysql/mysql.go b/plugins/database/mysql/mysql.go
index 0260ec20d2164..db47c71dd3108 100644
--- a/plugins/database/mysql/mysql.go
+++ b/plugins/database/mysql/mysql.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package mysql
 
 import (
diff --git a/plugins/database/mysql/mysql_test.go b/plugins/database/mysql/mysql_test.go
index 07e0165ffe490..3c7eab5af3576 100644
--- a/plugins/database/mysql/mysql_test.go
+++ b/plugins/database/mysql/mysql_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package mysql
 
 import (
diff --git a/plugins/database/postgresql/passwordauthentication.go b/plugins/database/postgresql/passwordauthentication.go
deleted file mode 100644
index ec94bafba1180..0000000000000
--- a/plugins/database/postgresql/passwordauthentication.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package postgresql
-
-import "fmt"
-
-// passwordAuthentication determines whether to send passwords in plaintext (password) or hashed (scram-sha-256).
-type passwordAuthentication string
-
-var (
-	// passwordAuthenticationPassword is the default. If set, passwords will be sent to PostgreSQL in plain text.
-	passwordAuthenticationPassword    passwordAuthentication = "password"
-	passwordAuthenticationSCRAMSHA256 passwordAuthentication = "scram-sha-256"
-)
-
-var passwordAuthentications = map[passwordAuthentication]struct{}{
-	passwordAuthenticationSCRAMSHA256: {},
-	passwordAuthenticationPassword:    {},
-}
-
-func parsePasswordAuthentication(s string) (passwordAuthentication, error) {
-	if _, ok := passwordAuthentications[passwordAuthentication(s)]; !ok {
-		return "", fmt.Errorf("'%s' is not a valid password authentication type", s)
-	}
-
-	return passwordAuthentication(s), nil
-}
diff --git a/plugins/database/postgresql/postgresql-database-plugin/main.go b/plugins/database/postgresql/postgresql-database-plugin/main.go
index f543167d4a3be..75b5fd9babb2a 100644
--- a/plugins/database/postgresql/postgresql-database-plugin/main.go
+++ b/plugins/database/postgresql/postgresql-database-plugin/main.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package main
 
 import (
diff --git a/plugins/database/postgresql/postgresql.go b/plugins/database/postgresql/postgresql.go
index 66c44cc34a08c..c76558350586d 100644
--- a/plugins/database/postgresql/postgresql.go
+++ b/plugins/database/postgresql/postgresql.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package postgresql
 
 import (
@@ -12,7 +9,6 @@ import (
 
 	"github.com/hashicorp/go-multierror"
 	"github.com/hashicorp/go-secure-stdlib/strutil"
-	"github.com/hashicorp/vault/plugins/database/postgresql/scram"
 	"github.com/hashicorp/vault/sdk/database/dbplugin/v5"
 	"github.com/hashicorp/vault/sdk/database/helper/connutil"
 	"github.com/hashicorp/vault/sdk/database/helper/dbutil"
@@ -69,8 +65,7 @@ func new() *PostgreSQL {
 	connProducer.Type = postgreSQLTypeName
 
 	db := &PostgreSQL{
-		SQLConnectionProducer:  connProducer,
-		passwordAuthentication: passwordAuthenticationPassword,
+		SQLConnectionProducer: connProducer,
 	}
 
 	return db
@@ -79,8 +74,7 @@ func new() *PostgreSQL {
 type PostgreSQL struct {
 	*connutil.SQLConnectionProducer
 
-	usernameProducer       template.StringTemplate
-	passwordAuthentication passwordAuthentication
+	usernameProducer template.StringTemplate
 }
 
 func (p *PostgreSQL) Initialize(ctx context.Context, req dbplugin.InitializeRequest) (dbplugin.InitializeResponse, error) {
@@ -108,20 +102,6 @@ func (p *PostgreSQL) Initialize(ctx context.Context, req dbplugin.InitializeRequ
 		return dbplugin.InitializeResponse{}, fmt.Errorf("invalid username template: %w", err)
 	}
 
-	passwordAuthenticationRaw, err := strutil.GetString(req.Config, "password_authentication")
-	if err != nil {
-		return dbplugin.InitializeResponse{}, fmt.Errorf("failed to retrieve password_authentication: %w", err)
-	}
-
-	if passwordAuthenticationRaw != "" {
-		pwAuthentication, err := parsePasswordAuthentication(passwordAuthenticationRaw)
-		if err != nil {
-			return dbplugin.InitializeResponse{}, err
-		}
-
-		p.passwordAuthentication = pwAuthentication
-	}
-
 	resp := dbplugin.InitializeResponse{
 		Config: newConf,
 	}
@@ -205,15 +185,6 @@ func (p *PostgreSQL) changeUserPassword(ctx context.Context, username string, ch
 				"username": username,
 				"password": password,
 			}
-
-			if p.passwordAuthentication == passwordAuthenticationSCRAMSHA256 {
-				hashedPassword, err := scram.Hash(password)
-				if err != nil {
-					return fmt.Errorf("unable to scram-sha256 password: %w", err)
-				}
-				m["password"] = hashedPassword
-			}
-
 			if err := dbtxn.ExecuteTxQueryDirect(ctx, tx, m, query); err != nil {
 				return fmt.Errorf("failed to execute query: %w", err)
 			}
@@ -298,24 +269,15 @@ func (p *PostgreSQL) NewUser(ctx context.Context, req dbplugin.NewUserRequest) (
 	}
 	defer tx.Rollback()
 
-	m := map[string]string{
-		"name":       username,
-		"username":   username,
-		"password":   req.Password,
-		"expiration": expirationStr,
-	}
-
-	if p.passwordAuthentication == passwordAuthenticationSCRAMSHA256 {
-		hashedPassword, err := scram.Hash(req.Password)
-		if err != nil {
-			return dbplugin.NewUserResponse{}, fmt.Errorf("unable to scram-sha256 password: %w", err)
-		}
-		m["password"] = hashedPassword
-	}
-
 	for _, stmt := range req.Statements.Commands {
 		if containsMultilineStatement(stmt) {
 			// Execute it as-is.
+			m := map[string]string{
+				"name":       username,
+				"username":   username,
+				"password":   req.Password,
+				"expiration": expirationStr,
+			}
 			if err := dbtxn.ExecuteTxQueryDirect(ctx, tx, m, stmt); err != nil {
 				return dbplugin.NewUserResponse{}, fmt.Errorf("failed to execute query: %w", err)
 			}
@@ -328,6 +290,12 @@ func (p *PostgreSQL) NewUser(ctx context.Context, req dbplugin.NewUserRequest) (
 				continue
 			}
 
+			m := map[string]string{
+				"name":       username,
+				"username":   username,
+				"password":   req.Password,
+				"expiration": expirationStr,
+			}
 			if err := dbtxn.ExecuteTxQueryDirect(ctx, tx, m, query); err != nil {
 				return dbplugin.NewUserResponse{}, fmt.Errorf("failed to execute query: %w", err)
 			}
@@ -370,17 +338,6 @@ func (p *PostgreSQL) customDeleteUser(ctx context.Context, username string, revo
 	}()
 
 	for _, stmt := range revocationStmts {
-		if containsMultilineStatement(stmt) {
-			// Execute it as-is.
-			m := map[string]string{
-				"name":     username,
-				"username": username,
-			}
-			if err := dbtxn.ExecuteTxQueryDirect(ctx, tx, m, stmt); err != nil {
-				return err
-			}
-			continue
-		}
 		for _, query := range strutil.ParseArbitraryStringSlice(stmt, ";") {
 			query = strings.TrimSpace(query)
 			if len(query) == 0 {
diff --git a/plugins/database/postgresql/postgresql_test.go b/plugins/database/postgresql/postgresql_test.go
index 5e89ee912c18c..3bb1bd594de97 100644
--- a/plugins/database/postgresql/postgresql_test.go
+++ b/plugins/database/postgresql/postgresql_test.go
@@ -1,24 +1,19 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package postgresql
 
 import (
 	"context"
 	"database/sql"
 	"fmt"
-	"os"
 	"strings"
 	"testing"
 	"time"
 
+	"github.com/hashicorp/vault/sdk/database/helper/dbutil"
+
 	"github.com/hashicorp/vault/helper/testhelpers/postgresql"
 	"github.com/hashicorp/vault/sdk/database/dbplugin/v5"
 	dbtesting "github.com/hashicorp/vault/sdk/database/dbplugin/v5/testing"
-	"github.com/hashicorp/vault/sdk/database/helper/dbutil"
-	"github.com/hashicorp/vault/sdk/helper/docker"
 	"github.com/hashicorp/vault/sdk/helper/template"
-	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
@@ -94,97 +89,6 @@ func TestPostgreSQL_Initialize_ConnURLWithDSNFormat(t *testing.T) {
 	}
 }
 
-// TestPostgreSQL_PasswordAuthentication tests that the default "password_authentication" is "none", and that
-// an error is returned if an invalid "password_authentication" is provided.
-func TestPostgreSQL_PasswordAuthentication(t *testing.T) {
-	cleanup, connURL := postgresql.PrepareTestContainer(t, "13.4-buster")
-	defer cleanup()
-
-	dsnConnURL, err := dbutil.ParseURL(connURL)
-	assert.NoError(t, err)
-	db := new()
-
-	ctx := context.Background()
-
-	t.Run("invalid-password-authentication", func(t *testing.T) {
-		connectionDetails := map[string]interface{}{
-			"connection_url":          dsnConnURL,
-			"password_authentication": "invalid-password-authentication",
-		}
-
-		req := dbplugin.InitializeRequest{
-			Config:           connectionDetails,
-			VerifyConnection: true,
-		}
-
-		_, err := db.Initialize(ctx, req)
-		assert.EqualError(t, err, "'invalid-password-authentication' is not a valid password authentication type")
-	})
-
-	t.Run("default-is-none", func(t *testing.T) {
-		connectionDetails := map[string]interface{}{
-			"connection_url": dsnConnURL,
-		}
-
-		req := dbplugin.InitializeRequest{
-			Config:           connectionDetails,
-			VerifyConnection: true,
-		}
-
-		_ = dbtesting.AssertInitialize(t, db, req)
-		assert.Equal(t, passwordAuthenticationPassword, db.passwordAuthentication)
-	})
-}
-
-// TestPostgreSQL_PasswordAuthentication_SCRAMSHA256 tests that password_authentication works when set to scram-sha-256.
-// When sending an encrypted password, the raw password should still successfully authenticate the user.
-func TestPostgreSQL_PasswordAuthentication_SCRAMSHA256(t *testing.T) {
-	cleanup, connURL := postgresql.PrepareTestContainer(t, "13.4-buster")
-	defer cleanup()
-
-	dsnConnURL, err := dbutil.ParseURL(connURL)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	connectionDetails := map[string]interface{}{
-		"connection_url":          dsnConnURL,
-		"password_authentication": string(passwordAuthenticationSCRAMSHA256),
-	}
-
-	req := dbplugin.InitializeRequest{
-		Config:           connectionDetails,
-		VerifyConnection: true,
-	}
-
-	db := new()
-	resp := dbtesting.AssertInitialize(t, db, req)
-	assert.Equal(t, string(passwordAuthenticationSCRAMSHA256), resp.Config["password_authentication"])
-
-	if !db.Initialized {
-		t.Fatal("Database should be initialized")
-	}
-
-	ctx := context.Background()
-	newUserRequest := dbplugin.NewUserRequest{
-		Statements: dbplugin.Statements{
-			Commands: []string{
-				`
-						CREATE ROLE "{{name}}" WITH
-						  LOGIN
-						  PASSWORD '{{password}}'
-						  VALID UNTIL '{{expiration}}';
-						GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO "{{name}}";`,
-			},
-		},
-		Password:   "somesecurepassword",
-		Expiration: time.Now().Add(1 * time.Minute),
-	}
-	newUserResponse, err := db.NewUser(ctx, newUserRequest)
-
-	assertCredsExist(t, db.ConnectionURL, newUserResponse.Username, newUserRequest.Password)
-}
-
 func TestPostgreSQL_NewUser(t *testing.T) {
 	type testCase struct {
 		req            dbplugin.NewUserRequest
@@ -683,19 +587,6 @@ func TestDeleteUser(t *testing.T) {
 			// Wait for a short time before checking because postgres takes a moment to finish deleting the user
 			credsAssertion: assertCredsExistAfter(100 * time.Millisecond),
 		},
-		"multiline": {
-			revokeStmts: []string{`
-				DO $$ BEGIN
-					REVOKE ALL PRIVILEGES ON ALL TABLES IN SCHEMA public FROM "{{username}}";
-					REVOKE ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA public FROM "{{username}}";
-					REVOKE USAGE ON SCHEMA public FROM "{{username}}";
-					DROP ROLE IF EXISTS "{{username}}";
-				END $$;
-				`},
-			expectErr: false,
-			// Wait for a short time before checking because postgres takes a moment to finish deleting the user
-			credsAssertion: waitUntilCredsDoNotExist(2 * time.Second),
-		},
 	}
 
 	// Shared test container for speed - there should not be any overlap between the tests
@@ -1099,142 +990,3 @@ func TestNewUser_CustomUsername(t *testing.T) {
 		})
 	}
 }
-
-// This is a long-running integration test which tests the functionality of Postgres's multi-host
-// connection strings. It uses two Postgres containers preconfigured with Replication Manager
-// provided by Bitnami. This test currently does not run in CI and must be run manually. This is
-// due to the test length, as it requires multiple sleep calls to ensure cluster setup and
-// primary node failover occurs before the test steps continue.
-//
-// To run the test, set the environment variable POSTGRES_MULTIHOST_NET to the value of
-// a docker network you've preconfigured, e.g.
-// 'docker network create -d bridge postgres-repmgr'
-// 'export POSTGRES_MULTIHOST_NET=postgres-repmgr'
-func TestPostgreSQL_Repmgr(t *testing.T) {
-	_, exists := os.LookupEnv("POSTGRES_MULTIHOST_NET")
-	if !exists {
-		t.Skipf("POSTGRES_MULTIHOST_NET not set, skipping test")
-	}
-
-	// Run two postgres-repmgr containers in a replication cluster
-	db0, runner0, url0, container0 := testPostgreSQL_Repmgr_Container(t, "psql-repl-node-0")
-	_, _, url1, _ := testPostgreSQL_Repmgr_Container(t, "psql-repl-node-1")
-
-	ctx, cancel := context.WithTimeout(context.Background(), 300*time.Second)
-	defer cancel()
-
-	time.Sleep(10 * time.Second)
-
-	// Write a read role to the cluster
-	_, err := db0.NewUser(ctx, dbplugin.NewUserRequest{
-		Statements: dbplugin.Statements{
-			Commands: []string{
-				`CREATE ROLE "ro" NOINHERIT;
-				GRANT SELECT ON ALL TABLES IN SCHEMA public TO "ro";`,
-			},
-		},
-	})
-	if err != nil {
-		t.Fatalf("no error expected, got: %s", err)
-	}
-
-	// Open a connection to both databases using the multihost connection string
-	connectionDetails := map[string]interface{}{
-		"connection_url": fmt.Sprintf("postgresql://{{username}}:{{password}}@%s,%s/postgres?target_session_attrs=read-write", getHost(url0), getHost(url1)),
-		"username":       "postgres",
-		"password":       "secret",
-	}
-	req := dbplugin.InitializeRequest{
-		Config:           connectionDetails,
-		VerifyConnection: true,
-	}
-
-	db := new()
-	dbtesting.AssertInitialize(t, db, req)
-	if !db.Initialized {
-		t.Fatal("Database should be initialized")
-	}
-	defer db.Close()
-
-	// Add a user to the cluster, then stop the primary container
-	if err = testPostgreSQL_Repmgr_AddUser(ctx, db); err != nil {
-		t.Fatalf("no error expected, got: %s", err)
-	}
-	postgresql.StopContainer(t, ctx, runner0, container0)
-
-	// Try adding a new user immediately - expect failure as the database
-	// cluster is still switching primaries
-	err = testPostgreSQL_Repmgr_AddUser(ctx, db)
-	if !strings.HasSuffix(err.Error(), "ValidateConnect failed (read only connection)") {
-		t.Fatalf("expected error was not received, got: %s", err)
-	}
-
-	time.Sleep(20 * time.Second)
-
-	// Try adding a new user again which should succeed after the sleep
-	// as the primary failover should have finished. Then, restart
-	// the first container which should become a secondary DB.
-	if err = testPostgreSQL_Repmgr_AddUser(ctx, db); err != nil {
-		t.Fatalf("no error expected, got: %s", err)
-	}
-	postgresql.RestartContainer(t, ctx, runner0, container0)
-
-	time.Sleep(10 * time.Second)
-
-	// A final new user to add, which should succeed after the secondary joins.
-	if err = testPostgreSQL_Repmgr_AddUser(ctx, db); err != nil {
-		t.Fatalf("no error expected, got: %s", err)
-	}
-
-	if err := db.Close(); err != nil {
-		t.Fatalf("err: %s", err)
-	}
-}
-
-func testPostgreSQL_Repmgr_Container(t *testing.T, name string) (*PostgreSQL, *docker.Runner, string, string) {
-	envVars := []string{
-		"REPMGR_NODE_NAME=" + name,
-		"REPMGR_NODE_NETWORK_NAME=" + name,
-	}
-
-	runner, cleanup, connURL, containerID := postgresql.PrepareTestContainerRepmgr(t, name, "13.4.0", envVars)
-	t.Cleanup(cleanup)
-
-	connectionDetails := map[string]interface{}{
-		"connection_url": connURL,
-	}
-	req := dbplugin.InitializeRequest{
-		Config:           connectionDetails,
-		VerifyConnection: true,
-	}
-	db := new()
-	dbtesting.AssertInitialize(t, db, req)
-	if !db.Initialized {
-		t.Fatal("Database should be initialized")
-	}
-
-	if err := db.Close(); err != nil {
-		t.Fatalf("err: %s", err)
-	}
-
-	return db, runner, connURL, containerID
-}
-
-func testPostgreSQL_Repmgr_AddUser(ctx context.Context, db *PostgreSQL) error {
-	_, err := db.NewUser(ctx, dbplugin.NewUserRequest{
-		Statements: dbplugin.Statements{
-			Commands: []string{
-				`CREATE ROLE "{{name}}" WITH LOGIN PASSWORD '{{password}}' VALID UNTIL '{{expiration}}' INHERIT;
-				GRANT ro TO "{{name}}";`,
-			},
-		},
-	})
-
-	return err
-}
-
-func getHost(url string) string {
-	splitCreds := strings.Split(url, "@")[1]
-
-	return strings.Split(splitCreds, "/")[0]
-}
diff --git a/plugins/database/postgresql/scram/LICENSE b/plugins/database/postgresql/scram/LICENSE
deleted file mode 100644
index cc36995f299f4..0000000000000
--- a/plugins/database/postgresql/scram/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2021 Taishi Kasuga
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
\ No newline at end of file
diff --git a/plugins/database/postgresql/scram/scram.go b/plugins/database/postgresql/scram/scram.go
deleted file mode 100644
index f5c6923cef662..0000000000000
--- a/plugins/database/postgresql/scram/scram.go
+++ /dev/null
@@ -1,86 +0,0 @@
-package scram
-
-//
-// @see https://github.com/postgres/postgres/blob/c30f54ad732ca5c8762bb68bbe0f51de9137dd72/src/interfaces/libpq/fe-auth.c#L1167-L1285
-// @see https://github.com/postgres/postgres/blob/e6bdfd9700ebfc7df811c97c2fc46d7e94e329a2/src/interfaces/libpq/fe-auth-scram.c#L868-L905
-// @see https://github.com/postgres/postgres/blob/c30f54ad732ca5c8762bb68bbe0f51de9137dd72/src/port/pg_strong_random.c#L66-L96
-// @see https://github.com/postgres/postgres/blob/e6bdfd9700ebfc7df811c97c2fc46d7e94e329a2/src/common/scram-common.c#L160-L274
-// @see https://github.com/postgres/postgres/blob/e6bdfd9700ebfc7df811c97c2fc46d7e94e329a2/src/common/scram-common.c#L27-L85
-
-// Implementation from https://github.com/supercaracal/scram-sha-256/blob/d3c05cd927770a11c6e12de3e3a99c3446a1f78d/main.go
-import (
-	"crypto/hmac"
-	"crypto/rand"
-	"crypto/sha256"
-	"encoding/base64"
-	"fmt"
-	"io"
-
-	"golang.org/x/crypto/pbkdf2"
-)
-
-const (
-	// @see https://github.com/postgres/postgres/blob/e6bdfd9700ebfc7df811c97c2fc46d7e94e329a2/src/include/common/scram-common.h#L36-L41
-	saltSize = 16
-
-	// @see https://github.com/postgres/postgres/blob/c30f54ad732ca5c8762bb68bbe0f51de9137dd72/src/include/common/sha2.h#L22
-	digestLen = 32
-
-	// @see https://github.com/postgres/postgres/blob/e6bdfd9700ebfc7df811c97c2fc46d7e94e329a2/src/include/common/scram-common.h#L43-L47
-	iterationCnt = 4096
-)
-
-var (
-	clientRawKey = []byte("Client Key")
-	serverRawKey = []byte("Server Key")
-)
-
-func genSalt(size int) ([]byte, error) {
-	salt := make([]byte, size)
-	if _, err := io.ReadFull(rand.Reader, salt); err != nil {
-		return nil, err
-	}
-	return salt, nil
-}
-
-func encodeB64(src []byte) (dst []byte) {
-	dst = make([]byte, base64.StdEncoding.EncodedLen(len(src)))
-	base64.StdEncoding.Encode(dst, src)
-	return
-}
-
-func getHMACSum(key, msg []byte) []byte {
-	h := hmac.New(sha256.New, key)
-	_, _ = h.Write(msg)
-	return h.Sum(nil)
-}
-
-func getSHA256Sum(key []byte) []byte {
-	h := sha256.New()
-	_, _ = h.Write(key)
-	return h.Sum(nil)
-}
-
-func hashPassword(rawPassword, salt []byte, iter, keyLen int) string {
-	digestKey := pbkdf2.Key(rawPassword, salt, iter, keyLen, sha256.New)
-	clientKey := getHMACSum(digestKey, clientRawKey)
-	storedKey := getSHA256Sum(clientKey)
-	serverKey := getHMACSum(digestKey, serverRawKey)
-
-	return fmt.Sprintf("SCRAM-SHA-256$%d:%s$%s:%s",
-		iter,
-		string(encodeB64(salt)),
-		string(encodeB64(storedKey)),
-		string(encodeB64(serverKey)),
-	)
-}
-
-func Hash(password string) (string, error) {
-	salt, err := genSalt(saltSize)
-	if err != nil {
-		return "", err
-	}
-
-	hashedPassword := hashPassword([]byte(password), salt, iterationCnt, digestLen)
-	return hashedPassword, nil
-}
diff --git a/plugins/database/postgresql/scram/scram_test.go b/plugins/database/postgresql/scram/scram_test.go
deleted file mode 100644
index d2933ebbca404..0000000000000
--- a/plugins/database/postgresql/scram/scram_test.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package scram
-
-import (
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-// TestScram tests the Hash method. The hashed password string should have a SCRAM-SHA-256 prefix.
-func TestScram(t *testing.T) {
-	tcs := map[string]struct {
-		Password string
-	}{
-		"empty-password":  {Password: ""},
-		"simple-password": {Password: "password"},
-	}
-
-	for name, tc := range tcs {
-		t.Run(name, func(t *testing.T) {
-			got, err := Hash(tc.Password)
-			assert.NoError(t, err)
-			assert.True(t, strings.HasPrefix(got, "SCRAM-SHA-256$4096:"))
-			assert.Len(t, got, 133)
-		})
-	}
-}
diff --git a/plugins/database/redshift/redshift-database-plugin/main.go b/plugins/database/redshift/redshift-database-plugin/main.go
index 7fcd9b0b64879..8d2f796eeab3f 100644
--- a/plugins/database/redshift/redshift-database-plugin/main.go
+++ b/plugins/database/redshift/redshift-database-plugin/main.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package main
 
 import (
diff --git a/plugins/database/redshift/redshift.go b/plugins/database/redshift/redshift.go
index 11ce30a73f338..ce39569d4858c 100644
--- a/plugins/database/redshift/redshift.go
+++ b/plugins/database/redshift/redshift.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package redshift
 
 import (
diff --git a/plugins/database/redshift/redshift_test.go b/plugins/database/redshift/redshift_test.go
index af264587b6cd3..0fb70dec18957 100644
--- a/plugins/database/redshift/redshift_test.go
+++ b/plugins/database/redshift/redshift_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package redshift
 
 import (
@@ -14,7 +11,6 @@ import (
 	"time"
 
 	"github.com/hashicorp/go-uuid"
-	"github.com/hashicorp/vault/helper/testhelpers"
 	dbplugin "github.com/hashicorp/vault/sdk/database/dbplugin/v5"
 	dbtesting "github.com/hashicorp/vault/sdk/database/dbplugin/v5/testing"
 	"github.com/hashicorp/vault/sdk/helper/dbtxn"
@@ -45,12 +41,6 @@ var (
 	keyRedshiftUser     = "REDSHIFT_USER"
 	keyRedshiftPassword = "REDSHIFT_PASSWORD"
 
-	credNames = []string{
-		keyRedshiftURL,
-		keyRedshiftUser,
-		keyRedshiftPassword,
-	}
-
 	vaultACC = "VAULT_ACC"
 )
 
@@ -80,9 +70,6 @@ func TestRedshift_Initialize(t *testing.T) {
 		t.SkipNow()
 	}
 
-	// Ensure each cred is populated.
-	testhelpers.SkipUnlessEnvVarsSet(t, credNames)
-
 	connURL, _, _, _, err := redshiftEnv()
 	if err != nil {
 		t.Fatal(err)
@@ -121,9 +108,6 @@ func TestRedshift_NewUser(t *testing.T) {
 		t.SkipNow()
 	}
 
-	// Ensure each cred is populated.
-	testhelpers.SkipUnlessEnvVarsSet(t, credNames)
-
 	connURL, url, _, _, err := redshiftEnv()
 	if err != nil {
 		t.Fatal(err)
@@ -174,9 +158,6 @@ func TestRedshift_NewUser_NoCreationStatement_ShouldError(t *testing.T) {
 		t.SkipNow()
 	}
 
-	// Ensure each cred is populated.
-	testhelpers.SkipUnlessEnvVarsSet(t, credNames)
-
 	connURL, _, _, _, err := redshiftEnv()
 	if err != nil {
 		t.Fatal(err)
@@ -220,9 +201,6 @@ func TestRedshift_UpdateUser_Expiration(t *testing.T) {
 		t.SkipNow()
 	}
 
-	// Ensure each cred is populated.
-	testhelpers.SkipUnlessEnvVarsSet(t, credNames)
-
 	connURL, url, _, _, err := redshiftEnv()
 	if err != nil {
 		t.Fatal(err)
@@ -283,9 +261,6 @@ func TestRedshift_UpdateUser_Password(t *testing.T) {
 		t.SkipNow()
 	}
 
-	// Ensure each cred is populated.
-	testhelpers.SkipUnlessEnvVarsSet(t, credNames)
-
 	connURL, url, _, _, err := redshiftEnv()
 	if err != nil {
 		t.Fatal(err)
@@ -340,9 +315,6 @@ func TestRedshift_DeleteUser(t *testing.T) {
 		t.SkipNow()
 	}
 
-	// Ensure each cred is populated.
-	testhelpers.SkipUnlessEnvVarsSet(t, credNames)
-
 	connURL, url, _, _, err := redshiftEnv()
 	if err != nil {
 		t.Fatal(err)
@@ -408,9 +380,6 @@ func TestRedshift_DefaultUsernameTemplate(t *testing.T) {
 		t.SkipNow()
 	}
 
-	// Ensure each cred is populated.
-	testhelpers.SkipUnlessEnvVarsSet(t, credNames)
-
 	connURL, url, _, _, err := redshiftEnv()
 	if err != nil {
 		t.Fatal(err)
@@ -459,9 +428,6 @@ func TestRedshift_CustomUsernameTemplate(t *testing.T) {
 		t.SkipNow()
 	}
 
-	// Ensure each cred is populated.
-	testhelpers.SkipUnlessEnvVarsSet(t, credNames)
-
 	connURL, url, _, _, err := redshiftEnv()
 	if err != nil {
 		t.Fatal(err)
diff --git a/scan.hcl b/scan.hcl
deleted file mode 100644
index 7553139d17f34..0000000000000
--- a/scan.hcl
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
-repository {
-  go_modules = true
-  osv = true
-  secrets {
-    all = true
-  } 
-  dependabot {
-    required = true
-    check_config = true
-  }
-  
-  plugin "semgrep" {
-    use_git_ignore = true
-    exclude = ["vendor"]
-    config = ["tools/semgrep/ci", "p/r2c-security-audit"]
-    exclude_rule = ["generic.html-templates.security.unquoted-attribute-var.unquoted-attribute-var"]
-  }
-  
-  plugin "codeql" {
-    languages = ["go"]
-  }
-}
diff --git a/scripts/assetcheck.sh b/scripts/assetcheck.sh
index d846dd5f9f4ca..7100f84d9faef 100755
--- a/scripts/assetcheck.sh
+++ b/scripts/assetcheck.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 if [[ ! -e http/web_ui/index.html ]]
 then
diff --git a/scripts/build.sh b/scripts/build.sh
index cf990fa265c6b..390b62f87c418 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 #
 # This script builds the application from source for multiple platforms.
 set -e
@@ -43,20 +40,18 @@ mkdir -p bin/
 echo "==> Building..."
 ${GO_CMD} build \
     -gcflags "${GCFLAGS}" \
-    -ldflags "${LD_FLAGS} -X github.com/hashicorp/vault/version.GitCommit='${GIT_COMMIT}${GIT_DIRTY}' -X github.com/hashicorp/vault/version.BuildDate=${BUILD_DATE}" \
+    -ldflags "${LD_FLAGS} -X github.com/hashicorp/vault/sdk/version.GitCommit='${GIT_COMMIT}${GIT_DIRTY}' -X github.com/hashicorp/vault/sdk/version.BuildDate=${BUILD_DATE}" \
     -o "bin/vault" \
     -tags "${BUILD_TAGS}" \
     .
 
 # Move all the compiled things to the $GOPATH/bin
 OLDIFS=$IFS
-IFS=: FIRST=($GOPATH) BIN_PATH=${GOBIN:-${FIRST}/bin}
+IFS=: MAIN_GOPATH=($GOPATH)
 IFS=$OLDIFS
 
-# Ensure the go bin folder exists
-mkdir -p ${BIN_PATH}
-rm -f ${BIN_PATH}/vault
-cp bin/vault ${BIN_PATH}
+rm -f ${MAIN_GOPATH}/bin/vault
+cp bin/vault ${MAIN_GOPATH}/bin/
 
 # Done!
 echo
diff --git a/scripts/ci-helper.sh b/scripts/ci-helper.sh
index 4e33a8e8aa775..a2730f5cc11a0 100755
--- a/scripts/ci-helper.sh
+++ b/scripts/ci-helper.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 # The ci-helper is used to determine build metadata, build Vault binaries,
 # package those binaries into artifacts, and execute tests with those artifacts.
@@ -41,7 +38,7 @@ function version_base() {
     return
   fi
 
-  : "${VERSION_FILE:=$(repo_root)/version/version_base.go}"
+  : "${VERSION_FILE:=$(repo_root)/sdk/version/version_base.go}"
   awk '$1 == "Version" && $2 == "=" { gsub(/"/, "", $3); print $3 }' < "$VERSION_FILE"
 }
 
@@ -69,7 +66,7 @@ function version_pre() {
     return
   fi
 
-  : "${VERSION_FILE:=$(repo_root)/version/version_base.go}"
+  : "${VERSION_FILE:=$(repo_root)/sdk/version/version_base.go}"
   awk '$1 == "VersionPrerelease" && $2 == "=" { gsub(/"/, "", $3); print $3 }' < "$VERSION_FILE"
 }
 
@@ -82,7 +79,7 @@ function version_metadata() {
     return
   fi
 
-  : "${VERSION_FILE:=$(repo_root)/version/version_base.go}"
+  : "${VERSION_FILE:=$(repo_root)/sdk/version/version_base.go}"
   awk '$1 == "VersionMetadata" && $2 == "=" { gsub(/"/, "", $3); print $3 }' < "$VERSION_FILE"
 }
 
@@ -132,9 +129,9 @@ function build_ui() {
   mkdir -p http/web_ui
   popd
   pushd "$repo_root/ui"
-  yarn install
+  yarn install --ignore-optional
   npm rebuild node-sass
-  yarn run build
+  yarn --verbose run build
   popd
 }
 
@@ -154,28 +151,28 @@ function build() {
   prerelease=$(version_pre)
   build_date=$(build_date)
   : "${GO_TAGS:=""}"
-  : "${REMOVE_SYMBOLS:=""}"
+  : "${KEEP_SYMBOLS:=""}"
 
   # Build our ldflags
   msg="--> Building Vault v$version, revision $revision, built $build_date"
 
-  # Keep the symbol and dwarf information by default
-  if [ -n "$REMOVE_SYMBOLS" ]; then
-    ldflags="-s -w "
-  else
+  # Strip the symbol and dwarf information by default
+  if [ -n "$KEEP_SYMBOLS" ]; then
     ldflags=""
+  else
+    ldflags="-s -w "
   fi
 
-  ldflags="${ldflags}-X github.com/hashicorp/vault/version.Version=$version -X github.com/hashicorp/vault/version.GitCommit=$revision -X github.com/hashicorp/vault/version.BuildDate=$build_date"
+  ldflags="${ldflags}-X github.com/hashicorp/vault/sdk/version.Version=$version -X github.com/hashicorp/vault/sdk/version.GitCommit=$revision -X github.com/hashicorp/vault/sdk/version.BuildDate=$build_date"
 
   if [ -n "$prerelease" ]; then
     msg="${msg}, prerelease ${prerelease}"
-    ldflags="${ldflags} -X github.com/hashicorp/vault/version.VersionPrerelease=$prerelease"
+    ldflags="${ldflags} -X github.com/hashicorp/vault/sdk/version.VersionPrerelease=$prerelease"
   fi
 
   if [ -n "$metadata" ]; then
     msg="${msg}, metadata ${metadata}"
-    ldflags="${ldflags} -X github.com/hashicorp/vault/version.VersionMetadata=$metadata"
+    ldflags="${ldflags} -X github.com/hashicorp/vault/sdk/version.VersionMetadata=$metadata"
   fi
 
   # Build vault
diff --git a/scripts/coverage.sh b/scripts/coverage.sh
index 7f5d49e534dea..ad80496d15787 100755
--- a/scripts/coverage.sh
+++ b/scripts/coverage.sh
@@ -1,7 +1,4 @@
 #!/bin/sh
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 # Generate test coverage statistics for Go packages.
 #
 # Works around the fact that `go test -coverprofile` currently does not work
diff --git a/scripts/cross/Dockerfile b/scripts/cross/Dockerfile
index c0fddb3b05fdc..504399c3ff386 100644
--- a/scripts/cross/Dockerfile
+++ b/scripts/cross/Dockerfile
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 FROM debian:buster
 
 RUN apt-get update -y && apt-get install --no-install-recommends -y -q \
@@ -15,7 +12,7 @@ RUN apt-get update -y && apt-get install --no-install-recommends -y -q \
                          libltdl-dev \
                          libltdl7
 
-RUN curl -sL https://deb.nodesource.com/setup_16.x | bash -
+RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
 RUN curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
 RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
 
diff --git a/scripts/deprecations-checker.sh b/scripts/deprecations-checker.sh
deleted file mode 100755
index 017149e6d7095..0000000000000
--- a/scripts/deprecations-checker.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
-# This script is sourced into the shell running in a Github Actions workflow.
-
-# Usage:
-# To check deprecations locally using the script, follow these steps:
-# From the repository root or within a package folder, execute deprecations-checker.sh 
-# Optionally: to only show deprecations in changed files between the current branch and 
-# a specific branch, pass the other branch name as an argument to the script.
-#
-# For example: 
-# ./scripts/deprecations-checker.sh (or) make deprecations
-# ./scripts/deprecations-checker.sh main (or) make ci-deprecations
-#
-# If no branch name is specified, the command will show all usage of deprecations in the code.
-#
-# GitHub Actions runs this against the PR's base ref branch. 
-
-# Staticcheck uses static analysis to finds bugs and performance issues, offers simplifications, 
-# and enforces style rules.
-# Here, it is used to check if a deprecated function, variable, constant or field is used.
-
-# Run staticcheck 
-echo "Performing deprecations check: running staticcheck"
-
-# Identify repository name
-if [ -z $2 ]; then
-    # local repository name
-    repositoryName=$(basename `git rev-parse --show-toplevel`)
-else
-    # github repository name from deprecated-functions-checker.yml
-    repositoryName=$2
-fi
-
-# Modify the command with the correct build tag based on repository
-if [ $repositoryName == "vault-enterprise" ]; then
-    staticcheckCommand=$(echo "staticcheck ./... -tags=enterprise")
-else
-    staticcheckCommand=$(echo "staticcheck ./...")
-fi
-
-# If no compare branch name is specified, output all deprecations
-# Else only output the deprecations from the changes added
-if [ -z $1 ]
-    then
-        $staticcheckCommand | grep deprecated
-    else
-        # GitHub Actions will use this to find only changes wrt PR's base ref branch
-        # revgrep CLI tool will return an exit status of 1 if any issues match, else it will return 0
-        $staticcheckCommand | grep deprecated 2>&1 | revgrep "$(git merge-base HEAD "origin/$1")"
-fi
diff --git a/scripts/deps_upgrade.py b/scripts/deps_upgrade.py
index edd1b52f10398..9531696cee565 100644
--- a/scripts/deps_upgrade.py
+++ b/scripts/deps_upgrade.py
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 import os
 import sys
 
diff --git a/scripts/dist.sh b/scripts/dist.sh
index fc605d4fdd994..e9891b059e1c9 100755
--- a/scripts/dist.sh
+++ b/scripts/dist.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 set -e
 
 # Get the version from the command line
diff --git a/scripts/docker/Dockerfile b/scripts/docker/Dockerfile
index ceb6ec6ee73dd..6208badf4bc89 100644
--- a/scripts/docker/Dockerfile
+++ b/scripts/docker/Dockerfile
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 # Multi-stage builder to avoid polluting users environment with wrong
 # architecture binaries.
 ARG VERSION
diff --git a/scripts/docker/Dockerfile.ui b/scripts/docker/Dockerfile.ui
index cac96929b43dd..b13f0fe1fbd4e 100644
--- a/scripts/docker/Dockerfile.ui
+++ b/scripts/docker/Dockerfile.ui
@@ -19,7 +19,7 @@ RUN apt-get update -y && apt-get install --no-install-recommends -y -q \
                          libltdl-dev \
                          libltdl7
 
-RUN curl -sL https://deb.nodesource.com/setup_16.x | bash -
+RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
 RUN curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
 RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
 
diff --git a/scripts/docker/docker-entrypoint.sh b/scripts/docker/docker-entrypoint.sh
index 2b9b8f35a1606..3b72da25b7f41 100755
--- a/scripts/docker/docker-entrypoint.sh
+++ b/scripts/docker/docker-entrypoint.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/dumb-init /bin/sh
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 set -e
 
 # Note above that we run dumb-init as PID 1 in order to reap zombie processes
diff --git a/scripts/gen_openapi.sh b/scripts/gen_openapi.sh
index de4589877d362..e98633b295e5b 100755
--- a/scripts/gen_openapi.sh
+++ b/scripts/gen_openapi.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 set -e
 
@@ -24,80 +21,70 @@ then
 fi
 
 vault server -dev -dev-root-token-id=root &
-sleep 5
+sleep 2
 VAULT_PID=$!
 
-defer_stop_vault() {
-    echo "Stopping Vault..."
-    kill $VAULT_PID
-    sleep 1
-}
-
-trap defer_stop_vault INT TERM EXIT
-
-export VAULT_ADDR=http://127.0.0.1:8200
-
-echo "Mounting all builtin plugins..."
+echo "Mounting all builtin backends..."
+
+# Read auth backends
+codeLinesStarted=false
+inQuotesRegex='".*"'
+while read -r line; do
+    if [[ $line == *"credentialBackends:"* ]] ; then
+        codeLinesStarted=true
+    elif [ $codeLinesStarted = true ] && [[ $line = *"}"* ]]  ; then
+        break
+    elif [ $codeLinesStarted = true ] && [[ $line =~ $inQuotesRegex ]] && [[ $line != *"Deprecated"* ]] ; then
+        backend=${BASH_REMATCH[0]}
+        plugin=$(sed -e 's/^"//' -e 's/"$//' <<<"$backend")
+        vault auth enable "${plugin}"
+    fi
+done <../../vault/helper/builtinplugins/registry.go
+
+# Read secrets backends
+codeLinesStarted=false
+while read -r line; do
+    if [[ $line == *"logicalBackends:"* ]] ; then
+        codeLinesStarted=true
+    elif [ $codeLinesStarted = true ] && [[ $line = *"}"* ]]  ; then
+        break
+    elif [ $codeLinesStarted = true ] && [[ $line =~ $inQuotesRegex ]] && [[ $line != *"Deprecated"* ]] ; then
+        backend=${BASH_REMATCH[0]}
+        plugin=$(sed -e 's/^"//' -e 's/"$//' <<<"$backend")
+        vault secrets enable "${plugin}"
+    fi
+done <../../vault/helper/builtinplugins/registry.go
 
-# Enable auth plugins
-vault auth enable "alicloud"
-vault auth enable "approle"
-vault auth enable "aws"
-vault auth enable "azure"
-vault auth enable "centrify"
-vault auth enable "cert"
-vault auth enable "cf"
-vault auth enable "gcp"
-vault auth enable "github"
-vault auth enable "jwt"
-vault auth enable "kerberos"
-vault auth enable "kubernetes"
-vault auth enable "ldap"
-vault auth enable "oci"
-vault auth enable "okta"
-vault auth enable "radius"
-vault auth enable "userpass"
-
-# Enable secrets plugins
-vault secrets enable "alicloud"
-vault secrets enable "aws"
-vault secrets enable "azure"
-vault secrets enable "consul"
-vault secrets enable "database"
-vault secrets enable "gcp"
-vault secrets enable "gcpkms"
-vault secrets enable "kubernetes"
-vault secrets enable "kv"
-vault secrets enable "ldap"
-vault secrets enable "mongodbatlas"
-vault secrets enable "nomad"
-vault secrets enable "pki"
-vault secrets enable "rabbitmq"
-vault secrets enable "ssh"
-vault secrets enable "terraform"
-vault secrets enable "totp"
-vault secrets enable "transit"
 
 # Enable enterprise features
-if [[ -n "${VAULT_LICENSE:-}" ]]; then
-    vault write sys/license text="${VAULT_LICENSE}"
-
-    vault secrets enable "keymgmt"
-    vault secrets enable "kmip"
-    vault secrets enable "transform"
+entRegFile=../../vault/helper/builtinplugins/registry_util_ent.go
+if [ -f $entRegFile ] && [[ -n "$VAULT_LICENSE" ]]; then
+  vault write sys/license text="$VAULT_LICENSE"
+
+  inQuotesRegex='".*"'
+  codeLinesStarted=false
+  while read -r line; do
+        if [[ $line == *"ExternalPluginsEnt"* ]] ; then
+        codeLinesStarted=true
+    elif [ $codeLinesStarted = true ] && [[ $line = *"}"* ]]  ; then
+        break
+    elif [ $codeLinesStarted = true ] && [[ $line =~ $inQuotesRegex ]] && [[ $line != *"Deprecated"* ]] ; then
+        backend=${BASH_REMATCH[0]}
+        plugin=$(sed -e 's/^"//' -e 's/"$//' <<<"$backend")
+        vault secrets enable "${plugin}"
+    fi
+  done <$entRegFile
 fi
 
 # Output OpenAPI, optionally formatted
 if [ "$1" == "-p" ]; then
-    curl --header 'X-Vault-Token: root' \
-         --data '{"generic_mount_paths": true}' \
-            'http://127.0.0.1:8200/v1/sys/internal/specs/openapi' | jq > openapi.json
+  curl -H "X-Vault-Token: root" "http://127.0.0.1:8200/v1/sys/internal/specs/openapi" | jq > openapi.json
 else
-    curl --header 'X-Vault-Token: root' \
-         --data '{"generic_mount_paths": true}' \
-            'http://127.0.0.1:8200/v1/sys/internal/specs/openapi' > openapi.json
+  curl -H "X-Vault-Token: root" "http://127.0.0.1:8200/v1/sys/internal/specs/openapi" > openapi.json
 fi
 
+kill $VAULT_PID
+sleep 1
+
 echo
 echo "openapi.json generated"
-echo
diff --git a/scripts/gofmtcheck.sh b/scripts/gofmtcheck.sh
index 5c58f178558b9..574f4d7167c94 100755
--- a/scripts/gofmtcheck.sh
+++ b/scripts/gofmtcheck.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 echo "==> Checking that code complies with gofmt requirements..."
 
diff --git a/scripts/goversioncheck.sh b/scripts/goversioncheck.sh
index 7ee7422581e5e..6f55260099f2e 100755
--- a/scripts/goversioncheck.sh
+++ b/scripts/goversioncheck.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 GO_CMD=${GO_CMD:-go}
 
diff --git a/scripts/protocversioncheck.sh b/scripts/protocversioncheck.sh
index a2cbc6cc3f279..4b081674806b9 100755
--- a/scripts/protocversioncheck.sh
+++ b/scripts/protocversioncheck.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 set -euo pipefail
 
diff --git a/scripts/semgrep_plugin_repos.sh b/scripts/semgrep_plugin_repos.sh
index 6dc7407320caa..41f6dfd7a158a 100755
--- a/scripts/semgrep_plugin_repos.sh
+++ b/scripts/semgrep_plugin_repos.sh
@@ -1,7 +1,4 @@
 #!/bin/sh
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 set -e
 set -x
diff --git a/scripts/testciphers.sh b/scripts/testciphers.sh
index f9684f570bba9..324d6bce7e02a 100755
--- a/scripts/testciphers.sh
+++ b/scripts/testciphers.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 # Adapted from https://superuser.com/a/224263
 
diff --git a/scripts/update_deps.sh b/scripts/update_deps.sh
index f491b7e69bc40..35f0fecdf1b57 100755
--- a/scripts/update_deps.sh
+++ b/scripts/update_deps.sh
@@ -1,7 +1,4 @@
 #!/bin/sh
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 set -e
 
diff --git a/scripts/update_plugin_modules.sh b/scripts/update_plugin_modules.sh
index 2a300f3bc8461..ae87fd8d6a5bf 100755
--- a/scripts/update_plugin_modules.sh
+++ b/scripts/update_plugin_modules.sh
@@ -1,7 +1,4 @@
 #!/bin/sh
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 set -e
 
diff --git a/scripts/windows/build.bat b/scripts/windows/build.bat
index 79e27605a72fd..1452911e514a7 100644
--- a/scripts/windows/build.bat
+++ b/scripts/windows/build.bat
@@ -63,7 +63,7 @@ del /f "%_GO_ENV_TMP_FILE%" 2>nul
 REM Build!
 echo ==^> Building...
 go build^
- -ldflags "-X github.com/hashicorp/vault/version.GitCommit=%_GIT_COMMIT%%_GIT_DIRTY% -X github.com/hashicorp/vault/version.BuildDate=%_BUILD_DATE%"^
+ -ldflags "-X github.com/hashicorp/vault/sdk/version.GitCommit=%_GIT_COMMIT%%_GIT_DIRTY% -X github.com/hashicorp/vault/sdk/version.BuildDate=%_BUILD_DATE%"^
  -o "bin/vault.exe"^
  .
 
diff --git a/sdk/database/dbplugin/client.go b/sdk/database/dbplugin/client.go
index 265b46b6108a5..c30c86d0c9109 100644
--- a/sdk/database/dbplugin/client.go
+++ b/sdk/database/dbplugin/client.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package dbplugin
 
 import (
diff --git a/sdk/database/dbplugin/database.pb.go b/sdk/database/dbplugin/database.pb.go
index 62964c7d15d62..c916c861e27fa 100644
--- a/sdk/database/dbplugin/database.pb.go
+++ b/sdk/database/dbplugin/database.pb.go
@@ -1,10 +1,7 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc        v3.21.5
 // source: sdk/database/dbplugin/database.proto
 
 package dbplugin
diff --git a/sdk/database/dbplugin/database.proto b/sdk/database/dbplugin/database.proto
index ed29252789898..d8c208099b368 100644
--- a/sdk/database/dbplugin/database.proto
+++ b/sdk/database/dbplugin/database.proto
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 syntax = "proto3";
 
 option go_package = "github.com/hashicorp/vault/sdk/database/dbplugin";
diff --git a/sdk/database/dbplugin/databasemiddleware.go b/sdk/database/dbplugin/databasemiddleware.go
index d7cabafefe29b..29c806113844b 100644
--- a/sdk/database/dbplugin/databasemiddleware.go
+++ b/sdk/database/dbplugin/databasemiddleware.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package dbplugin
 
 import (
diff --git a/sdk/database/dbplugin/grpc_transport.go b/sdk/database/dbplugin/grpc_transport.go
index 3740ef59c3b81..fbae626df3973 100644
--- a/sdk/database/dbplugin/grpc_transport.go
+++ b/sdk/database/dbplugin/grpc_transport.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package dbplugin
 
 import (
diff --git a/sdk/database/dbplugin/plugin.go b/sdk/database/dbplugin/plugin.go
index 0b01454123c82..29f2f1f898b89 100644
--- a/sdk/database/dbplugin/plugin.go
+++ b/sdk/database/dbplugin/plugin.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package dbplugin
 
 import (
diff --git a/sdk/database/dbplugin/server.go b/sdk/database/dbplugin/server.go
index bf96a3bba4d91..4949384baf565 100644
--- a/sdk/database/dbplugin/server.go
+++ b/sdk/database/dbplugin/server.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package dbplugin
 
 import (
diff --git a/sdk/database/dbplugin/v5/conversions_test.go b/sdk/database/dbplugin/v5/conversions_test.go
index 5e65c3467068b..6207f0f39f7f2 100644
--- a/sdk/database/dbplugin/v5/conversions_test.go
+++ b/sdk/database/dbplugin/v5/conversions_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package dbplugin
 
 import (
@@ -65,7 +62,6 @@ func TestConversionsHaveAllFields(t *testing.T) {
 			CredentialType: CredentialTypeRSAPrivateKey,
 			PublicKey:      []byte("-----BEGIN PUBLIC KEY-----"),
 			Password:       "password",
-			Subject:        "subject",
 			Expiration:     time.Now(),
 		}
 
diff --git a/sdk/database/dbplugin/v5/database.go b/sdk/database/dbplugin/v5/database.go
index 065aaefd5a246..b73bd6858dca7 100644
--- a/sdk/database/dbplugin/v5/database.go
+++ b/sdk/database/dbplugin/v5/database.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package dbplugin
 
 import (
@@ -123,10 +120,6 @@ type NewUserRequest struct {
 	// The value is set when the credential type is CredentialTypeRSAPrivateKey.
 	PublicKey []byte
 
-	// Subject is the distinguished name for the client certificate credential.
-	// Value is set when the credential type is CredentialTypeClientCertificate.
-	Subject string
-
 	// Expiration of the user. Not all database plugins will support this.
 	Expiration time.Time
 }
@@ -150,7 +143,6 @@ type CredentialType int
 const (
 	CredentialTypePassword CredentialType = iota
 	CredentialTypeRSAPrivateKey
-	CredentialTypeClientCertificate
 )
 
 func (k CredentialType) String() string {
@@ -159,8 +151,6 @@ func (k CredentialType) String() string {
 		return "password"
 	case CredentialTypeRSAPrivateKey:
 		return "rsa_private_key"
-	case CredentialTypeClientCertificate:
-		return "client_certificate"
 	default:
 		return "unknown"
 	}
diff --git a/sdk/database/dbplugin/v5/grpc_client.go b/sdk/database/dbplugin/v5/grpc_client.go
index 9b0b984f42af1..cfddfcd578efa 100644
--- a/sdk/database/dbplugin/v5/grpc_client.go
+++ b/sdk/database/dbplugin/v5/grpc_client.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package dbplugin
 
 import (
@@ -104,10 +101,6 @@ func newUserReqToProto(req NewUserRequest) (*proto.NewUserRequest, error) {
 		if len(req.PublicKey) == 0 {
 			return nil, fmt.Errorf("missing public key credential")
 		}
-	case CredentialTypeClientCertificate:
-		if req.Subject == "" {
-			return nil, fmt.Errorf("missing certificate subject")
-		}
 	default:
 		return nil, fmt.Errorf("unknown credential type")
 	}
@@ -125,7 +118,6 @@ func newUserReqToProto(req NewUserRequest) (*proto.NewUserRequest, error) {
 		CredentialType: int32(req.CredentialType),
 		Password:       req.Password,
 		PublicKey:      req.PublicKey,
-		Subject:        req.Subject,
 		Expiration:     expiration,
 		Statements: &proto.Statements{
 			Commands: req.Statements.Commands,
diff --git a/sdk/database/dbplugin/v5/grpc_client_test.go b/sdk/database/dbplugin/v5/grpc_client_test.go
index 05ecb960e60a3..b187d736d80ed 100644
--- a/sdk/database/dbplugin/v5/grpc_client_test.go
+++ b/sdk/database/dbplugin/v5/grpc_client_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package dbplugin
 
 import (
diff --git a/sdk/database/dbplugin/v5/grpc_database_plugin.go b/sdk/database/dbplugin/v5/grpc_database_plugin.go
index b428d4ce06eff..441030df93e0b 100644
--- a/sdk/database/dbplugin/v5/grpc_database_plugin.go
+++ b/sdk/database/dbplugin/v5/grpc_database_plugin.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package dbplugin
 
 import (
diff --git a/sdk/database/dbplugin/v5/grpc_server.go b/sdk/database/dbplugin/v5/grpc_server.go
index 7e1bc3fa1fc76..ce3be1efb7c68 100644
--- a/sdk/database/dbplugin/v5/grpc_server.go
+++ b/sdk/database/dbplugin/v5/grpc_server.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package dbplugin
 
 import (
@@ -152,7 +149,6 @@ func (g *gRPCServer) NewUser(ctx context.Context, req *proto.NewUserRequest) (*p
 		CredentialType:     CredentialType(req.GetCredentialType()),
 		Password:           req.GetPassword(),
 		PublicKey:          req.GetPublicKey(),
-		Subject:            req.GetSubject(),
 		Expiration:         expiration,
 		Statements:         getStatementsFromProto(req.GetStatements()),
 		RollbackStatements: getStatementsFromProto(req.GetRollbackStatements()),
diff --git a/sdk/database/dbplugin/v5/grpc_server_test.go b/sdk/database/dbplugin/v5/grpc_server_test.go
index 53d44c7c2a656..7399bf55789bc 100644
--- a/sdk/database/dbplugin/v5/grpc_server_test.go
+++ b/sdk/database/dbplugin/v5/grpc_server_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package dbplugin
 
 import (
diff --git a/sdk/database/dbplugin/v5/marshalling.go b/sdk/database/dbplugin/v5/marshalling.go
index 2b3e8cb346acf..e14a21e58335d 100644
--- a/sdk/database/dbplugin/v5/marshalling.go
+++ b/sdk/database/dbplugin/v5/marshalling.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package dbplugin
 
 import (
diff --git a/sdk/database/dbplugin/v5/middleware.go b/sdk/database/dbplugin/v5/middleware.go
index 2091e672084a6..240d64e6915ea 100644
--- a/sdk/database/dbplugin/v5/middleware.go
+++ b/sdk/database/dbplugin/v5/middleware.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package dbplugin
 
 import (
diff --git a/sdk/database/dbplugin/v5/middleware_test.go b/sdk/database/dbplugin/v5/middleware_test.go
index a2a76336fb7d0..5dd97cdb9e5a4 100644
--- a/sdk/database/dbplugin/v5/middleware_test.go
+++ b/sdk/database/dbplugin/v5/middleware_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package dbplugin
 
 import (
diff --git a/sdk/database/dbplugin/v5/plugin_client.go b/sdk/database/dbplugin/v5/plugin_client.go
index b4085ead6cb9c..caea00a8fdaf1 100644
--- a/sdk/database/dbplugin/v5/plugin_client.go
+++ b/sdk/database/dbplugin/v5/plugin_client.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package dbplugin
 
 import (
diff --git a/sdk/database/dbplugin/v5/plugin_client_test.go b/sdk/database/dbplugin/v5/plugin_client_test.go
index 10f02b7bec259..f41ecf8ef4ab0 100644
--- a/sdk/database/dbplugin/v5/plugin_client_test.go
+++ b/sdk/database/dbplugin/v5/plugin_client_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package dbplugin
 
 import (
@@ -138,10 +135,6 @@ type mockRunnerUtil struct {
 	mock.Mock
 }
 
-func (m *mockRunnerUtil) VaultVersion(ctx context.Context) (string, error) {
-	return "dummyversion", nil
-}
-
 func (m *mockRunnerUtil) NewPluginClient(ctx context.Context, config pluginutil.PluginClientConfig) (pluginutil.PluginClient, error) {
 	args := m.Called(ctx, config)
 	return args.Get(0).(pluginutil.PluginClient), args.Error(1)
diff --git a/sdk/database/dbplugin/v5/plugin_factory.go b/sdk/database/dbplugin/v5/plugin_factory.go
index 4b158c319e264..f68cc5621aa41 100644
--- a/sdk/database/dbplugin/v5/plugin_factory.go
+++ b/sdk/database/dbplugin/v5/plugin_factory.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package dbplugin
 
 import (
@@ -58,7 +55,6 @@ func PluginFactoryVersion(ctx context.Context, pluginName string, pluginVersion
 			Logger:          namedLogger,
 			IsMetadataMode:  false,
 			AutoMTLS:        true,
-			Wrapper:         sys,
 		}
 		// create a DatabasePluginClient instance
 		db, err = NewPluginClient(ctx, sys, config)
diff --git a/sdk/database/dbplugin/v5/plugin_server.go b/sdk/database/dbplugin/v5/plugin_server.go
index 216219df1d7fc..090894ae55217 100644
--- a/sdk/database/dbplugin/v5/plugin_server.go
+++ b/sdk/database/dbplugin/v5/plugin_server.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package dbplugin
 
 import (
diff --git a/sdk/database/dbplugin/v5/proto/database.pb.go b/sdk/database/dbplugin/v5/proto/database.pb.go
index f152acaa79fd8..f814c60bcec1d 100644
--- a/sdk/database/dbplugin/v5/proto/database.pb.go
+++ b/sdk/database/dbplugin/v5/proto/database.pb.go
@@ -1,10 +1,7 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc        v3.21.5
 // source: sdk/database/dbplugin/v5/proto/database.proto
 
 package proto
@@ -142,7 +139,6 @@ type NewUserRequest struct {
 	RollbackStatements *Statements            `protobuf:"bytes,5,opt,name=rollback_statements,json=rollbackStatements,proto3" json:"rollback_statements,omitempty"`
 	CredentialType     int32                  `protobuf:"varint,6,opt,name=credential_type,json=credentialType,proto3" json:"credential_type,omitempty"`
 	PublicKey          []byte                 `protobuf:"bytes,7,opt,name=public_key,json=publicKey,proto3" json:"public_key,omitempty"`
-	Subject            string                 `protobuf:"bytes,8,opt,name=subject,proto3" json:"subject,omitempty"`
 }
 
 func (x *NewUserRequest) Reset() {
@@ -226,13 +222,6 @@ func (x *NewUserRequest) GetPublicKey() []byte {
 	return nil
 }
 
-func (x *NewUserRequest) GetSubject() string {
-	if x != nil {
-		return x.Subject
-	}
-	return ""
-}
-
 type UsernameConfig struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -877,7 +866,7 @@ var file_sdk_database_dbplugin_v5_proto_database_proto_rawDesc = []byte{
 	0x0b, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01,
 	0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
 	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x0a, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x44, 0x61, 0x74, 0x61, 0x22, 0x93, 0x03, 0x0a, 0x0e, 0x4e, 0x65, 0x77, 0x55,
+	0x66, 0x69, 0x67, 0x44, 0x61, 0x74, 0x61, 0x22, 0xf9, 0x02, 0x0a, 0x0e, 0x4e, 0x65, 0x77, 0x55,
 	0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x44, 0x0a, 0x0f, 0x75, 0x73,
 	0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x01, 0x20,
 	0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x64, 0x62, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x76,
@@ -901,102 +890,100 @@ var file_sdk_database_dbplugin_v5_proto_database_proto_rawDesc = []byte{
 	0x20, 0x01, 0x28, 0x05, 0x52, 0x0e, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c,
 	0x54, 0x79, 0x70, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x6b,
 	0x65, 0x79, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63,
-	0x4b, 0x65, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x18, 0x08,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x22, 0x50, 0x0a,
-	0x0e, 0x55, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12,
-	0x21, 0x0a, 0x0c, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61,
-	0x6d, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x72, 0x6f, 0x6c, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x72, 0x6f, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x22,
-	0x2d, 0x0a, 0x0f, 0x4e, 0x65, 0x77, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x8d,
-	0x02, 0x0a, 0x11, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65,
-	0x12, 0x37, 0x0a, 0x08, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x64, 0x62, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x76, 0x35,
-	0x2e, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x52,
-	0x08, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x3d, 0x0a, 0x0a, 0x65, 0x78, 0x70,
-	0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e,
-	0x64, 0x62, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x76, 0x35, 0x2e, 0x43, 0x68, 0x61, 0x6e,
-	0x67, 0x65, 0x45, 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x65, 0x78,
-	0x70, 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3b, 0x0a, 0x0a, 0x70, 0x75, 0x62, 0x6c,
-	0x69, 0x63, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x64,
-	0x62, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x76, 0x35, 0x2e, 0x43, 0x68, 0x61, 0x6e, 0x67,
-	0x65, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x52, 0x09, 0x70, 0x75, 0x62, 0x6c,
-	0x69, 0x63, 0x4b, 0x65, 0x79, 0x12, 0x27, 0x0a, 0x0f, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74,
-	0x69, 0x61, 0x6c, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0e,
-	0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x22, 0x6c,
-	0x0a, 0x0e, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64,
-	0x12, 0x21, 0x0a, 0x0c, 0x6e, 0x65, 0x77, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x6e, 0x65, 0x77, 0x50, 0x61, 0x73, 0x73, 0x77,
-	0x6f, 0x72, 0x64, 0x12, 0x37, 0x0a, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74,
-	0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x64, 0x62, 0x70, 0x6c, 0x75, 0x67,
-	0x69, 0x6e, 0x2e, 0x76, 0x35, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73,
-	0x52, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x22, 0x70, 0x0a, 0x0f,
-	0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x12,
-	0x24, 0x0a, 0x0e, 0x6e, 0x65, 0x77, 0x5f, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x6b, 0x65,
-	0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0c, 0x6e, 0x65, 0x77, 0x50, 0x75, 0x62, 0x6c,
-	0x69, 0x63, 0x4b, 0x65, 0x79, 0x12, 0x37, 0x0a, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65,
-	0x6e, 0x74, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x64, 0x62, 0x70, 0x6c,
-	0x75, 0x67, 0x69, 0x6e, 0x2e, 0x76, 0x35, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e,
-	0x74, 0x73, 0x52, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x22, 0x8e,
-	0x01, 0x0a, 0x10, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x45, 0x78, 0x70, 0x69, 0x72, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x12, 0x41, 0x0a, 0x0e, 0x6e, 0x65, 0x77, 0x5f, 0x65, 0x78, 0x70, 0x69, 0x72,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f,
-	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69,
-	0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0d, 0x6e, 0x65, 0x77, 0x45, 0x78, 0x70, 0x69,
-	0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x37, 0x0a, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x65, 0x6d,
-	0x65, 0x6e, 0x74, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x64, 0x62, 0x70,
-	0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x76, 0x35, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65,
-	0x6e, 0x74, 0x73, 0x52, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x22,
-	0x14, 0x0a, 0x12, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x68, 0x0a, 0x11, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x55,
+	0x4b, 0x65, 0x79, 0x22, 0x50, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x43,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x21, 0x0a, 0x0c, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79,
+	0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x69, 0x73,
+	0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x72, 0x6f, 0x6c, 0x65,
+	0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x72, 0x6f, 0x6c,
+	0x65, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x2d, 0x0a, 0x0f, 0x4e, 0x65, 0x77, 0x55, 0x73, 0x65, 0x72,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x72,
+	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x75, 0x73, 0x65, 0x72,
+	0x6e, 0x61, 0x6d, 0x65, 0x22, 0x8d, 0x02, 0x0a, 0x11, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55,
 	0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x75, 0x73,
 	0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x75, 0x73,
-	0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x37, 0x0a, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x65, 0x6d,
-	0x65, 0x6e, 0x74, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x64, 0x62, 0x70,
-	0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x76, 0x35, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65,
-	0x6e, 0x74, 0x73, 0x52, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x22,
-	0x14, 0x0a, 0x12, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x22, 0x0a, 0x0c, 0x54, 0x79, 0x70, 0x65, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x04, 0x54, 0x79, 0x70, 0x65, 0x22, 0x28, 0x0a, 0x0a, 0x53, 0x74, 0x61,
-	0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x43, 0x6f, 0x6d, 0x6d, 0x61,
-	0x6e, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x43, 0x6f, 0x6d, 0x6d, 0x61,
-	0x6e, 0x64, 0x73, 0x22, 0x07, 0x0a, 0x05, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x32, 0xa5, 0x03, 0x0a,
-	0x08, 0x44, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x12, 0x4d, 0x0a, 0x0a, 0x49, 0x6e, 0x69,
-	0x74, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x12, 0x1e, 0x2e, 0x64, 0x62, 0x70, 0x6c, 0x75, 0x67,
-	0x69, 0x6e, 0x2e, 0x76, 0x35, 0x2e, 0x49, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x65,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x64, 0x62, 0x70, 0x6c, 0x75, 0x67,
-	0x69, 0x6e, 0x2e, 0x76, 0x35, 0x2e, 0x49, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x65,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x44, 0x0a, 0x07, 0x4e, 0x65, 0x77, 0x55,
-	0x73, 0x65, 0x72, 0x12, 0x1b, 0x2e, 0x64, 0x62, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x76,
-	0x35, 0x2e, 0x4e, 0x65, 0x77, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x1a, 0x1c, 0x2e, 0x64, 0x62, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x76, 0x35, 0x2e, 0x4e,
-	0x65, 0x77, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4d,
-	0x0a, 0x0a, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x12, 0x1e, 0x2e, 0x64,
-	0x62, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x76, 0x35, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74,
-	0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x64,
-	0x62, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x76, 0x35, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74,
-	0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4d, 0x0a,
-	0x0a, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x12, 0x1e, 0x2e, 0x64, 0x62,
-	0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x76, 0x35, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65,
-	0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x64, 0x62,
-	0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x76, 0x35, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65,
-	0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x35, 0x0a, 0x04,
-	0x54, 0x79, 0x70, 0x65, 0x12, 0x12, 0x2e, 0x64, 0x62, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e,
-	0x76, 0x35, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x19, 0x2e, 0x64, 0x62, 0x70, 0x6c, 0x75,
-	0x67, 0x69, 0x6e, 0x2e, 0x76, 0x35, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x12, 0x2f, 0x0a, 0x05, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x12, 0x12, 0x2e, 0x64,
-	0x62, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x76, 0x35, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79,
-	0x1a, 0x12, 0x2e, 0x64, 0x62, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x76, 0x35, 0x2e, 0x45,
-	0x6d, 0x70, 0x74, 0x79, 0x42, 0x3b, 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
-	0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x76, 0x61, 0x75,
-	0x6c, 0x74, 0x2f, 0x73, 0x64, 0x6b, 0x2f, 0x64, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x2f,
-	0x64, 0x62, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2f, 0x76, 0x35, 0x2f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x37, 0x0a, 0x08, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f,
+	0x72, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x64, 0x62, 0x70, 0x6c, 0x75,
+	0x67, 0x69, 0x6e, 0x2e, 0x76, 0x35, 0x2e, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x61, 0x73,
+	0x73, 0x77, 0x6f, 0x72, 0x64, 0x52, 0x08, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12,
+	0x3d, 0x0a, 0x0a, 0x65, 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x64, 0x62, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x76,
+	0x35, 0x2e, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x45, 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x52, 0x0a, 0x65, 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3b,
+	0x0a, 0x0a, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x04, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x64, 0x62, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x76, 0x35,
+	0x2e, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79,
+	0x52, 0x09, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x12, 0x27, 0x0a, 0x0f, 0x63,
+	0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x05,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x0e, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c,
+	0x54, 0x79, 0x70, 0x65, 0x22, 0x6c, 0x0a, 0x0e, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x61,
+	0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x21, 0x0a, 0x0c, 0x6e, 0x65, 0x77, 0x5f, 0x70, 0x61,
+	0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x6e, 0x65,
+	0x77, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x37, 0x0a, 0x0a, 0x73, 0x74, 0x61,
+	0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e,
+	0x64, 0x62, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x76, 0x35, 0x2e, 0x53, 0x74, 0x61, 0x74,
+	0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e,
+	0x74, 0x73, 0x22, 0x70, 0x0a, 0x0f, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x62, 0x6c,
+	0x69, 0x63, 0x4b, 0x65, 0x79, 0x12, 0x24, 0x0a, 0x0e, 0x6e, 0x65, 0x77, 0x5f, 0x70, 0x75, 0x62,
+	0x6c, 0x69, 0x63, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0c, 0x6e,
+	0x65, 0x77, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x12, 0x37, 0x0a, 0x0a, 0x73,
+	0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x17, 0x2e, 0x64, 0x62, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x76, 0x35, 0x2e, 0x53, 0x74,
+	0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x65, 0x6d,
+	0x65, 0x6e, 0x74, 0x73, 0x22, 0x8e, 0x01, 0x0a, 0x10, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x45,
+	0x78, 0x70, 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x41, 0x0a, 0x0e, 0x6e, 0x65, 0x77,
+	0x5f, 0x65, 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0d, 0x6e,
+	0x65, 0x77, 0x45, 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x37, 0x0a, 0x0a,
+	0x73, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x17, 0x2e, 0x64, 0x62, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x76, 0x35, 0x2e, 0x53,
+	0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x65,
+	0x6d, 0x65, 0x6e, 0x74, 0x73, 0x22, 0x14, 0x0a, 0x12, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55,
+	0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x68, 0x0a, 0x11, 0x44,
+	0x65, 0x6c, 0x65, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x12, 0x1a, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x08, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x37, 0x0a, 0x0a,
+	0x73, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x17, 0x2e, 0x64, 0x62, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x76, 0x35, 0x2e, 0x53,
+	0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x65,
+	0x6d, 0x65, 0x6e, 0x74, 0x73, 0x22, 0x14, 0x0a, 0x12, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x55,
+	0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x22, 0x0a, 0x0c, 0x54,
+	0x79, 0x70, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x54,
+	0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x54, 0x79, 0x70, 0x65, 0x22,
+	0x28, 0x0a, 0x0a, 0x53, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x1a, 0x0a,
+	0x08, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52,
+	0x08, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x73, 0x22, 0x07, 0x0a, 0x05, 0x45, 0x6d, 0x70,
+	0x74, 0x79, 0x32, 0xa5, 0x03, 0x0a, 0x08, 0x44, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x12,
+	0x4d, 0x0a, 0x0a, 0x49, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x12, 0x1e, 0x2e,
+	0x64, 0x62, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x76, 0x35, 0x2e, 0x49, 0x6e, 0x69, 0x74,
+	0x69, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e,
+	0x64, 0x62, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x76, 0x35, 0x2e, 0x49, 0x6e, 0x69, 0x74,
+	0x69, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x44,
+	0x0a, 0x07, 0x4e, 0x65, 0x77, 0x55, 0x73, 0x65, 0x72, 0x12, 0x1b, 0x2e, 0x64, 0x62, 0x70, 0x6c,
+	0x75, 0x67, 0x69, 0x6e, 0x2e, 0x76, 0x35, 0x2e, 0x4e, 0x65, 0x77, 0x55, 0x73, 0x65, 0x72, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x64, 0x62, 0x70, 0x6c, 0x75, 0x67, 0x69,
+	0x6e, 0x2e, 0x76, 0x35, 0x2e, 0x4e, 0x65, 0x77, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4d, 0x0a, 0x0a, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73,
+	0x65, 0x72, 0x12, 0x1e, 0x2e, 0x64, 0x62, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x76, 0x35,
+	0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x64, 0x62, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x76, 0x35,
+	0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x12, 0x4d, 0x0a, 0x0a, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x55, 0x73, 0x65,
+	0x72, 0x12, 0x1e, 0x2e, 0x64, 0x62, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x76, 0x35, 0x2e,
+	0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x1a, 0x1f, 0x2e, 0x64, 0x62, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x76, 0x35, 0x2e,
+	0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x12, 0x35, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x12, 0x2e, 0x64, 0x62, 0x70,
+	0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x76, 0x35, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x19,
+	0x2e, 0x64, 0x62, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x76, 0x35, 0x2e, 0x54, 0x79, 0x70,
+	0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2f, 0x0a, 0x05, 0x43, 0x6c, 0x6f,
+	0x73, 0x65, 0x12, 0x12, 0x2e, 0x64, 0x62, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x76, 0x35,
+	0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x12, 0x2e, 0x64, 0x62, 0x70, 0x6c, 0x75, 0x67, 0x69,
+	0x6e, 0x2e, 0x76, 0x35, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x42, 0x3b, 0x5a, 0x39, 0x67, 0x69,
+	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
+	0x72, 0x70, 0x2f, 0x76, 0x61, 0x75, 0x6c, 0x74, 0x2f, 0x73, 0x64, 0x6b, 0x2f, 0x64, 0x61, 0x74,
+	0x61, 0x62, 0x61, 0x73, 0x65, 0x2f, 0x64, 0x62, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2f, 0x76,
+	0x35, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/sdk/database/dbplugin/v5/proto/database.proto b/sdk/database/dbplugin/v5/proto/database.proto
index d6f877b6a549f..b4959f709e1f9 100644
--- a/sdk/database/dbplugin/v5/proto/database.proto
+++ b/sdk/database/dbplugin/v5/proto/database.proto
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 syntax = "proto3";
 package dbplugin.v5;
 
@@ -32,7 +29,6 @@ message NewUserRequest {
     Statements rollback_statements = 5;
     int32 credential_type = 6;
     bytes public_key = 7;
-    string subject = 8;
 }
 
 message UsernameConfig {
diff --git a/sdk/database/dbplugin/v5/testing/test_helpers.go b/sdk/database/dbplugin/v5/testing/test_helpers.go
index 83e4af3089ce3..55a402c7fe3c8 100644
--- a/sdk/database/dbplugin/v5/testing/test_helpers.go
+++ b/sdk/database/dbplugin/v5/testing/test_helpers.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package dbtesting
 
 import (
diff --git a/sdk/database/helper/connutil/connutil.go b/sdk/database/helper/connutil/connutil.go
index 50582aa8196a9..1749b275a2608 100644
--- a/sdk/database/helper/connutil/connutil.go
+++ b/sdk/database/helper/connutil/connutil.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package connutil
 
 import (
diff --git a/sdk/database/helper/connutil/sql.go b/sdk/database/helper/connutil/sql.go
index d1af4808cb44f..6256ff1a4cf01 100644
--- a/sdk/database/helper/connutil/sql.go
+++ b/sdk/database/helper/connutil/sql.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package connutil
 
 import (
diff --git a/sdk/database/helper/connutil/sql_test.go b/sdk/database/helper/connutil/sql_test.go
index 9f29d4ae2c5ab..2ca11b7589860 100644
--- a/sdk/database/helper/connutil/sql_test.go
+++ b/sdk/database/helper/connutil/sql_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package connutil
 
 import (
diff --git a/sdk/database/helper/credsutil/credsutil.go b/sdk/database/helper/credsutil/credsutil.go
index 503999c868b3f..064552d1fa9fb 100644
--- a/sdk/database/helper/credsutil/credsutil.go
+++ b/sdk/database/helper/credsutil/credsutil.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package credsutil
 
 import (
diff --git a/sdk/database/helper/credsutil/credsutil_test.go b/sdk/database/helper/credsutil/credsutil_test.go
index 77e1a2862f3c2..e094719d07974 100644
--- a/sdk/database/helper/credsutil/credsutil_test.go
+++ b/sdk/database/helper/credsutil/credsutil_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package credsutil
 
 import (
diff --git a/sdk/database/helper/credsutil/sql.go b/sdk/database/helper/credsutil/sql.go
index 2c27adf37cc12..39fb467a79bf9 100644
--- a/sdk/database/helper/credsutil/sql.go
+++ b/sdk/database/helper/credsutil/sql.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package credsutil
 
 import (
diff --git a/sdk/database/helper/credsutil/usernames.go b/sdk/database/helper/credsutil/usernames.go
index 962208ac9a662..c1e3ccb5298ed 100644
--- a/sdk/database/helper/credsutil/usernames.go
+++ b/sdk/database/helper/credsutil/usernames.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package credsutil
 
 import (
diff --git a/sdk/database/helper/credsutil/usernames_test.go b/sdk/database/helper/credsutil/usernames_test.go
index a3e883491fc28..b1e79ce26d6ed 100644
--- a/sdk/database/helper/credsutil/usernames_test.go
+++ b/sdk/database/helper/credsutil/usernames_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package credsutil
 
 import (
diff --git a/sdk/database/helper/dbutil/dbutil.go b/sdk/database/helper/dbutil/dbutil.go
index efc7e01e13f02..19198bcfdddd7 100644
--- a/sdk/database/helper/dbutil/dbutil.go
+++ b/sdk/database/helper/dbutil/dbutil.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package dbutil
 
 import (
diff --git a/sdk/database/helper/dbutil/dbutil_test.go b/sdk/database/helper/dbutil/dbutil_test.go
index 797712b4d902a..64ca9924d390d 100644
--- a/sdk/database/helper/dbutil/dbutil_test.go
+++ b/sdk/database/helper/dbutil/dbutil_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package dbutil
 
 import (
diff --git a/sdk/framework/backend.go b/sdk/framework/backend.go
index c0527addf999d..73d8f14e60f88 100644
--- a/sdk/framework/backend.go
+++ b/sdk/framework/backend.go
@@ -1,13 +1,9 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package framework
 
 import (
 	"context"
 	"crypto/rand"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -101,7 +97,6 @@ type Backend struct {
 
 	logger  log.Logger
 	system  logical.SystemView
-	events  logical.EventSender
 	once    sync.Once
 	pathsRe []*regexp.Regexp
 }
@@ -133,10 +128,6 @@ type InitializeFunc func(context.Context, *logical.InitializationRequest) error
 // the input as defined by request handler prior to JSON marshaling
 type PatchPreprocessorFunc func(map[string]interface{}) (map[string]interface{}, error)
 
-// ErrNoEvents is returned when attempting to send an event, but when the event
-// sender was not passed in during `backend.Setup()`.
-var ErrNoEvents = errors.New("no event sender configured")
-
 // Initialize is the logical.Backend implementation.
 func (b *Backend) Initialize(ctx context.Context, req *logical.InitializationRequest) error {
 	if b.InitializeFunc != nil {
@@ -407,7 +398,6 @@ func (b *Backend) InvalidateKey(ctx context.Context, key string) {
 func (b *Backend) Setup(ctx context.Context, config *logical.BackendConfig) error {
 	b.logger = config.Logger
 	b.system = config.System
-	b.events = config.EventsSender
 	return nil
 }
 
@@ -549,18 +539,16 @@ func (b *Backend) handleRootHelp(req *logical.Request) (*logical.Response, error
 	// names in the OAS document.
 	requestResponsePrefix := req.GetString("requestResponsePrefix")
 
-	// Build OpenAPI response for the entire backend
-	vaultVersion := "unknown"
-	if b.System() != nil {
-		env, err := b.System().PluginEnv(context.Background())
-		if err != nil {
-			return nil, err
-		}
-		vaultVersion = env.VaultVersion
-	}
+	// Generic mount paths will primarily be used for code generation purposes.
+	// This will result in dynamic mount paths being placed instead of
+	// hardcoded default paths. For example /auth/approle/login would be replaced
+	// with /auth/{mountPath}/login. This will be replaced for all secrets
+	// engines and auth methods that are enabled.
+	genericMountPaths, _ := req.Get("genericMountPaths").(bool)
 
-	doc := NewOASDocument(vaultVersion)
-	if err := documentPaths(b, requestResponsePrefix, doc); err != nil {
+	// Build OpenAPI response for the entire backend
+	doc := NewOASDocument()
+	if err := documentPaths(b, requestResponsePrefix, genericMountPaths, doc); err != nil {
 		b.Logger().Warn("error generating OpenAPI", "error", err)
 	}
 
@@ -692,13 +680,6 @@ func (b *Backend) handleWALRollback(ctx context.Context, req *logical.Request) (
 	return logical.ErrorResponse(merr.Error()), nil
 }
 
-func (b *Backend) SendEvent(ctx context.Context, eventType logical.EventType, event *logical.EventData) error {
-	if b.events == nil {
-		return ErrNoEvents
-	}
-	return b.events.Send(ctx, eventType, event)
-}
-
 // FieldSchema is a basic schema to describe the format of a path field.
 type FieldSchema struct {
 	Type        FieldType
@@ -755,8 +736,6 @@ func (t FieldType) Zero() interface{} {
 		return ""
 	case TypeInt:
 		return 0
-	case TypeInt64:
-		return int64(0)
 	case TypeBool:
 		return false
 	case TypeMap:
diff --git a/sdk/framework/backend_test.go b/sdk/framework/backend_test.go
index 0b7a2054373d6..9a2b5941457af 100644
--- a/sdk/framework/backend_test.go
+++ b/sdk/framework/backend_test.go
@@ -1,11 +1,7 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package framework
 
 import (
 	"context"
-	"fmt"
 	"net/http"
 	"reflect"
 	"strings"
@@ -815,23 +811,3 @@ func TestInitializeBackend(t *testing.T) {
 		t.Fatal("backend should be open")
 	}
 }
-
-// TestFieldTypeMethods tries to ensure our switch-case statements for the
-// FieldType "enum" are complete.
-func TestFieldTypeMethods(t *testing.T) {
-	unknownFormat := convertType(TypeInvalid).format
-
-	for i := TypeInvalid + 1; i < typeInvalidMax; i++ {
-		t.Run(fmt.Sprintf("%d", i), func(t *testing.T) {
-			if i.String() == TypeInvalid.String() {
-				t.Errorf("unknown type string for %d", i)
-			}
-
-			if convertType(i).format == unknownFormat {
-				t.Errorf("unknown schema for %d", i)
-			}
-
-			_ = i.Zero()
-		})
-	}
-}
diff --git a/sdk/framework/field_data.go b/sdk/framework/field_data.go
index e5f69acdb81ad..99e3fb7ab8888 100644
--- a/sdk/framework/field_data.go
+++ b/sdk/framework/field_data.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package framework
 
 import (
@@ -28,7 +25,7 @@ type FieldData struct {
 	Schema map[string]*FieldSchema
 }
 
-// Validate cycles through raw data and validates conversions in
+// Validate cycles through raw data and validate conversions in
 // the schema, so we don't get an error/panic later when
 // trying to get data out.  Data not in the schema is not
 // an error at this point, so we don't worry about it.
@@ -56,40 +53,6 @@ func (d *FieldData) Validate() error {
 	return nil
 }
 
-// ValidateStrict cycles through raw data and validates conversions in the
-// schema. In addition to the checks done by Validate, this function ensures
-// that the raw data has all of the schema's required fields and does not
-// have any fields outside of the schema. It will return a non-nil error if:
-//
-//  1. a conversion (parsing of the field's value) fails
-//  2. a raw field does not exist in the schema (unless the schema is nil)
-//  3. a required schema field is missing from the raw data
-//
-// This function is currently used for validating response schemas in tests.
-func (d *FieldData) ValidateStrict() error {
-	// the schema is nil, nothing to validate
-	if d.Schema == nil {
-		return nil
-	}
-
-	for field := range d.Raw {
-		if _, _, err := d.GetOkErr(field); err != nil {
-			return fmt.Errorf("field %q: %w", field, err)
-		}
-	}
-
-	for field, schema := range d.Schema {
-		if !schema.Required {
-			continue
-		}
-		if _, ok := d.Raw[field]; !ok {
-			return fmt.Errorf("missing required field %q", field)
-		}
-	}
-
-	return nil
-}
-
 // Get gets the value for the given field. If the key is an invalid field,
 // FieldData will panic. If you want a safer version of this method, use
 // GetOk. If the field k is not set, the default value (if set) will be
diff --git a/sdk/framework/field_data_test.go b/sdk/framework/field_data_test.go
index 078c6fbcd5b8e..d7cbd976157ad 100644
--- a/sdk/framework/field_data_test.go
+++ b/sdk/framework/field_data_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package framework
 
 import (
@@ -1160,118 +1157,8 @@ func TestFieldDataGetFirst(t *testing.T) {
 		t.Fatal("should have gotten buzz for fizz")
 	}
 
-	_, ok = data.GetFirst("cats")
+	result, ok = data.GetFirst("cats")
 	if ok {
 		t.Fatal("shouldn't have gotten anything for cats")
 	}
 }
-
-func TestValidateStrict(t *testing.T) {
-	cases := map[string]struct {
-		Schema      map[string]*FieldSchema
-		Raw         map[string]interface{}
-		ExpectError bool
-	}{
-		"string type, string value": {
-			map[string]*FieldSchema{
-				"foo": {Type: TypeString},
-			},
-			map[string]interface{}{
-				"foo": "bar",
-			},
-			false,
-		},
-
-		"string type, int value": {
-			map[string]*FieldSchema{
-				"foo": {Type: TypeString},
-			},
-			map[string]interface{}{
-				"foo": 42,
-			},
-			false,
-		},
-
-		"string type, unset value": {
-			map[string]*FieldSchema{
-				"foo": {Type: TypeString},
-			},
-			map[string]interface{}{},
-			false,
-		},
-
-		"string type, unset required value": {
-			map[string]*FieldSchema{
-				"foo": {
-					Type:     TypeString,
-					Required: true,
-				},
-			},
-			map[string]interface{}{},
-			true,
-		},
-
-		"value not in schema": {
-			map[string]*FieldSchema{
-				"foo": {
-					Type:     TypeString,
-					Required: true,
-				},
-			},
-			map[string]interface{}{
-				"foo": 42,
-				"bar": 43,
-			},
-			true,
-		},
-
-		"value not in schema, empty schema": {
-			map[string]*FieldSchema{},
-			map[string]interface{}{
-				"foo": 42,
-				"bar": 43,
-			},
-			true,
-		},
-
-		"value not in schema, nil schema": {
-			nil,
-			map[string]interface{}{
-				"foo": 42,
-				"bar": 43,
-			},
-			false,
-		},
-
-		"type time, invalid value": {
-			map[string]*FieldSchema{
-				"foo": {Type: TypeTime},
-			},
-			map[string]interface{}{
-				"foo": "2021-13-11T09:08:07+02:00",
-			},
-			true,
-		},
-	}
-
-	for name, tc := range cases {
-		name, tc := name, tc
-		t.Run(name, func(t *testing.T) {
-			t.Parallel()
-
-			data := &FieldData{
-				Raw:    tc.Raw,
-				Schema: tc.Schema,
-			}
-
-			err := data.ValidateStrict()
-
-			if err == nil && tc.ExpectError == true {
-				t.Fatalf("expected an error, got nil")
-			}
-			if err != nil && tc.ExpectError == false {
-				t.Fatalf("unexpected error: %v", err)
-			}
-		})
-	}
-}
diff --git a/sdk/framework/field_type.go b/sdk/framework/field_type.go
index ee07b6afe8664..ef7f08191e1a3 100644
--- a/sdk/framework/field_type.go
+++ b/sdk/framework/field_type.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package framework
 
 // FieldType is the enum of types that a field can be.
@@ -61,15 +58,11 @@ const (
 	// TypeFloat parses both float32 and float64 values
 	TypeFloat
 
-	// TypeTime represents absolute time. It accepts an RFC3339-formatted
+	// TypeTime represents absolute time. It accepts an RFC3999-formatted
 	// string (with or without fractional seconds), or an epoch timestamp
 	// formatted as a string or a number. The resulting time.Time
 	// is converted to UTC.
 	TypeTime
-
-	// DO NOT USE. Any new values must be inserted before this value.
-	// Used to write tests that ensure type methods handle all possible values.
-	typeInvalidMax
 )
 
 func (t FieldType) String() string {
@@ -82,8 +75,6 @@ func (t FieldType) String() string {
 		return "name string"
 	case TypeInt:
 		return "int"
-	case TypeInt64:
-		return "int64"
 	case TypeBool:
 		return "bool"
 	case TypeMap:
diff --git a/sdk/framework/filter.go b/sdk/framework/filter.go
index b9b99799b9169..faaccba2a864c 100644
--- a/sdk/framework/filter.go
+++ b/sdk/framework/filter.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package framework
 
 import (
diff --git a/sdk/framework/identity.go b/sdk/framework/identity.go
index 157f3c193cf42..ebb2aa4dcc6c0 100644
--- a/sdk/framework/identity.go
+++ b/sdk/framework/identity.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package framework
 
 import (
diff --git a/sdk/framework/identity_test.go b/sdk/framework/identity_test.go
index 1667fb9606360..cb71eefdf9d89 100644
--- a/sdk/framework/identity_test.go
+++ b/sdk/framework/identity_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package framework
 
 import (
diff --git a/sdk/framework/lease.go b/sdk/framework/lease.go
index 24824ca52a24b..4d0240fbe7fd8 100644
--- a/sdk/framework/lease.go
+++ b/sdk/framework/lease.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package framework
 
 import (
diff --git a/sdk/framework/lease_test.go b/sdk/framework/lease_test.go
index 5d1f9f091bbc5..e145c2a82b78b 100644
--- a/sdk/framework/lease_test.go
+++ b/sdk/framework/lease_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package framework
 
 import (
diff --git a/sdk/framework/openapi.go b/sdk/framework/openapi.go
index 663386a179d64..4d36fefbaee63 100644
--- a/sdk/framework/openapi.go
+++ b/sdk/framework/openapi.go
@@ -13,22 +13,21 @@ import (
 	log "github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/vault/sdk/helper/wrapping"
 	"github.com/hashicorp/vault/sdk/logical"
+	"github.com/hashicorp/vault/sdk/version"
 	"github.com/mitchellh/mapstructure"
-	"golang.org/x/text/cases"
-	"golang.org/x/text/language"
 )
 
 // OpenAPI specification (OAS): https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md
 const OASVersion = "3.0.2"
 
 // NewOASDocument returns an empty OpenAPI document.
-func NewOASDocument(version string) *OASDocument {
+func NewOASDocument() *OASDocument {
 	return &OASDocument{
 		Version: OASVersion,
 		Info: OASInfo{
 			Title:       "HashiCorp Vault API",
 			Description: "HTTP API that gives you full access to Vault. All API routes are prefixed with `/v1/`.",
-			Version:     version,
+			Version:     version.GetVersion().Version,
 			License: OASLicense{
 				Name: "Mozilla Public License 2.0",
 				URL:  "https://www.mozilla.org/en-US/MPL/2.0",
@@ -149,7 +148,6 @@ type OASParameter struct {
 
 type OASRequestBody struct {
 	Description string     `json:"description,omitempty"`
-	Required    bool       `json:"required,omitempty"`
 	Content     OASContent `json:"content,omitempty"`
 }
 
@@ -206,9 +204,9 @@ var (
 )
 
 // documentPaths parses all paths in a framework.Backend into OpenAPI paths.
-func documentPaths(backend *Backend, requestResponsePrefix string, doc *OASDocument) error {
+func documentPaths(backend *Backend, requestResponsePrefix string, genericMountPaths bool, doc *OASDocument) error {
 	for _, p := range backend.Paths {
-		if err := documentPath(p, backend.SpecialPaths(), requestResponsePrefix, backend.BackendType, doc); err != nil {
+		if err := documentPath(p, backend.SpecialPaths(), requestResponsePrefix, genericMountPaths, backend.BackendType, doc); err != nil {
 			return err
 		}
 	}
@@ -217,7 +215,7 @@ func documentPaths(backend *Backend, requestResponsePrefix string, doc *OASDocum
 }
 
 // documentPath parses a framework.Path into one or more OpenAPI paths.
-func documentPath(p *Path, specialPaths *logical.Paths, requestResponsePrefix string, backendType logical.BackendType, doc *OASDocument) error {
+func documentPath(p *Path, specialPaths *logical.Paths, requestResponsePrefix string, genericMountPaths bool, backendType logical.BackendType, doc *OASDocument) error {
 	var sudoPaths []string
 	var unauthPaths []string
 
@@ -244,7 +242,7 @@ func documentPath(p *Path, specialPaths *logical.Paths, requestResponsePrefix st
 		}
 	}
 
-	for pathIndex, path := range paths {
+	for _, path := range paths {
 		// Construct a top level PathItem which will be populated as the path is processed.
 		pi := OASPathItem{
 			Description: cleanString(p.HelpSynopsis),
@@ -252,7 +250,7 @@ func documentPath(p *Path, specialPaths *logical.Paths, requestResponsePrefix st
 
 		pi.Sudo = specialPathMatch(path, sudoPaths)
 		pi.Unauthenticated = specialPathMatch(path, unauthPaths)
-		pi.DisplayAttrs = withoutOperationHints(p.DisplayAttrs)
+		pi.DisplayAttrs = p.DisplayAttrs
 
 		// If the newer style Operations map isn't defined, create one from the legacy fields.
 		operations := p.Operations
@@ -271,6 +269,21 @@ func documentPath(p *Path, specialPaths *logical.Paths, requestResponsePrefix st
 		// Body fields will be added to individual operations.
 		pathFields, bodyFields := splitFields(p.Fields, path)
 
+		if genericMountPaths && requestResponsePrefix != "system" && requestResponsePrefix != "identity" {
+			// Add mount path as a parameter
+			p := OASParameter{
+				Name:        "mountPath",
+				Description: "Path that the backend was mounted at",
+				In:          "path",
+				Schema: &OASSchema{
+					Type: "string",
+				},
+				Required: true,
+			}
+
+			pi.Parameters = append(pi.Parameters, p)
+		}
+
 		for name, field := range pathFields {
 			location := "path"
 			required := true
@@ -294,7 +307,7 @@ func documentPath(p *Path, specialPaths *logical.Paths, requestResponsePrefix st
 					Pattern:      t.pattern,
 					Enum:         field.AllowedValues,
 					Default:      field.Default,
-					DisplayAttrs: withoutOperationHints(field.DisplayAttrs),
+					DisplayAttrs: field.DisplayAttrs,
 				},
 				Required:   required,
 				Deprecated: field.Deprecated,
@@ -331,19 +344,9 @@ func documentPath(p *Path, specialPaths *logical.Paths, requestResponsePrefix st
 
 			op := NewOASOperation()
 
-			operationID := constructOperationID(
-				path,
-				pathIndex,
-				p.DisplayAttrs,
-				opType,
-				props.DisplayAttrs,
-				requestResponsePrefix,
-			)
-
 			op.Summary = props.Summary
 			op.Description = props.Description
 			op.Deprecated = props.Deprecated
-			op.OperationID = operationID
 
 			// Add any fields not present in the path as body parameters for POST.
 			if opType == logical.CreateOperation || opType == logical.UpdateOperation {
@@ -373,7 +376,7 @@ func documentPath(p *Path, specialPaths *logical.Paths, requestResponsePrefix st
 						Enum:         field.AllowedValues,
 						Default:      field.Default,
 						Deprecated:   field.Deprecated,
-						DisplayAttrs: withoutOperationHints(field.DisplayAttrs),
+						DisplayAttrs: field.DisplayAttrs,
 					}
 					if openapiField.baseType == "array" {
 						p.Items = &OASSchema{
@@ -395,10 +398,9 @@ func documentPath(p *Path, specialPaths *logical.Paths, requestResponsePrefix st
 
 				// Set the final request body. Only JSON request data is supported.
 				if len(s.Properties) > 0 || s.Example != nil {
-					requestName := hyphenatedToTitleCase(operationID) + "Request"
+					requestName := constructRequestName(requestResponsePrefix, path)
 					doc.Components.Schemas[requestName] = s
 					op.RequestBody = &OASRequestBody{
-						Required: true,
 						Content: OASContent{
 							"application/json": &OASMediaTypeObject{
 								Schema: &OASSchema{Ref: fmt.Sprintf("#/components/schemas/%s", requestName)},
@@ -475,41 +477,6 @@ func documentPath(p *Path, specialPaths *logical.Paths, requestResponsePrefix st
 							}
 						}
 					}
-
-					responseSchema := &OASSchema{
-						Type:       "object",
-						Properties: make(map[string]*OASSchema),
-					}
-
-					for name, field := range resp.Fields {
-						openapiField := convertType(field.Type)
-						p := OASSchema{
-							Type:         openapiField.baseType,
-							Description:  cleanString(field.Description),
-							Format:       openapiField.format,
-							Pattern:      openapiField.pattern,
-							Enum:         field.AllowedValues,
-							Default:      field.Default,
-							Deprecated:   field.Deprecated,
-							DisplayAttrs: withoutOperationHints(field.DisplayAttrs),
-						}
-						if openapiField.baseType == "array" {
-							p.Items = &OASSchema{
-								Type: openapiField.items,
-							}
-						}
-						responseSchema.Properties[name] = &p
-					}
-
-					if len(resp.Fields) != 0 {
-						responseName := hyphenatedToTitleCase(operationID) + "Response"
-						doc.Components.Schemas[responseName] = responseSchema
-						content = OASContent{
-							"application/json": &OASMediaTypeObject{
-								Schema: &OASSchema{Ref: fmt.Sprintf("#/components/schemas/%s", responseName)},
-							},
-						}
-					}
 				}
 
 				op.Responses[code] = &OASResponse{
@@ -534,6 +501,30 @@ func documentPath(p *Path, specialPaths *logical.Paths, requestResponsePrefix st
 	return nil
 }
 
+// constructRequestName joins the given prefix with the path elements into a
+// CamelCaseRequest string.
+//
+// For example, prefix="kv" & path=/config/lease/{name} => KvConfigLeaseRequest
+func constructRequestName(requestResponsePrefix string, path string) string {
+	var b strings.Builder
+
+	b.WriteString(strings.Title(requestResponsePrefix))
+
+	// split the path by / _ - separators
+	for _, token := range strings.FieldsFunc(path, func(r rune) bool {
+		return r == '/' || r == '_' || r == '-'
+	}) {
+		// exclude request fields
+		if !strings.ContainsAny(token, "{}") {
+			b.WriteString(strings.Title(token))
+		}
+	}
+
+	b.WriteString("Request")
+
+	return b.String()
+}
+
 // specialPathMatch checks whether the given path matches one of the special
 // paths, taking into account * and + wildcards (e.g. foo/+/bar/*)
 func specialPathMatch(path string, specialPaths []string) bool {
@@ -586,117 +577,6 @@ func specialPathMatch(path string, specialPaths []string) bool {
 	return false
 }
 
-// constructOperationID joins the given inputs into a hyphen-separated
-// lower-case operation id, which is also used as a prefix for request and
-// response names.
-//
-// The OperationPrefix / -Verb / -Suffix found in display attributes will be
-// used, if provided. Otherwise, the function falls back to using the path and
-// the operation.
-//
-// Examples of generated operation identifiers:
-//   - kvv2-write
-//   - kvv2-read
-//   - google-cloud-login
-//   - google-cloud-write-role
-func constructOperationID(
-	path string,
-	pathIndex int,
-	pathAttributes *DisplayAttributes,
-	operation logical.Operation,
-	operationAttributes *DisplayAttributes,
-	defaultPrefix string,
-) string {
-	var (
-		prefix string
-		verb   string
-		suffix string
-	)
-
-	if operationAttributes != nil {
-		prefix = operationAttributes.OperationPrefix
-		verb = operationAttributes.OperationVerb
-		suffix = operationAttributes.OperationSuffix
-	}
-
-	if pathAttributes != nil {
-		if prefix == "" {
-			prefix = pathAttributes.OperationPrefix
-		}
-		if verb == "" {
-			verb = pathAttributes.OperationVerb
-		}
-		if suffix == "" {
-			suffix = pathAttributes.OperationSuffix
-		}
-	}
-
-	// A single suffix string can contain multiple pipe-delimited strings. To
-	// determine the actual suffix, we attempt to match it by the index of the
-	// paths returned from `expandPattern(...)`. For example:
-	//
-	//  pki/
-	//  	Pattern: "keys/generate/(internal|exported|kms)",
-	//      DisplayAttrs: {
-	//          ...
-	//          OperationSuffix: "internal-key|exported-key|kms-key",
-	//      },
-	//
-	//  will expand into three paths and corresponding suffixes:
-	//
-	//      path 0: "keys/generate/internal"  suffix: internal-key
-	//      path 1: "keys/generate/exported"  suffix: exported-key
-	//      path 2: "keys/generate/kms"       suffix: kms-key
-	//
-	pathIndexOutOfRange := false
-
-	if suffixes := strings.Split(suffix, "|"); len(suffixes) > 1 || pathIndex > 0 {
-		// if the index is out of bounds, fall back to the old logic
-		if pathIndex >= len(suffixes) {
-			suffix = ""
-			pathIndexOutOfRange = true
-		} else {
-			suffix = suffixes[pathIndex]
-		}
-	}
-
-	// a helper that hyphenates & lower-cases the slice except the empty elements
-	toLowerHyphenate := func(parts []string) string {
-		filtered := make([]string, 0, len(parts))
-		for _, e := range parts {
-			if e != "" {
-				filtered = append(filtered, e)
-			}
-		}
-		return strings.ToLower(strings.Join(filtered, "-"))
-	}
-
-	// fall back to using the path + operation to construct the operation id
-	var (
-		needPrefix = prefix == "" && verb == ""
-		needVerb   = verb == ""
-		needSuffix = suffix == "" && (verb == "" || pathIndexOutOfRange)
-	)
-
-	if needPrefix {
-		prefix = defaultPrefix
-	}
-
-	if needVerb {
-		if operation == logical.UpdateOperation {
-			verb = "write"
-		} else {
-			verb = string(operation)
-		}
-	}
-
-	if needSuffix {
-		suffix = toLowerHyphenate(nonWordRe.Split(path, -1))
-	}
-
-	return toLowerHyphenate([]string{prefix, verb, suffix})
-}
-
 // expandPattern expands a regex pattern by generating permutations of any optional parameters
 // and changing named parameters into their {openapi} equivalents.
 func expandPattern(pattern string) ([]string, error) {
@@ -988,40 +868,6 @@ func splitFields(allFields map[string]*FieldSchema, pattern string) (pathFields,
 	return pathFields, bodyFields
 }
 
-// withoutOperationHints returns a copy of the given DisplayAttributes without
-// OperationPrefix / OperationVerb / OperationSuffix since we don't need these
-// fields in the final output.
-func withoutOperationHints(in *DisplayAttributes) *DisplayAttributes {
-	if in == nil {
-		return nil
-	}
-
-	copy := *in
-
-	copy.OperationPrefix = ""
-	copy.OperationVerb = ""
-	copy.OperationSuffix = ""
-
-	// return nil if all fields are empty to avoid empty JSON objects
-	if copy == (DisplayAttributes{}) {
-		return nil
-	}
-
-	return &copy
-}
-
-func hyphenatedToTitleCase(in string) string {
-	var b strings.Builder
-
-	title := cases.Title(language.English, cases.NoLower)
-
-	for _, word := range strings.Split(in, "-") {
-		b.WriteString(title.String(word))
-	}
-
-	return b.String()
-}
-
 // cleanedResponse is identical to logical.Response but with nulls
 // removed from from JSON encoding
 type cleanedResponse struct {
@@ -1056,9 +902,6 @@ func cleanResponse(resp *logical.Response) *cleanedResponse {
 //	postSysToolsRandomUrlbytes_2
 //
 // An optional user-provided suffix ("context") may also be appended.
-//
-// Deprecated: operationID's are now populated using `constructOperationID`.
-// This function is here for backwards compatibility with older plugins.
 func (d *OASDocument) CreateOperationIDs(context string) {
 	opIDCount := make(map[string]int)
 	var paths []string
@@ -1086,13 +929,6 @@ func (d *OASDocument) CreateOperationIDs(context string) {
 				continue
 			}
 
-			if oasOperation.OperationID != "" {
-				continue
-			}
-
-			// Discard "_mount_path" from any {thing_mount_path} parameters
-			path = strings.Replace(path, "_mount_path", "", 1)
-
 			// Space-split on non-words, title case everything, recombine
 			opID := nonWordRe.ReplaceAllString(strings.ToLower(path), " ")
 			opID = strings.Title(opID)
diff --git a/sdk/framework/openapi_test.go b/sdk/framework/openapi_test.go
index 9e2763f1241e0..5f1bd46130060 100644
--- a/sdk/framework/openapi_test.go
+++ b/sdk/framework/openapi_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package framework
 
 import (
@@ -18,6 +15,7 @@ import (
 	"github.com/hashicorp/vault/sdk/helper/jsonutil"
 	"github.com/hashicorp/vault/sdk/helper/wrapping"
 	"github.com/hashicorp/vault/sdk/logical"
+	"github.com/hashicorp/vault/sdk/version"
 )
 
 func TestOpenAPI_Regex(t *testing.T) {
@@ -320,7 +318,7 @@ func TestOpenAPI_SpecialPaths(t *testing.T) {
 	}
 	for name, test := range tests {
 		t.Run(name, func(t *testing.T) {
-			doc := NewOASDocument("version")
+			doc := NewOASDocument()
 			path := Path{
 				Pattern: test.pattern,
 			}
@@ -329,7 +327,7 @@ func TestOpenAPI_SpecialPaths(t *testing.T) {
 				Unauthenticated: test.unauthenticatedPaths,
 			}
 
-			if err := documentPath(&path, specialPaths, "kv", logical.TypeLogical, doc); err != nil {
+			if err := documentPath(&path, specialPaths, "kv", false, logical.TypeLogical, doc); err != nil {
 				t.Fatal(err)
 			}
 
@@ -537,16 +535,6 @@ func TestOpenAPI_Paths(t *testing.T) {
 									"amount": 42,
 								},
 							},
-							Fields: map[string]*FieldSchema{
-								"field_a": {
-									Type:        TypeString,
-									Description: "field_a description",
-								},
-								"field_b": {
-									Type:        TypeBool,
-									Description: "field_b description",
-								},
-							},
 						}},
 					},
 				},
@@ -564,6 +552,66 @@ func TestOpenAPI_Paths(t *testing.T) {
 	})
 }
 
+func TestOpenAPI_OperationID(t *testing.T) {
+	path1 := &Path{
+		Pattern: "foo/" + GenericNameRegex("id"),
+		Fields: map[string]*FieldSchema{
+			"id": {Type: TypeString},
+		},
+		Operations: map[logical.Operation]OperationHandler{
+			logical.ReadOperation:   &PathOperation{},
+			logical.UpdateOperation: &PathOperation{},
+			logical.DeleteOperation: &PathOperation{},
+		},
+	}
+
+	path2 := &Path{
+		Pattern: "Foo/" + GenericNameRegex("id"),
+		Fields: map[string]*FieldSchema{
+			"id": {Type: TypeString},
+		},
+		Operations: map[logical.Operation]OperationHandler{
+			logical.ReadOperation: &PathOperation{},
+		},
+	}
+
+	for _, context := range []string{"", "bar"} {
+		doc := NewOASDocument()
+		err := documentPath(path1, nil, "kv", false, logical.TypeLogical, doc)
+		if err != nil {
+			t.Fatal(err)
+		}
+		err = documentPath(path2, nil, "kv", false, logical.TypeLogical, doc)
+		if err != nil {
+			t.Fatal(err)
+		}
+		doc.CreateOperationIDs(context)
+
+		tests := []struct {
+			path string
+			op   string
+			opID string
+		}{
+			{"/Foo/{id}", "get", "getFooId"},
+			{"/foo/{id}", "get", "getFooId_2"},
+			{"/foo/{id}", "post", "postFooId"},
+			{"/foo/{id}", "delete", "deleteFooId"},
+		}
+
+		for _, test := range tests {
+			actual := getPathOp(doc.Paths[test.path], test.op).OperationID
+			expected := test.opID
+			if context != "" {
+				expected += "_" + context
+			}
+
+			if actual != expected {
+				t.Fatalf("expected %v, got %v", expected, actual)
+			}
+		}
+	}
+}
+
 func TestOpenAPI_CustomDecoder(t *testing.T) {
 	p := &Path{
 		Pattern:      "foo",
@@ -592,8 +640,8 @@ func TestOpenAPI_CustomDecoder(t *testing.T) {
 		},
 	}
 
-	docOrig := NewOASDocument("version")
-	err := documentPath(p, nil, "kv", logical.TypeLogical, docOrig)
+	docOrig := NewOASDocument()
+	err := documentPath(p, nil, "kv", false, logical.TypeLogical, docOrig)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -652,221 +700,11 @@ func TestOpenAPI_CleanResponse(t *testing.T) {
 	}
 }
 
-func TestOpenAPI_constructOperationID(t *testing.T) {
-	tests := map[string]struct {
-		path                string
-		pathIndex           int
-		pathAttributes      *DisplayAttributes
-		operation           logical.Operation
-		operationAttributes *DisplayAttributes
-		defaultPrefix       string
-		expected            string
-	}{
-		"empty": {
-			path:                "",
-			pathIndex:           0,
-			pathAttributes:      nil,
-			operation:           logical.Operation(""),
-			operationAttributes: nil,
-			defaultPrefix:       "",
-			expected:            "",
-		},
-		"simple-read": {
-			path:                "path/to/thing",
-			pathIndex:           0,
-			pathAttributes:      nil,
-			operation:           logical.ReadOperation,
-			operationAttributes: nil,
-			defaultPrefix:       "test",
-			expected:            "test-read-path-to-thing",
-		},
-		"simple-write": {
-			path:                "path/to/thing",
-			pathIndex:           0,
-			pathAttributes:      nil,
-			operation:           logical.UpdateOperation,
-			operationAttributes: nil,
-			defaultPrefix:       "test",
-			expected:            "test-write-path-to-thing",
-		},
-		"operation-verb": {
-			path:                "path/to/thing",
-			pathIndex:           0,
-			pathAttributes:      &DisplayAttributes{OperationVerb: "do-something"},
-			operation:           logical.UpdateOperation,
-			operationAttributes: nil,
-			defaultPrefix:       "test",
-			expected:            "do-something",
-		},
-		"operation-verb-override": {
-			path:                "path/to/thing",
-			pathIndex:           0,
-			pathAttributes:      &DisplayAttributes{OperationVerb: "do-something"},
-			operation:           logical.UpdateOperation,
-			operationAttributes: &DisplayAttributes{OperationVerb: "do-something-else"},
-			defaultPrefix:       "test",
-			expected:            "do-something-else",
-		},
-		"operation-prefix": {
-			path:                "path/to/thing",
-			pathIndex:           0,
-			pathAttributes:      &DisplayAttributes{OperationPrefix: "my-prefix"},
-			operation:           logical.UpdateOperation,
-			operationAttributes: nil,
-			defaultPrefix:       "test",
-			expected:            "my-prefix-write-path-to-thing",
-		},
-		"operation-prefix-override": {
-			path:                "path/to/thing",
-			pathIndex:           0,
-			pathAttributes:      &DisplayAttributes{OperationPrefix: "my-prefix"},
-			operation:           logical.UpdateOperation,
-			operationAttributes: &DisplayAttributes{OperationPrefix: "better-prefix"},
-			defaultPrefix:       "test",
-			expected:            "better-prefix-write-path-to-thing",
-		},
-		"operation-prefix-and-suffix": {
-			path:                "path/to/thing",
-			pathIndex:           0,
-			pathAttributes:      &DisplayAttributes{OperationPrefix: "my-prefix", OperationSuffix: "my-suffix"},
-			operation:           logical.UpdateOperation,
-			operationAttributes: nil,
-			defaultPrefix:       "test",
-			expected:            "my-prefix-write-my-suffix",
-		},
-		"operation-prefix-and-suffix-override": {
-			path:                "path/to/thing",
-			pathIndex:           0,
-			pathAttributes:      &DisplayAttributes{OperationPrefix: "my-prefix", OperationSuffix: "my-suffix"},
-			operation:           logical.UpdateOperation,
-			operationAttributes: &DisplayAttributes{OperationPrefix: "better-prefix", OperationSuffix: "better-suffix"},
-			defaultPrefix:       "test",
-			expected:            "better-prefix-write-better-suffix",
-		},
-		"operation-prefix-verb-suffix": {
-			path:                "path/to/thing",
-			pathIndex:           0,
-			pathAttributes:      &DisplayAttributes{OperationPrefix: "my-prefix", OperationSuffix: "my-suffix", OperationVerb: "Create"},
-			operation:           logical.UpdateOperation,
-			operationAttributes: &DisplayAttributes{OperationPrefix: "better-prefix", OperationSuffix: "better-suffix"},
-			defaultPrefix:       "test",
-			expected:            "better-prefix-create-better-suffix",
-		},
-		"operation-prefix-verb-suffix-override": {
-			path:                "path/to/thing",
-			pathIndex:           0,
-			pathAttributes:      &DisplayAttributes{OperationPrefix: "my-prefix", OperationSuffix: "my-suffix", OperationVerb: "Create"},
-			operation:           logical.UpdateOperation,
-			operationAttributes: &DisplayAttributes{OperationPrefix: "better-prefix", OperationSuffix: "better-suffix", OperationVerb: "Login"},
-			defaultPrefix:       "test",
-			expected:            "better-prefix-login-better-suffix",
-		},
-		"operation-prefix-verb": {
-			path:                "path/to/thing",
-			pathIndex:           0,
-			pathAttributes:      nil,
-			operation:           logical.UpdateOperation,
-			operationAttributes: &DisplayAttributes{OperationPrefix: "better-prefix", OperationVerb: "Login"},
-			defaultPrefix:       "test",
-			expected:            "better-prefix-login",
-		},
-		"operation-verb-suffix": {
-			path:                "path/to/thing",
-			pathIndex:           0,
-			pathAttributes:      nil,
-			operation:           logical.UpdateOperation,
-			operationAttributes: &DisplayAttributes{OperationVerb: "Login", OperationSuffix: "better-suffix"},
-			defaultPrefix:       "test",
-			expected:            "login-better-suffix",
-		},
-		"pipe-delimited-suffix-0": {
-			path:                "path/to/thing",
-			pathIndex:           0,
-			pathAttributes:      nil,
-			operation:           logical.UpdateOperation,
-			operationAttributes: &DisplayAttributes{OperationPrefix: "better-prefix", OperationSuffix: "suffix0|suffix1"},
-			defaultPrefix:       "test",
-			expected:            "better-prefix-write-suffix0",
-		},
-		"pipe-delimited-suffix-1": {
-			path:                "path/to/thing",
-			pathIndex:           1,
-			pathAttributes:      nil,
-			operation:           logical.UpdateOperation,
-			operationAttributes: &DisplayAttributes{OperationPrefix: "better-prefix", OperationSuffix: "suffix0|suffix1"},
-			defaultPrefix:       "test",
-			expected:            "better-prefix-write-suffix1",
-		},
-		"pipe-delimited-suffix-2-fallback": {
-			path:                "path/to/thing",
-			pathIndex:           2,
-			pathAttributes:      nil,
-			operation:           logical.UpdateOperation,
-			operationAttributes: &DisplayAttributes{OperationPrefix: "better-prefix", OperationSuffix: "suffix0|suffix1"},
-			defaultPrefix:       "test",
-			expected:            "better-prefix-write-path-to-thing",
-		},
-	}
-
-	for name, test := range tests {
-		name, test := name, test
-		t.Run(name, func(t *testing.T) {
-			t.Parallel()
-			actual := constructOperationID(
-				test.path,
-				test.pathIndex,
-				test.pathAttributes,
-				test.operation,
-				test.operationAttributes,
-				test.defaultPrefix,
-			)
-			if actual != test.expected {
-				t.Fatalf("expected: %s; got: %s", test.expected, actual)
-			}
-		})
-	}
-}
-
-func TestOpenAPI_hyphenatedToTitleCase(t *testing.T) {
-	tests := map[string]struct {
-		in       string
-		expected string
-	}{
-		"simple": {
-			in:       "test",
-			expected: "Test",
-		},
-		"two-words": {
-			in:       "two-words",
-			expected: "TwoWords",
-		},
-		"three-words": {
-			in:       "one-two-three",
-			expected: "OneTwoThree",
-		},
-		"not-hyphenated": {
-			in:       "something_like_this",
-			expected: "Something_like_this",
-		},
-	}
-
-	for name, test := range tests {
-		name, test := name, test
-		t.Run(name, func(t *testing.T) {
-			t.Parallel()
-			actual := hyphenatedToTitleCase(test.in)
-			if actual != test.expected {
-				t.Fatalf("expected: %s; got: %s", test.expected, actual)
-			}
-		})
-	}
-}
-
 func testPath(t *testing.T, path *Path, sp *logical.Paths, expectedJSON string) {
 	t.Helper()
 
-	doc := NewOASDocument("dummyversion")
-	if err := documentPath(path, sp, "kv", logical.TypeLogical, doc); err != nil {
+	doc := NewOASDocument()
+	if err := documentPath(path, sp, "kv", false, logical.TypeLogical, doc); err != nil {
 		t.Fatal(err)
 	}
 	doc.CreateOperationIDs("")
@@ -911,7 +749,7 @@ func expected(name string) string {
 		panic(err)
 	}
 
-	content := strings.Replace(string(data), "<vault_version>", "dummyversion", 1)
+	content := strings.Replace(string(data), "<vault_version>", version.GetVersion().Version, 1)
 
 	return content
 }
diff --git a/sdk/framework/path.go b/sdk/framework/path.go
index e96ba4c41bb29..8a8b1c75879d4 100644
--- a/sdk/framework/path.go
+++ b/sdk/framework/path.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package framework
 
 import (
@@ -59,24 +56,12 @@ type Path struct {
 	Pattern string
 
 	// Fields is the mapping of data fields to a schema describing that
-	// field.
-	//
-	// Field values are obtained from:
-	//
-	// - Named captures in the Pattern.
-	//
-	// - Parameters in the HTTP request body, for HTTP methods where a
-	//   request body is expected, i.e. PUT/POST/PATCH. The request body is
-	//   typically formatted as JSON, though
-	//   "application/x-www-form-urlencoded" format can also be accepted.
-	//
-	// - Parameters in the HTTP URL query-string, for HTTP methods where
-	//   there is no request body, i.e. GET/LIST/DELETE. The query-string
-	//   is *not* parsed at all for PUT/POST/PATCH requests.
+	// field. Named captures in the Pattern also map to fields. If a named
+	// capture name matches a PUT body name, the named capture takes
+	// priority.
 	//
-	// Should the same field be specified both as a named capture and as
-	// a parameter, the named capture takes precedence, and a warning is
-	// returned.
+	// Note that only named capture fields are available in every operation,
+	// whereas all fields are available in the Write operation.
 	Fields map[string]*FieldSchema
 
 	// Operations is the set of operations supported and the associated OperationsHandler.
@@ -207,11 +192,6 @@ type DisplayAttributes struct {
 	// Name is the name of the field suitable as a label or documentation heading.
 	Name string `json:"name,omitempty"`
 
-	// Description of the field that renders as tooltip help text beside the label (name) in the UI.
-	// This may be used to replace descriptions that reference comma separation but correspond
-	// to UI inputs where only arrays are valid. For example params with Type: framework.TypeCommaStringSlice
-	Description string `json:"description,omitempty"`
-
 	// Value is a sample value to display for this field. This may be used
 	// to indicate a default value, but it is for display only and completely separate
 	// from any Default member handling.
@@ -232,28 +212,6 @@ type DisplayAttributes struct {
 	// Action is the verb to use for the operation.
 	Action string `json:"action,omitempty"`
 
-	// OperationPrefix is a hyphenated lower-case string used to construct
-	// OpenAPI OperationID (prefix + verb + suffix). OperationPrefix is
-	// typically a human-readable name of the plugin or a prefix shared by
-	// multiple related endpoints.
-	OperationPrefix string `json:"operationPrefix,omitempty"`
-
-	// OperationVerb is a hyphenated lower-case string used to construct
-	// OpenAPI OperationID (prefix + verb + suffix). OperationVerb is typically
-	// an action to be performed (e.g. "generate", "sign", "login", etc.). If
-	// not specified, the verb defaults to `logical.Operation.String()`
-	// (e.g. "read", "list", "delete", "write" for Create/Update)
-	OperationVerb string `json:"operationVerb,omitempty"`
-
-	// OperationSuffix is a hyphenated lower-case string used to construct
-	// OpenAPI OperationID (prefix + verb + suffix). It is typically the name
-	// of the resource on which the action is performed (e.g. "role",
-	// "credentials", etc.). A pipe (|) separator can be used to list different
-	// suffixes for various permutations of the `Path.Pattern` regular
-	// expression. If not specified, the suffix defaults to the `Path.Pattern`
-	// split by dashes.
-	OperationSuffix string `json:"operationSuffix,omitempty"`
-
 	// EditType is the optional type of form field needed for a property
 	// This is only necessary for a "textarea" or "file"
 	EditType string `json:"editType,omitempty"`
@@ -271,10 +229,9 @@ type RequestExample struct {
 
 // Response describes and optional demonstrations an operation response.
 type Response struct {
-	Description string                  // summary of the the response and should always be provided
-	MediaType   string                  // media type of the response, defaulting to "application/json" if empty
-	Fields      map[string]*FieldSchema // the fields present in this response, used to generate openapi response
-	Example     *logical.Response       // example response data
+	Description string            // summary of the the response and should always be provided
+	MediaType   string            // media type of the response, defaulting to "application/json" if empty
+	Example     *logical.Response // example response data
 }
 
 // PathOperation is a concrete implementation of OperationHandler.
@@ -288,7 +245,6 @@ type PathOperation struct {
 	Deprecated                  bool
 	ForwardPerformanceSecondary bool
 	ForwardPerformanceStandby   bool
-	DisplayAttrs                *DisplayAttributes
 }
 
 func (p *PathOperation) Handler() OperationFunc {
@@ -305,7 +261,6 @@ func (p *PathOperation) Properties() OperationProperties {
 		Deprecated:                  p.Deprecated,
 		ForwardPerformanceSecondary: p.ForwardPerformanceSecondary,
 		ForwardPerformanceStandby:   p.ForwardPerformanceStandby,
-		DisplayAttrs:                p.DisplayAttrs,
 	}
 }
 
@@ -361,20 +316,8 @@ func (p *Path) helpCallback(b *Backend) OperationFunc {
 		}
 
 		// Build OpenAPI response for this path
-		vaultVersion := "unknown"
-		if b.System() != nil {
-			// b.System() should always be non-nil, except tests might create a
-			// Backend without one.
-			env, err := b.System().PluginEnv(context.Background())
-			if err != nil {
-				return nil, err
-			}
-			if env != nil {
-				vaultVersion = env.VaultVersion
-			}
-		}
-		doc := NewOASDocument(vaultVersion)
-		if err := documentPath(p, b.SpecialPaths(), requestResponsePrefix, b.BackendType, doc); err != nil {
+		doc := NewOASDocument()
+		if err := documentPath(p, b.SpecialPaths(), requestResponsePrefix, false, b.BackendType, doc); err != nil {
 			b.Logger().Warn("error generating OpenAPI", "error", err)
 		}
 
diff --git a/sdk/framework/path_map.go b/sdk/framework/path_map.go
index 46cf4720e96e0..0cba8ea2fb16c 100644
--- a/sdk/framework/path_map.go
+++ b/sdk/framework/path_map.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package framework
 
 import (
diff --git a/sdk/framework/path_map_test.go b/sdk/framework/path_map_test.go
index 3fe6308cbcd24..11e1f37c9d54c 100644
--- a/sdk/framework/path_map_test.go
+++ b/sdk/framework/path_map_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package framework
 
 import (
diff --git a/sdk/framework/path_struct.go b/sdk/framework/path_struct.go
index cba855065ea20..2a2848e585084 100644
--- a/sdk/framework/path_struct.go
+++ b/sdk/framework/path_struct.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package framework
 
 import (
diff --git a/sdk/framework/path_struct_test.go b/sdk/framework/path_struct_test.go
index 88662af5300da..9e81cc2e301c3 100644
--- a/sdk/framework/path_struct_test.go
+++ b/sdk/framework/path_struct_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package framework
 
 import (
diff --git a/sdk/framework/path_test.go b/sdk/framework/path_test.go
index 4541930ed591a..ca359d1f57763 100644
--- a/sdk/framework/path_test.go
+++ b/sdk/framework/path_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package framework
 
 import (
diff --git a/sdk/framework/policy_map.go b/sdk/framework/policy_map.go
index 94accf88ae74c..7befb399545cd 100644
--- a/sdk/framework/policy_map.go
+++ b/sdk/framework/policy_map.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package framework
 
 import (
diff --git a/sdk/framework/policy_map_test.go b/sdk/framework/policy_map_test.go
index b785fddc783c3..6a88b80511850 100644
--- a/sdk/framework/policy_map_test.go
+++ b/sdk/framework/policy_map_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package framework
 
 import (
diff --git a/sdk/framework/secret.go b/sdk/framework/secret.go
index 095bc12b7246a..0c8f0dfcccdf6 100644
--- a/sdk/framework/secret.go
+++ b/sdk/framework/secret.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package framework
 
 import (
diff --git a/sdk/framework/secret_test.go b/sdk/framework/secret_test.go
index 29058dc84e3af..83af4753b6d98 100644
--- a/sdk/framework/secret_test.go
+++ b/sdk/framework/secret_test.go
@@ -1,4 +1 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package framework
diff --git a/sdk/framework/template.go b/sdk/framework/template.go
index d395c8f8dbd5f..3abdd624c55e6 100644
--- a/sdk/framework/template.go
+++ b/sdk/framework/template.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package framework
 
 import (
diff --git a/sdk/framework/testdata/legacy.json b/sdk/framework/testdata/legacy.json
index 548151c6f9e60..cb1f7ebd3f2d6 100644
--- a/sdk/framework/testdata/legacy.json
+++ b/sdk/framework/testdata/legacy.json
@@ -24,11 +24,9 @@
         }
       ],
       "get": {
-        "operationId": "kv-read-lookup-id",
+        "operationId": "getLookupId",
         "summary": "Synopsis",
-        "tags": [
-          "secrets"
-        ],
+        "tags": ["secrets"],
         "responses": {
           "200": {
             "description": "OK"
@@ -36,17 +34,14 @@
         }
       },
       "post": {
-        "operationId": "kv-write-lookup-id",
+        "operationId": "postLookupId",
         "summary": "Synopsis",
-        "tags": [
-          "secrets"
-        ],
+        "tags": ["secrets"],
         "requestBody": {
-          "required": true,
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/KvWriteLookupIdRequest"
+                "$ref": "#/components/schemas/KvLookupRequest"
               }
             }
           }
@@ -61,7 +56,7 @@
   },
   "components": {
     "schemas": {
-      "KvWriteLookupIdRequest": {
+      "KvLookupRequest": {
         "type": "object",
         "properties": {
           "token": {
@@ -73,3 +68,4 @@
     }
   }
 }
+
diff --git a/sdk/framework/testdata/operations.json b/sdk/framework/testdata/operations.json
index 7fca0e2650142..097399c02e0e8 100644
--- a/sdk/framework/testdata/operations.json
+++ b/sdk/framework/testdata/operations.json
@@ -37,10 +37,8 @@
         }
       ],
       "get": {
-        "operationId": "kv-read-foo-id",
-        "tags": [
-          "secrets"
-        ],
+        "operationId": "getFooId",
+        "tags": ["secrets"],
         "summary": "My Summary",
         "description": "My Description",
         "responses": {
@@ -60,18 +58,15 @@
         ]
       },
       "post": {
-        "operationId": "kv-write-foo-id",
-        "tags": [
-          "secrets"
-        ],
+        "operationId": "postFooId",
+        "tags": ["secrets"],
         "summary": "Update Summary",
         "description": "Update Description",
         "requestBody": {
-          "required": true,
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/KvWriteFooIdRequest"
+                "$ref": "#/components/schemas/KvFooRequest"
               }
             }
           }
@@ -86,11 +81,9 @@
   },
   "components": {
     "schemas": {
-      "KvWriteFooIdRequest": {
+      "KvFooRequest": {
         "type": "object",
-        "required": [
-          "age"
-        ],
+        "required": ["age"],
         "properties": {
           "flavors": {
             "type": "array",
@@ -102,11 +95,7 @@
           "age": {
             "type": "integer",
             "description": "the age",
-            "enum": [
-              1,
-              2,
-              3
-            ],
+            "enum": [1, 2, 3],
             "x-vault-displayAttrs": {
               "name": "Age",
               "sensitive": true,
@@ -123,13 +112,9 @@
           "x-abc-token": {
             "type": "string",
             "description": "a header value",
-            "enum": [
-              "a",
-              "b",
-              "c"
-            ]
+            "enum": ["a", "b", "c"]
           },
-          "maximum": {
+          "maximum" : {
             "type": "integer",
             "description": "a maximum value",
             "format": "int64"
diff --git a/sdk/framework/testdata/operations_list.json b/sdk/framework/testdata/operations_list.json
index a08208b24fa44..e89622a3c40a1 100644
--- a/sdk/framework/testdata/operations_list.json
+++ b/sdk/framework/testdata/operations_list.json
@@ -36,10 +36,8 @@
         }
       ],
       "get": {
-        "operationId": "kv-list-foo-id",
-        "tags": [
-          "secrets"
-        ],
+        "operationId": "getFooId",
+        "tags": ["secrets"],
         "summary": "List Summary",
         "description": "List Description",
         "responses": {
@@ -55,9 +53,7 @@
             "in": "query",
             "schema": {
               "type": "string",
-              "enum": [
-                "true"
-              ]
+              "enum": ["true"]
             }
           }
         ]
@@ -65,6 +61,7 @@
     }
   },
   "components": {
-    "schemas": {}
+    "schemas": {
+    }
   }
 }
diff --git a/sdk/framework/testdata/responses.json b/sdk/framework/testdata/responses.json
index 98d501ec5e896..b0e197babed5f 100644
--- a/sdk/framework/testdata/responses.json
+++ b/sdk/framework/testdata/responses.json
@@ -14,10 +14,8 @@
       "description": "Synopsis",
       "x-vault-unauthenticated": true,
       "delete": {
-        "operationId": "kv-delete-foo",
-        "tags": [
-          "secrets"
-        ],
+        "operationId": "deleteFoo",
+        "tags": ["secrets"],
         "summary": "Delete stuff",
         "responses": {
           "204": {
@@ -26,10 +24,8 @@
         }
       },
       "get": {
-        "operationId": "kv-read-foo",
-        "tags": [
-          "secrets"
-        ],
+        "operationId": "getFoo",
+        "tags": ["secrets"],
         "summary": "My Summary",
         "description": "My Description",
         "responses": {
@@ -38,7 +34,11 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/KvReadFooResponse"
+                  "example": {
+                    "data": {
+                      "amount": 42
+                    }
+                  }
                 }
               }
             }
@@ -49,19 +49,7 @@
   },
   "components": {
     "schemas": {
-      "KvReadFooResponse": {
-        "type": "object",
-        "properties": {
-          "field_a": {
-            "type": "string",
-            "description": "field_a description"
-          },
-          "field_b": {
-            "type": "boolean",
-            "description": "field_b description"
-          }
-        }
-      }
     }
   }
 }
+
diff --git a/sdk/framework/testing.go b/sdk/framework/testing.go
index d2035d676f0c8..a00a3241cf82f 100644
--- a/sdk/framework/testing.go
+++ b/sdk/framework/testing.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package framework
 
 import (
diff --git a/sdk/framework/wal.go b/sdk/framework/wal.go
index b090f03e7bf33..7e7bb1afa959d 100644
--- a/sdk/framework/wal.go
+++ b/sdk/framework/wal.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package framework
 
 import (
diff --git a/sdk/framework/wal_test.go b/sdk/framework/wal_test.go
index 040749239c887..958be7e79ecd9 100644
--- a/sdk/framework/wal_test.go
+++ b/sdk/framework/wal_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package framework
 
 import (
diff --git a/sdk/go.mod b/sdk/go.mod
index c4a2ec99fdbcb..8aaca44d4b0c8 100644
--- a/sdk/go.mod
+++ b/sdk/go.mod
@@ -3,94 +3,61 @@ module github.com/hashicorp/vault/sdk
 go 1.19
 
 require (
-	github.com/armon/go-metrics v0.4.1
+	github.com/armon/go-metrics v0.3.9
 	github.com/armon/go-radix v1.0.0
-	github.com/cenkalti/backoff/v3 v3.2.2
-	github.com/docker/docker v23.0.4+incompatible
-	github.com/docker/go-connections v0.4.0
-	github.com/evanphx/json-patch/v5 v5.6.0
+	github.com/evanphx/json-patch/v5 v5.5.0
 	github.com/fatih/structs v1.1.0
-	github.com/go-ldap/ldap/v3 v3.4.1
-	github.com/go-test/deep v1.1.0
+	github.com/go-ldap/ldap/v3 v3.1.10
+	github.com/go-test/deep v1.0.2
 	github.com/golang/protobuf v1.5.2
 	github.com/golang/snappy v0.0.4
-	github.com/google/tink/go v1.7.0
 	github.com/hashicorp/errwrap v1.1.0
-	github.com/hashicorp/go-cleanhttp v0.5.2
-	github.com/hashicorp/go-hclog v1.4.0
+	github.com/hashicorp/go-hclog v0.16.2
 	github.com/hashicorp/go-immutable-radix v1.3.1
 	github.com/hashicorp/go-kms-wrapping/entropy/v2 v2.0.0
-	github.com/hashicorp/go-kms-wrapping/v2 v2.0.8
 	github.com/hashicorp/go-multierror v1.1.1
-	github.com/hashicorp/go-plugin v1.4.8
-	github.com/hashicorp/go-retryablehttp v0.7.1
-	github.com/hashicorp/go-secure-stdlib/base62 v0.1.2
-	github.com/hashicorp/go-secure-stdlib/mlock v0.1.2
-	github.com/hashicorp/go-secure-stdlib/parseutil v0.1.7
+	github.com/hashicorp/go-plugin v1.4.3
+	github.com/hashicorp/go-secure-stdlib/base62 v0.1.1
+	github.com/hashicorp/go-secure-stdlib/mlock v0.1.1
+	github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6
 	github.com/hashicorp/go-secure-stdlib/password v0.1.1
 	github.com/hashicorp/go-secure-stdlib/strutil v0.1.2
 	github.com/hashicorp/go-secure-stdlib/tlsutil v0.1.2
 	github.com/hashicorp/go-sockaddr v1.0.2
-	github.com/hashicorp/go-uuid v1.0.3
-	github.com/hashicorp/go-version v1.6.0
+	github.com/hashicorp/go-uuid v1.0.2
+	github.com/hashicorp/go-version v1.2.0
 	github.com/hashicorp/golang-lru v0.5.4
-	github.com/hashicorp/hcl v1.0.1-vault-5
-	github.com/hashicorp/vault/api v1.9.1
-	github.com/mitchellh/copystructure v1.2.0
-	github.com/mitchellh/go-testing-interface v1.14.1
+	github.com/hashicorp/hcl v1.0.0
+	github.com/mitchellh/copystructure v1.0.0
+	github.com/mitchellh/go-testing-interface v1.0.0
 	github.com/mitchellh/mapstructure v1.5.0
-	github.com/pierrec/lz4 v2.6.1+incompatible
+	github.com/pierrec/lz4 v2.5.2+incompatible
 	github.com/ryanuber/go-glob v1.0.0
-	github.com/stretchr/testify v1.8.2
+	github.com/stretchr/testify v1.7.0
 	go.uber.org/atomic v1.9.0
 	golang.org/x/crypto v0.6.0
-	golang.org/x/net v0.8.0
-	golang.org/x/text v0.8.0
-	google.golang.org/grpc v1.53.0
-	google.golang.org/protobuf v1.28.1
+	google.golang.org/grpc v1.41.0
+	google.golang.org/protobuf v1.26.0
 )
 
 require (
-	github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c // indirect
-	github.com/Microsoft/go-winio v0.6.1 // indirect
-	github.com/containerd/containerd v1.7.0 // indirect
-	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/docker/distribution v2.8.1+incompatible // indirect
-	github.com/docker/go-units v0.5.0 // indirect
-	github.com/fatih/color v1.13.0 // indirect
-	github.com/frankban/quicktest v1.11.3 // indirect
-	github.com/go-asn1-ber/asn1-ber v1.5.1 // indirect
-	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/hashicorp/go-rootcerts v1.0.2 // indirect
-	github.com/hashicorp/yamux v0.0.0-20211028200310-0bc27b27de87 // indirect
-	github.com/klauspost/compress v1.16.5 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/fatih/color v1.7.0 // indirect
+	github.com/frankban/quicktest v1.10.0 // indirect
+	github.com/go-asn1-ber/asn1-ber v1.3.1 // indirect
+	github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb // indirect
 	github.com/kr/text v0.2.0 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.17 // indirect
-	github.com/mitchellh/go-homedir v1.1.0 // indirect
-	github.com/mitchellh/reflectwalk v1.0.2 // indirect
-	github.com/moby/patternmatcher v0.5.0 // indirect
-	github.com/moby/sys/sequential v0.5.0 // indirect
-	github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
-	github.com/morikuni/aec v1.0.0 // indirect
-	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
-	github.com/oklog/run v1.1.0 // indirect
-	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b // indirect
-	github.com/opencontainers/runc v1.1.6 // indirect
+	github.com/mattn/go-colorable v0.1.6 // indirect
+	github.com/mattn/go-isatty v0.0.12 // indirect
+	github.com/mitchellh/reflectwalk v1.0.0 // indirect
+	github.com/oklog/run v1.0.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/rogpeppe/go-internal v1.8.1 // indirect
-	github.com/sirupsen/logrus v1.9.0 // indirect
-	github.com/stretchr/objx v0.5.0 // indirect
-	golang.org/x/mod v0.8.0 // indirect
-	golang.org/x/sys v0.6.0 // indirect
-	golang.org/x/term v0.6.0 // indirect
-	golang.org/x/time v0.0.0-20220411224347-583f2d630306 // indirect
-	golang.org/x/tools v0.6.0 // indirect
-	google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
-	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
-	gopkg.in/square/go-jose.v2 v2.6.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-	gotest.tools/v3 v3.4.0 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/stretchr/objx v0.1.1 // indirect
+	golang.org/x/net v0.7.0 // indirect
+	golang.org/x/sys v0.5.0 // indirect
+	golang.org/x/term v0.5.0 // indirect
+	golang.org/x/text v0.7.0 // indirect
+	google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
 )
diff --git a/sdk/go.sum b/sdk/go.sum
index a6b0f59b096ce..25e05622e72e8 100644
--- a/sdk/go.sum
+++ b/sdk/go.sum
@@ -1,16 +1,14 @@
-github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8=
-github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c h1:/IBSNwUN8+eKzUzbJPqhK839ygXJ82sde8x3ogr6R28=
-github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU=
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
-github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
-github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
-github.com/Microsoft/hcsshim v0.10.0-rc.7 h1:HBytQPxcv8Oy4244zbQbe6hnOnx544eL5QPUqhJldz8=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJA=
-github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4=
+github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
+github.com/armon/go-metrics v0.3.9 h1:O2sNqxBdvq8Eq5xmzljcYzAORli6RWCvEym4cJf9m18=
+github.com/armon/go-metrics v0.3.9/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
 github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI=
 github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
@@ -18,100 +16,100 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
-github.com/cenkalti/backoff/v3 v3.2.2 h1:cfUAAO3yvKMYKPrvhDuHSwQnhZNk/RMHKdZqKTxfm6M=
-github.com/cenkalti/backoff/v3 v3.2.2/go.mod h1:cIeZDE3IrqwwJl6VUwCN6trj1oXrTS4rc0ij+ULvLYs=
+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
 github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
-github.com/containerd/containerd v1.7.0 h1:G/ZQr3gMZs6ZT0qPUZ15znx5QSdQdASW11nXTLTM2Pg=
-github.com/containerd/containerd v1.7.0/go.mod h1:QfR7Efgb/6X2BDpTPJRvPTYDE9rsF0FsXX9J8sIs/sc=
-github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
+github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
+github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68=
-github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
-github.com/docker/docker v23.0.4+incompatible h1:Kd3Bh9V/rO+XpTP/BLqM+gx8z7+Yb0AA2Ibj+nNo4ek=
-github.com/docker/docker v23.0.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
-github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
-github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
-github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
-github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
-github.com/evanphx/json-patch/v5 v5.6.0 h1:b91NhWfaz02IuVxO9faSllyAtNXHMPkC5J8sJCLunww=
-github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4=
+github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
+github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/evanphx/json-patch/v5 v5.5.0 h1:bAmFiUJ+o0o2B4OiTFeE3MqCOtyo+jjPP9iZ0VRxYUc=
+github.com/evanphx/json-patch/v5 v5.5.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4=
+github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
-github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
-github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
 github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
 github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
-github.com/frankban/quicktest v1.11.3 h1:8sXhOn0uLys67V8EsXLc6eszDs8VXWxL3iRvebPhedY=
-github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=
-github.com/go-asn1-ber/asn1-ber v1.5.1 h1:pDbRAunXzIUXfx4CB2QJFv5IuPiuoW+sWvr/Us009o8=
-github.com/go-asn1-ber/asn1-ber v1.5.1/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
+github.com/frankban/quicktest v1.10.0 h1:Gfh+GAJZOAoKZsIZeZbdn2JF10kN1XHNvjsvQK8gVkE=
+github.com/frankban/quicktest v1.10.0/go.mod h1:ui7WezCLWMWxVWr1GETZY3smRy0G4KWq9vcPtJmFl7Y=
+github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/go-asn1-ber/asn1-ber v1.3.1 h1:gvPdv/Hr++TRFCl0UbPFHC54P9N9jgsRPnmnr419Uck=
+github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-ldap/ldap/v3 v3.4.1 h1:fU/0xli6HY02ocbMuozHAYsaHLcnkLjvho2r5a34BUU=
-github.com/go-ldap/ldap/v3 v3.4.1/go.mod h1:iYS1MdmrmceOJ1QOTnRXrIs7i3kloqtmGQjRvjKpyMg=
+github.com/go-ldap/ldap/v3 v3.1.10 h1:7WsKqasmPThNvdl0Q5GPpbTDD/ZD98CfuawrMIuh7qQ=
+github.com/go-ldap/ldap/v3 v3.1.10/go.mod h1:5Zun81jBTabRaI8lzN7E1JjyEl1g6zI6u9pd8luAK4Q=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/go-test/deep v1.1.0 h1:WOcxcdHcvdgThNXjw0t76K42FXTU7HpNQWHpA2HHNlg=
-github.com/go-test/deep v1.1.0/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
+github.com/go-test/deep v1.0.2 h1:onZX1rnHT3Wv6cqNgYyFOOlgVKJrksuCMCRvJStbMYw=
+github.com/go-test/deep v1.0.2/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
-github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/tink/go v1.7.0 h1:6Eox8zONGebBFcCBqkVmt60LaWZa6xg1cl/DwAh/J1w=
-github.com/google/tink/go v1.7.0/go.mod h1:GAUOd+QE3pgj9q8VKIGTCP33c/B7eb4NhxLcgTJZStM=
+github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
 github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
-github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
-github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
-github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
-github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
-github.com/hashicorp/go-hclog v1.4.0 h1:ctuWFGrhFha8BnnzxqeRGidlEcQkDyL5u8J8t5eA11I=
-github.com/hashicorp/go-hclog v1.4.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
+github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
+github.com/hashicorp/go-hclog v0.16.2 h1:K4ev2ib4LdQETX5cSZBG0DVLk1jwGqSPXBjdah3veNs=
+github.com/hashicorp/go-hclog v0.16.2/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
 github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
 github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc=
 github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
 github.com/hashicorp/go-kms-wrapping/entropy/v2 v2.0.0 h1:pSjQfW3vPtrOTcasTUKgCTQT7OGPPTTMVRrOfU6FJD8=
 github.com/hashicorp/go-kms-wrapping/entropy/v2 v2.0.0/go.mod h1:xvb32K2keAc+R8DSFG2IwDcydK9DBQE+fGA5fsw6hSk=
-github.com/hashicorp/go-kms-wrapping/v2 v2.0.8 h1:9Q2lu1YbbmiAgvYZ7Pr31RdlVonUpX+mmDL7Z7qTA2U=
-github.com/hashicorp/go-kms-wrapping/v2 v2.0.8/go.mod h1:qTCjxGig/kjuj3hk1z8pOUrzbse/GxB1tGfbrq8tGJg=
 github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
 github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
-github.com/hashicorp/go-plugin v1.4.8 h1:CHGwpxYDOttQOY7HOWgETU9dyVjOXzniXDqJcYJE1zM=
-github.com/hashicorp/go-plugin v1.4.8/go.mod h1:viDMjcLJuDui6pXb8U4HVfb8AamCWhHGUjr2IrTF67s=
+github.com/hashicorp/go-plugin v1.4.3 h1:DXmvivbWD5qdiBts9TpBC7BYL1Aia5sxbRgQB+v6UZM=
+github.com/hashicorp/go-plugin v1.4.3/go.mod h1:5fGEH17QVwTTcR0zV7yhDPLLmFX9YSZ38b18Udy6vYQ=
 github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
-github.com/hashicorp/go-retryablehttp v0.7.1 h1:sUiuQAnLlbvmExtFQs72iFW/HXeUn8Z1aJLQ4LJJbTQ=
-github.com/hashicorp/go-retryablehttp v0.7.1/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
-github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc=
-github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
-github.com/hashicorp/go-secure-stdlib/base62 v0.1.2 h1:ET4pqyjiGmY09R5y+rSd70J2w45CtbWDNvGqWp/R3Ng=
-github.com/hashicorp/go-secure-stdlib/base62 v0.1.2/go.mod h1:EdWO6czbmthiwZ3/PUsDV+UD1D5IRU4ActiaWGwt0Yw=
-github.com/hashicorp/go-secure-stdlib/mlock v0.1.2 h1:p4AKXPPS24tO8Wc8i1gLvSKdmkiSY5xuju57czJ/IJQ=
-github.com/hashicorp/go-secure-stdlib/mlock v0.1.2/go.mod h1:zq93CJChV6L9QTfGKtfBxKqD7BqqXx5O04A/ns2p5+I=
+github.com/hashicorp/go-secure-stdlib/base62 v0.1.1 h1:6KMBnfEv0/kLAz0O76sliN5mXbCDcLfs2kP7ssP7+DQ=
+github.com/hashicorp/go-secure-stdlib/base62 v0.1.1/go.mod h1:EdWO6czbmthiwZ3/PUsDV+UD1D5IRU4ActiaWGwt0Yw=
+github.com/hashicorp/go-secure-stdlib/mlock v0.1.1 h1:cCRo8gK7oq6A2L6LICkUZ+/a5rLiRXFMf1Qd4xSwxTc=
+github.com/hashicorp/go-secure-stdlib/mlock v0.1.1/go.mod h1:zq93CJChV6L9QTfGKtfBxKqD7BqqXx5O04A/ns2p5+I=
 github.com/hashicorp/go-secure-stdlib/parseutil v0.1.1/go.mod h1:QmrqtbKuxxSWTN3ETMPuB+VtEiBJ/A9XhoYGv8E1uD8=
-github.com/hashicorp/go-secure-stdlib/parseutil v0.1.7 h1:UpiO20jno/eV1eVZcxqWnUohyKRe1g8FPV/xH1s/2qs=
-github.com/hashicorp/go-secure-stdlib/parseutil v0.1.7/go.mod h1:QmrqtbKuxxSWTN3ETMPuB+VtEiBJ/A9XhoYGv8E1uD8=
+github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6 h1:om4Al8Oy7kCm/B86rLCLah4Dt5Aa0Fr5rYBG60OzwHQ=
+github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6/go.mod h1:QmrqtbKuxxSWTN3ETMPuB+VtEiBJ/A9XhoYGv8E1uD8=
 github.com/hashicorp/go-secure-stdlib/password v0.1.1 h1:6JzmBqXprakgFEHwBgdchsjaA9x3GyjdI568bXKxa60=
 github.com/hashicorp/go-secure-stdlib/password v0.1.1/go.mod h1:9hH302QllNwu1o2TGYtSk8I8kTAN0ca1EHpwhm5Mmzo=
 github.com/hashicorp/go-secure-stdlib/strutil v0.1.1/go.mod h1:gKOamz3EwoIoJq7mlMIRBpVTAUn8qPCrEclOKKWhD3U=
@@ -122,228 +120,206 @@ github.com/hashicorp/go-secure-stdlib/tlsutil v0.1.2/go.mod h1:l8slYwnJA26yBz+Er
 github.com/hashicorp/go-sockaddr v1.0.2 h1:ztczhD1jLxIRjVejw8gFomI1BQZOe2WoVOu0SyteCQc=
 github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A=
 github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE=
 github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
-github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek=
-github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
+github.com/hashicorp/go-version v1.2.0 h1:3vNe/fWF5CBgRIguda1meWhsZHy3m8gCJ5wx+dIzX/E=
+github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
 github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
-github.com/hashicorp/hcl v1.0.1-vault-5 h1:kI3hhbbyzr4dldA8UdTb7ZlVVlI2DACdCfz31RPDgJM=
-github.com/hashicorp/hcl v1.0.1-vault-5/go.mod h1:XYhtn6ijBSAj6n4YqAaf7RBPS4I06AItNorpy+MoQNM=
-github.com/hashicorp/vault/api v1.9.1 h1:LtY/I16+5jVGU8rufyyAkwopgq/HpUnxFBg+QLOAV38=
-github.com/hashicorp/vault/api v1.9.1/go.mod h1:78kktNcQYbBGSrOjQfHjXN32OhhxXnbYl3zxpd2uPUs=
-github.com/hashicorp/yamux v0.0.0-20211028200310-0bc27b27de87 h1:xixZ2bWeofWV68J+x6AzmKuVM/JWCQwkWm6GW/MUR6I=
-github.com/hashicorp/yamux v0.0.0-20211028200310-0bc27b27de87/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ=
+github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
+github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
+github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb h1:b5rjCoWHc7eqmAS4/qyk21ZsHyb6Mxv/jykxvNTkU4M=
+github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jhump/protoreflect v1.6.0 h1:h5jfMVslIg6l29nsMs0D8Wj17RDVdNYti0vDN/PZZoE=
+github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
-github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/klauspost/compress v1.16.5 h1:IFV2oUNUzZaz+XyusxpLzpzS8Pt5rh0Z16For/djlyI=
-github.com/klauspost/compress v1.16.5/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
+github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs=
+github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
-github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
-github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
-github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
+github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
+github.com/mattn/go-colorable v0.1.6 h1:6Su7aK7lXmJ/U79bYtBjLNaha4Fs1Rg9plHpcH+vvnE=
+github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
+github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
+github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
-github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
-github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
-github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
-github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
-github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-github.com/mitchellh/go-testing-interface v1.14.1 h1:jrgshOhYAUVNMAJiKbEu7EqAwgJJ2JqpQmpLJOu07cU=
-github.com/mitchellh/go-testing-interface v1.14.1/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8=
+github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ=
+github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
+github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
+github.com/mitchellh/go-testing-interface v1.0.0 h1:fzU/JVNcaqHQEcVFAKeR41fkiLdIPrefOvVG1VZ96U0=
+github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
 github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
 github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
-github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
-github.com/moby/patternmatcher v0.5.0 h1:YCZgJOeULcxLw1Q+sVR636pmS7sPEn1Qo2iAN6M7DBo=
-github.com/moby/patternmatcher v0.5.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
-github.com/moby/sys/sequential v0.5.0 h1:OPvI35Lzn9K04PBbCLW0g4LcFAJgHsvXsRyewg5lXtc=
-github.com/moby/sys/sequential v0.5.0/go.mod h1:tH2cOOs5V9MlPiXcQzRC+eEyab644PWKGRYaaV5ZZlo=
-github.com/moby/term v0.0.0-20221205130635-1aeaba878587 h1:HfkjXDfhgVaN5rmueG8cL8KKeFNecRCXFhaJ2qZ5SKA=
-github.com/moby/term v0.0.0-20221205130635-1aeaba878587/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y=
+github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/IfikLNY=
+github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
-github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
-github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA=
-github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU=
-github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
-github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
-github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b h1:YWuSjZCQAPM8UUBLkYUk1e+rZcvWHJmFb6i6rM44Xs8=
-github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b/go.mod h1:3OVijpioIKYWTqjiG0zfF6wvoJ4fAXGbjdZuI2NgsRQ=
-github.com/opencontainers/runc v1.1.6 h1:XbhB8IfG/EsnhNvZtNdLB0GBw92GYEFvKlhaJk9jUgA=
-github.com/opencontainers/runc v1.1.6/go.mod h1:CbUumNnWCuTGFukNXahoo/RFBZvDAgRh/smNYNOhA50=
+github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw=
+github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
 github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=
 github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
-github.com/pierrec/lz4 v2.6.1+incompatible h1:9UY3+iC23yxF0UfGaYrGplQ+79Rg+h/q9FV9ix19jjM=
-github.com/pierrec/lz4 v2.6.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
-github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
+github.com/pierrec/lz4 v2.5.2+incompatible h1:WCjObylUIOlKy/+7Abdn34TLIkXiA4UWUMhxq9m9ZXI=
+github.com/pierrec/lz4 v2.5.2+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
 github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
-github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg=
-github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o=
+github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk=
 github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
-github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
-github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
-github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
 go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
 golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
-golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
-golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
-golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
+golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
+golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
-golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw=
-golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
+golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
-golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/time v0.0.0-20220411224347-583f2d630306 h1:+gHMid33q6pen7kv9xvT+JRinntgeXO2AeZVd0AWD3w=
-golang.org/x/time v0.0.0-20220411224347-583f2d630306/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
-golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
-golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 h1:DdoeryqhaXp1LtT/emMP1BRJPHHKFi5akj/nbx/zNTA=
-google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s=
-google.golang.org/grpc v1.53.0 h1:LAv2ds7cmFV/XTS3XG1NneeENYrXGmorPxsBbptIjNc=
-google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
+google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
+google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/grpc v1.41.0 h1:f+PlOh7QV4iIJkPrx5NQ7qaNGFQ3OTse67yaDHfju4E=
+google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
-google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
-gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
-gopkg.in/square/go-jose.v2 v2.6.0 h1:NGk74WTnPKBNUhNzQX7PYcTLUjoq7mzKk2OKbvwk2iI=
-gopkg.in/square/go-jose.v2 v2.6.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o=
-gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
diff --git a/sdk/helper/authmetadata/auth_metadata.go b/sdk/helper/authmetadata/auth_metadata.go
index e490ab359abaa..0fd2bd50f8309 100644
--- a/sdk/helper/authmetadata/auth_metadata.go
+++ b/sdk/helper/authmetadata/auth_metadata.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package authmetadata
 
 /*
diff --git a/sdk/helper/authmetadata/auth_metadata_acc_test.go b/sdk/helper/authmetadata/auth_metadata_acc_test.go
index 189c960098d31..39888c69a16cb 100644
--- a/sdk/helper/authmetadata/auth_metadata_acc_test.go
+++ b/sdk/helper/authmetadata/auth_metadata_acc_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package authmetadata
 
 import (
diff --git a/sdk/helper/authmetadata/auth_metadata_test.go b/sdk/helper/authmetadata/auth_metadata_test.go
index a82044f9bc436..62341ebc85fbb 100644
--- a/sdk/helper/authmetadata/auth_metadata_test.go
+++ b/sdk/helper/authmetadata/auth_metadata_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package authmetadata
 
 import (
diff --git a/sdk/helper/base62/base62.go b/sdk/helper/base62/base62.go
index 7d2c7d5ba1589..981face425d45 100644
--- a/sdk/helper/base62/base62.go
+++ b/sdk/helper/base62/base62.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 // DEPRECATED: this has been moved to go-secure-stdlib and will be removed
 package base62
 
diff --git a/sdk/helper/certutil/certutil_test.go b/sdk/helper/certutil/certutil_test.go
index 8b550946121d4..60b4888495f0f 100644
--- a/sdk/helper/certutil/certutil_test.go
+++ b/sdk/helper/certutil/certutil_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package certutil
 
 import (
@@ -13,7 +10,6 @@ import (
 	"crypto/rsa"
 	"crypto/x509"
 	"crypto/x509/pkix"
-	"encoding/asn1"
 	"encoding/json"
 	"encoding/pem"
 	"fmt"
@@ -30,7 +26,7 @@ import (
 
 // Tests converting back and forth between a CertBundle and a ParsedCertBundle.
 //
-// Also tests the GetSubjKeyID, GetHexFormatted, ParseHexFormatted and
+// Also tests the GetSubjKeyID, GetHexFormatted, and
 // ParsedCertBundle.getSigner functions.
 func TestCertBundleConversion(t *testing.T) {
 	cbuts := []*CertBundle{
@@ -249,10 +245,6 @@ func compareCertBundleToParsedCertBundle(cbut *CertBundle, pcbut *ParsedCertBund
 		return fmt.Errorf("bundle serial number does not match")
 	}
 
-	if !bytes.Equal(pcbut.Certificate.SerialNumber.Bytes(), ParseHexFormatted(cb.SerialNumber, ":")) {
-		return fmt.Errorf("failed re-parsing hex formatted number %s", cb.SerialNumber)
-	}
-
 	switch {
 	case len(pcbut.CAChain) > 0 && len(cb.CAChain) == 0:
 		return fmt.Errorf("parsed bundle ca chain has certs when cert bundle does not")
@@ -946,66 +938,6 @@ func TestSignatureAlgorithmRoundTripping(t *testing.T) {
 	}
 }
 
-// TestParseBasicConstraintExtension Verify extension generation and parsing of x509 basic constraint extensions
-// works as expected.
-func TestBasicConstraintExtension(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		name       string
-		isCA       bool
-		maxPathLen int
-	}{
-		{"empty-seq", false, -1},
-		{"just-ca-true", true, -1},
-		{"just-ca-with-maxpathlen", true, 2},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			ext, err := CreateBasicConstraintExtension(tt.isCA, tt.maxPathLen)
-			if err != nil {
-				t.Fatalf("failed generating basic extension: %v", err)
-			}
-
-			gotIsCa, gotMaxPathLen, err := ParseBasicConstraintExtension(ext)
-			if err != nil {
-				t.Fatalf("failed parsing basic extension: %v", err)
-			}
-
-			if tt.isCA != gotIsCa {
-				t.Fatalf("expected isCa (%v) got isCa (%v)", tt.isCA, gotIsCa)
-			}
-
-			if tt.maxPathLen != gotMaxPathLen {
-				t.Fatalf("expected maxPathLen (%v) got maxPathLen (%v)", tt.maxPathLen, gotMaxPathLen)
-			}
-		})
-	}
-
-	t.Run("bad-extension-oid", func(t *testing.T) {
-		// Test invalid type errors out
-		_, _, err := ParseBasicConstraintExtension(pkix.Extension{})
-		if err == nil {
-			t.Fatalf("should have failed parsing non-basic constraint extension")
-		}
-	})
-
-	t.Run("garbage-value", func(t *testing.T) {
-		extraBytes, err := asn1.Marshal("a string")
-		if err != nil {
-			t.Fatalf("failed encoding the struct: %v", err)
-		}
-		ext := pkix.Extension{
-			Id:    ExtensionBasicConstraintsOID,
-			Value: extraBytes,
-		}
-		_, _, err = ParseBasicConstraintExtension(ext)
-		if err == nil {
-			t.Fatalf("should have failed parsing basic constraint with extra information")
-		}
-	})
-}
-
 func genRsaKey(t *testing.T) *rsa.PrivateKey {
 	key, err := rsa.GenerateKey(rand.Reader, 2048)
 	if err != nil {
diff --git a/sdk/helper/certutil/helpers.go b/sdk/helper/certutil/helpers.go
index 28472027f8cd0..5fe0dc71d3c4a 100644
--- a/sdk/helper/certutil/helpers.go
+++ b/sdk/helper/certutil/helpers.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package certutil
 
 import (
@@ -81,11 +78,6 @@ var InvSignatureAlgorithmNames = map[x509.SignatureAlgorithm]string{
 	x509.PureEd25519:      "Ed25519",
 }
 
-// OID for RFC 5280 CRL Number extension.
-//
-// > id-ce-cRLNumber OBJECT IDENTIFIER ::= { id-ce 20 }
-var CRLNumberOID = asn1.ObjectIdentifier([]int{2, 5, 29, 20})
-
 // OID for RFC 5280 Delta CRL Indicator CRL extension.
 //
 // > id-ce-deltaCRLIndicator OBJECT IDENTIFIER ::= { id-ce 27 }
@@ -108,13 +100,13 @@ func GetHexFormatted(buf []byte, sep string) string {
 func ParseHexFormatted(in, sep string) []byte {
 	var ret bytes.Buffer
 	var err error
-	var inBits uint64
+	var inBits int64
 	inBytes := strings.Split(in, sep)
 	for _, inByte := range inBytes {
-		if inBits, err = strconv.ParseUint(inByte, 16, 8); err != nil {
+		if inBits, err = strconv.ParseInt(inByte, 16, 8); err != nil {
 			return nil
 		}
-		ret.WriteByte(uint8(inBits))
+		ret.WriteByte(byte(inBits))
 	}
 	return ret.Bytes()
 }
@@ -1041,10 +1033,7 @@ func selectSignatureAlgorithmForECDSA(pub crypto.PublicKey, signatureBits int) x
 	}
 }
 
-var (
-	ExtensionBasicConstraintsOID = []int{2, 5, 29, 19}
-	ExtensionSubjectAltNameOID   = []int{2, 5, 29, 17}
-)
+var oidExtensionBasicConstraints = []int{2, 5, 29, 19}
 
 // CreateCSR creates a CSR with the default rand.Reader to
 // generate a cert/keypair. This is currently only meant
@@ -1098,7 +1087,7 @@ func createCSR(data *CreationBundle, addBasicConstraints bool, randReader io.Rea
 			return nil, errutil.InternalError{Err: errwrap.Wrapf("error marshaling basic constraints: {{err}}", err).Error()}
 		}
 		ext := pkix.Extension{
-			Id:       ExtensionBasicConstraintsOID,
+			Id:       oidExtensionBasicConstraints,
 			Value:    val,
 			Critical: true,
 		}
@@ -1219,7 +1208,7 @@ func signCertificate(data *CreationBundle, randReader io.Reader) (*ParsedCertBun
 		certTemplate.URIs = data.CSR.URIs
 
 		for _, name := range data.CSR.Extensions {
-			if !name.Id.Equal(ExtensionBasicConstraintsOID) && !(len(data.Params.OtherSANs) > 0 && name.Id.Equal(ExtensionSubjectAltNameOID)) {
+			if !name.Id.Equal(oidExtensionBasicConstraints) {
 				certTemplate.ExtraExtensions = append(certTemplate.ExtraExtensions, name)
 			}
 		}
@@ -1392,68 +1381,3 @@ func CreateDeltaCRLIndicatorExt(completeCRLNumber int64) (pkix.Extension, error)
 		Value: bigNumValue,
 	}, nil
 }
-
-// ParseBasicConstraintExtension parses a basic constraint pkix.Extension, useful if attempting to validate
-// CSRs are requesting CA privileges as Go does not expose its implementation. Values returned are
-// IsCA, MaxPathLen or error. If MaxPathLen was not set, a value of -1 will be returned.
-func ParseBasicConstraintExtension(ext pkix.Extension) (bool, int, error) {
-	if !ext.Id.Equal(ExtensionBasicConstraintsOID) {
-		return false, -1, fmt.Errorf("passed in extension was not a basic constraint extension")
-	}
-
-	// All elements are set to optional here, as it is possible that we receive a CSR with the extension
-	// containing an empty sequence by spec.
-	type basicConstraints struct {
-		IsCA       bool `asn1:"optional"`
-		MaxPathLen int  `asn1:"optional,default:-1"`
-	}
-	bc := &basicConstraints{}
-	leftOver, err := asn1.Unmarshal(ext.Value, bc)
-	if err != nil {
-		return false, -1, fmt.Errorf("failed unmarshalling extension value: %w", err)
-	}
-
-	numLeftOver := len(bytes.TrimSpace(leftOver))
-	if numLeftOver > 0 {
-		return false, -1, fmt.Errorf("%d extra bytes within basic constraints value extension", numLeftOver)
-	}
-
-	return bc.IsCA, bc.MaxPathLen, nil
-}
-
-// CreateBasicConstraintExtension create a basic constraint extension based on inputs,
-// if isCa is false, an empty value sequence will be returned with maxPath being
-// ignored. If isCa is true maxPath can be set to -1 to not set a maxPath value.
-func CreateBasicConstraintExtension(isCa bool, maxPath int) (pkix.Extension, error) {
-	var asn1Bytes []byte
-	var err error
-
-	switch {
-	case isCa && maxPath >= 0:
-		CaAndMaxPathLen := struct {
-			IsCa       bool `asn1:""`
-			MaxPathLen int  `asn1:""`
-		}{
-			IsCa:       isCa,
-			MaxPathLen: maxPath,
-		}
-		asn1Bytes, err = asn1.Marshal(CaAndMaxPathLen)
-	case isCa && maxPath < 0:
-		justCa := struct {
-			IsCa bool `asn1:""`
-		}{IsCa: isCa}
-		asn1Bytes, err = asn1.Marshal(justCa)
-	default:
-		asn1Bytes, err = asn1.Marshal(struct{}{})
-	}
-
-	if err != nil {
-		return pkix.Extension{}, err
-	}
-
-	return pkix.Extension{
-		Id:       ExtensionBasicConstraintsOID,
-		Critical: true,
-		Value:    asn1Bytes,
-	}, nil
-}
diff --git a/sdk/helper/certutil/types.go b/sdk/helper/certutil/types.go
index 039ff8a52291a..15b816f0c8ea0 100644
--- a/sdk/helper/certutil/types.go
+++ b/sdk/helper/certutil/types.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 // Package certutil contains helper functions that are mostly used
 // with the PKI backend but can be generally useful. Functionality
 // includes helpers for converting a certificate/private key bundle
@@ -1016,6 +1013,3 @@ func CreatePolicyInformationExtensionFromStorageStrings(policyIdentifiers []stri
 		Value:    asn1Bytes,
 	}, nil
 }
-
-// Subject Attribute OIDs
-var SubjectPilotUserIDAttributeOID = asn1.ObjectIdentifier{0, 9, 2342, 19200300, 100, 1, 1}
diff --git a/sdk/helper/cidrutil/cidr.go b/sdk/helper/cidrutil/cidr.go
index 9d2a41829c4c3..7e48c2be5034b 100644
--- a/sdk/helper/cidrutil/cidr.go
+++ b/sdk/helper/cidrutil/cidr.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package cidrutil
 
 import (
diff --git a/sdk/helper/cidrutil/cidr_test.go b/sdk/helper/cidrutil/cidr_test.go
index e6fc5764452f2..6a8662cdf17ff 100644
--- a/sdk/helper/cidrutil/cidr_test.go
+++ b/sdk/helper/cidrutil/cidr_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package cidrutil
 
 import (
diff --git a/sdk/helper/compressutil/compress.go b/sdk/helper/compressutil/compress.go
index 9e96d8dd32ec8..924f82a2a1baa 100644
--- a/sdk/helper/compressutil/compress.go
+++ b/sdk/helper/compressutil/compress.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package compressutil
 
 import (
diff --git a/sdk/helper/compressutil/compress_test.go b/sdk/helper/compressutil/compress_test.go
index 7d90ce87e982f..f85f3c935ba1b 100644
--- a/sdk/helper/compressutil/compress_test.go
+++ b/sdk/helper/compressutil/compress_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package compressutil
 
 import (
diff --git a/sdk/helper/consts/agent.go b/sdk/helper/consts/agent.go
index 53b8b8e2e76e6..55be844e14ed2 100644
--- a/sdk/helper/consts/agent.go
+++ b/sdk/helper/consts/agent.go
@@ -1,13 +1,10 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package consts
 
 // AgentPathCacheClear is the path that the agent will use as its cache-clear
 // endpoint.
 const AgentPathCacheClear = "/agent/v1/cache-clear"
 
-// AgentPathMetrics is the path the agent will use to expose its internal
+// AgentPathMetrics is the path the the agent will use to expose its internal
 // metrics.
 const AgentPathMetrics = "/agent/v1/metrics"
 
diff --git a/sdk/helper/consts/consts.go b/sdk/helper/consts/consts.go
index 744d2aa81c720..c431e2e594194 100644
--- a/sdk/helper/consts/consts.go
+++ b/sdk/helper/consts/consts.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package consts
 
 const (
@@ -37,10 +34,4 @@ const (
 	ReplicationResolverALPN = "replication_resolver_v1"
 
 	VaultEnableFilePermissionsCheckEnv = "VAULT_ENABLE_FILE_PERMISSIONS_CHECK"
-
-	VaultDisableUserLockout = "VAULT_DISABLE_USER_LOCKOUT"
-
-	PerformanceReplicationPathTarget = "performance"
-
-	DRReplicationPathParget = "dr"
 )
diff --git a/sdk/helper/consts/deprecation_status.go b/sdk/helper/consts/deprecation_status.go
index e72292bee6c3e..656d6cc992a75 100644
--- a/sdk/helper/consts/deprecation_status.go
+++ b/sdk/helper/consts/deprecation_status.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package consts
 
 // EnvVaultAllowPendingRemovalMounts allows Pending Removal builtins to be
diff --git a/sdk/helper/consts/error.go b/sdk/helper/consts/error.go
index 5bd3f5e6e2612..1a9175c6392df 100644
--- a/sdk/helper/consts/error.go
+++ b/sdk/helper/consts/error.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package consts
 
 import "errors"
diff --git a/sdk/helper/consts/plugin_types.go b/sdk/helper/consts/plugin_types.go
index 6bc14b54f7167..e0a00e4860c66 100644
--- a/sdk/helper/consts/plugin_types.go
+++ b/sdk/helper/consts/plugin_types.go
@@ -1,12 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package consts
 
-// NOTE: this file has been copied to
-// https://github.com/hashicorp/vault/blob/main/api/plugin_types.go
-// Any changes made should be made to both files at the same time.
-
 import "fmt"
 
 var PluginTypes = []PluginType{
diff --git a/sdk/helper/consts/proxy.go b/sdk/helper/consts/proxy.go
deleted file mode 100644
index 0fc4117ccc1d7..0000000000000
--- a/sdk/helper/consts/proxy.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package consts
-
-// ProxyPathCacheClear is the path that the proxy will use as its cache-clear
-// endpoint.
-const ProxyPathCacheClear = "/proxy/v1/cache-clear"
-
-// ProxyPathMetrics is the path the proxy will use to expose its internal
-// metrics.
-const ProxyPathMetrics = "/proxy/v1/metrics"
-
-// ProxyPathQuit is the path that the proxy will use to trigger stopping it.
-const ProxyPathQuit = "/proxy/v1/quit"
diff --git a/sdk/helper/consts/replication.go b/sdk/helper/consts/replication.go
index 2a1511a9a9338..f72c2f47aee2e 100644
--- a/sdk/helper/consts/replication.go
+++ b/sdk/helper/consts/replication.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package consts
 
 const (
diff --git a/sdk/helper/consts/token_consts.go b/sdk/helper/consts/token_consts.go
index 108e7ba42d78a..2b4e0278bf287 100644
--- a/sdk/helper/consts/token_consts.go
+++ b/sdk/helper/consts/token_consts.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package consts
 
 const (
diff --git a/sdk/helper/cryptoutil/cryptoutil.go b/sdk/helper/cryptoutil/cryptoutil.go
index 956dad3408783..a37086c645d80 100644
--- a/sdk/helper/cryptoutil/cryptoutil.go
+++ b/sdk/helper/cryptoutil/cryptoutil.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package cryptoutil
 
 import "golang.org/x/crypto/blake2b"
diff --git a/sdk/helper/cryptoutil/cryptoutil_test.go b/sdk/helper/cryptoutil/cryptoutil_test.go
index 35799e42a2eae..a277e4fcee400 100644
--- a/sdk/helper/cryptoutil/cryptoutil_test.go
+++ b/sdk/helper/cryptoutil/cryptoutil_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package cryptoutil
 
 import "testing"
diff --git a/sdk/helper/custommetadata/custom_metadata.go b/sdk/helper/custommetadata/custom_metadata.go
index 81d4c27035d22..7d4ff8763d116 100644
--- a/sdk/helper/custommetadata/custom_metadata.go
+++ b/sdk/helper/custommetadata/custom_metadata.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package custommetadata
 
 import (
diff --git a/sdk/helper/custommetadata/custom_metadata_test.go b/sdk/helper/custommetadata/custom_metadata_test.go
index 2b25d991203c0..e71bd59462fed 100644
--- a/sdk/helper/custommetadata/custom_metadata_test.go
+++ b/sdk/helper/custommetadata/custom_metadata_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package custommetadata
 
 import (
diff --git a/sdk/helper/dbtxn/dbtxn.go b/sdk/helper/dbtxn/dbtxn.go
index 12288d5b37c82..133b360e73e82 100644
--- a/sdk/helper/dbtxn/dbtxn.go
+++ b/sdk/helper/dbtxn/dbtxn.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package dbtxn
 
 import (
diff --git a/sdk/helper/docker/testhelpers.go b/sdk/helper/docker/testhelpers.go
deleted file mode 100644
index 7902750d6dc52..0000000000000
--- a/sdk/helper/docker/testhelpers.go
+++ /dev/null
@@ -1,911 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package docker
-
-import (
-	"archive/tar"
-	"bufio"
-	"bytes"
-	"context"
-	"encoding/base64"
-	"encoding/json"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/url"
-	"os"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/cenkalti/backoff/v3"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/mount"
-	"github.com/docker/docker/api/types/network"
-	"github.com/docker/docker/api/types/strslice"
-	"github.com/docker/docker/client"
-	"github.com/docker/docker/pkg/archive"
-	"github.com/docker/docker/pkg/stdcopy"
-	"github.com/docker/go-connections/nat"
-	"github.com/hashicorp/go-uuid"
-)
-
-const DockerAPIVersion = "1.40"
-
-type Runner struct {
-	DockerAPI  *client.Client
-	RunOptions RunOptions
-}
-
-type RunOptions struct {
-	ImageRepo              string
-	ImageTag               string
-	ContainerName          string
-	Cmd                    []string
-	Entrypoint             []string
-	Env                    []string
-	NetworkName            string
-	NetworkID              string
-	CopyFromTo             map[string]string
-	Ports                  []string
-	DoNotAutoRemove        bool
-	AuthUsername           string
-	AuthPassword           string
-	OmitLogTimestamps      bool
-	LogConsumer            func(string)
-	Capabilities           []string
-	PreDelete              bool
-	PostStart              func(string, string) error
-	LogStderr              io.Writer
-	LogStdout              io.Writer
-	VolumeNameToMountPoint map[string]string
-}
-
-func NewDockerAPI() (*client.Client, error) {
-	return client.NewClientWithOpts(client.FromEnv, client.WithVersion(DockerAPIVersion))
-}
-
-func NewServiceRunner(opts RunOptions) (*Runner, error) {
-	dapi, err := NewDockerAPI()
-	if err != nil {
-		return nil, err
-	}
-
-	if opts.NetworkName == "" {
-		opts.NetworkName = os.Getenv("TEST_DOCKER_NETWORK_NAME")
-	}
-	if opts.NetworkName != "" {
-		nets, err := dapi.NetworkList(context.TODO(), types.NetworkListOptions{
-			Filters: filters.NewArgs(filters.Arg("name", opts.NetworkName)),
-		})
-		if err != nil {
-			return nil, err
-		}
-		if len(nets) != 1 {
-			return nil, fmt.Errorf("expected exactly one docker network named %q, got %d", opts.NetworkName, len(nets))
-		}
-		opts.NetworkID = nets[0].ID
-	}
-	if opts.NetworkID == "" {
-		opts.NetworkID = os.Getenv("TEST_DOCKER_NETWORK_ID")
-	}
-	if opts.ContainerName == "" {
-		if strings.Contains(opts.ImageRepo, "/") {
-			return nil, fmt.Errorf("ContainerName is required for non-library images")
-		}
-		// If there's no slash in the repo it's almost certainly going to be
-		// a good container name.
-		opts.ContainerName = opts.ImageRepo
-	}
-	return &Runner{
-		DockerAPI:  dapi,
-		RunOptions: opts,
-	}, nil
-}
-
-type ServiceConfig interface {
-	Address() string
-	URL() *url.URL
-}
-
-func NewServiceHostPort(host string, port int) *ServiceHostPort {
-	return &ServiceHostPort{address: fmt.Sprintf("%s:%d", host, port)}
-}
-
-func NewServiceHostPortParse(s string) (*ServiceHostPort, error) {
-	pieces := strings.Split(s, ":")
-	if len(pieces) != 2 {
-		return nil, fmt.Errorf("address must be of the form host:port, got: %v", s)
-	}
-
-	port, err := strconv.Atoi(pieces[1])
-	if err != nil || port < 1 {
-		return nil, fmt.Errorf("address must be of the form host:port, got: %v", s)
-	}
-
-	return &ServiceHostPort{s}, nil
-}
-
-type ServiceHostPort struct {
-	address string
-}
-
-func (s ServiceHostPort) Address() string {
-	return s.address
-}
-
-func (s ServiceHostPort) URL() *url.URL {
-	return &url.URL{Host: s.address}
-}
-
-func NewServiceURLParse(s string) (*ServiceURL, error) {
-	u, err := url.Parse(s)
-	if err != nil {
-		return nil, err
-	}
-	return &ServiceURL{u: *u}, nil
-}
-
-func NewServiceURL(u url.URL) *ServiceURL {
-	return &ServiceURL{u: u}
-}
-
-type ServiceURL struct {
-	u url.URL
-}
-
-func (s ServiceURL) Address() string {
-	return s.u.Host
-}
-
-func (s ServiceURL) URL() *url.URL {
-	return &s.u
-}
-
-// ServiceAdapter verifies connectivity to the service, then returns either the
-// connection string (typically a URL) and nil, or empty string and an error.
-type ServiceAdapter func(ctx context.Context, host string, port int) (ServiceConfig, error)
-
-// StartService will start the runner's configured docker container with a
-// random UUID suffix appended to the name to make it unique and will return
-// either a hostname or local address depending on if a Docker network was given.
-//
-// Most tests can default to using this.
-func (d *Runner) StartService(ctx context.Context, connect ServiceAdapter) (*Service, error) {
-	serv, _, err := d.StartNewService(ctx, true, false, connect)
-
-	return serv, err
-}
-
-type LogConsumerWriter struct {
-	consumer func(string)
-}
-
-func (l LogConsumerWriter) Write(p []byte) (n int, err error) {
-	// TODO this assumes that we're never passed partial log lines, which
-	// seems a safe assumption for now based on how docker looks to implement
-	// logging, but might change in the future.
-	scanner := bufio.NewScanner(bytes.NewReader(p))
-	scanner.Buffer(make([]byte, 64*1024), bufio.MaxScanTokenSize)
-	for scanner.Scan() {
-		l.consumer(scanner.Text())
-	}
-	return len(p), nil
-}
-
-var _ io.Writer = &LogConsumerWriter{}
-
-// StartNewService will start the runner's configured docker container but with the
-// ability to control adding a name suffix or forcing a local address to be returned.
-// 'addSuffix' will add a random UUID to the end of the container name.
-// 'forceLocalAddr' will force the container address returned to be in the
-// form of '127.0.0.1:1234' where 1234 is the mapped container port.
-func (d *Runner) StartNewService(ctx context.Context, addSuffix, forceLocalAddr bool, connect ServiceAdapter) (*Service, string, error) {
-	if d.RunOptions.PreDelete {
-		name := d.RunOptions.ContainerName
-		matches, err := d.DockerAPI.ContainerList(ctx, types.ContainerListOptions{
-			All: true,
-			// TODO use labels to ensure we don't delete anything we shouldn't
-			Filters: filters.NewArgs(
-				filters.Arg("name", name),
-			),
-		})
-		if err != nil {
-			return nil, "", fmt.Errorf("failed to list containers named %q", name)
-		}
-		for _, cont := range matches {
-			err = d.DockerAPI.ContainerRemove(ctx, cont.ID, types.ContainerRemoveOptions{Force: true})
-			if err != nil {
-				return nil, "", fmt.Errorf("failed to pre-delete container named %q", name)
-			}
-		}
-	}
-	result, err := d.Start(context.Background(), addSuffix, forceLocalAddr)
-	if err != nil {
-		return nil, "", err
-	}
-
-	var wg sync.WaitGroup
-	consumeLogs := false
-	var logStdout, logStderr io.Writer
-	if d.RunOptions.LogStdout != nil && d.RunOptions.LogStderr != nil {
-		consumeLogs = true
-		logStdout = d.RunOptions.LogStdout
-		logStderr = d.RunOptions.LogStderr
-	} else if d.RunOptions.LogConsumer != nil {
-		consumeLogs = true
-		logStdout = &LogConsumerWriter{d.RunOptions.LogConsumer}
-		logStderr = &LogConsumerWriter{d.RunOptions.LogConsumer}
-	}
-
-	// The waitgroup wg is used here to support some stuff in NewDockerCluster.
-	// We can't generate the PKI cert for the https listener until we know the
-	// container's address, meaning we must first start the container, then
-	// generate the cert, then copy it into the container, then signal Vault
-	// to reload its config/certs.  However, if we SIGHUP Vault before Vault
-	// has installed its signal handler, that will kill Vault, since the default
-	// behaviour for HUP is termination.  So the PostStart that NewDockerCluster
-	// passes in (which does all that PKI cert stuff) waits to see output from
-	// Vault on stdout/stderr before it sends the signal, and we don't want to
-	// run the PostStart until we've hooked into the docker logs.
-	if consumeLogs {
-		wg.Add(1)
-		go func() {
-			// We must run inside a goroutine because we're using Follow:true,
-			// and StdCopy will block until the log stream is closed.
-			stream, err := d.DockerAPI.ContainerLogs(context.Background(), result.Container.ID, types.ContainerLogsOptions{
-				ShowStdout: true,
-				ShowStderr: true,
-				Timestamps: !d.RunOptions.OmitLogTimestamps,
-				Details:    true,
-				Follow:     true,
-			})
-			wg.Done()
-			if err != nil {
-				d.RunOptions.LogConsumer(fmt.Sprintf("error reading container logs: %v", err))
-			} else {
-				_, err := stdcopy.StdCopy(logStdout, logStderr, stream)
-				if err != nil {
-					d.RunOptions.LogConsumer(fmt.Sprintf("error demultiplexing docker logs: %v", err))
-				}
-			}
-		}()
-	}
-	wg.Wait()
-
-	if d.RunOptions.PostStart != nil {
-		if err := d.RunOptions.PostStart(result.Container.ID, result.RealIP); err != nil {
-			return nil, "", fmt.Errorf("poststart failed: %w", err)
-		}
-	}
-
-	cleanup := func() {
-		for i := 0; i < 10; i++ {
-			err := d.DockerAPI.ContainerRemove(ctx, result.Container.ID, types.ContainerRemoveOptions{Force: true})
-			if err == nil || client.IsErrNotFound(err) {
-				return
-			}
-			time.Sleep(1 * time.Second)
-		}
-	}
-
-	bo := backoff.NewExponentialBackOff()
-	bo.MaxInterval = time.Second * 5
-	bo.MaxElapsedTime = 2 * time.Minute
-
-	pieces := strings.Split(result.Addrs[0], ":")
-	portInt, err := strconv.Atoi(pieces[1])
-	if err != nil {
-		return nil, "", err
-	}
-
-	var config ServiceConfig
-	err = backoff.Retry(func() error {
-		container, err := d.DockerAPI.ContainerInspect(ctx, result.Container.ID)
-		if err != nil || !container.State.Running {
-			return backoff.Permanent(fmt.Errorf("failed inspect or container %q not running: %w", result.Container.ID, err))
-		}
-
-		c, err := connect(ctx, pieces[0], portInt)
-		if err != nil {
-			return err
-		}
-		if c == nil {
-			return fmt.Errorf("service adapter returned nil error and config")
-		}
-		config = c
-		return nil
-	}, bo)
-
-	if err != nil {
-		if !d.RunOptions.DoNotAutoRemove {
-			cleanup()
-		}
-		return nil, "", err
-	}
-
-	return &Service{
-		Config:      config,
-		Cleanup:     cleanup,
-		Container:   result.Container,
-		StartResult: result,
-	}, result.Container.ID, nil
-}
-
-type Service struct {
-	Config      ServiceConfig
-	Cleanup     func()
-	Container   *types.ContainerJSON
-	StartResult *StartResult
-}
-
-type StartResult struct {
-	Container *types.ContainerJSON
-	Addrs     []string
-	RealIP    string
-}
-
-func (d *Runner) Start(ctx context.Context, addSuffix, forceLocalAddr bool) (*StartResult, error) {
-	name := d.RunOptions.ContainerName
-	if addSuffix {
-		suffix, err := uuid.GenerateUUID()
-		if err != nil {
-			return nil, err
-		}
-		name += "-" + suffix
-	}
-
-	cfg := &container.Config{
-		Hostname: name,
-		Image:    fmt.Sprintf("%s:%s", d.RunOptions.ImageRepo, d.RunOptions.ImageTag),
-		Env:      d.RunOptions.Env,
-		Cmd:      d.RunOptions.Cmd,
-	}
-	if len(d.RunOptions.Ports) > 0 {
-		cfg.ExposedPorts = make(map[nat.Port]struct{})
-		for _, p := range d.RunOptions.Ports {
-			cfg.ExposedPorts[nat.Port(p)] = struct{}{}
-		}
-	}
-	if len(d.RunOptions.Entrypoint) > 0 {
-		cfg.Entrypoint = strslice.StrSlice(d.RunOptions.Entrypoint)
-	}
-
-	hostConfig := &container.HostConfig{
-		AutoRemove:      !d.RunOptions.DoNotAutoRemove,
-		PublishAllPorts: true,
-	}
-	if len(d.RunOptions.Capabilities) > 0 {
-		hostConfig.CapAdd = d.RunOptions.Capabilities
-	}
-
-	netConfig := &network.NetworkingConfig{}
-	if d.RunOptions.NetworkID != "" {
-		netConfig.EndpointsConfig = map[string]*network.EndpointSettings{
-			d.RunOptions.NetworkID: {},
-		}
-	}
-
-	// best-effort pull
-	var opts types.ImageCreateOptions
-	if d.RunOptions.AuthUsername != "" && d.RunOptions.AuthPassword != "" {
-		var buf bytes.Buffer
-		auth := map[string]string{
-			"username": d.RunOptions.AuthUsername,
-			"password": d.RunOptions.AuthPassword,
-		}
-		if err := json.NewEncoder(&buf).Encode(auth); err != nil {
-			return nil, err
-		}
-		opts.RegistryAuth = base64.URLEncoding.EncodeToString(buf.Bytes())
-	}
-	resp, _ := d.DockerAPI.ImageCreate(ctx, cfg.Image, opts)
-	if resp != nil {
-		_, _ = ioutil.ReadAll(resp)
-	}
-
-	for vol, mtpt := range d.RunOptions.VolumeNameToMountPoint {
-		hostConfig.Mounts = append(hostConfig.Mounts, mount.Mount{
-			Type:     "volume",
-			Source:   vol,
-			Target:   mtpt,
-			ReadOnly: false,
-		})
-	}
-
-	c, err := d.DockerAPI.ContainerCreate(ctx, cfg, hostConfig, netConfig, nil, cfg.Hostname)
-	if err != nil {
-		return nil, fmt.Errorf("container create failed: %v", err)
-	}
-
-	for from, to := range d.RunOptions.CopyFromTo {
-		if err := copyToContainer(ctx, d.DockerAPI, c.ID, from, to); err != nil {
-			_ = d.DockerAPI.ContainerRemove(ctx, c.ID, types.ContainerRemoveOptions{})
-			return nil, err
-		}
-	}
-
-	err = d.DockerAPI.ContainerStart(ctx, c.ID, types.ContainerStartOptions{})
-	if err != nil {
-		_ = d.DockerAPI.ContainerRemove(ctx, c.ID, types.ContainerRemoveOptions{})
-		return nil, fmt.Errorf("container start failed: %v", err)
-	}
-
-	inspect, err := d.DockerAPI.ContainerInspect(ctx, c.ID)
-	if err != nil {
-		_ = d.DockerAPI.ContainerRemove(ctx, c.ID, types.ContainerRemoveOptions{})
-		return nil, err
-	}
-
-	var addrs []string
-	for _, port := range d.RunOptions.Ports {
-		pieces := strings.Split(port, "/")
-		if len(pieces) < 2 {
-			return nil, fmt.Errorf("expected port of the form 1234/tcp, got: %s", port)
-		}
-		if d.RunOptions.NetworkID != "" && !forceLocalAddr {
-			addrs = append(addrs, fmt.Sprintf("%s:%s", cfg.Hostname, pieces[0]))
-		} else {
-			mapped, ok := inspect.NetworkSettings.Ports[nat.Port(port)]
-			if !ok || len(mapped) == 0 {
-				return nil, fmt.Errorf("no port mapping found for %s", port)
-			}
-			addrs = append(addrs, fmt.Sprintf("127.0.0.1:%s", mapped[0].HostPort))
-		}
-	}
-
-	var realIP string
-	if d.RunOptions.NetworkID == "" {
-		if len(inspect.NetworkSettings.Networks) > 1 {
-			return nil, fmt.Errorf("Set d.RunOptions.NetworkName instead for container with multiple networks: %v", inspect.NetworkSettings.Networks)
-		}
-		for _, network := range inspect.NetworkSettings.Networks {
-			realIP = network.IPAddress
-			break
-		}
-	} else {
-		realIP = inspect.NetworkSettings.Networks[d.RunOptions.NetworkName].IPAddress
-	}
-
-	return &StartResult{
-		Container: &inspect,
-		Addrs:     addrs,
-		RealIP:    realIP,
-	}, nil
-}
-
-func (d *Runner) RefreshFiles(ctx context.Context, containerID string) error {
-	for from, to := range d.RunOptions.CopyFromTo {
-		if err := copyToContainer(ctx, d.DockerAPI, containerID, from, to); err != nil {
-			// TODO too drastic?
-			_ = d.DockerAPI.ContainerRemove(ctx, containerID, types.ContainerRemoveOptions{})
-			return err
-		}
-	}
-	return d.DockerAPI.ContainerKill(ctx, containerID, "SIGHUP")
-}
-
-func (d *Runner) Stop(ctx context.Context, containerID string) error {
-	if d.RunOptions.NetworkID != "" {
-		if err := d.DockerAPI.NetworkDisconnect(ctx, d.RunOptions.NetworkID, containerID, true); err != nil {
-			return fmt.Errorf("error disconnecting network (%v): %v", d.RunOptions.NetworkID, err)
-		}
-	}
-
-	// timeout in seconds
-	timeout := 5
-	options := container.StopOptions{
-		Timeout: &timeout,
-	}
-	if err := d.DockerAPI.ContainerStop(ctx, containerID, options); err != nil {
-		return fmt.Errorf("error stopping container: %v", err)
-	}
-
-	return nil
-}
-
-func (d *Runner) Restart(ctx context.Context, containerID string) error {
-	if err := d.DockerAPI.ContainerStart(ctx, containerID, types.ContainerStartOptions{}); err != nil {
-		return err
-	}
-
-	ends := &network.EndpointSettings{
-		NetworkID: d.RunOptions.NetworkID,
-	}
-
-	return d.DockerAPI.NetworkConnect(ctx, d.RunOptions.NetworkID, containerID, ends)
-}
-
-func copyToContainer(ctx context.Context, dapi *client.Client, containerID, from, to string) error {
-	srcInfo, err := archive.CopyInfoSourcePath(from, false)
-	if err != nil {
-		return fmt.Errorf("error copying from source %q: %v", from, err)
-	}
-
-	srcArchive, err := archive.TarResource(srcInfo)
-	if err != nil {
-		return fmt.Errorf("error creating tar from source %q: %v", from, err)
-	}
-	defer srcArchive.Close()
-
-	dstInfo := archive.CopyInfo{Path: to}
-
-	dstDir, content, err := archive.PrepareArchiveCopy(srcArchive, srcInfo, dstInfo)
-	if err != nil {
-		return fmt.Errorf("error preparing copy from %q -> %q: %v", from, to, err)
-	}
-	defer content.Close()
-	err = dapi.CopyToContainer(ctx, containerID, dstDir, content, types.CopyToContainerOptions{})
-	if err != nil {
-		return fmt.Errorf("error copying from %q -> %q: %v", from, to, err)
-	}
-
-	return nil
-}
-
-type RunCmdOpt interface {
-	Apply(cfg *types.ExecConfig) error
-}
-
-type RunCmdUser string
-
-var _ RunCmdOpt = (*RunCmdUser)(nil)
-
-func (u RunCmdUser) Apply(cfg *types.ExecConfig) error {
-	cfg.User = string(u)
-	return nil
-}
-
-func (d *Runner) RunCmdWithOutput(ctx context.Context, container string, cmd []string, opts ...RunCmdOpt) ([]byte, []byte, int, error) {
-	return RunCmdWithOutput(d.DockerAPI, ctx, container, cmd, opts...)
-}
-
-func RunCmdWithOutput(api *client.Client, ctx context.Context, container string, cmd []string, opts ...RunCmdOpt) ([]byte, []byte, int, error) {
-	runCfg := types.ExecConfig{
-		AttachStdout: true,
-		AttachStderr: true,
-		Cmd:          cmd,
-	}
-
-	for index, opt := range opts {
-		if err := opt.Apply(&runCfg); err != nil {
-			return nil, nil, -1, fmt.Errorf("error applying option (%d / %v): %w", index, opt, err)
-		}
-	}
-
-	ret, err := api.ContainerExecCreate(ctx, container, runCfg)
-	if err != nil {
-		return nil, nil, -1, fmt.Errorf("error creating execution environment: %v\ncfg: %v\n", err, runCfg)
-	}
-
-	resp, err := api.ContainerExecAttach(ctx, ret.ID, types.ExecStartCheck{})
-	if err != nil {
-		return nil, nil, -1, fmt.Errorf("error attaching to command execution: %v\ncfg: %v\nret: %v\n", err, runCfg, ret)
-	}
-	defer resp.Close()
-
-	var stdoutB bytes.Buffer
-	var stderrB bytes.Buffer
-	if _, err := stdcopy.StdCopy(&stdoutB, &stderrB, resp.Reader); err != nil {
-		return nil, nil, -1, fmt.Errorf("error reading command output: %v", err)
-	}
-
-	stdout := stdoutB.Bytes()
-	stderr := stderrB.Bytes()
-
-	// Fetch return code.
-	info, err := api.ContainerExecInspect(ctx, ret.ID)
-	if err != nil {
-		return stdout, stderr, -1, fmt.Errorf("error reading command exit code: %v", err)
-	}
-
-	return stdout, stderr, info.ExitCode, nil
-}
-
-func (d *Runner) RunCmdInBackground(ctx context.Context, container string, cmd []string, opts ...RunCmdOpt) (string, error) {
-	return RunCmdInBackground(d.DockerAPI, ctx, container, cmd, opts...)
-}
-
-func RunCmdInBackground(api *client.Client, ctx context.Context, container string, cmd []string, opts ...RunCmdOpt) (string, error) {
-	runCfg := types.ExecConfig{
-		AttachStdout: true,
-		AttachStderr: true,
-		Cmd:          cmd,
-	}
-
-	for index, opt := range opts {
-		if err := opt.Apply(&runCfg); err != nil {
-			return "", fmt.Errorf("error applying option (%d / %v): %w", index, opt, err)
-		}
-	}
-
-	ret, err := api.ContainerExecCreate(ctx, container, runCfg)
-	if err != nil {
-		return "", fmt.Errorf("error creating execution environment: %w\ncfg: %v\n", err, runCfg)
-	}
-
-	err = api.ContainerExecStart(ctx, ret.ID, types.ExecStartCheck{})
-	if err != nil {
-		return "", fmt.Errorf("error starting command execution: %w\ncfg: %v\nret: %v\n", err, runCfg, ret)
-	}
-
-	return ret.ID, nil
-}
-
-// Mapping of path->contents
-type PathContents interface {
-	UpdateHeader(header *tar.Header) error
-	Get() ([]byte, error)
-	SetMode(mode int64)
-	SetOwners(uid int, gid int)
-}
-
-type FileContents struct {
-	Data []byte
-	Mode int64
-	UID  int
-	GID  int
-}
-
-func (b FileContents) UpdateHeader(header *tar.Header) error {
-	header.Mode = b.Mode
-	header.Uid = b.UID
-	header.Gid = b.GID
-	return nil
-}
-
-func (b FileContents) Get() ([]byte, error) {
-	return b.Data, nil
-}
-
-func (b *FileContents) SetMode(mode int64) {
-	b.Mode = mode
-}
-
-func (b *FileContents) SetOwners(uid int, gid int) {
-	b.UID = uid
-	b.GID = gid
-}
-
-func PathContentsFromBytes(data []byte) PathContents {
-	return &FileContents{
-		Data: data,
-		Mode: 0o644,
-	}
-}
-
-func PathContentsFromString(data string) PathContents {
-	return PathContentsFromBytes([]byte(data))
-}
-
-type BuildContext map[string]PathContents
-
-func NewBuildContext() BuildContext {
-	return BuildContext{}
-}
-
-func BuildContextFromTarball(reader io.Reader) (BuildContext, error) {
-	archive := tar.NewReader(reader)
-	bCtx := NewBuildContext()
-
-	for true {
-		header, err := archive.Next()
-		if err != nil {
-			if err == io.EOF {
-				break
-			}
-
-			return nil, fmt.Errorf("failed to parse provided tarball: %v", err)
-		}
-
-		data := make([]byte, int(header.Size))
-		read, err := archive.Read(data)
-		if err != nil {
-			return nil, fmt.Errorf("failed to parse read from provided tarball: %v", err)
-		}
-
-		if read != int(header.Size) {
-			return nil, fmt.Errorf("unexpectedly short read on tarball: %v of %v", read, header.Size)
-		}
-
-		bCtx[header.Name] = &FileContents{
-			Data: data,
-			Mode: header.Mode,
-			UID:  header.Uid,
-			GID:  header.Gid,
-		}
-	}
-
-	return bCtx, nil
-}
-
-func (bCtx *BuildContext) ToTarball() (io.Reader, error) {
-	var err error
-	buffer := new(bytes.Buffer)
-	tarBuilder := tar.NewWriter(buffer)
-	defer tarBuilder.Close()
-
-	now := time.Now()
-	for filepath, contents := range *bCtx {
-		fileHeader := &tar.Header{
-			Name:       filepath,
-			ModTime:    now,
-			AccessTime: now,
-			ChangeTime: now,
-		}
-		if contents == nil && !strings.HasSuffix(filepath, "/") {
-			return nil, fmt.Errorf("expected file path (%v) to have trailing / due to nil contents, indicating directory", filepath)
-		}
-
-		if err := contents.UpdateHeader(fileHeader); err != nil {
-			return nil, fmt.Errorf("failed to update tar header entry for %v: %w", filepath, err)
-		}
-
-		var rawContents []byte
-		if contents != nil {
-			rawContents, err = contents.Get()
-			if err != nil {
-				return nil, fmt.Errorf("failed to get file contents for %v: %w", filepath, err)
-			}
-
-			fileHeader.Size = int64(len(rawContents))
-		}
-
-		if err := tarBuilder.WriteHeader(fileHeader); err != nil {
-			return nil, fmt.Errorf("failed to write tar header entry for %v: %w", filepath, err)
-		}
-
-		if contents != nil {
-			if _, err := tarBuilder.Write(rawContents); err != nil {
-				return nil, fmt.Errorf("failed to write tar file entry for %v: %w", filepath, err)
-			}
-		}
-	}
-
-	return bytes.NewReader(buffer.Bytes()), nil
-}
-
-type BuildOpt interface {
-	Apply(cfg *types.ImageBuildOptions) error
-}
-
-type BuildRemove bool
-
-var _ BuildOpt = (*BuildRemove)(nil)
-
-func (u BuildRemove) Apply(cfg *types.ImageBuildOptions) error {
-	cfg.Remove = bool(u)
-	return nil
-}
-
-type BuildForceRemove bool
-
-var _ BuildOpt = (*BuildForceRemove)(nil)
-
-func (u BuildForceRemove) Apply(cfg *types.ImageBuildOptions) error {
-	cfg.ForceRemove = bool(u)
-	return nil
-}
-
-type BuildPullParent bool
-
-var _ BuildOpt = (*BuildPullParent)(nil)
-
-func (u BuildPullParent) Apply(cfg *types.ImageBuildOptions) error {
-	cfg.PullParent = bool(u)
-	return nil
-}
-
-type BuildArgs map[string]*string
-
-var _ BuildOpt = (*BuildArgs)(nil)
-
-func (u BuildArgs) Apply(cfg *types.ImageBuildOptions) error {
-	cfg.BuildArgs = u
-	return nil
-}
-
-type BuildTags []string
-
-var _ BuildOpt = (*BuildTags)(nil)
-
-func (u BuildTags) Apply(cfg *types.ImageBuildOptions) error {
-	cfg.Tags = u
-	return nil
-}
-
-const containerfilePath = "_containerfile"
-
-func (d *Runner) BuildImage(ctx context.Context, containerfile string, containerContext BuildContext, opts ...BuildOpt) ([]byte, error) {
-	return BuildImage(ctx, d.DockerAPI, containerfile, containerContext, opts...)
-}
-
-func BuildImage(ctx context.Context, api *client.Client, containerfile string, containerContext BuildContext, opts ...BuildOpt) ([]byte, error) {
-	var cfg types.ImageBuildOptions
-
-	// Build container context tarball, provisioning containerfile in.
-	containerContext[containerfilePath] = PathContentsFromBytes([]byte(containerfile))
-	tar, err := containerContext.ToTarball()
-	if err != nil {
-		return nil, fmt.Errorf("failed to create build image context tarball: %w", err)
-	}
-	cfg.Dockerfile = "/" + containerfilePath
-
-	// Apply all given options
-	for index, opt := range opts {
-		if err := opt.Apply(&cfg); err != nil {
-			return nil, fmt.Errorf("failed to apply option (%d / %v): %w", index, opt, err)
-		}
-	}
-
-	resp, err := api.ImageBuild(ctx, tar, cfg)
-	if err != nil {
-		return nil, fmt.Errorf("failed to build image: %v", err)
-	}
-
-	output, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return nil, fmt.Errorf("failed to read image build output: %w", err)
-	}
-
-	return output, nil
-}
-
-func (d *Runner) CopyTo(container string, destination string, contents BuildContext) error {
-	// XXX: currently we use the default options but we might want to allow
-	// modifying cfg.CopyUIDGID in the future.
-	var cfg types.CopyToContainerOptions
-
-	// Convert our provided contents to a tarball to ship up.
-	tar, err := contents.ToTarball()
-	if err != nil {
-		return fmt.Errorf("failed to build contents into tarball: %v", err)
-	}
-
-	return d.DockerAPI.CopyToContainer(context.Background(), container, destination, tar, cfg)
-}
-
-func (d *Runner) CopyFrom(container string, source string) (BuildContext, *types.ContainerPathStat, error) {
-	reader, stat, err := d.DockerAPI.CopyFromContainer(context.Background(), container, source)
-	if err != nil {
-		return nil, nil, fmt.Errorf("failed to read %v from container: %v", source, err)
-	}
-
-	result, err := BuildContextFromTarball(reader)
-	if err != nil {
-		return nil, nil, fmt.Errorf("failed to build archive from result: %v", err)
-	}
-
-	return result, &stat, nil
-}
-
-func (d *Runner) GetNetworkAndAddresses(container string) (map[string]string, error) {
-	response, err := d.DockerAPI.ContainerInspect(context.Background(), container)
-	if err != nil {
-		return nil, fmt.Errorf("failed to fetch container inspection data: %v", err)
-	}
-
-	if response.NetworkSettings == nil || len(response.NetworkSettings.Networks) == 0 {
-		return nil, fmt.Errorf("container (%v) had no associated network settings: %v", container, response)
-	}
-
-	ret := make(map[string]string)
-	ns := response.NetworkSettings.Networks
-	for network, data := range ns {
-		if data == nil {
-			continue
-		}
-
-		ret[network] = data.IPAddress
-	}
-
-	if len(ret) == 0 {
-		return nil, fmt.Errorf("no valid network data for container (%v): %v", container, response)
-	}
-
-	return ret, nil
-}
diff --git a/sdk/helper/errutil/error.go b/sdk/helper/errutil/error.go
index 1866343b51835..0b95efb40e3a9 100644
--- a/sdk/helper/errutil/error.go
+++ b/sdk/helper/errutil/error.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package errutil
 
 // UserError represents an error generated due to invalid user input
diff --git a/sdk/helper/hclutil/hcl.go b/sdk/helper/hclutil/hcl.go
index a78d820087d43..0b120367d5a6a 100644
--- a/sdk/helper/hclutil/hcl.go
+++ b/sdk/helper/hclutil/hcl.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package hclutil
 
 import (
diff --git a/sdk/helper/identitytpl/templating.go b/sdk/helper/identitytpl/templating.go
index 124a27c920c30..6d84df8241ded 100644
--- a/sdk/helper/identitytpl/templating.go
+++ b/sdk/helper/identitytpl/templating.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package identitytpl
 
 import (
diff --git a/sdk/helper/identitytpl/templating_test.go b/sdk/helper/identitytpl/templating_test.go
index d17409e78ae66..15bfc812387c6 100644
--- a/sdk/helper/identitytpl/templating_test.go
+++ b/sdk/helper/identitytpl/templating_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package identitytpl
 
 import (
diff --git a/sdk/helper/jsonutil/json.go b/sdk/helper/jsonutil/json.go
index 1abd9fafebdc8..c03a4f8c8d14c 100644
--- a/sdk/helper/jsonutil/json.go
+++ b/sdk/helper/jsonutil/json.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package jsonutil
 
 import (
diff --git a/sdk/helper/jsonutil/json_test.go b/sdk/helper/jsonutil/json_test.go
index 10aabf1b93ea3..dd33f9bf179aa 100644
--- a/sdk/helper/jsonutil/json_test.go
+++ b/sdk/helper/jsonutil/json_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package jsonutil
 
 import (
diff --git a/sdk/helper/kdf/kdf.go b/sdk/helper/kdf/kdf.go
index e9964ba28c4f7..9d3e0e858585e 100644
--- a/sdk/helper/kdf/kdf.go
+++ b/sdk/helper/kdf/kdf.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 // This package is used to implement Key Derivation Functions (KDF)
 // based on the recommendations of NIST SP 800-108. These are useful
 // for generating unique-per-transaction keys, or situations in which
diff --git a/sdk/helper/kdf/kdf_test.go b/sdk/helper/kdf/kdf_test.go
index ed5c0a13d36b4..2148257f357c2 100644
--- a/sdk/helper/kdf/kdf_test.go
+++ b/sdk/helper/kdf/kdf_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package kdf
 
 import (
diff --git a/sdk/helper/keysutil/cache.go b/sdk/helper/keysutil/cache.go
index fb55091e40a8c..7da9c202fa58b 100644
--- a/sdk/helper/keysutil/cache.go
+++ b/sdk/helper/keysutil/cache.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package keysutil
 
 type Cache interface {
diff --git a/sdk/helper/keysutil/consts.go b/sdk/helper/keysutil/consts.go
index b684232423213..cbb8123517f13 100644
--- a/sdk/helper/keysutil/consts.go
+++ b/sdk/helper/keysutil/consts.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package keysutil
 
 import (
@@ -16,8 +13,8 @@ import (
 type HashType uint32
 
 const (
-	HashTypeNone HashType = iota
-	HashTypeSHA1
+	_                     = iota
+	HashTypeSHA1 HashType = iota
 	HashTypeSHA2224
 	HashTypeSHA2256
 	HashTypeSHA2384
@@ -38,7 +35,6 @@ const (
 
 var (
 	HashTypeMap = map[string]HashType{
-		"none":     HashTypeNone,
 		"sha1":     HashTypeSHA1,
 		"sha2-224": HashTypeSHA2224,
 		"sha2-256": HashTypeSHA2256,
@@ -51,7 +47,6 @@ var (
 	}
 
 	HashFuncMap = map[HashType]func() hash.Hash{
-		HashTypeNone:    nil,
 		HashTypeSHA1:    sha1.New,
 		HashTypeSHA2224: sha256.New224,
 		HashTypeSHA2256: sha256.New,
@@ -64,7 +59,6 @@ var (
 	}
 
 	CryptoHashMap = map[HashType]crypto.Hash{
-		HashTypeNone:    0,
 		HashTypeSHA1:    crypto.SHA1,
 		HashTypeSHA2224: crypto.SHA224,
 		HashTypeSHA2256: crypto.SHA256,
diff --git a/sdk/helper/keysutil/encrypted_key_storage.go b/sdk/helper/keysutil/encrypted_key_storage.go
index 7314758bc1679..90eaaf0bbae1f 100644
--- a/sdk/helper/keysutil/encrypted_key_storage.go
+++ b/sdk/helper/keysutil/encrypted_key_storage.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package keysutil
 
 import (
diff --git a/sdk/helper/keysutil/encrypted_key_storage_test.go b/sdk/helper/keysutil/encrypted_key_storage_test.go
index 5147027fc8839..2f29d14b7ad7f 100644
--- a/sdk/helper/keysutil/encrypted_key_storage_test.go
+++ b/sdk/helper/keysutil/encrypted_key_storage_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package keysutil
 
 import (
diff --git a/sdk/helper/keysutil/lock_manager.go b/sdk/helper/keysutil/lock_manager.go
index 6d2881e0d8daa..a60cf69d53f2c 100644
--- a/sdk/helper/keysutil/lock_manager.go
+++ b/sdk/helper/keysutil/lock_manager.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package keysutil
 
 import (
@@ -62,12 +59,6 @@ type PolicyRequest struct {
 
 	// AllowImportedKeyRotation indicates whether an imported key may be rotated by Vault
 	AllowImportedKeyRotation bool
-
-	// Indicates whether a private or public key is imported/upserted
-	IsPrivateKey bool
-
-	// The UUID of the managed key, if using one
-	ManagedKeyUUID string
 }
 
 type LockManager struct {
@@ -391,12 +382,6 @@ func (lm *LockManager) GetPolicy(ctx context.Context, req PolicyRequest, rand io
 				return nil, false, fmt.Errorf("key derivation and convergent encryption not supported for keys of type %v", req.KeyType)
 			}
 
-		case KeyType_MANAGED_KEY:
-			if req.Derived || req.Convergent {
-				cleanup()
-				return nil, false, fmt.Errorf("key derivation and convergent encryption not supported for keys of type %v", req.KeyType)
-			}
-
 		default:
 			cleanup()
 			return nil, false, fmt.Errorf("unsupported key type %v", req.KeyType)
@@ -427,11 +412,7 @@ func (lm *LockManager) GetPolicy(ctx context.Context, req PolicyRequest, rand io
 		}
 
 		// Performs the actual persist and does setup
-		if p.Type == KeyType_MANAGED_KEY {
-			err = p.RotateManagedKey(ctx, req.Storage, req.ManagedKeyUUID)
-		} else {
-			err = p.Rotate(ctx, req.Storage, rand)
-		}
+		err = p.Rotate(ctx, req.Storage, rand)
 		if err != nil {
 			cleanup()
 			return nil, false, err
@@ -514,7 +495,7 @@ func (lm *LockManager) ImportPolicy(ctx context.Context, req PolicyRequest, key
 		}
 	}
 
-	err = p.ImportPublicOrPrivate(ctx, req.Storage, key, req.IsPrivateKey, rand)
+	err = p.Import(ctx, req.Storage, key, rand)
 	if err != nil {
 		return fmt.Errorf("error importing key: %s", err)
 	}
diff --git a/sdk/helper/keysutil/managed_key_util.go b/sdk/helper/keysutil/managed_key_util.go
deleted file mode 100644
index bb3c0b2968b73..0000000000000
--- a/sdk/helper/keysutil/managed_key_util.go
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-//go:build !enterprise
-
-package keysutil
-
-import (
-	"context"
-	"errors"
-
-	"github.com/hashicorp/vault/sdk/logical"
-)
-
-type ManagedKeyParameters struct {
-	ManagedKeySystemView logical.ManagedKeySystemView
-	BackendUUID          string
-	Context              context.Context
-}
-
-var errEntOnly = errors.New("managed keys are supported within enterprise edition only")
-
-func (p *Policy) decryptWithManagedKey(params ManagedKeyParameters, keyEntry KeyEntry, ciphertext []byte, nonce []byte, aad []byte) (plaintext []byte, err error) {
-	return nil, errEntOnly
-}
-
-func (p *Policy) encryptWithManagedKey(params ManagedKeyParameters, keyEntry KeyEntry, plaintext []byte, nonce []byte, aad []byte) (ciphertext []byte, err error) {
-	return nil, errEntOnly
-}
-
-func (p *Policy) signWithManagedKey(options *SigningOptions, keyEntry KeyEntry, input []byte) (sig []byte, err error) {
-	return nil, errEntOnly
-}
-
-func (p *Policy) verifyWithManagedKey(options *SigningOptions, keyEntry KeyEntry, input, sig []byte) (verified bool, err error) {
-	return false, errEntOnly
-}
-
-func (p *Policy) HMACWithManagedKey(ctx context.Context, ver int, managedKeySystemView logical.ManagedKeySystemView, backendUUID string, algorithm string, data []byte) (hmacBytes []byte, err error) {
-	return nil, errEntOnly
-}
-
-func (p *Policy) RotateManagedKey(ctx context.Context, storage logical.Storage, managedKeyUUID string) error {
-	return errEntOnly
-}
diff --git a/sdk/helper/keysutil/policy.go b/sdk/helper/keysutil/policy.go
index 869733b3e9d4e..bbd587feb3554 100644
--- a/sdk/helper/keysutil/policy.go
+++ b/sdk/helper/keysutil/policy.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package keysutil
 
 import (
@@ -22,7 +19,6 @@ import (
 	"encoding/pem"
 	"errors"
 	"fmt"
-	"hash"
 	"io"
 	"math/big"
 	"path"
@@ -42,8 +38,6 @@ import (
 	"github.com/hashicorp/vault/sdk/helper/jsonutil"
 	"github.com/hashicorp/vault/sdk/helper/kdf"
 	"github.com/hashicorp/vault/sdk/logical"
-
-	"github.com/google/tink/go/kwp/subtle"
 )
 
 // Careful with iota; don't put anything before it in this const block because
@@ -85,14 +79,6 @@ type AEADFactory interface {
 	GetAEAD(iv []byte) (cipher.AEAD, error)
 }
 
-type AssociatedDataFactory interface {
-	GetAssociatedData() ([]byte, error)
-}
-
-type ManagedKeyFactory interface {
-	GetManagedKeyParameters() ManagedKeyParameters
-}
-
 type RestoreInfo struct {
 	Time    time.Time `json:"time"`
 	Version int       `json:"version"`
@@ -104,11 +90,10 @@ type BackupInfo struct {
 }
 
 type SigningOptions struct {
-	HashAlgorithm    HashType
-	Marshaling       MarshalingType
-	SaltLength       int
-	SigAlgorithm     string
-	ManagedKeyParams ManagedKeyParameters
+	HashAlgorithm HashType
+	Marshaling    MarshalingType
+	SaltLength    int
+	SigAlgorithm  string
 }
 
 type SigningResult struct {
@@ -124,7 +109,7 @@ type KeyType int
 
 func (kt KeyType) EncryptionSupported() bool {
 	switch kt {
-	case KeyType_AES128_GCM96, KeyType_AES256_GCM96, KeyType_ChaCha20_Poly1305, KeyType_RSA2048, KeyType_RSA3072, KeyType_RSA4096, KeyType_MANAGED_KEY:
+	case KeyType_AES128_GCM96, KeyType_AES256_GCM96, KeyType_ChaCha20_Poly1305, KeyType_RSA2048, KeyType_RSA3072, KeyType_RSA4096:
 		return true
 	}
 	return false
@@ -132,7 +117,7 @@ func (kt KeyType) EncryptionSupported() bool {
 
 func (kt KeyType) DecryptionSupported() bool {
 	switch kt {
-	case KeyType_AES128_GCM96, KeyType_AES256_GCM96, KeyType_ChaCha20_Poly1305, KeyType_RSA2048, KeyType_RSA3072, KeyType_RSA4096, KeyType_MANAGED_KEY:
+	case KeyType_AES128_GCM96, KeyType_AES256_GCM96, KeyType_ChaCha20_Poly1305, KeyType_RSA2048, KeyType_RSA3072, KeyType_RSA4096:
 		return true
 	}
 	return false
@@ -140,7 +125,7 @@ func (kt KeyType) DecryptionSupported() bool {
 
 func (kt KeyType) SigningSupported() bool {
 	switch kt {
-	case KeyType_ECDSA_P256, KeyType_ECDSA_P384, KeyType_ECDSA_P521, KeyType_ED25519, KeyType_RSA2048, KeyType_RSA3072, KeyType_RSA4096, KeyType_MANAGED_KEY:
+	case KeyType_ECDSA_P256, KeyType_ECDSA_P384, KeyType_ECDSA_P521, KeyType_ED25519, KeyType_RSA2048, KeyType_RSA3072, KeyType_RSA4096:
 		return true
 	}
 	return false
@@ -162,22 +147,6 @@ func (kt KeyType) DerivationSupported() bool {
 	return false
 }
 
-func (kt KeyType) AssociatedDataSupported() bool {
-	switch kt {
-	case KeyType_AES128_GCM96, KeyType_AES256_GCM96, KeyType_ChaCha20_Poly1305, KeyType_MANAGED_KEY:
-		return true
-	}
-	return false
-}
-
-func (kt KeyType) ImportPublicKeySupported() bool {
-	switch kt {
-	case KeyType_RSA2048, KeyType_RSA3072, KeyType_RSA4096, KeyType_ECDSA_P256, KeyType_ECDSA_P384, KeyType_ECDSA_P521, KeyType_ED25519:
-		return true
-	}
-	return false
-}
-
 func (kt KeyType) String() string {
 	switch kt {
 	case KeyType_AES128_GCM96:
@@ -202,8 +171,6 @@ func (kt KeyType) String() string {
 		return "rsa-4096"
 	case KeyType_HMAC:
 		return "hmac"
-	case KeyType_MANAGED_KEY:
-		return "managed_key"
 	}
 
 	return "[unknown]"
@@ -229,8 +196,7 @@ type KeyEntry struct {
 	EC_Y *big.Int `json:"ec_y"`
 	EC_D *big.Int `json:"ec_d"`
 
-	RSAKey       *rsa.PrivateKey `json:"rsa_key"`
-	RSAPublicKey *rsa.PublicKey  `json:"rsa_public_key"`
+	RSAKey *rsa.PrivateKey `json:"rsa_key"`
 
 	// The public key in an appropriate format for the type of key
 	FormattedPublicKey string `json:"public_key"`
@@ -242,16 +208,6 @@ type KeyEntry struct {
 	// This is deprecated (but still filled) in favor of the value above which
 	// is more precise
 	DeprecatedCreationTime int64 `json:"creation_time"`
-
-	ManagedKeyUUID string `json:"managed_key_id,omitempty"`
-}
-
-func (ke *KeyEntry) IsPrivateKeyMissing() bool {
-	if ke.RSAKey != nil || ke.EC_D != nil || len(ke.Key) != 0 {
-		return false
-	}
-
-	return true
 }
 
 // deprecatedKeyEntryMap is used to allow JSON marshal/unmarshal
@@ -355,19 +311,6 @@ func LoadPolicy(ctx context.Context, s logical.Storage, path string) (*Policy, e
 		return nil, err
 	}
 
-	// Migrate RSA private keys to include their private counterpart. This lets
-	// us reference RSAPublicKey whenever we need to, without necessarily
-	// needing the private key handy, synchronizing the behavior with EC and
-	// Ed25519 key pairs.
-	switch policy.Type {
-	case KeyType_RSA2048, KeyType_RSA3072, KeyType_RSA4096:
-		for _, entry := range policy.Keys {
-			if entry.RSAPublicKey == nil && entry.RSAKey != nil {
-				entry.RSAPublicKey = entry.RSAKey.Public().(*rsa.PublicKey)
-			}
-		}
-	}
-
 	policy.l = new(sync.RWMutex)
 
 	return &policy, nil
@@ -464,6 +407,8 @@ type Policy struct {
 
 	// AllowImportedKeyRotation indicates whether an imported key may be rotated by Vault
 	AllowImportedKeyRotation bool
+
+	ManagedKeyName string `json:"managed_key_name,omitempty"`
 }
 
 func (p *Policy) Lock(exclusive bool) {
@@ -903,10 +848,6 @@ func (p *Policy) Encrypt(ver int, context, nonce []byte, value string) (string,
 }
 
 func (p *Policy) Decrypt(context, nonce []byte, value string) (string, error) {
-	return p.DecryptWithFactory(context, nonce, value, nil)
-}
-
-func (p *Policy) DecryptWithFactory(context, nonce []byte, value string, factories ...interface{}) (string, error) {
 	if !p.Type.DecryptionSupported() {
 		return "", errutil.UserError{Err: fmt.Sprintf("message decryption not supported for key type %v", p.Type)}
 	}
@@ -974,29 +915,11 @@ func (p *Policy) DecryptWithFactory(context, nonce []byte, value string, factori
 			return "", errutil.InternalError{Err: "could not derive enc key, length not correct"}
 		}
 
-		symopts := SymmetricOpts{
-			Convergent:        p.ConvergentEncryption,
-			ConvergentVersion: p.ConvergentVersion,
-		}
-		for index, rawFactory := range factories {
-			if rawFactory == nil {
-				continue
-			}
-			switch factory := rawFactory.(type) {
-			case AEADFactory:
-				symopts.AEADFactory = factory
-			case AssociatedDataFactory:
-				symopts.AdditionalData, err = factory.GetAssociatedData()
-				if err != nil {
-					return "", errutil.InternalError{Err: fmt.Sprintf("unable to get associated_data/additional_data from factory[%d]: %v", index, err)}
-				}
-			case ManagedKeyFactory:
-			default:
-				return "", errutil.InternalError{Err: fmt.Sprintf("unknown type of factory[%d]: %T", index, rawFactory)}
-			}
-		}
-
-		plain, err = p.SymmetricDecryptRaw(encKey, decoded, symopts)
+		plain, err = p.SymmetricDecryptRaw(encKey, decoded,
+			SymmetricOpts{
+				Convergent:        p.ConvergentEncryption,
+				ConvergentVersion: p.ConvergentVersion,
+			})
 		if err != nil {
 			return "", err
 		}
@@ -1006,40 +929,10 @@ func (p *Policy) DecryptWithFactory(context, nonce []byte, value string, factori
 			return "", err
 		}
 		key := keyEntry.RSAKey
-		if key == nil {
-			return "", errutil.InternalError{Err: fmt.Sprintf("cannot decrypt ciphertext, key version does not have a private counterpart")}
-		}
 		plain, err = rsa.DecryptOAEP(sha256.New(), rand.Reader, key, decoded, nil)
 		if err != nil {
 			return "", errutil.InternalError{Err: fmt.Sprintf("failed to RSA decrypt the ciphertext: %v", err)}
 		}
-	case KeyType_MANAGED_KEY:
-		keyEntry, err := p.safeGetKeyEntry(ver)
-		if err != nil {
-			return "", err
-		}
-		var aad []byte
-		var managedKeyFactory ManagedKeyFactory
-		for _, f := range factories {
-			switch factory := f.(type) {
-			case AssociatedDataFactory:
-				aad, err = factory.GetAssociatedData()
-				if err != nil {
-					return "", err
-				}
-			case ManagedKeyFactory:
-				managedKeyFactory = factory
-			}
-		}
-
-		if managedKeyFactory == nil {
-			return "", errors.New("key type is managed_key, but managed key parameters were not provided")
-		}
-
-		plain, err = p.decryptWithManagedKey(managedKeyFactory.GetManagedKeyParameters(), keyEntry, decoded, nonce, aad)
-		if err != nil {
-			return "", err
-		}
 
 	default:
 		return "", errutil.InternalError{Err: fmt.Sprintf("unsupported key type %v", p.Type)}
@@ -1083,13 +976,13 @@ func (p *Policy) minRSAPSSSaltLength() int {
 	return rsa.PSSSaltLengthEqualsHash
 }
 
-func (p *Policy) maxRSAPSSSaltLength(keyBitLen int, hash crypto.Hash) int {
+func (p *Policy) maxRSAPSSSaltLength(priv *rsa.PrivateKey, hash crypto.Hash) int {
 	// https://cs.opensource.google/go/go/+/refs/tags/go1.19:src/crypto/rsa/pss.go;l=288
-	return (keyBitLen-1+7)/8 - 2 - hash.Size()
+	return (priv.N.BitLen()-1+7)/8 - 2 - hash.Size()
 }
 
-func (p *Policy) validRSAPSSSaltLength(keyBitLen int, hash crypto.Hash, saltLength int) bool {
-	return p.minRSAPSSSaltLength() <= saltLength && saltLength <= p.maxRSAPSSSaltLength(keyBitLen, hash)
+func (p *Policy) validRSAPSSSaltLength(priv *rsa.PrivateKey, hash crypto.Hash, saltLength int) bool {
+	return p.minRSAPSSSaltLength() <= saltLength && saltLength <= p.maxRSAPSSSaltLength(priv, hash)
 }
 
 func (p *Policy) SignWithOptions(ver int, context, input []byte, options *SigningOptions) (*SigningResult, error) {
@@ -1116,11 +1009,6 @@ func (p *Policy) SignWithOptions(ver int, context, input []byte, options *Signin
 		return nil, err
 	}
 
-	// Before signing, check if key has its private part, if not return error
-	if keyParams.IsPrivateKeyMissing() {
-		return nil, errutil.UserError{Err: "requested version for signing does not contain a private part"}
-	}
-
 	hashAlgorithm := options.HashAlgorithm
 	marshaling := options.Marshaling
 	saltLength := options.SaltLength
@@ -1227,7 +1115,7 @@ func (p *Policy) SignWithOptions(ver int, context, input []byte, options *Signin
 
 		switch sigAlgorithm {
 		case "pss":
-			if !p.validRSAPSSSaltLength(key.N.BitLen(), algo, saltLength) {
+			if !p.validRSAPSSSaltLength(key, algo, saltLength) {
 				return nil, errutil.UserError{Err: fmt.Sprintf("requested salt length %d is invalid", saltLength)}
 			}
 			sig, err = rsa.SignPSS(rand.Reader, key, algo, input, &rsa.PSSOptions{SaltLength: saltLength})
@@ -1243,17 +1131,6 @@ func (p *Policy) SignWithOptions(ver int, context, input []byte, options *Signin
 			return nil, errutil.InternalError{Err: fmt.Sprintf("unsupported rsa signature algorithm %s", sigAlgorithm)}
 		}
 
-	case KeyType_MANAGED_KEY:
-		keyEntry, err := p.safeGetKeyEntry(ver)
-		if err != nil {
-			return nil, err
-		}
-
-		sig, err = p.signWithManagedKey(options, keyEntry, input)
-		if err != nil {
-			return nil, err
-		}
-
 	default:
 		return nil, fmt.Errorf("unsupported key type %v", p.Type)
 	}
@@ -1381,30 +1258,20 @@ func (p *Policy) VerifySignatureWithOptions(context, input []byte, sig string, o
 		return ecdsa.Verify(key, input, ecdsaSig.R, ecdsaSig.S), nil
 
 	case KeyType_ED25519:
-		var pub ed25519.PublicKey
+		var key ed25519.PrivateKey
 
 		if p.Derived {
 			// Derive the key that should be used
-			key, err := p.GetKey(context, ver, 32)
+			var err error
+			key, err = p.GetKey(context, ver, 32)
 			if err != nil {
 				return false, errutil.InternalError{Err: fmt.Sprintf("error deriving key: %v", err)}
 			}
-			pub = ed25519.PrivateKey(key).Public().(ed25519.PublicKey)
 		} else {
-			keyEntry, err := p.safeGetKeyEntry(ver)
-			if err != nil {
-				return false, err
-			}
-
-			raw, err := base64.StdEncoding.DecodeString(keyEntry.FormattedPublicKey)
-			if err != nil {
-				return false, err
-			}
-
-			pub = ed25519.PublicKey(raw)
+			key = ed25519.PrivateKey(p.Keys[strconv.Itoa(ver)].Key)
 		}
 
-		return ed25519.Verify(pub, input, sigBytes), nil
+		return ed25519.Verify(key.Public().(ed25519.PublicKey), input, sigBytes), nil
 
 	case KeyType_RSA2048, KeyType_RSA3072, KeyType_RSA4096:
 		keyEntry, err := p.safeGetKeyEntry(ver)
@@ -1412,6 +1279,8 @@ func (p *Policy) VerifySignatureWithOptions(context, input []byte, sig string, o
 			return false, err
 		}
 
+		key := keyEntry.RSAKey
+
 		algo, ok := CryptoHashMap[hashAlgorithm]
 		if !ok {
 			return false, errutil.InternalError{Err: "unsupported hash algorithm"}
@@ -1423,62 +1292,30 @@ func (p *Policy) VerifySignatureWithOptions(context, input []byte, sig string, o
 
 		switch sigAlgorithm {
 		case "pss":
-			publicKey := keyEntry.RSAPublicKey
-			if !keyEntry.IsPrivateKeyMissing() {
-				publicKey = &keyEntry.RSAKey.PublicKey
-			}
-			if !p.validRSAPSSSaltLength(publicKey.N.BitLen(), algo, saltLength) {
+			if !p.validRSAPSSSaltLength(key, algo, saltLength) {
 				return false, errutil.UserError{Err: fmt.Sprintf("requested salt length %d is invalid", saltLength)}
 			}
-			err = rsa.VerifyPSS(publicKey, algo, input, sigBytes, &rsa.PSSOptions{SaltLength: saltLength})
+			err = rsa.VerifyPSS(&key.PublicKey, algo, input, sigBytes, &rsa.PSSOptions{SaltLength: saltLength})
 		case "pkcs1v15":
-			publicKey := keyEntry.RSAPublicKey
-			if !keyEntry.IsPrivateKeyMissing() {
-				publicKey = &keyEntry.RSAKey.PublicKey
-			}
-			err = rsa.VerifyPKCS1v15(publicKey, algo, input, sigBytes)
+			err = rsa.VerifyPKCS1v15(&key.PublicKey, algo, input, sigBytes)
 		default:
 			return false, errutil.InternalError{Err: fmt.Sprintf("unsupported rsa signature algorithm %s", sigAlgorithm)}
 		}
 
 		return err == nil, nil
 
-	case KeyType_MANAGED_KEY:
-		keyEntry, err := p.safeGetKeyEntry(ver)
-		if err != nil {
-			return false, err
-		}
-
-		return p.verifyWithManagedKey(options, keyEntry, input, sigBytes)
-
 	default:
 		return false, errutil.InternalError{Err: fmt.Sprintf("unsupported key type %v", p.Type)}
 	}
 }
 
 func (p *Policy) Import(ctx context.Context, storage logical.Storage, key []byte, randReader io.Reader) error {
-	return p.ImportPublicOrPrivate(ctx, storage, key, true, randReader)
-}
-
-func (p *Policy) ImportPublicOrPrivate(ctx context.Context, storage logical.Storage, key []byte, isPrivateKey bool, randReader io.Reader) error {
 	now := time.Now()
 	entry := KeyEntry{
 		CreationTime:           now,
 		DeprecatedCreationTime: now.Unix(),
 	}
 
-	// Before we insert this entry, check if the latest version is incomplete
-	// and this entry matches the current version; if so, return without
-	// updating to the next version.
-	if p.LatestVersion > 0 {
-		latestKey := p.Keys[strconv.Itoa(p.LatestVersion)]
-		if latestKey.IsPrivateKeyMissing() && isPrivateKey {
-			if err := p.ImportPrivateKeyForVersion(ctx, storage, p.LatestVersion, key); err == nil {
-				return nil
-			}
-		}
-	}
-
 	if p.Type != KeyType_HMAC {
 		hmacKey, err := uuid.GenerateRandomBytesWithReader(32, randReader)
 		if err != nil {
@@ -1487,10 +1324,6 @@ func (p *Policy) ImportPublicOrPrivate(ctx context.Context, storage logical.Stor
 		entry.HMACKey = hmacKey
 	}
 
-	if p.Type == KeyType_ED25519 && p.Derived && !isPrivateKey {
-		return fmt.Errorf("unable to import only public key for derived Ed25519 key: imported key should not be an Ed25519 key pair but is instead an HKDF key")
-	}
-
 	if (p.Type == KeyType_AES128_GCM96 && len(key) != 16) ||
 		((p.Type == KeyType_AES256_GCM96 || p.Type == KeyType_ChaCha20_Poly1305) && len(key) != 32) ||
 		(p.Type == KeyType_HMAC && (len(key) < HmacMinKeySize || len(key) > HmacMaxKeySize)) {
@@ -1504,42 +1337,83 @@ func (p *Policy) ImportPublicOrPrivate(ctx context.Context, storage logical.Stor
 			entry.HMACKey = key
 		}
 	} else {
-		var parsedKey any
-		var err error
-		if isPrivateKey {
-			parsedKey, err = x509.ParsePKCS8PrivateKey(key)
-			if err != nil {
-				if strings.Contains(err.Error(), "unknown elliptic curve") {
-					var edErr error
-					parsedKey, edErr = ParsePKCS8Ed25519PrivateKey(key)
-					if edErr != nil {
-						return fmt.Errorf("error parsing asymmetric key:\n - assuming contents are an ed25519 private key: %s\n - original error: %v", edErr, err)
-					}
-
-					// Parsing as Ed25519-in-PKCS8-ECPrivateKey succeeded!
-				} else if strings.Contains(err.Error(), oidSignatureRSAPSS.String()) {
-					var rsaErr error
-					parsedKey, rsaErr = ParsePKCS8RSAPSSPrivateKey(key)
-					if rsaErr != nil {
-						return fmt.Errorf("error parsing asymmetric key:\n - assuming contents are an RSA/PSS private key: %v\n - original error: %w", rsaErr, err)
-					}
-
-					// Parsing as RSA-PSS in PKCS8 succeeded!
-				} else {
-					return fmt.Errorf("error parsing asymmetric key: %s", err)
+		parsedPrivateKey, err := x509.ParsePKCS8PrivateKey(key)
+		if err != nil {
+			if strings.Contains(err.Error(), "unknown elliptic curve") {
+				var edErr error
+				parsedPrivateKey, edErr = ParsePKCS8Ed25519PrivateKey(key)
+				if edErr != nil {
+					return fmt.Errorf("error parsing asymmetric key:\n - assuming contents are an ed25519 private key: %s\n - original error: %v", edErr, err)
 				}
+
+				// Parsing as Ed25519-in-PKCS8-ECPrivateKey succeeded!
+			} else {
+				return fmt.Errorf("error parsing asymmetric key: %s", err)
 			}
-		} else {
-			pemBlock, _ := pem.Decode(key)
-			parsedKey, err = x509.ParsePKIXPublicKey(pemBlock.Bytes)
+		}
+
+		switch parsedPrivateKey.(type) {
+		case *ecdsa.PrivateKey:
+			if p.Type != KeyType_ECDSA_P256 && p.Type != KeyType_ECDSA_P384 && p.Type != KeyType_ECDSA_P521 {
+				return fmt.Errorf("invalid key type: expected %s, got %T", p.Type, parsedPrivateKey)
+			}
+
+			ecdsaKey := parsedPrivateKey.(*ecdsa.PrivateKey)
+			curve := elliptic.P256()
+			if p.Type == KeyType_ECDSA_P384 {
+				curve = elliptic.P384()
+			} else if p.Type == KeyType_ECDSA_P521 {
+				curve = elliptic.P521()
+			}
+
+			if ecdsaKey.Curve != curve {
+				return fmt.Errorf("invalid curve: expected %s, got %s", curve.Params().Name, ecdsaKey.Curve.Params().Name)
+			}
+
+			entry.EC_D = ecdsaKey.D
+			entry.EC_X = ecdsaKey.X
+			entry.EC_Y = ecdsaKey.Y
+			derBytes, err := x509.MarshalPKIXPublicKey(ecdsaKey.Public())
 			if err != nil {
-				return fmt.Errorf("error parsing public key: %s", err)
+				return errwrap.Wrapf("error marshaling public key: {{err}}", err)
 			}
-		}
+			pemBlock := &pem.Block{
+				Type:  "PUBLIC KEY",
+				Bytes: derBytes,
+			}
+			pemBytes := pem.EncodeToMemory(pemBlock)
+			if pemBytes == nil || len(pemBytes) == 0 {
+				return fmt.Errorf("error PEM-encoding public key")
+			}
+			entry.FormattedPublicKey = string(pemBytes)
+		case ed25519.PrivateKey:
+			if p.Type != KeyType_ED25519 {
+				return fmt.Errorf("invalid key type: expected %s, got %T", p.Type, parsedPrivateKey)
+			}
+			privateKey := parsedPrivateKey.(ed25519.PrivateKey)
 
-		err = entry.parseFromKey(p.Type, parsedKey)
-		if err != nil {
-			return err
+			entry.Key = privateKey
+			publicKey := privateKey.Public().(ed25519.PublicKey)
+			entry.FormattedPublicKey = base64.StdEncoding.EncodeToString(publicKey)
+		case *rsa.PrivateKey:
+			if p.Type != KeyType_RSA2048 && p.Type != KeyType_RSA3072 && p.Type != KeyType_RSA4096 {
+				return fmt.Errorf("invalid key type: expected %s, got %T", p.Type, parsedPrivateKey)
+			}
+
+			keyBytes := 256
+			if p.Type == KeyType_RSA3072 {
+				keyBytes = 384
+			} else if p.Type == KeyType_RSA4096 {
+				keyBytes = 512
+			}
+			rsaKey := parsedPrivateKey.(*rsa.PrivateKey)
+			if rsaKey.Size() != keyBytes {
+				return fmt.Errorf("invalid key size: expected %d bytes, got %d bytes", keyBytes, rsaKey.Size())
+			}
+
+			entry.RSAKey = rsaKey
+		default:
+			return fmt.Errorf("invalid key type: expected %s, got %T", p.Type, parsedPrivateKey)
 		}
 	}
 
@@ -1667,19 +1541,13 @@ func (p *Policy) RotateInMemory(randReader io.Reader) (retErr error) {
 		entry.FormattedPublicKey = string(pemBytes)
 
 	case KeyType_ED25519:
-		// Go uses a 64-byte private key for Ed25519 keys (private+public, each
-		// 32-bytes long). When we do Key derivation, we still generate a 32-byte
-		// random value (and compute the corresponding Ed25519 public key), but
-		// use this entire 64-byte key as if it was an HKDF key. The corresponding
-		// underlying public key is never returned (which is probably good, because
-		// doing so would leak half of our HKDF key...), but means we cannot import
-		// derived-enabled Ed25519 public key components.
 		pub, pri, err := ed25519.GenerateKey(randReader)
 		if err != nil {
 			return err
 		}
 		entry.Key = pri
 		entry.FormattedPublicKey = base64.StdEncoding.EncodeToString(pub)
+
 	case KeyType_RSA2048, KeyType_RSA3072, KeyType_RSA4096:
 		bitSize := 2048
 		if p.Type == KeyType_RSA3072 {
@@ -1972,7 +1840,7 @@ func (p *Policy) SymmetricDecryptRaw(encKey, ciphertext []byte, opts SymmetricOp
 	return plain, nil
 }
 
-func (p *Policy) EncryptWithFactory(ver int, context []byte, nonce []byte, value string, factories ...interface{}) (string, error) {
+func (p *Policy) EncryptWithFactory(ver int, context []byte, nonce []byte, value string, factory AEADFactory) (string, error) {
 	if !p.Type.EncryptionSupported() {
 		return "", errutil.UserError{Err: fmt.Sprintf("message encryption not supported for key type %v", p.Type)}
 	}
@@ -2033,30 +1901,14 @@ func (p *Policy) EncryptWithFactory(ver int, context []byte, nonce []byte, value
 			}
 		}
 
-		symopts := SymmetricOpts{
-			Convergent: p.ConvergentEncryption,
-			HMACKey:    hmacKey,
-			Nonce:      nonce,
-		}
-		for index, rawFactory := range factories {
-			if rawFactory == nil {
-				continue
-			}
-			switch factory := rawFactory.(type) {
-			case AEADFactory:
-				symopts.AEADFactory = factory
-			case AssociatedDataFactory:
-				symopts.AdditionalData, err = factory.GetAssociatedData()
-				if err != nil {
-					return "", errutil.InternalError{Err: fmt.Sprintf("unable to get associated_data/additional_data from factory[%d]: %v", index, err)}
-				}
-			case ManagedKeyFactory:
-			default:
-				return "", errutil.InternalError{Err: fmt.Sprintf("unknown type of factory[%d]: %T", index, rawFactory)}
-			}
-		}
+		ciphertext, err = p.SymmetricEncryptRaw(ver, encKey, plaintext,
+			SymmetricOpts{
+				Convergent:  p.ConvergentEncryption,
+				HMACKey:     hmacKey,
+				Nonce:       nonce,
+				AEADFactory: factory,
+			})
 
-		ciphertext, err = p.SymmetricEncryptRaw(ver, encKey, plaintext, symopts)
 		if err != nil {
 			return "", err
 		}
@@ -2065,44 +1917,11 @@ func (p *Policy) EncryptWithFactory(ver int, context []byte, nonce []byte, value
 		if err != nil {
 			return "", err
 		}
-		var publicKey *rsa.PublicKey
-		if keyEntry.RSAKey != nil {
-			publicKey = &keyEntry.RSAKey.PublicKey
-		} else {
-			publicKey = keyEntry.RSAPublicKey
-		}
-		ciphertext, err = rsa.EncryptOAEP(sha256.New(), rand.Reader, publicKey, plaintext, nil)
+		key := keyEntry.RSAKey
+		ciphertext, err = rsa.EncryptOAEP(sha256.New(), rand.Reader, &key.PublicKey, plaintext, nil)
 		if err != nil {
 			return "", errutil.InternalError{Err: fmt.Sprintf("failed to RSA encrypt the plaintext: %v", err)}
 		}
-	case KeyType_MANAGED_KEY:
-		keyEntry, err := p.safeGetKeyEntry(ver)
-		if err != nil {
-			return "", err
-		}
-
-		var aad []byte
-		var managedKeyFactory ManagedKeyFactory
-		for _, f := range factories {
-			switch factory := f.(type) {
-			case AssociatedDataFactory:
-				aad, err = factory.GetAssociatedData()
-				if err != nil {
-					return "", nil
-				}
-			case ManagedKeyFactory:
-				managedKeyFactory = factory
-			}
-		}
-
-		if managedKeyFactory == nil {
-			return "", errors.New("key type is managed_key, but managed key parameters were not provided")
-		}
-
-		ciphertext, err = p.encryptWithManagedKey(managedKeyFactory.GetManagedKeyParameters(), keyEntry, plaintext, nonce, aad)
-		if err != nil {
-			return "", err
-		}
 
 	default:
 		return "", errutil.InternalError{Err: fmt.Sprintf("unsupported key type %v", p.Type)}
@@ -2116,280 +1935,3 @@ func (p *Policy) EncryptWithFactory(ver int, context []byte, nonce []byte, value
 
 	return encoded, nil
 }
-
-func (p *Policy) KeyVersionCanBeUpdated(keyVersion int, isPrivateKey bool) error {
-	keyEntry, err := p.safeGetKeyEntry(keyVersion)
-	if err != nil {
-		return err
-	}
-
-	if !p.Type.ImportPublicKeySupported() {
-		return errors.New("provided type does not support importing key versions")
-	}
-
-	isPrivateKeyMissing := keyEntry.IsPrivateKeyMissing()
-	if isPrivateKeyMissing && !isPrivateKey {
-		return errors.New("cannot add a public key to a key version that already has a public key set")
-	}
-
-	if !isPrivateKeyMissing {
-		return errors.New("private key imported, key version cannot be updated")
-	}
-
-	return nil
-}
-
-func (p *Policy) ImportPrivateKeyForVersion(ctx context.Context, storage logical.Storage, keyVersion int, key []byte) error {
-	keyEntry, err := p.safeGetKeyEntry(keyVersion)
-	if err != nil {
-		return err
-	}
-
-	// Parse key
-	parsedPrivateKey, err := x509.ParsePKCS8PrivateKey(key)
-	if err != nil {
-		if strings.Contains(err.Error(), "unknown elliptic curve") {
-			var edErr error
-			parsedPrivateKey, edErr = ParsePKCS8Ed25519PrivateKey(key)
-			if edErr != nil {
-				return fmt.Errorf("error parsing asymmetric key:\n - assuming contents are an ed25519 private key: %s\n - original error: %v", edErr, err)
-			}
-
-			// Parsing as Ed25519-in-PKCS8-ECPrivateKey succeeded!
-		} else if strings.Contains(err.Error(), oidSignatureRSAPSS.String()) {
-			var rsaErr error
-			parsedPrivateKey, rsaErr = ParsePKCS8RSAPSSPrivateKey(key)
-			if rsaErr != nil {
-				return fmt.Errorf("error parsing asymmetric key:\n - assuming contents are an RSA/PSS private key: %v\n - original error: %w", rsaErr, err)
-			}
-
-			// Parsing as RSA-PSS in PKCS8 succeeded!
-		} else {
-			return fmt.Errorf("error parsing asymmetric key: %s", err)
-		}
-	}
-
-	switch parsedPrivateKey.(type) {
-	case *ecdsa.PrivateKey:
-		ecdsaKey := parsedPrivateKey.(*ecdsa.PrivateKey)
-		pemBlock, _ := pem.Decode([]byte(keyEntry.FormattedPublicKey))
-		publicKey, err := x509.ParsePKIXPublicKey(pemBlock.Bytes)
-		if err != nil || publicKey == nil {
-			return fmt.Errorf("failed to parse key entry public key: %v", err)
-		}
-		if !publicKey.(*ecdsa.PublicKey).Equal(&ecdsaKey.PublicKey) {
-			return fmt.Errorf("cannot import key, key pair does not match")
-		}
-	case *rsa.PrivateKey:
-		rsaKey := parsedPrivateKey.(*rsa.PrivateKey)
-		if !rsaKey.PublicKey.Equal(keyEntry.RSAPublicKey) {
-			return fmt.Errorf("cannot import key, key pair does not match")
-		}
-	case ed25519.PrivateKey:
-		ed25519Key := parsedPrivateKey.(ed25519.PrivateKey)
-		publicKey, err := base64.StdEncoding.DecodeString(keyEntry.FormattedPublicKey)
-		if err != nil {
-			return fmt.Errorf("failed to parse key entry public key: %v", err)
-		}
-		if !ed25519.PublicKey(publicKey).Equal(ed25519Key.Public()) {
-			return fmt.Errorf("cannot import key, key pair does not match")
-		}
-	}
-
-	err = keyEntry.parseFromKey(p.Type, parsedPrivateKey)
-	if err != nil {
-		return err
-	}
-
-	p.Keys[strconv.Itoa(keyVersion)] = keyEntry
-
-	return p.Persist(ctx, storage)
-}
-
-func (ke *KeyEntry) parseFromKey(PolKeyType KeyType, parsedKey any) error {
-	switch parsedKey.(type) {
-	case *ecdsa.PrivateKey, *ecdsa.PublicKey:
-		if PolKeyType != KeyType_ECDSA_P256 && PolKeyType != KeyType_ECDSA_P384 && PolKeyType != KeyType_ECDSA_P521 {
-			return fmt.Errorf("invalid key type: expected %s, got %T", PolKeyType, parsedKey)
-		}
-
-		curve := elliptic.P256()
-		if PolKeyType == KeyType_ECDSA_P384 {
-			curve = elliptic.P384()
-		} else if PolKeyType == KeyType_ECDSA_P521 {
-			curve = elliptic.P521()
-		}
-
-		var derBytes []byte
-		var err error
-		ecdsaKey, ok := parsedKey.(*ecdsa.PrivateKey)
-		if ok {
-
-			if ecdsaKey.Curve != curve {
-				return fmt.Errorf("invalid curve: expected %s, got %s", curve.Params().Name, ecdsaKey.Curve.Params().Name)
-			}
-
-			ke.EC_D = ecdsaKey.D
-			ke.EC_X = ecdsaKey.X
-			ke.EC_Y = ecdsaKey.Y
-
-			derBytes, err = x509.MarshalPKIXPublicKey(ecdsaKey.Public())
-			if err != nil {
-				return errwrap.Wrapf("error marshaling public key: {{err}}", err)
-			}
-		} else {
-			ecdsaKey := parsedKey.(*ecdsa.PublicKey)
-
-			if ecdsaKey.Curve != curve {
-				return fmt.Errorf("invalid curve: expected %s, got %s", curve.Params().Name, ecdsaKey.Curve.Params().Name)
-			}
-
-			ke.EC_X = ecdsaKey.X
-			ke.EC_Y = ecdsaKey.Y
-
-			derBytes, err = x509.MarshalPKIXPublicKey(ecdsaKey)
-			if err != nil {
-				return errwrap.Wrapf("error marshaling public key: {{err}}", err)
-			}
-		}
-
-		pemBlock := &pem.Block{
-			Type:  "PUBLIC KEY",
-			Bytes: derBytes,
-		}
-		pemBytes := pem.EncodeToMemory(pemBlock)
-		if pemBytes == nil || len(pemBytes) == 0 {
-			return fmt.Errorf("error PEM-encoding public key")
-		}
-		ke.FormattedPublicKey = string(pemBytes)
-	case ed25519.PrivateKey, ed25519.PublicKey:
-		if PolKeyType != KeyType_ED25519 {
-			return fmt.Errorf("invalid key type: expected %s, got %T", PolKeyType, parsedKey)
-		}
-
-		privateKey, ok := parsedKey.(ed25519.PrivateKey)
-		if ok {
-			ke.Key = privateKey
-			publicKey := privateKey.Public().(ed25519.PublicKey)
-			ke.FormattedPublicKey = base64.StdEncoding.EncodeToString(publicKey)
-		} else {
-			publicKey := parsedKey.(ed25519.PublicKey)
-			ke.FormattedPublicKey = base64.StdEncoding.EncodeToString(publicKey)
-		}
-	case *rsa.PrivateKey, *rsa.PublicKey:
-		if PolKeyType != KeyType_RSA2048 && PolKeyType != KeyType_RSA3072 && PolKeyType != KeyType_RSA4096 {
-			return fmt.Errorf("invalid key type: expected %s, got %T", PolKeyType, parsedKey)
-		}
-
-		keyBytes := 256
-		if PolKeyType == KeyType_RSA3072 {
-			keyBytes = 384
-		} else if PolKeyType == KeyType_RSA4096 {
-			keyBytes = 512
-		}
-
-		rsaKey, ok := parsedKey.(*rsa.PrivateKey)
-		if ok {
-			if rsaKey.Size() != keyBytes {
-				return fmt.Errorf("invalid key size: expected %d bytes, got %d bytes", keyBytes, rsaKey.Size())
-			}
-			ke.RSAKey = rsaKey
-			ke.RSAPublicKey = rsaKey.Public().(*rsa.PublicKey)
-		} else {
-			rsaKey := parsedKey.(*rsa.PublicKey)
-			if rsaKey.Size() != keyBytes {
-				return fmt.Errorf("invalid key size: expected %d bytes, got %d bytes", keyBytes, rsaKey.Size())
-			}
-			ke.RSAPublicKey = rsaKey
-		}
-	default:
-		return fmt.Errorf("invalid key type: expected %s, got %T", PolKeyType, parsedKey)
-	}
-
-	return nil
-}
-
-func (p *Policy) WrapKey(ver int, targetKey interface{}, targetKeyType KeyType, hash hash.Hash) (string, error) {
-	if !p.Type.SigningSupported() {
-		return "", fmt.Errorf("message signing not supported for key type %v", p.Type)
-	}
-
-	switch {
-	case ver == 0:
-		ver = p.LatestVersion
-	case ver < 0:
-		return "", errutil.UserError{Err: "requested version for key wrapping is negative"}
-	case ver > p.LatestVersion:
-		return "", errutil.UserError{Err: "requested version for key wrapping is higher than the latest key version"}
-	case p.MinEncryptionVersion > 0 && ver < p.MinEncryptionVersion:
-		return "", errutil.UserError{Err: "requested version for key wrapping is less than the minimum encryption key version"}
-	}
-
-	keyEntry, err := p.safeGetKeyEntry(ver)
-	if err != nil {
-		return "", err
-	}
-
-	return keyEntry.WrapKey(targetKey, targetKeyType, hash)
-}
-
-func (ke *KeyEntry) WrapKey(targetKey interface{}, targetKeyType KeyType, hash hash.Hash) (string, error) {
-	// Presently this method implements a CKM_RSA_AES_KEY_WRAP-compatible
-	// wrapping interface and only works on RSA keyEntries as a result.
-	if ke.RSAPublicKey == nil {
-		return "", fmt.Errorf("unsupported key type in use; must be a rsa key")
-	}
-
-	var preppedTargetKey []byte
-	switch targetKeyType {
-	case KeyType_AES128_GCM96, KeyType_AES256_GCM96, KeyType_ChaCha20_Poly1305, KeyType_HMAC:
-		var ok bool
-		preppedTargetKey, ok = targetKey.([]byte)
-		if !ok {
-			return "", fmt.Errorf("failed to wrap target key for import: symmetric key not provided in byte format (%T)", targetKey)
-		}
-	default:
-		var err error
-		preppedTargetKey, err = x509.MarshalPKCS8PrivateKey(targetKey)
-		if err != nil {
-			return "", fmt.Errorf("failed to wrap target key for import: %w", err)
-		}
-	}
-
-	result, err := wrapTargetPKCS8ForImport(ke.RSAPublicKey, preppedTargetKey, hash)
-	if err != nil {
-		return result, fmt.Errorf("failed to wrap target key for import: %w", err)
-	}
-
-	return result, nil
-}
-
-func wrapTargetPKCS8ForImport(wrappingKey *rsa.PublicKey, preppedTargetKey []byte, hash hash.Hash) (string, error) {
-	// Generate an ephemeral AES-256 key
-	ephKey, err := uuid.GenerateRandomBytes(32)
-	if err != nil {
-		return "", fmt.Errorf("failed to generate an ephemeral AES wrapping key: %w", err)
-	}
-
-	// Wrap ephemeral AES key with public wrapping key
-	ephKeyWrapped, err := rsa.EncryptOAEP(hash, rand.Reader, wrappingKey, ephKey, []byte{} /* label */)
-	if err != nil {
-		return "", fmt.Errorf("failed to encrypt ephemeral wrapping key with public key: %w", err)
-	}
-
-	// Create KWP instance for wrapping target key
-	kwp, err := subtle.NewKWP(ephKey)
-	if err != nil {
-		return "", fmt.Errorf("failed to generate new KWP from AES key: %w", err)
-	}
-
-	// Wrap target key with KWP
-	targetKeyWrapped, err := kwp.Wrap(preppedTargetKey)
-	if err != nil {
-		return "", fmt.Errorf("failed to wrap target key with KWP: %w", err)
-	}
-
-	// Combined wrapped keys into a single blob and base64 encode
-	wrappedKeys := append(ephKeyWrapped, targetKeyWrapped...)
-	return base64.StdEncoding.EncodeToString(wrappedKeys), nil
-}
diff --git a/sdk/helper/keysutil/policy_test.go b/sdk/helper/keysutil/policy_test.go
index f5e4d35eb81c4..91767cfd9d398 100644
--- a/sdk/helper/keysutil/policy_test.go
+++ b/sdk/helper/keysutil/policy_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package keysutil
 
 import (
@@ -846,7 +843,7 @@ func Test_RSA_PSS(t *testing.T) {
 		}
 		cryptoHash := CryptoHashMap[hashType]
 		minSaltLength := p.minRSAPSSSaltLength()
-		maxSaltLength := p.maxRSAPSSSaltLength(rsaKey.N.BitLen(), cryptoHash)
+		maxSaltLength := p.maxRSAPSSSaltLength(rsaKey, cryptoHash)
 		hash := cryptoHash.New()
 		hash.Write(input)
 		input = hash.Sum(nil)
@@ -956,9 +953,6 @@ func Test_RSA_PSS(t *testing.T) {
 		// 2. For each hash algorithm...
 		for hashAlgorithm, hashType := range HashTypeMap {
 			t.Log(tabs[1], "Hash algorithm:", hashAlgorithm)
-			if hashAlgorithm == "none" {
-				continue
-			}
 
 			// 3. For each marshaling type...
 			for marshalingName, marshalingType := range MarshalingTypeMap {
@@ -970,92 +964,6 @@ func Test_RSA_PSS(t *testing.T) {
 	}
 }
 
-func Test_RSA_PKCS1(t *testing.T) {
-	t.Log("Testing RSA PKCS#1v1.5")
-
-	ctx := context.Background()
-	storage := &logical.InmemStorage{}
-	// https://crypto.stackexchange.com/a/1222
-	input := []byte("Sphinx of black quartz, judge my vow")
-	sigAlgorithm := "pkcs1v15"
-
-	tabs := make(map[int]string)
-	for i := 1; i <= 6; i++ {
-		tabs[i] = strings.Repeat("\t", i)
-	}
-
-	test_RSA_PKCS1 := func(t *testing.T, p *Policy, rsaKey *rsa.PrivateKey, hashType HashType,
-		marshalingType MarshalingType,
-	) {
-		unsaltedOptions := SigningOptions{
-			HashAlgorithm: hashType,
-			Marshaling:    marshalingType,
-			SigAlgorithm:  sigAlgorithm,
-		}
-		cryptoHash := CryptoHashMap[hashType]
-
-		// PKCS#1v1.5 NoOID uses a direct input and assumes it is pre-hashed.
-		if hashType != 0 {
-			hash := cryptoHash.New()
-			hash.Write(input)
-			input = hash.Sum(nil)
-		}
-
-		// 1. Make a signature with the given key size and hash algorithm.
-		t.Log(tabs[3], "Make an automatic signature")
-		sig, err := p.Sign(0, nil, input, hashType, sigAlgorithm, marshalingType)
-		if err != nil {
-			// A bit of a hack but FIPS go does not support some hash types
-			if isUnsupportedGoHashType(hashType, err) {
-				t.Skip(tabs[4], "skipping test as FIPS Go does not support hash type")
-				return
-			}
-			t.Fatal(tabs[4], "❌ Failed to automatically sign:", err)
-		}
-
-		// 1.1 Verify this signature using the *inferred* salt length.
-		autoVerify(4, t, p, input, sig, unsaltedOptions)
-	}
-
-	rsaKeyTypes := []KeyType{KeyType_RSA2048, KeyType_RSA3072, KeyType_RSA4096}
-	testKeys, err := generateTestKeys()
-	if err != nil {
-		t.Fatalf("error generating test keys: %s", err)
-	}
-
-	// 1. For each standard RSA key size 2048, 3072, and 4096...
-	for _, rsaKeyType := range rsaKeyTypes {
-		t.Log("Key size: ", rsaKeyType)
-		p := &Policy{
-			Name: fmt.Sprint(rsaKeyType), // NOTE: crucial to create a new key per key size
-			Type: rsaKeyType,
-		}
-
-		rsaKeyBytes := testKeys[rsaKeyType]
-		err := p.Import(ctx, storage, rsaKeyBytes, rand.Reader)
-		if err != nil {
-			t.Fatal(tabs[1], "❌ Failed to import key:", err)
-		}
-		rsaKeyAny, err := x509.ParsePKCS8PrivateKey(rsaKeyBytes)
-		if err != nil {
-			t.Fatalf("error parsing test keys: %s", err)
-		}
-		rsaKey := rsaKeyAny.(*rsa.PrivateKey)
-
-		// 2. For each hash algorithm...
-		for hashAlgorithm, hashType := range HashTypeMap {
-			t.Log(tabs[1], "Hash algorithm:", hashAlgorithm)
-
-			// 3. For each marshaling type...
-			for marshalingName, marshalingType := range MarshalingTypeMap {
-				t.Log(tabs[2], "Marshaling type:", marshalingName)
-				testName := fmt.Sprintf("%s-%s-%s", rsaKeyType, hashAlgorithm, marshalingName)
-				t.Run(testName, func(t *testing.T) { test_RSA_PKCS1(t, p, rsaKey, hashType, marshalingType) })
-			}
-		}
-	}
-}
-
 // Normal Go builds support all the hash functions for RSA_PSS signatures but the
 // FIPS Go build does not support at this time the SHA3 hashes as FIPS 140_2 does
 // not accept them.
diff --git a/sdk/helper/keysutil/transit_lru.go b/sdk/helper/keysutil/transit_lru.go
index 66ea66dc74e23..cd1f6dafe693e 100644
--- a/sdk/helper/keysutil/transit_lru.go
+++ b/sdk/helper/keysutil/transit_lru.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package keysutil
 
 import lru "github.com/hashicorp/golang-lru"
diff --git a/sdk/helper/keysutil/transit_syncmap.go b/sdk/helper/keysutil/transit_syncmap.go
index fddcf706b2f12..ce9071380a996 100644
--- a/sdk/helper/keysutil/transit_syncmap.go
+++ b/sdk/helper/keysutil/transit_syncmap.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package keysutil
 
 import (
diff --git a/sdk/helper/keysutil/util.go b/sdk/helper/keysutil/util.go
index 94a56d42c5735..063af5914672d 100644
--- a/sdk/helper/keysutil/util.go
+++ b/sdk/helper/keysutil/util.go
@@ -1,10 +1,6 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package keysutil
 
 import (
-	"crypto/x509"
 	"crypto/x509/pkix"
 	"encoding/asn1"
 	"errors"
@@ -57,9 +53,6 @@ var (
 	// Other implementations may use the OID 1.3.101.110 from
 	// https://datatracker.ietf.org/doc/html/rfc8410.
 	oidRFC8410Ed25519 = asn1.ObjectIdentifier{1, 3, 101, 110}
-
-	// See crypto/x509/x509.go in the Go toolchain source distribution.
-	oidSignatureRSAPSS = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 10}
 )
 
 func isEd25519OID(oid asn1.ObjectIdentifier) bool {
@@ -120,32 +113,3 @@ func ParsePKCS8Ed25519PrivateKey(der []byte) (key interface{}, err error) {
 
 	return ed25519.NewKeyFromSeed(ed25519Key.PrivateKey), nil
 }
-
-// ParsePKCS8PrivateKey parses an unencrypted private key in PKCS #8, ASN.1 DER form.
-//
-// This helper only supports RSA/PSS keys (with OID 1.2.840.113549.1.1.10).
-//
-// It returns a *rsa.PrivateKey, a *ecdsa.PrivateKey, or a ed25519.PrivateKey.
-// More types might be supported in the future.
-//
-// This kind of key is commonly encoded in PEM blocks of type "PRIVATE KEY".
-func ParsePKCS8RSAPSSPrivateKey(der []byte) (key interface{}, err error) {
-	var privKey pkcs8
-	if _, err := asn1.Unmarshal(der, &privKey); err == nil {
-		switch {
-		case privKey.Algo.Algorithm.Equal(oidSignatureRSAPSS):
-			// Fall through; there's no parameters here unlike ECDSA
-			// containers, so we can go to parsing the inner rsaPrivateKey
-			// object.
-		default:
-			return nil, errors.New("keysutil: failed to parse key as RSA PSS private key")
-		}
-	}
-
-	key, err = x509.ParsePKCS1PrivateKey(privKey.PrivateKey)
-	if err != nil {
-		return nil, fmt.Errorf("keysutil: failed to parse inner RSA PSS private key: %w", err)
-	}
-
-	return key, nil
-}
diff --git a/sdk/helper/ldaputil/client.go b/sdk/helper/ldaputil/client.go
index c3562a5d406df..bbdca9a4e6a8b 100644
--- a/sdk/helper/ldaputil/client.go
+++ b/sdk/helper/ldaputil/client.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package ldaputil
 
 import (
@@ -139,11 +136,10 @@ func (c *Client) makeLdapSearchRequest(cfg *ConfigEntry, conn Connection, userna
 		c.Logger.Debug("discovering user", "userdn", cfg.UserDN, "filter", renderedFilter)
 	}
 	ldapRequest := &ldap.SearchRequest{
-		BaseDN:       cfg.UserDN,
-		DerefAliases: ldapDerefAliasMap[cfg.DerefAliases],
-		Scope:        ldap.ScopeWholeSubtree,
-		Filter:       renderedFilter,
-		SizeLimit:    2, // Should be only 1 result. Any number larger (2 or more) means access denied.
+		BaseDN:    cfg.UserDN,
+		Scope:     ldap.ScopeWholeSubtree,
+		Filter:    renderedFilter,
+		SizeLimit: 2, // Should be only 1 result. Any number larger (2 or more) means access denied.
 		Attributes: []string{
 			cfg.UserAttr, // Return only needed attributes
 		},
@@ -230,10 +226,6 @@ func (c *Client) RenderUserSearchFilter(cfg *ConfigEntry, username string) (stri
 		context.Username = fmt.Sprintf("%s@%s", EscapeLDAPValue(username), cfg.UPNDomain)
 	}
 
-	// Execute the template. Note that the template context contains escaped input and does
-	// not provide behavior via functions. Additionally, no function map has been provided
-	// during template initialization. The only template functions available during execution
-	// are the predefined global functions: https://pkg.go.dev/text/template#hdr-Functions
 	var renderedFilter bytes.Buffer
 	if err := t.Execute(&renderedFilter, context); err != nil {
 		return "", fmt.Errorf("LDAP search failed due to template parsing error: %w", err)
@@ -299,11 +291,10 @@ func (c *Client) GetUserDN(cfg *ConfigEntry, conn Connection, bindDN, username s
 			c.Logger.Debug("searching upn", "userdn", cfg.UserDN, "filter", filter)
 		}
 		result, err := conn.Search(&ldap.SearchRequest{
-			BaseDN:       cfg.UserDN,
-			Scope:        ldap.ScopeWholeSubtree,
-			DerefAliases: ldapDerefAliasMap[cfg.DerefAliases],
-			Filter:       filter,
-			SizeLimit:    math.MaxInt32,
+			BaseDN:    cfg.UserDN,
+			Scope:     ldap.ScopeWholeSubtree,
+			Filter:    filter,
+			SizeLimit: math.MaxInt32,
 		})
 		if err != nil {
 			return userDN, fmt.Errorf("LDAP search failed for detecting user: %w", err)
@@ -361,10 +352,9 @@ func (c *Client) performLdapFilterGroupsSearch(cfg *ConfigEntry, conn Connection
 	}
 
 	result, err := conn.Search(&ldap.SearchRequest{
-		BaseDN:       cfg.GroupDN,
-		Scope:        ldap.ScopeWholeSubtree,
-		DerefAliases: ldapDerefAliasMap[cfg.DerefAliases],
-		Filter:       renderedQuery.String(),
+		BaseDN: cfg.GroupDN,
+		Scope:  ldap.ScopeWholeSubtree,
+		Filter: renderedQuery.String(),
 		Attributes: []string{
 			cfg.GroupAttr,
 		},
@@ -410,10 +400,6 @@ func (c *Client) performLdapFilterGroupsSearchPaging(cfg *ConfigEntry, conn Pagi
 		ldap.EscapeFilter(username),
 	}
 
-	// Execute the template. Note that the template context contains escaped input and does
-	// not provide behavior via functions. Additionally, no function map has been provided
-	// during template initialization. The only template functions available during execution
-	// are the predefined global functions: https://pkg.go.dev/text/template#hdr-Functions
 	var renderedQuery bytes.Buffer
 	if err := t.Execute(&renderedQuery, context); err != nil {
 		return nil, fmt.Errorf("LDAP search failed due to template parsing error: %w", err)
@@ -424,10 +410,9 @@ func (c *Client) performLdapFilterGroupsSearchPaging(cfg *ConfigEntry, conn Pagi
 	}
 
 	result, err := conn.SearchWithPaging(&ldap.SearchRequest{
-		BaseDN:       cfg.GroupDN,
-		Scope:        ldap.ScopeWholeSubtree,
-		DerefAliases: ldapDerefAliasMap[cfg.DerefAliases],
-		Filter:       renderedQuery.String(),
+		BaseDN: cfg.GroupDN,
+		Scope:  ldap.ScopeWholeSubtree,
+		Filter: renderedQuery.String(),
 		Attributes: []string{
 			cfg.GroupAttr,
 		},
@@ -474,10 +459,9 @@ func sidBytesToString(b []byte) (string, error) {
 
 func (c *Client) performLdapTokenGroupsSearch(cfg *ConfigEntry, conn Connection, userDN string) ([]*ldap.Entry, error) {
 	result, err := conn.Search(&ldap.SearchRequest{
-		BaseDN:       userDN,
-		Scope:        ldap.ScopeBaseObject,
-		DerefAliases: ldapDerefAliasMap[cfg.DerefAliases],
-		Filter:       "(objectClass=*)",
+		BaseDN: userDN,
+		Scope:  ldap.ScopeBaseObject,
+		Filter: "(objectClass=*)",
 		Attributes: []string{
 			"tokenGroups",
 		},
@@ -503,10 +487,9 @@ func (c *Client) performLdapTokenGroupsSearch(cfg *ConfigEntry, conn Connection,
 		}
 
 		groupResult, err := conn.Search(&ldap.SearchRequest{
-			BaseDN:       fmt.Sprintf("<SID=%s>", sidString),
-			Scope:        ldap.ScopeBaseObject,
-			DerefAliases: ldapDerefAliasMap[cfg.DerefAliases],
-			Filter:       "(objectClass=*)",
+			BaseDN: fmt.Sprintf("<SID=%s>", sidString),
+			Scope:  ldap.ScopeBaseObject,
+			Filter: "(objectClass=*)",
 			Attributes: []string{
 				"1.1", // RFC no attributes
 			},
diff --git a/sdk/helper/ldaputil/client_test.go b/sdk/helper/ldaputil/client_test.go
index 167d50f22d628..c9ae9cd4baa5a 100644
--- a/sdk/helper/ldaputil/client_test.go
+++ b/sdk/helper/ldaputil/client_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package ldaputil
 
 import (
diff --git a/sdk/helper/ldaputil/config.go b/sdk/helper/ldaputil/config.go
index dfa34daddfd08..041ed0704ae05 100644
--- a/sdk/helper/ldaputil/config.go
+++ b/sdk/helper/ldaputil/config.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package ldaputil
 
 import (
@@ -16,17 +13,8 @@ import (
 	"github.com/hashicorp/vault/sdk/framework"
 
 	"github.com/hashicorp/errwrap"
-
-	"github.com/go-ldap/ldap/v3"
 )
 
-var ldapDerefAliasMap = map[string]int{
-	"never":     ldap.NeverDerefAliases,
-	"finding":   ldap.DerefFindingBaseObj,
-	"searching": ldap.DerefInSearching,
-	"always":    ldap.DerefAlways,
-}
-
 // ConfigFields returns all the config fields that can potentially be used by the LDAP client.
 // Not all fields will be used by every integration.
 func ConfigFields() map[string]*framework.FieldSchema {
@@ -245,13 +233,6 @@ Default: ({{.UserAttr}}={{.Username}})`,
 			Default:     "30s",
 		},
 
-		"dereference_aliases": {
-			Type:          framework.TypeString,
-			Description:   "When aliases should be dereferenced on search operations. Accepted values are 'never', 'finding', 'searching', 'always'. Defaults to 'never'.",
-			Default:       "never",
-			AllowedValues: []interface{}{"never", "finding", "searching", "always"},
-		},
-
 		"max_page_size": {
 			Type:        framework.TypeInt,
 			Description: "If set to a value greater than 0, the LDAP backend will use the LDAP server's paged search control to request pages of up to the given size. This can be used to avoid hitting the LDAP server's maximum result size limit. Otherwise, the LDAP backend will not use the paged search control.",
@@ -427,10 +408,6 @@ func NewConfigEntry(existing *ConfigEntry, d *framework.FieldData) (*ConfigEntry
 		cfg.ConnectionTimeout = d.Get("connection_timeout").(int)
 	}
 
-	if _, ok := d.Raw["dereference_aliases"]; ok || !hadExisting {
-		cfg.DerefAliases = d.Get("dereference_aliases").(string)
-	}
-
 	if _, ok := d.Raw["max_page_size"]; ok || !hadExisting {
 		cfg.MaximumPageSize = d.Get("max_page_size").(int)
 	}
@@ -462,7 +439,6 @@ type ConfigEntry struct {
 	UsePre111GroupCNBehavior *bool  `json:"use_pre111_group_cn_behavior"`
 	RequestTimeout           int    `json:"request_timeout"`
 	ConnectionTimeout        int    `json:"connection_timeout"`
-	DerefAliases             string `json:"dereference_aliases"`
 	MaximumPageSize          int    `json:"max_page_size"`
 
 	// These json tags deviate from snake case because there was a past issue
@@ -503,7 +479,6 @@ func (c *ConfigEntry) PasswordlessMap() map[string]interface{} {
 		"request_timeout":        c.RequestTimeout,
 		"connection_timeout":     c.ConnectionTimeout,
 		"username_as_alias":      c.UsernameAsAlias,
-		"dereference_aliases":    c.DerefAliases,
 		"max_page_size":          c.MaximumPageSize,
 	}
 	if c.CaseSensitiveNames != nil {
diff --git a/sdk/helper/ldaputil/config_test.go b/sdk/helper/ldaputil/config_test.go
index b7fd22ccbb2df..c0a57253ce7df 100644
--- a/sdk/helper/ldaputil/config_test.go
+++ b/sdk/helper/ldaputil/config_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package ldaputil
 
 import (
@@ -174,7 +171,6 @@ var jsonConfigDefault = []byte(`
   "username_as_alias": false,
   "request_timeout": 90,
   "connection_timeout": 30,
-  "dereference_aliases": "never",
   "max_page_size": 0,
   "CaseSensitiveNames": false,
   "ClientTLSCert": "",
diff --git a/sdk/helper/ldaputil/connection.go b/sdk/helper/ldaputil/connection.go
index c33ad403f78e2..71c83f2f9b3a9 100644
--- a/sdk/helper/ldaputil/connection.go
+++ b/sdk/helper/ldaputil/connection.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package ldaputil
 
 import (
diff --git a/sdk/helper/ldaputil/ldap.go b/sdk/helper/ldaputil/ldap.go
index bdf746e5c8cd4..73e36b230dc0e 100644
--- a/sdk/helper/ldaputil/ldap.go
+++ b/sdk/helper/ldaputil/ldap.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package ldaputil
 
 import (
diff --git a/sdk/helper/license/feature.go b/sdk/helper/license/feature.go
index b42fcd1fc1a19..c7c000a58a30d 100644
--- a/sdk/helper/license/feature.go
+++ b/sdk/helper/license/feature.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package license
 
 // Features is a bitmask of feature flags
diff --git a/sdk/helper/locksutil/locks.go b/sdk/helper/locksutil/locks.go
index c7538b63b4f78..35ffcf739d9dc 100644
--- a/sdk/helper/locksutil/locks.go
+++ b/sdk/helper/locksutil/locks.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package locksutil
 
 import (
diff --git a/sdk/helper/locksutil/locks_test.go b/sdk/helper/locksutil/locks_test.go
index 954a46349ea7e..9916644637779 100644
--- a/sdk/helper/locksutil/locks_test.go
+++ b/sdk/helper/locksutil/locks_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package locksutil
 
 import "testing"
diff --git a/sdk/helper/logging/logging.go b/sdk/helper/logging/logging.go
index 37dcefa477836..211a545e33601 100644
--- a/sdk/helper/logging/logging.go
+++ b/sdk/helper/logging/logging.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package logging
 
 import (
@@ -63,13 +60,16 @@ func ParseLogFormat(format string) (LogFormat, error) {
 	case "json":
 		return JSONFormat, nil
 	default:
-		return UnspecifiedFormat, fmt.Errorf("unknown log format: %s", format)
+		return UnspecifiedFormat, fmt.Errorf("Unknown log format: %s", format)
 	}
 }
 
 // ParseEnvLogFormat parses the log format from an environment variable.
 func ParseEnvLogFormat() LogFormat {
 	logFormat := os.Getenv("VAULT_LOG_FORMAT")
+	if logFormat == "" {
+		logFormat = os.Getenv("LOGXI_FORMAT")
+	}
 	switch strings.ToLower(logFormat) {
 	case "json", "vault_json", "vault-json", "vaultjson":
 		return JSONFormat
diff --git a/sdk/helper/logging/logging_test.go b/sdk/helper/logging/logging_test.go
index 16075524b0b8c..3a860d199c820 100644
--- a/sdk/helper/logging/logging_test.go
+++ b/sdk/helper/logging/logging_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package logging
 
 import (
@@ -24,7 +21,7 @@ func Test_ParseLogFormat(t *testing.T) {
 		{format: "STANDARD", expected: StandardFormat, expectedErr: nil},
 		{format: "json", expected: JSONFormat, expectedErr: nil},
 		{format: " json ", expected: JSONFormat, expectedErr: nil},
-		{format: "bogus", expected: UnspecifiedFormat, expectedErr: errors.New("unknown log format: bogus")},
+		{format: "bogus", expected: UnspecifiedFormat, expectedErr: errors.New("Unknown log format: bogus")},
 	}
 
 	for _, test := range tests {
@@ -45,6 +42,17 @@ func Test_ParseEnv_VAULT_LOG_FORMAT(t *testing.T) {
 	testParseEnvLogFormat(t, "VAULT_LOG_FORMAT")
 }
 
+func Test_ParseEnv_LOGXI_FORMAT(t *testing.T) {
+	oldVLF := os.Getenv("VAULT_LOG_FORMAT")
+	defer os.Setenv("VAULT_LOG_FORMAT", oldVLF)
+
+	oldLogxi := os.Getenv("LOGXI_FORMAT")
+	defer os.Setenv("LOGXI_FORMAT", oldLogxi)
+
+	os.Setenv("VAULT_LOG_FORMAT", "")
+	testParseEnvLogFormat(t, "LOGXI_FORMAT")
+}
+
 func testParseEnvLogFormat(t *testing.T, name string) {
 	env := []string{
 		"json", "vauLT_Json", "VAULT-JSON", "vaulTJSon",
diff --git a/sdk/helper/mlock/mlock.go b/sdk/helper/mlock/mlock.go
index 5820d15af3c1d..1bbf8a0bbbf83 100644
--- a/sdk/helper/mlock/mlock.go
+++ b/sdk/helper/mlock/mlock.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 // DEPRECATED: this has been moved to go-secure-stdlib and will be removed
 package mlock
 
diff --git a/sdk/helper/ocsp/client.go b/sdk/helper/ocsp/client.go
deleted file mode 100644
index c1b9c2fbc37a7..0000000000000
--- a/sdk/helper/ocsp/client.go
+++ /dev/null
@@ -1,1165 +0,0 @@
-// Copyright (c) 2017-2022 Snowflake Computing Inc. All rights reserved.
-
-package ocsp
-
-import (
-	"bytes"
-	"context"
-	"crypto"
-	"crypto/tls"
-	"crypto/x509"
-	"crypto/x509/pkix"
-	"encoding/asn1"
-	"encoding/base64"
-	"errors"
-	"fmt"
-	"io"
-	"math/big"
-	"net"
-	"net/http"
-	"net/url"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/go-multierror"
-	"github.com/hashicorp/go-retryablehttp"
-	lru "github.com/hashicorp/golang-lru"
-	"github.com/hashicorp/vault/sdk/helper/certutil"
-	"golang.org/x/crypto/ocsp"
-)
-
-// FailOpenMode is OCSP fail open mode. FailOpenTrue by default and may
-// set to ocspModeFailClosed for fail closed mode
-type FailOpenMode uint32
-
-type requestFunc func(method, urlStr string, body interface{}) (*retryablehttp.Request, error)
-
-type clientInterface interface {
-	Do(req *retryablehttp.Request) (*http.Response, error)
-}
-
-const (
-	httpHeaderContentType   = "Content-Type"
-	httpHeaderAccept        = "accept"
-	httpHeaderContentLength = "Content-Length"
-	httpHeaderHost          = "Host"
-	ocspRequestContentType  = "application/ocsp-request"
-	ocspResponseContentType = "application/ocsp-response"
-)
-
-const (
-	ocspFailOpenNotSet FailOpenMode = iota
-	// FailOpenTrue represents OCSP fail open mode.
-	FailOpenTrue
-	// FailOpenFalse represents OCSP fail closed mode.
-	FailOpenFalse
-)
-
-const (
-	ocspModeFailOpen   = "FAIL_OPEN"
-	ocspModeFailClosed = "FAIL_CLOSED"
-	ocspModeInsecure   = "INSECURE"
-)
-
-const ocspCacheKey = "ocsp_cache"
-
-const (
-	// defaultOCSPResponderTimeout is the total timeout for OCSP responder.
-	defaultOCSPResponderTimeout = 10 * time.Second
-)
-
-const (
-	// cacheExpire specifies cache data expiration time in seconds.
-	cacheExpire = float64(24 * 60 * 60)
-)
-
-type ocspCachedResponse struct {
-	time       float64
-	producedAt float64
-	thisUpdate float64
-	nextUpdate float64
-	status     ocspStatusCode
-}
-
-type Client struct {
-	// caRoot includes the CA certificates.
-	caRoot map[string]*x509.Certificate
-	// certPool includes the CA certificates.
-	certPool              *x509.CertPool
-	ocspResponseCache     *lru.TwoQueueCache
-	ocspResponseCacheLock sync.RWMutex
-	// cacheUpdated is true if the memory cache is updated
-	cacheUpdated bool
-	logFactory   func() hclog.Logger
-}
-
-type ocspStatusCode int
-
-type ocspStatus struct {
-	code ocspStatusCode
-	err  error
-}
-
-const (
-	ocspSuccess                ocspStatusCode = 0
-	ocspStatusGood             ocspStatusCode = -1
-	ocspStatusRevoked          ocspStatusCode = -2
-	ocspStatusUnknown          ocspStatusCode = -3
-	ocspStatusOthers           ocspStatusCode = -4
-	ocspFailedDecomposeRequest ocspStatusCode = -5
-	ocspInvalidValidity        ocspStatusCode = -6
-	ocspMissedCache            ocspStatusCode = -7
-	ocspCacheExpired           ocspStatusCode = -8
-)
-
-// copied from crypto/ocsp.go
-type certID struct {
-	HashAlgorithm pkix.AlgorithmIdentifier
-	NameHash      []byte
-	IssuerKeyHash []byte
-	SerialNumber  *big.Int
-}
-
-// cache key
-type certIDKey struct {
-	NameHash      string
-	IssuerKeyHash string
-	SerialNumber  string
-}
-
-// copied from crypto/ocsp
-var hashOIDs = map[crypto.Hash]asn1.ObjectIdentifier{
-	crypto.SHA1:   asn1.ObjectIdentifier([]int{1, 3, 14, 3, 2, 26}),
-	crypto.SHA256: asn1.ObjectIdentifier([]int{2, 16, 840, 1, 101, 3, 4, 2, 1}),
-	crypto.SHA384: asn1.ObjectIdentifier([]int{2, 16, 840, 1, 101, 3, 4, 2, 2}),
-	crypto.SHA512: asn1.ObjectIdentifier([]int{2, 16, 840, 1, 101, 3, 4, 2, 3}),
-}
-
-// copied from crypto/ocsp
-func getOIDFromHashAlgorithm(target crypto.Hash) (asn1.ObjectIdentifier, error) {
-	for hash, oid := range hashOIDs {
-		if hash == target {
-			return oid, nil
-		}
-	}
-	return nil, fmt.Errorf("no valid OID is found for the hash algorithm: %v", target)
-}
-
-func (c *Client) ClearCache() {
-	c.ocspResponseCache.Purge()
-}
-
-func (c *Client) getHashAlgorithmFromOID(target pkix.AlgorithmIdentifier) crypto.Hash {
-	for hash, oid := range hashOIDs {
-		if oid.Equal(target.Algorithm) {
-			return hash
-		}
-	}
-	// no valid hash algorithm is found for the oid. Falling back to SHA1
-	return crypto.SHA1
-}
-
-// isInValidityRange checks the validity
-func isInValidityRange(currTime, nextUpdate time.Time) bool {
-	return !nextUpdate.IsZero() && !currTime.After(nextUpdate)
-}
-
-func extractCertIDKeyFromRequest(ocspReq []byte) (*certIDKey, *ocspStatus) {
-	r, err := ocsp.ParseRequest(ocspReq)
-	if err != nil {
-		return nil, &ocspStatus{
-			code: ocspFailedDecomposeRequest,
-			err:  err,
-		}
-	}
-
-	// encode CertID, used as a key in the cache
-	encodedCertID := &certIDKey{
-		base64.StdEncoding.EncodeToString(r.IssuerNameHash),
-		base64.StdEncoding.EncodeToString(r.IssuerKeyHash),
-		r.SerialNumber.String(),
-	}
-	return encodedCertID, &ocspStatus{
-		code: ocspSuccess,
-	}
-}
-
-func (c *Client) encodeCertIDKey(certIDKeyBase64 string) (*certIDKey, error) {
-	r, err := base64.StdEncoding.DecodeString(certIDKeyBase64)
-	if err != nil {
-		return nil, err
-	}
-	var cid certID
-	rest, err := asn1.Unmarshal(r, &cid)
-	if err != nil {
-		// error in parsing
-		return nil, err
-	}
-	if len(rest) > 0 {
-		// extra bytes to the end
-		return nil, err
-	}
-	return &certIDKey{
-		base64.StdEncoding.EncodeToString(cid.NameHash),
-		base64.StdEncoding.EncodeToString(cid.IssuerKeyHash),
-		cid.SerialNumber.String(),
-	}, nil
-}
-
-func (c *Client) checkOCSPResponseCache(encodedCertID *certIDKey, subject, issuer *x509.Certificate) (*ocspStatus, error) {
-	c.ocspResponseCacheLock.RLock()
-	var cacheValue *ocspCachedResponse
-	v, ok := c.ocspResponseCache.Get(*encodedCertID)
-	if ok {
-		cacheValue = v.(*ocspCachedResponse)
-	}
-	c.ocspResponseCacheLock.RUnlock()
-
-	status, err := c.extractOCSPCacheResponseValue(cacheValue, subject, issuer)
-	if err != nil {
-		return nil, err
-	}
-	if !isValidOCSPStatus(status.code) {
-		c.deleteOCSPCache(encodedCertID)
-	}
-	return status, err
-}
-
-func (c *Client) deleteOCSPCache(encodedCertID *certIDKey) {
-	c.ocspResponseCacheLock.Lock()
-	c.ocspResponseCache.Remove(*encodedCertID)
-	c.cacheUpdated = true
-	c.ocspResponseCacheLock.Unlock()
-}
-
-func validateOCSP(ocspRes *ocsp.Response) (*ocspStatus, error) {
-	curTime := time.Now()
-
-	if ocspRes == nil {
-		return nil, errors.New("OCSP Response is nil")
-	}
-	if !isInValidityRange(curTime, ocspRes.NextUpdate) {
-		return &ocspStatus{
-			code: ocspInvalidValidity,
-			err:  fmt.Errorf("invalid validity: producedAt: %v, thisUpdate: %v, nextUpdate: %v", ocspRes.ProducedAt, ocspRes.ThisUpdate, ocspRes.NextUpdate),
-		}, nil
-	}
-	return returnOCSPStatus(ocspRes), nil
-}
-
-func returnOCSPStatus(ocspRes *ocsp.Response) *ocspStatus {
-	switch ocspRes.Status {
-	case ocsp.Good:
-		return &ocspStatus{
-			code: ocspStatusGood,
-			err:  nil,
-		}
-	case ocsp.Revoked:
-		return &ocspStatus{
-			code: ocspStatusRevoked,
-		}
-	case ocsp.Unknown:
-		return &ocspStatus{
-			code: ocspStatusUnknown,
-			err:  errors.New("OCSP status unknown."),
-		}
-	default:
-		return &ocspStatus{
-			code: ocspStatusOthers,
-			err:  fmt.Errorf("OCSP others. %v", ocspRes.Status),
-		}
-	}
-}
-
-// retryOCSP is the second level of retry method if the returned contents are corrupted. It often happens with OCSP
-// serer and retry helps.
-func (c *Client) retryOCSP(
-	ctx context.Context,
-	client clientInterface,
-	req requestFunc,
-	ocspHost *url.URL,
-	headers map[string]string,
-	reqBody []byte,
-	issuer *x509.Certificate,
-) (ocspRes *ocsp.Response, ocspResBytes []byte, ocspS *ocspStatus, retErr error) {
-	doRequest := func(request *retryablehttp.Request) (*http.Response, error) {
-		if request != nil {
-			request = request.WithContext(ctx)
-			for k, v := range headers {
-				request.Header[k] = append(request.Header[k], v)
-			}
-		}
-		res, err := client.Do(request)
-		if err != nil {
-			return nil, err
-		}
-		c.Logger().Debug("StatusCode from OCSP Server:", "statusCode", res.StatusCode)
-		return res, err
-	}
-
-	for _, method := range []string{"GET", "POST"} {
-		reqUrl := *ocspHost
-		var body []byte
-
-		switch method {
-		case "GET":
-			reqUrl.Path = reqUrl.Path + "/" + base64.StdEncoding.EncodeToString(reqBody)
-		case "POST":
-			body = reqBody
-		default:
-			// Programming error; all request/systems errors are multierror
-			// and appended.
-			return nil, nil, nil, fmt.Errorf("unknown request method: %v", method)
-		}
-
-		var res *http.Response
-		request, err := req(method, reqUrl.String(), bytes.NewBuffer(body))
-		if err != nil {
-			err = fmt.Errorf("error creating %v request: %w", method, err)
-			retErr = multierror.Append(retErr, err)
-			continue
-		}
-		if res, err = doRequest(request); err != nil {
-			err = fmt.Errorf("error doing %v request: %w", method, err)
-			retErr = multierror.Append(retErr, err)
-			continue
-		} else {
-			defer res.Body.Close()
-		}
-
-		if res.StatusCode != http.StatusOK {
-			err = fmt.Errorf("HTTP code is not OK on %v request. %v: %v", method, res.StatusCode, res.Status)
-			retErr = multierror.Append(retErr, err)
-			continue
-		}
-
-		ocspResBytes, err = io.ReadAll(res.Body)
-		if err != nil {
-			err = fmt.Errorf("error reading %v request body: %w", method, err)
-			retErr = multierror.Append(retErr, err)
-			continue
-		}
-
-		// Reading an OCSP response shouldn't be fatal. A misconfigured
-		// endpoint might return invalid results for e.g., GET but return
-		// valid results for POST on retry. This could happen if e.g., the
-		// server responds with JSON.
-		ocspRes, err = ocsp.ParseResponse(ocspResBytes /*issuer = */, nil /* !!unsafe!! */)
-		if err != nil {
-			err = fmt.Errorf("error parsing %v OCSP response: %w", method, err)
-			retErr = multierror.Append(retErr, err)
-			continue
-		}
-
-		// Above, we use the unsafe issuer=nil parameter to ocsp.ParseResponse
-		// because Go's library does the wrong thing.
-		//
-		// Here, we lack a full chain, but we know we trust the parent issuer,
-		// so if the Go library incorrectly discards useful certificates, we
-		// likely cannot verify this without passing through the full chain
-		// back to the root.
-		//
-		// Instead, take one of two paths: 1. if there is no certificate in
-		// the ocspRes, verify the OCSP response directly with our trusted
-		// issuer certificate, or 2. if there is a certificate, either verify
-		// it directly matches our trusted issuer certificate, or verify it
-		// is signed by our trusted issuer certificate.
-		//
-		// See also: https://github.com/golang/go/issues/59641
-		//
-		// This addresses the !!unsafe!! behavior above.
-		if ocspRes.Certificate == nil {
-			if err := ocspRes.CheckSignatureFrom(issuer); err != nil {
-				err = fmt.Errorf("error directly verifying signature on %v OCSP response: %w", method, err)
-				retErr = multierror.Append(retErr, err)
-				continue
-			}
-		} else {
-			// Because we have at least one certificate here, we know that
-			// Go's ocsp library verified the signature from this certificate
-			// onto the response and it was valid. Now we need to know we trust
-			// this certificate. There's two ways we can do this:
-			//
-			// 1. Via confirming issuer == ocspRes.Certificate, or
-			// 2. Via confirming ocspRes.Certificate.CheckSignatureFrom(issuer).
-			if !bytes.Equal(issuer.Raw, ocspRes.Raw) {
-				// 1 must not hold, so 2 holds; verify the signature.
-				if err := ocspRes.Certificate.CheckSignatureFrom(issuer); err != nil {
-					err = fmt.Errorf("error checking chain of trust on %v OCSP response via %v failed: %w", method, issuer.Subject.String(), err)
-					retErr = multierror.Append(retErr, err)
-					continue
-				}
-
-				// Verify the OCSP responder certificate is still valid and
-				// contains the required EKU since it is a delegated OCSP
-				// responder certificate.
-				if ocspRes.Certificate.NotAfter.Before(time.Now()) {
-					err := fmt.Errorf("error checking delegated OCSP responder on %v OCSP response: certificate has expired", method)
-					retErr = multierror.Append(retErr, err)
-					continue
-				}
-				haveEKU := false
-				for _, ku := range ocspRes.Certificate.ExtKeyUsage {
-					if ku == x509.ExtKeyUsageOCSPSigning {
-						haveEKU = true
-						break
-					}
-				}
-				if !haveEKU {
-					err := fmt.Errorf("error checking delegated OCSP responder on %v OCSP response: certificate lacks the OCSP Signing EKU", method)
-					retErr = multierror.Append(retErr, err)
-					continue
-				}
-			}
-		}
-
-		// While we haven't validated the signature on the OCSP response, we
-		// got what we presume is a definitive answer and simply changing
-		// methods will likely not help us in that regard. Use this status
-		// to return without retrying another method, when it looks definitive.
-		//
-		// We don't accept ocsp.Unknown here: presumably, we could've hit a CDN
-		// with static mapping of request->responses, with a default "unknown"
-		// handler for everything else. By retrying here, we use POST, which
-		// could hit a live OCSP server with fresher data than the cached CDN.
-		if ocspRes.Status == ocsp.Good || ocspRes.Status == ocsp.Revoked {
-			break
-		}
-
-		// Here, we didn't have a valid response. Even though we didn't get an
-		// error, we should inform the user that this (valid-looking) response
-		// wasn't utilized.
-		err = fmt.Errorf("fetched %v OCSP response of status %v; wanted either good (%v) or revoked (%v)", method, ocspRes.Status, ocsp.Good, ocsp.Revoked)
-		retErr = multierror.Append(retErr, err)
-	}
-
-	if ocspRes != nil && ocspResBytes != nil {
-		// Clear retErr, because we have one parseable-but-maybe-not-quite-correct
-		// OCSP response.
-		retErr = nil
-		ocspS = &ocspStatus{
-			code: ocspSuccess,
-		}
-	}
-
-	return
-}
-
-// GetRevocationStatus checks the certificate revocation status for subject using issuer certificate.
-func (c *Client) GetRevocationStatus(ctx context.Context, subject, issuer *x509.Certificate, conf *VerifyConfig) (*ocspStatus, error) {
-	status, ocspReq, encodedCertID, err := c.validateWithCache(subject, issuer)
-	if err != nil {
-		return nil, err
-	}
-	if isValidOCSPStatus(status.code) {
-		return status, nil
-	}
-	if ocspReq == nil || encodedCertID == nil {
-		return status, nil
-	}
-	c.Logger().Debug("cache missed", "server", subject.OCSPServer)
-	if len(subject.OCSPServer) == 0 && len(conf.OcspServersOverride) == 0 {
-		return nil, fmt.Errorf("no OCSP responder URL: subject: %v", subject.Subject)
-	}
-	ocspHosts := subject.OCSPServer
-	if len(conf.OcspServersOverride) > 0 {
-		ocspHosts = conf.OcspServersOverride
-	}
-
-	var wg sync.WaitGroup
-
-	ocspStatuses := make([]*ocspStatus, len(ocspHosts))
-	ocspResponses := make([]*ocsp.Response, len(ocspHosts))
-	errors := make([]error, len(ocspHosts))
-
-	for i, ocspHost := range ocspHosts {
-		u, err := url.Parse(ocspHost)
-		if err != nil {
-			return nil, err
-		}
-
-		hostname := u.Hostname()
-
-		headers := make(map[string]string)
-		headers[httpHeaderContentType] = ocspRequestContentType
-		headers[httpHeaderAccept] = ocspResponseContentType
-		headers[httpHeaderContentLength] = strconv.Itoa(len(ocspReq))
-		headers[httpHeaderHost] = hostname
-		timeout := defaultOCSPResponderTimeout
-
-		ocspClient := retryablehttp.NewClient()
-		ocspClient.HTTPClient.Timeout = timeout
-		ocspClient.HTTPClient.Transport = newInsecureOcspTransport(conf.ExtraCas)
-
-		doRequest := func() error {
-			if conf.QueryAllServers {
-				defer wg.Done()
-			}
-			ocspRes, _, ocspS, err := c.retryOCSP(
-				ctx, ocspClient, retryablehttp.NewRequest, u, headers, ocspReq, issuer)
-			ocspResponses[i] = ocspRes
-			if err != nil {
-				errors[i] = err
-				return err
-			}
-			if ocspS.code != ocspSuccess {
-				ocspStatuses[i] = ocspS
-				return nil
-			}
-
-			ret, err := validateOCSP(ocspRes)
-			if err != nil {
-				errors[i] = err
-				return err
-			}
-			if isValidOCSPStatus(ret.code) {
-				ocspStatuses[i] = ret
-			}
-			return nil
-		}
-		if conf.QueryAllServers {
-			wg.Add(1)
-			go doRequest()
-		} else {
-			err = doRequest()
-			if err == nil {
-				break
-			}
-		}
-	}
-	if conf.QueryAllServers {
-		wg.Wait()
-	}
-	// Good by default
-	var ret *ocspStatus
-	ocspRes := ocspResponses[0]
-	var firstError error
-	for i := range ocspHosts {
-		if errors[i] != nil {
-			if firstError == nil {
-				firstError = errors[i]
-			}
-		} else if ocspStatuses[i] != nil {
-			switch ocspStatuses[i].code {
-			case ocspStatusRevoked:
-				ret = ocspStatuses[i]
-				ocspRes = ocspResponses[i]
-				break
-			case ocspStatusGood:
-				// Use this response only if we don't have a status already, or if what we have was unknown
-				if ret == nil || ret.code == ocspStatusUnknown {
-					ret = ocspStatuses[i]
-					ocspRes = ocspResponses[i]
-				}
-			case ocspStatusUnknown:
-				if ret == nil {
-					// We may want to use this as the overall result
-					ret = ocspStatuses[i]
-					ocspRes = ocspResponses[i]
-				}
-			}
-		}
-	}
-
-	// If no server reported the cert revoked, but we did have an error, report it
-	if (ret == nil || ret.code == ocspStatusUnknown) && firstError != nil {
-		return nil, firstError
-	}
-	// otherwise ret should contain a response for the overall request
-
-	if !isValidOCSPStatus(ret.code) {
-		return ret, nil
-	}
-	v := ocspCachedResponse{
-		status:     ret.code,
-		time:       float64(time.Now().UTC().Unix()),
-		producedAt: float64(ocspRes.ProducedAt.UTC().Unix()),
-		thisUpdate: float64(ocspRes.ThisUpdate.UTC().Unix()),
-		nextUpdate: float64(ocspRes.NextUpdate.UTC().Unix()),
-	}
-
-	c.ocspResponseCacheLock.Lock()
-	c.ocspResponseCache.Add(*encodedCertID, &v)
-	c.cacheUpdated = true
-	c.ocspResponseCacheLock.Unlock()
-	return ret, nil
-}
-
-func isValidOCSPStatus(status ocspStatusCode) bool {
-	return status == ocspStatusGood || status == ocspStatusRevoked || status == ocspStatusUnknown
-}
-
-type VerifyConfig struct {
-	OcspEnabled         bool
-	ExtraCas            []*x509.Certificate
-	OcspServersOverride []string
-	OcspFailureMode     FailOpenMode
-	QueryAllServers     bool
-}
-
-// VerifyLeafCertificate verifies just the subject against it's direct issuer
-func (c *Client) VerifyLeafCertificate(ctx context.Context, subject, issuer *x509.Certificate, conf *VerifyConfig) error {
-	results, err := c.GetRevocationStatus(ctx, subject, issuer, conf)
-	if err != nil {
-		return err
-	}
-	if results.code == ocspStatusGood {
-		return nil
-	} else {
-		serial := issuer.SerialNumber
-		serialHex := strings.TrimSpace(certutil.GetHexFormatted(serial.Bytes(), ":"))
-		if results.code == ocspStatusRevoked {
-			return fmt.Errorf("certificate with serial number %s has been revoked", serialHex)
-		} else if conf.OcspFailureMode == FailOpenFalse {
-			return fmt.Errorf("unknown OCSP status for cert with serial number %s", strings.TrimSpace(certutil.GetHexFormatted(serial.Bytes(), ":")))
-		} else {
-			c.Logger().Warn("could not validate OCSP status for cert, but continuing in fail open mode", "serial", serialHex)
-		}
-	}
-	return nil
-}
-
-// VerifyPeerCertificate verifies all of certificate revocation status
-func (c *Client) VerifyPeerCertificate(ctx context.Context, verifiedChains [][]*x509.Certificate, conf *VerifyConfig) error {
-	for i := 0; i < len(verifiedChains); i++ {
-		// Certificate signed by Root CA. This should be one before the last in the Certificate Chain
-		numberOfNoneRootCerts := len(verifiedChains[i]) - 1
-		if !verifiedChains[i][numberOfNoneRootCerts].IsCA || string(verifiedChains[i][numberOfNoneRootCerts].RawIssuer) != string(verifiedChains[i][numberOfNoneRootCerts].RawSubject) {
-			// Check if the last Non Root Cert is also a CA or is self signed.
-			// if the last certificate is not, add it to the list
-			rca := c.caRoot[string(verifiedChains[i][numberOfNoneRootCerts].RawIssuer)]
-			if rca == nil {
-				return fmt.Errorf("failed to find root CA. pkix.name: %v", verifiedChains[i][numberOfNoneRootCerts].Issuer)
-			}
-			verifiedChains[i] = append(verifiedChains[i], rca)
-			numberOfNoneRootCerts++
-		}
-		results, err := c.GetAllRevocationStatus(ctx, verifiedChains[i], conf)
-		if err != nil {
-			return err
-		}
-		if r := c.canEarlyExitForOCSP(results, numberOfNoneRootCerts, conf); r != nil {
-			return r.err
-		}
-	}
-
-	return nil
-}
-
-func (c *Client) canEarlyExitForOCSP(results []*ocspStatus, chainSize int, conf *VerifyConfig) *ocspStatus {
-	msg := ""
-	if conf.OcspFailureMode == FailOpenFalse {
-		// Fail closed. any error is returned to stop connection
-		for _, r := range results {
-			if r.err != nil {
-				return r
-			}
-		}
-	} else {
-		// Fail open and all results are valid.
-		allValid := len(results) == chainSize
-		for _, r := range results {
-			if !isValidOCSPStatus(r.code) {
-				allValid = false
-				break
-			}
-		}
-		for _, r := range results {
-			if allValid && r.code == ocspStatusRevoked {
-				return r
-			}
-			if r != nil && r.code != ocspStatusGood && r.err != nil {
-				msg += "" + r.err.Error()
-			}
-		}
-	}
-	if len(msg) > 0 {
-		c.Logger().Warn(
-			"OCSP is set to fail-open, and could not retrieve OCSP based revocation checking but proceeding.", "detail", msg)
-	}
-	return nil
-}
-
-func (c *Client) validateWithCacheForAllCertificates(verifiedChains []*x509.Certificate) (bool, error) {
-	n := len(verifiedChains) - 1
-	for j := 0; j < n; j++ {
-		subject := verifiedChains[j]
-		issuer := verifiedChains[j+1]
-		status, _, _, err := c.validateWithCache(subject, issuer)
-		if err != nil {
-			return false, err
-		}
-		if !isValidOCSPStatus(status.code) {
-			return false, nil
-		}
-	}
-	return true, nil
-}
-
-func (c *Client) validateWithCache(subject, issuer *x509.Certificate) (*ocspStatus, []byte, *certIDKey, error) {
-	ocspReq, err := ocsp.CreateRequest(subject, issuer, &ocsp.RequestOptions{})
-	if err != nil {
-		return nil, nil, nil, fmt.Errorf("failed to create OCSP request from the certificates: %v", err)
-	}
-	encodedCertID, ocspS := extractCertIDKeyFromRequest(ocspReq)
-	if ocspS.code != ocspSuccess {
-		return nil, nil, nil, fmt.Errorf("failed to extract CertID from OCSP Request: %v", err)
-	}
-	status, err := c.checkOCSPResponseCache(encodedCertID, subject, issuer)
-	if err != nil {
-		return nil, nil, nil, err
-	}
-	return status, ocspReq, encodedCertID, nil
-}
-
-func (c *Client) GetAllRevocationStatus(ctx context.Context, verifiedChains []*x509.Certificate, conf *VerifyConfig) ([]*ocspStatus, error) {
-	_, err := c.validateWithCacheForAllCertificates(verifiedChains)
-	if err != nil {
-		return nil, err
-	}
-	n := len(verifiedChains) - 1
-	results := make([]*ocspStatus, n)
-	for j := 0; j < n; j++ {
-		results[j], err = c.GetRevocationStatus(ctx, verifiedChains[j], verifiedChains[j+1], conf)
-		if err != nil {
-			return nil, err
-		}
-		if !isValidOCSPStatus(results[j].code) {
-			return results, nil
-		}
-	}
-	return results, nil
-}
-
-// verifyPeerCertificateSerial verifies the certificate revocation status in serial.
-func (c *Client) verifyPeerCertificateSerial(conf *VerifyConfig) func(_ [][]byte, verifiedChains [][]*x509.Certificate) (err error) {
-	return func(_ [][]byte, verifiedChains [][]*x509.Certificate) error {
-		return c.VerifyPeerCertificate(context.TODO(), verifiedChains, conf)
-	}
-}
-
-func (c *Client) extractOCSPCacheResponseValueWithoutSubject(cacheValue ocspCachedResponse) (*ocspStatus, error) {
-	return c.extractOCSPCacheResponseValue(&cacheValue, nil, nil)
-}
-
-func (c *Client) extractOCSPCacheResponseValue(cacheValue *ocspCachedResponse, subject, issuer *x509.Certificate) (*ocspStatus, error) {
-	subjectName := "Unknown"
-	if subject != nil {
-		subjectName = subject.Subject.CommonName
-	}
-
-	curTime := time.Now()
-	if cacheValue == nil {
-		return &ocspStatus{
-			code: ocspMissedCache,
-			err:  fmt.Errorf("miss cache data. subject: %v", subjectName),
-		}, nil
-	}
-	currentTime := float64(curTime.UTC().Unix())
-	if currentTime-cacheValue.time >= cacheExpire {
-		return &ocspStatus{
-			code: ocspCacheExpired,
-			err: fmt.Errorf("cache expired. current: %v, cache: %v",
-				time.Unix(int64(currentTime), 0).UTC(), time.Unix(int64(cacheValue.time), 0).UTC()),
-		}, nil
-	}
-
-	return validateOCSP(&ocsp.Response{
-		ProducedAt: time.Unix(int64(cacheValue.producedAt), 0).UTC(),
-		ThisUpdate: time.Unix(int64(cacheValue.thisUpdate), 0).UTC(),
-		NextUpdate: time.Unix(int64(cacheValue.nextUpdate), 0).UTC(),
-		Status:     int(cacheValue.status),
-	})
-}
-
-/*
-// writeOCSPCache writes a OCSP Response cache
-func (c *Client) writeOCSPCache(ctx context.Context, storage logical.Storage) error {
-	c.Logger().Debug("writing OCSP Response cache")
-	t := time.Now()
-	m := make(map[string][]interface{})
-	keys := c.ocspResponseCache.Keys()
-	if len(keys) > persistedCacheSize {
-		keys = keys[:persistedCacheSize]
-	}
-	for _, k := range keys {
-		e, ok := c.ocspResponseCache.Get(k)
-		if ok {
-			entry := e.(*ocspCachedResponse)
-			// Don't store if expired
-			if isInValidityRange(t, time.Unix(int64(entry.thisUpdate), 0), time.Unix(int64(entry.nextUpdate), 0)) {
-				key := k.(certIDKey)
-				cacheKeyInBase64, err := decodeCertIDKey(&key)
-				if err != nil {
-					return err
-				}
-				m[cacheKeyInBase64] = []interface{}{entry.status, entry.time, entry.producedAt, entry.thisUpdate, entry.nextUpdate}
-			}
-		}
-	}
-
-	v, err := jsonutil.EncodeJSONAndCompress(m, nil)
-	if err != nil {
-		return err
-	}
-	entry := logical.StorageEntry{
-		Key:   ocspCacheKey,
-		Value: v,
-	}
-	return storage.Put(ctx, &entry)
-}
-
-// readOCSPCache reads a OCSP Response cache from storage
-func (c *Client) readOCSPCache(ctx context.Context, storage logical.Storage) error {
-	c.Logger().Debug("reading OCSP Response cache")
-
-	entry, err := storage.Get(ctx, ocspCacheKey)
-	if err != nil {
-		return err
-	}
-	if entry == nil {
-		return nil
-	}
-	var untypedCache map[string][]interface{}
-
-	err = jsonutil.DecodeJSON(entry.Value, &untypedCache)
-	if err != nil {
-		return errors.New("failed to unmarshal OCSP cache")
-	}
-
-	for k, v := range untypedCache {
-		key, err := c.encodeCertIDKey(k)
-		if err != nil {
-			return err
-		}
-		var times [4]float64
-		for i, t := range v[1:] {
-			if jn, ok := t.(json.Number); ok {
-				times[i], err = jn.Float64()
-				if err != nil {
-					return err
-				}
-			} else {
-				times[i] = t.(float64)
-			}
-		}
-		var status int
-		if jn, ok := v[0].(json.Number); ok {
-			s, err := jn.Int64()
-			if err != nil {
-				return err
-			}
-			status = int(s)
-		} else {
-			status = v[0].(int)
-		}
-
-		c.ocspResponseCache.Add(*key, &ocspCachedResponse{
-			status:     ocspStatusCode(status),
-			time:       times[0],
-			producedAt: times[1],
-			thisUpdate: times[2],
-			nextUpdate: times[3],
-		})
-	}
-
-	return nil
-}
-*/
-
-func New(logFactory func() hclog.Logger, cacheSize int) *Client {
-	if cacheSize < 100 {
-		cacheSize = 100
-	}
-	cache, _ := lru.New2Q(cacheSize)
-	c := Client{
-		caRoot:            make(map[string]*x509.Certificate),
-		ocspResponseCache: cache,
-		logFactory:        logFactory,
-	}
-
-	return &c
-}
-
-func (c *Client) Logger() hclog.Logger {
-	return c.logFactory()
-}
-
-// insecureOcspTransport is the transport object that doesn't do certificate revocation check.
-func newInsecureOcspTransport(extraCas []*x509.Certificate) *http.Transport {
-	// Get the SystemCertPool, continue with an empty pool on error
-	rootCAs, _ := x509.SystemCertPool()
-	if rootCAs == nil {
-		rootCAs = x509.NewCertPool()
-	}
-	for _, c := range extraCas {
-		rootCAs.AddCert(c)
-	}
-	config := &tls.Config{
-		RootCAs: rootCAs,
-	}
-	return &http.Transport{
-		MaxIdleConns:    10,
-		IdleConnTimeout: 30 * time.Minute,
-		Proxy:           http.ProxyFromEnvironment,
-		DialContext: (&net.Dialer{
-			Timeout:   30 * time.Second,
-			KeepAlive: 30 * time.Second,
-		}).DialContext,
-		TLSClientConfig: config,
-	}
-}
-
-// NewTransport includes the certificate revocation check with OCSP in sequential.
-func (c *Client) NewTransport(conf *VerifyConfig) *http.Transport {
-	rootCAs := c.certPool
-	if rootCAs == nil {
-		rootCAs, _ = x509.SystemCertPool()
-	}
-	if rootCAs == nil {
-		rootCAs = x509.NewCertPool()
-	}
-	for _, c := range conf.ExtraCas {
-		rootCAs.AddCert(c)
-	}
-	return &http.Transport{
-		TLSClientConfig: &tls.Config{
-			RootCAs:               rootCAs,
-			VerifyPeerCertificate: c.verifyPeerCertificateSerial(conf),
-		},
-		MaxIdleConns:    10,
-		IdleConnTimeout: 30 * time.Minute,
-		Proxy:           http.ProxyFromEnvironment,
-		DialContext: (&net.Dialer{
-			Timeout:   30 * time.Second,
-			KeepAlive: 30 * time.Second,
-		}).DialContext,
-	}
-}
-
-/*
-func (c *Client) WriteCache(ctx context.Context, storage logical.Storage) error {
-	c.ocspResponseCacheLock.Lock()
-	defer c.ocspResponseCacheLock.Unlock()
-	if c.cacheUpdated {
-		err := c.writeOCSPCache(ctx, storage)
-		if err == nil {
-			c.cacheUpdated = false
-		}
-		return err
-	}
-	return nil
-}
-
-func (c *Client) ReadCache(ctx context.Context, storage logical.Storage) error {
-	c.ocspResponseCacheLock.Lock()
-	defer c.ocspResponseCacheLock.Unlock()
-	return c.readOCSPCache(ctx, storage)
-}
-*/
-/*
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright (c) 2017-2022 Snowflake Computing Inc. All rights reserved.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-*/
diff --git a/sdk/helper/ocsp/ocsp_test.go b/sdk/helper/ocsp/ocsp_test.go
deleted file mode 100644
index 2f3f1976d2a80..0000000000000
--- a/sdk/helper/ocsp/ocsp_test.go
+++ /dev/null
@@ -1,530 +0,0 @@
-// Copyright (c) 2017-2022 Snowflake Computing Inc. All rights reserved.
-
-package ocsp
-
-import (
-	"bytes"
-	"context"
-	"crypto"
-	"crypto/tls"
-	"crypto/x509"
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net"
-	"net/http"
-	"net/url"
-	"testing"
-	"time"
-
-	"github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/go-retryablehttp"
-	lru "github.com/hashicorp/golang-lru"
-	"golang.org/x/crypto/ocsp"
-)
-
-func TestOCSP(t *testing.T) {
-	targetURL := []string{
-		"https://sfcdev1.blob.core.windows.net/",
-		"https://sfctest0.snowflakecomputing.com/",
-		"https://s3-us-west-2.amazonaws.com/sfc-snowsql-updates/?prefix=1.1/windows_x86_64",
-	}
-
-	conf := VerifyConfig{
-		OcspFailureMode: FailOpenFalse,
-	}
-	c := New(testLogFactory, 10)
-	transports := []*http.Transport{
-		newInsecureOcspTransport(nil),
-		c.NewTransport(&conf),
-	}
-
-	for _, tgt := range targetURL {
-		c.ocspResponseCache, _ = lru.New2Q(10)
-		for _, tr := range transports {
-			c := &http.Client{
-				Transport: tr,
-				Timeout:   30 * time.Second,
-			}
-			req, err := http.NewRequest("GET", tgt, bytes.NewReader(nil))
-			if err != nil {
-				t.Fatalf("fail to create a request. err: %v", err)
-			}
-			res, err := c.Do(req)
-			if err != nil {
-				t.Fatalf("failed to GET contents. err: %v", err)
-			}
-			defer res.Body.Close()
-			_, err = ioutil.ReadAll(res.Body)
-			if err != nil {
-				t.Fatalf("failed to read content body for %v", tgt)
-			}
-
-		}
-	}
-}
-
-/**
-// Used for development, requires an active Vault with PKI setup
-func TestMultiOCSP(t *testing.T) {
-
-	targetURL := []string{
-		"https://localhost:8200/v1/pki/ocsp",
-		"https://localhost:8200/v1/pki/ocsp",
-		"https://localhost:8200/v1/pki/ocsp",
-	}
-
-	b, _ := pem.Decode([]byte(vaultCert))
-	caCert, _ := x509.ParseCertificate(b.Bytes)
-	conf := VerifyConfig{
-		OcspFailureMode:     FailOpenFalse,
-		QueryAllServers:     true,
-		OcspServersOverride: targetURL,
-		ExtraCas:            []*x509.Certificate{caCert},
-	}
-	c := New(testLogFactory, 10)
-	transports := []*http.Transport{
-		newInsecureOcspTransport(conf.ExtraCas),
-		c.NewTransport(&conf),
-	}
-
-	tgt := "https://localhost:8200/v1/pki/ca/pem"
-	c.ocspResponseCache, _ = lru.New2Q(10)
-	for _, tr := range transports {
-		c := &http.Client{
-			Transport: tr,
-			Timeout:   30 * time.Second,
-		}
-		req, err := http.NewRequest("GET", tgt, bytes.NewReader(nil))
-		if err != nil {
-			t.Fatalf("fail to create a request. err: %v", err)
-		}
-		res, err := c.Do(req)
-		if err != nil {
-			t.Fatalf("failed to GET contents. err: %v", err)
-		}
-		defer res.Body.Close()
-		_, err = ioutil.ReadAll(res.Body)
-		if err != nil {
-			t.Fatalf("failed to read content body for %v", tgt)
-		}
-	}
-}
-*/
-
-func TestUnitEncodeCertIDGood(t *testing.T) {
-	targetURLs := []string{
-		"faketestaccount.snowflakecomputing.com:443",
-		"s3-us-west-2.amazonaws.com:443",
-		"sfcdev1.blob.core.windows.net:443",
-	}
-	for _, tt := range targetURLs {
-		chainedCerts := getCert(tt)
-		for i := 0; i < len(chainedCerts)-1; i++ {
-			subject := chainedCerts[i]
-			issuer := chainedCerts[i+1]
-			ocspServers := subject.OCSPServer
-			if len(ocspServers) == 0 {
-				t.Fatalf("no OCSP server is found. cert: %v", subject.Subject)
-			}
-			ocspReq, err := ocsp.CreateRequest(subject, issuer, &ocsp.RequestOptions{})
-			if err != nil {
-				t.Fatalf("failed to create OCSP request. err: %v", err)
-			}
-			var ost *ocspStatus
-			_, ost = extractCertIDKeyFromRequest(ocspReq)
-			if ost.err != nil {
-				t.Fatalf("failed to extract cert ID from the OCSP request. err: %v", ost.err)
-			}
-			// better hash. Not sure if the actual OCSP server accepts this, though.
-			ocspReq, err = ocsp.CreateRequest(subject, issuer, &ocsp.RequestOptions{Hash: crypto.SHA512})
-			if err != nil {
-				t.Fatalf("failed to create OCSP request. err: %v", err)
-			}
-			_, ost = extractCertIDKeyFromRequest(ocspReq)
-			if ost.err != nil {
-				t.Fatalf("failed to extract cert ID from the OCSP request. err: %v", ost.err)
-			}
-			// tweaked request binary
-			ocspReq, err = ocsp.CreateRequest(subject, issuer, &ocsp.RequestOptions{Hash: crypto.SHA512})
-			if err != nil {
-				t.Fatalf("failed to create OCSP request. err: %v", err)
-			}
-			ocspReq[10] = 0 // random change
-			_, ost = extractCertIDKeyFromRequest(ocspReq)
-			if ost.err == nil {
-				t.Fatal("should have failed")
-			}
-		}
-	}
-}
-
-func TestUnitCheckOCSPResponseCache(t *testing.T) {
-	c := New(testLogFactory, 10)
-	dummyKey0 := certIDKey{
-		NameHash:      "dummy0",
-		IssuerKeyHash: "dummy0",
-		SerialNumber:  "dummy0",
-	}
-	dummyKey := certIDKey{
-		NameHash:      "dummy1",
-		IssuerKeyHash: "dummy1",
-		SerialNumber:  "dummy1",
-	}
-	currentTime := float64(time.Now().UTC().Unix())
-	c.ocspResponseCache.Add(dummyKey0, &ocspCachedResponse{time: currentTime})
-	subject := &x509.Certificate{}
-	issuer := &x509.Certificate{}
-	ost, err := c.checkOCSPResponseCache(&dummyKey, subject, issuer)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if ost.code != ocspMissedCache {
-		t.Fatalf("should have failed. expected: %v, got: %v", ocspMissedCache, ost.code)
-	}
-	// old timestamp
-	c.ocspResponseCache.Add(dummyKey, &ocspCachedResponse{time: float64(1395054952)})
-	ost, err = c.checkOCSPResponseCache(&dummyKey, subject, issuer)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if ost.code != ocspCacheExpired {
-		t.Fatalf("should have failed. expected: %v, got: %v", ocspCacheExpired, ost.code)
-	}
-
-	// invalid validity
-	c.ocspResponseCache.Add(dummyKey, &ocspCachedResponse{time: float64(currentTime - 1000)})
-	ost, err = c.checkOCSPResponseCache(&dummyKey, subject, nil)
-	if err == nil && isValidOCSPStatus(ost.code) {
-		t.Fatalf("should have failed.")
-	}
-}
-
-func TestUnitValidateOCSP(t *testing.T) {
-	ocspRes := &ocsp.Response{}
-	ost, err := validateOCSP(ocspRes)
-	if err == nil && isValidOCSPStatus(ost.code) {
-		t.Fatalf("should have failed.")
-	}
-
-	currentTime := time.Now()
-	ocspRes.ThisUpdate = currentTime.Add(-2 * time.Hour)
-	ocspRes.NextUpdate = currentTime.Add(2 * time.Hour)
-	ocspRes.Status = ocsp.Revoked
-	ost, err = validateOCSP(ocspRes)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if ost.code != ocspStatusRevoked {
-		t.Fatalf("should have failed. expected: %v, got: %v", ocspStatusRevoked, ost.code)
-	}
-	ocspRes.Status = ocsp.Good
-	ost, err = validateOCSP(ocspRes)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if ost.code != ocspStatusGood {
-		t.Fatalf("should have success. expected: %v, got: %v", ocspStatusGood, ost.code)
-	}
-	ocspRes.Status = ocsp.Unknown
-	ost, err = validateOCSP(ocspRes)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if ost.code != ocspStatusUnknown {
-		t.Fatalf("should have failed. expected: %v, got: %v", ocspStatusUnknown, ost.code)
-	}
-	ocspRes.Status = ocsp.ServerFailed
-	ost, err = validateOCSP(ocspRes)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if ost.code != ocspStatusOthers {
-		t.Fatalf("should have failed. expected: %v, got: %v", ocspStatusOthers, ost.code)
-	}
-}
-
-func TestUnitEncodeCertID(t *testing.T) {
-	var st *ocspStatus
-	_, st = extractCertIDKeyFromRequest([]byte{0x1, 0x2})
-	if st.code != ocspFailedDecomposeRequest {
-		t.Fatalf("failed to get OCSP status. expected: %v, got: %v", ocspFailedDecomposeRequest, st.code)
-	}
-}
-
-func getCert(addr string) []*x509.Certificate {
-	tcpConn, err := net.DialTimeout("tcp", addr, 40*time.Second)
-	if err != nil {
-		panic(err)
-	}
-	defer tcpConn.Close()
-
-	err = tcpConn.SetDeadline(time.Now().Add(10 * time.Second))
-	if err != nil {
-		panic(err)
-	}
-	config := tls.Config{InsecureSkipVerify: true, ServerName: addr}
-
-	conn := tls.Client(tcpConn, &config)
-	defer conn.Close()
-
-	err = conn.Handshake()
-	if err != nil {
-		panic(err)
-	}
-
-	state := conn.ConnectionState()
-
-	return state.PeerCertificates
-}
-
-func TestOCSPRetry(t *testing.T) {
-	c := New(testLogFactory, 10)
-	certs := getCert("s3-us-west-2.amazonaws.com:443")
-	dummyOCSPHost := &url.URL{
-		Scheme: "https",
-		Host:   "dummyOCSPHost",
-	}
-	client := &fakeHTTPClient{
-		cnt:     3,
-		success: true,
-		body:    []byte{1, 2, 3},
-		logger:  hclog.New(hclog.DefaultOptions),
-		t:       t,
-	}
-	res, b, st, err := c.retryOCSP(
-		context.TODO(),
-		client, fakeRequestFunc,
-		dummyOCSPHost,
-		make(map[string]string), []byte{0}, certs[len(certs)-1])
-	if err == nil {
-		fmt.Printf("should fail: %v, %v, %v\n", res, b, st)
-	}
-	client = &fakeHTTPClient{
-		cnt:     30,
-		success: true,
-		body:    []byte{1, 2, 3},
-		logger:  hclog.New(hclog.DefaultOptions),
-		t:       t,
-	}
-	res, b, st, err = c.retryOCSP(
-		context.TODO(),
-		client, fakeRequestFunc,
-		dummyOCSPHost,
-		make(map[string]string), []byte{0}, certs[len(certs)-1])
-	if err == nil {
-		fmt.Printf("should fail: %v, %v, %v\n", res, b, st)
-	}
-}
-
-type tcCanEarlyExit struct {
-	results       []*ocspStatus
-	resultLen     int
-	retFailOpen   *ocspStatus
-	retFailClosed *ocspStatus
-}
-
-func TestCanEarlyExitForOCSP(t *testing.T) {
-	testcases := []tcCanEarlyExit{
-		{ // 0
-			results: []*ocspStatus{
-				{
-					code: ocspStatusGood,
-				},
-				{
-					code: ocspStatusGood,
-				},
-				{
-					code: ocspStatusGood,
-				},
-			},
-			retFailOpen:   nil,
-			retFailClosed: nil,
-		},
-		{ // 1
-			results: []*ocspStatus{
-				{
-					code: ocspStatusRevoked,
-					err:  errors.New("revoked"),
-				},
-				{
-					code: ocspStatusGood,
-				},
-				{
-					code: ocspStatusGood,
-				},
-			},
-			retFailOpen:   &ocspStatus{ocspStatusRevoked, errors.New("revoked")},
-			retFailClosed: &ocspStatus{ocspStatusRevoked, errors.New("revoked")},
-		},
-		{ // 2
-			results: []*ocspStatus{
-				{
-					code: ocspStatusUnknown,
-					err:  errors.New("unknown"),
-				},
-				{
-					code: ocspStatusGood,
-				},
-				{
-					code: ocspStatusGood,
-				},
-			},
-			retFailOpen:   nil,
-			retFailClosed: &ocspStatus{ocspStatusUnknown, errors.New("unknown")},
-		},
-		{ // 3: not taken as revoked if any invalid OCSP response (ocspInvalidValidity) is included.
-			results: []*ocspStatus{
-				{
-					code: ocspStatusRevoked,
-					err:  errors.New("revoked"),
-				},
-				{
-					code: ocspInvalidValidity,
-				},
-				{
-					code: ocspStatusGood,
-				},
-			},
-			retFailOpen:   nil,
-			retFailClosed: &ocspStatus{ocspStatusRevoked, errors.New("revoked")},
-		},
-		{ // 4: not taken as revoked if the number of results don't match the expected results.
-			results: []*ocspStatus{
-				{
-					code: ocspStatusRevoked,
-					err:  errors.New("revoked"),
-				},
-				{
-					code: ocspStatusGood,
-				},
-			},
-			resultLen:     3,
-			retFailOpen:   nil,
-			retFailClosed: &ocspStatus{ocspStatusRevoked, errors.New("revoked")},
-		},
-	}
-	c := New(testLogFactory, 10)
-	for idx, tt := range testcases {
-		expectedLen := len(tt.results)
-		if tt.resultLen > 0 {
-			expectedLen = tt.resultLen
-		}
-		r := c.canEarlyExitForOCSP(tt.results, expectedLen, &VerifyConfig{OcspFailureMode: FailOpenTrue})
-		if !(tt.retFailOpen == nil && r == nil) && !(tt.retFailOpen != nil && r != nil && tt.retFailOpen.code == r.code) {
-			t.Fatalf("%d: failed to match return. expected: %v, got: %v", idx, tt.retFailOpen, r)
-		}
-		r = c.canEarlyExitForOCSP(tt.results, expectedLen, &VerifyConfig{OcspFailureMode: FailOpenFalse})
-		if !(tt.retFailClosed == nil && r == nil) && !(tt.retFailClosed != nil && r != nil && tt.retFailClosed.code == r.code) {
-			t.Fatalf("%d: failed to match return. expected: %v, got: %v", idx, tt.retFailClosed, r)
-		}
-	}
-}
-
-var testLogger = hclog.New(hclog.DefaultOptions)
-
-func testLogFactory() hclog.Logger {
-	return testLogger
-}
-
-type fakeHTTPClient struct {
-	cnt        int    // number of retry
-	success    bool   // return success after retry in cnt times
-	timeout    bool   // timeout
-	body       []byte // return body
-	t          *testing.T
-	logger     hclog.Logger
-	redirected bool
-}
-
-func (c *fakeHTTPClient) Do(_ *retryablehttp.Request) (*http.Response, error) {
-	c.cnt--
-	if c.cnt < 0 {
-		c.cnt = 0
-	}
-	c.t.Log("fakeHTTPClient.cnt", c.cnt)
-
-	var retcode int
-	if !c.redirected {
-		c.redirected = true
-		c.cnt++
-		retcode = 405
-	} else if c.success && c.cnt == 1 {
-		retcode = 200
-	} else {
-		if c.timeout {
-			// simulate timeout
-			time.Sleep(time.Second * 1)
-			return nil, &fakeHTTPError{
-				err:     "Whatever reason (Client.Timeout exceeded while awaiting headers)",
-				timeout: true,
-			}
-		}
-		retcode = 0
-	}
-
-	ret := &http.Response{
-		StatusCode: retcode,
-		Body:       &fakeResponseBody{body: c.body},
-	}
-	return ret, nil
-}
-
-type fakeHTTPError struct {
-	err     string
-	timeout bool
-}
-
-func (e *fakeHTTPError) Error() string   { return e.err }
-func (e *fakeHTTPError) Timeout() bool   { return e.timeout }
-func (e *fakeHTTPError) Temporary() bool { return true }
-
-type fakeResponseBody struct {
-	body []byte
-	cnt  int
-}
-
-func (b *fakeResponseBody) Read(p []byte) (n int, err error) {
-	if b.cnt == 0 {
-		copy(p, b.body)
-		b.cnt = 1
-		return len(b.body), nil
-	}
-	b.cnt = 0
-	return 0, io.EOF
-}
-
-func (b *fakeResponseBody) Close() error {
-	return nil
-}
-
-func fakeRequestFunc(_, _ string, _ interface{}) (*retryablehttp.Request, error) {
-	return nil, nil
-}
-
-const vaultCert = `-----BEGIN CERTIFICATE-----
-MIIDuTCCAqGgAwIBAgIUA6VeVD1IB5rXcCZRAqPO4zr/GAMwDQYJKoZIhvcNAQEL
-BQAwcjELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAlZBMREwDwYDVQQHDAhTb21lQ2l0
-eTESMBAGA1UECgwJTXlDb21wYW55MRMwEQYDVQQLDApNeURpdmlzaW9uMRowGAYD
-VQQDDBF3d3cuY29uaHVnZWNvLmNvbTAeFw0yMjA5MDcxOTA1MzdaFw0yNDA5MDYx
-OTA1MzdaMHIxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJWQTERMA8GA1UEBwwIU29t
-ZUNpdHkxEjAQBgNVBAoMCU15Q29tcGFueTETMBEGA1UECwwKTXlEaXZpc2lvbjEa
-MBgGA1UEAwwRd3d3LmNvbmh1Z2Vjby5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDL9qzEXi4PIafSAqfcwcmjujFvbG1QZbI8swxnD+w8i4ufAQU5
-LDmvMrGo3ZbhJ0mCihYmFxpjhRdP2raJQ9TysHlPXHtDRpr9ckWTKBz2oIfqVtJ2
-qzteQkWCkDAO7kPqzgCFsMeoMZeONRkeGib0lEzQAbW/Rqnphg8zVVkyQ71DZ7Pc
-d5WkC2E28kKcSramhWfVFpxG3hSIrLOX2esEXteLRzKxFPf+gi413JZFKYIWrebP
-u5t0++MLNpuX322geoki4BWMjQsd47XILmxZ4aj33ScZvdrZESCnwP76hKIxg9mO
-lMxrqSWKVV5jHZrElSEj9LYJgDO1Y6eItn7hAgMBAAGjRzBFMAsGA1UdDwQEAwIE
-MDATBgNVHSUEDDAKBggrBgEFBQcDATAhBgNVHREEGjAYggtleGFtcGxlLmNvbYIJ
-bG9jYWxob3N0MA0GCSqGSIb3DQEBCwUAA4IBAQA5dPdf5SdtMwe2uSspO/EuWqbM
-497vMQBW1Ey8KRKasJjhvOVYMbe7De5YsnW4bn8u5pl0zQGF4hEtpmifAtVvziH/
-K+ritQj9VVNbLLCbFcg+b0kfjt4yrDZ64vWvIeCgPjG1Kme8gdUUWgu9dOud5gdx
-qg/tIFv4TRS/eIIymMlfd9owOD3Ig6S5fy4NaAJFAwXf8+3Rzuc+e7JSAPgAufjh
-tOTWinxvoiOLuYwo9CyGgq4qKBFsrY0aE0gdA7oTQkpbEbo2EbqiWUl/PTCl1Y4Z
-nSZ0n+4q9QC9RLrWwYTwh838d5RVLUst2mBKSA+vn7YkqmBJbdBC6nkd7n7H
------END CERTIFICATE-----
-`
diff --git a/sdk/helper/parseutil/parseutil.go b/sdk/helper/parseutil/parseutil.go
index 5bea8909de142..eda539424f2d1 100644
--- a/sdk/helper/parseutil/parseutil.go
+++ b/sdk/helper/parseutil/parseutil.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 // DEPRECATED: this has been moved to go-secure-stdlib and will be removed
 package parseutil
 
diff --git a/sdk/helper/password/password.go b/sdk/helper/password/password.go
index 931a72cc8bc33..84e6b594d55d2 100644
--- a/sdk/helper/password/password.go
+++ b/sdk/helper/password/password.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 // DEPRECATED: this has been moved to go-secure-stdlib and will be removed
 package password
 
diff --git a/sdk/helper/pathmanager/pathmanager.go b/sdk/helper/pathmanager/pathmanager.go
index 0d2d60070f789..e0e39445b2a56 100644
--- a/sdk/helper/pathmanager/pathmanager.go
+++ b/sdk/helper/pathmanager/pathmanager.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pathmanager
 
 import (
diff --git a/sdk/helper/pathmanager/pathmanager_test.go b/sdk/helper/pathmanager/pathmanager_test.go
index 515d830324f1e..7d6207b625e60 100644
--- a/sdk/helper/pathmanager/pathmanager_test.go
+++ b/sdk/helper/pathmanager/pathmanager_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pathmanager
 
 import (
diff --git a/sdk/helper/pluginutil/env.go b/sdk/helper/pluginutil/env.go
index 1b45ef32dca22..df1fdbeede939 100644
--- a/sdk/helper/pluginutil/env.go
+++ b/sdk/helper/pluginutil/env.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pluginutil
 
 import (
diff --git a/sdk/helper/pluginutil/env_test.go b/sdk/helper/pluginutil/env_test.go
index 21f77faba6e63..1d04b327524e5 100644
--- a/sdk/helper/pluginutil/env_test.go
+++ b/sdk/helper/pluginutil/env_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pluginutil
 
 import (
diff --git a/sdk/helper/pluginutil/multiplexing.go b/sdk/helper/pluginutil/multiplexing.go
index 8fc86a4c36c96..41316ec49df28 100644
--- a/sdk/helper/pluginutil/multiplexing.go
+++ b/sdk/helper/pluginutil/multiplexing.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pluginutil
 
 import (
diff --git a/sdk/helper/pluginutil/multiplexing.pb.go b/sdk/helper/pluginutil/multiplexing.pb.go
index d7663b90215f5..d7073b10e0a5b 100644
--- a/sdk/helper/pluginutil/multiplexing.pb.go
+++ b/sdk/helper/pluginutil/multiplexing.pb.go
@@ -1,10 +1,7 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc        v3.21.5
 // source: sdk/helper/pluginutil/multiplexing.proto
 
 package pluginutil
diff --git a/sdk/helper/pluginutil/multiplexing.proto b/sdk/helper/pluginutil/multiplexing.proto
index c1a2ca0a4aa49..aa2438b070ffb 100644
--- a/sdk/helper/pluginutil/multiplexing.proto
+++ b/sdk/helper/pluginutil/multiplexing.proto
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 syntax = "proto3";
 package pluginutil.multiplexing;
 
diff --git a/sdk/helper/pluginutil/multiplexing_test.go b/sdk/helper/pluginutil/multiplexing_test.go
index 3f589ffa7cd9e..125a4a120c624 100644
--- a/sdk/helper/pluginutil/multiplexing_test.go
+++ b/sdk/helper/pluginutil/multiplexing_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pluginutil
 
 import (
diff --git a/sdk/helper/pluginutil/run_config.go b/sdk/helper/pluginutil/run_config.go
index be34fa9dc09b7..3eb8fb2b28173 100644
--- a/sdk/helper/pluginutil/run_config.go
+++ b/sdk/helper/pluginutil/run_config.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pluginutil
 
 import (
@@ -13,6 +10,7 @@ import (
 	log "github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/go-plugin"
 	"github.com/hashicorp/vault/sdk/helper/consts"
+	"github.com/hashicorp/vault/sdk/version"
 )
 
 type PluginClientConfig struct {
@@ -48,11 +46,7 @@ func (rc runConfig) makeConfig(ctx context.Context) (*plugin.ClientConfig, error
 	if rc.MLock || (rc.Wrapper != nil && rc.Wrapper.MlockEnabled()) {
 		cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%s", PluginMlockEnabled, "true"))
 	}
-	version, err := rc.Wrapper.VaultVersion(ctx)
-	if err != nil {
-		return nil, err
-	}
-	cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%s", PluginVaultVersionEnv, version))
+	cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%s", PluginVaultVersionEnv, version.GetVersion().Version))
 
 	if rc.IsMetadataMode {
 		rc.Logger = rc.Logger.With("metadata", "true")
diff --git a/sdk/helper/pluginutil/run_config_test.go b/sdk/helper/pluginutil/run_config_test.go
index e64057783ad0d..3c2fef2196c14 100644
--- a/sdk/helper/pluginutil/run_config_test.go
+++ b/sdk/helper/pluginutil/run_config_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pluginutil
 
 import (
@@ -10,6 +7,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/hashicorp/vault/sdk/version"
+
 	"github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/go-plugin"
 	"github.com/hashicorp/vault/sdk/helper/wrapping"
@@ -77,7 +76,7 @@ func TestMakeConfig(t *testing.T) {
 					[]string{"foo", "bar"},
 					[]string{
 						"initial=true",
-						fmt.Sprintf("%s=%s", PluginVaultVersionEnv, "dummyversion"),
+						fmt.Sprintf("%s=%s", PluginVaultVersionEnv, version.GetVersion().Version),
 						fmt.Sprintf("%s=%t", PluginMetadataModeEnv, true),
 						fmt.Sprintf("%s=%t", PluginAutoMTLSEnv, false),
 					},
@@ -143,7 +142,7 @@ func TestMakeConfig(t *testing.T) {
 					[]string{
 						"initial=true",
 						fmt.Sprintf("%s=%t", PluginMlockEnabled, true),
-						fmt.Sprintf("%s=%s", PluginVaultVersionEnv, "dummyversion"),
+						fmt.Sprintf("%s=%s", PluginVaultVersionEnv, version.GetVersion().Version),
 						fmt.Sprintf("%s=%t", PluginMetadataModeEnv, false),
 						fmt.Sprintf("%s=%t", PluginAutoMTLSEnv, false),
 						fmt.Sprintf("%s=%s", PluginUnwrapTokenEnv, "testtoken"),
@@ -206,7 +205,7 @@ func TestMakeConfig(t *testing.T) {
 					[]string{"foo", "bar"},
 					[]string{
 						"initial=true",
-						fmt.Sprintf("%s=%s", PluginVaultVersionEnv, "dummyversion"),
+						fmt.Sprintf("%s=%s", PluginVaultVersionEnv, version.GetVersion().Version),
 						fmt.Sprintf("%s=%t", PluginMetadataModeEnv, true),
 						fmt.Sprintf("%s=%t", PluginAutoMTLSEnv, true),
 					},
@@ -268,7 +267,7 @@ func TestMakeConfig(t *testing.T) {
 					[]string{"foo", "bar"},
 					[]string{
 						"initial=true",
-						fmt.Sprintf("%s=%s", PluginVaultVersionEnv, "dummyversion"),
+						fmt.Sprintf("%s=%s", PluginVaultVersionEnv, version.GetVersion().Version),
 						fmt.Sprintf("%s=%t", PluginMetadataModeEnv, false),
 						fmt.Sprintf("%s=%t", PluginAutoMTLSEnv, true),
 					},
@@ -340,10 +339,6 @@ type mockRunnerUtil struct {
 	mock.Mock
 }
 
-func (m *mockRunnerUtil) VaultVersion(ctx context.Context) (string, error) {
-	return "dummyversion", nil
-}
-
 func (m *mockRunnerUtil) NewPluginClient(ctx context.Context, config PluginClientConfig) (PluginClient, error) {
 	args := m.Called(ctx, config)
 	return args.Get(0).(PluginClient), args.Error(1)
diff --git a/sdk/helper/pluginutil/runner.go b/sdk/helper/pluginutil/runner.go
index 977f95d72208a..631c4f3a2f35d 100644
--- a/sdk/helper/pluginutil/runner.go
+++ b/sdk/helper/pluginutil/runner.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pluginutil
 
 import (
@@ -30,7 +27,6 @@ type RunnerUtil interface {
 	NewPluginClient(ctx context.Context, config PluginClientConfig) (PluginClient, error)
 	ResponseWrapData(ctx context.Context, data map[string]interface{}, ttl time.Duration, jwt bool) (*wrapping.ResponseWrapInfo, error)
 	MlockEnabled() bool
-	VaultVersion(ctx context.Context) (string, error)
 }
 
 // LookRunnerUtil defines the functions for both Looker and Wrapper
diff --git a/sdk/helper/pluginutil/tls.go b/sdk/helper/pluginutil/tls.go
index 21b35d910e798..c5fff6d701ed7 100644
--- a/sdk/helper/pluginutil/tls.go
+++ b/sdk/helper/pluginutil/tls.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pluginutil
 
 import (
diff --git a/sdk/helper/pointerutil/pointer.go b/sdk/helper/pointerutil/pointer.go
index b4bfe114cfdf9..0f26e7dad660a 100644
--- a/sdk/helper/pointerutil/pointer.go
+++ b/sdk/helper/pointerutil/pointer.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pointerutil
 
 import (
diff --git a/sdk/helper/policyutil/policyutil.go b/sdk/helper/policyutil/policyutil.go
index a5a8082e13c22..8e5541b1868fc 100644
--- a/sdk/helper/policyutil/policyutil.go
+++ b/sdk/helper/policyutil/policyutil.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package policyutil
 
 import (
diff --git a/sdk/helper/policyutil/policyutil_test.go b/sdk/helper/policyutil/policyutil_test.go
index 2280ba93eed87..4b26483f716af 100644
--- a/sdk/helper/policyutil/policyutil_test.go
+++ b/sdk/helper/policyutil/policyutil_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package policyutil
 
 import "testing"
diff --git a/sdk/helper/roottoken/decode.go b/sdk/helper/roottoken/decode.go
index 9939b67f72f44..cc9300690a4ae 100644
--- a/sdk/helper/roottoken/decode.go
+++ b/sdk/helper/roottoken/decode.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package roottoken
 
 import (
diff --git a/sdk/helper/roottoken/encode.go b/sdk/helper/roottoken/encode.go
index dbbc90a2afa30..2537d93979064 100644
--- a/sdk/helper/roottoken/encode.go
+++ b/sdk/helper/roottoken/encode.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package roottoken
 
 import (
diff --git a/sdk/helper/roottoken/encode_test.go b/sdk/helper/roottoken/encode_test.go
index 269bf65b04726..9df26928e2942 100644
--- a/sdk/helper/roottoken/encode_test.go
+++ b/sdk/helper/roottoken/encode_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package roottoken
 
 import (
diff --git a/sdk/helper/roottoken/otp.go b/sdk/helper/roottoken/otp.go
index 4445ec52dc653..5a12c4f0ae869 100644
--- a/sdk/helper/roottoken/otp.go
+++ b/sdk/helper/roottoken/otp.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package roottoken
 
 import (
diff --git a/sdk/helper/roottoken/otp_test.go b/sdk/helper/roottoken/otp_test.go
index 53776ec21c8b5..437e8f3d0f22e 100644
--- a/sdk/helper/roottoken/otp_test.go
+++ b/sdk/helper/roottoken/otp_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package roottoken
 
 import (
diff --git a/sdk/helper/salt/salt.go b/sdk/helper/salt/salt.go
index 84cbd03556c27..50e0cad90a607 100644
--- a/sdk/helper/salt/salt.go
+++ b/sdk/helper/salt/salt.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package salt
 
 import (
diff --git a/sdk/helper/salt/salt_test.go b/sdk/helper/salt/salt_test.go
index 3aec9a27b4990..99fcb06bd053b 100644
--- a/sdk/helper/salt/salt_test.go
+++ b/sdk/helper/salt/salt_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package salt
 
 import (
diff --git a/sdk/helper/strutil/strutil.go b/sdk/helper/strutil/strutil.go
index a9e506942af59..09cc9425cb1db 100644
--- a/sdk/helper/strutil/strutil.go
+++ b/sdk/helper/strutil/strutil.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 // DEPRECATED: this has been moved to go-secure-stdlib and will be removed
 package strutil
 
diff --git a/sdk/helper/template/funcs.go b/sdk/helper/template/funcs.go
index 6d68cab3a7e44..ee9927fe15cbb 100644
--- a/sdk/helper/template/funcs.go
+++ b/sdk/helper/template/funcs.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package template
 
 import (
diff --git a/sdk/helper/template/funcs_test.go b/sdk/helper/template/funcs_test.go
index 4965115960eeb..f682a96753f2f 100644
--- a/sdk/helper/template/funcs_test.go
+++ b/sdk/helper/template/funcs_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package template
 
 import (
diff --git a/sdk/helper/template/template.go b/sdk/helper/template/template.go
index dea65f3f5ed36..2918825b978ec 100644
--- a/sdk/helper/template/template.go
+++ b/sdk/helper/template/template.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package template
 
 import (
diff --git a/sdk/helper/template/template_test.go b/sdk/helper/template/template_test.go
index 2f66bf36fe035..715dd52519e81 100644
--- a/sdk/helper/template/template_test.go
+++ b/sdk/helper/template/template_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package template
 
 import (
diff --git a/sdk/helper/testcluster/consts.go b/sdk/helper/testcluster/consts.go
deleted file mode 100644
index e85ef196a2215..0000000000000
--- a/sdk/helper/testcluster/consts.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package testcluster
-
-const (
-	// EnvVaultLicenseCI is the name of an environment variable that contains
-	// a signed license string used for Vault Enterprise binary-based tests.
-	// The binary will be run with the env var VAULT_LICENSE set to this value.
-	EnvVaultLicenseCI = "VAULT_LICENSE_CI"
-
-	// DefaultCAFile is the path to the CA file. This is a docker-specific
-	// constant. TODO: needs to be moved to a more relevant place
-	DefaultCAFile = "/vault/config/ca.pem"
-)
diff --git a/sdk/helper/testcluster/docker/cert.go b/sdk/helper/testcluster/docker/cert.go
deleted file mode 100644
index 4704030cb52f0..0000000000000
--- a/sdk/helper/testcluster/docker/cert.go
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package docker
-
-import (
-	"crypto/tls"
-	"crypto/x509"
-	"encoding/pem"
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"sync"
-
-	"github.com/hashicorp/errwrap"
-)
-
-// ReloadFunc are functions that are called when a reload is requested
-type ReloadFunc func() error
-
-// CertificateGetter satisfies ReloadFunc and its GetCertificate method
-// satisfies the tls.GetCertificate function signature.  Currently it does not
-// allow changing paths after the fact.
-type CertificateGetter struct {
-	sync.RWMutex
-
-	cert *tls.Certificate
-
-	certFile   string
-	keyFile    string
-	passphrase string
-}
-
-func NewCertificateGetter(certFile, keyFile, passphrase string) *CertificateGetter {
-	return &CertificateGetter{
-		certFile:   certFile,
-		keyFile:    keyFile,
-		passphrase: passphrase,
-	}
-}
-
-func (cg *CertificateGetter) Reload() error {
-	certPEMBlock, err := ioutil.ReadFile(cg.certFile)
-	if err != nil {
-		return err
-	}
-	keyPEMBlock, err := ioutil.ReadFile(cg.keyFile)
-	if err != nil {
-		return err
-	}
-
-	// Check for encrypted pem block
-	keyBlock, _ := pem.Decode(keyPEMBlock)
-	if keyBlock == nil {
-		return errors.New("decoded PEM is blank")
-	}
-
-	if x509.IsEncryptedPEMBlock(keyBlock) {
-		keyBlock.Bytes, err = x509.DecryptPEMBlock(keyBlock, []byte(cg.passphrase))
-		if err != nil {
-			return errwrap.Wrapf("Decrypting PEM block failed {{err}}", err)
-		}
-		keyPEMBlock = pem.EncodeToMemory(keyBlock)
-	}
-
-	cert, err := tls.X509KeyPair(certPEMBlock, keyPEMBlock)
-	if err != nil {
-		return err
-	}
-
-	cg.Lock()
-	defer cg.Unlock()
-
-	cg.cert = &cert
-
-	return nil
-}
-
-func (cg *CertificateGetter) GetCertificate(clientHello *tls.ClientHelloInfo) (*tls.Certificate, error) {
-	cg.RLock()
-	defer cg.RUnlock()
-
-	if cg.cert == nil {
-		return nil, fmt.Errorf("nil certificate")
-	}
-
-	return cg.cert, nil
-}
diff --git a/sdk/helper/testcluster/docker/environment.go b/sdk/helper/testcluster/docker/environment.go
deleted file mode 100644
index 204bacbdbddce..0000000000000
--- a/sdk/helper/testcluster/docker/environment.go
+++ /dev/null
@@ -1,1062 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package docker
-
-import (
-	"bufio"
-	"bytes"
-	"context"
-	"crypto/ecdsa"
-	"crypto/elliptic"
-	"crypto/rand"
-	"crypto/tls"
-	"crypto/x509"
-	"crypto/x509/pkix"
-	"encoding/hex"
-	"encoding/json"
-	"encoding/pem"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"math/big"
-	mathrand "math/rand"
-	"net"
-	"net/http"
-	"os"
-	"path/filepath"
-	"strings"
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/volume"
-	docker "github.com/docker/docker/client"
-	"github.com/hashicorp/go-cleanhttp"
-	log "github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/go-multierror"
-	"github.com/hashicorp/vault/api"
-	dockhelper "github.com/hashicorp/vault/sdk/helper/docker"
-	"github.com/hashicorp/vault/sdk/helper/logging"
-	"github.com/hashicorp/vault/sdk/helper/testcluster"
-	uberAtomic "go.uber.org/atomic"
-	"golang.org/x/net/http2"
-)
-
-var (
-	_ testcluster.VaultCluster     = &DockerCluster{}
-	_ testcluster.VaultClusterNode = &DockerClusterNode{}
-)
-
-const MaxClusterNameLength = 52
-
-// DockerCluster is used to managing the lifecycle of the test Vault cluster
-type DockerCluster struct {
-	ClusterName string
-
-	RaftStorage  bool
-	ClusterNodes []*DockerClusterNode
-
-	// Certificate fields
-	*testcluster.CA
-	RootCAs *x509.CertPool
-
-	barrierKeys  [][]byte
-	recoveryKeys [][]byte
-	tmpDir       string
-
-	// rootToken is the initial root token created when the Vault cluster is
-	// created.
-	rootToken string
-	DockerAPI *docker.Client
-	ID        string
-	Logger    log.Logger
-	builtTags map[string]struct{}
-}
-
-func (dc *DockerCluster) NamedLogger(s string) log.Logger {
-	return dc.Logger.Named(s)
-}
-
-func (dc *DockerCluster) ClusterID() string {
-	return dc.ID
-}
-
-func (dc *DockerCluster) Nodes() []testcluster.VaultClusterNode {
-	ret := make([]testcluster.VaultClusterNode, len(dc.ClusterNodes))
-	for i := range dc.ClusterNodes {
-		ret[i] = dc.ClusterNodes[i]
-	}
-	return ret
-}
-
-func (dc *DockerCluster) GetBarrierKeys() [][]byte {
-	return dc.barrierKeys
-}
-
-func testKeyCopy(key []byte) []byte {
-	result := make([]byte, len(key))
-	copy(result, key)
-	return result
-}
-
-func (dc *DockerCluster) GetRecoveryKeys() [][]byte {
-	ret := make([][]byte, len(dc.recoveryKeys))
-	for i, k := range dc.recoveryKeys {
-		ret[i] = testKeyCopy(k)
-	}
-	return ret
-}
-
-func (dc *DockerCluster) GetBarrierOrRecoveryKeys() [][]byte {
-	return dc.GetBarrierKeys()
-}
-
-func (dc *DockerCluster) SetBarrierKeys(keys [][]byte) {
-	dc.barrierKeys = make([][]byte, len(keys))
-	for i, k := range keys {
-		dc.barrierKeys[i] = testKeyCopy(k)
-	}
-}
-
-func (dc *DockerCluster) SetRecoveryKeys(keys [][]byte) {
-	dc.recoveryKeys = make([][]byte, len(keys))
-	for i, k := range keys {
-		dc.recoveryKeys[i] = testKeyCopy(k)
-	}
-}
-
-func (dc *DockerCluster) GetCACertPEMFile() string {
-	return dc.CACertPEMFile
-}
-
-func (dc *DockerCluster) Cleanup() {
-	dc.cleanup()
-}
-
-func (dc *DockerCluster) cleanup() error {
-	var result *multierror.Error
-	for _, node := range dc.ClusterNodes {
-		if err := node.cleanup(); err != nil {
-			result = multierror.Append(result, err)
-		}
-	}
-
-	return result.ErrorOrNil()
-}
-
-// GetRootToken returns the root token of the cluster, if set
-func (dc *DockerCluster) GetRootToken() string {
-	return dc.rootToken
-}
-
-func (dc *DockerCluster) SetRootToken(s string) {
-	dc.Logger.Trace("cluster root token changed", "helpful_env", fmt.Sprintf("VAULT_TOKEN=%s VAULT_CACERT=/vault/config/ca.pem", s))
-	dc.rootToken = s
-}
-
-func (n *DockerClusterNode) Name() string {
-	return n.Cluster.ClusterName + "-" + n.NodeID
-}
-
-func (dc *DockerCluster) setupNode0(ctx context.Context) error {
-	client := dc.ClusterNodes[0].client
-
-	var resp *api.InitResponse
-	var err error
-	for ctx.Err() == nil {
-		resp, err = client.Sys().Init(&api.InitRequest{
-			SecretShares:    3,
-			SecretThreshold: 3,
-		})
-		if err == nil && resp != nil {
-			break
-		}
-		time.Sleep(500 * time.Millisecond)
-	}
-	if err != nil {
-		return err
-	}
-	if resp == nil {
-		return fmt.Errorf("nil response to init request")
-	}
-
-	for _, k := range resp.Keys {
-		raw, err := hex.DecodeString(k)
-		if err != nil {
-			return err
-		}
-		dc.barrierKeys = append(dc.barrierKeys, raw)
-	}
-
-	for _, k := range resp.RecoveryKeys {
-		raw, err := hex.DecodeString(k)
-		if err != nil {
-			return err
-		}
-		dc.recoveryKeys = append(dc.recoveryKeys, raw)
-	}
-
-	dc.rootToken = resp.RootToken
-	client.SetToken(dc.rootToken)
-	dc.ClusterNodes[0].client = client
-
-	err = testcluster.UnsealNode(ctx, dc, 0)
-	if err != nil {
-		return err
-	}
-
-	err = ensureLeaderMatches(ctx, client, func(leader *api.LeaderResponse) error {
-		if !leader.IsSelf {
-			return fmt.Errorf("node %d leader=%v, expected=%v", 0, leader.IsSelf, true)
-		}
-
-		return nil
-	})
-
-	status, err := client.Sys().SealStatusWithContext(ctx)
-	if err != nil {
-		return err
-	}
-	dc.ID = status.ClusterID
-	return err
-}
-
-func (dc *DockerCluster) clusterReady(ctx context.Context) error {
-	for i, node := range dc.ClusterNodes {
-		expectLeader := i == 0
-		err := ensureLeaderMatches(ctx, node.client, func(leader *api.LeaderResponse) error {
-			if expectLeader != leader.IsSelf {
-				return fmt.Errorf("node %d leader=%v, expected=%v", i, leader.IsSelf, expectLeader)
-			}
-
-			return nil
-		})
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (dc *DockerCluster) setupCA(opts *DockerClusterOptions) error {
-	var err error
-	var ca testcluster.CA
-
-	if opts != nil && opts.CAKey != nil {
-		ca.CAKey = opts.CAKey
-	} else {
-		ca.CAKey, err = ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
-		if err != nil {
-			return err
-		}
-	}
-
-	var caBytes []byte
-	if opts != nil && len(opts.CACert) > 0 {
-		caBytes = opts.CACert
-	} else {
-		serialNumber := mathrand.New(mathrand.NewSource(time.Now().UnixNano())).Int63()
-		CACertTemplate := &x509.Certificate{
-			Subject: pkix.Name{
-				CommonName: "localhost",
-			},
-			KeyUsage:              x509.KeyUsageCertSign | x509.KeyUsageCRLSign,
-			SerialNumber:          big.NewInt(serialNumber),
-			NotBefore:             time.Now().Add(-30 * time.Second),
-			NotAfter:              time.Now().Add(262980 * time.Hour),
-			BasicConstraintsValid: true,
-			IsCA:                  true,
-		}
-		caBytes, err = x509.CreateCertificate(rand.Reader, CACertTemplate, CACertTemplate, ca.CAKey.Public(), ca.CAKey)
-		if err != nil {
-			return err
-		}
-	}
-	CACert, err := x509.ParseCertificate(caBytes)
-	if err != nil {
-		return err
-	}
-	ca.CACert = CACert
-	ca.CACertBytes = caBytes
-
-	CACertPEMBlock := &pem.Block{
-		Type:  "CERTIFICATE",
-		Bytes: caBytes,
-	}
-	ca.CACertPEM = pem.EncodeToMemory(CACertPEMBlock)
-
-	ca.CACertPEMFile = filepath.Join(dc.tmpDir, "ca", "ca.pem")
-	err = os.WriteFile(ca.CACertPEMFile, ca.CACertPEM, 0o755)
-	if err != nil {
-		return err
-	}
-
-	marshaledCAKey, err := x509.MarshalECPrivateKey(ca.CAKey)
-	if err != nil {
-		return err
-	}
-	CAKeyPEMBlock := &pem.Block{
-		Type:  "EC PRIVATE KEY",
-		Bytes: marshaledCAKey,
-	}
-	ca.CAKeyPEM = pem.EncodeToMemory(CAKeyPEMBlock)
-
-	dc.CA = &ca
-
-	return nil
-}
-
-func (n *DockerClusterNode) setupCert(ip string) error {
-	var err error
-
-	n.ServerKey, err = ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
-	if err != nil {
-		return err
-	}
-
-	serialNumber := mathrand.New(mathrand.NewSource(time.Now().UnixNano())).Int63()
-	certTemplate := &x509.Certificate{
-		Subject: pkix.Name{
-			CommonName: n.Name(),
-		},
-		DNSNames:    []string{"localhost", n.Name()},
-		IPAddresses: []net.IP{net.IPv6loopback, net.ParseIP("127.0.0.1"), net.ParseIP(ip)},
-		ExtKeyUsage: []x509.ExtKeyUsage{
-			x509.ExtKeyUsageServerAuth,
-			x509.ExtKeyUsageClientAuth,
-		},
-		KeyUsage:     x509.KeyUsageDigitalSignature | x509.KeyUsageKeyEncipherment | x509.KeyUsageKeyAgreement,
-		SerialNumber: big.NewInt(serialNumber),
-		NotBefore:    time.Now().Add(-30 * time.Second),
-		NotAfter:     time.Now().Add(262980 * time.Hour),
-	}
-	n.ServerCertBytes, err = x509.CreateCertificate(rand.Reader, certTemplate, n.Cluster.CACert, n.ServerKey.Public(), n.Cluster.CAKey)
-	if err != nil {
-		return err
-	}
-	n.ServerCert, err = x509.ParseCertificate(n.ServerCertBytes)
-	if err != nil {
-		return err
-	}
-	n.ServerCertPEM = pem.EncodeToMemory(&pem.Block{
-		Type:  "CERTIFICATE",
-		Bytes: n.ServerCertBytes,
-	})
-
-	marshaledKey, err := x509.MarshalECPrivateKey(n.ServerKey)
-	if err != nil {
-		return err
-	}
-	n.ServerKeyPEM = pem.EncodeToMemory(&pem.Block{
-		Type:  "EC PRIVATE KEY",
-		Bytes: marshaledKey,
-	})
-
-	n.ServerCertPEMFile = filepath.Join(n.WorkDir, "cert.pem")
-	err = os.WriteFile(n.ServerCertPEMFile, n.ServerCertPEM, 0o755)
-	if err != nil {
-		return err
-	}
-
-	n.ServerKeyPEMFile = filepath.Join(n.WorkDir, "key.pem")
-	err = os.WriteFile(n.ServerKeyPEMFile, n.ServerKeyPEM, 0o755)
-	if err != nil {
-		return err
-	}
-
-	tlsCert, err := tls.X509KeyPair(n.ServerCertPEM, n.ServerKeyPEM)
-	if err != nil {
-		return err
-	}
-
-	certGetter := NewCertificateGetter(n.ServerCertPEMFile, n.ServerKeyPEMFile, "")
-	if err := certGetter.Reload(); err != nil {
-		return err
-	}
-	tlsConfig := &tls.Config{
-		Certificates:   []tls.Certificate{tlsCert},
-		RootCAs:        n.Cluster.RootCAs,
-		ClientCAs:      n.Cluster.RootCAs,
-		ClientAuth:     tls.RequestClientCert,
-		NextProtos:     []string{"h2", "http/1.1"},
-		GetCertificate: certGetter.GetCertificate,
-	}
-
-	n.tlsConfig = tlsConfig
-
-	err = os.WriteFile(filepath.Join(n.WorkDir, "ca.pem"), n.Cluster.CACertPEM, 0o755)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func NewTestDockerCluster(t *testing.T, opts *DockerClusterOptions) *DockerCluster {
-	if opts == nil {
-		opts = &DockerClusterOptions{}
-	}
-	if opts.ClusterName == "" {
-		opts.ClusterName = strings.ReplaceAll(t.Name(), "/", "-")
-	}
-	if opts.Logger == nil {
-		opts.Logger = logging.NewVaultLogger(log.Trace).Named(t.Name())
-	}
-	if opts.NetworkName == "" {
-		opts.NetworkName = os.Getenv("TEST_DOCKER_NETWORK_NAME")
-	}
-	if opts.VaultLicense == "" {
-		opts.VaultLicense = os.Getenv(testcluster.EnvVaultLicenseCI)
-	}
-
-	ctx, cancel := context.WithTimeout(context.Background(), 120*time.Second)
-	t.Cleanup(cancel)
-
-	dc, err := NewDockerCluster(ctx, opts)
-	if err != nil {
-		t.Fatal(err)
-	}
-	dc.Logger.Trace("cluster started", "helpful_env", fmt.Sprintf("VAULT_TOKEN=%s VAULT_CACERT=/vault/config/ca.pem", dc.GetRootToken()))
-	return dc
-}
-
-func NewDockerCluster(ctx context.Context, opts *DockerClusterOptions) (*DockerCluster, error) {
-	api, err := dockhelper.NewDockerAPI()
-	if err != nil {
-		return nil, err
-	}
-
-	if opts == nil {
-		opts = &DockerClusterOptions{}
-	}
-	if opts.Logger == nil {
-		opts.Logger = log.NewNullLogger()
-	}
-
-	dc := &DockerCluster{
-		DockerAPI:   api,
-		RaftStorage: true,
-		ClusterName: opts.ClusterName,
-		Logger:      opts.Logger,
-		builtTags:   map[string]struct{}{},
-		CA:          opts.CA,
-	}
-
-	if err := dc.setupDockerCluster(ctx, opts); err != nil {
-		dc.Cleanup()
-		return nil, err
-	}
-
-	return dc, nil
-}
-
-// DockerClusterNode represents a single instance of Vault in a cluster
-type DockerClusterNode struct {
-	NodeID               string
-	HostPort             string
-	client               *api.Client
-	ServerCert           *x509.Certificate
-	ServerCertBytes      []byte
-	ServerCertPEM        []byte
-	ServerCertPEMFile    string
-	ServerKey            *ecdsa.PrivateKey
-	ServerKeyPEM         []byte
-	ServerKeyPEMFile     string
-	tlsConfig            *tls.Config
-	WorkDir              string
-	Cluster              *DockerCluster
-	Container            *types.ContainerJSON
-	DockerAPI            *docker.Client
-	runner               *dockhelper.Runner
-	Logger               log.Logger
-	cleanupContainer     func()
-	RealAPIAddr          string
-	ContainerNetworkName string
-	ContainerIPAddress   string
-	ImageRepo            string
-	ImageTag             string
-	DataVolumeName       string
-	cleanupVolume        func()
-}
-
-func (n *DockerClusterNode) TLSConfig() *tls.Config {
-	return n.tlsConfig.Clone()
-}
-
-func (n *DockerClusterNode) APIClient() *api.Client {
-	// We clone to ensure that whenever this method is called, the caller gets
-	// back a pristine client, without e.g. any namespace or token changes that
-	// might pollute a shared client.  We clone the config instead of the
-	// client because (1) Client.clone propagates the replicationStateStore and
-	// the httpClient pointers, (2) it doesn't copy the tlsConfig at all, and
-	// (3) if clone returns an error, it doesn't feel as appropriate to panic
-	// below.  Who knows why clone might return an error?
-	cfg := n.client.CloneConfig()
-	client, err := api.NewClient(cfg)
-	if err != nil {
-		// It seems fine to panic here, since this should be the same input
-		// we provided to NewClient when we were setup, and we didn't panic then.
-		// Better not to completely ignore the error though, suppose there's a
-		// bug in CloneConfig?
-		panic(fmt.Sprintf("NewClient error on cloned config: %v", err))
-	}
-	client.SetToken(n.Cluster.rootToken)
-	return client
-}
-
-// NewAPIClient creates and configures a Vault API client to communicate with
-// the running Vault Cluster for this DockerClusterNode
-func (n *DockerClusterNode) apiConfig() (*api.Config, error) {
-	transport := cleanhttp.DefaultPooledTransport()
-	transport.TLSClientConfig = n.TLSConfig()
-	if err := http2.ConfigureTransport(transport); err != nil {
-		return nil, err
-	}
-	client := &http.Client{
-		Transport: transport,
-		CheckRedirect: func(*http.Request, []*http.Request) error {
-			// This can of course be overridden per-test by using its own client
-			return fmt.Errorf("redirects not allowed in these tests")
-		},
-	}
-	config := api.DefaultConfig()
-	if config.Error != nil {
-		return nil, config.Error
-	}
-	config.Address = fmt.Sprintf("https://%s", n.HostPort)
-	config.HttpClient = client
-	config.MaxRetries = 0
-	return config, nil
-}
-
-func (n *DockerClusterNode) newAPIClient() (*api.Client, error) {
-	config, err := n.apiConfig()
-	if err != nil {
-		return nil, err
-	}
-	client, err := api.NewClient(config)
-	if err != nil {
-		return nil, err
-	}
-	client.SetToken(n.Cluster.GetRootToken())
-	return client, nil
-}
-
-// Cleanup kills the container of the node and deletes its data volume
-func (n *DockerClusterNode) Cleanup() {
-	n.cleanup()
-}
-
-// Stop kills the container of the node
-func (n *DockerClusterNode) Stop() {
-	n.cleanupContainer()
-}
-
-func (n *DockerClusterNode) cleanup() error {
-	if n.Container == nil || n.Container.ID == "" {
-		return nil
-	}
-	n.cleanupContainer()
-	n.cleanupVolume()
-	return nil
-}
-
-func (n *DockerClusterNode) Start(ctx context.Context, opts *DockerClusterOptions) error {
-	if n.DataVolumeName == "" {
-		vol, err := n.DockerAPI.VolumeCreate(ctx, volume.CreateOptions{})
-		if err != nil {
-			return err
-		}
-		n.DataVolumeName = vol.Name
-		n.cleanupVolume = func() {
-			_ = n.DockerAPI.VolumeRemove(ctx, vol.Name, false)
-		}
-	}
-	vaultCfg := map[string]interface{}{}
-	vaultCfg["listener"] = map[string]interface{}{
-		"tcp": map[string]interface{}{
-			"address":       fmt.Sprintf("%s:%d", "0.0.0.0", 8200),
-			"tls_cert_file": "/vault/config/cert.pem",
-			"tls_key_file":  "/vault/config/key.pem",
-			"telemetry": map[string]interface{}{
-				"unauthenticated_metrics_access": true,
-			},
-		},
-	}
-	vaultCfg["telemetry"] = map[string]interface{}{
-		"disable_hostname": true,
-	}
-	raftOpts := map[string]interface{}{
-		// TODO add options from vnc
-		"path":    "/vault/file",
-		"node_id": n.NodeID,
-	}
-	vaultCfg["storage"] = map[string]interface{}{
-		"raft": raftOpts,
-	}
-	if opts != nil && opts.VaultNodeConfig != nil && len(opts.VaultNodeConfig.StorageOptions) > 0 {
-		for k, v := range opts.VaultNodeConfig.StorageOptions {
-			if _, ok := raftOpts[k].(string); !ok {
-				raftOpts[k] = v
-			}
-		}
-	}
-	//// disable_mlock is required for working in the Docker environment with
-	//// custom plugins
-	vaultCfg["disable_mlock"] = true
-	vaultCfg["api_addr"] = `https://{{- GetAllInterfaces | exclude "flags" "loopback" | attr "address" -}}:8200`
-	vaultCfg["cluster_addr"] = `https://{{- GetAllInterfaces | exclude "flags" "loopback" | attr "address" -}}:8201`
-
-	systemJSON, err := json.Marshal(vaultCfg)
-	if err != nil {
-		return err
-	}
-	err = os.WriteFile(filepath.Join(n.WorkDir, "system.json"), systemJSON, 0o644)
-	if err != nil {
-		return err
-	}
-
-	if opts.VaultNodeConfig != nil {
-		localCfg := *opts.VaultNodeConfig
-		if opts.VaultNodeConfig.LicensePath != "" {
-			b, err := os.ReadFile(opts.VaultNodeConfig.LicensePath)
-			if err != nil || len(b) == 0 {
-				return fmt.Errorf("unable to read LicensePath at %q: %w", opts.VaultNodeConfig.LicensePath, err)
-			}
-			localCfg.LicensePath = "/vault/config/license"
-			dest := filepath.Join(n.WorkDir, "license")
-			err = os.WriteFile(dest, b, 0o644)
-			if err != nil {
-				return fmt.Errorf("error writing license to %q: %w", dest, err)
-			}
-
-		}
-		userJSON, err := json.Marshal(localCfg)
-		if err != nil {
-			return err
-		}
-		err = os.WriteFile(filepath.Join(n.WorkDir, "user.json"), userJSON, 0o644)
-		if err != nil {
-			return err
-		}
-	}
-
-	// Create a temporary cert so vault will start up
-	err = n.setupCert("127.0.0.1")
-	if err != nil {
-		return err
-	}
-
-	caDir := filepath.Join(n.Cluster.tmpDir, "ca")
-
-	// setup plugin bin copy if needed
-	copyFromTo := map[string]string{
-		n.WorkDir: "/vault/config",
-		caDir:     "/usr/local/share/ca-certificates/",
-	}
-
-	var wg sync.WaitGroup
-	wg.Add(1)
-	var seenLogs uberAtomic.Bool
-	logConsumer := func(s string) {
-		if seenLogs.CAS(false, true) {
-			wg.Done()
-		}
-		n.Logger.Trace(s)
-	}
-	logStdout := &LogConsumerWriter{logConsumer}
-	logStderr := &LogConsumerWriter{func(s string) {
-		if seenLogs.CAS(false, true) {
-			wg.Done()
-		}
-		testcluster.JSONLogNoTimestamp(n.Logger, s)
-	}}
-	r, err := dockhelper.NewServiceRunner(dockhelper.RunOptions{
-		ImageRepo: n.ImageRepo,
-		ImageTag:  n.ImageTag,
-		// We don't need to run update-ca-certificates in the container, because
-		// we're providing the CA in the raft join call, and otherwise Vault
-		// servers don't talk to one another on the API port.
-		Cmd: append([]string{"server"}, opts.Args...),
-		Env: []string{
-			// For now we're using disable_mlock, because this is for testing
-			// anyway, and because it prevents us using external plugins.
-			"SKIP_SETCAP=true",
-			"VAULT_LOG_FORMAT=json",
-			"VAULT_LICENSE=" + opts.VaultLicense,
-		},
-		Ports:           []string{"8200/tcp", "8201/tcp"},
-		ContainerName:   n.Name(),
-		NetworkName:     opts.NetworkName,
-		CopyFromTo:      copyFromTo,
-		LogConsumer:     logConsumer,
-		LogStdout:       logStdout,
-		LogStderr:       logStderr,
-		PreDelete:       true,
-		DoNotAutoRemove: true,
-		PostStart: func(containerID string, realIP string) error {
-			err := n.setupCert(realIP)
-			if err != nil {
-				return err
-			}
-
-			// If we signal Vault before it installs its sighup handler, it'll die.
-			wg.Wait()
-			n.Logger.Trace("running poststart", "containerID", containerID, "IP", realIP)
-			return n.runner.RefreshFiles(ctx, containerID)
-		},
-		Capabilities:      []string{"NET_ADMIN"},
-		OmitLogTimestamps: true,
-		VolumeNameToMountPoint: map[string]string{
-			n.DataVolumeName: "/vault/file",
-		},
-	})
-	if err != nil {
-		return err
-	}
-	n.runner = r
-
-	probe := opts.StartProbe
-	if probe == nil {
-		probe = func(c *api.Client) error {
-			_, err = c.Sys().SealStatus()
-			return err
-		}
-	}
-	svc, _, err := r.StartNewService(ctx, false, false, func(ctx context.Context, host string, port int) (dockhelper.ServiceConfig, error) {
-		config, err := n.apiConfig()
-		if err != nil {
-			return nil, err
-		}
-		config.Address = fmt.Sprintf("https://%s:%d", host, port)
-		client, err := api.NewClient(config)
-		if err != nil {
-			return nil, err
-		}
-		err = probe(client)
-		if err != nil {
-			return nil, err
-		}
-
-		return dockhelper.NewServiceHostPort(host, port), nil
-	})
-	if err != nil {
-		return err
-	}
-
-	n.HostPort = svc.Config.Address()
-	n.Container = svc.Container
-	netName := opts.NetworkName
-	if netName == "" {
-		if len(svc.Container.NetworkSettings.Networks) > 1 {
-			return fmt.Errorf("Set d.RunOptions.NetworkName instead for container with multiple networks: %v", svc.Container.NetworkSettings.Networks)
-		}
-		for netName = range svc.Container.NetworkSettings.Networks {
-			// Networks above is a map; we just need to find the first and
-			// only key of this map (network name). The range handles this
-			// for us, but we need a loop construction in order to use range.
-		}
-	}
-	n.ContainerNetworkName = netName
-	n.ContainerIPAddress = svc.Container.NetworkSettings.Networks[netName].IPAddress
-	n.RealAPIAddr = "https://" + n.ContainerIPAddress + ":8200"
-	n.cleanupContainer = svc.Cleanup
-
-	client, err := n.newAPIClient()
-	if err != nil {
-		return err
-	}
-	client.SetToken(n.Cluster.rootToken)
-	n.client = client
-	return nil
-}
-
-func (n *DockerClusterNode) Pause(ctx context.Context) error {
-	return n.DockerAPI.ContainerPause(ctx, n.Container.ID)
-}
-
-func (n *DockerClusterNode) AddNetworkDelay(ctx context.Context, delay time.Duration, targetIP string) error {
-	ip := net.ParseIP(targetIP)
-	if ip == nil {
-		return fmt.Errorf("targetIP %q is not an IP address", targetIP)
-	}
-	// Let's attempt to get a unique handle for the filter rule; we'll assume that
-	// every targetIP has a unique last octet, which is true currently for how
-	// we're doing docker networking.
-	lastOctet := ip.To4()[3]
-
-	stdout, stderr, exitCode, err := n.runner.RunCmdWithOutput(ctx, n.Container.ID, []string{
-		"/bin/sh",
-		"-xec", strings.Join([]string{
-			fmt.Sprintf("echo isolating node %s", targetIP),
-			"apk add iproute2",
-			// If we're running this script a second time on the same node,
-			// the add dev will fail; since we only want to run the netem
-			// command once, we'll do so in the case where the add dev doesn't fail.
-			"tc qdisc add dev eth0 root handle 1: prio && " +
-				fmt.Sprintf("tc qdisc add dev eth0 parent 1:1 handle 2: netem delay %dms", delay/time.Millisecond),
-			// Here we create a u32 filter as per https://man7.org/linux/man-pages/man8/tc-u32.8.html
-			// Its parent is 1:0 (which I guess is the root?)
-			// Its handle must be unique, so we base it on targetIP
-			fmt.Sprintf("tc filter add dev eth0 parent 1:0 protocol ip pref 55 handle ::%x u32 match ip dst %s flowid 2:1", lastOctet, targetIP),
-		}, "; "),
-	})
-	if err != nil {
-		return err
-	}
-
-	n.Logger.Trace(string(stdout))
-	n.Logger.Trace(string(stderr))
-	if exitCode != 0 {
-		return fmt.Errorf("got nonzero exit code from iptables: %d", exitCode)
-	}
-	return nil
-}
-
-type LogConsumerWriter struct {
-	consumer func(string)
-}
-
-func (l LogConsumerWriter) Write(p []byte) (n int, err error) {
-	// TODO this assumes that we're never passed partial log lines, which
-	// seems a safe assumption for now based on how docker looks to implement
-	// logging, but might change in the future.
-	scanner := bufio.NewScanner(bytes.NewReader(p))
-	scanner.Buffer(make([]byte, 64*1024), bufio.MaxScanTokenSize)
-	for scanner.Scan() {
-		l.consumer(scanner.Text())
-	}
-	return len(p), nil
-}
-
-// DockerClusterOptions has options for setting up the docker cluster
-type DockerClusterOptions struct {
-	testcluster.ClusterOptions
-	CAKey       *ecdsa.PrivateKey
-	NetworkName string
-	ImageRepo   string
-	ImageTag    string
-	CA          *testcluster.CA
-	VaultBinary string
-	Args        []string
-	StartProbe  func(*api.Client) error
-}
-
-func ensureLeaderMatches(ctx context.Context, client *api.Client, ready func(response *api.LeaderResponse) error) error {
-	var leader *api.LeaderResponse
-	var err error
-	for ctx.Err() == nil {
-		leader, err = client.Sys().Leader()
-		switch {
-		case err != nil:
-		case leader == nil:
-			err = fmt.Errorf("nil response to leader check")
-		default:
-			err = ready(leader)
-			if err == nil {
-				return nil
-			}
-		}
-		time.Sleep(500 * time.Millisecond)
-	}
-	return fmt.Errorf("error checking leader: %v", err)
-}
-
-const DefaultNumCores = 3
-
-// creates a managed docker container running Vault
-func (dc *DockerCluster) setupDockerCluster(ctx context.Context, opts *DockerClusterOptions) error {
-	if opts.TmpDir != "" {
-		if _, err := os.Stat(opts.TmpDir); os.IsNotExist(err) {
-			if err := os.MkdirAll(opts.TmpDir, 0o700); err != nil {
-				return err
-			}
-		}
-		dc.tmpDir = opts.TmpDir
-	} else {
-		tempDir, err := ioutil.TempDir("", "vault-test-cluster-")
-		if err != nil {
-			return err
-		}
-		dc.tmpDir = tempDir
-	}
-	caDir := filepath.Join(dc.tmpDir, "ca")
-	if err := os.MkdirAll(caDir, 0o755); err != nil {
-		return err
-	}
-
-	var numCores int
-	if opts.NumCores == 0 {
-		numCores = DefaultNumCores
-	} else {
-		numCores = opts.NumCores
-	}
-
-	if dc.CA == nil {
-		if err := dc.setupCA(opts); err != nil {
-			return err
-		}
-	}
-	dc.RootCAs = x509.NewCertPool()
-	dc.RootCAs.AddCert(dc.CA.CACert)
-
-	for i := 0; i < numCores; i++ {
-		if err := dc.addNode(ctx, opts); err != nil {
-			return err
-		}
-		if opts.SkipInit {
-			continue
-		}
-		if i == 0 {
-			if err := dc.setupNode0(ctx); err != nil {
-				return nil
-			}
-		} else {
-			if err := dc.joinNode(ctx, i, 0); err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}
-
-func (dc *DockerCluster) AddNode(ctx context.Context, opts *DockerClusterOptions) error {
-	leaderIdx, err := testcluster.LeaderNode(ctx, dc)
-	if err != nil {
-		return err
-	}
-	if err := dc.addNode(ctx, opts); err != nil {
-		return err
-	}
-
-	return dc.joinNode(ctx, len(dc.ClusterNodes)-1, leaderIdx)
-}
-
-func (dc *DockerCluster) addNode(ctx context.Context, opts *DockerClusterOptions) error {
-	tag, err := dc.setupImage(ctx, opts)
-	if err != nil {
-		return err
-	}
-	i := len(dc.ClusterNodes)
-	nodeID := fmt.Sprintf("core-%d", i)
-	node := &DockerClusterNode{
-		DockerAPI: dc.DockerAPI,
-		NodeID:    nodeID,
-		Cluster:   dc,
-		WorkDir:   filepath.Join(dc.tmpDir, nodeID),
-		Logger:    dc.Logger.Named(nodeID),
-		ImageRepo: opts.ImageRepo,
-		ImageTag:  tag,
-	}
-	dc.ClusterNodes = append(dc.ClusterNodes, node)
-	if err := os.MkdirAll(node.WorkDir, 0o755); err != nil {
-		return err
-	}
-	if err := node.Start(ctx, opts); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (dc *DockerCluster) joinNode(ctx context.Context, nodeIdx int, leaderIdx int) error {
-	leader := dc.ClusterNodes[leaderIdx]
-
-	if nodeIdx >= len(dc.ClusterNodes) {
-		return fmt.Errorf("invalid node %d", nodeIdx)
-	}
-	node := dc.ClusterNodes[nodeIdx]
-	client := node.APIClient()
-
-	var resp *api.RaftJoinResponse
-	resp, err := client.Sys().RaftJoinWithContext(ctx, &api.RaftJoinRequest{
-		// When running locally on a bridge network, the containers must use their
-		// actual (private) IP to talk to one another.  Our code must instead use
-		// the portmapped address since we're not on their network in that case.
-		LeaderAPIAddr:    leader.RealAPIAddr,
-		LeaderCACert:     string(dc.CACertPEM),
-		LeaderClientCert: string(node.ServerCertPEM),
-		LeaderClientKey:  string(node.ServerKeyPEM),
-	})
-	if resp == nil || !resp.Joined {
-		return fmt.Errorf("nil or negative response from raft join request: %v", resp)
-	}
-	if err != nil {
-		return fmt.Errorf("failed to join cluster: %w", err)
-	}
-
-	return testcluster.UnsealNode(ctx, dc, nodeIdx)
-}
-
-func (dc *DockerCluster) setupImage(ctx context.Context, opts *DockerClusterOptions) (string, error) {
-	if opts == nil {
-		opts = &DockerClusterOptions{}
-	}
-	sourceTag := opts.ImageTag
-	if sourceTag == "" {
-		sourceTag = "latest"
-	}
-
-	if opts.VaultBinary == "" {
-		return sourceTag, nil
-	}
-
-	suffix := "testing"
-	if sha := os.Getenv("COMMIT_SHA"); sha != "" {
-		suffix = sha
-	}
-	tag := sourceTag + "-" + suffix
-	if _, ok := dc.builtTags[tag]; ok {
-		return tag, nil
-	}
-
-	f, err := os.Open(opts.VaultBinary)
-	if err != nil {
-		return "", err
-	}
-	data, err := io.ReadAll(f)
-	if err != nil {
-		return "", err
-	}
-	bCtx := dockhelper.NewBuildContext()
-	bCtx["vault"] = &dockhelper.FileContents{
-		Data: data,
-		Mode: 0o755,
-	}
-
-	containerFile := fmt.Sprintf(`
-FROM %s:%s
-COPY vault /bin/vault
-`, opts.ImageRepo, sourceTag)
-
-	_, err = dockhelper.BuildImage(ctx, dc.DockerAPI, containerFile, bCtx,
-		dockhelper.BuildRemove(true), dockhelper.BuildForceRemove(true),
-		dockhelper.BuildPullParent(true),
-		dockhelper.BuildTags([]string{opts.ImageRepo + ":" + tag}))
-	if err != nil {
-		return "", err
-	}
-	dc.builtTags[tag] = struct{}{}
-	return tag, nil
-}
-
-/* Notes on testing the non-bridge network case:
-- you need the test itself to be running in a container so that it can use
-  the network; create the network using
-    docker network create testvault
-- this means that you need to mount the docker socket in that test container,
-  but on macos there's stuff that prevents that from working; to hack that,
-  on the host run
-    sudo ln -s "$HOME/Library/Containers/com.docker.docker/Data/docker.raw.sock" /var/run/docker.sock.raw
-- run the test container like
-    docker run --rm -it --network testvault \
-      -v /var/run/docker.sock.raw:/var/run/docker.sock \
-      -v $(pwd):/home/circleci/go/src/github.com/hashicorp/vault/ \
-      -w /home/circleci/go/src/github.com/hashicorp/vault/ \
-      "docker.mirror.hashicorp.services/cimg/go:1.19.2" /bin/bash
-- in the container you may need to chown/chmod /var/run/docker.sock; use `docker ps`
-  to test if it's working
-
-*/
diff --git a/sdk/helper/testcluster/docker/replication.go b/sdk/helper/testcluster/docker/replication.go
deleted file mode 100644
index c313e7af4d8d2..0000000000000
--- a/sdk/helper/testcluster/docker/replication.go
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package docker
-
-import (
-	"context"
-	"fmt"
-	"os"
-	"strings"
-	"testing"
-
-	"github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/vault/sdk/helper/logging"
-	"github.com/hashicorp/vault/sdk/helper/testcluster"
-)
-
-func DefaultOptions(t *testing.T) *DockerClusterOptions {
-	return &DockerClusterOptions{
-		ImageRepo:   "hashicorp/vault",
-		ImageTag:    "latest",
-		VaultBinary: os.Getenv("VAULT_BINARY"),
-		ClusterOptions: testcluster.ClusterOptions{
-			NumCores:    3,
-			ClusterName: strings.ReplaceAll(t.Name(), "/", "-"),
-			VaultNodeConfig: &testcluster.VaultNodeConfig{
-				LogLevel: "TRACE",
-			},
-		},
-	}
-}
-
-func NewReplicationSetDocker(t *testing.T, opts *DockerClusterOptions) (*testcluster.ReplicationSet, error) {
-	binary := os.Getenv("VAULT_BINARY")
-	if binary == "" {
-		t.Skip("only running docker test when $VAULT_BINARY present")
-	}
-
-	r := &testcluster.ReplicationSet{
-		Clusters: map[string]testcluster.VaultCluster{},
-		Logger:   logging.NewVaultLogger(hclog.Trace).Named(t.Name()),
-	}
-
-	// clusterName is used for container name as well.
-	// A container name should not exceed 64 chars.
-	// There are additional chars that are added to the name as well
-	// like "-A-core0". So, setting a max limit for a cluster name.
-	if len(opts.ClusterName) > MaxClusterNameLength {
-		return nil, fmt.Errorf("cluster name length exceeded the maximum allowed length of %v", MaxClusterNameLength)
-	}
-
-	r.Builder = func(ctx context.Context, name string, baseLogger hclog.Logger) (testcluster.VaultCluster, error) {
-		myOpts := *opts
-		myOpts.Logger = baseLogger.Named(name)
-		if myOpts.ClusterName == "" {
-			myOpts.ClusterName = strings.ReplaceAll(t.Name(), "/", "-")
-		}
-		myOpts.ClusterName += "-" + strings.ReplaceAll(name, "/", "-")
-		myOpts.CA = r.CA
-		return NewTestDockerCluster(t, &myOpts), nil
-	}
-
-	a, err := r.Builder(context.TODO(), "A", r.Logger)
-	if err != nil {
-		return nil, err
-	}
-	r.Clusters["A"] = a
-	r.CA = a.(*DockerCluster).CA
-
-	return r, err
-}
diff --git a/sdk/helper/testcluster/exec.go b/sdk/helper/testcluster/exec.go
deleted file mode 100644
index d91a3de034ac6..0000000000000
--- a/sdk/helper/testcluster/exec.go
+++ /dev/null
@@ -1,324 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package testcluster
-
-import (
-	"bufio"
-	"context"
-	"crypto/tls"
-	"fmt"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
-	"testing"
-	"time"
-
-	log "github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/sdk/helper/jsonutil"
-	"github.com/hashicorp/vault/sdk/helper/logging"
-)
-
-type ExecDevCluster struct {
-	ID                 string
-	ClusterName        string
-	ClusterNodes       []*execDevClusterNode
-	CACertPEMFile      string
-	barrierKeys        [][]byte
-	recoveryKeys       [][]byte
-	tmpDir             string
-	clientAuthRequired bool
-	rootToken          string
-	stop               func()
-	stopCh             chan struct{}
-	Logger             log.Logger
-}
-
-func (dc *ExecDevCluster) SetRootToken(token string) {
-	dc.rootToken = token
-}
-
-func (dc *ExecDevCluster) NamedLogger(s string) log.Logger {
-	return dc.Logger.Named(s)
-}
-
-var _ VaultCluster = &ExecDevCluster{}
-
-type ExecDevClusterOptions struct {
-	ClusterOptions
-	BinaryPath string
-	// this is -dev-listen-address, defaults to "127.0.0.1:8200"
-	BaseListenAddress string
-}
-
-func NewTestExecDevCluster(t *testing.T, opts *ExecDevClusterOptions) *ExecDevCluster {
-	if opts == nil {
-		opts = &ExecDevClusterOptions{}
-	}
-	if opts.ClusterName == "" {
-		opts.ClusterName = strings.ReplaceAll(t.Name(), "/", "-")
-	}
-	if opts.Logger == nil {
-		opts.Logger = logging.NewVaultLogger(log.Trace).Named(t.Name()) // .Named("container")
-	}
-	if opts.VaultLicense == "" {
-		opts.VaultLicense = os.Getenv(EnvVaultLicenseCI)
-	}
-
-	ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
-	t.Cleanup(cancel)
-
-	dc, err := NewExecDevCluster(ctx, opts)
-	if err != nil {
-		t.Fatal(err)
-	}
-	return dc
-}
-
-func NewExecDevCluster(ctx context.Context, opts *ExecDevClusterOptions) (*ExecDevCluster, error) {
-	dc := &ExecDevCluster{
-		ClusterName: opts.ClusterName,
-		stopCh:      make(chan struct{}),
-	}
-
-	if opts == nil {
-		opts = &ExecDevClusterOptions{}
-	}
-	if opts.NumCores == 0 {
-		opts.NumCores = 3
-	}
-	if err := dc.setupExecDevCluster(ctx, opts); err != nil {
-		dc.Cleanup()
-		return nil, err
-	}
-
-	return dc, nil
-}
-
-func (dc *ExecDevCluster) setupExecDevCluster(ctx context.Context, opts *ExecDevClusterOptions) (retErr error) {
-	if opts == nil {
-		opts = &ExecDevClusterOptions{}
-	}
-	if opts.Logger == nil {
-		opts.Logger = log.NewNullLogger()
-	}
-	dc.Logger = opts.Logger
-
-	if opts.TmpDir != "" {
-		if _, err := os.Stat(opts.TmpDir); os.IsNotExist(err) {
-			if err := os.MkdirAll(opts.TmpDir, 0o700); err != nil {
-				return err
-			}
-		}
-		dc.tmpDir = opts.TmpDir
-	} else {
-		tempDir, err := os.MkdirTemp("", "vault-test-cluster-")
-		if err != nil {
-			return err
-		}
-		dc.tmpDir = tempDir
-	}
-
-	// This context is used to stop the subprocess
-	execCtx, cancel := context.WithCancel(context.Background())
-	dc.stop = func() {
-		cancel()
-		close(dc.stopCh)
-	}
-	defer func() {
-		if retErr != nil {
-			cancel()
-		}
-	}()
-
-	bin := opts.BinaryPath
-	if bin == "" {
-		bin = "vault"
-	}
-
-	clusterJsonPath := filepath.Join(dc.tmpDir, "cluster.json")
-	args := []string{"server", "-dev", "-dev-cluster-json", clusterJsonPath}
-	switch {
-	case opts.NumCores == 3:
-		args = append(args, "-dev-three-node")
-	case opts.NumCores == 1:
-		args = append(args, "-dev-tls")
-	default:
-		return fmt.Errorf("NumCores=1 and NumCores=3 are the only supported options right now")
-	}
-	if opts.BaseListenAddress != "" {
-		args = append(args, "-dev-listen-address", opts.BaseListenAddress)
-	}
-	cmd := exec.CommandContext(execCtx, bin, args...)
-	cmd.Env = os.Environ()
-	cmd.Env = append(cmd.Env, "VAULT_LICENSE="+opts.VaultLicense)
-	cmd.Env = append(cmd.Env, "VAULT_LOG_FORMAT=json")
-	cmd.Env = append(cmd.Env, "VAULT_DEV_TEMP_DIR="+dc.tmpDir)
-	if opts.Logger != nil {
-		stdout, err := cmd.StdoutPipe()
-		if err != nil {
-			return err
-		}
-		go func() {
-			outlog := opts.Logger.Named("stdout")
-			scanner := bufio.NewScanner(stdout)
-			for scanner.Scan() {
-				outlog.Trace(scanner.Text())
-			}
-		}()
-		stderr, err := cmd.StderrPipe()
-		if err != nil {
-			return err
-		}
-		go func() {
-			errlog := opts.Logger.Named("stderr")
-			scanner := bufio.NewScanner(stderr)
-			// The default buffer is 4k, and Vault can emit bigger log lines
-			scanner.Buffer(make([]byte, 64*1024), bufio.MaxScanTokenSize)
-			for scanner.Scan() {
-				JSONLogNoTimestamp(errlog, scanner.Text())
-			}
-		}()
-	}
-
-	if err := cmd.Start(); err != nil {
-		return err
-	}
-
-	for ctx.Err() == nil {
-		if b, err := os.ReadFile(clusterJsonPath); err == nil && len(b) > 0 {
-			var clusterJson ClusterJson
-			if err := jsonutil.DecodeJSON(b, &clusterJson); err != nil {
-				continue
-			}
-			dc.CACertPEMFile = clusterJson.CACertPath
-			dc.rootToken = clusterJson.RootToken
-			for i, node := range clusterJson.Nodes {
-				config := api.DefaultConfig()
-				config.Address = node.APIAddress
-				err := config.ConfigureTLS(&api.TLSConfig{
-					CACert: clusterJson.CACertPath,
-				})
-				if err != nil {
-					return err
-				}
-				client, err := api.NewClient(config)
-				if err != nil {
-					return err
-				}
-				client.SetToken(dc.rootToken)
-				_, err = client.Sys().ListMounts()
-				if err != nil {
-					return err
-				}
-
-				dc.ClusterNodes = append(dc.ClusterNodes, &execDevClusterNode{
-					name:   fmt.Sprintf("core-%d", i),
-					client: client,
-				})
-			}
-			return nil
-		}
-		time.Sleep(500 * time.Millisecond)
-	}
-	return ctx.Err()
-}
-
-type execDevClusterNode struct {
-	name   string
-	client *api.Client
-}
-
-var _ VaultClusterNode = &execDevClusterNode{}
-
-func (e *execDevClusterNode) Name() string {
-	return e.name
-}
-
-func (e *execDevClusterNode) APIClient() *api.Client {
-	// We clone to ensure that whenever this method is called, the caller gets
-	// back a pristine client, without e.g. any namespace or token changes that
-	// might pollute a shared client.  We clone the config instead of the
-	// client because (1) Client.clone propagates the replicationStateStore and
-	// the httpClient pointers, (2) it doesn't copy the tlsConfig at all, and
-	// (3) if clone returns an error, it doesn't feel as appropriate to panic
-	// below.  Who knows why clone might return an error?
-	cfg := e.client.CloneConfig()
-	client, err := api.NewClient(cfg)
-	if err != nil {
-		// It seems fine to panic here, since this should be the same input
-		// we provided to NewClient when we were setup, and we didn't panic then.
-		// Better not to completely ignore the error though, suppose there's a
-		// bug in CloneConfig?
-		panic(fmt.Sprintf("NewClient error on cloned config: %v", err))
-	}
-	client.SetToken(e.client.Token())
-	return client
-}
-
-func (e *execDevClusterNode) TLSConfig() *tls.Config {
-	return e.client.CloneConfig().TLSConfig()
-}
-
-func (dc *ExecDevCluster) ClusterID() string {
-	return dc.ID
-}
-
-func (dc *ExecDevCluster) Nodes() []VaultClusterNode {
-	ret := make([]VaultClusterNode, len(dc.ClusterNodes))
-	for i := range dc.ClusterNodes {
-		ret[i] = dc.ClusterNodes[i]
-	}
-	return ret
-}
-
-func (dc *ExecDevCluster) GetBarrierKeys() [][]byte {
-	return dc.barrierKeys
-}
-
-func copyKey(key []byte) []byte {
-	result := make([]byte, len(key))
-	copy(result, key)
-	return result
-}
-
-func (dc *ExecDevCluster) GetRecoveryKeys() [][]byte {
-	ret := make([][]byte, len(dc.recoveryKeys))
-	for i, k := range dc.recoveryKeys {
-		ret[i] = copyKey(k)
-	}
-	return ret
-}
-
-func (dc *ExecDevCluster) GetBarrierOrRecoveryKeys() [][]byte {
-	return dc.GetBarrierKeys()
-}
-
-func (dc *ExecDevCluster) SetBarrierKeys(keys [][]byte) {
-	dc.barrierKeys = make([][]byte, len(keys))
-	for i, k := range keys {
-		dc.barrierKeys[i] = copyKey(k)
-	}
-}
-
-func (dc *ExecDevCluster) SetRecoveryKeys(keys [][]byte) {
-	dc.recoveryKeys = make([][]byte, len(keys))
-	for i, k := range keys {
-		dc.recoveryKeys[i] = copyKey(k)
-	}
-}
-
-func (dc *ExecDevCluster) GetCACertPEMFile() string {
-	return dc.CACertPEMFile
-}
-
-func (dc *ExecDevCluster) Cleanup() {
-	dc.stop()
-}
-
-// GetRootToken returns the root token of the cluster, if set
-func (dc *ExecDevCluster) GetRootToken() string {
-	return dc.rootToken
-}
diff --git a/sdk/helper/testcluster/logging.go b/sdk/helper/testcluster/logging.go
deleted file mode 100644
index dda759c7f84f1..0000000000000
--- a/sdk/helper/testcluster/logging.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package testcluster
-
-import (
-	"encoding/json"
-	"strings"
-
-	"github.com/hashicorp/go-hclog"
-)
-
-func JSONLogNoTimestamp(outlog hclog.Logger, text string) {
-	d := json.NewDecoder(strings.NewReader(text))
-	m := map[string]interface{}{}
-	if err := d.Decode(&m); err != nil {
-		outlog.Error("failed to decode json output from dev vault", "error", err, "input", text)
-		return
-	}
-
-	delete(m, "@timestamp")
-	message := m["@message"].(string)
-	delete(m, "@message")
-	level := m["@level"].(string)
-	delete(m, "@level")
-	if module, ok := m["@module"]; ok {
-		delete(m, "@module")
-		outlog = outlog.Named(module.(string))
-	}
-
-	var pairs []interface{}
-	for k, v := range m {
-		pairs = append(pairs, k, v)
-	}
-
-	outlog.Log(hclog.LevelFromString(level), message, pairs...)
-}
diff --git a/sdk/helper/testcluster/replication.go b/sdk/helper/testcluster/replication.go
deleted file mode 100644
index 46356deff1401..0000000000000
--- a/sdk/helper/testcluster/replication.go
+++ /dev/null
@@ -1,905 +0,0 @@
-package testcluster
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"reflect"
-	"strings"
-	"time"
-
-	"github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/go-secure-stdlib/strutil"
-	"github.com/hashicorp/go-uuid"
-	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/sdk/helper/consts"
-	"github.com/mitchellh/mapstructure"
-)
-
-func GetPerformanceToken(pri VaultCluster, id, secondaryPublicKey string) (string, error) {
-	client := pri.Nodes()[0].APIClient()
-	req := map[string]interface{}{
-		"id": id,
-	}
-	if secondaryPublicKey != "" {
-		req["secondary_public_key"] = secondaryPublicKey
-	}
-	secret, err := client.Logical().Write("sys/replication/performance/primary/secondary-token", req)
-	if err != nil {
-		return "", err
-	}
-
-	if secondaryPublicKey != "" {
-		return secret.Data["token"].(string), nil
-	}
-	return secret.WrapInfo.Token, nil
-}
-
-func EnablePerfPrimary(ctx context.Context, pri VaultCluster) error {
-	client := pri.Nodes()[0].APIClient()
-	_, err := client.Logical().WriteWithContext(ctx, "sys/replication/performance/primary/enable", nil)
-	if err != nil {
-		return err
-	}
-
-	err = WaitForPerfReplicationState(ctx, pri, consts.ReplicationPerformancePrimary)
-	if err != nil {
-		return err
-	}
-	return WaitForActiveNodeAndPerfStandbys(ctx, pri)
-}
-
-func WaitForPerfReplicationState(ctx context.Context, cluster VaultCluster, state consts.ReplicationState) error {
-	client := cluster.Nodes()[0].APIClient()
-	var health *api.HealthResponse
-	var err error
-	for ctx.Err() == nil {
-		health, err = client.Sys().HealthWithContext(ctx)
-		if err == nil && health.ReplicationPerformanceMode == state.GetPerformanceString() {
-			return nil
-		}
-		time.Sleep(500 * time.Millisecond)
-	}
-	if err == nil {
-		err = ctx.Err()
-	}
-	return err
-}
-
-func EnablePerformanceSecondaryNoWait(ctx context.Context, perfToken string, pri, sec VaultCluster, updatePrimary bool) error {
-	postData := map[string]interface{}{
-		"token":   perfToken,
-		"ca_file": DefaultCAFile,
-	}
-	path := "sys/replication/performance/secondary/enable"
-	if updatePrimary {
-		path = "sys/replication/performance/secondary/update-primary"
-	}
-	err := WaitForActiveNodeAndPerfStandbys(ctx, sec)
-	if err != nil {
-		return err
-	}
-	_, err = sec.Nodes()[0].APIClient().Logical().Write(path, postData)
-	if err != nil {
-		return err
-	}
-
-	return WaitForPerfReplicationState(ctx, sec, consts.ReplicationPerformanceSecondary)
-}
-
-func EnablePerformanceSecondary(ctx context.Context, perfToken string, pri, sec VaultCluster, updatePrimary, skipPoisonPill bool) (string, error) {
-	if err := EnablePerformanceSecondaryNoWait(ctx, perfToken, pri, sec, updatePrimary); err != nil {
-		return "", err
-	}
-	if err := WaitForMatchingMerkleRoots(ctx, "sys/replication/performance/", pri, sec); err != nil {
-		return "", err
-	}
-	root, err := WaitForPerformanceSecondary(ctx, pri, sec, skipPoisonPill)
-	if err != nil {
-		return "", err
-	}
-	if err := WaitForPerfReplicationWorking(ctx, pri, sec); err != nil {
-		return "", err
-	}
-	return root, nil
-}
-
-func WaitForMatchingMerkleRoots(ctx context.Context, endpoint string, pri, sec VaultCluster) error {
-	getRoot := func(mode string, cli *api.Client) (string, error) {
-		status, err := cli.Logical().Read(endpoint + "status")
-		if err != nil {
-			return "", err
-		}
-		if status == nil || status.Data == nil || status.Data["mode"] == nil {
-			return "", fmt.Errorf("got nil secret or data")
-		}
-		if status.Data["mode"].(string) != mode {
-			return "", fmt.Errorf("expected mode=%s, got %s", mode, status.Data["mode"].(string))
-		}
-		return status.Data["merkle_root"].(string), nil
-	}
-
-	secClient := sec.Nodes()[0].APIClient()
-	priClient := pri.Nodes()[0].APIClient()
-	for i := 0; i < 30; i++ {
-		secRoot, err := getRoot("secondary", secClient)
-		if err != nil {
-			return err
-		}
-		priRoot, err := getRoot("primary", priClient)
-		if err != nil {
-			return err
-		}
-
-		if reflect.DeepEqual(priRoot, secRoot) {
-			return nil
-		}
-		time.Sleep(time.Second)
-	}
-
-	return fmt.Errorf("roots did not become equal")
-}
-
-func WaitForPerformanceWAL(ctx context.Context, pri, sec VaultCluster) error {
-	endpoint := "sys/replication/performance/"
-	if err := WaitForMatchingMerkleRoots(ctx, endpoint, pri, sec); err != nil {
-		return nil
-	}
-	getWAL := func(mode, walKey string, cli *api.Client) (int64, error) {
-		status, err := cli.Logical().Read(endpoint + "status")
-		if err != nil {
-			return 0, err
-		}
-		if status == nil || status.Data == nil || status.Data["mode"] == nil {
-			return 0, fmt.Errorf("got nil secret or data")
-		}
-		if status.Data["mode"].(string) != mode {
-			return 0, fmt.Errorf("expected mode=%s, got %s", mode, status.Data["mode"].(string))
-		}
-		return status.Data[walKey].(json.Number).Int64()
-	}
-
-	secClient := sec.Nodes()[0].APIClient()
-	priClient := pri.Nodes()[0].APIClient()
-	for ctx.Err() == nil {
-		secLastRemoteWAL, err := getWAL("secondary", "last_remote_wal", secClient)
-		if err != nil {
-			return err
-		}
-		priLastPerfWAL, err := getWAL("primary", "last_performance_wal", priClient)
-		if err != nil {
-			return err
-		}
-
-		if secLastRemoteWAL >= priLastPerfWAL {
-			return nil
-		}
-		time.Sleep(time.Second)
-	}
-
-	return fmt.Errorf("performance WALs on the secondary did not catch up with the primary, context err: %w", ctx.Err())
-}
-
-func WaitForPerformanceSecondary(ctx context.Context, pri, sec VaultCluster, skipPoisonPill bool) (string, error) {
-	if len(pri.GetRecoveryKeys()) > 0 {
-		sec.SetBarrierKeys(pri.GetRecoveryKeys())
-		sec.SetRecoveryKeys(pri.GetRecoveryKeys())
-	} else {
-		sec.SetBarrierKeys(pri.GetBarrierKeys())
-		sec.SetRecoveryKeys(pri.GetBarrierKeys())
-	}
-
-	if len(sec.Nodes()) > 1 {
-		if skipPoisonPill {
-			// As part of prepareSecondary on the active node the keyring is
-			// deleted from storage.  Its absence can cause standbys to seal
-			// themselves. But it's not reliable, so we'll seal them
-			// ourselves to force the issue.
-			for i := range sec.Nodes()[1:] {
-				if err := SealNode(ctx, sec, i+1); err != nil {
-					return "", err
-				}
-			}
-		} else {
-			// We want to make sure we unseal all the nodes so we first need to wait
-			// until two of the nodes seal due to the poison pill being written
-			if err := WaitForNCoresSealed(ctx, sec, len(sec.Nodes())-1); err != nil {
-				return "", err
-			}
-		}
-	}
-	if _, err := WaitForActiveNode(ctx, sec); err != nil {
-		return "", err
-	}
-	if err := UnsealAllNodes(ctx, sec); err != nil {
-		return "", err
-	}
-
-	perfSecondaryRootToken, err := GenerateRoot(sec, GenerateRootRegular)
-	if err != nil {
-		return "", err
-	}
-	sec.SetRootToken(perfSecondaryRootToken)
-	if err := WaitForActiveNodeAndPerfStandbys(ctx, sec); err != nil {
-		return "", err
-	}
-
-	return perfSecondaryRootToken, nil
-}
-
-func WaitForPerfReplicationWorking(ctx context.Context, pri, sec VaultCluster) error {
-	priActiveIdx, err := WaitForActiveNode(ctx, pri)
-	if err != nil {
-		return err
-	}
-	secActiveIdx, err := WaitForActiveNode(ctx, sec)
-	if err != nil {
-		return err
-	}
-
-	priClient, secClient := pri.Nodes()[priActiveIdx].APIClient(), sec.Nodes()[secActiveIdx].APIClient()
-	mountPoint, err := uuid.GenerateUUID()
-	if err != nil {
-		return err
-	}
-	err = priClient.Sys().Mount(mountPoint, &api.MountInput{
-		Type:  "kv",
-		Local: false,
-	})
-	if err != nil {
-		return fmt.Errorf("unable to mount KV engine on primary")
-	}
-
-	path := mountPoint + "/foo"
-	_, err = priClient.Logical().Write(path, map[string]interface{}{
-		"bar": 1,
-	})
-	if err != nil {
-		return fmt.Errorf("unable to write KV on primary", "path", path)
-	}
-
-	for ctx.Err() == nil {
-		var secret *api.Secret
-		secret, err = secClient.Logical().Read(path)
-		if err == nil && secret != nil {
-			err = priClient.Sys().Unmount(mountPoint)
-			if err != nil {
-				return fmt.Errorf("unable to unmount KV engine on primary")
-			}
-			return nil
-		}
-		time.Sleep(100 * time.Millisecond)
-	}
-	if err == nil {
-		err = ctx.Err()
-	}
-	return fmt.Errorf("unable to read replicated KV on secondary, path=%s, err=%v", path, err)
-}
-
-func SetupTwoClusterPerfReplication(ctx context.Context, pri, sec VaultCluster) error {
-	if err := EnablePerfPrimary(ctx, pri); err != nil {
-		return err
-	}
-	perfToken, err := GetPerformanceToken(pri, sec.ClusterID(), "")
-	if err != nil {
-		return err
-	}
-
-	_, err = EnablePerformanceSecondary(ctx, perfToken, pri, sec, false, false)
-	return err
-}
-
-// PassiveWaitForActiveNodeAndPerfStandbys should be used instead of
-// WaitForActiveNodeAndPerfStandbys when you don't want to do any writes
-// as a side-effect. This returns perfStandby nodes in the cluster and
-// an error.
-func PassiveWaitForActiveNodeAndPerfStandbys(ctx context.Context, pri VaultCluster) (VaultClusterNode, []VaultClusterNode, error) {
-	leaderNode, standbys, err := GetActiveAndStandbys(ctx, pri)
-	if err != nil {
-		return nil, nil, fmt.Errorf("failed to derive standby nodes, %w", err)
-	}
-
-	for i, node := range standbys {
-		client := node.APIClient()
-		// Make sure we get perf standby nodes
-		if err = EnsureCoreIsPerfStandby(ctx, client); err != nil {
-			return nil, nil, fmt.Errorf("standby node %d is not a perfStandby, %w", i, err)
-		}
-	}
-
-	return leaderNode, standbys, nil
-}
-
-func GetActiveAndStandbys(ctx context.Context, cluster VaultCluster) (VaultClusterNode, []VaultClusterNode, error) {
-	var leaderIndex int
-	var err error
-	if leaderIndex, err = WaitForActiveNode(ctx, cluster); err != nil {
-		return nil, nil, err
-	}
-
-	var leaderNode VaultClusterNode
-	var nodes []VaultClusterNode
-	for i, node := range cluster.Nodes() {
-		if i == leaderIndex {
-			leaderNode = node
-			continue
-		}
-		nodes = append(nodes, node)
-	}
-
-	return leaderNode, nodes, nil
-}
-
-func EnsureCoreIsPerfStandby(ctx context.Context, client *api.Client) error {
-	var err error
-	var health *api.HealthResponse
-	for ctx.Err() == nil {
-		health, err = client.Sys().HealthWithContext(ctx)
-		if err == nil && health.PerformanceStandby {
-			return nil
-		}
-		time.Sleep(time.Millisecond * 500)
-	}
-	if err == nil {
-		err = ctx.Err()
-	}
-	return err
-}
-
-func WaitForDRReplicationState(ctx context.Context, cluster VaultCluster, state consts.ReplicationState) error {
-	client := cluster.Nodes()[0].APIClient()
-	var health *api.HealthResponse
-	var err error
-	for ctx.Err() == nil {
-		health, err = client.Sys().HealthWithContext(ctx)
-		if err == nil && health.ReplicationDRMode == state.GetDRString() {
-			return nil
-		}
-		time.Sleep(500 * time.Millisecond)
-	}
-	if err == nil {
-		err = ctx.Err()
-	}
-	return err
-}
-
-func EnableDrPrimary(ctx context.Context, pri VaultCluster) error {
-	client := pri.Nodes()[0].APIClient()
-	_, err := client.Logical().Write("sys/replication/dr/primary/enable", nil)
-	if err != nil {
-		return err
-	}
-
-	err = WaitForDRReplicationState(ctx, pri, consts.ReplicationDRPrimary)
-	if err != nil {
-		return err
-	}
-	return WaitForActiveNodeAndPerfStandbys(ctx, pri)
-}
-
-func GenerateDRActivationToken(pri VaultCluster, id, secondaryPublicKey string) (string, error) {
-	client := pri.Nodes()[0].APIClient()
-	req := map[string]interface{}{
-		"id": id,
-	}
-	if secondaryPublicKey != "" {
-		req["secondary_public_key"] = secondaryPublicKey
-	}
-	secret, err := client.Logical().Write("sys/replication/dr/primary/secondary-token", req)
-	if err != nil {
-		return "", err
-	}
-
-	if secondaryPublicKey != "" {
-		return secret.Data["token"].(string), nil
-	}
-	return secret.WrapInfo.Token, nil
-}
-
-func WaitForDRSecondary(ctx context.Context, pri, sec VaultCluster, skipPoisonPill bool) error {
-	if len(pri.GetRecoveryKeys()) > 0 {
-		sec.SetBarrierKeys(pri.GetRecoveryKeys())
-		sec.SetRecoveryKeys(pri.GetRecoveryKeys())
-	} else {
-		sec.SetBarrierKeys(pri.GetBarrierKeys())
-		sec.SetRecoveryKeys(pri.GetBarrierKeys())
-	}
-
-	if len(sec.Nodes()) > 1 {
-		if skipPoisonPill {
-			// As part of prepareSecondary on the active node the keyring is
-			// deleted from storage.  Its absence can cause standbys to seal
-			// themselves. But it's not reliable, so we'll seal them
-			// ourselves to force the issue.
-			for i := range sec.Nodes()[1:] {
-				if err := SealNode(ctx, sec, i+1); err != nil {
-					return err
-				}
-			}
-		} else {
-			// We want to make sure we unseal all the nodes so we first need to wait
-			// until two of the nodes seal due to the poison pill being written
-			if err := WaitForNCoresSealed(ctx, sec, len(sec.Nodes())-1); err != nil {
-				return err
-			}
-		}
-	}
-	if _, err := WaitForActiveNode(ctx, sec); err != nil {
-		return err
-	}
-
-	// unseal nodes
-	for i := range sec.Nodes() {
-		if err := UnsealNode(ctx, sec, i); err != nil {
-			// Sometimes when we get here it's already unsealed on its own
-			// and then this fails for DR secondaries so check again
-			// The error is "path disabled in replication DR secondary mode".
-			if healthErr := NodeHealthy(ctx, sec, i); healthErr != nil {
-				// return the original error
-				return err
-			}
-		}
-	}
-
-	sec.SetRootToken(pri.GetRootToken())
-
-	if _, err := WaitForActiveNode(ctx, sec); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func EnableDRSecondaryNoWait(ctx context.Context, sec VaultCluster, drToken string) error {
-	postData := map[string]interface{}{
-		"token":   drToken,
-		"ca_file": DefaultCAFile,
-	}
-
-	_, err := sec.Nodes()[0].APIClient().Logical().Write("sys/replication/dr/secondary/enable", postData)
-	if err != nil {
-		return err
-	}
-
-	return WaitForDRReplicationState(ctx, sec, consts.ReplicationDRSecondary)
-}
-
-func WaitForReplicationStatus(ctx context.Context, client *api.Client, dr bool, accept func(map[string]interface{}) error) error {
-	url := "sys/replication/performance/status"
-	if dr {
-		url = "sys/replication/dr/status"
-	}
-
-	var err error
-	var secret *api.Secret
-	for ctx.Err() == nil {
-		secret, err = client.Logical().Read(url)
-		if err == nil && secret != nil && secret.Data != nil {
-			if err = accept(secret.Data); err == nil {
-				return nil
-			}
-		}
-		time.Sleep(500 * time.Millisecond)
-	}
-	if err == nil {
-		err = ctx.Err()
-	}
-
-	return fmt.Errorf("unable to get acceptable replication status: error=%v secret=%#v", err, secret)
-}
-
-func WaitForDRReplicationWorking(ctx context.Context, pri, sec VaultCluster) error {
-	priClient := pri.Nodes()[0].APIClient()
-	secClient := sec.Nodes()[0].APIClient()
-
-	// Make sure we've entered stream-wals mode
-	err := WaitForReplicationStatus(ctx, secClient, true, func(secret map[string]interface{}) error {
-		state := secret["state"]
-		if state == string("stream-wals") {
-			return nil
-		}
-		return fmt.Errorf("expected stream-wals replication state, got %v", state)
-	})
-	if err != nil {
-		return err
-	}
-
-	// Now write some data and make sure that we see last_remote_wal nonzero, i.e.
-	// at least one WAL has been streamed.
-	secret, err := priClient.Auth().Token().Create(&api.TokenCreateRequest{})
-	if err != nil {
-		return err
-	}
-
-	// Revoke the token since some tests won't be happy to see it.
-	err = priClient.Auth().Token().RevokeTree(secret.Auth.ClientToken)
-	if err != nil {
-		return err
-	}
-
-	err = WaitForReplicationStatus(ctx, secClient, true, func(secret map[string]interface{}) error {
-		state := secret["state"]
-		if state != string("stream-wals") {
-			return fmt.Errorf("expected stream-wals replication state, got %v", state)
-		}
-
-		if secret["last_remote_wal"] != nil {
-			lastRemoteWal, _ := secret["last_remote_wal"].(json.Number).Int64()
-			if lastRemoteWal <= 0 {
-				return fmt.Errorf("expected last_remote_wal to be greater than zero")
-			}
-			return nil
-		}
-
-		return fmt.Errorf("replication seems to be still catching up, maybe need to wait more")
-	})
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func EnableDrSecondary(ctx context.Context, pri, sec VaultCluster, drToken string) error {
-	err := EnableDRSecondaryNoWait(ctx, sec, drToken)
-	if err != nil {
-		return err
-	}
-
-	if err = WaitForMatchingMerkleRoots(ctx, "sys/replication/dr/", pri, sec); err != nil {
-		return err
-	}
-
-	err = WaitForDRSecondary(ctx, pri, sec, false)
-	if err != nil {
-		return err
-	}
-
-	if err = WaitForDRReplicationWorking(ctx, pri, sec); err != nil {
-		return err
-	}
-	return nil
-}
-
-func SetupTwoClusterDRReplication(ctx context.Context, pri, sec VaultCluster) error {
-	if err := EnableDrPrimary(ctx, pri); err != nil {
-		return err
-	}
-
-	drToken, err := GenerateDRActivationToken(pri, sec.ClusterID(), "")
-	if err != nil {
-		return err
-	}
-	err = EnableDrSecondary(ctx, pri, sec, drToken)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func DemoteDRPrimary(client *api.Client) error {
-	_, err := client.Logical().Write("sys/replication/dr/primary/demote", map[string]interface{}{})
-	return err
-}
-
-func createBatchToken(client *api.Client, path string) (string, error) {
-	// TODO: should these be more random in case more than one batch token needs to be created?
-	suffix := strings.Replace(path, "/", "", -1)
-	policyName := "path-batch-policy-" + suffix
-	roleName := "path-batch-role-" + suffix
-
-	rules := fmt.Sprintf(`path "%s" { capabilities = [ "read", "update" ] }`, path)
-
-	// create policy
-	_, err := client.Logical().Write("sys/policy/"+policyName, map[string]interface{}{
-		"policy": rules,
-	})
-	if err != nil {
-		return "", err
-	}
-
-	// create a role
-	_, err = client.Logical().Write("auth/token/roles/"+roleName, map[string]interface{}{
-		"allowed_policies": policyName,
-		"orphan":           true,
-		"renewable":        false,
-		"token_type":       "batch",
-	})
-	if err != nil {
-		return "", err
-	}
-
-	// create batch token
-	secret, err := client.Logical().Write("auth/token/create/"+roleName, nil)
-	if err != nil {
-		return "", err
-	}
-
-	return secret.Auth.ClientToken, nil
-}
-
-// PromoteDRSecondaryWithBatchToken creates a batch token for DR promotion
-// before promotion, it demotes the primary cluster. The primary cluster needs
-// to be functional for the generation of the batch token
-func PromoteDRSecondaryWithBatchToken(ctx context.Context, pri, sec VaultCluster) error {
-	client := pri.Nodes()[0].APIClient()
-	drToken, err := createBatchToken(client, "sys/replication/dr/secondary/promote")
-	if err != nil {
-		return err
-	}
-
-	err = DemoteDRPrimary(client)
-	if err != nil {
-		return err
-	}
-
-	return promoteDRSecondaryInternal(ctx, sec, drToken)
-}
-
-// PromoteDRSecondary generates a DR operation token on the secondary using
-// unseal/recovery keys. Therefore, the primary cluster could potentially
-// be out of service.
-func PromoteDRSecondary(ctx context.Context, sec VaultCluster) error {
-	// generate DR operation token to do update primary on vC to point to
-	// the new perfSec primary vD
-	drToken, err := GenerateRoot(sec, GenerateRootDR)
-	if err != nil {
-		return err
-	}
-	return promoteDRSecondaryInternal(ctx, sec, drToken)
-}
-
-func promoteDRSecondaryInternal(ctx context.Context, sec VaultCluster, drToken string) error {
-	secClient := sec.Nodes()[0].APIClient()
-
-	// Allow retries of 503s, e.g.: replication is still catching up,
-	// try again later or provide the "force" argument
-	oldMaxRetries := secClient.MaxRetries()
-	secClient.SetMaxRetries(10)
-	defer secClient.SetMaxRetries(oldMaxRetries)
-	resp, err := secClient.Logical().Write("sys/replication/dr/secondary/promote", map[string]interface{}{
-		"dr_operation_token": drToken,
-	})
-	if err != nil {
-		return err
-	}
-	if resp == nil {
-		return fmt.Errorf("nil status response during DR promotion")
-	}
-
-	if _, err := WaitForActiveNode(ctx, sec); err != nil {
-		return err
-	}
-
-	return WaitForDRReplicationState(ctx, sec, consts.ReplicationDRPrimary)
-}
-
-func checkClusterAddr(ctx context.Context, pri, sec VaultCluster) error {
-	priClient := pri.Nodes()[0].APIClient()
-	priLeader, err := priClient.Sys().LeaderWithContext(ctx)
-	if err != nil {
-		return err
-	}
-	secClient := sec.Nodes()[0].APIClient()
-	endpoint := "sys/replication/dr/"
-	status, err := secClient.Logical().Read(endpoint + "status")
-	if err != nil {
-		return err
-	}
-	if status == nil || status.Data == nil {
-		return fmt.Errorf("got nil secret or data")
-	}
-
-	var priAddrs []string
-	err = mapstructure.Decode(status.Data["known_primary_cluster_addrs"], &priAddrs)
-	if err != nil {
-		return err
-	}
-	if !strutil.StrListContains(priAddrs, priLeader.LeaderClusterAddress) {
-		return fmt.Errorf("failed to fine the expected primary cluster address %v in known_primary_cluster_addrs", priLeader.LeaderClusterAddress)
-	}
-
-	return nil
-}
-
-func UpdatePrimary(ctx context.Context, pri, sec VaultCluster) error {
-	// generate DR operation token to do update primary on vC to point to
-	// the new perfSec primary vD
-	rootToken, err := GenerateRoot(sec, GenerateRootDR)
-	if err != nil {
-		return err
-	}
-
-	// secondary activation token
-	drToken, err := GenerateDRActivationToken(pri, sec.ClusterID(), "")
-	if err != nil {
-		return err
-	}
-
-	// update-primary on vC (new perfSec Dr secondary) to point to
-	// the new perfSec Dr primary
-	secClient := sec.Nodes()[0].APIClient()
-	resp, err := secClient.Logical().Write("sys/replication/dr/secondary/update-primary", map[string]interface{}{
-		"dr_operation_token": rootToken,
-		"token":              drToken,
-		"ca_file":            DefaultCAFile,
-	})
-	if err != nil {
-		return err
-	}
-	if resp == nil {
-		return fmt.Errorf("nil status response during update primary")
-	}
-
-	if _, err = WaitForActiveNode(ctx, sec); err != nil {
-		return err
-	}
-
-	if err = WaitForDRReplicationState(ctx, sec, consts.ReplicationDRSecondary); err != nil {
-		return err
-	}
-
-	if err = checkClusterAddr(ctx, pri, sec); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func SetupFourClusterReplication(ctx context.Context, pri, sec, pridr, secdr VaultCluster) error {
-	err := SetupTwoClusterPerfReplication(ctx, pri, sec)
-	if err != nil {
-		return err
-	}
-	err = SetupTwoClusterDRReplication(ctx, pri, pridr)
-	if err != nil {
-		return err
-	}
-	err = SetupTwoClusterDRReplication(ctx, sec, secdr)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-type ReplicationSet struct {
-	// By convention, we recommend the following naming scheme for
-	// clusters in this map:
-	// A: perf primary
-	// B: primary's DR
-	// C: first perf secondary of A
-	// D: C's DR
-	// E: second perf secondary of A
-	// F: E's DR
-	// ... etc.
-	//
-	// We use generic names rather than role-specific names because
-	// that's less confusing when promotions take place that result in role
-	// changes. In other words, if D gets promoted to replace C as a perf
-	// secondary, and C gets demoted and updated to become D's DR secondary,
-	// they should maintain their initial names of D and C throughout.
-	Clusters map[string]VaultCluster
-	Builder  ClusterBuilder
-	Logger   hclog.Logger
-	CA       *CA
-}
-
-type ClusterBuilder func(ctx context.Context, name string, logger hclog.Logger) (VaultCluster, error)
-
-func NewReplicationSet(b ClusterBuilder) (*ReplicationSet, error) {
-	return &ReplicationSet{
-		Clusters: map[string]VaultCluster{},
-		Builder:  b,
-		Logger:   hclog.NewNullLogger(),
-	}, nil
-}
-
-func (r *ReplicationSet) StandardPerfReplication(ctx context.Context) error {
-	for _, name := range []string{"A", "C"} {
-		if _, ok := r.Clusters[name]; !ok {
-			cluster, err := r.Builder(ctx, name, r.Logger)
-			if err != nil {
-				return err
-			}
-			r.Clusters[name] = cluster
-		}
-	}
-
-	ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
-	defer cancel()
-	err := SetupTwoClusterPerfReplication(ctx, r.Clusters["A"], r.Clusters["C"])
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (r *ReplicationSet) StandardDRReplication(ctx context.Context) error {
-	for _, name := range []string{"A", "B"} {
-		if _, ok := r.Clusters[name]; !ok {
-			cluster, err := r.Builder(ctx, name, r.Logger)
-			if err != nil {
-				return err
-			}
-			r.Clusters[name] = cluster
-		}
-	}
-
-	ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
-	defer cancel()
-	err := SetupTwoClusterDRReplication(ctx, r.Clusters["A"], r.Clusters["B"])
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (r *ReplicationSet) GetFourReplicationCluster(ctx context.Context) error {
-	for _, name := range []string{"A", "B", "C", "D"} {
-		if _, ok := r.Clusters[name]; !ok {
-			cluster, err := r.Builder(ctx, name, r.Logger)
-			if err != nil {
-				return err
-			}
-			r.Clusters[name] = cluster
-		}
-	}
-
-	ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
-	defer cancel()
-	err := SetupFourClusterReplication(ctx, r.Clusters["A"], r.Clusters["C"], r.Clusters["B"], r.Clusters["D"])
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func (r *ReplicationSet) Cleanup() {
-	for _, cluster := range r.Clusters {
-		cluster.Cleanup()
-	}
-}
-
-func WaitForPerfReplicationConnectionStatus(ctx context.Context, client *api.Client) error {
-	type Primary struct {
-		APIAddress       string `mapstructure:"api_address"`
-		ConnectionStatus string `mapstructure:"connection_status"`
-		ClusterAddress   string `mapstructure:"cluster_address"`
-		LastHeartbeat    string `mapstructure:"last_heartbeat"`
-	}
-	type Status struct {
-		Primaries []Primary `mapstructure:"primaries"`
-	}
-	return WaitForPerfReplicationStatus(ctx, client, func(m map[string]interface{}) error {
-		var status Status
-		err := mapstructure.Decode(m, &status)
-		if err != nil {
-			return err
-		}
-		if len(status.Primaries) == 0 {
-			return fmt.Errorf("primaries is zero")
-		}
-		for _, v := range status.Primaries {
-			if v.ConnectionStatus == "connected" {
-				return nil
-			}
-		}
-		return fmt.Errorf("no primaries connected")
-	})
-}
-
-func WaitForPerfReplicationStatus(ctx context.Context, client *api.Client, accept func(map[string]interface{}) error) error {
-	var err error
-	var secret *api.Secret
-	for ctx.Err() == nil {
-		secret, err = client.Logical().Read("sys/replication/performance/status")
-		if err == nil && secret != nil && secret.Data != nil {
-			if err = accept(secret.Data); err == nil {
-				return nil
-			}
-		}
-		time.Sleep(500 * time.Millisecond)
-	}
-	return fmt.Errorf("unable to get acceptable replication status within allotted time: error=%v secret=%#v", err, secret)
-}
diff --git a/sdk/helper/testcluster/types.go b/sdk/helper/testcluster/types.go
deleted file mode 100644
index 084413521ce88..0000000000000
--- a/sdk/helper/testcluster/types.go
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package testcluster
-
-import (
-	"crypto/ecdsa"
-	"crypto/tls"
-	"crypto/x509"
-	"time"
-
-	"github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/vault/api"
-)
-
-type VaultClusterNode interface {
-	APIClient() *api.Client
-	TLSConfig() *tls.Config
-}
-
-type VaultCluster interface {
-	Nodes() []VaultClusterNode
-	GetBarrierKeys() [][]byte
-	GetRecoveryKeys() [][]byte
-	GetBarrierOrRecoveryKeys() [][]byte
-	SetBarrierKeys([][]byte)
-	SetRecoveryKeys([][]byte)
-	GetCACertPEMFile() string
-	Cleanup()
-	ClusterID() string
-	NamedLogger(string) hclog.Logger
-	SetRootToken(token string)
-	GetRootToken() string
-}
-
-type VaultNodeConfig struct {
-	// Not configurable because cluster creator wants to control these:
-	//   PluginDirectory string `hcl:"plugin_directory"`
-	//   APIAddr              string      `hcl:"api_addr"`
-	//   ClusterAddr          string      `hcl:"cluster_addr"`
-	//   Storage   *Storage `hcl:"-"`
-	//   HAStorage *Storage `hcl:"-"`
-	//   DisableMlock bool `hcl:"disable_mlock"`
-	//   ClusterName string `hcl:"cluster_name"`
-
-	// Not configurable yet:
-	//   Listeners []*Listener `hcl:"-"`
-	//   Seals   []*KMS   `hcl:"-"`
-	//   Entropy *Entropy `hcl:"-"`
-	//   Telemetry *Telemetry `hcl:"telemetry"`
-	//   HCPLinkConf *HCPLinkConfig `hcl:"cloud"`
-	//   PidFile string `hcl:"pid_file"`
-	//   ServiceRegistrationType        string
-	//   ServiceRegistrationOptions    map[string]string
-
-	StorageOptions map[string]string
-
-	DefaultMaxRequestDuration      time.Duration `json:"default_max_request_duration"`
-	LogFormat                      string        `json:"log_format"`
-	LogLevel                       string        `json:"log_level"`
-	CacheSize                      int           `json:"cache_size"`
-	DisableCache                   bool          `json:"disable_cache"`
-	DisablePrintableCheck          bool          `json:"disable_printable_check"`
-	EnableUI                       bool          `json:"ui"`
-	MaxLeaseTTL                    time.Duration `json:"max_lease_ttl"`
-	DefaultLeaseTTL                time.Duration `json:"default_lease_ttl"`
-	ClusterCipherSuites            string        `json:"cluster_cipher_suites"`
-	PluginFileUid                  int           `json:"plugin_file_uid"`
-	PluginFilePermissions          int           `json:"plugin_file_permissions"`
-	EnableRawEndpoint              bool          `json:"raw_storage_endpoint"`
-	DisableClustering              bool          `json:"disable_clustering"`
-	DisablePerformanceStandby      bool          `json:"disable_performance_standby"`
-	DisableSealWrap                bool          `json:"disable_sealwrap"`
-	DisableIndexing                bool          `json:"disable_indexing"`
-	DisableSentinelTrace           bool          `json:"disable_sentinel"`
-	EnableResponseHeaderHostname   bool          `json:"enable_response_header_hostname"`
-	LogRequestsLevel               string        `json:"log_requests_level"`
-	EnableResponseHeaderRaftNodeID bool          `json:"enable_response_header_raft_node_id"`
-	LicensePath                    string        `json:"license_path"`
-}
-
-type ClusterNode struct {
-	APIAddress string `json:"api_address"`
-}
-
-type ClusterJson struct {
-	Nodes      []ClusterNode `json:"nodes"`
-	CACertPath string        `json:"ca_cert_path"`
-	RootToken  string        `json:"root_token"`
-}
-
-type ClusterOptions struct {
-	ClusterName        string
-	KeepStandbysSealed bool
-	SkipInit           bool
-	CACert             []byte
-	NumCores           int
-	TmpDir             string
-	Logger             hclog.Logger
-	VaultNodeConfig    *VaultNodeConfig
-	VaultLicense       string
-}
-
-type CA struct {
-	CACert        *x509.Certificate
-	CACertBytes   []byte
-	CACertPEM     []byte
-	CACertPEMFile string
-	CAKey         *ecdsa.PrivateKey
-	CAKeyPEM      []byte
-}
diff --git a/sdk/helper/testcluster/util.go b/sdk/helper/testcluster/util.go
deleted file mode 100644
index 4ecf5f5338998..0000000000000
--- a/sdk/helper/testcluster/util.go
+++ /dev/null
@@ -1,356 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package testcluster
-
-import (
-	"context"
-	"encoding/base64"
-	"encoding/hex"
-	"fmt"
-	"sync/atomic"
-	"time"
-
-	"github.com/hashicorp/go-multierror"
-	"github.com/hashicorp/go-uuid"
-	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/sdk/helper/xor"
-)
-
-// Note that OSS standbys will not accept seal requests.  And ent perf standbys
-// may fail it as well if they haven't yet been able to get "elected" as perf standbys.
-func SealNode(ctx context.Context, cluster VaultCluster, nodeIdx int) error {
-	if nodeIdx >= len(cluster.Nodes()) {
-		return fmt.Errorf("invalid nodeIdx %d for cluster", nodeIdx)
-	}
-	node := cluster.Nodes()[nodeIdx]
-	client := node.APIClient()
-
-	err := client.Sys().SealWithContext(ctx)
-	if err != nil {
-		return err
-	}
-
-	return NodeSealed(ctx, cluster, nodeIdx)
-}
-
-func SealAllNodes(ctx context.Context, cluster VaultCluster) error {
-	for i := range cluster.Nodes() {
-		if err := SealNode(ctx, cluster, i); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func UnsealNode(ctx context.Context, cluster VaultCluster, nodeIdx int) error {
-	if nodeIdx >= len(cluster.Nodes()) {
-		return fmt.Errorf("invalid nodeIdx %d for cluster", nodeIdx)
-	}
-	node := cluster.Nodes()[nodeIdx]
-	client := node.APIClient()
-
-	for _, key := range cluster.GetBarrierOrRecoveryKeys() {
-		_, err := client.Sys().UnsealWithContext(ctx, hex.EncodeToString(key))
-		if err != nil {
-			return err
-		}
-	}
-
-	return NodeHealthy(ctx, cluster, nodeIdx)
-}
-
-func UnsealAllNodes(ctx context.Context, cluster VaultCluster) error {
-	for i := range cluster.Nodes() {
-		if err := UnsealNode(ctx, cluster, i); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func NodeSealed(ctx context.Context, cluster VaultCluster, nodeIdx int) error {
-	if nodeIdx >= len(cluster.Nodes()) {
-		return fmt.Errorf("invalid nodeIdx %d for cluster", nodeIdx)
-	}
-	node := cluster.Nodes()[nodeIdx]
-	client := node.APIClient()
-
-	var health *api.HealthResponse
-	var err error
-	for ctx.Err() == nil {
-		health, err = client.Sys().HealthWithContext(ctx)
-		switch {
-		case err != nil:
-		case !health.Sealed:
-			err = fmt.Errorf("unsealed: %#v", health)
-		default:
-			return nil
-		}
-		time.Sleep(500 * time.Millisecond)
-	}
-	return fmt.Errorf("node %d is not sealed: %v", nodeIdx, err)
-}
-
-func WaitForNCoresSealed(ctx context.Context, cluster VaultCluster, n int) error {
-	ctx, cancel := context.WithCancel(ctx)
-	defer cancel()
-
-	errs := make(chan error)
-	for i := range cluster.Nodes() {
-		go func(i int) {
-			var err error
-			for ctx.Err() == nil {
-				err = NodeSealed(ctx, cluster, i)
-				if err == nil {
-					errs <- nil
-					return
-				}
-				time.Sleep(100 * time.Millisecond)
-			}
-			if err == nil {
-				err = ctx.Err()
-			}
-			errs <- err
-		}(i)
-	}
-
-	var merr *multierror.Error
-	var sealed int
-	for range cluster.Nodes() {
-		err := <-errs
-		if err != nil {
-			merr = multierror.Append(merr, err)
-		} else {
-			sealed++
-			if sealed == n {
-				return nil
-			}
-		}
-	}
-
-	return fmt.Errorf("%d cores were not sealed, errs: %v", n, merr.ErrorOrNil())
-}
-
-func NodeHealthy(ctx context.Context, cluster VaultCluster, nodeIdx int) error {
-	if nodeIdx >= len(cluster.Nodes()) {
-		return fmt.Errorf("invalid nodeIdx %d for cluster", nodeIdx)
-	}
-	node := cluster.Nodes()[nodeIdx]
-	client := node.APIClient()
-
-	var health *api.HealthResponse
-	var err error
-	for ctx.Err() == nil {
-		health, err = client.Sys().HealthWithContext(ctx)
-		switch {
-		case err != nil:
-		case health == nil:
-			err = fmt.Errorf("nil response to health check")
-		case health.Sealed:
-			err = fmt.Errorf("sealed: %#v", health)
-		default:
-			return nil
-		}
-		time.Sleep(500 * time.Millisecond)
-	}
-	return fmt.Errorf("node %d is unhealthy: %v", nodeIdx, err)
-}
-
-func LeaderNode(ctx context.Context, cluster VaultCluster) (int, error) {
-	for i, node := range cluster.Nodes() {
-		client := node.APIClient()
-		ctx, cancel := context.WithTimeout(ctx, 100*time.Millisecond)
-		resp, err := client.Sys().LeaderWithContext(ctx)
-		cancel()
-		if err != nil || resp == nil || !resp.IsSelf {
-			continue
-		}
-		return i, nil
-	}
-	return -1, fmt.Errorf("no leader found")
-}
-
-func WaitForActiveNode(ctx context.Context, cluster VaultCluster) (int, error) {
-	for ctx.Err() == nil {
-		if idx, _ := LeaderNode(ctx, cluster); idx != -1 {
-			return idx, nil
-		}
-		time.Sleep(500 * time.Millisecond)
-	}
-	return -1, ctx.Err()
-}
-
-func WaitForActiveNodeAndPerfStandbys(ctx context.Context, cluster VaultCluster) error {
-	logger := cluster.NamedLogger("WaitForActiveNodeAndPerfStandbys")
-	// This WaitForActiveNode was added because after a Raft cluster is sealed
-	// and then unsealed, when it comes up it may have a different leader than
-	// Core0, making this helper fail.
-	// A sleep before calling WaitForActiveNodeAndPerfStandbys seems to sort
-	// things out, but so apparently does this.  We should be able to eliminate
-	// this call to WaitForActiveNode by reworking the logic in this method.
-	if _, err := WaitForActiveNode(ctx, cluster); err != nil {
-		return err
-	}
-
-	if len(cluster.Nodes()) == 1 {
-		return nil
-	}
-
-	expectedStandbys := len(cluster.Nodes()) - 1
-
-	mountPoint, err := uuid.GenerateUUID()
-	if err != nil {
-		return err
-	}
-	leaderClient := cluster.Nodes()[0].APIClient()
-
-	for ctx.Err() == nil {
-		err = leaderClient.Sys().MountWithContext(ctx, mountPoint, &api.MountInput{
-			Type:  "kv",
-			Local: true,
-		})
-		if err == nil {
-			break
-		}
-		time.Sleep(1 * time.Second)
-	}
-	if err != nil {
-		return fmt.Errorf("unable to mount KV engine: %v", err)
-	}
-	path := mountPoint + "/waitforactivenodeandperfstandbys"
-	var standbys, actives int64
-	errchan := make(chan error, len(cluster.Nodes()))
-	for i := range cluster.Nodes() {
-		go func(coreNo int) {
-			node := cluster.Nodes()[coreNo]
-			client := node.APIClient()
-			val := 1
-			var err error
-			defer func() {
-				errchan <- err
-			}()
-
-			var lastWAL uint64
-			for ctx.Err() == nil {
-				_, err = leaderClient.Logical().WriteWithContext(ctx, path, map[string]interface{}{
-					"bar": val,
-				})
-				val++
-				time.Sleep(250 * time.Millisecond)
-				if err != nil {
-					continue
-				}
-				var leader *api.LeaderResponse
-				leader, err = client.Sys().LeaderWithContext(ctx)
-				if err != nil {
-					continue
-				}
-				switch {
-				case leader.IsSelf:
-					logger.Trace("waiting for core", "core", coreNo, "isLeader", true)
-					atomic.AddInt64(&actives, 1)
-					return
-				case leader.PerfStandby && leader.PerfStandbyLastRemoteWAL > 0:
-					switch {
-					case lastWAL == 0:
-						lastWAL = leader.PerfStandbyLastRemoteWAL
-						logger.Trace("waiting for core", "core", coreNo, "lastRemoteWAL", leader.PerfStandbyLastRemoteWAL, "lastWAL", lastWAL)
-					case lastWAL < leader.PerfStandbyLastRemoteWAL:
-						logger.Trace("waiting for core", "core", coreNo, "lastRemoteWAL", leader.PerfStandbyLastRemoteWAL, "lastWAL", lastWAL)
-						atomic.AddInt64(&standbys, 1)
-						return
-					}
-				}
-			}
-		}(i)
-	}
-
-	errs := make([]error, 0, len(cluster.Nodes()))
-	for range cluster.Nodes() {
-		errs = append(errs, <-errchan)
-	}
-	if actives != 1 || int(standbys) != expectedStandbys {
-		return fmt.Errorf("expected 1 active core and %d standbys, got %d active and %d standbys, errs: %v",
-			expectedStandbys, actives, standbys, errs)
-	}
-
-	for ctx.Err() == nil {
-		err = leaderClient.Sys().UnmountWithContext(ctx, mountPoint)
-		if err == nil {
-			break
-		}
-		time.Sleep(time.Second)
-	}
-	if err != nil {
-		return fmt.Errorf("unable to unmount KV engine on primary")
-	}
-	return nil
-}
-
-type GenerateRootKind int
-
-const (
-	GenerateRootRegular GenerateRootKind = iota
-	GenerateRootDR
-	GenerateRecovery
-)
-
-func GenerateRoot(cluster VaultCluster, kind GenerateRootKind) (string, error) {
-	// If recovery keys supported, use those to perform root token generation instead
-	keys := cluster.GetBarrierOrRecoveryKeys()
-
-	client := cluster.Nodes()[0].APIClient()
-
-	var err error
-	var status *api.GenerateRootStatusResponse
-	switch kind {
-	case GenerateRootRegular:
-		status, err = client.Sys().GenerateRootInit("", "")
-	case GenerateRootDR:
-		status, err = client.Sys().GenerateDROperationTokenInit("", "")
-	case GenerateRecovery:
-		status, err = client.Sys().GenerateRecoveryOperationTokenInit("", "")
-	}
-	if err != nil {
-		return "", err
-	}
-
-	if status.Required > len(keys) {
-		return "", fmt.Errorf("need more keys than have, need %d have %d", status.Required, len(keys))
-	}
-
-	otp := status.OTP
-
-	for i, key := range keys {
-		if i >= status.Required {
-			break
-		}
-
-		strKey := base64.StdEncoding.EncodeToString(key)
-		switch kind {
-		case GenerateRootRegular:
-			status, err = client.Sys().GenerateRootUpdate(strKey, status.Nonce)
-		case GenerateRootDR:
-			status, err = client.Sys().GenerateDROperationTokenUpdate(strKey, status.Nonce)
-		case GenerateRecovery:
-			status, err = client.Sys().GenerateRecoveryOperationTokenUpdate(strKey, status.Nonce)
-		}
-		if err != nil {
-			return "", err
-		}
-	}
-	if !status.Complete {
-		return "", fmt.Errorf("generate root operation did not end successfully")
-	}
-
-	tokenBytes, err := base64.RawStdEncoding.DecodeString(status.EncodedToken)
-	if err != nil {
-		return "", err
-	}
-	tokenBytes, err = xor.XORBytes(tokenBytes, []byte(otp))
-	if err != nil {
-		return "", err
-	}
-	return string(tokenBytes), nil
-}
diff --git a/sdk/helper/testhelpers/output.go b/sdk/helper/testhelpers/output.go
deleted file mode 100644
index 769a63a189498..0000000000000
--- a/sdk/helper/testhelpers/output.go
+++ /dev/null
@@ -1,81 +0,0 @@
-package testhelpers
-
-import (
-	"crypto/sha256"
-	"fmt"
-	"reflect"
-
-	"github.com/mitchellh/go-testing-interface"
-	"github.com/mitchellh/mapstructure"
-)
-
-// ToMap renders an input value of any type as a map.  This is intended for
-// logging human-readable data dumps in test logs, so it uses the `json`
-// tags on struct fields: this makes it easy to exclude `"-"` values that
-// are typically not interesting, respect omitempty, etc.
-//
-// We also replace any []byte fields with a hash of their value.
-// This is usually sufficient for test log purposes, and is a lot more readable
-// than a big array of individual byte values like Go would normally stringify a
-// byte slice.
-func ToMap(in any) (map[string]any, error) {
-	temp := make(map[string]any)
-	cfg := &mapstructure.DecoderConfig{
-		TagName:              "json",
-		IgnoreUntaggedFields: true,
-		Result:               &temp,
-	}
-	md, err := mapstructure.NewDecoder(cfg)
-	if err != nil {
-		return nil, err
-	}
-	err = md.Decode(in)
-	if err != nil {
-		return nil, err
-	}
-
-	// mapstructure doesn't call the DecodeHook for each field when doing
-	// struct->map conversions, but it does for map->map, so call it a second
-	// time to convert each []byte field.
-	out := make(map[string]any)
-	md2, err := mapstructure.NewDecoder(&mapstructure.DecoderConfig{
-		Result: &out,
-		DecodeHook: func(from reflect.Type, to reflect.Type, data interface{}) (interface{}, error) {
-			if from.Kind() != reflect.Slice || from.Elem().Kind() != reflect.Uint8 {
-				return data, nil
-			}
-			b := data.([]byte)
-			return fmt.Sprintf("%x", sha256.Sum256(b)), nil
-		},
-	})
-	if err != nil {
-		return nil, err
-	}
-	err = md2.Decode(temp)
-	if err != nil {
-		return nil, err
-	}
-
-	return out, nil
-}
-
-// ToString renders its input using ToMap, and returns a string containing the
-// result or an error if that fails.
-func ToString(in any) string {
-	m, err := ToMap(in)
-	if err != nil {
-		return err.Error()
-	}
-	return fmt.Sprintf("%v", m)
-}
-
-// StringOrDie renders its input using ToMap, and returns a string containing the
-// result.  If rendering yields an error, calls t.Fatal.
-func StringOrDie(t testing.T, in any) string {
-	t.Helper()
-	m, err := ToMap(in)
-	if err != nil {
-		t.Fatal(err)
-	}
-	return fmt.Sprintf("%v", m)
-}
diff --git a/sdk/helper/testhelpers/output_test.go b/sdk/helper/testhelpers/output_test.go
deleted file mode 100644
index 257d9480942f6..0000000000000
--- a/sdk/helper/testhelpers/output_test.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package testhelpers
-
-import (
-	"fmt"
-	"reflect"
-	"testing"
-)
-
-func TestToMap(t *testing.T) {
-	type s struct {
-		A string            `json:"a"`
-		B []byte            `json:"b"`
-		C map[string]string `json:"c"`
-		D string            `json:"-"`
-	}
-	type args struct {
-		in s
-	}
-	tests := []struct {
-		name    string
-		args    args
-		want    string
-		wantErr bool
-	}{
-		{
-			name:    "basic",
-			args:    args{s{A: "a", B: []byte("bytes"), C: map[string]string{"k": "v"}, D: "d"}},
-			want:    "map[a:a b:277089d91c0bdf4f2e6862ba7e4a07605119431f5d13f726dd352b06f1b206a9 c:map[k:v]]",
-			wantErr: false,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			m, err := ToMap(&tt.args.in)
-			if (err != nil) != tt.wantErr {
-				t.Errorf("ToMap() error = %v, wantErr %v", err, tt.wantErr)
-				return
-			}
-			got := fmt.Sprintf("%s", m)
-			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("ToMap() got = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
diff --git a/sdk/helper/testhelpers/schema/response_validation.go b/sdk/helper/testhelpers/schema/response_validation.go
deleted file mode 100644
index 430d1754a56f9..0000000000000
--- a/sdk/helper/testhelpers/schema/response_validation.go
+++ /dev/null
@@ -1,202 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package schema
-
-import (
-	"encoding/json"
-	"fmt"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/hashicorp/vault/sdk/framework"
-	"github.com/hashicorp/vault/sdk/logical"
-)
-
-// ValidateResponse is a test helper that validates whether the given response
-// object conforms to the response schema (schema.Fields). It cycles through
-// the data map and validates conversions in the schema. In "strict" mode, this
-// function will also ensure that the data map has all schema-required fields
-// and does not have any fields outside of the schema.
-func ValidateResponse(t *testing.T, schema *framework.Response, response *logical.Response, strict bool) {
-	t.Helper()
-
-	if response != nil {
-		ValidateResponseData(t, schema, response.Data, strict)
-	} else {
-		ValidateResponseData(t, schema, nil, strict)
-	}
-}
-
-// ValidateResponseData is a test helper that validates whether the given
-// response data map conforms to the response schema (schema.Fields). It cycles
-// through the data map and validates conversions in the schema. In "strict"
-// mode, this function will also ensure that the data map has all schema's
-// requred fields and does not have any fields outside of the schema.
-func ValidateResponseData(t *testing.T, schema *framework.Response, data map[string]interface{}, strict bool) {
-	t.Helper()
-
-	if err := validateResponseDataImpl(
-		schema,
-		data,
-		strict,
-	); err != nil {
-		t.Fatalf("validation error: %v; response data: %#v", err, data)
-	}
-}
-
-// validateResponseDataImpl is extracted so that it can be tested
-func validateResponseDataImpl(schema *framework.Response, data map[string]interface{}, strict bool) error {
-	// nothing to validate
-	if schema == nil {
-		return nil
-	}
-
-	// Certain responses may come through with non-2xx status codes. While
-	// these are not always errors (e.g. 3xx redirection codes), we don't
-	// consider them for the purposes of schema validation
-	if status, exists := data[logical.HTTPStatusCode]; exists {
-		s, ok := status.(int)
-		if ok && (s < 200 || s > 299) {
-			return nil
-		}
-	}
-
-	// Marshal the data to JSON and back to convert the map's values into
-	// JSON strings expected by Validate() and ValidateStrict(). This is
-	// not efficient and is done for testing purposes only.
-	jsonBytes, err := json.Marshal(data)
-	if err != nil {
-		return fmt.Errorf("failed to convert input to json: %w", err)
-	}
-
-	var dataWithStringValues map[string]interface{}
-	if err := json.Unmarshal(
-		jsonBytes,
-		&dataWithStringValues,
-	); err != nil {
-		return fmt.Errorf("failed to unmashal data: %w", err)
-	}
-
-	// these are special fields that will not show up in the final response and
-	// should be ignored
-	for _, field := range []string{
-		logical.HTTPContentType,
-		logical.HTTPRawBody,
-		logical.HTTPStatusCode,
-		logical.HTTPRawBodyAlreadyJSONDecoded,
-		logical.HTTPCacheControlHeader,
-		logical.HTTPPragmaHeader,
-		logical.HTTPWWWAuthenticateHeader,
-	} {
-		delete(dataWithStringValues, field)
-
-		if _, ok := schema.Fields[field]; ok {
-			return fmt.Errorf("encountered a reserved field in response schema: %s", field)
-		}
-	}
-
-	// Validate
-	fd := framework.FieldData{
-		Raw:    dataWithStringValues,
-		Schema: schema.Fields,
-	}
-
-	if strict {
-		return fd.ValidateStrict()
-	}
-
-	return fd.Validate()
-}
-
-// FindResponseSchema is a test helper to extract response schema from the
-// given framework path / operation.
-func FindResponseSchema(t *testing.T, paths []*framework.Path, pathIdx int, operation logical.Operation) *framework.Response {
-	t.Helper()
-
-	if pathIdx >= len(paths) {
-		t.Fatalf("path index %d is out of range", pathIdx)
-	}
-
-	schemaPath := paths[pathIdx]
-
-	return GetResponseSchema(t, schemaPath, operation)
-}
-
-func GetResponseSchema(t *testing.T, path *framework.Path, operation logical.Operation) *framework.Response {
-	t.Helper()
-
-	schemaOperation, ok := path.Operations[operation]
-	if !ok {
-		t.Fatalf(
-			"could not find response schema: %s: %q operation does not exist",
-			path.Pattern,
-			operation,
-		)
-	}
-
-	var schemaResponses []framework.Response
-
-	for _, status := range []int{
-		http.StatusOK,        // 200
-		http.StatusAccepted,  // 202
-		http.StatusNoContent, // 204
-	} {
-		schemaResponses, ok = schemaOperation.Properties().Responses[status]
-		if ok {
-			break
-		}
-	}
-
-	if len(schemaResponses) == 0 {
-		t.Fatalf(
-			"could not find response schema: %s: %q operation: no responses found",
-			path.Pattern,
-			operation,
-		)
-	}
-
-	return &schemaResponses[0]
-}
-
-// ResponseValidatingCallback can be used in setting up a [vault.TestCluster]
-// that validates every response against the openapi specifications.
-//
-// [vault.TestCluster]: https://pkg.go.dev/github.com/hashicorp/vault/vault#TestCluster
-func ResponseValidatingCallback(t *testing.T) func(logical.Backend, *logical.Request, *logical.Response) {
-	type PathRouter interface {
-		Route(string) *framework.Path
-	}
-
-	return func(b logical.Backend, req *logical.Request, resp *logical.Response) {
-		t.Helper()
-
-		if b == nil {
-			t.Fatalf("non-nil backend required")
-		}
-
-		backend, ok := b.(PathRouter)
-		if !ok {
-			t.Fatalf("could not cast %T to have `Route(string) *framework.Path`", b)
-		}
-
-		// The full request path includes the backend but when passing to the
-		// backend, we have to trim the mount point:
-		//   `sys/mounts/secret` -> `mounts/secret`
-		//   `auth/token/create` -> `create`
-		requestPath := strings.TrimPrefix(req.Path, req.MountPoint)
-
-		route := backend.Route(requestPath)
-		if route == nil {
-			t.Fatalf("backend %T could not find a route for %s", b, req.Path)
-		}
-
-		ValidateResponse(
-			t,
-			GetResponseSchema(t, route, req.Operation),
-			resp,
-			true,
-		)
-	}
-}
diff --git a/sdk/helper/testhelpers/schema/response_validation_test.go b/sdk/helper/testhelpers/schema/response_validation_test.go
deleted file mode 100644
index 4f4aa8b1cc3c6..0000000000000
--- a/sdk/helper/testhelpers/schema/response_validation_test.go
+++ /dev/null
@@ -1,359 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package schema
-
-import (
-	"testing"
-	"time"
-
-	"github.com/hashicorp/vault/sdk/framework"
-)
-
-func TestValidateResponse(t *testing.T) {
-	cases := map[string]struct {
-		schema        *framework.Response
-		response      map[string]interface{}
-		strict        bool
-		errorExpected bool
-	}{
-		"nil schema, nil response, strict": {
-			schema:        nil,
-			response:      nil,
-			strict:        true,
-			errorExpected: false,
-		},
-
-		"nil schema, nil response, not strict": {
-			schema:        nil,
-			response:      nil,
-			strict:        false,
-			errorExpected: false,
-		},
-
-		"nil schema, good response, strict": {
-			schema: nil,
-			response: map[string]interface{}{
-				"foo": "bar",
-			},
-			strict:        true,
-			errorExpected: false,
-		},
-
-		"nil schema, good response, not strict": {
-			schema: nil,
-			response: map[string]interface{}{
-				"foo": "bar",
-			},
-			strict:        true,
-			errorExpected: false,
-		},
-
-		"nil schema fields, good response, strict": {
-			schema: &framework.Response{},
-			response: map[string]interface{}{
-				"foo": "bar",
-			},
-			strict:        true,
-			errorExpected: false,
-		},
-
-		"nil schema fields, good response, not strict": {
-			schema: &framework.Response{},
-			response: map[string]interface{}{
-				"foo": "bar",
-			},
-			strict:        true,
-			errorExpected: false,
-		},
-
-		"string schema field, string response, strict": {
-			schema: &framework.Response{
-				Fields: map[string]*framework.FieldSchema{
-					"foo": {
-						Type: framework.TypeString,
-					},
-				},
-			},
-			response: map[string]interface{}{
-				"foo": "bar",
-			},
-			strict:        true,
-			errorExpected: false,
-		},
-
-		"string schema field, string response, not strict": {
-			schema: &framework.Response{
-				Fields: map[string]*framework.FieldSchema{
-					"foo": {
-						Type: framework.TypeString,
-					},
-				},
-			},
-			response: map[string]interface{}{
-				"foo": "bar",
-			},
-			strict:        false,
-			errorExpected: false,
-		},
-
-		"string schema not required field, empty response, strict": {
-			schema: &framework.Response{
-				Fields: map[string]*framework.FieldSchema{
-					"foo": {
-						Type:     framework.TypeString,
-						Required: false,
-					},
-				},
-			},
-			response:      map[string]interface{}{},
-			strict:        true,
-			errorExpected: false,
-		},
-
-		"string schema required field, empty response, strict": {
-			schema: &framework.Response{
-				Fields: map[string]*framework.FieldSchema{
-					"foo": {
-						Type:     framework.TypeString,
-						Required: true,
-					},
-				},
-			},
-			response:      map[string]interface{}{},
-			strict:        true,
-			errorExpected: true,
-		},
-
-		"string schema required field, empty response, not strict": {
-			schema: &framework.Response{
-				Fields: map[string]*framework.FieldSchema{
-					"foo": {
-						Type:     framework.TypeString,
-						Required: true,
-					},
-				},
-			},
-			response:      map[string]interface{}{},
-			strict:        false,
-			errorExpected: false,
-		},
-
-		"string schema required field, nil response, strict": {
-			schema: &framework.Response{
-				Fields: map[string]*framework.FieldSchema{
-					"foo": {
-						Type:     framework.TypeString,
-						Required: true,
-					},
-				},
-			},
-			response:      nil,
-			strict:        true,
-			errorExpected: true,
-		},
-
-		"string schema required field, nil response, not strict": {
-			schema: &framework.Response{
-				Fields: map[string]*framework.FieldSchema{
-					"foo": {
-						Type:     framework.TypeString,
-						Required: true,
-					},
-				},
-			},
-			response:      nil,
-			strict:        false,
-			errorExpected: false,
-		},
-
-		"empty schema, string response, strict": {
-			schema: &framework.Response{
-				Fields: map[string]*framework.FieldSchema{},
-			},
-			response: map[string]interface{}{
-				"foo": "bar",
-			},
-			strict:        true,
-			errorExpected: true,
-		},
-
-		"empty schema, string response, not strict": {
-			schema: &framework.Response{
-				Fields: map[string]*framework.FieldSchema{},
-			},
-			response: map[string]interface{}{
-				"foo": "bar",
-			},
-			strict:        false,
-			errorExpected: false,
-		},
-
-		"time schema, string response, strict": {
-			schema: &framework.Response{
-				Fields: map[string]*framework.FieldSchema{
-					"time": {
-						Type:     framework.TypeTime,
-						Required: true,
-					},
-				},
-			},
-			response: map[string]interface{}{
-				"time": "2024-12-11T09:08:07Z",
-			},
-			strict:        true,
-			errorExpected: false,
-		},
-
-		"time schema, string response, not strict": {
-			schema: &framework.Response{
-				Fields: map[string]*framework.FieldSchema{
-					"time": {
-						Type:     framework.TypeTime,
-						Required: true,
-					},
-				},
-			},
-			response: map[string]interface{}{
-				"time": "2024-12-11T09:08:07Z",
-			},
-			strict:        false,
-			errorExpected: false,
-		},
-
-		"time schema, time response, strict": {
-			schema: &framework.Response{
-				Fields: map[string]*framework.FieldSchema{
-					"time": {
-						Type:     framework.TypeTime,
-						Required: true,
-					},
-				},
-			},
-			response: map[string]interface{}{
-				"time": time.Date(2024, 12, 11, 9, 8, 7, 0, time.UTC),
-			},
-			strict:        true,
-			errorExpected: false,
-		},
-
-		"time schema, time response, not strict": {
-			schema: &framework.Response{
-				Fields: map[string]*framework.FieldSchema{
-					"time": {
-						Type:     framework.TypeTime,
-						Required: true,
-					},
-				},
-			},
-			response: map[string]interface{}{
-				"time": time.Date(2024, 12, 11, 9, 8, 7, 0, time.UTC),
-			},
-			strict:        false,
-			errorExpected: false,
-		},
-
-		"empty schema, response has http_raw_body, strict": {
-			schema: &framework.Response{
-				Fields: map[string]*framework.FieldSchema{},
-			},
-			response: map[string]interface{}{
-				"http_raw_body": "foo",
-			},
-			strict:        true,
-			errorExpected: false,
-		},
-
-		"empty schema, response has http_raw_body, not strict": {
-			schema: &framework.Response{
-				Fields: map[string]*framework.FieldSchema{},
-			},
-			response: map[string]interface{}{
-				"http_raw_body": "foo",
-			},
-			strict:        false,
-			errorExpected: false,
-		},
-
-		"string schema field, response has non-200 http_status_code, strict": {
-			schema: &framework.Response{
-				Fields: map[string]*framework.FieldSchema{
-					"foo": {
-						Type: framework.TypeString,
-					},
-				},
-			},
-			response: map[string]interface{}{
-				"http_status_code": 304,
-			},
-			strict:        true,
-			errorExpected: false,
-		},
-
-		"string schema field, response has non-200 http_status_code, not strict": {
-			schema: &framework.Response{
-				Fields: map[string]*framework.FieldSchema{
-					"foo": {
-						Type: framework.TypeString,
-					},
-				},
-			},
-			response: map[string]interface{}{
-				"http_status_code": 304,
-			},
-			strict:        false,
-			errorExpected: false,
-		},
-
-		"schema has http_raw_body, strict": {
-			schema: &framework.Response{
-				Fields: map[string]*framework.FieldSchema{
-					"http_raw_body": {
-						Type:     framework.TypeString,
-						Required: false,
-					},
-				},
-			},
-			response: map[string]interface{}{
-				"http_raw_body": "foo",
-			},
-			strict:        true,
-			errorExpected: true,
-		},
-
-		"schema has http_raw_body, not strict": {
-			schema: &framework.Response{
-				Fields: map[string]*framework.FieldSchema{
-					"http_raw_body": {
-						Type:     framework.TypeString,
-						Required: false,
-					},
-				},
-			},
-			response: map[string]interface{}{
-				"http_raw_body": "foo",
-			},
-			strict:        false,
-			errorExpected: true,
-		},
-	}
-
-	for name, tc := range cases {
-		name, tc := name, tc
-		t.Run(name, func(t *testing.T) {
-			t.Parallel()
-
-			err := validateResponseDataImpl(
-				tc.schema,
-				tc.response,
-				tc.strict,
-			)
-			if err == nil && tc.errorExpected == true {
-				t.Fatalf("expected an error, got nil")
-			}
-			if err != nil && tc.errorExpected == false {
-				t.Fatalf("unexpected error: %v", err)
-			}
-		})
-	}
-}
diff --git a/sdk/helper/tlsutil/tlsutil.go b/sdk/helper/tlsutil/tlsutil.go
index d91af3679e2e8..e1e9b9484bf4b 100644
--- a/sdk/helper/tlsutil/tlsutil.go
+++ b/sdk/helper/tlsutil/tlsutil.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 // DEPRECATED: this has been moved to go-secure-stdlib and will be removed
 package tlsutil
 
diff --git a/sdk/helper/tokenutil/tokenutil.go b/sdk/helper/tokenutil/tokenutil.go
index 4319bd1823698..776b40501ed45 100644
--- a/sdk/helper/tokenutil/tokenutil.go
+++ b/sdk/helper/tokenutil/tokenutil.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package tokenutil
 
 import (
@@ -78,9 +75,8 @@ func TokenFields() map[string]*framework.FieldSchema {
 			Type:        framework.TypeCommaStringSlice,
 			Description: `Comma separated string or JSON list of CIDR blocks. If set, specifies the blocks of IP addresses which are allowed to use the generated token.`,
 			DisplayAttrs: &framework.DisplayAttributes{
-				Name:        "Generated Token's Bound CIDRs",
-				Group:       "Tokens",
-				Description: "A list of CIDR blocks. If set, specifies the blocks of IP addresses which are allowed to use the generated token.",
+				Name:  "Generated Token's Bound CIDRs",
+				Group: "Tokens",
 			},
 		},
 
@@ -124,9 +120,8 @@ func TokenFields() map[string]*framework.FieldSchema {
 			Type:        framework.TypeCommaStringSlice,
 			Description: "Comma-separated list of policies",
 			DisplayAttrs: &framework.DisplayAttributes{
-				Name:        "Generated Token's Policies",
-				Group:       "Tokens",
-				Description: "A list of policies that will apply to the generated token for this user.",
+				Name:  "Generated Token's Policies",
+				Group: "Tokens",
 			},
 		},
 
diff --git a/sdk/helper/useragent/useragent.go b/sdk/helper/useragent/useragent.go
index 53569e910a87a..e7e23ac2b6f58 100644
--- a/sdk/helper/useragent/useragent.go
+++ b/sdk/helper/useragent/useragent.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package useragent
 
 import (
@@ -9,6 +6,7 @@ import (
 	"strings"
 
 	"github.com/hashicorp/vault/sdk/logical"
+	"github.com/hashicorp/vault/sdk/version"
 )
 
 var (
@@ -17,29 +15,25 @@ var (
 
 	// rt is the runtime - variable for tests.
 	rt = runtime.Version()
+
+	// versionFunc is the func that returns the current version. This is a
+	// function to take into account the different build processes and distinguish
+	// between enterprise and oss builds.
+	versionFunc = func() string {
+		return version.GetVersion().VersionNumber()
+	}
 )
 
 // String returns the consistent user-agent string for Vault.
-// Deprecated: use PluginString instead.
 //
-// Example output:
+// e.g. Vault/0.10.4 (+https://www.vaultproject.io/; go1.10.1)
 //
-//	Vault (+https://www.vaultproject.io/; go1.19.5)
-//
-// Given comments will be appended to the semicolon-delimited comment section:
-//
-//	Vault (+https://www.vaultproject.io/; go1.19.5; comment-0; comment-1)
+// Given comments will be appended to the semicolon-delimited comment section.
 //
-// At one point the user-agent string returned contained the Vault
-// version hardcoded into the vault/sdk/version/ package.  This worked for builtin
-// plugins that are compiled into the `vault` binary, in that it correctly described
-// the version of that Vault binary.  It did not work for external plugins: for them,
-// the version will be based on the version stored in the sdk based on the
-// contents of the external plugin's go.mod.  We've kept the String method around
-// to avoid breaking builds, but you should be using PluginString.
+// e.g. Vault/0.10.4 (+https://www.vaultproject.io/; go1.10.1; comment-0; comment-1)
 func String(comments ...string) string {
 	c := append([]string{"+" + projectURL, rt}, comments...)
-	return fmt.Sprintf("Vault (%s)", strings.Join(c, "; "))
+	return fmt.Sprintf("Vault/%s (%s)", versionFunc(), strings.Join(c, "; "))
 }
 
 // PluginString is usable by plugins to return a user-agent string reflecting
diff --git a/sdk/helper/useragent/useragent_test.go b/sdk/helper/useragent/useragent_test.go
index 4677bb62face3..f0d014f6c5708 100644
--- a/sdk/helper/useragent/useragent_test.go
+++ b/sdk/helper/useragent/useragent_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package useragent
 
 import (
@@ -12,6 +9,7 @@ import (
 func TestUserAgent(t *testing.T) {
 	projectURL = "https://vault-test.com"
 	rt = "go5.0"
+	versionFunc = func() string { return "1.2.3" }
 
 	type args struct {
 		comments []string
@@ -24,21 +22,21 @@ func TestUserAgent(t *testing.T) {
 		{
 			name: "User agent",
 			args: args{},
-			want: "Vault (+https://vault-test.com; go5.0)",
+			want: "Vault/1.2.3 (+https://vault-test.com; go5.0)",
 		},
 		{
 			name: "User agent with additional comment",
 			args: args{
 				comments: []string{"pid-abcdefg"},
 			},
-			want: "Vault (+https://vault-test.com; go5.0; pid-abcdefg)",
+			want: "Vault/1.2.3 (+https://vault-test.com; go5.0; pid-abcdefg)",
 		},
 		{
 			name: "User agent with additional comments",
 			args: args{
 				comments: []string{"pid-abcdefg", "cloud-provider"},
 			},
-			want: "Vault (+https://vault-test.com; go5.0; pid-abcdefg; cloud-provider)",
+			want: "Vault/1.2.3 (+https://vault-test.com; go5.0; pid-abcdefg; cloud-provider)",
 		},
 	}
 	for _, tt := range tests {
diff --git a/sdk/helper/wrapping/wrapinfo.go b/sdk/helper/wrapping/wrapinfo.go
index 03a703013008d..8d8e63340f959 100644
--- a/sdk/helper/wrapping/wrapinfo.go
+++ b/sdk/helper/wrapping/wrapinfo.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package wrapping
 
 import "time"
diff --git a/sdk/helper/xor/xor.go b/sdk/helper/xor/xor.go
index 098a673178558..a1f1e90bc156f 100644
--- a/sdk/helper/xor/xor.go
+++ b/sdk/helper/xor/xor.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package xor
 
 import (
diff --git a/sdk/helper/xor/xor_test.go b/sdk/helper/xor/xor_test.go
index 143345d9a5bde..f50f525ce6390 100644
--- a/sdk/helper/xor/xor_test.go
+++ b/sdk/helper/xor/xor_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package xor
 
 import (
diff --git a/sdk/logical/acme_billing.go b/sdk/logical/acme_billing.go
deleted file mode 100644
index 6e4f6ef398b83..0000000000000
--- a/sdk/logical/acme_billing.go
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package logical
-
-import "context"
-
-type ACMEBillingSystemView interface {
-	CreateActivityCountEventForIdentifiers(ctx context.Context, identifiers []string) error
-}
diff --git a/sdk/logical/audit.go b/sdk/logical/audit.go
index 30c03e6113ac2..8ba70f37e01a4 100644
--- a/sdk/logical/audit.go
+++ b/sdk/logical/audit.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package logical
 
 type LogInput struct {
diff --git a/sdk/logical/auth.go b/sdk/logical/auth.go
index 83d9daca12adc..51de20345fddd 100644
--- a/sdk/logical/auth.go
+++ b/sdk/logical/auth.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package logical
 
 import (
diff --git a/sdk/logical/connection.go b/sdk/logical/connection.go
index e590e6f59acc1..5be8630770794 100644
--- a/sdk/logical/connection.go
+++ b/sdk/logical/connection.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package logical
 
 import (
diff --git a/sdk/logical/controlgroup.go b/sdk/logical/controlgroup.go
index e166f00d1f884..2ed1b07688d9a 100644
--- a/sdk/logical/controlgroup.go
+++ b/sdk/logical/controlgroup.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package logical
 
 import (
diff --git a/sdk/logical/error.go b/sdk/logical/error.go
index 5605784b3e132..02f68dd9189c4 100644
--- a/sdk/logical/error.go
+++ b/sdk/logical/error.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package logical
 
 import "errors"
@@ -20,11 +17,6 @@ var (
 	// ErrPermissionDenied is returned if the client is not authorized
 	ErrPermissionDenied = errors.New("permission denied")
 
-	// ErrInvalidCredentials is returned when the provided credentials are incorrect
-	// This is used internally for user lockout purposes. This is not seen externally.
-	// The status code returned does not change because of this error
-	ErrInvalidCredentials = errors.New("invalid credentials")
-
 	// ErrMultiAuthzPending is returned if the the request needs more
 	// authorizations
 	ErrMultiAuthzPending = errors.New("request needs further approval")
diff --git a/sdk/logical/event.pb.go b/sdk/logical/event.pb.go
deleted file mode 100644
index 22e908d91a343..0000000000000
--- a/sdk/logical/event.pb.go
+++ /dev/null
@@ -1,413 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
-// source: sdk/logical/event.proto
-
-package logical
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	structpb "google.golang.org/protobuf/types/known/structpb"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-// EventPluginInfo contains data related to the plugin that generated an event.
-type EventPluginInfo struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// The type of plugin this event originated from, i.e., "auth" or "secrets.
-	MountClass string `protobuf:"bytes,1,opt,name=mount_class,json=mountClass,proto3" json:"mount_class,omitempty"`
-	// Unique ID of the mount entry, e.g., "kv_957bb7d8"
-	MountAccessor string `protobuf:"bytes,2,opt,name=mount_accessor,json=mountAccessor,proto3" json:"mount_accessor,omitempty"`
-	// Mount path of the plugin this event originated from, e.g., "secret/"
-	MountPath string `protobuf:"bytes,3,opt,name=mount_path,json=mountPath,proto3" json:"mount_path,omitempty"`
-	// Plugin name that this event originated from, e.g., "kv"
-	Plugin string `protobuf:"bytes,4,opt,name=plugin,proto3" json:"plugin,omitempty"`
-	// Plugin version of the plugin this event originated from, e.g., "v0.13.3+builtin"
-	PluginVersion string `protobuf:"bytes,5,opt,name=plugin_version,json=pluginVersion,proto3" json:"plugin_version,omitempty"`
-	// Mount version that this event originated from, i.e., if KVv2, then "2". Usually empty.
-	Version string `protobuf:"bytes,6,opt,name=version,proto3" json:"version,omitempty"`
-}
-
-func (x *EventPluginInfo) Reset() {
-	*x = EventPluginInfo{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_sdk_logical_event_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *EventPluginInfo) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*EventPluginInfo) ProtoMessage() {}
-
-func (x *EventPluginInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_sdk_logical_event_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use EventPluginInfo.ProtoReflect.Descriptor instead.
-func (*EventPluginInfo) Descriptor() ([]byte, []int) {
-	return file_sdk_logical_event_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *EventPluginInfo) GetMountClass() string {
-	if x != nil {
-		return x.MountClass
-	}
-	return ""
-}
-
-func (x *EventPluginInfo) GetMountAccessor() string {
-	if x != nil {
-		return x.MountAccessor
-	}
-	return ""
-}
-
-func (x *EventPluginInfo) GetMountPath() string {
-	if x != nil {
-		return x.MountPath
-	}
-	return ""
-}
-
-func (x *EventPluginInfo) GetPlugin() string {
-	if x != nil {
-		return x.Plugin
-	}
-	return ""
-}
-
-func (x *EventPluginInfo) GetPluginVersion() string {
-	if x != nil {
-		return x.PluginVersion
-	}
-	return ""
-}
-
-func (x *EventPluginInfo) GetVersion() string {
-	if x != nil {
-		return x.Version
-	}
-	return ""
-}
-
-// EventData contains event data in a CloudEvents container.
-type EventData struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// ID identifies the event. It is required. The combination of
-	// CloudEvents Source (i.e., Vault cluster) + ID must be unique.
-	// Events with the same Source + ID can be assumed to be duplicates
-	// by consumers.
-	// Be careful when setting this manually that the ID contains enough
-	// entropy to be unique, or possibly that it is idempotent, such
-	// as a hash of other fields with sufficient uniqueness.
-	Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
-	// Arbitrary non-secret data. Optional.
-	Metadata *structpb.Struct `protobuf:"bytes,2,opt,name=metadata,proto3" json:"metadata,omitempty"`
-	// Any IDs that the event relates to, i.e., UUIDs, paths.
-	EntityIds []string `protobuf:"bytes,3,rep,name=entity_ids,json=entityIds,proto3" json:"entity_ids,omitempty"`
-	// Human-readable note.
-	Note string `protobuf:"bytes,4,opt,name=note,proto3" json:"note,omitempty"`
-}
-
-func (x *EventData) Reset() {
-	*x = EventData{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_sdk_logical_event_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *EventData) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*EventData) ProtoMessage() {}
-
-func (x *EventData) ProtoReflect() protoreflect.Message {
-	mi := &file_sdk_logical_event_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use EventData.ProtoReflect.Descriptor instead.
-func (*EventData) Descriptor() ([]byte, []int) {
-	return file_sdk_logical_event_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *EventData) GetId() string {
-	if x != nil {
-		return x.Id
-	}
-	return ""
-}
-
-func (x *EventData) GetMetadata() *structpb.Struct {
-	if x != nil {
-		return x.Metadata
-	}
-	return nil
-}
-
-func (x *EventData) GetEntityIds() []string {
-	if x != nil {
-		return x.EntityIds
-	}
-	return nil
-}
-
-func (x *EventData) GetNote() string {
-	if x != nil {
-		return x.Note
-	}
-	return ""
-}
-
-// EventReceived is used to consume events and includes additional metadata regarding
-// the event type and plugin information.
-type EventReceived struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Event *EventData `protobuf:"bytes,1,opt,name=event,proto3" json:"event,omitempty"`
-	// namespace path
-	Namespace  string           `protobuf:"bytes,2,opt,name=namespace,proto3" json:"namespace,omitempty"`
-	EventType  string           `protobuf:"bytes,3,opt,name=event_type,json=eventType,proto3" json:"event_type,omitempty"`
-	PluginInfo *EventPluginInfo `protobuf:"bytes,4,opt,name=plugin_info,json=pluginInfo,proto3" json:"plugin_info,omitempty"`
-}
-
-func (x *EventReceived) Reset() {
-	*x = EventReceived{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_sdk_logical_event_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *EventReceived) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*EventReceived) ProtoMessage() {}
-
-func (x *EventReceived) ProtoReflect() protoreflect.Message {
-	mi := &file_sdk_logical_event_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use EventReceived.ProtoReflect.Descriptor instead.
-func (*EventReceived) Descriptor() ([]byte, []int) {
-	return file_sdk_logical_event_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *EventReceived) GetEvent() *EventData {
-	if x != nil {
-		return x.Event
-	}
-	return nil
-}
-
-func (x *EventReceived) GetNamespace() string {
-	if x != nil {
-		return x.Namespace
-	}
-	return ""
-}
-
-func (x *EventReceived) GetEventType() string {
-	if x != nil {
-		return x.EventType
-	}
-	return ""
-}
-
-func (x *EventReceived) GetPluginInfo() *EventPluginInfo {
-	if x != nil {
-		return x.PluginInfo
-	}
-	return nil
-}
-
-var File_sdk_logical_event_proto protoreflect.FileDescriptor
-
-var file_sdk_logical_event_proto_rawDesc = []byte{
-	0x0a, 0x17, 0x73, 0x64, 0x6b, 0x2f, 0x6c, 0x6f, 0x67, 0x69, 0x63, 0x61, 0x6c, 0x2f, 0x65, 0x76,
-	0x65, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x07, 0x6c, 0x6f, 0x67, 0x69, 0x63,
-	0x61, 0x6c, 0x1a, 0x1c, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2f, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x22, 0xd1, 0x01, 0x0a, 0x0f, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e,
-	0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1f, 0x0a, 0x0b, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x63, 0x6c,
-	0x61, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6d, 0x6f, 0x75, 0x6e, 0x74,
-	0x43, 0x6c, 0x61, 0x73, 0x73, 0x12, 0x25, 0x0a, 0x0e, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x61,
-	0x63, 0x63, 0x65, 0x73, 0x73, 0x6f, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x6d,
-	0x6f, 0x75, 0x6e, 0x74, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6f, 0x72, 0x12, 0x1d, 0x0a, 0x0a,
-	0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x09, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x50, 0x61, 0x74, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x70,
-	0x6c, 0x75, 0x67, 0x69, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x6c, 0x75,
-	0x67, 0x69, 0x6e, 0x12, 0x25, 0x0a, 0x0e, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x5f, 0x76, 0x65,
-	0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x70, 0x6c, 0x75,
-	0x67, 0x69, 0x6e, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65,
-	0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x76, 0x65, 0x72,
-	0x73, 0x69, 0x6f, 0x6e, 0x22, 0x83, 0x01, 0x0a, 0x09, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x44, 0x61,
-	0x74, 0x61, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02,
-	0x69, 0x64, 0x12, 0x33, 0x0a, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x08, 0x6d,
-	0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1d, 0x0a, 0x0a, 0x65, 0x6e, 0x74, 0x69, 0x74,
-	0x79, 0x5f, 0x69, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x65, 0x6e, 0x74,
-	0x69, 0x74, 0x79, 0x49, 0x64, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x6f, 0x74, 0x65, 0x18, 0x04,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x6f, 0x74, 0x65, 0x22, 0xb1, 0x01, 0x0a, 0x0d, 0x45,
-	0x76, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x12, 0x28, 0x0a, 0x05,
-	0x65, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6c, 0x6f,
-	0x67, 0x69, 0x63, 0x61, 0x6c, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x44, 0x61, 0x74, 0x61, 0x52,
-	0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70,
-	0x61, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73,
-	0x70, 0x61, 0x63, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x79,
-	0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x54,
-	0x79, 0x70, 0x65, 0x12, 0x39, 0x0a, 0x0b, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x5f, 0x69, 0x6e,
-	0x66, 0x6f, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6c, 0x6f, 0x67, 0x69, 0x63,
-	0x61, 0x6c, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x49, 0x6e,
-	0x66, 0x6f, 0x52, 0x0a, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x42, 0x28,
-	0x5a, 0x26, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x76, 0x61, 0x75, 0x6c, 0x74, 0x2f, 0x73, 0x64, 0x6b,
-	0x2f, 0x6c, 0x6f, 0x67, 0x69, 0x63, 0x61, 0x6c, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_sdk_logical_event_proto_rawDescOnce sync.Once
-	file_sdk_logical_event_proto_rawDescData = file_sdk_logical_event_proto_rawDesc
-)
-
-func file_sdk_logical_event_proto_rawDescGZIP() []byte {
-	file_sdk_logical_event_proto_rawDescOnce.Do(func() {
-		file_sdk_logical_event_proto_rawDescData = protoimpl.X.CompressGZIP(file_sdk_logical_event_proto_rawDescData)
-	})
-	return file_sdk_logical_event_proto_rawDescData
-}
-
-var file_sdk_logical_event_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
-var file_sdk_logical_event_proto_goTypes = []interface{}{
-	(*EventPluginInfo)(nil), // 0: logical.EventPluginInfo
-	(*EventData)(nil),       // 1: logical.EventData
-	(*EventReceived)(nil),   // 2: logical.EventReceived
-	(*structpb.Struct)(nil), // 3: google.protobuf.Struct
-}
-var file_sdk_logical_event_proto_depIdxs = []int32{
-	3, // 0: logical.EventData.metadata:type_name -> google.protobuf.Struct
-	1, // 1: logical.EventReceived.event:type_name -> logical.EventData
-	0, // 2: logical.EventReceived.plugin_info:type_name -> logical.EventPluginInfo
-	3, // [3:3] is the sub-list for method output_type
-	3, // [3:3] is the sub-list for method input_type
-	3, // [3:3] is the sub-list for extension type_name
-	3, // [3:3] is the sub-list for extension extendee
-	0, // [0:3] is the sub-list for field type_name
-}
-
-func init() { file_sdk_logical_event_proto_init() }
-func file_sdk_logical_event_proto_init() {
-	if File_sdk_logical_event_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_sdk_logical_event_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*EventPluginInfo); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_sdk_logical_event_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*EventData); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_sdk_logical_event_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*EventReceived); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_sdk_logical_event_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   3,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_sdk_logical_event_proto_goTypes,
-		DependencyIndexes: file_sdk_logical_event_proto_depIdxs,
-		MessageInfos:      file_sdk_logical_event_proto_msgTypes,
-	}.Build()
-	File_sdk_logical_event_proto = out.File
-	file_sdk_logical_event_proto_rawDesc = nil
-	file_sdk_logical_event_proto_goTypes = nil
-	file_sdk_logical_event_proto_depIdxs = nil
-}
diff --git a/sdk/logical/event.proto b/sdk/logical/event.proto
deleted file mode 100644
index 6e36e5e70f9ac..0000000000000
--- a/sdk/logical/event.proto
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-syntax = "proto3";
-
-option go_package = "github.com/hashicorp/vault/sdk/logical";
-
-package logical;
-
-import "google/protobuf/struct.proto";
-
-// EventPluginInfo contains data related to the plugin that generated an event.
-message EventPluginInfo {
-    // The type of plugin this event originated from, i.e., "auth" or "secrets.
-    string mount_class = 1;
-    // Unique ID of the mount entry, e.g., "kv_957bb7d8"
-    string mount_accessor = 2;
-    // Mount path of the plugin this event originated from, e.g., "secret/"
-    string mount_path = 3;
-    // Plugin name that this event originated from, e.g., "kv"
-    string plugin = 4;
-    // Plugin version of the plugin this event originated from, e.g., "v0.13.3+builtin"
-    string plugin_version = 5;
-    // Mount version that this event originated from, i.e., if KVv2, then "2". Usually empty.
-    string version = 6;
-}
-
-// EventData contains event data in a CloudEvents container.
-message EventData {
-    // ID identifies the event. It is required. The combination of
-    // CloudEvents Source (i.e., Vault cluster) + ID must be unique.
-    // Events with the same Source + ID can be assumed to be duplicates
-    // by consumers.
-    // Be careful when setting this manually that the ID contains enough
-    // entropy to be unique, or possibly that it is idempotent, such
-    // as a hash of other fields with sufficient uniqueness.
-    string id = 1;
-    // Arbitrary non-secret data. Optional.
-    google.protobuf.Struct metadata = 2;
-    // Any IDs that the event relates to, i.e., UUIDs, paths.
-    repeated string entity_ids = 3;
-    // Human-readable note.
-    string note = 4;
-}
-
-// EventReceived is used to consume events and includes additional metadata regarding
-// the event type and plugin information.
-message EventReceived {
-    EventData event = 1;
-    // namespace path
-    string namespace = 2;
-    string event_type = 3;
-    EventPluginInfo plugin_info = 4;
-}
diff --git a/sdk/logical/events.go b/sdk/logical/events.go
deleted file mode 100644
index cbd3f73690244..0000000000000
--- a/sdk/logical/events.go
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package logical
-
-import (
-	"context"
-
-	"github.com/hashicorp/go-uuid"
-)
-
-// ID is an alias to GetId() for CloudEvents compatibility.
-func (x *EventReceived) ID() string {
-	return x.Event.GetId()
-}
-
-// NewEvent returns an event with a new, random EID.
-func NewEvent() (*EventData, error) {
-	id, err := uuid.GenerateUUID()
-	if err != nil {
-		return nil, err
-	}
-	return &EventData{
-		Id: id,
-	}, nil
-}
-
-// EventType represents a topic, and is a wrapper around eventlogger.EventType.
-type EventType string
-
-// EventSender sends events to the common event bus.
-type EventSender interface {
-	Send(ctx context.Context, eventType EventType, event *EventData) error
-}
diff --git a/sdk/logical/identity.pb.go b/sdk/logical/identity.pb.go
index fedc5f5c202cb..6c1c4b2c9b903 100644
--- a/sdk/logical/identity.pb.go
+++ b/sdk/logical/identity.pb.go
@@ -1,10 +1,7 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc        v3.21.5
 // source: sdk/logical/identity.proto
 
 package logical
@@ -321,7 +318,6 @@ type MFAMethodID struct {
 	Type         string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"`
 	ID           string `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"`
 	UsesPasscode bool   `protobuf:"varint,3,opt,name=uses_passcode,json=usesPasscode,proto3" json:"uses_passcode,omitempty"`
-	Name         string `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"`
 }
 
 func (x *MFAMethodID) Reset() {
@@ -377,13 +373,6 @@ func (x *MFAMethodID) GetUsesPasscode() bool {
 	return false
 }
 
-func (x *MFAMethodID) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
 type MFAConstraintAny struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -548,35 +537,34 @@ var file_sdk_logical_identity_proto_rawDesc = []byte{
 	0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
 	0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
 	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
-	0x01, 0x22, 0x6a, 0x0a, 0x0b, 0x4d, 0x46, 0x41, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x49, 0x44,
+	0x01, 0x22, 0x56, 0x0a, 0x0b, 0x4d, 0x46, 0x41, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x49, 0x44,
 	0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
 	0x74, 0x79, 0x70, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
 	0x52, 0x02, 0x69, 0x64, 0x12, 0x23, 0x0a, 0x0d, 0x75, 0x73, 0x65, 0x73, 0x5f, 0x70, 0x61, 0x73,
 	0x73, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x75, 0x73, 0x65,
-	0x73, 0x50, 0x61, 0x73, 0x73, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d,
-	0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3a, 0x0a,
-	0x10, 0x4d, 0x46, 0x41, 0x43, 0x6f, 0x6e, 0x73, 0x74, 0x72, 0x61, 0x69, 0x6e, 0x74, 0x41, 0x6e,
-	0x79, 0x12, 0x26, 0x0a, 0x03, 0x61, 0x6e, 0x79, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14,
-	0x2e, 0x6c, 0x6f, 0x67, 0x69, 0x63, 0x61, 0x6c, 0x2e, 0x4d, 0x46, 0x41, 0x4d, 0x65, 0x74, 0x68,
-	0x6f, 0x64, 0x49, 0x44, 0x52, 0x03, 0x61, 0x6e, 0x79, 0x22, 0xea, 0x01, 0x0a, 0x0e, 0x4d, 0x46,
-	0x41, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x24, 0x0a, 0x0e,
-	0x6d, 0x66, 0x61, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x6d, 0x66, 0x61, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x49, 0x64, 0x12, 0x54, 0x0a, 0x0f, 0x6d, 0x66, 0x61, 0x5f, 0x63, 0x6f, 0x6e, 0x73, 0x74, 0x72,
-	0x61, 0x69, 0x6e, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x6c, 0x6f,
-	0x67, 0x69, 0x63, 0x61, 0x6c, 0x2e, 0x4d, 0x46, 0x41, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65,
-	0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x4d, 0x66, 0x61, 0x43, 0x6f, 0x6e, 0x73, 0x74, 0x72, 0x61, 0x69,
-	0x6e, 0x74, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0e, 0x6d, 0x66, 0x61, 0x43, 0x6f, 0x6e,
-	0x73, 0x74, 0x72, 0x61, 0x69, 0x6e, 0x74, 0x73, 0x1a, 0x5c, 0x0a, 0x13, 0x4d, 0x66, 0x61, 0x43,
-	0x6f, 0x6e, 0x73, 0x74, 0x72, 0x61, 0x69, 0x6e, 0x74, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
-	0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65,
-	0x79, 0x12, 0x2f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x19, 0x2e, 0x6c, 0x6f, 0x67, 0x69, 0x63, 0x61, 0x6c, 0x2e, 0x4d, 0x46, 0x41, 0x43, 0x6f,
-	0x6e, 0x73, 0x74, 0x72, 0x61, 0x69, 0x6e, 0x74, 0x41, 0x6e, 0x79, 0x52, 0x05, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x28, 0x5a, 0x26, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
-	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x76,
-	0x61, 0x75, 0x6c, 0x74, 0x2f, 0x73, 0x64, 0x6b, 0x2f, 0x6c, 0x6f, 0x67, 0x69, 0x63, 0x61, 0x6c,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x73, 0x50, 0x61, 0x73, 0x73, 0x63, 0x6f, 0x64, 0x65, 0x22, 0x3a, 0x0a, 0x10, 0x4d, 0x46, 0x41,
+	0x43, 0x6f, 0x6e, 0x73, 0x74, 0x72, 0x61, 0x69, 0x6e, 0x74, 0x41, 0x6e, 0x79, 0x12, 0x26, 0x0a,
+	0x03, 0x61, 0x6e, 0x79, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6c, 0x6f, 0x67,
+	0x69, 0x63, 0x61, 0x6c, 0x2e, 0x4d, 0x46, 0x41, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x49, 0x44,
+	0x52, 0x03, 0x61, 0x6e, 0x79, 0x22, 0xea, 0x01, 0x0a, 0x0e, 0x4d, 0x46, 0x41, 0x52, 0x65, 0x71,
+	0x75, 0x69, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x24, 0x0a, 0x0e, 0x6d, 0x66, 0x61, 0x5f,
+	0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x0c, 0x6d, 0x66, 0x61, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, 0x64, 0x12, 0x54,
+	0x0a, 0x0f, 0x6d, 0x66, 0x61, 0x5f, 0x63, 0x6f, 0x6e, 0x73, 0x74, 0x72, 0x61, 0x69, 0x6e, 0x74,
+	0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x6c, 0x6f, 0x67, 0x69, 0x63, 0x61,
+	0x6c, 0x2e, 0x4d, 0x46, 0x41, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74,
+	0x2e, 0x4d, 0x66, 0x61, 0x43, 0x6f, 0x6e, 0x73, 0x74, 0x72, 0x61, 0x69, 0x6e, 0x74, 0x73, 0x45,
+	0x6e, 0x74, 0x72, 0x79, 0x52, 0x0e, 0x6d, 0x66, 0x61, 0x43, 0x6f, 0x6e, 0x73, 0x74, 0x72, 0x61,
+	0x69, 0x6e, 0x74, 0x73, 0x1a, 0x5c, 0x0a, 0x13, 0x4d, 0x66, 0x61, 0x43, 0x6f, 0x6e, 0x73, 0x74,
+	0x72, 0x61, 0x69, 0x6e, 0x74, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
+	0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x2f, 0x0a,
+	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6c,
+	0x6f, 0x67, 0x69, 0x63, 0x61, 0x6c, 0x2e, 0x4d, 0x46, 0x41, 0x43, 0x6f, 0x6e, 0x73, 0x74, 0x72,
+	0x61, 0x69, 0x6e, 0x74, 0x41, 0x6e, 0x79, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
+	0x38, 0x01, 0x42, 0x28, 0x5a, 0x26, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
+	0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x76, 0x61, 0x75, 0x6c, 0x74,
+	0x2f, 0x73, 0x64, 0x6b, 0x2f, 0x6c, 0x6f, 0x67, 0x69, 0x63, 0x61, 0x6c, 0x62, 0x06, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/sdk/logical/identity.proto b/sdk/logical/identity.proto
index 4a1f3413750d3..ea2e373b18c6d 100644
--- a/sdk/logical/identity.proto
+++ b/sdk/logical/identity.proto
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 syntax = "proto3";
 
 option go_package = "github.com/hashicorp/vault/sdk/logical";
@@ -82,7 +79,6 @@ message MFAMethodID {
 	string type = 1;
 	string id = 2;
 	bool uses_passcode = 3;
-	string name = 4;
 }
 
 message MFAConstraintAny {
diff --git a/sdk/logical/lease.go b/sdk/logical/lease.go
index e00fb52d64b17..97bbe4f6582bc 100644
--- a/sdk/logical/lease.go
+++ b/sdk/logical/lease.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package logical
 
 import (
diff --git a/sdk/logical/lease_test.go b/sdk/logical/lease_test.go
index aee2bbdbcb3bf..050b7db8e92bd 100644
--- a/sdk/logical/lease_test.go
+++ b/sdk/logical/lease_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package logical
 
 import (
diff --git a/sdk/logical/logical.go b/sdk/logical/logical.go
index 51928d6e67e1f..601148952f0fb 100644
--- a/sdk/logical/logical.go
+++ b/sdk/logical/logical.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package logical
 
 import (
@@ -108,9 +105,6 @@ type BackendConfig struct {
 
 	// Config is the opaque user configuration provided when mounting
 	Config map[string]string
-
-	// EventsSender provides a mechanism to interact with Vault events.
-	EventsSender EventSender
 }
 
 // Factory is the factory function to create a logical backend.
@@ -137,28 +131,6 @@ type Paths struct {
 	// should be seal wrapped with extra encryption. It is exact matching
 	// unless it ends with '/' in which case it will be treated as a prefix.
 	SealWrapStorage []string
-
-	// WriteForwardedStorage are storage paths that, when running on a PR
-	// Secondary cluster, cause a GRPC call up to the PR Primary cluster's
-	// active node to handle storage.Put(...) and storage.Delete(...) events.
-	// These paths MUST include a {{clusterId}} literal, which the write layer
-	// will resolve to this cluster's UUID ("replication set" identifier).
-	// storage.List(...) and storage.Get(...) operations occur from the
-	// locally replicated data set, but can use path template expansion to be
-	// identifier agnostic.
-	//
-	// These paths require careful considerations by developers to use. In
-	// particular, writes on secondary clusters will not appear (when a
-	// corresponding read is issued immediately after a write) until the
-	// replication from primary->secondary has occurred. This replication
-	// triggers an InvalidateKey(...) call on the secondary, which can be
-	// used to detect the write has finished syncing. However, this will
-	// likely occur after the request has finished, so it is important to
-	// not block on this occurring.
-	//
-	// On standby nodes, like all storage write operations, this will trigger
-	// an ErrReadOnly return.
-	WriteForwardedStorage []string
 }
 
 type Auditor interface {
@@ -166,6 +138,11 @@ type Auditor interface {
 	AuditResponse(ctx context.Context, input *LogInput) error
 }
 
+// Externaler allows us to check if a backend is running externally (i.e., over GRPC)
+type Externaler interface {
+	IsExternal() bool
+}
+
 type PluginVersion struct {
 	Version string
 }
diff --git a/sdk/logical/logical_storage.go b/sdk/logical/logical_storage.go
index b4fbc2b72fdb3..16b85cd797e0e 100644
--- a/sdk/logical/logical_storage.go
+++ b/sdk/logical/logical_storage.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package logical
 
 import (
diff --git a/sdk/logical/managed_key.go b/sdk/logical/managed_key.go
index 04727f9d7f424..e892c9cce9483 100644
--- a/sdk/logical/managed_key.go
+++ b/sdk/logical/managed_key.go
@@ -1,14 +1,10 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package logical
 
 import (
 	"context"
 	"crypto"
+	"crypto/cipher"
 	"io"
-
-	wrapping "github.com/hashicorp/go-kms-wrapping/v2"
 )
 
 type KeyUsage int
@@ -20,7 +16,6 @@ const (
 	KeyUsageVerify
 	KeyUsageWrap
 	KeyUsageUnwrap
-	KeyUsageGenerateRandom
 )
 
 type ManagedKey interface {
@@ -39,11 +34,9 @@ type ManagedKey interface {
 }
 
 type (
-	ManagedKeyConsumer             func(context.Context, ManagedKey) error
-	ManagedSigningKeyConsumer      func(context.Context, ManagedSigningKey) error
-	ManagedEncryptingKeyConsumer   func(context.Context, ManagedEncryptingKey) error
-	ManagedMACKeyConsumer          func(context.Context, ManagedMACKey) error
-	ManagedKeyRandomSourceConsumer func(context.Context, ManagedKeyRandomSource) error
+	ManagedKeyConsumer           func(context.Context, ManagedKey) error
+	ManagedSigningKeyConsumer    func(context.Context, ManagedSigningKey) error
+	ManagedEncryptingKeyConsumer func(context.Context, ManagedEncryptingKey) error
 )
 
 type ManagedKeySystemView interface {
@@ -66,12 +59,6 @@ type ManagedKeySystemView interface {
 	// WithManagedSigningKeyByUUID retrieves an instantiated managed signing key for consumption by the given function,
 	// with the same semantics as WithManagedKeyByUUID
 	WithManagedEncryptingKeyByUUID(ctx context.Context, keyUuid, backendUUID string, f ManagedEncryptingKeyConsumer) error
-	// WithManagedMACKeyByName retrieves an instantiated managed MAC key by name for consumption by the given function,
-	// with the same semantics as WithManagedKeyByName.
-	WithManagedMACKeyByName(ctx context.Context, keyName, backendUUID string, f ManagedMACKeyConsumer) error
-	// WithManagedMACKeyByUUID retrieves an instantiated managed MAC key by UUID for consumption by the given function,
-	// with the same semantics as WithManagedKeyByUUID.
-	WithManagedMACKeyByUUID(ctx context.Context, keyUUID, backendUUID string, f ManagedMACKeyConsumer) error
 }
 
 type ManagedAsymmetricKey interface {
@@ -106,20 +93,5 @@ type ManagedSigningKey interface {
 
 type ManagedEncryptingKey interface {
 	ManagedKey
-	Encrypt(ctx context.Context, plaintext []byte, options ...wrapping.Option) ([]byte, error)
-	Decrypt(ctx context.Context, ciphertext []byte, options ...wrapping.Option) ([]byte, error)
-}
-
-type ManagedMACKey interface {
-	ManagedKey
-
-	// MAC generates a MAC tag using the provided algorithm for the provided value.
-	MAC(ctx context.Context, algorithm string, data []byte) ([]byte, error)
-}
-
-type ManagedKeyRandomSource interface {
-	ManagedKey
-
-	// GetRandomBytes returns a number (specified by the count parameter) of random bytes sourced from the target managed key.
-	GetRandomBytes(count int) ([]byte, error)
+	GetAEAD(iv []byte) (cipher.AEAD, error)
 }
diff --git a/sdk/logical/plugin.pb.go b/sdk/logical/plugin.pb.go
index 19b18d89e1862..03be5d3cba056 100644
--- a/sdk/logical/plugin.pb.go
+++ b/sdk/logical/plugin.pb.go
@@ -1,10 +1,7 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc        v3.21.5
 // source: sdk/logical/plugin.proto
 
 package logical
diff --git a/sdk/logical/plugin.proto b/sdk/logical/plugin.proto
index 0eaa3c57c8492..f2df6c75d97c3 100644
--- a/sdk/logical/plugin.proto
+++ b/sdk/logical/plugin.proto
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 syntax = "proto3";
 
 option go_package = "github.com/hashicorp/vault/sdk/logical";
diff --git a/sdk/logical/request.go b/sdk/logical/request.go
index 8a6ac241fe803..d774fd176b4a7 100644
--- a/sdk/logical/request.go
+++ b/sdk/logical/request.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package logical
 
 import (
@@ -156,22 +153,6 @@ type Request struct {
 	// backends can be tied to the mount it belongs to.
 	MountAccessor string `json:"mount_accessor" structs:"mount_accessor" mapstructure:"mount_accessor" sentinel:""`
 
-	// mountRunningVersion is used internally to propagate the semantic version
-	// of the mounted plugin as reported by its vault.MountEntry to audit logging
-	mountRunningVersion string
-
-	// mountRunningSha256 is used internally to propagate the encoded sha256
-	// of the mounted plugin as reported its vault.MountEntry to audit logging
-	mountRunningSha256 string
-
-	// mountIsExternalPlugin is used internally to propagate whether
-	// the backend of the mounted plugin is running externally (i.e., over GRPC)
-	// to audit logging
-	mountIsExternalPlugin bool
-
-	// mountClass is used internally to propagate the mount class of the mounted plugin to audit logging
-	mountClass string
-
 	// WrapInfo contains requested response wrapping parameters
 	WrapInfo *RequestWrapInfo `json:"wrap_info" structs:"wrap_info" mapstructure:"wrap_info" sentinel:""`
 
@@ -243,9 +224,6 @@ type Request struct {
 	// InboundSSCToken is the token that arrives on an inbound request, supplied
 	// by the vault user.
 	InboundSSCToken string
-
-	// When a request has been forwarded, contains information of the host the request was forwarded 'from'
-	ForwardedFrom string `json:"forwarded_from,omitempty"`
 }
 
 // Clone returns a deep copy of the request by using copystructure
@@ -302,38 +280,6 @@ func (r *Request) SentinelKeys() []string {
 	}
 }
 
-func (r *Request) MountRunningVersion() string {
-	return r.mountRunningVersion
-}
-
-func (r *Request) SetMountRunningVersion(mountRunningVersion string) {
-	r.mountRunningVersion = mountRunningVersion
-}
-
-func (r *Request) MountRunningSha256() string {
-	return r.mountRunningSha256
-}
-
-func (r *Request) SetMountRunningSha256(mountRunningSha256 string) {
-	r.mountRunningSha256 = mountRunningSha256
-}
-
-func (r *Request) MountIsExternalPlugin() bool {
-	return r.mountIsExternalPlugin
-}
-
-func (r *Request) SetMountIsExternalPlugin(mountIsExternalPlugin bool) {
-	r.mountIsExternalPlugin = mountIsExternalPlugin
-}
-
-func (r *Request) MountClass() string {
-	return r.mountClass
-}
-
-func (r *Request) SetMountClass(mountClass string) {
-	r.mountClass = mountClass
-}
-
 func (r *Request) LastRemoteWAL() uint64 {
 	return r.lastRemoteWAL
 }
@@ -420,7 +366,6 @@ const (
 	HelpOperation                     = "help"
 	AliasLookaheadOperation           = "alias-lookahead"
 	ResolveRoleOperation              = "resolve-role"
-	HeaderOperation                   = "header"
 
 	// The operations below are called globally, the path is less relevant.
 	RevokeOperation   Operation = "revoke"
diff --git a/sdk/logical/response.go b/sdk/logical/response.go
index 9ea5bf6c57274..19194f524871c 100644
--- a/sdk/logical/response.go
+++ b/sdk/logical/response.go
@@ -1,14 +1,9 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package logical
 
 import (
-	"bufio"
 	"encoding/json"
 	"errors"
 	"fmt"
-	"net"
 	"net/http"
 	"strconv"
 	"sync/atomic"
@@ -97,8 +92,7 @@ func (r *Response) AddWarning(warning string) {
 
 // IsError returns true if this response seems to indicate an error.
 func (r *Response) IsError() bool {
-	// If the response data contains only an 'error' element, or an 'error' and a 'data' element only
-	return r != nil && r.Data != nil && r.Data["error"] != nil && (len(r.Data) == 1 || (r.Data["data"] != nil && len(r.Data) == 2))
+	return r != nil && r.Data != nil && len(r.Data) == 1 && r.Data["error"] != nil
 }
 
 func (r *Response) Error() error {
@@ -247,13 +241,6 @@ func NewStatusHeaderResponseWriter(w http.ResponseWriter, h map[string][]*Custom
 	}
 }
 
-func (w *StatusHeaderResponseWriter) Hijack() (net.Conn, *bufio.ReadWriter, error) {
-	if h, ok := w.wrapped.(http.Hijacker); ok {
-		return h.Hijack()
-	}
-	return nil, nil, fmt.Errorf("could not hijack because wrapped connection is %T and it does not implement http.Hijacker", w.wrapped)
-}
-
 func (w *StatusHeaderResponseWriter) Wrapped() http.ResponseWriter {
 	return w.wrapped
 }
diff --git a/sdk/logical/response_util.go b/sdk/logical/response_util.go
index aef0213ed9e82..7454189f1d7d7 100644
--- a/sdk/logical/response_util.go
+++ b/sdk/logical/response_util.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package logical
 
 import (
@@ -20,7 +17,7 @@ import (
 func RespondErrorCommon(req *Request, resp *Response, err error) (int, error) {
 	if err == nil && (resp == nil || !resp.IsError()) {
 		switch {
-		case req.Operation == ReadOperation || req.Operation == HeaderOperation:
+		case req.Operation == ReadOperation:
 			if resp == nil {
 				return http.StatusNotFound, nil
 			}
@@ -76,21 +73,10 @@ func RespondErrorCommon(req *Request, resp *Response, err error) (int, error) {
 		var allErrors error
 		var codedErr *ReplicationCodedError
 		errwrap.Walk(err, func(inErr error) {
-			// The Walk function does not just traverse leaves, and execute the
-			// callback function on the entire error first. So, if the error is
-			// of type multierror.Error, we may want to skip storing the entire
-			// error first to avoid adding duplicate errors when walking down
-			// the leaf errors
-			if _, ok := inErr.(*multierror.Error); ok {
-				return
-			}
 			newErr, ok := inErr.(*ReplicationCodedError)
 			if ok {
 				codedErr = newErr
 			} else {
-				// if the error is of type fmt.wrapError which is typically
-				// made by calling fmt.Errorf("... %w", err), allErrors will
-				// contain duplicated error messages
 				allErrors = multierror.Append(allErrors, inErr)
 			}
 		})
@@ -136,8 +122,6 @@ func RespondErrorCommon(req *Request, resp *Response, err error) (int, error) {
 			statusCode = http.StatusNotFound
 		case errwrap.Contains(err, ErrRelativePath.Error()):
 			statusCode = http.StatusBadRequest
-		case errwrap.Contains(err, ErrInvalidCredentials.Error()):
-			statusCode = http.StatusBadRequest
 		}
 	}
 
@@ -196,23 +180,3 @@ func RespondError(w http.ResponseWriter, status int, err error) {
 	enc := json.NewEncoder(w)
 	enc.Encode(resp)
 }
-
-func RespondErrorAndData(w http.ResponseWriter, status int, data interface{}, err error) {
-	AdjustErrorStatusCode(&status, err)
-
-	w.Header().Set("Content-Type", "application/json")
-	w.WriteHeader(status)
-
-	type ErrorAndDataResponse struct {
-		Errors []string    `json:"errors"`
-		Data   interface{} `json:"data""`
-	}
-	resp := &ErrorAndDataResponse{Errors: make([]string, 0, 1)}
-	if err != nil {
-		resp.Errors = append(resp.Errors, err.Error())
-	}
-	resp.Data = data
-
-	enc := json.NewEncoder(w)
-	enc.Encode(resp)
-}
diff --git a/sdk/logical/response_util_test.go b/sdk/logical/response_util_test.go
index eafaa2fc76109..823c4afbdc217 100644
--- a/sdk/logical/response_util_test.go
+++ b/sdk/logical/response_util_test.go
@@ -1,10 +1,6 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package logical
 
 import (
-	"errors"
 	"strings"
 	"testing"
 )
@@ -42,14 +38,6 @@ func TestResponseUtil_RespondErrorCommon_basic(t *testing.T) {
 			respErr:        nil,
 			expectedStatus: 404,
 		},
-		{
-			title: "Header not found",
-			req: &Request{
-				Operation: HeaderOperation,
-			},
-			respErr:        nil,
-			expectedStatus: 404,
-		},
 		{
 			title: "List with response and no keys",
 			req: &Request{
@@ -72,17 +60,6 @@ func TestResponseUtil_RespondErrorCommon_basic(t *testing.T) {
 			respErr:        nil,
 			expectedStatus: 0,
 		},
-		{
-			title:   "Invalid Credentials error ",
-			respErr: ErrInvalidCredentials,
-			resp: &Response{
-				Data: map[string]interface{}{
-					"error": "error due to wrong credentials",
-				},
-			},
-			expectedErr:    errors.New("error due to wrong credentials"),
-			expectedStatus: 400,
-		},
 	}
 
 	for _, tc := range testCases {
diff --git a/sdk/logical/secret.go b/sdk/logical/secret.go
index e6b4d14d4732b..a2128d8689946 100644
--- a/sdk/logical/secret.go
+++ b/sdk/logical/secret.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package logical
 
 import "fmt"
diff --git a/sdk/logical/storage.go b/sdk/logical/storage.go
index 16ba60b94875c..0802ad01a0f62 100644
--- a/sdk/logical/storage.go
+++ b/sdk/logical/storage.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package logical
 
 import (
@@ -23,11 +20,6 @@ var ErrReadOnly = errors.New("cannot write to readonly storage")
 // storage while the backend is still being setup.
 var ErrSetupReadOnly = errors.New("cannot write to storage during setup")
 
-// Plugins using Paths.WriteForwardedStorage will need to use this sentinel
-// in their path to write cross-cluster. See the description of that parameter
-// for more information.
-const PBPWFClusterSentinel = "{{clusterId}}"
-
 // Storage is the way that logical backends are able read/write data.
 type Storage interface {
 	List(context.Context, string) ([]string, error)
diff --git a/sdk/logical/storage_inmem.go b/sdk/logical/storage_inmem.go
index 62ec58290a4b6..65368a070fe45 100644
--- a/sdk/logical/storage_inmem.go
+++ b/sdk/logical/storage_inmem.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package logical
 
 import (
diff --git a/sdk/logical/storage_inmem_test.go b/sdk/logical/storage_inmem_test.go
index 2ed776b20c38c..8e0964fd4af8f 100644
--- a/sdk/logical/storage_inmem_test.go
+++ b/sdk/logical/storage_inmem_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package logical
 
 import (
diff --git a/sdk/logical/storage_test.go b/sdk/logical/storage_test.go
index 1d6014dd9769c..3b96b4dbef340 100644
--- a/sdk/logical/storage_test.go
+++ b/sdk/logical/storage_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package logical
 
 import (
diff --git a/sdk/logical/storage_view.go b/sdk/logical/storage_view.go
index df40dca4fc53a..2cd07715c2ae4 100644
--- a/sdk/logical/storage_view.go
+++ b/sdk/logical/storage_view.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package logical
 
 import (
diff --git a/sdk/logical/system_view.go b/sdk/logical/system_view.go
index 7301c752a1625..4e5627b1c8805 100644
--- a/sdk/logical/system_view.go
+++ b/sdk/logical/system_view.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package logical
 
 import (
@@ -86,17 +83,9 @@ type SystemView interface {
 	// PluginEnv returns Vault environment information used by plugins
 	PluginEnv(context.Context) (*PluginEnvironment, error)
 
-	// VaultVersion returns the version string for the currently running Vault.
-	VaultVersion(context.Context) (string, error)
-
 	// GeneratePasswordFromPolicy generates a password from the policy referenced.
 	// If the policy does not exist, this will return an error.
 	GeneratePasswordFromPolicy(ctx context.Context, policyName string) (password string, err error)
-
-	// ClusterID returns the replication ClusterID, for use with path-based
-	// write forwarding (WriteForwardedPaths). This value will be templated
-	// in for the {{cluterId}} sentinel.
-	ClusterID(ctx context.Context) (string, error)
 }
 
 type PasswordPolicy interface {
@@ -124,10 +113,9 @@ type StaticSystemView struct {
 	EntityVal           *Entity
 	GroupsVal           []*Group
 	Features            license.Features
+	VaultVersion        string
 	PluginEnvironment   *PluginEnvironment
 	PasswordPolicies    map[string]PasswordGenerator
-	VersionString       string
-	ClusterUUID         string
 }
 
 type noopAuditor struct{}
@@ -216,10 +204,6 @@ func (d StaticSystemView) PluginEnv(_ context.Context) (*PluginEnvironment, erro
 	return d.PluginEnvironment, nil
 }
 
-func (d StaticSystemView) VaultVersion(_ context.Context) (string, error) {
-	return d.VersionString, nil
-}
-
 func (d StaticSystemView) GeneratePasswordFromPolicy(ctx context.Context, policyName string) (password string, err error) {
 	select {
 	case <-ctx.Done():
@@ -249,7 +233,3 @@ func (d *StaticSystemView) DeletePasswordPolicy(name string) (existed bool) {
 	delete(d.PasswordPolicies, name)
 	return existed
 }
-
-func (d StaticSystemView) ClusterID(ctx context.Context) (string, error) {
-	return d.ClusterUUID, nil
-}
diff --git a/sdk/logical/testing.go b/sdk/logical/testing.go
index a173c7c5f7b29..765f09826d4f7 100644
--- a/sdk/logical/testing.go
+++ b/sdk/logical/testing.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package logical
 
 import (
@@ -76,7 +73,6 @@ func TestSystemView() *StaticSystemView {
 	return &StaticSystemView{
 		DefaultLeaseTTLVal: defaultLeaseTTLVal,
 		MaxLeaseTTLVal:     maxLeaseTTLVal,
-		VersionString:      "testVersionString",
 	}
 }
 
diff --git a/sdk/logical/token.go b/sdk/logical/token.go
index a27a73a22dc27..ebebd4ad9ca7a 100644
--- a/sdk/logical/token.go
+++ b/sdk/logical/token.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package logical
 
 import (
diff --git a/sdk/logical/token_test.go b/sdk/logical/token_test.go
index 641d688b9dd1b..e44c707a51659 100644
--- a/sdk/logical/token_test.go
+++ b/sdk/logical/token_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package logical
 
 import (
diff --git a/sdk/logical/translate_response.go b/sdk/logical/translate_response.go
index ef5ba5f220724..de5ea8fdbe214 100644
--- a/sdk/logical/translate_response.go
+++ b/sdk/logical/translate_response.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package logical
 
 import (
diff --git a/sdk/logical/version.pb.go b/sdk/logical/version.pb.go
index 9962824cbb15d..7845aeaf5c372 100644
--- a/sdk/logical/version.pb.go
+++ b/sdk/logical/version.pb.go
@@ -1,10 +1,7 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc        v3.21.5
 // source: sdk/logical/version.proto
 
 package logical
diff --git a/sdk/logical/version.proto b/sdk/logical/version.proto
index 860ddc54e2707..345051ae9de95 100644
--- a/sdk/logical/version.proto
+++ b/sdk/logical/version.proto
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 syntax = "proto3";
 package logical;
 
diff --git a/sdk/physical/cache.go b/sdk/physical/cache.go
index cc318a4c0eb52..ffac33189bbc0 100644
--- a/sdk/physical/cache.go
+++ b/sdk/physical/cache.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package physical
 
 import (
@@ -32,6 +29,7 @@ var cacheExceptionsPaths = []string{
 	"sys/expire/",
 	"core/poison-pill",
 	"core/raft/tls",
+	"core/license",
 }
 
 // CacheRefreshContext returns a context with an added value denoting if the
diff --git a/sdk/physical/encoding.go b/sdk/physical/encoding.go
index 49e00ae6ace58..dbde84cc6dc46 100644
--- a/sdk/physical/encoding.go
+++ b/sdk/physical/encoding.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package physical
 
 import (
diff --git a/sdk/physical/entry.go b/sdk/physical/entry.go
index 1d907425dc08d..389fe6c81c144 100644
--- a/sdk/physical/entry.go
+++ b/sdk/physical/entry.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package physical
 
 import (
diff --git a/sdk/physical/error.go b/sdk/physical/error.go
index 4af7b7d639fcc..b547e4e4288d4 100644
--- a/sdk/physical/error.go
+++ b/sdk/physical/error.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package physical
 
 import (
diff --git a/sdk/physical/file/file.go b/sdk/physical/file/file.go
index d7ad9de3a2b09..e5e64e6efa41f 100644
--- a/sdk/physical/file/file.go
+++ b/sdk/physical/file/file.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package file
 
 import (
diff --git a/sdk/physical/file/file_test.go b/sdk/physical/file/file_test.go
index 14c33094dec48..724b8a012a66b 100644
--- a/sdk/physical/file/file_test.go
+++ b/sdk/physical/file/file_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package file
 
 import (
diff --git a/sdk/physical/inmem/cache_test.go b/sdk/physical/inmem/cache_test.go
index 3014fc1768da9..e6e6dabfe3760 100644
--- a/sdk/physical/inmem/cache_test.go
+++ b/sdk/physical/inmem/cache_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package inmem
 
 import (
diff --git a/sdk/physical/inmem/inmem.go b/sdk/physical/inmem/inmem.go
index e4fa1f69ba231..be16b4caa12fc 100644
--- a/sdk/physical/inmem/inmem.go
+++ b/sdk/physical/inmem/inmem.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package inmem
 
 import (
diff --git a/sdk/physical/inmem/inmem_ha.go b/sdk/physical/inmem/inmem_ha.go
index 1db26ca7461f3..64fcb3a66dce3 100644
--- a/sdk/physical/inmem/inmem_ha.go
+++ b/sdk/physical/inmem/inmem_ha.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package inmem
 
 import (
diff --git a/sdk/physical/inmem/inmem_ha_test.go b/sdk/physical/inmem/inmem_ha_test.go
index bb427a385e991..850d63a230be1 100644
--- a/sdk/physical/inmem/inmem_ha_test.go
+++ b/sdk/physical/inmem/inmem_ha_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package inmem
 
 import (
diff --git a/sdk/physical/inmem/inmem_test.go b/sdk/physical/inmem/inmem_test.go
index 56c029a43303b..678061326a218 100644
--- a/sdk/physical/inmem/inmem_test.go
+++ b/sdk/physical/inmem/inmem_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package inmem
 
 import (
diff --git a/sdk/physical/inmem/physical_view_test.go b/sdk/physical/inmem/physical_view_test.go
index 24b47d7ae7ec9..ea4a3ce24f187 100644
--- a/sdk/physical/inmem/physical_view_test.go
+++ b/sdk/physical/inmem/physical_view_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package inmem
 
 import (
diff --git a/sdk/physical/inmem/transactions_test.go b/sdk/physical/inmem/transactions_test.go
index 71a4829f96647..7ed3d59492412 100644
--- a/sdk/physical/inmem/transactions_test.go
+++ b/sdk/physical/inmem/transactions_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package inmem
 
 import (
diff --git a/sdk/physical/latency.go b/sdk/physical/latency.go
index f4cced5270b19..c00780598cf47 100644
--- a/sdk/physical/latency.go
+++ b/sdk/physical/latency.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package physical
 
 import (
diff --git a/sdk/physical/physical.go b/sdk/physical/physical.go
index c0e7d2ef8895c..808abd50fcd85 100644
--- a/sdk/physical/physical.go
+++ b/sdk/physical/physical.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package physical
 
 import (
diff --git a/sdk/physical/physical_access.go b/sdk/physical/physical_access.go
index 048ee83856670..7497313afca22 100644
--- a/sdk/physical/physical_access.go
+++ b/sdk/physical/physical_access.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package physical
 
 import (
diff --git a/sdk/physical/physical_view.go b/sdk/physical/physical_view.go
index 0369e13778a04..189ac93172a53 100644
--- a/sdk/physical/physical_view.go
+++ b/sdk/physical/physical_view.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package physical
 
 import (
diff --git a/sdk/physical/testing.go b/sdk/physical/testing.go
index 0c6a021d3d237..6e0ddfcc0eae0 100644
--- a/sdk/physical/testing.go
+++ b/sdk/physical/testing.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package physical
 
 import (
diff --git a/sdk/physical/transactions.go b/sdk/physical/transactions.go
index 8d4e33321e2cb..a943c6bd95efa 100644
--- a/sdk/physical/transactions.go
+++ b/sdk/physical/transactions.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package physical
 
 import (
diff --git a/sdk/plugin/backend.go b/sdk/plugin/backend.go
index 2da1378eaa91a..46e3710fdbace 100644
--- a/sdk/plugin/backend.go
+++ b/sdk/plugin/backend.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package plugin
 
 import (
diff --git a/sdk/plugin/grpc_backend.go b/sdk/plugin/grpc_backend.go
index f0114b9465790..a65eeebeb4322 100644
--- a/sdk/plugin/grpc_backend.go
+++ b/sdk/plugin/grpc_backend.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package plugin
 
 import (
diff --git a/sdk/plugin/grpc_backend_client.go b/sdk/plugin/grpc_backend_client.go
index a343356d19d86..91503f176e703 100644
--- a/sdk/plugin/grpc_backend_client.go
+++ b/sdk/plugin/grpc_backend_client.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package plugin
 
 import (
@@ -127,11 +124,10 @@ func (b *backendGRPCPluginClient) SpecialPaths() *logical.Paths {
 	}
 
 	return &logical.Paths{
-		Root:                  reply.Paths.Root,
-		Unauthenticated:       reply.Paths.Unauthenticated,
-		LocalStorage:          reply.Paths.LocalStorage,
-		SealWrapStorage:       reply.Paths.SealWrapStorage,
-		WriteForwardedStorage: reply.Paths.WriteForwardedStorage,
+		Root:            reply.Paths.Root,
+		Unauthenticated: reply.Paths.Unauthenticated,
+		LocalStorage:    reply.Paths.LocalStorage,
+		SealWrapStorage: reply.Paths.SealWrapStorage,
 	}
 }
 
@@ -231,10 +227,6 @@ func (b *backendGRPCPluginClient) Setup(ctx context.Context, config *logical.Bac
 		impl: sysViewImpl,
 	}
 
-	events := &GRPCEventsServer{
-		impl: config.EventsSender,
-	}
-
 	// Register the server in this closure.
 	serverFunc := func(opts []grpc.ServerOption) *grpc.Server {
 		opts = append(opts, grpc.MaxRecvMsgSize(math.MaxInt32))
@@ -243,7 +235,6 @@ func (b *backendGRPCPluginClient) Setup(ctx context.Context, config *logical.Bac
 		s := grpc.NewServer(opts...)
 		pb.RegisterSystemViewServer(s, sysView)
 		pb.RegisterStorageServer(s, storage)
-		pb.RegisterEventsServer(s, events)
 		b.server.Store(s)
 		close(b.cleanupCh)
 		return s
diff --git a/sdk/plugin/grpc_backend_server.go b/sdk/plugin/grpc_backend_server.go
index 3356e463c8ad8..361f3171f6734 100644
--- a/sdk/plugin/grpc_backend_server.go
+++ b/sdk/plugin/grpc_backend_server.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package plugin
 
 import (
@@ -95,15 +92,13 @@ func (b *backendGRPCPluginServer) Setup(ctx context.Context, args *pb.SetupArgs)
 
 	storage := newGRPCStorageClient(brokeredClient)
 	sysView := newGRPCSystemView(brokeredClient)
-	events := newGRPCEventsClient(brokeredClient)
 
 	config := &logical.BackendConfig{
-		StorageView:  storage,
-		Logger:       b.logger,
-		System:       sysView,
-		Config:       args.Config,
-		BackendUUID:  args.BackendUUID,
-		EventsSender: events,
+		StorageView: storage,
+		Logger:      b.logger,
+		System:      sysView,
+		Config:      args.Config,
+		BackendUUID: args.BackendUUID,
 	}
 
 	// Call the underlying backend factory after shims have been created
@@ -191,11 +186,10 @@ func (b *backendGRPCPluginServer) SpecialPaths(ctx context.Context, args *pb.Emp
 
 	return &pb.SpecialPathsReply{
 		Paths: &pb.Paths{
-			Root:                  paths.Root,
-			Unauthenticated:       paths.Unauthenticated,
-			LocalStorage:          paths.LocalStorage,
-			SealWrapStorage:       paths.SealWrapStorage,
-			WriteForwardedStorage: paths.WriteForwardedStorage,
+			Root:            paths.Root,
+			Unauthenticated: paths.Unauthenticated,
+			LocalStorage:    paths.LocalStorage,
+			SealWrapStorage: paths.SealWrapStorage,
 		},
 	}, nil
 }
diff --git a/sdk/plugin/grpc_backend_test.go b/sdk/plugin/grpc_backend_test.go
index 01a6ea609f7d6..2f665beb044ab 100644
--- a/sdk/plugin/grpc_backend_test.go
+++ b/sdk/plugin/grpc_backend_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package plugin
 
 import (
diff --git a/sdk/plugin/grpc_events.go b/sdk/plugin/grpc_events.go
deleted file mode 100644
index 05d788c66cd0a..0000000000000
--- a/sdk/plugin/grpc_events.go
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package plugin
-
-import (
-	"context"
-
-	"github.com/hashicorp/vault/sdk/logical"
-	"github.com/hashicorp/vault/sdk/plugin/pb"
-	"google.golang.org/grpc"
-)
-
-func newGRPCEventsClient(conn *grpc.ClientConn) *GRPCEventsClient {
-	return &GRPCEventsClient{
-		client: pb.NewEventsClient(conn),
-	}
-}
-
-type GRPCEventsClient struct {
-	client pb.EventsClient
-}
-
-var _ logical.EventSender = (*GRPCEventsClient)(nil)
-
-func (s *GRPCEventsClient) Send(ctx context.Context, eventType logical.EventType, event *logical.EventData) error {
-	_, err := s.client.SendEvent(ctx, &pb.SendEventRequest{
-		EventType: string(eventType),
-		Event:     event,
-	})
-	return err
-}
-
-type GRPCEventsServer struct {
-	pb.UnimplementedEventsServer
-	impl logical.EventSender
-}
-
-func (s *GRPCEventsServer) SendEvent(ctx context.Context, req *pb.SendEventRequest) (*pb.Empty, error) {
-	if s.impl == nil {
-		return &pb.Empty{}, nil
-	}
-
-	err := s.impl.Send(ctx, logical.EventType(req.EventType), req.Event)
-	if err != nil {
-		return nil, err
-	}
-	return &pb.Empty{}, nil
-}
diff --git a/sdk/plugin/grpc_storage.go b/sdk/plugin/grpc_storage.go
index 5c2f0de3f4f05..6a04b3a976871 100644
--- a/sdk/plugin/grpc_storage.go
+++ b/sdk/plugin/grpc_storage.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package plugin
 
 import (
diff --git a/sdk/plugin/grpc_system.go b/sdk/plugin/grpc_system.go
index bf4537bd58f74..5ab680a5d1f1f 100644
--- a/sdk/plugin/grpc_system.go
+++ b/sdk/plugin/grpc_system.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package plugin
 
 import (
@@ -29,8 +26,6 @@ func newGRPCSystemView(conn *grpc.ClientConn) *gRPCSystemViewClient {
 	}
 }
 
-var _ logical.SystemView = &gRPCSystemViewClient{}
-
 type gRPCSystemViewClient struct {
 	client pb.SystemViewClient
 }
@@ -182,15 +177,6 @@ func (s *gRPCSystemViewClient) PluginEnv(ctx context.Context) (*logical.PluginEn
 	return reply.PluginEnvironment, nil
 }
 
-func (s *gRPCSystemViewClient) VaultVersion(ctx context.Context) (string, error) {
-	reply, err := s.client.PluginEnv(ctx, &pb.Empty{})
-	if err != nil {
-		return "", err
-	}
-
-	return reply.PluginEnvironment.VaultVersion, nil
-}
-
 func (s *gRPCSystemViewClient) GeneratePasswordFromPolicy(ctx context.Context, policyName string) (password string, err error) {
 	req := &pb.GeneratePasswordFromPolicyRequest{
 		PolicyName: policyName,
@@ -202,15 +188,6 @@ func (s *gRPCSystemViewClient) GeneratePasswordFromPolicy(ctx context.Context, p
 	return resp.Password, nil
 }
 
-func (s gRPCSystemViewClient) ClusterID(ctx context.Context) (string, error) {
-	reply, err := s.client.ClusterInfo(ctx, &pb.Empty{})
-	if err != nil {
-		return "", err
-	}
-
-	return reply.ClusterID, nil
-}
-
 type gRPCSystemViewServer struct {
 	pb.UnimplementedSystemViewServer
 
@@ -379,18 +356,3 @@ func (s *gRPCSystemViewServer) GeneratePasswordFromPolicy(ctx context.Context, r
 	}
 	return resp, nil
 }
-
-func (s *gRPCSystemViewServer) ClusterInfo(ctx context.Context, _ *pb.Empty) (*pb.ClusterInfoReply, error) {
-	if s.impl == nil {
-		return nil, errMissingSystemView
-	}
-
-	clusterId, err := s.impl.ClusterID(ctx)
-	if err != nil {
-		return &pb.ClusterInfoReply{}, status.Errorf(codes.Internal, "failed to fetch cluster id")
-	}
-
-	return &pb.ClusterInfoReply{
-		ClusterID: clusterId,
-	}, nil
-}
diff --git a/sdk/plugin/grpc_system_test.go b/sdk/plugin/grpc_system_test.go
index 19a5ecbaaeea0..691c353068f34 100644
--- a/sdk/plugin/grpc_system_test.go
+++ b/sdk/plugin/grpc_system_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package plugin
 
 import (
@@ -116,6 +113,10 @@ func TestSystem_GRPC_replicationState(t *testing.T) {
 	}
 }
 
+func TestSystem_GRPC_responseWrapData(t *testing.T) {
+	t.SkipNow()
+}
+
 func TestSystem_GRPC_lookupPlugin(t *testing.T) {
 	sys := logical.TestSystemView()
 	client, _ := plugin.TestGRPCConn(t, func(s *grpc.Server) {
diff --git a/sdk/plugin/logger.go b/sdk/plugin/logger.go
index 1ef4694e9b8f4..ecf6ed01f158a 100644
--- a/sdk/plugin/logger.go
+++ b/sdk/plugin/logger.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package plugin
 
 import hclog "github.com/hashicorp/go-hclog"
diff --git a/sdk/plugin/logger_test.go b/sdk/plugin/logger_test.go
index c47a70b1c579b..a2b8a80155cde 100644
--- a/sdk/plugin/logger_test.go
+++ b/sdk/plugin/logger_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package plugin
 
 import (
diff --git a/sdk/plugin/middleware.go b/sdk/plugin/middleware.go
index 4411c788297b4..546584ccc7367 100644
--- a/sdk/plugin/middleware.go
+++ b/sdk/plugin/middleware.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package plugin
 
 import (
diff --git a/sdk/plugin/mock/backend.go b/sdk/plugin/mock/backend.go
index 9b3aa2c851e29..a75b639ef6536 100644
--- a/sdk/plugin/mock/backend.go
+++ b/sdk/plugin/mock/backend.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package mock
 
 import (
diff --git a/sdk/plugin/mock/backend_test.go b/sdk/plugin/mock/backend_test.go
index 640eec11643df..15860906d4a72 100644
--- a/sdk/plugin/mock/backend_test.go
+++ b/sdk/plugin/mock/backend_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package mock
 
 import (
diff --git a/sdk/plugin/mock/path_errors.go b/sdk/plugin/mock/path_errors.go
index f5e5b124fcb22..05ef474a7eafc 100644
--- a/sdk/plugin/mock/path_errors.go
+++ b/sdk/plugin/mock/path_errors.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package mock
 
 import (
diff --git a/sdk/plugin/mock/path_internal.go b/sdk/plugin/mock/path_internal.go
index 30c2926f5cfad..26ede270fac21 100644
--- a/sdk/plugin/mock/path_internal.go
+++ b/sdk/plugin/mock/path_internal.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package mock
 
 import (
diff --git a/sdk/plugin/mock/path_kv.go b/sdk/plugin/mock/path_kv.go
index fd8080572cd42..1946b57624964 100644
--- a/sdk/plugin/mock/path_kv.go
+++ b/sdk/plugin/mock/path_kv.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package mock
 
 import (
diff --git a/sdk/plugin/mock/path_raw.go b/sdk/plugin/mock/path_raw.go
index 2a4b77fb731a2..55cb7c9374087 100644
--- a/sdk/plugin/mock/path_raw.go
+++ b/sdk/plugin/mock/path_raw.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package mock
 
 import (
diff --git a/sdk/plugin/mock/path_special.go b/sdk/plugin/mock/path_special.go
index 4223f91053dc0..22afa41c6daed 100644
--- a/sdk/plugin/mock/path_special.go
+++ b/sdk/plugin/mock/path_special.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package mock
 
 import (
diff --git a/sdk/plugin/pb/backend.pb.go b/sdk/plugin/pb/backend.pb.go
index 82bbae2fd230f..8b764b5fd01da 100644
--- a/sdk/plugin/pb/backend.pb.go
+++ b/sdk/plugin/pb/backend.pb.go
@@ -1,10 +1,7 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc        v3.21.5
 // source: sdk/plugin/pb/backend.proto
 
 package pb
@@ -202,12 +199,6 @@ type Paths struct {
 	// should be seal wrapped with extra encryption. It is exact matching
 	// unless it ends with '/' in which case it will be treated as a prefix.
 	SealWrapStorage []string `protobuf:"bytes,4,rep,name=seal_wrap_storage,json=sealWrapStorage,proto3" json:"seal_wrap_storage,omitempty"`
-	// WriteForwardedStorage are storage paths that, when running on a PR
-	// Secondary cluster, cause a GRPC call up to the PR Primary cluster's
-	// active node to handle storage.Put(...) and storage.Delete(...) events.
-	//
-	// See extended note in /sdk/logical/logical.go.
-	WriteForwardedStorage []string `protobuf:"bytes,5,rep,name=write_forwarded_storage,json=writeForwardedStorage,proto3" json:"write_forwarded_storage,omitempty"`
 }
 
 func (x *Paths) Reset() {
@@ -270,13 +261,6 @@ func (x *Paths) GetSealWrapStorage() []string {
 	return nil
 }
 
-func (x *Paths) GetWriteForwardedStorage() []string {
-	if x != nil {
-		return x.WriteForwardedStorage
-	}
-	return nil
-}
-
 type Request struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -773,7 +757,6 @@ type TokenEntry struct {
 	InternalMeta       map[string]string `protobuf:"bytes,19,rep,name=internal_meta,json=internalMeta,proto3" json:"internal_meta,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	InlinePolicy       string            `protobuf:"bytes,20,opt,name=inline_policy,json=inlinePolicy,proto3" json:"inline_policy,omitempty"`
 	NoIdentityPolicies bool              `protobuf:"varint,21,opt,name=no_identity_policies,json=noIdentityPolicies,proto3" json:"no_identity_policies,omitempty"`
-	ExternalID         string            `protobuf:"bytes,22,opt,name=external_id,json=externalId,proto3" json:"external_id,omitempty"`
 }
 
 func (x *TokenEntry) Reset() {
@@ -955,13 +938,6 @@ func (x *TokenEntry) GetNoIdentityPolicies() bool {
 	return false
 }
 
-func (x *TokenEntry) GetExternalID() string {
-	if x != nil {
-		return x.ExternalID
-	}
-	return ""
-}
-
 type LeaseOptions struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -3151,69 +3127,6 @@ func (x *GeneratePasswordFromPolicyReply) GetPassword() string {
 	return ""
 }
 
-type ClusterInfoReply struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	ClusterName string `protobuf:"bytes,1,opt,name=cluster_name,json=clusterName,proto3" json:"cluster_name,omitempty"`
-	ClusterID   string `protobuf:"bytes,2,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
-	Err         string `protobuf:"bytes,3,opt,name=err,proto3" json:"err,omitempty"`
-}
-
-func (x *ClusterInfoReply) Reset() {
-	*x = ClusterInfoReply{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_sdk_plugin_pb_backend_proto_msgTypes[46]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ClusterInfoReply) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ClusterInfoReply) ProtoMessage() {}
-
-func (x *ClusterInfoReply) ProtoReflect() protoreflect.Message {
-	mi := &file_sdk_plugin_pb_backend_proto_msgTypes[46]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ClusterInfoReply.ProtoReflect.Descriptor instead.
-func (*ClusterInfoReply) Descriptor() ([]byte, []int) {
-	return file_sdk_plugin_pb_backend_proto_rawDescGZIP(), []int{46}
-}
-
-func (x *ClusterInfoReply) GetClusterName() string {
-	if x != nil {
-		return x.ClusterName
-	}
-	return ""
-}
-
-func (x *ClusterInfoReply) GetClusterID() string {
-	if x != nil {
-		return x.ClusterID
-	}
-	return ""
-}
-
-func (x *ClusterInfoReply) GetErr() string {
-	if x != nil {
-		return x.Err
-	}
-	return ""
-}
-
 type Connection struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -3231,7 +3144,7 @@ type Connection struct {
 func (x *Connection) Reset() {
 	*x = Connection{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_sdk_plugin_pb_backend_proto_msgTypes[47]
+		mi := &file_sdk_plugin_pb_backend_proto_msgTypes[46]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3244,7 +3157,7 @@ func (x *Connection) String() string {
 func (*Connection) ProtoMessage() {}
 
 func (x *Connection) ProtoReflect() protoreflect.Message {
-	mi := &file_sdk_plugin_pb_backend_proto_msgTypes[47]
+	mi := &file_sdk_plugin_pb_backend_proto_msgTypes[46]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3257,7 +3170,7 @@ func (x *Connection) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Connection.ProtoReflect.Descriptor instead.
 func (*Connection) Descriptor() ([]byte, []int) {
-	return file_sdk_plugin_pb_backend_proto_rawDescGZIP(), []int{47}
+	return file_sdk_plugin_pb_backend_proto_rawDescGZIP(), []int{46}
 }
 
 func (x *Connection) GetRemoteAddr() string {
@@ -3303,7 +3216,7 @@ type ConnectionState struct {
 func (x *ConnectionState) Reset() {
 	*x = ConnectionState{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_sdk_plugin_pb_backend_proto_msgTypes[48]
+		mi := &file_sdk_plugin_pb_backend_proto_msgTypes[47]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3316,7 +3229,7 @@ func (x *ConnectionState) String() string {
 func (*ConnectionState) ProtoMessage() {}
 
 func (x *ConnectionState) ProtoReflect() protoreflect.Message {
-	mi := &file_sdk_plugin_pb_backend_proto_msgTypes[48]
+	mi := &file_sdk_plugin_pb_backend_proto_msgTypes[47]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3329,7 +3242,7 @@ func (x *ConnectionState) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ConnectionState.ProtoReflect.Descriptor instead.
 func (*ConnectionState) Descriptor() ([]byte, []int) {
-	return file_sdk_plugin_pb_backend_proto_rawDescGZIP(), []int{48}
+	return file_sdk_plugin_pb_backend_proto_rawDescGZIP(), []int{47}
 }
 
 func (x *ConnectionState) GetVersion() uint32 {
@@ -3427,7 +3340,7 @@ type Certificate struct {
 func (x *Certificate) Reset() {
 	*x = Certificate{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_sdk_plugin_pb_backend_proto_msgTypes[49]
+		mi := &file_sdk_plugin_pb_backend_proto_msgTypes[48]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3440,7 +3353,7 @@ func (x *Certificate) String() string {
 func (*Certificate) ProtoMessage() {}
 
 func (x *Certificate) ProtoReflect() protoreflect.Message {
-	mi := &file_sdk_plugin_pb_backend_proto_msgTypes[49]
+	mi := &file_sdk_plugin_pb_backend_proto_msgTypes[48]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3453,7 +3366,7 @@ func (x *Certificate) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Certificate.ProtoReflect.Descriptor instead.
 func (*Certificate) Descriptor() ([]byte, []int) {
-	return file_sdk_plugin_pb_backend_proto_rawDescGZIP(), []int{49}
+	return file_sdk_plugin_pb_backend_proto_rawDescGZIP(), []int{48}
 }
 
 func (x *Certificate) GetAsn1Data() []byte {
@@ -3474,7 +3387,7 @@ type CertificateChain struct {
 func (x *CertificateChain) Reset() {
 	*x = CertificateChain{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_sdk_plugin_pb_backend_proto_msgTypes[50]
+		mi := &file_sdk_plugin_pb_backend_proto_msgTypes[49]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3487,7 +3400,7 @@ func (x *CertificateChain) String() string {
 func (*CertificateChain) ProtoMessage() {}
 
 func (x *CertificateChain) ProtoReflect() protoreflect.Message {
-	mi := &file_sdk_plugin_pb_backend_proto_msgTypes[50]
+	mi := &file_sdk_plugin_pb_backend_proto_msgTypes[49]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3500,7 +3413,7 @@ func (x *CertificateChain) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CertificateChain.ProtoReflect.Descriptor instead.
 func (*CertificateChain) Descriptor() ([]byte, []int) {
-	return file_sdk_plugin_pb_backend_proto_rawDescGZIP(), []int{50}
+	return file_sdk_plugin_pb_backend_proto_rawDescGZIP(), []int{49}
 }
 
 func (x *CertificateChain) GetCertificates() []*Certificate {
@@ -3510,61 +3423,6 @@ func (x *CertificateChain) GetCertificates() []*Certificate {
 	return nil
 }
 
-type SendEventRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	EventType string             `protobuf:"bytes,1,opt,name=event_type,json=eventType,proto3" json:"event_type,omitempty"`
-	Event     *logical.EventData `protobuf:"bytes,2,opt,name=event,proto3" json:"event,omitempty"`
-}
-
-func (x *SendEventRequest) Reset() {
-	*x = SendEventRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_sdk_plugin_pb_backend_proto_msgTypes[51]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *SendEventRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*SendEventRequest) ProtoMessage() {}
-
-func (x *SendEventRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_sdk_plugin_pb_backend_proto_msgTypes[51]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use SendEventRequest.ProtoReflect.Descriptor instead.
-func (*SendEventRequest) Descriptor() ([]byte, []int) {
-	return file_sdk_plugin_pb_backend_proto_rawDescGZIP(), []int{51}
-}
-
-func (x *SendEventRequest) GetEventType() string {
-	if x != nil {
-		return x.EventType
-	}
-	return ""
-}
-
-func (x *SendEventRequest) GetEvent() *logical.EventData {
-	if x != nil {
-		return x.Event
-	}
-	return nil
-}
-
 var File_sdk_plugin_pb_backend_proto protoreflect.FileDescriptor
 
 var file_sdk_plugin_pb_backend_proto_rawDesc = []byte{
@@ -3572,545 +3430,519 @@ var file_sdk_plugin_pb_backend_proto_rawDesc = []byte{
 	0x62, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x02, 0x70,
 	0x62, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
 	0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x1a, 0x17, 0x73, 0x64, 0x6b, 0x2f, 0x6c, 0x6f, 0x67, 0x69, 0x63, 0x61, 0x6c, 0x2f,
-	0x65, 0x76, 0x65, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1a, 0x73, 0x64, 0x6b,
-	0x2f, 0x6c, 0x6f, 0x67, 0x69, 0x63, 0x61, 0x6c, 0x2f, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74,
-	0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x18, 0x73, 0x64, 0x6b, 0x2f, 0x6c, 0x6f, 0x67,
-	0x69, 0x63, 0x61, 0x6c, 0x2f, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x22, 0x07, 0x0a, 0x05, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x20, 0x0a, 0x06, 0x48, 0x65,
-	0x61, 0x64, 0x65, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x01,
-	0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x22, 0x5b, 0x0a, 0x0a,
-	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x19, 0x0a, 0x08, 0x65, 0x72,
-	0x72, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x07, 0x65, 0x72,
-	0x72, 0x54, 0x79, 0x70, 0x65, 0x12, 0x17, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x5f, 0x6d, 0x73, 0x67,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 0x12, 0x19,
-	0x0a, 0x08, 0x65, 0x72, 0x72, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03,
-	0x52, 0x07, 0x65, 0x72, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x22, 0xce, 0x01, 0x0a, 0x05, 0x50, 0x61,
-	0x74, 0x68, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x6f, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28,
-	0x09, 0x52, 0x04, 0x72, 0x6f, 0x6f, 0x74, 0x12, 0x28, 0x0a, 0x0f, 0x75, 0x6e, 0x61, 0x75, 0x74,
-	0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09,
-	0x52, 0x0f, 0x75, 0x6e, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65,
-	0x64, 0x12, 0x23, 0x0a, 0x0d, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x61,
-	0x67, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x53,
-	0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x12, 0x2a, 0x0a, 0x11, 0x73, 0x65, 0x61, 0x6c, 0x5f, 0x77,
-	0x72, 0x61, 0x70, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x18, 0x04, 0x20, 0x03, 0x28,
-	0x09, 0x52, 0x0f, 0x73, 0x65, 0x61, 0x6c, 0x57, 0x72, 0x61, 0x70, 0x53, 0x74, 0x6f, 0x72, 0x61,
-	0x67, 0x65, 0x12, 0x36, 0x0a, 0x17, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x66, 0x6f, 0x72, 0x77,
-	0x61, 0x72, 0x64, 0x65, 0x64, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x18, 0x05, 0x20,
-	0x03, 0x28, 0x09, 0x52, 0x15, 0x77, 0x72, 0x69, 0x74, 0x65, 0x46, 0x6f, 0x72, 0x77, 0x61, 0x72,
-	0x64, 0x65, 0x64, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x22, 0xbf, 0x06, 0x0a, 0x07, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x2e, 0x0a, 0x12, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x12, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43,
-	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x1c, 0x0a, 0x09, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6f, 0x70, 0x65, 0x72, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x04, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61,
-	0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x22, 0x0a, 0x06,
-	0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x70,
-	0x62, 0x2e, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x52, 0x06, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74,
-	0x12, 0x1c, 0x0a, 0x04, 0x61, 0x75, 0x74, 0x68, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08,
-	0x2e, 0x70, 0x62, 0x2e, 0x41, 0x75, 0x74, 0x68, 0x52, 0x04, 0x61, 0x75, 0x74, 0x68, 0x12, 0x32,
-	0x0a, 0x07, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x18, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x48, 0x65, 0x61,
-	0x64, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x68, 0x65, 0x61, 0x64, 0x65,
-	0x72, 0x73, 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x6f, 0x6b,
-	0x65, 0x6e, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74,
-	0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x32, 0x0a, 0x15, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f,
-	0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x5f, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6f, 0x72, 0x18, 0x0a,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x13, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x6f, 0x6b, 0x65,
-	0x6e, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6f, 0x72, 0x12, 0x21, 0x0a, 0x0c, 0x64, 0x69, 0x73,
-	0x70, 0x6c, 0x61, 0x79, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0b, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1f, 0x0a, 0x0b,
-	0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x0a, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x1d, 0x0a,
-	0x0a, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x09, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x25, 0x0a, 0x0e,
-	0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6f, 0x72, 0x18, 0x0e,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x41, 0x63, 0x63, 0x65, 0x73,
-	0x73, 0x6f, 0x72, 0x12, 0x30, 0x0a, 0x09, 0x77, 0x72, 0x61, 0x70, 0x5f, 0x69, 0x6e, 0x66, 0x6f,
-	0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x57, 0x72, 0x61, 0x70, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x77, 0x72, 0x61,
-	0x70, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x3d, 0x0a, 0x1b, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f,
-	0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x5f, 0x72, 0x65, 0x6d, 0x61, 0x69, 0x6e, 0x69, 0x6e, 0x67, 0x5f,
-	0x75, 0x73, 0x65, 0x73, 0x18, 0x10, 0x20, 0x01, 0x28, 0x03, 0x52, 0x18, 0x63, 0x6c, 0x69, 0x65,
-	0x6e, 0x74, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x6d, 0x61, 0x69, 0x6e, 0x69, 0x6e, 0x67,
-	0x55, 0x73, 0x65, 0x73, 0x12, 0x1b, 0x0a, 0x09, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x5f, 0x69,
-	0x64, 0x18, 0x11, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x49,
-	0x64, 0x12, 0x27, 0x0a, 0x0f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x5f, 0x6f, 0x76, 0x65, 0x72,
-	0x72, 0x69, 0x64, 0x65, 0x18, 0x12, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x70, 0x6f, 0x6c, 0x69,
-	0x63, 0x79, 0x4f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x12, 0x28, 0x0a, 0x0f, 0x75, 0x6e,
-	0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, 0x18, 0x13, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x0f, 0x75, 0x6e, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63,
-	0x61, 0x74, 0x65, 0x64, 0x12, 0x2e, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69,
-	0x6f, 0x6e, 0x18, 0x14, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x6f,
-	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
-	0x74, 0x69, 0x6f, 0x6e, 0x1a, 0x46, 0x0a, 0x0c, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x45,
+	0x74, 0x6f, 0x1a, 0x1a, 0x73, 0x64, 0x6b, 0x2f, 0x6c, 0x6f, 0x67, 0x69, 0x63, 0x61, 0x6c, 0x2f,
+	0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x18,
+	0x73, 0x64, 0x6b, 0x2f, 0x6c, 0x6f, 0x67, 0x69, 0x63, 0x61, 0x6c, 0x2f, 0x70, 0x6c, 0x75, 0x67,
+	0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x07, 0x0a, 0x05, 0x45, 0x6d, 0x70, 0x74,
+	0x79, 0x22, 0x20, 0x0a, 0x06, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x68,
+	0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x61,
+	0x64, 0x65, 0x72, 0x22, 0x5b, 0x0a, 0x0a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f,
+	0x72, 0x12, 0x19, 0x0a, 0x08, 0x65, 0x72, 0x72, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x0d, 0x52, 0x07, 0x65, 0x72, 0x72, 0x54, 0x79, 0x70, 0x65, 0x12, 0x17, 0x0a, 0x07,
+	0x65, 0x72, 0x72, 0x5f, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65,
+	0x72, 0x72, 0x4d, 0x73, 0x67, 0x12, 0x19, 0x0a, 0x08, 0x65, 0x72, 0x72, 0x5f, 0x63, 0x6f, 0x64,
+	0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x65, 0x72, 0x72, 0x43, 0x6f, 0x64, 0x65,
+	0x22, 0x96, 0x01, 0x0a, 0x05, 0x50, 0x61, 0x74, 0x68, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x6f,
+	0x6f, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x72, 0x6f, 0x6f, 0x74, 0x12, 0x28,
+	0x0a, 0x0f, 0x75, 0x6e, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65,
+	0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0f, 0x75, 0x6e, 0x61, 0x75, 0x74, 0x68, 0x65,
+	0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, 0x12, 0x23, 0x0a, 0x0d, 0x6c, 0x6f, 0x63, 0x61,
+	0x6c, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52,
+	0x0c, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x12, 0x2a, 0x0a,
+	0x11, 0x73, 0x65, 0x61, 0x6c, 0x5f, 0x77, 0x72, 0x61, 0x70, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x61,
+	0x67, 0x65, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0f, 0x73, 0x65, 0x61, 0x6c, 0x57, 0x72,
+	0x61, 0x70, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x22, 0xbf, 0x06, 0x0a, 0x07, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x2e, 0x0a, 0x12, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x12, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6c,
+	0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x1c, 0x0a, 0x09, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18,
+	0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x22, 0x0a, 0x06, 0x73,
+	0x65, 0x63, 0x72, 0x65, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x70, 0x62,
+	0x2e, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x52, 0x06, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x12,
+	0x1c, 0x0a, 0x04, 0x61, 0x75, 0x74, 0x68, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e,
+	0x70, 0x62, 0x2e, 0x41, 0x75, 0x74, 0x68, 0x52, 0x04, 0x61, 0x75, 0x74, 0x68, 0x12, 0x32, 0x0a,
+	0x07, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18,
+	0x2e, 0x70, 0x62, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x48, 0x65, 0x61, 0x64,
+	0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72,
+	0x73, 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x6f, 0x6b, 0x65,
+	0x6e, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x54,
+	0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x32, 0x0a, 0x15, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x74,
+	0x6f, 0x6b, 0x65, 0x6e, 0x5f, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6f, 0x72, 0x18, 0x0a, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x13, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x6f, 0x6b, 0x65, 0x6e,
+	0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6f, 0x72, 0x12, 0x21, 0x0a, 0x0c, 0x64, 0x69, 0x73, 0x70,
+	0x6c, 0x61, 0x79, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b,
+	0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x6d,
+	0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x0a, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x1d, 0x0a, 0x0a,
+	0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x09, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x25, 0x0a, 0x0e, 0x6d,
+	0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6f, 0x72, 0x18, 0x0e, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x0d, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73,
+	0x6f, 0x72, 0x12, 0x30, 0x0a, 0x09, 0x77, 0x72, 0x61, 0x70, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18,
+	0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x57, 0x72, 0x61, 0x70, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x77, 0x72, 0x61, 0x70,
+	0x49, 0x6e, 0x66, 0x6f, 0x12, 0x3d, 0x0a, 0x1b, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x74,
+	0x6f, 0x6b, 0x65, 0x6e, 0x5f, 0x72, 0x65, 0x6d, 0x61, 0x69, 0x6e, 0x69, 0x6e, 0x67, 0x5f, 0x75,
+	0x73, 0x65, 0x73, 0x18, 0x10, 0x20, 0x01, 0x28, 0x03, 0x52, 0x18, 0x63, 0x6c, 0x69, 0x65, 0x6e,
+	0x74, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x6d, 0x61, 0x69, 0x6e, 0x69, 0x6e, 0x67, 0x55,
+	0x73, 0x65, 0x73, 0x12, 0x1b, 0x0a, 0x09, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x5f, 0x69, 0x64,
+	0x18, 0x11, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x49, 0x64,
+	0x12, 0x27, 0x0a, 0x0f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x5f, 0x6f, 0x76, 0x65, 0x72, 0x72,
+	0x69, 0x64, 0x65, 0x18, 0x12, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x70, 0x6f, 0x6c, 0x69, 0x63,
+	0x79, 0x4f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x12, 0x28, 0x0a, 0x0f, 0x75, 0x6e, 0x61,
+	0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, 0x18, 0x13, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x0f, 0x75, 0x6e, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61,
+	0x74, 0x65, 0x64, 0x12, 0x2e, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f,
+	0x6e, 0x18, 0x14, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x6f, 0x6e,
+	0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
+	0x69, 0x6f, 0x6e, 0x1a, 0x46, 0x0a, 0x0c, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x45, 0x6e,
+	0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x20, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x70, 0x62, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72,
+	0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xe6, 0x05, 0x0a, 0x04,
+	0x41, 0x75, 0x74, 0x68, 0x12, 0x35, 0x0a, 0x0d, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x5f, 0x6f, 0x70,
+	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x70, 0x62,
+	0x2e, 0x4c, 0x65, 0x61, 0x73, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x0c, 0x6c,
+	0x65, 0x61, 0x73, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x69,
+	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x0c, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x44, 0x61, 0x74, 0x61,
+	0x12, 0x21, 0x0a, 0x0c, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x5f, 0x6e, 0x61, 0x6d, 0x65,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e,
+	0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x18,
+	0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x12,
+	0x32, 0x0a, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x05, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x16, 0x2e, 0x70, 0x62, 0x2e, 0x41, 0x75, 0x74, 0x68, 0x2e, 0x4d, 0x65, 0x74, 0x61,
+	0x64, 0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64,
+	0x61, 0x74, 0x61, 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x6f,
+	0x6b, 0x65, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6c, 0x69, 0x65, 0x6e,
+	0x74, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73,
+	0x6f, 0x72, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73,
+	0x6f, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x18, 0x08, 0x20, 0x01,
+	0x28, 0x03, 0x52, 0x06, 0x70, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x12, 0x19, 0x0a, 0x08, 0x6e, 0x75,
+	0x6d, 0x5f, 0x75, 0x73, 0x65, 0x73, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x6e, 0x75,
+	0x6d, 0x55, 0x73, 0x65, 0x73, 0x12, 0x1b, 0x0a, 0x09, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x5f,
+	0x69, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79,
+	0x49, 0x64, 0x12, 0x24, 0x0a, 0x05, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x0b, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x0e, 0x2e, 0x6c, 0x6f, 0x67, 0x69, 0x63, 0x61, 0x6c, 0x2e, 0x41, 0x6c, 0x69, 0x61,
+	0x73, 0x52, 0x05, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x12, 0x33, 0x0a, 0x0d, 0x67, 0x72, 0x6f, 0x75,
+	0x70, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x65, 0x73, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x0e, 0x2e, 0x6c, 0x6f, 0x67, 0x69, 0x63, 0x61, 0x6c, 0x2e, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x52,
+	0x0c, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x65, 0x73, 0x12, 0x1f, 0x0a,
+	0x0b, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x63, 0x69, 0x64, 0x72, 0x73, 0x18, 0x0d, 0x20, 0x03,
+	0x28, 0x09, 0x52, 0x0a, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x43, 0x69, 0x64, 0x72, 0x73, 0x12, 0x25,
+	0x0a, 0x0e, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73,
+	0x18, 0x0e, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x50, 0x6f, 0x6c,
+	0x69, 0x63, 0x69, 0x65, 0x73, 0x12, 0x2b, 0x0a, 0x11, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74,
+	0x79, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x18, 0x0f, 0x20, 0x03, 0x28, 0x09,
+	0x52, 0x10, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x69,
+	0x65, 0x73, 0x12, 0x28, 0x0a, 0x10, 0x65, 0x78, 0x70, 0x6c, 0x69, 0x63, 0x69, 0x74, 0x5f, 0x6d,
+	0x61, 0x78, 0x5f, 0x74, 0x74, 0x6c, 0x18, 0x10, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0e, 0x65, 0x78,
+	0x70, 0x6c, 0x69, 0x63, 0x69, 0x74, 0x4d, 0x61, 0x78, 0x54, 0x74, 0x6c, 0x12, 0x1d, 0x0a, 0x0a,
+	0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x11, 0x20, 0x01, 0x28, 0x0d,
+	0x52, 0x09, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x2a, 0x0a, 0x11, 0x6e,
+	0x6f, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79,
+	0x18, 0x12, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0f, 0x6e, 0x6f, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c,
+	0x74, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x1a, 0x3b, 0x0a, 0x0d, 0x4d, 0x65, 0x74, 0x61, 0x64,
+	0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61,
+	0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
+	0x3a, 0x02, 0x38, 0x01, 0x22, 0xa9, 0x06, 0x0a, 0x0a, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x45, 0x6e,
+	0x74, 0x72, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x02, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6f, 0x72, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6f, 0x72, 0x12,
+	0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x06, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x6f, 0x6c, 0x69, 0x63,
+	0x69, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x70, 0x6f, 0x6c, 0x69, 0x63,
+	0x69, 0x65, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x05, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x2c, 0x0a, 0x04, 0x6d, 0x65, 0x74, 0x61, 0x18,
+	0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x70, 0x62, 0x2e, 0x54, 0x6f, 0x6b, 0x65, 0x6e,
+	0x45, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
+	0x04, 0x6d, 0x65, 0x74, 0x61, 0x12, 0x21, 0x0a, 0x0c, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79,
+	0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x69, 0x73,
+	0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x19, 0x0a, 0x08, 0x6e, 0x75, 0x6d, 0x5f,
+	0x75, 0x73, 0x65, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x6e, 0x75, 0x6d, 0x55,
+	0x73, 0x65, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f,
+	0x74, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x63, 0x72, 0x65, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x74, 0x6c, 0x18,
+	0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x74, 0x74, 0x6c, 0x12, 0x28, 0x0a, 0x10, 0x65, 0x78,
+	0x70, 0x6c, 0x69, 0x63, 0x69, 0x74, 0x5f, 0x6d, 0x61, 0x78, 0x5f, 0x74, 0x74, 0x6c, 0x18, 0x0b,
+	0x20, 0x01, 0x28, 0x03, 0x52, 0x0e, 0x65, 0x78, 0x70, 0x6c, 0x69, 0x63, 0x69, 0x74, 0x4d, 0x61,
+	0x78, 0x54, 0x74, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x18, 0x0c, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x65, 0x72, 0x69,
+	0x6f, 0x64, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x70, 0x65, 0x72, 0x69, 0x6f, 0x64,
+	0x12, 0x1b, 0x0a, 0x09, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x5f, 0x69, 0x64, 0x18, 0x0e, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x08, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x49, 0x64, 0x12, 0x1f, 0x0a,
+	0x0b, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x63, 0x69, 0x64, 0x72, 0x73, 0x18, 0x0f, 0x20, 0x03,
+	0x28, 0x09, 0x52, 0x0a, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x43, 0x69, 0x64, 0x72, 0x73, 0x12, 0x21,
+	0x0a, 0x0c, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x10,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x49,
+	0x64, 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x75, 0x62, 0x62, 0x79, 0x68, 0x6f, 0x6c, 0x65, 0x5f, 0x69,
+	0x64, 0x18, 0x11, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x75, 0x62, 0x62, 0x79, 0x68, 0x6f,
+	0x6c, 0x65, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x12, 0x20, 0x01,
+	0x28, 0x0d, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x45, 0x0a, 0x0d, 0x69, 0x6e, 0x74, 0x65,
+	0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x18, 0x13, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x20, 0x2e, 0x70, 0x62, 0x2e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x2e,
+	0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72,
+	0x79, 0x52, 0x0c, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x4d, 0x65, 0x74, 0x61, 0x12,
+	0x23, 0x0a, 0x0d, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79,
+	0x18, 0x14, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x50, 0x6f,
+	0x6c, 0x69, 0x63, 0x79, 0x12, 0x30, 0x0a, 0x14, 0x6e, 0x6f, 0x5f, 0x69, 0x64, 0x65, 0x6e, 0x74,
+	0x69, 0x74, 0x79, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x18, 0x15, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x12, 0x6e, 0x6f, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x50, 0x6f,
+	0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x1a, 0x37, 0x0a, 0x09, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e,
+	0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a,
+	0x3f, 0x0a, 0x11, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x4d, 0x65, 0x74, 0x61, 0x45,
 	0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x20, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x70, 0x62, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65,
-	0x72, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xe6, 0x05, 0x0a,
-	0x04, 0x41, 0x75, 0x74, 0x68, 0x12, 0x35, 0x0a, 0x0d, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x5f, 0x6f,
-	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x70,
-	0x62, 0x2e, 0x4c, 0x65, 0x61, 0x73, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x0c,
-	0x6c, 0x65, 0x61, 0x73, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x23, 0x0a, 0x0d,
-	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0c, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x44, 0x61, 0x74,
-	0x61, 0x12, 0x21, 0x0a, 0x0c, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x5f, 0x6e, 0x61, 0x6d,
-	0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79,
-	0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73,
-	0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73,
-	0x12, 0x32, 0x0a, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x05, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x16, 0x2e, 0x70, 0x62, 0x2e, 0x41, 0x75, 0x74, 0x68, 0x2e, 0x4d, 0x65, 0x74,
-	0x61, 0x64, 0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6d, 0x65, 0x74, 0x61,
-	0x64, 0x61, 0x74, 0x61, 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x74,
-	0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6c, 0x69, 0x65,
-	0x6e, 0x74, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x63, 0x63, 0x65, 0x73,
-	0x73, 0x6f, 0x72, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x61, 0x63, 0x63, 0x65, 0x73,
-	0x73, 0x6f, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x18, 0x08, 0x20,
-	0x01, 0x28, 0x03, 0x52, 0x06, 0x70, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x12, 0x19, 0x0a, 0x08, 0x6e,
-	0x75, 0x6d, 0x5f, 0x75, 0x73, 0x65, 0x73, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x6e,
-	0x75, 0x6d, 0x55, 0x73, 0x65, 0x73, 0x12, 0x1b, 0x0a, 0x09, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79,
-	0x5f, 0x69, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x65, 0x6e, 0x74, 0x69, 0x74,
-	0x79, 0x49, 0x64, 0x12, 0x24, 0x0a, 0x05, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x0b, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x6c, 0x6f, 0x67, 0x69, 0x63, 0x61, 0x6c, 0x2e, 0x41, 0x6c, 0x69,
-	0x61, 0x73, 0x52, 0x05, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x12, 0x33, 0x0a, 0x0d, 0x67, 0x72, 0x6f,
-	0x75, 0x70, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x65, 0x73, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x0e, 0x2e, 0x6c, 0x6f, 0x67, 0x69, 0x63, 0x61, 0x6c, 0x2e, 0x41, 0x6c, 0x69, 0x61, 0x73,
-	0x52, 0x0c, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x65, 0x73, 0x12, 0x1f,
-	0x0a, 0x0b, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x63, 0x69, 0x64, 0x72, 0x73, 0x18, 0x0d, 0x20,
-	0x03, 0x28, 0x09, 0x52, 0x0a, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x43, 0x69, 0x64, 0x72, 0x73, 0x12,
-	0x25, 0x0a, 0x0e, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65,
-	0x73, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x50, 0x6f,
-	0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x12, 0x2b, 0x0a, 0x11, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69,
-	0x74, 0x79, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x18, 0x0f, 0x20, 0x03, 0x28,
-	0x09, 0x52, 0x10, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63,
-	0x69, 0x65, 0x73, 0x12, 0x28, 0x0a, 0x10, 0x65, 0x78, 0x70, 0x6c, 0x69, 0x63, 0x69, 0x74, 0x5f,
-	0x6d, 0x61, 0x78, 0x5f, 0x74, 0x74, 0x6c, 0x18, 0x10, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0e, 0x65,
-	0x78, 0x70, 0x6c, 0x69, 0x63, 0x69, 0x74, 0x4d, 0x61, 0x78, 0x54, 0x74, 0x6c, 0x12, 0x1d, 0x0a,
-	0x0a, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x11, 0x20, 0x01, 0x28,
-	0x0d, 0x52, 0x09, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x2a, 0x0a, 0x11,
-	0x6e, 0x6f, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63,
-	0x79, 0x18, 0x12, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0f, 0x6e, 0x6f, 0x44, 0x65, 0x66, 0x61, 0x75,
-	0x6c, 0x74, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x1a, 0x3b, 0x0a, 0x0d, 0x4d, 0x65, 0x74, 0x61,
-	0x64, 0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xca, 0x06, 0x0a, 0x0a, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x45,
-	0x6e, 0x74, 0x72, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x02, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6f, 0x72,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6f, 0x72,
-	0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x06, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x6f, 0x6c, 0x69,
-	0x63, 0x69, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x70, 0x6f, 0x6c, 0x69,
-	0x63, 0x69, 0x65, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x05, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x2c, 0x0a, 0x04, 0x6d, 0x65, 0x74, 0x61,
-	0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x70, 0x62, 0x2e, 0x54, 0x6f, 0x6b, 0x65,
-	0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79,
-	0x52, 0x04, 0x6d, 0x65, 0x74, 0x61, 0x12, 0x21, 0x0a, 0x0c, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61,
-	0x79, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x69,
-	0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x19, 0x0a, 0x08, 0x6e, 0x75, 0x6d,
-	0x5f, 0x75, 0x73, 0x65, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x6e, 0x75, 0x6d,
-	0x55, 0x73, 0x65, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x63, 0x72, 0x65,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x74, 0x6c,
-	0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x74, 0x74, 0x6c, 0x12, 0x28, 0x0a, 0x10, 0x65,
-	0x78, 0x70, 0x6c, 0x69, 0x63, 0x69, 0x74, 0x5f, 0x6d, 0x61, 0x78, 0x5f, 0x74, 0x74, 0x6c, 0x18,
-	0x0b, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0e, 0x65, 0x78, 0x70, 0x6c, 0x69, 0x63, 0x69, 0x74, 0x4d,
-	0x61, 0x78, 0x54, 0x74, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x18, 0x0c, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x65, 0x72,
-	0x69, 0x6f, 0x64, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x70, 0x65, 0x72, 0x69, 0x6f,
-	0x64, 0x12, 0x1b, 0x0a, 0x09, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x5f, 0x69, 0x64, 0x18, 0x0e,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x49, 0x64, 0x12, 0x1f,
-	0x0a, 0x0b, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x63, 0x69, 0x64, 0x72, 0x73, 0x18, 0x0f, 0x20,
-	0x03, 0x28, 0x09, 0x52, 0x0a, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x43, 0x69, 0x64, 0x72, 0x73, 0x12,
-	0x21, 0x0a, 0x0c, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18,
-	0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65,
-	0x49, 0x64, 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x75, 0x62, 0x62, 0x79, 0x68, 0x6f, 0x6c, 0x65, 0x5f,
-	0x69, 0x64, 0x18, 0x11, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x75, 0x62, 0x62, 0x79, 0x68,
-	0x6f, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x12, 0x20,
-	0x01, 0x28, 0x0d, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x45, 0x0a, 0x0d, 0x69, 0x6e, 0x74,
-	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x18, 0x13, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x20, 0x2e, 0x70, 0x62, 0x2e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79,
-	0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74,
-	0x72, 0x79, 0x52, 0x0c, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x4d, 0x65, 0x74, 0x61,
-	0x12, 0x23, 0x0a, 0x0d, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63,
-	0x79, 0x18, 0x14, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x50,
-	0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x30, 0x0a, 0x14, 0x6e, 0x6f, 0x5f, 0x69, 0x64, 0x65, 0x6e,
-	0x74, 0x69, 0x74, 0x79, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x18, 0x15, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x12, 0x6e, 0x6f, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x50,
-	0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x65, 0x78, 0x74, 0x65, 0x72,
-	0x6e, 0x61, 0x6c, 0x5f, 0x69, 0x64, 0x18, 0x16, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x65, 0x78,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x49, 0x64, 0x1a, 0x37, 0x0a, 0x09, 0x4d, 0x65, 0x74, 0x61,
-	0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
-	0x01, 0x1a, 0x3f, 0x0a, 0x11, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x4d, 0x65, 0x74,
-	0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
+	0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
+	0x22, 0xaf, 0x01, 0x0a, 0x0c, 0x4c, 0x65, 0x61, 0x73, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
+	0x73, 0x12, 0x10, 0x0a, 0x03, 0x54, 0x54, 0x4c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03,
+	0x54, 0x54, 0x4c, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x6e, 0x65, 0x77, 0x61, 0x62, 0x6c, 0x65,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x72, 0x65, 0x6e, 0x65, 0x77, 0x61, 0x62, 0x6c,
+	0x65, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x69, 0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x12,
+	0x39, 0x0a, 0x0a, 0x69, 0x73, 0x73, 0x75, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52,
+	0x09, 0x69, 0x73, 0x73, 0x75, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x4d, 0x61,
+	0x78, 0x54, 0x54, 0x4c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x4d, 0x61, 0x78, 0x54,
+	0x54, 0x4c, 0x22, 0x7f, 0x0a, 0x06, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x12, 0x35, 0x0a, 0x0d,
+	0x6c, 0x65, 0x61, 0x73, 0x65, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x70, 0x62, 0x2e, 0x4c, 0x65, 0x61, 0x73, 0x65, 0x4f, 0x70,
+	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x0c, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x4f, 0x70, 0x74, 0x69,
+	0x6f, 0x6e, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f,
+	0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x69, 0x6e, 0x74, 0x65,
+	0x72, 0x6e, 0x61, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x12, 0x19, 0x0a, 0x08, 0x6c, 0x65, 0x61, 0x73,
+	0x65, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6c, 0x65, 0x61, 0x73,
+	0x65, 0x49, 0x64, 0x22, 0xc8, 0x02, 0x0a, 0x08, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x12, 0x22, 0x0a, 0x06, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x0a, 0x2e, 0x70, 0x62, 0x2e, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x52, 0x06, 0x73, 0x65,
+	0x63, 0x72, 0x65, 0x74, 0x12, 0x1c, 0x0a, 0x04, 0x61, 0x75, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x08, 0x2e, 0x70, 0x62, 0x2e, 0x41, 0x75, 0x74, 0x68, 0x52, 0x04, 0x61, 0x75,
+	0x74, 0x68, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65,
+	0x63, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65,
+	0x63, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x77, 0x61, 0x72, 0x6e, 0x69, 0x6e, 0x67, 0x73, 0x18, 0x05,
+	0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x77, 0x61, 0x72, 0x6e, 0x69, 0x6e, 0x67, 0x73, 0x12, 0x31,
+	0x0a, 0x09, 0x77, 0x72, 0x61, 0x70, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x06, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x14, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x57,
+	0x72, 0x61, 0x70, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x77, 0x72, 0x61, 0x70, 0x49, 0x6e, 0x66,
+	0x6f, 0x12, 0x33, 0x0a, 0x07, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x07, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x19, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x68,
+	0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x1a, 0x46, 0x0a, 0x0c, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72,
+	0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x20, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
+	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x70, 0x62, 0x2e, 0x48, 0x65, 0x61,
+	0x64, 0x65, 0x72, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xc8,
+	0x02, 0x0a, 0x10, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x57, 0x72, 0x61, 0x70, 0x49,
+	0x6e, 0x66, 0x6f, 0x12, 0x10, 0x0a, 0x03, 0x54, 0x54, 0x4c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03,
+	0x52, 0x03, 0x54, 0x54, 0x4c, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x61,
+	0x63, 0x63, 0x65, 0x73, 0x73, 0x6f, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x61,
+	0x63, 0x63, 0x65, 0x73, 0x73, 0x6f, 0x72, 0x12, 0x3f, 0x0a, 0x0d, 0x63, 0x72, 0x65, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a,
+	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
+	0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0c, 0x63, 0x72, 0x65, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x29, 0x0a, 0x10, 0x77, 0x72, 0x61, 0x70,
+	0x70, 0x65, 0x64, 0x5f, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6f, 0x72, 0x18, 0x05, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x0f, 0x77, 0x72, 0x61, 0x70, 0x70, 0x65, 0x64, 0x41, 0x63, 0x63, 0x65, 0x73,
+	0x73, 0x6f, 0x72, 0x12, 0x2a, 0x0a, 0x11, 0x77, 0x72, 0x61, 0x70, 0x70, 0x65, 0x64, 0x5f, 0x65,
+	0x6e, 0x74, 0x69, 0x74, 0x79, 0x5f, 0x69, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f,
+	0x77, 0x72, 0x61, 0x70, 0x70, 0x65, 0x64, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x49, 0x64, 0x12,
+	0x16, 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x23, 0x0a, 0x0d, 0x63, 0x72, 0x65, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c,
+	0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x61, 0x74, 0x68, 0x12, 0x1b, 0x0a, 0x09,
+	0x73, 0x65, 0x61, 0x6c, 0x5f, 0x77, 0x72, 0x61, 0x70, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x08, 0x73, 0x65, 0x61, 0x6c, 0x57, 0x72, 0x61, 0x70, 0x22, 0x58, 0x0a, 0x0f, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x57, 0x72, 0x61, 0x70, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x10, 0x0a, 0x03,
+	0x54, 0x54, 0x4c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x54, 0x54, 0x4c, 0x12, 0x16,
+	0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
+	0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x1b, 0x0a, 0x09, 0x73, 0x65, 0x61, 0x6c, 0x5f, 0x77,
+	0x72, 0x61, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x73, 0x65, 0x61, 0x6c, 0x57,
+	0x72, 0x61, 0x70, 0x22, 0x59, 0x0a, 0x11, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x41, 0x72, 0x67, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x73, 0x74, 0x6f, 0x72,
+	0x61, 0x67, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x09, 0x73, 0x74,
+	0x6f, 0x72, 0x61, 0x67, 0x65, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x07, 0x72, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x07, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x60,
+	0x0a, 0x12, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52,
+	0x65, 0x70, 0x6c, 0x79, 0x12, 0x28, 0x0a, 0x08, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x52, 0x08, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x20,
+	0x0a, 0x03, 0x65, 0x72, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x70, 0x62,
+	0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x03, 0x65, 0x72, 0x72,
+	0x22, 0x10, 0x0a, 0x0e, 0x49, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x41, 0x72,
+	0x67, 0x73, 0x22, 0x33, 0x0a, 0x0f, 0x49, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x65,
+	0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x20, 0x0a, 0x03, 0x65, 0x72, 0x72, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x70, 0x62, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72,
+	0x6f, 0x72, 0x52, 0x03, 0x65, 0x72, 0x72, 0x22, 0x34, 0x0a, 0x11, 0x53, 0x70, 0x65, 0x63, 0x69,
+	0x61, 0x6c, 0x50, 0x61, 0x74, 0x68, 0x73, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x1f, 0x0a, 0x05,
+	0x70, 0x61, 0x74, 0x68, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x70, 0x62,
+	0x2e, 0x50, 0x61, 0x74, 0x68, 0x73, 0x52, 0x05, 0x70, 0x61, 0x74, 0x68, 0x73, 0x22, 0x60, 0x0a,
+	0x18, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x45, 0x78, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x63, 0x65,
+	0x43, 0x68, 0x65, 0x63, 0x6b, 0x41, 0x72, 0x67, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x73, 0x74, 0x6f,
+	0x72, 0x61, 0x67, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x09, 0x73,
+	0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x07, 0x72, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x70, 0x62, 0x2e, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x07, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22,
+	0x76, 0x0a, 0x19, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x45, 0x78, 0x69, 0x73, 0x74, 0x65, 0x6e,
+	0x63, 0x65, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x1f, 0x0a, 0x0b,
+	0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x08, 0x52, 0x0a, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x16, 0x0a,
+	0x06, 0x65, 0x78, 0x69, 0x73, 0x74, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x65,
+	0x78, 0x69, 0x73, 0x74, 0x73, 0x12, 0x20, 0x0a, 0x03, 0x65, 0x72, 0x72, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x70, 0x62, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72,
+	0x6f, 0x72, 0x52, 0x03, 0x65, 0x72, 0x72, 0x22, 0xb8, 0x01, 0x0a, 0x09, 0x53, 0x65, 0x74, 0x75,
+	0x70, 0x41, 0x72, 0x67, 0x73, 0x12, 0x1b, 0x0a, 0x09, 0x62, 0x72, 0x6f, 0x6b, 0x65, 0x72, 0x5f,
+	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, 0x62, 0x72, 0x6f, 0x6b, 0x65, 0x72,
+	0x49, 0x64, 0x12, 0x31, 0x0a, 0x06, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x02, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x19, 0x2e, 0x70, 0x62, 0x2e, 0x53, 0x65, 0x74, 0x75, 0x70, 0x41, 0x72, 0x67,
+	0x73, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x43,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x20, 0x0a, 0x0b, 0x62, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64,
+	0x55, 0x55, 0x49, 0x44, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x62, 0x61, 0x63, 0x6b,
+	0x65, 0x6e, 0x64, 0x55, 0x55, 0x49, 0x44, 0x1a, 0x39, 0x0a, 0x0b, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
 	0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
 	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
-	0x38, 0x01, 0x22, 0xaf, 0x01, 0x0a, 0x0c, 0x4c, 0x65, 0x61, 0x73, 0x65, 0x4f, 0x70, 0x74, 0x69,
-	0x6f, 0x6e, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x54, 0x54, 0x4c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03,
-	0x52, 0x03, 0x54, 0x54, 0x4c, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x6e, 0x65, 0x77, 0x61, 0x62,
-	0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x72, 0x65, 0x6e, 0x65, 0x77, 0x61,
-	0x62, 0x6c, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x69, 0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e,
-	0x74, 0x12, 0x39, 0x0a, 0x0a, 0x69, 0x73, 0x73, 0x75, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d,
-	0x70, 0x52, 0x09, 0x69, 0x73, 0x73, 0x75, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06,
-	0x4d, 0x61, 0x78, 0x54, 0x54, 0x4c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x4d, 0x61,
-	0x78, 0x54, 0x54, 0x4c, 0x22, 0x7f, 0x0a, 0x06, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x12, 0x35,
-	0x0a, 0x0d, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x70, 0x62, 0x2e, 0x4c, 0x65, 0x61, 0x73, 0x65,
-	0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x0c, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x4f, 0x70,
-	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
-	0x6c, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x12, 0x19, 0x0a, 0x08, 0x6c, 0x65,
-	0x61, 0x73, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6c, 0x65,
-	0x61, 0x73, 0x65, 0x49, 0x64, 0x22, 0xc8, 0x02, 0x0a, 0x08, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x12, 0x22, 0x0a, 0x06, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x70, 0x62, 0x2e, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x52, 0x06,
-	0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x12, 0x1c, 0x0a, 0x04, 0x61, 0x75, 0x74, 0x68, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x70, 0x62, 0x2e, 0x41, 0x75, 0x74, 0x68, 0x52, 0x04,
-	0x61, 0x75, 0x74, 0x68, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x64, 0x69,
-	0x72, 0x65, 0x63, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x72, 0x65, 0x64, 0x69,
-	0x72, 0x65, 0x63, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x77, 0x61, 0x72, 0x6e, 0x69, 0x6e, 0x67, 0x73,
-	0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x77, 0x61, 0x72, 0x6e, 0x69, 0x6e, 0x67, 0x73,
-	0x12, 0x31, 0x0a, 0x09, 0x77, 0x72, 0x61, 0x70, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x06, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x57, 0x72, 0x61, 0x70, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x77, 0x72, 0x61, 0x70, 0x49,
-	0x6e, 0x66, 0x6f, 0x12, 0x33, 0x0a, 0x07, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x07,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
-	0x07, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x1a, 0x46, 0x0a, 0x0c, 0x48, 0x65, 0x61, 0x64,
-	0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x20, 0x0a, 0x05, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x70, 0x62, 0x2e, 0x48,
-	0x65, 0x61, 0x64, 0x65, 0x72, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
-	0x22, 0xc8, 0x02, 0x0a, 0x10, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x57, 0x72, 0x61,
-	0x70, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x10, 0x0a, 0x03, 0x54, 0x54, 0x4c, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x03, 0x52, 0x03, 0x54, 0x54, 0x4c, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x1a, 0x0a,
-	0x08, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6f, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x08, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6f, 0x72, 0x12, 0x3f, 0x0a, 0x0d, 0x63, 0x72, 0x65,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
-	0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0c, 0x63, 0x72,
-	0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x29, 0x0a, 0x10, 0x77, 0x72,
-	0x61, 0x70, 0x70, 0x65, 0x64, 0x5f, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6f, 0x72, 0x18, 0x05,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x77, 0x72, 0x61, 0x70, 0x70, 0x65, 0x64, 0x41, 0x63, 0x63,
-	0x65, 0x73, 0x73, 0x6f, 0x72, 0x12, 0x2a, 0x0a, 0x11, 0x77, 0x72, 0x61, 0x70, 0x70, 0x65, 0x64,
-	0x5f, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x5f, 0x69, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x0f, 0x77, 0x72, 0x61, 0x70, 0x70, 0x65, 0x64, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x49,
-	0x64, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x23, 0x0a, 0x0d, 0x63, 0x72, 0x65,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x0c, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x61, 0x74, 0x68, 0x12, 0x1b,
-	0x0a, 0x09, 0x73, 0x65, 0x61, 0x6c, 0x5f, 0x77, 0x72, 0x61, 0x70, 0x18, 0x09, 0x20, 0x01, 0x28,
-	0x08, 0x52, 0x08, 0x73, 0x65, 0x61, 0x6c, 0x57, 0x72, 0x61, 0x70, 0x22, 0x58, 0x0a, 0x0f, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x57, 0x72, 0x61, 0x70, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x10,
-	0x0a, 0x03, 0x54, 0x54, 0x4c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x54, 0x54, 0x4c,
-	0x12, 0x16, 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x1b, 0x0a, 0x09, 0x73, 0x65, 0x61, 0x6c,
-	0x5f, 0x77, 0x72, 0x61, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x73, 0x65, 0x61,
-	0x6c, 0x57, 0x72, 0x61, 0x70, 0x22, 0x59, 0x0a, 0x11, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x41, 0x72, 0x67, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x73, 0x74,
-	0x6f, 0x72, 0x61, 0x67, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x09,
-	0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x07, 0x72, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x70, 0x62, 0x2e,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x07, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x22, 0x60, 0x0a, 0x12, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x28, 0x0a, 0x08, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x52, 0x08, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x12, 0x20, 0x0a, 0x03, 0x65, 0x72, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e,
-	0x70, 0x62, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x03, 0x65,
-	0x72, 0x72, 0x22, 0x10, 0x0a, 0x0e, 0x49, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x65,
-	0x41, 0x72, 0x67, 0x73, 0x22, 0x33, 0x0a, 0x0f, 0x49, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x69,
-	0x7a, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x20, 0x0a, 0x03, 0x65, 0x72, 0x72, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x70, 0x62, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45,
-	0x72, 0x72, 0x6f, 0x72, 0x52, 0x03, 0x65, 0x72, 0x72, 0x22, 0x34, 0x0a, 0x11, 0x53, 0x70, 0x65,
-	0x63, 0x69, 0x61, 0x6c, 0x50, 0x61, 0x74, 0x68, 0x73, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x1f,
-	0x0a, 0x05, 0x70, 0x61, 0x74, 0x68, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e,
-	0x70, 0x62, 0x2e, 0x50, 0x61, 0x74, 0x68, 0x73, 0x52, 0x05, 0x70, 0x61, 0x74, 0x68, 0x73, 0x22,
-	0x60, 0x0a, 0x18, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x45, 0x78, 0x69, 0x73, 0x74, 0x65, 0x6e,
-	0x63, 0x65, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x41, 0x72, 0x67, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x73,
-	0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52,
-	0x09, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x07, 0x72, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x70, 0x62,
-	0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x07, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x22, 0x76, 0x0a, 0x19, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x45, 0x78, 0x69, 0x73, 0x74,
-	0x65, 0x6e, 0x63, 0x65, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x1f,
-	0x0a, 0x0b, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x0a, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x12,
-	0x16, 0x0a, 0x06, 0x65, 0x78, 0x69, 0x73, 0x74, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x06, 0x65, 0x78, 0x69, 0x73, 0x74, 0x73, 0x12, 0x20, 0x0a, 0x03, 0x65, 0x72, 0x72, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x70, 0x62, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45,
-	0x72, 0x72, 0x6f, 0x72, 0x52, 0x03, 0x65, 0x72, 0x72, 0x22, 0xb8, 0x01, 0x0a, 0x09, 0x53, 0x65,
-	0x74, 0x75, 0x70, 0x41, 0x72, 0x67, 0x73, 0x12, 0x1b, 0x0a, 0x09, 0x62, 0x72, 0x6f, 0x6b, 0x65,
-	0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, 0x62, 0x72, 0x6f, 0x6b,
-	0x65, 0x72, 0x49, 0x64, 0x12, 0x31, 0x0a, 0x06, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x02,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x70, 0x62, 0x2e, 0x53, 0x65, 0x74, 0x75, 0x70, 0x41,
-	0x72, 0x67, 0x73, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
-	0x06, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x20, 0x0a, 0x0b, 0x62, 0x61, 0x63, 0x6b, 0x65,
-	0x6e, 0x64, 0x55, 0x55, 0x49, 0x44, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x62, 0x61,
-	0x63, 0x6b, 0x65, 0x6e, 0x64, 0x55, 0x55, 0x49, 0x44, 0x1a, 0x39, 0x0a, 0x0b, 0x43, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x3a, 0x02, 0x38, 0x01, 0x22, 0x1e, 0x0a, 0x0a, 0x53, 0x65, 0x74, 0x75, 0x70, 0x52, 0x65, 0x70,
+	0x38, 0x01, 0x22, 0x1e, 0x0a, 0x0a, 0x53, 0x65, 0x74, 0x75, 0x70, 0x52, 0x65, 0x70, 0x6c, 0x79,
+	0x12, 0x10, 0x0a, 0x03, 0x65, 0x72, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x65,
+	0x72, 0x72, 0x22, 0x1f, 0x0a, 0x09, 0x54, 0x79, 0x70, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12,
+	0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x04, 0x74,
+	0x79, 0x70, 0x65, 0x22, 0x25, 0x0a, 0x11, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74,
+	0x65, 0x4b, 0x65, 0x79, 0x41, 0x72, 0x67, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x22, 0x53, 0x0a, 0x0c, 0x53, 0x74,
+	0x6f, 0x72, 0x61, 0x67, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
+	0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76, 0x61, 0x6c,
+	0x75, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x73, 0x65, 0x61, 0x6c, 0x5f, 0x77, 0x72, 0x61, 0x70, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x73, 0x65, 0x61, 0x6c, 0x57, 0x72, 0x61, 0x70, 0x22,
+	0x29, 0x0a, 0x0f, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x72,
+	0x67, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x06, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x22, 0x38, 0x0a, 0x10, 0x53, 0x74,
+	0x6f, 0x72, 0x61, 0x67, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x12,
+	0x0a, 0x04, 0x6b, 0x65, 0x79, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x6b, 0x65,
+	0x79, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x72, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x03, 0x65, 0x72, 0x72, 0x22, 0x22, 0x0a, 0x0e, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x47,
+	0x65, 0x74, 0x41, 0x72, 0x67, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x22, 0x4b, 0x0a, 0x0f, 0x53, 0x74, 0x6f, 0x72,
+	0x61, 0x67, 0x65, 0x47, 0x65, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x26, 0x0a, 0x05, 0x65,
+	0x6e, 0x74, 0x72, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x70, 0x62, 0x2e,
+	0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x65, 0x6e,
+	0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x72, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x03, 0x65, 0x72, 0x72, 0x22, 0x38, 0x0a, 0x0e, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65,
+	0x50, 0x75, 0x74, 0x41, 0x72, 0x67, 0x73, 0x12, 0x26, 0x0a, 0x05, 0x65, 0x6e, 0x74, 0x72, 0x79,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x70, 0x62, 0x2e, 0x53, 0x74, 0x6f, 0x72,
+	0x61, 0x67, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x22,
+	0x23, 0x0a, 0x0f, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x50, 0x75, 0x74, 0x52, 0x65, 0x70,
 	0x6c, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x72, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x03, 0x65, 0x72, 0x72, 0x22, 0x1f, 0x0a, 0x09, 0x54, 0x79, 0x70, 0x65, 0x52, 0x65, 0x70, 0x6c,
-	0x79, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52,
-	0x04, 0x74, 0x79, 0x70, 0x65, 0x22, 0x25, 0x0a, 0x11, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64,
-	0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x41, 0x72, 0x67, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
-	0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x22, 0x53, 0x0a, 0x0c,
-	0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
-	0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
-	0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x73, 0x65, 0x61, 0x6c, 0x5f, 0x77, 0x72, 0x61,
-	0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x73, 0x65, 0x61, 0x6c, 0x57, 0x72, 0x61,
-	0x70, 0x22, 0x29, 0x0a, 0x0f, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x4c, 0x69, 0x73, 0x74,
-	0x41, 0x72, 0x67, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x22, 0x38, 0x0a, 0x10,
-	0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x79,
-	0x12, 0x12, 0x0a, 0x04, 0x6b, 0x65, 0x79, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04,
-	0x6b, 0x65, 0x79, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x72, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x03, 0x65, 0x72, 0x72, 0x22, 0x22, 0x0a, 0x0e, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67,
-	0x65, 0x47, 0x65, 0x74, 0x41, 0x72, 0x67, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x22, 0x4b, 0x0a, 0x0f, 0x53, 0x74,
-	0x6f, 0x72, 0x61, 0x67, 0x65, 0x47, 0x65, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x26, 0x0a,
-	0x05, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x70,
-	0x62, 0x2e, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05,
-	0x65, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x72, 0x72, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x03, 0x65, 0x72, 0x72, 0x22, 0x38, 0x0a, 0x0e, 0x53, 0x74, 0x6f, 0x72, 0x61,
-	0x67, 0x65, 0x50, 0x75, 0x74, 0x41, 0x72, 0x67, 0x73, 0x12, 0x26, 0x0a, 0x05, 0x65, 0x6e, 0x74,
-	0x72, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x70, 0x62, 0x2e, 0x53, 0x74,
-	0x6f, 0x72, 0x61, 0x67, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x65, 0x6e, 0x74, 0x72,
-	0x79, 0x22, 0x23, 0x0a, 0x0f, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x50, 0x75, 0x74, 0x52,
-	0x65, 0x70, 0x6c, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x72, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x03, 0x65, 0x72, 0x72, 0x22, 0x25, 0x0a, 0x11, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67,
-	0x65, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x41, 0x72, 0x67, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x6b,
-	0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x22, 0x26, 0x0a,
-	0x12, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65,
-	0x70, 0x6c, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x72, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x03, 0x65, 0x72, 0x72, 0x22, 0x1c, 0x0a, 0x08, 0x54, 0x54, 0x4c, 0x52, 0x65, 0x70, 0x6c,
-	0x79, 0x12, 0x10, 0x0a, 0x03, 0x54, 0x54, 0x4c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03,
-	0x54, 0x54, 0x4c, 0x22, 0x28, 0x0a, 0x0c, 0x54, 0x61, 0x69, 0x6e, 0x74, 0x65, 0x64, 0x52, 0x65,
-	0x70, 0x6c, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x61, 0x69, 0x6e, 0x74, 0x65, 0x64, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x74, 0x61, 0x69, 0x6e, 0x74, 0x65, 0x64, 0x22, 0x32, 0x0a,
-	0x14, 0x43, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x67, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64,
-	0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65,
-	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65,
-	0x64, 0x22, 0x2d, 0x0a, 0x15, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74,
-	0x61, 0x74, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65,
-	0x22, 0x4e, 0x0a, 0x14, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x57, 0x72, 0x61, 0x70,
-	0x44, 0x61, 0x74, 0x61, 0x41, 0x72, 0x67, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x10, 0x0a, 0x03,
-	0x54, 0x54, 0x4c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x54, 0x54, 0x4c, 0x12, 0x10,
-	0x0a, 0x03, 0x4a, 0x57, 0x54, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x4a, 0x57, 0x54,
-	0x22, 0x5c, 0x0a, 0x15, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x57, 0x72, 0x61, 0x70,
-	0x44, 0x61, 0x74, 0x61, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x31, 0x0a, 0x09, 0x77, 0x72, 0x61,
-	0x70, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x70,
-	0x62, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x57, 0x72, 0x61, 0x70, 0x49, 0x6e,
-	0x66, 0x6f, 0x52, 0x08, 0x77, 0x72, 0x61, 0x70, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x10, 0x0a, 0x03,
-	0x65, 0x72, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x65, 0x72, 0x72, 0x22, 0x2d,
-	0x0a, 0x11, 0x4d, 0x6c, 0x6f, 0x63, 0x6b, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x52, 0x65,
-	0x70, 0x6c, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x22, 0x27, 0x0a,
-	0x0f, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x79,
-	0x12, 0x14, 0x0a, 0x05, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x05, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x22, 0x2d, 0x0a, 0x0e, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79,
-	0x49, 0x6e, 0x66, 0x6f, 0x41, 0x72, 0x67, 0x73, 0x12, 0x1b, 0x0a, 0x09, 0x65, 0x6e, 0x74, 0x69,
-	0x74, 0x79, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x65, 0x6e, 0x74,
-	0x69, 0x74, 0x79, 0x49, 0x64, 0x22, 0x4c, 0x0a, 0x0f, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x49,
-	0x6e, 0x66, 0x6f, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x27, 0x0a, 0x06, 0x65, 0x6e, 0x74, 0x69,
-	0x74, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x6c, 0x6f, 0x67, 0x69, 0x63,
-	0x61, 0x6c, 0x2e, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x52, 0x06, 0x65, 0x6e, 0x74, 0x69, 0x74,
-	0x79, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x72, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
-	0x65, 0x72, 0x72, 0x22, 0x50, 0x0a, 0x14, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x46, 0x6f, 0x72,
-	0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x26, 0x0a, 0x06, 0x67,
-	0x72, 0x6f, 0x75, 0x70, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x6c, 0x6f,
-	0x67, 0x69, 0x63, 0x61, 0x6c, 0x2e, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x06, 0x67, 0x72, 0x6f,
-	0x75, 0x70, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x72, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x03, 0x65, 0x72, 0x72, 0x22, 0x6d, 0x0a, 0x0e, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x45,
-	0x6e, 0x76, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x49, 0x0a, 0x12, 0x70, 0x6c, 0x75, 0x67, 0x69,
-	0x6e, 0x5f, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6c, 0x6f, 0x67, 0x69, 0x63, 0x61, 0x6c, 0x2e, 0x50, 0x6c,
-	0x75, 0x67, 0x69, 0x6e, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x52,
-	0x11, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65,
-	0x6e, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x72, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x03, 0x65, 0x72, 0x72, 0x22, 0x44, 0x0a, 0x21, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65,
-	0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x46, 0x72, 0x6f, 0x6d, 0x50, 0x6f, 0x6c, 0x69,
-	0x63, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x70, 0x6f, 0x6c,
-	0x69, 0x63, 0x79, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a,
-	0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x3d, 0x0a, 0x1f, 0x47, 0x65,
-	0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x46, 0x72,
-	0x6f, 0x6d, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x1a, 0x0a,
-	0x08, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x08, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x22, 0x66, 0x0a, 0x10, 0x43, 0x6c, 0x75,
-	0x73, 0x74, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x21, 0x0a,
-	0x0c, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65,
-	0x12, 0x1d, 0x0a, 0x0a, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, 0x12,
-	0x10, 0x0a, 0x03, 0x65, 0x72, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x65, 0x72,
-	0x72, 0x22, 0x8e, 0x01, 0x0a, 0x0a, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-	0x12, 0x1f, 0x0a, 0x0b, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x41, 0x64, 0x64,
-	0x72, 0x12, 0x1f, 0x0a, 0x0b, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x5f, 0x70, 0x6f, 0x72, 0x74,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x50, 0x6f,
-	0x72, 0x74, 0x12, 0x3e, 0x0a, 0x10, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-	0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x70,
-	0x62, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74,
-	0x65, 0x52, 0x0f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61,
-	0x74, 0x65, 0x22, 0xbb, 0x04, 0x0a, 0x0f, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f,
-	0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f,
-	0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e,
-	0x12, 0x2d, 0x0a, 0x12, 0x68, 0x61, 0x6e, 0x64, 0x73, 0x68, 0x61, 0x6b, 0x65, 0x5f, 0x63, 0x6f,
-	0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x68, 0x61,
-	0x6e, 0x64, 0x73, 0x68, 0x61, 0x6b, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x12,
-	0x1d, 0x0a, 0x0a, 0x64, 0x69, 0x64, 0x5f, 0x72, 0x65, 0x73, 0x75, 0x6d, 0x65, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x09, 0x64, 0x69, 0x64, 0x52, 0x65, 0x73, 0x75, 0x6d, 0x65, 0x12, 0x21,
-	0x0a, 0x0c, 0x63, 0x69, 0x70, 0x68, 0x65, 0x72, 0x5f, 0x73, 0x75, 0x69, 0x74, 0x65, 0x18, 0x04,
-	0x20, 0x01, 0x28, 0x0d, 0x52, 0x0b, 0x63, 0x69, 0x70, 0x68, 0x65, 0x72, 0x53, 0x75, 0x69, 0x74,
-	0x65, 0x12, 0x2f, 0x0a, 0x13, 0x6e, 0x65, 0x67, 0x6f, 0x74, 0x69, 0x61, 0x74, 0x65, 0x64, 0x5f,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12,
-	0x6e, 0x65, 0x67, 0x6f, 0x74, 0x69, 0x61, 0x74, 0x65, 0x64, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63,
-	0x6f, 0x6c, 0x12, 0x41, 0x0a, 0x1d, 0x6e, 0x65, 0x67, 0x6f, 0x74, 0x69, 0x61, 0x74, 0x65, 0x64,
-	0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x5f, 0x69, 0x73, 0x5f, 0x6d, 0x75, 0x74,
-	0x75, 0x61, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x1a, 0x6e, 0x65, 0x67, 0x6f, 0x74,
-	0x69, 0x61, 0x74, 0x65, 0x64, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x49, 0x73, 0x4d,
-	0x75, 0x74, 0x75, 0x61, 0x6c, 0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x5f,
-	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x65, 0x72, 0x76,
-	0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x41, 0x0a, 0x11, 0x70, 0x65, 0x65, 0x72, 0x5f, 0x63,
-	0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x14, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61,
-	0x74, 0x65, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x52, 0x10, 0x70, 0x65, 0x65, 0x72, 0x43, 0x65, 0x72,
-	0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x12, 0x3d, 0x0a, 0x0f, 0x76, 0x65, 0x72,
-	0x69, 0x66, 0x69, 0x65, 0x64, 0x5f, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x73, 0x18, 0x09, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x14, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63,
-	0x61, 0x74, 0x65, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x52, 0x0e, 0x76, 0x65, 0x72, 0x69, 0x66, 0x69,
-	0x65, 0x64, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x73, 0x12, 0x42, 0x0a, 0x1d, 0x73, 0x69, 0x67, 0x6e,
-	0x65, 0x64, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x74,
-	0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x73, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0c, 0x52,
-	0x1b, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61,
-	0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x73, 0x12, 0x23, 0x0a, 0x0d,
-	0x6f, 0x63, 0x73, 0x70, 0x5f, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x18, 0x0b, 0x20,
-	0x01, 0x28, 0x0c, 0x52, 0x0c, 0x6f, 0x63, 0x73, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x74, 0x6c, 0x73, 0x5f, 0x75, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x18,
-	0x0c, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x74, 0x6c, 0x73, 0x55, 0x6e, 0x69, 0x71, 0x75, 0x65,
-	0x22, 0x2a, 0x0a, 0x0b, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x12,
-	0x1b, 0x0a, 0x09, 0x61, 0x73, 0x6e, 0x31, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x0c, 0x52, 0x08, 0x61, 0x73, 0x6e, 0x31, 0x44, 0x61, 0x74, 0x61, 0x22, 0x47, 0x0a, 0x10,
-	0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x43, 0x68, 0x61, 0x69, 0x6e,
-	0x12, 0x33, 0x0a, 0x0c, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73,
-	0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x65, 0x72, 0x74,
-	0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x52, 0x0c, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69,
-	0x63, 0x61, 0x74, 0x65, 0x73, 0x22, 0x5b, 0x0a, 0x10, 0x53, 0x65, 0x6e, 0x64, 0x45, 0x76, 0x65,
-	0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x65, 0x76, 0x65,
-	0x6e, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x65,
-	0x76, 0x65, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x76, 0x65, 0x6e,
-	0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6c, 0x6f, 0x67, 0x69, 0x63, 0x61,
-	0x6c, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x65, 0x76, 0x65,
-	0x6e, 0x74, 0x32, 0xa5, 0x03, 0x0a, 0x07, 0x42, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x12, 0x3e,
-	0x0a, 0x0d, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
-	0x15, 0x2e, 0x70, 0x62, 0x2e, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x41, 0x72, 0x67, 0x73, 0x1a, 0x16, 0x2e, 0x70, 0x62, 0x2e, 0x48, 0x61, 0x6e, 0x64,
-	0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x30,
-	0x0a, 0x0c, 0x53, 0x70, 0x65, 0x63, 0x69, 0x61, 0x6c, 0x50, 0x61, 0x74, 0x68, 0x73, 0x12, 0x09,
-	0x2e, 0x70, 0x62, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x15, 0x2e, 0x70, 0x62, 0x2e, 0x53,
-	0x70, 0x65, 0x63, 0x69, 0x61, 0x6c, 0x50, 0x61, 0x74, 0x68, 0x73, 0x52, 0x65, 0x70, 0x6c, 0x79,
-	0x12, 0x53, 0x0a, 0x14, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x45, 0x78, 0x69, 0x73, 0x74, 0x65,
-	0x6e, 0x63, 0x65, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x12, 0x1c, 0x2e, 0x70, 0x62, 0x2e, 0x48, 0x61,
-	0x6e, 0x64, 0x6c, 0x65, 0x45, 0x78, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x63, 0x65, 0x43, 0x68, 0x65,
-	0x63, 0x6b, 0x41, 0x72, 0x67, 0x73, 0x1a, 0x1d, 0x2e, 0x70, 0x62, 0x2e, 0x48, 0x61, 0x6e, 0x64,
-	0x6c, 0x65, 0x45, 0x78, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x63, 0x65, 0x43, 0x68, 0x65, 0x63, 0x6b,
-	0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x1f, 0x0a, 0x07, 0x43, 0x6c, 0x65, 0x61, 0x6e, 0x75, 0x70,
-	0x12, 0x09, 0x2e, 0x70, 0x62, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x09, 0x2e, 0x70, 0x62,
-	0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x12, 0x31, 0x0a, 0x0d, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69,
-	0x64, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x12, 0x15, 0x2e, 0x70, 0x62, 0x2e, 0x49, 0x6e, 0x76,
-	0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x41, 0x72, 0x67, 0x73, 0x1a, 0x09,
-	0x2e, 0x70, 0x62, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x12, 0x26, 0x0a, 0x05, 0x53, 0x65, 0x74,
-	0x75, 0x70, 0x12, 0x0d, 0x2e, 0x70, 0x62, 0x2e, 0x53, 0x65, 0x74, 0x75, 0x70, 0x41, 0x72, 0x67,
-	0x73, 0x1a, 0x0e, 0x2e, 0x70, 0x62, 0x2e, 0x53, 0x65, 0x74, 0x75, 0x70, 0x52, 0x65, 0x70, 0x6c,
-	0x79, 0x12, 0x35, 0x0a, 0x0a, 0x49, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x12,
-	0x12, 0x2e, 0x70, 0x62, 0x2e, 0x49, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x41,
-	0x72, 0x67, 0x73, 0x1a, 0x13, 0x2e, 0x70, 0x62, 0x2e, 0x49, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c,
-	0x69, 0x7a, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x20, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65,
-	0x12, 0x09, 0x2e, 0x70, 0x62, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x0d, 0x2e, 0x70, 0x62,
-	0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x32, 0xd5, 0x01, 0x0a, 0x07, 0x53,
-	0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x12, 0x31, 0x0a, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x13,
-	0x2e, 0x70, 0x62, 0x2e, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x41,
-	0x72, 0x67, 0x73, 0x1a, 0x14, 0x2e, 0x70, 0x62, 0x2e, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65,
-	0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x2e, 0x0a, 0x03, 0x47, 0x65, 0x74,
-	0x12, 0x12, 0x2e, 0x70, 0x62, 0x2e, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x47, 0x65, 0x74,
-	0x41, 0x72, 0x67, 0x73, 0x1a, 0x13, 0x2e, 0x70, 0x62, 0x2e, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67,
-	0x65, 0x47, 0x65, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x2e, 0x0a, 0x03, 0x50, 0x75, 0x74,
-	0x12, 0x12, 0x2e, 0x70, 0x62, 0x2e, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x50, 0x75, 0x74,
-	0x41, 0x72, 0x67, 0x73, 0x1a, 0x13, 0x2e, 0x70, 0x62, 0x2e, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67,
-	0x65, 0x50, 0x75, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x37, 0x0a, 0x06, 0x44, 0x65, 0x6c,
-	0x65, 0x74, 0x65, 0x12, 0x15, 0x2e, 0x70, 0x62, 0x2e, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65,
-	0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x41, 0x72, 0x67, 0x73, 0x1a, 0x16, 0x2e, 0x70, 0x62, 0x2e,
-	0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x70,
-	0x6c, 0x79, 0x32, 0xe1, 0x05, 0x0a, 0x0a, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x56, 0x69, 0x65,
-	0x77, 0x12, 0x2a, 0x0a, 0x0f, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x4c, 0x65, 0x61, 0x73,
-	0x65, 0x54, 0x54, 0x4c, 0x12, 0x09, 0x2e, 0x70, 0x62, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a,
-	0x0c, 0x2e, 0x70, 0x62, 0x2e, 0x54, 0x54, 0x4c, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x26, 0x0a,
-	0x0b, 0x4d, 0x61, 0x78, 0x4c, 0x65, 0x61, 0x73, 0x65, 0x54, 0x54, 0x4c, 0x12, 0x09, 0x2e, 0x70,
-	0x62, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x0c, 0x2e, 0x70, 0x62, 0x2e, 0x54, 0x54, 0x4c,
-	0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x26, 0x0a, 0x07, 0x54, 0x61, 0x69, 0x6e, 0x74, 0x65, 0x64,
-	0x12, 0x09, 0x2e, 0x70, 0x62, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x10, 0x2e, 0x70, 0x62,
-	0x2e, 0x54, 0x61, 0x69, 0x6e, 0x74, 0x65, 0x64, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x36, 0x0a,
-	0x0f, 0x43, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x67, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64,
-	0x12, 0x09, 0x2e, 0x70, 0x62, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x18, 0x2e, 0x70, 0x62,
-	0x2e, 0x43, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x67, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64,
-	0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x38, 0x0a, 0x10, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x09, 0x2e, 0x70, 0x62, 0x2e, 0x45,
-	0x6d, 0x70, 0x74, 0x79, 0x1a, 0x19, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12,
-	0x47, 0x0a, 0x10, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x57, 0x72, 0x61, 0x70, 0x44,
-	0x61, 0x74, 0x61, 0x12, 0x18, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x57, 0x72, 0x61, 0x70, 0x44, 0x61, 0x74, 0x61, 0x41, 0x72, 0x67, 0x73, 0x1a, 0x19, 0x2e,
-	0x70, 0x62, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x57, 0x72, 0x61, 0x70, 0x44,
-	0x61, 0x74, 0x61, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x30, 0x0a, 0x0c, 0x4d, 0x6c, 0x6f, 0x63,
-	0x6b, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x12, 0x09, 0x2e, 0x70, 0x62, 0x2e, 0x45, 0x6d,
-	0x70, 0x74, 0x79, 0x1a, 0x15, 0x2e, 0x70, 0x62, 0x2e, 0x4d, 0x6c, 0x6f, 0x63, 0x6b, 0x45, 0x6e,
-	0x61, 0x62, 0x6c, 0x65, 0x64, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x2c, 0x0a, 0x0a, 0x4c, 0x6f,
-	0x63, 0x61, 0x6c, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x09, 0x2e, 0x70, 0x62, 0x2e, 0x45, 0x6d,
-	0x70, 0x74, 0x79, 0x1a, 0x13, 0x2e, 0x70, 0x62, 0x2e, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x4d, 0x6f,
-	0x75, 0x6e, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x35, 0x0a, 0x0a, 0x45, 0x6e, 0x74, 0x69,
-	0x74, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x12, 0x2e, 0x70, 0x62, 0x2e, 0x45, 0x6e, 0x74, 0x69,
-	0x74, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x41, 0x72, 0x67, 0x73, 0x1a, 0x13, 0x2e, 0x70, 0x62, 0x2e,
-	0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12,
-	0x2a, 0x0a, 0x09, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x45, 0x6e, 0x76, 0x12, 0x09, 0x2e, 0x70,
-	0x62, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x12, 0x2e, 0x70, 0x62, 0x2e, 0x50, 0x6c, 0x75,
-	0x67, 0x69, 0x6e, 0x45, 0x6e, 0x76, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x3f, 0x0a, 0x0f, 0x47,
-	0x72, 0x6f, 0x75, 0x70, 0x73, 0x46, 0x6f, 0x72, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x12, 0x12,
-	0x2e, 0x70, 0x62, 0x2e, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x41, 0x72,
-	0x67, 0x73, 0x1a, 0x18, 0x2e, 0x70, 0x62, 0x2e, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x46, 0x6f,
-	0x72, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x68, 0x0a, 0x1a,
-	0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64,
-	0x46, 0x72, 0x6f, 0x6d, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x25, 0x2e, 0x70, 0x62, 0x2e,
+	0x03, 0x65, 0x72, 0x72, 0x22, 0x25, 0x0a, 0x11, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x44,
+	0x65, 0x6c, 0x65, 0x74, 0x65, 0x41, 0x72, 0x67, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x22, 0x26, 0x0a, 0x12, 0x53,
+	0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x70, 0x6c,
+	0x79, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x72, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
+	0x65, 0x72, 0x72, 0x22, 0x1c, 0x0a, 0x08, 0x54, 0x54, 0x4c, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12,
+	0x10, 0x0a, 0x03, 0x54, 0x54, 0x4c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x54, 0x54,
+	0x4c, 0x22, 0x28, 0x0a, 0x0c, 0x54, 0x61, 0x69, 0x6e, 0x74, 0x65, 0x64, 0x52, 0x65, 0x70, 0x6c,
+	0x79, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x61, 0x69, 0x6e, 0x74, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x07, 0x74, 0x61, 0x69, 0x6e, 0x74, 0x65, 0x64, 0x22, 0x32, 0x0a, 0x14, 0x43,
+	0x61, 0x63, 0x68, 0x69, 0x6e, 0x67, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x52, 0x65,
+	0x70, 0x6c, 0x79, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x22,
+	0x2d, 0x0a, 0x15, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74,
+	0x61, 0x74, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74,
+	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x22, 0x4e,
+	0x0a, 0x14, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x57, 0x72, 0x61, 0x70, 0x44, 0x61,
+	0x74, 0x61, 0x41, 0x72, 0x67, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x10, 0x0a, 0x03, 0x54, 0x54,
+	0x4c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x54, 0x54, 0x4c, 0x12, 0x10, 0x0a, 0x03,
+	0x4a, 0x57, 0x54, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x4a, 0x57, 0x54, 0x22, 0x5c,
+	0x0a, 0x15, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x57, 0x72, 0x61, 0x70, 0x44, 0x61,
+	0x74, 0x61, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x31, 0x0a, 0x09, 0x77, 0x72, 0x61, 0x70, 0x5f,
+	0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x70, 0x62, 0x2e,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x57, 0x72, 0x61, 0x70, 0x49, 0x6e, 0x66, 0x6f,
+	0x52, 0x08, 0x77, 0x72, 0x61, 0x70, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x72,
+	0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x65, 0x72, 0x72, 0x22, 0x2d, 0x0a, 0x11,
+	0x4d, 0x6c, 0x6f, 0x63, 0x6b, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x52, 0x65, 0x70, 0x6c,
+	0x79, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x07, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x22, 0x27, 0x0a, 0x0f, 0x4c,
+	0x6f, 0x63, 0x61, 0x6c, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x14,
+	0x0a, 0x05, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x6c,
+	0x6f, 0x63, 0x61, 0x6c, 0x22, 0x2d, 0x0a, 0x0e, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x49, 0x6e,
+	0x66, 0x6f, 0x41, 0x72, 0x67, 0x73, 0x12, 0x1b, 0x0a, 0x09, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79,
+	0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x65, 0x6e, 0x74, 0x69, 0x74,
+	0x79, 0x49, 0x64, 0x22, 0x4c, 0x0a, 0x0f, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x49, 0x6e, 0x66,
+	0x6f, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x27, 0x0a, 0x06, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x6c, 0x6f, 0x67, 0x69, 0x63, 0x61, 0x6c,
+	0x2e, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x52, 0x06, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x12,
+	0x10, 0x0a, 0x03, 0x65, 0x72, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x65, 0x72,
+	0x72, 0x22, 0x50, 0x0a, 0x14, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x46, 0x6f, 0x72, 0x45, 0x6e,
+	0x74, 0x69, 0x74, 0x79, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x26, 0x0a, 0x06, 0x67, 0x72, 0x6f,
+	0x75, 0x70, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x6c, 0x6f, 0x67, 0x69,
+	0x63, 0x61, 0x6c, 0x2e, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x06, 0x67, 0x72, 0x6f, 0x75, 0x70,
+	0x73, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x72, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
+	0x65, 0x72, 0x72, 0x22, 0x6d, 0x0a, 0x0e, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x45, 0x6e, 0x76,
+	0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x49, 0x0a, 0x12, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x5f,
+	0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x1a, 0x2e, 0x6c, 0x6f, 0x67, 0x69, 0x63, 0x61, 0x6c, 0x2e, 0x50, 0x6c, 0x75, 0x67,
+	0x69, 0x6e, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x11, 0x70,
+	0x6c, 0x75, 0x67, 0x69, 0x6e, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74,
+	0x12, 0x10, 0x0a, 0x03, 0x65, 0x72, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x65,
+	0x72, 0x72, 0x22, 0x44, 0x0a, 0x21, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x50, 0x61,
+	0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x46, 0x72, 0x6f, 0x6d, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x70, 0x6f, 0x6c, 0x69, 0x63,
+	0x79, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x70, 0x6f,
+	0x6c, 0x69, 0x63, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x3d, 0x0a, 0x1f, 0x47, 0x65, 0x6e, 0x65,
+	0x72, 0x61, 0x74, 0x65, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x46, 0x72, 0x6f, 0x6d,
+	0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x1a, 0x0a, 0x08, 0x70,
+	0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70,
+	0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x22, 0x8e, 0x01, 0x0a, 0x0a, 0x43, 0x6f, 0x6e, 0x6e,
+	0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1f, 0x0a, 0x0b, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65,
+	0x5f, 0x61, 0x64, 0x64, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x72, 0x65, 0x6d,
+	0x6f, 0x74, 0x65, 0x41, 0x64, 0x64, 0x72, 0x12, 0x1f, 0x0a, 0x0b, 0x72, 0x65, 0x6d, 0x6f, 0x74,
+	0x65, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x72, 0x65,
+	0x6d, 0x6f, 0x74, 0x65, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x3e, 0x0a, 0x10, 0x63, 0x6f, 0x6e, 0x6e,
+	0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x13, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69,
+	0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x0f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
+	0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x22, 0xbb, 0x04, 0x0a, 0x0f, 0x43, 0x6f, 0x6e,
+	0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x18, 0x0a, 0x07,
+	0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x07, 0x76,
+	0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x2d, 0x0a, 0x12, 0x68, 0x61, 0x6e, 0x64, 0x73, 0x68,
+	0x61, 0x6b, 0x65, 0x5f, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x11, 0x68, 0x61, 0x6e, 0x64, 0x73, 0x68, 0x61, 0x6b, 0x65, 0x43, 0x6f, 0x6d,
+	0x70, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x64, 0x69, 0x64, 0x5f, 0x72, 0x65, 0x73,
+	0x75, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x64, 0x69, 0x64, 0x52, 0x65,
+	0x73, 0x75, 0x6d, 0x65, 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x69, 0x70, 0x68, 0x65, 0x72, 0x5f, 0x73,
+	0x75, 0x69, 0x74, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0b, 0x63, 0x69, 0x70, 0x68,
+	0x65, 0x72, 0x53, 0x75, 0x69, 0x74, 0x65, 0x12, 0x2f, 0x0a, 0x13, 0x6e, 0x65, 0x67, 0x6f, 0x74,
+	0x69, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x18, 0x05,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x6e, 0x65, 0x67, 0x6f, 0x74, 0x69, 0x61, 0x74, 0x65, 0x64,
+	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x12, 0x41, 0x0a, 0x1d, 0x6e, 0x65, 0x67, 0x6f,
+	0x74, 0x69, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x5f,
+	0x69, 0x73, 0x5f, 0x6d, 0x75, 0x74, 0x75, 0x61, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x1a, 0x6e, 0x65, 0x67, 0x6f, 0x74, 0x69, 0x61, 0x74, 0x65, 0x64, 0x50, 0x72, 0x6f, 0x74, 0x6f,
+	0x63, 0x6f, 0x6c, 0x49, 0x73, 0x4d, 0x75, 0x74, 0x75, 0x61, 0x6c, 0x12, 0x1f, 0x0a, 0x0b, 0x73,
+	0x65, 0x72, 0x76, 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x0a, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x41, 0x0a, 0x11,
+	0x70, 0x65, 0x65, 0x72, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65,
+	0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x65, 0x72,
+	0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x52, 0x10, 0x70,
+	0x65, 0x65, 0x72, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x12,
+	0x3d, 0x0a, 0x0f, 0x76, 0x65, 0x72, 0x69, 0x66, 0x69, 0x65, 0x64, 0x5f, 0x63, 0x68, 0x61, 0x69,
+	0x6e, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x65,
+	0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x52, 0x0e,
+	0x76, 0x65, 0x72, 0x69, 0x66, 0x69, 0x65, 0x64, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x73, 0x12, 0x42,
+	0x0a, 0x1d, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69,
+	0x63, 0x61, 0x74, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x73, 0x18,
+	0x0a, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x1b, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x43, 0x65, 0x72,
+	0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d,
+	0x70, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x6f, 0x63, 0x73, 0x70, 0x5f, 0x72, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0c, 0x6f, 0x63, 0x73, 0x70, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x74, 0x6c, 0x73, 0x5f, 0x75,
+	0x6e, 0x69, 0x71, 0x75, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x74, 0x6c, 0x73,
+	0x55, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x22, 0x2a, 0x0a, 0x0b, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66,
+	0x69, 0x63, 0x61, 0x74, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x61, 0x73, 0x6e, 0x31, 0x5f, 0x64, 0x61,
+	0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x08, 0x61, 0x73, 0x6e, 0x31, 0x44, 0x61,
+	0x74, 0x61, 0x22, 0x47, 0x0a, 0x10, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74,
+	0x65, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x12, 0x33, 0x0a, 0x0c, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66,
+	0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70,
+	0x62, 0x2e, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x52, 0x0c, 0x63,
+	0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x32, 0xa5, 0x03, 0x0a, 0x07,
+	0x42, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x12, 0x3e, 0x0a, 0x0d, 0x48, 0x61, 0x6e, 0x64, 0x6c,
+	0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x15, 0x2e, 0x70, 0x62, 0x2e, 0x48, 0x61,
+	0x6e, 0x64, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x41, 0x72, 0x67, 0x73, 0x1a,
+	0x16, 0x2e, 0x70, 0x62, 0x2e, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x30, 0x0a, 0x0c, 0x53, 0x70, 0x65, 0x63, 0x69,
+	0x61, 0x6c, 0x50, 0x61, 0x74, 0x68, 0x73, 0x12, 0x09, 0x2e, 0x70, 0x62, 0x2e, 0x45, 0x6d, 0x70,
+	0x74, 0x79, 0x1a, 0x15, 0x2e, 0x70, 0x62, 0x2e, 0x53, 0x70, 0x65, 0x63, 0x69, 0x61, 0x6c, 0x50,
+	0x61, 0x74, 0x68, 0x73, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x53, 0x0a, 0x14, 0x48, 0x61, 0x6e,
+	0x64, 0x6c, 0x65, 0x45, 0x78, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x63, 0x65, 0x43, 0x68, 0x65, 0x63,
+	0x6b, 0x12, 0x1c, 0x2e, 0x70, 0x62, 0x2e, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x45, 0x78, 0x69,
+	0x73, 0x74, 0x65, 0x6e, 0x63, 0x65, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x41, 0x72, 0x67, 0x73, 0x1a,
+	0x1d, 0x2e, 0x70, 0x62, 0x2e, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x45, 0x78, 0x69, 0x73, 0x74,
+	0x65, 0x6e, 0x63, 0x65, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x1f,
+	0x0a, 0x07, 0x43, 0x6c, 0x65, 0x61, 0x6e, 0x75, 0x70, 0x12, 0x09, 0x2e, 0x70, 0x62, 0x2e, 0x45,
+	0x6d, 0x70, 0x74, 0x79, 0x1a, 0x09, 0x2e, 0x70, 0x62, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x12,
+	0x31, 0x0a, 0x0d, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79,
+	0x12, 0x15, 0x2e, 0x70, 0x62, 0x2e, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65,
+	0x4b, 0x65, 0x79, 0x41, 0x72, 0x67, 0x73, 0x1a, 0x09, 0x2e, 0x70, 0x62, 0x2e, 0x45, 0x6d, 0x70,
+	0x74, 0x79, 0x12, 0x26, 0x0a, 0x05, 0x53, 0x65, 0x74, 0x75, 0x70, 0x12, 0x0d, 0x2e, 0x70, 0x62,
+	0x2e, 0x53, 0x65, 0x74, 0x75, 0x70, 0x41, 0x72, 0x67, 0x73, 0x1a, 0x0e, 0x2e, 0x70, 0x62, 0x2e,
+	0x53, 0x65, 0x74, 0x75, 0x70, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x35, 0x0a, 0x0a, 0x49, 0x6e,
+	0x69, 0x74, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x12, 0x12, 0x2e, 0x70, 0x62, 0x2e, 0x49, 0x6e,
+	0x69, 0x74, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x41, 0x72, 0x67, 0x73, 0x1a, 0x13, 0x2e, 0x70,
+	0x62, 0x2e, 0x49, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x52, 0x65, 0x70, 0x6c,
+	0x79, 0x12, 0x20, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x09, 0x2e, 0x70, 0x62, 0x2e, 0x45,
+	0x6d, 0x70, 0x74, 0x79, 0x1a, 0x0d, 0x2e, 0x70, 0x62, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x65,
+	0x70, 0x6c, 0x79, 0x32, 0xd5, 0x01, 0x0a, 0x07, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x12,
+	0x31, 0x0a, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x13, 0x2e, 0x70, 0x62, 0x2e, 0x53, 0x74, 0x6f,
+	0x72, 0x61, 0x67, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x72, 0x67, 0x73, 0x1a, 0x14, 0x2e, 0x70,
+	0x62, 0x2e, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x70,
+	0x6c, 0x79, 0x12, 0x2e, 0x0a, 0x03, 0x47, 0x65, 0x74, 0x12, 0x12, 0x2e, 0x70, 0x62, 0x2e, 0x53,
+	0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x47, 0x65, 0x74, 0x41, 0x72, 0x67, 0x73, 0x1a, 0x13, 0x2e,
+	0x70, 0x62, 0x2e, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x47, 0x65, 0x74, 0x52, 0x65, 0x70,
+	0x6c, 0x79, 0x12, 0x2e, 0x0a, 0x03, 0x50, 0x75, 0x74, 0x12, 0x12, 0x2e, 0x70, 0x62, 0x2e, 0x53,
+	0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x50, 0x75, 0x74, 0x41, 0x72, 0x67, 0x73, 0x1a, 0x13, 0x2e,
+	0x70, 0x62, 0x2e, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x50, 0x75, 0x74, 0x52, 0x65, 0x70,
+	0x6c, 0x79, 0x12, 0x37, 0x0a, 0x06, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x15, 0x2e, 0x70,
+	0x62, 0x2e, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x41,
+	0x72, 0x67, 0x73, 0x1a, 0x16, 0x2e, 0x70, 0x62, 0x2e, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65,
+	0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x32, 0xb1, 0x05, 0x0a, 0x0a,
+	0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x56, 0x69, 0x65, 0x77, 0x12, 0x2a, 0x0a, 0x0f, 0x44, 0x65,
+	0x66, 0x61, 0x75, 0x6c, 0x74, 0x4c, 0x65, 0x61, 0x73, 0x65, 0x54, 0x54, 0x4c, 0x12, 0x09, 0x2e,
+	0x70, 0x62, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x0c, 0x2e, 0x70, 0x62, 0x2e, 0x54, 0x54,
+	0x4c, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x26, 0x0a, 0x0b, 0x4d, 0x61, 0x78, 0x4c, 0x65, 0x61,
+	0x73, 0x65, 0x54, 0x54, 0x4c, 0x12, 0x09, 0x2e, 0x70, 0x62, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79,
+	0x1a, 0x0c, 0x2e, 0x70, 0x62, 0x2e, 0x54, 0x54, 0x4c, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x26,
+	0x0a, 0x07, 0x54, 0x61, 0x69, 0x6e, 0x74, 0x65, 0x64, 0x12, 0x09, 0x2e, 0x70, 0x62, 0x2e, 0x45,
+	0x6d, 0x70, 0x74, 0x79, 0x1a, 0x10, 0x2e, 0x70, 0x62, 0x2e, 0x54, 0x61, 0x69, 0x6e, 0x74, 0x65,
+	0x64, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x36, 0x0a, 0x0f, 0x43, 0x61, 0x63, 0x68, 0x69, 0x6e,
+	0x67, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x12, 0x09, 0x2e, 0x70, 0x62, 0x2e, 0x45,
+	0x6d, 0x70, 0x74, 0x79, 0x1a, 0x18, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x61, 0x63, 0x68, 0x69, 0x6e,
+	0x67, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x38,
+	0x0a, 0x10, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61,
+	0x74, 0x65, 0x12, 0x09, 0x2e, 0x70, 0x62, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x19, 0x2e,
+	0x70, 0x62, 0x2e, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74,
+	0x61, 0x74, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x47, 0x0a, 0x10, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x57, 0x72, 0x61, 0x70, 0x44, 0x61, 0x74, 0x61, 0x12, 0x18, 0x2e, 0x70,
+	0x62, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x57, 0x72, 0x61, 0x70, 0x44, 0x61,
+	0x74, 0x61, 0x41, 0x72, 0x67, 0x73, 0x1a, 0x19, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x57, 0x72, 0x61, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x65, 0x70, 0x6c,
+	0x79, 0x12, 0x30, 0x0a, 0x0c, 0x4d, 0x6c, 0x6f, 0x63, 0x6b, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65,
+	0x64, 0x12, 0x09, 0x2e, 0x70, 0x62, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x15, 0x2e, 0x70,
+	0x62, 0x2e, 0x4d, 0x6c, 0x6f, 0x63, 0x6b, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x52, 0x65,
+	0x70, 0x6c, 0x79, 0x12, 0x2c, 0x0a, 0x0a, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x4d, 0x6f, 0x75, 0x6e,
+	0x74, 0x12, 0x09, 0x2e, 0x70, 0x62, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x13, 0x2e, 0x70,
+	0x62, 0x2e, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, 0x70, 0x6c,
+	0x79, 0x12, 0x35, 0x0a, 0x0a, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x12,
+	0x12, 0x2e, 0x70, 0x62, 0x2e, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x41,
+	0x72, 0x67, 0x73, 0x1a, 0x13, 0x2e, 0x70, 0x62, 0x2e, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x49,
+	0x6e, 0x66, 0x6f, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x2a, 0x0a, 0x09, 0x50, 0x6c, 0x75, 0x67,
+	0x69, 0x6e, 0x45, 0x6e, 0x76, 0x12, 0x09, 0x2e, 0x70, 0x62, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79,
+	0x1a, 0x12, 0x2e, 0x70, 0x62, 0x2e, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x45, 0x6e, 0x76, 0x52,
+	0x65, 0x70, 0x6c, 0x79, 0x12, 0x3f, 0x0a, 0x0f, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x46, 0x6f,
+	0x72, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x12, 0x12, 0x2e, 0x70, 0x62, 0x2e, 0x45, 0x6e, 0x74,
+	0x69, 0x74, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x41, 0x72, 0x67, 0x73, 0x1a, 0x18, 0x2e, 0x70, 0x62,
+	0x2e, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x46, 0x6f, 0x72, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79,
+	0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x68, 0x0a, 0x1a, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74,
+	0x65, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x46, 0x72, 0x6f, 0x6d, 0x50, 0x6f, 0x6c,
+	0x69, 0x63, 0x79, 0x12, 0x25, 0x2e, 0x70, 0x62, 0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74,
+	0x65, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x46, 0x72, 0x6f, 0x6d, 0x50, 0x6f, 0x6c,
+	0x69, 0x63, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x70, 0x62, 0x2e,
 	0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64,
-	0x46, 0x72, 0x6f, 0x6d, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x1a, 0x23, 0x2e, 0x70, 0x62, 0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x50,
-	0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x46, 0x72, 0x6f, 0x6d, 0x50, 0x6f, 0x6c, 0x69, 0x63,
-	0x79, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x2e, 0x0a, 0x0b, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65,
-	0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x09, 0x2e, 0x70, 0x62, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79,
-	0x1a, 0x14, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x6e, 0x66,
-	0x6f, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x32, 0x36, 0x0a, 0x06, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73,
-	0x12, 0x2c, 0x0a, 0x09, 0x53, 0x65, 0x6e, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x14, 0x2e,
-	0x70, 0x62, 0x2e, 0x53, 0x65, 0x6e, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x1a, 0x09, 0x2e, 0x70, 0x62, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x42, 0x2a,
-	0x5a, 0x28, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x76, 0x61, 0x75, 0x6c, 0x74, 0x2f, 0x73, 0x64, 0x6b,
-	0x2f, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x33,
+	0x46, 0x72, 0x6f, 0x6d, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x42,
+	0x2a, 0x5a, 0x28, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61,
+	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x76, 0x61, 0x75, 0x6c, 0x74, 0x2f, 0x73, 0x64,
+	0x6b, 0x2f, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x33,
 }
 
 var (
@@ -4125,7 +3957,7 @@ func file_sdk_plugin_pb_backend_proto_rawDescGZIP() []byte {
 	return file_sdk_plugin_pb_backend_proto_rawDescData
 }
 
-var file_sdk_plugin_pb_backend_proto_msgTypes = make([]protoimpl.MessageInfo, 58)
+var file_sdk_plugin_pb_backend_proto_msgTypes = make([]protoimpl.MessageInfo, 56)
 var file_sdk_plugin_pb_backend_proto_goTypes = []interface{}{
 	(*Empty)(nil),                             // 0: pb.Empty
 	(*Header)(nil),                            // 1: pb.Header
@@ -4173,44 +4005,41 @@ var file_sdk_plugin_pb_backend_proto_goTypes = []interface{}{
 	(*PluginEnvReply)(nil),                    // 43: pb.PluginEnvReply
 	(*GeneratePasswordFromPolicyRequest)(nil), // 44: pb.GeneratePasswordFromPolicyRequest
 	(*GeneratePasswordFromPolicyReply)(nil),   // 45: pb.GeneratePasswordFromPolicyReply
-	(*ClusterInfoReply)(nil),                  // 46: pb.ClusterInfoReply
-	(*Connection)(nil),                        // 47: pb.Connection
-	(*ConnectionState)(nil),                   // 48: pb.ConnectionState
-	(*Certificate)(nil),                       // 49: pb.Certificate
-	(*CertificateChain)(nil),                  // 50: pb.CertificateChain
-	(*SendEventRequest)(nil),                  // 51: pb.SendEventRequest
-	nil,                                       // 52: pb.Request.HeadersEntry
-	nil,                                       // 53: pb.Auth.MetadataEntry
-	nil,                                       // 54: pb.TokenEntry.MetaEntry
-	nil,                                       // 55: pb.TokenEntry.InternalMetaEntry
-	nil,                                       // 56: pb.Response.HeadersEntry
-	nil,                                       // 57: pb.SetupArgs.ConfigEntry
-	(*logical.Alias)(nil),                     // 58: logical.Alias
-	(*timestamppb.Timestamp)(nil),             // 59: google.protobuf.Timestamp
-	(*logical.Entity)(nil),                    // 60: logical.Entity
-	(*logical.Group)(nil),                     // 61: logical.Group
-	(*logical.PluginEnvironment)(nil),         // 62: logical.PluginEnvironment
-	(*logical.EventData)(nil),                 // 63: logical.EventData
+	(*Connection)(nil),                        // 46: pb.Connection
+	(*ConnectionState)(nil),                   // 47: pb.ConnectionState
+	(*Certificate)(nil),                       // 48: pb.Certificate
+	(*CertificateChain)(nil),                  // 49: pb.CertificateChain
+	nil,                                       // 50: pb.Request.HeadersEntry
+	nil,                                       // 51: pb.Auth.MetadataEntry
+	nil,                                       // 52: pb.TokenEntry.MetaEntry
+	nil,                                       // 53: pb.TokenEntry.InternalMetaEntry
+	nil,                                       // 54: pb.Response.HeadersEntry
+	nil,                                       // 55: pb.SetupArgs.ConfigEntry
+	(*logical.Alias)(nil),                     // 56: logical.Alias
+	(*timestamppb.Timestamp)(nil),             // 57: google.protobuf.Timestamp
+	(*logical.Entity)(nil),                    // 58: logical.Entity
+	(*logical.Group)(nil),                     // 59: logical.Group
+	(*logical.PluginEnvironment)(nil),         // 60: logical.PluginEnvironment
 }
 var file_sdk_plugin_pb_backend_proto_depIDxs = []int32{
 	8,  // 0: pb.Request.secret:type_name -> pb.Secret
 	5,  // 1: pb.Request.auth:type_name -> pb.Auth
-	52, // 2: pb.Request.headers:type_name -> pb.Request.HeadersEntry
+	50, // 2: pb.Request.headers:type_name -> pb.Request.HeadersEntry
 	11, // 3: pb.Request.wrap_info:type_name -> pb.RequestWrapInfo
-	47, // 4: pb.Request.connection:type_name -> pb.Connection
+	46, // 4: pb.Request.connection:type_name -> pb.Connection
 	7,  // 5: pb.Auth.lease_options:type_name -> pb.LeaseOptions
-	53, // 6: pb.Auth.metadata:type_name -> pb.Auth.MetadataEntry
-	58, // 7: pb.Auth.alias:type_name -> logical.Alias
-	58, // 8: pb.Auth.group_aliases:type_name -> logical.Alias
-	54, // 9: pb.TokenEntry.meta:type_name -> pb.TokenEntry.MetaEntry
-	55, // 10: pb.TokenEntry.internal_meta:type_name -> pb.TokenEntry.InternalMetaEntry
-	59, // 11: pb.LeaseOptions.issue_time:type_name -> google.protobuf.Timestamp
+	51, // 6: pb.Auth.metadata:type_name -> pb.Auth.MetadataEntry
+	56, // 7: pb.Auth.alias:type_name -> logical.Alias
+	56, // 8: pb.Auth.group_aliases:type_name -> logical.Alias
+	52, // 9: pb.TokenEntry.meta:type_name -> pb.TokenEntry.MetaEntry
+	53, // 10: pb.TokenEntry.internal_meta:type_name -> pb.TokenEntry.InternalMetaEntry
+	57, // 11: pb.LeaseOptions.issue_time:type_name -> google.protobuf.Timestamp
 	7,  // 12: pb.Secret.lease_options:type_name -> pb.LeaseOptions
 	8,  // 13: pb.Response.secret:type_name -> pb.Secret
 	5,  // 14: pb.Response.auth:type_name -> pb.Auth
 	10, // 15: pb.Response.wrap_info:type_name -> pb.ResponseWrapInfo
-	56, // 16: pb.Response.headers:type_name -> pb.Response.HeadersEntry
-	59, // 17: pb.ResponseWrapInfo.creation_time:type_name -> google.protobuf.Timestamp
+	54, // 16: pb.Response.headers:type_name -> pb.Response.HeadersEntry
+	57, // 17: pb.ResponseWrapInfo.creation_time:type_name -> google.protobuf.Timestamp
 	4,  // 18: pb.HandleRequestArgs.request:type_name -> pb.Request
 	9,  // 19: pb.HandleRequestReply.response:type_name -> pb.Response
 	2,  // 20: pb.HandleRequestReply.err:type_name -> pb.ProtoError
@@ -4218,77 +4047,72 @@ var file_sdk_plugin_pb_backend_proto_depIDxs = []int32{
 	3,  // 22: pb.SpecialPathsReply.paths:type_name -> pb.Paths
 	4,  // 23: pb.HandleExistenceCheckArgs.request:type_name -> pb.Request
 	2,  // 24: pb.HandleExistenceCheckReply.err:type_name -> pb.ProtoError
-	57, // 25: pb.SetupArgs.Config:type_name -> pb.SetupArgs.ConfigEntry
+	55, // 25: pb.SetupArgs.Config:type_name -> pb.SetupArgs.ConfigEntry
 	23, // 26: pb.StorageGetReply.entry:type_name -> pb.StorageEntry
 	23, // 27: pb.StoragePutArgs.entry:type_name -> pb.StorageEntry
 	10, // 28: pb.ResponseWrapDataReply.wrap_info:type_name -> pb.ResponseWrapInfo
-	60, // 29: pb.EntityInfoReply.entity:type_name -> logical.Entity
-	61, // 30: pb.GroupsForEntityReply.groups:type_name -> logical.Group
-	62, // 31: pb.PluginEnvReply.plugin_environment:type_name -> logical.PluginEnvironment
-	48, // 32: pb.Connection.connection_state:type_name -> pb.ConnectionState
-	50, // 33: pb.ConnectionState.peer_certificates:type_name -> pb.CertificateChain
-	50, // 34: pb.ConnectionState.verified_chains:type_name -> pb.CertificateChain
-	49, // 35: pb.CertificateChain.certificates:type_name -> pb.Certificate
-	63, // 36: pb.SendEventRequest.event:type_name -> logical.EventData
-	1,  // 37: pb.Request.HeadersEntry.value:type_name -> pb.Header
-	1,  // 38: pb.Response.HeadersEntry.value:type_name -> pb.Header
-	12, // 39: pb.Backend.HandleRequest:input_type -> pb.HandleRequestArgs
-	0,  // 40: pb.Backend.SpecialPaths:input_type -> pb.Empty
-	17, // 41: pb.Backend.HandleExistenceCheck:input_type -> pb.HandleExistenceCheckArgs
-	0,  // 42: pb.Backend.Cleanup:input_type -> pb.Empty
-	22, // 43: pb.Backend.InvalidateKey:input_type -> pb.InvalidateKeyArgs
-	19, // 44: pb.Backend.Setup:input_type -> pb.SetupArgs
-	14, // 45: pb.Backend.Initialize:input_type -> pb.InitializeArgs
-	0,  // 46: pb.Backend.Type:input_type -> pb.Empty
-	24, // 47: pb.Storage.List:input_type -> pb.StorageListArgs
-	26, // 48: pb.Storage.Get:input_type -> pb.StorageGetArgs
-	28, // 49: pb.Storage.Put:input_type -> pb.StoragePutArgs
-	30, // 50: pb.Storage.Delete:input_type -> pb.StorageDeleteArgs
-	0,  // 51: pb.SystemView.DefaultLeaseTTL:input_type -> pb.Empty
-	0,  // 52: pb.SystemView.MaxLeaseTTL:input_type -> pb.Empty
-	0,  // 53: pb.SystemView.Tainted:input_type -> pb.Empty
-	0,  // 54: pb.SystemView.CachingDisabled:input_type -> pb.Empty
-	0,  // 55: pb.SystemView.ReplicationState:input_type -> pb.Empty
-	36, // 56: pb.SystemView.ResponseWrapData:input_type -> pb.ResponseWrapDataArgs
-	0,  // 57: pb.SystemView.MlockEnabled:input_type -> pb.Empty
-	0,  // 58: pb.SystemView.LocalMount:input_type -> pb.Empty
-	40, // 59: pb.SystemView.EntityInfo:input_type -> pb.EntityInfoArgs
-	0,  // 60: pb.SystemView.PluginEnv:input_type -> pb.Empty
-	40, // 61: pb.SystemView.GroupsForEntity:input_type -> pb.EntityInfoArgs
-	44, // 62: pb.SystemView.GeneratePasswordFromPolicy:input_type -> pb.GeneratePasswordFromPolicyRequest
-	0,  // 63: pb.SystemView.ClusterInfo:input_type -> pb.Empty
-	51, // 64: pb.Events.SendEvent:input_type -> pb.SendEventRequest
-	13, // 65: pb.Backend.HandleRequest:output_type -> pb.HandleRequestReply
-	16, // 66: pb.Backend.SpecialPaths:output_type -> pb.SpecialPathsReply
-	18, // 67: pb.Backend.HandleExistenceCheck:output_type -> pb.HandleExistenceCheckReply
-	0,  // 68: pb.Backend.Cleanup:output_type -> pb.Empty
-	0,  // 69: pb.Backend.InvalidateKey:output_type -> pb.Empty
-	20, // 70: pb.Backend.Setup:output_type -> pb.SetupReply
-	15, // 71: pb.Backend.Initialize:output_type -> pb.InitializeReply
-	21, // 72: pb.Backend.Type:output_type -> pb.TypeReply
-	25, // 73: pb.Storage.List:output_type -> pb.StorageListReply
-	27, // 74: pb.Storage.Get:output_type -> pb.StorageGetReply
-	29, // 75: pb.Storage.Put:output_type -> pb.StoragePutReply
-	31, // 76: pb.Storage.Delete:output_type -> pb.StorageDeleteReply
-	32, // 77: pb.SystemView.DefaultLeaseTTL:output_type -> pb.TTLReply
-	32, // 78: pb.SystemView.MaxLeaseTTL:output_type -> pb.TTLReply
-	33, // 79: pb.SystemView.Tainted:output_type -> pb.TaintedReply
-	34, // 80: pb.SystemView.CachingDisabled:output_type -> pb.CachingDisabledReply
-	35, // 81: pb.SystemView.ReplicationState:output_type -> pb.ReplicationStateReply
-	37, // 82: pb.SystemView.ResponseWrapData:output_type -> pb.ResponseWrapDataReply
-	38, // 83: pb.SystemView.MlockEnabled:output_type -> pb.MlockEnabledReply
-	39, // 84: pb.SystemView.LocalMount:output_type -> pb.LocalMountReply
-	41, // 85: pb.SystemView.EntityInfo:output_type -> pb.EntityInfoReply
-	43, // 86: pb.SystemView.PluginEnv:output_type -> pb.PluginEnvReply
-	42, // 87: pb.SystemView.GroupsForEntity:output_type -> pb.GroupsForEntityReply
-	45, // 88: pb.SystemView.GeneratePasswordFromPolicy:output_type -> pb.GeneratePasswordFromPolicyReply
-	46, // 89: pb.SystemView.ClusterInfo:output_type -> pb.ClusterInfoReply
-	0,  // 90: pb.Events.SendEvent:output_type -> pb.Empty
-	65, // [65:91] is the sub-list for method output_type
-	39, // [39:65] is the sub-list for method input_type
-	39, // [39:39] is the sub-list for extension type_name
-	39, // [39:39] is the sub-list for extension extendee
-	0,  // [0:39] is the sub-list for field type_name
+	58, // 29: pb.EntityInfoReply.entity:type_name -> logical.Entity
+	59, // 30: pb.GroupsForEntityReply.groups:type_name -> logical.Group
+	60, // 31: pb.PluginEnvReply.plugin_environment:type_name -> logical.PluginEnvironment
+	47, // 32: pb.Connection.connection_state:type_name -> pb.ConnectionState
+	49, // 33: pb.ConnectionState.peer_certificates:type_name -> pb.CertificateChain
+	49, // 34: pb.ConnectionState.verified_chains:type_name -> pb.CertificateChain
+	48, // 35: pb.CertificateChain.certificates:type_name -> pb.Certificate
+	1,  // 36: pb.Request.HeadersEntry.value:type_name -> pb.Header
+	1,  // 37: pb.Response.HeadersEntry.value:type_name -> pb.Header
+	12, // 38: pb.Backend.HandleRequest:input_type -> pb.HandleRequestArgs
+	0,  // 39: pb.Backend.SpecialPaths:input_type -> pb.Empty
+	17, // 40: pb.Backend.HandleExistenceCheck:input_type -> pb.HandleExistenceCheckArgs
+	0,  // 41: pb.Backend.Cleanup:input_type -> pb.Empty
+	22, // 42: pb.Backend.InvalidateKey:input_type -> pb.InvalidateKeyArgs
+	19, // 43: pb.Backend.Setup:input_type -> pb.SetupArgs
+	14, // 44: pb.Backend.Initialize:input_type -> pb.InitializeArgs
+	0,  // 45: pb.Backend.Type:input_type -> pb.Empty
+	24, // 46: pb.Storage.List:input_type -> pb.StorageListArgs
+	26, // 47: pb.Storage.Get:input_type -> pb.StorageGetArgs
+	28, // 48: pb.Storage.Put:input_type -> pb.StoragePutArgs
+	30, // 49: pb.Storage.Delete:input_type -> pb.StorageDeleteArgs
+	0,  // 50: pb.SystemView.DefaultLeaseTTL:input_type -> pb.Empty
+	0,  // 51: pb.SystemView.MaxLeaseTTL:input_type -> pb.Empty
+	0,  // 52: pb.SystemView.Tainted:input_type -> pb.Empty
+	0,  // 53: pb.SystemView.CachingDisabled:input_type -> pb.Empty
+	0,  // 54: pb.SystemView.ReplicationState:input_type -> pb.Empty
+	36, // 55: pb.SystemView.ResponseWrapData:input_type -> pb.ResponseWrapDataArgs
+	0,  // 56: pb.SystemView.MlockEnabled:input_type -> pb.Empty
+	0,  // 57: pb.SystemView.LocalMount:input_type -> pb.Empty
+	40, // 58: pb.SystemView.EntityInfo:input_type -> pb.EntityInfoArgs
+	0,  // 59: pb.SystemView.PluginEnv:input_type -> pb.Empty
+	40, // 60: pb.SystemView.GroupsForEntity:input_type -> pb.EntityInfoArgs
+	44, // 61: pb.SystemView.GeneratePasswordFromPolicy:input_type -> pb.GeneratePasswordFromPolicyRequest
+	13, // 62: pb.Backend.HandleRequest:output_type -> pb.HandleRequestReply
+	16, // 63: pb.Backend.SpecialPaths:output_type -> pb.SpecialPathsReply
+	18, // 64: pb.Backend.HandleExistenceCheck:output_type -> pb.HandleExistenceCheckReply
+	0,  // 65: pb.Backend.Cleanup:output_type -> pb.Empty
+	0,  // 66: pb.Backend.InvalidateKey:output_type -> pb.Empty
+	20, // 67: pb.Backend.Setup:output_type -> pb.SetupReply
+	15, // 68: pb.Backend.Initialize:output_type -> pb.InitializeReply
+	21, // 69: pb.Backend.Type:output_type -> pb.TypeReply
+	25, // 70: pb.Storage.List:output_type -> pb.StorageListReply
+	27, // 71: pb.Storage.Get:output_type -> pb.StorageGetReply
+	29, // 72: pb.Storage.Put:output_type -> pb.StoragePutReply
+	31, // 73: pb.Storage.Delete:output_type -> pb.StorageDeleteReply
+	32, // 74: pb.SystemView.DefaultLeaseTTL:output_type -> pb.TTLReply
+	32, // 75: pb.SystemView.MaxLeaseTTL:output_type -> pb.TTLReply
+	33, // 76: pb.SystemView.Tainted:output_type -> pb.TaintedReply
+	34, // 77: pb.SystemView.CachingDisabled:output_type -> pb.CachingDisabledReply
+	35, // 78: pb.SystemView.ReplicationState:output_type -> pb.ReplicationStateReply
+	37, // 79: pb.SystemView.ResponseWrapData:output_type -> pb.ResponseWrapDataReply
+	38, // 80: pb.SystemView.MlockEnabled:output_type -> pb.MlockEnabledReply
+	39, // 81: pb.SystemView.LocalMount:output_type -> pb.LocalMountReply
+	41, // 82: pb.SystemView.EntityInfo:output_type -> pb.EntityInfoReply
+	43, // 83: pb.SystemView.PluginEnv:output_type -> pb.PluginEnvReply
+	42, // 84: pb.SystemView.GroupsForEntity:output_type -> pb.GroupsForEntityReply
+	45, // 85: pb.SystemView.GeneratePasswordFromPolicy:output_type -> pb.GeneratePasswordFromPolicyReply
+	62, // [62:86] is the sub-list for method output_type
+	38, // [38:62] is the sub-list for method input_type
+	38, // [38:38] is the sub-list for extension type_name
+	38, // [38:38] is the sub-list for extension extendee
+	0,  // [0:38] is the sub-list for field type_name
 }
 
 func init() { file_sdk_plugin_pb_backend_proto_init() }
@@ -4850,18 +4674,6 @@ func file_sdk_plugin_pb_backend_proto_init() {
 			}
 		}
 		file_sdk_plugin_pb_backend_proto_msgTypes[46].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ClusterInfoReply); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_sdk_plugin_pb_backend_proto_msgTypes[47].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Connection); i {
 			case 0:
 				return &v.state
@@ -4873,7 +4685,7 @@ func file_sdk_plugin_pb_backend_proto_init() {
 				return nil
 			}
 		}
-		file_sdk_plugin_pb_backend_proto_msgTypes[48].Exporter = func(v interface{}, i int) interface{} {
+		file_sdk_plugin_pb_backend_proto_msgTypes[47].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ConnectionState); i {
 			case 0:
 				return &v.state
@@ -4885,7 +4697,7 @@ func file_sdk_plugin_pb_backend_proto_init() {
 				return nil
 			}
 		}
-		file_sdk_plugin_pb_backend_proto_msgTypes[49].Exporter = func(v interface{}, i int) interface{} {
+		file_sdk_plugin_pb_backend_proto_msgTypes[48].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Certificate); i {
 			case 0:
 				return &v.state
@@ -4897,7 +4709,7 @@ func file_sdk_plugin_pb_backend_proto_init() {
 				return nil
 			}
 		}
-		file_sdk_plugin_pb_backend_proto_msgTypes[50].Exporter = func(v interface{}, i int) interface{} {
+		file_sdk_plugin_pb_backend_proto_msgTypes[49].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CertificateChain); i {
 			case 0:
 				return &v.state
@@ -4909,18 +4721,6 @@ func file_sdk_plugin_pb_backend_proto_init() {
 				return nil
 			}
 		}
-		file_sdk_plugin_pb_backend_proto_msgTypes[51].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SendEventRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@@ -4928,9 +4728,9 @@ func file_sdk_plugin_pb_backend_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_sdk_plugin_pb_backend_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   58,
+			NumMessages:   56,
 			NumExtensions: 0,
-			NumServices:   4,
+			NumServices:   3,
 		},
 		GoTypes:           file_sdk_plugin_pb_backend_proto_goTypes,
 		DependencyIndexes: file_sdk_plugin_pb_backend_proto_depIDxs,
diff --git a/sdk/plugin/pb/backend.proto b/sdk/plugin/pb/backend.proto
index ded407788a72c..19a56be639e46 100644
--- a/sdk/plugin/pb/backend.proto
+++ b/sdk/plugin/pb/backend.proto
@@ -1,13 +1,9 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 syntax = "proto3";
 package pb;
 
 option go_package = "github.com/hashicorp/vault/sdk/plugin/pb";
 
 import "google/protobuf/timestamp.proto";
-import "sdk/logical/event.proto";
 import "sdk/logical/identity.proto";
 import "sdk/logical/plugin.proto";
 
@@ -51,13 +47,6 @@ message Paths {
 	// should be seal wrapped with extra encryption. It is exact matching
 	// unless it ends with '/' in which case it will be treated as a prefix.
 	repeated string seal_wrap_storage = 4;
-
-	// WriteForwardedStorage are storage paths that, when running on a PR
-	// Secondary cluster, cause a GRPC call up to the PR Primary cluster's
-	// active node to handle storage.Put(...) and storage.Delete(...) events.
-	//
-	// See extended note in /sdk/logical/logical.go.
-	repeated string write_forwarded_storage = 5;
 }
 
 message Request {
@@ -249,7 +238,6 @@ message TokenEntry {
 	map<string, string> internal_meta = 19;
 	string inline_policy = 20;
 	bool no_identity_policies = 21;
-	string external_id = 22;
 }
 
 message LeaseOptions {
@@ -578,12 +566,6 @@ message GeneratePasswordFromPolicyReply {
 	string password = 1;
 }
 
-message ClusterInfoReply {
-	string cluster_name = 1;
-	string cluster_id = 2;
-	string err = 3;
-}
-
 // SystemView exposes system configuration information in a safe way for plugins
 // to consume. Plugins should implement the client for this service.
 service SystemView {
@@ -636,9 +618,6 @@ service SystemView {
 
 	// GeneratePasswordFromPolicy generates a password from an existing password policy
 	rpc GeneratePasswordFromPolicy(GeneratePasswordFromPolicyRequest) returns (GeneratePasswordFromPolicyReply);
-
-	// ClusterInfo returns the ClusterID information; may be reused if ClusterName is also exposed.
-	rpc ClusterInfo(Empty) returns (ClusterInfoReply);
 }
 
 message Connection {
@@ -678,11 +657,3 @@ message CertificateChain {
 	repeated Certificate certificates = 1;
 }
 
-message SendEventRequest {
-	string event_type = 1;
-	logical.EventData event = 2;
-}
-
-service Events {
-	rpc SendEvent(SendEventRequest) returns (Empty);
-}
\ No newline at end of file
diff --git a/sdk/plugin/pb/backend_grpc.pb.go b/sdk/plugin/pb/backend_grpc.pb.go
index a8f3107e04074..9be6bacdc5d66 100644
--- a/sdk/plugin/pb/backend_grpc.pb.go
+++ b/sdk/plugin/pb/backend_grpc.pb.go
@@ -642,8 +642,6 @@ type SystemViewClient interface {
 	GroupsForEntity(ctx context.Context, in *EntityInfoArgs, opts ...grpc.CallOption) (*GroupsForEntityReply, error)
 	// GeneratePasswordFromPolicy generates a password from an existing password policy
 	GeneratePasswordFromPolicy(ctx context.Context, in *GeneratePasswordFromPolicyRequest, opts ...grpc.CallOption) (*GeneratePasswordFromPolicyReply, error)
-	// ClusterInfo returns the ClusterID information; may be reused if ClusterName is also exposed.
-	ClusterInfo(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*ClusterInfoReply, error)
 }
 
 type systemViewClient struct {
@@ -762,15 +760,6 @@ func (c *systemViewClient) GeneratePasswordFromPolicy(ctx context.Context, in *G
 	return out, nil
 }
 
-func (c *systemViewClient) ClusterInfo(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*ClusterInfoReply, error) {
-	out := new(ClusterInfoReply)
-	err := c.cc.Invoke(ctx, "/pb.SystemView/ClusterInfo", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
 // SystemViewServer is the server API for SystemView service.
 // All implementations must embed UnimplementedSystemViewServer
 // for forward compatibility
@@ -813,8 +802,6 @@ type SystemViewServer interface {
 	GroupsForEntity(context.Context, *EntityInfoArgs) (*GroupsForEntityReply, error)
 	// GeneratePasswordFromPolicy generates a password from an existing password policy
 	GeneratePasswordFromPolicy(context.Context, *GeneratePasswordFromPolicyRequest) (*GeneratePasswordFromPolicyReply, error)
-	// ClusterInfo returns the ClusterID information; may be reused if ClusterName is also exposed.
-	ClusterInfo(context.Context, *Empty) (*ClusterInfoReply, error)
 	mustEmbedUnimplementedSystemViewServer()
 }
 
@@ -858,9 +845,6 @@ func (UnimplementedSystemViewServer) GroupsForEntity(context.Context, *EntityInf
 func (UnimplementedSystemViewServer) GeneratePasswordFromPolicy(context.Context, *GeneratePasswordFromPolicyRequest) (*GeneratePasswordFromPolicyReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GeneratePasswordFromPolicy not implemented")
 }
-func (UnimplementedSystemViewServer) ClusterInfo(context.Context, *Empty) (*ClusterInfoReply, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method ClusterInfo not implemented")
-}
 func (UnimplementedSystemViewServer) mustEmbedUnimplementedSystemViewServer() {}
 
 // UnsafeSystemViewServer may be embedded to opt out of forward compatibility for this service.
@@ -1090,24 +1074,6 @@ func _SystemView_GeneratePasswordFromPolicy_Handler(srv interface{}, ctx context
 	return interceptor(ctx, in, info, handler)
 }
 
-func _SystemView_ClusterInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(Empty)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(SystemViewServer).ClusterInfo(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/pb.SystemView/ClusterInfo",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(SystemViewServer).ClusterInfo(ctx, req.(*Empty))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 // SystemView_ServiceDesc is the grpc.ServiceDesc for SystemView service.
 // It's only intended for direct use with grpc.RegisterService,
 // and not to be introspected or modified (even as a copy)
@@ -1163,96 +1129,6 @@ var SystemView_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "GeneratePasswordFromPolicy",
 			Handler:    _SystemView_GeneratePasswordFromPolicy_Handler,
 		},
-		{
-			MethodName: "ClusterInfo",
-			Handler:    _SystemView_ClusterInfo_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "sdk/plugin/pb/backend.proto",
-}
-
-// EventsClient is the client API for Events service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
-type EventsClient interface {
-	SendEvent(ctx context.Context, in *SendEventRequest, opts ...grpc.CallOption) (*Empty, error)
-}
-
-type eventsClient struct {
-	cc grpc.ClientConnInterface
-}
-
-func NewEventsClient(cc grpc.ClientConnInterface) EventsClient {
-	return &eventsClient{cc}
-}
-
-func (c *eventsClient) SendEvent(ctx context.Context, in *SendEventRequest, opts ...grpc.CallOption) (*Empty, error) {
-	out := new(Empty)
-	err := c.cc.Invoke(ctx, "/pb.Events/SendEvent", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// EventsServer is the server API for Events service.
-// All implementations must embed UnimplementedEventsServer
-// for forward compatibility
-type EventsServer interface {
-	SendEvent(context.Context, *SendEventRequest) (*Empty, error)
-	mustEmbedUnimplementedEventsServer()
-}
-
-// UnimplementedEventsServer must be embedded to have forward compatible implementations.
-type UnimplementedEventsServer struct {
-}
-
-func (UnimplementedEventsServer) SendEvent(context.Context, *SendEventRequest) (*Empty, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method SendEvent not implemented")
-}
-func (UnimplementedEventsServer) mustEmbedUnimplementedEventsServer() {}
-
-// UnsafeEventsServer may be embedded to opt out of forward compatibility for this service.
-// Use of this interface is not recommended, as added methods to EventsServer will
-// result in compilation errors.
-type UnsafeEventsServer interface {
-	mustEmbedUnimplementedEventsServer()
-}
-
-func RegisterEventsServer(s grpc.ServiceRegistrar, srv EventsServer) {
-	s.RegisterService(&Events_ServiceDesc, srv)
-}
-
-func _Events_SendEvent_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SendEventRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(EventsServer).SendEvent(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/pb.Events/SendEvent",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(EventsServer).SendEvent(ctx, req.(*SendEventRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-// Events_ServiceDesc is the grpc.ServiceDesc for Events service.
-// It's only intended for direct use with grpc.RegisterService,
-// and not to be introspected or modified (even as a copy)
-var Events_ServiceDesc = grpc.ServiceDesc{
-	ServiceName: "pb.Events",
-	HandlerType: (*EventsServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "SendEvent",
-			Handler:    _Events_SendEvent_Handler,
-		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "sdk/plugin/pb/backend.proto",
diff --git a/sdk/plugin/pb/translation.go b/sdk/plugin/pb/translation.go
index 92ca9af242855..732086b45e3ca 100644
--- a/sdk/plugin/pb/translation.go
+++ b/sdk/plugin/pb/translation.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pb
 
 import (
@@ -623,7 +620,6 @@ func LogicalTokenEntryToProtoTokenEntry(t *logical.TokenEntry) *TokenEntry {
 		NamespaceID:        t.NamespaceID,
 		CubbyholeID:        t.CubbyholeID,
 		Type:               uint32(t.Type),
-		ExternalID:         t.ExternalID,
 	}
 }
 
@@ -664,7 +660,6 @@ func ProtoTokenEntryToLogicalTokenEntry(t *TokenEntry) (*logical.TokenEntry, err
 		NamespaceID:        t.NamespaceID,
 		CubbyholeID:        t.CubbyholeID,
 		Type:               logical.TokenType(t.Type),
-		ExternalID:         t.ExternalID,
 	}, nil
 }
 
diff --git a/sdk/plugin/pb/translation_test.go b/sdk/plugin/pb/translation_test.go
index 30979257acc14..83cad401e5534 100644
--- a/sdk/plugin/pb/translation_test.go
+++ b/sdk/plugin/pb/translation_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pb
 
 import (
diff --git a/sdk/plugin/plugin.go b/sdk/plugin/plugin.go
index ec58417ec7d22..edbffcd6983ac 100644
--- a/sdk/plugin/plugin.go
+++ b/sdk/plugin/plugin.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package plugin
 
 import (
@@ -154,4 +151,14 @@ func (b *BackendPluginClient) PluginVersion() logical.PluginVersion {
 	return logical.EmptyPluginVersion
 }
 
-var _ logical.PluginVersioner = (*BackendPluginClient)(nil)
+func (b *BackendPluginClient) IsExternal() bool {
+	if externaler, ok := b.Backend.(logical.Externaler); ok {
+		return externaler.IsExternal()
+	}
+	return true // default to true since this is only used for GRPC plugins
+}
+
+var (
+	_ logical.PluginVersioner = (*BackendPluginClient)(nil)
+	_ logical.Externaler      = (*BackendPluginClient)(nil)
+)
diff --git a/sdk/plugin/plugin_v5.go b/sdk/plugin/plugin_v5.go
index cc2d1383775d4..2adf020a48eee 100644
--- a/sdk/plugin/plugin_v5.go
+++ b/sdk/plugin/plugin_v5.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package plugin
 
 import (
@@ -55,7 +52,10 @@ func (b *BackendPluginClientV5) PluginVersion() logical.PluginVersion {
 	return logical.EmptyPluginVersion
 }
 
-var _ logical.PluginVersioner = (*BackendPluginClientV5)(nil)
+var (
+	_ logical.PluginVersioner = (*BackendPluginClientV5)(nil)
+	_ logical.Externaler      = (*BackendPluginClientV5)(nil)
+)
 
 // NewBackendV5 will return an instance of an RPC-based client implementation of
 // the backend for external plugins, or a concrete implementation of the
diff --git a/sdk/plugin/serve.go b/sdk/plugin/serve.go
index 9ad2b820bb7ed..0da143f769b8b 100644
--- a/sdk/plugin/serve.go
+++ b/sdk/plugin/serve.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package plugin
 
 import (
diff --git a/sdk/plugin/storage_test.go b/sdk/plugin/storage_test.go
index 61a5deec6720d..651d361990428 100644
--- a/sdk/plugin/storage_test.go
+++ b/sdk/plugin/storage_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package plugin
 
 import (
diff --git a/sdk/queue/priority_queue.go b/sdk/queue/priority_queue.go
index 802a538587b30..3994841773e65 100644
--- a/sdk/queue/priority_queue.go
+++ b/sdk/queue/priority_queue.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 // Package queue  provides Vault plugins with a Priority Queue. It can be used
 // as an in-memory list of queue.Item sorted by their priority, and offers
 // methods to find or remove items by their key. Internally it uses
diff --git a/sdk/queue/priority_queue_test.go b/sdk/queue/priority_queue_test.go
index 108a26cc0edcf..928442b5246b8 100644
--- a/sdk/queue/priority_queue_test.go
+++ b/sdk/queue/priority_queue_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package queue
 
 import (
diff --git a/sdk/version/cgo.go b/sdk/version/cgo.go
new file mode 100644
index 0000000000000..5bc93e5bfcdaa
--- /dev/null
+++ b/sdk/version/cgo.go
@@ -0,0 +1,7 @@
+//go:build cgo
+
+package version
+
+func init() {
+	CgoEnabled = true
+}
diff --git a/version/version.go b/sdk/version/version.go
similarity index 96%
rename from version/version.go
rename to sdk/version/version.go
index 2dbcfb41c98d2..78b8eb829cdde 100644
--- a/version/version.go
+++ b/sdk/version/version.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package version
 
 import (
@@ -8,6 +5,7 @@ import (
 	"fmt"
 )
 
+// VersionInfo
 type VersionInfo struct {
 	Revision          string `json:"revision,omitempty"`
 	Version           string `json:"version,omitempty"`
diff --git a/sdk/version/version_base.go b/sdk/version/version_base.go
new file mode 100644
index 0000000000000..4a455d426a475
--- /dev/null
+++ b/sdk/version/version_base.go
@@ -0,0 +1,17 @@
+package version
+
+var (
+	// The git commit that was compiled. This will be filled in by the compiler.
+	GitCommit   string
+	GitDescribe string
+
+	// The compilation date. This will be filled in by the compiler.
+	BuildDate string
+
+	// Whether cgo is enabled or not; set at build time
+	CgoEnabled bool
+
+	Version           = "1.12.7"
+	VersionPrerelease = ""
+	VersionMetadata   = ""
+)
diff --git a/serviceregistration/consul/consul_service_registration.go b/serviceregistration/consul/consul_service_registration.go
index a49ab4ff63f76..79008967a5694 100644
--- a/serviceregistration/consul/consul_service_registration.go
+++ b/serviceregistration/consul/consul_service_registration.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package consul
 
 import (
diff --git a/serviceregistration/consul/consul_service_registration_test.go b/serviceregistration/consul/consul_service_registration_test.go
index 0ced651e0242f..21b2b2573b533 100644
--- a/serviceregistration/consul/consul_service_registration_test.go
+++ b/serviceregistration/consul/consul_service_registration_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package consul
 
 import (
diff --git a/serviceregistration/kubernetes/client/client.go b/serviceregistration/kubernetes/client/client.go
index 96d1952724530..934d3bad908cd 100644
--- a/serviceregistration/kubernetes/client/client.go
+++ b/serviceregistration/kubernetes/client/client.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package client
 
 import (
diff --git a/serviceregistration/kubernetes/client/client_test.go b/serviceregistration/kubernetes/client/client_test.go
index de11dad37e230..9f0dfad6e9a4b 100644
--- a/serviceregistration/kubernetes/client/client_test.go
+++ b/serviceregistration/kubernetes/client/client_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package client
 
 import (
diff --git a/serviceregistration/kubernetes/client/cmd/kubeclient/main.go b/serviceregistration/kubernetes/client/cmd/kubeclient/main.go
index 7060a063e2d7a..9eb031a362c69 100644
--- a/serviceregistration/kubernetes/client/cmd/kubeclient/main.go
+++ b/serviceregistration/kubernetes/client/cmd/kubeclient/main.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package main
 
 // This code builds a minimal binary of the lightweight kubernetes
diff --git a/serviceregistration/kubernetes/client/config.go b/serviceregistration/kubernetes/client/config.go
index be98240e21950..4e6a0f45848c6 100644
--- a/serviceregistration/kubernetes/client/config.go
+++ b/serviceregistration/kubernetes/client/config.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package client
 
 import (
diff --git a/serviceregistration/kubernetes/retry_handler.go b/serviceregistration/kubernetes/retry_handler.go
index 46ac18eafdddc..68afa8cdc576d 100644
--- a/serviceregistration/kubernetes/retry_handler.go
+++ b/serviceregistration/kubernetes/retry_handler.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package kubernetes
 
 import (
diff --git a/serviceregistration/kubernetes/retry_handler_test.go b/serviceregistration/kubernetes/retry_handler_test.go
index 0dd61113923e4..e2be809d0a095 100644
--- a/serviceregistration/kubernetes/retry_handler_test.go
+++ b/serviceregistration/kubernetes/retry_handler_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package kubernetes
 
 import (
diff --git a/serviceregistration/kubernetes/service_registration.go b/serviceregistration/kubernetes/service_registration.go
index f377cbb9874eb..f1c9a3c8ce401 100644
--- a/serviceregistration/kubernetes/service_registration.go
+++ b/serviceregistration/kubernetes/service_registration.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package kubernetes
 
 import (
diff --git a/serviceregistration/kubernetes/service_registration_test.go b/serviceregistration/kubernetes/service_registration_test.go
index a6a93c9ceeeed..a1bf001f16424 100644
--- a/serviceregistration/kubernetes/service_registration_test.go
+++ b/serviceregistration/kubernetes/service_registration_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package kubernetes
 
 import (
diff --git a/serviceregistration/kubernetes/testing/testserver.go b/serviceregistration/kubernetes/testing/testserver.go
index 6ceb94018625b..4f406eb6871bc 100644
--- a/serviceregistration/kubernetes/testing/testserver.go
+++ b/serviceregistration/kubernetes/testing/testserver.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package testing
 
 import (
diff --git a/serviceregistration/service_registration.go b/serviceregistration/service_registration.go
index 79f5b20d18839..5dc67af2bee10 100644
--- a/serviceregistration/service_registration.go
+++ b/serviceregistration/service_registration.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package serviceregistration
 
 /*
diff --git a/shamir/shamir.go b/shamir/shamir.go
index d9c0271a70985..22e3c337dcb14 100644
--- a/shamir/shamir.go
+++ b/shamir/shamir.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package shamir
 
 import (
diff --git a/shamir/shamir_test.go b/shamir/shamir_test.go
index 940a34ecf167f..90a7c371c2942 100644
--- a/shamir/shamir_test.go
+++ b/shamir/shamir_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package shamir
 
 import (
diff --git a/tools/godoctests/main.go b/tools/godoctests/main.go
deleted file mode 100644
index caa6ca0b93709..0000000000000
--- a/tools/godoctests/main.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package main
-
-import (
-	"github.com/hashicorp/vault/tools/godoctests/pkg/analyzer"
-	"golang.org/x/tools/go/analysis/singlechecker"
-)
-
-func main() {
-	singlechecker.Main(analyzer.Analyzer)
-}
diff --git a/tools/godoctests/pkg/analyzer/analyzer.go b/tools/godoctests/pkg/analyzer/analyzer.go
deleted file mode 100644
index 38ed37d933a6d..0000000000000
--- a/tools/godoctests/pkg/analyzer/analyzer.go
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package analyzer
-
-import (
-	"go/ast"
-	"strings"
-
-	"golang.org/x/tools/go/analysis"
-	"golang.org/x/tools/go/analysis/passes/inspect"
-	"golang.org/x/tools/go/ast/inspector"
-)
-
-var Analyzer = &analysis.Analyzer{
-	Name:     "godoctests",
-	Doc:      "Verifies that every go test has a go doc",
-	Run:      run,
-	Requires: []*analysis.Analyzer{inspect.Analyzer},
-}
-
-func run(pass *analysis.Pass) (interface{}, error) {
-	inspector := pass.ResultOf[inspect.Analyzer].(*inspector.Inspector)
-
-	nodeFilter := []ast.Node{
-		(*ast.FuncDecl)(nil),
-	}
-
-	inspector.Preorder(nodeFilter, func(node ast.Node) {
-		funcDecl, ok := node.(*ast.FuncDecl)
-		if !ok {
-			return
-		}
-
-		// starts with 'Test'
-		if !strings.HasPrefix(funcDecl.Name.Name, "Test") {
-			return
-		}
-
-		// has one parameter
-		params := funcDecl.Type.Params.List
-		if len(params) != 1 {
-			return
-		}
-
-		// parameter is a pointer
-		firstParamType, ok := params[0].Type.(*ast.StarExpr)
-		if !ok {
-			return
-		}
-
-		selector, ok := firstParamType.X.(*ast.SelectorExpr)
-		if !ok {
-			return
-		}
-
-		// the pointer comes from package 'testing'
-		selectorIdent, ok := selector.X.(*ast.Ident)
-		if !ok {
-			return
-		}
-		if selectorIdent.Name != "testing" {
-			return
-		}
-
-		// the pointer has type 'T'
-		if selector.Sel == nil || selector.Sel.Name != "T" {
-			return
-		}
-
-		// then there must be a godoc
-		if funcDecl.Doc == nil {
-			pass.Reportf(node.Pos(), "Test %s is missing a go doc",
-				funcDecl.Name.Name)
-		} else if !strings.HasPrefix(funcDecl.Doc.Text(), funcDecl.Name.Name) {
-			pass.Reportf(node.Pos(), "Test %s must have a go doc beginning with the function name",
-				funcDecl.Name.Name)
-		}
-	})
-	return nil, nil
-}
diff --git a/tools/godoctests/pkg/analyzer/analyzer_test.go b/tools/godoctests/pkg/analyzer/analyzer_test.go
deleted file mode 100644
index df1bfafd46324..0000000000000
--- a/tools/godoctests/pkg/analyzer/analyzer_test.go
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package analyzer
-
-import (
-	"os"
-	"path/filepath"
-	"testing"
-
-	"golang.org/x/tools/go/analysis/analysistest"
-)
-
-// TestAnalyzer runs the analyzer on the test functions in testdata/funcs.go. The report from the analyzer is compared against
-// the comments in funcs.go beginning with "want." If there is no comment beginning with "want", then the analyzer is expected
-// not to report anything.
-func TestAnalyzer(t *testing.T) {
-	f, err := os.Getwd()
-	if err != nil {
-		t.Fatal("failed to get working directory", err)
-	}
-	analysistest.Run(t, filepath.Join(f, "testdata"), Analyzer, ".")
-}
diff --git a/tools/godoctests/pkg/analyzer/testdata/funcs.go b/tools/godoctests/pkg/analyzer/testdata/funcs.go
deleted file mode 100644
index e9d5fead6744c..0000000000000
--- a/tools/godoctests/pkg/analyzer/testdata/funcs.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package testdata
-
-import "testing"
-
-// Test_GoDocOK is a test that has a go doc
-func Test_GoDocOK(t *testing.T) {}
-
-func Test_NoGoDocFails(t *testing.T) {} // want "Test Test_NoGoDocFails is missing a go doc"
-
-// This test does not have a go doc beginning with the function name
-func Test_BadGoDocFails(t *testing.T) {} // want "Test Test_BadGoDocFails must have a go doc beginning with the function name"
-
-func test_TestHelperNoGoDocOK(t *testing.T) {}
-
-func Test_DifferentSignatureNoGoDocOK() {}
-
-func Test_DifferentSignature2NoGoDocOK(t *testing.T, a int) {}
diff --git a/tools/gonilnilfunctions/main.go b/tools/gonilnilfunctions/main.go
deleted file mode 100644
index 68fd796a9f8dd..0000000000000
--- a/tools/gonilnilfunctions/main.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package main
-
-import (
-	"github.com/hashicorp/vault/tools/gonilnilfunctions/pkg/analyzer"
-	"golang.org/x/tools/go/analysis/singlechecker"
-)
-
-func main() {
-	singlechecker.Main(analyzer.Analyzer)
-}
diff --git a/tools/gonilnilfunctions/pkg/analyzer/analyzer.go b/tools/gonilnilfunctions/pkg/analyzer/analyzer.go
deleted file mode 100644
index 2b9f17a6e8f39..0000000000000
--- a/tools/gonilnilfunctions/pkg/analyzer/analyzer.go
+++ /dev/null
@@ -1,171 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package analyzer
-
-import (
-	"go/ast"
-	"go/types"
-	"reflect"
-	"strings"
-
-	"golang.org/x/tools/go/analysis"
-	"golang.org/x/tools/go/analysis/passes/inspect"
-	"golang.org/x/tools/go/ast/inspector"
-)
-
-var Analyzer = &analysis.Analyzer{
-	Name:       "gonilnilfunctions",
-	Doc:        "Verifies that every go function with error as one of its two return types cannot return nil, nil",
-	Run:        run,
-	ResultType: reflect.TypeOf((interface{})(nil)),
-	Requires:   []*analysis.Analyzer{inspect.Analyzer},
-}
-
-// getNestedReturnStatements searches the AST for return statements, and returns
-// them in a tail-call optimized list.
-func getNestedReturnStatements(s ast.Stmt, returns []*ast.ReturnStmt) []*ast.ReturnStmt {
-	switch s := s.(type) {
-	case *ast.BlockStmt:
-		statements := make([]*ast.ReturnStmt, 0)
-		for _, stmt := range s.List {
-			statements = append(statements, getNestedReturnStatements(stmt, make([]*ast.ReturnStmt, 0))...)
-		}
-
-		return append(returns, statements...)
-	case *ast.BranchStmt:
-		return returns
-	case *ast.ForStmt:
-		return getNestedReturnStatements(s.Body, returns)
-	case *ast.IfStmt:
-		return getNestedReturnStatements(s.Body, returns)
-	case *ast.LabeledStmt:
-		return getNestedReturnStatements(s.Stmt, returns)
-	case *ast.RangeStmt:
-		return getNestedReturnStatements(s.Body, returns)
-	case *ast.ReturnStmt:
-		return append(returns, s)
-	case *ast.SwitchStmt:
-		return getNestedReturnStatements(s.Body, returns)
-	case *ast.SelectStmt:
-		return getNestedReturnStatements(s.Body, returns)
-	case *ast.TypeSwitchStmt:
-		return getNestedReturnStatements(s.Body, returns)
-	case *ast.CommClause:
-		statements := make([]*ast.ReturnStmt, 0)
-		for _, stmt := range s.Body {
-			statements = append(statements, getNestedReturnStatements(stmt, make([]*ast.ReturnStmt, 0))...)
-		}
-
-		return append(returns, statements...)
-	case *ast.CaseClause:
-		statements := make([]*ast.ReturnStmt, 0)
-		for _, stmt := range s.Body {
-			statements = append(statements, getNestedReturnStatements(stmt, make([]*ast.ReturnStmt, 0))...)
-		}
-
-		return append(returns, statements...)
-	case *ast.ExprStmt:
-		return returns
-	}
-	return returns
-}
-
-// run runs the analysis, failing for functions whose signatures contain two results including one error
-// (e.g. (something, error)), that contain multiple nil returns
-func run(pass *analysis.Pass) (interface{}, error) {
-	inspector := pass.ResultOf[inspect.Analyzer].(*inspector.Inspector)
-
-	nodeFilter := []ast.Node{
-		(*ast.FuncDecl)(nil),
-	}
-
-	inspector.Preorder(nodeFilter, func(node ast.Node) {
-		funcDecl, ok := node.(*ast.FuncDecl)
-		if !ok {
-			return
-		}
-
-		// If the function has the "Ignore" godoc comment, skip it
-		if strings.Contains(funcDecl.Doc.Text(), "ignore-nil-nil-function-check") {
-			return
-		}
-
-		// The function returns something
-		if funcDecl == nil || funcDecl.Type == nil || funcDecl.Type.Results == nil {
-			return
-		}
-
-		// The function has more than 1 return value
-		results := funcDecl.Type.Results.List
-		if len(results) < 2 {
-			return
-		}
-
-		// isError is a helper function to check if a Field is of error type
-		isError := func(field *ast.Field) bool {
-			if named, ok := pass.TypesInfo.TypeOf(field.Type).(*types.Named); ok {
-				namedObject := named.Obj()
-				return namedObject != nil && namedObject.Pkg() == nil && namedObject.Name() == "error"
-			}
-			return false
-		}
-
-		// one of the return values is error
-		var errorFound bool
-		for _, result := range results {
-			if isError(result) {
-				errorFound = true
-				break
-			}
-		}
-
-		if !errorFound {
-			return
-		}
-
-		// Since these statements might be e.g. blocks with
-		// other statements inside, we need to get the return statements
-		// from inside them, first.
-		statements := funcDecl.Body.List
-
-		returnStatements := make([]*ast.ReturnStmt, 0)
-		for _, statement := range statements {
-			returnStatements = append(returnStatements, getNestedReturnStatements(statement, make([]*ast.ReturnStmt, 0))...)
-		}
-
-		for _, returnStatement := range returnStatements {
-			numResultsNil := 0
-			results := returnStatement.Results
-
-			// We only want two-arg functions (something, nil)
-			// We can remove this block in the future if we change our mind
-			if len(results) != 2 {
-				continue
-			}
-
-			for _, result := range results {
-				// nil is an ident
-				ident, isIdent := result.(*ast.Ident)
-				if isIdent {
-					if ident.Name == "nil" {
-						// We found one nil in the return list
-						numResultsNil++
-					}
-				}
-			}
-			// We found N nils, and our function returns N results, so this fails the check
-			if numResultsNil == len(results) {
-				// All the return values are nil, so we fail the report
-				pass.Reportf(node.Pos(), "Function %s can return an error, and has a statement that returns only nils",
-					funcDecl.Name.Name)
-
-				// We break out of the loop of checking return statements, so that we don't repeat ourselves
-				break
-			}
-		}
-	})
-
-	var success interface{}
-	return success, nil
-}
diff --git a/tools/gonilnilfunctions/pkg/analyzer/analyzer_test.go b/tools/gonilnilfunctions/pkg/analyzer/analyzer_test.go
deleted file mode 100644
index df1bfafd46324..0000000000000
--- a/tools/gonilnilfunctions/pkg/analyzer/analyzer_test.go
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package analyzer
-
-import (
-	"os"
-	"path/filepath"
-	"testing"
-
-	"golang.org/x/tools/go/analysis/analysistest"
-)
-
-// TestAnalyzer runs the analyzer on the test functions in testdata/funcs.go. The report from the analyzer is compared against
-// the comments in funcs.go beginning with "want." If there is no comment beginning with "want", then the analyzer is expected
-// not to report anything.
-func TestAnalyzer(t *testing.T) {
-	f, err := os.Getwd()
-	if err != nil {
-		t.Fatal("failed to get working directory", err)
-	}
-	analysistest.Run(t, filepath.Join(f, "testdata"), Analyzer, ".")
-}
diff --git a/tools/gonilnilfunctions/pkg/analyzer/testdata/funcs.go b/tools/gonilnilfunctions/pkg/analyzer/testdata/funcs.go
deleted file mode 100644
index f783f01219b12..0000000000000
--- a/tools/gonilnilfunctions/pkg/analyzer/testdata/funcs.go
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package testdata
-
-func ReturnReturnOkay() (any, error) {
-	var i interface{}
-	return i, nil
-}
-
-func OneGoodOneBad() (any, error) { // want "Function OneGoodOneBad can return an error, and has a statement that returns only nils"
-	var i interface{}
-	if true {
-		return i, nil
-	}
-	return nil, nil
-}
-
-func OneBadOneGood() (any, error) { // want "Function OneBadOneGood can return an error, and has a statement that returns only nils"
-	var i interface{}
-	if true {
-		return nil, nil
-	}
-	return i, nil
-}
-
-func EmptyFunc() {}
-
-func TwoNilNils() (any, error) { // want "Function TwoNilNils can return an error, and has a statement that returns only nils"
-	if true {
-		return nil, nil
-	}
-	return nil, nil
-}
-
-// ThreeResults should not fail, as while it returns nil, nil, nil, it has three results, not two.
-func ThreeResults() (any, any, error) {
-	return nil, nil, nil
-}
-
-func TwoArgsNoError() (any, any) {
-	return nil, nil
-}
-
-func NestedReturn() (any, error) { // want "Function NestedReturn can return an error, and has a statement that returns only nils"
-	{
-		{
-			{
-				return nil, nil
-			}
-		}
-	}
-}
-
-func NestedForReturn() (any, error) { // want "Function NestedForReturn can return an error, and has a statement that returns only nils"
-	for {
-		for i := 0; i < 100; i++ {
-			{
-				return nil, nil
-			}
-		}
-	}
-}
-
-func AnyErrorNilNil() (any, error) { // want "Function AnyErrorNilNil can return an error, and has a statement that returns only nils"
-	return nil, nil
-}
-
-// Skipped should be skipped because of the following line:
-// ignore-nil-nil-function-check
-func Skipped() (any, error) {
-	return nil, nil
-}
diff --git a/tools/semgrep/ci/atomic.yml b/tools/semgrep/ci/atomic.yml
index 1d6b2a9da7995..2fea38bd77b4f 100644
--- a/tools/semgrep/ci/atomic.yml
+++ b/tools/semgrep/ci/atomic.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 rules:
   - id: atomics-64bit-safety
     patterns:
diff --git a/tools/semgrep/ci/bad-multierror-append.yml b/tools/semgrep/ci/bad-multierror-append.yml
index bebb20013f396..86b637577d9de 100644
--- a/tools/semgrep/ci/bad-multierror-append.yml
+++ b/tools/semgrep/ci/bad-multierror-append.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 rules:
   - id: bad-multierror-append
     patterns:
diff --git a/tools/semgrep/ci/bad-nil-guard.yml b/tools/semgrep/ci/bad-nil-guard.yml
index 70003690f72fe..f5fd122e8c965 100644
--- a/tools/semgrep/ci/bad-nil-guard.yml
+++ b/tools/semgrep/ci/bad-nil-guard.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 rules:
   - id: bad-nil-guard
     patterns:
diff --git a/tools/semgrep/ci/error-shadowing.yml b/tools/semgrep/ci/error-shadowing.yml
index 43ea1a3eb9fd0..8362df5f7a7ec 100644
--- a/tools/semgrep/ci/error-shadowing.yml
+++ b/tools/semgrep/ci/error-shadowing.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 rules:
   - id: error-shadow-check-types 
     patterns:
diff --git a/tools/semgrep/ci/fmt-printf.yml b/tools/semgrep/ci/fmt-printf.yml
index fc6e824446a00..18777cabeffc4 100644
--- a/tools/semgrep/ci/fmt-printf.yml
+++ b/tools/semgrep/ci/fmt-printf.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 rules:
   - id: fmt.Printf
     languages: [go]
diff --git a/tools/semgrep/ci/hashsum.yml b/tools/semgrep/ci/hashsum.yml
index 82765a12a262a..47dfc02a98c40 100644
--- a/tools/semgrep/ci/hashsum.yml
+++ b/tools/semgrep/ci/hashsum.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 rules:
   - id: hash-sum-without-write
     patterns:
diff --git a/tools/semgrep/ci/hmac-bytes.yml b/tools/semgrep/ci/hmac-bytes.yml
index d8da277064a2b..629a8fe6c5b53 100644
--- a/tools/semgrep/ci/hmac-bytes.yml
+++ b/tools/semgrep/ci/hmac-bytes.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 rules:
   - id: use-hmac-equal
     patterns:
diff --git a/tools/semgrep/ci/hmac-hash.yml b/tools/semgrep/ci/hmac-hash.yml
index 2b03883c4a512..625d271c18b41 100644
--- a/tools/semgrep/ci/hmac-hash.yml
+++ b/tools/semgrep/ci/hmac-hash.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 rules:
   - id: hmac-needs-new
     patterns:
diff --git a/tools/semgrep/ci/logger-format-string.yml b/tools/semgrep/ci/logger-format-string.yml
index 14cb6cd4276ca..bb1b83e209bc3 100644
--- a/tools/semgrep/ci/logger-format-string.yml
+++ b/tools/semgrep/ci/logger-format-string.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 rules:
   - id: logger-used-with-format-string
     patterns:
diff --git a/tools/semgrep/ci/loop-time-after.yml b/tools/semgrep/ci/loop-time-after.yml
deleted file mode 100644
index e3a5183a1fd69..0000000000000
--- a/tools/semgrep/ci/loop-time-after.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
-rules:
-  - id: loop-time-after
-    pattern: |
-      for ... {
-        ...
-        select {
-          case ...
-          case <-time.After(...):
-            ...
-          case ...
-        }
-        ...
-      }
-    message: <-time.After() used in for loop, consider using a ticker or a timer instead
-    languages:
-      - go
-    severity: WARNING
\ No newline at end of file
diff --git a/tools/semgrep/ci/loopclosure.yml b/tools/semgrep/ci/loopclosure.yml
index 88ab134c5dff3..967376127db86 100644
--- a/tools/semgrep/ci/loopclosure.yml
+++ b/tools/semgrep/ci/loopclosure.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 rules:
   - id: loopclosure
     patterns:
diff --git a/tools/semgrep/ci/no-nil-check.yml b/tools/semgrep/ci/no-nil-check.yml
index 0b1f1ce372051..8697c08ce4ac9 100644
--- a/tools/semgrep/ci/no-nil-check.yml
+++ b/tools/semgrep/ci/no-nil-check.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 rules:
   - id: nil-check-logical-storage
     patterns:
@@ -65,7 +62,7 @@ rules:
     severity: ERROR
 
 # NamespaceByID 
-  - id: nil-check-physical-storage-by-nsid
+  - id: nil-check-physical-storage
     patterns:
       - pattern-either:
           - pattern: |
diff --git a/tools/semgrep/ci/oddifsequence.yml b/tools/semgrep/ci/oddifsequence.yml
index 77b71b6a2a635..bee36d06fad23 100644
--- a/tools/semgrep/ci/oddifsequence.yml
+++ b/tools/semgrep/ci/oddifsequence.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 rules:
   - id: odd-sequence-ifs
     patterns:
diff --git a/tools/semgrep/ci/return-nil-error.yml b/tools/semgrep/ci/return-nil-error.yml
index a91e4eaecd6d9..0b6f7f677c653 100644
--- a/tools/semgrep/ci/return-nil-error.yml
+++ b/tools/semgrep/ci/return-nil-error.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 rules:
   - id: return-nil
     patterns:
diff --git a/tools/semgrep/ci/return-nil.yml b/tools/semgrep/ci/return-nil.yml
index 2a6447cef7103..aa3975647e7a2 100644
--- a/tools/semgrep/ci/return-nil.yml
+++ b/tools/semgrep/ci/return-nil.yml
@@ -1,8 +1,5 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 rules:
-  - id: hc-return-nil
+  - id: return-nil
     patterns:
       - pattern-either:
           - pattern: |
diff --git a/tools/semgrep/ci/wrongerrcall.yml b/tools/semgrep/ci/wrongerrcall.yml
index 315e26d5f2d08..5a1a4d37af8d8 100644
--- a/tools/semgrep/ci/wrongerrcall.yml
+++ b/tools/semgrep/ci/wrongerrcall.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 rules:
   - id: maybe-wrong-err
     patterns:
diff --git a/tools/semgrep/ci/wronglock.yml b/tools/semgrep/ci/wronglock.yml
index 126a5446a4fd5..5f8422ce46cad 100644
--- a/tools/semgrep/ci/wronglock.yml
+++ b/tools/semgrep/ci/wronglock.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 rules:
   - id: wrong-lock-unlock
     patterns:
diff --git a/tools/semgrep/hostport.yml b/tools/semgrep/hostport.yml
index 28613ecd90364..c47510e8814b2 100644
--- a/tools/semgrep/hostport.yml
+++ b/tools/semgrep/hostport.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 # https://github.com/golang/go/issues/28308, from @stapelberg
 rules:
 - id: sprintf-host-port
diff --git a/tools/semgrep/joinpath.yml b/tools/semgrep/joinpath.yml
index ec27127bfa030..173aba0ab0a0e 100644
--- a/tools/semgrep/joinpath.yml
+++ b/tools/semgrep/joinpath.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 rules:
   - id: use-strings-join-path
     patterns:
diff --git a/tools/semgrep/lock-not-unlocked-on-return.yml b/tools/semgrep/lock-not-unlocked-on-return.yml
index 6482b71945992..2d097f1aa0ff7 100644
--- a/tools/semgrep/lock-not-unlocked-on-return.yml
+++ b/tools/semgrep/lock-not-unlocked-on-return.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 rules:
   - id: lock_not_unlocked
     message: |
diff --git a/tools/semgrep/logger-sprintf.yml b/tools/semgrep/logger-sprintf.yml
index 7d2f48bcdc3ec..3f58ba18ba8f7 100644
--- a/tools/semgrep/logger-sprintf.yml
+++ b/tools/semgrep/logger-sprintf.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 rules:
   - id: logger-used-with-sprintf
     patterns:
diff --git a/tools/semgrep/paths-with-callbacks-and-operations.yml b/tools/semgrep/paths-with-callbacks-and-operations.yml
index e29cbab65bafd..08e9c1ec1e396 100644
--- a/tools/semgrep/paths-with-callbacks-and-operations.yml
+++ b/tools/semgrep/paths-with-callbacks-and-operations.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 rules:
   - id: path-has-both-callbacks-and-operations
     patterns:
diff --git a/tools/semgrep/paths-with-callbacks.yml b/tools/semgrep/paths-with-callbacks.yml
index 9049a1d370a33..3a122cc6d9e4a 100644
--- a/tools/semgrep/paths-with-callbacks.yml
+++ b/tools/semgrep/paths-with-callbacks.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 rules:
   - id: uses-path-callbacks
     patterns:
diff --git a/tools/semgrep/physical-storage.yml b/tools/semgrep/physical-storage.yml
index e7e978cc75a9d..970c77693ed36 100644
--- a/tools/semgrep/physical-storage.yml
+++ b/tools/semgrep/physical-storage.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 rules:
   - id: physical-storage-bypass-encryption 
     patterns:
diff --git a/tools/semgrep/replication-has-state.yml b/tools/semgrep/replication-has-state.yml
index 7868e328087e5..416a59e6af6a2 100644
--- a/tools/semgrep/replication-has-state.yml
+++ b/tools/semgrep/replication-has-state.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 rules:
   - id: replication-state-should-use-IsPerfSecondary
     patterns:
diff --git a/tools/semgrep/self-equals.yml b/tools/semgrep/self-equals.yml
index ae7c1ff8c93c7..7cc5243f2b075 100644
--- a/tools/semgrep/self-equals.yml
+++ b/tools/semgrep/self-equals.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 rules:
   - id: self-equals
     patterns:
diff --git a/tools/tools.go b/tools/tools.go
index a3f743244ffad..061c963382f79 100644
--- a/tools/tools.go
+++ b/tools/tools.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build tools
 
 // This file ensures tool dependencies are kept in sync.  This is the
@@ -19,8 +16,6 @@ package tools
 //go:generate go install google.golang.org/protobuf/cmd/protoc-gen-go
 //go:generate go install google.golang.org/grpc/cmd/protoc-gen-go-grpc
 //go:generate go install github.com/favadi/protoc-go-inject-tag
-//go:generate go install honnef.co/go/tools/cmd/staticcheck
-//go:generate go install github.com/golangci/revgrep/cmd/revgrep
 //go:generate go install gotest.tools/gotestsum
 import (
 	_ "golang.org/x/tools/cmd/goimports"
@@ -35,9 +30,5 @@ import (
 
 	_ "github.com/favadi/protoc-go-inject-tag"
 
-	_ "github.com/golangci/revgrep/cmd/revgrep"
-
 	_ "gotest.tools/gotestsum"
-
-	_ "honnef.co/go/tools/cmd/staticcheck"
 )
diff --git a/ui/.ember-cli b/ui/.ember-cli
index f6e59871ff52d..4202ec1b2d71a 100644
--- a/ui/.ember-cli
+++ b/ui/.ember-cli
@@ -6,11 +6,5 @@
     Setting `disableAnalytics` to true will prevent any data from being sent.
   */
   "disableAnalytics": true,
-  "output-path": "../http/web_ui",
-
-  /**
-  Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
-  rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
-  */
-  "isTypeScriptProject": false
+  "output-path": "../http/web_ui"
 }
diff --git a/ui/.eslintignore b/ui/.eslintignore
index c352da9c77be8..5bd267e8e9d7c 100644
--- a/ui/.eslintignore
+++ b/ui/.eslintignore
@@ -20,11 +20,6 @@
 # ember-try
 /.node_modules.ember-try/
 /bower.json.ember-try
-/npm-shrinkwrap.json.ember-try
 /package.json.ember-try
-/package-lock.json.ember-try
-/yarn.lock.ember-try
-/tests/helpers/vault-keys.js
 
-# typescript declaration files
-*.d.ts
+/tests/helpers/vault-keys.js
diff --git a/ui/.eslintrc.js b/ui/.eslintrc.js
index bb4548319848e..9e626cbc17bba 100644
--- a/ui/.eslintrc.js
+++ b/ui/.eslintrc.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /* eslint-disable no-undef */
 
 'use strict';
@@ -28,8 +23,7 @@ module.exports = {
     browser: true,
   },
   rules: {
-    'no-console': 'error',
-    'prefer-const': ['error', { destructuring: 'all' }],
+    'no-console': 'warn',
     'ember/no-mixins': 'warn',
     'ember/no-new-mixins': 'off', // should be warn but then every line of the mixin is green
     // need to be fully glimmerized before these rules can be turned on
@@ -69,13 +63,9 @@ module.exports = {
       },
     },
     {
-      // test files
+      // Test files:
       files: ['tests/**/*-test.{js,ts}'],
       extends: ['plugin:qunit/recommended'],
     },
-    {
-      files: ['**/*.ts'],
-      extends: ['plugin:@typescript-eslint/recommended'],
-    },
   ],
 };
diff --git a/ui/.gitignore b/ui/.gitignore
index f51263f3dd9b3..0474208ee07e0 100644
--- a/ui/.gitignore
+++ b/ui/.gitignore
@@ -22,19 +22,4 @@ package-lock.json
 # ember-try
 /.node_modules.ember-try/
 /bower.json.ember-try
-/npm-shrinkwrap.json.ember-try
 /package.json.ember-try
-/package-lock.json.ember-try
-/yarn.lock.ember-try
-
-# broccoli-debug
-/DEBUG/
-
-# yarn
-.pnp.*
-.yarn/*
-!.yarn/patches
-!.yarn/plugins
-!.yarn/releases
-!.yarn/sdks
-!.yarn/versions
diff --git a/ui/.nvmrc b/ui/.nvmrc
new file mode 100644
index 0000000000000..958b5a36e1fad
--- /dev/null
+++ b/ui/.nvmrc
@@ -0,0 +1 @@
+v14
diff --git a/ui/.prettierignore b/ui/.prettierignore
index 4178fd571e680..9221655522bb5 100644
--- a/ui/.prettierignore
+++ b/ui/.prettierignore
@@ -14,12 +14,8 @@
 /coverage/
 !.*
 .eslintcache
-.lint-todo/
 
 # ember-try
 /.node_modules.ember-try/
 /bower.json.ember-try
-/npm-shrinkwrap.json.ember-try
 /package.json.ember-try
-/package-lock.json.ember-try
-/yarn.lock.ember-try
diff --git a/ui/.prettierrc.js b/ui/.prettierrc.js
index 8c776351a4545..8f507fd9b33d0 100644
--- a/ui/.prettierrc.js
+++ b/ui/.prettierrc.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 'use strict';
 
 module.exports = {
diff --git a/ui/.template-lintrc.js b/ui/.template-lintrc.js
index 3540521890a8c..f61b165724d1b 100644
--- a/ui/.template-lintrc.js
+++ b/ui/.template-lintrc.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 'use strict';
 
 const fs = require('fs');
@@ -34,18 +29,22 @@ try {
     prettier: false,
   };
 } catch (error) {
-  console.log(error); // eslint-disable-line
+  console.log(error);
 }
 
 module.exports = {
   plugins: ['ember-template-lint-plugin-prettier'],
   extends: ['recommended', 'ember-template-lint-plugin-prettier:recommended'],
   rules: {
+    'no-bare-strings': 'off',
     'no-action': 'off',
+    'no-duplicate-landmark-elements': 'warn',
     'no-implicit-this': {
       allow: ['supported-auth-backends'],
     },
     'require-input-label': 'off',
+    'no-down-event-binding': 'warn',
+    'self-closing-void-elements': 'off',
   },
   ignore: ['lib/story-md', 'tests/**'],
   // ember language server vscode extension does not currently respect the ignore field
diff --git a/ui/.yarn/releases/yarn-1.19.1.js b/ui/.yarn/releases/yarn-1.19.1.js
new file mode 100755
index 0000000000000..3907b87325d00
--- /dev/null
+++ b/ui/.yarn/releases/yarn-1.19.1.js
@@ -0,0 +1,147216 @@
+#!/usr/bin/env node
+module.exports =
+/******/ (function(modules) { // webpackBootstrap
+/******/ 	// The module cache
+/******/ 	var installedModules = {};
+/******/
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+/******/
+/******/ 		// Check if module is in cache
+/******/ 		if(installedModules[moduleId]) {
+/******/ 			return installedModules[moduleId].exports;
+/******/ 		}
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = installedModules[moduleId] = {
+/******/ 			i: moduleId,
+/******/ 			l: false,
+/******/ 			exports: {}
+/******/ 		};
+/******/
+/******/ 		// Execute the module function
+/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+/******/
+/******/ 		// Flag the module as loaded
+/******/ 		module.l = true;
+/******/
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+/******/
+/******/
+/******/ 	// expose the modules object (__webpack_modules__)
+/******/ 	__webpack_require__.m = modules;
+/******/
+/******/ 	// expose the module cache
+/******/ 	__webpack_require__.c = installedModules;
+/******/
+/******/ 	// identity function for calling harmony imports with the correct context
+/******/ 	__webpack_require__.i = function(value) { return value; };
+/******/
+/******/ 	// define getter function for harmony exports
+/******/ 	__webpack_require__.d = function(exports, name, getter) {
+/******/ 		if(!__webpack_require__.o(exports, name)) {
+/******/ 			Object.defineProperty(exports, name, {
+/******/ 				configurable: false,
+/******/ 				enumerable: true,
+/******/ 				get: getter
+/******/ 			});
+/******/ 		}
+/******/ 	};
+/******/
+/******/ 	// getDefaultExport function for compatibility with non-harmony modules
+/******/ 	__webpack_require__.n = function(module) {
+/******/ 		var getter = module && module.__esModule ?
+/******/ 			function getDefault() { return module['default']; } :
+/******/ 			function getModuleExports() { return module; };
+/******/ 		__webpack_require__.d(getter, 'a', getter);
+/******/ 		return getter;
+/******/ 	};
+/******/
+/******/ 	// Object.prototype.hasOwnProperty.call
+/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
+/******/
+/******/ 	// __webpack_public_path__
+/******/ 	__webpack_require__.p = "";
+/******/
+/******/ 	// Load entry module and return exports
+/******/ 	return __webpack_require__(__webpack_require__.s = 549);
+/******/ })
+/************************************************************************/
+/******/ ([
+/* 0 */
+/***/ (function(module, exports) {
+
+module.exports = require("path");
+
+/***/ }),
+/* 1 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = __extends;
+/* unused harmony export __assign */
+/* unused harmony export __rest */
+/* unused harmony export __decorate */
+/* unused harmony export __param */
+/* unused harmony export __metadata */
+/* unused harmony export __awaiter */
+/* unused harmony export __generator */
+/* unused harmony export __exportStar */
+/* unused harmony export __values */
+/* unused harmony export __read */
+/* unused harmony export __spread */
+/* unused harmony export __await */
+/* unused harmony export __asyncGenerator */
+/* unused harmony export __asyncDelegator */
+/* unused harmony export __asyncValues */
+/* unused harmony export __makeTemplateObject */
+/* unused harmony export __importStar */
+/* unused harmony export __importDefault */
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0
+
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+MERCHANTABLITY OR NON-INFRINGEMENT.
+
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+/* global Reflect, Promise */
+
+var extendStatics = function(d, b) {
+    extendStatics = Object.setPrototypeOf ||
+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+    return extendStatics(d, b);
+};
+
+function __extends(d, b) {
+    extendStatics(d, b);
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+}
+
+var __assign = function() {
+    __assign = Object.assign || function __assign(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+        }
+        return t;
+    }
+    return __assign.apply(this, arguments);
+}
+
+function __rest(s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
+            t[p[i]] = s[p[i]];
+    return t;
+}
+
+function __decorate(decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+
+function __param(paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+}
+
+function __metadata(metadataKey, metadataValue) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(metadataKey, metadataValue);
+}
+
+function __awaiter(thisArg, _arguments, P, generator) {
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+}
+
+function __generator(thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+}
+
+function __exportStar(m, exports) {
+    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+}
+
+function __values(o) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator], i = 0;
+    if (m) return m.call(o);
+    return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+}
+
+function __read(o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+}
+
+function __spread() {
+    for (var ar = [], i = 0; i < arguments.length; i++)
+        ar = ar.concat(__read(arguments[i]));
+    return ar;
+}
+
+function __await(v) {
+    return this instanceof __await ? (this.v = v, this) : new __await(v);
+}
+
+function __asyncGenerator(thisArg, _arguments, generator) {
+    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+    var g = generator.apply(thisArg, _arguments || []), i, q = [];
+    return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i;
+    function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }
+    function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
+    function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
+    function fulfill(value) { resume("next", value); }
+    function reject(value) { resume("throw", value); }
+    function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
+}
+
+function __asyncDelegator(o) {
+    var i, p;
+    return i = {}, verb("next"), verb("throw", function (e) { throw e; }), verb("return"), i[Symbol.iterator] = function () { return this; }, i;
+    function verb(n, f) { i[n] = o[n] ? function (v) { return (p = !p) ? { value: __await(o[n](v)), done: n === "return" } : f ? f(v) : v; } : f; }
+}
+
+function __asyncValues(o) {
+    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+    var m = o[Symbol.asyncIterator], i;
+    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
+    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
+    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
+}
+
+function __makeTemplateObject(cooked, raw) {
+    if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
+    return cooked;
+};
+
+function __importStar(mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
+    result.default = mod;
+    return result;
+}
+
+function __importDefault(mod) {
+    return (mod && mod.__esModule) ? mod : { default: mod };
+}
+
+
+/***/ }),
+/* 2 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+exports.__esModule = true;
+
+var _promise = __webpack_require__(227);
+
+var _promise2 = _interopRequireDefault(_promise);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+exports.default = function (fn) {
+  return function () {
+    var gen = fn.apply(this, arguments);
+    return new _promise2.default(function (resolve, reject) {
+      function step(key, arg) {
+        try {
+          var info = gen[key](arg);
+          var value = info.value;
+        } catch (error) {
+          reject(error);
+          return;
+        }
+
+        if (info.done) {
+          resolve(value);
+        } else {
+          return _promise2.default.resolve(value).then(function (value) {
+            step("next", value);
+          }, function (err) {
+            step("throw", err);
+          });
+        }
+      }
+
+      return step("next");
+    });
+  };
+};
+
+/***/ }),
+/* 3 */
+/***/ (function(module, exports) {
+
+module.exports = require("util");
+
+/***/ }),
+/* 4 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getFirstSuitableFolder = exports.readFirstAvailableStream = exports.makeTempDir = exports.hardlinksWork = exports.writeFilePreservingEol = exports.getFileSizeOnDisk = exports.walk = exports.symlink = exports.find = exports.readJsonAndFile = exports.readJson = exports.readFileAny = exports.hardlinkBulk = exports.copyBulk = exports.unlink = exports.glob = exports.link = exports.chmod = exports.lstat = exports.exists = exports.mkdirp = exports.stat = exports.access = exports.rename = exports.readdir = exports.realpath = exports.readlink = exports.writeFile = exports.open = exports.readFileBuffer = exports.lockQueue = exports.constants = undefined;
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+let buildActionsForCopy = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (queue, events, possibleExtraneous, reporter) {
+
+    //
+    let build = (() => {
+      var _ref5 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (data) {
+        const src = data.src,
+              dest = data.dest,
+              type = data.type;
+
+        const onFresh = data.onFresh || noop;
+        const onDone = data.onDone || noop;
+
+        // TODO https://github.com/yarnpkg/yarn/issues/3751
+        // related to bundled dependencies handling
+        if (files.has(dest.toLowerCase())) {
+          reporter.verbose(`The case-insensitive file ${dest} shouldn't be copied twice in one bulk copy`);
+        } else {
+          files.add(dest.toLowerCase());
+        }
+
+        if (type === 'symlink') {
+          yield mkdirp((_path || _load_path()).default.dirname(dest));
+          onFresh();
+          actions.symlink.push({
+            dest,
+            linkname: src
+          });
+          onDone();
+          return;
+        }
+
+        if (events.ignoreBasenames.indexOf((_path || _load_path()).default.basename(src)) >= 0) {
+          // ignored file
+          return;
+        }
+
+        const srcStat = yield lstat(src);
+        let srcFiles;
+
+        if (srcStat.isDirectory()) {
+          srcFiles = yield readdir(src);
+        }
+
+        let destStat;
+        try {
+          // try accessing the destination
+          destStat = yield lstat(dest);
+        } catch (e) {
+          // proceed if destination doesn't exist, otherwise error
+          if (e.code !== 'ENOENT') {
+            throw e;
+          }
+        }
+
+        // if destination exists
+        if (destStat) {
+          const bothSymlinks = srcStat.isSymbolicLink() && destStat.isSymbolicLink();
+          const bothFolders = srcStat.isDirectory() && destStat.isDirectory();
+          const bothFiles = srcStat.isFile() && destStat.isFile();
+
+          // EINVAL access errors sometimes happen which shouldn't because node shouldn't be giving
+          // us modes that aren't valid. investigate this, it's generally safe to proceed.
+
+          /* if (srcStat.mode !== destStat.mode) {
+            try {
+              await access(dest, srcStat.mode);
+            } catch (err) {}
+          } */
+
+          if (bothFiles && artifactFiles.has(dest)) {
+            // this file gets changed during build, likely by a custom install script. Don't bother checking it.
+            onDone();
+            reporter.verbose(reporter.lang('verboseFileSkipArtifact', src));
+            return;
+          }
+
+          if (bothFiles && srcStat.size === destStat.size && (0, (_fsNormalized || _load_fsNormalized()).fileDatesEqual)(srcStat.mtime, destStat.mtime)) {
+            // we can safely assume this is the same file
+            onDone();
+            reporter.verbose(reporter.lang('verboseFileSkip', src, dest, srcStat.size, +srcStat.mtime));
+            return;
+          }
+
+          if (bothSymlinks) {
+            const srcReallink = yield readlink(src);
+            if (srcReallink === (yield readlink(dest))) {
+              // if both symlinks are the same then we can continue on
+              onDone();
+              reporter.verbose(reporter.lang('verboseFileSkipSymlink', src, dest, srcReallink));
+              return;
+            }
+          }
+
+          if (bothFolders) {
+            // mark files that aren't in this folder as possibly extraneous
+            const destFiles = yield readdir(dest);
+            invariant(srcFiles, 'src files not initialised');
+
+            for (var _iterator4 = destFiles, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
+              var _ref6;
+
+              if (_isArray4) {
+                if (_i4 >= _iterator4.length) break;
+                _ref6 = _iterator4[_i4++];
+              } else {
+                _i4 = _iterator4.next();
+                if (_i4.done) break;
+                _ref6 = _i4.value;
+              }
+
+              const file = _ref6;
+
+              if (srcFiles.indexOf(file) < 0) {
+                const loc = (_path || _load_path()).default.join(dest, file);
+                possibleExtraneous.add(loc);
+
+                if ((yield lstat(loc)).isDirectory()) {
+                  for (var _iterator5 = yield readdir(loc), _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
+                    var _ref7;
+
+                    if (_isArray5) {
+                      if (_i5 >= _iterator5.length) break;
+                      _ref7 = _iterator5[_i5++];
+                    } else {
+                      _i5 = _iterator5.next();
+                      if (_i5.done) break;
+                      _ref7 = _i5.value;
+                    }
+
+                    const file = _ref7;
+
+                    possibleExtraneous.add((_path || _load_path()).default.join(loc, file));
+                  }
+                }
+              }
+            }
+          }
+        }
+
+        if (destStat && destStat.isSymbolicLink()) {
+          yield (0, (_fsNormalized || _load_fsNormalized()).unlink)(dest);
+          destStat = null;
+        }
+
+        if (srcStat.isSymbolicLink()) {
+          onFresh();
+          const linkname = yield readlink(src);
+          actions.symlink.push({
+            dest,
+            linkname
+          });
+          onDone();
+        } else if (srcStat.isDirectory()) {
+          if (!destStat) {
+            reporter.verbose(reporter.lang('verboseFileFolder', dest));
+            yield mkdirp(dest);
+          }
+
+          const destParts = dest.split((_path || _load_path()).default.sep);
+          while (destParts.length) {
+            files.add(destParts.join((_path || _load_path()).default.sep).toLowerCase());
+            destParts.pop();
+          }
+
+          // push all files to queue
+          invariant(srcFiles, 'src files not initialised');
+          let remaining = srcFiles.length;
+          if (!remaining) {
+            onDone();
+          }
+          for (var _iterator6 = srcFiles, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) {
+            var _ref8;
+
+            if (_isArray6) {
+              if (_i6 >= _iterator6.length) break;
+              _ref8 = _iterator6[_i6++];
+            } else {
+              _i6 = _iterator6.next();
+              if (_i6.done) break;
+              _ref8 = _i6.value;
+            }
+
+            const file = _ref8;
+
+            queue.push({
+              dest: (_path || _load_path()).default.join(dest, file),
+              onFresh,
+              onDone: function (_onDone) {
+                function onDone() {
+                  return _onDone.apply(this, arguments);
+                }
+
+                onDone.toString = function () {
+                  return _onDone.toString();
+                };
+
+                return onDone;
+              }(function () {
+                if (--remaining === 0) {
+                  onDone();
+                }
+              }),
+              src: (_path || _load_path()).default.join(src, file)
+            });
+          }
+        } else if (srcStat.isFile()) {
+          onFresh();
+          actions.file.push({
+            src,
+            dest,
+            atime: srcStat.atime,
+            mtime: srcStat.mtime,
+            mode: srcStat.mode
+          });
+          onDone();
+        } else {
+          throw new Error(`unsure how to copy this: ${src}`);
+        }
+      });
+
+      return function build(_x5) {
+        return _ref5.apply(this, arguments);
+      };
+    })();
+
+    const artifactFiles = new Set(events.artifactFiles || []);
+    const files = new Set();
+
+    // initialise events
+    for (var _iterator = queue, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+      var _ref2;
+
+      if (_isArray) {
+        if (_i >= _iterator.length) break;
+        _ref2 = _iterator[_i++];
+      } else {
+        _i = _iterator.next();
+        if (_i.done) break;
+        _ref2 = _i.value;
+      }
+
+      const item = _ref2;
+
+      const onDone = item.onDone;
+      item.onDone = function () {
+        events.onProgress(item.dest);
+        if (onDone) {
+          onDone();
+        }
+      };
+    }
+    events.onStart(queue.length);
+
+    // start building actions
+    const actions = {
+      file: [],
+      symlink: [],
+      link: []
+    };
+
+    // custom concurrency logic as we're always executing stacks of CONCURRENT_QUEUE_ITEMS queue items
+    // at a time due to the requirement to push items onto the queue
+    while (queue.length) {
+      const items = queue.splice(0, CONCURRENT_QUEUE_ITEMS);
+      yield Promise.all(items.map(build));
+    }
+
+    // simulate the existence of some files to prevent considering them extraneous
+    for (var _iterator2 = artifactFiles, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+      var _ref3;
+
+      if (_isArray2) {
+        if (_i2 >= _iterator2.length) break;
+        _ref3 = _iterator2[_i2++];
+      } else {
+        _i2 = _iterator2.next();
+        if (_i2.done) break;
+        _ref3 = _i2.value;
+      }
+
+      const file = _ref3;
+
+      if (possibleExtraneous.has(file)) {
+        reporter.verbose(reporter.lang('verboseFilePhantomExtraneous', file));
+        possibleExtraneous.delete(file);
+      }
+    }
+
+    for (var _iterator3 = possibleExtraneous, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
+      var _ref4;
+
+      if (_isArray3) {
+        if (_i3 >= _iterator3.length) break;
+        _ref4 = _iterator3[_i3++];
+      } else {
+        _i3 = _iterator3.next();
+        if (_i3.done) break;
+        _ref4 = _i3.value;
+      }
+
+      const loc = _ref4;
+
+      if (files.has(loc.toLowerCase())) {
+        possibleExtraneous.delete(loc);
+      }
+    }
+
+    return actions;
+  });
+
+  return function buildActionsForCopy(_x, _x2, _x3, _x4) {
+    return _ref.apply(this, arguments);
+  };
+})();
+
+let buildActionsForHardlink = (() => {
+  var _ref9 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (queue, events, possibleExtraneous, reporter) {
+
+    //
+    let build = (() => {
+      var _ref13 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (data) {
+        const src = data.src,
+              dest = data.dest;
+
+        const onFresh = data.onFresh || noop;
+        const onDone = data.onDone || noop;
+        if (files.has(dest.toLowerCase())) {
+          // Fixes issue https://github.com/yarnpkg/yarn/issues/2734
+          // When bulk hardlinking we have A -> B structure that we want to hardlink to A1 -> B1,
+          // package-linker passes that modules A1 and B1 need to be hardlinked,
+          // the recursive linking algorithm of A1 ends up scheduling files in B1 to be linked twice which will case
+          // an exception.
+          onDone();
+          return;
+        }
+        files.add(dest.toLowerCase());
+
+        if (events.ignoreBasenames.indexOf((_path || _load_path()).default.basename(src)) >= 0) {
+          // ignored file
+          return;
+        }
+
+        const srcStat = yield lstat(src);
+        let srcFiles;
+
+        if (srcStat.isDirectory()) {
+          srcFiles = yield readdir(src);
+        }
+
+        const destExists = yield exists(dest);
+        if (destExists) {
+          const destStat = yield lstat(dest);
+
+          const bothSymlinks = srcStat.isSymbolicLink() && destStat.isSymbolicLink();
+          const bothFolders = srcStat.isDirectory() && destStat.isDirectory();
+          const bothFiles = srcStat.isFile() && destStat.isFile();
+
+          if (srcStat.mode !== destStat.mode) {
+            try {
+              yield access(dest, srcStat.mode);
+            } catch (err) {
+              // EINVAL access errors sometimes happen which shouldn't because node shouldn't be giving
+              // us modes that aren't valid. investigate this, it's generally safe to proceed.
+              reporter.verbose(err);
+            }
+          }
+
+          if (bothFiles && artifactFiles.has(dest)) {
+            // this file gets changed during build, likely by a custom install script. Don't bother checking it.
+            onDone();
+            reporter.verbose(reporter.lang('verboseFileSkipArtifact', src));
+            return;
+          }
+
+          // correct hardlink
+          if (bothFiles && srcStat.ino !== null && srcStat.ino === destStat.ino) {
+            onDone();
+            reporter.verbose(reporter.lang('verboseFileSkip', src, dest, srcStat.ino));
+            return;
+          }
+
+          if (bothSymlinks) {
+            const srcReallink = yield readlink(src);
+            if (srcReallink === (yield readlink(dest))) {
+              // if both symlinks are the same then we can continue on
+              onDone();
+              reporter.verbose(reporter.lang('verboseFileSkipSymlink', src, dest, srcReallink));
+              return;
+            }
+          }
+
+          if (bothFolders) {
+            // mark files that aren't in this folder as possibly extraneous
+            const destFiles = yield readdir(dest);
+            invariant(srcFiles, 'src files not initialised');
+
+            for (var _iterator10 = destFiles, _isArray10 = Array.isArray(_iterator10), _i10 = 0, _iterator10 = _isArray10 ? _iterator10 : _iterator10[Symbol.iterator]();;) {
+              var _ref14;
+
+              if (_isArray10) {
+                if (_i10 >= _iterator10.length) break;
+                _ref14 = _iterator10[_i10++];
+              } else {
+                _i10 = _iterator10.next();
+                if (_i10.done) break;
+                _ref14 = _i10.value;
+              }
+
+              const file = _ref14;
+
+              if (srcFiles.indexOf(file) < 0) {
+                const loc = (_path || _load_path()).default.join(dest, file);
+                possibleExtraneous.add(loc);
+
+                if ((yield lstat(loc)).isDirectory()) {
+                  for (var _iterator11 = yield readdir(loc), _isArray11 = Array.isArray(_iterator11), _i11 = 0, _iterator11 = _isArray11 ? _iterator11 : _iterator11[Symbol.iterator]();;) {
+                    var _ref15;
+
+                    if (_isArray11) {
+                      if (_i11 >= _iterator11.length) break;
+                      _ref15 = _iterator11[_i11++];
+                    } else {
+                      _i11 = _iterator11.next();
+                      if (_i11.done) break;
+                      _ref15 = _i11.value;
+                    }
+
+                    const file = _ref15;
+
+                    possibleExtraneous.add((_path || _load_path()).default.join(loc, file));
+                  }
+                }
+              }
+            }
+          }
+        }
+
+        if (srcStat.isSymbolicLink()) {
+          onFresh();
+          const linkname = yield readlink(src);
+          actions.symlink.push({
+            dest,
+            linkname
+          });
+          onDone();
+        } else if (srcStat.isDirectory()) {
+          reporter.verbose(reporter.lang('verboseFileFolder', dest));
+          yield mkdirp(dest);
+
+          const destParts = dest.split((_path || _load_path()).default.sep);
+          while (destParts.length) {
+            files.add(destParts.join((_path || _load_path()).default.sep).toLowerCase());
+            destParts.pop();
+          }
+
+          // push all files to queue
+          invariant(srcFiles, 'src files not initialised');
+          let remaining = srcFiles.length;
+          if (!remaining) {
+            onDone();
+          }
+          for (var _iterator12 = srcFiles, _isArray12 = Array.isArray(_iterator12), _i12 = 0, _iterator12 = _isArray12 ? _iterator12 : _iterator12[Symbol.iterator]();;) {
+            var _ref16;
+
+            if (_isArray12) {
+              if (_i12 >= _iterator12.length) break;
+              _ref16 = _iterator12[_i12++];
+            } else {
+              _i12 = _iterator12.next();
+              if (_i12.done) break;
+              _ref16 = _i12.value;
+            }
+
+            const file = _ref16;
+
+            queue.push({
+              onFresh,
+              src: (_path || _load_path()).default.join(src, file),
+              dest: (_path || _load_path()).default.join(dest, file),
+              onDone: function (_onDone2) {
+                function onDone() {
+                  return _onDone2.apply(this, arguments);
+                }
+
+                onDone.toString = function () {
+                  return _onDone2.toString();
+                };
+
+                return onDone;
+              }(function () {
+                if (--remaining === 0) {
+                  onDone();
+                }
+              })
+            });
+          }
+        } else if (srcStat.isFile()) {
+          onFresh();
+          actions.link.push({
+            src,
+            dest,
+            removeDest: destExists
+          });
+          onDone();
+        } else {
+          throw new Error(`unsure how to copy this: ${src}`);
+        }
+      });
+
+      return function build(_x10) {
+        return _ref13.apply(this, arguments);
+      };
+    })();
+
+    const artifactFiles = new Set(events.artifactFiles || []);
+    const files = new Set();
+
+    // initialise events
+    for (var _iterator7 = queue, _isArray7 = Array.isArray(_iterator7), _i7 = 0, _iterator7 = _isArray7 ? _iterator7 : _iterator7[Symbol.iterator]();;) {
+      var _ref10;
+
+      if (_isArray7) {
+        if (_i7 >= _iterator7.length) break;
+        _ref10 = _iterator7[_i7++];
+      } else {
+        _i7 = _iterator7.next();
+        if (_i7.done) break;
+        _ref10 = _i7.value;
+      }
+
+      const item = _ref10;
+
+      const onDone = item.onDone || noop;
+      item.onDone = function () {
+        events.onProgress(item.dest);
+        onDone();
+      };
+    }
+    events.onStart(queue.length);
+
+    // start building actions
+    const actions = {
+      file: [],
+      symlink: [],
+      link: []
+    };
+
+    // custom concurrency logic as we're always executing stacks of CONCURRENT_QUEUE_ITEMS queue items
+    // at a time due to the requirement to push items onto the queue
+    while (queue.length) {
+      const items = queue.splice(0, CONCURRENT_QUEUE_ITEMS);
+      yield Promise.all(items.map(build));
+    }
+
+    // simulate the existence of some files to prevent considering them extraneous
+    for (var _iterator8 = artifactFiles, _isArray8 = Array.isArray(_iterator8), _i8 = 0, _iterator8 = _isArray8 ? _iterator8 : _iterator8[Symbol.iterator]();;) {
+      var _ref11;
+
+      if (_isArray8) {
+        if (_i8 >= _iterator8.length) break;
+        _ref11 = _iterator8[_i8++];
+      } else {
+        _i8 = _iterator8.next();
+        if (_i8.done) break;
+        _ref11 = _i8.value;
+      }
+
+      const file = _ref11;
+
+      if (possibleExtraneous.has(file)) {
+        reporter.verbose(reporter.lang('verboseFilePhantomExtraneous', file));
+        possibleExtraneous.delete(file);
+      }
+    }
+
+    for (var _iterator9 = possibleExtraneous, _isArray9 = Array.isArray(_iterator9), _i9 = 0, _iterator9 = _isArray9 ? _iterator9 : _iterator9[Symbol.iterator]();;) {
+      var _ref12;
+
+      if (_isArray9) {
+        if (_i9 >= _iterator9.length) break;
+        _ref12 = _iterator9[_i9++];
+      } else {
+        _i9 = _iterator9.next();
+        if (_i9.done) break;
+        _ref12 = _i9.value;
+      }
+
+      const loc = _ref12;
+
+      if (files.has(loc.toLowerCase())) {
+        possibleExtraneous.delete(loc);
+      }
+    }
+
+    return actions;
+  });
+
+  return function buildActionsForHardlink(_x6, _x7, _x8, _x9) {
+    return _ref9.apply(this, arguments);
+  };
+})();
+
+let copyBulk = exports.copyBulk = (() => {
+  var _ref17 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (queue, reporter, _events) {
+    const events = {
+      onStart: _events && _events.onStart || noop,
+      onProgress: _events && _events.onProgress || noop,
+      possibleExtraneous: _events ? _events.possibleExtraneous : new Set(),
+      ignoreBasenames: _events && _events.ignoreBasenames || [],
+      artifactFiles: _events && _events.artifactFiles || []
+    };
+
+    const actions = yield buildActionsForCopy(queue, events, events.possibleExtraneous, reporter);
+    events.onStart(actions.file.length + actions.symlink.length + actions.link.length);
+
+    const fileActions = actions.file;
+
+    const currentlyWriting = new Map();
+
+    yield (_promise || _load_promise()).queue(fileActions, (() => {
+      var _ref18 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (data) {
+        let writePromise;
+        while (writePromise = currentlyWriting.get(data.dest)) {
+          yield writePromise;
+        }
+
+        reporter.verbose(reporter.lang('verboseFileCopy', data.src, data.dest));
+        const copier = (0, (_fsNormalized || _load_fsNormalized()).copyFile)(data, function () {
+          return currentlyWriting.delete(data.dest);
+        });
+        currentlyWriting.set(data.dest, copier);
+        events.onProgress(data.dest);
+        return copier;
+      });
+
+      return function (_x14) {
+        return _ref18.apply(this, arguments);
+      };
+    })(), CONCURRENT_QUEUE_ITEMS);
+
+    // we need to copy symlinks last as they could reference files we were copying
+    const symlinkActions = actions.symlink;
+    yield (_promise || _load_promise()).queue(symlinkActions, function (data) {
+      const linkname = (_path || _load_path()).default.resolve((_path || _load_path()).default.dirname(data.dest), data.linkname);
+      reporter.verbose(reporter.lang('verboseFileSymlink', data.dest, linkname));
+      return symlink(linkname, data.dest);
+    });
+  });
+
+  return function copyBulk(_x11, _x12, _x13) {
+    return _ref17.apply(this, arguments);
+  };
+})();
+
+let hardlinkBulk = exports.hardlinkBulk = (() => {
+  var _ref19 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (queue, reporter, _events) {
+    const events = {
+      onStart: _events && _events.onStart || noop,
+      onProgress: _events && _events.onProgress || noop,
+      possibleExtraneous: _events ? _events.possibleExtraneous : new Set(),
+      artifactFiles: _events && _events.artifactFiles || [],
+      ignoreBasenames: []
+    };
+
+    const actions = yield buildActionsForHardlink(queue, events, events.possibleExtraneous, reporter);
+    events.onStart(actions.file.length + actions.symlink.length + actions.link.length);
+
+    const fileActions = actions.link;
+
+    yield (_promise || _load_promise()).queue(fileActions, (() => {
+      var _ref20 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (data) {
+        reporter.verbose(reporter.lang('verboseFileLink', data.src, data.dest));
+        if (data.removeDest) {
+          yield (0, (_fsNormalized || _load_fsNormalized()).unlink)(data.dest);
+        }
+        yield link(data.src, data.dest);
+      });
+
+      return function (_x18) {
+        return _ref20.apply(this, arguments);
+      };
+    })(), CONCURRENT_QUEUE_ITEMS);
+
+    // we need to copy symlinks last as they could reference files we were copying
+    const symlinkActions = actions.symlink;
+    yield (_promise || _load_promise()).queue(symlinkActions, function (data) {
+      const linkname = (_path || _load_path()).default.resolve((_path || _load_path()).default.dirname(data.dest), data.linkname);
+      reporter.verbose(reporter.lang('verboseFileSymlink', data.dest, linkname));
+      return symlink(linkname, data.dest);
+    });
+  });
+
+  return function hardlinkBulk(_x15, _x16, _x17) {
+    return _ref19.apply(this, arguments);
+  };
+})();
+
+let readFileAny = exports.readFileAny = (() => {
+  var _ref21 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (files) {
+    for (var _iterator13 = files, _isArray13 = Array.isArray(_iterator13), _i13 = 0, _iterator13 = _isArray13 ? _iterator13 : _iterator13[Symbol.iterator]();;) {
+      var _ref22;
+
+      if (_isArray13) {
+        if (_i13 >= _iterator13.length) break;
+        _ref22 = _iterator13[_i13++];
+      } else {
+        _i13 = _iterator13.next();
+        if (_i13.done) break;
+        _ref22 = _i13.value;
+      }
+
+      const file = _ref22;
+
+      if (yield exists(file)) {
+        return readFile(file);
+      }
+    }
+    return null;
+  });
+
+  return function readFileAny(_x19) {
+    return _ref21.apply(this, arguments);
+  };
+})();
+
+let readJson = exports.readJson = (() => {
+  var _ref23 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (loc) {
+    return (yield readJsonAndFile(loc)).object;
+  });
+
+  return function readJson(_x20) {
+    return _ref23.apply(this, arguments);
+  };
+})();
+
+let readJsonAndFile = exports.readJsonAndFile = (() => {
+  var _ref24 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (loc) {
+    const file = yield readFile(loc);
+    try {
+      return {
+        object: (0, (_map || _load_map()).default)(JSON.parse(stripBOM(file))),
+        content: file
+      };
+    } catch (err) {
+      err.message = `${loc}: ${err.message}`;
+      throw err;
+    }
+  });
+
+  return function readJsonAndFile(_x21) {
+    return _ref24.apply(this, arguments);
+  };
+})();
+
+let find = exports.find = (() => {
+  var _ref25 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (filename, dir) {
+    const parts = dir.split((_path || _load_path()).default.sep);
+
+    while (parts.length) {
+      const loc = parts.concat(filename).join((_path || _load_path()).default.sep);
+
+      if (yield exists(loc)) {
+        return loc;
+      } else {
+        parts.pop();
+      }
+    }
+
+    return false;
+  });
+
+  return function find(_x22, _x23) {
+    return _ref25.apply(this, arguments);
+  };
+})();
+
+let symlink = exports.symlink = (() => {
+  var _ref26 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (src, dest) {
+    if (process.platform !== 'win32') {
+      // use relative paths otherwise which will be retained if the directory is moved
+      src = (_path || _load_path()).default.relative((_path || _load_path()).default.dirname(dest), src);
+      // When path.relative returns an empty string for the current directory, we should instead use
+      // '.', which is a valid fs.symlink target.
+      src = src || '.';
+    }
+
+    try {
+      const stats = yield lstat(dest);
+      if (stats.isSymbolicLink()) {
+        const resolved = dest;
+        if (resolved === src) {
+          return;
+        }
+      }
+    } catch (err) {
+      if (err.code !== 'ENOENT') {
+        throw err;
+      }
+    }
+
+    // We use rimraf for unlink which never throws an ENOENT on missing target
+    yield (0, (_fsNormalized || _load_fsNormalized()).unlink)(dest);
+
+    if (process.platform === 'win32') {
+      // use directory junctions if possible on win32, this requires absolute paths
+      yield fsSymlink(src, dest, 'junction');
+    } else {
+      yield fsSymlink(src, dest);
+    }
+  });
+
+  return function symlink(_x24, _x25) {
+    return _ref26.apply(this, arguments);
+  };
+})();
+
+let walk = exports.walk = (() => {
+  var _ref27 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (dir, relativeDir, ignoreBasenames = new Set()) {
+    let files = [];
+
+    let filenames = yield readdir(dir);
+    if (ignoreBasenames.size) {
+      filenames = filenames.filter(function (name) {
+        return !ignoreBasenames.has(name);
+      });
+    }
+
+    for (var _iterator14 = filenames, _isArray14 = Array.isArray(_iterator14), _i14 = 0, _iterator14 = _isArray14 ? _iterator14 : _iterator14[Symbol.iterator]();;) {
+      var _ref28;
+
+      if (_isArray14) {
+        if (_i14 >= _iterator14.length) break;
+        _ref28 = _iterator14[_i14++];
+      } else {
+        _i14 = _iterator14.next();
+        if (_i14.done) break;
+        _ref28 = _i14.value;
+      }
+
+      const name = _ref28;
+
+      const relative = relativeDir ? (_path || _load_path()).default.join(relativeDir, name) : name;
+      const loc = (_path || _load_path()).default.join(dir, name);
+      const stat = yield lstat(loc);
+
+      files.push({
+        relative,
+        basename: name,
+        absolute: loc,
+        mtime: +stat.mtime
+      });
+
+      if (stat.isDirectory()) {
+        files = files.concat((yield walk(loc, relative, ignoreBasenames)));
+      }
+    }
+
+    return files;
+  });
+
+  return function walk(_x26, _x27) {
+    return _ref27.apply(this, arguments);
+  };
+})();
+
+let getFileSizeOnDisk = exports.getFileSizeOnDisk = (() => {
+  var _ref29 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (loc) {
+    const stat = yield lstat(loc);
+    const size = stat.size,
+          blockSize = stat.blksize;
+
+
+    return Math.ceil(size / blockSize) * blockSize;
+  });
+
+  return function getFileSizeOnDisk(_x28) {
+    return _ref29.apply(this, arguments);
+  };
+})();
+
+let getEolFromFile = (() => {
+  var _ref30 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (path) {
+    if (!(yield exists(path))) {
+      return undefined;
+    }
+
+    const buffer = yield readFileBuffer(path);
+
+    for (let i = 0; i < buffer.length; ++i) {
+      if (buffer[i] === cr) {
+        return '\r\n';
+      }
+      if (buffer[i] === lf) {
+        return '\n';
+      }
+    }
+    return undefined;
+  });
+
+  return function getEolFromFile(_x29) {
+    return _ref30.apply(this, arguments);
+  };
+})();
+
+let writeFilePreservingEol = exports.writeFilePreservingEol = (() => {
+  var _ref31 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (path, data) {
+    const eol = (yield getEolFromFile(path)) || (_os || _load_os()).default.EOL;
+    if (eol !== '\n') {
+      data = data.replace(/\n/g, eol);
+    }
+    yield writeFile(path, data);
+  });
+
+  return function writeFilePreservingEol(_x30, _x31) {
+    return _ref31.apply(this, arguments);
+  };
+})();
+
+let hardlinksWork = exports.hardlinksWork = (() => {
+  var _ref32 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (dir) {
+    const filename = 'test-file' + Math.random();
+    const file = (_path || _load_path()).default.join(dir, filename);
+    const fileLink = (_path || _load_path()).default.join(dir, filename + '-link');
+    try {
+      yield writeFile(file, 'test');
+      yield link(file, fileLink);
+    } catch (err) {
+      return false;
+    } finally {
+      yield (0, (_fsNormalized || _load_fsNormalized()).unlink)(file);
+      yield (0, (_fsNormalized || _load_fsNormalized()).unlink)(fileLink);
+    }
+    return true;
+  });
+
+  return function hardlinksWork(_x32) {
+    return _ref32.apply(this, arguments);
+  };
+})();
+
+// not a strict polyfill for Node's fs.mkdtemp
+
+
+let makeTempDir = exports.makeTempDir = (() => {
+  var _ref33 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (prefix) {
+    const dir = (_path || _load_path()).default.join((_os || _load_os()).default.tmpdir(), `yarn-${prefix || ''}-${Date.now()}-${Math.random()}`);
+    yield (0, (_fsNormalized || _load_fsNormalized()).unlink)(dir);
+    yield mkdirp(dir);
+    return dir;
+  });
+
+  return function makeTempDir(_x33) {
+    return _ref33.apply(this, arguments);
+  };
+})();
+
+let readFirstAvailableStream = exports.readFirstAvailableStream = (() => {
+  var _ref34 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (paths) {
+    for (var _iterator15 = paths, _isArray15 = Array.isArray(_iterator15), _i15 = 0, _iterator15 = _isArray15 ? _iterator15 : _iterator15[Symbol.iterator]();;) {
+      var _ref35;
+
+      if (_isArray15) {
+        if (_i15 >= _iterator15.length) break;
+        _ref35 = _iterator15[_i15++];
+      } else {
+        _i15 = _iterator15.next();
+        if (_i15.done) break;
+        _ref35 = _i15.value;
+      }
+
+      const path = _ref35;
+
+      try {
+        const fd = yield open(path, 'r');
+        return (_fs || _load_fs()).default.createReadStream(path, { fd });
+      } catch (err) {
+        // Try the next one
+      }
+    }
+    return null;
+  });
+
+  return function readFirstAvailableStream(_x34) {
+    return _ref34.apply(this, arguments);
+  };
+})();
+
+let getFirstSuitableFolder = exports.getFirstSuitableFolder = (() => {
+  var _ref36 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (paths, mode = constants.W_OK | constants.X_OK) {
+    const result = {
+      skipped: [],
+      folder: null
+    };
+
+    for (var _iterator16 = paths, _isArray16 = Array.isArray(_iterator16), _i16 = 0, _iterator16 = _isArray16 ? _iterator16 : _iterator16[Symbol.iterator]();;) {
+      var _ref37;
+
+      if (_isArray16) {
+        if (_i16 >= _iterator16.length) break;
+        _ref37 = _iterator16[_i16++];
+      } else {
+        _i16 = _iterator16.next();
+        if (_i16.done) break;
+        _ref37 = _i16.value;
+      }
+
+      const folder = _ref37;
+
+      try {
+        yield mkdirp(folder);
+        yield access(folder, mode);
+
+        result.folder = folder;
+
+        return result;
+      } catch (error) {
+        result.skipped.push({
+          error,
+          folder
+        });
+      }
+    }
+    return result;
+  });
+
+  return function getFirstSuitableFolder(_x35) {
+    return _ref36.apply(this, arguments);
+  };
+})();
+
+exports.copy = copy;
+exports.readFile = readFile;
+exports.readFileRaw = readFileRaw;
+exports.normalizeOS = normalizeOS;
+
+var _fs;
+
+function _load_fs() {
+  return _fs = _interopRequireDefault(__webpack_require__(5));
+}
+
+var _glob;
+
+function _load_glob() {
+  return _glob = _interopRequireDefault(__webpack_require__(99));
+}
+
+var _os;
+
+function _load_os() {
+  return _os = _interopRequireDefault(__webpack_require__(49));
+}
+
+var _path;
+
+function _load_path() {
+  return _path = _interopRequireDefault(__webpack_require__(0));
+}
+
+var _blockingQueue;
+
+function _load_blockingQueue() {
+  return _blockingQueue = _interopRequireDefault(__webpack_require__(110));
+}
+
+var _promise;
+
+function _load_promise() {
+  return _promise = _interopRequireWildcard(__webpack_require__(50));
+}
+
+var _promise2;
+
+function _load_promise2() {
+  return _promise2 = __webpack_require__(50);
+}
+
+var _map;
+
+function _load_map() {
+  return _map = _interopRequireDefault(__webpack_require__(29));
+}
+
+var _fsNormalized;
+
+function _load_fsNormalized() {
+  return _fsNormalized = __webpack_require__(218);
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const constants = exports.constants = typeof (_fs || _load_fs()).default.constants !== 'undefined' ? (_fs || _load_fs()).default.constants : {
+  R_OK: (_fs || _load_fs()).default.R_OK,
+  W_OK: (_fs || _load_fs()).default.W_OK,
+  X_OK: (_fs || _load_fs()).default.X_OK
+};
+
+const lockQueue = exports.lockQueue = new (_blockingQueue || _load_blockingQueue()).default('fs lock');
+
+const readFileBuffer = exports.readFileBuffer = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.readFile);
+const open = exports.open = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.open);
+const writeFile = exports.writeFile = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.writeFile);
+const readlink = exports.readlink = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.readlink);
+const realpath = exports.realpath = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.realpath);
+const readdir = exports.readdir = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.readdir);
+const rename = exports.rename = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.rename);
+const access = exports.access = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.access);
+const stat = exports.stat = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.stat);
+const mkdirp = exports.mkdirp = (0, (_promise2 || _load_promise2()).promisify)(__webpack_require__(145));
+const exists = exports.exists = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.exists, true);
+const lstat = exports.lstat = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.lstat);
+const chmod = exports.chmod = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.chmod);
+const link = exports.link = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.link);
+const glob = exports.glob = (0, (_promise2 || _load_promise2()).promisify)((_glob || _load_glob()).default);
+exports.unlink = (_fsNormalized || _load_fsNormalized()).unlink;
+
+// fs.copyFile uses the native file copying instructions on the system, performing much better
+// than any JS-based solution and consumes fewer resources. Repeated testing to fine tune the
+// concurrency level revealed 128 as the sweet spot on a quad-core, 16 CPU Intel system with SSD.
+
+const CONCURRENT_QUEUE_ITEMS = (_fs || _load_fs()).default.copyFile ? 128 : 4;
+
+const fsSymlink = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.symlink);
+const invariant = __webpack_require__(9);
+const stripBOM = __webpack_require__(160);
+
+const noop = () => {};
+
+function copy(src, dest, reporter) {
+  return copyBulk([{ src, dest }], reporter);
+}
+
+function _readFile(loc, encoding) {
+  return new Promise((resolve, reject) => {
+    (_fs || _load_fs()).default.readFile(loc, encoding, function (err, content) {
+      if (err) {
+        reject(err);
+      } else {
+        resolve(content);
+      }
+    });
+  });
+}
+
+function readFile(loc) {
+  return _readFile(loc, 'utf8').then(normalizeOS);
+}
+
+function readFileRaw(loc) {
+  return _readFile(loc, 'binary');
+}
+
+function normalizeOS(body) {
+  return body.replace(/\r\n/g, '\n');
+}
+
+const cr = '\r'.charCodeAt(0);
+const lf = '\n'.charCodeAt(0);
+
+/***/ }),
+/* 5 */
+/***/ (function(module, exports) {
+
+module.exports = require("fs");
+
+/***/ }),
+/* 6 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+class MessageError extends Error {
+  constructor(msg, code) {
+    super(msg);
+    this.code = code;
+  }
+
+}
+
+exports.MessageError = MessageError;
+class ProcessSpawnError extends MessageError {
+  constructor(msg, code, process) {
+    super(msg, code);
+    this.process = process;
+  }
+
+}
+
+exports.ProcessSpawnError = ProcessSpawnError;
+class SecurityError extends MessageError {}
+
+exports.SecurityError = SecurityError;
+class ProcessTermError extends MessageError {}
+
+exports.ProcessTermError = ProcessTermError;
+class ResponseError extends Error {
+  constructor(msg, responseCode) {
+    super(msg);
+    this.responseCode = responseCode;
+  }
+
+}
+
+exports.ResponseError = ResponseError;
+class OneTimePasswordError extends Error {}
+exports.OneTimePasswordError = OneTimePasswordError;
+
+/***/ }),
+/* 7 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Subscriber; });
+/* unused harmony export SafeSubscriber */
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_isFunction__ = __webpack_require__(154);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Observer__ = __webpack_require__(420);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__Subscription__ = __webpack_require__(25);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__internal_symbol_rxSubscriber__ = __webpack_require__(321);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__config__ = __webpack_require__(185);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__util_hostReportError__ = __webpack_require__(323);
+/** PURE_IMPORTS_START tslib,_util_isFunction,_Observer,_Subscription,_internal_symbol_rxSubscriber,_config,_util_hostReportError PURE_IMPORTS_END */
+
+
+
+
+
+
+
+var Subscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](Subscriber, _super);
+    function Subscriber(destinationOrNext, error, complete) {
+        var _this = _super.call(this) || this;
+        _this.syncErrorValue = null;
+        _this.syncErrorThrown = false;
+        _this.syncErrorThrowable = false;
+        _this.isStopped = false;
+        _this._parentSubscription = null;
+        switch (arguments.length) {
+            case 0:
+                _this.destination = __WEBPACK_IMPORTED_MODULE_2__Observer__["a" /* empty */];
+                break;
+            case 1:
+                if (!destinationOrNext) {
+                    _this.destination = __WEBPACK_IMPORTED_MODULE_2__Observer__["a" /* empty */];
+                    break;
+                }
+                if (typeof destinationOrNext === 'object') {
+                    if (destinationOrNext instanceof Subscriber) {
+                        _this.syncErrorThrowable = destinationOrNext.syncErrorThrowable;
+                        _this.destination = destinationOrNext;
+                        destinationOrNext.add(_this);
+                    }
+                    else {
+                        _this.syncErrorThrowable = true;
+                        _this.destination = new SafeSubscriber(_this, destinationOrNext);
+                    }
+                    break;
+                }
+            default:
+                _this.syncErrorThrowable = true;
+                _this.destination = new SafeSubscriber(_this, destinationOrNext, error, complete);
+                break;
+        }
+        return _this;
+    }
+    Subscriber.prototype[__WEBPACK_IMPORTED_MODULE_4__internal_symbol_rxSubscriber__["a" /* rxSubscriber */]] = function () { return this; };
+    Subscriber.create = function (next, error, complete) {
+        var subscriber = new Subscriber(next, error, complete);
+        subscriber.syncErrorThrowable = false;
+        return subscriber;
+    };
+    Subscriber.prototype.next = function (value) {
+        if (!this.isStopped) {
+            this._next(value);
+        }
+    };
+    Subscriber.prototype.error = function (err) {
+        if (!this.isStopped) {
+            this.isStopped = true;
+            this._error(err);
+        }
+    };
+    Subscriber.prototype.complete = function () {
+        if (!this.isStopped) {
+            this.isStopped = true;
+            this._complete();
+        }
+    };
+    Subscriber.prototype.unsubscribe = function () {
+        if (this.closed) {
+            return;
+        }
+        this.isStopped = true;
+        _super.prototype.unsubscribe.call(this);
+    };
+    Subscriber.prototype._next = function (value) {
+        this.destination.next(value);
+    };
+    Subscriber.prototype._error = function (err) {
+        this.destination.error(err);
+        this.unsubscribe();
+    };
+    Subscriber.prototype._complete = function () {
+        this.destination.complete();
+        this.unsubscribe();
+    };
+    Subscriber.prototype._unsubscribeAndRecycle = function () {
+        var _a = this, _parent = _a._parent, _parents = _a._parents;
+        this._parent = null;
+        this._parents = null;
+        this.unsubscribe();
+        this.closed = false;
+        this.isStopped = false;
+        this._parent = _parent;
+        this._parents = _parents;
+        this._parentSubscription = null;
+        return this;
+    };
+    return Subscriber;
+}(__WEBPACK_IMPORTED_MODULE_3__Subscription__["a" /* Subscription */]));
+
+var SafeSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](SafeSubscriber, _super);
+    function SafeSubscriber(_parentSubscriber, observerOrNext, error, complete) {
+        var _this = _super.call(this) || this;
+        _this._parentSubscriber = _parentSubscriber;
+        var next;
+        var context = _this;
+        if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__util_isFunction__["a" /* isFunction */])(observerOrNext)) {
+            next = observerOrNext;
+        }
+        else if (observerOrNext) {
+            next = observerOrNext.next;
+            error = observerOrNext.error;
+            complete = observerOrNext.complete;
+            if (observerOrNext !== __WEBPACK_IMPORTED_MODULE_2__Observer__["a" /* empty */]) {
+                context = Object.create(observerOrNext);
+                if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__util_isFunction__["a" /* isFunction */])(context.unsubscribe)) {
+                    _this.add(context.unsubscribe.bind(context));
+                }
+                context.unsubscribe = _this.unsubscribe.bind(_this);
+            }
+        }
+        _this._context = context;
+        _this._next = next;
+        _this._error = error;
+        _this._complete = complete;
+        return _this;
+    }
+    SafeSubscriber.prototype.next = function (value) {
+        if (!this.isStopped && this._next) {
+            var _parentSubscriber = this._parentSubscriber;
+            if (!__WEBPACK_IMPORTED_MODULE_5__config__["a" /* config */].useDeprecatedSynchronousErrorHandling || !_parentSubscriber.syncErrorThrowable) {
+                this.__tryOrUnsub(this._next, value);
+            }
+            else if (this.__tryOrSetError(_parentSubscriber, this._next, value)) {
+                this.unsubscribe();
+            }
+        }
+    };
+    SafeSubscriber.prototype.error = function (err) {
+        if (!this.isStopped) {
+            var _parentSubscriber = this._parentSubscriber;
+            var useDeprecatedSynchronousErrorHandling = __WEBPACK_IMPORTED_MODULE_5__config__["a" /* config */].useDeprecatedSynchronousErrorHandling;
+            if (this._error) {
+                if (!useDeprecatedSynchronousErrorHandling || !_parentSubscriber.syncErrorThrowable) {
+                    this.__tryOrUnsub(this._error, err);
+                    this.unsubscribe();
+                }
+                else {
+                    this.__tryOrSetError(_parentSubscriber, this._error, err);
+                    this.unsubscribe();
+                }
+            }
+            else if (!_parentSubscriber.syncErrorThrowable) {
+                this.unsubscribe();
+                if (useDeprecatedSynchronousErrorHandling) {
+                    throw err;
+                }
+                __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_6__util_hostReportError__["a" /* hostReportError */])(err);
+            }
+            else {
+                if (useDeprecatedSynchronousErrorHandling) {
+                    _parentSubscriber.syncErrorValue = err;
+                    _parentSubscriber.syncErrorThrown = true;
+                }
+                else {
+                    __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_6__util_hostReportError__["a" /* hostReportError */])(err);
+                }
+                this.unsubscribe();
+            }
+        }
+    };
+    SafeSubscriber.prototype.complete = function () {
+        var _this = this;
+        if (!this.isStopped) {
+            var _parentSubscriber = this._parentSubscriber;
+            if (this._complete) {
+                var wrappedComplete = function () { return _this._complete.call(_this._context); };
+                if (!__WEBPACK_IMPORTED_MODULE_5__config__["a" /* config */].useDeprecatedSynchronousErrorHandling || !_parentSubscriber.syncErrorThrowable) {
+                    this.__tryOrUnsub(wrappedComplete);
+                    this.unsubscribe();
+                }
+                else {
+                    this.__tryOrSetError(_parentSubscriber, wrappedComplete);
+                    this.unsubscribe();
+                }
+            }
+            else {
+                this.unsubscribe();
+            }
+        }
+    };
+    SafeSubscriber.prototype.__tryOrUnsub = function (fn, value) {
+        try {
+            fn.call(this._context, value);
+        }
+        catch (err) {
+            this.unsubscribe();
+            if (__WEBPACK_IMPORTED_MODULE_5__config__["a" /* config */].useDeprecatedSynchronousErrorHandling) {
+                throw err;
+            }
+            else {
+                __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_6__util_hostReportError__["a" /* hostReportError */])(err);
+            }
+        }
+    };
+    SafeSubscriber.prototype.__tryOrSetError = function (parent, fn, value) {
+        if (!__WEBPACK_IMPORTED_MODULE_5__config__["a" /* config */].useDeprecatedSynchronousErrorHandling) {
+            throw new Error('bad call');
+        }
+        try {
+            fn.call(this._context, value);
+        }
+        catch (err) {
+            if (__WEBPACK_IMPORTED_MODULE_5__config__["a" /* config */].useDeprecatedSynchronousErrorHandling) {
+                parent.syncErrorValue = err;
+                parent.syncErrorThrown = true;
+                return true;
+            }
+            else {
+                __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_6__util_hostReportError__["a" /* hostReportError */])(err);
+                return true;
+            }
+        }
+        return false;
+    };
+    SafeSubscriber.prototype._unsubscribe = function () {
+        var _parentSubscriber = this._parentSubscriber;
+        this._context = null;
+        this._parentSubscriber = null;
+        _parentSubscriber.unsubscribe();
+    };
+    return SafeSubscriber;
+}(Subscriber));
+
+//# sourceMappingURL=Subscriber.js.map
+
+
+/***/ }),
+/* 8 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getPathKey = getPathKey;
+const os = __webpack_require__(49);
+const path = __webpack_require__(0);
+const userHome = __webpack_require__(67).default;
+
+var _require = __webpack_require__(225);
+
+const getCacheDir = _require.getCacheDir,
+      getConfigDir = _require.getConfigDir,
+      getDataDir = _require.getDataDir;
+
+const isWebpackBundle = __webpack_require__(278);
+
+const DEPENDENCY_TYPES = exports.DEPENDENCY_TYPES = ['devDependencies', 'dependencies', 'optionalDependencies', 'peerDependencies'];
+const OWNED_DEPENDENCY_TYPES = exports.OWNED_DEPENDENCY_TYPES = ['devDependencies', 'dependencies', 'optionalDependencies'];
+
+const RESOLUTIONS = exports.RESOLUTIONS = 'resolutions';
+const MANIFEST_FIELDS = exports.MANIFEST_FIELDS = [RESOLUTIONS, ...DEPENDENCY_TYPES];
+
+const SUPPORTED_NODE_VERSIONS = exports.SUPPORTED_NODE_VERSIONS = '^4.8.0 || ^5.7.0 || ^6.2.2 || >=8.0.0';
+
+const YARN_REGISTRY = exports.YARN_REGISTRY = 'https://registry.yarnpkg.com';
+const NPM_REGISTRY_RE = exports.NPM_REGISTRY_RE = /https?:\/\/registry\.npmjs\.org/g;
+
+const YARN_DOCS = exports.YARN_DOCS = 'https://yarnpkg.com/en/docs/cli/';
+const YARN_INSTALLER_SH = exports.YARN_INSTALLER_SH = 'https://yarnpkg.com/install.sh';
+const YARN_INSTALLER_MSI = exports.YARN_INSTALLER_MSI = 'https://yarnpkg.com/latest.msi';
+
+const SELF_UPDATE_VERSION_URL = exports.SELF_UPDATE_VERSION_URL = 'https://yarnpkg.com/latest-version';
+
+// cache version, bump whenever we make backwards incompatible changes
+const CACHE_VERSION = exports.CACHE_VERSION = 6;
+
+// lockfile version, bump whenever we make backwards incompatible changes
+const LOCKFILE_VERSION = exports.LOCKFILE_VERSION = 1;
+
+// max amount of network requests to perform concurrently
+const NETWORK_CONCURRENCY = exports.NETWORK_CONCURRENCY = 8;
+
+// HTTP timeout used when downloading packages
+const NETWORK_TIMEOUT = exports.NETWORK_TIMEOUT = 30 * 1000; // in milliseconds
+
+// max amount of child processes to execute concurrently
+const CHILD_CONCURRENCY = exports.CHILD_CONCURRENCY = 5;
+
+const REQUIRED_PACKAGE_KEYS = exports.REQUIRED_PACKAGE_KEYS = ['name', 'version', '_uid'];
+
+function getPreferredCacheDirectories() {
+  const preferredCacheDirectories = [getCacheDir()];
+
+  if (process.getuid) {
+    // $FlowFixMe: process.getuid exists, dammit
+    preferredCacheDirectories.push(path.join(os.tmpdir(), `.yarn-cache-${process.getuid()}`));
+  }
+
+  preferredCacheDirectories.push(path.join(os.tmpdir(), `.yarn-cache`));
+
+  return preferredCacheDirectories;
+}
+
+const PREFERRED_MODULE_CACHE_DIRECTORIES = exports.PREFERRED_MODULE_CACHE_DIRECTORIES = getPreferredCacheDirectories();
+const CONFIG_DIRECTORY = exports.CONFIG_DIRECTORY = getConfigDir();
+const DATA_DIRECTORY = exports.DATA_DIRECTORY = getDataDir();
+const LINK_REGISTRY_DIRECTORY = exports.LINK_REGISTRY_DIRECTORY = path.join(DATA_DIRECTORY, 'link');
+const GLOBAL_MODULE_DIRECTORY = exports.GLOBAL_MODULE_DIRECTORY = path.join(DATA_DIRECTORY, 'global');
+
+const NODE_BIN_PATH = exports.NODE_BIN_PATH = process.execPath;
+const YARN_BIN_PATH = exports.YARN_BIN_PATH = getYarnBinPath();
+
+// Webpack needs to be configured with node.__dirname/__filename = false
+function getYarnBinPath() {
+  if (isWebpackBundle) {
+    return __filename;
+  } else {
+    return path.join(__dirname, '..', 'bin', 'yarn.js');
+  }
+}
+
+const NODE_MODULES_FOLDER = exports.NODE_MODULES_FOLDER = 'node_modules';
+const NODE_PACKAGE_JSON = exports.NODE_PACKAGE_JSON = 'package.json';
+
+const PNP_FILENAME = exports.PNP_FILENAME = '.pnp.js';
+
+const POSIX_GLOBAL_PREFIX = exports.POSIX_GLOBAL_PREFIX = `${process.env.DESTDIR || ''}/usr/local`;
+const FALLBACK_GLOBAL_PREFIX = exports.FALLBACK_GLOBAL_PREFIX = path.join(userHome, '.yarn');
+
+const META_FOLDER = exports.META_FOLDER = '.yarn-meta';
+const INTEGRITY_FILENAME = exports.INTEGRITY_FILENAME = '.yarn-integrity';
+const LOCKFILE_FILENAME = exports.LOCKFILE_FILENAME = 'yarn.lock';
+const METADATA_FILENAME = exports.METADATA_FILENAME = '.yarn-metadata.json';
+const TARBALL_FILENAME = exports.TARBALL_FILENAME = '.yarn-tarball.tgz';
+const CLEAN_FILENAME = exports.CLEAN_FILENAME = '.yarnclean';
+
+const NPM_LOCK_FILENAME = exports.NPM_LOCK_FILENAME = 'package-lock.json';
+const NPM_SHRINKWRAP_FILENAME = exports.NPM_SHRINKWRAP_FILENAME = 'npm-shrinkwrap.json';
+
+const DEFAULT_INDENT = exports.DEFAULT_INDENT = '  ';
+const SINGLE_INSTANCE_PORT = exports.SINGLE_INSTANCE_PORT = 31997;
+const SINGLE_INSTANCE_FILENAME = exports.SINGLE_INSTANCE_FILENAME = '.yarn-single-instance';
+
+const ENV_PATH_KEY = exports.ENV_PATH_KEY = getPathKey(process.platform, process.env);
+
+function getPathKey(platform, env) {
+  let pathKey = 'PATH';
+
+  // windows calls its path "Path" usually, but this is not guaranteed.
+  if (platform === 'win32') {
+    pathKey = 'Path';
+
+    for (const key in env) {
+      if (key.toLowerCase() === 'path') {
+        pathKey = key;
+      }
+    }
+  }
+
+  return pathKey;
+}
+
+const VERSION_COLOR_SCHEME = exports.VERSION_COLOR_SCHEME = {
+  major: 'red',
+  premajor: 'red',
+  minor: 'yellow',
+  preminor: 'yellow',
+  patch: 'green',
+  prepatch: 'green',
+  prerelease: 'red',
+  unchanged: 'white',
+  unknown: 'red'
+};
+
+/***/ }),
+/* 9 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+
+
+/**
+ * Use invariant() to assert state which your program assumes to be true.
+ *
+ * Provide sprintf-style format (only %s is supported) and arguments
+ * to provide information about what broke and what you were
+ * expecting.
+ *
+ * The invariant message will be stripped in production, but the invariant
+ * will remain to ensure logic does not differ in production.
+ */
+
+var NODE_ENV = process.env.NODE_ENV;
+
+var invariant = function(condition, format, a, b, c, d, e, f) {
+  if (NODE_ENV !== 'production') {
+    if (format === undefined) {
+      throw new Error('invariant requires an error message argument');
+    }
+  }
+
+  if (!condition) {
+    var error;
+    if (format === undefined) {
+      error = new Error(
+        'Minified exception occurred; use the non-minified dev environment ' +
+        'for the full error message and additional helpful warnings.'
+      );
+    } else {
+      var args = [a, b, c, d, e, f];
+      var argIndex = 0;
+      error = new Error(
+        format.replace(/%s/g, function() { return args[argIndex++]; })
+      );
+      error.name = 'Invariant Violation';
+    }
+
+    error.framesToPop = 1; // we don't care about invariant's own frame
+    throw error;
+  }
+};
+
+module.exports = invariant;
+
+
+/***/ }),
+/* 10 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var YAMLException = __webpack_require__(54);
+
+var TYPE_CONSTRUCTOR_OPTIONS = [
+  'kind',
+  'resolve',
+  'construct',
+  'instanceOf',
+  'predicate',
+  'represent',
+  'defaultStyle',
+  'styleAliases'
+];
+
+var YAML_NODE_KINDS = [
+  'scalar',
+  'sequence',
+  'mapping'
+];
+
+function compileStyleAliases(map) {
+  var result = {};
+
+  if (map !== null) {
+    Object.keys(map).forEach(function (style) {
+      map[style].forEach(function (alias) {
+        result[String(alias)] = style;
+      });
+    });
+  }
+
+  return result;
+}
+
+function Type(tag, options) {
+  options = options || {};
+
+  Object.keys(options).forEach(function (name) {
+    if (TYPE_CONSTRUCTOR_OPTIONS.indexOf(name) === -1) {
+      throw new YAMLException('Unknown option "' + name + '" is met in definition of "' + tag + '" YAML type.');
+    }
+  });
+
+  // TODO: Add tag format check.
+  this.tag          = tag;
+  this.kind         = options['kind']         || null;
+  this.resolve      = options['resolve']      || function () { return true; };
+  this.construct    = options['construct']    || function (data) { return data; };
+  this.instanceOf   = options['instanceOf']   || null;
+  this.predicate    = options['predicate']    || null;
+  this.represent    = options['represent']    || null;
+  this.defaultStyle = options['defaultStyle'] || null;
+  this.styleAliases = compileStyleAliases(options['styleAliases'] || null);
+
+  if (YAML_NODE_KINDS.indexOf(this.kind) === -1) {
+    throw new YAMLException('Unknown kind "' + this.kind + '" is specified for "' + tag + '" YAML type.');
+  }
+}
+
+module.exports = Type;
+
+
+/***/ }),
+/* 11 */
+/***/ (function(module, exports) {
+
+module.exports = require("crypto");
+
+/***/ }),
+/* 12 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Observable; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_canReportError__ = __webpack_require__(322);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_toSubscriber__ = __webpack_require__(932);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__internal_symbol_observable__ = __webpack_require__(117);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_pipe__ = __webpack_require__(324);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__config__ = __webpack_require__(185);
+/** PURE_IMPORTS_START _util_canReportError,_util_toSubscriber,_internal_symbol_observable,_util_pipe,_config PURE_IMPORTS_END */
+
+
+
+
+
+var Observable = /*@__PURE__*/ (function () {
+    function Observable(subscribe) {
+        this._isScalar = false;
+        if (subscribe) {
+            this._subscribe = subscribe;
+        }
+    }
+    Observable.prototype.lift = function (operator) {
+        var observable = new Observable();
+        observable.source = this;
+        observable.operator = operator;
+        return observable;
+    };
+    Observable.prototype.subscribe = function (observerOrNext, error, complete) {
+        var operator = this.operator;
+        var sink = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__util_toSubscriber__["a" /* toSubscriber */])(observerOrNext, error, complete);
+        if (operator) {
+            operator.call(sink, this.source);
+        }
+        else {
+            sink.add(this.source || (__WEBPACK_IMPORTED_MODULE_4__config__["a" /* config */].useDeprecatedSynchronousErrorHandling && !sink.syncErrorThrowable) ?
+                this._subscribe(sink) :
+                this._trySubscribe(sink));
+        }
+        if (__WEBPACK_IMPORTED_MODULE_4__config__["a" /* config */].useDeprecatedSynchronousErrorHandling) {
+            if (sink.syncErrorThrowable) {
+                sink.syncErrorThrowable = false;
+                if (sink.syncErrorThrown) {
+                    throw sink.syncErrorValue;
+                }
+            }
+        }
+        return sink;
+    };
+    Observable.prototype._trySubscribe = function (sink) {
+        try {
+            return this._subscribe(sink);
+        }
+        catch (err) {
+            if (__WEBPACK_IMPORTED_MODULE_4__config__["a" /* config */].useDeprecatedSynchronousErrorHandling) {
+                sink.syncErrorThrown = true;
+                sink.syncErrorValue = err;
+            }
+            if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__util_canReportError__["a" /* canReportError */])(sink)) {
+                sink.error(err);
+            }
+            else {
+                console.warn(err);
+            }
+        }
+    };
+    Observable.prototype.forEach = function (next, promiseCtor) {
+        var _this = this;
+        promiseCtor = getPromiseCtor(promiseCtor);
+        return new promiseCtor(function (resolve, reject) {
+            var subscription;
+            subscription = _this.subscribe(function (value) {
+                try {
+                    next(value);
+                }
+                catch (err) {
+                    reject(err);
+                    if (subscription) {
+                        subscription.unsubscribe();
+                    }
+                }
+            }, reject, resolve);
+        });
+    };
+    Observable.prototype._subscribe = function (subscriber) {
+        var source = this.source;
+        return source && source.subscribe(subscriber);
+    };
+    Observable.prototype[__WEBPACK_IMPORTED_MODULE_2__internal_symbol_observable__["a" /* observable */]] = function () {
+        return this;
+    };
+    Observable.prototype.pipe = function () {
+        var operations = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            operations[_i] = arguments[_i];
+        }
+        if (operations.length === 0) {
+            return this;
+        }
+        return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__util_pipe__["b" /* pipeFromArray */])(operations)(this);
+    };
+    Observable.prototype.toPromise = function (promiseCtor) {
+        var _this = this;
+        promiseCtor = getPromiseCtor(promiseCtor);
+        return new promiseCtor(function (resolve, reject) {
+            var value;
+            _this.subscribe(function (x) { return value = x; }, function (err) { return reject(err); }, function () { return resolve(value); });
+        });
+    };
+    Observable.create = function (subscribe) {
+        return new Observable(subscribe);
+    };
+    return Observable;
+}());
+
+function getPromiseCtor(promiseCtor) {
+    if (!promiseCtor) {
+        promiseCtor = __WEBPACK_IMPORTED_MODULE_4__config__["a" /* config */].Promise || Promise;
+    }
+    if (!promiseCtor) {
+        throw new Error('no Promise impl found');
+    }
+    return promiseCtor;
+}
+//# sourceMappingURL=Observable.js.map
+
+
+/***/ }),
+/* 13 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return OuterSubscriber; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
+/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+
+
+var OuterSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](OuterSubscriber, _super);
+    function OuterSubscriber() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    OuterSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        this.destination.next(innerValue);
+    };
+    OuterSubscriber.prototype.notifyError = function (error, innerSub) {
+        this.destination.error(error);
+    };
+    OuterSubscriber.prototype.notifyComplete = function (innerSub) {
+        this.destination.complete();
+    };
+    return OuterSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
+
+//# sourceMappingURL=OuterSubscriber.js.map
+
+
+/***/ }),
+/* 14 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = subscribeToResult;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__InnerSubscriber__ = __webpack_require__(84);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__subscribeTo__ = __webpack_require__(446);
+/** PURE_IMPORTS_START _InnerSubscriber,_subscribeTo PURE_IMPORTS_END */
+
+
+function subscribeToResult(outerSubscriber, result, outerValue, outerIndex, destination) {
+    if (destination === void 0) {
+        destination = new __WEBPACK_IMPORTED_MODULE_0__InnerSubscriber__["a" /* InnerSubscriber */](outerSubscriber, outerValue, outerIndex);
+    }
+    if (destination.closed) {
+        return;
+    }
+    return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__subscribeTo__["a" /* subscribeTo */])(result)(destination);
+}
+//# sourceMappingURL=subscribeToResult.js.map
+
+
+/***/ }),
+/* 15 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/* eslint-disable node/no-deprecated-api */
+
+
+
+var buffer = __webpack_require__(64)
+var Buffer = buffer.Buffer
+
+var safer = {}
+
+var key
+
+for (key in buffer) {
+  if (!buffer.hasOwnProperty(key)) continue
+  if (key === 'SlowBuffer' || key === 'Buffer') continue
+  safer[key] = buffer[key]
+}
+
+var Safer = safer.Buffer = {}
+for (key in Buffer) {
+  if (!Buffer.hasOwnProperty(key)) continue
+  if (key === 'allocUnsafe' || key === 'allocUnsafeSlow') continue
+  Safer[key] = Buffer[key]
+}
+
+safer.Buffer.prototype = Buffer.prototype
+
+if (!Safer.from || Safer.from === Uint8Array.from) {
+  Safer.from = function (value, encodingOrOffset, length) {
+    if (typeof value === 'number') {
+      throw new TypeError('The "value" argument must not be of type number. Received type ' + typeof value)
+    }
+    if (value && typeof value.length === 'undefined') {
+      throw new TypeError('The first argument must be one of type string, Buffer, ArrayBuffer, Array, or Array-like Object. Received type ' + typeof value)
+    }
+    return Buffer(value, encodingOrOffset, length)
+  }
+}
+
+if (!Safer.alloc) {
+  Safer.alloc = function (size, fill, encoding) {
+    if (typeof size !== 'number') {
+      throw new TypeError('The "size" argument must be of type number. Received type ' + typeof size)
+    }
+    if (size < 0 || size >= 2 * (1 << 30)) {
+      throw new RangeError('The value "' + size + '" is invalid for option "size"')
+    }
+    var buf = Buffer(size)
+    if (!fill || fill.length === 0) {
+      buf.fill(0)
+    } else if (typeof encoding === 'string') {
+      buf.fill(fill, encoding)
+    } else {
+      buf.fill(fill)
+    }
+    return buf
+  }
+}
+
+if (!safer.kStringMaxLength) {
+  try {
+    safer.kStringMaxLength = process.binding('buffer').kStringMaxLength
+  } catch (e) {
+    // we can't determine kStringMaxLength in environments where process.binding
+    // is unsupported, so let's not set it
+  }
+}
+
+if (!safer.constants) {
+  safer.constants = {
+    MAX_LENGTH: safer.kMaxLength
+  }
+  if (safer.kStringMaxLength) {
+    safer.constants.MAX_STRING_LENGTH = safer.kStringMaxLength
+  }
+}
+
+module.exports = safer
+
+
+/***/ }),
+/* 16 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// Copyright (c) 2012, Mark Cavage. All rights reserved.
+// Copyright 2015 Joyent, Inc.
+
+var assert = __webpack_require__(28);
+var Stream = __webpack_require__(23).Stream;
+var util = __webpack_require__(3);
+
+
+///--- Globals
+
+/* JSSTYLED */
+var UUID_REGEXP = /^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$/;
+
+
+///--- Internal
+
+function _capitalize(str) {
+    return (str.charAt(0).toUpperCase() + str.slice(1));
+}
+
+function _toss(name, expected, oper, arg, actual) {
+    throw new assert.AssertionError({
+        message: util.format('%s (%s) is required', name, expected),
+        actual: (actual === undefined) ? typeof (arg) : actual(arg),
+        expected: expected,
+        operator: oper || '===',
+        stackStartFunction: _toss.caller
+    });
+}
+
+function _getClass(arg) {
+    return (Object.prototype.toString.call(arg).slice(8, -1));
+}
+
+function noop() {
+    // Why even bother with asserts?
+}
+
+
+///--- Exports
+
+var types = {
+    bool: {
+        check: function (arg) { return typeof (arg) === 'boolean'; }
+    },
+    func: {
+        check: function (arg) { return typeof (arg) === 'function'; }
+    },
+    string: {
+        check: function (arg) { return typeof (arg) === 'string'; }
+    },
+    object: {
+        check: function (arg) {
+            return typeof (arg) === 'object' && arg !== null;
+        }
+    },
+    number: {
+        check: function (arg) {
+            return typeof (arg) === 'number' && !isNaN(arg);
+        }
+    },
+    finite: {
+        check: function (arg) {
+            return typeof (arg) === 'number' && !isNaN(arg) && isFinite(arg);
+        }
+    },
+    buffer: {
+        check: function (arg) { return Buffer.isBuffer(arg); },
+        operator: 'Buffer.isBuffer'
+    },
+    array: {
+        check: function (arg) { return Array.isArray(arg); },
+        operator: 'Array.isArray'
+    },
+    stream: {
+        check: function (arg) { return arg instanceof Stream; },
+        operator: 'instanceof',
+        actual: _getClass
+    },
+    date: {
+        check: function (arg) { return arg instanceof Date; },
+        operator: 'instanceof',
+        actual: _getClass
+    },
+    regexp: {
+        check: function (arg) { return arg instanceof RegExp; },
+        operator: 'instanceof',
+        actual: _getClass
+    },
+    uuid: {
+        check: function (arg) {
+            return typeof (arg) === 'string' && UUID_REGEXP.test(arg);
+        },
+        operator: 'isUUID'
+    }
+};
+
+function _setExports(ndebug) {
+    var keys = Object.keys(types);
+    var out;
+
+    /* re-export standard assert */
+    if (process.env.NODE_NDEBUG) {
+        out = noop;
+    } else {
+        out = function (arg, msg) {
+            if (!arg) {
+                _toss(msg, 'true', arg);
+            }
+        };
+    }
+
+    /* standard checks */
+    keys.forEach(function (k) {
+        if (ndebug) {
+            out[k] = noop;
+            return;
+        }
+        var type = types[k];
+        out[k] = function (arg, msg) {
+            if (!type.check(arg)) {
+                _toss(msg, k, type.operator, arg, type.actual);
+            }
+        };
+    });
+
+    /* optional checks */
+    keys.forEach(function (k) {
+        var name = 'optional' + _capitalize(k);
+        if (ndebug) {
+            out[name] = noop;
+            return;
+        }
+        var type = types[k];
+        out[name] = function (arg, msg) {
+            if (arg === undefined || arg === null) {
+                return;
+            }
+            if (!type.check(arg)) {
+                _toss(msg, k, type.operator, arg, type.actual);
+            }
+        };
+    });
+
+    /* arrayOf checks */
+    keys.forEach(function (k) {
+        var name = 'arrayOf' + _capitalize(k);
+        if (ndebug) {
+            out[name] = noop;
+            return;
+        }
+        var type = types[k];
+        var expected = '[' + k + ']';
+        out[name] = function (arg, msg) {
+            if (!Array.isArray(arg)) {
+                _toss(msg, expected, type.operator, arg, type.actual);
+            }
+            var i;
+            for (i = 0; i < arg.length; i++) {
+                if (!type.check(arg[i])) {
+                    _toss(msg, expected, type.operator, arg, type.actual);
+                }
+            }
+        };
+    });
+
+    /* optionalArrayOf checks */
+    keys.forEach(function (k) {
+        var name = 'optionalArrayOf' + _capitalize(k);
+        if (ndebug) {
+            out[name] = noop;
+            return;
+        }
+        var type = types[k];
+        var expected = '[' + k + ']';
+        out[name] = function (arg, msg) {
+            if (arg === undefined || arg === null) {
+                return;
+            }
+            if (!Array.isArray(arg)) {
+                _toss(msg, expected, type.operator, arg, type.actual);
+            }
+            var i;
+            for (i = 0; i < arg.length; i++) {
+                if (!type.check(arg[i])) {
+                    _toss(msg, expected, type.operator, arg, type.actual);
+                }
+            }
+        };
+    });
+
+    /* re-export built-in assertions */
+    Object.keys(assert).forEach(function (k) {
+        if (k === 'AssertionError') {
+            out[k] = assert[k];
+            return;
+        }
+        if (ndebug) {
+            out[k] = noop;
+            return;
+        }
+        out[k] = assert[k];
+    });
+
+    /* export ourselves (for unit tests _only_) */
+    out._setExports = _setExports;
+
+    return out;
+}
+
+module.exports = _setExports(process.env.NODE_NDEBUG);
+
+
+/***/ }),
+/* 17 */
+/***/ (function(module, exports) {
+
+// https://github.com/zloirock/core-js/issues/86#issuecomment-115759028
+var global = module.exports = typeof window != 'undefined' && window.Math == Math
+  ? window : typeof self != 'undefined' && self.Math == Math ? self
+  // eslint-disable-next-line no-new-func
+  : Function('return this')();
+if (typeof __g == 'number') __g = global; // eslint-disable-line no-undef
+
+
+/***/ }),
+/* 18 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.sortAlpha = sortAlpha;
+exports.sortOptionsByFlags = sortOptionsByFlags;
+exports.entries = entries;
+exports.removePrefix = removePrefix;
+exports.removeSuffix = removeSuffix;
+exports.addSuffix = addSuffix;
+exports.hyphenate = hyphenate;
+exports.camelCase = camelCase;
+exports.compareSortedArrays = compareSortedArrays;
+exports.sleep = sleep;
+const _camelCase = __webpack_require__(230);
+
+function sortAlpha(a, b) {
+  // sort alphabetically in a deterministic way
+  const shortLen = Math.min(a.length, b.length);
+  for (let i = 0; i < shortLen; i++) {
+    const aChar = a.charCodeAt(i);
+    const bChar = b.charCodeAt(i);
+    if (aChar !== bChar) {
+      return aChar - bChar;
+    }
+  }
+  return a.length - b.length;
+}
+
+function sortOptionsByFlags(a, b) {
+  const aOpt = a.flags.replace(/-/g, '');
+  const bOpt = b.flags.replace(/-/g, '');
+  return sortAlpha(aOpt, bOpt);
+}
+
+function entries(obj) {
+  const entries = [];
+  if (obj) {
+    for (const key in obj) {
+      entries.push([key, obj[key]]);
+    }
+  }
+  return entries;
+}
+
+function removePrefix(pattern, prefix) {
+  if (pattern.startsWith(prefix)) {
+    pattern = pattern.slice(prefix.length);
+  }
+
+  return pattern;
+}
+
+function removeSuffix(pattern, suffix) {
+  if (pattern.endsWith(suffix)) {
+    return pattern.slice(0, -suffix.length);
+  }
+
+  return pattern;
+}
+
+function addSuffix(pattern, suffix) {
+  if (!pattern.endsWith(suffix)) {
+    return pattern + suffix;
+  }
+
+  return pattern;
+}
+
+function hyphenate(str) {
+  return str.replace(/[A-Z]/g, match => {
+    return '-' + match.charAt(0).toLowerCase();
+  });
+}
+
+function camelCase(str) {
+  if (/[A-Z]/.test(str)) {
+    return null;
+  } else {
+    return _camelCase(str);
+  }
+}
+
+function compareSortedArrays(array1, array2) {
+  if (array1.length !== array2.length) {
+    return false;
+  }
+  for (let i = 0, len = array1.length; i < len; i++) {
+    if (array1[i] !== array2[i]) {
+      return false;
+    }
+  }
+  return true;
+}
+
+function sleep(ms) {
+  return new Promise(resolve => {
+    setTimeout(resolve, ms);
+  });
+}
+
+/***/ }),
+/* 19 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.stringify = exports.parse = undefined;
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+var _parse;
+
+function _load_parse() {
+  return _parse = __webpack_require__(105);
+}
+
+Object.defineProperty(exports, 'parse', {
+  enumerable: true,
+  get: function get() {
+    return _interopRequireDefault(_parse || _load_parse()).default;
+  }
+});
+
+var _stringify;
+
+function _load_stringify() {
+  return _stringify = __webpack_require__(199);
+}
+
+Object.defineProperty(exports, 'stringify', {
+  enumerable: true,
+  get: function get() {
+    return _interopRequireDefault(_stringify || _load_stringify()).default;
+  }
+});
+exports.implodeEntry = implodeEntry;
+exports.explodeEntry = explodeEntry;
+
+var _misc;
+
+function _load_misc() {
+  return _misc = __webpack_require__(18);
+}
+
+var _normalizePattern;
+
+function _load_normalizePattern() {
+  return _normalizePattern = __webpack_require__(37);
+}
+
+var _parse2;
+
+function _load_parse2() {
+  return _parse2 = _interopRequireDefault(__webpack_require__(105));
+}
+
+var _constants;
+
+function _load_constants() {
+  return _constants = __webpack_require__(8);
+}
+
+var _fs;
+
+function _load_fs() {
+  return _fs = _interopRequireWildcard(__webpack_require__(4));
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const invariant = __webpack_require__(9);
+
+const path = __webpack_require__(0);
+const ssri = __webpack_require__(65);
+
+function getName(pattern) {
+  return (0, (_normalizePattern || _load_normalizePattern()).normalizePattern)(pattern).name;
+}
+
+function blankObjectUndefined(obj) {
+  return obj && Object.keys(obj).length ? obj : undefined;
+}
+
+function keyForRemote(remote) {
+  return remote.resolved || (remote.reference && remote.hash ? `${remote.reference}#${remote.hash}` : null);
+}
+
+function serializeIntegrity(integrity) {
+  // We need this because `Integrity.toString()` does not use sorting to ensure a stable string output
+  // See https://git.io/vx2Hy
+  return integrity.toString().split(' ').sort().join(' ');
+}
+
+function implodeEntry(pattern, obj) {
+  const inferredName = getName(pattern);
+  const integrity = obj.integrity ? serializeIntegrity(obj.integrity) : '';
+  const imploded = {
+    name: inferredName === obj.name ? undefined : obj.name,
+    version: obj.version,
+    uid: obj.uid === obj.version ? undefined : obj.uid,
+    resolved: obj.resolved,
+    registry: obj.registry === 'npm' ? undefined : obj.registry,
+    dependencies: blankObjectUndefined(obj.dependencies),
+    optionalDependencies: blankObjectUndefined(obj.optionalDependencies),
+    permissions: blankObjectUndefined(obj.permissions),
+    prebuiltVariants: blankObjectUndefined(obj.prebuiltVariants)
+  };
+  if (integrity) {
+    imploded.integrity = integrity;
+  }
+  return imploded;
+}
+
+function explodeEntry(pattern, obj) {
+  obj.optionalDependencies = obj.optionalDependencies || {};
+  obj.dependencies = obj.dependencies || {};
+  obj.uid = obj.uid || obj.version;
+  obj.permissions = obj.permissions || {};
+  obj.registry = obj.registry || 'npm';
+  obj.name = obj.name || getName(pattern);
+  const integrity = obj.integrity;
+  if (integrity && integrity.isIntegrity) {
+    obj.integrity = ssri.parse(integrity);
+  }
+  return obj;
+}
+
+class Lockfile {
+  constructor({ cache, source, parseResultType } = {}) {
+    this.source = source || '';
+    this.cache = cache;
+    this.parseResultType = parseResultType;
+  }
+
+  // source string if the `cache` was parsed
+
+
+  // if true, we're parsing an old yarn file and need to update integrity fields
+  hasEntriesExistWithoutIntegrity() {
+    if (!this.cache) {
+      return false;
+    }
+
+    for (const key in this.cache) {
+      // $FlowFixMe - `this.cache` is clearly defined at this point
+      if (!/^.*@(file:|http)/.test(key) && this.cache[key] && !this.cache[key].integrity) {
+        return true;
+      }
+    }
+
+    return false;
+  }
+
+  static fromDirectory(dir, reporter) {
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      // read the manifest in this directory
+      const lockfileLoc = path.join(dir, (_constants || _load_constants()).LOCKFILE_FILENAME);
+
+      let lockfile;
+      let rawLockfile = '';
+      let parseResult;
+
+      if (yield (_fs || _load_fs()).exists(lockfileLoc)) {
+        rawLockfile = yield (_fs || _load_fs()).readFile(lockfileLoc);
+        parseResult = (0, (_parse2 || _load_parse2()).default)(rawLockfile, lockfileLoc);
+
+        if (reporter) {
+          if (parseResult.type === 'merge') {
+            reporter.info(reporter.lang('lockfileMerged'));
+          } else if (parseResult.type === 'conflict') {
+            reporter.warn(reporter.lang('lockfileConflict'));
+          }
+        }
+
+        lockfile = parseResult.object;
+      } else if (reporter) {
+        reporter.info(reporter.lang('noLockfileFound'));
+      }
+
+      if (lockfile && lockfile.__metadata) {
+        const lockfilev2 = lockfile;
+        lockfile = {};
+      }
+
+      return new Lockfile({ cache: lockfile, source: rawLockfile, parseResultType: parseResult && parseResult.type });
+    })();
+  }
+
+  getLocked(pattern) {
+    const cache = this.cache;
+    if (!cache) {
+      return undefined;
+    }
+
+    const shrunk = pattern in cache && cache[pattern];
+
+    if (typeof shrunk === 'string') {
+      return this.getLocked(shrunk);
+    } else if (shrunk) {
+      explodeEntry(pattern, shrunk);
+      return shrunk;
+    }
+
+    return undefined;
+  }
+
+  removePattern(pattern) {
+    const cache = this.cache;
+    if (!cache) {
+      return;
+    }
+    delete cache[pattern];
+  }
+
+  getLockfile(patterns) {
+    const lockfile = {};
+    const seen = new Map();
+
+    // order by name so that lockfile manifest is assigned to the first dependency with this manifest
+    // the others that have the same remoteKey will just refer to the first
+    // ordering allows for consistency in lockfile when it is serialized
+    const sortedPatternsKeys = Object.keys(patterns).sort((_misc || _load_misc()).sortAlpha);
+
+    for (var _iterator = sortedPatternsKeys, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+      var _ref;
+
+      if (_isArray) {
+        if (_i >= _iterator.length) break;
+        _ref = _iterator[_i++];
+      } else {
+        _i = _iterator.next();
+        if (_i.done) break;
+        _ref = _i.value;
+      }
+
+      const pattern = _ref;
+
+      const pkg = patterns[pattern];
+      const remote = pkg._remote,
+            ref = pkg._reference;
+
+      invariant(ref, 'Package is missing a reference');
+      invariant(remote, 'Package is missing a remote');
+
+      const remoteKey = keyForRemote(remote);
+      const seenPattern = remoteKey && seen.get(remoteKey);
+      if (seenPattern) {
+        // no point in duplicating it
+        lockfile[pattern] = seenPattern;
+
+        // if we're relying on our name being inferred and two of the patterns have
+        // different inferred names then we need to set it
+        if (!seenPattern.name && getName(pattern) !== pkg.name) {
+          seenPattern.name = pkg.name;
+        }
+        continue;
+      }
+      const obj = implodeEntry(pattern, {
+        name: pkg.name,
+        version: pkg.version,
+        uid: pkg._uid,
+        resolved: remote.resolved,
+        integrity: remote.integrity,
+        registry: remote.registry,
+        dependencies: pkg.dependencies,
+        peerDependencies: pkg.peerDependencies,
+        optionalDependencies: pkg.optionalDependencies,
+        permissions: ref.permissions,
+        prebuiltVariants: pkg.prebuiltVariants
+      });
+
+      lockfile[pattern] = obj;
+
+      if (remoteKey) {
+        seen.set(remoteKey, obj);
+      }
+    }
+
+    return lockfile;
+  }
+}
+exports.default = Lockfile;
+
+/***/ }),
+/* 20 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var store = __webpack_require__(133)('wks');
+var uid = __webpack_require__(137);
+var Symbol = __webpack_require__(17).Symbol;
+var USE_SYMBOL = typeof Symbol == 'function';
+
+var $exports = module.exports = function (name) {
+  return store[name] || (store[name] =
+    USE_SYMBOL && Symbol[name] || (USE_SYMBOL ? Symbol : uid)('Symbol.' + name));
+};
+
+$exports.store = store;
+
+
+/***/ }),
+/* 21 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+exports.__esModule = true;
+
+var _assign = __webpack_require__(591);
+
+var _assign2 = _interopRequireDefault(_assign);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+exports.default = _assign2.default || function (target) {
+  for (var i = 1; i < arguments.length; i++) {
+    var source = arguments[i];
+
+    for (var key in source) {
+      if (Object.prototype.hasOwnProperty.call(source, key)) {
+        target[key] = source[key];
+      }
+    }
+  }
+
+  return target;
+};
+
+/***/ }),
+/* 22 */
+/***/ (function(module, exports) {
+
+exports = module.exports = SemVer;
+
+// The debug function is excluded entirely from the minified version.
+/* nomin */ var debug;
+/* nomin */ if (typeof process === 'object' &&
+    /* nomin */ process.env &&
+    /* nomin */ process.env.NODE_DEBUG &&
+    /* nomin */ /\bsemver\b/i.test(process.env.NODE_DEBUG))
+  /* nomin */ debug = function() {
+    /* nomin */ var args = Array.prototype.slice.call(arguments, 0);
+    /* nomin */ args.unshift('SEMVER');
+    /* nomin */ console.log.apply(console, args);
+    /* nomin */ };
+/* nomin */ else
+  /* nomin */ debug = function() {};
+
+// Note: this is the semver.org version of the spec that it implements
+// Not necessarily the package version of this code.
+exports.SEMVER_SPEC_VERSION = '2.0.0';
+
+var MAX_LENGTH = 256;
+var MAX_SAFE_INTEGER = Number.MAX_SAFE_INTEGER || 9007199254740991;
+
+// Max safe segment length for coercion.
+var MAX_SAFE_COMPONENT_LENGTH = 16;
+
+// The actual regexps go on exports.re
+var re = exports.re = [];
+var src = exports.src = [];
+var R = 0;
+
+// The following Regular Expressions can be used for tokenizing,
+// validating, and parsing SemVer version strings.
+
+// ## Numeric Identifier
+// A single `0`, or a non-zero digit followed by zero or more digits.
+
+var NUMERICIDENTIFIER = R++;
+src[NUMERICIDENTIFIER] = '0|[1-9]\\d*';
+var NUMERICIDENTIFIERLOOSE = R++;
+src[NUMERICIDENTIFIERLOOSE] = '[0-9]+';
+
+
+// ## Non-numeric Identifier
+// Zero or more digits, followed by a letter or hyphen, and then zero or
+// more letters, digits, or hyphens.
+
+var NONNUMERICIDENTIFIER = R++;
+src[NONNUMERICIDENTIFIER] = '\\d*[a-zA-Z-][a-zA-Z0-9-]*';
+
+
+// ## Main Version
+// Three dot-separated numeric identifiers.
+
+var MAINVERSION = R++;
+src[MAINVERSION] = '(' + src[NUMERICIDENTIFIER] + ')\\.' +
+                   '(' + src[NUMERICIDENTIFIER] + ')\\.' +
+                   '(' + src[NUMERICIDENTIFIER] + ')';
+
+var MAINVERSIONLOOSE = R++;
+src[MAINVERSIONLOOSE] = '(' + src[NUMERICIDENTIFIERLOOSE] + ')\\.' +
+                        '(' + src[NUMERICIDENTIFIERLOOSE] + ')\\.' +
+                        '(' + src[NUMERICIDENTIFIERLOOSE] + ')';
+
+// ## Pre-release Version Identifier
+// A numeric identifier, or a non-numeric identifier.
+
+var PRERELEASEIDENTIFIER = R++;
+src[PRERELEASEIDENTIFIER] = '(?:' + src[NUMERICIDENTIFIER] +
+                            '|' + src[NONNUMERICIDENTIFIER] + ')';
+
+var PRERELEASEIDENTIFIERLOOSE = R++;
+src[PRERELEASEIDENTIFIERLOOSE] = '(?:' + src[NUMERICIDENTIFIERLOOSE] +
+                                 '|' + src[NONNUMERICIDENTIFIER] + ')';
+
+
+// ## Pre-release Version
+// Hyphen, followed by one or more dot-separated pre-release version
+// identifiers.
+
+var PRERELEASE = R++;
+src[PRERELEASE] = '(?:-(' + src[PRERELEASEIDENTIFIER] +
+                  '(?:\\.' + src[PRERELEASEIDENTIFIER] + ')*))';
+
+var PRERELEASELOOSE = R++;
+src[PRERELEASELOOSE] = '(?:-?(' + src[PRERELEASEIDENTIFIERLOOSE] +
+                       '(?:\\.' + src[PRERELEASEIDENTIFIERLOOSE] + ')*))';
+
+// ## Build Metadata Identifier
+// Any combination of digits, letters, or hyphens.
+
+var BUILDIDENTIFIER = R++;
+src[BUILDIDENTIFIER] = '[0-9A-Za-z-]+';
+
+// ## Build Metadata
+// Plus sign, followed by one or more period-separated build metadata
+// identifiers.
+
+var BUILD = R++;
+src[BUILD] = '(?:\\+(' + src[BUILDIDENTIFIER] +
+             '(?:\\.' + src[BUILDIDENTIFIER] + ')*))';
+
+
+// ## Full Version String
+// A main version, followed optionally by a pre-release version and
+// build metadata.
+
+// Note that the only major, minor, patch, and pre-release sections of
+// the version string are capturing groups.  The build metadata is not a
+// capturing group, because it should not ever be used in version
+// comparison.
+
+var FULL = R++;
+var FULLPLAIN = 'v?' + src[MAINVERSION] +
+                src[PRERELEASE] + '?' +
+                src[BUILD] + '?';
+
+src[FULL] = '^' + FULLPLAIN + '$';
+
+// like full, but allows v1.2.3 and =1.2.3, which people do sometimes.
+// also, 1.0.0alpha1 (prerelease without the hyphen) which is pretty
+// common in the npm registry.
+var LOOSEPLAIN = '[v=\\s]*' + src[MAINVERSIONLOOSE] +
+                 src[PRERELEASELOOSE] + '?' +
+                 src[BUILD] + '?';
+
+var LOOSE = R++;
+src[LOOSE] = '^' + LOOSEPLAIN + '$';
+
+var GTLT = R++;
+src[GTLT] = '((?:<|>)?=?)';
+
+// Something like "2.*" or "1.2.x".
+// Note that "x.x" is a valid xRange identifer, meaning "any version"
+// Only the first item is strictly required.
+var XRANGEIDENTIFIERLOOSE = R++;
+src[XRANGEIDENTIFIERLOOSE] = src[NUMERICIDENTIFIERLOOSE] + '|x|X|\\*';
+var XRANGEIDENTIFIER = R++;
+src[XRANGEIDENTIFIER] = src[NUMERICIDENTIFIER] + '|x|X|\\*';
+
+var XRANGEPLAIN = R++;
+src[XRANGEPLAIN] = '[v=\\s]*(' + src[XRANGEIDENTIFIER] + ')' +
+                   '(?:\\.(' + src[XRANGEIDENTIFIER] + ')' +
+                   '(?:\\.(' + src[XRANGEIDENTIFIER] + ')' +
+                   '(?:' + src[PRERELEASE] + ')?' +
+                   src[BUILD] + '?' +
+                   ')?)?';
+
+var XRANGEPLAINLOOSE = R++;
+src[XRANGEPLAINLOOSE] = '[v=\\s]*(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
+                        '(?:\\.(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
+                        '(?:\\.(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
+                        '(?:' + src[PRERELEASELOOSE] + ')?' +
+                        src[BUILD] + '?' +
+                        ')?)?';
+
+var XRANGE = R++;
+src[XRANGE] = '^' + src[GTLT] + '\\s*' + src[XRANGEPLAIN] + '$';
+var XRANGELOOSE = R++;
+src[XRANGELOOSE] = '^' + src[GTLT] + '\\s*' + src[XRANGEPLAINLOOSE] + '$';
+
+// Coercion.
+// Extract anything that could conceivably be a part of a valid semver
+var COERCE = R++;
+src[COERCE] = '(?:^|[^\\d])' +
+              '(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '})' +
+              '(?:\\.(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '}))?' +
+              '(?:\\.(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '}))?' +
+              '(?:$|[^\\d])';
+
+// Tilde ranges.
+// Meaning is "reasonably at or greater than"
+var LONETILDE = R++;
+src[LONETILDE] = '(?:~>?)';
+
+var TILDETRIM = R++;
+src[TILDETRIM] = '(\\s*)' + src[LONETILDE] + '\\s+';
+re[TILDETRIM] = new RegExp(src[TILDETRIM], 'g');
+var tildeTrimReplace = '$1~';
+
+var TILDE = R++;
+src[TILDE] = '^' + src[LONETILDE] + src[XRANGEPLAIN] + '$';
+var TILDELOOSE = R++;
+src[TILDELOOSE] = '^' + src[LONETILDE] + src[XRANGEPLAINLOOSE] + '$';
+
+// Caret ranges.
+// Meaning is "at least and backwards compatible with"
+var LONECARET = R++;
+src[LONECARET] = '(?:\\^)';
+
+var CARETTRIM = R++;
+src[CARETTRIM] = '(\\s*)' + src[LONECARET] + '\\s+';
+re[CARETTRIM] = new RegExp(src[CARETTRIM], 'g');
+var caretTrimReplace = '$1^';
+
+var CARET = R++;
+src[CARET] = '^' + src[LONECARET] + src[XRANGEPLAIN] + '$';
+var CARETLOOSE = R++;
+src[CARETLOOSE] = '^' + src[LONECARET] + src[XRANGEPLAINLOOSE] + '$';
+
+// A simple gt/lt/eq thing, or just "" to indicate "any version"
+var COMPARATORLOOSE = R++;
+src[COMPARATORLOOSE] = '^' + src[GTLT] + '\\s*(' + LOOSEPLAIN + ')$|^$';
+var COMPARATOR = R++;
+src[COMPARATOR] = '^' + src[GTLT] + '\\s*(' + FULLPLAIN + ')$|^$';
+
+
+// An expression to strip any whitespace between the gtlt and the thing
+// it modifies, so that `> 1.2.3` ==> `>1.2.3`
+var COMPARATORTRIM = R++;
+src[COMPARATORTRIM] = '(\\s*)' + src[GTLT] +
+                      '\\s*(' + LOOSEPLAIN + '|' + src[XRANGEPLAIN] + ')';
+
+// this one has to use the /g flag
+re[COMPARATORTRIM] = new RegExp(src[COMPARATORTRIM], 'g');
+var comparatorTrimReplace = '$1$2$3';
+
+
+// Something like `1.2.3 - 1.2.4`
+// Note that these all use the loose form, because they'll be
+// checked against either the strict or loose comparator form
+// later.
+var HYPHENRANGE = R++;
+src[HYPHENRANGE] = '^\\s*(' + src[XRANGEPLAIN] + ')' +
+                   '\\s+-\\s+' +
+                   '(' + src[XRANGEPLAIN] + ')' +
+                   '\\s*$';
+
+var HYPHENRANGELOOSE = R++;
+src[HYPHENRANGELOOSE] = '^\\s*(' + src[XRANGEPLAINLOOSE] + ')' +
+                        '\\s+-\\s+' +
+                        '(' + src[XRANGEPLAINLOOSE] + ')' +
+                        '\\s*$';
+
+// Star ranges basically just allow anything at all.
+var STAR = R++;
+src[STAR] = '(<|>)?=?\\s*\\*';
+
+// Compile to actual regexp objects.
+// All are flag-free, unless they were created above with a flag.
+for (var i = 0; i < R; i++) {
+  debug(i, src[i]);
+  if (!re[i])
+    re[i] = new RegExp(src[i]);
+}
+
+exports.parse = parse;
+function parse(version, loose) {
+  if (version instanceof SemVer)
+    return version;
+
+  if (typeof version !== 'string')
+    return null;
+
+  if (version.length > MAX_LENGTH)
+    return null;
+
+  var r = loose ? re[LOOSE] : re[FULL];
+  if (!r.test(version))
+    return null;
+
+  try {
+    return new SemVer(version, loose);
+  } catch (er) {
+    return null;
+  }
+}
+
+exports.valid = valid;
+function valid(version, loose) {
+  var v = parse(version, loose);
+  return v ? v.version : null;
+}
+
+
+exports.clean = clean;
+function clean(version, loose) {
+  var s = parse(version.trim().replace(/^[=v]+/, ''), loose);
+  return s ? s.version : null;
+}
+
+exports.SemVer = SemVer;
+
+function SemVer(version, loose) {
+  if (version instanceof SemVer) {
+    if (version.loose === loose)
+      return version;
+    else
+      version = version.version;
+  } else if (typeof version !== 'string') {
+    throw new TypeError('Invalid Version: ' + version);
+  }
+
+  if (version.length > MAX_LENGTH)
+    throw new TypeError('version is longer than ' + MAX_LENGTH + ' characters')
+
+  if (!(this instanceof SemVer))
+    return new SemVer(version, loose);
+
+  debug('SemVer', version, loose);
+  this.loose = loose;
+  var m = version.trim().match(loose ? re[LOOSE] : re[FULL]);
+
+  if (!m)
+    throw new TypeError('Invalid Version: ' + version);
+
+  this.raw = version;
+
+  // these are actually numbers
+  this.major = +m[1];
+  this.minor = +m[2];
+  this.patch = +m[3];
+
+  if (this.major > MAX_SAFE_INTEGER || this.major < 0)
+    throw new TypeError('Invalid major version')
+
+  if (this.minor > MAX_SAFE_INTEGER || this.minor < 0)
+    throw new TypeError('Invalid minor version')
+
+  if (this.patch > MAX_SAFE_INTEGER || this.patch < 0)
+    throw new TypeError('Invalid patch version')
+
+  // numberify any prerelease numeric ids
+  if (!m[4])
+    this.prerelease = [];
+  else
+    this.prerelease = m[4].split('.').map(function(id) {
+      if (/^[0-9]+$/.test(id)) {
+        var num = +id;
+        if (num >= 0 && num < MAX_SAFE_INTEGER)
+          return num;
+      }
+      return id;
+    });
+
+  this.build = m[5] ? m[5].split('.') : [];
+  this.format();
+}
+
+SemVer.prototype.format = function() {
+  this.version = this.major + '.' + this.minor + '.' + this.patch;
+  if (this.prerelease.length)
+    this.version += '-' + this.prerelease.join('.');
+  return this.version;
+};
+
+SemVer.prototype.toString = function() {
+  return this.version;
+};
+
+SemVer.prototype.compare = function(other) {
+  debug('SemVer.compare', this.version, this.loose, other);
+  if (!(other instanceof SemVer))
+    other = new SemVer(other, this.loose);
+
+  return this.compareMain(other) || this.comparePre(other);
+};
+
+SemVer.prototype.compareMain = function(other) {
+  if (!(other instanceof SemVer))
+    other = new SemVer(other, this.loose);
+
+  return compareIdentifiers(this.major, other.major) ||
+         compareIdentifiers(this.minor, other.minor) ||
+         compareIdentifiers(this.patch, other.patch);
+};
+
+SemVer.prototype.comparePre = function(other) {
+  if (!(other instanceof SemVer))
+    other = new SemVer(other, this.loose);
+
+  // NOT having a prerelease is > having one
+  if (this.prerelease.length && !other.prerelease.length)
+    return -1;
+  else if (!this.prerelease.length && other.prerelease.length)
+    return 1;
+  else if (!this.prerelease.length && !other.prerelease.length)
+    return 0;
+
+  var i = 0;
+  do {
+    var a = this.prerelease[i];
+    var b = other.prerelease[i];
+    debug('prerelease compare', i, a, b);
+    if (a === undefined && b === undefined)
+      return 0;
+    else if (b === undefined)
+      return 1;
+    else if (a === undefined)
+      return -1;
+    else if (a === b)
+      continue;
+    else
+      return compareIdentifiers(a, b);
+  } while (++i);
+};
+
+// preminor will bump the version up to the next minor release, and immediately
+// down to pre-release. premajor and prepatch work the same way.
+SemVer.prototype.inc = function(release, identifier) {
+  switch (release) {
+    case 'premajor':
+      this.prerelease.length = 0;
+      this.patch = 0;
+      this.minor = 0;
+      this.major++;
+      this.inc('pre', identifier);
+      break;
+    case 'preminor':
+      this.prerelease.length = 0;
+      this.patch = 0;
+      this.minor++;
+      this.inc('pre', identifier);
+      break;
+    case 'prepatch':
+      // If this is already a prerelease, it will bump to the next version
+      // drop any prereleases that might already exist, since they are not
+      // relevant at this point.
+      this.prerelease.length = 0;
+      this.inc('patch', identifier);
+      this.inc('pre', identifier);
+      break;
+    // If the input is a non-prerelease version, this acts the same as
+    // prepatch.
+    case 'prerelease':
+      if (this.prerelease.length === 0)
+        this.inc('patch', identifier);
+      this.inc('pre', identifier);
+      break;
+
+    case 'major':
+      // If this is a pre-major version, bump up to the same major version.
+      // Otherwise increment major.
+      // 1.0.0-5 bumps to 1.0.0
+      // 1.1.0 bumps to 2.0.0
+      if (this.minor !== 0 || this.patch !== 0 || this.prerelease.length === 0)
+        this.major++;
+      this.minor = 0;
+      this.patch = 0;
+      this.prerelease = [];
+      break;
+    case 'minor':
+      // If this is a pre-minor version, bump up to the same minor version.
+      // Otherwise increment minor.
+      // 1.2.0-5 bumps to 1.2.0
+      // 1.2.1 bumps to 1.3.0
+      if (this.patch !== 0 || this.prerelease.length === 0)
+        this.minor++;
+      this.patch = 0;
+      this.prerelease = [];
+      break;
+    case 'patch':
+      // If this is not a pre-release version, it will increment the patch.
+      // If it is a pre-release it will bump up to the same patch version.
+      // 1.2.0-5 patches to 1.2.0
+      // 1.2.0 patches to 1.2.1
+      if (this.prerelease.length === 0)
+        this.patch++;
+      this.prerelease = [];
+      break;
+    // This probably shouldn't be used publicly.
+    // 1.0.0 "pre" would become 1.0.0-0 which is the wrong direction.
+    case 'pre':
+      if (this.prerelease.length === 0)
+        this.prerelease = [0];
+      else {
+        var i = this.prerelease.length;
+        while (--i >= 0) {
+          if (typeof this.prerelease[i] === 'number') {
+            this.prerelease[i]++;
+            i = -2;
+          }
+        }
+        if (i === -1) // didn't increment anything
+          this.prerelease.push(0);
+      }
+      if (identifier) {
+        // 1.2.0-beta.1 bumps to 1.2.0-beta.2,
+        // 1.2.0-beta.fooblz or 1.2.0-beta bumps to 1.2.0-beta.0
+        if (this.prerelease[0] === identifier) {
+          if (isNaN(this.prerelease[1]))
+            this.prerelease = [identifier, 0];
+        } else
+          this.prerelease = [identifier, 0];
+      }
+      break;
+
+    default:
+      throw new Error('invalid increment argument: ' + release);
+  }
+  this.format();
+  this.raw = this.version;
+  return this;
+};
+
+exports.inc = inc;
+function inc(version, release, loose, identifier) {
+  if (typeof(loose) === 'string') {
+    identifier = loose;
+    loose = undefined;
+  }
+
+  try {
+    return new SemVer(version, loose).inc(release, identifier).version;
+  } catch (er) {
+    return null;
+  }
+}
+
+exports.diff = diff;
+function diff(version1, version2) {
+  if (eq(version1, version2)) {
+    return null;
+  } else {
+    var v1 = parse(version1);
+    var v2 = parse(version2);
+    if (v1.prerelease.length || v2.prerelease.length) {
+      for (var key in v1) {
+        if (key === 'major' || key === 'minor' || key === 'patch') {
+          if (v1[key] !== v2[key]) {
+            return 'pre'+key;
+          }
+        }
+      }
+      return 'prerelease';
+    }
+    for (var key in v1) {
+      if (key === 'major' || key === 'minor' || key === 'patch') {
+        if (v1[key] !== v2[key]) {
+          return key;
+        }
+      }
+    }
+  }
+}
+
+exports.compareIdentifiers = compareIdentifiers;
+
+var numeric = /^[0-9]+$/;
+function compareIdentifiers(a, b) {
+  var anum = numeric.test(a);
+  var bnum = numeric.test(b);
+
+  if (anum && bnum) {
+    a = +a;
+    b = +b;
+  }
+
+  return (anum && !bnum) ? -1 :
+         (bnum && !anum) ? 1 :
+         a < b ? -1 :
+         a > b ? 1 :
+         0;
+}
+
+exports.rcompareIdentifiers = rcompareIdentifiers;
+function rcompareIdentifiers(a, b) {
+  return compareIdentifiers(b, a);
+}
+
+exports.major = major;
+function major(a, loose) {
+  return new SemVer(a, loose).major;
+}
+
+exports.minor = minor;
+function minor(a, loose) {
+  return new SemVer(a, loose).minor;
+}
+
+exports.patch = patch;
+function patch(a, loose) {
+  return new SemVer(a, loose).patch;
+}
+
+exports.compare = compare;
+function compare(a, b, loose) {
+  return new SemVer(a, loose).compare(new SemVer(b, loose));
+}
+
+exports.compareLoose = compareLoose;
+function compareLoose(a, b) {
+  return compare(a, b, true);
+}
+
+exports.rcompare = rcompare;
+function rcompare(a, b, loose) {
+  return compare(b, a, loose);
+}
+
+exports.sort = sort;
+function sort(list, loose) {
+  return list.sort(function(a, b) {
+    return exports.compare(a, b, loose);
+  });
+}
+
+exports.rsort = rsort;
+function rsort(list, loose) {
+  return list.sort(function(a, b) {
+    return exports.rcompare(a, b, loose);
+  });
+}
+
+exports.gt = gt;
+function gt(a, b, loose) {
+  return compare(a, b, loose) > 0;
+}
+
+exports.lt = lt;
+function lt(a, b, loose) {
+  return compare(a, b, loose) < 0;
+}
+
+exports.eq = eq;
+function eq(a, b, loose) {
+  return compare(a, b, loose) === 0;
+}
+
+exports.neq = neq;
+function neq(a, b, loose) {
+  return compare(a, b, loose) !== 0;
+}
+
+exports.gte = gte;
+function gte(a, b, loose) {
+  return compare(a, b, loose) >= 0;
+}
+
+exports.lte = lte;
+function lte(a, b, loose) {
+  return compare(a, b, loose) <= 0;
+}
+
+exports.cmp = cmp;
+function cmp(a, op, b, loose) {
+  var ret;
+  switch (op) {
+    case '===':
+      if (typeof a === 'object') a = a.version;
+      if (typeof b === 'object') b = b.version;
+      ret = a === b;
+      break;
+    case '!==':
+      if (typeof a === 'object') a = a.version;
+      if (typeof b === 'object') b = b.version;
+      ret = a !== b;
+      break;
+    case '': case '=': case '==': ret = eq(a, b, loose); break;
+    case '!=': ret = neq(a, b, loose); break;
+    case '>': ret = gt(a, b, loose); break;
+    case '>=': ret = gte(a, b, loose); break;
+    case '<': ret = lt(a, b, loose); break;
+    case '<=': ret = lte(a, b, loose); break;
+    default: throw new TypeError('Invalid operator: ' + op);
+  }
+  return ret;
+}
+
+exports.Comparator = Comparator;
+function Comparator(comp, loose) {
+  if (comp instanceof Comparator) {
+    if (comp.loose === loose)
+      return comp;
+    else
+      comp = comp.value;
+  }
+
+  if (!(this instanceof Comparator))
+    return new Comparator(comp, loose);
+
+  debug('comparator', comp, loose);
+  this.loose = loose;
+  this.parse(comp);
+
+  if (this.semver === ANY)
+    this.value = '';
+  else
+    this.value = this.operator + this.semver.version;
+
+  debug('comp', this);
+}
+
+var ANY = {};
+Comparator.prototype.parse = function(comp) {
+  var r = this.loose ? re[COMPARATORLOOSE] : re[COMPARATOR];
+  var m = comp.match(r);
+
+  if (!m)
+    throw new TypeError('Invalid comparator: ' + comp);
+
+  this.operator = m[1];
+  if (this.operator === '=')
+    this.operator = '';
+
+  // if it literally is just '>' or '' then allow anything.
+  if (!m[2])
+    this.semver = ANY;
+  else
+    this.semver = new SemVer(m[2], this.loose);
+};
+
+Comparator.prototype.toString = function() {
+  return this.value;
+};
+
+Comparator.prototype.test = function(version) {
+  debug('Comparator.test', version, this.loose);
+
+  if (this.semver === ANY)
+    return true;
+
+  if (typeof version === 'string')
+    version = new SemVer(version, this.loose);
+
+  return cmp(version, this.operator, this.semver, this.loose);
+};
+
+Comparator.prototype.intersects = function(comp, loose) {
+  if (!(comp instanceof Comparator)) {
+    throw new TypeError('a Comparator is required');
+  }
+
+  var rangeTmp;
+
+  if (this.operator === '') {
+    rangeTmp = new Range(comp.value, loose);
+    return satisfies(this.value, rangeTmp, loose);
+  } else if (comp.operator === '') {
+    rangeTmp = new Range(this.value, loose);
+    return satisfies(comp.semver, rangeTmp, loose);
+  }
+
+  var sameDirectionIncreasing =
+    (this.operator === '>=' || this.operator === '>') &&
+    (comp.operator === '>=' || comp.operator === '>');
+  var sameDirectionDecreasing =
+    (this.operator === '<=' || this.operator === '<') &&
+    (comp.operator === '<=' || comp.operator === '<');
+  var sameSemVer = this.semver.version === comp.semver.version;
+  var differentDirectionsInclusive =
+    (this.operator === '>=' || this.operator === '<=') &&
+    (comp.operator === '>=' || comp.operator === '<=');
+  var oppositeDirectionsLessThan =
+    cmp(this.semver, '<', comp.semver, loose) &&
+    ((this.operator === '>=' || this.operator === '>') &&
+    (comp.operator === '<=' || comp.operator === '<'));
+  var oppositeDirectionsGreaterThan =
+    cmp(this.semver, '>', comp.semver, loose) &&
+    ((this.operator === '<=' || this.operator === '<') &&
+    (comp.operator === '>=' || comp.operator === '>'));
+
+  return sameDirectionIncreasing || sameDirectionDecreasing ||
+    (sameSemVer && differentDirectionsInclusive) ||
+    oppositeDirectionsLessThan || oppositeDirectionsGreaterThan;
+};
+
+
+exports.Range = Range;
+function Range(range, loose) {
+  if (range instanceof Range) {
+    if (range.loose === loose) {
+      return range;
+    } else {
+      return new Range(range.raw, loose);
+    }
+  }
+
+  if (range instanceof Comparator) {
+    return new Range(range.value, loose);
+  }
+
+  if (!(this instanceof Range))
+    return new Range(range, loose);
+
+  this.loose = loose;
+
+  // First, split based on boolean or ||
+  this.raw = range;
+  this.set = range.split(/\s*\|\|\s*/).map(function(range) {
+    return this.parseRange(range.trim());
+  }, this).filter(function(c) {
+    // throw out any that are not relevant for whatever reason
+    return c.length;
+  });
+
+  if (!this.set.length) {
+    throw new TypeError('Invalid SemVer Range: ' + range);
+  }
+
+  this.format();
+}
+
+Range.prototype.format = function() {
+  this.range = this.set.map(function(comps) {
+    return comps.join(' ').trim();
+  }).join('||').trim();
+  return this.range;
+};
+
+Range.prototype.toString = function() {
+  return this.range;
+};
+
+Range.prototype.parseRange = function(range) {
+  var loose = this.loose;
+  range = range.trim();
+  debug('range', range, loose);
+  // `1.2.3 - 1.2.4` => `>=1.2.3 <=1.2.4`
+  var hr = loose ? re[HYPHENRANGELOOSE] : re[HYPHENRANGE];
+  range = range.replace(hr, hyphenReplace);
+  debug('hyphen replace', range);
+  // `> 1.2.3 < 1.2.5` => `>1.2.3 <1.2.5`
+  range = range.replace(re[COMPARATORTRIM], comparatorTrimReplace);
+  debug('comparator trim', range, re[COMPARATORTRIM]);
+
+  // `~ 1.2.3` => `~1.2.3`
+  range = range.replace(re[TILDETRIM], tildeTrimReplace);
+
+  // `^ 1.2.3` => `^1.2.3`
+  range = range.replace(re[CARETTRIM], caretTrimReplace);
+
+  // normalize spaces
+  range = range.split(/\s+/).join(' ');
+
+  // At this point, the range is completely trimmed and
+  // ready to be split into comparators.
+
+  var compRe = loose ? re[COMPARATORLOOSE] : re[COMPARATOR];
+  var set = range.split(' ').map(function(comp) {
+    return parseComparator(comp, loose);
+  }).join(' ').split(/\s+/);
+  if (this.loose) {
+    // in loose mode, throw out any that are not valid comparators
+    set = set.filter(function(comp) {
+      return !!comp.match(compRe);
+    });
+  }
+  set = set.map(function(comp) {
+    return new Comparator(comp, loose);
+  });
+
+  return set;
+};
+
+Range.prototype.intersects = function(range, loose) {
+  if (!(range instanceof Range)) {
+    throw new TypeError('a Range is required');
+  }
+
+  return this.set.some(function(thisComparators) {
+    return thisComparators.every(function(thisComparator) {
+      return range.set.some(function(rangeComparators) {
+        return rangeComparators.every(function(rangeComparator) {
+          return thisComparator.intersects(rangeComparator, loose);
+        });
+      });
+    });
+  });
+};
+
+// Mostly just for testing and legacy API reasons
+exports.toComparators = toComparators;
+function toComparators(range, loose) {
+  return new Range(range, loose).set.map(function(comp) {
+    return comp.map(function(c) {
+      return c.value;
+    }).join(' ').trim().split(' ');
+  });
+}
+
+// comprised of xranges, tildes, stars, and gtlt's at this point.
+// already replaced the hyphen ranges
+// turn into a set of JUST comparators.
+function parseComparator(comp, loose) {
+  debug('comp', comp);
+  comp = replaceCarets(comp, loose);
+  debug('caret', comp);
+  comp = replaceTildes(comp, loose);
+  debug('tildes', comp);
+  comp = replaceXRanges(comp, loose);
+  debug('xrange', comp);
+  comp = replaceStars(comp, loose);
+  debug('stars', comp);
+  return comp;
+}
+
+function isX(id) {
+  return !id || id.toLowerCase() === 'x' || id === '*';
+}
+
+// ~, ~> --> * (any, kinda silly)
+// ~2, ~2.x, ~2.x.x, ~>2, ~>2.x ~>2.x.x --> >=2.0.0 <3.0.0
+// ~2.0, ~2.0.x, ~>2.0, ~>2.0.x --> >=2.0.0 <2.1.0
+// ~1.2, ~1.2.x, ~>1.2, ~>1.2.x --> >=1.2.0 <1.3.0
+// ~1.2.3, ~>1.2.3 --> >=1.2.3 <1.3.0
+// ~1.2.0, ~>1.2.0 --> >=1.2.0 <1.3.0
+function replaceTildes(comp, loose) {
+  return comp.trim().split(/\s+/).map(function(comp) {
+    return replaceTilde(comp, loose);
+  }).join(' ');
+}
+
+function replaceTilde(comp, loose) {
+  var r = loose ? re[TILDELOOSE] : re[TILDE];
+  return comp.replace(r, function(_, M, m, p, pr) {
+    debug('tilde', comp, _, M, m, p, pr);
+    var ret;
+
+    if (isX(M))
+      ret = '';
+    else if (isX(m))
+      ret = '>=' + M + '.0.0 <' + (+M + 1) + '.0.0';
+    else if (isX(p))
+      // ~1.2 == >=1.2.0 <1.3.0
+      ret = '>=' + M + '.' + m + '.0 <' + M + '.' + (+m + 1) + '.0';
+    else if (pr) {
+      debug('replaceTilde pr', pr);
+      if (pr.charAt(0) !== '-')
+        pr = '-' + pr;
+      ret = '>=' + M + '.' + m + '.' + p + pr +
+            ' <' + M + '.' + (+m + 1) + '.0';
+    } else
+      // ~1.2.3 == >=1.2.3 <1.3.0
+      ret = '>=' + M + '.' + m + '.' + p +
+            ' <' + M + '.' + (+m + 1) + '.0';
+
+    debug('tilde return', ret);
+    return ret;
+  });
+}
+
+// ^ --> * (any, kinda silly)
+// ^2, ^2.x, ^2.x.x --> >=2.0.0 <3.0.0
+// ^2.0, ^2.0.x --> >=2.0.0 <3.0.0
+// ^1.2, ^1.2.x --> >=1.2.0 <2.0.0
+// ^1.2.3 --> >=1.2.3 <2.0.0
+// ^1.2.0 --> >=1.2.0 <2.0.0
+function replaceCarets(comp, loose) {
+  return comp.trim().split(/\s+/).map(function(comp) {
+    return replaceCaret(comp, loose);
+  }).join(' ');
+}
+
+function replaceCaret(comp, loose) {
+  debug('caret', comp, loose);
+  var r = loose ? re[CARETLOOSE] : re[CARET];
+  return comp.replace(r, function(_, M, m, p, pr) {
+    debug('caret', comp, _, M, m, p, pr);
+    var ret;
+
+    if (isX(M))
+      ret = '';
+    else if (isX(m))
+      ret = '>=' + M + '.0.0 <' + (+M + 1) + '.0.0';
+    else if (isX(p)) {
+      if (M === '0')
+        ret = '>=' + M + '.' + m + '.0 <' + M + '.' + (+m + 1) + '.0';
+      else
+        ret = '>=' + M + '.' + m + '.0 <' + (+M + 1) + '.0.0';
+    } else if (pr) {
+      debug('replaceCaret pr', pr);
+      if (pr.charAt(0) !== '-')
+        pr = '-' + pr;
+      if (M === '0') {
+        if (m === '0')
+          ret = '>=' + M + '.' + m + '.' + p + pr +
+                ' <' + M + '.' + m + '.' + (+p + 1);
+        else
+          ret = '>=' + M + '.' + m + '.' + p + pr +
+                ' <' + M + '.' + (+m + 1) + '.0';
+      } else
+        ret = '>=' + M + '.' + m + '.' + p + pr +
+              ' <' + (+M + 1) + '.0.0';
+    } else {
+      debug('no pr');
+      if (M === '0') {
+        if (m === '0')
+          ret = '>=' + M + '.' + m + '.' + p +
+                ' <' + M + '.' + m + '.' + (+p + 1);
+        else
+          ret = '>=' + M + '.' + m + '.' + p +
+                ' <' + M + '.' + (+m + 1) + '.0';
+      } else
+        ret = '>=' + M + '.' + m + '.' + p +
+              ' <' + (+M + 1) + '.0.0';
+    }
+
+    debug('caret return', ret);
+    return ret;
+  });
+}
+
+function replaceXRanges(comp, loose) {
+  debug('replaceXRanges', comp, loose);
+  return comp.split(/\s+/).map(function(comp) {
+    return replaceXRange(comp, loose);
+  }).join(' ');
+}
+
+function replaceXRange(comp, loose) {
+  comp = comp.trim();
+  var r = loose ? re[XRANGELOOSE] : re[XRANGE];
+  return comp.replace(r, function(ret, gtlt, M, m, p, pr) {
+    debug('xRange', comp, ret, gtlt, M, m, p, pr);
+    var xM = isX(M);
+    var xm = xM || isX(m);
+    var xp = xm || isX(p);
+    var anyX = xp;
+
+    if (gtlt === '=' && anyX)
+      gtlt = '';
+
+    if (xM) {
+      if (gtlt === '>' || gtlt === '<') {
+        // nothing is allowed
+        ret = '<0.0.0';
+      } else {
+        // nothing is forbidden
+        ret = '*';
+      }
+    } else if (gtlt && anyX) {
+      // replace X with 0
+      if (xm)
+        m = 0;
+      if (xp)
+        p = 0;
+
+      if (gtlt === '>') {
+        // >1 => >=2.0.0
+        // >1.2 => >=1.3.0
+        // >1.2.3 => >= 1.2.4
+        gtlt = '>=';
+        if (xm) {
+          M = +M + 1;
+          m = 0;
+          p = 0;
+        } else if (xp) {
+          m = +m + 1;
+          p = 0;
+        }
+      } else if (gtlt === '<=') {
+        // <=0.7.x is actually <0.8.0, since any 0.7.x should
+        // pass.  Similarly, <=7.x is actually <8.0.0, etc.
+        gtlt = '<';
+        if (xm)
+          M = +M + 1;
+        else
+          m = +m + 1;
+      }
+
+      ret = gtlt + M + '.' + m + '.' + p;
+    } else if (xm) {
+      ret = '>=' + M + '.0.0 <' + (+M + 1) + '.0.0';
+    } else if (xp) {
+      ret = '>=' + M + '.' + m + '.0 <' + M + '.' + (+m + 1) + '.0';
+    }
+
+    debug('xRange return', ret);
+
+    return ret;
+  });
+}
+
+// Because * is AND-ed with everything else in the comparator,
+// and '' means "any version", just remove the *s entirely.
+function replaceStars(comp, loose) {
+  debug('replaceStars', comp, loose);
+  // Looseness is ignored here.  star is always as loose as it gets!
+  return comp.trim().replace(re[STAR], '');
+}
+
+// This function is passed to string.replace(re[HYPHENRANGE])
+// M, m, patch, prerelease, build
+// 1.2 - 3.4.5 => >=1.2.0 <=3.4.5
+// 1.2.3 - 3.4 => >=1.2.0 <3.5.0 Any 3.4.x will do
+// 1.2 - 3.4 => >=1.2.0 <3.5.0
+function hyphenReplace($0,
+                       from, fM, fm, fp, fpr, fb,
+                       to, tM, tm, tp, tpr, tb) {
+
+  if (isX(fM))
+    from = '';
+  else if (isX(fm))
+    from = '>=' + fM + '.0.0';
+  else if (isX(fp))
+    from = '>=' + fM + '.' + fm + '.0';
+  else
+    from = '>=' + from;
+
+  if (isX(tM))
+    to = '';
+  else if (isX(tm))
+    to = '<' + (+tM + 1) + '.0.0';
+  else if (isX(tp))
+    to = '<' + tM + '.' + (+tm + 1) + '.0';
+  else if (tpr)
+    to = '<=' + tM + '.' + tm + '.' + tp + '-' + tpr;
+  else
+    to = '<=' + to;
+
+  return (from + ' ' + to).trim();
+}
+
+
+// if ANY of the sets match ALL of its comparators, then pass
+Range.prototype.test = function(version) {
+  if (!version)
+    return false;
+
+  if (typeof version === 'string')
+    version = new SemVer(version, this.loose);
+
+  for (var i = 0; i < this.set.length; i++) {
+    if (testSet(this.set[i], version))
+      return true;
+  }
+  return false;
+};
+
+function testSet(set, version) {
+  for (var i = 0; i < set.length; i++) {
+    if (!set[i].test(version))
+      return false;
+  }
+
+  if (version.prerelease.length) {
+    // Find the set of versions that are allowed to have prereleases
+    // For example, ^1.2.3-pr.1 desugars to >=1.2.3-pr.1 <2.0.0
+    // That should allow `1.2.3-pr.2` to pass.
+    // However, `1.2.4-alpha.notready` should NOT be allowed,
+    // even though it's within the range set by the comparators.
+    for (var i = 0; i < set.length; i++) {
+      debug(set[i].semver);
+      if (set[i].semver === ANY)
+        continue;
+
+      if (set[i].semver.prerelease.length > 0) {
+        var allowed = set[i].semver;
+        if (allowed.major === version.major &&
+            allowed.minor === version.minor &&
+            allowed.patch === version.patch)
+          return true;
+      }
+    }
+
+    // Version has a -pre, but it's not one of the ones we like.
+    return false;
+  }
+
+  return true;
+}
+
+exports.satisfies = satisfies;
+function satisfies(version, range, loose) {
+  try {
+    range = new Range(range, loose);
+  } catch (er) {
+    return false;
+  }
+  return range.test(version);
+}
+
+exports.maxSatisfying = maxSatisfying;
+function maxSatisfying(versions, range, loose) {
+  var max = null;
+  var maxSV = null;
+  try {
+    var rangeObj = new Range(range, loose);
+  } catch (er) {
+    return null;
+  }
+  versions.forEach(function (v) {
+    if (rangeObj.test(v)) { // satisfies(v, range, loose)
+      if (!max || maxSV.compare(v) === -1) { // compare(max, v, true)
+        max = v;
+        maxSV = new SemVer(max, loose);
+      }
+    }
+  })
+  return max;
+}
+
+exports.minSatisfying = minSatisfying;
+function minSatisfying(versions, range, loose) {
+  var min = null;
+  var minSV = null;
+  try {
+    var rangeObj = new Range(range, loose);
+  } catch (er) {
+    return null;
+  }
+  versions.forEach(function (v) {
+    if (rangeObj.test(v)) { // satisfies(v, range, loose)
+      if (!min || minSV.compare(v) === 1) { // compare(min, v, true)
+        min = v;
+        minSV = new SemVer(min, loose);
+      }
+    }
+  })
+  return min;
+}
+
+exports.validRange = validRange;
+function validRange(range, loose) {
+  try {
+    // Return '*' instead of '' so that truthiness works.
+    // This will throw if it's invalid anyway
+    return new Range(range, loose).range || '*';
+  } catch (er) {
+    return null;
+  }
+}
+
+// Determine if version is less than all the versions possible in the range
+exports.ltr = ltr;
+function ltr(version, range, loose) {
+  return outside(version, range, '<', loose);
+}
+
+// Determine if version is greater than all the versions possible in the range.
+exports.gtr = gtr;
+function gtr(version, range, loose) {
+  return outside(version, range, '>', loose);
+}
+
+exports.outside = outside;
+function outside(version, range, hilo, loose) {
+  version = new SemVer(version, loose);
+  range = new Range(range, loose);
+
+  var gtfn, ltefn, ltfn, comp, ecomp;
+  switch (hilo) {
+    case '>':
+      gtfn = gt;
+      ltefn = lte;
+      ltfn = lt;
+      comp = '>';
+      ecomp = '>=';
+      break;
+    case '<':
+      gtfn = lt;
+      ltefn = gte;
+      ltfn = gt;
+      comp = '<';
+      ecomp = '<=';
+      break;
+    default:
+      throw new TypeError('Must provide a hilo val of "<" or ">"');
+  }
+
+  // If it satisifes the range it is not outside
+  if (satisfies(version, range, loose)) {
+    return false;
+  }
+
+  // From now on, variable terms are as if we're in "gtr" mode.
+  // but note that everything is flipped for the "ltr" function.
+
+  for (var i = 0; i < range.set.length; ++i) {
+    var comparators = range.set[i];
+
+    var high = null;
+    var low = null;
+
+    comparators.forEach(function(comparator) {
+      if (comparator.semver === ANY) {
+        comparator = new Comparator('>=0.0.0')
+      }
+      high = high || comparator;
+      low = low || comparator;
+      if (gtfn(comparator.semver, high.semver, loose)) {
+        high = comparator;
+      } else if (ltfn(comparator.semver, low.semver, loose)) {
+        low = comparator;
+      }
+    });
+
+    // If the edge version comparator has a operator then our version
+    // isn't outside it
+    if (high.operator === comp || high.operator === ecomp) {
+      return false;
+    }
+
+    // If the lowest version comparator has an operator and our version
+    // is less than it then it isn't higher than the range
+    if ((!low.operator || low.operator === comp) &&
+        ltefn(version, low.semver)) {
+      return false;
+    } else if (low.operator === ecomp && ltfn(version, low.semver)) {
+      return false;
+    }
+  }
+  return true;
+}
+
+exports.prerelease = prerelease;
+function prerelease(version, loose) {
+  var parsed = parse(version, loose);
+  return (parsed && parsed.prerelease.length) ? parsed.prerelease : null;
+}
+
+exports.intersects = intersects;
+function intersects(r1, r2, loose) {
+  r1 = new Range(r1, loose)
+  r2 = new Range(r2, loose)
+  return r1.intersects(r2)
+}
+
+exports.coerce = coerce;
+function coerce(version) {
+  if (version instanceof SemVer)
+    return version;
+
+  if (typeof version !== 'string')
+    return null;
+
+  var match = version.match(re[COERCE]);
+
+  if (match == null)
+    return null;
+
+  return parse((match[1] || '0') + '.' + (match[2] || '0') + '.' + (match[3] || '0')); 
+}
+
+
+/***/ }),
+/* 23 */
+/***/ (function(module, exports) {
+
+module.exports = require("stream");
+
+/***/ }),
+/* 24 */
+/***/ (function(module, exports) {
+
+module.exports = require("url");
+
+/***/ }),
+/* 25 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Subscription; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_isArray__ = __webpack_require__(41);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_isObject__ = __webpack_require__(444);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isFunction__ = __webpack_require__(154);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_tryCatch__ = __webpack_require__(56);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_errorObject__ = __webpack_require__(47);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_UnsubscriptionError__ = __webpack_require__(441);
+/** PURE_IMPORTS_START _util_isArray,_util_isObject,_util_isFunction,_util_tryCatch,_util_errorObject,_util_UnsubscriptionError PURE_IMPORTS_END */
+
+
+
+
+
+
+var Subscription = /*@__PURE__*/ (function () {
+    function Subscription(unsubscribe) {
+        this.closed = false;
+        this._parent = null;
+        this._parents = null;
+        this._subscriptions = null;
+        if (unsubscribe) {
+            this._unsubscribe = unsubscribe;
+        }
+    }
+    Subscription.prototype.unsubscribe = function () {
+        var hasErrors = false;
+        var errors;
+        if (this.closed) {
+            return;
+        }
+        var _a = this, _parent = _a._parent, _parents = _a._parents, _unsubscribe = _a._unsubscribe, _subscriptions = _a._subscriptions;
+        this.closed = true;
+        this._parent = null;
+        this._parents = null;
+        this._subscriptions = null;
+        var index = -1;
+        var len = _parents ? _parents.length : 0;
+        while (_parent) {
+            _parent.remove(this);
+            _parent = ++index < len && _parents[index] || null;
+        }
+        if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_isFunction__["a" /* isFunction */])(_unsubscribe)) {
+            var trial = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__util_tryCatch__["a" /* tryCatch */])(_unsubscribe).call(this);
+            if (trial === __WEBPACK_IMPORTED_MODULE_4__util_errorObject__["a" /* errorObject */]) {
+                hasErrors = true;
+                errors = errors || (__WEBPACK_IMPORTED_MODULE_4__util_errorObject__["a" /* errorObject */].e instanceof __WEBPACK_IMPORTED_MODULE_5__util_UnsubscriptionError__["a" /* UnsubscriptionError */] ?
+                    flattenUnsubscriptionErrors(__WEBPACK_IMPORTED_MODULE_4__util_errorObject__["a" /* errorObject */].e.errors) : [__WEBPACK_IMPORTED_MODULE_4__util_errorObject__["a" /* errorObject */].e]);
+            }
+        }
+        if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__util_isArray__["a" /* isArray */])(_subscriptions)) {
+            index = -1;
+            len = _subscriptions.length;
+            while (++index < len) {
+                var sub = _subscriptions[index];
+                if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__util_isObject__["a" /* isObject */])(sub)) {
+                    var trial = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__util_tryCatch__["a" /* tryCatch */])(sub.unsubscribe).call(sub);
+                    if (trial === __WEBPACK_IMPORTED_MODULE_4__util_errorObject__["a" /* errorObject */]) {
+                        hasErrors = true;
+                        errors = errors || [];
+                        var err = __WEBPACK_IMPORTED_MODULE_4__util_errorObject__["a" /* errorObject */].e;
+                        if (err instanceof __WEBPACK_IMPORTED_MODULE_5__util_UnsubscriptionError__["a" /* UnsubscriptionError */]) {
+                            errors = errors.concat(flattenUnsubscriptionErrors(err.errors));
+                        }
+                        else {
+                            errors.push(err);
+                        }
+                    }
+                }
+            }
+        }
+        if (hasErrors) {
+            throw new __WEBPACK_IMPORTED_MODULE_5__util_UnsubscriptionError__["a" /* UnsubscriptionError */](errors);
+        }
+    };
+    Subscription.prototype.add = function (teardown) {
+        if (!teardown || (teardown === Subscription.EMPTY)) {
+            return Subscription.EMPTY;
+        }
+        if (teardown === this) {
+            return this;
+        }
+        var subscription = teardown;
+        switch (typeof teardown) {
+            case 'function':
+                subscription = new Subscription(teardown);
+            case 'object':
+                if (subscription.closed || typeof subscription.unsubscribe !== 'function') {
+                    return subscription;
+                }
+                else if (this.closed) {
+                    subscription.unsubscribe();
+                    return subscription;
+                }
+                else if (typeof subscription._addParent !== 'function') {
+                    var tmp = subscription;
+                    subscription = new Subscription();
+                    subscription._subscriptions = [tmp];
+                }
+                break;
+            default:
+                throw new Error('unrecognized teardown ' + teardown + ' added to Subscription.');
+        }
+        var subscriptions = this._subscriptions || (this._subscriptions = []);
+        subscriptions.push(subscription);
+        subscription._addParent(this);
+        return subscription;
+    };
+    Subscription.prototype.remove = function (subscription) {
+        var subscriptions = this._subscriptions;
+        if (subscriptions) {
+            var subscriptionIndex = subscriptions.indexOf(subscription);
+            if (subscriptionIndex !== -1) {
+                subscriptions.splice(subscriptionIndex, 1);
+            }
+        }
+    };
+    Subscription.prototype._addParent = function (parent) {
+        var _a = this, _parent = _a._parent, _parents = _a._parents;
+        if (!_parent || _parent === parent) {
+            this._parent = parent;
+        }
+        else if (!_parents) {
+            this._parents = [parent];
+        }
+        else if (_parents.indexOf(parent) === -1) {
+            _parents.push(parent);
+        }
+    };
+    Subscription.EMPTY = (function (empty) {
+        empty.closed = true;
+        return empty;
+    }(new Subscription()));
+    return Subscription;
+}());
+
+function flattenUnsubscriptionErrors(errors) {
+    return errors.reduce(function (errs, err) { return errs.concat((err instanceof __WEBPACK_IMPORTED_MODULE_5__util_UnsubscriptionError__["a" /* UnsubscriptionError */]) ? err.errors : err); }, []);
+}
+//# sourceMappingURL=Subscription.js.map
+
+
+/***/ }),
+/* 26 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// Copyright 2015 Joyent, Inc.
+
+module.exports = {
+	bufferSplit: bufferSplit,
+	addRSAMissing: addRSAMissing,
+	calculateDSAPublic: calculateDSAPublic,
+	calculateED25519Public: calculateED25519Public,
+	calculateX25519Public: calculateX25519Public,
+	mpNormalize: mpNormalize,
+	mpDenormalize: mpDenormalize,
+	ecNormalize: ecNormalize,
+	countZeros: countZeros,
+	assertCompatible: assertCompatible,
+	isCompatible: isCompatible,
+	opensslKeyDeriv: opensslKeyDeriv,
+	opensshCipherInfo: opensshCipherInfo,
+	publicFromPrivateECDSA: publicFromPrivateECDSA,
+	zeroPadToLength: zeroPadToLength,
+	writeBitString: writeBitString,
+	readBitString: readBitString
+};
+
+var assert = __webpack_require__(16);
+var Buffer = __webpack_require__(15).Buffer;
+var PrivateKey = __webpack_require__(33);
+var Key = __webpack_require__(27);
+var crypto = __webpack_require__(11);
+var algs = __webpack_require__(32);
+var asn1 = __webpack_require__(66);
+
+var ec, jsbn;
+var nacl;
+
+var MAX_CLASS_DEPTH = 3;
+
+function isCompatible(obj, klass, needVer) {
+	if (obj === null || typeof (obj) !== 'object')
+		return (false);
+	if (needVer === undefined)
+		needVer = klass.prototype._sshpkApiVersion;
+	if (obj instanceof klass &&
+	    klass.prototype._sshpkApiVersion[0] == needVer[0])
+		return (true);
+	var proto = Object.getPrototypeOf(obj);
+	var depth = 0;
+	while (proto.constructor.name !== klass.name) {
+		proto = Object.getPrototypeOf(proto);
+		if (!proto || ++depth > MAX_CLASS_DEPTH)
+			return (false);
+	}
+	if (proto.constructor.name !== klass.name)
+		return (false);
+	var ver = proto._sshpkApiVersion;
+	if (ver === undefined)
+		ver = klass._oldVersionDetect(obj);
+	if (ver[0] != needVer[0] || ver[1] < needVer[1])
+		return (false);
+	return (true);
+}
+
+function assertCompatible(obj, klass, needVer, name) {
+	if (name === undefined)
+		name = 'object';
+	assert.ok(obj, name + ' must not be null');
+	assert.object(obj, name + ' must be an object');
+	if (needVer === undefined)
+		needVer = klass.prototype._sshpkApiVersion;
+	if (obj instanceof klass &&
+	    klass.prototype._sshpkApiVersion[0] == needVer[0])
+		return;
+	var proto = Object.getPrototypeOf(obj);
+	var depth = 0;
+	while (proto.constructor.name !== klass.name) {
+		proto = Object.getPrototypeOf(proto);
+		assert.ok(proto && ++depth <= MAX_CLASS_DEPTH,
+		    name + ' must be a ' + klass.name + ' instance');
+	}
+	assert.strictEqual(proto.constructor.name, klass.name,
+	    name + ' must be a ' + klass.name + ' instance');
+	var ver = proto._sshpkApiVersion;
+	if (ver === undefined)
+		ver = klass._oldVersionDetect(obj);
+	assert.ok(ver[0] == needVer[0] && ver[1] >= needVer[1],
+	    name + ' must be compatible with ' + klass.name + ' klass ' +
+	    'version ' + needVer[0] + '.' + needVer[1]);
+}
+
+var CIPHER_LEN = {
+	'des-ede3-cbc': { key: 7, iv: 8 },
+	'aes-128-cbc': { key: 16, iv: 16 }
+};
+var PKCS5_SALT_LEN = 8;
+
+function opensslKeyDeriv(cipher, salt, passphrase, count) {
+	assert.buffer(salt, 'salt');
+	assert.buffer(passphrase, 'passphrase');
+	assert.number(count, 'iteration count');
+
+	var clen = CIPHER_LEN[cipher];
+	assert.object(clen, 'supported cipher');
+
+	salt = salt.slice(0, PKCS5_SALT_LEN);
+
+	var D, D_prev, bufs;
+	var material = Buffer.alloc(0);
+	while (material.length < clen.key + clen.iv) {
+		bufs = [];
+		if (D_prev)
+			bufs.push(D_prev);
+		bufs.push(passphrase);
+		bufs.push(salt);
+		D = Buffer.concat(bufs);
+		for (var j = 0; j < count; ++j)
+			D = crypto.createHash('md5').update(D).digest();
+		material = Buffer.concat([material, D]);
+		D_prev = D;
+	}
+
+	return ({
+	    key: material.slice(0, clen.key),
+	    iv: material.slice(clen.key, clen.key + clen.iv)
+	});
+}
+
+/* Count leading zero bits on a buffer */
+function countZeros(buf) {
+	var o = 0, obit = 8;
+	while (o < buf.length) {
+		var mask = (1 << obit);
+		if ((buf[o] & mask) === mask)
+			break;
+		obit--;
+		if (obit < 0) {
+			o++;
+			obit = 8;
+		}
+	}
+	return (o*8 + (8 - obit) - 1);
+}
+
+function bufferSplit(buf, chr) {
+	assert.buffer(buf);
+	assert.string(chr);
+
+	var parts = [];
+	var lastPart = 0;
+	var matches = 0;
+	for (var i = 0; i < buf.length; ++i) {
+		if (buf[i] === chr.charCodeAt(matches))
+			++matches;
+		else if (buf[i] === chr.charCodeAt(0))
+			matches = 1;
+		else
+			matches = 0;
+
+		if (matches >= chr.length) {
+			var newPart = i + 1;
+			parts.push(buf.slice(lastPart, newPart - matches));
+			lastPart = newPart;
+			matches = 0;
+		}
+	}
+	if (lastPart <= buf.length)
+		parts.push(buf.slice(lastPart, buf.length));
+
+	return (parts);
+}
+
+function ecNormalize(buf, addZero) {
+	assert.buffer(buf);
+	if (buf[0] === 0x00 && buf[1] === 0x04) {
+		if (addZero)
+			return (buf);
+		return (buf.slice(1));
+	} else if (buf[0] === 0x04) {
+		if (!addZero)
+			return (buf);
+	} else {
+		while (buf[0] === 0x00)
+			buf = buf.slice(1);
+		if (buf[0] === 0x02 || buf[0] === 0x03)
+			throw (new Error('Compressed elliptic curve points ' +
+			    'are not supported'));
+		if (buf[0] !== 0x04)
+			throw (new Error('Not a valid elliptic curve point'));
+		if (!addZero)
+			return (buf);
+	}
+	var b = Buffer.alloc(buf.length + 1);
+	b[0] = 0x0;
+	buf.copy(b, 1);
+	return (b);
+}
+
+function readBitString(der, tag) {
+	if (tag === undefined)
+		tag = asn1.Ber.BitString;
+	var buf = der.readString(tag, true);
+	assert.strictEqual(buf[0], 0x00, 'bit strings with unused bits are ' +
+	    'not supported (0x' + buf[0].toString(16) + ')');
+	return (buf.slice(1));
+}
+
+function writeBitString(der, buf, tag) {
+	if (tag === undefined)
+		tag = asn1.Ber.BitString;
+	var b = Buffer.alloc(buf.length + 1);
+	b[0] = 0x00;
+	buf.copy(b, 1);
+	der.writeBuffer(b, tag);
+}
+
+function mpNormalize(buf) {
+	assert.buffer(buf);
+	while (buf.length > 1 && buf[0] === 0x00 && (buf[1] & 0x80) === 0x00)
+		buf = buf.slice(1);
+	if ((buf[0] & 0x80) === 0x80) {
+		var b = Buffer.alloc(buf.length + 1);
+		b[0] = 0x00;
+		buf.copy(b, 1);
+		buf = b;
+	}
+	return (buf);
+}
+
+function mpDenormalize(buf) {
+	assert.buffer(buf);
+	while (buf.length > 1 && buf[0] === 0x00)
+		buf = buf.slice(1);
+	return (buf);
+}
+
+function zeroPadToLength(buf, len) {
+	assert.buffer(buf);
+	assert.number(len);
+	while (buf.length > len) {
+		assert.equal(buf[0], 0x00);
+		buf = buf.slice(1);
+	}
+	while (buf.length < len) {
+		var b = Buffer.alloc(buf.length + 1);
+		b[0] = 0x00;
+		buf.copy(b, 1);
+		buf = b;
+	}
+	return (buf);
+}
+
+function bigintToMpBuf(bigint) {
+	var buf = Buffer.from(bigint.toByteArray());
+	buf = mpNormalize(buf);
+	return (buf);
+}
+
+function calculateDSAPublic(g, p, x) {
+	assert.buffer(g);
+	assert.buffer(p);
+	assert.buffer(x);
+	try {
+		var bigInt = __webpack_require__(81).BigInteger;
+	} catch (e) {
+		throw (new Error('To load a PKCS#8 format DSA private key, ' +
+		    'the node jsbn library is required.'));
+	}
+	g = new bigInt(g);
+	p = new bigInt(p);
+	x = new bigInt(x);
+	var y = g.modPow(x, p);
+	var ybuf = bigintToMpBuf(y);
+	return (ybuf);
+}
+
+function calculateED25519Public(k) {
+	assert.buffer(k);
+
+	if (nacl === undefined)
+		nacl = __webpack_require__(76);
+
+	var kp = nacl.sign.keyPair.fromSeed(new Uint8Array(k));
+	return (Buffer.from(kp.publicKey));
+}
+
+function calculateX25519Public(k) {
+	assert.buffer(k);
+
+	if (nacl === undefined)
+		nacl = __webpack_require__(76);
+
+	var kp = nacl.box.keyPair.fromSeed(new Uint8Array(k));
+	return (Buffer.from(kp.publicKey));
+}
+
+function addRSAMissing(key) {
+	assert.object(key);
+	assertCompatible(key, PrivateKey, [1, 1]);
+	try {
+		var bigInt = __webpack_require__(81).BigInteger;
+	} catch (e) {
+		throw (new Error('To write a PEM private key from ' +
+		    'this source, the node jsbn lib is required.'));
+	}
+
+	var d = new bigInt(key.part.d.data);
+	var buf;
+
+	if (!key.part.dmodp) {
+		var p = new bigInt(key.part.p.data);
+		var dmodp = d.mod(p.subtract(1));
+
+		buf = bigintToMpBuf(dmodp);
+		key.part.dmodp = {name: 'dmodp', data: buf};
+		key.parts.push(key.part.dmodp);
+	}
+	if (!key.part.dmodq) {
+		var q = new bigInt(key.part.q.data);
+		var dmodq = d.mod(q.subtract(1));
+
+		buf = bigintToMpBuf(dmodq);
+		key.part.dmodq = {name: 'dmodq', data: buf};
+		key.parts.push(key.part.dmodq);
+	}
+}
+
+function publicFromPrivateECDSA(curveName, priv) {
+	assert.string(curveName, 'curveName');
+	assert.buffer(priv);
+	if (ec === undefined)
+		ec = __webpack_require__(139);
+	if (jsbn === undefined)
+		jsbn = __webpack_require__(81).BigInteger;
+	var params = algs.curves[curveName];
+	var p = new jsbn(params.p);
+	var a = new jsbn(params.a);
+	var b = new jsbn(params.b);
+	var curve = new ec.ECCurveFp(p, a, b);
+	var G = curve.decodePointHex(params.G.toString('hex'));
+
+	var d = new jsbn(mpNormalize(priv));
+	var pub = G.multiply(d);
+	pub = Buffer.from(curve.encodePointHex(pub), 'hex');
+
+	var parts = [];
+	parts.push({name: 'curve', data: Buffer.from(curveName)});
+	parts.push({name: 'Q', data: pub});
+
+	var key = new Key({type: 'ecdsa', curve: curve, parts: parts});
+	return (key);
+}
+
+function opensshCipherInfo(cipher) {
+	var inf = {};
+	switch (cipher) {
+	case '3des-cbc':
+		inf.keySize = 24;
+		inf.blockSize = 8;
+		inf.opensslName = 'des-ede3-cbc';
+		break;
+	case 'blowfish-cbc':
+		inf.keySize = 16;
+		inf.blockSize = 8;
+		inf.opensslName = 'bf-cbc';
+		break;
+	case 'aes128-cbc':
+	case 'aes128-ctr':
+	case 'aes128-gcm@openssh.com':
+		inf.keySize = 16;
+		inf.blockSize = 16;
+		inf.opensslName = 'aes-128-' + cipher.slice(7, 10);
+		break;
+	case 'aes192-cbc':
+	case 'aes192-ctr':
+	case 'aes192-gcm@openssh.com':
+		inf.keySize = 24;
+		inf.blockSize = 16;
+		inf.opensslName = 'aes-192-' + cipher.slice(7, 10);
+		break;
+	case 'aes256-cbc':
+	case 'aes256-ctr':
+	case 'aes256-gcm@openssh.com':
+		inf.keySize = 32;
+		inf.blockSize = 16;
+		inf.opensslName = 'aes-256-' + cipher.slice(7, 10);
+		break;
+	default:
+		throw (new Error(
+		    'Unsupported openssl cipher "' + cipher + '"'));
+	}
+	return (inf);
+}
+
+
+/***/ }),
+/* 27 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// Copyright 2017 Joyent, Inc.
+
+module.exports = Key;
+
+var assert = __webpack_require__(16);
+var algs = __webpack_require__(32);
+var crypto = __webpack_require__(11);
+var Fingerprint = __webpack_require__(156);
+var Signature = __webpack_require__(75);
+var DiffieHellman = __webpack_require__(325).DiffieHellman;
+var errs = __webpack_require__(74);
+var utils = __webpack_require__(26);
+var PrivateKey = __webpack_require__(33);
+var edCompat;
+
+try {
+	edCompat = __webpack_require__(454);
+} catch (e) {
+	/* Just continue through, and bail out if we try to use it. */
+}
+
+var InvalidAlgorithmError = errs.InvalidAlgorithmError;
+var KeyParseError = errs.KeyParseError;
+
+var formats = {};
+formats['auto'] = __webpack_require__(455);
+formats['pem'] = __webpack_require__(86);
+formats['pkcs1'] = __webpack_require__(327);
+formats['pkcs8'] = __webpack_require__(157);
+formats['rfc4253'] = __webpack_require__(103);
+formats['ssh'] = __webpack_require__(456);
+formats['ssh-private'] = __webpack_require__(192);
+formats['openssh'] = formats['ssh-private'];
+formats['dnssec'] = __webpack_require__(326);
+
+function Key(opts) {
+	assert.object(opts, 'options');
+	assert.arrayOfObject(opts.parts, 'options.parts');
+	assert.string(opts.type, 'options.type');
+	assert.optionalString(opts.comment, 'options.comment');
+
+	var algInfo = algs.info[opts.type];
+	if (typeof (algInfo) !== 'object')
+		throw (new InvalidAlgorithmError(opts.type));
+
+	var partLookup = {};
+	for (var i = 0; i < opts.parts.length; ++i) {
+		var part = opts.parts[i];
+		partLookup[part.name] = part;
+	}
+
+	this.type = opts.type;
+	this.parts = opts.parts;
+	this.part = partLookup;
+	this.comment = undefined;
+	this.source = opts.source;
+
+	/* for speeding up hashing/fingerprint operations */
+	this._rfc4253Cache = opts._rfc4253Cache;
+	this._hashCache = {};
+
+	var sz;
+	this.curve = undefined;
+	if (this.type === 'ecdsa') {
+		var curve = this.part.curve.data.toString();
+		this.curve = curve;
+		sz = algs.curves[curve].size;
+	} else if (this.type === 'ed25519' || this.type === 'curve25519') {
+		sz = 256;
+		this.curve = 'curve25519';
+	} else {
+		var szPart = this.part[algInfo.sizePart];
+		sz = szPart.data.length;
+		sz = sz * 8 - utils.countZeros(szPart.data);
+	}
+	this.size = sz;
+}
+
+Key.formats = formats;
+
+Key.prototype.toBuffer = function (format, options) {
+	if (format === undefined)
+		format = 'ssh';
+	assert.string(format, 'format');
+	assert.object(formats[format], 'formats[format]');
+	assert.optionalObject(options, 'options');
+
+	if (format === 'rfc4253') {
+		if (this._rfc4253Cache === undefined)
+			this._rfc4253Cache = formats['rfc4253'].write(this);
+		return (this._rfc4253Cache);
+	}
+
+	return (formats[format].write(this, options));
+};
+
+Key.prototype.toString = function (format, options) {
+	return (this.toBuffer(format, options).toString());
+};
+
+Key.prototype.hash = function (algo) {
+	assert.string(algo, 'algorithm');
+	algo = algo.toLowerCase();
+	if (algs.hashAlgs[algo] === undefined)
+		throw (new InvalidAlgorithmError(algo));
+
+	if (this._hashCache[algo])
+		return (this._hashCache[algo]);
+	var hash = crypto.createHash(algo).
+	    update(this.toBuffer('rfc4253')).digest();
+	this._hashCache[algo] = hash;
+	return (hash);
+};
+
+Key.prototype.fingerprint = function (algo) {
+	if (algo === undefined)
+		algo = 'sha256';
+	assert.string(algo, 'algorithm');
+	var opts = {
+		type: 'key',
+		hash: this.hash(algo),
+		algorithm: algo
+	};
+	return (new Fingerprint(opts));
+};
+
+Key.prototype.defaultHashAlgorithm = function () {
+	var hashAlgo = 'sha1';
+	if (this.type === 'rsa')
+		hashAlgo = 'sha256';
+	if (this.type === 'dsa' && this.size > 1024)
+		hashAlgo = 'sha256';
+	if (this.type === 'ed25519')
+		hashAlgo = 'sha512';
+	if (this.type === 'ecdsa') {
+		if (this.size <= 256)
+			hashAlgo = 'sha256';
+		else if (this.size <= 384)
+			hashAlgo = 'sha384';
+		else
+			hashAlgo = 'sha512';
+	}
+	return (hashAlgo);
+};
+
+Key.prototype.createVerify = function (hashAlgo) {
+	if (hashAlgo === undefined)
+		hashAlgo = this.defaultHashAlgorithm();
+	assert.string(hashAlgo, 'hash algorithm');
+
+	/* ED25519 is not supported by OpenSSL, use a javascript impl. */
+	if (this.type === 'ed25519' && edCompat !== undefined)
+		return (new edCompat.Verifier(this, hashAlgo));
+	if (this.type === 'curve25519')
+		throw (new Error('Curve25519 keys are not suitable for ' +
+		    'signing or verification'));
+
+	var v, nm, err;
+	try {
+		nm = hashAlgo.toUpperCase();
+		v = crypto.createVerify(nm);
+	} catch (e) {
+		err = e;
+	}
+	if (v === undefined || (err instanceof Error &&
+	    err.message.match(/Unknown message digest/))) {
+		nm = 'RSA-';
+		nm += hashAlgo.toUpperCase();
+		v = crypto.createVerify(nm);
+	}
+	assert.ok(v, 'failed to create verifier');
+	var oldVerify = v.verify.bind(v);
+	var key = this.toBuffer('pkcs8');
+	var curve = this.curve;
+	var self = this;
+	v.verify = function (signature, fmt) {
+		if (Signature.isSignature(signature, [2, 0])) {
+			if (signature.type !== self.type)
+				return (false);
+			if (signature.hashAlgorithm &&
+			    signature.hashAlgorithm !== hashAlgo)
+				return (false);
+			if (signature.curve && self.type === 'ecdsa' &&
+			    signature.curve !== curve)
+				return (false);
+			return (oldVerify(key, signature.toBuffer('asn1')));
+
+		} else if (typeof (signature) === 'string' ||
+		    Buffer.isBuffer(signature)) {
+			return (oldVerify(key, signature, fmt));
+
+		/*
+		 * Avoid doing this on valid arguments, walking the prototype
+		 * chain can be quite slow.
+		 */
+		} else if (Signature.isSignature(signature, [1, 0])) {
+			throw (new Error('signature was created by too old ' +
+			    'a version of sshpk and cannot be verified'));
+
+		} else {
+			throw (new TypeError('signature must be a string, ' +
+			    'Buffer, or Signature object'));
+		}
+	};
+	return (v);
+};
+
+Key.prototype.createDiffieHellman = function () {
+	if (this.type === 'rsa')
+		throw (new Error('RSA keys do not support Diffie-Hellman'));
+
+	return (new DiffieHellman(this));
+};
+Key.prototype.createDH = Key.prototype.createDiffieHellman;
+
+Key.parse = function (data, format, options) {
+	if (typeof (data) !== 'string')
+		assert.buffer(data, 'data');
+	if (format === undefined)
+		format = 'auto';
+	assert.string(format, 'format');
+	if (typeof (options) === 'string')
+		options = { filename: options };
+	assert.optionalObject(options, 'options');
+	if (options === undefined)
+		options = {};
+	assert.optionalString(options.filename, 'options.filename');
+	if (options.filename === undefined)
+		options.filename = '(unnamed)';
+
+	assert.object(formats[format], 'formats[format]');
+
+	try {
+		var k = formats[format].read(data, options);
+		if (k instanceof PrivateKey)
+			k = k.toPublic();
+		if (!k.comment)
+			k.comment = options.filename;
+		return (k);
+	} catch (e) {
+		if (e.name === 'KeyEncryptedError')
+			throw (e);
+		throw (new KeyParseError(options.filename, format, e));
+	}
+};
+
+Key.isKey = function (obj, ver) {
+	return (utils.isCompatible(obj, Key, ver));
+};
+
+/*
+ * API versions for Key:
+ * [1,0] -- initial ver, may take Signature for createVerify or may not
+ * [1,1] -- added pkcs1, pkcs8 formats
+ * [1,2] -- added auto, ssh-private, openssh formats
+ * [1,3] -- added defaultHashAlgorithm
+ * [1,4] -- added ed support, createDH
+ * [1,5] -- first explicitly tagged version
+ * [1,6] -- changed ed25519 part names
+ */
+Key.prototype._sshpkApiVersion = [1, 6];
+
+Key._oldVersionDetect = function (obj) {
+	assert.func(obj.toBuffer);
+	assert.func(obj.fingerprint);
+	if (obj.createDH)
+		return ([1, 4]);
+	if (obj.defaultHashAlgorithm)
+		return ([1, 3]);
+	if (obj.formats['auto'])
+		return ([1, 2]);
+	if (obj.formats['pkcs1'])
+		return ([1, 1]);
+	return ([1, 0]);
+};
+
+
+/***/ }),
+/* 28 */
+/***/ (function(module, exports) {
+
+module.exports = require("assert");
+
+/***/ }),
+/* 29 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = nullify;
+function nullify(obj = {}) {
+  if (Array.isArray(obj)) {
+    for (var _iterator = obj, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+      var _ref;
+
+      if (_isArray) {
+        if (_i >= _iterator.length) break;
+        _ref = _iterator[_i++];
+      } else {
+        _i = _iterator.next();
+        if (_i.done) break;
+        _ref = _i.value;
+      }
+
+      const item = _ref;
+
+      nullify(item);
+    }
+  } else if (obj !== null && typeof obj === 'object' || typeof obj === 'function') {
+    Object.setPrototypeOf(obj, null);
+
+    // for..in can only be applied to 'object', not 'function'
+    if (typeof obj === 'object') {
+      for (const key in obj) {
+        nullify(obj[key]);
+      }
+    }
+  }
+
+  return obj;
+}
+
+/***/ }),
+/* 30 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+const escapeStringRegexp = __webpack_require__(388);
+const ansiStyles = __webpack_require__(506);
+const stdoutColor = __webpack_require__(598).stdout;
+
+const template = __webpack_require__(599);
+
+const isSimpleWindowsTerm = process.platform === 'win32' && !(process.env.TERM || '').toLowerCase().startsWith('xterm');
+
+// `supportsColor.level` → `ansiStyles.color[name]` mapping
+const levelMapping = ['ansi', 'ansi', 'ansi256', 'ansi16m'];
+
+// `color-convert` models to exclude from the Chalk API due to conflicts and such
+const skipModels = new Set(['gray']);
+
+const styles = Object.create(null);
+
+function applyOptions(obj, options) {
+	options = options || {};
+
+	// Detect level if not set manually
+	const scLevel = stdoutColor ? stdoutColor.level : 0;
+	obj.level = options.level === undefined ? scLevel : options.level;
+	obj.enabled = 'enabled' in options ? options.enabled : obj.level > 0;
+}
+
+function Chalk(options) {
+	// We check for this.template here since calling `chalk.constructor()`
+	// by itself will have a `this` of a previously constructed chalk object
+	if (!this || !(this instanceof Chalk) || this.template) {
+		const chalk = {};
+		applyOptions(chalk, options);
+
+		chalk.template = function () {
+			const args = [].slice.call(arguments);
+			return chalkTag.apply(null, [chalk.template].concat(args));
+		};
+
+		Object.setPrototypeOf(chalk, Chalk.prototype);
+		Object.setPrototypeOf(chalk.template, chalk);
+
+		chalk.template.constructor = Chalk;
+
+		return chalk.template;
+	}
+
+	applyOptions(this, options);
+}
+
+// Use bright blue on Windows as the normal blue color is illegible
+if (isSimpleWindowsTerm) {
+	ansiStyles.blue.open = '\u001B[94m';
+}
+
+for (const key of Object.keys(ansiStyles)) {
+	ansiStyles[key].closeRe = new RegExp(escapeStringRegexp(ansiStyles[key].close), 'g');
+
+	styles[key] = {
+		get() {
+			const codes = ansiStyles[key];
+			return build.call(this, this._styles ? this._styles.concat(codes) : [codes], this._empty, key);
+		}
+	};
+}
+
+styles.visible = {
+	get() {
+		return build.call(this, this._styles || [], true, 'visible');
+	}
+};
+
+ansiStyles.color.closeRe = new RegExp(escapeStringRegexp(ansiStyles.color.close), 'g');
+for (const model of Object.keys(ansiStyles.color.ansi)) {
+	if (skipModels.has(model)) {
+		continue;
+	}
+
+	styles[model] = {
+		get() {
+			const level = this.level;
+			return function () {
+				const open = ansiStyles.color[levelMapping[level]][model].apply(null, arguments);
+				const codes = {
+					open,
+					close: ansiStyles.color.close,
+					closeRe: ansiStyles.color.closeRe
+				};
+				return build.call(this, this._styles ? this._styles.concat(codes) : [codes], this._empty, model);
+			};
+		}
+	};
+}
+
+ansiStyles.bgColor.closeRe = new RegExp(escapeStringRegexp(ansiStyles.bgColor.close), 'g');
+for (const model of Object.keys(ansiStyles.bgColor.ansi)) {
+	if (skipModels.has(model)) {
+		continue;
+	}
+
+	const bgModel = 'bg' + model[0].toUpperCase() + model.slice(1);
+	styles[bgModel] = {
+		get() {
+			const level = this.level;
+			return function () {
+				const open = ansiStyles.bgColor[levelMapping[level]][model].apply(null, arguments);
+				const codes = {
+					open,
+					close: ansiStyles.bgColor.close,
+					closeRe: ansiStyles.bgColor.closeRe
+				};
+				return build.call(this, this._styles ? this._styles.concat(codes) : [codes], this._empty, model);
+			};
+		}
+	};
+}
+
+const proto = Object.defineProperties(() => {}, styles);
+
+function build(_styles, _empty, key) {
+	const builder = function () {
+		return applyStyle.apply(builder, arguments);
+	};
+
+	builder._styles = _styles;
+	builder._empty = _empty;
+
+	const self = this;
+
+	Object.defineProperty(builder, 'level', {
+		enumerable: true,
+		get() {
+			return self.level;
+		},
+		set(level) {
+			self.level = level;
+		}
+	});
+
+	Object.defineProperty(builder, 'enabled', {
+		enumerable: true,
+		get() {
+			return self.enabled;
+		},
+		set(enabled) {
+			self.enabled = enabled;
+		}
+	});
+
+	// See below for fix regarding invisible grey/dim combination on Windows
+	builder.hasGrey = this.hasGrey || key === 'gray' || key === 'grey';
+
+	// `__proto__` is used because we must return a function, but there is
+	// no way to create a function with a different prototype
+	builder.__proto__ = proto; // eslint-disable-line no-proto
+
+	return builder;
+}
+
+function applyStyle() {
+	// Support varags, but simply cast to string in case there's only one arg
+	const args = arguments;
+	const argsLen = args.length;
+	let str = String(arguments[0]);
+
+	if (argsLen === 0) {
+		return '';
+	}
+
+	if (argsLen > 1) {
+		// Don't slice `arguments`, it prevents V8 optimizations
+		for (let a = 1; a < argsLen; a++) {
+			str += ' ' + args[a];
+		}
+	}
+
+	if (!this.enabled || this.level <= 0 || !str) {
+		return this._empty ? '' : str;
+	}
+
+	// Turns out that on Windows dimmed gray text becomes invisible in cmd.exe,
+	// see https://github.com/chalk/chalk/issues/58
+	// If we're on Windows and we're dealing with a gray color, temporarily make 'dim' a noop.
+	const originalDim = ansiStyles.dim.open;
+	if (isSimpleWindowsTerm && this.hasGrey) {
+		ansiStyles.dim.open = '';
+	}
+
+	for (const code of this._styles.slice().reverse()) {
+		// Replace any instances already present with a re-opening code
+		// otherwise only the part of the string until said closing code
+		// will be colored, and the rest will simply be 'plain'.
+		str = code.open + str.replace(code.closeRe, code.open) + code.close;
+
+		// Close the styling before a linebreak and reopen
+		// after next line to fix a bleed issue on macOS
+		// https://github.com/chalk/chalk/pull/92
+		str = str.replace(/\r?\n/g, `${code.close}$&${code.open}`);
+	}
+
+	// Reset the original `dim` if we changed it to work around the Windows dimmed gray issue
+	ansiStyles.dim.open = originalDim;
+
+	return str;
+}
+
+function chalkTag(chalk, strings) {
+	if (!Array.isArray(strings)) {
+		// If chalk() was called by itself or with a string,
+		// return the string itself as a string.
+		return [].slice.call(arguments, 1).join(' ');
+	}
+
+	const args = [].slice.call(arguments, 2);
+	const parts = [strings.raw[0]];
+
+	for (let i = 1; i < strings.length; i++) {
+		parts.push(String(args[i - 1]).replace(/[{}\\]/g, '\\$&'));
+		parts.push(String(strings.raw[i]));
+	}
+
+	return template(chalk, parts.join(''));
+}
+
+Object.defineProperties(Chalk.prototype, styles);
+
+module.exports = Chalk(); // eslint-disable-line new-cap
+module.exports.supportsColor = stdoutColor;
+module.exports.default = module.exports; // For TypeScript
+
+
+/***/ }),
+/* 31 */
+/***/ (function(module, exports) {
+
+var core = module.exports = { version: '2.5.7' };
+if (typeof __e == 'number') __e = core; // eslint-disable-line no-undef
+
+
+/***/ }),
+/* 32 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// Copyright 2015 Joyent, Inc.
+
+var Buffer = __webpack_require__(15).Buffer;
+
+var algInfo = {
+	'dsa': {
+		parts: ['p', 'q', 'g', 'y'],
+		sizePart: 'p'
+	},
+	'rsa': {
+		parts: ['e', 'n'],
+		sizePart: 'n'
+	},
+	'ecdsa': {
+		parts: ['curve', 'Q'],
+		sizePart: 'Q'
+	},
+	'ed25519': {
+		parts: ['A'],
+		sizePart: 'A'
+	}
+};
+algInfo['curve25519'] = algInfo['ed25519'];
+
+var algPrivInfo = {
+	'dsa': {
+		parts: ['p', 'q', 'g', 'y', 'x']
+	},
+	'rsa': {
+		parts: ['n', 'e', 'd', 'iqmp', 'p', 'q']
+	},
+	'ecdsa': {
+		parts: ['curve', 'Q', 'd']
+	},
+	'ed25519': {
+		parts: ['A', 'k']
+	}
+};
+algPrivInfo['curve25519'] = algPrivInfo['ed25519'];
+
+var hashAlgs = {
+	'md5': true,
+	'sha1': true,
+	'sha256': true,
+	'sha384': true,
+	'sha512': true
+};
+
+/*
+ * Taken from
+ * http://csrc.nist.gov/groups/ST/toolkit/documents/dss/NISTReCur.pdf
+ */
+var curves = {
+	'nistp256': {
+		size: 256,
+		pkcs8oid: '1.2.840.10045.3.1.7',
+		p: Buffer.from(('00' +
+		    'ffffffff 00000001 00000000 00000000' +
+		    '00000000 ffffffff ffffffff ffffffff').
+		    replace(/ /g, ''), 'hex'),
+		a: Buffer.from(('00' +
+		    'FFFFFFFF 00000001 00000000 00000000' +
+		    '00000000 FFFFFFFF FFFFFFFF FFFFFFFC').
+		    replace(/ /g, ''), 'hex'),
+		b: Buffer.from((
+		    '5ac635d8 aa3a93e7 b3ebbd55 769886bc' +
+		    '651d06b0 cc53b0f6 3bce3c3e 27d2604b').
+		    replace(/ /g, ''), 'hex'),
+		s: Buffer.from(('00' +
+		    'c49d3608 86e70493 6a6678e1 139d26b7' +
+		    '819f7e90').
+		    replace(/ /g, ''), 'hex'),
+		n: Buffer.from(('00' +
+		    'ffffffff 00000000 ffffffff ffffffff' +
+		    'bce6faad a7179e84 f3b9cac2 fc632551').
+		    replace(/ /g, ''), 'hex'),
+		G: Buffer.from(('04' +
+		    '6b17d1f2 e12c4247 f8bce6e5 63a440f2' +
+		    '77037d81 2deb33a0 f4a13945 d898c296' +
+		    '4fe342e2 fe1a7f9b 8ee7eb4a 7c0f9e16' +
+		    '2bce3357 6b315ece cbb64068 37bf51f5').
+		    replace(/ /g, ''), 'hex')
+	},
+	'nistp384': {
+		size: 384,
+		pkcs8oid: '1.3.132.0.34',
+		p: Buffer.from(('00' +
+		    'ffffffff ffffffff ffffffff ffffffff' +
+		    'ffffffff ffffffff ffffffff fffffffe' +
+		    'ffffffff 00000000 00000000 ffffffff').
+		    replace(/ /g, ''), 'hex'),
+		a: Buffer.from(('00' +
+		    'FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF' +
+		    'FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFE' +
+		    'FFFFFFFF 00000000 00000000 FFFFFFFC').
+		    replace(/ /g, ''), 'hex'),
+		b: Buffer.from((
+		    'b3312fa7 e23ee7e4 988e056b e3f82d19' +
+		    '181d9c6e fe814112 0314088f 5013875a' +
+		    'c656398d 8a2ed19d 2a85c8ed d3ec2aef').
+		    replace(/ /g, ''), 'hex'),
+		s: Buffer.from(('00' +
+		    'a335926a a319a27a 1d00896a 6773a482' +
+		    '7acdac73').
+		    replace(/ /g, ''), 'hex'),
+		n: Buffer.from(('00' +
+		    'ffffffff ffffffff ffffffff ffffffff' +
+		    'ffffffff ffffffff c7634d81 f4372ddf' +
+		    '581a0db2 48b0a77a ecec196a ccc52973').
+		    replace(/ /g, ''), 'hex'),
+		G: Buffer.from(('04' +
+		    'aa87ca22 be8b0537 8eb1c71e f320ad74' +
+		    '6e1d3b62 8ba79b98 59f741e0 82542a38' +
+		    '5502f25d bf55296c 3a545e38 72760ab7' +
+		    '3617de4a 96262c6f 5d9e98bf 9292dc29' +
+		    'f8f41dbd 289a147c e9da3113 b5f0b8c0' +
+		    '0a60b1ce 1d7e819d 7a431d7c 90ea0e5f').
+		    replace(/ /g, ''), 'hex')
+	},
+	'nistp521': {
+		size: 521,
+		pkcs8oid: '1.3.132.0.35',
+		p: Buffer.from((
+		    '01ffffff ffffffff ffffffff ffffffff' +
+		    'ffffffff ffffffff ffffffff ffffffff' +
+		    'ffffffff ffffffff ffffffff ffffffff' +
+		    'ffffffff ffffffff ffffffff ffffffff' +
+		    'ffff').replace(/ /g, ''), 'hex'),
+		a: Buffer.from(('01FF' +
+		    'FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF' +
+		    'FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF' +
+		    'FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF' +
+		    'FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFC').
+		    replace(/ /g, ''), 'hex'),
+		b: Buffer.from(('51' +
+		    '953eb961 8e1c9a1f 929a21a0 b68540ee' +
+		    'a2da725b 99b315f3 b8b48991 8ef109e1' +
+		    '56193951 ec7e937b 1652c0bd 3bb1bf07' +
+		    '3573df88 3d2c34f1 ef451fd4 6b503f00').
+		    replace(/ /g, ''), 'hex'),
+		s: Buffer.from(('00' +
+		    'd09e8800 291cb853 96cc6717 393284aa' +
+		    'a0da64ba').replace(/ /g, ''), 'hex'),
+		n: Buffer.from(('01ff' +
+		    'ffffffff ffffffff ffffffff ffffffff' +
+		    'ffffffff ffffffff ffffffff fffffffa' +
+		    '51868783 bf2f966b 7fcc0148 f709a5d0' +
+		    '3bb5c9b8 899c47ae bb6fb71e 91386409').
+		    replace(/ /g, ''), 'hex'),
+		G: Buffer.from(('04' +
+		    '00c6 858e06b7 0404e9cd 9e3ecb66 2395b442' +
+		         '9c648139 053fb521 f828af60 6b4d3dba' +
+		         'a14b5e77 efe75928 fe1dc127 a2ffa8de' +
+		         '3348b3c1 856a429b f97e7e31 c2e5bd66' +
+		    '0118 39296a78 9a3bc004 5c8a5fb4 2c7d1bd9' +
+		         '98f54449 579b4468 17afbd17 273e662c' +
+		         '97ee7299 5ef42640 c550b901 3fad0761' +
+		         '353c7086 a272c240 88be9476 9fd16650').
+		    replace(/ /g, ''), 'hex')
+	}
+};
+
+module.exports = {
+	info: algInfo,
+	privInfo: algPrivInfo,
+	hashAlgs: hashAlgs,
+	curves: curves
+};
+
+
+/***/ }),
+/* 33 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// Copyright 2017 Joyent, Inc.
+
+module.exports = PrivateKey;
+
+var assert = __webpack_require__(16);
+var Buffer = __webpack_require__(15).Buffer;
+var algs = __webpack_require__(32);
+var crypto = __webpack_require__(11);
+var Fingerprint = __webpack_require__(156);
+var Signature = __webpack_require__(75);
+var errs = __webpack_require__(74);
+var util = __webpack_require__(3);
+var utils = __webpack_require__(26);
+var dhe = __webpack_require__(325);
+var generateECDSA = dhe.generateECDSA;
+var generateED25519 = dhe.generateED25519;
+var edCompat;
+var nacl;
+
+try {
+	edCompat = __webpack_require__(454);
+} catch (e) {
+	/* Just continue through, and bail out if we try to use it. */
+}
+
+var Key = __webpack_require__(27);
+
+var InvalidAlgorithmError = errs.InvalidAlgorithmError;
+var KeyParseError = errs.KeyParseError;
+var KeyEncryptedError = errs.KeyEncryptedError;
+
+var formats = {};
+formats['auto'] = __webpack_require__(455);
+formats['pem'] = __webpack_require__(86);
+formats['pkcs1'] = __webpack_require__(327);
+formats['pkcs8'] = __webpack_require__(157);
+formats['rfc4253'] = __webpack_require__(103);
+formats['ssh-private'] = __webpack_require__(192);
+formats['openssh'] = formats['ssh-private'];
+formats['ssh'] = formats['ssh-private'];
+formats['dnssec'] = __webpack_require__(326);
+
+function PrivateKey(opts) {
+	assert.object(opts, 'options');
+	Key.call(this, opts);
+
+	this._pubCache = undefined;
+}
+util.inherits(PrivateKey, Key);
+
+PrivateKey.formats = formats;
+
+PrivateKey.prototype.toBuffer = function (format, options) {
+	if (format === undefined)
+		format = 'pkcs1';
+	assert.string(format, 'format');
+	assert.object(formats[format], 'formats[format]');
+	assert.optionalObject(options, 'options');
+
+	return (formats[format].write(this, options));
+};
+
+PrivateKey.prototype.hash = function (algo) {
+	return (this.toPublic().hash(algo));
+};
+
+PrivateKey.prototype.toPublic = function () {
+	if (this._pubCache)
+		return (this._pubCache);
+
+	var algInfo = algs.info[this.type];
+	var pubParts = [];
+	for (var i = 0; i < algInfo.parts.length; ++i) {
+		var p = algInfo.parts[i];
+		pubParts.push(this.part[p]);
+	}
+
+	this._pubCache = new Key({
+		type: this.type,
+		source: this,
+		parts: pubParts
+	});
+	if (this.comment)
+		this._pubCache.comment = this.comment;
+	return (this._pubCache);
+};
+
+PrivateKey.prototype.derive = function (newType) {
+	assert.string(newType, 'type');
+	var priv, pub, pair;
+
+	if (this.type === 'ed25519' && newType === 'curve25519') {
+		if (nacl === undefined)
+			nacl = __webpack_require__(76);
+
+		priv = this.part.k.data;
+		if (priv[0] === 0x00)
+			priv = priv.slice(1);
+
+		pair = nacl.box.keyPair.fromSecretKey(new Uint8Array(priv));
+		pub = Buffer.from(pair.publicKey);
+
+		return (new PrivateKey({
+			type: 'curve25519',
+			parts: [
+				{ name: 'A', data: utils.mpNormalize(pub) },
+				{ name: 'k', data: utils.mpNormalize(priv) }
+			]
+		}));
+	} else if (this.type === 'curve25519' && newType === 'ed25519') {
+		if (nacl === undefined)
+			nacl = __webpack_require__(76);
+
+		priv = this.part.k.data;
+		if (priv[0] === 0x00)
+			priv = priv.slice(1);
+
+		pair = nacl.sign.keyPair.fromSeed(new Uint8Array(priv));
+		pub = Buffer.from(pair.publicKey);
+
+		return (new PrivateKey({
+			type: 'ed25519',
+			parts: [
+				{ name: 'A', data: utils.mpNormalize(pub) },
+				{ name: 'k', data: utils.mpNormalize(priv) }
+			]
+		}));
+	}
+	throw (new Error('Key derivation not supported from ' + this.type +
+	    ' to ' + newType));
+};
+
+PrivateKey.prototype.createVerify = function (hashAlgo) {
+	return (this.toPublic().createVerify(hashAlgo));
+};
+
+PrivateKey.prototype.createSign = function (hashAlgo) {
+	if (hashAlgo === undefined)
+		hashAlgo = this.defaultHashAlgorithm();
+	assert.string(hashAlgo, 'hash algorithm');
+
+	/* ED25519 is not supported by OpenSSL, use a javascript impl. */
+	if (this.type === 'ed25519' && edCompat !== undefined)
+		return (new edCompat.Signer(this, hashAlgo));
+	if (this.type === 'curve25519')
+		throw (new Error('Curve25519 keys are not suitable for ' +
+		    'signing or verification'));
+
+	var v, nm, err;
+	try {
+		nm = hashAlgo.toUpperCase();
+		v = crypto.createSign(nm);
+	} catch (e) {
+		err = e;
+	}
+	if (v === undefined || (err instanceof Error &&
+	    err.message.match(/Unknown message digest/))) {
+		nm = 'RSA-';
+		nm += hashAlgo.toUpperCase();
+		v = crypto.createSign(nm);
+	}
+	assert.ok(v, 'failed to create verifier');
+	var oldSign = v.sign.bind(v);
+	var key = this.toBuffer('pkcs1');
+	var type = this.type;
+	var curve = this.curve;
+	v.sign = function () {
+		var sig = oldSign(key);
+		if (typeof (sig) === 'string')
+			sig = Buffer.from(sig, 'binary');
+		sig = Signature.parse(sig, type, 'asn1');
+		sig.hashAlgorithm = hashAlgo;
+		sig.curve = curve;
+		return (sig);
+	};
+	return (v);
+};
+
+PrivateKey.parse = function (data, format, options) {
+	if (typeof (data) !== 'string')
+		assert.buffer(data, 'data');
+	if (format === undefined)
+		format = 'auto';
+	assert.string(format, 'format');
+	if (typeof (options) === 'string')
+		options = { filename: options };
+	assert.optionalObject(options, 'options');
+	if (options === undefined)
+		options = {};
+	assert.optionalString(options.filename, 'options.filename');
+	if (options.filename === undefined)
+		options.filename = '(unnamed)';
+
+	assert.object(formats[format], 'formats[format]');
+
+	try {
+		var k = formats[format].read(data, options);
+		assert.ok(k instanceof PrivateKey, 'key is not a private key');
+		if (!k.comment)
+			k.comment = options.filename;
+		return (k);
+	} catch (e) {
+		if (e.name === 'KeyEncryptedError')
+			throw (e);
+		throw (new KeyParseError(options.filename, format, e));
+	}
+};
+
+PrivateKey.isPrivateKey = function (obj, ver) {
+	return (utils.isCompatible(obj, PrivateKey, ver));
+};
+
+PrivateKey.generate = function (type, options) {
+	if (options === undefined)
+		options = {};
+	assert.object(options, 'options');
+
+	switch (type) {
+	case 'ecdsa':
+		if (options.curve === undefined)
+			options.curve = 'nistp256';
+		assert.string(options.curve, 'options.curve');
+		return (generateECDSA(options.curve));
+	case 'ed25519':
+		return (generateED25519());
+	default:
+		throw (new Error('Key generation not supported with key ' +
+		    'type "' + type + '"'));
+	}
+};
+
+/*
+ * API versions for PrivateKey:
+ * [1,0] -- initial ver
+ * [1,1] -- added auto, pkcs[18], openssh/ssh-private formats
+ * [1,2] -- added defaultHashAlgorithm
+ * [1,3] -- added derive, ed, createDH
+ * [1,4] -- first tagged version
+ * [1,5] -- changed ed25519 part names and format
+ */
+PrivateKey.prototype._sshpkApiVersion = [1, 5];
+
+PrivateKey._oldVersionDetect = function (obj) {
+	assert.func(obj.toPublic);
+	assert.func(obj.createSign);
+	if (obj.derive)
+		return ([1, 3]);
+	if (obj.defaultHashAlgorithm)
+		return ([1, 2]);
+	if (obj.formats['auto'])
+		return ([1, 1]);
+	return ([1, 0]);
+};
+
+
+/***/ }),
+/* 34 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.wrapLifecycle = exports.run = exports.install = exports.Install = undefined;
+
+var _extends2;
+
+function _load_extends() {
+  return _extends2 = _interopRequireDefault(__webpack_require__(21));
+}
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+let install = exports.install = (() => {
+  var _ref29 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, lockfile) {
+    yield wrapLifecycle(config, flags, (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const install = new Install(flags, config, reporter, lockfile);
+      yield install.init();
+    }));
+  });
+
+  return function install(_x7, _x8, _x9, _x10) {
+    return _ref29.apply(this, arguments);
+  };
+})();
+
+let run = exports.run = (() => {
+  var _ref31 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
+    let lockfile;
+    let error = 'installCommandRenamed';
+    if (flags.lockfile === false) {
+      lockfile = new (_lockfile || _load_lockfile()).default();
+    } else {
+      lockfile = yield (_lockfile || _load_lockfile()).default.fromDirectory(config.lockfileFolder, reporter);
+    }
+
+    if (args.length) {
+      const exampleArgs = args.slice();
+
+      if (flags.saveDev) {
+        exampleArgs.push('--dev');
+      }
+      if (flags.savePeer) {
+        exampleArgs.push('--peer');
+      }
+      if (flags.saveOptional) {
+        exampleArgs.push('--optional');
+      }
+      if (flags.saveExact) {
+        exampleArgs.push('--exact');
+      }
+      if (flags.saveTilde) {
+        exampleArgs.push('--tilde');
+      }
+      let command = 'add';
+      if (flags.global) {
+        error = 'globalFlagRemoved';
+        command = 'global add';
+      }
+      throw new (_errors || _load_errors()).MessageError(reporter.lang(error, `yarn ${command} ${exampleArgs.join(' ')}`));
+    }
+
+    yield install(config, reporter, flags, lockfile);
+  });
+
+  return function run(_x11, _x12, _x13, _x14) {
+    return _ref31.apply(this, arguments);
+  };
+})();
+
+let wrapLifecycle = exports.wrapLifecycle = (() => {
+  var _ref32 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, flags, factory) {
+    yield config.executeLifecycleScript('preinstall');
+
+    yield factory();
+
+    // npm behaviour, seems kinda funky but yay compatibility
+    yield config.executeLifecycleScript('install');
+    yield config.executeLifecycleScript('postinstall');
+
+    if (!config.production) {
+      if (!config.disablePrepublish) {
+        yield config.executeLifecycleScript('prepublish');
+      }
+      yield config.executeLifecycleScript('prepare');
+    }
+  });
+
+  return function wrapLifecycle(_x15, _x16, _x17) {
+    return _ref32.apply(this, arguments);
+  };
+})();
+
+exports.hasWrapper = hasWrapper;
+exports.setFlags = setFlags;
+
+var _objectPath;
+
+function _load_objectPath() {
+  return _objectPath = _interopRequireDefault(__webpack_require__(304));
+}
+
+var _hooks;
+
+function _load_hooks() {
+  return _hooks = __webpack_require__(374);
+}
+
+var _index;
+
+function _load_index() {
+  return _index = _interopRequireDefault(__webpack_require__(220));
+}
+
+var _errors;
+
+function _load_errors() {
+  return _errors = __webpack_require__(6);
+}
+
+var _integrityChecker;
+
+function _load_integrityChecker() {
+  return _integrityChecker = _interopRequireDefault(__webpack_require__(208));
+}
+
+var _lockfile;
+
+function _load_lockfile() {
+  return _lockfile = _interopRequireDefault(__webpack_require__(19));
+}
+
+var _lockfile2;
+
+function _load_lockfile2() {
+  return _lockfile2 = __webpack_require__(19);
+}
+
+var _packageFetcher;
+
+function _load_packageFetcher() {
+  return _packageFetcher = _interopRequireWildcard(__webpack_require__(210));
+}
+
+var _packageInstallScripts;
+
+function _load_packageInstallScripts() {
+  return _packageInstallScripts = _interopRequireDefault(__webpack_require__(557));
+}
+
+var _packageCompatibility;
+
+function _load_packageCompatibility() {
+  return _packageCompatibility = _interopRequireWildcard(__webpack_require__(209));
+}
+
+var _packageResolver;
+
+function _load_packageResolver() {
+  return _packageResolver = _interopRequireDefault(__webpack_require__(366));
+}
+
+var _packageLinker;
+
+function _load_packageLinker() {
+  return _packageLinker = _interopRequireDefault(__webpack_require__(211));
+}
+
+var _index2;
+
+function _load_index2() {
+  return _index2 = __webpack_require__(57);
+}
+
+var _index3;
+
+function _load_index3() {
+  return _index3 = __webpack_require__(78);
+}
+
+var _autoclean;
+
+function _load_autoclean() {
+  return _autoclean = __webpack_require__(354);
+}
+
+var _constants;
+
+function _load_constants() {
+  return _constants = _interopRequireWildcard(__webpack_require__(8));
+}
+
+var _normalizePattern;
+
+function _load_normalizePattern() {
+  return _normalizePattern = __webpack_require__(37);
+}
+
+var _fs;
+
+function _load_fs() {
+  return _fs = _interopRequireWildcard(__webpack_require__(4));
+}
+
+var _map;
+
+function _load_map() {
+  return _map = _interopRequireDefault(__webpack_require__(29));
+}
+
+var _yarnVersion;
+
+function _load_yarnVersion() {
+  return _yarnVersion = __webpack_require__(120);
+}
+
+var _generatePnpMap;
+
+function _load_generatePnpMap() {
+  return _generatePnpMap = __webpack_require__(579);
+}
+
+var _workspaceLayout;
+
+function _load_workspaceLayout() {
+  return _workspaceLayout = _interopRequireDefault(__webpack_require__(90));
+}
+
+var _resolutionMap;
+
+function _load_resolutionMap() {
+  return _resolutionMap = _interopRequireDefault(__webpack_require__(214));
+}
+
+var _guessName;
+
+function _load_guessName() {
+  return _guessName = _interopRequireDefault(__webpack_require__(169));
+}
+
+var _audit;
+
+function _load_audit() {
+  return _audit = _interopRequireDefault(__webpack_require__(353));
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const deepEqual = __webpack_require__(631);
+
+const emoji = __webpack_require__(302);
+const invariant = __webpack_require__(9);
+const path = __webpack_require__(0);
+const semver = __webpack_require__(22);
+const uuid = __webpack_require__(119);
+const ssri = __webpack_require__(65);
+
+const ONE_DAY = 1000 * 60 * 60 * 24;
+
+/**
+ * Try and detect the installation method for Yarn and provide a command to update it with.
+ */
+
+function getUpdateCommand(installationMethod) {
+  if (installationMethod === 'tar') {
+    return `curl --compressed -o- -L ${(_constants || _load_constants()).YARN_INSTALLER_SH} | bash`;
+  }
+
+  if (installationMethod === 'homebrew') {
+    return 'brew upgrade yarn';
+  }
+
+  if (installationMethod === 'deb') {
+    return 'sudo apt-get update && sudo apt-get install yarn';
+  }
+
+  if (installationMethod === 'rpm') {
+    return 'sudo yum install yarn';
+  }
+
+  if (installationMethod === 'npm') {
+    return 'npm install --global yarn';
+  }
+
+  if (installationMethod === 'chocolatey') {
+    return 'choco upgrade yarn';
+  }
+
+  if (installationMethod === 'apk') {
+    return 'apk update && apk add -u yarn';
+  }
+
+  if (installationMethod === 'portage') {
+    return 'sudo emerge --sync && sudo emerge -au sys-apps/yarn';
+  }
+
+  return null;
+}
+
+function getUpdateInstaller(installationMethod) {
+  // Windows
+  if (installationMethod === 'msi') {
+    return (_constants || _load_constants()).YARN_INSTALLER_MSI;
+  }
+
+  return null;
+}
+
+function normalizeFlags(config, rawFlags) {
+  const flags = {
+    // install
+    har: !!rawFlags.har,
+    ignorePlatform: !!rawFlags.ignorePlatform,
+    ignoreEngines: !!rawFlags.ignoreEngines,
+    ignoreScripts: !!rawFlags.ignoreScripts,
+    ignoreOptional: !!rawFlags.ignoreOptional,
+    force: !!rawFlags.force,
+    flat: !!rawFlags.flat,
+    lockfile: rawFlags.lockfile !== false,
+    pureLockfile: !!rawFlags.pureLockfile,
+    updateChecksums: !!rawFlags.updateChecksums,
+    skipIntegrityCheck: !!rawFlags.skipIntegrityCheck,
+    frozenLockfile: !!rawFlags.frozenLockfile,
+    linkDuplicates: !!rawFlags.linkDuplicates,
+    checkFiles: !!rawFlags.checkFiles,
+    audit: !!rawFlags.audit,
+
+    // add
+    peer: !!rawFlags.peer,
+    dev: !!rawFlags.dev,
+    optional: !!rawFlags.optional,
+    exact: !!rawFlags.exact,
+    tilde: !!rawFlags.tilde,
+    ignoreWorkspaceRootCheck: !!rawFlags.ignoreWorkspaceRootCheck,
+
+    // outdated, update-interactive
+    includeWorkspaceDeps: !!rawFlags.includeWorkspaceDeps,
+
+    // add, remove, update
+    workspaceRootIsCwd: rawFlags.workspaceRootIsCwd !== false
+  };
+
+  if (config.getOption('ignore-scripts')) {
+    flags.ignoreScripts = true;
+  }
+
+  if (config.getOption('ignore-platform')) {
+    flags.ignorePlatform = true;
+  }
+
+  if (config.getOption('ignore-engines')) {
+    flags.ignoreEngines = true;
+  }
+
+  if (config.getOption('ignore-optional')) {
+    flags.ignoreOptional = true;
+  }
+
+  if (config.getOption('force')) {
+    flags.force = true;
+  }
+
+  return flags;
+}
+
+class Install {
+  constructor(flags, config, reporter, lockfile) {
+    this.rootManifestRegistries = [];
+    this.rootPatternsToOrigin = (0, (_map || _load_map()).default)();
+    this.lockfile = lockfile;
+    this.reporter = reporter;
+    this.config = config;
+    this.flags = normalizeFlags(config, flags);
+    this.resolutions = (0, (_map || _load_map()).default)(); // Legacy resolutions field used for flat install mode
+    this.resolutionMap = new (_resolutionMap || _load_resolutionMap()).default(config); // Selective resolutions for nested dependencies
+    this.resolver = new (_packageResolver || _load_packageResolver()).default(config, lockfile, this.resolutionMap);
+    this.integrityChecker = new (_integrityChecker || _load_integrityChecker()).default(config);
+    this.linker = new (_packageLinker || _load_packageLinker()).default(config, this.resolver);
+    this.scripts = new (_packageInstallScripts || _load_packageInstallScripts()).default(config, this.resolver, this.flags.force);
+  }
+
+  /**
+   * Create a list of dependency requests from the current directories manifests.
+   */
+
+  fetchRequestFromCwd(excludePatterns = [], ignoreUnusedPatterns = false) {
+    var _this = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const patterns = [];
+      const deps = [];
+      let resolutionDeps = [];
+      const manifest = {};
+
+      const ignorePatterns = [];
+      const usedPatterns = [];
+      let workspaceLayout;
+
+      // some commands should always run in the context of the entire workspace
+      const cwd = _this.flags.includeWorkspaceDeps || _this.flags.workspaceRootIsCwd ? _this.config.lockfileFolder : _this.config.cwd;
+
+      // non-workspaces are always root, otherwise check for workspace root
+      const cwdIsRoot = !_this.config.workspaceRootFolder || _this.config.lockfileFolder === cwd;
+
+      // exclude package names that are in install args
+      const excludeNames = [];
+      for (var _iterator = excludePatterns, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+        var _ref;
+
+        if (_isArray) {
+          if (_i >= _iterator.length) break;
+          _ref = _iterator[_i++];
+        } else {
+          _i = _iterator.next();
+          if (_i.done) break;
+          _ref = _i.value;
+        }
+
+        const pattern = _ref;
+
+        if ((0, (_index3 || _load_index3()).getExoticResolver)(pattern)) {
+          excludeNames.push((0, (_guessName || _load_guessName()).default)(pattern));
+        } else {
+          // extract the name
+          const parts = (0, (_normalizePattern || _load_normalizePattern()).normalizePattern)(pattern);
+          excludeNames.push(parts.name);
+        }
+      }
+
+      const stripExcluded = function stripExcluded(manifest) {
+        for (var _iterator2 = excludeNames, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+          var _ref2;
+
+          if (_isArray2) {
+            if (_i2 >= _iterator2.length) break;
+            _ref2 = _iterator2[_i2++];
+          } else {
+            _i2 = _iterator2.next();
+            if (_i2.done) break;
+            _ref2 = _i2.value;
+          }
+
+          const exclude = _ref2;
+
+          if (manifest.dependencies && manifest.dependencies[exclude]) {
+            delete manifest.dependencies[exclude];
+          }
+          if (manifest.devDependencies && manifest.devDependencies[exclude]) {
+            delete manifest.devDependencies[exclude];
+          }
+          if (manifest.optionalDependencies && manifest.optionalDependencies[exclude]) {
+            delete manifest.optionalDependencies[exclude];
+          }
+        }
+      };
+
+      for (var _iterator3 = Object.keys((_index2 || _load_index2()).registries), _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
+        var _ref3;
+
+        if (_isArray3) {
+          if (_i3 >= _iterator3.length) break;
+          _ref3 = _iterator3[_i3++];
+        } else {
+          _i3 = _iterator3.next();
+          if (_i3.done) break;
+          _ref3 = _i3.value;
+        }
+
+        const registry = _ref3;
+
+        const filename = (_index2 || _load_index2()).registries[registry].filename;
+
+        const loc = path.join(cwd, filename);
+        if (!(yield (_fs || _load_fs()).exists(loc))) {
+          continue;
+        }
+
+        _this.rootManifestRegistries.push(registry);
+
+        const projectManifestJson = yield _this.config.readJson(loc);
+        yield (0, (_index || _load_index()).default)(projectManifestJson, cwd, _this.config, cwdIsRoot);
+
+        Object.assign(_this.resolutions, projectManifestJson.resolutions);
+        Object.assign(manifest, projectManifestJson);
+
+        _this.resolutionMap.init(_this.resolutions);
+        for (var _iterator4 = Object.keys(_this.resolutionMap.resolutionsByPackage), _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
+          var _ref4;
+
+          if (_isArray4) {
+            if (_i4 >= _iterator4.length) break;
+            _ref4 = _iterator4[_i4++];
+          } else {
+            _i4 = _iterator4.next();
+            if (_i4.done) break;
+            _ref4 = _i4.value;
+          }
+
+          const packageName = _ref4;
+
+          const optional = (_objectPath || _load_objectPath()).default.has(manifest.optionalDependencies, packageName) && _this.flags.ignoreOptional;
+          for (var _iterator8 = _this.resolutionMap.resolutionsByPackage[packageName], _isArray8 = Array.isArray(_iterator8), _i8 = 0, _iterator8 = _isArray8 ? _iterator8 : _iterator8[Symbol.iterator]();;) {
+            var _ref9;
+
+            if (_isArray8) {
+              if (_i8 >= _iterator8.length) break;
+              _ref9 = _iterator8[_i8++];
+            } else {
+              _i8 = _iterator8.next();
+              if (_i8.done) break;
+              _ref9 = _i8.value;
+            }
+
+            const _ref8 = _ref9;
+            const pattern = _ref8.pattern;
+
+            resolutionDeps = [...resolutionDeps, { registry, pattern, optional, hint: 'resolution' }];
+          }
+        }
+
+        const pushDeps = function pushDeps(depType, manifest, { hint, optional }, isUsed) {
+          if (ignoreUnusedPatterns && !isUsed) {
+            return;
+          }
+          // We only take unused dependencies into consideration to get deterministic hoisting.
+          // Since flat mode doesn't care about hoisting and everything is top level and specified then we can safely
+          // leave these out.
+          if (_this.flags.flat && !isUsed) {
+            return;
+          }
+          const depMap = manifest[depType];
+          for (const name in depMap) {
+            if (excludeNames.indexOf(name) >= 0) {
+              continue;
+            }
+
+            let pattern = name;
+            if (!_this.lockfile.getLocked(pattern)) {
+              // when we use --save we save the dependency to the lockfile with just the name rather than the
+              // version combo
+              pattern += '@' + depMap[name];
+            }
+
+            // normalization made sure packages are mentioned only once
+            if (isUsed) {
+              usedPatterns.push(pattern);
+            } else {
+              ignorePatterns.push(pattern);
+            }
+
+            _this.rootPatternsToOrigin[pattern] = depType;
+            patterns.push(pattern);
+            deps.push({ pattern, registry, hint, optional, workspaceName: manifest.name, workspaceLoc: manifest._loc });
+          }
+        };
+
+        if (cwdIsRoot) {
+          pushDeps('dependencies', projectManifestJson, { hint: null, optional: false }, true);
+          pushDeps('devDependencies', projectManifestJson, { hint: 'dev', optional: false }, !_this.config.production);
+          pushDeps('optionalDependencies', projectManifestJson, { hint: 'optional', optional: true }, true);
+        }
+
+        if (_this.config.workspaceRootFolder) {
+          const workspaceLoc = cwdIsRoot ? loc : path.join(_this.config.lockfileFolder, filename);
+          const workspacesRoot = path.dirname(workspaceLoc);
+
+          let workspaceManifestJson = projectManifestJson;
+          if (!cwdIsRoot) {
+            // the manifest we read before was a child workspace, so get the root
+            workspaceManifestJson = yield _this.config.readJson(workspaceLoc);
+            yield (0, (_index || _load_index()).default)(workspaceManifestJson, workspacesRoot, _this.config, true);
+          }
+
+          const workspaces = yield _this.config.resolveWorkspaces(workspacesRoot, workspaceManifestJson);
+          workspaceLayout = new (_workspaceLayout || _load_workspaceLayout()).default(workspaces, _this.config);
+
+          // add virtual manifest that depends on all workspaces, this way package hoisters and resolvers will work fine
+          const workspaceDependencies = (0, (_extends2 || _load_extends()).default)({}, workspaceManifestJson.dependencies);
+          for (var _iterator5 = Object.keys(workspaces), _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
+            var _ref5;
+
+            if (_isArray5) {
+              if (_i5 >= _iterator5.length) break;
+              _ref5 = _iterator5[_i5++];
+            } else {
+              _i5 = _iterator5.next();
+              if (_i5.done) break;
+              _ref5 = _i5.value;
+            }
+
+            const workspaceName = _ref5;
+
+            const workspaceManifest = workspaces[workspaceName].manifest;
+            workspaceDependencies[workspaceName] = workspaceManifest.version;
+
+            // include dependencies from all workspaces
+            if (_this.flags.includeWorkspaceDeps) {
+              pushDeps('dependencies', workspaceManifest, { hint: null, optional: false }, true);
+              pushDeps('devDependencies', workspaceManifest, { hint: 'dev', optional: false }, !_this.config.production);
+              pushDeps('optionalDependencies', workspaceManifest, { hint: 'optional', optional: true }, true);
+            }
+          }
+          const virtualDependencyManifest = {
+            _uid: '',
+            name: `workspace-aggregator-${uuid.v4()}`,
+            version: '1.0.0',
+            _registry: 'npm',
+            _loc: workspacesRoot,
+            dependencies: workspaceDependencies,
+            devDependencies: (0, (_extends2 || _load_extends()).default)({}, workspaceManifestJson.devDependencies),
+            optionalDependencies: (0, (_extends2 || _load_extends()).default)({}, workspaceManifestJson.optionalDependencies),
+            private: workspaceManifestJson.private,
+            workspaces: workspaceManifestJson.workspaces
+          };
+          workspaceLayout.virtualManifestName = virtualDependencyManifest.name;
+          const virtualDep = {};
+          virtualDep[virtualDependencyManifest.name] = virtualDependencyManifest.version;
+          workspaces[virtualDependencyManifest.name] = { loc: workspacesRoot, manifest: virtualDependencyManifest };
+
+          // ensure dependencies that should be excluded are stripped from the correct manifest
+          stripExcluded(cwdIsRoot ? virtualDependencyManifest : workspaces[projectManifestJson.name].manifest);
+
+          pushDeps('workspaces', { workspaces: virtualDep }, { hint: 'workspaces', optional: false }, true);
+
+          const implicitWorkspaceDependencies = (0, (_extends2 || _load_extends()).default)({}, workspaceDependencies);
+
+          for (var _iterator6 = (_constants || _load_constants()).OWNED_DEPENDENCY_TYPES, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) {
+            var _ref6;
+
+            if (_isArray6) {
+              if (_i6 >= _iterator6.length) break;
+              _ref6 = _iterator6[_i6++];
+            } else {
+              _i6 = _iterator6.next();
+              if (_i6.done) break;
+              _ref6 = _i6.value;
+            }
+
+            const type = _ref6;
+
+            for (var _iterator7 = Object.keys(projectManifestJson[type] || {}), _isArray7 = Array.isArray(_iterator7), _i7 = 0, _iterator7 = _isArray7 ? _iterator7 : _iterator7[Symbol.iterator]();;) {
+              var _ref7;
+
+              if (_isArray7) {
+                if (_i7 >= _iterator7.length) break;
+                _ref7 = _iterator7[_i7++];
+              } else {
+                _i7 = _iterator7.next();
+                if (_i7.done) break;
+                _ref7 = _i7.value;
+              }
+
+              const dependencyName = _ref7;
+
+              delete implicitWorkspaceDependencies[dependencyName];
+            }
+          }
+
+          pushDeps('dependencies', { dependencies: implicitWorkspaceDependencies }, { hint: 'workspaces', optional: false }, true);
+        }
+
+        break;
+      }
+
+      // inherit root flat flag
+      if (manifest.flat) {
+        _this.flags.flat = true;
+      }
+
+      return {
+        requests: [...resolutionDeps, ...deps],
+        patterns,
+        manifest,
+        usedPatterns,
+        ignorePatterns,
+        workspaceLayout
+      };
+    })();
+  }
+
+  /**
+   * TODO description
+   */
+
+  prepareRequests(requests) {
+    return requests;
+  }
+
+  preparePatterns(patterns) {
+    return patterns;
+  }
+  preparePatternsForLinking(patterns, cwdManifest, cwdIsRoot) {
+    return patterns;
+  }
+
+  prepareManifests() {
+    var _this2 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const manifests = yield _this2.config.getRootManifests();
+      return manifests;
+    })();
+  }
+
+  bailout(patterns, workspaceLayout) {
+    var _this3 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      // We don't want to skip the audit - it could yield important errors
+      if (_this3.flags.audit) {
+        return false;
+      }
+      // PNP is so fast that the integrity check isn't pertinent
+      if (_this3.config.plugnplayEnabled) {
+        return false;
+      }
+      if (_this3.flags.skipIntegrityCheck || _this3.flags.force) {
+        return false;
+      }
+      const lockfileCache = _this3.lockfile.cache;
+      if (!lockfileCache) {
+        return false;
+      }
+      const lockfileClean = _this3.lockfile.parseResultType === 'success';
+      const match = yield _this3.integrityChecker.check(patterns, lockfileCache, _this3.flags, workspaceLayout);
+      if (_this3.flags.frozenLockfile && (!lockfileClean || match.missingPatterns.length > 0)) {
+        throw new (_errors || _load_errors()).MessageError(_this3.reporter.lang('frozenLockfileError'));
+      }
+
+      const haveLockfile = yield (_fs || _load_fs()).exists(path.join(_this3.config.lockfileFolder, (_constants || _load_constants()).LOCKFILE_FILENAME));
+
+      const lockfileIntegrityPresent = !_this3.lockfile.hasEntriesExistWithoutIntegrity();
+      const integrityBailout = lockfileIntegrityPresent || !_this3.config.autoAddIntegrity;
+
+      if (match.integrityMatches && haveLockfile && lockfileClean && integrityBailout) {
+        _this3.reporter.success(_this3.reporter.lang('upToDate'));
+        return true;
+      }
+
+      if (match.integrityFileMissing && haveLockfile) {
+        // Integrity file missing, force script installations
+        _this3.scripts.setForce(true);
+        return false;
+      }
+
+      if (match.hardRefreshRequired) {
+        // e.g. node version doesn't match, force script installations
+        _this3.scripts.setForce(true);
+        return false;
+      }
+
+      if (!patterns.length && !match.integrityFileMissing) {
+        _this3.reporter.success(_this3.reporter.lang('nothingToInstall'));
+        yield _this3.createEmptyManifestFolders();
+        yield _this3.saveLockfileAndIntegrity(patterns, workspaceLayout);
+        return true;
+      }
+
+      return false;
+    })();
+  }
+
+  /**
+   * Produce empty folders for all used root manifests.
+   */
+
+  createEmptyManifestFolders() {
+    var _this4 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      if (_this4.config.modulesFolder) {
+        // already created
+        return;
+      }
+
+      for (var _iterator9 = _this4.rootManifestRegistries, _isArray9 = Array.isArray(_iterator9), _i9 = 0, _iterator9 = _isArray9 ? _iterator9 : _iterator9[Symbol.iterator]();;) {
+        var _ref10;
+
+        if (_isArray9) {
+          if (_i9 >= _iterator9.length) break;
+          _ref10 = _iterator9[_i9++];
+        } else {
+          _i9 = _iterator9.next();
+          if (_i9.done) break;
+          _ref10 = _i9.value;
+        }
+
+        const registryName = _ref10;
+        const folder = _this4.config.registries[registryName].folder;
+
+        yield (_fs || _load_fs()).mkdirp(path.join(_this4.config.lockfileFolder, folder));
+      }
+    })();
+  }
+
+  /**
+   * TODO description
+   */
+
+  markIgnored(patterns) {
+    for (var _iterator10 = patterns, _isArray10 = Array.isArray(_iterator10), _i10 = 0, _iterator10 = _isArray10 ? _iterator10 : _iterator10[Symbol.iterator]();;) {
+      var _ref11;
+
+      if (_isArray10) {
+        if (_i10 >= _iterator10.length) break;
+        _ref11 = _iterator10[_i10++];
+      } else {
+        _i10 = _iterator10.next();
+        if (_i10.done) break;
+        _ref11 = _i10.value;
+      }
+
+      const pattern = _ref11;
+
+      const manifest = this.resolver.getStrictResolvedPattern(pattern);
+      const ref = manifest._reference;
+      invariant(ref, 'expected package reference');
+
+      // just mark the package as ignored. if the package is used by a required package, the hoister
+      // will take care of that.
+      ref.ignore = true;
+    }
+  }
+
+  /**
+   * helper method that gets only recent manifests
+   * used by global.ls command
+   */
+  getFlattenedDeps() {
+    var _this5 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      var _ref12 = yield _this5.fetchRequestFromCwd();
+
+      const depRequests = _ref12.requests,
+            rawPatterns = _ref12.patterns;
+
+
+      yield _this5.resolver.init(depRequests, {});
+
+      const manifests = yield (_packageFetcher || _load_packageFetcher()).fetch(_this5.resolver.getManifests(), _this5.config);
+      _this5.resolver.updateManifests(manifests);
+
+      return _this5.flatten(rawPatterns);
+    })();
+  }
+
+  /**
+   * TODO description
+   */
+
+  init() {
+    var _this6 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      _this6.checkUpdate();
+
+      // warn if we have a shrinkwrap
+      if (yield (_fs || _load_fs()).exists(path.join(_this6.config.lockfileFolder, (_constants || _load_constants()).NPM_SHRINKWRAP_FILENAME))) {
+        _this6.reporter.warn(_this6.reporter.lang('shrinkwrapWarning'));
+      }
+
+      // warn if we have an npm lockfile
+      if (yield (_fs || _load_fs()).exists(path.join(_this6.config.lockfileFolder, (_constants || _load_constants()).NPM_LOCK_FILENAME))) {
+        _this6.reporter.warn(_this6.reporter.lang('npmLockfileWarning'));
+      }
+
+      if (_this6.config.plugnplayEnabled) {
+        _this6.reporter.info(_this6.reporter.lang('plugnplaySuggestV2L1'));
+        _this6.reporter.info(_this6.reporter.lang('plugnplaySuggestV2L2'));
+      }
+
+      let flattenedTopLevelPatterns = [];
+      const steps = [];
+
+      var _ref13 = yield _this6.fetchRequestFromCwd();
+
+      const depRequests = _ref13.requests,
+            rawPatterns = _ref13.patterns,
+            ignorePatterns = _ref13.ignorePatterns,
+            workspaceLayout = _ref13.workspaceLayout,
+            manifest = _ref13.manifest;
+
+      let topLevelPatterns = [];
+
+      const artifacts = yield _this6.integrityChecker.getArtifacts();
+      if (artifacts) {
+        _this6.linker.setArtifacts(artifacts);
+        _this6.scripts.setArtifacts(artifacts);
+      }
+
+      if ((_packageCompatibility || _load_packageCompatibility()).shouldCheck(manifest, _this6.flags)) {
+        steps.push((() => {
+          var _ref14 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (curr, total) {
+            _this6.reporter.step(curr, total, _this6.reporter.lang('checkingManifest'), emoji.get('mag'));
+            yield _this6.checkCompatibility();
+          });
+
+          return function (_x, _x2) {
+            return _ref14.apply(this, arguments);
+          };
+        })());
+      }
+
+      const audit = new (_audit || _load_audit()).default(_this6.config, _this6.reporter, { groups: (_constants || _load_constants()).OWNED_DEPENDENCY_TYPES });
+      let auditFoundProblems = false;
+
+      steps.push(function (curr, total) {
+        return (0, (_hooks || _load_hooks()).callThroughHook)('resolveStep', (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+          _this6.reporter.step(curr, total, _this6.reporter.lang('resolvingPackages'), emoji.get('mag'));
+          yield _this6.resolver.init(_this6.prepareRequests(depRequests), {
+            isFlat: _this6.flags.flat,
+            isFrozen: _this6.flags.frozenLockfile,
+            workspaceLayout
+          });
+          topLevelPatterns = _this6.preparePatterns(rawPatterns);
+          flattenedTopLevelPatterns = yield _this6.flatten(topLevelPatterns);
+          return { bailout: !_this6.flags.audit && (yield _this6.bailout(topLevelPatterns, workspaceLayout)) };
+        }));
+      });
+
+      if (_this6.flags.audit) {
+        steps.push(function (curr, total) {
+          return (0, (_hooks || _load_hooks()).callThroughHook)('auditStep', (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+            _this6.reporter.step(curr, total, _this6.reporter.lang('auditRunning'), emoji.get('mag'));
+            if (_this6.flags.offline) {
+              _this6.reporter.warn(_this6.reporter.lang('auditOffline'));
+              return { bailout: false };
+            }
+            const preparedManifests = yield _this6.prepareManifests();
+            // $FlowFixMe - Flow considers `m` in the map operation to be "mixed", so does not recognize `m.object`
+            const mergedManifest = Object.assign({}, ...Object.values(preparedManifests).map(function (m) {
+              return m.object;
+            }));
+            const auditVulnerabilityCounts = yield audit.performAudit(mergedManifest, _this6.lockfile, _this6.resolver, _this6.linker, topLevelPatterns);
+            auditFoundProblems = auditVulnerabilityCounts.info || auditVulnerabilityCounts.low || auditVulnerabilityCounts.moderate || auditVulnerabilityCounts.high || auditVulnerabilityCounts.critical;
+            return { bailout: yield _this6.bailout(topLevelPatterns, workspaceLayout) };
+          }));
+        });
+      }
+
+      steps.push(function (curr, total) {
+        return (0, (_hooks || _load_hooks()).callThroughHook)('fetchStep', (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+          _this6.markIgnored(ignorePatterns);
+          _this6.reporter.step(curr, total, _this6.reporter.lang('fetchingPackages'), emoji.get('truck'));
+          const manifests = yield (_packageFetcher || _load_packageFetcher()).fetch(_this6.resolver.getManifests(), _this6.config);
+          _this6.resolver.updateManifests(manifests);
+          yield (_packageCompatibility || _load_packageCompatibility()).check(_this6.resolver.getManifests(), _this6.config, _this6.flags.ignoreEngines);
+        }));
+      });
+
+      steps.push(function (curr, total) {
+        return (0, (_hooks || _load_hooks()).callThroughHook)('linkStep', (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+          // remove integrity hash to make this operation atomic
+          yield _this6.integrityChecker.removeIntegrityFile();
+          _this6.reporter.step(curr, total, _this6.reporter.lang('linkingDependencies'), emoji.get('link'));
+          flattenedTopLevelPatterns = _this6.preparePatternsForLinking(flattenedTopLevelPatterns, manifest, _this6.config.lockfileFolder === _this6.config.cwd);
+          yield _this6.linker.init(flattenedTopLevelPatterns, workspaceLayout, {
+            linkDuplicates: _this6.flags.linkDuplicates,
+            ignoreOptional: _this6.flags.ignoreOptional
+          });
+        }));
+      });
+
+      if (_this6.config.plugnplayEnabled) {
+        steps.push(function (curr, total) {
+          return (0, (_hooks || _load_hooks()).callThroughHook)('pnpStep', (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+            const pnpPath = `${_this6.config.lockfileFolder}/${(_constants || _load_constants()).PNP_FILENAME}`;
+
+            const code = yield (0, (_generatePnpMap || _load_generatePnpMap()).generatePnpMap)(_this6.config, flattenedTopLevelPatterns, {
+              resolver: _this6.resolver,
+              reporter: _this6.reporter,
+              targetPath: pnpPath,
+              workspaceLayout
+            });
+
+            try {
+              const file = yield (_fs || _load_fs()).readFile(pnpPath);
+              if (file === code) {
+                return;
+              }
+            } catch (error) {}
+
+            yield (_fs || _load_fs()).writeFile(pnpPath, code);
+            yield (_fs || _load_fs()).chmod(pnpPath, 0o755);
+          }));
+        });
+      }
+
+      steps.push(function (curr, total) {
+        return (0, (_hooks || _load_hooks()).callThroughHook)('buildStep', (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+          _this6.reporter.step(curr, total, _this6.flags.force ? _this6.reporter.lang('rebuildingPackages') : _this6.reporter.lang('buildingFreshPackages'), emoji.get('hammer'));
+
+          if (_this6.config.ignoreScripts) {
+            _this6.reporter.warn(_this6.reporter.lang('ignoredScripts'));
+          } else {
+            yield _this6.scripts.init(flattenedTopLevelPatterns);
+          }
+        }));
+      });
+
+      if (_this6.flags.har) {
+        steps.push((() => {
+          var _ref21 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (curr, total) {
+            const formattedDate = new Date().toISOString().replace(/:/g, '-');
+            const filename = `yarn-install_${formattedDate}.har`;
+            _this6.reporter.step(curr, total, _this6.reporter.lang('savingHar', filename), emoji.get('black_circle_for_record'));
+            yield _this6.config.requestManager.saveHar(filename);
+          });
+
+          return function (_x3, _x4) {
+            return _ref21.apply(this, arguments);
+          };
+        })());
+      }
+
+      if (yield _this6.shouldClean()) {
+        steps.push((() => {
+          var _ref22 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (curr, total) {
+            _this6.reporter.step(curr, total, _this6.reporter.lang('cleaningModules'), emoji.get('recycle'));
+            yield (0, (_autoclean || _load_autoclean()).clean)(_this6.config, _this6.reporter);
+          });
+
+          return function (_x5, _x6) {
+            return _ref22.apply(this, arguments);
+          };
+        })());
+      }
+
+      let currentStep = 0;
+      for (var _iterator11 = steps, _isArray11 = Array.isArray(_iterator11), _i11 = 0, _iterator11 = _isArray11 ? _iterator11 : _iterator11[Symbol.iterator]();;) {
+        var _ref23;
+
+        if (_isArray11) {
+          if (_i11 >= _iterator11.length) break;
+          _ref23 = _iterator11[_i11++];
+        } else {
+          _i11 = _iterator11.next();
+          if (_i11.done) break;
+          _ref23 = _i11.value;
+        }
+
+        const step = _ref23;
+
+        const stepResult = yield step(++currentStep, steps.length);
+        if (stepResult && stepResult.bailout) {
+          if (_this6.flags.audit) {
+            audit.summary();
+          }
+          if (auditFoundProblems) {
+            _this6.reporter.warn(_this6.reporter.lang('auditRunAuditForDetails'));
+          }
+          _this6.maybeOutputUpdate();
+          return flattenedTopLevelPatterns;
+        }
+      }
+
+      // fin!
+      if (_this6.flags.audit) {
+        audit.summary();
+      }
+      if (auditFoundProblems) {
+        _this6.reporter.warn(_this6.reporter.lang('auditRunAuditForDetails'));
+      }
+      yield _this6.saveLockfileAndIntegrity(topLevelPatterns, workspaceLayout);
+      yield _this6.persistChanges();
+      _this6.maybeOutputUpdate();
+      _this6.config.requestManager.clearCache();
+      return flattenedTopLevelPatterns;
+    })();
+  }
+
+  checkCompatibility() {
+    var _this7 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      var _ref24 = yield _this7.fetchRequestFromCwd();
+
+      const manifest = _ref24.manifest;
+
+      yield (_packageCompatibility || _load_packageCompatibility()).checkOne(manifest, _this7.config, _this7.flags.ignoreEngines);
+    })();
+  }
+
+  persistChanges() {
+    var _this8 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      // get all the different registry manifests in this folder
+      const manifests = yield _this8.config.getRootManifests();
+
+      if (yield _this8.applyChanges(manifests)) {
+        yield _this8.config.saveRootManifests(manifests);
+      }
+    })();
+  }
+
+  applyChanges(manifests) {
+    let hasChanged = false;
+
+    if (this.config.plugnplayPersist) {
+      const object = manifests.npm.object;
+
+
+      if (typeof object.installConfig !== 'object') {
+        object.installConfig = {};
+      }
+
+      if (this.config.plugnplayEnabled && object.installConfig.pnp !== true) {
+        object.installConfig.pnp = true;
+        hasChanged = true;
+      } else if (!this.config.plugnplayEnabled && typeof object.installConfig.pnp !== 'undefined') {
+        delete object.installConfig.pnp;
+        hasChanged = true;
+      }
+
+      if (Object.keys(object.installConfig).length === 0) {
+        delete object.installConfig;
+      }
+    }
+
+    return Promise.resolve(hasChanged);
+  }
+
+  /**
+   * Check if we should run the cleaning step.
+   */
+
+  shouldClean() {
+    return (_fs || _load_fs()).exists(path.join(this.config.lockfileFolder, (_constants || _load_constants()).CLEAN_FILENAME));
+  }
+
+  /**
+   * TODO
+   */
+
+  flatten(patterns) {
+    var _this9 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      if (!_this9.flags.flat) {
+        return patterns;
+      }
+
+      const flattenedPatterns = [];
+
+      for (var _iterator12 = _this9.resolver.getAllDependencyNamesByLevelOrder(patterns), _isArray12 = Array.isArray(_iterator12), _i12 = 0, _iterator12 = _isArray12 ? _iterator12 : _iterator12[Symbol.iterator]();;) {
+        var _ref25;
+
+        if (_isArray12) {
+          if (_i12 >= _iterator12.length) break;
+          _ref25 = _iterator12[_i12++];
+        } else {
+          _i12 = _iterator12.next();
+          if (_i12.done) break;
+          _ref25 = _i12.value;
+        }
+
+        const name = _ref25;
+
+        const infos = _this9.resolver.getAllInfoForPackageName(name).filter(function (manifest) {
+          const ref = manifest._reference;
+          invariant(ref, 'expected package reference');
+          return !ref.ignore;
+        });
+
+        if (infos.length === 0) {
+          continue;
+        }
+
+        if (infos.length === 1) {
+          // single version of this package
+          // take out a single pattern as multiple patterns may have resolved to this package
+          flattenedPatterns.push(_this9.resolver.patternsByPackage[name][0]);
+          continue;
+        }
+
+        const options = infos.map(function (info) {
+          const ref = info._reference;
+          invariant(ref, 'expected reference');
+          return {
+            // TODO `and is required by {PARENT}`,
+            name: _this9.reporter.lang('manualVersionResolutionOption', ref.patterns.join(', '), info.version),
+
+            value: info.version
+          };
+        });
+        const versions = infos.map(function (info) {
+          return info.version;
+        });
+        let version;
+
+        const resolutionVersion = _this9.resolutions[name];
+        if (resolutionVersion && versions.indexOf(resolutionVersion) >= 0) {
+          // use json `resolution` version
+          version = resolutionVersion;
+        } else {
+          version = yield _this9.reporter.select(_this9.reporter.lang('manualVersionResolution', name), _this9.reporter.lang('answer'), options);
+          _this9.resolutions[name] = version;
+        }
+
+        flattenedPatterns.push(_this9.resolver.collapseAllVersionsOfPackage(name, version));
+      }
+
+      // save resolutions to their appropriate root manifest
+      if (Object.keys(_this9.resolutions).length) {
+        const manifests = yield _this9.config.getRootManifests();
+
+        for (const name in _this9.resolutions) {
+          const version = _this9.resolutions[name];
+
+          const patterns = _this9.resolver.patternsByPackage[name];
+          if (!patterns) {
+            continue;
+          }
+
+          let manifest;
+          for (var _iterator13 = patterns, _isArray13 = Array.isArray(_iterator13), _i13 = 0, _iterator13 = _isArray13 ? _iterator13 : _iterator13[Symbol.iterator]();;) {
+            var _ref26;
+
+            if (_isArray13) {
+              if (_i13 >= _iterator13.length) break;
+              _ref26 = _iterator13[_i13++];
+            } else {
+              _i13 = _iterator13.next();
+              if (_i13.done) break;
+              _ref26 = _i13.value;
+            }
+
+            const pattern = _ref26;
+
+            manifest = _this9.resolver.getResolvedPattern(pattern);
+            if (manifest) {
+              break;
+            }
+          }
+          invariant(manifest, 'expected manifest');
+
+          const ref = manifest._reference;
+          invariant(ref, 'expected reference');
+
+          const object = manifests[ref.registry].object;
+          object.resolutions = object.resolutions || {};
+          object.resolutions[name] = version;
+        }
+
+        yield _this9.config.saveRootManifests(manifests);
+      }
+
+      return flattenedPatterns;
+    })();
+  }
+
+  /**
+   * Remove offline tarballs that are no longer required
+   */
+
+  pruneOfflineMirror(lockfile) {
+    var _this10 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const mirror = _this10.config.getOfflineMirrorPath();
+      if (!mirror) {
+        return;
+      }
+
+      const requiredTarballs = new Set();
+      for (const dependency in lockfile) {
+        const resolved = lockfile[dependency].resolved;
+        if (resolved) {
+          const basename = path.basename(resolved.split('#')[0]);
+          if (dependency[0] === '@' && basename[0] !== '@') {
+            requiredTarballs.add(`${dependency.split('/')[0]}-${basename}`);
+          }
+          requiredTarballs.add(basename);
+        }
+      }
+
+      const mirrorFiles = yield (_fs || _load_fs()).walk(mirror);
+      for (var _iterator14 = mirrorFiles, _isArray14 = Array.isArray(_iterator14), _i14 = 0, _iterator14 = _isArray14 ? _iterator14 : _iterator14[Symbol.iterator]();;) {
+        var _ref27;
+
+        if (_isArray14) {
+          if (_i14 >= _iterator14.length) break;
+          _ref27 = _iterator14[_i14++];
+        } else {
+          _i14 = _iterator14.next();
+          if (_i14.done) break;
+          _ref27 = _i14.value;
+        }
+
+        const file = _ref27;
+
+        const isTarball = path.extname(file.basename) === '.tgz';
+        // if using experimental-pack-script-packages-in-mirror flag, don't unlink prebuilt packages
+        const hasPrebuiltPackage = file.relative.startsWith('prebuilt/');
+        if (isTarball && !hasPrebuiltPackage && !requiredTarballs.has(file.basename)) {
+          yield (_fs || _load_fs()).unlink(file.absolute);
+        }
+      }
+    })();
+  }
+
+  /**
+   * Save updated integrity and lockfiles.
+   */
+
+  saveLockfileAndIntegrity(patterns, workspaceLayout) {
+    var _this11 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const resolvedPatterns = {};
+      Object.keys(_this11.resolver.patterns).forEach(function (pattern) {
+        if (!workspaceLayout || !workspaceLayout.getManifestByPattern(pattern)) {
+          resolvedPatterns[pattern] = _this11.resolver.patterns[pattern];
+        }
+      });
+
+      // TODO this code is duplicated in a few places, need a common way to filter out workspace patterns from lockfile
+      patterns = patterns.filter(function (p) {
+        return !workspaceLayout || !workspaceLayout.getManifestByPattern(p);
+      });
+
+      const lockfileBasedOnResolver = _this11.lockfile.getLockfile(resolvedPatterns);
+
+      if (_this11.config.pruneOfflineMirror) {
+        yield _this11.pruneOfflineMirror(lockfileBasedOnResolver);
+      }
+
+      // write integrity hash
+      if (!_this11.config.plugnplayEnabled) {
+        yield _this11.integrityChecker.save(patterns, lockfileBasedOnResolver, _this11.flags, workspaceLayout, _this11.scripts.getArtifacts());
+      }
+
+      // --no-lockfile or --pure-lockfile or --frozen-lockfile
+      if (_this11.flags.lockfile === false || _this11.flags.pureLockfile || _this11.flags.frozenLockfile) {
+        return;
+      }
+
+      const lockFileHasAllPatterns = patterns.every(function (p) {
+        return _this11.lockfile.getLocked(p);
+      });
+      const lockfilePatternsMatch = Object.keys(_this11.lockfile.cache || {}).every(function (p) {
+        return lockfileBasedOnResolver[p];
+      });
+      const resolverPatternsAreSameAsInLockfile = Object.keys(lockfileBasedOnResolver).every(function (pattern) {
+        const manifest = _this11.lockfile.getLocked(pattern);
+        return manifest && manifest.resolved === lockfileBasedOnResolver[pattern].resolved && deepEqual(manifest.prebuiltVariants, lockfileBasedOnResolver[pattern].prebuiltVariants);
+      });
+      const integrityPatternsAreSameAsInLockfile = Object.keys(lockfileBasedOnResolver).every(function (pattern) {
+        const existingIntegrityInfo = lockfileBasedOnResolver[pattern].integrity;
+        if (!existingIntegrityInfo) {
+          // if this entry does not have an integrity, no need to re-write the lockfile because of it
+          return true;
+        }
+        const manifest = _this11.lockfile.getLocked(pattern);
+        if (manifest && manifest.integrity) {
+          const manifestIntegrity = ssri.stringify(manifest.integrity);
+          return manifestIntegrity === existingIntegrityInfo;
+        }
+        return false;
+      });
+
+      // remove command is followed by install with force, lockfile will be rewritten in any case then
+      if (!_this11.flags.force && _this11.lockfile.parseResultType === 'success' && lockFileHasAllPatterns && lockfilePatternsMatch && resolverPatternsAreSameAsInLockfile && integrityPatternsAreSameAsInLockfile && patterns.length) {
+        return;
+      }
+
+      // build lockfile location
+      const loc = path.join(_this11.config.lockfileFolder, (_constants || _load_constants()).LOCKFILE_FILENAME);
+
+      // write lockfile
+      const lockSource = (0, (_lockfile2 || _load_lockfile2()).stringify)(lockfileBasedOnResolver, false, _this11.config.enableLockfileVersions);
+      yield (_fs || _load_fs()).writeFilePreservingEol(loc, lockSource);
+
+      _this11._logSuccessSaveLockfile();
+    })();
+  }
+
+  _logSuccessSaveLockfile() {
+    this.reporter.success(this.reporter.lang('savedLockfile'));
+  }
+
+  /**
+   * Load the dependency graph of the current install. Only does package resolving and wont write to the cwd.
+   */
+  hydrate(ignoreUnusedPatterns) {
+    var _this12 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const request = yield _this12.fetchRequestFromCwd([], ignoreUnusedPatterns);
+      const depRequests = request.requests,
+            rawPatterns = request.patterns,
+            ignorePatterns = request.ignorePatterns,
+            workspaceLayout = request.workspaceLayout;
+
+
+      yield _this12.resolver.init(depRequests, {
+        isFlat: _this12.flags.flat,
+        isFrozen: _this12.flags.frozenLockfile,
+        workspaceLayout
+      });
+      yield _this12.flatten(rawPatterns);
+      _this12.markIgnored(ignorePatterns);
+
+      // fetch packages, should hit cache most of the time
+      const manifests = yield (_packageFetcher || _load_packageFetcher()).fetch(_this12.resolver.getManifests(), _this12.config);
+      _this12.resolver.updateManifests(manifests);
+      yield (_packageCompatibility || _load_packageCompatibility()).check(_this12.resolver.getManifests(), _this12.config, _this12.flags.ignoreEngines);
+
+      // expand minimal manifests
+      for (var _iterator15 = _this12.resolver.getManifests(), _isArray15 = Array.isArray(_iterator15), _i15 = 0, _iterator15 = _isArray15 ? _iterator15 : _iterator15[Symbol.iterator]();;) {
+        var _ref28;
+
+        if (_isArray15) {
+          if (_i15 >= _iterator15.length) break;
+          _ref28 = _iterator15[_i15++];
+        } else {
+          _i15 = _iterator15.next();
+          if (_i15.done) break;
+          _ref28 = _i15.value;
+        }
+
+        const manifest = _ref28;
+
+        const ref = manifest._reference;
+        invariant(ref, 'expected reference');
+        const type = ref.remote.type;
+        // link specifier won't ever hit cache
+
+        let loc = '';
+        if (type === 'link') {
+          continue;
+        } else if (type === 'workspace') {
+          if (!ref.remote.reference) {
+            continue;
+          }
+          loc = ref.remote.reference;
+        } else {
+          loc = _this12.config.generateModuleCachePath(ref);
+        }
+        const newPkg = yield _this12.config.readManifest(loc);
+        yield _this12.resolver.updateManifest(ref, newPkg);
+      }
+
+      return request;
+    })();
+  }
+
+  /**
+   * Check for updates every day and output a nag message if there's a newer version.
+   */
+
+  checkUpdate() {
+    if (this.config.nonInteractive) {
+      // don't show upgrade dialog on CI or non-TTY terminals
+      return;
+    }
+
+    // don't check if disabled
+    if (this.config.getOption('disable-self-update-check')) {
+      return;
+    }
+
+    // only check for updates once a day
+    const lastUpdateCheck = Number(this.config.getOption('lastUpdateCheck')) || 0;
+    if (lastUpdateCheck && Date.now() - lastUpdateCheck < ONE_DAY) {
+      return;
+    }
+
+    // don't bug for updates on tagged releases
+    if ((_yarnVersion || _load_yarnVersion()).version.indexOf('-') >= 0) {
+      return;
+    }
+
+    this._checkUpdate().catch(() => {
+      // swallow errors
+    });
+  }
+
+  _checkUpdate() {
+    var _this13 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      let latestVersion = yield _this13.config.requestManager.request({
+        url: (_constants || _load_constants()).SELF_UPDATE_VERSION_URL
+      });
+      invariant(typeof latestVersion === 'string', 'expected string');
+      latestVersion = latestVersion.trim();
+      if (!semver.valid(latestVersion)) {
+        return;
+      }
+
+      // ensure we only check for updates periodically
+      _this13.config.registries.yarn.saveHomeConfig({
+        lastUpdateCheck: Date.now()
+      });
+
+      if (semver.gt(latestVersion, (_yarnVersion || _load_yarnVersion()).version)) {
+        const installationMethod = yield (0, (_yarnVersion || _load_yarnVersion()).getInstallationMethod)();
+        _this13.maybeOutputUpdate = function () {
+          _this13.reporter.warn(_this13.reporter.lang('yarnOutdated', latestVersion, (_yarnVersion || _load_yarnVersion()).version));
+
+          const command = getUpdateCommand(installationMethod);
+          if (command) {
+            _this13.reporter.info(_this13.reporter.lang('yarnOutdatedCommand'));
+            _this13.reporter.command(command);
+          } else {
+            const installer = getUpdateInstaller(installationMethod);
+            if (installer) {
+              _this13.reporter.info(_this13.reporter.lang('yarnOutdatedInstaller', installer));
+            }
+          }
+        };
+      }
+    })();
+  }
+
+  /**
+   * Method to override with a possible upgrade message.
+   */
+
+  maybeOutputUpdate() {}
+}
+
+exports.Install = Install;
+function hasWrapper(commander, args) {
+  return true;
+}
+
+function setFlags(commander) {
+  commander.description('Yarn install is used to install all dependencies for a project.');
+  commander.usage('install [flags]');
+  commander.option('-A, --audit', 'Run vulnerability audit on installed packages');
+  commander.option('-g, --global', 'DEPRECATED');
+  commander.option('-S, --save', 'DEPRECATED - save package to your `dependencies`');
+  commander.option('-D, --save-dev', 'DEPRECATED - save package to your `devDependencies`');
+  commander.option('-P, --save-peer', 'DEPRECATED - save package to your `peerDependencies`');
+  commander.option('-O, --save-optional', 'DEPRECATED - save package to your `optionalDependencies`');
+  commander.option('-E, --save-exact', 'DEPRECATED');
+  commander.option('-T, --save-tilde', 'DEPRECATED');
+}
+
+/***/ }),
+/* 35 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var isObject = __webpack_require__(52);
+module.exports = function (it) {
+  if (!isObject(it)) throw TypeError(it + ' is not an object!');
+  return it;
+};
+
+
+/***/ }),
+/* 36 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return SubjectSubscriber; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Subject; });
+/* unused harmony export AnonymousSubject */
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Observable__ = __webpack_require__(12);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Subscriber__ = __webpack_require__(7);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__Subscription__ = __webpack_require__(25);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_ObjectUnsubscribedError__ = __webpack_require__(189);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__SubjectSubscription__ = __webpack_require__(422);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__internal_symbol_rxSubscriber__ = __webpack_require__(321);
+/** PURE_IMPORTS_START tslib,_Observable,_Subscriber,_Subscription,_util_ObjectUnsubscribedError,_SubjectSubscription,_internal_symbol_rxSubscriber PURE_IMPORTS_END */
+
+
+
+
+
+
+
+var SubjectSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](SubjectSubscriber, _super);
+    function SubjectSubscriber(destination) {
+        var _this = _super.call(this, destination) || this;
+        _this.destination = destination;
+        return _this;
+    }
+    return SubjectSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_2__Subscriber__["a" /* Subscriber */]));
+
+var Subject = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](Subject, _super);
+    function Subject() {
+        var _this = _super.call(this) || this;
+        _this.observers = [];
+        _this.closed = false;
+        _this.isStopped = false;
+        _this.hasError = false;
+        _this.thrownError = null;
+        return _this;
+    }
+    Subject.prototype[__WEBPACK_IMPORTED_MODULE_6__internal_symbol_rxSubscriber__["a" /* rxSubscriber */]] = function () {
+        return new SubjectSubscriber(this);
+    };
+    Subject.prototype.lift = function (operator) {
+        var subject = new AnonymousSubject(this, this);
+        subject.operator = operator;
+        return subject;
+    };
+    Subject.prototype.next = function (value) {
+        if (this.closed) {
+            throw new __WEBPACK_IMPORTED_MODULE_4__util_ObjectUnsubscribedError__["a" /* ObjectUnsubscribedError */]();
+        }
+        if (!this.isStopped) {
+            var observers = this.observers;
+            var len = observers.length;
+            var copy = observers.slice();
+            for (var i = 0; i < len; i++) {
+                copy[i].next(value);
+            }
+        }
+    };
+    Subject.prototype.error = function (err) {
+        if (this.closed) {
+            throw new __WEBPACK_IMPORTED_MODULE_4__util_ObjectUnsubscribedError__["a" /* ObjectUnsubscribedError */]();
+        }
+        this.hasError = true;
+        this.thrownError = err;
+        this.isStopped = true;
+        var observers = this.observers;
+        var len = observers.length;
+        var copy = observers.slice();
+        for (var i = 0; i < len; i++) {
+            copy[i].error(err);
+        }
+        this.observers.length = 0;
+    };
+    Subject.prototype.complete = function () {
+        if (this.closed) {
+            throw new __WEBPACK_IMPORTED_MODULE_4__util_ObjectUnsubscribedError__["a" /* ObjectUnsubscribedError */]();
+        }
+        this.isStopped = true;
+        var observers = this.observers;
+        var len = observers.length;
+        var copy = observers.slice();
+        for (var i = 0; i < len; i++) {
+            copy[i].complete();
+        }
+        this.observers.length = 0;
+    };
+    Subject.prototype.unsubscribe = function () {
+        this.isStopped = true;
+        this.closed = true;
+        this.observers = null;
+    };
+    Subject.prototype._trySubscribe = function (subscriber) {
+        if (this.closed) {
+            throw new __WEBPACK_IMPORTED_MODULE_4__util_ObjectUnsubscribedError__["a" /* ObjectUnsubscribedError */]();
+        }
+        else {
+            return _super.prototype._trySubscribe.call(this, subscriber);
+        }
+    };
+    Subject.prototype._subscribe = function (subscriber) {
+        if (this.closed) {
+            throw new __WEBPACK_IMPORTED_MODULE_4__util_ObjectUnsubscribedError__["a" /* ObjectUnsubscribedError */]();
+        }
+        else if (this.hasError) {
+            subscriber.error(this.thrownError);
+            return __WEBPACK_IMPORTED_MODULE_3__Subscription__["a" /* Subscription */].EMPTY;
+        }
+        else if (this.isStopped) {
+            subscriber.complete();
+            return __WEBPACK_IMPORTED_MODULE_3__Subscription__["a" /* Subscription */].EMPTY;
+        }
+        else {
+            this.observers.push(subscriber);
+            return new __WEBPACK_IMPORTED_MODULE_5__SubjectSubscription__["a" /* SubjectSubscription */](this, subscriber);
+        }
+    };
+    Subject.prototype.asObservable = function () {
+        var observable = new __WEBPACK_IMPORTED_MODULE_1__Observable__["a" /* Observable */]();
+        observable.source = this;
+        return observable;
+    };
+    Subject.create = function (destination, source) {
+        return new AnonymousSubject(destination, source);
+    };
+    return Subject;
+}(__WEBPACK_IMPORTED_MODULE_1__Observable__["a" /* Observable */]));
+
+var AnonymousSubject = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](AnonymousSubject, _super);
+    function AnonymousSubject(destination, source) {
+        var _this = _super.call(this) || this;
+        _this.destination = destination;
+        _this.source = source;
+        return _this;
+    }
+    AnonymousSubject.prototype.next = function (value) {
+        var destination = this.destination;
+        if (destination && destination.next) {
+            destination.next(value);
+        }
+    };
+    AnonymousSubject.prototype.error = function (err) {
+        var destination = this.destination;
+        if (destination && destination.error) {
+            this.destination.error(err);
+        }
+    };
+    AnonymousSubject.prototype.complete = function () {
+        var destination = this.destination;
+        if (destination && destination.complete) {
+            this.destination.complete();
+        }
+    };
+    AnonymousSubject.prototype._subscribe = function (subscriber) {
+        var source = this.source;
+        if (source) {
+            return this.source.subscribe(subscriber);
+        }
+        else {
+            return __WEBPACK_IMPORTED_MODULE_3__Subscription__["a" /* Subscription */].EMPTY;
+        }
+    };
+    return AnonymousSubject;
+}(Subject));
+
+//# sourceMappingURL=Subject.js.map
+
+
+/***/ }),
+/* 37 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.normalizePattern = normalizePattern;
+
+/**
+ * Explode and normalize a pattern into its name and range.
+ */
+
+function normalizePattern(pattern) {
+  let hasVersion = false;
+  let range = 'latest';
+  let name = pattern;
+
+  // if we're a scope then remove the @ and add it back later
+  let isScoped = false;
+  if (name[0] === '@') {
+    isScoped = true;
+    name = name.slice(1);
+  }
+
+  // take first part as the name
+  const parts = name.split('@');
+  if (parts.length > 1) {
+    name = parts.shift();
+    range = parts.join('@');
+
+    if (range) {
+      hasVersion = true;
+    } else {
+      range = '*';
+    }
+  }
+
+  // add back @ scope suffix
+  if (isScoped) {
+    name = `@${name}`;
+  }
+
+  return { name, range, hasVersion };
+}
+
+/***/ }),
+/* 38 */
+/***/ (function(module, exports, __webpack_require__) {
+
+/* WEBPACK VAR INJECTION */(function(module) {var __WEBPACK_AMD_DEFINE_RESULT__;/**
+ * @license
+ * Lodash <https://lodash.com/>
+ * Copyright JS Foundation and other contributors <https://js.foundation/>
+ * Released under MIT license <https://lodash.com/license>
+ * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
+ * Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+ */
+;(function() {
+
+  /** Used as a safe reference for `undefined` in pre-ES5 environments. */
+  var undefined;
+
+  /** Used as the semantic version number. */
+  var VERSION = '4.17.10';
+
+  /** Used as the size to enable large array optimizations. */
+  var LARGE_ARRAY_SIZE = 200;
+
+  /** Error message constants. */
+  var CORE_ERROR_TEXT = 'Unsupported core-js use. Try https://npms.io/search?q=ponyfill.',
+      FUNC_ERROR_TEXT = 'Expected a function';
+
+  /** Used to stand-in for `undefined` hash values. */
+  var HASH_UNDEFINED = '__lodash_hash_undefined__';
+
+  /** Used as the maximum memoize cache size. */
+  var MAX_MEMOIZE_SIZE = 500;
+
+  /** Used as the internal argument placeholder. */
+  var PLACEHOLDER = '__lodash_placeholder__';
+
+  /** Used to compose bitmasks for cloning. */
+  var CLONE_DEEP_FLAG = 1,
+      CLONE_FLAT_FLAG = 2,
+      CLONE_SYMBOLS_FLAG = 4;
+
+  /** Used to compose bitmasks for value comparisons. */
+  var COMPARE_PARTIAL_FLAG = 1,
+      COMPARE_UNORDERED_FLAG = 2;
+
+  /** Used to compose bitmasks for function metadata. */
+  var WRAP_BIND_FLAG = 1,
+      WRAP_BIND_KEY_FLAG = 2,
+      WRAP_CURRY_BOUND_FLAG = 4,
+      WRAP_CURRY_FLAG = 8,
+      WRAP_CURRY_RIGHT_FLAG = 16,
+      WRAP_PARTIAL_FLAG = 32,
+      WRAP_PARTIAL_RIGHT_FLAG = 64,
+      WRAP_ARY_FLAG = 128,
+      WRAP_REARG_FLAG = 256,
+      WRAP_FLIP_FLAG = 512;
+
+  /** Used as default options for `_.truncate`. */
+  var DEFAULT_TRUNC_LENGTH = 30,
+      DEFAULT_TRUNC_OMISSION = '...';
+
+  /** Used to detect hot functions by number of calls within a span of milliseconds. */
+  var HOT_COUNT = 800,
+      HOT_SPAN = 16;
+
+  /** Used to indicate the type of lazy iteratees. */
+  var LAZY_FILTER_FLAG = 1,
+      LAZY_MAP_FLAG = 2,
+      LAZY_WHILE_FLAG = 3;
+
+  /** Used as references for various `Number` constants. */
+  var INFINITY = 1 / 0,
+      MAX_SAFE_INTEGER = 9007199254740991,
+      MAX_INTEGER = 1.7976931348623157e+308,
+      NAN = 0 / 0;
+
+  /** Used as references for the maximum length and index of an array. */
+  var MAX_ARRAY_LENGTH = 4294967295,
+      MAX_ARRAY_INDEX = MAX_ARRAY_LENGTH - 1,
+      HALF_MAX_ARRAY_LENGTH = MAX_ARRAY_LENGTH >>> 1;
+
+  /** Used to associate wrap methods with their bit flags. */
+  var wrapFlags = [
+    ['ary', WRAP_ARY_FLAG],
+    ['bind', WRAP_BIND_FLAG],
+    ['bindKey', WRAP_BIND_KEY_FLAG],
+    ['curry', WRAP_CURRY_FLAG],
+    ['curryRight', WRAP_CURRY_RIGHT_FLAG],
+    ['flip', WRAP_FLIP_FLAG],
+    ['partial', WRAP_PARTIAL_FLAG],
+    ['partialRight', WRAP_PARTIAL_RIGHT_FLAG],
+    ['rearg', WRAP_REARG_FLAG]
+  ];
+
+  /** `Object#toString` result references. */
+  var argsTag = '[object Arguments]',
+      arrayTag = '[object Array]',
+      asyncTag = '[object AsyncFunction]',
+      boolTag = '[object Boolean]',
+      dateTag = '[object Date]',
+      domExcTag = '[object DOMException]',
+      errorTag = '[object Error]',
+      funcTag = '[object Function]',
+      genTag = '[object GeneratorFunction]',
+      mapTag = '[object Map]',
+      numberTag = '[object Number]',
+      nullTag = '[object Null]',
+      objectTag = '[object Object]',
+      promiseTag = '[object Promise]',
+      proxyTag = '[object Proxy]',
+      regexpTag = '[object RegExp]',
+      setTag = '[object Set]',
+      stringTag = '[object String]',
+      symbolTag = '[object Symbol]',
+      undefinedTag = '[object Undefined]',
+      weakMapTag = '[object WeakMap]',
+      weakSetTag = '[object WeakSet]';
+
+  var arrayBufferTag = '[object ArrayBuffer]',
+      dataViewTag = '[object DataView]',
+      float32Tag = '[object Float32Array]',
+      float64Tag = '[object Float64Array]',
+      int8Tag = '[object Int8Array]',
+      int16Tag = '[object Int16Array]',
+      int32Tag = '[object Int32Array]',
+      uint8Tag = '[object Uint8Array]',
+      uint8ClampedTag = '[object Uint8ClampedArray]',
+      uint16Tag = '[object Uint16Array]',
+      uint32Tag = '[object Uint32Array]';
+
+  /** Used to match empty string literals in compiled template source. */
+  var reEmptyStringLeading = /\b__p \+= '';/g,
+      reEmptyStringMiddle = /\b(__p \+=) '' \+/g,
+      reEmptyStringTrailing = /(__e\(.*?\)|\b__t\)) \+\n'';/g;
+
+  /** Used to match HTML entities and HTML characters. */
+  var reEscapedHtml = /&(?:amp|lt|gt|quot|#39);/g,
+      reUnescapedHtml = /[&<>"']/g,
+      reHasEscapedHtml = RegExp(reEscapedHtml.source),
+      reHasUnescapedHtml = RegExp(reUnescapedHtml.source);
+
+  /** Used to match template delimiters. */
+  var reEscape = /<%-([\s\S]+?)%>/g,
+      reEvaluate = /<%([\s\S]+?)%>/g,
+      reInterpolate = /<%=([\s\S]+?)%>/g;
+
+  /** Used to match property names within property paths. */
+  var reIsDeepProp = /\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/,
+      reIsPlainProp = /^\w*$/,
+      rePropName = /[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|$))/g;
+
+  /**
+   * Used to match `RegExp`
+   * [syntax characters](http://ecma-international.org/ecma-262/7.0/#sec-patterns).
+   */
+  var reRegExpChar = /[\\^$.*+?()[\]{}|]/g,
+      reHasRegExpChar = RegExp(reRegExpChar.source);
+
+  /** Used to match leading and trailing whitespace. */
+  var reTrim = /^\s+|\s+$/g,
+      reTrimStart = /^\s+/,
+      reTrimEnd = /\s+$/;
+
+  /** Used to match wrap detail comments. */
+  var reWrapComment = /\{(?:\n\/\* \[wrapped with .+\] \*\/)?\n?/,
+      reWrapDetails = /\{\n\/\* \[wrapped with (.+)\] \*/,
+      reSplitDetails = /,? & /;
+
+  /** Used to match words composed of alphanumeric characters. */
+  var reAsciiWord = /[^\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f]+/g;
+
+  /** Used to match backslashes in property paths. */
+  var reEscapeChar = /\\(\\)?/g;
+
+  /**
+   * Used to match
+   * [ES template delimiters](http://ecma-international.org/ecma-262/7.0/#sec-template-literal-lexical-components).
+   */
+  var reEsTemplate = /\$\{([^\\}]*(?:\\.[^\\}]*)*)\}/g;
+
+  /** Used to match `RegExp` flags from their coerced string values. */
+  var reFlags = /\w*$/;
+
+  /** Used to detect bad signed hexadecimal string values. */
+  var reIsBadHex = /^[-+]0x[0-9a-f]+$/i;
+
+  /** Used to detect binary string values. */
+  var reIsBinary = /^0b[01]+$/i;
+
+  /** Used to detect host constructors (Safari). */
+  var reIsHostCtor = /^\[object .+?Constructor\]$/;
+
+  /** Used to detect octal string values. */
+  var reIsOctal = /^0o[0-7]+$/i;
+
+  /** Used to detect unsigned integer values. */
+  var reIsUint = /^(?:0|[1-9]\d*)$/;
+
+  /** Used to match Latin Unicode letters (excluding mathematical operators). */
+  var reLatin = /[\xc0-\xd6\xd8-\xf6\xf8-\xff\u0100-\u017f]/g;
+
+  /** Used to ensure capturing order of template delimiters. */
+  var reNoMatch = /($^)/;
+
+  /** Used to match unescaped characters in compiled string literals. */
+  var reUnescapedString = /['\n\r\u2028\u2029\\]/g;
+
+  /** Used to compose unicode character classes. */
+  var rsAstralRange = '\\ud800-\\udfff',
+      rsComboMarksRange = '\\u0300-\\u036f',
+      reComboHalfMarksRange = '\\ufe20-\\ufe2f',
+      rsComboSymbolsRange = '\\u20d0-\\u20ff',
+      rsComboRange = rsComboMarksRange + reComboHalfMarksRange + rsComboSymbolsRange,
+      rsDingbatRange = '\\u2700-\\u27bf',
+      rsLowerRange = 'a-z\\xdf-\\xf6\\xf8-\\xff',
+      rsMathOpRange = '\\xac\\xb1\\xd7\\xf7',
+      rsNonCharRange = '\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf',
+      rsPunctuationRange = '\\u2000-\\u206f',
+      rsSpaceRange = ' \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000',
+      rsUpperRange = 'A-Z\\xc0-\\xd6\\xd8-\\xde',
+      rsVarRange = '\\ufe0e\\ufe0f',
+      rsBreakRange = rsMathOpRange + rsNonCharRange + rsPunctuationRange + rsSpaceRange;
+
+  /** Used to compose unicode capture groups. */
+  var rsApos = "['\u2019]",
+      rsAstral = '[' + rsAstralRange + ']',
+      rsBreak = '[' + rsBreakRange + ']',
+      rsCombo = '[' + rsComboRange + ']',
+      rsDigits = '\\d+',
+      rsDingbat = '[' + rsDingbatRange + ']',
+      rsLower = '[' + rsLowerRange + ']',
+      rsMisc = '[^' + rsAstralRange + rsBreakRange + rsDigits + rsDingbatRange + rsLowerRange + rsUpperRange + ']',
+      rsFitz = '\\ud83c[\\udffb-\\udfff]',
+      rsModifier = '(?:' + rsCombo + '|' + rsFitz + ')',
+      rsNonAstral = '[^' + rsAstralRange + ']',
+      rsRegional = '(?:\\ud83c[\\udde6-\\uddff]){2}',
+      rsSurrPair = '[\\ud800-\\udbff][\\udc00-\\udfff]',
+      rsUpper = '[' + rsUpperRange + ']',
+      rsZWJ = '\\u200d';
+
+  /** Used to compose unicode regexes. */
+  var rsMiscLower = '(?:' + rsLower + '|' + rsMisc + ')',
+      rsMiscUpper = '(?:' + rsUpper + '|' + rsMisc + ')',
+      rsOptContrLower = '(?:' + rsApos + '(?:d|ll|m|re|s|t|ve))?',
+      rsOptContrUpper = '(?:' + rsApos + '(?:D|LL|M|RE|S|T|VE))?',
+      reOptMod = rsModifier + '?',
+      rsOptVar = '[' + rsVarRange + ']?',
+      rsOptJoin = '(?:' + rsZWJ + '(?:' + [rsNonAstral, rsRegional, rsSurrPair].join('|') + ')' + rsOptVar + reOptMod + ')*',
+      rsOrdLower = '\\d*(?:1st|2nd|3rd|(?![123])\\dth)(?=\\b|[A-Z_])',
+      rsOrdUpper = '\\d*(?:1ST|2ND|3RD|(?![123])\\dTH)(?=\\b|[a-z_])',
+      rsSeq = rsOptVar + reOptMod + rsOptJoin,
+      rsEmoji = '(?:' + [rsDingbat, rsRegional, rsSurrPair].join('|') + ')' + rsSeq,
+      rsSymbol = '(?:' + [rsNonAstral + rsCombo + '?', rsCombo, rsRegional, rsSurrPair, rsAstral].join('|') + ')';
+
+  /** Used to match apostrophes. */
+  var reApos = RegExp(rsApos, 'g');
+
+  /**
+   * Used to match [combining diacritical marks](https://en.wikipedia.org/wiki/Combining_Diacritical_Marks) and
+   * [combining diacritical marks for symbols](https://en.wikipedia.org/wiki/Combining_Diacritical_Marks_for_Symbols).
+   */
+  var reComboMark = RegExp(rsCombo, 'g');
+
+  /** Used to match [string symbols](https://mathiasbynens.be/notes/javascript-unicode). */
+  var reUnicode = RegExp(rsFitz + '(?=' + rsFitz + ')|' + rsSymbol + rsSeq, 'g');
+
+  /** Used to match complex or compound words. */
+  var reUnicodeWord = RegExp([
+    rsUpper + '?' + rsLower + '+' + rsOptContrLower + '(?=' + [rsBreak, rsUpper, '$'].join('|') + ')',
+    rsMiscUpper + '+' + rsOptContrUpper + '(?=' + [rsBreak, rsUpper + rsMiscLower, '$'].join('|') + ')',
+    rsUpper + '?' + rsMiscLower + '+' + rsOptContrLower,
+    rsUpper + '+' + rsOptContrUpper,
+    rsOrdUpper,
+    rsOrdLower,
+    rsDigits,
+    rsEmoji
+  ].join('|'), 'g');
+
+  /** Used to detect strings with [zero-width joiners or code points from the astral planes](http://eev.ee/blog/2015/09/12/dark-corners-of-unicode/). */
+  var reHasUnicode = RegExp('[' + rsZWJ + rsAstralRange  + rsComboRange + rsVarRange + ']');
+
+  /** Used to detect strings that need a more robust regexp to match words. */
+  var reHasUnicodeWord = /[a-z][A-Z]|[A-Z]{2,}[a-z]|[0-9][a-zA-Z]|[a-zA-Z][0-9]|[^a-zA-Z0-9 ]/;
+
+  /** Used to assign default `context` object properties. */
+  var contextProps = [
+    'Array', 'Buffer', 'DataView', 'Date', 'Error', 'Float32Array', 'Float64Array',
+    'Function', 'Int8Array', 'Int16Array', 'Int32Array', 'Map', 'Math', 'Object',
+    'Promise', 'RegExp', 'Set', 'String', 'Symbol', 'TypeError', 'Uint8Array',
+    'Uint8ClampedArray', 'Uint16Array', 'Uint32Array', 'WeakMap',
+    '_', 'clearTimeout', 'isFinite', 'parseInt', 'setTimeout'
+  ];
+
+  /** Used to make template sourceURLs easier to identify. */
+  var templateCounter = -1;
+
+  /** Used to identify `toStringTag` values of typed arrays. */
+  var typedArrayTags = {};
+  typedArrayTags[float32Tag] = typedArrayTags[float64Tag] =
+  typedArrayTags[int8Tag] = typedArrayTags[int16Tag] =
+  typedArrayTags[int32Tag] = typedArrayTags[uint8Tag] =
+  typedArrayTags[uint8ClampedTag] = typedArrayTags[uint16Tag] =
+  typedArrayTags[uint32Tag] = true;
+  typedArrayTags[argsTag] = typedArrayTags[arrayTag] =
+  typedArrayTags[arrayBufferTag] = typedArrayTags[boolTag] =
+  typedArrayTags[dataViewTag] = typedArrayTags[dateTag] =
+  typedArrayTags[errorTag] = typedArrayTags[funcTag] =
+  typedArrayTags[mapTag] = typedArrayTags[numberTag] =
+  typedArrayTags[objectTag] = typedArrayTags[regexpTag] =
+  typedArrayTags[setTag] = typedArrayTags[stringTag] =
+  typedArrayTags[weakMapTag] = false;
+
+  /** Used to identify `toStringTag` values supported by `_.clone`. */
+  var cloneableTags = {};
+  cloneableTags[argsTag] = cloneableTags[arrayTag] =
+  cloneableTags[arrayBufferTag] = cloneableTags[dataViewTag] =
+  cloneableTags[boolTag] = cloneableTags[dateTag] =
+  cloneableTags[float32Tag] = cloneableTags[float64Tag] =
+  cloneableTags[int8Tag] = cloneableTags[int16Tag] =
+  cloneableTags[int32Tag] = cloneableTags[mapTag] =
+  cloneableTags[numberTag] = cloneableTags[objectTag] =
+  cloneableTags[regexpTag] = cloneableTags[setTag] =
+  cloneableTags[stringTag] = cloneableTags[symbolTag] =
+  cloneableTags[uint8Tag] = cloneableTags[uint8ClampedTag] =
+  cloneableTags[uint16Tag] = cloneableTags[uint32Tag] = true;
+  cloneableTags[errorTag] = cloneableTags[funcTag] =
+  cloneableTags[weakMapTag] = false;
+
+  /** Used to map Latin Unicode letters to basic Latin letters. */
+  var deburredLetters = {
+    // Latin-1 Supplement block.
+    '\xc0': 'A',  '\xc1': 'A', '\xc2': 'A', '\xc3': 'A', '\xc4': 'A', '\xc5': 'A',
+    '\xe0': 'a',  '\xe1': 'a', '\xe2': 'a', '\xe3': 'a', '\xe4': 'a', '\xe5': 'a',
+    '\xc7': 'C',  '\xe7': 'c',
+    '\xd0': 'D',  '\xf0': 'd',
+    '\xc8': 'E',  '\xc9': 'E', '\xca': 'E', '\xcb': 'E',
+    '\xe8': 'e',  '\xe9': 'e', '\xea': 'e', '\xeb': 'e',
+    '\xcc': 'I',  '\xcd': 'I', '\xce': 'I', '\xcf': 'I',
+    '\xec': 'i',  '\xed': 'i', '\xee': 'i', '\xef': 'i',
+    '\xd1': 'N',  '\xf1': 'n',
+    '\xd2': 'O',  '\xd3': 'O', '\xd4': 'O', '\xd5': 'O', '\xd6': 'O', '\xd8': 'O',
+    '\xf2': 'o',  '\xf3': 'o', '\xf4': 'o', '\xf5': 'o', '\xf6': 'o', '\xf8': 'o',
+    '\xd9': 'U',  '\xda': 'U', '\xdb': 'U', '\xdc': 'U',
+    '\xf9': 'u',  '\xfa': 'u', '\xfb': 'u', '\xfc': 'u',
+    '\xdd': 'Y',  '\xfd': 'y', '\xff': 'y',
+    '\xc6': 'Ae', '\xe6': 'ae',
+    '\xde': 'Th', '\xfe': 'th',
+    '\xdf': 'ss',
+    // Latin Extended-A block.
+    '\u0100': 'A',  '\u0102': 'A', '\u0104': 'A',
+    '\u0101': 'a',  '\u0103': 'a', '\u0105': 'a',
+    '\u0106': 'C',  '\u0108': 'C', '\u010a': 'C', '\u010c': 'C',
+    '\u0107': 'c',  '\u0109': 'c', '\u010b': 'c', '\u010d': 'c',
+    '\u010e': 'D',  '\u0110': 'D', '\u010f': 'd', '\u0111': 'd',
+    '\u0112': 'E',  '\u0114': 'E', '\u0116': 'E', '\u0118': 'E', '\u011a': 'E',
+    '\u0113': 'e',  '\u0115': 'e', '\u0117': 'e', '\u0119': 'e', '\u011b': 'e',
+    '\u011c': 'G',  '\u011e': 'G', '\u0120': 'G', '\u0122': 'G',
+    '\u011d': 'g',  '\u011f': 'g', '\u0121': 'g', '\u0123': 'g',
+    '\u0124': 'H',  '\u0126': 'H', '\u0125': 'h', '\u0127': 'h',
+    '\u0128': 'I',  '\u012a': 'I', '\u012c': 'I', '\u012e': 'I', '\u0130': 'I',
+    '\u0129': 'i',  '\u012b': 'i', '\u012d': 'i', '\u012f': 'i', '\u0131': 'i',
+    '\u0134': 'J',  '\u0135': 'j',
+    '\u0136': 'K',  '\u0137': 'k', '\u0138': 'k',
+    '\u0139': 'L',  '\u013b': 'L', '\u013d': 'L', '\u013f': 'L', '\u0141': 'L',
+    '\u013a': 'l',  '\u013c': 'l', '\u013e': 'l', '\u0140': 'l', '\u0142': 'l',
+    '\u0143': 'N',  '\u0145': 'N', '\u0147': 'N', '\u014a': 'N',
+    '\u0144': 'n',  '\u0146': 'n', '\u0148': 'n', '\u014b': 'n',
+    '\u014c': 'O',  '\u014e': 'O', '\u0150': 'O',
+    '\u014d': 'o',  '\u014f': 'o', '\u0151': 'o',
+    '\u0154': 'R',  '\u0156': 'R', '\u0158': 'R',
+    '\u0155': 'r',  '\u0157': 'r', '\u0159': 'r',
+    '\u015a': 'S',  '\u015c': 'S', '\u015e': 'S', '\u0160': 'S',
+    '\u015b': 's',  '\u015d': 's', '\u015f': 's', '\u0161': 's',
+    '\u0162': 'T',  '\u0164': 'T', '\u0166': 'T',
+    '\u0163': 't',  '\u0165': 't', '\u0167': 't',
+    '\u0168': 'U',  '\u016a': 'U', '\u016c': 'U', '\u016e': 'U', '\u0170': 'U', '\u0172': 'U',
+    '\u0169': 'u',  '\u016b': 'u', '\u016d': 'u', '\u016f': 'u', '\u0171': 'u', '\u0173': 'u',
+    '\u0174': 'W',  '\u0175': 'w',
+    '\u0176': 'Y',  '\u0177': 'y', '\u0178': 'Y',
+    '\u0179': 'Z',  '\u017b': 'Z', '\u017d': 'Z',
+    '\u017a': 'z',  '\u017c': 'z', '\u017e': 'z',
+    '\u0132': 'IJ', '\u0133': 'ij',
+    '\u0152': 'Oe', '\u0153': 'oe',
+    '\u0149': "'n", '\u017f': 's'
+  };
+
+  /** Used to map characters to HTML entities. */
+  var htmlEscapes = {
+    '&': '&amp;',
+    '<': '&lt;',
+    '>': '&gt;',
+    '"': '&quot;',
+    "'": '&#39;'
+  };
+
+  /** Used to map HTML entities to characters. */
+  var htmlUnescapes = {
+    '&amp;': '&',
+    '&lt;': '<',
+    '&gt;': '>',
+    '&quot;': '"',
+    '&#39;': "'"
+  };
+
+  /** Used to escape characters for inclusion in compiled string literals. */
+  var stringEscapes = {
+    '\\': '\\',
+    "'": "'",
+    '\n': 'n',
+    '\r': 'r',
+    '\u2028': 'u2028',
+    '\u2029': 'u2029'
+  };
+
+  /** Built-in method references without a dependency on `root`. */
+  var freeParseFloat = parseFloat,
+      freeParseInt = parseInt;
+
+  /** Detect free variable `global` from Node.js. */
+  var freeGlobal = typeof global == 'object' && global && global.Object === Object && global;
+
+  /** Detect free variable `self`. */
+  var freeSelf = typeof self == 'object' && self && self.Object === Object && self;
+
+  /** Used as a reference to the global object. */
+  var root = freeGlobal || freeSelf || Function('return this')();
+
+  /** Detect free variable `exports`. */
+  var freeExports = typeof exports == 'object' && exports && !exports.nodeType && exports;
+
+  /** Detect free variable `module`. */
+  var freeModule = freeExports && typeof module == 'object' && module && !module.nodeType && module;
+
+  /** Detect the popular CommonJS extension `module.exports`. */
+  var moduleExports = freeModule && freeModule.exports === freeExports;
+
+  /** Detect free variable `process` from Node.js. */
+  var freeProcess = moduleExports && freeGlobal.process;
+
+  /** Used to access faster Node.js helpers. */
+  var nodeUtil = (function() {
+    try {
+      // Use `util.types` for Node.js 10+.
+      var types = freeModule && freeModule.require && freeModule.require('util').types;
+
+      if (types) {
+        return types;
+      }
+
+      // Legacy `process.binding('util')` for Node.js < 10.
+      return freeProcess && freeProcess.binding && freeProcess.binding('util');
+    } catch (e) {}
+  }());
+
+  /* Node.js helper references. */
+  var nodeIsArrayBuffer = nodeUtil && nodeUtil.isArrayBuffer,
+      nodeIsDate = nodeUtil && nodeUtil.isDate,
+      nodeIsMap = nodeUtil && nodeUtil.isMap,
+      nodeIsRegExp = nodeUtil && nodeUtil.isRegExp,
+      nodeIsSet = nodeUtil && nodeUtil.isSet,
+      nodeIsTypedArray = nodeUtil && nodeUtil.isTypedArray;
+
+  /*--------------------------------------------------------------------------*/
+
+  /**
+   * A faster alternative to `Function#apply`, this function invokes `func`
+   * with the `this` binding of `thisArg` and the arguments of `args`.
+   *
+   * @private
+   * @param {Function} func The function to invoke.
+   * @param {*} thisArg The `this` binding of `func`.
+   * @param {Array} args The arguments to invoke `func` with.
+   * @returns {*} Returns the result of `func`.
+   */
+  function apply(func, thisArg, args) {
+    switch (args.length) {
+      case 0: return func.call(thisArg);
+      case 1: return func.call(thisArg, args[0]);
+      case 2: return func.call(thisArg, args[0], args[1]);
+      case 3: return func.call(thisArg, args[0], args[1], args[2]);
+    }
+    return func.apply(thisArg, args);
+  }
+
+  /**
+   * A specialized version of `baseAggregator` for arrays.
+   *
+   * @private
+   * @param {Array} [array] The array to iterate over.
+   * @param {Function} setter The function to set `accumulator` values.
+   * @param {Function} iteratee The iteratee to transform keys.
+   * @param {Object} accumulator The initial aggregated object.
+   * @returns {Function} Returns `accumulator`.
+   */
+  function arrayAggregator(array, setter, iteratee, accumulator) {
+    var index = -1,
+        length = array == null ? 0 : array.length;
+
+    while (++index < length) {
+      var value = array[index];
+      setter(accumulator, value, iteratee(value), array);
+    }
+    return accumulator;
+  }
+
+  /**
+   * A specialized version of `_.forEach` for arrays without support for
+   * iteratee shorthands.
+   *
+   * @private
+   * @param {Array} [array] The array to iterate over.
+   * @param {Function} iteratee The function invoked per iteration.
+   * @returns {Array} Returns `array`.
+   */
+  function arrayEach(array, iteratee) {
+    var index = -1,
+        length = array == null ? 0 : array.length;
+
+    while (++index < length) {
+      if (iteratee(array[index], index, array) === false) {
+        break;
+      }
+    }
+    return array;
+  }
+
+  /**
+   * A specialized version of `_.forEachRight` for arrays without support for
+   * iteratee shorthands.
+   *
+   * @private
+   * @param {Array} [array] The array to iterate over.
+   * @param {Function} iteratee The function invoked per iteration.
+   * @returns {Array} Returns `array`.
+   */
+  function arrayEachRight(array, iteratee) {
+    var length = array == null ? 0 : array.length;
+
+    while (length--) {
+      if (iteratee(array[length], length, array) === false) {
+        break;
+      }
+    }
+    return array;
+  }
+
+  /**
+   * A specialized version of `_.every` for arrays without support for
+   * iteratee shorthands.
+   *
+   * @private
+   * @param {Array} [array] The array to iterate over.
+   * @param {Function} predicate The function invoked per iteration.
+   * @returns {boolean} Returns `true` if all elements pass the predicate check,
+   *  else `false`.
+   */
+  function arrayEvery(array, predicate) {
+    var index = -1,
+        length = array == null ? 0 : array.length;
+
+    while (++index < length) {
+      if (!predicate(array[index], index, array)) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  /**
+   * A specialized version of `_.filter` for arrays without support for
+   * iteratee shorthands.
+   *
+   * @private
+   * @param {Array} [array] The array to iterate over.
+   * @param {Function} predicate The function invoked per iteration.
+   * @returns {Array} Returns the new filtered array.
+   */
+  function arrayFilter(array, predicate) {
+    var index = -1,
+        length = array == null ? 0 : array.length,
+        resIndex = 0,
+        result = [];
+
+    while (++index < length) {
+      var value = array[index];
+      if (predicate(value, index, array)) {
+        result[resIndex++] = value;
+      }
+    }
+    return result;
+  }
+
+  /**
+   * A specialized version of `_.includes` for arrays without support for
+   * specifying an index to search from.
+   *
+   * @private
+   * @param {Array} [array] The array to inspect.
+   * @param {*} target The value to search for.
+   * @returns {boolean} Returns `true` if `target` is found, else `false`.
+   */
+  function arrayIncludes(array, value) {
+    var length = array == null ? 0 : array.length;
+    return !!length && baseIndexOf(array, value, 0) > -1;
+  }
+
+  /**
+   * This function is like `arrayIncludes` except that it accepts a comparator.
+   *
+   * @private
+   * @param {Array} [array] The array to inspect.
+   * @param {*} target The value to search for.
+   * @param {Function} comparator The comparator invoked per element.
+   * @returns {boolean} Returns `true` if `target` is found, else `false`.
+   */
+  function arrayIncludesWith(array, value, comparator) {
+    var index = -1,
+        length = array == null ? 0 : array.length;
+
+    while (++index < length) {
+      if (comparator(value, array[index])) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  /**
+   * A specialized version of `_.map` for arrays without support for iteratee
+   * shorthands.
+   *
+   * @private
+   * @param {Array} [array] The array to iterate over.
+   * @param {Function} iteratee The function invoked per iteration.
+   * @returns {Array} Returns the new mapped array.
+   */
+  function arrayMap(array, iteratee) {
+    var index = -1,
+        length = array == null ? 0 : array.length,
+        result = Array(length);
+
+    while (++index < length) {
+      result[index] = iteratee(array[index], index, array);
+    }
+    return result;
+  }
+
+  /**
+   * Appends the elements of `values` to `array`.
+   *
+   * @private
+   * @param {Array} array The array to modify.
+   * @param {Array} values The values to append.
+   * @returns {Array} Returns `array`.
+   */
+  function arrayPush(array, values) {
+    var index = -1,
+        length = values.length,
+        offset = array.length;
+
+    while (++index < length) {
+      array[offset + index] = values[index];
+    }
+    return array;
+  }
+
+  /**
+   * A specialized version of `_.reduce` for arrays without support for
+   * iteratee shorthands.
+   *
+   * @private
+   * @param {Array} [array] The array to iterate over.
+   * @param {Function} iteratee The function invoked per iteration.
+   * @param {*} [accumulator] The initial value.
+   * @param {boolean} [initAccum] Specify using the first element of `array` as
+   *  the initial value.
+   * @returns {*} Returns the accumulated value.
+   */
+  function arrayReduce(array, iteratee, accumulator, initAccum) {
+    var index = -1,
+        length = array == null ? 0 : array.length;
+
+    if (initAccum && length) {
+      accumulator = array[++index];
+    }
+    while (++index < length) {
+      accumulator = iteratee(accumulator, array[index], index, array);
+    }
+    return accumulator;
+  }
+
+  /**
+   * A specialized version of `_.reduceRight` for arrays without support for
+   * iteratee shorthands.
+   *
+   * @private
+   * @param {Array} [array] The array to iterate over.
+   * @param {Function} iteratee The function invoked per iteration.
+   * @param {*} [accumulator] The initial value.
+   * @param {boolean} [initAccum] Specify using the last element of `array` as
+   *  the initial value.
+   * @returns {*} Returns the accumulated value.
+   */
+  function arrayReduceRight(array, iteratee, accumulator, initAccum) {
+    var length = array == null ? 0 : array.length;
+    if (initAccum && length) {
+      accumulator = array[--length];
+    }
+    while (length--) {
+      accumulator = iteratee(accumulator, array[length], length, array);
+    }
+    return accumulator;
+  }
+
+  /**
+   * A specialized version of `_.some` for arrays without support for iteratee
+   * shorthands.
+   *
+   * @private
+   * @param {Array} [array] The array to iterate over.
+   * @param {Function} predicate The function invoked per iteration.
+   * @returns {boolean} Returns `true` if any element passes the predicate check,
+   *  else `false`.
+   */
+  function arraySome(array, predicate) {
+    var index = -1,
+        length = array == null ? 0 : array.length;
+
+    while (++index < length) {
+      if (predicate(array[index], index, array)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  /**
+   * Gets the size of an ASCII `string`.
+   *
+   * @private
+   * @param {string} string The string inspect.
+   * @returns {number} Returns the string size.
+   */
+  var asciiSize = baseProperty('length');
+
+  /**
+   * Converts an ASCII `string` to an array.
+   *
+   * @private
+   * @param {string} string The string to convert.
+   * @returns {Array} Returns the converted array.
+   */
+  function asciiToArray(string) {
+    return string.split('');
+  }
+
+  /**
+   * Splits an ASCII `string` into an array of its words.
+   *
+   * @private
+   * @param {string} The string to inspect.
+   * @returns {Array} Returns the words of `string`.
+   */
+  function asciiWords(string) {
+    return string.match(reAsciiWord) || [];
+  }
+
+  /**
+   * The base implementation of methods like `_.findKey` and `_.findLastKey`,
+   * without support for iteratee shorthands, which iterates over `collection`
+   * using `eachFunc`.
+   *
+   * @private
+   * @param {Array|Object} collection The collection to inspect.
+   * @param {Function} predicate The function invoked per iteration.
+   * @param {Function} eachFunc The function to iterate over `collection`.
+   * @returns {*} Returns the found element or its key, else `undefined`.
+   */
+  function baseFindKey(collection, predicate, eachFunc) {
+    var result;
+    eachFunc(collection, function(value, key, collection) {
+      if (predicate(value, key, collection)) {
+        result = key;
+        return false;
+      }
+    });
+    return result;
+  }
+
+  /**
+   * The base implementation of `_.findIndex` and `_.findLastIndex` without
+   * support for iteratee shorthands.
+   *
+   * @private
+   * @param {Array} array The array to inspect.
+   * @param {Function} predicate The function invoked per iteration.
+   * @param {number} fromIndex The index to search from.
+   * @param {boolean} [fromRight] Specify iterating from right to left.
+   * @returns {number} Returns the index of the matched value, else `-1`.
+   */
+  function baseFindIndex(array, predicate, fromIndex, fromRight) {
+    var length = array.length,
+        index = fromIndex + (fromRight ? 1 : -1);
+
+    while ((fromRight ? index-- : ++index < length)) {
+      if (predicate(array[index], index, array)) {
+        return index;
+      }
+    }
+    return -1;
+  }
+
+  /**
+   * The base implementation of `_.indexOf` without `fromIndex` bounds checks.
+   *
+   * @private
+   * @param {Array} array The array to inspect.
+   * @param {*} value The value to search for.
+   * @param {number} fromIndex The index to search from.
+   * @returns {number} Returns the index of the matched value, else `-1`.
+   */
+  function baseIndexOf(array, value, fromIndex) {
+    return value === value
+      ? strictIndexOf(array, value, fromIndex)
+      : baseFindIndex(array, baseIsNaN, fromIndex);
+  }
+
+  /**
+   * This function is like `baseIndexOf` except that it accepts a comparator.
+   *
+   * @private
+   * @param {Array} array The array to inspect.
+   * @param {*} value The value to search for.
+   * @param {number} fromIndex The index to search from.
+   * @param {Function} comparator The comparator invoked per element.
+   * @returns {number} Returns the index of the matched value, else `-1`.
+   */
+  function baseIndexOfWith(array, value, fromIndex, comparator) {
+    var index = fromIndex - 1,
+        length = array.length;
+
+    while (++index < length) {
+      if (comparator(array[index], value)) {
+        return index;
+      }
+    }
+    return -1;
+  }
+
+  /**
+   * The base implementation of `_.isNaN` without support for number objects.
+   *
+   * @private
+   * @param {*} value The value to check.
+   * @returns {boolean} Returns `true` if `value` is `NaN`, else `false`.
+   */
+  function baseIsNaN(value) {
+    return value !== value;
+  }
+
+  /**
+   * The base implementation of `_.mean` and `_.meanBy` without support for
+   * iteratee shorthands.
+   *
+   * @private
+   * @param {Array} array The array to iterate over.
+   * @param {Function} iteratee The function invoked per iteration.
+   * @returns {number} Returns the mean.
+   */
+  function baseMean(array, iteratee) {
+    var length = array == null ? 0 : array.length;
+    return length ? (baseSum(array, iteratee) / length) : NAN;
+  }
+
+  /**
+   * The base implementation of `_.property` without support for deep paths.
+   *
+   * @private
+   * @param {string} key The key of the property to get.
+   * @returns {Function} Returns the new accessor function.
+   */
+  function baseProperty(key) {
+    return function(object) {
+      return object == null ? undefined : object[key];
+    };
+  }
+
+  /**
+   * The base implementation of `_.propertyOf` without support for deep paths.
+   *
+   * @private
+   * @param {Object} object The object to query.
+   * @returns {Function} Returns the new accessor function.
+   */
+  function basePropertyOf(object) {
+    return function(key) {
+      return object == null ? undefined : object[key];
+    };
+  }
+
+  /**
+   * The base implementation of `_.reduce` and `_.reduceRight`, without support
+   * for iteratee shorthands, which iterates over `collection` using `eachFunc`.
+   *
+   * @private
+   * @param {Array|Object} collection The collection to iterate over.
+   * @param {Function} iteratee The function invoked per iteration.
+   * @param {*} accumulator The initial value.
+   * @param {boolean} initAccum Specify using the first or last element of
+   *  `collection` as the initial value.
+   * @param {Function} eachFunc The function to iterate over `collection`.
+   * @returns {*} Returns the accumulated value.
+   */
+  function baseReduce(collection, iteratee, accumulator, initAccum, eachFunc) {
+    eachFunc(collection, function(value, index, collection) {
+      accumulator = initAccum
+        ? (initAccum = false, value)
+        : iteratee(accumulator, value, index, collection);
+    });
+    return accumulator;
+  }
+
+  /**
+   * The base implementation of `_.sortBy` which uses `comparer` to define the
+   * sort order of `array` and replaces criteria objects with their corresponding
+   * values.
+   *
+   * @private
+   * @param {Array} array The array to sort.
+   * @param {Function} comparer The function to define sort order.
+   * @returns {Array} Returns `array`.
+   */
+  function baseSortBy(array, comparer) {
+    var length = array.length;
+
+    array.sort(comparer);
+    while (length--) {
+      array[length] = array[length].value;
+    }
+    return array;
+  }
+
+  /**
+   * The base implementation of `_.sum` and `_.sumBy` without support for
+   * iteratee shorthands.
+   *
+   * @private
+   * @param {Array} array The array to iterate over.
+   * @param {Function} iteratee The function invoked per iteration.
+   * @returns {number} Returns the sum.
+   */
+  function baseSum(array, iteratee) {
+    var result,
+        index = -1,
+        length = array.length;
+
+    while (++index < length) {
+      var current = iteratee(array[index]);
+      if (current !== undefined) {
+        result = result === undefined ? current : (result + current);
+      }
+    }
+    return result;
+  }
+
+  /**
+   * The base implementation of `_.times` without support for iteratee shorthands
+   * or max array length checks.
+   *
+   * @private
+   * @param {number} n The number of times to invoke `iteratee`.
+   * @param {Function} iteratee The function invoked per iteration.
+   * @returns {Array} Returns the array of results.
+   */
+  function baseTimes(n, iteratee) {
+    var index = -1,
+        result = Array(n);
+
+    while (++index < n) {
+      result[index] = iteratee(index);
+    }
+    return result;
+  }
+
+  /**
+   * The base implementation of `_.toPairs` and `_.toPairsIn` which creates an array
+   * of key-value pairs for `object` corresponding to the property names of `props`.
+   *
+   * @private
+   * @param {Object} object The object to query.
+   * @param {Array} props The property names to get values for.
+   * @returns {Object} Returns the key-value pairs.
+   */
+  function baseToPairs(object, props) {
+    return arrayMap(props, function(key) {
+      return [key, object[key]];
+    });
+  }
+
+  /**
+   * The base implementation of `_.unary` without support for storing metadata.
+   *
+   * @private
+   * @param {Function} func The function to cap arguments for.
+   * @returns {Function} Returns the new capped function.
+   */
+  function baseUnary(func) {
+    return function(value) {
+      return func(value);
+    };
+  }
+
+  /**
+   * The base implementation of `_.values` and `_.valuesIn` which creates an
+   * array of `object` property values corresponding to the property names
+   * of `props`.
+   *
+   * @private
+   * @param {Object} object The object to query.
+   * @param {Array} props The property names to get values for.
+   * @returns {Object} Returns the array of property values.
+   */
+  function baseValues(object, props) {
+    return arrayMap(props, function(key) {
+      return object[key];
+    });
+  }
+
+  /**
+   * Checks if a `cache` value for `key` exists.
+   *
+   * @private
+   * @param {Object} cache The cache to query.
+   * @param {string} key The key of the entry to check.
+   * @returns {boolean} Returns `true` if an entry for `key` exists, else `false`.
+   */
+  function cacheHas(cache, key) {
+    return cache.has(key);
+  }
+
+  /**
+   * Used by `_.trim` and `_.trimStart` to get the index of the first string symbol
+   * that is not found in the character symbols.
+   *
+   * @private
+   * @param {Array} strSymbols The string symbols to inspect.
+   * @param {Array} chrSymbols The character symbols to find.
+   * @returns {number} Returns the index of the first unmatched string symbol.
+   */
+  function charsStartIndex(strSymbols, chrSymbols) {
+    var index = -1,
+        length = strSymbols.length;
+
+    while (++index < length && baseIndexOf(chrSymbols, strSymbols[index], 0) > -1) {}
+    return index;
+  }
+
+  /**
+   * Used by `_.trim` and `_.trimEnd` to get the index of the last string symbol
+   * that is not found in the character symbols.
+   *
+   * @private
+   * @param {Array} strSymbols The string symbols to inspect.
+   * @param {Array} chrSymbols The character symbols to find.
+   * @returns {number} Returns the index of the last unmatched string symbol.
+   */
+  function charsEndIndex(strSymbols, chrSymbols) {
+    var index = strSymbols.length;
+
+    while (index-- && baseIndexOf(chrSymbols, strSymbols[index], 0) > -1) {}
+    return index;
+  }
+
+  /**
+   * Gets the number of `placeholder` occurrences in `array`.
+   *
+   * @private
+   * @param {Array} array The array to inspect.
+   * @param {*} placeholder The placeholder to search for.
+   * @returns {number} Returns the placeholder count.
+   */
+  function countHolders(array, placeholder) {
+    var length = array.length,
+        result = 0;
+
+    while (length--) {
+      if (array[length] === placeholder) {
+        ++result;
+      }
+    }
+    return result;
+  }
+
+  /**
+   * Used by `_.deburr` to convert Latin-1 Supplement and Latin Extended-A
+   * letters to basic Latin letters.
+   *
+   * @private
+   * @param {string} letter The matched letter to deburr.
+   * @returns {string} Returns the deburred letter.
+   */
+  var deburrLetter = basePropertyOf(deburredLetters);
+
+  /**
+   * Used by `_.escape` to convert characters to HTML entities.
+   *
+   * @private
+   * @param {string} chr The matched character to escape.
+   * @returns {string} Returns the escaped character.
+   */
+  var escapeHtmlChar = basePropertyOf(htmlEscapes);
+
+  /**
+   * Used by `_.template` to escape characters for inclusion in compiled string literals.
+   *
+   * @private
+   * @param {string} chr The matched character to escape.
+   * @returns {string} Returns the escaped character.
+   */
+  function escapeStringChar(chr) {
+    return '\\' + stringEscapes[chr];
+  }
+
+  /**
+   * Gets the value at `key` of `object`.
+   *
+   * @private
+   * @param {Object} [object] The object to query.
+   * @param {string} key The key of the property to get.
+   * @returns {*} Returns the property value.
+   */
+  function getValue(object, key) {
+    return object == null ? undefined : object[key];
+  }
+
+  /**
+   * Checks if `string` contains Unicode symbols.
+   *
+   * @private
+   * @param {string} string The string to inspect.
+   * @returns {boolean} Returns `true` if a symbol is found, else `false`.
+   */
+  function hasUnicode(string) {
+    return reHasUnicode.test(string);
+  }
+
+  /**
+   * Checks if `string` contains a word composed of Unicode symbols.
+   *
+   * @private
+   * @param {string} string The string to inspect.
+   * @returns {boolean} Returns `true` if a word is found, else `false`.
+   */
+  function hasUnicodeWord(string) {
+    return reHasUnicodeWord.test(string);
+  }
+
+  /**
+   * Converts `iterator` to an array.
+   *
+   * @private
+   * @param {Object} iterator The iterator to convert.
+   * @returns {Array} Returns the converted array.
+   */
+  function iteratorToArray(iterator) {
+    var data,
+        result = [];
+
+    while (!(data = iterator.next()).done) {
+      result.push(data.value);
+    }
+    return result;
+  }
+
+  /**
+   * Converts `map` to its key-value pairs.
+   *
+   * @private
+   * @param {Object} map The map to convert.
+   * @returns {Array} Returns the key-value pairs.
+   */
+  function mapToArray(map) {
+    var index = -1,
+        result = Array(map.size);
+
+    map.forEach(function(value, key) {
+      result[++index] = [key, value];
+    });
+    return result;
+  }
+
+  /**
+   * Creates a unary function that invokes `func` with its argument transformed.
+   *
+   * @private
+   * @param {Function} func The function to wrap.
+   * @param {Function} transform The argument transform.
+   * @returns {Function} Returns the new function.
+   */
+  function overArg(func, transform) {
+    return function(arg) {
+      return func(transform(arg));
+    };
+  }
+
+  /**
+   * Replaces all `placeholder` elements in `array` with an internal placeholder
+   * and returns an array of their indexes.
+   *
+   * @private
+   * @param {Array} array The array to modify.
+   * @param {*} placeholder The placeholder to replace.
+   * @returns {Array} Returns the new array of placeholder indexes.
+   */
+  function replaceHolders(array, placeholder) {
+    var index = -1,
+        length = array.length,
+        resIndex = 0,
+        result = [];
+
+    while (++index < length) {
+      var value = array[index];
+      if (value === placeholder || value === PLACEHOLDER) {
+        array[index] = PLACEHOLDER;
+        result[resIndex++] = index;
+      }
+    }
+    return result;
+  }
+
+  /**
+   * Gets the value at `key`, unless `key` is "__proto__".
+   *
+   * @private
+   * @param {Object} object The object to query.
+   * @param {string} key The key of the property to get.
+   * @returns {*} Returns the property value.
+   */
+  function safeGet(object, key) {
+    return key == '__proto__'
+      ? undefined
+      : object[key];
+  }
+
+  /**
+   * Converts `set` to an array of its values.
+   *
+   * @private
+   * @param {Object} set The set to convert.
+   * @returns {Array} Returns the values.
+   */
+  function setToArray(set) {
+    var index = -1,
+        result = Array(set.size);
+
+    set.forEach(function(value) {
+      result[++index] = value;
+    });
+    return result;
+  }
+
+  /**
+   * Converts `set` to its value-value pairs.
+   *
+   * @private
+   * @param {Object} set The set to convert.
+   * @returns {Array} Returns the value-value pairs.
+   */
+  function setToPairs(set) {
+    var index = -1,
+        result = Array(set.size);
+
+    set.forEach(function(value) {
+      result[++index] = [value, value];
+    });
+    return result;
+  }
+
+  /**
+   * A specialized version of `_.indexOf` which performs strict equality
+   * comparisons of values, i.e. `===`.
+   *
+   * @private
+   * @param {Array} array The array to inspect.
+   * @param {*} value The value to search for.
+   * @param {number} fromIndex The index to search from.
+   * @returns {number} Returns the index of the matched value, else `-1`.
+   */
+  function strictIndexOf(array, value, fromIndex) {
+    var index = fromIndex - 1,
+        length = array.length;
+
+    while (++index < length) {
+      if (array[index] === value) {
+        return index;
+      }
+    }
+    return -1;
+  }
+
+  /**
+   * A specialized version of `_.lastIndexOf` which performs strict equality
+   * comparisons of values, i.e. `===`.
+   *
+   * @private
+   * @param {Array} array The array to inspect.
+   * @param {*} value The value to search for.
+   * @param {number} fromIndex The index to search from.
+   * @returns {number} Returns the index of the matched value, else `-1`.
+   */
+  function strictLastIndexOf(array, value, fromIndex) {
+    var index = fromIndex + 1;
+    while (index--) {
+      if (array[index] === value) {
+        return index;
+      }
+    }
+    return index;
+  }
+
+  /**
+   * Gets the number of symbols in `string`.
+   *
+   * @private
+   * @param {string} string The string to inspect.
+   * @returns {number} Returns the string size.
+   */
+  function stringSize(string) {
+    return hasUnicode(string)
+      ? unicodeSize(string)
+      : asciiSize(string);
+  }
+
+  /**
+   * Converts `string` to an array.
+   *
+   * @private
+   * @param {string} string The string to convert.
+   * @returns {Array} Returns the converted array.
+   */
+  function stringToArray(string) {
+    return hasUnicode(string)
+      ? unicodeToArray(string)
+      : asciiToArray(string);
+  }
+
+  /**
+   * Used by `_.unescape` to convert HTML entities to characters.
+   *
+   * @private
+   * @param {string} chr The matched character to unescape.
+   * @returns {string} Returns the unescaped character.
+   */
+  var unescapeHtmlChar = basePropertyOf(htmlUnescapes);
+
+  /**
+   * Gets the size of a Unicode `string`.
+   *
+   * @private
+   * @param {string} string The string inspect.
+   * @returns {number} Returns the string size.
+   */
+  function unicodeSize(string) {
+    var result = reUnicode.lastIndex = 0;
+    while (reUnicode.test(string)) {
+      ++result;
+    }
+    return result;
+  }
+
+  /**
+   * Converts a Unicode `string` to an array.
+   *
+   * @private
+   * @param {string} string The string to convert.
+   * @returns {Array} Returns the converted array.
+   */
+  function unicodeToArray(string) {
+    return string.match(reUnicode) || [];
+  }
+
+  /**
+   * Splits a Unicode `string` into an array of its words.
+   *
+   * @private
+   * @param {string} The string to inspect.
+   * @returns {Array} Returns the words of `string`.
+   */
+  function unicodeWords(string) {
+    return string.match(reUnicodeWord) || [];
+  }
+
+  /*--------------------------------------------------------------------------*/
+
+  /**
+   * Create a new pristine `lodash` function using the `context` object.
+   *
+   * @static
+   * @memberOf _
+   * @since 1.1.0
+   * @category Util
+   * @param {Object} [context=root] The context object.
+   * @returns {Function} Returns a new `lodash` function.
+   * @example
+   *
+   * _.mixin({ 'foo': _.constant('foo') });
+   *
+   * var lodash = _.runInContext();
+   * lodash.mixin({ 'bar': lodash.constant('bar') });
+   *
+   * _.isFunction(_.foo);
+   * // => true
+   * _.isFunction(_.bar);
+   * // => false
+   *
+   * lodash.isFunction(lodash.foo);
+   * // => false
+   * lodash.isFunction(lodash.bar);
+   * // => true
+   *
+   * // Create a suped-up `defer` in Node.js.
+   * var defer = _.runInContext({ 'setTimeout': setImmediate }).defer;
+   */
+  var runInContext = (function runInContext(context) {
+    context = context == null ? root : _.defaults(root.Object(), context, _.pick(root, contextProps));
+
+    /** Built-in constructor references. */
+    var Array = context.Array,
+        Date = context.Date,
+        Error = context.Error,
+        Function = context.Function,
+        Math = context.Math,
+        Object = context.Object,
+        RegExp = context.RegExp,
+        String = context.String,
+        TypeError = context.TypeError;
+
+    /** Used for built-in method references. */
+    var arrayProto = Array.prototype,
+        funcProto = Function.prototype,
+        objectProto = Object.prototype;
+
+    /** Used to detect overreaching core-js shims. */
+    var coreJsData = context['__core-js_shared__'];
+
+    /** Used to resolve the decompiled source of functions. */
+    var funcToString = funcProto.toString;
+
+    /** Used to check objects for own properties. */
+    var hasOwnProperty = objectProto.hasOwnProperty;
+
+    /** Used to generate unique IDs. */
+    var idCounter = 0;
+
+    /** Used to detect methods masquerading as native. */
+    var maskSrcKey = (function() {
+      var uid = /[^.]+$/.exec(coreJsData && coreJsData.keys && coreJsData.keys.IE_PROTO || '');
+      return uid ? ('Symbol(src)_1.' + uid) : '';
+    }());
+
+    /**
+     * Used to resolve the
+     * [`toStringTag`](http://ecma-international.org/ecma-262/7.0/#sec-object.prototype.tostring)
+     * of values.
+     */
+    var nativeObjectToString = objectProto.toString;
+
+    /** Used to infer the `Object` constructor. */
+    var objectCtorString = funcToString.call(Object);
+
+    /** Used to restore the original `_` reference in `_.noConflict`. */
+    var oldDash = root._;
+
+    /** Used to detect if a method is native. */
+    var reIsNative = RegExp('^' +
+      funcToString.call(hasOwnProperty).replace(reRegExpChar, '\\$&')
+      .replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g, '$1.*?') + '$'
+    );
+
+    /** Built-in value references. */
+    var Buffer = moduleExports ? context.Buffer : undefined,
+        Symbol = context.Symbol,
+        Uint8Array = context.Uint8Array,
+        allocUnsafe = Buffer ? Buffer.allocUnsafe : undefined,
+        getPrototype = overArg(Object.getPrototypeOf, Object),
+        objectCreate = Object.create,
+        propertyIsEnumerable = objectProto.propertyIsEnumerable,
+        splice = arrayProto.splice,
+        spreadableSymbol = Symbol ? Symbol.isConcatSpreadable : undefined,
+        symIterator = Symbol ? Symbol.iterator : undefined,
+        symToStringTag = Symbol ? Symbol.toStringTag : undefined;
+
+    var defineProperty = (function() {
+      try {
+        var func = getNative(Object, 'defineProperty');
+        func({}, '', {});
+        return func;
+      } catch (e) {}
+    }());
+
+    /** Mocked built-ins. */
+    var ctxClearTimeout = context.clearTimeout !== root.clearTimeout && context.clearTimeout,
+        ctxNow = Date && Date.now !== root.Date.now && Date.now,
+        ctxSetTimeout = context.setTimeout !== root.setTimeout && context.setTimeout;
+
+    /* Built-in method references for those with the same name as other `lodash` methods. */
+    var nativeCeil = Math.ceil,
+        nativeFloor = Math.floor,
+        nativeGetSymbols = Object.getOwnPropertySymbols,
+        nativeIsBuffer = Buffer ? Buffer.isBuffer : undefined,
+        nativeIsFinite = context.isFinite,
+        nativeJoin = arrayProto.join,
+        nativeKeys = overArg(Object.keys, Object),
+        nativeMax = Math.max,
+        nativeMin = Math.min,
+        nativeNow = Date.now,
+        nativeParseInt = context.parseInt,
+        nativeRandom = Math.random,
+        nativeReverse = arrayProto.reverse;
+
+    /* Built-in method references that are verified to be native. */
+    var DataView = getNative(context, 'DataView'),
+        Map = getNative(context, 'Map'),
+        Promise = getNative(context, 'Promise'),
+        Set = getNative(context, 'Set'),
+        WeakMap = getNative(context, 'WeakMap'),
+        nativeCreate = getNative(Object, 'create');
+
+    /** Used to store function metadata. */
+    var metaMap = WeakMap && new WeakMap;
+
+    /** Used to lookup unminified function names. */
+    var realNames = {};
+
+    /** Used to detect maps, sets, and weakmaps. */
+    var dataViewCtorString = toSource(DataView),
+        mapCtorString = toSource(Map),
+        promiseCtorString = toSource(Promise),
+        setCtorString = toSource(Set),
+        weakMapCtorString = toSource(WeakMap);
+
+    /** Used to convert symbols to primitives and strings. */
+    var symbolProto = Symbol ? Symbol.prototype : undefined,
+        symbolValueOf = symbolProto ? symbolProto.valueOf : undefined,
+        symbolToString = symbolProto ? symbolProto.toString : undefined;
+
+    /*------------------------------------------------------------------------*/
+
+    /**
+     * Creates a `lodash` object which wraps `value` to enable implicit method
+     * chain sequences. Methods that operate on and return arrays, collections,
+     * and functions can be chained together. Methods that retrieve a single value
+     * or may return a primitive value will automatically end the chain sequence
+     * and return the unwrapped value. Otherwise, the value must be unwrapped
+     * with `_#value`.
+     *
+     * Explicit chain sequences, which must be unwrapped with `_#value`, may be
+     * enabled using `_.chain`.
+     *
+     * The execution of chained methods is lazy, that is, it's deferred until
+     * `_#value` is implicitly or explicitly called.
+     *
+     * Lazy evaluation allows several methods to support shortcut fusion.
+     * Shortcut fusion is an optimization to merge iteratee calls; this avoids
+     * the creation of intermediate arrays and can greatly reduce the number of
+     * iteratee executions. Sections of a chain sequence qualify for shortcut
+     * fusion if the section is applied to an array and iteratees accept only
+     * one argument. The heuristic for whether a section qualifies for shortcut
+     * fusion is subject to change.
+     *
+     * Chaining is supported in custom builds as long as the `_#value` method is
+     * directly or indirectly included in the build.
+     *
+     * In addition to lodash methods, wrappers have `Array` and `String` methods.
+     *
+     * The wrapper `Array` methods are:
+     * `concat`, `join`, `pop`, `push`, `shift`, `sort`, `splice`, and `unshift`
+     *
+     * The wrapper `String` methods are:
+     * `replace` and `split`
+     *
+     * The wrapper methods that support shortcut fusion are:
+     * `at`, `compact`, `drop`, `dropRight`, `dropWhile`, `filter`, `find`,
+     * `findLast`, `head`, `initial`, `last`, `map`, `reject`, `reverse`, `slice`,
+     * `tail`, `take`, `takeRight`, `takeRightWhile`, `takeWhile`, and `toArray`
+     *
+     * The chainable wrapper methods are:
+     * `after`, `ary`, `assign`, `assignIn`, `assignInWith`, `assignWith`, `at`,
+     * `before`, `bind`, `bindAll`, `bindKey`, `castArray`, `chain`, `chunk`,
+     * `commit`, `compact`, `concat`, `conforms`, `constant`, `countBy`, `create`,
+     * `curry`, `debounce`, `defaults`, `defaultsDeep`, `defer`, `delay`,
+     * `difference`, `differenceBy`, `differenceWith`, `drop`, `dropRight`,
+     * `dropRightWhile`, `dropWhile`, `extend`, `extendWith`, `fill`, `filter`,
+     * `flatMap`, `flatMapDeep`, `flatMapDepth`, `flatten`, `flattenDeep`,
+     * `flattenDepth`, `flip`, `flow`, `flowRight`, `fromPairs`, `functions`,
+     * `functionsIn`, `groupBy`, `initial`, `intersection`, `intersectionBy`,
+     * `intersectionWith`, `invert`, `invertBy`, `invokeMap`, `iteratee`, `keyBy`,
+     * `keys`, `keysIn`, `map`, `mapKeys`, `mapValues`, `matches`, `matchesProperty`,
+     * `memoize`, `merge`, `mergeWith`, `method`, `methodOf`, `mixin`, `negate`,
+     * `nthArg`, `omit`, `omitBy`, `once`, `orderBy`, `over`, `overArgs`,
+     * `overEvery`, `overSome`, `partial`, `partialRight`, `partition`, `pick`,
+     * `pickBy`, `plant`, `property`, `propertyOf`, `pull`, `pullAll`, `pullAllBy`,
+     * `pullAllWith`, `pullAt`, `push`, `range`, `rangeRight`, `rearg`, `reject`,
+     * `remove`, `rest`, `reverse`, `sampleSize`, `set`, `setWith`, `shuffle`,
+     * `slice`, `sort`, `sortBy`, `splice`, `spread`, `tail`, `take`, `takeRight`,
+     * `takeRightWhile`, `takeWhile`, `tap`, `throttle`, `thru`, `toArray`,
+     * `toPairs`, `toPairsIn`, `toPath`, `toPlainObject`, `transform`, `unary`,
+     * `union`, `unionBy`, `unionWith`, `uniq`, `uniqBy`, `uniqWith`, `unset`,
+     * `unshift`, `unzip`, `unzipWith`, `update`, `updateWith`, `values`,
+     * `valuesIn`, `without`, `wrap`, `xor`, `xorBy`, `xorWith`, `zip`,
+     * `zipObject`, `zipObjectDeep`, and `zipWith`
+     *
+     * The wrapper methods that are **not** chainable by default are:
+     * `add`, `attempt`, `camelCase`, `capitalize`, `ceil`, `clamp`, `clone`,
+     * `cloneDeep`, `cloneDeepWith`, `cloneWith`, `conformsTo`, `deburr`,
+     * `defaultTo`, `divide`, `each`, `eachRight`, `endsWith`, `eq`, `escape`,
+     * `escapeRegExp`, `every`, `find`, `findIndex`, `findKey`, `findLast`,
+     * `findLastIndex`, `findLastKey`, `first`, `floor`, `forEach`, `forEachRight`,
+     * `forIn`, `forInRight`, `forOwn`, `forOwnRight`, `get`, `gt`, `gte`, `has`,
+     * `hasIn`, `head`, `identity`, `includes`, `indexOf`, `inRange`, `invoke`,
+     * `isArguments`, `isArray`, `isArrayBuffer`, `isArrayLike`, `isArrayLikeObject`,
+     * `isBoolean`, `isBuffer`, `isDate`, `isElement`, `isEmpty`, `isEqual`,
+     * `isEqualWith`, `isError`, `isFinite`, `isFunction`, `isInteger`, `isLength`,
+     * `isMap`, `isMatch`, `isMatchWith`, `isNaN`, `isNative`, `isNil`, `isNull`,
+     * `isNumber`, `isObject`, `isObjectLike`, `isPlainObject`, `isRegExp`,
+     * `isSafeInteger`, `isSet`, `isString`, `isUndefined`, `isTypedArray`,
+     * `isWeakMap`, `isWeakSet`, `join`, `kebabCase`, `last`, `lastIndexOf`,
+     * `lowerCase`, `lowerFirst`, `lt`, `lte`, `max`, `maxBy`, `mean`, `meanBy`,
+     * `min`, `minBy`, `multiply`, `noConflict`, `noop`, `now`, `nth`, `pad`,
+     * `padEnd`, `padStart`, `parseInt`, `pop`, `random`, `reduce`, `reduceRight`,
+     * `repeat`, `result`, `round`, `runInContext`, `sample`, `shift`, `size`,
+     * `snakeCase`, `some`, `sortedIndex`, `sortedIndexBy`, `sortedLastIndex`,
+     * `sortedLastIndexBy`, `startCase`, `startsWith`, `stubArray`, `stubFalse`,
+     * `stubObject`, `stubString`, `stubTrue`, `subtract`, `sum`, `sumBy`,
+     * `template`, `times`, `toFinite`, `toInteger`, `toJSON`, `toLength`,
+     * `toLower`, `toNumber`, `toSafeInteger`, `toString`, `toUpper`, `trim`,
+     * `trimEnd`, `trimStart`, `truncate`, `unescape`, `uniqueId`, `upperCase`,
+     * `upperFirst`, `value`, and `words`
+     *
+     * @name _
+     * @constructor
+     * @category Seq
+     * @param {*} value The value to wrap in a `lodash` instance.
+     * @returns {Object} Returns the new `lodash` wrapper instance.
+     * @example
+     *
+     * function square(n) {
+     *   return n * n;
+     * }
+     *
+     * var wrapped = _([1, 2, 3]);
+     *
+     * // Returns an unwrapped value.
+     * wrapped.reduce(_.add);
+     * // => 6
+     *
+     * // Returns a wrapped value.
+     * var squares = wrapped.map(square);
+     *
+     * _.isArray(squares);
+     * // => false
+     *
+     * _.isArray(squares.value());
+     * // => true
+     */
+    function lodash(value) {
+      if (isObjectLike(value) && !isArray(value) && !(value instanceof LazyWrapper)) {
+        if (value instanceof LodashWrapper) {
+          return value;
+        }
+        if (hasOwnProperty.call(value, '__wrapped__')) {
+          return wrapperClone(value);
+        }
+      }
+      return new LodashWrapper(value);
+    }
+
+    /**
+     * The base implementation of `_.create` without support for assigning
+     * properties to the created object.
+     *
+     * @private
+     * @param {Object} proto The object to inherit from.
+     * @returns {Object} Returns the new object.
+     */
+    var baseCreate = (function() {
+      function object() {}
+      return function(proto) {
+        if (!isObject(proto)) {
+          return {};
+        }
+        if (objectCreate) {
+          return objectCreate(proto);
+        }
+        object.prototype = proto;
+        var result = new object;
+        object.prototype = undefined;
+        return result;
+      };
+    }());
+
+    /**
+     * The function whose prototype chain sequence wrappers inherit from.
+     *
+     * @private
+     */
+    function baseLodash() {
+      // No operation performed.
+    }
+
+    /**
+     * The base constructor for creating `lodash` wrapper objects.
+     *
+     * @private
+     * @param {*} value The value to wrap.
+     * @param {boolean} [chainAll] Enable explicit method chain sequences.
+     */
+    function LodashWrapper(value, chainAll) {
+      this.__wrapped__ = value;
+      this.__actions__ = [];
+      this.__chain__ = !!chainAll;
+      this.__index__ = 0;
+      this.__values__ = undefined;
+    }
+
+    /**
+     * By default, the template delimiters used by lodash are like those in
+     * embedded Ruby (ERB) as well as ES2015 template strings. Change the
+     * following template settings to use alternative delimiters.
+     *
+     * @static
+     * @memberOf _
+     * @type {Object}
+     */
+    lodash.templateSettings = {
+
+      /**
+       * Used to detect `data` property values to be HTML-escaped.
+       *
+       * @memberOf _.templateSettings
+       * @type {RegExp}
+       */
+      'escape': reEscape,
+
+      /**
+       * Used to detect code to be evaluated.
+       *
+       * @memberOf _.templateSettings
+       * @type {RegExp}
+       */
+      'evaluate': reEvaluate,
+
+      /**
+       * Used to detect `data` property values to inject.
+       *
+       * @memberOf _.templateSettings
+       * @type {RegExp}
+       */
+      'interpolate': reInterpolate,
+
+      /**
+       * Used to reference the data object in the template text.
+       *
+       * @memberOf _.templateSettings
+       * @type {string}
+       */
+      'variable': '',
+
+      /**
+       * Used to import variables into the compiled template.
+       *
+       * @memberOf _.templateSettings
+       * @type {Object}
+       */
+      'imports': {
+
+        /**
+         * A reference to the `lodash` function.
+         *
+         * @memberOf _.templateSettings.imports
+         * @type {Function}
+         */
+        '_': lodash
+      }
+    };
+
+    // Ensure wrappers are instances of `baseLodash`.
+    lodash.prototype = baseLodash.prototype;
+    lodash.prototype.constructor = lodash;
+
+    LodashWrapper.prototype = baseCreate(baseLodash.prototype);
+    LodashWrapper.prototype.constructor = LodashWrapper;
+
+    /*------------------------------------------------------------------------*/
+
+    /**
+     * Creates a lazy wrapper object which wraps `value` to enable lazy evaluation.
+     *
+     * @private
+     * @constructor
+     * @param {*} value The value to wrap.
+     */
+    function LazyWrapper(value) {
+      this.__wrapped__ = value;
+      this.__actions__ = [];
+      this.__dir__ = 1;
+      this.__filtered__ = false;
+      this.__iteratees__ = [];
+      this.__takeCount__ = MAX_ARRAY_LENGTH;
+      this.__views__ = [];
+    }
+
+    /**
+     * Creates a clone of the lazy wrapper object.
+     *
+     * @private
+     * @name clone
+     * @memberOf LazyWrapper
+     * @returns {Object} Returns the cloned `LazyWrapper` object.
+     */
+    function lazyClone() {
+      var result = new LazyWrapper(this.__wrapped__);
+      result.__actions__ = copyArray(this.__actions__);
+      result.__dir__ = this.__dir__;
+      result.__filtered__ = this.__filtered__;
+      result.__iteratees__ = copyArray(this.__iteratees__);
+      result.__takeCount__ = this.__takeCount__;
+      result.__views__ = copyArray(this.__views__);
+      return result;
+    }
+
+    /**
+     * Reverses the direction of lazy iteration.
+     *
+     * @private
+     * @name reverse
+     * @memberOf LazyWrapper
+     * @returns {Object} Returns the new reversed `LazyWrapper` object.
+     */
+    function lazyReverse() {
+      if (this.__filtered__) {
+        var result = new LazyWrapper(this);
+        result.__dir__ = -1;
+        result.__filtered__ = true;
+      } else {
+        result = this.clone();
+        result.__dir__ *= -1;
+      }
+      return result;
+    }
+
+    /**
+     * Extracts the unwrapped value from its lazy wrapper.
+     *
+     * @private
+     * @name value
+     * @memberOf LazyWrapper
+     * @returns {*} Returns the unwrapped value.
+     */
+    function lazyValue() {
+      var array = this.__wrapped__.value(),
+          dir = this.__dir__,
+          isArr = isArray(array),
+          isRight = dir < 0,
+          arrLength = isArr ? array.length : 0,
+          view = getView(0, arrLength, this.__views__),
+          start = view.start,
+          end = view.end,
+          length = end - start,
+          index = isRight ? end : (start - 1),
+          iteratees = this.__iteratees__,
+          iterLength = iteratees.length,
+          resIndex = 0,
+          takeCount = nativeMin(length, this.__takeCount__);
+
+      if (!isArr || (!isRight && arrLength == length && takeCount == length)) {
+        return baseWrapperValue(array, this.__actions__);
+      }
+      var result = [];
+
+      outer:
+      while (length-- && resIndex < takeCount) {
+        index += dir;
+
+        var iterIndex = -1,
+            value = array[index];
+
+        while (++iterIndex < iterLength) {
+          var data = iteratees[iterIndex],
+              iteratee = data.iteratee,
+              type = data.type,
+              computed = iteratee(value);
+
+          if (type == LAZY_MAP_FLAG) {
+            value = computed;
+          } else if (!computed) {
+            if (type == LAZY_FILTER_FLAG) {
+              continue outer;
+            } else {
+              break outer;
+            }
+          }
+        }
+        result[resIndex++] = value;
+      }
+      return result;
+    }
+
+    // Ensure `LazyWrapper` is an instance of `baseLodash`.
+    LazyWrapper.prototype = baseCreate(baseLodash.prototype);
+    LazyWrapper.prototype.constructor = LazyWrapper;
+
+    /*------------------------------------------------------------------------*/
+
+    /**
+     * Creates a hash object.
+     *
+     * @private
+     * @constructor
+     * @param {Array} [entries] The key-value pairs to cache.
+     */
+    function Hash(entries) {
+      var index = -1,
+          length = entries == null ? 0 : entries.length;
+
+      this.clear();
+      while (++index < length) {
+        var entry = entries[index];
+        this.set(entry[0], entry[1]);
+      }
+    }
+
+    /**
+     * Removes all key-value entries from the hash.
+     *
+     * @private
+     * @name clear
+     * @memberOf Hash
+     */
+    function hashClear() {
+      this.__data__ = nativeCreate ? nativeCreate(null) : {};
+      this.size = 0;
+    }
+
+    /**
+     * Removes `key` and its value from the hash.
+     *
+     * @private
+     * @name delete
+     * @memberOf Hash
+     * @param {Object} hash The hash to modify.
+     * @param {string} key The key of the value to remove.
+     * @returns {boolean} Returns `true` if the entry was removed, else `false`.
+     */
+    function hashDelete(key) {
+      var result = this.has(key) && delete this.__data__[key];
+      this.size -= result ? 1 : 0;
+      return result;
+    }
+
+    /**
+     * Gets the hash value for `key`.
+     *
+     * @private
+     * @name get
+     * @memberOf Hash
+     * @param {string} key The key of the value to get.
+     * @returns {*} Returns the entry value.
+     */
+    function hashGet(key) {
+      var data = this.__data__;
+      if (nativeCreate) {
+        var result = data[key];
+        return result === HASH_UNDEFINED ? undefined : result;
+      }
+      return hasOwnProperty.call(data, key) ? data[key] : undefined;
+    }
+
+    /**
+     * Checks if a hash value for `key` exists.
+     *
+     * @private
+     * @name has
+     * @memberOf Hash
+     * @param {string} key The key of the entry to check.
+     * @returns {boolean} Returns `true` if an entry for `key` exists, else `false`.
+     */
+    function hashHas(key) {
+      var data = this.__data__;
+      return nativeCreate ? (data[key] !== undefined) : hasOwnProperty.call(data, key);
+    }
+
+    /**
+     * Sets the hash `key` to `value`.
+     *
+     * @private
+     * @name set
+     * @memberOf Hash
+     * @param {string} key The key of the value to set.
+     * @param {*} value The value to set.
+     * @returns {Object} Returns the hash instance.
+     */
+    function hashSet(key, value) {
+      var data = this.__data__;
+      this.size += this.has(key) ? 0 : 1;
+      data[key] = (nativeCreate && value === undefined) ? HASH_UNDEFINED : value;
+      return this;
+    }
+
+    // Add methods to `Hash`.
+    Hash.prototype.clear = hashClear;
+    Hash.prototype['delete'] = hashDelete;
+    Hash.prototype.get = hashGet;
+    Hash.prototype.has = hashHas;
+    Hash.prototype.set = hashSet;
+
+    /*------------------------------------------------------------------------*/
+
+    /**
+     * Creates an list cache object.
+     *
+     * @private
+     * @constructor
+     * @param {Array} [entries] The key-value pairs to cache.
+     */
+    function ListCache(entries) {
+      var index = -1,
+          length = entries == null ? 0 : entries.length;
+
+      this.clear();
+      while (++index < length) {
+        var entry = entries[index];
+        this.set(entry[0], entry[1]);
+      }
+    }
+
+    /**
+     * Removes all key-value entries from the list cache.
+     *
+     * @private
+     * @name clear
+     * @memberOf ListCache
+     */
+    function listCacheClear() {
+      this.__data__ = [];
+      this.size = 0;
+    }
+
+    /**
+     * Removes `key` and its value from the list cache.
+     *
+     * @private
+     * @name delete
+     * @memberOf ListCache
+     * @param {string} key The key of the value to remove.
+     * @returns {boolean} Returns `true` if the entry was removed, else `false`.
+     */
+    function listCacheDelete(key) {
+      var data = this.__data__,
+          index = assocIndexOf(data, key);
+
+      if (index < 0) {
+        return false;
+      }
+      var lastIndex = data.length - 1;
+      if (index == lastIndex) {
+        data.pop();
+      } else {
+        splice.call(data, index, 1);
+      }
+      --this.size;
+      return true;
+    }
+
+    /**
+     * Gets the list cache value for `key`.
+     *
+     * @private
+     * @name get
+     * @memberOf ListCache
+     * @param {string} key The key of the value to get.
+     * @returns {*} Returns the entry value.
+     */
+    function listCacheGet(key) {
+      var data = this.__data__,
+          index = assocIndexOf(data, key);
+
+      return index < 0 ? undefined : data[index][1];
+    }
+
+    /**
+     * Checks if a list cache value for `key` exists.
+     *
+     * @private
+     * @name has
+     * @memberOf ListCache
+     * @param {string} key The key of the entry to check.
+     * @returns {boolean} Returns `true` if an entry for `key` exists, else `false`.
+     */
+    function listCacheHas(key) {
+      return assocIndexOf(this.__data__, key) > -1;
+    }
+
+    /**
+     * Sets the list cache `key` to `value`.
+     *
+     * @private
+     * @name set
+     * @memberOf ListCache
+     * @param {string} key The key of the value to set.
+     * @param {*} value The value to set.
+     * @returns {Object} Returns the list cache instance.
+     */
+    function listCacheSet(key, value) {
+      var data = this.__data__,
+          index = assocIndexOf(data, key);
+
+      if (index < 0) {
+        ++this.size;
+        data.push([key, value]);
+      } else {
+        data[index][1] = value;
+      }
+      return this;
+    }
+
+    // Add methods to `ListCache`.
+    ListCache.prototype.clear = listCacheClear;
+    ListCache.prototype['delete'] = listCacheDelete;
+    ListCache.prototype.get = listCacheGet;
+    ListCache.prototype.has = listCacheHas;
+    ListCache.prototype.set = listCacheSet;
+
+    /*------------------------------------------------------------------------*/
+
+    /**
+     * Creates a map cache object to store key-value pairs.
+     *
+     * @private
+     * @constructor
+     * @param {Array} [entries] The key-value pairs to cache.
+     */
+    function MapCache(entries) {
+      var index = -1,
+          length = entries == null ? 0 : entries.length;
+
+      this.clear();
+      while (++index < length) {
+        var entry = entries[index];
+        this.set(entry[0], entry[1]);
+      }
+    }
+
+    /**
+     * Removes all key-value entries from the map.
+     *
+     * @private
+     * @name clear
+     * @memberOf MapCache
+     */
+    function mapCacheClear() {
+      this.size = 0;
+      this.__data__ = {
+        'hash': new Hash,
+        'map': new (Map || ListCache),
+        'string': new Hash
+      };
+    }
+
+    /**
+     * Removes `key` and its value from the map.
+     *
+     * @private
+     * @name delete
+     * @memberOf MapCache
+     * @param {string} key The key of the value to remove.
+     * @returns {boolean} Returns `true` if the entry was removed, else `false`.
+     */
+    function mapCacheDelete(key) {
+      var result = getMapData(this, key)['delete'](key);
+      this.size -= result ? 1 : 0;
+      return result;
+    }
+
+    /**
+     * Gets the map value for `key`.
+     *
+     * @private
+     * @name get
+     * @memberOf MapCache
+     * @param {string} key The key of the value to get.
+     * @returns {*} Returns the entry value.
+     */
+    function mapCacheGet(key) {
+      return getMapData(this, key).get(key);
+    }
+
+    /**
+     * Checks if a map value for `key` exists.
+     *
+     * @private
+     * @name has
+     * @memberOf MapCache
+     * @param {string} key The key of the entry to check.
+     * @returns {boolean} Returns `true` if an entry for `key` exists, else `false`.
+     */
+    function mapCacheHas(key) {
+      return getMapData(this, key).has(key);
+    }
+
+    /**
+     * Sets the map `key` to `value`.
+     *
+     * @private
+     * @name set
+     * @memberOf MapCache
+     * @param {string} key The key of the value to set.
+     * @param {*} value The value to set.
+     * @returns {Object} Returns the map cache instance.
+     */
+    function mapCacheSet(key, value) {
+      var data = getMapData(this, key),
+          size = data.size;
+
+      data.set(key, value);
+      this.size += data.size == size ? 0 : 1;
+      return this;
+    }
+
+    // Add methods to `MapCache`.
+    MapCache.prototype.clear = mapCacheClear;
+    MapCache.prototype['delete'] = mapCacheDelete;
+    MapCache.prototype.get = mapCacheGet;
+    MapCache.prototype.has = mapCacheHas;
+    MapCache.prototype.set = mapCacheSet;
+
+    /*------------------------------------------------------------------------*/
+
+    /**
+     *
+     * Creates an array cache object to store unique values.
+     *
+     * @private
+     * @constructor
+     * @param {Array} [values] The values to cache.
+     */
+    function SetCache(values) {
+      var index = -1,
+          length = values == null ? 0 : values.length;
+
+      this.__data__ = new MapCache;
+      while (++index < length) {
+        this.add(values[index]);
+      }
+    }
+
+    /**
+     * Adds `value` to the array cache.
+     *
+     * @private
+     * @name add
+     * @memberOf SetCache
+     * @alias push
+     * @param {*} value The value to cache.
+     * @returns {Object} Returns the cache instance.
+     */
+    function setCacheAdd(value) {
+      this.__data__.set(value, HASH_UNDEFINED);
+      return this;
+    }
+
+    /**
+     * Checks if `value` is in the array cache.
+     *
+     * @private
+     * @name has
+     * @memberOf SetCache
+     * @param {*} value The value to search for.
+     * @returns {number} Returns `true` if `value` is found, else `false`.
+     */
+    function setCacheHas(value) {
+      return this.__data__.has(value);
+    }
+
+    // Add methods to `SetCache`.
+    SetCache.prototype.add = SetCache.prototype.push = setCacheAdd;
+    SetCache.prototype.has = setCacheHas;
+
+    /*------------------------------------------------------------------------*/
+
+    /**
+     * Creates a stack cache object to store key-value pairs.
+     *
+     * @private
+     * @constructor
+     * @param {Array} [entries] The key-value pairs to cache.
+     */
+    function Stack(entries) {
+      var data = this.__data__ = new ListCache(entries);
+      this.size = data.size;
+    }
+
+    /**
+     * Removes all key-value entries from the stack.
+     *
+     * @private
+     * @name clear
+     * @memberOf Stack
+     */
+    function stackClear() {
+      this.__data__ = new ListCache;
+      this.size = 0;
+    }
+
+    /**
+     * Removes `key` and its value from the stack.
+     *
+     * @private
+     * @name delete
+     * @memberOf Stack
+     * @param {string} key The key of the value to remove.
+     * @returns {boolean} Returns `true` if the entry was removed, else `false`.
+     */
+    function stackDelete(key) {
+      var data = this.__data__,
+          result = data['delete'](key);
+
+      this.size = data.size;
+      return result;
+    }
+
+    /**
+     * Gets the stack value for `key`.
+     *
+     * @private
+     * @name get
+     * @memberOf Stack
+     * @param {string} key The key of the value to get.
+     * @returns {*} Returns the entry value.
+     */
+    function stackGet(key) {
+      return this.__data__.get(key);
+    }
+
+    /**
+     * Checks if a stack value for `key` exists.
+     *
+     * @private
+     * @name has
+     * @memberOf Stack
+     * @param {string} key The key of the entry to check.
+     * @returns {boolean} Returns `true` if an entry for `key` exists, else `false`.
+     */
+    function stackHas(key) {
+      return this.__data__.has(key);
+    }
+
+    /**
+     * Sets the stack `key` to `value`.
+     *
+     * @private
+     * @name set
+     * @memberOf Stack
+     * @param {string} key The key of the value to set.
+     * @param {*} value The value to set.
+     * @returns {Object} Returns the stack cache instance.
+     */
+    function stackSet(key, value) {
+      var data = this.__data__;
+      if (data instanceof ListCache) {
+        var pairs = data.__data__;
+        if (!Map || (pairs.length < LARGE_ARRAY_SIZE - 1)) {
+          pairs.push([key, value]);
+          this.size = ++data.size;
+          return this;
+        }
+        data = this.__data__ = new MapCache(pairs);
+      }
+      data.set(key, value);
+      this.size = data.size;
+      return this;
+    }
+
+    // Add methods to `Stack`.
+    Stack.prototype.clear = stackClear;
+    Stack.prototype['delete'] = stackDelete;
+    Stack.prototype.get = stackGet;
+    Stack.prototype.has = stackHas;
+    Stack.prototype.set = stackSet;
+
+    /*------------------------------------------------------------------------*/
+
+    /**
+     * Creates an array of the enumerable property names of the array-like `value`.
+     *
+     * @private
+     * @param {*} value The value to query.
+     * @param {boolean} inherited Specify returning inherited property names.
+     * @returns {Array} Returns the array of property names.
+     */
+    function arrayLikeKeys(value, inherited) {
+      var isArr = isArray(value),
+          isArg = !isArr && isArguments(value),
+          isBuff = !isArr && !isArg && isBuffer(value),
+          isType = !isArr && !isArg && !isBuff && isTypedArray(value),
+          skipIndexes = isArr || isArg || isBuff || isType,
+          result = skipIndexes ? baseTimes(value.length, String) : [],
+          length = result.length;
+
+      for (var key in value) {
+        if ((inherited || hasOwnProperty.call(value, key)) &&
+            !(skipIndexes && (
+               // Safari 9 has enumerable `arguments.length` in strict mode.
+               key == 'length' ||
+               // Node.js 0.10 has enumerable non-index properties on buffers.
+               (isBuff && (key == 'offset' || key == 'parent')) ||
+               // PhantomJS 2 has enumerable non-index properties on typed arrays.
+               (isType && (key == 'buffer' || key == 'byteLength' || key == 'byteOffset')) ||
+               // Skip index properties.
+               isIndex(key, length)
+            ))) {
+          result.push(key);
+        }
+      }
+      return result;
+    }
+
+    /**
+     * A specialized version of `_.sample` for arrays.
+     *
+     * @private
+     * @param {Array} array The array to sample.
+     * @returns {*} Returns the random element.
+     */
+    function arraySample(array) {
+      var length = array.length;
+      return length ? array[baseRandom(0, length - 1)] : undefined;
+    }
+
+    /**
+     * A specialized version of `_.sampleSize` for arrays.
+     *
+     * @private
+     * @param {Array} array The array to sample.
+     * @param {number} n The number of elements to sample.
+     * @returns {Array} Returns the random elements.
+     */
+    function arraySampleSize(array, n) {
+      return shuffleSelf(copyArray(array), baseClamp(n, 0, array.length));
+    }
+
+    /**
+     * A specialized version of `_.shuffle` for arrays.
+     *
+     * @private
+     * @param {Array} array The array to shuffle.
+     * @returns {Array} Returns the new shuffled array.
+     */
+    function arrayShuffle(array) {
+      return shuffleSelf(copyArray(array));
+    }
+
+    /**
+     * This function is like `assignValue` except that it doesn't assign
+     * `undefined` values.
+     *
+     * @private
+     * @param {Object} object The object to modify.
+     * @param {string} key The key of the property to assign.
+     * @param {*} value The value to assign.
+     */
+    function assignMergeValue(object, key, value) {
+      if ((value !== undefined && !eq(object[key], value)) ||
+          (value === undefined && !(key in object))) {
+        baseAssignValue(object, key, value);
+      }
+    }
+
+    /**
+     * Assigns `value` to `key` of `object` if the existing value is not equivalent
+     * using [`SameValueZero`](http://ecma-international.org/ecma-262/7.0/#sec-samevaluezero)
+     * for equality comparisons.
+     *
+     * @private
+     * @param {Object} object The object to modify.
+     * @param {string} key The key of the property to assign.
+     * @param {*} value The value to assign.
+     */
+    function assignValue(object, key, value) {
+      var objValue = object[key];
+      if (!(hasOwnProperty.call(object, key) && eq(objValue, value)) ||
+          (value === undefined && !(key in object))) {
+        baseAssignValue(object, key, value);
+      }
+    }
+
+    /**
+     * Gets the index at which the `key` is found in `array` of key-value pairs.
+     *
+     * @private
+     * @param {Array} array The array to inspect.
+     * @param {*} key The key to search for.
+     * @returns {number} Returns the index of the matched value, else `-1`.
+     */
+    function assocIndexOf(array, key) {
+      var length = array.length;
+      while (length--) {
+        if (eq(array[length][0], key)) {
+          return length;
+        }
+      }
+      return -1;
+    }
+
+    /**
+     * Aggregates elements of `collection` on `accumulator` with keys transformed
+     * by `iteratee` and values set by `setter`.
+     *
+     * @private
+     * @param {Array|Object} collection The collection to iterate over.
+     * @param {Function} setter The function to set `accumulator` values.
+     * @param {Function} iteratee The iteratee to transform keys.
+     * @param {Object} accumulator The initial aggregated object.
+     * @returns {Function} Returns `accumulator`.
+     */
+    function baseAggregator(collection, setter, iteratee, accumulator) {
+      baseEach(collection, function(value, key, collection) {
+        setter(accumulator, value, iteratee(value), collection);
+      });
+      return accumulator;
+    }
+
+    /**
+     * The base implementation of `_.assign` without support for multiple sources
+     * or `customizer` functions.
+     *
+     * @private
+     * @param {Object} object The destination object.
+     * @param {Object} source The source object.
+     * @returns {Object} Returns `object`.
+     */
+    function baseAssign(object, source) {
+      return object && copyObject(source, keys(source), object);
+    }
+
+    /**
+     * The base implementation of `_.assignIn` without support for multiple sources
+     * or `customizer` functions.
+     *
+     * @private
+     * @param {Object} object The destination object.
+     * @param {Object} source The source object.
+     * @returns {Object} Returns `object`.
+     */
+    function baseAssignIn(object, source) {
+      return object && copyObject(source, keysIn(source), object);
+    }
+
+    /**
+     * The base implementation of `assignValue` and `assignMergeValue` without
+     * value checks.
+     *
+     * @private
+     * @param {Object} object The object to modify.
+     * @param {string} key The key of the property to assign.
+     * @param {*} value The value to assign.
+     */
+    function baseAssignValue(object, key, value) {
+      if (key == '__proto__' && defineProperty) {
+        defineProperty(object, key, {
+          'configurable': true,
+          'enumerable': true,
+          'value': value,
+          'writable': true
+        });
+      } else {
+        object[key] = value;
+      }
+    }
+
+    /**
+     * The base implementation of `_.at` without support for individual paths.
+     *
+     * @private
+     * @param {Object} object The object to iterate over.
+     * @param {string[]} paths The property paths to pick.
+     * @returns {Array} Returns the picked elements.
+     */
+    function baseAt(object, paths) {
+      var index = -1,
+          length = paths.length,
+          result = Array(length),
+          skip = object == null;
+
+      while (++index < length) {
+        result[index] = skip ? undefined : get(object, paths[index]);
+      }
+      return result;
+    }
+
+    /**
+     * The base implementation of `_.clamp` which doesn't coerce arguments.
+     *
+     * @private
+     * @param {number} number The number to clamp.
+     * @param {number} [lower] The lower bound.
+     * @param {number} upper The upper bound.
+     * @returns {number} Returns the clamped number.
+     */
+    function baseClamp(number, lower, upper) {
+      if (number === number) {
+        if (upper !== undefined) {
+          number = number <= upper ? number : upper;
+        }
+        if (lower !== undefined) {
+          number = number >= lower ? number : lower;
+        }
+      }
+      return number;
+    }
+
+    /**
+     * The base implementation of `_.clone` and `_.cloneDeep` which tracks
+     * traversed objects.
+     *
+     * @private
+     * @param {*} value The value to clone.
+     * @param {boolean} bitmask The bitmask flags.
+     *  1 - Deep clone
+     *  2 - Flatten inherited properties
+     *  4 - Clone symbols
+     * @param {Function} [customizer] The function to customize cloning.
+     * @param {string} [key] The key of `value`.
+     * @param {Object} [object] The parent object of `value`.
+     * @param {Object} [stack] Tracks traversed objects and their clone counterparts.
+     * @returns {*} Returns the cloned value.
+     */
+    function baseClone(value, bitmask, customizer, key, object, stack) {
+      var result,
+          isDeep = bitmask & CLONE_DEEP_FLAG,
+          isFlat = bitmask & CLONE_FLAT_FLAG,
+          isFull = bitmask & CLONE_SYMBOLS_FLAG;
+
+      if (customizer) {
+        result = object ? customizer(value, key, object, stack) : customizer(value);
+      }
+      if (result !== undefined) {
+        return result;
+      }
+      if (!isObject(value)) {
+        return value;
+      }
+      var isArr = isArray(value);
+      if (isArr) {
+        result = initCloneArray(value);
+        if (!isDeep) {
+          return copyArray(value, result);
+        }
+      } else {
+        var tag = getTag(value),
+            isFunc = tag == funcTag || tag == genTag;
+
+        if (isBuffer(value)) {
+          return cloneBuffer(value, isDeep);
+        }
+        if (tag == objectTag || tag == argsTag || (isFunc && !object)) {
+          result = (isFlat || isFunc) ? {} : initCloneObject(value);
+          if (!isDeep) {
+            return isFlat
+              ? copySymbolsIn(value, baseAssignIn(result, value))
+              : copySymbols(value, baseAssign(result, value));
+          }
+        } else {
+          if (!cloneableTags[tag]) {
+            return object ? value : {};
+          }
+          result = initCloneByTag(value, tag, isDeep);
+        }
+      }
+      // Check for circular references and return its corresponding clone.
+      stack || (stack = new Stack);
+      var stacked = stack.get(value);
+      if (stacked) {
+        return stacked;
+      }
+      stack.set(value, result);
+
+      if (isSet(value)) {
+        value.forEach(function(subValue) {
+          result.add(baseClone(subValue, bitmask, customizer, subValue, value, stack));
+        });
+
+        return result;
+      }
+
+      if (isMap(value)) {
+        value.forEach(function(subValue, key) {
+          result.set(key, baseClone(subValue, bitmask, customizer, key, value, stack));
+        });
+
+        return result;
+      }
+
+      var keysFunc = isFull
+        ? (isFlat ? getAllKeysIn : getAllKeys)
+        : (isFlat ? keysIn : keys);
+
+      var props = isArr ? undefined : keysFunc(value);
+      arrayEach(props || value, function(subValue, key) {
+        if (props) {
+          key = subValue;
+          subValue = value[key];
+        }
+        // Recursively populate clone (susceptible to call stack limits).
+        assignValue(result, key, baseClone(subValue, bitmask, customizer, key, value, stack));
+      });
+      return result;
+    }
+
+    /**
+     * The base implementation of `_.conforms` which doesn't clone `source`.
+     *
+     * @private
+     * @param {Object} source The object of property predicates to conform to.
+     * @returns {Function} Returns the new spec function.
+     */
+    function baseConforms(source) {
+      var props = keys(source);
+      return function(object) {
+        return baseConformsTo(object, source, props);
+      };
+    }
+
+    /**
+     * The base implementation of `_.conformsTo` which accepts `props` to check.
+     *
+     * @private
+     * @param {Object} object The object to inspect.
+     * @param {Object} source The object of property predicates to conform to.
+     * @returns {boolean} Returns `true` if `object` conforms, else `false`.
+     */
+    function baseConformsTo(object, source, props) {
+      var length = props.length;
+      if (object == null) {
+        return !length;
+      }
+      object = Object(object);
+      while (length--) {
+        var key = props[length],
+            predicate = source[key],
+            value = object[key];
+
+        if ((value === undefined && !(key in object)) || !predicate(value)) {
+          return false;
+        }
+      }
+      return true;
+    }
+
+    /**
+     * The base implementation of `_.delay` and `_.defer` which accepts `args`
+     * to provide to `func`.
+     *
+     * @private
+     * @param {Function} func The function to delay.
+     * @param {number} wait The number of milliseconds to delay invocation.
+     * @param {Array} args The arguments to provide to `func`.
+     * @returns {number|Object} Returns the timer id or timeout object.
+     */
+    function baseDelay(func, wait, args) {
+      if (typeof func != 'function') {
+        throw new TypeError(FUNC_ERROR_TEXT);
+      }
+      return setTimeout(function() { func.apply(undefined, args); }, wait);
+    }
+
+    /**
+     * The base implementation of methods like `_.difference` without support
+     * for excluding multiple arrays or iteratee shorthands.
+     *
+     * @private
+     * @param {Array} array The array to inspect.
+     * @param {Array} values The values to exclude.
+     * @param {Function} [iteratee] The iteratee invoked per element.
+     * @param {Function} [comparator] The comparator invoked per element.
+     * @returns {Array} Returns the new array of filtered values.
+     */
+    function baseDifference(array, values, iteratee, comparator) {
+      var index = -1,
+          includes = arrayIncludes,
+          isCommon = true,
+          length = array.length,
+          result = [],
+          valuesLength = values.length;
+
+      if (!length) {
+        return result;
+      }
+      if (iteratee) {
+        values = arrayMap(values, baseUnary(iteratee));
+      }
+      if (comparator) {
+        includes = arrayIncludesWith;
+        isCommon = false;
+      }
+      else if (values.length >= LARGE_ARRAY_SIZE) {
+        includes = cacheHas;
+        isCommon = false;
+        values = new SetCache(values);
+      }
+      outer:
+      while (++index < length) {
+        var value = array[index],
+            computed = iteratee == null ? value : iteratee(value);
+
+        value = (comparator || value !== 0) ? value : 0;
+        if (isCommon && computed === computed) {
+          var valuesIndex = valuesLength;
+          while (valuesIndex--) {
+            if (values[valuesIndex] === computed) {
+              continue outer;
+            }
+          }
+          result.push(value);
+        }
+        else if (!includes(values, computed, comparator)) {
+          result.push(value);
+        }
+      }
+      return result;
+    }
+
+    /**
+     * The base implementation of `_.forEach` without support for iteratee shorthands.
+     *
+     * @private
+     * @param {Array|Object} collection The collection to iterate over.
+     * @param {Function} iteratee The function invoked per iteration.
+     * @returns {Array|Object} Returns `collection`.
+     */
+    var baseEach = createBaseEach(baseForOwn);
+
+    /**
+     * The base implementation of `_.forEachRight` without support for iteratee shorthands.
+     *
+     * @private
+     * @param {Array|Object} collection The collection to iterate over.
+     * @param {Function} iteratee The function invoked per iteration.
+     * @returns {Array|Object} Returns `collection`.
+     */
+    var baseEachRight = createBaseEach(baseForOwnRight, true);
+
+    /**
+     * The base implementation of `_.every` without support for iteratee shorthands.
+     *
+     * @private
+     * @param {Array|Object} collection The collection to iterate over.
+     * @param {Function} predicate The function invoked per iteration.
+     * @returns {boolean} Returns `true` if all elements pass the predicate check,
+     *  else `false`
+     */
+    function baseEvery(collection, predicate) {
+      var result = true;
+      baseEach(collection, function(value, index, collection) {
+        result = !!predicate(value, index, collection);
+        return result;
+      });
+      return result;
+    }
+
+    /**
+     * The base implementation of methods like `_.max` and `_.min` which accepts a
+     * `comparator` to determine the extremum value.
+     *
+     * @private
+     * @param {Array} array The array to iterate over.
+     * @param {Function} iteratee The iteratee invoked per iteration.
+     * @param {Function} comparator The comparator used to compare values.
+     * @returns {*} Returns the extremum value.
+     */
+    function baseExtremum(array, iteratee, comparator) {
+      var index = -1,
+          length = array.length;
+
+      while (++index < length) {
+        var value = array[index],
+            current = iteratee(value);
+
+        if (current != null && (computed === undefined
+              ? (current === current && !isSymbol(current))
+              : comparator(current, computed)
+            )) {
+          var computed = current,
+              result = value;
+        }
+      }
+      return result;
+    }
+
+    /**
+     * The base implementation of `_.fill` without an iteratee call guard.
+     *
+     * @private
+     * @param {Array} array The array to fill.
+     * @param {*} value The value to fill `array` with.
+     * @param {number} [start=0] The start position.
+     * @param {number} [end=array.length] The end position.
+     * @returns {Array} Returns `array`.
+     */
+    function baseFill(array, value, start, end) {
+      var length = array.length;
+
+      start = toInteger(start);
+      if (start < 0) {
+        start = -start > length ? 0 : (length + start);
+      }
+      end = (end === undefined || end > length) ? length : toInteger(end);
+      if (end < 0) {
+        end += length;
+      }
+      end = start > end ? 0 : toLength(end);
+      while (start < end) {
+        array[start++] = value;
+      }
+      return array;
+    }
+
+    /**
+     * The base implementation of `_.filter` without support for iteratee shorthands.
+     *
+     * @private
+     * @param {Array|Object} collection The collection to iterate over.
+     * @param {Function} predicate The function invoked per iteration.
+     * @returns {Array} Returns the new filtered array.
+     */
+    function baseFilter(collection, predicate) {
+      var result = [];
+      baseEach(collection, function(value, index, collection) {
+        if (predicate(value, index, collection)) {
+          result.push(value);
+        }
+      });
+      return result;
+    }
+
+    /**
+     * The base implementation of `_.flatten` with support for restricting flattening.
+     *
+     * @private
+     * @param {Array} array The array to flatten.
+     * @param {number} depth The maximum recursion depth.
+     * @param {boolean} [predicate=isFlattenable] The function invoked per iteration.
+     * @param {boolean} [isStrict] Restrict to values that pass `predicate` checks.
+     * @param {Array} [result=[]] The initial result value.
+     * @returns {Array} Returns the new flattened array.
+     */
+    function baseFlatten(array, depth, predicate, isStrict, result) {
+      var index = -1,
+          length = array.length;
+
+      predicate || (predicate = isFlattenable);
+      result || (result = []);
+
+      while (++index < length) {
+        var value = array[index];
+        if (depth > 0 && predicate(value)) {
+          if (depth > 1) {
+            // Recursively flatten arrays (susceptible to call stack limits).
+            baseFlatten(value, depth - 1, predicate, isStrict, result);
+          } else {
+            arrayPush(result, value);
+          }
+        } else if (!isStrict) {
+          result[result.length] = value;
+        }
+      }
+      return result;
+    }
+
+    /**
+     * The base implementation of `baseForOwn` which iterates over `object`
+     * properties returned by `keysFunc` and invokes `iteratee` for each property.
+     * Iteratee functions may exit iteration early by explicitly returning `false`.
+     *
+     * @private
+     * @param {Object} object The object to iterate over.
+     * @param {Function} iteratee The function invoked per iteration.
+     * @param {Function} keysFunc The function to get the keys of `object`.
+     * @returns {Object} Returns `object`.
+     */
+    var baseFor = createBaseFor();
+
+    /**
+     * This function is like `baseFor` except that it iterates over properties
+     * in the opposite order.
+     *
+     * @private
+     * @param {Object} object The object to iterate over.
+     * @param {Function} iteratee The function invoked per iteration.
+     * @param {Function} keysFunc The function to get the keys of `object`.
+     * @returns {Object} Returns `object`.
+     */
+    var baseForRight = createBaseFor(true);
+
+    /**
+     * The base implementation of `_.forOwn` without support for iteratee shorthands.
+     *
+     * @private
+     * @param {Object} object The object to iterate over.
+     * @param {Function} iteratee The function invoked per iteration.
+     * @returns {Object} Returns `object`.
+     */
+    function baseForOwn(object, iteratee) {
+      return object && baseFor(object, iteratee, keys);
+    }
+
+    /**
+     * The base implementation of `_.forOwnRight` without support for iteratee shorthands.
+     *
+     * @private
+     * @param {Object} object The object to iterate over.
+     * @param {Function} iteratee The function invoked per iteration.
+     * @returns {Object} Returns `object`.
+     */
+    function baseForOwnRight(object, iteratee) {
+      return object && baseForRight(object, iteratee, keys);
+    }
+
+    /**
+     * The base implementation of `_.functions` which creates an array of
+     * `object` function property names filtered from `props`.
+     *
+     * @private
+     * @param {Object} object The object to inspect.
+     * @param {Array} props The property names to filter.
+     * @returns {Array} Returns the function names.
+     */
+    function baseFunctions(object, props) {
+      return arrayFilter(props, function(key) {
+        return isFunction(object[key]);
+      });
+    }
+
+    /**
+     * The base implementation of `_.get` without support for default values.
+     *
+     * @private
+     * @param {Object} object The object to query.
+     * @param {Array|string} path The path of the property to get.
+     * @returns {*} Returns the resolved value.
+     */
+    function baseGet(object, path) {
+      path = castPath(path, object);
+
+      var index = 0,
+          length = path.length;
+
+      while (object != null && index < length) {
+        object = object[toKey(path[index++])];
+      }
+      return (index && index == length) ? object : undefined;
+    }
+
+    /**
+     * The base implementation of `getAllKeys` and `getAllKeysIn` which uses
+     * `keysFunc` and `symbolsFunc` to get the enumerable property names and
+     * symbols of `object`.
+     *
+     * @private
+     * @param {Object} object The object to query.
+     * @param {Function} keysFunc The function to get the keys of `object`.
+     * @param {Function} symbolsFunc The function to get the symbols of `object`.
+     * @returns {Array} Returns the array of property names and symbols.
+     */
+    function baseGetAllKeys(object, keysFunc, symbolsFunc) {
+      var result = keysFunc(object);
+      return isArray(object) ? result : arrayPush(result, symbolsFunc(object));
+    }
+
+    /**
+     * The base implementation of `getTag` without fallbacks for buggy environments.
+     *
+     * @private
+     * @param {*} value The value to query.
+     * @returns {string} Returns the `toStringTag`.
+     */
+    function baseGetTag(value) {
+      if (value == null) {
+        return value === undefined ? undefinedTag : nullTag;
+      }
+      return (symToStringTag && symToStringTag in Object(value))
+        ? getRawTag(value)
+        : objectToString(value);
+    }
+
+    /**
+     * The base implementation of `_.gt` which doesn't coerce arguments.
+     *
+     * @private
+     * @param {*} value The value to compare.
+     * @param {*} other The other value to compare.
+     * @returns {boolean} Returns `true` if `value` is greater than `other`,
+     *  else `false`.
+     */
+    function baseGt(value, other) {
+      return value > other;
+    }
+
+    /**
+     * The base implementation of `_.has` without support for deep paths.
+     *
+     * @private
+     * @param {Object} [object] The object to query.
+     * @param {Array|string} key The key to check.
+     * @returns {boolean} Returns `true` if `key` exists, else `false`.
+     */
+    function baseHas(object, key) {
+      return object != null && hasOwnProperty.call(object, key);
+    }
+
+    /**
+     * The base implementation of `_.hasIn` without support for deep paths.
+     *
+     * @private
+     * @param {Object} [object] The object to query.
+     * @param {Array|string} key The key to check.
+     * @returns {boolean} Returns `true` if `key` exists, else `false`.
+     */
+    function baseHasIn(object, key) {
+      return object != null && key in Object(object);
+    }
+
+    /**
+     * The base implementation of `_.inRange` which doesn't coerce arguments.
+     *
+     * @private
+     * @param {number} number The number to check.
+     * @param {number} start The start of the range.
+     * @param {number} end The end of the range.
+     * @returns {boolean} Returns `true` if `number` is in the range, else `false`.
+     */
+    function baseInRange(number, start, end) {
+      return number >= nativeMin(start, end) && number < nativeMax(start, end);
+    }
+
+    /**
+     * The base implementation of methods like `_.intersection`, without support
+     * for iteratee shorthands, that accepts an array of arrays to inspect.
+     *
+     * @private
+     * @param {Array} arrays The arrays to inspect.
+     * @param {Function} [iteratee] The iteratee invoked per element.
+     * @param {Function} [comparator] The comparator invoked per element.
+     * @returns {Array} Returns the new array of shared values.
+     */
+    function baseIntersection(arrays, iteratee, comparator) {
+      var includes = comparator ? arrayIncludesWith : arrayIncludes,
+          length = arrays[0].length,
+          othLength = arrays.length,
+          othIndex = othLength,
+          caches = Array(othLength),
+          maxLength = Infinity,
+          result = [];
+
+      while (othIndex--) {
+        var array = arrays[othIndex];
+        if (othIndex && iteratee) {
+          array = arrayMap(array, baseUnary(iteratee));
+        }
+        maxLength = nativeMin(array.length, maxLength);
+        caches[othIndex] = !comparator && (iteratee || (length >= 120 && array.length >= 120))
+          ? new SetCache(othIndex && array)
+          : undefined;
+      }
+      array = arrays[0];
+
+      var index = -1,
+          seen = caches[0];
+
+      outer:
+      while (++index < length && result.length < maxLength) {
+        var value = array[index],
+            computed = iteratee ? iteratee(value) : value;
+
+        value = (comparator || value !== 0) ? value : 0;
+        if (!(seen
+              ? cacheHas(seen, computed)
+              : includes(result, computed, comparator)
+            )) {
+          othIndex = othLength;
+          while (--othIndex) {
+            var cache = caches[othIndex];
+            if (!(cache
+                  ? cacheHas(cache, computed)
+                  : includes(arrays[othIndex], computed, comparator))
+                ) {
+              continue outer;
+            }
+          }
+          if (seen) {
+            seen.push(computed);
+          }
+          result.push(value);
+        }
+      }
+      return result;
+    }
+
+    /**
+     * The base implementation of `_.invert` and `_.invertBy` which inverts
+     * `object` with values transformed by `iteratee` and set by `setter`.
+     *
+     * @private
+     * @param {Object} object The object to iterate over.
+     * @param {Function} setter The function to set `accumulator` values.
+     * @param {Function} iteratee The iteratee to transform values.
+     * @param {Object} accumulator The initial inverted object.
+     * @returns {Function} Returns `accumulator`.
+     */
+    function baseInverter(object, setter, iteratee, accumulator) {
+      baseForOwn(object, function(value, key, object) {
+        setter(accumulator, iteratee(value), key, object);
+      });
+      return accumulator;
+    }
+
+    /**
+     * The base implementation of `_.invoke` without support for individual
+     * method arguments.
+     *
+     * @private
+     * @param {Object} object The object to query.
+     * @param {Array|string} path The path of the method to invoke.
+     * @param {Array} args The arguments to invoke the method with.
+     * @returns {*} Returns the result of the invoked method.
+     */
+    function baseInvoke(object, path, args) {
+      path = castPath(path, object);
+      object = parent(object, path);
+      var func = object == null ? object : object[toKey(last(path))];
+      return func == null ? undefined : apply(func, object, args);
+    }
+
+    /**
+     * The base implementation of `_.isArguments`.
+     *
+     * @private
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is an `arguments` object,
+     */
+    function baseIsArguments(value) {
+      return isObjectLike(value) && baseGetTag(value) == argsTag;
+    }
+
+    /**
+     * The base implementation of `_.isArrayBuffer` without Node.js optimizations.
+     *
+     * @private
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is an array buffer, else `false`.
+     */
+    function baseIsArrayBuffer(value) {
+      return isObjectLike(value) && baseGetTag(value) == arrayBufferTag;
+    }
+
+    /**
+     * The base implementation of `_.isDate` without Node.js optimizations.
+     *
+     * @private
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is a date object, else `false`.
+     */
+    function baseIsDate(value) {
+      return isObjectLike(value) && baseGetTag(value) == dateTag;
+    }
+
+    /**
+     * The base implementation of `_.isEqual` which supports partial comparisons
+     * and tracks traversed objects.
+     *
+     * @private
+     * @param {*} value The value to compare.
+     * @param {*} other The other value to compare.
+     * @param {boolean} bitmask The bitmask flags.
+     *  1 - Unordered comparison
+     *  2 - Partial comparison
+     * @param {Function} [customizer] The function to customize comparisons.
+     * @param {Object} [stack] Tracks traversed `value` and `other` objects.
+     * @returns {boolean} Returns `true` if the values are equivalent, else `false`.
+     */
+    function baseIsEqual(value, other, bitmask, customizer, stack) {
+      if (value === other) {
+        return true;
+      }
+      if (value == null || other == null || (!isObjectLike(value) && !isObjectLike(other))) {
+        return value !== value && other !== other;
+      }
+      return baseIsEqualDeep(value, other, bitmask, customizer, baseIsEqual, stack);
+    }
+
+    /**
+     * A specialized version of `baseIsEqual` for arrays and objects which performs
+     * deep comparisons and tracks traversed objects enabling objects with circular
+     * references to be compared.
+     *
+     * @private
+     * @param {Object} object The object to compare.
+     * @param {Object} other The other object to compare.
+     * @param {number} bitmask The bitmask flags. See `baseIsEqual` for more details.
+     * @param {Function} customizer The function to customize comparisons.
+     * @param {Function} equalFunc The function to determine equivalents of values.
+     * @param {Object} [stack] Tracks traversed `object` and `other` objects.
+     * @returns {boolean} Returns `true` if the objects are equivalent, else `false`.
+     */
+    function baseIsEqualDeep(object, other, bitmask, customizer, equalFunc, stack) {
+      var objIsArr = isArray(object),
+          othIsArr = isArray(other),
+          objTag = objIsArr ? arrayTag : getTag(object),
+          othTag = othIsArr ? arrayTag : getTag(other);
+
+      objTag = objTag == argsTag ? objectTag : objTag;
+      othTag = othTag == argsTag ? objectTag : othTag;
+
+      var objIsObj = objTag == objectTag,
+          othIsObj = othTag == objectTag,
+          isSameTag = objTag == othTag;
+
+      if (isSameTag && isBuffer(object)) {
+        if (!isBuffer(other)) {
+          return false;
+        }
+        objIsArr = true;
+        objIsObj = false;
+      }
+      if (isSameTag && !objIsObj) {
+        stack || (stack = new Stack);
+        return (objIsArr || isTypedArray(object))
+          ? equalArrays(object, other, bitmask, customizer, equalFunc, stack)
+          : equalByTag(object, other, objTag, bitmask, customizer, equalFunc, stack);
+      }
+      if (!(bitmask & COMPARE_PARTIAL_FLAG)) {
+        var objIsWrapped = objIsObj && hasOwnProperty.call(object, '__wrapped__'),
+            othIsWrapped = othIsObj && hasOwnProperty.call(other, '__wrapped__');
+
+        if (objIsWrapped || othIsWrapped) {
+          var objUnwrapped = objIsWrapped ? object.value() : object,
+              othUnwrapped = othIsWrapped ? other.value() : other;
+
+          stack || (stack = new Stack);
+          return equalFunc(objUnwrapped, othUnwrapped, bitmask, customizer, stack);
+        }
+      }
+      if (!isSameTag) {
+        return false;
+      }
+      stack || (stack = new Stack);
+      return equalObjects(object, other, bitmask, customizer, equalFunc, stack);
+    }
+
+    /**
+     * The base implementation of `_.isMap` without Node.js optimizations.
+     *
+     * @private
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is a map, else `false`.
+     */
+    function baseIsMap(value) {
+      return isObjectLike(value) && getTag(value) == mapTag;
+    }
+
+    /**
+     * The base implementation of `_.isMatch` without support for iteratee shorthands.
+     *
+     * @private
+     * @param {Object} object The object to inspect.
+     * @param {Object} source The object of property values to match.
+     * @param {Array} matchData The property names, values, and compare flags to match.
+     * @param {Function} [customizer] The function to customize comparisons.
+     * @returns {boolean} Returns `true` if `object` is a match, else `false`.
+     */
+    function baseIsMatch(object, source, matchData, customizer) {
+      var index = matchData.length,
+          length = index,
+          noCustomizer = !customizer;
+
+      if (object == null) {
+        return !length;
+      }
+      object = Object(object);
+      while (index--) {
+        var data = matchData[index];
+        if ((noCustomizer && data[2])
+              ? data[1] !== object[data[0]]
+              : !(data[0] in object)
+            ) {
+          return false;
+        }
+      }
+      while (++index < length) {
+        data = matchData[index];
+        var key = data[0],
+            objValue = object[key],
+            srcValue = data[1];
+
+        if (noCustomizer && data[2]) {
+          if (objValue === undefined && !(key in object)) {
+            return false;
+          }
+        } else {
+          var stack = new Stack;
+          if (customizer) {
+            var result = customizer(objValue, srcValue, key, object, source, stack);
+          }
+          if (!(result === undefined
+                ? baseIsEqual(srcValue, objValue, COMPARE_PARTIAL_FLAG | COMPARE_UNORDERED_FLAG, customizer, stack)
+                : result
+              )) {
+            return false;
+          }
+        }
+      }
+      return true;
+    }
+
+    /**
+     * The base implementation of `_.isNative` without bad shim checks.
+     *
+     * @private
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is a native function,
+     *  else `false`.
+     */
+    function baseIsNative(value) {
+      if (!isObject(value) || isMasked(value)) {
+        return false;
+      }
+      var pattern = isFunction(value) ? reIsNative : reIsHostCtor;
+      return pattern.test(toSource(value));
+    }
+
+    /**
+     * The base implementation of `_.isRegExp` without Node.js optimizations.
+     *
+     * @private
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is a regexp, else `false`.
+     */
+    function baseIsRegExp(value) {
+      return isObjectLike(value) && baseGetTag(value) == regexpTag;
+    }
+
+    /**
+     * The base implementation of `_.isSet` without Node.js optimizations.
+     *
+     * @private
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is a set, else `false`.
+     */
+    function baseIsSet(value) {
+      return isObjectLike(value) && getTag(value) == setTag;
+    }
+
+    /**
+     * The base implementation of `_.isTypedArray` without Node.js optimizations.
+     *
+     * @private
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is a typed array, else `false`.
+     */
+    function baseIsTypedArray(value) {
+      return isObjectLike(value) &&
+        isLength(value.length) && !!typedArrayTags[baseGetTag(value)];
+    }
+
+    /**
+     * The base implementation of `_.iteratee`.
+     *
+     * @private
+     * @param {*} [value=_.identity] The value to convert to an iteratee.
+     * @returns {Function} Returns the iteratee.
+     */
+    function baseIteratee(value) {
+      // Don't store the `typeof` result in a variable to avoid a JIT bug in Safari 9.
+      // See https://bugs.webkit.org/show_bug.cgi?id=156034 for more details.
+      if (typeof value == 'function') {
+        return value;
+      }
+      if (value == null) {
+        return identity;
+      }
+      if (typeof value == 'object') {
+        return isArray(value)
+          ? baseMatchesProperty(value[0], value[1])
+          : baseMatches(value);
+      }
+      return property(value);
+    }
+
+    /**
+     * The base implementation of `_.keys` which doesn't treat sparse arrays as dense.
+     *
+     * @private
+     * @param {Object} object The object to query.
+     * @returns {Array} Returns the array of property names.
+     */
+    function baseKeys(object) {
+      if (!isPrototype(object)) {
+        return nativeKeys(object);
+      }
+      var result = [];
+      for (var key in Object(object)) {
+        if (hasOwnProperty.call(object, key) && key != 'constructor') {
+          result.push(key);
+        }
+      }
+      return result;
+    }
+
+    /**
+     * The base implementation of `_.keysIn` which doesn't treat sparse arrays as dense.
+     *
+     * @private
+     * @param {Object} object The object to query.
+     * @returns {Array} Returns the array of property names.
+     */
+    function baseKeysIn(object) {
+      if (!isObject(object)) {
+        return nativeKeysIn(object);
+      }
+      var isProto = isPrototype(object),
+          result = [];
+
+      for (var key in object) {
+        if (!(key == 'constructor' && (isProto || !hasOwnProperty.call(object, key)))) {
+          result.push(key);
+        }
+      }
+      return result;
+    }
+
+    /**
+     * The base implementation of `_.lt` which doesn't coerce arguments.
+     *
+     * @private
+     * @param {*} value The value to compare.
+     * @param {*} other The other value to compare.
+     * @returns {boolean} Returns `true` if `value` is less than `other`,
+     *  else `false`.
+     */
+    function baseLt(value, other) {
+      return value < other;
+    }
+
+    /**
+     * The base implementation of `_.map` without support for iteratee shorthands.
+     *
+     * @private
+     * @param {Array|Object} collection The collection to iterate over.
+     * @param {Function} iteratee The function invoked per iteration.
+     * @returns {Array} Returns the new mapped array.
+     */
+    function baseMap(collection, iteratee) {
+      var index = -1,
+          result = isArrayLike(collection) ? Array(collection.length) : [];
+
+      baseEach(collection, function(value, key, collection) {
+        result[++index] = iteratee(value, key, collection);
+      });
+      return result;
+    }
+
+    /**
+     * The base implementation of `_.matches` which doesn't clone `source`.
+     *
+     * @private
+     * @param {Object} source The object of property values to match.
+     * @returns {Function} Returns the new spec function.
+     */
+    function baseMatches(source) {
+      var matchData = getMatchData(source);
+      if (matchData.length == 1 && matchData[0][2]) {
+        return matchesStrictComparable(matchData[0][0], matchData[0][1]);
+      }
+      return function(object) {
+        return object === source || baseIsMatch(object, source, matchData);
+      };
+    }
+
+    /**
+     * The base implementation of `_.matchesProperty` which doesn't clone `srcValue`.
+     *
+     * @private
+     * @param {string} path The path of the property to get.
+     * @param {*} srcValue The value to match.
+     * @returns {Function} Returns the new spec function.
+     */
+    function baseMatchesProperty(path, srcValue) {
+      if (isKey(path) && isStrictComparable(srcValue)) {
+        return matchesStrictComparable(toKey(path), srcValue);
+      }
+      return function(object) {
+        var objValue = get(object, path);
+        return (objValue === undefined && objValue === srcValue)
+          ? hasIn(object, path)
+          : baseIsEqual(srcValue, objValue, COMPARE_PARTIAL_FLAG | COMPARE_UNORDERED_FLAG);
+      };
+    }
+
+    /**
+     * The base implementation of `_.merge` without support for multiple sources.
+     *
+     * @private
+     * @param {Object} object The destination object.
+     * @param {Object} source The source object.
+     * @param {number} srcIndex The index of `source`.
+     * @param {Function} [customizer] The function to customize merged values.
+     * @param {Object} [stack] Tracks traversed source values and their merged
+     *  counterparts.
+     */
+    function baseMerge(object, source, srcIndex, customizer, stack) {
+      if (object === source) {
+        return;
+      }
+      baseFor(source, function(srcValue, key) {
+        if (isObject(srcValue)) {
+          stack || (stack = new Stack);
+          baseMergeDeep(object, source, key, srcIndex, baseMerge, customizer, stack);
+        }
+        else {
+          var newValue = customizer
+            ? customizer(safeGet(object, key), srcValue, (key + ''), object, source, stack)
+            : undefined;
+
+          if (newValue === undefined) {
+            newValue = srcValue;
+          }
+          assignMergeValue(object, key, newValue);
+        }
+      }, keysIn);
+    }
+
+    /**
+     * A specialized version of `baseMerge` for arrays and objects which performs
+     * deep merges and tracks traversed objects enabling objects with circular
+     * references to be merged.
+     *
+     * @private
+     * @param {Object} object The destination object.
+     * @param {Object} source The source object.
+     * @param {string} key The key of the value to merge.
+     * @param {number} srcIndex The index of `source`.
+     * @param {Function} mergeFunc The function to merge values.
+     * @param {Function} [customizer] The function to customize assigned values.
+     * @param {Object} [stack] Tracks traversed source values and their merged
+     *  counterparts.
+     */
+    function baseMergeDeep(object, source, key, srcIndex, mergeFunc, customizer, stack) {
+      var objValue = safeGet(object, key),
+          srcValue = safeGet(source, key),
+          stacked = stack.get(srcValue);
+
+      if (stacked) {
+        assignMergeValue(object, key, stacked);
+        return;
+      }
+      var newValue = customizer
+        ? customizer(objValue, srcValue, (key + ''), object, source, stack)
+        : undefined;
+
+      var isCommon = newValue === undefined;
+
+      if (isCommon) {
+        var isArr = isArray(srcValue),
+            isBuff = !isArr && isBuffer(srcValue),
+            isTyped = !isArr && !isBuff && isTypedArray(srcValue);
+
+        newValue = srcValue;
+        if (isArr || isBuff || isTyped) {
+          if (isArray(objValue)) {
+            newValue = objValue;
+          }
+          else if (isArrayLikeObject(objValue)) {
+            newValue = copyArray(objValue);
+          }
+          else if (isBuff) {
+            isCommon = false;
+            newValue = cloneBuffer(srcValue, true);
+          }
+          else if (isTyped) {
+            isCommon = false;
+            newValue = cloneTypedArray(srcValue, true);
+          }
+          else {
+            newValue = [];
+          }
+        }
+        else if (isPlainObject(srcValue) || isArguments(srcValue)) {
+          newValue = objValue;
+          if (isArguments(objValue)) {
+            newValue = toPlainObject(objValue);
+          }
+          else if (!isObject(objValue) || (srcIndex && isFunction(objValue))) {
+            newValue = initCloneObject(srcValue);
+          }
+        }
+        else {
+          isCommon = false;
+        }
+      }
+      if (isCommon) {
+        // Recursively merge objects and arrays (susceptible to call stack limits).
+        stack.set(srcValue, newValue);
+        mergeFunc(newValue, srcValue, srcIndex, customizer, stack);
+        stack['delete'](srcValue);
+      }
+      assignMergeValue(object, key, newValue);
+    }
+
+    /**
+     * The base implementation of `_.nth` which doesn't coerce arguments.
+     *
+     * @private
+     * @param {Array} array The array to query.
+     * @param {number} n The index of the element to return.
+     * @returns {*} Returns the nth element of `array`.
+     */
+    function baseNth(array, n) {
+      var length = array.length;
+      if (!length) {
+        return;
+      }
+      n += n < 0 ? length : 0;
+      return isIndex(n, length) ? array[n] : undefined;
+    }
+
+    /**
+     * The base implementation of `_.orderBy` without param guards.
+     *
+     * @private
+     * @param {Array|Object} collection The collection to iterate over.
+     * @param {Function[]|Object[]|string[]} iteratees The iteratees to sort by.
+     * @param {string[]} orders The sort orders of `iteratees`.
+     * @returns {Array} Returns the new sorted array.
+     */
+    function baseOrderBy(collection, iteratees, orders) {
+      var index = -1;
+      iteratees = arrayMap(iteratees.length ? iteratees : [identity], baseUnary(getIteratee()));
+
+      var result = baseMap(collection, function(value, key, collection) {
+        var criteria = arrayMap(iteratees, function(iteratee) {
+          return iteratee(value);
+        });
+        return { 'criteria': criteria, 'index': ++index, 'value': value };
+      });
+
+      return baseSortBy(result, function(object, other) {
+        return compareMultiple(object, other, orders);
+      });
+    }
+
+    /**
+     * The base implementation of `_.pick` without support for individual
+     * property identifiers.
+     *
+     * @private
+     * @param {Object} object The source object.
+     * @param {string[]} paths The property paths to pick.
+     * @returns {Object} Returns the new object.
+     */
+    function basePick(object, paths) {
+      return basePickBy(object, paths, function(value, path) {
+        return hasIn(object, path);
+      });
+    }
+
+    /**
+     * The base implementation of  `_.pickBy` without support for iteratee shorthands.
+     *
+     * @private
+     * @param {Object} object The source object.
+     * @param {string[]} paths The property paths to pick.
+     * @param {Function} predicate The function invoked per property.
+     * @returns {Object} Returns the new object.
+     */
+    function basePickBy(object, paths, predicate) {
+      var index = -1,
+          length = paths.length,
+          result = {};
+
+      while (++index < length) {
+        var path = paths[index],
+            value = baseGet(object, path);
+
+        if (predicate(value, path)) {
+          baseSet(result, castPath(path, object), value);
+        }
+      }
+      return result;
+    }
+
+    /**
+     * A specialized version of `baseProperty` which supports deep paths.
+     *
+     * @private
+     * @param {Array|string} path The path of the property to get.
+     * @returns {Function} Returns the new accessor function.
+     */
+    function basePropertyDeep(path) {
+      return function(object) {
+        return baseGet(object, path);
+      };
+    }
+
+    /**
+     * The base implementation of `_.pullAllBy` without support for iteratee
+     * shorthands.
+     *
+     * @private
+     * @param {Array} array The array to modify.
+     * @param {Array} values The values to remove.
+     * @param {Function} [iteratee] The iteratee invoked per element.
+     * @param {Function} [comparator] The comparator invoked per element.
+     * @returns {Array} Returns `array`.
+     */
+    function basePullAll(array, values, iteratee, comparator) {
+      var indexOf = comparator ? baseIndexOfWith : baseIndexOf,
+          index = -1,
+          length = values.length,
+          seen = array;
+
+      if (array === values) {
+        values = copyArray(values);
+      }
+      if (iteratee) {
+        seen = arrayMap(array, baseUnary(iteratee));
+      }
+      while (++index < length) {
+        var fromIndex = 0,
+            value = values[index],
+            computed = iteratee ? iteratee(value) : value;
+
+        while ((fromIndex = indexOf(seen, computed, fromIndex, comparator)) > -1) {
+          if (seen !== array) {
+            splice.call(seen, fromIndex, 1);
+          }
+          splice.call(array, fromIndex, 1);
+        }
+      }
+      return array;
+    }
+
+    /**
+     * The base implementation of `_.pullAt` without support for individual
+     * indexes or capturing the removed elements.
+     *
+     * @private
+     * @param {Array} array The array to modify.
+     * @param {number[]} indexes The indexes of elements to remove.
+     * @returns {Array} Returns `array`.
+     */
+    function basePullAt(array, indexes) {
+      var length = array ? indexes.length : 0,
+          lastIndex = length - 1;
+
+      while (length--) {
+        var index = indexes[length];
+        if (length == lastIndex || index !== previous) {
+          var previous = index;
+          if (isIndex(index)) {
+            splice.call(array, index, 1);
+          } else {
+            baseUnset(array, index);
+          }
+        }
+      }
+      return array;
+    }
+
+    /**
+     * The base implementation of `_.random` without support for returning
+     * floating-point numbers.
+     *
+     * @private
+     * @param {number} lower The lower bound.
+     * @param {number} upper The upper bound.
+     * @returns {number} Returns the random number.
+     */
+    function baseRandom(lower, upper) {
+      return lower + nativeFloor(nativeRandom() * (upper - lower + 1));
+    }
+
+    /**
+     * The base implementation of `_.range` and `_.rangeRight` which doesn't
+     * coerce arguments.
+     *
+     * @private
+     * @param {number} start The start of the range.
+     * @param {number} end The end of the range.
+     * @param {number} step The value to increment or decrement by.
+     * @param {boolean} [fromRight] Specify iterating from right to left.
+     * @returns {Array} Returns the range of numbers.
+     */
+    function baseRange(start, end, step, fromRight) {
+      var index = -1,
+          length = nativeMax(nativeCeil((end - start) / (step || 1)), 0),
+          result = Array(length);
+
+      while (length--) {
+        result[fromRight ? length : ++index] = start;
+        start += step;
+      }
+      return result;
+    }
+
+    /**
+     * The base implementation of `_.repeat` which doesn't coerce arguments.
+     *
+     * @private
+     * @param {string} string The string to repeat.
+     * @param {number} n The number of times to repeat the string.
+     * @returns {string} Returns the repeated string.
+     */
+    function baseRepeat(string, n) {
+      var result = '';
+      if (!string || n < 1 || n > MAX_SAFE_INTEGER) {
+        return result;
+      }
+      // Leverage the exponentiation by squaring algorithm for a faster repeat.
+      // See https://en.wikipedia.org/wiki/Exponentiation_by_squaring for more details.
+      do {
+        if (n % 2) {
+          result += string;
+        }
+        n = nativeFloor(n / 2);
+        if (n) {
+          string += string;
+        }
+      } while (n);
+
+      return result;
+    }
+
+    /**
+     * The base implementation of `_.rest` which doesn't validate or coerce arguments.
+     *
+     * @private
+     * @param {Function} func The function to apply a rest parameter to.
+     * @param {number} [start=func.length-1] The start position of the rest parameter.
+     * @returns {Function} Returns the new function.
+     */
+    function baseRest(func, start) {
+      return setToString(overRest(func, start, identity), func + '');
+    }
+
+    /**
+     * The base implementation of `_.sample`.
+     *
+     * @private
+     * @param {Array|Object} collection The collection to sample.
+     * @returns {*} Returns the random element.
+     */
+    function baseSample(collection) {
+      return arraySample(values(collection));
+    }
+
+    /**
+     * The base implementation of `_.sampleSize` without param guards.
+     *
+     * @private
+     * @param {Array|Object} collection The collection to sample.
+     * @param {number} n The number of elements to sample.
+     * @returns {Array} Returns the random elements.
+     */
+    function baseSampleSize(collection, n) {
+      var array = values(collection);
+      return shuffleSelf(array, baseClamp(n, 0, array.length));
+    }
+
+    /**
+     * The base implementation of `_.set`.
+     *
+     * @private
+     * @param {Object} object The object to modify.
+     * @param {Array|string} path The path of the property to set.
+     * @param {*} value The value to set.
+     * @param {Function} [customizer] The function to customize path creation.
+     * @returns {Object} Returns `object`.
+     */
+    function baseSet(object, path, value, customizer) {
+      if (!isObject(object)) {
+        return object;
+      }
+      path = castPath(path, object);
+
+      var index = -1,
+          length = path.length,
+          lastIndex = length - 1,
+          nested = object;
+
+      while (nested != null && ++index < length) {
+        var key = toKey(path[index]),
+            newValue = value;
+
+        if (index != lastIndex) {
+          var objValue = nested[key];
+          newValue = customizer ? customizer(objValue, key, nested) : undefined;
+          if (newValue === undefined) {
+            newValue = isObject(objValue)
+              ? objValue
+              : (isIndex(path[index + 1]) ? [] : {});
+          }
+        }
+        assignValue(nested, key, newValue);
+        nested = nested[key];
+      }
+      return object;
+    }
+
+    /**
+     * The base implementation of `setData` without support for hot loop shorting.
+     *
+     * @private
+     * @param {Function} func The function to associate metadata with.
+     * @param {*} data The metadata.
+     * @returns {Function} Returns `func`.
+     */
+    var baseSetData = !metaMap ? identity : function(func, data) {
+      metaMap.set(func, data);
+      return func;
+    };
+
+    /**
+     * The base implementation of `setToString` without support for hot loop shorting.
+     *
+     * @private
+     * @param {Function} func The function to modify.
+     * @param {Function} string The `toString` result.
+     * @returns {Function} Returns `func`.
+     */
+    var baseSetToString = !defineProperty ? identity : function(func, string) {
+      return defineProperty(func, 'toString', {
+        'configurable': true,
+        'enumerable': false,
+        'value': constant(string),
+        'writable': true
+      });
+    };
+
+    /**
+     * The base implementation of `_.shuffle`.
+     *
+     * @private
+     * @param {Array|Object} collection The collection to shuffle.
+     * @returns {Array} Returns the new shuffled array.
+     */
+    function baseShuffle(collection) {
+      return shuffleSelf(values(collection));
+    }
+
+    /**
+     * The base implementation of `_.slice` without an iteratee call guard.
+     *
+     * @private
+     * @param {Array} array The array to slice.
+     * @param {number} [start=0] The start position.
+     * @param {number} [end=array.length] The end position.
+     * @returns {Array} Returns the slice of `array`.
+     */
+    function baseSlice(array, start, end) {
+      var index = -1,
+          length = array.length;
+
+      if (start < 0) {
+        start = -start > length ? 0 : (length + start);
+      }
+      end = end > length ? length : end;
+      if (end < 0) {
+        end += length;
+      }
+      length = start > end ? 0 : ((end - start) >>> 0);
+      start >>>= 0;
+
+      var result = Array(length);
+      while (++index < length) {
+        result[index] = array[index + start];
+      }
+      return result;
+    }
+
+    /**
+     * The base implementation of `_.some` without support for iteratee shorthands.
+     *
+     * @private
+     * @param {Array|Object} collection The collection to iterate over.
+     * @param {Function} predicate The function invoked per iteration.
+     * @returns {boolean} Returns `true` if any element passes the predicate check,
+     *  else `false`.
+     */
+    function baseSome(collection, predicate) {
+      var result;
+
+      baseEach(collection, function(value, index, collection) {
+        result = predicate(value, index, collection);
+        return !result;
+      });
+      return !!result;
+    }
+
+    /**
+     * The base implementation of `_.sortedIndex` and `_.sortedLastIndex` which
+     * performs a binary search of `array` to determine the index at which `value`
+     * should be inserted into `array` in order to maintain its sort order.
+     *
+     * @private
+     * @param {Array} array The sorted array to inspect.
+     * @param {*} value The value to evaluate.
+     * @param {boolean} [retHighest] Specify returning the highest qualified index.
+     * @returns {number} Returns the index at which `value` should be inserted
+     *  into `array`.
+     */
+    function baseSortedIndex(array, value, retHighest) {
+      var low = 0,
+          high = array == null ? low : array.length;
+
+      if (typeof value == 'number' && value === value && high <= HALF_MAX_ARRAY_LENGTH) {
+        while (low < high) {
+          var mid = (low + high) >>> 1,
+              computed = array[mid];
+
+          if (computed !== null && !isSymbol(computed) &&
+              (retHighest ? (computed <= value) : (computed < value))) {
+            low = mid + 1;
+          } else {
+            high = mid;
+          }
+        }
+        return high;
+      }
+      return baseSortedIndexBy(array, value, identity, retHighest);
+    }
+
+    /**
+     * The base implementation of `_.sortedIndexBy` and `_.sortedLastIndexBy`
+     * which invokes `iteratee` for `value` and each element of `array` to compute
+     * their sort ranking. The iteratee is invoked with one argument; (value).
+     *
+     * @private
+     * @param {Array} array The sorted array to inspect.
+     * @param {*} value The value to evaluate.
+     * @param {Function} iteratee The iteratee invoked per element.
+     * @param {boolean} [retHighest] Specify returning the highest qualified index.
+     * @returns {number} Returns the index at which `value` should be inserted
+     *  into `array`.
+     */
+    function baseSortedIndexBy(array, value, iteratee, retHighest) {
+      value = iteratee(value);
+
+      var low = 0,
+          high = array == null ? 0 : array.length,
+          valIsNaN = value !== value,
+          valIsNull = value === null,
+          valIsSymbol = isSymbol(value),
+          valIsUndefined = value === undefined;
+
+      while (low < high) {
+        var mid = nativeFloor((low + high) / 2),
+            computed = iteratee(array[mid]),
+            othIsDefined = computed !== undefined,
+            othIsNull = computed === null,
+            othIsReflexive = computed === computed,
+            othIsSymbol = isSymbol(computed);
+
+        if (valIsNaN) {
+          var setLow = retHighest || othIsReflexive;
+        } else if (valIsUndefined) {
+          setLow = othIsReflexive && (retHighest || othIsDefined);
+        } else if (valIsNull) {
+          setLow = othIsReflexive && othIsDefined && (retHighest || !othIsNull);
+        } else if (valIsSymbol) {
+          setLow = othIsReflexive && othIsDefined && !othIsNull && (retHighest || !othIsSymbol);
+        } else if (othIsNull || othIsSymbol) {
+          setLow = false;
+        } else {
+          setLow = retHighest ? (computed <= value) : (computed < value);
+        }
+        if (setLow) {
+          low = mid + 1;
+        } else {
+          high = mid;
+        }
+      }
+      return nativeMin(high, MAX_ARRAY_INDEX);
+    }
+
+    /**
+     * The base implementation of `_.sortedUniq` and `_.sortedUniqBy` without
+     * support for iteratee shorthands.
+     *
+     * @private
+     * @param {Array} array The array to inspect.
+     * @param {Function} [iteratee] The iteratee invoked per element.
+     * @returns {Array} Returns the new duplicate free array.
+     */
+    function baseSortedUniq(array, iteratee) {
+      var index = -1,
+          length = array.length,
+          resIndex = 0,
+          result = [];
+
+      while (++index < length) {
+        var value = array[index],
+            computed = iteratee ? iteratee(value) : value;
+
+        if (!index || !eq(computed, seen)) {
+          var seen = computed;
+          result[resIndex++] = value === 0 ? 0 : value;
+        }
+      }
+      return result;
+    }
+
+    /**
+     * The base implementation of `_.toNumber` which doesn't ensure correct
+     * conversions of binary, hexadecimal, or octal string values.
+     *
+     * @private
+     * @param {*} value The value to process.
+     * @returns {number} Returns the number.
+     */
+    function baseToNumber(value) {
+      if (typeof value == 'number') {
+        return value;
+      }
+      if (isSymbol(value)) {
+        return NAN;
+      }
+      return +value;
+    }
+
+    /**
+     * The base implementation of `_.toString` which doesn't convert nullish
+     * values to empty strings.
+     *
+     * @private
+     * @param {*} value The value to process.
+     * @returns {string} Returns the string.
+     */
+    function baseToString(value) {
+      // Exit early for strings to avoid a performance hit in some environments.
+      if (typeof value == 'string') {
+        return value;
+      }
+      if (isArray(value)) {
+        // Recursively convert values (susceptible to call stack limits).
+        return arrayMap(value, baseToString) + '';
+      }
+      if (isSymbol(value)) {
+        return symbolToString ? symbolToString.call(value) : '';
+      }
+      var result = (value + '');
+      return (result == '0' && (1 / value) == -INFINITY) ? '-0' : result;
+    }
+
+    /**
+     * The base implementation of `_.uniqBy` without support for iteratee shorthands.
+     *
+     * @private
+     * @param {Array} array The array to inspect.
+     * @param {Function} [iteratee] The iteratee invoked per element.
+     * @param {Function} [comparator] The comparator invoked per element.
+     * @returns {Array} Returns the new duplicate free array.
+     */
+    function baseUniq(array, iteratee, comparator) {
+      var index = -1,
+          includes = arrayIncludes,
+          length = array.length,
+          isCommon = true,
+          result = [],
+          seen = result;
+
+      if (comparator) {
+        isCommon = false;
+        includes = arrayIncludesWith;
+      }
+      else if (length >= LARGE_ARRAY_SIZE) {
+        var set = iteratee ? null : createSet(array);
+        if (set) {
+          return setToArray(set);
+        }
+        isCommon = false;
+        includes = cacheHas;
+        seen = new SetCache;
+      }
+      else {
+        seen = iteratee ? [] : result;
+      }
+      outer:
+      while (++index < length) {
+        var value = array[index],
+            computed = iteratee ? iteratee(value) : value;
+
+        value = (comparator || value !== 0) ? value : 0;
+        if (isCommon && computed === computed) {
+          var seenIndex = seen.length;
+          while (seenIndex--) {
+            if (seen[seenIndex] === computed) {
+              continue outer;
+            }
+          }
+          if (iteratee) {
+            seen.push(computed);
+          }
+          result.push(value);
+        }
+        else if (!includes(seen, computed, comparator)) {
+          if (seen !== result) {
+            seen.push(computed);
+          }
+          result.push(value);
+        }
+      }
+      return result;
+    }
+
+    /**
+     * The base implementation of `_.unset`.
+     *
+     * @private
+     * @param {Object} object The object to modify.
+     * @param {Array|string} path The property path to unset.
+     * @returns {boolean} Returns `true` if the property is deleted, else `false`.
+     */
+    function baseUnset(object, path) {
+      path = castPath(path, object);
+      object = parent(object, path);
+      return object == null || delete object[toKey(last(path))];
+    }
+
+    /**
+     * The base implementation of `_.update`.
+     *
+     * @private
+     * @param {Object} object The object to modify.
+     * @param {Array|string} path The path of the property to update.
+     * @param {Function} updater The function to produce the updated value.
+     * @param {Function} [customizer] The function to customize path creation.
+     * @returns {Object} Returns `object`.
+     */
+    function baseUpdate(object, path, updater, customizer) {
+      return baseSet(object, path, updater(baseGet(object, path)), customizer);
+    }
+
+    /**
+     * The base implementation of methods like `_.dropWhile` and `_.takeWhile`
+     * without support for iteratee shorthands.
+     *
+     * @private
+     * @param {Array} array The array to query.
+     * @param {Function} predicate The function invoked per iteration.
+     * @param {boolean} [isDrop] Specify dropping elements instead of taking them.
+     * @param {boolean} [fromRight] Specify iterating from right to left.
+     * @returns {Array} Returns the slice of `array`.
+     */
+    function baseWhile(array, predicate, isDrop, fromRight) {
+      var length = array.length,
+          index = fromRight ? length : -1;
+
+      while ((fromRight ? index-- : ++index < length) &&
+        predicate(array[index], index, array)) {}
+
+      return isDrop
+        ? baseSlice(array, (fromRight ? 0 : index), (fromRight ? index + 1 : length))
+        : baseSlice(array, (fromRight ? index + 1 : 0), (fromRight ? length : index));
+    }
+
+    /**
+     * The base implementation of `wrapperValue` which returns the result of
+     * performing a sequence of actions on the unwrapped `value`, where each
+     * successive action is supplied the return value of the previous.
+     *
+     * @private
+     * @param {*} value The unwrapped value.
+     * @param {Array} actions Actions to perform to resolve the unwrapped value.
+     * @returns {*} Returns the resolved value.
+     */
+    function baseWrapperValue(value, actions) {
+      var result = value;
+      if (result instanceof LazyWrapper) {
+        result = result.value();
+      }
+      return arrayReduce(actions, function(result, action) {
+        return action.func.apply(action.thisArg, arrayPush([result], action.args));
+      }, result);
+    }
+
+    /**
+     * The base implementation of methods like `_.xor`, without support for
+     * iteratee shorthands, that accepts an array of arrays to inspect.
+     *
+     * @private
+     * @param {Array} arrays The arrays to inspect.
+     * @param {Function} [iteratee] The iteratee invoked per element.
+     * @param {Function} [comparator] The comparator invoked per element.
+     * @returns {Array} Returns the new array of values.
+     */
+    function baseXor(arrays, iteratee, comparator) {
+      var length = arrays.length;
+      if (length < 2) {
+        return length ? baseUniq(arrays[0]) : [];
+      }
+      var index = -1,
+          result = Array(length);
+
+      while (++index < length) {
+        var array = arrays[index],
+            othIndex = -1;
+
+        while (++othIndex < length) {
+          if (othIndex != index) {
+            result[index] = baseDifference(result[index] || array, arrays[othIndex], iteratee, comparator);
+          }
+        }
+      }
+      return baseUniq(baseFlatten(result, 1), iteratee, comparator);
+    }
+
+    /**
+     * This base implementation of `_.zipObject` which assigns values using `assignFunc`.
+     *
+     * @private
+     * @param {Array} props The property identifiers.
+     * @param {Array} values The property values.
+     * @param {Function} assignFunc The function to assign values.
+     * @returns {Object} Returns the new object.
+     */
+    function baseZipObject(props, values, assignFunc) {
+      var index = -1,
+          length = props.length,
+          valsLength = values.length,
+          result = {};
+
+      while (++index < length) {
+        var value = index < valsLength ? values[index] : undefined;
+        assignFunc(result, props[index], value);
+      }
+      return result;
+    }
+
+    /**
+     * Casts `value` to an empty array if it's not an array like object.
+     *
+     * @private
+     * @param {*} value The value to inspect.
+     * @returns {Array|Object} Returns the cast array-like object.
+     */
+    function castArrayLikeObject(value) {
+      return isArrayLikeObject(value) ? value : [];
+    }
+
+    /**
+     * Casts `value` to `identity` if it's not a function.
+     *
+     * @private
+     * @param {*} value The value to inspect.
+     * @returns {Function} Returns cast function.
+     */
+    function castFunction(value) {
+      return typeof value == 'function' ? value : identity;
+    }
+
+    /**
+     * Casts `value` to a path array if it's not one.
+     *
+     * @private
+     * @param {*} value The value to inspect.
+     * @param {Object} [object] The object to query keys on.
+     * @returns {Array} Returns the cast property path array.
+     */
+    function castPath(value, object) {
+      if (isArray(value)) {
+        return value;
+      }
+      return isKey(value, object) ? [value] : stringToPath(toString(value));
+    }
+
+    /**
+     * A `baseRest` alias which can be replaced with `identity` by module
+     * replacement plugins.
+     *
+     * @private
+     * @type {Function}
+     * @param {Function} func The function to apply a rest parameter to.
+     * @returns {Function} Returns the new function.
+     */
+    var castRest = baseRest;
+
+    /**
+     * Casts `array` to a slice if it's needed.
+     *
+     * @private
+     * @param {Array} array The array to inspect.
+     * @param {number} start The start position.
+     * @param {number} [end=array.length] The end position.
+     * @returns {Array} Returns the cast slice.
+     */
+    function castSlice(array, start, end) {
+      var length = array.length;
+      end = end === undefined ? length : end;
+      return (!start && end >= length) ? array : baseSlice(array, start, end);
+    }
+
+    /**
+     * A simple wrapper around the global [`clearTimeout`](https://mdn.io/clearTimeout).
+     *
+     * @private
+     * @param {number|Object} id The timer id or timeout object of the timer to clear.
+     */
+    var clearTimeout = ctxClearTimeout || function(id) {
+      return root.clearTimeout(id);
+    };
+
+    /**
+     * Creates a clone of  `buffer`.
+     *
+     * @private
+     * @param {Buffer} buffer The buffer to clone.
+     * @param {boolean} [isDeep] Specify a deep clone.
+     * @returns {Buffer} Returns the cloned buffer.
+     */
+    function cloneBuffer(buffer, isDeep) {
+      if (isDeep) {
+        return buffer.slice();
+      }
+      var length = buffer.length,
+          result = allocUnsafe ? allocUnsafe(length) : new buffer.constructor(length);
+
+      buffer.copy(result);
+      return result;
+    }
+
+    /**
+     * Creates a clone of `arrayBuffer`.
+     *
+     * @private
+     * @param {ArrayBuffer} arrayBuffer The array buffer to clone.
+     * @returns {ArrayBuffer} Returns the cloned array buffer.
+     */
+    function cloneArrayBuffer(arrayBuffer) {
+      var result = new arrayBuffer.constructor(arrayBuffer.byteLength);
+      new Uint8Array(result).set(new Uint8Array(arrayBuffer));
+      return result;
+    }
+
+    /**
+     * Creates a clone of `dataView`.
+     *
+     * @private
+     * @param {Object} dataView The data view to clone.
+     * @param {boolean} [isDeep] Specify a deep clone.
+     * @returns {Object} Returns the cloned data view.
+     */
+    function cloneDataView(dataView, isDeep) {
+      var buffer = isDeep ? cloneArrayBuffer(dataView.buffer) : dataView.buffer;
+      return new dataView.constructor(buffer, dataView.byteOffset, dataView.byteLength);
+    }
+
+    /**
+     * Creates a clone of `regexp`.
+     *
+     * @private
+     * @param {Object} regexp The regexp to clone.
+     * @returns {Object} Returns the cloned regexp.
+     */
+    function cloneRegExp(regexp) {
+      var result = new regexp.constructor(regexp.source, reFlags.exec(regexp));
+      result.lastIndex = regexp.lastIndex;
+      return result;
+    }
+
+    /**
+     * Creates a clone of the `symbol` object.
+     *
+     * @private
+     * @param {Object} symbol The symbol object to clone.
+     * @returns {Object} Returns the cloned symbol object.
+     */
+    function cloneSymbol(symbol) {
+      return symbolValueOf ? Object(symbolValueOf.call(symbol)) : {};
+    }
+
+    /**
+     * Creates a clone of `typedArray`.
+     *
+     * @private
+     * @param {Object} typedArray The typed array to clone.
+     * @param {boolean} [isDeep] Specify a deep clone.
+     * @returns {Object} Returns the cloned typed array.
+     */
+    function cloneTypedArray(typedArray, isDeep) {
+      var buffer = isDeep ? cloneArrayBuffer(typedArray.buffer) : typedArray.buffer;
+      return new typedArray.constructor(buffer, typedArray.byteOffset, typedArray.length);
+    }
+
+    /**
+     * Compares values to sort them in ascending order.
+     *
+     * @private
+     * @param {*} value The value to compare.
+     * @param {*} other The other value to compare.
+     * @returns {number} Returns the sort order indicator for `value`.
+     */
+    function compareAscending(value, other) {
+      if (value !== other) {
+        var valIsDefined = value !== undefined,
+            valIsNull = value === null,
+            valIsReflexive = value === value,
+            valIsSymbol = isSymbol(value);
+
+        var othIsDefined = other !== undefined,
+            othIsNull = other === null,
+            othIsReflexive = other === other,
+            othIsSymbol = isSymbol(other);
+
+        if ((!othIsNull && !othIsSymbol && !valIsSymbol && value > other) ||
+            (valIsSymbol && othIsDefined && othIsReflexive && !othIsNull && !othIsSymbol) ||
+            (valIsNull && othIsDefined && othIsReflexive) ||
+            (!valIsDefined && othIsReflexive) ||
+            !valIsReflexive) {
+          return 1;
+        }
+        if ((!valIsNull && !valIsSymbol && !othIsSymbol && value < other) ||
+            (othIsSymbol && valIsDefined && valIsReflexive && !valIsNull && !valIsSymbol) ||
+            (othIsNull && valIsDefined && valIsReflexive) ||
+            (!othIsDefined && valIsReflexive) ||
+            !othIsReflexive) {
+          return -1;
+        }
+      }
+      return 0;
+    }
+
+    /**
+     * Used by `_.orderBy` to compare multiple properties of a value to another
+     * and stable sort them.
+     *
+     * If `orders` is unspecified, all values are sorted in ascending order. Otherwise,
+     * specify an order of "desc" for descending or "asc" for ascending sort order
+     * of corresponding values.
+     *
+     * @private
+     * @param {Object} object The object to compare.
+     * @param {Object} other The other object to compare.
+     * @param {boolean[]|string[]} orders The order to sort by for each property.
+     * @returns {number} Returns the sort order indicator for `object`.
+     */
+    function compareMultiple(object, other, orders) {
+      var index = -1,
+          objCriteria = object.criteria,
+          othCriteria = other.criteria,
+          length = objCriteria.length,
+          ordersLength = orders.length;
+
+      while (++index < length) {
+        var result = compareAscending(objCriteria[index], othCriteria[index]);
+        if (result) {
+          if (index >= ordersLength) {
+            return result;
+          }
+          var order = orders[index];
+          return result * (order == 'desc' ? -1 : 1);
+        }
+      }
+      // Fixes an `Array#sort` bug in the JS engine embedded in Adobe applications
+      // that causes it, under certain circumstances, to provide the same value for
+      // `object` and `other`. See https://github.com/jashkenas/underscore/pull/1247
+      // for more details.
+      //
+      // This also ensures a stable sort in V8 and other engines.
+      // See https://bugs.chromium.org/p/v8/issues/detail?id=90 for more details.
+      return object.index - other.index;
+    }
+
+    /**
+     * Creates an array that is the composition of partially applied arguments,
+     * placeholders, and provided arguments into a single array of arguments.
+     *
+     * @private
+     * @param {Array} args The provided arguments.
+     * @param {Array} partials The arguments to prepend to those provided.
+     * @param {Array} holders The `partials` placeholder indexes.
+     * @params {boolean} [isCurried] Specify composing for a curried function.
+     * @returns {Array} Returns the new array of composed arguments.
+     */
+    function composeArgs(args, partials, holders, isCurried) {
+      var argsIndex = -1,
+          argsLength = args.length,
+          holdersLength = holders.length,
+          leftIndex = -1,
+          leftLength = partials.length,
+          rangeLength = nativeMax(argsLength - holdersLength, 0),
+          result = Array(leftLength + rangeLength),
+          isUncurried = !isCurried;
+
+      while (++leftIndex < leftLength) {
+        result[leftIndex] = partials[leftIndex];
+      }
+      while (++argsIndex < holdersLength) {
+        if (isUncurried || argsIndex < argsLength) {
+          result[holders[argsIndex]] = args[argsIndex];
+        }
+      }
+      while (rangeLength--) {
+        result[leftIndex++] = args[argsIndex++];
+      }
+      return result;
+    }
+
+    /**
+     * This function is like `composeArgs` except that the arguments composition
+     * is tailored for `_.partialRight`.
+     *
+     * @private
+     * @param {Array} args The provided arguments.
+     * @param {Array} partials The arguments to append to those provided.
+     * @param {Array} holders The `partials` placeholder indexes.
+     * @params {boolean} [isCurried] Specify composing for a curried function.
+     * @returns {Array} Returns the new array of composed arguments.
+     */
+    function composeArgsRight(args, partials, holders, isCurried) {
+      var argsIndex = -1,
+          argsLength = args.length,
+          holdersIndex = -1,
+          holdersLength = holders.length,
+          rightIndex = -1,
+          rightLength = partials.length,
+          rangeLength = nativeMax(argsLength - holdersLength, 0),
+          result = Array(rangeLength + rightLength),
+          isUncurried = !isCurried;
+
+      while (++argsIndex < rangeLength) {
+        result[argsIndex] = args[argsIndex];
+      }
+      var offset = argsIndex;
+      while (++rightIndex < rightLength) {
+        result[offset + rightIndex] = partials[rightIndex];
+      }
+      while (++holdersIndex < holdersLength) {
+        if (isUncurried || argsIndex < argsLength) {
+          result[offset + holders[holdersIndex]] = args[argsIndex++];
+        }
+      }
+      return result;
+    }
+
+    /**
+     * Copies the values of `source` to `array`.
+     *
+     * @private
+     * @param {Array} source The array to copy values from.
+     * @param {Array} [array=[]] The array to copy values to.
+     * @returns {Array} Returns `array`.
+     */
+    function copyArray(source, array) {
+      var index = -1,
+          length = source.length;
+
+      array || (array = Array(length));
+      while (++index < length) {
+        array[index] = source[index];
+      }
+      return array;
+    }
+
+    /**
+     * Copies properties of `source` to `object`.
+     *
+     * @private
+     * @param {Object} source The object to copy properties from.
+     * @param {Array} props The property identifiers to copy.
+     * @param {Object} [object={}] The object to copy properties to.
+     * @param {Function} [customizer] The function to customize copied values.
+     * @returns {Object} Returns `object`.
+     */
+    function copyObject(source, props, object, customizer) {
+      var isNew = !object;
+      object || (object = {});
+
+      var index = -1,
+          length = props.length;
+
+      while (++index < length) {
+        var key = props[index];
+
+        var newValue = customizer
+          ? customizer(object[key], source[key], key, object, source)
+          : undefined;
+
+        if (newValue === undefined) {
+          newValue = source[key];
+        }
+        if (isNew) {
+          baseAssignValue(object, key, newValue);
+        } else {
+          assignValue(object, key, newValue);
+        }
+      }
+      return object;
+    }
+
+    /**
+     * Copies own symbols of `source` to `object`.
+     *
+     * @private
+     * @param {Object} source The object to copy symbols from.
+     * @param {Object} [object={}] The object to copy symbols to.
+     * @returns {Object} Returns `object`.
+     */
+    function copySymbols(source, object) {
+      return copyObject(source, getSymbols(source), object);
+    }
+
+    /**
+     * Copies own and inherited symbols of `source` to `object`.
+     *
+     * @private
+     * @param {Object} source The object to copy symbols from.
+     * @param {Object} [object={}] The object to copy symbols to.
+     * @returns {Object} Returns `object`.
+     */
+    function copySymbolsIn(source, object) {
+      return copyObject(source, getSymbolsIn(source), object);
+    }
+
+    /**
+     * Creates a function like `_.groupBy`.
+     *
+     * @private
+     * @param {Function} setter The function to set accumulator values.
+     * @param {Function} [initializer] The accumulator object initializer.
+     * @returns {Function} Returns the new aggregator function.
+     */
+    function createAggregator(setter, initializer) {
+      return function(collection, iteratee) {
+        var func = isArray(collection) ? arrayAggregator : baseAggregator,
+            accumulator = initializer ? initializer() : {};
+
+        return func(collection, setter, getIteratee(iteratee, 2), accumulator);
+      };
+    }
+
+    /**
+     * Creates a function like `_.assign`.
+     *
+     * @private
+     * @param {Function} assigner The function to assign values.
+     * @returns {Function} Returns the new assigner function.
+     */
+    function createAssigner(assigner) {
+      return baseRest(function(object, sources) {
+        var index = -1,
+            length = sources.length,
+            customizer = length > 1 ? sources[length - 1] : undefined,
+            guard = length > 2 ? sources[2] : undefined;
+
+        customizer = (assigner.length > 3 && typeof customizer == 'function')
+          ? (length--, customizer)
+          : undefined;
+
+        if (guard && isIterateeCall(sources[0], sources[1], guard)) {
+          customizer = length < 3 ? undefined : customizer;
+          length = 1;
+        }
+        object = Object(object);
+        while (++index < length) {
+          var source = sources[index];
+          if (source) {
+            assigner(object, source, index, customizer);
+          }
+        }
+        return object;
+      });
+    }
+
+    /**
+     * Creates a `baseEach` or `baseEachRight` function.
+     *
+     * @private
+     * @param {Function} eachFunc The function to iterate over a collection.
+     * @param {boolean} [fromRight] Specify iterating from right to left.
+     * @returns {Function} Returns the new base function.
+     */
+    function createBaseEach(eachFunc, fromRight) {
+      return function(collection, iteratee) {
+        if (collection == null) {
+          return collection;
+        }
+        if (!isArrayLike(collection)) {
+          return eachFunc(collection, iteratee);
+        }
+        var length = collection.length,
+            index = fromRight ? length : -1,
+            iterable = Object(collection);
+
+        while ((fromRight ? index-- : ++index < length)) {
+          if (iteratee(iterable[index], index, iterable) === false) {
+            break;
+          }
+        }
+        return collection;
+      };
+    }
+
+    /**
+     * Creates a base function for methods like `_.forIn` and `_.forOwn`.
+     *
+     * @private
+     * @param {boolean} [fromRight] Specify iterating from right to left.
+     * @returns {Function} Returns the new base function.
+     */
+    function createBaseFor(fromRight) {
+      return function(object, iteratee, keysFunc) {
+        var index = -1,
+            iterable = Object(object),
+            props = keysFunc(object),
+            length = props.length;
+
+        while (length--) {
+          var key = props[fromRight ? length : ++index];
+          if (iteratee(iterable[key], key, iterable) === false) {
+            break;
+          }
+        }
+        return object;
+      };
+    }
+
+    /**
+     * Creates a function that wraps `func` to invoke it with the optional `this`
+     * binding of `thisArg`.
+     *
+     * @private
+     * @param {Function} func The function to wrap.
+     * @param {number} bitmask The bitmask flags. See `createWrap` for more details.
+     * @param {*} [thisArg] The `this` binding of `func`.
+     * @returns {Function} Returns the new wrapped function.
+     */
+    function createBind(func, bitmask, thisArg) {
+      var isBind = bitmask & WRAP_BIND_FLAG,
+          Ctor = createCtor(func);
+
+      function wrapper() {
+        var fn = (this && this !== root && this instanceof wrapper) ? Ctor : func;
+        return fn.apply(isBind ? thisArg : this, arguments);
+      }
+      return wrapper;
+    }
+
+    /**
+     * Creates a function like `_.lowerFirst`.
+     *
+     * @private
+     * @param {string} methodName The name of the `String` case method to use.
+     * @returns {Function} Returns the new case function.
+     */
+    function createCaseFirst(methodName) {
+      return function(string) {
+        string = toString(string);
+
+        var strSymbols = hasUnicode(string)
+          ? stringToArray(string)
+          : undefined;
+
+        var chr = strSymbols
+          ? strSymbols[0]
+          : string.charAt(0);
+
+        var trailing = strSymbols
+          ? castSlice(strSymbols, 1).join('')
+          : string.slice(1);
+
+        return chr[methodName]() + trailing;
+      };
+    }
+
+    /**
+     * Creates a function like `_.camelCase`.
+     *
+     * @private
+     * @param {Function} callback The function to combine each word.
+     * @returns {Function} Returns the new compounder function.
+     */
+    function createCompounder(callback) {
+      return function(string) {
+        return arrayReduce(words(deburr(string).replace(reApos, '')), callback, '');
+      };
+    }
+
+    /**
+     * Creates a function that produces an instance of `Ctor` regardless of
+     * whether it was invoked as part of a `new` expression or by `call` or `apply`.
+     *
+     * @private
+     * @param {Function} Ctor The constructor to wrap.
+     * @returns {Function} Returns the new wrapped function.
+     */
+    function createCtor(Ctor) {
+      return function() {
+        // Use a `switch` statement to work with class constructors. See
+        // http://ecma-international.org/ecma-262/7.0/#sec-ecmascript-function-objects-call-thisargument-argumentslist
+        // for more details.
+        var args = arguments;
+        switch (args.length) {
+          case 0: return new Ctor;
+          case 1: return new Ctor(args[0]);
+          case 2: return new Ctor(args[0], args[1]);
+          case 3: return new Ctor(args[0], args[1], args[2]);
+          case 4: return new Ctor(args[0], args[1], args[2], args[3]);
+          case 5: return new Ctor(args[0], args[1], args[2], args[3], args[4]);
+          case 6: return new Ctor(args[0], args[1], args[2], args[3], args[4], args[5]);
+          case 7: return new Ctor(args[0], args[1], args[2], args[3], args[4], args[5], args[6]);
+        }
+        var thisBinding = baseCreate(Ctor.prototype),
+            result = Ctor.apply(thisBinding, args);
+
+        // Mimic the constructor's `return` behavior.
+        // See https://es5.github.io/#x13.2.2 for more details.
+        return isObject(result) ? result : thisBinding;
+      };
+    }
+
+    /**
+     * Creates a function that wraps `func` to enable currying.
+     *
+     * @private
+     * @param {Function} func The function to wrap.
+     * @param {number} bitmask The bitmask flags. See `createWrap` for more details.
+     * @param {number} arity The arity of `func`.
+     * @returns {Function} Returns the new wrapped function.
+     */
+    function createCurry(func, bitmask, arity) {
+      var Ctor = createCtor(func);
+
+      function wrapper() {
+        var length = arguments.length,
+            args = Array(length),
+            index = length,
+            placeholder = getHolder(wrapper);
+
+        while (index--) {
+          args[index] = arguments[index];
+        }
+        var holders = (length < 3 && args[0] !== placeholder && args[length - 1] !== placeholder)
+          ? []
+          : replaceHolders(args, placeholder);
+
+        length -= holders.length;
+        if (length < arity) {
+          return createRecurry(
+            func, bitmask, createHybrid, wrapper.placeholder, undefined,
+            args, holders, undefined, undefined, arity - length);
+        }
+        var fn = (this && this !== root && this instanceof wrapper) ? Ctor : func;
+        return apply(fn, this, args);
+      }
+      return wrapper;
+    }
+
+    /**
+     * Creates a `_.find` or `_.findLast` function.
+     *
+     * @private
+     * @param {Function} findIndexFunc The function to find the collection index.
+     * @returns {Function} Returns the new find function.
+     */
+    function createFind(findIndexFunc) {
+      return function(collection, predicate, fromIndex) {
+        var iterable = Object(collection);
+        if (!isArrayLike(collection)) {
+          var iteratee = getIteratee(predicate, 3);
+          collection = keys(collection);
+          predicate = function(key) { return iteratee(iterable[key], key, iterable); };
+        }
+        var index = findIndexFunc(collection, predicate, fromIndex);
+        return index > -1 ? iterable[iteratee ? collection[index] : index] : undefined;
+      };
+    }
+
+    /**
+     * Creates a `_.flow` or `_.flowRight` function.
+     *
+     * @private
+     * @param {boolean} [fromRight] Specify iterating from right to left.
+     * @returns {Function} Returns the new flow function.
+     */
+    function createFlow(fromRight) {
+      return flatRest(function(funcs) {
+        var length = funcs.length,
+            index = length,
+            prereq = LodashWrapper.prototype.thru;
+
+        if (fromRight) {
+          funcs.reverse();
+        }
+        while (index--) {
+          var func = funcs[index];
+          if (typeof func != 'function') {
+            throw new TypeError(FUNC_ERROR_TEXT);
+          }
+          if (prereq && !wrapper && getFuncName(func) == 'wrapper') {
+            var wrapper = new LodashWrapper([], true);
+          }
+        }
+        index = wrapper ? index : length;
+        while (++index < length) {
+          func = funcs[index];
+
+          var funcName = getFuncName(func),
+              data = funcName == 'wrapper' ? getData(func) : undefined;
+
+          if (data && isLaziable(data[0]) &&
+                data[1] == (WRAP_ARY_FLAG | WRAP_CURRY_FLAG | WRAP_PARTIAL_FLAG | WRAP_REARG_FLAG) &&
+                !data[4].length && data[9] == 1
+              ) {
+            wrapper = wrapper[getFuncName(data[0])].apply(wrapper, data[3]);
+          } else {
+            wrapper = (func.length == 1 && isLaziable(func))
+              ? wrapper[funcName]()
+              : wrapper.thru(func);
+          }
+        }
+        return function() {
+          var args = arguments,
+              value = args[0];
+
+          if (wrapper && args.length == 1 && isArray(value)) {
+            return wrapper.plant(value).value();
+          }
+          var index = 0,
+              result = length ? funcs[index].apply(this, args) : value;
+
+          while (++index < length) {
+            result = funcs[index].call(this, result);
+          }
+          return result;
+        };
+      });
+    }
+
+    /**
+     * Creates a function that wraps `func` to invoke it with optional `this`
+     * binding of `thisArg`, partial application, and currying.
+     *
+     * @private
+     * @param {Function|string} func The function or method name to wrap.
+     * @param {number} bitmask The bitmask flags. See `createWrap` for more details.
+     * @param {*} [thisArg] The `this` binding of `func`.
+     * @param {Array} [partials] The arguments to prepend to those provided to
+     *  the new function.
+     * @param {Array} [holders] The `partials` placeholder indexes.
+     * @param {Array} [partialsRight] The arguments to append to those provided
+     *  to the new function.
+     * @param {Array} [holdersRight] The `partialsRight` placeholder indexes.
+     * @param {Array} [argPos] The argument positions of the new function.
+     * @param {number} [ary] The arity cap of `func`.
+     * @param {number} [arity] The arity of `func`.
+     * @returns {Function} Returns the new wrapped function.
+     */
+    function createHybrid(func, bitmask, thisArg, partials, holders, partialsRight, holdersRight, argPos, ary, arity) {
+      var isAry = bitmask & WRAP_ARY_FLAG,
+          isBind = bitmask & WRAP_BIND_FLAG,
+          isBindKey = bitmask & WRAP_BIND_KEY_FLAG,
+          isCurried = bitmask & (WRAP_CURRY_FLAG | WRAP_CURRY_RIGHT_FLAG),
+          isFlip = bitmask & WRAP_FLIP_FLAG,
+          Ctor = isBindKey ? undefined : createCtor(func);
+
+      function wrapper() {
+        var length = arguments.length,
+            args = Array(length),
+            index = length;
+
+        while (index--) {
+          args[index] = arguments[index];
+        }
+        if (isCurried) {
+          var placeholder = getHolder(wrapper),
+              holdersCount = countHolders(args, placeholder);
+        }
+        if (partials) {
+          args = composeArgs(args, partials, holders, isCurried);
+        }
+        if (partialsRight) {
+          args = composeArgsRight(args, partialsRight, holdersRight, isCurried);
+        }
+        length -= holdersCount;
+        if (isCurried && length < arity) {
+          var newHolders = replaceHolders(args, placeholder);
+          return createRecurry(
+            func, bitmask, createHybrid, wrapper.placeholder, thisArg,
+            args, newHolders, argPos, ary, arity - length
+          );
+        }
+        var thisBinding = isBind ? thisArg : this,
+            fn = isBindKey ? thisBinding[func] : func;
+
+        length = args.length;
+        if (argPos) {
+          args = reorder(args, argPos);
+        } else if (isFlip && length > 1) {
+          args.reverse();
+        }
+        if (isAry && ary < length) {
+          args.length = ary;
+        }
+        if (this && this !== root && this instanceof wrapper) {
+          fn = Ctor || createCtor(fn);
+        }
+        return fn.apply(thisBinding, args);
+      }
+      return wrapper;
+    }
+
+    /**
+     * Creates a function like `_.invertBy`.
+     *
+     * @private
+     * @param {Function} setter The function to set accumulator values.
+     * @param {Function} toIteratee The function to resolve iteratees.
+     * @returns {Function} Returns the new inverter function.
+     */
+    function createInverter(setter, toIteratee) {
+      return function(object, iteratee) {
+        return baseInverter(object, setter, toIteratee(iteratee), {});
+      };
+    }
+
+    /**
+     * Creates a function that performs a mathematical operation on two values.
+     *
+     * @private
+     * @param {Function} operator The function to perform the operation.
+     * @param {number} [defaultValue] The value used for `undefined` arguments.
+     * @returns {Function} Returns the new mathematical operation function.
+     */
+    function createMathOperation(operator, defaultValue) {
+      return function(value, other) {
+        var result;
+        if (value === undefined && other === undefined) {
+          return defaultValue;
+        }
+        if (value !== undefined) {
+          result = value;
+        }
+        if (other !== undefined) {
+          if (result === undefined) {
+            return other;
+          }
+          if (typeof value == 'string' || typeof other == 'string') {
+            value = baseToString(value);
+            other = baseToString(other);
+          } else {
+            value = baseToNumber(value);
+            other = baseToNumber(other);
+          }
+          result = operator(value, other);
+        }
+        return result;
+      };
+    }
+
+    /**
+     * Creates a function like `_.over`.
+     *
+     * @private
+     * @param {Function} arrayFunc The function to iterate over iteratees.
+     * @returns {Function} Returns the new over function.
+     */
+    function createOver(arrayFunc) {
+      return flatRest(function(iteratees) {
+        iteratees = arrayMap(iteratees, baseUnary(getIteratee()));
+        return baseRest(function(args) {
+          var thisArg = this;
+          return arrayFunc(iteratees, function(iteratee) {
+            return apply(iteratee, thisArg, args);
+          });
+        });
+      });
+    }
+
+    /**
+     * Creates the padding for `string` based on `length`. The `chars` string
+     * is truncated if the number of characters exceeds `length`.
+     *
+     * @private
+     * @param {number} length The padding length.
+     * @param {string} [chars=' '] The string used as padding.
+     * @returns {string} Returns the padding for `string`.
+     */
+    function createPadding(length, chars) {
+      chars = chars === undefined ? ' ' : baseToString(chars);
+
+      var charsLength = chars.length;
+      if (charsLength < 2) {
+        return charsLength ? baseRepeat(chars, length) : chars;
+      }
+      var result = baseRepeat(chars, nativeCeil(length / stringSize(chars)));
+      return hasUnicode(chars)
+        ? castSlice(stringToArray(result), 0, length).join('')
+        : result.slice(0, length);
+    }
+
+    /**
+     * Creates a function that wraps `func` to invoke it with the `this` binding
+     * of `thisArg` and `partials` prepended to the arguments it receives.
+     *
+     * @private
+     * @param {Function} func The function to wrap.
+     * @param {number} bitmask The bitmask flags. See `createWrap` for more details.
+     * @param {*} thisArg The `this` binding of `func`.
+     * @param {Array} partials The arguments to prepend to those provided to
+     *  the new function.
+     * @returns {Function} Returns the new wrapped function.
+     */
+    function createPartial(func, bitmask, thisArg, partials) {
+      var isBind = bitmask & WRAP_BIND_FLAG,
+          Ctor = createCtor(func);
+
+      function wrapper() {
+        var argsIndex = -1,
+            argsLength = arguments.length,
+            leftIndex = -1,
+            leftLength = partials.length,
+            args = Array(leftLength + argsLength),
+            fn = (this && this !== root && this instanceof wrapper) ? Ctor : func;
+
+        while (++leftIndex < leftLength) {
+          args[leftIndex] = partials[leftIndex];
+        }
+        while (argsLength--) {
+          args[leftIndex++] = arguments[++argsIndex];
+        }
+        return apply(fn, isBind ? thisArg : this, args);
+      }
+      return wrapper;
+    }
+
+    /**
+     * Creates a `_.range` or `_.rangeRight` function.
+     *
+     * @private
+     * @param {boolean} [fromRight] Specify iterating from right to left.
+     * @returns {Function} Returns the new range function.
+     */
+    function createRange(fromRight) {
+      return function(start, end, step) {
+        if (step && typeof step != 'number' && isIterateeCall(start, end, step)) {
+          end = step = undefined;
+        }
+        // Ensure the sign of `-0` is preserved.
+        start = toFinite(start);
+        if (end === undefined) {
+          end = start;
+          start = 0;
+        } else {
+          end = toFinite(end);
+        }
+        step = step === undefined ? (start < end ? 1 : -1) : toFinite(step);
+        return baseRange(start, end, step, fromRight);
+      };
+    }
+
+    /**
+     * Creates a function that performs a relational operation on two values.
+     *
+     * @private
+     * @param {Function} operator The function to perform the operation.
+     * @returns {Function} Returns the new relational operation function.
+     */
+    function createRelationalOperation(operator) {
+      return function(value, other) {
+        if (!(typeof value == 'string' && typeof other == 'string')) {
+          value = toNumber(value);
+          other = toNumber(other);
+        }
+        return operator(value, other);
+      };
+    }
+
+    /**
+     * Creates a function that wraps `func` to continue currying.
+     *
+     * @private
+     * @param {Function} func The function to wrap.
+     * @param {number} bitmask The bitmask flags. See `createWrap` for more details.
+     * @param {Function} wrapFunc The function to create the `func` wrapper.
+     * @param {*} placeholder The placeholder value.
+     * @param {*} [thisArg] The `this` binding of `func`.
+     * @param {Array} [partials] The arguments to prepend to those provided to
+     *  the new function.
+     * @param {Array} [holders] The `partials` placeholder indexes.
+     * @param {Array} [argPos] The argument positions of the new function.
+     * @param {number} [ary] The arity cap of `func`.
+     * @param {number} [arity] The arity of `func`.
+     * @returns {Function} Returns the new wrapped function.
+     */
+    function createRecurry(func, bitmask, wrapFunc, placeholder, thisArg, partials, holders, argPos, ary, arity) {
+      var isCurry = bitmask & WRAP_CURRY_FLAG,
+          newHolders = isCurry ? holders : undefined,
+          newHoldersRight = isCurry ? undefined : holders,
+          newPartials = isCurry ? partials : undefined,
+          newPartialsRight = isCurry ? undefined : partials;
+
+      bitmask |= (isCurry ? WRAP_PARTIAL_FLAG : WRAP_PARTIAL_RIGHT_FLAG);
+      bitmask &= ~(isCurry ? WRAP_PARTIAL_RIGHT_FLAG : WRAP_PARTIAL_FLAG);
+
+      if (!(bitmask & WRAP_CURRY_BOUND_FLAG)) {
+        bitmask &= ~(WRAP_BIND_FLAG | WRAP_BIND_KEY_FLAG);
+      }
+      var newData = [
+        func, bitmask, thisArg, newPartials, newHolders, newPartialsRight,
+        newHoldersRight, argPos, ary, arity
+      ];
+
+      var result = wrapFunc.apply(undefined, newData);
+      if (isLaziable(func)) {
+        setData(result, newData);
+      }
+      result.placeholder = placeholder;
+      return setWrapToString(result, func, bitmask);
+    }
+
+    /**
+     * Creates a function like `_.round`.
+     *
+     * @private
+     * @param {string} methodName The name of the `Math` method to use when rounding.
+     * @returns {Function} Returns the new round function.
+     */
+    function createRound(methodName) {
+      var func = Math[methodName];
+      return function(number, precision) {
+        number = toNumber(number);
+        precision = precision == null ? 0 : nativeMin(toInteger(precision), 292);
+        if (precision) {
+          // Shift with exponential notation to avoid floating-point issues.
+          // See [MDN](https://mdn.io/round#Examples) for more details.
+          var pair = (toString(number) + 'e').split('e'),
+              value = func(pair[0] + 'e' + (+pair[1] + precision));
+
+          pair = (toString(value) + 'e').split('e');
+          return +(pair[0] + 'e' + (+pair[1] - precision));
+        }
+        return func(number);
+      };
+    }
+
+    /**
+     * Creates a set object of `values`.
+     *
+     * @private
+     * @param {Array} values The values to add to the set.
+     * @returns {Object} Returns the new set.
+     */
+    var createSet = !(Set && (1 / setToArray(new Set([,-0]))[1]) == INFINITY) ? noop : function(values) {
+      return new Set(values);
+    };
+
+    /**
+     * Creates a `_.toPairs` or `_.toPairsIn` function.
+     *
+     * @private
+     * @param {Function} keysFunc The function to get the keys of a given object.
+     * @returns {Function} Returns the new pairs function.
+     */
+    function createToPairs(keysFunc) {
+      return function(object) {
+        var tag = getTag(object);
+        if (tag == mapTag) {
+          return mapToArray(object);
+        }
+        if (tag == setTag) {
+          return setToPairs(object);
+        }
+        return baseToPairs(object, keysFunc(object));
+      };
+    }
+
+    /**
+     * Creates a function that either curries or invokes `func` with optional
+     * `this` binding and partially applied arguments.
+     *
+     * @private
+     * @param {Function|string} func The function or method name to wrap.
+     * @param {number} bitmask The bitmask flags.
+     *    1 - `_.bind`
+     *    2 - `_.bindKey`
+     *    4 - `_.curry` or `_.curryRight` of a bound function
+     *    8 - `_.curry`
+     *   16 - `_.curryRight`
+     *   32 - `_.partial`
+     *   64 - `_.partialRight`
+     *  128 - `_.rearg`
+     *  256 - `_.ary`
+     *  512 - `_.flip`
+     * @param {*} [thisArg] The `this` binding of `func`.
+     * @param {Array} [partials] The arguments to be partially applied.
+     * @param {Array} [holders] The `partials` placeholder indexes.
+     * @param {Array} [argPos] The argument positions of the new function.
+     * @param {number} [ary] The arity cap of `func`.
+     * @param {number} [arity] The arity of `func`.
+     * @returns {Function} Returns the new wrapped function.
+     */
+    function createWrap(func, bitmask, thisArg, partials, holders, argPos, ary, arity) {
+      var isBindKey = bitmask & WRAP_BIND_KEY_FLAG;
+      if (!isBindKey && typeof func != 'function') {
+        throw new TypeError(FUNC_ERROR_TEXT);
+      }
+      var length = partials ? partials.length : 0;
+      if (!length) {
+        bitmask &= ~(WRAP_PARTIAL_FLAG | WRAP_PARTIAL_RIGHT_FLAG);
+        partials = holders = undefined;
+      }
+      ary = ary === undefined ? ary : nativeMax(toInteger(ary), 0);
+      arity = arity === undefined ? arity : toInteger(arity);
+      length -= holders ? holders.length : 0;
+
+      if (bitmask & WRAP_PARTIAL_RIGHT_FLAG) {
+        var partialsRight = partials,
+            holdersRight = holders;
+
+        partials = holders = undefined;
+      }
+      var data = isBindKey ? undefined : getData(func);
+
+      var newData = [
+        func, bitmask, thisArg, partials, holders, partialsRight, holdersRight,
+        argPos, ary, arity
+      ];
+
+      if (data) {
+        mergeData(newData, data);
+      }
+      func = newData[0];
+      bitmask = newData[1];
+      thisArg = newData[2];
+      partials = newData[3];
+      holders = newData[4];
+      arity = newData[9] = newData[9] === undefined
+        ? (isBindKey ? 0 : func.length)
+        : nativeMax(newData[9] - length, 0);
+
+      if (!arity && bitmask & (WRAP_CURRY_FLAG | WRAP_CURRY_RIGHT_FLAG)) {
+        bitmask &= ~(WRAP_CURRY_FLAG | WRAP_CURRY_RIGHT_FLAG);
+      }
+      if (!bitmask || bitmask == WRAP_BIND_FLAG) {
+        var result = createBind(func, bitmask, thisArg);
+      } else if (bitmask == WRAP_CURRY_FLAG || bitmask == WRAP_CURRY_RIGHT_FLAG) {
+        result = createCurry(func, bitmask, arity);
+      } else if ((bitmask == WRAP_PARTIAL_FLAG || bitmask == (WRAP_BIND_FLAG | WRAP_PARTIAL_FLAG)) && !holders.length) {
+        result = createPartial(func, bitmask, thisArg, partials);
+      } else {
+        result = createHybrid.apply(undefined, newData);
+      }
+      var setter = data ? baseSetData : setData;
+      return setWrapToString(setter(result, newData), func, bitmask);
+    }
+
+    /**
+     * Used by `_.defaults` to customize its `_.assignIn` use to assign properties
+     * of source objects to the destination object for all destination properties
+     * that resolve to `undefined`.
+     *
+     * @private
+     * @param {*} objValue The destination value.
+     * @param {*} srcValue The source value.
+     * @param {string} key The key of the property to assign.
+     * @param {Object} object The parent object of `objValue`.
+     * @returns {*} Returns the value to assign.
+     */
+    function customDefaultsAssignIn(objValue, srcValue, key, object) {
+      if (objValue === undefined ||
+          (eq(objValue, objectProto[key]) && !hasOwnProperty.call(object, key))) {
+        return srcValue;
+      }
+      return objValue;
+    }
+
+    /**
+     * Used by `_.defaultsDeep` to customize its `_.merge` use to merge source
+     * objects into destination objects that are passed thru.
+     *
+     * @private
+     * @param {*} objValue The destination value.
+     * @param {*} srcValue The source value.
+     * @param {string} key The key of the property to merge.
+     * @param {Object} object The parent object of `objValue`.
+     * @param {Object} source The parent object of `srcValue`.
+     * @param {Object} [stack] Tracks traversed source values and their merged
+     *  counterparts.
+     * @returns {*} Returns the value to assign.
+     */
+    function customDefaultsMerge(objValue, srcValue, key, object, source, stack) {
+      if (isObject(objValue) && isObject(srcValue)) {
+        // Recursively merge objects and arrays (susceptible to call stack limits).
+        stack.set(srcValue, objValue);
+        baseMerge(objValue, srcValue, undefined, customDefaultsMerge, stack);
+        stack['delete'](srcValue);
+      }
+      return objValue;
+    }
+
+    /**
+     * Used by `_.omit` to customize its `_.cloneDeep` use to only clone plain
+     * objects.
+     *
+     * @private
+     * @param {*} value The value to inspect.
+     * @param {string} key The key of the property to inspect.
+     * @returns {*} Returns the uncloned value or `undefined` to defer cloning to `_.cloneDeep`.
+     */
+    function customOmitClone(value) {
+      return isPlainObject(value) ? undefined : value;
+    }
+
+    /**
+     * A specialized version of `baseIsEqualDeep` for arrays with support for
+     * partial deep comparisons.
+     *
+     * @private
+     * @param {Array} array The array to compare.
+     * @param {Array} other The other array to compare.
+     * @param {number} bitmask The bitmask flags. See `baseIsEqual` for more details.
+     * @param {Function} customizer The function to customize comparisons.
+     * @param {Function} equalFunc The function to determine equivalents of values.
+     * @param {Object} stack Tracks traversed `array` and `other` objects.
+     * @returns {boolean} Returns `true` if the arrays are equivalent, else `false`.
+     */
+    function equalArrays(array, other, bitmask, customizer, equalFunc, stack) {
+      var isPartial = bitmask & COMPARE_PARTIAL_FLAG,
+          arrLength = array.length,
+          othLength = other.length;
+
+      if (arrLength != othLength && !(isPartial && othLength > arrLength)) {
+        return false;
+      }
+      // Assume cyclic values are equal.
+      var stacked = stack.get(array);
+      if (stacked && stack.get(other)) {
+        return stacked == other;
+      }
+      var index = -1,
+          result = true,
+          seen = (bitmask & COMPARE_UNORDERED_FLAG) ? new SetCache : undefined;
+
+      stack.set(array, other);
+      stack.set(other, array);
+
+      // Ignore non-index properties.
+      while (++index < arrLength) {
+        var arrValue = array[index],
+            othValue = other[index];
+
+        if (customizer) {
+          var compared = isPartial
+            ? customizer(othValue, arrValue, index, other, array, stack)
+            : customizer(arrValue, othValue, index, array, other, stack);
+        }
+        if (compared !== undefined) {
+          if (compared) {
+            continue;
+          }
+          result = false;
+          break;
+        }
+        // Recursively compare arrays (susceptible to call stack limits).
+        if (seen) {
+          if (!arraySome(other, function(othValue, othIndex) {
+                if (!cacheHas(seen, othIndex) &&
+                    (arrValue === othValue || equalFunc(arrValue, othValue, bitmask, customizer, stack))) {
+                  return seen.push(othIndex);
+                }
+              })) {
+            result = false;
+            break;
+          }
+        } else if (!(
+              arrValue === othValue ||
+                equalFunc(arrValue, othValue, bitmask, customizer, stack)
+            )) {
+          result = false;
+          break;
+        }
+      }
+      stack['delete'](array);
+      stack['delete'](other);
+      return result;
+    }
+
+    /**
+     * A specialized version of `baseIsEqualDeep` for comparing objects of
+     * the same `toStringTag`.
+     *
+     * **Note:** This function only supports comparing values with tags of
+     * `Boolean`, `Date`, `Error`, `Number`, `RegExp`, or `String`.
+     *
+     * @private
+     * @param {Object} object The object to compare.
+     * @param {Object} other The other object to compare.
+     * @param {string} tag The `toStringTag` of the objects to compare.
+     * @param {number} bitmask The bitmask flags. See `baseIsEqual` for more details.
+     * @param {Function} customizer The function to customize comparisons.
+     * @param {Function} equalFunc The function to determine equivalents of values.
+     * @param {Object} stack Tracks traversed `object` and `other` objects.
+     * @returns {boolean} Returns `true` if the objects are equivalent, else `false`.
+     */
+    function equalByTag(object, other, tag, bitmask, customizer, equalFunc, stack) {
+      switch (tag) {
+        case dataViewTag:
+          if ((object.byteLength != other.byteLength) ||
+              (object.byteOffset != other.byteOffset)) {
+            return false;
+          }
+          object = object.buffer;
+          other = other.buffer;
+
+        case arrayBufferTag:
+          if ((object.byteLength != other.byteLength) ||
+              !equalFunc(new Uint8Array(object), new Uint8Array(other))) {
+            return false;
+          }
+          return true;
+
+        case boolTag:
+        case dateTag:
+        case numberTag:
+          // Coerce booleans to `1` or `0` and dates to milliseconds.
+          // Invalid dates are coerced to `NaN`.
+          return eq(+object, +other);
+
+        case errorTag:
+          return object.name == other.name && object.message == other.message;
+
+        case regexpTag:
+        case stringTag:
+          // Coerce regexes to strings and treat strings, primitives and objects,
+          // as equal. See http://www.ecma-international.org/ecma-262/7.0/#sec-regexp.prototype.tostring
+          // for more details.
+          return object == (other + '');
+
+        case mapTag:
+          var convert = mapToArray;
+
+        case setTag:
+          var isPartial = bitmask & COMPARE_PARTIAL_FLAG;
+          convert || (convert = setToArray);
+
+          if (object.size != other.size && !isPartial) {
+            return false;
+          }
+          // Assume cyclic values are equal.
+          var stacked = stack.get(object);
+          if (stacked) {
+            return stacked == other;
+          }
+          bitmask |= COMPARE_UNORDERED_FLAG;
+
+          // Recursively compare objects (susceptible to call stack limits).
+          stack.set(object, other);
+          var result = equalArrays(convert(object), convert(other), bitmask, customizer, equalFunc, stack);
+          stack['delete'](object);
+          return result;
+
+        case symbolTag:
+          if (symbolValueOf) {
+            return symbolValueOf.call(object) == symbolValueOf.call(other);
+          }
+      }
+      return false;
+    }
+
+    /**
+     * A specialized version of `baseIsEqualDeep` for objects with support for
+     * partial deep comparisons.
+     *
+     * @private
+     * @param {Object} object The object to compare.
+     * @param {Object} other The other object to compare.
+     * @param {number} bitmask The bitmask flags. See `baseIsEqual` for more details.
+     * @param {Function} customizer The function to customize comparisons.
+     * @param {Function} equalFunc The function to determine equivalents of values.
+     * @param {Object} stack Tracks traversed `object` and `other` objects.
+     * @returns {boolean} Returns `true` if the objects are equivalent, else `false`.
+     */
+    function equalObjects(object, other, bitmask, customizer, equalFunc, stack) {
+      var isPartial = bitmask & COMPARE_PARTIAL_FLAG,
+          objProps = getAllKeys(object),
+          objLength = objProps.length,
+          othProps = getAllKeys(other),
+          othLength = othProps.length;
+
+      if (objLength != othLength && !isPartial) {
+        return false;
+      }
+      var index = objLength;
+      while (index--) {
+        var key = objProps[index];
+        if (!(isPartial ? key in other : hasOwnProperty.call(other, key))) {
+          return false;
+        }
+      }
+      // Assume cyclic values are equal.
+      var stacked = stack.get(object);
+      if (stacked && stack.get(other)) {
+        return stacked == other;
+      }
+      var result = true;
+      stack.set(object, other);
+      stack.set(other, object);
+
+      var skipCtor = isPartial;
+      while (++index < objLength) {
+        key = objProps[index];
+        var objValue = object[key],
+            othValue = other[key];
+
+        if (customizer) {
+          var compared = isPartial
+            ? customizer(othValue, objValue, key, other, object, stack)
+            : customizer(objValue, othValue, key, object, other, stack);
+        }
+        // Recursively compare objects (susceptible to call stack limits).
+        if (!(compared === undefined
+              ? (objValue === othValue || equalFunc(objValue, othValue, bitmask, customizer, stack))
+              : compared
+            )) {
+          result = false;
+          break;
+        }
+        skipCtor || (skipCtor = key == 'constructor');
+      }
+      if (result && !skipCtor) {
+        var objCtor = object.constructor,
+            othCtor = other.constructor;
+
+        // Non `Object` object instances with different constructors are not equal.
+        if (objCtor != othCtor &&
+            ('constructor' in object && 'constructor' in other) &&
+            !(typeof objCtor == 'function' && objCtor instanceof objCtor &&
+              typeof othCtor == 'function' && othCtor instanceof othCtor)) {
+          result = false;
+        }
+      }
+      stack['delete'](object);
+      stack['delete'](other);
+      return result;
+    }
+
+    /**
+     * A specialized version of `baseRest` which flattens the rest array.
+     *
+     * @private
+     * @param {Function} func The function to apply a rest parameter to.
+     * @returns {Function} Returns the new function.
+     */
+    function flatRest(func) {
+      return setToString(overRest(func, undefined, flatten), func + '');
+    }
+
+    /**
+     * Creates an array of own enumerable property names and symbols of `object`.
+     *
+     * @private
+     * @param {Object} object The object to query.
+     * @returns {Array} Returns the array of property names and symbols.
+     */
+    function getAllKeys(object) {
+      return baseGetAllKeys(object, keys, getSymbols);
+    }
+
+    /**
+     * Creates an array of own and inherited enumerable property names and
+     * symbols of `object`.
+     *
+     * @private
+     * @param {Object} object The object to query.
+     * @returns {Array} Returns the array of property names and symbols.
+     */
+    function getAllKeysIn(object) {
+      return baseGetAllKeys(object, keysIn, getSymbolsIn);
+    }
+
+    /**
+     * Gets metadata for `func`.
+     *
+     * @private
+     * @param {Function} func The function to query.
+     * @returns {*} Returns the metadata for `func`.
+     */
+    var getData = !metaMap ? noop : function(func) {
+      return metaMap.get(func);
+    };
+
+    /**
+     * Gets the name of `func`.
+     *
+     * @private
+     * @param {Function} func The function to query.
+     * @returns {string} Returns the function name.
+     */
+    function getFuncName(func) {
+      var result = (func.name + ''),
+          array = realNames[result],
+          length = hasOwnProperty.call(realNames, result) ? array.length : 0;
+
+      while (length--) {
+        var data = array[length],
+            otherFunc = data.func;
+        if (otherFunc == null || otherFunc == func) {
+          return data.name;
+        }
+      }
+      return result;
+    }
+
+    /**
+     * Gets the argument placeholder value for `func`.
+     *
+     * @private
+     * @param {Function} func The function to inspect.
+     * @returns {*} Returns the placeholder value.
+     */
+    function getHolder(func) {
+      var object = hasOwnProperty.call(lodash, 'placeholder') ? lodash : func;
+      return object.placeholder;
+    }
+
+    /**
+     * Gets the appropriate "iteratee" function. If `_.iteratee` is customized,
+     * this function returns the custom method, otherwise it returns `baseIteratee`.
+     * If arguments are provided, the chosen function is invoked with them and
+     * its result is returned.
+     *
+     * @private
+     * @param {*} [value] The value to convert to an iteratee.
+     * @param {number} [arity] The arity of the created iteratee.
+     * @returns {Function} Returns the chosen function or its result.
+     */
+    function getIteratee() {
+      var result = lodash.iteratee || iteratee;
+      result = result === iteratee ? baseIteratee : result;
+      return arguments.length ? result(arguments[0], arguments[1]) : result;
+    }
+
+    /**
+     * Gets the data for `map`.
+     *
+     * @private
+     * @param {Object} map The map to query.
+     * @param {string} key The reference key.
+     * @returns {*} Returns the map data.
+     */
+    function getMapData(map, key) {
+      var data = map.__data__;
+      return isKeyable(key)
+        ? data[typeof key == 'string' ? 'string' : 'hash']
+        : data.map;
+    }
+
+    /**
+     * Gets the property names, values, and compare flags of `object`.
+     *
+     * @private
+     * @param {Object} object The object to query.
+     * @returns {Array} Returns the match data of `object`.
+     */
+    function getMatchData(object) {
+      var result = keys(object),
+          length = result.length;
+
+      while (length--) {
+        var key = result[length],
+            value = object[key];
+
+        result[length] = [key, value, isStrictComparable(value)];
+      }
+      return result;
+    }
+
+    /**
+     * Gets the native function at `key` of `object`.
+     *
+     * @private
+     * @param {Object} object The object to query.
+     * @param {string} key The key of the method to get.
+     * @returns {*} Returns the function if it's native, else `undefined`.
+     */
+    function getNative(object, key) {
+      var value = getValue(object, key);
+      return baseIsNative(value) ? value : undefined;
+    }
+
+    /**
+     * A specialized version of `baseGetTag` which ignores `Symbol.toStringTag` values.
+     *
+     * @private
+     * @param {*} value The value to query.
+     * @returns {string} Returns the raw `toStringTag`.
+     */
+    function getRawTag(value) {
+      var isOwn = hasOwnProperty.call(value, symToStringTag),
+          tag = value[symToStringTag];
+
+      try {
+        value[symToStringTag] = undefined;
+        var unmasked = true;
+      } catch (e) {}
+
+      var result = nativeObjectToString.call(value);
+      if (unmasked) {
+        if (isOwn) {
+          value[symToStringTag] = tag;
+        } else {
+          delete value[symToStringTag];
+        }
+      }
+      return result;
+    }
+
+    /**
+     * Creates an array of the own enumerable symbols of `object`.
+     *
+     * @private
+     * @param {Object} object The object to query.
+     * @returns {Array} Returns the array of symbols.
+     */
+    var getSymbols = !nativeGetSymbols ? stubArray : function(object) {
+      if (object == null) {
+        return [];
+      }
+      object = Object(object);
+      return arrayFilter(nativeGetSymbols(object), function(symbol) {
+        return propertyIsEnumerable.call(object, symbol);
+      });
+    };
+
+    /**
+     * Creates an array of the own and inherited enumerable symbols of `object`.
+     *
+     * @private
+     * @param {Object} object The object to query.
+     * @returns {Array} Returns the array of symbols.
+     */
+    var getSymbolsIn = !nativeGetSymbols ? stubArray : function(object) {
+      var result = [];
+      while (object) {
+        arrayPush(result, getSymbols(object));
+        object = getPrototype(object);
+      }
+      return result;
+    };
+
+    /**
+     * Gets the `toStringTag` of `value`.
+     *
+     * @private
+     * @param {*} value The value to query.
+     * @returns {string} Returns the `toStringTag`.
+     */
+    var getTag = baseGetTag;
+
+    // Fallback for data views, maps, sets, and weak maps in IE 11 and promises in Node.js < 6.
+    if ((DataView && getTag(new DataView(new ArrayBuffer(1))) != dataViewTag) ||
+        (Map && getTag(new Map) != mapTag) ||
+        (Promise && getTag(Promise.resolve()) != promiseTag) ||
+        (Set && getTag(new Set) != setTag) ||
+        (WeakMap && getTag(new WeakMap) != weakMapTag)) {
+      getTag = function(value) {
+        var result = baseGetTag(value),
+            Ctor = result == objectTag ? value.constructor : undefined,
+            ctorString = Ctor ? toSource(Ctor) : '';
+
+        if (ctorString) {
+          switch (ctorString) {
+            case dataViewCtorString: return dataViewTag;
+            case mapCtorString: return mapTag;
+            case promiseCtorString: return promiseTag;
+            case setCtorString: return setTag;
+            case weakMapCtorString: return weakMapTag;
+          }
+        }
+        return result;
+      };
+    }
+
+    /**
+     * Gets the view, applying any `transforms` to the `start` and `end` positions.
+     *
+     * @private
+     * @param {number} start The start of the view.
+     * @param {number} end The end of the view.
+     * @param {Array} transforms The transformations to apply to the view.
+     * @returns {Object} Returns an object containing the `start` and `end`
+     *  positions of the view.
+     */
+    function getView(start, end, transforms) {
+      var index = -1,
+          length = transforms.length;
+
+      while (++index < length) {
+        var data = transforms[index],
+            size = data.size;
+
+        switch (data.type) {
+          case 'drop':      start += size; break;
+          case 'dropRight': end -= size; break;
+          case 'take':      end = nativeMin(end, start + size); break;
+          case 'takeRight': start = nativeMax(start, end - size); break;
+        }
+      }
+      return { 'start': start, 'end': end };
+    }
+
+    /**
+     * Extracts wrapper details from the `source` body comment.
+     *
+     * @private
+     * @param {string} source The source to inspect.
+     * @returns {Array} Returns the wrapper details.
+     */
+    function getWrapDetails(source) {
+      var match = source.match(reWrapDetails);
+      return match ? match[1].split(reSplitDetails) : [];
+    }
+
+    /**
+     * Checks if `path` exists on `object`.
+     *
+     * @private
+     * @param {Object} object The object to query.
+     * @param {Array|string} path The path to check.
+     * @param {Function} hasFunc The function to check properties.
+     * @returns {boolean} Returns `true` if `path` exists, else `false`.
+     */
+    function hasPath(object, path, hasFunc) {
+      path = castPath(path, object);
+
+      var index = -1,
+          length = path.length,
+          result = false;
+
+      while (++index < length) {
+        var key = toKey(path[index]);
+        if (!(result = object != null && hasFunc(object, key))) {
+          break;
+        }
+        object = object[key];
+      }
+      if (result || ++index != length) {
+        return result;
+      }
+      length = object == null ? 0 : object.length;
+      return !!length && isLength(length) && isIndex(key, length) &&
+        (isArray(object) || isArguments(object));
+    }
+
+    /**
+     * Initializes an array clone.
+     *
+     * @private
+     * @param {Array} array The array to clone.
+     * @returns {Array} Returns the initialized clone.
+     */
+    function initCloneArray(array) {
+      var length = array.length,
+          result = new array.constructor(length);
+
+      // Add properties assigned by `RegExp#exec`.
+      if (length && typeof array[0] == 'string' && hasOwnProperty.call(array, 'index')) {
+        result.index = array.index;
+        result.input = array.input;
+      }
+      return result;
+    }
+
+    /**
+     * Initializes an object clone.
+     *
+     * @private
+     * @param {Object} object The object to clone.
+     * @returns {Object} Returns the initialized clone.
+     */
+    function initCloneObject(object) {
+      return (typeof object.constructor == 'function' && !isPrototype(object))
+        ? baseCreate(getPrototype(object))
+        : {};
+    }
+
+    /**
+     * Initializes an object clone based on its `toStringTag`.
+     *
+     * **Note:** This function only supports cloning values with tags of
+     * `Boolean`, `Date`, `Error`, `Map`, `Number`, `RegExp`, `Set`, or `String`.
+     *
+     * @private
+     * @param {Object} object The object to clone.
+     * @param {string} tag The `toStringTag` of the object to clone.
+     * @param {boolean} [isDeep] Specify a deep clone.
+     * @returns {Object} Returns the initialized clone.
+     */
+    function initCloneByTag(object, tag, isDeep) {
+      var Ctor = object.constructor;
+      switch (tag) {
+        case arrayBufferTag:
+          return cloneArrayBuffer(object);
+
+        case boolTag:
+        case dateTag:
+          return new Ctor(+object);
+
+        case dataViewTag:
+          return cloneDataView(object, isDeep);
+
+        case float32Tag: case float64Tag:
+        case int8Tag: case int16Tag: case int32Tag:
+        case uint8Tag: case uint8ClampedTag: case uint16Tag: case uint32Tag:
+          return cloneTypedArray(object, isDeep);
+
+        case mapTag:
+          return new Ctor;
+
+        case numberTag:
+        case stringTag:
+          return new Ctor(object);
+
+        case regexpTag:
+          return cloneRegExp(object);
+
+        case setTag:
+          return new Ctor;
+
+        case symbolTag:
+          return cloneSymbol(object);
+      }
+    }
+
+    /**
+     * Inserts wrapper `details` in a comment at the top of the `source` body.
+     *
+     * @private
+     * @param {string} source The source to modify.
+     * @returns {Array} details The details to insert.
+     * @returns {string} Returns the modified source.
+     */
+    function insertWrapDetails(source, details) {
+      var length = details.length;
+      if (!length) {
+        return source;
+      }
+      var lastIndex = length - 1;
+      details[lastIndex] = (length > 1 ? '& ' : '') + details[lastIndex];
+      details = details.join(length > 2 ? ', ' : ' ');
+      return source.replace(reWrapComment, '{\n/* [wrapped with ' + details + '] */\n');
+    }
+
+    /**
+     * Checks if `value` is a flattenable `arguments` object or array.
+     *
+     * @private
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is flattenable, else `false`.
+     */
+    function isFlattenable(value) {
+      return isArray(value) || isArguments(value) ||
+        !!(spreadableSymbol && value && value[spreadableSymbol]);
+    }
+
+    /**
+     * Checks if `value` is a valid array-like index.
+     *
+     * @private
+     * @param {*} value The value to check.
+     * @param {number} [length=MAX_SAFE_INTEGER] The upper bounds of a valid index.
+     * @returns {boolean} Returns `true` if `value` is a valid index, else `false`.
+     */
+    function isIndex(value, length) {
+      var type = typeof value;
+      length = length == null ? MAX_SAFE_INTEGER : length;
+
+      return !!length &&
+        (type == 'number' ||
+          (type != 'symbol' && reIsUint.test(value))) &&
+            (value > -1 && value % 1 == 0 && value < length);
+    }
+
+    /**
+     * Checks if the given arguments are from an iteratee call.
+     *
+     * @private
+     * @param {*} value The potential iteratee value argument.
+     * @param {*} index The potential iteratee index or key argument.
+     * @param {*} object The potential iteratee object argument.
+     * @returns {boolean} Returns `true` if the arguments are from an iteratee call,
+     *  else `false`.
+     */
+    function isIterateeCall(value, index, object) {
+      if (!isObject(object)) {
+        return false;
+      }
+      var type = typeof index;
+      if (type == 'number'
+            ? (isArrayLike(object) && isIndex(index, object.length))
+            : (type == 'string' && index in object)
+          ) {
+        return eq(object[index], value);
+      }
+      return false;
+    }
+
+    /**
+     * Checks if `value` is a property name and not a property path.
+     *
+     * @private
+     * @param {*} value The value to check.
+     * @param {Object} [object] The object to query keys on.
+     * @returns {boolean} Returns `true` if `value` is a property name, else `false`.
+     */
+    function isKey(value, object) {
+      if (isArray(value)) {
+        return false;
+      }
+      var type = typeof value;
+      if (type == 'number' || type == 'symbol' || type == 'boolean' ||
+          value == null || isSymbol(value)) {
+        return true;
+      }
+      return reIsPlainProp.test(value) || !reIsDeepProp.test(value) ||
+        (object != null && value in Object(object));
+    }
+
+    /**
+     * Checks if `value` is suitable for use as unique object key.
+     *
+     * @private
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is suitable, else `false`.
+     */
+    function isKeyable(value) {
+      var type = typeof value;
+      return (type == 'string' || type == 'number' || type == 'symbol' || type == 'boolean')
+        ? (value !== '__proto__')
+        : (value === null);
+    }
+
+    /**
+     * Checks if `func` has a lazy counterpart.
+     *
+     * @private
+     * @param {Function} func The function to check.
+     * @returns {boolean} Returns `true` if `func` has a lazy counterpart,
+     *  else `false`.
+     */
+    function isLaziable(func) {
+      var funcName = getFuncName(func),
+          other = lodash[funcName];
+
+      if (typeof other != 'function' || !(funcName in LazyWrapper.prototype)) {
+        return false;
+      }
+      if (func === other) {
+        return true;
+      }
+      var data = getData(other);
+      return !!data && func === data[0];
+    }
+
+    /**
+     * Checks if `func` has its source masked.
+     *
+     * @private
+     * @param {Function} func The function to check.
+     * @returns {boolean} Returns `true` if `func` is masked, else `false`.
+     */
+    function isMasked(func) {
+      return !!maskSrcKey && (maskSrcKey in func);
+    }
+
+    /**
+     * Checks if `func` is capable of being masked.
+     *
+     * @private
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `func` is maskable, else `false`.
+     */
+    var isMaskable = coreJsData ? isFunction : stubFalse;
+
+    /**
+     * Checks if `value` is likely a prototype object.
+     *
+     * @private
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is a prototype, else `false`.
+     */
+    function isPrototype(value) {
+      var Ctor = value && value.constructor,
+          proto = (typeof Ctor == 'function' && Ctor.prototype) || objectProto;
+
+      return value === proto;
+    }
+
+    /**
+     * Checks if `value` is suitable for strict equality comparisons, i.e. `===`.
+     *
+     * @private
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` if suitable for strict
+     *  equality comparisons, else `false`.
+     */
+    function isStrictComparable(value) {
+      return value === value && !isObject(value);
+    }
+
+    /**
+     * A specialized version of `matchesProperty` for source values suitable
+     * for strict equality comparisons, i.e. `===`.
+     *
+     * @private
+     * @param {string} key The key of the property to get.
+     * @param {*} srcValue The value to match.
+     * @returns {Function} Returns the new spec function.
+     */
+    function matchesStrictComparable(key, srcValue) {
+      return function(object) {
+        if (object == null) {
+          return false;
+        }
+        return object[key] === srcValue &&
+          (srcValue !== undefined || (key in Object(object)));
+      };
+    }
+
+    /**
+     * A specialized version of `_.memoize` which clears the memoized function's
+     * cache when it exceeds `MAX_MEMOIZE_SIZE`.
+     *
+     * @private
+     * @param {Function} func The function to have its output memoized.
+     * @returns {Function} Returns the new memoized function.
+     */
+    function memoizeCapped(func) {
+      var result = memoize(func, function(key) {
+        if (cache.size === MAX_MEMOIZE_SIZE) {
+          cache.clear();
+        }
+        return key;
+      });
+
+      var cache = result.cache;
+      return result;
+    }
+
+    /**
+     * Merges the function metadata of `source` into `data`.
+     *
+     * Merging metadata reduces the number of wrappers used to invoke a function.
+     * This is possible because methods like `_.bind`, `_.curry`, and `_.partial`
+     * may be applied regardless of execution order. Methods like `_.ary` and
+     * `_.rearg` modify function arguments, making the order in which they are
+     * executed important, preventing the merging of metadata. However, we make
+     * an exception for a safe combined case where curried functions have `_.ary`
+     * and or `_.rearg` applied.
+     *
+     * @private
+     * @param {Array} data The destination metadata.
+     * @param {Array} source The source metadata.
+     * @returns {Array} Returns `data`.
+     */
+    function mergeData(data, source) {
+      var bitmask = data[1],
+          srcBitmask = source[1],
+          newBitmask = bitmask | srcBitmask,
+          isCommon = newBitmask < (WRAP_BIND_FLAG | WRAP_BIND_KEY_FLAG | WRAP_ARY_FLAG);
+
+      var isCombo =
+        ((srcBitmask == WRAP_ARY_FLAG) && (bitmask == WRAP_CURRY_FLAG)) ||
+        ((srcBitmask == WRAP_ARY_FLAG) && (bitmask == WRAP_REARG_FLAG) && (data[7].length <= source[8])) ||
+        ((srcBitmask == (WRAP_ARY_FLAG | WRAP_REARG_FLAG)) && (source[7].length <= source[8]) && (bitmask == WRAP_CURRY_FLAG));
+
+      // Exit early if metadata can't be merged.
+      if (!(isCommon || isCombo)) {
+        return data;
+      }
+      // Use source `thisArg` if available.
+      if (srcBitmask & WRAP_BIND_FLAG) {
+        data[2] = source[2];
+        // Set when currying a bound function.
+        newBitmask |= bitmask & WRAP_BIND_FLAG ? 0 : WRAP_CURRY_BOUND_FLAG;
+      }
+      // Compose partial arguments.
+      var value = source[3];
+      if (value) {
+        var partials = data[3];
+        data[3] = partials ? composeArgs(partials, value, source[4]) : value;
+        data[4] = partials ? replaceHolders(data[3], PLACEHOLDER) : source[4];
+      }
+      // Compose partial right arguments.
+      value = source[5];
+      if (value) {
+        partials = data[5];
+        data[5] = partials ? composeArgsRight(partials, value, source[6]) : value;
+        data[6] = partials ? replaceHolders(data[5], PLACEHOLDER) : source[6];
+      }
+      // Use source `argPos` if available.
+      value = source[7];
+      if (value) {
+        data[7] = value;
+      }
+      // Use source `ary` if it's smaller.
+      if (srcBitmask & WRAP_ARY_FLAG) {
+        data[8] = data[8] == null ? source[8] : nativeMin(data[8], source[8]);
+      }
+      // Use source `arity` if one is not provided.
+      if (data[9] == null) {
+        data[9] = source[9];
+      }
+      // Use source `func` and merge bitmasks.
+      data[0] = source[0];
+      data[1] = newBitmask;
+
+      return data;
+    }
+
+    /**
+     * This function is like
+     * [`Object.keys`](http://ecma-international.org/ecma-262/7.0/#sec-object.keys)
+     * except that it includes inherited enumerable properties.
+     *
+     * @private
+     * @param {Object} object The object to query.
+     * @returns {Array} Returns the array of property names.
+     */
+    function nativeKeysIn(object) {
+      var result = [];
+      if (object != null) {
+        for (var key in Object(object)) {
+          result.push(key);
+        }
+      }
+      return result;
+    }
+
+    /**
+     * Converts `value` to a string using `Object.prototype.toString`.
+     *
+     * @private
+     * @param {*} value The value to convert.
+     * @returns {string} Returns the converted string.
+     */
+    function objectToString(value) {
+      return nativeObjectToString.call(value);
+    }
+
+    /**
+     * A specialized version of `baseRest` which transforms the rest array.
+     *
+     * @private
+     * @param {Function} func The function to apply a rest parameter to.
+     * @param {number} [start=func.length-1] The start position of the rest parameter.
+     * @param {Function} transform The rest array transform.
+     * @returns {Function} Returns the new function.
+     */
+    function overRest(func, start, transform) {
+      start = nativeMax(start === undefined ? (func.length - 1) : start, 0);
+      return function() {
+        var args = arguments,
+            index = -1,
+            length = nativeMax(args.length - start, 0),
+            array = Array(length);
+
+        while (++index < length) {
+          array[index] = args[start + index];
+        }
+        index = -1;
+        var otherArgs = Array(start + 1);
+        while (++index < start) {
+          otherArgs[index] = args[index];
+        }
+        otherArgs[start] = transform(array);
+        return apply(func, this, otherArgs);
+      };
+    }
+
+    /**
+     * Gets the parent value at `path` of `object`.
+     *
+     * @private
+     * @param {Object} object The object to query.
+     * @param {Array} path The path to get the parent value of.
+     * @returns {*} Returns the parent value.
+     */
+    function parent(object, path) {
+      return path.length < 2 ? object : baseGet(object, baseSlice(path, 0, -1));
+    }
+
+    /**
+     * Reorder `array` according to the specified indexes where the element at
+     * the first index is assigned as the first element, the element at
+     * the second index is assigned as the second element, and so on.
+     *
+     * @private
+     * @param {Array} array The array to reorder.
+     * @param {Array} indexes The arranged array indexes.
+     * @returns {Array} Returns `array`.
+     */
+    function reorder(array, indexes) {
+      var arrLength = array.length,
+          length = nativeMin(indexes.length, arrLength),
+          oldArray = copyArray(array);
+
+      while (length--) {
+        var index = indexes[length];
+        array[length] = isIndex(index, arrLength) ? oldArray[index] : undefined;
+      }
+      return array;
+    }
+
+    /**
+     * Sets metadata for `func`.
+     *
+     * **Note:** If this function becomes hot, i.e. is invoked a lot in a short
+     * period of time, it will trip its breaker and transition to an identity
+     * function to avoid garbage collection pauses in V8. See
+     * [V8 issue 2070](https://bugs.chromium.org/p/v8/issues/detail?id=2070)
+     * for more details.
+     *
+     * @private
+     * @param {Function} func The function to associate metadata with.
+     * @param {*} data The metadata.
+     * @returns {Function} Returns `func`.
+     */
+    var setData = shortOut(baseSetData);
+
+    /**
+     * A simple wrapper around the global [`setTimeout`](https://mdn.io/setTimeout).
+     *
+     * @private
+     * @param {Function} func The function to delay.
+     * @param {number} wait The number of milliseconds to delay invocation.
+     * @returns {number|Object} Returns the timer id or timeout object.
+     */
+    var setTimeout = ctxSetTimeout || function(func, wait) {
+      return root.setTimeout(func, wait);
+    };
+
+    /**
+     * Sets the `toString` method of `func` to return `string`.
+     *
+     * @private
+     * @param {Function} func The function to modify.
+     * @param {Function} string The `toString` result.
+     * @returns {Function} Returns `func`.
+     */
+    var setToString = shortOut(baseSetToString);
+
+    /**
+     * Sets the `toString` method of `wrapper` to mimic the source of `reference`
+     * with wrapper details in a comment at the top of the source body.
+     *
+     * @private
+     * @param {Function} wrapper The function to modify.
+     * @param {Function} reference The reference function.
+     * @param {number} bitmask The bitmask flags. See `createWrap` for more details.
+     * @returns {Function} Returns `wrapper`.
+     */
+    function setWrapToString(wrapper, reference, bitmask) {
+      var source = (reference + '');
+      return setToString(wrapper, insertWrapDetails(source, updateWrapDetails(getWrapDetails(source), bitmask)));
+    }
+
+    /**
+     * Creates a function that'll short out and invoke `identity` instead
+     * of `func` when it's called `HOT_COUNT` or more times in `HOT_SPAN`
+     * milliseconds.
+     *
+     * @private
+     * @param {Function} func The function to restrict.
+     * @returns {Function} Returns the new shortable function.
+     */
+    function shortOut(func) {
+      var count = 0,
+          lastCalled = 0;
+
+      return function() {
+        var stamp = nativeNow(),
+            remaining = HOT_SPAN - (stamp - lastCalled);
+
+        lastCalled = stamp;
+        if (remaining > 0) {
+          if (++count >= HOT_COUNT) {
+            return arguments[0];
+          }
+        } else {
+          count = 0;
+        }
+        return func.apply(undefined, arguments);
+      };
+    }
+
+    /**
+     * A specialized version of `_.shuffle` which mutates and sets the size of `array`.
+     *
+     * @private
+     * @param {Array} array The array to shuffle.
+     * @param {number} [size=array.length] The size of `array`.
+     * @returns {Array} Returns `array`.
+     */
+    function shuffleSelf(array, size) {
+      var index = -1,
+          length = array.length,
+          lastIndex = length - 1;
+
+      size = size === undefined ? length : size;
+      while (++index < size) {
+        var rand = baseRandom(index, lastIndex),
+            value = array[rand];
+
+        array[rand] = array[index];
+        array[index] = value;
+      }
+      array.length = size;
+      return array;
+    }
+
+    /**
+     * Converts `string` to a property path array.
+     *
+     * @private
+     * @param {string} string The string to convert.
+     * @returns {Array} Returns the property path array.
+     */
+    var stringToPath = memoizeCapped(function(string) {
+      var result = [];
+      if (string.charCodeAt(0) === 46 /* . */) {
+        result.push('');
+      }
+      string.replace(rePropName, function(match, number, quote, subString) {
+        result.push(quote ? subString.replace(reEscapeChar, '$1') : (number || match));
+      });
+      return result;
+    });
+
+    /**
+     * Converts `value` to a string key if it's not a string or symbol.
+     *
+     * @private
+     * @param {*} value The value to inspect.
+     * @returns {string|symbol} Returns the key.
+     */
+    function toKey(value) {
+      if (typeof value == 'string' || isSymbol(value)) {
+        return value;
+      }
+      var result = (value + '');
+      return (result == '0' && (1 / value) == -INFINITY) ? '-0' : result;
+    }
+
+    /**
+     * Converts `func` to its source code.
+     *
+     * @private
+     * @param {Function} func The function to convert.
+     * @returns {string} Returns the source code.
+     */
+    function toSource(func) {
+      if (func != null) {
+        try {
+          return funcToString.call(func);
+        } catch (e) {}
+        try {
+          return (func + '');
+        } catch (e) {}
+      }
+      return '';
+    }
+
+    /**
+     * Updates wrapper `details` based on `bitmask` flags.
+     *
+     * @private
+     * @returns {Array} details The details to modify.
+     * @param {number} bitmask The bitmask flags. See `createWrap` for more details.
+     * @returns {Array} Returns `details`.
+     */
+    function updateWrapDetails(details, bitmask) {
+      arrayEach(wrapFlags, function(pair) {
+        var value = '_.' + pair[0];
+        if ((bitmask & pair[1]) && !arrayIncludes(details, value)) {
+          details.push(value);
+        }
+      });
+      return details.sort();
+    }
+
+    /**
+     * Creates a clone of `wrapper`.
+     *
+     * @private
+     * @param {Object} wrapper The wrapper to clone.
+     * @returns {Object} Returns the cloned wrapper.
+     */
+    function wrapperClone(wrapper) {
+      if (wrapper instanceof LazyWrapper) {
+        return wrapper.clone();
+      }
+      var result = new LodashWrapper(wrapper.__wrapped__, wrapper.__chain__);
+      result.__actions__ = copyArray(wrapper.__actions__);
+      result.__index__  = wrapper.__index__;
+      result.__values__ = wrapper.__values__;
+      return result;
+    }
+
+    /*------------------------------------------------------------------------*/
+
+    /**
+     * Creates an array of elements split into groups the length of `size`.
+     * If `array` can't be split evenly, the final chunk will be the remaining
+     * elements.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.0.0
+     * @category Array
+     * @param {Array} array The array to process.
+     * @param {number} [size=1] The length of each chunk
+     * @param- {Object} [guard] Enables use as an iteratee for methods like `_.map`.
+     * @returns {Array} Returns the new array of chunks.
+     * @example
+     *
+     * _.chunk(['a', 'b', 'c', 'd'], 2);
+     * // => [['a', 'b'], ['c', 'd']]
+     *
+     * _.chunk(['a', 'b', 'c', 'd'], 3);
+     * // => [['a', 'b', 'c'], ['d']]
+     */
+    function chunk(array, size, guard) {
+      if ((guard ? isIterateeCall(array, size, guard) : size === undefined)) {
+        size = 1;
+      } else {
+        size = nativeMax(toInteger(size), 0);
+      }
+      var length = array == null ? 0 : array.length;
+      if (!length || size < 1) {
+        return [];
+      }
+      var index = 0,
+          resIndex = 0,
+          result = Array(nativeCeil(length / size));
+
+      while (index < length) {
+        result[resIndex++] = baseSlice(array, index, (index += size));
+      }
+      return result;
+    }
+
+    /**
+     * Creates an array with all falsey values removed. The values `false`, `null`,
+     * `0`, `""`, `undefined`, and `NaN` are falsey.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Array
+     * @param {Array} array The array to compact.
+     * @returns {Array} Returns the new array of filtered values.
+     * @example
+     *
+     * _.compact([0, 1, false, 2, '', 3]);
+     * // => [1, 2, 3]
+     */
+    function compact(array) {
+      var index = -1,
+          length = array == null ? 0 : array.length,
+          resIndex = 0,
+          result = [];
+
+      while (++index < length) {
+        var value = array[index];
+        if (value) {
+          result[resIndex++] = value;
+        }
+      }
+      return result;
+    }
+
+    /**
+     * Creates a new array concatenating `array` with any additional arrays
+     * and/or values.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Array
+     * @param {Array} array The array to concatenate.
+     * @param {...*} [values] The values to concatenate.
+     * @returns {Array} Returns the new concatenated array.
+     * @example
+     *
+     * var array = [1];
+     * var other = _.concat(array, 2, [3], [[4]]);
+     *
+     * console.log(other);
+     * // => [1, 2, 3, [4]]
+     *
+     * console.log(array);
+     * // => [1]
+     */
+    function concat() {
+      var length = arguments.length;
+      if (!length) {
+        return [];
+      }
+      var args = Array(length - 1),
+          array = arguments[0],
+          index = length;
+
+      while (index--) {
+        args[index - 1] = arguments[index];
+      }
+      return arrayPush(isArray(array) ? copyArray(array) : [array], baseFlatten(args, 1));
+    }
+
+    /**
+     * Creates an array of `array` values not included in the other given arrays
+     * using [`SameValueZero`](http://ecma-international.org/ecma-262/7.0/#sec-samevaluezero)
+     * for equality comparisons. The order and references of result values are
+     * determined by the first array.
+     *
+     * **Note:** Unlike `_.pullAll`, this method returns a new array.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Array
+     * @param {Array} array The array to inspect.
+     * @param {...Array} [values] The values to exclude.
+     * @returns {Array} Returns the new array of filtered values.
+     * @see _.without, _.xor
+     * @example
+     *
+     * _.difference([2, 1], [2, 3]);
+     * // => [1]
+     */
+    var difference = baseRest(function(array, values) {
+      return isArrayLikeObject(array)
+        ? baseDifference(array, baseFlatten(values, 1, isArrayLikeObject, true))
+        : [];
+    });
+
+    /**
+     * This method is like `_.difference` except that it accepts `iteratee` which
+     * is invoked for each element of `array` and `values` to generate the criterion
+     * by which they're compared. The order and references of result values are
+     * determined by the first array. The iteratee is invoked with one argument:
+     * (value).
+     *
+     * **Note:** Unlike `_.pullAllBy`, this method returns a new array.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Array
+     * @param {Array} array The array to inspect.
+     * @param {...Array} [values] The values to exclude.
+     * @param {Function} [iteratee=_.identity] The iteratee invoked per element.
+     * @returns {Array} Returns the new array of filtered values.
+     * @example
+     *
+     * _.differenceBy([2.1, 1.2], [2.3, 3.4], Math.floor);
+     * // => [1.2]
+     *
+     * // The `_.property` iteratee shorthand.
+     * _.differenceBy([{ 'x': 2 }, { 'x': 1 }], [{ 'x': 1 }], 'x');
+     * // => [{ 'x': 2 }]
+     */
+    var differenceBy = baseRest(function(array, values) {
+      var iteratee = last(values);
+      if (isArrayLikeObject(iteratee)) {
+        iteratee = undefined;
+      }
+      return isArrayLikeObject(array)
+        ? baseDifference(array, baseFlatten(values, 1, isArrayLikeObject, true), getIteratee(iteratee, 2))
+        : [];
+    });
+
+    /**
+     * This method is like `_.difference` except that it accepts `comparator`
+     * which is invoked to compare elements of `array` to `values`. The order and
+     * references of result values are determined by the first array. The comparator
+     * is invoked with two arguments: (arrVal, othVal).
+     *
+     * **Note:** Unlike `_.pullAllWith`, this method returns a new array.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Array
+     * @param {Array} array The array to inspect.
+     * @param {...Array} [values] The values to exclude.
+     * @param {Function} [comparator] The comparator invoked per element.
+     * @returns {Array} Returns the new array of filtered values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+     *
+     * _.differenceWith(objects, [{ 'x': 1, 'y': 2 }], _.isEqual);
+     * // => [{ 'x': 2, 'y': 1 }]
+     */
+    var differenceWith = baseRest(function(array, values) {
+      var comparator = last(values);
+      if (isArrayLikeObject(comparator)) {
+        comparator = undefined;
+      }
+      return isArrayLikeObject(array)
+        ? baseDifference(array, baseFlatten(values, 1, isArrayLikeObject, true), undefined, comparator)
+        : [];
+    });
+
+    /**
+     * Creates a slice of `array` with `n` elements dropped from the beginning.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.5.0
+     * @category Array
+     * @param {Array} array The array to query.
+     * @param {number} [n=1] The number of elements to drop.
+     * @param- {Object} [guard] Enables use as an iteratee for methods like `_.map`.
+     * @returns {Array} Returns the slice of `array`.
+     * @example
+     *
+     * _.drop([1, 2, 3]);
+     * // => [2, 3]
+     *
+     * _.drop([1, 2, 3], 2);
+     * // => [3]
+     *
+     * _.drop([1, 2, 3], 5);
+     * // => []
+     *
+     * _.drop([1, 2, 3], 0);
+     * // => [1, 2, 3]
+     */
+    function drop(array, n, guard) {
+      var length = array == null ? 0 : array.length;
+      if (!length) {
+        return [];
+      }
+      n = (guard || n === undefined) ? 1 : toInteger(n);
+      return baseSlice(array, n < 0 ? 0 : n, length);
+    }
+
+    /**
+     * Creates a slice of `array` with `n` elements dropped from the end.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.0.0
+     * @category Array
+     * @param {Array} array The array to query.
+     * @param {number} [n=1] The number of elements to drop.
+     * @param- {Object} [guard] Enables use as an iteratee for methods like `_.map`.
+     * @returns {Array} Returns the slice of `array`.
+     * @example
+     *
+     * _.dropRight([1, 2, 3]);
+     * // => [1, 2]
+     *
+     * _.dropRight([1, 2, 3], 2);
+     * // => [1]
+     *
+     * _.dropRight([1, 2, 3], 5);
+     * // => []
+     *
+     * _.dropRight([1, 2, 3], 0);
+     * // => [1, 2, 3]
+     */
+    function dropRight(array, n, guard) {
+      var length = array == null ? 0 : array.length;
+      if (!length) {
+        return [];
+      }
+      n = (guard || n === undefined) ? 1 : toInteger(n);
+      n = length - n;
+      return baseSlice(array, 0, n < 0 ? 0 : n);
+    }
+
+    /**
+     * Creates a slice of `array` excluding elements dropped from the end.
+     * Elements are dropped until `predicate` returns falsey. The predicate is
+     * invoked with three arguments: (value, index, array).
+     *
+     * @static
+     * @memberOf _
+     * @since 3.0.0
+     * @category Array
+     * @param {Array} array The array to query.
+     * @param {Function} [predicate=_.identity] The function invoked per iteration.
+     * @returns {Array} Returns the slice of `array`.
+     * @example
+     *
+     * var users = [
+     *   { 'user': 'barney',  'active': true },
+     *   { 'user': 'fred',    'active': false },
+     *   { 'user': 'pebbles', 'active': false }
+     * ];
+     *
+     * _.dropRightWhile(users, function(o) { return !o.active; });
+     * // => objects for ['barney']
+     *
+     * // The `_.matches` iteratee shorthand.
+     * _.dropRightWhile(users, { 'user': 'pebbles', 'active': false });
+     * // => objects for ['barney', 'fred']
+     *
+     * // The `_.matchesProperty` iteratee shorthand.
+     * _.dropRightWhile(users, ['active', false]);
+     * // => objects for ['barney']
+     *
+     * // The `_.property` iteratee shorthand.
+     * _.dropRightWhile(users, 'active');
+     * // => objects for ['barney', 'fred', 'pebbles']
+     */
+    function dropRightWhile(array, predicate) {
+      return (array && array.length)
+        ? baseWhile(array, getIteratee(predicate, 3), true, true)
+        : [];
+    }
+
+    /**
+     * Creates a slice of `array` excluding elements dropped from the beginning.
+     * Elements are dropped until `predicate` returns falsey. The predicate is
+     * invoked with three arguments: (value, index, array).
+     *
+     * @static
+     * @memberOf _
+     * @since 3.0.0
+     * @category Array
+     * @param {Array} array The array to query.
+     * @param {Function} [predicate=_.identity] The function invoked per iteration.
+     * @returns {Array} Returns the slice of `array`.
+     * @example
+     *
+     * var users = [
+     *   { 'user': 'barney',  'active': false },
+     *   { 'user': 'fred',    'active': false },
+     *   { 'user': 'pebbles', 'active': true }
+     * ];
+     *
+     * _.dropWhile(users, function(o) { return !o.active; });
+     * // => objects for ['pebbles']
+     *
+     * // The `_.matches` iteratee shorthand.
+     * _.dropWhile(users, { 'user': 'barney', 'active': false });
+     * // => objects for ['fred', 'pebbles']
+     *
+     * // The `_.matchesProperty` iteratee shorthand.
+     * _.dropWhile(users, ['active', false]);
+     * // => objects for ['pebbles']
+     *
+     * // The `_.property` iteratee shorthand.
+     * _.dropWhile(users, 'active');
+     * // => objects for ['barney', 'fred', 'pebbles']
+     */
+    function dropWhile(array, predicate) {
+      return (array && array.length)
+        ? baseWhile(array, getIteratee(predicate, 3), true)
+        : [];
+    }
+
+    /**
+     * Fills elements of `array` with `value` from `start` up to, but not
+     * including, `end`.
+     *
+     * **Note:** This method mutates `array`.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.2.0
+     * @category Array
+     * @param {Array} array The array to fill.
+     * @param {*} value The value to fill `array` with.
+     * @param {number} [start=0] The start position.
+     * @param {number} [end=array.length] The end position.
+     * @returns {Array} Returns `array`.
+     * @example
+     *
+     * var array = [1, 2, 3];
+     *
+     * _.fill(array, 'a');
+     * console.log(array);
+     * // => ['a', 'a', 'a']
+     *
+     * _.fill(Array(3), 2);
+     * // => [2, 2, 2]
+     *
+     * _.fill([4, 6, 8, 10], '*', 1, 3);
+     * // => [4, '*', '*', 10]
+     */
+    function fill(array, value, start, end) {
+      var length = array == null ? 0 : array.length;
+      if (!length) {
+        return [];
+      }
+      if (start && typeof start != 'number' && isIterateeCall(array, value, start)) {
+        start = 0;
+        end = length;
+      }
+      return baseFill(array, value, start, end);
+    }
+
+    /**
+     * This method is like `_.find` except that it returns the index of the first
+     * element `predicate` returns truthy for instead of the element itself.
+     *
+     * @static
+     * @memberOf _
+     * @since 1.1.0
+     * @category Array
+     * @param {Array} array The array to inspect.
+     * @param {Function} [predicate=_.identity] The function invoked per iteration.
+     * @param {number} [fromIndex=0] The index to search from.
+     * @returns {number} Returns the index of the found element, else `-1`.
+     * @example
+     *
+     * var users = [
+     *   { 'user': 'barney',  'active': false },
+     *   { 'user': 'fred',    'active': false },
+     *   { 'user': 'pebbles', 'active': true }
+     * ];
+     *
+     * _.findIndex(users, function(o) { return o.user == 'barney'; });
+     * // => 0
+     *
+     * // The `_.matches` iteratee shorthand.
+     * _.findIndex(users, { 'user': 'fred', 'active': false });
+     * // => 1
+     *
+     * // The `_.matchesProperty` iteratee shorthand.
+     * _.findIndex(users, ['active', false]);
+     * // => 0
+     *
+     * // The `_.property` iteratee shorthand.
+     * _.findIndex(users, 'active');
+     * // => 2
+     */
+    function findIndex(array, predicate, fromIndex) {
+      var length = array == null ? 0 : array.length;
+      if (!length) {
+        return -1;
+      }
+      var index = fromIndex == null ? 0 : toInteger(fromIndex);
+      if (index < 0) {
+        index = nativeMax(length + index, 0);
+      }
+      return baseFindIndex(array, getIteratee(predicate, 3), index);
+    }
+
+    /**
+     * This method is like `_.findIndex` except that it iterates over elements
+     * of `collection` from right to left.
+     *
+     * @static
+     * @memberOf _
+     * @since 2.0.0
+     * @category Array
+     * @param {Array} array The array to inspect.
+     * @param {Function} [predicate=_.identity] The function invoked per iteration.
+     * @param {number} [fromIndex=array.length-1] The index to search from.
+     * @returns {number} Returns the index of the found element, else `-1`.
+     * @example
+     *
+     * var users = [
+     *   { 'user': 'barney',  'active': true },
+     *   { 'user': 'fred',    'active': false },
+     *   { 'user': 'pebbles', 'active': false }
+     * ];
+     *
+     * _.findLastIndex(users, function(o) { return o.user == 'pebbles'; });
+     * // => 2
+     *
+     * // The `_.matches` iteratee shorthand.
+     * _.findLastIndex(users, { 'user': 'barney', 'active': true });
+     * // => 0
+     *
+     * // The `_.matchesProperty` iteratee shorthand.
+     * _.findLastIndex(users, ['active', false]);
+     * // => 2
+     *
+     * // The `_.property` iteratee shorthand.
+     * _.findLastIndex(users, 'active');
+     * // => 0
+     */
+    function findLastIndex(array, predicate, fromIndex) {
+      var length = array == null ? 0 : array.length;
+      if (!length) {
+        return -1;
+      }
+      var index = length - 1;
+      if (fromIndex !== undefined) {
+        index = toInteger(fromIndex);
+        index = fromIndex < 0
+          ? nativeMax(length + index, 0)
+          : nativeMin(index, length - 1);
+      }
+      return baseFindIndex(array, getIteratee(predicate, 3), index, true);
+    }
+
+    /**
+     * Flattens `array` a single level deep.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Array
+     * @param {Array} array The array to flatten.
+     * @returns {Array} Returns the new flattened array.
+     * @example
+     *
+     * _.flatten([1, [2, [3, [4]], 5]]);
+     * // => [1, 2, [3, [4]], 5]
+     */
+    function flatten(array) {
+      var length = array == null ? 0 : array.length;
+      return length ? baseFlatten(array, 1) : [];
+    }
+
+    /**
+     * Recursively flattens `array`.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.0.0
+     * @category Array
+     * @param {Array} array The array to flatten.
+     * @returns {Array} Returns the new flattened array.
+     * @example
+     *
+     * _.flattenDeep([1, [2, [3, [4]], 5]]);
+     * // => [1, 2, 3, 4, 5]
+     */
+    function flattenDeep(array) {
+      var length = array == null ? 0 : array.length;
+      return length ? baseFlatten(array, INFINITY) : [];
+    }
+
+    /**
+     * Recursively flatten `array` up to `depth` times.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.4.0
+     * @category Array
+     * @param {Array} array The array to flatten.
+     * @param {number} [depth=1] The maximum recursion depth.
+     * @returns {Array} Returns the new flattened array.
+     * @example
+     *
+     * var array = [1, [2, [3, [4]], 5]];
+     *
+     * _.flattenDepth(array, 1);
+     * // => [1, 2, [3, [4]], 5]
+     *
+     * _.flattenDepth(array, 2);
+     * // => [1, 2, 3, [4], 5]
+     */
+    function flattenDepth(array, depth) {
+      var length = array == null ? 0 : array.length;
+      if (!length) {
+        return [];
+      }
+      depth = depth === undefined ? 1 : toInteger(depth);
+      return baseFlatten(array, depth);
+    }
+
+    /**
+     * The inverse of `_.toPairs`; this method returns an object composed
+     * from key-value `pairs`.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Array
+     * @param {Array} pairs The key-value pairs.
+     * @returns {Object} Returns the new object.
+     * @example
+     *
+     * _.fromPairs([['a', 1], ['b', 2]]);
+     * // => { 'a': 1, 'b': 2 }
+     */
+    function fromPairs(pairs) {
+      var index = -1,
+          length = pairs == null ? 0 : pairs.length,
+          result = {};
+
+      while (++index < length) {
+        var pair = pairs[index];
+        result[pair[0]] = pair[1];
+      }
+      return result;
+    }
+
+    /**
+     * Gets the first element of `array`.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @alias first
+     * @category Array
+     * @param {Array} array The array to query.
+     * @returns {*} Returns the first element of `array`.
+     * @example
+     *
+     * _.head([1, 2, 3]);
+     * // => 1
+     *
+     * _.head([]);
+     * // => undefined
+     */
+    function head(array) {
+      return (array && array.length) ? array[0] : undefined;
+    }
+
+    /**
+     * Gets the index at which the first occurrence of `value` is found in `array`
+     * using [`SameValueZero`](http://ecma-international.org/ecma-262/7.0/#sec-samevaluezero)
+     * for equality comparisons. If `fromIndex` is negative, it's used as the
+     * offset from the end of `array`.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Array
+     * @param {Array} array The array to inspect.
+     * @param {*} value The value to search for.
+     * @param {number} [fromIndex=0] The index to search from.
+     * @returns {number} Returns the index of the matched value, else `-1`.
+     * @example
+     *
+     * _.indexOf([1, 2, 1, 2], 2);
+     * // => 1
+     *
+     * // Search from the `fromIndex`.
+     * _.indexOf([1, 2, 1, 2], 2, 2);
+     * // => 3
+     */
+    function indexOf(array, value, fromIndex) {
+      var length = array == null ? 0 : array.length;
+      if (!length) {
+        return -1;
+      }
+      var index = fromIndex == null ? 0 : toInteger(fromIndex);
+      if (index < 0) {
+        index = nativeMax(length + index, 0);
+      }
+      return baseIndexOf(array, value, index);
+    }
+
+    /**
+     * Gets all but the last element of `array`.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Array
+     * @param {Array} array The array to query.
+     * @returns {Array} Returns the slice of `array`.
+     * @example
+     *
+     * _.initial([1, 2, 3]);
+     * // => [1, 2]
+     */
+    function initial(array) {
+      var length = array == null ? 0 : array.length;
+      return length ? baseSlice(array, 0, -1) : [];
+    }
+
+    /**
+     * Creates an array of unique values that are included in all given arrays
+     * using [`SameValueZero`](http://ecma-international.org/ecma-262/7.0/#sec-samevaluezero)
+     * for equality comparisons. The order and references of result values are
+     * determined by the first array.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Array
+     * @param {...Array} [arrays] The arrays to inspect.
+     * @returns {Array} Returns the new array of intersecting values.
+     * @example
+     *
+     * _.intersection([2, 1], [2, 3]);
+     * // => [2]
+     */
+    var intersection = baseRest(function(arrays) {
+      var mapped = arrayMap(arrays, castArrayLikeObject);
+      return (mapped.length && mapped[0] === arrays[0])
+        ? baseIntersection(mapped)
+        : [];
+    });
+
+    /**
+     * This method is like `_.intersection` except that it accepts `iteratee`
+     * which is invoked for each element of each `arrays` to generate the criterion
+     * by which they're compared. The order and references of result values are
+     * determined by the first array. The iteratee is invoked with one argument:
+     * (value).
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Array
+     * @param {...Array} [arrays] The arrays to inspect.
+     * @param {Function} [iteratee=_.identity] The iteratee invoked per element.
+     * @returns {Array} Returns the new array of intersecting values.
+     * @example
+     *
+     * _.intersectionBy([2.1, 1.2], [2.3, 3.4], Math.floor);
+     * // => [2.1]
+     *
+     * // The `_.property` iteratee shorthand.
+     * _.intersectionBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
+     * // => [{ 'x': 1 }]
+     */
+    var intersectionBy = baseRest(function(arrays) {
+      var iteratee = last(arrays),
+          mapped = arrayMap(arrays, castArrayLikeObject);
+
+      if (iteratee === last(mapped)) {
+        iteratee = undefined;
+      } else {
+        mapped.pop();
+      }
+      return (mapped.length && mapped[0] === arrays[0])
+        ? baseIntersection(mapped, getIteratee(iteratee, 2))
+        : [];
+    });
+
+    /**
+     * This method is like `_.intersection` except that it accepts `comparator`
+     * which is invoked to compare elements of `arrays`. The order and references
+     * of result values are determined by the first array. The comparator is
+     * invoked with two arguments: (arrVal, othVal).
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Array
+     * @param {...Array} [arrays] The arrays to inspect.
+     * @param {Function} [comparator] The comparator invoked per element.
+     * @returns {Array} Returns the new array of intersecting values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
+     *
+     * _.intersectionWith(objects, others, _.isEqual);
+     * // => [{ 'x': 1, 'y': 2 }]
+     */
+    var intersectionWith = baseRest(function(arrays) {
+      var comparator = last(arrays),
+          mapped = arrayMap(arrays, castArrayLikeObject);
+
+      comparator = typeof comparator == 'function' ? comparator : undefined;
+      if (comparator) {
+        mapped.pop();
+      }
+      return (mapped.length && mapped[0] === arrays[0])
+        ? baseIntersection(mapped, undefined, comparator)
+        : [];
+    });
+
+    /**
+     * Converts all elements in `array` into a string separated by `separator`.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Array
+     * @param {Array} array The array to convert.
+     * @param {string} [separator=','] The element separator.
+     * @returns {string} Returns the joined string.
+     * @example
+     *
+     * _.join(['a', 'b', 'c'], '~');
+     * // => 'a~b~c'
+     */
+    function join(array, separator) {
+      return array == null ? '' : nativeJoin.call(array, separator);
+    }
+
+    /**
+     * Gets the last element of `array`.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Array
+     * @param {Array} array The array to query.
+     * @returns {*} Returns the last element of `array`.
+     * @example
+     *
+     * _.last([1, 2, 3]);
+     * // => 3
+     */
+    function last(array) {
+      var length = array == null ? 0 : array.length;
+      return length ? array[length - 1] : undefined;
+    }
+
+    /**
+     * This method is like `_.indexOf` except that it iterates over elements of
+     * `array` from right to left.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Array
+     * @param {Array} array The array to inspect.
+     * @param {*} value The value to search for.
+     * @param {number} [fromIndex=array.length-1] The index to search from.
+     * @returns {number} Returns the index of the matched value, else `-1`.
+     * @example
+     *
+     * _.lastIndexOf([1, 2, 1, 2], 2);
+     * // => 3
+     *
+     * // Search from the `fromIndex`.
+     * _.lastIndexOf([1, 2, 1, 2], 2, 2);
+     * // => 1
+     */
+    function lastIndexOf(array, value, fromIndex) {
+      var length = array == null ? 0 : array.length;
+      if (!length) {
+        return -1;
+      }
+      var index = length;
+      if (fromIndex !== undefined) {
+        index = toInteger(fromIndex);
+        index = index < 0 ? nativeMax(length + index, 0) : nativeMin(index, length - 1);
+      }
+      return value === value
+        ? strictLastIndexOf(array, value, index)
+        : baseFindIndex(array, baseIsNaN, index, true);
+    }
+
+    /**
+     * Gets the element at index `n` of `array`. If `n` is negative, the nth
+     * element from the end is returned.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.11.0
+     * @category Array
+     * @param {Array} array The array to query.
+     * @param {number} [n=0] The index of the element to return.
+     * @returns {*} Returns the nth element of `array`.
+     * @example
+     *
+     * var array = ['a', 'b', 'c', 'd'];
+     *
+     * _.nth(array, 1);
+     * // => 'b'
+     *
+     * _.nth(array, -2);
+     * // => 'c';
+     */
+    function nth(array, n) {
+      return (array && array.length) ? baseNth(array, toInteger(n)) : undefined;
+    }
+
+    /**
+     * Removes all given values from `array` using
+     * [`SameValueZero`](http://ecma-international.org/ecma-262/7.0/#sec-samevaluezero)
+     * for equality comparisons.
+     *
+     * **Note:** Unlike `_.without`, this method mutates `array`. Use `_.remove`
+     * to remove elements from an array by predicate.
+     *
+     * @static
+     * @memberOf _
+     * @since 2.0.0
+     * @category Array
+     * @param {Array} array The array to modify.
+     * @param {...*} [values] The values to remove.
+     * @returns {Array} Returns `array`.
+     * @example
+     *
+     * var array = ['a', 'b', 'c', 'a', 'b', 'c'];
+     *
+     * _.pull(array, 'a', 'c');
+     * console.log(array);
+     * // => ['b', 'b']
+     */
+    var pull = baseRest(pullAll);
+
+    /**
+     * This method is like `_.pull` except that it accepts an array of values to remove.
+     *
+     * **Note:** Unlike `_.difference`, this method mutates `array`.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Array
+     * @param {Array} array The array to modify.
+     * @param {Array} values The values to remove.
+     * @returns {Array} Returns `array`.
+     * @example
+     *
+     * var array = ['a', 'b', 'c', 'a', 'b', 'c'];
+     *
+     * _.pullAll(array, ['a', 'c']);
+     * console.log(array);
+     * // => ['b', 'b']
+     */
+    function pullAll(array, values) {
+      return (array && array.length && values && values.length)
+        ? basePullAll(array, values)
+        : array;
+    }
+
+    /**
+     * This method is like `_.pullAll` except that it accepts `iteratee` which is
+     * invoked for each element of `array` and `values` to generate the criterion
+     * by which they're compared. The iteratee is invoked with one argument: (value).
+     *
+     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Array
+     * @param {Array} array The array to modify.
+     * @param {Array} values The values to remove.
+     * @param {Function} [iteratee=_.identity] The iteratee invoked per element.
+     * @returns {Array} Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
+     *
+     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
+     * console.log(array);
+     * // => [{ 'x': 2 }]
+     */
+    function pullAllBy(array, values, iteratee) {
+      return (array && array.length && values && values.length)
+        ? basePullAll(array, values, getIteratee(iteratee, 2))
+        : array;
+    }
+
+    /**
+     * This method is like `_.pullAll` except that it accepts `comparator` which
+     * is invoked to compare elements of `array` to `values`. The comparator is
+     * invoked with two arguments: (arrVal, othVal).
+     *
+     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.6.0
+     * @category Array
+     * @param {Array} array The array to modify.
+     * @param {Array} values The values to remove.
+     * @param {Function} [comparator] The comparator invoked per element.
+     * @returns {Array} Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
+     *
+     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
+     * console.log(array);
+     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
+     */
+    function pullAllWith(array, values, comparator) {
+      return (array && array.length && values && values.length)
+        ? basePullAll(array, values, undefined, comparator)
+        : array;
+    }
+
+    /**
+     * Removes elements from `array` corresponding to `indexes` and returns an
+     * array of removed elements.
+     *
+     * **Note:** Unlike `_.at`, this method mutates `array`.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.0.0
+     * @category Array
+     * @param {Array} array The array to modify.
+     * @param {...(number|number[])} [indexes] The indexes of elements to remove.
+     * @returns {Array} Returns the new array of removed elements.
+     * @example
+     *
+     * var array = ['a', 'b', 'c', 'd'];
+     * var pulled = _.pullAt(array, [1, 3]);
+     *
+     * console.log(array);
+     * // => ['a', 'c']
+     *
+     * console.log(pulled);
+     * // => ['b', 'd']
+     */
+    var pullAt = flatRest(function(array, indexes) {
+      var length = array == null ? 0 : array.length,
+          result = baseAt(array, indexes);
+
+      basePullAt(array, arrayMap(indexes, function(index) {
+        return isIndex(index, length) ? +index : index;
+      }).sort(compareAscending));
+
+      return result;
+    });
+
+    /**
+     * Removes all elements from `array` that `predicate` returns truthy for
+     * and returns an array of the removed elements. The predicate is invoked
+     * with three arguments: (value, index, array).
+     *
+     * **Note:** Unlike `_.filter`, this method mutates `array`. Use `_.pull`
+     * to pull elements from an array by value.
+     *
+     * @static
+     * @memberOf _
+     * @since 2.0.0
+     * @category Array
+     * @param {Array} array The array to modify.
+     * @param {Function} [predicate=_.identity] The function invoked per iteration.
+     * @returns {Array} Returns the new array of removed elements.
+     * @example
+     *
+     * var array = [1, 2, 3, 4];
+     * var evens = _.remove(array, function(n) {
+     *   return n % 2 == 0;
+     * });
+     *
+     * console.log(array);
+     * // => [1, 3]
+     *
+     * console.log(evens);
+     * // => [2, 4]
+     */
+    function remove(array, predicate) {
+      var result = [];
+      if (!(array && array.length)) {
+        return result;
+      }
+      var index = -1,
+          indexes = [],
+          length = array.length;
+
+      predicate = getIteratee(predicate, 3);
+      while (++index < length) {
+        var value = array[index];
+        if (predicate(value, index, array)) {
+          result.push(value);
+          indexes.push(index);
+        }
+      }
+      basePullAt(array, indexes);
+      return result;
+    }
+
+    /**
+     * Reverses `array` so that the first element becomes the last, the second
+     * element becomes the second to last, and so on.
+     *
+     * **Note:** This method mutates `array` and is based on
+     * [`Array#reverse`](https://mdn.io/Array/reverse).
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Array
+     * @param {Array} array The array to modify.
+     * @returns {Array} Returns `array`.
+     * @example
+     *
+     * var array = [1, 2, 3];
+     *
+     * _.reverse(array);
+     * // => [3, 2, 1]
+     *
+     * console.log(array);
+     * // => [3, 2, 1]
+     */
+    function reverse(array) {
+      return array == null ? array : nativeReverse.call(array);
+    }
+
+    /**
+     * Creates a slice of `array` from `start` up to, but not including, `end`.
+     *
+     * **Note:** This method is used instead of
+     * [`Array#slice`](https://mdn.io/Array/slice) to ensure dense arrays are
+     * returned.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.0.0
+     * @category Array
+     * @param {Array} array The array to slice.
+     * @param {number} [start=0] The start position.
+     * @param {number} [end=array.length] The end position.
+     * @returns {Array} Returns the slice of `array`.
+     */
+    function slice(array, start, end) {
+      var length = array == null ? 0 : array.length;
+      if (!length) {
+        return [];
+      }
+      if (end && typeof end != 'number' && isIterateeCall(array, start, end)) {
+        start = 0;
+        end = length;
+      }
+      else {
+        start = start == null ? 0 : toInteger(start);
+        end = end === undefined ? length : toInteger(end);
+      }
+      return baseSlice(array, start, end);
+    }
+
+    /**
+     * Uses a binary search to determine the lowest index at which `value`
+     * should be inserted into `array` in order to maintain its sort order.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Array
+     * @param {Array} array The sorted array to inspect.
+     * @param {*} value The value to evaluate.
+     * @returns {number} Returns the index at which `value` should be inserted
+     *  into `array`.
+     * @example
+     *
+     * _.sortedIndex([30, 50], 40);
+     * // => 1
+     */
+    function sortedIndex(array, value) {
+      return baseSortedIndex(array, value);
+    }
+
+    /**
+     * This method is like `_.sortedIndex` except that it accepts `iteratee`
+     * which is invoked for `value` and each element of `array` to compute their
+     * sort ranking. The iteratee is invoked with one argument: (value).
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Array
+     * @param {Array} array The sorted array to inspect.
+     * @param {*} value The value to evaluate.
+     * @param {Function} [iteratee=_.identity] The iteratee invoked per element.
+     * @returns {number} Returns the index at which `value` should be inserted
+     *  into `array`.
+     * @example
+     *
+     * var objects = [{ 'x': 4 }, { 'x': 5 }];
+     *
+     * _.sortedIndexBy(objects, { 'x': 4 }, function(o) { return o.x; });
+     * // => 0
+     *
+     * // The `_.property` iteratee shorthand.
+     * _.sortedIndexBy(objects, { 'x': 4 }, 'x');
+     * // => 0
+     */
+    function sortedIndexBy(array, value, iteratee) {
+      return baseSortedIndexBy(array, value, getIteratee(iteratee, 2));
+    }
+
+    /**
+     * This method is like `_.indexOf` except that it performs a binary
+     * search on a sorted `array`.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Array
+     * @param {Array} array The array to inspect.
+     * @param {*} value The value to search for.
+     * @returns {number} Returns the index of the matched value, else `-1`.
+     * @example
+     *
+     * _.sortedIndexOf([4, 5, 5, 5, 6], 5);
+     * // => 1
+     */
+    function sortedIndexOf(array, value) {
+      var length = array == null ? 0 : array.length;
+      if (length) {
+        var index = baseSortedIndex(array, value);
+        if (index < length && eq(array[index], value)) {
+          return index;
+        }
+      }
+      return -1;
+    }
+
+    /**
+     * This method is like `_.sortedIndex` except that it returns the highest
+     * index at which `value` should be inserted into `array` in order to
+     * maintain its sort order.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.0.0
+     * @category Array
+     * @param {Array} array The sorted array to inspect.
+     * @param {*} value The value to evaluate.
+     * @returns {number} Returns the index at which `value` should be inserted
+     *  into `array`.
+     * @example
+     *
+     * _.sortedLastIndex([4, 5, 5, 5, 6], 5);
+     * // => 4
+     */
+    function sortedLastIndex(array, value) {
+      return baseSortedIndex(array, value, true);
+    }
+
+    /**
+     * This method is like `_.sortedLastIndex` except that it accepts `iteratee`
+     * which is invoked for `value` and each element of `array` to compute their
+     * sort ranking. The iteratee is invoked with one argument: (value).
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Array
+     * @param {Array} array The sorted array to inspect.
+     * @param {*} value The value to evaluate.
+     * @param {Function} [iteratee=_.identity] The iteratee invoked per element.
+     * @returns {number} Returns the index at which `value` should be inserted
+     *  into `array`.
+     * @example
+     *
+     * var objects = [{ 'x': 4 }, { 'x': 5 }];
+     *
+     * _.sortedLastIndexBy(objects, { 'x': 4 }, function(o) { return o.x; });
+     * // => 1
+     *
+     * // The `_.property` iteratee shorthand.
+     * _.sortedLastIndexBy(objects, { 'x': 4 }, 'x');
+     * // => 1
+     */
+    function sortedLastIndexBy(array, value, iteratee) {
+      return baseSortedIndexBy(array, value, getIteratee(iteratee, 2), true);
+    }
+
+    /**
+     * This method is like `_.lastIndexOf` except that it performs a binary
+     * search on a sorted `array`.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Array
+     * @param {Array} array The array to inspect.
+     * @param {*} value The value to search for.
+     * @returns {number} Returns the index of the matched value, else `-1`.
+     * @example
+     *
+     * _.sortedLastIndexOf([4, 5, 5, 5, 6], 5);
+     * // => 3
+     */
+    function sortedLastIndexOf(array, value) {
+      var length = array == null ? 0 : array.length;
+      if (length) {
+        var index = baseSortedIndex(array, value, true) - 1;
+        if (eq(array[index], value)) {
+          return index;
+        }
+      }
+      return -1;
+    }
+
+    /**
+     * This method is like `_.uniq` except that it's designed and optimized
+     * for sorted arrays.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Array
+     * @param {Array} array The array to inspect.
+     * @returns {Array} Returns the new duplicate free array.
+     * @example
+     *
+     * _.sortedUniq([1, 1, 2]);
+     * // => [1, 2]
+     */
+    function sortedUniq(array) {
+      return (array && array.length)
+        ? baseSortedUniq(array)
+        : [];
+    }
+
+    /**
+     * This method is like `_.uniqBy` except that it's designed and optimized
+     * for sorted arrays.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Array
+     * @param {Array} array The array to inspect.
+     * @param {Function} [iteratee] The iteratee invoked per element.
+     * @returns {Array} Returns the new duplicate free array.
+     * @example
+     *
+     * _.sortedUniqBy([1.1, 1.2, 2.3, 2.4], Math.floor);
+     * // => [1.1, 2.3]
+     */
+    function sortedUniqBy(array, iteratee) {
+      return (array && array.length)
+        ? baseSortedUniq(array, getIteratee(iteratee, 2))
+        : [];
+    }
+
+    /**
+     * Gets all but the first element of `array`.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Array
+     * @param {Array} array The array to query.
+     * @returns {Array} Returns the slice of `array`.
+     * @example
+     *
+     * _.tail([1, 2, 3]);
+     * // => [2, 3]
+     */
+    function tail(array) {
+      var length = array == null ? 0 : array.length;
+      return length ? baseSlice(array, 1, length) : [];
+    }
+
+    /**
+     * Creates a slice of `array` with `n` elements taken from the beginning.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Array
+     * @param {Array} array The array to query.
+     * @param {number} [n=1] The number of elements to take.
+     * @param- {Object} [guard] Enables use as an iteratee for methods like `_.map`.
+     * @returns {Array} Returns the slice of `array`.
+     * @example
+     *
+     * _.take([1, 2, 3]);
+     * // => [1]
+     *
+     * _.take([1, 2, 3], 2);
+     * // => [1, 2]
+     *
+     * _.take([1, 2, 3], 5);
+     * // => [1, 2, 3]
+     *
+     * _.take([1, 2, 3], 0);
+     * // => []
+     */
+    function take(array, n, guard) {
+      if (!(array && array.length)) {
+        return [];
+      }
+      n = (guard || n === undefined) ? 1 : toInteger(n);
+      return baseSlice(array, 0, n < 0 ? 0 : n);
+    }
+
+    /**
+     * Creates a slice of `array` with `n` elements taken from the end.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.0.0
+     * @category Array
+     * @param {Array} array The array to query.
+     * @param {number} [n=1] The number of elements to take.
+     * @param- {Object} [guard] Enables use as an iteratee for methods like `_.map`.
+     * @returns {Array} Returns the slice of `array`.
+     * @example
+     *
+     * _.takeRight([1, 2, 3]);
+     * // => [3]
+     *
+     * _.takeRight([1, 2, 3], 2);
+     * // => [2, 3]
+     *
+     * _.takeRight([1, 2, 3], 5);
+     * // => [1, 2, 3]
+     *
+     * _.takeRight([1, 2, 3], 0);
+     * // => []
+     */
+    function takeRight(array, n, guard) {
+      var length = array == null ? 0 : array.length;
+      if (!length) {
+        return [];
+      }
+      n = (guard || n === undefined) ? 1 : toInteger(n);
+      n = length - n;
+      return baseSlice(array, n < 0 ? 0 : n, length);
+    }
+
+    /**
+     * Creates a slice of `array` with elements taken from the end. Elements are
+     * taken until `predicate` returns falsey. The predicate is invoked with
+     * three arguments: (value, index, array).
+     *
+     * @static
+     * @memberOf _
+     * @since 3.0.0
+     * @category Array
+     * @param {Array} array The array to query.
+     * @param {Function} [predicate=_.identity] The function invoked per iteration.
+     * @returns {Array} Returns the slice of `array`.
+     * @example
+     *
+     * var users = [
+     *   { 'user': 'barney',  'active': true },
+     *   { 'user': 'fred',    'active': false },
+     *   { 'user': 'pebbles', 'active': false }
+     * ];
+     *
+     * _.takeRightWhile(users, function(o) { return !o.active; });
+     * // => objects for ['fred', 'pebbles']
+     *
+     * // The `_.matches` iteratee shorthand.
+     * _.takeRightWhile(users, { 'user': 'pebbles', 'active': false });
+     * // => objects for ['pebbles']
+     *
+     * // The `_.matchesProperty` iteratee shorthand.
+     * _.takeRightWhile(users, ['active', false]);
+     * // => objects for ['fred', 'pebbles']
+     *
+     * // The `_.property` iteratee shorthand.
+     * _.takeRightWhile(users, 'active');
+     * // => []
+     */
+    function takeRightWhile(array, predicate) {
+      return (array && array.length)
+        ? baseWhile(array, getIteratee(predicate, 3), false, true)
+        : [];
+    }
+
+    /**
+     * Creates a slice of `array` with elements taken from the beginning. Elements
+     * are taken until `predicate` returns falsey. The predicate is invoked with
+     * three arguments: (value, index, array).
+     *
+     * @static
+     * @memberOf _
+     * @since 3.0.0
+     * @category Array
+     * @param {Array} array The array to query.
+     * @param {Function} [predicate=_.identity] The function invoked per iteration.
+     * @returns {Array} Returns the slice of `array`.
+     * @example
+     *
+     * var users = [
+     *   { 'user': 'barney',  'active': false },
+     *   { 'user': 'fred',    'active': false },
+     *   { 'user': 'pebbles', 'active': true }
+     * ];
+     *
+     * _.takeWhile(users, function(o) { return !o.active; });
+     * // => objects for ['barney', 'fred']
+     *
+     * // The `_.matches` iteratee shorthand.
+     * _.takeWhile(users, { 'user': 'barney', 'active': false });
+     * // => objects for ['barney']
+     *
+     * // The `_.matchesProperty` iteratee shorthand.
+     * _.takeWhile(users, ['active', false]);
+     * // => objects for ['barney', 'fred']
+     *
+     * // The `_.property` iteratee shorthand.
+     * _.takeWhile(users, 'active');
+     * // => []
+     */
+    function takeWhile(array, predicate) {
+      return (array && array.length)
+        ? baseWhile(array, getIteratee(predicate, 3))
+        : [];
+    }
+
+    /**
+     * Creates an array of unique values, in order, from all given arrays using
+     * [`SameValueZero`](http://ecma-international.org/ecma-262/7.0/#sec-samevaluezero)
+     * for equality comparisons.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Array
+     * @param {...Array} [arrays] The arrays to inspect.
+     * @returns {Array} Returns the new array of combined values.
+     * @example
+     *
+     * _.union([2], [1, 2]);
+     * // => [2, 1]
+     */
+    var union = baseRest(function(arrays) {
+      return baseUniq(baseFlatten(arrays, 1, isArrayLikeObject, true));
+    });
+
+    /**
+     * This method is like `_.union` except that it accepts `iteratee` which is
+     * invoked for each element of each `arrays` to generate the criterion by
+     * which uniqueness is computed. Result values are chosen from the first
+     * array in which the value occurs. The iteratee is invoked with one argument:
+     * (value).
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Array
+     * @param {...Array} [arrays] The arrays to inspect.
+     * @param {Function} [iteratee=_.identity] The iteratee invoked per element.
+     * @returns {Array} Returns the new array of combined values.
+     * @example
+     *
+     * _.unionBy([2.1], [1.2, 2.3], Math.floor);
+     * // => [2.1, 1.2]
+     *
+     * // The `_.property` iteratee shorthand.
+     * _.unionBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
+     * // => [{ 'x': 1 }, { 'x': 2 }]
+     */
+    var unionBy = baseRest(function(arrays) {
+      var iteratee = last(arrays);
+      if (isArrayLikeObject(iteratee)) {
+        iteratee = undefined;
+      }
+      return baseUniq(baseFlatten(arrays, 1, isArrayLikeObject, true), getIteratee(iteratee, 2));
+    });
+
+    /**
+     * This method is like `_.union` except that it accepts `comparator` which
+     * is invoked to compare elements of `arrays`. Result values are chosen from
+     * the first array in which the value occurs. The comparator is invoked
+     * with two arguments: (arrVal, othVal).
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Array
+     * @param {...Array} [arrays] The arrays to inspect.
+     * @param {Function} [comparator] The comparator invoked per element.
+     * @returns {Array} Returns the new array of combined values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
+     *
+     * _.unionWith(objects, others, _.isEqual);
+     * // => [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
+     */
+    var unionWith = baseRest(function(arrays) {
+      var comparator = last(arrays);
+      comparator = typeof comparator == 'function' ? comparator : undefined;
+      return baseUniq(baseFlatten(arrays, 1, isArrayLikeObject, true), undefined, comparator);
+    });
+
+    /**
+     * Creates a duplicate-free version of an array, using
+     * [`SameValueZero`](http://ecma-international.org/ecma-262/7.0/#sec-samevaluezero)
+     * for equality comparisons, in which only the first occurrence of each element
+     * is kept. The order of result values is determined by the order they occur
+     * in the array.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Array
+     * @param {Array} array The array to inspect.
+     * @returns {Array} Returns the new duplicate free array.
+     * @example
+     *
+     * _.uniq([2, 1, 2]);
+     * // => [2, 1]
+     */
+    function uniq(array) {
+      return (array && array.length) ? baseUniq(array) : [];
+    }
+
+    /**
+     * This method is like `_.uniq` except that it accepts `iteratee` which is
+     * invoked for each element in `array` to generate the criterion by which
+     * uniqueness is computed. The order of result values is determined by the
+     * order they occur in the array. The iteratee is invoked with one argument:
+     * (value).
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Array
+     * @param {Array} array The array to inspect.
+     * @param {Function} [iteratee=_.identity] The iteratee invoked per element.
+     * @returns {Array} Returns the new duplicate free array.
+     * @example
+     *
+     * _.uniqBy([2.1, 1.2, 2.3], Math.floor);
+     * // => [2.1, 1.2]
+     *
+     * // The `_.property` iteratee shorthand.
+     * _.uniqBy([{ 'x': 1 }, { 'x': 2 }, { 'x': 1 }], 'x');
+     * // => [{ 'x': 1 }, { 'x': 2 }]
+     */
+    function uniqBy(array, iteratee) {
+      return (array && array.length) ? baseUniq(array, getIteratee(iteratee, 2)) : [];
+    }
+
+    /**
+     * This method is like `_.uniq` except that it accepts `comparator` which
+     * is invoked to compare elements of `array`. The order of result values is
+     * determined by the order they occur in the array.The comparator is invoked
+     * with two arguments: (arrVal, othVal).
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Array
+     * @param {Array} array The array to inspect.
+     * @param {Function} [comparator] The comparator invoked per element.
+     * @returns {Array} Returns the new duplicate free array.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }, { 'x': 1, 'y': 2 }];
+     *
+     * _.uniqWith(objects, _.isEqual);
+     * // => [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }]
+     */
+    function uniqWith(array, comparator) {
+      comparator = typeof comparator == 'function' ? comparator : undefined;
+      return (array && array.length) ? baseUniq(array, undefined, comparator) : [];
+    }
+
+    /**
+     * This method is like `_.zip` except that it accepts an array of grouped
+     * elements and creates an array regrouping the elements to their pre-zip
+     * configuration.
+     *
+     * @static
+     * @memberOf _
+     * @since 1.2.0
+     * @category Array
+     * @param {Array} array The array of grouped elements to process.
+     * @returns {Array} Returns the new array of regrouped elements.
+     * @example
+     *
+     * var zipped = _.zip(['a', 'b'], [1, 2], [true, false]);
+     * // => [['a', 1, true], ['b', 2, false]]
+     *
+     * _.unzip(zipped);
+     * // => [['a', 'b'], [1, 2], [true, false]]
+     */
+    function unzip(array) {
+      if (!(array && array.length)) {
+        return [];
+      }
+      var length = 0;
+      array = arrayFilter(array, function(group) {
+        if (isArrayLikeObject(group)) {
+          length = nativeMax(group.length, length);
+          return true;
+        }
+      });
+      return baseTimes(length, function(index) {
+        return arrayMap(array, baseProperty(index));
+      });
+    }
+
+    /**
+     * This method is like `_.unzip` except that it accepts `iteratee` to specify
+     * how regrouped values should be combined. The iteratee is invoked with the
+     * elements of each group: (...group).
+     *
+     * @static
+     * @memberOf _
+     * @since 3.8.0
+     * @category Array
+     * @param {Array} array The array of grouped elements to process.
+     * @param {Function} [iteratee=_.identity] The function to combine
+     *  regrouped values.
+     * @returns {Array} Returns the new array of regrouped elements.
+     * @example
+     *
+     * var zipped = _.zip([1, 2], [10, 20], [100, 200]);
+     * // => [[1, 10, 100], [2, 20, 200]]
+     *
+     * _.unzipWith(zipped, _.add);
+     * // => [3, 30, 300]
+     */
+    function unzipWith(array, iteratee) {
+      if (!(array && array.length)) {
+        return [];
+      }
+      var result = unzip(array);
+      if (iteratee == null) {
+        return result;
+      }
+      return arrayMap(result, function(group) {
+        return apply(iteratee, undefined, group);
+      });
+    }
+
+    /**
+     * Creates an array excluding all given values using
+     * [`SameValueZero`](http://ecma-international.org/ecma-262/7.0/#sec-samevaluezero)
+     * for equality comparisons.
+     *
+     * **Note:** Unlike `_.pull`, this method returns a new array.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Array
+     * @param {Array} array The array to inspect.
+     * @param {...*} [values] The values to exclude.
+     * @returns {Array} Returns the new array of filtered values.
+     * @see _.difference, _.xor
+     * @example
+     *
+     * _.without([2, 1, 2, 3], 1, 2);
+     * // => [3]
+     */
+    var without = baseRest(function(array, values) {
+      return isArrayLikeObject(array)
+        ? baseDifference(array, values)
+        : [];
+    });
+
+    /**
+     * Creates an array of unique values that is the
+     * [symmetric difference](https://en.wikipedia.org/wiki/Symmetric_difference)
+     * of the given arrays. The order of result values is determined by the order
+     * they occur in the arrays.
+     *
+     * @static
+     * @memberOf _
+     * @since 2.4.0
+     * @category Array
+     * @param {...Array} [arrays] The arrays to inspect.
+     * @returns {Array} Returns the new array of filtered values.
+     * @see _.difference, _.without
+     * @example
+     *
+     * _.xor([2, 1], [2, 3]);
+     * // => [1, 3]
+     */
+    var xor = baseRest(function(arrays) {
+      return baseXor(arrayFilter(arrays, isArrayLikeObject));
+    });
+
+    /**
+     * This method is like `_.xor` except that it accepts `iteratee` which is
+     * invoked for each element of each `arrays` to generate the criterion by
+     * which by which they're compared. The order of result values is determined
+     * by the order they occur in the arrays. The iteratee is invoked with one
+     * argument: (value).
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Array
+     * @param {...Array} [arrays] The arrays to inspect.
+     * @param {Function} [iteratee=_.identity] The iteratee invoked per element.
+     * @returns {Array} Returns the new array of filtered values.
+     * @example
+     *
+     * _.xorBy([2.1, 1.2], [2.3, 3.4], Math.floor);
+     * // => [1.2, 3.4]
+     *
+     * // The `_.property` iteratee shorthand.
+     * _.xorBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
+     * // => [{ 'x': 2 }]
+     */
+    var xorBy = baseRest(function(arrays) {
+      var iteratee = last(arrays);
+      if (isArrayLikeObject(iteratee)) {
+        iteratee = undefined;
+      }
+      return baseXor(arrayFilter(arrays, isArrayLikeObject), getIteratee(iteratee, 2));
+    });
+
+    /**
+     * This method is like `_.xor` except that it accepts `comparator` which is
+     * invoked to compare elements of `arrays`. The order of result values is
+     * determined by the order they occur in the arrays. The comparator is invoked
+     * with two arguments: (arrVal, othVal).
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Array
+     * @param {...Array} [arrays] The arrays to inspect.
+     * @param {Function} [comparator] The comparator invoked per element.
+     * @returns {Array} Returns the new array of filtered values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
+     *
+     * _.xorWith(objects, others, _.isEqual);
+     * // => [{ 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
+     */
+    var xorWith = baseRest(function(arrays) {
+      var comparator = last(arrays);
+      comparator = typeof comparator == 'function' ? comparator : undefined;
+      return baseXor(arrayFilter(arrays, isArrayLikeObject), undefined, comparator);
+    });
+
+    /**
+     * Creates an array of grouped elements, the first of which contains the
+     * first elements of the given arrays, the second of which contains the
+     * second elements of the given arrays, and so on.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Array
+     * @param {...Array} [arrays] The arrays to process.
+     * @returns {Array} Returns the new array of grouped elements.
+     * @example
+     *
+     * _.zip(['a', 'b'], [1, 2], [true, false]);
+     * // => [['a', 1, true], ['b', 2, false]]
+     */
+    var zip = baseRest(unzip);
+
+    /**
+     * This method is like `_.fromPairs` except that it accepts two arrays,
+     * one of property identifiers and one of corresponding values.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.4.0
+     * @category Array
+     * @param {Array} [props=[]] The property identifiers.
+     * @param {Array} [values=[]] The property values.
+     * @returns {Object} Returns the new object.
+     * @example
+     *
+     * _.zipObject(['a', 'b'], [1, 2]);
+     * // => { 'a': 1, 'b': 2 }
+     */
+    function zipObject(props, values) {
+      return baseZipObject(props || [], values || [], assignValue);
+    }
+
+    /**
+     * This method is like `_.zipObject` except that it supports property paths.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.1.0
+     * @category Array
+     * @param {Array} [props=[]] The property identifiers.
+     * @param {Array} [values=[]] The property values.
+     * @returns {Object} Returns the new object.
+     * @example
+     *
+     * _.zipObjectDeep(['a.b[0].c', 'a.b[1].d'], [1, 2]);
+     * // => { 'a': { 'b': [{ 'c': 1 }, { 'd': 2 }] } }
+     */
+    function zipObjectDeep(props, values) {
+      return baseZipObject(props || [], values || [], baseSet);
+    }
+
+    /**
+     * This method is like `_.zip` except that it accepts `iteratee` to specify
+     * how grouped values should be combined. The iteratee is invoked with the
+     * elements of each group: (...group).
+     *
+     * @static
+     * @memberOf _
+     * @since 3.8.0
+     * @category Array
+     * @param {...Array} [arrays] The arrays to process.
+     * @param {Function} [iteratee=_.identity] The function to combine
+     *  grouped values.
+     * @returns {Array} Returns the new array of grouped elements.
+     * @example
+     *
+     * _.zipWith([1, 2], [10, 20], [100, 200], function(a, b, c) {
+     *   return a + b + c;
+     * });
+     * // => [111, 222]
+     */
+    var zipWith = baseRest(function(arrays) {
+      var length = arrays.length,
+          iteratee = length > 1 ? arrays[length - 1] : undefined;
+
+      iteratee = typeof iteratee == 'function' ? (arrays.pop(), iteratee) : undefined;
+      return unzipWith(arrays, iteratee);
+    });
+
+    /*------------------------------------------------------------------------*/
+
+    /**
+     * Creates a `lodash` wrapper instance that wraps `value` with explicit method
+     * chain sequences enabled. The result of such sequences must be unwrapped
+     * with `_#value`.
+     *
+     * @static
+     * @memberOf _
+     * @since 1.3.0
+     * @category Seq
+     * @param {*} value The value to wrap.
+     * @returns {Object} Returns the new `lodash` wrapper instance.
+     * @example
+     *
+     * var users = [
+     *   { 'user': 'barney',  'age': 36 },
+     *   { 'user': 'fred',    'age': 40 },
+     *   { 'user': 'pebbles', 'age': 1 }
+     * ];
+     *
+     * var youngest = _
+     *   .chain(users)
+     *   .sortBy('age')
+     *   .map(function(o) {
+     *     return o.user + ' is ' + o.age;
+     *   })
+     *   .head()
+     *   .value();
+     * // => 'pebbles is 1'
+     */
+    function chain(value) {
+      var result = lodash(value);
+      result.__chain__ = true;
+      return result;
+    }
+
+    /**
+     * This method invokes `interceptor` and returns `value`. The interceptor
+     * is invoked with one argument; (value). The purpose of this method is to
+     * "tap into" a method chain sequence in order to modify intermediate results.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Seq
+     * @param {*} value The value to provide to `interceptor`.
+     * @param {Function} interceptor The function to invoke.
+     * @returns {*} Returns `value`.
+     * @example
+     *
+     * _([1, 2, 3])
+     *  .tap(function(array) {
+     *    // Mutate input array.
+     *    array.pop();
+     *  })
+     *  .reverse()
+     *  .value();
+     * // => [2, 1]
+     */
+    function tap(value, interceptor) {
+      interceptor(value);
+      return value;
+    }
+
+    /**
+     * This method is like `_.tap` except that it returns the result of `interceptor`.
+     * The purpose of this method is to "pass thru" values replacing intermediate
+     * results in a method chain sequence.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.0.0
+     * @category Seq
+     * @param {*} value The value to provide to `interceptor`.
+     * @param {Function} interceptor The function to invoke.
+     * @returns {*} Returns the result of `interceptor`.
+     * @example
+     *
+     * _('  abc  ')
+     *  .chain()
+     *  .trim()
+     *  .thru(function(value) {
+     *    return [value];
+     *  })
+     *  .value();
+     * // => ['abc']
+     */
+    function thru(value, interceptor) {
+      return interceptor(value);
+    }
+
+    /**
+     * This method is the wrapper version of `_.at`.
+     *
+     * @name at
+     * @memberOf _
+     * @since 1.0.0
+     * @category Seq
+     * @param {...(string|string[])} [paths] The property paths to pick.
+     * @returns {Object} Returns the new `lodash` wrapper instance.
+     * @example
+     *
+     * var object = { 'a': [{ 'b': { 'c': 3 } }, 4] };
+     *
+     * _(object).at(['a[0].b.c', 'a[1]']).value();
+     * // => [3, 4]
+     */
+    var wrapperAt = flatRest(function(paths) {
+      var length = paths.length,
+          start = length ? paths[0] : 0,
+          value = this.__wrapped__,
+          interceptor = function(object) { return baseAt(object, paths); };
+
+      if (length > 1 || this.__actions__.length ||
+          !(value instanceof LazyWrapper) || !isIndex(start)) {
+        return this.thru(interceptor);
+      }
+      value = value.slice(start, +start + (length ? 1 : 0));
+      value.__actions__.push({
+        'func': thru,
+        'args': [interceptor],
+        'thisArg': undefined
+      });
+      return new LodashWrapper(value, this.__chain__).thru(function(array) {
+        if (length && !array.length) {
+          array.push(undefined);
+        }
+        return array;
+      });
+    });
+
+    /**
+     * Creates a `lodash` wrapper instance with explicit method chain sequences enabled.
+     *
+     * @name chain
+     * @memberOf _
+     * @since 0.1.0
+     * @category Seq
+     * @returns {Object} Returns the new `lodash` wrapper instance.
+     * @example
+     *
+     * var users = [
+     *   { 'user': 'barney', 'age': 36 },
+     *   { 'user': 'fred',   'age': 40 }
+     * ];
+     *
+     * // A sequence without explicit chaining.
+     * _(users).head();
+     * // => { 'user': 'barney', 'age': 36 }
+     *
+     * // A sequence with explicit chaining.
+     * _(users)
+     *   .chain()
+     *   .head()
+     *   .pick('user')
+     *   .value();
+     * // => { 'user': 'barney' }
+     */
+    function wrapperChain() {
+      return chain(this);
+    }
+
+    /**
+     * Executes the chain sequence and returns the wrapped result.
+     *
+     * @name commit
+     * @memberOf _
+     * @since 3.2.0
+     * @category Seq
+     * @returns {Object} Returns the new `lodash` wrapper instance.
+     * @example
+     *
+     * var array = [1, 2];
+     * var wrapped = _(array).push(3);
+     *
+     * console.log(array);
+     * // => [1, 2]
+     *
+     * wrapped = wrapped.commit();
+     * console.log(array);
+     * // => [1, 2, 3]
+     *
+     * wrapped.last();
+     * // => 3
+     *
+     * console.log(array);
+     * // => [1, 2, 3]
+     */
+    function wrapperCommit() {
+      return new LodashWrapper(this.value(), this.__chain__);
+    }
+
+    /**
+     * Gets the next value on a wrapped object following the
+     * [iterator protocol](https://mdn.io/iteration_protocols#iterator).
+     *
+     * @name next
+     * @memberOf _
+     * @since 4.0.0
+     * @category Seq
+     * @returns {Object} Returns the next iterator value.
+     * @example
+     *
+     * var wrapped = _([1, 2]);
+     *
+     * wrapped.next();
+     * // => { 'done': false, 'value': 1 }
+     *
+     * wrapped.next();
+     * // => { 'done': false, 'value': 2 }
+     *
+     * wrapped.next();
+     * // => { 'done': true, 'value': undefined }
+     */
+    function wrapperNext() {
+      if (this.__values__ === undefined) {
+        this.__values__ = toArray(this.value());
+      }
+      var done = this.__index__ >= this.__values__.length,
+          value = done ? undefined : this.__values__[this.__index__++];
+
+      return { 'done': done, 'value': value };
+    }
+
+    /**
+     * Enables the wrapper to be iterable.
+     *
+     * @name Symbol.iterator
+     * @memberOf _
+     * @since 4.0.0
+     * @category Seq
+     * @returns {Object} Returns the wrapper object.
+     * @example
+     *
+     * var wrapped = _([1, 2]);
+     *
+     * wrapped[Symbol.iterator]() === wrapped;
+     * // => true
+     *
+     * Array.from(wrapped);
+     * // => [1, 2]
+     */
+    function wrapperToIterator() {
+      return this;
+    }
+
+    /**
+     * Creates a clone of the chain sequence planting `value` as the wrapped value.
+     *
+     * @name plant
+     * @memberOf _
+     * @since 3.2.0
+     * @category Seq
+     * @param {*} value The value to plant.
+     * @returns {Object} Returns the new `lodash` wrapper instance.
+     * @example
+     *
+     * function square(n) {
+     *   return n * n;
+     * }
+     *
+     * var wrapped = _([1, 2]).map(square);
+     * var other = wrapped.plant([3, 4]);
+     *
+     * other.value();
+     * // => [9, 16]
+     *
+     * wrapped.value();
+     * // => [1, 4]
+     */
+    function wrapperPlant(value) {
+      var result,
+          parent = this;
+
+      while (parent instanceof baseLodash) {
+        var clone = wrapperClone(parent);
+        clone.__index__ = 0;
+        clone.__values__ = undefined;
+        if (result) {
+          previous.__wrapped__ = clone;
+        } else {
+          result = clone;
+        }
+        var previous = clone;
+        parent = parent.__wrapped__;
+      }
+      previous.__wrapped__ = value;
+      return result;
+    }
+
+    /**
+     * This method is the wrapper version of `_.reverse`.
+     *
+     * **Note:** This method mutates the wrapped array.
+     *
+     * @name reverse
+     * @memberOf _
+     * @since 0.1.0
+     * @category Seq
+     * @returns {Object} Returns the new `lodash` wrapper instance.
+     * @example
+     *
+     * var array = [1, 2, 3];
+     *
+     * _(array).reverse().value()
+     * // => [3, 2, 1]
+     *
+     * console.log(array);
+     * // => [3, 2, 1]
+     */
+    function wrapperReverse() {
+      var value = this.__wrapped__;
+      if (value instanceof LazyWrapper) {
+        var wrapped = value;
+        if (this.__actions__.length) {
+          wrapped = new LazyWrapper(this);
+        }
+        wrapped = wrapped.reverse();
+        wrapped.__actions__.push({
+          'func': thru,
+          'args': [reverse],
+          'thisArg': undefined
+        });
+        return new LodashWrapper(wrapped, this.__chain__);
+      }
+      return this.thru(reverse);
+    }
+
+    /**
+     * Executes the chain sequence to resolve the unwrapped value.
+     *
+     * @name value
+     * @memberOf _
+     * @since 0.1.0
+     * @alias toJSON, valueOf
+     * @category Seq
+     * @returns {*} Returns the resolved unwrapped value.
+     * @example
+     *
+     * _([1, 2, 3]).value();
+     * // => [1, 2, 3]
+     */
+    function wrapperValue() {
+      return baseWrapperValue(this.__wrapped__, this.__actions__);
+    }
+
+    /*------------------------------------------------------------------------*/
+
+    /**
+     * Creates an object composed of keys generated from the results of running
+     * each element of `collection` thru `iteratee`. The corresponding value of
+     * each key is the number of times the key was returned by `iteratee`. The
+     * iteratee is invoked with one argument: (value).
+     *
+     * @static
+     * @memberOf _
+     * @since 0.5.0
+     * @category Collection
+     * @param {Array|Object} collection The collection to iterate over.
+     * @param {Function} [iteratee=_.identity] The iteratee to transform keys.
+     * @returns {Object} Returns the composed aggregate object.
+     * @example
+     *
+     * _.countBy([6.1, 4.2, 6.3], Math.floor);
+     * // => { '4': 1, '6': 2 }
+     *
+     * // The `_.property` iteratee shorthand.
+     * _.countBy(['one', 'two', 'three'], 'length');
+     * // => { '3': 2, '5': 1 }
+     */
+    var countBy = createAggregator(function(result, value, key) {
+      if (hasOwnProperty.call(result, key)) {
+        ++result[key];
+      } else {
+        baseAssignValue(result, key, 1);
+      }
+    });
+
+    /**
+     * Checks if `predicate` returns truthy for **all** elements of `collection`.
+     * Iteration is stopped once `predicate` returns falsey. The predicate is
+     * invoked with three arguments: (value, index|key, collection).
+     *
+     * **Note:** This method returns `true` for
+     * [empty collections](https://en.wikipedia.org/wiki/Empty_set) because
+     * [everything is true](https://en.wikipedia.org/wiki/Vacuous_truth) of
+     * elements of empty collections.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Collection
+     * @param {Array|Object} collection The collection to iterate over.
+     * @param {Function} [predicate=_.identity] The function invoked per iteration.
+     * @param- {Object} [guard] Enables use as an iteratee for methods like `_.map`.
+     * @returns {boolean} Returns `true` if all elements pass the predicate check,
+     *  else `false`.
+     * @example
+     *
+     * _.every([true, 1, null, 'yes'], Boolean);
+     * // => false
+     *
+     * var users = [
+     *   { 'user': 'barney', 'age': 36, 'active': false },
+     *   { 'user': 'fred',   'age': 40, 'active': false }
+     * ];
+     *
+     * // The `_.matches` iteratee shorthand.
+     * _.every(users, { 'user': 'barney', 'active': false });
+     * // => false
+     *
+     * // The `_.matchesProperty` iteratee shorthand.
+     * _.every(users, ['active', false]);
+     * // => true
+     *
+     * // The `_.property` iteratee shorthand.
+     * _.every(users, 'active');
+     * // => false
+     */
+    function every(collection, predicate, guard) {
+      var func = isArray(collection) ? arrayEvery : baseEvery;
+      if (guard && isIterateeCall(collection, predicate, guard)) {
+        predicate = undefined;
+      }
+      return func(collection, getIteratee(predicate, 3));
+    }
+
+    /**
+     * Iterates over elements of `collection`, returning an array of all elements
+     * `predicate` returns truthy for. The predicate is invoked with three
+     * arguments: (value, index|key, collection).
+     *
+     * **Note:** Unlike `_.remove`, this method returns a new array.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Collection
+     * @param {Array|Object} collection The collection to iterate over.
+     * @param {Function} [predicate=_.identity] The function invoked per iteration.
+     * @returns {Array} Returns the new filtered array.
+     * @see _.reject
+     * @example
+     *
+     * var users = [
+     *   { 'user': 'barney', 'age': 36, 'active': true },
+     *   { 'user': 'fred',   'age': 40, 'active': false }
+     * ];
+     *
+     * _.filter(users, function(o) { return !o.active; });
+     * // => objects for ['fred']
+     *
+     * // The `_.matches` iteratee shorthand.
+     * _.filter(users, { 'age': 36, 'active': true });
+     * // => objects for ['barney']
+     *
+     * // The `_.matchesProperty` iteratee shorthand.
+     * _.filter(users, ['active', false]);
+     * // => objects for ['fred']
+     *
+     * // The `_.property` iteratee shorthand.
+     * _.filter(users, 'active');
+     * // => objects for ['barney']
+     */
+    function filter(collection, predicate) {
+      var func = isArray(collection) ? arrayFilter : baseFilter;
+      return func(collection, getIteratee(predicate, 3));
+    }
+
+    /**
+     * Iterates over elements of `collection`, returning the first element
+     * `predicate` returns truthy for. The predicate is invoked with three
+     * arguments: (value, index|key, collection).
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Collection
+     * @param {Array|Object} collection The collection to inspect.
+     * @param {Function} [predicate=_.identity] The function invoked per iteration.
+     * @param {number} [fromIndex=0] The index to search from.
+     * @returns {*} Returns the matched element, else `undefined`.
+     * @example
+     *
+     * var users = [
+     *   { 'user': 'barney',  'age': 36, 'active': true },
+     *   { 'user': 'fred',    'age': 40, 'active': false },
+     *   { 'user': 'pebbles', 'age': 1,  'active': true }
+     * ];
+     *
+     * _.find(users, function(o) { return o.age < 40; });
+     * // => object for 'barney'
+     *
+     * // The `_.matches` iteratee shorthand.
+     * _.find(users, { 'age': 1, 'active': true });
+     * // => object for 'pebbles'
+     *
+     * // The `_.matchesProperty` iteratee shorthand.
+     * _.find(users, ['active', false]);
+     * // => object for 'fred'
+     *
+     * // The `_.property` iteratee shorthand.
+     * _.find(users, 'active');
+     * // => object for 'barney'
+     */
+    var find = createFind(findIndex);
+
+    /**
+     * This method is like `_.find` except that it iterates over elements of
+     * `collection` from right to left.
+     *
+     * @static
+     * @memberOf _
+     * @since 2.0.0
+     * @category Collection
+     * @param {Array|Object} collection The collection to inspect.
+     * @param {Function} [predicate=_.identity] The function invoked per iteration.
+     * @param {number} [fromIndex=collection.length-1] The index to search from.
+     * @returns {*} Returns the matched element, else `undefined`.
+     * @example
+     *
+     * _.findLast([1, 2, 3, 4], function(n) {
+     *   return n % 2 == 1;
+     * });
+     * // => 3
+     */
+    var findLast = createFind(findLastIndex);
+
+    /**
+     * Creates a flattened array of values by running each element in `collection`
+     * thru `iteratee` and flattening the mapped results. The iteratee is invoked
+     * with three arguments: (value, index|key, collection).
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Collection
+     * @param {Array|Object} collection The collection to iterate over.
+     * @param {Function} [iteratee=_.identity] The function invoked per iteration.
+     * @returns {Array} Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [n, n];
+     * }
+     *
+     * _.flatMap([1, 2], duplicate);
+     * // => [1, 1, 2, 2]
+     */
+    function flatMap(collection, iteratee) {
+      return baseFlatten(map(collection, iteratee), 1);
+    }
+
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.7.0
+     * @category Collection
+     * @param {Array|Object} collection The collection to iterate over.
+     * @param {Function} [iteratee=_.identity] The function invoked per iteration.
+     * @returns {Array} Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDeep([1, 2], duplicate);
+     * // => [1, 1, 2, 2]
+     */
+    function flatMapDeep(collection, iteratee) {
+      return baseFlatten(map(collection, iteratee), INFINITY);
+    }
+
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results up to `depth` times.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.7.0
+     * @category Collection
+     * @param {Array|Object} collection The collection to iterate over.
+     * @param {Function} [iteratee=_.identity] The function invoked per iteration.
+     * @param {number} [depth=1] The maximum recursion depth.
+     * @returns {Array} Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDepth([1, 2], duplicate, 2);
+     * // => [[1, 1], [2, 2]]
+     */
+    function flatMapDepth(collection, iteratee, depth) {
+      depth = depth === undefined ? 1 : toInteger(depth);
+      return baseFlatten(map(collection, iteratee), depth);
+    }
+
+    /**
+     * Iterates over elements of `collection` and invokes `iteratee` for each element.
+     * The iteratee is invoked with three arguments: (value, index|key, collection).
+     * Iteratee functions may exit iteration early by explicitly returning `false`.
+     *
+     * **Note:** As with other "Collections" methods, objects with a "length"
+     * property are iterated like arrays. To avoid this behavior use `_.forIn`
+     * or `_.forOwn` for object iteration.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @alias each
+     * @category Collection
+     * @param {Array|Object} collection The collection to iterate over.
+     * @param {Function} [iteratee=_.identity] The function invoked per iteration.
+     * @returns {Array|Object} Returns `collection`.
+     * @see _.forEachRight
+     * @example
+     *
+     * _.forEach([1, 2], function(value) {
+     *   console.log(value);
+     * });
+     * // => Logs `1` then `2`.
+     *
+     * _.forEach({ 'a': 1, 'b': 2 }, function(value, key) {
+     *   console.log(key);
+     * });
+     * // => Logs 'a' then 'b' (iteration order is not guaranteed).
+     */
+    function forEach(collection, iteratee) {
+      var func = isArray(collection) ? arrayEach : baseEach;
+      return func(collection, getIteratee(iteratee, 3));
+    }
+
+    /**
+     * This method is like `_.forEach` except that it iterates over elements of
+     * `collection` from right to left.
+     *
+     * @static
+     * @memberOf _
+     * @since 2.0.0
+     * @alias eachRight
+     * @category Collection
+     * @param {Array|Object} collection The collection to iterate over.
+     * @param {Function} [iteratee=_.identity] The function invoked per iteration.
+     * @returns {Array|Object} Returns `collection`.
+     * @see _.forEach
+     * @example
+     *
+     * _.forEachRight([1, 2], function(value) {
+     *   console.log(value);
+     * });
+     * // => Logs `2` then `1`.
+     */
+    function forEachRight(collection, iteratee) {
+      var func = isArray(collection) ? arrayEachRight : baseEachRight;
+      return func(collection, getIteratee(iteratee, 3));
+    }
+
+    /**
+     * Creates an object composed of keys generated from the results of running
+     * each element of `collection` thru `iteratee`. The order of grouped values
+     * is determined by the order they occur in `collection`. The corresponding
+     * value of each key is an array of elements responsible for generating the
+     * key. The iteratee is invoked with one argument: (value).
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Collection
+     * @param {Array|Object} collection The collection to iterate over.
+     * @param {Function} [iteratee=_.identity] The iteratee to transform keys.
+     * @returns {Object} Returns the composed aggregate object.
+     * @example
+     *
+     * _.groupBy([6.1, 4.2, 6.3], Math.floor);
+     * // => { '4': [4.2], '6': [6.1, 6.3] }
+     *
+     * // The `_.property` iteratee shorthand.
+     * _.groupBy(['one', 'two', 'three'], 'length');
+     * // => { '3': ['one', 'two'], '5': ['three'] }
+     */
+    var groupBy = createAggregator(function(result, value, key) {
+      if (hasOwnProperty.call(result, key)) {
+        result[key].push(value);
+      } else {
+        baseAssignValue(result, key, [value]);
+      }
+    });
+
+    /**
+     * Checks if `value` is in `collection`. If `collection` is a string, it's
+     * checked for a substring of `value`, otherwise
+     * [`SameValueZero`](http://ecma-international.org/ecma-262/7.0/#sec-samevaluezero)
+     * is used for equality comparisons. If `fromIndex` is negative, it's used as
+     * the offset from the end of `collection`.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Collection
+     * @param {Array|Object|string} collection The collection to inspect.
+     * @param {*} value The value to search for.
+     * @param {number} [fromIndex=0] The index to search from.
+     * @param- {Object} [guard] Enables use as an iteratee for methods like `_.reduce`.
+     * @returns {boolean} Returns `true` if `value` is found, else `false`.
+     * @example
+     *
+     * _.includes([1, 2, 3], 1);
+     * // => true
+     *
+     * _.includes([1, 2, 3], 1, 2);
+     * // => false
+     *
+     * _.includes({ 'a': 1, 'b': 2 }, 1);
+     * // => true
+     *
+     * _.includes('abcd', 'bc');
+     * // => true
+     */
+    function includes(collection, value, fromIndex, guard) {
+      collection = isArrayLike(collection) ? collection : values(collection);
+      fromIndex = (fromIndex && !guard) ? toInteger(fromIndex) : 0;
+
+      var length = collection.length;
+      if (fromIndex < 0) {
+        fromIndex = nativeMax(length + fromIndex, 0);
+      }
+      return isString(collection)
+        ? (fromIndex <= length && collection.indexOf(value, fromIndex) > -1)
+        : (!!length && baseIndexOf(collection, value, fromIndex) > -1);
+    }
+
+    /**
+     * Invokes the method at `path` of each element in `collection`, returning
+     * an array of the results of each invoked method. Any additional arguments
+     * are provided to each invoked method. If `path` is a function, it's invoked
+     * for, and `this` bound to, each element in `collection`.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Collection
+     * @param {Array|Object} collection The collection to iterate over.
+     * @param {Array|Function|string} path The path of the method to invoke or
+     *  the function invoked per iteration.
+     * @param {...*} [args] The arguments to invoke each method with.
+     * @returns {Array} Returns the array of results.
+     * @example
+     *
+     * _.invokeMap([[5, 1, 7], [3, 2, 1]], 'sort');
+     * // => [[1, 5, 7], [1, 2, 3]]
+     *
+     * _.invokeMap([123, 456], String.prototype.split, '');
+     * // => [['1', '2', '3'], ['4', '5', '6']]
+     */
+    var invokeMap = baseRest(function(collection, path, args) {
+      var index = -1,
+          isFunc = typeof path == 'function',
+          result = isArrayLike(collection) ? Array(collection.length) : [];
+
+      baseEach(collection, function(value) {
+        result[++index] = isFunc ? apply(path, value, args) : baseInvoke(value, path, args);
+      });
+      return result;
+    });
+
+    /**
+     * Creates an object composed of keys generated from the results of running
+     * each element of `collection` thru `iteratee`. The corresponding value of
+     * each key is the last element responsible for generating the key. The
+     * iteratee is invoked with one argument: (value).
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Collection
+     * @param {Array|Object} collection The collection to iterate over.
+     * @param {Function} [iteratee=_.identity] The iteratee to transform keys.
+     * @returns {Object} Returns the composed aggregate object.
+     * @example
+     *
+     * var array = [
+     *   { 'dir': 'left', 'code': 97 },
+     *   { 'dir': 'right', 'code': 100 }
+     * ];
+     *
+     * _.keyBy(array, function(o) {
+     *   return String.fromCharCode(o.code);
+     * });
+     * // => { 'a': { 'dir': 'left', 'code': 97 }, 'd': { 'dir': 'right', 'code': 100 } }
+     *
+     * _.keyBy(array, 'dir');
+     * // => { 'left': { 'dir': 'left', 'code': 97 }, 'right': { 'dir': 'right', 'code': 100 } }
+     */
+    var keyBy = createAggregator(function(result, value, key) {
+      baseAssignValue(result, key, value);
+    });
+
+    /**
+     * Creates an array of values by running each element in `collection` thru
+     * `iteratee`. The iteratee is invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * Many lodash methods are guarded to work as iteratees for methods like
+     * `_.every`, `_.filter`, `_.map`, `_.mapValues`, `_.reject`, and `_.some`.
+     *
+     * The guarded methods are:
+     * `ary`, `chunk`, `curry`, `curryRight`, `drop`, `dropRight`, `every`,
+     * `fill`, `invert`, `parseInt`, `random`, `range`, `rangeRight`, `repeat`,
+     * `sampleSize`, `slice`, `some`, `sortBy`, `split`, `take`, `takeRight`,
+     * `template`, `trim`, `trimEnd`, `trimStart`, and `words`
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Collection
+     * @param {Array|Object} collection The collection to iterate over.
+     * @param {Function} [iteratee=_.identity] The function invoked per iteration.
+     * @returns {Array} Returns the new mapped array.
+     * @example
+     *
+     * function square(n) {
+     *   return n * n;
+     * }
+     *
+     * _.map([4, 8], square);
+     * // => [16, 64]
+     *
+     * _.map({ 'a': 4, 'b': 8 }, square);
+     * // => [16, 64] (iteration order is not guaranteed)
+     *
+     * var users = [
+     *   { 'user': 'barney' },
+     *   { 'user': 'fred' }
+     * ];
+     *
+     * // The `_.property` iteratee shorthand.
+     * _.map(users, 'user');
+     * // => ['barney', 'fred']
+     */
+    function map(collection, iteratee) {
+      var func = isArray(collection) ? arrayMap : baseMap;
+      return func(collection, getIteratee(iteratee, 3));
+    }
+
+    /**
+     * This method is like `_.sortBy` except that it allows specifying the sort
+     * orders of the iteratees to sort by. If `orders` is unspecified, all values
+     * are sorted in ascending order. Otherwise, specify an order of "desc" for
+     * descending or "asc" for ascending sort order of corresponding values.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Collection
+     * @param {Array|Object} collection The collection to iterate over.
+     * @param {Array[]|Function[]|Object[]|string[]} [iteratees=[_.identity]]
+     *  The iteratees to sort by.
+     * @param {string[]} [orders] The sort orders of `iteratees`.
+     * @param- {Object} [guard] Enables use as an iteratee for methods like `_.reduce`.
+     * @returns {Array} Returns the new sorted array.
+     * @example
+     *
+     * var users = [
+     *   { 'user': 'fred',   'age': 48 },
+     *   { 'user': 'barney', 'age': 34 },
+     *   { 'user': 'fred',   'age': 40 },
+     *   { 'user': 'barney', 'age': 36 }
+     * ];
+     *
+     * // Sort by `user` in ascending order and by `age` in descending order.
+     * _.orderBy(users, ['user', 'age'], ['asc', 'desc']);
+     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 40]]
+     */
+    function orderBy(collection, iteratees, orders, guard) {
+      if (collection == null) {
+        return [];
+      }
+      if (!isArray(iteratees)) {
+        iteratees = iteratees == null ? [] : [iteratees];
+      }
+      orders = guard ? undefined : orders;
+      if (!isArray(orders)) {
+        orders = orders == null ? [] : [orders];
+      }
+      return baseOrderBy(collection, iteratees, orders);
+    }
+
+    /**
+     * Creates an array of elements split into two groups, the first of which
+     * contains elements `predicate` returns truthy for, the second of which
+     * contains elements `predicate` returns falsey for. The predicate is
+     * invoked with one argument: (value).
+     *
+     * @static
+     * @memberOf _
+     * @since 3.0.0
+     * @category Collection
+     * @param {Array|Object} collection The collection to iterate over.
+     * @param {Function} [predicate=_.identity] The function invoked per iteration.
+     * @returns {Array} Returns the array of grouped elements.
+     * @example
+     *
+     * var users = [
+     *   { 'user': 'barney',  'age': 36, 'active': false },
+     *   { 'user': 'fred',    'age': 40, 'active': true },
+     *   { 'user': 'pebbles', 'age': 1,  'active': false }
+     * ];
+     *
+     * _.partition(users, function(o) { return o.active; });
+     * // => objects for [['fred'], ['barney', 'pebbles']]
+     *
+     * // The `_.matches` iteratee shorthand.
+     * _.partition(users, { 'age': 1, 'active': false });
+     * // => objects for [['pebbles'], ['barney', 'fred']]
+     *
+     * // The `_.matchesProperty` iteratee shorthand.
+     * _.partition(users, ['active', false]);
+     * // => objects for [['barney', 'pebbles'], ['fred']]
+     *
+     * // The `_.property` iteratee shorthand.
+     * _.partition(users, 'active');
+     * // => objects for [['fred'], ['barney', 'pebbles']]
+     */
+    var partition = createAggregator(function(result, value, key) {
+      result[key ? 0 : 1].push(value);
+    }, function() { return [[], []]; });
+
+    /**
+     * Reduces `collection` to a value which is the accumulated result of running
+     * each element in `collection` thru `iteratee`, where each successive
+     * invocation is supplied the return value of the previous. If `accumulator`
+     * is not given, the first element of `collection` is used as the initial
+     * value. The iteratee is invoked with four arguments:
+     * (accumulator, value, index|key, collection).
+     *
+     * Many lodash methods are guarded to work as iteratees for methods like
+     * `_.reduce`, `_.reduceRight`, and `_.transform`.
+     *
+     * The guarded methods are:
+     * `assign`, `defaults`, `defaultsDeep`, `includes`, `merge`, `orderBy`,
+     * and `sortBy`
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Collection
+     * @param {Array|Object} collection The collection to iterate over.
+     * @param {Function} [iteratee=_.identity] The function invoked per iteration.
+     * @param {*} [accumulator] The initial value.
+     * @returns {*} Returns the accumulated value.
+     * @see _.reduceRight
+     * @example
+     *
+     * _.reduce([1, 2], function(sum, n) {
+     *   return sum + n;
+     * }, 0);
+     * // => 3
+     *
+     * _.reduce({ 'a': 1, 'b': 2, 'c': 1 }, function(result, value, key) {
+     *   (result[value] || (result[value] = [])).push(key);
+     *   return result;
+     * }, {});
+     * // => { '1': ['a', 'c'], '2': ['b'] } (iteration order is not guaranteed)
+     */
+    function reduce(collection, iteratee, accumulator) {
+      var func = isArray(collection) ? arrayReduce : baseReduce,
+          initAccum = arguments.length < 3;
+
+      return func(collection, getIteratee(iteratee, 4), accumulator, initAccum, baseEach);
+    }
+
+    /**
+     * This method is like `_.reduce` except that it iterates over elements of
+     * `collection` from right to left.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Collection
+     * @param {Array|Object} collection The collection to iterate over.
+     * @param {Function} [iteratee=_.identity] The function invoked per iteration.
+     * @param {*} [accumulator] The initial value.
+     * @returns {*} Returns the accumulated value.
+     * @see _.reduce
+     * @example
+     *
+     * var array = [[0, 1], [2, 3], [4, 5]];
+     *
+     * _.reduceRight(array, function(flattened, other) {
+     *   return flattened.concat(other);
+     * }, []);
+     * // => [4, 5, 2, 3, 0, 1]
+     */
+    function reduceRight(collection, iteratee, accumulator) {
+      var func = isArray(collection) ? arrayReduceRight : baseReduce,
+          initAccum = arguments.length < 3;
+
+      return func(collection, getIteratee(iteratee, 4), accumulator, initAccum, baseEachRight);
+    }
+
+    /**
+     * The opposite of `_.filter`; this method returns the elements of `collection`
+     * that `predicate` does **not** return truthy for.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Collection
+     * @param {Array|Object} collection The collection to iterate over.
+     * @param {Function} [predicate=_.identity] The function invoked per iteration.
+     * @returns {Array} Returns the new filtered array.
+     * @see _.filter
+     * @example
+     *
+     * var users = [
+     *   { 'user': 'barney', 'age': 36, 'active': false },
+     *   { 'user': 'fred',   'age': 40, 'active': true }
+     * ];
+     *
+     * _.reject(users, function(o) { return !o.active; });
+     * // => objects for ['fred']
+     *
+     * // The `_.matches` iteratee shorthand.
+     * _.reject(users, { 'age': 40, 'active': true });
+     * // => objects for ['barney']
+     *
+     * // The `_.matchesProperty` iteratee shorthand.
+     * _.reject(users, ['active', false]);
+     * // => objects for ['fred']
+     *
+     * // The `_.property` iteratee shorthand.
+     * _.reject(users, 'active');
+     * // => objects for ['barney']
+     */
+    function reject(collection, predicate) {
+      var func = isArray(collection) ? arrayFilter : baseFilter;
+      return func(collection, negate(getIteratee(predicate, 3)));
+    }
+
+    /**
+     * Gets a random element from `collection`.
+     *
+     * @static
+     * @memberOf _
+     * @since 2.0.0
+     * @category Collection
+     * @param {Array|Object} collection The collection to sample.
+     * @returns {*} Returns the random element.
+     * @example
+     *
+     * _.sample([1, 2, 3, 4]);
+     * // => 2
+     */
+    function sample(collection) {
+      var func = isArray(collection) ? arraySample : baseSample;
+      return func(collection);
+    }
+
+    /**
+     * Gets `n` random elements at unique keys from `collection` up to the
+     * size of `collection`.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Collection
+     * @param {Array|Object} collection The collection to sample.
+     * @param {number} [n=1] The number of elements to sample.
+     * @param- {Object} [guard] Enables use as an iteratee for methods like `_.map`.
+     * @returns {Array} Returns the random elements.
+     * @example
+     *
+     * _.sampleSize([1, 2, 3], 2);
+     * // => [3, 1]
+     *
+     * _.sampleSize([1, 2, 3], 4);
+     * // => [2, 3, 1]
+     */
+    function sampleSize(collection, n, guard) {
+      if ((guard ? isIterateeCall(collection, n, guard) : n === undefined)) {
+        n = 1;
+      } else {
+        n = toInteger(n);
+      }
+      var func = isArray(collection) ? arraySampleSize : baseSampleSize;
+      return func(collection, n);
+    }
+
+    /**
+     * Creates an array of shuffled values, using a version of the
+     * [Fisher-Yates shuffle](https://en.wikipedia.org/wiki/Fisher-Yates_shuffle).
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Collection
+     * @param {Array|Object} collection The collection to shuffle.
+     * @returns {Array} Returns the new shuffled array.
+     * @example
+     *
+     * _.shuffle([1, 2, 3, 4]);
+     * // => [4, 1, 3, 2]
+     */
+    function shuffle(collection) {
+      var func = isArray(collection) ? arrayShuffle : baseShuffle;
+      return func(collection);
+    }
+
+    /**
+     * Gets the size of `collection` by returning its length for array-like
+     * values or the number of own enumerable string keyed properties for objects.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Collection
+     * @param {Array|Object|string} collection The collection to inspect.
+     * @returns {number} Returns the collection size.
+     * @example
+     *
+     * _.size([1, 2, 3]);
+     * // => 3
+     *
+     * _.size({ 'a': 1, 'b': 2 });
+     * // => 2
+     *
+     * _.size('pebbles');
+     * // => 7
+     */
+    function size(collection) {
+      if (collection == null) {
+        return 0;
+      }
+      if (isArrayLike(collection)) {
+        return isString(collection) ? stringSize(collection) : collection.length;
+      }
+      var tag = getTag(collection);
+      if (tag == mapTag || tag == setTag) {
+        return collection.size;
+      }
+      return baseKeys(collection).length;
+    }
+
+    /**
+     * Checks if `predicate` returns truthy for **any** element of `collection`.
+     * Iteration is stopped once `predicate` returns truthy. The predicate is
+     * invoked with three arguments: (value, index|key, collection).
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Collection
+     * @param {Array|Object} collection The collection to iterate over.
+     * @param {Function} [predicate=_.identity] The function invoked per iteration.
+     * @param- {Object} [guard] Enables use as an iteratee for methods like `_.map`.
+     * @returns {boolean} Returns `true` if any element passes the predicate check,
+     *  else `false`.
+     * @example
+     *
+     * _.some([null, 0, 'yes', false], Boolean);
+     * // => true
+     *
+     * var users = [
+     *   { 'user': 'barney', 'active': true },
+     *   { 'user': 'fred',   'active': false }
+     * ];
+     *
+     * // The `_.matches` iteratee shorthand.
+     * _.some(users, { 'user': 'barney', 'active': false });
+     * // => false
+     *
+     * // The `_.matchesProperty` iteratee shorthand.
+     * _.some(users, ['active', false]);
+     * // => true
+     *
+     * // The `_.property` iteratee shorthand.
+     * _.some(users, 'active');
+     * // => true
+     */
+    function some(collection, predicate, guard) {
+      var func = isArray(collection) ? arraySome : baseSome;
+      if (guard && isIterateeCall(collection, predicate, guard)) {
+        predicate = undefined;
+      }
+      return func(collection, getIteratee(predicate, 3));
+    }
+
+    /**
+     * Creates an array of elements, sorted in ascending order by the results of
+     * running each element in a collection thru each iteratee. This method
+     * performs a stable sort, that is, it preserves the original sort order of
+     * equal elements. The iteratees are invoked with one argument: (value).
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Collection
+     * @param {Array|Object} collection The collection to iterate over.
+     * @param {...(Function|Function[])} [iteratees=[_.identity]]
+     *  The iteratees to sort by.
+     * @returns {Array} Returns the new sorted array.
+     * @example
+     *
+     * var users = [
+     *   { 'user': 'fred',   'age': 48 },
+     *   { 'user': 'barney', 'age': 36 },
+     *   { 'user': 'fred',   'age': 40 },
+     *   { 'user': 'barney', 'age': 34 }
+     * ];
+     *
+     * _.sortBy(users, [function(o) { return o.user; }]);
+     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 40]]
+     *
+     * _.sortBy(users, ['user', 'age']);
+     * // => objects for [['barney', 34], ['barney', 36], ['fred', 40], ['fred', 48]]
+     */
+    var sortBy = baseRest(function(collection, iteratees) {
+      if (collection == null) {
+        return [];
+      }
+      var length = iteratees.length;
+      if (length > 1 && isIterateeCall(collection, iteratees[0], iteratees[1])) {
+        iteratees = [];
+      } else if (length > 2 && isIterateeCall(iteratees[0], iteratees[1], iteratees[2])) {
+        iteratees = [iteratees[0]];
+      }
+      return baseOrderBy(collection, baseFlatten(iteratees, 1), []);
+    });
+
+    /*------------------------------------------------------------------------*/
+
+    /**
+     * Gets the timestamp of the number of milliseconds that have elapsed since
+     * the Unix epoch (1 January 1970 00:00:00 UTC).
+     *
+     * @static
+     * @memberOf _
+     * @since 2.4.0
+     * @category Date
+     * @returns {number} Returns the timestamp.
+     * @example
+     *
+     * _.defer(function(stamp) {
+     *   console.log(_.now() - stamp);
+     * }, _.now());
+     * // => Logs the number of milliseconds it took for the deferred invocation.
+     */
+    var now = ctxNow || function() {
+      return root.Date.now();
+    };
+
+    /*------------------------------------------------------------------------*/
+
+    /**
+     * The opposite of `_.before`; this method creates a function that invokes
+     * `func` once it's called `n` or more times.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Function
+     * @param {number} n The number of calls before `func` is invoked.
+     * @param {Function} func The function to restrict.
+     * @returns {Function} Returns the new restricted function.
+     * @example
+     *
+     * var saves = ['profile', 'settings'];
+     *
+     * var done = _.after(saves.length, function() {
+     *   console.log('done saving!');
+     * });
+     *
+     * _.forEach(saves, function(type) {
+     *   asyncSave({ 'type': type, 'complete': done });
+     * });
+     * // => Logs 'done saving!' after the two async saves have completed.
+     */
+    function after(n, func) {
+      if (typeof func != 'function') {
+        throw new TypeError(FUNC_ERROR_TEXT);
+      }
+      n = toInteger(n);
+      return function() {
+        if (--n < 1) {
+          return func.apply(this, arguments);
+        }
+      };
+    }
+
+    /**
+     * Creates a function that invokes `func`, with up to `n` arguments,
+     * ignoring any additional arguments.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.0.0
+     * @category Function
+     * @param {Function} func The function to cap arguments for.
+     * @param {number} [n=func.length] The arity cap.
+     * @param- {Object} [guard] Enables use as an iteratee for methods like `_.map`.
+     * @returns {Function} Returns the new capped function.
+     * @example
+     *
+     * _.map(['6', '8', '10'], _.ary(parseInt, 1));
+     * // => [6, 8, 10]
+     */
+    function ary(func, n, guard) {
+      n = guard ? undefined : n;
+      n = (func && n == null) ? func.length : n;
+      return createWrap(func, WRAP_ARY_FLAG, undefined, undefined, undefined, undefined, n);
+    }
+
+    /**
+     * Creates a function that invokes `func`, with the `this` binding and arguments
+     * of the created function, while it's called less than `n` times. Subsequent
+     * calls to the created function return the result of the last `func` invocation.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.0.0
+     * @category Function
+     * @param {number} n The number of calls at which `func` is no longer invoked.
+     * @param {Function} func The function to restrict.
+     * @returns {Function} Returns the new restricted function.
+     * @example
+     *
+     * jQuery(element).on('click', _.before(5, addContactToList));
+     * // => Allows adding up to 4 contacts to the list.
+     */
+    function before(n, func) {
+      var result;
+      if (typeof func != 'function') {
+        throw new TypeError(FUNC_ERROR_TEXT);
+      }
+      n = toInteger(n);
+      return function() {
+        if (--n > 0) {
+          result = func.apply(this, arguments);
+        }
+        if (n <= 1) {
+          func = undefined;
+        }
+        return result;
+      };
+    }
+
+    /**
+     * Creates a function that invokes `func` with the `this` binding of `thisArg`
+     * and `partials` prepended to the arguments it receives.
+     *
+     * The `_.bind.placeholder` value, which defaults to `_` in monolithic builds,
+     * may be used as a placeholder for partially applied arguments.
+     *
+     * **Note:** Unlike native `Function#bind`, this method doesn't set the "length"
+     * property of bound functions.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Function
+     * @param {Function} func The function to bind.
+     * @param {*} thisArg The `this` binding of `func`.
+     * @param {...*} [partials] The arguments to be partially applied.
+     * @returns {Function} Returns the new bound function.
+     * @example
+     *
+     * function greet(greeting, punctuation) {
+     *   return greeting + ' ' + this.user + punctuation;
+     * }
+     *
+     * var object = { 'user': 'fred' };
+     *
+     * var bound = _.bind(greet, object, 'hi');
+     * bound('!');
+     * // => 'hi fred!'
+     *
+     * // Bound with placeholders.
+     * var bound = _.bind(greet, object, _, '!');
+     * bound('hi');
+     * // => 'hi fred!'
+     */
+    var bind = baseRest(function(func, thisArg, partials) {
+      var bitmask = WRAP_BIND_FLAG;
+      if (partials.length) {
+        var holders = replaceHolders(partials, getHolder(bind));
+        bitmask |= WRAP_PARTIAL_FLAG;
+      }
+      return createWrap(func, bitmask, thisArg, partials, holders);
+    });
+
+    /**
+     * Creates a function that invokes the method at `object[key]` with `partials`
+     * prepended to the arguments it receives.
+     *
+     * This method differs from `_.bind` by allowing bound functions to reference
+     * methods that may be redefined or don't yet exist. See
+     * [Peter Michaux's article](http://peter.michaux.ca/articles/lazy-function-definition-pattern)
+     * for more details.
+     *
+     * The `_.bindKey.placeholder` value, which defaults to `_` in monolithic
+     * builds, may be used as a placeholder for partially applied arguments.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.10.0
+     * @category Function
+     * @param {Object} object The object to invoke the method on.
+     * @param {string} key The key of the method.
+     * @param {...*} [partials] The arguments to be partially applied.
+     * @returns {Function} Returns the new bound function.
+     * @example
+     *
+     * var object = {
+     *   'user': 'fred',
+     *   'greet': function(greeting, punctuation) {
+     *     return greeting + ' ' + this.user + punctuation;
+     *   }
+     * };
+     *
+     * var bound = _.bindKey(object, 'greet', 'hi');
+     * bound('!');
+     * // => 'hi fred!'
+     *
+     * object.greet = function(greeting, punctuation) {
+     *   return greeting + 'ya ' + this.user + punctuation;
+     * };
+     *
+     * bound('!');
+     * // => 'hiya fred!'
+     *
+     * // Bound with placeholders.
+     * var bound = _.bindKey(object, 'greet', _, '!');
+     * bound('hi');
+     * // => 'hiya fred!'
+     */
+    var bindKey = baseRest(function(object, key, partials) {
+      var bitmask = WRAP_BIND_FLAG | WRAP_BIND_KEY_FLAG;
+      if (partials.length) {
+        var holders = replaceHolders(partials, getHolder(bindKey));
+        bitmask |= WRAP_PARTIAL_FLAG;
+      }
+      return createWrap(key, bitmask, object, partials, holders);
+    });
+
+    /**
+     * Creates a function that accepts arguments of `func` and either invokes
+     * `func` returning its result, if at least `arity` number of arguments have
+     * been provided, or returns a function that accepts the remaining `func`
+     * arguments, and so on. The arity of `func` may be specified if `func.length`
+     * is not sufficient.
+     *
+     * The `_.curry.placeholder` value, which defaults to `_` in monolithic builds,
+     * may be used as a placeholder for provided arguments.
+     *
+     * **Note:** This method doesn't set the "length" property of curried functions.
+     *
+     * @static
+     * @memberOf _
+     * @since 2.0.0
+     * @category Function
+     * @param {Function} func The function to curry.
+     * @param {number} [arity=func.length] The arity of `func`.
+     * @param- {Object} [guard] Enables use as an iteratee for methods like `_.map`.
+     * @returns {Function} Returns the new curried function.
+     * @example
+     *
+     * var abc = function(a, b, c) {
+     *   return [a, b, c];
+     * };
+     *
+     * var curried = _.curry(abc);
+     *
+     * curried(1)(2)(3);
+     * // => [1, 2, 3]
+     *
+     * curried(1, 2)(3);
+     * // => [1, 2, 3]
+     *
+     * curried(1, 2, 3);
+     * // => [1, 2, 3]
+     *
+     * // Curried with placeholders.
+     * curried(1)(_, 3)(2);
+     * // => [1, 2, 3]
+     */
+    function curry(func, arity, guard) {
+      arity = guard ? undefined : arity;
+      var result = createWrap(func, WRAP_CURRY_FLAG, undefined, undefined, undefined, undefined, undefined, arity);
+      result.placeholder = curry.placeholder;
+      return result;
+    }
+
+    /**
+     * This method is like `_.curry` except that arguments are applied to `func`
+     * in the manner of `_.partialRight` instead of `_.partial`.
+     *
+     * The `_.curryRight.placeholder` value, which defaults to `_` in monolithic
+     * builds, may be used as a placeholder for provided arguments.
+     *
+     * **Note:** This method doesn't set the "length" property of curried functions.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.0.0
+     * @category Function
+     * @param {Function} func The function to curry.
+     * @param {number} [arity=func.length] The arity of `func`.
+     * @param- {Object} [guard] Enables use as an iteratee for methods like `_.map`.
+     * @returns {Function} Returns the new curried function.
+     * @example
+     *
+     * var abc = function(a, b, c) {
+     *   return [a, b, c];
+     * };
+     *
+     * var curried = _.curryRight(abc);
+     *
+     * curried(3)(2)(1);
+     * // => [1, 2, 3]
+     *
+     * curried(2, 3)(1);
+     * // => [1, 2, 3]
+     *
+     * curried(1, 2, 3);
+     * // => [1, 2, 3]
+     *
+     * // Curried with placeholders.
+     * curried(3)(1, _)(2);
+     * // => [1, 2, 3]
+     */
+    function curryRight(func, arity, guard) {
+      arity = guard ? undefined : arity;
+      var result = createWrap(func, WRAP_CURRY_RIGHT_FLAG, undefined, undefined, undefined, undefined, undefined, arity);
+      result.placeholder = curryRight.placeholder;
+      return result;
+    }
+
+    /**
+     * Creates a debounced function that delays invoking `func` until after `wait`
+     * milliseconds have elapsed since the last time the debounced function was
+     * invoked. The debounced function comes with a `cancel` method to cancel
+     * delayed `func` invocations and a `flush` method to immediately invoke them.
+     * Provide `options` to indicate whether `func` should be invoked on the
+     * leading and/or trailing edge of the `wait` timeout. The `func` is invoked
+     * with the last arguments provided to the debounced function. Subsequent
+     * calls to the debounced function return the result of the last `func`
+     * invocation.
+     *
+     * **Note:** If `leading` and `trailing` options are `true`, `func` is
+     * invoked on the trailing edge of the timeout only if the debounced function
+     * is invoked more than once during the `wait` timeout.
+     *
+     * If `wait` is `0` and `leading` is `false`, `func` invocation is deferred
+     * until to the next tick, similar to `setTimeout` with a timeout of `0`.
+     *
+     * See [David Corbacho's article](https://css-tricks.com/debouncing-throttling-explained-examples/)
+     * for details over the differences between `_.debounce` and `_.throttle`.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Function
+     * @param {Function} func The function to debounce.
+     * @param {number} [wait=0] The number of milliseconds to delay.
+     * @param {Object} [options={}] The options object.
+     * @param {boolean} [options.leading=false]
+     *  Specify invoking on the leading edge of the timeout.
+     * @param {number} [options.maxWait]
+     *  The maximum time `func` is allowed to be delayed before it's invoked.
+     * @param {boolean} [options.trailing=true]
+     *  Specify invoking on the trailing edge of the timeout.
+     * @returns {Function} Returns the new debounced function.
+     * @example
+     *
+     * // Avoid costly calculations while the window size is in flux.
+     * jQuery(window).on('resize', _.debounce(calculateLayout, 150));
+     *
+     * // Invoke `sendMail` when clicked, debouncing subsequent calls.
+     * jQuery(element).on('click', _.debounce(sendMail, 300, {
+     *   'leading': true,
+     *   'trailing': false
+     * }));
+     *
+     * // Ensure `batchLog` is invoked once after 1 second of debounced calls.
+     * var debounced = _.debounce(batchLog, 250, { 'maxWait': 1000 });
+     * var source = new EventSource('/stream');
+     * jQuery(source).on('message', debounced);
+     *
+     * // Cancel the trailing debounced invocation.
+     * jQuery(window).on('popstate', debounced.cancel);
+     */
+    function debounce(func, wait, options) {
+      var lastArgs,
+          lastThis,
+          maxWait,
+          result,
+          timerId,
+          lastCallTime,
+          lastInvokeTime = 0,
+          leading = false,
+          maxing = false,
+          trailing = true;
+
+      if (typeof func != 'function') {
+        throw new TypeError(FUNC_ERROR_TEXT);
+      }
+      wait = toNumber(wait) || 0;
+      if (isObject(options)) {
+        leading = !!options.leading;
+        maxing = 'maxWait' in options;
+        maxWait = maxing ? nativeMax(toNumber(options.maxWait) || 0, wait) : maxWait;
+        trailing = 'trailing' in options ? !!options.trailing : trailing;
+      }
+
+      function invokeFunc(time) {
+        var args = lastArgs,
+            thisArg = lastThis;
+
+        lastArgs = lastThis = undefined;
+        lastInvokeTime = time;
+        result = func.apply(thisArg, args);
+        return result;
+      }
+
+      function leadingEdge(time) {
+        // Reset any `maxWait` timer.
+        lastInvokeTime = time;
+        // Start the timer for the trailing edge.
+        timerId = setTimeout(timerExpired, wait);
+        // Invoke the leading edge.
+        return leading ? invokeFunc(time) : result;
+      }
+
+      function remainingWait(time) {
+        var timeSinceLastCall = time - lastCallTime,
+            timeSinceLastInvoke = time - lastInvokeTime,
+            timeWaiting = wait - timeSinceLastCall;
+
+        return maxing
+          ? nativeMin(timeWaiting, maxWait - timeSinceLastInvoke)
+          : timeWaiting;
+      }
+
+      function shouldInvoke(time) {
+        var timeSinceLastCall = time - lastCallTime,
+            timeSinceLastInvoke = time - lastInvokeTime;
+
+        // Either this is the first call, activity has stopped and we're at the
+        // trailing edge, the system time has gone backwards and we're treating
+        // it as the trailing edge, or we've hit the `maxWait` limit.
+        return (lastCallTime === undefined || (timeSinceLastCall >= wait) ||
+          (timeSinceLastCall < 0) || (maxing && timeSinceLastInvoke >= maxWait));
+      }
+
+      function timerExpired() {
+        var time = now();
+        if (shouldInvoke(time)) {
+          return trailingEdge(time);
+        }
+        // Restart the timer.
+        timerId = setTimeout(timerExpired, remainingWait(time));
+      }
+
+      function trailingEdge(time) {
+        timerId = undefined;
+
+        // Only invoke if we have `lastArgs` which means `func` has been
+        // debounced at least once.
+        if (trailing && lastArgs) {
+          return invokeFunc(time);
+        }
+        lastArgs = lastThis = undefined;
+        return result;
+      }
+
+      function cancel() {
+        if (timerId !== undefined) {
+          clearTimeout(timerId);
+        }
+        lastInvokeTime = 0;
+        lastArgs = lastCallTime = lastThis = timerId = undefined;
+      }
+
+      function flush() {
+        return timerId === undefined ? result : trailingEdge(now());
+      }
+
+      function debounced() {
+        var time = now(),
+            isInvoking = shouldInvoke(time);
+
+        lastArgs = arguments;
+        lastThis = this;
+        lastCallTime = time;
+
+        if (isInvoking) {
+          if (timerId === undefined) {
+            return leadingEdge(lastCallTime);
+          }
+          if (maxing) {
+            // Handle invocations in a tight loop.
+            timerId = setTimeout(timerExpired, wait);
+            return invokeFunc(lastCallTime);
+          }
+        }
+        if (timerId === undefined) {
+          timerId = setTimeout(timerExpired, wait);
+        }
+        return result;
+      }
+      debounced.cancel = cancel;
+      debounced.flush = flush;
+      return debounced;
+    }
+
+    /**
+     * Defers invoking the `func` until the current call stack has cleared. Any
+     * additional arguments are provided to `func` when it's invoked.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Function
+     * @param {Function} func The function to defer.
+     * @param {...*} [args] The arguments to invoke `func` with.
+     * @returns {number} Returns the timer id.
+     * @example
+     *
+     * _.defer(function(text) {
+     *   console.log(text);
+     * }, 'deferred');
+     * // => Logs 'deferred' after one millisecond.
+     */
+    var defer = baseRest(function(func, args) {
+      return baseDelay(func, 1, args);
+    });
+
+    /**
+     * Invokes `func` after `wait` milliseconds. Any additional arguments are
+     * provided to `func` when it's invoked.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Function
+     * @param {Function} func The function to delay.
+     * @param {number} wait The number of milliseconds to delay invocation.
+     * @param {...*} [args] The arguments to invoke `func` with.
+     * @returns {number} Returns the timer id.
+     * @example
+     *
+     * _.delay(function(text) {
+     *   console.log(text);
+     * }, 1000, 'later');
+     * // => Logs 'later' after one second.
+     */
+    var delay = baseRest(function(func, wait, args) {
+      return baseDelay(func, toNumber(wait) || 0, args);
+    });
+
+    /**
+     * Creates a function that invokes `func` with arguments reversed.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Function
+     * @param {Function} func The function to flip arguments for.
+     * @returns {Function} Returns the new flipped function.
+     * @example
+     *
+     * var flipped = _.flip(function() {
+     *   return _.toArray(arguments);
+     * });
+     *
+     * flipped('a', 'b', 'c', 'd');
+     * // => ['d', 'c', 'b', 'a']
+     */
+    function flip(func) {
+      return createWrap(func, WRAP_FLIP_FLAG);
+    }
+
+    /**
+     * Creates a function that memoizes the result of `func`. If `resolver` is
+     * provided, it determines the cache key for storing the result based on the
+     * arguments provided to the memoized function. By default, the first argument
+     * provided to the memoized function is used as the map cache key. The `func`
+     * is invoked with the `this` binding of the memoized function.
+     *
+     * **Note:** The cache is exposed as the `cache` property on the memoized
+     * function. Its creation may be customized by replacing the `_.memoize.Cache`
+     * constructor with one whose instances implement the
+     * [`Map`](http://ecma-international.org/ecma-262/7.0/#sec-properties-of-the-map-prototype-object)
+     * method interface of `clear`, `delete`, `get`, `has`, and `set`.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Function
+     * @param {Function} func The function to have its output memoized.
+     * @param {Function} [resolver] The function to resolve the cache key.
+     * @returns {Function} Returns the new memoized function.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': 2 };
+     * var other = { 'c': 3, 'd': 4 };
+     *
+     * var values = _.memoize(_.values);
+     * values(object);
+     * // => [1, 2]
+     *
+     * values(other);
+     * // => [3, 4]
+     *
+     * object.a = 2;
+     * values(object);
+     * // => [1, 2]
+     *
+     * // Modify the result cache.
+     * values.cache.set(object, ['a', 'b']);
+     * values(object);
+     * // => ['a', 'b']
+     *
+     * // Replace `_.memoize.Cache`.
+     * _.memoize.Cache = WeakMap;
+     */
+    function memoize(func, resolver) {
+      if (typeof func != 'function' || (resolver != null && typeof resolver != 'function')) {
+        throw new TypeError(FUNC_ERROR_TEXT);
+      }
+      var memoized = function() {
+        var args = arguments,
+            key = resolver ? resolver.apply(this, args) : args[0],
+            cache = memoized.cache;
+
+        if (cache.has(key)) {
+          return cache.get(key);
+        }
+        var result = func.apply(this, args);
+        memoized.cache = cache.set(key, result) || cache;
+        return result;
+      };
+      memoized.cache = new (memoize.Cache || MapCache);
+      return memoized;
+    }
+
+    // Expose `MapCache`.
+    memoize.Cache = MapCache;
+
+    /**
+     * Creates a function that negates the result of the predicate `func`. The
+     * `func` predicate is invoked with the `this` binding and arguments of the
+     * created function.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.0.0
+     * @category Function
+     * @param {Function} predicate The predicate to negate.
+     * @returns {Function} Returns the new negated function.
+     * @example
+     *
+     * function isEven(n) {
+     *   return n % 2 == 0;
+     * }
+     *
+     * _.filter([1, 2, 3, 4, 5, 6], _.negate(isEven));
+     * // => [1, 3, 5]
+     */
+    function negate(predicate) {
+      if (typeof predicate != 'function') {
+        throw new TypeError(FUNC_ERROR_TEXT);
+      }
+      return function() {
+        var args = arguments;
+        switch (args.length) {
+          case 0: return !predicate.call(this);
+          case 1: return !predicate.call(this, args[0]);
+          case 2: return !predicate.call(this, args[0], args[1]);
+          case 3: return !predicate.call(this, args[0], args[1], args[2]);
+        }
+        return !predicate.apply(this, args);
+      };
+    }
+
+    /**
+     * Creates a function that is restricted to invoking `func` once. Repeat calls
+     * to the function return the value of the first invocation. The `func` is
+     * invoked with the `this` binding and arguments of the created function.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Function
+     * @param {Function} func The function to restrict.
+     * @returns {Function} Returns the new restricted function.
+     * @example
+     *
+     * var initialize = _.once(createApplication);
+     * initialize();
+     * initialize();
+     * // => `createApplication` is invoked once
+     */
+    function once(func) {
+      return before(2, func);
+    }
+
+    /**
+     * Creates a function that invokes `func` with its arguments transformed.
+     *
+     * @static
+     * @since 4.0.0
+     * @memberOf _
+     * @category Function
+     * @param {Function} func The function to wrap.
+     * @param {...(Function|Function[])} [transforms=[_.identity]]
+     *  The argument transforms.
+     * @returns {Function} Returns the new function.
+     * @example
+     *
+     * function doubled(n) {
+     *   return n * 2;
+     * }
+     *
+     * function square(n) {
+     *   return n * n;
+     * }
+     *
+     * var func = _.overArgs(function(x, y) {
+     *   return [x, y];
+     * }, [square, doubled]);
+     *
+     * func(9, 3);
+     * // => [81, 6]
+     *
+     * func(10, 5);
+     * // => [100, 10]
+     */
+    var overArgs = castRest(function(func, transforms) {
+      transforms = (transforms.length == 1 && isArray(transforms[0]))
+        ? arrayMap(transforms[0], baseUnary(getIteratee()))
+        : arrayMap(baseFlatten(transforms, 1), baseUnary(getIteratee()));
+
+      var funcsLength = transforms.length;
+      return baseRest(function(args) {
+        var index = -1,
+            length = nativeMin(args.length, funcsLength);
+
+        while (++index < length) {
+          args[index] = transforms[index].call(this, args[index]);
+        }
+        return apply(func, this, args);
+      });
+    });
+
+    /**
+     * Creates a function that invokes `func` with `partials` prepended to the
+     * arguments it receives. This method is like `_.bind` except it does **not**
+     * alter the `this` binding.
+     *
+     * The `_.partial.placeholder` value, which defaults to `_` in monolithic
+     * builds, may be used as a placeholder for partially applied arguments.
+     *
+     * **Note:** This method doesn't set the "length" property of partially
+     * applied functions.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.2.0
+     * @category Function
+     * @param {Function} func The function to partially apply arguments to.
+     * @param {...*} [partials] The arguments to be partially applied.
+     * @returns {Function} Returns the new partially applied function.
+     * @example
+     *
+     * function greet(greeting, name) {
+     *   return greeting + ' ' + name;
+     * }
+     *
+     * var sayHelloTo = _.partial(greet, 'hello');
+     * sayHelloTo('fred');
+     * // => 'hello fred'
+     *
+     * // Partially applied with placeholders.
+     * var greetFred = _.partial(greet, _, 'fred');
+     * greetFred('hi');
+     * // => 'hi fred'
+     */
+    var partial = baseRest(function(func, partials) {
+      var holders = replaceHolders(partials, getHolder(partial));
+      return createWrap(func, WRAP_PARTIAL_FLAG, undefined, partials, holders);
+    });
+
+    /**
+     * This method is like `_.partial` except that partially applied arguments
+     * are appended to the arguments it receives.
+     *
+     * The `_.partialRight.placeholder` value, which defaults to `_` in monolithic
+     * builds, may be used as a placeholder for partially applied arguments.
+     *
+     * **Note:** This method doesn't set the "length" property of partially
+     * applied functions.
+     *
+     * @static
+     * @memberOf _
+     * @since 1.0.0
+     * @category Function
+     * @param {Function} func The function to partially apply arguments to.
+     * @param {...*} [partials] The arguments to be partially applied.
+     * @returns {Function} Returns the new partially applied function.
+     * @example
+     *
+     * function greet(greeting, name) {
+     *   return greeting + ' ' + name;
+     * }
+     *
+     * var greetFred = _.partialRight(greet, 'fred');
+     * greetFred('hi');
+     * // => 'hi fred'
+     *
+     * // Partially applied with placeholders.
+     * var sayHelloTo = _.partialRight(greet, 'hello', _);
+     * sayHelloTo('fred');
+     * // => 'hello fred'
+     */
+    var partialRight = baseRest(function(func, partials) {
+      var holders = replaceHolders(partials, getHolder(partialRight));
+      return createWrap(func, WRAP_PARTIAL_RIGHT_FLAG, undefined, partials, holders);
+    });
+
+    /**
+     * Creates a function that invokes `func` with arguments arranged according
+     * to the specified `indexes` where the argument value at the first index is
+     * provided as the first argument, the argument value at the second index is
+     * provided as the second argument, and so on.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.0.0
+     * @category Function
+     * @param {Function} func The function to rearrange arguments for.
+     * @param {...(number|number[])} indexes The arranged argument indexes.
+     * @returns {Function} Returns the new function.
+     * @example
+     *
+     * var rearged = _.rearg(function(a, b, c) {
+     *   return [a, b, c];
+     * }, [2, 0, 1]);
+     *
+     * rearged('b', 'c', 'a')
+     * // => ['a', 'b', 'c']
+     */
+    var rearg = flatRest(function(func, indexes) {
+      return createWrap(func, WRAP_REARG_FLAG, undefined, undefined, undefined, indexes);
+    });
+
+    /**
+     * Creates a function that invokes `func` with the `this` binding of the
+     * created function and arguments from `start` and beyond provided as
+     * an array.
+     *
+     * **Note:** This method is based on the
+     * [rest parameter](https://mdn.io/rest_parameters).
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Function
+     * @param {Function} func The function to apply a rest parameter to.
+     * @param {number} [start=func.length-1] The start position of the rest parameter.
+     * @returns {Function} Returns the new function.
+     * @example
+     *
+     * var say = _.rest(function(what, names) {
+     *   return what + ' ' + _.initial(names).join(', ') +
+     *     (_.size(names) > 1 ? ', & ' : '') + _.last(names);
+     * });
+     *
+     * say('hello', 'fred', 'barney', 'pebbles');
+     * // => 'hello fred, barney, & pebbles'
+     */
+    function rest(func, start) {
+      if (typeof func != 'function') {
+        throw new TypeError(FUNC_ERROR_TEXT);
+      }
+      start = start === undefined ? start : toInteger(start);
+      return baseRest(func, start);
+    }
+
+    /**
+     * Creates a function that invokes `func` with the `this` binding of the
+     * create function and an array of arguments much like
+     * [`Function#apply`](http://www.ecma-international.org/ecma-262/7.0/#sec-function.prototype.apply).
+     *
+     * **Note:** This method is based on the
+     * [spread operator](https://mdn.io/spread_operator).
+     *
+     * @static
+     * @memberOf _
+     * @since 3.2.0
+     * @category Function
+     * @param {Function} func The function to spread arguments over.
+     * @param {number} [start=0] The start position of the spread.
+     * @returns {Function} Returns the new function.
+     * @example
+     *
+     * var say = _.spread(function(who, what) {
+     *   return who + ' says ' + what;
+     * });
+     *
+     * say(['fred', 'hello']);
+     * // => 'fred says hello'
+     *
+     * var numbers = Promise.all([
+     *   Promise.resolve(40),
+     *   Promise.resolve(36)
+     * ]);
+     *
+     * numbers.then(_.spread(function(x, y) {
+     *   return x + y;
+     * }));
+     * // => a Promise of 76
+     */
+    function spread(func, start) {
+      if (typeof func != 'function') {
+        throw new TypeError(FUNC_ERROR_TEXT);
+      }
+      start = start == null ? 0 : nativeMax(toInteger(start), 0);
+      return baseRest(function(args) {
+        var array = args[start],
+            otherArgs = castSlice(args, 0, start);
+
+        if (array) {
+          arrayPush(otherArgs, array);
+        }
+        return apply(func, this, otherArgs);
+      });
+    }
+
+    /**
+     * Creates a throttled function that only invokes `func` at most once per
+     * every `wait` milliseconds. The throttled function comes with a `cancel`
+     * method to cancel delayed `func` invocations and a `flush` method to
+     * immediately invoke them. Provide `options` to indicate whether `func`
+     * should be invoked on the leading and/or trailing edge of the `wait`
+     * timeout. The `func` is invoked with the last arguments provided to the
+     * throttled function. Subsequent calls to the throttled function return the
+     * result of the last `func` invocation.
+     *
+     * **Note:** If `leading` and `trailing` options are `true`, `func` is
+     * invoked on the trailing edge of the timeout only if the throttled function
+     * is invoked more than once during the `wait` timeout.
+     *
+     * If `wait` is `0` and `leading` is `false`, `func` invocation is deferred
+     * until to the next tick, similar to `setTimeout` with a timeout of `0`.
+     *
+     * See [David Corbacho's article](https://css-tricks.com/debouncing-throttling-explained-examples/)
+     * for details over the differences between `_.throttle` and `_.debounce`.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Function
+     * @param {Function} func The function to throttle.
+     * @param {number} [wait=0] The number of milliseconds to throttle invocations to.
+     * @param {Object} [options={}] The options object.
+     * @param {boolean} [options.leading=true]
+     *  Specify invoking on the leading edge of the timeout.
+     * @param {boolean} [options.trailing=true]
+     *  Specify invoking on the trailing edge of the timeout.
+     * @returns {Function} Returns the new throttled function.
+     * @example
+     *
+     * // Avoid excessively updating the position while scrolling.
+     * jQuery(window).on('scroll', _.throttle(updatePosition, 100));
+     *
+     * // Invoke `renewToken` when the click event is fired, but not more than once every 5 minutes.
+     * var throttled = _.throttle(renewToken, 300000, { 'trailing': false });
+     * jQuery(element).on('click', throttled);
+     *
+     * // Cancel the trailing throttled invocation.
+     * jQuery(window).on('popstate', throttled.cancel);
+     */
+    function throttle(func, wait, options) {
+      var leading = true,
+          trailing = true;
+
+      if (typeof func != 'function') {
+        throw new TypeError(FUNC_ERROR_TEXT);
+      }
+      if (isObject(options)) {
+        leading = 'leading' in options ? !!options.leading : leading;
+        trailing = 'trailing' in options ? !!options.trailing : trailing;
+      }
+      return debounce(func, wait, {
+        'leading': leading,
+        'maxWait': wait,
+        'trailing': trailing
+      });
+    }
+
+    /**
+     * Creates a function that accepts up to one argument, ignoring any
+     * additional arguments.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Function
+     * @param {Function} func The function to cap arguments for.
+     * @returns {Function} Returns the new capped function.
+     * @example
+     *
+     * _.map(['6', '8', '10'], _.unary(parseInt));
+     * // => [6, 8, 10]
+     */
+    function unary(func) {
+      return ary(func, 1);
+    }
+
+    /**
+     * Creates a function that provides `value` to `wrapper` as its first
+     * argument. Any additional arguments provided to the function are appended
+     * to those provided to the `wrapper`. The wrapper is invoked with the `this`
+     * binding of the created function.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Function
+     * @param {*} value The value to wrap.
+     * @param {Function} [wrapper=identity] The wrapper function.
+     * @returns {Function} Returns the new function.
+     * @example
+     *
+     * var p = _.wrap(_.escape, function(func, text) {
+     *   return '<p>' + func(text) + '</p>';
+     * });
+     *
+     * p('fred, barney, & pebbles');
+     * // => '<p>fred, barney, &amp; pebbles</p>'
+     */
+    function wrap(value, wrapper) {
+      return partial(castFunction(wrapper), value);
+    }
+
+    /*------------------------------------------------------------------------*/
+
+    /**
+     * Casts `value` as an array if it's not one.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.4.0
+     * @category Lang
+     * @param {*} value The value to inspect.
+     * @returns {Array} Returns the cast array.
+     * @example
+     *
+     * _.castArray(1);
+     * // => [1]
+     *
+     * _.castArray({ 'a': 1 });
+     * // => [{ 'a': 1 }]
+     *
+     * _.castArray('abc');
+     * // => ['abc']
+     *
+     * _.castArray(null);
+     * // => [null]
+     *
+     * _.castArray(undefined);
+     * // => [undefined]
+     *
+     * _.castArray();
+     * // => []
+     *
+     * var array = [1, 2, 3];
+     * console.log(_.castArray(array) === array);
+     * // => true
+     */
+    function castArray() {
+      if (!arguments.length) {
+        return [];
+      }
+      var value = arguments[0];
+      return isArray(value) ? value : [value];
+    }
+
+    /**
+     * Creates a shallow clone of `value`.
+     *
+     * **Note:** This method is loosely based on the
+     * [structured clone algorithm](https://mdn.io/Structured_clone_algorithm)
+     * and supports cloning arrays, array buffers, booleans, date objects, maps,
+     * numbers, `Object` objects, regexes, sets, strings, symbols, and typed
+     * arrays. The own enumerable properties of `arguments` objects are cloned
+     * as plain objects. An empty object is returned for uncloneable values such
+     * as error objects, functions, DOM nodes, and WeakMaps.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Lang
+     * @param {*} value The value to clone.
+     * @returns {*} Returns the cloned value.
+     * @see _.cloneDeep
+     * @example
+     *
+     * var objects = [{ 'a': 1 }, { 'b': 2 }];
+     *
+     * var shallow = _.clone(objects);
+     * console.log(shallow[0] === objects[0]);
+     * // => true
+     */
+    function clone(value) {
+      return baseClone(value, CLONE_SYMBOLS_FLAG);
+    }
+
+    /**
+     * This method is like `_.clone` except that it accepts `customizer` which
+     * is invoked to produce the cloned value. If `customizer` returns `undefined`,
+     * cloning is handled by the method instead. The `customizer` is invoked with
+     * up to four arguments; (value [, index|key, object, stack]).
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Lang
+     * @param {*} value The value to clone.
+     * @param {Function} [customizer] The function to customize cloning.
+     * @returns {*} Returns the cloned value.
+     * @see _.cloneDeepWith
+     * @example
+     *
+     * function customizer(value) {
+     *   if (_.isElement(value)) {
+     *     return value.cloneNode(false);
+     *   }
+     * }
+     *
+     * var el = _.cloneWith(document.body, customizer);
+     *
+     * console.log(el === document.body);
+     * // => false
+     * console.log(el.nodeName);
+     * // => 'BODY'
+     * console.log(el.childNodes.length);
+     * // => 0
+     */
+    function cloneWith(value, customizer) {
+      customizer = typeof customizer == 'function' ? customizer : undefined;
+      return baseClone(value, CLONE_SYMBOLS_FLAG, customizer);
+    }
+
+    /**
+     * This method is like `_.clone` except that it recursively clones `value`.
+     *
+     * @static
+     * @memberOf _
+     * @since 1.0.0
+     * @category Lang
+     * @param {*} value The value to recursively clone.
+     * @returns {*} Returns the deep cloned value.
+     * @see _.clone
+     * @example
+     *
+     * var objects = [{ 'a': 1 }, { 'b': 2 }];
+     *
+     * var deep = _.cloneDeep(objects);
+     * console.log(deep[0] === objects[0]);
+     * // => false
+     */
+    function cloneDeep(value) {
+      return baseClone(value, CLONE_DEEP_FLAG | CLONE_SYMBOLS_FLAG);
+    }
+
+    /**
+     * This method is like `_.cloneWith` except that it recursively clones `value`.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Lang
+     * @param {*} value The value to recursively clone.
+     * @param {Function} [customizer] The function to customize cloning.
+     * @returns {*} Returns the deep cloned value.
+     * @see _.cloneWith
+     * @example
+     *
+     * function customizer(value) {
+     *   if (_.isElement(value)) {
+     *     return value.cloneNode(true);
+     *   }
+     * }
+     *
+     * var el = _.cloneDeepWith(document.body, customizer);
+     *
+     * console.log(el === document.body);
+     * // => false
+     * console.log(el.nodeName);
+     * // => 'BODY'
+     * console.log(el.childNodes.length);
+     * // => 20
+     */
+    function cloneDeepWith(value, customizer) {
+      customizer = typeof customizer == 'function' ? customizer : undefined;
+      return baseClone(value, CLONE_DEEP_FLAG | CLONE_SYMBOLS_FLAG, customizer);
+    }
+
+    /**
+     * Checks if `object` conforms to `source` by invoking the predicate
+     * properties of `source` with the corresponding property values of `object`.
+     *
+     * **Note:** This method is equivalent to `_.conforms` when `source` is
+     * partially applied.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.14.0
+     * @category Lang
+     * @param {Object} object The object to inspect.
+     * @param {Object} source The object of property predicates to conform to.
+     * @returns {boolean} Returns `true` if `object` conforms, else `false`.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': 2 };
+     *
+     * _.conformsTo(object, { 'b': function(n) { return n > 1; } });
+     * // => true
+     *
+     * _.conformsTo(object, { 'b': function(n) { return n > 2; } });
+     * // => false
+     */
+    function conformsTo(object, source) {
+      return source == null || baseConformsTo(object, source, keys(source));
+    }
+
+    /**
+     * Performs a
+     * [`SameValueZero`](http://ecma-international.org/ecma-262/7.0/#sec-samevaluezero)
+     * comparison between two values to determine if they are equivalent.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Lang
+     * @param {*} value The value to compare.
+     * @param {*} other The other value to compare.
+     * @returns {boolean} Returns `true` if the values are equivalent, else `false`.
+     * @example
+     *
+     * var object = { 'a': 1 };
+     * var other = { 'a': 1 };
+     *
+     * _.eq(object, object);
+     * // => true
+     *
+     * _.eq(object, other);
+     * // => false
+     *
+     * _.eq('a', 'a');
+     * // => true
+     *
+     * _.eq('a', Object('a'));
+     * // => false
+     *
+     * _.eq(NaN, NaN);
+     * // => true
+     */
+    function eq(value, other) {
+      return value === other || (value !== value && other !== other);
+    }
+
+    /**
+     * Checks if `value` is greater than `other`.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.9.0
+     * @category Lang
+     * @param {*} value The value to compare.
+     * @param {*} other The other value to compare.
+     * @returns {boolean} Returns `true` if `value` is greater than `other`,
+     *  else `false`.
+     * @see _.lt
+     * @example
+     *
+     * _.gt(3, 1);
+     * // => true
+     *
+     * _.gt(3, 3);
+     * // => false
+     *
+     * _.gt(1, 3);
+     * // => false
+     */
+    var gt = createRelationalOperation(baseGt);
+
+    /**
+     * Checks if `value` is greater than or equal to `other`.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.9.0
+     * @category Lang
+     * @param {*} value The value to compare.
+     * @param {*} other The other value to compare.
+     * @returns {boolean} Returns `true` if `value` is greater than or equal to
+     *  `other`, else `false`.
+     * @see _.lte
+     * @example
+     *
+     * _.gte(3, 1);
+     * // => true
+     *
+     * _.gte(3, 3);
+     * // => true
+     *
+     * _.gte(1, 3);
+     * // => false
+     */
+    var gte = createRelationalOperation(function(value, other) {
+      return value >= other;
+    });
+
+    /**
+     * Checks if `value` is likely an `arguments` object.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Lang
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is an `arguments` object,
+     *  else `false`.
+     * @example
+     *
+     * _.isArguments(function() { return arguments; }());
+     * // => true
+     *
+     * _.isArguments([1, 2, 3]);
+     * // => false
+     */
+    var isArguments = baseIsArguments(function() { return arguments; }()) ? baseIsArguments : function(value) {
+      return isObjectLike(value) && hasOwnProperty.call(value, 'callee') &&
+        !propertyIsEnumerable.call(value, 'callee');
+    };
+
+    /**
+     * Checks if `value` is classified as an `Array` object.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Lang
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is an array, else `false`.
+     * @example
+     *
+     * _.isArray([1, 2, 3]);
+     * // => true
+     *
+     * _.isArray(document.body.children);
+     * // => false
+     *
+     * _.isArray('abc');
+     * // => false
+     *
+     * _.isArray(_.noop);
+     * // => false
+     */
+    var isArray = Array.isArray;
+
+    /**
+     * Checks if `value` is classified as an `ArrayBuffer` object.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.3.0
+     * @category Lang
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is an array buffer, else `false`.
+     * @example
+     *
+     * _.isArrayBuffer(new ArrayBuffer(2));
+     * // => true
+     *
+     * _.isArrayBuffer(new Array(2));
+     * // => false
+     */
+    var isArrayBuffer = nodeIsArrayBuffer ? baseUnary(nodeIsArrayBuffer) : baseIsArrayBuffer;
+
+    /**
+     * Checks if `value` is array-like. A value is considered array-like if it's
+     * not a function and has a `value.length` that's an integer greater than or
+     * equal to `0` and less than or equal to `Number.MAX_SAFE_INTEGER`.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Lang
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is array-like, else `false`.
+     * @example
+     *
+     * _.isArrayLike([1, 2, 3]);
+     * // => true
+     *
+     * _.isArrayLike(document.body.children);
+     * // => true
+     *
+     * _.isArrayLike('abc');
+     * // => true
+     *
+     * _.isArrayLike(_.noop);
+     * // => false
+     */
+    function isArrayLike(value) {
+      return value != null && isLength(value.length) && !isFunction(value);
+    }
+
+    /**
+     * This method is like `_.isArrayLike` except that it also checks if `value`
+     * is an object.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Lang
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is an array-like object,
+     *  else `false`.
+     * @example
+     *
+     * _.isArrayLikeObject([1, 2, 3]);
+     * // => true
+     *
+     * _.isArrayLikeObject(document.body.children);
+     * // => true
+     *
+     * _.isArrayLikeObject('abc');
+     * // => false
+     *
+     * _.isArrayLikeObject(_.noop);
+     * // => false
+     */
+    function isArrayLikeObject(value) {
+      return isObjectLike(value) && isArrayLike(value);
+    }
+
+    /**
+     * Checks if `value` is classified as a boolean primitive or object.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Lang
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is a boolean, else `false`.
+     * @example
+     *
+     * _.isBoolean(false);
+     * // => true
+     *
+     * _.isBoolean(null);
+     * // => false
+     */
+    function isBoolean(value) {
+      return value === true || value === false ||
+        (isObjectLike(value) && baseGetTag(value) == boolTag);
+    }
+
+    /**
+     * Checks if `value` is a buffer.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.3.0
+     * @category Lang
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is a buffer, else `false`.
+     * @example
+     *
+     * _.isBuffer(new Buffer(2));
+     * // => true
+     *
+     * _.isBuffer(new Uint8Array(2));
+     * // => false
+     */
+    var isBuffer = nativeIsBuffer || stubFalse;
+
+    /**
+     * Checks if `value` is classified as a `Date` object.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Lang
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is a date object, else `false`.
+     * @example
+     *
+     * _.isDate(new Date);
+     * // => true
+     *
+     * _.isDate('Mon April 23 2012');
+     * // => false
+     */
+    var isDate = nodeIsDate ? baseUnary(nodeIsDate) : baseIsDate;
+
+    /**
+     * Checks if `value` is likely a DOM element.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Lang
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is a DOM element, else `false`.
+     * @example
+     *
+     * _.isElement(document.body);
+     * // => true
+     *
+     * _.isElement('<body>');
+     * // => false
+     */
+    function isElement(value) {
+      return isObjectLike(value) && value.nodeType === 1 && !isPlainObject(value);
+    }
+
+    /**
+     * Checks if `value` is an empty object, collection, map, or set.
+     *
+     * Objects are considered empty if they have no own enumerable string keyed
+     * properties.
+     *
+     * Array-like values such as `arguments` objects, arrays, buffers, strings, or
+     * jQuery-like collections are considered empty if they have a `length` of `0`.
+     * Similarly, maps and sets are considered empty if they have a `size` of `0`.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Lang
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is empty, else `false`.
+     * @example
+     *
+     * _.isEmpty(null);
+     * // => true
+     *
+     * _.isEmpty(true);
+     * // => true
+     *
+     * _.isEmpty(1);
+     * // => true
+     *
+     * _.isEmpty([1, 2, 3]);
+     * // => false
+     *
+     * _.isEmpty({ 'a': 1 });
+     * // => false
+     */
+    function isEmpty(value) {
+      if (value == null) {
+        return true;
+      }
+      if (isArrayLike(value) &&
+          (isArray(value) || typeof value == 'string' || typeof value.splice == 'function' ||
+            isBuffer(value) || isTypedArray(value) || isArguments(value))) {
+        return !value.length;
+      }
+      var tag = getTag(value);
+      if (tag == mapTag || tag == setTag) {
+        return !value.size;
+      }
+      if (isPrototype(value)) {
+        return !baseKeys(value).length;
+      }
+      for (var key in value) {
+        if (hasOwnProperty.call(value, key)) {
+          return false;
+        }
+      }
+      return true;
+    }
+
+    /**
+     * Performs a deep comparison between two values to determine if they are
+     * equivalent.
+     *
+     * **Note:** This method supports comparing arrays, array buffers, booleans,
+     * date objects, error objects, maps, numbers, `Object` objects, regexes,
+     * sets, strings, symbols, and typed arrays. `Object` objects are compared
+     * by their own, not inherited, enumerable properties. Functions and DOM
+     * nodes are compared by strict equality, i.e. `===`.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Lang
+     * @param {*} value The value to compare.
+     * @param {*} other The other value to compare.
+     * @returns {boolean} Returns `true` if the values are equivalent, else `false`.
+     * @example
+     *
+     * var object = { 'a': 1 };
+     * var other = { 'a': 1 };
+     *
+     * _.isEqual(object, other);
+     * // => true
+     *
+     * object === other;
+     * // => false
+     */
+    function isEqual(value, other) {
+      return baseIsEqual(value, other);
+    }
+
+    /**
+     * This method is like `_.isEqual` except that it accepts `customizer` which
+     * is invoked to compare values. If `customizer` returns `undefined`, comparisons
+     * are handled by the method instead. The `customizer` is invoked with up to
+     * six arguments: (objValue, othValue [, index|key, object, other, stack]).
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Lang
+     * @param {*} value The value to compare.
+     * @param {*} other The other value to compare.
+     * @param {Function} [customizer] The function to customize comparisons.
+     * @returns {boolean} Returns `true` if the values are equivalent, else `false`.
+     * @example
+     *
+     * function isGreeting(value) {
+     *   return /^h(?:i|ello)$/.test(value);
+     * }
+     *
+     * function customizer(objValue, othValue) {
+     *   if (isGreeting(objValue) && isGreeting(othValue)) {
+     *     return true;
+     *   }
+     * }
+     *
+     * var array = ['hello', 'goodbye'];
+     * var other = ['hi', 'goodbye'];
+     *
+     * _.isEqualWith(array, other, customizer);
+     * // => true
+     */
+    function isEqualWith(value, other, customizer) {
+      customizer = typeof customizer == 'function' ? customizer : undefined;
+      var result = customizer ? customizer(value, other) : undefined;
+      return result === undefined ? baseIsEqual(value, other, undefined, customizer) : !!result;
+    }
+
+    /**
+     * Checks if `value` is an `Error`, `EvalError`, `RangeError`, `ReferenceError`,
+     * `SyntaxError`, `TypeError`, or `URIError` object.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.0.0
+     * @category Lang
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is an error object, else `false`.
+     * @example
+     *
+     * _.isError(new Error);
+     * // => true
+     *
+     * _.isError(Error);
+     * // => false
+     */
+    function isError(value) {
+      if (!isObjectLike(value)) {
+        return false;
+      }
+      var tag = baseGetTag(value);
+      return tag == errorTag || tag == domExcTag ||
+        (typeof value.message == 'string' && typeof value.name == 'string' && !isPlainObject(value));
+    }
+
+    /**
+     * Checks if `value` is a finite primitive number.
+     *
+     * **Note:** This method is based on
+     * [`Number.isFinite`](https://mdn.io/Number/isFinite).
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Lang
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is a finite number, else `false`.
+     * @example
+     *
+     * _.isFinite(3);
+     * // => true
+     *
+     * _.isFinite(Number.MIN_VALUE);
+     * // => true
+     *
+     * _.isFinite(Infinity);
+     * // => false
+     *
+     * _.isFinite('3');
+     * // => false
+     */
+    function isFinite(value) {
+      return typeof value == 'number' && nativeIsFinite(value);
+    }
+
+    /**
+     * Checks if `value` is classified as a `Function` object.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Lang
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is a function, else `false`.
+     * @example
+     *
+     * _.isFunction(_);
+     * // => true
+     *
+     * _.isFunction(/abc/);
+     * // => false
+     */
+    function isFunction(value) {
+      if (!isObject(value)) {
+        return false;
+      }
+      // The use of `Object#toString` avoids issues with the `typeof` operator
+      // in Safari 9 which returns 'object' for typed arrays and other constructors.
+      var tag = baseGetTag(value);
+      return tag == funcTag || tag == genTag || tag == asyncTag || tag == proxyTag;
+    }
+
+    /**
+     * Checks if `value` is an integer.
+     *
+     * **Note:** This method is based on
+     * [`Number.isInteger`](https://mdn.io/Number/isInteger).
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Lang
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is an integer, else `false`.
+     * @example
+     *
+     * _.isInteger(3);
+     * // => true
+     *
+     * _.isInteger(Number.MIN_VALUE);
+     * // => false
+     *
+     * _.isInteger(Infinity);
+     * // => false
+     *
+     * _.isInteger('3');
+     * // => false
+     */
+    function isInteger(value) {
+      return typeof value == 'number' && value == toInteger(value);
+    }
+
+    /**
+     * Checks if `value` is a valid array-like length.
+     *
+     * **Note:** This method is loosely based on
+     * [`ToLength`](http://ecma-international.org/ecma-262/7.0/#sec-tolength).
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Lang
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is a valid length, else `false`.
+     * @example
+     *
+     * _.isLength(3);
+     * // => true
+     *
+     * _.isLength(Number.MIN_VALUE);
+     * // => false
+     *
+     * _.isLength(Infinity);
+     * // => false
+     *
+     * _.isLength('3');
+     * // => false
+     */
+    function isLength(value) {
+      return typeof value == 'number' &&
+        value > -1 && value % 1 == 0 && value <= MAX_SAFE_INTEGER;
+    }
+
+    /**
+     * Checks if `value` is the
+     * [language type](http://www.ecma-international.org/ecma-262/7.0/#sec-ecmascript-language-types)
+     * of `Object`. (e.g. arrays, functions, objects, regexes, `new Number(0)`, and `new String('')`)
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Lang
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is an object, else `false`.
+     * @example
+     *
+     * _.isObject({});
+     * // => true
+     *
+     * _.isObject([1, 2, 3]);
+     * // => true
+     *
+     * _.isObject(_.noop);
+     * // => true
+     *
+     * _.isObject(null);
+     * // => false
+     */
+    function isObject(value) {
+      var type = typeof value;
+      return value != null && (type == 'object' || type == 'function');
+    }
+
+    /**
+     * Checks if `value` is object-like. A value is object-like if it's not `null`
+     * and has a `typeof` result of "object".
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Lang
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is object-like, else `false`.
+     * @example
+     *
+     * _.isObjectLike({});
+     * // => true
+     *
+     * _.isObjectLike([1, 2, 3]);
+     * // => true
+     *
+     * _.isObjectLike(_.noop);
+     * // => false
+     *
+     * _.isObjectLike(null);
+     * // => false
+     */
+    function isObjectLike(value) {
+      return value != null && typeof value == 'object';
+    }
+
+    /**
+     * Checks if `value` is classified as a `Map` object.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.3.0
+     * @category Lang
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is a map, else `false`.
+     * @example
+     *
+     * _.isMap(new Map);
+     * // => true
+     *
+     * _.isMap(new WeakMap);
+     * // => false
+     */
+    var isMap = nodeIsMap ? baseUnary(nodeIsMap) : baseIsMap;
+
+    /**
+     * Performs a partial deep comparison between `object` and `source` to
+     * determine if `object` contains equivalent property values.
+     *
+     * **Note:** This method is equivalent to `_.matches` when `source` is
+     * partially applied.
+     *
+     * Partial comparisons will match empty array and empty object `source`
+     * values against any array or object value, respectively. See `_.isEqual`
+     * for a list of supported value comparisons.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.0.0
+     * @category Lang
+     * @param {Object} object The object to inspect.
+     * @param {Object} source The object of property values to match.
+     * @returns {boolean} Returns `true` if `object` is a match, else `false`.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': 2 };
+     *
+     * _.isMatch(object, { 'b': 2 });
+     * // => true
+     *
+     * _.isMatch(object, { 'b': 1 });
+     * // => false
+     */
+    function isMatch(object, source) {
+      return object === source || baseIsMatch(object, source, getMatchData(source));
+    }
+
+    /**
+     * This method is like `_.isMatch` except that it accepts `customizer` which
+     * is invoked to compare values. If `customizer` returns `undefined`, comparisons
+     * are handled by the method instead. The `customizer` is invoked with five
+     * arguments: (objValue, srcValue, index|key, object, source).
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Lang
+     * @param {Object} object The object to inspect.
+     * @param {Object} source The object of property values to match.
+     * @param {Function} [customizer] The function to customize comparisons.
+     * @returns {boolean} Returns `true` if `object` is a match, else `false`.
+     * @example
+     *
+     * function isGreeting(value) {
+     *   return /^h(?:i|ello)$/.test(value);
+     * }
+     *
+     * function customizer(objValue, srcValue) {
+     *   if (isGreeting(objValue) && isGreeting(srcValue)) {
+     *     return true;
+     *   }
+     * }
+     *
+     * var object = { 'greeting': 'hello' };
+     * var source = { 'greeting': 'hi' };
+     *
+     * _.isMatchWith(object, source, customizer);
+     * // => true
+     */
+    function isMatchWith(object, source, customizer) {
+      customizer = typeof customizer == 'function' ? customizer : undefined;
+      return baseIsMatch(object, source, getMatchData(source), customizer);
+    }
+
+    /**
+     * Checks if `value` is `NaN`.
+     *
+     * **Note:** This method is based on
+     * [`Number.isNaN`](https://mdn.io/Number/isNaN) and is not the same as
+     * global [`isNaN`](https://mdn.io/isNaN) which returns `true` for
+     * `undefined` and other non-number values.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Lang
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is `NaN`, else `false`.
+     * @example
+     *
+     * _.isNaN(NaN);
+     * // => true
+     *
+     * _.isNaN(new Number(NaN));
+     * // => true
+     *
+     * isNaN(undefined);
+     * // => true
+     *
+     * _.isNaN(undefined);
+     * // => false
+     */
+    function isNaN(value) {
+      // An `NaN` primitive is the only value that is not equal to itself.
+      // Perform the `toStringTag` check first to avoid errors with some
+      // ActiveX objects in IE.
+      return isNumber(value) && value != +value;
+    }
+
+    /**
+     * Checks if `value` is a pristine native function.
+     *
+     * **Note:** This method can't reliably detect native functions in the presence
+     * of the core-js package because core-js circumvents this kind of detection.
+     * Despite multiple requests, the core-js maintainer has made it clear: any
+     * attempt to fix the detection will be obstructed. As a result, we're left
+     * with little choice but to throw an error. Unfortunately, this also affects
+     * packages, like [babel-polyfill](https://www.npmjs.com/package/babel-polyfill),
+     * which rely on core-js.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.0.0
+     * @category Lang
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is a native function,
+     *  else `false`.
+     * @example
+     *
+     * _.isNative(Array.prototype.push);
+     * // => true
+     *
+     * _.isNative(_);
+     * // => false
+     */
+    function isNative(value) {
+      if (isMaskable(value)) {
+        throw new Error(CORE_ERROR_TEXT);
+      }
+      return baseIsNative(value);
+    }
+
+    /**
+     * Checks if `value` is `null`.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Lang
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is `null`, else `false`.
+     * @example
+     *
+     * _.isNull(null);
+     * // => true
+     *
+     * _.isNull(void 0);
+     * // => false
+     */
+    function isNull(value) {
+      return value === null;
+    }
+
+    /**
+     * Checks if `value` is `null` or `undefined`.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Lang
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is nullish, else `false`.
+     * @example
+     *
+     * _.isNil(null);
+     * // => true
+     *
+     * _.isNil(void 0);
+     * // => true
+     *
+     * _.isNil(NaN);
+     * // => false
+     */
+    function isNil(value) {
+      return value == null;
+    }
+
+    /**
+     * Checks if `value` is classified as a `Number` primitive or object.
+     *
+     * **Note:** To exclude `Infinity`, `-Infinity`, and `NaN`, which are
+     * classified as numbers, use the `_.isFinite` method.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Lang
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is a number, else `false`.
+     * @example
+     *
+     * _.isNumber(3);
+     * // => true
+     *
+     * _.isNumber(Number.MIN_VALUE);
+     * // => true
+     *
+     * _.isNumber(Infinity);
+     * // => true
+     *
+     * _.isNumber('3');
+     * // => false
+     */
+    function isNumber(value) {
+      return typeof value == 'number' ||
+        (isObjectLike(value) && baseGetTag(value) == numberTag);
+    }
+
+    /**
+     * Checks if `value` is a plain object, that is, an object created by the
+     * `Object` constructor or one with a `[[Prototype]]` of `null`.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.8.0
+     * @category Lang
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is a plain object, else `false`.
+     * @example
+     *
+     * function Foo() {
+     *   this.a = 1;
+     * }
+     *
+     * _.isPlainObject(new Foo);
+     * // => false
+     *
+     * _.isPlainObject([1, 2, 3]);
+     * // => false
+     *
+     * _.isPlainObject({ 'x': 0, 'y': 0 });
+     * // => true
+     *
+     * _.isPlainObject(Object.create(null));
+     * // => true
+     */
+    function isPlainObject(value) {
+      if (!isObjectLike(value) || baseGetTag(value) != objectTag) {
+        return false;
+      }
+      var proto = getPrototype(value);
+      if (proto === null) {
+        return true;
+      }
+      var Ctor = hasOwnProperty.call(proto, 'constructor') && proto.constructor;
+      return typeof Ctor == 'function' && Ctor instanceof Ctor &&
+        funcToString.call(Ctor) == objectCtorString;
+    }
+
+    /**
+     * Checks if `value` is classified as a `RegExp` object.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.1.0
+     * @category Lang
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is a regexp, else `false`.
+     * @example
+     *
+     * _.isRegExp(/abc/);
+     * // => true
+     *
+     * _.isRegExp('/abc/');
+     * // => false
+     */
+    var isRegExp = nodeIsRegExp ? baseUnary(nodeIsRegExp) : baseIsRegExp;
+
+    /**
+     * Checks if `value` is a safe integer. An integer is safe if it's an IEEE-754
+     * double precision number which isn't the result of a rounded unsafe integer.
+     *
+     * **Note:** This method is based on
+     * [`Number.isSafeInteger`](https://mdn.io/Number/isSafeInteger).
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Lang
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is a safe integer, else `false`.
+     * @example
+     *
+     * _.isSafeInteger(3);
+     * // => true
+     *
+     * _.isSafeInteger(Number.MIN_VALUE);
+     * // => false
+     *
+     * _.isSafeInteger(Infinity);
+     * // => false
+     *
+     * _.isSafeInteger('3');
+     * // => false
+     */
+    function isSafeInteger(value) {
+      return isInteger(value) && value >= -MAX_SAFE_INTEGER && value <= MAX_SAFE_INTEGER;
+    }
+
+    /**
+     * Checks if `value` is classified as a `Set` object.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.3.0
+     * @category Lang
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is a set, else `false`.
+     * @example
+     *
+     * _.isSet(new Set);
+     * // => true
+     *
+     * _.isSet(new WeakSet);
+     * // => false
+     */
+    var isSet = nodeIsSet ? baseUnary(nodeIsSet) : baseIsSet;
+
+    /**
+     * Checks if `value` is classified as a `String` primitive or object.
+     *
+     * @static
+     * @since 0.1.0
+     * @memberOf _
+     * @category Lang
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is a string, else `false`.
+     * @example
+     *
+     * _.isString('abc');
+     * // => true
+     *
+     * _.isString(1);
+     * // => false
+     */
+    function isString(value) {
+      return typeof value == 'string' ||
+        (!isArray(value) && isObjectLike(value) && baseGetTag(value) == stringTag);
+    }
+
+    /**
+     * Checks if `value` is classified as a `Symbol` primitive or object.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Lang
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is a symbol, else `false`.
+     * @example
+     *
+     * _.isSymbol(Symbol.iterator);
+     * // => true
+     *
+     * _.isSymbol('abc');
+     * // => false
+     */
+    function isSymbol(value) {
+      return typeof value == 'symbol' ||
+        (isObjectLike(value) && baseGetTag(value) == symbolTag);
+    }
+
+    /**
+     * Checks if `value` is classified as a typed array.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.0.0
+     * @category Lang
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is a typed array, else `false`.
+     * @example
+     *
+     * _.isTypedArray(new Uint8Array);
+     * // => true
+     *
+     * _.isTypedArray([]);
+     * // => false
+     */
+    var isTypedArray = nodeIsTypedArray ? baseUnary(nodeIsTypedArray) : baseIsTypedArray;
+
+    /**
+     * Checks if `value` is `undefined`.
+     *
+     * @static
+     * @since 0.1.0
+     * @memberOf _
+     * @category Lang
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is `undefined`, else `false`.
+     * @example
+     *
+     * _.isUndefined(void 0);
+     * // => true
+     *
+     * _.isUndefined(null);
+     * // => false
+     */
+    function isUndefined(value) {
+      return value === undefined;
+    }
+
+    /**
+     * Checks if `value` is classified as a `WeakMap` object.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.3.0
+     * @category Lang
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is a weak map, else `false`.
+     * @example
+     *
+     * _.isWeakMap(new WeakMap);
+     * // => true
+     *
+     * _.isWeakMap(new Map);
+     * // => false
+     */
+    function isWeakMap(value) {
+      return isObjectLike(value) && getTag(value) == weakMapTag;
+    }
+
+    /**
+     * Checks if `value` is classified as a `WeakSet` object.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.3.0
+     * @category Lang
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is a weak set, else `false`.
+     * @example
+     *
+     * _.isWeakSet(new WeakSet);
+     * // => true
+     *
+     * _.isWeakSet(new Set);
+     * // => false
+     */
+    function isWeakSet(value) {
+      return isObjectLike(value) && baseGetTag(value) == weakSetTag;
+    }
+
+    /**
+     * Checks if `value` is less than `other`.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.9.0
+     * @category Lang
+     * @param {*} value The value to compare.
+     * @param {*} other The other value to compare.
+     * @returns {boolean} Returns `true` if `value` is less than `other`,
+     *  else `false`.
+     * @see _.gt
+     * @example
+     *
+     * _.lt(1, 3);
+     * // => true
+     *
+     * _.lt(3, 3);
+     * // => false
+     *
+     * _.lt(3, 1);
+     * // => false
+     */
+    var lt = createRelationalOperation(baseLt);
+
+    /**
+     * Checks if `value` is less than or equal to `other`.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.9.0
+     * @category Lang
+     * @param {*} value The value to compare.
+     * @param {*} other The other value to compare.
+     * @returns {boolean} Returns `true` if `value` is less than or equal to
+     *  `other`, else `false`.
+     * @see _.gte
+     * @example
+     *
+     * _.lte(1, 3);
+     * // => true
+     *
+     * _.lte(3, 3);
+     * // => true
+     *
+     * _.lte(3, 1);
+     * // => false
+     */
+    var lte = createRelationalOperation(function(value, other) {
+      return value <= other;
+    });
+
+    /**
+     * Converts `value` to an array.
+     *
+     * @static
+     * @since 0.1.0
+     * @memberOf _
+     * @category Lang
+     * @param {*} value The value to convert.
+     * @returns {Array} Returns the converted array.
+     * @example
+     *
+     * _.toArray({ 'a': 1, 'b': 2 });
+     * // => [1, 2]
+     *
+     * _.toArray('abc');
+     * // => ['a', 'b', 'c']
+     *
+     * _.toArray(1);
+     * // => []
+     *
+     * _.toArray(null);
+     * // => []
+     */
+    function toArray(value) {
+      if (!value) {
+        return [];
+      }
+      if (isArrayLike(value)) {
+        return isString(value) ? stringToArray(value) : copyArray(value);
+      }
+      if (symIterator && value[symIterator]) {
+        return iteratorToArray(value[symIterator]());
+      }
+      var tag = getTag(value),
+          func = tag == mapTag ? mapToArray : (tag == setTag ? setToArray : values);
+
+      return func(value);
+    }
+
+    /**
+     * Converts `value` to a finite number.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.12.0
+     * @category Lang
+     * @param {*} value The value to convert.
+     * @returns {number} Returns the converted number.
+     * @example
+     *
+     * _.toFinite(3.2);
+     * // => 3.2
+     *
+     * _.toFinite(Number.MIN_VALUE);
+     * // => 5e-324
+     *
+     * _.toFinite(Infinity);
+     * // => 1.7976931348623157e+308
+     *
+     * _.toFinite('3.2');
+     * // => 3.2
+     */
+    function toFinite(value) {
+      if (!value) {
+        return value === 0 ? value : 0;
+      }
+      value = toNumber(value);
+      if (value === INFINITY || value === -INFINITY) {
+        var sign = (value < 0 ? -1 : 1);
+        return sign * MAX_INTEGER;
+      }
+      return value === value ? value : 0;
+    }
+
+    /**
+     * Converts `value` to an integer.
+     *
+     * **Note:** This method is loosely based on
+     * [`ToInteger`](http://www.ecma-international.org/ecma-262/7.0/#sec-tointeger).
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Lang
+     * @param {*} value The value to convert.
+     * @returns {number} Returns the converted integer.
+     * @example
+     *
+     * _.toInteger(3.2);
+     * // => 3
+     *
+     * _.toInteger(Number.MIN_VALUE);
+     * // => 0
+     *
+     * _.toInteger(Infinity);
+     * // => 1.7976931348623157e+308
+     *
+     * _.toInteger('3.2');
+     * // => 3
+     */
+    function toInteger(value) {
+      var result = toFinite(value),
+          remainder = result % 1;
+
+      return result === result ? (remainder ? result - remainder : result) : 0;
+    }
+
+    /**
+     * Converts `value` to an integer suitable for use as the length of an
+     * array-like object.
+     *
+     * **Note:** This method is based on
+     * [`ToLength`](http://ecma-international.org/ecma-262/7.0/#sec-tolength).
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Lang
+     * @param {*} value The value to convert.
+     * @returns {number} Returns the converted integer.
+     * @example
+     *
+     * _.toLength(3.2);
+     * // => 3
+     *
+     * _.toLength(Number.MIN_VALUE);
+     * // => 0
+     *
+     * _.toLength(Infinity);
+     * // => 4294967295
+     *
+     * _.toLength('3.2');
+     * // => 3
+     */
+    function toLength(value) {
+      return value ? baseClamp(toInteger(value), 0, MAX_ARRAY_LENGTH) : 0;
+    }
+
+    /**
+     * Converts `value` to a number.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Lang
+     * @param {*} value The value to process.
+     * @returns {number} Returns the number.
+     * @example
+     *
+     * _.toNumber(3.2);
+     * // => 3.2
+     *
+     * _.toNumber(Number.MIN_VALUE);
+     * // => 5e-324
+     *
+     * _.toNumber(Infinity);
+     * // => Infinity
+     *
+     * _.toNumber('3.2');
+     * // => 3.2
+     */
+    function toNumber(value) {
+      if (typeof value == 'number') {
+        return value;
+      }
+      if (isSymbol(value)) {
+        return NAN;
+      }
+      if (isObject(value)) {
+        var other = typeof value.valueOf == 'function' ? value.valueOf() : value;
+        value = isObject(other) ? (other + '') : other;
+      }
+      if (typeof value != 'string') {
+        return value === 0 ? value : +value;
+      }
+      value = value.replace(reTrim, '');
+      var isBinary = reIsBinary.test(value);
+      return (isBinary || reIsOctal.test(value))
+        ? freeParseInt(value.slice(2), isBinary ? 2 : 8)
+        : (reIsBadHex.test(value) ? NAN : +value);
+    }
+
+    /**
+     * Converts `value` to a plain object flattening inherited enumerable string
+     * keyed properties of `value` to own properties of the plain object.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.0.0
+     * @category Lang
+     * @param {*} value The value to convert.
+     * @returns {Object} Returns the converted plain object.
+     * @example
+     *
+     * function Foo() {
+     *   this.b = 2;
+     * }
+     *
+     * Foo.prototype.c = 3;
+     *
+     * _.assign({ 'a': 1 }, new Foo);
+     * // => { 'a': 1, 'b': 2 }
+     *
+     * _.assign({ 'a': 1 }, _.toPlainObject(new Foo));
+     * // => { 'a': 1, 'b': 2, 'c': 3 }
+     */
+    function toPlainObject(value) {
+      return copyObject(value, keysIn(value));
+    }
+
+    /**
+     * Converts `value` to a safe integer. A safe integer can be compared and
+     * represented correctly.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Lang
+     * @param {*} value The value to convert.
+     * @returns {number} Returns the converted integer.
+     * @example
+     *
+     * _.toSafeInteger(3.2);
+     * // => 3
+     *
+     * _.toSafeInteger(Number.MIN_VALUE);
+     * // => 0
+     *
+     * _.toSafeInteger(Infinity);
+     * // => 9007199254740991
+     *
+     * _.toSafeInteger('3.2');
+     * // => 3
+     */
+    function toSafeInteger(value) {
+      return value
+        ? baseClamp(toInteger(value), -MAX_SAFE_INTEGER, MAX_SAFE_INTEGER)
+        : (value === 0 ? value : 0);
+    }
+
+    /**
+     * Converts `value` to a string. An empty string is returned for `null`
+     * and `undefined` values. The sign of `-0` is preserved.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Lang
+     * @param {*} value The value to convert.
+     * @returns {string} Returns the converted string.
+     * @example
+     *
+     * _.toString(null);
+     * // => ''
+     *
+     * _.toString(-0);
+     * // => '-0'
+     *
+     * _.toString([1, 2, 3]);
+     * // => '1,2,3'
+     */
+    function toString(value) {
+      return value == null ? '' : baseToString(value);
+    }
+
+    /*------------------------------------------------------------------------*/
+
+    /**
+     * Assigns own enumerable string keyed properties of source objects to the
+     * destination object. Source objects are applied from left to right.
+     * Subsequent sources overwrite property assignments of previous sources.
+     *
+     * **Note:** This method mutates `object` and is loosely based on
+     * [`Object.assign`](https://mdn.io/Object/assign).
+     *
+     * @static
+     * @memberOf _
+     * @since 0.10.0
+     * @category Object
+     * @param {Object} object The destination object.
+     * @param {...Object} [sources] The source objects.
+     * @returns {Object} Returns `object`.
+     * @see _.assignIn
+     * @example
+     *
+     * function Foo() {
+     *   this.a = 1;
+     * }
+     *
+     * function Bar() {
+     *   this.c = 3;
+     * }
+     *
+     * Foo.prototype.b = 2;
+     * Bar.prototype.d = 4;
+     *
+     * _.assign({ 'a': 0 }, new Foo, new Bar);
+     * // => { 'a': 1, 'c': 3 }
+     */
+    var assign = createAssigner(function(object, source) {
+      if (isPrototype(source) || isArrayLike(source)) {
+        copyObject(source, keys(source), object);
+        return;
+      }
+      for (var key in source) {
+        if (hasOwnProperty.call(source, key)) {
+          assignValue(object, key, source[key]);
+        }
+      }
+    });
+
+    /**
+     * This method is like `_.assign` except that it iterates over own and
+     * inherited source properties.
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @alias extend
+     * @category Object
+     * @param {Object} object The destination object.
+     * @param {...Object} [sources] The source objects.
+     * @returns {Object} Returns `object`.
+     * @see _.assign
+     * @example
+     *
+     * function Foo() {
+     *   this.a = 1;
+     * }
+     *
+     * function Bar() {
+     *   this.c = 3;
+     * }
+     *
+     * Foo.prototype.b = 2;
+     * Bar.prototype.d = 4;
+     *
+     * _.assignIn({ 'a': 0 }, new Foo, new Bar);
+     * // => { 'a': 1, 'b': 2, 'c': 3, 'd': 4 }
+     */
+    var assignIn = createAssigner(function(object, source) {
+      copyObject(source, keysIn(source), object);
+    });
+
+    /**
+     * This method is like `_.assignIn` except that it accepts `customizer`
+     * which is invoked to produce the assigned values. If `customizer` returns
+     * `undefined`, assignment is handled by the method instead. The `customizer`
+     * is invoked with five arguments: (objValue, srcValue, key, object, source).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @alias extendWith
+     * @category Object
+     * @param {Object} object The destination object.
+     * @param {...Object} sources The source objects.
+     * @param {Function} [customizer] The function to customize assigned values.
+     * @returns {Object} Returns `object`.
+     * @see _.assignWith
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   return _.isUndefined(objValue) ? srcValue : objValue;
+     * }
+     *
+     * var defaults = _.partialRight(_.assignInWith, customizer);
+     *
+     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+     * // => { 'a': 1, 'b': 2 }
+     */
+    var assignInWith = createAssigner(function(object, source, srcIndex, customizer) {
+      copyObject(source, keysIn(source), object, customizer);
+    });
+
+    /**
+     * This method is like `_.assign` except that it accepts `customizer`
+     * which is invoked to produce the assigned values. If `customizer` returns
+     * `undefined`, assignment is handled by the method instead. The `customizer`
+     * is invoked with five arguments: (objValue, srcValue, key, object, source).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Object
+     * @param {Object} object The destination object.
+     * @param {...Object} sources The source objects.
+     * @param {Function} [customizer] The function to customize assigned values.
+     * @returns {Object} Returns `object`.
+     * @see _.assignInWith
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   return _.isUndefined(objValue) ? srcValue : objValue;
+     * }
+     *
+     * var defaults = _.partialRight(_.assignWith, customizer);
+     *
+     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+     * // => { 'a': 1, 'b': 2 }
+     */
+    var assignWith = createAssigner(function(object, source, srcIndex, customizer) {
+      copyObject(source, keys(source), object, customizer);
+    });
+
+    /**
+     * Creates an array of values corresponding to `paths` of `object`.
+     *
+     * @static
+     * @memberOf _
+     * @since 1.0.0
+     * @category Object
+     * @param {Object} object The object to iterate over.
+     * @param {...(string|string[])} [paths] The property paths to pick.
+     * @returns {Array} Returns the picked values.
+     * @example
+     *
+     * var object = { 'a': [{ 'b': { 'c': 3 } }, 4] };
+     *
+     * _.at(object, ['a[0].b.c', 'a[1]']);
+     * // => [3, 4]
+     */
+    var at = flatRest(baseAt);
+
+    /**
+     * Creates an object that inherits from the `prototype` object. If a
+     * `properties` object is given, its own enumerable string keyed properties
+     * are assigned to the created object.
+     *
+     * @static
+     * @memberOf _
+     * @since 2.3.0
+     * @category Object
+     * @param {Object} prototype The object to inherit from.
+     * @param {Object} [properties] The properties to assign to the object.
+     * @returns {Object} Returns the new object.
+     * @example
+     *
+     * function Shape() {
+     *   this.x = 0;
+     *   this.y = 0;
+     * }
+     *
+     * function Circle() {
+     *   Shape.call(this);
+     * }
+     *
+     * Circle.prototype = _.create(Shape.prototype, {
+     *   'constructor': Circle
+     * });
+     *
+     * var circle = new Circle;
+     * circle instanceof Circle;
+     * // => true
+     *
+     * circle instanceof Shape;
+     * // => true
+     */
+    function create(prototype, properties) {
+      var result = baseCreate(prototype);
+      return properties == null ? result : baseAssign(result, properties);
+    }
+
+    /**
+     * Assigns own and inherited enumerable string keyed properties of source
+     * objects to the destination object for all destination properties that
+     * resolve to `undefined`. Source objects are applied from left to right.
+     * Once a property is set, additional values of the same property are ignored.
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @static
+     * @since 0.1.0
+     * @memberOf _
+     * @category Object
+     * @param {Object} object The destination object.
+     * @param {...Object} [sources] The source objects.
+     * @returns {Object} Returns `object`.
+     * @see _.defaultsDeep
+     * @example
+     *
+     * _.defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+     * // => { 'a': 1, 'b': 2 }
+     */
+    var defaults = baseRest(function(object, sources) {
+      object = Object(object);
+
+      var index = -1;
+      var length = sources.length;
+      var guard = length > 2 ? sources[2] : undefined;
+
+      if (guard && isIterateeCall(sources[0], sources[1], guard)) {
+        length = 1;
+      }
+
+      while (++index < length) {
+        var source = sources[index];
+        var props = keysIn(source);
+        var propsIndex = -1;
+        var propsLength = props.length;
+
+        while (++propsIndex < propsLength) {
+          var key = props[propsIndex];
+          var value = object[key];
+
+          if (value === undefined ||
+              (eq(value, objectProto[key]) && !hasOwnProperty.call(object, key))) {
+            object[key] = source[key];
+          }
+        }
+      }
+
+      return object;
+    });
+
+    /**
+     * This method is like `_.defaults` except that it recursively assigns
+     * default properties.
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.10.0
+     * @category Object
+     * @param {Object} object The destination object.
+     * @param {...Object} [sources] The source objects.
+     * @returns {Object} Returns `object`.
+     * @see _.defaults
+     * @example
+     *
+     * _.defaultsDeep({ 'a': { 'b': 2 } }, { 'a': { 'b': 1, 'c': 3 } });
+     * // => { 'a': { 'b': 2, 'c': 3 } }
+     */
+    var defaultsDeep = baseRest(function(args) {
+      args.push(undefined, customDefaultsMerge);
+      return apply(mergeWith, undefined, args);
+    });
+
+    /**
+     * This method is like `_.find` except that it returns the key of the first
+     * element `predicate` returns truthy for instead of the element itself.
+     *
+     * @static
+     * @memberOf _
+     * @since 1.1.0
+     * @category Object
+     * @param {Object} object The object to inspect.
+     * @param {Function} [predicate=_.identity] The function invoked per iteration.
+     * @returns {string|undefined} Returns the key of the matched element,
+     *  else `undefined`.
+     * @example
+     *
+     * var users = {
+     *   'barney':  { 'age': 36, 'active': true },
+     *   'fred':    { 'age': 40, 'active': false },
+     *   'pebbles': { 'age': 1,  'active': true }
+     * };
+     *
+     * _.findKey(users, function(o) { return o.age < 40; });
+     * // => 'barney' (iteration order is not guaranteed)
+     *
+     * // The `_.matches` iteratee shorthand.
+     * _.findKey(users, { 'age': 1, 'active': true });
+     * // => 'pebbles'
+     *
+     * // The `_.matchesProperty` iteratee shorthand.
+     * _.findKey(users, ['active', false]);
+     * // => 'fred'
+     *
+     * // The `_.property` iteratee shorthand.
+     * _.findKey(users, 'active');
+     * // => 'barney'
+     */
+    function findKey(object, predicate) {
+      return baseFindKey(object, getIteratee(predicate, 3), baseForOwn);
+    }
+
+    /**
+     * This method is like `_.findKey` except that it iterates over elements of
+     * a collection in the opposite order.
+     *
+     * @static
+     * @memberOf _
+     * @since 2.0.0
+     * @category Object
+     * @param {Object} object The object to inspect.
+     * @param {Function} [predicate=_.identity] The function invoked per iteration.
+     * @returns {string|undefined} Returns the key of the matched element,
+     *  else `undefined`.
+     * @example
+     *
+     * var users = {
+     *   'barney':  { 'age': 36, 'active': true },
+     *   'fred':    { 'age': 40, 'active': false },
+     *   'pebbles': { 'age': 1,  'active': true }
+     * };
+     *
+     * _.findLastKey(users, function(o) { return o.age < 40; });
+     * // => returns 'pebbles' assuming `_.findKey` returns 'barney'
+     *
+     * // The `_.matches` iteratee shorthand.
+     * _.findLastKey(users, { 'age': 36, 'active': true });
+     * // => 'barney'
+     *
+     * // The `_.matchesProperty` iteratee shorthand.
+     * _.findLastKey(users, ['active', false]);
+     * // => 'fred'
+     *
+     * // The `_.property` iteratee shorthand.
+     * _.findLastKey(users, 'active');
+     * // => 'pebbles'
+     */
+    function findLastKey(object, predicate) {
+      return baseFindKey(object, getIteratee(predicate, 3), baseForOwnRight);
+    }
+
+    /**
+     * Iterates over own and inherited enumerable string keyed properties of an
+     * object and invokes `iteratee` for each property. The iteratee is invoked
+     * with three arguments: (value, key, object). Iteratee functions may exit
+     * iteration early by explicitly returning `false`.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.3.0
+     * @category Object
+     * @param {Object} object The object to iterate over.
+     * @param {Function} [iteratee=_.identity] The function invoked per iteration.
+     * @returns {Object} Returns `object`.
+     * @see _.forInRight
+     * @example
+     *
+     * function Foo() {
+     *   this.a = 1;
+     *   this.b = 2;
+     * }
+     *
+     * Foo.prototype.c = 3;
+     *
+     * _.forIn(new Foo, function(value, key) {
+     *   console.log(key);
+     * });
+     * // => Logs 'a', 'b', then 'c' (iteration order is not guaranteed).
+     */
+    function forIn(object, iteratee) {
+      return object == null
+        ? object
+        : baseFor(object, getIteratee(iteratee, 3), keysIn);
+    }
+
+    /**
+     * This method is like `_.forIn` except that it iterates over properties of
+     * `object` in the opposite order.
+     *
+     * @static
+     * @memberOf _
+     * @since 2.0.0
+     * @category Object
+     * @param {Object} object The object to iterate over.
+     * @param {Function} [iteratee=_.identity] The function invoked per iteration.
+     * @returns {Object} Returns `object`.
+     * @see _.forIn
+     * @example
+     *
+     * function Foo() {
+     *   this.a = 1;
+     *   this.b = 2;
+     * }
+     *
+     * Foo.prototype.c = 3;
+     *
+     * _.forInRight(new Foo, function(value, key) {
+     *   console.log(key);
+     * });
+     * // => Logs 'c', 'b', then 'a' assuming `_.forIn` logs 'a', 'b', then 'c'.
+     */
+    function forInRight(object, iteratee) {
+      return object == null
+        ? object
+        : baseForRight(object, getIteratee(iteratee, 3), keysIn);
+    }
+
+    /**
+     * Iterates over own enumerable string keyed properties of an object and
+     * invokes `iteratee` for each property. The iteratee is invoked with three
+     * arguments: (value, key, object). Iteratee functions may exit iteration
+     * early by explicitly returning `false`.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.3.0
+     * @category Object
+     * @param {Object} object The object to iterate over.
+     * @param {Function} [iteratee=_.identity] The function invoked per iteration.
+     * @returns {Object} Returns `object`.
+     * @see _.forOwnRight
+     * @example
+     *
+     * function Foo() {
+     *   this.a = 1;
+     *   this.b = 2;
+     * }
+     *
+     * Foo.prototype.c = 3;
+     *
+     * _.forOwn(new Foo, function(value, key) {
+     *   console.log(key);
+     * });
+     * // => Logs 'a' then 'b' (iteration order is not guaranteed).
+     */
+    function forOwn(object, iteratee) {
+      return object && baseForOwn(object, getIteratee(iteratee, 3));
+    }
+
+    /**
+     * This method is like `_.forOwn` except that it iterates over properties of
+     * `object` in the opposite order.
+     *
+     * @static
+     * @memberOf _
+     * @since 2.0.0
+     * @category Object
+     * @param {Object} object The object to iterate over.
+     * @param {Function} [iteratee=_.identity] The function invoked per iteration.
+     * @returns {Object} Returns `object`.
+     * @see _.forOwn
+     * @example
+     *
+     * function Foo() {
+     *   this.a = 1;
+     *   this.b = 2;
+     * }
+     *
+     * Foo.prototype.c = 3;
+     *
+     * _.forOwnRight(new Foo, function(value, key) {
+     *   console.log(key);
+     * });
+     * // => Logs 'b' then 'a' assuming `_.forOwn` logs 'a' then 'b'.
+     */
+    function forOwnRight(object, iteratee) {
+      return object && baseForOwnRight(object, getIteratee(iteratee, 3));
+    }
+
+    /**
+     * Creates an array of function property names from own enumerable properties
+     * of `object`.
+     *
+     * @static
+     * @since 0.1.0
+     * @memberOf _
+     * @category Object
+     * @param {Object} object The object to inspect.
+     * @returns {Array} Returns the function names.
+     * @see _.functionsIn
+     * @example
+     *
+     * function Foo() {
+     *   this.a = _.constant('a');
+     *   this.b = _.constant('b');
+     * }
+     *
+     * Foo.prototype.c = _.constant('c');
+     *
+     * _.functions(new Foo);
+     * // => ['a', 'b']
+     */
+    function functions(object) {
+      return object == null ? [] : baseFunctions(object, keys(object));
+    }
+
+    /**
+     * Creates an array of function property names from own and inherited
+     * enumerable properties of `object`.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Object
+     * @param {Object} object The object to inspect.
+     * @returns {Array} Returns the function names.
+     * @see _.functions
+     * @example
+     *
+     * function Foo() {
+     *   this.a = _.constant('a');
+     *   this.b = _.constant('b');
+     * }
+     *
+     * Foo.prototype.c = _.constant('c');
+     *
+     * _.functionsIn(new Foo);
+     * // => ['a', 'b', 'c']
+     */
+    function functionsIn(object) {
+      return object == null ? [] : baseFunctions(object, keysIn(object));
+    }
+
+    /**
+     * Gets the value at `path` of `object`. If the resolved value is
+     * `undefined`, the `defaultValue` is returned in its place.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.7.0
+     * @category Object
+     * @param {Object} object The object to query.
+     * @param {Array|string} path The path of the property to get.
+     * @param {*} [defaultValue] The value returned for `undefined` resolved values.
+     * @returns {*} Returns the resolved value.
+     * @example
+     *
+     * var object = { 'a': [{ 'b': { 'c': 3 } }] };
+     *
+     * _.get(object, 'a[0].b.c');
+     * // => 3
+     *
+     * _.get(object, ['a', '0', 'b', 'c']);
+     * // => 3
+     *
+     * _.get(object, 'a.b.c', 'default');
+     * // => 'default'
+     */
+    function get(object, path, defaultValue) {
+      var result = object == null ? undefined : baseGet(object, path);
+      return result === undefined ? defaultValue : result;
+    }
+
+    /**
+     * Checks if `path` is a direct property of `object`.
+     *
+     * @static
+     * @since 0.1.0
+     * @memberOf _
+     * @category Object
+     * @param {Object} object The object to query.
+     * @param {Array|string} path The path to check.
+     * @returns {boolean} Returns `true` if `path` exists, else `false`.
+     * @example
+     *
+     * var object = { 'a': { 'b': 2 } };
+     * var other = _.create({ 'a': _.create({ 'b': 2 }) });
+     *
+     * _.has(object, 'a');
+     * // => true
+     *
+     * _.has(object, 'a.b');
+     * // => true
+     *
+     * _.has(object, ['a', 'b']);
+     * // => true
+     *
+     * _.has(other, 'a');
+     * // => false
+     */
+    function has(object, path) {
+      return object != null && hasPath(object, path, baseHas);
+    }
+
+    /**
+     * Checks if `path` is a direct or inherited property of `object`.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Object
+     * @param {Object} object The object to query.
+     * @param {Array|string} path The path to check.
+     * @returns {boolean} Returns `true` if `path` exists, else `false`.
+     * @example
+     *
+     * var object = _.create({ 'a': _.create({ 'b': 2 }) });
+     *
+     * _.hasIn(object, 'a');
+     * // => true
+     *
+     * _.hasIn(object, 'a.b');
+     * // => true
+     *
+     * _.hasIn(object, ['a', 'b']);
+     * // => true
+     *
+     * _.hasIn(object, 'b');
+     * // => false
+     */
+    function hasIn(object, path) {
+      return object != null && hasPath(object, path, baseHasIn);
+    }
+
+    /**
+     * Creates an object composed of the inverted keys and values of `object`.
+     * If `object` contains duplicate values, subsequent values overwrite
+     * property assignments of previous values.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.7.0
+     * @category Object
+     * @param {Object} object The object to invert.
+     * @returns {Object} Returns the new inverted object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': 2, 'c': 1 };
+     *
+     * _.invert(object);
+     * // => { '1': 'c', '2': 'b' }
+     */
+    var invert = createInverter(function(result, value, key) {
+      if (value != null &&
+          typeof value.toString != 'function') {
+        value = nativeObjectToString.call(value);
+      }
+
+      result[value] = key;
+    }, constant(identity));
+
+    /**
+     * This method is like `_.invert` except that the inverted object is generated
+     * from the results of running each element of `object` thru `iteratee`. The
+     * corresponding inverted value of each inverted key is an array of keys
+     * responsible for generating the inverted value. The iteratee is invoked
+     * with one argument: (value).
+     *
+     * @static
+     * @memberOf _
+     * @since 4.1.0
+     * @category Object
+     * @param {Object} object The object to invert.
+     * @param {Function} [iteratee=_.identity] The iteratee invoked per element.
+     * @returns {Object} Returns the new inverted object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': 2, 'c': 1 };
+     *
+     * _.invertBy(object);
+     * // => { '1': ['a', 'c'], '2': ['b'] }
+     *
+     * _.invertBy(object, function(value) {
+     *   return 'group' + value;
+     * });
+     * // => { 'group1': ['a', 'c'], 'group2': ['b'] }
+     */
+    var invertBy = createInverter(function(result, value, key) {
+      if (value != null &&
+          typeof value.toString != 'function') {
+        value = nativeObjectToString.call(value);
+      }
+
+      if (hasOwnProperty.call(result, value)) {
+        result[value].push(key);
+      } else {
+        result[value] = [key];
+      }
+    }, getIteratee);
+
+    /**
+     * Invokes the method at `path` of `object`.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Object
+     * @param {Object} object The object to query.
+     * @param {Array|string} path The path of the method to invoke.
+     * @param {...*} [args] The arguments to invoke the method with.
+     * @returns {*} Returns the result of the invoked method.
+     * @example
+     *
+     * var object = { 'a': [{ 'b': { 'c': [1, 2, 3, 4] } }] };
+     *
+     * _.invoke(object, 'a[0].b.c.slice', 1, 3);
+     * // => [2, 3]
+     */
+    var invoke = baseRest(baseInvoke);
+
+    /**
+     * Creates an array of the own enumerable property names of `object`.
+     *
+     * **Note:** Non-object values are coerced to objects. See the
+     * [ES spec](http://ecma-international.org/ecma-262/7.0/#sec-object.keys)
+     * for more details.
+     *
+     * @static
+     * @since 0.1.0
+     * @memberOf _
+     * @category Object
+     * @param {Object} object The object to query.
+     * @returns {Array} Returns the array of property names.
+     * @example
+     *
+     * function Foo() {
+     *   this.a = 1;
+     *   this.b = 2;
+     * }
+     *
+     * Foo.prototype.c = 3;
+     *
+     * _.keys(new Foo);
+     * // => ['a', 'b'] (iteration order is not guaranteed)
+     *
+     * _.keys('hi');
+     * // => ['0', '1']
+     */
+    function keys(object) {
+      return isArrayLike(object) ? arrayLikeKeys(object) : baseKeys(object);
+    }
+
+    /**
+     * Creates an array of the own and inherited enumerable property names of `object`.
+     *
+     * **Note:** Non-object values are coerced to objects.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.0.0
+     * @category Object
+     * @param {Object} object The object to query.
+     * @returns {Array} Returns the array of property names.
+     * @example
+     *
+     * function Foo() {
+     *   this.a = 1;
+     *   this.b = 2;
+     * }
+     *
+     * Foo.prototype.c = 3;
+     *
+     * _.keysIn(new Foo);
+     * // => ['a', 'b', 'c'] (iteration order is not guaranteed)
+     */
+    function keysIn(object) {
+      return isArrayLike(object) ? arrayLikeKeys(object, true) : baseKeysIn(object);
+    }
+
+    /**
+     * The opposite of `_.mapValues`; this method creates an object with the
+     * same values as `object` and keys generated by running each own enumerable
+     * string keyed property of `object` thru `iteratee`. The iteratee is invoked
+     * with three arguments: (value, key, object).
+     *
+     * @static
+     * @memberOf _
+     * @since 3.8.0
+     * @category Object
+     * @param {Object} object The object to iterate over.
+     * @param {Function} [iteratee=_.identity] The function invoked per iteration.
+     * @returns {Object} Returns the new mapped object.
+     * @see _.mapValues
+     * @example
+     *
+     * _.mapKeys({ 'a': 1, 'b': 2 }, function(value, key) {
+     *   return key + value;
+     * });
+     * // => { 'a1': 1, 'b2': 2 }
+     */
+    function mapKeys(object, iteratee) {
+      var result = {};
+      iteratee = getIteratee(iteratee, 3);
+
+      baseForOwn(object, function(value, key, object) {
+        baseAssignValue(result, iteratee(value, key, object), value);
+      });
+      return result;
+    }
+
+    /**
+     * Creates an object with the same keys as `object` and values generated
+     * by running each own enumerable string keyed property of `object` thru
+     * `iteratee`. The iteratee is invoked with three arguments:
+     * (value, key, object).
+     *
+     * @static
+     * @memberOf _
+     * @since 2.4.0
+     * @category Object
+     * @param {Object} object The object to iterate over.
+     * @param {Function} [iteratee=_.identity] The function invoked per iteration.
+     * @returns {Object} Returns the new mapped object.
+     * @see _.mapKeys
+     * @example
+     *
+     * var users = {
+     *   'fred':    { 'user': 'fred',    'age': 40 },
+     *   'pebbles': { 'user': 'pebbles', 'age': 1 }
+     * };
+     *
+     * _.mapValues(users, function(o) { return o.age; });
+     * // => { 'fred': 40, 'pebbles': 1 } (iteration order is not guaranteed)
+     *
+     * // The `_.property` iteratee shorthand.
+     * _.mapValues(users, 'age');
+     * // => { 'fred': 40, 'pebbles': 1 } (iteration order is not guaranteed)
+     */
+    function mapValues(object, iteratee) {
+      var result = {};
+      iteratee = getIteratee(iteratee, 3);
+
+      baseForOwn(object, function(value, key, object) {
+        baseAssignValue(result, key, iteratee(value, key, object));
+      });
+      return result;
+    }
+
+    /**
+     * This method is like `_.assign` except that it recursively merges own and
+     * inherited enumerable string keyed properties of source objects into the
+     * destination object. Source properties that resolve to `undefined` are
+     * skipped if a destination value exists. Array and plain object properties
+     * are merged recursively. Other objects and value types are overridden by
+     * assignment. Source objects are applied from left to right. Subsequent
+     * sources overwrite property assignments of previous sources.
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.5.0
+     * @category Object
+     * @param {Object} object The destination object.
+     * @param {...Object} [sources] The source objects.
+     * @returns {Object} Returns `object`.
+     * @example
+     *
+     * var object = {
+     *   'a': [{ 'b': 2 }, { 'd': 4 }]
+     * };
+     *
+     * var other = {
+     *   'a': [{ 'c': 3 }, { 'e': 5 }]
+     * };
+     *
+     * _.merge(object, other);
+     * // => { 'a': [{ 'b': 2, 'c': 3 }, { 'd': 4, 'e': 5 }] }
+     */
+    var merge = createAssigner(function(object, source, srcIndex) {
+      baseMerge(object, source, srcIndex);
+    });
+
+    /**
+     * This method is like `_.merge` except that it accepts `customizer` which
+     * is invoked to produce the merged values of the destination and source
+     * properties. If `customizer` returns `undefined`, merging is handled by the
+     * method instead. The `customizer` is invoked with six arguments:
+     * (objValue, srcValue, key, object, source, stack).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Object
+     * @param {Object} object The destination object.
+     * @param {...Object} sources The source objects.
+     * @param {Function} customizer The function to customize assigned values.
+     * @returns {Object} Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   if (_.isArray(objValue)) {
+     *     return objValue.concat(srcValue);
+     *   }
+     * }
+     *
+     * var object = { 'a': [1], 'b': [2] };
+     * var other = { 'a': [3], 'b': [4] };
+     *
+     * _.mergeWith(object, other, customizer);
+     * // => { 'a': [1, 3], 'b': [2, 4] }
+     */
+    var mergeWith = createAssigner(function(object, source, srcIndex, customizer) {
+      baseMerge(object, source, srcIndex, customizer);
+    });
+
+    /**
+     * The opposite of `_.pick`; this method creates an object composed of the
+     * own and inherited enumerable property paths of `object` that are not omitted.
+     *
+     * **Note:** This method is considerably slower than `_.pick`.
+     *
+     * @static
+     * @since 0.1.0
+     * @memberOf _
+     * @category Object
+     * @param {Object} object The source object.
+     * @param {...(string|string[])} [paths] The property paths to omit.
+     * @returns {Object} Returns the new object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': '2', 'c': 3 };
+     *
+     * _.omit(object, ['a', 'c']);
+     * // => { 'b': '2' }
+     */
+    var omit = flatRest(function(object, paths) {
+      var result = {};
+      if (object == null) {
+        return result;
+      }
+      var isDeep = false;
+      paths = arrayMap(paths, function(path) {
+        path = castPath(path, object);
+        isDeep || (isDeep = path.length > 1);
+        return path;
+      });
+      copyObject(object, getAllKeysIn(object), result);
+      if (isDeep) {
+        result = baseClone(result, CLONE_DEEP_FLAG | CLONE_FLAT_FLAG | CLONE_SYMBOLS_FLAG, customOmitClone);
+      }
+      var length = paths.length;
+      while (length--) {
+        baseUnset(result, paths[length]);
+      }
+      return result;
+    });
+
+    /**
+     * The opposite of `_.pickBy`; this method creates an object composed of
+     * the own and inherited enumerable string keyed properties of `object` that
+     * `predicate` doesn't return truthy for. The predicate is invoked with two
+     * arguments: (value, key).
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Object
+     * @param {Object} object The source object.
+     * @param {Function} [predicate=_.identity] The function invoked per property.
+     * @returns {Object} Returns the new object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': '2', 'c': 3 };
+     *
+     * _.omitBy(object, _.isNumber);
+     * // => { 'b': '2' }
+     */
+    function omitBy(object, predicate) {
+      return pickBy(object, negate(getIteratee(predicate)));
+    }
+
+    /**
+     * Creates an object composed of the picked `object` properties.
+     *
+     * @static
+     * @since 0.1.0
+     * @memberOf _
+     * @category Object
+     * @param {Object} object The source object.
+     * @param {...(string|string[])} [paths] The property paths to pick.
+     * @returns {Object} Returns the new object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': '2', 'c': 3 };
+     *
+     * _.pick(object, ['a', 'c']);
+     * // => { 'a': 1, 'c': 3 }
+     */
+    var pick = flatRest(function(object, paths) {
+      return object == null ? {} : basePick(object, paths);
+    });
+
+    /**
+     * Creates an object composed of the `object` properties `predicate` returns
+     * truthy for. The predicate is invoked with two arguments: (value, key).
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Object
+     * @param {Object} object The source object.
+     * @param {Function} [predicate=_.identity] The function invoked per property.
+     * @returns {Object} Returns the new object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': '2', 'c': 3 };
+     *
+     * _.pickBy(object, _.isNumber);
+     * // => { 'a': 1, 'c': 3 }
+     */
+    function pickBy(object, predicate) {
+      if (object == null) {
+        return {};
+      }
+      var props = arrayMap(getAllKeysIn(object), function(prop) {
+        return [prop];
+      });
+      predicate = getIteratee(predicate);
+      return basePickBy(object, props, function(value, path) {
+        return predicate(value, path[0]);
+      });
+    }
+
+    /**
+     * This method is like `_.get` except that if the resolved value is a
+     * function it's invoked with the `this` binding of its parent object and
+     * its result is returned.
+     *
+     * @static
+     * @since 0.1.0
+     * @memberOf _
+     * @category Object
+     * @param {Object} object The object to query.
+     * @param {Array|string} path The path of the property to resolve.
+     * @param {*} [defaultValue] The value returned for `undefined` resolved values.
+     * @returns {*} Returns the resolved value.
+     * @example
+     *
+     * var object = { 'a': [{ 'b': { 'c1': 3, 'c2': _.constant(4) } }] };
+     *
+     * _.result(object, 'a[0].b.c1');
+     * // => 3
+     *
+     * _.result(object, 'a[0].b.c2');
+     * // => 4
+     *
+     * _.result(object, 'a[0].b.c3', 'default');
+     * // => 'default'
+     *
+     * _.result(object, 'a[0].b.c3', _.constant('default'));
+     * // => 'default'
+     */
+    function result(object, path, defaultValue) {
+      path = castPath(path, object);
+
+      var index = -1,
+          length = path.length;
+
+      // Ensure the loop is entered when path is empty.
+      if (!length) {
+        length = 1;
+        object = undefined;
+      }
+      while (++index < length) {
+        var value = object == null ? undefined : object[toKey(path[index])];
+        if (value === undefined) {
+          index = length;
+          value = defaultValue;
+        }
+        object = isFunction(value) ? value.call(object) : value;
+      }
+      return object;
+    }
+
+    /**
+     * Sets the value at `path` of `object`. If a portion of `path` doesn't exist,
+     * it's created. Arrays are created for missing index properties while objects
+     * are created for all other missing properties. Use `_.setWith` to customize
+     * `path` creation.
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.7.0
+     * @category Object
+     * @param {Object} object The object to modify.
+     * @param {Array|string} path The path of the property to set.
+     * @param {*} value The value to set.
+     * @returns {Object} Returns `object`.
+     * @example
+     *
+     * var object = { 'a': [{ 'b': { 'c': 3 } }] };
+     *
+     * _.set(object, 'a[0].b.c', 4);
+     * console.log(object.a[0].b.c);
+     * // => 4
+     *
+     * _.set(object, ['x', '0', 'y', 'z'], 5);
+     * console.log(object.x[0].y.z);
+     * // => 5
+     */
+    function set(object, path, value) {
+      return object == null ? object : baseSet(object, path, value);
+    }
+
+    /**
+     * This method is like `_.set` except that it accepts `customizer` which is
+     * invoked to produce the objects of `path`.  If `customizer` returns `undefined`
+     * path creation is handled by the method instead. The `customizer` is invoked
+     * with three arguments: (nsValue, key, nsObject).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Object
+     * @param {Object} object The object to modify.
+     * @param {Array|string} path The path of the property to set.
+     * @param {*} value The value to set.
+     * @param {Function} [customizer] The function to customize assigned values.
+     * @returns {Object} Returns `object`.
+     * @example
+     *
+     * var object = {};
+     *
+     * _.setWith(object, '[0][1]', 'a', Object);
+     * // => { '0': { '1': 'a' } }
+     */
+    function setWith(object, path, value, customizer) {
+      customizer = typeof customizer == 'function' ? customizer : undefined;
+      return object == null ? object : baseSet(object, path, value, customizer);
+    }
+
+    /**
+     * Creates an array of own enumerable string keyed-value pairs for `object`
+     * which can be consumed by `_.fromPairs`. If `object` is a map or set, its
+     * entries are returned.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @alias entries
+     * @category Object
+     * @param {Object} object The object to query.
+     * @returns {Array} Returns the key-value pairs.
+     * @example
+     *
+     * function Foo() {
+     *   this.a = 1;
+     *   this.b = 2;
+     * }
+     *
+     * Foo.prototype.c = 3;
+     *
+     * _.toPairs(new Foo);
+     * // => [['a', 1], ['b', 2]] (iteration order is not guaranteed)
+     */
+    var toPairs = createToPairs(keys);
+
+    /**
+     * Creates an array of own and inherited enumerable string keyed-value pairs
+     * for `object` which can be consumed by `_.fromPairs`. If `object` is a map
+     * or set, its entries are returned.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @alias entriesIn
+     * @category Object
+     * @param {Object} object The object to query.
+     * @returns {Array} Returns the key-value pairs.
+     * @example
+     *
+     * function Foo() {
+     *   this.a = 1;
+     *   this.b = 2;
+     * }
+     *
+     * Foo.prototype.c = 3;
+     *
+     * _.toPairsIn(new Foo);
+     * // => [['a', 1], ['b', 2], ['c', 3]] (iteration order is not guaranteed)
+     */
+    var toPairsIn = createToPairs(keysIn);
+
+    /**
+     * An alternative to `_.reduce`; this method transforms `object` to a new
+     * `accumulator` object which is the result of running each of its own
+     * enumerable string keyed properties thru `iteratee`, with each invocation
+     * potentially mutating the `accumulator` object. If `accumulator` is not
+     * provided, a new object with the same `[[Prototype]]` will be used. The
+     * iteratee is invoked with four arguments: (accumulator, value, key, object).
+     * Iteratee functions may exit iteration early by explicitly returning `false`.
+     *
+     * @static
+     * @memberOf _
+     * @since 1.3.0
+     * @category Object
+     * @param {Object} object The object to iterate over.
+     * @param {Function} [iteratee=_.identity] The function invoked per iteration.
+     * @param {*} [accumulator] The custom accumulator value.
+     * @returns {*} Returns the accumulated value.
+     * @example
+     *
+     * _.transform([2, 3, 4], function(result, n) {
+     *   result.push(n *= n);
+     *   return n % 2 == 0;
+     * }, []);
+     * // => [4, 9]
+     *
+     * _.transform({ 'a': 1, 'b': 2, 'c': 1 }, function(result, value, key) {
+     *   (result[value] || (result[value] = [])).push(key);
+     * }, {});
+     * // => { '1': ['a', 'c'], '2': ['b'] }
+     */
+    function transform(object, iteratee, accumulator) {
+      var isArr = isArray(object),
+          isArrLike = isArr || isBuffer(object) || isTypedArray(object);
+
+      iteratee = getIteratee(iteratee, 4);
+      if (accumulator == null) {
+        var Ctor = object && object.constructor;
+        if (isArrLike) {
+          accumulator = isArr ? new Ctor : [];
+        }
+        else if (isObject(object)) {
+          accumulator = isFunction(Ctor) ? baseCreate(getPrototype(object)) : {};
+        }
+        else {
+          accumulator = {};
+        }
+      }
+      (isArrLike ? arrayEach : baseForOwn)(object, function(value, index, object) {
+        return iteratee(accumulator, value, index, object);
+      });
+      return accumulator;
+    }
+
+    /**
+     * Removes the property at `path` of `object`.
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Object
+     * @param {Object} object The object to modify.
+     * @param {Array|string} path The path of the property to unset.
+     * @returns {boolean} Returns `true` if the property is deleted, else `false`.
+     * @example
+     *
+     * var object = { 'a': [{ 'b': { 'c': 7 } }] };
+     * _.unset(object, 'a[0].b.c');
+     * // => true
+     *
+     * console.log(object);
+     * // => { 'a': [{ 'b': {} }] };
+     *
+     * _.unset(object, ['a', '0', 'b', 'c']);
+     * // => true
+     *
+     * console.log(object);
+     * // => { 'a': [{ 'b': {} }] };
+     */
+    function unset(object, path) {
+      return object == null ? true : baseUnset(object, path);
+    }
+
+    /**
+     * This method is like `_.set` except that accepts `updater` to produce the
+     * value to set. Use `_.updateWith` to customize `path` creation. The `updater`
+     * is invoked with one argument: (value).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.6.0
+     * @category Object
+     * @param {Object} object The object to modify.
+     * @param {Array|string} path The path of the property to set.
+     * @param {Function} updater The function to produce the updated value.
+     * @returns {Object} Returns `object`.
+     * @example
+     *
+     * var object = { 'a': [{ 'b': { 'c': 3 } }] };
+     *
+     * _.update(object, 'a[0].b.c', function(n) { return n * n; });
+     * console.log(object.a[0].b.c);
+     * // => 9
+     *
+     * _.update(object, 'x[0].y.z', function(n) { return n ? n + 1 : 0; });
+     * console.log(object.x[0].y.z);
+     * // => 0
+     */
+    function update(object, path, updater) {
+      return object == null ? object : baseUpdate(object, path, castFunction(updater));
+    }
+
+    /**
+     * This method is like `_.update` except that it accepts `customizer` which is
+     * invoked to produce the objects of `path`.  If `customizer` returns `undefined`
+     * path creation is handled by the method instead. The `customizer` is invoked
+     * with three arguments: (nsValue, key, nsObject).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.6.0
+     * @category Object
+     * @param {Object} object The object to modify.
+     * @param {Array|string} path The path of the property to set.
+     * @param {Function} updater The function to produce the updated value.
+     * @param {Function} [customizer] The function to customize assigned values.
+     * @returns {Object} Returns `object`.
+     * @example
+     *
+     * var object = {};
+     *
+     * _.updateWith(object, '[0][1]', _.constant('a'), Object);
+     * // => { '0': { '1': 'a' } }
+     */
+    function updateWith(object, path, updater, customizer) {
+      customizer = typeof customizer == 'function' ? customizer : undefined;
+      return object == null ? object : baseUpdate(object, path, castFunction(updater), customizer);
+    }
+
+    /**
+     * Creates an array of the own enumerable string keyed property values of `object`.
+     *
+     * **Note:** Non-object values are coerced to objects.
+     *
+     * @static
+     * @since 0.1.0
+     * @memberOf _
+     * @category Object
+     * @param {Object} object The object to query.
+     * @returns {Array} Returns the array of property values.
+     * @example
+     *
+     * function Foo() {
+     *   this.a = 1;
+     *   this.b = 2;
+     * }
+     *
+     * Foo.prototype.c = 3;
+     *
+     * _.values(new Foo);
+     * // => [1, 2] (iteration order is not guaranteed)
+     *
+     * _.values('hi');
+     * // => ['h', 'i']
+     */
+    function values(object) {
+      return object == null ? [] : baseValues(object, keys(object));
+    }
+
+    /**
+     * Creates an array of the own and inherited enumerable string keyed property
+     * values of `object`.
+     *
+     * **Note:** Non-object values are coerced to objects.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.0.0
+     * @category Object
+     * @param {Object} object The object to query.
+     * @returns {Array} Returns the array of property values.
+     * @example
+     *
+     * function Foo() {
+     *   this.a = 1;
+     *   this.b = 2;
+     * }
+     *
+     * Foo.prototype.c = 3;
+     *
+     * _.valuesIn(new Foo);
+     * // => [1, 2, 3] (iteration order is not guaranteed)
+     */
+    function valuesIn(object) {
+      return object == null ? [] : baseValues(object, keysIn(object));
+    }
+
+    /*------------------------------------------------------------------------*/
+
+    /**
+     * Clamps `number` within the inclusive `lower` and `upper` bounds.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Number
+     * @param {number} number The number to clamp.
+     * @param {number} [lower] The lower bound.
+     * @param {number} upper The upper bound.
+     * @returns {number} Returns the clamped number.
+     * @example
+     *
+     * _.clamp(-10, -5, 5);
+     * // => -5
+     *
+     * _.clamp(10, -5, 5);
+     * // => 5
+     */
+    function clamp(number, lower, upper) {
+      if (upper === undefined) {
+        upper = lower;
+        lower = undefined;
+      }
+      if (upper !== undefined) {
+        upper = toNumber(upper);
+        upper = upper === upper ? upper : 0;
+      }
+      if (lower !== undefined) {
+        lower = toNumber(lower);
+        lower = lower === lower ? lower : 0;
+      }
+      return baseClamp(toNumber(number), lower, upper);
+    }
+
+    /**
+     * Checks if `n` is between `start` and up to, but not including, `end`. If
+     * `end` is not specified, it's set to `start` with `start` then set to `0`.
+     * If `start` is greater than `end` the params are swapped to support
+     * negative ranges.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.3.0
+     * @category Number
+     * @param {number} number The number to check.
+     * @param {number} [start=0] The start of the range.
+     * @param {number} end The end of the range.
+     * @returns {boolean} Returns `true` if `number` is in the range, else `false`.
+     * @see _.range, _.rangeRight
+     * @example
+     *
+     * _.inRange(3, 2, 4);
+     * // => true
+     *
+     * _.inRange(4, 8);
+     * // => true
+     *
+     * _.inRange(4, 2);
+     * // => false
+     *
+     * _.inRange(2, 2);
+     * // => false
+     *
+     * _.inRange(1.2, 2);
+     * // => true
+     *
+     * _.inRange(5.2, 4);
+     * // => false
+     *
+     * _.inRange(-3, -2, -6);
+     * // => true
+     */
+    function inRange(number, start, end) {
+      start = toFinite(start);
+      if (end === undefined) {
+        end = start;
+        start = 0;
+      } else {
+        end = toFinite(end);
+      }
+      number = toNumber(number);
+      return baseInRange(number, start, end);
+    }
+
+    /**
+     * Produces a random number between the inclusive `lower` and `upper` bounds.
+     * If only one argument is provided a number between `0` and the given number
+     * is returned. If `floating` is `true`, or either `lower` or `upper` are
+     * floats, a floating-point number is returned instead of an integer.
+     *
+     * **Note:** JavaScript follows the IEEE-754 standard for resolving
+     * floating-point values which can produce unexpected results.
+     *
+     * @static
+     * @memberOf _
+     * @since 0.7.0
+     * @category Number
+     * @param {number} [lower=0] The lower bound.
+     * @param {number} [upper=1] The upper bound.
+     * @param {boolean} [floating] Specify returning a floating-point number.
+     * @returns {number} Returns the random number.
+     * @example
+     *
+     * _.random(0, 5);
+     * // => an integer between 0 and 5
+     *
+     * _.random(5);
+     * // => also an integer between 0 and 5
+     *
+     * _.random(5, true);
+     * // => a floating-point number between 0 and 5
+     *
+     * _.random(1.2, 5.2);
+     * // => a floating-point number between 1.2 and 5.2
+     */
+    function random(lower, upper, floating) {
+      if (floating && typeof floating != 'boolean' && isIterateeCall(lower, upper, floating)) {
+        upper = floating = undefined;
+      }
+      if (floating === undefined) {
+        if (typeof upper == 'boolean') {
+          floating = upper;
+          upper = undefined;
+        }
+        else if (typeof lower == 'boolean') {
+          floating = lower;
+          lower = undefined;
+        }
+      }
+      if (lower === undefined && upper === undefined) {
+        lower = 0;
+        upper = 1;
+      }
+      else {
+        lower = toFinite(lower);
+        if (upper === undefined) {
+          upper = lower;
+          lower = 0;
+        } else {
+          upper = toFinite(upper);
+        }
+      }
+      if (lower > upper) {
+        var temp = lower;
+        lower = upper;
+        upper = temp;
+      }
+      if (floating || lower % 1 || upper % 1) {
+        var rand = nativeRandom();
+        return nativeMin(lower + (rand * (upper - lower + freeParseFloat('1e-' + ((rand + '').length - 1)))), upper);
+      }
+      return baseRandom(lower, upper);
+    }
+
+    /*------------------------------------------------------------------------*/
+
+    /**
+     * Converts `string` to [camel case](https://en.wikipedia.org/wiki/CamelCase).
+     *
+     * @static
+     * @memberOf _
+     * @since 3.0.0
+     * @category String
+     * @param {string} [string=''] The string to convert.
+     * @returns {string} Returns the camel cased string.
+     * @example
+     *
+     * _.camelCase('Foo Bar');
+     * // => 'fooBar'
+     *
+     * _.camelCase('--foo-bar--');
+     * // => 'fooBar'
+     *
+     * _.camelCase('__FOO_BAR__');
+     * // => 'fooBar'
+     */
+    var camelCase = createCompounder(function(result, word, index) {
+      word = word.toLowerCase();
+      return result + (index ? capitalize(word) : word);
+    });
+
+    /**
+     * Converts the first character of `string` to upper case and the remaining
+     * to lower case.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.0.0
+     * @category String
+     * @param {string} [string=''] The string to capitalize.
+     * @returns {string} Returns the capitalized string.
+     * @example
+     *
+     * _.capitalize('FRED');
+     * // => 'Fred'
+     */
+    function capitalize(string) {
+      return upperFirst(toString(string).toLowerCase());
+    }
+
+    /**
+     * Deburrs `string` by converting
+     * [Latin-1 Supplement](https://en.wikipedia.org/wiki/Latin-1_Supplement_(Unicode_block)#Character_table)
+     * and [Latin Extended-A](https://en.wikipedia.org/wiki/Latin_Extended-A)
+     * letters to basic Latin letters and removing
+     * [combining diacritical marks](https://en.wikipedia.org/wiki/Combining_Diacritical_Marks).
+     *
+     * @static
+     * @memberOf _
+     * @since 3.0.0
+     * @category String
+     * @param {string} [string=''] The string to deburr.
+     * @returns {string} Returns the deburred string.
+     * @example
+     *
+     * _.deburr('déjà vu');
+     * // => 'deja vu'
+     */
+    function deburr(string) {
+      string = toString(string);
+      return string && string.replace(reLatin, deburrLetter).replace(reComboMark, '');
+    }
+
+    /**
+     * Checks if `string` ends with the given target string.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.0.0
+     * @category String
+     * @param {string} [string=''] The string to inspect.
+     * @param {string} [target] The string to search for.
+     * @param {number} [position=string.length] The position to search up to.
+     * @returns {boolean} Returns `true` if `string` ends with `target`,
+     *  else `false`.
+     * @example
+     *
+     * _.endsWith('abc', 'c');
+     * // => true
+     *
+     * _.endsWith('abc', 'b');
+     * // => false
+     *
+     * _.endsWith('abc', 'b', 2);
+     * // => true
+     */
+    function endsWith(string, target, position) {
+      string = toString(string);
+      target = baseToString(target);
+
+      var length = string.length;
+      position = position === undefined
+        ? length
+        : baseClamp(toInteger(position), 0, length);
+
+      var end = position;
+      position -= target.length;
+      return position >= 0 && string.slice(position, end) == target;
+    }
+
+    /**
+     * Converts the characters "&", "<", ">", '"', and "'" in `string` to their
+     * corresponding HTML entities.
+     *
+     * **Note:** No other characters are escaped. To escape additional
+     * characters use a third-party library like [_he_](https://mths.be/he).
+     *
+     * Though the ">" character is escaped for symmetry, characters like
+     * ">" and "/" don't need escaping in HTML and have no special meaning
+     * unless they're part of a tag or unquoted attribute value. See
+     * [Mathias Bynens's article](https://mathiasbynens.be/notes/ambiguous-ampersands)
+     * (under "semi-related fun fact") for more details.
+     *
+     * When working with HTML you should always
+     * [quote attribute values](http://wonko.com/post/html-escaping) to reduce
+     * XSS vectors.
+     *
+     * @static
+     * @since 0.1.0
+     * @memberOf _
+     * @category String
+     * @param {string} [string=''] The string to escape.
+     * @returns {string} Returns the escaped string.
+     * @example
+     *
+     * _.escape('fred, barney, & pebbles');
+     * // => 'fred, barney, &amp; pebbles'
+     */
+    function escape(string) {
+      string = toString(string);
+      return (string && reHasUnescapedHtml.test(string))
+        ? string.replace(reUnescapedHtml, escapeHtmlChar)
+        : string;
+    }
+
+    /**
+     * Escapes the `RegExp` special characters "^", "$", "\", ".", "*", "+",
+     * "?", "(", ")", "[", "]", "{", "}", and "|" in `string`.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.0.0
+     * @category String
+     * @param {string} [string=''] The string to escape.
+     * @returns {string} Returns the escaped string.
+     * @example
+     *
+     * _.escapeRegExp('[lodash](https://lodash.com/)');
+     * // => '\[lodash\]\(https://lodash\.com/\)'
+     */
+    function escapeRegExp(string) {
+      string = toString(string);
+      return (string && reHasRegExpChar.test(string))
+        ? string.replace(reRegExpChar, '\\$&')
+        : string;
+    }
+
+    /**
+     * Converts `string` to
+     * [kebab case](https://en.wikipedia.org/wiki/Letter_case#Special_case_styles).
+     *
+     * @static
+     * @memberOf _
+     * @since 3.0.0
+     * @category String
+     * @param {string} [string=''] The string to convert.
+     * @returns {string} Returns the kebab cased string.
+     * @example
+     *
+     * _.kebabCase('Foo Bar');
+     * // => 'foo-bar'
+     *
+     * _.kebabCase('fooBar');
+     * // => 'foo-bar'
+     *
+     * _.kebabCase('__FOO_BAR__');
+     * // => 'foo-bar'
+     */
+    var kebabCase = createCompounder(function(result, word, index) {
+      return result + (index ? '-' : '') + word.toLowerCase();
+    });
+
+    /**
+     * Converts `string`, as space separated words, to lower case.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category String
+     * @param {string} [string=''] The string to convert.
+     * @returns {string} Returns the lower cased string.
+     * @example
+     *
+     * _.lowerCase('--Foo-Bar--');
+     * // => 'foo bar'
+     *
+     * _.lowerCase('fooBar');
+     * // => 'foo bar'
+     *
+     * _.lowerCase('__FOO_BAR__');
+     * // => 'foo bar'
+     */
+    var lowerCase = createCompounder(function(result, word, index) {
+      return result + (index ? ' ' : '') + word.toLowerCase();
+    });
+
+    /**
+     * Converts the first character of `string` to lower case.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category String
+     * @param {string} [string=''] The string to convert.
+     * @returns {string} Returns the converted string.
+     * @example
+     *
+     * _.lowerFirst('Fred');
+     * // => 'fred'
+     *
+     * _.lowerFirst('FRED');
+     * // => 'fRED'
+     */
+    var lowerFirst = createCaseFirst('toLowerCase');
+
+    /**
+     * Pads `string` on the left and right sides if it's shorter than `length`.
+     * Padding characters are truncated if they can't be evenly divided by `length`.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.0.0
+     * @category String
+     * @param {string} [string=''] The string to pad.
+     * @param {number} [length=0] The padding length.
+     * @param {string} [chars=' '] The string used as padding.
+     * @returns {string} Returns the padded string.
+     * @example
+     *
+     * _.pad('abc', 8);
+     * // => '  abc   '
+     *
+     * _.pad('abc', 8, '_-');
+     * // => '_-abc_-_'
+     *
+     * _.pad('abc', 3);
+     * // => 'abc'
+     */
+    function pad(string, length, chars) {
+      string = toString(string);
+      length = toInteger(length);
+
+      var strLength = length ? stringSize(string) : 0;
+      if (!length || strLength >= length) {
+        return string;
+      }
+      var mid = (length - strLength) / 2;
+      return (
+        createPadding(nativeFloor(mid), chars) +
+        string +
+        createPadding(nativeCeil(mid), chars)
+      );
+    }
+
+    /**
+     * Pads `string` on the right side if it's shorter than `length`. Padding
+     * characters are truncated if they exceed `length`.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category String
+     * @param {string} [string=''] The string to pad.
+     * @param {number} [length=0] The padding length.
+     * @param {string} [chars=' '] The string used as padding.
+     * @returns {string} Returns the padded string.
+     * @example
+     *
+     * _.padEnd('abc', 6);
+     * // => 'abc   '
+     *
+     * _.padEnd('abc', 6, '_-');
+     * // => 'abc_-_'
+     *
+     * _.padEnd('abc', 3);
+     * // => 'abc'
+     */
+    function padEnd(string, length, chars) {
+      string = toString(string);
+      length = toInteger(length);
+
+      var strLength = length ? stringSize(string) : 0;
+      return (length && strLength < length)
+        ? (string + createPadding(length - strLength, chars))
+        : string;
+    }
+
+    /**
+     * Pads `string` on the left side if it's shorter than `length`. Padding
+     * characters are truncated if they exceed `length`.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category String
+     * @param {string} [string=''] The string to pad.
+     * @param {number} [length=0] The padding length.
+     * @param {string} [chars=' '] The string used as padding.
+     * @returns {string} Returns the padded string.
+     * @example
+     *
+     * _.padStart('abc', 6);
+     * // => '   abc'
+     *
+     * _.padStart('abc', 6, '_-');
+     * // => '_-_abc'
+     *
+     * _.padStart('abc', 3);
+     * // => 'abc'
+     */
+    function padStart(string, length, chars) {
+      string = toString(string);
+      length = toInteger(length);
+
+      var strLength = length ? stringSize(string) : 0;
+      return (length && strLength < length)
+        ? (createPadding(length - strLength, chars) + string)
+        : string;
+    }
+
+    /**
+     * Converts `string` to an integer of the specified radix. If `radix` is
+     * `undefined` or `0`, a `radix` of `10` is used unless `value` is a
+     * hexadecimal, in which case a `radix` of `16` is used.
+     *
+     * **Note:** This method aligns with the
+     * [ES5 implementation](https://es5.github.io/#x15.1.2.2) of `parseInt`.
+     *
+     * @static
+     * @memberOf _
+     * @since 1.1.0
+     * @category String
+     * @param {string} string The string to convert.
+     * @param {number} [radix=10] The radix to interpret `value` by.
+     * @param- {Object} [guard] Enables use as an iteratee for methods like `_.map`.
+     * @returns {number} Returns the converted integer.
+     * @example
+     *
+     * _.parseInt('08');
+     * // => 8
+     *
+     * _.map(['6', '08', '10'], _.parseInt);
+     * // => [6, 8, 10]
+     */
+    function parseInt(string, radix, guard) {
+      if (guard || radix == null) {
+        radix = 0;
+      } else if (radix) {
+        radix = +radix;
+      }
+      return nativeParseInt(toString(string).replace(reTrimStart, ''), radix || 0);
+    }
+
+    /**
+     * Repeats the given string `n` times.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.0.0
+     * @category String
+     * @param {string} [string=''] The string to repeat.
+     * @param {number} [n=1] The number of times to repeat the string.
+     * @param- {Object} [guard] Enables use as an iteratee for methods like `_.map`.
+     * @returns {string} Returns the repeated string.
+     * @example
+     *
+     * _.repeat('*', 3);
+     * // => '***'
+     *
+     * _.repeat('abc', 2);
+     * // => 'abcabc'
+     *
+     * _.repeat('abc', 0);
+     * // => ''
+     */
+    function repeat(string, n, guard) {
+      if ((guard ? isIterateeCall(string, n, guard) : n === undefined)) {
+        n = 1;
+      } else {
+        n = toInteger(n);
+      }
+      return baseRepeat(toString(string), n);
+    }
+
+    /**
+     * Replaces matches for `pattern` in `string` with `replacement`.
+     *
+     * **Note:** This method is based on
+     * [`String#replace`](https://mdn.io/String/replace).
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category String
+     * @param {string} [string=''] The string to modify.
+     * @param {RegExp|string} pattern The pattern to replace.
+     * @param {Function|string} replacement The match replacement.
+     * @returns {string} Returns the modified string.
+     * @example
+     *
+     * _.replace('Hi Fred', 'Fred', 'Barney');
+     * // => 'Hi Barney'
+     */
+    function replace() {
+      var args = arguments,
+          string = toString(args[0]);
+
+      return args.length < 3 ? string : string.replace(args[1], args[2]);
+    }
+
+    /**
+     * Converts `string` to
+     * [snake case](https://en.wikipedia.org/wiki/Snake_case).
+     *
+     * @static
+     * @memberOf _
+     * @since 3.0.0
+     * @category String
+     * @param {string} [string=''] The string to convert.
+     * @returns {string} Returns the snake cased string.
+     * @example
+     *
+     * _.snakeCase('Foo Bar');
+     * // => 'foo_bar'
+     *
+     * _.snakeCase('fooBar');
+     * // => 'foo_bar'
+     *
+     * _.snakeCase('--FOO-BAR--');
+     * // => 'foo_bar'
+     */
+    var snakeCase = createCompounder(function(result, word, index) {
+      return result + (index ? '_' : '') + word.toLowerCase();
+    });
+
+    /**
+     * Splits `string` by `separator`.
+     *
+     * **Note:** This method is based on
+     * [`String#split`](https://mdn.io/String/split).
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category String
+     * @param {string} [string=''] The string to split.
+     * @param {RegExp|string} separator The separator pattern to split by.
+     * @param {number} [limit] The length to truncate results to.
+     * @returns {Array} Returns the string segments.
+     * @example
+     *
+     * _.split('a-b-c', '-', 2);
+     * // => ['a', 'b']
+     */
+    function split(string, separator, limit) {
+      if (limit && typeof limit != 'number' && isIterateeCall(string, separator, limit)) {
+        separator = limit = undefined;
+      }
+      limit = limit === undefined ? MAX_ARRAY_LENGTH : limit >>> 0;
+      if (!limit) {
+        return [];
+      }
+      string = toString(string);
+      if (string && (
+            typeof separator == 'string' ||
+            (separator != null && !isRegExp(separator))
+          )) {
+        separator = baseToString(separator);
+        if (!separator && hasUnicode(string)) {
+          return castSlice(stringToArray(string), 0, limit);
+        }
+      }
+      return string.split(separator, limit);
+    }
+
+    /**
+     * Converts `string` to
+     * [start case](https://en.wikipedia.org/wiki/Letter_case#Stylistic_or_specialised_usage).
+     *
+     * @static
+     * @memberOf _
+     * @since 3.1.0
+     * @category String
+     * @param {string} [string=''] The string to convert.
+     * @returns {string} Returns the start cased string.
+     * @example
+     *
+     * _.startCase('--foo-bar--');
+     * // => 'Foo Bar'
+     *
+     * _.startCase('fooBar');
+     * // => 'Foo Bar'
+     *
+     * _.startCase('__FOO_BAR__');
+     * // => 'FOO BAR'
+     */
+    var startCase = createCompounder(function(result, word, index) {
+      return result + (index ? ' ' : '') + upperFirst(word);
+    });
+
+    /**
+     * Checks if `string` starts with the given target string.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.0.0
+     * @category String
+     * @param {string} [string=''] The string to inspect.
+     * @param {string} [target] The string to search for.
+     * @param {number} [position=0] The position to search from.
+     * @returns {boolean} Returns `true` if `string` starts with `target`,
+     *  else `false`.
+     * @example
+     *
+     * _.startsWith('abc', 'a');
+     * // => true
+     *
+     * _.startsWith('abc', 'b');
+     * // => false
+     *
+     * _.startsWith('abc', 'b', 1);
+     * // => true
+     */
+    function startsWith(string, target, position) {
+      string = toString(string);
+      position = position == null
+        ? 0
+        : baseClamp(toInteger(position), 0, string.length);
+
+      target = baseToString(target);
+      return string.slice(position, position + target.length) == target;
+    }
+
+    /**
+     * Creates a compiled template function that can interpolate data properties
+     * in "interpolate" delimiters, HTML-escape interpolated data properties in
+     * "escape" delimiters, and execute JavaScript in "evaluate" delimiters. Data
+     * properties may be accessed as free variables in the template. If a setting
+     * object is given, it takes precedence over `_.templateSettings` values.
+     *
+     * **Note:** In the development build `_.template` utilizes
+     * [sourceURLs](http://www.html5rocks.com/en/tutorials/developertools/sourcemaps/#toc-sourceurl)
+     * for easier debugging.
+     *
+     * For more information on precompiling templates see
+     * [lodash's custom builds documentation](https://lodash.com/custom-builds).
+     *
+     * For more information on Chrome extension sandboxes see
+     * [Chrome's extensions documentation](https://developer.chrome.com/extensions/sandboxingEval).
+     *
+     * @static
+     * @since 0.1.0
+     * @memberOf _
+     * @category String
+     * @param {string} [string=''] The template string.
+     * @param {Object} [options={}] The options object.
+     * @param {RegExp} [options.escape=_.templateSettings.escape]
+     *  The HTML "escape" delimiter.
+     * @param {RegExp} [options.evaluate=_.templateSettings.evaluate]
+     *  The "evaluate" delimiter.
+     * @param {Object} [options.imports=_.templateSettings.imports]
+     *  An object to import into the template as free variables.
+     * @param {RegExp} [options.interpolate=_.templateSettings.interpolate]
+     *  The "interpolate" delimiter.
+     * @param {string} [options.sourceURL='lodash.templateSources[n]']
+     *  The sourceURL of the compiled template.
+     * @param {string} [options.variable='obj']
+     *  The data object variable name.
+     * @param- {Object} [guard] Enables use as an iteratee for methods like `_.map`.
+     * @returns {Function} Returns the compiled template function.
+     * @example
+     *
+     * // Use the "interpolate" delimiter to create a compiled template.
+     * var compiled = _.template('hello <%= user %>!');
+     * compiled({ 'user': 'fred' });
+     * // => 'hello fred!'
+     *
+     * // Use the HTML "escape" delimiter to escape data property values.
+     * var compiled = _.template('<b><%- value %></b>');
+     * compiled({ 'value': '<script>' });
+     * // => '<b>&lt;script&gt;</b>'
+     *
+     * // Use the "evaluate" delimiter to execute JavaScript and generate HTML.
+     * var compiled = _.template('<% _.forEach(users, function(user) { %><li><%- user %></li><% }); %>');
+     * compiled({ 'users': ['fred', 'barney'] });
+     * // => '<li>fred</li><li>barney</li>'
+     *
+     * // Use the internal `print` function in "evaluate" delimiters.
+     * var compiled = _.template('<% print("hello " + user); %>!');
+     * compiled({ 'user': 'barney' });
+     * // => 'hello barney!'
+     *
+     * // Use the ES template literal delimiter as an "interpolate" delimiter.
+     * // Disable support by replacing the "interpolate" delimiter.
+     * var compiled = _.template('hello ${ user }!');
+     * compiled({ 'user': 'pebbles' });
+     * // => 'hello pebbles!'
+     *
+     * // Use backslashes to treat delimiters as plain text.
+     * var compiled = _.template('<%= "\\<%- value %\\>" %>');
+     * compiled({ 'value': 'ignored' });
+     * // => '<%- value %>'
+     *
+     * // Use the `imports` option to import `jQuery` as `jq`.
+     * var text = '<% jq.each(users, function(user) { %><li><%- user %></li><% }); %>';
+     * var compiled = _.template(text, { 'imports': { 'jq': jQuery } });
+     * compiled({ 'users': ['fred', 'barney'] });
+     * // => '<li>fred</li><li>barney</li>'
+     *
+     * // Use the `sourceURL` option to specify a custom sourceURL for the template.
+     * var compiled = _.template('hello <%= user %>!', { 'sourceURL': '/basic/greeting.jst' });
+     * compiled(data);
+     * // => Find the source of "greeting.jst" under the Sources tab or Resources panel of the web inspector.
+     *
+     * // Use the `variable` option to ensure a with-statement isn't used in the compiled template.
+     * var compiled = _.template('hi <%= data.user %>!', { 'variable': 'data' });
+     * compiled.source;
+     * // => function(data) {
+     * //   var __t, __p = '';
+     * //   __p += 'hi ' + ((__t = ( data.user )) == null ? '' : __t) + '!';
+     * //   return __p;
+     * // }
+     *
+     * // Use custom template delimiters.
+     * _.templateSettings.interpolate = /{{([\s\S]+?)}}/g;
+     * var compiled = _.template('hello {{ user }}!');
+     * compiled({ 'user': 'mustache' });
+     * // => 'hello mustache!'
+     *
+     * // Use the `source` property to inline compiled templates for meaningful
+     * // line numbers in error messages and stack traces.
+     * fs.writeFileSync(path.join(process.cwd(), 'jst.js'), '\
+     *   var JST = {\
+     *     "main": ' + _.template(mainText).source + '\
+     *   };\
+     * ');
+     */
+    function template(string, options, guard) {
+      // Based on John Resig's `tmpl` implementation
+      // (http://ejohn.org/blog/javascript-micro-templating/)
+      // and Laura Doktorova's doT.js (https://github.com/olado/doT).
+      var settings = lodash.templateSettings;
+
+      if (guard && isIterateeCall(string, options, guard)) {
+        options = undefined;
+      }
+      string = toString(string);
+      options = assignInWith({}, options, settings, customDefaultsAssignIn);
+
+      var imports = assignInWith({}, options.imports, settings.imports, customDefaultsAssignIn),
+          importsKeys = keys(imports),
+          importsValues = baseValues(imports, importsKeys);
+
+      var isEscaping,
+          isEvaluating,
+          index = 0,
+          interpolate = options.interpolate || reNoMatch,
+          source = "__p += '";
+
+      // Compile the regexp to match each delimiter.
+      var reDelimiters = RegExp(
+        (options.escape || reNoMatch).source + '|' +
+        interpolate.source + '|' +
+        (interpolate === reInterpolate ? reEsTemplate : reNoMatch).source + '|' +
+        (options.evaluate || reNoMatch).source + '|$'
+      , 'g');
+
+      // Use a sourceURL for easier debugging.
+      var sourceURL = '//# sourceURL=' +
+        ('sourceURL' in options
+          ? options.sourceURL
+          : ('lodash.templateSources[' + (++templateCounter) + ']')
+        ) + '\n';
+
+      string.replace(reDelimiters, function(match, escapeValue, interpolateValue, esTemplateValue, evaluateValue, offset) {
+        interpolateValue || (interpolateValue = esTemplateValue);
+
+        // Escape characters that can't be included in string literals.
+        source += string.slice(index, offset).replace(reUnescapedString, escapeStringChar);
+
+        // Replace delimiters with snippets.
+        if (escapeValue) {
+          isEscaping = true;
+          source += "' +\n__e(" + escapeValue + ") +\n'";
+        }
+        if (evaluateValue) {
+          isEvaluating = true;
+          source += "';\n" + evaluateValue + ";\n__p += '";
+        }
+        if (interpolateValue) {
+          source += "' +\n((__t = (" + interpolateValue + ")) == null ? '' : __t) +\n'";
+        }
+        index = offset + match.length;
+
+        // The JS engine embedded in Adobe products needs `match` returned in
+        // order to produce the correct `offset` value.
+        return match;
+      });
+
+      source += "';\n";
+
+      // If `variable` is not specified wrap a with-statement around the generated
+      // code to add the data object to the top of the scope chain.
+      var variable = options.variable;
+      if (!variable) {
+        source = 'with (obj) {\n' + source + '\n}\n';
+      }
+      // Cleanup code by stripping empty strings.
+      source = (isEvaluating ? source.replace(reEmptyStringLeading, '') : source)
+        .replace(reEmptyStringMiddle, '$1')
+        .replace(reEmptyStringTrailing, '$1;');
+
+      // Frame code as the function body.
+      source = 'function(' + (variable || 'obj') + ') {\n' +
+        (variable
+          ? ''
+          : 'obj || (obj = {});\n'
+        ) +
+        "var __t, __p = ''" +
+        (isEscaping
+           ? ', __e = _.escape'
+           : ''
+        ) +
+        (isEvaluating
+          ? ', __j = Array.prototype.join;\n' +
+            "function print() { __p += __j.call(arguments, '') }\n"
+          : ';\n'
+        ) +
+        source +
+        'return __p\n}';
+
+      var result = attempt(function() {
+        return Function(importsKeys, sourceURL + 'return ' + source)
+          .apply(undefined, importsValues);
+      });
+
+      // Provide the compiled function's source by its `toString` method or
+      // the `source` property as a convenience for inlining compiled templates.
+      result.source = source;
+      if (isError(result)) {
+        throw result;
+      }
+      return result;
+    }
+
+    /**
+     * Converts `string`, as a whole, to lower case just like
+     * [String#toLowerCase](https://mdn.io/toLowerCase).
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category String
+     * @param {string} [string=''] The string to convert.
+     * @returns {string} Returns the lower cased string.
+     * @example
+     *
+     * _.toLower('--Foo-Bar--');
+     * // => '--foo-bar--'
+     *
+     * _.toLower('fooBar');
+     * // => 'foobar'
+     *
+     * _.toLower('__FOO_BAR__');
+     * // => '__foo_bar__'
+     */
+    function toLower(value) {
+      return toString(value).toLowerCase();
+    }
+
+    /**
+     * Converts `string`, as a whole, to upper case just like
+     * [String#toUpperCase](https://mdn.io/toUpperCase).
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category String
+     * @param {string} [string=''] The string to convert.
+     * @returns {string} Returns the upper cased string.
+     * @example
+     *
+     * _.toUpper('--foo-bar--');
+     * // => '--FOO-BAR--'
+     *
+     * _.toUpper('fooBar');
+     * // => 'FOOBAR'
+     *
+     * _.toUpper('__foo_bar__');
+     * // => '__FOO_BAR__'
+     */
+    function toUpper(value) {
+      return toString(value).toUpperCase();
+    }
+
+    /**
+     * Removes leading and trailing whitespace or specified characters from `string`.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.0.0
+     * @category String
+     * @param {string} [string=''] The string to trim.
+     * @param {string} [chars=whitespace] The characters to trim.
+     * @param- {Object} [guard] Enables use as an iteratee for methods like `_.map`.
+     * @returns {string} Returns the trimmed string.
+     * @example
+     *
+     * _.trim('  abc  ');
+     * // => 'abc'
+     *
+     * _.trim('-_-abc-_-', '_-');
+     * // => 'abc'
+     *
+     * _.map(['  foo  ', '  bar  '], _.trim);
+     * // => ['foo', 'bar']
+     */
+    function trim(string, chars, guard) {
+      string = toString(string);
+      if (string && (guard || chars === undefined)) {
+        return string.replace(reTrim, '');
+      }
+      if (!string || !(chars = baseToString(chars))) {
+        return string;
+      }
+      var strSymbols = stringToArray(string),
+          chrSymbols = stringToArray(chars),
+          start = charsStartIndex(strSymbols, chrSymbols),
+          end = charsEndIndex(strSymbols, chrSymbols) + 1;
+
+      return castSlice(strSymbols, start, end).join('');
+    }
+
+    /**
+     * Removes trailing whitespace or specified characters from `string`.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category String
+     * @param {string} [string=''] The string to trim.
+     * @param {string} [chars=whitespace] The characters to trim.
+     * @param- {Object} [guard] Enables use as an iteratee for methods like `_.map`.
+     * @returns {string} Returns the trimmed string.
+     * @example
+     *
+     * _.trimEnd('  abc  ');
+     * // => '  abc'
+     *
+     * _.trimEnd('-_-abc-_-', '_-');
+     * // => '-_-abc'
+     */
+    function trimEnd(string, chars, guard) {
+      string = toString(string);
+      if (string && (guard || chars === undefined)) {
+        return string.replace(reTrimEnd, '');
+      }
+      if (!string || !(chars = baseToString(chars))) {
+        return string;
+      }
+      var strSymbols = stringToArray(string),
+          end = charsEndIndex(strSymbols, stringToArray(chars)) + 1;
+
+      return castSlice(strSymbols, 0, end).join('');
+    }
+
+    /**
+     * Removes leading whitespace or specified characters from `string`.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category String
+     * @param {string} [string=''] The string to trim.
+     * @param {string} [chars=whitespace] The characters to trim.
+     * @param- {Object} [guard] Enables use as an iteratee for methods like `_.map`.
+     * @returns {string} Returns the trimmed string.
+     * @example
+     *
+     * _.trimStart('  abc  ');
+     * // => 'abc  '
+     *
+     * _.trimStart('-_-abc-_-', '_-');
+     * // => 'abc-_-'
+     */
+    function trimStart(string, chars, guard) {
+      string = toString(string);
+      if (string && (guard || chars === undefined)) {
+        return string.replace(reTrimStart, '');
+      }
+      if (!string || !(chars = baseToString(chars))) {
+        return string;
+      }
+      var strSymbols = stringToArray(string),
+          start = charsStartIndex(strSymbols, stringToArray(chars));
+
+      return castSlice(strSymbols, start).join('');
+    }
+
+    /**
+     * Truncates `string` if it's longer than the given maximum string length.
+     * The last characters of the truncated string are replaced with the omission
+     * string which defaults to "...".
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category String
+     * @param {string} [string=''] The string to truncate.
+     * @param {Object} [options={}] The options object.
+     * @param {number} [options.length=30] The maximum string length.
+     * @param {string} [options.omission='...'] The string to indicate text is omitted.
+     * @param {RegExp|string} [options.separator] The separator pattern to truncate to.
+     * @returns {string} Returns the truncated string.
+     * @example
+     *
+     * _.truncate('hi-diddly-ho there, neighborino');
+     * // => 'hi-diddly-ho there, neighbo...'
+     *
+     * _.truncate('hi-diddly-ho there, neighborino', {
+     *   'length': 24,
+     *   'separator': ' '
+     * });
+     * // => 'hi-diddly-ho there,...'
+     *
+     * _.truncate('hi-diddly-ho there, neighborino', {
+     *   'length': 24,
+     *   'separator': /,? +/
+     * });
+     * // => 'hi-diddly-ho there...'
+     *
+     * _.truncate('hi-diddly-ho there, neighborino', {
+     *   'omission': ' [...]'
+     * });
+     * // => 'hi-diddly-ho there, neig [...]'
+     */
+    function truncate(string, options) {
+      var length = DEFAULT_TRUNC_LENGTH,
+          omission = DEFAULT_TRUNC_OMISSION;
+
+      if (isObject(options)) {
+        var separator = 'separator' in options ? options.separator : separator;
+        length = 'length' in options ? toInteger(options.length) : length;
+        omission = 'omission' in options ? baseToString(options.omission) : omission;
+      }
+      string = toString(string);
+
+      var strLength = string.length;
+      if (hasUnicode(string)) {
+        var strSymbols = stringToArray(string);
+        strLength = strSymbols.length;
+      }
+      if (length >= strLength) {
+        return string;
+      }
+      var end = length - stringSize(omission);
+      if (end < 1) {
+        return omission;
+      }
+      var result = strSymbols
+        ? castSlice(strSymbols, 0, end).join('')
+        : string.slice(0, end);
+
+      if (separator === undefined) {
+        return result + omission;
+      }
+      if (strSymbols) {
+        end += (result.length - end);
+      }
+      if (isRegExp(separator)) {
+        if (string.slice(end).search(separator)) {
+          var match,
+              substring = result;
+
+          if (!separator.global) {
+            separator = RegExp(separator.source, toString(reFlags.exec(separator)) + 'g');
+          }
+          separator.lastIndex = 0;
+          while ((match = separator.exec(substring))) {
+            var newEnd = match.index;
+          }
+          result = result.slice(0, newEnd === undefined ? end : newEnd);
+        }
+      } else if (string.indexOf(baseToString(separator), end) != end) {
+        var index = result.lastIndexOf(separator);
+        if (index > -1) {
+          result = result.slice(0, index);
+        }
+      }
+      return result + omission;
+    }
+
+    /**
+     * The inverse of `_.escape`; this method converts the HTML entities
+     * `&amp;`, `&lt;`, `&gt;`, `&quot;`, and `&#39;` in `string` to
+     * their corresponding characters.
+     *
+     * **Note:** No other HTML entities are unescaped. To unescape additional
+     * HTML entities use a third-party library like [_he_](https://mths.be/he).
+     *
+     * @static
+     * @memberOf _
+     * @since 0.6.0
+     * @category String
+     * @param {string} [string=''] The string to unescape.
+     * @returns {string} Returns the unescaped string.
+     * @example
+     *
+     * _.unescape('fred, barney, &amp; pebbles');
+     * // => 'fred, barney, & pebbles'
+     */
+    function unescape(string) {
+      string = toString(string);
+      return (string && reHasEscapedHtml.test(string))
+        ? string.replace(reEscapedHtml, unescapeHtmlChar)
+        : string;
+    }
+
+    /**
+     * Converts `string`, as space separated words, to upper case.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category String
+     * @param {string} [string=''] The string to convert.
+     * @returns {string} Returns the upper cased string.
+     * @example
+     *
+     * _.upperCase('--foo-bar');
+     * // => 'FOO BAR'
+     *
+     * _.upperCase('fooBar');
+     * // => 'FOO BAR'
+     *
+     * _.upperCase('__foo_bar__');
+     * // => 'FOO BAR'
+     */
+    var upperCase = createCompounder(function(result, word, index) {
+      return result + (index ? ' ' : '') + word.toUpperCase();
+    });
+
+    /**
+     * Converts the first character of `string` to upper case.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category String
+     * @param {string} [string=''] The string to convert.
+     * @returns {string} Returns the converted string.
+     * @example
+     *
+     * _.upperFirst('fred');
+     * // => 'Fred'
+     *
+     * _.upperFirst('FRED');
+     * // => 'FRED'
+     */
+    var upperFirst = createCaseFirst('toUpperCase');
+
+    /**
+     * Splits `string` into an array of its words.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.0.0
+     * @category String
+     * @param {string} [string=''] The string to inspect.
+     * @param {RegExp|string} [pattern] The pattern to match words.
+     * @param- {Object} [guard] Enables use as an iteratee for methods like `_.map`.
+     * @returns {Array} Returns the words of `string`.
+     * @example
+     *
+     * _.words('fred, barney, & pebbles');
+     * // => ['fred', 'barney', 'pebbles']
+     *
+     * _.words('fred, barney, & pebbles', /[^, ]+/g);
+     * // => ['fred', 'barney', '&', 'pebbles']
+     */
+    function words(string, pattern, guard) {
+      string = toString(string);
+      pattern = guard ? undefined : pattern;
+
+      if (pattern === undefined) {
+        return hasUnicodeWord(string) ? unicodeWords(string) : asciiWords(string);
+      }
+      return string.match(pattern) || [];
+    }
+
+    /*------------------------------------------------------------------------*/
+
+    /**
+     * Attempts to invoke `func`, returning either the result or the caught error
+     * object. Any additional arguments are provided to `func` when it's invoked.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.0.0
+     * @category Util
+     * @param {Function} func The function to attempt.
+     * @param {...*} [args] The arguments to invoke `func` with.
+     * @returns {*} Returns the `func` result or error object.
+     * @example
+     *
+     * // Avoid throwing errors for invalid selectors.
+     * var elements = _.attempt(function(selector) {
+     *   return document.querySelectorAll(selector);
+     * }, '>_>');
+     *
+     * if (_.isError(elements)) {
+     *   elements = [];
+     * }
+     */
+    var attempt = baseRest(function(func, args) {
+      try {
+        return apply(func, undefined, args);
+      } catch (e) {
+        return isError(e) ? e : new Error(e);
+      }
+    });
+
+    /**
+     * Binds methods of an object to the object itself, overwriting the existing
+     * method.
+     *
+     * **Note:** This method doesn't set the "length" property of bound functions.
+     *
+     * @static
+     * @since 0.1.0
+     * @memberOf _
+     * @category Util
+     * @param {Object} object The object to bind and assign the bound methods to.
+     * @param {...(string|string[])} methodNames The object method names to bind.
+     * @returns {Object} Returns `object`.
+     * @example
+     *
+     * var view = {
+     *   'label': 'docs',
+     *   'click': function() {
+     *     console.log('clicked ' + this.label);
+     *   }
+     * };
+     *
+     * _.bindAll(view, ['click']);
+     * jQuery(element).on('click', view.click);
+     * // => Logs 'clicked docs' when clicked.
+     */
+    var bindAll = flatRest(function(object, methodNames) {
+      arrayEach(methodNames, function(key) {
+        key = toKey(key);
+        baseAssignValue(object, key, bind(object[key], object));
+      });
+      return object;
+    });
+
+    /**
+     * Creates a function that iterates over `pairs` and invokes the corresponding
+     * function of the first predicate to return truthy. The predicate-function
+     * pairs are invoked with the `this` binding and arguments of the created
+     * function.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Util
+     * @param {Array} pairs The predicate-function pairs.
+     * @returns {Function} Returns the new composite function.
+     * @example
+     *
+     * var func = _.cond([
+     *   [_.matches({ 'a': 1 }),           _.constant('matches A')],
+     *   [_.conforms({ 'b': _.isNumber }), _.constant('matches B')],
+     *   [_.stubTrue,                      _.constant('no match')]
+     * ]);
+     *
+     * func({ 'a': 1, 'b': 2 });
+     * // => 'matches A'
+     *
+     * func({ 'a': 0, 'b': 1 });
+     * // => 'matches B'
+     *
+     * func({ 'a': '1', 'b': '2' });
+     * // => 'no match'
+     */
+    function cond(pairs) {
+      var length = pairs == null ? 0 : pairs.length,
+          toIteratee = getIteratee();
+
+      pairs = !length ? [] : arrayMap(pairs, function(pair) {
+        if (typeof pair[1] != 'function') {
+          throw new TypeError(FUNC_ERROR_TEXT);
+        }
+        return [toIteratee(pair[0]), pair[1]];
+      });
+
+      return baseRest(function(args) {
+        var index = -1;
+        while (++index < length) {
+          var pair = pairs[index];
+          if (apply(pair[0], this, args)) {
+            return apply(pair[1], this, args);
+          }
+        }
+      });
+    }
+
+    /**
+     * Creates a function that invokes the predicate properties of `source` with
+     * the corresponding property values of a given object, returning `true` if
+     * all predicates return truthy, else `false`.
+     *
+     * **Note:** The created function is equivalent to `_.conformsTo` with
+     * `source` partially applied.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Util
+     * @param {Object} source The object of property predicates to conform to.
+     * @returns {Function} Returns the new spec function.
+     * @example
+     *
+     * var objects = [
+     *   { 'a': 2, 'b': 1 },
+     *   { 'a': 1, 'b': 2 }
+     * ];
+     *
+     * _.filter(objects, _.conforms({ 'b': function(n) { return n > 1; } }));
+     * // => [{ 'a': 1, 'b': 2 }]
+     */
+    function conforms(source) {
+      return baseConforms(baseClone(source, CLONE_DEEP_FLAG));
+    }
+
+    /**
+     * Creates a function that returns `value`.
+     *
+     * @static
+     * @memberOf _
+     * @since 2.4.0
+     * @category Util
+     * @param {*} value The value to return from the new function.
+     * @returns {Function} Returns the new constant function.
+     * @example
+     *
+     * var objects = _.times(2, _.constant({ 'a': 1 }));
+     *
+     * console.log(objects);
+     * // => [{ 'a': 1 }, { 'a': 1 }]
+     *
+     * console.log(objects[0] === objects[1]);
+     * // => true
+     */
+    function constant(value) {
+      return function() {
+        return value;
+      };
+    }
+
+    /**
+     * Checks `value` to determine whether a default value should be returned in
+     * its place. The `defaultValue` is returned if `value` is `NaN`, `null`,
+     * or `undefined`.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.14.0
+     * @category Util
+     * @param {*} value The value to check.
+     * @param {*} defaultValue The default value.
+     * @returns {*} Returns the resolved value.
+     * @example
+     *
+     * _.defaultTo(1, 10);
+     * // => 1
+     *
+     * _.defaultTo(undefined, 10);
+     * // => 10
+     */
+    function defaultTo(value, defaultValue) {
+      return (value == null || value !== value) ? defaultValue : value;
+    }
+
+    /**
+     * Creates a function that returns the result of invoking the given functions
+     * with the `this` binding of the created function, where each successive
+     * invocation is supplied the return value of the previous.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.0.0
+     * @category Util
+     * @param {...(Function|Function[])} [funcs] The functions to invoke.
+     * @returns {Function} Returns the new composite function.
+     * @see _.flowRight
+     * @example
+     *
+     * function square(n) {
+     *   return n * n;
+     * }
+     *
+     * var addSquare = _.flow([_.add, square]);
+     * addSquare(1, 2);
+     * // => 9
+     */
+    var flow = createFlow();
+
+    /**
+     * This method is like `_.flow` except that it creates a function that
+     * invokes the given functions from right to left.
+     *
+     * @static
+     * @since 3.0.0
+     * @memberOf _
+     * @category Util
+     * @param {...(Function|Function[])} [funcs] The functions to invoke.
+     * @returns {Function} Returns the new composite function.
+     * @see _.flow
+     * @example
+     *
+     * function square(n) {
+     *   return n * n;
+     * }
+     *
+     * var addSquare = _.flowRight([square, _.add]);
+     * addSquare(1, 2);
+     * // => 9
+     */
+    var flowRight = createFlow(true);
+
+    /**
+     * This method returns the first argument it receives.
+     *
+     * @static
+     * @since 0.1.0
+     * @memberOf _
+     * @category Util
+     * @param {*} value Any value.
+     * @returns {*} Returns `value`.
+     * @example
+     *
+     * var object = { 'a': 1 };
+     *
+     * console.log(_.identity(object) === object);
+     * // => true
+     */
+    function identity(value) {
+      return value;
+    }
+
+    /**
+     * Creates a function that invokes `func` with the arguments of the created
+     * function. If `func` is a property name, the created function returns the
+     * property value for a given element. If `func` is an array or object, the
+     * created function returns `true` for elements that contain the equivalent
+     * source properties, otherwise it returns `false`.
+     *
+     * @static
+     * @since 4.0.0
+     * @memberOf _
+     * @category Util
+     * @param {*} [func=_.identity] The value to convert to a callback.
+     * @returns {Function} Returns the callback.
+     * @example
+     *
+     * var users = [
+     *   { 'user': 'barney', 'age': 36, 'active': true },
+     *   { 'user': 'fred',   'age': 40, 'active': false }
+     * ];
+     *
+     * // The `_.matches` iteratee shorthand.
+     * _.filter(users, _.iteratee({ 'user': 'barney', 'active': true }));
+     * // => [{ 'user': 'barney', 'age': 36, 'active': true }]
+     *
+     * // The `_.matchesProperty` iteratee shorthand.
+     * _.filter(users, _.iteratee(['user', 'fred']));
+     * // => [{ 'user': 'fred', 'age': 40 }]
+     *
+     * // The `_.property` iteratee shorthand.
+     * _.map(users, _.iteratee('user'));
+     * // => ['barney', 'fred']
+     *
+     * // Create custom iteratee shorthands.
+     * _.iteratee = _.wrap(_.iteratee, function(iteratee, func) {
+     *   return !_.isRegExp(func) ? iteratee(func) : function(string) {
+     *     return func.test(string);
+     *   };
+     * });
+     *
+     * _.filter(['abc', 'def'], /ef/);
+     * // => ['def']
+     */
+    function iteratee(func) {
+      return baseIteratee(typeof func == 'function' ? func : baseClone(func, CLONE_DEEP_FLAG));
+    }
+
+    /**
+     * Creates a function that performs a partial deep comparison between a given
+     * object and `source`, returning `true` if the given object has equivalent
+     * property values, else `false`.
+     *
+     * **Note:** The created function is equivalent to `_.isMatch` with `source`
+     * partially applied.
+     *
+     * Partial comparisons will match empty array and empty object `source`
+     * values against any array or object value, respectively. See `_.isEqual`
+     * for a list of supported value comparisons.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.0.0
+     * @category Util
+     * @param {Object} source The object of property values to match.
+     * @returns {Function} Returns the new spec function.
+     * @example
+     *
+     * var objects = [
+     *   { 'a': 1, 'b': 2, 'c': 3 },
+     *   { 'a': 4, 'b': 5, 'c': 6 }
+     * ];
+     *
+     * _.filter(objects, _.matches({ 'a': 4, 'c': 6 }));
+     * // => [{ 'a': 4, 'b': 5, 'c': 6 }]
+     */
+    function matches(source) {
+      return baseMatches(baseClone(source, CLONE_DEEP_FLAG));
+    }
+
+    /**
+     * Creates a function that performs a partial deep comparison between the
+     * value at `path` of a given object to `srcValue`, returning `true` if the
+     * object value is equivalent, else `false`.
+     *
+     * **Note:** Partial comparisons will match empty array and empty object
+     * `srcValue` values against any array or object value, respectively. See
+     * `_.isEqual` for a list of supported value comparisons.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.2.0
+     * @category Util
+     * @param {Array|string} path The path of the property to get.
+     * @param {*} srcValue The value to match.
+     * @returns {Function} Returns the new spec function.
+     * @example
+     *
+     * var objects = [
+     *   { 'a': 1, 'b': 2, 'c': 3 },
+     *   { 'a': 4, 'b': 5, 'c': 6 }
+     * ];
+     *
+     * _.find(objects, _.matchesProperty('a', 4));
+     * // => { 'a': 4, 'b': 5, 'c': 6 }
+     */
+    function matchesProperty(path, srcValue) {
+      return baseMatchesProperty(path, baseClone(srcValue, CLONE_DEEP_FLAG));
+    }
+
+    /**
+     * Creates a function that invokes the method at `path` of a given object.
+     * Any additional arguments are provided to the invoked method.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.7.0
+     * @category Util
+     * @param {Array|string} path The path of the method to invoke.
+     * @param {...*} [args] The arguments to invoke the method with.
+     * @returns {Function} Returns the new invoker function.
+     * @example
+     *
+     * var objects = [
+     *   { 'a': { 'b': _.constant(2) } },
+     *   { 'a': { 'b': _.constant(1) } }
+     * ];
+     *
+     * _.map(objects, _.method('a.b'));
+     * // => [2, 1]
+     *
+     * _.map(objects, _.method(['a', 'b']));
+     * // => [2, 1]
+     */
+    var method = baseRest(function(path, args) {
+      return function(object) {
+        return baseInvoke(object, path, args);
+      };
+    });
+
+    /**
+     * The opposite of `_.method`; this method creates a function that invokes
+     * the method at a given path of `object`. Any additional arguments are
+     * provided to the invoked method.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.7.0
+     * @category Util
+     * @param {Object} object The object to query.
+     * @param {...*} [args] The arguments to invoke the method with.
+     * @returns {Function} Returns the new invoker function.
+     * @example
+     *
+     * var array = _.times(3, _.constant),
+     *     object = { 'a': array, 'b': array, 'c': array };
+     *
+     * _.map(['a[2]', 'c[0]'], _.methodOf(object));
+     * // => [2, 0]
+     *
+     * _.map([['a', '2'], ['c', '0']], _.methodOf(object));
+     * // => [2, 0]
+     */
+    var methodOf = baseRest(function(object, args) {
+      return function(path) {
+        return baseInvoke(object, path, args);
+      };
+    });
+
+    /**
+     * Adds all own enumerable string keyed function properties of a source
+     * object to the destination object. If `object` is a function, then methods
+     * are added to its prototype as well.
+     *
+     * **Note:** Use `_.runInContext` to create a pristine `lodash` function to
+     * avoid conflicts caused by modifying the original.
+     *
+     * @static
+     * @since 0.1.0
+     * @memberOf _
+     * @category Util
+     * @param {Function|Object} [object=lodash] The destination object.
+     * @param {Object} source The object of functions to add.
+     * @param {Object} [options={}] The options object.
+     * @param {boolean} [options.chain=true] Specify whether mixins are chainable.
+     * @returns {Function|Object} Returns `object`.
+     * @example
+     *
+     * function vowels(string) {
+     *   return _.filter(string, function(v) {
+     *     return /[aeiou]/i.test(v);
+     *   });
+     * }
+     *
+     * _.mixin({ 'vowels': vowels });
+     * _.vowels('fred');
+     * // => ['e']
+     *
+     * _('fred').vowels().value();
+     * // => ['e']
+     *
+     * _.mixin({ 'vowels': vowels }, { 'chain': false });
+     * _('fred').vowels();
+     * // => ['e']
+     */
+    function mixin(object, source, options) {
+      var props = keys(source),
+          methodNames = baseFunctions(source, props);
+
+      if (options == null &&
+          !(isObject(source) && (methodNames.length || !props.length))) {
+        options = source;
+        source = object;
+        object = this;
+        methodNames = baseFunctions(source, keys(source));
+      }
+      var chain = !(isObject(options) && 'chain' in options) || !!options.chain,
+          isFunc = isFunction(object);
+
+      arrayEach(methodNames, function(methodName) {
+        var func = source[methodName];
+        object[methodName] = func;
+        if (isFunc) {
+          object.prototype[methodName] = function() {
+            var chainAll = this.__chain__;
+            if (chain || chainAll) {
+              var result = object(this.__wrapped__),
+                  actions = result.__actions__ = copyArray(this.__actions__);
+
+              actions.push({ 'func': func, 'args': arguments, 'thisArg': object });
+              result.__chain__ = chainAll;
+              return result;
+            }
+            return func.apply(object, arrayPush([this.value()], arguments));
+          };
+        }
+      });
+
+      return object;
+    }
+
+    /**
+     * Reverts the `_` variable to its previous value and returns a reference to
+     * the `lodash` function.
+     *
+     * @static
+     * @since 0.1.0
+     * @memberOf _
+     * @category Util
+     * @returns {Function} Returns the `lodash` function.
+     * @example
+     *
+     * var lodash = _.noConflict();
+     */
+    function noConflict() {
+      if (root._ === this) {
+        root._ = oldDash;
+      }
+      return this;
+    }
+
+    /**
+     * This method returns `undefined`.
+     *
+     * @static
+     * @memberOf _
+     * @since 2.3.0
+     * @category Util
+     * @example
+     *
+     * _.times(2, _.noop);
+     * // => [undefined, undefined]
+     */
+    function noop() {
+      // No operation performed.
+    }
+
+    /**
+     * Creates a function that gets the argument at index `n`. If `n` is negative,
+     * the nth argument from the end is returned.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Util
+     * @param {number} [n=0] The index of the argument to return.
+     * @returns {Function} Returns the new pass-thru function.
+     * @example
+     *
+     * var func = _.nthArg(1);
+     * func('a', 'b', 'c', 'd');
+     * // => 'b'
+     *
+     * var func = _.nthArg(-2);
+     * func('a', 'b', 'c', 'd');
+     * // => 'c'
+     */
+    function nthArg(n) {
+      n = toInteger(n);
+      return baseRest(function(args) {
+        return baseNth(args, n);
+      });
+    }
+
+    /**
+     * Creates a function that invokes `iteratees` with the arguments it receives
+     * and returns their results.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Util
+     * @param {...(Function|Function[])} [iteratees=[_.identity]]
+     *  The iteratees to invoke.
+     * @returns {Function} Returns the new function.
+     * @example
+     *
+     * var func = _.over([Math.max, Math.min]);
+     *
+     * func(1, 2, 3, 4);
+     * // => [4, 1]
+     */
+    var over = createOver(arrayMap);
+
+    /**
+     * Creates a function that checks if **all** of the `predicates` return
+     * truthy when invoked with the arguments it receives.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Util
+     * @param {...(Function|Function[])} [predicates=[_.identity]]
+     *  The predicates to check.
+     * @returns {Function} Returns the new function.
+     * @example
+     *
+     * var func = _.overEvery([Boolean, isFinite]);
+     *
+     * func('1');
+     * // => true
+     *
+     * func(null);
+     * // => false
+     *
+     * func(NaN);
+     * // => false
+     */
+    var overEvery = createOver(arrayEvery);
+
+    /**
+     * Creates a function that checks if **any** of the `predicates` return
+     * truthy when invoked with the arguments it receives.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Util
+     * @param {...(Function|Function[])} [predicates=[_.identity]]
+     *  The predicates to check.
+     * @returns {Function} Returns the new function.
+     * @example
+     *
+     * var func = _.overSome([Boolean, isFinite]);
+     *
+     * func('1');
+     * // => true
+     *
+     * func(null);
+     * // => true
+     *
+     * func(NaN);
+     * // => false
+     */
+    var overSome = createOver(arraySome);
+
+    /**
+     * Creates a function that returns the value at `path` of a given object.
+     *
+     * @static
+     * @memberOf _
+     * @since 2.4.0
+     * @category Util
+     * @param {Array|string} path The path of the property to get.
+     * @returns {Function} Returns the new accessor function.
+     * @example
+     *
+     * var objects = [
+     *   { 'a': { 'b': 2 } },
+     *   { 'a': { 'b': 1 } }
+     * ];
+     *
+     * _.map(objects, _.property('a.b'));
+     * // => [2, 1]
+     *
+     * _.map(_.sortBy(objects, _.property(['a', 'b'])), 'a.b');
+     * // => [1, 2]
+     */
+    function property(path) {
+      return isKey(path) ? baseProperty(toKey(path)) : basePropertyDeep(path);
+    }
+
+    /**
+     * The opposite of `_.property`; this method creates a function that returns
+     * the value at a given path of `object`.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.0.0
+     * @category Util
+     * @param {Object} object The object to query.
+     * @returns {Function} Returns the new accessor function.
+     * @example
+     *
+     * var array = [0, 1, 2],
+     *     object = { 'a': array, 'b': array, 'c': array };
+     *
+     * _.map(['a[2]', 'c[0]'], _.propertyOf(object));
+     * // => [2, 0]
+     *
+     * _.map([['a', '2'], ['c', '0']], _.propertyOf(object));
+     * // => [2, 0]
+     */
+    function propertyOf(object) {
+      return function(path) {
+        return object == null ? undefined : baseGet(object, path);
+      };
+    }
+
+    /**
+     * Creates an array of numbers (positive and/or negative) progressing from
+     * `start` up to, but not including, `end`. A step of `-1` is used if a negative
+     * `start` is specified without an `end` or `step`. If `end` is not specified,
+     * it's set to `start` with `start` then set to `0`.
+     *
+     * **Note:** JavaScript follows the IEEE-754 standard for resolving
+     * floating-point values which can produce unexpected results.
+     *
+     * @static
+     * @since 0.1.0
+     * @memberOf _
+     * @category Util
+     * @param {number} [start=0] The start of the range.
+     * @param {number} end The end of the range.
+     * @param {number} [step=1] The value to increment or decrement by.
+     * @returns {Array} Returns the range of numbers.
+     * @see _.inRange, _.rangeRight
+     * @example
+     *
+     * _.range(4);
+     * // => [0, 1, 2, 3]
+     *
+     * _.range(-4);
+     * // => [0, -1, -2, -3]
+     *
+     * _.range(1, 5);
+     * // => [1, 2, 3, 4]
+     *
+     * _.range(0, 20, 5);
+     * // => [0, 5, 10, 15]
+     *
+     * _.range(0, -4, -1);
+     * // => [0, -1, -2, -3]
+     *
+     * _.range(1, 4, 0);
+     * // => [1, 1, 1]
+     *
+     * _.range(0);
+     * // => []
+     */
+    var range = createRange();
+
+    /**
+     * This method is like `_.range` except that it populates values in
+     * descending order.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Util
+     * @param {number} [start=0] The start of the range.
+     * @param {number} end The end of the range.
+     * @param {number} [step=1] The value to increment or decrement by.
+     * @returns {Array} Returns the range of numbers.
+     * @see _.inRange, _.range
+     * @example
+     *
+     * _.rangeRight(4);
+     * // => [3, 2, 1, 0]
+     *
+     * _.rangeRight(-4);
+     * // => [-3, -2, -1, 0]
+     *
+     * _.rangeRight(1, 5);
+     * // => [4, 3, 2, 1]
+     *
+     * _.rangeRight(0, 20, 5);
+     * // => [15, 10, 5, 0]
+     *
+     * _.rangeRight(0, -4, -1);
+     * // => [-3, -2, -1, 0]
+     *
+     * _.rangeRight(1, 4, 0);
+     * // => [1, 1, 1]
+     *
+     * _.rangeRight(0);
+     * // => []
+     */
+    var rangeRight = createRange(true);
+
+    /**
+     * This method returns a new empty array.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.13.0
+     * @category Util
+     * @returns {Array} Returns the new empty array.
+     * @example
+     *
+     * var arrays = _.times(2, _.stubArray);
+     *
+     * console.log(arrays);
+     * // => [[], []]
+     *
+     * console.log(arrays[0] === arrays[1]);
+     * // => false
+     */
+    function stubArray() {
+      return [];
+    }
+
+    /**
+     * This method returns `false`.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.13.0
+     * @category Util
+     * @returns {boolean} Returns `false`.
+     * @example
+     *
+     * _.times(2, _.stubFalse);
+     * // => [false, false]
+     */
+    function stubFalse() {
+      return false;
+    }
+
+    /**
+     * This method returns a new empty object.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.13.0
+     * @category Util
+     * @returns {Object} Returns the new empty object.
+     * @example
+     *
+     * var objects = _.times(2, _.stubObject);
+     *
+     * console.log(objects);
+     * // => [{}, {}]
+     *
+     * console.log(objects[0] === objects[1]);
+     * // => false
+     */
+    function stubObject() {
+      return {};
+    }
+
+    /**
+     * This method returns an empty string.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.13.0
+     * @category Util
+     * @returns {string} Returns the empty string.
+     * @example
+     *
+     * _.times(2, _.stubString);
+     * // => ['', '']
+     */
+    function stubString() {
+      return '';
+    }
+
+    /**
+     * This method returns `true`.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.13.0
+     * @category Util
+     * @returns {boolean} Returns `true`.
+     * @example
+     *
+     * _.times(2, _.stubTrue);
+     * // => [true, true]
+     */
+    function stubTrue() {
+      return true;
+    }
+
+    /**
+     * Invokes the iteratee `n` times, returning an array of the results of
+     * each invocation. The iteratee is invoked with one argument; (index).
+     *
+     * @static
+     * @since 0.1.0
+     * @memberOf _
+     * @category Util
+     * @param {number} n The number of times to invoke `iteratee`.
+     * @param {Function} [iteratee=_.identity] The function invoked per iteration.
+     * @returns {Array} Returns the array of results.
+     * @example
+     *
+     * _.times(3, String);
+     * // => ['0', '1', '2']
+     *
+     *  _.times(4, _.constant(0));
+     * // => [0, 0, 0, 0]
+     */
+    function times(n, iteratee) {
+      n = toInteger(n);
+      if (n < 1 || n > MAX_SAFE_INTEGER) {
+        return [];
+      }
+      var index = MAX_ARRAY_LENGTH,
+          length = nativeMin(n, MAX_ARRAY_LENGTH);
+
+      iteratee = getIteratee(iteratee);
+      n -= MAX_ARRAY_LENGTH;
+
+      var result = baseTimes(length, iteratee);
+      while (++index < n) {
+        iteratee(index);
+      }
+      return result;
+    }
+
+    /**
+     * Converts `value` to a property path array.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Util
+     * @param {*} value The value to convert.
+     * @returns {Array} Returns the new property path array.
+     * @example
+     *
+     * _.toPath('a.b.c');
+     * // => ['a', 'b', 'c']
+     *
+     * _.toPath('a[0].b.c');
+     * // => ['a', '0', 'b', 'c']
+     */
+    function toPath(value) {
+      if (isArray(value)) {
+        return arrayMap(value, toKey);
+      }
+      return isSymbol(value) ? [value] : copyArray(stringToPath(toString(value)));
+    }
+
+    /**
+     * Generates a unique ID. If `prefix` is given, the ID is appended to it.
+     *
+     * @static
+     * @since 0.1.0
+     * @memberOf _
+     * @category Util
+     * @param {string} [prefix=''] The value to prefix the ID with.
+     * @returns {string} Returns the unique ID.
+     * @example
+     *
+     * _.uniqueId('contact_');
+     * // => 'contact_104'
+     *
+     * _.uniqueId();
+     * // => '105'
+     */
+    function uniqueId(prefix) {
+      var id = ++idCounter;
+      return toString(prefix) + id;
+    }
+
+    /*------------------------------------------------------------------------*/
+
+    /**
+     * Adds two numbers.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.4.0
+     * @category Math
+     * @param {number} augend The first number in an addition.
+     * @param {number} addend The second number in an addition.
+     * @returns {number} Returns the total.
+     * @example
+     *
+     * _.add(6, 4);
+     * // => 10
+     */
+    var add = createMathOperation(function(augend, addend) {
+      return augend + addend;
+    }, 0);
+
+    /**
+     * Computes `number` rounded up to `precision`.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.10.0
+     * @category Math
+     * @param {number} number The number to round up.
+     * @param {number} [precision=0] The precision to round up to.
+     * @returns {number} Returns the rounded up number.
+     * @example
+     *
+     * _.ceil(4.006);
+     * // => 5
+     *
+     * _.ceil(6.004, 2);
+     * // => 6.01
+     *
+     * _.ceil(6040, -2);
+     * // => 6100
+     */
+    var ceil = createRound('ceil');
+
+    /**
+     * Divide two numbers.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.7.0
+     * @category Math
+     * @param {number} dividend The first number in a division.
+     * @param {number} divisor The second number in a division.
+     * @returns {number} Returns the quotient.
+     * @example
+     *
+     * _.divide(6, 4);
+     * // => 1.5
+     */
+    var divide = createMathOperation(function(dividend, divisor) {
+      return dividend / divisor;
+    }, 1);
+
+    /**
+     * Computes `number` rounded down to `precision`.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.10.0
+     * @category Math
+     * @param {number} number The number to round down.
+     * @param {number} [precision=0] The precision to round down to.
+     * @returns {number} Returns the rounded down number.
+     * @example
+     *
+     * _.floor(4.006);
+     * // => 4
+     *
+     * _.floor(0.046, 2);
+     * // => 0.04
+     *
+     * _.floor(4060, -2);
+     * // => 4000
+     */
+    var floor = createRound('floor');
+
+    /**
+     * Computes the maximum value of `array`. If `array` is empty or falsey,
+     * `undefined` is returned.
+     *
+     * @static
+     * @since 0.1.0
+     * @memberOf _
+     * @category Math
+     * @param {Array} array The array to iterate over.
+     * @returns {*} Returns the maximum value.
+     * @example
+     *
+     * _.max([4, 2, 8, 6]);
+     * // => 8
+     *
+     * _.max([]);
+     * // => undefined
+     */
+    function max(array) {
+      return (array && array.length)
+        ? baseExtremum(array, identity, baseGt)
+        : undefined;
+    }
+
+    /**
+     * This method is like `_.max` except that it accepts `iteratee` which is
+     * invoked for each element in `array` to generate the criterion by which
+     * the value is ranked. The iteratee is invoked with one argument: (value).
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Math
+     * @param {Array} array The array to iterate over.
+     * @param {Function} [iteratee=_.identity] The iteratee invoked per element.
+     * @returns {*} Returns the maximum value.
+     * @example
+     *
+     * var objects = [{ 'n': 1 }, { 'n': 2 }];
+     *
+     * _.maxBy(objects, function(o) { return o.n; });
+     * // => { 'n': 2 }
+     *
+     * // The `_.property` iteratee shorthand.
+     * _.maxBy(objects, 'n');
+     * // => { 'n': 2 }
+     */
+    function maxBy(array, iteratee) {
+      return (array && array.length)
+        ? baseExtremum(array, getIteratee(iteratee, 2), baseGt)
+        : undefined;
+    }
+
+    /**
+     * Computes the mean of the values in `array`.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Math
+     * @param {Array} array The array to iterate over.
+     * @returns {number} Returns the mean.
+     * @example
+     *
+     * _.mean([4, 2, 8, 6]);
+     * // => 5
+     */
+    function mean(array) {
+      return baseMean(array, identity);
+    }
+
+    /**
+     * This method is like `_.mean` except that it accepts `iteratee` which is
+     * invoked for each element in `array` to generate the value to be averaged.
+     * The iteratee is invoked with one argument: (value).
+     *
+     * @static
+     * @memberOf _
+     * @since 4.7.0
+     * @category Math
+     * @param {Array} array The array to iterate over.
+     * @param {Function} [iteratee=_.identity] The iteratee invoked per element.
+     * @returns {number} Returns the mean.
+     * @example
+     *
+     * var objects = [{ 'n': 4 }, { 'n': 2 }, { 'n': 8 }, { 'n': 6 }];
+     *
+     * _.meanBy(objects, function(o) { return o.n; });
+     * // => 5
+     *
+     * // The `_.property` iteratee shorthand.
+     * _.meanBy(objects, 'n');
+     * // => 5
+     */
+    function meanBy(array, iteratee) {
+      return baseMean(array, getIteratee(iteratee, 2));
+    }
+
+    /**
+     * Computes the minimum value of `array`. If `array` is empty or falsey,
+     * `undefined` is returned.
+     *
+     * @static
+     * @since 0.1.0
+     * @memberOf _
+     * @category Math
+     * @param {Array} array The array to iterate over.
+     * @returns {*} Returns the minimum value.
+     * @example
+     *
+     * _.min([4, 2, 8, 6]);
+     * // => 2
+     *
+     * _.min([]);
+     * // => undefined
+     */
+    function min(array) {
+      return (array && array.length)
+        ? baseExtremum(array, identity, baseLt)
+        : undefined;
+    }
+
+    /**
+     * This method is like `_.min` except that it accepts `iteratee` which is
+     * invoked for each element in `array` to generate the criterion by which
+     * the value is ranked. The iteratee is invoked with one argument: (value).
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Math
+     * @param {Array} array The array to iterate over.
+     * @param {Function} [iteratee=_.identity] The iteratee invoked per element.
+     * @returns {*} Returns the minimum value.
+     * @example
+     *
+     * var objects = [{ 'n': 1 }, { 'n': 2 }];
+     *
+     * _.minBy(objects, function(o) { return o.n; });
+     * // => { 'n': 1 }
+     *
+     * // The `_.property` iteratee shorthand.
+     * _.minBy(objects, 'n');
+     * // => { 'n': 1 }
+     */
+    function minBy(array, iteratee) {
+      return (array && array.length)
+        ? baseExtremum(array, getIteratee(iteratee, 2), baseLt)
+        : undefined;
+    }
+
+    /**
+     * Multiply two numbers.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.7.0
+     * @category Math
+     * @param {number} multiplier The first number in a multiplication.
+     * @param {number} multiplicand The second number in a multiplication.
+     * @returns {number} Returns the product.
+     * @example
+     *
+     * _.multiply(6, 4);
+     * // => 24
+     */
+    var multiply = createMathOperation(function(multiplier, multiplicand) {
+      return multiplier * multiplicand;
+    }, 1);
+
+    /**
+     * Computes `number` rounded to `precision`.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.10.0
+     * @category Math
+     * @param {number} number The number to round.
+     * @param {number} [precision=0] The precision to round to.
+     * @returns {number} Returns the rounded number.
+     * @example
+     *
+     * _.round(4.006);
+     * // => 4
+     *
+     * _.round(4.006, 2);
+     * // => 4.01
+     *
+     * _.round(4060, -2);
+     * // => 4100
+     */
+    var round = createRound('round');
+
+    /**
+     * Subtract two numbers.
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Math
+     * @param {number} minuend The first number in a subtraction.
+     * @param {number} subtrahend The second number in a subtraction.
+     * @returns {number} Returns the difference.
+     * @example
+     *
+     * _.subtract(6, 4);
+     * // => 2
+     */
+    var subtract = createMathOperation(function(minuend, subtrahend) {
+      return minuend - subtrahend;
+    }, 0);
+
+    /**
+     * Computes the sum of the values in `array`.
+     *
+     * @static
+     * @memberOf _
+     * @since 3.4.0
+     * @category Math
+     * @param {Array} array The array to iterate over.
+     * @returns {number} Returns the sum.
+     * @example
+     *
+     * _.sum([4, 2, 8, 6]);
+     * // => 20
+     */
+    function sum(array) {
+      return (array && array.length)
+        ? baseSum(array, identity)
+        : 0;
+    }
+
+    /**
+     * This method is like `_.sum` except that it accepts `iteratee` which is
+     * invoked for each element in `array` to generate the value to be summed.
+     * The iteratee is invoked with one argument: (value).
+     *
+     * @static
+     * @memberOf _
+     * @since 4.0.0
+     * @category Math
+     * @param {Array} array The array to iterate over.
+     * @param {Function} [iteratee=_.identity] The iteratee invoked per element.
+     * @returns {number} Returns the sum.
+     * @example
+     *
+     * var objects = [{ 'n': 4 }, { 'n': 2 }, { 'n': 8 }, { 'n': 6 }];
+     *
+     * _.sumBy(objects, function(o) { return o.n; });
+     * // => 20
+     *
+     * // The `_.property` iteratee shorthand.
+     * _.sumBy(objects, 'n');
+     * // => 20
+     */
+    function sumBy(array, iteratee) {
+      return (array && array.length)
+        ? baseSum(array, getIteratee(iteratee, 2))
+        : 0;
+    }
+
+    /*------------------------------------------------------------------------*/
+
+    // Add methods that return wrapped values in chain sequences.
+    lodash.after = after;
+    lodash.ary = ary;
+    lodash.assign = assign;
+    lodash.assignIn = assignIn;
+    lodash.assignInWith = assignInWith;
+    lodash.assignWith = assignWith;
+    lodash.at = at;
+    lodash.before = before;
+    lodash.bind = bind;
+    lodash.bindAll = bindAll;
+    lodash.bindKey = bindKey;
+    lodash.castArray = castArray;
+    lodash.chain = chain;
+    lodash.chunk = chunk;
+    lodash.compact = compact;
+    lodash.concat = concat;
+    lodash.cond = cond;
+    lodash.conforms = conforms;
+    lodash.constant = constant;
+    lodash.countBy = countBy;
+    lodash.create = create;
+    lodash.curry = curry;
+    lodash.curryRight = curryRight;
+    lodash.debounce = debounce;
+    lodash.defaults = defaults;
+    lodash.defaultsDeep = defaultsDeep;
+    lodash.defer = defer;
+    lodash.delay = delay;
+    lodash.difference = difference;
+    lodash.differenceBy = differenceBy;
+    lodash.differenceWith = differenceWith;
+    lodash.drop = drop;
+    lodash.dropRight = dropRight;
+    lodash.dropRightWhile = dropRightWhile;
+    lodash.dropWhile = dropWhile;
+    lodash.fill = fill;
+    lodash.filter = filter;
+    lodash.flatMap = flatMap;
+    lodash.flatMapDeep = flatMapDeep;
+    lodash.flatMapDepth = flatMapDepth;
+    lodash.flatten = flatten;
+    lodash.flattenDeep = flattenDeep;
+    lodash.flattenDepth = flattenDepth;
+    lodash.flip = flip;
+    lodash.flow = flow;
+    lodash.flowRight = flowRight;
+    lodash.fromPairs = fromPairs;
+    lodash.functions = functions;
+    lodash.functionsIn = functionsIn;
+    lodash.groupBy = groupBy;
+    lodash.initial = initial;
+    lodash.intersection = intersection;
+    lodash.intersectionBy = intersectionBy;
+    lodash.intersectionWith = intersectionWith;
+    lodash.invert = invert;
+    lodash.invertBy = invertBy;
+    lodash.invokeMap = invokeMap;
+    lodash.iteratee = iteratee;
+    lodash.keyBy = keyBy;
+    lodash.keys = keys;
+    lodash.keysIn = keysIn;
+    lodash.map = map;
+    lodash.mapKeys = mapKeys;
+    lodash.mapValues = mapValues;
+    lodash.matches = matches;
+    lodash.matchesProperty = matchesProperty;
+    lodash.memoize = memoize;
+    lodash.merge = merge;
+    lodash.mergeWith = mergeWith;
+    lodash.method = method;
+    lodash.methodOf = methodOf;
+    lodash.mixin = mixin;
+    lodash.negate = negate;
+    lodash.nthArg = nthArg;
+    lodash.omit = omit;
+    lodash.omitBy = omitBy;
+    lodash.once = once;
+    lodash.orderBy = orderBy;
+    lodash.over = over;
+    lodash.overArgs = overArgs;
+    lodash.overEvery = overEvery;
+    lodash.overSome = overSome;
+    lodash.partial = partial;
+    lodash.partialRight = partialRight;
+    lodash.partition = partition;
+    lodash.pick = pick;
+    lodash.pickBy = pickBy;
+    lodash.property = property;
+    lodash.propertyOf = propertyOf;
+    lodash.pull = pull;
+    lodash.pullAll = pullAll;
+    lodash.pullAllBy = pullAllBy;
+    lodash.pullAllWith = pullAllWith;
+    lodash.pullAt = pullAt;
+    lodash.range = range;
+    lodash.rangeRight = rangeRight;
+    lodash.rearg = rearg;
+    lodash.reject = reject;
+    lodash.remove = remove;
+    lodash.rest = rest;
+    lodash.reverse = reverse;
+    lodash.sampleSize = sampleSize;
+    lodash.set = set;
+    lodash.setWith = setWith;
+    lodash.shuffle = shuffle;
+    lodash.slice = slice;
+    lodash.sortBy = sortBy;
+    lodash.sortedUniq = sortedUniq;
+    lodash.sortedUniqBy = sortedUniqBy;
+    lodash.split = split;
+    lodash.spread = spread;
+    lodash.tail = tail;
+    lodash.take = take;
+    lodash.takeRight = takeRight;
+    lodash.takeRightWhile = takeRightWhile;
+    lodash.takeWhile = takeWhile;
+    lodash.tap = tap;
+    lodash.throttle = throttle;
+    lodash.thru = thru;
+    lodash.toArray = toArray;
+    lodash.toPairs = toPairs;
+    lodash.toPairsIn = toPairsIn;
+    lodash.toPath = toPath;
+    lodash.toPlainObject = toPlainObject;
+    lodash.transform = transform;
+    lodash.unary = unary;
+    lodash.union = union;
+    lodash.unionBy = unionBy;
+    lodash.unionWith = unionWith;
+    lodash.uniq = uniq;
+    lodash.uniqBy = uniqBy;
+    lodash.uniqWith = uniqWith;
+    lodash.unset = unset;
+    lodash.unzip = unzip;
+    lodash.unzipWith = unzipWith;
+    lodash.update = update;
+    lodash.updateWith = updateWith;
+    lodash.values = values;
+    lodash.valuesIn = valuesIn;
+    lodash.without = without;
+    lodash.words = words;
+    lodash.wrap = wrap;
+    lodash.xor = xor;
+    lodash.xorBy = xorBy;
+    lodash.xorWith = xorWith;
+    lodash.zip = zip;
+    lodash.zipObject = zipObject;
+    lodash.zipObjectDeep = zipObjectDeep;
+    lodash.zipWith = zipWith;
+
+    // Add aliases.
+    lodash.entries = toPairs;
+    lodash.entriesIn = toPairsIn;
+    lodash.extend = assignIn;
+    lodash.extendWith = assignInWith;
+
+    // Add methods to `lodash.prototype`.
+    mixin(lodash, lodash);
+
+    /*------------------------------------------------------------------------*/
+
+    // Add methods that return unwrapped values in chain sequences.
+    lodash.add = add;
+    lodash.attempt = attempt;
+    lodash.camelCase = camelCase;
+    lodash.capitalize = capitalize;
+    lodash.ceil = ceil;
+    lodash.clamp = clamp;
+    lodash.clone = clone;
+    lodash.cloneDeep = cloneDeep;
+    lodash.cloneDeepWith = cloneDeepWith;
+    lodash.cloneWith = cloneWith;
+    lodash.conformsTo = conformsTo;
+    lodash.deburr = deburr;
+    lodash.defaultTo = defaultTo;
+    lodash.divide = divide;
+    lodash.endsWith = endsWith;
+    lodash.eq = eq;
+    lodash.escape = escape;
+    lodash.escapeRegExp = escapeRegExp;
+    lodash.every = every;
+    lodash.find = find;
+    lodash.findIndex = findIndex;
+    lodash.findKey = findKey;
+    lodash.findLast = findLast;
+    lodash.findLastIndex = findLastIndex;
+    lodash.findLastKey = findLastKey;
+    lodash.floor = floor;
+    lodash.forEach = forEach;
+    lodash.forEachRight = forEachRight;
+    lodash.forIn = forIn;
+    lodash.forInRight = forInRight;
+    lodash.forOwn = forOwn;
+    lodash.forOwnRight = forOwnRight;
+    lodash.get = get;
+    lodash.gt = gt;
+    lodash.gte = gte;
+    lodash.has = has;
+    lodash.hasIn = hasIn;
+    lodash.head = head;
+    lodash.identity = identity;
+    lodash.includes = includes;
+    lodash.indexOf = indexOf;
+    lodash.inRange = inRange;
+    lodash.invoke = invoke;
+    lodash.isArguments = isArguments;
+    lodash.isArray = isArray;
+    lodash.isArrayBuffer = isArrayBuffer;
+    lodash.isArrayLike = isArrayLike;
+    lodash.isArrayLikeObject = isArrayLikeObject;
+    lodash.isBoolean = isBoolean;
+    lodash.isBuffer = isBuffer;
+    lodash.isDate = isDate;
+    lodash.isElement = isElement;
+    lodash.isEmpty = isEmpty;
+    lodash.isEqual = isEqual;
+    lodash.isEqualWith = isEqualWith;
+    lodash.isError = isError;
+    lodash.isFinite = isFinite;
+    lodash.isFunction = isFunction;
+    lodash.isInteger = isInteger;
+    lodash.isLength = isLength;
+    lodash.isMap = isMap;
+    lodash.isMatch = isMatch;
+    lodash.isMatchWith = isMatchWith;
+    lodash.isNaN = isNaN;
+    lodash.isNative = isNative;
+    lodash.isNil = isNil;
+    lodash.isNull = isNull;
+    lodash.isNumber = isNumber;
+    lodash.isObject = isObject;
+    lodash.isObjectLike = isObjectLike;
+    lodash.isPlainObject = isPlainObject;
+    lodash.isRegExp = isRegExp;
+    lodash.isSafeInteger = isSafeInteger;
+    lodash.isSet = isSet;
+    lodash.isString = isString;
+    lodash.isSymbol = isSymbol;
+    lodash.isTypedArray = isTypedArray;
+    lodash.isUndefined = isUndefined;
+    lodash.isWeakMap = isWeakMap;
+    lodash.isWeakSet = isWeakSet;
+    lodash.join = join;
+    lodash.kebabCase = kebabCase;
+    lodash.last = last;
+    lodash.lastIndexOf = lastIndexOf;
+    lodash.lowerCase = lowerCase;
+    lodash.lowerFirst = lowerFirst;
+    lodash.lt = lt;
+    lodash.lte = lte;
+    lodash.max = max;
+    lodash.maxBy = maxBy;
+    lodash.mean = mean;
+    lodash.meanBy = meanBy;
+    lodash.min = min;
+    lodash.minBy = minBy;
+    lodash.stubArray = stubArray;
+    lodash.stubFalse = stubFalse;
+    lodash.stubObject = stubObject;
+    lodash.stubString = stubString;
+    lodash.stubTrue = stubTrue;
+    lodash.multiply = multiply;
+    lodash.nth = nth;
+    lodash.noConflict = noConflict;
+    lodash.noop = noop;
+    lodash.now = now;
+    lodash.pad = pad;
+    lodash.padEnd = padEnd;
+    lodash.padStart = padStart;
+    lodash.parseInt = parseInt;
+    lodash.random = random;
+    lodash.reduce = reduce;
+    lodash.reduceRight = reduceRight;
+    lodash.repeat = repeat;
+    lodash.replace = replace;
+    lodash.result = result;
+    lodash.round = round;
+    lodash.runInContext = runInContext;
+    lodash.sample = sample;
+    lodash.size = size;
+    lodash.snakeCase = snakeCase;
+    lodash.some = some;
+    lodash.sortedIndex = sortedIndex;
+    lodash.sortedIndexBy = sortedIndexBy;
+    lodash.sortedIndexOf = sortedIndexOf;
+    lodash.sortedLastIndex = sortedLastIndex;
+    lodash.sortedLastIndexBy = sortedLastIndexBy;
+    lodash.sortedLastIndexOf = sortedLastIndexOf;
+    lodash.startCase = startCase;
+    lodash.startsWith = startsWith;
+    lodash.subtract = subtract;
+    lodash.sum = sum;
+    lodash.sumBy = sumBy;
+    lodash.template = template;
+    lodash.times = times;
+    lodash.toFinite = toFinite;
+    lodash.toInteger = toInteger;
+    lodash.toLength = toLength;
+    lodash.toLower = toLower;
+    lodash.toNumber = toNumber;
+    lodash.toSafeInteger = toSafeInteger;
+    lodash.toString = toString;
+    lodash.toUpper = toUpper;
+    lodash.trim = trim;
+    lodash.trimEnd = trimEnd;
+    lodash.trimStart = trimStart;
+    lodash.truncate = truncate;
+    lodash.unescape = unescape;
+    lodash.uniqueId = uniqueId;
+    lodash.upperCase = upperCase;
+    lodash.upperFirst = upperFirst;
+
+    // Add aliases.
+    lodash.each = forEach;
+    lodash.eachRight = forEachRight;
+    lodash.first = head;
+
+    mixin(lodash, (function() {
+      var source = {};
+      baseForOwn(lodash, function(func, methodName) {
+        if (!hasOwnProperty.call(lodash.prototype, methodName)) {
+          source[methodName] = func;
+        }
+      });
+      return source;
+    }()), { 'chain': false });
+
+    /*------------------------------------------------------------------------*/
+
+    /**
+     * The semantic version number.
+     *
+     * @static
+     * @memberOf _
+     * @type {string}
+     */
+    lodash.VERSION = VERSION;
+
+    // Assign default placeholders.
+    arrayEach(['bind', 'bindKey', 'curry', 'curryRight', 'partial', 'partialRight'], function(methodName) {
+      lodash[methodName].placeholder = lodash;
+    });
+
+    // Add `LazyWrapper` methods for `_.drop` and `_.take` variants.
+    arrayEach(['drop', 'take'], function(methodName, index) {
+      LazyWrapper.prototype[methodName] = function(n) {
+        n = n === undefined ? 1 : nativeMax(toInteger(n), 0);
+
+        var result = (this.__filtered__ && !index)
+          ? new LazyWrapper(this)
+          : this.clone();
+
+        if (result.__filtered__) {
+          result.__takeCount__ = nativeMin(n, result.__takeCount__);
+        } else {
+          result.__views__.push({
+            'size': nativeMin(n, MAX_ARRAY_LENGTH),
+            'type': methodName + (result.__dir__ < 0 ? 'Right' : '')
+          });
+        }
+        return result;
+      };
+
+      LazyWrapper.prototype[methodName + 'Right'] = function(n) {
+        return this.reverse()[methodName](n).reverse();
+      };
+    });
+
+    // Add `LazyWrapper` methods that accept an `iteratee` value.
+    arrayEach(['filter', 'map', 'takeWhile'], function(methodName, index) {
+      var type = index + 1,
+          isFilter = type == LAZY_FILTER_FLAG || type == LAZY_WHILE_FLAG;
+
+      LazyWrapper.prototype[methodName] = function(iteratee) {
+        var result = this.clone();
+        result.__iteratees__.push({
+          'iteratee': getIteratee(iteratee, 3),
+          'type': type
+        });
+        result.__filtered__ = result.__filtered__ || isFilter;
+        return result;
+      };
+    });
+
+    // Add `LazyWrapper` methods for `_.head` and `_.last`.
+    arrayEach(['head', 'last'], function(methodName, index) {
+      var takeName = 'take' + (index ? 'Right' : '');
+
+      LazyWrapper.prototype[methodName] = function() {
+        return this[takeName](1).value()[0];
+      };
+    });
+
+    // Add `LazyWrapper` methods for `_.initial` and `_.tail`.
+    arrayEach(['initial', 'tail'], function(methodName, index) {
+      var dropName = 'drop' + (index ? '' : 'Right');
+
+      LazyWrapper.prototype[methodName] = function() {
+        return this.__filtered__ ? new LazyWrapper(this) : this[dropName](1);
+      };
+    });
+
+    LazyWrapper.prototype.compact = function() {
+      return this.filter(identity);
+    };
+
+    LazyWrapper.prototype.find = function(predicate) {
+      return this.filter(predicate).head();
+    };
+
+    LazyWrapper.prototype.findLast = function(predicate) {
+      return this.reverse().find(predicate);
+    };
+
+    LazyWrapper.prototype.invokeMap = baseRest(function(path, args) {
+      if (typeof path == 'function') {
+        return new LazyWrapper(this);
+      }
+      return this.map(function(value) {
+        return baseInvoke(value, path, args);
+      });
+    });
+
+    LazyWrapper.prototype.reject = function(predicate) {
+      return this.filter(negate(getIteratee(predicate)));
+    };
+
+    LazyWrapper.prototype.slice = function(start, end) {
+      start = toInteger(start);
+
+      var result = this;
+      if (result.__filtered__ && (start > 0 || end < 0)) {
+        return new LazyWrapper(result);
+      }
+      if (start < 0) {
+        result = result.takeRight(-start);
+      } else if (start) {
+        result = result.drop(start);
+      }
+      if (end !== undefined) {
+        end = toInteger(end);
+        result = end < 0 ? result.dropRight(-end) : result.take(end - start);
+      }
+      return result;
+    };
+
+    LazyWrapper.prototype.takeRightWhile = function(predicate) {
+      return this.reverse().takeWhile(predicate).reverse();
+    };
+
+    LazyWrapper.prototype.toArray = function() {
+      return this.take(MAX_ARRAY_LENGTH);
+    };
+
+    // Add `LazyWrapper` methods to `lodash.prototype`.
+    baseForOwn(LazyWrapper.prototype, function(func, methodName) {
+      var checkIteratee = /^(?:filter|find|map|reject)|While$/.test(methodName),
+          isTaker = /^(?:head|last)$/.test(methodName),
+          lodashFunc = lodash[isTaker ? ('take' + (methodName == 'last' ? 'Right' : '')) : methodName],
+          retUnwrapped = isTaker || /^find/.test(methodName);
+
+      if (!lodashFunc) {
+        return;
+      }
+      lodash.prototype[methodName] = function() {
+        var value = this.__wrapped__,
+            args = isTaker ? [1] : arguments,
+            isLazy = value instanceof LazyWrapper,
+            iteratee = args[0],
+            useLazy = isLazy || isArray(value);
+
+        var interceptor = function(value) {
+          var result = lodashFunc.apply(lodash, arrayPush([value], args));
+          return (isTaker && chainAll) ? result[0] : result;
+        };
+
+        if (useLazy && checkIteratee && typeof iteratee == 'function' && iteratee.length != 1) {
+          // Avoid lazy use if the iteratee has a "length" value other than `1`.
+          isLazy = useLazy = false;
+        }
+        var chainAll = this.__chain__,
+            isHybrid = !!this.__actions__.length,
+            isUnwrapped = retUnwrapped && !chainAll,
+            onlyLazy = isLazy && !isHybrid;
+
+        if (!retUnwrapped && useLazy) {
+          value = onlyLazy ? value : new LazyWrapper(this);
+          var result = func.apply(value, args);
+          result.__actions__.push({ 'func': thru, 'args': [interceptor], 'thisArg': undefined });
+          return new LodashWrapper(result, chainAll);
+        }
+        if (isUnwrapped && onlyLazy) {
+          return func.apply(this, args);
+        }
+        result = this.thru(interceptor);
+        return isUnwrapped ? (isTaker ? result.value()[0] : result.value()) : result;
+      };
+    });
+
+    // Add `Array` methods to `lodash.prototype`.
+    arrayEach(['pop', 'push', 'shift', 'sort', 'splice', 'unshift'], function(methodName) {
+      var func = arrayProto[methodName],
+          chainName = /^(?:push|sort|unshift)$/.test(methodName) ? 'tap' : 'thru',
+          retUnwrapped = /^(?:pop|shift)$/.test(methodName);
+
+      lodash.prototype[methodName] = function() {
+        var args = arguments;
+        if (retUnwrapped && !this.__chain__) {
+          var value = this.value();
+          return func.apply(isArray(value) ? value : [], args);
+        }
+        return this[chainName](function(value) {
+          return func.apply(isArray(value) ? value : [], args);
+        });
+      };
+    });
+
+    // Map minified method names to their real names.
+    baseForOwn(LazyWrapper.prototype, function(func, methodName) {
+      var lodashFunc = lodash[methodName];
+      if (lodashFunc) {
+        var key = (lodashFunc.name + ''),
+            names = realNames[key] || (realNames[key] = []);
+
+        names.push({ 'name': methodName, 'func': lodashFunc });
+      }
+    });
+
+    realNames[createHybrid(undefined, WRAP_BIND_KEY_FLAG).name] = [{
+      'name': 'wrapper',
+      'func': undefined
+    }];
+
+    // Add methods to `LazyWrapper`.
+    LazyWrapper.prototype.clone = lazyClone;
+    LazyWrapper.prototype.reverse = lazyReverse;
+    LazyWrapper.prototype.value = lazyValue;
+
+    // Add chain sequence methods to the `lodash` wrapper.
+    lodash.prototype.at = wrapperAt;
+    lodash.prototype.chain = wrapperChain;
+    lodash.prototype.commit = wrapperCommit;
+    lodash.prototype.next = wrapperNext;
+    lodash.prototype.plant = wrapperPlant;
+    lodash.prototype.reverse = wrapperReverse;
+    lodash.prototype.toJSON = lodash.prototype.valueOf = lodash.prototype.value = wrapperValue;
+
+    // Add lazy aliases.
+    lodash.prototype.first = lodash.prototype.head;
+
+    if (symIterator) {
+      lodash.prototype[symIterator] = wrapperToIterator;
+    }
+    return lodash;
+  });
+
+  /*--------------------------------------------------------------------------*/
+
+  // Export lodash.
+  var _ = runInContext();
+
+  // Some AMD build optimizers, like r.js, check for condition patterns like:
+  if (true) {
+    // Expose Lodash on the global object to prevent errors when Lodash is
+    // loaded by a script tag in the presence of an AMD loader.
+    // See http://requirejs.org/docs/errors.html#mismatch for more details.
+    // Use `_.noConflict` to remove Lodash from the global object.
+    root._ = _;
+
+    // Define as an anonymous module so, through path mapping, it can be
+    // referenced as the "underscore" module.
+    !(__WEBPACK_AMD_DEFINE_RESULT__ = function() {
+      return _;
+    }.call(exports, __webpack_require__, exports, module),
+				__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__));
+  }
+  // Check for `exports` after `define` in case a build optimizer adds it.
+  else if (freeModule) {
+    // Export for Node.js.
+    (freeModule.exports = _)._ = _;
+    // Export for CommonJS support.
+    freeExports._ = _;
+  }
+  else {
+    // Export to the global object.
+    root._ = _;
+  }
+}.call(this));
+
+/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(163)(module)))
+
+/***/ }),
+/* 39 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return EMPTY; });
+/* harmony export (immutable) */ __webpack_exports__["a"] = empty;
+/* unused harmony export emptyScheduled */
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(12);
+/** PURE_IMPORTS_START _Observable PURE_IMPORTS_END */
+
+var EMPTY = /*@__PURE__*/ new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) { return subscriber.complete(); });
+function empty(scheduler) {
+    return scheduler ? emptyScheduled(scheduler) : EMPTY;
+}
+function emptyScheduled(scheduler) {
+    return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) { return scheduler.schedule(function () { return subscriber.complete(); }); });
+}
+//# sourceMappingURL=empty.js.map
+
+
+/***/ }),
+/* 40 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return async; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__AsyncAction__ = __webpack_require__(149);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsyncScheduler__ = __webpack_require__(150);
+/** PURE_IMPORTS_START _AsyncAction,_AsyncScheduler PURE_IMPORTS_END */
+
+
+var async = /*@__PURE__*/ new __WEBPACK_IMPORTED_MODULE_1__AsyncScheduler__["a" /* AsyncScheduler */](__WEBPACK_IMPORTED_MODULE_0__AsyncAction__["a" /* AsyncAction */]);
+//# sourceMappingURL=async.js.map
+
+
+/***/ }),
+/* 41 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return isArray; });
+/** PURE_IMPORTS_START  PURE_IMPORTS_END */
+var isArray = Array.isArray || (function (x) { return x && typeof x.length === 'number'; });
+//# sourceMappingURL=isArray.js.map
+
+
+/***/ }),
+/* 42 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var dP = __webpack_require__(72);
+var createDesc = __webpack_require__(132);
+module.exports = __webpack_require__(51) ? function (object, key, value) {
+  return dP.f(object, key, createDesc(1, value));
+} : function (object, key, value) {
+  object[key] = value;
+  return object;
+};
+
+
+/***/ }),
+/* 43 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+
+function isNothing(subject) {
+  return (typeof subject === 'undefined') || (subject === null);
+}
+
+
+function isObject(subject) {
+  return (typeof subject === 'object') && (subject !== null);
+}
+
+
+function toArray(sequence) {
+  if (Array.isArray(sequence)) return sequence;
+  else if (isNothing(sequence)) return [];
+
+  return [ sequence ];
+}
+
+
+function extend(target, source) {
+  var index, length, key, sourceKeys;
+
+  if (source) {
+    sourceKeys = Object.keys(source);
+
+    for (index = 0, length = sourceKeys.length; index < length; index += 1) {
+      key = sourceKeys[index];
+      target[key] = source[key];
+    }
+  }
+
+  return target;
+}
+
+
+function repeat(string, count) {
+  var result = '', cycle;
+
+  for (cycle = 0; cycle < count; cycle += 1) {
+    result += string;
+  }
+
+  return result;
+}
+
+
+function isNegativeZero(number) {
+  return (number === 0) && (Number.NEGATIVE_INFINITY === 1 / number);
+}
+
+
+module.exports.isNothing      = isNothing;
+module.exports.isObject       = isObject;
+module.exports.toArray        = toArray;
+module.exports.repeat         = repeat;
+module.exports.isNegativeZero = isNegativeZero;
+module.exports.extend         = extend;
+
+
+/***/ }),
+/* 44 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+/*eslint-disable max-len*/
+
+var common        = __webpack_require__(43);
+var YAMLException = __webpack_require__(54);
+var Type          = __webpack_require__(10);
+
+
+function compileList(schema, name, result) {
+  var exclude = [];
+
+  schema.include.forEach(function (includedSchema) {
+    result = compileList(includedSchema, name, result);
+  });
+
+  schema[name].forEach(function (currentType) {
+    result.forEach(function (previousType, previousIndex) {
+      if (previousType.tag === currentType.tag && previousType.kind === currentType.kind) {
+        exclude.push(previousIndex);
+      }
+    });
+
+    result.push(currentType);
+  });
+
+  return result.filter(function (type, index) {
+    return exclude.indexOf(index) === -1;
+  });
+}
+
+
+function compileMap(/* lists... */) {
+  var result = {
+        scalar: {},
+        sequence: {},
+        mapping: {},
+        fallback: {}
+      }, index, length;
+
+  function collectType(type) {
+    result[type.kind][type.tag] = result['fallback'][type.tag] = type;
+  }
+
+  for (index = 0, length = arguments.length; index < length; index += 1) {
+    arguments[index].forEach(collectType);
+  }
+  return result;
+}
+
+
+function Schema(definition) {
+  this.include  = definition.include  || [];
+  this.implicit = definition.implicit || [];
+  this.explicit = definition.explicit || [];
+
+  this.implicit.forEach(function (type) {
+    if (type.loadKind && type.loadKind !== 'scalar') {
+      throw new YAMLException('There is a non-scalar type in the implicit list of a schema. Implicit resolving of such types is not supported.');
+    }
+  });
+
+  this.compiledImplicit = compileList(this, 'implicit', []);
+  this.compiledExplicit = compileList(this, 'explicit', []);
+  this.compiledTypeMap  = compileMap(this.compiledImplicit, this.compiledExplicit);
+}
+
+
+Schema.DEFAULT = null;
+
+
+Schema.create = function createSchema() {
+  var schemas, types;
+
+  switch (arguments.length) {
+    case 1:
+      schemas = Schema.DEFAULT;
+      types = arguments[0];
+      break;
+
+    case 2:
+      schemas = arguments[0];
+      types = arguments[1];
+      break;
+
+    default:
+      throw new YAMLException('Wrong number of arguments for Schema.create function');
+  }
+
+  schemas = common.toArray(schemas);
+  types = common.toArray(types);
+
+  if (!schemas.every(function (schema) { return schema instanceof Schema; })) {
+    throw new YAMLException('Specified list of super schemas (or a single Schema object) contains a non-Schema object.');
+  }
+
+  if (!types.every(function (type) { return type instanceof Type; })) {
+    throw new YAMLException('Specified list of YAML types (or a single Type object) contains a non-Type object.');
+  }
+
+  return new Schema({
+    include: schemas,
+    explicit: types
+  });
+};
+
+
+module.exports = Schema;
+
+
+/***/ }),
+/* 45 */
+/***/ (function(module, exports, __webpack_require__) {
+
+/* eslint-disable node/no-deprecated-api */
+var buffer = __webpack_require__(64)
+var Buffer = buffer.Buffer
+
+// alternative to using Object.keys for old browsers
+function copyProps (src, dst) {
+  for (var key in src) {
+    dst[key] = src[key]
+  }
+}
+if (Buffer.from && Buffer.alloc && Buffer.allocUnsafe && Buffer.allocUnsafeSlow) {
+  module.exports = buffer
+} else {
+  // Copy properties from require('buffer')
+  copyProps(buffer, exports)
+  exports.Buffer = SafeBuffer
+}
+
+function SafeBuffer (arg, encodingOrOffset, length) {
+  return Buffer(arg, encodingOrOffset, length)
+}
+
+// Copy static methods from Buffer
+copyProps(Buffer, SafeBuffer)
+
+SafeBuffer.from = function (arg, encodingOrOffset, length) {
+  if (typeof arg === 'number') {
+    throw new TypeError('Argument must not be a number')
+  }
+  return Buffer(arg, encodingOrOffset, length)
+}
+
+SafeBuffer.alloc = function (size, fill, encoding) {
+  if (typeof size !== 'number') {
+    throw new TypeError('Argument must be a number')
+  }
+  var buf = Buffer(size)
+  if (fill !== undefined) {
+    if (typeof encoding === 'string') {
+      buf.fill(fill, encoding)
+    } else {
+      buf.fill(fill)
+    }
+  } else {
+    buf.fill(0)
+  }
+  return buf
+}
+
+SafeBuffer.allocUnsafe = function (size) {
+  if (typeof size !== 'number') {
+    throw new TypeError('Argument must be a number')
+  }
+  return Buffer(size)
+}
+
+SafeBuffer.allocUnsafeSlow = function (size) {
+  if (typeof size !== 'number') {
+    throw new TypeError('Argument must be a number')
+  }
+  return buffer.SlowBuffer(size)
+}
+
+
+/***/ }),
+/* 46 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = map;
+/* unused harmony export MapOperator */
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
+/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+
+
+function map(project, thisArg) {
+    return function mapOperation(source) {
+        if (typeof project !== 'function') {
+            throw new TypeError('argument is not a function. Are you looking for `mapTo()`?');
+        }
+        return source.lift(new MapOperator(project, thisArg));
+    };
+}
+var MapOperator = /*@__PURE__*/ (function () {
+    function MapOperator(project, thisArg) {
+        this.project = project;
+        this.thisArg = thisArg;
+    }
+    MapOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new MapSubscriber(subscriber, this.project, this.thisArg));
+    };
+    return MapOperator;
+}());
+
+var MapSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](MapSubscriber, _super);
+    function MapSubscriber(destination, project, thisArg) {
+        var _this = _super.call(this, destination) || this;
+        _this.project = project;
+        _this.count = 0;
+        _this.thisArg = thisArg || _this;
+        return _this;
+    }
+    MapSubscriber.prototype._next = function (value) {
+        var result;
+        try {
+            result = this.project.call(this.thisArg, value, this.count++);
+        }
+        catch (err) {
+            this.destination.error(err);
+            return;
+        }
+        this.destination.next(result);
+    };
+    return MapSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
+//# sourceMappingURL=map.js.map
+
+
+/***/ }),
+/* 47 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return errorObject; });
+/** PURE_IMPORTS_START  PURE_IMPORTS_END */
+var errorObject = { e: {} };
+//# sourceMappingURL=errorObject.js.map
+
+
+/***/ }),
+/* 48 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = isScheduler;
+/** PURE_IMPORTS_START  PURE_IMPORTS_END */
+function isScheduler(value) {
+    return value && typeof value.schedule === 'function';
+}
+//# sourceMappingURL=isScheduler.js.map
+
+
+/***/ }),
+/* 49 */
+/***/ (function(module, exports) {
+
+module.exports = require("os");
+
+/***/ }),
+/* 50 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.wait = wait;
+exports.promisify = promisify;
+exports.queue = queue;
+function wait(delay) {
+  return new Promise(resolve => {
+    setTimeout(resolve, delay);
+  });
+}
+
+function promisify(fn, firstData) {
+  return function (...args) {
+    return new Promise(function (resolve, reject) {
+      args.push(function (err, ...result) {
+        let res = result;
+
+        if (result.length <= 1) {
+          res = result[0];
+        }
+
+        if (firstData) {
+          res = err;
+          err = null;
+        }
+
+        if (err) {
+          reject(err);
+        } else {
+          resolve(res);
+        }
+      });
+
+      fn.apply(null, args);
+    });
+  };
+}
+
+function queue(arr, promiseProducer, concurrency = Infinity) {
+  concurrency = Math.min(concurrency, arr.length);
+
+  // clone
+  arr = arr.slice();
+
+  const results = [];
+  let total = arr.length;
+  if (!total) {
+    return Promise.resolve(results);
+  }
+
+  return new Promise((resolve, reject) => {
+    for (let i = 0; i < concurrency; i++) {
+      next();
+    }
+
+    function next() {
+      const item = arr.shift();
+      const promise = promiseProducer(item);
+
+      promise.then(function (result) {
+        results.push(result);
+
+        total--;
+        if (total === 0) {
+          resolve(results);
+        } else {
+          if (arr.length) {
+            next();
+          }
+        }
+      }, reject);
+    }
+  });
+}
+
+/***/ }),
+/* 51 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// Thank's IE8 for his funny defineProperty
+module.exports = !__webpack_require__(112)(function () {
+  return Object.defineProperty({}, 'a', { get: function () { return 7; } }).a != 7;
+});
+
+
+/***/ }),
+/* 52 */
+/***/ (function(module, exports) {
+
+module.exports = function (it) {
+  return typeof it === 'object' ? it !== null : typeof it === 'function';
+};
+
+
+/***/ }),
+/* 53 */
+/***/ (function(module, exports) {
+
+module.exports = {};
+
+
+/***/ }),
+/* 54 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+// YAML error class. http://stackoverflow.com/questions/8458984
+//
+
+
+function YAMLException(reason, mark) {
+  // Super constructor
+  Error.call(this);
+
+  this.name = 'YAMLException';
+  this.reason = reason;
+  this.mark = mark;
+  this.message = (this.reason || '(unknown reason)') + (this.mark ? ' ' + this.mark.toString() : '');
+
+  // Include stack trace in error object
+  if (Error.captureStackTrace) {
+    // Chrome and NodeJS
+    Error.captureStackTrace(this, this.constructor);
+  } else {
+    // FF, IE 10+ and Safari 6+. Fallback for others
+    this.stack = (new Error()).stack || '';
+  }
+}
+
+
+// Inherit from Error
+YAMLException.prototype = Object.create(Error.prototype);
+YAMLException.prototype.constructor = YAMLException;
+
+
+YAMLException.prototype.toString = function toString(compact) {
+  var result = this.name + ': ';
+
+  result += this.reason || '(unknown reason)';
+
+  if (!compact && this.mark) {
+    result += ' ' + this.mark.toString();
+  }
+
+  return result;
+};
+
+
+module.exports = YAMLException;
+
+
+/***/ }),
+/* 55 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+// JS-YAML's default schema for `safeLoad` function.
+// It is not described in the YAML specification.
+//
+// This schema is based on standard YAML's Core schema and includes most of
+// extra types described at YAML tag repository. (http://yaml.org/type/)
+
+
+
+
+
+var Schema = __webpack_require__(44);
+
+
+module.exports = new Schema({
+  include: [
+    __webpack_require__(143)
+  ],
+  implicit: [
+    __webpack_require__(299),
+    __webpack_require__(292)
+  ],
+  explicit: [
+    __webpack_require__(284),
+    __webpack_require__(294),
+    __webpack_require__(295),
+    __webpack_require__(297)
+  ]
+});
+
+
+/***/ }),
+/* 56 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = tryCatch;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__errorObject__ = __webpack_require__(47);
+/** PURE_IMPORTS_START _errorObject PURE_IMPORTS_END */
+
+var tryCatchTarget;
+function tryCatcher() {
+    try {
+        return tryCatchTarget.apply(this, arguments);
+    }
+    catch (e) {
+        __WEBPACK_IMPORTED_MODULE_0__errorObject__["a" /* errorObject */].e = e;
+        return __WEBPACK_IMPORTED_MODULE_0__errorObject__["a" /* errorObject */];
+    }
+}
+function tryCatch(fn) {
+    tryCatchTarget = fn;
+    return tryCatcher;
+}
+//# sourceMappingURL=tryCatch.js.map
+
+
+/***/ }),
+/* 57 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.registryNames = exports.registries = undefined;
+
+var _yarnRegistry;
+
+function _load_yarnRegistry() {
+  return _yarnRegistry = _interopRequireDefault(__webpack_require__(559));
+}
+
+var _npmRegistry;
+
+function _load_npmRegistry() {
+  return _npmRegistry = _interopRequireDefault(__webpack_require__(88));
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const registries = exports.registries = {
+  npm: (_npmRegistry || _load_npmRegistry()).default,
+  yarn: (_yarnRegistry || _load_yarnRegistry()).default
+};
+
+const registryNames = exports.registryNames = Object.keys(registries);
+
+/***/ }),
+/* 58 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.exec = exports.queue = undefined;
+exports.forkp = forkp;
+exports.spawnp = spawnp;
+exports.forwardSignalToSpawnedProcesses = forwardSignalToSpawnedProcesses;
+exports.spawn = spawn;
+
+var _constants;
+
+function _load_constants() {
+  return _constants = _interopRequireWildcard(__webpack_require__(8));
+}
+
+var _blockingQueue;
+
+function _load_blockingQueue() {
+  return _blockingQueue = _interopRequireDefault(__webpack_require__(110));
+}
+
+var _errors;
+
+function _load_errors() {
+  return _errors = __webpack_require__(6);
+}
+
+var _promise;
+
+function _load_promise() {
+  return _promise = __webpack_require__(50);
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+/* global child_process$spawnOpts */
+
+const child = __webpack_require__(331);
+
+const queue = exports.queue = new (_blockingQueue || _load_blockingQueue()).default('child', (_constants || _load_constants()).CHILD_CONCURRENCY);
+
+// TODO: this uid check is kinda whack
+let uid = 0;
+
+const exec = exports.exec = (0, (_promise || _load_promise()).promisify)(child.exec);
+
+function forkp(program, args, opts) {
+  return new Promise((resolve, reject) => {
+    const proc = child.fork(program, args, opts);
+
+    proc.on('error', error => {
+      reject(error);
+    });
+
+    proc.on('close', exitCode => {
+      resolve(exitCode);
+    });
+  });
+}
+
+function spawnp(program, args, opts) {
+  return new Promise((resolve, reject) => {
+    const proc = child.spawn(program, args, opts);
+
+    proc.on('error', error => {
+      reject(error);
+    });
+
+    proc.on('close', exitCode => {
+      resolve(exitCode);
+    });
+  });
+}
+
+const spawnedProcesses = {};
+
+function forwardSignalToSpawnedProcesses(signal) {
+  for (var _iterator = Object.keys(spawnedProcesses), _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+    var _ref;
+
+    if (_isArray) {
+      if (_i >= _iterator.length) break;
+      _ref = _iterator[_i++];
+    } else {
+      _i = _iterator.next();
+      if (_i.done) break;
+      _ref = _i.value;
+    }
+
+    const key = _ref;
+
+    spawnedProcesses[key].kill(signal);
+  }
+}
+
+function spawn(program, args, opts = {}, onData) {
+  const key = opts.cwd || String(++uid);
+  return queue.push(key, () => new Promise((resolve, reject) => {
+    const proc = child.spawn(program, args, opts);
+    spawnedProcesses[key] = proc;
+
+    let processingDone = false;
+    let processClosed = false;
+    let err = null;
+
+    let stdout = '';
+
+    proc.on('error', err => {
+      if (err.code === 'ENOENT') {
+        reject(new (_errors || _load_errors()).ProcessSpawnError(`Couldn't find the binary ${program}`, err.code, program));
+      } else {
+        reject(err);
+      }
+    });
+
+    function updateStdout(chunk) {
+      stdout += chunk;
+      if (onData) {
+        onData(chunk);
+      }
+    }
+
+    function finish() {
+      delete spawnedProcesses[key];
+      if (err) {
+        reject(err);
+      } else {
+        resolve(stdout.trim());
+      }
+    }
+
+    if (typeof opts.process === 'function') {
+      opts.process(proc, updateStdout, reject, function () {
+        if (processClosed) {
+          finish();
+        } else {
+          processingDone = true;
+        }
+      });
+    } else {
+      if (proc.stderr) {
+        proc.stderr.on('data', updateStdout);
+      }
+
+      if (proc.stdout) {
+        proc.stdout.on('data', updateStdout);
+      }
+
+      processingDone = true;
+    }
+
+    proc.on('close', (code, signal) => {
+      if (signal || code >= 1) {
+        err = new (_errors || _load_errors()).ProcessTermError(['Command failed.', signal ? `Exit signal: ${signal}` : `Exit code: ${code}`, `Command: ${program}`, `Arguments: ${args.join(' ')}`, `Directory: ${opts.cwd || process.cwd()}`, `Output:\n${stdout.trim()}`].join('\n'));
+        err.EXIT_SIGNAL = signal;
+        err.EXIT_CODE = code;
+      }
+
+      if (processingDone || err) {
+        finish();
+      } else {
+        processClosed = true;
+      }
+    });
+  }));
+}
+
+/***/ }),
+/* 59 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+exports.default = function (rootCommandName, subCommands, usage = []) {
+  let run = (() => {
+    var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
+      const subName = (0, (_misc || _load_misc()).camelCase)(args.shift() || '');
+      if (subName && subCommands[subName]) {
+        const command = subCommands[subName];
+        const res = yield command(config, reporter, flags, args);
+        if (res !== false) {
+          return Promise.resolve();
+        }
+      }
+
+      if (usage && usage.length) {
+        reporter.error(`${reporter.lang('usage')}:`);
+        for (var _iterator = usage, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+          var _ref2;
+
+          if (_isArray) {
+            if (_i >= _iterator.length) break;
+            _ref2 = _iterator[_i++];
+          } else {
+            _i = _iterator.next();
+            if (_i.done) break;
+            _ref2 = _i.value;
+          }
+
+          const msg = _ref2;
+
+          reporter.error(`yarn ${rootCommandName} ${msg}`);
+        }
+      }
+      return Promise.reject(new (_errors || _load_errors()).MessageError(reporter.lang('invalidCommand', subCommandNames.join(', '))));
+    });
+
+    return function run(_x, _x2, _x3, _x4) {
+      return _ref.apply(this, arguments);
+    };
+  })();
+
+  const subCommandNames = Object.keys(subCommands).map((_misc || _load_misc()).hyphenate);
+
+  function setFlags(commander) {
+    commander.usage(`${rootCommandName} [${subCommandNames.join('|')}] [flags]`);
+  }
+
+  function hasWrapper(commander, args) {
+    return true;
+  }
+
+  const examples = usage.map(cmd => {
+    return `${rootCommandName} ${cmd}`;
+  });
+
+  return { run, setFlags, hasWrapper, examples };
+};
+
+var _errors;
+
+function _load_errors() {
+  return _errors = __webpack_require__(6);
+}
+
+var _misc;
+
+function _load_misc() {
+  return _misc = __webpack_require__(18);
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/***/ }),
+/* 60 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var global = __webpack_require__(17);
+var core = __webpack_require__(31);
+var ctx = __webpack_require__(70);
+var hide = __webpack_require__(42);
+var has = __webpack_require__(71);
+var PROTOTYPE = 'prototype';
+
+var $export = function (type, name, source) {
+  var IS_FORCED = type & $export.F;
+  var IS_GLOBAL = type & $export.G;
+  var IS_STATIC = type & $export.S;
+  var IS_PROTO = type & $export.P;
+  var IS_BIND = type & $export.B;
+  var IS_WRAP = type & $export.W;
+  var exports = IS_GLOBAL ? core : core[name] || (core[name] = {});
+  var expProto = exports[PROTOTYPE];
+  var target = IS_GLOBAL ? global : IS_STATIC ? global[name] : (global[name] || {})[PROTOTYPE];
+  var key, own, out;
+  if (IS_GLOBAL) source = name;
+  for (key in source) {
+    // contains in native
+    own = !IS_FORCED && target && target[key] !== undefined;
+    if (own && has(exports, key)) continue;
+    // export native or passed
+    out = own ? target[key] : source[key];
+    // prevent global pollution for namespaces
+    exports[key] = IS_GLOBAL && typeof target[key] != 'function' ? source[key]
+    // bind timers to global for call from export context
+    : IS_BIND && own ? ctx(out, global)
+    // wrap global constructors for prevent change them in library
+    : IS_WRAP && target[key] == out ? (function (C) {
+      var F = function (a, b, c) {
+        if (this instanceof C) {
+          switch (arguments.length) {
+            case 0: return new C();
+            case 1: return new C(a);
+            case 2: return new C(a, b);
+          } return new C(a, b, c);
+        } return C.apply(this, arguments);
+      };
+      F[PROTOTYPE] = C[PROTOTYPE];
+      return F;
+    // make static versions for prototype methods
+    })(out) : IS_PROTO && typeof out == 'function' ? ctx(Function.call, out) : out;
+    // export proto methods to core.%CONSTRUCTOR%.methods.%NAME%
+    if (IS_PROTO) {
+      (exports.virtual || (exports.virtual = {}))[key] = out;
+      // export proto methods to core.%CONSTRUCTOR%.prototype.%NAME%
+      if (type & $export.R && expProto && !expProto[key]) hide(expProto, key, out);
+    }
+  }
+};
+// type bitmap
+$export.F = 1;   // forced
+$export.G = 2;   // global
+$export.S = 4;   // static
+$export.P = 8;   // proto
+$export.B = 16;  // bind
+$export.W = 32;  // wrap
+$export.U = 64;  // safe
+$export.R = 128; // real proto method for `library`
+module.exports = $export;
+
+
+/***/ }),
+/* 61 */
+/***/ (function(module, exports, __webpack_require__) {
+
+try {
+  var util = __webpack_require__(3);
+  if (typeof util.inherits !== 'function') throw '';
+  module.exports = util.inherits;
+} catch (e) {
+  module.exports = __webpack_require__(275);
+}
+
+
+/***/ }),
+/* 62 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = from;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(12);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_isPromise__ = __webpack_require__(445);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isArrayLike__ = __webpack_require__(442);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_isInteropObservable__ = __webpack_require__(928);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_isIterable__ = __webpack_require__(929);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__fromArray__ = __webpack_require__(85);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__fromPromise__ = __webpack_require__(830);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__fromIterable__ = __webpack_require__(828);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__fromObservable__ = __webpack_require__(829);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__util_subscribeTo__ = __webpack_require__(446);
+/** PURE_IMPORTS_START _Observable,_util_isPromise,_util_isArrayLike,_util_isInteropObservable,_util_isIterable,_fromArray,_fromPromise,_fromIterable,_fromObservable,_util_subscribeTo PURE_IMPORTS_END */
+
+
+
+
+
+
+
+
+
+
+function from(input, scheduler) {
+    if (!scheduler) {
+        if (input instanceof __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */]) {
+            return input;
+        }
+        return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_9__util_subscribeTo__["a" /* subscribeTo */])(input));
+    }
+    if (input != null) {
+        if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__util_isInteropObservable__["a" /* isInteropObservable */])(input)) {
+            return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_8__fromObservable__["a" /* fromObservable */])(input, scheduler);
+        }
+        else if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__util_isPromise__["a" /* isPromise */])(input)) {
+            return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_6__fromPromise__["a" /* fromPromise */])(input, scheduler);
+        }
+        else if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_isArrayLike__["a" /* isArrayLike */])(input)) {
+            return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_5__fromArray__["a" /* fromArray */])(input, scheduler);
+        }
+        else if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_4__util_isIterable__["a" /* isIterable */])(input) || typeof input === 'string') {
+            return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_7__fromIterable__["a" /* fromIterable */])(input, scheduler);
+        }
+    }
+    throw new TypeError((input !== null && typeof input || input) + ' is not observable');
+}
+//# sourceMappingURL=from.js.map
+
+
+/***/ }),
+/* 63 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__internal_operators_audit__ = __webpack_require__(428);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "audit", function() { return __WEBPACK_IMPORTED_MODULE_0__internal_operators_audit__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__internal_operators_auditTime__ = __webpack_require__(838);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "auditTime", function() { return __WEBPACK_IMPORTED_MODULE_1__internal_operators_auditTime__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__internal_operators_buffer__ = __webpack_require__(839);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "buffer", function() { return __WEBPACK_IMPORTED_MODULE_2__internal_operators_buffer__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__internal_operators_bufferCount__ = __webpack_require__(840);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "bufferCount", function() { return __WEBPACK_IMPORTED_MODULE_3__internal_operators_bufferCount__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__internal_operators_bufferTime__ = __webpack_require__(841);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "bufferTime", function() { return __WEBPACK_IMPORTED_MODULE_4__internal_operators_bufferTime__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__internal_operators_bufferToggle__ = __webpack_require__(842);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "bufferToggle", function() { return __WEBPACK_IMPORTED_MODULE_5__internal_operators_bufferToggle__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__internal_operators_bufferWhen__ = __webpack_require__(843);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "bufferWhen", function() { return __WEBPACK_IMPORTED_MODULE_6__internal_operators_bufferWhen__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__internal_operators_catchError__ = __webpack_require__(844);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "catchError", function() { return __WEBPACK_IMPORTED_MODULE_7__internal_operators_catchError__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__internal_operators_combineAll__ = __webpack_require__(845);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "combineAll", function() { return __WEBPACK_IMPORTED_MODULE_8__internal_operators_combineAll__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__internal_operators_combineLatest__ = __webpack_require__(846);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "combineLatest", function() { return __WEBPACK_IMPORTED_MODULE_9__internal_operators_combineLatest__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__internal_operators_concat__ = __webpack_require__(847);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "concat", function() { return __WEBPACK_IMPORTED_MODULE_10__internal_operators_concat__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_11__internal_operators_concatAll__ = __webpack_require__(429);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "concatAll", function() { return __WEBPACK_IMPORTED_MODULE_11__internal_operators_concatAll__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_12__internal_operators_concatMap__ = __webpack_require__(430);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "concatMap", function() { return __WEBPACK_IMPORTED_MODULE_12__internal_operators_concatMap__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_13__internal_operators_concatMapTo__ = __webpack_require__(848);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "concatMapTo", function() { return __WEBPACK_IMPORTED_MODULE_13__internal_operators_concatMapTo__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_14__internal_operators_count__ = __webpack_require__(849);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "count", function() { return __WEBPACK_IMPORTED_MODULE_14__internal_operators_count__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_15__internal_operators_debounce__ = __webpack_require__(850);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "debounce", function() { return __WEBPACK_IMPORTED_MODULE_15__internal_operators_debounce__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_16__internal_operators_debounceTime__ = __webpack_require__(851);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "debounceTime", function() { return __WEBPACK_IMPORTED_MODULE_16__internal_operators_debounceTime__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_17__internal_operators_defaultIfEmpty__ = __webpack_require__(146);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "defaultIfEmpty", function() { return __WEBPACK_IMPORTED_MODULE_17__internal_operators_defaultIfEmpty__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_18__internal_operators_delay__ = __webpack_require__(852);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "delay", function() { return __WEBPACK_IMPORTED_MODULE_18__internal_operators_delay__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_19__internal_operators_delayWhen__ = __webpack_require__(853);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "delayWhen", function() { return __WEBPACK_IMPORTED_MODULE_19__internal_operators_delayWhen__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_20__internal_operators_dematerialize__ = __webpack_require__(854);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "dematerialize", function() { return __WEBPACK_IMPORTED_MODULE_20__internal_operators_dematerialize__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_21__internal_operators_distinct__ = __webpack_require__(855);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "distinct", function() { return __WEBPACK_IMPORTED_MODULE_21__internal_operators_distinct__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_22__internal_operators_distinctUntilChanged__ = __webpack_require__(431);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "distinctUntilChanged", function() { return __WEBPACK_IMPORTED_MODULE_22__internal_operators_distinctUntilChanged__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_23__internal_operators_distinctUntilKeyChanged__ = __webpack_require__(856);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "distinctUntilKeyChanged", function() { return __WEBPACK_IMPORTED_MODULE_23__internal_operators_distinctUntilKeyChanged__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_24__internal_operators_elementAt__ = __webpack_require__(857);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "elementAt", function() { return __WEBPACK_IMPORTED_MODULE_24__internal_operators_elementAt__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_25__internal_operators_endWith__ = __webpack_require__(858);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "endWith", function() { return __WEBPACK_IMPORTED_MODULE_25__internal_operators_endWith__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_26__internal_operators_every__ = __webpack_require__(859);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "every", function() { return __WEBPACK_IMPORTED_MODULE_26__internal_operators_every__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_27__internal_operators_exhaust__ = __webpack_require__(860);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "exhaust", function() { return __WEBPACK_IMPORTED_MODULE_27__internal_operators_exhaust__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_28__internal_operators_exhaustMap__ = __webpack_require__(861);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "exhaustMap", function() { return __WEBPACK_IMPORTED_MODULE_28__internal_operators_exhaustMap__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_29__internal_operators_expand__ = __webpack_require__(862);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "expand", function() { return __WEBPACK_IMPORTED_MODULE_29__internal_operators_expand__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_30__internal_operators_filter__ = __webpack_require__(147);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "filter", function() { return __WEBPACK_IMPORTED_MODULE_30__internal_operators_filter__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_31__internal_operators_finalize__ = __webpack_require__(863);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "finalize", function() { return __WEBPACK_IMPORTED_MODULE_31__internal_operators_finalize__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_32__internal_operators_find__ = __webpack_require__(432);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "find", function() { return __WEBPACK_IMPORTED_MODULE_32__internal_operators_find__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_33__internal_operators_findIndex__ = __webpack_require__(864);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "findIndex", function() { return __WEBPACK_IMPORTED_MODULE_33__internal_operators_findIndex__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_34__internal_operators_first__ = __webpack_require__(865);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "first", function() { return __WEBPACK_IMPORTED_MODULE_34__internal_operators_first__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_35__internal_operators_groupBy__ = __webpack_require__(433);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "groupBy", function() { return __WEBPACK_IMPORTED_MODULE_35__internal_operators_groupBy__["b"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_36__internal_operators_ignoreElements__ = __webpack_require__(866);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "ignoreElements", function() { return __WEBPACK_IMPORTED_MODULE_36__internal_operators_ignoreElements__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_37__internal_operators_isEmpty__ = __webpack_require__(867);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "isEmpty", function() { return __WEBPACK_IMPORTED_MODULE_37__internal_operators_isEmpty__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_38__internal_operators_last__ = __webpack_require__(868);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "last", function() { return __WEBPACK_IMPORTED_MODULE_38__internal_operators_last__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_39__internal_operators_map__ = __webpack_require__(46);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "map", function() { return __WEBPACK_IMPORTED_MODULE_39__internal_operators_map__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_40__internal_operators_mapTo__ = __webpack_require__(869);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "mapTo", function() { return __WEBPACK_IMPORTED_MODULE_40__internal_operators_mapTo__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_41__internal_operators_materialize__ = __webpack_require__(870);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "materialize", function() { return __WEBPACK_IMPORTED_MODULE_41__internal_operators_materialize__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_42__internal_operators_max__ = __webpack_require__(871);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "max", function() { return __WEBPACK_IMPORTED_MODULE_42__internal_operators_max__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_43__internal_operators_merge__ = __webpack_require__(872);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "merge", function() { return __WEBPACK_IMPORTED_MODULE_43__internal_operators_merge__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_44__internal_operators_mergeAll__ = __webpack_require__(315);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "mergeAll", function() { return __WEBPACK_IMPORTED_MODULE_44__internal_operators_mergeAll__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_45__internal_operators_mergeMap__ = __webpack_require__(148);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "mergeMap", function() { return __WEBPACK_IMPORTED_MODULE_45__internal_operators_mergeMap__["a"]; });
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "flatMap", function() { return __WEBPACK_IMPORTED_MODULE_45__internal_operators_mergeMap__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_46__internal_operators_mergeMapTo__ = __webpack_require__(873);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "mergeMapTo", function() { return __WEBPACK_IMPORTED_MODULE_46__internal_operators_mergeMapTo__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_47__internal_operators_mergeScan__ = __webpack_require__(874);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "mergeScan", function() { return __WEBPACK_IMPORTED_MODULE_47__internal_operators_mergeScan__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_48__internal_operators_min__ = __webpack_require__(875);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "min", function() { return __WEBPACK_IMPORTED_MODULE_48__internal_operators_min__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_49__internal_operators_multicast__ = __webpack_require__(116);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "multicast", function() { return __WEBPACK_IMPORTED_MODULE_49__internal_operators_multicast__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_50__internal_operators_observeOn__ = __webpack_require__(434);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "observeOn", function() { return __WEBPACK_IMPORTED_MODULE_50__internal_operators_observeOn__["b"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_51__internal_operators_onErrorResumeNext__ = __webpack_require__(876);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "onErrorResumeNext", function() { return __WEBPACK_IMPORTED_MODULE_51__internal_operators_onErrorResumeNext__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_52__internal_operators_pairwise__ = __webpack_require__(877);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "pairwise", function() { return __WEBPACK_IMPORTED_MODULE_52__internal_operators_pairwise__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_53__internal_operators_partition__ = __webpack_require__(878);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "partition", function() { return __WEBPACK_IMPORTED_MODULE_53__internal_operators_partition__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_54__internal_operators_pluck__ = __webpack_require__(879);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "pluck", function() { return __WEBPACK_IMPORTED_MODULE_54__internal_operators_pluck__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_55__internal_operators_publish__ = __webpack_require__(880);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "publish", function() { return __WEBPACK_IMPORTED_MODULE_55__internal_operators_publish__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_56__internal_operators_publishBehavior__ = __webpack_require__(881);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "publishBehavior", function() { return __WEBPACK_IMPORTED_MODULE_56__internal_operators_publishBehavior__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_57__internal_operators_publishLast__ = __webpack_require__(882);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "publishLast", function() { return __WEBPACK_IMPORTED_MODULE_57__internal_operators_publishLast__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_58__internal_operators_publishReplay__ = __webpack_require__(883);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "publishReplay", function() { return __WEBPACK_IMPORTED_MODULE_58__internal_operators_publishReplay__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_59__internal_operators_race__ = __webpack_require__(884);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "race", function() { return __WEBPACK_IMPORTED_MODULE_59__internal_operators_race__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_60__internal_operators_reduce__ = __webpack_require__(187);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "reduce", function() { return __WEBPACK_IMPORTED_MODULE_60__internal_operators_reduce__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_61__internal_operators_repeat__ = __webpack_require__(885);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "repeat", function() { return __WEBPACK_IMPORTED_MODULE_61__internal_operators_repeat__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_62__internal_operators_repeatWhen__ = __webpack_require__(886);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "repeatWhen", function() { return __WEBPACK_IMPORTED_MODULE_62__internal_operators_repeatWhen__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_63__internal_operators_retry__ = __webpack_require__(887);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "retry", function() { return __WEBPACK_IMPORTED_MODULE_63__internal_operators_retry__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_64__internal_operators_retryWhen__ = __webpack_require__(888);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "retryWhen", function() { return __WEBPACK_IMPORTED_MODULE_64__internal_operators_retryWhen__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_65__internal_operators_refCount__ = __webpack_require__(316);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "refCount", function() { return __WEBPACK_IMPORTED_MODULE_65__internal_operators_refCount__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_66__internal_operators_sample__ = __webpack_require__(889);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "sample", function() { return __WEBPACK_IMPORTED_MODULE_66__internal_operators_sample__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_67__internal_operators_sampleTime__ = __webpack_require__(890);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "sampleTime", function() { return __WEBPACK_IMPORTED_MODULE_67__internal_operators_sampleTime__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_68__internal_operators_scan__ = __webpack_require__(317);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "scan", function() { return __WEBPACK_IMPORTED_MODULE_68__internal_operators_scan__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_69__internal_operators_sequenceEqual__ = __webpack_require__(891);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "sequenceEqual", function() { return __WEBPACK_IMPORTED_MODULE_69__internal_operators_sequenceEqual__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_70__internal_operators_share__ = __webpack_require__(892);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "share", function() { return __WEBPACK_IMPORTED_MODULE_70__internal_operators_share__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_71__internal_operators_shareReplay__ = __webpack_require__(893);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "shareReplay", function() { return __WEBPACK_IMPORTED_MODULE_71__internal_operators_shareReplay__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_72__internal_operators_single__ = __webpack_require__(894);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "single", function() { return __WEBPACK_IMPORTED_MODULE_72__internal_operators_single__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_73__internal_operators_skip__ = __webpack_require__(895);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "skip", function() { return __WEBPACK_IMPORTED_MODULE_73__internal_operators_skip__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_74__internal_operators_skipLast__ = __webpack_require__(896);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "skipLast", function() { return __WEBPACK_IMPORTED_MODULE_74__internal_operators_skipLast__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_75__internal_operators_skipUntil__ = __webpack_require__(897);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "skipUntil", function() { return __WEBPACK_IMPORTED_MODULE_75__internal_operators_skipUntil__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_76__internal_operators_skipWhile__ = __webpack_require__(898);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "skipWhile", function() { return __WEBPACK_IMPORTED_MODULE_76__internal_operators_skipWhile__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_77__internal_operators_startWith__ = __webpack_require__(899);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "startWith", function() { return __WEBPACK_IMPORTED_MODULE_77__internal_operators_startWith__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_78__internal_operators_subscribeOn__ = __webpack_require__(900);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "subscribeOn", function() { return __WEBPACK_IMPORTED_MODULE_78__internal_operators_subscribeOn__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_79__internal_operators_switchAll__ = __webpack_require__(901);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "switchAll", function() { return __WEBPACK_IMPORTED_MODULE_79__internal_operators_switchAll__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_80__internal_operators_switchMap__ = __webpack_require__(318);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "switchMap", function() { return __WEBPACK_IMPORTED_MODULE_80__internal_operators_switchMap__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_81__internal_operators_switchMapTo__ = __webpack_require__(902);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "switchMapTo", function() { return __WEBPACK_IMPORTED_MODULE_81__internal_operators_switchMapTo__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_82__internal_operators_take__ = __webpack_require__(319);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "take", function() { return __WEBPACK_IMPORTED_MODULE_82__internal_operators_take__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_83__internal_operators_takeLast__ = __webpack_require__(320);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "takeLast", function() { return __WEBPACK_IMPORTED_MODULE_83__internal_operators_takeLast__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_84__internal_operators_takeUntil__ = __webpack_require__(903);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "takeUntil", function() { return __WEBPACK_IMPORTED_MODULE_84__internal_operators_takeUntil__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_85__internal_operators_takeWhile__ = __webpack_require__(904);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "takeWhile", function() { return __WEBPACK_IMPORTED_MODULE_85__internal_operators_takeWhile__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_86__internal_operators_tap__ = __webpack_require__(435);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "tap", function() { return __WEBPACK_IMPORTED_MODULE_86__internal_operators_tap__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_87__internal_operators_throttle__ = __webpack_require__(436);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "throttle", function() { return __WEBPACK_IMPORTED_MODULE_87__internal_operators_throttle__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_88__internal_operators_throttleTime__ = __webpack_require__(905);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "throttleTime", function() { return __WEBPACK_IMPORTED_MODULE_88__internal_operators_throttleTime__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_89__internal_operators_throwIfEmpty__ = __webpack_require__(188);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "throwIfEmpty", function() { return __WEBPACK_IMPORTED_MODULE_89__internal_operators_throwIfEmpty__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_90__internal_operators_timeInterval__ = __webpack_require__(906);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "timeInterval", function() { return __WEBPACK_IMPORTED_MODULE_90__internal_operators_timeInterval__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_91__internal_operators_timeout__ = __webpack_require__(907);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "timeout", function() { return __WEBPACK_IMPORTED_MODULE_91__internal_operators_timeout__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_92__internal_operators_timeoutWith__ = __webpack_require__(437);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "timeoutWith", function() { return __WEBPACK_IMPORTED_MODULE_92__internal_operators_timeoutWith__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_93__internal_operators_timestamp__ = __webpack_require__(908);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "timestamp", function() { return __WEBPACK_IMPORTED_MODULE_93__internal_operators_timestamp__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_94__internal_operators_toArray__ = __webpack_require__(909);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "toArray", function() { return __WEBPACK_IMPORTED_MODULE_94__internal_operators_toArray__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_95__internal_operators_window__ = __webpack_require__(910);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "window", function() { return __WEBPACK_IMPORTED_MODULE_95__internal_operators_window__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_96__internal_operators_windowCount__ = __webpack_require__(911);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "windowCount", function() { return __WEBPACK_IMPORTED_MODULE_96__internal_operators_windowCount__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_97__internal_operators_windowTime__ = __webpack_require__(912);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "windowTime", function() { return __WEBPACK_IMPORTED_MODULE_97__internal_operators_windowTime__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_98__internal_operators_windowToggle__ = __webpack_require__(913);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "windowToggle", function() { return __WEBPACK_IMPORTED_MODULE_98__internal_operators_windowToggle__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_99__internal_operators_windowWhen__ = __webpack_require__(914);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "windowWhen", function() { return __WEBPACK_IMPORTED_MODULE_99__internal_operators_windowWhen__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_100__internal_operators_withLatestFrom__ = __webpack_require__(915);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "withLatestFrom", function() { return __WEBPACK_IMPORTED_MODULE_100__internal_operators_withLatestFrom__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_101__internal_operators_zip__ = __webpack_require__(916);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "zip", function() { return __WEBPACK_IMPORTED_MODULE_101__internal_operators_zip__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_102__internal_operators_zipAll__ = __webpack_require__(917);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "zipAll", function() { return __WEBPACK_IMPORTED_MODULE_102__internal_operators_zipAll__["a"]; });
+/** PURE_IMPORTS_START  PURE_IMPORTS_END */
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+//# sourceMappingURL=index.js.map
+
+
+/***/ }),
+/* 64 */
+/***/ (function(module, exports) {
+
+module.exports = require("buffer");
+
+/***/ }),
+/* 65 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+const Buffer = __webpack_require__(45).Buffer
+
+const crypto = __webpack_require__(11)
+const Transform = __webpack_require__(23).Transform
+
+const SPEC_ALGORITHMS = ['sha256', 'sha384', 'sha512']
+
+const BASE64_REGEX = /^[a-z0-9+/]+(?:=?=?)$/i
+const SRI_REGEX = /^([^-]+)-([^?]+)([?\S*]*)$/
+const STRICT_SRI_REGEX = /^([^-]+)-([A-Za-z0-9+/=]{44,88})(\?[\x21-\x7E]*)*$/
+const VCHAR_REGEX = /^[\x21-\x7E]+$/
+
+class Hash {
+  get isHash () { return true }
+  constructor (hash, opts) {
+    const strict = !!(opts && opts.strict)
+    this.source = hash.trim()
+    // 3.1. Integrity metadata (called "Hash" by ssri)
+    // https://w3c.github.io/webappsec-subresource-integrity/#integrity-metadata-description
+    const match = this.source.match(
+      strict
+      ? STRICT_SRI_REGEX
+      : SRI_REGEX
+    )
+    if (!match) { return }
+    if (strict && !SPEC_ALGORITHMS.some(a => a === match[1])) { return }
+    this.algorithm = match[1]
+    this.digest = match[2]
+
+    const rawOpts = match[3]
+    this.options = rawOpts ? rawOpts.slice(1).split('?') : []
+  }
+  hexDigest () {
+    return this.digest && Buffer.from(this.digest, 'base64').toString('hex')
+  }
+  toJSON () {
+    return this.toString()
+  }
+  toString (opts) {
+    if (opts && opts.strict) {
+      // Strict mode enforces the standard as close to the foot of the
+      // letter as it can.
+      if (!(
+        // The spec has very restricted productions for algorithms.
+        // https://www.w3.org/TR/CSP2/#source-list-syntax
+        SPEC_ALGORITHMS.some(x => x === this.algorithm) &&
+        // Usually, if someone insists on using a "different" base64, we
+        // leave it as-is, since there's multiple standards, and the
+        // specified is not a URL-safe variant.
+        // https://www.w3.org/TR/CSP2/#base64_value
+        this.digest.match(BASE64_REGEX) &&
+        // Option syntax is strictly visual chars.
+        // https://w3c.github.io/webappsec-subresource-integrity/#grammardef-option-expression
+        // https://tools.ietf.org/html/rfc5234#appendix-B.1
+        (this.options || []).every(opt => opt.match(VCHAR_REGEX))
+      )) {
+        return ''
+      }
+    }
+    const options = this.options && this.options.length
+    ? `?${this.options.join('?')}`
+    : ''
+    return `${this.algorithm}-${this.digest}${options}`
+  }
+}
+
+class Integrity {
+  get isIntegrity () { return true }
+  toJSON () {
+    return this.toString()
+  }
+  toString (opts) {
+    opts = opts || {}
+    let sep = opts.sep || ' '
+    if (opts.strict) {
+      // Entries must be separated by whitespace, according to spec.
+      sep = sep.replace(/\S+/g, ' ')
+    }
+    return Object.keys(this).map(k => {
+      return this[k].map(hash => {
+        return Hash.prototype.toString.call(hash, opts)
+      }).filter(x => x.length).join(sep)
+    }).filter(x => x.length).join(sep)
+  }
+  concat (integrity, opts) {
+    const other = typeof integrity === 'string'
+    ? integrity
+    : stringify(integrity, opts)
+    return parse(`${this.toString(opts)} ${other}`, opts)
+  }
+  hexDigest () {
+    return parse(this, {single: true}).hexDigest()
+  }
+  match (integrity, opts) {
+    const other = parse(integrity, opts)
+    const algo = other.pickAlgorithm(opts)
+    return (
+      this[algo] &&
+      other[algo] &&
+      this[algo].find(hash =>
+        other[algo].find(otherhash =>
+          hash.digest === otherhash.digest
+        )
+      )
+    ) || false
+  }
+  pickAlgorithm (opts) {
+    const pickAlgorithm = (opts && opts.pickAlgorithm) || getPrioritizedHash
+    const keys = Object.keys(this)
+    if (!keys.length) {
+      throw new Error(`No algorithms available for ${
+        JSON.stringify(this.toString())
+      }`)
+    }
+    return keys.reduce((acc, algo) => {
+      return pickAlgorithm(acc, algo) || acc
+    })
+  }
+}
+
+module.exports.parse = parse
+function parse (sri, opts) {
+  opts = opts || {}
+  if (typeof sri === 'string') {
+    return _parse(sri, opts)
+  } else if (sri.algorithm && sri.digest) {
+    const fullSri = new Integrity()
+    fullSri[sri.algorithm] = [sri]
+    return _parse(stringify(fullSri, opts), opts)
+  } else {
+    return _parse(stringify(sri, opts), opts)
+  }
+}
+
+function _parse (integrity, opts) {
+  // 3.4.3. Parse metadata
+  // https://w3c.github.io/webappsec-subresource-integrity/#parse-metadata
+  if (opts.single) {
+    return new Hash(integrity, opts)
+  }
+  return integrity.trim().split(/\s+/).reduce((acc, string) => {
+    const hash = new Hash(string, opts)
+    if (hash.algorithm && hash.digest) {
+      const algo = hash.algorithm
+      if (!acc[algo]) { acc[algo] = [] }
+      acc[algo].push(hash)
+    }
+    return acc
+  }, new Integrity())
+}
+
+module.exports.stringify = stringify
+function stringify (obj, opts) {
+  if (obj.algorithm && obj.digest) {
+    return Hash.prototype.toString.call(obj, opts)
+  } else if (typeof obj === 'string') {
+    return stringify(parse(obj, opts), opts)
+  } else {
+    return Integrity.prototype.toString.call(obj, opts)
+  }
+}
+
+module.exports.fromHex = fromHex
+function fromHex (hexDigest, algorithm, opts) {
+  const optString = (opts && opts.options && opts.options.length)
+  ? `?${opts.options.join('?')}`
+  : ''
+  return parse(
+    `${algorithm}-${
+      Buffer.from(hexDigest, 'hex').toString('base64')
+    }${optString}`, opts
+  )
+}
+
+module.exports.fromData = fromData
+function fromData (data, opts) {
+  opts = opts || {}
+  const algorithms = opts.algorithms || ['sha512']
+  const optString = opts.options && opts.options.length
+  ? `?${opts.options.join('?')}`
+  : ''
+  return algorithms.reduce((acc, algo) => {
+    const digest = crypto.createHash(algo).update(data).digest('base64')
+    const hash = new Hash(
+      `${algo}-${digest}${optString}`,
+       opts
+    )
+    if (hash.algorithm && hash.digest) {
+      const algo = hash.algorithm
+      if (!acc[algo]) { acc[algo] = [] }
+      acc[algo].push(hash)
+    }
+    return acc
+  }, new Integrity())
+}
+
+module.exports.fromStream = fromStream
+function fromStream (stream, opts) {
+  opts = opts || {}
+  const P = opts.Promise || Promise
+  const istream = integrityStream(opts)
+  return new P((resolve, reject) => {
+    stream.pipe(istream)
+    stream.on('error', reject)
+    istream.on('error', reject)
+    let sri
+    istream.on('integrity', s => { sri = s })
+    istream.on('end', () => resolve(sri))
+    istream.on('data', () => {})
+  })
+}
+
+module.exports.checkData = checkData
+function checkData (data, sri, opts) {
+  opts = opts || {}
+  sri = parse(sri, opts)
+  if (!Object.keys(sri).length) {
+    if (opts.error) {
+      throw Object.assign(
+        new Error('No valid integrity hashes to check against'), {
+          code: 'EINTEGRITY'
+        }
+      )
+    } else {
+      return false
+    }
+  }
+  const algorithm = sri.pickAlgorithm(opts)
+  const digest = crypto.createHash(algorithm).update(data).digest('base64')
+  const newSri = parse({algorithm, digest})
+  const match = newSri.match(sri, opts)
+  if (match || !opts.error) {
+    return match
+  } else if (typeof opts.size === 'number' && (data.length !== opts.size)) {
+    const err = new Error(`data size mismatch when checking ${sri}.\n  Wanted: ${opts.size}\n  Found: ${data.length}`)
+    err.code = 'EBADSIZE'
+    err.found = data.length
+    err.expected = opts.size
+    err.sri = sri
+    throw err
+  } else {
+    const err = new Error(`Integrity checksum failed when using ${algorithm}: Wanted ${sri}, but got ${newSri}. (${data.length} bytes)`)
+    err.code = 'EINTEGRITY'
+    err.found = newSri
+    err.expected = sri
+    err.algorithm = algorithm
+    err.sri = sri
+    throw err
+  }
+}
+
+module.exports.checkStream = checkStream
+function checkStream (stream, sri, opts) {
+  opts = opts || {}
+  const P = opts.Promise || Promise
+  const checker = integrityStream(Object.assign({}, opts, {
+    integrity: sri
+  }))
+  return new P((resolve, reject) => {
+    stream.pipe(checker)
+    stream.on('error', reject)
+    checker.on('error', reject)
+    let sri
+    checker.on('verified', s => { sri = s })
+    checker.on('end', () => resolve(sri))
+    checker.on('data', () => {})
+  })
+}
+
+module.exports.integrityStream = integrityStream
+function integrityStream (opts) {
+  opts = opts || {}
+  // For verification
+  const sri = opts.integrity && parse(opts.integrity, opts)
+  const goodSri = sri && Object.keys(sri).length
+  const algorithm = goodSri && sri.pickAlgorithm(opts)
+  const digests = goodSri && sri[algorithm]
+  // Calculating stream
+  const algorithms = Array.from(
+    new Set(
+      (opts.algorithms || ['sha512'])
+      .concat(algorithm ? [algorithm] : [])
+    )
+  )
+  const hashes = algorithms.map(crypto.createHash)
+  let streamSize = 0
+  const stream = new Transform({
+    transform (chunk, enc, cb) {
+      streamSize += chunk.length
+      hashes.forEach(h => h.update(chunk, enc))
+      cb(null, chunk, enc)
+    }
+  }).on('end', () => {
+    const optString = (opts.options && opts.options.length)
+    ? `?${opts.options.join('?')}`
+    : ''
+    const newSri = parse(hashes.map((h, i) => {
+      return `${algorithms[i]}-${h.digest('base64')}${optString}`
+    }).join(' '), opts)
+    // Integrity verification mode
+    const match = goodSri && newSri.match(sri, opts)
+    if (typeof opts.size === 'number' && streamSize !== opts.size) {
+      const err = new Error(`stream size mismatch when checking ${sri}.\n  Wanted: ${opts.size}\n  Found: ${streamSize}`)
+      err.code = 'EBADSIZE'
+      err.found = streamSize
+      err.expected = opts.size
+      err.sri = sri
+      stream.emit('error', err)
+    } else if (opts.integrity && !match) {
+      const err = new Error(`${sri} integrity checksum failed when using ${algorithm}: wanted ${digests} but got ${newSri}. (${streamSize} bytes)`)
+      err.code = 'EINTEGRITY'
+      err.found = newSri
+      err.expected = digests
+      err.algorithm = algorithm
+      err.sri = sri
+      stream.emit('error', err)
+    } else {
+      stream.emit('size', streamSize)
+      stream.emit('integrity', newSri)
+      match && stream.emit('verified', match)
+    }
+  })
+  return stream
+}
+
+module.exports.create = createIntegrity
+function createIntegrity (opts) {
+  opts = opts || {}
+  const algorithms = opts.algorithms || ['sha512']
+  const optString = opts.options && opts.options.length
+  ? `?${opts.options.join('?')}`
+  : ''
+
+  const hashes = algorithms.map(crypto.createHash)
+
+  return {
+    update: function (chunk, enc) {
+      hashes.forEach(h => h.update(chunk, enc))
+      return this
+    },
+    digest: function (enc) {
+      const integrity = algorithms.reduce((acc, algo) => {
+        const digest = hashes.shift().digest('base64')
+        const hash = new Hash(
+          `${algo}-${digest}${optString}`,
+          opts
+        )
+        if (hash.algorithm && hash.digest) {
+          const algo = hash.algorithm
+          if (!acc[algo]) { acc[algo] = [] }
+          acc[algo].push(hash)
+        }
+        return acc
+      }, new Integrity())
+
+      return integrity
+    }
+  }
+}
+
+const NODE_HASHES = new Set(crypto.getHashes())
+
+// This is a Best Effort™ at a reasonable priority for hash algos
+const DEFAULT_PRIORITY = [
+  'md5', 'whirlpool', 'sha1', 'sha224', 'sha256', 'sha384', 'sha512',
+  // TODO - it's unclear _which_ of these Node will actually use as its name
+  //        for the algorithm, so we guesswork it based on the OpenSSL names.
+  'sha3',
+  'sha3-256', 'sha3-384', 'sha3-512',
+  'sha3_256', 'sha3_384', 'sha3_512'
+].filter(algo => NODE_HASHES.has(algo))
+
+function getPrioritizedHash (algo1, algo2) {
+  return DEFAULT_PRIORITY.indexOf(algo1.toLowerCase()) >= DEFAULT_PRIORITY.indexOf(algo2.toLowerCase())
+  ? algo1
+  : algo2
+}
+
+
+/***/ }),
+/* 66 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// Copyright 2011 Mark Cavage <mcavage@gmail.com> All rights reserved.
+
+// If you have no idea what ASN.1 or BER is, see this:
+// ftp://ftp.rsa.com/pub/pkcs/ascii/layman.asc
+
+var Ber = __webpack_require__(514);
+
+
+
+// --- Exported API
+
+module.exports = {
+
+  Ber: Ber,
+
+  BerReader: Ber.Reader,
+
+  BerWriter: Ber.Writer
+
+};
+
+
+/***/ }),
+/* 67 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.home = undefined;
+
+var _rootUser;
+
+function _load_rootUser() {
+  return _rootUser = _interopRequireDefault(__webpack_require__(223));
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const path = __webpack_require__(0);
+
+const home = exports.home = __webpack_require__(49).homedir();
+
+const userHomeDir = (_rootUser || _load_rootUser()).default ? path.resolve('/usr/local/share') : home;
+
+exports.default = userHomeDir;
+
+/***/ }),
+/* 68 */
+/***/ (function(module, exports) {
+
+module.exports = function (it) {
+  if (typeof it != 'function') throw TypeError(it + ' is not a function!');
+  return it;
+};
+
+
+/***/ }),
+/* 69 */
+/***/ (function(module, exports) {
+
+var toString = {}.toString;
+
+module.exports = function (it) {
+  return toString.call(it).slice(8, -1);
+};
+
+
+/***/ }),
+/* 70 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// optional / simple context binding
+var aFunction = __webpack_require__(68);
+module.exports = function (fn, that, length) {
+  aFunction(fn);
+  if (that === undefined) return fn;
+  switch (length) {
+    case 1: return function (a) {
+      return fn.call(that, a);
+    };
+    case 2: return function (a, b) {
+      return fn.call(that, a, b);
+    };
+    case 3: return function (a, b, c) {
+      return fn.call(that, a, b, c);
+    };
+  }
+  return function (/* ...args */) {
+    return fn.apply(that, arguments);
+  };
+};
+
+
+/***/ }),
+/* 71 */
+/***/ (function(module, exports) {
+
+var hasOwnProperty = {}.hasOwnProperty;
+module.exports = function (it, key) {
+  return hasOwnProperty.call(it, key);
+};
+
+
+/***/ }),
+/* 72 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var anObject = __webpack_require__(35);
+var IE8_DOM_DEFINE = __webpack_require__(238);
+var toPrimitive = __webpack_require__(255);
+var dP = Object.defineProperty;
+
+exports.f = __webpack_require__(51) ? Object.defineProperty : function defineProperty(O, P, Attributes) {
+  anObject(O);
+  P = toPrimitive(P, true);
+  anObject(Attributes);
+  if (IE8_DOM_DEFINE) try {
+    return dP(O, P, Attributes);
+  } catch (e) { /* empty */ }
+  if ('get' in Attributes || 'set' in Attributes) throw TypeError('Accessors not supported!');
+  if ('value' in Attributes) O[P] = Attributes.value;
+  return O;
+};
+
+
+/***/ }),
+/* 73 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+// JS-YAML's default schema for `load` function.
+// It is not described in the YAML specification.
+//
+// This schema is based on JS-YAML's default safe schema and includes
+// JavaScript-specific types: !!js/undefined, !!js/regexp and !!js/function.
+//
+// Also this schema is used as default base schema at `Schema.create` function.
+
+
+
+
+
+var Schema = __webpack_require__(44);
+
+
+module.exports = Schema.DEFAULT = new Schema({
+  include: [
+    __webpack_require__(55)
+  ],
+  explicit: [
+    __webpack_require__(290),
+    __webpack_require__(289),
+    __webpack_require__(288)
+  ]
+});
+
+
+/***/ }),
+/* 74 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// Copyright 2015 Joyent, Inc.
+
+var assert = __webpack_require__(16);
+var util = __webpack_require__(3);
+
+function FingerprintFormatError(fp, format) {
+	if (Error.captureStackTrace)
+		Error.captureStackTrace(this, FingerprintFormatError);
+	this.name = 'FingerprintFormatError';
+	this.fingerprint = fp;
+	this.format = format;
+	this.message = 'Fingerprint format is not supported, or is invalid: ';
+	if (fp !== undefined)
+		this.message += ' fingerprint = ' + fp;
+	if (format !== undefined)
+		this.message += ' format = ' + format;
+}
+util.inherits(FingerprintFormatError, Error);
+
+function InvalidAlgorithmError(alg) {
+	if (Error.captureStackTrace)
+		Error.captureStackTrace(this, InvalidAlgorithmError);
+	this.name = 'InvalidAlgorithmError';
+	this.algorithm = alg;
+	this.message = 'Algorithm "' + alg + '" is not supported';
+}
+util.inherits(InvalidAlgorithmError, Error);
+
+function KeyParseError(name, format, innerErr) {
+	if (Error.captureStackTrace)
+		Error.captureStackTrace(this, KeyParseError);
+	this.name = 'KeyParseError';
+	this.format = format;
+	this.keyName = name;
+	this.innerErr = innerErr;
+	this.message = 'Failed to parse ' + name + ' as a valid ' + format +
+	    ' format key: ' + innerErr.message;
+}
+util.inherits(KeyParseError, Error);
+
+function SignatureParseError(type, format, innerErr) {
+	if (Error.captureStackTrace)
+		Error.captureStackTrace(this, SignatureParseError);
+	this.name = 'SignatureParseError';
+	this.type = type;
+	this.format = format;
+	this.innerErr = innerErr;
+	this.message = 'Failed to parse the given data as a ' + type +
+	    ' signature in ' + format + ' format: ' + innerErr.message;
+}
+util.inherits(SignatureParseError, Error);
+
+function CertificateParseError(name, format, innerErr) {
+	if (Error.captureStackTrace)
+		Error.captureStackTrace(this, CertificateParseError);
+	this.name = 'CertificateParseError';
+	this.format = format;
+	this.certName = name;
+	this.innerErr = innerErr;
+	this.message = 'Failed to parse ' + name + ' as a valid ' + format +
+	    ' format certificate: ' + innerErr.message;
+}
+util.inherits(CertificateParseError, Error);
+
+function KeyEncryptedError(name, format) {
+	if (Error.captureStackTrace)
+		Error.captureStackTrace(this, KeyEncryptedError);
+	this.name = 'KeyEncryptedError';
+	this.format = format;
+	this.keyName = name;
+	this.message = 'The ' + format + ' format key ' + name + ' is ' +
+	    'encrypted (password-protected), and no passphrase was ' +
+	    'provided in `options`';
+}
+util.inherits(KeyEncryptedError, Error);
+
+module.exports = {
+	FingerprintFormatError: FingerprintFormatError,
+	InvalidAlgorithmError: InvalidAlgorithmError,
+	KeyParseError: KeyParseError,
+	SignatureParseError: SignatureParseError,
+	KeyEncryptedError: KeyEncryptedError,
+	CertificateParseError: CertificateParseError
+};
+
+
+/***/ }),
+/* 75 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// Copyright 2015 Joyent, Inc.
+
+module.exports = Signature;
+
+var assert = __webpack_require__(16);
+var Buffer = __webpack_require__(15).Buffer;
+var algs = __webpack_require__(32);
+var crypto = __webpack_require__(11);
+var errs = __webpack_require__(74);
+var utils = __webpack_require__(26);
+var asn1 = __webpack_require__(66);
+var SSHBuffer = __webpack_require__(159);
+
+var InvalidAlgorithmError = errs.InvalidAlgorithmError;
+var SignatureParseError = errs.SignatureParseError;
+
+function Signature(opts) {
+	assert.object(opts, 'options');
+	assert.arrayOfObject(opts.parts, 'options.parts');
+	assert.string(opts.type, 'options.type');
+
+	var partLookup = {};
+	for (var i = 0; i < opts.parts.length; ++i) {
+		var part = opts.parts[i];
+		partLookup[part.name] = part;
+	}
+
+	this.type = opts.type;
+	this.hashAlgorithm = opts.hashAlgo;
+	this.curve = opts.curve;
+	this.parts = opts.parts;
+	this.part = partLookup;
+}
+
+Signature.prototype.toBuffer = function (format) {
+	if (format === undefined)
+		format = 'asn1';
+	assert.string(format, 'format');
+
+	var buf;
+	var stype = 'ssh-' + this.type;
+
+	switch (this.type) {
+	case 'rsa':
+		switch (this.hashAlgorithm) {
+		case 'sha256':
+			stype = 'rsa-sha2-256';
+			break;
+		case 'sha512':
+			stype = 'rsa-sha2-512';
+			break;
+		case 'sha1':
+		case undefined:
+			break;
+		default:
+			throw (new Error('SSH signature ' +
+			    'format does not support hash ' +
+			    'algorithm ' + this.hashAlgorithm));
+		}
+		if (format === 'ssh') {
+			buf = new SSHBuffer({});
+			buf.writeString(stype);
+			buf.writePart(this.part.sig);
+			return (buf.toBuffer());
+		} else {
+			return (this.part.sig.data);
+		}
+		break;
+
+	case 'ed25519':
+		if (format === 'ssh') {
+			buf = new SSHBuffer({});
+			buf.writeString(stype);
+			buf.writePart(this.part.sig);
+			return (buf.toBuffer());
+		} else {
+			return (this.part.sig.data);
+		}
+		break;
+
+	case 'dsa':
+	case 'ecdsa':
+		var r, s;
+		if (format === 'asn1') {
+			var der = new asn1.BerWriter();
+			der.startSequence();
+			r = utils.mpNormalize(this.part.r.data);
+			s = utils.mpNormalize(this.part.s.data);
+			der.writeBuffer(r, asn1.Ber.Integer);
+			der.writeBuffer(s, asn1.Ber.Integer);
+			der.endSequence();
+			return (der.buffer);
+		} else if (format === 'ssh' && this.type === 'dsa') {
+			buf = new SSHBuffer({});
+			buf.writeString('ssh-dss');
+			r = this.part.r.data;
+			if (r.length > 20 && r[0] === 0x00)
+				r = r.slice(1);
+			s = this.part.s.data;
+			if (s.length > 20 && s[0] === 0x00)
+				s = s.slice(1);
+			if ((this.hashAlgorithm &&
+			    this.hashAlgorithm !== 'sha1') ||
+			    r.length + s.length !== 40) {
+				throw (new Error('OpenSSH only supports ' +
+				    'DSA signatures with SHA1 hash'));
+			}
+			buf.writeBuffer(Buffer.concat([r, s]));
+			return (buf.toBuffer());
+		} else if (format === 'ssh' && this.type === 'ecdsa') {
+			var inner = new SSHBuffer({});
+			r = this.part.r.data;
+			inner.writeBuffer(r);
+			inner.writePart(this.part.s);
+
+			buf = new SSHBuffer({});
+			/* XXX: find a more proper way to do this? */
+			var curve;
+			if (r[0] === 0x00)
+				r = r.slice(1);
+			var sz = r.length * 8;
+			if (sz === 256)
+				curve = 'nistp256';
+			else if (sz === 384)
+				curve = 'nistp384';
+			else if (sz === 528)
+				curve = 'nistp521';
+			buf.writeString('ecdsa-sha2-' + curve);
+			buf.writeBuffer(inner.toBuffer());
+			return (buf.toBuffer());
+		}
+		throw (new Error('Invalid signature format'));
+	default:
+		throw (new Error('Invalid signature data'));
+	}
+};
+
+Signature.prototype.toString = function (format) {
+	assert.optionalString(format, 'format');
+	return (this.toBuffer(format).toString('base64'));
+};
+
+Signature.parse = function (data, type, format) {
+	if (typeof (data) === 'string')
+		data = Buffer.from(data, 'base64');
+	assert.buffer(data, 'data');
+	assert.string(format, 'format');
+	assert.string(type, 'type');
+
+	var opts = {};
+	opts.type = type.toLowerCase();
+	opts.parts = [];
+
+	try {
+		assert.ok(data.length > 0, 'signature must not be empty');
+		switch (opts.type) {
+		case 'rsa':
+			return (parseOneNum(data, type, format, opts));
+		case 'ed25519':
+			return (parseOneNum(data, type, format, opts));
+
+		case 'dsa':
+		case 'ecdsa':
+			if (format === 'asn1')
+				return (parseDSAasn1(data, type, format, opts));
+			else if (opts.type === 'dsa')
+				return (parseDSA(data, type, format, opts));
+			else
+				return (parseECDSA(data, type, format, opts));
+
+		default:
+			throw (new InvalidAlgorithmError(type));
+		}
+
+	} catch (e) {
+		if (e instanceof InvalidAlgorithmError)
+			throw (e);
+		throw (new SignatureParseError(type, format, e));
+	}
+};
+
+function parseOneNum(data, type, format, opts) {
+	if (format === 'ssh') {
+		try {
+			var buf = new SSHBuffer({buffer: data});
+			var head = buf.readString();
+		} catch (e) {
+			/* fall through */
+		}
+		if (buf !== undefined) {
+			var msg = 'SSH signature does not match expected ' +
+			    'type (expected ' + type + ', got ' + head + ')';
+			switch (head) {
+			case 'ssh-rsa':
+				assert.strictEqual(type, 'rsa', msg);
+				opts.hashAlgo = 'sha1';
+				break;
+			case 'rsa-sha2-256':
+				assert.strictEqual(type, 'rsa', msg);
+				opts.hashAlgo = 'sha256';
+				break;
+			case 'rsa-sha2-512':
+				assert.strictEqual(type, 'rsa', msg);
+				opts.hashAlgo = 'sha512';
+				break;
+			case 'ssh-ed25519':
+				assert.strictEqual(type, 'ed25519', msg);
+				opts.hashAlgo = 'sha512';
+				break;
+			default:
+				throw (new Error('Unknown SSH signature ' +
+				    'type: ' + head));
+			}
+			var sig = buf.readPart();
+			assert.ok(buf.atEnd(), 'extra trailing bytes');
+			sig.name = 'sig';
+			opts.parts.push(sig);
+			return (new Signature(opts));
+		}
+	}
+	opts.parts.push({name: 'sig', data: data});
+	return (new Signature(opts));
+}
+
+function parseDSAasn1(data, type, format, opts) {
+	var der = new asn1.BerReader(data);
+	der.readSequence();
+	var r = der.readString(asn1.Ber.Integer, true);
+	var s = der.readString(asn1.Ber.Integer, true);
+
+	opts.parts.push({name: 'r', data: utils.mpNormalize(r)});
+	opts.parts.push({name: 's', data: utils.mpNormalize(s)});
+
+	return (new Signature(opts));
+}
+
+function parseDSA(data, type, format, opts) {
+	if (data.length != 40) {
+		var buf = new SSHBuffer({buffer: data});
+		var d = buf.readBuffer();
+		if (d.toString('ascii') === 'ssh-dss')
+			d = buf.readBuffer();
+		assert.ok(buf.atEnd(), 'extra trailing bytes');
+		assert.strictEqual(d.length, 40, 'invalid inner length');
+		data = d;
+	}
+	opts.parts.push({name: 'r', data: data.slice(0, 20)});
+	opts.parts.push({name: 's', data: data.slice(20, 40)});
+	return (new Signature(opts));
+}
+
+function parseECDSA(data, type, format, opts) {
+	var buf = new SSHBuffer({buffer: data});
+
+	var r, s;
+	var inner = buf.readBuffer();
+	var stype = inner.toString('ascii');
+	if (stype.slice(0, 6) === 'ecdsa-') {
+		var parts = stype.split('-');
+		assert.strictEqual(parts[0], 'ecdsa');
+		assert.strictEqual(parts[1], 'sha2');
+		opts.curve = parts[2];
+		switch (opts.curve) {
+		case 'nistp256':
+			opts.hashAlgo = 'sha256';
+			break;
+		case 'nistp384':
+			opts.hashAlgo = 'sha384';
+			break;
+		case 'nistp521':
+			opts.hashAlgo = 'sha512';
+			break;
+		default:
+			throw (new Error('Unsupported ECDSA curve: ' +
+			    opts.curve));
+		}
+		inner = buf.readBuffer();
+		assert.ok(buf.atEnd(), 'extra trailing bytes on outer');
+		buf = new SSHBuffer({buffer: inner});
+		r = buf.readPart();
+	} else {
+		r = {data: inner};
+	}
+
+	s = buf.readPart();
+	assert.ok(buf.atEnd(), 'extra trailing bytes');
+
+	r.name = 'r';
+	s.name = 's';
+
+	opts.parts.push(r);
+	opts.parts.push(s);
+	return (new Signature(opts));
+}
+
+Signature.isSignature = function (obj, ver) {
+	return (utils.isCompatible(obj, Signature, ver));
+};
+
+/*
+ * API versions for Signature:
+ * [1,0] -- initial ver
+ * [2,0] -- support for rsa in full ssh format, compat with sshpk-agent
+ *          hashAlgorithm property
+ * [2,1] -- first tagged version
+ */
+Signature.prototype._sshpkApiVersion = [2, 1];
+
+Signature._oldVersionDetect = function (obj) {
+	assert.func(obj.toBuffer);
+	if (obj.hasOwnProperty('hashAlgorithm'))
+		return ([2, 0]);
+	return ([1, 0]);
+};
+
+
+/***/ }),
+/* 76 */
+/***/ (function(module, exports, __webpack_require__) {
+
+(function(nacl) {
+'use strict';
+
+// Ported in 2014 by Dmitry Chestnykh and Devi Mandiri.
+// Public domain.
+//
+// Implementation derived from TweetNaCl version 20140427.
+// See for details: http://tweetnacl.cr.yp.to/
+
+var gf = function(init) {
+  var i, r = new Float64Array(16);
+  if (init) for (i = 0; i < init.length; i++) r[i] = init[i];
+  return r;
+};
+
+//  Pluggable, initialized in high-level API below.
+var randombytes = function(/* x, n */) { throw new Error('no PRNG'); };
+
+var _0 = new Uint8Array(16);
+var _9 = new Uint8Array(32); _9[0] = 9;
+
+var gf0 = gf(),
+    gf1 = gf([1]),
+    _121665 = gf([0xdb41, 1]),
+    D = gf([0x78a3, 0x1359, 0x4dca, 0x75eb, 0xd8ab, 0x4141, 0x0a4d, 0x0070, 0xe898, 0x7779, 0x4079, 0x8cc7, 0xfe73, 0x2b6f, 0x6cee, 0x5203]),
+    D2 = gf([0xf159, 0x26b2, 0x9b94, 0xebd6, 0xb156, 0x8283, 0x149a, 0x00e0, 0xd130, 0xeef3, 0x80f2, 0x198e, 0xfce7, 0x56df, 0xd9dc, 0x2406]),
+    X = gf([0xd51a, 0x8f25, 0x2d60, 0xc956, 0xa7b2, 0x9525, 0xc760, 0x692c, 0xdc5c, 0xfdd6, 0xe231, 0xc0a4, 0x53fe, 0xcd6e, 0x36d3, 0x2169]),
+    Y = gf([0x6658, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666]),
+    I = gf([0xa0b0, 0x4a0e, 0x1b27, 0xc4ee, 0xe478, 0xad2f, 0x1806, 0x2f43, 0xd7a7, 0x3dfb, 0x0099, 0x2b4d, 0xdf0b, 0x4fc1, 0x2480, 0x2b83]);
+
+function ts64(x, i, h, l) {
+  x[i]   = (h >> 24) & 0xff;
+  x[i+1] = (h >> 16) & 0xff;
+  x[i+2] = (h >>  8) & 0xff;
+  x[i+3] = h & 0xff;
+  x[i+4] = (l >> 24)  & 0xff;
+  x[i+5] = (l >> 16)  & 0xff;
+  x[i+6] = (l >>  8)  & 0xff;
+  x[i+7] = l & 0xff;
+}
+
+function vn(x, xi, y, yi, n) {
+  var i,d = 0;
+  for (i = 0; i < n; i++) d |= x[xi+i]^y[yi+i];
+  return (1 & ((d - 1) >>> 8)) - 1;
+}
+
+function crypto_verify_16(x, xi, y, yi) {
+  return vn(x,xi,y,yi,16);
+}
+
+function crypto_verify_32(x, xi, y, yi) {
+  return vn(x,xi,y,yi,32);
+}
+
+function core_salsa20(o, p, k, c) {
+  var j0  = c[ 0] & 0xff | (c[ 1] & 0xff)<<8 | (c[ 2] & 0xff)<<16 | (c[ 3] & 0xff)<<24,
+      j1  = k[ 0] & 0xff | (k[ 1] & 0xff)<<8 | (k[ 2] & 0xff)<<16 | (k[ 3] & 0xff)<<24,
+      j2  = k[ 4] & 0xff | (k[ 5] & 0xff)<<8 | (k[ 6] & 0xff)<<16 | (k[ 7] & 0xff)<<24,
+      j3  = k[ 8] & 0xff | (k[ 9] & 0xff)<<8 | (k[10] & 0xff)<<16 | (k[11] & 0xff)<<24,
+      j4  = k[12] & 0xff | (k[13] & 0xff)<<8 | (k[14] & 0xff)<<16 | (k[15] & 0xff)<<24,
+      j5  = c[ 4] & 0xff | (c[ 5] & 0xff)<<8 | (c[ 6] & 0xff)<<16 | (c[ 7] & 0xff)<<24,
+      j6  = p[ 0] & 0xff | (p[ 1] & 0xff)<<8 | (p[ 2] & 0xff)<<16 | (p[ 3] & 0xff)<<24,
+      j7  = p[ 4] & 0xff | (p[ 5] & 0xff)<<8 | (p[ 6] & 0xff)<<16 | (p[ 7] & 0xff)<<24,
+      j8  = p[ 8] & 0xff | (p[ 9] & 0xff)<<8 | (p[10] & 0xff)<<16 | (p[11] & 0xff)<<24,
+      j9  = p[12] & 0xff | (p[13] & 0xff)<<8 | (p[14] & 0xff)<<16 | (p[15] & 0xff)<<24,
+      j10 = c[ 8] & 0xff | (c[ 9] & 0xff)<<8 | (c[10] & 0xff)<<16 | (c[11] & 0xff)<<24,
+      j11 = k[16] & 0xff | (k[17] & 0xff)<<8 | (k[18] & 0xff)<<16 | (k[19] & 0xff)<<24,
+      j12 = k[20] & 0xff | (k[21] & 0xff)<<8 | (k[22] & 0xff)<<16 | (k[23] & 0xff)<<24,
+      j13 = k[24] & 0xff | (k[25] & 0xff)<<8 | (k[26] & 0xff)<<16 | (k[27] & 0xff)<<24,
+      j14 = k[28] & 0xff | (k[29] & 0xff)<<8 | (k[30] & 0xff)<<16 | (k[31] & 0xff)<<24,
+      j15 = c[12] & 0xff | (c[13] & 0xff)<<8 | (c[14] & 0xff)<<16 | (c[15] & 0xff)<<24;
+
+  var x0 = j0, x1 = j1, x2 = j2, x3 = j3, x4 = j4, x5 = j5, x6 = j6, x7 = j7,
+      x8 = j8, x9 = j9, x10 = j10, x11 = j11, x12 = j12, x13 = j13, x14 = j14,
+      x15 = j15, u;
+
+  for (var i = 0; i < 20; i += 2) {
+    u = x0 + x12 | 0;
+    x4 ^= u<<7 | u>>>(32-7);
+    u = x4 + x0 | 0;
+    x8 ^= u<<9 | u>>>(32-9);
+    u = x8 + x4 | 0;
+    x12 ^= u<<13 | u>>>(32-13);
+    u = x12 + x8 | 0;
+    x0 ^= u<<18 | u>>>(32-18);
+
+    u = x5 + x1 | 0;
+    x9 ^= u<<7 | u>>>(32-7);
+    u = x9 + x5 | 0;
+    x13 ^= u<<9 | u>>>(32-9);
+    u = x13 + x9 | 0;
+    x1 ^= u<<13 | u>>>(32-13);
+    u = x1 + x13 | 0;
+    x5 ^= u<<18 | u>>>(32-18);
+
+    u = x10 + x6 | 0;
+    x14 ^= u<<7 | u>>>(32-7);
+    u = x14 + x10 | 0;
+    x2 ^= u<<9 | u>>>(32-9);
+    u = x2 + x14 | 0;
+    x6 ^= u<<13 | u>>>(32-13);
+    u = x6 + x2 | 0;
+    x10 ^= u<<18 | u>>>(32-18);
+
+    u = x15 + x11 | 0;
+    x3 ^= u<<7 | u>>>(32-7);
+    u = x3 + x15 | 0;
+    x7 ^= u<<9 | u>>>(32-9);
+    u = x7 + x3 | 0;
+    x11 ^= u<<13 | u>>>(32-13);
+    u = x11 + x7 | 0;
+    x15 ^= u<<18 | u>>>(32-18);
+
+    u = x0 + x3 | 0;
+    x1 ^= u<<7 | u>>>(32-7);
+    u = x1 + x0 | 0;
+    x2 ^= u<<9 | u>>>(32-9);
+    u = x2 + x1 | 0;
+    x3 ^= u<<13 | u>>>(32-13);
+    u = x3 + x2 | 0;
+    x0 ^= u<<18 | u>>>(32-18);
+
+    u = x5 + x4 | 0;
+    x6 ^= u<<7 | u>>>(32-7);
+    u = x6 + x5 | 0;
+    x7 ^= u<<9 | u>>>(32-9);
+    u = x7 + x6 | 0;
+    x4 ^= u<<13 | u>>>(32-13);
+    u = x4 + x7 | 0;
+    x5 ^= u<<18 | u>>>(32-18);
+
+    u = x10 + x9 | 0;
+    x11 ^= u<<7 | u>>>(32-7);
+    u = x11 + x10 | 0;
+    x8 ^= u<<9 | u>>>(32-9);
+    u = x8 + x11 | 0;
+    x9 ^= u<<13 | u>>>(32-13);
+    u = x9 + x8 | 0;
+    x10 ^= u<<18 | u>>>(32-18);
+
+    u = x15 + x14 | 0;
+    x12 ^= u<<7 | u>>>(32-7);
+    u = x12 + x15 | 0;
+    x13 ^= u<<9 | u>>>(32-9);
+    u = x13 + x12 | 0;
+    x14 ^= u<<13 | u>>>(32-13);
+    u = x14 + x13 | 0;
+    x15 ^= u<<18 | u>>>(32-18);
+  }
+   x0 =  x0 +  j0 | 0;
+   x1 =  x1 +  j1 | 0;
+   x2 =  x2 +  j2 | 0;
+   x3 =  x3 +  j3 | 0;
+   x4 =  x4 +  j4 | 0;
+   x5 =  x5 +  j5 | 0;
+   x6 =  x6 +  j6 | 0;
+   x7 =  x7 +  j7 | 0;
+   x8 =  x8 +  j8 | 0;
+   x9 =  x9 +  j9 | 0;
+  x10 = x10 + j10 | 0;
+  x11 = x11 + j11 | 0;
+  x12 = x12 + j12 | 0;
+  x13 = x13 + j13 | 0;
+  x14 = x14 + j14 | 0;
+  x15 = x15 + j15 | 0;
+
+  o[ 0] = x0 >>>  0 & 0xff;
+  o[ 1] = x0 >>>  8 & 0xff;
+  o[ 2] = x0 >>> 16 & 0xff;
+  o[ 3] = x0 >>> 24 & 0xff;
+
+  o[ 4] = x1 >>>  0 & 0xff;
+  o[ 5] = x1 >>>  8 & 0xff;
+  o[ 6] = x1 >>> 16 & 0xff;
+  o[ 7] = x1 >>> 24 & 0xff;
+
+  o[ 8] = x2 >>>  0 & 0xff;
+  o[ 9] = x2 >>>  8 & 0xff;
+  o[10] = x2 >>> 16 & 0xff;
+  o[11] = x2 >>> 24 & 0xff;
+
+  o[12] = x3 >>>  0 & 0xff;
+  o[13] = x3 >>>  8 & 0xff;
+  o[14] = x3 >>> 16 & 0xff;
+  o[15] = x3 >>> 24 & 0xff;
+
+  o[16] = x4 >>>  0 & 0xff;
+  o[17] = x4 >>>  8 & 0xff;
+  o[18] = x4 >>> 16 & 0xff;
+  o[19] = x4 >>> 24 & 0xff;
+
+  o[20] = x5 >>>  0 & 0xff;
+  o[21] = x5 >>>  8 & 0xff;
+  o[22] = x5 >>> 16 & 0xff;
+  o[23] = x5 >>> 24 & 0xff;
+
+  o[24] = x6 >>>  0 & 0xff;
+  o[25] = x6 >>>  8 & 0xff;
+  o[26] = x6 >>> 16 & 0xff;
+  o[27] = x6 >>> 24 & 0xff;
+
+  o[28] = x7 >>>  0 & 0xff;
+  o[29] = x7 >>>  8 & 0xff;
+  o[30] = x7 >>> 16 & 0xff;
+  o[31] = x7 >>> 24 & 0xff;
+
+  o[32] = x8 >>>  0 & 0xff;
+  o[33] = x8 >>>  8 & 0xff;
+  o[34] = x8 >>> 16 & 0xff;
+  o[35] = x8 >>> 24 & 0xff;
+
+  o[36] = x9 >>>  0 & 0xff;
+  o[37] = x9 >>>  8 & 0xff;
+  o[38] = x9 >>> 16 & 0xff;
+  o[39] = x9 >>> 24 & 0xff;
+
+  o[40] = x10 >>>  0 & 0xff;
+  o[41] = x10 >>>  8 & 0xff;
+  o[42] = x10 >>> 16 & 0xff;
+  o[43] = x10 >>> 24 & 0xff;
+
+  o[44] = x11 >>>  0 & 0xff;
+  o[45] = x11 >>>  8 & 0xff;
+  o[46] = x11 >>> 16 & 0xff;
+  o[47] = x11 >>> 24 & 0xff;
+
+  o[48] = x12 >>>  0 & 0xff;
+  o[49] = x12 >>>  8 & 0xff;
+  o[50] = x12 >>> 16 & 0xff;
+  o[51] = x12 >>> 24 & 0xff;
+
+  o[52] = x13 >>>  0 & 0xff;
+  o[53] = x13 >>>  8 & 0xff;
+  o[54] = x13 >>> 16 & 0xff;
+  o[55] = x13 >>> 24 & 0xff;
+
+  o[56] = x14 >>>  0 & 0xff;
+  o[57] = x14 >>>  8 & 0xff;
+  o[58] = x14 >>> 16 & 0xff;
+  o[59] = x14 >>> 24 & 0xff;
+
+  o[60] = x15 >>>  0 & 0xff;
+  o[61] = x15 >>>  8 & 0xff;
+  o[62] = x15 >>> 16 & 0xff;
+  o[63] = x15 >>> 24 & 0xff;
+}
+
+function core_hsalsa20(o,p,k,c) {
+  var j0  = c[ 0] & 0xff | (c[ 1] & 0xff)<<8 | (c[ 2] & 0xff)<<16 | (c[ 3] & 0xff)<<24,
+      j1  = k[ 0] & 0xff | (k[ 1] & 0xff)<<8 | (k[ 2] & 0xff)<<16 | (k[ 3] & 0xff)<<24,
+      j2  = k[ 4] & 0xff | (k[ 5] & 0xff)<<8 | (k[ 6] & 0xff)<<16 | (k[ 7] & 0xff)<<24,
+      j3  = k[ 8] & 0xff | (k[ 9] & 0xff)<<8 | (k[10] & 0xff)<<16 | (k[11] & 0xff)<<24,
+      j4  = k[12] & 0xff | (k[13] & 0xff)<<8 | (k[14] & 0xff)<<16 | (k[15] & 0xff)<<24,
+      j5  = c[ 4] & 0xff | (c[ 5] & 0xff)<<8 | (c[ 6] & 0xff)<<16 | (c[ 7] & 0xff)<<24,
+      j6  = p[ 0] & 0xff | (p[ 1] & 0xff)<<8 | (p[ 2] & 0xff)<<16 | (p[ 3] & 0xff)<<24,
+      j7  = p[ 4] & 0xff | (p[ 5] & 0xff)<<8 | (p[ 6] & 0xff)<<16 | (p[ 7] & 0xff)<<24,
+      j8  = p[ 8] & 0xff | (p[ 9] & 0xff)<<8 | (p[10] & 0xff)<<16 | (p[11] & 0xff)<<24,
+      j9  = p[12] & 0xff | (p[13] & 0xff)<<8 | (p[14] & 0xff)<<16 | (p[15] & 0xff)<<24,
+      j10 = c[ 8] & 0xff | (c[ 9] & 0xff)<<8 | (c[10] & 0xff)<<16 | (c[11] & 0xff)<<24,
+      j11 = k[16] & 0xff | (k[17] & 0xff)<<8 | (k[18] & 0xff)<<16 | (k[19] & 0xff)<<24,
+      j12 = k[20] & 0xff | (k[21] & 0xff)<<8 | (k[22] & 0xff)<<16 | (k[23] & 0xff)<<24,
+      j13 = k[24] & 0xff | (k[25] & 0xff)<<8 | (k[26] & 0xff)<<16 | (k[27] & 0xff)<<24,
+      j14 = k[28] & 0xff | (k[29] & 0xff)<<8 | (k[30] & 0xff)<<16 | (k[31] & 0xff)<<24,
+      j15 = c[12] & 0xff | (c[13] & 0xff)<<8 | (c[14] & 0xff)<<16 | (c[15] & 0xff)<<24;
+
+  var x0 = j0, x1 = j1, x2 = j2, x3 = j3, x4 = j4, x5 = j5, x6 = j6, x7 = j7,
+      x8 = j8, x9 = j9, x10 = j10, x11 = j11, x12 = j12, x13 = j13, x14 = j14,
+      x15 = j15, u;
+
+  for (var i = 0; i < 20; i += 2) {
+    u = x0 + x12 | 0;
+    x4 ^= u<<7 | u>>>(32-7);
+    u = x4 + x0 | 0;
+    x8 ^= u<<9 | u>>>(32-9);
+    u = x8 + x4 | 0;
+    x12 ^= u<<13 | u>>>(32-13);
+    u = x12 + x8 | 0;
+    x0 ^= u<<18 | u>>>(32-18);
+
+    u = x5 + x1 | 0;
+    x9 ^= u<<7 | u>>>(32-7);
+    u = x9 + x5 | 0;
+    x13 ^= u<<9 | u>>>(32-9);
+    u = x13 + x9 | 0;
+    x1 ^= u<<13 | u>>>(32-13);
+    u = x1 + x13 | 0;
+    x5 ^= u<<18 | u>>>(32-18);
+
+    u = x10 + x6 | 0;
+    x14 ^= u<<7 | u>>>(32-7);
+    u = x14 + x10 | 0;
+    x2 ^= u<<9 | u>>>(32-9);
+    u = x2 + x14 | 0;
+    x6 ^= u<<13 | u>>>(32-13);
+    u = x6 + x2 | 0;
+    x10 ^= u<<18 | u>>>(32-18);
+
+    u = x15 + x11 | 0;
+    x3 ^= u<<7 | u>>>(32-7);
+    u = x3 + x15 | 0;
+    x7 ^= u<<9 | u>>>(32-9);
+    u = x7 + x3 | 0;
+    x11 ^= u<<13 | u>>>(32-13);
+    u = x11 + x7 | 0;
+    x15 ^= u<<18 | u>>>(32-18);
+
+    u = x0 + x3 | 0;
+    x1 ^= u<<7 | u>>>(32-7);
+    u = x1 + x0 | 0;
+    x2 ^= u<<9 | u>>>(32-9);
+    u = x2 + x1 | 0;
+    x3 ^= u<<13 | u>>>(32-13);
+    u = x3 + x2 | 0;
+    x0 ^= u<<18 | u>>>(32-18);
+
+    u = x5 + x4 | 0;
+    x6 ^= u<<7 | u>>>(32-7);
+    u = x6 + x5 | 0;
+    x7 ^= u<<9 | u>>>(32-9);
+    u = x7 + x6 | 0;
+    x4 ^= u<<13 | u>>>(32-13);
+    u = x4 + x7 | 0;
+    x5 ^= u<<18 | u>>>(32-18);
+
+    u = x10 + x9 | 0;
+    x11 ^= u<<7 | u>>>(32-7);
+    u = x11 + x10 | 0;
+    x8 ^= u<<9 | u>>>(32-9);
+    u = x8 + x11 | 0;
+    x9 ^= u<<13 | u>>>(32-13);
+    u = x9 + x8 | 0;
+    x10 ^= u<<18 | u>>>(32-18);
+
+    u = x15 + x14 | 0;
+    x12 ^= u<<7 | u>>>(32-7);
+    u = x12 + x15 | 0;
+    x13 ^= u<<9 | u>>>(32-9);
+    u = x13 + x12 | 0;
+    x14 ^= u<<13 | u>>>(32-13);
+    u = x14 + x13 | 0;
+    x15 ^= u<<18 | u>>>(32-18);
+  }
+
+  o[ 0] = x0 >>>  0 & 0xff;
+  o[ 1] = x0 >>>  8 & 0xff;
+  o[ 2] = x0 >>> 16 & 0xff;
+  o[ 3] = x0 >>> 24 & 0xff;
+
+  o[ 4] = x5 >>>  0 & 0xff;
+  o[ 5] = x5 >>>  8 & 0xff;
+  o[ 6] = x5 >>> 16 & 0xff;
+  o[ 7] = x5 >>> 24 & 0xff;
+
+  o[ 8] = x10 >>>  0 & 0xff;
+  o[ 9] = x10 >>>  8 & 0xff;
+  o[10] = x10 >>> 16 & 0xff;
+  o[11] = x10 >>> 24 & 0xff;
+
+  o[12] = x15 >>>  0 & 0xff;
+  o[13] = x15 >>>  8 & 0xff;
+  o[14] = x15 >>> 16 & 0xff;
+  o[15] = x15 >>> 24 & 0xff;
+
+  o[16] = x6 >>>  0 & 0xff;
+  o[17] = x6 >>>  8 & 0xff;
+  o[18] = x6 >>> 16 & 0xff;
+  o[19] = x6 >>> 24 & 0xff;
+
+  o[20] = x7 >>>  0 & 0xff;
+  o[21] = x7 >>>  8 & 0xff;
+  o[22] = x7 >>> 16 & 0xff;
+  o[23] = x7 >>> 24 & 0xff;
+
+  o[24] = x8 >>>  0 & 0xff;
+  o[25] = x8 >>>  8 & 0xff;
+  o[26] = x8 >>> 16 & 0xff;
+  o[27] = x8 >>> 24 & 0xff;
+
+  o[28] = x9 >>>  0 & 0xff;
+  o[29] = x9 >>>  8 & 0xff;
+  o[30] = x9 >>> 16 & 0xff;
+  o[31] = x9 >>> 24 & 0xff;
+}
+
+function crypto_core_salsa20(out,inp,k,c) {
+  core_salsa20(out,inp,k,c);
+}
+
+function crypto_core_hsalsa20(out,inp,k,c) {
+  core_hsalsa20(out,inp,k,c);
+}
+
+var sigma = new Uint8Array([101, 120, 112, 97, 110, 100, 32, 51, 50, 45, 98, 121, 116, 101, 32, 107]);
+            // "expand 32-byte k"
+
+function crypto_stream_salsa20_xor(c,cpos,m,mpos,b,n,k) {
+  var z = new Uint8Array(16), x = new Uint8Array(64);
+  var u, i;
+  for (i = 0; i < 16; i++) z[i] = 0;
+  for (i = 0; i < 8; i++) z[i] = n[i];
+  while (b >= 64) {
+    crypto_core_salsa20(x,z,k,sigma);
+    for (i = 0; i < 64; i++) c[cpos+i] = m[mpos+i] ^ x[i];
+    u = 1;
+    for (i = 8; i < 16; i++) {
+      u = u + (z[i] & 0xff) | 0;
+      z[i] = u & 0xff;
+      u >>>= 8;
+    }
+    b -= 64;
+    cpos += 64;
+    mpos += 64;
+  }
+  if (b > 0) {
+    crypto_core_salsa20(x,z,k,sigma);
+    for (i = 0; i < b; i++) c[cpos+i] = m[mpos+i] ^ x[i];
+  }
+  return 0;
+}
+
+function crypto_stream_salsa20(c,cpos,b,n,k) {
+  var z = new Uint8Array(16), x = new Uint8Array(64);
+  var u, i;
+  for (i = 0; i < 16; i++) z[i] = 0;
+  for (i = 0; i < 8; i++) z[i] = n[i];
+  while (b >= 64) {
+    crypto_core_salsa20(x,z,k,sigma);
+    for (i = 0; i < 64; i++) c[cpos+i] = x[i];
+    u = 1;
+    for (i = 8; i < 16; i++) {
+      u = u + (z[i] & 0xff) | 0;
+      z[i] = u & 0xff;
+      u >>>= 8;
+    }
+    b -= 64;
+    cpos += 64;
+  }
+  if (b > 0) {
+    crypto_core_salsa20(x,z,k,sigma);
+    for (i = 0; i < b; i++) c[cpos+i] = x[i];
+  }
+  return 0;
+}
+
+function crypto_stream(c,cpos,d,n,k) {
+  var s = new Uint8Array(32);
+  crypto_core_hsalsa20(s,n,k,sigma);
+  var sn = new Uint8Array(8);
+  for (var i = 0; i < 8; i++) sn[i] = n[i+16];
+  return crypto_stream_salsa20(c,cpos,d,sn,s);
+}
+
+function crypto_stream_xor(c,cpos,m,mpos,d,n,k) {
+  var s = new Uint8Array(32);
+  crypto_core_hsalsa20(s,n,k,sigma);
+  var sn = new Uint8Array(8);
+  for (var i = 0; i < 8; i++) sn[i] = n[i+16];
+  return crypto_stream_salsa20_xor(c,cpos,m,mpos,d,sn,s);
+}
+
+/*
+* Port of Andrew Moon's Poly1305-donna-16. Public domain.
+* https://github.com/floodyberry/poly1305-donna
+*/
+
+var poly1305 = function(key) {
+  this.buffer = new Uint8Array(16);
+  this.r = new Uint16Array(10);
+  this.h = new Uint16Array(10);
+  this.pad = new Uint16Array(8);
+  this.leftover = 0;
+  this.fin = 0;
+
+  var t0, t1, t2, t3, t4, t5, t6, t7;
+
+  t0 = key[ 0] & 0xff | (key[ 1] & 0xff) << 8; this.r[0] = ( t0                     ) & 0x1fff;
+  t1 = key[ 2] & 0xff | (key[ 3] & 0xff) << 8; this.r[1] = ((t0 >>> 13) | (t1 <<  3)) & 0x1fff;
+  t2 = key[ 4] & 0xff | (key[ 5] & 0xff) << 8; this.r[2] = ((t1 >>> 10) | (t2 <<  6)) & 0x1f03;
+  t3 = key[ 6] & 0xff | (key[ 7] & 0xff) << 8; this.r[3] = ((t2 >>>  7) | (t3 <<  9)) & 0x1fff;
+  t4 = key[ 8] & 0xff | (key[ 9] & 0xff) << 8; this.r[4] = ((t3 >>>  4) | (t4 << 12)) & 0x00ff;
+  this.r[5] = ((t4 >>>  1)) & 0x1ffe;
+  t5 = key[10] & 0xff | (key[11] & 0xff) << 8; this.r[6] = ((t4 >>> 14) | (t5 <<  2)) & 0x1fff;
+  t6 = key[12] & 0xff | (key[13] & 0xff) << 8; this.r[7] = ((t5 >>> 11) | (t6 <<  5)) & 0x1f81;
+  t7 = key[14] & 0xff | (key[15] & 0xff) << 8; this.r[8] = ((t6 >>>  8) | (t7 <<  8)) & 0x1fff;
+  this.r[9] = ((t7 >>>  5)) & 0x007f;
+
+  this.pad[0] = key[16] & 0xff | (key[17] & 0xff) << 8;
+  this.pad[1] = key[18] & 0xff | (key[19] & 0xff) << 8;
+  this.pad[2] = key[20] & 0xff | (key[21] & 0xff) << 8;
+  this.pad[3] = key[22] & 0xff | (key[23] & 0xff) << 8;
+  this.pad[4] = key[24] & 0xff | (key[25] & 0xff) << 8;
+  this.pad[5] = key[26] & 0xff | (key[27] & 0xff) << 8;
+  this.pad[6] = key[28] & 0xff | (key[29] & 0xff) << 8;
+  this.pad[7] = key[30] & 0xff | (key[31] & 0xff) << 8;
+};
+
+poly1305.prototype.blocks = function(m, mpos, bytes) {
+  var hibit = this.fin ? 0 : (1 << 11);
+  var t0, t1, t2, t3, t4, t5, t6, t7, c;
+  var d0, d1, d2, d3, d4, d5, d6, d7, d8, d9;
+
+  var h0 = this.h[0],
+      h1 = this.h[1],
+      h2 = this.h[2],
+      h3 = this.h[3],
+      h4 = this.h[4],
+      h5 = this.h[5],
+      h6 = this.h[6],
+      h7 = this.h[7],
+      h8 = this.h[8],
+      h9 = this.h[9];
+
+  var r0 = this.r[0],
+      r1 = this.r[1],
+      r2 = this.r[2],
+      r3 = this.r[3],
+      r4 = this.r[4],
+      r5 = this.r[5],
+      r6 = this.r[6],
+      r7 = this.r[7],
+      r8 = this.r[8],
+      r9 = this.r[9];
+
+  while (bytes >= 16) {
+    t0 = m[mpos+ 0] & 0xff | (m[mpos+ 1] & 0xff) << 8; h0 += ( t0                     ) & 0x1fff;
+    t1 = m[mpos+ 2] & 0xff | (m[mpos+ 3] & 0xff) << 8; h1 += ((t0 >>> 13) | (t1 <<  3)) & 0x1fff;
+    t2 = m[mpos+ 4] & 0xff | (m[mpos+ 5] & 0xff) << 8; h2 += ((t1 >>> 10) | (t2 <<  6)) & 0x1fff;
+    t3 = m[mpos+ 6] & 0xff | (m[mpos+ 7] & 0xff) << 8; h3 += ((t2 >>>  7) | (t3 <<  9)) & 0x1fff;
+    t4 = m[mpos+ 8] & 0xff | (m[mpos+ 9] & 0xff) << 8; h4 += ((t3 >>>  4) | (t4 << 12)) & 0x1fff;
+    h5 += ((t4 >>>  1)) & 0x1fff;
+    t5 = m[mpos+10] & 0xff | (m[mpos+11] & 0xff) << 8; h6 += ((t4 >>> 14) | (t5 <<  2)) & 0x1fff;
+    t6 = m[mpos+12] & 0xff | (m[mpos+13] & 0xff) << 8; h7 += ((t5 >>> 11) | (t6 <<  5)) & 0x1fff;
+    t7 = m[mpos+14] & 0xff | (m[mpos+15] & 0xff) << 8; h8 += ((t6 >>>  8) | (t7 <<  8)) & 0x1fff;
+    h9 += ((t7 >>> 5)) | hibit;
+
+    c = 0;
+
+    d0 = c;
+    d0 += h0 * r0;
+    d0 += h1 * (5 * r9);
+    d0 += h2 * (5 * r8);
+    d0 += h3 * (5 * r7);
+    d0 += h4 * (5 * r6);
+    c = (d0 >>> 13); d0 &= 0x1fff;
+    d0 += h5 * (5 * r5);
+    d0 += h6 * (5 * r4);
+    d0 += h7 * (5 * r3);
+    d0 += h8 * (5 * r2);
+    d0 += h9 * (5 * r1);
+    c += (d0 >>> 13); d0 &= 0x1fff;
+
+    d1 = c;
+    d1 += h0 * r1;
+    d1 += h1 * r0;
+    d1 += h2 * (5 * r9);
+    d1 += h3 * (5 * r8);
+    d1 += h4 * (5 * r7);
+    c = (d1 >>> 13); d1 &= 0x1fff;
+    d1 += h5 * (5 * r6);
+    d1 += h6 * (5 * r5);
+    d1 += h7 * (5 * r4);
+    d1 += h8 * (5 * r3);
+    d1 += h9 * (5 * r2);
+    c += (d1 >>> 13); d1 &= 0x1fff;
+
+    d2 = c;
+    d2 += h0 * r2;
+    d2 += h1 * r1;
+    d2 += h2 * r0;
+    d2 += h3 * (5 * r9);
+    d2 += h4 * (5 * r8);
+    c = (d2 >>> 13); d2 &= 0x1fff;
+    d2 += h5 * (5 * r7);
+    d2 += h6 * (5 * r6);
+    d2 += h7 * (5 * r5);
+    d2 += h8 * (5 * r4);
+    d2 += h9 * (5 * r3);
+    c += (d2 >>> 13); d2 &= 0x1fff;
+
+    d3 = c;
+    d3 += h0 * r3;
+    d3 += h1 * r2;
+    d3 += h2 * r1;
+    d3 += h3 * r0;
+    d3 += h4 * (5 * r9);
+    c = (d3 >>> 13); d3 &= 0x1fff;
+    d3 += h5 * (5 * r8);
+    d3 += h6 * (5 * r7);
+    d3 += h7 * (5 * r6);
+    d3 += h8 * (5 * r5);
+    d3 += h9 * (5 * r4);
+    c += (d3 >>> 13); d3 &= 0x1fff;
+
+    d4 = c;
+    d4 += h0 * r4;
+    d4 += h1 * r3;
+    d4 += h2 * r2;
+    d4 += h3 * r1;
+    d4 += h4 * r0;
+    c = (d4 >>> 13); d4 &= 0x1fff;
+    d4 += h5 * (5 * r9);
+    d4 += h6 * (5 * r8);
+    d4 += h7 * (5 * r7);
+    d4 += h8 * (5 * r6);
+    d4 += h9 * (5 * r5);
+    c += (d4 >>> 13); d4 &= 0x1fff;
+
+    d5 = c;
+    d5 += h0 * r5;
+    d5 += h1 * r4;
+    d5 += h2 * r3;
+    d5 += h3 * r2;
+    d5 += h4 * r1;
+    c = (d5 >>> 13); d5 &= 0x1fff;
+    d5 += h5 * r0;
+    d5 += h6 * (5 * r9);
+    d5 += h7 * (5 * r8);
+    d5 += h8 * (5 * r7);
+    d5 += h9 * (5 * r6);
+    c += (d5 >>> 13); d5 &= 0x1fff;
+
+    d6 = c;
+    d6 += h0 * r6;
+    d6 += h1 * r5;
+    d6 += h2 * r4;
+    d6 += h3 * r3;
+    d6 += h4 * r2;
+    c = (d6 >>> 13); d6 &= 0x1fff;
+    d6 += h5 * r1;
+    d6 += h6 * r0;
+    d6 += h7 * (5 * r9);
+    d6 += h8 * (5 * r8);
+    d6 += h9 * (5 * r7);
+    c += (d6 >>> 13); d6 &= 0x1fff;
+
+    d7 = c;
+    d7 += h0 * r7;
+    d7 += h1 * r6;
+    d7 += h2 * r5;
+    d7 += h3 * r4;
+    d7 += h4 * r3;
+    c = (d7 >>> 13); d7 &= 0x1fff;
+    d7 += h5 * r2;
+    d7 += h6 * r1;
+    d7 += h7 * r0;
+    d7 += h8 * (5 * r9);
+    d7 += h9 * (5 * r8);
+    c += (d7 >>> 13); d7 &= 0x1fff;
+
+    d8 = c;
+    d8 += h0 * r8;
+    d8 += h1 * r7;
+    d8 += h2 * r6;
+    d8 += h3 * r5;
+    d8 += h4 * r4;
+    c = (d8 >>> 13); d8 &= 0x1fff;
+    d8 += h5 * r3;
+    d8 += h6 * r2;
+    d8 += h7 * r1;
+    d8 += h8 * r0;
+    d8 += h9 * (5 * r9);
+    c += (d8 >>> 13); d8 &= 0x1fff;
+
+    d9 = c;
+    d9 += h0 * r9;
+    d9 += h1 * r8;
+    d9 += h2 * r7;
+    d9 += h3 * r6;
+    d9 += h4 * r5;
+    c = (d9 >>> 13); d9 &= 0x1fff;
+    d9 += h5 * r4;
+    d9 += h6 * r3;
+    d9 += h7 * r2;
+    d9 += h8 * r1;
+    d9 += h9 * r0;
+    c += (d9 >>> 13); d9 &= 0x1fff;
+
+    c = (((c << 2) + c)) | 0;
+    c = (c + d0) | 0;
+    d0 = c & 0x1fff;
+    c = (c >>> 13);
+    d1 += c;
+
+    h0 = d0;
+    h1 = d1;
+    h2 = d2;
+    h3 = d3;
+    h4 = d4;
+    h5 = d5;
+    h6 = d6;
+    h7 = d7;
+    h8 = d8;
+    h9 = d9;
+
+    mpos += 16;
+    bytes -= 16;
+  }
+  this.h[0] = h0;
+  this.h[1] = h1;
+  this.h[2] = h2;
+  this.h[3] = h3;
+  this.h[4] = h4;
+  this.h[5] = h5;
+  this.h[6] = h6;
+  this.h[7] = h7;
+  this.h[8] = h8;
+  this.h[9] = h9;
+};
+
+poly1305.prototype.finish = function(mac, macpos) {
+  var g = new Uint16Array(10);
+  var c, mask, f, i;
+
+  if (this.leftover) {
+    i = this.leftover;
+    this.buffer[i++] = 1;
+    for (; i < 16; i++) this.buffer[i] = 0;
+    this.fin = 1;
+    this.blocks(this.buffer, 0, 16);
+  }
+
+  c = this.h[1] >>> 13;
+  this.h[1] &= 0x1fff;
+  for (i = 2; i < 10; i++) {
+    this.h[i] += c;
+    c = this.h[i] >>> 13;
+    this.h[i] &= 0x1fff;
+  }
+  this.h[0] += (c * 5);
+  c = this.h[0] >>> 13;
+  this.h[0] &= 0x1fff;
+  this.h[1] += c;
+  c = this.h[1] >>> 13;
+  this.h[1] &= 0x1fff;
+  this.h[2] += c;
+
+  g[0] = this.h[0] + 5;
+  c = g[0] >>> 13;
+  g[0] &= 0x1fff;
+  for (i = 1; i < 10; i++) {
+    g[i] = this.h[i] + c;
+    c = g[i] >>> 13;
+    g[i] &= 0x1fff;
+  }
+  g[9] -= (1 << 13);
+
+  mask = (c ^ 1) - 1;
+  for (i = 0; i < 10; i++) g[i] &= mask;
+  mask = ~mask;
+  for (i = 0; i < 10; i++) this.h[i] = (this.h[i] & mask) | g[i];
+
+  this.h[0] = ((this.h[0]       ) | (this.h[1] << 13)                    ) & 0xffff;
+  this.h[1] = ((this.h[1] >>>  3) | (this.h[2] << 10)                    ) & 0xffff;
+  this.h[2] = ((this.h[2] >>>  6) | (this.h[3] <<  7)                    ) & 0xffff;
+  this.h[3] = ((this.h[3] >>>  9) | (this.h[4] <<  4)                    ) & 0xffff;
+  this.h[4] = ((this.h[4] >>> 12) | (this.h[5] <<  1) | (this.h[6] << 14)) & 0xffff;
+  this.h[5] = ((this.h[6] >>>  2) | (this.h[7] << 11)                    ) & 0xffff;
+  this.h[6] = ((this.h[7] >>>  5) | (this.h[8] <<  8)                    ) & 0xffff;
+  this.h[7] = ((this.h[8] >>>  8) | (this.h[9] <<  5)                    ) & 0xffff;
+
+  f = this.h[0] + this.pad[0];
+  this.h[0] = f & 0xffff;
+  for (i = 1; i < 8; i++) {
+    f = (((this.h[i] + this.pad[i]) | 0) + (f >>> 16)) | 0;
+    this.h[i] = f & 0xffff;
+  }
+
+  mac[macpos+ 0] = (this.h[0] >>> 0) & 0xff;
+  mac[macpos+ 1] = (this.h[0] >>> 8) & 0xff;
+  mac[macpos+ 2] = (this.h[1] >>> 0) & 0xff;
+  mac[macpos+ 3] = (this.h[1] >>> 8) & 0xff;
+  mac[macpos+ 4] = (this.h[2] >>> 0) & 0xff;
+  mac[macpos+ 5] = (this.h[2] >>> 8) & 0xff;
+  mac[macpos+ 6] = (this.h[3] >>> 0) & 0xff;
+  mac[macpos+ 7] = (this.h[3] >>> 8) & 0xff;
+  mac[macpos+ 8] = (this.h[4] >>> 0) & 0xff;
+  mac[macpos+ 9] = (this.h[4] >>> 8) & 0xff;
+  mac[macpos+10] = (this.h[5] >>> 0) & 0xff;
+  mac[macpos+11] = (this.h[5] >>> 8) & 0xff;
+  mac[macpos+12] = (this.h[6] >>> 0) & 0xff;
+  mac[macpos+13] = (this.h[6] >>> 8) & 0xff;
+  mac[macpos+14] = (this.h[7] >>> 0) & 0xff;
+  mac[macpos+15] = (this.h[7] >>> 8) & 0xff;
+};
+
+poly1305.prototype.update = function(m, mpos, bytes) {
+  var i, want;
+
+  if (this.leftover) {
+    want = (16 - this.leftover);
+    if (want > bytes)
+      want = bytes;
+    for (i = 0; i < want; i++)
+      this.buffer[this.leftover + i] = m[mpos+i];
+    bytes -= want;
+    mpos += want;
+    this.leftover += want;
+    if (this.leftover < 16)
+      return;
+    this.blocks(this.buffer, 0, 16);
+    this.leftover = 0;
+  }
+
+  if (bytes >= 16) {
+    want = bytes - (bytes % 16);
+    this.blocks(m, mpos, want);
+    mpos += want;
+    bytes -= want;
+  }
+
+  if (bytes) {
+    for (i = 0; i < bytes; i++)
+      this.buffer[this.leftover + i] = m[mpos+i];
+    this.leftover += bytes;
+  }
+};
+
+function crypto_onetimeauth(out, outpos, m, mpos, n, k) {
+  var s = new poly1305(k);
+  s.update(m, mpos, n);
+  s.finish(out, outpos);
+  return 0;
+}
+
+function crypto_onetimeauth_verify(h, hpos, m, mpos, n, k) {
+  var x = new Uint8Array(16);
+  crypto_onetimeauth(x,0,m,mpos,n,k);
+  return crypto_verify_16(h,hpos,x,0);
+}
+
+function crypto_secretbox(c,m,d,n,k) {
+  var i;
+  if (d < 32) return -1;
+  crypto_stream_xor(c,0,m,0,d,n,k);
+  crypto_onetimeauth(c, 16, c, 32, d - 32, c);
+  for (i = 0; i < 16; i++) c[i] = 0;
+  return 0;
+}
+
+function crypto_secretbox_open(m,c,d,n,k) {
+  var i;
+  var x = new Uint8Array(32);
+  if (d < 32) return -1;
+  crypto_stream(x,0,32,n,k);
+  if (crypto_onetimeauth_verify(c, 16,c, 32,d - 32,x) !== 0) return -1;
+  crypto_stream_xor(m,0,c,0,d,n,k);
+  for (i = 0; i < 32; i++) m[i] = 0;
+  return 0;
+}
+
+function set25519(r, a) {
+  var i;
+  for (i = 0; i < 16; i++) r[i] = a[i]|0;
+}
+
+function car25519(o) {
+  var i, v, c = 1;
+  for (i = 0; i < 16; i++) {
+    v = o[i] + c + 65535;
+    c = Math.floor(v / 65536);
+    o[i] = v - c * 65536;
+  }
+  o[0] += c-1 + 37 * (c-1);
+}
+
+function sel25519(p, q, b) {
+  var t, c = ~(b-1);
+  for (var i = 0; i < 16; i++) {
+    t = c & (p[i] ^ q[i]);
+    p[i] ^= t;
+    q[i] ^= t;
+  }
+}
+
+function pack25519(o, n) {
+  var i, j, b;
+  var m = gf(), t = gf();
+  for (i = 0; i < 16; i++) t[i] = n[i];
+  car25519(t);
+  car25519(t);
+  car25519(t);
+  for (j = 0; j < 2; j++) {
+    m[0] = t[0] - 0xffed;
+    for (i = 1; i < 15; i++) {
+      m[i] = t[i] - 0xffff - ((m[i-1]>>16) & 1);
+      m[i-1] &= 0xffff;
+    }
+    m[15] = t[15] - 0x7fff - ((m[14]>>16) & 1);
+    b = (m[15]>>16) & 1;
+    m[14] &= 0xffff;
+    sel25519(t, m, 1-b);
+  }
+  for (i = 0; i < 16; i++) {
+    o[2*i] = t[i] & 0xff;
+    o[2*i+1] = t[i]>>8;
+  }
+}
+
+function neq25519(a, b) {
+  var c = new Uint8Array(32), d = new Uint8Array(32);
+  pack25519(c, a);
+  pack25519(d, b);
+  return crypto_verify_32(c, 0, d, 0);
+}
+
+function par25519(a) {
+  var d = new Uint8Array(32);
+  pack25519(d, a);
+  return d[0] & 1;
+}
+
+function unpack25519(o, n) {
+  var i;
+  for (i = 0; i < 16; i++) o[i] = n[2*i] + (n[2*i+1] << 8);
+  o[15] &= 0x7fff;
+}
+
+function A(o, a, b) {
+  for (var i = 0; i < 16; i++) o[i] = a[i] + b[i];
+}
+
+function Z(o, a, b) {
+  for (var i = 0; i < 16; i++) o[i] = a[i] - b[i];
+}
+
+function M(o, a, b) {
+  var v, c,
+     t0 = 0,  t1 = 0,  t2 = 0,  t3 = 0,  t4 = 0,  t5 = 0,  t6 = 0,  t7 = 0,
+     t8 = 0,  t9 = 0, t10 = 0, t11 = 0, t12 = 0, t13 = 0, t14 = 0, t15 = 0,
+    t16 = 0, t17 = 0, t18 = 0, t19 = 0, t20 = 0, t21 = 0, t22 = 0, t23 = 0,
+    t24 = 0, t25 = 0, t26 = 0, t27 = 0, t28 = 0, t29 = 0, t30 = 0,
+    b0 = b[0],
+    b1 = b[1],
+    b2 = b[2],
+    b3 = b[3],
+    b4 = b[4],
+    b5 = b[5],
+    b6 = b[6],
+    b7 = b[7],
+    b8 = b[8],
+    b9 = b[9],
+    b10 = b[10],
+    b11 = b[11],
+    b12 = b[12],
+    b13 = b[13],
+    b14 = b[14],
+    b15 = b[15];
+
+  v = a[0];
+  t0 += v * b0;
+  t1 += v * b1;
+  t2 += v * b2;
+  t3 += v * b3;
+  t4 += v * b4;
+  t5 += v * b5;
+  t6 += v * b6;
+  t7 += v * b7;
+  t8 += v * b8;
+  t9 += v * b9;
+  t10 += v * b10;
+  t11 += v * b11;
+  t12 += v * b12;
+  t13 += v * b13;
+  t14 += v * b14;
+  t15 += v * b15;
+  v = a[1];
+  t1 += v * b0;
+  t2 += v * b1;
+  t3 += v * b2;
+  t4 += v * b3;
+  t5 += v * b4;
+  t6 += v * b5;
+  t7 += v * b6;
+  t8 += v * b7;
+  t9 += v * b8;
+  t10 += v * b9;
+  t11 += v * b10;
+  t12 += v * b11;
+  t13 += v * b12;
+  t14 += v * b13;
+  t15 += v * b14;
+  t16 += v * b15;
+  v = a[2];
+  t2 += v * b0;
+  t3 += v * b1;
+  t4 += v * b2;
+  t5 += v * b3;
+  t6 += v * b4;
+  t7 += v * b5;
+  t8 += v * b6;
+  t9 += v * b7;
+  t10 += v * b8;
+  t11 += v * b9;
+  t12 += v * b10;
+  t13 += v * b11;
+  t14 += v * b12;
+  t15 += v * b13;
+  t16 += v * b14;
+  t17 += v * b15;
+  v = a[3];
+  t3 += v * b0;
+  t4 += v * b1;
+  t5 += v * b2;
+  t6 += v * b3;
+  t7 += v * b4;
+  t8 += v * b5;
+  t9 += v * b6;
+  t10 += v * b7;
+  t11 += v * b8;
+  t12 += v * b9;
+  t13 += v * b10;
+  t14 += v * b11;
+  t15 += v * b12;
+  t16 += v * b13;
+  t17 += v * b14;
+  t18 += v * b15;
+  v = a[4];
+  t4 += v * b0;
+  t5 += v * b1;
+  t6 += v * b2;
+  t7 += v * b3;
+  t8 += v * b4;
+  t9 += v * b5;
+  t10 += v * b6;
+  t11 += v * b7;
+  t12 += v * b8;
+  t13 += v * b9;
+  t14 += v * b10;
+  t15 += v * b11;
+  t16 += v * b12;
+  t17 += v * b13;
+  t18 += v * b14;
+  t19 += v * b15;
+  v = a[5];
+  t5 += v * b0;
+  t6 += v * b1;
+  t7 += v * b2;
+  t8 += v * b3;
+  t9 += v * b4;
+  t10 += v * b5;
+  t11 += v * b6;
+  t12 += v * b7;
+  t13 += v * b8;
+  t14 += v * b9;
+  t15 += v * b10;
+  t16 += v * b11;
+  t17 += v * b12;
+  t18 += v * b13;
+  t19 += v * b14;
+  t20 += v * b15;
+  v = a[6];
+  t6 += v * b0;
+  t7 += v * b1;
+  t8 += v * b2;
+  t9 += v * b3;
+  t10 += v * b4;
+  t11 += v * b5;
+  t12 += v * b6;
+  t13 += v * b7;
+  t14 += v * b8;
+  t15 += v * b9;
+  t16 += v * b10;
+  t17 += v * b11;
+  t18 += v * b12;
+  t19 += v * b13;
+  t20 += v * b14;
+  t21 += v * b15;
+  v = a[7];
+  t7 += v * b0;
+  t8 += v * b1;
+  t9 += v * b2;
+  t10 += v * b3;
+  t11 += v * b4;
+  t12 += v * b5;
+  t13 += v * b6;
+  t14 += v * b7;
+  t15 += v * b8;
+  t16 += v * b9;
+  t17 += v * b10;
+  t18 += v * b11;
+  t19 += v * b12;
+  t20 += v * b13;
+  t21 += v * b14;
+  t22 += v * b15;
+  v = a[8];
+  t8 += v * b0;
+  t9 += v * b1;
+  t10 += v * b2;
+  t11 += v * b3;
+  t12 += v * b4;
+  t13 += v * b5;
+  t14 += v * b6;
+  t15 += v * b7;
+  t16 += v * b8;
+  t17 += v * b9;
+  t18 += v * b10;
+  t19 += v * b11;
+  t20 += v * b12;
+  t21 += v * b13;
+  t22 += v * b14;
+  t23 += v * b15;
+  v = a[9];
+  t9 += v * b0;
+  t10 += v * b1;
+  t11 += v * b2;
+  t12 += v * b3;
+  t13 += v * b4;
+  t14 += v * b5;
+  t15 += v * b6;
+  t16 += v * b7;
+  t17 += v * b8;
+  t18 += v * b9;
+  t19 += v * b10;
+  t20 += v * b11;
+  t21 += v * b12;
+  t22 += v * b13;
+  t23 += v * b14;
+  t24 += v * b15;
+  v = a[10];
+  t10 += v * b0;
+  t11 += v * b1;
+  t12 += v * b2;
+  t13 += v * b3;
+  t14 += v * b4;
+  t15 += v * b5;
+  t16 += v * b6;
+  t17 += v * b7;
+  t18 += v * b8;
+  t19 += v * b9;
+  t20 += v * b10;
+  t21 += v * b11;
+  t22 += v * b12;
+  t23 += v * b13;
+  t24 += v * b14;
+  t25 += v * b15;
+  v = a[11];
+  t11 += v * b0;
+  t12 += v * b1;
+  t13 += v * b2;
+  t14 += v * b3;
+  t15 += v * b4;
+  t16 += v * b5;
+  t17 += v * b6;
+  t18 += v * b7;
+  t19 += v * b8;
+  t20 += v * b9;
+  t21 += v * b10;
+  t22 += v * b11;
+  t23 += v * b12;
+  t24 += v * b13;
+  t25 += v * b14;
+  t26 += v * b15;
+  v = a[12];
+  t12 += v * b0;
+  t13 += v * b1;
+  t14 += v * b2;
+  t15 += v * b3;
+  t16 += v * b4;
+  t17 += v * b5;
+  t18 += v * b6;
+  t19 += v * b7;
+  t20 += v * b8;
+  t21 += v * b9;
+  t22 += v * b10;
+  t23 += v * b11;
+  t24 += v * b12;
+  t25 += v * b13;
+  t26 += v * b14;
+  t27 += v * b15;
+  v = a[13];
+  t13 += v * b0;
+  t14 += v * b1;
+  t15 += v * b2;
+  t16 += v * b3;
+  t17 += v * b4;
+  t18 += v * b5;
+  t19 += v * b6;
+  t20 += v * b7;
+  t21 += v * b8;
+  t22 += v * b9;
+  t23 += v * b10;
+  t24 += v * b11;
+  t25 += v * b12;
+  t26 += v * b13;
+  t27 += v * b14;
+  t28 += v * b15;
+  v = a[14];
+  t14 += v * b0;
+  t15 += v * b1;
+  t16 += v * b2;
+  t17 += v * b3;
+  t18 += v * b4;
+  t19 += v * b5;
+  t20 += v * b6;
+  t21 += v * b7;
+  t22 += v * b8;
+  t23 += v * b9;
+  t24 += v * b10;
+  t25 += v * b11;
+  t26 += v * b12;
+  t27 += v * b13;
+  t28 += v * b14;
+  t29 += v * b15;
+  v = a[15];
+  t15 += v * b0;
+  t16 += v * b1;
+  t17 += v * b2;
+  t18 += v * b3;
+  t19 += v * b4;
+  t20 += v * b5;
+  t21 += v * b6;
+  t22 += v * b7;
+  t23 += v * b8;
+  t24 += v * b9;
+  t25 += v * b10;
+  t26 += v * b11;
+  t27 += v * b12;
+  t28 += v * b13;
+  t29 += v * b14;
+  t30 += v * b15;
+
+  t0  += 38 * t16;
+  t1  += 38 * t17;
+  t2  += 38 * t18;
+  t3  += 38 * t19;
+  t4  += 38 * t20;
+  t5  += 38 * t21;
+  t6  += 38 * t22;
+  t7  += 38 * t23;
+  t8  += 38 * t24;
+  t9  += 38 * t25;
+  t10 += 38 * t26;
+  t11 += 38 * t27;
+  t12 += 38 * t28;
+  t13 += 38 * t29;
+  t14 += 38 * t30;
+  // t15 left as is
+
+  // first car
+  c = 1;
+  v =  t0 + c + 65535; c = Math.floor(v / 65536);  t0 = v - c * 65536;
+  v =  t1 + c + 65535; c = Math.floor(v / 65536);  t1 = v - c * 65536;
+  v =  t2 + c + 65535; c = Math.floor(v / 65536);  t2 = v - c * 65536;
+  v =  t3 + c + 65535; c = Math.floor(v / 65536);  t3 = v - c * 65536;
+  v =  t4 + c + 65535; c = Math.floor(v / 65536);  t4 = v - c * 65536;
+  v =  t5 + c + 65535; c = Math.floor(v / 65536);  t5 = v - c * 65536;
+  v =  t6 + c + 65535; c = Math.floor(v / 65536);  t6 = v - c * 65536;
+  v =  t7 + c + 65535; c = Math.floor(v / 65536);  t7 = v - c * 65536;
+  v =  t8 + c + 65535; c = Math.floor(v / 65536);  t8 = v - c * 65536;
+  v =  t9 + c + 65535; c = Math.floor(v / 65536);  t9 = v - c * 65536;
+  v = t10 + c + 65535; c = Math.floor(v / 65536); t10 = v - c * 65536;
+  v = t11 + c + 65535; c = Math.floor(v / 65536); t11 = v - c * 65536;
+  v = t12 + c + 65535; c = Math.floor(v / 65536); t12 = v - c * 65536;
+  v = t13 + c + 65535; c = Math.floor(v / 65536); t13 = v - c * 65536;
+  v = t14 + c + 65535; c = Math.floor(v / 65536); t14 = v - c * 65536;
+  v = t15 + c + 65535; c = Math.floor(v / 65536); t15 = v - c * 65536;
+  t0 += c-1 + 37 * (c-1);
+
+  // second car
+  c = 1;
+  v =  t0 + c + 65535; c = Math.floor(v / 65536);  t0 = v - c * 65536;
+  v =  t1 + c + 65535; c = Math.floor(v / 65536);  t1 = v - c * 65536;
+  v =  t2 + c + 65535; c = Math.floor(v / 65536);  t2 = v - c * 65536;
+  v =  t3 + c + 65535; c = Math.floor(v / 65536);  t3 = v - c * 65536;
+  v =  t4 + c + 65535; c = Math.floor(v / 65536);  t4 = v - c * 65536;
+  v =  t5 + c + 65535; c = Math.floor(v / 65536);  t5 = v - c * 65536;
+  v =  t6 + c + 65535; c = Math.floor(v / 65536);  t6 = v - c * 65536;
+  v =  t7 + c + 65535; c = Math.floor(v / 65536);  t7 = v - c * 65536;
+  v =  t8 + c + 65535; c = Math.floor(v / 65536);  t8 = v - c * 65536;
+  v =  t9 + c + 65535; c = Math.floor(v / 65536);  t9 = v - c * 65536;
+  v = t10 + c + 65535; c = Math.floor(v / 65536); t10 = v - c * 65536;
+  v = t11 + c + 65535; c = Math.floor(v / 65536); t11 = v - c * 65536;
+  v = t12 + c + 65535; c = Math.floor(v / 65536); t12 = v - c * 65536;
+  v = t13 + c + 65535; c = Math.floor(v / 65536); t13 = v - c * 65536;
+  v = t14 + c + 65535; c = Math.floor(v / 65536); t14 = v - c * 65536;
+  v = t15 + c + 65535; c = Math.floor(v / 65536); t15 = v - c * 65536;
+  t0 += c-1 + 37 * (c-1);
+
+  o[ 0] = t0;
+  o[ 1] = t1;
+  o[ 2] = t2;
+  o[ 3] = t3;
+  o[ 4] = t4;
+  o[ 5] = t5;
+  o[ 6] = t6;
+  o[ 7] = t7;
+  o[ 8] = t8;
+  o[ 9] = t9;
+  o[10] = t10;
+  o[11] = t11;
+  o[12] = t12;
+  o[13] = t13;
+  o[14] = t14;
+  o[15] = t15;
+}
+
+function S(o, a) {
+  M(o, a, a);
+}
+
+function inv25519(o, i) {
+  var c = gf();
+  var a;
+  for (a = 0; a < 16; a++) c[a] = i[a];
+  for (a = 253; a >= 0; a--) {
+    S(c, c);
+    if(a !== 2 && a !== 4) M(c, c, i);
+  }
+  for (a = 0; a < 16; a++) o[a] = c[a];
+}
+
+function pow2523(o, i) {
+  var c = gf();
+  var a;
+  for (a = 0; a < 16; a++) c[a] = i[a];
+  for (a = 250; a >= 0; a--) {
+      S(c, c);
+      if(a !== 1) M(c, c, i);
+  }
+  for (a = 0; a < 16; a++) o[a] = c[a];
+}
+
+function crypto_scalarmult(q, n, p) {
+  var z = new Uint8Array(32);
+  var x = new Float64Array(80), r, i;
+  var a = gf(), b = gf(), c = gf(),
+      d = gf(), e = gf(), f = gf();
+  for (i = 0; i < 31; i++) z[i] = n[i];
+  z[31]=(n[31]&127)|64;
+  z[0]&=248;
+  unpack25519(x,p);
+  for (i = 0; i < 16; i++) {
+    b[i]=x[i];
+    d[i]=a[i]=c[i]=0;
+  }
+  a[0]=d[0]=1;
+  for (i=254; i>=0; --i) {
+    r=(z[i>>>3]>>>(i&7))&1;
+    sel25519(a,b,r);
+    sel25519(c,d,r);
+    A(e,a,c);
+    Z(a,a,c);
+    A(c,b,d);
+    Z(b,b,d);
+    S(d,e);
+    S(f,a);
+    M(a,c,a);
+    M(c,b,e);
+    A(e,a,c);
+    Z(a,a,c);
+    S(b,a);
+    Z(c,d,f);
+    M(a,c,_121665);
+    A(a,a,d);
+    M(c,c,a);
+    M(a,d,f);
+    M(d,b,x);
+    S(b,e);
+    sel25519(a,b,r);
+    sel25519(c,d,r);
+  }
+  for (i = 0; i < 16; i++) {
+    x[i+16]=a[i];
+    x[i+32]=c[i];
+    x[i+48]=b[i];
+    x[i+64]=d[i];
+  }
+  var x32 = x.subarray(32);
+  var x16 = x.subarray(16);
+  inv25519(x32,x32);
+  M(x16,x16,x32);
+  pack25519(q,x16);
+  return 0;
+}
+
+function crypto_scalarmult_base(q, n) {
+  return crypto_scalarmult(q, n, _9);
+}
+
+function crypto_box_keypair(y, x) {
+  randombytes(x, 32);
+  return crypto_scalarmult_base(y, x);
+}
+
+function crypto_box_beforenm(k, y, x) {
+  var s = new Uint8Array(32);
+  crypto_scalarmult(s, x, y);
+  return crypto_core_hsalsa20(k, _0, s, sigma);
+}
+
+var crypto_box_afternm = crypto_secretbox;
+var crypto_box_open_afternm = crypto_secretbox_open;
+
+function crypto_box(c, m, d, n, y, x) {
+  var k = new Uint8Array(32);
+  crypto_box_beforenm(k, y, x);
+  return crypto_box_afternm(c, m, d, n, k);
+}
+
+function crypto_box_open(m, c, d, n, y, x) {
+  var k = new Uint8Array(32);
+  crypto_box_beforenm(k, y, x);
+  return crypto_box_open_afternm(m, c, d, n, k);
+}
+
+var K = [
+  0x428a2f98, 0xd728ae22, 0x71374491, 0x23ef65cd,
+  0xb5c0fbcf, 0xec4d3b2f, 0xe9b5dba5, 0x8189dbbc,
+  0x3956c25b, 0xf348b538, 0x59f111f1, 0xb605d019,
+  0x923f82a4, 0xaf194f9b, 0xab1c5ed5, 0xda6d8118,
+  0xd807aa98, 0xa3030242, 0x12835b01, 0x45706fbe,
+  0x243185be, 0x4ee4b28c, 0x550c7dc3, 0xd5ffb4e2,
+  0x72be5d74, 0xf27b896f, 0x80deb1fe, 0x3b1696b1,
+  0x9bdc06a7, 0x25c71235, 0xc19bf174, 0xcf692694,
+  0xe49b69c1, 0x9ef14ad2, 0xefbe4786, 0x384f25e3,
+  0x0fc19dc6, 0x8b8cd5b5, 0x240ca1cc, 0x77ac9c65,
+  0x2de92c6f, 0x592b0275, 0x4a7484aa, 0x6ea6e483,
+  0x5cb0a9dc, 0xbd41fbd4, 0x76f988da, 0x831153b5,
+  0x983e5152, 0xee66dfab, 0xa831c66d, 0x2db43210,
+  0xb00327c8, 0x98fb213f, 0xbf597fc7, 0xbeef0ee4,
+  0xc6e00bf3, 0x3da88fc2, 0xd5a79147, 0x930aa725,
+  0x06ca6351, 0xe003826f, 0x14292967, 0x0a0e6e70,
+  0x27b70a85, 0x46d22ffc, 0x2e1b2138, 0x5c26c926,
+  0x4d2c6dfc, 0x5ac42aed, 0x53380d13, 0x9d95b3df,
+  0x650a7354, 0x8baf63de, 0x766a0abb, 0x3c77b2a8,
+  0x81c2c92e, 0x47edaee6, 0x92722c85, 0x1482353b,
+  0xa2bfe8a1, 0x4cf10364, 0xa81a664b, 0xbc423001,
+  0xc24b8b70, 0xd0f89791, 0xc76c51a3, 0x0654be30,
+  0xd192e819, 0xd6ef5218, 0xd6990624, 0x5565a910,
+  0xf40e3585, 0x5771202a, 0x106aa070, 0x32bbd1b8,
+  0x19a4c116, 0xb8d2d0c8, 0x1e376c08, 0x5141ab53,
+  0x2748774c, 0xdf8eeb99, 0x34b0bcb5, 0xe19b48a8,
+  0x391c0cb3, 0xc5c95a63, 0x4ed8aa4a, 0xe3418acb,
+  0x5b9cca4f, 0x7763e373, 0x682e6ff3, 0xd6b2b8a3,
+  0x748f82ee, 0x5defb2fc, 0x78a5636f, 0x43172f60,
+  0x84c87814, 0xa1f0ab72, 0x8cc70208, 0x1a6439ec,
+  0x90befffa, 0x23631e28, 0xa4506ceb, 0xde82bde9,
+  0xbef9a3f7, 0xb2c67915, 0xc67178f2, 0xe372532b,
+  0xca273ece, 0xea26619c, 0xd186b8c7, 0x21c0c207,
+  0xeada7dd6, 0xcde0eb1e, 0xf57d4f7f, 0xee6ed178,
+  0x06f067aa, 0x72176fba, 0x0a637dc5, 0xa2c898a6,
+  0x113f9804, 0xbef90dae, 0x1b710b35, 0x131c471b,
+  0x28db77f5, 0x23047d84, 0x32caab7b, 0x40c72493,
+  0x3c9ebe0a, 0x15c9bebc, 0x431d67c4, 0x9c100d4c,
+  0x4cc5d4be, 0xcb3e42b6, 0x597f299c, 0xfc657e2a,
+  0x5fcb6fab, 0x3ad6faec, 0x6c44198c, 0x4a475817
+];
+
+function crypto_hashblocks_hl(hh, hl, m, n) {
+  var wh = new Int32Array(16), wl = new Int32Array(16),
+      bh0, bh1, bh2, bh3, bh4, bh5, bh6, bh7,
+      bl0, bl1, bl2, bl3, bl4, bl5, bl6, bl7,
+      th, tl, i, j, h, l, a, b, c, d;
+
+  var ah0 = hh[0],
+      ah1 = hh[1],
+      ah2 = hh[2],
+      ah3 = hh[3],
+      ah4 = hh[4],
+      ah5 = hh[5],
+      ah6 = hh[6],
+      ah7 = hh[7],
+
+      al0 = hl[0],
+      al1 = hl[1],
+      al2 = hl[2],
+      al3 = hl[3],
+      al4 = hl[4],
+      al5 = hl[5],
+      al6 = hl[6],
+      al7 = hl[7];
+
+  var pos = 0;
+  while (n >= 128) {
+    for (i = 0; i < 16; i++) {
+      j = 8 * i + pos;
+      wh[i] = (m[j+0] << 24) | (m[j+1] << 16) | (m[j+2] << 8) | m[j+3];
+      wl[i] = (m[j+4] << 24) | (m[j+5] << 16) | (m[j+6] << 8) | m[j+7];
+    }
+    for (i = 0; i < 80; i++) {
+      bh0 = ah0;
+      bh1 = ah1;
+      bh2 = ah2;
+      bh3 = ah3;
+      bh4 = ah4;
+      bh5 = ah5;
+      bh6 = ah6;
+      bh7 = ah7;
+
+      bl0 = al0;
+      bl1 = al1;
+      bl2 = al2;
+      bl3 = al3;
+      bl4 = al4;
+      bl5 = al5;
+      bl6 = al6;
+      bl7 = al7;
+
+      // add
+      h = ah7;
+      l = al7;
+
+      a = l & 0xffff; b = l >>> 16;
+      c = h & 0xffff; d = h >>> 16;
+
+      // Sigma1
+      h = ((ah4 >>> 14) | (al4 << (32-14))) ^ ((ah4 >>> 18) | (al4 << (32-18))) ^ ((al4 >>> (41-32)) | (ah4 << (32-(41-32))));
+      l = ((al4 >>> 14) | (ah4 << (32-14))) ^ ((al4 >>> 18) | (ah4 << (32-18))) ^ ((ah4 >>> (41-32)) | (al4 << (32-(41-32))));
+
+      a += l & 0xffff; b += l >>> 16;
+      c += h & 0xffff; d += h >>> 16;
+
+      // Ch
+      h = (ah4 & ah5) ^ (~ah4 & ah6);
+      l = (al4 & al5) ^ (~al4 & al6);
+
+      a += l & 0xffff; b += l >>> 16;
+      c += h & 0xffff; d += h >>> 16;
+
+      // K
+      h = K[i*2];
+      l = K[i*2+1];
+
+      a += l & 0xffff; b += l >>> 16;
+      c += h & 0xffff; d += h >>> 16;
+
+      // w
+      h = wh[i%16];
+      l = wl[i%16];
+
+      a += l & 0xffff; b += l >>> 16;
+      c += h & 0xffff; d += h >>> 16;
+
+      b += a >>> 16;
+      c += b >>> 16;
+      d += c >>> 16;
+
+      th = c & 0xffff | d << 16;
+      tl = a & 0xffff | b << 16;
+
+      // add
+      h = th;
+      l = tl;
+
+      a = l & 0xffff; b = l >>> 16;
+      c = h & 0xffff; d = h >>> 16;
+
+      // Sigma0
+      h = ((ah0 >>> 28) | (al0 << (32-28))) ^ ((al0 >>> (34-32)) | (ah0 << (32-(34-32)))) ^ ((al0 >>> (39-32)) | (ah0 << (32-(39-32))));
+      l = ((al0 >>> 28) | (ah0 << (32-28))) ^ ((ah0 >>> (34-32)) | (al0 << (32-(34-32)))) ^ ((ah0 >>> (39-32)) | (al0 << (32-(39-32))));
+
+      a += l & 0xffff; b += l >>> 16;
+      c += h & 0xffff; d += h >>> 16;
+
+      // Maj
+      h = (ah0 & ah1) ^ (ah0 & ah2) ^ (ah1 & ah2);
+      l = (al0 & al1) ^ (al0 & al2) ^ (al1 & al2);
+
+      a += l & 0xffff; b += l >>> 16;
+      c += h & 0xffff; d += h >>> 16;
+
+      b += a >>> 16;
+      c += b >>> 16;
+      d += c >>> 16;
+
+      bh7 = (c & 0xffff) | (d << 16);
+      bl7 = (a & 0xffff) | (b << 16);
+
+      // add
+      h = bh3;
+      l = bl3;
+
+      a = l & 0xffff; b = l >>> 16;
+      c = h & 0xffff; d = h >>> 16;
+
+      h = th;
+      l = tl;
+
+      a += l & 0xffff; b += l >>> 16;
+      c += h & 0xffff; d += h >>> 16;
+
+      b += a >>> 16;
+      c += b >>> 16;
+      d += c >>> 16;
+
+      bh3 = (c & 0xffff) | (d << 16);
+      bl3 = (a & 0xffff) | (b << 16);
+
+      ah1 = bh0;
+      ah2 = bh1;
+      ah3 = bh2;
+      ah4 = bh3;
+      ah5 = bh4;
+      ah6 = bh5;
+      ah7 = bh6;
+      ah0 = bh7;
+
+      al1 = bl0;
+      al2 = bl1;
+      al3 = bl2;
+      al4 = bl3;
+      al5 = bl4;
+      al6 = bl5;
+      al7 = bl6;
+      al0 = bl7;
+
+      if (i%16 === 15) {
+        for (j = 0; j < 16; j++) {
+          // add
+          h = wh[j];
+          l = wl[j];
+
+          a = l & 0xffff; b = l >>> 16;
+          c = h & 0xffff; d = h >>> 16;
+
+          h = wh[(j+9)%16];
+          l = wl[(j+9)%16];
+
+          a += l & 0xffff; b += l >>> 16;
+          c += h & 0xffff; d += h >>> 16;
+
+          // sigma0
+          th = wh[(j+1)%16];
+          tl = wl[(j+1)%16];
+          h = ((th >>> 1) | (tl << (32-1))) ^ ((th >>> 8) | (tl << (32-8))) ^ (th >>> 7);
+          l = ((tl >>> 1) | (th << (32-1))) ^ ((tl >>> 8) | (th << (32-8))) ^ ((tl >>> 7) | (th << (32-7)));
+
+          a += l & 0xffff; b += l >>> 16;
+          c += h & 0xffff; d += h >>> 16;
+
+          // sigma1
+          th = wh[(j+14)%16];
+          tl = wl[(j+14)%16];
+          h = ((th >>> 19) | (tl << (32-19))) ^ ((tl >>> (61-32)) | (th << (32-(61-32)))) ^ (th >>> 6);
+          l = ((tl >>> 19) | (th << (32-19))) ^ ((th >>> (61-32)) | (tl << (32-(61-32)))) ^ ((tl >>> 6) | (th << (32-6)));
+
+          a += l & 0xffff; b += l >>> 16;
+          c += h & 0xffff; d += h >>> 16;
+
+          b += a >>> 16;
+          c += b >>> 16;
+          d += c >>> 16;
+
+          wh[j] = (c & 0xffff) | (d << 16);
+          wl[j] = (a & 0xffff) | (b << 16);
+        }
+      }
+    }
+
+    // add
+    h = ah0;
+    l = al0;
+
+    a = l & 0xffff; b = l >>> 16;
+    c = h & 0xffff; d = h >>> 16;
+
+    h = hh[0];
+    l = hl[0];
+
+    a += l & 0xffff; b += l >>> 16;
+    c += h & 0xffff; d += h >>> 16;
+
+    b += a >>> 16;
+    c += b >>> 16;
+    d += c >>> 16;
+
+    hh[0] = ah0 = (c & 0xffff) | (d << 16);
+    hl[0] = al0 = (a & 0xffff) | (b << 16);
+
+    h = ah1;
+    l = al1;
+
+    a = l & 0xffff; b = l >>> 16;
+    c = h & 0xffff; d = h >>> 16;
+
+    h = hh[1];
+    l = hl[1];
+
+    a += l & 0xffff; b += l >>> 16;
+    c += h & 0xffff; d += h >>> 16;
+
+    b += a >>> 16;
+    c += b >>> 16;
+    d += c >>> 16;
+
+    hh[1] = ah1 = (c & 0xffff) | (d << 16);
+    hl[1] = al1 = (a & 0xffff) | (b << 16);
+
+    h = ah2;
+    l = al2;
+
+    a = l & 0xffff; b = l >>> 16;
+    c = h & 0xffff; d = h >>> 16;
+
+    h = hh[2];
+    l = hl[2];
+
+    a += l & 0xffff; b += l >>> 16;
+    c += h & 0xffff; d += h >>> 16;
+
+    b += a >>> 16;
+    c += b >>> 16;
+    d += c >>> 16;
+
+    hh[2] = ah2 = (c & 0xffff) | (d << 16);
+    hl[2] = al2 = (a & 0xffff) | (b << 16);
+
+    h = ah3;
+    l = al3;
+
+    a = l & 0xffff; b = l >>> 16;
+    c = h & 0xffff; d = h >>> 16;
+
+    h = hh[3];
+    l = hl[3];
+
+    a += l & 0xffff; b += l >>> 16;
+    c += h & 0xffff; d += h >>> 16;
+
+    b += a >>> 16;
+    c += b >>> 16;
+    d += c >>> 16;
+
+    hh[3] = ah3 = (c & 0xffff) | (d << 16);
+    hl[3] = al3 = (a & 0xffff) | (b << 16);
+
+    h = ah4;
+    l = al4;
+
+    a = l & 0xffff; b = l >>> 16;
+    c = h & 0xffff; d = h >>> 16;
+
+    h = hh[4];
+    l = hl[4];
+
+    a += l & 0xffff; b += l >>> 16;
+    c += h & 0xffff; d += h >>> 16;
+
+    b += a >>> 16;
+    c += b >>> 16;
+    d += c >>> 16;
+
+    hh[4] = ah4 = (c & 0xffff) | (d << 16);
+    hl[4] = al4 = (a & 0xffff) | (b << 16);
+
+    h = ah5;
+    l = al5;
+
+    a = l & 0xffff; b = l >>> 16;
+    c = h & 0xffff; d = h >>> 16;
+
+    h = hh[5];
+    l = hl[5];
+
+    a += l & 0xffff; b += l >>> 16;
+    c += h & 0xffff; d += h >>> 16;
+
+    b += a >>> 16;
+    c += b >>> 16;
+    d += c >>> 16;
+
+    hh[5] = ah5 = (c & 0xffff) | (d << 16);
+    hl[5] = al5 = (a & 0xffff) | (b << 16);
+
+    h = ah6;
+    l = al6;
+
+    a = l & 0xffff; b = l >>> 16;
+    c = h & 0xffff; d = h >>> 16;
+
+    h = hh[6];
+    l = hl[6];
+
+    a += l & 0xffff; b += l >>> 16;
+    c += h & 0xffff; d += h >>> 16;
+
+    b += a >>> 16;
+    c += b >>> 16;
+    d += c >>> 16;
+
+    hh[6] = ah6 = (c & 0xffff) | (d << 16);
+    hl[6] = al6 = (a & 0xffff) | (b << 16);
+
+    h = ah7;
+    l = al7;
+
+    a = l & 0xffff; b = l >>> 16;
+    c = h & 0xffff; d = h >>> 16;
+
+    h = hh[7];
+    l = hl[7];
+
+    a += l & 0xffff; b += l >>> 16;
+    c += h & 0xffff; d += h >>> 16;
+
+    b += a >>> 16;
+    c += b >>> 16;
+    d += c >>> 16;
+
+    hh[7] = ah7 = (c & 0xffff) | (d << 16);
+    hl[7] = al7 = (a & 0xffff) | (b << 16);
+
+    pos += 128;
+    n -= 128;
+  }
+
+  return n;
+}
+
+function crypto_hash(out, m, n) {
+  var hh = new Int32Array(8),
+      hl = new Int32Array(8),
+      x = new Uint8Array(256),
+      i, b = n;
+
+  hh[0] = 0x6a09e667;
+  hh[1] = 0xbb67ae85;
+  hh[2] = 0x3c6ef372;
+  hh[3] = 0xa54ff53a;
+  hh[4] = 0x510e527f;
+  hh[5] = 0x9b05688c;
+  hh[6] = 0x1f83d9ab;
+  hh[7] = 0x5be0cd19;
+
+  hl[0] = 0xf3bcc908;
+  hl[1] = 0x84caa73b;
+  hl[2] = 0xfe94f82b;
+  hl[3] = 0x5f1d36f1;
+  hl[4] = 0xade682d1;
+  hl[5] = 0x2b3e6c1f;
+  hl[6] = 0xfb41bd6b;
+  hl[7] = 0x137e2179;
+
+  crypto_hashblocks_hl(hh, hl, m, n);
+  n %= 128;
+
+  for (i = 0; i < n; i++) x[i] = m[b-n+i];
+  x[n] = 128;
+
+  n = 256-128*(n<112?1:0);
+  x[n-9] = 0;
+  ts64(x, n-8,  (b / 0x20000000) | 0, b << 3);
+  crypto_hashblocks_hl(hh, hl, x, n);
+
+  for (i = 0; i < 8; i++) ts64(out, 8*i, hh[i], hl[i]);
+
+  return 0;
+}
+
+function add(p, q) {
+  var a = gf(), b = gf(), c = gf(),
+      d = gf(), e = gf(), f = gf(),
+      g = gf(), h = gf(), t = gf();
+
+  Z(a, p[1], p[0]);
+  Z(t, q[1], q[0]);
+  M(a, a, t);
+  A(b, p[0], p[1]);
+  A(t, q[0], q[1]);
+  M(b, b, t);
+  M(c, p[3], q[3]);
+  M(c, c, D2);
+  M(d, p[2], q[2]);
+  A(d, d, d);
+  Z(e, b, a);
+  Z(f, d, c);
+  A(g, d, c);
+  A(h, b, a);
+
+  M(p[0], e, f);
+  M(p[1], h, g);
+  M(p[2], g, f);
+  M(p[3], e, h);
+}
+
+function cswap(p, q, b) {
+  var i;
+  for (i = 0; i < 4; i++) {
+    sel25519(p[i], q[i], b);
+  }
+}
+
+function pack(r, p) {
+  var tx = gf(), ty = gf(), zi = gf();
+  inv25519(zi, p[2]);
+  M(tx, p[0], zi);
+  M(ty, p[1], zi);
+  pack25519(r, ty);
+  r[31] ^= par25519(tx) << 7;
+}
+
+function scalarmult(p, q, s) {
+  var b, i;
+  set25519(p[0], gf0);
+  set25519(p[1], gf1);
+  set25519(p[2], gf1);
+  set25519(p[3], gf0);
+  for (i = 255; i >= 0; --i) {
+    b = (s[(i/8)|0] >> (i&7)) & 1;
+    cswap(p, q, b);
+    add(q, p);
+    add(p, p);
+    cswap(p, q, b);
+  }
+}
+
+function scalarbase(p, s) {
+  var q = [gf(), gf(), gf(), gf()];
+  set25519(q[0], X);
+  set25519(q[1], Y);
+  set25519(q[2], gf1);
+  M(q[3], X, Y);
+  scalarmult(p, q, s);
+}
+
+function crypto_sign_keypair(pk, sk, seeded) {
+  var d = new Uint8Array(64);
+  var p = [gf(), gf(), gf(), gf()];
+  var i;
+
+  if (!seeded) randombytes(sk, 32);
+  crypto_hash(d, sk, 32);
+  d[0] &= 248;
+  d[31] &= 127;
+  d[31] |= 64;
+
+  scalarbase(p, d);
+  pack(pk, p);
+
+  for (i = 0; i < 32; i++) sk[i+32] = pk[i];
+  return 0;
+}
+
+var L = new Float64Array([0xed, 0xd3, 0xf5, 0x5c, 0x1a, 0x63, 0x12, 0x58, 0xd6, 0x9c, 0xf7, 0xa2, 0xde, 0xf9, 0xde, 0x14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x10]);
+
+function modL(r, x) {
+  var carry, i, j, k;
+  for (i = 63; i >= 32; --i) {
+    carry = 0;
+    for (j = i - 32, k = i - 12; j < k; ++j) {
+      x[j] += carry - 16 * x[i] * L[j - (i - 32)];
+      carry = (x[j] + 128) >> 8;
+      x[j] -= carry * 256;
+    }
+    x[j] += carry;
+    x[i] = 0;
+  }
+  carry = 0;
+  for (j = 0; j < 32; j++) {
+    x[j] += carry - (x[31] >> 4) * L[j];
+    carry = x[j] >> 8;
+    x[j] &= 255;
+  }
+  for (j = 0; j < 32; j++) x[j] -= carry * L[j];
+  for (i = 0; i < 32; i++) {
+    x[i+1] += x[i] >> 8;
+    r[i] = x[i] & 255;
+  }
+}
+
+function reduce(r) {
+  var x = new Float64Array(64), i;
+  for (i = 0; i < 64; i++) x[i] = r[i];
+  for (i = 0; i < 64; i++) r[i] = 0;
+  modL(r, x);
+}
+
+// Note: difference from C - smlen returned, not passed as argument.
+function crypto_sign(sm, m, n, sk) {
+  var d = new Uint8Array(64), h = new Uint8Array(64), r = new Uint8Array(64);
+  var i, j, x = new Float64Array(64);
+  var p = [gf(), gf(), gf(), gf()];
+
+  crypto_hash(d, sk, 32);
+  d[0] &= 248;
+  d[31] &= 127;
+  d[31] |= 64;
+
+  var smlen = n + 64;
+  for (i = 0; i < n; i++) sm[64 + i] = m[i];
+  for (i = 0; i < 32; i++) sm[32 + i] = d[32 + i];
+
+  crypto_hash(r, sm.subarray(32), n+32);
+  reduce(r);
+  scalarbase(p, r);
+  pack(sm, p);
+
+  for (i = 32; i < 64; i++) sm[i] = sk[i];
+  crypto_hash(h, sm, n + 64);
+  reduce(h);
+
+  for (i = 0; i < 64; i++) x[i] = 0;
+  for (i = 0; i < 32; i++) x[i] = r[i];
+  for (i = 0; i < 32; i++) {
+    for (j = 0; j < 32; j++) {
+      x[i+j] += h[i] * d[j];
+    }
+  }
+
+  modL(sm.subarray(32), x);
+  return smlen;
+}
+
+function unpackneg(r, p) {
+  var t = gf(), chk = gf(), num = gf(),
+      den = gf(), den2 = gf(), den4 = gf(),
+      den6 = gf();
+
+  set25519(r[2], gf1);
+  unpack25519(r[1], p);
+  S(num, r[1]);
+  M(den, num, D);
+  Z(num, num, r[2]);
+  A(den, r[2], den);
+
+  S(den2, den);
+  S(den4, den2);
+  M(den6, den4, den2);
+  M(t, den6, num);
+  M(t, t, den);
+
+  pow2523(t, t);
+  M(t, t, num);
+  M(t, t, den);
+  M(t, t, den);
+  M(r[0], t, den);
+
+  S(chk, r[0]);
+  M(chk, chk, den);
+  if (neq25519(chk, num)) M(r[0], r[0], I);
+
+  S(chk, r[0]);
+  M(chk, chk, den);
+  if (neq25519(chk, num)) return -1;
+
+  if (par25519(r[0]) === (p[31]>>7)) Z(r[0], gf0, r[0]);
+
+  M(r[3], r[0], r[1]);
+  return 0;
+}
+
+function crypto_sign_open(m, sm, n, pk) {
+  var i, mlen;
+  var t = new Uint8Array(32), h = new Uint8Array(64);
+  var p = [gf(), gf(), gf(), gf()],
+      q = [gf(), gf(), gf(), gf()];
+
+  mlen = -1;
+  if (n < 64) return -1;
+
+  if (unpackneg(q, pk)) return -1;
+
+  for (i = 0; i < n; i++) m[i] = sm[i];
+  for (i = 0; i < 32; i++) m[i+32] = pk[i];
+  crypto_hash(h, m, n);
+  reduce(h);
+  scalarmult(p, q, h);
+
+  scalarbase(q, sm.subarray(32));
+  add(p, q);
+  pack(t, p);
+
+  n -= 64;
+  if (crypto_verify_32(sm, 0, t, 0)) {
+    for (i = 0; i < n; i++) m[i] = 0;
+    return -1;
+  }
+
+  for (i = 0; i < n; i++) m[i] = sm[i + 64];
+  mlen = n;
+  return mlen;
+}
+
+var crypto_secretbox_KEYBYTES = 32,
+    crypto_secretbox_NONCEBYTES = 24,
+    crypto_secretbox_ZEROBYTES = 32,
+    crypto_secretbox_BOXZEROBYTES = 16,
+    crypto_scalarmult_BYTES = 32,
+    crypto_scalarmult_SCALARBYTES = 32,
+    crypto_box_PUBLICKEYBYTES = 32,
+    crypto_box_SECRETKEYBYTES = 32,
+    crypto_box_BEFORENMBYTES = 32,
+    crypto_box_NONCEBYTES = crypto_secretbox_NONCEBYTES,
+    crypto_box_ZEROBYTES = crypto_secretbox_ZEROBYTES,
+    crypto_box_BOXZEROBYTES = crypto_secretbox_BOXZEROBYTES,
+    crypto_sign_BYTES = 64,
+    crypto_sign_PUBLICKEYBYTES = 32,
+    crypto_sign_SECRETKEYBYTES = 64,
+    crypto_sign_SEEDBYTES = 32,
+    crypto_hash_BYTES = 64;
+
+nacl.lowlevel = {
+  crypto_core_hsalsa20: crypto_core_hsalsa20,
+  crypto_stream_xor: crypto_stream_xor,
+  crypto_stream: crypto_stream,
+  crypto_stream_salsa20_xor: crypto_stream_salsa20_xor,
+  crypto_stream_salsa20: crypto_stream_salsa20,
+  crypto_onetimeauth: crypto_onetimeauth,
+  crypto_onetimeauth_verify: crypto_onetimeauth_verify,
+  crypto_verify_16: crypto_verify_16,
+  crypto_verify_32: crypto_verify_32,
+  crypto_secretbox: crypto_secretbox,
+  crypto_secretbox_open: crypto_secretbox_open,
+  crypto_scalarmult: crypto_scalarmult,
+  crypto_scalarmult_base: crypto_scalarmult_base,
+  crypto_box_beforenm: crypto_box_beforenm,
+  crypto_box_afternm: crypto_box_afternm,
+  crypto_box: crypto_box,
+  crypto_box_open: crypto_box_open,
+  crypto_box_keypair: crypto_box_keypair,
+  crypto_hash: crypto_hash,
+  crypto_sign: crypto_sign,
+  crypto_sign_keypair: crypto_sign_keypair,
+  crypto_sign_open: crypto_sign_open,
+
+  crypto_secretbox_KEYBYTES: crypto_secretbox_KEYBYTES,
+  crypto_secretbox_NONCEBYTES: crypto_secretbox_NONCEBYTES,
+  crypto_secretbox_ZEROBYTES: crypto_secretbox_ZEROBYTES,
+  crypto_secretbox_BOXZEROBYTES: crypto_secretbox_BOXZEROBYTES,
+  crypto_scalarmult_BYTES: crypto_scalarmult_BYTES,
+  crypto_scalarmult_SCALARBYTES: crypto_scalarmult_SCALARBYTES,
+  crypto_box_PUBLICKEYBYTES: crypto_box_PUBLICKEYBYTES,
+  crypto_box_SECRETKEYBYTES: crypto_box_SECRETKEYBYTES,
+  crypto_box_BEFORENMBYTES: crypto_box_BEFORENMBYTES,
+  crypto_box_NONCEBYTES: crypto_box_NONCEBYTES,
+  crypto_box_ZEROBYTES: crypto_box_ZEROBYTES,
+  crypto_box_BOXZEROBYTES: crypto_box_BOXZEROBYTES,
+  crypto_sign_BYTES: crypto_sign_BYTES,
+  crypto_sign_PUBLICKEYBYTES: crypto_sign_PUBLICKEYBYTES,
+  crypto_sign_SECRETKEYBYTES: crypto_sign_SECRETKEYBYTES,
+  crypto_sign_SEEDBYTES: crypto_sign_SEEDBYTES,
+  crypto_hash_BYTES: crypto_hash_BYTES
+};
+
+/* High-level API */
+
+function checkLengths(k, n) {
+  if (k.length !== crypto_secretbox_KEYBYTES) throw new Error('bad key size');
+  if (n.length !== crypto_secretbox_NONCEBYTES) throw new Error('bad nonce size');
+}
+
+function checkBoxLengths(pk, sk) {
+  if (pk.length !== crypto_box_PUBLICKEYBYTES) throw new Error('bad public key size');
+  if (sk.length !== crypto_box_SECRETKEYBYTES) throw new Error('bad secret key size');
+}
+
+function checkArrayTypes() {
+  var t, i;
+  for (i = 0; i < arguments.length; i++) {
+     if ((t = Object.prototype.toString.call(arguments[i])) !== '[object Uint8Array]')
+       throw new TypeError('unexpected type ' + t + ', use Uint8Array');
+  }
+}
+
+function cleanup(arr) {
+  for (var i = 0; i < arr.length; i++) arr[i] = 0;
+}
+
+// TODO: Completely remove this in v0.15.
+if (!nacl.util) {
+  nacl.util = {};
+  nacl.util.decodeUTF8 = nacl.util.encodeUTF8 = nacl.util.encodeBase64 = nacl.util.decodeBase64 = function() {
+    throw new Error('nacl.util moved into separate package: https://github.com/dchest/tweetnacl-util-js');
+  };
+}
+
+nacl.randomBytes = function(n) {
+  var b = new Uint8Array(n);
+  randombytes(b, n);
+  return b;
+};
+
+nacl.secretbox = function(msg, nonce, key) {
+  checkArrayTypes(msg, nonce, key);
+  checkLengths(key, nonce);
+  var m = new Uint8Array(crypto_secretbox_ZEROBYTES + msg.length);
+  var c = new Uint8Array(m.length);
+  for (var i = 0; i < msg.length; i++) m[i+crypto_secretbox_ZEROBYTES] = msg[i];
+  crypto_secretbox(c, m, m.length, nonce, key);
+  return c.subarray(crypto_secretbox_BOXZEROBYTES);
+};
+
+nacl.secretbox.open = function(box, nonce, key) {
+  checkArrayTypes(box, nonce, key);
+  checkLengths(key, nonce);
+  var c = new Uint8Array(crypto_secretbox_BOXZEROBYTES + box.length);
+  var m = new Uint8Array(c.length);
+  for (var i = 0; i < box.length; i++) c[i+crypto_secretbox_BOXZEROBYTES] = box[i];
+  if (c.length < 32) return false;
+  if (crypto_secretbox_open(m, c, c.length, nonce, key) !== 0) return false;
+  return m.subarray(crypto_secretbox_ZEROBYTES);
+};
+
+nacl.secretbox.keyLength = crypto_secretbox_KEYBYTES;
+nacl.secretbox.nonceLength = crypto_secretbox_NONCEBYTES;
+nacl.secretbox.overheadLength = crypto_secretbox_BOXZEROBYTES;
+
+nacl.scalarMult = function(n, p) {
+  checkArrayTypes(n, p);
+  if (n.length !== crypto_scalarmult_SCALARBYTES) throw new Error('bad n size');
+  if (p.length !== crypto_scalarmult_BYTES) throw new Error('bad p size');
+  var q = new Uint8Array(crypto_scalarmult_BYTES);
+  crypto_scalarmult(q, n, p);
+  return q;
+};
+
+nacl.scalarMult.base = function(n) {
+  checkArrayTypes(n);
+  if (n.length !== crypto_scalarmult_SCALARBYTES) throw new Error('bad n size');
+  var q = new Uint8Array(crypto_scalarmult_BYTES);
+  crypto_scalarmult_base(q, n);
+  return q;
+};
+
+nacl.scalarMult.scalarLength = crypto_scalarmult_SCALARBYTES;
+nacl.scalarMult.groupElementLength = crypto_scalarmult_BYTES;
+
+nacl.box = function(msg, nonce, publicKey, secretKey) {
+  var k = nacl.box.before(publicKey, secretKey);
+  return nacl.secretbox(msg, nonce, k);
+};
+
+nacl.box.before = function(publicKey, secretKey) {
+  checkArrayTypes(publicKey, secretKey);
+  checkBoxLengths(publicKey, secretKey);
+  var k = new Uint8Array(crypto_box_BEFORENMBYTES);
+  crypto_box_beforenm(k, publicKey, secretKey);
+  return k;
+};
+
+nacl.box.after = nacl.secretbox;
+
+nacl.box.open = function(msg, nonce, publicKey, secretKey) {
+  var k = nacl.box.before(publicKey, secretKey);
+  return nacl.secretbox.open(msg, nonce, k);
+};
+
+nacl.box.open.after = nacl.secretbox.open;
+
+nacl.box.keyPair = function() {
+  var pk = new Uint8Array(crypto_box_PUBLICKEYBYTES);
+  var sk = new Uint8Array(crypto_box_SECRETKEYBYTES);
+  crypto_box_keypair(pk, sk);
+  return {publicKey: pk, secretKey: sk};
+};
+
+nacl.box.keyPair.fromSecretKey = function(secretKey) {
+  checkArrayTypes(secretKey);
+  if (secretKey.length !== crypto_box_SECRETKEYBYTES)
+    throw new Error('bad secret key size');
+  var pk = new Uint8Array(crypto_box_PUBLICKEYBYTES);
+  crypto_scalarmult_base(pk, secretKey);
+  return {publicKey: pk, secretKey: new Uint8Array(secretKey)};
+};
+
+nacl.box.publicKeyLength = crypto_box_PUBLICKEYBYTES;
+nacl.box.secretKeyLength = crypto_box_SECRETKEYBYTES;
+nacl.box.sharedKeyLength = crypto_box_BEFORENMBYTES;
+nacl.box.nonceLength = crypto_box_NONCEBYTES;
+nacl.box.overheadLength = nacl.secretbox.overheadLength;
+
+nacl.sign = function(msg, secretKey) {
+  checkArrayTypes(msg, secretKey);
+  if (secretKey.length !== crypto_sign_SECRETKEYBYTES)
+    throw new Error('bad secret key size');
+  var signedMsg = new Uint8Array(crypto_sign_BYTES+msg.length);
+  crypto_sign(signedMsg, msg, msg.length, secretKey);
+  return signedMsg;
+};
+
+nacl.sign.open = function(signedMsg, publicKey) {
+  if (arguments.length !== 2)
+    throw new Error('nacl.sign.open accepts 2 arguments; did you mean to use nacl.sign.detached.verify?');
+  checkArrayTypes(signedMsg, publicKey);
+  if (publicKey.length !== crypto_sign_PUBLICKEYBYTES)
+    throw new Error('bad public key size');
+  var tmp = new Uint8Array(signedMsg.length);
+  var mlen = crypto_sign_open(tmp, signedMsg, signedMsg.length, publicKey);
+  if (mlen < 0) return null;
+  var m = new Uint8Array(mlen);
+  for (var i = 0; i < m.length; i++) m[i] = tmp[i];
+  return m;
+};
+
+nacl.sign.detached = function(msg, secretKey) {
+  var signedMsg = nacl.sign(msg, secretKey);
+  var sig = new Uint8Array(crypto_sign_BYTES);
+  for (var i = 0; i < sig.length; i++) sig[i] = signedMsg[i];
+  return sig;
+};
+
+nacl.sign.detached.verify = function(msg, sig, publicKey) {
+  checkArrayTypes(msg, sig, publicKey);
+  if (sig.length !== crypto_sign_BYTES)
+    throw new Error('bad signature size');
+  if (publicKey.length !== crypto_sign_PUBLICKEYBYTES)
+    throw new Error('bad public key size');
+  var sm = new Uint8Array(crypto_sign_BYTES + msg.length);
+  var m = new Uint8Array(crypto_sign_BYTES + msg.length);
+  var i;
+  for (i = 0; i < crypto_sign_BYTES; i++) sm[i] = sig[i];
+  for (i = 0; i < msg.length; i++) sm[i+crypto_sign_BYTES] = msg[i];
+  return (crypto_sign_open(m, sm, sm.length, publicKey) >= 0);
+};
+
+nacl.sign.keyPair = function() {
+  var pk = new Uint8Array(crypto_sign_PUBLICKEYBYTES);
+  var sk = new Uint8Array(crypto_sign_SECRETKEYBYTES);
+  crypto_sign_keypair(pk, sk);
+  return {publicKey: pk, secretKey: sk};
+};
+
+nacl.sign.keyPair.fromSecretKey = function(secretKey) {
+  checkArrayTypes(secretKey);
+  if (secretKey.length !== crypto_sign_SECRETKEYBYTES)
+    throw new Error('bad secret key size');
+  var pk = new Uint8Array(crypto_sign_PUBLICKEYBYTES);
+  for (var i = 0; i < pk.length; i++) pk[i] = secretKey[32+i];
+  return {publicKey: pk, secretKey: new Uint8Array(secretKey)};
+};
+
+nacl.sign.keyPair.fromSeed = function(seed) {
+  checkArrayTypes(seed);
+  if (seed.length !== crypto_sign_SEEDBYTES)
+    throw new Error('bad seed size');
+  var pk = new Uint8Array(crypto_sign_PUBLICKEYBYTES);
+  var sk = new Uint8Array(crypto_sign_SECRETKEYBYTES);
+  for (var i = 0; i < 32; i++) sk[i] = seed[i];
+  crypto_sign_keypair(pk, sk, true);
+  return {publicKey: pk, secretKey: sk};
+};
+
+nacl.sign.publicKeyLength = crypto_sign_PUBLICKEYBYTES;
+nacl.sign.secretKeyLength = crypto_sign_SECRETKEYBYTES;
+nacl.sign.seedLength = crypto_sign_SEEDBYTES;
+nacl.sign.signatureLength = crypto_sign_BYTES;
+
+nacl.hash = function(msg) {
+  checkArrayTypes(msg);
+  var h = new Uint8Array(crypto_hash_BYTES);
+  crypto_hash(h, msg, msg.length);
+  return h;
+};
+
+nacl.hash.hashLength = crypto_hash_BYTES;
+
+nacl.verify = function(x, y) {
+  checkArrayTypes(x, y);
+  // Zero length arguments are considered not equal.
+  if (x.length === 0 || y.length === 0) return false;
+  if (x.length !== y.length) return false;
+  return (vn(x, 0, y, 0, x.length) === 0) ? true : false;
+};
+
+nacl.setPRNG = function(fn) {
+  randombytes = fn;
+};
+
+(function() {
+  // Initialize PRNG if environment provides CSPRNG.
+  // If not, methods calling randombytes will throw.
+  var crypto = typeof self !== 'undefined' ? (self.crypto || self.msCrypto) : null;
+  if (crypto && crypto.getRandomValues) {
+    // Browsers.
+    var QUOTA = 65536;
+    nacl.setPRNG(function(x, n) {
+      var i, v = new Uint8Array(n);
+      for (i = 0; i < n; i += QUOTA) {
+        crypto.getRandomValues(v.subarray(i, i + Math.min(n - i, QUOTA)));
+      }
+      for (i = 0; i < n; i++) x[i] = v[i];
+      cleanup(v);
+    });
+  } else if (true) {
+    // Node.js.
+    crypto = __webpack_require__(11);
+    if (crypto && crypto.randomBytes) {
+      nacl.setPRNG(function(x, n) {
+        var i, v = crypto.randomBytes(n);
+        for (i = 0; i < n; i++) x[i] = v[i];
+        cleanup(v);
+      });
+    }
+  }
+})();
+
+})(typeof module !== 'undefined' && module.exports ? module.exports : (self.nacl = self.nacl || {}));
+
+
+/***/ }),
+/* 77 */
+/***/ (function(module, exports) {
+
+module.exports = require("events");
+
+/***/ }),
+/* 78 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.hostedGit = exports.registries = undefined;
+exports.getExoticResolver = getExoticResolver;
+exports.hostedGitFragmentToGitUrl = hostedGitFragmentToGitUrl;
+
+var _baseResolver;
+
+function _load_baseResolver() {
+  return _baseResolver = _interopRequireDefault(__webpack_require__(123));
+}
+
+var _npmResolver;
+
+function _load_npmResolver() {
+  return _npmResolver = _interopRequireDefault(__webpack_require__(217));
+}
+
+var _yarnResolver;
+
+function _load_yarnResolver() {
+  return _yarnResolver = _interopRequireDefault(__webpack_require__(576));
+}
+
+var _gitResolver;
+
+function _load_gitResolver() {
+  return _gitResolver = _interopRequireDefault(__webpack_require__(124));
+}
+
+var _tarballResolver;
+
+function _load_tarballResolver() {
+  return _tarballResolver = _interopRequireDefault(__webpack_require__(574));
+}
+
+var _githubResolver;
+
+function _load_githubResolver() {
+  return _githubResolver = _interopRequireDefault(__webpack_require__(367));
+}
+
+var _fileResolver;
+
+function _load_fileResolver() {
+  return _fileResolver = _interopRequireDefault(__webpack_require__(215));
+}
+
+var _linkResolver;
+
+function _load_linkResolver() {
+  return _linkResolver = _interopRequireDefault(__webpack_require__(368));
+}
+
+var _gitlabResolver;
+
+function _load_gitlabResolver() {
+  return _gitlabResolver = _interopRequireDefault(__webpack_require__(572));
+}
+
+var _gistResolver;
+
+function _load_gistResolver() {
+  return _gistResolver = _interopRequireDefault(__webpack_require__(216));
+}
+
+var _bitbucketResolver;
+
+function _load_bitbucketResolver() {
+  return _bitbucketResolver = _interopRequireDefault(__webpack_require__(571));
+}
+
+var _hostedGitResolver;
+
+function _load_hostedGitResolver() {
+  return _hostedGitResolver = __webpack_require__(109);
+}
+
+var _registryResolver;
+
+function _load_registryResolver() {
+  return _registryResolver = _interopRequireDefault(__webpack_require__(573));
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const registries = exports.registries = {
+  npm: (_npmResolver || _load_npmResolver()).default,
+  yarn: (_yarnResolver || _load_yarnResolver()).default
+};
+
+//
+
+const exotics = new Set([(_gitResolver || _load_gitResolver()).default, (_tarballResolver || _load_tarballResolver()).default, (_githubResolver || _load_githubResolver()).default, (_fileResolver || _load_fileResolver()).default, (_linkResolver || _load_linkResolver()).default, (_gitlabResolver || _load_gitlabResolver()).default, (_gistResolver || _load_gistResolver()).default, (_bitbucketResolver || _load_bitbucketResolver()).default]);
+
+function getExoticResolver(pattern) {
+  for (var _iterator = exotics, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+    var _ref;
+
+    if (_isArray) {
+      if (_i >= _iterator.length) break;
+      _ref = _iterator[_i++];
+    } else {
+      _i = _iterator.next();
+      if (_i.done) break;
+      _ref = _i.value;
+    }
+
+    const Resolver = _ref;
+
+    if (Resolver.isVersion(pattern)) {
+      return Resolver;
+    }
+  }
+  return null;
+}
+
+//
+
+const hostedGit = exports.hostedGit = {
+  github: (_githubResolver || _load_githubResolver()).default,
+  gitlab: (_gitlabResolver || _load_gitlabResolver()).default,
+  bitbucket: (_bitbucketResolver || _load_bitbucketResolver()).default
+};
+
+function hostedGitFragmentToGitUrl(fragment, reporter) {
+  for (const key in hostedGit) {
+    const Resolver = hostedGit[key];
+    if (Resolver.isVersion(fragment)) {
+      return Resolver.getGitHTTPUrl((0, (_hostedGitResolver || _load_hostedGitResolver()).explodeHostedGitFragment)(fragment, reporter));
+    }
+  }
+
+  return fragment;
+}
+
+//
+
+for (const key in registries) {
+  var _class, _temp;
+
+  const RegistryResolver = registries[key];
+
+  exotics.add((_temp = _class = class extends (_registryResolver || _load_registryResolver()).default {}, _class.protocol = key, _class.factory = RegistryResolver, _temp));
+}
+
+/***/ }),
+/* 79 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/**
+ * Base prompt implementation
+ * Should be extended by prompt types.
+ */
+
+var _ = __webpack_require__(38);
+var chalk = __webpack_require__(30);
+var runAsync = __webpack_require__(181);
+var { filter, flatMap, share, take, takeUntil } = __webpack_require__(63);
+var Choices = __webpack_require__(686);
+var ScreenManager = __webpack_require__(697);
+
+class Prompt {
+  constructor(question, rl, answers) {
+    // Setup instance defaults property
+    _.assign(this, {
+      answers: answers,
+      status: 'pending'
+    });
+
+    // Set defaults prompt options
+    this.opt = _.defaults(_.clone(question), {
+      validate: () => true,
+      filter: val => val,
+      when: () => true,
+      suffix: '',
+      prefix: chalk.green('?')
+    });
+
+    // Make sure name is present
+    if (!this.opt.name) {
+      this.throwParamError('name');
+    }
+
+    // Set default message if no message defined
+    if (!this.opt.message) {
+      this.opt.message = this.opt.name + ':';
+    }
+
+    // Normalize choices
+    if (Array.isArray(this.opt.choices)) {
+      this.opt.choices = new Choices(this.opt.choices, answers);
+    }
+
+    this.rl = rl;
+    this.screen = new ScreenManager(this.rl);
+  }
+
+  /**
+   * Start the Inquiry session and manage output value filtering
+   * @return {Promise}
+   */
+
+  run() {
+    return new Promise(resolve => {
+      this._run(value => resolve(value));
+    });
+  }
+
+  // Default noop (this one should be overwritten in prompts)
+  _run(cb) {
+    cb();
+  }
+
+  /**
+   * Throw an error telling a required parameter is missing
+   * @param  {String} name Name of the missing param
+   * @return {Throw Error}
+   */
+
+  throwParamError(name) {
+    throw new Error('You must provide a `' + name + '` parameter');
+  }
+
+  /**
+   * Called when the UI closes. Override to do any specific cleanup necessary
+   */
+  close() {
+    this.screen.releaseCursor();
+  }
+
+  /**
+   * Run the provided validation method each time a submit event occur.
+   * @param  {Rx.Observable} submit - submit event flow
+   * @return {Object}        Object containing two observables: `success` and `error`
+   */
+  handleSubmitEvents(submit) {
+    var self = this;
+    var validate = runAsync(this.opt.validate);
+    var asyncFilter = runAsync(this.opt.filter);
+    var validation = submit.pipe(
+      flatMap(value =>
+        asyncFilter(value, self.answers).then(
+          filteredValue =>
+            validate(filteredValue, self.answers).then(
+              isValid => ({ isValid: isValid, value: filteredValue }),
+              err => ({ isValid: err })
+            ),
+          err => ({ isValid: err })
+        )
+      ),
+      share()
+    );
+
+    var success = validation.pipe(
+      filter(state => state.isValid === true),
+      take(1)
+    );
+    var error = validation.pipe(
+      filter(state => state.isValid !== true),
+      takeUntil(success)
+    );
+
+    return {
+      success: success,
+      error: error
+    };
+  }
+
+  /**
+   * Generate the prompt question string
+   * @return {String} prompt question string
+   */
+
+  getQuestion() {
+    var message =
+      this.opt.prefix +
+      ' ' +
+      chalk.bold(this.opt.message) +
+      this.opt.suffix +
+      chalk.reset(' ');
+
+    // Append the default if available, and if question isn't answered
+    if (this.opt.default != null && this.status !== 'answered') {
+      // If default password is supplied, hide it
+      if (this.opt.type === 'password') {
+        message += chalk.italic.dim('[hidden] ');
+      } else {
+        message += chalk.dim('(' + this.opt.default + ') ');
+      }
+    }
+
+    return message;
+  }
+}
+
+module.exports = Prompt;
+
+
+/***/ }),
+/* 80 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var { fromEvent } = __webpack_require__(182);
+var { filter, map, share } = __webpack_require__(63);
+
+function normalizeKeypressEvents(value, key) {
+  return { value: value, key: key || {} };
+}
+
+module.exports = function(rl) {
+  var keypress = fromEvent(rl.input, 'keypress', normalizeKeypressEvents)
+    // Ignore `enter` key. On the readline, we only care about the `line` event.
+    .pipe(filter(({ key }) => key.name !== 'enter' && key.name !== 'return'));
+
+  return {
+    line: fromEvent(rl, 'line'),
+    keypress: keypress,
+
+    normalizedUpKey: keypress.pipe(
+      filter(
+        ({ key }) =>
+          key.name === 'up' || key.name === 'k' || (key.name === 'p' && key.ctrl)
+      ),
+      share()
+    ),
+
+    normalizedDownKey: keypress.pipe(
+      filter(
+        ({ key }) =>
+          key.name === 'down' || key.name === 'j' || (key.name === 'n' && key.ctrl)
+      ),
+      share()
+    ),
+
+    numberKey: keypress.pipe(
+      filter(e => e.value && '123456789'.indexOf(e.value) >= 0),
+      map(e => Number(e.value)),
+      share()
+    ),
+
+    spaceKey: keypress.pipe(
+      filter(({ key }) => key && key.name === 'space'),
+      share()
+    ),
+    aKey: keypress.pipe(
+      filter(({ key }) => key && key.name === 'a'),
+      share()
+    ),
+    iKey: keypress.pipe(
+      filter(({ key }) => key && key.name === 'i'),
+      share()
+    )
+  };
+};
+
+
+/***/ }),
+/* 81 */
+/***/ (function(module, exports, __webpack_require__) {
+
+(function(){
+
+    // Copyright (c) 2005  Tom Wu
+    // All Rights Reserved.
+    // See "LICENSE" for details.
+
+    // Basic JavaScript BN library - subset useful for RSA encryption.
+
+    // Bits per digit
+    var dbits;
+
+    // JavaScript engine analysis
+    var canary = 0xdeadbeefcafe;
+    var j_lm = ((canary&0xffffff)==0xefcafe);
+
+    // (public) Constructor
+    function BigInteger(a,b,c) {
+      if(a != null)
+        if("number" == typeof a) this.fromNumber(a,b,c);
+        else if(b == null && "string" != typeof a) this.fromString(a,256);
+        else this.fromString(a,b);
+    }
+
+    // return new, unset BigInteger
+    function nbi() { return new BigInteger(null); }
+
+    // am: Compute w_j += (x*this_i), propagate carries,
+    // c is initial carry, returns final carry.
+    // c < 3*dvalue, x < 2*dvalue, this_i < dvalue
+    // We need to select the fastest one that works in this environment.
+
+    // am1: use a single mult and divide to get the high bits,
+    // max digit bits should be 26 because
+    // max internal value = 2*dvalue^2-2*dvalue (< 2^53)
+    function am1(i,x,w,j,c,n) {
+      while(--n >= 0) {
+        var v = x*this[i++]+w[j]+c;
+        c = Math.floor(v/0x4000000);
+        w[j++] = v&0x3ffffff;
+      }
+      return c;
+    }
+    // am2 avoids a big mult-and-extract completely.
+    // Max digit bits should be <= 30 because we do bitwise ops
+    // on values up to 2*hdvalue^2-hdvalue-1 (< 2^31)
+    function am2(i,x,w,j,c,n) {
+      var xl = x&0x7fff, xh = x>>15;
+      while(--n >= 0) {
+        var l = this[i]&0x7fff;
+        var h = this[i++]>>15;
+        var m = xh*l+h*xl;
+        l = xl*l+((m&0x7fff)<<15)+w[j]+(c&0x3fffffff);
+        c = (l>>>30)+(m>>>15)+xh*h+(c>>>30);
+        w[j++] = l&0x3fffffff;
+      }
+      return c;
+    }
+    // Alternately, set max digit bits to 28 since some
+    // browsers slow down when dealing with 32-bit numbers.
+    function am3(i,x,w,j,c,n) {
+      var xl = x&0x3fff, xh = x>>14;
+      while(--n >= 0) {
+        var l = this[i]&0x3fff;
+        var h = this[i++]>>14;
+        var m = xh*l+h*xl;
+        l = xl*l+((m&0x3fff)<<14)+w[j]+c;
+        c = (l>>28)+(m>>14)+xh*h;
+        w[j++] = l&0xfffffff;
+      }
+      return c;
+    }
+    var inBrowser = typeof navigator !== "undefined";
+    if(inBrowser && j_lm && (navigator.appName == "Microsoft Internet Explorer")) {
+      BigInteger.prototype.am = am2;
+      dbits = 30;
+    }
+    else if(inBrowser && j_lm && (navigator.appName != "Netscape")) {
+      BigInteger.prototype.am = am1;
+      dbits = 26;
+    }
+    else { // Mozilla/Netscape seems to prefer am3
+      BigInteger.prototype.am = am3;
+      dbits = 28;
+    }
+
+    BigInteger.prototype.DB = dbits;
+    BigInteger.prototype.DM = ((1<<dbits)-1);
+    BigInteger.prototype.DV = (1<<dbits);
+
+    var BI_FP = 52;
+    BigInteger.prototype.FV = Math.pow(2,BI_FP);
+    BigInteger.prototype.F1 = BI_FP-dbits;
+    BigInteger.prototype.F2 = 2*dbits-BI_FP;
+
+    // Digit conversions
+    var BI_RM = "0123456789abcdefghijklmnopqrstuvwxyz";
+    var BI_RC = new Array();
+    var rr,vv;
+    rr = "0".charCodeAt(0);
+    for(vv = 0; vv <= 9; ++vv) BI_RC[rr++] = vv;
+    rr = "a".charCodeAt(0);
+    for(vv = 10; vv < 36; ++vv) BI_RC[rr++] = vv;
+    rr = "A".charCodeAt(0);
+    for(vv = 10; vv < 36; ++vv) BI_RC[rr++] = vv;
+
+    function int2char(n) { return BI_RM.charAt(n); }
+    function intAt(s,i) {
+      var c = BI_RC[s.charCodeAt(i)];
+      return (c==null)?-1:c;
+    }
+
+    // (protected) copy this to r
+    function bnpCopyTo(r) {
+      for(var i = this.t-1; i >= 0; --i) r[i] = this[i];
+      r.t = this.t;
+      r.s = this.s;
+    }
+
+    // (protected) set from integer value x, -DV <= x < DV
+    function bnpFromInt(x) {
+      this.t = 1;
+      this.s = (x<0)?-1:0;
+      if(x > 0) this[0] = x;
+      else if(x < -1) this[0] = x+this.DV;
+      else this.t = 0;
+    }
+
+    // return bigint initialized to value
+    function nbv(i) { var r = nbi(); r.fromInt(i); return r; }
+
+    // (protected) set from string and radix
+    function bnpFromString(s,b) {
+      var k;
+      if(b == 16) k = 4;
+      else if(b == 8) k = 3;
+      else if(b == 256) k = 8; // byte array
+      else if(b == 2) k = 1;
+      else if(b == 32) k = 5;
+      else if(b == 4) k = 2;
+      else { this.fromRadix(s,b); return; }
+      this.t = 0;
+      this.s = 0;
+      var i = s.length, mi = false, sh = 0;
+      while(--i >= 0) {
+        var x = (k==8)?s[i]&0xff:intAt(s,i);
+        if(x < 0) {
+          if(s.charAt(i) == "-") mi = true;
+          continue;
+        }
+        mi = false;
+        if(sh == 0)
+          this[this.t++] = x;
+        else if(sh+k > this.DB) {
+          this[this.t-1] |= (x&((1<<(this.DB-sh))-1))<<sh;
+          this[this.t++] = (x>>(this.DB-sh));
+        }
+        else
+          this[this.t-1] |= x<<sh;
+        sh += k;
+        if(sh >= this.DB) sh -= this.DB;
+      }
+      if(k == 8 && (s[0]&0x80) != 0) {
+        this.s = -1;
+        if(sh > 0) this[this.t-1] |= ((1<<(this.DB-sh))-1)<<sh;
+      }
+      this.clamp();
+      if(mi) BigInteger.ZERO.subTo(this,this);
+    }
+
+    // (protected) clamp off excess high words
+    function bnpClamp() {
+      var c = this.s&this.DM;
+      while(this.t > 0 && this[this.t-1] == c) --this.t;
+    }
+
+    // (public) return string representation in given radix
+    function bnToString(b) {
+      if(this.s < 0) return "-"+this.negate().toString(b);
+      var k;
+      if(b == 16) k = 4;
+      else if(b == 8) k = 3;
+      else if(b == 2) k = 1;
+      else if(b == 32) k = 5;
+      else if(b == 4) k = 2;
+      else return this.toRadix(b);
+      var km = (1<<k)-1, d, m = false, r = "", i = this.t;
+      var p = this.DB-(i*this.DB)%k;
+      if(i-- > 0) {
+        if(p < this.DB && (d = this[i]>>p) > 0) { m = true; r = int2char(d); }
+        while(i >= 0) {
+          if(p < k) {
+            d = (this[i]&((1<<p)-1))<<(k-p);
+            d |= this[--i]>>(p+=this.DB-k);
+          }
+          else {
+            d = (this[i]>>(p-=k))&km;
+            if(p <= 0) { p += this.DB; --i; }
+          }
+          if(d > 0) m = true;
+          if(m) r += int2char(d);
+        }
+      }
+      return m?r:"0";
+    }
+
+    // (public) -this
+    function bnNegate() { var r = nbi(); BigInteger.ZERO.subTo(this,r); return r; }
+
+    // (public) |this|
+    function bnAbs() { return (this.s<0)?this.negate():this; }
+
+    // (public) return + if this > a, - if this < a, 0 if equal
+    function bnCompareTo(a) {
+      var r = this.s-a.s;
+      if(r != 0) return r;
+      var i = this.t;
+      r = i-a.t;
+      if(r != 0) return (this.s<0)?-r:r;
+      while(--i >= 0) if((r=this[i]-a[i]) != 0) return r;
+      return 0;
+    }
+
+    // returns bit length of the integer x
+    function nbits(x) {
+      var r = 1, t;
+      if((t=x>>>16) != 0) { x = t; r += 16; }
+      if((t=x>>8) != 0) { x = t; r += 8; }
+      if((t=x>>4) != 0) { x = t; r += 4; }
+      if((t=x>>2) != 0) { x = t; r += 2; }
+      if((t=x>>1) != 0) { x = t; r += 1; }
+      return r;
+    }
+
+    // (public) return the number of bits in "this"
+    function bnBitLength() {
+      if(this.t <= 0) return 0;
+      return this.DB*(this.t-1)+nbits(this[this.t-1]^(this.s&this.DM));
+    }
+
+    // (protected) r = this << n*DB
+    function bnpDLShiftTo(n,r) {
+      var i;
+      for(i = this.t-1; i >= 0; --i) r[i+n] = this[i];
+      for(i = n-1; i >= 0; --i) r[i] = 0;
+      r.t = this.t+n;
+      r.s = this.s;
+    }
+
+    // (protected) r = this >> n*DB
+    function bnpDRShiftTo(n,r) {
+      for(var i = n; i < this.t; ++i) r[i-n] = this[i];
+      r.t = Math.max(this.t-n,0);
+      r.s = this.s;
+    }
+
+    // (protected) r = this << n
+    function bnpLShiftTo(n,r) {
+      var bs = n%this.DB;
+      var cbs = this.DB-bs;
+      var bm = (1<<cbs)-1;
+      var ds = Math.floor(n/this.DB), c = (this.s<<bs)&this.DM, i;
+      for(i = this.t-1; i >= 0; --i) {
+        r[i+ds+1] = (this[i]>>cbs)|c;
+        c = (this[i]&bm)<<bs;
+      }
+      for(i = ds-1; i >= 0; --i) r[i] = 0;
+      r[ds] = c;
+      r.t = this.t+ds+1;
+      r.s = this.s;
+      r.clamp();
+    }
+
+    // (protected) r = this >> n
+    function bnpRShiftTo(n,r) {
+      r.s = this.s;
+      var ds = Math.floor(n/this.DB);
+      if(ds >= this.t) { r.t = 0; return; }
+      var bs = n%this.DB;
+      var cbs = this.DB-bs;
+      var bm = (1<<bs)-1;
+      r[0] = this[ds]>>bs;
+      for(var i = ds+1; i < this.t; ++i) {
+        r[i-ds-1] |= (this[i]&bm)<<cbs;
+        r[i-ds] = this[i]>>bs;
+      }
+      if(bs > 0) r[this.t-ds-1] |= (this.s&bm)<<cbs;
+      r.t = this.t-ds;
+      r.clamp();
+    }
+
+    // (protected) r = this - a
+    function bnpSubTo(a,r) {
+      var i = 0, c = 0, m = Math.min(a.t,this.t);
+      while(i < m) {
+        c += this[i]-a[i];
+        r[i++] = c&this.DM;
+        c >>= this.DB;
+      }
+      if(a.t < this.t) {
+        c -= a.s;
+        while(i < this.t) {
+          c += this[i];
+          r[i++] = c&this.DM;
+          c >>= this.DB;
+        }
+        c += this.s;
+      }
+      else {
+        c += this.s;
+        while(i < a.t) {
+          c -= a[i];
+          r[i++] = c&this.DM;
+          c >>= this.DB;
+        }
+        c -= a.s;
+      }
+      r.s = (c<0)?-1:0;
+      if(c < -1) r[i++] = this.DV+c;
+      else if(c > 0) r[i++] = c;
+      r.t = i;
+      r.clamp();
+    }
+
+    // (protected) r = this * a, r != this,a (HAC 14.12)
+    // "this" should be the larger one if appropriate.
+    function bnpMultiplyTo(a,r) {
+      var x = this.abs(), y = a.abs();
+      var i = x.t;
+      r.t = i+y.t;
+      while(--i >= 0) r[i] = 0;
+      for(i = 0; i < y.t; ++i) r[i+x.t] = x.am(0,y[i],r,i,0,x.t);
+      r.s = 0;
+      r.clamp();
+      if(this.s != a.s) BigInteger.ZERO.subTo(r,r);
+    }
+
+    // (protected) r = this^2, r != this (HAC 14.16)
+    function bnpSquareTo(r) {
+      var x = this.abs();
+      var i = r.t = 2*x.t;
+      while(--i >= 0) r[i] = 0;
+      for(i = 0; i < x.t-1; ++i) {
+        var c = x.am(i,x[i],r,2*i,0,1);
+        if((r[i+x.t]+=x.am(i+1,2*x[i],r,2*i+1,c,x.t-i-1)) >= x.DV) {
+          r[i+x.t] -= x.DV;
+          r[i+x.t+1] = 1;
+        }
+      }
+      if(r.t > 0) r[r.t-1] += x.am(i,x[i],r,2*i,0,1);
+      r.s = 0;
+      r.clamp();
+    }
+
+    // (protected) divide this by m, quotient and remainder to q, r (HAC 14.20)
+    // r != q, this != m.  q or r may be null.
+    function bnpDivRemTo(m,q,r) {
+      var pm = m.abs();
+      if(pm.t <= 0) return;
+      var pt = this.abs();
+      if(pt.t < pm.t) {
+        if(q != null) q.fromInt(0);
+        if(r != null) this.copyTo(r);
+        return;
+      }
+      if(r == null) r = nbi();
+      var y = nbi(), ts = this.s, ms = m.s;
+      var nsh = this.DB-nbits(pm[pm.t-1]);   // normalize modulus
+      if(nsh > 0) { pm.lShiftTo(nsh,y); pt.lShiftTo(nsh,r); }
+      else { pm.copyTo(y); pt.copyTo(r); }
+      var ys = y.t;
+      var y0 = y[ys-1];
+      if(y0 == 0) return;
+      var yt = y0*(1<<this.F1)+((ys>1)?y[ys-2]>>this.F2:0);
+      var d1 = this.FV/yt, d2 = (1<<this.F1)/yt, e = 1<<this.F2;
+      var i = r.t, j = i-ys, t = (q==null)?nbi():q;
+      y.dlShiftTo(j,t);
+      if(r.compareTo(t) >= 0) {
+        r[r.t++] = 1;
+        r.subTo(t,r);
+      }
+      BigInteger.ONE.dlShiftTo(ys,t);
+      t.subTo(y,y);  // "negative" y so we can replace sub with am later
+      while(y.t < ys) y[y.t++] = 0;
+      while(--j >= 0) {
+        // Estimate quotient digit
+        var qd = (r[--i]==y0)?this.DM:Math.floor(r[i]*d1+(r[i-1]+e)*d2);
+        if((r[i]+=y.am(0,qd,r,j,0,ys)) < qd) {   // Try it out
+          y.dlShiftTo(j,t);
+          r.subTo(t,r);
+          while(r[i] < --qd) r.subTo(t,r);
+        }
+      }
+      if(q != null) {
+        r.drShiftTo(ys,q);
+        if(ts != ms) BigInteger.ZERO.subTo(q,q);
+      }
+      r.t = ys;
+      r.clamp();
+      if(nsh > 0) r.rShiftTo(nsh,r); // Denormalize remainder
+      if(ts < 0) BigInteger.ZERO.subTo(r,r);
+    }
+
+    // (public) this mod a
+    function bnMod(a) {
+      var r = nbi();
+      this.abs().divRemTo(a,null,r);
+      if(this.s < 0 && r.compareTo(BigInteger.ZERO) > 0) a.subTo(r,r);
+      return r;
+    }
+
+    // Modular reduction using "classic" algorithm
+    function Classic(m) { this.m = m; }
+    function cConvert(x) {
+      if(x.s < 0 || x.compareTo(this.m) >= 0) return x.mod(this.m);
+      else return x;
+    }
+    function cRevert(x) { return x; }
+    function cReduce(x) { x.divRemTo(this.m,null,x); }
+    function cMulTo(x,y,r) { x.multiplyTo(y,r); this.reduce(r); }
+    function cSqrTo(x,r) { x.squareTo(r); this.reduce(r); }
+
+    Classic.prototype.convert = cConvert;
+    Classic.prototype.revert = cRevert;
+    Classic.prototype.reduce = cReduce;
+    Classic.prototype.mulTo = cMulTo;
+    Classic.prototype.sqrTo = cSqrTo;
+
+    // (protected) return "-1/this % 2^DB"; useful for Mont. reduction
+    // justification:
+    //         xy == 1 (mod m)
+    //         xy =  1+km
+    //   xy(2-xy) = (1+km)(1-km)
+    // x[y(2-xy)] = 1-k^2m^2
+    // x[y(2-xy)] == 1 (mod m^2)
+    // if y is 1/x mod m, then y(2-xy) is 1/x mod m^2
+    // should reduce x and y(2-xy) by m^2 at each step to keep size bounded.
+    // JS multiply "overflows" differently from C/C++, so care is needed here.
+    function bnpInvDigit() {
+      if(this.t < 1) return 0;
+      var x = this[0];
+      if((x&1) == 0) return 0;
+      var y = x&3;       // y == 1/x mod 2^2
+      y = (y*(2-(x&0xf)*y))&0xf; // y == 1/x mod 2^4
+      y = (y*(2-(x&0xff)*y))&0xff;   // y == 1/x mod 2^8
+      y = (y*(2-(((x&0xffff)*y)&0xffff)))&0xffff;    // y == 1/x mod 2^16
+      // last step - calculate inverse mod DV directly;
+      // assumes 16 < DB <= 32 and assumes ability to handle 48-bit ints
+      y = (y*(2-x*y%this.DV))%this.DV;       // y == 1/x mod 2^dbits
+      // we really want the negative inverse, and -DV < y < DV
+      return (y>0)?this.DV-y:-y;
+    }
+
+    // Montgomery reduction
+    function Montgomery(m) {
+      this.m = m;
+      this.mp = m.invDigit();
+      this.mpl = this.mp&0x7fff;
+      this.mph = this.mp>>15;
+      this.um = (1<<(m.DB-15))-1;
+      this.mt2 = 2*m.t;
+    }
+
+    // xR mod m
+    function montConvert(x) {
+      var r = nbi();
+      x.abs().dlShiftTo(this.m.t,r);
+      r.divRemTo(this.m,null,r);
+      if(x.s < 0 && r.compareTo(BigInteger.ZERO) > 0) this.m.subTo(r,r);
+      return r;
+    }
+
+    // x/R mod m
+    function montRevert(x) {
+      var r = nbi();
+      x.copyTo(r);
+      this.reduce(r);
+      return r;
+    }
+
+    // x = x/R mod m (HAC 14.32)
+    function montReduce(x) {
+      while(x.t <= this.mt2) // pad x so am has enough room later
+        x[x.t++] = 0;
+      for(var i = 0; i < this.m.t; ++i) {
+        // faster way of calculating u0 = x[i]*mp mod DV
+        var j = x[i]&0x7fff;
+        var u0 = (j*this.mpl+(((j*this.mph+(x[i]>>15)*this.mpl)&this.um)<<15))&x.DM;
+        // use am to combine the multiply-shift-add into one call
+        j = i+this.m.t;
+        x[j] += this.m.am(0,u0,x,i,0,this.m.t);
+        // propagate carry
+        while(x[j] >= x.DV) { x[j] -= x.DV; x[++j]++; }
+      }
+      x.clamp();
+      x.drShiftTo(this.m.t,x);
+      if(x.compareTo(this.m) >= 0) x.subTo(this.m,x);
+    }
+
+    // r = "x^2/R mod m"; x != r
+    function montSqrTo(x,r) { x.squareTo(r); this.reduce(r); }
+
+    // r = "xy/R mod m"; x,y != r
+    function montMulTo(x,y,r) { x.multiplyTo(y,r); this.reduce(r); }
+
+    Montgomery.prototype.convert = montConvert;
+    Montgomery.prototype.revert = montRevert;
+    Montgomery.prototype.reduce = montReduce;
+    Montgomery.prototype.mulTo = montMulTo;
+    Montgomery.prototype.sqrTo = montSqrTo;
+
+    // (protected) true iff this is even
+    function bnpIsEven() { return ((this.t>0)?(this[0]&1):this.s) == 0; }
+
+    // (protected) this^e, e < 2^32, doing sqr and mul with "r" (HAC 14.79)
+    function bnpExp(e,z) {
+      if(e > 0xffffffff || e < 1) return BigInteger.ONE;
+      var r = nbi(), r2 = nbi(), g = z.convert(this), i = nbits(e)-1;
+      g.copyTo(r);
+      while(--i >= 0) {
+        z.sqrTo(r,r2);
+        if((e&(1<<i)) > 0) z.mulTo(r2,g,r);
+        else { var t = r; r = r2; r2 = t; }
+      }
+      return z.revert(r);
+    }
+
+    // (public) this^e % m, 0 <= e < 2^32
+    function bnModPowInt(e,m) {
+      var z;
+      if(e < 256 || m.isEven()) z = new Classic(m); else z = new Montgomery(m);
+      return this.exp(e,z);
+    }
+
+    // protected
+    BigInteger.prototype.copyTo = bnpCopyTo;
+    BigInteger.prototype.fromInt = bnpFromInt;
+    BigInteger.prototype.fromString = bnpFromString;
+    BigInteger.prototype.clamp = bnpClamp;
+    BigInteger.prototype.dlShiftTo = bnpDLShiftTo;
+    BigInteger.prototype.drShiftTo = bnpDRShiftTo;
+    BigInteger.prototype.lShiftTo = bnpLShiftTo;
+    BigInteger.prototype.rShiftTo = bnpRShiftTo;
+    BigInteger.prototype.subTo = bnpSubTo;
+    BigInteger.prototype.multiplyTo = bnpMultiplyTo;
+    BigInteger.prototype.squareTo = bnpSquareTo;
+    BigInteger.prototype.divRemTo = bnpDivRemTo;
+    BigInteger.prototype.invDigit = bnpInvDigit;
+    BigInteger.prototype.isEven = bnpIsEven;
+    BigInteger.prototype.exp = bnpExp;
+
+    // public
+    BigInteger.prototype.toString = bnToString;
+    BigInteger.prototype.negate = bnNegate;
+    BigInteger.prototype.abs = bnAbs;
+    BigInteger.prototype.compareTo = bnCompareTo;
+    BigInteger.prototype.bitLength = bnBitLength;
+    BigInteger.prototype.mod = bnMod;
+    BigInteger.prototype.modPowInt = bnModPowInt;
+
+    // "constants"
+    BigInteger.ZERO = nbv(0);
+    BigInteger.ONE = nbv(1);
+
+    // Copyright (c) 2005-2009  Tom Wu
+    // All Rights Reserved.
+    // See "LICENSE" for details.
+
+    // Extended JavaScript BN functions, required for RSA private ops.
+
+    // Version 1.1: new BigInteger("0", 10) returns "proper" zero
+    // Version 1.2: square() API, isProbablePrime fix
+
+    // (public)
+    function bnClone() { var r = nbi(); this.copyTo(r); return r; }
+
+    // (public) return value as integer
+    function bnIntValue() {
+      if(this.s < 0) {
+        if(this.t == 1) return this[0]-this.DV;
+        else if(this.t == 0) return -1;
+      }
+      else if(this.t == 1) return this[0];
+      else if(this.t == 0) return 0;
+      // assumes 16 < DB < 32
+      return ((this[1]&((1<<(32-this.DB))-1))<<this.DB)|this[0];
+    }
+
+    // (public) return value as byte
+    function bnByteValue() { return (this.t==0)?this.s:(this[0]<<24)>>24; }
+
+    // (public) return value as short (assumes DB>=16)
+    function bnShortValue() { return (this.t==0)?this.s:(this[0]<<16)>>16; }
+
+    // (protected) return x s.t. r^x < DV
+    function bnpChunkSize(r) { return Math.floor(Math.LN2*this.DB/Math.log(r)); }
+
+    // (public) 0 if this == 0, 1 if this > 0
+    function bnSigNum() {
+      if(this.s < 0) return -1;
+      else if(this.t <= 0 || (this.t == 1 && this[0] <= 0)) return 0;
+      else return 1;
+    }
+
+    // (protected) convert to radix string
+    function bnpToRadix(b) {
+      if(b == null) b = 10;
+      if(this.signum() == 0 || b < 2 || b > 36) return "0";
+      var cs = this.chunkSize(b);
+      var a = Math.pow(b,cs);
+      var d = nbv(a), y = nbi(), z = nbi(), r = "";
+      this.divRemTo(d,y,z);
+      while(y.signum() > 0) {
+        r = (a+z.intValue()).toString(b).substr(1) + r;
+        y.divRemTo(d,y,z);
+      }
+      return z.intValue().toString(b) + r;
+    }
+
+    // (protected) convert from radix string
+    function bnpFromRadix(s,b) {
+      this.fromInt(0);
+      if(b == null) b = 10;
+      var cs = this.chunkSize(b);
+      var d = Math.pow(b,cs), mi = false, j = 0, w = 0;
+      for(var i = 0; i < s.length; ++i) {
+        var x = intAt(s,i);
+        if(x < 0) {
+          if(s.charAt(i) == "-" && this.signum() == 0) mi = true;
+          continue;
+        }
+        w = b*w+x;
+        if(++j >= cs) {
+          this.dMultiply(d);
+          this.dAddOffset(w,0);
+          j = 0;
+          w = 0;
+        }
+      }
+      if(j > 0) {
+        this.dMultiply(Math.pow(b,j));
+        this.dAddOffset(w,0);
+      }
+      if(mi) BigInteger.ZERO.subTo(this,this);
+    }
+
+    // (protected) alternate constructor
+    function bnpFromNumber(a,b,c) {
+      if("number" == typeof b) {
+        // new BigInteger(int,int,RNG)
+        if(a < 2) this.fromInt(1);
+        else {
+          this.fromNumber(a,c);
+          if(!this.testBit(a-1))	// force MSB set
+            this.bitwiseTo(BigInteger.ONE.shiftLeft(a-1),op_or,this);
+          if(this.isEven()) this.dAddOffset(1,0); // force odd
+          while(!this.isProbablePrime(b)) {
+            this.dAddOffset(2,0);
+            if(this.bitLength() > a) this.subTo(BigInteger.ONE.shiftLeft(a-1),this);
+          }
+        }
+      }
+      else {
+        // new BigInteger(int,RNG)
+        var x = new Array(), t = a&7;
+        x.length = (a>>3)+1;
+        b.nextBytes(x);
+        if(t > 0) x[0] &= ((1<<t)-1); else x[0] = 0;
+        this.fromString(x,256);
+      }
+    }
+
+    // (public) convert to bigendian byte array
+    function bnToByteArray() {
+      var i = this.t, r = new Array();
+      r[0] = this.s;
+      var p = this.DB-(i*this.DB)%8, d, k = 0;
+      if(i-- > 0) {
+        if(p < this.DB && (d = this[i]>>p) != (this.s&this.DM)>>p)
+          r[k++] = d|(this.s<<(this.DB-p));
+        while(i >= 0) {
+          if(p < 8) {
+            d = (this[i]&((1<<p)-1))<<(8-p);
+            d |= this[--i]>>(p+=this.DB-8);
+          }
+          else {
+            d = (this[i]>>(p-=8))&0xff;
+            if(p <= 0) { p += this.DB; --i; }
+          }
+          if((d&0x80) != 0) d |= -256;
+          if(k == 0 && (this.s&0x80) != (d&0x80)) ++k;
+          if(k > 0 || d != this.s) r[k++] = d;
+        }
+      }
+      return r;
+    }
+
+    function bnEquals(a) { return(this.compareTo(a)==0); }
+    function bnMin(a) { return(this.compareTo(a)<0)?this:a; }
+    function bnMax(a) { return(this.compareTo(a)>0)?this:a; }
+
+    // (protected) r = this op a (bitwise)
+    function bnpBitwiseTo(a,op,r) {
+      var i, f, m = Math.min(a.t,this.t);
+      for(i = 0; i < m; ++i) r[i] = op(this[i],a[i]);
+      if(a.t < this.t) {
+        f = a.s&this.DM;
+        for(i = m; i < this.t; ++i) r[i] = op(this[i],f);
+        r.t = this.t;
+      }
+      else {
+        f = this.s&this.DM;
+        for(i = m; i < a.t; ++i) r[i] = op(f,a[i]);
+        r.t = a.t;
+      }
+      r.s = op(this.s,a.s);
+      r.clamp();
+    }
+
+    // (public) this & a
+    function op_and(x,y) { return x&y; }
+    function bnAnd(a) { var r = nbi(); this.bitwiseTo(a,op_and,r); return r; }
+
+    // (public) this | a
+    function op_or(x,y) { return x|y; }
+    function bnOr(a) { var r = nbi(); this.bitwiseTo(a,op_or,r); return r; }
+
+    // (public) this ^ a
+    function op_xor(x,y) { return x^y; }
+    function bnXor(a) { var r = nbi(); this.bitwiseTo(a,op_xor,r); return r; }
+
+    // (public) this & ~a
+    function op_andnot(x,y) { return x&~y; }
+    function bnAndNot(a) { var r = nbi(); this.bitwiseTo(a,op_andnot,r); return r; }
+
+    // (public) ~this
+    function bnNot() {
+      var r = nbi();
+      for(var i = 0; i < this.t; ++i) r[i] = this.DM&~this[i];
+      r.t = this.t;
+      r.s = ~this.s;
+      return r;
+    }
+
+    // (public) this << n
+    function bnShiftLeft(n) {
+      var r = nbi();
+      if(n < 0) this.rShiftTo(-n,r); else this.lShiftTo(n,r);
+      return r;
+    }
+
+    // (public) this >> n
+    function bnShiftRight(n) {
+      var r = nbi();
+      if(n < 0) this.lShiftTo(-n,r); else this.rShiftTo(n,r);
+      return r;
+    }
+
+    // return index of lowest 1-bit in x, x < 2^31
+    function lbit(x) {
+      if(x == 0) return -1;
+      var r = 0;
+      if((x&0xffff) == 0) { x >>= 16; r += 16; }
+      if((x&0xff) == 0) { x >>= 8; r += 8; }
+      if((x&0xf) == 0) { x >>= 4; r += 4; }
+      if((x&3) == 0) { x >>= 2; r += 2; }
+      if((x&1) == 0) ++r;
+      return r;
+    }
+
+    // (public) returns index of lowest 1-bit (or -1 if none)
+    function bnGetLowestSetBit() {
+      for(var i = 0; i < this.t; ++i)
+        if(this[i] != 0) return i*this.DB+lbit(this[i]);
+      if(this.s < 0) return this.t*this.DB;
+      return -1;
+    }
+
+    // return number of 1 bits in x
+    function cbit(x) {
+      var r = 0;
+      while(x != 0) { x &= x-1; ++r; }
+      return r;
+    }
+
+    // (public) return number of set bits
+    function bnBitCount() {
+      var r = 0, x = this.s&this.DM;
+      for(var i = 0; i < this.t; ++i) r += cbit(this[i]^x);
+      return r;
+    }
+
+    // (public) true iff nth bit is set
+    function bnTestBit(n) {
+      var j = Math.floor(n/this.DB);
+      if(j >= this.t) return(this.s!=0);
+      return((this[j]&(1<<(n%this.DB)))!=0);
+    }
+
+    // (protected) this op (1<<n)
+    function bnpChangeBit(n,op) {
+      var r = BigInteger.ONE.shiftLeft(n);
+      this.bitwiseTo(r,op,r);
+      return r;
+    }
+
+    // (public) this | (1<<n)
+    function bnSetBit(n) { return this.changeBit(n,op_or); }
+
+    // (public) this & ~(1<<n)
+    function bnClearBit(n) { return this.changeBit(n,op_andnot); }
+
+    // (public) this ^ (1<<n)
+    function bnFlipBit(n) { return this.changeBit(n,op_xor); }
+
+    // (protected) r = this + a
+    function bnpAddTo(a,r) {
+      var i = 0, c = 0, m = Math.min(a.t,this.t);
+      while(i < m) {
+        c += this[i]+a[i];
+        r[i++] = c&this.DM;
+        c >>= this.DB;
+      }
+      if(a.t < this.t) {
+        c += a.s;
+        while(i < this.t) {
+          c += this[i];
+          r[i++] = c&this.DM;
+          c >>= this.DB;
+        }
+        c += this.s;
+      }
+      else {
+        c += this.s;
+        while(i < a.t) {
+          c += a[i];
+          r[i++] = c&this.DM;
+          c >>= this.DB;
+        }
+        c += a.s;
+      }
+      r.s = (c<0)?-1:0;
+      if(c > 0) r[i++] = c;
+      else if(c < -1) r[i++] = this.DV+c;
+      r.t = i;
+      r.clamp();
+    }
+
+    // (public) this + a
+    function bnAdd(a) { var r = nbi(); this.addTo(a,r); return r; }
+
+    // (public) this - a
+    function bnSubtract(a) { var r = nbi(); this.subTo(a,r); return r; }
+
+    // (public) this * a
+    function bnMultiply(a) { var r = nbi(); this.multiplyTo(a,r); return r; }
+
+    // (public) this^2
+    function bnSquare() { var r = nbi(); this.squareTo(r); return r; }
+
+    // (public) this / a
+    function bnDivide(a) { var r = nbi(); this.divRemTo(a,r,null); return r; }
+
+    // (public) this % a
+    function bnRemainder(a) { var r = nbi(); this.divRemTo(a,null,r); return r; }
+
+    // (public) [this/a,this%a]
+    function bnDivideAndRemainder(a) {
+      var q = nbi(), r = nbi();
+      this.divRemTo(a,q,r);
+      return new Array(q,r);
+    }
+
+    // (protected) this *= n, this >= 0, 1 < n < DV
+    function bnpDMultiply(n) {
+      this[this.t] = this.am(0,n-1,this,0,0,this.t);
+      ++this.t;
+      this.clamp();
+    }
+
+    // (protected) this += n << w words, this >= 0
+    function bnpDAddOffset(n,w) {
+      if(n == 0) return;
+      while(this.t <= w) this[this.t++] = 0;
+      this[w] += n;
+      while(this[w] >= this.DV) {
+        this[w] -= this.DV;
+        if(++w >= this.t) this[this.t++] = 0;
+        ++this[w];
+      }
+    }
+
+    // A "null" reducer
+    function NullExp() {}
+    function nNop(x) { return x; }
+    function nMulTo(x,y,r) { x.multiplyTo(y,r); }
+    function nSqrTo(x,r) { x.squareTo(r); }
+
+    NullExp.prototype.convert = nNop;
+    NullExp.prototype.revert = nNop;
+    NullExp.prototype.mulTo = nMulTo;
+    NullExp.prototype.sqrTo = nSqrTo;
+
+    // (public) this^e
+    function bnPow(e) { return this.exp(e,new NullExp()); }
+
+    // (protected) r = lower n words of "this * a", a.t <= n
+    // "this" should be the larger one if appropriate.
+    function bnpMultiplyLowerTo(a,n,r) {
+      var i = Math.min(this.t+a.t,n);
+      r.s = 0; // assumes a,this >= 0
+      r.t = i;
+      while(i > 0) r[--i] = 0;
+      var j;
+      for(j = r.t-this.t; i < j; ++i) r[i+this.t] = this.am(0,a[i],r,i,0,this.t);
+      for(j = Math.min(a.t,n); i < j; ++i) this.am(0,a[i],r,i,0,n-i);
+      r.clamp();
+    }
+
+    // (protected) r = "this * a" without lower n words, n > 0
+    // "this" should be the larger one if appropriate.
+    function bnpMultiplyUpperTo(a,n,r) {
+      --n;
+      var i = r.t = this.t+a.t-n;
+      r.s = 0; // assumes a,this >= 0
+      while(--i >= 0) r[i] = 0;
+      for(i = Math.max(n-this.t,0); i < a.t; ++i)
+        r[this.t+i-n] = this.am(n-i,a[i],r,0,0,this.t+i-n);
+      r.clamp();
+      r.drShiftTo(1,r);
+    }
+
+    // Barrett modular reduction
+    function Barrett(m) {
+      // setup Barrett
+      this.r2 = nbi();
+      this.q3 = nbi();
+      BigInteger.ONE.dlShiftTo(2*m.t,this.r2);
+      this.mu = this.r2.divide(m);
+      this.m = m;
+    }
+
+    function barrettConvert(x) {
+      if(x.s < 0 || x.t > 2*this.m.t) return x.mod(this.m);
+      else if(x.compareTo(this.m) < 0) return x;
+      else { var r = nbi(); x.copyTo(r); this.reduce(r); return r; }
+    }
+
+    function barrettRevert(x) { return x; }
+
+    // x = x mod m (HAC 14.42)
+    function barrettReduce(x) {
+      x.drShiftTo(this.m.t-1,this.r2);
+      if(x.t > this.m.t+1) { x.t = this.m.t+1; x.clamp(); }
+      this.mu.multiplyUpperTo(this.r2,this.m.t+1,this.q3);
+      this.m.multiplyLowerTo(this.q3,this.m.t+1,this.r2);
+      while(x.compareTo(this.r2) < 0) x.dAddOffset(1,this.m.t+1);
+      x.subTo(this.r2,x);
+      while(x.compareTo(this.m) >= 0) x.subTo(this.m,x);
+    }
+
+    // r = x^2 mod m; x != r
+    function barrettSqrTo(x,r) { x.squareTo(r); this.reduce(r); }
+
+    // r = x*y mod m; x,y != r
+    function barrettMulTo(x,y,r) { x.multiplyTo(y,r); this.reduce(r); }
+
+    Barrett.prototype.convert = barrettConvert;
+    Barrett.prototype.revert = barrettRevert;
+    Barrett.prototype.reduce = barrettReduce;
+    Barrett.prototype.mulTo = barrettMulTo;
+    Barrett.prototype.sqrTo = barrettSqrTo;
+
+    // (public) this^e % m (HAC 14.85)
+    function bnModPow(e,m) {
+      var i = e.bitLength(), k, r = nbv(1), z;
+      if(i <= 0) return r;
+      else if(i < 18) k = 1;
+      else if(i < 48) k = 3;
+      else if(i < 144) k = 4;
+      else if(i < 768) k = 5;
+      else k = 6;
+      if(i < 8)
+        z = new Classic(m);
+      else if(m.isEven())
+        z = new Barrett(m);
+      else
+        z = new Montgomery(m);
+
+      // precomputation
+      var g = new Array(), n = 3, k1 = k-1, km = (1<<k)-1;
+      g[1] = z.convert(this);
+      if(k > 1) {
+        var g2 = nbi();
+        z.sqrTo(g[1],g2);
+        while(n <= km) {
+          g[n] = nbi();
+          z.mulTo(g2,g[n-2],g[n]);
+          n += 2;
+        }
+      }
+
+      var j = e.t-1, w, is1 = true, r2 = nbi(), t;
+      i = nbits(e[j])-1;
+      while(j >= 0) {
+        if(i >= k1) w = (e[j]>>(i-k1))&km;
+        else {
+          w = (e[j]&((1<<(i+1))-1))<<(k1-i);
+          if(j > 0) w |= e[j-1]>>(this.DB+i-k1);
+        }
+
+        n = k;
+        while((w&1) == 0) { w >>= 1; --n; }
+        if((i -= n) < 0) { i += this.DB; --j; }
+        if(is1) {	// ret == 1, don't bother squaring or multiplying it
+          g[w].copyTo(r);
+          is1 = false;
+        }
+        else {
+          while(n > 1) { z.sqrTo(r,r2); z.sqrTo(r2,r); n -= 2; }
+          if(n > 0) z.sqrTo(r,r2); else { t = r; r = r2; r2 = t; }
+          z.mulTo(r2,g[w],r);
+        }
+
+        while(j >= 0 && (e[j]&(1<<i)) == 0) {
+          z.sqrTo(r,r2); t = r; r = r2; r2 = t;
+          if(--i < 0) { i = this.DB-1; --j; }
+        }
+      }
+      return z.revert(r);
+    }
+
+    // (public) gcd(this,a) (HAC 14.54)
+    function bnGCD(a) {
+      var x = (this.s<0)?this.negate():this.clone();
+      var y = (a.s<0)?a.negate():a.clone();
+      if(x.compareTo(y) < 0) { var t = x; x = y; y = t; }
+      var i = x.getLowestSetBit(), g = y.getLowestSetBit();
+      if(g < 0) return x;
+      if(i < g) g = i;
+      if(g > 0) {
+        x.rShiftTo(g,x);
+        y.rShiftTo(g,y);
+      }
+      while(x.signum() > 0) {
+        if((i = x.getLowestSetBit()) > 0) x.rShiftTo(i,x);
+        if((i = y.getLowestSetBit()) > 0) y.rShiftTo(i,y);
+        if(x.compareTo(y) >= 0) {
+          x.subTo(y,x);
+          x.rShiftTo(1,x);
+        }
+        else {
+          y.subTo(x,y);
+          y.rShiftTo(1,y);
+        }
+      }
+      if(g > 0) y.lShiftTo(g,y);
+      return y;
+    }
+
+    // (protected) this % n, n < 2^26
+    function bnpModInt(n) {
+      if(n <= 0) return 0;
+      var d = this.DV%n, r = (this.s<0)?n-1:0;
+      if(this.t > 0)
+        if(d == 0) r = this[0]%n;
+        else for(var i = this.t-1; i >= 0; --i) r = (d*r+this[i])%n;
+      return r;
+    }
+
+    // (public) 1/this % m (HAC 14.61)
+    function bnModInverse(m) {
+      var ac = m.isEven();
+      if((this.isEven() && ac) || m.signum() == 0) return BigInteger.ZERO;
+      var u = m.clone(), v = this.clone();
+      var a = nbv(1), b = nbv(0), c = nbv(0), d = nbv(1);
+      while(u.signum() != 0) {
+        while(u.isEven()) {
+          u.rShiftTo(1,u);
+          if(ac) {
+            if(!a.isEven() || !b.isEven()) { a.addTo(this,a); b.subTo(m,b); }
+            a.rShiftTo(1,a);
+          }
+          else if(!b.isEven()) b.subTo(m,b);
+          b.rShiftTo(1,b);
+        }
+        while(v.isEven()) {
+          v.rShiftTo(1,v);
+          if(ac) {
+            if(!c.isEven() || !d.isEven()) { c.addTo(this,c); d.subTo(m,d); }
+            c.rShiftTo(1,c);
+          }
+          else if(!d.isEven()) d.subTo(m,d);
+          d.rShiftTo(1,d);
+        }
+        if(u.compareTo(v) >= 0) {
+          u.subTo(v,u);
+          if(ac) a.subTo(c,a);
+          b.subTo(d,b);
+        }
+        else {
+          v.subTo(u,v);
+          if(ac) c.subTo(a,c);
+          d.subTo(b,d);
+        }
+      }
+      if(v.compareTo(BigInteger.ONE) != 0) return BigInteger.ZERO;
+      if(d.compareTo(m) >= 0) return d.subtract(m);
+      if(d.signum() < 0) d.addTo(m,d); else return d;
+      if(d.signum() < 0) return d.add(m); else return d;
+    }
+
+    var lowprimes = [2,3,5,7,11,13,17,19,23,29,31,37,41,43,47,53,59,61,67,71,73,79,83,89,97,101,103,107,109,113,127,131,137,139,149,151,157,163,167,173,179,181,191,193,197,199,211,223,227,229,233,239,241,251,257,263,269,271,277,281,283,293,307,311,313,317,331,337,347,349,353,359,367,373,379,383,389,397,401,409,419,421,431,433,439,443,449,457,461,463,467,479,487,491,499,503,509,521,523,541,547,557,563,569,571,577,587,593,599,601,607,613,617,619,631,641,643,647,653,659,661,673,677,683,691,701,709,719,727,733,739,743,751,757,761,769,773,787,797,809,811,821,823,827,829,839,853,857,859,863,877,881,883,887,907,911,919,929,937,941,947,953,967,971,977,983,991,997];
+    var lplim = (1<<26)/lowprimes[lowprimes.length-1];
+
+    // (public) test primality with certainty >= 1-.5^t
+    function bnIsProbablePrime(t) {
+      var i, x = this.abs();
+      if(x.t == 1 && x[0] <= lowprimes[lowprimes.length-1]) {
+        for(i = 0; i < lowprimes.length; ++i)
+          if(x[0] == lowprimes[i]) return true;
+        return false;
+      }
+      if(x.isEven()) return false;
+      i = 1;
+      while(i < lowprimes.length) {
+        var m = lowprimes[i], j = i+1;
+        while(j < lowprimes.length && m < lplim) m *= lowprimes[j++];
+        m = x.modInt(m);
+        while(i < j) if(m%lowprimes[i++] == 0) return false;
+      }
+      return x.millerRabin(t);
+    }
+
+    // (protected) true if probably prime (HAC 4.24, Miller-Rabin)
+    function bnpMillerRabin(t) {
+      var n1 = this.subtract(BigInteger.ONE);
+      var k = n1.getLowestSetBit();
+      if(k <= 0) return false;
+      var r = n1.shiftRight(k);
+      t = (t+1)>>1;
+      if(t > lowprimes.length) t = lowprimes.length;
+      var a = nbi();
+      for(var i = 0; i < t; ++i) {
+        //Pick bases at random, instead of starting at 2
+        a.fromInt(lowprimes[Math.floor(Math.random()*lowprimes.length)]);
+        var y = a.modPow(r,this);
+        if(y.compareTo(BigInteger.ONE) != 0 && y.compareTo(n1) != 0) {
+          var j = 1;
+          while(j++ < k && y.compareTo(n1) != 0) {
+            y = y.modPowInt(2,this);
+            if(y.compareTo(BigInteger.ONE) == 0) return false;
+          }
+          if(y.compareTo(n1) != 0) return false;
+        }
+      }
+      return true;
+    }
+
+    // protected
+    BigInteger.prototype.chunkSize = bnpChunkSize;
+    BigInteger.prototype.toRadix = bnpToRadix;
+    BigInteger.prototype.fromRadix = bnpFromRadix;
+    BigInteger.prototype.fromNumber = bnpFromNumber;
+    BigInteger.prototype.bitwiseTo = bnpBitwiseTo;
+    BigInteger.prototype.changeBit = bnpChangeBit;
+    BigInteger.prototype.addTo = bnpAddTo;
+    BigInteger.prototype.dMultiply = bnpDMultiply;
+    BigInteger.prototype.dAddOffset = bnpDAddOffset;
+    BigInteger.prototype.multiplyLowerTo = bnpMultiplyLowerTo;
+    BigInteger.prototype.multiplyUpperTo = bnpMultiplyUpperTo;
+    BigInteger.prototype.modInt = bnpModInt;
+    BigInteger.prototype.millerRabin = bnpMillerRabin;
+
+    // public
+    BigInteger.prototype.clone = bnClone;
+    BigInteger.prototype.intValue = bnIntValue;
+    BigInteger.prototype.byteValue = bnByteValue;
+    BigInteger.prototype.shortValue = bnShortValue;
+    BigInteger.prototype.signum = bnSigNum;
+    BigInteger.prototype.toByteArray = bnToByteArray;
+    BigInteger.prototype.equals = bnEquals;
+    BigInteger.prototype.min = bnMin;
+    BigInteger.prototype.max = bnMax;
+    BigInteger.prototype.and = bnAnd;
+    BigInteger.prototype.or = bnOr;
+    BigInteger.prototype.xor = bnXor;
+    BigInteger.prototype.andNot = bnAndNot;
+    BigInteger.prototype.not = bnNot;
+    BigInteger.prototype.shiftLeft = bnShiftLeft;
+    BigInteger.prototype.shiftRight = bnShiftRight;
+    BigInteger.prototype.getLowestSetBit = bnGetLowestSetBit;
+    BigInteger.prototype.bitCount = bnBitCount;
+    BigInteger.prototype.testBit = bnTestBit;
+    BigInteger.prototype.setBit = bnSetBit;
+    BigInteger.prototype.clearBit = bnClearBit;
+    BigInteger.prototype.flipBit = bnFlipBit;
+    BigInteger.prototype.add = bnAdd;
+    BigInteger.prototype.subtract = bnSubtract;
+    BigInteger.prototype.multiply = bnMultiply;
+    BigInteger.prototype.divide = bnDivide;
+    BigInteger.prototype.remainder = bnRemainder;
+    BigInteger.prototype.divideAndRemainder = bnDivideAndRemainder;
+    BigInteger.prototype.modPow = bnModPow;
+    BigInteger.prototype.modInverse = bnModInverse;
+    BigInteger.prototype.pow = bnPow;
+    BigInteger.prototype.gcd = bnGCD;
+    BigInteger.prototype.isProbablePrime = bnIsProbablePrime;
+
+    // JSBN-specific extension
+    BigInteger.prototype.square = bnSquare;
+
+    // Expose the Barrett function
+    BigInteger.prototype.Barrett = Barrett
+
+    // BigInteger interfaces not implemented in jsbn:
+
+    // BigInteger(int signum, byte[] magnitude)
+    // double doubleValue()
+    // float floatValue()
+    // int hashCode()
+    // long longValue()
+    // static BigInteger valueOf(long val)
+
+	// Random number generator - requires a PRNG backend, e.g. prng4.js
+
+	// For best results, put code like
+	// <body onClick='rng_seed_time();' onKeyPress='rng_seed_time();'>
+	// in your main HTML document.
+
+	var rng_state;
+	var rng_pool;
+	var rng_pptr;
+
+	// Mix in a 32-bit integer into the pool
+	function rng_seed_int(x) {
+	  rng_pool[rng_pptr++] ^= x & 255;
+	  rng_pool[rng_pptr++] ^= (x >> 8) & 255;
+	  rng_pool[rng_pptr++] ^= (x >> 16) & 255;
+	  rng_pool[rng_pptr++] ^= (x >> 24) & 255;
+	  if(rng_pptr >= rng_psize) rng_pptr -= rng_psize;
+	}
+
+	// Mix in the current time (w/milliseconds) into the pool
+	function rng_seed_time() {
+	  rng_seed_int(new Date().getTime());
+	}
+
+	// Initialize the pool with junk if needed.
+	if(rng_pool == null) {
+	  rng_pool = new Array();
+	  rng_pptr = 0;
+	  var t;
+	  if(typeof window !== "undefined" && window.crypto) {
+		if (window.crypto.getRandomValues) {
+		  // Use webcrypto if available
+		  var ua = new Uint8Array(32);
+		  window.crypto.getRandomValues(ua);
+		  for(t = 0; t < 32; ++t)
+			rng_pool[rng_pptr++] = ua[t];
+		}
+		else if(navigator.appName == "Netscape" && navigator.appVersion < "5") {
+		  // Extract entropy (256 bits) from NS4 RNG if available
+		  var z = window.crypto.random(32);
+		  for(t = 0; t < z.length; ++t)
+			rng_pool[rng_pptr++] = z.charCodeAt(t) & 255;
+		}
+	  }
+	  while(rng_pptr < rng_psize) {  // extract some randomness from Math.random()
+		t = Math.floor(65536 * Math.random());
+		rng_pool[rng_pptr++] = t >>> 8;
+		rng_pool[rng_pptr++] = t & 255;
+	  }
+	  rng_pptr = 0;
+	  rng_seed_time();
+	  //rng_seed_int(window.screenX);
+	  //rng_seed_int(window.screenY);
+	}
+
+	function rng_get_byte() {
+	  if(rng_state == null) {
+		rng_seed_time();
+		rng_state = prng_newstate();
+		rng_state.init(rng_pool);
+		for(rng_pptr = 0; rng_pptr < rng_pool.length; ++rng_pptr)
+		  rng_pool[rng_pptr] = 0;
+		rng_pptr = 0;
+		//rng_pool = null;
+	  }
+	  // TODO: allow reseeding after first request
+	  return rng_state.next();
+	}
+
+	function rng_get_bytes(ba) {
+	  var i;
+	  for(i = 0; i < ba.length; ++i) ba[i] = rng_get_byte();
+	}
+
+	function SecureRandom() {}
+
+	SecureRandom.prototype.nextBytes = rng_get_bytes;
+
+	// prng4.js - uses Arcfour as a PRNG
+
+	function Arcfour() {
+	  this.i = 0;
+	  this.j = 0;
+	  this.S = new Array();
+	}
+
+	// Initialize arcfour context from key, an array of ints, each from [0..255]
+	function ARC4init(key) {
+	  var i, j, t;
+	  for(i = 0; i < 256; ++i)
+		this.S[i] = i;
+	  j = 0;
+	  for(i = 0; i < 256; ++i) {
+		j = (j + this.S[i] + key[i % key.length]) & 255;
+		t = this.S[i];
+		this.S[i] = this.S[j];
+		this.S[j] = t;
+	  }
+	  this.i = 0;
+	  this.j = 0;
+	}
+
+	function ARC4next() {
+	  var t;
+	  this.i = (this.i + 1) & 255;
+	  this.j = (this.j + this.S[this.i]) & 255;
+	  t = this.S[this.i];
+	  this.S[this.i] = this.S[this.j];
+	  this.S[this.j] = t;
+	  return this.S[(t + this.S[this.i]) & 255];
+	}
+
+	Arcfour.prototype.init = ARC4init;
+	Arcfour.prototype.next = ARC4next;
+
+	// Plug in your RNG constructor here
+	function prng_newstate() {
+	  return new Arcfour();
+	}
+
+	// Pool size must be a multiple of 4 and greater than 32.
+	// An array of bytes the size of the pool will be passed to init()
+	var rng_psize = 256;
+
+  BigInteger.SecureRandom = SecureRandom;
+  BigInteger.BigInteger = BigInteger;
+  if (true) {
+    exports = module.exports = BigInteger;
+  } else {
+    this.BigInteger = BigInteger;
+    this.SecureRandom = SecureRandom;
+  }
+
+}).call(this);
+
+
+/***/ }),
+/* 82 */
+/***/ (function(module, exports, __webpack_require__) {
+
+module.exports = minimatch
+minimatch.Minimatch = Minimatch
+
+var path = { sep: '/' }
+try {
+  path = __webpack_require__(0)
+} catch (er) {}
+
+var GLOBSTAR = minimatch.GLOBSTAR = Minimatch.GLOBSTAR = {}
+var expand = __webpack_require__(229)
+
+var plTypes = {
+  '!': { open: '(?:(?!(?:', close: '))[^/]*?)'},
+  '?': { open: '(?:', close: ')?' },
+  '+': { open: '(?:', close: ')+' },
+  '*': { open: '(?:', close: ')*' },
+  '@': { open: '(?:', close: ')' }
+}
+
+// any single thing other than /
+// don't need to escape / when using new RegExp()
+var qmark = '[^/]'
+
+// * => any number of characters
+var star = qmark + '*?'
+
+// ** when dots are allowed.  Anything goes, except .. and .
+// not (^ or / followed by one or two dots followed by $ or /),
+// followed by anything, any number of times.
+var twoStarDot = '(?:(?!(?:\\\/|^)(?:\\.{1,2})($|\\\/)).)*?'
+
+// not a ^ or / followed by a dot,
+// followed by anything, any number of times.
+var twoStarNoDot = '(?:(?!(?:\\\/|^)\\.).)*?'
+
+// characters that need to be escaped in RegExp.
+var reSpecials = charSet('().*{}+?[]^$\\!')
+
+// "abc" -> { a:true, b:true, c:true }
+function charSet (s) {
+  return s.split('').reduce(function (set, c) {
+    set[c] = true
+    return set
+  }, {})
+}
+
+// normalizes slashes.
+var slashSplit = /\/+/
+
+minimatch.filter = filter
+function filter (pattern, options) {
+  options = options || {}
+  return function (p, i, list) {
+    return minimatch(p, pattern, options)
+  }
+}
+
+function ext (a, b) {
+  a = a || {}
+  b = b || {}
+  var t = {}
+  Object.keys(b).forEach(function (k) {
+    t[k] = b[k]
+  })
+  Object.keys(a).forEach(function (k) {
+    t[k] = a[k]
+  })
+  return t
+}
+
+minimatch.defaults = function (def) {
+  if (!def || !Object.keys(def).length) return minimatch
+
+  var orig = minimatch
+
+  var m = function minimatch (p, pattern, options) {
+    return orig.minimatch(p, pattern, ext(def, options))
+  }
+
+  m.Minimatch = function Minimatch (pattern, options) {
+    return new orig.Minimatch(pattern, ext(def, options))
+  }
+
+  return m
+}
+
+Minimatch.defaults = function (def) {
+  if (!def || !Object.keys(def).length) return Minimatch
+  return minimatch.defaults(def).Minimatch
+}
+
+function minimatch (p, pattern, options) {
+  if (typeof pattern !== 'string') {
+    throw new TypeError('glob pattern string required')
+  }
+
+  if (!options) options = {}
+
+  // shortcut: comments match nothing.
+  if (!options.nocomment && pattern.charAt(0) === '#') {
+    return false
+  }
+
+  // "" only matches ""
+  if (pattern.trim() === '') return p === ''
+
+  return new Minimatch(pattern, options).match(p)
+}
+
+function Minimatch (pattern, options) {
+  if (!(this instanceof Minimatch)) {
+    return new Minimatch(pattern, options)
+  }
+
+  if (typeof pattern !== 'string') {
+    throw new TypeError('glob pattern string required')
+  }
+
+  if (!options) options = {}
+  pattern = pattern.trim()
+
+  // windows support: need to use /, not \
+  if (path.sep !== '/') {
+    pattern = pattern.split(path.sep).join('/')
+  }
+
+  this.options = options
+  this.set = []
+  this.pattern = pattern
+  this.regexp = null
+  this.negate = false
+  this.comment = false
+  this.empty = false
+
+  // make the set of regexps etc.
+  this.make()
+}
+
+Minimatch.prototype.debug = function () {}
+
+Minimatch.prototype.make = make
+function make () {
+  // don't do it more than once.
+  if (this._made) return
+
+  var pattern = this.pattern
+  var options = this.options
+
+  // empty patterns and comments match nothing.
+  if (!options.nocomment && pattern.charAt(0) === '#') {
+    this.comment = true
+    return
+  }
+  if (!pattern) {
+    this.empty = true
+    return
+  }
+
+  // step 1: figure out negation, etc.
+  this.parseNegate()
+
+  // step 2: expand braces
+  var set = this.globSet = this.braceExpand()
+
+  if (options.debug) this.debug = console.error
+
+  this.debug(this.pattern, set)
+
+  // step 3: now we have a set, so turn each one into a series of path-portion
+  // matching patterns.
+  // These will be regexps, except in the case of "**", which is
+  // set to the GLOBSTAR object for globstar behavior,
+  // and will not contain any / characters
+  set = this.globParts = set.map(function (s) {
+    return s.split(slashSplit)
+  })
+
+  this.debug(this.pattern, set)
+
+  // glob --> regexps
+  set = set.map(function (s, si, set) {
+    return s.map(this.parse, this)
+  }, this)
+
+  this.debug(this.pattern, set)
+
+  // filter out everything that didn't compile properly.
+  set = set.filter(function (s) {
+    return s.indexOf(false) === -1
+  })
+
+  this.debug(this.pattern, set)
+
+  this.set = set
+}
+
+Minimatch.prototype.parseNegate = parseNegate
+function parseNegate () {
+  var pattern = this.pattern
+  var negate = false
+  var options = this.options
+  var negateOffset = 0
+
+  if (options.nonegate) return
+
+  for (var i = 0, l = pattern.length
+    ; i < l && pattern.charAt(i) === '!'
+    ; i++) {
+    negate = !negate
+    negateOffset++
+  }
+
+  if (negateOffset) this.pattern = pattern.substr(negateOffset)
+  this.negate = negate
+}
+
+// Brace expansion:
+// a{b,c}d -> abd acd
+// a{b,}c -> abc ac
+// a{0..3}d -> a0d a1d a2d a3d
+// a{b,c{d,e}f}g -> abg acdfg acefg
+// a{b,c}d{e,f}g -> abdeg acdeg abdeg abdfg
+//
+// Invalid sets are not expanded.
+// a{2..}b -> a{2..}b
+// a{b}c -> a{b}c
+minimatch.braceExpand = function (pattern, options) {
+  return braceExpand(pattern, options)
+}
+
+Minimatch.prototype.braceExpand = braceExpand
+
+function braceExpand (pattern, options) {
+  if (!options) {
+    if (this instanceof Minimatch) {
+      options = this.options
+    } else {
+      options = {}
+    }
+  }
+
+  pattern = typeof pattern === 'undefined'
+    ? this.pattern : pattern
+
+  if (typeof pattern === 'undefined') {
+    throw new TypeError('undefined pattern')
+  }
+
+  if (options.nobrace ||
+    !pattern.match(/\{.*\}/)) {
+    // shortcut. no need to expand.
+    return [pattern]
+  }
+
+  return expand(pattern)
+}
+
+// parse a component of the expanded set.
+// At this point, no pattern may contain "/" in it
+// so we're going to return a 2d array, where each entry is the full
+// pattern, split on '/', and then turned into a regular expression.
+// A regexp is made at the end which joins each array with an
+// escaped /, and another full one which joins each regexp with |.
+//
+// Following the lead of Bash 4.1, note that "**" only has special meaning
+// when it is the *only* thing in a path portion.  Otherwise, any series
+// of * is equivalent to a single *.  Globstar behavior is enabled by
+// default, and can be disabled by setting options.noglobstar.
+Minimatch.prototype.parse = parse
+var SUBPARSE = {}
+function parse (pattern, isSub) {
+  if (pattern.length > 1024 * 64) {
+    throw new TypeError('pattern is too long')
+  }
+
+  var options = this.options
+
+  // shortcuts
+  if (!options.noglobstar && pattern === '**') return GLOBSTAR
+  if (pattern === '') return ''
+
+  var re = ''
+  var hasMagic = !!options.nocase
+  var escaping = false
+  // ? => one single character
+  var patternListStack = []
+  var negativeLists = []
+  var stateChar
+  var inClass = false
+  var reClassStart = -1
+  var classStart = -1
+  // . and .. never match anything that doesn't start with .,
+  // even when options.dot is set.
+  var patternStart = pattern.charAt(0) === '.' ? '' // anything
+  // not (start or / followed by . or .. followed by / or end)
+  : options.dot ? '(?!(?:^|\\\/)\\.{1,2}(?:$|\\\/))'
+  : '(?!\\.)'
+  var self = this
+
+  function clearStateChar () {
+    if (stateChar) {
+      // we had some state-tracking character
+      // that wasn't consumed by this pass.
+      switch (stateChar) {
+        case '*':
+          re += star
+          hasMagic = true
+        break
+        case '?':
+          re += qmark
+          hasMagic = true
+        break
+        default:
+          re += '\\' + stateChar
+        break
+      }
+      self.debug('clearStateChar %j %j', stateChar, re)
+      stateChar = false
+    }
+  }
+
+  for (var i = 0, len = pattern.length, c
+    ; (i < len) && (c = pattern.charAt(i))
+    ; i++) {
+    this.debug('%s\t%s %s %j', pattern, i, re, c)
+
+    // skip over any that are escaped.
+    if (escaping && reSpecials[c]) {
+      re += '\\' + c
+      escaping = false
+      continue
+    }
+
+    switch (c) {
+      case '/':
+        // completely not allowed, even escaped.
+        // Should already be path-split by now.
+        return false
+
+      case '\\':
+        clearStateChar()
+        escaping = true
+      continue
+
+      // the various stateChar values
+      // for the "extglob" stuff.
+      case '?':
+      case '*':
+      case '+':
+      case '@':
+      case '!':
+        this.debug('%s\t%s %s %j <-- stateChar', pattern, i, re, c)
+
+        // all of those are literals inside a class, except that
+        // the glob [!a] means [^a] in regexp
+        if (inClass) {
+          this.debug('  in class')
+          if (c === '!' && i === classStart + 1) c = '^'
+          re += c
+          continue
+        }
+
+        // if we already have a stateChar, then it means
+        // that there was something like ** or +? in there.
+        // Handle the stateChar, then proceed with this one.
+        self.debug('call clearStateChar %j', stateChar)
+        clearStateChar()
+        stateChar = c
+        // if extglob is disabled, then +(asdf|foo) isn't a thing.
+        // just clear the statechar *now*, rather than even diving into
+        // the patternList stuff.
+        if (options.noext) clearStateChar()
+      continue
+
+      case '(':
+        if (inClass) {
+          re += '('
+          continue
+        }
+
+        if (!stateChar) {
+          re += '\\('
+          continue
+        }
+
+        patternListStack.push({
+          type: stateChar,
+          start: i - 1,
+          reStart: re.length,
+          open: plTypes[stateChar].open,
+          close: plTypes[stateChar].close
+        })
+        // negation is (?:(?!js)[^/]*)
+        re += stateChar === '!' ? '(?:(?!(?:' : '(?:'
+        this.debug('plType %j %j', stateChar, re)
+        stateChar = false
+      continue
+
+      case ')':
+        if (inClass || !patternListStack.length) {
+          re += '\\)'
+          continue
+        }
+
+        clearStateChar()
+        hasMagic = true
+        var pl = patternListStack.pop()
+        // negation is (?:(?!js)[^/]*)
+        // The others are (?:<pattern>)<type>
+        re += pl.close
+        if (pl.type === '!') {
+          negativeLists.push(pl)
+        }
+        pl.reEnd = re.length
+      continue
+
+      case '|':
+        if (inClass || !patternListStack.length || escaping) {
+          re += '\\|'
+          escaping = false
+          continue
+        }
+
+        clearStateChar()
+        re += '|'
+      continue
+
+      // these are mostly the same in regexp and glob
+      case '[':
+        // swallow any state-tracking char before the [
+        clearStateChar()
+
+        if (inClass) {
+          re += '\\' + c
+          continue
+        }
+
+        inClass = true
+        classStart = i
+        reClassStart = re.length
+        re += c
+      continue
+
+      case ']':
+        //  a right bracket shall lose its special
+        //  meaning and represent itself in
+        //  a bracket expression if it occurs
+        //  first in the list.  -- POSIX.2 2.8.3.2
+        if (i === classStart + 1 || !inClass) {
+          re += '\\' + c
+          escaping = false
+          continue
+        }
+
+        // handle the case where we left a class open.
+        // "[z-a]" is valid, equivalent to "\[z-a\]"
+        if (inClass) {
+          // split where the last [ was, make sure we don't have
+          // an invalid re. if so, re-walk the contents of the
+          // would-be class to re-translate any characters that
+          // were passed through as-is
+          // TODO: It would probably be faster to determine this
+          // without a try/catch and a new RegExp, but it's tricky
+          // to do safely.  For now, this is safe and works.
+          var cs = pattern.substring(classStart + 1, i)
+          try {
+            RegExp('[' + cs + ']')
+          } catch (er) {
+            // not a valid class!
+            var sp = this.parse(cs, SUBPARSE)
+            re = re.substr(0, reClassStart) + '\\[' + sp[0] + '\\]'
+            hasMagic = hasMagic || sp[1]
+            inClass = false
+            continue
+          }
+        }
+
+        // finish up the class.
+        hasMagic = true
+        inClass = false
+        re += c
+      continue
+
+      default:
+        // swallow any state char that wasn't consumed
+        clearStateChar()
+
+        if (escaping) {
+          // no need
+          escaping = false
+        } else if (reSpecials[c]
+          && !(c === '^' && inClass)) {
+          re += '\\'
+        }
+
+        re += c
+
+    } // switch
+  } // for
+
+  // handle the case where we left a class open.
+  // "[abc" is valid, equivalent to "\[abc"
+  if (inClass) {
+    // split where the last [ was, and escape it
+    // this is a huge pita.  We now have to re-walk
+    // the contents of the would-be class to re-translate
+    // any characters that were passed through as-is
+    cs = pattern.substr(classStart + 1)
+    sp = this.parse(cs, SUBPARSE)
+    re = re.substr(0, reClassStart) + '\\[' + sp[0]
+    hasMagic = hasMagic || sp[1]
+  }
+
+  // handle the case where we had a +( thing at the *end*
+  // of the pattern.
+  // each pattern list stack adds 3 chars, and we need to go through
+  // and escape any | chars that were passed through as-is for the regexp.
+  // Go through and escape them, taking care not to double-escape any
+  // | chars that were already escaped.
+  for (pl = patternListStack.pop(); pl; pl = patternListStack.pop()) {
+    var tail = re.slice(pl.reStart + pl.open.length)
+    this.debug('setting tail', re, pl)
+    // maybe some even number of \, then maybe 1 \, followed by a |
+    tail = tail.replace(/((?:\\{2}){0,64})(\\?)\|/g, function (_, $1, $2) {
+      if (!$2) {
+        // the | isn't already escaped, so escape it.
+        $2 = '\\'
+      }
+
+      // need to escape all those slashes *again*, without escaping the
+      // one that we need for escaping the | character.  As it works out,
+      // escaping an even number of slashes can be done by simply repeating
+      // it exactly after itself.  That's why this trick works.
+      //
+      // I am sorry that you have to see this.
+      return $1 + $1 + $2 + '|'
+    })
+
+    this.debug('tail=%j\n   %s', tail, tail, pl, re)
+    var t = pl.type === '*' ? star
+      : pl.type === '?' ? qmark
+      : '\\' + pl.type
+
+    hasMagic = true
+    re = re.slice(0, pl.reStart) + t + '\\(' + tail
+  }
+
+  // handle trailing things that only matter at the very end.
+  clearStateChar()
+  if (escaping) {
+    // trailing \\
+    re += '\\\\'
+  }
+
+  // only need to apply the nodot start if the re starts with
+  // something that could conceivably capture a dot
+  var addPatternStart = false
+  switch (re.charAt(0)) {
+    case '.':
+    case '[':
+    case '(': addPatternStart = true
+  }
+
+  // Hack to work around lack of negative lookbehind in JS
+  // A pattern like: *.!(x).!(y|z) needs to ensure that a name
+  // like 'a.xyz.yz' doesn't match.  So, the first negative
+  // lookahead, has to look ALL the way ahead, to the end of
+  // the pattern.
+  for (var n = negativeLists.length - 1; n > -1; n--) {
+    var nl = negativeLists[n]
+
+    var nlBefore = re.slice(0, nl.reStart)
+    var nlFirst = re.slice(nl.reStart, nl.reEnd - 8)
+    var nlLast = re.slice(nl.reEnd - 8, nl.reEnd)
+    var nlAfter = re.slice(nl.reEnd)
+
+    nlLast += nlAfter
+
+    // Handle nested stuff like *(*.js|!(*.json)), where open parens
+    // mean that we should *not* include the ) in the bit that is considered
+    // "after" the negated section.
+    var openParensBefore = nlBefore.split('(').length - 1
+    var cleanAfter = nlAfter
+    for (i = 0; i < openParensBefore; i++) {
+      cleanAfter = cleanAfter.replace(/\)[+*?]?/, '')
+    }
+    nlAfter = cleanAfter
+
+    var dollar = ''
+    if (nlAfter === '' && isSub !== SUBPARSE) {
+      dollar = '$'
+    }
+    var newRe = nlBefore + nlFirst + nlAfter + dollar + nlLast
+    re = newRe
+  }
+
+  // if the re is not "" at this point, then we need to make sure
+  // it doesn't match against an empty path part.
+  // Otherwise a/* will match a/, which it should not.
+  if (re !== '' && hasMagic) {
+    re = '(?=.)' + re
+  }
+
+  if (addPatternStart) {
+    re = patternStart + re
+  }
+
+  // parsing just a piece of a larger pattern.
+  if (isSub === SUBPARSE) {
+    return [re, hasMagic]
+  }
+
+  // skip the regexp for non-magical patterns
+  // unescape anything in it, though, so that it'll be
+  // an exact match against a file etc.
+  if (!hasMagic) {
+    return globUnescape(pattern)
+  }
+
+  var flags = options.nocase ? 'i' : ''
+  try {
+    var regExp = new RegExp('^' + re + '$', flags)
+  } catch (er) {
+    // If it was an invalid regular expression, then it can't match
+    // anything.  This trick looks for a character after the end of
+    // the string, which is of course impossible, except in multi-line
+    // mode, but it's not a /m regex.
+    return new RegExp('$.')
+  }
+
+  regExp._glob = pattern
+  regExp._src = re
+
+  return regExp
+}
+
+minimatch.makeRe = function (pattern, options) {
+  return new Minimatch(pattern, options || {}).makeRe()
+}
+
+Minimatch.prototype.makeRe = makeRe
+function makeRe () {
+  if (this.regexp || this.regexp === false) return this.regexp
+
+  // at this point, this.set is a 2d array of partial
+  // pattern strings, or "**".
+  //
+  // It's better to use .match().  This function shouldn't
+  // be used, really, but it's pretty convenient sometimes,
+  // when you just want to work with a regex.
+  var set = this.set
+
+  if (!set.length) {
+    this.regexp = false
+    return this.regexp
+  }
+  var options = this.options
+
+  var twoStar = options.noglobstar ? star
+    : options.dot ? twoStarDot
+    : twoStarNoDot
+  var flags = options.nocase ? 'i' : ''
+
+  var re = set.map(function (pattern) {
+    return pattern.map(function (p) {
+      return (p === GLOBSTAR) ? twoStar
+      : (typeof p === 'string') ? regExpEscape(p)
+      : p._src
+    }).join('\\\/')
+  }).join('|')
+
+  // must match entire pattern
+  // ending in a * or ** will make it less strict.
+  re = '^(?:' + re + ')$'
+
+  // can match anything, as long as it's not this.
+  if (this.negate) re = '^(?!' + re + ').*$'
+
+  try {
+    this.regexp = new RegExp(re, flags)
+  } catch (ex) {
+    this.regexp = false
+  }
+  return this.regexp
+}
+
+minimatch.match = function (list, pattern, options) {
+  options = options || {}
+  var mm = new Minimatch(pattern, options)
+  list = list.filter(function (f) {
+    return mm.match(f)
+  })
+  if (mm.options.nonull && !list.length) {
+    list.push(pattern)
+  }
+  return list
+}
+
+Minimatch.prototype.match = match
+function match (f, partial) {
+  this.debug('match', f, this.pattern)
+  // short-circuit in the case of busted things.
+  // comments, etc.
+  if (this.comment) return false
+  if (this.empty) return f === ''
+
+  if (f === '/' && partial) return true
+
+  var options = this.options
+
+  // windows: need to use /, not \
+  if (path.sep !== '/') {
+    f = f.split(path.sep).join('/')
+  }
+
+  // treat the test path as a set of pathparts.
+  f = f.split(slashSplit)
+  this.debug(this.pattern, 'split', f)
+
+  // just ONE of the pattern sets in this.set needs to match
+  // in order for it to be valid.  If negating, then just one
+  // match means that we have failed.
+  // Either way, return on the first hit.
+
+  var set = this.set
+  this.debug(this.pattern, 'set', set)
+
+  // Find the basename of the path by looking for the last non-empty segment
+  var filename
+  var i
+  for (i = f.length - 1; i >= 0; i--) {
+    filename = f[i]
+    if (filename) break
+  }
+
+  for (i = 0; i < set.length; i++) {
+    var pattern = set[i]
+    var file = f
+    if (options.matchBase && pattern.length === 1) {
+      file = [filename]
+    }
+    var hit = this.matchOne(file, pattern, partial)
+    if (hit) {
+      if (options.flipNegate) return true
+      return !this.negate
+    }
+  }
+
+  // didn't get any hits.  this is success if it's a negative
+  // pattern, failure otherwise.
+  if (options.flipNegate) return false
+  return this.negate
+}
+
+// set partial to true to test if, for example,
+// "/a/b" matches the start of "/*/b/*/d"
+// Partial means, if you run out of file before you run
+// out of pattern, then that's fine, as long as all
+// the parts match.
+Minimatch.prototype.matchOne = function (file, pattern, partial) {
+  var options = this.options
+
+  this.debug('matchOne',
+    { 'this': this, file: file, pattern: pattern })
+
+  this.debug('matchOne', file.length, pattern.length)
+
+  for (var fi = 0,
+      pi = 0,
+      fl = file.length,
+      pl = pattern.length
+      ; (fi < fl) && (pi < pl)
+      ; fi++, pi++) {
+    this.debug('matchOne loop')
+    var p = pattern[pi]
+    var f = file[fi]
+
+    this.debug(pattern, p, f)
+
+    // should be impossible.
+    // some invalid regexp stuff in the set.
+    if (p === false) return false
+
+    if (p === GLOBSTAR) {
+      this.debug('GLOBSTAR', [pattern, p, f])
+
+      // "**"
+      // a/**/b/**/c would match the following:
+      // a/b/x/y/z/c
+      // a/x/y/z/b/c
+      // a/b/x/b/x/c
+      // a/b/c
+      // To do this, take the rest of the pattern after
+      // the **, and see if it would match the file remainder.
+      // If so, return success.
+      // If not, the ** "swallows" a segment, and try again.
+      // This is recursively awful.
+      //
+      // a/**/b/**/c matching a/b/x/y/z/c
+      // - a matches a
+      // - doublestar
+      //   - matchOne(b/x/y/z/c, b/**/c)
+      //     - b matches b
+      //     - doublestar
+      //       - matchOne(x/y/z/c, c) -> no
+      //       - matchOne(y/z/c, c) -> no
+      //       - matchOne(z/c, c) -> no
+      //       - matchOne(c, c) yes, hit
+      var fr = fi
+      var pr = pi + 1
+      if (pr === pl) {
+        this.debug('** at the end')
+        // a ** at the end will just swallow the rest.
+        // We have found a match.
+        // however, it will not swallow /.x, unless
+        // options.dot is set.
+        // . and .. are *never* matched by **, for explosively
+        // exponential reasons.
+        for (; fi < fl; fi++) {
+          if (file[fi] === '.' || file[fi] === '..' ||
+            (!options.dot && file[fi].charAt(0) === '.')) return false
+        }
+        return true
+      }
+
+      // ok, let's see if we can swallow whatever we can.
+      while (fr < fl) {
+        var swallowee = file[fr]
+
+        this.debug('\nglobstar while', file, fr, pattern, pr, swallowee)
+
+        // XXX remove this slice.  Just pass the start index.
+        if (this.matchOne(file.slice(fr), pattern.slice(pr), partial)) {
+          this.debug('globstar found match!', fr, fl, swallowee)
+          // found a match.
+          return true
+        } else {
+          // can't swallow "." or ".." ever.
+          // can only swallow ".foo" when explicitly asked.
+          if (swallowee === '.' || swallowee === '..' ||
+            (!options.dot && swallowee.charAt(0) === '.')) {
+            this.debug('dot detected!', file, fr, pattern, pr)
+            break
+          }
+
+          // ** swallows a segment, and continue.
+          this.debug('globstar swallow a segment, and continue')
+          fr++
+        }
+      }
+
+      // no match was found.
+      // However, in partial mode, we can't say this is necessarily over.
+      // If there's more *pattern* left, then
+      if (partial) {
+        // ran out of file
+        this.debug('\n>>> no match, partial?', file, fr, pattern, pr)
+        if (fr === fl) return true
+      }
+      return false
+    }
+
+    // something other than **
+    // non-magic patterns just have to match exactly
+    // patterns with magic have been turned into regexps.
+    var hit
+    if (typeof p === 'string') {
+      if (options.nocase) {
+        hit = f.toLowerCase() === p.toLowerCase()
+      } else {
+        hit = f === p
+      }
+      this.debug('string match', p, f, hit)
+    } else {
+      hit = f.match(p)
+      this.debug('pattern match', p, f, hit)
+    }
+
+    if (!hit) return false
+  }
+
+  // Note: ending in / means that we'll get a final ""
+  // at the end of the pattern.  This can only match a
+  // corresponding "" at the end of the file.
+  // If the file ends in /, then it can only match a
+  // a pattern that ends in /, unless the pattern just
+  // doesn't have any more for it. But, a/b/ should *not*
+  // match "a/b/*", even though "" matches against the
+  // [^/]*? pattern, except in partial mode, where it might
+  // simply not be reached yet.
+  // However, a/b/ should still satisfy a/*
+
+  // now either we fell off the end of the pattern, or we're done.
+  if (fi === fl && pi === pl) {
+    // ran out of pattern and filename at the same time.
+    // an exact hit!
+    return true
+  } else if (fi === fl) {
+    // ran out of file, but still had pattern left.
+    // this is ok if we're doing the match as part of
+    // a glob fs traversal.
+    return partial
+  } else if (pi === pl) {
+    // ran out of pattern, still have file left.
+    // this is only acceptable if we're on the very last
+    // empty segment of a file with a trailing slash.
+    // a/* should match a/b/
+    var emptyFileEnd = (fi === fl - 1) && (file[fi] === '')
+    return emptyFileEnd
+  }
+
+  // should be unreachable.
+  throw new Error('wtf?')
+}
+
+// replace stuff like \* with *
+function globUnescape (s) {
+  return s.replace(/\\(.)/g, '$1')
+}
+
+function regExpEscape (s) {
+  return s.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&')
+}
+
+
+/***/ }),
+/* 83 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var wrappy = __webpack_require__(161)
+module.exports = wrappy(once)
+module.exports.strict = wrappy(onceStrict)
+
+once.proto = once(function () {
+  Object.defineProperty(Function.prototype, 'once', {
+    value: function () {
+      return once(this)
+    },
+    configurable: true
+  })
+
+  Object.defineProperty(Function.prototype, 'onceStrict', {
+    value: function () {
+      return onceStrict(this)
+    },
+    configurable: true
+  })
+})
+
+function once (fn) {
+  var f = function () {
+    if (f.called) return f.value
+    f.called = true
+    return f.value = fn.apply(this, arguments)
+  }
+  f.called = false
+  return f
+}
+
+function onceStrict (fn) {
+  var f = function () {
+    if (f.called)
+      throw new Error(f.onceError)
+    f.called = true
+    return f.value = fn.apply(this, arguments)
+  }
+  var name = fn.name || 'Function wrapped with `once`'
+  f.onceError = name + " shouldn't be called more than once"
+  f.called = false
+  return f
+}
+
+
+/***/ }),
+/* 84 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return InnerSubscriber; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
+/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+
+
+var InnerSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](InnerSubscriber, _super);
+    function InnerSubscriber(parent, outerValue, outerIndex) {
+        var _this = _super.call(this) || this;
+        _this.parent = parent;
+        _this.outerValue = outerValue;
+        _this.outerIndex = outerIndex;
+        _this.index = 0;
+        return _this;
+    }
+    InnerSubscriber.prototype._next = function (value) {
+        this.parent.notifyNext(this.outerValue, value, this.outerIndex, this.index++, this);
+    };
+    InnerSubscriber.prototype._error = function (error) {
+        this.parent.notifyError(error, this);
+        this.unsubscribe();
+    };
+    InnerSubscriber.prototype._complete = function () {
+        this.parent.notifyComplete(this);
+        this.unsubscribe();
+    };
+    return InnerSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
+
+//# sourceMappingURL=InnerSubscriber.js.map
+
+
+/***/ }),
+/* 85 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = fromArray;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(12);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscription__ = __webpack_require__(25);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToArray__ = __webpack_require__(447);
+/** PURE_IMPORTS_START _Observable,_Subscription,_util_subscribeToArray PURE_IMPORTS_END */
+
+
+
+function fromArray(input, scheduler) {
+    if (!scheduler) {
+        return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_subscribeToArray__["a" /* subscribeToArray */])(input));
+    }
+    else {
+        return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) {
+            var sub = new __WEBPACK_IMPORTED_MODULE_1__Subscription__["a" /* Subscription */]();
+            var i = 0;
+            sub.add(scheduler.schedule(function () {
+                if (i === input.length) {
+                    subscriber.complete();
+                    return;
+                }
+                subscriber.next(input[i++]);
+                if (!subscriber.closed) {
+                    sub.add(this.schedule());
+                }
+            }));
+            return sub;
+        });
+    }
+}
+//# sourceMappingURL=fromArray.js.map
+
+
+/***/ }),
+/* 86 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// Copyright 2015 Joyent, Inc.
+
+module.exports = {
+	read: read,
+	write: write
+};
+
+var assert = __webpack_require__(16);
+var asn1 = __webpack_require__(66);
+var crypto = __webpack_require__(11);
+var Buffer = __webpack_require__(15).Buffer;
+var algs = __webpack_require__(32);
+var utils = __webpack_require__(26);
+var Key = __webpack_require__(27);
+var PrivateKey = __webpack_require__(33);
+
+var pkcs1 = __webpack_require__(327);
+var pkcs8 = __webpack_require__(157);
+var sshpriv = __webpack_require__(192);
+var rfc4253 = __webpack_require__(103);
+
+var errors = __webpack_require__(74);
+
+/*
+ * For reading we support both PKCS#1 and PKCS#8. If we find a private key,
+ * we just take the public component of it and use that.
+ */
+function read(buf, options, forceType) {
+	var input = buf;
+	if (typeof (buf) !== 'string') {
+		assert.buffer(buf, 'buf');
+		buf = buf.toString('ascii');
+	}
+
+	var lines = buf.trim().split('\n');
+
+	var m = lines[0].match(/*JSSTYLED*/
+	    /[-]+[ ]*BEGIN ([A-Z0-9][A-Za-z0-9]+ )?(PUBLIC|PRIVATE) KEY[ ]*[-]+/);
+	assert.ok(m, 'invalid PEM header');
+
+	var m2 = lines[lines.length - 1].match(/*JSSTYLED*/
+	    /[-]+[ ]*END ([A-Z0-9][A-Za-z0-9]+ )?(PUBLIC|PRIVATE) KEY[ ]*[-]+/);
+	assert.ok(m2, 'invalid PEM footer');
+
+	/* Begin and end banners must match key type */
+	assert.equal(m[2], m2[2]);
+	var type = m[2].toLowerCase();
+
+	var alg;
+	if (m[1]) {
+		/* They also must match algorithms, if given */
+		assert.equal(m[1], m2[1], 'PEM header and footer mismatch');
+		alg = m[1].trim();
+	}
+
+	var headers = {};
+	while (true) {
+		lines = lines.slice(1);
+		m = lines[0].match(/*JSSTYLED*/
+		    /^([A-Za-z0-9-]+): (.+)$/);
+		if (!m)
+			break;
+		headers[m[1].toLowerCase()] = m[2];
+	}
+
+	var cipher, key, iv;
+	if (headers['proc-type']) {
+		var parts = headers['proc-type'].split(',');
+		if (parts[0] === '4' && parts[1] === 'ENCRYPTED') {
+			if (typeof (options.passphrase) === 'string') {
+				options.passphrase = Buffer.from(
+				    options.passphrase, 'utf-8');
+			}
+			if (!Buffer.isBuffer(options.passphrase)) {
+				throw (new errors.KeyEncryptedError(
+				    options.filename, 'PEM'));
+			} else {
+				parts = headers['dek-info'].split(',');
+				assert.ok(parts.length === 2);
+				cipher = parts[0].toLowerCase();
+				iv = Buffer.from(parts[1], 'hex');
+				key = utils.opensslKeyDeriv(cipher, iv,
+				    options.passphrase, 1).key;
+			}
+		}
+	}
+
+	/* Chop off the first and last lines */
+	lines = lines.slice(0, -1).join('');
+	buf = Buffer.from(lines, 'base64');
+
+	if (cipher && key && iv) {
+		var cipherStream = crypto.createDecipheriv(cipher, key, iv);
+		var chunk, chunks = [];
+		cipherStream.once('error', function (e) {
+			if (e.toString().indexOf('bad decrypt') !== -1) {
+				throw (new Error('Incorrect passphrase ' +
+				    'supplied, could not decrypt key'));
+			}
+			throw (e);
+		});
+		cipherStream.write(buf);
+		cipherStream.end();
+		while ((chunk = cipherStream.read()) !== null)
+			chunks.push(chunk);
+		buf = Buffer.concat(chunks);
+	}
+
+	/* The new OpenSSH internal format abuses PEM headers */
+	if (alg && alg.toLowerCase() === 'openssh')
+		return (sshpriv.readSSHPrivate(type, buf, options));
+	if (alg && alg.toLowerCase() === 'ssh2')
+		return (rfc4253.readType(type, buf, options));
+
+	var der = new asn1.BerReader(buf);
+	der.originalInput = input;
+
+	/*
+	 * All of the PEM file types start with a sequence tag, so chop it
+	 * off here
+	 */
+	der.readSequence();
+
+	/* PKCS#1 type keys name an algorithm in the banner explicitly */
+	if (alg) {
+		if (forceType)
+			assert.strictEqual(forceType, 'pkcs1');
+		return (pkcs1.readPkcs1(alg, type, der));
+	} else {
+		if (forceType)
+			assert.strictEqual(forceType, 'pkcs8');
+		return (pkcs8.readPkcs8(alg, type, der));
+	}
+}
+
+function write(key, options, type) {
+	assert.object(key);
+
+	var alg = {
+	    'ecdsa': 'EC',
+	    'rsa': 'RSA',
+	    'dsa': 'DSA',
+	    'ed25519': 'EdDSA'
+	}[key.type];
+	var header;
+
+	var der = new asn1.BerWriter();
+
+	if (PrivateKey.isPrivateKey(key)) {
+		if (type && type === 'pkcs8') {
+			header = 'PRIVATE KEY';
+			pkcs8.writePkcs8(der, key);
+		} else {
+			if (type)
+				assert.strictEqual(type, 'pkcs1');
+			header = alg + ' PRIVATE KEY';
+			pkcs1.writePkcs1(der, key);
+		}
+
+	} else if (Key.isKey(key)) {
+		if (type && type === 'pkcs1') {
+			header = alg + ' PUBLIC KEY';
+			pkcs1.writePkcs1(der, key);
+		} else {
+			if (type)
+				assert.strictEqual(type, 'pkcs8');
+			header = 'PUBLIC KEY';
+			pkcs8.writePkcs8(der, key);
+		}
+
+	} else {
+		throw (new Error('key is not a Key or PrivateKey'));
+	}
+
+	var tmp = der.buffer.toString('base64');
+	var len = tmp.length + (tmp.length / 64) +
+	    18 + 16 + header.length*2 + 10;
+	var buf = Buffer.alloc(len);
+	var o = 0;
+	o += buf.write('-----BEGIN ' + header + '-----\n', o);
+	for (var i = 0; i < tmp.length; ) {
+		var limit = i + 64;
+		if (limit > tmp.length)
+			limit = tmp.length;
+		o += buf.write(tmp.slice(i, limit), o);
+		buf[o++] = 10;
+		i = limit;
+	}
+	o += buf.write('-----END ' + header + '-----\n', o);
+
+	return (buf.slice(0, o));
+}
+
+
+/***/ }),
+/* 87 */
+/***/ (function(module, exports) {
+
+module.exports = require("http");
+
+/***/ }),
+/* 88 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.SCOPE_SEPARATOR = undefined;
+
+var _extends2;
+
+function _load_extends() {
+  return _extends2 = _interopRequireDefault(__webpack_require__(21));
+}
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+var _constants;
+
+function _load_constants() {
+  return _constants = __webpack_require__(8);
+}
+
+var _fs;
+
+function _load_fs() {
+  return _fs = _interopRequireWildcard(__webpack_require__(4));
+}
+
+var _npmResolver;
+
+function _load_npmResolver() {
+  return _npmResolver = _interopRequireDefault(__webpack_require__(217));
+}
+
+var _envReplace;
+
+function _load_envReplace() {
+  return _envReplace = _interopRequireDefault(__webpack_require__(577));
+}
+
+var _baseRegistry;
+
+function _load_baseRegistry() {
+  return _baseRegistry = _interopRequireDefault(__webpack_require__(558));
+}
+
+var _misc;
+
+function _load_misc() {
+  return _misc = __webpack_require__(18);
+}
+
+var _path;
+
+function _load_path() {
+  return _path = __webpack_require__(377);
+}
+
+var _normalizeUrl;
+
+function _load_normalizeUrl() {
+  return _normalizeUrl = _interopRequireDefault(__webpack_require__(402));
+}
+
+var _userHomeDir;
+
+function _load_userHomeDir() {
+  return _userHomeDir = _interopRequireDefault(__webpack_require__(67));
+}
+
+var _userHomeDir2;
+
+function _load_userHomeDir2() {
+  return _userHomeDir2 = __webpack_require__(67);
+}
+
+var _errors;
+
+function _load_errors() {
+  return _errors = __webpack_require__(6);
+}
+
+var _login;
+
+function _load_login() {
+  return _login = __webpack_require__(107);
+}
+
+var _path2;
+
+function _load_path2() {
+  return _path2 = _interopRequireDefault(__webpack_require__(0));
+}
+
+var _url;
+
+function _load_url() {
+  return _url = _interopRequireDefault(__webpack_require__(24));
+}
+
+var _ini;
+
+function _load_ini() {
+  return _ini = _interopRequireDefault(__webpack_require__(684));
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const DEFAULT_REGISTRY = 'https://registry.npmjs.org/';
+const REGEX_REGISTRY_ENFORCED_HTTPS = /^https?:\/\/([^\/]+\.)?(yarnpkg\.com|npmjs\.(org|com))(\/|$)/;
+const REGEX_REGISTRY_HTTP_PROTOCOL = /^https?:/i;
+const REGEX_REGISTRY_PREFIX = /^(https?:)?\/\//i;
+const REGEX_REGISTRY_SUFFIX = /registry\/?$/;
+
+const SCOPE_SEPARATOR = exports.SCOPE_SEPARATOR = '%2f';
+// All scoped package names are of the format `@scope%2fpkg` from the use of NpmRegistry.escapeName
+// `(?:^|\/)` Match either the start of the string or a `/` but don't capture
+// `[^\/?]+?` Match any character that is not '/' or '?' and capture, up until the first occurrence of:
+// `(?=%2f|\/)` Match SCOPE_SEPARATOR, the escaped '/', or a raw `/` and don't capture
+// The reason for matching a plain `/` is NPM registry being inconsistent about escaping `/` in
+// scoped package names: when you're fetching a tarball, it is not escaped, when you want info
+// about the package, it is escaped.
+const SCOPED_PKG_REGEXP = /(?:^|\/)(@[^\/?]+?)(?=%2f|\/)/;
+
+// TODO: Use the method from src/cli/commands/global.js for this instead
+function getGlobalPrefix() {
+  if (process.env.PREFIX) {
+    return process.env.PREFIX;
+  } else if (process.platform === 'win32') {
+    // c:\node\node.exe --> prefix=c:\node\
+    return (_path2 || _load_path2()).default.dirname(process.execPath);
+  } else {
+    // /usr/local/bin/node --> prefix=/usr/local
+    let prefix = (_path2 || _load_path2()).default.dirname((_path2 || _load_path2()).default.dirname(process.execPath));
+
+    // destdir only is respected on Unix
+    if (process.env.DESTDIR) {
+      prefix = (_path2 || _load_path2()).default.join(process.env.DESTDIR, prefix);
+    }
+
+    return prefix;
+  }
+}
+
+const PATH_CONFIG_OPTIONS = new Set(['cache', 'cafile', 'prefix', 'userconfig']);
+
+function isPathConfigOption(key) {
+  return PATH_CONFIG_OPTIONS.has(key);
+}
+
+function normalizePath(val) {
+  if (val === undefined) {
+    return undefined;
+  }
+
+  if (typeof val !== 'string') {
+    val = String(val);
+  }
+
+  return (0, (_path || _load_path()).resolveWithHome)(val);
+}
+
+function urlParts(requestUrl) {
+  const normalizedUrl = (0, (_normalizeUrl || _load_normalizeUrl()).default)(requestUrl);
+  const parsed = (_url || _load_url()).default.parse(normalizedUrl);
+  const host = parsed.host || '';
+  const path = parsed.path || '';
+  return { host, path };
+}
+
+class NpmRegistry extends (_baseRegistry || _load_baseRegistry()).default {
+  constructor(cwd, registries, requestManager, reporter, enableDefaultRc, extraneousRcFiles) {
+    super(cwd, registries, requestManager, reporter, enableDefaultRc, extraneousRcFiles);
+    this.folder = 'node_modules';
+  }
+
+  static escapeName(name) {
+    // scoped packages contain slashes and the npm registry expects them to be escaped
+    return name.replace('/', SCOPE_SEPARATOR);
+  }
+
+  isScopedPackage(packageIdent) {
+    return SCOPED_PKG_REGEXP.test(packageIdent);
+  }
+
+  getRequestUrl(registry, pathname) {
+    let resolved = pathname;
+
+    if (!REGEX_REGISTRY_PREFIX.test(pathname)) {
+      resolved = (_url || _load_url()).default.resolve((0, (_misc || _load_misc()).addSuffix)(registry, '/'), pathname);
+    }
+
+    if (REGEX_REGISTRY_ENFORCED_HTTPS.test(resolved)) {
+      resolved = resolved.replace(/^http:\/\//, 'https://');
+    }
+
+    return resolved;
+  }
+
+  isRequestToRegistry(requestUrl, registryUrl) {
+    const request = urlParts(requestUrl);
+    const registry = urlParts(registryUrl);
+    const customHostSuffix = this.getRegistryOrGlobalOption(registryUrl, 'custom-host-suffix');
+
+    const requestToRegistryHost = request.host === registry.host;
+    const requestToYarn = (_constants || _load_constants()).YARN_REGISTRY.includes(request.host) && DEFAULT_REGISTRY.includes(registry.host);
+    const requestToRegistryPath = request.path.startsWith(registry.path);
+    // For some registries, the package path does not prefix with the registry path
+    const customHostSuffixInUse = typeof customHostSuffix === 'string' && request.host.endsWith(customHostSuffix);
+
+    return (requestToRegistryHost || requestToYarn) && (requestToRegistryPath || customHostSuffixInUse);
+  }
+
+  request(pathname, opts = {}, packageName) {
+    var _this = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      // packageName needs to be escaped when if it is passed
+      const packageIdent = packageName && NpmRegistry.escapeName(packageName) || pathname;
+      const registry = opts.registry || _this.getRegistry(packageIdent);
+      const requestUrl = _this.getRequestUrl(registry, pathname);
+
+      const alwaysAuth = _this.getRegistryOrGlobalOption(registry, 'always-auth');
+
+      const headers = (0, (_extends2 || _load_extends()).default)({
+        Accept:
+        // This is to use less bandwidth unless we really need to get the full response.
+        // See https://github.com/npm/npm-registry-client#requests
+        opts.unfiltered ? 'application/json' : 'application/vnd.npm.install-v1+json; q=1.0, application/json; q=0.8, */*'
+      }, opts.headers);
+
+      const isToRegistry = _this.isRequestToRegistry(requestUrl, registry) || _this.requestNeedsAuth(requestUrl);
+
+      // this.token must be checked to account for publish requests on non-scoped packages
+      if (_this.token || isToRegistry && (alwaysAuth || _this.isScopedPackage(packageIdent))) {
+        const authorization = _this.getAuth(packageIdent);
+        if (authorization) {
+          headers.authorization = authorization;
+        }
+      }
+
+      if (_this.otp) {
+        headers['npm-otp'] = _this.otp;
+      }
+
+      try {
+        return yield _this.requestManager.request({
+          url: requestUrl,
+          method: opts.method,
+          body: opts.body,
+          auth: opts.auth,
+          headers,
+          json: !opts.buffer,
+          buffer: opts.buffer,
+          process: opts.process,
+          gzip: true
+        });
+      } catch (error) {
+        if (error instanceof (_errors || _load_errors()).OneTimePasswordError) {
+          if (_this.otp) {
+            throw new (_errors || _load_errors()).MessageError(_this.reporter.lang('incorrectOneTimePassword'));
+          }
+
+          _this.reporter.info(_this.reporter.lang('twoFactorAuthenticationEnabled'));
+          _this.otp = yield (0, (_login || _load_login()).getOneTimePassword)(_this.reporter);
+
+          _this.requestManager.clearCache();
+
+          return _this.request(pathname, opts, packageName);
+        } else {
+          throw error;
+        }
+      }
+    })();
+  }
+
+  requestNeedsAuth(requestUrl) {
+    const config = this.config;
+    const requestParts = urlParts(requestUrl);
+    return !!Object.keys(config).find(option => {
+      const parts = option.split(':');
+      if (parts.length === 2 && parts[1] === '_authToken' || parts[1] === '_password') {
+        const registryParts = urlParts(parts[0]);
+        if (requestParts.host === registryParts.host && requestParts.path.startsWith(registryParts.path)) {
+          return true;
+        }
+      }
+      return false;
+    });
+  }
+
+  checkOutdated(config, name, range) {
+    var _this2 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const escapedName = NpmRegistry.escapeName(name);
+      const req = yield _this2.request(escapedName, { unfiltered: true });
+      if (!req) {
+        throw new Error(`couldn't find ${name}`);
+      }
+
+      // By default use top level 'repository' and 'homepage' values
+      let repository = req.repository,
+          homepage = req.homepage;
+
+      const wantedPkg = yield (_npmResolver || _load_npmResolver()).default.findVersionInRegistryResponse(config, escapedName, range, req);
+
+      // But some local repositories like Verdaccio do not return 'repository' nor 'homepage'
+      // in top level data structure, so we fallback to wanted package manifest
+      if (!repository && !homepage) {
+        repository = wantedPkg.repository;
+        homepage = wantedPkg.homepage;
+      }
+
+      let latest = req['dist-tags'].latest;
+      // In certain cases, registries do not return a 'latest' tag.
+      if (!latest) {
+        latest = wantedPkg.version;
+      }
+
+      const url = homepage || repository && repository.url || '';
+
+      return {
+        latest,
+        wanted: wantedPkg.version,
+        url
+      };
+    })();
+  }
+
+  getPossibleConfigLocations(filename, reporter) {
+    var _this3 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      let possibles = [];
+
+      for (var _iterator = _this3.extraneousRcFiles.slice().reverse(), _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+        var _ref;
+
+        if (_isArray) {
+          if (_i >= _iterator.length) break;
+          _ref = _iterator[_i++];
+        } else {
+          _i = _iterator.next();
+          if (_i.done) break;
+          _ref = _i.value;
+        }
+
+        const rcFile = _ref;
+
+        possibles.push([false, (_path2 || _load_path2()).default.resolve(process.cwd(), rcFile)]);
+      }
+
+      if (_this3.enableDefaultRc) {
+        // npmrc --> ./.npmrc, ~/.npmrc, ${prefix}/etc/npmrc
+        const localfile = '.' + filename;
+        possibles = possibles.concat([[false, (_path2 || _load_path2()).default.join(_this3.cwd, localfile)], [true, _this3.config.userconfig || (_path2 || _load_path2()).default.join((_userHomeDir || _load_userHomeDir()).default, localfile)], [false, (_path2 || _load_path2()).default.join(getGlobalPrefix(), 'etc', filename)]]);
+
+        // When home directory for global install is different from where $HOME/npmrc is stored,
+        // E.g. /usr/local/share vs /root on linux machines, check the additional location
+        if ((_userHomeDir2 || _load_userHomeDir2()).home !== (_userHomeDir || _load_userHomeDir()).default) {
+          possibles.push([true, (_path2 || _load_path2()).default.join((_userHomeDir2 || _load_userHomeDir2()).home, localfile)]);
+        }
+
+        // npmrc --> ../.npmrc, ../../.npmrc, etc.
+        const foldersFromRootToCwd = (0, (_path || _load_path()).getPosixPath)(_this3.cwd).split('/');
+        while (foldersFromRootToCwd.length > 1) {
+          possibles.push([false, (_path2 || _load_path2()).default.join(foldersFromRootToCwd.join((_path2 || _load_path2()).default.sep), localfile)]);
+          foldersFromRootToCwd.pop();
+        }
+      }
+
+      const actuals = [];
+      for (var _iterator2 = possibles, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+        var _ref3;
+
+        if (_isArray2) {
+          if (_i2 >= _iterator2.length) break;
+          _ref3 = _iterator2[_i2++];
+        } else {
+          _i2 = _iterator2.next();
+          if (_i2.done) break;
+          _ref3 = _i2.value;
+        }
+
+        const _ref2 = _ref3;
+        const isHome = _ref2[0];
+        const loc = _ref2[1];
+
+        reporter.verbose(reporter.lang('configPossibleFile', loc));
+        if (yield (_fs || _load_fs()).exists(loc)) {
+          reporter.verbose(reporter.lang('configFileFound', loc));
+          actuals.push([isHome, loc, yield (_fs || _load_fs()).readFile(loc)]);
+        }
+      }
+
+      return actuals;
+    })();
+  }
+
+  static getConfigEnv(env = process.env) {
+    // To match NPM's behavior, HOME is always the user's home directory.
+    const overrideEnv = {
+      HOME: (_userHomeDir2 || _load_userHomeDir2()).home
+    };
+    return Object.assign({}, env, overrideEnv);
+  }
+
+  static normalizeConfig(config) {
+    const env = NpmRegistry.getConfigEnv();
+    config = (_baseRegistry || _load_baseRegistry()).default.normalizeConfig(config);
+
+    for (const key in config) {
+      config[key] = (0, (_envReplace || _load_envReplace()).default)(config[key], env);
+      if (isPathConfigOption(key)) {
+        config[key] = normalizePath(config[key]);
+      }
+    }
+
+    return config;
+  }
+
+  loadConfig() {
+    var _this4 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      // docs: https://docs.npmjs.com/misc/config
+      _this4.mergeEnv('npm_config_');
+
+      for (var _iterator3 = yield _this4.getPossibleConfigLocations('npmrc', _this4.reporter), _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
+        var _ref5;
+
+        if (_isArray3) {
+          if (_i3 >= _iterator3.length) break;
+          _ref5 = _iterator3[_i3++];
+        } else {
+          _i3 = _iterator3.next();
+          if (_i3.done) break;
+          _ref5 = _i3.value;
+        }
+
+        const _ref4 = _ref5;
+        const loc = _ref4[1];
+        const file = _ref4[2];
+
+        const config = NpmRegistry.normalizeConfig((_ini || _load_ini()).default.parse(file));
+
+        // normalize offline mirror path relative to the current npmrc
+        const offlineLoc = config['yarn-offline-mirror'];
+        // don't normalize if we already have a mirror path
+        if (!_this4.config['yarn-offline-mirror'] && offlineLoc) {
+          const mirrorLoc = config['yarn-offline-mirror'] = (_path2 || _load_path2()).default.resolve((_path2 || _load_path2()).default.dirname(loc), offlineLoc);
+          yield (_fs || _load_fs()).mkdirp(mirrorLoc);
+        }
+
+        _this4.config = Object.assign({}, config, _this4.config);
+      }
+    })();
+  }
+
+  getScope(packageIdent) {
+    const match = packageIdent.match(SCOPED_PKG_REGEXP);
+    return match && match[1] || '';
+  }
+
+  getRegistry(packageIdent) {
+    // Try extracting registry from the url, then scoped registry, and default registry
+    if (packageIdent.match(REGEX_REGISTRY_PREFIX)) {
+      const availableRegistries = this.getAvailableRegistries();
+      const registry = availableRegistries.find(registry => packageIdent.startsWith(registry));
+      if (registry) {
+        return String(registry);
+      }
+    }
+
+    var _arr = [this.getScope(packageIdent), ''];
+    for (var _i4 = 0; _i4 < _arr.length; _i4++) {
+      const scope = _arr[_i4];
+      const registry = this.getScopedOption(scope, 'registry') || this.registries.yarn.getScopedOption(scope, 'registry');
+      if (registry) {
+        return String(registry);
+      }
+    }
+
+    return DEFAULT_REGISTRY;
+  }
+
+  getAuthByRegistry(registry) {
+    // Check for bearer token.
+    const authToken = this.getRegistryOrGlobalOption(registry, '_authToken');
+    if (authToken) {
+      return `Bearer ${String(authToken)}`;
+    }
+
+    // Check for basic auth token.
+    const auth = this.getRegistryOrGlobalOption(registry, '_auth');
+    if (auth) {
+      return `Basic ${String(auth)}`;
+    }
+
+    // Check for basic username/password auth.
+    const username = this.getRegistryOrGlobalOption(registry, 'username');
+    const password = this.getRegistryOrGlobalOption(registry, '_password');
+    if (username && password) {
+      const pw = Buffer.from(String(password), 'base64').toString();
+      return 'Basic ' + Buffer.from(String(username) + ':' + pw).toString('base64');
+    }
+
+    return '';
+  }
+
+  getAuth(packageIdent) {
+    if (this.token) {
+      return this.token;
+    }
+
+    const baseRegistry = this.getRegistry(packageIdent);
+    const registries = [baseRegistry];
+
+    // If sending a request to the Yarn registry, we must also send it the auth token for the npm registry
+    if (baseRegistry === (_constants || _load_constants()).YARN_REGISTRY) {
+      registries.push(DEFAULT_REGISTRY);
+    }
+
+    for (var _iterator4 = registries, _isArray4 = Array.isArray(_iterator4), _i5 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
+      var _ref6;
+
+      if (_isArray4) {
+        if (_i5 >= _iterator4.length) break;
+        _ref6 = _iterator4[_i5++];
+      } else {
+        _i5 = _iterator4.next();
+        if (_i5.done) break;
+        _ref6 = _i5.value;
+      }
+
+      const registry = _ref6;
+
+      const auth = this.getAuthByRegistry(registry);
+
+      if (auth) {
+        return auth;
+      }
+    }
+
+    return '';
+  }
+
+  getScopedOption(scope, option) {
+    return this.getOption(scope + (scope ? ':' : '') + option);
+  }
+
+  getRegistryOption(registry, option) {
+    const pre = REGEX_REGISTRY_HTTP_PROTOCOL;
+    const suf = REGEX_REGISTRY_SUFFIX;
+
+    // When registry is used config scope, the trailing '/' is required
+    const reg = (0, (_misc || _load_misc()).addSuffix)(registry, '/');
+
+    // 1st attempt, try to get option for the given registry URL
+    // 2nd attempt, remove the 'https?:' prefix of the registry URL
+    // 3nd attempt, remove the 'registry/?' suffix of the registry URL
+    return this.getScopedOption(reg, option) || pre.test(reg) && this.getRegistryOption(reg.replace(pre, ''), option) || suf.test(reg) && this.getRegistryOption(reg.replace(suf, ''), option);
+  }
+
+  getRegistryOrGlobalOption(registry, option) {
+    return this.getRegistryOption(registry, option) || this.getOption(option);
+  }
+}
+exports.default = NpmRegistry;
+NpmRegistry.filename = 'package.json';
+
+/***/ }),
+/* 89 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _baseResolver;
+
+function _load_baseResolver() {
+  return _baseResolver = _interopRequireDefault(__webpack_require__(123));
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+class ExoticResolver extends (_baseResolver || _load_baseResolver()).default {
+
+  static isVersion(pattern) {
+    const proto = this.protocol;
+    if (proto) {
+      return pattern.startsWith(`${proto}:`);
+    } else {
+      throw new Error('No protocol specified');
+    }
+  }
+}
+exports.default = ExoticResolver;
+
+/***/ }),
+/* 90 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _normalizePattern2;
+
+function _load_normalizePattern() {
+  return _normalizePattern2 = __webpack_require__(37);
+}
+
+const semver = __webpack_require__(22);
+
+class WorkspaceLayout {
+  constructor(workspaces, config) {
+    this.workspaces = workspaces;
+    this.config = config;
+  }
+
+  getWorkspaceManifest(key) {
+    return this.workspaces[key];
+  }
+
+  getManifestByPattern(pattern) {
+    var _normalizePattern = (0, (_normalizePattern2 || _load_normalizePattern()).normalizePattern)(pattern);
+
+    const name = _normalizePattern.name,
+          range = _normalizePattern.range;
+
+    const workspace = this.getWorkspaceManifest(name);
+    if (!workspace || !semver.satisfies(workspace.manifest.version, range, this.config.looseSemver)) {
+      return null;
+    }
+    return workspace;
+  }
+}
+exports.default = WorkspaceLayout;
+
+/***/ }),
+/* 91 */
+/***/ (function(module, exports) {
+
+// 7.2.1 RequireObjectCoercible(argument)
+module.exports = function (it) {
+  if (it == undefined) throw TypeError("Can't call method on  " + it);
+  return it;
+};
+
+
+/***/ }),
+/* 92 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var isObject = __webpack_require__(52);
+var document = __webpack_require__(17).document;
+// typeof document.createElement is 'object' in old IE
+var is = isObject(document) && isObject(document.createElement);
+module.exports = function (it) {
+  return is ? document.createElement(it) : {};
+};
+
+
+/***/ }),
+/* 93 */
+/***/ (function(module, exports) {
+
+module.exports = true;
+
+
+/***/ }),
+/* 94 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+// 25.4.1.5 NewPromiseCapability(C)
+var aFunction = __webpack_require__(68);
+
+function PromiseCapability(C) {
+  var resolve, reject;
+  this.promise = new C(function ($$resolve, $$reject) {
+    if (resolve !== undefined || reject !== undefined) throw TypeError('Bad Promise constructor');
+    resolve = $$resolve;
+    reject = $$reject;
+  });
+  this.resolve = aFunction(resolve);
+  this.reject = aFunction(reject);
+}
+
+module.exports.f = function (C) {
+  return new PromiseCapability(C);
+};
+
+
+/***/ }),
+/* 95 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var def = __webpack_require__(72).f;
+var has = __webpack_require__(71);
+var TAG = __webpack_require__(20)('toStringTag');
+
+module.exports = function (it, tag, stat) {
+  if (it && !has(it = stat ? it : it.prototype, TAG)) def(it, TAG, { configurable: true, value: tag });
+};
+
+
+/***/ }),
+/* 96 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var shared = __webpack_require__(133)('keys');
+var uid = __webpack_require__(137);
+module.exports = function (key) {
+  return shared[key] || (shared[key] = uid(key));
+};
+
+
+/***/ }),
+/* 97 */
+/***/ (function(module, exports) {
+
+// 7.1.4 ToInteger
+var ceil = Math.ceil;
+var floor = Math.floor;
+module.exports = function (it) {
+  return isNaN(it = +it) ? 0 : (it > 0 ? floor : ceil)(it);
+};
+
+
+/***/ }),
+/* 98 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// to indexed object, toObject with fallback for non-array-like ES3 strings
+var IObject = __webpack_require__(170);
+var defined = __webpack_require__(91);
+module.exports = function (it) {
+  return IObject(defined(it));
+};
+
+
+/***/ }),
+/* 99 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// Approach:
+//
+// 1. Get the minimatch set
+// 2. For each pattern in the set, PROCESS(pattern, false)
+// 3. Store matches per-set, then uniq them
+//
+// PROCESS(pattern, inGlobStar)
+// Get the first [n] items from pattern that are all strings
+// Join these together.  This is PREFIX.
+//   If there is no more remaining, then stat(PREFIX) and
+//   add to matches if it succeeds.  END.
+//
+// If inGlobStar and PREFIX is symlink and points to dir
+//   set ENTRIES = []
+// else readdir(PREFIX) as ENTRIES
+//   If fail, END
+//
+// with ENTRIES
+//   If pattern[n] is GLOBSTAR
+//     // handle the case where the globstar match is empty
+//     // by pruning it out, and testing the resulting pattern
+//     PROCESS(pattern[0..n] + pattern[n+1 .. $], false)
+//     // handle other cases.
+//     for ENTRY in ENTRIES (not dotfiles)
+//       // attach globstar + tail onto the entry
+//       // Mark that this entry is a globstar match
+//       PROCESS(pattern[0..n] + ENTRY + pattern[n .. $], true)
+//
+//   else // not globstar
+//     for ENTRY in ENTRIES (not dotfiles, unless pattern[n] is dot)
+//       Test ENTRY against pattern[n]
+//       If fails, continue
+//       If passes, PROCESS(pattern[0..n] + item + pattern[n+1 .. $])
+//
+// Caveat:
+//   Cache all stats and readdirs results to minimize syscall.  Since all
+//   we ever care about is existence and directory-ness, we can just keep
+//   `true` for files, and [children,...] for directories, or `false` for
+//   things that don't exist.
+
+module.exports = glob
+
+var fs = __webpack_require__(5)
+var rp = __webpack_require__(140)
+var minimatch = __webpack_require__(82)
+var Minimatch = minimatch.Minimatch
+var inherits = __webpack_require__(61)
+var EE = __webpack_require__(77).EventEmitter
+var path = __webpack_require__(0)
+var assert = __webpack_require__(28)
+var isAbsolute = __webpack_require__(101)
+var globSync = __webpack_require__(272)
+var common = __webpack_require__(141)
+var alphasort = common.alphasort
+var alphasorti = common.alphasorti
+var setopts = common.setopts
+var ownProp = common.ownProp
+var inflight = __webpack_require__(274)
+var util = __webpack_require__(3)
+var childrenIgnored = common.childrenIgnored
+var isIgnored = common.isIgnored
+
+var once = __webpack_require__(83)
+
+function glob (pattern, options, cb) {
+  if (typeof options === 'function') cb = options, options = {}
+  if (!options) options = {}
+
+  if (options.sync) {
+    if (cb)
+      throw new TypeError('callback provided to sync glob')
+    return globSync(pattern, options)
+  }
+
+  return new Glob(pattern, options, cb)
+}
+
+glob.sync = globSync
+var GlobSync = glob.GlobSync = globSync.GlobSync
+
+// old api surface
+glob.glob = glob
+
+function extend (origin, add) {
+  if (add === null || typeof add !== 'object') {
+    return origin
+  }
+
+  var keys = Object.keys(add)
+  var i = keys.length
+  while (i--) {
+    origin[keys[i]] = add[keys[i]]
+  }
+  return origin
+}
+
+glob.hasMagic = function (pattern, options_) {
+  var options = extend({}, options_)
+  options.noprocess = true
+
+  var g = new Glob(pattern, options)
+  var set = g.minimatch.set
+
+  if (!pattern)
+    return false
+
+  if (set.length > 1)
+    return true
+
+  for (var j = 0; j < set[0].length; j++) {
+    if (typeof set[0][j] !== 'string')
+      return true
+  }
+
+  return false
+}
+
+glob.Glob = Glob
+inherits(Glob, EE)
+function Glob (pattern, options, cb) {
+  if (typeof options === 'function') {
+    cb = options
+    options = null
+  }
+
+  if (options && options.sync) {
+    if (cb)
+      throw new TypeError('callback provided to sync glob')
+    return new GlobSync(pattern, options)
+  }
+
+  if (!(this instanceof Glob))
+    return new Glob(pattern, options, cb)
+
+  setopts(this, pattern, options)
+  this._didRealPath = false
+
+  // process each pattern in the minimatch set
+  var n = this.minimatch.set.length
+
+  // The matches are stored as {<filename>: true,...} so that
+  // duplicates are automagically pruned.
+  // Later, we do an Object.keys() on these.
+  // Keep them as a list so we can fill in when nonull is set.
+  this.matches = new Array(n)
+
+  if (typeof cb === 'function') {
+    cb = once(cb)
+    this.on('error', cb)
+    this.on('end', function (matches) {
+      cb(null, matches)
+    })
+  }
+
+  var self = this
+  this._processing = 0
+
+  this._emitQueue = []
+  this._processQueue = []
+  this.paused = false
+
+  if (this.noprocess)
+    return this
+
+  if (n === 0)
+    return done()
+
+  var sync = true
+  for (var i = 0; i < n; i ++) {
+    this._process(this.minimatch.set[i], i, false, done)
+  }
+  sync = false
+
+  function done () {
+    --self._processing
+    if (self._processing <= 0) {
+      if (sync) {
+        process.nextTick(function () {
+          self._finish()
+        })
+      } else {
+        self._finish()
+      }
+    }
+  }
+}
+
+Glob.prototype._finish = function () {
+  assert(this instanceof Glob)
+  if (this.aborted)
+    return
+
+  if (this.realpath && !this._didRealpath)
+    return this._realpath()
+
+  common.finish(this)
+  this.emit('end', this.found)
+}
+
+Glob.prototype._realpath = function () {
+  if (this._didRealpath)
+    return
+
+  this._didRealpath = true
+
+  var n = this.matches.length
+  if (n === 0)
+    return this._finish()
+
+  var self = this
+  for (var i = 0; i < this.matches.length; i++)
+    this._realpathSet(i, next)
+
+  function next () {
+    if (--n === 0)
+      self._finish()
+  }
+}
+
+Glob.prototype._realpathSet = function (index, cb) {
+  var matchset = this.matches[index]
+  if (!matchset)
+    return cb()
+
+  var found = Object.keys(matchset)
+  var self = this
+  var n = found.length
+
+  if (n === 0)
+    return cb()
+
+  var set = this.matches[index] = Object.create(null)
+  found.forEach(function (p, i) {
+    // If there's a problem with the stat, then it means that
+    // one or more of the links in the realpath couldn't be
+    // resolved.  just return the abs value in that case.
+    p = self._makeAbs(p)
+    rp.realpath(p, self.realpathCache, function (er, real) {
+      if (!er)
+        set[real] = true
+      else if (er.syscall === 'stat')
+        set[p] = true
+      else
+        self.emit('error', er) // srsly wtf right here
+
+      if (--n === 0) {
+        self.matches[index] = set
+        cb()
+      }
+    })
+  })
+}
+
+Glob.prototype._mark = function (p) {
+  return common.mark(this, p)
+}
+
+Glob.prototype._makeAbs = function (f) {
+  return common.makeAbs(this, f)
+}
+
+Glob.prototype.abort = function () {
+  this.aborted = true
+  this.emit('abort')
+}
+
+Glob.prototype.pause = function () {
+  if (!this.paused) {
+    this.paused = true
+    this.emit('pause')
+  }
+}
+
+Glob.prototype.resume = function () {
+  if (this.paused) {
+    this.emit('resume')
+    this.paused = false
+    if (this._emitQueue.length) {
+      var eq = this._emitQueue.slice(0)
+      this._emitQueue.length = 0
+      for (var i = 0; i < eq.length; i ++) {
+        var e = eq[i]
+        this._emitMatch(e[0], e[1])
+      }
+    }
+    if (this._processQueue.length) {
+      var pq = this._processQueue.slice(0)
+      this._processQueue.length = 0
+      for (var i = 0; i < pq.length; i ++) {
+        var p = pq[i]
+        this._processing--
+        this._process(p[0], p[1], p[2], p[3])
+      }
+    }
+  }
+}
+
+Glob.prototype._process = function (pattern, index, inGlobStar, cb) {
+  assert(this instanceof Glob)
+  assert(typeof cb === 'function')
+
+  if (this.aborted)
+    return
+
+  this._processing++
+  if (this.paused) {
+    this._processQueue.push([pattern, index, inGlobStar, cb])
+    return
+  }
+
+  //console.error('PROCESS %d', this._processing, pattern)
+
+  // Get the first [n] parts of pattern that are all strings.
+  var n = 0
+  while (typeof pattern[n] === 'string') {
+    n ++
+  }
+  // now n is the index of the first one that is *not* a string.
+
+  // see if there's anything else
+  var prefix
+  switch (n) {
+    // if not, then this is rather simple
+    case pattern.length:
+      this._processSimple(pattern.join('/'), index, cb)
+      return
+
+    case 0:
+      // pattern *starts* with some non-trivial item.
+      // going to readdir(cwd), but not include the prefix in matches.
+      prefix = null
+      break
+
+    default:
+      // pattern has some string bits in the front.
+      // whatever it starts with, whether that's 'absolute' like /foo/bar,
+      // or 'relative' like '../baz'
+      prefix = pattern.slice(0, n).join('/')
+      break
+  }
+
+  var remain = pattern.slice(n)
+
+  // get the list of entries.
+  var read
+  if (prefix === null)
+    read = '.'
+  else if (isAbsolute(prefix) || isAbsolute(pattern.join('/'))) {
+    if (!prefix || !isAbsolute(prefix))
+      prefix = '/' + prefix
+    read = prefix
+  } else
+    read = prefix
+
+  var abs = this._makeAbs(read)
+
+  //if ignored, skip _processing
+  if (childrenIgnored(this, read))
+    return cb()
+
+  var isGlobStar = remain[0] === minimatch.GLOBSTAR
+  if (isGlobStar)
+    this._processGlobStar(prefix, read, abs, remain, index, inGlobStar, cb)
+  else
+    this._processReaddir(prefix, read, abs, remain, index, inGlobStar, cb)
+}
+
+Glob.prototype._processReaddir = function (prefix, read, abs, remain, index, inGlobStar, cb) {
+  var self = this
+  this._readdir(abs, inGlobStar, function (er, entries) {
+    return self._processReaddir2(prefix, read, abs, remain, index, inGlobStar, entries, cb)
+  })
+}
+
+Glob.prototype._processReaddir2 = function (prefix, read, abs, remain, index, inGlobStar, entries, cb) {
+
+  // if the abs isn't a dir, then nothing can match!
+  if (!entries)
+    return cb()
+
+  // It will only match dot entries if it starts with a dot, or if
+  // dot is set.  Stuff like @(.foo|.bar) isn't allowed.
+  var pn = remain[0]
+  var negate = !!this.minimatch.negate
+  var rawGlob = pn._glob
+  var dotOk = this.dot || rawGlob.charAt(0) === '.'
+
+  var matchedEntries = []
+  for (var i = 0; i < entries.length; i++) {
+    var e = entries[i]
+    if (e.charAt(0) !== '.' || dotOk) {
+      var m
+      if (negate && !prefix) {
+        m = !e.match(pn)
+      } else {
+        m = e.match(pn)
+      }
+      if (m)
+        matchedEntries.push(e)
+    }
+  }
+
+  //console.error('prd2', prefix, entries, remain[0]._glob, matchedEntries)
+
+  var len = matchedEntries.length
+  // If there are no matched entries, then nothing matches.
+  if (len === 0)
+    return cb()
+
+  // if this is the last remaining pattern bit, then no need for
+  // an additional stat *unless* the user has specified mark or
+  // stat explicitly.  We know they exist, since readdir returned
+  // them.
+
+  if (remain.length === 1 && !this.mark && !this.stat) {
+    if (!this.matches[index])
+      this.matches[index] = Object.create(null)
+
+    for (var i = 0; i < len; i ++) {
+      var e = matchedEntries[i]
+      if (prefix) {
+        if (prefix !== '/')
+          e = prefix + '/' + e
+        else
+          e = prefix + e
+      }
+
+      if (e.charAt(0) === '/' && !this.nomount) {
+        e = path.join(this.root, e)
+      }
+      this._emitMatch(index, e)
+    }
+    // This was the last one, and no stats were needed
+    return cb()
+  }
+
+  // now test all matched entries as stand-ins for that part
+  // of the pattern.
+  remain.shift()
+  for (var i = 0; i < len; i ++) {
+    var e = matchedEntries[i]
+    var newPattern
+    if (prefix) {
+      if (prefix !== '/')
+        e = prefix + '/' + e
+      else
+        e = prefix + e
+    }
+    this._process([e].concat(remain), index, inGlobStar, cb)
+  }
+  cb()
+}
+
+Glob.prototype._emitMatch = function (index, e) {
+  if (this.aborted)
+    return
+
+  if (isIgnored(this, e))
+    return
+
+  if (this.paused) {
+    this._emitQueue.push([index, e])
+    return
+  }
+
+  var abs = isAbsolute(e) ? e : this._makeAbs(e)
+
+  if (this.mark)
+    e = this._mark(e)
+
+  if (this.absolute)
+    e = abs
+
+  if (this.matches[index][e])
+    return
+
+  if (this.nodir) {
+    var c = this.cache[abs]
+    if (c === 'DIR' || Array.isArray(c))
+      return
+  }
+
+  this.matches[index][e] = true
+
+  var st = this.statCache[abs]
+  if (st)
+    this.emit('stat', e, st)
+
+  this.emit('match', e)
+}
+
+Glob.prototype._readdirInGlobStar = function (abs, cb) {
+  if (this.aborted)
+    return
+
+  // follow all symlinked directories forever
+  // just proceed as if this is a non-globstar situation
+  if (this.follow)
+    return this._readdir(abs, false, cb)
+
+  var lstatkey = 'lstat\0' + abs
+  var self = this
+  var lstatcb = inflight(lstatkey, lstatcb_)
+
+  if (lstatcb)
+    fs.lstat(abs, lstatcb)
+
+  function lstatcb_ (er, lstat) {
+    if (er && er.code === 'ENOENT')
+      return cb()
+
+    var isSym = lstat && lstat.isSymbolicLink()
+    self.symlinks[abs] = isSym
+
+    // If it's not a symlink or a dir, then it's definitely a regular file.
+    // don't bother doing a readdir in that case.
+    if (!isSym && lstat && !lstat.isDirectory()) {
+      self.cache[abs] = 'FILE'
+      cb()
+    } else
+      self._readdir(abs, false, cb)
+  }
+}
+
+Glob.prototype._readdir = function (abs, inGlobStar, cb) {
+  if (this.aborted)
+    return
+
+  cb = inflight('readdir\0'+abs+'\0'+inGlobStar, cb)
+  if (!cb)
+    return
+
+  //console.error('RD %j %j', +inGlobStar, abs)
+  if (inGlobStar && !ownProp(this.symlinks, abs))
+    return this._readdirInGlobStar(abs, cb)
+
+  if (ownProp(this.cache, abs)) {
+    var c = this.cache[abs]
+    if (!c || c === 'FILE')
+      return cb()
+
+    if (Array.isArray(c))
+      return cb(null, c)
+  }
+
+  var self = this
+  fs.readdir(abs, readdirCb(this, abs, cb))
+}
+
+function readdirCb (self, abs, cb) {
+  return function (er, entries) {
+    if (er)
+      self._readdirError(abs, er, cb)
+    else
+      self._readdirEntries(abs, entries, cb)
+  }
+}
+
+Glob.prototype._readdirEntries = function (abs, entries, cb) {
+  if (this.aborted)
+    return
+
+  // if we haven't asked to stat everything, then just
+  // assume that everything in there exists, so we can avoid
+  // having to stat it a second time.
+  if (!this.mark && !this.stat) {
+    for (var i = 0; i < entries.length; i ++) {
+      var e = entries[i]
+      if (abs === '/')
+        e = abs + e
+      else
+        e = abs + '/' + e
+      this.cache[e] = true
+    }
+  }
+
+  this.cache[abs] = entries
+  return cb(null, entries)
+}
+
+Glob.prototype._readdirError = function (f, er, cb) {
+  if (this.aborted)
+    return
+
+  // handle errors, and cache the information
+  switch (er.code) {
+    case 'ENOTSUP': // https://github.com/isaacs/node-glob/issues/205
+    case 'ENOTDIR': // totally normal. means it *does* exist.
+      var abs = this._makeAbs(f)
+      this.cache[abs] = 'FILE'
+      if (abs === this.cwdAbs) {
+        var error = new Error(er.code + ' invalid cwd ' + this.cwd)
+        error.path = this.cwd
+        error.code = er.code
+        this.emit('error', error)
+        this.abort()
+      }
+      break
+
+    case 'ENOENT': // not terribly unusual
+    case 'ELOOP':
+    case 'ENAMETOOLONG':
+    case 'UNKNOWN':
+      this.cache[this._makeAbs(f)] = false
+      break
+
+    default: // some unusual error.  Treat as failure.
+      this.cache[this._makeAbs(f)] = false
+      if (this.strict) {
+        this.emit('error', er)
+        // If the error is handled, then we abort
+        // if not, we threw out of here
+        this.abort()
+      }
+      if (!this.silent)
+        console.error('glob error', er)
+      break
+  }
+
+  return cb()
+}
+
+Glob.prototype._processGlobStar = function (prefix, read, abs, remain, index, inGlobStar, cb) {
+  var self = this
+  this._readdir(abs, inGlobStar, function (er, entries) {
+    self._processGlobStar2(prefix, read, abs, remain, index, inGlobStar, entries, cb)
+  })
+}
+
+
+Glob.prototype._processGlobStar2 = function (prefix, read, abs, remain, index, inGlobStar, entries, cb) {
+  //console.error('pgs2', prefix, remain[0], entries)
+
+  // no entries means not a dir, so it can never have matches
+  // foo.txt/** doesn't match foo.txt
+  if (!entries)
+    return cb()
+
+  // test without the globstar, and with every child both below
+  // and replacing the globstar.
+  var remainWithoutGlobStar = remain.slice(1)
+  var gspref = prefix ? [ prefix ] : []
+  var noGlobStar = gspref.concat(remainWithoutGlobStar)
+
+  // the noGlobStar pattern exits the inGlobStar state
+  this._process(noGlobStar, index, false, cb)
+
+  var isSym = this.symlinks[abs]
+  var len = entries.length
+
+  // If it's a symlink, and we're in a globstar, then stop
+  if (isSym && inGlobStar)
+    return cb()
+
+  for (var i = 0; i < len; i++) {
+    var e = entries[i]
+    if (e.charAt(0) === '.' && !this.dot)
+      continue
+
+    // these two cases enter the inGlobStar state
+    var instead = gspref.concat(entries[i], remainWithoutGlobStar)
+    this._process(instead, index, true, cb)
+
+    var below = gspref.concat(entries[i], remain)
+    this._process(below, index, true, cb)
+  }
+
+  cb()
+}
+
+Glob.prototype._processSimple = function (prefix, index, cb) {
+  // XXX review this.  Shouldn't it be doing the mounting etc
+  // before doing stat?  kinda weird?
+  var self = this
+  this._stat(prefix, function (er, exists) {
+    self._processSimple2(prefix, index, er, exists, cb)
+  })
+}
+Glob.prototype._processSimple2 = function (prefix, index, er, exists, cb) {
+
+  //console.error('ps2', prefix, exists)
+
+  if (!this.matches[index])
+    this.matches[index] = Object.create(null)
+
+  // If it doesn't exist, then just mark the lack of results
+  if (!exists)
+    return cb()
+
+  if (prefix && isAbsolute(prefix) && !this.nomount) {
+    var trail = /[\/\\]$/.test(prefix)
+    if (prefix.charAt(0) === '/') {
+      prefix = path.join(this.root, prefix)
+    } else {
+      prefix = path.resolve(this.root, prefix)
+      if (trail)
+        prefix += '/'
+    }
+  }
+
+  if (process.platform === 'win32')
+    prefix = prefix.replace(/\\/g, '/')
+
+  // Mark this as a match
+  this._emitMatch(index, prefix)
+  cb()
+}
+
+// Returns either 'DIR', 'FILE', or false
+Glob.prototype._stat = function (f, cb) {
+  var abs = this._makeAbs(f)
+  var needDir = f.slice(-1) === '/'
+
+  if (f.length > this.maxLength)
+    return cb()
+
+  if (!this.stat && ownProp(this.cache, abs)) {
+    var c = this.cache[abs]
+
+    if (Array.isArray(c))
+      c = 'DIR'
+
+    // It exists, but maybe not how we need it
+    if (!needDir || c === 'DIR')
+      return cb(null, c)
+
+    if (needDir && c === 'FILE')
+      return cb()
+
+    // otherwise we have to stat, because maybe c=true
+    // if we know it exists, but not what it is.
+  }
+
+  var exists
+  var stat = this.statCache[abs]
+  if (stat !== undefined) {
+    if (stat === false)
+      return cb(null, stat)
+    else {
+      var type = stat.isDirectory() ? 'DIR' : 'FILE'
+      if (needDir && type === 'FILE')
+        return cb()
+      else
+        return cb(null, type, stat)
+    }
+  }
+
+  var self = this
+  var statcb = inflight('stat\0' + abs, lstatcb_)
+  if (statcb)
+    fs.lstat(abs, statcb)
+
+  function lstatcb_ (er, lstat) {
+    if (lstat && lstat.isSymbolicLink()) {
+      // If it's a symlink, then treat it as the target, unless
+      // the target does not exist, then treat it as a file.
+      return fs.stat(abs, function (er, stat) {
+        if (er)
+          self._stat2(f, abs, null, lstat, cb)
+        else
+          self._stat2(f, abs, er, stat, cb)
+      })
+    } else {
+      self._stat2(f, abs, er, lstat, cb)
+    }
+  }
+}
+
+Glob.prototype._stat2 = function (f, abs, er, stat, cb) {
+  if (er && (er.code === 'ENOENT' || er.code === 'ENOTDIR')) {
+    this.statCache[abs] = false
+    return cb()
+  }
+
+  var needDir = f.slice(-1) === '/'
+  this.statCache[abs] = stat
+
+  if (abs.slice(-1) === '/' && stat && !stat.isDirectory())
+    return cb(null, false, stat)
+
+  var c = true
+  if (stat)
+    c = stat.isDirectory() ? 'DIR' : 'FILE'
+  this.cache[abs] = this.cache[abs] || c
+
+  if (needDir && c === 'FILE')
+    return cb()
+
+  return cb(null, c, stat)
+}
+
+
+/***/ }),
+/* 100 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+// Standard YAML's Failsafe schema.
+// http://www.yaml.org/spec/1.2/spec.html#id2802346
+
+
+
+
+
+var Schema = __webpack_require__(44);
+
+
+module.exports = new Schema({
+  explicit: [
+    __webpack_require__(298),
+    __webpack_require__(296),
+    __webpack_require__(291)
+  ]
+});
+
+
+/***/ }),
+/* 101 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+function posix(path) {
+	return path.charAt(0) === '/';
+}
+
+function win32(path) {
+	// https://github.com/nodejs/node/blob/b3fcc245fb25539909ef1d5eaa01dbf92e168633/lib/path.js#L56
+	var splitDeviceRe = /^([a-zA-Z]:|[\\\/]{2}[^\\\/]+[\\\/]+[^\\\/]+)?([\\\/])?([\s\S]*?)$/;
+	var result = splitDeviceRe.exec(path);
+	var device = result[1] || '';
+	var isUnc = Boolean(device && device.charAt(1) !== ':');
+
+	// UNC paths are always absolute
+	return Boolean(result[2] || isUnc);
+}
+
+module.exports = process.platform === 'win32' ? win32 : posix;
+module.exports.posix = posix;
+module.exports.win32 = win32;
+
+
+/***/ }),
+/* 102 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var Stream = __webpack_require__(23);
+if (process.env.READABLE_STREAM === 'disable' && Stream) {
+  module.exports = Stream;
+  exports = module.exports = Stream.Readable;
+  exports.Readable = Stream.Readable;
+  exports.Writable = Stream.Writable;
+  exports.Duplex = Stream.Duplex;
+  exports.Transform = Stream.Transform;
+  exports.PassThrough = Stream.PassThrough;
+  exports.Stream = Stream;
+} else {
+  exports = module.exports = __webpack_require__(406);
+  exports.Stream = Stream || exports;
+  exports.Readable = exports;
+  exports.Writable = __webpack_require__(408);
+  exports.Duplex = __webpack_require__(115);
+  exports.Transform = __webpack_require__(407);
+  exports.PassThrough = __webpack_require__(792);
+}
+
+
+/***/ }),
+/* 103 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// Copyright 2015 Joyent, Inc.
+
+module.exports = {
+	read: read.bind(undefined, false, undefined),
+	readType: read.bind(undefined, false),
+	write: write,
+	/* semi-private api, used by sshpk-agent */
+	readPartial: read.bind(undefined, true),
+
+	/* shared with ssh format */
+	readInternal: read,
+	keyTypeToAlg: keyTypeToAlg,
+	algToKeyType: algToKeyType
+};
+
+var assert = __webpack_require__(16);
+var Buffer = __webpack_require__(15).Buffer;
+var algs = __webpack_require__(32);
+var utils = __webpack_require__(26);
+var Key = __webpack_require__(27);
+var PrivateKey = __webpack_require__(33);
+var SSHBuffer = __webpack_require__(159);
+
+function algToKeyType(alg) {
+	assert.string(alg);
+	if (alg === 'ssh-dss')
+		return ('dsa');
+	else if (alg === 'ssh-rsa')
+		return ('rsa');
+	else if (alg === 'ssh-ed25519')
+		return ('ed25519');
+	else if (alg === 'ssh-curve25519')
+		return ('curve25519');
+	else if (alg.match(/^ecdsa-sha2-/))
+		return ('ecdsa');
+	else
+		throw (new Error('Unknown algorithm ' + alg));
+}
+
+function keyTypeToAlg(key) {
+	assert.object(key);
+	if (key.type === 'dsa')
+		return ('ssh-dss');
+	else if (key.type === 'rsa')
+		return ('ssh-rsa');
+	else if (key.type === 'ed25519')
+		return ('ssh-ed25519');
+	else if (key.type === 'curve25519')
+		return ('ssh-curve25519');
+	else if (key.type === 'ecdsa')
+		return ('ecdsa-sha2-' + key.part.curve.data.toString());
+	else
+		throw (new Error('Unknown key type ' + key.type));
+}
+
+function read(partial, type, buf, options) {
+	if (typeof (buf) === 'string')
+		buf = Buffer.from(buf);
+	assert.buffer(buf, 'buf');
+
+	var key = {};
+
+	var parts = key.parts = [];
+	var sshbuf = new SSHBuffer({buffer: buf});
+
+	var alg = sshbuf.readString();
+	assert.ok(!sshbuf.atEnd(), 'key must have at least one part');
+
+	key.type = algToKeyType(alg);
+
+	var partCount = algs.info[key.type].parts.length;
+	if (type && type === 'private')
+		partCount = algs.privInfo[key.type].parts.length;
+
+	while (!sshbuf.atEnd() && parts.length < partCount)
+		parts.push(sshbuf.readPart());
+	while (!partial && !sshbuf.atEnd())
+		parts.push(sshbuf.readPart());
+
+	assert.ok(parts.length >= 1,
+	    'key must have at least one part');
+	assert.ok(partial || sshbuf.atEnd(),
+	    'leftover bytes at end of key');
+
+	var Constructor = Key;
+	var algInfo = algs.info[key.type];
+	if (type === 'private' || algInfo.parts.length !== parts.length) {
+		algInfo = algs.privInfo[key.type];
+		Constructor = PrivateKey;
+	}
+	assert.strictEqual(algInfo.parts.length, parts.length);
+
+	if (key.type === 'ecdsa') {
+		var res = /^ecdsa-sha2-(.+)$/.exec(alg);
+		assert.ok(res !== null);
+		assert.strictEqual(res[1], parts[0].data.toString());
+	}
+
+	var normalized = true;
+	for (var i = 0; i < algInfo.parts.length; ++i) {
+		var p = parts[i];
+		p.name = algInfo.parts[i];
+		/*
+		 * OpenSSH stores ed25519 "private" keys as seed + public key
+		 * concat'd together (k followed by A). We want to keep them
+		 * separate for other formats that don't do this.
+		 */
+		if (key.type === 'ed25519' && p.name === 'k')
+			p.data = p.data.slice(0, 32);
+
+		if (p.name !== 'curve' && algInfo.normalize !== false) {
+			var nd;
+			if (key.type === 'ed25519') {
+				nd = utils.zeroPadToLength(p.data, 32);
+			} else {
+				nd = utils.mpNormalize(p.data);
+			}
+			if (nd.toString('binary') !==
+			    p.data.toString('binary')) {
+				p.data = nd;
+				normalized = false;
+			}
+		}
+	}
+
+	if (normalized)
+		key._rfc4253Cache = sshbuf.toBuffer();
+
+	if (partial && typeof (partial) === 'object') {
+		partial.remainder = sshbuf.remainder();
+		partial.consumed = sshbuf._offset;
+	}
+
+	return (new Constructor(key));
+}
+
+function write(key, options) {
+	assert.object(key);
+
+	var alg = keyTypeToAlg(key);
+	var i;
+
+	var algInfo = algs.info[key.type];
+	if (PrivateKey.isPrivateKey(key))
+		algInfo = algs.privInfo[key.type];
+	var parts = algInfo.parts;
+
+	var buf = new SSHBuffer({});
+
+	buf.writeString(alg);
+
+	for (i = 0; i < parts.length; ++i) {
+		var data = key.part[parts[i]].data;
+		if (algInfo.normalize !== false) {
+			if (key.type === 'ed25519')
+				data = utils.zeroPadToLength(data, 32);
+			else
+				data = utils.mpNormalize(data);
+		}
+		if (key.type === 'ed25519' && parts[i] === 'k')
+			data = Buffer.concat([data, key.part.A.data]);
+		buf.writeBuffer(data);
+	}
+
+	return (buf.toBuffer());
+}
+
+
+/***/ }),
+/* 104 */
+/***/ (function(module, exports) {
+
+module.exports = require("tty");
+
+/***/ }),
+/* 105 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+exports.default = function (str, fileLoc = 'lockfile') {
+  str = (0, (_stripBom || _load_stripBom()).default)(str);
+  return hasMergeConflicts(str) ? parseWithConflict(str, fileLoc) : { type: 'success', object: parse(str, fileLoc) };
+};
+
+var _util;
+
+function _load_util() {
+  return _util = _interopRequireDefault(__webpack_require__(3));
+}
+
+var _invariant;
+
+function _load_invariant() {
+  return _invariant = _interopRequireDefault(__webpack_require__(9));
+}
+
+var _stripBom;
+
+function _load_stripBom() {
+  return _stripBom = _interopRequireDefault(__webpack_require__(160));
+}
+
+var _constants;
+
+function _load_constants() {
+  return _constants = __webpack_require__(8);
+}
+
+var _errors;
+
+function _load_errors() {
+  return _errors = __webpack_require__(6);
+}
+
+var _map;
+
+function _load_map() {
+  return _map = _interopRequireDefault(__webpack_require__(29));
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/* eslint quotes: 0 */
+
+var _require = __webpack_require__(279);
+
+const safeLoad = _require.safeLoad,
+      FAILSAFE_SCHEMA = _require.FAILSAFE_SCHEMA;
+
+
+const VERSION_REGEX = /^yarn lockfile v(\d+)$/;
+
+const TOKEN_TYPES = {
+  boolean: 'BOOLEAN',
+  string: 'STRING',
+  identifier: 'IDENTIFIER',
+  eof: 'EOF',
+  colon: 'COLON',
+  newline: 'NEWLINE',
+  comment: 'COMMENT',
+  indent: 'INDENT',
+  invalid: 'INVALID',
+  number: 'NUMBER',
+  comma: 'COMMA'
+};
+
+const VALID_PROP_VALUE_TOKENS = [TOKEN_TYPES.boolean, TOKEN_TYPES.string, TOKEN_TYPES.number];
+
+function isValidPropValueToken(token) {
+  return VALID_PROP_VALUE_TOKENS.indexOf(token.type) >= 0;
+}
+
+function* tokenise(input) {
+  let lastNewline = false;
+  let line = 1;
+  let col = 0;
+
+  function buildToken(type, value) {
+    return { line, col, type, value };
+  }
+
+  while (input.length) {
+    let chop = 0;
+
+    if (input[0] === '\n' || input[0] === '\r') {
+      chop++;
+      // If this is a \r\n line, ignore both chars but only add one new line
+      if (input[1] === '\n') {
+        chop++;
+      }
+      line++;
+      col = 0;
+      yield buildToken(TOKEN_TYPES.newline);
+    } else if (input[0] === '#') {
+      chop++;
+
+      let nextNewline = input.indexOf('\n', chop);
+      if (nextNewline === -1) {
+        nextNewline = input.length;
+      }
+      const val = input.substring(chop, nextNewline);
+      chop = nextNewline;
+      yield buildToken(TOKEN_TYPES.comment, val);
+    } else if (input[0] === ' ') {
+      if (lastNewline) {
+        let indentSize = 1;
+        for (let i = 1; input[i] === ' '; i++) {
+          indentSize++;
+        }
+
+        if (indentSize % 2) {
+          throw new TypeError('Invalid number of spaces');
+        } else {
+          chop = indentSize;
+          yield buildToken(TOKEN_TYPES.indent, indentSize / 2);
+        }
+      } else {
+        chop++;
+      }
+    } else if (input[0] === '"') {
+      let i = 1;
+      for (; i < input.length; i++) {
+        if (input[i] === '"') {
+          const isEscaped = input[i - 1] === '\\' && input[i - 2] !== '\\';
+          if (!isEscaped) {
+            i++;
+            break;
+          }
+        }
+      }
+      const val = input.substring(0, i);
+
+      chop = i;
+
+      try {
+        yield buildToken(TOKEN_TYPES.string, JSON.parse(val));
+      } catch (err) {
+        if (err instanceof SyntaxError) {
+          yield buildToken(TOKEN_TYPES.invalid);
+        } else {
+          throw err;
+        }
+      }
+    } else if (/^[0-9]/.test(input)) {
+      const val = /^[0-9]+/.exec(input)[0];
+      chop = val.length;
+
+      yield buildToken(TOKEN_TYPES.number, +val);
+    } else if (/^true/.test(input)) {
+      yield buildToken(TOKEN_TYPES.boolean, true);
+      chop = 4;
+    } else if (/^false/.test(input)) {
+      yield buildToken(TOKEN_TYPES.boolean, false);
+      chop = 5;
+    } else if (input[0] === ':') {
+      yield buildToken(TOKEN_TYPES.colon);
+      chop++;
+    } else if (input[0] === ',') {
+      yield buildToken(TOKEN_TYPES.comma);
+      chop++;
+    } else if (/^[a-zA-Z\/.-]/g.test(input)) {
+      let i = 0;
+      for (; i < input.length; i++) {
+        const char = input[i];
+        if (char === ':' || char === ' ' || char === '\n' || char === '\r' || char === ',') {
+          break;
+        }
+      }
+      const name = input.substring(0, i);
+      chop = i;
+
+      yield buildToken(TOKEN_TYPES.string, name);
+    } else {
+      yield buildToken(TOKEN_TYPES.invalid);
+    }
+
+    if (!chop) {
+      // will trigger infinite recursion
+      yield buildToken(TOKEN_TYPES.invalid);
+    }
+
+    col += chop;
+    lastNewline = input[0] === '\n' || input[0] === '\r' && input[1] === '\n';
+    input = input.slice(chop);
+  }
+
+  yield buildToken(TOKEN_TYPES.eof);
+}
+
+class Parser {
+  constructor(input, fileLoc = 'lockfile') {
+    this.comments = [];
+    this.tokens = tokenise(input);
+    this.fileLoc = fileLoc;
+  }
+
+  onComment(token) {
+    const value = token.value;
+    (0, (_invariant || _load_invariant()).default)(typeof value === 'string', 'expected token value to be a string');
+
+    const comment = value.trim();
+
+    const versionMatch = comment.match(VERSION_REGEX);
+    if (versionMatch) {
+      const version = +versionMatch[1];
+      if (version > (_constants || _load_constants()).LOCKFILE_VERSION) {
+        throw new (_errors || _load_errors()).MessageError(`Can't install from a lockfile of version ${version} as you're on an old yarn version that only supports ` + `versions up to ${(_constants || _load_constants()).LOCKFILE_VERSION}. Run \`$ yarn self-update\` to upgrade to the latest version.`);
+      }
+    }
+
+    this.comments.push(comment);
+  }
+
+  next() {
+    const item = this.tokens.next();
+    (0, (_invariant || _load_invariant()).default)(item, 'expected a token');
+
+    const done = item.done,
+          value = item.value;
+
+    if (done || !value) {
+      throw new Error('No more tokens');
+    } else if (value.type === TOKEN_TYPES.comment) {
+      this.onComment(value);
+      return this.next();
+    } else {
+      return this.token = value;
+    }
+  }
+
+  unexpected(msg = 'Unexpected token') {
+    throw new SyntaxError(`${msg} ${this.token.line}:${this.token.col} in ${this.fileLoc}`);
+  }
+
+  expect(tokType) {
+    if (this.token.type === tokType) {
+      this.next();
+    } else {
+      this.unexpected();
+    }
+  }
+
+  eat(tokType) {
+    if (this.token.type === tokType) {
+      this.next();
+      return true;
+    } else {
+      return false;
+    }
+  }
+
+  parse(indent = 0) {
+    const obj = (0, (_map || _load_map()).default)();
+
+    while (true) {
+      const propToken = this.token;
+
+      if (propToken.type === TOKEN_TYPES.newline) {
+        const nextToken = this.next();
+        if (!indent) {
+          // if we have 0 indentation then the next token doesn't matter
+          continue;
+        }
+
+        if (nextToken.type !== TOKEN_TYPES.indent) {
+          // if we have no indentation after a newline then we've gone down a level
+          break;
+        }
+
+        if (nextToken.value === indent) {
+          // all is good, the indent is on our level
+          this.next();
+        } else {
+          // the indentation is less than our level
+          break;
+        }
+      } else if (propToken.type === TOKEN_TYPES.indent) {
+        if (propToken.value === indent) {
+          this.next();
+        } else {
+          break;
+        }
+      } else if (propToken.type === TOKEN_TYPES.eof) {
+        break;
+      } else if (propToken.type === TOKEN_TYPES.string) {
+        // property key
+        const key = propToken.value;
+        (0, (_invariant || _load_invariant()).default)(key, 'Expected a key');
+
+        const keys = [key];
+        this.next();
+
+        // support multiple keys
+        while (this.token.type === TOKEN_TYPES.comma) {
+          this.next(); // skip comma
+
+          const keyToken = this.token;
+          if (keyToken.type !== TOKEN_TYPES.string) {
+            this.unexpected('Expected string');
+          }
+
+          const key = keyToken.value;
+          (0, (_invariant || _load_invariant()).default)(key, 'Expected a key');
+          keys.push(key);
+          this.next();
+        }
+
+        const wasColon = this.token.type === TOKEN_TYPES.colon;
+        if (wasColon) {
+          this.next();
+        }
+
+        if (isValidPropValueToken(this.token)) {
+          // plain value
+          for (var _iterator = keys, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+            var _ref;
+
+            if (_isArray) {
+              if (_i >= _iterator.length) break;
+              _ref = _iterator[_i++];
+            } else {
+              _i = _iterator.next();
+              if (_i.done) break;
+              _ref = _i.value;
+            }
+
+            const key = _ref;
+
+            obj[key] = this.token.value;
+          }
+
+          this.next();
+        } else if (wasColon) {
+          // parse object
+          const val = this.parse(indent + 1);
+
+          for (var _iterator2 = keys, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+            var _ref2;
+
+            if (_isArray2) {
+              if (_i2 >= _iterator2.length) break;
+              _ref2 = _iterator2[_i2++];
+            } else {
+              _i2 = _iterator2.next();
+              if (_i2.done) break;
+              _ref2 = _i2.value;
+            }
+
+            const key = _ref2;
+
+            obj[key] = val;
+          }
+
+          if (indent && this.token.type !== TOKEN_TYPES.indent) {
+            break;
+          }
+        } else {
+          this.unexpected('Invalid value type');
+        }
+      } else {
+        this.unexpected(`Unknown token: ${(_util || _load_util()).default.inspect(propToken)}`);
+      }
+    }
+
+    return obj;
+  }
+}
+
+const MERGE_CONFLICT_ANCESTOR = '|||||||';
+const MERGE_CONFLICT_END = '>>>>>>>';
+const MERGE_CONFLICT_SEP = '=======';
+const MERGE_CONFLICT_START = '<<<<<<<';
+
+/**
+ * Extract the two versions of the lockfile from a merge conflict.
+ */
+function extractConflictVariants(str) {
+  const variants = [[], []];
+  const lines = str.split(/\r?\n/g);
+  let skip = false;
+
+  while (lines.length) {
+    const line = lines.shift();
+    if (line.startsWith(MERGE_CONFLICT_START)) {
+      // get the first variant
+      while (lines.length) {
+        const conflictLine = lines.shift();
+        if (conflictLine === MERGE_CONFLICT_SEP) {
+          skip = false;
+          break;
+        } else if (skip || conflictLine.startsWith(MERGE_CONFLICT_ANCESTOR)) {
+          skip = true;
+          continue;
+        } else {
+          variants[0].push(conflictLine);
+        }
+      }
+
+      // get the second variant
+      while (lines.length) {
+        const conflictLine = lines.shift();
+        if (conflictLine.startsWith(MERGE_CONFLICT_END)) {
+          break;
+        } else {
+          variants[1].push(conflictLine);
+        }
+      }
+    } else {
+      variants[0].push(line);
+      variants[1].push(line);
+    }
+  }
+
+  return [variants[0].join('\n'), variants[1].join('\n')];
+}
+
+/**
+ * Check if a lockfile has merge conflicts.
+ */
+function hasMergeConflicts(str) {
+  return str.includes(MERGE_CONFLICT_START) && str.includes(MERGE_CONFLICT_SEP) && str.includes(MERGE_CONFLICT_END);
+}
+
+/**
+ * Parse the lockfile.
+ */
+function parse(str, fileLoc) {
+  const parser = new Parser(str, fileLoc);
+  parser.next();
+  try {
+    return parser.parse();
+  } catch (error1) {
+    try {
+      return safeLoad(str, {
+        schema: FAILSAFE_SCHEMA
+      });
+    } catch (error2) {
+      throw error1;
+    }
+  }
+}
+
+/**
+ * Parse and merge the two variants in a conflicted lockfile.
+ */
+function parseWithConflict(str, fileLoc) {
+  const variants = extractConflictVariants(str);
+  try {
+    return { type: 'merge', object: Object.assign({}, parse(variants[0], fileLoc), parse(variants[1], fileLoc)) };
+  } catch (err) {
+    if (err instanceof SyntaxError) {
+      return { type: 'conflict', object: {} };
+    } else {
+      throw err;
+    }
+  }
+}
+
+/***/ }),
+/* 106 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+
+module.exports = {
+  copy: copy,
+  checkDataType: checkDataType,
+  checkDataTypes: checkDataTypes,
+  coerceToTypes: coerceToTypes,
+  toHash: toHash,
+  getProperty: getProperty,
+  escapeQuotes: escapeQuotes,
+  equal: __webpack_require__(204),
+  ucs2length: __webpack_require__(480),
+  varOccurences: varOccurences,
+  varReplace: varReplace,
+  cleanUpCode: cleanUpCode,
+  finalCleanUpCode: finalCleanUpCode,
+  schemaHasRules: schemaHasRules,
+  schemaHasRulesExcept: schemaHasRulesExcept,
+  toQuotedString: toQuotedString,
+  getPathExpr: getPathExpr,
+  getPath: getPath,
+  getData: getData,
+  unescapeFragment: unescapeFragment,
+  unescapeJsonPointer: unescapeJsonPointer,
+  escapeFragment: escapeFragment,
+  escapeJsonPointer: escapeJsonPointer
+};
+
+
+function copy(o, to) {
+  to = to || {};
+  for (var key in o) to[key] = o[key];
+  return to;
+}
+
+
+function checkDataType(dataType, data, negate) {
+  var EQUAL = negate ? ' !== ' : ' === '
+    , AND = negate ? ' || ' : ' && '
+    , OK = negate ? '!' : ''
+    , NOT = negate ? '' : '!';
+  switch (dataType) {
+    case 'null': return data + EQUAL + 'null';
+    case 'array': return OK + 'Array.isArray(' + data + ')';
+    case 'object': return '(' + OK + data + AND +
+                          'typeof ' + data + EQUAL + '"object"' + AND +
+                          NOT + 'Array.isArray(' + data + '))';
+    case 'integer': return '(typeof ' + data + EQUAL + '"number"' + AND +
+                           NOT + '(' + data + ' % 1)' +
+                           AND + data + EQUAL + data + ')';
+    default: return 'typeof ' + data + EQUAL + '"' + dataType + '"';
+  }
+}
+
+
+function checkDataTypes(dataTypes, data) {
+  switch (dataTypes.length) {
+    case 1: return checkDataType(dataTypes[0], data, true);
+    default:
+      var code = '';
+      var types = toHash(dataTypes);
+      if (types.array && types.object) {
+        code = types.null ? '(': '(!' + data + ' || ';
+        code += 'typeof ' + data + ' !== "object")';
+        delete types.null;
+        delete types.array;
+        delete types.object;
+      }
+      if (types.number) delete types.integer;
+      for (var t in types)
+        code += (code ? ' && ' : '' ) + checkDataType(t, data, true);
+
+      return code;
+  }
+}
+
+
+var COERCE_TO_TYPES = toHash([ 'string', 'number', 'integer', 'boolean', 'null' ]);
+function coerceToTypes(optionCoerceTypes, dataTypes) {
+  if (Array.isArray(dataTypes)) {
+    var types = [];
+    for (var i=0; i<dataTypes.length; i++) {
+      var t = dataTypes[i];
+      if (COERCE_TO_TYPES[t]) types[types.length] = t;
+      else if (optionCoerceTypes === 'array' && t === 'array') types[types.length] = t;
+    }
+    if (types.length) return types;
+  } else if (COERCE_TO_TYPES[dataTypes]) {
+    return [dataTypes];
+  } else if (optionCoerceTypes === 'array' && dataTypes === 'array') {
+    return ['array'];
+  }
+}
+
+
+function toHash(arr) {
+  var hash = {};
+  for (var i=0; i<arr.length; i++) hash[arr[i]] = true;
+  return hash;
+}
+
+
+var IDENTIFIER = /^[a-z$_][a-z$_0-9]*$/i;
+var SINGLE_QUOTE = /'|\\/g;
+function getProperty(key) {
+  return typeof key == 'number'
+          ? '[' + key + ']'
+          : IDENTIFIER.test(key)
+            ? '.' + key
+            : "['" + escapeQuotes(key) + "']";
+}
+
+
+function escapeQuotes(str) {
+  return str.replace(SINGLE_QUOTE, '\\$&')
+            .replace(/\n/g, '\\n')
+            .replace(/\r/g, '\\r')
+            .replace(/\f/g, '\\f')
+            .replace(/\t/g, '\\t');
+}
+
+
+function varOccurences(str, dataVar) {
+  dataVar += '[^0-9]';
+  var matches = str.match(new RegExp(dataVar, 'g'));
+  return matches ? matches.length : 0;
+}
+
+
+function varReplace(str, dataVar, expr) {
+  dataVar += '([^0-9])';
+  expr = expr.replace(/\$/g, '$$$$');
+  return str.replace(new RegExp(dataVar, 'g'), expr + '$1');
+}
+
+
+var EMPTY_ELSE = /else\s*{\s*}/g
+  , EMPTY_IF_NO_ELSE = /if\s*\([^)]+\)\s*\{\s*\}(?!\s*else)/g
+  , EMPTY_IF_WITH_ELSE = /if\s*\(([^)]+)\)\s*\{\s*\}\s*else(?!\s*if)/g;
+function cleanUpCode(out) {
+  return out.replace(EMPTY_ELSE, '')
+            .replace(EMPTY_IF_NO_ELSE, '')
+            .replace(EMPTY_IF_WITH_ELSE, 'if (!($1))');
+}
+
+
+var ERRORS_REGEXP = /[^v.]errors/g
+  , REMOVE_ERRORS = /var errors = 0;|var vErrors = null;|validate.errors = vErrors;/g
+  , REMOVE_ERRORS_ASYNC = /var errors = 0;|var vErrors = null;/g
+  , RETURN_VALID = 'return errors === 0;'
+  , RETURN_TRUE = 'validate.errors = null; return true;'
+  , RETURN_ASYNC = /if \(errors === 0\) return data;\s*else throw new ValidationError\(vErrors\);/
+  , RETURN_DATA_ASYNC = 'return data;'
+  , ROOTDATA_REGEXP = /[^A-Za-z_$]rootData[^A-Za-z0-9_$]/g
+  , REMOVE_ROOTDATA = /if \(rootData === undefined\) rootData = data;/;
+
+function finalCleanUpCode(out, async) {
+  var matches = out.match(ERRORS_REGEXP);
+  if (matches && matches.length == 2) {
+    out = async
+          ? out.replace(REMOVE_ERRORS_ASYNC, '')
+               .replace(RETURN_ASYNC, RETURN_DATA_ASYNC)
+          : out.replace(REMOVE_ERRORS, '')
+               .replace(RETURN_VALID, RETURN_TRUE);
+  }
+
+  matches = out.match(ROOTDATA_REGEXP);
+  if (!matches || matches.length !== 3) return out;
+  return out.replace(REMOVE_ROOTDATA, '');
+}
+
+
+function schemaHasRules(schema, rules) {
+  if (typeof schema == 'boolean') return !schema;
+  for (var key in schema) if (rules[key]) return true;
+}
+
+
+function schemaHasRulesExcept(schema, rules, exceptKeyword) {
+  if (typeof schema == 'boolean') return !schema && exceptKeyword != 'not';
+  for (var key in schema) if (key != exceptKeyword && rules[key]) return true;
+}
+
+
+function toQuotedString(str) {
+  return '\'' + escapeQuotes(str) + '\'';
+}
+
+
+function getPathExpr(currentPath, expr, jsonPointers, isNumber) {
+  var path = jsonPointers // false by default
+              ? '\'/\' + ' + expr + (isNumber ? '' : '.replace(/~/g, \'~0\').replace(/\\//g, \'~1\')')
+              : (isNumber ? '\'[\' + ' + expr + ' + \']\'' : '\'[\\\'\' + ' + expr + ' + \'\\\']\'');
+  return joinPaths(currentPath, path);
+}
+
+
+function getPath(currentPath, prop, jsonPointers) {
+  var path = jsonPointers // false by default
+              ? toQuotedString('/' + escapeJsonPointer(prop))
+              : toQuotedString(getProperty(prop));
+  return joinPaths(currentPath, path);
+}
+
+
+var JSON_POINTER = /^\/(?:[^~]|~0|~1)*$/;
+var RELATIVE_JSON_POINTER = /^([0-9]+)(#|\/(?:[^~]|~0|~1)*)?$/;
+function getData($data, lvl, paths) {
+  var up, jsonPointer, data, matches;
+  if ($data === '') return 'rootData';
+  if ($data[0] == '/') {
+    if (!JSON_POINTER.test($data)) throw new Error('Invalid JSON-pointer: ' + $data);
+    jsonPointer = $data;
+    data = 'rootData';
+  } else {
+    matches = $data.match(RELATIVE_JSON_POINTER);
+    if (!matches) throw new Error('Invalid JSON-pointer: ' + $data);
+    up = +matches[1];
+    jsonPointer = matches[2];
+    if (jsonPointer == '#') {
+      if (up >= lvl) throw new Error('Cannot access property/index ' + up + ' levels up, current level is ' + lvl);
+      return paths[lvl - up];
+    }
+
+    if (up > lvl) throw new Error('Cannot access data ' + up + ' levels up, current level is ' + lvl);
+    data = 'data' + ((lvl - up) || '');
+    if (!jsonPointer) return data;
+  }
+
+  var expr = data;
+  var segments = jsonPointer.split('/');
+  for (var i=0; i<segments.length; i++) {
+    var segment = segments[i];
+    if (segment) {
+      data += getProperty(unescapeJsonPointer(segment));
+      expr += ' && ' + data;
+    }
+  }
+  return expr;
+}
+
+
+function joinPaths (a, b) {
+  if (a == '""') return b;
+  return (a + ' + ' + b).replace(/' \+ '/g, '');
+}
+
+
+function unescapeFragment(str) {
+  return unescapeJsonPointer(decodeURIComponent(str));
+}
+
+
+function escapeFragment(str) {
+  return encodeURIComponent(escapeJsonPointer(str));
+}
+
+
+function escapeJsonPointer(str) {
+  return str.replace(/~/g, '~0').replace(/\//g, '~1');
+}
+
+
+function unescapeJsonPointer(str) {
+  return str.replace(/~1/g, '/').replace(/~0/g, '~');
+}
+
+
+/***/ }),
+/* 107 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.run = exports.getToken = undefined;
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+let getCredentials = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter) {
+    var _config$registries$ya = config.registries.yarn.config;
+    let username = _config$registries$ya.username,
+        email = _config$registries$ya.email;
+
+
+    if (username) {
+      reporter.info(`${reporter.lang('npmUsername')}: ${username}`);
+    } else {
+      username = yield reporter.question(reporter.lang('npmUsername'));
+      if (!username) {
+        return null;
+      }
+    }
+
+    if (email) {
+      reporter.info(`${reporter.lang('npmEmail')}: ${email}`);
+    } else {
+      email = yield reporter.question(reporter.lang('npmEmail'));
+      if (!email) {
+        return null;
+      }
+    }
+
+    yield config.registries.yarn.saveHomeConfig({ username, email });
+
+    return { username, email };
+  });
+
+  return function getCredentials(_x, _x2) {
+    return _ref.apply(this, arguments);
+  };
+})();
+
+let getToken = exports.getToken = (() => {
+  var _ref2 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, name = '', flags = {}, registry = '') {
+    const auth = registry ? config.registries.npm.getAuthByRegistry(registry) : config.registries.npm.getAuth(name);
+
+    if (config.otp) {
+      config.registries.npm.setOtp(config.otp);
+    }
+
+    if (auth) {
+      config.registries.npm.setToken(auth);
+      return function revoke() {
+        reporter.info(reporter.lang('notRevokingConfigToken'));
+        return Promise.resolve();
+      };
+    }
+
+    const env = process.env.YARN_AUTH_TOKEN || process.env.NPM_AUTH_TOKEN;
+    if (env) {
+      config.registries.npm.setToken(`Bearer ${env}`);
+      return function revoke() {
+        reporter.info(reporter.lang('notRevokingEnvToken'));
+        return Promise.resolve();
+      };
+    }
+
+    // make sure we're not running in non-interactive mode before asking for login
+    if (flags.nonInteractive || config.nonInteractive) {
+      throw new (_errors || _load_errors()).MessageError(reporter.lang('nonInteractiveNoToken'));
+    }
+
+    //
+    const creds = yield getCredentials(config, reporter);
+    if (!creds) {
+      reporter.warn(reporter.lang('loginAsPublic'));
+      return function revoke() {
+        reporter.info(reporter.lang('noTokenToRevoke'));
+        return Promise.resolve();
+      };
+    }
+
+    const username = creds.username,
+          email = creds.email;
+
+    const password = yield reporter.question(reporter.lang('npmPassword'), {
+      password: true,
+      required: true
+    });
+
+    //
+    const userobj = {
+      _id: `org.couchdb.user:${username}`,
+      name: username,
+      password,
+      email,
+      type: 'user',
+      roles: [],
+      date: new Date().toISOString()
+    };
+
+    //
+    const res = yield config.registries.npm.request(`-/user/org.couchdb.user:${encodeURIComponent(username)}`, {
+      method: 'PUT',
+      registry,
+      body: userobj,
+      auth: { username, password, email }
+    });
+
+    if (res && res.ok) {
+      reporter.success(reporter.lang('loggedIn'));
+
+      const token = res.token;
+      config.registries.npm.setToken(`Bearer ${token}`);
+
+      return (() => {
+        var _ref3 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+          reporter.success(reporter.lang('revokedToken'));
+          yield config.registries.npm.request(`-/user/token/${token}`, {
+            method: 'DELETE',
+            registry
+          });
+        });
+
+        function revoke() {
+          return _ref3.apply(this, arguments);
+        }
+
+        return revoke;
+      })();
+    } else {
+      throw new (_errors || _load_errors()).MessageError(reporter.lang('incorrectCredentials'));
+    }
+  });
+
+  return function getToken(_x3, _x4) {
+    return _ref2.apply(this, arguments);
+  };
+})();
+
+let run = exports.run = (() => {
+  var _ref4 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
+    yield getCredentials(config, reporter);
+  });
+
+  return function run(_x5, _x6, _x7, _x8) {
+    return _ref4.apply(this, arguments);
+  };
+})();
+
+exports.getOneTimePassword = getOneTimePassword;
+exports.hasWrapper = hasWrapper;
+exports.setFlags = setFlags;
+
+var _errors;
+
+function _load_errors() {
+  return _errors = __webpack_require__(6);
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function getOneTimePassword(reporter) {
+  return reporter.question(reporter.lang('npmOneTimePassword'));
+}
+
+function hasWrapper(commander, args) {
+  return true;
+}
+
+function setFlags(commander) {
+  commander.description('Stores registry username and email.');
+}
+
+/***/ }),
+/* 108 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+exports.stringifyLangArgs = stringifyLangArgs;
+
+var _format;
+
+function _load_format() {
+  return _format = __webpack_require__(566);
+}
+
+var _index;
+
+function _load_index() {
+  return _index = _interopRequireWildcard(__webpack_require__(568));
+}
+
+var _isCi;
+
+function _load_isCi() {
+  return _isCi = _interopRequireDefault(__webpack_require__(397));
+}
+
+var _os;
+
+function _load_os() {
+  return _os = _interopRequireDefault(__webpack_require__(49));
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/* eslint no-unused-vars: 0 */
+
+const util = __webpack_require__(3);
+const EventEmitter = __webpack_require__(77).EventEmitter;
+
+function stringifyLangArgs(args) {
+  return args.map(function (val) {
+    if (val != null && val.inspect) {
+      return val.inspect();
+    } else {
+      try {
+        const str = JSON.stringify(val) || val + '';
+        // should match all literal line breaks and
+        // "u001b" that follow an odd number of backslashes and convert them to ESC
+        // we do this because the JSON.stringify process has escaped these characters
+        return str.replace(/((?:^|[^\\])(?:\\{2})*)\\u001[bB]/g, '$1\u001b').replace(/[\\]r[\\]n|([\\])?[\\]n/g, (match, precededBacklash) => {
+          // precededBacklash not null when "\n" is preceded by a backlash ("\\n")
+          // match will be "\\n" and we don't replace it with os.EOL
+          return precededBacklash ? match : (_os || _load_os()).default.EOL;
+        });
+      } catch (e) {
+        return util.inspect(val);
+      }
+    }
+  });
+}
+
+class BaseReporter {
+  constructor(opts = {}) {
+    const lang = 'en';
+    this.language = lang;
+
+    this.stdout = opts.stdout || process.stdout;
+    this.stderr = opts.stderr || process.stderr;
+    this.stdin = opts.stdin || this._getStandardInput();
+    this.emoji = !!opts.emoji;
+    this.nonInteractive = !!opts.nonInteractive;
+    this.noProgress = !!opts.noProgress || (_isCi || _load_isCi()).default;
+    this.isVerbose = !!opts.verbose;
+
+    // $FlowFixMe: this is valid!
+    this.isTTY = this.stdout.isTTY;
+
+    this.peakMemory = 0;
+    this.startTime = Date.now();
+    this.format = (_format || _load_format()).defaultFormatter;
+  }
+
+  lang(key, ...args) {
+    const msg = (_index || _load_index())[this.language][key] || (_index || _load_index()).en[key];
+    if (!msg) {
+      throw new ReferenceError(`No message defined for language key ${key}`);
+    }
+
+    // stringify args
+    const stringifiedArgs = stringifyLangArgs(args);
+
+    // replace $0 placeholders with args
+    return msg.replace(/\$(\d+)/g, (str, i) => {
+      return stringifiedArgs[i];
+    });
+  }
+
+  /**
+   * `stringifyLangArgs` run `JSON.stringify` on strings too causing
+   * them to appear quoted. This marks them as "raw" and prevents
+   * the quoting and escaping
+   */
+  rawText(str) {
+    return {
+      inspect() {
+        return str;
+      }
+    };
+  }
+
+  verbose(msg) {
+    if (this.isVerbose) {
+      this._verbose(msg);
+    }
+  }
+
+  verboseInspect(val) {
+    if (this.isVerbose) {
+      this._verboseInspect(val);
+    }
+  }
+
+  _verbose(msg) {}
+  _verboseInspect(val) {}
+
+  _getStandardInput() {
+    let standardInput;
+
+    // Accessing stdin in a win32 headless process (e.g., Visual Studio) may throw an exception.
+    try {
+      standardInput = process.stdin;
+    } catch (e) {
+      console.warn(e.message);
+      delete process.stdin;
+      // $FlowFixMe: this is valid!
+      process.stdin = new EventEmitter();
+      standardInput = process.stdin;
+    }
+
+    return standardInput;
+  }
+
+  initPeakMemoryCounter() {
+    this.checkPeakMemory();
+    this.peakMemoryInterval = setInterval(() => {
+      this.checkPeakMemory();
+    }, 1000);
+    // $FlowFixMe: Node's setInterval returns a Timeout, not a Number
+    this.peakMemoryInterval.unref();
+  }
+
+  checkPeakMemory() {
+    var _process$memoryUsage = process.memoryUsage();
+
+    const heapTotal = _process$memoryUsage.heapTotal;
+
+    if (heapTotal > this.peakMemory) {
+      this.peakMemory = heapTotal;
+    }
+  }
+
+  close() {
+    if (this.peakMemoryInterval) {
+      clearInterval(this.peakMemoryInterval);
+      this.peakMemoryInterval = null;
+    }
+  }
+
+  getTotalTime() {
+    return Date.now() - this.startTime;
+  }
+
+  // TODO
+  list(key, items, hints) {}
+
+  // Outputs basic tree structure to console
+  tree(key, obj, { force = false } = {}) {}
+
+  // called whenever we begin a step in the CLI.
+  step(current, total, message, emoji) {}
+
+  // a error message has been triggered. this however does not always meant an abrupt
+  // program end.
+  error(message) {}
+
+  // an info message has been triggered. this provides things like stats and diagnostics.
+  info(message) {}
+
+  // a warning message has been triggered.
+  warn(message) {}
+
+  // a success message has been triggered.
+  success(message) {}
+
+  // a simple log message
+  // TODO: rethink the {force} parameter. In the meantime, please don't use it (cf comments in #4143).
+  log(message, { force = false } = {}) {}
+
+  // a shell command has been executed
+  command(command) {}
+
+  // inspect and pretty-print any value
+  inspect(value) {}
+
+  // the screen shown at the very start of the CLI
+  header(command, pkg) {}
+
+  // the screen shown at the very end of the CLI
+  footer(showPeakMemory) {}
+
+  // a table structure
+  table(head, body) {}
+
+  // security audit action to resolve advisories
+  auditAction(recommendation) {}
+
+  // security audit requires manual review
+  auditManualReview() {}
+
+  // security audit advisory
+  auditAdvisory(resolution, auditAdvisory) {}
+
+  // summary for security audit report
+  auditSummary(auditMetadata) {}
+
+  // render an activity spinner and return a function that will trigger an update
+  activity() {
+    return {
+      tick(name) {},
+      end() {}
+    };
+  }
+
+  //
+  activitySet(total, workers) {
+    return {
+      spinners: Array(workers).fill({
+        clear() {},
+        setPrefix() {},
+        tick() {},
+        end() {}
+      }),
+      end() {}
+    };
+  }
+
+  //
+  question(question, options = {}) {
+    return Promise.reject(new Error('Not implemented'));
+  }
+
+  //
+  questionAffirm(question) {
+    var _this = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const condition = true; // trick eslint
+      if (_this.nonInteractive) {
+        return true;
+      }
+
+      while (condition) {
+        let answer = yield _this.question(question);
+        answer = answer.toLowerCase();
+
+        if (answer === 'y' || answer === 'yes') {
+          return true;
+        }
+        if (answer === 'n' || answer === 'no') {
+          return false;
+        }
+
+        _this.error('Invalid answer for question');
+      }
+
+      return false;
+    })();
+  }
+
+  // prompt the user to select an option from an array
+  select(header, question, options) {
+    return Promise.reject(new Error('Not implemented'));
+  }
+
+  // render a progress bar and return a function which when called will trigger an update
+  progress(total) {
+    return function () {};
+  }
+
+  // utility function to disable progress bar
+  disableProgress() {
+    this.noProgress = true;
+  }
+
+  //
+  prompt(message, choices, options = {}) {
+    return Promise.reject(new Error('Not implemented'));
+  }
+}
+exports.default = BaseReporter;
+
+/***/ }),
+/* 109 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+exports.explodeHostedGitFragment = explodeHostedGitFragment;
+
+var _errors;
+
+function _load_errors() {
+  return _errors = __webpack_require__(6);
+}
+
+var _index;
+
+function _load_index() {
+  return _index = __webpack_require__(57);
+}
+
+var _gitResolver;
+
+function _load_gitResolver() {
+  return _gitResolver = _interopRequireDefault(__webpack_require__(124));
+}
+
+var _exoticResolver;
+
+function _load_exoticResolver() {
+  return _exoticResolver = _interopRequireDefault(__webpack_require__(89));
+}
+
+var _git;
+
+function _load_git() {
+  return _git = _interopRequireDefault(__webpack_require__(219));
+}
+
+var _guessName;
+
+function _load_guessName() {
+  return _guessName = _interopRequireDefault(__webpack_require__(169));
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function parseHash(fragment) {
+  const hashPosition = fragment.indexOf('#');
+  return hashPosition === -1 ? '' : fragment.substr(hashPosition + 1);
+}
+
+function explodeHostedGitFragment(fragment, reporter) {
+  const hash = parseHash(fragment);
+
+  const preParts = fragment.split('@');
+  if (preParts.length > 2) {
+    fragment = preParts[1] + '@' + preParts[2];
+  }
+
+  const parts = fragment.replace(/(.*?)#.*/, '$1') // Strip hash
+  .replace(/.*:(.*)/, '$1') // Strip prefixed protocols
+  .replace(/.git$/, '') // Strip the .git suffix
+  .split('/');
+
+  const user = parts[parts.length - 2];
+  const repo = parts[parts.length - 1];
+
+  if (user === undefined || repo === undefined) {
+    throw new (_errors || _load_errors()).MessageError(reporter.lang('invalidHostedGitFragment', fragment));
+  }
+
+  return {
+    user,
+    repo,
+    hash
+  };
+}
+
+class HostedGitResolver extends (_exoticResolver || _load_exoticResolver()).default {
+  constructor(request, fragment) {
+    super(request, fragment);
+
+    const exploded = this.exploded = explodeHostedGitFragment(fragment, this.reporter);
+    const user = exploded.user,
+          repo = exploded.repo,
+          hash = exploded.hash;
+
+    this.user = user;
+    this.repo = repo;
+    this.hash = hash;
+  }
+
+  static getTarballUrl(exploded, commit) {
+    exploded;
+    commit;
+    throw new Error('Not implemented');
+  }
+
+  static getGitHTTPUrl(exploded) {
+    exploded;
+    throw new Error('Not implemented');
+  }
+
+  static getGitHTTPBaseUrl(exploded) {
+    exploded;
+    throw new Error('Not implemented');
+  }
+
+  static getGitSSHUrl(exploded) {
+    exploded;
+    throw new Error('Not implemented');
+  }
+
+  static getHTTPFileUrl(exploded, filename, commit) {
+    exploded;
+    filename;
+    commit;
+    throw new Error('Not implemented');
+  }
+
+  getRefOverHTTP(url) {
+    var _this = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const gitUrl = (_git || _load_git()).default.npmUrlToGitUrl(url);
+      const client = new (_git || _load_git()).default(_this.config, gitUrl, _this.hash);
+
+      let out = yield _this.config.requestManager.request({
+        url: `${url}/info/refs?service=git-upload-pack`,
+        queue: _this.resolver.fetchingQueue
+      });
+
+      if (out) {
+        // clean up output
+        let lines = out.trim().split('\n');
+
+        // remove first two lines which contains compatibility info etc
+        lines = lines.slice(2);
+
+        // remove last line which contains the terminator "0000"
+        lines.pop();
+
+        // remove line lengths from start of each line
+        lines = lines.map(function (line) {
+          return line.slice(4);
+        });
+
+        out = lines.join('\n');
+      } else {
+        throw new Error(_this.reporter.lang('hostedGitResolveError'));
+      }
+
+      return client.setRefHosted(out);
+    })();
+  }
+
+  resolveOverHTTP(url) {
+    var _this2 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const commit = yield _this2.getRefOverHTTP(url);
+      const config = _this2.config;
+
+
+      const tarballUrl = _this2.constructor.getTarballUrl(_this2.exploded, commit);
+
+      const tryRegistry = (() => {
+        var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (registry) {
+          const filename = (_index || _load_index()).registries[registry].filename;
+
+          const href = _this2.constructor.getHTTPFileUrl(_this2.exploded, filename, commit);
+          const file = yield config.requestManager.request({
+            url: href,
+            queue: _this2.resolver.fetchingQueue
+          });
+          if (!file) {
+            return null;
+          }
+
+          const json = yield config.readJson(href, function () {
+            return JSON.parse(file);
+          });
+          json._uid = commit;
+          json._remote = {
+            resolved: tarballUrl,
+            type: 'tarball',
+            reference: tarballUrl,
+            registry
+          };
+          return json;
+        });
+
+        return function tryRegistry(_x) {
+          return _ref.apply(this, arguments);
+        };
+      })();
+
+      const file = yield tryRegistry(_this2.registry);
+      if (file) {
+        return file;
+      }
+
+      for (const registry in (_index || _load_index()).registries) {
+        if (registry === _this2.registry) {
+          continue;
+        }
+
+        const file = yield tryRegistry(registry);
+        if (file) {
+          return file;
+        }
+      }
+
+      return {
+        name: (0, (_guessName || _load_guessName()).default)(url),
+        version: '0.0.0',
+        _uid: commit,
+        _remote: {
+          resolved: tarballUrl,
+          type: 'tarball',
+          reference: tarballUrl,
+          registry: 'npm',
+          hash: undefined
+        }
+      };
+    })();
+  }
+
+  hasHTTPCapability(url) {
+    var _this3 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      return (yield _this3.config.requestManager.request({
+        url,
+        method: 'HEAD',
+        queue: _this3.resolver.fetchingQueue,
+        followRedirect: false
+      })) !== false;
+    })();
+  }
+
+  resolve() {
+    var _this4 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      // If we already have the tarball, just return it without having to make any HTTP requests.
+      const shrunk = _this4.request.getLocked('tarball');
+      if (shrunk) {
+        return shrunk;
+      }
+
+      const httpUrl = _this4.constructor.getGitHTTPUrl(_this4.exploded);
+      const httpBaseUrl = _this4.constructor.getGitHTTPBaseUrl(_this4.exploded);
+      const sshUrl = _this4.constructor.getGitSSHUrl(_this4.exploded);
+
+      // If we can access the files over HTTP then we should as it's MUCH faster than git
+      // archive and tarball unarchiving. The HTTP API is only available for public repos
+      // though.
+      if (yield _this4.hasHTTPCapability(httpBaseUrl)) {
+        return _this4.resolveOverHTTP(httpUrl);
+      }
+
+      // If the url is accessible over git archive then we should immediately delegate to
+      // the git resolver.
+      //
+      // NOTE: Here we use a different url than when we delegate to the git resolver later on.
+      // This is because `git archive` requires access over ssh and github only allows that
+      // if you have write permissions
+      const sshGitUrl = (_git || _load_git()).default.npmUrlToGitUrl(sshUrl);
+      if (yield (_git || _load_git()).default.hasArchiveCapability(sshGitUrl)) {
+        const archiveClient = new (_git || _load_git()).default(_this4.config, sshGitUrl, _this4.hash);
+        const commit = yield archiveClient.init();
+        return _this4.fork((_gitResolver || _load_gitResolver()).default, true, `${sshUrl}#${commit}`);
+      }
+
+      // fallback to the plain git resolver
+      return _this4.fork((_gitResolver || _load_gitResolver()).default, true, sshUrl);
+    })();
+  }
+}
+exports.default = HostedGitResolver;
+
+/***/ }),
+/* 110 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _map;
+
+function _load_map() {
+  return _map = _interopRequireDefault(__webpack_require__(29));
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const debug = __webpack_require__(266)('yarn');
+
+class BlockingQueue {
+  constructor(alias, maxConcurrency = Infinity) {
+    this.concurrencyQueue = [];
+    this.maxConcurrency = maxConcurrency;
+    this.runningCount = 0;
+    this.warnedStuck = false;
+    this.alias = alias;
+    this.first = true;
+
+    this.running = (0, (_map || _load_map()).default)();
+    this.queue = (0, (_map || _load_map()).default)();
+
+    this.stuckTick = this.stuckTick.bind(this);
+  }
+
+  stillActive() {
+    if (this.stuckTimer) {
+      clearTimeout(this.stuckTimer);
+    }
+
+    this.stuckTimer = setTimeout(this.stuckTick, 5000);
+
+    // We need to check the existence of unref because of https://github.com/facebook/jest/issues/4559
+    // $FlowFixMe: Node's setInterval returns a Timeout, not a Number
+    this.stuckTimer.unref && this.stuckTimer.unref();
+  }
+
+  stuckTick() {
+    if (this.runningCount === 1) {
+      this.warnedStuck = true;
+      debug(`The ${JSON.stringify(this.alias)} blocking queue may be stuck. 5 seconds ` + `without any activity with 1 worker: ${Object.keys(this.running)[0]}`);
+    }
+  }
+
+  push(key, factory) {
+    if (this.first) {
+      this.first = false;
+    } else {
+      this.stillActive();
+    }
+
+    return new Promise((resolve, reject) => {
+      // we're already running so push ourselves to the queue
+      const queue = this.queue[key] = this.queue[key] || [];
+      queue.push({ factory, resolve, reject });
+
+      if (!this.running[key]) {
+        this.shift(key);
+      }
+    });
+  }
+
+  shift(key) {
+    if (this.running[key]) {
+      delete this.running[key];
+      this.runningCount--;
+
+      if (this.stuckTimer) {
+        clearTimeout(this.stuckTimer);
+        this.stuckTimer = null;
+      }
+
+      if (this.warnedStuck) {
+        this.warnedStuck = false;
+        debug(`${JSON.stringify(this.alias)} blocking queue finally resolved. Nothing to worry about.`);
+      }
+    }
+
+    const queue = this.queue[key];
+    if (!queue) {
+      return;
+    }
+
+    var _queue$shift = queue.shift();
+
+    const resolve = _queue$shift.resolve,
+          reject = _queue$shift.reject,
+          factory = _queue$shift.factory;
+
+    if (!queue.length) {
+      delete this.queue[key];
+    }
+
+    const next = () => {
+      this.shift(key);
+      this.shiftConcurrencyQueue();
+    };
+
+    const run = () => {
+      this.running[key] = true;
+      this.runningCount++;
+
+      factory().then(function (val) {
+        resolve(val);
+        next();
+        return null;
+      }).catch(function (err) {
+        reject(err);
+        next();
+      });
+    };
+
+    this.maybePushConcurrencyQueue(run);
+  }
+
+  maybePushConcurrencyQueue(run) {
+    if (this.runningCount < this.maxConcurrency) {
+      run();
+    } else {
+      this.concurrencyQueue.push(run);
+    }
+  }
+
+  shiftConcurrencyQueue() {
+    if (this.runningCount < this.maxConcurrency) {
+      const fn = this.concurrencyQueue.shift();
+      if (fn) {
+        fn();
+      }
+    }
+  }
+}
+exports.default = BlockingQueue;
+
+/***/ }),
+/* 111 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.execCommand = exports.execFromManifest = exports.executeLifecycleScript = exports.makeEnv = exports.getWrappersFolder = exports.IGNORE_MANIFEST_KEYS = undefined;
+
+var _extends2;
+
+function _load_extends() {
+  return _extends2 = _interopRequireDefault(__webpack_require__(21));
+}
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+let getWrappersFolder = exports.getWrappersFolder = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config) {
+    if (wrappersFolder) {
+      return wrappersFolder;
+    }
+
+    wrappersFolder = yield (_fs || _load_fs()).makeTempDir();
+
+    yield (0, (_portableScript || _load_portableScript()).makePortableProxyScript)(process.execPath, wrappersFolder, {
+      proxyBasename: 'node'
+    });
+
+    yield (0, (_portableScript || _load_portableScript()).makePortableProxyScript)(process.execPath, wrappersFolder, {
+      proxyBasename: 'yarn',
+      prependArguments: [process.argv[1]]
+    });
+
+    return wrappersFolder;
+  });
+
+  return function getWrappersFolder(_x) {
+    return _ref.apply(this, arguments);
+  };
+})();
+
+let makeEnv = exports.makeEnv = (() => {
+  var _ref2 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (stage, cwd, config) {
+    const env = (0, (_extends2 || _load_extends()).default)({
+      NODE: process.execPath,
+      INIT_CWD: process.cwd()
+    }, process.env);
+
+    // Merge in the `env` object specified in .yarnrc
+    const customEnv = config.getOption('env');
+    if (customEnv && typeof customEnv === 'object') {
+      Object.assign(env, customEnv);
+    }
+
+    env.npm_lifecycle_event = stage;
+    env.npm_node_execpath = env.NODE;
+    env.npm_execpath = env.npm_execpath || process.mainModule && process.mainModule.filename;
+
+    // Set the env to production for npm compat if production mode.
+    // https://github.com/npm/npm/blob/30d75e738b9cb7a6a3f9b50e971adcbe63458ed3/lib/utils/lifecycle.js#L336
+    if (config.production) {
+      env.NODE_ENV = 'production';
+    }
+
+    // Note: npm_config_argv environment variable contains output of nopt - command-line
+    // parser used by npm. Since we use other parser, we just roughly emulate it's output. (See: #684)
+    env.npm_config_argv = JSON.stringify({
+      remain: [],
+      cooked: config.commandName === 'run' ? [config.commandName, stage] : [config.commandName],
+      original: process.argv.slice(2)
+    });
+
+    const manifest = yield config.maybeReadManifest(cwd);
+    if (manifest) {
+      if (manifest.scripts && Object.prototype.hasOwnProperty.call(manifest.scripts, stage)) {
+        env.npm_lifecycle_script = manifest.scripts[stage];
+      }
+
+      // add npm_package_*
+      const queue = [['', manifest]];
+      while (queue.length) {
+        var _queue$pop = queue.pop();
+
+        const key = _queue$pop[0],
+              val = _queue$pop[1];
+
+        if (typeof val === 'object') {
+          for (const subKey in val) {
+            const fullKey = [key, subKey].filter(Boolean).join('_');
+            if (fullKey && fullKey[0] !== '_' && !IGNORE_MANIFEST_KEYS.has(fullKey)) {
+              queue.push([fullKey, val[subKey]]);
+            }
+          }
+        } else {
+          let cleanVal = String(val);
+          if (cleanVal.indexOf('\n') >= 0) {
+            cleanVal = JSON.stringify(cleanVal);
+          }
+
+          //replacing invalid chars with underscore
+          const cleanKey = key.replace(INVALID_CHAR_REGEX, '_');
+
+          env[`npm_package_${cleanKey}`] = cleanVal;
+        }
+      }
+    }
+
+    // add npm_config_* and npm_package_config_* from yarn config
+    const keys = new Set([...Object.keys(config.registries.yarn.config), ...Object.keys(config.registries.npm.config)]);
+    const cleaned = Array.from(keys).filter(function (key) {
+      return !key.match(/:_/) && IGNORE_CONFIG_KEYS.indexOf(key) === -1;
+    }).map(function (key) {
+      let val = config.getOption(key);
+      if (!val) {
+        val = '';
+      } else if (typeof val === 'number') {
+        val = '' + val;
+      } else if (typeof val !== 'string') {
+        val = JSON.stringify(val);
+      }
+
+      if (val.indexOf('\n') >= 0) {
+        val = JSON.stringify(val);
+      }
+      return [key, val];
+    });
+    // add npm_config_*
+    for (var _iterator = cleaned, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+      var _ref4;
+
+      if (_isArray) {
+        if (_i >= _iterator.length) break;
+        _ref4 = _iterator[_i++];
+      } else {
+        _i = _iterator.next();
+        if (_i.done) break;
+        _ref4 = _i.value;
+      }
+
+      const _ref3 = _ref4;
+      const key = _ref3[0];
+      const val = _ref3[1];
+
+      const cleanKey = key.replace(/^_+/, '');
+      const envKey = `npm_config_${cleanKey}`.replace(INVALID_CHAR_REGEX, '_');
+      env[envKey] = val;
+    }
+    // add npm_package_config_*
+    if (manifest && manifest.name) {
+      const packageConfigPrefix = `${manifest.name}:`;
+      for (var _iterator2 = cleaned, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+        var _ref6;
+
+        if (_isArray2) {
+          if (_i2 >= _iterator2.length) break;
+          _ref6 = _iterator2[_i2++];
+        } else {
+          _i2 = _iterator2.next();
+          if (_i2.done) break;
+          _ref6 = _i2.value;
+        }
+
+        const _ref5 = _ref6;
+        const key = _ref5[0];
+        const val = _ref5[1];
+
+        if (key.indexOf(packageConfigPrefix) !== 0) {
+          continue;
+        }
+        const cleanKey = key.replace(/^_+/, '').replace(packageConfigPrefix, '');
+        const envKey = `npm_package_config_${cleanKey}`.replace(INVALID_CHAR_REGEX, '_');
+        env[envKey] = val;
+      }
+    }
+
+    // split up the path
+    const envPath = env[(_constants || _load_constants()).ENV_PATH_KEY];
+    const pathParts = envPath ? envPath.split(path.delimiter) : [];
+
+    // Include node-gyp version that was bundled with the current Node.js version,
+    // if available.
+    pathParts.unshift(path.join(path.dirname(process.execPath), 'node_modules', 'npm', 'bin', 'node-gyp-bin'));
+    pathParts.unshift(path.join(path.dirname(process.execPath), '..', 'lib', 'node_modules', 'npm', 'bin', 'node-gyp-bin'));
+    // Include node-gyp version from homebrew managed npm, if available.
+    pathParts.unshift(path.join(path.dirname(process.execPath), '..', 'libexec', 'lib', 'node_modules', 'npm', 'bin', 'node-gyp-bin'));
+
+    // Add global bin folder if it is not present already, as some packages depend
+    // on a globally-installed version of node-gyp.
+    const globalBin = yield (0, (_global || _load_global()).getBinFolder)(config, {});
+    if (pathParts.indexOf(globalBin) === -1) {
+      pathParts.unshift(globalBin);
+    }
+
+    // Add node_modules .bin folders to the PATH
+    for (var _iterator3 = config.registryFolders, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
+      var _ref7;
+
+      if (_isArray3) {
+        if (_i3 >= _iterator3.length) break;
+        _ref7 = _iterator3[_i3++];
+      } else {
+        _i3 = _iterator3.next();
+        if (_i3.done) break;
+        _ref7 = _i3.value;
+      }
+
+      const registryFolder = _ref7;
+
+      const binFolder = path.join(registryFolder, '.bin');
+      if (config.workspacesEnabled && config.workspaceRootFolder) {
+        pathParts.unshift(path.join(config.workspaceRootFolder, binFolder));
+      }
+      pathParts.unshift(path.join(config.linkFolder, binFolder));
+      pathParts.unshift(path.join(cwd, binFolder));
+    }
+
+    let pnpFile;
+
+    if (process.versions.pnp) {
+      pnpFile = (_dynamicRequire || _load_dynamicRequire()).dynamicRequire.resolve('pnpapi');
+    } else {
+      const candidate = `${config.lockfileFolder}/${(_constants || _load_constants()).PNP_FILENAME}`;
+      if (yield (_fs || _load_fs()).exists(candidate)) {
+        pnpFile = candidate;
+      }
+    }
+
+    if (pnpFile) {
+      const pnpApi = (0, (_dynamicRequire || _load_dynamicRequire()).dynamicRequire)(pnpFile);
+
+      const packageLocator = pnpApi.findPackageLocator(`${cwd}/`);
+      const packageInformation = pnpApi.getPackageInformation(packageLocator);
+
+      for (var _iterator4 = packageInformation.packageDependencies.entries(), _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
+        var _ref9;
+
+        if (_isArray4) {
+          if (_i4 >= _iterator4.length) break;
+          _ref9 = _iterator4[_i4++];
+        } else {
+          _i4 = _iterator4.next();
+          if (_i4.done) break;
+          _ref9 = _i4.value;
+        }
+
+        const _ref8 = _ref9;
+        const name = _ref8[0];
+        const reference = _ref8[1];
+
+        const dependencyInformation = pnpApi.getPackageInformation({ name, reference });
+
+        if (!dependencyInformation || !dependencyInformation.packageLocation) {
+          continue;
+        }
+
+        const binFolder = `${dependencyInformation.packageLocation}/.bin`;
+        if (yield (_fs || _load_fs()).exists(binFolder)) {
+          pathParts.unshift(binFolder);
+        }
+      }
+
+      // Note that NODE_OPTIONS doesn't support any style of quoting its arguments at the moment
+      // For this reason, it won't work if the user has a space inside its $PATH
+      env.NODE_OPTIONS = env.NODE_OPTIONS || '';
+      env.NODE_OPTIONS = `--require ${pnpFile} ${env.NODE_OPTIONS}`;
+    }
+
+    pathParts.unshift((yield getWrappersFolder(config)));
+
+    // join path back together
+    env[(_constants || _load_constants()).ENV_PATH_KEY] = pathParts.join(path.delimiter);
+
+    return env;
+  });
+
+  return function makeEnv(_x2, _x3, _x4) {
+    return _ref2.apply(this, arguments);
+  };
+})();
+
+let executeLifecycleScript = exports.executeLifecycleScript = (() => {
+  var _ref10 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* ({
+    stage,
+    config,
+    cwd,
+    cmd,
+    isInteractive,
+    onProgress,
+    customShell
+  }) {
+    const env = yield makeEnv(stage, cwd, config);
+
+    yield checkForGypIfNeeded(config, cmd, env[(_constants || _load_constants()).ENV_PATH_KEY].split(path.delimiter));
+
+    if (process.platform === 'win32' && (!customShell || customShell === 'cmd')) {
+      // handle windows run scripts starting with a relative path
+      cmd = (0, (_fixCmdWinSlashes || _load_fixCmdWinSlashes()).fixCmdWinSlashes)(cmd);
+    }
+
+    // By default (non-interactive), pipe everything to the terminal and run child process detached
+    // as long as it's not Windows (since windows does not have /dev/tty)
+    let stdio = ['ignore', 'pipe', 'pipe'];
+    let detached = process.platform !== 'win32';
+
+    if (isInteractive) {
+      stdio = 'inherit';
+      detached = false;
+    }
+
+    const shell = customShell || true;
+    const stdout = yield (_child || _load_child()).spawn(cmd, [], { cwd, env, stdio, detached, shell }, onProgress);
+
+    return { cwd, command: cmd, stdout };
+  });
+
+  return function executeLifecycleScript(_x5) {
+    return _ref10.apply(this, arguments);
+  };
+})();
+
+let _checkForGyp = (() => {
+  var _ref11 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, paths) {
+    const reporter = config.reporter;
+
+    // Check every directory in the PATH
+
+    const allChecks = yield Promise.all(paths.map(function (dir) {
+      return (_fs || _load_fs()).exists(path.join(dir, 'node-gyp'));
+    }));
+    if (allChecks.some(Boolean)) {
+      // node-gyp is available somewhere
+      return;
+    }
+
+    reporter.info(reporter.lang('packageRequiresNodeGyp'));
+
+    try {
+      yield (0, (_global || _load_global()).run)(config, reporter, {}, ['add', 'node-gyp']);
+    } catch (e) {
+      throw new (_errors || _load_errors()).MessageError(reporter.lang('nodeGypAutoInstallFailed', e.message));
+    }
+  });
+
+  return function _checkForGyp(_x6, _x7) {
+    return _ref11.apply(this, arguments);
+  };
+})();
+
+let execFromManifest = exports.execFromManifest = (() => {
+  var _ref12 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, commandName, cwd) {
+    const pkg = yield config.maybeReadManifest(cwd);
+    if (!pkg || !pkg.scripts) {
+      return;
+    }
+
+    const cmd = pkg.scripts[commandName];
+    if (cmd) {
+      yield execCommand({ stage: commandName, config, cmd, cwd, isInteractive: true });
+    }
+  });
+
+  return function execFromManifest(_x8, _x9, _x10) {
+    return _ref12.apply(this, arguments);
+  };
+})();
+
+let execCommand = exports.execCommand = (() => {
+  var _ref13 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* ({
+    stage,
+    config,
+    cmd,
+    cwd,
+    isInteractive,
+    customShell
+  }) {
+    const reporter = config.reporter;
+
+    try {
+      reporter.command(cmd);
+      yield executeLifecycleScript({ stage, config, cwd, cmd, isInteractive, customShell });
+      return Promise.resolve();
+    } catch (err) {
+      if (err instanceof (_errors || _load_errors()).ProcessTermError) {
+        const formattedError = new (_errors || _load_errors()).ProcessTermError(err.EXIT_SIGNAL ? reporter.lang('commandFailedWithSignal', err.EXIT_SIGNAL) : reporter.lang('commandFailedWithCode', err.EXIT_CODE));
+        formattedError.EXIT_CODE = err.EXIT_CODE;
+        formattedError.EXIT_SIGNAL = err.EXIT_SIGNAL;
+        throw formattedError;
+      } else {
+        throw err;
+      }
+    }
+  });
+
+  return function execCommand(_x11) {
+    return _ref13.apply(this, arguments);
+  };
+})();
+
+var _errors;
+
+function _load_errors() {
+  return _errors = __webpack_require__(6);
+}
+
+var _constants;
+
+function _load_constants() {
+  return _constants = _interopRequireWildcard(__webpack_require__(8));
+}
+
+var _child;
+
+function _load_child() {
+  return _child = _interopRequireWildcard(__webpack_require__(58));
+}
+
+var _fs;
+
+function _load_fs() {
+  return _fs = _interopRequireWildcard(__webpack_require__(4));
+}
+
+var _dynamicRequire;
+
+function _load_dynamicRequire() {
+  return _dynamicRequire = __webpack_require__(371);
+}
+
+var _portableScript;
+
+function _load_portableScript() {
+  return _portableScript = __webpack_require__(589);
+}
+
+var _fixCmdWinSlashes;
+
+function _load_fixCmdWinSlashes() {
+  return _fixCmdWinSlashes = __webpack_require__(578);
+}
+
+var _global;
+
+function _load_global() {
+  return _global = __webpack_require__(121);
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const path = __webpack_require__(0);
+
+const IGNORE_MANIFEST_KEYS = exports.IGNORE_MANIFEST_KEYS = new Set(['readme', 'notice', 'licenseText', 'activationEvents', 'contributes']);
+
+// We treat these configs as internal, thus not expose them to process.env.
+// This helps us avoid some gyp issues when building native modules.
+// See https://github.com/yarnpkg/yarn/issues/2286.
+const IGNORE_CONFIG_KEYS = ['lastUpdateCheck'];
+
+let wrappersFolder = null;
+
+const INVALID_CHAR_REGEX = /\W/g;
+
+exports.default = executeLifecycleScript;
+
+
+let checkGypPromise = null;
+/**
+ * Special case: Some packages depend on node-gyp, but don't specify this in
+ * their package.json dependencies. They assume that node-gyp is available
+ * globally. We need to detect this case and show an error message.
+ */
+function checkForGypIfNeeded(config, cmd, paths) {
+  if (cmd.substr(0, cmd.indexOf(' ')) !== 'node-gyp') {
+    return Promise.resolve();
+  }
+
+  // Ensure this only runs once, rather than multiple times in parallel.
+  if (!checkGypPromise) {
+    checkGypPromise = _checkForGyp(config, paths);
+  }
+  return checkGypPromise;
+}
+
+/***/ }),
+/* 112 */
+/***/ (function(module, exports) {
+
+module.exports = function (exec) {
+  try {
+    return !!exec();
+  } catch (e) {
+    return true;
+  }
+};
+
+
+/***/ }),
+/* 113 */
+/***/ (function(module, exports) {
+
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+// NOTE: These type checking functions intentionally don't use `instanceof`
+// because it is fragile and can be easily faked with `Object.create()`.
+
+function isArray(arg) {
+  if (Array.isArray) {
+    return Array.isArray(arg);
+  }
+  return objectToString(arg) === '[object Array]';
+}
+exports.isArray = isArray;
+
+function isBoolean(arg) {
+  return typeof arg === 'boolean';
+}
+exports.isBoolean = isBoolean;
+
+function isNull(arg) {
+  return arg === null;
+}
+exports.isNull = isNull;
+
+function isNullOrUndefined(arg) {
+  return arg == null;
+}
+exports.isNullOrUndefined = isNullOrUndefined;
+
+function isNumber(arg) {
+  return typeof arg === 'number';
+}
+exports.isNumber = isNumber;
+
+function isString(arg) {
+  return typeof arg === 'string';
+}
+exports.isString = isString;
+
+function isSymbol(arg) {
+  return typeof arg === 'symbol';
+}
+exports.isSymbol = isSymbol;
+
+function isUndefined(arg) {
+  return arg === void 0;
+}
+exports.isUndefined = isUndefined;
+
+function isRegExp(re) {
+  return objectToString(re) === '[object RegExp]';
+}
+exports.isRegExp = isRegExp;
+
+function isObject(arg) {
+  return typeof arg === 'object' && arg !== null;
+}
+exports.isObject = isObject;
+
+function isDate(d) {
+  return objectToString(d) === '[object Date]';
+}
+exports.isDate = isDate;
+
+function isError(e) {
+  return (objectToString(e) === '[object Error]' || e instanceof Error);
+}
+exports.isError = isError;
+
+function isFunction(arg) {
+  return typeof arg === 'function';
+}
+exports.isFunction = isFunction;
+
+function isPrimitive(arg) {
+  return arg === null ||
+         typeof arg === 'boolean' ||
+         typeof arg === 'number' ||
+         typeof arg === 'string' ||
+         typeof arg === 'symbol' ||  // ES6 symbol
+         typeof arg === 'undefined';
+}
+exports.isPrimitive = isPrimitive;
+
+exports.isBuffer = Buffer.isBuffer;
+
+function objectToString(o) {
+  return Object.prototype.toString.call(o);
+}
+
+
+/***/ }),
+/* 114 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*!
+ * micromatch <https://github.com/jonschlinkert/micromatch>
+ *
+ * Copyright (c) 2014-2015, Jon Schlinkert.
+ * Licensed under the MIT License.
+ */
+
+
+
+var expand = __webpack_require__(753);
+var utils = __webpack_require__(300);
+
+/**
+ * The main function. Pass an array of filepaths,
+ * and a string or array of glob patterns
+ *
+ * @param  {Array|String} `files`
+ * @param  {Array|String} `patterns`
+ * @param  {Object} `opts`
+ * @return {Array} Array of matches
+ */
+
+function micromatch(files, patterns, opts) {
+  if (!files || !patterns) return [];
+  opts = opts || {};
+
+  if (typeof opts.cache === 'undefined') {
+    opts.cache = true;
+  }
+
+  if (!Array.isArray(patterns)) {
+    return match(files, patterns, opts);
+  }
+
+  var len = patterns.length, i = 0;
+  var omit = [], keep = [];
+
+  while (len--) {
+    var glob = patterns[i++];
+    if (typeof glob === 'string' && glob.charCodeAt(0) === 33 /* ! */) {
+      omit.push.apply(omit, match(files, glob.slice(1), opts));
+    } else {
+      keep.push.apply(keep, match(files, glob, opts));
+    }
+  }
+  return utils.diff(keep, omit);
+}
+
+/**
+ * Return an array of files that match the given glob pattern.
+ *
+ * This function is called by the main `micromatch` function If you only
+ * need to pass a single pattern you might get very minor speed improvements
+ * using this function.
+ *
+ * @param  {Array} `files`
+ * @param  {String} `pattern`
+ * @param  {Object} `options`
+ * @return {Array}
+ */
+
+function match(files, pattern, opts) {
+  if (utils.typeOf(files) !== 'string' && !Array.isArray(files)) {
+    throw new Error(msg('match', 'files', 'a string or array'));
+  }
+
+  files = utils.arrayify(files);
+  opts = opts || {};
+
+  var negate = opts.negate || false;
+  var orig = pattern;
+
+  if (typeof pattern === 'string') {
+    negate = pattern.charAt(0) === '!';
+    if (negate) {
+      pattern = pattern.slice(1);
+    }
+
+    // we need to remove the character regardless,
+    // so the above logic is still needed
+    if (opts.nonegate === true) {
+      negate = false;
+    }
+  }
+
+  var _isMatch = matcher(pattern, opts);
+  var len = files.length, i = 0;
+  var res = [];
+
+  while (i < len) {
+    var file = files[i++];
+    var fp = utils.unixify(file, opts);
+
+    if (!_isMatch(fp)) { continue; }
+    res.push(fp);
+  }
+
+  if (res.length === 0) {
+    if (opts.failglob === true) {
+      throw new Error('micromatch.match() found no matches for: "' + orig + '".');
+    }
+
+    if (opts.nonull || opts.nullglob) {
+      res.push(utils.unescapeGlob(orig));
+    }
+  }
+
+  // if `negate` was defined, diff negated files
+  if (negate) { res = utils.diff(files, res); }
+
+  // if `ignore` was defined, diff ignored filed
+  if (opts.ignore && opts.ignore.length) {
+    pattern = opts.ignore;
+    opts = utils.omit(opts, ['ignore']);
+    res = utils.diff(res, micromatch(res, pattern, opts));
+  }
+
+  if (opts.nodupes) {
+    return utils.unique(res);
+  }
+  return res;
+}
+
+/**
+ * Returns a function that takes a glob pattern or array of glob patterns
+ * to be used with `Array#filter()`. (Internally this function generates
+ * the matching function using the [matcher] method).
+ *
+ * ```js
+ * var fn = mm.filter('[a-c]');
+ * ['a', 'b', 'c', 'd', 'e'].filter(fn);
+ * //=> ['a', 'b', 'c']
+ * ```
+ * @param  {String|Array} `patterns` Can be a glob or array of globs.
+ * @param  {Options} `opts` Options to pass to the [matcher] method.
+ * @return {Function} Filter function to be passed to `Array#filter()`.
+ */
+
+function filter(patterns, opts) {
+  if (!Array.isArray(patterns) && typeof patterns !== 'string') {
+    throw new TypeError(msg('filter', 'patterns', 'a string or array'));
+  }
+
+  patterns = utils.arrayify(patterns);
+  var len = patterns.length, i = 0;
+  var patternMatchers = Array(len);
+  while (i < len) {
+    patternMatchers[i] = matcher(patterns[i++], opts);
+  }
+
+  return function(fp) {
+    if (fp == null) return [];
+    var len = patternMatchers.length, i = 0;
+    var res = true;
+
+    fp = utils.unixify(fp, opts);
+    while (i < len) {
+      var fn = patternMatchers[i++];
+      if (!fn(fp)) {
+        res = false;
+        break;
+      }
+    }
+    return res;
+  };
+}
+
+/**
+ * Returns true if the filepath contains the given
+ * pattern. Can also return a function for matching.
+ *
+ * ```js
+ * isMatch('foo.md', '*.md', {});
+ * //=> true
+ *
+ * isMatch('*.md', {})('foo.md')
+ * //=> true
+ * ```
+ * @param  {String} `fp`
+ * @param  {String} `pattern`
+ * @param  {Object} `opts`
+ * @return {Boolean}
+ */
+
+function isMatch(fp, pattern, opts) {
+  if (typeof fp !== 'string') {
+    throw new TypeError(msg('isMatch', 'filepath', 'a string'));
+  }
+
+  fp = utils.unixify(fp, opts);
+  if (utils.typeOf(pattern) === 'object') {
+    return matcher(fp, pattern);
+  }
+  return matcher(pattern, opts)(fp);
+}
+
+/**
+ * Returns true if the filepath matches the
+ * given pattern.
+ */
+
+function contains(fp, pattern, opts) {
+  if (typeof fp !== 'string') {
+    throw new TypeError(msg('contains', 'pattern', 'a string'));
+  }
+
+  opts = opts || {};
+  opts.contains = (pattern !== '');
+  fp = utils.unixify(fp, opts);
+
+  if (opts.contains && !utils.isGlob(pattern)) {
+    return fp.indexOf(pattern) !== -1;
+  }
+  return matcher(pattern, opts)(fp);
+}
+
+/**
+ * Returns true if a file path matches any of the
+ * given patterns.
+ *
+ * @param  {String} `fp` The filepath to test.
+ * @param  {String|Array} `patterns` Glob patterns to use.
+ * @param  {Object} `opts` Options to pass to the `matcher()` function.
+ * @return {String}
+ */
+
+function any(fp, patterns, opts) {
+  if (!Array.isArray(patterns) && typeof patterns !== 'string') {
+    throw new TypeError(msg('any', 'patterns', 'a string or array'));
+  }
+
+  patterns = utils.arrayify(patterns);
+  var len = patterns.length;
+
+  fp = utils.unixify(fp, opts);
+  while (len--) {
+    var isMatch = matcher(patterns[len], opts);
+    if (isMatch(fp)) {
+      return true;
+    }
+  }
+  return false;
+}
+
+/**
+ * Filter the keys of an object with the given `glob` pattern
+ * and `options`
+ *
+ * @param  {Object} `object`
+ * @param  {Pattern} `object`
+ * @return {Array}
+ */
+
+function matchKeys(obj, glob, options) {
+  if (utils.typeOf(obj) !== 'object') {
+    throw new TypeError(msg('matchKeys', 'first argument', 'an object'));
+  }
+
+  var fn = matcher(glob, options);
+  var res = {};
+
+  for (var key in obj) {
+    if (obj.hasOwnProperty(key) && fn(key)) {
+      res[key] = obj[key];
+    }
+  }
+  return res;
+}
+
+/**
+ * Return a function for matching based on the
+ * given `pattern` and `options`.
+ *
+ * @param  {String} `pattern`
+ * @param  {Object} `options`
+ * @return {Function}
+ */
+
+function matcher(pattern, opts) {
+  // pattern is a function
+  if (typeof pattern === 'function') {
+    return pattern;
+  }
+  // pattern is a regex
+  if (pattern instanceof RegExp) {
+    return function(fp) {
+      return pattern.test(fp);
+    };
+  }
+
+  if (typeof pattern !== 'string') {
+    throw new TypeError(msg('matcher', 'pattern', 'a string, regex, or function'));
+  }
+
+  // strings, all the way down...
+  pattern = utils.unixify(pattern, opts);
+
+  // pattern is a non-glob string
+  if (!utils.isGlob(pattern)) {
+    return utils.matchPath(pattern, opts);
+  }
+  // pattern is a glob string
+  var re = makeRe(pattern, opts);
+
+  // `matchBase` is defined
+  if (opts && opts.matchBase) {
+    return utils.hasFilename(re, opts);
+  }
+  // `matchBase` is not defined
+  return function(fp) {
+    fp = utils.unixify(fp, opts);
+    return re.test(fp);
+  };
+}
+
+/**
+ * Create and cache a regular expression for matching
+ * file paths.
+ *
+ * If the leading character in the `glob` is `!`, a negation
+ * regex is returned.
+ *
+ * @param  {String} `glob`
+ * @param  {Object} `options`
+ * @return {RegExp}
+ */
+
+function toRegex(glob, options) {
+  // clone options to prevent  mutating the original object
+  var opts = Object.create(options || {});
+  var flags = opts.flags || '';
+  if (opts.nocase && flags.indexOf('i') === -1) {
+    flags += 'i';
+  }
+
+  var parsed = expand(glob, opts);
+
+  // pass in tokens to avoid parsing more than once
+  opts.negated = opts.negated || parsed.negated;
+  opts.negate = opts.negated;
+  glob = wrapGlob(parsed.pattern, opts);
+  var re;
+
+  try {
+    re = new RegExp(glob, flags);
+    return re;
+  } catch (err) {
+    err.reason = 'micromatch invalid regex: (' + re + ')';
+    if (opts.strict) throw new SyntaxError(err);
+  }
+
+  // we're only here if a bad pattern was used and the user
+  // passed `options.silent`, so match nothing
+  return /$^/;
+}
+
+/**
+ * Create the regex to do the matching. If the leading
+ * character in the `glob` is `!` a negation regex is returned.
+ *
+ * @param {String} `glob`
+ * @param {Boolean} `negate`
+ */
+
+function wrapGlob(glob, opts) {
+  var prefix = (opts && !opts.contains) ? '^' : '';
+  var after = (opts && !opts.contains) ? '$' : '';
+  glob = ('(?:' + glob + ')' + after);
+  if (opts && opts.negate) {
+    return prefix + ('(?!^' + glob + ').*$');
+  }
+  return prefix + glob;
+}
+
+/**
+ * Create and cache a regular expression for matching file paths.
+ * If the leading character in the `glob` is `!`, a negation
+ * regex is returned.
+ *
+ * @param  {String} `glob`
+ * @param  {Object} `options`
+ * @return {RegExp}
+ */
+
+function makeRe(glob, opts) {
+  if (utils.typeOf(glob) !== 'string') {
+    throw new Error(msg('makeRe', 'glob', 'a string'));
+  }
+  return utils.cache(toRegex, glob, opts);
+}
+
+/**
+ * Make error messages consistent. Follows this format:
+ *
+ * ```js
+ * msg(methodName, argNumber, nativeType);
+ * // example:
+ * msg('matchKeys', 'first', 'an object');
+ * ```
+ *
+ * @param  {String} `method`
+ * @param  {String} `num`
+ * @param  {String} `type`
+ * @return {String}
+ */
+
+function msg(method, what, type) {
+  return 'micromatch.' + method + '(): ' + what + ' should be ' + type + '.';
+}
+
+/**
+ * Public methods
+ */
+
+/* eslint no-multi-spaces: 0 */
+micromatch.any       = any;
+micromatch.braces    = micromatch.braceExpand = utils.braces;
+micromatch.contains  = contains;
+micromatch.expand    = expand;
+micromatch.filter    = filter;
+micromatch.isMatch   = isMatch;
+micromatch.makeRe    = makeRe;
+micromatch.match     = match;
+micromatch.matcher   = matcher;
+micromatch.matchKeys = matchKeys;
+
+/**
+ * Expose `micromatch`
+ */
+
+module.exports = micromatch;
+
+
+/***/ }),
+/* 115 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+// a duplex stream is just a stream that is both readable and writable.
+// Since JS doesn't have multiple prototypal inheritance, this class
+// prototypally inherits from Readable, and then parasitically from
+// Writable.
+
+
+
+/*<replacement>*/
+
+var pna = __webpack_require__(180);
+/*</replacement>*/
+
+/*<replacement>*/
+var objectKeys = Object.keys || function (obj) {
+  var keys = [];
+  for (var key in obj) {
+    keys.push(key);
+  }return keys;
+};
+/*</replacement>*/
+
+module.exports = Duplex;
+
+/*<replacement>*/
+var util = __webpack_require__(113);
+util.inherits = __webpack_require__(61);
+/*</replacement>*/
+
+var Readable = __webpack_require__(406);
+var Writable = __webpack_require__(408);
+
+util.inherits(Duplex, Readable);
+
+{
+  // avoid scope creep, the keys array can then be collected
+  var keys = objectKeys(Writable.prototype);
+  for (var v = 0; v < keys.length; v++) {
+    var method = keys[v];
+    if (!Duplex.prototype[method]) Duplex.prototype[method] = Writable.prototype[method];
+  }
+}
+
+function Duplex(options) {
+  if (!(this instanceof Duplex)) return new Duplex(options);
+
+  Readable.call(this, options);
+  Writable.call(this, options);
+
+  if (options && options.readable === false) this.readable = false;
+
+  if (options && options.writable === false) this.writable = false;
+
+  this.allowHalfOpen = true;
+  if (options && options.allowHalfOpen === false) this.allowHalfOpen = false;
+
+  this.once('end', onend);
+}
+
+Object.defineProperty(Duplex.prototype, 'writableHighWaterMark', {
+  // making it explicit this property is not enumerable
+  // because otherwise some prototype manipulation in
+  // userland will fail
+  enumerable: false,
+  get: function () {
+    return this._writableState.highWaterMark;
+  }
+});
+
+// the no-half-open enforcer
+function onend() {
+  // if we allow half-open state, or if the writable side ended,
+  // then we're ok.
+  if (this.allowHalfOpen || this._writableState.ended) return;
+
+  // no more data can be written.
+  // But allow more writes to happen in this tick.
+  pna.nextTick(onEndNT, this);
+}
+
+function onEndNT(self) {
+  self.end();
+}
+
+Object.defineProperty(Duplex.prototype, 'destroyed', {
+  get: function () {
+    if (this._readableState === undefined || this._writableState === undefined) {
+      return false;
+    }
+    return this._readableState.destroyed && this._writableState.destroyed;
+  },
+  set: function (value) {
+    // we ignore the value if the stream
+    // has not been initialized yet
+    if (this._readableState === undefined || this._writableState === undefined) {
+      return;
+    }
+
+    // backward compatibility, the user is explicitly
+    // managing destroyed
+    this._readableState.destroyed = value;
+    this._writableState.destroyed = value;
+  }
+});
+
+Duplex.prototype._destroy = function (err, cb) {
+  this.push(null);
+  this.end();
+
+  pna.nextTick(cb, err);
+};
+
+/***/ }),
+/* 116 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = multicast;
+/* unused harmony export MulticastOperator */
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__observable_ConnectableObservable__ = __webpack_require__(423);
+/** PURE_IMPORTS_START _observable_ConnectableObservable PURE_IMPORTS_END */
+
+function multicast(subjectOrSubjectFactory, selector) {
+    return function multicastOperatorFunction(source) {
+        var subjectFactory;
+        if (typeof subjectOrSubjectFactory === 'function') {
+            subjectFactory = subjectOrSubjectFactory;
+        }
+        else {
+            subjectFactory = function subjectFactory() {
+                return subjectOrSubjectFactory;
+            };
+        }
+        if (typeof selector === 'function') {
+            return source.lift(new MulticastOperator(subjectFactory, selector));
+        }
+        var connectable = Object.create(source, __WEBPACK_IMPORTED_MODULE_0__observable_ConnectableObservable__["b" /* connectableObservableDescriptor */]);
+        connectable.source = source;
+        connectable.subjectFactory = subjectFactory;
+        return connectable;
+    };
+}
+var MulticastOperator = /*@__PURE__*/ (function () {
+    function MulticastOperator(subjectFactory, selector) {
+        this.subjectFactory = subjectFactory;
+        this.selector = selector;
+    }
+    MulticastOperator.prototype.call = function (subscriber, source) {
+        var selector = this.selector;
+        var subject = this.subjectFactory();
+        var subscription = selector(subject).subscribe(subscriber);
+        subscription.add(source.subscribe(subject));
+        return subscription;
+    };
+    return MulticastOperator;
+}());
+
+//# sourceMappingURL=multicast.js.map
+
+
+/***/ }),
+/* 117 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return observable; });
+/** PURE_IMPORTS_START  PURE_IMPORTS_END */
+var observable = typeof Symbol === 'function' && Symbol.observable || '@@observable';
+//# sourceMappingURL=observable.js.map
+
+
+/***/ }),
+/* 118 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = identity;
+/** PURE_IMPORTS_START  PURE_IMPORTS_END */
+function identity(x) {
+    return x;
+}
+//# sourceMappingURL=identity.js.map
+
+
+/***/ }),
+/* 119 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var v1 = __webpack_require__(957);
+var v4 = __webpack_require__(958);
+
+var uuid = v4;
+uuid.v1 = v1;
+uuid.v4 = v4;
+
+module.exports = uuid;
+
+
+/***/ }),
+/* 120 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getInstallationMethod = exports.version = undefined;
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+let getInstallationMethod = exports.getInstallationMethod = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+    let installationMethod = originalInstallationMethod;
+
+    // If there's a package.json in the parent directory, it could have an
+    // override for the installation method, so we should prefer that over
+    // whatever was originally in Yarn's package.json. This is the case with
+    // systems such as Homebrew, which take the tarball and modify the
+    // installation method so we're aware of the fact that Yarn was installed via
+    // Homebrew (so things like update notifications can point out the correct
+    // command to upgrade).
+    try {
+      const manifestPath = (_path || _load_path()).default.join(__dirname, '..', 'package.json');
+      if ((_fs2 || _load_fs2()).default.existsSync(manifestPath)) {
+        // non-async version is deprecated
+        const manifest = yield (0, (_fs || _load_fs()).readJson)(manifestPath);
+        if (manifest.installationMethod) {
+          installationMethod = manifest.installationMethod;
+        }
+      }
+    } catch (e) {
+      // Ignore any errors; this is not critical functionality.
+    }
+    return installationMethod;
+  });
+
+  return function getInstallationMethod() {
+    return _ref.apply(this, arguments);
+  };
+})();
+
+var _fs;
+
+function _load_fs() {
+  return _fs = __webpack_require__(4);
+}
+
+var _fs2;
+
+function _load_fs2() {
+  return _fs2 = _interopRequireDefault(__webpack_require__(5));
+}
+
+var _path;
+
+function _load_path() {
+  return _path = _interopRequireDefault(__webpack_require__(0));
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+// This will be bundled directly in the .js file for production builds
+var _require = __webpack_require__(194); /**
+                                               * Determines the current version of Yarn itself.
+                                               * 
+                                               */
+
+const version = _require.version,
+      originalInstallationMethod = _require.installationMethod;
+exports.version = version;
+
+/***/ }),
+/* 121 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.run = exports.getBinFolder = undefined;
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+let updateCwd = (() => {
+  var _ref2 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config) {
+    yield (_fs || _load_fs()).mkdirp(config.globalFolder);
+
+    yield config.init({
+      cwd: config.globalFolder,
+      offline: config.offline,
+      binLinks: true,
+      globalFolder: config.globalFolder,
+      cacheFolder: config._cacheRootFolder,
+      linkFolder: config.linkFolder,
+      enableDefaultRc: config.enableDefaultRc,
+      extraneousYarnrcFiles: config.extraneousYarnrcFiles
+    });
+  });
+
+  return function updateCwd(_x) {
+    return _ref2.apply(this, arguments);
+  };
+})();
+
+let getBins = (() => {
+  var _ref3 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config) {
+    // build up list of registry folders to search for binaries
+    const dirs = [];
+    for (var _iterator2 = Object.keys((_index || _load_index()).registries), _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+      var _ref4;
+
+      if (_isArray2) {
+        if (_i2 >= _iterator2.length) break;
+        _ref4 = _iterator2[_i2++];
+      } else {
+        _i2 = _iterator2.next();
+        if (_i2.done) break;
+        _ref4 = _i2.value;
+      }
+
+      const registryName = _ref4;
+
+      const registry = config.registries[registryName];
+      dirs.push(registry.loc);
+    }
+
+    // build up list of binary files
+    const paths = new Set();
+    for (var _iterator3 = dirs, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
+      var _ref5;
+
+      if (_isArray3) {
+        if (_i3 >= _iterator3.length) break;
+        _ref5 = _iterator3[_i3++];
+      } else {
+        _i3 = _iterator3.next();
+        if (_i3.done) break;
+        _ref5 = _i3.value;
+      }
+
+      const dir = _ref5;
+
+      const binDir = path.join(dir, '.bin');
+      if (!(yield (_fs || _load_fs()).exists(binDir))) {
+        continue;
+      }
+
+      for (var _iterator4 = yield (_fs || _load_fs()).readdir(binDir), _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
+        var _ref6;
+
+        if (_isArray4) {
+          if (_i4 >= _iterator4.length) break;
+          _ref6 = _iterator4[_i4++];
+        } else {
+          _i4 = _iterator4.next();
+          if (_i4.done) break;
+          _ref6 = _i4.value;
+        }
+
+        const name = _ref6;
+
+        paths.add(path.join(binDir, name));
+      }
+    }
+    return paths;
+  });
+
+  return function getBins(_x2) {
+    return _ref3.apply(this, arguments);
+  };
+})();
+
+let getGlobalPrefix = (() => {
+  var _ref7 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, flags) {
+    if (flags.prefix) {
+      return flags.prefix;
+    } else if (config.getOption('prefix', true)) {
+      return String(config.getOption('prefix', true));
+    } else if (process.env.PREFIX) {
+      return process.env.PREFIX;
+    }
+
+    const potentialPrefixFolders = [(_constants || _load_constants()).FALLBACK_GLOBAL_PREFIX];
+    if (process.platform === 'win32') {
+      // %LOCALAPPDATA%\Yarn --> C:\Users\Alice\AppData\Local\Yarn
+      if (process.env.LOCALAPPDATA) {
+        potentialPrefixFolders.unshift(path.join(process.env.LOCALAPPDATA, 'Yarn'));
+      }
+    } else {
+      potentialPrefixFolders.unshift((_constants || _load_constants()).POSIX_GLOBAL_PREFIX);
+    }
+
+    const binFolders = potentialPrefixFolders.map(function (prefix) {
+      return path.join(prefix, 'bin');
+    });
+    const prefixFolderQueryResult = yield (_fs || _load_fs()).getFirstSuitableFolder(binFolders);
+    const prefix = prefixFolderQueryResult.folder && path.dirname(prefixFolderQueryResult.folder);
+
+    if (!prefix) {
+      config.reporter.warn(config.reporter.lang('noGlobalFolder', prefixFolderQueryResult.skipped.map(function (item) {
+        return path.dirname(item.folder);
+      }).join(', ')));
+
+      return (_constants || _load_constants()).FALLBACK_GLOBAL_PREFIX;
+    }
+
+    return prefix;
+  });
+
+  return function getGlobalPrefix(_x3, _x4) {
+    return _ref7.apply(this, arguments);
+  };
+})();
+
+let getBinFolder = exports.getBinFolder = (() => {
+  var _ref8 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, flags) {
+    const prefix = yield getGlobalPrefix(config, flags);
+    return path.resolve(prefix, 'bin');
+  });
+
+  return function getBinFolder(_x5, _x6) {
+    return _ref8.apply(this, arguments);
+  };
+})();
+
+let initUpdateBins = (() => {
+  var _ref9 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags) {
+    const beforeBins = yield getBins(config);
+    const binFolder = yield getBinFolder(config, flags);
+
+    function throwPermError(err, dest) {
+      if (err.code === 'EACCES') {
+        throw new (_errors || _load_errors()).MessageError(reporter.lang('noPermission', dest));
+      } else {
+        throw err;
+      }
+    }
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      try {
+        yield (_fs || _load_fs()).mkdirp(binFolder);
+      } catch (err) {
+        throwPermError(err, binFolder);
+      }
+
+      const afterBins = yield getBins(config);
+
+      // remove old bins
+      for (var _iterator5 = beforeBins, _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
+        var _ref11;
+
+        if (_isArray5) {
+          if (_i5 >= _iterator5.length) break;
+          _ref11 = _iterator5[_i5++];
+        } else {
+          _i5 = _iterator5.next();
+          if (_i5.done) break;
+          _ref11 = _i5.value;
+        }
+
+        const src = _ref11;
+
+        if (afterBins.has(src)) {
+          // not old
+          continue;
+        }
+
+        // remove old bin
+        const dest = path.join(binFolder, path.basename(src));
+        try {
+          yield (_fs || _load_fs()).unlink(dest);
+        } catch (err) {
+          throwPermError(err, dest);
+        }
+      }
+
+      // add new bins
+      for (var _iterator6 = afterBins, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) {
+        var _ref12;
+
+        if (_isArray6) {
+          if (_i6 >= _iterator6.length) break;
+          _ref12 = _iterator6[_i6++];
+        } else {
+          _i6 = _iterator6.next();
+          if (_i6.done) break;
+          _ref12 = _i6.value;
+        }
+
+        const src = _ref12;
+
+        // insert new bin
+        const dest = path.join(binFolder, path.basename(src));
+        try {
+          yield (_fs || _load_fs()).unlink(dest);
+          yield (0, (_packageLinker || _load_packageLinker()).linkBin)(src, dest);
+          if (process.platform === 'win32' && dest.indexOf('.cmd') !== -1) {
+            yield (_fs || _load_fs()).rename(dest + '.cmd', dest);
+          }
+        } catch (err) {
+          throwPermError(err, dest);
+        }
+      }
+    });
+  });
+
+  return function initUpdateBins(_x7, _x8, _x9) {
+    return _ref9.apply(this, arguments);
+  };
+})();
+
+let list = (() => {
+  var _ref13 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
+    yield updateCwd(config);
+
+    // install so we get hard file paths
+    const lockfile = yield (_lockfile || _load_lockfile()).default.fromDirectory(config.cwd);
+    const install = new (_install || _load_install()).Install({}, config, new (_baseReporter || _load_baseReporter()).default(), lockfile);
+    const patterns = yield install.getFlattenedDeps();
+
+    // dump global modules
+    for (var _iterator7 = patterns, _isArray7 = Array.isArray(_iterator7), _i7 = 0, _iterator7 = _isArray7 ? _iterator7 : _iterator7[Symbol.iterator]();;) {
+      var _ref14;
+
+      if (_isArray7) {
+        if (_i7 >= _iterator7.length) break;
+        _ref14 = _iterator7[_i7++];
+      } else {
+        _i7 = _iterator7.next();
+        if (_i7.done) break;
+        _ref14 = _i7.value;
+      }
+
+      const pattern = _ref14;
+
+      const manifest = install.resolver.getStrictResolvedPattern(pattern);
+      ls(manifest, reporter, false);
+    }
+  });
+
+  return function list(_x10, _x11, _x12, _x13) {
+    return _ref13.apply(this, arguments);
+  };
+})();
+
+exports.hasWrapper = hasWrapper;
+exports.setFlags = setFlags;
+
+var _errors;
+
+function _load_errors() {
+  return _errors = __webpack_require__(6);
+}
+
+var _index;
+
+function _load_index() {
+  return _index = __webpack_require__(57);
+}
+
+var _baseReporter;
+
+function _load_baseReporter() {
+  return _baseReporter = _interopRequireDefault(__webpack_require__(108));
+}
+
+var _buildSubCommands2;
+
+function _load_buildSubCommands() {
+  return _buildSubCommands2 = _interopRequireDefault(__webpack_require__(59));
+}
+
+var _lockfile;
+
+function _load_lockfile() {
+  return _lockfile = _interopRequireDefault(__webpack_require__(19));
+}
+
+var _install;
+
+function _load_install() {
+  return _install = __webpack_require__(34);
+}
+
+var _add;
+
+function _load_add() {
+  return _add = __webpack_require__(165);
+}
+
+var _remove;
+
+function _load_remove() {
+  return _remove = __webpack_require__(359);
+}
+
+var _upgrade;
+
+function _load_upgrade() {
+  return _upgrade = __webpack_require__(207);
+}
+
+var _upgradeInteractive;
+
+function _load_upgradeInteractive() {
+  return _upgradeInteractive = __webpack_require__(362);
+}
+
+var _packageLinker;
+
+function _load_packageLinker() {
+  return _packageLinker = __webpack_require__(211);
+}
+
+var _constants;
+
+function _load_constants() {
+  return _constants = __webpack_require__(8);
+}
+
+var _fs;
+
+function _load_fs() {
+  return _fs = _interopRequireWildcard(__webpack_require__(4));
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+class GlobalAdd extends (_add || _load_add()).Add {
+  constructor(args, flags, config, reporter, lockfile) {
+    super(args, flags, config, reporter, lockfile);
+
+    this.linker.setTopLevelBinLinking(false);
+  }
+
+  maybeOutputSaveTree() {
+    for (var _iterator = this.addedPatterns, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+      var _ref;
+
+      if (_isArray) {
+        if (_i >= _iterator.length) break;
+        _ref = _iterator[_i++];
+      } else {
+        _i = _iterator.next();
+        if (_i.done) break;
+        _ref = _i.value;
+      }
+
+      const pattern = _ref;
+
+      const manifest = this.resolver.getStrictResolvedPattern(pattern);
+      ls(manifest, this.reporter, true);
+    }
+    return Promise.resolve();
+  }
+
+  _logSuccessSaveLockfile() {
+    // noop
+  }
+}
+
+const path = __webpack_require__(0);
+
+function hasWrapper(flags, args) {
+  return args[0] !== 'bin' && args[0] !== 'dir';
+}
+
+function ls(manifest, reporter, saved) {
+  const bins = manifest.bin ? Object.keys(manifest.bin) : [];
+  const human = `${manifest.name}@${manifest.version}`;
+  if (bins.length) {
+    if (saved) {
+      reporter.success(reporter.lang('packageInstalledWithBinaries', human));
+    } else {
+      reporter.info(reporter.lang('packageHasBinaries', human));
+    }
+    reporter.list(`bins-${manifest.name}`, bins);
+  } else if (saved) {
+    reporter.warn(reporter.lang('packageHasNoBinaries', human));
+  }
+}
+
+var _buildSubCommands = (0, (_buildSubCommands2 || _load_buildSubCommands()).default)('global', {
+  add(config, reporter, flags, args) {
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      yield updateCwd(config);
+
+      const updateBins = yield initUpdateBins(config, reporter, flags);
+      if (args.indexOf('yarn') !== -1) {
+        reporter.warn(reporter.lang('packageContainsYarnAsGlobal'));
+      }
+
+      // install module
+      const lockfile = yield (_lockfile || _load_lockfile()).default.fromDirectory(config.cwd);
+      const install = new GlobalAdd(args, flags, config, reporter, lockfile);
+      yield install.init();
+
+      // link binaries
+      yield updateBins();
+    })();
+  },
+
+  bin(config, reporter, flags, args) {
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      reporter.log((yield getBinFolder(config, flags)), { force: true });
+    })();
+  },
+
+  dir(config, reporter, flags, args) {
+    reporter.log(config.globalFolder, { force: true });
+    return Promise.resolve();
+  },
+
+  ls(config, reporter, flags, args) {
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      reporter.warn(`\`yarn global ls\` is deprecated. Please use \`yarn global list\`.`);
+      yield list(config, reporter, flags, args);
+    })();
+  },
+
+  list(config, reporter, flags, args) {
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      yield list(config, reporter, flags, args);
+    })();
+  },
+
+  remove(config, reporter, flags, args) {
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      yield updateCwd(config);
+
+      const updateBins = yield initUpdateBins(config, reporter, flags);
+
+      // remove module
+      yield (0, (_remove || _load_remove()).run)(config, reporter, flags, args);
+
+      // remove binaries
+      yield updateBins();
+    })();
+  },
+
+  upgrade(config, reporter, flags, args) {
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      yield updateCwd(config);
+
+      const updateBins = yield initUpdateBins(config, reporter, flags);
+
+      // upgrade module
+      yield (0, (_upgrade || _load_upgrade()).run)(config, reporter, flags, args);
+
+      // update binaries
+      yield updateBins();
+    })();
+  },
+
+  upgradeInteractive(config, reporter, flags, args) {
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      yield updateCwd(config);
+
+      const updateBins = yield initUpdateBins(config, reporter, flags);
+
+      // upgrade module
+      yield (0, (_upgradeInteractive || _load_upgradeInteractive()).run)(config, reporter, flags, args);
+
+      // update binaries
+      yield updateBins();
+    })();
+  }
+});
+
+const run = _buildSubCommands.run,
+      _setFlags = _buildSubCommands.setFlags;
+exports.run = run;
+function setFlags(commander) {
+  _setFlags(commander);
+  commander.description('Installs packages globally on your operating system.');
+  commander.option('--prefix <prefix>', 'bin prefix to use to install binaries');
+  commander.option('--latest', 'upgrade to the latest version of packages');
+}
+
+/***/ }),
+/* 122 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+var _path;
+
+function _load_path() {
+  return _path = _interopRequireDefault(__webpack_require__(0));
+}
+
+var _invariant;
+
+function _load_invariant() {
+  return _invariant = _interopRequireDefault(__webpack_require__(9));
+}
+
+var _semver;
+
+function _load_semver() {
+  return _semver = _interopRequireDefault(__webpack_require__(22));
+}
+
+var _validate;
+
+function _load_validate() {
+  return _validate = __webpack_require__(125);
+}
+
+var _lockfile;
+
+function _load_lockfile() {
+  return _lockfile = _interopRequireDefault(__webpack_require__(19));
+}
+
+var _packageReference;
+
+function _load_packageReference() {
+  return _packageReference = _interopRequireDefault(__webpack_require__(365));
+}
+
+var _index;
+
+function _load_index() {
+  return _index = __webpack_require__(78);
+}
+
+var _errors;
+
+function _load_errors() {
+  return _errors = __webpack_require__(6);
+}
+
+var _constants;
+
+function _load_constants() {
+  return _constants = _interopRequireWildcard(__webpack_require__(8));
+}
+
+var _version;
+
+function _load_version() {
+  return _version = _interopRequireWildcard(__webpack_require__(226));
+}
+
+var _workspaceResolver;
+
+function _load_workspaceResolver() {
+  return _workspaceResolver = _interopRequireDefault(__webpack_require__(570));
+}
+
+var _fs;
+
+function _load_fs() {
+  return _fs = _interopRequireWildcard(__webpack_require__(4));
+}
+
+var _normalizePattern4;
+
+function _load_normalizePattern() {
+  return _normalizePattern4 = __webpack_require__(37);
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const micromatch = __webpack_require__(114);
+
+class PackageRequest {
+  constructor(req, resolver) {
+    this.parentRequest = req.parentRequest;
+    this.parentNames = req.parentNames || [];
+    this.lockfile = resolver.lockfile;
+    this.registry = req.registry;
+    this.reporter = resolver.reporter;
+    this.resolver = resolver;
+    this.optional = req.optional;
+    this.hint = req.hint;
+    this.pattern = req.pattern;
+    this.config = resolver.config;
+    this.foundInfo = null;
+  }
+
+  init() {
+    this.resolver.usedRegistries.add(this.registry);
+  }
+
+  getLocked(remoteType) {
+    // always prioritise root lockfile
+    const shrunk = this.lockfile.getLocked(this.pattern);
+
+    if (shrunk && shrunk.resolved) {
+      const resolvedParts = (_version || _load_version()).explodeHashedUrl(shrunk.resolved);
+
+      // Detect Git protocols (git://HOST/PATH or git+PROTOCOL://HOST/PATH)
+      const preferredRemoteType = /^git(\+[a-z0-9]+)?:\/\//.test(resolvedParts.url) ? 'git' : remoteType;
+
+      return {
+        name: shrunk.name,
+        version: shrunk.version,
+        _uid: shrunk.uid,
+        _remote: {
+          resolved: shrunk.resolved,
+          type: preferredRemoteType,
+          reference: resolvedParts.url,
+          hash: resolvedParts.hash,
+          integrity: shrunk.integrity,
+          registry: shrunk.registry,
+          packageName: shrunk.name
+        },
+        optionalDependencies: shrunk.optionalDependencies || {},
+        dependencies: shrunk.dependencies || {},
+        prebuiltVariants: shrunk.prebuiltVariants || {}
+      };
+    } else {
+      return null;
+    }
+  }
+
+  /**
+   * If the input pattern matches a registry one then attempt to find it on the registry.
+   * Otherwise fork off to an exotic resolver if one matches.
+   */
+
+  findVersionOnRegistry(pattern) {
+    var _this = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      var _ref = yield _this.normalize(pattern);
+
+      const range = _ref.range,
+            name = _ref.name;
+
+
+      const exoticResolver = (0, (_index || _load_index()).getExoticResolver)(range);
+      if (exoticResolver) {
+        let data = yield _this.findExoticVersionInfo(exoticResolver, range);
+
+        // clone data as we're manipulating it in place and this could be resolved multiple
+        // times
+        data = Object.assign({}, data);
+
+        // this is so the returned package response uses the overridden name. ie. if the
+        // package's actual name is `bar`, but it's been specified in the manifest like:
+        //   "foo": "http://foo.com/bar.tar.gz"
+        // then we use the foo name
+        data.name = name;
+        return data;
+      }
+
+      const Resolver = _this.getRegistryResolver();
+      const resolver = new Resolver(_this, name, range);
+      try {
+        return yield resolver.resolve();
+      } catch (err) {
+        // if it is not an error thrown by yarn and it has a parent request,
+        // thow a more readable error
+        if (!(err instanceof (_errors || _load_errors()).MessageError) && _this.parentRequest && _this.parentRequest.pattern) {
+          throw new (_errors || _load_errors()).MessageError(_this.reporter.lang('requiredPackageNotFoundRegistry', pattern, _this.parentRequest.pattern, _this.registry));
+        }
+        throw err;
+      }
+    })();
+  }
+
+  /**
+   * Get the registry resolver associated with this package request.
+   */
+
+  getRegistryResolver() {
+    const Resolver = (_index || _load_index()).registries[this.registry];
+    if (Resolver) {
+      return Resolver;
+    } else {
+      throw new (_errors || _load_errors()).MessageError(this.reporter.lang('unknownRegistryResolver', this.registry));
+    }
+  }
+
+  normalizeRange(pattern) {
+    var _this2 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      if (pattern.indexOf(':') > -1 || pattern.indexOf('@') > -1 || (0, (_index || _load_index()).getExoticResolver)(pattern)) {
+        return pattern;
+      }
+
+      if (!(_semver || _load_semver()).default.validRange(pattern)) {
+        try {
+          if (yield (_fs || _load_fs()).exists((_path || _load_path()).default.join(_this2.config.cwd, pattern, (_constants || _load_constants()).NODE_PACKAGE_JSON))) {
+            _this2.reporter.warn(_this2.reporter.lang('implicitFileDeprecated', pattern));
+            return `file:${pattern}`;
+          }
+        } catch (err) {
+          // pass
+        }
+      }
+
+      return pattern;
+    })();
+  }
+
+  normalize(pattern) {
+    var _this3 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      var _normalizePattern = (0, (_normalizePattern4 || _load_normalizePattern()).normalizePattern)(pattern);
+
+      const name = _normalizePattern.name,
+            range = _normalizePattern.range,
+            hasVersion = _normalizePattern.hasVersion;
+
+      const newRange = yield _this3.normalizeRange(range);
+      return { name, range: newRange, hasVersion };
+    })();
+  }
+
+  /**
+   * Construct an exotic resolver instance with the input `ExoticResolver` and `range`.
+   */
+
+  findExoticVersionInfo(ExoticResolver, range) {
+    const resolver = new ExoticResolver(this, range);
+    return resolver.resolve();
+  }
+
+  /**
+   * If the current pattern matches an exotic resolver then delegate to it or else try
+   * the registry.
+   */
+
+  findVersionInfo() {
+    var _this4 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const exoticResolver = (0, (_index || _load_index()).getExoticResolver)(_this4.pattern);
+      if (exoticResolver) {
+        return _this4.findExoticVersionInfo(exoticResolver, _this4.pattern);
+      } else if ((_workspaceResolver || _load_workspaceResolver()).default.isWorkspace(_this4.pattern, _this4.resolver.workspaceLayout)) {
+        (0, (_invariant || _load_invariant()).default)(_this4.resolver.workspaceLayout, 'expected workspaceLayout');
+        const resolver = new (_workspaceResolver || _load_workspaceResolver()).default(_this4, _this4.pattern, _this4.resolver.workspaceLayout);
+        let manifest;
+        if (_this4.config.focus && !_this4.pattern.includes(_this4.resolver.workspaceLayout.virtualManifestName) && !_this4.pattern.startsWith(_this4.config.focusedWorkspaceName + '@')) {
+          const localInfo = _this4.resolver.workspaceLayout.getManifestByPattern(_this4.pattern);
+          (0, (_invariant || _load_invariant()).default)(localInfo, 'expected local info for ' + _this4.pattern);
+          const localManifest = localInfo.manifest;
+          const requestPattern = localManifest.name + '@' + localManifest.version;
+          manifest = yield _this4.findVersionOnRegistry(requestPattern);
+        }
+        return resolver.resolve(manifest);
+      } else {
+        return _this4.findVersionOnRegistry(_this4.pattern);
+      }
+    })();
+  }
+
+  reportResolvedRangeMatch(info, resolved) {}
+
+  /**
+   * Do the final resolve of a package that had a match with an existing version.
+   * After all unique versions have been discovered, so the best available version
+   * is found.
+   */
+  resolveToExistingVersion(info) {
+    // get final resolved version
+    var _normalizePattern2 = (0, (_normalizePattern4 || _load_normalizePattern()).normalizePattern)(this.pattern);
+
+    const range = _normalizePattern2.range,
+          name = _normalizePattern2.name;
+
+    const solvedRange = (_semver || _load_semver()).default.validRange(range) ? info.version : range;
+    const resolved = this.resolver.getHighestRangeVersionMatch(name, solvedRange, info);
+    (0, (_invariant || _load_invariant()).default)(resolved, 'should have a resolved reference');
+
+    this.reportResolvedRangeMatch(info, resolved);
+    const ref = resolved._reference;
+    (0, (_invariant || _load_invariant()).default)(ref, 'Resolved package info has no package reference');
+    ref.addRequest(this);
+    ref.addPattern(this.pattern, resolved);
+    ref.addOptional(this.optional);
+  }
+
+  /**
+   * TODO description
+   */
+  find({ fresh, frozen }) {
+    var _this5 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      // find version info for this package pattern
+      const info = yield _this5.findVersionInfo();
+
+      if (!(_semver || _load_semver()).default.valid(info.version)) {
+        throw new (_errors || _load_errors()).MessageError(_this5.reporter.lang('invalidPackageVersion', info.name, info.version));
+      }
+
+      info.fresh = fresh;
+      (0, (_validate || _load_validate()).cleanDependencies)(info, false, _this5.reporter, function () {
+        // swallow warnings
+      });
+
+      // check if while we were resolving this dep we've already resolved one that satisfies
+      // the same range
+
+      var _normalizePattern3 = (0, (_normalizePattern4 || _load_normalizePattern()).normalizePattern)(_this5.pattern);
+
+      const range = _normalizePattern3.range,
+            name = _normalizePattern3.name;
+
+      const solvedRange = (_semver || _load_semver()).default.validRange(range) ? info.version : range;
+      const resolved = !info.fresh || frozen ? _this5.resolver.getExactVersionMatch(name, solvedRange, info) : _this5.resolver.getHighestRangeVersionMatch(name, solvedRange, info);
+
+      if (resolved) {
+        _this5.resolver.reportPackageWithExistingVersion(_this5, info);
+        return;
+      }
+
+      if (info.flat && !_this5.resolver.flat) {
+        throw new (_errors || _load_errors()).MessageError(_this5.reporter.lang('flatGlobalError', `${info.name}@${info.version}`));
+      }
+
+      // validate version info
+      PackageRequest.validateVersionInfo(info, _this5.reporter);
+
+      //
+      const remote = info._remote;
+      (0, (_invariant || _load_invariant()).default)(remote, 'Missing remote');
+
+      // set package reference
+      const ref = new (_packageReference || _load_packageReference()).default(_this5, info, remote);
+      ref.addPattern(_this5.pattern, info);
+      ref.addOptional(_this5.optional);
+      ref.setFresh(fresh);
+      info._reference = ref;
+      info._remote = remote;
+      // start installation of dependencies
+      const promises = [];
+      const deps = [];
+      const parentNames = [..._this5.parentNames, name];
+      // normal deps
+      for (const depName in info.dependencies) {
+        const depPattern = depName + '@' + info.dependencies[depName];
+        deps.push(depPattern);
+        promises.push(_this5.resolver.find({
+          pattern: depPattern,
+          registry: remote.registry,
+          // dependencies of optional dependencies should themselves be optional
+          optional: _this5.optional,
+          parentRequest: _this5,
+          parentNames
+        }));
+      }
+
+      // optional deps
+      for (const depName in info.optionalDependencies) {
+        const depPattern = depName + '@' + info.optionalDependencies[depName];
+        deps.push(depPattern);
+        promises.push(_this5.resolver.find({
+          hint: 'optional',
+          pattern: depPattern,
+          registry: remote.registry,
+          optional: true,
+          parentRequest: _this5,
+          parentNames
+        }));
+      }
+      if (remote.type === 'workspace' && !_this5.config.production) {
+        // workspaces support dev dependencies
+        for (const depName in info.devDependencies) {
+          const depPattern = depName + '@' + info.devDependencies[depName];
+          deps.push(depPattern);
+          promises.push(_this5.resolver.find({
+            hint: 'dev',
+            pattern: depPattern,
+            registry: remote.registry,
+            optional: false,
+            parentRequest: _this5,
+            parentNames
+          }));
+        }
+      }
+
+      for (var _iterator = promises, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+        var _ref2;
+
+        if (_isArray) {
+          if (_i >= _iterator.length) break;
+          _ref2 = _iterator[_i++];
+        } else {
+          _i = _iterator.next();
+          if (_i.done) break;
+          _ref2 = _i.value;
+        }
+
+        const promise = _ref2;
+
+        yield promise;
+      }
+
+      ref.addDependencies(deps);
+
+      // Now that we have all dependencies, it's safe to propagate optional
+      for (var _iterator2 = ref.requests.slice(1), _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+        var _ref3;
+
+        if (_isArray2) {
+          if (_i2 >= _iterator2.length) break;
+          _ref3 = _iterator2[_i2++];
+        } else {
+          _i2 = _iterator2.next();
+          if (_i2.done) break;
+          _ref3 = _i2.value;
+        }
+
+        const otherRequest = _ref3;
+
+        ref.addOptional(otherRequest.optional);
+      }
+    })();
+  }
+
+  /**
+   * TODO description
+   */
+
+  static validateVersionInfo(info, reporter) {
+    // human readable name to use in errors
+    const human = `${info.name}@${info.version}`;
+
+    info.version = PackageRequest.getPackageVersion(info);
+
+    for (var _iterator3 = (_constants || _load_constants()).REQUIRED_PACKAGE_KEYS, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
+      var _ref4;
+
+      if (_isArray3) {
+        if (_i3 >= _iterator3.length) break;
+        _ref4 = _iterator3[_i3++];
+      } else {
+        _i3 = _iterator3.next();
+        if (_i3.done) break;
+        _ref4 = _i3.value;
+      }
+
+      const key = _ref4;
+
+      if (!info[key]) {
+        throw new (_errors || _load_errors()).MessageError(reporter.lang('missingRequiredPackageKey', human, key));
+      }
+    }
+  }
+
+  /**
+   * Returns the package version if present, else defaults to the uid
+   */
+
+  static getPackageVersion(info) {
+    // TODO possibly reconsider this behaviour
+    return info.version === undefined ? info._uid : info.version;
+  }
+
+  /**
+   * Gets all of the outdated packages and sorts them appropriately
+   */
+
+  static getOutdatedPackages(lockfile, install, config, reporter, filterByPatterns, flags) {
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      var _ref5 = yield install.fetchRequestFromCwd();
+
+      const reqPatterns = _ref5.requests,
+            workspaceLayout = _ref5.workspaceLayout;
+
+      // Filter out workspace patterns if necessary
+
+      let depReqPatterns = workspaceLayout ? reqPatterns.filter(function (p) {
+        return !workspaceLayout.getManifestByPattern(p.pattern);
+      }) : reqPatterns;
+
+      // filter the list down to just the packages requested.
+      // prevents us from having to query the metadata for all packages.
+      if (filterByPatterns && filterByPatterns.length || flags && flags.pattern) {
+        const filterByNames = filterByPatterns && filterByPatterns.length ? filterByPatterns.map(function (pattern) {
+          return (0, (_normalizePattern4 || _load_normalizePattern()).normalizePattern)(pattern).name;
+        }) : [];
+        depReqPatterns = depReqPatterns.filter(function (dep) {
+          return filterByNames.indexOf((0, (_normalizePattern4 || _load_normalizePattern()).normalizePattern)(dep.pattern).name) >= 0 || flags && flags.pattern && micromatch.contains((0, (_normalizePattern4 || _load_normalizePattern()).normalizePattern)(dep.pattern).name, flags.pattern);
+        });
+      }
+
+      const deps = yield Promise.all(depReqPatterns.map((() => {
+        var _ref6 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* ({ pattern, hint, workspaceName, workspaceLoc }) {
+          const locked = lockfile.getLocked(pattern);
+          if (!locked) {
+            throw new (_errors || _load_errors()).MessageError(reporter.lang('lockfileOutdated'));
+          }
+
+          const name = locked.name,
+                current = locked.version;
+
+          let latest = '';
+          let wanted = '';
+          let url = '';
+
+          const normalized = (0, (_normalizePattern4 || _load_normalizePattern()).normalizePattern)(pattern);
+
+          if ((0, (_index || _load_index()).getExoticResolver)(pattern) || (0, (_index || _load_index()).getExoticResolver)(normalized.range)) {
+            latest = wanted = 'exotic';
+            url = normalized.range;
+          } else {
+            const registry = config.registries[locked.registry];
+
+            var _ref7 = yield registry.checkOutdated(config, name, normalized.range);
+
+            latest = _ref7.latest;
+            wanted = _ref7.wanted;
+            url = _ref7.url;
+          }
+
+          return {
+            name,
+            current,
+            wanted,
+            latest,
+            url,
+            hint,
+            range: normalized.range,
+            upgradeTo: '',
+            workspaceName: workspaceName || '',
+            workspaceLoc: workspaceLoc || ''
+          };
+        });
+
+        return function (_x) {
+          return _ref6.apply(this, arguments);
+        };
+      })()));
+
+      // Make sure to always output `exotic` versions to be compatible with npm
+      const isDepOld = function isDepOld({ current, latest, wanted }) {
+        return latest === 'exotic' || (_semver || _load_semver()).default.lt(current, wanted) || (_semver || _load_semver()).default.lt(current, latest);
+      };
+      const orderByName = function orderByName(depA, depB) {
+        return depA.name.localeCompare(depB.name);
+      };
+      return deps.filter(isDepOld).sort(orderByName);
+    })();
+  }
+}
+exports.default = PackageRequest;
+
+/***/ }),
+/* 123 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+class BaseResolver {
+  constructor(request, fragment) {
+    this.resolver = request.resolver;
+    this.reporter = request.reporter;
+    this.fragment = fragment;
+    this.registry = request.registry;
+    this.request = request;
+    this.pattern = request.pattern;
+    this.config = request.config;
+  }
+
+  fork(Resolver, resolveArg, ...args) {
+    const resolver = new Resolver(this.request, ...args);
+    resolver.registry = this.registry;
+    return resolver.resolve(resolveArg);
+  }
+
+  resolve(resolveArg) {
+    throw new Error('Not implemented');
+  }
+}
+exports.default = BaseResolver;
+
+/***/ }),
+/* 124 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+var _index;
+
+function _load_index() {
+  return _index = __webpack_require__(78);
+}
+
+var _misc;
+
+function _load_misc() {
+  return _misc = _interopRequireWildcard(__webpack_require__(18));
+}
+
+var _version;
+
+function _load_version() {
+  return _version = _interopRequireWildcard(__webpack_require__(226));
+}
+
+var _guessName;
+
+function _load_guessName() {
+  return _guessName = _interopRequireDefault(__webpack_require__(169));
+}
+
+var _index2;
+
+function _load_index2() {
+  return _index2 = __webpack_require__(57);
+}
+
+var _exoticResolver;
+
+function _load_exoticResolver() {
+  return _exoticResolver = _interopRequireDefault(__webpack_require__(89));
+}
+
+var _git;
+
+function _load_git() {
+  return _git = _interopRequireDefault(__webpack_require__(219));
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const urlParse = __webpack_require__(24).parse;
+
+const GIT_HOSTS = ['github.com', 'gitlab.com', 'bitbucket.com', 'bitbucket.org'];
+
+const GIT_PATTERN_MATCHERS = [/^git:/, /^git\+.+:/, /^ssh:/, /^https?:.+\.git$/, /^https?:.+\.git#.+/];
+
+class GitResolver extends (_exoticResolver || _load_exoticResolver()).default {
+  constructor(request, fragment) {
+    super(request, fragment);
+
+    var _versionUtil$explodeH = (_version || _load_version()).explodeHashedUrl(fragment);
+
+    const url = _versionUtil$explodeH.url,
+          hash = _versionUtil$explodeH.hash;
+
+    this.url = url;
+    this.hash = hash;
+  }
+
+  static isVersion(pattern) {
+    for (var _iterator = GIT_PATTERN_MATCHERS, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+      var _ref;
+
+      if (_isArray) {
+        if (_i >= _iterator.length) break;
+        _ref = _iterator[_i++];
+      } else {
+        _i = _iterator.next();
+        if (_i.done) break;
+        _ref = _i.value;
+      }
+
+      const matcher = _ref;
+
+      if (matcher.test(pattern)) {
+        return true;
+      }
+    }
+
+    var _urlParse = urlParse(pattern);
+
+    const hostname = _urlParse.hostname,
+          path = _urlParse.path;
+
+    if (hostname && path && GIT_HOSTS.indexOf(hostname) >= 0) {
+      // only if dependency is pointing to a git repo,
+      // e.g. facebook/flow and not file in a git repo facebook/flow/archive/v1.0.0.tar.gz
+      return path.split('/').filter(p => !!p).length === 2;
+    }
+
+    return false;
+  }
+
+  resolve(forked) {
+    var _this = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      let tryRegistry = (() => {
+        var _ref2 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (registry) {
+          const filename = (_index2 || _load_index2()).registries[registry].filename;
+
+          const file = yield client.getFile(filename);
+          if (!file) {
+            return null;
+          }
+
+          const json = yield config.readJson(`${url}/${filename}`, function () {
+            return JSON.parse(file);
+          });
+          json._uid = commit;
+          json._remote = {
+            resolved: `${url}#${commit}`,
+            type: 'git',
+            reference: url,
+            hash: commit,
+            registry
+          };
+          return json;
+        });
+
+        return function tryRegistry(_x) {
+          return _ref2.apply(this, arguments);
+        };
+      })();
+
+      const url = _this.url;
+
+      // shortcut for hosted git. we will fallback to a GitResolver if the hosted git
+      // optimisations fail which the `forked` flag indicates so we don't get into an
+      // infinite loop
+
+      const parts = urlParse(url);
+      if (false) {
+        // check if this git url uses any of the hostnames defined in our hosted git resolvers
+        for (const name in (_index || _load_index()).hostedGit) {
+          const Resolver = (_index || _load_index()).hostedGit[name];
+          if (Resolver.hostname !== parts.hostname) {
+            continue;
+          }
+
+          // we have a match! clean up the pathname of url artifacts
+          let pathname = parts.pathname;
+          pathname = (_misc || _load_misc()).removePrefix(pathname, '/'); // remove prefixed slash
+          pathname = (_misc || _load_misc()).removeSuffix(pathname, '.git'); // remove .git suffix if present
+
+          const url = `${pathname}${_this.hash ? '#' + decodeURIComponent(_this.hash) : ''}`;
+          return _this.fork(Resolver, false, url);
+        }
+      }
+
+      // get from lockfile
+      const shrunk = _this.request.getLocked('git');
+      if (shrunk) {
+        return shrunk;
+      }
+
+      const config = _this.config;
+
+
+      const gitUrl = (_git || _load_git()).default.npmUrlToGitUrl(url);
+      const client = new (_git || _load_git()).default(config, gitUrl, _this.hash);
+      const commit = yield client.init();
+
+      const file = yield tryRegistry(_this.registry);
+      if (file) {
+        return file;
+      }
+
+      for (const registry in (_index2 || _load_index2()).registries) {
+        if (registry === _this.registry) {
+          continue;
+        }
+
+        const file = yield tryRegistry(registry);
+        if (file) {
+          return file;
+        }
+      }
+
+      return {
+        // This is just the default, it can be overridden with key of dependencies
+        name: (0, (_guessName || _load_guessName()).default)(url),
+        version: '0.0.0',
+        _uid: commit,
+        _remote: {
+          resolved: `${url}#${commit}`,
+          type: 'git',
+          reference: url,
+          hash: commit,
+          registry: 'npm'
+        }
+      };
+    })();
+  }
+}
+exports.default = GitResolver;
+
+/***/ }),
+/* 125 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isValidPackageName = isValidPackageName;
+
+exports.default = function (info, isRoot, reporter, warn) {
+  if (isRoot) {
+    for (const key in (_typos || _load_typos()).default) {
+      if (key in info) {
+        warn(reporter.lang('manifestPotentialTypo', key, (_typos || _load_typos()).default[key]));
+      }
+    }
+  }
+
+  // validate name
+  const name = info.name;
+
+  if (typeof name === 'string') {
+    if (isRoot && isBuiltinModule(name)) {
+      warn(reporter.lang('manifestBuiltinModule', name));
+    }
+
+    // cannot start with a dot
+    if (name[0] === '.') {
+      throw new (_errors || _load_errors()).MessageError(reporter.lang('manifestNameDot'));
+    }
+
+    // cannot contain the following characters
+    if (!isValidPackageName(name)) {
+      throw new (_errors || _load_errors()).MessageError(reporter.lang('manifestNameIllegalChars'));
+    }
+
+    // cannot equal node_modules or favicon.ico
+    const lower = name.toLowerCase();
+    if (lower === 'node_modules' || lower === 'favicon.ico') {
+      throw new (_errors || _load_errors()).MessageError(reporter.lang('manifestNameBlacklisted'));
+    }
+  }
+
+  // validate license
+  if (isRoot && !info.private) {
+    if (typeof info.license === 'string') {
+      const license = info.license.replace(/\*$/g, '');
+      if (!(0, (_util || _load_util()).isValidLicense)(license)) {
+        warn(reporter.lang('manifestLicenseInvalid'));
+      }
+    } else {
+      warn(reporter.lang('manifestLicenseNone'));
+    }
+  }
+
+  // validate strings
+  for (var _iterator = strings, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+    var _ref;
+
+    if (_isArray) {
+      if (_i >= _iterator.length) break;
+      _ref = _iterator[_i++];
+    } else {
+      _i = _iterator.next();
+      if (_i.done) break;
+      _ref = _i.value;
+    }
+
+    const key = _ref;
+
+    const val = info[key];
+    if (val && typeof val !== 'string') {
+      throw new (_errors || _load_errors()).MessageError(reporter.lang('manifestStringExpected', key));
+    }
+  }
+
+  cleanDependencies(info, isRoot, reporter, warn);
+};
+
+exports.cleanDependencies = cleanDependencies;
+
+var _errors;
+
+function _load_errors() {
+  return _errors = __webpack_require__(6);
+}
+
+var _util;
+
+function _load_util() {
+  return _util = __webpack_require__(221);
+}
+
+var _typos;
+
+function _load_typos() {
+  return _typos = _interopRequireDefault(__webpack_require__(587));
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const isBuiltinModule = __webpack_require__(730);
+
+const strings = ['name', 'version'];
+
+const dependencyKeys = [
+// npm registry will include optionalDependencies in dependencies and we'll want to dedupe them from the
+// other fields first
+'optionalDependencies',
+
+// it's seemingly common to include a dependency in dependencies and devDependencies of the same name but
+// different ranges, this can cause a lot of issues with our determinism and the behaviour of npm is
+// currently unspecified.
+'dependencies', 'devDependencies'];
+
+function isValidName(name) {
+  return !name.match(/[\/@\s\+%:]/) && encodeURIComponent(name) === name;
+}
+
+function isValidScopedName(name) {
+  if (name[0] !== '@') {
+    return false;
+  }
+
+  const parts = name.slice(1).split('/');
+  return parts.length === 2 && isValidName(parts[0]) && isValidName(parts[1]);
+}
+
+function isValidPackageName(name) {
+  return isValidName(name) || isValidScopedName(name);
+}
+
+function cleanDependencies(info, isRoot, reporter, warn) {
+  // get dependency objects
+  const depTypes = [];
+  for (var _iterator2 = dependencyKeys, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+    var _ref2;
+
+    if (_isArray2) {
+      if (_i2 >= _iterator2.length) break;
+      _ref2 = _iterator2[_i2++];
+    } else {
+      _i2 = _iterator2.next();
+      if (_i2.done) break;
+      _ref2 = _i2.value;
+    }
+
+    const type = _ref2;
+
+    const deps = info[type];
+    if (!deps || typeof deps !== 'object') {
+      continue;
+    }
+    depTypes.push([type, deps]);
+  }
+
+  // aggregate all non-trivial deps (not '' or '*')
+  const nonTrivialDeps = new Map();
+  for (var _iterator3 = depTypes, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
+    var _ref4;
+
+    if (_isArray3) {
+      if (_i3 >= _iterator3.length) break;
+      _ref4 = _iterator3[_i3++];
+    } else {
+      _i3 = _iterator3.next();
+      if (_i3.done) break;
+      _ref4 = _i3.value;
+    }
+
+    const _ref3 = _ref4;
+    const type = _ref3[0];
+    const deps = _ref3[1];
+
+    for (var _iterator5 = Object.keys(deps), _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
+      var _ref7;
+
+      if (_isArray5) {
+        if (_i5 >= _iterator5.length) break;
+        _ref7 = _iterator5[_i5++];
+      } else {
+        _i5 = _iterator5.next();
+        if (_i5.done) break;
+        _ref7 = _i5.value;
+      }
+
+      const name = _ref7;
+
+      const version = deps[name];
+      if (!nonTrivialDeps.has(name) && version && version !== '*') {
+        nonTrivialDeps.set(name, { type, version });
+      }
+    }
+  }
+
+  // overwrite first dep of package with non-trivial version, remove the rest
+  const setDeps = new Set();
+  for (var _iterator4 = depTypes, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
+    var _ref6;
+
+    if (_isArray4) {
+      if (_i4 >= _iterator4.length) break;
+      _ref6 = _iterator4[_i4++];
+    } else {
+      _i4 = _iterator4.next();
+      if (_i4.done) break;
+      _ref6 = _i4.value;
+    }
+
+    const _ref5 = _ref6;
+    const type = _ref5[0];
+    const deps = _ref5[1];
+
+    for (var _iterator6 = Object.keys(deps), _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) {
+      var _ref8;
+
+      if (_isArray6) {
+        if (_i6 >= _iterator6.length) break;
+        _ref8 = _iterator6[_i6++];
+      } else {
+        _i6 = _iterator6.next();
+        if (_i6.done) break;
+        _ref8 = _i6.value;
+      }
+
+      const name = _ref8;
+
+      let version = deps[name];
+
+      const dep = nonTrivialDeps.get(name);
+      if (dep) {
+        if (version && version !== '*' && version !== dep.version && isRoot) {
+          // only throw a warning when at the root
+          warn(reporter.lang('manifestDependencyCollision', dep.type, name, dep.version, type, version));
+        }
+        version = dep.version;
+      }
+
+      if (setDeps.has(name)) {
+        delete deps[name];
+      } else {
+        deps[name] = version;
+        setDeps.add(name);
+      }
+    }
+  }
+}
+
+/***/ }),
+/* 126 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// getting tag from 19.1.3.6 Object.prototype.toString()
+var cof = __webpack_require__(69);
+var TAG = __webpack_require__(20)('toStringTag');
+// ES3 wrong here
+var ARG = cof(function () { return arguments; }()) == 'Arguments';
+
+// fallback for IE11 Script Access Denied error
+var tryGet = function (it, key) {
+  try {
+    return it[key];
+  } catch (e) { /* empty */ }
+};
+
+module.exports = function (it) {
+  var O, T, B;
+  return it === undefined ? 'Undefined' : it === null ? 'Null'
+    // @@toStringTag case
+    : typeof (T = tryGet(O = Object(it), TAG)) == 'string' ? T
+    // builtinTag case
+    : ARG ? cof(O)
+    // ES3 arguments fallback
+    : (B = cof(O)) == 'Object' && typeof O.callee == 'function' ? 'Arguments' : B;
+};
+
+
+/***/ }),
+/* 127 */
+/***/ (function(module, exports) {
+
+// IE 8- don't enum bug keys
+module.exports = (
+  'constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf'
+).split(',');
+
+
+/***/ }),
+/* 128 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var document = __webpack_require__(17).document;
+module.exports = document && document.documentElement;
+
+
+/***/ }),
+/* 129 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var LIBRARY = __webpack_require__(93);
+var $export = __webpack_require__(60);
+var redefine = __webpack_require__(251);
+var hide = __webpack_require__(42);
+var Iterators = __webpack_require__(53);
+var $iterCreate = __webpack_require__(242);
+var setToStringTag = __webpack_require__(95);
+var getPrototypeOf = __webpack_require__(248);
+var ITERATOR = __webpack_require__(20)('iterator');
+var BUGGY = !([].keys && 'next' in [].keys()); // Safari has buggy iterators w/o `next`
+var FF_ITERATOR = '@@iterator';
+var KEYS = 'keys';
+var VALUES = 'values';
+
+var returnThis = function () { return this; };
+
+module.exports = function (Base, NAME, Constructor, next, DEFAULT, IS_SET, FORCED) {
+  $iterCreate(Constructor, NAME, next);
+  var getMethod = function (kind) {
+    if (!BUGGY && kind in proto) return proto[kind];
+    switch (kind) {
+      case KEYS: return function keys() { return new Constructor(this, kind); };
+      case VALUES: return function values() { return new Constructor(this, kind); };
+    } return function entries() { return new Constructor(this, kind); };
+  };
+  var TAG = NAME + ' Iterator';
+  var DEF_VALUES = DEFAULT == VALUES;
+  var VALUES_BUG = false;
+  var proto = Base.prototype;
+  var $native = proto[ITERATOR] || proto[FF_ITERATOR] || DEFAULT && proto[DEFAULT];
+  var $default = $native || getMethod(DEFAULT);
+  var $entries = DEFAULT ? !DEF_VALUES ? $default : getMethod('entries') : undefined;
+  var $anyNative = NAME == 'Array' ? proto.entries || $native : $native;
+  var methods, key, IteratorPrototype;
+  // Fix native
+  if ($anyNative) {
+    IteratorPrototype = getPrototypeOf($anyNative.call(new Base()));
+    if (IteratorPrototype !== Object.prototype && IteratorPrototype.next) {
+      // Set @@toStringTag to native iterators
+      setToStringTag(IteratorPrototype, TAG, true);
+      // fix for some old engines
+      if (!LIBRARY && typeof IteratorPrototype[ITERATOR] != 'function') hide(IteratorPrototype, ITERATOR, returnThis);
+    }
+  }
+  // fix Array#{values, @@iterator}.name in V8 / FF
+  if (DEF_VALUES && $native && $native.name !== VALUES) {
+    VALUES_BUG = true;
+    $default = function values() { return $native.call(this); };
+  }
+  // Define iterator
+  if ((!LIBRARY || FORCED) && (BUGGY || VALUES_BUG || !proto[ITERATOR])) {
+    hide(proto, ITERATOR, $default);
+  }
+  // Plug for library
+  Iterators[NAME] = $default;
+  Iterators[TAG] = returnThis;
+  if (DEFAULT) {
+    methods = {
+      values: DEF_VALUES ? $default : getMethod(VALUES),
+      keys: IS_SET ? $default : getMethod(KEYS),
+      entries: $entries
+    };
+    if (FORCED) for (key in methods) {
+      if (!(key in proto)) redefine(proto, key, methods[key]);
+    } else $export($export.P + $export.F * (BUGGY || VALUES_BUG), NAME, methods);
+  }
+  return methods;
+};
+
+
+/***/ }),
+/* 130 */
+/***/ (function(module, exports) {
+
+module.exports = function (exec) {
+  try {
+    return { e: false, v: exec() };
+  } catch (e) {
+    return { e: true, v: e };
+  }
+};
+
+
+/***/ }),
+/* 131 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var anObject = __webpack_require__(35);
+var isObject = __webpack_require__(52);
+var newPromiseCapability = __webpack_require__(94);
+
+module.exports = function (C, x) {
+  anObject(C);
+  if (isObject(x) && x.constructor === C) return x;
+  var promiseCapability = newPromiseCapability.f(C);
+  var resolve = promiseCapability.resolve;
+  resolve(x);
+  return promiseCapability.promise;
+};
+
+
+/***/ }),
+/* 132 */
+/***/ (function(module, exports) {
+
+module.exports = function (bitmap, value) {
+  return {
+    enumerable: !(bitmap & 1),
+    configurable: !(bitmap & 2),
+    writable: !(bitmap & 4),
+    value: value
+  };
+};
+
+
+/***/ }),
+/* 133 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var core = __webpack_require__(31);
+var global = __webpack_require__(17);
+var SHARED = '__core-js_shared__';
+var store = global[SHARED] || (global[SHARED] = {});
+
+(module.exports = function (key, value) {
+  return store[key] || (store[key] = value !== undefined ? value : {});
+})('versions', []).push({
+  version: core.version,
+  mode: __webpack_require__(93) ? 'pure' : 'global',
+  copyright: '© 2018 Denis Pushkarev (zloirock.ru)'
+});
+
+
+/***/ }),
+/* 134 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// 7.3.20 SpeciesConstructor(O, defaultConstructor)
+var anObject = __webpack_require__(35);
+var aFunction = __webpack_require__(68);
+var SPECIES = __webpack_require__(20)('species');
+module.exports = function (O, D) {
+  var C = anObject(O).constructor;
+  var S;
+  return C === undefined || (S = anObject(C)[SPECIES]) == undefined ? D : aFunction(S);
+};
+
+
+/***/ }),
+/* 135 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var ctx = __webpack_require__(70);
+var invoke = __webpack_require__(239);
+var html = __webpack_require__(128);
+var cel = __webpack_require__(92);
+var global = __webpack_require__(17);
+var process = global.process;
+var setTask = global.setImmediate;
+var clearTask = global.clearImmediate;
+var MessageChannel = global.MessageChannel;
+var Dispatch = global.Dispatch;
+var counter = 0;
+var queue = {};
+var ONREADYSTATECHANGE = 'onreadystatechange';
+var defer, channel, port;
+var run = function () {
+  var id = +this;
+  // eslint-disable-next-line no-prototype-builtins
+  if (queue.hasOwnProperty(id)) {
+    var fn = queue[id];
+    delete queue[id];
+    fn();
+  }
+};
+var listener = function (event) {
+  run.call(event.data);
+};
+// Node.js 0.9+ & IE10+ has setImmediate, otherwise:
+if (!setTask || !clearTask) {
+  setTask = function setImmediate(fn) {
+    var args = [];
+    var i = 1;
+    while (arguments.length > i) args.push(arguments[i++]);
+    queue[++counter] = function () {
+      // eslint-disable-next-line no-new-func
+      invoke(typeof fn == 'function' ? fn : Function(fn), args);
+    };
+    defer(counter);
+    return counter;
+  };
+  clearTask = function clearImmediate(id) {
+    delete queue[id];
+  };
+  // Node.js 0.8-
+  if (__webpack_require__(69)(process) == 'process') {
+    defer = function (id) {
+      process.nextTick(ctx(run, id, 1));
+    };
+  // Sphere (JS game engine) Dispatch API
+  } else if (Dispatch && Dispatch.now) {
+    defer = function (id) {
+      Dispatch.now(ctx(run, id, 1));
+    };
+  // Browsers with MessageChannel, includes WebWorkers
+  } else if (MessageChannel) {
+    channel = new MessageChannel();
+    port = channel.port2;
+    channel.port1.onmessage = listener;
+    defer = ctx(port.postMessage, port, 1);
+  // Browsers with postMessage, skip WebWorkers
+  // IE8 has postMessage, but it's sync & typeof its postMessage is 'object'
+  } else if (global.addEventListener && typeof postMessage == 'function' && !global.importScripts) {
+    defer = function (id) {
+      global.postMessage(id + '', '*');
+    };
+    global.addEventListener('message', listener, false);
+  // IE8-
+  } else if (ONREADYSTATECHANGE in cel('script')) {
+    defer = function (id) {
+      html.appendChild(cel('script'))[ONREADYSTATECHANGE] = function () {
+        html.removeChild(this);
+        run.call(id);
+      };
+    };
+  // Rest old browsers
+  } else {
+    defer = function (id) {
+      setTimeout(ctx(run, id, 1), 0);
+    };
+  }
+}
+module.exports = {
+  set: setTask,
+  clear: clearTask
+};
+
+
+/***/ }),
+/* 136 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// 7.1.15 ToLength
+var toInteger = __webpack_require__(97);
+var min = Math.min;
+module.exports = function (it) {
+  return it > 0 ? min(toInteger(it), 0x1fffffffffffff) : 0; // pow(2, 53) - 1 == 9007199254740991
+};
+
+
+/***/ }),
+/* 137 */
+/***/ (function(module, exports) {
+
+var id = 0;
+var px = Math.random();
+module.exports = function (key) {
+  return 'Symbol('.concat(key === undefined ? '' : key, ')_', (++id + px).toString(36));
+};
+
+
+/***/ }),
+/* 138 */
+/***/ (function(module, exports, __webpack_require__) {
+
+
+/**
+ * This is the common logic for both the Node.js and web browser
+ * implementations of `debug()`.
+ *
+ * Expose `debug()` as the module.
+ */
+
+exports = module.exports = createDebug.debug = createDebug['default'] = createDebug;
+exports.coerce = coerce;
+exports.disable = disable;
+exports.enable = enable;
+exports.enabled = enabled;
+exports.humanize = __webpack_require__(301);
+
+/**
+ * Active `debug` instances.
+ */
+exports.instances = [];
+
+/**
+ * The currently active debug mode names, and names to skip.
+ */
+
+exports.names = [];
+exports.skips = [];
+
+/**
+ * Map of special "%n" handling functions, for the debug "format" argument.
+ *
+ * Valid key names are a single, lower or upper-case letter, i.e. "n" and "N".
+ */
+
+exports.formatters = {};
+
+/**
+ * Select a color.
+ * @param {String} namespace
+ * @return {Number}
+ * @api private
+ */
+
+function selectColor(namespace) {
+  var hash = 0, i;
+
+  for (i in namespace) {
+    hash  = ((hash << 5) - hash) + namespace.charCodeAt(i);
+    hash |= 0; // Convert to 32bit integer
+  }
+
+  return exports.colors[Math.abs(hash) % exports.colors.length];
+}
+
+/**
+ * Create a debugger with the given `namespace`.
+ *
+ * @param {String} namespace
+ * @return {Function}
+ * @api public
+ */
+
+function createDebug(namespace) {
+
+  var prevTime;
+
+  function debug() {
+    // disabled?
+    if (!debug.enabled) return;
+
+    var self = debug;
+
+    // set `diff` timestamp
+    var curr = +new Date();
+    var ms = curr - (prevTime || curr);
+    self.diff = ms;
+    self.prev = prevTime;
+    self.curr = curr;
+    prevTime = curr;
+
+    // turn the `arguments` into a proper Array
+    var args = new Array(arguments.length);
+    for (var i = 0; i < args.length; i++) {
+      args[i] = arguments[i];
+    }
+
+    args[0] = exports.coerce(args[0]);
+
+    if ('string' !== typeof args[0]) {
+      // anything else let's inspect with %O
+      args.unshift('%O');
+    }
+
+    // apply any `formatters` transformations
+    var index = 0;
+    args[0] = args[0].replace(/%([a-zA-Z%])/g, function(match, format) {
+      // if we encounter an escaped % then don't increase the array index
+      if (match === '%%') return match;
+      index++;
+      var formatter = exports.formatters[format];
+      if ('function' === typeof formatter) {
+        var val = args[index];
+        match = formatter.call(self, val);
+
+        // now we need to remove `args[index]` since it's inlined in the `format`
+        args.splice(index, 1);
+        index--;
+      }
+      return match;
+    });
+
+    // apply env-specific formatting (colors, etc.)
+    exports.formatArgs.call(self, args);
+
+    var logFn = debug.log || exports.log || console.log.bind(console);
+    logFn.apply(self, args);
+  }
+
+  debug.namespace = namespace;
+  debug.enabled = exports.enabled(namespace);
+  debug.useColors = exports.useColors();
+  debug.color = selectColor(namespace);
+  debug.destroy = destroy;
+
+  // env-specific initialization logic for debug instances
+  if ('function' === typeof exports.init) {
+    exports.init(debug);
+  }
+
+  exports.instances.push(debug);
+
+  return debug;
+}
+
+function destroy () {
+  var index = exports.instances.indexOf(this);
+  if (index !== -1) {
+    exports.instances.splice(index, 1);
+    return true;
+  } else {
+    return false;
+  }
+}
+
+/**
+ * Enables a debug mode by namespaces. This can include modes
+ * separated by a colon and wildcards.
+ *
+ * @param {String} namespaces
+ * @api public
+ */
+
+function enable(namespaces) {
+  exports.save(namespaces);
+
+  exports.names = [];
+  exports.skips = [];
+
+  var i;
+  var split = (typeof namespaces === 'string' ? namespaces : '').split(/[\s,]+/);
+  var len = split.length;
+
+  for (i = 0; i < len; i++) {
+    if (!split[i]) continue; // ignore empty strings
+    namespaces = split[i].replace(/\*/g, '.*?');
+    if (namespaces[0] === '-') {
+      exports.skips.push(new RegExp('^' + namespaces.substr(1) + '$'));
+    } else {
+      exports.names.push(new RegExp('^' + namespaces + '$'));
+    }
+  }
+
+  for (i = 0; i < exports.instances.length; i++) {
+    var instance = exports.instances[i];
+    instance.enabled = exports.enabled(instance.namespace);
+  }
+}
+
+/**
+ * Disable debug output.
+ *
+ * @api public
+ */
+
+function disable() {
+  exports.enable('');
+}
+
+/**
+ * Returns true if the given mode name is enabled, false otherwise.
+ *
+ * @param {String} name
+ * @return {Boolean}
+ * @api public
+ */
+
+function enabled(name) {
+  if (name[name.length - 1] === '*') {
+    return true;
+  }
+  var i, len;
+  for (i = 0, len = exports.skips.length; i < len; i++) {
+    if (exports.skips[i].test(name)) {
+      return false;
+    }
+  }
+  for (i = 0, len = exports.names.length; i < len; i++) {
+    if (exports.names[i].test(name)) {
+      return true;
+    }
+  }
+  return false;
+}
+
+/**
+ * Coerce `val`.
+ *
+ * @param {Mixed} val
+ * @return {Mixed}
+ * @api private
+ */
+
+function coerce(val) {
+  if (val instanceof Error) return val.stack || val.message;
+  return val;
+}
+
+
+/***/ }),
+/* 139 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// Basic Javascript Elliptic Curve implementation
+// Ported loosely from BouncyCastle's Java EC code
+// Only Fp curves implemented for now
+
+// Requires jsbn.js and jsbn2.js
+var BigInteger = __webpack_require__(81).BigInteger
+var Barrett = BigInteger.prototype.Barrett
+
+// ----------------
+// ECFieldElementFp
+
+// constructor
+function ECFieldElementFp(q,x) {
+    this.x = x;
+    // TODO if(x.compareTo(q) >= 0) error
+    this.q = q;
+}
+
+function feFpEquals(other) {
+    if(other == this) return true;
+    return (this.q.equals(other.q) && this.x.equals(other.x));
+}
+
+function feFpToBigInteger() {
+    return this.x;
+}
+
+function feFpNegate() {
+    return new ECFieldElementFp(this.q, this.x.negate().mod(this.q));
+}
+
+function feFpAdd(b) {
+    return new ECFieldElementFp(this.q, this.x.add(b.toBigInteger()).mod(this.q));
+}
+
+function feFpSubtract(b) {
+    return new ECFieldElementFp(this.q, this.x.subtract(b.toBigInteger()).mod(this.q));
+}
+
+function feFpMultiply(b) {
+    return new ECFieldElementFp(this.q, this.x.multiply(b.toBigInteger()).mod(this.q));
+}
+
+function feFpSquare() {
+    return new ECFieldElementFp(this.q, this.x.square().mod(this.q));
+}
+
+function feFpDivide(b) {
+    return new ECFieldElementFp(this.q, this.x.multiply(b.toBigInteger().modInverse(this.q)).mod(this.q));
+}
+
+ECFieldElementFp.prototype.equals = feFpEquals;
+ECFieldElementFp.prototype.toBigInteger = feFpToBigInteger;
+ECFieldElementFp.prototype.negate = feFpNegate;
+ECFieldElementFp.prototype.add = feFpAdd;
+ECFieldElementFp.prototype.subtract = feFpSubtract;
+ECFieldElementFp.prototype.multiply = feFpMultiply;
+ECFieldElementFp.prototype.square = feFpSquare;
+ECFieldElementFp.prototype.divide = feFpDivide;
+
+// ----------------
+// ECPointFp
+
+// constructor
+function ECPointFp(curve,x,y,z) {
+    this.curve = curve;
+    this.x = x;
+    this.y = y;
+    // Projective coordinates: either zinv == null or z * zinv == 1
+    // z and zinv are just BigIntegers, not fieldElements
+    if(z == null) {
+      this.z = BigInteger.ONE;
+    }
+    else {
+      this.z = z;
+    }
+    this.zinv = null;
+    //TODO: compression flag
+}
+
+function pointFpGetX() {
+    if(this.zinv == null) {
+      this.zinv = this.z.modInverse(this.curve.q);
+    }
+    var r = this.x.toBigInteger().multiply(this.zinv);
+    this.curve.reduce(r);
+    return this.curve.fromBigInteger(r);
+}
+
+function pointFpGetY() {
+    if(this.zinv == null) {
+      this.zinv = this.z.modInverse(this.curve.q);
+    }
+    var r = this.y.toBigInteger().multiply(this.zinv);
+    this.curve.reduce(r);
+    return this.curve.fromBigInteger(r);
+}
+
+function pointFpEquals(other) {
+    if(other == this) return true;
+    if(this.isInfinity()) return other.isInfinity();
+    if(other.isInfinity()) return this.isInfinity();
+    var u, v;
+    // u = Y2 * Z1 - Y1 * Z2
+    u = other.y.toBigInteger().multiply(this.z).subtract(this.y.toBigInteger().multiply(other.z)).mod(this.curve.q);
+    if(!u.equals(BigInteger.ZERO)) return false;
+    // v = X2 * Z1 - X1 * Z2
+    v = other.x.toBigInteger().multiply(this.z).subtract(this.x.toBigInteger().multiply(other.z)).mod(this.curve.q);
+    return v.equals(BigInteger.ZERO);
+}
+
+function pointFpIsInfinity() {
+    if((this.x == null) && (this.y == null)) return true;
+    return this.z.equals(BigInteger.ZERO) && !this.y.toBigInteger().equals(BigInteger.ZERO);
+}
+
+function pointFpNegate() {
+    return new ECPointFp(this.curve, this.x, this.y.negate(), this.z);
+}
+
+function pointFpAdd(b) {
+    if(this.isInfinity()) return b;
+    if(b.isInfinity()) return this;
+
+    // u = Y2 * Z1 - Y1 * Z2
+    var u = b.y.toBigInteger().multiply(this.z).subtract(this.y.toBigInteger().multiply(b.z)).mod(this.curve.q);
+    // v = X2 * Z1 - X1 * Z2
+    var v = b.x.toBigInteger().multiply(this.z).subtract(this.x.toBigInteger().multiply(b.z)).mod(this.curve.q);
+
+    if(BigInteger.ZERO.equals(v)) {
+        if(BigInteger.ZERO.equals(u)) {
+            return this.twice(); // this == b, so double
+        }
+	return this.curve.getInfinity(); // this = -b, so infinity
+    }
+
+    var THREE = new BigInteger("3");
+    var x1 = this.x.toBigInteger();
+    var y1 = this.y.toBigInteger();
+    var x2 = b.x.toBigInteger();
+    var y2 = b.y.toBigInteger();
+
+    var v2 = v.square();
+    var v3 = v2.multiply(v);
+    var x1v2 = x1.multiply(v2);
+    var zu2 = u.square().multiply(this.z);
+
+    // x3 = v * (z2 * (z1 * u^2 - 2 * x1 * v^2) - v^3)
+    var x3 = zu2.subtract(x1v2.shiftLeft(1)).multiply(b.z).subtract(v3).multiply(v).mod(this.curve.q);
+    // y3 = z2 * (3 * x1 * u * v^2 - y1 * v^3 - z1 * u^3) + u * v^3
+    var y3 = x1v2.multiply(THREE).multiply(u).subtract(y1.multiply(v3)).subtract(zu2.multiply(u)).multiply(b.z).add(u.multiply(v3)).mod(this.curve.q);
+    // z3 = v^3 * z1 * z2
+    var z3 = v3.multiply(this.z).multiply(b.z).mod(this.curve.q);
+
+    return new ECPointFp(this.curve, this.curve.fromBigInteger(x3), this.curve.fromBigInteger(y3), z3);
+}
+
+function pointFpTwice() {
+    if(this.isInfinity()) return this;
+    if(this.y.toBigInteger().signum() == 0) return this.curve.getInfinity();
+
+    // TODO: optimized handling of constants
+    var THREE = new BigInteger("3");
+    var x1 = this.x.toBigInteger();
+    var y1 = this.y.toBigInteger();
+
+    var y1z1 = y1.multiply(this.z);
+    var y1sqz1 = y1z1.multiply(y1).mod(this.curve.q);
+    var a = this.curve.a.toBigInteger();
+
+    // w = 3 * x1^2 + a * z1^2
+    var w = x1.square().multiply(THREE);
+    if(!BigInteger.ZERO.equals(a)) {
+      w = w.add(this.z.square().multiply(a));
+    }
+    w = w.mod(this.curve.q);
+    //this.curve.reduce(w);
+    // x3 = 2 * y1 * z1 * (w^2 - 8 * x1 * y1^2 * z1)
+    var x3 = w.square().subtract(x1.shiftLeft(3).multiply(y1sqz1)).shiftLeft(1).multiply(y1z1).mod(this.curve.q);
+    // y3 = 4 * y1^2 * z1 * (3 * w * x1 - 2 * y1^2 * z1) - w^3
+    var y3 = w.multiply(THREE).multiply(x1).subtract(y1sqz1.shiftLeft(1)).shiftLeft(2).multiply(y1sqz1).subtract(w.square().multiply(w)).mod(this.curve.q);
+    // z3 = 8 * (y1 * z1)^3
+    var z3 = y1z1.square().multiply(y1z1).shiftLeft(3).mod(this.curve.q);
+
+    return new ECPointFp(this.curve, this.curve.fromBigInteger(x3), this.curve.fromBigInteger(y3), z3);
+}
+
+// Simple NAF (Non-Adjacent Form) multiplication algorithm
+// TODO: modularize the multiplication algorithm
+function pointFpMultiply(k) {
+    if(this.isInfinity()) return this;
+    if(k.signum() == 0) return this.curve.getInfinity();
+
+    var e = k;
+    var h = e.multiply(new BigInteger("3"));
+
+    var neg = this.negate();
+    var R = this;
+
+    var i;
+    for(i = h.bitLength() - 2; i > 0; --i) {
+	R = R.twice();
+
+	var hBit = h.testBit(i);
+	var eBit = e.testBit(i);
+
+	if (hBit != eBit) {
+	    R = R.add(hBit ? this : neg);
+	}
+    }
+
+    return R;
+}
+
+// Compute this*j + x*k (simultaneous multiplication)
+function pointFpMultiplyTwo(j,x,k) {
+  var i;
+  if(j.bitLength() > k.bitLength())
+    i = j.bitLength() - 1;
+  else
+    i = k.bitLength() - 1;
+
+  var R = this.curve.getInfinity();
+  var both = this.add(x);
+  while(i >= 0) {
+    R = R.twice();
+    if(j.testBit(i)) {
+      if(k.testBit(i)) {
+        R = R.add(both);
+      }
+      else {
+        R = R.add(this);
+      }
+    }
+    else {
+      if(k.testBit(i)) {
+        R = R.add(x);
+      }
+    }
+    --i;
+  }
+
+  return R;
+}
+
+ECPointFp.prototype.getX = pointFpGetX;
+ECPointFp.prototype.getY = pointFpGetY;
+ECPointFp.prototype.equals = pointFpEquals;
+ECPointFp.prototype.isInfinity = pointFpIsInfinity;
+ECPointFp.prototype.negate = pointFpNegate;
+ECPointFp.prototype.add = pointFpAdd;
+ECPointFp.prototype.twice = pointFpTwice;
+ECPointFp.prototype.multiply = pointFpMultiply;
+ECPointFp.prototype.multiplyTwo = pointFpMultiplyTwo;
+
+// ----------------
+// ECCurveFp
+
+// constructor
+function ECCurveFp(q,a,b) {
+    this.q = q;
+    this.a = this.fromBigInteger(a);
+    this.b = this.fromBigInteger(b);
+    this.infinity = new ECPointFp(this, null, null);
+    this.reducer = new Barrett(this.q);
+}
+
+function curveFpGetQ() {
+    return this.q;
+}
+
+function curveFpGetA() {
+    return this.a;
+}
+
+function curveFpGetB() {
+    return this.b;
+}
+
+function curveFpEquals(other) {
+    if(other == this) return true;
+    return(this.q.equals(other.q) && this.a.equals(other.a) && this.b.equals(other.b));
+}
+
+function curveFpGetInfinity() {
+    return this.infinity;
+}
+
+function curveFpFromBigInteger(x) {
+    return new ECFieldElementFp(this.q, x);
+}
+
+function curveReduce(x) {
+    this.reducer.reduce(x);
+}
+
+// for now, work with hex strings because they're easier in JS
+function curveFpDecodePointHex(s) {
+    switch(parseInt(s.substr(0,2), 16)) { // first byte
+    case 0:
+	return this.infinity;
+    case 2:
+    case 3:
+	// point compression not supported yet
+	return null;
+    case 4:
+    case 6:
+    case 7:
+	var len = (s.length - 2) / 2;
+	var xHex = s.substr(2, len);
+	var yHex = s.substr(len+2, len);
+
+	return new ECPointFp(this,
+			     this.fromBigInteger(new BigInteger(xHex, 16)),
+			     this.fromBigInteger(new BigInteger(yHex, 16)));
+
+    default: // unsupported
+	return null;
+    }
+}
+
+function curveFpEncodePointHex(p) {
+	if (p.isInfinity()) return "00";
+	var xHex = p.getX().toBigInteger().toString(16);
+	var yHex = p.getY().toBigInteger().toString(16);
+	var oLen = this.getQ().toString(16).length;
+	if ((oLen % 2) != 0) oLen++;
+	while (xHex.length < oLen) {
+		xHex = "0" + xHex;
+	}
+	while (yHex.length < oLen) {
+		yHex = "0" + yHex;
+	}
+	return "04" + xHex + yHex;
+}
+
+ECCurveFp.prototype.getQ = curveFpGetQ;
+ECCurveFp.prototype.getA = curveFpGetA;
+ECCurveFp.prototype.getB = curveFpGetB;
+ECCurveFp.prototype.equals = curveFpEquals;
+ECCurveFp.prototype.getInfinity = curveFpGetInfinity;
+ECCurveFp.prototype.fromBigInteger = curveFpFromBigInteger;
+ECCurveFp.prototype.reduce = curveReduce;
+//ECCurveFp.prototype.decodePointHex = curveFpDecodePointHex;
+ECCurveFp.prototype.encodePointHex = curveFpEncodePointHex;
+
+// from: https://github.com/kaielvin/jsbn-ec-point-compression
+ECCurveFp.prototype.decodePointHex = function(s)
+{
+	var yIsEven;
+    switch(parseInt(s.substr(0,2), 16)) { // first byte
+    case 0:
+	return this.infinity;
+    case 2:
+	yIsEven = false;
+    case 3:
+	if(yIsEven == undefined) yIsEven = true;
+	var len = s.length - 2;
+	var xHex = s.substr(2, len);
+	var x = this.fromBigInteger(new BigInteger(xHex,16));
+	var alpha = x.multiply(x.square().add(this.getA())).add(this.getB());
+	var beta = alpha.sqrt();
+
+    if (beta == null) throw "Invalid point compression";
+
+    var betaValue = beta.toBigInteger();
+    if (betaValue.testBit(0) != yIsEven)
+    {
+        // Use the other root
+        beta = this.fromBigInteger(this.getQ().subtract(betaValue));
+    }
+    return new ECPointFp(this,x,beta);
+    case 4:
+    case 6:
+    case 7:
+	var len = (s.length - 2) / 2;
+	var xHex = s.substr(2, len);
+	var yHex = s.substr(len+2, len);
+
+	return new ECPointFp(this,
+			     this.fromBigInteger(new BigInteger(xHex, 16)),
+			     this.fromBigInteger(new BigInteger(yHex, 16)));
+
+    default: // unsupported
+	return null;
+    }
+}
+ECCurveFp.prototype.encodeCompressedPointHex = function(p)
+{
+	if (p.isInfinity()) return "00";
+	var xHex = p.getX().toBigInteger().toString(16);
+	var oLen = this.getQ().toString(16).length;
+	if ((oLen % 2) != 0) oLen++;
+	while (xHex.length < oLen)
+		xHex = "0" + xHex;
+	var yPrefix;
+	if(p.getY().toBigInteger().isEven()) yPrefix = "02";
+	else                                 yPrefix = "03";
+
+	return yPrefix + xHex;
+}
+
+
+ECFieldElementFp.prototype.getR = function()
+{
+	if(this.r != undefined) return this.r;
+
+    this.r = null;
+    var bitLength = this.q.bitLength();
+    if (bitLength > 128)
+    {
+        var firstWord = this.q.shiftRight(bitLength - 64);
+        if (firstWord.intValue() == -1)
+        {
+            this.r = BigInteger.ONE.shiftLeft(bitLength).subtract(this.q);
+        }
+    }
+    return this.r;
+}
+ECFieldElementFp.prototype.modMult = function(x1,x2)
+{
+    return this.modReduce(x1.multiply(x2));
+}
+ECFieldElementFp.prototype.modReduce = function(x)
+{
+    if (this.getR() != null)
+    {
+        var qLen = q.bitLength();
+        while (x.bitLength() > (qLen + 1))
+        {
+            var u = x.shiftRight(qLen);
+            var v = x.subtract(u.shiftLeft(qLen));
+            if (!this.getR().equals(BigInteger.ONE))
+            {
+                u = u.multiply(this.getR());
+            }
+            x = u.add(v); 
+        }
+        while (x.compareTo(q) >= 0)
+        {
+            x = x.subtract(q);
+        }
+    }
+    else
+    {
+        x = x.mod(q);
+    }
+    return x;
+}
+ECFieldElementFp.prototype.sqrt = function()
+{
+    if (!this.q.testBit(0)) throw "unsupported";
+
+    // p mod 4 == 3
+    if (this.q.testBit(1))
+    {
+    	var z = new ECFieldElementFp(this.q,this.x.modPow(this.q.shiftRight(2).add(BigInteger.ONE),this.q));
+    	return z.square().equals(this) ? z : null;
+    }
+
+    // p mod 4 == 1
+    var qMinusOne = this.q.subtract(BigInteger.ONE);
+
+    var legendreExponent = qMinusOne.shiftRight(1);
+    if (!(this.x.modPow(legendreExponent, this.q).equals(BigInteger.ONE)))
+    {
+        return null;
+    }
+
+    var u = qMinusOne.shiftRight(2);
+    var k = u.shiftLeft(1).add(BigInteger.ONE);
+
+    var Q = this.x;
+    var fourQ = modDouble(modDouble(Q));
+
+    var U, V;
+    do
+    {
+        var P;
+        do
+        {
+            P = new BigInteger(this.q.bitLength(), new SecureRandom());
+        }
+        while (P.compareTo(this.q) >= 0
+            || !(P.multiply(P).subtract(fourQ).modPow(legendreExponent, this.q).equals(qMinusOne)));
+
+        var result = this.lucasSequence(P, Q, k);
+        U = result[0];
+        V = result[1];
+
+        if (this.modMult(V, V).equals(fourQ))
+        {
+            // Integer division by 2, mod q
+            if (V.testBit(0))
+            {
+                V = V.add(q);
+            }
+
+            V = V.shiftRight(1);
+
+            return new ECFieldElementFp(q,V);
+        }
+    }
+    while (U.equals(BigInteger.ONE) || U.equals(qMinusOne));
+
+    return null;
+}
+ECFieldElementFp.prototype.lucasSequence = function(P,Q,k)
+{
+    var n = k.bitLength();
+    var s = k.getLowestSetBit();
+
+    var Uh = BigInteger.ONE;
+    var Vl = BigInteger.TWO;
+    var Vh = P;
+    var Ql = BigInteger.ONE;
+    var Qh = BigInteger.ONE;
+
+    for (var j = n - 1; j >= s + 1; --j)
+    {
+        Ql = this.modMult(Ql, Qh);
+
+        if (k.testBit(j))
+        {
+            Qh = this.modMult(Ql, Q);
+            Uh = this.modMult(Uh, Vh);
+            Vl = this.modReduce(Vh.multiply(Vl).subtract(P.multiply(Ql)));
+            Vh = this.modReduce(Vh.multiply(Vh).subtract(Qh.shiftLeft(1)));
+        }
+        else
+        {
+            Qh = Ql;
+            Uh = this.modReduce(Uh.multiply(Vl).subtract(Ql));
+            Vh = this.modReduce(Vh.multiply(Vl).subtract(P.multiply(Ql)));
+            Vl = this.modReduce(Vl.multiply(Vl).subtract(Ql.shiftLeft(1)));
+        }
+    }
+
+    Ql = this.modMult(Ql, Qh);
+    Qh = this.modMult(Ql, Q);
+    Uh = this.modReduce(Uh.multiply(Vl).subtract(Ql));
+    Vl = this.modReduce(Vh.multiply(Vl).subtract(P.multiply(Ql)));
+    Ql = this.modMult(Ql, Qh);
+
+    for (var j = 1; j <= s; ++j)
+    {
+        Uh = this.modMult(Uh, Vl);
+        Vl = this.modReduce(Vl.multiply(Vl).subtract(Ql.shiftLeft(1)));
+        Ql = this.modMult(Ql, Ql);
+    }
+
+    return [ Uh, Vl ];
+}
+
+var exports = {
+  ECCurveFp: ECCurveFp,
+  ECPointFp: ECPointFp,
+  ECFieldElementFp: ECFieldElementFp
+}
+
+module.exports = exports
+
+
+/***/ }),
+/* 140 */
+/***/ (function(module, exports, __webpack_require__) {
+
+module.exports = realpath
+realpath.realpath = realpath
+realpath.sync = realpathSync
+realpath.realpathSync = realpathSync
+realpath.monkeypatch = monkeypatch
+realpath.unmonkeypatch = unmonkeypatch
+
+var fs = __webpack_require__(5)
+var origRealpath = fs.realpath
+var origRealpathSync = fs.realpathSync
+
+var version = process.version
+var ok = /^v[0-5]\./.test(version)
+var old = __webpack_require__(271)
+
+function newError (er) {
+  return er && er.syscall === 'realpath' && (
+    er.code === 'ELOOP' ||
+    er.code === 'ENOMEM' ||
+    er.code === 'ENAMETOOLONG'
+  )
+}
+
+function realpath (p, cache, cb) {
+  if (ok) {
+    return origRealpath(p, cache, cb)
+  }
+
+  if (typeof cache === 'function') {
+    cb = cache
+    cache = null
+  }
+  origRealpath(p, cache, function (er, result) {
+    if (newError(er)) {
+      old.realpath(p, cache, cb)
+    } else {
+      cb(er, result)
+    }
+  })
+}
+
+function realpathSync (p, cache) {
+  if (ok) {
+    return origRealpathSync(p, cache)
+  }
+
+  try {
+    return origRealpathSync(p, cache)
+  } catch (er) {
+    if (newError(er)) {
+      return old.realpathSync(p, cache)
+    } else {
+      throw er
+    }
+  }
+}
+
+function monkeypatch () {
+  fs.realpath = realpath
+  fs.realpathSync = realpathSync
+}
+
+function unmonkeypatch () {
+  fs.realpath = origRealpath
+  fs.realpathSync = origRealpathSync
+}
+
+
+/***/ }),
+/* 141 */
+/***/ (function(module, exports, __webpack_require__) {
+
+exports.alphasort = alphasort
+exports.alphasorti = alphasorti
+exports.setopts = setopts
+exports.ownProp = ownProp
+exports.makeAbs = makeAbs
+exports.finish = finish
+exports.mark = mark
+exports.isIgnored = isIgnored
+exports.childrenIgnored = childrenIgnored
+
+function ownProp (obj, field) {
+  return Object.prototype.hasOwnProperty.call(obj, field)
+}
+
+var path = __webpack_require__(0)
+var minimatch = __webpack_require__(82)
+var isAbsolute = __webpack_require__(101)
+var Minimatch = minimatch.Minimatch
+
+function alphasorti (a, b) {
+  return a.toLowerCase().localeCompare(b.toLowerCase())
+}
+
+function alphasort (a, b) {
+  return a.localeCompare(b)
+}
+
+function setupIgnores (self, options) {
+  self.ignore = options.ignore || []
+
+  if (!Array.isArray(self.ignore))
+    self.ignore = [self.ignore]
+
+  if (self.ignore.length) {
+    self.ignore = self.ignore.map(ignoreMap)
+  }
+}
+
+// ignore patterns are always in dot:true mode.
+function ignoreMap (pattern) {
+  var gmatcher = null
+  if (pattern.slice(-3) === '/**') {
+    var gpattern = pattern.replace(/(\/\*\*)+$/, '')
+    gmatcher = new Minimatch(gpattern, { dot: true })
+  }
+
+  return {
+    matcher: new Minimatch(pattern, { dot: true }),
+    gmatcher: gmatcher
+  }
+}
+
+function setopts (self, pattern, options) {
+  if (!options)
+    options = {}
+
+  // base-matching: just use globstar for that.
+  if (options.matchBase && -1 === pattern.indexOf("/")) {
+    if (options.noglobstar) {
+      throw new Error("base matching requires globstar")
+    }
+    pattern = "**/" + pattern
+  }
+
+  self.silent = !!options.silent
+  self.pattern = pattern
+  self.strict = options.strict !== false
+  self.realpath = !!options.realpath
+  self.realpathCache = options.realpathCache || Object.create(null)
+  self.follow = !!options.follow
+  self.dot = !!options.dot
+  self.mark = !!options.mark
+  self.nodir = !!options.nodir
+  if (self.nodir)
+    self.mark = true
+  self.sync = !!options.sync
+  self.nounique = !!options.nounique
+  self.nonull = !!options.nonull
+  self.nosort = !!options.nosort
+  self.nocase = !!options.nocase
+  self.stat = !!options.stat
+  self.noprocess = !!options.noprocess
+  self.absolute = !!options.absolute
+
+  self.maxLength = options.maxLength || Infinity
+  self.cache = options.cache || Object.create(null)
+  self.statCache = options.statCache || Object.create(null)
+  self.symlinks = options.symlinks || Object.create(null)
+
+  setupIgnores(self, options)
+
+  self.changedCwd = false
+  var cwd = process.cwd()
+  if (!ownProp(options, "cwd"))
+    self.cwd = cwd
+  else {
+    self.cwd = path.resolve(options.cwd)
+    self.changedCwd = self.cwd !== cwd
+  }
+
+  self.root = options.root || path.resolve(self.cwd, "/")
+  self.root = path.resolve(self.root)
+  if (process.platform === "win32")
+    self.root = self.root.replace(/\\/g, "/")
+
+  // TODO: is an absolute `cwd` supposed to be resolved against `root`?
+  // e.g. { cwd: '/test', root: __dirname } === path.join(__dirname, '/test')
+  self.cwdAbs = isAbsolute(self.cwd) ? self.cwd : makeAbs(self, self.cwd)
+  if (process.platform === "win32")
+    self.cwdAbs = self.cwdAbs.replace(/\\/g, "/")
+  self.nomount = !!options.nomount
+
+  // disable comments and negation in Minimatch.
+  // Note that they are not supported in Glob itself anyway.
+  options.nonegate = true
+  options.nocomment = true
+
+  self.minimatch = new Minimatch(pattern, options)
+  self.options = self.minimatch.options
+}
+
+function finish (self) {
+  var nou = self.nounique
+  var all = nou ? [] : Object.create(null)
+
+  for (var i = 0, l = self.matches.length; i < l; i ++) {
+    var matches = self.matches[i]
+    if (!matches || Object.keys(matches).length === 0) {
+      if (self.nonull) {
+        // do like the shell, and spit out the literal glob
+        var literal = self.minimatch.globSet[i]
+        if (nou)
+          all.push(literal)
+        else
+          all[literal] = true
+      }
+    } else {
+      // had matches
+      var m = Object.keys(matches)
+      if (nou)
+        all.push.apply(all, m)
+      else
+        m.forEach(function (m) {
+          all[m] = true
+        })
+    }
+  }
+
+  if (!nou)
+    all = Object.keys(all)
+
+  if (!self.nosort)
+    all = all.sort(self.nocase ? alphasorti : alphasort)
+
+  // at *some* point we statted all of these
+  if (self.mark) {
+    for (var i = 0; i < all.length; i++) {
+      all[i] = self._mark(all[i])
+    }
+    if (self.nodir) {
+      all = all.filter(function (e) {
+        var notDir = !(/\/$/.test(e))
+        var c = self.cache[e] || self.cache[makeAbs(self, e)]
+        if (notDir && c)
+          notDir = c !== 'DIR' && !Array.isArray(c)
+        return notDir
+      })
+    }
+  }
+
+  if (self.ignore.length)
+    all = all.filter(function(m) {
+      return !isIgnored(self, m)
+    })
+
+  self.found = all
+}
+
+function mark (self, p) {
+  var abs = makeAbs(self, p)
+  var c = self.cache[abs]
+  var m = p
+  if (c) {
+    var isDir = c === 'DIR' || Array.isArray(c)
+    var slash = p.slice(-1) === '/'
+
+    if (isDir && !slash)
+      m += '/'
+    else if (!isDir && slash)
+      m = m.slice(0, -1)
+
+    if (m !== p) {
+      var mabs = makeAbs(self, m)
+      self.statCache[mabs] = self.statCache[abs]
+      self.cache[mabs] = self.cache[abs]
+    }
+  }
+
+  return m
+}
+
+// lotta situps...
+function makeAbs (self, f) {
+  var abs = f
+  if (f.charAt(0) === '/') {
+    abs = path.join(self.root, f)
+  } else if (isAbsolute(f) || f === '') {
+    abs = f
+  } else if (self.changedCwd) {
+    abs = path.resolve(self.cwd, f)
+  } else {
+    abs = path.resolve(f)
+  }
+
+  if (process.platform === 'win32')
+    abs = abs.replace(/\\/g, '/')
+
+  return abs
+}
+
+
+// Return true, if pattern ends with globstar '**', for the accompanying parent directory.
+// Ex:- If node_modules/** is the pattern, add 'node_modules' to ignore list along with it's contents
+function isIgnored (self, path) {
+  if (!self.ignore.length)
+    return false
+
+  return self.ignore.some(function(item) {
+    return item.matcher.match(path) || !!(item.gmatcher && item.gmatcher.match(path))
+  })
+}
+
+function childrenIgnored (self, path) {
+  if (!self.ignore.length)
+    return false
+
+  return self.ignore.some(function(item) {
+    return !!(item.gmatcher && item.gmatcher.match(path))
+  })
+}
+
+
+/***/ }),
+/* 142 */
+/***/ (function(module, exports) {
+
+
+module.exports = function(det, rec, confidence, name, lang) {
+  this.confidence = confidence;
+  this.name = name || rec.name(det);
+  this.lang = lang;
+};
+
+
+/***/ }),
+/* 143 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+// Standard YAML's Core schema.
+// http://www.yaml.org/spec/1.2/spec.html#id2804923
+//
+// NOTE: JS-YAML does not support schema-specific tag resolution restrictions.
+// So, Core schema has no distinctions from JSON schema is JS-YAML.
+
+
+
+
+
+var Schema = __webpack_require__(44);
+
+
+module.exports = new Schema({
+  include: [
+    __webpack_require__(144)
+  ]
+});
+
+
+/***/ }),
+/* 144 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+// Standard YAML's JSON schema.
+// http://www.yaml.org/spec/1.2/spec.html#id2803231
+//
+// NOTE: JS-YAML does not support schema-specific tag resolution restrictions.
+// So, this schema is not such strict as defined in the YAML specification.
+// It allows numbers in binary notaion, use `Null` and `NULL` as `null`, etc.
+
+
+
+
+
+var Schema = __webpack_require__(44);
+
+
+module.exports = new Schema({
+  include: [
+    __webpack_require__(100)
+  ],
+  implicit: [
+    __webpack_require__(293),
+    __webpack_require__(285),
+    __webpack_require__(287),
+    __webpack_require__(286)
+  ]
+});
+
+
+/***/ }),
+/* 145 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var path = __webpack_require__(0);
+var fs = __webpack_require__(5);
+var _0777 = parseInt('0777', 8);
+
+module.exports = mkdirP.mkdirp = mkdirP.mkdirP = mkdirP;
+
+function mkdirP (p, opts, f, made) {
+    if (typeof opts === 'function') {
+        f = opts;
+        opts = {};
+    }
+    else if (!opts || typeof opts !== 'object') {
+        opts = { mode: opts };
+    }
+    
+    var mode = opts.mode;
+    var xfs = opts.fs || fs;
+    
+    if (mode === undefined) {
+        mode = _0777 & (~process.umask());
+    }
+    if (!made) made = null;
+    
+    var cb = f || function () {};
+    p = path.resolve(p);
+    
+    xfs.mkdir(p, mode, function (er) {
+        if (!er) {
+            made = made || p;
+            return cb(null, made);
+        }
+        switch (er.code) {
+            case 'ENOENT':
+                mkdirP(path.dirname(p), opts, function (er, made) {
+                    if (er) cb(er, made);
+                    else mkdirP(p, opts, cb, made);
+                });
+                break;
+
+            // In the case of any other error, just see if there's a dir
+            // there already.  If so, then hooray!  If not, then something
+            // is borked.
+            default:
+                xfs.stat(p, function (er2, stat) {
+                    // if the stat fails, then that's super weird.
+                    // let the original error be the failure reason.
+                    if (er2 || !stat.isDirectory()) cb(er, made)
+                    else cb(null, made);
+                });
+                break;
+        }
+    });
+}
+
+mkdirP.sync = function sync (p, opts, made) {
+    if (!opts || typeof opts !== 'object') {
+        opts = { mode: opts };
+    }
+    
+    var mode = opts.mode;
+    var xfs = opts.fs || fs;
+    
+    if (mode === undefined) {
+        mode = _0777 & (~process.umask());
+    }
+    if (!made) made = null;
+
+    p = path.resolve(p);
+
+    try {
+        xfs.mkdirSync(p, mode);
+        made = made || p;
+    }
+    catch (err0) {
+        switch (err0.code) {
+            case 'ENOENT' :
+                made = sync(path.dirname(p), opts, made);
+                sync(p, opts, made);
+                break;
+
+            // In the case of any other error, just see if there's a dir
+            // there already.  If so, then hooray!  If not, then something
+            // is borked.
+            default:
+                var stat;
+                try {
+                    stat = xfs.statSync(p);
+                }
+                catch (err1) {
+                    throw err0;
+                }
+                if (!stat.isDirectory()) throw err0;
+                break;
+        }
+    }
+
+    return made;
+};
+
+
+/***/ }),
+/* 146 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = defaultIfEmpty;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
+/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+
+
+function defaultIfEmpty(defaultValue) {
+    if (defaultValue === void 0) {
+        defaultValue = null;
+    }
+    return function (source) { return source.lift(new DefaultIfEmptyOperator(defaultValue)); };
+}
+var DefaultIfEmptyOperator = /*@__PURE__*/ (function () {
+    function DefaultIfEmptyOperator(defaultValue) {
+        this.defaultValue = defaultValue;
+    }
+    DefaultIfEmptyOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new DefaultIfEmptySubscriber(subscriber, this.defaultValue));
+    };
+    return DefaultIfEmptyOperator;
+}());
+var DefaultIfEmptySubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](DefaultIfEmptySubscriber, _super);
+    function DefaultIfEmptySubscriber(destination, defaultValue) {
+        var _this = _super.call(this, destination) || this;
+        _this.defaultValue = defaultValue;
+        _this.isEmpty = true;
+        return _this;
+    }
+    DefaultIfEmptySubscriber.prototype._next = function (value) {
+        this.isEmpty = false;
+        this.destination.next(value);
+    };
+    DefaultIfEmptySubscriber.prototype._complete = function () {
+        if (this.isEmpty) {
+            this.destination.next(this.defaultValue);
+        }
+        this.destination.complete();
+    };
+    return DefaultIfEmptySubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
+//# sourceMappingURL=defaultIfEmpty.js.map
+
+
+/***/ }),
+/* 147 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = filter;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
+/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+
+
+function filter(predicate, thisArg) {
+    return function filterOperatorFunction(source) {
+        return source.lift(new FilterOperator(predicate, thisArg));
+    };
+}
+var FilterOperator = /*@__PURE__*/ (function () {
+    function FilterOperator(predicate, thisArg) {
+        this.predicate = predicate;
+        this.thisArg = thisArg;
+    }
+    FilterOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new FilterSubscriber(subscriber, this.predicate, this.thisArg));
+    };
+    return FilterOperator;
+}());
+var FilterSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](FilterSubscriber, _super);
+    function FilterSubscriber(destination, predicate, thisArg) {
+        var _this = _super.call(this, destination) || this;
+        _this.predicate = predicate;
+        _this.thisArg = thisArg;
+        _this.count = 0;
+        return _this;
+    }
+    FilterSubscriber.prototype._next = function (value) {
+        var result;
+        try {
+            result = this.predicate.call(this.thisArg, value, this.count++);
+        }
+        catch (err) {
+            this.destination.error(err);
+            return;
+        }
+        if (result) {
+            this.destination.next(value);
+        }
+    };
+    return FilterSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
+//# sourceMappingURL=filter.js.map
+
+
+/***/ }),
+/* 148 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = mergeMap;
+/* unused harmony export MergeMapOperator */
+/* unused harmony export MergeMapSubscriber */
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_subscribeToResult__ = __webpack_require__(14);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__OuterSubscriber__ = __webpack_require__(13);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__InnerSubscriber__ = __webpack_require__(84);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__map__ = __webpack_require__(46);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__observable_from__ = __webpack_require__(62);
+/** PURE_IMPORTS_START tslib,_util_subscribeToResult,_OuterSubscriber,_InnerSubscriber,_map,_observable_from PURE_IMPORTS_END */
+
+
+
+
+
+
+function mergeMap(project, resultSelector, concurrent) {
+    if (concurrent === void 0) {
+        concurrent = Number.POSITIVE_INFINITY;
+    }
+    if (typeof resultSelector === 'function') {
+        return function (source) { return source.pipe(mergeMap(function (a, i) { return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_5__observable_from__["a" /* from */])(project(a, i)).pipe(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_4__map__["a" /* map */])(function (b, ii) { return resultSelector(a, b, i, ii); })); }, concurrent)); };
+    }
+    else if (typeof resultSelector === 'number') {
+        concurrent = resultSelector;
+    }
+    return function (source) { return source.lift(new MergeMapOperator(project, concurrent)); };
+}
+var MergeMapOperator = /*@__PURE__*/ (function () {
+    function MergeMapOperator(project, concurrent) {
+        if (concurrent === void 0) {
+            concurrent = Number.POSITIVE_INFINITY;
+        }
+        this.project = project;
+        this.concurrent = concurrent;
+    }
+    MergeMapOperator.prototype.call = function (observer, source) {
+        return source.subscribe(new MergeMapSubscriber(observer, this.project, this.concurrent));
+    };
+    return MergeMapOperator;
+}());
+
+var MergeMapSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](MergeMapSubscriber, _super);
+    function MergeMapSubscriber(destination, project, concurrent) {
+        if (concurrent === void 0) {
+            concurrent = Number.POSITIVE_INFINITY;
+        }
+        var _this = _super.call(this, destination) || this;
+        _this.project = project;
+        _this.concurrent = concurrent;
+        _this.hasCompleted = false;
+        _this.buffer = [];
+        _this.active = 0;
+        _this.index = 0;
+        return _this;
+    }
+    MergeMapSubscriber.prototype._next = function (value) {
+        if (this.active < this.concurrent) {
+            this._tryNext(value);
+        }
+        else {
+            this.buffer.push(value);
+        }
+    };
+    MergeMapSubscriber.prototype._tryNext = function (value) {
+        var result;
+        var index = this.index++;
+        try {
+            result = this.project(value, index);
+        }
+        catch (err) {
+            this.destination.error(err);
+            return;
+        }
+        this.active++;
+        this._innerSub(result, value, index);
+    };
+    MergeMapSubscriber.prototype._innerSub = function (ish, value, index) {
+        var innerSubscriber = new __WEBPACK_IMPORTED_MODULE_3__InnerSubscriber__["a" /* InnerSubscriber */](this, undefined, undefined);
+        var destination = this.destination;
+        destination.add(innerSubscriber);
+        __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__util_subscribeToResult__["a" /* subscribeToResult */])(this, ish, value, index, innerSubscriber);
+    };
+    MergeMapSubscriber.prototype._complete = function () {
+        this.hasCompleted = true;
+        if (this.active === 0 && this.buffer.length === 0) {
+            this.destination.complete();
+        }
+        this.unsubscribe();
+    };
+    MergeMapSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        this.destination.next(innerValue);
+    };
+    MergeMapSubscriber.prototype.notifyComplete = function (innerSub) {
+        var buffer = this.buffer;
+        this.remove(innerSub);
+        this.active--;
+        if (buffer.length > 0) {
+            this._next(buffer.shift());
+        }
+        else if (this.active === 0 && this.hasCompleted) {
+            this.destination.complete();
+        }
+    };
+    return MergeMapSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_2__OuterSubscriber__["a" /* OuterSubscriber */]));
+
+//# sourceMappingURL=mergeMap.js.map
+
+
+/***/ }),
+/* 149 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AsyncAction; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Action__ = __webpack_require__(918);
+/** PURE_IMPORTS_START tslib,_Action PURE_IMPORTS_END */
+
+
+var AsyncAction = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](AsyncAction, _super);
+    function AsyncAction(scheduler, work) {
+        var _this = _super.call(this, scheduler, work) || this;
+        _this.scheduler = scheduler;
+        _this.work = work;
+        _this.pending = false;
+        return _this;
+    }
+    AsyncAction.prototype.schedule = function (state, delay) {
+        if (delay === void 0) {
+            delay = 0;
+        }
+        if (this.closed) {
+            return this;
+        }
+        this.state = state;
+        var id = this.id;
+        var scheduler = this.scheduler;
+        if (id != null) {
+            this.id = this.recycleAsyncId(scheduler, id, delay);
+        }
+        this.pending = true;
+        this.delay = delay;
+        this.id = this.id || this.requestAsyncId(scheduler, this.id, delay);
+        return this;
+    };
+    AsyncAction.prototype.requestAsyncId = function (scheduler, id, delay) {
+        if (delay === void 0) {
+            delay = 0;
+        }
+        return setInterval(scheduler.flush.bind(scheduler, this), delay);
+    };
+    AsyncAction.prototype.recycleAsyncId = function (scheduler, id, delay) {
+        if (delay === void 0) {
+            delay = 0;
+        }
+        if (delay !== null && this.delay === delay && this.pending === false) {
+            return id;
+        }
+        clearInterval(id);
+    };
+    AsyncAction.prototype.execute = function (state, delay) {
+        if (this.closed) {
+            return new Error('executing a cancelled action');
+        }
+        this.pending = false;
+        var error = this._execute(state, delay);
+        if (error) {
+            return error;
+        }
+        else if (this.pending === false && this.id != null) {
+            this.id = this.recycleAsyncId(this.scheduler, this.id, null);
+        }
+    };
+    AsyncAction.prototype._execute = function (state, delay) {
+        var errored = false;
+        var errorValue = undefined;
+        try {
+            this.work(state);
+        }
+        catch (e) {
+            errored = true;
+            errorValue = !!e && e || new Error(e);
+        }
+        if (errored) {
+            this.unsubscribe();
+            return errorValue;
+        }
+    };
+    AsyncAction.prototype._unsubscribe = function () {
+        var id = this.id;
+        var scheduler = this.scheduler;
+        var actions = scheduler.actions;
+        var index = actions.indexOf(this);
+        this.work = null;
+        this.state = null;
+        this.pending = false;
+        this.scheduler = null;
+        if (index !== -1) {
+            actions.splice(index, 1);
+        }
+        if (id != null) {
+            this.id = this.recycleAsyncId(scheduler, id, null);
+        }
+        this.delay = null;
+    };
+    return AsyncAction;
+}(__WEBPACK_IMPORTED_MODULE_1__Action__["a" /* Action */]));
+
+//# sourceMappingURL=AsyncAction.js.map
+
+
+/***/ }),
+/* 150 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AsyncScheduler; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Scheduler__ = __webpack_require__(421);
+/** PURE_IMPORTS_START tslib,_Scheduler PURE_IMPORTS_END */
+
+
+var AsyncScheduler = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](AsyncScheduler, _super);
+    function AsyncScheduler(SchedulerAction, now) {
+        if (now === void 0) {
+            now = __WEBPACK_IMPORTED_MODULE_1__Scheduler__["a" /* Scheduler */].now;
+        }
+        var _this = _super.call(this, SchedulerAction, function () {
+            if (AsyncScheduler.delegate && AsyncScheduler.delegate !== _this) {
+                return AsyncScheduler.delegate.now();
+            }
+            else {
+                return now();
+            }
+        }) || this;
+        _this.actions = [];
+        _this.active = false;
+        _this.scheduled = undefined;
+        return _this;
+    }
+    AsyncScheduler.prototype.schedule = function (work, delay, state) {
+        if (delay === void 0) {
+            delay = 0;
+        }
+        if (AsyncScheduler.delegate && AsyncScheduler.delegate !== this) {
+            return AsyncScheduler.delegate.schedule(work, delay, state);
+        }
+        else {
+            return _super.prototype.schedule.call(this, work, delay, state);
+        }
+    };
+    AsyncScheduler.prototype.flush = function (action) {
+        var actions = this.actions;
+        if (this.active) {
+            actions.push(action);
+            return;
+        }
+        var error;
+        this.active = true;
+        do {
+            if (error = action.execute(action.state, action.delay)) {
+                break;
+            }
+        } while (action = actions.shift());
+        this.active = false;
+        if (error) {
+            while (action = actions.shift()) {
+                action.unsubscribe();
+            }
+            throw error;
+        }
+    };
+    return AsyncScheduler;
+}(__WEBPACK_IMPORTED_MODULE_1__Scheduler__["a" /* Scheduler */]));
+
+//# sourceMappingURL=AsyncScheduler.js.map
+
+
+/***/ }),
+/* 151 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* unused harmony export getSymbolIterator */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return iterator; });
+/* unused harmony export $$iterator */
+/** PURE_IMPORTS_START  PURE_IMPORTS_END */
+function getSymbolIterator() {
+    if (typeof Symbol !== 'function' || !Symbol.iterator) {
+        return '@@iterator';
+    }
+    return Symbol.iterator;
+}
+var iterator = /*@__PURE__*/ getSymbolIterator();
+var $$iterator = iterator;
+//# sourceMappingURL=iterator.js.map
+
+
+/***/ }),
+/* 152 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ArgumentOutOfRangeError; });
+/** PURE_IMPORTS_START  PURE_IMPORTS_END */
+function ArgumentOutOfRangeErrorImpl() {
+    Error.call(this);
+    this.message = 'argument out of range';
+    this.name = 'ArgumentOutOfRangeError';
+    return this;
+}
+ArgumentOutOfRangeErrorImpl.prototype = /*@__PURE__*/ Object.create(Error.prototype);
+var ArgumentOutOfRangeError = ArgumentOutOfRangeErrorImpl;
+//# sourceMappingURL=ArgumentOutOfRangeError.js.map
+
+
+/***/ }),
+/* 153 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return EmptyError; });
+/** PURE_IMPORTS_START  PURE_IMPORTS_END */
+function EmptyErrorImpl() {
+    Error.call(this);
+    this.message = 'no elements in sequence';
+    this.name = 'EmptyError';
+    return this;
+}
+EmptyErrorImpl.prototype = /*@__PURE__*/ Object.create(Error.prototype);
+var EmptyError = EmptyErrorImpl;
+//# sourceMappingURL=EmptyError.js.map
+
+
+/***/ }),
+/* 154 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = isFunction;
+/** PURE_IMPORTS_START  PURE_IMPORTS_END */
+function isFunction(x) {
+    return typeof x === 'function';
+}
+//# sourceMappingURL=isFunction.js.map
+
+
+/***/ }),
+/* 155 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// Copyright 2016 Joyent, Inc.
+
+module.exports = Certificate;
+
+var assert = __webpack_require__(16);
+var Buffer = __webpack_require__(15).Buffer;
+var algs = __webpack_require__(32);
+var crypto = __webpack_require__(11);
+var Fingerprint = __webpack_require__(156);
+var Signature = __webpack_require__(75);
+var errs = __webpack_require__(74);
+var util = __webpack_require__(3);
+var utils = __webpack_require__(26);
+var Key = __webpack_require__(27);
+var PrivateKey = __webpack_require__(33);
+var Identity = __webpack_require__(158);
+
+var formats = {};
+formats['openssh'] = __webpack_require__(940);
+formats['x509'] = __webpack_require__(457);
+formats['pem'] = __webpack_require__(941);
+
+var CertificateParseError = errs.CertificateParseError;
+var InvalidAlgorithmError = errs.InvalidAlgorithmError;
+
+function Certificate(opts) {
+	assert.object(opts, 'options');
+	assert.arrayOfObject(opts.subjects, 'options.subjects');
+	utils.assertCompatible(opts.subjects[0], Identity, [1, 0],
+	    'options.subjects');
+	utils.assertCompatible(opts.subjectKey, Key, [1, 0],
+	    'options.subjectKey');
+	utils.assertCompatible(opts.issuer, Identity, [1, 0], 'options.issuer');
+	if (opts.issuerKey !== undefined) {
+		utils.assertCompatible(opts.issuerKey, Key, [1, 0],
+		    'options.issuerKey');
+	}
+	assert.object(opts.signatures, 'options.signatures');
+	assert.buffer(opts.serial, 'options.serial');
+	assert.date(opts.validFrom, 'options.validFrom');
+	assert.date(opts.validUntil, 'optons.validUntil');
+
+	assert.optionalArrayOfString(opts.purposes, 'options.purposes');
+
+	this._hashCache = {};
+
+	this.subjects = opts.subjects;
+	this.issuer = opts.issuer;
+	this.subjectKey = opts.subjectKey;
+	this.issuerKey = opts.issuerKey;
+	this.signatures = opts.signatures;
+	this.serial = opts.serial;
+	this.validFrom = opts.validFrom;
+	this.validUntil = opts.validUntil;
+	this.purposes = opts.purposes;
+}
+
+Certificate.formats = formats;
+
+Certificate.prototype.toBuffer = function (format, options) {
+	if (format === undefined)
+		format = 'x509';
+	assert.string(format, 'format');
+	assert.object(formats[format], 'formats[format]');
+	assert.optionalObject(options, 'options');
+
+	return (formats[format].write(this, options));
+};
+
+Certificate.prototype.toString = function (format, options) {
+	if (format === undefined)
+		format = 'pem';
+	return (this.toBuffer(format, options).toString());
+};
+
+Certificate.prototype.fingerprint = function (algo) {
+	if (algo === undefined)
+		algo = 'sha256';
+	assert.string(algo, 'algorithm');
+	var opts = {
+		type: 'certificate',
+		hash: this.hash(algo),
+		algorithm: algo
+	};
+	return (new Fingerprint(opts));
+};
+
+Certificate.prototype.hash = function (algo) {
+	assert.string(algo, 'algorithm');
+	algo = algo.toLowerCase();
+	if (algs.hashAlgs[algo] === undefined)
+		throw (new InvalidAlgorithmError(algo));
+
+	if (this._hashCache[algo])
+		return (this._hashCache[algo]);
+
+	var hash = crypto.createHash(algo).
+	    update(this.toBuffer('x509')).digest();
+	this._hashCache[algo] = hash;
+	return (hash);
+};
+
+Certificate.prototype.isExpired = function (when) {
+	if (when === undefined)
+		when = new Date();
+	return (!((when.getTime() >= this.validFrom.getTime()) &&
+		(when.getTime() < this.validUntil.getTime())));
+};
+
+Certificate.prototype.isSignedBy = function (issuerCert) {
+	utils.assertCompatible(issuerCert, Certificate, [1, 0], 'issuer');
+
+	if (!this.issuer.equals(issuerCert.subjects[0]))
+		return (false);
+	if (this.issuer.purposes && this.issuer.purposes.length > 0 &&
+	    this.issuer.purposes.indexOf('ca') === -1) {
+		return (false);
+	}
+
+	return (this.isSignedByKey(issuerCert.subjectKey));
+};
+
+Certificate.prototype.isSignedByKey = function (issuerKey) {
+	utils.assertCompatible(issuerKey, Key, [1, 2], 'issuerKey');
+
+	if (this.issuerKey !== undefined) {
+		return (this.issuerKey.
+		    fingerprint('sha512').matches(issuerKey));
+	}
+
+	var fmt = Object.keys(this.signatures)[0];
+	var valid = formats[fmt].verify(this, issuerKey);
+	if (valid)
+		this.issuerKey = issuerKey;
+	return (valid);
+};
+
+Certificate.prototype.signWith = function (key) {
+	utils.assertCompatible(key, PrivateKey, [1, 2], 'key');
+	var fmts = Object.keys(formats);
+	var didOne = false;
+	for (var i = 0; i < fmts.length; ++i) {
+		if (fmts[i] !== 'pem') {
+			var ret = formats[fmts[i]].sign(this, key);
+			if (ret === true)
+				didOne = true;
+		}
+	}
+	if (!didOne) {
+		throw (new Error('Failed to sign the certificate for any ' +
+		    'available certificate formats'));
+	}
+};
+
+Certificate.createSelfSigned = function (subjectOrSubjects, key, options) {
+	var subjects;
+	if (Array.isArray(subjectOrSubjects))
+		subjects = subjectOrSubjects;
+	else
+		subjects = [subjectOrSubjects];
+
+	assert.arrayOfObject(subjects);
+	subjects.forEach(function (subject) {
+		utils.assertCompatible(subject, Identity, [1, 0], 'subject');
+	});
+
+	utils.assertCompatible(key, PrivateKey, [1, 2], 'private key');
+
+	assert.optionalObject(options, 'options');
+	if (options === undefined)
+		options = {};
+	assert.optionalObject(options.validFrom, 'options.validFrom');
+	assert.optionalObject(options.validUntil, 'options.validUntil');
+	var validFrom = options.validFrom;
+	var validUntil = options.validUntil;
+	if (validFrom === undefined)
+		validFrom = new Date();
+	if (validUntil === undefined) {
+		assert.optionalNumber(options.lifetime, 'options.lifetime');
+		var lifetime = options.lifetime;
+		if (lifetime === undefined)
+			lifetime = 10*365*24*3600;
+		validUntil = new Date();
+		validUntil.setTime(validUntil.getTime() + lifetime*1000);
+	}
+	assert.optionalBuffer(options.serial, 'options.serial');
+	var serial = options.serial;
+	if (serial === undefined)
+		serial = Buffer.from('0000000000000001', 'hex');
+
+	var purposes = options.purposes;
+	if (purposes === undefined)
+		purposes = [];
+
+	if (purposes.indexOf('signature') === -1)
+		purposes.push('signature');
+
+	/* Self-signed certs are always CAs. */
+	if (purposes.indexOf('ca') === -1)
+		purposes.push('ca');
+	if (purposes.indexOf('crl') === -1)
+		purposes.push('crl');
+
+	/*
+	 * If we weren't explicitly given any other purposes, do the sensible
+	 * thing and add some basic ones depending on the subject type.
+	 */
+	if (purposes.length <= 3) {
+		var hostSubjects = subjects.filter(function (subject) {
+			return (subject.type === 'host');
+		});
+		var userSubjects = subjects.filter(function (subject) {
+			return (subject.type === 'user');
+		});
+		if (hostSubjects.length > 0) {
+			if (purposes.indexOf('serverAuth') === -1)
+				purposes.push('serverAuth');
+		}
+		if (userSubjects.length > 0) {
+			if (purposes.indexOf('clientAuth') === -1)
+				purposes.push('clientAuth');
+		}
+		if (userSubjects.length > 0 || hostSubjects.length > 0) {
+			if (purposes.indexOf('keyAgreement') === -1)
+				purposes.push('keyAgreement');
+			if (key.type === 'rsa' &&
+			    purposes.indexOf('encryption') === -1)
+				purposes.push('encryption');
+		}
+	}
+
+	var cert = new Certificate({
+		subjects: subjects,
+		issuer: subjects[0],
+		subjectKey: key.toPublic(),
+		issuerKey: key.toPublic(),
+		signatures: {},
+		serial: serial,
+		validFrom: validFrom,
+		validUntil: validUntil,
+		purposes: purposes
+	});
+	cert.signWith(key);
+
+	return (cert);
+};
+
+Certificate.create =
+    function (subjectOrSubjects, key, issuer, issuerKey, options) {
+	var subjects;
+	if (Array.isArray(subjectOrSubjects))
+		subjects = subjectOrSubjects;
+	else
+		subjects = [subjectOrSubjects];
+
+	assert.arrayOfObject(subjects);
+	subjects.forEach(function (subject) {
+		utils.assertCompatible(subject, Identity, [1, 0], 'subject');
+	});
+
+	utils.assertCompatible(key, Key, [1, 0], 'key');
+	if (PrivateKey.isPrivateKey(key))
+		key = key.toPublic();
+	utils.assertCompatible(issuer, Identity, [1, 0], 'issuer');
+	utils.assertCompatible(issuerKey, PrivateKey, [1, 2], 'issuer key');
+
+	assert.optionalObject(options, 'options');
+	if (options === undefined)
+		options = {};
+	assert.optionalObject(options.validFrom, 'options.validFrom');
+	assert.optionalObject(options.validUntil, 'options.validUntil');
+	var validFrom = options.validFrom;
+	var validUntil = options.validUntil;
+	if (validFrom === undefined)
+		validFrom = new Date();
+	if (validUntil === undefined) {
+		assert.optionalNumber(options.lifetime, 'options.lifetime');
+		var lifetime = options.lifetime;
+		if (lifetime === undefined)
+			lifetime = 10*365*24*3600;
+		validUntil = new Date();
+		validUntil.setTime(validUntil.getTime() + lifetime*1000);
+	}
+	assert.optionalBuffer(options.serial, 'options.serial');
+	var serial = options.serial;
+	if (serial === undefined)
+		serial = Buffer.from('0000000000000001', 'hex');
+
+	var purposes = options.purposes;
+	if (purposes === undefined)
+		purposes = [];
+
+	if (purposes.indexOf('signature') === -1)
+		purposes.push('signature');
+
+	if (options.ca === true) {
+		if (purposes.indexOf('ca') === -1)
+			purposes.push('ca');
+		if (purposes.indexOf('crl') === -1)
+			purposes.push('crl');
+	}
+
+	var hostSubjects = subjects.filter(function (subject) {
+		return (subject.type === 'host');
+	});
+	var userSubjects = subjects.filter(function (subject) {
+		return (subject.type === 'user');
+	});
+	if (hostSubjects.length > 0) {
+		if (purposes.indexOf('serverAuth') === -1)
+			purposes.push('serverAuth');
+	}
+	if (userSubjects.length > 0) {
+		if (purposes.indexOf('clientAuth') === -1)
+			purposes.push('clientAuth');
+	}
+	if (userSubjects.length > 0 || hostSubjects.length > 0) {
+		if (purposes.indexOf('keyAgreement') === -1)
+			purposes.push('keyAgreement');
+		if (key.type === 'rsa' &&
+		    purposes.indexOf('encryption') === -1)
+			purposes.push('encryption');
+	}
+
+	var cert = new Certificate({
+		subjects: subjects,
+		issuer: issuer,
+		subjectKey: key,
+		issuerKey: issuerKey.toPublic(),
+		signatures: {},
+		serial: serial,
+		validFrom: validFrom,
+		validUntil: validUntil,
+		purposes: purposes
+	});
+	cert.signWith(issuerKey);
+
+	return (cert);
+};
+
+Certificate.parse = function (data, format, options) {
+	if (typeof (data) !== 'string')
+		assert.buffer(data, 'data');
+	if (format === undefined)
+		format = 'auto';
+	assert.string(format, 'format');
+	if (typeof (options) === 'string')
+		options = { filename: options };
+	assert.optionalObject(options, 'options');
+	if (options === undefined)
+		options = {};
+	assert.optionalString(options.filename, 'options.filename');
+	if (options.filename === undefined)
+		options.filename = '(unnamed)';
+
+	assert.object(formats[format], 'formats[format]');
+
+	try {
+		var k = formats[format].read(data, options);
+		return (k);
+	} catch (e) {
+		throw (new CertificateParseError(options.filename, format, e));
+	}
+};
+
+Certificate.isCertificate = function (obj, ver) {
+	return (utils.isCompatible(obj, Certificate, ver));
+};
+
+/*
+ * API versions for Certificate:
+ * [1,0] -- initial ver
+ */
+Certificate.prototype._sshpkApiVersion = [1, 0];
+
+Certificate._oldVersionDetect = function (obj) {
+	return ([1, 0]);
+};
+
+
+/***/ }),
+/* 156 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// Copyright 2015 Joyent, Inc.
+
+module.exports = Fingerprint;
+
+var assert = __webpack_require__(16);
+var Buffer = __webpack_require__(15).Buffer;
+var algs = __webpack_require__(32);
+var crypto = __webpack_require__(11);
+var errs = __webpack_require__(74);
+var Key = __webpack_require__(27);
+var Certificate = __webpack_require__(155);
+var utils = __webpack_require__(26);
+
+var FingerprintFormatError = errs.FingerprintFormatError;
+var InvalidAlgorithmError = errs.InvalidAlgorithmError;
+
+function Fingerprint(opts) {
+	assert.object(opts, 'options');
+	assert.string(opts.type, 'options.type');
+	assert.buffer(opts.hash, 'options.hash');
+	assert.string(opts.algorithm, 'options.algorithm');
+
+	this.algorithm = opts.algorithm.toLowerCase();
+	if (algs.hashAlgs[this.algorithm] !== true)
+		throw (new InvalidAlgorithmError(this.algorithm));
+
+	this.hash = opts.hash;
+	this.type = opts.type;
+}
+
+Fingerprint.prototype.toString = function (format) {
+	if (format === undefined) {
+		if (this.algorithm === 'md5')
+			format = 'hex';
+		else
+			format = 'base64';
+	}
+	assert.string(format);
+
+	switch (format) {
+	case 'hex':
+		return (addColons(this.hash.toString('hex')));
+	case 'base64':
+		return (sshBase64Format(this.algorithm,
+		    this.hash.toString('base64')));
+	default:
+		throw (new FingerprintFormatError(undefined, format));
+	}
+};
+
+Fingerprint.prototype.matches = function (other) {
+	assert.object(other, 'key or certificate');
+	if (this.type === 'key') {
+		utils.assertCompatible(other, Key, [1, 0], 'key');
+	} else {
+		utils.assertCompatible(other, Certificate, [1, 0],
+		    'certificate');
+	}
+
+	var theirHash = other.hash(this.algorithm);
+	var theirHash2 = crypto.createHash(this.algorithm).
+	    update(theirHash).digest('base64');
+
+	if (this.hash2 === undefined)
+		this.hash2 = crypto.createHash(this.algorithm).
+		    update(this.hash).digest('base64');
+
+	return (this.hash2 === theirHash2);
+};
+
+Fingerprint.parse = function (fp, options) {
+	assert.string(fp, 'fingerprint');
+
+	var alg, hash, enAlgs;
+	if (Array.isArray(options)) {
+		enAlgs = options;
+		options = {};
+	}
+	assert.optionalObject(options, 'options');
+	if (options === undefined)
+		options = {};
+	if (options.enAlgs !== undefined)
+		enAlgs = options.enAlgs;
+	assert.optionalArrayOfString(enAlgs, 'algorithms');
+
+	var parts = fp.split(':');
+	if (parts.length == 2) {
+		alg = parts[0].toLowerCase();
+		/*JSSTYLED*/
+		var base64RE = /^[A-Za-z0-9+\/=]+$/;
+		if (!base64RE.test(parts[1]))
+			throw (new FingerprintFormatError(fp));
+		try {
+			hash = Buffer.from(parts[1], 'base64');
+		} catch (e) {
+			throw (new FingerprintFormatError(fp));
+		}
+	} else if (parts.length > 2) {
+		alg = 'md5';
+		if (parts[0].toLowerCase() === 'md5')
+			parts = parts.slice(1);
+		parts = parts.join('');
+		/*JSSTYLED*/
+		var md5RE = /^[a-fA-F0-9]+$/;
+		if (!md5RE.test(parts))
+			throw (new FingerprintFormatError(fp));
+		try {
+			hash = Buffer.from(parts, 'hex');
+		} catch (e) {
+			throw (new FingerprintFormatError(fp));
+		}
+	}
+
+	if (alg === undefined)
+		throw (new FingerprintFormatError(fp));
+
+	if (algs.hashAlgs[alg] === undefined)
+		throw (new InvalidAlgorithmError(alg));
+
+	if (enAlgs !== undefined) {
+		enAlgs = enAlgs.map(function (a) { return a.toLowerCase(); });
+		if (enAlgs.indexOf(alg) === -1)
+			throw (new InvalidAlgorithmError(alg));
+	}
+
+	return (new Fingerprint({
+		algorithm: alg,
+		hash: hash,
+		type: options.type || 'key'
+	}));
+};
+
+function addColons(s) {
+	/*JSSTYLED*/
+	return (s.replace(/(.{2})(?=.)/g, '$1:'));
+}
+
+function base64Strip(s) {
+	/*JSSTYLED*/
+	return (s.replace(/=*$/, ''));
+}
+
+function sshBase64Format(alg, h) {
+	return (alg.toUpperCase() + ':' + base64Strip(h));
+}
+
+Fingerprint.isFingerprint = function (obj, ver) {
+	return (utils.isCompatible(obj, Fingerprint, ver));
+};
+
+/*
+ * API versions for Fingerprint:
+ * [1,0] -- initial ver
+ * [1,1] -- first tagged ver
+ */
+Fingerprint.prototype._sshpkApiVersion = [1, 1];
+
+Fingerprint._oldVersionDetect = function (obj) {
+	assert.func(obj.toString);
+	assert.func(obj.matches);
+	return ([1, 0]);
+};
+
+
+/***/ }),
+/* 157 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// Copyright 2015 Joyent, Inc.
+
+module.exports = {
+	read: read,
+	readPkcs8: readPkcs8,
+	write: write,
+	writePkcs8: writePkcs8,
+
+	readECDSACurve: readECDSACurve,
+	writeECDSACurve: writeECDSACurve
+};
+
+var assert = __webpack_require__(16);
+var asn1 = __webpack_require__(66);
+var Buffer = __webpack_require__(15).Buffer;
+var algs = __webpack_require__(32);
+var utils = __webpack_require__(26);
+var Key = __webpack_require__(27);
+var PrivateKey = __webpack_require__(33);
+var pem = __webpack_require__(86);
+
+function read(buf, options) {
+	return (pem.read(buf, options, 'pkcs8'));
+}
+
+function write(key, options) {
+	return (pem.write(key, options, 'pkcs8'));
+}
+
+/* Helper to read in a single mpint */
+function readMPInt(der, nm) {
+	assert.strictEqual(der.peek(), asn1.Ber.Integer,
+	    nm + ' is not an Integer');
+	return (utils.mpNormalize(der.readString(asn1.Ber.Integer, true)));
+}
+
+function readPkcs8(alg, type, der) {
+	/* Private keys in pkcs#8 format have a weird extra int */
+	if (der.peek() === asn1.Ber.Integer) {
+		assert.strictEqual(type, 'private',
+		    'unexpected Integer at start of public key');
+		der.readString(asn1.Ber.Integer, true);
+	}
+
+	der.readSequence();
+	var next = der.offset + der.length;
+
+	var oid = der.readOID();
+	switch (oid) {
+	case '1.2.840.113549.1.1.1':
+		der._offset = next;
+		if (type === 'public')
+			return (readPkcs8RSAPublic(der));
+		else
+			return (readPkcs8RSAPrivate(der));
+	case '1.2.840.10040.4.1':
+		if (type === 'public')
+			return (readPkcs8DSAPublic(der));
+		else
+			return (readPkcs8DSAPrivate(der));
+	case '1.2.840.10045.2.1':
+		if (type === 'public')
+			return (readPkcs8ECDSAPublic(der));
+		else
+			return (readPkcs8ECDSAPrivate(der));
+	case '1.3.101.112':
+		if (type === 'public') {
+			return (readPkcs8EdDSAPublic(der));
+		} else {
+			return (readPkcs8EdDSAPrivate(der));
+		}
+	case '1.3.101.110':
+		if (type === 'public') {
+			return (readPkcs8X25519Public(der));
+		} else {
+			return (readPkcs8X25519Private(der));
+		}
+	default:
+		throw (new Error('Unknown key type OID ' + oid));
+	}
+}
+
+function readPkcs8RSAPublic(der) {
+	// bit string sequence
+	der.readSequence(asn1.Ber.BitString);
+	der.readByte();
+	der.readSequence();
+
+	// modulus
+	var n = readMPInt(der, 'modulus');
+	var e = readMPInt(der, 'exponent');
+
+	// now, make the key
+	var key = {
+		type: 'rsa',
+		source: der.originalInput,
+		parts: [
+			{ name: 'e', data: e },
+			{ name: 'n', data: n }
+		]
+	};
+
+	return (new Key(key));
+}
+
+function readPkcs8RSAPrivate(der) {
+	der.readSequence(asn1.Ber.OctetString);
+	der.readSequence();
+
+	var ver = readMPInt(der, 'version');
+	assert.equal(ver[0], 0x0, 'unknown RSA private key version');
+
+	// modulus then public exponent
+	var n = readMPInt(der, 'modulus');
+	var e = readMPInt(der, 'public exponent');
+	var d = readMPInt(der, 'private exponent');
+	var p = readMPInt(der, 'prime1');
+	var q = readMPInt(der, 'prime2');
+	var dmodp = readMPInt(der, 'exponent1');
+	var dmodq = readMPInt(der, 'exponent2');
+	var iqmp = readMPInt(der, 'iqmp');
+
+	// now, make the key
+	var key = {
+		type: 'rsa',
+		parts: [
+			{ name: 'n', data: n },
+			{ name: 'e', data: e },
+			{ name: 'd', data: d },
+			{ name: 'iqmp', data: iqmp },
+			{ name: 'p', data: p },
+			{ name: 'q', data: q },
+			{ name: 'dmodp', data: dmodp },
+			{ name: 'dmodq', data: dmodq }
+		]
+	};
+
+	return (new PrivateKey(key));
+}
+
+function readPkcs8DSAPublic(der) {
+	der.readSequence();
+
+	var p = readMPInt(der, 'p');
+	var q = readMPInt(der, 'q');
+	var g = readMPInt(der, 'g');
+
+	// bit string sequence
+	der.readSequence(asn1.Ber.BitString);
+	der.readByte();
+
+	var y = readMPInt(der, 'y');
+
+	// now, make the key
+	var key = {
+		type: 'dsa',
+		parts: [
+			{ name: 'p', data: p },
+			{ name: 'q', data: q },
+			{ name: 'g', data: g },
+			{ name: 'y', data: y }
+		]
+	};
+
+	return (new Key(key));
+}
+
+function readPkcs8DSAPrivate(der) {
+	der.readSequence();
+
+	var p = readMPInt(der, 'p');
+	var q = readMPInt(der, 'q');
+	var g = readMPInt(der, 'g');
+
+	der.readSequence(asn1.Ber.OctetString);
+	var x = readMPInt(der, 'x');
+
+	/* The pkcs#8 format does not include the public key */
+	var y = utils.calculateDSAPublic(g, p, x);
+
+	var key = {
+		type: 'dsa',
+		parts: [
+			{ name: 'p', data: p },
+			{ name: 'q', data: q },
+			{ name: 'g', data: g },
+			{ name: 'y', data: y },
+			{ name: 'x', data: x }
+		]
+	};
+
+	return (new PrivateKey(key));
+}
+
+function readECDSACurve(der) {
+	var curveName, curveNames;
+	var j, c, cd;
+
+	if (der.peek() === asn1.Ber.OID) {
+		var oid = der.readOID();
+
+		curveNames = Object.keys(algs.curves);
+		for (j = 0; j < curveNames.length; ++j) {
+			c = curveNames[j];
+			cd = algs.curves[c];
+			if (cd.pkcs8oid === oid) {
+				curveName = c;
+				break;
+			}
+		}
+
+	} else {
+		// ECParameters sequence
+		der.readSequence();
+		var version = der.readString(asn1.Ber.Integer, true);
+		assert.strictEqual(version[0], 1, 'ECDSA key not version 1');
+
+		var curve = {};
+
+		// FieldID sequence
+		der.readSequence();
+		var fieldTypeOid = der.readOID();
+		assert.strictEqual(fieldTypeOid, '1.2.840.10045.1.1',
+		    'ECDSA key is not from a prime-field');
+		var p = curve.p = utils.mpNormalize(
+		    der.readString(asn1.Ber.Integer, true));
+		/*
+		 * p always starts with a 1 bit, so count the zeros to get its
+		 * real size.
+		 */
+		curve.size = p.length * 8 - utils.countZeros(p);
+
+		// Curve sequence
+		der.readSequence();
+		curve.a = utils.mpNormalize(
+		    der.readString(asn1.Ber.OctetString, true));
+		curve.b = utils.mpNormalize(
+		    der.readString(asn1.Ber.OctetString, true));
+		if (der.peek() === asn1.Ber.BitString)
+			curve.s = der.readString(asn1.Ber.BitString, true);
+
+		// Combined Gx and Gy
+		curve.G = der.readString(asn1.Ber.OctetString, true);
+		assert.strictEqual(curve.G[0], 0x4,
+		    'uncompressed G is required');
+
+		curve.n = utils.mpNormalize(
+		    der.readString(asn1.Ber.Integer, true));
+		curve.h = utils.mpNormalize(
+		    der.readString(asn1.Ber.Integer, true));
+		assert.strictEqual(curve.h[0], 0x1, 'a cofactor=1 curve is ' +
+		    'required');
+
+		curveNames = Object.keys(algs.curves);
+		var ks = Object.keys(curve);
+		for (j = 0; j < curveNames.length; ++j) {
+			c = curveNames[j];
+			cd = algs.curves[c];
+			var equal = true;
+			for (var i = 0; i < ks.length; ++i) {
+				var k = ks[i];
+				if (cd[k] === undefined)
+					continue;
+				if (typeof (cd[k]) === 'object' &&
+				    cd[k].equals !== undefined) {
+					if (!cd[k].equals(curve[k])) {
+						equal = false;
+						break;
+					}
+				} else if (Buffer.isBuffer(cd[k])) {
+					if (cd[k].toString('binary')
+					    !== curve[k].toString('binary')) {
+						equal = false;
+						break;
+					}
+				} else {
+					if (cd[k] !== curve[k]) {
+						equal = false;
+						break;
+					}
+				}
+			}
+			if (equal) {
+				curveName = c;
+				break;
+			}
+		}
+	}
+	return (curveName);
+}
+
+function readPkcs8ECDSAPrivate(der) {
+	var curveName = readECDSACurve(der);
+	assert.string(curveName, 'a known elliptic curve');
+
+	der.readSequence(asn1.Ber.OctetString);
+	der.readSequence();
+
+	var version = readMPInt(der, 'version');
+	assert.equal(version[0], 1, 'unknown version of ECDSA key');
+
+	var d = der.readString(asn1.Ber.OctetString, true);
+	der.readSequence(0xa1);
+
+	var Q = der.readString(asn1.Ber.BitString, true);
+	Q = utils.ecNormalize(Q);
+
+	var key = {
+		type: 'ecdsa',
+		parts: [
+			{ name: 'curve', data: Buffer.from(curveName) },
+			{ name: 'Q', data: Q },
+			{ name: 'd', data: d }
+		]
+	};
+
+	return (new PrivateKey(key));
+}
+
+function readPkcs8ECDSAPublic(der) {
+	var curveName = readECDSACurve(der);
+	assert.string(curveName, 'a known elliptic curve');
+
+	var Q = der.readString(asn1.Ber.BitString, true);
+	Q = utils.ecNormalize(Q);
+
+	var key = {
+		type: 'ecdsa',
+		parts: [
+			{ name: 'curve', data: Buffer.from(curveName) },
+			{ name: 'Q', data: Q }
+		]
+	};
+
+	return (new Key(key));
+}
+
+function readPkcs8EdDSAPublic(der) {
+	if (der.peek() === 0x00)
+		der.readByte();
+
+	var A = utils.readBitString(der);
+
+	var key = {
+		type: 'ed25519',
+		parts: [
+			{ name: 'A', data: utils.zeroPadToLength(A, 32) }
+		]
+	};
+
+	return (new Key(key));
+}
+
+function readPkcs8X25519Public(der) {
+	var A = utils.readBitString(der);
+
+	var key = {
+		type: 'curve25519',
+		parts: [
+			{ name: 'A', data: utils.zeroPadToLength(A, 32) }
+		]
+	};
+
+	return (new Key(key));
+}
+
+function readPkcs8EdDSAPrivate(der) {
+	if (der.peek() === 0x00)
+		der.readByte();
+
+	der.readSequence(asn1.Ber.OctetString);
+	var k = der.readString(asn1.Ber.OctetString, true);
+	k = utils.zeroPadToLength(k, 32);
+
+	var A;
+	if (der.peek() === asn1.Ber.BitString) {
+		A = utils.readBitString(der);
+		A = utils.zeroPadToLength(A, 32);
+	} else {
+		A = utils.calculateED25519Public(k);
+	}
+
+	var key = {
+		type: 'ed25519',
+		parts: [
+			{ name: 'A', data: utils.zeroPadToLength(A, 32) },
+			{ name: 'k', data: utils.zeroPadToLength(k, 32) }
+		]
+	};
+
+	return (new PrivateKey(key));
+}
+
+function readPkcs8X25519Private(der) {
+	if (der.peek() === 0x00)
+		der.readByte();
+
+	der.readSequence(asn1.Ber.OctetString);
+	var k = der.readString(asn1.Ber.OctetString, true);
+	k = utils.zeroPadToLength(k, 32);
+
+	var A = utils.calculateX25519Public(k);
+
+	var key = {
+		type: 'curve25519',
+		parts: [
+			{ name: 'A', data: utils.zeroPadToLength(A, 32) },
+			{ name: 'k', data: utils.zeroPadToLength(k, 32) }
+		]
+	};
+
+	return (new PrivateKey(key));
+}
+
+function writePkcs8(der, key) {
+	der.startSequence();
+
+	if (PrivateKey.isPrivateKey(key)) {
+		var sillyInt = Buffer.from([0]);
+		der.writeBuffer(sillyInt, asn1.Ber.Integer);
+	}
+
+	der.startSequence();
+	switch (key.type) {
+	case 'rsa':
+		der.writeOID('1.2.840.113549.1.1.1');
+		if (PrivateKey.isPrivateKey(key))
+			writePkcs8RSAPrivate(key, der);
+		else
+			writePkcs8RSAPublic(key, der);
+		break;
+	case 'dsa':
+		der.writeOID('1.2.840.10040.4.1');
+		if (PrivateKey.isPrivateKey(key))
+			writePkcs8DSAPrivate(key, der);
+		else
+			writePkcs8DSAPublic(key, der);
+		break;
+	case 'ecdsa':
+		der.writeOID('1.2.840.10045.2.1');
+		if (PrivateKey.isPrivateKey(key))
+			writePkcs8ECDSAPrivate(key, der);
+		else
+			writePkcs8ECDSAPublic(key, der);
+		break;
+	case 'ed25519':
+		der.writeOID('1.3.101.112');
+		if (PrivateKey.isPrivateKey(key))
+			throw (new Error('Ed25519 private keys in pkcs8 ' +
+			    'format are not supported'));
+		writePkcs8EdDSAPublic(key, der);
+		break;
+	default:
+		throw (new Error('Unsupported key type: ' + key.type));
+	}
+
+	der.endSequence();
+}
+
+function writePkcs8RSAPrivate(key, der) {
+	der.writeNull();
+	der.endSequence();
+
+	der.startSequence(asn1.Ber.OctetString);
+	der.startSequence();
+
+	var version = Buffer.from([0]);
+	der.writeBuffer(version, asn1.Ber.Integer);
+
+	der.writeBuffer(key.part.n.data, asn1.Ber.Integer);
+	der.writeBuffer(key.part.e.data, asn1.Ber.Integer);
+	der.writeBuffer(key.part.d.data, asn1.Ber.Integer);
+	der.writeBuffer(key.part.p.data, asn1.Ber.Integer);
+	der.writeBuffer(key.part.q.data, asn1.Ber.Integer);
+	if (!key.part.dmodp || !key.part.dmodq)
+		utils.addRSAMissing(key);
+	der.writeBuffer(key.part.dmodp.data, asn1.Ber.Integer);
+	der.writeBuffer(key.part.dmodq.data, asn1.Ber.Integer);
+	der.writeBuffer(key.part.iqmp.data, asn1.Ber.Integer);
+
+	der.endSequence();
+	der.endSequence();
+}
+
+function writePkcs8RSAPublic(key, der) {
+	der.writeNull();
+	der.endSequence();
+
+	der.startSequence(asn1.Ber.BitString);
+	der.writeByte(0x00);
+
+	der.startSequence();
+	der.writeBuffer(key.part.n.data, asn1.Ber.Integer);
+	der.writeBuffer(key.part.e.data, asn1.Ber.Integer);
+	der.endSequence();
+
+	der.endSequence();
+}
+
+function writePkcs8DSAPrivate(key, der) {
+	der.startSequence();
+	der.writeBuffer(key.part.p.data, asn1.Ber.Integer);
+	der.writeBuffer(key.part.q.data, asn1.Ber.Integer);
+	der.writeBuffer(key.part.g.data, asn1.Ber.Integer);
+	der.endSequence();
+
+	der.endSequence();
+
+	der.startSequence(asn1.Ber.OctetString);
+	der.writeBuffer(key.part.x.data, asn1.Ber.Integer);
+	der.endSequence();
+}
+
+function writePkcs8DSAPublic(key, der) {
+	der.startSequence();
+	der.writeBuffer(key.part.p.data, asn1.Ber.Integer);
+	der.writeBuffer(key.part.q.data, asn1.Ber.Integer);
+	der.writeBuffer(key.part.g.data, asn1.Ber.Integer);
+	der.endSequence();
+	der.endSequence();
+
+	der.startSequence(asn1.Ber.BitString);
+	der.writeByte(0x00);
+	der.writeBuffer(key.part.y.data, asn1.Ber.Integer);
+	der.endSequence();
+}
+
+function writeECDSACurve(key, der) {
+	var curve = algs.curves[key.curve];
+	if (curve.pkcs8oid) {
+		/* This one has a name in pkcs#8, so just write the oid */
+		der.writeOID(curve.pkcs8oid);
+
+	} else {
+		// ECParameters sequence
+		der.startSequence();
+
+		var version = Buffer.from([1]);
+		der.writeBuffer(version, asn1.Ber.Integer);
+
+		// FieldID sequence
+		der.startSequence();
+		der.writeOID('1.2.840.10045.1.1'); // prime-field
+		der.writeBuffer(curve.p, asn1.Ber.Integer);
+		der.endSequence();
+
+		// Curve sequence
+		der.startSequence();
+		var a = curve.p;
+		if (a[0] === 0x0)
+			a = a.slice(1);
+		der.writeBuffer(a, asn1.Ber.OctetString);
+		der.writeBuffer(curve.b, asn1.Ber.OctetString);
+		der.writeBuffer(curve.s, asn1.Ber.BitString);
+		der.endSequence();
+
+		der.writeBuffer(curve.G, asn1.Ber.OctetString);
+		der.writeBuffer(curve.n, asn1.Ber.Integer);
+		var h = curve.h;
+		if (!h) {
+			h = Buffer.from([1]);
+		}
+		der.writeBuffer(h, asn1.Ber.Integer);
+
+		// ECParameters
+		der.endSequence();
+	}
+}
+
+function writePkcs8ECDSAPublic(key, der) {
+	writeECDSACurve(key, der);
+	der.endSequence();
+
+	var Q = utils.ecNormalize(key.part.Q.data, true);
+	der.writeBuffer(Q, asn1.Ber.BitString);
+}
+
+function writePkcs8ECDSAPrivate(key, der) {
+	writeECDSACurve(key, der);
+	der.endSequence();
+
+	der.startSequence(asn1.Ber.OctetString);
+	der.startSequence();
+
+	var version = Buffer.from([1]);
+	der.writeBuffer(version, asn1.Ber.Integer);
+
+	der.writeBuffer(key.part.d.data, asn1.Ber.OctetString);
+
+	der.startSequence(0xa1);
+	var Q = utils.ecNormalize(key.part.Q.data, true);
+	der.writeBuffer(Q, asn1.Ber.BitString);
+	der.endSequence();
+
+	der.endSequence();
+	der.endSequence();
+}
+
+function writePkcs8EdDSAPublic(key, der) {
+	der.endSequence();
+
+	utils.writeBitString(der, key.part.A.data);
+}
+
+function writePkcs8EdDSAPrivate(key, der) {
+	der.endSequence();
+
+	var k = utils.mpNormalize(key.part.k.data, true);
+	der.startSequence(asn1.Ber.OctetString);
+	der.writeBuffer(k, asn1.Ber.OctetString);
+	der.endSequence();
+}
+
+
+/***/ }),
+/* 158 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// Copyright 2017 Joyent, Inc.
+
+module.exports = Identity;
+
+var assert = __webpack_require__(16);
+var algs = __webpack_require__(32);
+var crypto = __webpack_require__(11);
+var Fingerprint = __webpack_require__(156);
+var Signature = __webpack_require__(75);
+var errs = __webpack_require__(74);
+var util = __webpack_require__(3);
+var utils = __webpack_require__(26);
+var asn1 = __webpack_require__(66);
+var Buffer = __webpack_require__(15).Buffer;
+
+/*JSSTYLED*/
+var DNS_NAME_RE = /^([*]|[a-z0-9][a-z0-9\-]{0,62})(?:\.([*]|[a-z0-9][a-z0-9\-]{0,62}))*$/i;
+
+var oids = {};
+oids.cn = '2.5.4.3';
+oids.o = '2.5.4.10';
+oids.ou = '2.5.4.11';
+oids.l = '2.5.4.7';
+oids.s = '2.5.4.8';
+oids.c = '2.5.4.6';
+oids.sn = '2.5.4.4';
+oids.dc = '0.9.2342.19200300.100.1.25';
+oids.uid = '0.9.2342.19200300.100.1.1';
+oids.mail = '0.9.2342.19200300.100.1.3';
+
+var unoids = {};
+Object.keys(oids).forEach(function (k) {
+	unoids[oids[k]] = k;
+});
+
+function Identity(opts) {
+	var self = this;
+	assert.object(opts, 'options');
+	assert.arrayOfObject(opts.components, 'options.components');
+	this.components = opts.components;
+	this.componentLookup = {};
+	this.components.forEach(function (c) {
+		if (c.name && !c.oid)
+			c.oid = oids[c.name];
+		if (c.oid && !c.name)
+			c.name = unoids[c.oid];
+		if (self.componentLookup[c.name] === undefined)
+			self.componentLookup[c.name] = [];
+		self.componentLookup[c.name].push(c);
+	});
+	if (this.componentLookup.cn && this.componentLookup.cn.length > 0) {
+		this.cn = this.componentLookup.cn[0].value;
+	}
+	assert.optionalString(opts.type, 'options.type');
+	if (opts.type === undefined) {
+		if (this.components.length === 1 &&
+		    this.componentLookup.cn &&
+		    this.componentLookup.cn.length === 1 &&
+		    this.componentLookup.cn[0].value.match(DNS_NAME_RE)) {
+			this.type = 'host';
+			this.hostname = this.componentLookup.cn[0].value;
+
+		} else if (this.componentLookup.dc &&
+		    this.components.length === this.componentLookup.dc.length) {
+			this.type = 'host';
+			this.hostname = this.componentLookup.dc.map(
+			    function (c) {
+				return (c.value);
+			}).join('.');
+
+		} else if (this.componentLookup.uid &&
+		    this.components.length ===
+		    this.componentLookup.uid.length) {
+			this.type = 'user';
+			this.uid = this.componentLookup.uid[0].value;
+
+		} else if (this.componentLookup.cn &&
+		    this.componentLookup.cn.length === 1 &&
+		    this.componentLookup.cn[0].value.match(DNS_NAME_RE)) {
+			this.type = 'host';
+			this.hostname = this.componentLookup.cn[0].value;
+
+		} else if (this.componentLookup.uid &&
+		    this.componentLookup.uid.length === 1) {
+			this.type = 'user';
+			this.uid = this.componentLookup.uid[0].value;
+
+		} else if (this.componentLookup.mail &&
+		    this.componentLookup.mail.length === 1) {
+			this.type = 'email';
+			this.email = this.componentLookup.mail[0].value;
+
+		} else if (this.componentLookup.cn &&
+		    this.componentLookup.cn.length === 1) {
+			this.type = 'user';
+			this.uid = this.componentLookup.cn[0].value;
+
+		} else {
+			this.type = 'unknown';
+		}
+	} else {
+		this.type = opts.type;
+		if (this.type === 'host')
+			this.hostname = opts.hostname;
+		else if (this.type === 'user')
+			this.uid = opts.uid;
+		else if (this.type === 'email')
+			this.email = opts.email;
+		else
+			throw (new Error('Unknown type ' + this.type));
+	}
+}
+
+Identity.prototype.toString = function () {
+	return (this.components.map(function (c) {
+		return (c.name.toUpperCase() + '=' + c.value);
+	}).join(', '));
+};
+
+/*
+ * These are from X.680 -- PrintableString allowed chars are in section 37.4
+ * table 8. Spec for IA5Strings is "1,6 + SPACE + DEL" where 1 refers to
+ * ISO IR #001 (standard ASCII control characters) and 6 refers to ISO IR #006
+ * (the basic ASCII character set).
+ */
+/* JSSTYLED */
+var NOT_PRINTABLE = /[^a-zA-Z0-9 '(),+.\/:=?-]/;
+/* JSSTYLED */
+var NOT_IA5 = /[^\x00-\x7f]/;
+
+Identity.prototype.toAsn1 = function (der, tag) {
+	der.startSequence(tag);
+	this.components.forEach(function (c) {
+		der.startSequence(asn1.Ber.Constructor | asn1.Ber.Set);
+		der.startSequence();
+		der.writeOID(c.oid);
+		/*
+		 * If we fit in a PrintableString, use that. Otherwise use an
+		 * IA5String or UTF8String.
+		 *
+		 * If this identity was parsed from a DN, use the ASN.1 types
+		 * from the original representation (otherwise this might not
+		 * be a full match for the original in some validators).
+		 */
+		if (c.asn1type === asn1.Ber.Utf8String ||
+		    c.value.match(NOT_IA5)) {
+			var v = Buffer.from(c.value, 'utf8');
+			der.writeBuffer(v, asn1.Ber.Utf8String);
+
+		} else if (c.asn1type === asn1.Ber.IA5String ||
+		    c.value.match(NOT_PRINTABLE)) {
+			der.writeString(c.value, asn1.Ber.IA5String);
+
+		} else {
+			var type = asn1.Ber.PrintableString;
+			if (c.asn1type !== undefined)
+				type = c.asn1type;
+			der.writeString(c.value, type);
+		}
+		der.endSequence();
+		der.endSequence();
+	});
+	der.endSequence();
+};
+
+function globMatch(a, b) {
+	if (a === '**' || b === '**')
+		return (true);
+	var aParts = a.split('.');
+	var bParts = b.split('.');
+	if (aParts.length !== bParts.length)
+		return (false);
+	for (var i = 0; i < aParts.length; ++i) {
+		if (aParts[i] === '*' || bParts[i] === '*')
+			continue;
+		if (aParts[i] !== bParts[i])
+			return (false);
+	}
+	return (true);
+}
+
+Identity.prototype.equals = function (other) {
+	if (!Identity.isIdentity(other, [1, 0]))
+		return (false);
+	if (other.components.length !== this.components.length)
+		return (false);
+	for (var i = 0; i < this.components.length; ++i) {
+		if (this.components[i].oid !== other.components[i].oid)
+			return (false);
+		if (!globMatch(this.components[i].value,
+		    other.components[i].value)) {
+			return (false);
+		}
+	}
+	return (true);
+};
+
+Identity.forHost = function (hostname) {
+	assert.string(hostname, 'hostname');
+	return (new Identity({
+		type: 'host',
+		hostname: hostname,
+		components: [ { name: 'cn', value: hostname } ]
+	}));
+};
+
+Identity.forUser = function (uid) {
+	assert.string(uid, 'uid');
+	return (new Identity({
+		type: 'user',
+		uid: uid,
+		components: [ { name: 'uid', value: uid } ]
+	}));
+};
+
+Identity.forEmail = function (email) {
+	assert.string(email, 'email');
+	return (new Identity({
+		type: 'email',
+		email: email,
+		components: [ { name: 'mail', value: email } ]
+	}));
+};
+
+Identity.parseDN = function (dn) {
+	assert.string(dn, 'dn');
+	var parts = dn.split(',');
+	var cmps = parts.map(function (c) {
+		c = c.trim();
+		var eqPos = c.indexOf('=');
+		var name = c.slice(0, eqPos).toLowerCase();
+		var value = c.slice(eqPos + 1);
+		return ({ name: name, value: value });
+	});
+	return (new Identity({ components: cmps }));
+};
+
+Identity.parseAsn1 = function (der, top) {
+	var components = [];
+	der.readSequence(top);
+	var end = der.offset + der.length;
+	while (der.offset < end) {
+		der.readSequence(asn1.Ber.Constructor | asn1.Ber.Set);
+		var after = der.offset + der.length;
+		der.readSequence();
+		var oid = der.readOID();
+		var type = der.peek();
+		var value;
+		switch (type) {
+		case asn1.Ber.PrintableString:
+		case asn1.Ber.IA5String:
+		case asn1.Ber.OctetString:
+		case asn1.Ber.T61String:
+			value = der.readString(type);
+			break;
+		case asn1.Ber.Utf8String:
+			value = der.readString(type, true);
+			value = value.toString('utf8');
+			break;
+		case asn1.Ber.CharacterString:
+		case asn1.Ber.BMPString:
+			value = der.readString(type, true);
+			value = value.toString('utf16le');
+			break;
+		default:
+			throw (new Error('Unknown asn1 type ' + type));
+		}
+		components.push({ oid: oid, asn1type: type, value: value });
+		der._offset = after;
+	}
+	der._offset = end;
+	return (new Identity({
+		components: components
+	}));
+};
+
+Identity.isIdentity = function (obj, ver) {
+	return (utils.isCompatible(obj, Identity, ver));
+};
+
+/*
+ * API versions for Identity:
+ * [1,0] -- initial ver
+ */
+Identity.prototype._sshpkApiVersion = [1, 0];
+
+Identity._oldVersionDetect = function (obj) {
+	return ([1, 0]);
+};
+
+
+/***/ }),
+/* 159 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// Copyright 2015 Joyent, Inc.
+
+module.exports = SSHBuffer;
+
+var assert = __webpack_require__(16);
+var Buffer = __webpack_require__(15).Buffer;
+
+function SSHBuffer(opts) {
+	assert.object(opts, 'options');
+	if (opts.buffer !== undefined)
+		assert.buffer(opts.buffer, 'options.buffer');
+
+	this._size = opts.buffer ? opts.buffer.length : 1024;
+	this._buffer = opts.buffer || Buffer.alloc(this._size);
+	this._offset = 0;
+}
+
+SSHBuffer.prototype.toBuffer = function () {
+	return (this._buffer.slice(0, this._offset));
+};
+
+SSHBuffer.prototype.atEnd = function () {
+	return (this._offset >= this._buffer.length);
+};
+
+SSHBuffer.prototype.remainder = function () {
+	return (this._buffer.slice(this._offset));
+};
+
+SSHBuffer.prototype.skip = function (n) {
+	this._offset += n;
+};
+
+SSHBuffer.prototype.expand = function () {
+	this._size *= 2;
+	var buf = Buffer.alloc(this._size);
+	this._buffer.copy(buf, 0);
+	this._buffer = buf;
+};
+
+SSHBuffer.prototype.readPart = function () {
+	return ({data: this.readBuffer()});
+};
+
+SSHBuffer.prototype.readBuffer = function () {
+	var len = this._buffer.readUInt32BE(this._offset);
+	this._offset += 4;
+	assert.ok(this._offset + len <= this._buffer.length,
+	    'length out of bounds at +0x' + this._offset.toString(16) +
+	    ' (data truncated?)');
+	var buf = this._buffer.slice(this._offset, this._offset + len);
+	this._offset += len;
+	return (buf);
+};
+
+SSHBuffer.prototype.readString = function () {
+	return (this.readBuffer().toString());
+};
+
+SSHBuffer.prototype.readCString = function () {
+	var offset = this._offset;
+	while (offset < this._buffer.length &&
+	    this._buffer[offset] !== 0x00)
+		offset++;
+	assert.ok(offset < this._buffer.length, 'c string does not terminate');
+	var str = this._buffer.slice(this._offset, offset).toString();
+	this._offset = offset + 1;
+	return (str);
+};
+
+SSHBuffer.prototype.readInt = function () {
+	var v = this._buffer.readUInt32BE(this._offset);
+	this._offset += 4;
+	return (v);
+};
+
+SSHBuffer.prototype.readInt64 = function () {
+	assert.ok(this._offset + 8 < this._buffer.length,
+	    'buffer not long enough to read Int64');
+	var v = this._buffer.slice(this._offset, this._offset + 8);
+	this._offset += 8;
+	return (v);
+};
+
+SSHBuffer.prototype.readChar = function () {
+	var v = this._buffer[this._offset++];
+	return (v);
+};
+
+SSHBuffer.prototype.writeBuffer = function (buf) {
+	while (this._offset + 4 + buf.length > this._size)
+		this.expand();
+	this._buffer.writeUInt32BE(buf.length, this._offset);
+	this._offset += 4;
+	buf.copy(this._buffer, this._offset);
+	this._offset += buf.length;
+};
+
+SSHBuffer.prototype.writeString = function (str) {
+	this.writeBuffer(Buffer.from(str, 'utf8'));
+};
+
+SSHBuffer.prototype.writeCString = function (str) {
+	while (this._offset + 1 + str.length > this._size)
+		this.expand();
+	this._buffer.write(str, this._offset);
+	this._offset += str.length;
+	this._buffer[this._offset++] = 0;
+};
+
+SSHBuffer.prototype.writeInt = function (v) {
+	while (this._offset + 4 > this._size)
+		this.expand();
+	this._buffer.writeUInt32BE(v, this._offset);
+	this._offset += 4;
+};
+
+SSHBuffer.prototype.writeInt64 = function (v) {
+	assert.buffer(v, 'value');
+	if (v.length > 8) {
+		var lead = v.slice(0, v.length - 8);
+		for (var i = 0; i < lead.length; ++i) {
+			assert.strictEqual(lead[i], 0,
+			    'must fit in 64 bits of precision');
+		}
+		v = v.slice(v.length - 8, v.length);
+	}
+	while (this._offset + 8 > this._size)
+		this.expand();
+	v.copy(this._buffer, this._offset);
+	this._offset += 8;
+};
+
+SSHBuffer.prototype.writeChar = function (v) {
+	while (this._offset + 1 > this._size)
+		this.expand();
+	this._buffer[this._offset++] = v;
+};
+
+SSHBuffer.prototype.writePart = function (p) {
+	this.writeBuffer(p.data);
+};
+
+SSHBuffer.prototype.write = function (buf) {
+	while (this._offset + buf.length > this._size)
+		this.expand();
+	buf.copy(this._buffer, this._offset);
+	this._offset += buf.length;
+};
+
+
+/***/ }),
+/* 160 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = x => {
+	if (typeof x !== 'string') {
+		throw new TypeError('Expected a string, got ' + typeof x);
+	}
+
+	// Catches EFBBBF (UTF-8 BOM) because the buffer-to-string
+	// conversion translates it to FEFF (UTF-16 BOM)
+	if (x.charCodeAt(0) === 0xFEFF) {
+		return x.slice(1);
+	}
+
+	return x;
+};
+
+
+/***/ }),
+/* 161 */
+/***/ (function(module, exports) {
+
+// Returns a wrapper function that returns a wrapped callback
+// The wrapper function should do some stuff, and return a
+// presumably different callback function.
+// This makes sure that own properties are retained, so that
+// decorations and such are not lost along the way.
+module.exports = wrappy
+function wrappy (fn, cb) {
+  if (fn && cb) return wrappy(fn)(cb)
+
+  if (typeof fn !== 'function')
+    throw new TypeError('need wrapper function')
+
+  Object.keys(fn).forEach(function (k) {
+    wrapper[k] = fn[k]
+  })
+
+  return wrapper
+
+  function wrapper() {
+    var args = new Array(arguments.length)
+    for (var i = 0; i < args.length; i++) {
+      args[i] = arguments[i]
+    }
+    var ret = fn.apply(this, args)
+    var cb = args[args.length-1]
+    if (typeof ret === 'function' && ret !== cb) {
+      Object.keys(cb).forEach(function (k) {
+        ret[k] = cb[k]
+      })
+    }
+    return ret
+  }
+}
+
+
+/***/ }),
+/* 162 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _extends2;
+
+function _load_extends() {
+  return _extends2 = _interopRequireDefault(__webpack_require__(21));
+}
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+exports.extractWorkspaces = extractWorkspaces;
+
+var _executeLifecycleScript;
+
+function _load_executeLifecycleScript() {
+  return _executeLifecycleScript = __webpack_require__(111);
+}
+
+var _path;
+
+function _load_path() {
+  return _path = __webpack_require__(377);
+}
+
+var _conversion;
+
+function _load_conversion() {
+  return _conversion = __webpack_require__(336);
+}
+
+var _index;
+
+function _load_index() {
+  return _index = _interopRequireDefault(__webpack_require__(220));
+}
+
+var _errors;
+
+function _load_errors() {
+  return _errors = __webpack_require__(6);
+}
+
+var _fs;
+
+function _load_fs() {
+  return _fs = _interopRequireWildcard(__webpack_require__(4));
+}
+
+var _constants;
+
+function _load_constants() {
+  return _constants = _interopRequireWildcard(__webpack_require__(8));
+}
+
+var _packageConstraintResolver;
+
+function _load_packageConstraintResolver() {
+  return _packageConstraintResolver = _interopRequireDefault(__webpack_require__(555));
+}
+
+var _requestManager;
+
+function _load_requestManager() {
+  return _requestManager = _interopRequireDefault(__webpack_require__(378));
+}
+
+var _index2;
+
+function _load_index2() {
+  return _index2 = __webpack_require__(57);
+}
+
+var _index3;
+
+function _load_index3() {
+  return _index3 = __webpack_require__(200);
+}
+
+var _map;
+
+function _load_map() {
+  return _map = _interopRequireDefault(__webpack_require__(29));
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const crypto = __webpack_require__(11);
+const detectIndent = __webpack_require__(635);
+const invariant = __webpack_require__(9);
+const path = __webpack_require__(0);
+const micromatch = __webpack_require__(114);
+const isCi = __webpack_require__(397);
+
+function sortObject(object) {
+  const sortedObject = {};
+  Object.keys(object).sort().forEach(item => {
+    sortedObject[item] = object[item];
+  });
+  return sortedObject;
+}
+
+class Config {
+  constructor(reporter) {
+    this.constraintResolver = new (_packageConstraintResolver || _load_packageConstraintResolver()).default(this, reporter);
+    this.requestManager = new (_requestManager || _load_requestManager()).default(reporter);
+    this.reporter = reporter;
+    this._init({});
+  }
+
+  //
+
+
+  //
+
+
+  // cache packages in offline mirror folder as new .tgz files
+
+
+  //
+
+
+  //
+
+
+  //
+
+
+  //
+
+
+  //
+
+
+  //
+
+
+  //
+
+
+  //
+
+
+  //
+
+
+  //
+
+
+  //
+
+
+  // Whether we should ignore executing lifecycle scripts
+
+
+  //
+
+
+  //
+
+
+  //
+
+
+  //
+
+
+  /**
+   * Execute a promise produced by factory if it doesn't exist in our cache with
+   * the associated key.
+   */
+
+  getCache(key, factory) {
+    const cached = this.cache[key];
+    if (cached) {
+      return cached;
+    }
+
+    return this.cache[key] = factory().catch(err => {
+      this.cache[key] = null;
+      throw err;
+    });
+  }
+
+  /**
+   * Get a config option from our yarn config.
+   */
+
+  getOption(key, resolve = false) {
+    const value = this.registries.yarn.getOption(key);
+
+    if (resolve && typeof value === 'string' && value.length) {
+      return (0, (_path || _load_path()).resolveWithHome)(value);
+    }
+
+    return value;
+  }
+
+  /**
+   * Reduce a list of versions to a single one based on an input range.
+   */
+
+  resolveConstraints(versions, range) {
+    return this.constraintResolver.reduce(versions, range);
+  }
+
+  /**
+   * Initialise config. Fetch registry options, find package roots.
+   */
+
+  init(opts = {}) {
+    var _this = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      _this._init(opts);
+
+      _this.workspaceRootFolder = yield _this.findWorkspaceRoot(_this.cwd);
+      _this.lockfileFolder = _this.workspaceRootFolder || _this.cwd;
+
+      // using focus in a workspace root is not allowed
+      if (_this.focus && (!_this.workspaceRootFolder || _this.cwd === _this.workspaceRootFolder)) {
+        throw new (_errors || _load_errors()).MessageError(_this.reporter.lang('workspacesFocusRootCheck'));
+      }
+
+      if (_this.focus) {
+        const focusedWorkspaceManifest = yield _this.readRootManifest();
+        _this.focusedWorkspaceName = focusedWorkspaceManifest.name;
+      }
+
+      _this.linkedModules = [];
+
+      let linkedModules;
+      try {
+        linkedModules = yield (_fs || _load_fs()).readdir(_this.linkFolder);
+      } catch (err) {
+        if (err.code === 'ENOENT') {
+          linkedModules = [];
+        } else {
+          throw err;
+        }
+      }
+
+      for (var _iterator = linkedModules, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+        var _ref;
+
+        if (_isArray) {
+          if (_i >= _iterator.length) break;
+          _ref = _iterator[_i++];
+        } else {
+          _i = _iterator.next();
+          if (_i.done) break;
+          _ref = _i.value;
+        }
+
+        const dir = _ref;
+
+        const linkedPath = path.join(_this.linkFolder, dir);
+
+        if (dir[0] === '@') {
+          // it's a scope, not a package
+          const scopedLinked = yield (_fs || _load_fs()).readdir(linkedPath);
+          _this.linkedModules.push(...scopedLinked.map(function (scopedDir) {
+            return path.join(dir, scopedDir);
+          }));
+        } else {
+          _this.linkedModules.push(dir);
+        }
+      }
+
+      for (var _iterator2 = Object.keys((_index2 || _load_index2()).registries), _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+        var _ref2;
+
+        if (_isArray2) {
+          if (_i2 >= _iterator2.length) break;
+          _ref2 = _iterator2[_i2++];
+        } else {
+          _i2 = _iterator2.next();
+          if (_i2.done) break;
+          _ref2 = _i2.value;
+        }
+
+        const key = _ref2;
+
+        const Registry = (_index2 || _load_index2()).registries[key];
+
+        const extraneousRcFiles = Registry === (_index2 || _load_index2()).registries.yarn ? _this.extraneousYarnrcFiles : [];
+
+        // instantiate registry
+        const registry = new Registry(_this.cwd, _this.registries, _this.requestManager, _this.reporter, _this.enableDefaultRc, extraneousRcFiles);
+        yield registry.init({
+          registry: opts.registry
+        });
+
+        _this.registries[key] = registry;
+        if (_this.registryFolders.indexOf(registry.folder) === -1) {
+          _this.registryFolders.push(registry.folder);
+        }
+      }
+
+      if (_this.modulesFolder) {
+        _this.registryFolders = [_this.modulesFolder];
+      }
+
+      _this.networkConcurrency = opts.networkConcurrency || Number(_this.getOption('network-concurrency')) || (_constants || _load_constants()).NETWORK_CONCURRENCY;
+
+      _this.childConcurrency = opts.childConcurrency || Number(_this.getOption('child-concurrency')) || Number(process.env.CHILD_CONCURRENCY) || (_constants || _load_constants()).CHILD_CONCURRENCY;
+
+      _this.networkTimeout = opts.networkTimeout || Number(_this.getOption('network-timeout')) || (_constants || _load_constants()).NETWORK_TIMEOUT;
+
+      const httpProxy = opts.httpProxy || _this.getOption('proxy');
+      const httpsProxy = opts.httpsProxy || _this.getOption('https-proxy');
+      _this.requestManager.setOptions({
+        userAgent: String(_this.getOption('user-agent')),
+        httpProxy: httpProxy === false ? false : String(httpProxy || ''),
+        httpsProxy: httpsProxy === false ? false : String(httpsProxy || ''),
+        strictSSL: Boolean(_this.getOption('strict-ssl')),
+        ca: Array.prototype.concat(opts.ca || _this.getOption('ca') || []).map(String),
+        cafile: String(opts.cafile || _this.getOption('cafile', true) || ''),
+        cert: String(opts.cert || _this.getOption('cert') || ''),
+        key: String(opts.key || _this.getOption('key') || ''),
+        networkConcurrency: _this.networkConcurrency,
+        networkTimeout: _this.networkTimeout
+      });
+
+      _this.globalFolder = opts.globalFolder || String(_this.getOption('global-folder', true));
+      if (_this.globalFolder === 'undefined') {
+        _this.globalFolder = (_constants || _load_constants()).GLOBAL_MODULE_DIRECTORY;
+      }
+
+      let cacheRootFolder = opts.cacheFolder || _this.getOption('cache-folder', true);
+
+      if (!cacheRootFolder) {
+        let preferredCacheFolders = (_constants || _load_constants()).PREFERRED_MODULE_CACHE_DIRECTORIES;
+        const preferredCacheFolder = opts.preferredCacheFolder || _this.getOption('preferred-cache-folder', true);
+
+        if (preferredCacheFolder) {
+          preferredCacheFolders = [String(preferredCacheFolder)].concat(preferredCacheFolders);
+        }
+
+        const cacheFolderQuery = yield (_fs || _load_fs()).getFirstSuitableFolder(preferredCacheFolders, (_fs || _load_fs()).constants.W_OK | (_fs || _load_fs()).constants.X_OK | (_fs || _load_fs()).constants.R_OK // eslint-disable-line no-bitwise
+        );
+        for (var _iterator3 = cacheFolderQuery.skipped, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
+          var _ref3;
+
+          if (_isArray3) {
+            if (_i3 >= _iterator3.length) break;
+            _ref3 = _iterator3[_i3++];
+          } else {
+            _i3 = _iterator3.next();
+            if (_i3.done) break;
+            _ref3 = _i3.value;
+          }
+
+          const skippedEntry = _ref3;
+
+          _this.reporter.warn(_this.reporter.lang('cacheFolderSkipped', skippedEntry.folder));
+        }
+
+        cacheRootFolder = cacheFolderQuery.folder;
+        if (cacheRootFolder && cacheFolderQuery.skipped.length > 0) {
+          _this.reporter.warn(_this.reporter.lang('cacheFolderSelected', cacheRootFolder));
+        }
+      }
+
+      if (!cacheRootFolder) {
+        throw new (_errors || _load_errors()).MessageError(_this.reporter.lang('cacheFolderMissing'));
+      } else {
+        _this._cacheRootFolder = String(cacheRootFolder);
+      }
+
+      const manifest = yield _this.maybeReadManifest(_this.lockfileFolder);
+
+      const plugnplayByEnv = _this.getOption('plugnplay-override');
+      if (plugnplayByEnv != null) {
+        _this.plugnplayEnabled = plugnplayByEnv !== 'false' && plugnplayByEnv !== '0';
+        _this.plugnplayPersist = false;
+      } else if (opts.enablePnp || opts.disablePnp) {
+        _this.plugnplayEnabled = !!opts.enablePnp;
+        _this.plugnplayPersist = true;
+      } else if (manifest && manifest.installConfig && manifest.installConfig.pnp) {
+        _this.plugnplayEnabled = !!manifest.installConfig.pnp;
+        _this.plugnplayPersist = false;
+      } else {
+        _this.plugnplayEnabled = false;
+        _this.plugnplayPersist = false;
+      }
+
+      if (process.platform === 'win32') {
+        const cacheRootFolderDrive = path.parse(_this._cacheRootFolder).root.toLowerCase();
+        const lockfileFolderDrive = path.parse(_this.lockfileFolder).root.toLowerCase();
+
+        if (cacheRootFolderDrive !== lockfileFolderDrive) {
+          if (_this.plugnplayEnabled) {
+            _this.reporter.warn(_this.reporter.lang('plugnplayWindowsSupport'));
+          }
+          _this.plugnplayEnabled = false;
+          _this.plugnplayPersist = false;
+        }
+      }
+
+      _this.plugnplayShebang = String(_this.getOption('plugnplay-shebang') || '') || '/usr/bin/env node';
+      _this.plugnplayBlacklist = String(_this.getOption('plugnplay-blacklist') || '') || null;
+
+      _this.ignoreScripts = opts.ignoreScripts || Boolean(_this.getOption('ignore-scripts', false));
+
+      _this.workspacesEnabled = _this.getOption('workspaces-experimental') !== false;
+      _this.workspacesNohoistEnabled = _this.getOption('workspaces-nohoist-experimental') !== false;
+
+      _this.offlineCacheFolder = String(_this.getOption('offline-cache-folder') || '') || null;
+
+      _this.pruneOfflineMirror = Boolean(_this.getOption('yarn-offline-mirror-pruning'));
+      _this.enableMetaFolder = Boolean(_this.getOption('enable-meta-folder'));
+      _this.enableLockfileVersions = Boolean(_this.getOption('yarn-enable-lockfile-versions'));
+      _this.linkFileDependencies = Boolean(_this.getOption('yarn-link-file-dependencies'));
+      _this.packBuiltPackages = Boolean(_this.getOption('experimental-pack-script-packages-in-mirror'));
+
+      _this.autoAddIntegrity = !(0, (_conversion || _load_conversion()).boolifyWithDefault)(String(_this.getOption('unsafe-disable-integrity-migration')), true);
+
+      //init & create cacheFolder, tempFolder
+      _this.cacheFolder = path.join(_this._cacheRootFolder, 'v' + String((_constants || _load_constants()).CACHE_VERSION));
+      _this.tempFolder = opts.tempFolder || path.join(_this.cacheFolder, '.tmp');
+      yield (_fs || _load_fs()).mkdirp(_this.cacheFolder);
+      yield (_fs || _load_fs()).mkdirp(_this.tempFolder);
+
+      if (opts.production !== undefined) {
+        _this.production = Boolean(opts.production);
+      } else {
+        _this.production = Boolean(_this.getOption('production')) || process.env.NODE_ENV === 'production' && process.env.NPM_CONFIG_PRODUCTION !== 'false' && process.env.YARN_PRODUCTION !== 'false';
+      }
+
+      if (_this.workspaceRootFolder && !_this.workspacesEnabled) {
+        throw new (_errors || _load_errors()).MessageError(_this.reporter.lang('workspacesDisabled'));
+      }
+    })();
+  }
+
+  _init(opts) {
+    this.registryFolders = [];
+    this.linkedModules = [];
+
+    this.registries = (0, (_map || _load_map()).default)();
+    this.cache = (0, (_map || _load_map()).default)();
+
+    // Ensure the cwd is always an absolute path.
+    this.cwd = path.resolve(opts.cwd || this.cwd || process.cwd());
+
+    this.looseSemver = opts.looseSemver == undefined ? true : opts.looseSemver;
+
+    this.commandName = opts.commandName || '';
+
+    this.enableDefaultRc = opts.enableDefaultRc !== false;
+    this.extraneousYarnrcFiles = opts.extraneousYarnrcFiles || [];
+
+    this.preferOffline = !!opts.preferOffline;
+    this.modulesFolder = opts.modulesFolder;
+    this.linkFolder = opts.linkFolder || (_constants || _load_constants()).LINK_REGISTRY_DIRECTORY;
+    this.offline = !!opts.offline;
+    this.binLinks = !!opts.binLinks;
+    this.updateChecksums = !!opts.updateChecksums;
+    this.plugnplayUnplugged = [];
+    this.plugnplayPurgeUnpluggedPackages = false;
+
+    this.ignorePlatform = !!opts.ignorePlatform;
+    this.ignoreScripts = !!opts.ignoreScripts;
+
+    this.disablePrepublish = !!opts.disablePrepublish;
+
+    // $FlowFixMe$
+    this.nonInteractive = !!opts.nonInteractive || isCi || !process.stdout.isTTY;
+
+    this.requestManager.setOptions({
+      offline: !!opts.offline && !opts.preferOffline,
+      captureHar: !!opts.captureHar
+    });
+
+    this.focus = !!opts.focus;
+    this.focusedWorkspaceName = '';
+
+    this.otp = opts.otp || '';
+  }
+
+  /**
+   * Generate a name suitable as unique filesystem identifier for the specified package.
+   */
+
+  generateUniquePackageSlug(pkg) {
+    let slug = pkg.name;
+
+    slug = slug.replace(/[^@a-z0-9]+/g, '-');
+    slug = slug.replace(/^-+|-+$/g, '');
+
+    if (pkg.registry) {
+      slug = `${pkg.registry}-${slug}`;
+    } else {
+      slug = `unknown-${slug}`;
+    }
+
+    const hash = pkg.remote.hash;
+
+
+    if (pkg.version) {
+      slug += `-${pkg.version}`;
+    }
+
+    if (pkg.uid && pkg.version !== pkg.uid) {
+      slug += `-${pkg.uid}`;
+    } else if (hash) {
+      slug += `-${hash}`;
+    }
+
+    if (pkg.remote.integrity) {
+      slug += `-integrity`;
+    }
+
+    return slug;
+  }
+
+  /**
+   * Generate an absolute module path.
+   */
+
+  generateModuleCachePath(pkg) {
+    invariant(this.cacheFolder, 'No package root');
+    invariant(pkg, 'Undefined package');
+
+    const slug = this.generateUniquePackageSlug(pkg);
+    return path.join(this.cacheFolder, slug, 'node_modules', pkg.name);
+  }
+
+  /**
+   */
+
+  getUnpluggedPath() {
+    return path.join(this.lockfileFolder, '.pnp', 'unplugged');
+  }
+
+  /**
+    */
+
+  generatePackageUnpluggedPath(pkg) {
+    const slug = this.generateUniquePackageSlug(pkg);
+    return path.join(this.getUnpluggedPath(), slug, 'node_modules', pkg.name);
+  }
+
+  /**
+   */
+
+  listUnpluggedPackageFolders() {
+    var _this2 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const unpluggedPackages = new Map();
+      const unpluggedPath = _this2.getUnpluggedPath();
+
+      if (!(yield (_fs || _load_fs()).exists(unpluggedPath))) {
+        return unpluggedPackages;
+      }
+
+      for (var _iterator4 = yield (_fs || _load_fs()).readdir(unpluggedPath), _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
+        var _ref4;
+
+        if (_isArray4) {
+          if (_i4 >= _iterator4.length) break;
+          _ref4 = _iterator4[_i4++];
+        } else {
+          _i4 = _iterator4.next();
+          if (_i4.done) break;
+          _ref4 = _i4.value;
+        }
+
+        const unpluggedName = _ref4;
+
+        const nmListing = yield (_fs || _load_fs()).readdir(path.join(unpluggedPath, unpluggedName, 'node_modules'));
+        invariant(nmListing.length === 1, 'A single folder should be in the unplugged directory');
+
+        const target = path.join(unpluggedPath, unpluggedName, `node_modules`, nmListing[0]);
+        unpluggedPackages.set(unpluggedName, target);
+      }
+
+      return unpluggedPackages;
+    })();
+  }
+
+  /**
+   * Execute lifecycle scripts in the specified directory. Ignoring when the --ignore-scripts flag has been
+   * passed.
+   */
+
+  executeLifecycleScript(commandName, cwd) {
+    if (this.ignoreScripts) {
+      return Promise.resolve();
+    } else {
+      return (0, (_executeLifecycleScript || _load_executeLifecycleScript()).execFromManifest)(this, commandName, cwd || this.cwd);
+    }
+  }
+
+  /**
+   * Generate an absolute temporary filename location based on the input filename.
+   */
+
+  getTemp(filename) {
+    invariant(this.tempFolder, 'No temp folder');
+    return path.join(this.tempFolder, filename);
+  }
+
+  /**
+   * Remote packages may be cached in a file system to be available for offline installation.
+   * Second time the same package needs to be installed it will be loaded from there.
+   * Given a package's filename, return a path in the offline mirror location.
+   */
+
+  getOfflineMirrorPath(packageFilename) {
+    let mirrorPath;
+
+    var _arr = ['npm', 'yarn'];
+    for (var _i5 = 0; _i5 < _arr.length; _i5++) {
+      const key = _arr[_i5];
+      const registry = this.registries[key];
+
+      if (registry == null) {
+        continue;
+      }
+
+      const registryMirrorPath = registry.config['yarn-offline-mirror'];
+
+      if (registryMirrorPath === false) {
+        return null;
+      }
+
+      if (registryMirrorPath == null) {
+        continue;
+      }
+
+      mirrorPath = registryMirrorPath;
+    }
+
+    if (mirrorPath == null) {
+      return null;
+    }
+
+    if (packageFilename == null) {
+      return mirrorPath;
+    }
+
+    return path.join(mirrorPath, path.basename(packageFilename));
+  }
+
+  /**
+   * Checker whether the folder input is a valid module folder. We output a yarn metadata
+   * file when we've successfully setup a folder so use this as a marker.
+   */
+
+  isValidModuleDest(dest) {
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      if (!(yield (_fs || _load_fs()).exists(dest))) {
+        return false;
+      }
+
+      if (!(yield (_fs || _load_fs()).exists(path.join(dest, (_constants || _load_constants()).METADATA_FILENAME)))) {
+        return false;
+      }
+
+      return true;
+    })();
+  }
+
+  /**
+   * Read package metadata and normalized package info.
+   */
+
+  readPackageMetadata(dir) {
+    var _this3 = this;
+
+    return this.getCache(`metadata-${dir}`, (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const metadata = yield _this3.readJson(path.join(dir, (_constants || _load_constants()).METADATA_FILENAME));
+      const pkg = yield _this3.readManifest(dir, metadata.registry);
+
+      return {
+        package: pkg,
+        artifacts: metadata.artifacts || [],
+        hash: metadata.hash,
+        remote: metadata.remote,
+        registry: metadata.registry
+      };
+    }));
+  }
+
+  /**
+   * Read normalized package info according yarn-metadata.json
+   * throw an error if package.json was not found
+   */
+
+  readManifest(dir, priorityRegistry, isRoot = false) {
+    var _this4 = this;
+
+    return this.getCache(`manifest-${dir}`, (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const manifest = yield _this4.maybeReadManifest(dir, priorityRegistry, isRoot);
+
+      if (manifest) {
+        return manifest;
+      } else {
+        throw new (_errors || _load_errors()).MessageError(_this4.reporter.lang('couldntFindPackagejson', dir), 'ENOENT');
+      }
+    }));
+  }
+
+  /**
+   * try get the manifest file by looking
+   * 1. manifest file in cache
+   * 2. manifest file in registry
+   */
+  maybeReadManifest(dir, priorityRegistry, isRoot = false) {
+    var _this5 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const metadataLoc = path.join(dir, (_constants || _load_constants()).METADATA_FILENAME);
+
+      if (yield (_fs || _load_fs()).exists(metadataLoc)) {
+        const metadata = yield _this5.readJson(metadataLoc);
+
+        if (!priorityRegistry) {
+          priorityRegistry = metadata.priorityRegistry;
+        }
+
+        if (typeof metadata.manifest !== 'undefined') {
+          return metadata.manifest;
+        }
+      }
+
+      if (priorityRegistry) {
+        const file = yield _this5.tryManifest(dir, priorityRegistry, isRoot);
+        if (file) {
+          return file;
+        }
+      }
+
+      for (var _iterator5 = Object.keys((_index2 || _load_index2()).registries), _isArray5 = Array.isArray(_iterator5), _i6 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
+        var _ref7;
+
+        if (_isArray5) {
+          if (_i6 >= _iterator5.length) break;
+          _ref7 = _iterator5[_i6++];
+        } else {
+          _i6 = _iterator5.next();
+          if (_i6.done) break;
+          _ref7 = _i6.value;
+        }
+
+        const registry = _ref7;
+
+        if (priorityRegistry === registry) {
+          continue;
+        }
+
+        const file = yield _this5.tryManifest(dir, registry, isRoot);
+        if (file) {
+          return file;
+        }
+      }
+
+      return null;
+    })();
+  }
+
+  /**
+   * Read the root manifest.
+   */
+
+  readRootManifest() {
+    return this.readManifest(this.cwd, 'npm', true);
+  }
+
+  /**
+   * Try and find package info with the input directory and registry.
+   */
+
+  tryManifest(dir, registry, isRoot) {
+    var _this6 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const filename = (_index2 || _load_index2()).registries[registry].filename;
+
+      const loc = path.join(dir, filename);
+      if (yield (_fs || _load_fs()).exists(loc)) {
+        const data = yield _this6.readJson(loc);
+        data._registry = registry;
+        data._loc = loc;
+        return (0, (_index || _load_index()).default)(data, dir, _this6, isRoot);
+      } else {
+        return null;
+      }
+    })();
+  }
+
+  findManifest(dir, isRoot) {
+    var _this7 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      for (var _iterator6 = (_index2 || _load_index2()).registryNames, _isArray6 = Array.isArray(_iterator6), _i7 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) {
+        var _ref8;
+
+        if (_isArray6) {
+          if (_i7 >= _iterator6.length) break;
+          _ref8 = _iterator6[_i7++];
+        } else {
+          _i7 = _iterator6.next();
+          if (_i7.done) break;
+          _ref8 = _i7.value;
+        }
+
+        const registry = _ref8;
+
+        const manifest = yield _this7.tryManifest(dir, registry, isRoot);
+
+        if (manifest) {
+          return manifest;
+        }
+      }
+
+      return null;
+    })();
+  }
+
+  findWorkspaceRoot(initial) {
+    var _this8 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      let previous = null;
+      let current = path.normalize(initial);
+      if (!(yield (_fs || _load_fs()).exists(current))) {
+        throw new (_errors || _load_errors()).MessageError(_this8.reporter.lang('folderMissing', current));
+      }
+
+      do {
+        const manifest = yield _this8.findManifest(current, true);
+        const ws = extractWorkspaces(manifest);
+        if (ws && ws.packages) {
+          const relativePath = path.relative(current, initial);
+          if (relativePath === '' || micromatch([relativePath], ws.packages).length > 0) {
+            return current;
+          } else {
+            return null;
+          }
+        }
+
+        previous = current;
+        current = path.dirname(current);
+      } while (current !== previous);
+
+      return null;
+    })();
+  }
+
+  resolveWorkspaces(root, rootManifest) {
+    var _this9 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const workspaces = {};
+      if (!_this9.workspacesEnabled) {
+        return workspaces;
+      }
+
+      const ws = _this9.getWorkspaces(rootManifest, true);
+      const patterns = ws && ws.packages ? ws.packages : [];
+
+      if (!Array.isArray(patterns)) {
+        throw new (_errors || _load_errors()).MessageError(_this9.reporter.lang('workspacesSettingMustBeArray'));
+      }
+
+      const registryFilenames = (_index2 || _load_index2()).registryNames.map(function (registryName) {
+        return _this9.registries[registryName].constructor.filename;
+      }).join('|');
+      const trailingPattern = `/+(${registryFilenames})`;
+      // anything under folder (node_modules) should be ignored, thus use the '**' instead of shallow match "*"
+      const ignorePatterns = _this9.registryFolders.map(function (folder) {
+        return `/${folder}/**/+(${registryFilenames})`;
+      });
+
+      const files = yield Promise.all(patterns.map(function (pattern) {
+        return (_fs || _load_fs()).glob(pattern.replace(/\/?$/, trailingPattern), {
+          cwd: root,
+          ignore: ignorePatterns.map(function (ignorePattern) {
+            return pattern.replace(/\/?$/, ignorePattern);
+          })
+        });
+      }));
+
+      for (var _iterator7 = new Set([].concat(...files)), _isArray7 = Array.isArray(_iterator7), _i8 = 0, _iterator7 = _isArray7 ? _iterator7 : _iterator7[Symbol.iterator]();;) {
+        var _ref9;
+
+        if (_isArray7) {
+          if (_i8 >= _iterator7.length) break;
+          _ref9 = _iterator7[_i8++];
+        } else {
+          _i8 = _iterator7.next();
+          if (_i8.done) break;
+          _ref9 = _i8.value;
+        }
+
+        const file = _ref9;
+
+        const loc = path.join(root, path.dirname(file));
+        const manifest = yield _this9.findManifest(loc, false);
+
+        if (!manifest) {
+          continue;
+        }
+
+        if (!manifest.name) {
+          _this9.reporter.warn(_this9.reporter.lang('workspaceNameMandatory', loc));
+          continue;
+        }
+        if (!manifest.version) {
+          _this9.reporter.warn(_this9.reporter.lang('workspaceVersionMandatory', loc));
+          continue;
+        }
+
+        if (Object.prototype.hasOwnProperty.call(workspaces, manifest.name)) {
+          throw new (_errors || _load_errors()).MessageError(_this9.reporter.lang('workspaceNameDuplicate', manifest.name));
+        }
+
+        workspaces[manifest.name] = { loc, manifest };
+      }
+
+      return workspaces;
+    })();
+  }
+
+  // workspaces functions
+  getWorkspaces(manifest, shouldThrow = false) {
+    if (!manifest || !this.workspacesEnabled) {
+      return undefined;
+    }
+
+    const ws = extractWorkspaces(manifest);
+
+    if (!ws) {
+      return ws;
+    }
+
+    // validate eligibility
+    let wsCopy = (0, (_extends2 || _load_extends()).default)({}, ws);
+    const warnings = [];
+    const errors = [];
+
+    // packages
+    if (wsCopy.packages && wsCopy.packages.length > 0 && !manifest.private) {
+      errors.push(this.reporter.lang('workspacesRequirePrivateProjects'));
+      wsCopy = undefined;
+    }
+    // nohoist
+    if (wsCopy && wsCopy.nohoist && wsCopy.nohoist.length > 0) {
+      if (!this.workspacesNohoistEnabled) {
+        warnings.push(this.reporter.lang('workspacesNohoistDisabled', manifest.name));
+        wsCopy.nohoist = undefined;
+      } else if (!manifest.private) {
+        errors.push(this.reporter.lang('workspacesNohoistRequirePrivatePackages', manifest.name));
+        wsCopy.nohoist = undefined;
+      }
+    }
+
+    if (errors.length > 0 && shouldThrow) {
+      throw new (_errors || _load_errors()).MessageError(errors.join('\n'));
+    }
+
+    const msg = errors.concat(warnings).join('\n');
+    if (msg.length > 0) {
+      this.reporter.warn(msg);
+    }
+
+    return wsCopy;
+  }
+
+  /**
+   * Description
+   */
+
+  getFolder(pkg) {
+    let registryName = pkg._registry;
+    if (!registryName) {
+      const ref = pkg._reference;
+      invariant(ref, 'expected reference');
+      registryName = ref.registry;
+    }
+    return this.registries[registryName].folder;
+  }
+
+  /**
+   * Get root manifests.
+   */
+
+  getRootManifests() {
+    var _this10 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const manifests = {};
+      for (var _iterator8 = (_index2 || _load_index2()).registryNames, _isArray8 = Array.isArray(_iterator8), _i9 = 0, _iterator8 = _isArray8 ? _iterator8 : _iterator8[Symbol.iterator]();;) {
+        var _ref10;
+
+        if (_isArray8) {
+          if (_i9 >= _iterator8.length) break;
+          _ref10 = _iterator8[_i9++];
+        } else {
+          _i9 = _iterator8.next();
+          if (_i9.done) break;
+          _ref10 = _i9.value;
+        }
+
+        const registryName = _ref10;
+
+        const registry = (_index2 || _load_index2()).registries[registryName];
+        const jsonLoc = path.join(_this10.cwd, registry.filename);
+
+        let object = {};
+        let exists = false;
+        let indent;
+        if (yield (_fs || _load_fs()).exists(jsonLoc)) {
+          exists = true;
+
+          const info = yield _this10.readJson(jsonLoc, (_fs || _load_fs()).readJsonAndFile);
+          object = info.object;
+          indent = detectIndent(info.content).indent || undefined;
+        }
+        manifests[registryName] = { loc: jsonLoc, object, exists, indent };
+      }
+      return manifests;
+    })();
+  }
+
+  /**
+   * Save root manifests.
+   */
+
+  saveRootManifests(manifests) {
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      for (var _iterator9 = (_index2 || _load_index2()).registryNames, _isArray9 = Array.isArray(_iterator9), _i10 = 0, _iterator9 = _isArray9 ? _iterator9 : _iterator9[Symbol.iterator]();;) {
+        var _ref11;
+
+        if (_isArray9) {
+          if (_i10 >= _iterator9.length) break;
+          _ref11 = _iterator9[_i10++];
+        } else {
+          _i10 = _iterator9.next();
+          if (_i10.done) break;
+          _ref11 = _i10.value;
+        }
+
+        const registryName = _ref11;
+        var _manifests$registryNa = manifests[registryName];
+        const loc = _manifests$registryNa.loc,
+              object = _manifests$registryNa.object,
+              exists = _manifests$registryNa.exists,
+              indent = _manifests$registryNa.indent;
+
+        if (!exists && !Object.keys(object).length) {
+          continue;
+        }
+
+        for (var _iterator10 = (_constants || _load_constants()).DEPENDENCY_TYPES, _isArray10 = Array.isArray(_iterator10), _i11 = 0, _iterator10 = _isArray10 ? _iterator10 : _iterator10[Symbol.iterator]();;) {
+          var _ref12;
+
+          if (_isArray10) {
+            if (_i11 >= _iterator10.length) break;
+            _ref12 = _iterator10[_i11++];
+          } else {
+            _i11 = _iterator10.next();
+            if (_i11.done) break;
+            _ref12 = _i11.value;
+          }
+
+          const field = _ref12;
+
+          if (object[field]) {
+            object[field] = sortObject(object[field]);
+          }
+        }
+
+        yield (_fs || _load_fs()).writeFilePreservingEol(loc, JSON.stringify(object, null, indent || (_constants || _load_constants()).DEFAULT_INDENT) + '\n');
+      }
+    })();
+  }
+
+  /**
+   * Call the passed factory (defaults to fs.readJson) and rethrow a pretty error message if it was the result
+   * of a syntax error.
+   */
+
+  readJson(loc, factory = (_fs || _load_fs()).readJson) {
+    try {
+      return factory(loc);
+    } catch (err) {
+      if (err instanceof SyntaxError) {
+        throw new (_errors || _load_errors()).MessageError(this.reporter.lang('jsonError', loc, err.message));
+      } else {
+        throw err;
+      }
+    }
+  }
+
+  static create(opts = {}, reporter = new (_index3 || _load_index3()).NoopReporter()) {
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const config = new Config(reporter);
+      yield config.init(opts);
+      return config;
+    })();
+  }
+}
+
+exports.default = Config;
+function extractWorkspaces(manifest) {
+  if (!manifest || !manifest.workspaces) {
+    return undefined;
+  }
+
+  if (Array.isArray(manifest.workspaces)) {
+    return { packages: manifest.workspaces };
+  }
+
+  if (manifest.workspaces.packages && Array.isArray(manifest.workspaces.packages) || manifest.workspaces.nohoist && Array.isArray(manifest.workspaces.nohoist)) {
+    return manifest.workspaces;
+  }
+
+  return undefined;
+}
+
+/***/ }),
+/* 163 */
+/***/ (function(module, exports) {
+
+module.exports = function(module) {
+	if(!module.webpackPolyfill) {
+		module.deprecate = function() {};
+		module.paths = [];
+		// module.parent = undefined by default
+		if(!module.children) module.children = [];
+		Object.defineProperty(module, "loaded", {
+			enumerable: true,
+			get: function() {
+				return module.l;
+			}
+		});
+		Object.defineProperty(module, "id", {
+			enumerable: true,
+			get: function() {
+				return module.i;
+			}
+		});
+		module.webpackPolyfill = 1;
+	}
+	return module;
+};
+
+
+/***/ }),
+/* 164 */
+/***/ (function(module, exports) {
+
+module.exports = require("net");
+
+/***/ }),
+/* 165 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.run = exports.Add = undefined;
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+var _extends2;
+
+function _load_extends() {
+  return _extends2 = _interopRequireDefault(__webpack_require__(21));
+}
+
+let run = exports.run = (() => {
+  var _ref7 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
+    if (!args.length) {
+      throw new (_errors || _load_errors()).MessageError(reporter.lang('missingAddDependencies'));
+    }
+
+    const lockfile = yield (_lockfile || _load_lockfile()).default.fromDirectory(config.lockfileFolder, reporter);
+
+    yield (0, (_install || _load_install()).wrapLifecycle)(config, flags, (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const install = new Add(args, flags, config, reporter, lockfile);
+      yield install.init();
+    }));
+  });
+
+  return function run(_x, _x2, _x3, _x4) {
+    return _ref7.apply(this, arguments);
+  };
+})();
+
+exports.hasWrapper = hasWrapper;
+exports.setFlags = setFlags;
+
+var _lockfile;
+
+function _load_lockfile() {
+  return _lockfile = _interopRequireDefault(__webpack_require__(19));
+}
+
+var _normalizePattern2;
+
+function _load_normalizePattern() {
+  return _normalizePattern2 = __webpack_require__(37);
+}
+
+var _workspaceLayout;
+
+function _load_workspaceLayout() {
+  return _workspaceLayout = _interopRequireDefault(__webpack_require__(90));
+}
+
+var _index;
+
+function _load_index() {
+  return _index = __webpack_require__(78);
+}
+
+var _list;
+
+function _load_list() {
+  return _list = __webpack_require__(358);
+}
+
+var _install;
+
+function _load_install() {
+  return _install = __webpack_require__(34);
+}
+
+var _errors;
+
+function _load_errors() {
+  return _errors = __webpack_require__(6);
+}
+
+var _constants;
+
+function _load_constants() {
+  return _constants = _interopRequireWildcard(__webpack_require__(8));
+}
+
+var _fs;
+
+function _load_fs() {
+  return _fs = _interopRequireWildcard(__webpack_require__(4));
+}
+
+var _invariant;
+
+function _load_invariant() {
+  return _invariant = _interopRequireDefault(__webpack_require__(9));
+}
+
+var _path;
+
+function _load_path() {
+  return _path = _interopRequireDefault(__webpack_require__(0));
+}
+
+var _semver;
+
+function _load_semver() {
+  return _semver = _interopRequireDefault(__webpack_require__(22));
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const SILENCE_DEPENDENCY_TYPE_WARNINGS = ['upgrade', 'upgrade-interactive'];
+
+class Add extends (_install || _load_install()).Install {
+  constructor(args, flags, config, reporter, lockfile) {
+    const workspaceRootIsCwd = config.cwd === config.lockfileFolder;
+    const _flags = flags ? (0, (_extends2 || _load_extends()).default)({}, flags, { workspaceRootIsCwd }) : { workspaceRootIsCwd };
+    super(_flags, config, reporter, lockfile);
+    this.args = args;
+    // only one flag is supported, so we can figure out which one was passed to `yarn add`
+    this.flagToOrigin = [flags.dev && 'devDependencies', flags.optional && 'optionalDependencies', flags.peer && 'peerDependencies', 'dependencies'].filter(Boolean).shift();
+  }
+
+  /**
+   * TODO
+   */
+
+  prepareRequests(requests) {
+    const requestsWithArgs = requests.slice();
+
+    for (var _iterator = this.args, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+      var _ref;
+
+      if (_isArray) {
+        if (_i >= _iterator.length) break;
+        _ref = _iterator[_i++];
+      } else {
+        _i = _iterator.next();
+        if (_i.done) break;
+        _ref = _i.value;
+      }
+
+      const pattern = _ref;
+
+      requestsWithArgs.push({
+        pattern,
+        registry: 'npm',
+        optional: false
+      });
+    }
+    return requestsWithArgs;
+  }
+
+  /**
+   * returns version for a pattern based on Manifest
+   */
+  getPatternVersion(pattern, pkg) {
+    const tilde = this.flags.tilde;
+    const configPrefix = String(this.config.getOption('save-prefix'));
+    const exact = this.flags.exact || Boolean(this.config.getOption('save-exact')) || configPrefix === '';
+
+    var _normalizePattern = (0, (_normalizePattern2 || _load_normalizePattern()).normalizePattern)(pattern);
+
+    const hasVersion = _normalizePattern.hasVersion,
+          range = _normalizePattern.range;
+
+    let version;
+
+    if ((0, (_index || _load_index()).getExoticResolver)(pattern)) {
+      // wasn't a name/range tuple so this is just a raw exotic pattern
+      version = pattern;
+    } else if (hasVersion && range && ((_semver || _load_semver()).default.satisfies(pkg.version, range) || (0, (_index || _load_index()).getExoticResolver)(range))) {
+      // if the user specified a range then use it verbatim
+      version = range;
+    }
+
+    if (!version || (_semver || _load_semver()).default.valid(version)) {
+      let prefix = configPrefix || '^';
+
+      if (tilde) {
+        prefix = '~';
+      } else if (version || exact) {
+        prefix = '';
+      }
+      version = `${prefix}${pkg.version}`;
+    }
+
+    return version;
+  }
+
+  preparePatterns(patterns) {
+    const preparedPatterns = patterns.slice();
+    for (var _iterator2 = this.resolver.dedupePatterns(this.args), _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+      var _ref2;
+
+      if (_isArray2) {
+        if (_i2 >= _iterator2.length) break;
+        _ref2 = _iterator2[_i2++];
+      } else {
+        _i2 = _iterator2.next();
+        if (_i2.done) break;
+        _ref2 = _i2.value;
+      }
+
+      const pattern = _ref2;
+
+      const pkg = this.resolver.getResolvedPattern(pattern);
+      (0, (_invariant || _load_invariant()).default)(pkg, `missing package ${pattern}`);
+      const version = this.getPatternVersion(pattern, pkg);
+      const newPattern = `${pkg.name}@${version}`;
+      preparedPatterns.push(newPattern);
+      this.addedPatterns.push(newPattern);
+      if (newPattern === pattern) {
+        continue;
+      }
+      this.resolver.replacePattern(pattern, newPattern);
+    }
+    return preparedPatterns;
+  }
+
+  preparePatternsForLinking(patterns, cwdManifest, cwdIsRoot) {
+    // remove the newly added patterns if cwd != root and update the in-memory package dependency instead
+    if (cwdIsRoot) {
+      return patterns;
+    }
+
+    let manifest;
+    const cwdPackage = `${cwdManifest.name}@${cwdManifest.version}`;
+    try {
+      manifest = this.resolver.getStrictResolvedPattern(cwdPackage);
+    } catch (e) {
+      this.reporter.warn(this.reporter.lang('unknownPackage', cwdPackage));
+      return patterns;
+    }
+
+    let newPatterns = patterns;
+    this._iterateAddedPackages((pattern, registry, dependencyType, pkgName, version) => {
+      // remove added package from patterns list
+      const filtered = newPatterns.filter(p => p !== pattern);
+      (0, (_invariant || _load_invariant()).default)(newPatterns.length - filtered.length > 0, `expect added pattern '${pattern}' in the list: ${patterns.toString()}`);
+      newPatterns = filtered;
+
+      // add new package into in-memory manifest so they can be linked properly
+      manifest[dependencyType] = manifest[dependencyType] || {};
+      if (manifest[dependencyType][pkgName] === version) {
+        // package already existed
+        return;
+      }
+
+      // update dependencies in the manifest
+      (0, (_invariant || _load_invariant()).default)(manifest._reference, 'manifest._reference should not be null');
+      const ref = manifest._reference;
+
+      ref['dependencies'] = ref['dependencies'] || [];
+      ref['dependencies'].push(pattern);
+    });
+
+    return newPatterns;
+  }
+
+  bailout(patterns, workspaceLayout) {
+    var _this = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const lockfileCache = _this.lockfile.cache;
+      if (!lockfileCache) {
+        return false;
+      }
+      const match = yield _this.integrityChecker.check(patterns, lockfileCache, _this.flags, workspaceLayout);
+      const haveLockfile = yield (_fs || _load_fs()).exists((_path || _load_path()).default.join(_this.config.lockfileFolder, (_constants || _load_constants()).LOCKFILE_FILENAME));
+      if (match.integrityFileMissing && haveLockfile) {
+        // Integrity file missing, force script installations
+        _this.scripts.setForce(true);
+      }
+      return false;
+    })();
+  }
+
+  /**
+   * Description
+   */
+
+  init() {
+    var _this2 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const isWorkspaceRoot = _this2.config.workspaceRootFolder && _this2.config.cwd === _this2.config.workspaceRootFolder;
+
+      // running "yarn add something" in a workspace root is often a mistake
+      if (isWorkspaceRoot && !_this2.flags.ignoreWorkspaceRootCheck) {
+        throw new (_errors || _load_errors()).MessageError(_this2.reporter.lang('workspacesAddRootCheck'));
+      }
+
+      _this2.addedPatterns = [];
+      const patterns = yield (_install || _load_install()).Install.prototype.init.call(_this2);
+      yield _this2.maybeOutputSaveTree(patterns);
+      return patterns;
+    })();
+  }
+
+  applyChanges(manifests) {
+    var _this3 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      yield (_install || _load_install()).Install.prototype.applyChanges.call(_this3, manifests);
+
+      // fill rootPatternsToOrigin without `excludePatterns`
+      yield (_install || _load_install()).Install.prototype.fetchRequestFromCwd.call(_this3);
+
+      _this3._iterateAddedPackages(function (pattern, registry, dependencyType, pkgName, version) {
+        // add it to manifest
+        const object = manifests[registry].object;
+
+
+        object[dependencyType] = object[dependencyType] || {};
+        object[dependencyType][pkgName] = version;
+        if (SILENCE_DEPENDENCY_TYPE_WARNINGS.indexOf(_this3.config.commandName) === -1 && dependencyType !== _this3.flagToOrigin) {
+          _this3.reporter.warn(_this3.reporter.lang('moduleAlreadyInManifest', pkgName, dependencyType, _this3.flagToOrigin));
+        }
+      });
+
+      return true;
+    })();
+  }
+
+  /**
+   * Description
+   */
+
+  fetchRequestFromCwd() {
+    return (_install || _load_install()).Install.prototype.fetchRequestFromCwd.call(this, this.args);
+  }
+
+  /**
+   * Output a tree of any newly added dependencies.
+   */
+
+  maybeOutputSaveTree(patterns) {
+    var _this4 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      // don't limit the shown tree depth
+      const opts = {
+        reqDepth: 0
+      };
+
+      // restore the original patterns
+      const merged = [...patterns, ..._this4.addedPatterns];
+
+      var _ref3 = yield (0, (_list || _load_list()).buildTree)(_this4.resolver, _this4.linker, merged, opts, true, true);
+
+      const trees = _ref3.trees,
+            count = _ref3.count;
+
+
+      if (count === 1) {
+        _this4.reporter.success(_this4.reporter.lang('savedNewDependency'));
+      } else {
+        _this4.reporter.success(_this4.reporter.lang('savedNewDependencies', count));
+      }
+
+      if (!count) {
+        return;
+      }
+
+      const resolverPatterns = new Set();
+      for (var _iterator3 = patterns, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
+        var _ref4;
+
+        if (_isArray3) {
+          if (_i3 >= _iterator3.length) break;
+          _ref4 = _iterator3[_i3++];
+        } else {
+          _i3 = _iterator3.next();
+          if (_i3.done) break;
+          _ref4 = _i3.value;
+        }
+
+        const pattern = _ref4;
+
+        var _ref5 = _this4.resolver.getResolvedPattern(pattern) || {};
+
+        const version = _ref5.version,
+              name = _ref5.name;
+
+        resolverPatterns.add(`${name}@${version}`);
+      }
+      const directRequireDependencies = trees.filter(function ({ name }) {
+        return resolverPatterns.has(name);
+      });
+
+      _this4.reporter.info(_this4.reporter.lang('directDependencies'));
+      _this4.reporter.tree('newDirectDependencies', directRequireDependencies);
+      _this4.reporter.info(_this4.reporter.lang('allDependencies'));
+      _this4.reporter.tree('newAllDependencies', trees);
+    })();
+  }
+
+  /**
+   * Save added packages to manifest if any of the --save flags were used.
+   */
+
+  savePackages() {
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {})();
+  }
+
+  _iterateAddedPackages(f) {
+    const patternOrigins = Object.keys(this.rootPatternsToOrigin);
+
+    // add new patterns to their appropriate registry manifest
+    for (var _iterator4 = this.addedPatterns, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
+      var _ref6;
+
+      if (_isArray4) {
+        if (_i4 >= _iterator4.length) break;
+        _ref6 = _iterator4[_i4++];
+      } else {
+        _i4 = _iterator4.next();
+        if (_i4.done) break;
+        _ref6 = _i4.value;
+      }
+
+      const pattern = _ref6;
+
+      const pkg = this.resolver.getResolvedPattern(pattern);
+      (0, (_invariant || _load_invariant()).default)(pkg, `missing package ${pattern}`);
+      const version = this.getPatternVersion(pattern, pkg);
+      const ref = pkg._reference;
+      (0, (_invariant || _load_invariant()).default)(ref, 'expected package reference');
+      // lookup the package to determine dependency type; used during `yarn upgrade`
+      const depType = patternOrigins.reduce((acc, prev) => {
+        if (prev.indexOf(`${pkg.name}@`) === 0) {
+          return this.rootPatternsToOrigin[prev];
+        }
+        return acc;
+      }, null);
+
+      // depType is calculated when `yarn upgrade` command is used
+      const target = depType || this.flagToOrigin;
+
+      f(pattern, ref.registry, target, pkg.name, version);
+    }
+  }
+}
+
+exports.Add = Add;
+function hasWrapper(commander) {
+  return true;
+}
+
+function setFlags(commander) {
+  commander.description('Installs a package and any packages that it depends on.');
+  commander.usage('add [packages ...] [flags]');
+  commander.option('-W, --ignore-workspace-root-check', 'required to run yarn add inside a workspace root');
+  commander.option('-D, --dev', 'save package to your `devDependencies`');
+  commander.option('-P, --peer', 'save package to your `peerDependencies`');
+  commander.option('-O, --optional', 'save package to your `optionalDependencies`');
+  commander.option('-E, --exact', 'install exact version');
+  commander.option('-T, --tilde', 'install most recent release with the same minor version');
+  commander.option('-A, --audit', 'Run vulnerability audit on installed packages');
+}
+
+/***/ }),
+/* 166 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.run = exports.pack = exports.packTarball = undefined;
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+let packTarball = exports.packTarball = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, { mapHeader } = {}) {
+    const pkg = yield config.readRootManifest();
+    const bundleDependencies = pkg.bundleDependencies,
+          main = pkg.main,
+          onlyFiles = pkg.files;
+
+    // include required files
+
+    let filters = NEVER_IGNORE.slice();
+    // include default filters unless `files` is used
+    if (!onlyFiles) {
+      filters = filters.concat(DEFAULT_IGNORE);
+    }
+    if (main) {
+      filters = filters.concat((0, (_filter || _load_filter()).ignoreLinesToRegex)(['!/' + main]));
+    }
+
+    // include bundleDependencies
+    let bundleDependenciesFiles = [];
+    if (bundleDependencies) {
+      for (var _iterator = bundleDependencies, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+        var _ref2;
+
+        if (_isArray) {
+          if (_i >= _iterator.length) break;
+          _ref2 = _iterator[_i++];
+        } else {
+          _i = _iterator.next();
+          if (_i.done) break;
+          _ref2 = _i.value;
+        }
+
+        const dependency = _ref2;
+
+        const dependencyList = depsFor(dependency, config.cwd);
+
+        for (var _iterator2 = dependencyList, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+          var _ref3;
+
+          if (_isArray2) {
+            if (_i2 >= _iterator2.length) break;
+            _ref3 = _iterator2[_i2++];
+          } else {
+            _i2 = _iterator2.next();
+            if (_i2.done) break;
+            _ref3 = _i2.value;
+          }
+
+          const dep = _ref3;
+
+          const filesForBundledDep = yield (_fs || _load_fs()).walk(dep.baseDir, null, new Set(FOLDERS_IGNORE));
+          bundleDependenciesFiles = bundleDependenciesFiles.concat(filesForBundledDep);
+        }
+      }
+    }
+
+    // `files` field
+    if (onlyFiles) {
+      let lines = ['*'];
+      lines = lines.concat(onlyFiles.map(function (filename) {
+        return `!${filename}`;
+      }), onlyFiles.map(function (filename) {
+        return `!${path.join(filename, '**')}`;
+      }));
+      const regexes = (0, (_filter || _load_filter()).ignoreLinesToRegex)(lines, './');
+      filters = filters.concat(regexes);
+    }
+
+    const files = yield (_fs || _load_fs()).walk(config.cwd, null, new Set(FOLDERS_IGNORE));
+    const dotIgnoreFiles = (0, (_filter || _load_filter()).filterOverridenGitignores)(files);
+
+    // create ignores
+    for (var _iterator3 = dotIgnoreFiles, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
+      var _ref4;
+
+      if (_isArray3) {
+        if (_i3 >= _iterator3.length) break;
+        _ref4 = _iterator3[_i3++];
+      } else {
+        _i3 = _iterator3.next();
+        if (_i3.done) break;
+        _ref4 = _i3.value;
+      }
+
+      const file = _ref4;
+
+      const raw = yield (_fs || _load_fs()).readFile(file.absolute);
+      const lines = raw.split('\n');
+
+      const regexes = (0, (_filter || _load_filter()).ignoreLinesToRegex)(lines, path.dirname(file.relative));
+      filters = filters.concat(regexes);
+    }
+
+    // files to definitely keep, takes precedence over ignore filter
+    const keepFiles = new Set();
+
+    // files to definitely ignore
+    const ignoredFiles = new Set();
+
+    // list of files that didn't match any of our patterns, if a directory in the chain above was matched
+    // then we should inherit it
+    const possibleKeepFiles = new Set();
+
+    // apply filters
+    (0, (_filter || _load_filter()).sortFilter)(files, filters, keepFiles, possibleKeepFiles, ignoredFiles);
+
+    // add the files for the bundled dependencies to the set of files to keep
+    for (var _iterator4 = bundleDependenciesFiles, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
+      var _ref5;
+
+      if (_isArray4) {
+        if (_i4 >= _iterator4.length) break;
+        _ref5 = _iterator4[_i4++];
+      } else {
+        _i4 = _iterator4.next();
+        if (_i4.done) break;
+        _ref5 = _i4.value;
+      }
+
+      const file = _ref5;
+
+      const realPath = yield (_fs || _load_fs()).realpath(config.cwd);
+      keepFiles.add(path.relative(realPath, file.absolute));
+    }
+
+    return packWithIgnoreAndHeaders(config.cwd, function (name) {
+      const relative = path.relative(config.cwd, name);
+      // Don't ignore directories, since we need to recurse inside them to check for unignored files.
+      if (fs2.lstatSync(name).isDirectory()) {
+        const isParentOfKeptFile = Array.from(keepFiles).some(function (name) {
+          return !path.relative(relative, name).startsWith('..');
+        });
+        return !isParentOfKeptFile;
+      }
+      // Otherwise, ignore a file if we're not supposed to keep it.
+      return !keepFiles.has(relative);
+    }, { mapHeader });
+  });
+
+  return function packTarball(_x) {
+    return _ref.apply(this, arguments);
+  };
+})();
+
+let pack = exports.pack = (() => {
+  var _ref6 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config) {
+    const packer = yield packTarball(config);
+    const compressor = packer.pipe(new zlib.Gzip());
+
+    return compressor;
+  });
+
+  return function pack(_x2) {
+    return _ref6.apply(this, arguments);
+  };
+})();
+
+let run = exports.run = (() => {
+  var _ref7 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
+    const pkg = yield config.readRootManifest();
+    if (!pkg.name) {
+      throw new (_errors || _load_errors()).MessageError(reporter.lang('noName'));
+    }
+    if (!pkg.version) {
+      throw new (_errors || _load_errors()).MessageError(reporter.lang('noVersion'));
+    }
+
+    const normaliseScope = function normaliseScope(name) {
+      return name[0] === '@' ? name.substr(1).replace('/', '-') : name;
+    };
+    const filename = flags.filename || path.join(config.cwd, `${normaliseScope(pkg.name)}-v${pkg.version}.tgz`);
+
+    yield config.executeLifecycleScript('prepack');
+
+    const stream = yield pack(config);
+
+    yield new Promise(function (resolve, reject) {
+      stream.pipe(fs2.createWriteStream(filename));
+      stream.on('error', reject);
+      stream.on('close', resolve);
+    });
+
+    yield config.executeLifecycleScript('postpack');
+
+    reporter.success(reporter.lang('packWroteTarball', filename));
+  });
+
+  return function run(_x3, _x4, _x5, _x6) {
+    return _ref7.apply(this, arguments);
+  };
+})();
+
+exports.packWithIgnoreAndHeaders = packWithIgnoreAndHeaders;
+exports.setFlags = setFlags;
+exports.hasWrapper = hasWrapper;
+
+var _fs;
+
+function _load_fs() {
+  return _fs = _interopRequireWildcard(__webpack_require__(4));
+}
+
+var _filter;
+
+function _load_filter() {
+  return _filter = __webpack_require__(372);
+}
+
+var _errors;
+
+function _load_errors() {
+  return _errors = __webpack_require__(6);
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const zlib = __webpack_require__(198);
+const path = __webpack_require__(0);
+const tar = __webpack_require__(193);
+const fs2 = __webpack_require__(5);
+const depsFor = __webpack_require__(678);
+
+const FOLDERS_IGNORE = [
+// never allow version control folders
+'.git', 'CVS', '.svn', '.hg', 'node_modules'];
+
+const DEFAULT_IGNORE = (0, (_filter || _load_filter()).ignoreLinesToRegex)([...FOLDERS_IGNORE,
+
+// ignore cruft
+'yarn.lock', '.lock-wscript', '.wafpickle-{0..9}', '*.swp', '._*', 'npm-debug.log', 'yarn-error.log', '.npmrc', '.yarnrc', '.npmignore', '.gitignore', '.DS_Store']);
+
+const NEVER_IGNORE = (0, (_filter || _load_filter()).ignoreLinesToRegex)([
+// never ignore these files
+'!/package.json', '!/readme*', '!/+(license|licence)*', '!/+(changes|changelog|history)*']);
+
+function packWithIgnoreAndHeaders(cwd, ignoreFunction, { mapHeader } = {}) {
+  return tar.pack(cwd, {
+    ignore: ignoreFunction,
+    map: header => {
+      const suffix = header.name === '.' ? '' : `/${header.name}`;
+      header.name = `package${suffix}`;
+      delete header.uid;
+      delete header.gid;
+      return mapHeader ? mapHeader(header) : header;
+    }
+  });
+}
+
+function setFlags(commander) {
+  commander.description('Creates a compressed gzip archive of package dependencies.');
+  commander.option('-f, --filename <filename>', 'filename');
+}
+
+function hasWrapper(commander, args) {
+  return true;
+}
+
+/***/ }),
+/* 167 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+var _index;
+
+function _load_index() {
+  return _index = _interopRequireDefault(__webpack_require__(220));
+}
+
+var _constants;
+
+function _load_constants() {
+  return _constants = _interopRequireWildcard(__webpack_require__(8));
+}
+
+var _fs;
+
+function _load_fs() {
+  return _fs = _interopRequireWildcard(__webpack_require__(4));
+}
+
+var _mutex;
+
+function _load_mutex() {
+  return _mutex = _interopRequireDefault(__webpack_require__(375));
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/* eslint no-unused-vars: 0 */
+
+const cmdShim = __webpack_require__(201);
+const path = __webpack_require__(0);
+
+class BaseFetcher {
+  constructor(dest, remote, config) {
+    this.reporter = config.reporter;
+    this.packageName = remote.packageName;
+    this.reference = remote.reference;
+    this.registry = remote.registry;
+    this.hash = remote.hash;
+    this.remote = remote;
+    this.config = config;
+    this.dest = dest;
+  }
+
+  setupMirrorFromCache() {
+    // fetcher subclasses may use this to perform actions such as copying over a cached tarball to the offline
+    // mirror etc
+    return Promise.resolve();
+  }
+
+  _fetch() {
+    return Promise.reject(new Error('Not implemented'));
+  }
+
+  fetch(defaultManifest) {
+    var _this = this;
+
+    return (_fs || _load_fs()).lockQueue.push(this.dest, (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      yield (_fs || _load_fs()).mkdirp(_this.dest);
+
+      // fetch package and get the hash
+
+      var _ref2 = yield _this._fetch();
+
+      const hash = _ref2.hash;
+
+
+      const pkg = yield (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+        // load the new normalized manifest
+        try {
+          return yield _this.config.readManifest(_this.dest, _this.registry);
+        } catch (e) {
+          if (e.code === 'ENOENT' && defaultManifest) {
+            return (0, (_index || _load_index()).default)(defaultManifest, _this.dest, _this.config, false);
+          } else {
+            throw e;
+          }
+        }
+      })();
+
+      if (pkg.bin) {
+        for (var _iterator = Object.keys(pkg.bin), _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+          var _ref4;
+
+          if (_isArray) {
+            if (_i >= _iterator.length) break;
+            _ref4 = _iterator[_i++];
+          } else {
+            _i = _iterator.next();
+            if (_i.done) break;
+            _ref4 = _i.value;
+          }
+
+          const binName = _ref4;
+
+          const binDest = `${_this.dest}/.bin`;
+
+          // Using any sort of absolute path here would prevent makePortableProxyScript from preserving symlinks when
+          // calling the binary
+          const src = path.resolve(_this.dest, pkg.bin[binName]);
+
+          if (yield (_fs || _load_fs()).exists(src)) {
+            // We ensure that the target is executable
+            yield (_fs || _load_fs()).chmod(src, 0o755);
+          }
+
+          yield (_fs || _load_fs()).mkdirp(binDest);
+          if (process.platform === 'win32') {
+            const unlockMutex = yield (0, (_mutex || _load_mutex()).default)(src);
+            try {
+              yield cmdShim.ifExists(src, `${binDest}/${binName}`, { createPwshFile: false });
+            } finally {
+              unlockMutex();
+            }
+          } else {
+            yield (_fs || _load_fs()).symlink(src, `${binDest}/${binName}`);
+          }
+        }
+      }
+
+      yield (_fs || _load_fs()).writeFile(path.join(_this.dest, (_constants || _load_constants()).METADATA_FILENAME), JSON.stringify({
+        manifest: pkg,
+        artifacts: [],
+        remote: _this.remote,
+        registry: _this.registry,
+        hash
+      }, null, '  '));
+
+      return {
+        hash,
+        dest: _this.dest,
+        package: pkg,
+        cached: false
+      };
+    }));
+  }
+}
+exports.default = BaseFetcher;
+
+/***/ }),
+/* 168 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.hash = hash;
+const crypto = __webpack_require__(11);
+const stream = __webpack_require__(23);
+
+function hash(content, type = 'md5') {
+  return crypto.createHash(type).update(content).digest('hex');
+}
+
+class HashStream extends stream.Transform {
+  constructor(options) {
+    super(options);
+    this._hash = crypto.createHash('sha1');
+    this._updated = false;
+  }
+
+  _transform(chunk, encoding, callback) {
+    this._updated = true;
+    this._hash.update(chunk);
+    callback(null, chunk);
+  }
+
+  getHash() {
+    return this._hash.digest('hex');
+  }
+
+  test(sum) {
+    return this._updated && sum === this.getHash();
+  }
+}
+exports.HashStream = HashStream;
+
+/***/ }),
+/* 169 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = guessName;
+
+var _url;
+
+function _load_url() {
+  return _url = _interopRequireDefault(__webpack_require__(24));
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function cleanup(name) {
+  name = name.replace(/-\d+\.\d+\.\d+/, '');
+  return name.replace(/\.git$|\.zip$|\.tar\.gz$|\.tar\.bz2$/, '');
+}
+
+function guessNameFallback(source) {
+  // If cannot parse as url, just return cleaned up last part
+  const parts = source.split('/');
+  return cleanup(parts[parts.length - 1]);
+}
+
+function guessName(source) {
+  try {
+    const parsed = (_url || _load_url()).default.parse(source);
+
+    if (!parsed.pathname) {
+      return guessNameFallback(source);
+    }
+
+    const parts = parsed.pathname.split('/');
+
+    // Priority goes to part that ends with .git
+    for (var _iterator = parts, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+      var _ref;
+
+      if (_isArray) {
+        if (_i >= _iterator.length) break;
+        _ref = _iterator[_i++];
+      } else {
+        _i = _iterator.next();
+        if (_i.done) break;
+        _ref = _i.value;
+      }
+
+      const part = _ref;
+
+      if (part.match(/\.git$/)) {
+        return cleanup(part);
+      }
+    }
+
+    // Most likely a directory
+    if (parsed.host == null) {
+      return cleanup(parts[parts.length - 1]);
+    }
+
+    // A site like github or gitlab
+    if (parts.length > 2) {
+      return cleanup(parts[2]);
+    }
+
+    // Privately hosted package?
+    if (parts.length > 1) {
+      return cleanup(parts[1]);
+    }
+
+    return guessNameFallback(source);
+  } catch (e) {
+    return guessNameFallback(source);
+  }
+}
+
+/***/ }),
+/* 170 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// fallback for non-array-like ES3 and non-enumerable old V8 strings
+var cof = __webpack_require__(69);
+// eslint-disable-next-line no-prototype-builtins
+module.exports = Object('z').propertyIsEnumerable(0) ? Object : function (it) {
+  return cof(it) == 'String' ? it.split('') : Object(it);
+};
+
+
+/***/ }),
+/* 171 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// 19.1.2.14 / 15.2.3.14 Object.keys(O)
+var $keys = __webpack_require__(249);
+var enumBugKeys = __webpack_require__(127);
+
+module.exports = Object.keys || function keys(O) {
+  return $keys(O, enumBugKeys);
+};
+
+
+/***/ }),
+/* 172 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// 7.1.13 ToObject(argument)
+var defined = __webpack_require__(91);
+module.exports = function (it) {
+  return Object(defined(it));
+};
+
+
+/***/ }),
+/* 173 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var once = __webpack_require__(83);
+
+var noop = function() {};
+
+var isRequest = function(stream) {
+	return stream.setHeader && typeof stream.abort === 'function';
+};
+
+var isChildProcess = function(stream) {
+	return stream.stdio && Array.isArray(stream.stdio) && stream.stdio.length === 3
+};
+
+var eos = function(stream, opts, callback) {
+	if (typeof opts === 'function') return eos(stream, null, opts);
+	if (!opts) opts = {};
+
+	callback = once(callback || noop);
+
+	var ws = stream._writableState;
+	var rs = stream._readableState;
+	var readable = opts.readable || (opts.readable !== false && stream.readable);
+	var writable = opts.writable || (opts.writable !== false && stream.writable);
+
+	var onlegacyfinish = function() {
+		if (!stream.writable) onfinish();
+	};
+
+	var onfinish = function() {
+		writable = false;
+		if (!readable) callback.call(stream);
+	};
+
+	var onend = function() {
+		readable = false;
+		if (!writable) callback.call(stream);
+	};
+
+	var onexit = function(exitCode) {
+		callback.call(stream, exitCode ? new Error('exited with error code: ' + exitCode) : null);
+	};
+
+	var onerror = function(err) {
+		callback.call(stream, err);
+	};
+
+	var onclose = function() {
+		if (readable && !(rs && rs.ended)) return callback.call(stream, new Error('premature close'));
+		if (writable && !(ws && ws.ended)) return callback.call(stream, new Error('premature close'));
+	};
+
+	var onrequest = function() {
+		stream.req.on('finish', onfinish);
+	};
+
+	if (isRequest(stream)) {
+		stream.on('complete', onfinish);
+		stream.on('abort', onclose);
+		if (stream.req) onrequest();
+		else stream.on('request', onrequest);
+	} else if (writable && !ws) { // legacy streams
+		stream.on('end', onlegacyfinish);
+		stream.on('close', onlegacyfinish);
+	}
+
+	if (isChildProcess(stream)) stream.on('exit', onexit);
+
+	stream.on('end', onend);
+	stream.on('finish', onfinish);
+	if (opts.error !== false) stream.on('error', onerror);
+	stream.on('close', onclose);
+
+	return function() {
+		stream.removeListener('complete', onfinish);
+		stream.removeListener('abort', onclose);
+		stream.removeListener('request', onrequest);
+		if (stream.req) stream.req.removeListener('finish', onfinish);
+		stream.removeListener('end', onlegacyfinish);
+		stream.removeListener('close', onlegacyfinish);
+		stream.removeListener('finish', onfinish);
+		stream.removeListener('exit', onexit);
+		stream.removeListener('end', onend);
+		stream.removeListener('error', onerror);
+		stream.removeListener('close', onclose);
+	};
+};
+
+module.exports = eos;
+
+
+/***/ }),
+/* 174 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// Copyright 2012 Joyent, Inc.  All rights reserved.
+
+var assert = __webpack_require__(16);
+var sshpk = __webpack_require__(328);
+var util = __webpack_require__(3);
+
+var HASH_ALGOS = {
+  'sha1': true,
+  'sha256': true,
+  'sha512': true
+};
+
+var PK_ALGOS = {
+  'rsa': true,
+  'dsa': true,
+  'ecdsa': true
+};
+
+function HttpSignatureError(message, caller) {
+  if (Error.captureStackTrace)
+    Error.captureStackTrace(this, caller || HttpSignatureError);
+
+  this.message = message;
+  this.name = caller.name;
+}
+util.inherits(HttpSignatureError, Error);
+
+function InvalidAlgorithmError(message) {
+  HttpSignatureError.call(this, message, InvalidAlgorithmError);
+}
+util.inherits(InvalidAlgorithmError, HttpSignatureError);
+
+function validateAlgorithm(algorithm) {
+  var alg = algorithm.toLowerCase().split('-');
+
+  if (alg.length !== 2) {
+    throw (new InvalidAlgorithmError(alg[0].toUpperCase() + ' is not a ' +
+      'valid algorithm'));
+  }
+
+  if (alg[0] !== 'hmac' && !PK_ALGOS[alg[0]]) {
+    throw (new InvalidAlgorithmError(alg[0].toUpperCase() + ' type keys ' +
+      'are not supported'));
+  }
+
+  if (!HASH_ALGOS[alg[1]]) {
+    throw (new InvalidAlgorithmError(alg[1].toUpperCase() + ' is not a ' +
+      'supported hash algorithm'));
+  }
+
+  return (alg);
+}
+
+///--- API
+
+module.exports = {
+
+  HASH_ALGOS: HASH_ALGOS,
+  PK_ALGOS: PK_ALGOS,
+
+  HttpSignatureError: HttpSignatureError,
+  InvalidAlgorithmError: InvalidAlgorithmError,
+
+  validateAlgorithm: validateAlgorithm,
+
+  /**
+   * Converts an OpenSSH public key (rsa only) to a PKCS#8 PEM file.
+   *
+   * The intent of this module is to interoperate with OpenSSL only,
+   * specifically the node crypto module's `verify` method.
+   *
+   * @param {String} key an OpenSSH public key.
+   * @return {String} PEM encoded form of the RSA public key.
+   * @throws {TypeError} on bad input.
+   * @throws {Error} on invalid ssh key formatted data.
+   */
+  sshKeyToPEM: function sshKeyToPEM(key) {
+    assert.string(key, 'ssh_key');
+
+    var k = sshpk.parseKey(key, 'ssh');
+    return (k.toString('pem'));
+  },
+
+
+  /**
+   * Generates an OpenSSH fingerprint from an ssh public key.
+   *
+   * @param {String} key an OpenSSH public key.
+   * @return {String} key fingerprint.
+   * @throws {TypeError} on bad input.
+   * @throws {Error} if what you passed doesn't look like an ssh public key.
+   */
+  fingerprint: function fingerprint(key) {
+    assert.string(key, 'ssh_key');
+
+    var k = sshpk.parseKey(key, 'ssh');
+    return (k.fingerprint('md5').toString('hex'));
+  },
+
+  /**
+   * Converts a PKGCS#8 PEM file to an OpenSSH public key (rsa)
+   *
+   * The reverse of the above function.
+   */
+  pemToRsaSSHKey: function pemToRsaSSHKey(pem, comment) {
+    assert.equal('string', typeof (pem), 'typeof pem');
+
+    var k = sshpk.parseKey(pem, 'pem');
+    k.comment = comment;
+    return (k.toString('ssh'));
+  }
+};
+
+
+/***/ }),
+/* 175 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var chalk = __webpack_require__(30);
+var figures = __webpack_require__(270);
+
+/**
+ * Separator object
+ * Used to space/separate choices group
+ * @constructor
+ * @param {String} line   Separation line content (facultative)
+ */
+
+class Separator {
+  constructor(line) {
+    this.type = 'separator';
+    this.line = chalk.dim(line || new Array(15).join(figures.line));
+  }
+
+  /**
+   * Stringify separator
+   * @return {String} the separator display string
+   */
+  toString() {
+    return this.line;
+  }
+}
+
+/**
+ * Helper function returning false if object is a separator
+ * @param  {Object} obj object to test against
+ * @return {Boolean}    `false` if object is a separator
+ */
+
+Separator.exclude = function(obj) {
+  return obj.type !== 'separator';
+};
+
+module.exports = Separator;
+
+
+/***/ }),
+/* 176 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var _ = __webpack_require__(38);
+var chalk = __webpack_require__(30);
+
+/**
+ * The paginator keeps track of a pointer index in a list and returns
+ * a subset of the choices if the list is too long.
+ */
+
+class Paginator {
+  constructor(screen) {
+    this.pointer = 0;
+    this.lastIndex = 0;
+    this.screen = screen;
+  }
+
+  paginate(output, active, pageSize) {
+    pageSize = pageSize || 7;
+    var middleOfList = Math.floor(pageSize / 2);
+    var lines = output.split('\n');
+
+    if (this.screen) {
+      lines = this.screen.breakLines(lines);
+      active = _.sum(lines.map(lineParts => lineParts.length).splice(0, active));
+      lines = _.flatten(lines);
+    }
+
+    // Make sure there's enough lines to paginate
+    if (lines.length <= pageSize) {
+      return output;
+    }
+
+    // Move the pointer only when the user go down and limit it to the middle of the list
+    if (
+      this.pointer < middleOfList &&
+      this.lastIndex < active &&
+      active - this.lastIndex < pageSize
+    ) {
+      this.pointer = Math.min(middleOfList, this.pointer + active - this.lastIndex);
+    }
+    this.lastIndex = active;
+
+    // Duplicate the lines so it give an infinite list look
+    var infinite = _.flatten([lines, lines, lines]);
+    var topIndex = Math.max(0, active + lines.length - this.pointer);
+
+    var section = infinite.splice(topIndex, pageSize).join('\n');
+    return section + '\n' + chalk.dim('(Move up and down to reveal more choices)');
+  }
+}
+
+module.exports = Paginator;
+
+
+/***/ }),
+/* 177 */
+/***/ (function(module, exports) {
+
+/*!
+ * is-extglob <https://github.com/jonschlinkert/is-extglob>
+ *
+ * Copyright (c) 2014-2015, Jon Schlinkert.
+ * Licensed under the MIT License.
+ */
+
+module.exports = function isExtglob(str) {
+  return typeof str === 'string'
+    && /[@?!+*]\(/.test(str);
+};
+
+
+/***/ }),
+/* 178 */
+/***/ (function(module, exports, __webpack_require__) {
+
+/*!
+ * is-glob <https://github.com/jonschlinkert/is-glob>
+ *
+ * Copyright (c) 2014-2015, Jon Schlinkert.
+ * Licensed under the MIT License.
+ */
+
+var isExtglob = __webpack_require__(177);
+
+module.exports = function isGlob(str) {
+  return typeof str === 'string'
+    && (/[*!?{}(|)[\]]/.test(str)
+     || isExtglob(str));
+};
+
+/***/ }),
+/* 179 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var isBuffer = __webpack_require__(729);
+var toString = Object.prototype.toString;
+
+/**
+ * Get the native `typeof` a value.
+ *
+ * @param  {*} `val`
+ * @return {*} Native javascript type
+ */
+
+module.exports = function kindOf(val) {
+  // primitivies
+  if (typeof val === 'undefined') {
+    return 'undefined';
+  }
+  if (val === null) {
+    return 'null';
+  }
+  if (val === true || val === false || val instanceof Boolean) {
+    return 'boolean';
+  }
+  if (typeof val === 'string' || val instanceof String) {
+    return 'string';
+  }
+  if (typeof val === 'number' || val instanceof Number) {
+    return 'number';
+  }
+
+  // functions
+  if (typeof val === 'function' || val instanceof Function) {
+    return 'function';
+  }
+
+  // array
+  if (typeof Array.isArray !== 'undefined' && Array.isArray(val)) {
+    return 'array';
+  }
+
+  // check for instances of RegExp and Date before calling `toString`
+  if (val instanceof RegExp) {
+    return 'regexp';
+  }
+  if (val instanceof Date) {
+    return 'date';
+  }
+
+  // other objects
+  var type = toString.call(val);
+
+  if (type === '[object RegExp]') {
+    return 'regexp';
+  }
+  if (type === '[object Date]') {
+    return 'date';
+  }
+  if (type === '[object Arguments]') {
+    return 'arguments';
+  }
+  if (type === '[object Error]') {
+    return 'error';
+  }
+
+  // buffer
+  if (isBuffer(val)) {
+    return 'buffer';
+  }
+
+  // es6: Map, WeakMap, Set, WeakSet
+  if (type === '[object Set]') {
+    return 'set';
+  }
+  if (type === '[object WeakSet]') {
+    return 'weakset';
+  }
+  if (type === '[object Map]') {
+    return 'map';
+  }
+  if (type === '[object WeakMap]') {
+    return 'weakmap';
+  }
+  if (type === '[object Symbol]') {
+    return 'symbol';
+  }
+
+  // typed arrays
+  if (type === '[object Int8Array]') {
+    return 'int8array';
+  }
+  if (type === '[object Uint8Array]') {
+    return 'uint8array';
+  }
+  if (type === '[object Uint8ClampedArray]') {
+    return 'uint8clampedarray';
+  }
+  if (type === '[object Int16Array]') {
+    return 'int16array';
+  }
+  if (type === '[object Uint16Array]') {
+    return 'uint16array';
+  }
+  if (type === '[object Int32Array]') {
+    return 'int32array';
+  }
+  if (type === '[object Uint32Array]') {
+    return 'uint32array';
+  }
+  if (type === '[object Float32Array]') {
+    return 'float32array';
+  }
+  if (type === '[object Float64Array]') {
+    return 'float64array';
+  }
+
+  // must be a plain object
+  return 'object';
+};
+
+
+/***/ }),
+/* 180 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+if (!process.version ||
+    process.version.indexOf('v0.') === 0 ||
+    process.version.indexOf('v1.') === 0 && process.version.indexOf('v1.8.') !== 0) {
+  module.exports = { nextTick: nextTick };
+} else {
+  module.exports = process
+}
+
+function nextTick(fn, arg1, arg2, arg3) {
+  if (typeof fn !== 'function') {
+    throw new TypeError('"callback" argument must be a function');
+  }
+  var len = arguments.length;
+  var args, i;
+  switch (len) {
+  case 0:
+  case 1:
+    return process.nextTick(fn);
+  case 2:
+    return process.nextTick(function afterTickOne() {
+      fn.call(null, arg1);
+    });
+  case 3:
+    return process.nextTick(function afterTickTwo() {
+      fn.call(null, arg1, arg2);
+    });
+  case 4:
+    return process.nextTick(function afterTickThree() {
+      fn.call(null, arg1, arg2, arg3);
+    });
+  default:
+    args = new Array(len - 1);
+    i = 0;
+    while (i < args.length) {
+      args[i++] = arguments[i];
+    }
+    return process.nextTick(function afterTick() {
+      fn.apply(null, args);
+    });
+  }
+}
+
+
+
+/***/ }),
+/* 181 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var isPromise = __webpack_require__(741);
+
+/**
+ * Return a function that will run a function asynchronously or synchronously
+ *
+ * example:
+ * runAsync(wrappedFunction, callback)(...args);
+ *
+ * @param   {Function} func  Function to run
+ * @param   {Function} cb    Callback function passed the `func` returned value
+ * @return  {Function(arguments)} Arguments to pass to `func`. This function will in turn
+ *                                return a Promise (Node >= 0.12) or call the callbacks.
+ */
+
+var runAsync = module.exports = function (func, cb) {
+  cb = cb || function () {};
+
+  return function () {
+    var async = false;
+    var args = arguments;
+
+    var promise = new Promise(function (resolve, reject) {
+      var answer = func.apply({
+        async: function () {
+          async = true;
+          return function (err, value) {
+            if (err) {
+              reject(err);
+            } else {
+              resolve(value);
+            }
+          };
+        }
+      }, Array.prototype.slice.call(args));
+
+      if (!async) {
+        if (isPromise(answer)) {
+          answer.then(resolve, reject);
+        } else {
+          resolve(answer);
+        }
+      }
+    });
+
+    promise.then(cb.bind(null, null), cb);
+
+    return promise;
+  }
+};
+
+runAsync.cb = function (func, cb) {
+  return runAsync(function () {
+    var args = Array.prototype.slice.call(arguments);
+    if (args.length === func.length - 1) {
+      args.push(this.async());
+    }
+    return func.apply(this, args);
+  }, cb);
+};
+
+
+/***/ }),
+/* 182 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__internal_Observable__ = __webpack_require__(12);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "Observable", function() { return __WEBPACK_IMPORTED_MODULE_0__internal_Observable__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__internal_observable_ConnectableObservable__ = __webpack_require__(423);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "ConnectableObservable", function() { return __WEBPACK_IMPORTED_MODULE_1__internal_observable_ConnectableObservable__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__internal_operators_groupBy__ = __webpack_require__(433);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "GroupedObservable", function() { return __WEBPACK_IMPORTED_MODULE_2__internal_operators_groupBy__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__internal_symbol_observable__ = __webpack_require__(117);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "observable", function() { return __WEBPACK_IMPORTED_MODULE_3__internal_symbol_observable__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__internal_Subject__ = __webpack_require__(36);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "Subject", function() { return __WEBPACK_IMPORTED_MODULE_4__internal_Subject__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__internal_BehaviorSubject__ = __webpack_require__(419);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "BehaviorSubject", function() { return __WEBPACK_IMPORTED_MODULE_5__internal_BehaviorSubject__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__internal_ReplaySubject__ = __webpack_require__(308);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "ReplaySubject", function() { return __WEBPACK_IMPORTED_MODULE_6__internal_ReplaySubject__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__internal_AsyncSubject__ = __webpack_require__(183);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "AsyncSubject", function() { return __WEBPACK_IMPORTED_MODULE_7__internal_AsyncSubject__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__internal_scheduler_asap__ = __webpack_require__(438);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "asapScheduler", function() { return __WEBPACK_IMPORTED_MODULE_8__internal_scheduler_asap__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__internal_scheduler_async__ = __webpack_require__(40);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "asyncScheduler", function() { return __WEBPACK_IMPORTED_MODULE_9__internal_scheduler_async__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__internal_scheduler_queue__ = __webpack_require__(439);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "queueScheduler", function() { return __WEBPACK_IMPORTED_MODULE_10__internal_scheduler_queue__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_11__internal_scheduler_animationFrame__ = __webpack_require__(926);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "animationFrameScheduler", function() { return __WEBPACK_IMPORTED_MODULE_11__internal_scheduler_animationFrame__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_12__internal_scheduler_VirtualTimeScheduler__ = __webpack_require__(925);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "VirtualTimeScheduler", function() { return __WEBPACK_IMPORTED_MODULE_12__internal_scheduler_VirtualTimeScheduler__["a"]; });
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "VirtualAction", function() { return __WEBPACK_IMPORTED_MODULE_12__internal_scheduler_VirtualTimeScheduler__["b"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_13__internal_Scheduler__ = __webpack_require__(421);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "Scheduler", function() { return __WEBPACK_IMPORTED_MODULE_13__internal_Scheduler__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_14__internal_Subscription__ = __webpack_require__(25);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "Subscription", function() { return __WEBPACK_IMPORTED_MODULE_14__internal_Subscription__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_15__internal_Subscriber__ = __webpack_require__(7);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "Subscriber", function() { return __WEBPACK_IMPORTED_MODULE_15__internal_Subscriber__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_16__internal_Notification__ = __webpack_require__(184);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "Notification", function() { return __WEBPACK_IMPORTED_MODULE_16__internal_Notification__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_17__internal_util_pipe__ = __webpack_require__(324);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "pipe", function() { return __WEBPACK_IMPORTED_MODULE_17__internal_util_pipe__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_18__internal_util_noop__ = __webpack_require__(191);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "noop", function() { return __WEBPACK_IMPORTED_MODULE_18__internal_util_noop__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_19__internal_util_identity__ = __webpack_require__(118);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "identity", function() { return __WEBPACK_IMPORTED_MODULE_19__internal_util_identity__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_20__internal_util_isObservable__ = __webpack_require__(930);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "isObservable", function() { return __WEBPACK_IMPORTED_MODULE_20__internal_util_isObservable__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_21__internal_util_ArgumentOutOfRangeError__ = __webpack_require__(152);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "ArgumentOutOfRangeError", function() { return __WEBPACK_IMPORTED_MODULE_21__internal_util_ArgumentOutOfRangeError__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_22__internal_util_EmptyError__ = __webpack_require__(153);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "EmptyError", function() { return __WEBPACK_IMPORTED_MODULE_22__internal_util_EmptyError__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_23__internal_util_ObjectUnsubscribedError__ = __webpack_require__(189);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "ObjectUnsubscribedError", function() { return __WEBPACK_IMPORTED_MODULE_23__internal_util_ObjectUnsubscribedError__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_24__internal_util_UnsubscriptionError__ = __webpack_require__(441);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "UnsubscriptionError", function() { return __WEBPACK_IMPORTED_MODULE_24__internal_util_UnsubscriptionError__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_25__internal_util_TimeoutError__ = __webpack_require__(440);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "TimeoutError", function() { return __WEBPACK_IMPORTED_MODULE_25__internal_util_TimeoutError__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_26__internal_observable_bindCallback__ = __webpack_require__(823);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "bindCallback", function() { return __WEBPACK_IMPORTED_MODULE_26__internal_observable_bindCallback__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_27__internal_observable_bindNodeCallback__ = __webpack_require__(824);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "bindNodeCallback", function() { return __WEBPACK_IMPORTED_MODULE_27__internal_observable_bindNodeCallback__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_28__internal_observable_combineLatest__ = __webpack_require__(309);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "combineLatest", function() { return __WEBPACK_IMPORTED_MODULE_28__internal_observable_combineLatest__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_29__internal_observable_concat__ = __webpack_require__(186);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "concat", function() { return __WEBPACK_IMPORTED_MODULE_29__internal_observable_concat__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_30__internal_observable_defer__ = __webpack_require__(310);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "defer", function() { return __WEBPACK_IMPORTED_MODULE_30__internal_observable_defer__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_31__internal_observable_empty__ = __webpack_require__(39);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "empty", function() { return __WEBPACK_IMPORTED_MODULE_31__internal_observable_empty__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_32__internal_observable_forkJoin__ = __webpack_require__(825);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "forkJoin", function() { return __WEBPACK_IMPORTED_MODULE_32__internal_observable_forkJoin__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_33__internal_observable_from__ = __webpack_require__(62);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "from", function() { return __WEBPACK_IMPORTED_MODULE_33__internal_observable_from__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_34__internal_observable_fromEvent__ = __webpack_require__(826);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "fromEvent", function() { return __WEBPACK_IMPORTED_MODULE_34__internal_observable_fromEvent__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_35__internal_observable_fromEventPattern__ = __webpack_require__(827);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "fromEventPattern", function() { return __WEBPACK_IMPORTED_MODULE_35__internal_observable_fromEventPattern__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_36__internal_observable_generate__ = __webpack_require__(831);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "generate", function() { return __WEBPACK_IMPORTED_MODULE_36__internal_observable_generate__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_37__internal_observable_iif__ = __webpack_require__(832);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "iif", function() { return __WEBPACK_IMPORTED_MODULE_37__internal_observable_iif__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_38__internal_observable_interval__ = __webpack_require__(833);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "interval", function() { return __WEBPACK_IMPORTED_MODULE_38__internal_observable_interval__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_39__internal_observable_merge__ = __webpack_require__(424);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "merge", function() { return __WEBPACK_IMPORTED_MODULE_39__internal_observable_merge__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_40__internal_observable_never__ = __webpack_require__(425);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "never", function() { return __WEBPACK_IMPORTED_MODULE_40__internal_observable_never__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_41__internal_observable_of__ = __webpack_require__(311);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "of", function() { return __WEBPACK_IMPORTED_MODULE_41__internal_observable_of__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_42__internal_observable_onErrorResumeNext__ = __webpack_require__(834);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "onErrorResumeNext", function() { return __WEBPACK_IMPORTED_MODULE_42__internal_observable_onErrorResumeNext__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_43__internal_observable_pairs__ = __webpack_require__(835);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "pairs", function() { return __WEBPACK_IMPORTED_MODULE_43__internal_observable_pairs__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_44__internal_observable_race__ = __webpack_require__(426);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "race", function() { return __WEBPACK_IMPORTED_MODULE_44__internal_observable_race__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_45__internal_observable_range__ = __webpack_require__(836);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "range", function() { return __WEBPACK_IMPORTED_MODULE_45__internal_observable_range__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_46__internal_observable_throwError__ = __webpack_require__(313);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "throwError", function() { return __WEBPACK_IMPORTED_MODULE_46__internal_observable_throwError__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_47__internal_observable_timer__ = __webpack_require__(427);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "timer", function() { return __WEBPACK_IMPORTED_MODULE_47__internal_observable_timer__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_48__internal_observable_using__ = __webpack_require__(837);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "using", function() { return __WEBPACK_IMPORTED_MODULE_48__internal_observable_using__["a"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_49__internal_observable_zip__ = __webpack_require__(314);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "zip", function() { return __WEBPACK_IMPORTED_MODULE_49__internal_observable_zip__["a"]; });
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "EMPTY", function() { return __WEBPACK_IMPORTED_MODULE_31__internal_observable_empty__["b"]; });
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "NEVER", function() { return __WEBPACK_IMPORTED_MODULE_40__internal_observable_never__["b"]; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_50__internal_config__ = __webpack_require__(185);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "config", function() { return __WEBPACK_IMPORTED_MODULE_50__internal_config__["a"]; });
+/** PURE_IMPORTS_START  PURE_IMPORTS_END */
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+//# sourceMappingURL=index.js.map
+
+
+/***/ }),
+/* 183 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AsyncSubject; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subject__ = __webpack_require__(36);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Subscription__ = __webpack_require__(25);
+/** PURE_IMPORTS_START tslib,_Subject,_Subscription PURE_IMPORTS_END */
+
+
+
+var AsyncSubject = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](AsyncSubject, _super);
+    function AsyncSubject() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.value = null;
+        _this.hasNext = false;
+        _this.hasCompleted = false;
+        return _this;
+    }
+    AsyncSubject.prototype._subscribe = function (subscriber) {
+        if (this.hasError) {
+            subscriber.error(this.thrownError);
+            return __WEBPACK_IMPORTED_MODULE_2__Subscription__["a" /* Subscription */].EMPTY;
+        }
+        else if (this.hasCompleted && this.hasNext) {
+            subscriber.next(this.value);
+            subscriber.complete();
+            return __WEBPACK_IMPORTED_MODULE_2__Subscription__["a" /* Subscription */].EMPTY;
+        }
+        return _super.prototype._subscribe.call(this, subscriber);
+    };
+    AsyncSubject.prototype.next = function (value) {
+        if (!this.hasCompleted) {
+            this.value = value;
+            this.hasNext = true;
+        }
+    };
+    AsyncSubject.prototype.error = function (error) {
+        if (!this.hasCompleted) {
+            _super.prototype.error.call(this, error);
+        }
+    };
+    AsyncSubject.prototype.complete = function () {
+        this.hasCompleted = true;
+        if (this.hasNext) {
+            _super.prototype.next.call(this, this.value);
+        }
+        _super.prototype.complete.call(this);
+    };
+    return AsyncSubject;
+}(__WEBPACK_IMPORTED_MODULE_1__Subject__["a" /* Subject */]));
+
+//# sourceMappingURL=AsyncSubject.js.map
+
+
+/***/ }),
+/* 184 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Notification; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__observable_empty__ = __webpack_require__(39);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__observable_of__ = __webpack_require__(311);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__observable_throwError__ = __webpack_require__(313);
+/** PURE_IMPORTS_START _observable_empty,_observable_of,_observable_throwError PURE_IMPORTS_END */
+
+
+
+var Notification = /*@__PURE__*/ (function () {
+    function Notification(kind, value, error) {
+        this.kind = kind;
+        this.value = value;
+        this.error = error;
+        this.hasValue = kind === 'N';
+    }
+    Notification.prototype.observe = function (observer) {
+        switch (this.kind) {
+            case 'N':
+                return observer.next && observer.next(this.value);
+            case 'E':
+                return observer.error && observer.error(this.error);
+            case 'C':
+                return observer.complete && observer.complete();
+        }
+    };
+    Notification.prototype.do = function (next, error, complete) {
+        var kind = this.kind;
+        switch (kind) {
+            case 'N':
+                return next && next(this.value);
+            case 'E':
+                return error && error(this.error);
+            case 'C':
+                return complete && complete();
+        }
+    };
+    Notification.prototype.accept = function (nextOrObserver, error, complete) {
+        if (nextOrObserver && typeof nextOrObserver.next === 'function') {
+            return this.observe(nextOrObserver);
+        }
+        else {
+            return this.do(nextOrObserver, error, complete);
+        }
+    };
+    Notification.prototype.toObservable = function () {
+        var kind = this.kind;
+        switch (kind) {
+            case 'N':
+                return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__observable_of__["a" /* of */])(this.value);
+            case 'E':
+                return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__observable_throwError__["a" /* throwError */])(this.error);
+            case 'C':
+                return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__observable_empty__["a" /* empty */])();
+        }
+        throw new Error('unexpected notification kind value');
+    };
+    Notification.createNext = function (value) {
+        if (typeof value !== 'undefined') {
+            return new Notification('N', value);
+        }
+        return Notification.undefinedValueNotification;
+    };
+    Notification.createError = function (err) {
+        return new Notification('E', undefined, err);
+    };
+    Notification.createComplete = function () {
+        return Notification.completeNotification;
+    };
+    Notification.completeNotification = new Notification('C');
+    Notification.undefinedValueNotification = new Notification('N', undefined);
+    return Notification;
+}());
+
+//# sourceMappingURL=Notification.js.map
+
+
+/***/ }),
+/* 185 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return config; });
+/** PURE_IMPORTS_START  PURE_IMPORTS_END */
+var _enable_super_gross_mode_that_will_cause_bad_things = false;
+var config = {
+    Promise: undefined,
+    set useDeprecatedSynchronousErrorHandling(value) {
+        if (value) {
+            var error = /*@__PURE__*/ new Error();
+            /*@__PURE__*/ console.warn('DEPRECATED! RxJS was set to use deprecated synchronous error handling behavior by code at: \n' + error.stack);
+        }
+        else if (_enable_super_gross_mode_that_will_cause_bad_things) {
+            /*@__PURE__*/ console.log('RxJS: Back to a better error behavior. Thank you. <3');
+        }
+        _enable_super_gross_mode_that_will_cause_bad_things = value;
+    },
+    get useDeprecatedSynchronousErrorHandling() {
+        return _enable_super_gross_mode_that_will_cause_bad_things;
+    },
+};
+//# sourceMappingURL=config.js.map
+
+
+/***/ }),
+/* 186 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = concat;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_isScheduler__ = __webpack_require__(48);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__of__ = __webpack_require__(311);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__from__ = __webpack_require__(62);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__operators_concatAll__ = __webpack_require__(429);
+/** PURE_IMPORTS_START _util_isScheduler,_of,_from,_operators_concatAll PURE_IMPORTS_END */
+
+
+
+
+function concat() {
+    var observables = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        observables[_i] = arguments[_i];
+    }
+    if (observables.length === 1 || (observables.length === 2 && __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__util_isScheduler__["a" /* isScheduler */])(observables[1]))) {
+        return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__from__["a" /* from */])(observables[0]);
+    }
+    return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__operators_concatAll__["a" /* concatAll */])()(__WEBPACK_IMPORTED_MODULE_1__of__["a" /* of */].apply(void 0, observables));
+}
+//# sourceMappingURL=concat.js.map
+
+
+/***/ }),
+/* 187 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = reduce;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__scan__ = __webpack_require__(317);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__takeLast__ = __webpack_require__(320);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__defaultIfEmpty__ = __webpack_require__(146);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_pipe__ = __webpack_require__(324);
+/** PURE_IMPORTS_START _scan,_takeLast,_defaultIfEmpty,_util_pipe PURE_IMPORTS_END */
+
+
+
+
+function reduce(accumulator, seed) {
+    if (arguments.length >= 2) {
+        return function reduceOperatorFunctionWithSeed(source) {
+            return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__util_pipe__["a" /* pipe */])(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__scan__["a" /* scan */])(accumulator, seed), __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__takeLast__["a" /* takeLast */])(1), __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__defaultIfEmpty__["a" /* defaultIfEmpty */])(seed))(source);
+        };
+    }
+    return function reduceOperatorFunction(source) {
+        return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__util_pipe__["a" /* pipe */])(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__scan__["a" /* scan */])(function (acc, value, index) { return accumulator(acc, value, index + 1); }), __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__takeLast__["a" /* takeLast */])(1))(source);
+    };
+}
+//# sourceMappingURL=reduce.js.map
+
+
+/***/ }),
+/* 188 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return throwIfEmpty; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__tap__ = __webpack_require__(435);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_EmptyError__ = __webpack_require__(153);
+/** PURE_IMPORTS_START _tap,_util_EmptyError PURE_IMPORTS_END */
+
+
+var throwIfEmpty = function (errorFactory) {
+    if (errorFactory === void 0) {
+        errorFactory = defaultErrorFactory;
+    }
+    return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__tap__["a" /* tap */])({
+        hasValue: false,
+        next: function () { this.hasValue = true; },
+        complete: function () {
+            if (!this.hasValue) {
+                throw errorFactory();
+            }
+        }
+    });
+};
+function defaultErrorFactory() {
+    return new __WEBPACK_IMPORTED_MODULE_1__util_EmptyError__["a" /* EmptyError */]();
+}
+//# sourceMappingURL=throwIfEmpty.js.map
+
+
+/***/ }),
+/* 189 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ObjectUnsubscribedError; });
+/** PURE_IMPORTS_START  PURE_IMPORTS_END */
+function ObjectUnsubscribedErrorImpl() {
+    Error.call(this);
+    this.message = 'object unsubscribed';
+    this.name = 'ObjectUnsubscribedError';
+    return this;
+}
+ObjectUnsubscribedErrorImpl.prototype = /*@__PURE__*/ Object.create(Error.prototype);
+var ObjectUnsubscribedError = ObjectUnsubscribedErrorImpl;
+//# sourceMappingURL=ObjectUnsubscribedError.js.map
+
+
+/***/ }),
+/* 190 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = isNumeric;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__isArray__ = __webpack_require__(41);
+/** PURE_IMPORTS_START _isArray PURE_IMPORTS_END */
+
+function isNumeric(val) {
+    return !__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__isArray__["a" /* isArray */])(val) && (val - parseFloat(val) + 1) >= 0;
+}
+//# sourceMappingURL=isNumeric.js.map
+
+
+/***/ }),
+/* 191 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = noop;
+/** PURE_IMPORTS_START  PURE_IMPORTS_END */
+function noop() { }
+//# sourceMappingURL=noop.js.map
+
+
+/***/ }),
+/* 192 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// Copyright 2015 Joyent, Inc.
+
+module.exports = {
+	read: read,
+	readSSHPrivate: readSSHPrivate,
+	write: write
+};
+
+var assert = __webpack_require__(16);
+var asn1 = __webpack_require__(66);
+var Buffer = __webpack_require__(15).Buffer;
+var algs = __webpack_require__(32);
+var utils = __webpack_require__(26);
+var crypto = __webpack_require__(11);
+
+var Key = __webpack_require__(27);
+var PrivateKey = __webpack_require__(33);
+var pem = __webpack_require__(86);
+var rfc4253 = __webpack_require__(103);
+var SSHBuffer = __webpack_require__(159);
+var errors = __webpack_require__(74);
+
+var bcrypt;
+
+function read(buf, options) {
+	return (pem.read(buf, options));
+}
+
+var MAGIC = 'openssh-key-v1';
+
+function readSSHPrivate(type, buf, options) {
+	buf = new SSHBuffer({buffer: buf});
+
+	var magic = buf.readCString();
+	assert.strictEqual(magic, MAGIC, 'bad magic string');
+
+	var cipher = buf.readString();
+	var kdf = buf.readString();
+	var kdfOpts = buf.readBuffer();
+
+	var nkeys = buf.readInt();
+	if (nkeys !== 1) {
+		throw (new Error('OpenSSH-format key file contains ' +
+		    'multiple keys: this is unsupported.'));
+	}
+
+	var pubKey = buf.readBuffer();
+
+	if (type === 'public') {
+		assert.ok(buf.atEnd(), 'excess bytes left after key');
+		return (rfc4253.read(pubKey));
+	}
+
+	var privKeyBlob = buf.readBuffer();
+	assert.ok(buf.atEnd(), 'excess bytes left after key');
+
+	var kdfOptsBuf = new SSHBuffer({ buffer: kdfOpts });
+	switch (kdf) {
+	case 'none':
+		if (cipher !== 'none') {
+			throw (new Error('OpenSSH-format key uses KDF "none" ' +
+			     'but specifies a cipher other than "none"'));
+		}
+		break;
+	case 'bcrypt':
+		var salt = kdfOptsBuf.readBuffer();
+		var rounds = kdfOptsBuf.readInt();
+		var cinf = utils.opensshCipherInfo(cipher);
+		if (bcrypt === undefined) {
+			bcrypt = __webpack_require__(379);
+		}
+
+		if (typeof (options.passphrase) === 'string') {
+			options.passphrase = Buffer.from(options.passphrase,
+			    'utf-8');
+		}
+		if (!Buffer.isBuffer(options.passphrase)) {
+			throw (new errors.KeyEncryptedError(
+			    options.filename, 'OpenSSH'));
+		}
+
+		var pass = new Uint8Array(options.passphrase);
+		var salti = new Uint8Array(salt);
+		/* Use the pbkdf to derive both the key and the IV. */
+		var out = new Uint8Array(cinf.keySize + cinf.blockSize);
+		var res = bcrypt.pbkdf(pass, pass.length, salti, salti.length,
+		    out, out.length, rounds);
+		if (res !== 0) {
+			throw (new Error('bcrypt_pbkdf function returned ' +
+			    'failure, parameters invalid'));
+		}
+		out = Buffer.from(out);
+		var ckey = out.slice(0, cinf.keySize);
+		var iv = out.slice(cinf.keySize, cinf.keySize + cinf.blockSize);
+		var cipherStream = crypto.createDecipheriv(cinf.opensslName,
+		    ckey, iv);
+		cipherStream.setAutoPadding(false);
+		var chunk, chunks = [];
+		cipherStream.once('error', function (e) {
+			if (e.toString().indexOf('bad decrypt') !== -1) {
+				throw (new Error('Incorrect passphrase ' +
+				    'supplied, could not decrypt key'));
+			}
+			throw (e);
+		});
+		cipherStream.write(privKeyBlob);
+		cipherStream.end();
+		while ((chunk = cipherStream.read()) !== null)
+			chunks.push(chunk);
+		privKeyBlob = Buffer.concat(chunks);
+		break;
+	default:
+		throw (new Error(
+		    'OpenSSH-format key uses unknown KDF "' + kdf + '"'));
+	}
+
+	buf = new SSHBuffer({buffer: privKeyBlob});
+
+	var checkInt1 = buf.readInt();
+	var checkInt2 = buf.readInt();
+	if (checkInt1 !== checkInt2) {
+		throw (new Error('Incorrect passphrase supplied, could not ' +
+		    'decrypt key'));
+	}
+
+	var ret = {};
+	var key = rfc4253.readInternal(ret, 'private', buf.remainder());
+
+	buf.skip(ret.consumed);
+
+	var comment = buf.readString();
+	key.comment = comment;
+
+	return (key);
+}
+
+function write(key, options) {
+	var pubKey;
+	if (PrivateKey.isPrivateKey(key))
+		pubKey = key.toPublic();
+	else
+		pubKey = key;
+
+	var cipher = 'none';
+	var kdf = 'none';
+	var kdfopts = Buffer.alloc(0);
+	var cinf = { blockSize: 8 };
+	var passphrase;
+	if (options !== undefined) {
+		passphrase = options.passphrase;
+		if (typeof (passphrase) === 'string')
+			passphrase = Buffer.from(passphrase, 'utf-8');
+		if (passphrase !== undefined) {
+			assert.buffer(passphrase, 'options.passphrase');
+			assert.optionalString(options.cipher, 'options.cipher');
+			cipher = options.cipher;
+			if (cipher === undefined)
+				cipher = 'aes128-ctr';
+			cinf = utils.opensshCipherInfo(cipher);
+			kdf = 'bcrypt';
+		}
+	}
+
+	var privBuf;
+	if (PrivateKey.isPrivateKey(key)) {
+		privBuf = new SSHBuffer({});
+		var checkInt = crypto.randomBytes(4).readUInt32BE(0);
+		privBuf.writeInt(checkInt);
+		privBuf.writeInt(checkInt);
+		privBuf.write(key.toBuffer('rfc4253'));
+		privBuf.writeString(key.comment || '');
+
+		var n = 1;
+		while (privBuf._offset % cinf.blockSize !== 0)
+			privBuf.writeChar(n++);
+		privBuf = privBuf.toBuffer();
+	}
+
+	switch (kdf) {
+	case 'none':
+		break;
+	case 'bcrypt':
+		var salt = crypto.randomBytes(16);
+		var rounds = 16;
+		var kdfssh = new SSHBuffer({});
+		kdfssh.writeBuffer(salt);
+		kdfssh.writeInt(rounds);
+		kdfopts = kdfssh.toBuffer();
+
+		if (bcrypt === undefined) {
+			bcrypt = __webpack_require__(379);
+		}
+		var pass = new Uint8Array(passphrase);
+		var salti = new Uint8Array(salt);
+		/* Use the pbkdf to derive both the key and the IV. */
+		var out = new Uint8Array(cinf.keySize + cinf.blockSize);
+		var res = bcrypt.pbkdf(pass, pass.length, salti, salti.length,
+		    out, out.length, rounds);
+		if (res !== 0) {
+			throw (new Error('bcrypt_pbkdf function returned ' +
+			    'failure, parameters invalid'));
+		}
+		out = Buffer.from(out);
+		var ckey = out.slice(0, cinf.keySize);
+		var iv = out.slice(cinf.keySize, cinf.keySize + cinf.blockSize);
+
+		var cipherStream = crypto.createCipheriv(cinf.opensslName,
+		    ckey, iv);
+		cipherStream.setAutoPadding(false);
+		var chunk, chunks = [];
+		cipherStream.once('error', function (e) {
+			throw (e);
+		});
+		cipherStream.write(privBuf);
+		cipherStream.end();
+		while ((chunk = cipherStream.read()) !== null)
+			chunks.push(chunk);
+		privBuf = Buffer.concat(chunks);
+		break;
+	default:
+		throw (new Error('Unsupported kdf ' + kdf));
+	}
+
+	var buf = new SSHBuffer({});
+
+	buf.writeCString(MAGIC);
+	buf.writeString(cipher);	/* cipher */
+	buf.writeString(kdf);		/* kdf */
+	buf.writeBuffer(kdfopts);	/* kdfoptions */
+
+	buf.writeInt(1);		/* nkeys */
+	buf.writeBuffer(pubKey.toBuffer('rfc4253'));
+
+	if (privBuf)
+		buf.writeBuffer(privBuf);
+
+	buf = buf.toBuffer();
+
+	var header;
+	if (PrivateKey.isPrivateKey(key))
+		header = 'OPENSSH PRIVATE KEY';
+	else
+		header = 'OPENSSH PUBLIC KEY';
+
+	var tmp = buf.toString('base64');
+	var len = tmp.length + (tmp.length / 70) +
+	    18 + 16 + header.length*2 + 10;
+	buf = Buffer.alloc(len);
+	var o = 0;
+	o += buf.write('-----BEGIN ' + header + '-----\n', o);
+	for (var i = 0; i < tmp.length; ) {
+		var limit = i + 70;
+		if (limit > tmp.length)
+			limit = tmp.length;
+		o += buf.write(tmp.slice(i, limit), o);
+		buf[o++] = 10;
+		i = limit;
+	}
+	o += buf.write('-----END ' + header + '-----\n', o);
+
+	return (buf.slice(0, o));
+}
+
+
+/***/ }),
+/* 193 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var chownr = __webpack_require__(600)
+var tar = __webpack_require__(460)
+var pump = __webpack_require__(781)
+var mkdirp = __webpack_require__(145)
+var fs = __webpack_require__(5)
+var path = __webpack_require__(0)
+var os = __webpack_require__(49)
+
+var win32 = os.platform() === 'win32'
+
+var noop = function () {}
+
+var echo = function (name) {
+  return name
+}
+
+var normalize = !win32 ? echo : function (name) {
+  return name.replace(/\\/g, '/').replace(/[:?<>|]/g, '_')
+}
+
+var statAll = function (fs, stat, cwd, ignore, entries, sort) {
+  var queue = entries || ['.']
+
+  return function loop (callback) {
+    if (!queue.length) return callback()
+    var next = queue.shift()
+    var nextAbs = path.join(cwd, next)
+
+    stat(nextAbs, function (err, stat) {
+      if (err) return callback(err)
+
+      if (!stat.isDirectory()) return callback(null, next, stat)
+
+      fs.readdir(nextAbs, function (err, files) {
+        if (err) return callback(err)
+
+        if (sort) files.sort()
+        for (var i = 0; i < files.length; i++) {
+          if (!ignore(path.join(cwd, next, files[i]))) queue.push(path.join(next, files[i]))
+        }
+
+        callback(null, next, stat)
+      })
+    })
+  }
+}
+
+var strip = function (map, level) {
+  return function (header) {
+    header.name = header.name.split('/').slice(level).join('/')
+
+    var linkname = header.linkname
+    if (linkname && (header.type === 'link' || path.isAbsolute(linkname))) {
+      header.linkname = linkname.split('/').slice(level).join('/')
+    }
+
+    return map(header)
+  }
+}
+
+exports.pack = function (cwd, opts) {
+  if (!cwd) cwd = '.'
+  if (!opts) opts = {}
+
+  var xfs = opts.fs || fs
+  var ignore = opts.ignore || opts.filter || noop
+  var map = opts.map || noop
+  var mapStream = opts.mapStream || echo
+  var statNext = statAll(xfs, opts.dereference ? xfs.stat : xfs.lstat, cwd, ignore, opts.entries, opts.sort)
+  var strict = opts.strict !== false
+  var umask = typeof opts.umask === 'number' ? ~opts.umask : ~processUmask()
+  var dmode = typeof opts.dmode === 'number' ? opts.dmode : 0
+  var fmode = typeof opts.fmode === 'number' ? opts.fmode : 0
+  var pack = opts.pack || tar.pack()
+  var finish = opts.finish || noop
+
+  if (opts.strip) map = strip(map, opts.strip)
+
+  if (opts.readable) {
+    dmode |= parseInt(555, 8)
+    fmode |= parseInt(444, 8)
+  }
+  if (opts.writable) {
+    dmode |= parseInt(333, 8)
+    fmode |= parseInt(222, 8)
+  }
+
+  var onsymlink = function (filename, header) {
+    xfs.readlink(path.join(cwd, filename), function (err, linkname) {
+      if (err) return pack.destroy(err)
+      header.linkname = normalize(linkname)
+      pack.entry(header, onnextentry)
+    })
+  }
+
+  var onstat = function (err, filename, stat) {
+    if (err) return pack.destroy(err)
+    if (!filename) {
+      if (opts.finalize !== false) pack.finalize()
+      return finish(pack)
+    }
+
+    if (stat.isSocket()) return onnextentry() // tar does not support sockets...
+
+    var header = {
+      name: normalize(filename),
+      mode: (stat.mode | (stat.isDirectory() ? dmode : fmode)) & umask,
+      mtime: stat.mtime,
+      size: stat.size,
+      type: 'file',
+      uid: stat.uid,
+      gid: stat.gid
+    }
+
+    if (stat.isDirectory()) {
+      header.size = 0
+      header.type = 'directory'
+      header = map(header) || header
+      return pack.entry(header, onnextentry)
+    }
+
+    if (stat.isSymbolicLink()) {
+      header.size = 0
+      header.type = 'symlink'
+      header = map(header) || header
+      return onsymlink(filename, header)
+    }
+
+    // TODO: add fifo etc...
+
+    header = map(header) || header
+
+    if (!stat.isFile()) {
+      if (strict) return pack.destroy(new Error('unsupported type for ' + filename))
+      return onnextentry()
+    }
+
+    var entry = pack.entry(header, onnextentry)
+    if (!entry) return
+
+    var rs = mapStream(xfs.createReadStream(path.join(cwd, filename)), header)
+
+    rs.on('error', function (err) { // always forward errors on destroy
+      entry.destroy(err)
+    })
+
+    pump(rs, entry)
+  }
+
+  var onnextentry = function (err) {
+    if (err) return pack.destroy(err)
+    statNext(onstat)
+  }
+
+  onnextentry()
+
+  return pack
+}
+
+var head = function (list) {
+  return list.length ? list[list.length - 1] : null
+}
+
+var processGetuid = function () {
+  return process.getuid ? process.getuid() : -1
+}
+
+var processUmask = function () {
+  return process.umask ? process.umask() : 0
+}
+
+exports.extract = function (cwd, opts) {
+  if (!cwd) cwd = '.'
+  if (!opts) opts = {}
+
+  var xfs = opts.fs || fs
+  var ignore = opts.ignore || opts.filter || noop
+  var map = opts.map || noop
+  var mapStream = opts.mapStream || echo
+  var own = opts.chown !== false && !win32 && processGetuid() === 0
+  var extract = opts.extract || tar.extract()
+  var stack = []
+  var now = new Date()
+  var umask = typeof opts.umask === 'number' ? ~opts.umask : ~processUmask()
+  var dmode = typeof opts.dmode === 'number' ? opts.dmode : 0
+  var fmode = typeof opts.fmode === 'number' ? opts.fmode : 0
+  var strict = opts.strict !== false
+
+  if (opts.strip) map = strip(map, opts.strip)
+
+  if (opts.readable) {
+    dmode |= parseInt(555, 8)
+    fmode |= parseInt(444, 8)
+  }
+  if (opts.writable) {
+    dmode |= parseInt(333, 8)
+    fmode |= parseInt(222, 8)
+  }
+
+  var utimesParent = function (name, cb) { // we just set the mtime on the parent dir again everytime we write an entry
+    var top
+    while ((top = head(stack)) && name.slice(0, top[0].length) !== top[0]) stack.pop()
+    if (!top) return cb()
+    xfs.utimes(top[0], now, top[1], cb)
+  }
+
+  var utimes = function (name, header, cb) {
+    if (opts.utimes === false) return cb()
+
+    if (header.type === 'directory') return xfs.utimes(name, now, header.mtime, cb)
+    if (header.type === 'symlink') return utimesParent(name, cb) // TODO: how to set mtime on link?
+
+    xfs.utimes(name, now, header.mtime, function (err) {
+      if (err) return cb(err)
+      utimesParent(name, cb)
+    })
+  }
+
+  var chperm = function (name, header, cb) {
+    var link = header.type === 'symlink'
+    var chmod = link ? xfs.lchmod : xfs.chmod
+    var chown = link ? xfs.lchown : xfs.chown
+
+    if (!chmod) return cb()
+
+    var mode = (header.mode | (header.type === 'directory' ? dmode : fmode)) & umask
+    chmod(name, mode, function (err) {
+      if (err) return cb(err)
+      if (!own) return cb()
+      if (!chown) return cb()
+      chown(name, header.uid, header.gid, cb)
+    })
+  }
+
+  extract.on('entry', function (header, stream, next) {
+    header = map(header) || header
+    header.name = normalize(header.name)
+    var name = path.join(cwd, path.join('/', header.name))
+
+    if (ignore(name, header)) {
+      stream.resume()
+      return next()
+    }
+
+    var stat = function (err) {
+      if (err) return next(err)
+      utimes(name, header, function (err) {
+        if (err) return next(err)
+        if (win32) return next()
+        chperm(name, header, next)
+      })
+    }
+
+    var onsymlink = function () {
+      if (win32) return next() // skip symlinks on win for now before it can be tested
+      xfs.unlink(name, function () {
+        xfs.symlink(header.linkname, name, stat)
+      })
+    }
+
+    var onlink = function () {
+      if (win32) return next() // skip links on win for now before it can be tested
+      xfs.unlink(name, function () {
+        var srcpath = path.join(cwd, path.join('/', header.linkname))
+
+        xfs.link(srcpath, name, function (err) {
+          if (err && err.code === 'EPERM' && opts.hardlinkAsFilesFallback) {
+            stream = xfs.createReadStream(srcpath)
+            return onfile()
+          }
+
+          stat(err)
+        })
+      })
+    }
+
+    var onfile = function () {
+      var ws = xfs.createWriteStream(name)
+      var rs = mapStream(stream, header)
+
+      ws.on('error', function (err) { // always forward errors on destroy
+        rs.destroy(err)
+      })
+
+      pump(rs, ws, function (err) {
+        if (err) return next(err)
+        ws.on('close', stat)
+      })
+    }
+
+    if (header.type === 'directory') {
+      stack.push([name, header.mtime])
+      return mkdirfix(name, {
+        fs: xfs, own: own, uid: header.uid, gid: header.gid
+      }, stat)
+    }
+
+    var dir = path.dirname(name)
+
+    validate(xfs, dir, path.join(cwd, '.'), function (err, valid) {
+      if (err) return next(err)
+      if (!valid) return next(new Error(dir + ' is not a valid path'))
+
+      mkdirfix(dir, {
+        fs: xfs, own: own, uid: header.uid, gid: header.gid
+      }, function (err) {
+        if (err) return next(err)
+
+        switch (header.type) {
+          case 'file': return onfile()
+          case 'link': return onlink()
+          case 'symlink': return onsymlink()
+        }
+
+        if (strict) return next(new Error('unsupported type for ' + name + ' (' + header.type + ')'))
+
+        stream.resume()
+        next()
+      })
+    })
+  })
+
+  if (opts.finish) extract.on('finish', opts.finish)
+
+  return extract
+}
+
+function validate (fs, name, root, cb) {
+  if (name === root) return cb(null, true)
+  fs.lstat(name, function (err, st) {
+    if (err && err.code !== 'ENOENT') return cb(err)
+    if (err || st.isDirectory()) return validate(fs, path.join(name, '..'), root, cb)
+    cb(null, false)
+  })
+}
+
+function mkdirfix (name, opts, cb) {
+  mkdirp(name, {fs: opts.fs}, function (err, made) {
+    if (!err && made && opts.own) {
+      chownr(made, opts.uid, opts.gid, cb)
+    } else {
+      cb(err)
+    }
+  })
+}
+
+
+/***/ }),
+/* 194 */
+/***/ (function(module, exports) {
+
+module.exports = {"name":"yarn","installationMethod":"unknown","version":"1.19.1","license":"BSD-2-Clause","preferGlobal":true,"description":"📦🐈 Fast, reliable, and secure dependency management.","dependencies":{"@zkochan/cmd-shim":"^3.1.0","babel-runtime":"^6.26.0","bytes":"^3.0.0","camelcase":"^4.0.0","chalk":"^2.1.0","cli-table3":"^0.4.0","commander":"^2.9.0","death":"^1.0.0","debug":"^3.0.0","deep-equal":"^1.0.1","detect-indent":"^5.0.0","dnscache":"^1.0.1","glob":"^7.1.1","gunzip-maybe":"^1.4.0","hash-for-dep":"^1.2.3","imports-loader":"^0.8.0","ini":"^1.3.4","inquirer":"^6.2.0","invariant":"^2.2.0","is-builtin-module":"^2.0.0","is-ci":"^1.0.10","is-webpack-bundle":"^1.0.0","js-yaml":"^3.13.1","leven":"^2.0.0","loud-rejection":"^1.2.0","micromatch":"^2.3.11","mkdirp":"^0.5.1","node-emoji":"^1.6.1","normalize-url":"^2.0.0","npm-logical-tree":"^1.2.1","object-path":"^0.11.2","proper-lockfile":"^2.0.0","puka":"^1.0.0","read":"^1.0.7","request":"^2.87.0","request-capture-har":"^1.2.2","rimraf":"^2.5.0","semver":"^5.1.0","ssri":"^5.3.0","strip-ansi":"^4.0.0","strip-bom":"^3.0.0","tar-fs":"^1.16.0","tar-stream":"^1.6.1","uuid":"^3.0.1","v8-compile-cache":"^2.0.0","validate-npm-package-license":"^3.0.4","yn":"^2.0.0"},"devDependencies":{"babel-core":"^6.26.0","babel-eslint":"^7.2.3","babel-loader":"^6.2.5","babel-plugin-array-includes":"^2.0.3","babel-plugin-inline-import":"^3.0.0","babel-plugin-transform-builtin-extend":"^1.1.2","babel-plugin-transform-inline-imports-commonjs":"^1.0.0","babel-plugin-transform-runtime":"^6.4.3","babel-preset-env":"^1.6.0","babel-preset-flow":"^6.23.0","babel-preset-stage-0":"^6.0.0","babylon":"^6.5.0","commitizen":"^2.9.6","cz-conventional-changelog":"^2.0.0","eslint":"^4.3.0","eslint-config-fb-strict":"^22.0.0","eslint-plugin-babel":"^5.0.0","eslint-plugin-flowtype":"^2.35.0","eslint-plugin-jasmine":"^2.6.2","eslint-plugin-jest":"^21.0.0","eslint-plugin-jsx-a11y":"^6.0.2","eslint-plugin-prefer-object-spread":"^1.2.1","eslint-plugin-prettier":"^2.1.2","eslint-plugin-react":"^7.1.0","eslint-plugin-relay":"^0.0.28","eslint-plugin-yarn-internal":"file:scripts/eslint-rules","execa":"^0.11.0","fancy-log":"^1.3.2","flow-bin":"^0.66.0","git-release-notes":"^3.0.0","gulp":"^4.0.0","gulp-babel":"^7.0.0","gulp-if":"^2.0.1","gulp-newer":"^1.0.0","gulp-plumber":"^1.0.1","gulp-sourcemaps":"^2.2.0","jest":"^22.4.4","jsinspect":"^0.12.6","minimatch":"^3.0.4","mock-stdin":"^0.3.0","prettier":"^1.5.2","string-replace-loader":"^2.1.1","temp":"^0.8.3","webpack":"^2.1.0-beta.25","yargs":"^6.3.0"},"resolutions":{"sshpk":"^1.14.2"},"engines":{"node":">=4.0.0"},"repository":"yarnpkg/yarn","bin":{"yarn":"./bin/yarn.js","yarnpkg":"./bin/yarn.js"},"scripts":{"build":"gulp build","build-bundle":"node ./scripts/build-webpack.js","build-chocolatey":"powershell ./scripts/build-chocolatey.ps1","build-deb":"./scripts/build-deb.sh","build-dist":"bash ./scripts/build-dist.sh","build-win-installer":"scripts\\build-windows-installer.bat","changelog":"git-release-notes $(git describe --tags --abbrev=0 $(git describe --tags --abbrev=0)^)..$(git describe --tags --abbrev=0) scripts/changelog.md","dupe-check":"yarn jsinspect ./src","lint":"eslint . && flow check","pkg-tests":"yarn --cwd packages/pkg-tests jest yarn.test.js","prettier":"eslint src __tests__ --fix","release-branch":"./scripts/release-branch.sh","test":"yarn lint && yarn test-only","test-only":"node --max_old_space_size=4096 node_modules/jest/bin/jest.js --verbose","test-only-debug":"node --inspect-brk --max_old_space_size=4096 node_modules/jest/bin/jest.js --runInBand --verbose","test-coverage":"node --max_old_space_size=4096 node_modules/jest/bin/jest.js --coverage --verbose","watch":"gulp watch","commit":"git-cz"},"jest":{"collectCoverageFrom":["src/**/*.js"],"testEnvironment":"node","modulePathIgnorePatterns":["__tests__/fixtures/","packages/pkg-tests/pkg-tests-fixtures","dist/"],"testPathIgnorePatterns":["__tests__/(fixtures|__mocks__)/","updates/","_(temp|mock|install|init|helpers).js$","packages/pkg-tests"]},"config":{"commitizen":{"path":"./node_modules/cz-conventional-changelog"}}}
+
+/***/ }),
+/* 195 */
+/***/ (function(module, exports) {
+
+module.exports = require("https");
+
+/***/ }),
+/* 196 */
+/***/ (function(module, exports) {
+
+module.exports = require("querystring");
+
+/***/ }),
+/* 197 */
+/***/ (function(module, exports) {
+
+module.exports = require("readline");
+
+/***/ }),
+/* 198 */
+/***/ (function(module, exports) {
+
+module.exports = require("zlib");
+
+/***/ }),
+/* 199 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = stringify;
+
+var _misc;
+
+function _load_misc() {
+  return _misc = __webpack_require__(18);
+}
+
+var _constants;
+
+function _load_constants() {
+  return _constants = __webpack_require__(8);
+}
+
+var _package;
+
+function _load_package() {
+  return _package = __webpack_require__(194);
+}
+
+const NODE_VERSION = process.version;
+
+function shouldWrapKey(str) {
+  return str.indexOf('true') === 0 || str.indexOf('false') === 0 || /[:\s\n\\",\[\]]/g.test(str) || /^[0-9]/g.test(str) || !/^[a-zA-Z]/g.test(str);
+}
+
+function maybeWrap(str) {
+  if (typeof str === 'boolean' || typeof str === 'number' || shouldWrapKey(str)) {
+    return JSON.stringify(str);
+  } else {
+    return str;
+  }
+}
+
+const priorities = {
+  name: 1,
+  version: 2,
+  uid: 3,
+  resolved: 4,
+  integrity: 5,
+  registry: 6,
+  dependencies: 7
+};
+
+function priorityThenAlphaSort(a, b) {
+  if (priorities[a] || priorities[b]) {
+    return (priorities[a] || 100) > (priorities[b] || 100) ? 1 : -1;
+  } else {
+    return (0, (_misc || _load_misc()).sortAlpha)(a, b);
+  }
+}
+
+function _stringify(obj, options) {
+  if (typeof obj !== 'object') {
+    throw new TypeError();
+  }
+
+  const indent = options.indent;
+  const lines = [];
+
+  // Sorting order needs to be consistent between runs, we run native sort by name because there are no
+  // problems with it being unstable because there are no to keys the same
+  // However priorities can be duplicated and native sort can shuffle things from run to run
+  const keys = Object.keys(obj).sort(priorityThenAlphaSort);
+
+  let addedKeys = [];
+
+  for (let i = 0; i < keys.length; i++) {
+    const key = keys[i];
+    const val = obj[key];
+    if (val == null || addedKeys.indexOf(key) >= 0) {
+      continue;
+    }
+
+    const valKeys = [key];
+
+    // get all keys that have the same value equality, we only want this for objects
+    if (typeof val === 'object') {
+      for (let j = i + 1; j < keys.length; j++) {
+        const key = keys[j];
+        if (val === obj[key]) {
+          valKeys.push(key);
+        }
+      }
+    }
+
+    const keyLine = valKeys.sort((_misc || _load_misc()).sortAlpha).map(maybeWrap).join(', ');
+
+    if (typeof val === 'string' || typeof val === 'boolean' || typeof val === 'number') {
+      lines.push(`${keyLine} ${maybeWrap(val)}`);
+    } else if (typeof val === 'object') {
+      lines.push(`${keyLine}:\n${_stringify(val, { indent: indent + '  ' })}` + (options.topLevel ? '\n' : ''));
+    } else {
+      throw new TypeError();
+    }
+
+    addedKeys = addedKeys.concat(valKeys);
+  }
+
+  return indent + lines.join(`\n${indent}`);
+}
+
+function stringify(obj, noHeader, enableVersions) {
+  const val = _stringify(obj, {
+    indent: '',
+    topLevel: true
+  });
+  if (noHeader) {
+    return val;
+  }
+
+  const lines = [];
+  lines.push('# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.');
+  lines.push(`# yarn lockfile v${(_constants || _load_constants()).LOCKFILE_VERSION}`);
+  if (enableVersions) {
+    lines.push(`# yarn v${(_package || _load_package()).version}`);
+    lines.push(`# node ${NODE_VERSION}`);
+  }
+  lines.push('\n');
+  lines.push(val);
+
+  return lines.join('\n');
+}
+
+/***/ }),
+/* 200 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _consoleReporter;
+
+function _load_consoleReporter() {
+  return _consoleReporter = __webpack_require__(561);
+}
+
+Object.defineProperty(exports, 'ConsoleReporter', {
+  enumerable: true,
+  get: function get() {
+    return _interopRequireDefault(_consoleReporter || _load_consoleReporter()).default;
+  }
+});
+
+var _bufferReporter;
+
+function _load_bufferReporter() {
+  return _bufferReporter = __webpack_require__(560);
+}
+
+Object.defineProperty(exports, 'BufferReporter', {
+  enumerable: true,
+  get: function get() {
+    return _interopRequireDefault(_bufferReporter || _load_bufferReporter()).default;
+  }
+});
+
+var _eventReporter;
+
+function _load_eventReporter() {
+  return _eventReporter = __webpack_require__(565);
+}
+
+Object.defineProperty(exports, 'EventReporter', {
+  enumerable: true,
+  get: function get() {
+    return _interopRequireDefault(_eventReporter || _load_eventReporter()).default;
+  }
+});
+
+var _jsonReporter;
+
+function _load_jsonReporter() {
+  return _jsonReporter = __webpack_require__(213);
+}
+
+Object.defineProperty(exports, 'JSONReporter', {
+  enumerable: true,
+  get: function get() {
+    return _interopRequireDefault(_jsonReporter || _load_jsonReporter()).default;
+  }
+});
+
+var _noopReporter;
+
+function _load_noopReporter() {
+  return _noopReporter = __webpack_require__(569);
+}
+
+Object.defineProperty(exports, 'NoopReporter', {
+  enumerable: true,
+  get: function get() {
+    return _interopRequireDefault(_noopReporter || _load_noopReporter()).default;
+  }
+});
+
+var _baseReporter;
+
+function _load_baseReporter() {
+  return _baseReporter = __webpack_require__(108);
+}
+
+Object.defineProperty(exports, 'Reporter', {
+  enumerable: true,
+  get: function get() {
+    return _interopRequireDefault(_baseReporter || _load_baseReporter()).default;
+  }
+});
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/***/ }),
+/* 201 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+// On windows, create a .cmd file.
+// Read the #! in the file to see what it uses.  The vast majority
+// of the time, this will be either:
+// "#!/usr/bin/env <prog> <args...>"
+// or:
+// "#!<prog> <args...>"
+//
+// Write a binroot/pkg.bin + ".cmd" file that has this line in it:
+// @<prog> <args...> %~dp0<target> %*
+
+module.exports = cmdShim
+cmdShim.ifExists = cmdShimIfExists
+
+const fs = __webpack_require__(762)
+
+const mkdir = __webpack_require__(761)
+const path = __webpack_require__(0)
+const isWindows = __webpack_require__(743)
+const shebangExpr = /^#!\s*(?:\/usr\/bin\/env)?\s*([^ \t]+)(.*)$/
+const DEFAULT_OPTIONS = {
+  // Create PowerShell file by default if the option hasn't been specified
+  createPwshFile: true,
+  createCmdFile: isWindows()
+}
+
+function cmdShimIfExists (src, to, opts) {
+  opts = Object.assign({}, DEFAULT_OPTIONS, opts)
+  return fs.stat(src)
+    .then(() => cmdShim(src, to, opts))
+    .catch(() => {})
+}
+
+// Try to unlink, but ignore errors.
+// Any problems will surface later.
+function rm (path) {
+  return fs.unlink(path).catch(() => {})
+}
+
+function cmdShim (src, to, opts) {
+  opts = Object.assign({}, DEFAULT_OPTIONS, opts)
+  return fs.stat(src)
+    .then(() => cmdShim_(src, to, opts))
+}
+
+function cmdShim_ (src, to, opts) {
+  return Promise.all([
+    rm(to),
+    rm(`${to}.ps1`),
+    opts.createCmdFile && rm(`${to}.cmd`)
+  ])
+    .then(() => writeShim(src, to, opts))
+}
+
+function writeShim (src, to, opts) {
+  opts = Object.assign({}, DEFAULT_OPTIONS, opts)
+  const defaultArgs = opts.preserveSymlinks ? '--preserve-symlinks' : ''
+  // make a cmd file and a sh script
+  // First, check if the bin is a #! of some sort.
+  // If not, then assume it's something that'll be compiled, or some other
+  // sort of script, and just call it directly.
+  return mkdir(path.dirname(to))
+    .then(() => {
+      return fs.readFile(src, 'utf8')
+        .then(data => {
+          const firstLine = data.trim().split(/\r*\n/)[0]
+          const shebang = firstLine.match(shebangExpr)
+          if (!shebang) return writeShim_(src, to, Object.assign({}, opts, {args: defaultArgs}))
+          const prog = shebang[1]
+          const args = (shebang[2] && ((defaultArgs && (shebang[2] + ' ' + defaultArgs)) || shebang[2])) || defaultArgs
+          return writeShim_(src, to, Object.assign({}, opts, {prog, args}))
+        })
+        .catch(() => writeShim_(src, to, Object.assign({}, opts, {args: defaultArgs})))
+    })
+}
+
+function writeShim_ (src, to, opts) {
+  opts = Object.assign({}, DEFAULT_OPTIONS, opts)
+  let shTarget = path.relative(path.dirname(to), src)
+  let target = shTarget.split('/').join('\\')
+  let longProg
+  let prog = opts.prog
+  let shProg = prog && prog.split('\\').join('/')
+  let shLongProg
+  let pwshProg = shProg && `"${shProg}$exe"`
+  let pwshLongProg
+  shTarget = shTarget.split('\\').join('/')
+  let args = opts.args || ''
+  let {
+    win32: nodePath,
+    posix: shNodePath
+  } = normalizePathEnvVar(opts.nodePath)
+  if (!prog) {
+    prog = `"%~dp0\\${target}"`
+    shProg = `"$basedir/${shTarget}"`
+    pwshProg = shProg
+    args = ''
+    target = ''
+    shTarget = ''
+  } else {
+    longProg = `"%~dp0\\${prog}.exe"`
+    shLongProg = '"$basedir/' + prog + '"'
+    pwshLongProg = `"$basedir/${prog}$exe"`
+    target = `"%~dp0\\${target}"`
+    shTarget = `"$basedir/${shTarget}"`
+  }
+
+  let cmd
+  if (opts.createCmdFile) {
+    // @IF EXIST "%~dp0\node.exe" (
+    //   "%~dp0\node.exe" "%~dp0\.\node_modules\npm\bin\npm-cli.js" %*
+    // ) ELSE (
+    //   SETLOCAL
+    //   SET PATHEXT=%PATHEXT:;.JS;=;%
+    //   node "%~dp0\.\node_modules\npm\bin\npm-cli.js" %*
+    // )
+    cmd = nodePath ? `@SET NODE_PATH=${nodePath}\r\n` : ''
+    if (longProg) {
+      cmd += '@IF EXIST ' + longProg + ' (\r\n' +
+        '  ' + longProg + ' ' + args + ' ' + target + ' %*\r\n' +
+        ') ELSE (\r\n' +
+        '  @SETLOCAL\r\n' +
+        '  @SET PATHEXT=%PATHEXT:;.JS;=;%\r\n' +
+        '  ' + prog + ' ' + args + ' ' + target + ' %*\r\n' +
+        ')'
+    } else {
+      cmd += `@${prog} ${args} ${target} %*\r\n`
+    }
+  }
+
+  // #!/bin/sh
+  // basedir=`dirname "$0"`
+  //
+  // case `uname` in
+  //     *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+  // esac
+  //
+  // if [ -x "$basedir/node.exe" ]; then
+  //   "$basedir/node.exe" "$basedir/node_modules/npm/bin/npm-cli.js" "$@"
+  //   ret=$?
+  // else
+  //   node "$basedir/node_modules/npm/bin/npm-cli.js" "$@"
+  //   ret=$?
+  // fi
+  // exit $ret
+
+  let sh = '#!/bin/sh\n'
+  sh = sh +
+    "basedir=$(dirname \"$(echo \"$0\" | sed -e 's,\\\\,/,g')\")\n" +
+    '\n' +
+    'case `uname` in\n' +
+    '    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;\n' +
+    'esac\n' +
+    '\n'
+  const env = opts.nodePath ? `NODE_PATH="${shNodePath}" ` : ''
+
+  if (shLongProg) {
+    sh = sh +
+      'if [ -x ' + shLongProg + ' ]; then\n' +
+      '  ' + env + shLongProg + ' ' + args + ' ' + shTarget + ' "$@"\n' +
+      '  ret=$?\n' +
+      'else \n' +
+      '  ' + env + shProg + ' ' + args + ' ' + shTarget + ' "$@"\n' +
+      '  ret=$?\n' +
+      'fi\n' +
+      'exit $ret\n'
+  } else {
+    sh = sh + env + shProg + ' ' + args + ' ' + shTarget + ' "$@"\n' +
+      'exit $?\n'
+  }
+
+  // #!/usr/bin/env pwsh
+  // $basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent
+  //
+  // $ret=0
+  // $exe = ""
+  // if ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) {
+  //   # Fix case when both the Windows and Linux builds of Node
+  //   # are installed in the same directory
+  //   $exe = ".exe"
+  // }
+  // if (Test-Path "$basedir/node") {
+  //   & "$basedir/node$exe" "$basedir/node_modules/npm/bin/npm-cli.js" $args
+  //   $ret=$LASTEXITCODE
+  // } else {
+  //   & "node$exe" "$basedir/node_modules/npm/bin/npm-cli.js" $args
+  //   $ret=$LASTEXITCODE
+  // }
+  // exit $ret
+  let pwsh = '#!/usr/bin/env pwsh\n' +
+    '$basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent\n' +
+    '\n' +
+    '$exe=""\n' +
+    (opts.nodePath ? '$env_node_path=$env:NODE_PATH\n' +
+      `$env:NODE_PATH="${nodePath}"\n` : '') +
+    'if ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) {\n' +
+    '  # Fix case when both the Windows and Linux builds of Node\n' +
+    '  # are installed in the same directory\n' +
+    '  $exe=".exe"\n' +
+    '}'
+  if (opts.nodePath) {
+    pwsh = pwsh +
+      ' else {\n' +
+      `  $env:NODE_PATH="${shNodePath}"\n` +
+      '}'
+  }
+  pwsh += '\n'
+  if (shLongProg) {
+    pwsh = pwsh +
+      '$ret=0\n' +
+      `if (Test-Path ${pwshLongProg}) {\n` +
+      `  & ${pwshLongProg} ${args} ${shTarget} $args\n` +
+      '  $ret=$LASTEXITCODE\n' +
+      '} else {\n' +
+      `  & ${pwshProg} ${args} ${shTarget} $args\n` +
+      '  $ret=$LASTEXITCODE\n' +
+      '}\n' +
+      (opts.nodePath ? '$env:NODE_PATH=$env_node_path\n' : '') +
+      'exit $ret\n'
+  } else {
+    pwsh = pwsh +
+      `& ${pwshProg} ${args} ${shTarget} $args\n` +
+      (opts.nodePath ? '$env:NODE_PATH=$env_node_path\n' : '') +
+      'exit $LASTEXITCODE\n'
+  }
+
+  return Promise.all([
+    opts.createCmdFile && fs.writeFile(to + '.cmd', cmd, 'utf8'),
+    opts.createPwshFile && fs.writeFile(`${to}.ps1`, pwsh, 'utf8'),
+    fs.writeFile(to, sh, 'utf8')
+  ])
+    .then(() => chmodShim(to, opts))
+}
+
+function chmodShim (to, {createCmdFile, createPwshFile}) {
+  return Promise.all([
+    fs.chmod(to, 0o755),
+    createPwshFile && fs.chmod(`${to}.ps1`, 0o755),
+    createCmdFile && fs.chmod(`${to}.cmd`, 0o755)
+  ])
+}
+
+/**
+ * @param {string|string[]} nodePath
+ * @returns {{win32:string,posix:string}}
+ */
+function normalizePathEnvVar (nodePath) {
+  if (!nodePath) {
+    return {
+      win32: nodePath,
+      posix: nodePath
+    }
+  }
+  let split = (typeof nodePath === 'string' ? nodePath.split(path.delimiter) : Array.from(nodePath))
+  let result = {}
+  for (let i = 0; i < split.length; i++) {
+    const win32 = split[i].split('/').join('\\')
+    const posix = isWindows() ? split[i].split('\\').join('/').replace(/^([^:\\/]*):/, (_, $1) => `/mnt/${$1.toLowerCase()}`) : split[i]
+
+    result.win32 = result.win32 ? `${result.win32};${win32}` : win32
+    result.posix = result.posix ? `${result.posix}:${posix}` : posix
+
+    result[i] = {win32, posix}
+  }
+  return result
+}
+
+
+/***/ }),
+/* 202 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var resolve = __webpack_require__(203);
+
+module.exports = {
+  Validation: errorSubclass(ValidationError),
+  MissingRef: errorSubclass(MissingRefError)
+};
+
+
+function ValidationError(errors) {
+  this.message = 'validation failed';
+  this.errors = errors;
+  this.ajv = this.validation = true;
+}
+
+
+MissingRefError.message = function (baseId, ref) {
+  return 'can\'t resolve reference ' + ref + ' from id ' + baseId;
+};
+
+
+function MissingRefError(baseId, ref, message) {
+  this.message = message || MissingRefError.message(baseId, ref);
+  this.missingRef = resolve.url(baseId, ref);
+  this.missingSchema = resolve.normalizeId(resolve.fullPath(this.missingRef));
+}
+
+
+function errorSubclass(Subclass) {
+  Subclass.prototype = Object.create(Error.prototype);
+  Subclass.prototype.constructor = Subclass;
+  return Subclass;
+}
+
+
+/***/ }),
+/* 203 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var url = __webpack_require__(24)
+  , equal = __webpack_require__(204)
+  , util = __webpack_require__(106)
+  , SchemaObject = __webpack_require__(339)
+  , traverse = __webpack_require__(503);
+
+module.exports = resolve;
+
+resolve.normalizeId = normalizeId;
+resolve.fullPath = getFullPath;
+resolve.url = resolveUrl;
+resolve.ids = resolveIds;
+resolve.inlineRef = inlineRef;
+resolve.schema = resolveSchema;
+
+/**
+ * [resolve and compile the references ($ref)]
+ * @this   Ajv
+ * @param  {Function} compile reference to schema compilation funciton (localCompile)
+ * @param  {Object} root object with information about the root schema for the current schema
+ * @param  {String} ref reference to resolve
+ * @return {Object|Function} schema object (if the schema can be inlined) or validation function
+ */
+function resolve(compile, root, ref) {
+  /* jshint validthis: true */
+  var refVal = this._refs[ref];
+  if (typeof refVal == 'string') {
+    if (this._refs[refVal]) refVal = this._refs[refVal];
+    else return resolve.call(this, compile, root, refVal);
+  }
+
+  refVal = refVal || this._schemas[ref];
+  if (refVal instanceof SchemaObject) {
+    return inlineRef(refVal.schema, this._opts.inlineRefs)
+            ? refVal.schema
+            : refVal.validate || this._compile(refVal);
+  }
+
+  var res = resolveSchema.call(this, root, ref);
+  var schema, v, baseId;
+  if (res) {
+    schema = res.schema;
+    root = res.root;
+    baseId = res.baseId;
+  }
+
+  if (schema instanceof SchemaObject) {
+    v = schema.validate || compile.call(this, schema.schema, root, undefined, baseId);
+  } else if (schema !== undefined) {
+    v = inlineRef(schema, this._opts.inlineRefs)
+        ? schema
+        : compile.call(this, schema, root, undefined, baseId);
+  }
+
+  return v;
+}
+
+
+/**
+ * Resolve schema, its root and baseId
+ * @this Ajv
+ * @param  {Object} root root object with properties schema, refVal, refs
+ * @param  {String} ref  reference to resolve
+ * @return {Object} object with properties schema, root, baseId
+ */
+function resolveSchema(root, ref) {
+  /* jshint validthis: true */
+  var p = url.parse(ref, false, true)
+    , refPath = _getFullPath(p)
+    , baseId = getFullPath(this._getId(root.schema));
+  if (refPath !== baseId) {
+    var id = normalizeId(refPath);
+    var refVal = this._refs[id];
+    if (typeof refVal == 'string') {
+      return resolveRecursive.call(this, root, refVal, p);
+    } else if (refVal instanceof SchemaObject) {
+      if (!refVal.validate) this._compile(refVal);
+      root = refVal;
+    } else {
+      refVal = this._schemas[id];
+      if (refVal instanceof SchemaObject) {
+        if (!refVal.validate) this._compile(refVal);
+        if (id == normalizeId(ref))
+          return { schema: refVal, root: root, baseId: baseId };
+        root = refVal;
+      } else {
+        return;
+      }
+    }
+    if (!root.schema) return;
+    baseId = getFullPath(this._getId(root.schema));
+  }
+  return getJsonPointer.call(this, p, baseId, root.schema, root);
+}
+
+
+/* @this Ajv */
+function resolveRecursive(root, ref, parsedRef) {
+  /* jshint validthis: true */
+  var res = resolveSchema.call(this, root, ref);
+  if (res) {
+    var schema = res.schema;
+    var baseId = res.baseId;
+    root = res.root;
+    var id = this._getId(schema);
+    if (id) baseId = resolveUrl(baseId, id);
+    return getJsonPointer.call(this, parsedRef, baseId, schema, root);
+  }
+}
+
+
+var PREVENT_SCOPE_CHANGE = util.toHash(['properties', 'patternProperties', 'enum', 'dependencies', 'definitions']);
+/* @this Ajv */
+function getJsonPointer(parsedRef, baseId, schema, root) {
+  /* jshint validthis: true */
+  parsedRef.hash = parsedRef.hash || '';
+  if (parsedRef.hash.slice(0,2) != '#/') return;
+  var parts = parsedRef.hash.split('/');
+
+  for (var i = 1; i < parts.length; i++) {
+    var part = parts[i];
+    if (part) {
+      part = util.unescapeFragment(part);
+      schema = schema[part];
+      if (schema === undefined) break;
+      var id;
+      if (!PREVENT_SCOPE_CHANGE[part]) {
+        id = this._getId(schema);
+        if (id) baseId = resolveUrl(baseId, id);
+        if (schema.$ref) {
+          var $ref = resolveUrl(baseId, schema.$ref);
+          var res = resolveSchema.call(this, root, $ref);
+          if (res) {
+            schema = res.schema;
+            root = res.root;
+            baseId = res.baseId;
+          }
+        }
+      }
+    }
+  }
+  if (schema !== undefined && schema !== root.schema)
+    return { schema: schema, root: root, baseId: baseId };
+}
+
+
+var SIMPLE_INLINED = util.toHash([
+  'type', 'format', 'pattern',
+  'maxLength', 'minLength',
+  'maxProperties', 'minProperties',
+  'maxItems', 'minItems',
+  'maximum', 'minimum',
+  'uniqueItems', 'multipleOf',
+  'required', 'enum'
+]);
+function inlineRef(schema, limit) {
+  if (limit === false) return false;
+  if (limit === undefined || limit === true) return checkNoRef(schema);
+  else if (limit) return countKeys(schema) <= limit;
+}
+
+
+function checkNoRef(schema) {
+  var item;
+  if (Array.isArray(schema)) {
+    for (var i=0; i<schema.length; i++) {
+      item = schema[i];
+      if (typeof item == 'object' && !checkNoRef(item)) return false;
+    }
+  } else {
+    for (var key in schema) {
+      if (key == '$ref') return false;
+      item = schema[key];
+      if (typeof item == 'object' && !checkNoRef(item)) return false;
+    }
+  }
+  return true;
+}
+
+
+function countKeys(schema) {
+  var count = 0, item;
+  if (Array.isArray(schema)) {
+    for (var i=0; i<schema.length; i++) {
+      item = schema[i];
+      if (typeof item == 'object') count += countKeys(item);
+      if (count == Infinity) return Infinity;
+    }
+  } else {
+    for (var key in schema) {
+      if (key == '$ref') return Infinity;
+      if (SIMPLE_INLINED[key]) {
+        count++;
+      } else {
+        item = schema[key];
+        if (typeof item == 'object') count += countKeys(item) + 1;
+        if (count == Infinity) return Infinity;
+      }
+    }
+  }
+  return count;
+}
+
+
+function getFullPath(id, normalize) {
+  if (normalize !== false) id = normalizeId(id);
+  var p = url.parse(id, false, true);
+  return _getFullPath(p);
+}
+
+
+function _getFullPath(p) {
+  var protocolSeparator = p.protocol || p.href.slice(0,2) == '//' ? '//' : '';
+  return (p.protocol||'') + protocolSeparator + (p.host||'') + (p.path||'')  + '#';
+}
+
+
+var TRAILING_SLASH_HASH = /#\/?$/;
+function normalizeId(id) {
+  return id ? id.replace(TRAILING_SLASH_HASH, '') : '';
+}
+
+
+function resolveUrl(baseId, id) {
+  id = normalizeId(id);
+  return url.resolve(baseId, id);
+}
+
+
+/* @this Ajv */
+function resolveIds(schema) {
+  var schemaId = normalizeId(this._getId(schema));
+  var baseIds = {'': schemaId};
+  var fullPaths = {'': getFullPath(schemaId, false)};
+  var localRefs = {};
+  var self = this;
+
+  traverse(schema, {allKeys: true}, function(sch, jsonPtr, rootSchema, parentJsonPtr, parentKeyword, parentSchema, keyIndex) {
+    if (jsonPtr === '') return;
+    var id = self._getId(sch);
+    var baseId = baseIds[parentJsonPtr];
+    var fullPath = fullPaths[parentJsonPtr] + '/' + parentKeyword;
+    if (keyIndex !== undefined)
+      fullPath += '/' + (typeof keyIndex == 'number' ? keyIndex : util.escapeFragment(keyIndex));
+
+    if (typeof id == 'string') {
+      id = baseId = normalizeId(baseId ? url.resolve(baseId, id) : id);
+
+      var refVal = self._refs[id];
+      if (typeof refVal == 'string') refVal = self._refs[refVal];
+      if (refVal && refVal.schema) {
+        if (!equal(sch, refVal.schema))
+          throw new Error('id "' + id + '" resolves to more than one schema');
+      } else if (id != normalizeId(fullPath)) {
+        if (id[0] == '#') {
+          if (localRefs[id] && !equal(sch, localRefs[id]))
+            throw new Error('id "' + id + '" resolves to more than one schema');
+          localRefs[id] = sch;
+        } else {
+          self._refs[id] = fullPath;
+        }
+      }
+    }
+    baseIds[jsonPtr] = baseId;
+    fullPaths[jsonPtr] = fullPath;
+  });
+
+  return localRefs;
+}
+
+
+/***/ }),
+/* 204 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var isArray = Array.isArray;
+var keyList = Object.keys;
+var hasProp = Object.prototype.hasOwnProperty;
+
+module.exports = function equal(a, b) {
+  if (a === b) return true;
+
+  var arrA = isArray(a)
+    , arrB = isArray(b)
+    , i
+    , length
+    , key;
+
+  if (arrA && arrB) {
+    length = a.length;
+    if (length != b.length) return false;
+    for (i = 0; i < length; i++)
+      if (!equal(a[i], b[i])) return false;
+    return true;
+  }
+
+  if (arrA != arrB) return false;
+
+  var dateA = a instanceof Date
+    , dateB = b instanceof Date;
+  if (dateA != dateB) return false;
+  if (dateA && dateB) return a.getTime() == b.getTime();
+
+  var regexpA = a instanceof RegExp
+    , regexpB = b instanceof RegExp;
+  if (regexpA != regexpB) return false;
+  if (regexpA && regexpB) return a.toString() == b.toString();
+
+  if (a instanceof Object && b instanceof Object) {
+    var keys = keyList(a);
+    length = keys.length;
+
+    if (length !== keyList(b).length)
+      return false;
+
+    for (i = 0; i < length; i++)
+      if (!hasProp.call(b, keys[i])) return false;
+
+    for (i = 0; i < length; i++) {
+      key = keys[i];
+      if (!equal(a[key], b[key])) return false;
+    }
+
+    return true;
+  }
+
+  return false;
+};
+
+
+/***/ }),
+/* 205 */
+/***/ (function(module, exports) {
+
+// Copyright 2011 Mark Cavage <mcavage@gmail.com> All rights reserved.
+
+
+module.exports = {
+
+  newInvalidAsn1Error: function (msg) {
+    var e = new Error();
+    e.name = 'InvalidAsn1Error';
+    e.message = msg || '';
+    return e;
+  }
+
+};
+
+
+/***/ }),
+/* 206 */
+/***/ (function(module, exports) {
+
+// Copyright 2011 Mark Cavage <mcavage@gmail.com> All rights reserved.
+
+
+module.exports = {
+  EOC: 0,
+  Boolean: 1,
+  Integer: 2,
+  BitString: 3,
+  OctetString: 4,
+  Null: 5,
+  OID: 6,
+  ObjectDescriptor: 7,
+  External: 8,
+  Real: 9, // float
+  Enumeration: 10,
+  PDV: 11,
+  Utf8String: 12,
+  RelativeOID: 13,
+  Sequence: 16,
+  Set: 17,
+  NumericString: 18,
+  PrintableString: 19,
+  T61String: 20,
+  VideotexString: 21,
+  IA5String: 22,
+  UTCTime: 23,
+  GeneralizedTime: 24,
+  GraphicString: 25,
+  VisibleString: 26,
+  GeneralString: 28,
+  UniversalString: 29,
+  CharacterString: 30,
+  BMPString: 31,
+  Constructor: 32,
+  Context: 128
+};
+
+
+/***/ }),
+/* 207 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getOutdated = exports.run = exports.requireLockfile = undefined;
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+let run = exports.run = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
+    let addArgs = [];
+    const upgradeAll = args.length === 0 && typeof flags.scope === 'undefined' && typeof flags.pattern === 'undefined';
+    const addFlags = Object.assign({}, flags, {
+      force: true,
+      ignoreWorkspaceRootCheck: true,
+      workspaceRootIsCwd: config.cwd === config.lockfileFolder
+    });
+    const lockfile = yield (_lockfile || _load_lockfile()).default.fromDirectory(config.lockfileFolder, reporter);
+    const deps = yield getOutdated(config, reporter, flags, lockfile, args);
+    const install = new (_install || _load_install()).Install(flags, config, reporter, lockfile);
+
+    var _ref2 = yield install.fetchRequestFromCwd();
+
+    const packagePatterns = _ref2.requests;
+
+
+    setUserRequestedPackageVersions(deps, args, flags.latest, packagePatterns, reporter);
+    cleanLockfile(lockfile, deps, packagePatterns, reporter);
+    addArgs = deps.map(function (dep) {
+      return dep.upgradeTo;
+    });
+
+    if (flags.scope && validScopeRegex.test(flags.scope)) {
+      addArgs = addArgs.filter(function (depName) {
+        return depName.startsWith(flags.scope);
+      });
+    }
+
+    const add = new (_add || _load_add()).Add(addArgs, addFlags, config, reporter, upgradeAll ? new (_lockfile || _load_lockfile()).default() : lockfile);
+    yield add.init();
+  });
+
+  return function run(_x, _x2, _x3, _x4) {
+    return _ref.apply(this, arguments);
+  };
+})();
+
+let getOutdated = exports.getOutdated = (() => {
+  var _ref3 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, lockfile, patterns) {
+    const install = new (_install || _load_install()).Install(flags, config, reporter, lockfile);
+    const outdatedFieldName = flags.latest ? 'latest' : 'wanted';
+
+    // ensure scope is of the form `@scope/`
+    const normalizeScope = function normalizeScope() {
+      if (flags.scope) {
+        if (!flags.scope.startsWith('@')) {
+          flags.scope = '@' + flags.scope;
+        }
+
+        if (!flags.scope.endsWith('/')) {
+          flags.scope += '/';
+        }
+      }
+    };
+
+    const versionFilter = function versionFilter(dep) {
+      return dep.current !== dep[outdatedFieldName];
+    };
+
+    if (!flags.latest) {
+      // these flags only have an affect when --latest is used
+      flags.tilde = false;
+      flags.exact = false;
+      flags.caret = false;
+    }
+
+    normalizeScope();
+
+    const deps = (yield (_packageRequest || _load_packageRequest()).default.getOutdatedPackages(lockfile, install, config, reporter, patterns, flags)).filter(versionFilter).filter(scopeFilter.bind(this, flags));
+    deps.forEach(function (dep) {
+      dep.upgradeTo = buildPatternToUpgradeTo(dep, flags);
+      reporter.verbose(reporter.lang('verboseUpgradeBecauseOutdated', dep.name, dep.upgradeTo));
+    });
+
+    return deps;
+  });
+
+  return function getOutdated(_x5, _x6, _x7, _x8, _x9) {
+    return _ref3.apply(this, arguments);
+  };
+})();
+
+exports.cleanLockfile = cleanLockfile;
+exports.setFlags = setFlags;
+exports.hasWrapper = hasWrapper;
+
+var _add;
+
+function _load_add() {
+  return _add = __webpack_require__(165);
+}
+
+var _lockfile;
+
+function _load_lockfile() {
+  return _lockfile = _interopRequireDefault(__webpack_require__(19));
+}
+
+var _packageRequest;
+
+function _load_packageRequest() {
+  return _packageRequest = _interopRequireDefault(__webpack_require__(122));
+}
+
+var _normalizePattern;
+
+function _load_normalizePattern() {
+  return _normalizePattern = __webpack_require__(37);
+}
+
+var _install;
+
+function _load_install() {
+  return _install = __webpack_require__(34);
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+// used to detect whether a semver range is simple enough to preserve when doing a --latest upgrade.
+// when not matched, the upgraded version range will default to `^` the same as the `add` command would.
+const basicSemverOperatorRegex = new RegExp('^(\\^|~|>=|<=)?[^ |&,]+$');
+
+// used to detect if a passed parameter is a scope or a package name.
+
+
+const validScopeRegex = /^@[a-zA-Z0-9-][a-zA-Z0-9_.-]*\/$/;
+
+// If specific versions were requested for packages, override what getOutdated reported as the latest to install
+// Also add ones that are missing, since the requested packages may not have been outdated at all.
+function setUserRequestedPackageVersions(deps, args, latest, packagePatterns, reporter) {
+  args.forEach(requestedPattern => {
+    let found = false;
+    let normalized = (0, (_normalizePattern || _load_normalizePattern()).normalizePattern)(requestedPattern);
+
+    // if the user specified a package name without a version range, then that implies "latest"
+    // but if the latest flag is not passed then we need to use the version range from package.json
+    if (!normalized.hasVersion && !latest) {
+      packagePatterns.forEach(packagePattern => {
+        const packageNormalized = (0, (_normalizePattern || _load_normalizePattern()).normalizePattern)(packagePattern.pattern);
+        if (packageNormalized.name === normalized.name) {
+          normalized = packageNormalized;
+        }
+      });
+    }
+
+    const newPattern = `${normalized.name}@${normalized.range}`;
+
+    // if this dependency is already in the outdated list,
+    // just update the upgradeTo to whatever version the user requested.
+    deps.forEach(dep => {
+      if (normalized.hasVersion && dep.name === normalized.name) {
+        found = true;
+        dep.upgradeTo = newPattern;
+        reporter.verbose(reporter.lang('verboseUpgradeBecauseRequested', requestedPattern, newPattern));
+      }
+    });
+
+    // if this dependency was not in the outdated list,
+    // then add a new entry
+    if (normalized.hasVersion && !found) {
+      deps.push({
+        name: normalized.name,
+        wanted: '',
+        latest: '',
+        url: '',
+        hint: '',
+        range: '',
+        current: '',
+        upgradeTo: newPattern,
+        workspaceName: '',
+        workspaceLoc: ''
+      });
+      reporter.verbose(reporter.lang('verboseUpgradeBecauseRequested', requestedPattern, newPattern));
+    }
+  });
+}
+
+// this function attempts to determine the range operator on the semver range.
+// this will only handle the simple cases of a semver starting with '^', '~', '>=', '<=', or an exact version.
+// "exotic" semver ranges will not be handled.
+function getRangeOperator(version) {
+  const result = basicSemverOperatorRegex.exec(version);
+  return result ? result[1] || '' : '^';
+}
+
+// Attempt to preserve the range operator from the package.json specified semver range.
+// If an explicit operator was specified using --exact, --tilde, --caret, then that will take precedence.
+function buildPatternToUpgradeTo(dep, flags) {
+  if (dep.latest === 'exotic') {
+    return `${dep.name}@${dep.url}`;
+  }
+
+  const toLatest = flags.latest;
+  const toVersion = toLatest ? dep.latest : dep.range;
+  let rangeOperator = '';
+
+  if (toLatest) {
+    if (flags.caret) {
+      rangeOperator = '^';
+    } else if (flags.tilde) {
+      rangeOperator = '~';
+    } else if (flags.exact) {
+      rangeOperator = '';
+    } else {
+      rangeOperator = getRangeOperator(dep.range);
+    }
+  }
+
+  return `${dep.name}@${rangeOperator}${toVersion}`;
+}
+
+function scopeFilter(flags, dep) {
+  if (validScopeRegex.test(flags.scope)) {
+    return dep.name.startsWith(flags.scope);
+  }
+  return true;
+}
+
+// Remove deps being upgraded from the lockfile, or else Add will use the already-installed version
+// instead of the latest for the range.
+// We do this recursively so that when Yarn installs the potentially updated transitive deps,
+// it may upgrade them too instead of just using the "locked" version from the lockfile.
+// Transitive dependencies that are also a direct dependency are skipped.
+function cleanLockfile(lockfile, deps, packagePatterns, reporter) {
+  function cleanDepFromLockfile(pattern, depth) {
+    const lockManifest = lockfile.getLocked(pattern);
+    if (!lockManifest || depth > 1 && packagePatterns.some(packagePattern => packagePattern.pattern === pattern)) {
+      reporter.verbose(reporter.lang('verboseUpgradeNotUnlocking', pattern));
+      return;
+    }
+
+    const dependencies = Object.assign({}, lockManifest.dependencies || {}, lockManifest.optionalDependencies || {});
+    const depPatterns = Object.keys(dependencies).map(key => `${key}@${dependencies[key]}`);
+    reporter.verbose(reporter.lang('verboseUpgradeUnlocking', pattern));
+    lockfile.removePattern(pattern);
+    depPatterns.forEach(pattern => cleanDepFromLockfile(pattern, depth + 1));
+  }
+
+  const patterns = deps.map(dep => dep.upgradeTo);
+  patterns.forEach(pattern => cleanDepFromLockfile(pattern, 1));
+}
+
+function setFlags(commander) {
+  commander.description('Upgrades packages to their latest version based on the specified range.');
+  commander.usage('upgrade [flags]');
+  commander.option('-S, --scope <scope>', 'upgrade packages under the specified scope');
+  commander.option('-L, --latest', 'list the latest version of packages, ignoring version ranges in package.json');
+  commander.option('-E, --exact', 'install exact version. Only used when --latest is specified.');
+  commander.option('-P, --pattern [pattern]', 'upgrade packages that match pattern');
+  commander.option('-T, --tilde', 'install most recent release with the same minor version. Only used when --latest is specified.');
+  commander.option('-C, --caret', 'install most recent release with the same major version. Only used when --latest is specified.');
+  commander.option('-A, --audit', 'Run vulnerability audit on installed packages');
+}
+
+function hasWrapper(commander, args) {
+  return true;
+}
+
+const requireLockfile = exports.requireLockfile = true;
+
+/***/ }),
+/* 208 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.integrityErrors = undefined;
+
+var _extends2;
+
+function _load_extends() {
+  return _extends2 = _interopRequireDefault(__webpack_require__(21));
+}
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+var _constants;
+
+function _load_constants() {
+  return _constants = _interopRequireWildcard(__webpack_require__(8));
+}
+
+var _fs;
+
+function _load_fs() {
+  return _fs = _interopRequireWildcard(__webpack_require__(4));
+}
+
+var _misc;
+
+function _load_misc() {
+  return _misc = __webpack_require__(18);
+}
+
+var _packageNameUtils;
+
+function _load_packageNameUtils() {
+  return _packageNameUtils = __webpack_require__(222);
+}
+
+var _workspaceLayout;
+
+function _load_workspaceLayout() {
+  return _workspaceLayout = _interopRequireDefault(__webpack_require__(90));
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const invariant = __webpack_require__(9);
+
+const path = __webpack_require__(0);
+
+const integrityErrors = exports.integrityErrors = {
+  EXPECTED_IS_NOT_A_JSON: 'integrityFailedExpectedIsNotAJSON',
+  FILES_MISSING: 'integrityFailedFilesMissing',
+  LOCKFILE_DONT_MATCH: 'integrityLockfilesDontMatch',
+  FLAGS_DONT_MATCH: 'integrityFlagsDontMatch',
+  LINKED_MODULES_DONT_MATCH: 'integrityCheckLinkedModulesDontMatch',
+  PATTERNS_DONT_MATCH: 'integrityPatternsDontMatch',
+  MODULES_FOLDERS_MISSING: 'integrityModulesFoldersMissing',
+  SYSTEM_PARAMS_DONT_MATCH: 'integritySystemParamsDontMatch'
+};
+
+const INTEGRITY_FILE_DEFAULTS = () => ({
+  systemParams: (0, (_packageNameUtils || _load_packageNameUtils()).getSystemParams)(),
+  modulesFolders: [],
+  flags: [],
+  linkedModules: [],
+  topLevelPatterns: [],
+  lockfileEntries: {},
+  files: []
+});
+
+/**
+ *
+ */
+class InstallationIntegrityChecker {
+  constructor(config) {
+    this.config = config;
+  }
+
+  /**
+   * Get the common ancestor of every node_modules - it may be a node_modules directory itself, but isn't required to.
+   */
+
+  _getModulesRootFolder() {
+    if (this.config.modulesFolder) {
+      return this.config.modulesFolder;
+    } else if (this.config.workspaceRootFolder) {
+      return this.config.workspaceRootFolder;
+    } else {
+      return path.join(this.config.lockfileFolder, (_constants || _load_constants()).NODE_MODULES_FOLDER);
+    }
+  }
+
+  /**
+   * Get the directory in which the yarn-integrity file should be written.
+   */
+
+  _getIntegrityFileFolder() {
+    if (this.config.modulesFolder) {
+      return this.config.modulesFolder;
+    } else if (this.config.enableMetaFolder) {
+      return path.join(this.config.lockfileFolder, (_constants || _load_constants()).META_FOLDER);
+    } else {
+      return path.join(this.config.lockfileFolder, (_constants || _load_constants()).NODE_MODULES_FOLDER);
+    }
+  }
+
+  /**
+   * Get the full path of the yarn-integrity file.
+   */
+
+  _getIntegrityFileLocation() {
+    var _this = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const locationFolder = _this._getIntegrityFileFolder();
+      const locationPath = path.join(locationFolder, (_constants || _load_constants()).INTEGRITY_FILENAME);
+
+      const exists = yield (_fs || _load_fs()).exists(locationPath);
+
+      return {
+        locationFolder,
+        locationPath,
+        exists
+      };
+    })();
+  }
+
+  /**
+   * Get the list of the directories that contain our modules (there might be multiple such folders b/c of workspaces).
+   */
+
+  _getModulesFolders({ workspaceLayout } = {}) {
+    const locations = [];
+
+    if (this.config.modulesFolder) {
+      locations.push(this.config.modulesFolder);
+    } else {
+      locations.push(path.join(this.config.lockfileFolder, (_constants || _load_constants()).NODE_MODULES_FOLDER));
+    }
+
+    if (workspaceLayout) {
+      for (var _iterator = Object.keys(workspaceLayout.workspaces), _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+        var _ref;
+
+        if (_isArray) {
+          if (_i >= _iterator.length) break;
+          _ref = _iterator[_i++];
+        } else {
+          _i = _iterator.next();
+          if (_i.done) break;
+          _ref = _i.value;
+        }
+
+        const workspaceName = _ref;
+
+        const loc = workspaceLayout.workspaces[workspaceName].loc;
+
+        if (loc) {
+          locations.push(path.join(loc, (_constants || _load_constants()).NODE_MODULES_FOLDER));
+        }
+      }
+    }
+
+    return locations.sort((_misc || _load_misc()).sortAlpha);
+  }
+
+  /**
+   * Get a list of the files that are located inside our module folders.
+   */
+  _getIntegrityListing({ workspaceLayout } = {}) {
+    var _this2 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const files = [];
+
+      const recurse = (() => {
+        var _ref2 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (dir) {
+          for (var _iterator2 = yield (_fs || _load_fs()).readdir(dir), _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+            var _ref3;
+
+            if (_isArray2) {
+              if (_i2 >= _iterator2.length) break;
+              _ref3 = _iterator2[_i2++];
+            } else {
+              _i2 = _iterator2.next();
+              if (_i2.done) break;
+              _ref3 = _i2.value;
+            }
+
+            const file = _ref3;
+
+            const entry = path.join(dir, file);
+            const stat = yield (_fs || _load_fs()).lstat(entry);
+
+            if (stat.isDirectory()) {
+              yield recurse(entry);
+            } else {
+              files.push(entry);
+            }
+          }
+        });
+
+        return function recurse(_x) {
+          return _ref2.apply(this, arguments);
+        };
+      })();
+
+      for (var _iterator3 = _this2._getModulesFolders({ workspaceLayout }), _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
+        var _ref4;
+
+        if (_isArray3) {
+          if (_i3 >= _iterator3.length) break;
+          _ref4 = _iterator3[_i3++];
+        } else {
+          _i3 = _iterator3.next();
+          if (_i3.done) break;
+          _ref4 = _i3.value;
+        }
+
+        const modulesFolder = _ref4;
+
+        if (yield (_fs || _load_fs()).exists(modulesFolder)) {
+          yield recurse(modulesFolder);
+        }
+      }
+
+      return files;
+    })();
+  }
+
+  /**
+   * Generate integrity hash of input lockfile.
+   */
+
+  _generateIntegrityFile(lockfile, patterns, flags, workspaceLayout, artifacts) {
+    var _this3 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const result = (0, (_extends2 || _load_extends()).default)({}, INTEGRITY_FILE_DEFAULTS(), {
+        artifacts
+      });
+
+      result.topLevelPatterns = patterns;
+
+      // If using workspaces, we also need to add the workspaces patterns to the top-level, so that we'll know if a
+      // dependency is added or removed into one of them. We must take care not to read the aggregator (if !loc).
+      //
+      // Also note that we can't use of workspaceLayout.workspaces[].manifest._reference.patterns, because when
+      // doing a "yarn check", the _reference property hasn't yet been properly initialized.
+
+      if (workspaceLayout) {
+        result.topLevelPatterns = result.topLevelPatterns.filter(function (p) {
+          // $FlowFixMe
+          return !workspaceLayout.getManifestByPattern(p);
+        });
+
+        for (var _iterator4 = Object.keys(workspaceLayout.workspaces), _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
+          var _ref5;
+
+          if (_isArray4) {
+            if (_i4 >= _iterator4.length) break;
+            _ref5 = _iterator4[_i4++];
+          } else {
+            _i4 = _iterator4.next();
+            if (_i4.done) break;
+            _ref5 = _i4.value;
+          }
+
+          const name = _ref5;
+
+          if (!workspaceLayout.workspaces[name].loc) {
+            continue;
+          }
+
+          const manifest = workspaceLayout.workspaces[name].manifest;
+
+          if (manifest) {
+            for (var _iterator5 = (_constants || _load_constants()).DEPENDENCY_TYPES, _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
+              var _ref6;
+
+              if (_isArray5) {
+                if (_i5 >= _iterator5.length) break;
+                _ref6 = _iterator5[_i5++];
+              } else {
+                _i5 = _iterator5.next();
+                if (_i5.done) break;
+                _ref6 = _i5.value;
+              }
+
+              const dependencyType = _ref6;
+
+              const dependencies = manifest[dependencyType];
+
+              if (!dependencies) {
+                continue;
+              }
+
+              for (var _iterator6 = Object.keys(dependencies), _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) {
+                var _ref7;
+
+                if (_isArray6) {
+                  if (_i6 >= _iterator6.length) break;
+                  _ref7 = _iterator6[_i6++];
+                } else {
+                  _i6 = _iterator6.next();
+                  if (_i6.done) break;
+                  _ref7 = _i6.value;
+                }
+
+                const dep = _ref7;
+
+                result.topLevelPatterns.push(`${dep}@${dependencies[dep]}`);
+              }
+            }
+          }
+        }
+      }
+
+      result.topLevelPatterns.sort((_misc || _load_misc()).sortAlpha);
+
+      if (flags.checkFiles) {
+        result.flags.push('checkFiles');
+      }
+
+      if (flags.flat) {
+        result.flags.push('flat');
+      }
+
+      if (_this3.config.ignoreScripts) {
+        result.flags.push('ignoreScripts');
+      }
+      if (_this3.config.focus) {
+        result.flags.push('focus: ' + _this3.config.focusedWorkspaceName);
+      }
+
+      if (_this3.config.production) {
+        result.flags.push('production');
+      }
+
+      if (_this3.config.plugnplayEnabled) {
+        result.flags.push('plugnplay');
+      }
+
+      const linkedModules = _this3.config.linkedModules;
+
+      if (linkedModules.length) {
+        result.linkedModules = linkedModules.sort((_misc || _load_misc()).sortAlpha);
+      }
+
+      for (var _iterator7 = Object.keys(lockfile), _isArray7 = Array.isArray(_iterator7), _i7 = 0, _iterator7 = _isArray7 ? _iterator7 : _iterator7[Symbol.iterator]();;) {
+        var _ref8;
+
+        if (_isArray7) {
+          if (_i7 >= _iterator7.length) break;
+          _ref8 = _iterator7[_i7++];
+        } else {
+          _i7 = _iterator7.next();
+          if (_i7.done) break;
+          _ref8 = _i7.value;
+        }
+
+        const key = _ref8;
+
+        result.lockfileEntries[key] = lockfile[key].resolved || '';
+      }
+
+      for (var _iterator8 = _this3._getModulesFolders({ workspaceLayout }), _isArray8 = Array.isArray(_iterator8), _i8 = 0, _iterator8 = _isArray8 ? _iterator8 : _iterator8[Symbol.iterator]();;) {
+        var _ref9;
+
+        if (_isArray8) {
+          if (_i8 >= _iterator8.length) break;
+          _ref9 = _iterator8[_i8++];
+        } else {
+          _i8 = _iterator8.next();
+          if (_i8.done) break;
+          _ref9 = _i8.value;
+        }
+
+        const modulesFolder = _ref9;
+
+        if (yield (_fs || _load_fs()).exists(modulesFolder)) {
+          result.modulesFolders.push(path.relative(_this3.config.lockfileFolder, modulesFolder));
+        }
+      }
+
+      if (flags.checkFiles) {
+        const modulesRoot = _this3._getModulesRootFolder();
+
+        result.files = (yield _this3._getIntegrityListing({ workspaceLayout })).map(function (entry) {
+          return path.relative(modulesRoot, entry);
+        }).sort((_misc || _load_misc()).sortAlpha);
+      }
+
+      return result;
+    })();
+  }
+
+  _getIntegrityFile(locationPath) {
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const expectedRaw = yield (_fs || _load_fs()).readFile(locationPath);
+      try {
+        return (0, (_extends2 || _load_extends()).default)({}, INTEGRITY_FILE_DEFAULTS(), JSON.parse(expectedRaw));
+      } catch (e) {
+        // ignore JSON parsing for legacy text integrity files compatibility
+      }
+      return null;
+    })();
+  }
+
+  _compareIntegrityFiles(actual, expected, checkFiles, workspaceLayout) {
+    if (!expected) {
+      return 'EXPECTED_IS_NOT_A_JSON';
+    }
+
+    if (!(0, (_misc || _load_misc()).compareSortedArrays)(actual.linkedModules, expected.linkedModules)) {
+      return 'LINKED_MODULES_DONT_MATCH';
+    }
+
+    if (actual.systemParams !== expected.systemParams) {
+      return 'SYSTEM_PARAMS_DONT_MATCH';
+    }
+
+    let relevantExpectedFlags = expected.flags.slice();
+
+    // If we run "yarn" after "yarn --check-files", we shouldn't fail the less strict validation
+    if (actual.flags.indexOf('checkFiles') === -1) {
+      relevantExpectedFlags = relevantExpectedFlags.filter(flag => flag !== 'checkFiles');
+    }
+
+    if (!(0, (_misc || _load_misc()).compareSortedArrays)(actual.flags, relevantExpectedFlags)) {
+      return 'FLAGS_DONT_MATCH';
+    }
+
+    if (!(0, (_misc || _load_misc()).compareSortedArrays)(actual.topLevelPatterns, expected.topLevelPatterns || [])) {
+      return 'PATTERNS_DONT_MATCH';
+    }
+
+    for (var _iterator9 = Object.keys(actual.lockfileEntries), _isArray9 = Array.isArray(_iterator9), _i9 = 0, _iterator9 = _isArray9 ? _iterator9 : _iterator9[Symbol.iterator]();;) {
+      var _ref10;
+
+      if (_isArray9) {
+        if (_i9 >= _iterator9.length) break;
+        _ref10 = _iterator9[_i9++];
+      } else {
+        _i9 = _iterator9.next();
+        if (_i9.done) break;
+        _ref10 = _i9.value;
+      }
+
+      const key = _ref10;
+
+      if (actual.lockfileEntries[key] !== expected.lockfileEntries[key]) {
+        return 'LOCKFILE_DONT_MATCH';
+      }
+    }
+
+    for (var _iterator10 = Object.keys(expected.lockfileEntries), _isArray10 = Array.isArray(_iterator10), _i10 = 0, _iterator10 = _isArray10 ? _iterator10 : _iterator10[Symbol.iterator]();;) {
+      var _ref11;
+
+      if (_isArray10) {
+        if (_i10 >= _iterator10.length) break;
+        _ref11 = _iterator10[_i10++];
+      } else {
+        _i10 = _iterator10.next();
+        if (_i10.done) break;
+        _ref11 = _i10.value;
+      }
+
+      const key = _ref11;
+
+      if (actual.lockfileEntries[key] !== expected.lockfileEntries[key]) {
+        return 'LOCKFILE_DONT_MATCH';
+      }
+    }
+
+    if (checkFiles) {
+      // Early bailout if we expect more files than what we have
+      if (expected.files.length > actual.files.length) {
+        return 'FILES_MISSING';
+      }
+
+      // Since we know the "files" array is sorted (alphabetically), we can optimize the thing
+      // Instead of storing the files in a Set, we can just iterate both arrays at once. O(n)!
+      for (let u = 0, v = 0; u < expected.files.length; ++u) {
+        // Index that, if reached, means that we won't have enough food to match the remaining expected entries anyway
+        const max = v + (actual.files.length - v) - (expected.files.length - u) + 1;
+
+        // Skip over files that have been added (ie not present in 'expected')
+        while (v < max && actual.files[v] !== expected.files[u]) {
+          v += 1;
+        }
+
+        // If we've reached the index defined above, the file is either missing or we can early exit
+        if (v === max) {
+          return 'FILES_MISSING';
+        }
+      }
+    }
+    return 'OK';
+  }
+
+  check(patterns, lockfile, flags, workspaceLayout) {
+    var _this4 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      // check if patterns exist in lockfile
+      const missingPatterns = patterns.filter(function (p) {
+        return !lockfile[p] && (!workspaceLayout || !workspaceLayout.getManifestByPattern(p));
+      });
+
+      const loc = yield _this4._getIntegrityFileLocation();
+      if (missingPatterns.length || !loc.exists) {
+        return {
+          integrityFileMissing: !loc.exists,
+          missingPatterns
+        };
+      }
+
+      const actual = yield _this4._generateIntegrityFile(lockfile, patterns, flags, workspaceLayout);
+
+      const expected = yield _this4._getIntegrityFile(loc.locationPath);
+      let integrityMatches = _this4._compareIntegrityFiles(actual, expected, flags.checkFiles, workspaceLayout);
+
+      if (integrityMatches === 'OK') {
+        invariant(expected, "The integrity shouldn't pass without integrity file");
+        for (var _iterator11 = expected.modulesFolders, _isArray11 = Array.isArray(_iterator11), _i11 = 0, _iterator11 = _isArray11 ? _iterator11 : _iterator11[Symbol.iterator]();;) {
+          var _ref12;
+
+          if (_isArray11) {
+            if (_i11 >= _iterator11.length) break;
+            _ref12 = _iterator11[_i11++];
+          } else {
+            _i11 = _iterator11.next();
+            if (_i11.done) break;
+            _ref12 = _i11.value;
+          }
+
+          const modulesFolder = _ref12;
+
+          if (!(yield (_fs || _load_fs()).exists(path.join(_this4.config.lockfileFolder, modulesFolder)))) {
+            integrityMatches = 'MODULES_FOLDERS_MISSING';
+          }
+        }
+      }
+
+      return {
+        integrityFileMissing: false,
+        integrityMatches: integrityMatches === 'OK',
+        integrityError: integrityMatches === 'OK' ? undefined : integrityMatches,
+        missingPatterns,
+        hardRefreshRequired: integrityMatches === 'SYSTEM_PARAMS_DONT_MATCH'
+      };
+    })();
+  }
+
+  /**
+   * Get artifacts from integrity file if it exists.
+   */
+  getArtifacts() {
+    var _this5 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const loc = yield _this5._getIntegrityFileLocation();
+      if (!loc.exists) {
+        return null;
+      }
+
+      const expectedRaw = yield (_fs || _load_fs()).readFile(loc.locationPath);
+      let expected;
+      try {
+        expected = JSON.parse(expectedRaw);
+      } catch (e) {
+        // ignore JSON parsing for legacy text integrity files compatibility
+      }
+
+      return expected ? expected.artifacts : null;
+    })();
+  }
+
+  /**
+   * Write the integrity hash of the current install to disk.
+   */
+  save(patterns, lockfile, flags, workspaceLayout, artifacts) {
+    var _this6 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const integrityFile = yield _this6._generateIntegrityFile(lockfile, patterns, flags, workspaceLayout, artifacts);
+
+      const loc = yield _this6._getIntegrityFileLocation();
+      invariant(loc.locationPath, 'expected integrity hash location');
+
+      yield (_fs || _load_fs()).mkdirp(path.dirname(loc.locationPath));
+      yield (_fs || _load_fs()).writeFile(loc.locationPath, JSON.stringify(integrityFile, null, 2));
+    })();
+  }
+
+  removeIntegrityFile() {
+    var _this7 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const loc = yield _this7._getIntegrityFileLocation();
+      if (loc.exists) {
+        yield (_fs || _load_fs()).unlink(loc.locationPath);
+      }
+    })();
+  }
+}
+exports.default = InstallationIntegrityChecker;
+
+/***/ }),
+/* 209 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.testEngine = testEngine;
+exports.checkOne = checkOne;
+exports.check = check;
+exports.shouldCheck = shouldCheck;
+
+var _errors;
+
+function _load_errors() {
+  return _errors = __webpack_require__(6);
+}
+
+var _map;
+
+function _load_map() {
+  return _map = _interopRequireDefault(__webpack_require__(29));
+}
+
+var _misc;
+
+function _load_misc() {
+  return _misc = __webpack_require__(18);
+}
+
+var _yarnVersion;
+
+function _load_yarnVersion() {
+  return _yarnVersion = __webpack_require__(120);
+}
+
+var _semver;
+
+function _load_semver() {
+  return _semver = __webpack_require__(224);
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const semver = __webpack_require__(22);
+
+const VERSIONS = Object.assign({}, process.versions, {
+  yarn: (_yarnVersion || _load_yarnVersion()).version
+});
+
+function isValid(items, actual) {
+  let isNotWhitelist = true;
+  let isBlacklist = false;
+
+  for (var _iterator = items, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+    var _ref;
+
+    if (_isArray) {
+      if (_i >= _iterator.length) break;
+      _ref = _iterator[_i++];
+    } else {
+      _i = _iterator.next();
+      if (_i.done) break;
+      _ref = _i.value;
+    }
+
+    const item = _ref;
+
+    // blacklist
+    if (item[0] === '!') {
+      isBlacklist = true;
+
+      if (actual === item.slice(1)) {
+        return false;
+      }
+      // whitelist
+    } else {
+      isNotWhitelist = false;
+
+      if (item === actual) {
+        return true;
+      }
+    }
+  }
+
+  // npm allows blacklists and whitelists to be mixed. Blacklists with
+  // whitelisted items should be treated as whitelists.
+  return isBlacklist && isNotWhitelist;
+}
+
+const aliases = (0, (_map || _load_map()).default)({
+  iojs: 'node' // we should probably prompt these libraries to fix this
+});
+
+const ignore = ['npm', // we'll never satisfy this for obvious reasons
+'teleport', // a module bundler used by some modules
+'rhino', // once a target for older modules
+'cordovaDependencies', // http://bit.ly/2tkUePg
+'parcel'];
+
+function testEngine(name, range, versions, looseSemver) {
+  const actual = versions[name];
+  if (!actual) {
+    return false;
+  }
+
+  if (!semver.valid(actual, looseSemver)) {
+    return false;
+  }
+
+  if (semver.satisfies(actual, range, looseSemver)) {
+    return true;
+  }
+
+  if (name === 'yarn' && (0, (_semver || _load_semver()).satisfiesWithPrereleases)(actual, range, looseSemver)) {
+    return true;
+  }
+
+  if (name === 'node' && semver.gt(actual, '1.0.0', looseSemver)) {
+    // WARNING: this is a massive hack and is super gross but necessary for compatibility
+    // some modules have the `engines.node` field set to a caret version below semver major v1
+    // eg. ^0.12.0. this is problematic as we enforce engines checks and node is now on version >=1
+    // to allow this pattern we transform the node version to fake ones in the minor range 10-13
+    const major = semver.major(actual, looseSemver);
+    const fakes = [`0.10.${major}`, `0.11.${major}`, `0.12.${major}`, `0.13.${major}`];
+    for (var _iterator2 = fakes, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+      var _ref2;
+
+      if (_isArray2) {
+        if (_i2 >= _iterator2.length) break;
+        _ref2 = _iterator2[_i2++];
+      } else {
+        _i2 = _iterator2.next();
+        if (_i2.done) break;
+        _ref2 = _i2.value;
+      }
+
+      const actualFake = _ref2;
+
+      if (semver.satisfies(actualFake, range, looseSemver)) {
+        return true;
+      }
+    }
+  }
+
+  // incompatible version
+  return false;
+}
+
+function isValidArch(archs) {
+  return isValid(archs, process.arch);
+}
+
+function isValidPlatform(platforms) {
+  return isValid(platforms, process.platform);
+}
+
+function checkOne(info, config, ignoreEngines) {
+  let didIgnore = false;
+  let didError = false;
+  const reporter = config.reporter;
+  const human = `${info.name}@${info.version}`;
+
+  const pushError = msg => {
+    const ref = info._reference;
+
+    if (ref && ref.optional) {
+      ref.ignore = true;
+      ref.incompatible = true;
+
+      reporter.info(`${human}: ${msg}`);
+      if (!didIgnore) {
+        reporter.info(reporter.lang('optionalCompatibilityExcluded', human));
+        didIgnore = true;
+      }
+    } else {
+      reporter.error(`${human}: ${msg}`);
+      didError = true;
+    }
+  };
+
+  const os = info.os,
+        cpu = info.cpu,
+        engines = info.engines;
+
+
+  if (shouldCheckPlatform(os, config.ignorePlatform) && !isValidPlatform(os)) {
+    pushError(reporter.lang('incompatibleOS', process.platform));
+  }
+
+  if (shouldCheckCpu(cpu, config.ignorePlatform) && !isValidArch(cpu)) {
+    pushError(reporter.lang('incompatibleCPU', process.arch));
+  }
+
+  if (shouldCheckEngines(engines, ignoreEngines)) {
+    for (var _iterator3 = (0, (_misc || _load_misc()).entries)(info.engines), _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
+      var _ref3;
+
+      if (_isArray3) {
+        if (_i3 >= _iterator3.length) break;
+        _ref3 = _iterator3[_i3++];
+      } else {
+        _i3 = _iterator3.next();
+        if (_i3.done) break;
+        _ref3 = _i3.value;
+      }
+
+      const entry = _ref3;
+
+      let name = entry[0];
+      const range = entry[1];
+
+      if (aliases[name]) {
+        name = aliases[name];
+      }
+
+      if (VERSIONS[name]) {
+        if (!testEngine(name, range, VERSIONS, config.looseSemver)) {
+          pushError(reporter.lang('incompatibleEngine', name, range, VERSIONS[name]));
+        }
+      } else if (ignore.indexOf(name) < 0) {
+        reporter.warn(`${human}: ${reporter.lang('invalidEngine', name)}`);
+      }
+    }
+  }
+
+  if (didError) {
+    throw new (_errors || _load_errors()).MessageError(reporter.lang('foundIncompatible'));
+  }
+}
+
+function check(infos, config, ignoreEngines) {
+  for (var _iterator4 = infos, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
+    var _ref4;
+
+    if (_isArray4) {
+      if (_i4 >= _iterator4.length) break;
+      _ref4 = _iterator4[_i4++];
+    } else {
+      _i4 = _iterator4.next();
+      if (_i4.done) break;
+      _ref4 = _i4.value;
+    }
+
+    const info = _ref4;
+
+    checkOne(info, config, ignoreEngines);
+  }
+}
+
+function shouldCheckCpu(cpu, ignorePlatform) {
+  return !ignorePlatform && Array.isArray(cpu) && cpu.length > 0;
+}
+
+function shouldCheckPlatform(os, ignorePlatform) {
+  return !ignorePlatform && Array.isArray(os) && os.length > 0;
+}
+
+function shouldCheckEngines(engines, ignoreEngines) {
+  return !ignoreEngines && typeof engines === 'object';
+}
+
+function shouldCheck(manifest, options) {
+  return shouldCheckCpu(manifest.cpu, options.ignorePlatform) || shouldCheckPlatform(manifest.os, options.ignorePlatform) || shouldCheckEngines(manifest.engines, options.ignoreEngines);
+}
+
+/***/ }),
+/* 210 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.fetchOneRemote = undefined;
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+let fetchCache = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (dest, fetcher, config, remote) {
+    // $FlowFixMe: This error doesn't make sense
+    var _ref2 = yield config.readPackageMetadata(dest);
+
+    const hash = _ref2.hash,
+          pkg = _ref2.package,
+          cacheRemote = _ref2.remote;
+
+
+    const cacheIntegrity = cacheRemote.cacheIntegrity || cacheRemote.integrity;
+    const cacheHash = cacheRemote.hash;
+
+    if (remote.integrity) {
+      if (!cacheIntegrity || !ssri.parse(cacheIntegrity).match(remote.integrity)) {
+        throw new (_errors || _load_errors()).SecurityError(config.reporter.lang('fetchBadIntegrityCache', pkg.name, cacheIntegrity, remote.integrity));
+      }
+    }
+
+    if (remote.hash) {
+      if (!cacheHash || cacheHash !== remote.hash) {
+        throw new (_errors || _load_errors()).SecurityError(config.reporter.lang('fetchBadHashCache', pkg.name, cacheHash, remote.hash));
+      }
+    }
+
+    yield fetcher.setupMirrorFromCache();
+    return {
+      package: pkg,
+      hash,
+      dest,
+      cached: true
+    };
+  });
+
+  return function fetchCache(_x, _x2, _x3, _x4) {
+    return _ref.apply(this, arguments);
+  };
+})();
+
+let fetchOneRemote = exports.fetchOneRemote = (() => {
+  var _ref3 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (remote, name, version, dest, config) {
+    // Mock metadata for symlinked dependencies
+    if (remote.type === 'link') {
+      const mockPkg = { _uid: '', name: '', version: '0.0.0' };
+      return Promise.resolve({ resolved: null, hash: '', dest, package: mockPkg, cached: false });
+    }
+
+    const Fetcher = (_index || _load_index())[remote.type];
+    if (!Fetcher) {
+      throw new (_errors || _load_errors()).MessageError(config.reporter.lang('unknownFetcherFor', remote.type));
+    }
+
+    const fetcher = new Fetcher(dest, remote, config);
+    if (yield config.isValidModuleDest(dest)) {
+      return fetchCache(dest, fetcher, config, remote);
+    }
+
+    // remove as the module may be invalid
+    yield (_fs || _load_fs()).unlink(dest);
+
+    try {
+      return yield fetcher.fetch({
+        name,
+        version
+      });
+    } catch (err) {
+      try {
+        yield (_fs || _load_fs()).unlink(dest);
+      } catch (err2) {
+        // what do?
+      }
+      throw err;
+    }
+  });
+
+  return function fetchOneRemote(_x5, _x6, _x7, _x8, _x9) {
+    return _ref3.apply(this, arguments);
+  };
+})();
+
+let maybeFetchOne = (() => {
+  var _ref4 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (ref, config) {
+    try {
+      return yield fetchOne(ref, config);
+    } catch (err) {
+      if (ref.optional) {
+        config.reporter.error(err.message);
+        return null;
+      } else {
+        throw err;
+      }
+    }
+  });
+
+  return function maybeFetchOne(_x10, _x11) {
+    return _ref4.apply(this, arguments);
+  };
+})();
+
+exports.fetch = fetch;
+
+var _errors;
+
+function _load_errors() {
+  return _errors = __webpack_require__(6);
+}
+
+var _index;
+
+function _load_index() {
+  return _index = _interopRequireWildcard(__webpack_require__(552));
+}
+
+var _fs;
+
+function _load_fs() {
+  return _fs = _interopRequireWildcard(__webpack_require__(4));
+}
+
+var _promise;
+
+function _load_promise() {
+  return _promise = _interopRequireWildcard(__webpack_require__(50));
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const ssri = __webpack_require__(65);
+
+function fetchOne(ref, config) {
+  const dest = config.generateModuleCachePath(ref);
+
+  return fetchOneRemote(ref.remote, ref.name, ref.version, dest, config);
+}
+
+function fetch(pkgs, config) {
+  const pkgsPerDest = new Map();
+  pkgs = pkgs.filter(pkg => {
+    const ref = pkg._reference;
+    if (!ref) {
+      return false;
+    }
+    const dest = config.generateModuleCachePath(ref);
+    const otherPkg = pkgsPerDest.get(dest);
+    if (otherPkg) {
+      config.reporter.warn(config.reporter.lang('multiplePackagesCantUnpackInSameDestination', ref.patterns, dest, otherPkg.patterns));
+      return false;
+    }
+    pkgsPerDest.set(dest, ref);
+    return true;
+  });
+  const tick = config.reporter.progress(pkgs.length);
+
+  return (_promise || _load_promise()).queue(pkgs, (() => {
+    var _ref5 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (pkg) {
+      const ref = pkg._reference;
+      if (!ref) {
+        return pkg;
+      }
+
+      const res = yield maybeFetchOne(ref, config);
+      let newPkg;
+
+      if (res) {
+        newPkg = res.package;
+
+        // update with new remote
+        // but only if there was a hash previously as the tarball fetcher does not provide a hash.
+        if (ref.remote.hash) {
+          // if the checksum was updated, also update resolved and cache
+          if (ref.remote.hash !== res.hash && config.updateChecksums) {
+            const oldHash = ref.remote.hash;
+            if (ref.remote.resolved) {
+              ref.remote.resolved = ref.remote.resolved.replace(oldHash, res.hash);
+            }
+            ref.config.cache = Object.keys(ref.config.cache).reduce(function (cache, entry) {
+              const entryWithNewHash = entry.replace(oldHash, res.hash);
+              cache[entryWithNewHash] = ref.config.cache[entry];
+              return cache;
+            }, {});
+          }
+          ref.remote.hash = res.hash || ref.remote.hash;
+        }
+      }
+
+      if (tick) {
+        tick();
+      }
+
+      if (newPkg) {
+        newPkg._reference = ref;
+        newPkg._remote = ref.remote;
+        newPkg.name = pkg.name;
+        newPkg.fresh = pkg.fresh;
+        return newPkg;
+      }
+
+      return pkg;
+    });
+
+    return function (_x12) {
+      return _ref5.apply(this, arguments);
+    };
+  })(), config.networkConcurrency);
+}
+
+/***/ }),
+/* 211 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.linkBin = undefined;
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+let linkBin = exports.linkBin = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (src, dest) {
+    if (process.platform === 'win32') {
+      const unlockMutex = yield (0, (_mutex || _load_mutex()).default)(src);
+      try {
+        yield cmdShim(src, dest, { createPwshFile: false });
+      } finally {
+        unlockMutex();
+      }
+    } else {
+      yield (_fs || _load_fs()).mkdirp(path.dirname(dest));
+      yield (_fs || _load_fs()).symlink(src, dest);
+      yield (_fs || _load_fs()).chmod(dest, '755');
+    }
+  });
+
+  return function linkBin(_x, _x2) {
+    return _ref.apply(this, arguments);
+  };
+})();
+
+var _packageHoister;
+
+function _load_packageHoister() {
+  return _packageHoister = _interopRequireDefault(__webpack_require__(556));
+}
+
+var _constants;
+
+function _load_constants() {
+  return _constants = _interopRequireWildcard(__webpack_require__(8));
+}
+
+var _promise;
+
+function _load_promise() {
+  return _promise = _interopRequireWildcard(__webpack_require__(50));
+}
+
+var _normalizePattern2;
+
+function _load_normalizePattern() {
+  return _normalizePattern2 = __webpack_require__(37);
+}
+
+var _misc;
+
+function _load_misc() {
+  return _misc = __webpack_require__(18);
+}
+
+var _fs;
+
+function _load_fs() {
+  return _fs = _interopRequireWildcard(__webpack_require__(4));
+}
+
+var _mutex;
+
+function _load_mutex() {
+  return _mutex = _interopRequireDefault(__webpack_require__(375));
+}
+
+var _semver;
+
+function _load_semver() {
+  return _semver = __webpack_require__(224);
+}
+
+var _workspaceLayout;
+
+function _load_workspaceLayout() {
+  return _workspaceLayout = _interopRequireDefault(__webpack_require__(90));
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const invariant = __webpack_require__(9);
+
+const cmdShim = __webpack_require__(201);
+const path = __webpack_require__(0);
+const semver = __webpack_require__(22);
+// Concurrency for creating bin links disabled because of the issue #1961
+const linkBinConcurrency = 1;
+
+class PackageLinker {
+  constructor(config, resolver) {
+    this.resolver = resolver;
+    this.reporter = config.reporter;
+    this.config = config;
+    this.artifacts = {};
+    this.topLevelBinLinking = true;
+    this.unplugged = [];
+  }
+
+  setArtifacts(artifacts) {
+    this.artifacts = artifacts;
+  }
+
+  setTopLevelBinLinking(topLevelBinLinking) {
+    this.topLevelBinLinking = topLevelBinLinking;
+  }
+
+  linkSelfDependencies(pkg, pkgLoc, targetBinLoc, override = false) {
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      targetBinLoc = path.join(targetBinLoc, '.bin');
+      yield (_fs || _load_fs()).mkdirp(targetBinLoc);
+      targetBinLoc = yield (_fs || _load_fs()).realpath(targetBinLoc);
+      pkgLoc = yield (_fs || _load_fs()).realpath(pkgLoc);
+      for (var _iterator = (0, (_misc || _load_misc()).entries)(pkg.bin), _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+        var _ref3;
+
+        if (_isArray) {
+          if (_i >= _iterator.length) break;
+          _ref3 = _iterator[_i++];
+        } else {
+          _i = _iterator.next();
+          if (_i.done) break;
+          _ref3 = _i.value;
+        }
+
+        const _ref2 = _ref3;
+        const scriptName = _ref2[0];
+        const scriptCmd = _ref2[1];
+
+        const dest = path.join(targetBinLoc, scriptName);
+        const src = path.join(pkgLoc, scriptCmd);
+        if (!(yield (_fs || _load_fs()).exists(src))) {
+          if (!override) {
+            // TODO maybe throw an error
+            continue;
+          }
+        }
+        yield linkBin(src, dest);
+      }
+    })();
+  }
+
+  linkBinDependencies(pkg, dir) {
+    var _this = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const deps = [];
+
+      const ref = pkg._reference;
+      invariant(ref, 'Package reference is missing');
+
+      const remote = pkg._remote;
+      invariant(remote, 'Package remote is missing');
+
+      // link up `bin scripts` in `dependencies`
+      for (var _iterator2 = ref.dependencies, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+        var _ref4;
+
+        if (_isArray2) {
+          if (_i2 >= _iterator2.length) break;
+          _ref4 = _iterator2[_i2++];
+        } else {
+          _i2 = _iterator2.next();
+          if (_i2.done) break;
+          _ref4 = _i2.value;
+        }
+
+        const pattern = _ref4;
+
+        const dep = _this.resolver.getStrictResolvedPattern(pattern);
+        if (
+        // Missing locations means not installed inside node_modules
+        dep._reference && dep._reference.locations.length && dep.bin && Object.keys(dep.bin).length) {
+          const loc = yield _this.findNearestInstalledVersionOfPackage(dep, dir);
+          deps.push({ dep, loc });
+        }
+      }
+
+      // link up the `bin` scripts in bundled dependencies
+      if (pkg.bundleDependencies) {
+        for (var _iterator3 = pkg.bundleDependencies, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
+          var _ref5;
+
+          if (_isArray3) {
+            if (_i3 >= _iterator3.length) break;
+            _ref5 = _iterator3[_i3++];
+          } else {
+            _i3 = _iterator3.next();
+            if (_i3.done) break;
+            _ref5 = _i3.value;
+          }
+
+          const depName = _ref5;
+
+          const locs = ref.locations.map(function (loc) {
+            return path.join(loc, _this.config.getFolder(pkg), depName);
+          });
+          try {
+            const dep = yield _this.config.readManifest(locs[0], remote.registry); //all of them should be the same
+
+            if (dep.bin && Object.keys(dep.bin).length) {
+              deps.push(...locs.map(function (loc) {
+                return { dep, loc };
+              }));
+            }
+          } catch (ex) {
+            if (ex.code !== 'ENOENT') {
+              throw ex;
+            }
+            // intentionally ignoring ENOENT error.
+            // bundledDependency either does not exist or does not contain a package.json
+          }
+        }
+      }
+
+      // no deps to link
+      if (!deps.length) {
+        return;
+      }
+
+      // write the executables
+      for (var _iterator4 = deps, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
+        var _ref7;
+
+        if (_isArray4) {
+          if (_i4 >= _iterator4.length) break;
+          _ref7 = _iterator4[_i4++];
+        } else {
+          _i4 = _iterator4.next();
+          if (_i4.done) break;
+          _ref7 = _i4.value;
+        }
+
+        const _ref6 = _ref7;
+        const dep = _ref6.dep,
+              loc = _ref6.loc;
+
+        if (dep._reference && dep._reference.locations.length) {
+          invariant(!dep._reference.isPlugnplay, "Plug'n'play packages should not be referenced here");
+          yield _this.linkSelfDependencies(dep, loc, dir);
+        }
+      }
+    })();
+  }
+
+  //find the installation location of ref that would be used in binLoc based on node module resolution
+  findNearestInstalledVersionOfPackage(pkg, binLoc) {
+    var _this2 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const ref = pkg._reference;
+      invariant(ref, 'expected pkg reference for ' + pkg.name);
+      const moduleFolder = _this2.config.getFolder(pkg);
+      yield (_fs || _load_fs()).mkdirp(binLoc);
+      const realBinLoc = yield (_fs || _load_fs()).realpath(binLoc);
+
+      const allLocations = [...ref.locations];
+      const realLocations = yield Promise.all(ref.locations.map(function (loc) {
+        return (_fs || _load_fs()).realpath(loc);
+      }));
+      realLocations.forEach(function (loc) {
+        return allLocations.indexOf(loc) !== -1 || allLocations.push(loc);
+      });
+
+      const locationBinLocPairs = allLocations.map(function (loc) {
+        return [loc, binLoc];
+      });
+      if (binLoc !== realBinLoc) {
+        locationBinLocPairs.push(...allLocations.map(function (loc) {
+          return [loc, realBinLoc];
+        }));
+      }
+
+      const distancePairs = locationBinLocPairs.map(function ([loc, curBinLoc]) {
+        let distance = 0;
+        let curLoc = curBinLoc;
+        let notFound = false;
+
+        while (path.join(curLoc, ref.name) !== loc && path.join(curLoc, moduleFolder, ref.name) !== loc) {
+          const next = path.dirname(curLoc);
+          if (curLoc === next) {
+            notFound = true;
+            break;
+          }
+
+          distance++;
+          curLoc = next;
+        }
+        return notFound ? null : [loc, distance];
+      });
+
+      //remove items where path was not found
+      const filteredDistancePairs = distancePairs.filter(function (d) {
+        return d;
+      });
+      filteredDistancePairs;
+
+      invariant(filteredDistancePairs.length > 0, `could not find a copy of ${pkg.name} to link in ${binLoc}`);
+
+      //get smallest distance from package location
+      const minItem = filteredDistancePairs.reduce(function (min, cur) {
+        return cur[1] < min[1] ? cur : min;
+      });
+
+      invariant(minItem[1] >= 0, 'could not find a target for bin dir of ' + minItem.toString());
+      return minItem[0];
+    })();
+  }
+
+  getFlatHoistedTree(patterns, workspaceLayout, { ignoreOptional } = {}) {
+    const hoister = new (_packageHoister || _load_packageHoister()).default(this.config, this.resolver, { ignoreOptional, workspaceLayout });
+    hoister.seed(patterns);
+    if (this.config.focus) {
+      hoister.markShallowWorkspaceEntries();
+    }
+    return hoister.init();
+  }
+
+  copyModules(patterns, workspaceLayout, { linkDuplicates, ignoreOptional } = {}) {
+    var _this3 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      let flatTree = _this3.getFlatHoistedTree(patterns, workspaceLayout, { ignoreOptional });
+      // sorted tree makes file creation and copying not to interfere with each other
+      flatTree = flatTree.sort(function (dep1, dep2) {
+        return dep1[0].localeCompare(dep2[0]);
+      });
+
+      // list of artifacts in modules to remove from extraneous removal
+      const artifactFiles = [];
+
+      const copyQueue = new Map();
+      const hardlinkQueue = new Map();
+      const hardlinksEnabled = linkDuplicates && (yield (_fs || _load_fs()).hardlinksWork(_this3.config.cwd));
+
+      const copiedSrcs = new Map();
+      const symlinkPaths = new Map();
+      for (var _iterator5 = flatTree, _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
+        var _ref9;
+
+        if (_isArray5) {
+          if (_i5 >= _iterator5.length) break;
+          _ref9 = _iterator5[_i5++];
+        } else {
+          _i5 = _iterator5.next();
+          if (_i5.done) break;
+          _ref9 = _i5.value;
+        }
+
+        const _ref8 = _ref9;
+        const folder = _ref8[0];
+        var _ref8$ = _ref8[1];
+        const pkg = _ref8$.pkg;
+        const loc = _ref8$.loc;
+        const isShallow = _ref8$.isShallow;
+
+        const remote = pkg._remote || { type: '' };
+        const ref = pkg._reference;
+        let dest = folder;
+        invariant(ref, 'expected package reference');
+
+        let src = loc;
+        let type = '';
+        if (remote.type === 'link') {
+          // replace package source from incorrect cache location (workspaces and link: are not cached)
+          // with a symlink source
+          src = remote.reference;
+          type = 'symlink';
+        } else if (workspaceLayout && remote.type === 'workspace' && !isShallow) {
+          src = remote.reference;
+          type = 'symlink';
+          if (dest.indexOf(workspaceLayout.virtualManifestName) !== -1) {
+            // we don't need to install virtual manifest
+            continue;
+          }
+          // to get real path for non hoisted dependencies
+          symlinkPaths.set(dest, src);
+        } else {
+          // backwards compatibility: get build artifacts from metadata
+          // does not apply to symlinked dependencies
+          const metadata = yield _this3.config.readPackageMetadata(src);
+          for (var _iterator15 = metadata.artifacts, _isArray15 = Array.isArray(_iterator15), _i15 = 0, _iterator15 = _isArray15 ? _iterator15 : _iterator15[Symbol.iterator]();;) {
+            var _ref23;
+
+            if (_isArray15) {
+              if (_i15 >= _iterator15.length) break;
+              _ref23 = _iterator15[_i15++];
+            } else {
+              _i15 = _iterator15.next();
+              if (_i15.done) break;
+              _ref23 = _i15.value;
+            }
+
+            const file = _ref23;
+
+            artifactFiles.push(path.join(dest, file));
+          }
+        }
+
+        for (var _iterator16 = symlinkPaths.entries(), _isArray16 = Array.isArray(_iterator16), _i16 = 0, _iterator16 = _isArray16 ? _iterator16 : _iterator16[Symbol.iterator]();;) {
+          var _ref25;
+
+          if (_isArray16) {
+            if (_i16 >= _iterator16.length) break;
+            _ref25 = _iterator16[_i16++];
+          } else {
+            _i16 = _iterator16.next();
+            if (_i16.done) break;
+            _ref25 = _i16.value;
+          }
+
+          const _ref24 = _ref25;
+          const symlink = _ref24[0];
+          const realpath = _ref24[1];
+
+          if (dest.indexOf(symlink + path.sep) === 0) {
+            // after hoisting we end up with this structure
+            // root/node_modules/workspace-package(symlink)/node_modules/package-a
+            // fs.copy operations can't copy files through a symlink, so all the paths under workspace-package
+            // need to be replaced with a real path, except for the symlink root/node_modules/workspace-package
+            dest = dest.replace(symlink, realpath);
+          }
+        }
+
+        if (_this3.config.plugnplayEnabled) {
+          ref.isPlugnplay = true;
+          if (yield _this3._isUnplugged(pkg, ref)) {
+            dest = _this3.config.generatePackageUnpluggedPath(ref);
+
+            // We don't skip the copy if the unplugged package isn't materialized yet
+            if (yield (_fs || _load_fs()).exists(dest)) {
+              ref.addLocation(dest);
+              continue;
+            }
+          } else {
+            ref.addLocation(src);
+            continue;
+          }
+        }
+
+        ref.addLocation(dest);
+
+        const integrityArtifacts = _this3.artifacts[`${pkg.name}@${pkg.version}`];
+        if (integrityArtifacts) {
+          for (var _iterator17 = integrityArtifacts, _isArray17 = Array.isArray(_iterator17), _i17 = 0, _iterator17 = _isArray17 ? _iterator17 : _iterator17[Symbol.iterator]();;) {
+            var _ref26;
+
+            if (_isArray17) {
+              if (_i17 >= _iterator17.length) break;
+              _ref26 = _iterator17[_i17++];
+            } else {
+              _i17 = _iterator17.next();
+              if (_i17.done) break;
+              _ref26 = _i17.value;
+            }
+
+            const file = _ref26;
+
+            artifactFiles.push(path.join(dest, file));
+          }
+        }
+
+        const copiedDest = copiedSrcs.get(src);
+        if (!copiedDest) {
+          // no point to hardlink to a symlink
+          if (hardlinksEnabled && type !== 'symlink') {
+            copiedSrcs.set(src, dest);
+          }
+          copyQueue.set(dest, {
+            src,
+            dest,
+            type,
+            onFresh() {
+              if (ref) {
+                ref.setFresh(true);
+              }
+            }
+          });
+        } else {
+          hardlinkQueue.set(dest, {
+            src: copiedDest,
+            dest,
+            onFresh() {
+              if (ref) {
+                ref.setFresh(true);
+              }
+            }
+          });
+        }
+      }
+
+      const possibleExtraneous = new Set();
+      const scopedPaths = new Set();
+
+      const findExtraneousFiles = (() => {
+        var _ref10 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (basePath) {
+          for (var _iterator6 = _this3.config.registryFolders, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) {
+            var _ref11;
+
+            if (_isArray6) {
+              if (_i6 >= _iterator6.length) break;
+              _ref11 = _iterator6[_i6++];
+            } else {
+              _i6 = _iterator6.next();
+              if (_i6.done) break;
+              _ref11 = _i6.value;
+            }
+
+            const folder = _ref11;
+
+            const loc = path.resolve(basePath, folder);
+
+            if (yield (_fs || _load_fs()).exists(loc)) {
+              const files = yield (_fs || _load_fs()).readdir(loc);
+
+              for (var _iterator7 = files, _isArray7 = Array.isArray(_iterator7), _i7 = 0, _iterator7 = _isArray7 ? _iterator7 : _iterator7[Symbol.iterator]();;) {
+                var _ref12;
+
+                if (_isArray7) {
+                  if (_i7 >= _iterator7.length) break;
+                  _ref12 = _iterator7[_i7++];
+                } else {
+                  _i7 = _iterator7.next();
+                  if (_i7.done) break;
+                  _ref12 = _i7.value;
+                }
+
+                const file = _ref12;
+
+                const filepath = path.join(loc, file);
+
+                // it's a scope, not a package
+                if (file[0] === '@') {
+                  scopedPaths.add(filepath);
+
+                  for (var _iterator8 = yield (_fs || _load_fs()).readdir(filepath), _isArray8 = Array.isArray(_iterator8), _i8 = 0, _iterator8 = _isArray8 ? _iterator8 : _iterator8[Symbol.iterator]();;) {
+                    var _ref13;
+
+                    if (_isArray8) {
+                      if (_i8 >= _iterator8.length) break;
+                      _ref13 = _iterator8[_i8++];
+                    } else {
+                      _i8 = _iterator8.next();
+                      if (_i8.done) break;
+                      _ref13 = _i8.value;
+                    }
+
+                    const subfile = _ref13;
+
+                    possibleExtraneous.add(path.join(filepath, subfile));
+                  }
+                } else {
+                  possibleExtraneous.add(filepath);
+                }
+              }
+            }
+          }
+        });
+
+        return function findExtraneousFiles(_x3) {
+          return _ref10.apply(this, arguments);
+        };
+      })();
+
+      yield findExtraneousFiles(_this3.config.lockfileFolder);
+      if (workspaceLayout) {
+        for (var _iterator9 = Object.keys(workspaceLayout.workspaces), _isArray9 = Array.isArray(_iterator9), _i9 = 0, _iterator9 = _isArray9 ? _iterator9 : _iterator9[Symbol.iterator]();;) {
+          var _ref14;
+
+          if (_isArray9) {
+            if (_i9 >= _iterator9.length) break;
+            _ref14 = _iterator9[_i9++];
+          } else {
+            _i9 = _iterator9.next();
+            if (_i9.done) break;
+            _ref14 = _i9.value;
+          }
+
+          const workspaceName = _ref14;
+
+          yield findExtraneousFiles(workspaceLayout.workspaces[workspaceName].loc);
+        }
+      }
+
+      // If an Extraneous is an entry created via "yarn link", we prevent it from being overwritten.
+      // Unfortunately, the only way we can know if they have been created this way is to check if they
+      // are symlinks - problem is that it then conflicts with the newly introduced "link:" protocol,
+      // which also creates symlinks :( a somewhat weak fix is to check if the symlink target is registered
+      // inside the linkFolder, in which case we assume it has been created via "yarn link". Otherwise, we
+      // assume it's a link:-managed dependency, and overwrite it as usual.
+      const linkTargets = new Map();
+
+      let linkedModules;
+      try {
+        linkedModules = yield (_fs || _load_fs()).readdir(_this3.config.linkFolder);
+      } catch (err) {
+        if (err.code === 'ENOENT') {
+          linkedModules = [];
+        } else {
+          throw err;
+        }
+      }
+
+      // TODO: Consolidate this logic with `this.config.linkedModules` logic
+      for (var _iterator10 = linkedModules, _isArray10 = Array.isArray(_iterator10), _i10 = 0, _iterator10 = _isArray10 ? _iterator10 : _iterator10[Symbol.iterator]();;) {
+        var _ref15;
+
+        if (_isArray10) {
+          if (_i10 >= _iterator10.length) break;
+          _ref15 = _iterator10[_i10++];
+        } else {
+          _i10 = _iterator10.next();
+          if (_i10.done) break;
+          _ref15 = _i10.value;
+        }
+
+        const entry = _ref15;
+
+        const entryPath = path.join(_this3.config.linkFolder, entry);
+        const stat = yield (_fs || _load_fs()).lstat(entryPath);
+
+        if (stat.isSymbolicLink()) {
+          try {
+            const entryTarget = yield (_fs || _load_fs()).realpath(entryPath);
+            linkTargets.set(entry, entryTarget);
+          } catch (err) {
+            _this3.reporter.warn(_this3.reporter.lang('linkTargetMissing', entry));
+            yield (_fs || _load_fs()).unlink(entryPath);
+          }
+        } else if (stat.isDirectory() && entry[0] === '@') {
+          // if the entry is directory beginning with '@', then we're dealing with a package scope, which
+          // means we must iterate inside to retrieve the package names it contains
+          const scopeName = entry;
+
+          for (var _iterator18 = yield (_fs || _load_fs()).readdir(entryPath), _isArray18 = Array.isArray(_iterator18), _i18 = 0, _iterator18 = _isArray18 ? _iterator18 : _iterator18[Symbol.iterator]();;) {
+            var _ref27;
+
+            if (_isArray18) {
+              if (_i18 >= _iterator18.length) break;
+              _ref27 = _iterator18[_i18++];
+            } else {
+              _i18 = _iterator18.next();
+              if (_i18.done) break;
+              _ref27 = _i18.value;
+            }
+
+            const entry2 = _ref27;
+
+            const entryPath2 = path.join(entryPath, entry2);
+            const stat2 = yield (_fs || _load_fs()).lstat(entryPath2);
+
+            if (stat2.isSymbolicLink()) {
+              const packageName = `${scopeName}/${entry2}`;
+              try {
+                const entryTarget = yield (_fs || _load_fs()).realpath(entryPath2);
+                linkTargets.set(packageName, entryTarget);
+              } catch (err) {
+                _this3.reporter.warn(_this3.reporter.lang('linkTargetMissing', packageName));
+                yield (_fs || _load_fs()).unlink(entryPath2);
+              }
+            }
+          }
+        }
+      }
+
+      for (var _iterator11 = possibleExtraneous, _isArray11 = Array.isArray(_iterator11), _i11 = 0, _iterator11 = _isArray11 ? _iterator11 : _iterator11[Symbol.iterator]();;) {
+        var _ref16;
+
+        if (_isArray11) {
+          if (_i11 >= _iterator11.length) break;
+          _ref16 = _iterator11[_i11++];
+        } else {
+          _i11 = _iterator11.next();
+          if (_i11.done) break;
+          _ref16 = _i11.value;
+        }
+
+        const loc = _ref16;
+
+        let packageName = path.basename(loc);
+        const scopeName = path.basename(path.dirname(loc));
+
+        if (scopeName[0] === `@`) {
+          packageName = `${scopeName}/${packageName}`;
+        }
+
+        if ((yield (_fs || _load_fs()).lstat(loc)).isSymbolicLink() && linkTargets.has(packageName) && linkTargets.get(packageName) === (yield (_fs || _load_fs()).realpath(loc))) {
+          possibleExtraneous.delete(loc);
+          copyQueue.delete(loc);
+        }
+      }
+
+      //
+      let tick;
+      yield (_fs || _load_fs()).copyBulk(Array.from(copyQueue.values()), _this3.reporter, {
+        possibleExtraneous,
+        artifactFiles,
+
+        ignoreBasenames: [(_constants || _load_constants()).METADATA_FILENAME, (_constants || _load_constants()).TARBALL_FILENAME, '.bin'],
+
+        onStart: function onStart(num) {
+          tick = _this3.reporter.progress(num);
+        },
+
+        onProgress(src) {
+          if (tick) {
+            tick();
+          }
+        }
+      });
+
+      yield (_fs || _load_fs()).hardlinkBulk(Array.from(hardlinkQueue.values()), _this3.reporter, {
+        possibleExtraneous,
+        artifactFiles,
+
+        onStart: function onStart(num) {
+          tick = _this3.reporter.progress(num);
+        },
+
+        onProgress(src) {
+          if (tick) {
+            tick();
+          }
+        }
+      });
+
+      // remove all extraneous files that weren't in the tree
+      for (var _iterator12 = possibleExtraneous, _isArray12 = Array.isArray(_iterator12), _i12 = 0, _iterator12 = _isArray12 ? _iterator12 : _iterator12[Symbol.iterator]();;) {
+        var _ref17;
+
+        if (_isArray12) {
+          if (_i12 >= _iterator12.length) break;
+          _ref17 = _iterator12[_i12++];
+        } else {
+          _i12 = _iterator12.next();
+          if (_i12.done) break;
+          _ref17 = _i12.value;
+        }
+
+        const loc = _ref17;
+
+        _this3.reporter.verbose(_this3.reporter.lang('verboseFileRemoveExtraneous', loc));
+        yield (_fs || _load_fs()).unlink(loc);
+      }
+
+      // remove any empty scoped directories
+      for (var _iterator13 = scopedPaths, _isArray13 = Array.isArray(_iterator13), _i13 = 0, _iterator13 = _isArray13 ? _iterator13 : _iterator13[Symbol.iterator]();;) {
+        var _ref18;
+
+        if (_isArray13) {
+          if (_i13 >= _iterator13.length) break;
+          _ref18 = _iterator13[_i13++];
+        } else {
+          _i13 = _iterator13.next();
+          if (_i13.done) break;
+          _ref18 = _i13.value;
+        }
+
+        const scopedPath = _ref18;
+
+        const files = yield (_fs || _load_fs()).readdir(scopedPath);
+        if (files.length === 0) {
+          yield (_fs || _load_fs()).unlink(scopedPath);
+        }
+      }
+
+      // create binary links
+      if (_this3.config.getOption('bin-links') && _this3.config.binLinks !== false) {
+        const topLevelDependencies = _this3.determineTopLevelBinLinkOrder(flatTree);
+        const tickBin = _this3.reporter.progress(flatTree.length + topLevelDependencies.length);
+
+        // create links in transient dependencies
+        yield (_promise || _load_promise()).queue(flatTree, (() => {
+          var _ref19 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* ([dest, { pkg, isNohoist, parts }]) {
+            if (pkg._reference && pkg._reference.locations.length && !pkg._reference.isPlugnplay) {
+              const binLoc = path.join(dest, _this3.config.getFolder(pkg));
+              yield _this3.linkBinDependencies(pkg, binLoc);
+              if (isNohoist) {
+                // if nohoist, we need to override the binLink to point to the local destination
+                const parentBinLoc = _this3.getParentBinLoc(parts, flatTree);
+                yield _this3.linkSelfDependencies(pkg, dest, parentBinLoc, true);
+              }
+              tickBin();
+            }
+            tickBin();
+          });
+
+          return function (_x4) {
+            return _ref19.apply(this, arguments);
+          };
+        })(), linkBinConcurrency);
+
+        // create links at top level for all dependencies.
+        yield (_promise || _load_promise()).queue(topLevelDependencies, (() => {
+          var _ref20 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* ([dest, { pkg }]) {
+            if (pkg._reference && pkg._reference.locations.length && !pkg._reference.isPlugnplay && pkg.bin && Object.keys(pkg.bin).length) {
+              let binLoc;
+              if (_this3.config.modulesFolder) {
+                binLoc = path.join(_this3.config.modulesFolder);
+              } else {
+                binLoc = path.join(_this3.config.lockfileFolder, _this3.config.getFolder(pkg));
+              }
+              yield _this3.linkSelfDependencies(pkg, dest, binLoc);
+            }
+            tickBin();
+          });
+
+          return function (_x5) {
+            return _ref20.apply(this, arguments);
+          };
+        })(), linkBinConcurrency);
+      }
+
+      for (var _iterator14 = flatTree, _isArray14 = Array.isArray(_iterator14), _i14 = 0, _iterator14 = _isArray14 ? _iterator14 : _iterator14[Symbol.iterator]();;) {
+        var _ref22;
+
+        if (_isArray14) {
+          if (_i14 >= _iterator14.length) break;
+          _ref22 = _iterator14[_i14++];
+        } else {
+          _i14 = _iterator14.next();
+          if (_i14.done) break;
+          _ref22 = _i14.value;
+        }
+
+        const _ref21 = _ref22;
+        const pkg = _ref21[1].pkg;
+
+        yield _this3._warnForMissingBundledDependencies(pkg);
+      }
+    })();
+  }
+
+  _buildTreeHash(flatTree) {
+    const hash = new Map();
+    for (var _iterator19 = flatTree, _isArray19 = Array.isArray(_iterator19), _i19 = 0, _iterator19 = _isArray19 ? _iterator19 : _iterator19[Symbol.iterator]();;) {
+      var _ref29;
+
+      if (_isArray19) {
+        if (_i19 >= _iterator19.length) break;
+        _ref29 = _iterator19[_i19++];
+      } else {
+        _i19 = _iterator19.next();
+        if (_i19.done) break;
+        _ref29 = _i19.value;
+      }
+
+      const _ref28 = _ref29;
+      const dest = _ref28[0];
+      const hoistManifest = _ref28[1];
+
+      const key = hoistManifest.parts.join('#');
+      hash.set(key, [dest, hoistManifest]);
+    }
+    this._treeHash = hash;
+    return hash;
+  }
+
+  getParentBinLoc(parts, flatTree) {
+    const hash = this._treeHash || this._buildTreeHash(flatTree);
+    const parent = parts.slice(0, -1).join('#');
+    const tuple = hash.get(parent);
+    if (!tuple) {
+      throw new Error(`failed to get parent '${parent}' binLoc`);
+    }
+    const dest = tuple[0],
+          hoistManifest = tuple[1];
+
+    const parentBinLoc = path.join(dest, this.config.getFolder(hoistManifest.pkg));
+
+    return parentBinLoc;
+  }
+
+  determineTopLevelBinLinkOrder(flatTree) {
+    const linksToCreate = new Map();
+    for (var _iterator20 = flatTree, _isArray20 = Array.isArray(_iterator20), _i20 = 0, _iterator20 = _isArray20 ? _iterator20 : _iterator20[Symbol.iterator]();;) {
+      var _ref31;
+
+      if (_isArray20) {
+        if (_i20 >= _iterator20.length) break;
+        _ref31 = _iterator20[_i20++];
+      } else {
+        _i20 = _iterator20.next();
+        if (_i20.done) break;
+        _ref31 = _i20.value;
+      }
+
+      const _ref30 = _ref31;
+      const dest = _ref30[0];
+      const hoistManifest = _ref30[1];
+      const pkg = hoistManifest.pkg,
+            isDirectRequire = hoistManifest.isDirectRequire,
+            isNohoist = hoistManifest.isNohoist,
+            isShallow = hoistManifest.isShallow;
+      const name = pkg.name;
+
+      // nohoist and shallow packages should not be linked at topLevel bin
+
+      if (!isNohoist && !isShallow && (isDirectRequire || this.topLevelBinLinking && !linksToCreate.has(name))) {
+        linksToCreate.set(name, [dest, hoistManifest]);
+      }
+    }
+
+    // Sort the array so that direct dependencies will be linked last.
+    // Bin links are overwritten if they already exist, so this will cause direct deps to take precedence.
+    // If someone finds this to be incorrect later, you could also consider sorting descending by
+    //   `linkToCreate.level` which is the dependency tree depth. Direct deps will have level 0 and transitive
+    //   deps will have level > 0.
+    const transientBins = [];
+    const topLevelBins = [];
+    for (var _iterator21 = Array.from(linksToCreate.values()), _isArray21 = Array.isArray(_iterator21), _i21 = 0, _iterator21 = _isArray21 ? _iterator21 : _iterator21[Symbol.iterator]();;) {
+      var _ref32;
+
+      if (_isArray21) {
+        if (_i21 >= _iterator21.length) break;
+        _ref32 = _iterator21[_i21++];
+      } else {
+        _i21 = _iterator21.next();
+        if (_i21.done) break;
+        _ref32 = _i21.value;
+      }
+
+      const linkToCreate = _ref32;
+
+      if (linkToCreate[1].isDirectRequire) {
+        topLevelBins.push(linkToCreate);
+      } else {
+        transientBins.push(linkToCreate);
+      }
+    }
+    return [...transientBins, ...topLevelBins];
+  }
+
+  resolvePeerModules() {
+    for (var _iterator22 = this.resolver.getManifests(), _isArray22 = Array.isArray(_iterator22), _i22 = 0, _iterator22 = _isArray22 ? _iterator22 : _iterator22[Symbol.iterator]();;) {
+      var _ref33;
+
+      if (_isArray22) {
+        if (_i22 >= _iterator22.length) break;
+        _ref33 = _iterator22[_i22++];
+      } else {
+        _i22 = _iterator22.next();
+        if (_i22.done) break;
+        _ref33 = _i22.value;
+      }
+
+      const pkg = _ref33;
+
+      const peerDeps = pkg.peerDependencies;
+      const peerDepsMeta = pkg.peerDependenciesMeta;
+
+      if (!peerDeps) {
+        continue;
+      }
+
+      const ref = pkg._reference;
+      invariant(ref, 'Package reference is missing');
+
+      // TODO: We are taking the "shortest" ref tree but there may be multiple ref trees with the same length
+      const refTree = ref.requests.map(req => req.parentNames).sort((arr1, arr2) => arr1.length - arr2.length)[0];
+
+      const getLevelDistance = pkgRef => {
+        let minDistance = Infinity;
+        for (var _iterator23 = pkgRef.requests, _isArray23 = Array.isArray(_iterator23), _i23 = 0, _iterator23 = _isArray23 ? _iterator23 : _iterator23[Symbol.iterator]();;) {
+          var _ref34;
+
+          if (_isArray23) {
+            if (_i23 >= _iterator23.length) break;
+            _ref34 = _iterator23[_i23++];
+          } else {
+            _i23 = _iterator23.next();
+            if (_i23.done) break;
+            _ref34 = _i23.value;
+          }
+
+          const req = _ref34;
+
+          const distance = refTree.length - req.parentNames.length;
+
+          if (distance >= 0 && distance < minDistance && req.parentNames.every((name, idx) => name === refTree[idx])) {
+            minDistance = distance;
+          }
+        }
+
+        return minDistance;
+      };
+
+      for (const peerDepName in peerDeps) {
+        const range = peerDeps[peerDepName];
+        const meta = peerDepsMeta && peerDepsMeta[peerDepName];
+
+        const isOptional = !!(meta && meta.optional);
+
+        const peerPkgs = this.resolver.getAllInfoForPackageName(peerDepName);
+
+        let peerError = 'unmetPeer';
+        let resolvedLevelDistance = Infinity;
+        let resolvedPeerPkg;
+        for (var _iterator24 = peerPkgs, _isArray24 = Array.isArray(_iterator24), _i24 = 0, _iterator24 = _isArray24 ? _iterator24 : _iterator24[Symbol.iterator]();;) {
+          var _ref35;
+
+          if (_isArray24) {
+            if (_i24 >= _iterator24.length) break;
+            _ref35 = _iterator24[_i24++];
+          } else {
+            _i24 = _iterator24.next();
+            if (_i24.done) break;
+            _ref35 = _i24.value;
+          }
+
+          const peerPkg = _ref35;
+
+          const peerPkgRef = peerPkg._reference;
+          if (!(peerPkgRef && peerPkgRef.patterns)) {
+            continue;
+          }
+          const levelDistance = getLevelDistance(peerPkgRef);
+          if (isFinite(levelDistance) && levelDistance < resolvedLevelDistance) {
+            if (this._satisfiesPeerDependency(range, peerPkgRef.version)) {
+              resolvedLevelDistance = levelDistance;
+              resolvedPeerPkg = peerPkgRef;
+            } else {
+              peerError = 'incorrectPeer';
+            }
+          }
+        }
+
+        if (resolvedPeerPkg) {
+          ref.addDependencies(resolvedPeerPkg.patterns);
+          this.reporter.verbose(this.reporter.lang('selectedPeer', `${pkg.name}@${pkg.version}`, `${peerDepName}@${resolvedPeerPkg.version}`, resolvedPeerPkg.level));
+        } else if (!isOptional) {
+          this.reporter.warn(this.reporter.lang(peerError, `${refTree.join(' > ')} > ${pkg.name}@${pkg.version}`, `${peerDepName}@${range}`));
+        }
+      }
+    }
+  }
+
+  _satisfiesPeerDependency(range, version) {
+    return range === '*' || (0, (_semver || _load_semver()).satisfiesWithPrereleases)(version, range, this.config.looseSemver);
+  }
+
+  _warnForMissingBundledDependencies(pkg) {
+    var _this4 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const ref = pkg._reference;
+      invariant(ref, 'missing package ref ' + pkg.name);
+
+      if (pkg.bundleDependencies) {
+        for (var _iterator25 = pkg.bundleDependencies, _isArray25 = Array.isArray(_iterator25), _i25 = 0, _iterator25 = _isArray25 ? _iterator25 : _iterator25[Symbol.iterator]();;) {
+          var _ref36;
+
+          if (_isArray25) {
+            if (_i25 >= _iterator25.length) break;
+            _ref36 = _iterator25[_i25++];
+          } else {
+            _i25 = _iterator25.next();
+            if (_i25.done) break;
+            _ref36 = _i25.value;
+          }
+
+          const depName = _ref36;
+
+          const locs = ref.locations.map(function (loc) {
+            return path.join(loc, _this4.config.getFolder(pkg), depName);
+          });
+          const locsExist = yield Promise.all(locs.map(function (loc) {
+            return (_fs || _load_fs()).exists(loc);
+          }));
+          if (locsExist.some(function (e) {
+            return !e;
+          })) {
+            //if any of the locs do not exist
+            const pkgHuman = `${pkg.name}@${pkg.version}`;
+            _this4.reporter.warn(_this4.reporter.lang('missingBundledDependency', pkgHuman, depName));
+          }
+        }
+      }
+    })();
+  }
+
+  _isUnplugged(pkg, ref) {
+    var _this5 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      // If an unplugged folder exists for the specified package, we simply use it
+      if (yield (_fs || _load_fs()).exists(_this5.config.generatePackageUnpluggedPath(ref))) {
+        return true;
+      }
+
+      // If the package has a postinstall script, we also unplug it (otherwise they would run into the cache)
+      if (!_this5.config.ignoreScripts && pkg.scripts && (pkg.scripts.preinstall || pkg.scripts.install || pkg.scripts.postinstall)) {
+        return true;
+      }
+
+      // Check whether the user explicitly requested for the package to be unplugged
+      return _this5.unplugged.some(function (patternToUnplug) {
+        var _normalizePattern = (0, (_normalizePattern2 || _load_normalizePattern()).normalizePattern)(patternToUnplug);
+
+        const name = _normalizePattern.name,
+              range = _normalizePattern.range,
+              hasVersion = _normalizePattern.hasVersion;
+
+        const satisfiesSemver = hasVersion ? semver.satisfies(ref.version, range) : true;
+        return name === ref.name && satisfiesSemver;
+      });
+    })();
+  }
+
+  init(patterns, workspaceLayout, { linkDuplicates, ignoreOptional } = {}) {
+    var _this6 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      _this6.resolvePeerModules();
+      yield _this6.copyModules(patterns, workspaceLayout, { linkDuplicates, ignoreOptional });
+
+      if (!_this6.config.plugnplayEnabled) {
+        yield (_fs || _load_fs()).unlink(`${_this6.config.lockfileFolder}/${(_constants || _load_constants()).PNP_FILENAME}`);
+      }
+    })();
+  }
+}
+exports.default = PackageLinker;
+
+/***/ }),
+/* 212 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.clearLine = clearLine;
+exports.toStartOfLine = toStartOfLine;
+exports.writeOnNthLine = writeOnNthLine;
+exports.clearNthLine = clearNthLine;
+
+var _tty;
+
+function _load_tty() {
+  return _tty = _interopRequireDefault(__webpack_require__(104));
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const readline = __webpack_require__(197);
+
+var _require = __webpack_require__(30);
+
+const supportsColor = _require.supportsColor;
+
+
+const CLEAR_WHOLE_LINE = 0;
+const CLEAR_RIGHT_OF_CURSOR = 1;
+
+function clearLine(stdout) {
+  if (!supportsColor) {
+    if (stdout instanceof (_tty || _load_tty()).default.WriteStream) {
+      if (stdout.columns > 0) {
+        stdout.write(`\r${' '.repeat(stdout.columns - 1)}`);
+      }
+      stdout.write(`\r`);
+    }
+    return;
+  }
+
+  readline.clearLine(stdout, CLEAR_WHOLE_LINE);
+  readline.cursorTo(stdout, 0);
+}
+
+function toStartOfLine(stdout) {
+  if (!supportsColor) {
+    stdout.write('\r');
+    return;
+  }
+
+  readline.cursorTo(stdout, 0);
+}
+
+function writeOnNthLine(stdout, n, msg) {
+  if (!supportsColor) {
+    return;
+  }
+
+  if (n == 0) {
+    readline.cursorTo(stdout, 0);
+    stdout.write(msg);
+    readline.clearLine(stdout, CLEAR_RIGHT_OF_CURSOR);
+    return;
+  }
+  readline.cursorTo(stdout, 0);
+  readline.moveCursor(stdout, 0, -n);
+  stdout.write(msg);
+  readline.clearLine(stdout, CLEAR_RIGHT_OF_CURSOR);
+  readline.cursorTo(stdout, 0);
+  readline.moveCursor(stdout, 0, n);
+}
+
+function clearNthLine(stdout, n) {
+  if (!supportsColor) {
+    return;
+  }
+
+  if (n == 0) {
+    clearLine(stdout);
+    return;
+  }
+  readline.cursorTo(stdout, 0);
+  readline.moveCursor(stdout, 0, -n);
+  readline.clearLine(stdout, CLEAR_WHOLE_LINE);
+  readline.moveCursor(stdout, 0, n);
+}
+
+/***/ }),
+/* 213 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _extends2;
+
+function _load_extends() {
+  return _extends2 = _interopRequireDefault(__webpack_require__(21));
+}
+
+var _baseReporter;
+
+function _load_baseReporter() {
+  return _baseReporter = _interopRequireDefault(__webpack_require__(108));
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+class JSONReporter extends (_baseReporter || _load_baseReporter()).default {
+  constructor(opts) {
+    super(opts);
+
+    this._activityId = 0;
+    this._progressId = 0;
+  }
+
+  _dump(type, data, error) {
+    let stdout = this.stdout;
+    if (error) {
+      stdout = this.stderr;
+    }
+    stdout.write(`${JSON.stringify({ type, data })}\n`);
+  }
+
+  _verbose(msg) {
+    this._dump('verbose', msg);
+  }
+
+  list(type, items, hints) {
+    this._dump('list', { type, items, hints });
+  }
+
+  tree(type, trees) {
+    this._dump('tree', { type, trees });
+  }
+
+  step(current, total, message) {
+    this._dump('step', { message, current, total });
+  }
+
+  inspect(value) {
+    this._dump('inspect', value);
+  }
+
+  footer(showPeakMemory) {
+    this._dump('finished', this.getTotalTime());
+  }
+
+  log(msg) {
+    this._dump('log', msg);
+  }
+
+  command(msg) {
+    this._dump('command', msg);
+  }
+
+  table(head, body) {
+    this._dump('table', { head, body });
+  }
+
+  success(msg) {
+    this._dump('success', msg);
+  }
+
+  error(msg) {
+    this._dump('error', msg, true);
+  }
+
+  warn(msg) {
+    this._dump('warning', msg, true);
+  }
+
+  info(msg) {
+    this._dump('info', msg);
+  }
+
+  activitySet(total, workers) {
+    if (!this.isTTY || this.noProgress) {
+      return super.activitySet(total, workers);
+    }
+
+    const id = this._activityId++;
+    this._dump('activitySetStart', { id, total, workers });
+
+    const spinners = [];
+    for (let i = 0; i < workers; i++) {
+      let current = 0;
+      let header = '';
+
+      spinners.push({
+        clear() {},
+        setPrefix(_current, _header) {
+          current = _current;
+          header = _header;
+        },
+        tick: msg => {
+          this._dump('activitySetTick', {
+            id,
+            header,
+            current,
+            worker: i,
+            message: msg
+          });
+        },
+        end() {}
+      });
+    }
+
+    return {
+      spinners,
+      end: () => {
+        this._dump('activitySetEnd', { id });
+      }
+    };
+  }
+
+  activity() {
+    return this._activity({});
+  }
+
+  _activity(data) {
+    if (!this.isTTY || this.noProgress) {
+      return {
+        tick() {},
+        end() {}
+      };
+    }
+
+    const id = this._activityId++;
+    this._dump('activityStart', (0, (_extends2 || _load_extends()).default)({ id }, data));
+
+    return {
+      tick: name => {
+        this._dump('activityTick', { id, name });
+      },
+
+      end: () => {
+        this._dump('activityEnd', { id });
+      }
+    };
+  }
+
+  progress(total) {
+    if (this.noProgress) {
+      return function () {
+        // noop
+      };
+    }
+
+    const id = this._progressId++;
+    let current = 0;
+    this._dump('progressStart', { id, total });
+
+    return () => {
+      current++;
+      this._dump('progressTick', { id, current });
+
+      if (current === total) {
+        this._dump('progressFinish', { id });
+      }
+    };
+  }
+
+  auditAction(recommendation) {
+    this._dump('auditAction', recommendation);
+  }
+
+  auditAdvisory(resolution, auditAdvisory) {
+    this._dump('auditAdvisory', { resolution, advisory: auditAdvisory });
+  }
+
+  auditSummary(auditMetadata) {
+    this._dump('auditSummary', auditMetadata);
+  }
+}
+exports.default = JSONReporter;
+
+/***/ }),
+/* 214 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.shouldUpdateLockfile = undefined;
+
+var _semver;
+
+function _load_semver() {
+  return _semver = _interopRequireDefault(__webpack_require__(22));
+}
+
+var _minimatch;
+
+function _load_minimatch() {
+  return _minimatch = _interopRequireDefault(__webpack_require__(82));
+}
+
+var _map;
+
+function _load_map() {
+  return _map = _interopRequireDefault(__webpack_require__(29));
+}
+
+var _normalizePattern2;
+
+function _load_normalizePattern() {
+  return _normalizePattern2 = __webpack_require__(37);
+}
+
+var _parsePackagePath;
+
+function _load_parsePackagePath() {
+  return _parsePackagePath = _interopRequireDefault(__webpack_require__(376));
+}
+
+var _parsePackagePath2;
+
+function _load_parsePackagePath2() {
+  return _parsePackagePath2 = __webpack_require__(376);
+}
+
+var _resolvers;
+
+function _load_resolvers() {
+  return _resolvers = __webpack_require__(78);
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const DIRECTORY_SEPARATOR = '/';
+const GLOBAL_NESTED_DEP_PATTERN = '**/';
+
+class ResolutionMap {
+  constructor(config) {
+    this.resolutionsByPackage = (0, (_map || _load_map()).default)();
+    this.config = config;
+    this.reporter = config.reporter;
+    this.delayQueue = new Set();
+  }
+
+  init(resolutions = {}) {
+    for (const globPattern in resolutions) {
+      const info = this.parsePatternInfo(globPattern, resolutions[globPattern]);
+
+      if (info) {
+        const resolution = this.resolutionsByPackage[info.name] || [];
+        this.resolutionsByPackage[info.name] = [...resolution, info];
+      }
+    }
+  }
+
+  addToDelayQueue(req) {
+    this.delayQueue.add(req);
+  }
+
+  parsePatternInfo(globPattern, range) {
+    if (!(0, (_parsePackagePath2 || _load_parsePackagePath2()).isValidPackagePath)(globPattern)) {
+      this.reporter.warn(this.reporter.lang('invalidResolutionName', globPattern));
+      return null;
+    }
+
+    const directories = (0, (_parsePackagePath || _load_parsePackagePath()).default)(globPattern);
+    const name = directories.pop();
+
+    if (!(_semver || _load_semver()).default.validRange(range) && !(0, (_resolvers || _load_resolvers()).getExoticResolver)(range)) {
+      this.reporter.warn(this.reporter.lang('invalidResolutionVersion', range));
+      return null;
+    }
+
+    // For legacy support of resolutions, replace `name` with `**/name`
+    if (name === globPattern) {
+      globPattern = `${GLOBAL_NESTED_DEP_PATTERN}${name}`;
+    }
+
+    return {
+      name,
+      range,
+      globPattern,
+      pattern: `${name}@${range}`
+    };
+  }
+
+  find(reqPattern, parentNames) {
+    var _normalizePattern = (0, (_normalizePattern2 || _load_normalizePattern()).normalizePattern)(reqPattern);
+
+    const name = _normalizePattern.name,
+          reqRange = _normalizePattern.range;
+
+    const resolutions = this.resolutionsByPackage[name];
+
+    if (!resolutions) {
+      return '';
+    }
+
+    const modulePath = [...parentNames, name].join(DIRECTORY_SEPARATOR);
+
+    var _ref = resolutions.find(({ globPattern }) => (0, (_minimatch || _load_minimatch()).default)(modulePath, globPattern)) || {};
+
+    const pattern = _ref.pattern,
+          range = _ref.range;
+
+
+    if (pattern) {
+      if ((_semver || _load_semver()).default.validRange(reqRange) && (_semver || _load_semver()).default.valid(range) && !(_semver || _load_semver()).default.satisfies(range, reqRange)) {
+        this.reporter.warn(this.reporter.lang('incompatibleResolutionVersion', pattern, reqPattern));
+      }
+    }
+
+    return pattern;
+  }
+}
+
+exports.default = ResolutionMap;
+const shouldUpdateLockfile = exports.shouldUpdateLockfile = (lockfileEntry, resolutionEntry) => {
+  if (!lockfileEntry || !resolutionEntry) {
+    return false;
+  }
+
+  return lockfileEntry.resolved !== resolutionEntry.remote.resolved;
+};
+
+/***/ }),
+/* 215 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FILE_PROTOCOL_PREFIX = undefined;
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+var _path;
+
+function _load_path() {
+  return _path = _interopRequireDefault(__webpack_require__(0));
+}
+
+var _invariant;
+
+function _load_invariant() {
+  return _invariant = _interopRequireDefault(__webpack_require__(9));
+}
+
+var _uuid;
+
+function _load_uuid() {
+  return _uuid = _interopRequireDefault(__webpack_require__(119));
+}
+
+var _errors;
+
+function _load_errors() {
+  return _errors = __webpack_require__(6);
+}
+
+var _exoticResolver;
+
+function _load_exoticResolver() {
+  return _exoticResolver = _interopRequireDefault(__webpack_require__(89));
+}
+
+var _misc;
+
+function _load_misc() {
+  return _misc = _interopRequireWildcard(__webpack_require__(18));
+}
+
+var _fs;
+
+function _load_fs() {
+  return _fs = _interopRequireWildcard(__webpack_require__(4));
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const FILE_PROTOCOL_PREFIX = exports.FILE_PROTOCOL_PREFIX = 'file:';
+
+class FileResolver extends (_exoticResolver || _load_exoticResolver()).default {
+  constructor(request, fragment) {
+    super(request, fragment);
+    this.loc = (_misc || _load_misc()).removePrefix(fragment, FILE_PROTOCOL_PREFIX);
+  }
+
+  static isVersion(pattern) {
+    return super.isVersion.call(this, pattern) || this.prefixMatcher.test(pattern) || (_path || _load_path()).default.isAbsolute(pattern);
+  }
+
+  resolve() {
+    var _this = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      let loc = _this.loc;
+      if (!(_path || _load_path()).default.isAbsolute(loc)) {
+        loc = (_path || _load_path()).default.resolve(_this.config.lockfileFolder, loc);
+      }
+
+      if (_this.config.linkFileDependencies) {
+        const registry = 'npm';
+        const manifest = { _uid: '', name: '', version: '0.0.0', _registry: registry };
+        manifest._remote = {
+          type: 'link',
+          registry,
+          hash: null,
+          reference: loc
+        };
+        manifest._uid = manifest.version;
+        return manifest;
+      }
+      if (!(yield (_fs || _load_fs()).exists(loc))) {
+        throw new (_errors || _load_errors()).MessageError(_this.reporter.lang('doesntExist', loc, _this.pattern.split('@')[0]));
+      }
+
+      const manifest = yield (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+        try {
+          return yield _this.config.readManifest(loc, _this.registry);
+        } catch (e) {
+          if (e.code === 'ENOENT') {
+            return {
+              // This is just the default, it can be overridden with key of dependencies
+              name: (_path || _load_path()).default.dirname(loc),
+              version: '0.0.0',
+              _uid: '0.0.0',
+              _registry: 'npm'
+            };
+          }
+
+          throw e;
+        }
+      })();
+      const registry = manifest._registry;
+      (0, (_invariant || _load_invariant()).default)(registry, 'expected registry');
+
+      manifest._remote = {
+        type: 'copy',
+        registry,
+        hash: `${(_uuid || _load_uuid()).default.v4()}-${new Date().getTime()}`,
+        reference: loc
+      };
+
+      manifest._uid = manifest.version;
+
+      return manifest;
+    })();
+  }
+}
+exports.default = FileResolver;
+FileResolver.protocol = 'file';
+FileResolver.prefixMatcher = /^\.{1,2}\//;
+
+/***/ }),
+/* 216 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.explodeGistFragment = explodeGistFragment;
+
+var _errors;
+
+function _load_errors() {
+  return _errors = __webpack_require__(6);
+}
+
+var _gitResolver;
+
+function _load_gitResolver() {
+  return _gitResolver = _interopRequireDefault(__webpack_require__(124));
+}
+
+var _exoticResolver;
+
+function _load_exoticResolver() {
+  return _exoticResolver = _interopRequireDefault(__webpack_require__(89));
+}
+
+var _misc;
+
+function _load_misc() {
+  return _misc = _interopRequireWildcard(__webpack_require__(18));
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function explodeGistFragment(fragment, reporter) {
+  fragment = (_misc || _load_misc()).removePrefix(fragment, 'gist:');
+
+  const parts = fragment.split('#');
+
+  if (parts.length <= 2) {
+    return {
+      id: parts[0],
+      hash: parts[1] || ''
+    };
+  } else {
+    throw new (_errors || _load_errors()).MessageError(reporter.lang('invalidGistFragment', fragment));
+  }
+}
+
+class GistResolver extends (_exoticResolver || _load_exoticResolver()).default {
+
+  constructor(request, fragment) {
+    super(request, fragment);
+
+    var _explodeGistFragment = explodeGistFragment(fragment, this.reporter);
+
+    const id = _explodeGistFragment.id,
+          hash = _explodeGistFragment.hash;
+
+    this.id = id;
+    this.hash = hash;
+  }
+
+  resolve() {
+    return this.fork((_gitResolver || _load_gitResolver()).default, false, `https://gist.github.com/${this.id}.git#${this.hash}`);
+  }
+}
+exports.default = GistResolver;
+GistResolver.protocol = 'gist';
+
+/***/ }),
+/* 217 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+var _cache;
+
+function _load_cache() {
+  return _cache = __webpack_require__(355);
+}
+
+var _errors;
+
+function _load_errors() {
+  return _errors = __webpack_require__(6);
+}
+
+var _registryResolver;
+
+function _load_registryResolver() {
+  return _registryResolver = _interopRequireDefault(__webpack_require__(575));
+}
+
+var _npmRegistry;
+
+function _load_npmRegistry() {
+  return _npmRegistry = _interopRequireDefault(__webpack_require__(88));
+}
+
+var _map;
+
+function _load_map() {
+  return _map = _interopRequireDefault(__webpack_require__(29));
+}
+
+var _fs;
+
+function _load_fs() {
+  return _fs = _interopRequireWildcard(__webpack_require__(4));
+}
+
+var _constants;
+
+function _load_constants() {
+  return _constants = __webpack_require__(8);
+}
+
+var _packageNameUtils;
+
+function _load_packageNameUtils() {
+  return _packageNameUtils = __webpack_require__(222);
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const inquirer = __webpack_require__(276);
+const tty = __webpack_require__(104);
+const path = __webpack_require__(0);
+const semver = __webpack_require__(22);
+const ssri = __webpack_require__(65);
+
+const NPM_REGISTRY_ID = 'npm';
+
+class NpmResolver extends (_registryResolver || _load_registryResolver()).default {
+
+  static findVersionInRegistryResponse(config, name, range, body, request) {
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      if (body.versions && Object.keys(body.versions).length === 0) {
+        throw new (_errors || _load_errors()).MessageError(config.reporter.lang('registryNoVersions', body.name));
+      }
+
+      if (!body['dist-tags'] || !body.versions) {
+        throw new (_errors || _load_errors()).MessageError(config.reporter.lang('malformedRegistryResponse', name));
+      }
+
+      if (range in body['dist-tags']) {
+        range = body['dist-tags'][range];
+      }
+
+      // If the latest tag in the registry satisfies the requested range, then use that.
+      // Otherwise we will fall back to semver maxSatisfying.
+      // This mimics logic in NPM. See issue #3560
+      const latestVersion = body['dist-tags'] ? body['dist-tags'].latest : undefined;
+      if (latestVersion && semver.satisfies(latestVersion, range)) {
+        return body.versions[latestVersion];
+      }
+
+      const satisfied = yield config.resolveConstraints(Object.keys(body.versions), range);
+      if (satisfied) {
+        return body.versions[satisfied];
+      } else if (request && !config.nonInteractive) {
+        if (request.resolver && request.resolver.activity) {
+          request.resolver.activity.end();
+        }
+        config.reporter.log(config.reporter.lang('couldntFindVersionThatMatchesRange', body.name, range));
+        let pageSize;
+        if (process.stdout instanceof tty.WriteStream) {
+          pageSize = process.stdout.rows - 2;
+        }
+        const response = yield inquirer.prompt([{
+          name: 'package',
+          type: 'list',
+          message: config.reporter.lang('chooseVersionFromList', body.name),
+          choices: semver.rsort(Object.keys(body.versions)),
+          pageSize
+        }]);
+        if (response && response.package) {
+          return body.versions[response.package];
+        }
+      }
+      throw new (_errors || _load_errors()).MessageError(config.reporter.lang('couldntFindVersionThatMatchesRange', body.name, range));
+    })();
+  }
+
+  resolveRequest(desiredVersion) {
+    var _this = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      if (_this.config.offline) {
+        const res = yield _this.resolveRequestOffline();
+        if (res != null) {
+          return res;
+        }
+      }
+
+      const escapedName = (_npmRegistry || _load_npmRegistry()).default.escapeName(_this.name);
+      const desiredRange = desiredVersion || _this.range;
+      const body = yield _this.config.registries.npm.request(escapedName);
+
+      if (body) {
+        return NpmResolver.findVersionInRegistryResponse(_this.config, escapedName, desiredRange, body, _this.request);
+      } else {
+        return null;
+      }
+    })();
+  }
+
+  resolveRequestOffline() {
+    var _this2 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const packageDirs = yield _this2.config.getCache('cachedPackages', function () {
+        return (0, (_cache || _load_cache()).getCachedPackagesDirs)(_this2.config, _this2.config.cacheFolder);
+      });
+
+      const versions = (0, (_map || _load_map()).default)();
+
+      for (var _iterator = packageDirs, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+        var _ref;
+
+        if (_isArray) {
+          if (_i >= _iterator.length) break;
+          _ref = _iterator[_i++];
+        } else {
+          _i = _iterator.next();
+          if (_i.done) break;
+          _ref = _i.value;
+        }
+
+        const dir = _ref;
+
+        // check if folder contains the registry prefix
+        if (dir.indexOf(`${NPM_REGISTRY_ID}-`) === -1) {
+          continue;
+        }
+
+        // read manifest and validate correct name
+        const pkg = yield _this2.config.readManifest(dir, NPM_REGISTRY_ID);
+        if (pkg.name !== _this2.name) {
+          continue;
+        }
+
+        // read package metadata
+        const metadata = yield _this2.config.readPackageMetadata(dir);
+        if (!metadata.remote) {
+          continue; // old yarn metadata
+        }
+
+        versions[pkg.version] = Object.assign({}, pkg, {
+          _remote: metadata.remote
+        });
+      }
+
+      const satisfied = yield _this2.config.resolveConstraints(Object.keys(versions), _this2.range);
+      if (satisfied) {
+        return versions[satisfied];
+      } else if (!_this2.config.preferOffline) {
+        throw new (_errors || _load_errors()).MessageError(_this2.reporter.lang('couldntFindPackageInCache', _this2.name, _this2.range, Object.keys(versions).join(', ')));
+      } else {
+        return null;
+      }
+    })();
+  }
+
+  cleanRegistry(url) {
+    if (this.config.getOption('registry') === (_constants || _load_constants()).YARN_REGISTRY) {
+      return url.replace((_constants || _load_constants()).NPM_REGISTRY_RE, (_constants || _load_constants()).YARN_REGISTRY);
+    } else {
+      return url;
+    }
+  }
+
+  resolve() {
+    var _this3 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      // lockfile
+      const shrunk = _this3.request.getLocked('tarball');
+      if (shrunk) {
+        if (_this3.config.packBuiltPackages && shrunk.prebuiltVariants && shrunk._remote) {
+          const prebuiltVariants = shrunk.prebuiltVariants;
+          const prebuiltName = (0, (_packageNameUtils || _load_packageNameUtils()).getPlatformSpecificPackageFilename)(shrunk);
+          const offlineMirrorPath = _this3.config.getOfflineMirrorPath();
+          if (prebuiltVariants[prebuiltName] && offlineMirrorPath) {
+            const filename = path.join(offlineMirrorPath, 'prebuilt', prebuiltName + '.tgz');
+            const _remote = shrunk._remote;
+
+            if (_remote && (yield (_fs || _load_fs()).exists(filename))) {
+              _remote.reference = `file:${filename}`;
+              _remote.hash = prebuiltVariants[prebuiltName];
+              _remote.integrity = ssri.fromHex(_remote.hash, 'sha1').toString();
+            }
+          }
+        }
+      }
+      if (shrunk && shrunk._remote && (shrunk._remote.integrity || _this3.config.offline || !_this3.config.autoAddIntegrity)) {
+        // if the integrity field does not exist, we're not network-restricted, and the
+        // migration hasn't been disabled, it needs to be created
+        return shrunk;
+      }
+
+      const desiredVersion = shrunk && shrunk.version ? shrunk.version : null;
+      const info = yield _this3.resolveRequest(desiredVersion);
+      if (info == null) {
+        throw new (_errors || _load_errors()).MessageError(_this3.reporter.lang('packageNotFoundRegistry', _this3.name, NPM_REGISTRY_ID));
+      }
+
+      const deprecated = info.deprecated,
+            dist = info.dist;
+
+      if (shrunk && shrunk._remote) {
+        shrunk._remote.integrity = dist && dist.integrity ? ssri.parse(dist.integrity) : ssri.fromHex(dist && dist.shasum ? dist.shasum : '', 'sha1');
+        return shrunk;
+      }
+
+      if (typeof deprecated === 'string') {
+        let human = `${info.name}@${info.version}`;
+        const parentNames = _this3.request.parentNames;
+        if (parentNames.length) {
+          human = parentNames.concat(human).join(' > ');
+        }
+        _this3.reporter.warn(`${human}: ${deprecated}`);
+      }
+
+      if (dist != null && dist.tarball) {
+        info._remote = {
+          resolved: `${_this3.cleanRegistry(dist.tarball)}#${dist.shasum}`,
+          type: 'tarball',
+          reference: _this3.cleanRegistry(dist.tarball),
+          hash: dist.shasum,
+          integrity: dist.integrity ? ssri.parse(dist.integrity) : ssri.fromHex(dist.shasum, 'sha1'),
+          registry: NPM_REGISTRY_ID,
+          packageName: info.name
+        };
+      }
+
+      info._uid = info.version;
+
+      return info;
+    })();
+  }
+}
+exports.default = NpmResolver;
+NpmResolver.registry = NPM_REGISTRY_ID;
+
+/***/ }),
+/* 218 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.fileDatesEqual = exports.copyFile = exports.unlink = undefined;
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+// We want to preserve file timestamps when copying a file, since yarn uses them to decide if a file has
+// changed compared to the cache.
+// There are some OS specific cases here:
+// * On linux, fs.copyFile does not preserve timestamps, but does on OSX and Win.
+// * On windows, you must open a file with write permissions to call `fs.futimes`.
+// * On OSX you can open with read permissions and still call `fs.futimes`.
+let fixTimes = (() => {
+  var _ref3 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (fd, dest, data) {
+    const doOpen = fd === undefined;
+    let openfd = fd ? fd : -1;
+
+    if (disableTimestampCorrection === undefined) {
+      // if timestamps match already, no correction is needed.
+      // the need to correct timestamps varies based on OS and node versions.
+      const destStat = yield lstat(dest);
+      disableTimestampCorrection = fileDatesEqual(destStat.mtime, data.mtime);
+    }
+
+    if (disableTimestampCorrection) {
+      return;
+    }
+
+    if (doOpen) {
+      try {
+        openfd = yield open(dest, 'a', data.mode);
+      } catch (er) {
+        // file is likely read-only
+        try {
+          openfd = yield open(dest, 'r', data.mode);
+        } catch (err) {
+          // We can't even open this file for reading.
+          return;
+        }
+      }
+    }
+
+    try {
+      if (openfd) {
+        yield futimes(openfd, data.atime, data.mtime);
+      }
+    } catch (er) {
+      // If `futimes` throws an exception, we probably have a case of a read-only file on Windows.
+      // In this case we can just return. The incorrect timestamp will just cause that file to be recopied
+      // on subsequent installs, which will effect yarn performance but not break anything.
+    } finally {
+      if (doOpen && openfd) {
+        yield close(openfd);
+      }
+    }
+  });
+
+  return function fixTimes(_x7, _x8, _x9) {
+    return _ref3.apply(this, arguments);
+  };
+})();
+
+// Compare file timestamps.
+// Some versions of Node on windows zero the milliseconds when utime is used.
+
+
+var _fs;
+
+function _load_fs() {
+  return _fs = _interopRequireDefault(__webpack_require__(5));
+}
+
+var _promise;
+
+function _load_promise() {
+  return _promise = __webpack_require__(50);
+}
+
+var _fs2;
+
+function _load_fs2() {
+  return _fs2 = __webpack_require__(4);
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+let disableTimestampCorrection = undefined; // OS dependent. will be detected on first file copy.
+
+// This module serves as a wrapper for file operations that are inconsistant across node and OS versions.
+
+const readFileBuffer = (0, (_promise || _load_promise()).promisify)((_fs || _load_fs()).default.readFile);
+const close = (0, (_promise || _load_promise()).promisify)((_fs || _load_fs()).default.close);
+const lstat = (0, (_promise || _load_promise()).promisify)((_fs || _load_fs()).default.lstat);
+const open = (0, (_promise || _load_promise()).promisify)((_fs || _load_fs()).default.open);
+const futimes = (0, (_promise || _load_promise()).promisify)((_fs || _load_fs()).default.futimes);
+
+const write = (0, (_promise || _load_promise()).promisify)((_fs || _load_fs()).default.write);
+
+const unlink = exports.unlink = (0, (_promise || _load_promise()).promisify)(__webpack_require__(307));
+
+/**
+ * Unlinks the destination to force a recreation. This is needed on case-insensitive file systems
+ * to force the correct naming when the filename has changed only in character-casing. (Jest -> jest).
+ */
+const copyFile = exports.copyFile = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (data, cleanup) {
+    // $FlowFixMe: Flow doesn't currently support COPYFILE_FICLONE
+    const ficloneFlag = (_fs2 || _load_fs2()).constants.COPYFILE_FICLONE || 0;
+    try {
+      yield unlink(data.dest);
+      yield copyFilePoly(data.src, data.dest, ficloneFlag, data);
+    } finally {
+      if (cleanup) {
+        cleanup();
+      }
+    }
+  });
+
+  return function copyFile(_x, _x2) {
+    return _ref.apply(this, arguments);
+  };
+})();
+
+// Node 8.5.0 introduced `fs.copyFile` which is much faster, so use that when available.
+// Otherwise we fall back to reading and writing files as buffers.
+const copyFilePoly = (src, dest, flags, data) => {
+  if ((_fs || _load_fs()).default.copyFile) {
+    return new Promise((resolve, reject) => (_fs || _load_fs()).default.copyFile(src, dest, flags, err => {
+      if (err) {
+        reject(err);
+      } else {
+        fixTimes(undefined, dest, data).then(() => resolve()).catch(ex => reject(ex));
+      }
+    }));
+  } else {
+    return copyWithBuffer(src, dest, flags, data);
+  }
+};
+
+const copyWithBuffer = (() => {
+  var _ref2 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (src, dest, flags, data) {
+    // Use open -> write -> futimes -> close sequence to avoid opening the file twice:
+    // one with writeFile and one with utimes
+    const fd = yield open(dest, 'w', data.mode);
+    try {
+      const buffer = yield readFileBuffer(src);
+      yield write(fd, buffer, 0, buffer.length);
+      yield fixTimes(fd, dest, data);
+    } finally {
+      yield close(fd);
+    }
+  });
+
+  return function copyWithBuffer(_x3, _x4, _x5, _x6) {
+    return _ref2.apply(this, arguments);
+  };
+})();const fileDatesEqual = exports.fileDatesEqual = (a, b) => {
+  const aTime = a.getTime();
+  const bTime = b.getTime();
+
+  if (process.platform !== 'win32') {
+    return aTime === bTime;
+  }
+
+  // See https://github.com/nodejs/node/pull/12607
+  // Submillisecond times from stat and utimes are truncated on Windows,
+  // causing a file with mtime 8.0079998 and 8.0081144 to become 8.007 and 8.008
+  // and making it impossible to update these files to their correct timestamps.
+  if (Math.abs(aTime - bTime) <= 1) {
+    return true;
+  }
+
+  const aTimeSec = Math.floor(aTime / 1000);
+  const bTimeSec = Math.floor(bTime / 1000);
+
+  // See https://github.com/nodejs/node/issues/2069
+  // Some versions of Node on windows zero the milliseconds when utime is used
+  // So if any of the time has a milliseconds part of zero we suspect that the
+  // bug is present and compare only seconds.
+  if (aTime - aTimeSec * 1000 === 0 || bTime - bTimeSec * 1000 === 0) {
+    return aTimeSec === bTimeSec;
+  }
+
+  return aTime === bTime;
+};
+
+/***/ }),
+/* 219 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+var _extends2;
+
+function _load_extends() {
+  return _extends2 = _interopRequireDefault(__webpack_require__(21));
+}
+
+var _invariant;
+
+function _load_invariant() {
+  return _invariant = _interopRequireDefault(__webpack_require__(9));
+}
+
+var _string_decoder;
+
+function _load_string_decoder() {
+  return _string_decoder = __webpack_require__(333);
+}
+
+var _tarFs;
+
+function _load_tarFs() {
+  return _tarFs = _interopRequireDefault(__webpack_require__(193));
+}
+
+var _tarStream;
+
+function _load_tarStream() {
+  return _tarStream = _interopRequireDefault(__webpack_require__(460));
+}
+
+var _url;
+
+function _load_url() {
+  return _url = _interopRequireDefault(__webpack_require__(24));
+}
+
+var _fs;
+
+function _load_fs() {
+  return _fs = __webpack_require__(5);
+}
+
+var _errors;
+
+function _load_errors() {
+  return _errors = __webpack_require__(6);
+}
+
+var _gitSpawn;
+
+function _load_gitSpawn() {
+  return _gitSpawn = __webpack_require__(373);
+}
+
+var _gitRefResolver;
+
+function _load_gitRefResolver() {
+  return _gitRefResolver = __webpack_require__(581);
+}
+
+var _crypto;
+
+function _load_crypto() {
+  return _crypto = _interopRequireWildcard(__webpack_require__(168));
+}
+
+var _fs2;
+
+function _load_fs2() {
+  return _fs2 = _interopRequireWildcard(__webpack_require__(4));
+}
+
+var _map;
+
+function _load_map() {
+  return _map = _interopRequireDefault(__webpack_require__(29));
+}
+
+var _misc;
+
+function _load_misc() {
+  return _misc = __webpack_require__(18);
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const GIT_PROTOCOL_PREFIX = 'git+';
+
+const SSH_PROTOCOL = 'ssh:';
+const SCP_PATH_PREFIX = '/:';
+const FILE_PROTOCOL = 'file:';
+const GIT_VALID_REF_LINE_REGEXP = /^([a-fA-F0-9]+|ref)/;
+
+const validRef = line => {
+  return GIT_VALID_REF_LINE_REGEXP.exec(line);
+};
+
+const supportsArchiveCache = (0, (_map || _load_map()).default)({
+  'github.com': false // not support, doubt they will ever support it
+});
+
+const handleSpawnError = err => {
+  if (err instanceof (_errors || _load_errors()).ProcessSpawnError) {
+    throw err;
+  }
+};
+
+const SHORTHAND_SERVICES = (0, (_map || _load_map()).default)({
+  'github:': parsedUrl => (0, (_extends2 || _load_extends()).default)({}, parsedUrl, {
+    slashes: true,
+    auth: 'git',
+    protocol: SSH_PROTOCOL,
+    host: 'github.com',
+    hostname: 'github.com',
+    pathname: `/${parsedUrl.hostname}${parsedUrl.pathname}`
+  }),
+  'bitbucket:': parsedUrl => (0, (_extends2 || _load_extends()).default)({}, parsedUrl, {
+    slashes: true,
+    auth: 'git',
+    protocol: SSH_PROTOCOL,
+    host: 'bitbucket.com',
+    hostname: 'bitbucket.com',
+    pathname: `/${parsedUrl.hostname}${parsedUrl.pathname}`
+  })
+});
+
+class Git {
+  constructor(config, gitUrl, hash) {
+    this.supportsArchive = false;
+    this.fetched = false;
+    this.config = config;
+    this.reporter = config.reporter;
+    this.hash = hash;
+    this.ref = hash;
+    this.gitUrl = gitUrl;
+    this.cwd = this.config.getTemp((_crypto || _load_crypto()).hash(this.gitUrl.repository));
+  }
+
+  /**
+   * npm URLs contain a 'git+' scheme prefix, which is not understood by git.
+   * git "URLs" also allow an alternative scp-like syntax, so they're not standard URLs.
+   */
+  static npmUrlToGitUrl(npmUrl) {
+    npmUrl = (0, (_misc || _load_misc()).removePrefix)(npmUrl, GIT_PROTOCOL_PREFIX);
+
+    let parsed = (_url || _load_url()).default.parse(npmUrl);
+    const expander = parsed.protocol && SHORTHAND_SERVICES[parsed.protocol];
+
+    if (expander) {
+      parsed = expander(parsed);
+    }
+
+    // Special case in npm, where ssh:// prefix is stripped to pass scp-like syntax
+    // which in git works as remote path only if there are no slashes before ':'.
+    // See #3146.
+    if (parsed.protocol === SSH_PROTOCOL && parsed.hostname && parsed.path && parsed.path.startsWith(SCP_PATH_PREFIX) && parsed.port === null) {
+      const auth = parsed.auth ? parsed.auth + '@' : '';
+      const pathname = parsed.path.slice(SCP_PATH_PREFIX.length);
+      return {
+        hostname: parsed.hostname,
+        protocol: parsed.protocol,
+        repository: `${auth}${parsed.hostname}:${pathname}`
+      };
+    }
+
+    // git local repos are specified as `git+file:` and a filesystem path, not a url.
+    let repository;
+    if (parsed.protocol === FILE_PROTOCOL) {
+      repository = parsed.path;
+    } else {
+      repository = (_url || _load_url()).default.format((0, (_extends2 || _load_extends()).default)({}, parsed, { hash: '' }));
+    }
+
+    return {
+      hostname: parsed.hostname || null,
+      protocol: parsed.protocol || FILE_PROTOCOL,
+      repository: repository || ''
+    };
+  }
+
+  /**
+   * Check if the host specified in the input `gitUrl` has archive capability.
+   */
+
+  static hasArchiveCapability(ref) {
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const hostname = ref.hostname;
+      if (ref.protocol !== 'ssh:' || hostname == null) {
+        return false;
+      }
+
+      if (hostname in supportsArchiveCache) {
+        return supportsArchiveCache[hostname];
+      }
+
+      try {
+        yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(['archive', `--remote=${ref.repository}`, 'HEAD', Date.now() + '']);
+        throw new Error();
+      } catch (err) {
+        handleSpawnError(err);
+        const supports = err.message.indexOf('did not match any files') >= 0;
+        return supportsArchiveCache[hostname] = supports;
+      }
+    })();
+  }
+
+  /**
+   * Check if the input `target` is a 5-40 character hex commit hash.
+   */
+
+  static repoExists(ref) {
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const isLocal = ref.protocol === FILE_PROTOCOL;
+
+      try {
+        if (isLocal) {
+          yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(['show-ref', '-t'], { cwd: ref.repository });
+        } else {
+          yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(['ls-remote', '-t', ref.repository]);
+        }
+        return true;
+      } catch (err) {
+        handleSpawnError(err);
+        return false;
+      }
+    })();
+  }
+
+  static replaceProtocol(ref, protocol) {
+    return {
+      hostname: ref.hostname,
+      protocol,
+      repository: ref.repository.replace(/^(?:git|http):/, protocol)
+    };
+  }
+
+  /**
+   * Attempt to upgrade insecure protocols to secure protocol
+   */
+  static secureGitUrl(ref, hash, reporter) {
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      if ((0, (_gitRefResolver || _load_gitRefResolver()).isCommitSha)(hash)) {
+        // this is cryptographically secure
+        return ref;
+      }
+
+      if (ref.protocol === 'git:') {
+        const secureUrl = Git.replaceProtocol(ref, 'https:');
+        if (yield Git.repoExists(secureUrl)) {
+          return secureUrl;
+        } else {
+          reporter.warn(reporter.lang('downloadGitWithoutCommit', ref.repository));
+          return ref;
+        }
+      }
+
+      if (ref.protocol === 'http:') {
+        const secureRef = Git.replaceProtocol(ref, 'https:');
+        if (yield Git.repoExists(secureRef)) {
+          return secureRef;
+        } else {
+          reporter.warn(reporter.lang('downloadHTTPWithoutCommit', ref.repository));
+          return ref;
+        }
+      }
+
+      return ref;
+    })();
+  }
+
+  /**
+   * Archive a repo to destination
+   */
+
+  archive(dest) {
+    if (this.supportsArchive) {
+      return this._archiveViaRemoteArchive(dest);
+    } else {
+      return this._archiveViaLocalFetched(dest);
+    }
+  }
+
+  _archiveViaRemoteArchive(dest) {
+    var _this = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const hashStream = new (_crypto || _load_crypto()).HashStream();
+      yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(['archive', `--remote=${_this.gitUrl.repository}`, _this.ref], {
+        process(proc, resolve, reject, done) {
+          const writeStream = (0, (_fs || _load_fs()).createWriteStream)(dest);
+          proc.on('error', reject);
+          writeStream.on('error', reject);
+          writeStream.on('end', done);
+          writeStream.on('open', function () {
+            proc.stdout.pipe(hashStream).pipe(writeStream);
+          });
+          writeStream.once('finish', done);
+        }
+      });
+      return hashStream.getHash();
+    })();
+  }
+
+  _archiveViaLocalFetched(dest) {
+    var _this2 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const hashStream = new (_crypto || _load_crypto()).HashStream();
+      yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(['archive', _this2.hash], {
+        cwd: _this2.cwd,
+        process(proc, resolve, reject, done) {
+          const writeStream = (0, (_fs || _load_fs()).createWriteStream)(dest);
+          proc.on('error', reject);
+          writeStream.on('error', reject);
+          writeStream.on('open', function () {
+            proc.stdout.pipe(hashStream).pipe(writeStream);
+          });
+          writeStream.once('finish', done);
+        }
+      });
+      return hashStream.getHash();
+    })();
+  }
+
+  /**
+   * Clone a repo to the input `dest`. Use `git archive` if it's available, otherwise fall
+   * back to `git clone`.
+   */
+
+  clone(dest) {
+    if (this.supportsArchive) {
+      return this._cloneViaRemoteArchive(dest);
+    } else {
+      return this._cloneViaLocalFetched(dest);
+    }
+  }
+
+  _cloneViaRemoteArchive(dest) {
+    var _this3 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(['archive', `--remote=${_this3.gitUrl.repository}`, _this3.ref], {
+        process(proc, update, reject, done) {
+          const extractor = (_tarFs || _load_tarFs()).default.extract(dest, {
+            dmode: 0o555, // all dirs should be readable
+            fmode: 0o444 // all files should be readable
+          });
+          extractor.on('error', reject);
+          extractor.on('finish', done);
+
+          proc.stdout.pipe(extractor);
+          proc.on('error', reject);
+        }
+      });
+    })();
+  }
+
+  _cloneViaLocalFetched(dest) {
+    var _this4 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(['archive', _this4.hash], {
+        cwd: _this4.cwd,
+        process(proc, resolve, reject, done) {
+          const extractor = (_tarFs || _load_tarFs()).default.extract(dest, {
+            dmode: 0o555, // all dirs should be readable
+            fmode: 0o444 // all files should be readable
+          });
+
+          extractor.on('error', reject);
+          extractor.on('finish', done);
+
+          proc.stdout.pipe(extractor);
+        }
+      });
+    })();
+  }
+
+  /**
+   * Clone this repo.
+   */
+
+  fetch() {
+    var _this5 = this;
+
+    const gitUrl = this.gitUrl,
+          cwd = this.cwd;
+
+
+    return (_fs2 || _load_fs2()).lockQueue.push(gitUrl.repository, (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      if (yield (_fs2 || _load_fs2()).exists(cwd)) {
+        yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(['fetch', '--tags'], { cwd });
+        yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(['pull'], { cwd });
+      } else {
+        yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(['clone', gitUrl.repository, cwd]);
+      }
+
+      _this5.fetched = true;
+    }));
+  }
+
+  /**
+   * Fetch the file by cloning the repo and reading it.
+   */
+
+  getFile(filename) {
+    if (this.supportsArchive) {
+      return this._getFileFromArchive(filename);
+    } else {
+      return this._getFileFromClone(filename);
+    }
+  }
+
+  _getFileFromArchive(filename) {
+    var _this6 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      try {
+        return yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(['archive', `--remote=${_this6.gitUrl.repository}`, _this6.ref, filename], {
+          process(proc, update, reject, done) {
+            const parser = (_tarStream || _load_tarStream()).default.extract();
+
+            parser.on('error', reject);
+            parser.on('finish', done);
+
+            parser.on('entry', (header, stream, next) => {
+              const decoder = new (_string_decoder || _load_string_decoder()).StringDecoder('utf8');
+              let fileContent = '';
+
+              stream.on('data', buffer => {
+                fileContent += decoder.write(buffer);
+              });
+              stream.on('end', () => {
+                const remaining = decoder.end();
+                update(fileContent + remaining);
+                next();
+              });
+              stream.resume();
+            });
+
+            proc.stdout.pipe(parser);
+          }
+        });
+      } catch (err) {
+        if (err.message.indexOf('did not match any files') >= 0) {
+          return false;
+        } else {
+          throw err;
+        }
+      }
+    })();
+  }
+
+  _getFileFromClone(filename) {
+    var _this7 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      (0, (_invariant || _load_invariant()).default)(_this7.fetched, 'Repo not fetched');
+
+      try {
+        return yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(['show', `${_this7.hash}:${filename}`], {
+          cwd: _this7.cwd
+        });
+      } catch (err) {
+        handleSpawnError(err);
+        // file doesn't exist
+        return false;
+      }
+    })();
+  }
+
+  /**
+   * Initialize the repo, find a secure url to use and
+   * set the ref to match an input `target`.
+   */
+  init() {
+    var _this8 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      _this8.gitUrl = yield Git.secureGitUrl(_this8.gitUrl, _this8.hash, _this8.reporter);
+
+      yield _this8.setRefRemote();
+
+      // check capabilities
+      if (_this8.ref !== '' && (yield Git.hasArchiveCapability(_this8.gitUrl))) {
+        _this8.supportsArchive = true;
+      } else {
+        yield _this8.fetch();
+      }
+
+      return _this8.hash;
+    })();
+  }
+
+  setRefRemote() {
+    var _this9 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const isLocal = _this9.gitUrl.protocol === FILE_PROTOCOL;
+      let stdout;
+
+      if (isLocal) {
+        stdout = yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(['show-ref', '--tags', '--heads'], { cwd: _this9.gitUrl.repository });
+      } else {
+        stdout = yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(['ls-remote', '--tags', '--heads', _this9.gitUrl.repository]);
+      }
+
+      const refs = (0, (_gitRefResolver || _load_gitRefResolver()).parseRefs)(stdout);
+      return _this9.setRef(refs);
+    })();
+  }
+
+  setRefHosted(hostedRefsList) {
+    const refs = (0, (_gitRefResolver || _load_gitRefResolver()).parseRefs)(hostedRefsList);
+    return this.setRef(refs);
+  }
+
+  /**
+   * Resolves the default branch of a remote repository (not always "master")
+   */
+
+  resolveDefaultBranch() {
+    var _this10 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const isLocal = _this10.gitUrl.protocol === FILE_PROTOCOL;
+
+      try {
+        let stdout;
+        if (isLocal) {
+          stdout = yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(['show-ref', 'HEAD'], { cwd: _this10.gitUrl.repository });
+          const refs = (0, (_gitRefResolver || _load_gitRefResolver()).parseRefs)(stdout);
+          const sha = refs.values().next().value;
+          if (sha) {
+            return { sha, ref: undefined };
+          } else {
+            throw new Error('Unable to find SHA for git HEAD');
+          }
+        } else {
+          stdout = yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(['ls-remote', '--symref', _this10.gitUrl.repository, 'HEAD']);
+          const lines = stdout.split('\n').filter(validRef);
+
+          var _lines$0$split = lines[0].split(/\s+/);
+
+          const ref = _lines$0$split[1];
+
+          var _lines$1$split = lines[1].split(/\s+/);
+
+          const sha = _lines$1$split[0];
+
+          return { sha, ref };
+        }
+      } catch (err) {
+        handleSpawnError(err);
+        // older versions of git don't support "--symref"
+        const stdout = yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(['ls-remote', _this10.gitUrl.repository, 'HEAD']);
+        const lines = stdout.split('\n').filter(validRef);
+
+        var _lines$0$split2 = lines[0].split(/\s+/);
+
+        const sha = _lines$0$split2[0];
+
+        return { sha, ref: undefined };
+      }
+    })();
+  }
+
+  /**
+   * Resolve a git commit to it's 40-chars format and ensure it exists in the repository
+   * We need to use the 40-chars format to avoid multiple folders in the cache
+   */
+
+  resolveCommit(shaToResolve) {
+    var _this11 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      try {
+        yield _this11.fetch();
+        const revListArgs = ['rev-list', '-n', '1', '--no-abbrev-commit', '--format=oneline', shaToResolve];
+        const stdout = yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(revListArgs, { cwd: _this11.cwd });
+
+        var _stdout$split = stdout.split(/\s+/);
+
+        const sha = _stdout$split[0];
+
+        return { sha, ref: undefined };
+      } catch (err) {
+        handleSpawnError(err);
+        // assuming commit not found, let's try something else
+        return null;
+      }
+    })();
+  }
+
+  /**
+   * Resolves the input hash / ref / semver range to a valid commit sha
+   * If possible also resolves the sha to a valid ref in order to use "git archive"
+   */
+
+  setRef(refs) {
+    var _this12 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      // get commit ref
+      const version = _this12.hash;
+
+
+      const resolvedResult = yield (0, (_gitRefResolver || _load_gitRefResolver()).resolveVersion)({
+        config: _this12.config,
+        git: _this12,
+        version,
+        refs
+      });
+      if (!resolvedResult) {
+        throw new (_errors || _load_errors()).MessageError(_this12.reporter.lang('couldntFindMatch', version, Array.from(refs.keys()).join(','), _this12.gitUrl.repository));
+      }
+
+      _this12.hash = resolvedResult.sha;
+      _this12.ref = resolvedResult.ref || '';
+      return _this12.hash;
+    })();
+  }
+}
+exports.default = Git;
+
+/***/ }),
+/* 220 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+var _resolveRelative;
+
+function _load_resolveRelative() {
+  return _resolveRelative = _interopRequireDefault(__webpack_require__(586));
+}
+
+var _validate;
+
+function _load_validate() {
+  return _validate = _interopRequireDefault(__webpack_require__(125));
+}
+
+var _fix;
+
+function _load_fix() {
+  return _fix = _interopRequireDefault(__webpack_require__(583));
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const path = __webpack_require__(0);
+
+exports.default = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (info, moduleLoc, config, isRoot) {
+    // create human readable name
+    const name = info.name,
+          version = info.version;
+
+    let human;
+    if (typeof name === 'string') {
+      human = name;
+    }
+    if (human && typeof version === 'string' && version) {
+      human += `@${version}`;
+    }
+    if (isRoot && info._loc) {
+      human = path.relative(config.cwd, info._loc);
+    }
+
+    function warn(msg) {
+      if (human) {
+        msg = `${human}: ${msg}`;
+      }
+      config.reporter.warn(msg);
+    }
+
+    yield (0, (_fix || _load_fix()).default)(info, moduleLoc, config.reporter, warn, config.looseSemver);
+    (0, (_resolveRelative || _load_resolveRelative()).default)(info, moduleLoc, config.lockfileFolder);
+
+    if (config.cwd === config.globalFolder) {
+      return info;
+    }
+
+    try {
+      (0, (_validate || _load_validate()).default)(info, isRoot, config.reporter, warn);
+    } catch (err) {
+      if (human) {
+        err.message = `${human}: ${err.message}`;
+      }
+      throw err;
+    }
+
+    return info;
+  });
+
+  return function (_x, _x2, _x3, _x4) {
+    return _ref.apply(this, arguments);
+  };
+})();
+
+/***/ }),
+/* 221 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isValidLicense = isValidLicense;
+exports.stringifyPerson = stringifyPerson;
+exports.parsePerson = parsePerson;
+exports.normalizePerson = normalizePerson;
+exports.extractDescription = extractDescription;
+exports.extractRepositoryUrl = extractRepositoryUrl;
+
+
+const validateLicense = __webpack_require__(959);
+
+function isValidLicense(license) {
+  return !!license && validateLicense(license).validForNewPackages;
+}
+
+function stringifyPerson(person) {
+  if (!person || typeof person !== 'object') {
+    return person;
+  }
+
+  const parts = [];
+  if (person.name) {
+    parts.push(person.name);
+  }
+
+  const email = person.email || person.mail;
+  if (typeof email === 'string') {
+    parts.push(`<${email}>`);
+  }
+
+  const url = person.url || person.web;
+  if (typeof url === 'string') {
+    parts.push(`(${url})`);
+  }
+
+  return parts.join(' ');
+}
+
+function parsePerson(person) {
+  if (typeof person !== 'string') {
+    return person;
+  }
+
+  // format: name (url) <email>
+  const obj = {};
+
+  let name = person.match(/^([^\(<]+)/);
+  if (name) {
+    name = name[0].trim();
+    if (name) {
+      obj.name = name;
+    }
+  }
+
+  const email = person.match(/<([^>]+)>/);
+  if (email) {
+    obj.email = email[1];
+  }
+
+  const url = person.match(/\(([^\)]+)\)/);
+  if (url) {
+    obj.url = url[1];
+  }
+
+  return obj;
+}
+
+function normalizePerson(person) {
+  return parsePerson(stringifyPerson(person));
+}
+
+function extractDescription(readme) {
+  if (typeof readme !== 'string' || readme === '') {
+    return undefined;
+  }
+
+  // split into lines
+  const lines = readme.trim().split('\n').map(line => line.trim());
+
+  // find the start of the first paragraph, ignore headings
+  let start = 0;
+  for (; start < lines.length; start++) {
+    const line = lines[start];
+    if (line && line.match(/^(#|$)/)) {
+      // line isn't empty and isn't a heading so this is the start of a paragraph
+      start++;
+      break;
+    }
+  }
+
+  // skip newlines from the header to the first line
+  while (start < lines.length && !lines[start]) {
+    start++;
+  }
+
+  // continue to the first non empty line
+  let end = start;
+  while (end < lines.length && lines[end]) {
+    end++;
+  }
+
+  return lines.slice(start, end).join(' ');
+}
+
+function extractRepositoryUrl(repository) {
+  if (!repository || typeof repository !== 'object') {
+    return repository;
+  }
+  return repository.url;
+}
+
+/***/ }),
+/* 222 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getPlatformSpecificPackageFilename = getPlatformSpecificPackageFilename;
+exports.getSystemParams = getSystemParams;
+function getPlatformSpecificPackageFilename(pkg) {
+  // TODO support hash for all subdependencies that have installs scripts
+  const normalizeScope = name => name[0] === '@' ? name.substr(1).replace('/', '-') : name;
+  const suffix = getSystemParams();
+  return `${normalizeScope(pkg.name)}-v${pkg.version}-${suffix}`;
+}
+
+function getSystemParams() {
+  // TODO support platform variant for linux
+  return `${process.platform}-${process.arch}-${process.versions.modules || ''}`;
+}
+
+/***/ }),
+/* 223 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isFakeRoot = isFakeRoot;
+exports.isRootUser = isRootUser;
+function getUid() {
+  if (process.platform !== 'win32' && process.getuid) {
+    return process.getuid();
+  }
+  return null;
+}
+
+exports.default = isRootUser(getUid()) && !isFakeRoot();
+function isFakeRoot() {
+  return Boolean(process.env.FAKEROOTKEY);
+}
+
+function isRootUser(uid) {
+  return uid === 0;
+}
+
+/***/ }),
+/* 224 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.satisfiesWithPrereleases = satisfiesWithPrereleases;
+exports.diffWithUnstable = diffWithUnstable;
+
+var _semver;
+
+function _load_semver() {
+  return _semver = _interopRequireDefault(__webpack_require__(22));
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/**
+ * Returns whether the given semver version satisfies the given range. Notably this supports
+ * prerelease versions so that "2.0.0-rc.0" satisfies the range ">=1.0.0", for example.
+ */
+
+function satisfiesWithPrereleases(version, range, loose = false) {
+  let semverRange;
+  try {
+    // $FlowFixMe: Add a definition for the Range class
+    semverRange = new (_semver || _load_semver()).default.Range(range, loose);
+  } catch (err) {
+    return false;
+  }
+
+  if (!version) {
+    return false;
+  }
+  let semverVersion;
+  try {
+    semverVersion = new (_semver || _load_semver()).default.SemVer(version, semverRange.loose);
+  } catch (err) {
+    return false;
+  }
+
+  // A range has multiple sets of comparators. A version must satisfy all comparators in a set
+  // and at least one set to satisfy the range.
+  return semverRange.set.some(comparatorSet => {
+    // node-semver converts ~ and ^ ranges into pairs of >= and < ranges but the upper bounds don't
+    // properly exclude prerelease versions. For example, "^1.0.0" is converted to ">=1.0.0 <2.0.0",
+    // which includes "2.0.0-pre" since prerelease versions are lower than their non-prerelease
+    // counterparts. As a practical workaround we make upper-bound ranges exclude prereleases and
+    // convert "<2.0.0" to "<2.0.0-0", for example.
+    comparatorSet = comparatorSet.map(comparator => {
+      if (comparator.operator !== '<' || !comparator.value || comparator.semver.prerelease.length) {
+        return comparator;
+      }
+
+      // "0" is the lowest prerelease version
+      comparator.semver.inc('pre', 0);
+
+      const comparatorString = comparator.operator + comparator.semver.version;
+      // $FlowFixMe: Add a definition for the Comparator class
+      return new (_semver || _load_semver()).default.Comparator(comparatorString, comparator.loose);
+    });
+
+    return !comparatorSet.some(comparator => !comparator.test(semverVersion));
+  });
+}
+
+const PRE_RELEASES = {
+  major: 'premajor',
+  minor: 'preminor',
+  patch: 'prepatch'
+};
+
+/**
+ * Returns the difference between two versions as a semantic string representation.
+ * Similar to the `diff` method in node-semver, but it also accounts for unstable versions,
+ * like 0.x.x or 0.0.x.
+ */
+
+function diffWithUnstable(version1, version2) {
+  if ((_semver || _load_semver()).default.eq(version1, version2) === false) {
+    const v1 = (_semver || _load_semver()).default.parse(version1);
+    const v2 = (_semver || _load_semver()).default.parse(version2);
+
+    if (v1 != null && v2 != null) {
+      const isPreRelease = v1.prerelease.length > 0 || v2.prerelease.length > 0;
+      const preMajor = v1.major === 0 || v2.major === 0;
+      const preMinor = preMajor && (v1.minor === 0 || v2.minor === 0);
+
+      let diff = null;
+
+      if (v1.major !== v2.major) {
+        diff = 'major';
+      } else if (v1.minor !== v2.minor) {
+        if (preMajor) {
+          // If the major version number is zero (0.x.x), treat a change
+          // of the minor version number as a major change.
+          diff = 'major';
+        } else {
+          diff = 'minor';
+        }
+      } else if (v1.patch !== v2.patch) {
+        if (preMinor) {
+          // If the major & minor version numbers are zero (0.0.x), treat a change
+          // of the patch version number as a major change.
+          diff = 'major';
+        } else if (preMajor) {
+          // If the major version number is zero (0.x.x), treat a change
+          // of the patch version number as a minor change.
+          diff = 'minor';
+        } else {
+          diff = 'patch';
+        }
+      }
+
+      if (isPreRelease) {
+        if (diff != null) {
+          diff = PRE_RELEASES[diff];
+        } else {
+          diff = 'prerelease';
+        }
+      }
+
+      return diff;
+    }
+  }
+
+  return null;
+}
+
+/***/ }),
+/* 225 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getDataDir = getDataDir;
+exports.getCacheDir = getCacheDir;
+exports.getConfigDir = getConfigDir;
+const path = __webpack_require__(0);
+const userHome = __webpack_require__(67).default;
+
+const FALLBACK_CONFIG_DIR = path.join(userHome, '.config', 'yarn');
+const FALLBACK_CACHE_DIR = path.join(userHome, '.cache', 'yarn');
+
+function getDataDir() {
+  if (process.platform === 'win32') {
+    const WIN32_APPDATA_DIR = getLocalAppDataDir();
+    return WIN32_APPDATA_DIR == null ? FALLBACK_CONFIG_DIR : path.join(WIN32_APPDATA_DIR, 'Data');
+  } else if (process.env.XDG_DATA_HOME) {
+    return path.join(process.env.XDG_DATA_HOME, 'yarn');
+  } else {
+    // This could arguably be ~/Library/Application Support/Yarn on Macs,
+    // but that feels unintuitive for a cli tool
+
+    // Instead, use our prior fallback. Some day this could be
+    // path.join(userHome, '.local', 'share', 'yarn')
+    // or return path.join(WIN32_APPDATA_DIR, 'Data') on win32
+    return FALLBACK_CONFIG_DIR;
+  }
+}
+
+function getCacheDir() {
+  if (process.platform === 'win32') {
+    // process.env.TEMP also exists, but most apps put caches here
+    return path.join(getLocalAppDataDir() || path.join(userHome, 'AppData', 'Local', 'Yarn'), 'Cache');
+  } else if (process.env.XDG_CACHE_HOME) {
+    return path.join(process.env.XDG_CACHE_HOME, 'yarn');
+  } else if (process.platform === 'darwin') {
+    return path.join(userHome, 'Library', 'Caches', 'Yarn');
+  } else {
+    return FALLBACK_CACHE_DIR;
+  }
+}
+
+function getConfigDir() {
+  if (process.platform === 'win32') {
+    // Use our prior fallback. Some day this could be
+    // return path.join(WIN32_APPDATA_DIR, 'Config')
+    const WIN32_APPDATA_DIR = getLocalAppDataDir();
+    return WIN32_APPDATA_DIR == null ? FALLBACK_CONFIG_DIR : path.join(WIN32_APPDATA_DIR, 'Config');
+  } else if (process.env.XDG_CONFIG_HOME) {
+    return path.join(process.env.XDG_CONFIG_HOME, 'yarn');
+  } else {
+    return FALLBACK_CONFIG_DIR;
+  }
+}
+
+function getLocalAppDataDir() {
+  return process.env.LOCALAPPDATA ? path.join(process.env.LOCALAPPDATA, 'Yarn') : null;
+}
+
+/***/ }),
+/* 226 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.explodeHashedUrl = explodeHashedUrl;
+function explodeHashedUrl(url) {
+  const parts = url.split('#');
+
+  return {
+    hash: parts[1] || '',
+    url: parts[0]
+  };
+}
+
+/***/ }),
+/* 227 */
+/***/ (function(module, exports, __webpack_require__) {
+
+module.exports = { "default": __webpack_require__(233), __esModule: true };
+
+/***/ }),
+/* 228 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = balanced;
+function balanced(a, b, str) {
+  if (a instanceof RegExp) a = maybeMatch(a, str);
+  if (b instanceof RegExp) b = maybeMatch(b, str);
+
+  var r = range(a, b, str);
+
+  return r && {
+    start: r[0],
+    end: r[1],
+    pre: str.slice(0, r[0]),
+    body: str.slice(r[0] + a.length, r[1]),
+    post: str.slice(r[1] + b.length)
+  };
+}
+
+function maybeMatch(reg, str) {
+  var m = str.match(reg);
+  return m ? m[0] : null;
+}
+
+balanced.range = range;
+function range(a, b, str) {
+  var begs, beg, left, right, result;
+  var ai = str.indexOf(a);
+  var bi = str.indexOf(b, ai + 1);
+  var i = ai;
+
+  if (ai >= 0 && bi > 0) {
+    begs = [];
+    left = str.length;
+
+    while (i >= 0 && !result) {
+      if (i == ai) {
+        begs.push(i);
+        ai = str.indexOf(a, i + 1);
+      } else if (begs.length == 1) {
+        result = [ begs.pop(), bi ];
+      } else {
+        beg = begs.pop();
+        if (beg < left) {
+          left = beg;
+          right = bi;
+        }
+
+        bi = str.indexOf(b, i + 1);
+      }
+
+      i = ai < bi && ai >= 0 ? ai : bi;
+    }
+
+    if (begs.length) {
+      result = [ left, right ];
+    }
+  }
+
+  return result;
+}
+
+
+/***/ }),
+/* 229 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var concatMap = __webpack_require__(232);
+var balanced = __webpack_require__(228);
+
+module.exports = expandTop;
+
+var escSlash = '\0SLASH'+Math.random()+'\0';
+var escOpen = '\0OPEN'+Math.random()+'\0';
+var escClose = '\0CLOSE'+Math.random()+'\0';
+var escComma = '\0COMMA'+Math.random()+'\0';
+var escPeriod = '\0PERIOD'+Math.random()+'\0';
+
+function numeric(str) {
+  return parseInt(str, 10) == str
+    ? parseInt(str, 10)
+    : str.charCodeAt(0);
+}
+
+function escapeBraces(str) {
+  return str.split('\\\\').join(escSlash)
+            .split('\\{').join(escOpen)
+            .split('\\}').join(escClose)
+            .split('\\,').join(escComma)
+            .split('\\.').join(escPeriod);
+}
+
+function unescapeBraces(str) {
+  return str.split(escSlash).join('\\')
+            .split(escOpen).join('{')
+            .split(escClose).join('}')
+            .split(escComma).join(',')
+            .split(escPeriod).join('.');
+}
+
+
+// Basically just str.split(","), but handling cases
+// where we have nested braced sections, which should be
+// treated as individual members, like {a,{b,c},d}
+function parseCommaParts(str) {
+  if (!str)
+    return [''];
+
+  var parts = [];
+  var m = balanced('{', '}', str);
+
+  if (!m)
+    return str.split(',');
+
+  var pre = m.pre;
+  var body = m.body;
+  var post = m.post;
+  var p = pre.split(',');
+
+  p[p.length-1] += '{' + body + '}';
+  var postParts = parseCommaParts(post);
+  if (post.length) {
+    p[p.length-1] += postParts.shift();
+    p.push.apply(p, postParts);
+  }
+
+  parts.push.apply(parts, p);
+
+  return parts;
+}
+
+function expandTop(str) {
+  if (!str)
+    return [];
+
+  // I don't know why Bash 4.3 does this, but it does.
+  // Anything starting with {} will have the first two bytes preserved
+  // but *only* at the top level, so {},a}b will not expand to anything,
+  // but a{},b}c will be expanded to [a}c,abc].
+  // One could argue that this is a bug in Bash, but since the goal of
+  // this module is to match Bash's rules, we escape a leading {}
+  if (str.substr(0, 2) === '{}') {
+    str = '\\{\\}' + str.substr(2);
+  }
+
+  return expand(escapeBraces(str), true).map(unescapeBraces);
+}
+
+function identity(e) {
+  return e;
+}
+
+function embrace(str) {
+  return '{' + str + '}';
+}
+function isPadded(el) {
+  return /^-?0\d/.test(el);
+}
+
+function lte(i, y) {
+  return i <= y;
+}
+function gte(i, y) {
+  return i >= y;
+}
+
+function expand(str, isTop) {
+  var expansions = [];
+
+  var m = balanced('{', '}', str);
+  if (!m || /\$$/.test(m.pre)) return [str];
+
+  var isNumericSequence = /^-?\d+\.\.-?\d+(?:\.\.-?\d+)?$/.test(m.body);
+  var isAlphaSequence = /^[a-zA-Z]\.\.[a-zA-Z](?:\.\.-?\d+)?$/.test(m.body);
+  var isSequence = isNumericSequence || isAlphaSequence;
+  var isOptions = m.body.indexOf(',') >= 0;
+  if (!isSequence && !isOptions) {
+    // {a},b}
+    if (m.post.match(/,.*\}/)) {
+      str = m.pre + '{' + m.body + escClose + m.post;
+      return expand(str);
+    }
+    return [str];
+  }
+
+  var n;
+  if (isSequence) {
+    n = m.body.split(/\.\./);
+  } else {
+    n = parseCommaParts(m.body);
+    if (n.length === 1) {
+      // x{{a,b}}y ==> x{a}y x{b}y
+      n = expand(n[0], false).map(embrace);
+      if (n.length === 1) {
+        var post = m.post.length
+          ? expand(m.post, false)
+          : [''];
+        return post.map(function(p) {
+          return m.pre + n[0] + p;
+        });
+      }
+    }
+  }
+
+  // at this point, n is the parts, and we know it's not a comma set
+  // with a single entry.
+
+  // no need to expand pre, since it is guaranteed to be free of brace-sets
+  var pre = m.pre;
+  var post = m.post.length
+    ? expand(m.post, false)
+    : [''];
+
+  var N;
+
+  if (isSequence) {
+    var x = numeric(n[0]);
+    var y = numeric(n[1]);
+    var width = Math.max(n[0].length, n[1].length)
+    var incr = n.length == 3
+      ? Math.abs(numeric(n[2]))
+      : 1;
+    var test = lte;
+    var reverse = y < x;
+    if (reverse) {
+      incr *= -1;
+      test = gte;
+    }
+    var pad = n.some(isPadded);
+
+    N = [];
+
+    for (var i = x; test(i, y); i += incr) {
+      var c;
+      if (isAlphaSequence) {
+        c = String.fromCharCode(i);
+        if (c === '\\')
+          c = '';
+      } else {
+        c = String(i);
+        if (pad) {
+          var need = width - c.length;
+          if (need > 0) {
+            var z = new Array(need + 1).join('0');
+            if (i < 0)
+              c = '-' + z + c.slice(1);
+            else
+              c = z + c;
+          }
+        }
+      }
+      N.push(c);
+    }
+  } else {
+    N = concatMap(n, function(el) { return expand(el, false) });
+  }
+
+  for (var j = 0; j < N.length; j++) {
+    for (var k = 0; k < post.length; k++) {
+      var expansion = pre + N[j] + post[k];
+      if (!isTop || isSequence || expansion)
+        expansions.push(expansion);
+    }
+  }
+
+  return expansions;
+}
+
+
+
+/***/ }),
+/* 230 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+function preserveCamelCase(str) {
+	let isLastCharLower = false;
+	let isLastCharUpper = false;
+	let isLastLastCharUpper = false;
+
+	for (let i = 0; i < str.length; i++) {
+		const c = str[i];
+
+		if (isLastCharLower && /[a-zA-Z]/.test(c) && c.toUpperCase() === c) {
+			str = str.substr(0, i) + '-' + str.substr(i);
+			isLastCharLower = false;
+			isLastLastCharUpper = isLastCharUpper;
+			isLastCharUpper = true;
+			i++;
+		} else if (isLastCharUpper && isLastLastCharUpper && /[a-zA-Z]/.test(c) && c.toLowerCase() === c) {
+			str = str.substr(0, i - 1) + '-' + str.substr(i - 1);
+			isLastLastCharUpper = isLastCharUpper;
+			isLastCharUpper = false;
+			isLastCharLower = true;
+		} else {
+			isLastCharLower = c.toLowerCase() === c;
+			isLastLastCharUpper = isLastCharUpper;
+			isLastCharUpper = c.toUpperCase() === c;
+		}
+	}
+
+	return str;
+}
+
+module.exports = function (str) {
+	if (arguments.length > 1) {
+		str = Array.from(arguments)
+			.map(x => x.trim())
+			.filter(x => x.length)
+			.join('-');
+	} else {
+		str = str.trim();
+	}
+
+	if (str.length === 0) {
+		return '';
+	}
+
+	if (str.length === 1) {
+		return str.toLowerCase();
+	}
+
+	if (/^[a-z0-9]+$/.test(str)) {
+		return str;
+	}
+
+	const hasUpperCase = str !== str.toLowerCase();
+
+	if (hasUpperCase) {
+		str = preserveCamelCase(str);
+	}
+
+	return str
+		.replace(/^[_.\- ]+/, '')
+		.toLowerCase()
+		.replace(/[_.\- ]+(\w|$)/g, (m, p1) => p1.toUpperCase());
+};
+
+
+/***/ }),
+/* 231 */
+/***/ (function(module, exports) {
+
+function Caseless (dict) {
+  this.dict = dict || {}
+}
+Caseless.prototype.set = function (name, value, clobber) {
+  if (typeof name === 'object') {
+    for (var i in name) {
+      this.set(i, name[i], value)
+    }
+  } else {
+    if (typeof clobber === 'undefined') clobber = true
+    var has = this.has(name)
+
+    if (!clobber && has) this.dict[has] = this.dict[has] + ',' + value
+    else this.dict[has || name] = value
+    return has
+  }
+}
+Caseless.prototype.has = function (name) {
+  var keys = Object.keys(this.dict)
+    , name = name.toLowerCase()
+    ;
+  for (var i=0;i<keys.length;i++) {
+    if (keys[i].toLowerCase() === name) return keys[i]
+  }
+  return false
+}
+Caseless.prototype.get = function (name) {
+  name = name.toLowerCase()
+  var result, _key
+  var headers = this.dict
+  Object.keys(headers).forEach(function (key) {
+    _key = key.toLowerCase()
+    if (name === _key) result = headers[key]
+  })
+  return result
+}
+Caseless.prototype.swap = function (name) {
+  var has = this.has(name)
+  if (has === name) return
+  if (!has) throw new Error('There is no header than matches "'+name+'"')
+  this.dict[name] = this.dict[has]
+  delete this.dict[has]
+}
+Caseless.prototype.del = function (name) {
+  var has = this.has(name)
+  return delete this.dict[has || name]
+}
+
+module.exports = function (dict) {return new Caseless(dict)}
+module.exports.httpify = function (resp, headers) {
+  var c = new Caseless(headers)
+  resp.setHeader = function (key, value, clobber) {
+    if (typeof value === 'undefined') return
+    return c.set(key, value, clobber)
+  }
+  resp.hasHeader = function (key) {
+    return c.has(key)
+  }
+  resp.getHeader = function (key) {
+    return c.get(key)
+  }
+  resp.removeHeader = function (key) {
+    return c.del(key)
+  }
+  resp.headers = c.dict
+  return c
+}
+
+
+/***/ }),
+/* 232 */
+/***/ (function(module, exports) {
+
+module.exports = function (xs, fn) {
+    var res = [];
+    for (var i = 0; i < xs.length; i++) {
+        var x = fn(xs[i], i);
+        if (isArray(x)) res.push.apply(res, x);
+        else res.push(x);
+    }
+    return res;
+};
+
+var isArray = Array.isArray || function (xs) {
+    return Object.prototype.toString.call(xs) === '[object Array]';
+};
+
+
+/***/ }),
+/* 233 */
+/***/ (function(module, exports, __webpack_require__) {
+
+__webpack_require__(259);
+__webpack_require__(261);
+__webpack_require__(264);
+__webpack_require__(260);
+__webpack_require__(262);
+__webpack_require__(263);
+module.exports = __webpack_require__(31).Promise;
+
+
+/***/ }),
+/* 234 */
+/***/ (function(module, exports) {
+
+module.exports = function () { /* empty */ };
+
+
+/***/ }),
+/* 235 */
+/***/ (function(module, exports) {
+
+module.exports = function (it, Constructor, name, forbiddenField) {
+  if (!(it instanceof Constructor) || (forbiddenField !== undefined && forbiddenField in it)) {
+    throw TypeError(name + ': incorrect invocation!');
+  } return it;
+};
+
+
+/***/ }),
+/* 236 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// false -> Array#indexOf
+// true  -> Array#includes
+var toIObject = __webpack_require__(98);
+var toLength = __webpack_require__(136);
+var toAbsoluteIndex = __webpack_require__(254);
+module.exports = function (IS_INCLUDES) {
+  return function ($this, el, fromIndex) {
+    var O = toIObject($this);
+    var length = toLength(O.length);
+    var index = toAbsoluteIndex(fromIndex, length);
+    var value;
+    // Array#includes uses SameValueZero equality algorithm
+    // eslint-disable-next-line no-self-compare
+    if (IS_INCLUDES && el != el) while (length > index) {
+      value = O[index++];
+      // eslint-disable-next-line no-self-compare
+      if (value != value) return true;
+    // Array#indexOf ignores holes, Array#includes - not
+    } else for (;length > index; index++) if (IS_INCLUDES || index in O) {
+      if (O[index] === el) return IS_INCLUDES || index || 0;
+    } return !IS_INCLUDES && -1;
+  };
+};
+
+
+/***/ }),
+/* 237 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var ctx = __webpack_require__(70);
+var call = __webpack_require__(241);
+var isArrayIter = __webpack_require__(240);
+var anObject = __webpack_require__(35);
+var toLength = __webpack_require__(136);
+var getIterFn = __webpack_require__(257);
+var BREAK = {};
+var RETURN = {};
+var exports = module.exports = function (iterable, entries, fn, that, ITERATOR) {
+  var iterFn = ITERATOR ? function () { return iterable; } : getIterFn(iterable);
+  var f = ctx(fn, that, entries ? 2 : 1);
+  var index = 0;
+  var length, step, iterator, result;
+  if (typeof iterFn != 'function') throw TypeError(iterable + ' is not iterable!');
+  // fast case for arrays with default iterator
+  if (isArrayIter(iterFn)) for (length = toLength(iterable.length); length > index; index++) {
+    result = entries ? f(anObject(step = iterable[index])[0], step[1]) : f(iterable[index]);
+    if (result === BREAK || result === RETURN) return result;
+  } else for (iterator = iterFn.call(iterable); !(step = iterator.next()).done;) {
+    result = call(iterator, f, step.value, entries);
+    if (result === BREAK || result === RETURN) return result;
+  }
+};
+exports.BREAK = BREAK;
+exports.RETURN = RETURN;
+
+
+/***/ }),
+/* 238 */
+/***/ (function(module, exports, __webpack_require__) {
+
+module.exports = !__webpack_require__(51) && !__webpack_require__(112)(function () {
+  return Object.defineProperty(__webpack_require__(92)('div'), 'a', { get: function () { return 7; } }).a != 7;
+});
+
+
+/***/ }),
+/* 239 */
+/***/ (function(module, exports) {
+
+// fast apply, http://jsperf.lnkit.com/fast-apply/5
+module.exports = function (fn, args, that) {
+  var un = that === undefined;
+  switch (args.length) {
+    case 0: return un ? fn()
+                      : fn.call(that);
+    case 1: return un ? fn(args[0])
+                      : fn.call(that, args[0]);
+    case 2: return un ? fn(args[0], args[1])
+                      : fn.call(that, args[0], args[1]);
+    case 3: return un ? fn(args[0], args[1], args[2])
+                      : fn.call(that, args[0], args[1], args[2]);
+    case 4: return un ? fn(args[0], args[1], args[2], args[3])
+                      : fn.call(that, args[0], args[1], args[2], args[3]);
+  } return fn.apply(that, args);
+};
+
+
+/***/ }),
+/* 240 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// check on default Array iterator
+var Iterators = __webpack_require__(53);
+var ITERATOR = __webpack_require__(20)('iterator');
+var ArrayProto = Array.prototype;
+
+module.exports = function (it) {
+  return it !== undefined && (Iterators.Array === it || ArrayProto[ITERATOR] === it);
+};
+
+
+/***/ }),
+/* 241 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// call something on iterator step with safe closing on error
+var anObject = __webpack_require__(35);
+module.exports = function (iterator, fn, value, entries) {
+  try {
+    return entries ? fn(anObject(value)[0], value[1]) : fn(value);
+  // 7.4.6 IteratorClose(iterator, completion)
+  } catch (e) {
+    var ret = iterator['return'];
+    if (ret !== undefined) anObject(ret.call(iterator));
+    throw e;
+  }
+};
+
+
+/***/ }),
+/* 242 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var create = __webpack_require__(246);
+var descriptor = __webpack_require__(132);
+var setToStringTag = __webpack_require__(95);
+var IteratorPrototype = {};
+
+// 25.1.2.1.1 %IteratorPrototype%[@@iterator]()
+__webpack_require__(42)(IteratorPrototype, __webpack_require__(20)('iterator'), function () { return this; });
+
+module.exports = function (Constructor, NAME, next) {
+  Constructor.prototype = create(IteratorPrototype, { next: descriptor(1, next) });
+  setToStringTag(Constructor, NAME + ' Iterator');
+};
+
+
+/***/ }),
+/* 243 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var ITERATOR = __webpack_require__(20)('iterator');
+var SAFE_CLOSING = false;
+
+try {
+  var riter = [7][ITERATOR]();
+  riter['return'] = function () { SAFE_CLOSING = true; };
+  // eslint-disable-next-line no-throw-literal
+  Array.from(riter, function () { throw 2; });
+} catch (e) { /* empty */ }
+
+module.exports = function (exec, skipClosing) {
+  if (!skipClosing && !SAFE_CLOSING) return false;
+  var safe = false;
+  try {
+    var arr = [7];
+    var iter = arr[ITERATOR]();
+    iter.next = function () { return { done: safe = true }; };
+    arr[ITERATOR] = function () { return iter; };
+    exec(arr);
+  } catch (e) { /* empty */ }
+  return safe;
+};
+
+
+/***/ }),
+/* 244 */
+/***/ (function(module, exports) {
+
+module.exports = function (done, value) {
+  return { value: value, done: !!done };
+};
+
+
+/***/ }),
+/* 245 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var global = __webpack_require__(17);
+var macrotask = __webpack_require__(135).set;
+var Observer = global.MutationObserver || global.WebKitMutationObserver;
+var process = global.process;
+var Promise = global.Promise;
+var isNode = __webpack_require__(69)(process) == 'process';
+
+module.exports = function () {
+  var head, last, notify;
+
+  var flush = function () {
+    var parent, fn;
+    if (isNode && (parent = process.domain)) parent.exit();
+    while (head) {
+      fn = head.fn;
+      head = head.next;
+      try {
+        fn();
+      } catch (e) {
+        if (head) notify();
+        else last = undefined;
+        throw e;
+      }
+    } last = undefined;
+    if (parent) parent.enter();
+  };
+
+  // Node.js
+  if (isNode) {
+    notify = function () {
+      process.nextTick(flush);
+    };
+  // browsers with MutationObserver, except iOS Safari - https://github.com/zloirock/core-js/issues/339
+  } else if (Observer && !(global.navigator && global.navigator.standalone)) {
+    var toggle = true;
+    var node = document.createTextNode('');
+    new Observer(flush).observe(node, { characterData: true }); // eslint-disable-line no-new
+    notify = function () {
+      node.data = toggle = !toggle;
+    };
+  // environments with maybe non-completely correct, but existent Promise
+  } else if (Promise && Promise.resolve) {
+    // Promise.resolve without an argument throws an error in LG WebOS 2
+    var promise = Promise.resolve(undefined);
+    notify = function () {
+      promise.then(flush);
+    };
+  // for other environments - macrotask based on:
+  // - setImmediate
+  // - MessageChannel
+  // - window.postMessag
+  // - onreadystatechange
+  // - setTimeout
+  } else {
+    notify = function () {
+      // strange IE + webpack dev server bug - use .call(global)
+      macrotask.call(global, flush);
+    };
+  }
+
+  return function (fn) {
+    var task = { fn: fn, next: undefined };
+    if (last) last.next = task;
+    if (!head) {
+      head = task;
+      notify();
+    } last = task;
+  };
+};
+
+
+/***/ }),
+/* 246 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// 19.1.2.2 / 15.2.3.5 Object.create(O [, Properties])
+var anObject = __webpack_require__(35);
+var dPs = __webpack_require__(247);
+var enumBugKeys = __webpack_require__(127);
+var IE_PROTO = __webpack_require__(96)('IE_PROTO');
+var Empty = function () { /* empty */ };
+var PROTOTYPE = 'prototype';
+
+// Create object with fake `null` prototype: use iframe Object with cleared prototype
+var createDict = function () {
+  // Thrash, waste and sodomy: IE GC bug
+  var iframe = __webpack_require__(92)('iframe');
+  var i = enumBugKeys.length;
+  var lt = '<';
+  var gt = '>';
+  var iframeDocument;
+  iframe.style.display = 'none';
+  __webpack_require__(128).appendChild(iframe);
+  iframe.src = 'javascript:'; // eslint-disable-line no-script-url
+  // createDict = iframe.contentWindow.Object;
+  // html.removeChild(iframe);
+  iframeDocument = iframe.contentWindow.document;
+  iframeDocument.open();
+  iframeDocument.write(lt + 'script' + gt + 'document.F=Object' + lt + '/script' + gt);
+  iframeDocument.close();
+  createDict = iframeDocument.F;
+  while (i--) delete createDict[PROTOTYPE][enumBugKeys[i]];
+  return createDict();
+};
+
+module.exports = Object.create || function create(O, Properties) {
+  var result;
+  if (O !== null) {
+    Empty[PROTOTYPE] = anObject(O);
+    result = new Empty();
+    Empty[PROTOTYPE] = null;
+    // add "__proto__" for Object.getPrototypeOf polyfill
+    result[IE_PROTO] = O;
+  } else result = createDict();
+  return Properties === undefined ? result : dPs(result, Properties);
+};
+
+
+/***/ }),
+/* 247 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var dP = __webpack_require__(72);
+var anObject = __webpack_require__(35);
+var getKeys = __webpack_require__(171);
+
+module.exports = __webpack_require__(51) ? Object.defineProperties : function defineProperties(O, Properties) {
+  anObject(O);
+  var keys = getKeys(Properties);
+  var length = keys.length;
+  var i = 0;
+  var P;
+  while (length > i) dP.f(O, P = keys[i++], Properties[P]);
+  return O;
+};
+
+
+/***/ }),
+/* 248 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// 19.1.2.9 / 15.2.3.2 Object.getPrototypeOf(O)
+var has = __webpack_require__(71);
+var toObject = __webpack_require__(172);
+var IE_PROTO = __webpack_require__(96)('IE_PROTO');
+var ObjectProto = Object.prototype;
+
+module.exports = Object.getPrototypeOf || function (O) {
+  O = toObject(O);
+  if (has(O, IE_PROTO)) return O[IE_PROTO];
+  if (typeof O.constructor == 'function' && O instanceof O.constructor) {
+    return O.constructor.prototype;
+  } return O instanceof Object ? ObjectProto : null;
+};
+
+
+/***/ }),
+/* 249 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var has = __webpack_require__(71);
+var toIObject = __webpack_require__(98);
+var arrayIndexOf = __webpack_require__(236)(false);
+var IE_PROTO = __webpack_require__(96)('IE_PROTO');
+
+module.exports = function (object, names) {
+  var O = toIObject(object);
+  var i = 0;
+  var result = [];
+  var key;
+  for (key in O) if (key != IE_PROTO) has(O, key) && result.push(key);
+  // Don't enum bug & hidden keys
+  while (names.length > i) if (has(O, key = names[i++])) {
+    ~arrayIndexOf(result, key) || result.push(key);
+  }
+  return result;
+};
+
+
+/***/ }),
+/* 250 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var hide = __webpack_require__(42);
+module.exports = function (target, src, safe) {
+  for (var key in src) {
+    if (safe && target[key]) target[key] = src[key];
+    else hide(target, key, src[key]);
+  } return target;
+};
+
+
+/***/ }),
+/* 251 */
+/***/ (function(module, exports, __webpack_require__) {
+
+module.exports = __webpack_require__(42);
+
+
+/***/ }),
+/* 252 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var global = __webpack_require__(17);
+var core = __webpack_require__(31);
+var dP = __webpack_require__(72);
+var DESCRIPTORS = __webpack_require__(51);
+var SPECIES = __webpack_require__(20)('species');
+
+module.exports = function (KEY) {
+  var C = typeof core[KEY] == 'function' ? core[KEY] : global[KEY];
+  if (DESCRIPTORS && C && !C[SPECIES]) dP.f(C, SPECIES, {
+    configurable: true,
+    get: function () { return this; }
+  });
+};
+
+
+/***/ }),
+/* 253 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var toInteger = __webpack_require__(97);
+var defined = __webpack_require__(91);
+// true  -> String#at
+// false -> String#codePointAt
+module.exports = function (TO_STRING) {
+  return function (that, pos) {
+    var s = String(defined(that));
+    var i = toInteger(pos);
+    var l = s.length;
+    var a, b;
+    if (i < 0 || i >= l) return TO_STRING ? '' : undefined;
+    a = s.charCodeAt(i);
+    return a < 0xd800 || a > 0xdbff || i + 1 === l || (b = s.charCodeAt(i + 1)) < 0xdc00 || b > 0xdfff
+      ? TO_STRING ? s.charAt(i) : a
+      : TO_STRING ? s.slice(i, i + 2) : (a - 0xd800 << 10) + (b - 0xdc00) + 0x10000;
+  };
+};
+
+
+/***/ }),
+/* 254 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var toInteger = __webpack_require__(97);
+var max = Math.max;
+var min = Math.min;
+module.exports = function (index, length) {
+  index = toInteger(index);
+  return index < 0 ? max(index + length, 0) : min(index, length);
+};
+
+
+/***/ }),
+/* 255 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// 7.1.1 ToPrimitive(input [, PreferredType])
+var isObject = __webpack_require__(52);
+// instead of the ES6 spec version, we didn't implement @@toPrimitive case
+// and the second argument - flag - preferred type is a string
+module.exports = function (it, S) {
+  if (!isObject(it)) return it;
+  var fn, val;
+  if (S && typeof (fn = it.toString) == 'function' && !isObject(val = fn.call(it))) return val;
+  if (typeof (fn = it.valueOf) == 'function' && !isObject(val = fn.call(it))) return val;
+  if (!S && typeof (fn = it.toString) == 'function' && !isObject(val = fn.call(it))) return val;
+  throw TypeError("Can't convert object to primitive value");
+};
+
+
+/***/ }),
+/* 256 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var global = __webpack_require__(17);
+var navigator = global.navigator;
+
+module.exports = navigator && navigator.userAgent || '';
+
+
+/***/ }),
+/* 257 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var classof = __webpack_require__(126);
+var ITERATOR = __webpack_require__(20)('iterator');
+var Iterators = __webpack_require__(53);
+module.exports = __webpack_require__(31).getIteratorMethod = function (it) {
+  if (it != undefined) return it[ITERATOR]
+    || it['@@iterator']
+    || Iterators[classof(it)];
+};
+
+
+/***/ }),
+/* 258 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var addToUnscopables = __webpack_require__(234);
+var step = __webpack_require__(244);
+var Iterators = __webpack_require__(53);
+var toIObject = __webpack_require__(98);
+
+// 22.1.3.4 Array.prototype.entries()
+// 22.1.3.13 Array.prototype.keys()
+// 22.1.3.29 Array.prototype.values()
+// 22.1.3.30 Array.prototype[@@iterator]()
+module.exports = __webpack_require__(129)(Array, 'Array', function (iterated, kind) {
+  this._t = toIObject(iterated); // target
+  this._i = 0;                   // next index
+  this._k = kind;                // kind
+// 22.1.5.2.1 %ArrayIteratorPrototype%.next()
+}, function () {
+  var O = this._t;
+  var kind = this._k;
+  var index = this._i++;
+  if (!O || index >= O.length) {
+    this._t = undefined;
+    return step(1);
+  }
+  if (kind == 'keys') return step(0, index);
+  if (kind == 'values') return step(0, O[index]);
+  return step(0, [index, O[index]]);
+}, 'values');
+
+// argumentsList[@@iterator] is %ArrayProto_values% (9.4.4.6, 9.4.4.7)
+Iterators.Arguments = Iterators.Array;
+
+addToUnscopables('keys');
+addToUnscopables('values');
+addToUnscopables('entries');
+
+
+/***/ }),
+/* 259 */
+/***/ (function(module, exports) {
+
+
+
+/***/ }),
+/* 260 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var LIBRARY = __webpack_require__(93);
+var global = __webpack_require__(17);
+var ctx = __webpack_require__(70);
+var classof = __webpack_require__(126);
+var $export = __webpack_require__(60);
+var isObject = __webpack_require__(52);
+var aFunction = __webpack_require__(68);
+var anInstance = __webpack_require__(235);
+var forOf = __webpack_require__(237);
+var speciesConstructor = __webpack_require__(134);
+var task = __webpack_require__(135).set;
+var microtask = __webpack_require__(245)();
+var newPromiseCapabilityModule = __webpack_require__(94);
+var perform = __webpack_require__(130);
+var userAgent = __webpack_require__(256);
+var promiseResolve = __webpack_require__(131);
+var PROMISE = 'Promise';
+var TypeError = global.TypeError;
+var process = global.process;
+var versions = process && process.versions;
+var v8 = versions && versions.v8 || '';
+var $Promise = global[PROMISE];
+var isNode = classof(process) == 'process';
+var empty = function () { /* empty */ };
+var Internal, newGenericPromiseCapability, OwnPromiseCapability, Wrapper;
+var newPromiseCapability = newGenericPromiseCapability = newPromiseCapabilityModule.f;
+
+var USE_NATIVE = !!function () {
+  try {
+    // correct subclassing with @@species support
+    var promise = $Promise.resolve(1);
+    var FakePromise = (promise.constructor = {})[__webpack_require__(20)('species')] = function (exec) {
+      exec(empty, empty);
+    };
+    // unhandled rejections tracking support, NodeJS Promise without it fails @@species test
+    return (isNode || typeof PromiseRejectionEvent == 'function')
+      && promise.then(empty) instanceof FakePromise
+      // v8 6.6 (Node 10 and Chrome 66) have a bug with resolving custom thenables
+      // https://bugs.chromium.org/p/chromium/issues/detail?id=830565
+      // we can't detect it synchronously, so just check versions
+      && v8.indexOf('6.6') !== 0
+      && userAgent.indexOf('Chrome/66') === -1;
+  } catch (e) { /* empty */ }
+}();
+
+// helpers
+var isThenable = function (it) {
+  var then;
+  return isObject(it) && typeof (then = it.then) == 'function' ? then : false;
+};
+var notify = function (promise, isReject) {
+  if (promise._n) return;
+  promise._n = true;
+  var chain = promise._c;
+  microtask(function () {
+    var value = promise._v;
+    var ok = promise._s == 1;
+    var i = 0;
+    var run = function (reaction) {
+      var handler = ok ? reaction.ok : reaction.fail;
+      var resolve = reaction.resolve;
+      var reject = reaction.reject;
+      var domain = reaction.domain;
+      var result, then, exited;
+      try {
+        if (handler) {
+          if (!ok) {
+            if (promise._h == 2) onHandleUnhandled(promise);
+            promise._h = 1;
+          }
+          if (handler === true) result = value;
+          else {
+            if (domain) domain.enter();
+            result = handler(value); // may throw
+            if (domain) {
+              domain.exit();
+              exited = true;
+            }
+          }
+          if (result === reaction.promise) {
+            reject(TypeError('Promise-chain cycle'));
+          } else if (then = isThenable(result)) {
+            then.call(result, resolve, reject);
+          } else resolve(result);
+        } else reject(value);
+      } catch (e) {
+        if (domain && !exited) domain.exit();
+        reject(e);
+      }
+    };
+    while (chain.length > i) run(chain[i++]); // variable length - can't use forEach
+    promise._c = [];
+    promise._n = false;
+    if (isReject && !promise._h) onUnhandled(promise);
+  });
+};
+var onUnhandled = function (promise) {
+  task.call(global, function () {
+    var value = promise._v;
+    var unhandled = isUnhandled(promise);
+    var result, handler, console;
+    if (unhandled) {
+      result = perform(function () {
+        if (isNode) {
+          process.emit('unhandledRejection', value, promise);
+        } else if (handler = global.onunhandledrejection) {
+          handler({ promise: promise, reason: value });
+        } else if ((console = global.console) && console.error) {
+          console.error('Unhandled promise rejection', value);
+        }
+      });
+      // Browsers should not trigger `rejectionHandled` event if it was handled here, NodeJS - should
+      promise._h = isNode || isUnhandled(promise) ? 2 : 1;
+    } promise._a = undefined;
+    if (unhandled && result.e) throw result.v;
+  });
+};
+var isUnhandled = function (promise) {
+  return promise._h !== 1 && (promise._a || promise._c).length === 0;
+};
+var onHandleUnhandled = function (promise) {
+  task.call(global, function () {
+    var handler;
+    if (isNode) {
+      process.emit('rejectionHandled', promise);
+    } else if (handler = global.onrejectionhandled) {
+      handler({ promise: promise, reason: promise._v });
+    }
+  });
+};
+var $reject = function (value) {
+  var promise = this;
+  if (promise._d) return;
+  promise._d = true;
+  promise = promise._w || promise; // unwrap
+  promise._v = value;
+  promise._s = 2;
+  if (!promise._a) promise._a = promise._c.slice();
+  notify(promise, true);
+};
+var $resolve = function (value) {
+  var promise = this;
+  var then;
+  if (promise._d) return;
+  promise._d = true;
+  promise = promise._w || promise; // unwrap
+  try {
+    if (promise === value) throw TypeError("Promise can't be resolved itself");
+    if (then = isThenable(value)) {
+      microtask(function () {
+        var wrapper = { _w: promise, _d: false }; // wrap
+        try {
+          then.call(value, ctx($resolve, wrapper, 1), ctx($reject, wrapper, 1));
+        } catch (e) {
+          $reject.call(wrapper, e);
+        }
+      });
+    } else {
+      promise._v = value;
+      promise._s = 1;
+      notify(promise, false);
+    }
+  } catch (e) {
+    $reject.call({ _w: promise, _d: false }, e); // wrap
+  }
+};
+
+// constructor polyfill
+if (!USE_NATIVE) {
+  // 25.4.3.1 Promise(executor)
+  $Promise = function Promise(executor) {
+    anInstance(this, $Promise, PROMISE, '_h');
+    aFunction(executor);
+    Internal.call(this);
+    try {
+      executor(ctx($resolve, this, 1), ctx($reject, this, 1));
+    } catch (err) {
+      $reject.call(this, err);
+    }
+  };
+  // eslint-disable-next-line no-unused-vars
+  Internal = function Promise(executor) {
+    this._c = [];             // <- awaiting reactions
+    this._a = undefined;      // <- checked in isUnhandled reactions
+    this._s = 0;              // <- state
+    this._d = false;          // <- done
+    this._v = undefined;      // <- value
+    this._h = 0;              // <- rejection state, 0 - default, 1 - handled, 2 - unhandled
+    this._n = false;          // <- notify
+  };
+  Internal.prototype = __webpack_require__(250)($Promise.prototype, {
+    // 25.4.5.3 Promise.prototype.then(onFulfilled, onRejected)
+    then: function then(onFulfilled, onRejected) {
+      var reaction = newPromiseCapability(speciesConstructor(this, $Promise));
+      reaction.ok = typeof onFulfilled == 'function' ? onFulfilled : true;
+      reaction.fail = typeof onRejected == 'function' && onRejected;
+      reaction.domain = isNode ? process.domain : undefined;
+      this._c.push(reaction);
+      if (this._a) this._a.push(reaction);
+      if (this._s) notify(this, false);
+      return reaction.promise;
+    },
+    // 25.4.5.1 Promise.prototype.catch(onRejected)
+    'catch': function (onRejected) {
+      return this.then(undefined, onRejected);
+    }
+  });
+  OwnPromiseCapability = function () {
+    var promise = new Internal();
+    this.promise = promise;
+    this.resolve = ctx($resolve, promise, 1);
+    this.reject = ctx($reject, promise, 1);
+  };
+  newPromiseCapabilityModule.f = newPromiseCapability = function (C) {
+    return C === $Promise || C === Wrapper
+      ? new OwnPromiseCapability(C)
+      : newGenericPromiseCapability(C);
+  };
+}
+
+$export($export.G + $export.W + $export.F * !USE_NATIVE, { Promise: $Promise });
+__webpack_require__(95)($Promise, PROMISE);
+__webpack_require__(252)(PROMISE);
+Wrapper = __webpack_require__(31)[PROMISE];
+
+// statics
+$export($export.S + $export.F * !USE_NATIVE, PROMISE, {
+  // 25.4.4.5 Promise.reject(r)
+  reject: function reject(r) {
+    var capability = newPromiseCapability(this);
+    var $$reject = capability.reject;
+    $$reject(r);
+    return capability.promise;
+  }
+});
+$export($export.S + $export.F * (LIBRARY || !USE_NATIVE), PROMISE, {
+  // 25.4.4.6 Promise.resolve(x)
+  resolve: function resolve(x) {
+    return promiseResolve(LIBRARY && this === Wrapper ? $Promise : this, x);
+  }
+});
+$export($export.S + $export.F * !(USE_NATIVE && __webpack_require__(243)(function (iter) {
+  $Promise.all(iter)['catch'](empty);
+})), PROMISE, {
+  // 25.4.4.1 Promise.all(iterable)
+  all: function all(iterable) {
+    var C = this;
+    var capability = newPromiseCapability(C);
+    var resolve = capability.resolve;
+    var reject = capability.reject;
+    var result = perform(function () {
+      var values = [];
+      var index = 0;
+      var remaining = 1;
+      forOf(iterable, false, function (promise) {
+        var $index = index++;
+        var alreadyCalled = false;
+        values.push(undefined);
+        remaining++;
+        C.resolve(promise).then(function (value) {
+          if (alreadyCalled) return;
+          alreadyCalled = true;
+          values[$index] = value;
+          --remaining || resolve(values);
+        }, reject);
+      });
+      --remaining || resolve(values);
+    });
+    if (result.e) reject(result.v);
+    return capability.promise;
+  },
+  // 25.4.4.4 Promise.race(iterable)
+  race: function race(iterable) {
+    var C = this;
+    var capability = newPromiseCapability(C);
+    var reject = capability.reject;
+    var result = perform(function () {
+      forOf(iterable, false, function (promise) {
+        C.resolve(promise).then(capability.resolve, reject);
+      });
+    });
+    if (result.e) reject(result.v);
+    return capability.promise;
+  }
+});
+
+
+/***/ }),
+/* 261 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var $at = __webpack_require__(253)(true);
+
+// 21.1.3.27 String.prototype[@@iterator]()
+__webpack_require__(129)(String, 'String', function (iterated) {
+  this._t = String(iterated); // target
+  this._i = 0;                // next index
+// 21.1.5.2.1 %StringIteratorPrototype%.next()
+}, function () {
+  var O = this._t;
+  var index = this._i;
+  var point;
+  if (index >= O.length) return { value: undefined, done: true };
+  point = $at(O, index);
+  this._i += point.length;
+  return { value: point, done: false };
+});
+
+
+/***/ }),
+/* 262 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+// https://github.com/tc39/proposal-promise-finally
+
+var $export = __webpack_require__(60);
+var core = __webpack_require__(31);
+var global = __webpack_require__(17);
+var speciesConstructor = __webpack_require__(134);
+var promiseResolve = __webpack_require__(131);
+
+$export($export.P + $export.R, 'Promise', { 'finally': function (onFinally) {
+  var C = speciesConstructor(this, core.Promise || global.Promise);
+  var isFunction = typeof onFinally == 'function';
+  return this.then(
+    isFunction ? function (x) {
+      return promiseResolve(C, onFinally()).then(function () { return x; });
+    } : onFinally,
+    isFunction ? function (e) {
+      return promiseResolve(C, onFinally()).then(function () { throw e; });
+    } : onFinally
+  );
+} });
+
+
+/***/ }),
+/* 263 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+// https://github.com/tc39/proposal-promise-try
+var $export = __webpack_require__(60);
+var newPromiseCapability = __webpack_require__(94);
+var perform = __webpack_require__(130);
+
+$export($export.S, 'Promise', { 'try': function (callbackfn) {
+  var promiseCapability = newPromiseCapability.f(this);
+  var result = perform(callbackfn);
+  (result.e ? promiseCapability.reject : promiseCapability.resolve)(result.v);
+  return promiseCapability.promise;
+} });
+
+
+/***/ }),
+/* 264 */
+/***/ (function(module, exports, __webpack_require__) {
+
+__webpack_require__(258);
+var global = __webpack_require__(17);
+var hide = __webpack_require__(42);
+var Iterators = __webpack_require__(53);
+var TO_STRING_TAG = __webpack_require__(20)('toStringTag');
+
+var DOMIterables = ('CSSRuleList,CSSStyleDeclaration,CSSValueList,ClientRectList,DOMRectList,DOMStringList,' +
+  'DOMTokenList,DataTransferItemList,FileList,HTMLAllCollection,HTMLCollection,HTMLFormElement,HTMLSelectElement,' +
+  'MediaList,MimeTypeArray,NamedNodeMap,NodeList,PaintRequestList,Plugin,PluginArray,SVGLengthList,SVGNumberList,' +
+  'SVGPathSegList,SVGPointList,SVGStringList,SVGTransformList,SourceBufferList,StyleSheetList,TextTrackCueList,' +
+  'TextTrackList,TouchList').split(',');
+
+for (var i = 0; i < DOMIterables.length; i++) {
+  var NAME = DOMIterables[i];
+  var Collection = global[NAME];
+  var proto = Collection && Collection.prototype;
+  if (proto && !proto[TO_STRING_TAG]) hide(proto, TO_STRING_TAG, NAME);
+  Iterators[NAME] = Iterators.Array;
+}
+
+
+/***/ }),
+/* 265 */
+/***/ (function(module, exports, __webpack_require__) {
+
+/**
+ * This is the web browser implementation of `debug()`.
+ *
+ * Expose `debug()` as the module.
+ */
+
+exports = module.exports = __webpack_require__(138);
+exports.log = log;
+exports.formatArgs = formatArgs;
+exports.save = save;
+exports.load = load;
+exports.useColors = useColors;
+exports.storage = 'undefined' != typeof chrome
+               && 'undefined' != typeof chrome.storage
+                  ? chrome.storage.local
+                  : localstorage();
+
+/**
+ * Colors.
+ */
+
+exports.colors = [
+  '#0000CC', '#0000FF', '#0033CC', '#0033FF', '#0066CC', '#0066FF', '#0099CC',
+  '#0099FF', '#00CC00', '#00CC33', '#00CC66', '#00CC99', '#00CCCC', '#00CCFF',
+  '#3300CC', '#3300FF', '#3333CC', '#3333FF', '#3366CC', '#3366FF', '#3399CC',
+  '#3399FF', '#33CC00', '#33CC33', '#33CC66', '#33CC99', '#33CCCC', '#33CCFF',
+  '#6600CC', '#6600FF', '#6633CC', '#6633FF', '#66CC00', '#66CC33', '#9900CC',
+  '#9900FF', '#9933CC', '#9933FF', '#99CC00', '#99CC33', '#CC0000', '#CC0033',
+  '#CC0066', '#CC0099', '#CC00CC', '#CC00FF', '#CC3300', '#CC3333', '#CC3366',
+  '#CC3399', '#CC33CC', '#CC33FF', '#CC6600', '#CC6633', '#CC9900', '#CC9933',
+  '#CCCC00', '#CCCC33', '#FF0000', '#FF0033', '#FF0066', '#FF0099', '#FF00CC',
+  '#FF00FF', '#FF3300', '#FF3333', '#FF3366', '#FF3399', '#FF33CC', '#FF33FF',
+  '#FF6600', '#FF6633', '#FF9900', '#FF9933', '#FFCC00', '#FFCC33'
+];
+
+/**
+ * Currently only WebKit-based Web Inspectors, Firefox >= v31,
+ * and the Firebug extension (any Firefox version) are known
+ * to support "%c" CSS customizations.
+ *
+ * TODO: add a `localStorage` variable to explicitly enable/disable colors
+ */
+
+function useColors() {
+  // NB: In an Electron preload script, document will be defined but not fully
+  // initialized. Since we know we're in Chrome, we'll just detect this case
+  // explicitly
+  if (typeof window !== 'undefined' && window.process && window.process.type === 'renderer') {
+    return true;
+  }
+
+  // Internet Explorer and Edge do not support colors.
+  if (typeof navigator !== 'undefined' && navigator.userAgent && navigator.userAgent.toLowerCase().match(/(edge|trident)\/(\d+)/)) {
+    return false;
+  }
+
+  // is webkit? http://stackoverflow.com/a/16459606/376773
+  // document is undefined in react-native: https://github.com/facebook/react-native/pull/1632
+  return (typeof document !== 'undefined' && document.documentElement && document.documentElement.style && document.documentElement.style.WebkitAppearance) ||
+    // is firebug? http://stackoverflow.com/a/398120/376773
+    (typeof window !== 'undefined' && window.console && (window.console.firebug || (window.console.exception && window.console.table))) ||
+    // is firefox >= v31?
+    // https://developer.mozilla.org/en-US/docs/Tools/Web_Console#Styling_messages
+    (typeof navigator !== 'undefined' && navigator.userAgent && navigator.userAgent.toLowerCase().match(/firefox\/(\d+)/) && parseInt(RegExp.$1, 10) >= 31) ||
+    // double check webkit in userAgent just in case we are in a worker
+    (typeof navigator !== 'undefined' && navigator.userAgent && navigator.userAgent.toLowerCase().match(/applewebkit\/(\d+)/));
+}
+
+/**
+ * Map %j to `JSON.stringify()`, since no Web Inspectors do that by default.
+ */
+
+exports.formatters.j = function(v) {
+  try {
+    return JSON.stringify(v);
+  } catch (err) {
+    return '[UnexpectedJSONParseError]: ' + err.message;
+  }
+};
+
+
+/**
+ * Colorize log arguments if enabled.
+ *
+ * @api public
+ */
+
+function formatArgs(args) {
+  var useColors = this.useColors;
+
+  args[0] = (useColors ? '%c' : '')
+    + this.namespace
+    + (useColors ? ' %c' : ' ')
+    + args[0]
+    + (useColors ? '%c ' : ' ')
+    + '+' + exports.humanize(this.diff);
+
+  if (!useColors) return;
+
+  var c = 'color: ' + this.color;
+  args.splice(1, 0, c, 'color: inherit')
+
+  // the final "%c" is somewhat tricky, because there could be other
+  // arguments passed either before or after the %c, so we need to
+  // figure out the correct index to insert the CSS into
+  var index = 0;
+  var lastC = 0;
+  args[0].replace(/%[a-zA-Z%]/g, function(match) {
+    if ('%%' === match) return;
+    index++;
+    if ('%c' === match) {
+      // we only are interested in the *last* %c
+      // (the user may have provided their own)
+      lastC = index;
+    }
+  });
+
+  args.splice(lastC, 0, c);
+}
+
+/**
+ * Invokes `console.log()` when available.
+ * No-op when `console.log` is not a "function".
+ *
+ * @api public
+ */
+
+function log() {
+  // this hackery is required for IE8/9, where
+  // the `console.log` function doesn't have 'apply'
+  return 'object' === typeof console
+    && console.log
+    && Function.prototype.apply.call(console.log, console, arguments);
+}
+
+/**
+ * Save `namespaces`.
+ *
+ * @param {String} namespaces
+ * @api private
+ */
+
+function save(namespaces) {
+  try {
+    if (null == namespaces) {
+      exports.storage.removeItem('debug');
+    } else {
+      exports.storage.debug = namespaces;
+    }
+  } catch(e) {}
+}
+
+/**
+ * Load `namespaces`.
+ *
+ * @return {String} returns the previously persisted debug modes
+ * @api private
+ */
+
+function load() {
+  var r;
+  try {
+    r = exports.storage.debug;
+  } catch(e) {}
+
+  // If debug isn't set in LS, and we're in Electron, try to load $DEBUG
+  if (!r && typeof process !== 'undefined' && 'env' in process) {
+    r = process.env.DEBUG;
+  }
+
+  return r;
+}
+
+/**
+ * Enable namespaces listed in `localStorage.debug` initially.
+ */
+
+exports.enable(load());
+
+/**
+ * Localstorage attempts to return the localstorage.
+ *
+ * This is necessary because safari throws
+ * when a user disables cookies/localstorage
+ * and you attempt to access it.
+ *
+ * @return {LocalStorage}
+ * @api private
+ */
+
+function localstorage() {
+  try {
+    return window.localStorage;
+  } catch (e) {}
+}
+
+
+/***/ }),
+/* 266 */
+/***/ (function(module, exports, __webpack_require__) {
+
+/**
+ * Detect Electron renderer process, which is node, but we should
+ * treat as a browser.
+ */
+
+if (typeof process === 'undefined' || process.type === 'renderer') {
+  module.exports = __webpack_require__(265);
+} else {
+  module.exports = __webpack_require__(267);
+}
+
+
+/***/ }),
+/* 267 */
+/***/ (function(module, exports, __webpack_require__) {
+
+/**
+ * Module dependencies.
+ */
+
+var tty = __webpack_require__(104);
+var util = __webpack_require__(3);
+
+/**
+ * This is the Node.js implementation of `debug()`.
+ *
+ * Expose `debug()` as the module.
+ */
+
+exports = module.exports = __webpack_require__(138);
+exports.init = init;
+exports.log = log;
+exports.formatArgs = formatArgs;
+exports.save = save;
+exports.load = load;
+exports.useColors = useColors;
+
+/**
+ * Colors.
+ */
+
+exports.colors = [ 6, 2, 3, 4, 5, 1 ];
+
+try {
+  var supportsColor = __webpack_require__(330);
+  if (supportsColor && supportsColor.level >= 2) {
+    exports.colors = [
+      20, 21, 26, 27, 32, 33, 38, 39, 40, 41, 42, 43, 44, 45, 56, 57, 62, 63, 68,
+      69, 74, 75, 76, 77, 78, 79, 80, 81, 92, 93, 98, 99, 112, 113, 128, 129, 134,
+      135, 148, 149, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171,
+      172, 173, 178, 179, 184, 185, 196, 197, 198, 199, 200, 201, 202, 203, 204,
+      205, 206, 207, 208, 209, 214, 215, 220, 221
+    ];
+  }
+} catch (err) {
+  // swallow - we only care if `supports-color` is available; it doesn't have to be.
+}
+
+/**
+ * Build up the default `inspectOpts` object from the environment variables.
+ *
+ *   $ DEBUG_COLORS=no DEBUG_DEPTH=10 DEBUG_SHOW_HIDDEN=enabled node script.js
+ */
+
+exports.inspectOpts = Object.keys(process.env).filter(function (key) {
+  return /^debug_/i.test(key);
+}).reduce(function (obj, key) {
+  // camel-case
+  var prop = key
+    .substring(6)
+    .toLowerCase()
+    .replace(/_([a-z])/g, function (_, k) { return k.toUpperCase() });
+
+  // coerce string value into JS value
+  var val = process.env[key];
+  if (/^(yes|on|true|enabled)$/i.test(val)) val = true;
+  else if (/^(no|off|false|disabled)$/i.test(val)) val = false;
+  else if (val === 'null') val = null;
+  else val = Number(val);
+
+  obj[prop] = val;
+  return obj;
+}, {});
+
+/**
+ * Is stdout a TTY? Colored output is enabled when `true`.
+ */
+
+function useColors() {
+  return 'colors' in exports.inspectOpts
+    ? Boolean(exports.inspectOpts.colors)
+    : tty.isatty(process.stderr.fd);
+}
+
+/**
+ * Map %o to `util.inspect()`, all on a single line.
+ */
+
+exports.formatters.o = function(v) {
+  this.inspectOpts.colors = this.useColors;
+  return util.inspect(v, this.inspectOpts)
+    .split('\n').map(function(str) {
+      return str.trim()
+    }).join(' ');
+};
+
+/**
+ * Map %o to `util.inspect()`, allowing multiple lines if needed.
+ */
+
+exports.formatters.O = function(v) {
+  this.inspectOpts.colors = this.useColors;
+  return util.inspect(v, this.inspectOpts);
+};
+
+/**
+ * Adds ANSI color escape codes if enabled.
+ *
+ * @api public
+ */
+
+function formatArgs(args) {
+  var name = this.namespace;
+  var useColors = this.useColors;
+
+  if (useColors) {
+    var c = this.color;
+    var colorCode = '\u001b[3' + (c < 8 ? c : '8;5;' + c);
+    var prefix = '  ' + colorCode + ';1m' + name + ' ' + '\u001b[0m';
+
+    args[0] = prefix + args[0].split('\n').join('\n' + prefix);
+    args.push(colorCode + 'm+' + exports.humanize(this.diff) + '\u001b[0m');
+  } else {
+    args[0] = getDate() + name + ' ' + args[0];
+  }
+}
+
+function getDate() {
+  if (exports.inspectOpts.hideDate) {
+    return '';
+  } else {
+    return new Date().toISOString() + ' ';
+  }
+}
+
+/**
+ * Invokes `util.format()` with the specified arguments and writes to stderr.
+ */
+
+function log() {
+  return process.stderr.write(util.format.apply(util, arguments) + '\n');
+}
+
+/**
+ * Save `namespaces`.
+ *
+ * @param {String} namespaces
+ * @api private
+ */
+
+function save(namespaces) {
+  if (null == namespaces) {
+    // If you set a process.env field to null or undefined, it gets cast to the
+    // string 'null' or 'undefined'. Just delete instead.
+    delete process.env.DEBUG;
+  } else {
+    process.env.DEBUG = namespaces;
+  }
+}
+
+/**
+ * Load `namespaces`.
+ *
+ * @return {String} returns the previously persisted debug modes
+ * @api private
+ */
+
+function load() {
+  return process.env.DEBUG;
+}
+
+/**
+ * Init logic for `debug` instances.
+ *
+ * Create a new `inspectOpts` object in case `useColors` is set
+ * differently for a particular `debug` instance.
+ */
+
+function init (debug) {
+  debug.inspectOpts = {};
+
+  var keys = Object.keys(exports.inspectOpts);
+  for (var i = 0; i < keys.length; i++) {
+    debug.inspectOpts[keys[i]] = exports.inspectOpts[keys[i]];
+  }
+}
+
+/**
+ * Enable namespaces listed in `process.env.DEBUG` initially.
+ */
+
+exports.enable(load());
+
+
+/***/ }),
+/* 268 */
+/***/ (function(module, exports, __webpack_require__) {
+
+(function webpackUniversalModuleDefinition(root, factory) {
+/* istanbul ignore next */
+	if(true)
+		module.exports = factory();
+	else if(typeof define === 'function' && define.amd)
+		define([], factory);
+/* istanbul ignore next */
+	else if(typeof exports === 'object')
+		exports["esprima"] = factory();
+	else
+		root["esprima"] = factory();
+})(this, function() {
+return /******/ (function(modules) { // webpackBootstrap
+/******/ 	// The module cache
+/******/ 	var installedModules = {};
+
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+
+/******/ 		// Check if module is in cache
+/* istanbul ignore if */
+/******/ 		if(installedModules[moduleId])
+/******/ 			return installedModules[moduleId].exports;
+
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = installedModules[moduleId] = {
+/******/ 			exports: {},
+/******/ 			id: moduleId,
+/******/ 			loaded: false
+/******/ 		};
+
+/******/ 		// Execute the module function
+/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+
+/******/ 		// Flag the module as loaded
+/******/ 		module.loaded = true;
+
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+
+
+/******/ 	// expose the modules object (__webpack_modules__)
+/******/ 	__webpack_require__.m = modules;
+
+/******/ 	// expose the module cache
+/******/ 	__webpack_require__.c = installedModules;
+
+/******/ 	// __webpack_public_path__
+/******/ 	__webpack_require__.p = "";
+
+/******/ 	// Load entry module and return exports
+/******/ 	return __webpack_require__(0);
+/******/ })
+/************************************************************************/
+/******/ ([
+/* 0 */
+/***/ function(module, exports, __webpack_require__) {
+
+	"use strict";
+	/*
+	  Copyright JS Foundation and other contributors, https://js.foundation/
+
+	  Redistribution and use in source and binary forms, with or without
+	  modification, are permitted provided that the following conditions are met:
+
+	    * Redistributions of source code must retain the above copyright
+	      notice, this list of conditions and the following disclaimer.
+	    * Redistributions in binary form must reproduce the above copyright
+	      notice, this list of conditions and the following disclaimer in the
+	      documentation and/or other materials provided with the distribution.
+
+	  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+	  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+	  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+	  ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+	  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+	  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+	  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+	  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+	  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+	  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+	*/
+	Object.defineProperty(exports, "__esModule", { value: true });
+	var comment_handler_1 = __webpack_require__(1);
+	var jsx_parser_1 = __webpack_require__(3);
+	var parser_1 = __webpack_require__(8);
+	var tokenizer_1 = __webpack_require__(15);
+	function parse(code, options, delegate) {
+	    var commentHandler = null;
+	    var proxyDelegate = function (node, metadata) {
+	        if (delegate) {
+	            delegate(node, metadata);
+	        }
+	        if (commentHandler) {
+	            commentHandler.visit(node, metadata);
+	        }
+	    };
+	    var parserDelegate = (typeof delegate === 'function') ? proxyDelegate : null;
+	    var collectComment = false;
+	    if (options) {
+	        collectComment = (typeof options.comment === 'boolean' && options.comment);
+	        var attachComment = (typeof options.attachComment === 'boolean' && options.attachComment);
+	        if (collectComment || attachComment) {
+	            commentHandler = new comment_handler_1.CommentHandler();
+	            commentHandler.attach = attachComment;
+	            options.comment = true;
+	            parserDelegate = proxyDelegate;
+	        }
+	    }
+	    var isModule = false;
+	    if (options && typeof options.sourceType === 'string') {
+	        isModule = (options.sourceType === 'module');
+	    }
+	    var parser;
+	    if (options && typeof options.jsx === 'boolean' && options.jsx) {
+	        parser = new jsx_parser_1.JSXParser(code, options, parserDelegate);
+	    }
+	    else {
+	        parser = new parser_1.Parser(code, options, parserDelegate);
+	    }
+	    var program = isModule ? parser.parseModule() : parser.parseScript();
+	    var ast = program;
+	    if (collectComment && commentHandler) {
+	        ast.comments = commentHandler.comments;
+	    }
+	    if (parser.config.tokens) {
+	        ast.tokens = parser.tokens;
+	    }
+	    if (parser.config.tolerant) {
+	        ast.errors = parser.errorHandler.errors;
+	    }
+	    return ast;
+	}
+	exports.parse = parse;
+	function parseModule(code, options, delegate) {
+	    var parsingOptions = options || {};
+	    parsingOptions.sourceType = 'module';
+	    return parse(code, parsingOptions, delegate);
+	}
+	exports.parseModule = parseModule;
+	function parseScript(code, options, delegate) {
+	    var parsingOptions = options || {};
+	    parsingOptions.sourceType = 'script';
+	    return parse(code, parsingOptions, delegate);
+	}
+	exports.parseScript = parseScript;
+	function tokenize(code, options, delegate) {
+	    var tokenizer = new tokenizer_1.Tokenizer(code, options);
+	    var tokens;
+	    tokens = [];
+	    try {
+	        while (true) {
+	            var token = tokenizer.getNextToken();
+	            if (!token) {
+	                break;
+	            }
+	            if (delegate) {
+	                token = delegate(token);
+	            }
+	            tokens.push(token);
+	        }
+	    }
+	    catch (e) {
+	        tokenizer.errorHandler.tolerate(e);
+	    }
+	    if (tokenizer.errorHandler.tolerant) {
+	        tokens.errors = tokenizer.errors();
+	    }
+	    return tokens;
+	}
+	exports.tokenize = tokenize;
+	var syntax_1 = __webpack_require__(2);
+	exports.Syntax = syntax_1.Syntax;
+	// Sync with *.json manifests.
+	exports.version = '4.0.1';
+
+
+/***/ },
+/* 1 */
+/***/ function(module, exports, __webpack_require__) {
+
+	"use strict";
+	Object.defineProperty(exports, "__esModule", { value: true });
+	var syntax_1 = __webpack_require__(2);
+	var CommentHandler = (function () {
+	    function CommentHandler() {
+	        this.attach = false;
+	        this.comments = [];
+	        this.stack = [];
+	        this.leading = [];
+	        this.trailing = [];
+	    }
+	    CommentHandler.prototype.insertInnerComments = function (node, metadata) {
+	        //  innnerComments for properties empty block
+	        //  `function a() {/** comments **\/}`
+	        if (node.type === syntax_1.Syntax.BlockStatement && node.body.length === 0) {
+	            var innerComments = [];
+	            for (var i = this.leading.length - 1; i >= 0; --i) {
+	                var entry = this.leading[i];
+	                if (metadata.end.offset >= entry.start) {
+	                    innerComments.unshift(entry.comment);
+	                    this.leading.splice(i, 1);
+	                    this.trailing.splice(i, 1);
+	                }
+	            }
+	            if (innerComments.length) {
+	                node.innerComments = innerComments;
+	            }
+	        }
+	    };
+	    CommentHandler.prototype.findTrailingComments = function (metadata) {
+	        var trailingComments = [];
+	        if (this.trailing.length > 0) {
+	            for (var i = this.trailing.length - 1; i >= 0; --i) {
+	                var entry_1 = this.trailing[i];
+	                if (entry_1.start >= metadata.end.offset) {
+	                    trailingComments.unshift(entry_1.comment);
+	                }
+	            }
+	            this.trailing.length = 0;
+	            return trailingComments;
+	        }
+	        var entry = this.stack[this.stack.length - 1];
+	        if (entry && entry.node.trailingComments) {
+	            var firstComment = entry.node.trailingComments[0];
+	            if (firstComment && firstComment.range[0] >= metadata.end.offset) {
+	                trailingComments = entry.node.trailingComments;
+	                delete entry.node.trailingComments;
+	            }
+	        }
+	        return trailingComments;
+	    };
+	    CommentHandler.prototype.findLeadingComments = function (metadata) {
+	        var leadingComments = [];
+	        var target;
+	        while (this.stack.length > 0) {
+	            var entry = this.stack[this.stack.length - 1];
+	            if (entry && entry.start >= metadata.start.offset) {
+	                target = entry.node;
+	                this.stack.pop();
+	            }
+	            else {
+	                break;
+	            }
+	        }
+	        if (target) {
+	            var count = target.leadingComments ? target.leadingComments.length : 0;
+	            for (var i = count - 1; i >= 0; --i) {
+	                var comment = target.leadingComments[i];
+	                if (comment.range[1] <= metadata.start.offset) {
+	                    leadingComments.unshift(comment);
+	                    target.leadingComments.splice(i, 1);
+	                }
+	            }
+	            if (target.leadingComments && target.leadingComments.length === 0) {
+	                delete target.leadingComments;
+	            }
+	            return leadingComments;
+	        }
+	        for (var i = this.leading.length - 1; i >= 0; --i) {
+	            var entry = this.leading[i];
+	            if (entry.start <= metadata.start.offset) {
+	                leadingComments.unshift(entry.comment);
+	                this.leading.splice(i, 1);
+	            }
+	        }
+	        return leadingComments;
+	    };
+	    CommentHandler.prototype.visitNode = function (node, metadata) {
+	        if (node.type === syntax_1.Syntax.Program && node.body.length > 0) {
+	            return;
+	        }
+	        this.insertInnerComments(node, metadata);
+	        var trailingComments = this.findTrailingComments(metadata);
+	        var leadingComments = this.findLeadingComments(metadata);
+	        if (leadingComments.length > 0) {
+	            node.leadingComments = leadingComments;
+	        }
+	        if (trailingComments.length > 0) {
+	            node.trailingComments = trailingComments;
+	        }
+	        this.stack.push({
+	            node: node,
+	            start: metadata.start.offset
+	        });
+	    };
+	    CommentHandler.prototype.visitComment = function (node, metadata) {
+	        var type = (node.type[0] === 'L') ? 'Line' : 'Block';
+	        var comment = {
+	            type: type,
+	            value: node.value
+	        };
+	        if (node.range) {
+	            comment.range = node.range;
+	        }
+	        if (node.loc) {
+	            comment.loc = node.loc;
+	        }
+	        this.comments.push(comment);
+	        if (this.attach) {
+	            var entry = {
+	                comment: {
+	                    type: type,
+	                    value: node.value,
+	                    range: [metadata.start.offset, metadata.end.offset]
+	                },
+	                start: metadata.start.offset
+	            };
+	            if (node.loc) {
+	                entry.comment.loc = node.loc;
+	            }
+	            node.type = type;
+	            this.leading.push(entry);
+	            this.trailing.push(entry);
+	        }
+	    };
+	    CommentHandler.prototype.visit = function (node, metadata) {
+	        if (node.type === 'LineComment') {
+	            this.visitComment(node, metadata);
+	        }
+	        else if (node.type === 'BlockComment') {
+	            this.visitComment(node, metadata);
+	        }
+	        else if (this.attach) {
+	            this.visitNode(node, metadata);
+	        }
+	    };
+	    return CommentHandler;
+	}());
+	exports.CommentHandler = CommentHandler;
+
+
+/***/ },
+/* 2 */
+/***/ function(module, exports) {
+
+	"use strict";
+	Object.defineProperty(exports, "__esModule", { value: true });
+	exports.Syntax = {
+	    AssignmentExpression: 'AssignmentExpression',
+	    AssignmentPattern: 'AssignmentPattern',
+	    ArrayExpression: 'ArrayExpression',
+	    ArrayPattern: 'ArrayPattern',
+	    ArrowFunctionExpression: 'ArrowFunctionExpression',
+	    AwaitExpression: 'AwaitExpression',
+	    BlockStatement: 'BlockStatement',
+	    BinaryExpression: 'BinaryExpression',
+	    BreakStatement: 'BreakStatement',
+	    CallExpression: 'CallExpression',
+	    CatchClause: 'CatchClause',
+	    ClassBody: 'ClassBody',
+	    ClassDeclaration: 'ClassDeclaration',
+	    ClassExpression: 'ClassExpression',
+	    ConditionalExpression: 'ConditionalExpression',
+	    ContinueStatement: 'ContinueStatement',
+	    DoWhileStatement: 'DoWhileStatement',
+	    DebuggerStatement: 'DebuggerStatement',
+	    EmptyStatement: 'EmptyStatement',
+	    ExportAllDeclaration: 'ExportAllDeclaration',
+	    ExportDefaultDeclaration: 'ExportDefaultDeclaration',
+	    ExportNamedDeclaration: 'ExportNamedDeclaration',
+	    ExportSpecifier: 'ExportSpecifier',
+	    ExpressionStatement: 'ExpressionStatement',
+	    ForStatement: 'ForStatement',
+	    ForOfStatement: 'ForOfStatement',
+	    ForInStatement: 'ForInStatement',
+	    FunctionDeclaration: 'FunctionDeclaration',
+	    FunctionExpression: 'FunctionExpression',
+	    Identifier: 'Identifier',
+	    IfStatement: 'IfStatement',
+	    ImportDeclaration: 'ImportDeclaration',
+	    ImportDefaultSpecifier: 'ImportDefaultSpecifier',
+	    ImportNamespaceSpecifier: 'ImportNamespaceSpecifier',
+	    ImportSpecifier: 'ImportSpecifier',
+	    Literal: 'Literal',
+	    LabeledStatement: 'LabeledStatement',
+	    LogicalExpression: 'LogicalExpression',
+	    MemberExpression: 'MemberExpression',
+	    MetaProperty: 'MetaProperty',
+	    MethodDefinition: 'MethodDefinition',
+	    NewExpression: 'NewExpression',
+	    ObjectExpression: 'ObjectExpression',
+	    ObjectPattern: 'ObjectPattern',
+	    Program: 'Program',
+	    Property: 'Property',
+	    RestElement: 'RestElement',
+	    ReturnStatement: 'ReturnStatement',
+	    SequenceExpression: 'SequenceExpression',
+	    SpreadElement: 'SpreadElement',
+	    Super: 'Super',
+	    SwitchCase: 'SwitchCase',
+	    SwitchStatement: 'SwitchStatement',
+	    TaggedTemplateExpression: 'TaggedTemplateExpression',
+	    TemplateElement: 'TemplateElement',
+	    TemplateLiteral: 'TemplateLiteral',
+	    ThisExpression: 'ThisExpression',
+	    ThrowStatement: 'ThrowStatement',
+	    TryStatement: 'TryStatement',
+	    UnaryExpression: 'UnaryExpression',
+	    UpdateExpression: 'UpdateExpression',
+	    VariableDeclaration: 'VariableDeclaration',
+	    VariableDeclarator: 'VariableDeclarator',
+	    WhileStatement: 'WhileStatement',
+	    WithStatement: 'WithStatement',
+	    YieldExpression: 'YieldExpression'
+	};
+
+
+/***/ },
+/* 3 */
+/***/ function(module, exports, __webpack_require__) {
+
+	"use strict";
+/* istanbul ignore next */
+	var __extends = (this && this.__extends) || (function () {
+	    var extendStatics = Object.setPrototypeOf ||
+	        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+	        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+	    return function (d, b) {
+	        extendStatics(d, b);
+	        function __() { this.constructor = d; }
+	        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+	    };
+	})();
+	Object.defineProperty(exports, "__esModule", { value: true });
+	var character_1 = __webpack_require__(4);
+	var JSXNode = __webpack_require__(5);
+	var jsx_syntax_1 = __webpack_require__(6);
+	var Node = __webpack_require__(7);
+	var parser_1 = __webpack_require__(8);
+	var token_1 = __webpack_require__(13);
+	var xhtml_entities_1 = __webpack_require__(14);
+	token_1.TokenName[100 /* Identifier */] = 'JSXIdentifier';
+	token_1.TokenName[101 /* Text */] = 'JSXText';
+	// Fully qualified element name, e.g. <svg:path> returns "svg:path"
+	function getQualifiedElementName(elementName) {
+	    var qualifiedName;
+	    switch (elementName.type) {
+	        case jsx_syntax_1.JSXSyntax.JSXIdentifier:
+	            var id = elementName;
+	            qualifiedName = id.name;
+	            break;
+	        case jsx_syntax_1.JSXSyntax.JSXNamespacedName:
+	            var ns = elementName;
+	            qualifiedName = getQualifiedElementName(ns.namespace) + ':' +
+	                getQualifiedElementName(ns.name);
+	            break;
+	        case jsx_syntax_1.JSXSyntax.JSXMemberExpression:
+	            var expr = elementName;
+	            qualifiedName = getQualifiedElementName(expr.object) + '.' +
+	                getQualifiedElementName(expr.property);
+	            break;
+	        /* istanbul ignore next */
+	        default:
+	            break;
+	    }
+	    return qualifiedName;
+	}
+	var JSXParser = (function (_super) {
+	    __extends(JSXParser, _super);
+	    function JSXParser(code, options, delegate) {
+	        return _super.call(this, code, options, delegate) || this;
+	    }
+	    JSXParser.prototype.parsePrimaryExpression = function () {
+	        return this.match('<') ? this.parseJSXRoot() : _super.prototype.parsePrimaryExpression.call(this);
+	    };
+	    JSXParser.prototype.startJSX = function () {
+	        // Unwind the scanner before the lookahead token.
+	        this.scanner.index = this.startMarker.index;
+	        this.scanner.lineNumber = this.startMarker.line;
+	        this.scanner.lineStart = this.startMarker.index - this.startMarker.column;
+	    };
+	    JSXParser.prototype.finishJSX = function () {
+	        // Prime the next lookahead.
+	        this.nextToken();
+	    };
+	    JSXParser.prototype.reenterJSX = function () {
+	        this.startJSX();
+	        this.expectJSX('}');
+	        // Pop the closing '}' added from the lookahead.
+	        if (this.config.tokens) {
+	            this.tokens.pop();
+	        }
+	    };
+	    JSXParser.prototype.createJSXNode = function () {
+	        this.collectComments();
+	        return {
+	            index: this.scanner.index,
+	            line: this.scanner.lineNumber,
+	            column: this.scanner.index - this.scanner.lineStart
+	        };
+	    };
+	    JSXParser.prototype.createJSXChildNode = function () {
+	        return {
+	            index: this.scanner.index,
+	            line: this.scanner.lineNumber,
+	            column: this.scanner.index - this.scanner.lineStart
+	        };
+	    };
+	    JSXParser.prototype.scanXHTMLEntity = function (quote) {
+	        var result = '&';
+	        var valid = true;
+	        var terminated = false;
+	        var numeric = false;
+	        var hex = false;
+	        while (!this.scanner.eof() && valid && !terminated) {
+	            var ch = this.scanner.source[this.scanner.index];
+	            if (ch === quote) {
+	                break;
+	            }
+	            terminated = (ch === ';');
+	            result += ch;
+	            ++this.scanner.index;
+	            if (!terminated) {
+	                switch (result.length) {
+	                    case 2:
+	                        // e.g. '&#123;'
+	                        numeric = (ch === '#');
+	                        break;
+	                    case 3:
+	                        if (numeric) {
+	                            // e.g. '&#x41;'
+	                            hex = (ch === 'x');
+	                            valid = hex || character_1.Character.isDecimalDigit(ch.charCodeAt(0));
+	                            numeric = numeric && !hex;
+	                        }
+	                        break;
+	                    default:
+	                        valid = valid && !(numeric && !character_1.Character.isDecimalDigit(ch.charCodeAt(0)));
+	                        valid = valid && !(hex && !character_1.Character.isHexDigit(ch.charCodeAt(0)));
+	                        break;
+	                }
+	            }
+	        }
+	        if (valid && terminated && result.length > 2) {
+	            // e.g. '&#x41;' becomes just '#x41'
+	            var str = result.substr(1, result.length - 2);
+	            if (numeric && str.length > 1) {
+	                result = String.fromCharCode(parseInt(str.substr(1), 10));
+	            }
+	            else if (hex && str.length > 2) {
+	                result = String.fromCharCode(parseInt('0' + str.substr(1), 16));
+	            }
+	            else if (!numeric && !hex && xhtml_entities_1.XHTMLEntities[str]) {
+	                result = xhtml_entities_1.XHTMLEntities[str];
+	            }
+	        }
+	        return result;
+	    };
+	    // Scan the next JSX token. This replaces Scanner#lex when in JSX mode.
+	    JSXParser.prototype.lexJSX = function () {
+	        var cp = this.scanner.source.charCodeAt(this.scanner.index);
+	        // < > / : = { }
+	        if (cp === 60 || cp === 62 || cp === 47 || cp === 58 || cp === 61 || cp === 123 || cp === 125) {
+	            var value = this.scanner.source[this.scanner.index++];
+	            return {
+	                type: 7 /* Punctuator */,
+	                value: value,
+	                lineNumber: this.scanner.lineNumber,
+	                lineStart: this.scanner.lineStart,
+	                start: this.scanner.index - 1,
+	                end: this.scanner.index
+	            };
+	        }
+	        // " '
+	        if (cp === 34 || cp === 39) {
+	            var start = this.scanner.index;
+	            var quote = this.scanner.source[this.scanner.index++];
+	            var str = '';
+	            while (!this.scanner.eof()) {
+	                var ch = this.scanner.source[this.scanner.index++];
+	                if (ch === quote) {
+	                    break;
+	                }
+	                else if (ch === '&') {
+	                    str += this.scanXHTMLEntity(quote);
+	                }
+	                else {
+	                    str += ch;
+	                }
+	            }
+	            return {
+	                type: 8 /* StringLiteral */,
+	                value: str,
+	                lineNumber: this.scanner.lineNumber,
+	                lineStart: this.scanner.lineStart,
+	                start: start,
+	                end: this.scanner.index
+	            };
+	        }
+	        // ... or .
+	        if (cp === 46) {
+	            var n1 = this.scanner.source.charCodeAt(this.scanner.index + 1);
+	            var n2 = this.scanner.source.charCodeAt(this.scanner.index + 2);
+	            var value = (n1 === 46 && n2 === 46) ? '...' : '.';
+	            var start = this.scanner.index;
+	            this.scanner.index += value.length;
+	            return {
+	                type: 7 /* Punctuator */,
+	                value: value,
+	                lineNumber: this.scanner.lineNumber,
+	                lineStart: this.scanner.lineStart,
+	                start: start,
+	                end: this.scanner.index
+	            };
+	        }
+	        // `
+	        if (cp === 96) {
+	            // Only placeholder, since it will be rescanned as a real assignment expression.
+	            return {
+	                type: 10 /* Template */,
+	                value: '',
+	                lineNumber: this.scanner.lineNumber,
+	                lineStart: this.scanner.lineStart,
+	                start: this.scanner.index,
+	                end: this.scanner.index
+	            };
+	        }
+	        // Identifer can not contain backslash (char code 92).
+	        if (character_1.Character.isIdentifierStart(cp) && (cp !== 92)) {
+	            var start = this.scanner.index;
+	            ++this.scanner.index;
+	            while (!this.scanner.eof()) {
+	                var ch = this.scanner.source.charCodeAt(this.scanner.index);
+	                if (character_1.Character.isIdentifierPart(ch) && (ch !== 92)) {
+	                    ++this.scanner.index;
+	                }
+	                else if (ch === 45) {
+	                    // Hyphen (char code 45) can be part of an identifier.
+	                    ++this.scanner.index;
+	                }
+	                else {
+	                    break;
+	                }
+	            }
+	            var id = this.scanner.source.slice(start, this.scanner.index);
+	            return {
+	                type: 100 /* Identifier */,
+	                value: id,
+	                lineNumber: this.scanner.lineNumber,
+	                lineStart: this.scanner.lineStart,
+	                start: start,
+	                end: this.scanner.index
+	            };
+	        }
+	        return this.scanner.lex();
+	    };
+	    JSXParser.prototype.nextJSXToken = function () {
+	        this.collectComments();
+	        this.startMarker.index = this.scanner.index;
+	        this.startMarker.line = this.scanner.lineNumber;
+	        this.startMarker.column = this.scanner.index - this.scanner.lineStart;
+	        var token = this.lexJSX();
+	        this.lastMarker.index = this.scanner.index;
+	        this.lastMarker.line = this.scanner.lineNumber;
+	        this.lastMarker.column = this.scanner.index - this.scanner.lineStart;
+	        if (this.config.tokens) {
+	            this.tokens.push(this.convertToken(token));
+	        }
+	        return token;
+	    };
+	    JSXParser.prototype.nextJSXText = function () {
+	        this.startMarker.index = this.scanner.index;
+	        this.startMarker.line = this.scanner.lineNumber;
+	        this.startMarker.column = this.scanner.index - this.scanner.lineStart;
+	        var start = this.scanner.index;
+	        var text = '';
+	        while (!this.scanner.eof()) {
+	            var ch = this.scanner.source[this.scanner.index];
+	            if (ch === '{' || ch === '<') {
+	                break;
+	            }
+	            ++this.scanner.index;
+	            text += ch;
+	            if (character_1.Character.isLineTerminator(ch.charCodeAt(0))) {
+	                ++this.scanner.lineNumber;
+	                if (ch === '\r' && this.scanner.source[this.scanner.index] === '\n') {
+	                    ++this.scanner.index;
+	                }
+	                this.scanner.lineStart = this.scanner.index;
+	            }
+	        }
+	        this.lastMarker.index = this.scanner.index;
+	        this.lastMarker.line = this.scanner.lineNumber;
+	        this.lastMarker.column = this.scanner.index - this.scanner.lineStart;
+	        var token = {
+	            type: 101 /* Text */,
+	            value: text,
+	            lineNumber: this.scanner.lineNumber,
+	            lineStart: this.scanner.lineStart,
+	            start: start,
+	            end: this.scanner.index
+	        };
+	        if ((text.length > 0) && this.config.tokens) {
+	            this.tokens.push(this.convertToken(token));
+	        }
+	        return token;
+	    };
+	    JSXParser.prototype.peekJSXToken = function () {
+	        var state = this.scanner.saveState();
+	        this.scanner.scanComments();
+	        var next = this.lexJSX();
+	        this.scanner.restoreState(state);
+	        return next;
+	    };
+	    // Expect the next JSX token to match the specified punctuator.
+	    // If not, an exception will be thrown.
+	    JSXParser.prototype.expectJSX = function (value) {
+	        var token = this.nextJSXToken();
+	        if (token.type !== 7 /* Punctuator */ || token.value !== value) {
+	            this.throwUnexpectedToken(token);
+	        }
+	    };
+	    // Return true if the next JSX token matches the specified punctuator.
+	    JSXParser.prototype.matchJSX = function (value) {
+	        var next = this.peekJSXToken();
+	        return next.type === 7 /* Punctuator */ && next.value === value;
+	    };
+	    JSXParser.prototype.parseJSXIdentifier = function () {
+	        var node = this.createJSXNode();
+	        var token = this.nextJSXToken();
+	        if (token.type !== 100 /* Identifier */) {
+	            this.throwUnexpectedToken(token);
+	        }
+	        return this.finalize(node, new JSXNode.JSXIdentifier(token.value));
+	    };
+	    JSXParser.prototype.parseJSXElementName = function () {
+	        var node = this.createJSXNode();
+	        var elementName = this.parseJSXIdentifier();
+	        if (this.matchJSX(':')) {
+	            var namespace = elementName;
+	            this.expectJSX(':');
+	            var name_1 = this.parseJSXIdentifier();
+	            elementName = this.finalize(node, new JSXNode.JSXNamespacedName(namespace, name_1));
+	        }
+	        else if (this.matchJSX('.')) {
+	            while (this.matchJSX('.')) {
+	                var object = elementName;
+	                this.expectJSX('.');
+	                var property = this.parseJSXIdentifier();
+	                elementName = this.finalize(node, new JSXNode.JSXMemberExpression(object, property));
+	            }
+	        }
+	        return elementName;
+	    };
+	    JSXParser.prototype.parseJSXAttributeName = function () {
+	        var node = this.createJSXNode();
+	        var attributeName;
+	        var identifier = this.parseJSXIdentifier();
+	        if (this.matchJSX(':')) {
+	            var namespace = identifier;
+	            this.expectJSX(':');
+	            var name_2 = this.parseJSXIdentifier();
+	            attributeName = this.finalize(node, new JSXNode.JSXNamespacedName(namespace, name_2));
+	        }
+	        else {
+	            attributeName = identifier;
+	        }
+	        return attributeName;
+	    };
+	    JSXParser.prototype.parseJSXStringLiteralAttribute = function () {
+	        var node = this.createJSXNode();
+	        var token = this.nextJSXToken();
+	        if (token.type !== 8 /* StringLiteral */) {
+	            this.throwUnexpectedToken(token);
+	        }
+	        var raw = this.getTokenRaw(token);
+	        return this.finalize(node, new Node.Literal(token.value, raw));
+	    };
+	    JSXParser.prototype.parseJSXExpressionAttribute = function () {
+	        var node = this.createJSXNode();
+	        this.expectJSX('{');
+	        this.finishJSX();
+	        if (this.match('}')) {
+	            this.tolerateError('JSX attributes must only be assigned a non-empty expression');
+	        }
+	        var expression = this.parseAssignmentExpression();
+	        this.reenterJSX();
+	        return this.finalize(node, new JSXNode.JSXExpressionContainer(expression));
+	    };
+	    JSXParser.prototype.parseJSXAttributeValue = function () {
+	        return this.matchJSX('{') ? this.parseJSXExpressionAttribute() :
+	            this.matchJSX('<') ? this.parseJSXElement() : this.parseJSXStringLiteralAttribute();
+	    };
+	    JSXParser.prototype.parseJSXNameValueAttribute = function () {
+	        var node = this.createJSXNode();
+	        var name = this.parseJSXAttributeName();
+	        var value = null;
+	        if (this.matchJSX('=')) {
+	            this.expectJSX('=');
+	            value = this.parseJSXAttributeValue();
+	        }
+	        return this.finalize(node, new JSXNode.JSXAttribute(name, value));
+	    };
+	    JSXParser.prototype.parseJSXSpreadAttribute = function () {
+	        var node = this.createJSXNode();
+	        this.expectJSX('{');
+	        this.expectJSX('...');
+	        this.finishJSX();
+	        var argument = this.parseAssignmentExpression();
+	        this.reenterJSX();
+	        return this.finalize(node, new JSXNode.JSXSpreadAttribute(argument));
+	    };
+	    JSXParser.prototype.parseJSXAttributes = function () {
+	        var attributes = [];
+	        while (!this.matchJSX('/') && !this.matchJSX('>')) {
+	            var attribute = this.matchJSX('{') ? this.parseJSXSpreadAttribute() :
+	                this.parseJSXNameValueAttribute();
+	            attributes.push(attribute);
+	        }
+	        return attributes;
+	    };
+	    JSXParser.prototype.parseJSXOpeningElement = function () {
+	        var node = this.createJSXNode();
+	        this.expectJSX('<');
+	        var name = this.parseJSXElementName();
+	        var attributes = this.parseJSXAttributes();
+	        var selfClosing = this.matchJSX('/');
+	        if (selfClosing) {
+	            this.expectJSX('/');
+	        }
+	        this.expectJSX('>');
+	        return this.finalize(node, new JSXNode.JSXOpeningElement(name, selfClosing, attributes));
+	    };
+	    JSXParser.prototype.parseJSXBoundaryElement = function () {
+	        var node = this.createJSXNode();
+	        this.expectJSX('<');
+	        if (this.matchJSX('/')) {
+	            this.expectJSX('/');
+	            var name_3 = this.parseJSXElementName();
+	            this.expectJSX('>');
+	            return this.finalize(node, new JSXNode.JSXClosingElement(name_3));
+	        }
+	        var name = this.parseJSXElementName();
+	        var attributes = this.parseJSXAttributes();
+	        var selfClosing = this.matchJSX('/');
+	        if (selfClosing) {
+	            this.expectJSX('/');
+	        }
+	        this.expectJSX('>');
+	        return this.finalize(node, new JSXNode.JSXOpeningElement(name, selfClosing, attributes));
+	    };
+	    JSXParser.prototype.parseJSXEmptyExpression = function () {
+	        var node = this.createJSXChildNode();
+	        this.collectComments();
+	        this.lastMarker.index = this.scanner.index;
+	        this.lastMarker.line = this.scanner.lineNumber;
+	        this.lastMarker.column = this.scanner.index - this.scanner.lineStart;
+	        return this.finalize(node, new JSXNode.JSXEmptyExpression());
+	    };
+	    JSXParser.prototype.parseJSXExpressionContainer = function () {
+	        var node = this.createJSXNode();
+	        this.expectJSX('{');
+	        var expression;
+	        if (this.matchJSX('}')) {
+	            expression = this.parseJSXEmptyExpression();
+	            this.expectJSX('}');
+	        }
+	        else {
+	            this.finishJSX();
+	            expression = this.parseAssignmentExpression();
+	            this.reenterJSX();
+	        }
+	        return this.finalize(node, new JSXNode.JSXExpressionContainer(expression));
+	    };
+	    JSXParser.prototype.parseJSXChildren = function () {
+	        var children = [];
+	        while (!this.scanner.eof()) {
+	            var node = this.createJSXChildNode();
+	            var token = this.nextJSXText();
+	            if (token.start < token.end) {
+	                var raw = this.getTokenRaw(token);
+	                var child = this.finalize(node, new JSXNode.JSXText(token.value, raw));
+	                children.push(child);
+	            }
+	            if (this.scanner.source[this.scanner.index] === '{') {
+	                var container = this.parseJSXExpressionContainer();
+	                children.push(container);
+	            }
+	            else {
+	                break;
+	            }
+	        }
+	        return children;
+	    };
+	    JSXParser.prototype.parseComplexJSXElement = function (el) {
+	        var stack = [];
+	        while (!this.scanner.eof()) {
+	            el.children = el.children.concat(this.parseJSXChildren());
+	            var node = this.createJSXChildNode();
+	            var element = this.parseJSXBoundaryElement();
+	            if (element.type === jsx_syntax_1.JSXSyntax.JSXOpeningElement) {
+	                var opening = element;
+	                if (opening.selfClosing) {
+	                    var child = this.finalize(node, new JSXNode.JSXElement(opening, [], null));
+	                    el.children.push(child);
+	                }
+	                else {
+	                    stack.push(el);
+	                    el = { node: node, opening: opening, closing: null, children: [] };
+	                }
+	            }
+	            if (element.type === jsx_syntax_1.JSXSyntax.JSXClosingElement) {
+	                el.closing = element;
+	                var open_1 = getQualifiedElementName(el.opening.name);
+	                var close_1 = getQualifiedElementName(el.closing.name);
+	                if (open_1 !== close_1) {
+	                    this.tolerateError('Expected corresponding JSX closing tag for %0', open_1);
+	                }
+	                if (stack.length > 0) {
+	                    var child = this.finalize(el.node, new JSXNode.JSXElement(el.opening, el.children, el.closing));
+	                    el = stack[stack.length - 1];
+	                    el.children.push(child);
+	                    stack.pop();
+	                }
+	                else {
+	                    break;
+	                }
+	            }
+	        }
+	        return el;
+	    };
+	    JSXParser.prototype.parseJSXElement = function () {
+	        var node = this.createJSXNode();
+	        var opening = this.parseJSXOpeningElement();
+	        var children = [];
+	        var closing = null;
+	        if (!opening.selfClosing) {
+	            var el = this.parseComplexJSXElement({ node: node, opening: opening, closing: closing, children: children });
+	            children = el.children;
+	            closing = el.closing;
+	        }
+	        return this.finalize(node, new JSXNode.JSXElement(opening, children, closing));
+	    };
+	    JSXParser.prototype.parseJSXRoot = function () {
+	        // Pop the opening '<' added from the lookahead.
+	        if (this.config.tokens) {
+	            this.tokens.pop();
+	        }
+	        this.startJSX();
+	        var element = this.parseJSXElement();
+	        this.finishJSX();
+	        return element;
+	    };
+	    JSXParser.prototype.isStartOfExpression = function () {
+	        return _super.prototype.isStartOfExpression.call(this) || this.match('<');
+	    };
+	    return JSXParser;
+	}(parser_1.Parser));
+	exports.JSXParser = JSXParser;
+
+
+/***/ },
+/* 4 */
+/***/ function(module, exports) {
+
+	"use strict";
+	Object.defineProperty(exports, "__esModule", { value: true });
+	// See also tools/generate-unicode-regex.js.
+	var Regex = {
+	    // Unicode v8.0.0 NonAsciiIdentifierStart:
+	    NonAsciiIdentifierStart: /[\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u08A0-\u08B4\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0AF9\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D\u0C58-\u0C5A\u0C60\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D5F-\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191E\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2118-\u211D\u2124\u2126\u2128\u212A-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303C\u3041-\u3096\u309B-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FD5\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA69D\uA6A0-\uA6EF\uA717-\uA71F\uA722-\uA788\uA78B-\uA7AD\uA7B0-\uA7B7\uA7F7-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA8FD\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uA9E0-\uA9E4\uA9E6-\uA9EF\uA9FA-\uA9FE\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA7E-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB65\uAB70-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDD40-\uDD74\uDE80-\uDE9C\uDEA0-\uDED0\uDF00-\uDF1F\uDF30-\uDF4A\uDF50-\uDF75\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF\uDFD1-\uDFD5]|\uD801[\uDC00-\uDC9D\uDD00-\uDD27\uDD30-\uDD63\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC60-\uDC76\uDC80-\uDC9E\uDCE0-\uDCF2\uDCF4\uDCF5\uDD00-\uDD15\uDD20-\uDD39\uDD80-\uDDB7\uDDBE\uDDBF\uDE00\uDE10-\uDE13\uDE15-\uDE17\uDE19-\uDE33\uDE60-\uDE7C\uDE80-\uDE9C\uDEC0-\uDEC7\uDEC9-\uDEE4\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72\uDF80-\uDF91]|\uD803[\uDC00-\uDC48\uDC80-\uDCB2\uDCC0-\uDCF2]|\uD804[\uDC03-\uDC37\uDC83-\uDCAF\uDCD0-\uDCE8\uDD03-\uDD26\uDD50-\uDD72\uDD76\uDD83-\uDDB2\uDDC1-\uDDC4\uDDDA\uDDDC\uDE00-\uDE11\uDE13-\uDE2B\uDE80-\uDE86\uDE88\uDE8A-\uDE8D\uDE8F-\uDE9D\uDE9F-\uDEA8\uDEB0-\uDEDE\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3D\uDF50\uDF5D-\uDF61]|\uD805[\uDC80-\uDCAF\uDCC4\uDCC5\uDCC7\uDD80-\uDDAE\uDDD8-\uDDDB\uDE00-\uDE2F\uDE44\uDE80-\uDEAA\uDF00-\uDF19]|\uD806[\uDCA0-\uDCDF\uDCFF\uDEC0-\uDEF8]|\uD808[\uDC00-\uDF99]|\uD809[\uDC00-\uDC6E\uDC80-\uDD43]|[\uD80C\uD840-\uD868\uD86A-\uD86C\uD86F-\uD872][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD811[\uDC00-\uDE46]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDED0-\uDEED\uDF00-\uDF2F\uDF40-\uDF43\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDF00-\uDF44\uDF50\uDF93-\uDF9F]|\uD82C[\uDC00\uDC01]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB]|\uD83A[\uDC00-\uDCC4]|\uD83B[\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD869[\uDC00-\uDED6\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF34\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D\uDC20-\uDFFF]|\uD873[\uDC00-\uDEA1]|\uD87E[\uDC00-\uDE1D]/,
+	    // Unicode v8.0.0 NonAsciiIdentifierPart:
+	    NonAsciiIdentifierPart: /[\xAA\xB5\xB7\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0300-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u0483-\u0487\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u0591-\u05BD\u05BF\u05C1\u05C2\u05C4\u05C5\u05C7\u05D0-\u05EA\u05F0-\u05F2\u0610-\u061A\u0620-\u0669\u066E-\u06D3\u06D5-\u06DC\u06DF-\u06E8\u06EA-\u06FC\u06FF\u0710-\u074A\u074D-\u07B1\u07C0-\u07F5\u07FA\u0800-\u082D\u0840-\u085B\u08A0-\u08B4\u08E3-\u0963\u0966-\u096F\u0971-\u0983\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BC-\u09C4\u09C7\u09C8\u09CB-\u09CE\u09D7\u09DC\u09DD\u09DF-\u09E3\u09E6-\u09F1\u0A01-\u0A03\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A3C\u0A3E-\u0A42\u0A47\u0A48\u0A4B-\u0A4D\u0A51\u0A59-\u0A5C\u0A5E\u0A66-\u0A75\u0A81-\u0A83\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABC-\u0AC5\u0AC7-\u0AC9\u0ACB-\u0ACD\u0AD0\u0AE0-\u0AE3\u0AE6-\u0AEF\u0AF9\u0B01-\u0B03\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3C-\u0B44\u0B47\u0B48\u0B4B-\u0B4D\u0B56\u0B57\u0B5C\u0B5D\u0B5F-\u0B63\u0B66-\u0B6F\u0B71\u0B82\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BBE-\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCD\u0BD0\u0BD7\u0BE6-\u0BEF\u0C00-\u0C03\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D-\u0C44\u0C46-\u0C48\u0C4A-\u0C4D\u0C55\u0C56\u0C58-\u0C5A\u0C60-\u0C63\u0C66-\u0C6F\u0C81-\u0C83\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBC-\u0CC4\u0CC6-\u0CC8\u0CCA-\u0CCD\u0CD5\u0CD6\u0CDE\u0CE0-\u0CE3\u0CE6-\u0CEF\u0CF1\u0CF2\u0D01-\u0D03\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D-\u0D44\u0D46-\u0D48\u0D4A-\u0D4E\u0D57\u0D5F-\u0D63\u0D66-\u0D6F\u0D7A-\u0D7F\u0D82\u0D83\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0DCA\u0DCF-\u0DD4\u0DD6\u0DD8-\u0DDF\u0DE6-\u0DEF\u0DF2\u0DF3\u0E01-\u0E3A\u0E40-\u0E4E\u0E50-\u0E59\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB9\u0EBB-\u0EBD\u0EC0-\u0EC4\u0EC6\u0EC8-\u0ECD\u0ED0-\u0ED9\u0EDC-\u0EDF\u0F00\u0F18\u0F19\u0F20-\u0F29\u0F35\u0F37\u0F39\u0F3E-\u0F47\u0F49-\u0F6C\u0F71-\u0F84\u0F86-\u0F97\u0F99-\u0FBC\u0FC6\u1000-\u1049\u1050-\u109D\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u135D-\u135F\u1369-\u1371\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1714\u1720-\u1734\u1740-\u1753\u1760-\u176C\u176E-\u1770\u1772\u1773\u1780-\u17D3\u17D7\u17DC\u17DD\u17E0-\u17E9\u180B-\u180D\u1810-\u1819\u1820-\u1877\u1880-\u18AA\u18B0-\u18F5\u1900-\u191E\u1920-\u192B\u1930-\u193B\u1946-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u19D0-\u19DA\u1A00-\u1A1B\u1A20-\u1A5E\u1A60-\u1A7C\u1A7F-\u1A89\u1A90-\u1A99\u1AA7\u1AB0-\u1ABD\u1B00-\u1B4B\u1B50-\u1B59\u1B6B-\u1B73\u1B80-\u1BF3\u1C00-\u1C37\u1C40-\u1C49\u1C4D-\u1C7D\u1CD0-\u1CD2\u1CD4-\u1CF6\u1CF8\u1CF9\u1D00-\u1DF5\u1DFC-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u200C\u200D\u203F\u2040\u2054\u2071\u207F\u2090-\u209C\u20D0-\u20DC\u20E1\u20E5-\u20F0\u2102\u2107\u210A-\u2113\u2115\u2118-\u211D\u2124\u2126\u2128\u212A-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D7F-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2DE0-\u2DFF\u3005-\u3007\u3021-\u302F\u3031-\u3035\u3038-\u303C\u3041-\u3096\u3099-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FD5\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA62B\uA640-\uA66F\uA674-\uA67D\uA67F-\uA6F1\uA717-\uA71F\uA722-\uA788\uA78B-\uA7AD\uA7B0-\uA7B7\uA7F7-\uA827\uA840-\uA873\uA880-\uA8C4\uA8D0-\uA8D9\uA8E0-\uA8F7\uA8FB\uA8FD\uA900-\uA92D\uA930-\uA953\uA960-\uA97C\uA980-\uA9C0\uA9CF-\uA9D9\uA9E0-\uA9FE\uAA00-\uAA36\uAA40-\uAA4D\uAA50-\uAA59\uAA60-\uAA76\uAA7A-\uAAC2\uAADB-\uAADD\uAAE0-\uAAEF\uAAF2-\uAAF6\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB65\uAB70-\uABEA\uABEC\uABED\uABF0-\uABF9\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE00-\uFE0F\uFE20-\uFE2F\uFE33\uFE34\uFE4D-\uFE4F\uFE70-\uFE74\uFE76-\uFEFC\uFF10-\uFF19\uFF21-\uFF3A\uFF3F\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDD40-\uDD74\uDDFD\uDE80-\uDE9C\uDEA0-\uDED0\uDEE0\uDF00-\uDF1F\uDF30-\uDF4A\uDF50-\uDF7A\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF\uDFD1-\uDFD5]|\uD801[\uDC00-\uDC9D\uDCA0-\uDCA9\uDD00-\uDD27\uDD30-\uDD63\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC60-\uDC76\uDC80-\uDC9E\uDCE0-\uDCF2\uDCF4\uDCF5\uDD00-\uDD15\uDD20-\uDD39\uDD80-\uDDB7\uDDBE\uDDBF\uDE00-\uDE03\uDE05\uDE06\uDE0C-\uDE13\uDE15-\uDE17\uDE19-\uDE33\uDE38-\uDE3A\uDE3F\uDE60-\uDE7C\uDE80-\uDE9C\uDEC0-\uDEC7\uDEC9-\uDEE6\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72\uDF80-\uDF91]|\uD803[\uDC00-\uDC48\uDC80-\uDCB2\uDCC0-\uDCF2]|\uD804[\uDC00-\uDC46\uDC66-\uDC6F\uDC7F-\uDCBA\uDCD0-\uDCE8\uDCF0-\uDCF9\uDD00-\uDD34\uDD36-\uDD3F\uDD50-\uDD73\uDD76\uDD80-\uDDC4\uDDCA-\uDDCC\uDDD0-\uDDDA\uDDDC\uDE00-\uDE11\uDE13-\uDE37\uDE80-\uDE86\uDE88\uDE8A-\uDE8D\uDE8F-\uDE9D\uDE9F-\uDEA8\uDEB0-\uDEEA\uDEF0-\uDEF9\uDF00-\uDF03\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3C-\uDF44\uDF47\uDF48\uDF4B-\uDF4D\uDF50\uDF57\uDF5D-\uDF63\uDF66-\uDF6C\uDF70-\uDF74]|\uD805[\uDC80-\uDCC5\uDCC7\uDCD0-\uDCD9\uDD80-\uDDB5\uDDB8-\uDDC0\uDDD8-\uDDDD\uDE00-\uDE40\uDE44\uDE50-\uDE59\uDE80-\uDEB7\uDEC0-\uDEC9\uDF00-\uDF19\uDF1D-\uDF2B\uDF30-\uDF39]|\uD806[\uDCA0-\uDCE9\uDCFF\uDEC0-\uDEF8]|\uD808[\uDC00-\uDF99]|\uD809[\uDC00-\uDC6E\uDC80-\uDD43]|[\uD80C\uD840-\uD868\uD86A-\uD86C\uD86F-\uD872][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD811[\uDC00-\uDE46]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDE60-\uDE69\uDED0-\uDEED\uDEF0-\uDEF4\uDF00-\uDF36\uDF40-\uDF43\uDF50-\uDF59\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDF00-\uDF44\uDF50-\uDF7E\uDF8F-\uDF9F]|\uD82C[\uDC00\uDC01]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99\uDC9D\uDC9E]|\uD834[\uDD65-\uDD69\uDD6D-\uDD72\uDD7B-\uDD82\uDD85-\uDD8B\uDDAA-\uDDAD\uDE42-\uDE44]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB\uDFCE-\uDFFF]|\uD836[\uDE00-\uDE36\uDE3B-\uDE6C\uDE75\uDE84\uDE9B-\uDE9F\uDEA1-\uDEAF]|\uD83A[\uDC00-\uDCC4\uDCD0-\uDCD6]|\uD83B[\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD869[\uDC00-\uDED6\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF34\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D\uDC20-\uDFFF]|\uD873[\uDC00-\uDEA1]|\uD87E[\uDC00-\uDE1D]|\uDB40[\uDD00-\uDDEF]/
+	};
+	exports.Character = {
+	    /* tslint:disable:no-bitwise */
+	    fromCodePoint: function (cp) {
+	        return (cp < 0x10000) ? String.fromCharCode(cp) :
+	            String.fromCharCode(0xD800 + ((cp - 0x10000) >> 10)) +
+	                String.fromCharCode(0xDC00 + ((cp - 0x10000) & 1023));
+	    },
+	    // https://tc39.github.io/ecma262/#sec-white-space
+	    isWhiteSpace: function (cp) {
+	        return (cp === 0x20) || (cp === 0x09) || (cp === 0x0B) || (cp === 0x0C) || (cp === 0xA0) ||
+	            (cp >= 0x1680 && [0x1680, 0x2000, 0x2001, 0x2002, 0x2003, 0x2004, 0x2005, 0x2006, 0x2007, 0x2008, 0x2009, 0x200A, 0x202F, 0x205F, 0x3000, 0xFEFF].indexOf(cp) >= 0);
+	    },
+	    // https://tc39.github.io/ecma262/#sec-line-terminators
+	    isLineTerminator: function (cp) {
+	        return (cp === 0x0A) || (cp === 0x0D) || (cp === 0x2028) || (cp === 0x2029);
+	    },
+	    // https://tc39.github.io/ecma262/#sec-names-and-keywords
+	    isIdentifierStart: function (cp) {
+	        return (cp === 0x24) || (cp === 0x5F) ||
+	            (cp >= 0x41 && cp <= 0x5A) ||
+	            (cp >= 0x61 && cp <= 0x7A) ||
+	            (cp === 0x5C) ||
+	            ((cp >= 0x80) && Regex.NonAsciiIdentifierStart.test(exports.Character.fromCodePoint(cp)));
+	    },
+	    isIdentifierPart: function (cp) {
+	        return (cp === 0x24) || (cp === 0x5F) ||
+	            (cp >= 0x41 && cp <= 0x5A) ||
+	            (cp >= 0x61 && cp <= 0x7A) ||
+	            (cp >= 0x30 && cp <= 0x39) ||
+	            (cp === 0x5C) ||
+	            ((cp >= 0x80) && Regex.NonAsciiIdentifierPart.test(exports.Character.fromCodePoint(cp)));
+	    },
+	    // https://tc39.github.io/ecma262/#sec-literals-numeric-literals
+	    isDecimalDigit: function (cp) {
+	        return (cp >= 0x30 && cp <= 0x39); // 0..9
+	    },
+	    isHexDigit: function (cp) {
+	        return (cp >= 0x30 && cp <= 0x39) ||
+	            (cp >= 0x41 && cp <= 0x46) ||
+	            (cp >= 0x61 && cp <= 0x66); // a..f
+	    },
+	    isOctalDigit: function (cp) {
+	        return (cp >= 0x30 && cp <= 0x37); // 0..7
+	    }
+	};
+
+
+/***/ },
+/* 5 */
+/***/ function(module, exports, __webpack_require__) {
+
+	"use strict";
+	Object.defineProperty(exports, "__esModule", { value: true });
+	var jsx_syntax_1 = __webpack_require__(6);
+	/* tslint:disable:max-classes-per-file */
+	var JSXClosingElement = (function () {
+	    function JSXClosingElement(name) {
+	        this.type = jsx_syntax_1.JSXSyntax.JSXClosingElement;
+	        this.name = name;
+	    }
+	    return JSXClosingElement;
+	}());
+	exports.JSXClosingElement = JSXClosingElement;
+	var JSXElement = (function () {
+	    function JSXElement(openingElement, children, closingElement) {
+	        this.type = jsx_syntax_1.JSXSyntax.JSXElement;
+	        this.openingElement = openingElement;
+	        this.children = children;
+	        this.closingElement = closingElement;
+	    }
+	    return JSXElement;
+	}());
+	exports.JSXElement = JSXElement;
+	var JSXEmptyExpression = (function () {
+	    function JSXEmptyExpression() {
+	        this.type = jsx_syntax_1.JSXSyntax.JSXEmptyExpression;
+	    }
+	    return JSXEmptyExpression;
+	}());
+	exports.JSXEmptyExpression = JSXEmptyExpression;
+	var JSXExpressionContainer = (function () {
+	    function JSXExpressionContainer(expression) {
+	        this.type = jsx_syntax_1.JSXSyntax.JSXExpressionContainer;
+	        this.expression = expression;
+	    }
+	    return JSXExpressionContainer;
+	}());
+	exports.JSXExpressionContainer = JSXExpressionContainer;
+	var JSXIdentifier = (function () {
+	    function JSXIdentifier(name) {
+	        this.type = jsx_syntax_1.JSXSyntax.JSXIdentifier;
+	        this.name = name;
+	    }
+	    return JSXIdentifier;
+	}());
+	exports.JSXIdentifier = JSXIdentifier;
+	var JSXMemberExpression = (function () {
+	    function JSXMemberExpression(object, property) {
+	        this.type = jsx_syntax_1.JSXSyntax.JSXMemberExpression;
+	        this.object = object;
+	        this.property = property;
+	    }
+	    return JSXMemberExpression;
+	}());
+	exports.JSXMemberExpression = JSXMemberExpression;
+	var JSXAttribute = (function () {
+	    function JSXAttribute(name, value) {
+	        this.type = jsx_syntax_1.JSXSyntax.JSXAttribute;
+	        this.name = name;
+	        this.value = value;
+	    }
+	    return JSXAttribute;
+	}());
+	exports.JSXAttribute = JSXAttribute;
+	var JSXNamespacedName = (function () {
+	    function JSXNamespacedName(namespace, name) {
+	        this.type = jsx_syntax_1.JSXSyntax.JSXNamespacedName;
+	        this.namespace = namespace;
+	        this.name = name;
+	    }
+	    return JSXNamespacedName;
+	}());
+	exports.JSXNamespacedName = JSXNamespacedName;
+	var JSXOpeningElement = (function () {
+	    function JSXOpeningElement(name, selfClosing, attributes) {
+	        this.type = jsx_syntax_1.JSXSyntax.JSXOpeningElement;
+	        this.name = name;
+	        this.selfClosing = selfClosing;
+	        this.attributes = attributes;
+	    }
+	    return JSXOpeningElement;
+	}());
+	exports.JSXOpeningElement = JSXOpeningElement;
+	var JSXSpreadAttribute = (function () {
+	    function JSXSpreadAttribute(argument) {
+	        this.type = jsx_syntax_1.JSXSyntax.JSXSpreadAttribute;
+	        this.argument = argument;
+	    }
+	    return JSXSpreadAttribute;
+	}());
+	exports.JSXSpreadAttribute = JSXSpreadAttribute;
+	var JSXText = (function () {
+	    function JSXText(value, raw) {
+	        this.type = jsx_syntax_1.JSXSyntax.JSXText;
+	        this.value = value;
+	        this.raw = raw;
+	    }
+	    return JSXText;
+	}());
+	exports.JSXText = JSXText;
+
+
+/***/ },
+/* 6 */
+/***/ function(module, exports) {
+
+	"use strict";
+	Object.defineProperty(exports, "__esModule", { value: true });
+	exports.JSXSyntax = {
+	    JSXAttribute: 'JSXAttribute',
+	    JSXClosingElement: 'JSXClosingElement',
+	    JSXElement: 'JSXElement',
+	    JSXEmptyExpression: 'JSXEmptyExpression',
+	    JSXExpressionContainer: 'JSXExpressionContainer',
+	    JSXIdentifier: 'JSXIdentifier',
+	    JSXMemberExpression: 'JSXMemberExpression',
+	    JSXNamespacedName: 'JSXNamespacedName',
+	    JSXOpeningElement: 'JSXOpeningElement',
+	    JSXSpreadAttribute: 'JSXSpreadAttribute',
+	    JSXText: 'JSXText'
+	};
+
+
+/***/ },
+/* 7 */
+/***/ function(module, exports, __webpack_require__) {
+
+	"use strict";
+	Object.defineProperty(exports, "__esModule", { value: true });
+	var syntax_1 = __webpack_require__(2);
+	/* tslint:disable:max-classes-per-file */
+	var ArrayExpression = (function () {
+	    function ArrayExpression(elements) {
+	        this.type = syntax_1.Syntax.ArrayExpression;
+	        this.elements = elements;
+	    }
+	    return ArrayExpression;
+	}());
+	exports.ArrayExpression = ArrayExpression;
+	var ArrayPattern = (function () {
+	    function ArrayPattern(elements) {
+	        this.type = syntax_1.Syntax.ArrayPattern;
+	        this.elements = elements;
+	    }
+	    return ArrayPattern;
+	}());
+	exports.ArrayPattern = ArrayPattern;
+	var ArrowFunctionExpression = (function () {
+	    function ArrowFunctionExpression(params, body, expression) {
+	        this.type = syntax_1.Syntax.ArrowFunctionExpression;
+	        this.id = null;
+	        this.params = params;
+	        this.body = body;
+	        this.generator = false;
+	        this.expression = expression;
+	        this.async = false;
+	    }
+	    return ArrowFunctionExpression;
+	}());
+	exports.ArrowFunctionExpression = ArrowFunctionExpression;
+	var AssignmentExpression = (function () {
+	    function AssignmentExpression(operator, left, right) {
+	        this.type = syntax_1.Syntax.AssignmentExpression;
+	        this.operator = operator;
+	        this.left = left;
+	        this.right = right;
+	    }
+	    return AssignmentExpression;
+	}());
+	exports.AssignmentExpression = AssignmentExpression;
+	var AssignmentPattern = (function () {
+	    function AssignmentPattern(left, right) {
+	        this.type = syntax_1.Syntax.AssignmentPattern;
+	        this.left = left;
+	        this.right = right;
+	    }
+	    return AssignmentPattern;
+	}());
+	exports.AssignmentPattern = AssignmentPattern;
+	var AsyncArrowFunctionExpression = (function () {
+	    function AsyncArrowFunctionExpression(params, body, expression) {
+	        this.type = syntax_1.Syntax.ArrowFunctionExpression;
+	        this.id = null;
+	        this.params = params;
+	        this.body = body;
+	        this.generator = false;
+	        this.expression = expression;
+	        this.async = true;
+	    }
+	    return AsyncArrowFunctionExpression;
+	}());
+	exports.AsyncArrowFunctionExpression = AsyncArrowFunctionExpression;
+	var AsyncFunctionDeclaration = (function () {
+	    function AsyncFunctionDeclaration(id, params, body) {
+	        this.type = syntax_1.Syntax.FunctionDeclaration;
+	        this.id = id;
+	        this.params = params;
+	        this.body = body;
+	        this.generator = false;
+	        this.expression = false;
+	        this.async = true;
+	    }
+	    return AsyncFunctionDeclaration;
+	}());
+	exports.AsyncFunctionDeclaration = AsyncFunctionDeclaration;
+	var AsyncFunctionExpression = (function () {
+	    function AsyncFunctionExpression(id, params, body) {
+	        this.type = syntax_1.Syntax.FunctionExpression;
+	        this.id = id;
+	        this.params = params;
+	        this.body = body;
+	        this.generator = false;
+	        this.expression = false;
+	        this.async = true;
+	    }
+	    return AsyncFunctionExpression;
+	}());
+	exports.AsyncFunctionExpression = AsyncFunctionExpression;
+	var AwaitExpression = (function () {
+	    function AwaitExpression(argument) {
+	        this.type = syntax_1.Syntax.AwaitExpression;
+	        this.argument = argument;
+	    }
+	    return AwaitExpression;
+	}());
+	exports.AwaitExpression = AwaitExpression;
+	var BinaryExpression = (function () {
+	    function BinaryExpression(operator, left, right) {
+	        var logical = (operator === '||' || operator === '&&');
+	        this.type = logical ? syntax_1.Syntax.LogicalExpression : syntax_1.Syntax.BinaryExpression;
+	        this.operator = operator;
+	        this.left = left;
+	        this.right = right;
+	    }
+	    return BinaryExpression;
+	}());
+	exports.BinaryExpression = BinaryExpression;
+	var BlockStatement = (function () {
+	    function BlockStatement(body) {
+	        this.type = syntax_1.Syntax.BlockStatement;
+	        this.body = body;
+	    }
+	    return BlockStatement;
+	}());
+	exports.BlockStatement = BlockStatement;
+	var BreakStatement = (function () {
+	    function BreakStatement(label) {
+	        this.type = syntax_1.Syntax.BreakStatement;
+	        this.label = label;
+	    }
+	    return BreakStatement;
+	}());
+	exports.BreakStatement = BreakStatement;
+	var CallExpression = (function () {
+	    function CallExpression(callee, args) {
+	        this.type = syntax_1.Syntax.CallExpression;
+	        this.callee = callee;
+	        this.arguments = args;
+	    }
+	    return CallExpression;
+	}());
+	exports.CallExpression = CallExpression;
+	var CatchClause = (function () {
+	    function CatchClause(param, body) {
+	        this.type = syntax_1.Syntax.CatchClause;
+	        this.param = param;
+	        this.body = body;
+	    }
+	    return CatchClause;
+	}());
+	exports.CatchClause = CatchClause;
+	var ClassBody = (function () {
+	    function ClassBody(body) {
+	        this.type = syntax_1.Syntax.ClassBody;
+	        this.body = body;
+	    }
+	    return ClassBody;
+	}());
+	exports.ClassBody = ClassBody;
+	var ClassDeclaration = (function () {
+	    function ClassDeclaration(id, superClass, body) {
+	        this.type = syntax_1.Syntax.ClassDeclaration;
+	        this.id = id;
+	        this.superClass = superClass;
+	        this.body = body;
+	    }
+	    return ClassDeclaration;
+	}());
+	exports.ClassDeclaration = ClassDeclaration;
+	var ClassExpression = (function () {
+	    function ClassExpression(id, superClass, body) {
+	        this.type = syntax_1.Syntax.ClassExpression;
+	        this.id = id;
+	        this.superClass = superClass;
+	        this.body = body;
+	    }
+	    return ClassExpression;
+	}());
+	exports.ClassExpression = ClassExpression;
+	var ComputedMemberExpression = (function () {
+	    function ComputedMemberExpression(object, property) {
+	        this.type = syntax_1.Syntax.MemberExpression;
+	        this.computed = true;
+	        this.object = object;
+	        this.property = property;
+	    }
+	    return ComputedMemberExpression;
+	}());
+	exports.ComputedMemberExpression = ComputedMemberExpression;
+	var ConditionalExpression = (function () {
+	    function ConditionalExpression(test, consequent, alternate) {
+	        this.type = syntax_1.Syntax.ConditionalExpression;
+	        this.test = test;
+	        this.consequent = consequent;
+	        this.alternate = alternate;
+	    }
+	    return ConditionalExpression;
+	}());
+	exports.ConditionalExpression = ConditionalExpression;
+	var ContinueStatement = (function () {
+	    function ContinueStatement(label) {
+	        this.type = syntax_1.Syntax.ContinueStatement;
+	        this.label = label;
+	    }
+	    return ContinueStatement;
+	}());
+	exports.ContinueStatement = ContinueStatement;
+	var DebuggerStatement = (function () {
+	    function DebuggerStatement() {
+	        this.type = syntax_1.Syntax.DebuggerStatement;
+	    }
+	    return DebuggerStatement;
+	}());
+	exports.DebuggerStatement = DebuggerStatement;
+	var Directive = (function () {
+	    function Directive(expression, directive) {
+	        this.type = syntax_1.Syntax.ExpressionStatement;
+	        this.expression = expression;
+	        this.directive = directive;
+	    }
+	    return Directive;
+	}());
+	exports.Directive = Directive;
+	var DoWhileStatement = (function () {
+	    function DoWhileStatement(body, test) {
+	        this.type = syntax_1.Syntax.DoWhileStatement;
+	        this.body = body;
+	        this.test = test;
+	    }
+	    return DoWhileStatement;
+	}());
+	exports.DoWhileStatement = DoWhileStatement;
+	var EmptyStatement = (function () {
+	    function EmptyStatement() {
+	        this.type = syntax_1.Syntax.EmptyStatement;
+	    }
+	    return EmptyStatement;
+	}());
+	exports.EmptyStatement = EmptyStatement;
+	var ExportAllDeclaration = (function () {
+	    function ExportAllDeclaration(source) {
+	        this.type = syntax_1.Syntax.ExportAllDeclaration;
+	        this.source = source;
+	    }
+	    return ExportAllDeclaration;
+	}());
+	exports.ExportAllDeclaration = ExportAllDeclaration;
+	var ExportDefaultDeclaration = (function () {
+	    function ExportDefaultDeclaration(declaration) {
+	        this.type = syntax_1.Syntax.ExportDefaultDeclaration;
+	        this.declaration = declaration;
+	    }
+	    return ExportDefaultDeclaration;
+	}());
+	exports.ExportDefaultDeclaration = ExportDefaultDeclaration;
+	var ExportNamedDeclaration = (function () {
+	    function ExportNamedDeclaration(declaration, specifiers, source) {
+	        this.type = syntax_1.Syntax.ExportNamedDeclaration;
+	        this.declaration = declaration;
+	        this.specifiers = specifiers;
+	        this.source = source;
+	    }
+	    return ExportNamedDeclaration;
+	}());
+	exports.ExportNamedDeclaration = ExportNamedDeclaration;
+	var ExportSpecifier = (function () {
+	    function ExportSpecifier(local, exported) {
+	        this.type = syntax_1.Syntax.ExportSpecifier;
+	        this.exported = exported;
+	        this.local = local;
+	    }
+	    return ExportSpecifier;
+	}());
+	exports.ExportSpecifier = ExportSpecifier;
+	var ExpressionStatement = (function () {
+	    function ExpressionStatement(expression) {
+	        this.type = syntax_1.Syntax.ExpressionStatement;
+	        this.expression = expression;
+	    }
+	    return ExpressionStatement;
+	}());
+	exports.ExpressionStatement = ExpressionStatement;
+	var ForInStatement = (function () {
+	    function ForInStatement(left, right, body) {
+	        this.type = syntax_1.Syntax.ForInStatement;
+	        this.left = left;
+	        this.right = right;
+	        this.body = body;
+	        this.each = false;
+	    }
+	    return ForInStatement;
+	}());
+	exports.ForInStatement = ForInStatement;
+	var ForOfStatement = (function () {
+	    function ForOfStatement(left, right, body) {
+	        this.type = syntax_1.Syntax.ForOfStatement;
+	        this.left = left;
+	        this.right = right;
+	        this.body = body;
+	    }
+	    return ForOfStatement;
+	}());
+	exports.ForOfStatement = ForOfStatement;
+	var ForStatement = (function () {
+	    function ForStatement(init, test, update, body) {
+	        this.type = syntax_1.Syntax.ForStatement;
+	        this.init = init;
+	        this.test = test;
+	        this.update = update;
+	        this.body = body;
+	    }
+	    return ForStatement;
+	}());
+	exports.ForStatement = ForStatement;
+	var FunctionDeclaration = (function () {
+	    function FunctionDeclaration(id, params, body, generator) {
+	        this.type = syntax_1.Syntax.FunctionDeclaration;
+	        this.id = id;
+	        this.params = params;
+	        this.body = body;
+	        this.generator = generator;
+	        this.expression = false;
+	        this.async = false;
+	    }
+	    return FunctionDeclaration;
+	}());
+	exports.FunctionDeclaration = FunctionDeclaration;
+	var FunctionExpression = (function () {
+	    function FunctionExpression(id, params, body, generator) {
+	        this.type = syntax_1.Syntax.FunctionExpression;
+	        this.id = id;
+	        this.params = params;
+	        this.body = body;
+	        this.generator = generator;
+	        this.expression = false;
+	        this.async = false;
+	    }
+	    return FunctionExpression;
+	}());
+	exports.FunctionExpression = FunctionExpression;
+	var Identifier = (function () {
+	    function Identifier(name) {
+	        this.type = syntax_1.Syntax.Identifier;
+	        this.name = name;
+	    }
+	    return Identifier;
+	}());
+	exports.Identifier = Identifier;
+	var IfStatement = (function () {
+	    function IfStatement(test, consequent, alternate) {
+	        this.type = syntax_1.Syntax.IfStatement;
+	        this.test = test;
+	        this.consequent = consequent;
+	        this.alternate = alternate;
+	    }
+	    return IfStatement;
+	}());
+	exports.IfStatement = IfStatement;
+	var ImportDeclaration = (function () {
+	    function ImportDeclaration(specifiers, source) {
+	        this.type = syntax_1.Syntax.ImportDeclaration;
+	        this.specifiers = specifiers;
+	        this.source = source;
+	    }
+	    return ImportDeclaration;
+	}());
+	exports.ImportDeclaration = ImportDeclaration;
+	var ImportDefaultSpecifier = (function () {
+	    function ImportDefaultSpecifier(local) {
+	        this.type = syntax_1.Syntax.ImportDefaultSpecifier;
+	        this.local = local;
+	    }
+	    return ImportDefaultSpecifier;
+	}());
+	exports.ImportDefaultSpecifier = ImportDefaultSpecifier;
+	var ImportNamespaceSpecifier = (function () {
+	    function ImportNamespaceSpecifier(local) {
+	        this.type = syntax_1.Syntax.ImportNamespaceSpecifier;
+	        this.local = local;
+	    }
+	    return ImportNamespaceSpecifier;
+	}());
+	exports.ImportNamespaceSpecifier = ImportNamespaceSpecifier;
+	var ImportSpecifier = (function () {
+	    function ImportSpecifier(local, imported) {
+	        this.type = syntax_1.Syntax.ImportSpecifier;
+	        this.local = local;
+	        this.imported = imported;
+	    }
+	    return ImportSpecifier;
+	}());
+	exports.ImportSpecifier = ImportSpecifier;
+	var LabeledStatement = (function () {
+	    function LabeledStatement(label, body) {
+	        this.type = syntax_1.Syntax.LabeledStatement;
+	        this.label = label;
+	        this.body = body;
+	    }
+	    return LabeledStatement;
+	}());
+	exports.LabeledStatement = LabeledStatement;
+	var Literal = (function () {
+	    function Literal(value, raw) {
+	        this.type = syntax_1.Syntax.Literal;
+	        this.value = value;
+	        this.raw = raw;
+	    }
+	    return Literal;
+	}());
+	exports.Literal = Literal;
+	var MetaProperty = (function () {
+	    function MetaProperty(meta, property) {
+	        this.type = syntax_1.Syntax.MetaProperty;
+	        this.meta = meta;
+	        this.property = property;
+	    }
+	    return MetaProperty;
+	}());
+	exports.MetaProperty = MetaProperty;
+	var MethodDefinition = (function () {
+	    function MethodDefinition(key, computed, value, kind, isStatic) {
+	        this.type = syntax_1.Syntax.MethodDefinition;
+	        this.key = key;
+	        this.computed = computed;
+	        this.value = value;
+	        this.kind = kind;
+	        this.static = isStatic;
+	    }
+	    return MethodDefinition;
+	}());
+	exports.MethodDefinition = MethodDefinition;
+	var Module = (function () {
+	    function Module(body) {
+	        this.type = syntax_1.Syntax.Program;
+	        this.body = body;
+	        this.sourceType = 'module';
+	    }
+	    return Module;
+	}());
+	exports.Module = Module;
+	var NewExpression = (function () {
+	    function NewExpression(callee, args) {
+	        this.type = syntax_1.Syntax.NewExpression;
+	        this.callee = callee;
+	        this.arguments = args;
+	    }
+	    return NewExpression;
+	}());
+	exports.NewExpression = NewExpression;
+	var ObjectExpression = (function () {
+	    function ObjectExpression(properties) {
+	        this.type = syntax_1.Syntax.ObjectExpression;
+	        this.properties = properties;
+	    }
+	    return ObjectExpression;
+	}());
+	exports.ObjectExpression = ObjectExpression;
+	var ObjectPattern = (function () {
+	    function ObjectPattern(properties) {
+	        this.type = syntax_1.Syntax.ObjectPattern;
+	        this.properties = properties;
+	    }
+	    return ObjectPattern;
+	}());
+	exports.ObjectPattern = ObjectPattern;
+	var Property = (function () {
+	    function Property(kind, key, computed, value, method, shorthand) {
+	        this.type = syntax_1.Syntax.Property;
+	        this.key = key;
+	        this.computed = computed;
+	        this.value = value;
+	        this.kind = kind;
+	        this.method = method;
+	        this.shorthand = shorthand;
+	    }
+	    return Property;
+	}());
+	exports.Property = Property;
+	var RegexLiteral = (function () {
+	    function RegexLiteral(value, raw, pattern, flags) {
+	        this.type = syntax_1.Syntax.Literal;
+	        this.value = value;
+	        this.raw = raw;
+	        this.regex = { pattern: pattern, flags: flags };
+	    }
+	    return RegexLiteral;
+	}());
+	exports.RegexLiteral = RegexLiteral;
+	var RestElement = (function () {
+	    function RestElement(argument) {
+	        this.type = syntax_1.Syntax.RestElement;
+	        this.argument = argument;
+	    }
+	    return RestElement;
+	}());
+	exports.RestElement = RestElement;
+	var ReturnStatement = (function () {
+	    function ReturnStatement(argument) {
+	        this.type = syntax_1.Syntax.ReturnStatement;
+	        this.argument = argument;
+	    }
+	    return ReturnStatement;
+	}());
+	exports.ReturnStatement = ReturnStatement;
+	var Script = (function () {
+	    function Script(body) {
+	        this.type = syntax_1.Syntax.Program;
+	        this.body = body;
+	        this.sourceType = 'script';
+	    }
+	    return Script;
+	}());
+	exports.Script = Script;
+	var SequenceExpression = (function () {
+	    function SequenceExpression(expressions) {
+	        this.type = syntax_1.Syntax.SequenceExpression;
+	        this.expressions = expressions;
+	    }
+	    return SequenceExpression;
+	}());
+	exports.SequenceExpression = SequenceExpression;
+	var SpreadElement = (function () {
+	    function SpreadElement(argument) {
+	        this.type = syntax_1.Syntax.SpreadElement;
+	        this.argument = argument;
+	    }
+	    return SpreadElement;
+	}());
+	exports.SpreadElement = SpreadElement;
+	var StaticMemberExpression = (function () {
+	    function StaticMemberExpression(object, property) {
+	        this.type = syntax_1.Syntax.MemberExpression;
+	        this.computed = false;
+	        this.object = object;
+	        this.property = property;
+	    }
+	    return StaticMemberExpression;
+	}());
+	exports.StaticMemberExpression = StaticMemberExpression;
+	var Super = (function () {
+	    function Super() {
+	        this.type = syntax_1.Syntax.Super;
+	    }
+	    return Super;
+	}());
+	exports.Super = Super;
+	var SwitchCase = (function () {
+	    function SwitchCase(test, consequent) {
+	        this.type = syntax_1.Syntax.SwitchCase;
+	        this.test = test;
+	        this.consequent = consequent;
+	    }
+	    return SwitchCase;
+	}());
+	exports.SwitchCase = SwitchCase;
+	var SwitchStatement = (function () {
+	    function SwitchStatement(discriminant, cases) {
+	        this.type = syntax_1.Syntax.SwitchStatement;
+	        this.discriminant = discriminant;
+	        this.cases = cases;
+	    }
+	    return SwitchStatement;
+	}());
+	exports.SwitchStatement = SwitchStatement;
+	var TaggedTemplateExpression = (function () {
+	    function TaggedTemplateExpression(tag, quasi) {
+	        this.type = syntax_1.Syntax.TaggedTemplateExpression;
+	        this.tag = tag;
+	        this.quasi = quasi;
+	    }
+	    return TaggedTemplateExpression;
+	}());
+	exports.TaggedTemplateExpression = TaggedTemplateExpression;
+	var TemplateElement = (function () {
+	    function TemplateElement(value, tail) {
+	        this.type = syntax_1.Syntax.TemplateElement;
+	        this.value = value;
+	        this.tail = tail;
+	    }
+	    return TemplateElement;
+	}());
+	exports.TemplateElement = TemplateElement;
+	var TemplateLiteral = (function () {
+	    function TemplateLiteral(quasis, expressions) {
+	        this.type = syntax_1.Syntax.TemplateLiteral;
+	        this.quasis = quasis;
+	        this.expressions = expressions;
+	    }
+	    return TemplateLiteral;
+	}());
+	exports.TemplateLiteral = TemplateLiteral;
+	var ThisExpression = (function () {
+	    function ThisExpression() {
+	        this.type = syntax_1.Syntax.ThisExpression;
+	    }
+	    return ThisExpression;
+	}());
+	exports.ThisExpression = ThisExpression;
+	var ThrowStatement = (function () {
+	    function ThrowStatement(argument) {
+	        this.type = syntax_1.Syntax.ThrowStatement;
+	        this.argument = argument;
+	    }
+	    return ThrowStatement;
+	}());
+	exports.ThrowStatement = ThrowStatement;
+	var TryStatement = (function () {
+	    function TryStatement(block, handler, finalizer) {
+	        this.type = syntax_1.Syntax.TryStatement;
+	        this.block = block;
+	        this.handler = handler;
+	        this.finalizer = finalizer;
+	    }
+	    return TryStatement;
+	}());
+	exports.TryStatement = TryStatement;
+	var UnaryExpression = (function () {
+	    function UnaryExpression(operator, argument) {
+	        this.type = syntax_1.Syntax.UnaryExpression;
+	        this.operator = operator;
+	        this.argument = argument;
+	        this.prefix = true;
+	    }
+	    return UnaryExpression;
+	}());
+	exports.UnaryExpression = UnaryExpression;
+	var UpdateExpression = (function () {
+	    function UpdateExpression(operator, argument, prefix) {
+	        this.type = syntax_1.Syntax.UpdateExpression;
+	        this.operator = operator;
+	        this.argument = argument;
+	        this.prefix = prefix;
+	    }
+	    return UpdateExpression;
+	}());
+	exports.UpdateExpression = UpdateExpression;
+	var VariableDeclaration = (function () {
+	    function VariableDeclaration(declarations, kind) {
+	        this.type = syntax_1.Syntax.VariableDeclaration;
+	        this.declarations = declarations;
+	        this.kind = kind;
+	    }
+	    return VariableDeclaration;
+	}());
+	exports.VariableDeclaration = VariableDeclaration;
+	var VariableDeclarator = (function () {
+	    function VariableDeclarator(id, init) {
+	        this.type = syntax_1.Syntax.VariableDeclarator;
+	        this.id = id;
+	        this.init = init;
+	    }
+	    return VariableDeclarator;
+	}());
+	exports.VariableDeclarator = VariableDeclarator;
+	var WhileStatement = (function () {
+	    function WhileStatement(test, body) {
+	        this.type = syntax_1.Syntax.WhileStatement;
+	        this.test = test;
+	        this.body = body;
+	    }
+	    return WhileStatement;
+	}());
+	exports.WhileStatement = WhileStatement;
+	var WithStatement = (function () {
+	    function WithStatement(object, body) {
+	        this.type = syntax_1.Syntax.WithStatement;
+	        this.object = object;
+	        this.body = body;
+	    }
+	    return WithStatement;
+	}());
+	exports.WithStatement = WithStatement;
+	var YieldExpression = (function () {
+	    function YieldExpression(argument, delegate) {
+	        this.type = syntax_1.Syntax.YieldExpression;
+	        this.argument = argument;
+	        this.delegate = delegate;
+	    }
+	    return YieldExpression;
+	}());
+	exports.YieldExpression = YieldExpression;
+
+
+/***/ },
+/* 8 */
+/***/ function(module, exports, __webpack_require__) {
+
+	"use strict";
+	Object.defineProperty(exports, "__esModule", { value: true });
+	var assert_1 = __webpack_require__(9);
+	var error_handler_1 = __webpack_require__(10);
+	var messages_1 = __webpack_require__(11);
+	var Node = __webpack_require__(7);
+	var scanner_1 = __webpack_require__(12);
+	var syntax_1 = __webpack_require__(2);
+	var token_1 = __webpack_require__(13);
+	var ArrowParameterPlaceHolder = 'ArrowParameterPlaceHolder';
+	var Parser = (function () {
+	    function Parser(code, options, delegate) {
+	        if (options === void 0) { options = {}; }
+	        this.config = {
+	            range: (typeof options.range === 'boolean') && options.range,
+	            loc: (typeof options.loc === 'boolean') && options.loc,
+	            source: null,
+	            tokens: (typeof options.tokens === 'boolean') && options.tokens,
+	            comment: (typeof options.comment === 'boolean') && options.comment,
+	            tolerant: (typeof options.tolerant === 'boolean') && options.tolerant
+	        };
+	        if (this.config.loc && options.source && options.source !== null) {
+	            this.config.source = String(options.source);
+	        }
+	        this.delegate = delegate;
+	        this.errorHandler = new error_handler_1.ErrorHandler();
+	        this.errorHandler.tolerant = this.config.tolerant;
+	        this.scanner = new scanner_1.Scanner(code, this.errorHandler);
+	        this.scanner.trackComment = this.config.comment;
+	        this.operatorPrecedence = {
+	            ')': 0,
+	            ';': 0,
+	            ',': 0,
+	            '=': 0,
+	            ']': 0,
+	            '||': 1,
+	            '&&': 2,
+	            '|': 3,
+	            '^': 4,
+	            '&': 5,
+	            '==': 6,
+	            '!=': 6,
+	            '===': 6,
+	            '!==': 6,
+	            '<': 7,
+	            '>': 7,
+	            '<=': 7,
+	            '>=': 7,
+	            '<<': 8,
+	            '>>': 8,
+	            '>>>': 8,
+	            '+': 9,
+	            '-': 9,
+	            '*': 11,
+	            '/': 11,
+	            '%': 11
+	        };
+	        this.lookahead = {
+	            type: 2 /* EOF */,
+	            value: '',
+	            lineNumber: this.scanner.lineNumber,
+	            lineStart: 0,
+	            start: 0,
+	            end: 0
+	        };
+	        this.hasLineTerminator = false;
+	        this.context = {
+	            isModule: false,
+	            await: false,
+	            allowIn: true,
+	            allowStrictDirective: true,
+	            allowYield: true,
+	            firstCoverInitializedNameError: null,
+	            isAssignmentTarget: false,
+	            isBindingElement: false,
+	            inFunctionBody: false,
+	            inIteration: false,
+	            inSwitch: false,
+	            labelSet: {},
+	            strict: false
+	        };
+	        this.tokens = [];
+	        this.startMarker = {
+	            index: 0,
+	            line: this.scanner.lineNumber,
+	            column: 0
+	        };
+	        this.lastMarker = {
+	            index: 0,
+	            line: this.scanner.lineNumber,
+	            column: 0
+	        };
+	        this.nextToken();
+	        this.lastMarker = {
+	            index: this.scanner.index,
+	            line: this.scanner.lineNumber,
+	            column: this.scanner.index - this.scanner.lineStart
+	        };
+	    }
+	    Parser.prototype.throwError = function (messageFormat) {
+	        var values = [];
+	        for (var _i = 1; _i < arguments.length; _i++) {
+	            values[_i - 1] = arguments[_i];
+	        }
+	        var args = Array.prototype.slice.call(arguments, 1);
+	        var msg = messageFormat.replace(/%(\d)/g, function (whole, idx) {
+	            assert_1.assert(idx < args.length, 'Message reference must be in range');
+	            return args[idx];
+	        });
+	        var index = this.lastMarker.index;
+	        var line = this.lastMarker.line;
+	        var column = this.lastMarker.column + 1;
+	        throw this.errorHandler.createError(index, line, column, msg);
+	    };
+	    Parser.prototype.tolerateError = function (messageFormat) {
+	        var values = [];
+	        for (var _i = 1; _i < arguments.length; _i++) {
+	            values[_i - 1] = arguments[_i];
+	        }
+	        var args = Array.prototype.slice.call(arguments, 1);
+	        var msg = messageFormat.replace(/%(\d)/g, function (whole, idx) {
+	            assert_1.assert(idx < args.length, 'Message reference must be in range');
+	            return args[idx];
+	        });
+	        var index = this.lastMarker.index;
+	        var line = this.scanner.lineNumber;
+	        var column = this.lastMarker.column + 1;
+	        this.errorHandler.tolerateError(index, line, column, msg);
+	    };
+	    // Throw an exception because of the token.
+	    Parser.prototype.unexpectedTokenError = function (token, message) {
+	        var msg = message || messages_1.Messages.UnexpectedToken;
+	        var value;
+	        if (token) {
+	            if (!message) {
+	                msg = (token.type === 2 /* EOF */) ? messages_1.Messages.UnexpectedEOS :
+	                    (token.type === 3 /* Identifier */) ? messages_1.Messages.UnexpectedIdentifier :
+	                        (token.type === 6 /* NumericLiteral */) ? messages_1.Messages.UnexpectedNumber :
+	                            (token.type === 8 /* StringLiteral */) ? messages_1.Messages.UnexpectedString :
+	                                (token.type === 10 /* Template */) ? messages_1.Messages.UnexpectedTemplate :
+	                                    messages_1.Messages.UnexpectedToken;
+	                if (token.type === 4 /* Keyword */) {
+	                    if (this.scanner.isFutureReservedWord(token.value)) {
+	                        msg = messages_1.Messages.UnexpectedReserved;
+	                    }
+	                    else if (this.context.strict && this.scanner.isStrictModeReservedWord(token.value)) {
+	                        msg = messages_1.Messages.StrictReservedWord;
+	                    }
+	                }
+	            }
+	            value = token.value;
+	        }
+	        else {
+	            value = 'ILLEGAL';
+	        }
+	        msg = msg.replace('%0', value);
+	        if (token && typeof token.lineNumber === 'number') {
+	            var index = token.start;
+	            var line = token.lineNumber;
+	            var lastMarkerLineStart = this.lastMarker.index - this.lastMarker.column;
+	            var column = token.start - lastMarkerLineStart + 1;
+	            return this.errorHandler.createError(index, line, column, msg);
+	        }
+	        else {
+	            var index = this.lastMarker.index;
+	            var line = this.lastMarker.line;
+	            var column = this.lastMarker.column + 1;
+	            return this.errorHandler.createError(index, line, column, msg);
+	        }
+	    };
+	    Parser.prototype.throwUnexpectedToken = function (token, message) {
+	        throw this.unexpectedTokenError(token, message);
+	    };
+	    Parser.prototype.tolerateUnexpectedToken = function (token, message) {
+	        this.errorHandler.tolerate(this.unexpectedTokenError(token, message));
+	    };
+	    Parser.prototype.collectComments = function () {
+	        if (!this.config.comment) {
+	            this.scanner.scanComments();
+	        }
+	        else {
+	            var comments = this.scanner.scanComments();
+	            if (comments.length > 0 && this.delegate) {
+	                for (var i = 0; i < comments.length; ++i) {
+	                    var e = comments[i];
+	                    var node = void 0;
+	                    node = {
+	                        type: e.multiLine ? 'BlockComment' : 'LineComment',
+	                        value: this.scanner.source.slice(e.slice[0], e.slice[1])
+	                    };
+	                    if (this.config.range) {
+	                        node.range = e.range;
+	                    }
+	                    if (this.config.loc) {
+	                        node.loc = e.loc;
+	                    }
+	                    var metadata = {
+	                        start: {
+	                            line: e.loc.start.line,
+	                            column: e.loc.start.column,
+	                            offset: e.range[0]
+	                        },
+	                        end: {
+	                            line: e.loc.end.line,
+	                            column: e.loc.end.column,
+	                            offset: e.range[1]
+	                        }
+	                    };
+	                    this.delegate(node, metadata);
+	                }
+	            }
+	        }
+	    };
+	    // From internal representation to an external structure
+	    Parser.prototype.getTokenRaw = function (token) {
+	        return this.scanner.source.slice(token.start, token.end);
+	    };
+	    Parser.prototype.convertToken = function (token) {
+	        var t = {
+	            type: token_1.TokenName[token.type],
+	            value: this.getTokenRaw(token)
+	        };
+	        if (this.config.range) {
+	            t.range = [token.start, token.end];
+	        }
+	        if (this.config.loc) {
+	            t.loc = {
+	                start: {
+	                    line: this.startMarker.line,
+	                    column: this.startMarker.column
+	                },
+	                end: {
+	                    line: this.scanner.lineNumber,
+	                    column: this.scanner.index - this.scanner.lineStart
+	                }
+	            };
+	        }
+	        if (token.type === 9 /* RegularExpression */) {
+	            var pattern = token.pattern;
+	            var flags = token.flags;
+	            t.regex = { pattern: pattern, flags: flags };
+	        }
+	        return t;
+	    };
+	    Parser.prototype.nextToken = function () {
+	        var token = this.lookahead;
+	        this.lastMarker.index = this.scanner.index;
+	        this.lastMarker.line = this.scanner.lineNumber;
+	        this.lastMarker.column = this.scanner.index - this.scanner.lineStart;
+	        this.collectComments();
+	        if (this.scanner.index !== this.startMarker.index) {
+	            this.startMarker.index = this.scanner.index;
+	            this.startMarker.line = this.scanner.lineNumber;
+	            this.startMarker.column = this.scanner.index - this.scanner.lineStart;
+	        }
+	        var next = this.scanner.lex();
+	        this.hasLineTerminator = (token.lineNumber !== next.lineNumber);
+	        if (next && this.context.strict && next.type === 3 /* Identifier */) {
+	            if (this.scanner.isStrictModeReservedWord(next.value)) {
+	                next.type = 4 /* Keyword */;
+	            }
+	        }
+	        this.lookahead = next;
+	        if (this.config.tokens && next.type !== 2 /* EOF */) {
+	            this.tokens.push(this.convertToken(next));
+	        }
+	        return token;
+	    };
+	    Parser.prototype.nextRegexToken = function () {
+	        this.collectComments();
+	        var token = this.scanner.scanRegExp();
+	        if (this.config.tokens) {
+	            // Pop the previous token, '/' or '/='
+	            // This is added from the lookahead token.
+	            this.tokens.pop();
+	            this.tokens.push(this.convertToken(token));
+	        }
+	        // Prime the next lookahead.
+	        this.lookahead = token;
+	        this.nextToken();
+	        return token;
+	    };
+	    Parser.prototype.createNode = function () {
+	        return {
+	            index: this.startMarker.index,
+	            line: this.startMarker.line,
+	            column: this.startMarker.column
+	        };
+	    };
+	    Parser.prototype.startNode = function (token, lastLineStart) {
+	        if (lastLineStart === void 0) { lastLineStart = 0; }
+	        var column = token.start - token.lineStart;
+	        var line = token.lineNumber;
+	        if (column < 0) {
+	            column += lastLineStart;
+	            line--;
+	        }
+	        return {
+	            index: token.start,
+	            line: line,
+	            column: column
+	        };
+	    };
+	    Parser.prototype.finalize = function (marker, node) {
+	        if (this.config.range) {
+	            node.range = [marker.index, this.lastMarker.index];
+	        }
+	        if (this.config.loc) {
+	            node.loc = {
+	                start: {
+	                    line: marker.line,
+	                    column: marker.column,
+	                },
+	                end: {
+	                    line: this.lastMarker.line,
+	                    column: this.lastMarker.column
+	                }
+	            };
+	            if (this.config.source) {
+	                node.loc.source = this.config.source;
+	            }
+	        }
+	        if (this.delegate) {
+	            var metadata = {
+	                start: {
+	                    line: marker.line,
+	                    column: marker.column,
+	                    offset: marker.index
+	                },
+	                end: {
+	                    line: this.lastMarker.line,
+	                    column: this.lastMarker.column,
+	                    offset: this.lastMarker.index
+	                }
+	            };
+	            this.delegate(node, metadata);
+	        }
+	        return node;
+	    };
+	    // Expect the next token to match the specified punctuator.
+	    // If not, an exception will be thrown.
+	    Parser.prototype.expect = function (value) {
+	        var token = this.nextToken();
+	        if (token.type !== 7 /* Punctuator */ || token.value !== value) {
+	            this.throwUnexpectedToken(token);
+	        }
+	    };
+	    // Quietly expect a comma when in tolerant mode, otherwise delegates to expect().
+	    Parser.prototype.expectCommaSeparator = function () {
+	        if (this.config.tolerant) {
+	            var token = this.lookahead;
+	            if (token.type === 7 /* Punctuator */ && token.value === ',') {
+	                this.nextToken();
+	            }
+	            else if (token.type === 7 /* Punctuator */ && token.value === ';') {
+	                this.nextToken();
+	                this.tolerateUnexpectedToken(token);
+	            }
+	            else {
+	                this.tolerateUnexpectedToken(token, messages_1.Messages.UnexpectedToken);
+	            }
+	        }
+	        else {
+	            this.expect(',');
+	        }
+	    };
+	    // Expect the next token to match the specified keyword.
+	    // If not, an exception will be thrown.
+	    Parser.prototype.expectKeyword = function (keyword) {
+	        var token = this.nextToken();
+	        if (token.type !== 4 /* Keyword */ || token.value !== keyword) {
+	            this.throwUnexpectedToken(token);
+	        }
+	    };
+	    // Return true if the next token matches the specified punctuator.
+	    Parser.prototype.match = function (value) {
+	        return this.lookahead.type === 7 /* Punctuator */ && this.lookahead.value === value;
+	    };
+	    // Return true if the next token matches the specified keyword
+	    Parser.prototype.matchKeyword = function (keyword) {
+	        return this.lookahead.type === 4 /* Keyword */ && this.lookahead.value === keyword;
+	    };
+	    // Return true if the next token matches the specified contextual keyword
+	    // (where an identifier is sometimes a keyword depending on the context)
+	    Parser.prototype.matchContextualKeyword = function (keyword) {
+	        return this.lookahead.type === 3 /* Identifier */ && this.lookahead.value === keyword;
+	    };
+	    // Return true if the next token is an assignment operator
+	    Parser.prototype.matchAssign = function () {
+	        if (this.lookahead.type !== 7 /* Punctuator */) {
+	            return false;
+	        }
+	        var op = this.lookahead.value;
+	        return op === '=' ||
+	            op === '*=' ||
+	            op === '**=' ||
+	            op === '/=' ||
+	            op === '%=' ||
+	            op === '+=' ||
+	            op === '-=' ||
+	            op === '<<=' ||
+	            op === '>>=' ||
+	            op === '>>>=' ||
+	            op === '&=' ||
+	            op === '^=' ||
+	            op === '|=';
+	    };
+	    // Cover grammar support.
+	    //
+	    // When an assignment expression position starts with an left parenthesis, the determination of the type
+	    // of the syntax is to be deferred arbitrarily long until the end of the parentheses pair (plus a lookahead)
+	    // or the first comma. This situation also defers the determination of all the expressions nested in the pair.
+	    //
+	    // There are three productions that can be parsed in a parentheses pair that needs to be determined
+	    // after the outermost pair is closed. They are:
+	    //
+	    //   1. AssignmentExpression
+	    //   2. BindingElements
+	    //   3. AssignmentTargets
+	    //
+	    // In order to avoid exponential backtracking, we use two flags to denote if the production can be
+	    // binding element or assignment target.
+	    //
+	    // The three productions have the relationship:
+	    //
+	    //   BindingElements ⊆ AssignmentTargets ⊆ AssignmentExpression
+	    //
+	    // with a single exception that CoverInitializedName when used directly in an Expression, generates
+	    // an early error. Therefore, we need the third state, firstCoverInitializedNameError, to track the
+	    // first usage of CoverInitializedName and report it when we reached the end of the parentheses pair.
+	    //
+	    // isolateCoverGrammar function runs the given parser function with a new cover grammar context, and it does not
+	    // effect the current flags. This means the production the parser parses is only used as an expression. Therefore
+	    // the CoverInitializedName check is conducted.
+	    //
+	    // inheritCoverGrammar function runs the given parse function with a new cover grammar context, and it propagates
+	    // the flags outside of the parser. This means the production the parser parses is used as a part of a potential
+	    // pattern. The CoverInitializedName check is deferred.
+	    Parser.prototype.isolateCoverGrammar = function (parseFunction) {
+	        var previousIsBindingElement = this.context.isBindingElement;
+	        var previousIsAssignmentTarget = this.context.isAssignmentTarget;
+	        var previousFirstCoverInitializedNameError = this.context.firstCoverInitializedNameError;
+	        this.context.isBindingElement = true;
+	        this.context.isAssignmentTarget = true;
+	        this.context.firstCoverInitializedNameError = null;
+	        var result = parseFunction.call(this);
+	        if (this.context.firstCoverInitializedNameError !== null) {
+	            this.throwUnexpectedToken(this.context.firstCoverInitializedNameError);
+	        }
+	        this.context.isBindingElement = previousIsBindingElement;
+	        this.context.isAssignmentTarget = previousIsAssignmentTarget;
+	        this.context.firstCoverInitializedNameError = previousFirstCoverInitializedNameError;
+	        return result;
+	    };
+	    Parser.prototype.inheritCoverGrammar = function (parseFunction) {
+	        var previousIsBindingElement = this.context.isBindingElement;
+	        var previousIsAssignmentTarget = this.context.isAssignmentTarget;
+	        var previousFirstCoverInitializedNameError = this.context.firstCoverInitializedNameError;
+	        this.context.isBindingElement = true;
+	        this.context.isAssignmentTarget = true;
+	        this.context.firstCoverInitializedNameError = null;
+	        var result = parseFunction.call(this);
+	        this.context.isBindingElement = this.context.isBindingElement && previousIsBindingElement;
+	        this.context.isAssignmentTarget = this.context.isAssignmentTarget && previousIsAssignmentTarget;
+	        this.context.firstCoverInitializedNameError = previousFirstCoverInitializedNameError || this.context.firstCoverInitializedNameError;
+	        return result;
+	    };
+	    Parser.prototype.consumeSemicolon = function () {
+	        if (this.match(';')) {
+	            this.nextToken();
+	        }
+	        else if (!this.hasLineTerminator) {
+	            if (this.lookahead.type !== 2 /* EOF */ && !this.match('}')) {
+	                this.throwUnexpectedToken(this.lookahead);
+	            }
+	            this.lastMarker.index = this.startMarker.index;
+	            this.lastMarker.line = this.startMarker.line;
+	            this.lastMarker.column = this.startMarker.column;
+	        }
+	    };
+	    // https://tc39.github.io/ecma262/#sec-primary-expression
+	    Parser.prototype.parsePrimaryExpression = function () {
+	        var node = this.createNode();
+	        var expr;
+	        var token, raw;
+	        switch (this.lookahead.type) {
+	            case 3 /* Identifier */:
+	                if ((this.context.isModule || this.context.await) && this.lookahead.value === 'await') {
+	                    this.tolerateUnexpectedToken(this.lookahead);
+	                }
+	                expr = this.matchAsyncFunction() ? this.parseFunctionExpression() : this.finalize(node, new Node.Identifier(this.nextToken().value));
+	                break;
+	            case 6 /* NumericLiteral */:
+	            case 8 /* StringLiteral */:
+	                if (this.context.strict && this.lookahead.octal) {
+	                    this.tolerateUnexpectedToken(this.lookahead, messages_1.Messages.StrictOctalLiteral);
+	                }
+	                this.context.isAssignmentTarget = false;
+	                this.context.isBindingElement = false;
+	                token = this.nextToken();
+	                raw = this.getTokenRaw(token);
+	                expr = this.finalize(node, new Node.Literal(token.value, raw));
+	                break;
+	            case 1 /* BooleanLiteral */:
+	                this.context.isAssignmentTarget = false;
+	                this.context.isBindingElement = false;
+	                token = this.nextToken();
+	                raw = this.getTokenRaw(token);
+	                expr = this.finalize(node, new Node.Literal(token.value === 'true', raw));
+	                break;
+	            case 5 /* NullLiteral */:
+	                this.context.isAssignmentTarget = false;
+	                this.context.isBindingElement = false;
+	                token = this.nextToken();
+	                raw = this.getTokenRaw(token);
+	                expr = this.finalize(node, new Node.Literal(null, raw));
+	                break;
+	            case 10 /* Template */:
+	                expr = this.parseTemplateLiteral();
+	                break;
+	            case 7 /* Punctuator */:
+	                switch (this.lookahead.value) {
+	                    case '(':
+	                        this.context.isBindingElement = false;
+	                        expr = this.inheritCoverGrammar(this.parseGroupExpression);
+	                        break;
+	                    case '[':
+	                        expr = this.inheritCoverGrammar(this.parseArrayInitializer);
+	                        break;
+	                    case '{':
+	                        expr = this.inheritCoverGrammar(this.parseObjectInitializer);
+	                        break;
+	                    case '/':
+	                    case '/=':
+	                        this.context.isAssignmentTarget = false;
+	                        this.context.isBindingElement = false;
+	                        this.scanner.index = this.startMarker.index;
+	                        token = this.nextRegexToken();
+	                        raw = this.getTokenRaw(token);
+	                        expr = this.finalize(node, new Node.RegexLiteral(token.regex, raw, token.pattern, token.flags));
+	                        break;
+	                    default:
+	                        expr = this.throwUnexpectedToken(this.nextToken());
+	                }
+	                break;
+	            case 4 /* Keyword */:
+	                if (!this.context.strict && this.context.allowYield && this.matchKeyword('yield')) {
+	                    expr = this.parseIdentifierName();
+	                }
+	                else if (!this.context.strict && this.matchKeyword('let')) {
+	                    expr = this.finalize(node, new Node.Identifier(this.nextToken().value));
+	                }
+	                else {
+	                    this.context.isAssignmentTarget = false;
+	                    this.context.isBindingElement = false;
+	                    if (this.matchKeyword('function')) {
+	                        expr = this.parseFunctionExpression();
+	                    }
+	                    else if (this.matchKeyword('this')) {
+	                        this.nextToken();
+	                        expr = this.finalize(node, new Node.ThisExpression());
+	                    }
+	                    else if (this.matchKeyword('class')) {
+	                        expr = this.parseClassExpression();
+	                    }
+	                    else {
+	                        expr = this.throwUnexpectedToken(this.nextToken());
+	                    }
+	                }
+	                break;
+	            default:
+	                expr = this.throwUnexpectedToken(this.nextToken());
+	        }
+	        return expr;
+	    };
+	    // https://tc39.github.io/ecma262/#sec-array-initializer
+	    Parser.prototype.parseSpreadElement = function () {
+	        var node = this.createNode();
+	        this.expect('...');
+	        var arg = this.inheritCoverGrammar(this.parseAssignmentExpression);
+	        return this.finalize(node, new Node.SpreadElement(arg));
+	    };
+	    Parser.prototype.parseArrayInitializer = function () {
+	        var node = this.createNode();
+	        var elements = [];
+	        this.expect('[');
+	        while (!this.match(']')) {
+	            if (this.match(',')) {
+	                this.nextToken();
+	                elements.push(null);
+	            }
+	            else if (this.match('...')) {
+	                var element = this.parseSpreadElement();
+	                if (!this.match(']')) {
+	                    this.context.isAssignmentTarget = false;
+	                    this.context.isBindingElement = false;
+	                    this.expect(',');
+	                }
+	                elements.push(element);
+	            }
+	            else {
+	                elements.push(this.inheritCoverGrammar(this.parseAssignmentExpression));
+	                if (!this.match(']')) {
+	                    this.expect(',');
+	                }
+	            }
+	        }
+	        this.expect(']');
+	        return this.finalize(node, new Node.ArrayExpression(elements));
+	    };
+	    // https://tc39.github.io/ecma262/#sec-object-initializer
+	    Parser.prototype.parsePropertyMethod = function (params) {
+	        this.context.isAssignmentTarget = false;
+	        this.context.isBindingElement = false;
+	        var previousStrict = this.context.strict;
+	        var previousAllowStrictDirective = this.context.allowStrictDirective;
+	        this.context.allowStrictDirective = params.simple;
+	        var body = this.isolateCoverGrammar(this.parseFunctionSourceElements);
+	        if (this.context.strict && params.firstRestricted) {
+	            this.tolerateUnexpectedToken(params.firstRestricted, params.message);
+	        }
+	        if (this.context.strict && params.stricted) {
+	            this.tolerateUnexpectedToken(params.stricted, params.message);
+	        }
+	        this.context.strict = previousStrict;
+	        this.context.allowStrictDirective = previousAllowStrictDirective;
+	        return body;
+	    };
+	    Parser.prototype.parsePropertyMethodFunction = function () {
+	        var isGenerator = false;
+	        var node = this.createNode();
+	        var previousAllowYield = this.context.allowYield;
+	        this.context.allowYield = true;
+	        var params = this.parseFormalParameters();
+	        var method = this.parsePropertyMethod(params);
+	        this.context.allowYield = previousAllowYield;
+	        return this.finalize(node, new Node.FunctionExpression(null, params.params, method, isGenerator));
+	    };
+	    Parser.prototype.parsePropertyMethodAsyncFunction = function () {
+	        var node = this.createNode();
+	        var previousAllowYield = this.context.allowYield;
+	        var previousAwait = this.context.await;
+	        this.context.allowYield = false;
+	        this.context.await = true;
+	        var params = this.parseFormalParameters();
+	        var method = this.parsePropertyMethod(params);
+	        this.context.allowYield = previousAllowYield;
+	        this.context.await = previousAwait;
+	        return this.finalize(node, new Node.AsyncFunctionExpression(null, params.params, method));
+	    };
+	    Parser.prototype.parseObjectPropertyKey = function () {
+	        var node = this.createNode();
+	        var token = this.nextToken();
+	        var key;
+	        switch (token.type) {
+	            case 8 /* StringLiteral */:
+	            case 6 /* NumericLiteral */:
+	                if (this.context.strict && token.octal) {
+	                    this.tolerateUnexpectedToken(token, messages_1.Messages.StrictOctalLiteral);
+	                }
+	                var raw = this.getTokenRaw(token);
+	                key = this.finalize(node, new Node.Literal(token.value, raw));
+	                break;
+	            case 3 /* Identifier */:
+	            case 1 /* BooleanLiteral */:
+	            case 5 /* NullLiteral */:
+	            case 4 /* Keyword */:
+	                key = this.finalize(node, new Node.Identifier(token.value));
+	                break;
+	            case 7 /* Punctuator */:
+	                if (token.value === '[') {
+	                    key = this.isolateCoverGrammar(this.parseAssignmentExpression);
+	                    this.expect(']');
+	                }
+	                else {
+	                    key = this.throwUnexpectedToken(token);
+	                }
+	                break;
+	            default:
+	                key = this.throwUnexpectedToken(token);
+	        }
+	        return key;
+	    };
+	    Parser.prototype.isPropertyKey = function (key, value) {
+	        return (key.type === syntax_1.Syntax.Identifier && key.name === value) ||
+	            (key.type === syntax_1.Syntax.Literal && key.value === value);
+	    };
+	    Parser.prototype.parseObjectProperty = function (hasProto) {
+	        var node = this.createNode();
+	        var token = this.lookahead;
+	        var kind;
+	        var key = null;
+	        var value = null;
+	        var computed = false;
+	        var method = false;
+	        var shorthand = false;
+	        var isAsync = false;
+	        if (token.type === 3 /* Identifier */) {
+	            var id = token.value;
+	            this.nextToken();
+	            computed = this.match('[');
+	            isAsync = !this.hasLineTerminator && (id === 'async') &&
+	                !this.match(':') && !this.match('(') && !this.match('*') && !this.match(',');
+	            key = isAsync ? this.parseObjectPropertyKey() : this.finalize(node, new Node.Identifier(id));
+	        }
+	        else if (this.match('*')) {
+	            this.nextToken();
+	        }
+	        else {
+	            computed = this.match('[');
+	            key = this.parseObjectPropertyKey();
+	        }
+	        var lookaheadPropertyKey = this.qualifiedPropertyName(this.lookahead);
+	        if (token.type === 3 /* Identifier */ && !isAsync && token.value === 'get' && lookaheadPropertyKey) {
+	            kind = 'get';
+	            computed = this.match('[');
+	            key = this.parseObjectPropertyKey();
+	            this.context.allowYield = false;
+	            value = this.parseGetterMethod();
+	        }
+	        else if (token.type === 3 /* Identifier */ && !isAsync && token.value === 'set' && lookaheadPropertyKey) {
+	            kind = 'set';
+	            computed = this.match('[');
+	            key = this.parseObjectPropertyKey();
+	            value = this.parseSetterMethod();
+	        }
+	        else if (token.type === 7 /* Punctuator */ && token.value === '*' && lookaheadPropertyKey) {
+	            kind = 'init';
+	            computed = this.match('[');
+	            key = this.parseObjectPropertyKey();
+	            value = this.parseGeneratorMethod();
+	            method = true;
+	        }
+	        else {
+	            if (!key) {
+	                this.throwUnexpectedToken(this.lookahead);
+	            }
+	            kind = 'init';
+	            if (this.match(':') && !isAsync) {
+	                if (!computed && this.isPropertyKey(key, '__proto__')) {
+	                    if (hasProto.value) {
+	                        this.tolerateError(messages_1.Messages.DuplicateProtoProperty);
+	                    }
+	                    hasProto.value = true;
+	                }
+	                this.nextToken();
+	                value = this.inheritCoverGrammar(this.parseAssignmentExpression);
+	            }
+	            else if (this.match('(')) {
+	                value = isAsync ? this.parsePropertyMethodAsyncFunction() : this.parsePropertyMethodFunction();
+	                method = true;
+	            }
+	            else if (token.type === 3 /* Identifier */) {
+	                var id = this.finalize(node, new Node.Identifier(token.value));
+	                if (this.match('=')) {
+	                    this.context.firstCoverInitializedNameError = this.lookahead;
+	                    this.nextToken();
+	                    shorthand = true;
+	                    var init = this.isolateCoverGrammar(this.parseAssignmentExpression);
+	                    value = this.finalize(node, new Node.AssignmentPattern(id, init));
+	                }
+	                else {
+	                    shorthand = true;
+	                    value = id;
+	                }
+	            }
+	            else {
+	                this.throwUnexpectedToken(this.nextToken());
+	            }
+	        }
+	        return this.finalize(node, new Node.Property(kind, key, computed, value, method, shorthand));
+	    };
+	    Parser.prototype.parseObjectInitializer = function () {
+	        var node = this.createNode();
+	        this.expect('{');
+	        var properties = [];
+	        var hasProto = { value: false };
+	        while (!this.match('}')) {
+	            properties.push(this.parseObjectProperty(hasProto));
+	            if (!this.match('}')) {
+	                this.expectCommaSeparator();
+	            }
+	        }
+	        this.expect('}');
+	        return this.finalize(node, new Node.ObjectExpression(properties));
+	    };
+	    // https://tc39.github.io/ecma262/#sec-template-literals
+	    Parser.prototype.parseTemplateHead = function () {
+	        assert_1.assert(this.lookahead.head, 'Template literal must start with a template head');
+	        var node = this.createNode();
+	        var token = this.nextToken();
+	        var raw = token.value;
+	        var cooked = token.cooked;
+	        return this.finalize(node, new Node.TemplateElement({ raw: raw, cooked: cooked }, token.tail));
+	    };
+	    Parser.prototype.parseTemplateElement = function () {
+	        if (this.lookahead.type !== 10 /* Template */) {
+	            this.throwUnexpectedToken();
+	        }
+	        var node = this.createNode();
+	        var token = this.nextToken();
+	        var raw = token.value;
+	        var cooked = token.cooked;
+	        return this.finalize(node, new Node.TemplateElement({ raw: raw, cooked: cooked }, token.tail));
+	    };
+	    Parser.prototype.parseTemplateLiteral = function () {
+	        var node = this.createNode();
+	        var expressions = [];
+	        var quasis = [];
+	        var quasi = this.parseTemplateHead();
+	        quasis.push(quasi);
+	        while (!quasi.tail) {
+	            expressions.push(this.parseExpression());
+	            quasi = this.parseTemplateElement();
+	            quasis.push(quasi);
+	        }
+	        return this.finalize(node, new Node.TemplateLiteral(quasis, expressions));
+	    };
+	    // https://tc39.github.io/ecma262/#sec-grouping-operator
+	    Parser.prototype.reinterpretExpressionAsPattern = function (expr) {
+	        switch (expr.type) {
+	            case syntax_1.Syntax.Identifier:
+	            case syntax_1.Syntax.MemberExpression:
+	            case syntax_1.Syntax.RestElement:
+	            case syntax_1.Syntax.AssignmentPattern:
+	                break;
+	            case syntax_1.Syntax.SpreadElement:
+	                expr.type = syntax_1.Syntax.RestElement;
+	                this.reinterpretExpressionAsPattern(expr.argument);
+	                break;
+	            case syntax_1.Syntax.ArrayExpression:
+	                expr.type = syntax_1.Syntax.ArrayPattern;
+	                for (var i = 0; i < expr.elements.length; i++) {
+	                    if (expr.elements[i] !== null) {
+	                        this.reinterpretExpressionAsPattern(expr.elements[i]);
+	                    }
+	                }
+	                break;
+	            case syntax_1.Syntax.ObjectExpression:
+	                expr.type = syntax_1.Syntax.ObjectPattern;
+	                for (var i = 0; i < expr.properties.length; i++) {
+	                    this.reinterpretExpressionAsPattern(expr.properties[i].value);
+	                }
+	                break;
+	            case syntax_1.Syntax.AssignmentExpression:
+	                expr.type = syntax_1.Syntax.AssignmentPattern;
+	                delete expr.operator;
+	                this.reinterpretExpressionAsPattern(expr.left);
+	                break;
+	            default:
+	                // Allow other node type for tolerant parsing.
+	                break;
+	        }
+	    };
+	    Parser.prototype.parseGroupExpression = function () {
+	        var expr;
+	        this.expect('(');
+	        if (this.match(')')) {
+	            this.nextToken();
+	            if (!this.match('=>')) {
+	                this.expect('=>');
+	            }
+	            expr = {
+	                type: ArrowParameterPlaceHolder,
+	                params: [],
+	                async: false
+	            };
+	        }
+	        else {
+	            var startToken = this.lookahead;
+	            var params = [];
+	            if (this.match('...')) {
+	                expr = this.parseRestElement(params);
+	                this.expect(')');
+	                if (!this.match('=>')) {
+	                    this.expect('=>');
+	                }
+	                expr = {
+	                    type: ArrowParameterPlaceHolder,
+	                    params: [expr],
+	                    async: false
+	                };
+	            }
+	            else {
+	                var arrow = false;
+	                this.context.isBindingElement = true;
+	                expr = this.inheritCoverGrammar(this.parseAssignmentExpression);
+	                if (this.match(',')) {
+	                    var expressions = [];
+	                    this.context.isAssignmentTarget = false;
+	                    expressions.push(expr);
+	                    while (this.lookahead.type !== 2 /* EOF */) {
+	                        if (!this.match(',')) {
+	                            break;
+	                        }
+	                        this.nextToken();
+	                        if (this.match(')')) {
+	                            this.nextToken();
+	                            for (var i = 0; i < expressions.length; i++) {
+	                                this.reinterpretExpressionAsPattern(expressions[i]);
+	                            }
+	                            arrow = true;
+	                            expr = {
+	                                type: ArrowParameterPlaceHolder,
+	                                params: expressions,
+	                                async: false
+	                            };
+	                        }
+	                        else if (this.match('...')) {
+	                            if (!this.context.isBindingElement) {
+	                                this.throwUnexpectedToken(this.lookahead);
+	                            }
+	                            expressions.push(this.parseRestElement(params));
+	                            this.expect(')');
+	                            if (!this.match('=>')) {
+	                                this.expect('=>');
+	                            }
+	                            this.context.isBindingElement = false;
+	                            for (var i = 0; i < expressions.length; i++) {
+	                                this.reinterpretExpressionAsPattern(expressions[i]);
+	                            }
+	                            arrow = true;
+	                            expr = {
+	                                type: ArrowParameterPlaceHolder,
+	                                params: expressions,
+	                                async: false
+	                            };
+	                        }
+	                        else {
+	                            expressions.push(this.inheritCoverGrammar(this.parseAssignmentExpression));
+	                        }
+	                        if (arrow) {
+	                            break;
+	                        }
+	                    }
+	                    if (!arrow) {
+	                        expr = this.finalize(this.startNode(startToken), new Node.SequenceExpression(expressions));
+	                    }
+	                }
+	                if (!arrow) {
+	                    this.expect(')');
+	                    if (this.match('=>')) {
+	                        if (expr.type === syntax_1.Syntax.Identifier && expr.name === 'yield') {
+	                            arrow = true;
+	                            expr = {
+	                                type: ArrowParameterPlaceHolder,
+	                                params: [expr],
+	                                async: false
+	                            };
+	                        }
+	                        if (!arrow) {
+	                            if (!this.context.isBindingElement) {
+	                                this.throwUnexpectedToken(this.lookahead);
+	                            }
+	                            if (expr.type === syntax_1.Syntax.SequenceExpression) {
+	                                for (var i = 0; i < expr.expressions.length; i++) {
+	                                    this.reinterpretExpressionAsPattern(expr.expressions[i]);
+	                                }
+	                            }
+	                            else {
+	                                this.reinterpretExpressionAsPattern(expr);
+	                            }
+	                            var parameters = (expr.type === syntax_1.Syntax.SequenceExpression ? expr.expressions : [expr]);
+	                            expr = {
+	                                type: ArrowParameterPlaceHolder,
+	                                params: parameters,
+	                                async: false
+	                            };
+	                        }
+	                    }
+	                    this.context.isBindingElement = false;
+	                }
+	            }
+	        }
+	        return expr;
+	    };
+	    // https://tc39.github.io/ecma262/#sec-left-hand-side-expressions
+	    Parser.prototype.parseArguments = function () {
+	        this.expect('(');
+	        var args = [];
+	        if (!this.match(')')) {
+	            while (true) {
+	                var expr = this.match('...') ? this.parseSpreadElement() :
+	                    this.isolateCoverGrammar(this.parseAssignmentExpression);
+	                args.push(expr);
+	                if (this.match(')')) {
+	                    break;
+	                }
+	                this.expectCommaSeparator();
+	                if (this.match(')')) {
+	                    break;
+	                }
+	            }
+	        }
+	        this.expect(')');
+	        return args;
+	    };
+	    Parser.prototype.isIdentifierName = function (token) {
+	        return token.type === 3 /* Identifier */ ||
+	            token.type === 4 /* Keyword */ ||
+	            token.type === 1 /* BooleanLiteral */ ||
+	            token.type === 5 /* NullLiteral */;
+	    };
+	    Parser.prototype.parseIdentifierName = function () {
+	        var node = this.createNode();
+	        var token = this.nextToken();
+	        if (!this.isIdentifierName(token)) {
+	            this.throwUnexpectedToken(token);
+	        }
+	        return this.finalize(node, new Node.Identifier(token.value));
+	    };
+	    Parser.prototype.parseNewExpression = function () {
+	        var node = this.createNode();
+	        var id = this.parseIdentifierName();
+	        assert_1.assert(id.name === 'new', 'New expression must start with `new`');
+	        var expr;
+	        if (this.match('.')) {
+	            this.nextToken();
+	            if (this.lookahead.type === 3 /* Identifier */ && this.context.inFunctionBody && this.lookahead.value === 'target') {
+	                var property = this.parseIdentifierName();
+	                expr = new Node.MetaProperty(id, property);
+	            }
+	            else {
+	                this.throwUnexpectedToken(this.lookahead);
+	            }
+	        }
+	        else {
+	            var callee = this.isolateCoverGrammar(this.parseLeftHandSideExpression);
+	            var args = this.match('(') ? this.parseArguments() : [];
+	            expr = new Node.NewExpression(callee, args);
+	            this.context.isAssignmentTarget = false;
+	            this.context.isBindingElement = false;
+	        }
+	        return this.finalize(node, expr);
+	    };
+	    Parser.prototype.parseAsyncArgument = function () {
+	        var arg = this.parseAssignmentExpression();
+	        this.context.firstCoverInitializedNameError = null;
+	        return arg;
+	    };
+	    Parser.prototype.parseAsyncArguments = function () {
+	        this.expect('(');
+	        var args = [];
+	        if (!this.match(')')) {
+	            while (true) {
+	                var expr = this.match('...') ? this.parseSpreadElement() :
+	                    this.isolateCoverGrammar(this.parseAsyncArgument);
+	                args.push(expr);
+	                if (this.match(')')) {
+	                    break;
+	                }
+	                this.expectCommaSeparator();
+	                if (this.match(')')) {
+	                    break;
+	                }
+	            }
+	        }
+	        this.expect(')');
+	        return args;
+	    };
+	    Parser.prototype.parseLeftHandSideExpressionAllowCall = function () {
+	        var startToken = this.lookahead;
+	        var maybeAsync = this.matchContextualKeyword('async');
+	        var previousAllowIn = this.context.allowIn;
+	        this.context.allowIn = true;
+	        var expr;
+	        if (this.matchKeyword('super') && this.context.inFunctionBody) {
+	            expr = this.createNode();
+	            this.nextToken();
+	            expr = this.finalize(expr, new Node.Super());
+	            if (!this.match('(') && !this.match('.') && !this.match('[')) {
+	                this.throwUnexpectedToken(this.lookahead);
+	            }
+	        }
+	        else {
+	            expr = this.inheritCoverGrammar(this.matchKeyword('new') ? this.parseNewExpression : this.parsePrimaryExpression);
+	        }
+	        while (true) {
+	            if (this.match('.')) {
+	                this.context.isBindingElement = false;
+	                this.context.isAssignmentTarget = true;
+	                this.expect('.');
+	                var property = this.parseIdentifierName();
+	                expr = this.finalize(this.startNode(startToken), new Node.StaticMemberExpression(expr, property));
+	            }
+	            else if (this.match('(')) {
+	                var asyncArrow = maybeAsync && (startToken.lineNumber === this.lookahead.lineNumber);
+	                this.context.isBindingElement = false;
+	                this.context.isAssignmentTarget = false;
+	                var args = asyncArrow ? this.parseAsyncArguments() : this.parseArguments();
+	                expr = this.finalize(this.startNode(startToken), new Node.CallExpression(expr, args));
+	                if (asyncArrow && this.match('=>')) {
+	                    for (var i = 0; i < args.length; ++i) {
+	                        this.reinterpretExpressionAsPattern(args[i]);
+	                    }
+	                    expr = {
+	                        type: ArrowParameterPlaceHolder,
+	                        params: args,
+	                        async: true
+	                    };
+	                }
+	            }
+	            else if (this.match('[')) {
+	                this.context.isBindingElement = false;
+	                this.context.isAssignmentTarget = true;
+	                this.expect('[');
+	                var property = this.isolateCoverGrammar(this.parseExpression);
+	                this.expect(']');
+	                expr = this.finalize(this.startNode(startToken), new Node.ComputedMemberExpression(expr, property));
+	            }
+	            else if (this.lookahead.type === 10 /* Template */ && this.lookahead.head) {
+	                var quasi = this.parseTemplateLiteral();
+	                expr = this.finalize(this.startNode(startToken), new Node.TaggedTemplateExpression(expr, quasi));
+	            }
+	            else {
+	                break;
+	            }
+	        }
+	        this.context.allowIn = previousAllowIn;
+	        return expr;
+	    };
+	    Parser.prototype.parseSuper = function () {
+	        var node = this.createNode();
+	        this.expectKeyword('super');
+	        if (!this.match('[') && !this.match('.')) {
+	            this.throwUnexpectedToken(this.lookahead);
+	        }
+	        return this.finalize(node, new Node.Super());
+	    };
+	    Parser.prototype.parseLeftHandSideExpression = function () {
+	        assert_1.assert(this.context.allowIn, 'callee of new expression always allow in keyword.');
+	        var node = this.startNode(this.lookahead);
+	        var expr = (this.matchKeyword('super') && this.context.inFunctionBody) ? this.parseSuper() :
+	            this.inheritCoverGrammar(this.matchKeyword('new') ? this.parseNewExpression : this.parsePrimaryExpression);
+	        while (true) {
+	            if (this.match('[')) {
+	                this.context.isBindingElement = false;
+	                this.context.isAssignmentTarget = true;
+	                this.expect('[');
+	                var property = this.isolateCoverGrammar(this.parseExpression);
+	                this.expect(']');
+	                expr = this.finalize(node, new Node.ComputedMemberExpression(expr, property));
+	            }
+	            else if (this.match('.')) {
+	                this.context.isBindingElement = false;
+	                this.context.isAssignmentTarget = true;
+	                this.expect('.');
+	                var property = this.parseIdentifierName();
+	                expr = this.finalize(node, new Node.StaticMemberExpression(expr, property));
+	            }
+	            else if (this.lookahead.type === 10 /* Template */ && this.lookahead.head) {
+	                var quasi = this.parseTemplateLiteral();
+	                expr = this.finalize(node, new Node.TaggedTemplateExpression(expr, quasi));
+	            }
+	            else {
+	                break;
+	            }
+	        }
+	        return expr;
+	    };
+	    // https://tc39.github.io/ecma262/#sec-update-expressions
+	    Parser.prototype.parseUpdateExpression = function () {
+	        var expr;
+	        var startToken = this.lookahead;
+	        if (this.match('++') || this.match('--')) {
+	            var node = this.startNode(startToken);
+	            var token = this.nextToken();
+	            expr = this.inheritCoverGrammar(this.parseUnaryExpression);
+	            if (this.context.strict && expr.type === syntax_1.Syntax.Identifier && this.scanner.isRestrictedWord(expr.name)) {
+	                this.tolerateError(messages_1.Messages.StrictLHSPrefix);
+	            }
+	            if (!this.context.isAssignmentTarget) {
+	                this.tolerateError(messages_1.Messages.InvalidLHSInAssignment);
+	            }
+	            var prefix = true;
+	            expr = this.finalize(node, new Node.UpdateExpression(token.value, expr, prefix));
+	            this.context.isAssignmentTarget = false;
+	            this.context.isBindingElement = false;
+	        }
+	        else {
+	            expr = this.inheritCoverGrammar(this.parseLeftHandSideExpressionAllowCall);
+	            if (!this.hasLineTerminator && this.lookahead.type === 7 /* Punctuator */) {
+	                if (this.match('++') || this.match('--')) {
+	                    if (this.context.strict && expr.type === syntax_1.Syntax.Identifier && this.scanner.isRestrictedWord(expr.name)) {
+	                        this.tolerateError(messages_1.Messages.StrictLHSPostfix);
+	                    }
+	                    if (!this.context.isAssignmentTarget) {
+	                        this.tolerateError(messages_1.Messages.InvalidLHSInAssignment);
+	                    }
+	                    this.context.isAssignmentTarget = false;
+	                    this.context.isBindingElement = false;
+	                    var operator = this.nextToken().value;
+	                    var prefix = false;
+	                    expr = this.finalize(this.startNode(startToken), new Node.UpdateExpression(operator, expr, prefix));
+	                }
+	            }
+	        }
+	        return expr;
+	    };
+	    // https://tc39.github.io/ecma262/#sec-unary-operators
+	    Parser.prototype.parseAwaitExpression = function () {
+	        var node = this.createNode();
+	        this.nextToken();
+	        var argument = this.parseUnaryExpression();
+	        return this.finalize(node, new Node.AwaitExpression(argument));
+	    };
+	    Parser.prototype.parseUnaryExpression = function () {
+	        var expr;
+	        if (this.match('+') || this.match('-') || this.match('~') || this.match('!') ||
+	            this.matchKeyword('delete') || this.matchKeyword('void') || this.matchKeyword('typeof')) {
+	            var node = this.startNode(this.lookahead);
+	            var token = this.nextToken();
+	            expr = this.inheritCoverGrammar(this.parseUnaryExpression);
+	            expr = this.finalize(node, new Node.UnaryExpression(token.value, expr));
+	            if (this.context.strict && expr.operator === 'delete' && expr.argument.type === syntax_1.Syntax.Identifier) {
+	                this.tolerateError(messages_1.Messages.StrictDelete);
+	            }
+	            this.context.isAssignmentTarget = false;
+	            this.context.isBindingElement = false;
+	        }
+	        else if (this.context.await && this.matchContextualKeyword('await')) {
+	            expr = this.parseAwaitExpression();
+	        }
+	        else {
+	            expr = this.parseUpdateExpression();
+	        }
+	        return expr;
+	    };
+	    Parser.prototype.parseExponentiationExpression = function () {
+	        var startToken = this.lookahead;
+	        var expr = this.inheritCoverGrammar(this.parseUnaryExpression);
+	        if (expr.type !== syntax_1.Syntax.UnaryExpression && this.match('**')) {
+	            this.nextToken();
+	            this.context.isAssignmentTarget = false;
+	            this.context.isBindingElement = false;
+	            var left = expr;
+	            var right = this.isolateCoverGrammar(this.parseExponentiationExpression);
+	            expr = this.finalize(this.startNode(startToken), new Node.BinaryExpression('**', left, right));
+	        }
+	        return expr;
+	    };
+	    // https://tc39.github.io/ecma262/#sec-exp-operator
+	    // https://tc39.github.io/ecma262/#sec-multiplicative-operators
+	    // https://tc39.github.io/ecma262/#sec-additive-operators
+	    // https://tc39.github.io/ecma262/#sec-bitwise-shift-operators
+	    // https://tc39.github.io/ecma262/#sec-relational-operators
+	    // https://tc39.github.io/ecma262/#sec-equality-operators
+	    // https://tc39.github.io/ecma262/#sec-binary-bitwise-operators
+	    // https://tc39.github.io/ecma262/#sec-binary-logical-operators
+	    Parser.prototype.binaryPrecedence = function (token) {
+	        var op = token.value;
+	        var precedence;
+	        if (token.type === 7 /* Punctuator */) {
+	            precedence = this.operatorPrecedence[op] || 0;
+	        }
+	        else if (token.type === 4 /* Keyword */) {
+	            precedence = (op === 'instanceof' || (this.context.allowIn && op === 'in')) ? 7 : 0;
+	        }
+	        else {
+	            precedence = 0;
+	        }
+	        return precedence;
+	    };
+	    Parser.prototype.parseBinaryExpression = function () {
+	        var startToken = this.lookahead;
+	        var expr = this.inheritCoverGrammar(this.parseExponentiationExpression);
+	        var token = this.lookahead;
+	        var prec = this.binaryPrecedence(token);
+	        if (prec > 0) {
+	            this.nextToken();
+	            this.context.isAssignmentTarget = false;
+	            this.context.isBindingElement = false;
+	            var markers = [startToken, this.lookahead];
+	            var left = expr;
+	            var right = this.isolateCoverGrammar(this.parseExponentiationExpression);
+	            var stack = [left, token.value, right];
+	            var precedences = [prec];
+	            while (true) {
+	                prec = this.binaryPrecedence(this.lookahead);
+	                if (prec <= 0) {
+	                    break;
+	                }
+	                // Reduce: make a binary expression from the three topmost entries.
+	                while ((stack.length > 2) && (prec <= precedences[precedences.length - 1])) {
+	                    right = stack.pop();
+	                    var operator = stack.pop();
+	                    precedences.pop();
+	                    left = stack.pop();
+	                    markers.pop();
+	                    var node = this.startNode(markers[markers.length - 1]);
+	                    stack.push(this.finalize(node, new Node.BinaryExpression(operator, left, right)));
+	                }
+	                // Shift.
+	                stack.push(this.nextToken().value);
+	                precedences.push(prec);
+	                markers.push(this.lookahead);
+	                stack.push(this.isolateCoverGrammar(this.parseExponentiationExpression));
+	            }
+	            // Final reduce to clean-up the stack.
+	            var i = stack.length - 1;
+	            expr = stack[i];
+	            var lastMarker = markers.pop();
+	            while (i > 1) {
+	                var marker = markers.pop();
+	                var lastLineStart = lastMarker && lastMarker.lineStart;
+	                var node = this.startNode(marker, lastLineStart);
+	                var operator = stack[i - 1];
+	                expr = this.finalize(node, new Node.BinaryExpression(operator, stack[i - 2], expr));
+	                i -= 2;
+	                lastMarker = marker;
+	            }
+	        }
+	        return expr;
+	    };
+	    // https://tc39.github.io/ecma262/#sec-conditional-operator
+	    Parser.prototype.parseConditionalExpression = function () {
+	        var startToken = this.lookahead;
+	        var expr = this.inheritCoverGrammar(this.parseBinaryExpression);
+	        if (this.match('?')) {
+	            this.nextToken();
+	            var previousAllowIn = this.context.allowIn;
+	            this.context.allowIn = true;
+	            var consequent = this.isolateCoverGrammar(this.parseAssignmentExpression);
+	            this.context.allowIn = previousAllowIn;
+	            this.expect(':');
+	            var alternate = this.isolateCoverGrammar(this.parseAssignmentExpression);
+	            expr = this.finalize(this.startNode(startToken), new Node.ConditionalExpression(expr, consequent, alternate));
+	            this.context.isAssignmentTarget = false;
+	            this.context.isBindingElement = false;
+	        }
+	        return expr;
+	    };
+	    // https://tc39.github.io/ecma262/#sec-assignment-operators
+	    Parser.prototype.checkPatternParam = function (options, param) {
+	        switch (param.type) {
+	            case syntax_1.Syntax.Identifier:
+	                this.validateParam(options, param, param.name);
+	                break;
+	            case syntax_1.Syntax.RestElement:
+	                this.checkPatternParam(options, param.argument);
+	                break;
+	            case syntax_1.Syntax.AssignmentPattern:
+	                this.checkPatternParam(options, param.left);
+	                break;
+	            case syntax_1.Syntax.ArrayPattern:
+	                for (var i = 0; i < param.elements.length; i++) {
+	                    if (param.elements[i] !== null) {
+	                        this.checkPatternParam(options, param.elements[i]);
+	                    }
+	                }
+	                break;
+	            case syntax_1.Syntax.ObjectPattern:
+	                for (var i = 0; i < param.properties.length; i++) {
+	                    this.checkPatternParam(options, param.properties[i].value);
+	                }
+	                break;
+	            default:
+	                break;
+	        }
+	        options.simple = options.simple && (param instanceof Node.Identifier);
+	    };
+	    Parser.prototype.reinterpretAsCoverFormalsList = function (expr) {
+	        var params = [expr];
+	        var options;
+	        var asyncArrow = false;
+	        switch (expr.type) {
+	            case syntax_1.Syntax.Identifier:
+	                break;
+	            case ArrowParameterPlaceHolder:
+	                params = expr.params;
+	                asyncArrow = expr.async;
+	                break;
+	            default:
+	                return null;
+	        }
+	        options = {
+	            simple: true,
+	            paramSet: {}
+	        };
+	        for (var i = 0; i < params.length; ++i) {
+	            var param = params[i];
+	            if (param.type === syntax_1.Syntax.AssignmentPattern) {
+	                if (param.right.type === syntax_1.Syntax.YieldExpression) {
+	                    if (param.right.argument) {
+	                        this.throwUnexpectedToken(this.lookahead);
+	                    }
+	                    param.right.type = syntax_1.Syntax.Identifier;
+	                    param.right.name = 'yield';
+	                    delete param.right.argument;
+	                    delete param.right.delegate;
+	                }
+	            }
+	            else if (asyncArrow && param.type === syntax_1.Syntax.Identifier && param.name === 'await') {
+	                this.throwUnexpectedToken(this.lookahead);
+	            }
+	            this.checkPatternParam(options, param);
+	            params[i] = param;
+	        }
+	        if (this.context.strict || !this.context.allowYield) {
+	            for (var i = 0; i < params.length; ++i) {
+	                var param = params[i];
+	                if (param.type === syntax_1.Syntax.YieldExpression) {
+	                    this.throwUnexpectedToken(this.lookahead);
+	                }
+	            }
+	        }
+	        if (options.message === messages_1.Messages.StrictParamDupe) {
+	            var token = this.context.strict ? options.stricted : options.firstRestricted;
+	            this.throwUnexpectedToken(token, options.message);
+	        }
+	        return {
+	            simple: options.simple,
+	            params: params,
+	            stricted: options.stricted,
+	            firstRestricted: options.firstRestricted,
+	            message: options.message
+	        };
+	    };
+	    Parser.prototype.parseAssignmentExpression = function () {
+	        var expr;
+	        if (!this.context.allowYield && this.matchKeyword('yield')) {
+	            expr = this.parseYieldExpression();
+	        }
+	        else {
+	            var startToken = this.lookahead;
+	            var token = startToken;
+	            expr = this.parseConditionalExpression();
+	            if (token.type === 3 /* Identifier */ && (token.lineNumber === this.lookahead.lineNumber) && token.value === 'async') {
+	                if (this.lookahead.type === 3 /* Identifier */ || this.matchKeyword('yield')) {
+	                    var arg = this.parsePrimaryExpression();
+	                    this.reinterpretExpressionAsPattern(arg);
+	                    expr = {
+	                        type: ArrowParameterPlaceHolder,
+	                        params: [arg],
+	                        async: true
+	                    };
+	                }
+	            }
+	            if (expr.type === ArrowParameterPlaceHolder || this.match('=>')) {
+	                // https://tc39.github.io/ecma262/#sec-arrow-function-definitions
+	                this.context.isAssignmentTarget = false;
+	                this.context.isBindingElement = false;
+	                var isAsync = expr.async;
+	                var list = this.reinterpretAsCoverFormalsList(expr);
+	                if (list) {
+	                    if (this.hasLineTerminator) {
+	                        this.tolerateUnexpectedToken(this.lookahead);
+	                    }
+	                    this.context.firstCoverInitializedNameError = null;
+	                    var previousStrict = this.context.strict;
+	                    var previousAllowStrictDirective = this.context.allowStrictDirective;
+	                    this.context.allowStrictDirective = list.simple;
+	                    var previousAllowYield = this.context.allowYield;
+	                    var previousAwait = this.context.await;
+	                    this.context.allowYield = true;
+	                    this.context.await = isAsync;
+	                    var node = this.startNode(startToken);
+	                    this.expect('=>');
+	                    var body = void 0;
+	                    if (this.match('{')) {
+	                        var previousAllowIn = this.context.allowIn;
+	                        this.context.allowIn = true;
+	                        body = this.parseFunctionSourceElements();
+	                        this.context.allowIn = previousAllowIn;
+	                    }
+	                    else {
+	                        body = this.isolateCoverGrammar(this.parseAssignmentExpression);
+	                    }
+	                    var expression = body.type !== syntax_1.Syntax.BlockStatement;
+	                    if (this.context.strict && list.firstRestricted) {
+	                        this.throwUnexpectedToken(list.firstRestricted, list.message);
+	                    }
+	                    if (this.context.strict && list.stricted) {
+	                        this.tolerateUnexpectedToken(list.stricted, list.message);
+	                    }
+	                    expr = isAsync ? this.finalize(node, new Node.AsyncArrowFunctionExpression(list.params, body, expression)) :
+	                        this.finalize(node, new Node.ArrowFunctionExpression(list.params, body, expression));
+	                    this.context.strict = previousStrict;
+	                    this.context.allowStrictDirective = previousAllowStrictDirective;
+	                    this.context.allowYield = previousAllowYield;
+	                    this.context.await = previousAwait;
+	                }
+	            }
+	            else {
+	                if (this.matchAssign()) {
+	                    if (!this.context.isAssignmentTarget) {
+	                        this.tolerateError(messages_1.Messages.InvalidLHSInAssignment);
+	                    }
+	                    if (this.context.strict && expr.type === syntax_1.Syntax.Identifier) {
+	                        var id = expr;
+	                        if (this.scanner.isRestrictedWord(id.name)) {
+	                            this.tolerateUnexpectedToken(token, messages_1.Messages.StrictLHSAssignment);
+	                        }
+	                        if (this.scanner.isStrictModeReservedWord(id.name)) {
+	                            this.tolerateUnexpectedToken(token, messages_1.Messages.StrictReservedWord);
+	                        }
+	                    }
+	                    if (!this.match('=')) {
+	                        this.context.isAssignmentTarget = false;
+	                        this.context.isBindingElement = false;
+	                    }
+	                    else {
+	                        this.reinterpretExpressionAsPattern(expr);
+	                    }
+	                    token = this.nextToken();
+	                    var operator = token.value;
+	                    var right = this.isolateCoverGrammar(this.parseAssignmentExpression);
+	                    expr = this.finalize(this.startNode(startToken), new Node.AssignmentExpression(operator, expr, right));
+	                    this.context.firstCoverInitializedNameError = null;
+	                }
+	            }
+	        }
+	        return expr;
+	    };
+	    // https://tc39.github.io/ecma262/#sec-comma-operator
+	    Parser.prototype.parseExpression = function () {
+	        var startToken = this.lookahead;
+	        var expr = this.isolateCoverGrammar(this.parseAssignmentExpression);
+	        if (this.match(',')) {
+	            var expressions = [];
+	            expressions.push(expr);
+	            while (this.lookahead.type !== 2 /* EOF */) {
+	                if (!this.match(',')) {
+	                    break;
+	                }
+	                this.nextToken();
+	                expressions.push(this.isolateCoverGrammar(this.parseAssignmentExpression));
+	            }
+	            expr = this.finalize(this.startNode(startToken), new Node.SequenceExpression(expressions));
+	        }
+	        return expr;
+	    };
+	    // https://tc39.github.io/ecma262/#sec-block
+	    Parser.prototype.parseStatementListItem = function () {
+	        var statement;
+	        this.context.isAssignmentTarget = true;
+	        this.context.isBindingElement = true;
+	        if (this.lookahead.type === 4 /* Keyword */) {
+	            switch (this.lookahead.value) {
+	                case 'export':
+	                    if (!this.context.isModule) {
+	                        this.tolerateUnexpectedToken(this.lookahead, messages_1.Messages.IllegalExportDeclaration);
+	                    }
+	                    statement = this.parseExportDeclaration();
+	                    break;
+	                case 'import':
+	                    if (!this.context.isModule) {
+	                        this.tolerateUnexpectedToken(this.lookahead, messages_1.Messages.IllegalImportDeclaration);
+	                    }
+	                    statement = this.parseImportDeclaration();
+	                    break;
+	                case 'const':
+	                    statement = this.parseLexicalDeclaration({ inFor: false });
+	                    break;
+	                case 'function':
+	                    statement = this.parseFunctionDeclaration();
+	                    break;
+	                case 'class':
+	                    statement = this.parseClassDeclaration();
+	                    break;
+	                case 'let':
+	                    statement = this.isLexicalDeclaration() ? this.parseLexicalDeclaration({ inFor: false }) : this.parseStatement();
+	                    break;
+	                default:
+	                    statement = this.parseStatement();
+	                    break;
+	            }
+	        }
+	        else {
+	            statement = this.parseStatement();
+	        }
+	        return statement;
+	    };
+	    Parser.prototype.parseBlock = function () {
+	        var node = this.createNode();
+	        this.expect('{');
+	        var block = [];
+	        while (true) {
+	            if (this.match('}')) {
+	                break;
+	            }
+	            block.push(this.parseStatementListItem());
+	        }
+	        this.expect('}');
+	        return this.finalize(node, new Node.BlockStatement(block));
+	    };
+	    // https://tc39.github.io/ecma262/#sec-let-and-const-declarations
+	    Parser.prototype.parseLexicalBinding = function (kind, options) {
+	        var node = this.createNode();
+	        var params = [];
+	        var id = this.parsePattern(params, kind);
+	        if (this.context.strict && id.type === syntax_1.Syntax.Identifier) {
+	            if (this.scanner.isRestrictedWord(id.name)) {
+	                this.tolerateError(messages_1.Messages.StrictVarName);
+	            }
+	        }
+	        var init = null;
+	        if (kind === 'const') {
+	            if (!this.matchKeyword('in') && !this.matchContextualKeyword('of')) {
+	                if (this.match('=')) {
+	                    this.nextToken();
+	                    init = this.isolateCoverGrammar(this.parseAssignmentExpression);
+	                }
+	                else {
+	                    this.throwError(messages_1.Messages.DeclarationMissingInitializer, 'const');
+	                }
+	            }
+	        }
+	        else if ((!options.inFor && id.type !== syntax_1.Syntax.Identifier) || this.match('=')) {
+	            this.expect('=');
+	            init = this.isolateCoverGrammar(this.parseAssignmentExpression);
+	        }
+	        return this.finalize(node, new Node.VariableDeclarator(id, init));
+	    };
+	    Parser.prototype.parseBindingList = function (kind, options) {
+	        var list = [this.parseLexicalBinding(kind, options)];
+	        while (this.match(',')) {
+	            this.nextToken();
+	            list.push(this.parseLexicalBinding(kind, options));
+	        }
+	        return list;
+	    };
+	    Parser.prototype.isLexicalDeclaration = function () {
+	        var state = this.scanner.saveState();
+	        this.scanner.scanComments();
+	        var next = this.scanner.lex();
+	        this.scanner.restoreState(state);
+	        return (next.type === 3 /* Identifier */) ||
+	            (next.type === 7 /* Punctuator */ && next.value === '[') ||
+	            (next.type === 7 /* Punctuator */ && next.value === '{') ||
+	            (next.type === 4 /* Keyword */ && next.value === 'let') ||
+	            (next.type === 4 /* Keyword */ && next.value === 'yield');
+	    };
+	    Parser.prototype.parseLexicalDeclaration = function (options) {
+	        var node = this.createNode();
+	        var kind = this.nextToken().value;
+	        assert_1.assert(kind === 'let' || kind === 'const', 'Lexical declaration must be either let or const');
+	        var declarations = this.parseBindingList(kind, options);
+	        this.consumeSemicolon();
+	        return this.finalize(node, new Node.VariableDeclaration(declarations, kind));
+	    };
+	    // https://tc39.github.io/ecma262/#sec-destructuring-binding-patterns
+	    Parser.prototype.parseBindingRestElement = function (params, kind) {
+	        var node = this.createNode();
+	        this.expect('...');
+	        var arg = this.parsePattern(params, kind);
+	        return this.finalize(node, new Node.RestElement(arg));
+	    };
+	    Parser.prototype.parseArrayPattern = function (params, kind) {
+	        var node = this.createNode();
+	        this.expect('[');
+	        var elements = [];
+	        while (!this.match(']')) {
+	            if (this.match(',')) {
+	                this.nextToken();
+	                elements.push(null);
+	            }
+	            else {
+	                if (this.match('...')) {
+	                    elements.push(this.parseBindingRestElement(params, kind));
+	                    break;
+	                }
+	                else {
+	                    elements.push(this.parsePatternWithDefault(params, kind));
+	                }
+	                if (!this.match(']')) {
+	                    this.expect(',');
+	                }
+	            }
+	        }
+	        this.expect(']');
+	        return this.finalize(node, new Node.ArrayPattern(elements));
+	    };
+	    Parser.prototype.parsePropertyPattern = function (params, kind) {
+	        var node = this.createNode();
+	        var computed = false;
+	        var shorthand = false;
+	        var method = false;
+	        var key;
+	        var value;
+	        if (this.lookahead.type === 3 /* Identifier */) {
+	            var keyToken = this.lookahead;
+	            key = this.parseVariableIdentifier();
+	            var init = this.finalize(node, new Node.Identifier(keyToken.value));
+	            if (this.match('=')) {
+	                params.push(keyToken);
+	                shorthand = true;
+	                this.nextToken();
+	                var expr = this.parseAssignmentExpression();
+	                value = this.finalize(this.startNode(keyToken), new Node.AssignmentPattern(init, expr));
+	            }
+	            else if (!this.match(':')) {
+	                params.push(keyToken);
+	                shorthand = true;
+	                value = init;
+	            }
+	            else {
+	                this.expect(':');
+	                value = this.parsePatternWithDefault(params, kind);
+	            }
+	        }
+	        else {
+	            computed = this.match('[');
+	            key = this.parseObjectPropertyKey();
+	            this.expect(':');
+	            value = this.parsePatternWithDefault(params, kind);
+	        }
+	        return this.finalize(node, new Node.Property('init', key, computed, value, method, shorthand));
+	    };
+	    Parser.prototype.parseObjectPattern = function (params, kind) {
+	        var node = this.createNode();
+	        var properties = [];
+	        this.expect('{');
+	        while (!this.match('}')) {
+	            properties.push(this.parsePropertyPattern(params, kind));
+	            if (!this.match('}')) {
+	                this.expect(',');
+	            }
+	        }
+	        this.expect('}');
+	        return this.finalize(node, new Node.ObjectPattern(properties));
+	    };
+	    Parser.prototype.parsePattern = function (params, kind) {
+	        var pattern;
+	        if (this.match('[')) {
+	            pattern = this.parseArrayPattern(params, kind);
+	        }
+	        else if (this.match('{')) {
+	            pattern = this.parseObjectPattern(params, kind);
+	        }
+	        else {
+	            if (this.matchKeyword('let') && (kind === 'const' || kind === 'let')) {
+	                this.tolerateUnexpectedToken(this.lookahead, messages_1.Messages.LetInLexicalBinding);
+	            }
+	            params.push(this.lookahead);
+	            pattern = this.parseVariableIdentifier(kind);
+	        }
+	        return pattern;
+	    };
+	    Parser.prototype.parsePatternWithDefault = function (params, kind) {
+	        var startToken = this.lookahead;
+	        var pattern = this.parsePattern(params, kind);
+	        if (this.match('=')) {
+	            this.nextToken();
+	            var previousAllowYield = this.context.allowYield;
+	            this.context.allowYield = true;
+	            var right = this.isolateCoverGrammar(this.parseAssignmentExpression);
+	            this.context.allowYield = previousAllowYield;
+	            pattern = this.finalize(this.startNode(startToken), new Node.AssignmentPattern(pattern, right));
+	        }
+	        return pattern;
+	    };
+	    // https://tc39.github.io/ecma262/#sec-variable-statement
+	    Parser.prototype.parseVariableIdentifier = function (kind) {
+	        var node = this.createNode();
+	        var token = this.nextToken();
+	        if (token.type === 4 /* Keyword */ && token.value === 'yield') {
+	            if (this.context.strict) {
+	                this.tolerateUnexpectedToken(token, messages_1.Messages.StrictReservedWord);
+	            }
+	            else if (!this.context.allowYield) {
+	                this.throwUnexpectedToken(token);
+	            }
+	        }
+	        else if (token.type !== 3 /* Identifier */) {
+	            if (this.context.strict && token.type === 4 /* Keyword */ && this.scanner.isStrictModeReservedWord(token.value)) {
+	                this.tolerateUnexpectedToken(token, messages_1.Messages.StrictReservedWord);
+	            }
+	            else {
+	                if (this.context.strict || token.value !== 'let' || kind !== 'var') {
+	                    this.throwUnexpectedToken(token);
+	                }
+	            }
+	        }
+	        else if ((this.context.isModule || this.context.await) && token.type === 3 /* Identifier */ && token.value === 'await') {
+	            this.tolerateUnexpectedToken(token);
+	        }
+	        return this.finalize(node, new Node.Identifier(token.value));
+	    };
+	    Parser.prototype.parseVariableDeclaration = function (options) {
+	        var node = this.createNode();
+	        var params = [];
+	        var id = this.parsePattern(params, 'var');
+	        if (this.context.strict && id.type === syntax_1.Syntax.Identifier) {
+	            if (this.scanner.isRestrictedWord(id.name)) {
+	                this.tolerateError(messages_1.Messages.StrictVarName);
+	            }
+	        }
+	        var init = null;
+	        if (this.match('=')) {
+	            this.nextToken();
+	            init = this.isolateCoverGrammar(this.parseAssignmentExpression);
+	        }
+	        else if (id.type !== syntax_1.Syntax.Identifier && !options.inFor) {
+	            this.expect('=');
+	        }
+	        return this.finalize(node, new Node.VariableDeclarator(id, init));
+	    };
+	    Parser.prototype.parseVariableDeclarationList = function (options) {
+	        var opt = { inFor: options.inFor };
+	        var list = [];
+	        list.push(this.parseVariableDeclaration(opt));
+	        while (this.match(',')) {
+	            this.nextToken();
+	            list.push(this.parseVariableDeclaration(opt));
+	        }
+	        return list;
+	    };
+	    Parser.prototype.parseVariableStatement = function () {
+	        var node = this.createNode();
+	        this.expectKeyword('var');
+	        var declarations = this.parseVariableDeclarationList({ inFor: false });
+	        this.consumeSemicolon();
+	        return this.finalize(node, new Node.VariableDeclaration(declarations, 'var'));
+	    };
+	    // https://tc39.github.io/ecma262/#sec-empty-statement
+	    Parser.prototype.parseEmptyStatement = function () {
+	        var node = this.createNode();
+	        this.expect(';');
+	        return this.finalize(node, new Node.EmptyStatement());
+	    };
+	    // https://tc39.github.io/ecma262/#sec-expression-statement
+	    Parser.prototype.parseExpressionStatement = function () {
+	        var node = this.createNode();
+	        var expr = this.parseExpression();
+	        this.consumeSemicolon();
+	        return this.finalize(node, new Node.ExpressionStatement(expr));
+	    };
+	    // https://tc39.github.io/ecma262/#sec-if-statement
+	    Parser.prototype.parseIfClause = function () {
+	        if (this.context.strict && this.matchKeyword('function')) {
+	            this.tolerateError(messages_1.Messages.StrictFunction);
+	        }
+	        return this.parseStatement();
+	    };
+	    Parser.prototype.parseIfStatement = function () {
+	        var node = this.createNode();
+	        var consequent;
+	        var alternate = null;
+	        this.expectKeyword('if');
+	        this.expect('(');
+	        var test = this.parseExpression();
+	        if (!this.match(')') && this.config.tolerant) {
+	            this.tolerateUnexpectedToken(this.nextToken());
+	            consequent = this.finalize(this.createNode(), new Node.EmptyStatement());
+	        }
+	        else {
+	            this.expect(')');
+	            consequent = this.parseIfClause();
+	            if (this.matchKeyword('else')) {
+	                this.nextToken();
+	                alternate = this.parseIfClause();
+	            }
+	        }
+	        return this.finalize(node, new Node.IfStatement(test, consequent, alternate));
+	    };
+	    // https://tc39.github.io/ecma262/#sec-do-while-statement
+	    Parser.prototype.parseDoWhileStatement = function () {
+	        var node = this.createNode();
+	        this.expectKeyword('do');
+	        var previousInIteration = this.context.inIteration;
+	        this.context.inIteration = true;
+	        var body = this.parseStatement();
+	        this.context.inIteration = previousInIteration;
+	        this.expectKeyword('while');
+	        this.expect('(');
+	        var test = this.parseExpression();
+	        if (!this.match(')') && this.config.tolerant) {
+	            this.tolerateUnexpectedToken(this.nextToken());
+	        }
+	        else {
+	            this.expect(')');
+	            if (this.match(';')) {
+	                this.nextToken();
+	            }
+	        }
+	        return this.finalize(node, new Node.DoWhileStatement(body, test));
+	    };
+	    // https://tc39.github.io/ecma262/#sec-while-statement
+	    Parser.prototype.parseWhileStatement = function () {
+	        var node = this.createNode();
+	        var body;
+	        this.expectKeyword('while');
+	        this.expect('(');
+	        var test = this.parseExpression();
+	        if (!this.match(')') && this.config.tolerant) {
+	            this.tolerateUnexpectedToken(this.nextToken());
+	            body = this.finalize(this.createNode(), new Node.EmptyStatement());
+	        }
+	        else {
+	            this.expect(')');
+	            var previousInIteration = this.context.inIteration;
+	            this.context.inIteration = true;
+	            body = this.parseStatement();
+	            this.context.inIteration = previousInIteration;
+	        }
+	        return this.finalize(node, new Node.WhileStatement(test, body));
+	    };
+	    // https://tc39.github.io/ecma262/#sec-for-statement
+	    // https://tc39.github.io/ecma262/#sec-for-in-and-for-of-statements
+	    Parser.prototype.parseForStatement = function () {
+	        var init = null;
+	        var test = null;
+	        var update = null;
+	        var forIn = true;
+	        var left, right;
+	        var node = this.createNode();
+	        this.expectKeyword('for');
+	        this.expect('(');
+	        if (this.match(';')) {
+	            this.nextToken();
+	        }
+	        else {
+	            if (this.matchKeyword('var')) {
+	                init = this.createNode();
+	                this.nextToken();
+	                var previousAllowIn = this.context.allowIn;
+	                this.context.allowIn = false;
+	                var declarations = this.parseVariableDeclarationList({ inFor: true });
+	                this.context.allowIn = previousAllowIn;
+	                if (declarations.length === 1 && this.matchKeyword('in')) {
+	                    var decl = declarations[0];
+	                    if (decl.init && (decl.id.type === syntax_1.Syntax.ArrayPattern || decl.id.type === syntax_1.Syntax.ObjectPattern || this.context.strict)) {
+	                        this.tolerateError(messages_1.Messages.ForInOfLoopInitializer, 'for-in');
+	                    }
+	                    init = this.finalize(init, new Node.VariableDeclaration(declarations, 'var'));
+	                    this.nextToken();
+	                    left = init;
+	                    right = this.parseExpression();
+	                    init = null;
+	                }
+	                else if (declarations.length === 1 && declarations[0].init === null && this.matchContextualKeyword('of')) {
+	                    init = this.finalize(init, new Node.VariableDeclaration(declarations, 'var'));
+	                    this.nextToken();
+	                    left = init;
+	                    right = this.parseAssignmentExpression();
+	                    init = null;
+	                    forIn = false;
+	                }
+	                else {
+	                    init = this.finalize(init, new Node.VariableDeclaration(declarations, 'var'));
+	                    this.expect(';');
+	                }
+	            }
+	            else if (this.matchKeyword('const') || this.matchKeyword('let')) {
+	                init = this.createNode();
+	                var kind = this.nextToken().value;
+	                if (!this.context.strict && this.lookahead.value === 'in') {
+	                    init = this.finalize(init, new Node.Identifier(kind));
+	                    this.nextToken();
+	                    left = init;
+	                    right = this.parseExpression();
+	                    init = null;
+	                }
+	                else {
+	                    var previousAllowIn = this.context.allowIn;
+	                    this.context.allowIn = false;
+	                    var declarations = this.parseBindingList(kind, { inFor: true });
+	                    this.context.allowIn = previousAllowIn;
+	                    if (declarations.length === 1 && declarations[0].init === null && this.matchKeyword('in')) {
+	                        init = this.finalize(init, new Node.VariableDeclaration(declarations, kind));
+	                        this.nextToken();
+	                        left = init;
+	                        right = this.parseExpression();
+	                        init = null;
+	                    }
+	                    else if (declarations.length === 1 && declarations[0].init === null && this.matchContextualKeyword('of')) {
+	                        init = this.finalize(init, new Node.VariableDeclaration(declarations, kind));
+	                        this.nextToken();
+	                        left = init;
+	                        right = this.parseAssignmentExpression();
+	                        init = null;
+	                        forIn = false;
+	                    }
+	                    else {
+	                        this.consumeSemicolon();
+	                        init = this.finalize(init, new Node.VariableDeclaration(declarations, kind));
+	                    }
+	                }
+	            }
+	            else {
+	                var initStartToken = this.lookahead;
+	                var previousAllowIn = this.context.allowIn;
+	                this.context.allowIn = false;
+	                init = this.inheritCoverGrammar(this.parseAssignmentExpression);
+	                this.context.allowIn = previousAllowIn;
+	                if (this.matchKeyword('in')) {
+	                    if (!this.context.isAssignmentTarget || init.type === syntax_1.Syntax.AssignmentExpression) {
+	                        this.tolerateError(messages_1.Messages.InvalidLHSInForIn);
+	                    }
+	                    this.nextToken();
+	                    this.reinterpretExpressionAsPattern(init);
+	                    left = init;
+	                    right = this.parseExpression();
+	                    init = null;
+	                }
+	                else if (this.matchContextualKeyword('of')) {
+	                    if (!this.context.isAssignmentTarget || init.type === syntax_1.Syntax.AssignmentExpression) {
+	                        this.tolerateError(messages_1.Messages.InvalidLHSInForLoop);
+	                    }
+	                    this.nextToken();
+	                    this.reinterpretExpressionAsPattern(init);
+	                    left = init;
+	                    right = this.parseAssignmentExpression();
+	                    init = null;
+	                    forIn = false;
+	                }
+	                else {
+	                    if (this.match(',')) {
+	                        var initSeq = [init];
+	                        while (this.match(',')) {
+	                            this.nextToken();
+	                            initSeq.push(this.isolateCoverGrammar(this.parseAssignmentExpression));
+	                        }
+	                        init = this.finalize(this.startNode(initStartToken), new Node.SequenceExpression(initSeq));
+	                    }
+	                    this.expect(';');
+	                }
+	            }
+	        }
+	        if (typeof left === 'undefined') {
+	            if (!this.match(';')) {
+	                test = this.parseExpression();
+	            }
+	            this.expect(';');
+	            if (!this.match(')')) {
+	                update = this.parseExpression();
+	            }
+	        }
+	        var body;
+	        if (!this.match(')') && this.config.tolerant) {
+	            this.tolerateUnexpectedToken(this.nextToken());
+	            body = this.finalize(this.createNode(), new Node.EmptyStatement());
+	        }
+	        else {
+	            this.expect(')');
+	            var previousInIteration = this.context.inIteration;
+	            this.context.inIteration = true;
+	            body = this.isolateCoverGrammar(this.parseStatement);
+	            this.context.inIteration = previousInIteration;
+	        }
+	        return (typeof left === 'undefined') ?
+	            this.finalize(node, new Node.ForStatement(init, test, update, body)) :
+	            forIn ? this.finalize(node, new Node.ForInStatement(left, right, body)) :
+	                this.finalize(node, new Node.ForOfStatement(left, right, body));
+	    };
+	    // https://tc39.github.io/ecma262/#sec-continue-statement
+	    Parser.prototype.parseContinueStatement = function () {
+	        var node = this.createNode();
+	        this.expectKeyword('continue');
+	        var label = null;
+	        if (this.lookahead.type === 3 /* Identifier */ && !this.hasLineTerminator) {
+	            var id = this.parseVariableIdentifier();
+	            label = id;
+	            var key = '$' + id.name;
+	            if (!Object.prototype.hasOwnProperty.call(this.context.labelSet, key)) {
+	                this.throwError(messages_1.Messages.UnknownLabel, id.name);
+	            }
+	        }
+	        this.consumeSemicolon();
+	        if (label === null && !this.context.inIteration) {
+	            this.throwError(messages_1.Messages.IllegalContinue);
+	        }
+	        return this.finalize(node, new Node.ContinueStatement(label));
+	    };
+	    // https://tc39.github.io/ecma262/#sec-break-statement
+	    Parser.prototype.parseBreakStatement = function () {
+	        var node = this.createNode();
+	        this.expectKeyword('break');
+	        var label = null;
+	        if (this.lookahead.type === 3 /* Identifier */ && !this.hasLineTerminator) {
+	            var id = this.parseVariableIdentifier();
+	            var key = '$' + id.name;
+	            if (!Object.prototype.hasOwnProperty.call(this.context.labelSet, key)) {
+	                this.throwError(messages_1.Messages.UnknownLabel, id.name);
+	            }
+	            label = id;
+	        }
+	        this.consumeSemicolon();
+	        if (label === null && !this.context.inIteration && !this.context.inSwitch) {
+	            this.throwError(messages_1.Messages.IllegalBreak);
+	        }
+	        return this.finalize(node, new Node.BreakStatement(label));
+	    };
+	    // https://tc39.github.io/ecma262/#sec-return-statement
+	    Parser.prototype.parseReturnStatement = function () {
+	        if (!this.context.inFunctionBody) {
+	            this.tolerateError(messages_1.Messages.IllegalReturn);
+	        }
+	        var node = this.createNode();
+	        this.expectKeyword('return');
+	        var hasArgument = (!this.match(';') && !this.match('}') &&
+	            !this.hasLineTerminator && this.lookahead.type !== 2 /* EOF */) ||
+	            this.lookahead.type === 8 /* StringLiteral */ ||
+	            this.lookahead.type === 10 /* Template */;
+	        var argument = hasArgument ? this.parseExpression() : null;
+	        this.consumeSemicolon();
+	        return this.finalize(node, new Node.ReturnStatement(argument));
+	    };
+	    // https://tc39.github.io/ecma262/#sec-with-statement
+	    Parser.prototype.parseWithStatement = function () {
+	        if (this.context.strict) {
+	            this.tolerateError(messages_1.Messages.StrictModeWith);
+	        }
+	        var node = this.createNode();
+	        var body;
+	        this.expectKeyword('with');
+	        this.expect('(');
+	        var object = this.parseExpression();
+	        if (!this.match(')') && this.config.tolerant) {
+	            this.tolerateUnexpectedToken(this.nextToken());
+	            body = this.finalize(this.createNode(), new Node.EmptyStatement());
+	        }
+	        else {
+	            this.expect(')');
+	            body = this.parseStatement();
+	        }
+	        return this.finalize(node, new Node.WithStatement(object, body));
+	    };
+	    // https://tc39.github.io/ecma262/#sec-switch-statement
+	    Parser.prototype.parseSwitchCase = function () {
+	        var node = this.createNode();
+	        var test;
+	        if (this.matchKeyword('default')) {
+	            this.nextToken();
+	            test = null;
+	        }
+	        else {
+	            this.expectKeyword('case');
+	            test = this.parseExpression();
+	        }
+	        this.expect(':');
+	        var consequent = [];
+	        while (true) {
+	            if (this.match('}') || this.matchKeyword('default') || this.matchKeyword('case')) {
+	                break;
+	            }
+	            consequent.push(this.parseStatementListItem());
+	        }
+	        return this.finalize(node, new Node.SwitchCase(test, consequent));
+	    };
+	    Parser.prototype.parseSwitchStatement = function () {
+	        var node = this.createNode();
+	        this.expectKeyword('switch');
+	        this.expect('(');
+	        var discriminant = this.parseExpression();
+	        this.expect(')');
+	        var previousInSwitch = this.context.inSwitch;
+	        this.context.inSwitch = true;
+	        var cases = [];
+	        var defaultFound = false;
+	        this.expect('{');
+	        while (true) {
+	            if (this.match('}')) {
+	                break;
+	            }
+	            var clause = this.parseSwitchCase();
+	            if (clause.test === null) {
+	                if (defaultFound) {
+	                    this.throwError(messages_1.Messages.MultipleDefaultsInSwitch);
+	                }
+	                defaultFound = true;
+	            }
+	            cases.push(clause);
+	        }
+	        this.expect('}');
+	        this.context.inSwitch = previousInSwitch;
+	        return this.finalize(node, new Node.SwitchStatement(discriminant, cases));
+	    };
+	    // https://tc39.github.io/ecma262/#sec-labelled-statements
+	    Parser.prototype.parseLabelledStatement = function () {
+	        var node = this.createNode();
+	        var expr = this.parseExpression();
+	        var statement;
+	        if ((expr.type === syntax_1.Syntax.Identifier) && this.match(':')) {
+	            this.nextToken();
+	            var id = expr;
+	            var key = '$' + id.name;
+	            if (Object.prototype.hasOwnProperty.call(this.context.labelSet, key)) {
+	                this.throwError(messages_1.Messages.Redeclaration, 'Label', id.name);
+	            }
+	            this.context.labelSet[key] = true;
+	            var body = void 0;
+	            if (this.matchKeyword('class')) {
+	                this.tolerateUnexpectedToken(this.lookahead);
+	                body = this.parseClassDeclaration();
+	            }
+	            else if (this.matchKeyword('function')) {
+	                var token = this.lookahead;
+	                var declaration = this.parseFunctionDeclaration();
+	                if (this.context.strict) {
+	                    this.tolerateUnexpectedToken(token, messages_1.Messages.StrictFunction);
+	                }
+	                else if (declaration.generator) {
+	                    this.tolerateUnexpectedToken(token, messages_1.Messages.GeneratorInLegacyContext);
+	                }
+	                body = declaration;
+	            }
+	            else {
+	                body = this.parseStatement();
+	            }
+	            delete this.context.labelSet[key];
+	            statement = new Node.LabeledStatement(id, body);
+	        }
+	        else {
+	            this.consumeSemicolon();
+	            statement = new Node.ExpressionStatement(expr);
+	        }
+	        return this.finalize(node, statement);
+	    };
+	    // https://tc39.github.io/ecma262/#sec-throw-statement
+	    Parser.prototype.parseThrowStatement = function () {
+	        var node = this.createNode();
+	        this.expectKeyword('throw');
+	        if (this.hasLineTerminator) {
+	            this.throwError(messages_1.Messages.NewlineAfterThrow);
+	        }
+	        var argument = this.parseExpression();
+	        this.consumeSemicolon();
+	        return this.finalize(node, new Node.ThrowStatement(argument));
+	    };
+	    // https://tc39.github.io/ecma262/#sec-try-statement
+	    Parser.prototype.parseCatchClause = function () {
+	        var node = this.createNode();
+	        this.expectKeyword('catch');
+	        this.expect('(');
+	        if (this.match(')')) {
+	            this.throwUnexpectedToken(this.lookahead);
+	        }
+	        var params = [];
+	        var param = this.parsePattern(params);
+	        var paramMap = {};
+	        for (var i = 0; i < params.length; i++) {
+	            var key = '$' + params[i].value;
+	            if (Object.prototype.hasOwnProperty.call(paramMap, key)) {
+	                this.tolerateError(messages_1.Messages.DuplicateBinding, params[i].value);
+	            }
+	            paramMap[key] = true;
+	        }
+	        if (this.context.strict && param.type === syntax_1.Syntax.Identifier) {
+	            if (this.scanner.isRestrictedWord(param.name)) {
+	                this.tolerateError(messages_1.Messages.StrictCatchVariable);
+	            }
+	        }
+	        this.expect(')');
+	        var body = this.parseBlock();
+	        return this.finalize(node, new Node.CatchClause(param, body));
+	    };
+	    Parser.prototype.parseFinallyClause = function () {
+	        this.expectKeyword('finally');
+	        return this.parseBlock();
+	    };
+	    Parser.prototype.parseTryStatement = function () {
+	        var node = this.createNode();
+	        this.expectKeyword('try');
+	        var block = this.parseBlock();
+	        var handler = this.matchKeyword('catch') ? this.parseCatchClause() : null;
+	        var finalizer = this.matchKeyword('finally') ? this.parseFinallyClause() : null;
+	        if (!handler && !finalizer) {
+	            this.throwError(messages_1.Messages.NoCatchOrFinally);
+	        }
+	        return this.finalize(node, new Node.TryStatement(block, handler, finalizer));
+	    };
+	    // https://tc39.github.io/ecma262/#sec-debugger-statement
+	    Parser.prototype.parseDebuggerStatement = function () {
+	        var node = this.createNode();
+	        this.expectKeyword('debugger');
+	        this.consumeSemicolon();
+	        return this.finalize(node, new Node.DebuggerStatement());
+	    };
+	    // https://tc39.github.io/ecma262/#sec-ecmascript-language-statements-and-declarations
+	    Parser.prototype.parseStatement = function () {
+	        var statement;
+	        switch (this.lookahead.type) {
+	            case 1 /* BooleanLiteral */:
+	            case 5 /* NullLiteral */:
+	            case 6 /* NumericLiteral */:
+	            case 8 /* StringLiteral */:
+	            case 10 /* Template */:
+	            case 9 /* RegularExpression */:
+	                statement = this.parseExpressionStatement();
+	                break;
+	            case 7 /* Punctuator */:
+	                var value = this.lookahead.value;
+	                if (value === '{') {
+	                    statement = this.parseBlock();
+	                }
+	                else if (value === '(') {
+	                    statement = this.parseExpressionStatement();
+	                }
+	                else if (value === ';') {
+	                    statement = this.parseEmptyStatement();
+	                }
+	                else {
+	                    statement = this.parseExpressionStatement();
+	                }
+	                break;
+	            case 3 /* Identifier */:
+	                statement = this.matchAsyncFunction() ? this.parseFunctionDeclaration() : this.parseLabelledStatement();
+	                break;
+	            case 4 /* Keyword */:
+	                switch (this.lookahead.value) {
+	                    case 'break':
+	                        statement = this.parseBreakStatement();
+	                        break;
+	                    case 'continue':
+	                        statement = this.parseContinueStatement();
+	                        break;
+	                    case 'debugger':
+	                        statement = this.parseDebuggerStatement();
+	                        break;
+	                    case 'do':
+	                        statement = this.parseDoWhileStatement();
+	                        break;
+	                    case 'for':
+	                        statement = this.parseForStatement();
+	                        break;
+	                    case 'function':
+	                        statement = this.parseFunctionDeclaration();
+	                        break;
+	                    case 'if':
+	                        statement = this.parseIfStatement();
+	                        break;
+	                    case 'return':
+	                        statement = this.parseReturnStatement();
+	                        break;
+	                    case 'switch':
+	                        statement = this.parseSwitchStatement();
+	                        break;
+	                    case 'throw':
+	                        statement = this.parseThrowStatement();
+	                        break;
+	                    case 'try':
+	                        statement = this.parseTryStatement();
+	                        break;
+	                    case 'var':
+	                        statement = this.parseVariableStatement();
+	                        break;
+	                    case 'while':
+	                        statement = this.parseWhileStatement();
+	                        break;
+	                    case 'with':
+	                        statement = this.parseWithStatement();
+	                        break;
+	                    default:
+	                        statement = this.parseExpressionStatement();
+	                        break;
+	                }
+	                break;
+	            default:
+	                statement = this.throwUnexpectedToken(this.lookahead);
+	        }
+	        return statement;
+	    };
+	    // https://tc39.github.io/ecma262/#sec-function-definitions
+	    Parser.prototype.parseFunctionSourceElements = function () {
+	        var node = this.createNode();
+	        this.expect('{');
+	        var body = this.parseDirectivePrologues();
+	        var previousLabelSet = this.context.labelSet;
+	        var previousInIteration = this.context.inIteration;
+	        var previousInSwitch = this.context.inSwitch;
+	        var previousInFunctionBody = this.context.inFunctionBody;
+	        this.context.labelSet = {};
+	        this.context.inIteration = false;
+	        this.context.inSwitch = false;
+	        this.context.inFunctionBody = true;
+	        while (this.lookahead.type !== 2 /* EOF */) {
+	            if (this.match('}')) {
+	                break;
+	            }
+	            body.push(this.parseStatementListItem());
+	        }
+	        this.expect('}');
+	        this.context.labelSet = previousLabelSet;
+	        this.context.inIteration = previousInIteration;
+	        this.context.inSwitch = previousInSwitch;
+	        this.context.inFunctionBody = previousInFunctionBody;
+	        return this.finalize(node, new Node.BlockStatement(body));
+	    };
+	    Parser.prototype.validateParam = function (options, param, name) {
+	        var key = '$' + name;
+	        if (this.context.strict) {
+	            if (this.scanner.isRestrictedWord(name)) {
+	                options.stricted = param;
+	                options.message = messages_1.Messages.StrictParamName;
+	            }
+	            if (Object.prototype.hasOwnProperty.call(options.paramSet, key)) {
+	                options.stricted = param;
+	                options.message = messages_1.Messages.StrictParamDupe;
+	            }
+	        }
+	        else if (!options.firstRestricted) {
+	            if (this.scanner.isRestrictedWord(name)) {
+	                options.firstRestricted = param;
+	                options.message = messages_1.Messages.StrictParamName;
+	            }
+	            else if (this.scanner.isStrictModeReservedWord(name)) {
+	                options.firstRestricted = param;
+	                options.message = messages_1.Messages.StrictReservedWord;
+	            }
+	            else if (Object.prototype.hasOwnProperty.call(options.paramSet, key)) {
+	                options.stricted = param;
+	                options.message = messages_1.Messages.StrictParamDupe;
+	            }
+	        }
+	        /* istanbul ignore next */
+	        if (typeof Object.defineProperty === 'function') {
+	            Object.defineProperty(options.paramSet, key, { value: true, enumerable: true, writable: true, configurable: true });
+	        }
+	        else {
+	            options.paramSet[key] = true;
+	        }
+	    };
+	    Parser.prototype.parseRestElement = function (params) {
+	        var node = this.createNode();
+	        this.expect('...');
+	        var arg = this.parsePattern(params);
+	        if (this.match('=')) {
+	            this.throwError(messages_1.Messages.DefaultRestParameter);
+	        }
+	        if (!this.match(')')) {
+	            this.throwError(messages_1.Messages.ParameterAfterRestParameter);
+	        }
+	        return this.finalize(node, new Node.RestElement(arg));
+	    };
+	    Parser.prototype.parseFormalParameter = function (options) {
+	        var params = [];
+	        var param = this.match('...') ? this.parseRestElement(params) : this.parsePatternWithDefault(params);
+	        for (var i = 0; i < params.length; i++) {
+	            this.validateParam(options, params[i], params[i].value);
+	        }
+	        options.simple = options.simple && (param instanceof Node.Identifier);
+	        options.params.push(param);
+	    };
+	    Parser.prototype.parseFormalParameters = function (firstRestricted) {
+	        var options;
+	        options = {
+	            simple: true,
+	            params: [],
+	            firstRestricted: firstRestricted
+	        };
+	        this.expect('(');
+	        if (!this.match(')')) {
+	            options.paramSet = {};
+	            while (this.lookahead.type !== 2 /* EOF */) {
+	                this.parseFormalParameter(options);
+	                if (this.match(')')) {
+	                    break;
+	                }
+	                this.expect(',');
+	                if (this.match(')')) {
+	                    break;
+	                }
+	            }
+	        }
+	        this.expect(')');
+	        return {
+	            simple: options.simple,
+	            params: options.params,
+	            stricted: options.stricted,
+	            firstRestricted: options.firstRestricted,
+	            message: options.message
+	        };
+	    };
+	    Parser.prototype.matchAsyncFunction = function () {
+	        var match = this.matchContextualKeyword('async');
+	        if (match) {
+	            var state = this.scanner.saveState();
+	            this.scanner.scanComments();
+	            var next = this.scanner.lex();
+	            this.scanner.restoreState(state);
+	            match = (state.lineNumber === next.lineNumber) && (next.type === 4 /* Keyword */) && (next.value === 'function');
+	        }
+	        return match;
+	    };
+	    Parser.prototype.parseFunctionDeclaration = function (identifierIsOptional) {
+	        var node = this.createNode();
+	        var isAsync = this.matchContextualKeyword('async');
+	        if (isAsync) {
+	            this.nextToken();
+	        }
+	        this.expectKeyword('function');
+	        var isGenerator = isAsync ? false : this.match('*');
+	        if (isGenerator) {
+	            this.nextToken();
+	        }
+	        var message;
+	        var id = null;
+	        var firstRestricted = null;
+	        if (!identifierIsOptional || !this.match('(')) {
+	            var token = this.lookahead;
+	            id = this.parseVariableIdentifier();
+	            if (this.context.strict) {
+	                if (this.scanner.isRestrictedWord(token.value)) {
+	                    this.tolerateUnexpectedToken(token, messages_1.Messages.StrictFunctionName);
+	                }
+	            }
+	            else {
+	                if (this.scanner.isRestrictedWord(token.value)) {
+	                    firstRestricted = token;
+	                    message = messages_1.Messages.StrictFunctionName;
+	                }
+	                else if (this.scanner.isStrictModeReservedWord(token.value)) {
+	                    firstRestricted = token;
+	                    message = messages_1.Messages.StrictReservedWord;
+	                }
+	            }
+	        }
+	        var previousAllowAwait = this.context.await;
+	        var previousAllowYield = this.context.allowYield;
+	        this.context.await = isAsync;
+	        this.context.allowYield = !isGenerator;
+	        var formalParameters = this.parseFormalParameters(firstRestricted);
+	        var params = formalParameters.params;
+	        var stricted = formalParameters.stricted;
+	        firstRestricted = formalParameters.firstRestricted;
+	        if (formalParameters.message) {
+	            message = formalParameters.message;
+	        }
+	        var previousStrict = this.context.strict;
+	        var previousAllowStrictDirective = this.context.allowStrictDirective;
+	        this.context.allowStrictDirective = formalParameters.simple;
+	        var body = this.parseFunctionSourceElements();
+	        if (this.context.strict && firstRestricted) {
+	            this.throwUnexpectedToken(firstRestricted, message);
+	        }
+	        if (this.context.strict && stricted) {
+	            this.tolerateUnexpectedToken(stricted, message);
+	        }
+	        this.context.strict = previousStrict;
+	        this.context.allowStrictDirective = previousAllowStrictDirective;
+	        this.context.await = previousAllowAwait;
+	        this.context.allowYield = previousAllowYield;
+	        return isAsync ? this.finalize(node, new Node.AsyncFunctionDeclaration(id, params, body)) :
+	            this.finalize(node, new Node.FunctionDeclaration(id, params, body, isGenerator));
+	    };
+	    Parser.prototype.parseFunctionExpression = function () {
+	        var node = this.createNode();
+	        var isAsync = this.matchContextualKeyword('async');
+	        if (isAsync) {
+	            this.nextToken();
+	        }
+	        this.expectKeyword('function');
+	        var isGenerator = isAsync ? false : this.match('*');
+	        if (isGenerator) {
+	            this.nextToken();
+	        }
+	        var message;
+	        var id = null;
+	        var firstRestricted;
+	        var previousAllowAwait = this.context.await;
+	        var previousAllowYield = this.context.allowYield;
+	        this.context.await = isAsync;
+	        this.context.allowYield = !isGenerator;
+	        if (!this.match('(')) {
+	            var token = this.lookahead;
+	            id = (!this.context.strict && !isGenerator && this.matchKeyword('yield')) ? this.parseIdentifierName() : this.parseVariableIdentifier();
+	            if (this.context.strict) {
+	                if (this.scanner.isRestrictedWord(token.value)) {
+	                    this.tolerateUnexpectedToken(token, messages_1.Messages.StrictFunctionName);
+	                }
+	            }
+	            else {
+	                if (this.scanner.isRestrictedWord(token.value)) {
+	                    firstRestricted = token;
+	                    message = messages_1.Messages.StrictFunctionName;
+	                }
+	                else if (this.scanner.isStrictModeReservedWord(token.value)) {
+	                    firstRestricted = token;
+	                    message = messages_1.Messages.StrictReservedWord;
+	                }
+	            }
+	        }
+	        var formalParameters = this.parseFormalParameters(firstRestricted);
+	        var params = formalParameters.params;
+	        var stricted = formalParameters.stricted;
+	        firstRestricted = formalParameters.firstRestricted;
+	        if (formalParameters.message) {
+	            message = formalParameters.message;
+	        }
+	        var previousStrict = this.context.strict;
+	        var previousAllowStrictDirective = this.context.allowStrictDirective;
+	        this.context.allowStrictDirective = formalParameters.simple;
+	        var body = this.parseFunctionSourceElements();
+	        if (this.context.strict && firstRestricted) {
+	            this.throwUnexpectedToken(firstRestricted, message);
+	        }
+	        if (this.context.strict && stricted) {
+	            this.tolerateUnexpectedToken(stricted, message);
+	        }
+	        this.context.strict = previousStrict;
+	        this.context.allowStrictDirective = previousAllowStrictDirective;
+	        this.context.await = previousAllowAwait;
+	        this.context.allowYield = previousAllowYield;
+	        return isAsync ? this.finalize(node, new Node.AsyncFunctionExpression(id, params, body)) :
+	            this.finalize(node, new Node.FunctionExpression(id, params, body, isGenerator));
+	    };
+	    // https://tc39.github.io/ecma262/#sec-directive-prologues-and-the-use-strict-directive
+	    Parser.prototype.parseDirective = function () {
+	        var token = this.lookahead;
+	        var node = this.createNode();
+	        var expr = this.parseExpression();
+	        var directive = (expr.type === syntax_1.Syntax.Literal) ? this.getTokenRaw(token).slice(1, -1) : null;
+	        this.consumeSemicolon();
+	        return this.finalize(node, directive ? new Node.Directive(expr, directive) : new Node.ExpressionStatement(expr));
+	    };
+	    Parser.prototype.parseDirectivePrologues = function () {
+	        var firstRestricted = null;
+	        var body = [];
+	        while (true) {
+	            var token = this.lookahead;
+	            if (token.type !== 8 /* StringLiteral */) {
+	                break;
+	            }
+	            var statement = this.parseDirective();
+	            body.push(statement);
+	            var directive = statement.directive;
+	            if (typeof directive !== 'string') {
+	                break;
+	            }
+	            if (directive === 'use strict') {
+	                this.context.strict = true;
+	                if (firstRestricted) {
+	                    this.tolerateUnexpectedToken(firstRestricted, messages_1.Messages.StrictOctalLiteral);
+	                }
+	                if (!this.context.allowStrictDirective) {
+	                    this.tolerateUnexpectedToken(token, messages_1.Messages.IllegalLanguageModeDirective);
+	                }
+	            }
+	            else {
+	                if (!firstRestricted && token.octal) {
+	                    firstRestricted = token;
+	                }
+	            }
+	        }
+	        return body;
+	    };
+	    // https://tc39.github.io/ecma262/#sec-method-definitions
+	    Parser.prototype.qualifiedPropertyName = function (token) {
+	        switch (token.type) {
+	            case 3 /* Identifier */:
+	            case 8 /* StringLiteral */:
+	            case 1 /* BooleanLiteral */:
+	            case 5 /* NullLiteral */:
+	            case 6 /* NumericLiteral */:
+	            case 4 /* Keyword */:
+	                return true;
+	            case 7 /* Punctuator */:
+	                return token.value === '[';
+	            default:
+	                break;
+	        }
+	        return false;
+	    };
+	    Parser.prototype.parseGetterMethod = function () {
+	        var node = this.createNode();
+	        var isGenerator = false;
+	        var previousAllowYield = this.context.allowYield;
+	        this.context.allowYield = !isGenerator;
+	        var formalParameters = this.parseFormalParameters();
+	        if (formalParameters.params.length > 0) {
+	            this.tolerateError(messages_1.Messages.BadGetterArity);
+	        }
+	        var method = this.parsePropertyMethod(formalParameters);
+	        this.context.allowYield = previousAllowYield;
+	        return this.finalize(node, new Node.FunctionExpression(null, formalParameters.params, method, isGenerator));
+	    };
+	    Parser.prototype.parseSetterMethod = function () {
+	        var node = this.createNode();
+	        var isGenerator = false;
+	        var previousAllowYield = this.context.allowYield;
+	        this.context.allowYield = !isGenerator;
+	        var formalParameters = this.parseFormalParameters();
+	        if (formalParameters.params.length !== 1) {
+	            this.tolerateError(messages_1.Messages.BadSetterArity);
+	        }
+	        else if (formalParameters.params[0] instanceof Node.RestElement) {
+	            this.tolerateError(messages_1.Messages.BadSetterRestParameter);
+	        }
+	        var method = this.parsePropertyMethod(formalParameters);
+	        this.context.allowYield = previousAllowYield;
+	        return this.finalize(node, new Node.FunctionExpression(null, formalParameters.params, method, isGenerator));
+	    };
+	    Parser.prototype.parseGeneratorMethod = function () {
+	        var node = this.createNode();
+	        var isGenerator = true;
+	        var previousAllowYield = this.context.allowYield;
+	        this.context.allowYield = true;
+	        var params = this.parseFormalParameters();
+	        this.context.allowYield = false;
+	        var method = this.parsePropertyMethod(params);
+	        this.context.allowYield = previousAllowYield;
+	        return this.finalize(node, new Node.FunctionExpression(null, params.params, method, isGenerator));
+	    };
+	    // https://tc39.github.io/ecma262/#sec-generator-function-definitions
+	    Parser.prototype.isStartOfExpression = function () {
+	        var start = true;
+	        var value = this.lookahead.value;
+	        switch (this.lookahead.type) {
+	            case 7 /* Punctuator */:
+	                start = (value === '[') || (value === '(') || (value === '{') ||
+	                    (value === '+') || (value === '-') ||
+	                    (value === '!') || (value === '~') ||
+	                    (value === '++') || (value === '--') ||
+	                    (value === '/') || (value === '/='); // regular expression literal
+	                break;
+	            case 4 /* Keyword */:
+	                start = (value === 'class') || (value === 'delete') ||
+	                    (value === 'function') || (value === 'let') || (value === 'new') ||
+	                    (value === 'super') || (value === 'this') || (value === 'typeof') ||
+	                    (value === 'void') || (value === 'yield');
+	                break;
+	            default:
+	                break;
+	        }
+	        return start;
+	    };
+	    Parser.prototype.parseYieldExpression = function () {
+	        var node = this.createNode();
+	        this.expectKeyword('yield');
+	        var argument = null;
+	        var delegate = false;
+	        if (!this.hasLineTerminator) {
+	            var previousAllowYield = this.context.allowYield;
+	            this.context.allowYield = false;
+	            delegate = this.match('*');
+	            if (delegate) {
+	                this.nextToken();
+	                argument = this.parseAssignmentExpression();
+	            }
+	            else if (this.isStartOfExpression()) {
+	                argument = this.parseAssignmentExpression();
+	            }
+	            this.context.allowYield = previousAllowYield;
+	        }
+	        return this.finalize(node, new Node.YieldExpression(argument, delegate));
+	    };
+	    // https://tc39.github.io/ecma262/#sec-class-definitions
+	    Parser.prototype.parseClassElement = function (hasConstructor) {
+	        var token = this.lookahead;
+	        var node = this.createNode();
+	        var kind = '';
+	        var key = null;
+	        var value = null;
+	        var computed = false;
+	        var method = false;
+	        var isStatic = false;
+	        var isAsync = false;
+	        if (this.match('*')) {
+	            this.nextToken();
+	        }
+	        else {
+	            computed = this.match('[');
+	            key = this.parseObjectPropertyKey();
+	            var id = key;
+	            if (id.name === 'static' && (this.qualifiedPropertyName(this.lookahead) || this.match('*'))) {
+	                token = this.lookahead;
+	                isStatic = true;
+	                computed = this.match('[');
+	                if (this.match('*')) {
+	                    this.nextToken();
+	                }
+	                else {
+	                    key = this.parseObjectPropertyKey();
+	                }
+	            }
+	            if ((token.type === 3 /* Identifier */) && !this.hasLineTerminator && (token.value === 'async')) {
+	                var punctuator = this.lookahead.value;
+	                if (punctuator !== ':' && punctuator !== '(' && punctuator !== '*') {
+	                    isAsync = true;
+	                    token = this.lookahead;
+	                    key = this.parseObjectPropertyKey();
+	                    if (token.type === 3 /* Identifier */ && token.value === 'constructor') {
+	                        this.tolerateUnexpectedToken(token, messages_1.Messages.ConstructorIsAsync);
+	                    }
+	                }
+	            }
+	        }
+	        var lookaheadPropertyKey = this.qualifiedPropertyName(this.lookahead);
+	        if (token.type === 3 /* Identifier */) {
+	            if (token.value === 'get' && lookaheadPropertyKey) {
+	                kind = 'get';
+	                computed = this.match('[');
+	                key = this.parseObjectPropertyKey();
+	                this.context.allowYield = false;
+	                value = this.parseGetterMethod();
+	            }
+	            else if (token.value === 'set' && lookaheadPropertyKey) {
+	                kind = 'set';
+	                computed = this.match('[');
+	                key = this.parseObjectPropertyKey();
+	                value = this.parseSetterMethod();
+	            }
+	        }
+	        else if (token.type === 7 /* Punctuator */ && token.value === '*' && lookaheadPropertyKey) {
+	            kind = 'init';
+	            computed = this.match('[');
+	            key = this.parseObjectPropertyKey();
+	            value = this.parseGeneratorMethod();
+	            method = true;
+	        }
+	        if (!kind && key && this.match('(')) {
+	            kind = 'init';
+	            value = isAsync ? this.parsePropertyMethodAsyncFunction() : this.parsePropertyMethodFunction();
+	            method = true;
+	        }
+	        if (!kind) {
+	            this.throwUnexpectedToken(this.lookahead);
+	        }
+	        if (kind === 'init') {
+	            kind = 'method';
+	        }
+	        if (!computed) {
+	            if (isStatic && this.isPropertyKey(key, 'prototype')) {
+	                this.throwUnexpectedToken(token, messages_1.Messages.StaticPrototype);
+	            }
+	            if (!isStatic && this.isPropertyKey(key, 'constructor')) {
+	                if (kind !== 'method' || !method || (value && value.generator)) {
+	                    this.throwUnexpectedToken(token, messages_1.Messages.ConstructorSpecialMethod);
+	                }
+	                if (hasConstructor.value) {
+	                    this.throwUnexpectedToken(token, messages_1.Messages.DuplicateConstructor);
+	                }
+	                else {
+	                    hasConstructor.value = true;
+	                }
+	                kind = 'constructor';
+	            }
+	        }
+	        return this.finalize(node, new Node.MethodDefinition(key, computed, value, kind, isStatic));
+	    };
+	    Parser.prototype.parseClassElementList = function () {
+	        var body = [];
+	        var hasConstructor = { value: false };
+	        this.expect('{');
+	        while (!this.match('}')) {
+	            if (this.match(';')) {
+	                this.nextToken();
+	            }
+	            else {
+	                body.push(this.parseClassElement(hasConstructor));
+	            }
+	        }
+	        this.expect('}');
+	        return body;
+	    };
+	    Parser.prototype.parseClassBody = function () {
+	        var node = this.createNode();
+	        var elementList = this.parseClassElementList();
+	        return this.finalize(node, new Node.ClassBody(elementList));
+	    };
+	    Parser.prototype.parseClassDeclaration = function (identifierIsOptional) {
+	        var node = this.createNode();
+	        var previousStrict = this.context.strict;
+	        this.context.strict = true;
+	        this.expectKeyword('class');
+	        var id = (identifierIsOptional && (this.lookahead.type !== 3 /* Identifier */)) ? null : this.parseVariableIdentifier();
+	        var superClass = null;
+	        if (this.matchKeyword('extends')) {
+	            this.nextToken();
+	            superClass = this.isolateCoverGrammar(this.parseLeftHandSideExpressionAllowCall);
+	        }
+	        var classBody = this.parseClassBody();
+	        this.context.strict = previousStrict;
+	        return this.finalize(node, new Node.ClassDeclaration(id, superClass, classBody));
+	    };
+	    Parser.prototype.parseClassExpression = function () {
+	        var node = this.createNode();
+	        var previousStrict = this.context.strict;
+	        this.context.strict = true;
+	        this.expectKeyword('class');
+	        var id = (this.lookahead.type === 3 /* Identifier */) ? this.parseVariableIdentifier() : null;
+	        var superClass = null;
+	        if (this.matchKeyword('extends')) {
+	            this.nextToken();
+	            superClass = this.isolateCoverGrammar(this.parseLeftHandSideExpressionAllowCall);
+	        }
+	        var classBody = this.parseClassBody();
+	        this.context.strict = previousStrict;
+	        return this.finalize(node, new Node.ClassExpression(id, superClass, classBody));
+	    };
+	    // https://tc39.github.io/ecma262/#sec-scripts
+	    // https://tc39.github.io/ecma262/#sec-modules
+	    Parser.prototype.parseModule = function () {
+	        this.context.strict = true;
+	        this.context.isModule = true;
+	        this.scanner.isModule = true;
+	        var node = this.createNode();
+	        var body = this.parseDirectivePrologues();
+	        while (this.lookahead.type !== 2 /* EOF */) {
+	            body.push(this.parseStatementListItem());
+	        }
+	        return this.finalize(node, new Node.Module(body));
+	    };
+	    Parser.prototype.parseScript = function () {
+	        var node = this.createNode();
+	        var body = this.parseDirectivePrologues();
+	        while (this.lookahead.type !== 2 /* EOF */) {
+	            body.push(this.parseStatementListItem());
+	        }
+	        return this.finalize(node, new Node.Script(body));
+	    };
+	    // https://tc39.github.io/ecma262/#sec-imports
+	    Parser.prototype.parseModuleSpecifier = function () {
+	        var node = this.createNode();
+	        if (this.lookahead.type !== 8 /* StringLiteral */) {
+	            this.throwError(messages_1.Messages.InvalidModuleSpecifier);
+	        }
+	        var token = this.nextToken();
+	        var raw = this.getTokenRaw(token);
+	        return this.finalize(node, new Node.Literal(token.value, raw));
+	    };
+	    // import {<foo as bar>} ...;
+	    Parser.prototype.parseImportSpecifier = function () {
+	        var node = this.createNode();
+	        var imported;
+	        var local;
+	        if (this.lookahead.type === 3 /* Identifier */) {
+	            imported = this.parseVariableIdentifier();
+	            local = imported;
+	            if (this.matchContextualKeyword('as')) {
+	                this.nextToken();
+	                local = this.parseVariableIdentifier();
+	            }
+	        }
+	        else {
+	            imported = this.parseIdentifierName();
+	            local = imported;
+	            if (this.matchContextualKeyword('as')) {
+	                this.nextToken();
+	                local = this.parseVariableIdentifier();
+	            }
+	            else {
+	                this.throwUnexpectedToken(this.nextToken());
+	            }
+	        }
+	        return this.finalize(node, new Node.ImportSpecifier(local, imported));
+	    };
+	    // {foo, bar as bas}
+	    Parser.prototype.parseNamedImports = function () {
+	        this.expect('{');
+	        var specifiers = [];
+	        while (!this.match('}')) {
+	            specifiers.push(this.parseImportSpecifier());
+	            if (!this.match('}')) {
+	                this.expect(',');
+	            }
+	        }
+	        this.expect('}');
+	        return specifiers;
+	    };
+	    // import <foo> ...;
+	    Parser.prototype.parseImportDefaultSpecifier = function () {
+	        var node = this.createNode();
+	        var local = this.parseIdentifierName();
+	        return this.finalize(node, new Node.ImportDefaultSpecifier(local));
+	    };
+	    // import <* as foo> ...;
+	    Parser.prototype.parseImportNamespaceSpecifier = function () {
+	        var node = this.createNode();
+	        this.expect('*');
+	        if (!this.matchContextualKeyword('as')) {
+	            this.throwError(messages_1.Messages.NoAsAfterImportNamespace);
+	        }
+	        this.nextToken();
+	        var local = this.parseIdentifierName();
+	        return this.finalize(node, new Node.ImportNamespaceSpecifier(local));
+	    };
+	    Parser.prototype.parseImportDeclaration = function () {
+	        if (this.context.inFunctionBody) {
+	            this.throwError(messages_1.Messages.IllegalImportDeclaration);
+	        }
+	        var node = this.createNode();
+	        this.expectKeyword('import');
+	        var src;
+	        var specifiers = [];
+	        if (this.lookahead.type === 8 /* StringLiteral */) {
+	            // import 'foo';
+	            src = this.parseModuleSpecifier();
+	        }
+	        else {
+	            if (this.match('{')) {
+	                // import {bar}
+	                specifiers = specifiers.concat(this.parseNamedImports());
+	            }
+	            else if (this.match('*')) {
+	                // import * as foo
+	                specifiers.push(this.parseImportNamespaceSpecifier());
+	            }
+	            else if (this.isIdentifierName(this.lookahead) && !this.matchKeyword('default')) {
+	                // import foo
+	                specifiers.push(this.parseImportDefaultSpecifier());
+	                if (this.match(',')) {
+	                    this.nextToken();
+	                    if (this.match('*')) {
+	                        // import foo, * as foo
+	                        specifiers.push(this.parseImportNamespaceSpecifier());
+	                    }
+	                    else if (this.match('{')) {
+	                        // import foo, {bar}
+	                        specifiers = specifiers.concat(this.parseNamedImports());
+	                    }
+	                    else {
+	                        this.throwUnexpectedToken(this.lookahead);
+	                    }
+	                }
+	            }
+	            else {
+	                this.throwUnexpectedToken(this.nextToken());
+	            }
+	            if (!this.matchContextualKeyword('from')) {
+	                var message = this.lookahead.value ? messages_1.Messages.UnexpectedToken : messages_1.Messages.MissingFromClause;
+	                this.throwError(message, this.lookahead.value);
+	            }
+	            this.nextToken();
+	            src = this.parseModuleSpecifier();
+	        }
+	        this.consumeSemicolon();
+	        return this.finalize(node, new Node.ImportDeclaration(specifiers, src));
+	    };
+	    // https://tc39.github.io/ecma262/#sec-exports
+	    Parser.prototype.parseExportSpecifier = function () {
+	        var node = this.createNode();
+	        var local = this.parseIdentifierName();
+	        var exported = local;
+	        if (this.matchContextualKeyword('as')) {
+	            this.nextToken();
+	            exported = this.parseIdentifierName();
+	        }
+	        return this.finalize(node, new Node.ExportSpecifier(local, exported));
+	    };
+	    Parser.prototype.parseExportDeclaration = function () {
+	        if (this.context.inFunctionBody) {
+	            this.throwError(messages_1.Messages.IllegalExportDeclaration);
+	        }
+	        var node = this.createNode();
+	        this.expectKeyword('export');
+	        var exportDeclaration;
+	        if (this.matchKeyword('default')) {
+	            // export default ...
+	            this.nextToken();
+	            if (this.matchKeyword('function')) {
+	                // export default function foo () {}
+	                // export default function () {}
+	                var declaration = this.parseFunctionDeclaration(true);
+	                exportDeclaration = this.finalize(node, new Node.ExportDefaultDeclaration(declaration));
+	            }
+	            else if (this.matchKeyword('class')) {
+	                // export default class foo {}
+	                var declaration = this.parseClassDeclaration(true);
+	                exportDeclaration = this.finalize(node, new Node.ExportDefaultDeclaration(declaration));
+	            }
+	            else if (this.matchContextualKeyword('async')) {
+	                // export default async function f () {}
+	                // export default async function () {}
+	                // export default async x => x
+	                var declaration = this.matchAsyncFunction() ? this.parseFunctionDeclaration(true) : this.parseAssignmentExpression();
+	                exportDeclaration = this.finalize(node, new Node.ExportDefaultDeclaration(declaration));
+	            }
+	            else {
+	                if (this.matchContextualKeyword('from')) {
+	                    this.throwError(messages_1.Messages.UnexpectedToken, this.lookahead.value);
+	                }
+	                // export default {};
+	                // export default [];
+	                // export default (1 + 2);
+	                var declaration = this.match('{') ? this.parseObjectInitializer() :
+	                    this.match('[') ? this.parseArrayInitializer() : this.parseAssignmentExpression();
+	                this.consumeSemicolon();
+	                exportDeclaration = this.finalize(node, new Node.ExportDefaultDeclaration(declaration));
+	            }
+	        }
+	        else if (this.match('*')) {
+	            // export * from 'foo';
+	            this.nextToken();
+	            if (!this.matchContextualKeyword('from')) {
+	                var message = this.lookahead.value ? messages_1.Messages.UnexpectedToken : messages_1.Messages.MissingFromClause;
+	                this.throwError(message, this.lookahead.value);
+	            }
+	            this.nextToken();
+	            var src = this.parseModuleSpecifier();
+	            this.consumeSemicolon();
+	            exportDeclaration = this.finalize(node, new Node.ExportAllDeclaration(src));
+	        }
+	        else if (this.lookahead.type === 4 /* Keyword */) {
+	            // export var f = 1;
+	            var declaration = void 0;
+	            switch (this.lookahead.value) {
+	                case 'let':
+	                case 'const':
+	                    declaration = this.parseLexicalDeclaration({ inFor: false });
+	                    break;
+	                case 'var':
+	                case 'class':
+	                case 'function':
+	                    declaration = this.parseStatementListItem();
+	                    break;
+	                default:
+	                    this.throwUnexpectedToken(this.lookahead);
+	            }
+	            exportDeclaration = this.finalize(node, new Node.ExportNamedDeclaration(declaration, [], null));
+	        }
+	        else if (this.matchAsyncFunction()) {
+	            var declaration = this.parseFunctionDeclaration();
+	            exportDeclaration = this.finalize(node, new Node.ExportNamedDeclaration(declaration, [], null));
+	        }
+	        else {
+	            var specifiers = [];
+	            var source = null;
+	            var isExportFromIdentifier = false;
+	            this.expect('{');
+	            while (!this.match('}')) {
+	                isExportFromIdentifier = isExportFromIdentifier || this.matchKeyword('default');
+	                specifiers.push(this.parseExportSpecifier());
+	                if (!this.match('}')) {
+	                    this.expect(',');
+	                }
+	            }
+	            this.expect('}');
+	            if (this.matchContextualKeyword('from')) {
+	                // export {default} from 'foo';
+	                // export {foo} from 'foo';
+	                this.nextToken();
+	                source = this.parseModuleSpecifier();
+	                this.consumeSemicolon();
+	            }
+	            else if (isExportFromIdentifier) {
+	                // export {default}; // missing fromClause
+	                var message = this.lookahead.value ? messages_1.Messages.UnexpectedToken : messages_1.Messages.MissingFromClause;
+	                this.throwError(message, this.lookahead.value);
+	            }
+	            else {
+	                // export {foo};
+	                this.consumeSemicolon();
+	            }
+	            exportDeclaration = this.finalize(node, new Node.ExportNamedDeclaration(null, specifiers, source));
+	        }
+	        return exportDeclaration;
+	    };
+	    return Parser;
+	}());
+	exports.Parser = Parser;
+
+
+/***/ },
+/* 9 */
+/***/ function(module, exports) {
+
+	"use strict";
+	// Ensure the condition is true, otherwise throw an error.
+	// This is only to have a better contract semantic, i.e. another safety net
+	// to catch a logic error. The condition shall be fulfilled in normal case.
+	// Do NOT use this to enforce a certain condition on any user input.
+	Object.defineProperty(exports, "__esModule", { value: true });
+	function assert(condition, message) {
+	    /* istanbul ignore if */
+	    if (!condition) {
+	        throw new Error('ASSERT: ' + message);
+	    }
+	}
+	exports.assert = assert;
+
+
+/***/ },
+/* 10 */
+/***/ function(module, exports) {
+
+	"use strict";
+	/* tslint:disable:max-classes-per-file */
+	Object.defineProperty(exports, "__esModule", { value: true });
+	var ErrorHandler = (function () {
+	    function ErrorHandler() {
+	        this.errors = [];
+	        this.tolerant = false;
+	    }
+	    ErrorHandler.prototype.recordError = function (error) {
+	        this.errors.push(error);
+	    };
+	    ErrorHandler.prototype.tolerate = function (error) {
+	        if (this.tolerant) {
+	            this.recordError(error);
+	        }
+	        else {
+	            throw error;
+	        }
+	    };
+	    ErrorHandler.prototype.constructError = function (msg, column) {
+	        var error = new Error(msg);
+	        try {
+	            throw error;
+	        }
+	        catch (base) {
+	            /* istanbul ignore else */
+	            if (Object.create && Object.defineProperty) {
+	                error = Object.create(base);
+	                Object.defineProperty(error, 'column', { value: column });
+	            }
+	        }
+	        /* istanbul ignore next */
+	        return error;
+	    };
+	    ErrorHandler.prototype.createError = function (index, line, col, description) {
+	        var msg = 'Line ' + line + ': ' + description;
+	        var error = this.constructError(msg, col);
+	        error.index = index;
+	        error.lineNumber = line;
+	        error.description = description;
+	        return error;
+	    };
+	    ErrorHandler.prototype.throwError = function (index, line, col, description) {
+	        throw this.createError(index, line, col, description);
+	    };
+	    ErrorHandler.prototype.tolerateError = function (index, line, col, description) {
+	        var error = this.createError(index, line, col, description);
+	        if (this.tolerant) {
+	            this.recordError(error);
+	        }
+	        else {
+	            throw error;
+	        }
+	    };
+	    return ErrorHandler;
+	}());
+	exports.ErrorHandler = ErrorHandler;
+
+
+/***/ },
+/* 11 */
+/***/ function(module, exports) {
+
+	"use strict";
+	Object.defineProperty(exports, "__esModule", { value: true });
+	// Error messages should be identical to V8.
+	exports.Messages = {
+	    BadGetterArity: 'Getter must not have any formal parameters',
+	    BadSetterArity: 'Setter must have exactly one formal parameter',
+	    BadSetterRestParameter: 'Setter function argument must not be a rest parameter',
+	    ConstructorIsAsync: 'Class constructor may not be an async method',
+	    ConstructorSpecialMethod: 'Class constructor may not be an accessor',
+	    DeclarationMissingInitializer: 'Missing initializer in %0 declaration',
+	    DefaultRestParameter: 'Unexpected token =',
+	    DuplicateBinding: 'Duplicate binding %0',
+	    DuplicateConstructor: 'A class may only have one constructor',
+	    DuplicateProtoProperty: 'Duplicate __proto__ fields are not allowed in object literals',
+	    ForInOfLoopInitializer: '%0 loop variable declaration may not have an initializer',
+	    GeneratorInLegacyContext: 'Generator declarations are not allowed in legacy contexts',
+	    IllegalBreak: 'Illegal break statement',
+	    IllegalContinue: 'Illegal continue statement',
+	    IllegalExportDeclaration: 'Unexpected token',
+	    IllegalImportDeclaration: 'Unexpected token',
+	    IllegalLanguageModeDirective: 'Illegal \'use strict\' directive in function with non-simple parameter list',
+	    IllegalReturn: 'Illegal return statement',
+	    InvalidEscapedReservedWord: 'Keyword must not contain escaped characters',
+	    InvalidHexEscapeSequence: 'Invalid hexadecimal escape sequence',
+	    InvalidLHSInAssignment: 'Invalid left-hand side in assignment',
+	    InvalidLHSInForIn: 'Invalid left-hand side in for-in',
+	    InvalidLHSInForLoop: 'Invalid left-hand side in for-loop',
+	    InvalidModuleSpecifier: 'Unexpected token',
+	    InvalidRegExp: 'Invalid regular expression',
+	    LetInLexicalBinding: 'let is disallowed as a lexically bound name',
+	    MissingFromClause: 'Unexpected token',
+	    MultipleDefaultsInSwitch: 'More than one default clause in switch statement',
+	    NewlineAfterThrow: 'Illegal newline after throw',
+	    NoAsAfterImportNamespace: 'Unexpected token',
+	    NoCatchOrFinally: 'Missing catch or finally after try',
+	    ParameterAfterRestParameter: 'Rest parameter must be last formal parameter',
+	    Redeclaration: '%0 \'%1\' has already been declared',
+	    StaticPrototype: 'Classes may not have static property named prototype',
+	    StrictCatchVariable: 'Catch variable may not be eval or arguments in strict mode',
+	    StrictDelete: 'Delete of an unqualified identifier in strict mode.',
+	    StrictFunction: 'In strict mode code, functions can only be declared at top level or inside a block',
+	    StrictFunctionName: 'Function name may not be eval or arguments in strict mode',
+	    StrictLHSAssignment: 'Assignment to eval or arguments is not allowed in strict mode',
+	    StrictLHSPostfix: 'Postfix increment/decrement may not have eval or arguments operand in strict mode',
+	    StrictLHSPrefix: 'Prefix increment/decrement may not have eval or arguments operand in strict mode',
+	    StrictModeWith: 'Strict mode code may not include a with statement',
+	    StrictOctalLiteral: 'Octal literals are not allowed in strict mode.',
+	    StrictParamDupe: 'Strict mode function may not have duplicate parameter names',
+	    StrictParamName: 'Parameter name eval or arguments is not allowed in strict mode',
+	    StrictReservedWord: 'Use of future reserved word in strict mode',
+	    StrictVarName: 'Variable name may not be eval or arguments in strict mode',
+	    TemplateOctalLiteral: 'Octal literals are not allowed in template strings.',
+	    UnexpectedEOS: 'Unexpected end of input',
+	    UnexpectedIdentifier: 'Unexpected identifier',
+	    UnexpectedNumber: 'Unexpected number',
+	    UnexpectedReserved: 'Unexpected reserved word',
+	    UnexpectedString: 'Unexpected string',
+	    UnexpectedTemplate: 'Unexpected quasi %0',
+	    UnexpectedToken: 'Unexpected token %0',
+	    UnexpectedTokenIllegal: 'Unexpected token ILLEGAL',
+	    UnknownLabel: 'Undefined label \'%0\'',
+	    UnterminatedRegExp: 'Invalid regular expression: missing /'
+	};
+
+
+/***/ },
+/* 12 */
+/***/ function(module, exports, __webpack_require__) {
+
+	"use strict";
+	Object.defineProperty(exports, "__esModule", { value: true });
+	var assert_1 = __webpack_require__(9);
+	var character_1 = __webpack_require__(4);
+	var messages_1 = __webpack_require__(11);
+	function hexValue(ch) {
+	    return '0123456789abcdef'.indexOf(ch.toLowerCase());
+	}
+	function octalValue(ch) {
+	    return '01234567'.indexOf(ch);
+	}
+	var Scanner = (function () {
+	    function Scanner(code, handler) {
+	        this.source = code;
+	        this.errorHandler = handler;
+	        this.trackComment = false;
+	        this.isModule = false;
+	        this.length = code.length;
+	        this.index = 0;
+	        this.lineNumber = (code.length > 0) ? 1 : 0;
+	        this.lineStart = 0;
+	        this.curlyStack = [];
+	    }
+	    Scanner.prototype.saveState = function () {
+	        return {
+	            index: this.index,
+	            lineNumber: this.lineNumber,
+	            lineStart: this.lineStart
+	        };
+	    };
+	    Scanner.prototype.restoreState = function (state) {
+	        this.index = state.index;
+	        this.lineNumber = state.lineNumber;
+	        this.lineStart = state.lineStart;
+	    };
+	    Scanner.prototype.eof = function () {
+	        return this.index >= this.length;
+	    };
+	    Scanner.prototype.throwUnexpectedToken = function (message) {
+	        if (message === void 0) { message = messages_1.Messages.UnexpectedTokenIllegal; }
+	        return this.errorHandler.throwError(this.index, this.lineNumber, this.index - this.lineStart + 1, message);
+	    };
+	    Scanner.prototype.tolerateUnexpectedToken = function (message) {
+	        if (message === void 0) { message = messages_1.Messages.UnexpectedTokenIllegal; }
+	        this.errorHandler.tolerateError(this.index, this.lineNumber, this.index - this.lineStart + 1, message);
+	    };
+	    // https://tc39.github.io/ecma262/#sec-comments
+	    Scanner.prototype.skipSingleLineComment = function (offset) {
+	        var comments = [];
+	        var start, loc;
+	        if (this.trackComment) {
+	            comments = [];
+	            start = this.index - offset;
+	            loc = {
+	                start: {
+	                    line: this.lineNumber,
+	                    column: this.index - this.lineStart - offset
+	                },
+	                end: {}
+	            };
+	        }
+	        while (!this.eof()) {
+	            var ch = this.source.charCodeAt(this.index);
+	            ++this.index;
+	            if (character_1.Character.isLineTerminator(ch)) {
+	                if (this.trackComment) {
+	                    loc.end = {
+	                        line: this.lineNumber,
+	                        column: this.index - this.lineStart - 1
+	                    };
+	                    var entry = {
+	                        multiLine: false,
+	                        slice: [start + offset, this.index - 1],
+	                        range: [start, this.index - 1],
+	                        loc: loc
+	                    };
+	                    comments.push(entry);
+	                }
+	                if (ch === 13 && this.source.charCodeAt(this.index) === 10) {
+	                    ++this.index;
+	                }
+	                ++this.lineNumber;
+	                this.lineStart = this.index;
+	                return comments;
+	            }
+	        }
+	        if (this.trackComment) {
+	            loc.end = {
+	                line: this.lineNumber,
+	                column: this.index - this.lineStart
+	            };
+	            var entry = {
+	                multiLine: false,
+	                slice: [start + offset, this.index],
+	                range: [start, this.index],
+	                loc: loc
+	            };
+	            comments.push(entry);
+	        }
+	        return comments;
+	    };
+	    Scanner.prototype.skipMultiLineComment = function () {
+	        var comments = [];
+	        var start, loc;
+	        if (this.trackComment) {
+	            comments = [];
+	            start = this.index - 2;
+	            loc = {
+	                start: {
+	                    line: this.lineNumber,
+	                    column: this.index - this.lineStart - 2
+	                },
+	                end: {}
+	            };
+	        }
+	        while (!this.eof()) {
+	            var ch = this.source.charCodeAt(this.index);
+	            if (character_1.Character.isLineTerminator(ch)) {
+	                if (ch === 0x0D && this.source.charCodeAt(this.index + 1) === 0x0A) {
+	                    ++this.index;
+	                }
+	                ++this.lineNumber;
+	                ++this.index;
+	                this.lineStart = this.index;
+	            }
+	            else if (ch === 0x2A) {
+	                // Block comment ends with '*/'.
+	                if (this.source.charCodeAt(this.index + 1) === 0x2F) {
+	                    this.index += 2;
+	                    if (this.trackComment) {
+	                        loc.end = {
+	                            line: this.lineNumber,
+	                            column: this.index - this.lineStart
+	                        };
+	                        var entry = {
+	                            multiLine: true,
+	                            slice: [start + 2, this.index - 2],
+	                            range: [start, this.index],
+	                            loc: loc
+	                        };
+	                        comments.push(entry);
+	                    }
+	                    return comments;
+	                }
+	                ++this.index;
+	            }
+	            else {
+	                ++this.index;
+	            }
+	        }
+	        // Ran off the end of the file - the whole thing is a comment
+	        if (this.trackComment) {
+	            loc.end = {
+	                line: this.lineNumber,
+	                column: this.index - this.lineStart
+	            };
+	            var entry = {
+	                multiLine: true,
+	                slice: [start + 2, this.index],
+	                range: [start, this.index],
+	                loc: loc
+	            };
+	            comments.push(entry);
+	        }
+	        this.tolerateUnexpectedToken();
+	        return comments;
+	    };
+	    Scanner.prototype.scanComments = function () {
+	        var comments;
+	        if (this.trackComment) {
+	            comments = [];
+	        }
+	        var start = (this.index === 0);
+	        while (!this.eof()) {
+	            var ch = this.source.charCodeAt(this.index);
+	            if (character_1.Character.isWhiteSpace(ch)) {
+	                ++this.index;
+	            }
+	            else if (character_1.Character.isLineTerminator(ch)) {
+	                ++this.index;
+	                if (ch === 0x0D && this.source.charCodeAt(this.index) === 0x0A) {
+	                    ++this.index;
+	                }
+	                ++this.lineNumber;
+	                this.lineStart = this.index;
+	                start = true;
+	            }
+	            else if (ch === 0x2F) {
+	                ch = this.source.charCodeAt(this.index + 1);
+	                if (ch === 0x2F) {
+	                    this.index += 2;
+	                    var comment = this.skipSingleLineComment(2);
+	                    if (this.trackComment) {
+	                        comments = comments.concat(comment);
+	                    }
+	                    start = true;
+	                }
+	                else if (ch === 0x2A) {
+	                    this.index += 2;
+	                    var comment = this.skipMultiLineComment();
+	                    if (this.trackComment) {
+	                        comments = comments.concat(comment);
+	                    }
+	                }
+	                else {
+	                    break;
+	                }
+	            }
+	            else if (start && ch === 0x2D) {
+	                // U+003E is '>'
+	                if ((this.source.charCodeAt(this.index + 1) === 0x2D) && (this.source.charCodeAt(this.index + 2) === 0x3E)) {
+	                    // '-->' is a single-line comment
+	                    this.index += 3;
+	                    var comment = this.skipSingleLineComment(3);
+	                    if (this.trackComment) {
+	                        comments = comments.concat(comment);
+	                    }
+	                }
+	                else {
+	                    break;
+	                }
+	            }
+	            else if (ch === 0x3C && !this.isModule) {
+	                if (this.source.slice(this.index + 1, this.index + 4) === '!--') {
+	                    this.index += 4; // `<!--`
+	                    var comment = this.skipSingleLineComment(4);
+	                    if (this.trackComment) {
+	                        comments = comments.concat(comment);
+	                    }
+	                }
+	                else {
+	                    break;
+	                }
+	            }
+	            else {
+	                break;
+	            }
+	        }
+	        return comments;
+	    };
+	    // https://tc39.github.io/ecma262/#sec-future-reserved-words
+	    Scanner.prototype.isFutureReservedWord = function (id) {
+	        switch (id) {
+	            case 'enum':
+	            case 'export':
+	            case 'import':
+	            case 'super':
+	                return true;
+	            default:
+	                return false;
+	        }
+	    };
+	    Scanner.prototype.isStrictModeReservedWord = function (id) {
+	        switch (id) {
+	            case 'implements':
+	            case 'interface':
+	            case 'package':
+	            case 'private':
+	            case 'protected':
+	            case 'public':
+	            case 'static':
+	            case 'yield':
+	            case 'let':
+	                return true;
+	            default:
+	                return false;
+	        }
+	    };
+	    Scanner.prototype.isRestrictedWord = function (id) {
+	        return id === 'eval' || id === 'arguments';
+	    };
+	    // https://tc39.github.io/ecma262/#sec-keywords
+	    Scanner.prototype.isKeyword = function (id) {
+	        switch (id.length) {
+	            case 2:
+	                return (id === 'if') || (id === 'in') || (id === 'do');
+	            case 3:
+	                return (id === 'var') || (id === 'for') || (id === 'new') ||
+	                    (id === 'try') || (id === 'let');
+	            case 4:
+	                return (id === 'this') || (id === 'else') || (id === 'case') ||
+	                    (id === 'void') || (id === 'with') || (id === 'enum');
+	            case 5:
+	                return (id === 'while') || (id === 'break') || (id === 'catch') ||
+	                    (id === 'throw') || (id === 'const') || (id === 'yield') ||
+	                    (id === 'class') || (id === 'super');
+	            case 6:
+	                return (id === 'return') || (id === 'typeof') || (id === 'delete') ||
+	                    (id === 'switch') || (id === 'export') || (id === 'import');
+	            case 7:
+	                return (id === 'default') || (id === 'finally') || (id === 'extends');
+	            case 8:
+	                return (id === 'function') || (id === 'continue') || (id === 'debugger');
+	            case 10:
+	                return (id === 'instanceof');
+	            default:
+	                return false;
+	        }
+	    };
+	    Scanner.prototype.codePointAt = function (i) {
+	        var cp = this.source.charCodeAt(i);
+	        if (cp >= 0xD800 && cp <= 0xDBFF) {
+	            var second = this.source.charCodeAt(i + 1);
+	            if (second >= 0xDC00 && second <= 0xDFFF) {
+	                var first = cp;
+	                cp = (first - 0xD800) * 0x400 + second - 0xDC00 + 0x10000;
+	            }
+	        }
+	        return cp;
+	    };
+	    Scanner.prototype.scanHexEscape = function (prefix) {
+	        var len = (prefix === 'u') ? 4 : 2;
+	        var code = 0;
+	        for (var i = 0; i < len; ++i) {
+	            if (!this.eof() && character_1.Character.isHexDigit(this.source.charCodeAt(this.index))) {
+	                code = code * 16 + hexValue(this.source[this.index++]);
+	            }
+	            else {
+	                return null;
+	            }
+	        }
+	        return String.fromCharCode(code);
+	    };
+	    Scanner.prototype.scanUnicodeCodePointEscape = function () {
+	        var ch = this.source[this.index];
+	        var code = 0;
+	        // At least, one hex digit is required.
+	        if (ch === '}') {
+	            this.throwUnexpectedToken();
+	        }
+	        while (!this.eof()) {
+	            ch = this.source[this.index++];
+	            if (!character_1.Character.isHexDigit(ch.charCodeAt(0))) {
+	                break;
+	            }
+	            code = code * 16 + hexValue(ch);
+	        }
+	        if (code > 0x10FFFF || ch !== '}') {
+	            this.throwUnexpectedToken();
+	        }
+	        return character_1.Character.fromCodePoint(code);
+	    };
+	    Scanner.prototype.getIdentifier = function () {
+	        var start = this.index++;
+	        while (!this.eof()) {
+	            var ch = this.source.charCodeAt(this.index);
+	            if (ch === 0x5C) {
+	                // Blackslash (U+005C) marks Unicode escape sequence.
+	                this.index = start;
+	                return this.getComplexIdentifier();
+	            }
+	            else if (ch >= 0xD800 && ch < 0xDFFF) {
+	                // Need to handle surrogate pairs.
+	                this.index = start;
+	                return this.getComplexIdentifier();
+	            }
+	            if (character_1.Character.isIdentifierPart(ch)) {
+	                ++this.index;
+	            }
+	            else {
+	                break;
+	            }
+	        }
+	        return this.source.slice(start, this.index);
+	    };
+	    Scanner.prototype.getComplexIdentifier = function () {
+	        var cp = this.codePointAt(this.index);
+	        var id = character_1.Character.fromCodePoint(cp);
+	        this.index += id.length;
+	        // '\u' (U+005C, U+0075) denotes an escaped character.
+	        var ch;
+	        if (cp === 0x5C) {
+	            if (this.source.charCodeAt(this.index) !== 0x75) {
+	                this.throwUnexpectedToken();
+	            }
+	            ++this.index;
+	            if (this.source[this.index] === '{') {
+	                ++this.index;
+	                ch = this.scanUnicodeCodePointEscape();
+	            }
+	            else {
+	                ch = this.scanHexEscape('u');
+	                if (ch === null || ch === '\\' || !character_1.Character.isIdentifierStart(ch.charCodeAt(0))) {
+	                    this.throwUnexpectedToken();
+	                }
+	            }
+	            id = ch;
+	        }
+	        while (!this.eof()) {
+	            cp = this.codePointAt(this.index);
+	            if (!character_1.Character.isIdentifierPart(cp)) {
+	                break;
+	            }
+	            ch = character_1.Character.fromCodePoint(cp);
+	            id += ch;
+	            this.index += ch.length;
+	            // '\u' (U+005C, U+0075) denotes an escaped character.
+	            if (cp === 0x5C) {
+	                id = id.substr(0, id.length - 1);
+	                if (this.source.charCodeAt(this.index) !== 0x75) {
+	                    this.throwUnexpectedToken();
+	                }
+	                ++this.index;
+	                if (this.source[this.index] === '{') {
+	                    ++this.index;
+	                    ch = this.scanUnicodeCodePointEscape();
+	                }
+	                else {
+	                    ch = this.scanHexEscape('u');
+	                    if (ch === null || ch === '\\' || !character_1.Character.isIdentifierPart(ch.charCodeAt(0))) {
+	                        this.throwUnexpectedToken();
+	                    }
+	                }
+	                id += ch;
+	            }
+	        }
+	        return id;
+	    };
+	    Scanner.prototype.octalToDecimal = function (ch) {
+	        // \0 is not octal escape sequence
+	        var octal = (ch !== '0');
+	        var code = octalValue(ch);
+	        if (!this.eof() && character_1.Character.isOctalDigit(this.source.charCodeAt(this.index))) {
+	            octal = true;
+	            code = code * 8 + octalValue(this.source[this.index++]);
+	            // 3 digits are only allowed when string starts
+	            // with 0, 1, 2, 3
+	            if ('0123'.indexOf(ch) >= 0 && !this.eof() && character_1.Character.isOctalDigit(this.source.charCodeAt(this.index))) {
+	                code = code * 8 + octalValue(this.source[this.index++]);
+	            }
+	        }
+	        return {
+	            code: code,
+	            octal: octal
+	        };
+	    };
+	    // https://tc39.github.io/ecma262/#sec-names-and-keywords
+	    Scanner.prototype.scanIdentifier = function () {
+	        var type;
+	        var start = this.index;
+	        // Backslash (U+005C) starts an escaped character.
+	        var id = (this.source.charCodeAt(start) === 0x5C) ? this.getComplexIdentifier() : this.getIdentifier();
+	        // There is no keyword or literal with only one character.
+	        // Thus, it must be an identifier.
+	        if (id.length === 1) {
+	            type = 3 /* Identifier */;
+	        }
+	        else if (this.isKeyword(id)) {
+	            type = 4 /* Keyword */;
+	        }
+	        else if (id === 'null') {
+	            type = 5 /* NullLiteral */;
+	        }
+	        else if (id === 'true' || id === 'false') {
+	            type = 1 /* BooleanLiteral */;
+	        }
+	        else {
+	            type = 3 /* Identifier */;
+	        }
+	        if (type !== 3 /* Identifier */ && (start + id.length !== this.index)) {
+	            var restore = this.index;
+	            this.index = start;
+	            this.tolerateUnexpectedToken(messages_1.Messages.InvalidEscapedReservedWord);
+	            this.index = restore;
+	        }
+	        return {
+	            type: type,
+	            value: id,
+	            lineNumber: this.lineNumber,
+	            lineStart: this.lineStart,
+	            start: start,
+	            end: this.index
+	        };
+	    };
+	    // https://tc39.github.io/ecma262/#sec-punctuators
+	    Scanner.prototype.scanPunctuator = function () {
+	        var start = this.index;
+	        // Check for most common single-character punctuators.
+	        var str = this.source[this.index];
+	        switch (str) {
+	            case '(':
+	            case '{':
+	                if (str === '{') {
+	                    this.curlyStack.push('{');
+	                }
+	                ++this.index;
+	                break;
+	            case '.':
+	                ++this.index;
+	                if (this.source[this.index] === '.' && this.source[this.index + 1] === '.') {
+	                    // Spread operator: ...
+	                    this.index += 2;
+	                    str = '...';
+	                }
+	                break;
+	            case '}':
+	                ++this.index;
+	                this.curlyStack.pop();
+	                break;
+	            case ')':
+	            case ';':
+	            case ',':
+	            case '[':
+	            case ']':
+	            case ':':
+	            case '?':
+	            case '~':
+	                ++this.index;
+	                break;
+	            default:
+	                // 4-character punctuator.
+	                str = this.source.substr(this.index, 4);
+	                if (str === '>>>=') {
+	                    this.index += 4;
+	                }
+	                else {
+	                    // 3-character punctuators.
+	                    str = str.substr(0, 3);
+	                    if (str === '===' || str === '!==' || str === '>>>' ||
+	                        str === '<<=' || str === '>>=' || str === '**=') {
+	                        this.index += 3;
+	                    }
+	                    else {
+	                        // 2-character punctuators.
+	                        str = str.substr(0, 2);
+	                        if (str === '&&' || str === '||' || str === '==' || str === '!=' ||
+	                            str === '+=' || str === '-=' || str === '*=' || str === '/=' ||
+	                            str === '++' || str === '--' || str === '<<' || str === '>>' ||
+	                            str === '&=' || str === '|=' || str === '^=' || str === '%=' ||
+	                            str === '<=' || str === '>=' || str === '=>' || str === '**') {
+	                            this.index += 2;
+	                        }
+	                        else {
+	                            // 1-character punctuators.
+	                            str = this.source[this.index];
+	                            if ('<>=!+-*%&|^/'.indexOf(str) >= 0) {
+	                                ++this.index;
+	                            }
+	                        }
+	                    }
+	                }
+	        }
+	        if (this.index === start) {
+	            this.throwUnexpectedToken();
+	        }
+	        return {
+	            type: 7 /* Punctuator */,
+	            value: str,
+	            lineNumber: this.lineNumber,
+	            lineStart: this.lineStart,
+	            start: start,
+	            end: this.index
+	        };
+	    };
+	    // https://tc39.github.io/ecma262/#sec-literals-numeric-literals
+	    Scanner.prototype.scanHexLiteral = function (start) {
+	        var num = '';
+	        while (!this.eof()) {
+	            if (!character_1.Character.isHexDigit(this.source.charCodeAt(this.index))) {
+	                break;
+	            }
+	            num += this.source[this.index++];
+	        }
+	        if (num.length === 0) {
+	            this.throwUnexpectedToken();
+	        }
+	        if (character_1.Character.isIdentifierStart(this.source.charCodeAt(this.index))) {
+	            this.throwUnexpectedToken();
+	        }
+	        return {
+	            type: 6 /* NumericLiteral */,
+	            value: parseInt('0x' + num, 16),
+	            lineNumber: this.lineNumber,
+	            lineStart: this.lineStart,
+	            start: start,
+	            end: this.index
+	        };
+	    };
+	    Scanner.prototype.scanBinaryLiteral = function (start) {
+	        var num = '';
+	        var ch;
+	        while (!this.eof()) {
+	            ch = this.source[this.index];
+	            if (ch !== '0' && ch !== '1') {
+	                break;
+	            }
+	            num += this.source[this.index++];
+	        }
+	        if (num.length === 0) {
+	            // only 0b or 0B
+	            this.throwUnexpectedToken();
+	        }
+	        if (!this.eof()) {
+	            ch = this.source.charCodeAt(this.index);
+	            /* istanbul ignore else */
+	            if (character_1.Character.isIdentifierStart(ch) || character_1.Character.isDecimalDigit(ch)) {
+	                this.throwUnexpectedToken();
+	            }
+	        }
+	        return {
+	            type: 6 /* NumericLiteral */,
+	            value: parseInt(num, 2),
+	            lineNumber: this.lineNumber,
+	            lineStart: this.lineStart,
+	            start: start,
+	            end: this.index
+	        };
+	    };
+	    Scanner.prototype.scanOctalLiteral = function (prefix, start) {
+	        var num = '';
+	        var octal = false;
+	        if (character_1.Character.isOctalDigit(prefix.charCodeAt(0))) {
+	            octal = true;
+	            num = '0' + this.source[this.index++];
+	        }
+	        else {
+	            ++this.index;
+	        }
+	        while (!this.eof()) {
+	            if (!character_1.Character.isOctalDigit(this.source.charCodeAt(this.index))) {
+	                break;
+	            }
+	            num += this.source[this.index++];
+	        }
+	        if (!octal && num.length === 0) {
+	            // only 0o or 0O
+	            this.throwUnexpectedToken();
+	        }
+	        if (character_1.Character.isIdentifierStart(this.source.charCodeAt(this.index)) || character_1.Character.isDecimalDigit(this.source.charCodeAt(this.index))) {
+	            this.throwUnexpectedToken();
+	        }
+	        return {
+	            type: 6 /* NumericLiteral */,
+	            value: parseInt(num, 8),
+	            octal: octal,
+	            lineNumber: this.lineNumber,
+	            lineStart: this.lineStart,
+	            start: start,
+	            end: this.index
+	        };
+	    };
+	    Scanner.prototype.isImplicitOctalLiteral = function () {
+	        // Implicit octal, unless there is a non-octal digit.
+	        // (Annex B.1.1 on Numeric Literals)
+	        for (var i = this.index + 1; i < this.length; ++i) {
+	            var ch = this.source[i];
+	            if (ch === '8' || ch === '9') {
+	                return false;
+	            }
+	            if (!character_1.Character.isOctalDigit(ch.charCodeAt(0))) {
+	                return true;
+	            }
+	        }
+	        return true;
+	    };
+	    Scanner.prototype.scanNumericLiteral = function () {
+	        var start = this.index;
+	        var ch = this.source[start];
+	        assert_1.assert(character_1.Character.isDecimalDigit(ch.charCodeAt(0)) || (ch === '.'), 'Numeric literal must start with a decimal digit or a decimal point');
+	        var num = '';
+	        if (ch !== '.') {
+	            num = this.source[this.index++];
+	            ch = this.source[this.index];
+	            // Hex number starts with '0x'.
+	            // Octal number starts with '0'.
+	            // Octal number in ES6 starts with '0o'.
+	            // Binary number in ES6 starts with '0b'.
+	            if (num === '0') {
+	                if (ch === 'x' || ch === 'X') {
+	                    ++this.index;
+	                    return this.scanHexLiteral(start);
+	                }
+	                if (ch === 'b' || ch === 'B') {
+	                    ++this.index;
+	                    return this.scanBinaryLiteral(start);
+	                }
+	                if (ch === 'o' || ch === 'O') {
+	                    return this.scanOctalLiteral(ch, start);
+	                }
+	                if (ch && character_1.Character.isOctalDigit(ch.charCodeAt(0))) {
+	                    if (this.isImplicitOctalLiteral()) {
+	                        return this.scanOctalLiteral(ch, start);
+	                    }
+	                }
+	            }
+	            while (character_1.Character.isDecimalDigit(this.source.charCodeAt(this.index))) {
+	                num += this.source[this.index++];
+	            }
+	            ch = this.source[this.index];
+	        }
+	        if (ch === '.') {
+	            num += this.source[this.index++];
+	            while (character_1.Character.isDecimalDigit(this.source.charCodeAt(this.index))) {
+	                num += this.source[this.index++];
+	            }
+	            ch = this.source[this.index];
+	        }
+	        if (ch === 'e' || ch === 'E') {
+	            num += this.source[this.index++];
+	            ch = this.source[this.index];
+	            if (ch === '+' || ch === '-') {
+	                num += this.source[this.index++];
+	            }
+	            if (character_1.Character.isDecimalDigit(this.source.charCodeAt(this.index))) {
+	                while (character_1.Character.isDecimalDigit(this.source.charCodeAt(this.index))) {
+	                    num += this.source[this.index++];
+	                }
+	            }
+	            else {
+	                this.throwUnexpectedToken();
+	            }
+	        }
+	        if (character_1.Character.isIdentifierStart(this.source.charCodeAt(this.index))) {
+	            this.throwUnexpectedToken();
+	        }
+	        return {
+	            type: 6 /* NumericLiteral */,
+	            value: parseFloat(num),
+	            lineNumber: this.lineNumber,
+	            lineStart: this.lineStart,
+	            start: start,
+	            end: this.index
+	        };
+	    };
+	    // https://tc39.github.io/ecma262/#sec-literals-string-literals
+	    Scanner.prototype.scanStringLiteral = function () {
+	        var start = this.index;
+	        var quote = this.source[start];
+	        assert_1.assert((quote === '\'' || quote === '"'), 'String literal must starts with a quote');
+	        ++this.index;
+	        var octal = false;
+	        var str = '';
+	        while (!this.eof()) {
+	            var ch = this.source[this.index++];
+	            if (ch === quote) {
+	                quote = '';
+	                break;
+	            }
+	            else if (ch === '\\') {
+	                ch = this.source[this.index++];
+	                if (!ch || !character_1.Character.isLineTerminator(ch.charCodeAt(0))) {
+	                    switch (ch) {
+	                        case 'u':
+	                            if (this.source[this.index] === '{') {
+	                                ++this.index;
+	                                str += this.scanUnicodeCodePointEscape();
+	                            }
+	                            else {
+	                                var unescaped_1 = this.scanHexEscape(ch);
+	                                if (unescaped_1 === null) {
+	                                    this.throwUnexpectedToken();
+	                                }
+	                                str += unescaped_1;
+	                            }
+	                            break;
+	                        case 'x':
+	                            var unescaped = this.scanHexEscape(ch);
+	                            if (unescaped === null) {
+	                                this.throwUnexpectedToken(messages_1.Messages.InvalidHexEscapeSequence);
+	                            }
+	                            str += unescaped;
+	                            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 'v':
+	                            str += '\x0B';
+	                            break;
+	                        case '8':
+	                        case '9':
+	                            str += ch;
+	                            this.tolerateUnexpectedToken();
+	                            break;
+	                        default:
+	                            if (ch && character_1.Character.isOctalDigit(ch.charCodeAt(0))) {
+	                                var octToDec = this.octalToDecimal(ch);
+	                                octal = octToDec.octal || octal;
+	                                str += String.fromCharCode(octToDec.code);
+	                            }
+	                            else {
+	                                str += ch;
+	                            }
+	                            break;
+	                    }
+	                }
+	                else {
+	                    ++this.lineNumber;
+	                    if (ch === '\r' && this.source[this.index] === '\n') {
+	                        ++this.index;
+	                    }
+	                    this.lineStart = this.index;
+	                }
+	            }
+	            else if (character_1.Character.isLineTerminator(ch.charCodeAt(0))) {
+	                break;
+	            }
+	            else {
+	                str += ch;
+	            }
+	        }
+	        if (quote !== '') {
+	            this.index = start;
+	            this.throwUnexpectedToken();
+	        }
+	        return {
+	            type: 8 /* StringLiteral */,
+	            value: str,
+	            octal: octal,
+	            lineNumber: this.lineNumber,
+	            lineStart: this.lineStart,
+	            start: start,
+	            end: this.index
+	        };
+	    };
+	    // https://tc39.github.io/ecma262/#sec-template-literal-lexical-components
+	    Scanner.prototype.scanTemplate = function () {
+	        var cooked = '';
+	        var terminated = false;
+	        var start = this.index;
+	        var head = (this.source[start] === '`');
+	        var tail = false;
+	        var rawOffset = 2;
+	        ++this.index;
+	        while (!this.eof()) {
+	            var ch = this.source[this.index++];
+	            if (ch === '`') {
+	                rawOffset = 1;
+	                tail = true;
+	                terminated = true;
+	                break;
+	            }
+	            else if (ch === '$') {
+	                if (this.source[this.index] === '{') {
+	                    this.curlyStack.push('${');
+	                    ++this.index;
+	                    terminated = true;
+	                    break;
+	                }
+	                cooked += ch;
+	            }
+	            else if (ch === '\\') {
+	                ch = this.source[this.index++];
+	                if (!character_1.Character.isLineTerminator(ch.charCodeAt(0))) {
+	                    switch (ch) {
+	                        case 'n':
+	                            cooked += '\n';
+	                            break;
+	                        case 'r':
+	                            cooked += '\r';
+	                            break;
+	                        case 't':
+	                            cooked += '\t';
+	                            break;
+	                        case 'u':
+	                            if (this.source[this.index] === '{') {
+	                                ++this.index;
+	                                cooked += this.scanUnicodeCodePointEscape();
+	                            }
+	                            else {
+	                                var restore = this.index;
+	                                var unescaped_2 = this.scanHexEscape(ch);
+	                                if (unescaped_2 !== null) {
+	                                    cooked += unescaped_2;
+	                                }
+	                                else {
+	                                    this.index = restore;
+	                                    cooked += ch;
+	                                }
+	                            }
+	                            break;
+	                        case 'x':
+	                            var unescaped = this.scanHexEscape(ch);
+	                            if (unescaped === null) {
+	                                this.throwUnexpectedToken(messages_1.Messages.InvalidHexEscapeSequence);
+	                            }
+	                            cooked += unescaped;
+	                            break;
+	                        case 'b':
+	                            cooked += '\b';
+	                            break;
+	                        case 'f':
+	                            cooked += '\f';
+	                            break;
+	                        case 'v':
+	                            cooked += '\v';
+	                            break;
+	                        default:
+	                            if (ch === '0') {
+	                                if (character_1.Character.isDecimalDigit(this.source.charCodeAt(this.index))) {
+	                                    // Illegal: \01 \02 and so on
+	                                    this.throwUnexpectedToken(messages_1.Messages.TemplateOctalLiteral);
+	                                }
+	                                cooked += '\0';
+	                            }
+	                            else if (character_1.Character.isOctalDigit(ch.charCodeAt(0))) {
+	                                // Illegal: \1 \2
+	                                this.throwUnexpectedToken(messages_1.Messages.TemplateOctalLiteral);
+	                            }
+	                            else {
+	                                cooked += ch;
+	                            }
+	                            break;
+	                    }
+	                }
+	                else {
+	                    ++this.lineNumber;
+	                    if (ch === '\r' && this.source[this.index] === '\n') {
+	                        ++this.index;
+	                    }
+	                    this.lineStart = this.index;
+	                }
+	            }
+	            else if (character_1.Character.isLineTerminator(ch.charCodeAt(0))) {
+	                ++this.lineNumber;
+	                if (ch === '\r' && this.source[this.index] === '\n') {
+	                    ++this.index;
+	                }
+	                this.lineStart = this.index;
+	                cooked += '\n';
+	            }
+	            else {
+	                cooked += ch;
+	            }
+	        }
+	        if (!terminated) {
+	            this.throwUnexpectedToken();
+	        }
+	        if (!head) {
+	            this.curlyStack.pop();
+	        }
+	        return {
+	            type: 10 /* Template */,
+	            value: this.source.slice(start + 1, this.index - rawOffset),
+	            cooked: cooked,
+	            head: head,
+	            tail: tail,
+	            lineNumber: this.lineNumber,
+	            lineStart: this.lineStart,
+	            start: start,
+	            end: this.index
+	        };
+	    };
+	    // https://tc39.github.io/ecma262/#sec-literals-regular-expression-literals
+	    Scanner.prototype.testRegExp = function (pattern, flags) {
+	        // The BMP character to use as a replacement for astral symbols when
+	        // translating an ES6 "u"-flagged pattern to an ES5-compatible
+	        // approximation.
+	        // Note: replacing with '\uFFFF' enables false positives in unlikely
+	        // scenarios. For example, `[\u{1044f}-\u{10440}]` is an invalid
+	        // pattern that would not be detected by this substitution.
+	        var astralSubstitute = '\uFFFF';
+	        var tmp = pattern;
+	        var self = this;
+	        if (flags.indexOf('u') >= 0) {
+	            tmp = tmp
+	                .replace(/\\u\{([0-9a-fA-F]+)\}|\\u([a-fA-F0-9]{4})/g, function ($0, $1, $2) {
+	                var codePoint = parseInt($1 || $2, 16);
+	                if (codePoint > 0x10FFFF) {
+	                    self.throwUnexpectedToken(messages_1.Messages.InvalidRegExp);
+	                }
+	                if (codePoint <= 0xFFFF) {
+	                    return String.fromCharCode(codePoint);
+	                }
+	                return astralSubstitute;
+	            })
+	                .replace(/[\uD800-\uDBFF][\uDC00-\uDFFF]/g, astralSubstitute);
+	        }
+	        // First, detect invalid regular expressions.
+	        try {
+	            RegExp(tmp);
+	        }
+	        catch (e) {
+	            this.throwUnexpectedToken(messages_1.Messages.InvalidRegExp);
+	        }
+	        // Return a regular expression object for this pattern-flag pair, or
+	        // `null` in case the current environment doesn't support the flags it
+	        // uses.
+	        try {
+	            return new RegExp(pattern, flags);
+	        }
+	        catch (exception) {
+	            /* istanbul ignore next */
+	            return null;
+	        }
+	    };
+	    Scanner.prototype.scanRegExpBody = function () {
+	        var ch = this.source[this.index];
+	        assert_1.assert(ch === '/', 'Regular expression literal must start with a slash');
+	        var str = this.source[this.index++];
+	        var classMarker = false;
+	        var terminated = false;
+	        while (!this.eof()) {
+	            ch = this.source[this.index++];
+	            str += ch;
+	            if (ch === '\\') {
+	                ch = this.source[this.index++];
+	                // https://tc39.github.io/ecma262/#sec-literals-regular-expression-literals
+	                if (character_1.Character.isLineTerminator(ch.charCodeAt(0))) {
+	                    this.throwUnexpectedToken(messages_1.Messages.UnterminatedRegExp);
+	                }
+	                str += ch;
+	            }
+	            else if (character_1.Character.isLineTerminator(ch.charCodeAt(0))) {
+	                this.throwUnexpectedToken(messages_1.Messages.UnterminatedRegExp);
+	            }
+	            else if (classMarker) {
+	                if (ch === ']') {
+	                    classMarker = false;
+	                }
+	            }
+	            else {
+	                if (ch === '/') {
+	                    terminated = true;
+	                    break;
+	                }
+	                else if (ch === '[') {
+	                    classMarker = true;
+	                }
+	            }
+	        }
+	        if (!terminated) {
+	            this.throwUnexpectedToken(messages_1.Messages.UnterminatedRegExp);
+	        }
+	        // Exclude leading and trailing slash.
+	        return str.substr(1, str.length - 2);
+	    };
+	    Scanner.prototype.scanRegExpFlags = function () {
+	        var str = '';
+	        var flags = '';
+	        while (!this.eof()) {
+	            var ch = this.source[this.index];
+	            if (!character_1.Character.isIdentifierPart(ch.charCodeAt(0))) {
+	                break;
+	            }
+	            ++this.index;
+	            if (ch === '\\' && !this.eof()) {
+	                ch = this.source[this.index];
+	                if (ch === 'u') {
+	                    ++this.index;
+	                    var restore = this.index;
+	                    var char = this.scanHexEscape('u');
+	                    if (char !== null) {
+	                        flags += char;
+	                        for (str += '\\u'; restore < this.index; ++restore) {
+	                            str += this.source[restore];
+	                        }
+	                    }
+	                    else {
+	                        this.index = restore;
+	                        flags += 'u';
+	                        str += '\\u';
+	                    }
+	                    this.tolerateUnexpectedToken();
+	                }
+	                else {
+	                    str += '\\';
+	                    this.tolerateUnexpectedToken();
+	                }
+	            }
+	            else {
+	                flags += ch;
+	                str += ch;
+	            }
+	        }
+	        return flags;
+	    };
+	    Scanner.prototype.scanRegExp = function () {
+	        var start = this.index;
+	        var pattern = this.scanRegExpBody();
+	        var flags = this.scanRegExpFlags();
+	        var value = this.testRegExp(pattern, flags);
+	        return {
+	            type: 9 /* RegularExpression */,
+	            value: '',
+	            pattern: pattern,
+	            flags: flags,
+	            regex: value,
+	            lineNumber: this.lineNumber,
+	            lineStart: this.lineStart,
+	            start: start,
+	            end: this.index
+	        };
+	    };
+	    Scanner.prototype.lex = function () {
+	        if (this.eof()) {
+	            return {
+	                type: 2 /* EOF */,
+	                value: '',
+	                lineNumber: this.lineNumber,
+	                lineStart: this.lineStart,
+	                start: this.index,
+	                end: this.index
+	            };
+	        }
+	        var cp = this.source.charCodeAt(this.index);
+	        if (character_1.Character.isIdentifierStart(cp)) {
+	            return this.scanIdentifier();
+	        }
+	        // Very common: ( and ) and ;
+	        if (cp === 0x28 || cp === 0x29 || cp === 0x3B) {
+	            return this.scanPunctuator();
+	        }
+	        // String literal starts with single quote (U+0027) or double quote (U+0022).
+	        if (cp === 0x27 || cp === 0x22) {
+	            return this.scanStringLiteral();
+	        }
+	        // Dot (.) U+002E can also start a floating-point number, hence the need
+	        // to check the next character.
+	        if (cp === 0x2E) {
+	            if (character_1.Character.isDecimalDigit(this.source.charCodeAt(this.index + 1))) {
+	                return this.scanNumericLiteral();
+	            }
+	            return this.scanPunctuator();
+	        }
+	        if (character_1.Character.isDecimalDigit(cp)) {
+	            return this.scanNumericLiteral();
+	        }
+	        // Template literals start with ` (U+0060) for template head
+	        // or } (U+007D) for template middle or template tail.
+	        if (cp === 0x60 || (cp === 0x7D && this.curlyStack[this.curlyStack.length - 1] === '${')) {
+	            return this.scanTemplate();
+	        }
+	        // Possible identifier start in a surrogate pair.
+	        if (cp >= 0xD800 && cp < 0xDFFF) {
+	            if (character_1.Character.isIdentifierStart(this.codePointAt(this.index))) {
+	                return this.scanIdentifier();
+	            }
+	        }
+	        return this.scanPunctuator();
+	    };
+	    return Scanner;
+	}());
+	exports.Scanner = Scanner;
+
+
+/***/ },
+/* 13 */
+/***/ function(module, exports) {
+
+	"use strict";
+	Object.defineProperty(exports, "__esModule", { value: true });
+	exports.TokenName = {};
+	exports.TokenName[1 /* BooleanLiteral */] = 'Boolean';
+	exports.TokenName[2 /* EOF */] = '<end>';
+	exports.TokenName[3 /* Identifier */] = 'Identifier';
+	exports.TokenName[4 /* Keyword */] = 'Keyword';
+	exports.TokenName[5 /* NullLiteral */] = 'Null';
+	exports.TokenName[6 /* NumericLiteral */] = 'Numeric';
+	exports.TokenName[7 /* Punctuator */] = 'Punctuator';
+	exports.TokenName[8 /* StringLiteral */] = 'String';
+	exports.TokenName[9 /* RegularExpression */] = 'RegularExpression';
+	exports.TokenName[10 /* Template */] = 'Template';
+
+
+/***/ },
+/* 14 */
+/***/ function(module, exports) {
+
+	"use strict";
+	// Generated by generate-xhtml-entities.js. DO NOT MODIFY!
+	Object.defineProperty(exports, "__esModule", { value: true });
+	exports.XHTMLEntities = {
+	    quot: '\u0022',
+	    amp: '\u0026',
+	    apos: '\u0027',
+	    gt: '\u003E',
+	    nbsp: '\u00A0',
+	    iexcl: '\u00A1',
+	    cent: '\u00A2',
+	    pound: '\u00A3',
+	    curren: '\u00A4',
+	    yen: '\u00A5',
+	    brvbar: '\u00A6',
+	    sect: '\u00A7',
+	    uml: '\u00A8',
+	    copy: '\u00A9',
+	    ordf: '\u00AA',
+	    laquo: '\u00AB',
+	    not: '\u00AC',
+	    shy: '\u00AD',
+	    reg: '\u00AE',
+	    macr: '\u00AF',
+	    deg: '\u00B0',
+	    plusmn: '\u00B1',
+	    sup2: '\u00B2',
+	    sup3: '\u00B3',
+	    acute: '\u00B4',
+	    micro: '\u00B5',
+	    para: '\u00B6',
+	    middot: '\u00B7',
+	    cedil: '\u00B8',
+	    sup1: '\u00B9',
+	    ordm: '\u00BA',
+	    raquo: '\u00BB',
+	    frac14: '\u00BC',
+	    frac12: '\u00BD',
+	    frac34: '\u00BE',
+	    iquest: '\u00BF',
+	    Agrave: '\u00C0',
+	    Aacute: '\u00C1',
+	    Acirc: '\u00C2',
+	    Atilde: '\u00C3',
+	    Auml: '\u00C4',
+	    Aring: '\u00C5',
+	    AElig: '\u00C6',
+	    Ccedil: '\u00C7',
+	    Egrave: '\u00C8',
+	    Eacute: '\u00C9',
+	    Ecirc: '\u00CA',
+	    Euml: '\u00CB',
+	    Igrave: '\u00CC',
+	    Iacute: '\u00CD',
+	    Icirc: '\u00CE',
+	    Iuml: '\u00CF',
+	    ETH: '\u00D0',
+	    Ntilde: '\u00D1',
+	    Ograve: '\u00D2',
+	    Oacute: '\u00D3',
+	    Ocirc: '\u00D4',
+	    Otilde: '\u00D5',
+	    Ouml: '\u00D6',
+	    times: '\u00D7',
+	    Oslash: '\u00D8',
+	    Ugrave: '\u00D9',
+	    Uacute: '\u00DA',
+	    Ucirc: '\u00DB',
+	    Uuml: '\u00DC',
+	    Yacute: '\u00DD',
+	    THORN: '\u00DE',
+	    szlig: '\u00DF',
+	    agrave: '\u00E0',
+	    aacute: '\u00E1',
+	    acirc: '\u00E2',
+	    atilde: '\u00E3',
+	    auml: '\u00E4',
+	    aring: '\u00E5',
+	    aelig: '\u00E6',
+	    ccedil: '\u00E7',
+	    egrave: '\u00E8',
+	    eacute: '\u00E9',
+	    ecirc: '\u00EA',
+	    euml: '\u00EB',
+	    igrave: '\u00EC',
+	    iacute: '\u00ED',
+	    icirc: '\u00EE',
+	    iuml: '\u00EF',
+	    eth: '\u00F0',
+	    ntilde: '\u00F1',
+	    ograve: '\u00F2',
+	    oacute: '\u00F3',
+	    ocirc: '\u00F4',
+	    otilde: '\u00F5',
+	    ouml: '\u00F6',
+	    divide: '\u00F7',
+	    oslash: '\u00F8',
+	    ugrave: '\u00F9',
+	    uacute: '\u00FA',
+	    ucirc: '\u00FB',
+	    uuml: '\u00FC',
+	    yacute: '\u00FD',
+	    thorn: '\u00FE',
+	    yuml: '\u00FF',
+	    OElig: '\u0152',
+	    oelig: '\u0153',
+	    Scaron: '\u0160',
+	    scaron: '\u0161',
+	    Yuml: '\u0178',
+	    fnof: '\u0192',
+	    circ: '\u02C6',
+	    tilde: '\u02DC',
+	    Alpha: '\u0391',
+	    Beta: '\u0392',
+	    Gamma: '\u0393',
+	    Delta: '\u0394',
+	    Epsilon: '\u0395',
+	    Zeta: '\u0396',
+	    Eta: '\u0397',
+	    Theta: '\u0398',
+	    Iota: '\u0399',
+	    Kappa: '\u039A',
+	    Lambda: '\u039B',
+	    Mu: '\u039C',
+	    Nu: '\u039D',
+	    Xi: '\u039E',
+	    Omicron: '\u039F',
+	    Pi: '\u03A0',
+	    Rho: '\u03A1',
+	    Sigma: '\u03A3',
+	    Tau: '\u03A4',
+	    Upsilon: '\u03A5',
+	    Phi: '\u03A6',
+	    Chi: '\u03A7',
+	    Psi: '\u03A8',
+	    Omega: '\u03A9',
+	    alpha: '\u03B1',
+	    beta: '\u03B2',
+	    gamma: '\u03B3',
+	    delta: '\u03B4',
+	    epsilon: '\u03B5',
+	    zeta: '\u03B6',
+	    eta: '\u03B7',
+	    theta: '\u03B8',
+	    iota: '\u03B9',
+	    kappa: '\u03BA',
+	    lambda: '\u03BB',
+	    mu: '\u03BC',
+	    nu: '\u03BD',
+	    xi: '\u03BE',
+	    omicron: '\u03BF',
+	    pi: '\u03C0',
+	    rho: '\u03C1',
+	    sigmaf: '\u03C2',
+	    sigma: '\u03C3',
+	    tau: '\u03C4',
+	    upsilon: '\u03C5',
+	    phi: '\u03C6',
+	    chi: '\u03C7',
+	    psi: '\u03C8',
+	    omega: '\u03C9',
+	    thetasym: '\u03D1',
+	    upsih: '\u03D2',
+	    piv: '\u03D6',
+	    ensp: '\u2002',
+	    emsp: '\u2003',
+	    thinsp: '\u2009',
+	    zwnj: '\u200C',
+	    zwj: '\u200D',
+	    lrm: '\u200E',
+	    rlm: '\u200F',
+	    ndash: '\u2013',
+	    mdash: '\u2014',
+	    lsquo: '\u2018',
+	    rsquo: '\u2019',
+	    sbquo: '\u201A',
+	    ldquo: '\u201C',
+	    rdquo: '\u201D',
+	    bdquo: '\u201E',
+	    dagger: '\u2020',
+	    Dagger: '\u2021',
+	    bull: '\u2022',
+	    hellip: '\u2026',
+	    permil: '\u2030',
+	    prime: '\u2032',
+	    Prime: '\u2033',
+	    lsaquo: '\u2039',
+	    rsaquo: '\u203A',
+	    oline: '\u203E',
+	    frasl: '\u2044',
+	    euro: '\u20AC',
+	    image: '\u2111',
+	    weierp: '\u2118',
+	    real: '\u211C',
+	    trade: '\u2122',
+	    alefsym: '\u2135',
+	    larr: '\u2190',
+	    uarr: '\u2191',
+	    rarr: '\u2192',
+	    darr: '\u2193',
+	    harr: '\u2194',
+	    crarr: '\u21B5',
+	    lArr: '\u21D0',
+	    uArr: '\u21D1',
+	    rArr: '\u21D2',
+	    dArr: '\u21D3',
+	    hArr: '\u21D4',
+	    forall: '\u2200',
+	    part: '\u2202',
+	    exist: '\u2203',
+	    empty: '\u2205',
+	    nabla: '\u2207',
+	    isin: '\u2208',
+	    notin: '\u2209',
+	    ni: '\u220B',
+	    prod: '\u220F',
+	    sum: '\u2211',
+	    minus: '\u2212',
+	    lowast: '\u2217',
+	    radic: '\u221A',
+	    prop: '\u221D',
+	    infin: '\u221E',
+	    ang: '\u2220',
+	    and: '\u2227',
+	    or: '\u2228',
+	    cap: '\u2229',
+	    cup: '\u222A',
+	    int: '\u222B',
+	    there4: '\u2234',
+	    sim: '\u223C',
+	    cong: '\u2245',
+	    asymp: '\u2248',
+	    ne: '\u2260',
+	    equiv: '\u2261',
+	    le: '\u2264',
+	    ge: '\u2265',
+	    sub: '\u2282',
+	    sup: '\u2283',
+	    nsub: '\u2284',
+	    sube: '\u2286',
+	    supe: '\u2287',
+	    oplus: '\u2295',
+	    otimes: '\u2297',
+	    perp: '\u22A5',
+	    sdot: '\u22C5',
+	    lceil: '\u2308',
+	    rceil: '\u2309',
+	    lfloor: '\u230A',
+	    rfloor: '\u230B',
+	    loz: '\u25CA',
+	    spades: '\u2660',
+	    clubs: '\u2663',
+	    hearts: '\u2665',
+	    diams: '\u2666',
+	    lang: '\u27E8',
+	    rang: '\u27E9'
+	};
+
+
+/***/ },
+/* 15 */
+/***/ function(module, exports, __webpack_require__) {
+
+	"use strict";
+	Object.defineProperty(exports, "__esModule", { value: true });
+	var error_handler_1 = __webpack_require__(10);
+	var scanner_1 = __webpack_require__(12);
+	var token_1 = __webpack_require__(13);
+	var Reader = (function () {
+	    function Reader() {
+	        this.values = [];
+	        this.curly = this.paren = -1;
+	    }
+	    // A function following one of those tokens is an expression.
+	    Reader.prototype.beforeFunctionExpression = function (t) {
+	        return ['(', '{', '[', 'in', 'typeof', 'instanceof', 'new',
+	            'return', 'case', 'delete', 'throw', 'void',
+	            // assignment operators
+	            '=', '+=', '-=', '*=', '**=', '/=', '%=', '<<=', '>>=', '>>>=',
+	            '&=', '|=', '^=', ',',
+	            // binary/unary operators
+	            '+', '-', '*', '**', '/', '%', '++', '--', '<<', '>>', '>>>', '&',
+	            '|', '^', '!', '~', '&&', '||', '?', ':', '===', '==', '>=',
+	            '<=', '<', '>', '!=', '!=='].indexOf(t) >= 0;
+	    };
+	    // Determine if forward slash (/) is an operator or part of a regular expression
+	    // https://github.com/mozilla/sweet.js/wiki/design
+	    Reader.prototype.isRegexStart = function () {
+	        var previous = this.values[this.values.length - 1];
+	        var regex = (previous !== null);
+	        switch (previous) {
+	            case 'this':
+	            case ']':
+	                regex = false;
+	                break;
+	            case ')':
+	                var keyword = this.values[this.paren - 1];
+	                regex = (keyword === 'if' || keyword === 'while' || keyword === 'for' || keyword === 'with');
+	                break;
+	            case '}':
+	                // Dividing a function by anything makes little sense,
+	                // but we have to check for that.
+	                regex = false;
+	                if (this.values[this.curly - 3] === 'function') {
+	                    // Anonymous function, e.g. function(){} /42
+	                    var check = this.values[this.curly - 4];
+	                    regex = check ? !this.beforeFunctionExpression(check) : false;
+	                }
+	                else if (this.values[this.curly - 4] === 'function') {
+	                    // Named function, e.g. function f(){} /42/
+	                    var check = this.values[this.curly - 5];
+	                    regex = check ? !this.beforeFunctionExpression(check) : true;
+	                }
+	                break;
+	            default:
+	                break;
+	        }
+	        return regex;
+	    };
+	    Reader.prototype.push = function (token) {
+	        if (token.type === 7 /* Punctuator */ || token.type === 4 /* Keyword */) {
+	            if (token.value === '{') {
+	                this.curly = this.values.length;
+	            }
+	            else if (token.value === '(') {
+	                this.paren = this.values.length;
+	            }
+	            this.values.push(token.value);
+	        }
+	        else {
+	            this.values.push(null);
+	        }
+	    };
+	    return Reader;
+	}());
+	var Tokenizer = (function () {
+	    function Tokenizer(code, config) {
+	        this.errorHandler = new error_handler_1.ErrorHandler();
+	        this.errorHandler.tolerant = config ? (typeof config.tolerant === 'boolean' && config.tolerant) : false;
+	        this.scanner = new scanner_1.Scanner(code, this.errorHandler);
+	        this.scanner.trackComment = config ? (typeof config.comment === 'boolean' && config.comment) : false;
+	        this.trackRange = config ? (typeof config.range === 'boolean' && config.range) : false;
+	        this.trackLoc = config ? (typeof config.loc === 'boolean' && config.loc) : false;
+	        this.buffer = [];
+	        this.reader = new Reader();
+	    }
+	    Tokenizer.prototype.errors = function () {
+	        return this.errorHandler.errors;
+	    };
+	    Tokenizer.prototype.getNextToken = function () {
+	        if (this.buffer.length === 0) {
+	            var comments = this.scanner.scanComments();
+	            if (this.scanner.trackComment) {
+	                for (var i = 0; i < comments.length; ++i) {
+	                    var e = comments[i];
+	                    var value = this.scanner.source.slice(e.slice[0], e.slice[1]);
+	                    var comment = {
+	                        type: e.multiLine ? 'BlockComment' : 'LineComment',
+	                        value: value
+	                    };
+	                    if (this.trackRange) {
+	                        comment.range = e.range;
+	                    }
+	                    if (this.trackLoc) {
+	                        comment.loc = e.loc;
+	                    }
+	                    this.buffer.push(comment);
+	                }
+	            }
+	            if (!this.scanner.eof()) {
+	                var loc = void 0;
+	                if (this.trackLoc) {
+	                    loc = {
+	                        start: {
+	                            line: this.scanner.lineNumber,
+	                            column: this.scanner.index - this.scanner.lineStart
+	                        },
+	                        end: {}
+	                    };
+	                }
+	                var startRegex = (this.scanner.source[this.scanner.index] === '/') && this.reader.isRegexStart();
+	                var token = startRegex ? this.scanner.scanRegExp() : this.scanner.lex();
+	                this.reader.push(token);
+	                var entry = {
+	                    type: token_1.TokenName[token.type],
+	                    value: this.scanner.source.slice(token.start, token.end)
+	                };
+	                if (this.trackRange) {
+	                    entry.range = [token.start, token.end];
+	                }
+	                if (this.trackLoc) {
+	                    loc.end = {
+	                        line: this.scanner.lineNumber,
+	                        column: this.scanner.index - this.scanner.lineStart
+	                    };
+	                    entry.loc = loc;
+	                }
+	                if (token.type === 9 /* RegularExpression */) {
+	                    var pattern = token.pattern;
+	                    var flags = token.flags;
+	                    entry.regex = { pattern: pattern, flags: flags };
+	                }
+	                this.buffer.push(entry);
+	            }
+	        }
+	        return this.buffer.shift();
+	    };
+	    return Tokenizer;
+	}());
+	exports.Tokenizer = Tokenizer;
+
+
+/***/ }
+/******/ ])
+});
+;
+
+/***/ }),
+/* 269 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var hasOwn = Object.prototype.hasOwnProperty;
+var toStr = Object.prototype.toString;
+var defineProperty = Object.defineProperty;
+var gOPD = Object.getOwnPropertyDescriptor;
+
+var isArray = function isArray(arr) {
+	if (typeof Array.isArray === 'function') {
+		return Array.isArray(arr);
+	}
+
+	return toStr.call(arr) === '[object Array]';
+};
+
+var isPlainObject = function isPlainObject(obj) {
+	if (!obj || toStr.call(obj) !== '[object Object]') {
+		return false;
+	}
+
+	var hasOwnConstructor = hasOwn.call(obj, 'constructor');
+	var hasIsPrototypeOf = obj.constructor && obj.constructor.prototype && hasOwn.call(obj.constructor.prototype, 'isPrototypeOf');
+	// Not own constructor property must be Object
+	if (obj.constructor && !hasOwnConstructor && !hasIsPrototypeOf) {
+		return false;
+	}
+
+	// Own properties are enumerated firstly, so to speed up,
+	// if last one is own, then all properties are own.
+	var key;
+	for (key in obj) { /**/ }
+
+	return typeof key === 'undefined' || hasOwn.call(obj, key);
+};
+
+// If name is '__proto__', and Object.defineProperty is available, define __proto__ as an own property on target
+var setProperty = function setProperty(target, options) {
+	if (defineProperty && options.name === '__proto__') {
+		defineProperty(target, options.name, {
+			enumerable: true,
+			configurable: true,
+			value: options.newValue,
+			writable: true
+		});
+	} else {
+		target[options.name] = options.newValue;
+	}
+};
+
+// Return undefined instead of __proto__ if '__proto__' is not an own property
+var getProperty = function getProperty(obj, name) {
+	if (name === '__proto__') {
+		if (!hasOwn.call(obj, name)) {
+			return void 0;
+		} else if (gOPD) {
+			// In early versions of node, obj['__proto__'] is buggy when obj has
+			// __proto__ as an own property. Object.getOwnPropertyDescriptor() works.
+			return gOPD(obj, name).value;
+		}
+	}
+
+	return obj[name];
+};
+
+module.exports = function extend() {
+	var options, name, src, copy, copyIsArray, clone;
+	var target = arguments[0];
+	var i = 1;
+	var length = arguments.length;
+	var deep = false;
+
+	// Handle a deep copy situation
+	if (typeof target === 'boolean') {
+		deep = target;
+		target = arguments[1] || {};
+		// skip the boolean and the target
+		i = 2;
+	}
+	if (target == null || (typeof target !== 'object' && typeof target !== 'function')) {
+		target = {};
+	}
+
+	for (; i < length; ++i) {
+		options = arguments[i];
+		// Only deal with non-null/undefined values
+		if (options != null) {
+			// Extend the base object
+			for (name in options) {
+				src = getProperty(target, name);
+				copy = getProperty(options, name);
+
+				// Prevent never-ending loop
+				if (target !== copy) {
+					// Recurse if we're merging plain objects or arrays
+					if (deep && copy && (isPlainObject(copy) || (copyIsArray = isArray(copy)))) {
+						if (copyIsArray) {
+							copyIsArray = false;
+							clone = src && isArray(src) ? src : [];
+						} else {
+							clone = src && isPlainObject(src) ? src : {};
+						}
+
+						// Never move original objects, clone them
+						setProperty(target, { name: name, newValue: extend(deep, clone, copy) });
+
+					// Don't bring in undefined values
+					} else if (typeof copy !== 'undefined') {
+						setProperty(target, { name: name, newValue: copy });
+					}
+				}
+			}
+		}
+	}
+
+	// Return the modified object
+	return target;
+};
+
+
+/***/ }),
+/* 270 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+const escapeStringRegexp = __webpack_require__(388);
+
+const platform = process.platform;
+
+const main = {
+	tick: '✔',
+	cross: '✖',
+	star: '★',
+	square: '▇',
+	squareSmall: '◻',
+	squareSmallFilled: '◼',
+	play: '▶',
+	circle: '◯',
+	circleFilled: '◉',
+	circleDotted: '◌',
+	circleDouble: '◎',
+	circleCircle: 'ⓞ',
+	circleCross: 'ⓧ',
+	circlePipe: 'Ⓘ',
+	circleQuestionMark: '?⃝',
+	bullet: '●',
+	dot: '․',
+	line: '─',
+	ellipsis: '…',
+	pointer: '❯',
+	pointerSmall: '›',
+	info: 'ℹ',
+	warning: '⚠',
+	hamburger: '☰',
+	smiley: '㋡',
+	mustache: '෴',
+	heart: '♥',
+	arrowUp: '↑',
+	arrowDown: '↓',
+	arrowLeft: '←',
+	arrowRight: '→',
+	radioOn: '◉',
+	radioOff: '◯',
+	checkboxOn: '☒',
+	checkboxOff: '☐',
+	checkboxCircleOn: 'ⓧ',
+	checkboxCircleOff: 'Ⓘ',
+	questionMarkPrefix: '?⃝',
+	oneHalf: '½',
+	oneThird: '⅓',
+	oneQuarter: '¼',
+	oneFifth: '⅕',
+	oneSixth: '⅙',
+	oneSeventh: '⅐',
+	oneEighth: '⅛',
+	oneNinth: '⅑',
+	oneTenth: '⅒',
+	twoThirds: '⅔',
+	twoFifths: '⅖',
+	threeQuarters: '¾',
+	threeFifths: '⅗',
+	threeEighths: '⅜',
+	fourFifths: '⅘',
+	fiveSixths: '⅚',
+	fiveEighths: '⅝',
+	sevenEighths: '⅞'
+};
+
+const win = {
+	tick: '√',
+	cross: '×',
+	star: '*',
+	square: '█',
+	squareSmall: '[ ]',
+	squareSmallFilled: '[█]',
+	play: '►',
+	circle: '( )',
+	circleFilled: '(*)',
+	circleDotted: '( )',
+	circleDouble: '( )',
+	circleCircle: '(○)',
+	circleCross: '(×)',
+	circlePipe: '(│)',
+	circleQuestionMark: '(?)',
+	bullet: '*',
+	dot: '.',
+	line: '─',
+	ellipsis: '...',
+	pointer: '>',
+	pointerSmall: '»',
+	info: 'i',
+	warning: '‼',
+	hamburger: '≡',
+	smiley: '☺',
+	mustache: '┌─┐',
+	heart: main.heart,
+	arrowUp: main.arrowUp,
+	arrowDown: main.arrowDown,
+	arrowLeft: main.arrowLeft,
+	arrowRight: main.arrowRight,
+	radioOn: '(*)',
+	radioOff: '( )',
+	checkboxOn: '[×]',
+	checkboxOff: '[ ]',
+	checkboxCircleOn: '(×)',
+	checkboxCircleOff: '( )',
+	questionMarkPrefix: '？',
+	oneHalf: '1/2',
+	oneThird: '1/3',
+	oneQuarter: '1/4',
+	oneFifth: '1/5',
+	oneSixth: '1/6',
+	oneSeventh: '1/7',
+	oneEighth: '1/8',
+	oneNinth: '1/9',
+	oneTenth: '1/10',
+	twoThirds: '2/3',
+	twoFifths: '2/5',
+	threeQuarters: '3/4',
+	threeFifths: '3/5',
+	threeEighths: '3/8',
+	fourFifths: '4/5',
+	fiveSixths: '5/6',
+	fiveEighths: '5/8',
+	sevenEighths: '7/8'
+};
+
+if (platform === 'linux') {
+	// the main one doesn't look that good on Ubuntu
+	main.questionMarkPrefix = '?';
+}
+
+const figures = platform === 'win32' ? win : main;
+
+const fn = str => {
+	if (figures === main) {
+		return str;
+	}
+
+	Object.keys(main).forEach(key => {
+		if (main[key] === figures[key]) {
+			return;
+		}
+
+		str = str.replace(new RegExp(escapeStringRegexp(main[key]), 'g'), figures[key]);
+	});
+
+	return str;
+};
+
+module.exports = Object.assign(fn, figures);
+
+
+/***/ }),
+/* 271 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+var pathModule = __webpack_require__(0);
+var isWindows = process.platform === 'win32';
+var fs = __webpack_require__(5);
+
+// JavaScript implementation of realpath, ported from node pre-v6
+
+var DEBUG = process.env.NODE_DEBUG && /fs/.test(process.env.NODE_DEBUG);
+
+function rethrow() {
+  // Only enable in debug mode. A backtrace uses ~1000 bytes of heap space and
+  // is fairly slow to generate.
+  var callback;
+  if (DEBUG) {
+    var backtrace = new Error;
+    callback = debugCallback;
+  } else
+    callback = missingCallback;
+
+  return callback;
+
+  function debugCallback(err) {
+    if (err) {
+      backtrace.message = err.message;
+      err = backtrace;
+      missingCallback(err);
+    }
+  }
+
+  function missingCallback(err) {
+    if (err) {
+      if (process.throwDeprecation)
+        throw err;  // Forgot a callback but don't know where? Use NODE_DEBUG=fs
+      else if (!process.noDeprecation) {
+        var msg = 'fs: missing callback ' + (err.stack || err.message);
+        if (process.traceDeprecation)
+          console.trace(msg);
+        else
+          console.error(msg);
+      }
+    }
+  }
+}
+
+function maybeCallback(cb) {
+  return typeof cb === 'function' ? cb : rethrow();
+}
+
+var normalize = pathModule.normalize;
+
+// Regexp that finds the next partion of a (partial) path
+// result is [base_with_slash, base], e.g. ['somedir/', 'somedir']
+if (isWindows) {
+  var nextPartRe = /(.*?)(?:[\/\\]+|$)/g;
+} else {
+  var nextPartRe = /(.*?)(?:[\/]+|$)/g;
+}
+
+// Regex to find the device root, including trailing slash. E.g. 'c:\\'.
+if (isWindows) {
+  var splitRootRe = /^(?:[a-zA-Z]:|[\\\/]{2}[^\\\/]+[\\\/][^\\\/]+)?[\\\/]*/;
+} else {
+  var splitRootRe = /^[\/]*/;
+}
+
+exports.realpathSync = function realpathSync(p, cache) {
+  // make p is absolute
+  p = pathModule.resolve(p);
+
+  if (cache && Object.prototype.hasOwnProperty.call(cache, p)) {
+    return cache[p];
+  }
+
+  var original = p,
+      seenLinks = {},
+      knownHard = {};
+
+  // current character position in p
+  var pos;
+  // the partial path so far, including a trailing slash if any
+  var current;
+  // the partial path without a trailing slash (except when pointing at a root)
+  var base;
+  // the partial path scanned in the previous round, with slash
+  var previous;
+
+  start();
+
+  function start() {
+    // Skip over roots
+    var m = splitRootRe.exec(p);
+    pos = m[0].length;
+    current = m[0];
+    base = m[0];
+    previous = '';
+
+    // On windows, check that the root exists. On unix there is no need.
+    if (isWindows && !knownHard[base]) {
+      fs.lstatSync(base);
+      knownHard[base] = true;
+    }
+  }
+
+  // walk down the path, swapping out linked pathparts for their real
+  // values
+  // NB: p.length changes.
+  while (pos < p.length) {
+    // find the next part
+    nextPartRe.lastIndex = pos;
+    var result = nextPartRe.exec(p);
+    previous = current;
+    current += result[0];
+    base = previous + result[1];
+    pos = nextPartRe.lastIndex;
+
+    // continue if not a symlink
+    if (knownHard[base] || (cache && cache[base] === base)) {
+      continue;
+    }
+
+    var resolvedLink;
+    if (cache && Object.prototype.hasOwnProperty.call(cache, base)) {
+      // some known symbolic link.  no need to stat again.
+      resolvedLink = cache[base];
+    } else {
+      var stat = fs.lstatSync(base);
+      if (!stat.isSymbolicLink()) {
+        knownHard[base] = true;
+        if (cache) cache[base] = base;
+        continue;
+      }
+
+      // read the link if it wasn't read before
+      // dev/ino always return 0 on windows, so skip the check.
+      var linkTarget = null;
+      if (!isWindows) {
+        var id = stat.dev.toString(32) + ':' + stat.ino.toString(32);
+        if (seenLinks.hasOwnProperty(id)) {
+          linkTarget = seenLinks[id];
+        }
+      }
+      if (linkTarget === null) {
+        fs.statSync(base);
+        linkTarget = fs.readlinkSync(base);
+      }
+      resolvedLink = pathModule.resolve(previous, linkTarget);
+      // track this, if given a cache.
+      if (cache) cache[base] = resolvedLink;
+      if (!isWindows) seenLinks[id] = linkTarget;
+    }
+
+    // resolve the link, then start over
+    p = pathModule.resolve(resolvedLink, p.slice(pos));
+    start();
+  }
+
+  if (cache) cache[original] = p;
+
+  return p;
+};
+
+
+exports.realpath = function realpath(p, cache, cb) {
+  if (typeof cb !== 'function') {
+    cb = maybeCallback(cache);
+    cache = null;
+  }
+
+  // make p is absolute
+  p = pathModule.resolve(p);
+
+  if (cache && Object.prototype.hasOwnProperty.call(cache, p)) {
+    return process.nextTick(cb.bind(null, null, cache[p]));
+  }
+
+  var original = p,
+      seenLinks = {},
+      knownHard = {};
+
+  // current character position in p
+  var pos;
+  // the partial path so far, including a trailing slash if any
+  var current;
+  // the partial path without a trailing slash (except when pointing at a root)
+  var base;
+  // the partial path scanned in the previous round, with slash
+  var previous;
+
+  start();
+
+  function start() {
+    // Skip over roots
+    var m = splitRootRe.exec(p);
+    pos = m[0].length;
+    current = m[0];
+    base = m[0];
+    previous = '';
+
+    // On windows, check that the root exists. On unix there is no need.
+    if (isWindows && !knownHard[base]) {
+      fs.lstat(base, function(err) {
+        if (err) return cb(err);
+        knownHard[base] = true;
+        LOOP();
+      });
+    } else {
+      process.nextTick(LOOP);
+    }
+  }
+
+  // walk down the path, swapping out linked pathparts for their real
+  // values
+  function LOOP() {
+    // stop if scanned past end of path
+    if (pos >= p.length) {
+      if (cache) cache[original] = p;
+      return cb(null, p);
+    }
+
+    // find the next part
+    nextPartRe.lastIndex = pos;
+    var result = nextPartRe.exec(p);
+    previous = current;
+    current += result[0];
+    base = previous + result[1];
+    pos = nextPartRe.lastIndex;
+
+    // continue if not a symlink
+    if (knownHard[base] || (cache && cache[base] === base)) {
+      return process.nextTick(LOOP);
+    }
+
+    if (cache && Object.prototype.hasOwnProperty.call(cache, base)) {
+      // known symbolic link.  no need to stat again.
+      return gotResolvedLink(cache[base]);
+    }
+
+    return fs.lstat(base, gotStat);
+  }
+
+  function gotStat(err, stat) {
+    if (err) return cb(err);
+
+    // if not a symlink, skip to the next path part
+    if (!stat.isSymbolicLink()) {
+      knownHard[base] = true;
+      if (cache) cache[base] = base;
+      return process.nextTick(LOOP);
+    }
+
+    // stat & read the link if not read before
+    // call gotTarget as soon as the link target is known
+    // dev/ino always return 0 on windows, so skip the check.
+    if (!isWindows) {
+      var id = stat.dev.toString(32) + ':' + stat.ino.toString(32);
+      if (seenLinks.hasOwnProperty(id)) {
+        return gotTarget(null, seenLinks[id], base);
+      }
+    }
+    fs.stat(base, function(err) {
+      if (err) return cb(err);
+
+      fs.readlink(base, function(err, target) {
+        if (!isWindows) seenLinks[id] = target;
+        gotTarget(err, target);
+      });
+    });
+  }
+
+  function gotTarget(err, target, base) {
+    if (err) return cb(err);
+
+    var resolvedLink = pathModule.resolve(previous, target);
+    if (cache) cache[base] = resolvedLink;
+    gotResolvedLink(resolvedLink);
+  }
+
+  function gotResolvedLink(resolvedLink) {
+    // resolve the link, then start over
+    p = pathModule.resolve(resolvedLink, p.slice(pos));
+    start();
+  }
+};
+
+
+/***/ }),
+/* 272 */
+/***/ (function(module, exports, __webpack_require__) {
+
+module.exports = globSync
+globSync.GlobSync = GlobSync
+
+var fs = __webpack_require__(5)
+var rp = __webpack_require__(140)
+var minimatch = __webpack_require__(82)
+var Minimatch = minimatch.Minimatch
+var Glob = __webpack_require__(99).Glob
+var util = __webpack_require__(3)
+var path = __webpack_require__(0)
+var assert = __webpack_require__(28)
+var isAbsolute = __webpack_require__(101)
+var common = __webpack_require__(141)
+var alphasort = common.alphasort
+var alphasorti = common.alphasorti
+var setopts = common.setopts
+var ownProp = common.ownProp
+var childrenIgnored = common.childrenIgnored
+var isIgnored = common.isIgnored
+
+function globSync (pattern, options) {
+  if (typeof options === 'function' || arguments.length === 3)
+    throw new TypeError('callback provided to sync glob\n'+
+                        'See: https://github.com/isaacs/node-glob/issues/167')
+
+  return new GlobSync(pattern, options).found
+}
+
+function GlobSync (pattern, options) {
+  if (!pattern)
+    throw new Error('must provide pattern')
+
+  if (typeof options === 'function' || arguments.length === 3)
+    throw new TypeError('callback provided to sync glob\n'+
+                        'See: https://github.com/isaacs/node-glob/issues/167')
+
+  if (!(this instanceof GlobSync))
+    return new GlobSync(pattern, options)
+
+  setopts(this, pattern, options)
+
+  if (this.noprocess)
+    return this
+
+  var n = this.minimatch.set.length
+  this.matches = new Array(n)
+  for (var i = 0; i < n; i ++) {
+    this._process(this.minimatch.set[i], i, false)
+  }
+  this._finish()
+}
+
+GlobSync.prototype._finish = function () {
+  assert(this instanceof GlobSync)
+  if (this.realpath) {
+    var self = this
+    this.matches.forEach(function (matchset, index) {
+      var set = self.matches[index] = Object.create(null)
+      for (var p in matchset) {
+        try {
+          p = self._makeAbs(p)
+          var real = rp.realpathSync(p, self.realpathCache)
+          set[real] = true
+        } catch (er) {
+          if (er.syscall === 'stat')
+            set[self._makeAbs(p)] = true
+          else
+            throw er
+        }
+      }
+    })
+  }
+  common.finish(this)
+}
+
+
+GlobSync.prototype._process = function (pattern, index, inGlobStar) {
+  assert(this instanceof GlobSync)
+
+  // Get the first [n] parts of pattern that are all strings.
+  var n = 0
+  while (typeof pattern[n] === 'string') {
+    n ++
+  }
+  // now n is the index of the first one that is *not* a string.
+
+  // See if there's anything else
+  var prefix
+  switch (n) {
+    // if not, then this is rather simple
+    case pattern.length:
+      this._processSimple(pattern.join('/'), index)
+      return
+
+    case 0:
+      // pattern *starts* with some non-trivial item.
+      // going to readdir(cwd), but not include the prefix in matches.
+      prefix = null
+      break
+
+    default:
+      // pattern has some string bits in the front.
+      // whatever it starts with, whether that's 'absolute' like /foo/bar,
+      // or 'relative' like '../baz'
+      prefix = pattern.slice(0, n).join('/')
+      break
+  }
+
+  var remain = pattern.slice(n)
+
+  // get the list of entries.
+  var read
+  if (prefix === null)
+    read = '.'
+  else if (isAbsolute(prefix) || isAbsolute(pattern.join('/'))) {
+    if (!prefix || !isAbsolute(prefix))
+      prefix = '/' + prefix
+    read = prefix
+  } else
+    read = prefix
+
+  var abs = this._makeAbs(read)
+
+  //if ignored, skip processing
+  if (childrenIgnored(this, read))
+    return
+
+  var isGlobStar = remain[0] === minimatch.GLOBSTAR
+  if (isGlobStar)
+    this._processGlobStar(prefix, read, abs, remain, index, inGlobStar)
+  else
+    this._processReaddir(prefix, read, abs, remain, index, inGlobStar)
+}
+
+
+GlobSync.prototype._processReaddir = function (prefix, read, abs, remain, index, inGlobStar) {
+  var entries = this._readdir(abs, inGlobStar)
+
+  // if the abs isn't a dir, then nothing can match!
+  if (!entries)
+    return
+
+  // It will only match dot entries if it starts with a dot, or if
+  // dot is set.  Stuff like @(.foo|.bar) isn't allowed.
+  var pn = remain[0]
+  var negate = !!this.minimatch.negate
+  var rawGlob = pn._glob
+  var dotOk = this.dot || rawGlob.charAt(0) === '.'
+
+  var matchedEntries = []
+  for (var i = 0; i < entries.length; i++) {
+    var e = entries[i]
+    if (e.charAt(0) !== '.' || dotOk) {
+      var m
+      if (negate && !prefix) {
+        m = !e.match(pn)
+      } else {
+        m = e.match(pn)
+      }
+      if (m)
+        matchedEntries.push(e)
+    }
+  }
+
+  var len = matchedEntries.length
+  // If there are no matched entries, then nothing matches.
+  if (len === 0)
+    return
+
+  // if this is the last remaining pattern bit, then no need for
+  // an additional stat *unless* the user has specified mark or
+  // stat explicitly.  We know they exist, since readdir returned
+  // them.
+
+  if (remain.length === 1 && !this.mark && !this.stat) {
+    if (!this.matches[index])
+      this.matches[index] = Object.create(null)
+
+    for (var i = 0; i < len; i ++) {
+      var e = matchedEntries[i]
+      if (prefix) {
+        if (prefix.slice(-1) !== '/')
+          e = prefix + '/' + e
+        else
+          e = prefix + e
+      }
+
+      if (e.charAt(0) === '/' && !this.nomount) {
+        e = path.join(this.root, e)
+      }
+      this._emitMatch(index, e)
+    }
+    // This was the last one, and no stats were needed
+    return
+  }
+
+  // now test all matched entries as stand-ins for that part
+  // of the pattern.
+  remain.shift()
+  for (var i = 0; i < len; i ++) {
+    var e = matchedEntries[i]
+    var newPattern
+    if (prefix)
+      newPattern = [prefix, e]
+    else
+      newPattern = [e]
+    this._process(newPattern.concat(remain), index, inGlobStar)
+  }
+}
+
+
+GlobSync.prototype._emitMatch = function (index, e) {
+  if (isIgnored(this, e))
+    return
+
+  var abs = this._makeAbs(e)
+
+  if (this.mark)
+    e = this._mark(e)
+
+  if (this.absolute) {
+    e = abs
+  }
+
+  if (this.matches[index][e])
+    return
+
+  if (this.nodir) {
+    var c = this.cache[abs]
+    if (c === 'DIR' || Array.isArray(c))
+      return
+  }
+
+  this.matches[index][e] = true
+
+  if (this.stat)
+    this._stat(e)
+}
+
+
+GlobSync.prototype._readdirInGlobStar = function (abs) {
+  // follow all symlinked directories forever
+  // just proceed as if this is a non-globstar situation
+  if (this.follow)
+    return this._readdir(abs, false)
+
+  var entries
+  var lstat
+  var stat
+  try {
+    lstat = fs.lstatSync(abs)
+  } catch (er) {
+    if (er.code === 'ENOENT') {
+      // lstat failed, doesn't exist
+      return null
+    }
+  }
+
+  var isSym = lstat && lstat.isSymbolicLink()
+  this.symlinks[abs] = isSym
+
+  // If it's not a symlink or a dir, then it's definitely a regular file.
+  // don't bother doing a readdir in that case.
+  if (!isSym && lstat && !lstat.isDirectory())
+    this.cache[abs] = 'FILE'
+  else
+    entries = this._readdir(abs, false)
+
+  return entries
+}
+
+GlobSync.prototype._readdir = function (abs, inGlobStar) {
+  var entries
+
+  if (inGlobStar && !ownProp(this.symlinks, abs))
+    return this._readdirInGlobStar(abs)
+
+  if (ownProp(this.cache, abs)) {
+    var c = this.cache[abs]
+    if (!c || c === 'FILE')
+      return null
+
+    if (Array.isArray(c))
+      return c
+  }
+
+  try {
+    return this._readdirEntries(abs, fs.readdirSync(abs))
+  } catch (er) {
+    this._readdirError(abs, er)
+    return null
+  }
+}
+
+GlobSync.prototype._readdirEntries = function (abs, entries) {
+  // if we haven't asked to stat everything, then just
+  // assume that everything in there exists, so we can avoid
+  // having to stat it a second time.
+  if (!this.mark && !this.stat) {
+    for (var i = 0; i < entries.length; i ++) {
+      var e = entries[i]
+      if (abs === '/')
+        e = abs + e
+      else
+        e = abs + '/' + e
+      this.cache[e] = true
+    }
+  }
+
+  this.cache[abs] = entries
+
+  // mark and cache dir-ness
+  return entries
+}
+
+GlobSync.prototype._readdirError = function (f, er) {
+  // handle errors, and cache the information
+  switch (er.code) {
+    case 'ENOTSUP': // https://github.com/isaacs/node-glob/issues/205
+    case 'ENOTDIR': // totally normal. means it *does* exist.
+      var abs = this._makeAbs(f)
+      this.cache[abs] = 'FILE'
+      if (abs === this.cwdAbs) {
+        var error = new Error(er.code + ' invalid cwd ' + this.cwd)
+        error.path = this.cwd
+        error.code = er.code
+        throw error
+      }
+      break
+
+    case 'ENOENT': // not terribly unusual
+    case 'ELOOP':
+    case 'ENAMETOOLONG':
+    case 'UNKNOWN':
+      this.cache[this._makeAbs(f)] = false
+      break
+
+    default: // some unusual error.  Treat as failure.
+      this.cache[this._makeAbs(f)] = false
+      if (this.strict)
+        throw er
+      if (!this.silent)
+        console.error('glob error', er)
+      break
+  }
+}
+
+GlobSync.prototype._processGlobStar = function (prefix, read, abs, remain, index, inGlobStar) {
+
+  var entries = this._readdir(abs, inGlobStar)
+
+  // no entries means not a dir, so it can never have matches
+  // foo.txt/** doesn't match foo.txt
+  if (!entries)
+    return
+
+  // test without the globstar, and with every child both below
+  // and replacing the globstar.
+  var remainWithoutGlobStar = remain.slice(1)
+  var gspref = prefix ? [ prefix ] : []
+  var noGlobStar = gspref.concat(remainWithoutGlobStar)
+
+  // the noGlobStar pattern exits the inGlobStar state
+  this._process(noGlobStar, index, false)
+
+  var len = entries.length
+  var isSym = this.symlinks[abs]
+
+  // If it's a symlink, and we're in a globstar, then stop
+  if (isSym && inGlobStar)
+    return
+
+  for (var i = 0; i < len; i++) {
+    var e = entries[i]
+    if (e.charAt(0) === '.' && !this.dot)
+      continue
+
+    // these two cases enter the inGlobStar state
+    var instead = gspref.concat(entries[i], remainWithoutGlobStar)
+    this._process(instead, index, true)
+
+    var below = gspref.concat(entries[i], remain)
+    this._process(below, index, true)
+  }
+}
+
+GlobSync.prototype._processSimple = function (prefix, index) {
+  // XXX review this.  Shouldn't it be doing the mounting etc
+  // before doing stat?  kinda weird?
+  var exists = this._stat(prefix)
+
+  if (!this.matches[index])
+    this.matches[index] = Object.create(null)
+
+  // If it doesn't exist, then just mark the lack of results
+  if (!exists)
+    return
+
+  if (prefix && isAbsolute(prefix) && !this.nomount) {
+    var trail = /[\/\\]$/.test(prefix)
+    if (prefix.charAt(0) === '/') {
+      prefix = path.join(this.root, prefix)
+    } else {
+      prefix = path.resolve(this.root, prefix)
+      if (trail)
+        prefix += '/'
+    }
+  }
+
+  if (process.platform === 'win32')
+    prefix = prefix.replace(/\\/g, '/')
+
+  // Mark this as a match
+  this._emitMatch(index, prefix)
+}
+
+// Returns either 'DIR', 'FILE', or false
+GlobSync.prototype._stat = function (f) {
+  var abs = this._makeAbs(f)
+  var needDir = f.slice(-1) === '/'
+
+  if (f.length > this.maxLength)
+    return false
+
+  if (!this.stat && ownProp(this.cache, abs)) {
+    var c = this.cache[abs]
+
+    if (Array.isArray(c))
+      c = 'DIR'
+
+    // It exists, but maybe not how we need it
+    if (!needDir || c === 'DIR')
+      return c
+
+    if (needDir && c === 'FILE')
+      return false
+
+    // otherwise we have to stat, because maybe c=true
+    // if we know it exists, but not what it is.
+  }
+
+  var exists
+  var stat = this.statCache[abs]
+  if (!stat) {
+    var lstat
+    try {
+      lstat = fs.lstatSync(abs)
+    } catch (er) {
+      if (er && (er.code === 'ENOENT' || er.code === 'ENOTDIR')) {
+        this.statCache[abs] = false
+        return false
+      }
+    }
+
+    if (lstat && lstat.isSymbolicLink()) {
+      try {
+        stat = fs.statSync(abs)
+      } catch (er) {
+        stat = lstat
+      }
+    } else {
+      stat = lstat
+    }
+  }
+
+  this.statCache[abs] = stat
+
+  var c = true
+  if (stat)
+    c = stat.isDirectory() ? 'DIR' : 'FILE'
+
+  this.cache[abs] = this.cache[abs] || c
+
+  if (needDir && c === 'FILE')
+    return false
+
+  return c
+}
+
+GlobSync.prototype._mark = function (p) {
+  return common.mark(this, p)
+}
+
+GlobSync.prototype._makeAbs = function (f) {
+  return common.makeAbs(this, f)
+}
+
+
+/***/ }),
+/* 273 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function (flag, argv) {
+	argv = argv || process.argv;
+
+	var terminatorPos = argv.indexOf('--');
+	var prefix = /^--/.test(flag) ? '' : '--';
+	var pos = argv.indexOf(prefix + flag);
+
+	return pos !== -1 && (terminatorPos !== -1 ? pos < terminatorPos : true);
+};
+
+
+/***/ }),
+/* 274 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var wrappy = __webpack_require__(161)
+var reqs = Object.create(null)
+var once = __webpack_require__(83)
+
+module.exports = wrappy(inflight)
+
+function inflight (key, cb) {
+  if (reqs[key]) {
+    reqs[key].push(cb)
+    return null
+  } else {
+    reqs[key] = [cb]
+    return makeres(key)
+  }
+}
+
+function makeres (key) {
+  return once(function RES () {
+    var cbs = reqs[key]
+    var len = cbs.length
+    var args = slice(arguments)
+
+    // XXX It's somewhat ambiguous whether a new callback added in this
+    // pass should be queued for later execution if something in the
+    // list of callbacks throws, or if it should just be discarded.
+    // However, it's such an edge case that it hardly matters, and either
+    // choice is likely as surprising as the other.
+    // As it happens, we do go ahead and schedule it for later execution.
+    try {
+      for (var i = 0; i < len; i++) {
+        cbs[i].apply(null, args)
+      }
+    } finally {
+      if (cbs.length > len) {
+        // added more in the interim.
+        // de-zalgo, just in case, but don't call again.
+        cbs.splice(0, len)
+        process.nextTick(function () {
+          RES.apply(null, args)
+        })
+      } else {
+        delete reqs[key]
+      }
+    }
+  })
+}
+
+function slice (args) {
+  var length = args.length
+  var array = []
+
+  for (var i = 0; i < length; i++) array[i] = args[i]
+  return array
+}
+
+
+/***/ }),
+/* 275 */
+/***/ (function(module, exports) {
+
+if (typeof Object.create === 'function') {
+  // implementation from standard node.js 'util' module
+  module.exports = function inherits(ctor, superCtor) {
+    ctor.super_ = superCtor
+    ctor.prototype = Object.create(superCtor.prototype, {
+      constructor: {
+        value: ctor,
+        enumerable: false,
+        writable: true,
+        configurable: true
+      }
+    });
+  };
+} else {
+  // old school shim for old browsers
+  module.exports = function inherits(ctor, superCtor) {
+    ctor.super_ = superCtor
+    var TempCtor = function () {}
+    TempCtor.prototype = superCtor.prototype
+    ctor.prototype = new TempCtor()
+    ctor.prototype.constructor = ctor
+  }
+}
+
+
+/***/ }),
+/* 276 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/**
+ * Inquirer.js
+ * A collection of common interactive command line user interfaces.
+ */
+
+var inquirer = module.exports;
+
+/**
+ * Client interfaces
+ */
+
+inquirer.prompts = {};
+
+inquirer.Separator = __webpack_require__(175);
+
+inquirer.ui = {
+  BottomBar: __webpack_require__(695),
+  Prompt: __webpack_require__(696)
+};
+
+/**
+ * Create a new self-contained prompt module.
+ */
+inquirer.createPromptModule = function(opt) {
+  var promptModule = function(questions) {
+    var ui = new inquirer.ui.Prompt(promptModule.prompts, opt);
+    var promise = ui.run(questions);
+
+    // Monkey patch the UI on the promise object so
+    // that it remains publicly accessible.
+    promise.ui = ui;
+
+    return promise;
+  };
+  promptModule.prompts = {};
+
+  /**
+   * Register a prompt type
+   * @param {String} name     Prompt type name
+   * @param {Function} prompt Prompt constructor
+   * @return {inquirer}
+   */
+
+  promptModule.registerPrompt = function(name, prompt) {
+    promptModule.prompts[name] = prompt;
+    return this;
+  };
+
+  /**
+   * Register the defaults provider prompts
+   */
+
+  promptModule.restoreDefaultPrompts = function() {
+    this.registerPrompt('list', __webpack_require__(691));
+    this.registerPrompt('input', __webpack_require__(392));
+    this.registerPrompt('number', __webpack_require__(692));
+    this.registerPrompt('confirm', __webpack_require__(688));
+    this.registerPrompt('rawlist', __webpack_require__(694));
+    this.registerPrompt('expand', __webpack_require__(690));
+    this.registerPrompt('checkbox', __webpack_require__(687));
+    this.registerPrompt('password', __webpack_require__(693));
+    this.registerPrompt('editor', __webpack_require__(689));
+  };
+
+  promptModule.restoreDefaultPrompts();
+
+  return promptModule;
+};
+
+/**
+ * Public CLI helper interface
+ * @param  {Array|Object|Rx.Observable} questions - Questions settings array
+ * @param  {Function} cb - Callback being passed the user answers
+ * @return {inquirer.ui.Prompt}
+ */
+
+inquirer.prompt = inquirer.createPromptModule();
+
+// Expose helper functions on the top level for easiest usage by common users
+inquirer.registerPrompt = function(name, prompt) {
+  inquirer.prompt.registerPrompt(name, prompt);
+};
+inquirer.restoreDefaultPrompts = function() {
+  inquirer.prompt.restoreDefaultPrompts();
+};
+
+
+/***/ }),
+/* 277 */
+/***/ (function(module, exports) {
+
+module.exports = [["0","\u0000",127,"€"],["8140","丂丄丅丆丏丒丗丟丠両丣並丩丮丯丱丳丵丷丼乀乁乂乄乆乊乑乕乗乚乛乢乣乤乥乧乨乪",5,"乲乴",9,"乿",6,"亇亊"],["8180","亐亖亗亙亜亝亞亣亪亯亰亱亴亶亷亸亹亼亽亾仈仌仏仐仒仚仛仜仠仢仦仧仩仭仮仯仱仴仸仹仺仼仾伀伂",6,"伋伌伒",4,"伜伝伡伣伨伩伬伭伮伱伳伵伷伹伻伾",4,"佄佅佇",5,"佒佔佖佡佢佦佨佪佫佭佮佱佲併佷佸佹佺佽侀侁侂侅來侇侊侌侎侐侒侓侕侖侘侙侚侜侞侟価侢"],["8240","侤侫侭侰",4,"侶",8,"俀俁係俆俇俈俉俋俌俍俒",4,"俙俛俠俢俤俥俧俫俬俰俲俴俵俶俷俹俻俼俽俿",11],["8280","個倎倐們倓倕倖倗倛倝倞倠倢倣値倧倫倯",10,"倻倽倿偀偁偂偄偅偆偉偊偋偍偐",4,"偖偗偘偙偛偝",7,"偦",5,"偭",8,"偸偹偺偼偽傁傂傃傄傆傇傉傊傋傌傎",20,"傤傦傪傫傭",4,"傳",6,"傼"],["8340","傽",17,"僐",5,"僗僘僙僛",10,"僨僩僪僫僯僰僱僲僴僶",4,"僼",9,"儈"],["8380","儉儊儌",5,"儓",13,"儢",28,"兂兇兊兌兎兏児兒兓兗兘兙兛兝",4,"兣兤兦內兩兪兯兲兺兾兿冃冄円冇冊冋冎冏冐冑冓冔冘冚冝冞冟冡冣冦",4,"冭冮冴冸冹冺冾冿凁凂凃凅凈凊凍凎凐凒",5],["8440","凘凙凚凜凞凟凢凣凥",5,"凬凮凱凲凴凷凾刄刅刉刋刌刏刐刓刔刕刜刞刟刡刢刣別刦刧刪刬刯刱刲刴刵刼刾剄",5,"剋剎剏剒剓剕剗剘"],["8480","剙剚剛剝剟剠剢剣剤剦剨剫剬剭剮剰剱剳",9,"剾劀劃",4,"劉",6,"劑劒劔",6,"劜劤劥劦劧劮劯劰労",9,"勀勁勂勄勅勆勈勊勌勍勎勏勑勓勔動勗務",5,"勠勡勢勣勥",10,"勱",7,"勻勼勽匁匂匃匄匇匉匊匋匌匎"],["8540","匑匒匓匔匘匛匜匞匟匢匤匥匧匨匩匫匬匭匯",9,"匼匽區卂卄卆卋卌卍卐協単卙卛卝卥卨卪卬卭卲卶卹卻卼卽卾厀厁厃厇厈厊厎厏"],["8580","厐",4,"厖厗厙厛厜厞厠厡厤厧厪厫厬厭厯",6,"厷厸厹厺厼厽厾叀參",4,"収叏叐叒叓叕叚叜叝叞叡叢叧叴叺叾叿吀吂吅吇吋吔吘吙吚吜吢吤吥吪吰吳吶吷吺吽吿呁呂呄呅呇呉呌呍呎呏呑呚呝",4,"呣呥呧呩",7,"呴呹呺呾呿咁咃咅咇咈咉咊咍咑咓咗咘咜咞咟咠咡"],["8640","咢咥咮咰咲咵咶咷咹咺咼咾哃哅哊哋哖哘哛哠",4,"哫哬哯哰哱哴",5,"哻哾唀唂唃唄唅唈唊",4,"唒唓唕",5,"唜唝唞唟唡唥唦"],["8680","唨唩唫唭唲唴唵唶唸唹唺唻唽啀啂啅啇啈啋",4,"啑啒啓啔啗",4,"啝啞啟啠啢啣啨啩啫啯",5,"啹啺啽啿喅喆喌喍喎喐喒喓喕喖喗喚喛喞喠",6,"喨",8,"喲喴営喸喺喼喿",4,"嗆嗇嗈嗊嗋嗎嗏嗐嗕嗗",4,"嗞嗠嗢嗧嗩嗭嗮嗰嗱嗴嗶嗸",4,"嗿嘂嘃嘄嘅"],["8740","嘆嘇嘊嘋嘍嘐",7,"嘙嘚嘜嘝嘠嘡嘢嘥嘦嘨嘩嘪嘫嘮嘯嘰嘳嘵嘷嘸嘺嘼嘽嘾噀",11,"噏",4,"噕噖噚噛噝",4],["8780","噣噥噦噧噭噮噯噰噲噳噴噵噷噸噹噺噽",7,"嚇",6,"嚐嚑嚒嚔",14,"嚤",10,"嚰",6,"嚸嚹嚺嚻嚽",12,"囋",8,"囕囖囘囙囜団囥",5,"囬囮囯囲図囶囷囸囻囼圀圁圂圅圇國",6],["8840","園",9,"圝圞圠圡圢圤圥圦圧圫圱圲圴",4,"圼圽圿坁坃坄坅坆坈坉坋坒",4,"坘坙坢坣坥坧坬坮坰坱坲坴坵坸坹坺坽坾坿垀"],["8880","垁垇垈垉垊垍",4,"垔",6,"垜垝垞垟垥垨垪垬垯垰垱垳垵垶垷垹",8,"埄",6,"埌埍埐埑埓埖埗埛埜埞埡埢埣埥",7,"埮埰埱埲埳埵埶執埻埼埾埿堁堃堄堅堈堉堊堌堎堏堐堒堓堔堖堗堘堚堛堜堝堟堢堣堥",4,"堫",4,"報堲堳場堶",7],["8940","堾",5,"塅",6,"塎塏塐塒塓塕塖塗塙",4,"塟",5,"塦",4,"塭",16,"塿墂墄墆墇墈墊墋墌"],["8980","墍",4,"墔",4,"墛墜墝墠",7,"墪",17,"墽墾墿壀壂壃壄壆",10,"壒壓壔壖",13,"壥",5,"壭壯壱売壴壵壷壸壺",7,"夃夅夆夈",4,"夎夐夑夒夓夗夘夛夝夞夠夡夢夣夦夨夬夰夲夳夵夶夻"],["8a40","夽夾夿奀奃奅奆奊奌奍奐奒奓奙奛",4,"奡奣奤奦",12,"奵奷奺奻奼奾奿妀妅妉妋妌妎妏妐妑妔妕妘妚妛妜妝妟妠妡妢妦"],["8a80","妧妬妭妰妱妳",5,"妺妼妽妿",6,"姇姈姉姌姍姎姏姕姖姙姛姞",4,"姤姦姧姩姪姫姭",11,"姺姼姽姾娀娂娊娋娍娎娏娐娒娔娕娖娗娙娚娛娝娞娡娢娤娦娧娨娪",6,"娳娵娷",4,"娽娾娿婁",4,"婇婈婋",9,"婖婗婘婙婛",5],["8b40","婡婣婤婥婦婨婩婫",8,"婸婹婻婼婽婾媀",17,"媓",6,"媜",13,"媫媬"],["8b80","媭",4,"媴媶媷媹",4,"媿嫀嫃",5,"嫊嫋嫍",4,"嫓嫕嫗嫙嫚嫛嫝嫞嫟嫢嫤嫥嫧嫨嫪嫬",4,"嫲",22,"嬊",11,"嬘",25,"嬳嬵嬶嬸",7,"孁",6],["8c40","孈",7,"孒孖孞孠孡孧孨孫孭孮孯孲孴孶孷學孹孻孼孾孿宂宆宊宍宎宐宑宒宔宖実宧宨宩宬宭宮宯宱宲宷宺宻宼寀寁寃寈寉寊寋寍寎寏"],["8c80","寑寔",8,"寠寢寣實寧審",4,"寯寱",6,"寽対尀専尃尅將專尋尌對導尐尒尓尗尙尛尞尟尠尡尣尦尨尩尪尫尭尮尯尰尲尳尵尶尷屃屄屆屇屌屍屒屓屔屖屗屘屚屛屜屝屟屢層屧",6,"屰屲",6,"屻屼屽屾岀岃",4,"岉岊岋岎岏岒岓岕岝",4,"岤",4],["8d40","岪岮岯岰岲岴岶岹岺岻岼岾峀峂峃峅",5,"峌",5,"峓",5,"峚",6,"峢峣峧峩峫峬峮峯峱",9,"峼",4],["8d80","崁崄崅崈",5,"崏",4,"崕崗崘崙崚崜崝崟",4,"崥崨崪崫崬崯",4,"崵",7,"崿",7,"嵈嵉嵍",10,"嵙嵚嵜嵞",10,"嵪嵭嵮嵰嵱嵲嵳嵵",12,"嶃",21,"嶚嶛嶜嶞嶟嶠"],["8e40","嶡",21,"嶸",12,"巆",6,"巎",12,"巜巟巠巣巤巪巬巭"],["8e80","巰巵巶巸",4,"巿帀帄帇帉帊帋帍帎帒帓帗帞",7,"帨",4,"帯帰帲",4,"帹帺帾帿幀幁幃幆",5,"幍",6,"幖",4,"幜幝幟幠幣",14,"幵幷幹幾庁庂広庅庈庉庌庍庎庒庘庛庝庡庢庣庤庨",4,"庮",4,"庴庺庻庼庽庿",6],["8f40","廆廇廈廋",5,"廔廕廗廘廙廚廜",11,"廩廫",8,"廵廸廹廻廼廽弅弆弇弉弌弍弎弐弒弔弖弙弚弜弝弞弡弢弣弤"],["8f80","弨弫弬弮弰弲",6,"弻弽弾弿彁",14,"彑彔彙彚彛彜彞彟彠彣彥彧彨彫彮彯彲彴彵彶彸彺彽彾彿徃徆徍徎徏徑従徔徖徚徛徝從徟徠徢",5,"復徫徬徯",5,"徶徸徹徺徻徾",4,"忇忈忊忋忎忓忔忕忚忛応忞忟忢忣忥忦忨忩忬忯忰忲忳忴忶忷忹忺忼怇"],["9040","怈怉怋怌怐怑怓怗怘怚怞怟怢怣怤怬怭怮怰",4,"怶",4,"怽怾恀恄",6,"恌恎恏恑恓恔恖恗恘恛恜恞恟恠恡恥恦恮恱恲恴恵恷恾悀"],["9080","悁悂悅悆悇悈悊悋悎悏悐悑悓悕悗悘悙悜悞悡悢悤悥悧悩悪悮悰悳悵悶悷悹悺悽",7,"惇惈惉惌",4,"惒惓惔惖惗惙惛惞惡",4,"惪惱惲惵惷惸惻",4,"愂愃愄愅愇愊愋愌愐",4,"愖愗愘愙愛愜愝愞愡愢愥愨愩愪愬",18,"慀",6],["9140","慇慉態慍慏慐慒慓慔慖",6,"慞慟慠慡慣慤慥慦慩",6,"慱慲慳慴慶慸",18,"憌憍憏",4,"憕"],["9180","憖",6,"憞",8,"憪憫憭",9,"憸",5,"憿懀懁懃",4,"應懌",4,"懓懕",16,"懧",13,"懶",8,"戀",5,"戇戉戓戔戙戜戝戞戠戣戦戧戨戩戫戭戯戰戱戲戵戶戸",4,"扂扄扅扆扊"],["9240","扏扐払扖扗扙扚扜",6,"扤扥扨扱扲扴扵扷扸扺扻扽抁抂抃抅抆抇抈抋",5,"抔抙抜抝択抣抦抧抩抪抭抮抯抰抲抳抴抶抷抸抺抾拀拁"],["9280","拃拋拏拑拕拝拞拠拡拤拪拫拰拲拵拸拹拺拻挀挃挄挅挆挊挋挌挍挏挐挒挓挔挕挗挘挙挜挦挧挩挬挭挮挰挱挳",5,"挻挼挾挿捀捁捄捇捈捊捑捒捓捔捖",7,"捠捤捥捦捨捪捫捬捯捰捲捳捴捵捸捹捼捽捾捿掁掃掄掅掆掋掍掑掓掔掕掗掙",6,"採掤掦掫掯掱掲掵掶掹掻掽掿揀"],["9340","揁揂揃揅揇揈揊揋揌揑揓揔揕揗",6,"揟揢揤",4,"揫揬揮揯揰揱揳揵揷揹揺揻揼揾搃搄搆",4,"損搎搑搒搕",5,"搝搟搢搣搤"],["9380","搥搧搨搩搫搮",5,"搵",4,"搻搼搾摀摂摃摉摋",6,"摓摕摖摗摙",4,"摟",7,"摨摪摫摬摮",9,"摻",6,"撃撆撈",8,"撓撔撗撘撚撛撜撝撟",4,"撥撦撧撨撪撫撯撱撲撳撴撶撹撻撽撾撿擁擃擄擆",6,"擏擑擓擔擕擖擙據"],["9440","擛擜擝擟擠擡擣擥擧",24,"攁",7,"攊",7,"攓",4,"攙",8],["9480","攢攣攤攦",4,"攬攭攰攱攲攳攷攺攼攽敀",4,"敆敇敊敋敍敎敐敒敓敔敗敘敚敜敟敠敡敤敥敧敨敩敪敭敮敯敱敳敵敶數",14,"斈斉斊斍斎斏斒斔斕斖斘斚斝斞斠斢斣斦斨斪斬斮斱",7,"斺斻斾斿旀旂旇旈旉旊旍旐旑旓旔旕旘",7,"旡旣旤旪旫"],["9540","旲旳旴旵旸旹旻",4,"昁昄昅昇昈昉昋昍昐昑昒昖昗昘昚昛昜昞昡昢昣昤昦昩昪昫昬昮昰昲昳昷",4,"昽昿晀時晄",6,"晍晎晐晑晘"],["9580","晙晛晜晝晞晠晢晣晥晧晩",4,"晱晲晳晵晸晹晻晼晽晿暀暁暃暅暆暈暉暊暋暍暎暏暐暒暓暔暕暘",4,"暞",8,"暩",4,"暯",4,"暵暶暷暸暺暻暼暽暿",25,"曚曞",7,"曧曨曪",5,"曱曵曶書曺曻曽朁朂會"],["9640","朄朅朆朇朌朎朏朑朒朓朖朘朙朚朜朞朠",5,"朧朩朮朰朲朳朶朷朸朹朻朼朾朿杁杄杅杇杊杋杍杒杔杕杗",4,"杝杢杣杤杦杧杫杬杮東杴杶"],["9680","杸杹杺杻杽枀枂枃枅枆枈枊枌枍枎枏枑枒枓枔枖枙枛枟枠枡枤枦枩枬枮枱枲枴枹",7,"柂柅",9,"柕柖柗柛柟柡柣柤柦柧柨柪柫柭柮柲柵",7,"柾栁栂栃栄栆栍栐栒栔栕栘",4,"栞栟栠栢",6,"栫",6,"栴栵栶栺栻栿桇桋桍桏桒桖",5],["9740","桜桝桞桟桪桬",7,"桵桸",8,"梂梄梇",7,"梐梑梒梔梕梖梘",9,"梣梤梥梩梪梫梬梮梱梲梴梶梷梸"],["9780","梹",6,"棁棃",5,"棊棌棎棏棐棑棓棔棖棗棙棛",4,"棡棢棤",9,"棯棲棳棴棶棷棸棻棽棾棿椀椂椃椄椆",4,"椌椏椑椓",11,"椡椢椣椥",7,"椮椯椱椲椳椵椶椷椸椺椻椼椾楀楁楃",16,"楕楖楘楙楛楜楟"],["9840","楡楢楤楥楧楨楩楪楬業楯楰楲",4,"楺楻楽楾楿榁榃榅榊榋榌榎",5,"榖榗榙榚榝",9,"榩榪榬榮榯榰榲榳榵榶榸榹榺榼榽"],["9880","榾榿槀槂",7,"構槍槏槑槒槓槕",5,"槜槝槞槡",11,"槮槯槰槱槳",9,"槾樀",9,"樋",11,"標",5,"樠樢",5,"権樫樬樭樮樰樲樳樴樶",6,"樿",4,"橅橆橈",7,"橑",6,"橚"],["9940","橜",4,"橢橣橤橦",10,"橲",6,"橺橻橽橾橿檁檂檃檅",8,"檏檒",4,"檘",7,"檡",5],["9980","檧檨檪檭",114,"欥欦欨",6],["9a40","欯欰欱欳欴欵欶欸欻欼欽欿歀歁歂歄歅歈歊歋歍",11,"歚",7,"歨歩歫",13,"歺歽歾歿殀殅殈"],["9a80","殌殎殏殐殑殔殕殗殘殙殜",4,"殢",7,"殫",7,"殶殸",6,"毀毃毄毆",4,"毌毎毐毑毘毚毜",4,"毢",7,"毬毭毮毰毱毲毴毶毷毸毺毻毼毾",6,"氈",4,"氎氒気氜氝氞氠氣氥氫氬氭氱氳氶氷氹氺氻氼氾氿汃汄汅汈汋",4,"汑汒汓汖汘"],["9b40","汙汚汢汣汥汦汧汫",4,"汱汳汵汷汸決汻汼汿沀沄沇沊沋沍沎沑沒沕沖沗沘沚沜沝沞沠沢沨沬沯沰沴沵沶沷沺泀況泂泃泆泇泈泋泍泎泏泑泒泘"],["9b80","泙泚泜泝泟泤泦泧泩泬泭泲泴泹泿洀洂洃洅洆洈洉洊洍洏洐洑洓洔洕洖洘洜洝洟",5,"洦洨洩洬洭洯洰洴洶洷洸洺洿浀浂浄浉浌浐浕浖浗浘浛浝浟浡浢浤浥浧浨浫浬浭浰浱浲浳浵浶浹浺浻浽",4,"涃涄涆涇涊涋涍涏涐涒涖",4,"涜涢涥涬涭涰涱涳涴涶涷涹",5,"淁淂淃淈淉淊"],["9c40","淍淎淏淐淒淓淔淕淗淚淛淜淟淢淣淥淧淨淩淪淭淯淰淲淴淵淶淸淺淽",7,"渆渇済渉渋渏渒渓渕渘渙減渜渞渟渢渦渧渨渪測渮渰渱渳渵"],["9c80","渶渷渹渻",7,"湅",7,"湏湐湑湒湕湗湙湚湜湝湞湠",10,"湬湭湯",14,"満溁溂溄溇溈溊",4,"溑",6,"溙溚溛溝溞溠溡溣溤溦溨溩溫溬溭溮溰溳溵溸溹溼溾溿滀滃滄滅滆滈滉滊滌滍滎滐滒滖滘滙滛滜滝滣滧滪",5],["9d40","滰滱滲滳滵滶滷滸滺",7,"漃漄漅漇漈漊",4,"漐漑漒漖",9,"漡漢漣漥漦漧漨漬漮漰漲漴漵漷",6,"漿潀潁潂"],["9d80","潃潄潅潈潉潊潌潎",9,"潙潚潛潝潟潠潡潣潤潥潧",5,"潯潰潱潳潵潶潷潹潻潽",6,"澅澆澇澊澋澏",12,"澝澞澟澠澢",4,"澨",10,"澴澵澷澸澺",5,"濁濃",5,"濊",6,"濓",10,"濟濢濣濤濥"],["9e40","濦",7,"濰",32,"瀒",7,"瀜",6,"瀤",6],["9e80","瀫",9,"瀶瀷瀸瀺",17,"灍灎灐",13,"灟",11,"灮灱灲灳灴灷灹灺灻災炁炂炃炄炆炇炈炋炌炍炏炐炑炓炗炘炚炛炞",12,"炰炲炴炵炶為炾炿烄烅烆烇烉烋",12,"烚"],["9f40","烜烝烞烠烡烢烣烥烪烮烰",6,"烸烺烻烼烾",10,"焋",4,"焑焒焔焗焛",10,"焧",7,"焲焳焴"],["9f80","焵焷",13,"煆煇煈煉煋煍煏",12,"煝煟",4,"煥煩",4,"煯煰煱煴煵煶煷煹煻煼煾",5,"熅",4,"熋熌熍熎熐熑熒熓熕熖熗熚",4,"熡",6,"熩熪熫熭",5,"熴熶熷熸熺",8,"燄",9,"燏",4],["a040","燖",9,"燡燢燣燤燦燨",5,"燯",9,"燺",11,"爇",19],["a080","爛爜爞",9,"爩爫爭爮爯爲爳爴爺爼爾牀",6,"牉牊牋牎牏牐牑牓牔牕牗牘牚牜牞牠牣牤牥牨牪牫牬牭牰牱牳牴牶牷牸牻牼牽犂犃犅",4,"犌犎犐犑犓",11,"犠",11,"犮犱犲犳犵犺",6,"狅狆狇狉狊狋狌狏狑狓狔狕狖狘狚狛"],["a1a1","　、。·ˉˇ¨〃々—～‖…‘’“”〔〕〈",7,"〖〗【】±×÷∶∧∨∑∏∪∩∈∷√⊥∥∠⌒⊙∫∮≡≌≈∽∝≠≮≯≤≥∞∵∴♂♀°′″℃＄¤￠￡‰§№☆★○●◎◇◆□■△▲※→←↑↓〓"],["a2a1","ⅰ",9],["a2b1","⒈",19,"⑴",19,"①",9],["a2e5","㈠",9],["a2f1","Ⅰ",11],["a3a1","！＂＃￥％",88,"￣"],["a4a1","ぁ",82],["a5a1","ァ",85],["a6a1","Α",16,"Σ",6],["a6c1","α",16,"σ",6],["a6e0","︵︶︹︺︿﹀︽︾﹁﹂﹃﹄"],["a6ee","︻︼︷︸︱"],["a6f4","︳︴"],["a7a1","А",5,"ЁЖ",25],["a7d1","а",5,"ёж",25],["a840","ˊˋ˙–―‥‵℅℉↖↗↘↙∕∟∣≒≦≧⊿═",35,"▁",6],["a880","█",7,"▓▔▕▼▽◢◣◤◥☉⊕〒〝〞"],["a8a1","āáǎàēéěèīíǐìōóǒòūúǔùǖǘǚǜüêɑ"],["a8bd","ńň"],["a8c0","ɡ"],["a8c5","ㄅ",36],["a940","〡",8,"㊣㎎㎏㎜㎝㎞㎡㏄㏎㏑㏒㏕︰￢￤"],["a959","℡㈱"],["a95c","‐"],["a960","ー゛゜ヽヾ〆ゝゞ﹉",9,"﹔﹕﹖﹗﹙",8],["a980","﹢",4,"﹨﹩﹪﹫"],["a996","〇"],["a9a4","─",75],["aa40","狜狝狟狢",5,"狪狫狵狶狹狽狾狿猀猂猄",5,"猋猌猍猏猐猑猒猔猘猙猚猟猠猣猤猦猧猨猭猯猰猲猳猵猶猺猻猼猽獀",8],["aa80","獉獊獋獌獎獏獑獓獔獕獖獘",7,"獡",10,"獮獰獱"],["ab40","獲",11,"獿",4,"玅玆玈玊玌玍玏玐玒玓玔玕玗玘玙玚玜玝玞玠玡玣",5,"玪玬玭玱玴玵玶玸玹玼玽玾玿珁珃",4],["ab80","珋珌珎珒",6,"珚珛珜珝珟珡珢珣珤珦珨珪珫珬珮珯珰珱珳",4],["ac40","珸",10,"琄琇琈琋琌琍琎琑",8,"琜",5,"琣琤琧琩琫琭琯琱琲琷",4,"琽琾琿瑀瑂",11],["ac80","瑎",6,"瑖瑘瑝瑠",12,"瑮瑯瑱",4,"瑸瑹瑺"],["ad40","瑻瑼瑽瑿璂璄璅璆璈璉璊璌璍璏璑",10,"璝璟",7,"璪",15,"璻",12],["ad80","瓈",9,"瓓",8,"瓝瓟瓡瓥瓧",6,"瓰瓱瓲"],["ae40","瓳瓵瓸",6,"甀甁甂甃甅",7,"甎甐甒甔甕甖甗甛甝甞甠",4,"甦甧甪甮甴甶甹甼甽甿畁畂畃畄畆畇畉畊畍畐畑畒畓畕畖畗畘"],["ae80","畝",7,"畧畨畩畫",6,"畳畵當畷畺",4,"疀疁疂疄疅疇"],["af40","疈疉疊疌疍疎疐疓疕疘疛疜疞疢疦",4,"疭疶疷疺疻疿痀痁痆痋痌痎痏痐痑痓痗痙痚痜痝痟痠痡痥痩痬痭痮痯痲痳痵痶痷痸痺痻痽痾瘂瘄瘆瘇"],["af80","瘈瘉瘋瘍瘎瘏瘑瘒瘓瘔瘖瘚瘜瘝瘞瘡瘣瘧瘨瘬瘮瘯瘱瘲瘶瘷瘹瘺瘻瘽癁療癄"],["b040","癅",6,"癎",5,"癕癗",4,"癝癟癠癡癢癤",6,"癬癭癮癰",7,"癹発發癿皀皁皃皅皉皊皌皍皏皐皒皔皕皗皘皚皛"],["b080","皜",7,"皥",8,"皯皰皳皵",9,"盀盁盃啊阿埃挨哎唉哀皑癌蔼矮艾碍爱隘鞍氨安俺按暗岸胺案肮昂盎凹敖熬翱袄傲奥懊澳芭捌扒叭吧笆八疤巴拔跋靶把耙坝霸罢爸白柏百摆佰败拜稗斑班搬扳般颁板版扮拌伴瓣半办绊邦帮梆榜膀绑棒磅蚌镑傍谤苞胞包褒剥"],["b140","盄盇盉盋盌盓盕盙盚盜盝盞盠",4,"盦",7,"盰盳盵盶盷盺盻盽盿眀眂眃眅眆眊県眎",10,"眛眜眝眞眡眣眤眥眧眪眫"],["b180","眬眮眰",4,"眹眻眽眾眿睂睄睅睆睈",7,"睒",7,"睜薄雹保堡饱宝抱报暴豹鲍爆杯碑悲卑北辈背贝钡倍狈备惫焙被奔苯本笨崩绷甭泵蹦迸逼鼻比鄙笔彼碧蓖蔽毕毙毖币庇痹闭敝弊必辟壁臂避陛鞭边编贬扁便变卞辨辩辫遍标彪膘表鳖憋别瘪彬斌濒滨宾摈兵冰柄丙秉饼炳"],["b240","睝睞睟睠睤睧睩睪睭",11,"睺睻睼瞁瞂瞃瞆",5,"瞏瞐瞓",11,"瞡瞣瞤瞦瞨瞫瞭瞮瞯瞱瞲瞴瞶",4],["b280","瞼瞾矀",12,"矎",8,"矘矙矚矝",4,"矤病并玻菠播拨钵波博勃搏铂箔伯帛舶脖膊渤泊驳捕卜哺补埠不布步簿部怖擦猜裁材才财睬踩采彩菜蔡餐参蚕残惭惨灿苍舱仓沧藏操糙槽曹草厕策侧册测层蹭插叉茬茶查碴搽察岔差诧拆柴豺搀掺蝉馋谗缠铲产阐颤昌猖"],["b340","矦矨矪矯矰矱矲矴矵矷矹矺矻矼砃",5,"砊砋砎砏砐砓砕砙砛砞砠砡砢砤砨砪砫砮砯砱砲砳砵砶砽砿硁硂硃硄硆硈硉硊硋硍硏硑硓硔硘硙硚"],["b380","硛硜硞",11,"硯",7,"硸硹硺硻硽",6,"场尝常长偿肠厂敞畅唱倡超抄钞朝嘲潮巢吵炒车扯撤掣彻澈郴臣辰尘晨忱沉陈趁衬撑称城橙成呈乘程惩澄诚承逞骋秤吃痴持匙池迟弛驰耻齿侈尺赤翅斥炽充冲虫崇宠抽酬畴踌稠愁筹仇绸瞅丑臭初出橱厨躇锄雏滁除楚"],["b440","碄碅碆碈碊碋碏碐碒碔碕碖碙碝碞碠碢碤碦碨",7,"碵碶碷碸確碻碼碽碿磀磂磃磄磆磇磈磌磍磎磏磑磒磓磖磗磘磚",9],["b480","磤磥磦磧磩磪磫磭",4,"磳磵磶磸磹磻",5,"礂礃礄礆",6,"础储矗搐触处揣川穿椽传船喘串疮窗幢床闯创吹炊捶锤垂春椿醇唇淳纯蠢戳绰疵茨磁雌辞慈瓷词此刺赐次聪葱囱匆从丛凑粗醋簇促蹿篡窜摧崔催脆瘁粹淬翠村存寸磋撮搓措挫错搭达答瘩打大呆歹傣戴带殆代贷袋待逮"],["b540","礍",5,"礔",9,"礟",4,"礥",14,"礵",4,"礽礿祂祃祄祅祇祊",8,"祔祕祘祙祡祣"],["b580","祤祦祩祪祫祬祮祰",6,"祹祻",4,"禂禃禆禇禈禉禋禌禍禎禐禑禒怠耽担丹单郸掸胆旦氮但惮淡诞弹蛋当挡党荡档刀捣蹈倒岛祷导到稻悼道盗德得的蹬灯登等瞪凳邓堤低滴迪敌笛狄涤翟嫡抵底地蒂第帝弟递缔颠掂滇碘点典靛垫电佃甸店惦奠淀殿碉叼雕凋刁掉吊钓调跌爹碟蝶迭谍叠"],["b640","禓",6,"禛",11,"禨",10,"禴",4,"禼禿秂秄秅秇秈秊秌秎秏秐秓秔秖秗秙",5,"秠秡秢秥秨秪"],["b680","秬秮秱",6,"秹秺秼秾秿稁稄稅稇稈稉稊稌稏",4,"稕稖稘稙稛稜丁盯叮钉顶鼎锭定订丢东冬董懂动栋侗恫冻洞兜抖斗陡豆逗痘都督毒犊独读堵睹赌杜镀肚度渡妒端短锻段断缎堆兑队对墩吨蹲敦顿囤钝盾遁掇哆多夺垛躲朵跺舵剁惰堕蛾峨鹅俄额讹娥恶厄扼遏鄂饿恩而儿耳尔饵洱二"],["b740","稝稟稡稢稤",14,"稴稵稶稸稺稾穀",5,"穇",9,"穒",4,"穘",16],["b780","穩",6,"穱穲穳穵穻穼穽穾窂窅窇窉窊窋窌窎窏窐窓窔窙窚窛窞窡窢贰发罚筏伐乏阀法珐藩帆番翻樊矾钒繁凡烦反返范贩犯饭泛坊芳方肪房防妨仿访纺放菲非啡飞肥匪诽吠肺废沸费芬酚吩氛分纷坟焚汾粉奋份忿愤粪丰封枫蜂峰锋风疯烽逢冯缝讽奉凤佛否夫敷肤孵扶拂辐幅氟符伏俘服"],["b840","窣窤窧窩窪窫窮",4,"窴",10,"竀",10,"竌",9,"竗竘竚竛竜竝竡竢竤竧",5,"竮竰竱竲竳"],["b880","竴",4,"竻竼竾笀笁笂笅笇笉笌笍笎笐笒笓笖笗笘笚笜笝笟笡笢笣笧笩笭浮涪福袱弗甫抚辅俯釜斧脯腑府腐赴副覆赋复傅付阜父腹负富讣附妇缚咐噶嘎该改概钙盖溉干甘杆柑竿肝赶感秆敢赣冈刚钢缸肛纲岗港杠篙皋高膏羔糕搞镐稿告哥歌搁戈鸽胳疙割革葛格蛤阁隔铬个各给根跟耕更庚羹"],["b940","笯笰笲笴笵笶笷笹笻笽笿",5,"筆筈筊筍筎筓筕筗筙筜筞筟筡筣",10,"筯筰筳筴筶筸筺筼筽筿箁箂箃箄箆",6,"箎箏"],["b980","箑箒箓箖箘箙箚箛箞箟箠箣箤箥箮箯箰箲箳箵箶箷箹",7,"篂篃範埂耿梗工攻功恭龚供躬公宫弓巩汞拱贡共钩勾沟苟狗垢构购够辜菇咕箍估沽孤姑鼓古蛊骨谷股故顾固雇刮瓜剐寡挂褂乖拐怪棺关官冠观管馆罐惯灌贯光广逛瑰规圭硅归龟闺轨鬼诡癸桂柜跪贵刽辊滚棍锅郭国果裹过哈"],["ba40","篅篈築篊篋篍篎篏篐篒篔",4,"篛篜篞篟篠篢篣篤篧篨篩篫篬篭篯篰篲",4,"篸篹篺篻篽篿",7,"簈簉簊簍簎簐",5,"簗簘簙"],["ba80","簚",4,"簠",5,"簨簩簫",12,"簹",5,"籂骸孩海氦亥害骇酣憨邯韩含涵寒函喊罕翰撼捍旱憾悍焊汗汉夯杭航壕嚎豪毫郝好耗号浩呵喝荷菏核禾和何合盒貉阂河涸赫褐鹤贺嘿黑痕很狠恨哼亨横衡恒轰哄烘虹鸿洪宏弘红喉侯猴吼厚候后呼乎忽瑚壶葫胡蝴狐糊湖"],["bb40","籃",9,"籎",36,"籵",5,"籾",9],["bb80","粈粊",6,"粓粔粖粙粚粛粠粡粣粦粧粨粩粫粬粭粯粰粴",4,"粺粻弧虎唬护互沪户花哗华猾滑画划化话槐徊怀淮坏欢环桓还缓换患唤痪豢焕涣宦幻荒慌黄磺蝗簧皇凰惶煌晃幌恍谎灰挥辉徽恢蛔回毁悔慧卉惠晦贿秽会烩汇讳诲绘荤昏婚魂浑混豁活伙火获或惑霍货祸击圾基机畸稽积箕"],["bc40","粿糀糂糃糄糆糉糋糎",6,"糘糚糛糝糞糡",6,"糩",5,"糰",7,"糹糺糼",13,"紋",5],["bc80","紑",14,"紡紣紤紥紦紨紩紪紬紭紮細",6,"肌饥迹激讥鸡姬绩缉吉极棘辑籍集及急疾汲即嫉级挤几脊己蓟技冀季伎祭剂悸济寄寂计记既忌际妓继纪嘉枷夹佳家加荚颊贾甲钾假稼价架驾嫁歼监坚尖笺间煎兼肩艰奸缄茧检柬碱硷拣捡简俭剪减荐槛鉴践贱见键箭件"],["bd40","紷",54,"絯",7],["bd80","絸",32,"健舰剑饯渐溅涧建僵姜将浆江疆蒋桨奖讲匠酱降蕉椒礁焦胶交郊浇骄娇嚼搅铰矫侥脚狡角饺缴绞剿教酵轿较叫窖揭接皆秸街阶截劫节桔杰捷睫竭洁结解姐戒藉芥界借介疥诫届巾筋斤金今津襟紧锦仅谨进靳晋禁近烬浸"],["be40","継",12,"綧",6,"綯",42],["be80","線",32,"尽劲荆兢茎睛晶鲸京惊精粳经井警景颈静境敬镜径痉靖竟竞净炯窘揪究纠玖韭久灸九酒厩救旧臼舅咎就疚鞠拘狙疽居驹菊局咀矩举沮聚拒据巨具距踞锯俱句惧炬剧捐鹃娟倦眷卷绢撅攫抉掘倔爵觉决诀绝均菌钧军君峻"],["bf40","緻",62],["bf80","縺縼",4,"繂",4,"繈",21,"俊竣浚郡骏喀咖卡咯开揩楷凯慨刊堪勘坎砍看康慷糠扛抗亢炕考拷烤靠坷苛柯棵磕颗科壳咳可渴克刻客课肯啃垦恳坑吭空恐孔控抠口扣寇枯哭窟苦酷库裤夸垮挎跨胯块筷侩快宽款匡筐狂框矿眶旷况亏盔岿窥葵奎魁傀"],["c040","繞",35,"纃",23,"纜纝纞"],["c080","纮纴纻纼绖绤绬绹缊缐缞缷缹缻",6,"罃罆",9,"罒罓馈愧溃坤昆捆困括扩廓阔垃拉喇蜡腊辣啦莱来赖蓝婪栏拦篮阑兰澜谰揽览懒缆烂滥琅榔狼廊郎朗浪捞劳牢老佬姥酪烙涝勒乐雷镭蕾磊累儡垒擂肋类泪棱楞冷厘梨犁黎篱狸离漓理李里鲤礼莉荔吏栗丽厉励砾历利傈例俐"],["c140","罖罙罛罜罝罞罠罣",4,"罫罬罭罯罰罳罵罶罷罸罺罻罼罽罿羀羂",7,"羋羍羏",4,"羕",4,"羛羜羠羢羣羥羦羨",6,"羱"],["c180","羳",4,"羺羻羾翀翂翃翄翆翇翈翉翋翍翏",4,"翖翗翙",5,"翢翣痢立粒沥隶力璃哩俩联莲连镰廉怜涟帘敛脸链恋炼练粮凉梁粱良两辆量晾亮谅撩聊僚疗燎寥辽潦了撂镣廖料列裂烈劣猎琳林磷霖临邻鳞淋凛赁吝拎玲菱零龄铃伶羚凌灵陵岭领另令溜琉榴硫馏留刘瘤流柳六龙聋咙笼窿"],["c240","翤翧翨翪翫翬翭翯翲翴",6,"翽翾翿耂耇耈耉耊耎耏耑耓耚耛耝耞耟耡耣耤耫",5,"耲耴耹耺耼耾聀聁聄聅聇聈聉聎聏聐聑聓聕聖聗"],["c280","聙聛",13,"聫",5,"聲",11,"隆垄拢陇楼娄搂篓漏陋芦卢颅庐炉掳卤虏鲁麓碌露路赂鹿潞禄录陆戮驴吕铝侣旅履屡缕虑氯律率滤绿峦挛孪滦卵乱掠略抡轮伦仑沦纶论萝螺罗逻锣箩骡裸落洛骆络妈麻玛码蚂马骂嘛吗埋买麦卖迈脉瞒馒蛮满蔓曼慢漫"],["c340","聾肁肂肅肈肊肍",5,"肔肕肗肙肞肣肦肧肨肬肰肳肵肶肸肹肻胅胇",4,"胏",6,"胘胟胠胢胣胦胮胵胷胹胻胾胿脀脁脃脄脅脇脈脋"],["c380","脌脕脗脙脛脜脝脟",12,"脭脮脰脳脴脵脷脹",4,"脿谩芒茫盲氓忙莽猫茅锚毛矛铆卯茂冒帽貌贸么玫枚梅酶霉煤没眉媒镁每美昧寐妹媚门闷们萌蒙檬盟锰猛梦孟眯醚靡糜迷谜弥米秘觅泌蜜密幂棉眠绵冕免勉娩缅面苗描瞄藐秒渺庙妙蔑灭民抿皿敏悯闽明螟鸣铭名命谬摸"],["c440","腀",5,"腇腉腍腎腏腒腖腗腘腛",4,"腡腢腣腤腦腨腪腫腬腯腲腳腵腶腷腸膁膃",4,"膉膋膌膍膎膐膒",5,"膙膚膞",4,"膤膥"],["c480","膧膩膫",7,"膴",5,"膼膽膾膿臄臅臇臈臉臋臍",6,"摹蘑模膜磨摩魔抹末莫墨默沫漠寞陌谋牟某拇牡亩姆母墓暮幕募慕木目睦牧穆拿哪呐钠那娜纳氖乃奶耐奈南男难囊挠脑恼闹淖呢馁内嫩能妮霓倪泥尼拟你匿腻逆溺蔫拈年碾撵捻念娘酿鸟尿捏聂孽啮镊镍涅您柠狞凝宁"],["c540","臔",14,"臤臥臦臨臩臫臮",4,"臵",5,"臽臿舃與",4,"舎舏舑舓舕",5,"舝舠舤舥舦舧舩舮舲舺舼舽舿"],["c580","艀艁艂艃艅艆艈艊艌艍艎艐",7,"艙艛艜艝艞艠",7,"艩拧泞牛扭钮纽脓浓农弄奴努怒女暖虐疟挪懦糯诺哦欧鸥殴藕呕偶沤啪趴爬帕怕琶拍排牌徘湃派攀潘盘磐盼畔判叛乓庞旁耪胖抛咆刨炮袍跑泡呸胚培裴赔陪配佩沛喷盆砰抨烹澎彭蓬棚硼篷膨朋鹏捧碰坯砒霹批披劈琵毗"],["c640","艪艫艬艭艱艵艶艷艸艻艼芀芁芃芅芆芇芉芌芐芓芔芕芖芚芛芞芠芢芣芧芲芵芶芺芻芼芿苀苂苃苅苆苉苐苖苙苚苝苢苧苨苩苪苬苭苮苰苲苳苵苶苸"],["c680","苺苼",4,"茊茋茍茐茒茓茖茘茙茝",9,"茩茪茮茰茲茷茻茽啤脾疲皮匹痞僻屁譬篇偏片骗飘漂瓢票撇瞥拼频贫品聘乒坪苹萍平凭瓶评屏坡泼颇婆破魄迫粕剖扑铺仆莆葡菩蒲埔朴圃普浦谱曝瀑期欺栖戚妻七凄漆柒沏其棋奇歧畦崎脐齐旗祈祁骑起岂乞企启契砌器气迄弃汽泣讫掐"],["c740","茾茿荁荂荄荅荈荊",4,"荓荕",4,"荝荢荰",6,"荹荺荾",6,"莇莈莊莋莌莍莏莐莑莔莕莖莗莙莚莝莟莡",6,"莬莭莮"],["c780","莯莵莻莾莿菂菃菄菆菈菉菋菍菎菐菑菒菓菕菗菙菚菛菞菢菣菤菦菧菨菫菬菭恰洽牵扦钎铅千迁签仟谦乾黔钱钳前潜遣浅谴堑嵌欠歉枪呛腔羌墙蔷强抢橇锹敲悄桥瞧乔侨巧鞘撬翘峭俏窍切茄且怯窃钦侵亲秦琴勤芹擒禽寝沁青轻氢倾卿清擎晴氰情顷请庆琼穷秋丘邱球求囚酋泅趋区蛆曲躯屈驱渠"],["c840","菮華菳",4,"菺菻菼菾菿萀萂萅萇萈萉萊萐萒",5,"萙萚萛萞",5,"萩",7,"萲",5,"萹萺萻萾",7,"葇葈葉"],["c880","葊",6,"葒",4,"葘葝葞葟葠葢葤",4,"葪葮葯葰葲葴葷葹葻葼取娶龋趣去圈颧权醛泉全痊拳犬券劝缺炔瘸却鹊榷确雀裙群然燃冉染瓤壤攘嚷让饶扰绕惹热壬仁人忍韧任认刃妊纫扔仍日戎茸蓉荣融熔溶容绒冗揉柔肉茹蠕儒孺如辱乳汝入褥软阮蕊瑞锐闰润若弱撒洒萨腮鳃塞赛三叁"],["c940","葽",4,"蒃蒄蒅蒆蒊蒍蒏",7,"蒘蒚蒛蒝蒞蒟蒠蒢",12,"蒰蒱蒳蒵蒶蒷蒻蒼蒾蓀蓂蓃蓅蓆蓇蓈蓋蓌蓎蓏蓒蓔蓕蓗"],["c980","蓘",4,"蓞蓡蓢蓤蓧",4,"蓭蓮蓯蓱",10,"蓽蓾蔀蔁蔂伞散桑嗓丧搔骚扫嫂瑟色涩森僧莎砂杀刹沙纱傻啥煞筛晒珊苫杉山删煽衫闪陕擅赡膳善汕扇缮墒伤商赏晌上尚裳梢捎稍烧芍勺韶少哨邵绍奢赊蛇舌舍赦摄射慑涉社设砷申呻伸身深娠绅神沈审婶甚肾慎渗声生甥牲升绳"],["ca40","蔃",8,"蔍蔎蔏蔐蔒蔔蔕蔖蔘蔙蔛蔜蔝蔞蔠蔢",8,"蔭",9,"蔾",4,"蕄蕅蕆蕇蕋",10],["ca80","蕗蕘蕚蕛蕜蕝蕟",4,"蕥蕦蕧蕩",8,"蕳蕵蕶蕷蕸蕼蕽蕿薀薁省盛剩胜圣师失狮施湿诗尸虱十石拾时什食蚀实识史矢使屎驶始式示士世柿事拭誓逝势是嗜噬适仕侍释饰氏市恃室视试收手首守寿授售受瘦兽蔬枢梳殊抒输叔舒淑疏书赎孰熟薯暑曙署蜀黍鼠属术述树束戍竖墅庶数漱"],["cb40","薂薃薆薈",6,"薐",10,"薝",6,"薥薦薧薩薫薬薭薱",5,"薸薺",6,"藂",6,"藊",4,"藑藒"],["cb80","藔藖",5,"藝",6,"藥藦藧藨藪",14,"恕刷耍摔衰甩帅栓拴霜双爽谁水睡税吮瞬顺舜说硕朔烁斯撕嘶思私司丝死肆寺嗣四伺似饲巳松耸怂颂送宋讼诵搜艘擞嗽苏酥俗素速粟僳塑溯宿诉肃酸蒜算虽隋随绥髓碎岁穗遂隧祟孙损笋蓑梭唆缩琐索锁所塌他它她塔"],["cc40","藹藺藼藽藾蘀",4,"蘆",10,"蘒蘓蘔蘕蘗",15,"蘨蘪",13,"蘹蘺蘻蘽蘾蘿虀"],["cc80","虁",11,"虒虓處",4,"虛虜虝號虠虡虣",7,"獭挞蹋踏胎苔抬台泰酞太态汰坍摊贪瘫滩坛檀痰潭谭谈坦毯袒碳探叹炭汤塘搪堂棠膛唐糖倘躺淌趟烫掏涛滔绦萄桃逃淘陶讨套特藤腾疼誊梯剔踢锑提题蹄啼体替嚏惕涕剃屉天添填田甜恬舔腆挑条迢眺跳贴铁帖厅听烃"],["cd40","虭虯虰虲",6,"蚃",6,"蚎",4,"蚔蚖",5,"蚞",4,"蚥蚦蚫蚭蚮蚲蚳蚷蚸蚹蚻",4,"蛁蛂蛃蛅蛈蛌蛍蛒蛓蛕蛖蛗蛚蛜"],["cd80","蛝蛠蛡蛢蛣蛥蛦蛧蛨蛪蛫蛬蛯蛵蛶蛷蛺蛻蛼蛽蛿蜁蜄蜅蜆蜋蜌蜎蜏蜐蜑蜔蜖汀廷停亭庭挺艇通桐酮瞳同铜彤童桶捅筒统痛偷投头透凸秃突图徒途涂屠土吐兔湍团推颓腿蜕褪退吞屯臀拖托脱鸵陀驮驼椭妥拓唾挖哇蛙洼娃瓦袜歪外豌弯湾玩顽丸烷完碗挽晚皖惋宛婉万腕汪王亡枉网往旺望忘妄威"],["ce40","蜙蜛蜝蜟蜠蜤蜦蜧蜨蜪蜫蜬蜭蜯蜰蜲蜳蜵蜶蜸蜹蜺蜼蜽蝀",6,"蝊蝋蝍蝏蝐蝑蝒蝔蝕蝖蝘蝚",5,"蝡蝢蝦",7,"蝯蝱蝲蝳蝵"],["ce80","蝷蝸蝹蝺蝿螀螁螄螆螇螉螊螌螎",4,"螔螕螖螘",6,"螠",4,"巍微危韦违桅围唯惟为潍维苇萎委伟伪尾纬未蔚味畏胃喂魏位渭谓尉慰卫瘟温蚊文闻纹吻稳紊问嗡翁瓮挝蜗涡窝我斡卧握沃巫呜钨乌污诬屋无芜梧吾吴毋武五捂午舞伍侮坞戊雾晤物勿务悟误昔熙析西硒矽晰嘻吸锡牺"],["cf40","螥螦螧螩螪螮螰螱螲螴螶螷螸螹螻螼螾螿蟁",4,"蟇蟈蟉蟌",4,"蟔",6,"蟜蟝蟞蟟蟡蟢蟣蟤蟦蟧蟨蟩蟫蟬蟭蟯",9],["cf80","蟺蟻蟼蟽蟿蠀蠁蠂蠄",5,"蠋",7,"蠔蠗蠘蠙蠚蠜",4,"蠣稀息希悉膝夕惜熄烯溪汐犀檄袭席习媳喜铣洗系隙戏细瞎虾匣霞辖暇峡侠狭下厦夏吓掀锨先仙鲜纤咸贤衔舷闲涎弦嫌显险现献县腺馅羡宪陷限线相厢镶香箱襄湘乡翔祥详想响享项巷橡像向象萧硝霄削哮嚣销消宵淆晓"],["d040","蠤",13,"蠳",5,"蠺蠻蠽蠾蠿衁衂衃衆",5,"衎",5,"衕衖衘衚",6,"衦衧衪衭衯衱衳衴衵衶衸衹衺"],["d080","衻衼袀袃袆袇袉袊袌袎袏袐袑袓袔袕袗",4,"袝",4,"袣袥",5,"小孝校肖啸笑效楔些歇蝎鞋协挟携邪斜胁谐写械卸蟹懈泄泻谢屑薪芯锌欣辛新忻心信衅星腥猩惺兴刑型形邢行醒幸杏性姓兄凶胸匈汹雄熊休修羞朽嗅锈秀袖绣墟戌需虚嘘须徐许蓄酗叙旭序畜恤絮婿绪续轩喧宣悬旋玄"],["d140","袬袮袯袰袲",4,"袸袹袺袻袽袾袿裀裃裄裇裈裊裋裌裍裏裐裑裓裖裗裚",4,"裠裡裦裧裩",6,"裲裵裶裷裺裻製裿褀褁褃",5],["d180","褉褋",4,"褑褔",4,"褜",4,"褢褣褤褦褧褨褩褬褭褮褯褱褲褳褵褷选癣眩绚靴薛学穴雪血勋熏循旬询寻驯巡殉汛训讯逊迅压押鸦鸭呀丫芽牙蚜崖衙涯雅哑亚讶焉咽阉烟淹盐严研蜒岩延言颜阎炎沿奄掩眼衍演艳堰燕厌砚雁唁彦焰宴谚验殃央鸯秧杨扬佯疡羊洋阳氧仰痒养样漾邀腰妖瑶"],["d240","褸",8,"襂襃襅",24,"襠",5,"襧",19,"襼"],["d280","襽襾覀覂覄覅覇",26,"摇尧遥窑谣姚咬舀药要耀椰噎耶爷野冶也页掖业叶曳腋夜液一壹医揖铱依伊衣颐夷遗移仪胰疑沂宜姨彝椅蚁倚已乙矣以艺抑易邑屹亿役臆逸肄疫亦裔意毅忆义益溢诣议谊译异翼翌绎茵荫因殷音阴姻吟银淫寅饮尹引隐"],["d340","覢",30,"觃觍觓觔觕觗觘觙觛觝觟觠觡觢觤觧觨觩觪觬觭觮觰觱觲觴",6],["d380","觻",4,"訁",5,"計",21,"印英樱婴鹰应缨莹萤营荧蝇迎赢盈影颖硬映哟拥佣臃痈庸雍踊蛹咏泳涌永恿勇用幽优悠忧尤由邮铀犹油游酉有友右佑釉诱又幼迂淤于盂榆虞愚舆余俞逾鱼愉渝渔隅予娱雨与屿禹宇语羽玉域芋郁吁遇喻峪御愈欲狱育誉"],["d440","訞",31,"訿",8,"詉",21],["d480","詟",25,"詺",6,"浴寓裕预豫驭鸳渊冤元垣袁原援辕园员圆猿源缘远苑愿怨院曰约越跃钥岳粤月悦阅耘云郧匀陨允运蕴酝晕韵孕匝砸杂栽哉灾宰载再在咱攒暂赞赃脏葬遭糟凿藻枣早澡蚤躁噪造皂灶燥责择则泽贼怎增憎曾赠扎喳渣札轧"],["d540","誁",7,"誋",7,"誔",46],["d580","諃",32,"铡闸眨栅榨咋乍炸诈摘斋宅窄债寨瞻毡詹粘沾盏斩辗崭展蘸栈占战站湛绽樟章彰漳张掌涨杖丈帐账仗胀瘴障招昭找沼赵照罩兆肇召遮折哲蛰辙者锗蔗这浙珍斟真甄砧臻贞针侦枕疹诊震振镇阵蒸挣睁征狰争怔整拯正政"],["d640","諤",34,"謈",27],["d680","謤謥謧",30,"帧症郑证芝枝支吱蜘知肢脂汁之织职直植殖执值侄址指止趾只旨纸志挚掷至致置帜峙制智秩稚质炙痔滞治窒中盅忠钟衷终种肿重仲众舟周州洲诌粥轴肘帚咒皱宙昼骤珠株蛛朱猪诸诛逐竹烛煮拄瞩嘱主著柱助蛀贮铸筑"],["d740","譆",31,"譧",4,"譭",25],["d780","讇",24,"讬讱讻诇诐诪谉谞住注祝驻抓爪拽专砖转撰赚篆桩庄装妆撞壮状椎锥追赘坠缀谆准捉拙卓桌琢茁酌啄着灼浊兹咨资姿滋淄孜紫仔籽滓子自渍字鬃棕踪宗综总纵邹走奏揍租足卒族祖诅阻组钻纂嘴醉最罪尊遵昨左佐柞做作坐座"],["d840","谸",8,"豂豃豄豅豈豊豋豍",7,"豖豗豘豙豛",5,"豣",6,"豬",6,"豴豵豶豷豻",6,"貃貄貆貇"],["d880","貈貋貍",6,"貕貖貗貙",20,"亍丌兀丐廿卅丕亘丞鬲孬噩丨禺丿匕乇夭爻卮氐囟胤馗毓睾鼗丶亟鼐乜乩亓芈孛啬嘏仄厍厝厣厥厮靥赝匚叵匦匮匾赜卦卣刂刈刎刭刳刿剀剌剞剡剜蒯剽劂劁劐劓冂罔亻仃仉仂仨仡仫仞伛仳伢佤仵伥伧伉伫佞佧攸佚佝"],["d940","貮",62],["d980","賭",32,"佟佗伲伽佶佴侑侉侃侏佾佻侪佼侬侔俦俨俪俅俚俣俜俑俟俸倩偌俳倬倏倮倭俾倜倌倥倨偾偃偕偈偎偬偻傥傧傩傺僖儆僭僬僦僮儇儋仝氽佘佥俎龠汆籴兮巽黉馘冁夔勹匍訇匐凫夙兕亠兖亳衮袤亵脔裒禀嬴蠃羸冫冱冽冼"],["da40","贎",14,"贠赑赒赗赟赥赨赩赪赬赮赯赱赲赸",8,"趂趃趆趇趈趉趌",4,"趒趓趕",9,"趠趡"],["da80","趢趤",12,"趲趶趷趹趻趽跀跁跂跅跇跈跉跊跍跐跒跓跔凇冖冢冥讠讦讧讪讴讵讷诂诃诋诏诎诒诓诔诖诘诙诜诟诠诤诨诩诮诰诳诶诹诼诿谀谂谄谇谌谏谑谒谔谕谖谙谛谘谝谟谠谡谥谧谪谫谮谯谲谳谵谶卩卺阝阢阡阱阪阽阼陂陉陔陟陧陬陲陴隈隍隗隰邗邛邝邙邬邡邴邳邶邺"],["db40","跕跘跙跜跠跡跢跥跦跧跩跭跮跰跱跲跴跶跼跾",6,"踆踇踈踋踍踎踐踑踒踓踕",7,"踠踡踤",4,"踫踭踰踲踳踴踶踷踸踻踼踾"],["db80","踿蹃蹅蹆蹌",4,"蹓",5,"蹚",11,"蹧蹨蹪蹫蹮蹱邸邰郏郅邾郐郄郇郓郦郢郜郗郛郫郯郾鄄鄢鄞鄣鄱鄯鄹酃酆刍奂劢劬劭劾哿勐勖勰叟燮矍廴凵凼鬯厶弁畚巯坌垩垡塾墼壅壑圩圬圪圳圹圮圯坜圻坂坩垅坫垆坼坻坨坭坶坳垭垤垌垲埏垧垴垓垠埕埘埚埙埒垸埴埯埸埤埝"],["dc40","蹳蹵蹷",4,"蹽蹾躀躂躃躄躆躈",6,"躑躒躓躕",6,"躝躟",11,"躭躮躰躱躳",6,"躻",7],["dc80","軃",10,"軏",21,"堋堍埽埭堀堞堙塄堠塥塬墁墉墚墀馨鼙懿艹艽艿芏芊芨芄芎芑芗芙芫芸芾芰苈苊苣芘芷芮苋苌苁芩芴芡芪芟苄苎芤苡茉苷苤茏茇苜苴苒苘茌苻苓茑茚茆茔茕苠苕茜荑荛荜茈莒茼茴茱莛荞茯荏荇荃荟荀茗荠茭茺茳荦荥"],["dd40","軥",62],["dd80","輤",32,"荨茛荩荬荪荭荮莰荸莳莴莠莪莓莜莅荼莶莩荽莸荻莘莞莨莺莼菁萁菥菘堇萘萋菝菽菖萜萸萑萆菔菟萏萃菸菹菪菅菀萦菰菡葜葑葚葙葳蒇蒈葺蒉葸萼葆葩葶蒌蒎萱葭蓁蓍蓐蓦蒽蓓蓊蒿蒺蓠蒡蒹蒴蒗蓥蓣蔌甍蔸蓰蔹蔟蔺"],["de40","轅",32,"轪辀辌辒辝辠辡辢辤辥辦辧辪辬辭辮辯農辳辴辵辷辸辺辻込辿迀迃迆"],["de80","迉",4,"迏迒迖迗迚迠迡迣迧迬迯迱迲迴迵迶迺迻迼迾迿逇逈逌逎逓逕逘蕖蔻蓿蓼蕙蕈蕨蕤蕞蕺瞢蕃蕲蕻薤薨薇薏蕹薮薜薅薹薷薰藓藁藜藿蘧蘅蘩蘖蘼廾弈夼奁耷奕奚奘匏尢尥尬尴扌扪抟抻拊拚拗拮挢拶挹捋捃掭揶捱捺掎掴捭掬掊捩掮掼揲揸揠揿揄揞揎摒揆掾摅摁搋搛搠搌搦搡摞撄摭撖"],["df40","這逜連逤逥逧",5,"逰",4,"逷逹逺逽逿遀遃遅遆遈",4,"過達違遖遙遚遜",5,"遤遦遧適遪遫遬遯",4,"遶",6,"遾邁"],["df80","還邅邆邇邉邊邌",4,"邒邔邖邘邚邜邞邟邠邤邥邧邨邩邫邭邲邷邼邽邿郀摺撷撸撙撺擀擐擗擤擢攉攥攮弋忒甙弑卟叱叽叩叨叻吒吖吆呋呒呓呔呖呃吡呗呙吣吲咂咔呷呱呤咚咛咄呶呦咝哐咭哂咴哒咧咦哓哔呲咣哕咻咿哌哙哚哜咩咪咤哝哏哞唛哧唠哽唔哳唢唣唏唑唧唪啧喏喵啉啭啁啕唿啐唼"],["e040","郂郃郆郈郉郋郌郍郒郔郕郖郘郙郚郞郟郠郣郤郥郩郪郬郮郰郱郲郳郵郶郷郹郺郻郼郿鄀鄁鄃鄅",19,"鄚鄛鄜"],["e080","鄝鄟鄠鄡鄤",10,"鄰鄲",6,"鄺",8,"酄唷啖啵啶啷唳唰啜喋嗒喃喱喹喈喁喟啾嗖喑啻嗟喽喾喔喙嗪嗷嗉嘟嗑嗫嗬嗔嗦嗝嗄嗯嗥嗲嗳嗌嗍嗨嗵嗤辔嘞嘈嘌嘁嘤嘣嗾嘀嘧嘭噘嘹噗嘬噍噢噙噜噌噔嚆噤噱噫噻噼嚅嚓嚯囔囗囝囡囵囫囹囿圄圊圉圜帏帙帔帑帱帻帼"],["e140","酅酇酈酑酓酔酕酖酘酙酛酜酟酠酦酧酨酫酭酳酺酻酼醀",4,"醆醈醊醎醏醓",6,"醜",5,"醤",5,"醫醬醰醱醲醳醶醷醸醹醻"],["e180","醼",10,"釈釋釐釒",9,"針",8,"帷幄幔幛幞幡岌屺岍岐岖岈岘岙岑岚岜岵岢岽岬岫岱岣峁岷峄峒峤峋峥崂崃崧崦崮崤崞崆崛嵘崾崴崽嵬嵛嵯嵝嵫嵋嵊嵩嵴嶂嶙嶝豳嶷巅彳彷徂徇徉後徕徙徜徨徭徵徼衢彡犭犰犴犷犸狃狁狎狍狒狨狯狩狲狴狷猁狳猃狺"],["e240","釦",62],["e280","鈥",32,"狻猗猓猡猊猞猝猕猢猹猥猬猸猱獐獍獗獠獬獯獾舛夥飧夤夂饣饧",5,"饴饷饽馀馄馇馊馍馐馑馓馔馕庀庑庋庖庥庠庹庵庾庳赓廒廑廛廨廪膺忄忉忖忏怃忮怄忡忤忾怅怆忪忭忸怙怵怦怛怏怍怩怫怊怿怡恸恹恻恺恂"],["e340","鉆",45,"鉵",16],["e380","銆",7,"銏",24,"恪恽悖悚悭悝悃悒悌悛惬悻悱惝惘惆惚悴愠愦愕愣惴愀愎愫慊慵憬憔憧憷懔懵忝隳闩闫闱闳闵闶闼闾阃阄阆阈阊阋阌阍阏阒阕阖阗阙阚丬爿戕氵汔汜汊沣沅沐沔沌汨汩汴汶沆沩泐泔沭泷泸泱泗沲泠泖泺泫泮沱泓泯泾"],["e440","銨",5,"銯",24,"鋉",31],["e480","鋩",32,"洹洧洌浃浈洇洄洙洎洫浍洮洵洚浏浒浔洳涑浯涞涠浞涓涔浜浠浼浣渚淇淅淞渎涿淠渑淦淝淙渖涫渌涮渫湮湎湫溲湟溆湓湔渲渥湄滟溱溘滠漭滢溥溧溽溻溷滗溴滏溏滂溟潢潆潇漤漕滹漯漶潋潴漪漉漩澉澍澌潸潲潼潺濑"],["e540","錊",51,"錿",10],["e580","鍊",31,"鍫濉澧澹澶濂濡濮濞濠濯瀚瀣瀛瀹瀵灏灞宀宄宕宓宥宸甯骞搴寤寮褰寰蹇謇辶迓迕迥迮迤迩迦迳迨逅逄逋逦逑逍逖逡逵逶逭逯遄遑遒遐遨遘遢遛暹遴遽邂邈邃邋彐彗彖彘尻咫屐屙孱屣屦羼弪弩弭艴弼鬻屮妁妃妍妩妪妣"],["e640","鍬",34,"鎐",27],["e680","鎬",29,"鏋鏌鏍妗姊妫妞妤姒妲妯姗妾娅娆姝娈姣姘姹娌娉娲娴娑娣娓婀婧婊婕娼婢婵胬媪媛婷婺媾嫫媲嫒嫔媸嫠嫣嫱嫖嫦嫘嫜嬉嬗嬖嬲嬷孀尕尜孚孥孳孑孓孢驵驷驸驺驿驽骀骁骅骈骊骐骒骓骖骘骛骜骝骟骠骢骣骥骧纟纡纣纥纨纩"],["e740","鏎",7,"鏗",54],["e780","鐎",32,"纭纰纾绀绁绂绉绋绌绐绔绗绛绠绡绨绫绮绯绱绲缍绶绺绻绾缁缂缃缇缈缋缌缏缑缒缗缙缜缛缟缡",6,"缪缫缬缭缯",4,"缵幺畿巛甾邕玎玑玮玢玟珏珂珑玷玳珀珉珈珥珙顼琊珩珧珞玺珲琏琪瑛琦琥琨琰琮琬"],["e840","鐯",14,"鐿",43,"鑬鑭鑮鑯"],["e880","鑰",20,"钑钖钘铇铏铓铔铚铦铻锜锠琛琚瑁瑜瑗瑕瑙瑷瑭瑾璜璎璀璁璇璋璞璨璩璐璧瓒璺韪韫韬杌杓杞杈杩枥枇杪杳枘枧杵枨枞枭枋杷杼柰栉柘栊柩枰栌柙枵柚枳柝栀柃枸柢栎柁柽栲栳桠桡桎桢桄桤梃栝桕桦桁桧桀栾桊桉栩梵梏桴桷梓桫棂楮棼椟椠棹"],["e940","锧锳锽镃镈镋镕镚镠镮镴镵長",7,"門",42],["e980","閫",32,"椤棰椋椁楗棣椐楱椹楠楂楝榄楫榀榘楸椴槌榇榈槎榉楦楣楹榛榧榻榫榭槔榱槁槊槟榕槠榍槿樯槭樗樘橥槲橄樾檠橐橛樵檎橹樽樨橘橼檑檐檩檗檫猷獒殁殂殇殄殒殓殍殚殛殡殪轫轭轱轲轳轵轶轸轷轹轺轼轾辁辂辄辇辋"],["ea40","闌",27,"闬闿阇阓阘阛阞阠阣",6,"阫阬阭阯阰阷阸阹阺阾陁陃陊陎陏陑陒陓陖陗"],["ea80","陘陙陚陜陝陞陠陣陥陦陫陭",4,"陳陸",12,"隇隉隊辍辎辏辘辚軎戋戗戛戟戢戡戥戤戬臧瓯瓴瓿甏甑甓攴旮旯旰昊昙杲昃昕昀炅曷昝昴昱昶昵耆晟晔晁晏晖晡晗晷暄暌暧暝暾曛曜曦曩贲贳贶贻贽赀赅赆赈赉赇赍赕赙觇觊觋觌觎觏觐觑牮犟牝牦牯牾牿犄犋犍犏犒挈挲掰"],["eb40","隌階隑隒隓隕隖隚際隝",9,"隨",7,"隱隲隴隵隷隸隺隻隿雂雃雈雊雋雐雑雓雔雖",9,"雡",6,"雫"],["eb80","雬雭雮雰雱雲雴雵雸雺電雼雽雿霂霃霅霊霋霌霐霑霒霔霕霗",4,"霝霟霠搿擘耄毪毳毽毵毹氅氇氆氍氕氘氙氚氡氩氤氪氲攵敕敫牍牒牖爰虢刖肟肜肓肼朊肽肱肫肭肴肷胧胨胩胪胛胂胄胙胍胗朐胝胫胱胴胭脍脎胲胼朕脒豚脶脞脬脘脲腈腌腓腴腙腚腱腠腩腼腽腭腧塍媵膈膂膑滕膣膪臌朦臊膻"],["ec40","霡",8,"霫霬霮霯霱霳",4,"霺霻霼霽霿",18,"靔靕靗靘靚靜靝靟靣靤靦靧靨靪",7],["ec80","靲靵靷",4,"靽",7,"鞆",4,"鞌鞎鞏鞐鞓鞕鞖鞗鞙",4,"臁膦欤欷欹歃歆歙飑飒飓飕飙飚殳彀毂觳斐齑斓於旆旄旃旌旎旒旖炀炜炖炝炻烀炷炫炱烨烊焐焓焖焯焱煳煜煨煅煲煊煸煺熘熳熵熨熠燠燔燧燹爝爨灬焘煦熹戾戽扃扈扉礻祀祆祉祛祜祓祚祢祗祠祯祧祺禅禊禚禧禳忑忐"],["ed40","鞞鞟鞡鞢鞤",6,"鞬鞮鞰鞱鞳鞵",46],["ed80","韤韥韨韮",4,"韴韷",23,"怼恝恚恧恁恙恣悫愆愍慝憩憝懋懑戆肀聿沓泶淼矶矸砀砉砗砘砑斫砭砜砝砹砺砻砟砼砥砬砣砩硎硭硖硗砦硐硇硌硪碛碓碚碇碜碡碣碲碹碥磔磙磉磬磲礅磴礓礤礞礴龛黹黻黼盱眄眍盹眇眈眚眢眙眭眦眵眸睐睑睇睃睚睨"],["ee40","頏",62],["ee80","顎",32,"睢睥睿瞍睽瞀瞌瞑瞟瞠瞰瞵瞽町畀畎畋畈畛畲畹疃罘罡罟詈罨罴罱罹羁罾盍盥蠲钅钆钇钋钊钌钍钏钐钔钗钕钚钛钜钣钤钫钪钭钬钯钰钲钴钶",4,"钼钽钿铄铈",6,"铐铑铒铕铖铗铙铘铛铞铟铠铢铤铥铧铨铪"],["ef40","顯",5,"颋颎颒颕颙颣風",37,"飏飐飔飖飗飛飜飝飠",4],["ef80","飥飦飩",30,"铩铫铮铯铳铴铵铷铹铼铽铿锃锂锆锇锉锊锍锎锏锒",4,"锘锛锝锞锟锢锪锫锩锬锱锲锴锶锷锸锼锾锿镂锵镄镅镆镉镌镎镏镒镓镔镖镗镘镙镛镞镟镝镡镢镤",8,"镯镱镲镳锺矧矬雉秕秭秣秫稆嵇稃稂稞稔"],["f040","餈",4,"餎餏餑",28,"餯",26],["f080","饊",9,"饖",12,"饤饦饳饸饹饻饾馂馃馉稹稷穑黏馥穰皈皎皓皙皤瓞瓠甬鸠鸢鸨",4,"鸲鸱鸶鸸鸷鸹鸺鸾鹁鹂鹄鹆鹇鹈鹉鹋鹌鹎鹑鹕鹗鹚鹛鹜鹞鹣鹦",6,"鹱鹭鹳疒疔疖疠疝疬疣疳疴疸痄疱疰痃痂痖痍痣痨痦痤痫痧瘃痱痼痿瘐瘀瘅瘌瘗瘊瘥瘘瘕瘙"],["f140","馌馎馚",10,"馦馧馩",47],["f180","駙",32,"瘛瘼瘢瘠癀瘭瘰瘿瘵癃瘾瘳癍癞癔癜癖癫癯翊竦穸穹窀窆窈窕窦窠窬窨窭窳衤衩衲衽衿袂袢裆袷袼裉裢裎裣裥裱褚裼裨裾裰褡褙褓褛褊褴褫褶襁襦襻疋胥皲皴矜耒耔耖耜耠耢耥耦耧耩耨耱耋耵聃聆聍聒聩聱覃顸颀颃"],["f240","駺",62],["f280","騹",32,"颉颌颍颏颔颚颛颞颟颡颢颥颦虍虔虬虮虿虺虼虻蚨蚍蚋蚬蚝蚧蚣蚪蚓蚩蚶蛄蚵蛎蚰蚺蚱蚯蛉蛏蚴蛩蛱蛲蛭蛳蛐蜓蛞蛴蛟蛘蛑蜃蜇蛸蜈蜊蜍蜉蜣蜻蜞蜥蜮蜚蜾蝈蜴蜱蜩蜷蜿螂蜢蝽蝾蝻蝠蝰蝌蝮螋蝓蝣蝼蝤蝙蝥螓螯螨蟒"],["f340","驚",17,"驲骃骉骍骎骔骕骙骦骩",6,"骲骳骴骵骹骻骽骾骿髃髄髆",4,"髍髎髏髐髒體髕髖髗髙髚髛髜"],["f380","髝髞髠髢髣髤髥髧髨髩髪髬髮髰",8,"髺髼",6,"鬄鬅鬆蟆螈螅螭螗螃螫蟥螬螵螳蟋蟓螽蟑蟀蟊蟛蟪蟠蟮蠖蠓蟾蠊蠛蠡蠹蠼缶罂罄罅舐竺竽笈笃笄笕笊笫笏筇笸笪笙笮笱笠笥笤笳笾笞筘筚筅筵筌筝筠筮筻筢筲筱箐箦箧箸箬箝箨箅箪箜箢箫箴篑篁篌篝篚篥篦篪簌篾篼簏簖簋"],["f440","鬇鬉",5,"鬐鬑鬒鬔",10,"鬠鬡鬢鬤",10,"鬰鬱鬳",7,"鬽鬾鬿魀魆魊魋魌魎魐魒魓魕",5],["f480","魛",32,"簟簪簦簸籁籀臾舁舂舄臬衄舡舢舣舭舯舨舫舸舻舳舴舾艄艉艋艏艚艟艨衾袅袈裘裟襞羝羟羧羯羰羲籼敉粑粝粜粞粢粲粼粽糁糇糌糍糈糅糗糨艮暨羿翎翕翥翡翦翩翮翳糸絷綦綮繇纛麸麴赳趄趔趑趱赧赭豇豉酊酐酎酏酤"],["f540","魼",62],["f580","鮻",32,"酢酡酰酩酯酽酾酲酴酹醌醅醐醍醑醢醣醪醭醮醯醵醴醺豕鹾趸跫踅蹙蹩趵趿趼趺跄跖跗跚跞跎跏跛跆跬跷跸跣跹跻跤踉跽踔踝踟踬踮踣踯踺蹀踹踵踽踱蹉蹁蹂蹑蹒蹊蹰蹶蹼蹯蹴躅躏躔躐躜躞豸貂貊貅貘貔斛觖觞觚觜"],["f640","鯜",62],["f680","鰛",32,"觥觫觯訾謦靓雩雳雯霆霁霈霏霎霪霭霰霾龀龃龅",5,"龌黾鼋鼍隹隼隽雎雒瞿雠銎銮鋈錾鍪鏊鎏鐾鑫鱿鲂鲅鲆鲇鲈稣鲋鲎鲐鲑鲒鲔鲕鲚鲛鲞",5,"鲥",4,"鲫鲭鲮鲰",7,"鲺鲻鲼鲽鳄鳅鳆鳇鳊鳋"],["f740","鰼",62],["f780","鱻鱽鱾鲀鲃鲄鲉鲊鲌鲏鲓鲖鲗鲘鲙鲝鲪鲬鲯鲹鲾",4,"鳈鳉鳑鳒鳚鳛鳠鳡鳌",4,"鳓鳔鳕鳗鳘鳙鳜鳝鳟鳢靼鞅鞑鞒鞔鞯鞫鞣鞲鞴骱骰骷鹘骶骺骼髁髀髅髂髋髌髑魅魃魇魉魈魍魑飨餍餮饕饔髟髡髦髯髫髻髭髹鬈鬏鬓鬟鬣麽麾縻麂麇麈麋麒鏖麝麟黛黜黝黠黟黢黩黧黥黪黯鼢鼬鼯鼹鼷鼽鼾齄"],["f840","鳣",62],["f880","鴢",32],["f940","鵃",62],["f980","鶂",32],["fa40","鶣",62],["fa80","鷢",32],["fb40","鸃",27,"鸤鸧鸮鸰鸴鸻鸼鹀鹍鹐鹒鹓鹔鹖鹙鹝鹟鹠鹡鹢鹥鹮鹯鹲鹴",9,"麀"],["fb80","麁麃麄麅麆麉麊麌",5,"麔",8,"麞麠",5,"麧麨麩麪"],["fc40","麫",8,"麵麶麷麹麺麼麿",4,"黅黆黇黈黊黋黌黐黒黓黕黖黗黙黚點黡黣黤黦黨黫黬黭黮黰",8,"黺黽黿",6],["fc80","鼆",4,"鼌鼏鼑鼒鼔鼕鼖鼘鼚",5,"鼡鼣",8,"鼭鼮鼰鼱"],["fd40","鼲",4,"鼸鼺鼼鼿",4,"齅",10,"齒",38],["fd80","齹",5,"龁龂龍",11,"龜龝龞龡",4,"郎凉秊裏隣"],["fe40","兀嗀﨎﨏﨑﨓﨔礼﨟蘒﨡﨣﨤﨧﨨﨩"]]
+
+/***/ }),
+/* 278 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// @flow
+
+/*::
+declare var __webpack_require__: mixed;
+*/
+
+module.exports = typeof __webpack_require__ !== "undefined";
+
+
+/***/ }),
+/* 279 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+
+var yaml = __webpack_require__(280);
+
+
+module.exports = yaml;
+
+
+/***/ }),
+/* 280 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+
+var loader = __webpack_require__(282);
+var dumper = __webpack_require__(281);
+
+
+function deprecated(name) {
+  return function () {
+    throw new Error('Function ' + name + ' is deprecated and cannot be used.');
+  };
+}
+
+
+module.exports.Type                = __webpack_require__(10);
+module.exports.Schema              = __webpack_require__(44);
+module.exports.FAILSAFE_SCHEMA     = __webpack_require__(100);
+module.exports.JSON_SCHEMA         = __webpack_require__(144);
+module.exports.CORE_SCHEMA         = __webpack_require__(143);
+module.exports.DEFAULT_SAFE_SCHEMA = __webpack_require__(55);
+module.exports.DEFAULT_FULL_SCHEMA = __webpack_require__(73);
+module.exports.load                = loader.load;
+module.exports.loadAll             = loader.loadAll;
+module.exports.safeLoad            = loader.safeLoad;
+module.exports.safeLoadAll         = loader.safeLoadAll;
+module.exports.dump                = dumper.dump;
+module.exports.safeDump            = dumper.safeDump;
+module.exports.YAMLException       = __webpack_require__(54);
+
+// Deprecated schema names from JS-YAML 2.0.x
+module.exports.MINIMAL_SCHEMA = __webpack_require__(100);
+module.exports.SAFE_SCHEMA    = __webpack_require__(55);
+module.exports.DEFAULT_SCHEMA = __webpack_require__(73);
+
+// Deprecated functions from JS-YAML 1.x.x
+module.exports.scan           = deprecated('scan');
+module.exports.parse          = deprecated('parse');
+module.exports.compose        = deprecated('compose');
+module.exports.addConstructor = deprecated('addConstructor');
+
+
+/***/ }),
+/* 281 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+/*eslint-disable no-use-before-define*/
+
+var common              = __webpack_require__(43);
+var YAMLException       = __webpack_require__(54);
+var DEFAULT_FULL_SCHEMA = __webpack_require__(73);
+var DEFAULT_SAFE_SCHEMA = __webpack_require__(55);
+
+var _toString       = Object.prototype.toString;
+var _hasOwnProperty = Object.prototype.hasOwnProperty;
+
+var CHAR_TAB                  = 0x09; /* Tab */
+var CHAR_LINE_FEED            = 0x0A; /* LF */
+var CHAR_SPACE                = 0x20; /* Space */
+var CHAR_EXCLAMATION          = 0x21; /* ! */
+var CHAR_DOUBLE_QUOTE         = 0x22; /* " */
+var CHAR_SHARP                = 0x23; /* # */
+var CHAR_PERCENT              = 0x25; /* % */
+var CHAR_AMPERSAND            = 0x26; /* & */
+var CHAR_SINGLE_QUOTE         = 0x27; /* ' */
+var CHAR_ASTERISK             = 0x2A; /* * */
+var CHAR_COMMA                = 0x2C; /* , */
+var CHAR_MINUS                = 0x2D; /* - */
+var CHAR_COLON                = 0x3A; /* : */
+var CHAR_GREATER_THAN         = 0x3E; /* > */
+var CHAR_QUESTION             = 0x3F; /* ? */
+var CHAR_COMMERCIAL_AT        = 0x40; /* @ */
+var CHAR_LEFT_SQUARE_BRACKET  = 0x5B; /* [ */
+var CHAR_RIGHT_SQUARE_BRACKET = 0x5D; /* ] */
+var CHAR_GRAVE_ACCENT         = 0x60; /* ` */
+var CHAR_LEFT_CURLY_BRACKET   = 0x7B; /* { */
+var CHAR_VERTICAL_LINE        = 0x7C; /* | */
+var CHAR_RIGHT_CURLY_BRACKET  = 0x7D; /* } */
+
+var ESCAPE_SEQUENCES = {};
+
+ESCAPE_SEQUENCES[0x00]   = '\\0';
+ESCAPE_SEQUENCES[0x07]   = '\\a';
+ESCAPE_SEQUENCES[0x08]   = '\\b';
+ESCAPE_SEQUENCES[0x09]   = '\\t';
+ESCAPE_SEQUENCES[0x0A]   = '\\n';
+ESCAPE_SEQUENCES[0x0B]   = '\\v';
+ESCAPE_SEQUENCES[0x0C]   = '\\f';
+ESCAPE_SEQUENCES[0x0D]   = '\\r';
+ESCAPE_SEQUENCES[0x1B]   = '\\e';
+ESCAPE_SEQUENCES[0x22]   = '\\"';
+ESCAPE_SEQUENCES[0x5C]   = '\\\\';
+ESCAPE_SEQUENCES[0x85]   = '\\N';
+ESCAPE_SEQUENCES[0xA0]   = '\\_';
+ESCAPE_SEQUENCES[0x2028] = '\\L';
+ESCAPE_SEQUENCES[0x2029] = '\\P';
+
+var DEPRECATED_BOOLEANS_SYNTAX = [
+  'y', 'Y', 'yes', 'Yes', 'YES', 'on', 'On', 'ON',
+  'n', 'N', 'no', 'No', 'NO', 'off', 'Off', 'OFF'
+];
+
+function compileStyleMap(schema, map) {
+  var result, keys, index, length, tag, style, type;
+
+  if (map === null) return {};
+
+  result = {};
+  keys = Object.keys(map);
+
+  for (index = 0, length = keys.length; index < length; index += 1) {
+    tag = keys[index];
+    style = String(map[tag]);
+
+    if (tag.slice(0, 2) === '!!') {
+      tag = 'tag:yaml.org,2002:' + tag.slice(2);
+    }
+    type = schema.compiledTypeMap['fallback'][tag];
+
+    if (type && _hasOwnProperty.call(type.styleAliases, style)) {
+      style = type.styleAliases[style];
+    }
+
+    result[tag] = style;
+  }
+
+  return result;
+}
+
+function encodeHex(character) {
+  var string, handle, length;
+
+  string = character.toString(16).toUpperCase();
+
+  if (character <= 0xFF) {
+    handle = 'x';
+    length = 2;
+  } else if (character <= 0xFFFF) {
+    handle = 'u';
+    length = 4;
+  } else if (character <= 0xFFFFFFFF) {
+    handle = 'U';
+    length = 8;
+  } else {
+    throw new YAMLException('code point within a string may not be greater than 0xFFFFFFFF');
+  }
+
+  return '\\' + handle + common.repeat('0', length - string.length) + string;
+}
+
+function State(options) {
+  this.schema        = options['schema'] || DEFAULT_FULL_SCHEMA;
+  this.indent        = Math.max(1, (options['indent'] || 2));
+  this.noArrayIndent = options['noArrayIndent'] || false;
+  this.skipInvalid   = options['skipInvalid'] || false;
+  this.flowLevel     = (common.isNothing(options['flowLevel']) ? -1 : options['flowLevel']);
+  this.styleMap      = compileStyleMap(this.schema, options['styles'] || null);
+  this.sortKeys      = options['sortKeys'] || false;
+  this.lineWidth     = options['lineWidth'] || 80;
+  this.noRefs        = options['noRefs'] || false;
+  this.noCompatMode  = options['noCompatMode'] || false;
+  this.condenseFlow  = options['condenseFlow'] || false;
+
+  this.implicitTypes = this.schema.compiledImplicit;
+  this.explicitTypes = this.schema.compiledExplicit;
+
+  this.tag = null;
+  this.result = '';
+
+  this.duplicates = [];
+  this.usedDuplicates = null;
+}
+
+// Indents every line in a string. Empty lines (\n only) are not indented.
+function indentString(string, spaces) {
+  var ind = common.repeat(' ', spaces),
+      position = 0,
+      next = -1,
+      result = '',
+      line,
+      length = string.length;
+
+  while (position < length) {
+    next = string.indexOf('\n', position);
+    if (next === -1) {
+      line = string.slice(position);
+      position = length;
+    } else {
+      line = string.slice(position, next + 1);
+      position = next + 1;
+    }
+
+    if (line.length && line !== '\n') result += ind;
+
+    result += line;
+  }
+
+  return result;
+}
+
+function generateNextLine(state, level) {
+  return '\n' + common.repeat(' ', state.indent * level);
+}
+
+function testImplicitResolving(state, str) {
+  var index, length, type;
+
+  for (index = 0, length = state.implicitTypes.length; index < length; index += 1) {
+    type = state.implicitTypes[index];
+
+    if (type.resolve(str)) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+// [33] s-white ::= s-space | s-tab
+function isWhitespace(c) {
+  return c === CHAR_SPACE || c === CHAR_TAB;
+}
+
+// Returns true if the character can be printed without escaping.
+// From YAML 1.2: "any allowed characters known to be non-printable
+// should also be escaped. [However,] This isn’t mandatory"
+// Derived from nb-char - \t - #x85 - #xA0 - #x2028 - #x2029.
+function isPrintable(c) {
+  return  (0x00020 <= c && c <= 0x00007E)
+      || ((0x000A1 <= c && c <= 0x00D7FF) && c !== 0x2028 && c !== 0x2029)
+      || ((0x0E000 <= c && c <= 0x00FFFD) && c !== 0xFEFF /* BOM */)
+      ||  (0x10000 <= c && c <= 0x10FFFF);
+}
+
+// Simplified test for values allowed after the first character in plain style.
+function isPlainSafe(c) {
+  // Uses a subset of nb-char - c-flow-indicator - ":" - "#"
+  // where nb-char ::= c-printable - b-char - c-byte-order-mark.
+  return isPrintable(c) && c !== 0xFEFF
+    // - c-flow-indicator
+    && c !== CHAR_COMMA
+    && c !== CHAR_LEFT_SQUARE_BRACKET
+    && c !== CHAR_RIGHT_SQUARE_BRACKET
+    && c !== CHAR_LEFT_CURLY_BRACKET
+    && c !== CHAR_RIGHT_CURLY_BRACKET
+    // - ":" - "#"
+    && c !== CHAR_COLON
+    && c !== CHAR_SHARP;
+}
+
+// Simplified test for values allowed as the first character in plain style.
+function isPlainSafeFirst(c) {
+  // Uses a subset of ns-char - c-indicator
+  // where ns-char = nb-char - s-white.
+  return isPrintable(c) && c !== 0xFEFF
+    && !isWhitespace(c) // - s-white
+    // - (c-indicator ::=
+    // “-” | “?” | “:” | “,” | “[” | “]” | “{” | “}”
+    && c !== CHAR_MINUS
+    && c !== CHAR_QUESTION
+    && c !== CHAR_COLON
+    && c !== CHAR_COMMA
+    && c !== CHAR_LEFT_SQUARE_BRACKET
+    && c !== CHAR_RIGHT_SQUARE_BRACKET
+    && c !== CHAR_LEFT_CURLY_BRACKET
+    && c !== CHAR_RIGHT_CURLY_BRACKET
+    // | “#” | “&” | “*” | “!” | “|” | “>” | “'” | “"”
+    && c !== CHAR_SHARP
+    && c !== CHAR_AMPERSAND
+    && c !== CHAR_ASTERISK
+    && c !== CHAR_EXCLAMATION
+    && c !== CHAR_VERTICAL_LINE
+    && c !== CHAR_GREATER_THAN
+    && c !== CHAR_SINGLE_QUOTE
+    && c !== CHAR_DOUBLE_QUOTE
+    // | “%” | “@” | “`”)
+    && c !== CHAR_PERCENT
+    && c !== CHAR_COMMERCIAL_AT
+    && c !== CHAR_GRAVE_ACCENT;
+}
+
+// Determines whether block indentation indicator is required.
+function needIndentIndicator(string) {
+  var leadingSpaceRe = /^\n* /;
+  return leadingSpaceRe.test(string);
+}
+
+var STYLE_PLAIN   = 1,
+    STYLE_SINGLE  = 2,
+    STYLE_LITERAL = 3,
+    STYLE_FOLDED  = 4,
+    STYLE_DOUBLE  = 5;
+
+// Determines which scalar styles are possible and returns the preferred style.
+// lineWidth = -1 => no limit.
+// Pre-conditions: str.length > 0.
+// Post-conditions:
+//    STYLE_PLAIN or STYLE_SINGLE => no \n are in the string.
+//    STYLE_LITERAL => no lines are suitable for folding (or lineWidth is -1).
+//    STYLE_FOLDED => a line > lineWidth and can be folded (and lineWidth != -1).
+function chooseScalarStyle(string, singleLineOnly, indentPerLevel, lineWidth, testAmbiguousType) {
+  var i;
+  var char;
+  var hasLineBreak = false;
+  var hasFoldableLine = false; // only checked if shouldTrackWidth
+  var shouldTrackWidth = lineWidth !== -1;
+  var previousLineBreak = -1; // count the first line correctly
+  var plain = isPlainSafeFirst(string.charCodeAt(0))
+          && !isWhitespace(string.charCodeAt(string.length - 1));
+
+  if (singleLineOnly) {
+    // Case: no block styles.
+    // Check for disallowed characters to rule out plain and single.
+    for (i = 0; i < string.length; i++) {
+      char = string.charCodeAt(i);
+      if (!isPrintable(char)) {
+        return STYLE_DOUBLE;
+      }
+      plain = plain && isPlainSafe(char);
+    }
+  } else {
+    // Case: block styles permitted.
+    for (i = 0; i < string.length; i++) {
+      char = string.charCodeAt(i);
+      if (char === CHAR_LINE_FEED) {
+        hasLineBreak = true;
+        // Check if any line can be folded.
+        if (shouldTrackWidth) {
+          hasFoldableLine = hasFoldableLine ||
+            // Foldable line = too long, and not more-indented.
+            (i - previousLineBreak - 1 > lineWidth &&
+             string[previousLineBreak + 1] !== ' ');
+          previousLineBreak = i;
+        }
+      } else if (!isPrintable(char)) {
+        return STYLE_DOUBLE;
+      }
+      plain = plain && isPlainSafe(char);
+    }
+    // in case the end is missing a \n
+    hasFoldableLine = hasFoldableLine || (shouldTrackWidth &&
+      (i - previousLineBreak - 1 > lineWidth &&
+       string[previousLineBreak + 1] !== ' '));
+  }
+  // Although every style can represent \n without escaping, prefer block styles
+  // for multiline, since they're more readable and they don't add empty lines.
+  // Also prefer folding a super-long line.
+  if (!hasLineBreak && !hasFoldableLine) {
+    // Strings interpretable as another type have to be quoted;
+    // e.g. the string 'true' vs. the boolean true.
+    return plain && !testAmbiguousType(string)
+      ? STYLE_PLAIN : STYLE_SINGLE;
+  }
+  // Edge case: block indentation indicator can only have one digit.
+  if (indentPerLevel > 9 && needIndentIndicator(string)) {
+    return STYLE_DOUBLE;
+  }
+  // At this point we know block styles are valid.
+  // Prefer literal style unless we want to fold.
+  return hasFoldableLine ? STYLE_FOLDED : STYLE_LITERAL;
+}
+
+// Note: line breaking/folding is implemented for only the folded style.
+// NB. We drop the last trailing newline (if any) of a returned block scalar
+//  since the dumper adds its own newline. This always works:
+//    • No ending newline => unaffected; already using strip "-" chomping.
+//    • Ending newline    => removed then restored.
+//  Importantly, this keeps the "+" chomp indicator from gaining an extra line.
+function writeScalar(state, string, level, iskey) {
+  state.dump = (function () {
+    if (string.length === 0) {
+      return "''";
+    }
+    if (!state.noCompatMode &&
+        DEPRECATED_BOOLEANS_SYNTAX.indexOf(string) !== -1) {
+      return "'" + string + "'";
+    }
+
+    var indent = state.indent * Math.max(1, level); // no 0-indent scalars
+    // As indentation gets deeper, let the width decrease monotonically
+    // to the lower bound min(state.lineWidth, 40).
+    // Note that this implies
+    //  state.lineWidth ≤ 40 + state.indent: width is fixed at the lower bound.
+    //  state.lineWidth > 40 + state.indent: width decreases until the lower bound.
+    // This behaves better than a constant minimum width which disallows narrower options,
+    // or an indent threshold which causes the width to suddenly increase.
+    var lineWidth = state.lineWidth === -1
+      ? -1 : Math.max(Math.min(state.lineWidth, 40), state.lineWidth - indent);
+
+    // Without knowing if keys are implicit/explicit, assume implicit for safety.
+    var singleLineOnly = iskey
+      // No block styles in flow mode.
+      || (state.flowLevel > -1 && level >= state.flowLevel);
+    function testAmbiguity(string) {
+      return testImplicitResolving(state, string);
+    }
+
+    switch (chooseScalarStyle(string, singleLineOnly, state.indent, lineWidth, testAmbiguity)) {
+      case STYLE_PLAIN:
+        return string;
+      case STYLE_SINGLE:
+        return "'" + string.replace(/'/g, "''") + "'";
+      case STYLE_LITERAL:
+        return '|' + blockHeader(string, state.indent)
+          + dropEndingNewline(indentString(string, indent));
+      case STYLE_FOLDED:
+        return '>' + blockHeader(string, state.indent)
+          + dropEndingNewline(indentString(foldString(string, lineWidth), indent));
+      case STYLE_DOUBLE:
+        return '"' + escapeString(string, lineWidth) + '"';
+      default:
+        throw new YAMLException('impossible error: invalid scalar style');
+    }
+  }());
+}
+
+// Pre-conditions: string is valid for a block scalar, 1 <= indentPerLevel <= 9.
+function blockHeader(string, indentPerLevel) {
+  var indentIndicator = needIndentIndicator(string) ? String(indentPerLevel) : '';
+
+  // note the special case: the string '\n' counts as a "trailing" empty line.
+  var clip =          string[string.length - 1] === '\n';
+  var keep = clip && (string[string.length - 2] === '\n' || string === '\n');
+  var chomp = keep ? '+' : (clip ? '' : '-');
+
+  return indentIndicator + chomp + '\n';
+}
+
+// (See the note for writeScalar.)
+function dropEndingNewline(string) {
+  return string[string.length - 1] === '\n' ? string.slice(0, -1) : string;
+}
+
+// Note: a long line without a suitable break point will exceed the width limit.
+// Pre-conditions: every char in str isPrintable, str.length > 0, width > 0.
+function foldString(string, width) {
+  // In folded style, $k$ consecutive newlines output as $k+1$ newlines—
+  // unless they're before or after a more-indented line, or at the very
+  // beginning or end, in which case $k$ maps to $k$.
+  // Therefore, parse each chunk as newline(s) followed by a content line.
+  var lineRe = /(\n+)([^\n]*)/g;
+
+  // first line (possibly an empty line)
+  var result = (function () {
+    var nextLF = string.indexOf('\n');
+    nextLF = nextLF !== -1 ? nextLF : string.length;
+    lineRe.lastIndex = nextLF;
+    return foldLine(string.slice(0, nextLF), width);
+  }());
+  // If we haven't reached the first content line yet, don't add an extra \n.
+  var prevMoreIndented = string[0] === '\n' || string[0] === ' ';
+  var moreIndented;
+
+  // rest of the lines
+  var match;
+  while ((match = lineRe.exec(string))) {
+    var prefix = match[1], line = match[2];
+    moreIndented = (line[0] === ' ');
+    result += prefix
+      + (!prevMoreIndented && !moreIndented && line !== ''
+        ? '\n' : '')
+      + foldLine(line, width);
+    prevMoreIndented = moreIndented;
+  }
+
+  return result;
+}
+
+// Greedy line breaking.
+// Picks the longest line under the limit each time,
+// otherwise settles for the shortest line over the limit.
+// NB. More-indented lines *cannot* be folded, as that would add an extra \n.
+function foldLine(line, width) {
+  if (line === '' || line[0] === ' ') return line;
+
+  // Since a more-indented line adds a \n, breaks can't be followed by a space.
+  var breakRe = / [^ ]/g; // note: the match index will always be <= length-2.
+  var match;
+  // start is an inclusive index. end, curr, and next are exclusive.
+  var start = 0, end, curr = 0, next = 0;
+  var result = '';
+
+  // Invariants: 0 <= start <= length-1.
+  //   0 <= curr <= next <= max(0, length-2). curr - start <= width.
+  // Inside the loop:
+  //   A match implies length >= 2, so curr and next are <= length-2.
+  while ((match = breakRe.exec(line))) {
+    next = match.index;
+    // maintain invariant: curr - start <= width
+    if (next - start > width) {
+      end = (curr > start) ? curr : next; // derive end <= length-2
+      result += '\n' + line.slice(start, end);
+      // skip the space that was output as \n
+      start = end + 1;                    // derive start <= length-1
+    }
+    curr = next;
+  }
+
+  // By the invariants, start <= length-1, so there is something left over.
+  // It is either the whole string or a part starting from non-whitespace.
+  result += '\n';
+  // Insert a break if the remainder is too long and there is a break available.
+  if (line.length - start > width && curr > start) {
+    result += line.slice(start, curr) + '\n' + line.slice(curr + 1);
+  } else {
+    result += line.slice(start);
+  }
+
+  return result.slice(1); // drop extra \n joiner
+}
+
+// Escapes a double-quoted string.
+function escapeString(string) {
+  var result = '';
+  var char, nextChar;
+  var escapeSeq;
+
+  for (var i = 0; i < string.length; i++) {
+    char = string.charCodeAt(i);
+    // Check for surrogate pairs (reference Unicode 3.0 section "3.7 Surrogates").
+    if (char >= 0xD800 && char <= 0xDBFF/* high surrogate */) {
+      nextChar = string.charCodeAt(i + 1);
+      if (nextChar >= 0xDC00 && nextChar <= 0xDFFF/* low surrogate */) {
+        // Combine the surrogate pair and store it escaped.
+        result += encodeHex((char - 0xD800) * 0x400 + nextChar - 0xDC00 + 0x10000);
+        // Advance index one extra since we already used that char here.
+        i++; continue;
+      }
+    }
+    escapeSeq = ESCAPE_SEQUENCES[char];
+    result += !escapeSeq && isPrintable(char)
+      ? string[i]
+      : escapeSeq || encodeHex(char);
+  }
+
+  return result;
+}
+
+function writeFlowSequence(state, level, object) {
+  var _result = '',
+      _tag    = state.tag,
+      index,
+      length;
+
+  for (index = 0, length = object.length; index < length; index += 1) {
+    // Write only valid elements.
+    if (writeNode(state, level, object[index], false, false)) {
+      if (index !== 0) _result += ',' + (!state.condenseFlow ? ' ' : '');
+      _result += state.dump;
+    }
+  }
+
+  state.tag = _tag;
+  state.dump = '[' + _result + ']';
+}
+
+function writeBlockSequence(state, level, object, compact) {
+  var _result = '',
+      _tag    = state.tag,
+      index,
+      length;
+
+  for (index = 0, length = object.length; index < length; index += 1) {
+    // Write only valid elements.
+    if (writeNode(state, level + 1, object[index], true, true)) {
+      if (!compact || index !== 0) {
+        _result += generateNextLine(state, level);
+      }
+
+      if (state.dump && CHAR_LINE_FEED === state.dump.charCodeAt(0)) {
+        _result += '-';
+      } else {
+        _result += '- ';
+      }
+
+      _result += state.dump;
+    }
+  }
+
+  state.tag = _tag;
+  state.dump = _result || '[]'; // Empty sequence if no valid values.
+}
+
+function writeFlowMapping(state, level, object) {
+  var _result       = '',
+      _tag          = state.tag,
+      objectKeyList = Object.keys(object),
+      index,
+      length,
+      objectKey,
+      objectValue,
+      pairBuffer;
+
+  for (index = 0, length = objectKeyList.length; index < length; index += 1) {
+    pairBuffer = state.condenseFlow ? '"' : '';
+
+    if (index !== 0) pairBuffer += ', ';
+
+    objectKey = objectKeyList[index];
+    objectValue = object[objectKey];
+
+    if (!writeNode(state, level, objectKey, false, false)) {
+      continue; // Skip this pair because of invalid key;
+    }
+
+    if (state.dump.length > 1024) pairBuffer += '? ';
+
+    pairBuffer += state.dump + (state.condenseFlow ? '"' : '') + ':' + (state.condenseFlow ? '' : ' ');
+
+    if (!writeNode(state, level, objectValue, false, false)) {
+      continue; // Skip this pair because of invalid value.
+    }
+
+    pairBuffer += state.dump;
+
+    // Both key and value are valid.
+    _result += pairBuffer;
+  }
+
+  state.tag = _tag;
+  state.dump = '{' + _result + '}';
+}
+
+function writeBlockMapping(state, level, object, compact) {
+  var _result       = '',
+      _tag          = state.tag,
+      objectKeyList = Object.keys(object),
+      index,
+      length,
+      objectKey,
+      objectValue,
+      explicitPair,
+      pairBuffer;
+
+  // Allow sorting keys so that the output file is deterministic
+  if (state.sortKeys === true) {
+    // Default sorting
+    objectKeyList.sort();
+  } else if (typeof state.sortKeys === 'function') {
+    // Custom sort function
+    objectKeyList.sort(state.sortKeys);
+  } else if (state.sortKeys) {
+    // Something is wrong
+    throw new YAMLException('sortKeys must be a boolean or a function');
+  }
+
+  for (index = 0, length = objectKeyList.length; index < length; index += 1) {
+    pairBuffer = '';
+
+    if (!compact || index !== 0) {
+      pairBuffer += generateNextLine(state, level);
+    }
+
+    objectKey = objectKeyList[index];
+    objectValue = object[objectKey];
+
+    if (!writeNode(state, level + 1, objectKey, true, true, true)) {
+      continue; // Skip this pair because of invalid key.
+    }
+
+    explicitPair = (state.tag !== null && state.tag !== '?') ||
+                   (state.dump && state.dump.length > 1024);
+
+    if (explicitPair) {
+      if (state.dump && CHAR_LINE_FEED === state.dump.charCodeAt(0)) {
+        pairBuffer += '?';
+      } else {
+        pairBuffer += '? ';
+      }
+    }
+
+    pairBuffer += state.dump;
+
+    if (explicitPair) {
+      pairBuffer += generateNextLine(state, level);
+    }
+
+    if (!writeNode(state, level + 1, objectValue, true, explicitPair)) {
+      continue; // Skip this pair because of invalid value.
+    }
+
+    if (state.dump && CHAR_LINE_FEED === state.dump.charCodeAt(0)) {
+      pairBuffer += ':';
+    } else {
+      pairBuffer += ': ';
+    }
+
+    pairBuffer += state.dump;
+
+    // Both key and value are valid.
+    _result += pairBuffer;
+  }
+
+  state.tag = _tag;
+  state.dump = _result || '{}'; // Empty mapping if no valid pairs.
+}
+
+function detectType(state, object, explicit) {
+  var _result, typeList, index, length, type, style;
+
+  typeList = explicit ? state.explicitTypes : state.implicitTypes;
+
+  for (index = 0, length = typeList.length; index < length; index += 1) {
+    type = typeList[index];
+
+    if ((type.instanceOf  || type.predicate) &&
+        (!type.instanceOf || ((typeof object === 'object') && (object instanceof type.instanceOf))) &&
+        (!type.predicate  || type.predicate(object))) {
+
+      state.tag = explicit ? type.tag : '?';
+
+      if (type.represent) {
+        style = state.styleMap[type.tag] || type.defaultStyle;
+
+        if (_toString.call(type.represent) === '[object Function]') {
+          _result = type.represent(object, style);
+        } else if (_hasOwnProperty.call(type.represent, style)) {
+          _result = type.represent[style](object, style);
+        } else {
+          throw new YAMLException('!<' + type.tag + '> tag resolver accepts not "' + style + '" style');
+        }
+
+        state.dump = _result;
+      }
+
+      return true;
+    }
+  }
+
+  return false;
+}
+
+// Serializes `object` and writes it to global `result`.
+// Returns true on success, or false on invalid object.
+//
+function writeNode(state, level, object, block, compact, iskey) {
+  state.tag = null;
+  state.dump = object;
+
+  if (!detectType(state, object, false)) {
+    detectType(state, object, true);
+  }
+
+  var type = _toString.call(state.dump);
+
+  if (block) {
+    block = (state.flowLevel < 0 || state.flowLevel > level);
+  }
+
+  var objectOrArray = type === '[object Object]' || type === '[object Array]',
+      duplicateIndex,
+      duplicate;
+
+  if (objectOrArray) {
+    duplicateIndex = state.duplicates.indexOf(object);
+    duplicate = duplicateIndex !== -1;
+  }
+
+  if ((state.tag !== null && state.tag !== '?') || duplicate || (state.indent !== 2 && level > 0)) {
+    compact = false;
+  }
+
+  if (duplicate && state.usedDuplicates[duplicateIndex]) {
+    state.dump = '*ref_' + duplicateIndex;
+  } else {
+    if (objectOrArray && duplicate && !state.usedDuplicates[duplicateIndex]) {
+      state.usedDuplicates[duplicateIndex] = true;
+    }
+    if (type === '[object Object]') {
+      if (block && (Object.keys(state.dump).length !== 0)) {
+        writeBlockMapping(state, level, state.dump, compact);
+        if (duplicate) {
+          state.dump = '&ref_' + duplicateIndex + state.dump;
+        }
+      } else {
+        writeFlowMapping(state, level, state.dump);
+        if (duplicate) {
+          state.dump = '&ref_' + duplicateIndex + ' ' + state.dump;
+        }
+      }
+    } else if (type === '[object Array]') {
+      var arrayLevel = (state.noArrayIndent && (level > 0)) ? level - 1 : level;
+      if (block && (state.dump.length !== 0)) {
+        writeBlockSequence(state, arrayLevel, state.dump, compact);
+        if (duplicate) {
+          state.dump = '&ref_' + duplicateIndex + state.dump;
+        }
+      } else {
+        writeFlowSequence(state, arrayLevel, state.dump);
+        if (duplicate) {
+          state.dump = '&ref_' + duplicateIndex + ' ' + state.dump;
+        }
+      }
+    } else if (type === '[object String]') {
+      if (state.tag !== '?') {
+        writeScalar(state, state.dump, level, iskey);
+      }
+    } else {
+      if (state.skipInvalid) return false;
+      throw new YAMLException('unacceptable kind of an object to dump ' + type);
+    }
+
+    if (state.tag !== null && state.tag !== '?') {
+      state.dump = '!<' + state.tag + '> ' + state.dump;
+    }
+  }
+
+  return true;
+}
+
+function getDuplicateReferences(object, state) {
+  var objects = [],
+      duplicatesIndexes = [],
+      index,
+      length;
+
+  inspectNode(object, objects, duplicatesIndexes);
+
+  for (index = 0, length = duplicatesIndexes.length; index < length; index += 1) {
+    state.duplicates.push(objects[duplicatesIndexes[index]]);
+  }
+  state.usedDuplicates = new Array(length);
+}
+
+function inspectNode(object, objects, duplicatesIndexes) {
+  var objectKeyList,
+      index,
+      length;
+
+  if (object !== null && typeof object === 'object') {
+    index = objects.indexOf(object);
+    if (index !== -1) {
+      if (duplicatesIndexes.indexOf(index) === -1) {
+        duplicatesIndexes.push(index);
+      }
+    } else {
+      objects.push(object);
+
+      if (Array.isArray(object)) {
+        for (index = 0, length = object.length; index < length; index += 1) {
+          inspectNode(object[index], objects, duplicatesIndexes);
+        }
+      } else {
+        objectKeyList = Object.keys(object);
+
+        for (index = 0, length = objectKeyList.length; index < length; index += 1) {
+          inspectNode(object[objectKeyList[index]], objects, duplicatesIndexes);
+        }
+      }
+    }
+  }
+}
+
+function dump(input, options) {
+  options = options || {};
+
+  var state = new State(options);
+
+  if (!state.noRefs) getDuplicateReferences(input, state);
+
+  if (writeNode(state, 0, input, true, true)) return state.dump + '\n';
+
+  return '';
+}
+
+function safeDump(input, options) {
+  return dump(input, common.extend({ schema: DEFAULT_SAFE_SCHEMA }, options));
+}
+
+module.exports.dump     = dump;
+module.exports.safeDump = safeDump;
+
+
+/***/ }),
+/* 282 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+/*eslint-disable max-len,no-use-before-define*/
+
+var common              = __webpack_require__(43);
+var YAMLException       = __webpack_require__(54);
+var Mark                = __webpack_require__(283);
+var DEFAULT_SAFE_SCHEMA = __webpack_require__(55);
+var DEFAULT_FULL_SCHEMA = __webpack_require__(73);
+
+
+var _hasOwnProperty = Object.prototype.hasOwnProperty;
+
+
+var CONTEXT_FLOW_IN   = 1;
+var CONTEXT_FLOW_OUT  = 2;
+var CONTEXT_BLOCK_IN  = 3;
+var CONTEXT_BLOCK_OUT = 4;
+
+
+var CHOMPING_CLIP  = 1;
+var CHOMPING_STRIP = 2;
+var CHOMPING_KEEP  = 3;
+
+
+var PATTERN_NON_PRINTABLE         = /[\x00-\x08\x0B\x0C\x0E-\x1F\x7F-\x84\x86-\x9F\uFFFE\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF]/;
+var PATTERN_NON_ASCII_LINE_BREAKS = /[\x85\u2028\u2029]/;
+var PATTERN_FLOW_INDICATORS       = /[,\[\]\{\}]/;
+var PATTERN_TAG_HANDLE            = /^(?:!|!!|![a-z\-]+!)$/i;
+var PATTERN_TAG_URI               = /^(?:!|[^,\[\]\{\}])(?:%[0-9a-f]{2}|[0-9a-z\-#;\/\?:@&=\+\$,_\.!~\*'\(\)\[\]])*$/i;
+
+
+function _class(obj) { return Object.prototype.toString.call(obj); }
+
+function is_EOL(c) {
+  return (c === 0x0A/* LF */) || (c === 0x0D/* CR */);
+}
+
+function is_WHITE_SPACE(c) {
+  return (c === 0x09/* Tab */) || (c === 0x20/* Space */);
+}
+
+function is_WS_OR_EOL(c) {
+  return (c === 0x09/* Tab */) ||
+         (c === 0x20/* Space */) ||
+         (c === 0x0A/* LF */) ||
+         (c === 0x0D/* CR */);
+}
+
+function is_FLOW_INDICATOR(c) {
+  return c === 0x2C/* , */ ||
+         c === 0x5B/* [ */ ||
+         c === 0x5D/* ] */ ||
+         c === 0x7B/* { */ ||
+         c === 0x7D/* } */;
+}
+
+function fromHexCode(c) {
+  var lc;
+
+  if ((0x30/* 0 */ <= c) && (c <= 0x39/* 9 */)) {
+    return c - 0x30;
+  }
+
+  /*eslint-disable no-bitwise*/
+  lc = c | 0x20;
+
+  if ((0x61/* a */ <= lc) && (lc <= 0x66/* f */)) {
+    return lc - 0x61 + 10;
+  }
+
+  return -1;
+}
+
+function escapedHexLen(c) {
+  if (c === 0x78/* x */) { return 2; }
+  if (c === 0x75/* u */) { return 4; }
+  if (c === 0x55/* U */) { return 8; }
+  return 0;
+}
+
+function fromDecimalCode(c) {
+  if ((0x30/* 0 */ <= c) && (c <= 0x39/* 9 */)) {
+    return c - 0x30;
+  }
+
+  return -1;
+}
+
+function simpleEscapeSequence(c) {
+  /* eslint-disable indent */
+  return (c === 0x30/* 0 */) ? '\x00' :
+        (c === 0x61/* a */) ? '\x07' :
+        (c === 0x62/* b */) ? '\x08' :
+        (c === 0x74/* t */) ? '\x09' :
+        (c === 0x09/* Tab */) ? '\x09' :
+        (c === 0x6E/* n */) ? '\x0A' :
+        (c === 0x76/* v */) ? '\x0B' :
+        (c === 0x66/* f */) ? '\x0C' :
+        (c === 0x72/* r */) ? '\x0D' :
+        (c === 0x65/* e */) ? '\x1B' :
+        (c === 0x20/* Space */) ? ' ' :
+        (c === 0x22/* " */) ? '\x22' :
+        (c === 0x2F/* / */) ? '/' :
+        (c === 0x5C/* \ */) ? '\x5C' :
+        (c === 0x4E/* N */) ? '\x85' :
+        (c === 0x5F/* _ */) ? '\xA0' :
+        (c === 0x4C/* L */) ? '\u2028' :
+        (c === 0x50/* P */) ? '\u2029' : '';
+}
+
+function charFromCodepoint(c) {
+  if (c <= 0xFFFF) {
+    return String.fromCharCode(c);
+  }
+  // Encode UTF-16 surrogate pair
+  // https://en.wikipedia.org/wiki/UTF-16#Code_points_U.2B010000_to_U.2B10FFFF
+  return String.fromCharCode(
+    ((c - 0x010000) >> 10) + 0xD800,
+    ((c - 0x010000) & 0x03FF) + 0xDC00
+  );
+}
+
+var simpleEscapeCheck = new Array(256); // integer, for fast access
+var simpleEscapeMap = new Array(256);
+for (var i = 0; i < 256; i++) {
+  simpleEscapeCheck[i] = simpleEscapeSequence(i) ? 1 : 0;
+  simpleEscapeMap[i] = simpleEscapeSequence(i);
+}
+
+
+function State(input, options) {
+  this.input = input;
+
+  this.filename  = options['filename']  || null;
+  this.schema    = options['schema']    || DEFAULT_FULL_SCHEMA;
+  this.onWarning = options['onWarning'] || null;
+  this.legacy    = options['legacy']    || false;
+  this.json      = options['json']      || false;
+  this.listener  = options['listener']  || null;
+
+  this.implicitTypes = this.schema.compiledImplicit;
+  this.typeMap       = this.schema.compiledTypeMap;
+
+  this.length     = input.length;
+  this.position   = 0;
+  this.line       = 0;
+  this.lineStart  = 0;
+  this.lineIndent = 0;
+
+  this.documents = [];
+
+  /*
+  this.version;
+  this.checkLineBreaks;
+  this.tagMap;
+  this.anchorMap;
+  this.tag;
+  this.anchor;
+  this.kind;
+  this.result;*/
+
+}
+
+
+function generateError(state, message) {
+  return new YAMLException(
+    message,
+    new Mark(state.filename, state.input, state.position, state.line, (state.position - state.lineStart)));
+}
+
+function throwError(state, message) {
+  throw generateError(state, message);
+}
+
+function throwWarning(state, message) {
+  if (state.onWarning) {
+    state.onWarning.call(null, generateError(state, message));
+  }
+}
+
+
+var directiveHandlers = {
+
+  YAML: function handleYamlDirective(state, name, args) {
+
+    var match, major, minor;
+
+    if (state.version !== null) {
+      throwError(state, 'duplication of %YAML directive');
+    }
+
+    if (args.length !== 1) {
+      throwError(state, 'YAML directive accepts exactly one argument');
+    }
+
+    match = /^([0-9]+)\.([0-9]+)$/.exec(args[0]);
+
+    if (match === null) {
+      throwError(state, 'ill-formed argument of the YAML directive');
+    }
+
+    major = parseInt(match[1], 10);
+    minor = parseInt(match[2], 10);
+
+    if (major !== 1) {
+      throwError(state, 'unacceptable YAML version of the document');
+    }
+
+    state.version = args[0];
+    state.checkLineBreaks = (minor < 2);
+
+    if (minor !== 1 && minor !== 2) {
+      throwWarning(state, 'unsupported YAML version of the document');
+    }
+  },
+
+  TAG: function handleTagDirective(state, name, args) {
+
+    var handle, prefix;
+
+    if (args.length !== 2) {
+      throwError(state, 'TAG directive accepts exactly two arguments');
+    }
+
+    handle = args[0];
+    prefix = args[1];
+
+    if (!PATTERN_TAG_HANDLE.test(handle)) {
+      throwError(state, 'ill-formed tag handle (first argument) of the TAG directive');
+    }
+
+    if (_hasOwnProperty.call(state.tagMap, handle)) {
+      throwError(state, 'there is a previously declared suffix for "' + handle + '" tag handle');
+    }
+
+    if (!PATTERN_TAG_URI.test(prefix)) {
+      throwError(state, 'ill-formed tag prefix (second argument) of the TAG directive');
+    }
+
+    state.tagMap[handle] = prefix;
+  }
+};
+
+
+function captureSegment(state, start, end, checkJson) {
+  var _position, _length, _character, _result;
+
+  if (start < end) {
+    _result = state.input.slice(start, end);
+
+    if (checkJson) {
+      for (_position = 0, _length = _result.length; _position < _length; _position += 1) {
+        _character = _result.charCodeAt(_position);
+        if (!(_character === 0x09 ||
+              (0x20 <= _character && _character <= 0x10FFFF))) {
+          throwError(state, 'expected valid JSON character');
+        }
+      }
+    } else if (PATTERN_NON_PRINTABLE.test(_result)) {
+      throwError(state, 'the stream contains non-printable characters');
+    }
+
+    state.result += _result;
+  }
+}
+
+function mergeMappings(state, destination, source, overridableKeys) {
+  var sourceKeys, key, index, quantity;
+
+  if (!common.isObject(source)) {
+    throwError(state, 'cannot merge mappings; the provided source object is unacceptable');
+  }
+
+  sourceKeys = Object.keys(source);
+
+  for (index = 0, quantity = sourceKeys.length; index < quantity; index += 1) {
+    key = sourceKeys[index];
+
+    if (!_hasOwnProperty.call(destination, key)) {
+      destination[key] = source[key];
+      overridableKeys[key] = true;
+    }
+  }
+}
+
+function storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, valueNode, startLine, startPos) {
+  var index, quantity;
+
+  // The output is a plain object here, so keys can only be strings.
+  // We need to convert keyNode to a string, but doing so can hang the process
+  // (deeply nested arrays that explode exponentially using aliases).
+  if (Array.isArray(keyNode)) {
+    keyNode = Array.prototype.slice.call(keyNode);
+
+    for (index = 0, quantity = keyNode.length; index < quantity; index += 1) {
+      if (Array.isArray(keyNode[index])) {
+        throwError(state, 'nested arrays are not supported inside keys');
+      }
+
+      if (typeof keyNode === 'object' && _class(keyNode[index]) === '[object Object]') {
+        keyNode[index] = '[object Object]';
+      }
+    }
+  }
+
+  // Avoid code execution in load() via toString property
+  // (still use its own toString for arrays, timestamps,
+  // and whatever user schema extensions happen to have @@toStringTag)
+  if (typeof keyNode === 'object' && _class(keyNode) === '[object Object]') {
+    keyNode = '[object Object]';
+  }
+
+
+  keyNode = String(keyNode);
+
+  if (_result === null) {
+    _result = {};
+  }
+
+  if (keyTag === 'tag:yaml.org,2002:merge') {
+    if (Array.isArray(valueNode)) {
+      for (index = 0, quantity = valueNode.length; index < quantity; index += 1) {
+        mergeMappings(state, _result, valueNode[index], overridableKeys);
+      }
+    } else {
+      mergeMappings(state, _result, valueNode, overridableKeys);
+    }
+  } else {
+    if (!state.json &&
+        !_hasOwnProperty.call(overridableKeys, keyNode) &&
+        _hasOwnProperty.call(_result, keyNode)) {
+      state.line = startLine || state.line;
+      state.position = startPos || state.position;
+      throwError(state, 'duplicated mapping key');
+    }
+    _result[keyNode] = valueNode;
+    delete overridableKeys[keyNode];
+  }
+
+  return _result;
+}
+
+function readLineBreak(state) {
+  var ch;
+
+  ch = state.input.charCodeAt(state.position);
+
+  if (ch === 0x0A/* LF */) {
+    state.position++;
+  } else if (ch === 0x0D/* CR */) {
+    state.position++;
+    if (state.input.charCodeAt(state.position) === 0x0A/* LF */) {
+      state.position++;
+    }
+  } else {
+    throwError(state, 'a line break is expected');
+  }
+
+  state.line += 1;
+  state.lineStart = state.position;
+}
+
+function skipSeparationSpace(state, allowComments, checkIndent) {
+  var lineBreaks = 0,
+      ch = state.input.charCodeAt(state.position);
+
+  while (ch !== 0) {
+    while (is_WHITE_SPACE(ch)) {
+      ch = state.input.charCodeAt(++state.position);
+    }
+
+    if (allowComments && ch === 0x23/* # */) {
+      do {
+        ch = state.input.charCodeAt(++state.position);
+      } while (ch !== 0x0A/* LF */ && ch !== 0x0D/* CR */ && ch !== 0);
+    }
+
+    if (is_EOL(ch)) {
+      readLineBreak(state);
+
+      ch = state.input.charCodeAt(state.position);
+      lineBreaks++;
+      state.lineIndent = 0;
+
+      while (ch === 0x20/* Space */) {
+        state.lineIndent++;
+        ch = state.input.charCodeAt(++state.position);
+      }
+    } else {
+      break;
+    }
+  }
+
+  if (checkIndent !== -1 && lineBreaks !== 0 && state.lineIndent < checkIndent) {
+    throwWarning(state, 'deficient indentation');
+  }
+
+  return lineBreaks;
+}
+
+function testDocumentSeparator(state) {
+  var _position = state.position,
+      ch;
+
+  ch = state.input.charCodeAt(_position);
+
+  // Condition state.position === state.lineStart is tested
+  // in parent on each call, for efficiency. No needs to test here again.
+  if ((ch === 0x2D/* - */ || ch === 0x2E/* . */) &&
+      ch === state.input.charCodeAt(_position + 1) &&
+      ch === state.input.charCodeAt(_position + 2)) {
+
+    _position += 3;
+
+    ch = state.input.charCodeAt(_position);
+
+    if (ch === 0 || is_WS_OR_EOL(ch)) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+function writeFoldedLines(state, count) {
+  if (count === 1) {
+    state.result += ' ';
+  } else if (count > 1) {
+    state.result += common.repeat('\n', count - 1);
+  }
+}
+
+
+function readPlainScalar(state, nodeIndent, withinFlowCollection) {
+  var preceding,
+      following,
+      captureStart,
+      captureEnd,
+      hasPendingContent,
+      _line,
+      _lineStart,
+      _lineIndent,
+      _kind = state.kind,
+      _result = state.result,
+      ch;
+
+  ch = state.input.charCodeAt(state.position);
+
+  if (is_WS_OR_EOL(ch)      ||
+      is_FLOW_INDICATOR(ch) ||
+      ch === 0x23/* # */    ||
+      ch === 0x26/* & */    ||
+      ch === 0x2A/* * */    ||
+      ch === 0x21/* ! */    ||
+      ch === 0x7C/* | */    ||
+      ch === 0x3E/* > */    ||
+      ch === 0x27/* ' */    ||
+      ch === 0x22/* " */    ||
+      ch === 0x25/* % */    ||
+      ch === 0x40/* @ */    ||
+      ch === 0x60/* ` */) {
+    return false;
+  }
+
+  if (ch === 0x3F/* ? */ || ch === 0x2D/* - */) {
+    following = state.input.charCodeAt(state.position + 1);
+
+    if (is_WS_OR_EOL(following) ||
+        withinFlowCollection && is_FLOW_INDICATOR(following)) {
+      return false;
+    }
+  }
+
+  state.kind = 'scalar';
+  state.result = '';
+  captureStart = captureEnd = state.position;
+  hasPendingContent = false;
+
+  while (ch !== 0) {
+    if (ch === 0x3A/* : */) {
+      following = state.input.charCodeAt(state.position + 1);
+
+      if (is_WS_OR_EOL(following) ||
+          withinFlowCollection && is_FLOW_INDICATOR(following)) {
+        break;
+      }
+
+    } else if (ch === 0x23/* # */) {
+      preceding = state.input.charCodeAt(state.position - 1);
+
+      if (is_WS_OR_EOL(preceding)) {
+        break;
+      }
+
+    } else if ((state.position === state.lineStart && testDocumentSeparator(state)) ||
+               withinFlowCollection && is_FLOW_INDICATOR(ch)) {
+      break;
+
+    } else if (is_EOL(ch)) {
+      _line = state.line;
+      _lineStart = state.lineStart;
+      _lineIndent = state.lineIndent;
+      skipSeparationSpace(state, false, -1);
+
+      if (state.lineIndent >= nodeIndent) {
+        hasPendingContent = true;
+        ch = state.input.charCodeAt(state.position);
+        continue;
+      } else {
+        state.position = captureEnd;
+        state.line = _line;
+        state.lineStart = _lineStart;
+        state.lineIndent = _lineIndent;
+        break;
+      }
+    }
+
+    if (hasPendingContent) {
+      captureSegment(state, captureStart, captureEnd, false);
+      writeFoldedLines(state, state.line - _line);
+      captureStart = captureEnd = state.position;
+      hasPendingContent = false;
+    }
+
+    if (!is_WHITE_SPACE(ch)) {
+      captureEnd = state.position + 1;
+    }
+
+    ch = state.input.charCodeAt(++state.position);
+  }
+
+  captureSegment(state, captureStart, captureEnd, false);
+
+  if (state.result) {
+    return true;
+  }
+
+  state.kind = _kind;
+  state.result = _result;
+  return false;
+}
+
+function readSingleQuotedScalar(state, nodeIndent) {
+  var ch,
+      captureStart, captureEnd;
+
+  ch = state.input.charCodeAt(state.position);
+
+  if (ch !== 0x27/* ' */) {
+    return false;
+  }
+
+  state.kind = 'scalar';
+  state.result = '';
+  state.position++;
+  captureStart = captureEnd = state.position;
+
+  while ((ch = state.input.charCodeAt(state.position)) !== 0) {
+    if (ch === 0x27/* ' */) {
+      captureSegment(state, captureStart, state.position, true);
+      ch = state.input.charCodeAt(++state.position);
+
+      if (ch === 0x27/* ' */) {
+        captureStart = state.position;
+        state.position++;
+        captureEnd = state.position;
+      } else {
+        return true;
+      }
+
+    } else if (is_EOL(ch)) {
+      captureSegment(state, captureStart, captureEnd, true);
+      writeFoldedLines(state, skipSeparationSpace(state, false, nodeIndent));
+      captureStart = captureEnd = state.position;
+
+    } else if (state.position === state.lineStart && testDocumentSeparator(state)) {
+      throwError(state, 'unexpected end of the document within a single quoted scalar');
+
+    } else {
+      state.position++;
+      captureEnd = state.position;
+    }
+  }
+
+  throwError(state, 'unexpected end of the stream within a single quoted scalar');
+}
+
+function readDoubleQuotedScalar(state, nodeIndent) {
+  var captureStart,
+      captureEnd,
+      hexLength,
+      hexResult,
+      tmp,
+      ch;
+
+  ch = state.input.charCodeAt(state.position);
+
+  if (ch !== 0x22/* " */) {
+    return false;
+  }
+
+  state.kind = 'scalar';
+  state.result = '';
+  state.position++;
+  captureStart = captureEnd = state.position;
+
+  while ((ch = state.input.charCodeAt(state.position)) !== 0) {
+    if (ch === 0x22/* " */) {
+      captureSegment(state, captureStart, state.position, true);
+      state.position++;
+      return true;
+
+    } else if (ch === 0x5C/* \ */) {
+      captureSegment(state, captureStart, state.position, true);
+      ch = state.input.charCodeAt(++state.position);
+
+      if (is_EOL(ch)) {
+        skipSeparationSpace(state, false, nodeIndent);
+
+        // TODO: rework to inline fn with no type cast?
+      } else if (ch < 256 && simpleEscapeCheck[ch]) {
+        state.result += simpleEscapeMap[ch];
+        state.position++;
+
+      } else if ((tmp = escapedHexLen(ch)) > 0) {
+        hexLength = tmp;
+        hexResult = 0;
+
+        for (; hexLength > 0; hexLength--) {
+          ch = state.input.charCodeAt(++state.position);
+
+          if ((tmp = fromHexCode(ch)) >= 0) {
+            hexResult = (hexResult << 4) + tmp;
+
+          } else {
+            throwError(state, 'expected hexadecimal character');
+          }
+        }
+
+        state.result += charFromCodepoint(hexResult);
+
+        state.position++;
+
+      } else {
+        throwError(state, 'unknown escape sequence');
+      }
+
+      captureStart = captureEnd = state.position;
+
+    } else if (is_EOL(ch)) {
+      captureSegment(state, captureStart, captureEnd, true);
+      writeFoldedLines(state, skipSeparationSpace(state, false, nodeIndent));
+      captureStart = captureEnd = state.position;
+
+    } else if (state.position === state.lineStart && testDocumentSeparator(state)) {
+      throwError(state, 'unexpected end of the document within a double quoted scalar');
+
+    } else {
+      state.position++;
+      captureEnd = state.position;
+    }
+  }
+
+  throwError(state, 'unexpected end of the stream within a double quoted scalar');
+}
+
+function readFlowCollection(state, nodeIndent) {
+  var readNext = true,
+      _line,
+      _tag     = state.tag,
+      _result,
+      _anchor  = state.anchor,
+      following,
+      terminator,
+      isPair,
+      isExplicitPair,
+      isMapping,
+      overridableKeys = {},
+      keyNode,
+      keyTag,
+      valueNode,
+      ch;
+
+  ch = state.input.charCodeAt(state.position);
+
+  if (ch === 0x5B/* [ */) {
+    terminator = 0x5D;/* ] */
+    isMapping = false;
+    _result = [];
+  } else if (ch === 0x7B/* { */) {
+    terminator = 0x7D;/* } */
+    isMapping = true;
+    _result = {};
+  } else {
+    return false;
+  }
+
+  if (state.anchor !== null) {
+    state.anchorMap[state.anchor] = _result;
+  }
+
+  ch = state.input.charCodeAt(++state.position);
+
+  while (ch !== 0) {
+    skipSeparationSpace(state, true, nodeIndent);
+
+    ch = state.input.charCodeAt(state.position);
+
+    if (ch === terminator) {
+      state.position++;
+      state.tag = _tag;
+      state.anchor = _anchor;
+      state.kind = isMapping ? 'mapping' : 'sequence';
+      state.result = _result;
+      return true;
+    } else if (!readNext) {
+      throwError(state, 'missed comma between flow collection entries');
+    }
+
+    keyTag = keyNode = valueNode = null;
+    isPair = isExplicitPair = false;
+
+    if (ch === 0x3F/* ? */) {
+      following = state.input.charCodeAt(state.position + 1);
+
+      if (is_WS_OR_EOL(following)) {
+        isPair = isExplicitPair = true;
+        state.position++;
+        skipSeparationSpace(state, true, nodeIndent);
+      }
+    }
+
+    _line = state.line;
+    composeNode(state, nodeIndent, CONTEXT_FLOW_IN, false, true);
+    keyTag = state.tag;
+    keyNode = state.result;
+    skipSeparationSpace(state, true, nodeIndent);
+
+    ch = state.input.charCodeAt(state.position);
+
+    if ((isExplicitPair || state.line === _line) && ch === 0x3A/* : */) {
+      isPair = true;
+      ch = state.input.charCodeAt(++state.position);
+      skipSeparationSpace(state, true, nodeIndent);
+      composeNode(state, nodeIndent, CONTEXT_FLOW_IN, false, true);
+      valueNode = state.result;
+    }
+
+    if (isMapping) {
+      storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, valueNode);
+    } else if (isPair) {
+      _result.push(storeMappingPair(state, null, overridableKeys, keyTag, keyNode, valueNode));
+    } else {
+      _result.push(keyNode);
+    }
+
+    skipSeparationSpace(state, true, nodeIndent);
+
+    ch = state.input.charCodeAt(state.position);
+
+    if (ch === 0x2C/* , */) {
+      readNext = true;
+      ch = state.input.charCodeAt(++state.position);
+    } else {
+      readNext = false;
+    }
+  }
+
+  throwError(state, 'unexpected end of the stream within a flow collection');
+}
+
+function readBlockScalar(state, nodeIndent) {
+  var captureStart,
+      folding,
+      chomping       = CHOMPING_CLIP,
+      didReadContent = false,
+      detectedIndent = false,
+      textIndent     = nodeIndent,
+      emptyLines     = 0,
+      atMoreIndented = false,
+      tmp,
+      ch;
+
+  ch = state.input.charCodeAt(state.position);
+
+  if (ch === 0x7C/* | */) {
+    folding = false;
+  } else if (ch === 0x3E/* > */) {
+    folding = true;
+  } else {
+    return false;
+  }
+
+  state.kind = 'scalar';
+  state.result = '';
+
+  while (ch !== 0) {
+    ch = state.input.charCodeAt(++state.position);
+
+    if (ch === 0x2B/* + */ || ch === 0x2D/* - */) {
+      if (CHOMPING_CLIP === chomping) {
+        chomping = (ch === 0x2B/* + */) ? CHOMPING_KEEP : CHOMPING_STRIP;
+      } else {
+        throwError(state, 'repeat of a chomping mode identifier');
+      }
+
+    } else if ((tmp = fromDecimalCode(ch)) >= 0) {
+      if (tmp === 0) {
+        throwError(state, 'bad explicit indentation width of a block scalar; it cannot be less than one');
+      } else if (!detectedIndent) {
+        textIndent = nodeIndent + tmp - 1;
+        detectedIndent = true;
+      } else {
+        throwError(state, 'repeat of an indentation width identifier');
+      }
+
+    } else {
+      break;
+    }
+  }
+
+  if (is_WHITE_SPACE(ch)) {
+    do { ch = state.input.charCodeAt(++state.position); }
+    while (is_WHITE_SPACE(ch));
+
+    if (ch === 0x23/* # */) {
+      do { ch = state.input.charCodeAt(++state.position); }
+      while (!is_EOL(ch) && (ch !== 0));
+    }
+  }
+
+  while (ch !== 0) {
+    readLineBreak(state);
+    state.lineIndent = 0;
+
+    ch = state.input.charCodeAt(state.position);
+
+    while ((!detectedIndent || state.lineIndent < textIndent) &&
+           (ch === 0x20/* Space */)) {
+      state.lineIndent++;
+      ch = state.input.charCodeAt(++state.position);
+    }
+
+    if (!detectedIndent && state.lineIndent > textIndent) {
+      textIndent = state.lineIndent;
+    }
+
+    if (is_EOL(ch)) {
+      emptyLines++;
+      continue;
+    }
+
+    // End of the scalar.
+    if (state.lineIndent < textIndent) {
+
+      // Perform the chomping.
+      if (chomping === CHOMPING_KEEP) {
+        state.result += common.repeat('\n', didReadContent ? 1 + emptyLines : emptyLines);
+      } else if (chomping === CHOMPING_CLIP) {
+        if (didReadContent) { // i.e. only if the scalar is not empty.
+          state.result += '\n';
+        }
+      }
+
+      // Break this `while` cycle and go to the funciton's epilogue.
+      break;
+    }
+
+    // Folded style: use fancy rules to handle line breaks.
+    if (folding) {
+
+      // Lines starting with white space characters (more-indented lines) are not folded.
+      if (is_WHITE_SPACE(ch)) {
+        atMoreIndented = true;
+        // except for the first content line (cf. Example 8.1)
+        state.result += common.repeat('\n', didReadContent ? 1 + emptyLines : emptyLines);
+
+      // End of more-indented block.
+      } else if (atMoreIndented) {
+        atMoreIndented = false;
+        state.result += common.repeat('\n', emptyLines + 1);
+
+      // Just one line break - perceive as the same line.
+      } else if (emptyLines === 0) {
+        if (didReadContent) { // i.e. only if we have already read some scalar content.
+          state.result += ' ';
+        }
+
+      // Several line breaks - perceive as different lines.
+      } else {
+        state.result += common.repeat('\n', emptyLines);
+      }
+
+    // Literal style: just add exact number of line breaks between content lines.
+    } else {
+      // Keep all line breaks except the header line break.
+      state.result += common.repeat('\n', didReadContent ? 1 + emptyLines : emptyLines);
+    }
+
+    didReadContent = true;
+    detectedIndent = true;
+    emptyLines = 0;
+    captureStart = state.position;
+
+    while (!is_EOL(ch) && (ch !== 0)) {
+      ch = state.input.charCodeAt(++state.position);
+    }
+
+    captureSegment(state, captureStart, state.position, false);
+  }
+
+  return true;
+}
+
+function readBlockSequence(state, nodeIndent) {
+  var _line,
+      _tag      = state.tag,
+      _anchor   = state.anchor,
+      _result   = [],
+      following,
+      detected  = false,
+      ch;
+
+  if (state.anchor !== null) {
+    state.anchorMap[state.anchor] = _result;
+  }
+
+  ch = state.input.charCodeAt(state.position);
+
+  while (ch !== 0) {
+
+    if (ch !== 0x2D/* - */) {
+      break;
+    }
+
+    following = state.input.charCodeAt(state.position + 1);
+
+    if (!is_WS_OR_EOL(following)) {
+      break;
+    }
+
+    detected = true;
+    state.position++;
+
+    if (skipSeparationSpace(state, true, -1)) {
+      if (state.lineIndent <= nodeIndent) {
+        _result.push(null);
+        ch = state.input.charCodeAt(state.position);
+        continue;
+      }
+    }
+
+    _line = state.line;
+    composeNode(state, nodeIndent, CONTEXT_BLOCK_IN, false, true);
+    _result.push(state.result);
+    skipSeparationSpace(state, true, -1);
+
+    ch = state.input.charCodeAt(state.position);
+
+    if ((state.line === _line || state.lineIndent > nodeIndent) && (ch !== 0)) {
+      throwError(state, 'bad indentation of a sequence entry');
+    } else if (state.lineIndent < nodeIndent) {
+      break;
+    }
+  }
+
+  if (detected) {
+    state.tag = _tag;
+    state.anchor = _anchor;
+    state.kind = 'sequence';
+    state.result = _result;
+    return true;
+  }
+  return false;
+}
+
+function readBlockMapping(state, nodeIndent, flowIndent) {
+  var following,
+      allowCompact,
+      _line,
+      _pos,
+      _tag          = state.tag,
+      _anchor       = state.anchor,
+      _result       = {},
+      overridableKeys = {},
+      keyTag        = null,
+      keyNode       = null,
+      valueNode     = null,
+      atExplicitKey = false,
+      detected      = false,
+      ch;
+
+  if (state.anchor !== null) {
+    state.anchorMap[state.anchor] = _result;
+  }
+
+  ch = state.input.charCodeAt(state.position);
+
+  while (ch !== 0) {
+    following = state.input.charCodeAt(state.position + 1);
+    _line = state.line; // Save the current line.
+    _pos = state.position;
+
+    //
+    // Explicit notation case. There are two separate blocks:
+    // first for the key (denoted by "?") and second for the value (denoted by ":")
+    //
+    if ((ch === 0x3F/* ? */ || ch === 0x3A/* : */) && is_WS_OR_EOL(following)) {
+
+      if (ch === 0x3F/* ? */) {
+        if (atExplicitKey) {
+          storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, null);
+          keyTag = keyNode = valueNode = null;
+        }
+
+        detected = true;
+        atExplicitKey = true;
+        allowCompact = true;
+
+      } else if (atExplicitKey) {
+        // i.e. 0x3A/* : */ === character after the explicit key.
+        atExplicitKey = false;
+        allowCompact = true;
+
+      } else {
+        throwError(state, 'incomplete explicit mapping pair; a key node is missed; or followed by a non-tabulated empty line');
+      }
+
+      state.position += 1;
+      ch = following;
+
+    //
+    // Implicit notation case. Flow-style node as the key first, then ":", and the value.
+    //
+    } else if (composeNode(state, flowIndent, CONTEXT_FLOW_OUT, false, true)) {
+
+      if (state.line === _line) {
+        ch = state.input.charCodeAt(state.position);
+
+        while (is_WHITE_SPACE(ch)) {
+          ch = state.input.charCodeAt(++state.position);
+        }
+
+        if (ch === 0x3A/* : */) {
+          ch = state.input.charCodeAt(++state.position);
+
+          if (!is_WS_OR_EOL(ch)) {
+            throwError(state, 'a whitespace character is expected after the key-value separator within a block mapping');
+          }
+
+          if (atExplicitKey) {
+            storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, null);
+            keyTag = keyNode = valueNode = null;
+          }
+
+          detected = true;
+          atExplicitKey = false;
+          allowCompact = false;
+          keyTag = state.tag;
+          keyNode = state.result;
+
+        } else if (detected) {
+          throwError(state, 'can not read an implicit mapping pair; a colon is missed');
+
+        } else {
+          state.tag = _tag;
+          state.anchor = _anchor;
+          return true; // Keep the result of `composeNode`.
+        }
+
+      } else if (detected) {
+        throwError(state, 'can not read a block mapping entry; a multiline key may not be an implicit key');
+
+      } else {
+        state.tag = _tag;
+        state.anchor = _anchor;
+        return true; // Keep the result of `composeNode`.
+      }
+
+    } else {
+      break; // Reading is done. Go to the epilogue.
+    }
+
+    //
+    // Common reading code for both explicit and implicit notations.
+    //
+    if (state.line === _line || state.lineIndent > nodeIndent) {
+      if (composeNode(state, nodeIndent, CONTEXT_BLOCK_OUT, true, allowCompact)) {
+        if (atExplicitKey) {
+          keyNode = state.result;
+        } else {
+          valueNode = state.result;
+        }
+      }
+
+      if (!atExplicitKey) {
+        storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, valueNode, _line, _pos);
+        keyTag = keyNode = valueNode = null;
+      }
+
+      skipSeparationSpace(state, true, -1);
+      ch = state.input.charCodeAt(state.position);
+    }
+
+    if (state.lineIndent > nodeIndent && (ch !== 0)) {
+      throwError(state, 'bad indentation of a mapping entry');
+    } else if (state.lineIndent < nodeIndent) {
+      break;
+    }
+  }
+
+  //
+  // Epilogue.
+  //
+
+  // Special case: last mapping's node contains only the key in explicit notation.
+  if (atExplicitKey) {
+    storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, null);
+  }
+
+  // Expose the resulting mapping.
+  if (detected) {
+    state.tag = _tag;
+    state.anchor = _anchor;
+    state.kind = 'mapping';
+    state.result = _result;
+  }
+
+  return detected;
+}
+
+function readTagProperty(state) {
+  var _position,
+      isVerbatim = false,
+      isNamed    = false,
+      tagHandle,
+      tagName,
+      ch;
+
+  ch = state.input.charCodeAt(state.position);
+
+  if (ch !== 0x21/* ! */) return false;
+
+  if (state.tag !== null) {
+    throwError(state, 'duplication of a tag property');
+  }
+
+  ch = state.input.charCodeAt(++state.position);
+
+  if (ch === 0x3C/* < */) {
+    isVerbatim = true;
+    ch = state.input.charCodeAt(++state.position);
+
+  } else if (ch === 0x21/* ! */) {
+    isNamed = true;
+    tagHandle = '!!';
+    ch = state.input.charCodeAt(++state.position);
+
+  } else {
+    tagHandle = '!';
+  }
+
+  _position = state.position;
+
+  if (isVerbatim) {
+    do { ch = state.input.charCodeAt(++state.position); }
+    while (ch !== 0 && ch !== 0x3E/* > */);
+
+    if (state.position < state.length) {
+      tagName = state.input.slice(_position, state.position);
+      ch = state.input.charCodeAt(++state.position);
+    } else {
+      throwError(state, 'unexpected end of the stream within a verbatim tag');
+    }
+  } else {
+    while (ch !== 0 && !is_WS_OR_EOL(ch)) {
+
+      if (ch === 0x21/* ! */) {
+        if (!isNamed) {
+          tagHandle = state.input.slice(_position - 1, state.position + 1);
+
+          if (!PATTERN_TAG_HANDLE.test(tagHandle)) {
+            throwError(state, 'named tag handle cannot contain such characters');
+          }
+
+          isNamed = true;
+          _position = state.position + 1;
+        } else {
+          throwError(state, 'tag suffix cannot contain exclamation marks');
+        }
+      }
+
+      ch = state.input.charCodeAt(++state.position);
+    }
+
+    tagName = state.input.slice(_position, state.position);
+
+    if (PATTERN_FLOW_INDICATORS.test(tagName)) {
+      throwError(state, 'tag suffix cannot contain flow indicator characters');
+    }
+  }
+
+  if (tagName && !PATTERN_TAG_URI.test(tagName)) {
+    throwError(state, 'tag name cannot contain such characters: ' + tagName);
+  }
+
+  if (isVerbatim) {
+    state.tag = tagName;
+
+  } else if (_hasOwnProperty.call(state.tagMap, tagHandle)) {
+    state.tag = state.tagMap[tagHandle] + tagName;
+
+  } else if (tagHandle === '!') {
+    state.tag = '!' + tagName;
+
+  } else if (tagHandle === '!!') {
+    state.tag = 'tag:yaml.org,2002:' + tagName;
+
+  } else {
+    throwError(state, 'undeclared tag handle "' + tagHandle + '"');
+  }
+
+  return true;
+}
+
+function readAnchorProperty(state) {
+  var _position,
+      ch;
+
+  ch = state.input.charCodeAt(state.position);
+
+  if (ch !== 0x26/* & */) return false;
+
+  if (state.anchor !== null) {
+    throwError(state, 'duplication of an anchor property');
+  }
+
+  ch = state.input.charCodeAt(++state.position);
+  _position = state.position;
+
+  while (ch !== 0 && !is_WS_OR_EOL(ch) && !is_FLOW_INDICATOR(ch)) {
+    ch = state.input.charCodeAt(++state.position);
+  }
+
+  if (state.position === _position) {
+    throwError(state, 'name of an anchor node must contain at least one character');
+  }
+
+  state.anchor = state.input.slice(_position, state.position);
+  return true;
+}
+
+function readAlias(state) {
+  var _position, alias,
+      ch;
+
+  ch = state.input.charCodeAt(state.position);
+
+  if (ch !== 0x2A/* * */) return false;
+
+  ch = state.input.charCodeAt(++state.position);
+  _position = state.position;
+
+  while (ch !== 0 && !is_WS_OR_EOL(ch) && !is_FLOW_INDICATOR(ch)) {
+    ch = state.input.charCodeAt(++state.position);
+  }
+
+  if (state.position === _position) {
+    throwError(state, 'name of an alias node must contain at least one character');
+  }
+
+  alias = state.input.slice(_position, state.position);
+
+  if (!state.anchorMap.hasOwnProperty(alias)) {
+    throwError(state, 'unidentified alias "' + alias + '"');
+  }
+
+  state.result = state.anchorMap[alias];
+  skipSeparationSpace(state, true, -1);
+  return true;
+}
+
+function composeNode(state, parentIndent, nodeContext, allowToSeek, allowCompact) {
+  var allowBlockStyles,
+      allowBlockScalars,
+      allowBlockCollections,
+      indentStatus = 1, // 1: this>parent, 0: this=parent, -1: this<parent
+      atNewLine  = false,
+      hasContent = false,
+      typeIndex,
+      typeQuantity,
+      type,
+      flowIndent,
+      blockIndent;
+
+  if (state.listener !== null) {
+    state.listener('open', state);
+  }
+
+  state.tag    = null;
+  state.anchor = null;
+  state.kind   = null;
+  state.result = null;
+
+  allowBlockStyles = allowBlockScalars = allowBlockCollections =
+    CONTEXT_BLOCK_OUT === nodeContext ||
+    CONTEXT_BLOCK_IN  === nodeContext;
+
+  if (allowToSeek) {
+    if (skipSeparationSpace(state, true, -1)) {
+      atNewLine = true;
+
+      if (state.lineIndent > parentIndent) {
+        indentStatus = 1;
+      } else if (state.lineIndent === parentIndent) {
+        indentStatus = 0;
+      } else if (state.lineIndent < parentIndent) {
+        indentStatus = -1;
+      }
+    }
+  }
+
+  if (indentStatus === 1) {
+    while (readTagProperty(state) || readAnchorProperty(state)) {
+      if (skipSeparationSpace(state, true, -1)) {
+        atNewLine = true;
+        allowBlockCollections = allowBlockStyles;
+
+        if (state.lineIndent > parentIndent) {
+          indentStatus = 1;
+        } else if (state.lineIndent === parentIndent) {
+          indentStatus = 0;
+        } else if (state.lineIndent < parentIndent) {
+          indentStatus = -1;
+        }
+      } else {
+        allowBlockCollections = false;
+      }
+    }
+  }
+
+  if (allowBlockCollections) {
+    allowBlockCollections = atNewLine || allowCompact;
+  }
+
+  if (indentStatus === 1 || CONTEXT_BLOCK_OUT === nodeContext) {
+    if (CONTEXT_FLOW_IN === nodeContext || CONTEXT_FLOW_OUT === nodeContext) {
+      flowIndent = parentIndent;
+    } else {
+      flowIndent = parentIndent + 1;
+    }
+
+    blockIndent = state.position - state.lineStart;
+
+    if (indentStatus === 1) {
+      if (allowBlockCollections &&
+          (readBlockSequence(state, blockIndent) ||
+           readBlockMapping(state, blockIndent, flowIndent)) ||
+          readFlowCollection(state, flowIndent)) {
+        hasContent = true;
+      } else {
+        if ((allowBlockScalars && readBlockScalar(state, flowIndent)) ||
+            readSingleQuotedScalar(state, flowIndent) ||
+            readDoubleQuotedScalar(state, flowIndent)) {
+          hasContent = true;
+
+        } else if (readAlias(state)) {
+          hasContent = true;
+
+          if (state.tag !== null || state.anchor !== null) {
+            throwError(state, 'alias node should not have any properties');
+          }
+
+        } else if (readPlainScalar(state, flowIndent, CONTEXT_FLOW_IN === nodeContext)) {
+          hasContent = true;
+
+          if (state.tag === null) {
+            state.tag = '?';
+          }
+        }
+
+        if (state.anchor !== null) {
+          state.anchorMap[state.anchor] = state.result;
+        }
+      }
+    } else if (indentStatus === 0) {
+      // Special case: block sequences are allowed to have same indentation level as the parent.
+      // http://www.yaml.org/spec/1.2/spec.html#id2799784
+      hasContent = allowBlockCollections && readBlockSequence(state, blockIndent);
+    }
+  }
+
+  if (state.tag !== null && state.tag !== '!') {
+    if (state.tag === '?') {
+      for (typeIndex = 0, typeQuantity = state.implicitTypes.length; typeIndex < typeQuantity; typeIndex += 1) {
+        type = state.implicitTypes[typeIndex];
+
+        // Implicit resolving is not allowed for non-scalar types, and '?'
+        // non-specific tag is only assigned to plain scalars. So, it isn't
+        // needed to check for 'kind' conformity.
+
+        if (type.resolve(state.result)) { // `state.result` updated in resolver if matched
+          state.result = type.construct(state.result);
+          state.tag = type.tag;
+          if (state.anchor !== null) {
+            state.anchorMap[state.anchor] = state.result;
+          }
+          break;
+        }
+      }
+    } else if (_hasOwnProperty.call(state.typeMap[state.kind || 'fallback'], state.tag)) {
+      type = state.typeMap[state.kind || 'fallback'][state.tag];
+
+      if (state.result !== null && type.kind !== state.kind) {
+        throwError(state, 'unacceptable node kind for !<' + state.tag + '> tag; it should be "' + type.kind + '", not "' + state.kind + '"');
+      }
+
+      if (!type.resolve(state.result)) { // `state.result` updated in resolver if matched
+        throwError(state, 'cannot resolve a node with !<' + state.tag + '> explicit tag');
+      } else {
+        state.result = type.construct(state.result);
+        if (state.anchor !== null) {
+          state.anchorMap[state.anchor] = state.result;
+        }
+      }
+    } else {
+      throwError(state, 'unknown tag !<' + state.tag + '>');
+    }
+  }
+
+  if (state.listener !== null) {
+    state.listener('close', state);
+  }
+  return state.tag !== null ||  state.anchor !== null || hasContent;
+}
+
+function readDocument(state) {
+  var documentStart = state.position,
+      _position,
+      directiveName,
+      directiveArgs,
+      hasDirectives = false,
+      ch;
+
+  state.version = null;
+  state.checkLineBreaks = state.legacy;
+  state.tagMap = {};
+  state.anchorMap = {};
+
+  while ((ch = state.input.charCodeAt(state.position)) !== 0) {
+    skipSeparationSpace(state, true, -1);
+
+    ch = state.input.charCodeAt(state.position);
+
+    if (state.lineIndent > 0 || ch !== 0x25/* % */) {
+      break;
+    }
+
+    hasDirectives = true;
+    ch = state.input.charCodeAt(++state.position);
+    _position = state.position;
+
+    while (ch !== 0 && !is_WS_OR_EOL(ch)) {
+      ch = state.input.charCodeAt(++state.position);
+    }
+
+    directiveName = state.input.slice(_position, state.position);
+    directiveArgs = [];
+
+    if (directiveName.length < 1) {
+      throwError(state, 'directive name must not be less than one character in length');
+    }
+
+    while (ch !== 0) {
+      while (is_WHITE_SPACE(ch)) {
+        ch = state.input.charCodeAt(++state.position);
+      }
+
+      if (ch === 0x23/* # */) {
+        do { ch = state.input.charCodeAt(++state.position); }
+        while (ch !== 0 && !is_EOL(ch));
+        break;
+      }
+
+      if (is_EOL(ch)) break;
+
+      _position = state.position;
+
+      while (ch !== 0 && !is_WS_OR_EOL(ch)) {
+        ch = state.input.charCodeAt(++state.position);
+      }
+
+      directiveArgs.push(state.input.slice(_position, state.position));
+    }
+
+    if (ch !== 0) readLineBreak(state);
+
+    if (_hasOwnProperty.call(directiveHandlers, directiveName)) {
+      directiveHandlers[directiveName](state, directiveName, directiveArgs);
+    } else {
+      throwWarning(state, 'unknown document directive "' + directiveName + '"');
+    }
+  }
+
+  skipSeparationSpace(state, true, -1);
+
+  if (state.lineIndent === 0 &&
+      state.input.charCodeAt(state.position)     === 0x2D/* - */ &&
+      state.input.charCodeAt(state.position + 1) === 0x2D/* - */ &&
+      state.input.charCodeAt(state.position + 2) === 0x2D/* - */) {
+    state.position += 3;
+    skipSeparationSpace(state, true, -1);
+
+  } else if (hasDirectives) {
+    throwError(state, 'directives end mark is expected');
+  }
+
+  composeNode(state, state.lineIndent - 1, CONTEXT_BLOCK_OUT, false, true);
+  skipSeparationSpace(state, true, -1);
+
+  if (state.checkLineBreaks &&
+      PATTERN_NON_ASCII_LINE_BREAKS.test(state.input.slice(documentStart, state.position))) {
+    throwWarning(state, 'non-ASCII line breaks are interpreted as content');
+  }
+
+  state.documents.push(state.result);
+
+  if (state.position === state.lineStart && testDocumentSeparator(state)) {
+
+    if (state.input.charCodeAt(state.position) === 0x2E/* . */) {
+      state.position += 3;
+      skipSeparationSpace(state, true, -1);
+    }
+    return;
+  }
+
+  if (state.position < (state.length - 1)) {
+    throwError(state, 'end of the stream or a document separator is expected');
+  } else {
+    return;
+  }
+}
+
+
+function loadDocuments(input, options) {
+  input = String(input);
+  options = options || {};
+
+  if (input.length !== 0) {
+
+    // Add tailing `\n` if not exists
+    if (input.charCodeAt(input.length - 1) !== 0x0A/* LF */ &&
+        input.charCodeAt(input.length - 1) !== 0x0D/* CR */) {
+      input += '\n';
+    }
+
+    // Strip BOM
+    if (input.charCodeAt(0) === 0xFEFF) {
+      input = input.slice(1);
+    }
+  }
+
+  var state = new State(input, options);
+
+  // Use 0 as string terminator. That significantly simplifies bounds check.
+  state.input += '\0';
+
+  while (state.input.charCodeAt(state.position) === 0x20/* Space */) {
+    state.lineIndent += 1;
+    state.position += 1;
+  }
+
+  while (state.position < (state.length - 1)) {
+    readDocument(state);
+  }
+
+  return state.documents;
+}
+
+
+function loadAll(input, iterator, options) {
+  var documents = loadDocuments(input, options), index, length;
+
+  if (typeof iterator !== 'function') {
+    return documents;
+  }
+
+  for (index = 0, length = documents.length; index < length; index += 1) {
+    iterator(documents[index]);
+  }
+}
+
+
+function load(input, options) {
+  var documents = loadDocuments(input, options);
+
+  if (documents.length === 0) {
+    /*eslint-disable no-undefined*/
+    return undefined;
+  } else if (documents.length === 1) {
+    return documents[0];
+  }
+  throw new YAMLException('expected a single document in the stream, but found more');
+}
+
+
+function safeLoadAll(input, output, options) {
+  if (typeof output === 'function') {
+    loadAll(input, output, common.extend({ schema: DEFAULT_SAFE_SCHEMA }, options));
+  } else {
+    return loadAll(input, common.extend({ schema: DEFAULT_SAFE_SCHEMA }, options));
+  }
+}
+
+
+function safeLoad(input, options) {
+  return load(input, common.extend({ schema: DEFAULT_SAFE_SCHEMA }, options));
+}
+
+
+module.exports.loadAll     = loadAll;
+module.exports.load        = load;
+module.exports.safeLoadAll = safeLoadAll;
+module.exports.safeLoad    = safeLoad;
+
+
+/***/ }),
+/* 283 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+
+var common = __webpack_require__(43);
+
+
+function Mark(name, buffer, position, line, column) {
+  this.name     = name;
+  this.buffer   = buffer;
+  this.position = position;
+  this.line     = line;
+  this.column   = column;
+}
+
+
+Mark.prototype.getSnippet = function getSnippet(indent, maxLength) {
+  var head, start, tail, end, snippet;
+
+  if (!this.buffer) return null;
+
+  indent = indent || 4;
+  maxLength = maxLength || 75;
+
+  head = '';
+  start = this.position;
+
+  while (start > 0 && '\x00\r\n\x85\u2028\u2029'.indexOf(this.buffer.charAt(start - 1)) === -1) {
+    start -= 1;
+    if (this.position - start > (maxLength / 2 - 1)) {
+      head = ' ... ';
+      start += 5;
+      break;
+    }
+  }
+
+  tail = '';
+  end = this.position;
+
+  while (end < this.buffer.length && '\x00\r\n\x85\u2028\u2029'.indexOf(this.buffer.charAt(end)) === -1) {
+    end += 1;
+    if (end - this.position > (maxLength / 2 - 1)) {
+      tail = ' ... ';
+      end -= 5;
+      break;
+    }
+  }
+
+  snippet = this.buffer.slice(start, end);
+
+  return common.repeat(' ', indent) + head + snippet + tail + '\n' +
+         common.repeat(' ', indent + this.position - start + head.length) + '^';
+};
+
+
+Mark.prototype.toString = function toString(compact) {
+  var snippet, where = '';
+
+  if (this.name) {
+    where += 'in "' + this.name + '" ';
+  }
+
+  where += 'at line ' + (this.line + 1) + ', column ' + (this.column + 1);
+
+  if (!compact) {
+    snippet = this.getSnippet();
+
+    if (snippet) {
+      where += ':\n' + snippet;
+    }
+  }
+
+  return where;
+};
+
+
+module.exports = Mark;
+
+
+/***/ }),
+/* 284 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+var require;
+
+/*eslint-disable no-bitwise*/
+
+var NodeBuffer;
+
+try {
+  // A trick for browserified version, to not include `Buffer` shim
+  var _require = require;
+  NodeBuffer = __webpack_require__(64).Buffer;
+} catch (__) {}
+
+var Type       = __webpack_require__(10);
+
+
+// [ 64, 65, 66 ] -> [ padding, CR, LF ]
+var BASE64_MAP = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=\n\r';
+
+
+function resolveYamlBinary(data) {
+  if (data === null) return false;
+
+  var code, idx, bitlen = 0, max = data.length, map = BASE64_MAP;
+
+  // Convert one by one.
+  for (idx = 0; idx < max; idx++) {
+    code = map.indexOf(data.charAt(idx));
+
+    // Skip CR/LF
+    if (code > 64) continue;
+
+    // Fail on illegal characters
+    if (code < 0) return false;
+
+    bitlen += 6;
+  }
+
+  // If there are any bits left, source was corrupted
+  return (bitlen % 8) === 0;
+}
+
+function constructYamlBinary(data) {
+  var idx, tailbits,
+      input = data.replace(/[\r\n=]/g, ''), // remove CR/LF & padding to simplify scan
+      max = input.length,
+      map = BASE64_MAP,
+      bits = 0,
+      result = [];
+
+  // Collect by 6*4 bits (3 bytes)
+
+  for (idx = 0; idx < max; idx++) {
+    if ((idx % 4 === 0) && idx) {
+      result.push((bits >> 16) & 0xFF);
+      result.push((bits >> 8) & 0xFF);
+      result.push(bits & 0xFF);
+    }
+
+    bits = (bits << 6) | map.indexOf(input.charAt(idx));
+  }
+
+  // Dump tail
+
+  tailbits = (max % 4) * 6;
+
+  if (tailbits === 0) {
+    result.push((bits >> 16) & 0xFF);
+    result.push((bits >> 8) & 0xFF);
+    result.push(bits & 0xFF);
+  } else if (tailbits === 18) {
+    result.push((bits >> 10) & 0xFF);
+    result.push((bits >> 2) & 0xFF);
+  } else if (tailbits === 12) {
+    result.push((bits >> 4) & 0xFF);
+  }
+
+  // Wrap into Buffer for NodeJS and leave Array for browser
+  if (NodeBuffer) {
+    // Support node 6.+ Buffer API when available
+    return NodeBuffer.from ? NodeBuffer.from(result) : new NodeBuffer(result);
+  }
+
+  return result;
+}
+
+function representYamlBinary(object /*, style*/) {
+  var result = '', bits = 0, idx, tail,
+      max = object.length,
+      map = BASE64_MAP;
+
+  // Convert every three bytes to 4 ASCII characters.
+
+  for (idx = 0; idx < max; idx++) {
+    if ((idx % 3 === 0) && idx) {
+      result += map[(bits >> 18) & 0x3F];
+      result += map[(bits >> 12) & 0x3F];
+      result += map[(bits >> 6) & 0x3F];
+      result += map[bits & 0x3F];
+    }
+
+    bits = (bits << 8) + object[idx];
+  }
+
+  // Dump tail
+
+  tail = max % 3;
+
+  if (tail === 0) {
+    result += map[(bits >> 18) & 0x3F];
+    result += map[(bits >> 12) & 0x3F];
+    result += map[(bits >> 6) & 0x3F];
+    result += map[bits & 0x3F];
+  } else if (tail === 2) {
+    result += map[(bits >> 10) & 0x3F];
+    result += map[(bits >> 4) & 0x3F];
+    result += map[(bits << 2) & 0x3F];
+    result += map[64];
+  } else if (tail === 1) {
+    result += map[(bits >> 2) & 0x3F];
+    result += map[(bits << 4) & 0x3F];
+    result += map[64];
+    result += map[64];
+  }
+
+  return result;
+}
+
+function isBinary(object) {
+  return NodeBuffer && NodeBuffer.isBuffer(object);
+}
+
+module.exports = new Type('tag:yaml.org,2002:binary', {
+  kind: 'scalar',
+  resolve: resolveYamlBinary,
+  construct: constructYamlBinary,
+  predicate: isBinary,
+  represent: representYamlBinary
+});
+
+
+/***/ }),
+/* 285 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var Type = __webpack_require__(10);
+
+function resolveYamlBoolean(data) {
+  if (data === null) return false;
+
+  var max = data.length;
+
+  return (max === 4 && (data === 'true' || data === 'True' || data === 'TRUE')) ||
+         (max === 5 && (data === 'false' || data === 'False' || data === 'FALSE'));
+}
+
+function constructYamlBoolean(data) {
+  return data === 'true' ||
+         data === 'True' ||
+         data === 'TRUE';
+}
+
+function isBoolean(object) {
+  return Object.prototype.toString.call(object) === '[object Boolean]';
+}
+
+module.exports = new Type('tag:yaml.org,2002:bool', {
+  kind: 'scalar',
+  resolve: resolveYamlBoolean,
+  construct: constructYamlBoolean,
+  predicate: isBoolean,
+  represent: {
+    lowercase: function (object) { return object ? 'true' : 'false'; },
+    uppercase: function (object) { return object ? 'TRUE' : 'FALSE'; },
+    camelcase: function (object) { return object ? 'True' : 'False'; }
+  },
+  defaultStyle: 'lowercase'
+});
+
+
+/***/ }),
+/* 286 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var common = __webpack_require__(43);
+var Type   = __webpack_require__(10);
+
+var YAML_FLOAT_PATTERN = new RegExp(
+  // 2.5e4, 2.5 and integers
+  '^(?:[-+]?(?:0|[1-9][0-9_]*)(?:\\.[0-9_]*)?(?:[eE][-+]?[0-9]+)?' +
+  // .2e4, .2
+  // special case, seems not from spec
+  '|\\.[0-9_]+(?:[eE][-+]?[0-9]+)?' +
+  // 20:59
+  '|[-+]?[0-9][0-9_]*(?::[0-5]?[0-9])+\\.[0-9_]*' +
+  // .inf
+  '|[-+]?\\.(?:inf|Inf|INF)' +
+  // .nan
+  '|\\.(?:nan|NaN|NAN))$');
+
+function resolveYamlFloat(data) {
+  if (data === null) return false;
+
+  if (!YAML_FLOAT_PATTERN.test(data) ||
+      // Quick hack to not allow integers end with `_`
+      // Probably should update regexp & check speed
+      data[data.length - 1] === '_') {
+    return false;
+  }
+
+  return true;
+}
+
+function constructYamlFloat(data) {
+  var value, sign, base, digits;
+
+  value  = data.replace(/_/g, '').toLowerCase();
+  sign   = value[0] === '-' ? -1 : 1;
+  digits = [];
+
+  if ('+-'.indexOf(value[0]) >= 0) {
+    value = value.slice(1);
+  }
+
+  if (value === '.inf') {
+    return (sign === 1) ? Number.POSITIVE_INFINITY : Number.NEGATIVE_INFINITY;
+
+  } else if (value === '.nan') {
+    return NaN;
+
+  } else if (value.indexOf(':') >= 0) {
+    value.split(':').forEach(function (v) {
+      digits.unshift(parseFloat(v, 10));
+    });
+
+    value = 0.0;
+    base = 1;
+
+    digits.forEach(function (d) {
+      value += d * base;
+      base *= 60;
+    });
+
+    return sign * value;
+
+  }
+  return sign * parseFloat(value, 10);
+}
+
+
+var SCIENTIFIC_WITHOUT_DOT = /^[-+]?[0-9]+e/;
+
+function representYamlFloat(object, style) {
+  var res;
+
+  if (isNaN(object)) {
+    switch (style) {
+      case 'lowercase': return '.nan';
+      case 'uppercase': return '.NAN';
+      case 'camelcase': return '.NaN';
+    }
+  } else if (Number.POSITIVE_INFINITY === object) {
+    switch (style) {
+      case 'lowercase': return '.inf';
+      case 'uppercase': return '.INF';
+      case 'camelcase': return '.Inf';
+    }
+  } else if (Number.NEGATIVE_INFINITY === object) {
+    switch (style) {
+      case 'lowercase': return '-.inf';
+      case 'uppercase': return '-.INF';
+      case 'camelcase': return '-.Inf';
+    }
+  } else if (common.isNegativeZero(object)) {
+    return '-0.0';
+  }
+
+  res = object.toString(10);
+
+  // JS stringifier can build scientific format without dots: 5e-100,
+  // while YAML requres dot: 5.e-100. Fix it with simple hack
+
+  return SCIENTIFIC_WITHOUT_DOT.test(res) ? res.replace('e', '.e') : res;
+}
+
+function isFloat(object) {
+  return (Object.prototype.toString.call(object) === '[object Number]') &&
+         (object % 1 !== 0 || common.isNegativeZero(object));
+}
+
+module.exports = new Type('tag:yaml.org,2002:float', {
+  kind: 'scalar',
+  resolve: resolveYamlFloat,
+  construct: constructYamlFloat,
+  predicate: isFloat,
+  represent: representYamlFloat,
+  defaultStyle: 'lowercase'
+});
+
+
+/***/ }),
+/* 287 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var common = __webpack_require__(43);
+var Type   = __webpack_require__(10);
+
+function isHexCode(c) {
+  return ((0x30/* 0 */ <= c) && (c <= 0x39/* 9 */)) ||
+         ((0x41/* A */ <= c) && (c <= 0x46/* F */)) ||
+         ((0x61/* a */ <= c) && (c <= 0x66/* f */));
+}
+
+function isOctCode(c) {
+  return ((0x30/* 0 */ <= c) && (c <= 0x37/* 7 */));
+}
+
+function isDecCode(c) {
+  return ((0x30/* 0 */ <= c) && (c <= 0x39/* 9 */));
+}
+
+function resolveYamlInteger(data) {
+  if (data === null) return false;
+
+  var max = data.length,
+      index = 0,
+      hasDigits = false,
+      ch;
+
+  if (!max) return false;
+
+  ch = data[index];
+
+  // sign
+  if (ch === '-' || ch === '+') {
+    ch = data[++index];
+  }
+
+  if (ch === '0') {
+    // 0
+    if (index + 1 === max) return true;
+    ch = data[++index];
+
+    // base 2, base 8, base 16
+
+    if (ch === 'b') {
+      // base 2
+      index++;
+
+      for (; index < max; index++) {
+        ch = data[index];
+        if (ch === '_') continue;
+        if (ch !== '0' && ch !== '1') return false;
+        hasDigits = true;
+      }
+      return hasDigits && ch !== '_';
+    }
+
+
+    if (ch === 'x') {
+      // base 16
+      index++;
+
+      for (; index < max; index++) {
+        ch = data[index];
+        if (ch === '_') continue;
+        if (!isHexCode(data.charCodeAt(index))) return false;
+        hasDigits = true;
+      }
+      return hasDigits && ch !== '_';
+    }
+
+    // base 8
+    for (; index < max; index++) {
+      ch = data[index];
+      if (ch === '_') continue;
+      if (!isOctCode(data.charCodeAt(index))) return false;
+      hasDigits = true;
+    }
+    return hasDigits && ch !== '_';
+  }
+
+  // base 10 (except 0) or base 60
+
+  // value should not start with `_`;
+  if (ch === '_') return false;
+
+  for (; index < max; index++) {
+    ch = data[index];
+    if (ch === '_') continue;
+    if (ch === ':') break;
+    if (!isDecCode(data.charCodeAt(index))) {
+      return false;
+    }
+    hasDigits = true;
+  }
+
+  // Should have digits and should not end with `_`
+  if (!hasDigits || ch === '_') return false;
+
+  // if !base60 - done;
+  if (ch !== ':') return true;
+
+  // base60 almost not used, no needs to optimize
+  return /^(:[0-5]?[0-9])+$/.test(data.slice(index));
+}
+
+function constructYamlInteger(data) {
+  var value = data, sign = 1, ch, base, digits = [];
+
+  if (value.indexOf('_') !== -1) {
+    value = value.replace(/_/g, '');
+  }
+
+  ch = value[0];
+
+  if (ch === '-' || ch === '+') {
+    if (ch === '-') sign = -1;
+    value = value.slice(1);
+    ch = value[0];
+  }
+
+  if (value === '0') return 0;
+
+  if (ch === '0') {
+    if (value[1] === 'b') return sign * parseInt(value.slice(2), 2);
+    if (value[1] === 'x') return sign * parseInt(value, 16);
+    return sign * parseInt(value, 8);
+  }
+
+  if (value.indexOf(':') !== -1) {
+    value.split(':').forEach(function (v) {
+      digits.unshift(parseInt(v, 10));
+    });
+
+    value = 0;
+    base = 1;
+
+    digits.forEach(function (d) {
+      value += (d * base);
+      base *= 60;
+    });
+
+    return sign * value;
+
+  }
+
+  return sign * parseInt(value, 10);
+}
+
+function isInteger(object) {
+  return (Object.prototype.toString.call(object)) === '[object Number]' &&
+         (object % 1 === 0 && !common.isNegativeZero(object));
+}
+
+module.exports = new Type('tag:yaml.org,2002:int', {
+  kind: 'scalar',
+  resolve: resolveYamlInteger,
+  construct: constructYamlInteger,
+  predicate: isInteger,
+  represent: {
+    binary:      function (obj) { return obj >= 0 ? '0b' + obj.toString(2) : '-0b' + obj.toString(2).slice(1); },
+    octal:       function (obj) { return obj >= 0 ? '0'  + obj.toString(8) : '-0'  + obj.toString(8).slice(1); },
+    decimal:     function (obj) { return obj.toString(10); },
+    /* eslint-disable max-len */
+    hexadecimal: function (obj) { return obj >= 0 ? '0x' + obj.toString(16).toUpperCase() :  '-0x' + obj.toString(16).toUpperCase().slice(1); }
+  },
+  defaultStyle: 'decimal',
+  styleAliases: {
+    binary:      [ 2,  'bin' ],
+    octal:       [ 8,  'oct' ],
+    decimal:     [ 10, 'dec' ],
+    hexadecimal: [ 16, 'hex' ]
+  }
+});
+
+
+/***/ }),
+/* 288 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+var require;
+
+var esprima;
+
+// Browserified version does not have esprima
+//
+// 1. For node.js just require module as deps
+// 2. For browser try to require mudule via external AMD system.
+//    If not found - try to fallback to window.esprima. If not
+//    found too - then fail to parse.
+//
+try {
+  // workaround to exclude package from browserify list.
+  var _require = require;
+  esprima = __webpack_require__(268);
+} catch (_) {
+  /*global window */
+  if (typeof window !== 'undefined') esprima = window.esprima;
+}
+
+var Type = __webpack_require__(10);
+
+function resolveJavascriptFunction(data) {
+  if (data === null) return false;
+
+  try {
+    var source = '(' + data + ')',
+        ast    = esprima.parse(source, { range: true });
+
+    if (ast.type                    !== 'Program'             ||
+        ast.body.length             !== 1                     ||
+        ast.body[0].type            !== 'ExpressionStatement' ||
+        (ast.body[0].expression.type !== 'ArrowFunctionExpression' &&
+          ast.body[0].expression.type !== 'FunctionExpression')) {
+      return false;
+    }
+
+    return true;
+  } catch (err) {
+    return false;
+  }
+}
+
+function constructJavascriptFunction(data) {
+  /*jslint evil:true*/
+
+  var source = '(' + data + ')',
+      ast    = esprima.parse(source, { range: true }),
+      params = [],
+      body;
+
+  if (ast.type                    !== 'Program'             ||
+      ast.body.length             !== 1                     ||
+      ast.body[0].type            !== 'ExpressionStatement' ||
+      (ast.body[0].expression.type !== 'ArrowFunctionExpression' &&
+        ast.body[0].expression.type !== 'FunctionExpression')) {
+    throw new Error('Failed to resolve function');
+  }
+
+  ast.body[0].expression.params.forEach(function (param) {
+    params.push(param.name);
+  });
+
+  body = ast.body[0].expression.body.range;
+
+  // Esprima's ranges include the first '{' and the last '}' characters on
+  // function expressions. So cut them out.
+  if (ast.body[0].expression.body.type === 'BlockStatement') {
+    /*eslint-disable no-new-func*/
+    return new Function(params, source.slice(body[0] + 1, body[1] - 1));
+  }
+  // ES6 arrow functions can omit the BlockStatement. In that case, just return
+  // the body.
+  /*eslint-disable no-new-func*/
+  return new Function(params, 'return ' + source.slice(body[0], body[1]));
+}
+
+function representJavascriptFunction(object /*, style*/) {
+  return object.toString();
+}
+
+function isFunction(object) {
+  return Object.prototype.toString.call(object) === '[object Function]';
+}
+
+module.exports = new Type('tag:yaml.org,2002:js/function', {
+  kind: 'scalar',
+  resolve: resolveJavascriptFunction,
+  construct: constructJavascriptFunction,
+  predicate: isFunction,
+  represent: representJavascriptFunction
+});
+
+
+/***/ }),
+/* 289 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var Type = __webpack_require__(10);
+
+function resolveJavascriptRegExp(data) {
+  if (data === null) return false;
+  if (data.length === 0) return false;
+
+  var regexp = data,
+      tail   = /\/([gim]*)$/.exec(data),
+      modifiers = '';
+
+  // if regexp starts with '/' it can have modifiers and must be properly closed
+  // `/foo/gim` - modifiers tail can be maximum 3 chars
+  if (regexp[0] === '/') {
+    if (tail) modifiers = tail[1];
+
+    if (modifiers.length > 3) return false;
+    // if expression starts with /, is should be properly terminated
+    if (regexp[regexp.length - modifiers.length - 1] !== '/') return false;
+  }
+
+  return true;
+}
+
+function constructJavascriptRegExp(data) {
+  var regexp = data,
+      tail   = /\/([gim]*)$/.exec(data),
+      modifiers = '';
+
+  // `/foo/gim` - tail can be maximum 4 chars
+  if (regexp[0] === '/') {
+    if (tail) modifiers = tail[1];
+    regexp = regexp.slice(1, regexp.length - modifiers.length - 1);
+  }
+
+  return new RegExp(regexp, modifiers);
+}
+
+function representJavascriptRegExp(object /*, style*/) {
+  var result = '/' + object.source + '/';
+
+  if (object.global) result += 'g';
+  if (object.multiline) result += 'm';
+  if (object.ignoreCase) result += 'i';
+
+  return result;
+}
+
+function isRegExp(object) {
+  return Object.prototype.toString.call(object) === '[object RegExp]';
+}
+
+module.exports = new Type('tag:yaml.org,2002:js/regexp', {
+  kind: 'scalar',
+  resolve: resolveJavascriptRegExp,
+  construct: constructJavascriptRegExp,
+  predicate: isRegExp,
+  represent: representJavascriptRegExp
+});
+
+
+/***/ }),
+/* 290 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var Type = __webpack_require__(10);
+
+function resolveJavascriptUndefined() {
+  return true;
+}
+
+function constructJavascriptUndefined() {
+  /*eslint-disable no-undefined*/
+  return undefined;
+}
+
+function representJavascriptUndefined() {
+  return '';
+}
+
+function isUndefined(object) {
+  return typeof object === 'undefined';
+}
+
+module.exports = new Type('tag:yaml.org,2002:js/undefined', {
+  kind: 'scalar',
+  resolve: resolveJavascriptUndefined,
+  construct: constructJavascriptUndefined,
+  predicate: isUndefined,
+  represent: representJavascriptUndefined
+});
+
+
+/***/ }),
+/* 291 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var Type = __webpack_require__(10);
+
+module.exports = new Type('tag:yaml.org,2002:map', {
+  kind: 'mapping',
+  construct: function (data) { return data !== null ? data : {}; }
+});
+
+
+/***/ }),
+/* 292 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var Type = __webpack_require__(10);
+
+function resolveYamlMerge(data) {
+  return data === '<<' || data === null;
+}
+
+module.exports = new Type('tag:yaml.org,2002:merge', {
+  kind: 'scalar',
+  resolve: resolveYamlMerge
+});
+
+
+/***/ }),
+/* 293 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var Type = __webpack_require__(10);
+
+function resolveYamlNull(data) {
+  if (data === null) return true;
+
+  var max = data.length;
+
+  return (max === 1 && data === '~') ||
+         (max === 4 && (data === 'null' || data === 'Null' || data === 'NULL'));
+}
+
+function constructYamlNull() {
+  return null;
+}
+
+function isNull(object) {
+  return object === null;
+}
+
+module.exports = new Type('tag:yaml.org,2002:null', {
+  kind: 'scalar',
+  resolve: resolveYamlNull,
+  construct: constructYamlNull,
+  predicate: isNull,
+  represent: {
+    canonical: function () { return '~';    },
+    lowercase: function () { return 'null'; },
+    uppercase: function () { return 'NULL'; },
+    camelcase: function () { return 'Null'; }
+  },
+  defaultStyle: 'lowercase'
+});
+
+
+/***/ }),
+/* 294 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var Type = __webpack_require__(10);
+
+var _hasOwnProperty = Object.prototype.hasOwnProperty;
+var _toString       = Object.prototype.toString;
+
+function resolveYamlOmap(data) {
+  if (data === null) return true;
+
+  var objectKeys = [], index, length, pair, pairKey, pairHasKey,
+      object = data;
+
+  for (index = 0, length = object.length; index < length; index += 1) {
+    pair = object[index];
+    pairHasKey = false;
+
+    if (_toString.call(pair) !== '[object Object]') return false;
+
+    for (pairKey in pair) {
+      if (_hasOwnProperty.call(pair, pairKey)) {
+        if (!pairHasKey) pairHasKey = true;
+        else return false;
+      }
+    }
+
+    if (!pairHasKey) return false;
+
+    if (objectKeys.indexOf(pairKey) === -1) objectKeys.push(pairKey);
+    else return false;
+  }
+
+  return true;
+}
+
+function constructYamlOmap(data) {
+  return data !== null ? data : [];
+}
+
+module.exports = new Type('tag:yaml.org,2002:omap', {
+  kind: 'sequence',
+  resolve: resolveYamlOmap,
+  construct: constructYamlOmap
+});
+
+
+/***/ }),
+/* 295 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var Type = __webpack_require__(10);
+
+var _toString = Object.prototype.toString;
+
+function resolveYamlPairs(data) {
+  if (data === null) return true;
+
+  var index, length, pair, keys, result,
+      object = data;
+
+  result = new Array(object.length);
+
+  for (index = 0, length = object.length; index < length; index += 1) {
+    pair = object[index];
+
+    if (_toString.call(pair) !== '[object Object]') return false;
+
+    keys = Object.keys(pair);
+
+    if (keys.length !== 1) return false;
+
+    result[index] = [ keys[0], pair[keys[0]] ];
+  }
+
+  return true;
+}
+
+function constructYamlPairs(data) {
+  if (data === null) return [];
+
+  var index, length, pair, keys, result,
+      object = data;
+
+  result = new Array(object.length);
+
+  for (index = 0, length = object.length; index < length; index += 1) {
+    pair = object[index];
+
+    keys = Object.keys(pair);
+
+    result[index] = [ keys[0], pair[keys[0]] ];
+  }
+
+  return result;
+}
+
+module.exports = new Type('tag:yaml.org,2002:pairs', {
+  kind: 'sequence',
+  resolve: resolveYamlPairs,
+  construct: constructYamlPairs
+});
+
+
+/***/ }),
+/* 296 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var Type = __webpack_require__(10);
+
+module.exports = new Type('tag:yaml.org,2002:seq', {
+  kind: 'sequence',
+  construct: function (data) { return data !== null ? data : []; }
+});
+
+
+/***/ }),
+/* 297 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var Type = __webpack_require__(10);
+
+var _hasOwnProperty = Object.prototype.hasOwnProperty;
+
+function resolveYamlSet(data) {
+  if (data === null) return true;
+
+  var key, object = data;
+
+  for (key in object) {
+    if (_hasOwnProperty.call(object, key)) {
+      if (object[key] !== null) return false;
+    }
+  }
+
+  return true;
+}
+
+function constructYamlSet(data) {
+  return data !== null ? data : {};
+}
+
+module.exports = new Type('tag:yaml.org,2002:set', {
+  kind: 'mapping',
+  resolve: resolveYamlSet,
+  construct: constructYamlSet
+});
+
+
+/***/ }),
+/* 298 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var Type = __webpack_require__(10);
+
+module.exports = new Type('tag:yaml.org,2002:str', {
+  kind: 'scalar',
+  construct: function (data) { return data !== null ? data : ''; }
+});
+
+
+/***/ }),
+/* 299 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var Type = __webpack_require__(10);
+
+var YAML_DATE_REGEXP = new RegExp(
+  '^([0-9][0-9][0-9][0-9])'          + // [1] year
+  '-([0-9][0-9])'                    + // [2] month
+  '-([0-9][0-9])$');                   // [3] day
+
+var YAML_TIMESTAMP_REGEXP = new RegExp(
+  '^([0-9][0-9][0-9][0-9])'          + // [1] year
+  '-([0-9][0-9]?)'                   + // [2] month
+  '-([0-9][0-9]?)'                   + // [3] day
+  '(?:[Tt]|[ \\t]+)'                 + // ...
+  '([0-9][0-9]?)'                    + // [4] hour
+  ':([0-9][0-9])'                    + // [5] minute
+  ':([0-9][0-9])'                    + // [6] second
+  '(?:\\.([0-9]*))?'                 + // [7] fraction
+  '(?:[ \\t]*(Z|([-+])([0-9][0-9]?)' + // [8] tz [9] tz_sign [10] tz_hour
+  '(?::([0-9][0-9]))?))?$');           // [11] tz_minute
+
+function resolveYamlTimestamp(data) {
+  if (data === null) return false;
+  if (YAML_DATE_REGEXP.exec(data) !== null) return true;
+  if (YAML_TIMESTAMP_REGEXP.exec(data) !== null) return true;
+  return false;
+}
+
+function constructYamlTimestamp(data) {
+  var match, year, month, day, hour, minute, second, fraction = 0,
+      delta = null, tz_hour, tz_minute, date;
+
+  match = YAML_DATE_REGEXP.exec(data);
+  if (match === null) match = YAML_TIMESTAMP_REGEXP.exec(data);
+
+  if (match === null) throw new Error('Date resolve error');
+
+  // match: [1] year [2] month [3] day
+
+  year = +(match[1]);
+  month = +(match[2]) - 1; // JS month starts with 0
+  day = +(match[3]);
+
+  if (!match[4]) { // no hour
+    return new Date(Date.UTC(year, month, day));
+  }
+
+  // match: [4] hour [5] minute [6] second [7] fraction
+
+  hour = +(match[4]);
+  minute = +(match[5]);
+  second = +(match[6]);
+
+  if (match[7]) {
+    fraction = match[7].slice(0, 3);
+    while (fraction.length < 3) { // milli-seconds
+      fraction += '0';
+    }
+    fraction = +fraction;
+  }
+
+  // match: [8] tz [9] tz_sign [10] tz_hour [11] tz_minute
+
+  if (match[9]) {
+    tz_hour = +(match[10]);
+    tz_minute = +(match[11] || 0);
+    delta = (tz_hour * 60 + tz_minute) * 60000; // delta in mili-seconds
+    if (match[9] === '-') delta = -delta;
+  }
+
+  date = new Date(Date.UTC(year, month, day, hour, minute, second, fraction));
+
+  if (delta) date.setTime(date.getTime() - delta);
+
+  return date;
+}
+
+function representYamlTimestamp(object /*, style*/) {
+  return object.toISOString();
+}
+
+module.exports = new Type('tag:yaml.org,2002:timestamp', {
+  kind: 'scalar',
+  resolve: resolveYamlTimestamp,
+  construct: constructYamlTimestamp,
+  instanceOf: Date,
+  represent: representYamlTimestamp
+});
+
+
+/***/ }),
+/* 300 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var win32 = process && process.platform === 'win32';
+var path = __webpack_require__(0);
+var fileRe = __webpack_require__(646);
+var utils = module.exports;
+
+/**
+ * Module dependencies
+ */
+
+utils.diff = __webpack_require__(755);
+utils.unique = __webpack_require__(756);
+utils.braces = __webpack_require__(757);
+utils.brackets = __webpack_require__(639);
+utils.extglob = __webpack_require__(644);
+utils.isExtglob = __webpack_require__(177);
+utils.isGlob = __webpack_require__(178);
+utils.typeOf = __webpack_require__(179);
+utils.normalize = __webpack_require__(765);
+utils.omit = __webpack_require__(769);
+utils.parseGlob = __webpack_require__(773);
+utils.cache = __webpack_require__(795);
+
+/**
+ * Get the filename of a filepath
+ *
+ * @param {String} `string`
+ * @return {String}
+ */
+
+utils.filename = function filename(fp) {
+  var seg = fp.match(fileRe());
+  return seg && seg[0];
+};
+
+/**
+ * Returns a function that returns true if the given
+ * pattern is the same as a given `filepath`
+ *
+ * @param {String} `pattern`
+ * @return {Function}
+ */
+
+utils.isPath = function isPath(pattern, opts) {
+  opts = opts || {};
+  return function(fp) {
+    var unixified = utils.unixify(fp, opts);
+    if(opts.nocase){
+      return pattern.toLowerCase() === unixified.toLowerCase();
+    }
+    return pattern === unixified;
+  };
+};
+
+/**
+ * Returns a function that returns true if the given
+ * pattern contains a `filepath`
+ *
+ * @param {String} `pattern`
+ * @return {Function}
+ */
+
+utils.hasPath = function hasPath(pattern, opts) {
+  return function(fp) {
+    return utils.unixify(pattern, opts).indexOf(fp) !== -1;
+  };
+};
+
+/**
+ * Returns a function that returns true if the given
+ * pattern matches or contains a `filepath`
+ *
+ * @param {String} `pattern`
+ * @return {Function}
+ */
+
+utils.matchPath = function matchPath(pattern, opts) {
+  var fn = (opts && opts.contains)
+    ? utils.hasPath(pattern, opts)
+    : utils.isPath(pattern, opts);
+  return fn;
+};
+
+/**
+ * Returns a function that returns true if the given
+ * regex matches the `filename` of a file path.
+ *
+ * @param {RegExp} `re`
+ * @return {Boolean}
+ */
+
+utils.hasFilename = function hasFilename(re) {
+  return function(fp) {
+    var name = utils.filename(fp);
+    return name && re.test(name);
+  };
+};
+
+/**
+ * Coerce `val` to an array
+ *
+ * @param  {*} val
+ * @return {Array}
+ */
+
+utils.arrayify = function arrayify(val) {
+  return !Array.isArray(val)
+    ? [val]
+    : val;
+};
+
+/**
+ * Normalize all slashes in a file path or glob pattern to
+ * forward slashes.
+ */
+
+utils.unixify = function unixify(fp, opts) {
+  if (opts && opts.unixify === false) return fp;
+  if (opts && opts.unixify === true || win32 || path.sep === '\\') {
+    return utils.normalize(fp, false);
+  }
+  if (opts && opts.unescape === true) {
+    return fp ? fp.toString().replace(/\\(\w)/g, '$1') : '';
+  }
+  return fp;
+};
+
+/**
+ * Escape/unescape utils
+ */
+
+utils.escapePath = function escapePath(fp) {
+  return fp.replace(/[\\.]/g, '\\$&');
+};
+
+utils.unescapeGlob = function unescapeGlob(fp) {
+  return fp.replace(/[\\"']/g, '');
+};
+
+utils.escapeRe = function escapeRe(str) {
+  return str.replace(/[-[\\$*+?.#^\s{}(|)\]]/g, '\\$&');
+};
+
+/**
+ * Expose `utils`
+ */
+
+module.exports = utils;
+
+
+/***/ }),
+/* 301 */
+/***/ (function(module, exports) {
+
+/**
+ * Helpers.
+ */
+
+var s = 1000;
+var m = s * 60;
+var h = m * 60;
+var d = h * 24;
+var y = d * 365.25;
+
+/**
+ * Parse or format the given `val`.
+ *
+ * Options:
+ *
+ *  - `long` verbose formatting [false]
+ *
+ * @param {String|Number} val
+ * @param {Object} [options]
+ * @throws {Error} throw an error if val is not a non-empty string or a number
+ * @return {String|Number}
+ * @api public
+ */
+
+module.exports = function(val, options) {
+  options = options || {};
+  var type = typeof val;
+  if (type === 'string' && val.length > 0) {
+    return parse(val);
+  } else if (type === 'number' && isNaN(val) === false) {
+    return options.long ? fmtLong(val) : fmtShort(val);
+  }
+  throw new Error(
+    'val is not a non-empty string or a valid number. val=' +
+      JSON.stringify(val)
+  );
+};
+
+/**
+ * Parse the given `str` and return milliseconds.
+ *
+ * @param {String} str
+ * @return {Number}
+ * @api private
+ */
+
+function parse(str) {
+  str = String(str);
+  if (str.length > 100) {
+    return;
+  }
+  var match = /^((?:\d+)?\.?\d+) *(milliseconds?|msecs?|ms|seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|years?|yrs?|y)?$/i.exec(
+    str
+  );
+  if (!match) {
+    return;
+  }
+  var n = parseFloat(match[1]);
+  var type = (match[2] || 'ms').toLowerCase();
+  switch (type) {
+    case 'years':
+    case 'year':
+    case 'yrs':
+    case 'yr':
+    case 'y':
+      return n * y;
+    case 'days':
+    case 'day':
+    case 'd':
+      return n * d;
+    case 'hours':
+    case 'hour':
+    case 'hrs':
+    case 'hr':
+    case 'h':
+      return n * h;
+    case 'minutes':
+    case 'minute':
+    case 'mins':
+    case 'min':
+    case 'm':
+      return n * m;
+    case 'seconds':
+    case 'second':
+    case 'secs':
+    case 'sec':
+    case 's':
+      return n * s;
+    case 'milliseconds':
+    case 'millisecond':
+    case 'msecs':
+    case 'msec':
+    case 'ms':
+      return n;
+    default:
+      return undefined;
+  }
+}
+
+/**
+ * Short format for `ms`.
+ *
+ * @param {Number} ms
+ * @return {String}
+ * @api private
+ */
+
+function fmtShort(ms) {
+  if (ms >= d) {
+    return Math.round(ms / d) + 'd';
+  }
+  if (ms >= h) {
+    return Math.round(ms / h) + 'h';
+  }
+  if (ms >= m) {
+    return Math.round(ms / m) + 'm';
+  }
+  if (ms >= s) {
+    return Math.round(ms / s) + 's';
+  }
+  return ms + 'ms';
+}
+
+/**
+ * Long format for `ms`.
+ *
+ * @param {Number} ms
+ * @return {String}
+ * @api private
+ */
+
+function fmtLong(ms) {
+  return plural(ms, d, 'day') ||
+    plural(ms, h, 'hour') ||
+    plural(ms, m, 'minute') ||
+    plural(ms, s, 'second') ||
+    ms + ' ms';
+}
+
+/**
+ * Pluralization helper.
+ */
+
+function plural(ms, n, name) {
+  if (ms < n) {
+    return;
+  }
+  if (ms < n * 1.5) {
+    return Math.floor(ms / n) + ' ' + name;
+  }
+  return Math.ceil(ms / n) + ' ' + name + 's';
+}
+
+
+/***/ }),
+/* 302 */
+/***/ (function(module, exports, __webpack_require__) {
+
+module.exports = __webpack_require__(763);
+
+/***/ }),
+/* 303 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*
+object-assign
+(c) Sindre Sorhus
+@license MIT
+*/
+
+
+/* eslint-disable no-unused-vars */
+var getOwnPropertySymbols = Object.getOwnPropertySymbols;
+var hasOwnProperty = Object.prototype.hasOwnProperty;
+var propIsEnumerable = Object.prototype.propertyIsEnumerable;
+
+function toObject(val) {
+	if (val === null || val === undefined) {
+		throw new TypeError('Object.assign cannot be called with null or undefined');
+	}
+
+	return Object(val);
+}
+
+function shouldUseNative() {
+	try {
+		if (!Object.assign) {
+			return false;
+		}
+
+		// Detect buggy property enumeration order in older V8 versions.
+
+		// https://bugs.chromium.org/p/v8/issues/detail?id=4118
+		var test1 = new String('abc');  // eslint-disable-line no-new-wrappers
+		test1[5] = 'de';
+		if (Object.getOwnPropertyNames(test1)[0] === '5') {
+			return false;
+		}
+
+		// https://bugs.chromium.org/p/v8/issues/detail?id=3056
+		var test2 = {};
+		for (var i = 0; i < 10; i++) {
+			test2['_' + String.fromCharCode(i)] = i;
+		}
+		var order2 = Object.getOwnPropertyNames(test2).map(function (n) {
+			return test2[n];
+		});
+		if (order2.join('') !== '0123456789') {
+			return false;
+		}
+
+		// https://bugs.chromium.org/p/v8/issues/detail?id=3056
+		var test3 = {};
+		'abcdefghijklmnopqrst'.split('').forEach(function (letter) {
+			test3[letter] = letter;
+		});
+		if (Object.keys(Object.assign({}, test3)).join('') !==
+				'abcdefghijklmnopqrst') {
+			return false;
+		}
+
+		return true;
+	} catch (err) {
+		// We don't expect any of the above to throw, but better to be safe.
+		return false;
+	}
+}
+
+module.exports = shouldUseNative() ? Object.assign : function (target, source) {
+	var from;
+	var to = toObject(target);
+	var symbols;
+
+	for (var s = 1; s < arguments.length; s++) {
+		from = Object(arguments[s]);
+
+		for (var key in from) {
+			if (hasOwnProperty.call(from, key)) {
+				to[key] = from[key];
+			}
+		}
+
+		if (getOwnPropertySymbols) {
+			symbols = getOwnPropertySymbols(from);
+			for (var i = 0; i < symbols.length; i++) {
+				if (propIsEnumerable.call(from, symbols[i])) {
+					to[symbols[i]] = from[symbols[i]];
+				}
+			}
+		}
+	}
+
+	return to;
+};
+
+
+/***/ }),
+/* 304 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;(function (root, factory){
+  'use strict';
+
+  /*istanbul ignore next:cant test*/
+  if (typeof module === 'object' && typeof module.exports === 'object') {
+    module.exports = factory();
+  } else if (true) {
+    // AMD. Register as an anonymous module.
+    !(__WEBPACK_AMD_DEFINE_ARRAY__ = [], __WEBPACK_AMD_DEFINE_FACTORY__ = (factory),
+				__WEBPACK_AMD_DEFINE_RESULT__ = (typeof __WEBPACK_AMD_DEFINE_FACTORY__ === 'function' ?
+				(__WEBPACK_AMD_DEFINE_FACTORY__.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__)) : __WEBPACK_AMD_DEFINE_FACTORY__),
+				__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__));
+  } else {
+    // Browser globals
+    root.objectPath = factory();
+  }
+})(this, function(){
+  'use strict';
+
+  var toStr = Object.prototype.toString;
+  function hasOwnProperty(obj, prop) {
+    if(obj == null) {
+      return false
+    }
+    //to handle objects with null prototypes (too edge case?)
+    return Object.prototype.hasOwnProperty.call(obj, prop)
+  }
+
+  function isEmpty(value){
+    if (!value) {
+      return true;
+    }
+    if (isArray(value) && value.length === 0) {
+        return true;
+    } else if (typeof value !== 'string') {
+        for (var i in value) {
+            if (hasOwnProperty(value, i)) {
+                return false;
+            }
+        }
+        return true;
+    }
+    return false;
+  }
+
+  function toString(type){
+    return toStr.call(type);
+  }
+
+  function isObject(obj){
+    return typeof obj === 'object' && toString(obj) === "[object Object]";
+  }
+
+  var isArray = Array.isArray || function(obj){
+    /*istanbul ignore next:cant test*/
+    return toStr.call(obj) === '[object Array]';
+  }
+
+  function isBoolean(obj){
+    return typeof obj === 'boolean' || toString(obj) === '[object Boolean]';
+  }
+
+  function getKey(key){
+    var intKey = parseInt(key);
+    if (intKey.toString() === key) {
+      return intKey;
+    }
+    return key;
+  }
+
+  function factory(options) {
+    options = options || {}
+
+    var objectPath = function(obj) {
+      return Object.keys(objectPath).reduce(function(proxy, prop) {
+        if(prop === 'create') {
+          return proxy;
+        }
+
+        /*istanbul ignore else*/
+        if (typeof objectPath[prop] === 'function') {
+          proxy[prop] = objectPath[prop].bind(objectPath, obj);
+        }
+
+        return proxy;
+      }, {});
+    };
+
+    function hasShallowProperty(obj, prop) {
+      return (options.includeInheritedProps || (typeof prop === 'number' && Array.isArray(obj)) || hasOwnProperty(obj, prop))
+    }
+
+    function getShallowProperty(obj, prop) {
+      if (hasShallowProperty(obj, prop)) {
+        return obj[prop];
+      }
+    }
+
+    function set(obj, path, value, doNotReplace){
+      if (typeof path === 'number') {
+        path = [path];
+      }
+      if (!path || path.length === 0) {
+        return obj;
+      }
+      if (typeof path === 'string') {
+        return set(obj, path.split('.').map(getKey), value, doNotReplace);
+      }
+      var currentPath = path[0];
+      var currentValue = getShallowProperty(obj, currentPath);
+      if (path.length === 1) {
+        if (currentValue === void 0 || !doNotReplace) {
+          obj[currentPath] = value;
+        }
+        return currentValue;
+      }
+
+      if (currentValue === void 0) {
+        //check if we assume an array
+        if(typeof path[1] === 'number') {
+          obj[currentPath] = [];
+        } else {
+          obj[currentPath] = {};
+        }
+      }
+
+      return set(obj[currentPath], path.slice(1), value, doNotReplace);
+    }
+
+    objectPath.has = function (obj, path) {
+      if (typeof path === 'number') {
+        path = [path];
+      } else if (typeof path === 'string') {
+        path = path.split('.');
+      }
+
+      if (!path || path.length === 0) {
+        return !!obj;
+      }
+
+      for (var i = 0; i < path.length; i++) {
+        var j = getKey(path[i]);
+
+        if((typeof j === 'number' && isArray(obj) && j < obj.length) ||
+          (options.includeInheritedProps ? (j in Object(obj)) : hasOwnProperty(obj, j))) {
+          obj = obj[j];
+        } else {
+          return false;
+        }
+      }
+
+      return true;
+    };
+
+    objectPath.ensureExists = function (obj, path, value){
+      return set(obj, path, value, true);
+    };
+
+    objectPath.set = function (obj, path, value, doNotReplace){
+      return set(obj, path, value, doNotReplace);
+    };
+
+    objectPath.insert = function (obj, path, value, at){
+      var arr = objectPath.get(obj, path);
+      at = ~~at;
+      if (!isArray(arr)) {
+        arr = [];
+        objectPath.set(obj, path, arr);
+      }
+      arr.splice(at, 0, value);
+    };
+
+    objectPath.empty = function(obj, path) {
+      if (isEmpty(path)) {
+        return void 0;
+      }
+      if (obj == null) {
+        return void 0;
+      }
+
+      var value, i;
+      if (!(value = objectPath.get(obj, path))) {
+        return void 0;
+      }
+
+      if (typeof value === 'string') {
+        return objectPath.set(obj, path, '');
+      } else if (isBoolean(value)) {
+        return objectPath.set(obj, path, false);
+      } else if (typeof value === 'number') {
+        return objectPath.set(obj, path, 0);
+      } else if (isArray(value)) {
+        value.length = 0;
+      } else if (isObject(value)) {
+        for (i in value) {
+          if (hasShallowProperty(value, i)) {
+            delete value[i];
+          }
+        }
+      } else {
+        return objectPath.set(obj, path, null);
+      }
+    };
+
+    objectPath.push = function (obj, path /*, values */){
+      var arr = objectPath.get(obj, path);
+      if (!isArray(arr)) {
+        arr = [];
+        objectPath.set(obj, path, arr);
+      }
+
+      arr.push.apply(arr, Array.prototype.slice.call(arguments, 2));
+    };
+
+    objectPath.coalesce = function (obj, paths, defaultValue) {
+      var value;
+
+      for (var i = 0, len = paths.length; i < len; i++) {
+        if ((value = objectPath.get(obj, paths[i])) !== void 0) {
+          return value;
+        }
+      }
+
+      return defaultValue;
+    };
+
+    objectPath.get = function (obj, path, defaultValue){
+      if (typeof path === 'number') {
+        path = [path];
+      }
+      if (!path || path.length === 0) {
+        return obj;
+      }
+      if (obj == null) {
+        return defaultValue;
+      }
+      if (typeof path === 'string') {
+        return objectPath.get(obj, path.split('.'), defaultValue);
+      }
+
+      var currentPath = getKey(path[0]);
+      var nextObj = getShallowProperty(obj, currentPath)
+      if (nextObj === void 0) {
+        return defaultValue;
+      }
+
+      if (path.length === 1) {
+        return nextObj;
+      }
+
+      return objectPath.get(obj[currentPath], path.slice(1), defaultValue);
+    };
+
+    objectPath.del = function del(obj, path) {
+      if (typeof path === 'number') {
+        path = [path];
+      }
+
+      if (obj == null) {
+        return obj;
+      }
+
+      if (isEmpty(path)) {
+        return obj;
+      }
+      if(typeof path === 'string') {
+        return objectPath.del(obj, path.split('.'));
+      }
+
+      var currentPath = getKey(path[0]);
+      if (!hasShallowProperty(obj, currentPath)) {
+        return obj;
+      }
+
+      if(path.length === 1) {
+        if (isArray(obj)) {
+          obj.splice(currentPath, 1);
+        } else {
+          delete obj[currentPath];
+        }
+      } else {
+        return objectPath.del(obj[currentPath], path.slice(1));
+      }
+
+      return obj;
+    }
+
+    return objectPath;
+  }
+
+  var mod = factory();
+  mod.create = factory;
+  mod.withInheritedProps = factory({includeInheritedProps: true})
+  return mod;
+});
+
+
+/***/ }),
+/* 305 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var jsonSafeStringify = __webpack_require__(745)
+var crypto = __webpack_require__(11)
+var Buffer = __webpack_require__(45).Buffer
+
+var defer = typeof setImmediate === 'undefined'
+  ? process.nextTick
+  : setImmediate
+
+function paramsHaveRequestBody (params) {
+  return (
+    params.body ||
+    params.requestBodyStream ||
+    (params.json && typeof params.json !== 'boolean') ||
+    params.multipart
+  )
+}
+
+function safeStringify (obj, replacer) {
+  var ret
+  try {
+    ret = JSON.stringify(obj, replacer)
+  } catch (e) {
+    ret = jsonSafeStringify(obj, replacer)
+  }
+  return ret
+}
+
+function md5 (str) {
+  return crypto.createHash('md5').update(str).digest('hex')
+}
+
+function isReadStream (rs) {
+  return rs.readable && rs.path && rs.mode
+}
+
+function toBase64 (str) {
+  return Buffer.from(str || '', 'utf8').toString('base64')
+}
+
+function copy (obj) {
+  var o = {}
+  Object.keys(obj).forEach(function (i) {
+    o[i] = obj[i]
+  })
+  return o
+}
+
+function version () {
+  var numbers = process.version.replace('v', '').split('.')
+  return {
+    major: parseInt(numbers[0], 10),
+    minor: parseInt(numbers[1], 10),
+    patch: parseInt(numbers[2], 10)
+  }
+}
+
+exports.paramsHaveRequestBody = paramsHaveRequestBody
+exports.safeStringify = safeStringify
+exports.md5 = md5
+exports.isReadStream = isReadStream
+exports.toBase64 = toBase64
+exports.copy = copy
+exports.version = version
+exports.defer = defer
+
+
+/***/ }),
+/* 306 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var current = (process.versions && process.versions.node && process.versions.node.split('.')) || [];
+
+function specifierIncluded(specifier) {
+    var parts = specifier.split(' ');
+    var op = parts.length > 1 ? parts[0] : '=';
+    var versionParts = (parts.length > 1 ? parts[1] : parts[0]).split('.');
+
+    for (var i = 0; i < 3; ++i) {
+        var cur = Number(current[i] || 0);
+        var ver = Number(versionParts[i] || 0);
+        if (cur === ver) {
+            continue; // eslint-disable-line no-restricted-syntax, no-continue
+        }
+        if (op === '<') {
+            return cur < ver;
+        } else if (op === '>=') {
+            return cur >= ver;
+        } else {
+            return false;
+        }
+    }
+    return op === '>=';
+}
+
+function matchesRange(range) {
+    var specifiers = range.split(/ ?&& ?/);
+    if (specifiers.length === 0) { return false; }
+    for (var i = 0; i < specifiers.length; ++i) {
+        if (!specifierIncluded(specifiers[i])) { return false; }
+    }
+    return true;
+}
+
+function versionIncluded(specifierValue) {
+    if (typeof specifierValue === 'boolean') { return specifierValue; }
+    if (specifierValue && typeof specifierValue === 'object') {
+        for (var i = 0; i < specifierValue.length; ++i) {
+            if (matchesRange(specifierValue[i])) { return true; }
+        }
+        return false;
+    }
+    return matchesRange(specifierValue);
+}
+
+var data = __webpack_require__(816);
+
+var core = {};
+for (var mod in data) { // eslint-disable-line no-restricted-syntax
+    if (Object.prototype.hasOwnProperty.call(data, mod)) {
+        core[mod] = versionIncluded(data[mod]);
+    }
+}
+module.exports = core;
+
+
+/***/ }),
+/* 307 */
+/***/ (function(module, exports, __webpack_require__) {
+
+module.exports = rimraf
+rimraf.sync = rimrafSync
+
+var assert = __webpack_require__(28)
+var path = __webpack_require__(0)
+var fs = __webpack_require__(5)
+var glob = __webpack_require__(99)
+var _0666 = parseInt('666', 8)
+
+var defaultGlobOpts = {
+  nosort: true,
+  silent: true
+}
+
+// for EMFILE handling
+var timeout = 0
+
+var isWindows = (process.platform === "win32")
+
+function defaults (options) {
+  var methods = [
+    'unlink',
+    'chmod',
+    'stat',
+    'lstat',
+    'rmdir',
+    'readdir'
+  ]
+  methods.forEach(function(m) {
+    options[m] = options[m] || fs[m]
+    m = m + 'Sync'
+    options[m] = options[m] || fs[m]
+  })
+
+  options.maxBusyTries = options.maxBusyTries || 3
+  options.emfileWait = options.emfileWait || 1000
+  if (options.glob === false) {
+    options.disableGlob = true
+  }
+  options.disableGlob = options.disableGlob || false
+  options.glob = options.glob || defaultGlobOpts
+}
+
+function rimraf (p, options, cb) {
+  if (typeof options === 'function') {
+    cb = options
+    options = {}
+  }
+
+  assert(p, 'rimraf: missing path')
+  assert.equal(typeof p, 'string', 'rimraf: path should be a string')
+  assert.equal(typeof cb, 'function', 'rimraf: callback function required')
+  assert(options, 'rimraf: invalid options argument provided')
+  assert.equal(typeof options, 'object', 'rimraf: options should be object')
+
+  defaults(options)
+
+  var busyTries = 0
+  var errState = null
+  var n = 0
+
+  if (options.disableGlob || !glob.hasMagic(p))
+    return afterGlob(null, [p])
+
+  options.lstat(p, function (er, stat) {
+    if (!er)
+      return afterGlob(null, [p])
+
+    glob(p, options.glob, afterGlob)
+  })
+
+  function next (er) {
+    errState = errState || er
+    if (--n === 0)
+      cb(errState)
+  }
+
+  function afterGlob (er, results) {
+    if (er)
+      return cb(er)
+
+    n = results.length
+    if (n === 0)
+      return cb()
+
+    results.forEach(function (p) {
+      rimraf_(p, options, function CB (er) {
+        if (er) {
+          if ((er.code === "EBUSY" || er.code === "ENOTEMPTY" || er.code === "EPERM") &&
+              busyTries < options.maxBusyTries) {
+            busyTries ++
+            var time = busyTries * 100
+            // try again, with the same exact callback as this one.
+            return setTimeout(function () {
+              rimraf_(p, options, CB)
+            }, time)
+          }
+
+          // this one won't happen if graceful-fs is used.
+          if (er.code === "EMFILE" && timeout < options.emfileWait) {
+            return setTimeout(function () {
+              rimraf_(p, options, CB)
+            }, timeout ++)
+          }
+
+          // already gone
+          if (er.code === "ENOENT") er = null
+        }
+
+        timeout = 0
+        next(er)
+      })
+    })
+  }
+}
+
+// Two possible strategies.
+// 1. Assume it's a file.  unlink it, then do the dir stuff on EPERM or EISDIR
+// 2. Assume it's a directory.  readdir, then do the file stuff on ENOTDIR
+//
+// Both result in an extra syscall when you guess wrong.  However, there
+// are likely far more normal files in the world than directories.  This
+// is based on the assumption that a the average number of files per
+// directory is >= 1.
+//
+// If anyone ever complains about this, then I guess the strategy could
+// be made configurable somehow.  But until then, YAGNI.
+function rimraf_ (p, options, cb) {
+  assert(p)
+  assert(options)
+  assert(typeof cb === 'function')
+
+  // sunos lets the root user unlink directories, which is... weird.
+  // so we have to lstat here and make sure it's not a dir.
+  options.lstat(p, function (er, st) {
+    if (er && er.code === "ENOENT")
+      return cb(null)
+
+    // Windows can EPERM on stat.  Life is suffering.
+    if (er && er.code === "EPERM" && isWindows)
+      fixWinEPERM(p, options, er, cb)
+
+    if (st && st.isDirectory())
+      return rmdir(p, options, er, cb)
+
+    options.unlink(p, function (er) {
+      if (er) {
+        if (er.code === "ENOENT")
+          return cb(null)
+        if (er.code === "EPERM")
+          return (isWindows)
+            ? fixWinEPERM(p, options, er, cb)
+            : rmdir(p, options, er, cb)
+        if (er.code === "EISDIR")
+          return rmdir(p, options, er, cb)
+      }
+      return cb(er)
+    })
+  })
+}
+
+function fixWinEPERM (p, options, er, cb) {
+  assert(p)
+  assert(options)
+  assert(typeof cb === 'function')
+  if (er)
+    assert(er instanceof Error)
+
+  options.chmod(p, _0666, function (er2) {
+    if (er2)
+      cb(er2.code === "ENOENT" ? null : er)
+    else
+      options.stat(p, function(er3, stats) {
+        if (er3)
+          cb(er3.code === "ENOENT" ? null : er)
+        else if (stats.isDirectory())
+          rmdir(p, options, er, cb)
+        else
+          options.unlink(p, cb)
+      })
+  })
+}
+
+function fixWinEPERMSync (p, options, er) {
+  assert(p)
+  assert(options)
+  if (er)
+    assert(er instanceof Error)
+
+  try {
+    options.chmodSync(p, _0666)
+  } catch (er2) {
+    if (er2.code === "ENOENT")
+      return
+    else
+      throw er
+  }
+
+  try {
+    var stats = options.statSync(p)
+  } catch (er3) {
+    if (er3.code === "ENOENT")
+      return
+    else
+      throw er
+  }
+
+  if (stats.isDirectory())
+    rmdirSync(p, options, er)
+  else
+    options.unlinkSync(p)
+}
+
+function rmdir (p, options, originalEr, cb) {
+  assert(p)
+  assert(options)
+  if (originalEr)
+    assert(originalEr instanceof Error)
+  assert(typeof cb === 'function')
+
+  // try to rmdir first, and only readdir on ENOTEMPTY or EEXIST (SunOS)
+  // if we guessed wrong, and it's not a directory, then
+  // raise the original error.
+  options.rmdir(p, function (er) {
+    if (er && (er.code === "ENOTEMPTY" || er.code === "EEXIST" || er.code === "EPERM"))
+      rmkids(p, options, cb)
+    else if (er && er.code === "ENOTDIR")
+      cb(originalEr)
+    else
+      cb(er)
+  })
+}
+
+function rmkids(p, options, cb) {
+  assert(p)
+  assert(options)
+  assert(typeof cb === 'function')
+
+  options.readdir(p, function (er, files) {
+    if (er)
+      return cb(er)
+    var n = files.length
+    if (n === 0)
+      return options.rmdir(p, cb)
+    var errState
+    files.forEach(function (f) {
+      rimraf(path.join(p, f), options, function (er) {
+        if (errState)
+          return
+        if (er)
+          return cb(errState = er)
+        if (--n === 0)
+          options.rmdir(p, cb)
+      })
+    })
+  })
+}
+
+// this looks simpler, and is strictly *faster*, but will
+// tie up the JavaScript thread and fail on excessively
+// deep directory trees.
+function rimrafSync (p, options) {
+  options = options || {}
+  defaults(options)
+
+  assert(p, 'rimraf: missing path')
+  assert.equal(typeof p, 'string', 'rimraf: path should be a string')
+  assert(options, 'rimraf: missing options')
+  assert.equal(typeof options, 'object', 'rimraf: options should be object')
+
+  var results
+
+  if (options.disableGlob || !glob.hasMagic(p)) {
+    results = [p]
+  } else {
+    try {
+      options.lstatSync(p)
+      results = [p]
+    } catch (er) {
+      results = glob.sync(p, options.glob)
+    }
+  }
+
+  if (!results.length)
+    return
+
+  for (var i = 0; i < results.length; i++) {
+    var p = results[i]
+
+    try {
+      var st = options.lstatSync(p)
+    } catch (er) {
+      if (er.code === "ENOENT")
+        return
+
+      // Windows can EPERM on stat.  Life is suffering.
+      if (er.code === "EPERM" && isWindows)
+        fixWinEPERMSync(p, options, er)
+    }
+
+    try {
+      // sunos lets the root user unlink directories, which is... weird.
+      if (st && st.isDirectory())
+        rmdirSync(p, options, null)
+      else
+        options.unlinkSync(p)
+    } catch (er) {
+      if (er.code === "ENOENT")
+        return
+      if (er.code === "EPERM")
+        return isWindows ? fixWinEPERMSync(p, options, er) : rmdirSync(p, options, er)
+      if (er.code !== "EISDIR")
+        throw er
+
+      rmdirSync(p, options, er)
+    }
+  }
+}
+
+function rmdirSync (p, options, originalEr) {
+  assert(p)
+  assert(options)
+  if (originalEr)
+    assert(originalEr instanceof Error)
+
+  try {
+    options.rmdirSync(p)
+  } catch (er) {
+    if (er.code === "ENOENT")
+      return
+    if (er.code === "ENOTDIR")
+      throw originalEr
+    if (er.code === "ENOTEMPTY" || er.code === "EEXIST" || er.code === "EPERM")
+      rmkidsSync(p, options)
+  }
+}
+
+function rmkidsSync (p, options) {
+  assert(p)
+  assert(options)
+  options.readdirSync(p).forEach(function (f) {
+    rimrafSync(path.join(p, f), options)
+  })
+
+  // We only end up here once we got ENOTEMPTY at least once, and
+  // at this point, we are guaranteed to have removed all the kids.
+  // So, we know that it won't be ENOENT or ENOTDIR or anything else.
+  // try really hard to delete stuff on windows, because it has a
+  // PROFOUNDLY annoying habit of not closing handles promptly when
+  // files are deleted, resulting in spurious ENOTEMPTY errors.
+  var retries = isWindows ? 100 : 1
+  var i = 0
+  do {
+    var threw = true
+    try {
+      var ret = options.rmdirSync(p, options)
+      threw = false
+      return ret
+    } finally {
+      if (++i < retries && threw)
+        continue
+    }
+  } while (true)
+}
+
+
+/***/ }),
+/* 308 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ReplaySubject; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subject__ = __webpack_require__(36);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__scheduler_queue__ = __webpack_require__(439);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__Subscription__ = __webpack_require__(25);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__operators_observeOn__ = __webpack_require__(434);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_ObjectUnsubscribedError__ = __webpack_require__(189);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__SubjectSubscription__ = __webpack_require__(422);
+/** PURE_IMPORTS_START tslib,_Subject,_scheduler_queue,_Subscription,_operators_observeOn,_util_ObjectUnsubscribedError,_SubjectSubscription PURE_IMPORTS_END */
+
+
+
+
+
+
+
+var ReplaySubject = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](ReplaySubject, _super);
+    function ReplaySubject(bufferSize, windowTime, scheduler) {
+        if (bufferSize === void 0) {
+            bufferSize = Number.POSITIVE_INFINITY;
+        }
+        if (windowTime === void 0) {
+            windowTime = Number.POSITIVE_INFINITY;
+        }
+        var _this = _super.call(this) || this;
+        _this.scheduler = scheduler;
+        _this._events = [];
+        _this._infiniteTimeWindow = false;
+        _this._bufferSize = bufferSize < 1 ? 1 : bufferSize;
+        _this._windowTime = windowTime < 1 ? 1 : windowTime;
+        if (windowTime === Number.POSITIVE_INFINITY) {
+            _this._infiniteTimeWindow = true;
+            _this.next = _this.nextInfiniteTimeWindow;
+        }
+        else {
+            _this.next = _this.nextTimeWindow;
+        }
+        return _this;
+    }
+    ReplaySubject.prototype.nextInfiniteTimeWindow = function (value) {
+        var _events = this._events;
+        _events.push(value);
+        if (_events.length > this._bufferSize) {
+            _events.shift();
+        }
+        _super.prototype.next.call(this, value);
+    };
+    ReplaySubject.prototype.nextTimeWindow = function (value) {
+        this._events.push(new ReplayEvent(this._getNow(), value));
+        this._trimBufferThenGetEvents();
+        _super.prototype.next.call(this, value);
+    };
+    ReplaySubject.prototype._subscribe = function (subscriber) {
+        var _infiniteTimeWindow = this._infiniteTimeWindow;
+        var _events = _infiniteTimeWindow ? this._events : this._trimBufferThenGetEvents();
+        var scheduler = this.scheduler;
+        var len = _events.length;
+        var subscription;
+        if (this.closed) {
+            throw new __WEBPACK_IMPORTED_MODULE_5__util_ObjectUnsubscribedError__["a" /* ObjectUnsubscribedError */]();
+        }
+        else if (this.isStopped || this.hasError) {
+            subscription = __WEBPACK_IMPORTED_MODULE_3__Subscription__["a" /* Subscription */].EMPTY;
+        }
+        else {
+            this.observers.push(subscriber);
+            subscription = new __WEBPACK_IMPORTED_MODULE_6__SubjectSubscription__["a" /* SubjectSubscription */](this, subscriber);
+        }
+        if (scheduler) {
+            subscriber.add(subscriber = new __WEBPACK_IMPORTED_MODULE_4__operators_observeOn__["a" /* ObserveOnSubscriber */](subscriber, scheduler));
+        }
+        if (_infiniteTimeWindow) {
+            for (var i = 0; i < len && !subscriber.closed; i++) {
+                subscriber.next(_events[i]);
+            }
+        }
+        else {
+            for (var i = 0; i < len && !subscriber.closed; i++) {
+                subscriber.next(_events[i].value);
+            }
+        }
+        if (this.hasError) {
+            subscriber.error(this.thrownError);
+        }
+        else if (this.isStopped) {
+            subscriber.complete();
+        }
+        return subscription;
+    };
+    ReplaySubject.prototype._getNow = function () {
+        return (this.scheduler || __WEBPACK_IMPORTED_MODULE_2__scheduler_queue__["a" /* queue */]).now();
+    };
+    ReplaySubject.prototype._trimBufferThenGetEvents = function () {
+        var now = this._getNow();
+        var _bufferSize = this._bufferSize;
+        var _windowTime = this._windowTime;
+        var _events = this._events;
+        var eventsCount = _events.length;
+        var spliceCount = 0;
+        while (spliceCount < eventsCount) {
+            if ((now - _events[spliceCount].time) < _windowTime) {
+                break;
+            }
+            spliceCount++;
+        }
+        if (eventsCount > _bufferSize) {
+            spliceCount = Math.max(spliceCount, eventsCount - _bufferSize);
+        }
+        if (spliceCount > 0) {
+            _events.splice(0, spliceCount);
+        }
+        return _events;
+    };
+    return ReplaySubject;
+}(__WEBPACK_IMPORTED_MODULE_1__Subject__["a" /* Subject */]));
+
+var ReplayEvent = /*@__PURE__*/ (function () {
+    function ReplayEvent(time, value) {
+        this.time = time;
+        this.value = value;
+    }
+    return ReplayEvent;
+}());
+//# sourceMappingURL=ReplaySubject.js.map
+
+
+/***/ }),
+/* 309 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = combineLatest;
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return CombineLatestOperator; });
+/* unused harmony export CombineLatestSubscriber */
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_isScheduler__ = __webpack_require__(48);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isArray__ = __webpack_require__(41);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__ = __webpack_require__(13);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__ = __webpack_require__(14);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__fromArray__ = __webpack_require__(85);
+/** PURE_IMPORTS_START tslib,_util_isScheduler,_util_isArray,_OuterSubscriber,_util_subscribeToResult,_fromArray PURE_IMPORTS_END */
+
+
+
+
+
+
+var NONE = {};
+function combineLatest() {
+    var observables = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        observables[_i] = arguments[_i];
+    }
+    var resultSelector = null;
+    var scheduler = null;
+    if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__util_isScheduler__["a" /* isScheduler */])(observables[observables.length - 1])) {
+        scheduler = observables.pop();
+    }
+    if (typeof observables[observables.length - 1] === 'function') {
+        resultSelector = observables.pop();
+    }
+    if (observables.length === 1 && __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_isArray__["a" /* isArray */])(observables[0])) {
+        observables = observables[0];
+    }
+    return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_5__fromArray__["a" /* fromArray */])(observables, scheduler).lift(new CombineLatestOperator(resultSelector));
+}
+var CombineLatestOperator = /*@__PURE__*/ (function () {
+    function CombineLatestOperator(resultSelector) {
+        this.resultSelector = resultSelector;
+    }
+    CombineLatestOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new CombineLatestSubscriber(subscriber, this.resultSelector));
+    };
+    return CombineLatestOperator;
+}());
+
+var CombineLatestSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](CombineLatestSubscriber, _super);
+    function CombineLatestSubscriber(destination, resultSelector) {
+        var _this = _super.call(this, destination) || this;
+        _this.resultSelector = resultSelector;
+        _this.active = 0;
+        _this.values = [];
+        _this.observables = [];
+        return _this;
+    }
+    CombineLatestSubscriber.prototype._next = function (observable) {
+        this.values.push(NONE);
+        this.observables.push(observable);
+    };
+    CombineLatestSubscriber.prototype._complete = function () {
+        var observables = this.observables;
+        var len = observables.length;
+        if (len === 0) {
+            this.destination.complete();
+        }
+        else {
+            this.active = len;
+            this.toRespond = len;
+            for (var i = 0; i < len; i++) {
+                var observable = observables[i];
+                this.add(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__["a" /* subscribeToResult */])(this, observable, observable, i));
+            }
+        }
+    };
+    CombineLatestSubscriber.prototype.notifyComplete = function (unused) {
+        if ((this.active -= 1) === 0) {
+            this.destination.complete();
+        }
+    };
+    CombineLatestSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        var values = this.values;
+        var oldVal = values[outerIndex];
+        var toRespond = !this.toRespond
+            ? 0
+            : oldVal === NONE ? --this.toRespond : this.toRespond;
+        values[outerIndex] = innerValue;
+        if (toRespond === 0) {
+            if (this.resultSelector) {
+                this._tryResultSelector(values);
+            }
+            else {
+                this.destination.next(values.slice());
+            }
+        }
+    };
+    CombineLatestSubscriber.prototype._tryResultSelector = function (values) {
+        var result;
+        try {
+            result = this.resultSelector.apply(this, values);
+        }
+        catch (err) {
+            this.destination.error(err);
+            return;
+        }
+        this.destination.next(result);
+    };
+    return CombineLatestSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__["a" /* OuterSubscriber */]));
+
+//# sourceMappingURL=combineLatest.js.map
+
+
+/***/ }),
+/* 310 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = defer;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(12);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__from__ = __webpack_require__(62);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__empty__ = __webpack_require__(39);
+/** PURE_IMPORTS_START _Observable,_from,_empty PURE_IMPORTS_END */
+
+
+
+function defer(observableFactory) {
+    return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) {
+        var input;
+        try {
+            input = observableFactory();
+        }
+        catch (err) {
+            subscriber.error(err);
+            return undefined;
+        }
+        var source = input ? __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__from__["a" /* from */])(input) : __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__empty__["a" /* empty */])();
+        return source.subscribe(subscriber);
+    });
+}
+//# sourceMappingURL=defer.js.map
+
+
+/***/ }),
+/* 311 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = of;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_isScheduler__ = __webpack_require__(48);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__fromArray__ = __webpack_require__(85);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__empty__ = __webpack_require__(39);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__scalar__ = __webpack_require__(312);
+/** PURE_IMPORTS_START _util_isScheduler,_fromArray,_empty,_scalar PURE_IMPORTS_END */
+
+
+
+
+function of() {
+    var args = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        args[_i] = arguments[_i];
+    }
+    var scheduler = args[args.length - 1];
+    if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__util_isScheduler__["a" /* isScheduler */])(scheduler)) {
+        args.pop();
+    }
+    else {
+        scheduler = undefined;
+    }
+    switch (args.length) {
+        case 0:
+            return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__empty__["a" /* empty */])(scheduler);
+        case 1:
+            return scheduler ? __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__fromArray__["a" /* fromArray */])(args, scheduler) : __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__scalar__["a" /* scalar */])(args[0]);
+        default:
+            return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__fromArray__["a" /* fromArray */])(args, scheduler);
+    }
+}
+//# sourceMappingURL=of.js.map
+
+
+/***/ }),
+/* 312 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = scalar;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(12);
+/** PURE_IMPORTS_START _Observable PURE_IMPORTS_END */
+
+function scalar(value) {
+    var result = new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) {
+        subscriber.next(value);
+        subscriber.complete();
+    });
+    result._isScalar = true;
+    result.value = value;
+    return result;
+}
+//# sourceMappingURL=scalar.js.map
+
+
+/***/ }),
+/* 313 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = throwError;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(12);
+/** PURE_IMPORTS_START _Observable PURE_IMPORTS_END */
+
+function throwError(error, scheduler) {
+    if (!scheduler) {
+        return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) { return subscriber.error(error); });
+    }
+    else {
+        return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) { return scheduler.schedule(dispatch, 0, { error: error, subscriber: subscriber }); });
+    }
+}
+function dispatch(_a) {
+    var error = _a.error, subscriber = _a.subscriber;
+    subscriber.error(error);
+}
+//# sourceMappingURL=throwError.js.map
+
+
+/***/ }),
+/* 314 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = zip;
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return ZipOperator; });
+/* unused harmony export ZipSubscriber */
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__fromArray__ = __webpack_require__(85);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isArray__ = __webpack_require__(41);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__Subscriber__ = __webpack_require__(7);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__ = __webpack_require__(13);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__ = __webpack_require__(14);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__internal_symbol_iterator__ = __webpack_require__(151);
+/** PURE_IMPORTS_START tslib,_fromArray,_util_isArray,_Subscriber,_OuterSubscriber,_util_subscribeToResult,_.._internal_symbol_iterator PURE_IMPORTS_END */
+
+
+
+
+
+
+
+function zip() {
+    var observables = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        observables[_i] = arguments[_i];
+    }
+    var resultSelector = observables[observables.length - 1];
+    if (typeof resultSelector === 'function') {
+        observables.pop();
+    }
+    return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__fromArray__["a" /* fromArray */])(observables, undefined).lift(new ZipOperator(resultSelector));
+}
+var ZipOperator = /*@__PURE__*/ (function () {
+    function ZipOperator(resultSelector) {
+        this.resultSelector = resultSelector;
+    }
+    ZipOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new ZipSubscriber(subscriber, this.resultSelector));
+    };
+    return ZipOperator;
+}());
+
+var ZipSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](ZipSubscriber, _super);
+    function ZipSubscriber(destination, resultSelector, values) {
+        if (values === void 0) {
+            values = Object.create(null);
+        }
+        var _this = _super.call(this, destination) || this;
+        _this.iterators = [];
+        _this.active = 0;
+        _this.resultSelector = (typeof resultSelector === 'function') ? resultSelector : null;
+        _this.values = values;
+        return _this;
+    }
+    ZipSubscriber.prototype._next = function (value) {
+        var iterators = this.iterators;
+        if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_isArray__["a" /* isArray */])(value)) {
+            iterators.push(new StaticArrayIterator(value));
+        }
+        else if (typeof value[__WEBPACK_IMPORTED_MODULE_6__internal_symbol_iterator__["a" /* iterator */]] === 'function') {
+            iterators.push(new StaticIterator(value[__WEBPACK_IMPORTED_MODULE_6__internal_symbol_iterator__["a" /* iterator */]]()));
+        }
+        else {
+            iterators.push(new ZipBufferIterator(this.destination, this, value));
+        }
+    };
+    ZipSubscriber.prototype._complete = function () {
+        var iterators = this.iterators;
+        var len = iterators.length;
+        this.unsubscribe();
+        if (len === 0) {
+            this.destination.complete();
+            return;
+        }
+        this.active = len;
+        for (var i = 0; i < len; i++) {
+            var iterator = iterators[i];
+            if (iterator.stillUnsubscribed) {
+                var destination = this.destination;
+                destination.add(iterator.subscribe(iterator, i));
+            }
+            else {
+                this.active--;
+            }
+        }
+    };
+    ZipSubscriber.prototype.notifyInactive = function () {
+        this.active--;
+        if (this.active === 0) {
+            this.destination.complete();
+        }
+    };
+    ZipSubscriber.prototype.checkIterators = function () {
+        var iterators = this.iterators;
+        var len = iterators.length;
+        var destination = this.destination;
+        for (var i = 0; i < len; i++) {
+            var iterator = iterators[i];
+            if (typeof iterator.hasValue === 'function' && !iterator.hasValue()) {
+                return;
+            }
+        }
+        var shouldComplete = false;
+        var args = [];
+        for (var i = 0; i < len; i++) {
+            var iterator = iterators[i];
+            var result = iterator.next();
+            if (iterator.hasCompleted()) {
+                shouldComplete = true;
+            }
+            if (result.done) {
+                destination.complete();
+                return;
+            }
+            args.push(result.value);
+        }
+        if (this.resultSelector) {
+            this._tryresultSelector(args);
+        }
+        else {
+            destination.next(args);
+        }
+        if (shouldComplete) {
+            destination.complete();
+        }
+    };
+    ZipSubscriber.prototype._tryresultSelector = function (args) {
+        var result;
+        try {
+            result = this.resultSelector.apply(this, args);
+        }
+        catch (err) {
+            this.destination.error(err);
+            return;
+        }
+        this.destination.next(result);
+    };
+    return ZipSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_3__Subscriber__["a" /* Subscriber */]));
+
+var StaticIterator = /*@__PURE__*/ (function () {
+    function StaticIterator(iterator) {
+        this.iterator = iterator;
+        this.nextResult = iterator.next();
+    }
+    StaticIterator.prototype.hasValue = function () {
+        return true;
+    };
+    StaticIterator.prototype.next = function () {
+        var result = this.nextResult;
+        this.nextResult = this.iterator.next();
+        return result;
+    };
+    StaticIterator.prototype.hasCompleted = function () {
+        var nextResult = this.nextResult;
+        return nextResult && nextResult.done;
+    };
+    return StaticIterator;
+}());
+var StaticArrayIterator = /*@__PURE__*/ (function () {
+    function StaticArrayIterator(array) {
+        this.array = array;
+        this.index = 0;
+        this.length = 0;
+        this.length = array.length;
+    }
+    StaticArrayIterator.prototype[__WEBPACK_IMPORTED_MODULE_6__internal_symbol_iterator__["a" /* iterator */]] = function () {
+        return this;
+    };
+    StaticArrayIterator.prototype.next = function (value) {
+        var i = this.index++;
+        var array = this.array;
+        return i < this.length ? { value: array[i], done: false } : { value: null, done: true };
+    };
+    StaticArrayIterator.prototype.hasValue = function () {
+        return this.array.length > this.index;
+    };
+    StaticArrayIterator.prototype.hasCompleted = function () {
+        return this.array.length === this.index;
+    };
+    return StaticArrayIterator;
+}());
+var ZipBufferIterator = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](ZipBufferIterator, _super);
+    function ZipBufferIterator(destination, parent, observable) {
+        var _this = _super.call(this, destination) || this;
+        _this.parent = parent;
+        _this.observable = observable;
+        _this.stillUnsubscribed = true;
+        _this.buffer = [];
+        _this.isComplete = false;
+        return _this;
+    }
+    ZipBufferIterator.prototype[__WEBPACK_IMPORTED_MODULE_6__internal_symbol_iterator__["a" /* iterator */]] = function () {
+        return this;
+    };
+    ZipBufferIterator.prototype.next = function () {
+        var buffer = this.buffer;
+        if (buffer.length === 0 && this.isComplete) {
+            return { value: null, done: true };
+        }
+        else {
+            return { value: buffer.shift(), done: false };
+        }
+    };
+    ZipBufferIterator.prototype.hasValue = function () {
+        return this.buffer.length > 0;
+    };
+    ZipBufferIterator.prototype.hasCompleted = function () {
+        return this.buffer.length === 0 && this.isComplete;
+    };
+    ZipBufferIterator.prototype.notifyComplete = function () {
+        if (this.buffer.length > 0) {
+            this.isComplete = true;
+            this.parent.notifyInactive();
+        }
+        else {
+            this.destination.complete();
+        }
+    };
+    ZipBufferIterator.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        this.buffer.push(innerValue);
+        this.parent.checkIterators();
+    };
+    ZipBufferIterator.prototype.subscribe = function (value, index) {
+        return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__["a" /* subscribeToResult */])(this, this.observable, this, index);
+    };
+    return ZipBufferIterator;
+}(__WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__["a" /* OuterSubscriber */]));
+//# sourceMappingURL=zip.js.map
+
+
+/***/ }),
+/* 315 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = mergeAll;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__mergeMap__ = __webpack_require__(148);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_identity__ = __webpack_require__(118);
+/** PURE_IMPORTS_START _mergeMap,_util_identity PURE_IMPORTS_END */
+
+
+function mergeAll(concurrent) {
+    if (concurrent === void 0) {
+        concurrent = Number.POSITIVE_INFINITY;
+    }
+    return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__mergeMap__["a" /* mergeMap */])(__WEBPACK_IMPORTED_MODULE_1__util_identity__["a" /* identity */], concurrent);
+}
+//# sourceMappingURL=mergeAll.js.map
+
+
+/***/ }),
+/* 316 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = refCount;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
+/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+
+
+function refCount() {
+    return function refCountOperatorFunction(source) {
+        return source.lift(new RefCountOperator(source));
+    };
+}
+var RefCountOperator = /*@__PURE__*/ (function () {
+    function RefCountOperator(connectable) {
+        this.connectable = connectable;
+    }
+    RefCountOperator.prototype.call = function (subscriber, source) {
+        var connectable = this.connectable;
+        connectable._refCount++;
+        var refCounter = new RefCountSubscriber(subscriber, connectable);
+        var subscription = source.subscribe(refCounter);
+        if (!refCounter.closed) {
+            refCounter.connection = connectable.connect();
+        }
+        return subscription;
+    };
+    return RefCountOperator;
+}());
+var RefCountSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](RefCountSubscriber, _super);
+    function RefCountSubscriber(destination, connectable) {
+        var _this = _super.call(this, destination) || this;
+        _this.connectable = connectable;
+        return _this;
+    }
+    RefCountSubscriber.prototype._unsubscribe = function () {
+        var connectable = this.connectable;
+        if (!connectable) {
+            this.connection = null;
+            return;
+        }
+        this.connectable = null;
+        var refCount = connectable._refCount;
+        if (refCount <= 0) {
+            this.connection = null;
+            return;
+        }
+        connectable._refCount = refCount - 1;
+        if (refCount > 1) {
+            this.connection = null;
+            return;
+        }
+        var connection = this.connection;
+        var sharedConnection = connectable._connection;
+        this.connection = null;
+        if (sharedConnection && (!connection || sharedConnection === connection)) {
+            sharedConnection.unsubscribe();
+        }
+    };
+    return RefCountSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
+//# sourceMappingURL=refCount.js.map
+
+
+/***/ }),
+/* 317 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = scan;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
+/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+
+
+function scan(accumulator, seed) {
+    var hasSeed = false;
+    if (arguments.length >= 2) {
+        hasSeed = true;
+    }
+    return function scanOperatorFunction(source) {
+        return source.lift(new ScanOperator(accumulator, seed, hasSeed));
+    };
+}
+var ScanOperator = /*@__PURE__*/ (function () {
+    function ScanOperator(accumulator, seed, hasSeed) {
+        if (hasSeed === void 0) {
+            hasSeed = false;
+        }
+        this.accumulator = accumulator;
+        this.seed = seed;
+        this.hasSeed = hasSeed;
+    }
+    ScanOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new ScanSubscriber(subscriber, this.accumulator, this.seed, this.hasSeed));
+    };
+    return ScanOperator;
+}());
+var ScanSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](ScanSubscriber, _super);
+    function ScanSubscriber(destination, accumulator, _seed, hasSeed) {
+        var _this = _super.call(this, destination) || this;
+        _this.accumulator = accumulator;
+        _this._seed = _seed;
+        _this.hasSeed = hasSeed;
+        _this.index = 0;
+        return _this;
+    }
+    Object.defineProperty(ScanSubscriber.prototype, "seed", {
+        get: function () {
+            return this._seed;
+        },
+        set: function (value) {
+            this.hasSeed = true;
+            this._seed = value;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    ScanSubscriber.prototype._next = function (value) {
+        if (!this.hasSeed) {
+            this.seed = value;
+            this.destination.next(value);
+        }
+        else {
+            return this._tryNext(value);
+        }
+    };
+    ScanSubscriber.prototype._tryNext = function (value) {
+        var index = this.index++;
+        var result;
+        try {
+            result = this.accumulator(this.seed, value, index);
+        }
+        catch (err) {
+            this.destination.error(err);
+        }
+        this.seed = result;
+        this.destination.next(result);
+    };
+    return ScanSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
+//# sourceMappingURL=scan.js.map
+
+
+/***/ }),
+/* 318 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = switchMap;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(13);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__InnerSubscriber__ = __webpack_require__(84);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_subscribeToResult__ = __webpack_require__(14);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__map__ = __webpack_require__(46);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__observable_from__ = __webpack_require__(62);
+/** PURE_IMPORTS_START tslib,_OuterSubscriber,_InnerSubscriber,_util_subscribeToResult,_map,_observable_from PURE_IMPORTS_END */
+
+
+
+
+
+
+function switchMap(project, resultSelector) {
+    if (typeof resultSelector === 'function') {
+        return function (source) { return source.pipe(switchMap(function (a, i) { return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_5__observable_from__["a" /* from */])(project(a, i)).pipe(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_4__map__["a" /* map */])(function (b, ii) { return resultSelector(a, b, i, ii); })); })); };
+    }
+    return function (source) { return source.lift(new SwitchMapOperator(project)); };
+}
+var SwitchMapOperator = /*@__PURE__*/ (function () {
+    function SwitchMapOperator(project) {
+        this.project = project;
+    }
+    SwitchMapOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new SwitchMapSubscriber(subscriber, this.project));
+    };
+    return SwitchMapOperator;
+}());
+var SwitchMapSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](SwitchMapSubscriber, _super);
+    function SwitchMapSubscriber(destination, project) {
+        var _this = _super.call(this, destination) || this;
+        _this.project = project;
+        _this.index = 0;
+        return _this;
+    }
+    SwitchMapSubscriber.prototype._next = function (value) {
+        var result;
+        var index = this.index++;
+        try {
+            result = this.project(value, index);
+        }
+        catch (error) {
+            this.destination.error(error);
+            return;
+        }
+        this._innerSub(result, value, index);
+    };
+    SwitchMapSubscriber.prototype._innerSub = function (result, value, index) {
+        var innerSubscription = this.innerSubscription;
+        if (innerSubscription) {
+            innerSubscription.unsubscribe();
+        }
+        var innerSubscriber = new __WEBPACK_IMPORTED_MODULE_2__InnerSubscriber__["a" /* InnerSubscriber */](this, undefined, undefined);
+        var destination = this.destination;
+        destination.add(innerSubscriber);
+        this.innerSubscription = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__util_subscribeToResult__["a" /* subscribeToResult */])(this, result, value, index, innerSubscriber);
+    };
+    SwitchMapSubscriber.prototype._complete = function () {
+        var innerSubscription = this.innerSubscription;
+        if (!innerSubscription || innerSubscription.closed) {
+            _super.prototype._complete.call(this);
+        }
+        this.unsubscribe();
+    };
+    SwitchMapSubscriber.prototype._unsubscribe = function () {
+        this.innerSubscription = null;
+    };
+    SwitchMapSubscriber.prototype.notifyComplete = function (innerSub) {
+        var destination = this.destination;
+        destination.remove(innerSub);
+        this.innerSubscription = null;
+        if (this.isStopped) {
+            _super.prototype._complete.call(this);
+        }
+    };
+    SwitchMapSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        this.destination.next(innerValue);
+    };
+    return SwitchMapSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__["a" /* OuterSubscriber */]));
+//# sourceMappingURL=switchMap.js.map
+
+
+/***/ }),
+/* 319 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = take;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_ArgumentOutOfRangeError__ = __webpack_require__(152);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__observable_empty__ = __webpack_require__(39);
+/** PURE_IMPORTS_START tslib,_Subscriber,_util_ArgumentOutOfRangeError,_observable_empty PURE_IMPORTS_END */
+
+
+
+
+function take(count) {
+    return function (source) {
+        if (count === 0) {
+            return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__observable_empty__["a" /* empty */])();
+        }
+        else {
+            return source.lift(new TakeOperator(count));
+        }
+    };
+}
+var TakeOperator = /*@__PURE__*/ (function () {
+    function TakeOperator(total) {
+        this.total = total;
+        if (this.total < 0) {
+            throw new __WEBPACK_IMPORTED_MODULE_2__util_ArgumentOutOfRangeError__["a" /* ArgumentOutOfRangeError */];
+        }
+    }
+    TakeOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new TakeSubscriber(subscriber, this.total));
+    };
+    return TakeOperator;
+}());
+var TakeSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](TakeSubscriber, _super);
+    function TakeSubscriber(destination, total) {
+        var _this = _super.call(this, destination) || this;
+        _this.total = total;
+        _this.count = 0;
+        return _this;
+    }
+    TakeSubscriber.prototype._next = function (value) {
+        var total = this.total;
+        var count = ++this.count;
+        if (count <= total) {
+            this.destination.next(value);
+            if (count === total) {
+                this.destination.complete();
+                this.unsubscribe();
+            }
+        }
+    };
+    return TakeSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
+//# sourceMappingURL=take.js.map
+
+
+/***/ }),
+/* 320 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = takeLast;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_ArgumentOutOfRangeError__ = __webpack_require__(152);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__observable_empty__ = __webpack_require__(39);
+/** PURE_IMPORTS_START tslib,_Subscriber,_util_ArgumentOutOfRangeError,_observable_empty PURE_IMPORTS_END */
+
+
+
+
+function takeLast(count) {
+    return function takeLastOperatorFunction(source) {
+        if (count === 0) {
+            return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__observable_empty__["a" /* empty */])();
+        }
+        else {
+            return source.lift(new TakeLastOperator(count));
+        }
+    };
+}
+var TakeLastOperator = /*@__PURE__*/ (function () {
+    function TakeLastOperator(total) {
+        this.total = total;
+        if (this.total < 0) {
+            throw new __WEBPACK_IMPORTED_MODULE_2__util_ArgumentOutOfRangeError__["a" /* ArgumentOutOfRangeError */];
+        }
+    }
+    TakeLastOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new TakeLastSubscriber(subscriber, this.total));
+    };
+    return TakeLastOperator;
+}());
+var TakeLastSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](TakeLastSubscriber, _super);
+    function TakeLastSubscriber(destination, total) {
+        var _this = _super.call(this, destination) || this;
+        _this.total = total;
+        _this.ring = new Array();
+        _this.count = 0;
+        return _this;
+    }
+    TakeLastSubscriber.prototype._next = function (value) {
+        var ring = this.ring;
+        var total = this.total;
+        var count = this.count++;
+        if (ring.length < total) {
+            ring.push(value);
+        }
+        else {
+            var index = count % total;
+            ring[index] = value;
+        }
+    };
+    TakeLastSubscriber.prototype._complete = function () {
+        var destination = this.destination;
+        var count = this.count;
+        if (count > 0) {
+            var total = this.count >= this.total ? this.total : this.count;
+            var ring = this.ring;
+            for (var i = 0; i < total; i++) {
+                var idx = (count++) % total;
+                destination.next(ring[idx]);
+            }
+        }
+        destination.complete();
+    };
+    return TakeLastSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
+//# sourceMappingURL=takeLast.js.map
+
+
+/***/ }),
+/* 321 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return rxSubscriber; });
+/* unused harmony export $$rxSubscriber */
+/** PURE_IMPORTS_START  PURE_IMPORTS_END */
+var rxSubscriber = typeof Symbol === 'function'
+    ? /*@__PURE__*/ Symbol('rxSubscriber')
+    : '@@rxSubscriber_' + /*@__PURE__*/ Math.random();
+var $$rxSubscriber = rxSubscriber;
+//# sourceMappingURL=rxSubscriber.js.map
+
+
+/***/ }),
+/* 322 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = canReportError;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Subscriber__ = __webpack_require__(7);
+/** PURE_IMPORTS_START _Subscriber PURE_IMPORTS_END */
+
+function canReportError(observer) {
+    while (observer) {
+        var _a = observer, closed_1 = _a.closed, destination = _a.destination, isStopped = _a.isStopped;
+        if (closed_1 || isStopped) {
+            return false;
+        }
+        else if (destination && destination instanceof __WEBPACK_IMPORTED_MODULE_0__Subscriber__["a" /* Subscriber */]) {
+            observer = destination;
+        }
+        else {
+            observer = null;
+        }
+    }
+    return true;
+}
+//# sourceMappingURL=canReportError.js.map
+
+
+/***/ }),
+/* 323 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = hostReportError;
+/** PURE_IMPORTS_START  PURE_IMPORTS_END */
+function hostReportError(err) {
+    setTimeout(function () { throw err; });
+}
+//# sourceMappingURL=hostReportError.js.map
+
+
+/***/ }),
+/* 324 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = pipe;
+/* harmony export (immutable) */ __webpack_exports__["b"] = pipeFromArray;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__noop__ = __webpack_require__(191);
+/** PURE_IMPORTS_START _noop PURE_IMPORTS_END */
+
+function pipe() {
+    var fns = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        fns[_i] = arguments[_i];
+    }
+    return pipeFromArray(fns);
+}
+function pipeFromArray(fns) {
+    if (!fns) {
+        return __WEBPACK_IMPORTED_MODULE_0__noop__["a" /* noop */];
+    }
+    if (fns.length === 1) {
+        return fns[0];
+    }
+    return function piped(input) {
+        return fns.reduce(function (prev, fn) { return fn(prev); }, input);
+    };
+}
+//# sourceMappingURL=pipe.js.map
+
+
+/***/ }),
+/* 325 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// Copyright 2017 Joyent, Inc.
+
+module.exports = {
+	DiffieHellman: DiffieHellman,
+	generateECDSA: generateECDSA,
+	generateED25519: generateED25519
+};
+
+var assert = __webpack_require__(16);
+var crypto = __webpack_require__(11);
+var Buffer = __webpack_require__(15).Buffer;
+var algs = __webpack_require__(32);
+var utils = __webpack_require__(26);
+var nacl;
+
+var Key = __webpack_require__(27);
+var PrivateKey = __webpack_require__(33);
+
+var CRYPTO_HAVE_ECDH = (crypto.createECDH !== undefined);
+
+var ecdh, ec, jsbn;
+
+function DiffieHellman(key) {
+	utils.assertCompatible(key, Key, [1, 4], 'key');
+	this._isPriv = PrivateKey.isPrivateKey(key, [1, 3]);
+	this._algo = key.type;
+	this._curve = key.curve;
+	this._key = key;
+	if (key.type === 'dsa') {
+		if (!CRYPTO_HAVE_ECDH) {
+			throw (new Error('Due to bugs in the node 0.10 ' +
+			    'crypto API, node 0.12.x or later is required ' +
+			    'to use DH'));
+		}
+		this._dh = crypto.createDiffieHellman(
+		    key.part.p.data, undefined,
+		    key.part.g.data, undefined);
+		this._p = key.part.p;
+		this._g = key.part.g;
+		if (this._isPriv)
+			this._dh.setPrivateKey(key.part.x.data);
+		this._dh.setPublicKey(key.part.y.data);
+
+	} else if (key.type === 'ecdsa') {
+		if (!CRYPTO_HAVE_ECDH) {
+			if (ecdh === undefined)
+				ecdh = __webpack_require__(387);
+			if (ec === undefined)
+				ec = __webpack_require__(139);
+			if (jsbn === undefined)
+				jsbn = __webpack_require__(81).BigInteger;
+
+			this._ecParams = new X9ECParameters(this._curve);
+
+			if (this._isPriv) {
+				this._priv = new ECPrivate(
+				    this._ecParams, key.part.d.data);
+			}
+			return;
+		}
+
+		var curve = {
+			'nistp256': 'prime256v1',
+			'nistp384': 'secp384r1',
+			'nistp521': 'secp521r1'
+		}[key.curve];
+		this._dh = crypto.createECDH(curve);
+		if (typeof (this._dh) !== 'object' ||
+		    typeof (this._dh.setPrivateKey) !== 'function') {
+			CRYPTO_HAVE_ECDH = false;
+			DiffieHellman.call(this, key);
+			return;
+		}
+		if (this._isPriv)
+			this._dh.setPrivateKey(key.part.d.data);
+		this._dh.setPublicKey(key.part.Q.data);
+
+	} else if (key.type === 'curve25519') {
+		if (nacl === undefined)
+			nacl = __webpack_require__(76);
+
+		if (this._isPriv) {
+			utils.assertCompatible(key, PrivateKey, [1, 5], 'key');
+			this._priv = key.part.k.data;
+		}
+
+	} else {
+		throw (new Error('DH not supported for ' + key.type + ' keys'));
+	}
+}
+
+DiffieHellman.prototype.getPublicKey = function () {
+	if (this._isPriv)
+		return (this._key.toPublic());
+	return (this._key);
+};
+
+DiffieHellman.prototype.getPrivateKey = function () {
+	if (this._isPriv)
+		return (this._key);
+	else
+		return (undefined);
+};
+DiffieHellman.prototype.getKey = DiffieHellman.prototype.getPrivateKey;
+
+DiffieHellman.prototype._keyCheck = function (pk, isPub) {
+	assert.object(pk, 'key');
+	if (!isPub)
+		utils.assertCompatible(pk, PrivateKey, [1, 3], 'key');
+	utils.assertCompatible(pk, Key, [1, 4], 'key');
+
+	if (pk.type !== this._algo) {
+		throw (new Error('A ' + pk.type + ' key cannot be used in ' +
+		    this._algo + ' Diffie-Hellman'));
+	}
+
+	if (pk.curve !== this._curve) {
+		throw (new Error('A key from the ' + pk.curve + ' curve ' +
+		    'cannot be used with a ' + this._curve +
+		    ' Diffie-Hellman'));
+	}
+
+	if (pk.type === 'dsa') {
+		assert.deepEqual(pk.part.p, this._p,
+		    'DSA key prime does not match');
+		assert.deepEqual(pk.part.g, this._g,
+		    'DSA key generator does not match');
+	}
+};
+
+DiffieHellman.prototype.setKey = function (pk) {
+	this._keyCheck(pk);
+
+	if (pk.type === 'dsa') {
+		this._dh.setPrivateKey(pk.part.x.data);
+		this._dh.setPublicKey(pk.part.y.data);
+
+	} else if (pk.type === 'ecdsa') {
+		if (CRYPTO_HAVE_ECDH) {
+			this._dh.setPrivateKey(pk.part.d.data);
+			this._dh.setPublicKey(pk.part.Q.data);
+		} else {
+			this._priv = new ECPrivate(
+			    this._ecParams, pk.part.d.data);
+		}
+
+	} else if (pk.type === 'curve25519') {
+		var k = pk.part.k;
+		if (!pk.part.k)
+			k = pk.part.r;
+		this._priv = k.data;
+		if (this._priv[0] === 0x00)
+			this._priv = this._priv.slice(1);
+		this._priv = this._priv.slice(0, 32);
+	}
+	this._key = pk;
+	this._isPriv = true;
+};
+DiffieHellman.prototype.setPrivateKey = DiffieHellman.prototype.setKey;
+
+DiffieHellman.prototype.computeSecret = function (otherpk) {
+	this._keyCheck(otherpk, true);
+	if (!this._isPriv)
+		throw (new Error('DH exchange has not been initialized with ' +
+		    'a private key yet'));
+
+	var pub;
+	if (this._algo === 'dsa') {
+		return (this._dh.computeSecret(
+		    otherpk.part.y.data));
+
+	} else if (this._algo === 'ecdsa') {
+		if (CRYPTO_HAVE_ECDH) {
+			return (this._dh.computeSecret(
+			    otherpk.part.Q.data));
+		} else {
+			pub = new ECPublic(
+			    this._ecParams, otherpk.part.Q.data);
+			return (this._priv.deriveSharedSecret(pub));
+		}
+
+	} else if (this._algo === 'curve25519') {
+		pub = otherpk.part.A.data;
+		while (pub[0] === 0x00 && pub.length > 32)
+			pub = pub.slice(1);
+		var priv = this._priv;
+		assert.strictEqual(pub.length, 32);
+		assert.strictEqual(priv.length, 32);
+
+		var secret = nacl.box.before(new Uint8Array(pub),
+		    new Uint8Array(priv));
+
+		return (Buffer.from(secret));
+	}
+
+	throw (new Error('Invalid algorithm: ' + this._algo));
+};
+
+DiffieHellman.prototype.generateKey = function () {
+	var parts = [];
+	var priv, pub;
+	if (this._algo === 'dsa') {
+		this._dh.generateKeys();
+
+		parts.push({name: 'p', data: this._p.data});
+		parts.push({name: 'q', data: this._key.part.q.data});
+		parts.push({name: 'g', data: this._g.data});
+		parts.push({name: 'y', data: this._dh.getPublicKey()});
+		parts.push({name: 'x', data: this._dh.getPrivateKey()});
+		this._key = new PrivateKey({
+			type: 'dsa',
+			parts: parts
+		});
+		this._isPriv = true;
+		return (this._key);
+
+	} else if (this._algo === 'ecdsa') {
+		if (CRYPTO_HAVE_ECDH) {
+			this._dh.generateKeys();
+
+			parts.push({name: 'curve',
+			    data: Buffer.from(this._curve)});
+			parts.push({name: 'Q', data: this._dh.getPublicKey()});
+			parts.push({name: 'd', data: this._dh.getPrivateKey()});
+			this._key = new PrivateKey({
+				type: 'ecdsa',
+				curve: this._curve,
+				parts: parts
+			});
+			this._isPriv = true;
+			return (this._key);
+
+		} else {
+			var n = this._ecParams.getN();
+			var r = new jsbn(crypto.randomBytes(n.bitLength()));
+			var n1 = n.subtract(jsbn.ONE);
+			priv = r.mod(n1).add(jsbn.ONE);
+			pub = this._ecParams.getG().multiply(priv);
+
+			priv = Buffer.from(priv.toByteArray());
+			pub = Buffer.from(this._ecParams.getCurve().
+			    encodePointHex(pub), 'hex');
+
+			this._priv = new ECPrivate(this._ecParams, priv);
+
+			parts.push({name: 'curve',
+			    data: Buffer.from(this._curve)});
+			parts.push({name: 'Q', data: pub});
+			parts.push({name: 'd', data: priv});
+
+			this._key = new PrivateKey({
+				type: 'ecdsa',
+				curve: this._curve,
+				parts: parts
+			});
+			this._isPriv = true;
+			return (this._key);
+		}
+
+	} else if (this._algo === 'curve25519') {
+		var pair = nacl.box.keyPair();
+		priv = Buffer.from(pair.secretKey);
+		pub = Buffer.from(pair.publicKey);
+		priv = Buffer.concat([priv, pub]);
+		assert.strictEqual(priv.length, 64);
+		assert.strictEqual(pub.length, 32);
+
+		parts.push({name: 'A', data: pub});
+		parts.push({name: 'k', data: priv});
+		this._key = new PrivateKey({
+			type: 'curve25519',
+			parts: parts
+		});
+		this._isPriv = true;
+		return (this._key);
+	}
+
+	throw (new Error('Invalid algorithm: ' + this._algo));
+};
+DiffieHellman.prototype.generateKeys = DiffieHellman.prototype.generateKey;
+
+/* These are helpers for using ecc-jsbn (for node 0.10 compatibility). */
+
+function X9ECParameters(name) {
+	var params = algs.curves[name];
+	assert.object(params);
+
+	var p = new jsbn(params.p);
+	var a = new jsbn(params.a);
+	var b = new jsbn(params.b);
+	var n = new jsbn(params.n);
+	var h = jsbn.ONE;
+	var curve = new ec.ECCurveFp(p, a, b);
+	var G = curve.decodePointHex(params.G.toString('hex'));
+
+	this.curve = curve;
+	this.g = G;
+	this.n = n;
+	this.h = h;
+}
+X9ECParameters.prototype.getCurve = function () { return (this.curve); };
+X9ECParameters.prototype.getG = function () { return (this.g); };
+X9ECParameters.prototype.getN = function () { return (this.n); };
+X9ECParameters.prototype.getH = function () { return (this.h); };
+
+function ECPublic(params, buffer) {
+	this._params = params;
+	if (buffer[0] === 0x00)
+		buffer = buffer.slice(1);
+	this._pub = params.getCurve().decodePointHex(buffer.toString('hex'));
+}
+
+function ECPrivate(params, buffer) {
+	this._params = params;
+	this._priv = new jsbn(utils.mpNormalize(buffer));
+}
+ECPrivate.prototype.deriveSharedSecret = function (pubKey) {
+	assert.ok(pubKey instanceof ECPublic);
+	var S = pubKey._pub.multiply(this._priv);
+	return (Buffer.from(S.getX().toBigInteger().toByteArray()));
+};
+
+function generateED25519() {
+	if (nacl === undefined)
+		nacl = __webpack_require__(76);
+
+	var pair = nacl.sign.keyPair();
+	var priv = Buffer.from(pair.secretKey);
+	var pub = Buffer.from(pair.publicKey);
+	assert.strictEqual(priv.length, 64);
+	assert.strictEqual(pub.length, 32);
+
+	var parts = [];
+	parts.push({name: 'A', data: pub});
+	parts.push({name: 'k', data: priv.slice(0, 32)});
+	var key = new PrivateKey({
+		type: 'ed25519',
+		parts: parts
+	});
+	return (key);
+}
+
+/* Generates a new ECDSA private key on a given curve. */
+function generateECDSA(curve) {
+	var parts = [];
+	var key;
+
+	if (CRYPTO_HAVE_ECDH) {
+		/*
+		 * Node crypto doesn't expose key generation directly, but the
+		 * ECDH instances can generate keys. It turns out this just
+		 * calls into the OpenSSL generic key generator, and we can
+		 * read its output happily without doing an actual DH. So we
+		 * use that here.
+		 */
+		var osCurve = {
+			'nistp256': 'prime256v1',
+			'nistp384': 'secp384r1',
+			'nistp521': 'secp521r1'
+		}[curve];
+
+		var dh = crypto.createECDH(osCurve);
+		dh.generateKeys();
+
+		parts.push({name: 'curve',
+		    data: Buffer.from(curve)});
+		parts.push({name: 'Q', data: dh.getPublicKey()});
+		parts.push({name: 'd', data: dh.getPrivateKey()});
+
+		key = new PrivateKey({
+			type: 'ecdsa',
+			curve: curve,
+			parts: parts
+		});
+		return (key);
+	} else {
+		if (ecdh === undefined)
+			ecdh = __webpack_require__(387);
+		if (ec === undefined)
+			ec = __webpack_require__(139);
+		if (jsbn === undefined)
+			jsbn = __webpack_require__(81).BigInteger;
+
+		var ecParams = new X9ECParameters(curve);
+
+		/* This algorithm taken from FIPS PUB 186-4 (section B.4.1) */
+		var n = ecParams.getN();
+		/*
+		 * The crypto.randomBytes() function can only give us whole
+		 * bytes, so taking a nod from X9.62, we round up.
+		 */
+		var cByteLen = Math.ceil((n.bitLength() + 64) / 8);
+		var c = new jsbn(crypto.randomBytes(cByteLen));
+
+		var n1 = n.subtract(jsbn.ONE);
+		var priv = c.mod(n1).add(jsbn.ONE);
+		var pub = ecParams.getG().multiply(priv);
+
+		priv = Buffer.from(priv.toByteArray());
+		pub = Buffer.from(ecParams.getCurve().
+		    encodePointHex(pub), 'hex');
+
+		parts.push({name: 'curve', data: Buffer.from(curve)});
+		parts.push({name: 'Q', data: pub});
+		parts.push({name: 'd', data: priv});
+
+		key = new PrivateKey({
+			type: 'ecdsa',
+			curve: curve,
+			parts: parts
+		});
+		return (key);
+	}
+}
+
+
+/***/ }),
+/* 326 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// Copyright 2017 Joyent, Inc.
+
+module.exports = {
+	read: read,
+	write: write
+};
+
+var assert = __webpack_require__(16);
+var Buffer = __webpack_require__(15).Buffer;
+var Key = __webpack_require__(27);
+var PrivateKey = __webpack_require__(33);
+var utils = __webpack_require__(26);
+var SSHBuffer = __webpack_require__(159);
+var Dhe = __webpack_require__(325);
+
+var supportedAlgos = {
+	'rsa-sha1' : 5,
+	'rsa-sha256' : 8,
+	'rsa-sha512' : 10,
+	'ecdsa-p256-sha256' : 13,
+	'ecdsa-p384-sha384' : 14
+	/*
+	 * ed25519 is hypothetically supported with id 15
+	 * but the common tools available don't appear to be
+	 * capable of generating/using ed25519 keys
+	 */
+};
+
+var supportedAlgosById = {};
+Object.keys(supportedAlgos).forEach(function (k) {
+	supportedAlgosById[supportedAlgos[k]] = k.toUpperCase();
+});
+
+function read(buf, options) {
+	if (typeof (buf) !== 'string') {
+		assert.buffer(buf, 'buf');
+		buf = buf.toString('ascii');
+	}
+	var lines = buf.split('\n');
+	if (lines[0].match(/^Private-key-format\: v1/)) {
+		var algElems = lines[1].split(' ');
+		var algoNum = parseInt(algElems[1], 10);
+		var algoName = algElems[2];
+		if (!supportedAlgosById[algoNum])
+			throw (new Error('Unsupported algorithm: ' + algoName));
+		return (readDNSSECPrivateKey(algoNum, lines.slice(2)));
+	}
+
+	// skip any comment-lines
+	var line = 0;
+	/* JSSTYLED */
+	while (lines[line].match(/^\;/))
+		line++;
+	// we should now have *one single* line left with our KEY on it.
+	if ((lines[line].match(/\. IN KEY /) ||
+	    lines[line].match(/\. IN DNSKEY /)) && lines[line+1].length === 0) {
+		return (readRFC3110(lines[line]));
+	}
+	throw (new Error('Cannot parse dnssec key'));
+}
+
+function readRFC3110(keyString) {
+	var elems = keyString.split(' ');
+	//unused var flags = parseInt(elems[3], 10);
+	//unused var protocol = parseInt(elems[4], 10);
+	var algorithm = parseInt(elems[5], 10);
+	if (!supportedAlgosById[algorithm])
+		throw (new Error('Unsupported algorithm: ' + algorithm));
+	var base64key = elems.slice(6, elems.length).join();
+	var keyBuffer = Buffer.from(base64key, 'base64');
+	if (supportedAlgosById[algorithm].match(/^RSA-/)) {
+		// join the rest of the body into a single base64-blob
+		var publicExponentLen = keyBuffer.readUInt8(0);
+		if (publicExponentLen != 3 && publicExponentLen != 1)
+			throw (new Error('Cannot parse dnssec key: ' +
+			    'unsupported exponent length'));
+
+		var publicExponent = keyBuffer.slice(1, publicExponentLen+1);
+		publicExponent = utils.mpNormalize(publicExponent);
+		var modulus = keyBuffer.slice(1+publicExponentLen);
+		modulus = utils.mpNormalize(modulus);
+		// now, make the key
+		var rsaKey = {
+			type: 'rsa',
+			parts: []
+		};
+		rsaKey.parts.push({ name: 'e', data: publicExponent});
+		rsaKey.parts.push({ name: 'n', data: modulus});
+		return (new Key(rsaKey));
+	}
+	if (supportedAlgosById[algorithm] === 'ECDSA-P384-SHA384' ||
+	    supportedAlgosById[algorithm] === 'ECDSA-P256-SHA256') {
+		var curve = 'nistp384';
+		var size = 384;
+		if (supportedAlgosById[algorithm].match(/^ECDSA-P256-SHA256/)) {
+			curve = 'nistp256';
+			size = 256;
+		}
+
+		var ecdsaKey = {
+			type: 'ecdsa',
+			curve: curve,
+			size: size,
+			parts: [
+				{name: 'curve', data: Buffer.from(curve) },
+				{name: 'Q', data: utils.ecNormalize(keyBuffer) }
+			]
+		};
+		return (new Key(ecdsaKey));
+	}
+	throw (new Error('Unsupported algorithm: ' +
+	    supportedAlgosById[algorithm]));
+}
+
+function elementToBuf(e) {
+	return (Buffer.from(e.split(' ')[1], 'base64'));
+}
+
+function readDNSSECRSAPrivateKey(elements) {
+	var rsaParams = {};
+	elements.forEach(function (element) {
+		if (element.split(' ')[0] === 'Modulus:')
+			rsaParams['n'] = elementToBuf(element);
+		else if (element.split(' ')[0] === 'PublicExponent:')
+			rsaParams['e'] = elementToBuf(element);
+		else if (element.split(' ')[0] === 'PrivateExponent:')
+			rsaParams['d'] = elementToBuf(element);
+		else if (element.split(' ')[0] === 'Prime1:')
+			rsaParams['p'] = elementToBuf(element);
+		else if (element.split(' ')[0] === 'Prime2:')
+			rsaParams['q'] = elementToBuf(element);
+		else if (element.split(' ')[0] === 'Exponent1:')
+			rsaParams['dmodp'] = elementToBuf(element);
+		else if (element.split(' ')[0] === 'Exponent2:')
+			rsaParams['dmodq'] = elementToBuf(element);
+		else if (element.split(' ')[0] === 'Coefficient:')
+			rsaParams['iqmp'] = elementToBuf(element);
+	});
+	// now, make the key
+	var key = {
+		type: 'rsa',
+		parts: [
+			{ name: 'e', data: utils.mpNormalize(rsaParams['e'])},
+			{ name: 'n', data: utils.mpNormalize(rsaParams['n'])},
+			{ name: 'd', data: utils.mpNormalize(rsaParams['d'])},
+			{ name: 'p', data: utils.mpNormalize(rsaParams['p'])},
+			{ name: 'q', data: utils.mpNormalize(rsaParams['q'])},
+			{ name: 'dmodp',
+			    data: utils.mpNormalize(rsaParams['dmodp'])},
+			{ name: 'dmodq',
+			    data: utils.mpNormalize(rsaParams['dmodq'])},
+			{ name: 'iqmp',
+			    data: utils.mpNormalize(rsaParams['iqmp'])}
+		]
+	};
+	return (new PrivateKey(key));
+}
+
+function readDNSSECPrivateKey(alg, elements) {
+	if (supportedAlgosById[alg].match(/^RSA-/)) {
+		return (readDNSSECRSAPrivateKey(elements));
+	}
+	if (supportedAlgosById[alg] === 'ECDSA-P384-SHA384' ||
+	    supportedAlgosById[alg] === 'ECDSA-P256-SHA256') {
+		var d = Buffer.from(elements[0].split(' ')[1], 'base64');
+		var curve = 'nistp384';
+		var size = 384;
+		if (supportedAlgosById[alg] === 'ECDSA-P256-SHA256') {
+			curve = 'nistp256';
+			size = 256;
+		}
+		// DNSSEC generates the public-key on the fly (go calculate it)
+		var publicKey = utils.publicFromPrivateECDSA(curve, d);
+		var Q = publicKey.part['Q'].data;
+		var ecdsaKey = {
+			type: 'ecdsa',
+			curve: curve,
+			size: size,
+			parts: [
+				{name: 'curve', data: Buffer.from(curve) },
+				{name: 'd', data: d },
+				{name: 'Q', data: Q }
+			]
+		};
+		return (new PrivateKey(ecdsaKey));
+	}
+	throw (new Error('Unsupported algorithm: ' + supportedAlgosById[alg]));
+}
+
+function dnssecTimestamp(date) {
+	var year = date.getFullYear() + ''; //stringify
+	var month = (date.getMonth() + 1);
+	var timestampStr = year + month + date.getUTCDate();
+	timestampStr += '' + date.getUTCHours() + date.getUTCMinutes();
+	timestampStr += date.getUTCSeconds();
+	return (timestampStr);
+}
+
+function rsaAlgFromOptions(opts) {
+	if (!opts || !opts.hashAlgo || opts.hashAlgo === 'sha1')
+		return ('5 (RSASHA1)');
+	else if (opts.hashAlgo === 'sha256')
+		return ('8 (RSASHA256)');
+	else if (opts.hashAlgo === 'sha512')
+		return ('10 (RSASHA512)');
+	else
+		throw (new Error('Unknown or unsupported hash: ' +
+		    opts.hashAlgo));
+}
+
+function writeRSA(key, options) {
+	// if we're missing parts, add them.
+	if (!key.part.dmodp || !key.part.dmodq) {
+		utils.addRSAMissing(key);
+	}
+
+	var out = '';
+	out += 'Private-key-format: v1.3\n';
+	out += 'Algorithm: ' + rsaAlgFromOptions(options) + '\n';
+	var n = utils.mpDenormalize(key.part['n'].data);
+	out += 'Modulus: ' + n.toString('base64') + '\n';
+	var e = utils.mpDenormalize(key.part['e'].data);
+	out += 'PublicExponent: ' + e.toString('base64') + '\n';
+	var d = utils.mpDenormalize(key.part['d'].data);
+	out += 'PrivateExponent: ' + d.toString('base64') + '\n';
+	var p = utils.mpDenormalize(key.part['p'].data);
+	out += 'Prime1: ' + p.toString('base64') + '\n';
+	var q = utils.mpDenormalize(key.part['q'].data);
+	out += 'Prime2: ' + q.toString('base64') + '\n';
+	var dmodp = utils.mpDenormalize(key.part['dmodp'].data);
+	out += 'Exponent1: ' + dmodp.toString('base64') + '\n';
+	var dmodq = utils.mpDenormalize(key.part['dmodq'].data);
+	out += 'Exponent2: ' + dmodq.toString('base64') + '\n';
+	var iqmp = utils.mpDenormalize(key.part['iqmp'].data);
+	out += 'Coefficient: ' + iqmp.toString('base64') + '\n';
+	// Assume that we're valid as-of now
+	var timestamp = new Date();
+	out += 'Created: ' + dnssecTimestamp(timestamp) + '\n';
+	out += 'Publish: ' + dnssecTimestamp(timestamp) + '\n';
+	out += 'Activate: ' + dnssecTimestamp(timestamp) + '\n';
+	return (Buffer.from(out, 'ascii'));
+}
+
+function writeECDSA(key, options) {
+	var out = '';
+	out += 'Private-key-format: v1.3\n';
+
+	if (key.curve === 'nistp256') {
+		out += 'Algorithm: 13 (ECDSAP256SHA256)\n';
+	} else if (key.curve === 'nistp384') {
+		out += 'Algorithm: 14 (ECDSAP384SHA384)\n';
+	} else {
+		throw (new Error('Unsupported curve'));
+	}
+	var base64Key = key.part['d'].data.toString('base64');
+	out += 'PrivateKey: ' + base64Key + '\n';
+
+	// Assume that we're valid as-of now
+	var timestamp = new Date();
+	out += 'Created: ' + dnssecTimestamp(timestamp) + '\n';
+	out += 'Publish: ' + dnssecTimestamp(timestamp) + '\n';
+	out += 'Activate: ' + dnssecTimestamp(timestamp) + '\n';
+
+	return (Buffer.from(out, 'ascii'));
+}
+
+function write(key, options) {
+	if (PrivateKey.isPrivateKey(key)) {
+		if (key.type === 'rsa') {
+			return (writeRSA(key, options));
+		} else if (key.type === 'ecdsa') {
+			return (writeECDSA(key, options));
+		} else {
+			throw (new Error('Unsupported algorithm: ' + key.type));
+		}
+	} else if (Key.isKey(key)) {
+		/*
+		 * RFC3110 requires a keyname, and a keytype, which we
+		 * don't really have a mechanism for specifying such
+		 * additional metadata.
+		 */
+		throw (new Error('Format "dnssec" only supports ' +
+		    'writing private keys'));
+	} else {
+		throw (new Error('key is not a Key or PrivateKey'));
+	}
+}
+
+
+/***/ }),
+/* 327 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// Copyright 2015 Joyent, Inc.
+
+module.exports = {
+	read: read,
+	readPkcs1: readPkcs1,
+	write: write,
+	writePkcs1: writePkcs1
+};
+
+var assert = __webpack_require__(16);
+var asn1 = __webpack_require__(66);
+var Buffer = __webpack_require__(15).Buffer;
+var algs = __webpack_require__(32);
+var utils = __webpack_require__(26);
+
+var Key = __webpack_require__(27);
+var PrivateKey = __webpack_require__(33);
+var pem = __webpack_require__(86);
+
+var pkcs8 = __webpack_require__(157);
+var readECDSACurve = pkcs8.readECDSACurve;
+
+function read(buf, options) {
+	return (pem.read(buf, options, 'pkcs1'));
+}
+
+function write(key, options) {
+	return (pem.write(key, options, 'pkcs1'));
+}
+
+/* Helper to read in a single mpint */
+function readMPInt(der, nm) {
+	assert.strictEqual(der.peek(), asn1.Ber.Integer,
+	    nm + ' is not an Integer');
+	return (utils.mpNormalize(der.readString(asn1.Ber.Integer, true)));
+}
+
+function readPkcs1(alg, type, der) {
+	switch (alg) {
+	case 'RSA':
+		if (type === 'public')
+			return (readPkcs1RSAPublic(der));
+		else if (type === 'private')
+			return (readPkcs1RSAPrivate(der));
+		throw (new Error('Unknown key type: ' + type));
+	case 'DSA':
+		if (type === 'public')
+			return (readPkcs1DSAPublic(der));
+		else if (type === 'private')
+			return (readPkcs1DSAPrivate(der));
+		throw (new Error('Unknown key type: ' + type));
+	case 'EC':
+	case 'ECDSA':
+		if (type === 'private')
+			return (readPkcs1ECDSAPrivate(der));
+		else if (type === 'public')
+			return (readPkcs1ECDSAPublic(der));
+		throw (new Error('Unknown key type: ' + type));
+	case 'EDDSA':
+	case 'EdDSA':
+		if (type === 'private')
+			return (readPkcs1EdDSAPrivate(der));
+		throw (new Error(type + ' keys not supported with EdDSA'));
+	default:
+		throw (new Error('Unknown key algo: ' + alg));
+	}
+}
+
+function readPkcs1RSAPublic(der) {
+	// modulus and exponent
+	var n = readMPInt(der, 'modulus');
+	var e = readMPInt(der, 'exponent');
+
+	// now, make the key
+	var key = {
+		type: 'rsa',
+		parts: [
+			{ name: 'e', data: e },
+			{ name: 'n', data: n }
+		]
+	};
+
+	return (new Key(key));
+}
+
+function readPkcs1RSAPrivate(der) {
+	var version = readMPInt(der, 'version');
+	assert.strictEqual(version[0], 0);
+
+	// modulus then public exponent
+	var n = readMPInt(der, 'modulus');
+	var e = readMPInt(der, 'public exponent');
+	var d = readMPInt(der, 'private exponent');
+	var p = readMPInt(der, 'prime1');
+	var q = readMPInt(der, 'prime2');
+	var dmodp = readMPInt(der, 'exponent1');
+	var dmodq = readMPInt(der, 'exponent2');
+	var iqmp = readMPInt(der, 'iqmp');
+
+	// now, make the key
+	var key = {
+		type: 'rsa',
+		parts: [
+			{ name: 'n', data: n },
+			{ name: 'e', data: e },
+			{ name: 'd', data: d },
+			{ name: 'iqmp', data: iqmp },
+			{ name: 'p', data: p },
+			{ name: 'q', data: q },
+			{ name: 'dmodp', data: dmodp },
+			{ name: 'dmodq', data: dmodq }
+		]
+	};
+
+	return (new PrivateKey(key));
+}
+
+function readPkcs1DSAPrivate(der) {
+	var version = readMPInt(der, 'version');
+	assert.strictEqual(version.readUInt8(0), 0);
+
+	var p = readMPInt(der, 'p');
+	var q = readMPInt(der, 'q');
+	var g = readMPInt(der, 'g');
+	var y = readMPInt(der, 'y');
+	var x = readMPInt(der, 'x');
+
+	// now, make the key
+	var key = {
+		type: 'dsa',
+		parts: [
+			{ name: 'p', data: p },
+			{ name: 'q', data: q },
+			{ name: 'g', data: g },
+			{ name: 'y', data: y },
+			{ name: 'x', data: x }
+		]
+	};
+
+	return (new PrivateKey(key));
+}
+
+function readPkcs1EdDSAPrivate(der) {
+	var version = readMPInt(der, 'version');
+	assert.strictEqual(version.readUInt8(0), 1);
+
+	// private key
+	var k = der.readString(asn1.Ber.OctetString, true);
+
+	der.readSequence(0xa0);
+	var oid = der.readOID();
+	assert.strictEqual(oid, '1.3.101.112', 'the ed25519 curve identifier');
+
+	der.readSequence(0xa1);
+	var A = utils.readBitString(der);
+
+	var key = {
+		type: 'ed25519',
+		parts: [
+			{ name: 'A', data: utils.zeroPadToLength(A, 32) },
+			{ name: 'k', data: k }
+		]
+	};
+
+	return (new PrivateKey(key));
+}
+
+function readPkcs1DSAPublic(der) {
+	var y = readMPInt(der, 'y');
+	var p = readMPInt(der, 'p');
+	var q = readMPInt(der, 'q');
+	var g = readMPInt(der, 'g');
+
+	var key = {
+		type: 'dsa',
+		parts: [
+			{ name: 'y', data: y },
+			{ name: 'p', data: p },
+			{ name: 'q', data: q },
+			{ name: 'g', data: g }
+		]
+	};
+
+	return (new Key(key));
+}
+
+function readPkcs1ECDSAPublic(der) {
+	der.readSequence();
+
+	var oid = der.readOID();
+	assert.strictEqual(oid, '1.2.840.10045.2.1', 'must be ecPublicKey');
+
+	var curveOid = der.readOID();
+
+	var curve;
+	var curves = Object.keys(algs.curves);
+	for (var j = 0; j < curves.length; ++j) {
+		var c = curves[j];
+		var cd = algs.curves[c];
+		if (cd.pkcs8oid === curveOid) {
+			curve = c;
+			break;
+		}
+	}
+	assert.string(curve, 'a known ECDSA named curve');
+
+	var Q = der.readString(asn1.Ber.BitString, true);
+	Q = utils.ecNormalize(Q);
+
+	var key = {
+		type: 'ecdsa',
+		parts: [
+			{ name: 'curve', data: Buffer.from(curve) },
+			{ name: 'Q', data: Q }
+		]
+	};
+
+	return (new Key(key));
+}
+
+function readPkcs1ECDSAPrivate(der) {
+	var version = readMPInt(der, 'version');
+	assert.strictEqual(version.readUInt8(0), 1);
+
+	// private key
+	var d = der.readString(asn1.Ber.OctetString, true);
+
+	der.readSequence(0xa0);
+	var curve = readECDSACurve(der);
+	assert.string(curve, 'a known elliptic curve');
+
+	der.readSequence(0xa1);
+	var Q = der.readString(asn1.Ber.BitString, true);
+	Q = utils.ecNormalize(Q);
+
+	var key = {
+		type: 'ecdsa',
+		parts: [
+			{ name: 'curve', data: Buffer.from(curve) },
+			{ name: 'Q', data: Q },
+			{ name: 'd', data: d }
+		]
+	};
+
+	return (new PrivateKey(key));
+}
+
+function writePkcs1(der, key) {
+	der.startSequence();
+
+	switch (key.type) {
+	case 'rsa':
+		if (PrivateKey.isPrivateKey(key))
+			writePkcs1RSAPrivate(der, key);
+		else
+			writePkcs1RSAPublic(der, key);
+		break;
+	case 'dsa':
+		if (PrivateKey.isPrivateKey(key))
+			writePkcs1DSAPrivate(der, key);
+		else
+			writePkcs1DSAPublic(der, key);
+		break;
+	case 'ecdsa':
+		if (PrivateKey.isPrivateKey(key))
+			writePkcs1ECDSAPrivate(der, key);
+		else
+			writePkcs1ECDSAPublic(der, key);
+		break;
+	case 'ed25519':
+		if (PrivateKey.isPrivateKey(key))
+			writePkcs1EdDSAPrivate(der, key);
+		else
+			writePkcs1EdDSAPublic(der, key);
+		break;
+	default:
+		throw (new Error('Unknown key algo: ' + key.type));
+	}
+
+	der.endSequence();
+}
+
+function writePkcs1RSAPublic(der, key) {
+	der.writeBuffer(key.part.n.data, asn1.Ber.Integer);
+	der.writeBuffer(key.part.e.data, asn1.Ber.Integer);
+}
+
+function writePkcs1RSAPrivate(der, key) {
+	var ver = Buffer.from([0]);
+	der.writeBuffer(ver, asn1.Ber.Integer);
+
+	der.writeBuffer(key.part.n.data, asn1.Ber.Integer);
+	der.writeBuffer(key.part.e.data, asn1.Ber.Integer);
+	der.writeBuffer(key.part.d.data, asn1.Ber.Integer);
+	der.writeBuffer(key.part.p.data, asn1.Ber.Integer);
+	der.writeBuffer(key.part.q.data, asn1.Ber.Integer);
+	if (!key.part.dmodp || !key.part.dmodq)
+		utils.addRSAMissing(key);
+	der.writeBuffer(key.part.dmodp.data, asn1.Ber.Integer);
+	der.writeBuffer(key.part.dmodq.data, asn1.Ber.Integer);
+	der.writeBuffer(key.part.iqmp.data, asn1.Ber.Integer);
+}
+
+function writePkcs1DSAPrivate(der, key) {
+	var ver = Buffer.from([0]);
+	der.writeBuffer(ver, asn1.Ber.Integer);
+
+	der.writeBuffer(key.part.p.data, asn1.Ber.Integer);
+	der.writeBuffer(key.part.q.data, asn1.Ber.Integer);
+	der.writeBuffer(key.part.g.data, asn1.Ber.Integer);
+	der.writeBuffer(key.part.y.data, asn1.Ber.Integer);
+	der.writeBuffer(key.part.x.data, asn1.Ber.Integer);
+}
+
+function writePkcs1DSAPublic(der, key) {
+	der.writeBuffer(key.part.y.data, asn1.Ber.Integer);
+	der.writeBuffer(key.part.p.data, asn1.Ber.Integer);
+	der.writeBuffer(key.part.q.data, asn1.Ber.Integer);
+	der.writeBuffer(key.part.g.data, asn1.Ber.Integer);
+}
+
+function writePkcs1ECDSAPublic(der, key) {
+	der.startSequence();
+
+	der.writeOID('1.2.840.10045.2.1'); /* ecPublicKey */
+	var curve = key.part.curve.data.toString();
+	var curveOid = algs.curves[curve].pkcs8oid;
+	assert.string(curveOid, 'a known ECDSA named curve');
+	der.writeOID(curveOid);
+
+	der.endSequence();
+
+	var Q = utils.ecNormalize(key.part.Q.data, true);
+	der.writeBuffer(Q, asn1.Ber.BitString);
+}
+
+function writePkcs1ECDSAPrivate(der, key) {
+	var ver = Buffer.from([1]);
+	der.writeBuffer(ver, asn1.Ber.Integer);
+
+	der.writeBuffer(key.part.d.data, asn1.Ber.OctetString);
+
+	der.startSequence(0xa0);
+	var curve = key.part.curve.data.toString();
+	var curveOid = algs.curves[curve].pkcs8oid;
+	assert.string(curveOid, 'a known ECDSA named curve');
+	der.writeOID(curveOid);
+	der.endSequence();
+
+	der.startSequence(0xa1);
+	var Q = utils.ecNormalize(key.part.Q.data, true);
+	der.writeBuffer(Q, asn1.Ber.BitString);
+	der.endSequence();
+}
+
+function writePkcs1EdDSAPrivate(der, key) {
+	var ver = Buffer.from([1]);
+	der.writeBuffer(ver, asn1.Ber.Integer);
+
+	der.writeBuffer(key.part.k.data, asn1.Ber.OctetString);
+
+	der.startSequence(0xa0);
+	der.writeOID('1.3.101.112');
+	der.endSequence();
+
+	der.startSequence(0xa1);
+	utils.writeBitString(der, key.part.A.data);
+	der.endSequence();
+}
+
+function writePkcs1EdDSAPublic(der, key) {
+	throw (new Error('Public keys are not supported for EdDSA PKCS#1'));
+}
+
+
+/***/ }),
+/* 328 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// Copyright 2015 Joyent, Inc.
+
+var Key = __webpack_require__(27);
+var Fingerprint = __webpack_require__(156);
+var Signature = __webpack_require__(75);
+var PrivateKey = __webpack_require__(33);
+var Certificate = __webpack_require__(155);
+var Identity = __webpack_require__(158);
+var errs = __webpack_require__(74);
+
+module.exports = {
+	/* top-level classes */
+	Key: Key,
+	parseKey: Key.parse,
+	Fingerprint: Fingerprint,
+	parseFingerprint: Fingerprint.parse,
+	Signature: Signature,
+	parseSignature: Signature.parse,
+	PrivateKey: PrivateKey,
+	parsePrivateKey: PrivateKey.parse,
+	generatePrivateKey: PrivateKey.generate,
+	Certificate: Certificate,
+	parseCertificate: Certificate.parse,
+	createSelfSignedCertificate: Certificate.createSelfSigned,
+	createCertificate: Certificate.create,
+	Identity: Identity,
+	identityFromDN: Identity.parseDN,
+	identityForHost: Identity.forHost,
+	identityForUser: Identity.forUser,
+	identityForEmail: Identity.forEmail,
+
+	/* errors */
+	FingerprintFormatError: errs.FingerprintFormatError,
+	InvalidAlgorithmError: errs.InvalidAlgorithmError,
+	KeyParseError: errs.KeyParseError,
+	SignatureParseError: errs.SignatureParseError,
+	KeyEncryptedError: errs.KeyEncryptedError,
+	CertificateParseError: errs.CertificateParseError
+};
+
+
+/***/ }),
+/* 329 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+const ansiRegex = __webpack_require__(948);
+
+module.exports = input => typeof input === 'string' ? input.replace(ansiRegex(), '') : input;
+
+
+/***/ }),
+/* 330 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var hasFlag = __webpack_require__(273);
+
+var support = function (level) {
+	if (level === 0) {
+		return false;
+	}
+
+	return {
+		level: level,
+		hasBasic: true,
+		has256: level >= 2,
+		has16m: level >= 3
+	};
+};
+
+var supportLevel = (function () {
+	if (hasFlag('no-color') ||
+		hasFlag('no-colors') ||
+		hasFlag('color=false')) {
+		return 0;
+	}
+
+	if (hasFlag('color=16m') ||
+		hasFlag('color=full') ||
+		hasFlag('color=truecolor')) {
+		return 3;
+	}
+
+	if (hasFlag('color=256')) {
+		return 2;
+	}
+
+	if (hasFlag('color') ||
+		hasFlag('colors') ||
+		hasFlag('color=true') ||
+		hasFlag('color=always')) {
+		return 1;
+	}
+
+	if (process.stdout && !process.stdout.isTTY) {
+		return 0;
+	}
+
+	if (process.platform === 'win32') {
+		return 1;
+	}
+
+	if ('CI' in process.env) {
+		if ('TRAVIS' in process.env || process.env.CI === 'Travis') {
+			return 1;
+		}
+
+		return 0;
+	}
+
+	if ('TEAMCITY_VERSION' in process.env) {
+		return process.env.TEAMCITY_VERSION.match(/^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/) === null ? 0 : 1;
+	}
+
+	if (/^(screen|xterm)-256(?:color)?/.test(process.env.TERM)) {
+		return 2;
+	}
+
+	if (/^screen|^xterm|^vt100|color|ansi|cygwin|linux/i.test(process.env.TERM)) {
+		return 1;
+	}
+
+	if ('COLORTERM' in process.env) {
+		return 1;
+	}
+
+	if (process.env.TERM === 'dumb') {
+		return 0;
+	}
+
+	return 0;
+})();
+
+if (supportLevel === 0 && 'FORCE_COLOR' in process.env) {
+	supportLevel = 1;
+}
+
+module.exports = process && support(supportLevel);
+
+
+/***/ }),
+/* 331 */
+/***/ (function(module, exports) {
+
+module.exports = require("child_process");
+
+/***/ }),
+/* 332 */
+/***/ (function(module, exports) {
+
+module.exports = require("punycode");
+
+/***/ }),
+/* 333 */
+/***/ (function(module, exports) {
+
+module.exports = require("string_decoder");
+
+/***/ }),
+/* 334 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _constants;
+
+function _load_constants() {
+  return _constants = _interopRequireWildcard(__webpack_require__(8));
+}
+
+var _access;
+
+function _load_access() {
+  return _access = _interopRequireWildcard(__webpack_require__(525));
+}
+
+var _add;
+
+function _load_add() {
+  return _add = _interopRequireWildcard(__webpack_require__(165));
+}
+
+var _audit;
+
+function _load_audit() {
+  return _audit = _interopRequireWildcard(__webpack_require__(353));
+}
+
+var _autoclean;
+
+function _load_autoclean() {
+  return _autoclean = _interopRequireWildcard(__webpack_require__(354));
+}
+
+var _bin;
+
+function _load_bin() {
+  return _bin = _interopRequireWildcard(__webpack_require__(526));
+}
+
+var _cache;
+
+function _load_cache() {
+  return _cache = _interopRequireWildcard(__webpack_require__(355));
+}
+
+var _check;
+
+function _load_check() {
+  return _check = _interopRequireWildcard(__webpack_require__(356));
+}
+
+var _config;
+
+function _load_config() {
+  return _config = _interopRequireWildcard(__webpack_require__(527));
+}
+
+var _create;
+
+function _load_create() {
+  return _create = _interopRequireWildcard(__webpack_require__(528));
+}
+
+var _exec;
+
+function _load_exec() {
+  return _exec = _interopRequireWildcard(__webpack_require__(529));
+}
+
+var _generateLockEntry;
+
+function _load_generateLockEntry() {
+  return _generateLockEntry = _interopRequireWildcard(__webpack_require__(530));
+}
+
+var _global;
+
+function _load_global() {
+  return _global = _interopRequireWildcard(__webpack_require__(121));
+}
+
+var _help;
+
+function _load_help() {
+  return _help = _interopRequireWildcard(__webpack_require__(531));
+}
+
+var _import;
+
+function _load_import() {
+  return _import = _interopRequireWildcard(__webpack_require__(532));
+}
+
+var _info;
+
+function _load_info() {
+  return _info = _interopRequireWildcard(__webpack_require__(533));
+}
+
+var _init;
+
+function _load_init() {
+  return _init = _interopRequireWildcard(__webpack_require__(534));
+}
+
+var _install;
+
+function _load_install() {
+  return _install = _interopRequireWildcard(__webpack_require__(34));
+}
+
+var _licenses;
+
+function _load_licenses() {
+  return _licenses = _interopRequireWildcard(__webpack_require__(535));
+}
+
+var _link;
+
+function _load_link() {
+  return _link = _interopRequireWildcard(__webpack_require__(357));
+}
+
+var _login;
+
+function _load_login() {
+  return _login = _interopRequireWildcard(__webpack_require__(107));
+}
+
+var _logout;
+
+function _load_logout() {
+  return _logout = _interopRequireWildcard(__webpack_require__(536));
+}
+
+var _list;
+
+function _load_list() {
+  return _list = _interopRequireWildcard(__webpack_require__(358));
+}
+
+var _node;
+
+function _load_node() {
+  return _node = _interopRequireWildcard(__webpack_require__(537));
+}
+
+var _outdated;
+
+function _load_outdated() {
+  return _outdated = _interopRequireWildcard(__webpack_require__(538));
+}
+
+var _owner;
+
+function _load_owner() {
+  return _owner = _interopRequireWildcard(__webpack_require__(539));
+}
+
+var _pack;
+
+function _load_pack() {
+  return _pack = _interopRequireWildcard(__webpack_require__(166));
+}
+
+var _policies;
+
+function _load_policies() {
+  return _policies = _interopRequireWildcard(__webpack_require__(540));
+}
+
+var _publish;
+
+function _load_publish() {
+  return _publish = _interopRequireWildcard(__webpack_require__(541));
+}
+
+var _remove;
+
+function _load_remove() {
+  return _remove = _interopRequireWildcard(__webpack_require__(359));
+}
+
+var _run;
+
+function _load_run() {
+  return _run = _interopRequireWildcard(__webpack_require__(360));
+}
+
+var _tag;
+
+function _load_tag() {
+  return _tag = _interopRequireWildcard(__webpack_require__(361));
+}
+
+var _team;
+
+function _load_team() {
+  return _team = _interopRequireWildcard(__webpack_require__(542));
+}
+
+var _unplug;
+
+function _load_unplug() {
+  return _unplug = _interopRequireWildcard(__webpack_require__(544));
+}
+
+var _unlink;
+
+function _load_unlink() {
+  return _unlink = _interopRequireWildcard(__webpack_require__(543));
+}
+
+var _upgrade;
+
+function _load_upgrade() {
+  return _upgrade = _interopRequireWildcard(__webpack_require__(207));
+}
+
+var _version;
+
+function _load_version() {
+  return _version = _interopRequireWildcard(__webpack_require__(363));
+}
+
+var _versions;
+
+function _load_versions() {
+  return _versions = _interopRequireWildcard(__webpack_require__(545));
+}
+
+var _why;
+
+function _load_why() {
+  return _why = _interopRequireWildcard(__webpack_require__(546));
+}
+
+var _workspaces;
+
+function _load_workspaces() {
+  return _workspaces = _interopRequireWildcard(__webpack_require__(548));
+}
+
+var _workspace;
+
+function _load_workspace() {
+  return _workspace = _interopRequireWildcard(__webpack_require__(547));
+}
+
+var _upgradeInteractive;
+
+function _load_upgradeInteractive() {
+  return _upgradeInteractive = _interopRequireWildcard(__webpack_require__(362));
+}
+
+var _useless;
+
+function _load_useless() {
+  return _useless = _interopRequireDefault(__webpack_require__(524));
+}
+
+var _aliases;
+
+function _load_aliases() {
+  return _aliases = _interopRequireDefault(__webpack_require__(352));
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+const chalk = __webpack_require__(30);
+
+
+const getDocsLink = name => `${(_constants || _load_constants()).YARN_DOCS}${name || ''}`;
+const getDocsInfo = name => 'Visit ' + chalk.bold(getDocsLink(name)) + ' for documentation about this command.';
+
+const commands = {
+  access: _access || _load_access(),
+  add: _add || _load_add(),
+  audit: _audit || _load_audit(),
+  autoclean: _autoclean || _load_autoclean(),
+  bin: _bin || _load_bin(),
+  cache: _cache || _load_cache(),
+  check: _check || _load_check(),
+  config: _config || _load_config(),
+  create: _create || _load_create(),
+  dedupe: (0, (_useless || _load_useless()).default)("The dedupe command isn't necessary. `yarn install` will already dedupe."),
+  exec: _exec || _load_exec(),
+  generateLockEntry: _generateLockEntry || _load_generateLockEntry(),
+  global: _global || _load_global(),
+  help: _help || _load_help(),
+  import: _import || _load_import(),
+  info: _info || _load_info(),
+  init: _init || _load_init(),
+  install: _install || _load_install(),
+  licenses: _licenses || _load_licenses(),
+  link: _link || _load_link(),
+  lockfile: (0, (_useless || _load_useless()).default)("The lockfile command isn't necessary. `yarn install` will produce a lockfile."),
+  login: _login || _load_login(),
+  logout: _logout || _load_logout(),
+  list: _list || _load_list(),
+  node: _node || _load_node(),
+  outdated: _outdated || _load_outdated(),
+  owner: _owner || _load_owner(),
+  pack: _pack || _load_pack(),
+  policies: _policies || _load_policies(),
+  prune: (0, (_useless || _load_useless()).default)("The prune command isn't necessary. `yarn install` will prune extraneous packages."),
+  publish: _publish || _load_publish(),
+  remove: _remove || _load_remove(),
+  run: _run || _load_run(),
+  tag: _tag || _load_tag(),
+  team: _team || _load_team(),
+  unplug: _unplug || _load_unplug(),
+  unlink: _unlink || _load_unlink(),
+  upgrade: _upgrade || _load_upgrade(),
+  version: _version || _load_version(),
+  versions: _versions || _load_versions(),
+  why: _why || _load_why(),
+  workspaces: _workspaces || _load_workspaces(),
+  workspace: _workspace || _load_workspace(),
+  upgradeInteractive: _upgradeInteractive || _load_upgradeInteractive()
+};
+
+for (const key in commands) {
+  commands[key].getDocsInfo = getDocsInfo(key);
+}
+
+for (const key in (_aliases || _load_aliases()).default) {
+  commands[key] = commands[(_aliases || _load_aliases()).default[key]];
+  commands[key].getDocsInfo = getDocsInfo(key);
+}
+
+exports.default = commands;
+
+/***/ }),
+/* 335 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getRcConfigForCwd = getRcConfigForCwd;
+exports.getRcArgs = getRcArgs;
+
+var _fs;
+
+function _load_fs() {
+  return _fs = __webpack_require__(5);
+}
+
+var _path;
+
+function _load_path() {
+  return _path = __webpack_require__(0);
+}
+
+var _commander;
+
+function _load_commander() {
+  return _commander = _interopRequireDefault(__webpack_require__(338));
+}
+
+var _lockfile;
+
+function _load_lockfile() {
+  return _lockfile = __webpack_require__(19);
+}
+
+var _rc;
+
+function _load_rc() {
+  return _rc = _interopRequireWildcard(__webpack_require__(590));
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+// Keys that will get resolved relative to the path of the rc file they belong to
+const PATH_KEYS = new Set(['yarn-path', 'cache-folder', 'global-folder', 'modules-folder', 'cwd', 'offline-cache-folder']);
+
+// given a cwd, load all .yarnrc files relative to it
+
+
+function getRcConfigForCwd(cwd, args) {
+  const config = {};
+
+  if (args.indexOf('--no-default-rc') === -1) {
+    Object.assign(config, (_rc || _load_rc()).findRc('yarn', cwd, (fileText, filePath) => {
+      return loadRcFile(fileText, filePath);
+    }));
+  }
+
+  for (let index = args.indexOf('--use-yarnrc'); index !== -1; index = args.indexOf('--use-yarnrc', index + 1)) {
+    const value = args[index + 1];
+
+    if (value && value.charAt(0) !== '-') {
+      Object.assign(config, loadRcFile((0, (_fs || _load_fs()).readFileSync)(value).toString(), value));
+    }
+  }
+
+  return config;
+}
+
+function loadRcFile(fileText, filePath) {
+  var _parse = (0, (_lockfile || _load_lockfile()).parse)(fileText, 'yarnrc');
+
+  let values = _parse.object;
+
+
+  if (filePath.match(/\.yml$/)) {
+    values = { 'yarn-path': values.yarnPath };
+  }
+
+  // some keys reference directories so keep their relativity
+  for (const key in values) {
+    if (PATH_KEYS.has(key.replace(/^(--)?([^.]+\.)*/, ''))) {
+      values[key] = (0, (_path || _load_path()).resolve)((0, (_path || _load_path()).dirname)(filePath), values[key]);
+    }
+  }
+
+  return values;
+}
+
+// get the built of arguments of a .yarnrc chain of the passed cwd
+function buildRcArgs(cwd, args) {
+  const config = getRcConfigForCwd(cwd, args);
+
+  const argsForCommands = new Map();
+
+  for (const key in config) {
+    // args can be prefixed with the command name they're meant for, eg.
+    // `--install.check-files true`
+    const keyMatch = key.match(/^--(?:([^.]+)\.)?(.*)$/);
+    if (!keyMatch) {
+      continue;
+    }
+
+    const commandName = keyMatch[1] || '*';
+    const arg = keyMatch[2];
+    const value = config[key];
+
+    // create args for this command name if we didn't previously have them
+    const args = argsForCommands.get(commandName) || [];
+    argsForCommands.set(commandName, args);
+
+    // turn config value into appropriate cli flag
+    const option = (_commander || _load_commander()).default.optionFor(`--${arg}`);
+
+    // If commander doesn't recognize the option or it takes a value after it
+    if (!option || option.optional || option.required) {
+      args.push(`--${arg}`, value);
+    } else if (value === true) {
+      // we can't force remove an arg from cli
+      args.push(`--${arg}`);
+    }
+  }
+
+  return argsForCommands;
+}
+
+// extract the value of a --cwd arg if present
+function extractCwdArg(args) {
+  for (let i = 0, I = args.length; i < I; ++i) {
+    const arg = args[i];
+    if (arg === '--') {
+      return null;
+    } else if (arg === '--cwd') {
+      return args[i + 1];
+    }
+  }
+  return null;
+}
+
+// get a list of arguments from .yarnrc that apply to this commandName
+function getRcArgs(commandName, args, previousCwds = []) {
+  // for the cwd, use the --cwd arg if it was passed or else use process.cwd()
+  const origCwd = extractCwdArg(args) || process.cwd();
+
+  // get a map of command names and their arguments
+  const argMap = buildRcArgs(origCwd, args);
+
+  // concat wildcard arguments and arguments meant for this specific command
+  const newArgs = [...(argMap.get('*') || []), ...(argMap.get(commandName) || [])];
+
+  // check if the .yarnrc args specified a cwd
+  const newCwd = extractCwdArg(newArgs);
+  if (newCwd && newCwd !== origCwd) {
+    // ensure that we don't enter into a loop
+    if (previousCwds.indexOf(newCwd) !== -1) {
+      throw new Error(`Recursive .yarnrc files specifying --cwd flags. Bailing out.`);
+    }
+
+    //  if we have a new cwd then let's refetch the .yarnrc args relative to it
+    return getRcArgs(commandName, newArgs, previousCwds.concat(origCwd));
+  }
+
+  return newArgs;
+}
+
+/***/ }),
+/* 336 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.boolify = boolify;
+exports.boolifyWithDefault = boolifyWithDefault;
+const FALSY_STRINGS = new Set(['0', 'false']);
+
+function boolify(val) {
+  return !FALSY_STRINGS.has(val.toString().toLowerCase());
+}
+
+function boolifyWithDefault(val, defaultResult) {
+  return val === '' || val === null || val === undefined ? defaultResult : boolify(val);
+}
+
+/***/ }),
+/* 337 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isOffline = isOffline;
+const os = __webpack_require__(49);
+
+const IGNORE_INTERFACES = ['lo0', 'awdl0', 'bridge0'];
+const LOCAL_IPS = ['127.0.0.1', '::1'];
+
+function isOffline() {
+  let interfaces;
+
+  try {
+    interfaces = os.networkInterfaces();
+  } catch (e) {
+    // As of October 2016, Windows Subsystem for Linux (WSL) does not support
+    // the os.networkInterfaces() call and throws instead. For this platform,
+    // assume we are online.
+    if (e.syscall === 'uv_interface_addresses') {
+      return false;
+    } else {
+      throw e;
+    }
+  }
+
+  for (const name in interfaces) {
+    if (IGNORE_INTERFACES.indexOf(name) >= 0) {
+      continue;
+    }
+
+    const addrs = interfaces[name];
+    for (var _iterator = addrs, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+      var _ref;
+
+      if (_isArray) {
+        if (_i >= _iterator.length) break;
+        _ref = _iterator[_i++];
+      } else {
+        _i = _iterator.next();
+        if (_i.done) break;
+        _ref = _i.value;
+      }
+
+      const addr = _ref;
+
+      if (LOCAL_IPS.indexOf(addr.address) < 0) {
+        // found a possible remote ip
+        return false;
+      }
+    }
+  }
+
+  return true;
+}
+
+/***/ }),
+/* 338 */
+/***/ (function(module, exports, __webpack_require__) {
+
+/**
+ * Module dependencies.
+ */
+
+var EventEmitter = __webpack_require__(77).EventEmitter;
+var spawn = __webpack_require__(331).spawn;
+var path = __webpack_require__(0);
+var dirname = path.dirname;
+var basename = path.basename;
+var fs = __webpack_require__(5);
+
+/**
+ * Inherit `Command` from `EventEmitter.prototype`.
+ */
+
+__webpack_require__(3).inherits(Command, EventEmitter);
+
+/**
+ * Expose the root command.
+ */
+
+exports = module.exports = new Command();
+
+/**
+ * Expose `Command`.
+ */
+
+exports.Command = Command;
+
+/**
+ * Expose `Option`.
+ */
+
+exports.Option = Option;
+
+/**
+ * Initialize a new `Option` with the given `flags` and `description`.
+ *
+ * @param {String} flags
+ * @param {String} description
+ * @api public
+ */
+
+function Option(flags, description) {
+  this.flags = flags;
+  this.required = flags.indexOf('<') >= 0;
+  this.optional = flags.indexOf('[') >= 0;
+  this.bool = flags.indexOf('-no-') === -1;
+  flags = flags.split(/[ ,|]+/);
+  if (flags.length > 1 && !/^[[<]/.test(flags[1])) this.short = flags.shift();
+  this.long = flags.shift();
+  this.description = description || '';
+}
+
+/**
+ * Return option name.
+ *
+ * @return {String}
+ * @api private
+ */
+
+Option.prototype.name = function() {
+  return this.long
+    .replace('--', '')
+    .replace('no-', '');
+};
+
+/**
+ * Return option name, in a camelcase format that can be used
+ * as a object attribute key.
+ *
+ * @return {String}
+ * @api private
+ */
+
+Option.prototype.attributeName = function() {
+  return camelcase(this.name());
+};
+
+/**
+ * Check if `arg` matches the short or long flag.
+ *
+ * @param {String} arg
+ * @return {Boolean}
+ * @api private
+ */
+
+Option.prototype.is = function(arg) {
+  return this.short === arg || this.long === arg;
+};
+
+/**
+ * Initialize a new `Command`.
+ *
+ * @param {String} name
+ * @api public
+ */
+
+function Command(name) {
+  this.commands = [];
+  this.options = [];
+  this._execs = {};
+  this._allowUnknownOption = false;
+  this._args = [];
+  this._name = name || '';
+}
+
+/**
+ * Add command `name`.
+ *
+ * The `.action()` callback is invoked when the
+ * command `name` is specified via __ARGV__,
+ * and the remaining arguments are applied to the
+ * function for access.
+ *
+ * When the `name` is "*" an un-matched command
+ * will be passed as the first arg, followed by
+ * the rest of __ARGV__ remaining.
+ *
+ * Examples:
+ *
+ *      program
+ *        .version('0.0.1')
+ *        .option('-C, --chdir <path>', 'change the working directory')
+ *        .option('-c, --config <path>', 'set config path. defaults to ./deploy.conf')
+ *        .option('-T, --no-tests', 'ignore test hook')
+ *
+ *      program
+ *        .command('setup')
+ *        .description('run remote setup commands')
+ *        .action(function() {
+ *          console.log('setup');
+ *        });
+ *
+ *      program
+ *        .command('exec <cmd>')
+ *        .description('run the given remote command')
+ *        .action(function(cmd) {
+ *          console.log('exec "%s"', cmd);
+ *        });
+ *
+ *      program
+ *        .command('teardown <dir> [otherDirs...]')
+ *        .description('run teardown commands')
+ *        .action(function(dir, otherDirs) {
+ *          console.log('dir "%s"', dir);
+ *          if (otherDirs) {
+ *            otherDirs.forEach(function (oDir) {
+ *              console.log('dir "%s"', oDir);
+ *            });
+ *          }
+ *        });
+ *
+ *      program
+ *        .command('*')
+ *        .description('deploy the given env')
+ *        .action(function(env) {
+ *          console.log('deploying "%s"', env);
+ *        });
+ *
+ *      program.parse(process.argv);
+  *
+ * @param {String} name
+ * @param {String} [desc] for git-style sub-commands
+ * @return {Command} the new command
+ * @api public
+ */
+
+Command.prototype.command = function(name, desc, opts) {
+  if (typeof desc === 'object' && desc !== null) {
+    opts = desc;
+    desc = null;
+  }
+  opts = opts || {};
+  var args = name.split(/ +/);
+  var cmd = new Command(args.shift());
+
+  if (desc) {
+    cmd.description(desc);
+    this.executables = true;
+    this._execs[cmd._name] = true;
+    if (opts.isDefault) this.defaultExecutable = cmd._name;
+  }
+  cmd._noHelp = !!opts.noHelp;
+  this.commands.push(cmd);
+  cmd.parseExpectedArgs(args);
+  cmd.parent = this;
+
+  if (desc) return this;
+  return cmd;
+};
+
+/**
+ * Define argument syntax for the top-level command.
+ *
+ * @api public
+ */
+
+Command.prototype.arguments = function(desc) {
+  return this.parseExpectedArgs(desc.split(/ +/));
+};
+
+/**
+ * Add an implicit `help [cmd]` subcommand
+ * which invokes `--help` for the given command.
+ *
+ * @api private
+ */
+
+Command.prototype.addImplicitHelpCommand = function() {
+  this.command('help [cmd]', 'display help for [cmd]');
+};
+
+/**
+ * Parse expected `args`.
+ *
+ * For example `["[type]"]` becomes `[{ required: false, name: 'type' }]`.
+ *
+ * @param {Array} args
+ * @return {Command} for chaining
+ * @api public
+ */
+
+Command.prototype.parseExpectedArgs = function(args) {
+  if (!args.length) return;
+  var self = this;
+  args.forEach(function(arg) {
+    var argDetails = {
+      required: false,
+      name: '',
+      variadic: false
+    };
+
+    switch (arg[0]) {
+      case '<':
+        argDetails.required = true;
+        argDetails.name = arg.slice(1, -1);
+        break;
+      case '[':
+        argDetails.name = arg.slice(1, -1);
+        break;
+    }
+
+    if (argDetails.name.length > 3 && argDetails.name.slice(-3) === '...') {
+      argDetails.variadic = true;
+      argDetails.name = argDetails.name.slice(0, -3);
+    }
+    if (argDetails.name) {
+      self._args.push(argDetails);
+    }
+  });
+  return this;
+};
+
+/**
+ * Register callback `fn` for the command.
+ *
+ * Examples:
+ *
+ *      program
+ *        .command('help')
+ *        .description('display verbose help')
+ *        .action(function() {
+ *           // output help here
+ *        });
+ *
+ * @param {Function} fn
+ * @return {Command} for chaining
+ * @api public
+ */
+
+Command.prototype.action = function(fn) {
+  var self = this;
+  var listener = function(args, unknown) {
+    // Parse any so-far unknown options
+    args = args || [];
+    unknown = unknown || [];
+
+    var parsed = self.parseOptions(unknown);
+
+    // Output help if necessary
+    outputHelpIfNecessary(self, parsed.unknown);
+
+    // If there are still any unknown options, then we simply
+    // die, unless someone asked for help, in which case we give it
+    // to them, and then we die.
+    if (parsed.unknown.length > 0) {
+      self.unknownOption(parsed.unknown[0]);
+    }
+
+    // Leftover arguments need to be pushed back. Fixes issue #56
+    if (parsed.args.length) args = parsed.args.concat(args);
+
+    self._args.forEach(function(arg, i) {
+      if (arg.required && args[i] == null) {
+        self.missingArgument(arg.name);
+      } else if (arg.variadic) {
+        if (i !== self._args.length - 1) {
+          self.variadicArgNotLast(arg.name);
+        }
+
+        args[i] = args.splice(i);
+      }
+    });
+
+    // Always append ourselves to the end of the arguments,
+    // to make sure we match the number of arguments the user
+    // expects
+    if (self._args.length) {
+      args[self._args.length] = self;
+    } else {
+      args.push(self);
+    }
+
+    fn.apply(self, args);
+  };
+  var parent = this.parent || this;
+  var name = parent === this ? '*' : this._name;
+  parent.on('command:' + name, listener);
+  if (this._alias) parent.on('command:' + this._alias, listener);
+  return this;
+};
+
+/**
+ * Define option with `flags`, `description` and optional
+ * coercion `fn`.
+ *
+ * The `flags` string should contain both the short and long flags,
+ * separated by comma, a pipe or space. The following are all valid
+ * all will output this way when `--help` is used.
+ *
+ *    "-p, --pepper"
+ *    "-p|--pepper"
+ *    "-p --pepper"
+ *
+ * Examples:
+ *
+ *     // simple boolean defaulting to false
+ *     program.option('-p, --pepper', 'add pepper');
+ *
+ *     --pepper
+ *     program.pepper
+ *     // => Boolean
+ *
+ *     // simple boolean defaulting to true
+ *     program.option('-C, --no-cheese', 'remove cheese');
+ *
+ *     program.cheese
+ *     // => true
+ *
+ *     --no-cheese
+ *     program.cheese
+ *     // => false
+ *
+ *     // required argument
+ *     program.option('-C, --chdir <path>', 'change the working directory');
+ *
+ *     --chdir /tmp
+ *     program.chdir
+ *     // => "/tmp"
+ *
+ *     // optional argument
+ *     program.option('-c, --cheese [type]', 'add cheese [marble]');
+ *
+ * @param {String} flags
+ * @param {String} description
+ * @param {Function|*} [fn] or default
+ * @param {*} [defaultValue]
+ * @return {Command} for chaining
+ * @api public
+ */
+
+Command.prototype.option = function(flags, description, fn, defaultValue) {
+  var self = this,
+    option = new Option(flags, description),
+    oname = option.name(),
+    name = option.attributeName();
+
+  // default as 3rd arg
+  if (typeof fn !== 'function') {
+    if (fn instanceof RegExp) {
+      var regex = fn;
+      fn = function(val, def) {
+        var m = regex.exec(val);
+        return m ? m[0] : def;
+      };
+    } else {
+      defaultValue = fn;
+      fn = null;
+    }
+  }
+
+  // preassign default value only for --no-*, [optional], or <required>
+  if (!option.bool || option.optional || option.required) {
+    // when --no-* we make sure default is true
+    if (!option.bool) defaultValue = true;
+    // preassign only if we have a default
+    if (defaultValue !== undefined) {
+      self[name] = defaultValue;
+      option.defaultValue = defaultValue;
+    }
+  }
+
+  // register the option
+  this.options.push(option);
+
+  // when it's passed assign the value
+  // and conditionally invoke the callback
+  this.on('option:' + oname, function(val) {
+    // coercion
+    if (val !== null && fn) {
+      val = fn(val, self[name] === undefined ? defaultValue : self[name]);
+    }
+
+    // unassigned or bool
+    if (typeof self[name] === 'boolean' || typeof self[name] === 'undefined') {
+      // if no value, bool true, and we have a default, then use it!
+      if (val == null) {
+        self[name] = option.bool
+          ? defaultValue || true
+          : false;
+      } else {
+        self[name] = val;
+      }
+    } else if (val !== null) {
+      // reassign
+      self[name] = val;
+    }
+  });
+
+  return this;
+};
+
+/**
+ * Allow unknown options on the command line.
+ *
+ * @param {Boolean} arg if `true` or omitted, no error will be thrown
+ * for unknown options.
+ * @api public
+ */
+Command.prototype.allowUnknownOption = function(arg) {
+  this._allowUnknownOption = arguments.length === 0 || arg;
+  return this;
+};
+
+/**
+ * Parse `argv`, settings options and invoking commands when defined.
+ *
+ * @param {Array} argv
+ * @return {Command} for chaining
+ * @api public
+ */
+
+Command.prototype.parse = function(argv) {
+  // implicit help
+  if (this.executables) this.addImplicitHelpCommand();
+
+  // store raw args
+  this.rawArgs = argv;
+
+  // guess name
+  this._name = this._name || basename(argv[1], '.js');
+
+  // github-style sub-commands with no sub-command
+  if (this.executables && argv.length < 3 && !this.defaultExecutable) {
+    // this user needs help
+    argv.push('--help');
+  }
+
+  // process argv
+  var parsed = this.parseOptions(this.normalize(argv.slice(2)));
+  var args = this.args = parsed.args;
+
+  var result = this.parseArgs(this.args, parsed.unknown);
+
+  // executable sub-commands
+  var name = result.args[0];
+
+  var aliasCommand = null;
+  // check alias of sub commands
+  if (name) {
+    aliasCommand = this.commands.filter(function(command) {
+      return command.alias() === name;
+    })[0];
+  }
+
+  if (this._execs[name] && typeof this._execs[name] !== 'function') {
+    return this.executeSubCommand(argv, args, parsed.unknown);
+  } else if (aliasCommand) {
+    // is alias of a subCommand
+    args[0] = aliasCommand._name;
+    return this.executeSubCommand(argv, args, parsed.unknown);
+  } else if (this.defaultExecutable) {
+    // use the default subcommand
+    args.unshift(this.defaultExecutable);
+    return this.executeSubCommand(argv, args, parsed.unknown);
+  }
+
+  return result;
+};
+
+/**
+ * Execute a sub-command executable.
+ *
+ * @param {Array} argv
+ * @param {Array} args
+ * @param {Array} unknown
+ * @api private
+ */
+
+Command.prototype.executeSubCommand = function(argv, args, unknown) {
+  args = args.concat(unknown);
+
+  if (!args.length) this.help();
+  if (args[0] === 'help' && args.length === 1) this.help();
+
+  // <cmd> --help
+  if (args[0] === 'help') {
+    args[0] = args[1];
+    args[1] = '--help';
+  }
+
+  // executable
+  var f = argv[1];
+  // name of the subcommand, link `pm-install`
+  var bin = basename(f, '.js') + '-' + args[0];
+
+  // In case of globally installed, get the base dir where executable
+  //  subcommand file should be located at
+  var baseDir,
+    link = fs.lstatSync(f).isSymbolicLink() ? fs.readlinkSync(f) : f;
+
+  // when symbolink is relative path
+  if (link !== f && link.charAt(0) !== '/') {
+    link = path.join(dirname(f), link);
+  }
+  baseDir = dirname(link);
+
+  // prefer local `./<bin>` to bin in the $PATH
+  var localBin = path.join(baseDir, bin);
+
+  // whether bin file is a js script with explicit `.js` extension
+  var isExplicitJS = false;
+  if (exists(localBin + '.js')) {
+    bin = localBin + '.js';
+    isExplicitJS = true;
+  } else if (exists(localBin)) {
+    bin = localBin;
+  }
+
+  args = args.slice(1);
+
+  var proc;
+  if (process.platform !== 'win32') {
+    if (isExplicitJS) {
+      args.unshift(bin);
+      // add executable arguments to spawn
+      args = (process.execArgv || []).concat(args);
+
+      proc = spawn(process.argv[0], args, { stdio: 'inherit', customFds: [0, 1, 2] });
+    } else {
+      proc = spawn(bin, args, { stdio: 'inherit', customFds: [0, 1, 2] });
+    }
+  } else {
+    args.unshift(bin);
+    proc = spawn(process.execPath, args, { stdio: 'inherit' });
+  }
+
+  var signals = ['SIGUSR1', 'SIGUSR2', 'SIGTERM', 'SIGINT', 'SIGHUP'];
+  signals.forEach(function(signal) {
+    process.on(signal, function() {
+      if (proc.killed === false && proc.exitCode === null) {
+        proc.kill(signal);
+      }
+    });
+  });
+  proc.on('close', process.exit.bind(process));
+  proc.on('error', function(err) {
+    if (err.code === 'ENOENT') {
+      console.error('\n  %s(1) does not exist, try --help\n', bin);
+    } else if (err.code === 'EACCES') {
+      console.error('\n  %s(1) not executable. try chmod or run with root\n', bin);
+    }
+    process.exit(1);
+  });
+
+  // Store the reference to the child process
+  this.runningCommand = proc;
+};
+
+/**
+ * Normalize `args`, splitting joined short flags. For example
+ * the arg "-abc" is equivalent to "-a -b -c".
+ * This also normalizes equal sign and splits "--abc=def" into "--abc def".
+ *
+ * @param {Array} args
+ * @return {Array}
+ * @api private
+ */
+
+Command.prototype.normalize = function(args) {
+  var ret = [],
+    arg,
+    lastOpt,
+    index;
+
+  for (var i = 0, len = args.length; i < len; ++i) {
+    arg = args[i];
+    if (i > 0) {
+      lastOpt = this.optionFor(args[i - 1]);
+    }
+
+    if (arg === '--') {
+      // Honor option terminator
+      ret = ret.concat(args.slice(i));
+      break;
+    } else if (lastOpt && lastOpt.required) {
+      ret.push(arg);
+    } else if (arg.length > 1 && arg[0] === '-' && arg[1] !== '-') {
+      arg.slice(1).split('').forEach(function(c) {
+        ret.push('-' + c);
+      });
+    } else if (/^--/.test(arg) && ~(index = arg.indexOf('='))) {
+      ret.push(arg.slice(0, index), arg.slice(index + 1));
+    } else {
+      ret.push(arg);
+    }
+  }
+
+  return ret;
+};
+
+/**
+ * Parse command `args`.
+ *
+ * When listener(s) are available those
+ * callbacks are invoked, otherwise the "*"
+ * event is emitted and those actions are invoked.
+ *
+ * @param {Array} args
+ * @return {Command} for chaining
+ * @api private
+ */
+
+Command.prototype.parseArgs = function(args, unknown) {
+  var name;
+
+  if (args.length) {
+    name = args[0];
+    if (this.listeners('command:' + name).length) {
+      this.emit('command:' + args.shift(), args, unknown);
+    } else {
+      this.emit('command:*', args);
+    }
+  } else {
+    outputHelpIfNecessary(this, unknown);
+
+    // If there were no args and we have unknown options,
+    // then they are extraneous and we need to error.
+    if (unknown.length > 0) {
+      this.unknownOption(unknown[0]);
+    }
+  }
+
+  return this;
+};
+
+/**
+ * Return an option matching `arg` if any.
+ *
+ * @param {String} arg
+ * @return {Option}
+ * @api private
+ */
+
+Command.prototype.optionFor = function(arg) {
+  for (var i = 0, len = this.options.length; i < len; ++i) {
+    if (this.options[i].is(arg)) {
+      return this.options[i];
+    }
+  }
+};
+
+/**
+ * Parse options from `argv` returning `argv`
+ * void of these options.
+ *
+ * @param {Array} argv
+ * @return {Array}
+ * @api public
+ */
+
+Command.prototype.parseOptions = function(argv) {
+  var args = [],
+    len = argv.length,
+    literal,
+    option,
+    arg;
+
+  var unknownOptions = [];
+
+  // parse options
+  for (var i = 0; i < len; ++i) {
+    arg = argv[i];
+
+    // literal args after --
+    if (literal) {
+      args.push(arg);
+      continue;
+    }
+
+    if (arg === '--') {
+      literal = true;
+      continue;
+    }
+
+    // find matching Option
+    option = this.optionFor(arg);
+
+    // option is defined
+    if (option) {
+      // requires arg
+      if (option.required) {
+        arg = argv[++i];
+        if (arg == null) return this.optionMissingArgument(option);
+        this.emit('option:' + option.name(), arg);
+      // optional arg
+      } else if (option.optional) {
+        arg = argv[i + 1];
+        if (arg == null || (arg[0] === '-' && arg !== '-')) {
+          arg = null;
+        } else {
+          ++i;
+        }
+        this.emit('option:' + option.name(), arg);
+      // bool
+      } else {
+        this.emit('option:' + option.name());
+      }
+      continue;
+    }
+
+    // looks like an option
+    if (arg.length > 1 && arg[0] === '-') {
+      unknownOptions.push(arg);
+
+      // If the next argument looks like it might be
+      // an argument for this option, we pass it on.
+      // If it isn't, then it'll simply be ignored
+      if ((i + 1) < argv.length && argv[i + 1][0] !== '-') {
+        unknownOptions.push(argv[++i]);
+      }
+      continue;
+    }
+
+    // arg
+    args.push(arg);
+  }
+
+  return { args: args, unknown: unknownOptions };
+};
+
+/**
+ * Return an object containing options as key-value pairs
+ *
+ * @return {Object}
+ * @api public
+ */
+Command.prototype.opts = function() {
+  var result = {},
+    len = this.options.length;
+
+  for (var i = 0; i < len; i++) {
+    var key = this.options[i].attributeName();
+    result[key] = key === this._versionOptionName ? this._version : this[key];
+  }
+  return result;
+};
+
+/**
+ * Argument `name` is missing.
+ *
+ * @param {String} name
+ * @api private
+ */
+
+Command.prototype.missingArgument = function(name) {
+  console.error();
+  console.error("  error: missing required argument `%s'", name);
+  console.error();
+  process.exit(1);
+};
+
+/**
+ * `Option` is missing an argument, but received `flag` or nothing.
+ *
+ * @param {String} option
+ * @param {String} flag
+ * @api private
+ */
+
+Command.prototype.optionMissingArgument = function(option, flag) {
+  console.error();
+  if (flag) {
+    console.error("  error: option `%s' argument missing, got `%s'", option.flags, flag);
+  } else {
+    console.error("  error: option `%s' argument missing", option.flags);
+  }
+  console.error();
+  process.exit(1);
+};
+
+/**
+ * Unknown option `flag`.
+ *
+ * @param {String} flag
+ * @api private
+ */
+
+Command.prototype.unknownOption = function(flag) {
+  if (this._allowUnknownOption) return;
+  console.error();
+  console.error("  error: unknown option `%s'", flag);
+  console.error();
+  process.exit(1);
+};
+
+/**
+ * Variadic argument with `name` is not the last argument as required.
+ *
+ * @param {String} name
+ * @api private
+ */
+
+Command.prototype.variadicArgNotLast = function(name) {
+  console.error();
+  console.error("  error: variadic arguments must be last `%s'", name);
+  console.error();
+  process.exit(1);
+};
+
+/**
+ * Set the program version to `str`.
+ *
+ * This method auto-registers the "-V, --version" flag
+ * which will print the version number when passed.
+ *
+ * @param {String} str
+ * @param {String} [flags]
+ * @return {Command} for chaining
+ * @api public
+ */
+
+Command.prototype.version = function(str, flags) {
+  if (arguments.length === 0) return this._version;
+  this._version = str;
+  flags = flags || '-V, --version';
+  var versionOption = new Option(flags, 'output the version number');
+  this._versionOptionName = versionOption.long.substr(2) || 'version';
+  this.options.push(versionOption);
+  this.on('option:' + this._versionOptionName, function() {
+    process.stdout.write(str + '\n');
+    process.exit(0);
+  });
+  return this;
+};
+
+/**
+ * Set the description to `str`.
+ *
+ * @param {String} str
+ * @param {Object} argsDescription
+ * @return {String|Command}
+ * @api public
+ */
+
+Command.prototype.description = function(str, argsDescription) {
+  if (arguments.length === 0) return this._description;
+  this._description = str;
+  this._argsDescription = argsDescription;
+  return this;
+};
+
+/**
+ * Set an alias for the command
+ *
+ * @param {String} alias
+ * @return {String|Command}
+ * @api public
+ */
+
+Command.prototype.alias = function(alias) {
+  var command = this;
+  if (this.commands.length !== 0) {
+    command = this.commands[this.commands.length - 1];
+  }
+
+  if (arguments.length === 0) return command._alias;
+
+  if (alias === command._name) throw new Error('Command alias can\'t be the same as its name');
+
+  command._alias = alias;
+  return this;
+};
+
+/**
+ * Set / get the command usage `str`.
+ *
+ * @param {String} str
+ * @return {String|Command}
+ * @api public
+ */
+
+Command.prototype.usage = function(str) {
+  var args = this._args.map(function(arg) {
+    return humanReadableArgName(arg);
+  });
+
+  var usage = '[options]' +
+    (this.commands.length ? ' [command]' : '') +
+    (this._args.length ? ' ' + args.join(' ') : '');
+
+  if (arguments.length === 0) return this._usage || usage;
+  this._usage = str;
+
+  return this;
+};
+
+/**
+ * Get or set the name of the command
+ *
+ * @param {String} str
+ * @return {String|Command}
+ * @api public
+ */
+
+Command.prototype.name = function(str) {
+  if (arguments.length === 0) return this._name;
+  this._name = str;
+  return this;
+};
+
+/**
+ * Return prepared commands.
+ *
+ * @return {Array}
+ * @api private
+ */
+
+Command.prototype.prepareCommands = function() {
+  return this.commands.filter(function(cmd) {
+    return !cmd._noHelp;
+  }).map(function(cmd) {
+    var args = cmd._args.map(function(arg) {
+      return humanReadableArgName(arg);
+    }).join(' ');
+
+    return [
+      cmd._name +
+        (cmd._alias ? '|' + cmd._alias : '') +
+        (cmd.options.length ? ' [options]' : '') +
+        (args ? ' ' + args : ''),
+      cmd._description
+    ];
+  });
+};
+
+/**
+ * Return the largest command length.
+ *
+ * @return {Number}
+ * @api private
+ */
+
+Command.prototype.largestCommandLength = function() {
+  var commands = this.prepareCommands();
+  return commands.reduce(function(max, command) {
+    return Math.max(max, command[0].length);
+  }, 0);
+};
+
+/**
+ * Return the largest option length.
+ *
+ * @return {Number}
+ * @api private
+ */
+
+Command.prototype.largestOptionLength = function() {
+  var options = [].slice.call(this.options);
+  options.push({
+    flags: '-h, --help'
+  });
+  return options.reduce(function(max, option) {
+    return Math.max(max, option.flags.length);
+  }, 0);
+};
+
+/**
+ * Return the largest arg length.
+ *
+ * @return {Number}
+ * @api private
+ */
+
+Command.prototype.largestArgLength = function() {
+  return this._args.reduce(function(max, arg) {
+    return Math.max(max, arg.name.length);
+  }, 0);
+};
+
+/**
+ * Return the pad width.
+ *
+ * @return {Number}
+ * @api private
+ */
+
+Command.prototype.padWidth = function() {
+  var width = this.largestOptionLength();
+  if (this._argsDescription && this._args.length) {
+    if (this.largestArgLength() > width) {
+      width = this.largestArgLength();
+    }
+  }
+
+  if (this.commands && this.commands.length) {
+    if (this.largestCommandLength() > width) {
+      width = this.largestCommandLength();
+    }
+  }
+
+  return width;
+};
+
+/**
+ * Return help for options.
+ *
+ * @return {String}
+ * @api private
+ */
+
+Command.prototype.optionHelp = function() {
+  var width = this.padWidth();
+
+  // Append the help information
+  return this.options.map(function(option) {
+    return pad(option.flags, width) + '  ' + option.description +
+      ((option.bool && option.defaultValue !== undefined) ? ' (default: ' + option.defaultValue + ')' : '');
+  }).concat([pad('-h, --help', width) + '  ' + 'output usage information'])
+    .join('\n');
+};
+
+/**
+ * Return command help documentation.
+ *
+ * @return {String}
+ * @api private
+ */
+
+Command.prototype.commandHelp = function() {
+  if (!this.commands.length) return '';
+
+  var commands = this.prepareCommands();
+  var width = this.padWidth();
+
+  return [
+    '  Commands:',
+    '',
+    commands.map(function(cmd) {
+      var desc = cmd[1] ? '  ' + cmd[1] : '';
+      return (desc ? pad(cmd[0], width) : cmd[0]) + desc;
+    }).join('\n').replace(/^/gm, '    '),
+    ''
+  ].join('\n');
+};
+
+/**
+ * Return program help documentation.
+ *
+ * @return {String}
+ * @api private
+ */
+
+Command.prototype.helpInformation = function() {
+  var desc = [];
+  if (this._description) {
+    desc = [
+      '  ' + this._description,
+      ''
+    ];
+
+    var argsDescription = this._argsDescription;
+    if (argsDescription && this._args.length) {
+      var width = this.padWidth();
+      desc.push('  Arguments:');
+      desc.push('');
+      this._args.forEach(function(arg) {
+        desc.push('    ' + pad(arg.name, width) + '  ' + argsDescription[arg.name]);
+      });
+      desc.push('');
+    }
+  }
+
+  var cmdName = this._name;
+  if (this._alias) {
+    cmdName = cmdName + '|' + this._alias;
+  }
+  var usage = [
+    '',
+    '  Usage: ' + cmdName + ' ' + this.usage(),
+    ''
+  ];
+
+  var cmds = [];
+  var commandHelp = this.commandHelp();
+  if (commandHelp) cmds = [commandHelp];
+
+  var options = [
+    '  Options:',
+    '',
+    '' + this.optionHelp().replace(/^/gm, '    '),
+    ''
+  ];
+
+  return usage
+    .concat(desc)
+    .concat(options)
+    .concat(cmds)
+    .join('\n');
+};
+
+/**
+ * Output help information for this command
+ *
+ * @api public
+ */
+
+Command.prototype.outputHelp = function(cb) {
+  if (!cb) {
+    cb = function(passthru) {
+      return passthru;
+    };
+  }
+  process.stdout.write(cb(this.helpInformation()));
+  this.emit('--help');
+};
+
+/**
+ * Output help information and exit.
+ *
+ * @api public
+ */
+
+Command.prototype.help = function(cb) {
+  this.outputHelp(cb);
+  process.exit();
+};
+
+/**
+ * Camel-case the given `flag`
+ *
+ * @param {String} flag
+ * @return {String}
+ * @api private
+ */
+
+function camelcase(flag) {
+  return flag.split('-').reduce(function(str, word) {
+    return str + word[0].toUpperCase() + word.slice(1);
+  });
+}
+
+/**
+ * Pad `str` to `width`.
+ *
+ * @param {String} str
+ * @param {Number} width
+ * @return {String}
+ * @api private
+ */
+
+function pad(str, width) {
+  var len = Math.max(0, width - str.length);
+  return str + Array(len + 1).join(' ');
+}
+
+/**
+ * Output help information if necessary
+ *
+ * @param {Command} command to output help for
+ * @param {Array} array of options to search for -h or --help
+ * @api private
+ */
+
+function outputHelpIfNecessary(cmd, options) {
+  options = options || [];
+  for (var i = 0; i < options.length; i++) {
+    if (options[i] === '--help' || options[i] === '-h') {
+      cmd.outputHelp();
+      process.exit(0);
+    }
+  }
+}
+
+/**
+ * Takes an argument an returns its human readable equivalent for help usage.
+ *
+ * @param {Object} arg
+ * @return {String}
+ * @api private
+ */
+
+function humanReadableArgName(arg) {
+  var nameOutput = arg.name + (arg.variadic === true ? '...' : '');
+
+  return arg.required
+    ? '<' + nameOutput + '>'
+    : '[' + nameOutput + ']';
+}
+
+// for versions before node v0.8 when there weren't `fs.existsSync`
+function exists(file) {
+  try {
+    if (fs.statSync(file).isFile()) {
+      return true;
+    }
+  } catch (e) {
+    return false;
+  }
+}
+
+
+/***/ }),
+/* 339 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var util = __webpack_require__(106);
+
+module.exports = SchemaObject;
+
+function SchemaObject(obj) {
+  util.copy(obj, this);
+}
+
+
+/***/ }),
+/* 340 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function generate__limit(it, $keyword, $ruleType) {
+  var out = ' ';
+  var $lvl = it.level;
+  var $dataLvl = it.dataLevel;
+  var $schema = it.schema[$keyword];
+  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
+  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
+  var $breakOnError = !it.opts.allErrors;
+  var $errorKeyword;
+  var $data = 'data' + ($dataLvl || '');
+  var $isData = it.opts.$data && $schema && $schema.$data,
+    $schemaValue;
+  if ($isData) {
+    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
+    $schemaValue = 'schema' + $lvl;
+  } else {
+    $schemaValue = $schema;
+  }
+  var $isMax = $keyword == 'maximum',
+    $exclusiveKeyword = $isMax ? 'exclusiveMaximum' : 'exclusiveMinimum',
+    $schemaExcl = it.schema[$exclusiveKeyword],
+    $isDataExcl = it.opts.$data && $schemaExcl && $schemaExcl.$data,
+    $op = $isMax ? '<' : '>',
+    $notOp = $isMax ? '>' : '<',
+    $errorKeyword = undefined;
+  if ($isDataExcl) {
+    var $schemaValueExcl = it.util.getData($schemaExcl.$data, $dataLvl, it.dataPathArr),
+      $exclusive = 'exclusive' + $lvl,
+      $exclType = 'exclType' + $lvl,
+      $exclIsNumber = 'exclIsNumber' + $lvl,
+      $opExpr = 'op' + $lvl,
+      $opStr = '\' + ' + $opExpr + ' + \'';
+    out += ' var schemaExcl' + ($lvl) + ' = ' + ($schemaValueExcl) + '; ';
+    $schemaValueExcl = 'schemaExcl' + $lvl;
+    out += ' var ' + ($exclusive) + '; var ' + ($exclType) + ' = typeof ' + ($schemaValueExcl) + '; if (' + ($exclType) + ' != \'boolean\' && ' + ($exclType) + ' != \'undefined\' && ' + ($exclType) + ' != \'number\') { ';
+    var $errorKeyword = $exclusiveKeyword;
+    var $$outStack = $$outStack || [];
+    $$outStack.push(out);
+    out = ''; /* istanbul ignore else */
+    if (it.createErrors !== false) {
+      out += ' { keyword: \'' + ($errorKeyword || '_exclusiveLimit') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: {} ';
+      if (it.opts.messages !== false) {
+        out += ' , message: \'' + ($exclusiveKeyword) + ' should be boolean\' ';
+      }
+      if (it.opts.verbose) {
+        out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+      }
+      out += ' } ';
+    } else {
+      out += ' {} ';
+    }
+    var __err = out;
+    out = $$outStack.pop();
+    if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+      if (it.async) {
+        out += ' throw new ValidationError([' + (__err) + ']); ';
+      } else {
+        out += ' validate.errors = [' + (__err) + ']; return false; ';
+      }
+    } else {
+      out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+    }
+    out += ' } else if ( ';
+    if ($isData) {
+      out += ' (' + ($schemaValue) + ' !== undefined && typeof ' + ($schemaValue) + ' != \'number\') || ';
+    }
+    out += ' ' + ($exclType) + ' == \'number\' ? ( (' + ($exclusive) + ' = ' + ($schemaValue) + ' === undefined || ' + ($schemaValueExcl) + ' ' + ($op) + '= ' + ($schemaValue) + ') ? ' + ($data) + ' ' + ($notOp) + '= ' + ($schemaValueExcl) + ' : ' + ($data) + ' ' + ($notOp) + ' ' + ($schemaValue) + ' ) : ( (' + ($exclusive) + ' = ' + ($schemaValueExcl) + ' === true) ? ' + ($data) + ' ' + ($notOp) + '= ' + ($schemaValue) + ' : ' + ($data) + ' ' + ($notOp) + ' ' + ($schemaValue) + ' ) || ' + ($data) + ' !== ' + ($data) + ') { var op' + ($lvl) + ' = ' + ($exclusive) + ' ? \'' + ($op) + '\' : \'' + ($op) + '=\';';
+  } else {
+    var $exclIsNumber = typeof $schemaExcl == 'number',
+      $opStr = $op;
+    if ($exclIsNumber && $isData) {
+      var $opExpr = '\'' + $opStr + '\'';
+      out += ' if ( ';
+      if ($isData) {
+        out += ' (' + ($schemaValue) + ' !== undefined && typeof ' + ($schemaValue) + ' != \'number\') || ';
+      }
+      out += ' ( ' + ($schemaValue) + ' === undefined || ' + ($schemaExcl) + ' ' + ($op) + '= ' + ($schemaValue) + ' ? ' + ($data) + ' ' + ($notOp) + '= ' + ($schemaExcl) + ' : ' + ($data) + ' ' + ($notOp) + ' ' + ($schemaValue) + ' ) || ' + ($data) + ' !== ' + ($data) + ') { ';
+    } else {
+      if ($exclIsNumber && $schema === undefined) {
+        $exclusive = true;
+        $errorKeyword = $exclusiveKeyword;
+        $errSchemaPath = it.errSchemaPath + '/' + $exclusiveKeyword;
+        $schemaValue = $schemaExcl;
+        $notOp += '=';
+      } else {
+        if ($exclIsNumber) $schemaValue = Math[$isMax ? 'min' : 'max']($schemaExcl, $schema);
+        if ($schemaExcl === ($exclIsNumber ? $schemaValue : true)) {
+          $exclusive = true;
+          $errorKeyword = $exclusiveKeyword;
+          $errSchemaPath = it.errSchemaPath + '/' + $exclusiveKeyword;
+          $notOp += '=';
+        } else {
+          $exclusive = false;
+          $opStr += '=';
+        }
+      }
+      var $opExpr = '\'' + $opStr + '\'';
+      out += ' if ( ';
+      if ($isData) {
+        out += ' (' + ($schemaValue) + ' !== undefined && typeof ' + ($schemaValue) + ' != \'number\') || ';
+      }
+      out += ' ' + ($data) + ' ' + ($notOp) + ' ' + ($schemaValue) + ' || ' + ($data) + ' !== ' + ($data) + ') { ';
+    }
+  }
+  $errorKeyword = $errorKeyword || $keyword;
+  var $$outStack = $$outStack || [];
+  $$outStack.push(out);
+  out = ''; /* istanbul ignore else */
+  if (it.createErrors !== false) {
+    out += ' { keyword: \'' + ($errorKeyword || '_limit') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { comparison: ' + ($opExpr) + ', limit: ' + ($schemaValue) + ', exclusive: ' + ($exclusive) + ' } ';
+    if (it.opts.messages !== false) {
+      out += ' , message: \'should be ' + ($opStr) + ' ';
+      if ($isData) {
+        out += '\' + ' + ($schemaValue);
+      } else {
+        out += '' + ($schemaValue) + '\'';
+      }
+    }
+    if (it.opts.verbose) {
+      out += ' , schema:  ';
+      if ($isData) {
+        out += 'validate.schema' + ($schemaPath);
+      } else {
+        out += '' + ($schema);
+      }
+      out += '         , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+    }
+    out += ' } ';
+  } else {
+    out += ' {} ';
+  }
+  var __err = out;
+  out = $$outStack.pop();
+  if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+    if (it.async) {
+      out += ' throw new ValidationError([' + (__err) + ']); ';
+    } else {
+      out += ' validate.errors = [' + (__err) + ']; return false; ';
+    }
+  } else {
+    out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+  }
+  out += ' } ';
+  if ($breakOnError) {
+    out += ' else { ';
+  }
+  return out;
+}
+
+
+/***/ }),
+/* 341 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function generate__limitItems(it, $keyword, $ruleType) {
+  var out = ' ';
+  var $lvl = it.level;
+  var $dataLvl = it.dataLevel;
+  var $schema = it.schema[$keyword];
+  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
+  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
+  var $breakOnError = !it.opts.allErrors;
+  var $errorKeyword;
+  var $data = 'data' + ($dataLvl || '');
+  var $isData = it.opts.$data && $schema && $schema.$data,
+    $schemaValue;
+  if ($isData) {
+    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
+    $schemaValue = 'schema' + $lvl;
+  } else {
+    $schemaValue = $schema;
+  }
+  var $op = $keyword == 'maxItems' ? '>' : '<';
+  out += 'if ( ';
+  if ($isData) {
+    out += ' (' + ($schemaValue) + ' !== undefined && typeof ' + ($schemaValue) + ' != \'number\') || ';
+  }
+  out += ' ' + ($data) + '.length ' + ($op) + ' ' + ($schemaValue) + ') { ';
+  var $errorKeyword = $keyword;
+  var $$outStack = $$outStack || [];
+  $$outStack.push(out);
+  out = ''; /* istanbul ignore else */
+  if (it.createErrors !== false) {
+    out += ' { keyword: \'' + ($errorKeyword || '_limitItems') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { limit: ' + ($schemaValue) + ' } ';
+    if (it.opts.messages !== false) {
+      out += ' , message: \'should NOT have ';
+      if ($keyword == 'maxItems') {
+        out += 'more';
+      } else {
+        out += 'less';
+      }
+      out += ' than ';
+      if ($isData) {
+        out += '\' + ' + ($schemaValue) + ' + \'';
+      } else {
+        out += '' + ($schema);
+      }
+      out += ' items\' ';
+    }
+    if (it.opts.verbose) {
+      out += ' , schema:  ';
+      if ($isData) {
+        out += 'validate.schema' + ($schemaPath);
+      } else {
+        out += '' + ($schema);
+      }
+      out += '         , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+    }
+    out += ' } ';
+  } else {
+    out += ' {} ';
+  }
+  var __err = out;
+  out = $$outStack.pop();
+  if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+    if (it.async) {
+      out += ' throw new ValidationError([' + (__err) + ']); ';
+    } else {
+      out += ' validate.errors = [' + (__err) + ']; return false; ';
+    }
+  } else {
+    out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+  }
+  out += '} ';
+  if ($breakOnError) {
+    out += ' else { ';
+  }
+  return out;
+}
+
+
+/***/ }),
+/* 342 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function generate__limitLength(it, $keyword, $ruleType) {
+  var out = ' ';
+  var $lvl = it.level;
+  var $dataLvl = it.dataLevel;
+  var $schema = it.schema[$keyword];
+  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
+  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
+  var $breakOnError = !it.opts.allErrors;
+  var $errorKeyword;
+  var $data = 'data' + ($dataLvl || '');
+  var $isData = it.opts.$data && $schema && $schema.$data,
+    $schemaValue;
+  if ($isData) {
+    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
+    $schemaValue = 'schema' + $lvl;
+  } else {
+    $schemaValue = $schema;
+  }
+  var $op = $keyword == 'maxLength' ? '>' : '<';
+  out += 'if ( ';
+  if ($isData) {
+    out += ' (' + ($schemaValue) + ' !== undefined && typeof ' + ($schemaValue) + ' != \'number\') || ';
+  }
+  if (it.opts.unicode === false) {
+    out += ' ' + ($data) + '.length ';
+  } else {
+    out += ' ucs2length(' + ($data) + ') ';
+  }
+  out += ' ' + ($op) + ' ' + ($schemaValue) + ') { ';
+  var $errorKeyword = $keyword;
+  var $$outStack = $$outStack || [];
+  $$outStack.push(out);
+  out = ''; /* istanbul ignore else */
+  if (it.createErrors !== false) {
+    out += ' { keyword: \'' + ($errorKeyword || '_limitLength') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { limit: ' + ($schemaValue) + ' } ';
+    if (it.opts.messages !== false) {
+      out += ' , message: \'should NOT be ';
+      if ($keyword == 'maxLength') {
+        out += 'longer';
+      } else {
+        out += 'shorter';
+      }
+      out += ' than ';
+      if ($isData) {
+        out += '\' + ' + ($schemaValue) + ' + \'';
+      } else {
+        out += '' + ($schema);
+      }
+      out += ' characters\' ';
+    }
+    if (it.opts.verbose) {
+      out += ' , schema:  ';
+      if ($isData) {
+        out += 'validate.schema' + ($schemaPath);
+      } else {
+        out += '' + ($schema);
+      }
+      out += '         , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+    }
+    out += ' } ';
+  } else {
+    out += ' {} ';
+  }
+  var __err = out;
+  out = $$outStack.pop();
+  if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+    if (it.async) {
+      out += ' throw new ValidationError([' + (__err) + ']); ';
+    } else {
+      out += ' validate.errors = [' + (__err) + ']; return false; ';
+    }
+  } else {
+    out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+  }
+  out += '} ';
+  if ($breakOnError) {
+    out += ' else { ';
+  }
+  return out;
+}
+
+
+/***/ }),
+/* 343 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function generate__limitProperties(it, $keyword, $ruleType) {
+  var out = ' ';
+  var $lvl = it.level;
+  var $dataLvl = it.dataLevel;
+  var $schema = it.schema[$keyword];
+  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
+  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
+  var $breakOnError = !it.opts.allErrors;
+  var $errorKeyword;
+  var $data = 'data' + ($dataLvl || '');
+  var $isData = it.opts.$data && $schema && $schema.$data,
+    $schemaValue;
+  if ($isData) {
+    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
+    $schemaValue = 'schema' + $lvl;
+  } else {
+    $schemaValue = $schema;
+  }
+  var $op = $keyword == 'maxProperties' ? '>' : '<';
+  out += 'if ( ';
+  if ($isData) {
+    out += ' (' + ($schemaValue) + ' !== undefined && typeof ' + ($schemaValue) + ' != \'number\') || ';
+  }
+  out += ' Object.keys(' + ($data) + ').length ' + ($op) + ' ' + ($schemaValue) + ') { ';
+  var $errorKeyword = $keyword;
+  var $$outStack = $$outStack || [];
+  $$outStack.push(out);
+  out = ''; /* istanbul ignore else */
+  if (it.createErrors !== false) {
+    out += ' { keyword: \'' + ($errorKeyword || '_limitProperties') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { limit: ' + ($schemaValue) + ' } ';
+    if (it.opts.messages !== false) {
+      out += ' , message: \'should NOT have ';
+      if ($keyword == 'maxProperties') {
+        out += 'more';
+      } else {
+        out += 'less';
+      }
+      out += ' than ';
+      if ($isData) {
+        out += '\' + ' + ($schemaValue) + ' + \'';
+      } else {
+        out += '' + ($schema);
+      }
+      out += ' properties\' ';
+    }
+    if (it.opts.verbose) {
+      out += ' , schema:  ';
+      if ($isData) {
+        out += 'validate.schema' + ($schemaPath);
+      } else {
+        out += '' + ($schema);
+      }
+      out += '         , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+    }
+    out += ' } ';
+  } else {
+    out += ' {} ';
+  }
+  var __err = out;
+  out = $$outStack.pop();
+  if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+    if (it.async) {
+      out += ' throw new ValidationError([' + (__err) + ']); ';
+    } else {
+      out += ' validate.errors = [' + (__err) + ']; return false; ';
+    }
+  } else {
+    out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+  }
+  out += '} ';
+  if ($breakOnError) {
+    out += ' else { ';
+  }
+  return out;
+}
+
+
+/***/ }),
+/* 344 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function generate_validate(it, $keyword, $ruleType) {
+  var out = '';
+  var $async = it.schema.$async === true,
+    $refKeywords = it.util.schemaHasRulesExcept(it.schema, it.RULES.all, '$ref'),
+    $id = it.self._getId(it.schema);
+  if (it.isTop) {
+    if ($async) {
+      it.async = true;
+      var $es7 = it.opts.async == 'es7';
+      it.yieldAwait = $es7 ? 'await' : 'yield';
+    }
+    out += ' var validate = ';
+    if ($async) {
+      if ($es7) {
+        out += ' (async function ';
+      } else {
+        if (it.opts.async != '*') {
+          out += 'co.wrap';
+        }
+        out += '(function* ';
+      }
+    } else {
+      out += ' (function ';
+    }
+    out += ' (data, dataPath, parentData, parentDataProperty, rootData) { \'use strict\'; ';
+    if ($id && (it.opts.sourceCode || it.opts.processCode)) {
+      out += ' ' + ('/\*# sourceURL=' + $id + ' */') + ' ';
+    }
+  }
+  if (typeof it.schema == 'boolean' || !($refKeywords || it.schema.$ref)) {
+    var $keyword = 'false schema';
+    var $lvl = it.level;
+    var $dataLvl = it.dataLevel;
+    var $schema = it.schema[$keyword];
+    var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
+    var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
+    var $breakOnError = !it.opts.allErrors;
+    var $errorKeyword;
+    var $data = 'data' + ($dataLvl || '');
+    var $valid = 'valid' + $lvl;
+    if (it.schema === false) {
+      if (it.isTop) {
+        $breakOnError = true;
+      } else {
+        out += ' var ' + ($valid) + ' = false; ';
+      }
+      var $$outStack = $$outStack || [];
+      $$outStack.push(out);
+      out = ''; /* istanbul ignore else */
+      if (it.createErrors !== false) {
+        out += ' { keyword: \'' + ($errorKeyword || 'false schema') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: {} ';
+        if (it.opts.messages !== false) {
+          out += ' , message: \'boolean schema is false\' ';
+        }
+        if (it.opts.verbose) {
+          out += ' , schema: false , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+        }
+        out += ' } ';
+      } else {
+        out += ' {} ';
+      }
+      var __err = out;
+      out = $$outStack.pop();
+      if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+        if (it.async) {
+          out += ' throw new ValidationError([' + (__err) + ']); ';
+        } else {
+          out += ' validate.errors = [' + (__err) + ']; return false; ';
+        }
+      } else {
+        out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+      }
+    } else {
+      if (it.isTop) {
+        if ($async) {
+          out += ' return data; ';
+        } else {
+          out += ' validate.errors = null; return true; ';
+        }
+      } else {
+        out += ' var ' + ($valid) + ' = true; ';
+      }
+    }
+    if (it.isTop) {
+      out += ' }); return validate; ';
+    }
+    return out;
+  }
+  if (it.isTop) {
+    var $top = it.isTop,
+      $lvl = it.level = 0,
+      $dataLvl = it.dataLevel = 0,
+      $data = 'data';
+    it.rootId = it.resolve.fullPath(it.self._getId(it.root.schema));
+    it.baseId = it.baseId || it.rootId;
+    delete it.isTop;
+    it.dataPathArr = [undefined];
+    out += ' var vErrors = null; ';
+    out += ' var errors = 0;     ';
+    out += ' if (rootData === undefined) rootData = data; ';
+  } else {
+    var $lvl = it.level,
+      $dataLvl = it.dataLevel,
+      $data = 'data' + ($dataLvl || '');
+    if ($id) it.baseId = it.resolve.url(it.baseId, $id);
+    if ($async && !it.async) throw new Error('async schema in sync schema');
+    out += ' var errs_' + ($lvl) + ' = errors;';
+  }
+  var $valid = 'valid' + $lvl,
+    $breakOnError = !it.opts.allErrors,
+    $closingBraces1 = '',
+    $closingBraces2 = '';
+  var $errorKeyword;
+  var $typeSchema = it.schema.type,
+    $typeIsArray = Array.isArray($typeSchema);
+  if ($typeIsArray && $typeSchema.length == 1) {
+    $typeSchema = $typeSchema[0];
+    $typeIsArray = false;
+  }
+  if (it.schema.$ref && $refKeywords) {
+    if (it.opts.extendRefs == 'fail') {
+      throw new Error('$ref: validation keywords used in schema at path "' + it.errSchemaPath + '" (see option extendRefs)');
+    } else if (it.opts.extendRefs !== true) {
+      $refKeywords = false;
+      it.logger.warn('$ref: keywords ignored in schema at path "' + it.errSchemaPath + '"');
+    }
+  }
+  if ($typeSchema) {
+    if (it.opts.coerceTypes) {
+      var $coerceToTypes = it.util.coerceToTypes(it.opts.coerceTypes, $typeSchema);
+    }
+    var $rulesGroup = it.RULES.types[$typeSchema];
+    if ($coerceToTypes || $typeIsArray || $rulesGroup === true || ($rulesGroup && !$shouldUseGroup($rulesGroup))) {
+      var $schemaPath = it.schemaPath + '.type',
+        $errSchemaPath = it.errSchemaPath + '/type';
+      var $schemaPath = it.schemaPath + '.type',
+        $errSchemaPath = it.errSchemaPath + '/type',
+        $method = $typeIsArray ? 'checkDataTypes' : 'checkDataType';
+      out += ' if (' + (it.util[$method]($typeSchema, $data, true)) + ') { ';
+      if ($coerceToTypes) {
+        var $dataType = 'dataType' + $lvl,
+          $coerced = 'coerced' + $lvl;
+        out += ' var ' + ($dataType) + ' = typeof ' + ($data) + '; ';
+        if (it.opts.coerceTypes == 'array') {
+          out += ' if (' + ($dataType) + ' == \'object\' && Array.isArray(' + ($data) + ')) ' + ($dataType) + ' = \'array\'; ';
+        }
+        out += ' var ' + ($coerced) + ' = undefined; ';
+        var $bracesCoercion = '';
+        var arr1 = $coerceToTypes;
+        if (arr1) {
+          var $type, $i = -1,
+            l1 = arr1.length - 1;
+          while ($i < l1) {
+            $type = arr1[$i += 1];
+            if ($i) {
+              out += ' if (' + ($coerced) + ' === undefined) { ';
+              $bracesCoercion += '}';
+            }
+            if (it.opts.coerceTypes == 'array' && $type != 'array') {
+              out += ' if (' + ($dataType) + ' == \'array\' && ' + ($data) + '.length == 1) { ' + ($coerced) + ' = ' + ($data) + ' = ' + ($data) + '[0]; ' + ($dataType) + ' = typeof ' + ($data) + ';  } ';
+            }
+            if ($type == 'string') {
+              out += ' if (' + ($dataType) + ' == \'number\' || ' + ($dataType) + ' == \'boolean\') ' + ($coerced) + ' = \'\' + ' + ($data) + '; else if (' + ($data) + ' === null) ' + ($coerced) + ' = \'\'; ';
+            } else if ($type == 'number' || $type == 'integer') {
+              out += ' if (' + ($dataType) + ' == \'boolean\' || ' + ($data) + ' === null || (' + ($dataType) + ' == \'string\' && ' + ($data) + ' && ' + ($data) + ' == +' + ($data) + ' ';
+              if ($type == 'integer') {
+                out += ' && !(' + ($data) + ' % 1)';
+              }
+              out += ')) ' + ($coerced) + ' = +' + ($data) + '; ';
+            } else if ($type == 'boolean') {
+              out += ' if (' + ($data) + ' === \'false\' || ' + ($data) + ' === 0 || ' + ($data) + ' === null) ' + ($coerced) + ' = false; else if (' + ($data) + ' === \'true\' || ' + ($data) + ' === 1) ' + ($coerced) + ' = true; ';
+            } else if ($type == 'null') {
+              out += ' if (' + ($data) + ' === \'\' || ' + ($data) + ' === 0 || ' + ($data) + ' === false) ' + ($coerced) + ' = null; ';
+            } else if (it.opts.coerceTypes == 'array' && $type == 'array') {
+              out += ' if (' + ($dataType) + ' == \'string\' || ' + ($dataType) + ' == \'number\' || ' + ($dataType) + ' == \'boolean\' || ' + ($data) + ' == null) ' + ($coerced) + ' = [' + ($data) + ']; ';
+            }
+          }
+        }
+        out += ' ' + ($bracesCoercion) + ' if (' + ($coerced) + ' === undefined) {   ';
+        var $$outStack = $$outStack || [];
+        $$outStack.push(out);
+        out = ''; /* istanbul ignore else */
+        if (it.createErrors !== false) {
+          out += ' { keyword: \'' + ($errorKeyword || 'type') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { type: \'';
+          if ($typeIsArray) {
+            out += '' + ($typeSchema.join(","));
+          } else {
+            out += '' + ($typeSchema);
+          }
+          out += '\' } ';
+          if (it.opts.messages !== false) {
+            out += ' , message: \'should be ';
+            if ($typeIsArray) {
+              out += '' + ($typeSchema.join(","));
+            } else {
+              out += '' + ($typeSchema);
+            }
+            out += '\' ';
+          }
+          if (it.opts.verbose) {
+            out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+          }
+          out += ' } ';
+        } else {
+          out += ' {} ';
+        }
+        var __err = out;
+        out = $$outStack.pop();
+        if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+          if (it.async) {
+            out += ' throw new ValidationError([' + (__err) + ']); ';
+          } else {
+            out += ' validate.errors = [' + (__err) + ']; return false; ';
+          }
+        } else {
+          out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+        }
+        out += ' } else {  ';
+        var $parentData = $dataLvl ? 'data' + (($dataLvl - 1) || '') : 'parentData',
+          $parentDataProperty = $dataLvl ? it.dataPathArr[$dataLvl] : 'parentDataProperty';
+        out += ' ' + ($data) + ' = ' + ($coerced) + '; ';
+        if (!$dataLvl) {
+          out += 'if (' + ($parentData) + ' !== undefined)';
+        }
+        out += ' ' + ($parentData) + '[' + ($parentDataProperty) + '] = ' + ($coerced) + '; } ';
+      } else {
+        var $$outStack = $$outStack || [];
+        $$outStack.push(out);
+        out = ''; /* istanbul ignore else */
+        if (it.createErrors !== false) {
+          out += ' { keyword: \'' + ($errorKeyword || 'type') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { type: \'';
+          if ($typeIsArray) {
+            out += '' + ($typeSchema.join(","));
+          } else {
+            out += '' + ($typeSchema);
+          }
+          out += '\' } ';
+          if (it.opts.messages !== false) {
+            out += ' , message: \'should be ';
+            if ($typeIsArray) {
+              out += '' + ($typeSchema.join(","));
+            } else {
+              out += '' + ($typeSchema);
+            }
+            out += '\' ';
+          }
+          if (it.opts.verbose) {
+            out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+          }
+          out += ' } ';
+        } else {
+          out += ' {} ';
+        }
+        var __err = out;
+        out = $$outStack.pop();
+        if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+          if (it.async) {
+            out += ' throw new ValidationError([' + (__err) + ']); ';
+          } else {
+            out += ' validate.errors = [' + (__err) + ']; return false; ';
+          }
+        } else {
+          out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+        }
+      }
+      out += ' } ';
+    }
+  }
+  if (it.schema.$ref && !$refKeywords) {
+    out += ' ' + (it.RULES.all.$ref.code(it, '$ref')) + ' ';
+    if ($breakOnError) {
+      out += ' } if (errors === ';
+      if ($top) {
+        out += '0';
+      } else {
+        out += 'errs_' + ($lvl);
+      }
+      out += ') { ';
+      $closingBraces2 += '}';
+    }
+  } else {
+    if (it.opts.v5 && it.schema.patternGroups) {
+      it.logger.warn('keyword "patternGroups" is deprecated and disabled. Use option patternGroups: true to enable.');
+    }
+    var arr2 = it.RULES;
+    if (arr2) {
+      var $rulesGroup, i2 = -1,
+        l2 = arr2.length - 1;
+      while (i2 < l2) {
+        $rulesGroup = arr2[i2 += 1];
+        if ($shouldUseGroup($rulesGroup)) {
+          if ($rulesGroup.type) {
+            out += ' if (' + (it.util.checkDataType($rulesGroup.type, $data)) + ') { ';
+          }
+          if (it.opts.useDefaults && !it.compositeRule) {
+            if ($rulesGroup.type == 'object' && it.schema.properties) {
+              var $schema = it.schema.properties,
+                $schemaKeys = Object.keys($schema);
+              var arr3 = $schemaKeys;
+              if (arr3) {
+                var $propertyKey, i3 = -1,
+                  l3 = arr3.length - 1;
+                while (i3 < l3) {
+                  $propertyKey = arr3[i3 += 1];
+                  var $sch = $schema[$propertyKey];
+                  if ($sch.default !== undefined) {
+                    var $passData = $data + it.util.getProperty($propertyKey);
+                    out += '  if (' + ($passData) + ' === undefined) ' + ($passData) + ' = ';
+                    if (it.opts.useDefaults == 'shared') {
+                      out += ' ' + (it.useDefault($sch.default)) + ' ';
+                    } else {
+                      out += ' ' + (JSON.stringify($sch.default)) + ' ';
+                    }
+                    out += '; ';
+                  }
+                }
+              }
+            } else if ($rulesGroup.type == 'array' && Array.isArray(it.schema.items)) {
+              var arr4 = it.schema.items;
+              if (arr4) {
+                var $sch, $i = -1,
+                  l4 = arr4.length - 1;
+                while ($i < l4) {
+                  $sch = arr4[$i += 1];
+                  if ($sch.default !== undefined) {
+                    var $passData = $data + '[' + $i + ']';
+                    out += '  if (' + ($passData) + ' === undefined) ' + ($passData) + ' = ';
+                    if (it.opts.useDefaults == 'shared') {
+                      out += ' ' + (it.useDefault($sch.default)) + ' ';
+                    } else {
+                      out += ' ' + (JSON.stringify($sch.default)) + ' ';
+                    }
+                    out += '; ';
+                  }
+                }
+              }
+            }
+          }
+          var arr5 = $rulesGroup.rules;
+          if (arr5) {
+            var $rule, i5 = -1,
+              l5 = arr5.length - 1;
+            while (i5 < l5) {
+              $rule = arr5[i5 += 1];
+              if ($shouldUseRule($rule)) {
+                var $code = $rule.code(it, $rule.keyword, $rulesGroup.type);
+                if ($code) {
+                  out += ' ' + ($code) + ' ';
+                  if ($breakOnError) {
+                    $closingBraces1 += '}';
+                  }
+                }
+              }
+            }
+          }
+          if ($breakOnError) {
+            out += ' ' + ($closingBraces1) + ' ';
+            $closingBraces1 = '';
+          }
+          if ($rulesGroup.type) {
+            out += ' } ';
+            if ($typeSchema && $typeSchema === $rulesGroup.type && !$coerceToTypes) {
+              out += ' else { ';
+              var $schemaPath = it.schemaPath + '.type',
+                $errSchemaPath = it.errSchemaPath + '/type';
+              var $$outStack = $$outStack || [];
+              $$outStack.push(out);
+              out = ''; /* istanbul ignore else */
+              if (it.createErrors !== false) {
+                out += ' { keyword: \'' + ($errorKeyword || 'type') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { type: \'';
+                if ($typeIsArray) {
+                  out += '' + ($typeSchema.join(","));
+                } else {
+                  out += '' + ($typeSchema);
+                }
+                out += '\' } ';
+                if (it.opts.messages !== false) {
+                  out += ' , message: \'should be ';
+                  if ($typeIsArray) {
+                    out += '' + ($typeSchema.join(","));
+                  } else {
+                    out += '' + ($typeSchema);
+                  }
+                  out += '\' ';
+                }
+                if (it.opts.verbose) {
+                  out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+                }
+                out += ' } ';
+              } else {
+                out += ' {} ';
+              }
+              var __err = out;
+              out = $$outStack.pop();
+              if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+                if (it.async) {
+                  out += ' throw new ValidationError([' + (__err) + ']); ';
+                } else {
+                  out += ' validate.errors = [' + (__err) + ']; return false; ';
+                }
+              } else {
+                out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+              }
+              out += ' } ';
+            }
+          }
+          if ($breakOnError) {
+            out += ' if (errors === ';
+            if ($top) {
+              out += '0';
+            } else {
+              out += 'errs_' + ($lvl);
+            }
+            out += ') { ';
+            $closingBraces2 += '}';
+          }
+        }
+      }
+    }
+  }
+  if ($breakOnError) {
+    out += ' ' + ($closingBraces2) + ' ';
+  }
+  if ($top) {
+    if ($async) {
+      out += ' if (errors === 0) return data;           ';
+      out += ' else throw new ValidationError(vErrors); ';
+    } else {
+      out += ' validate.errors = vErrors; ';
+      out += ' return errors === 0;       ';
+    }
+    out += ' }); return validate;';
+  } else {
+    out += ' var ' + ($valid) + ' = errors === errs_' + ($lvl) + ';';
+  }
+  out = it.util.cleanUpCode(out);
+  if ($top) {
+    out = it.util.finalCleanUpCode(out, $async);
+  }
+
+  function $shouldUseGroup($rulesGroup) {
+    var rules = $rulesGroup.rules;
+    for (var i = 0; i < rules.length; i++)
+      if ($shouldUseRule(rules[i])) return true;
+  }
+
+  function $shouldUseRule($rule) {
+    return it.schema[$rule.keyword] !== undefined || ($rule.implements && $ruleImplementsSomeKeyword($rule));
+  }
+
+  function $ruleImplementsSomeKeyword($rule) {
+    var impl = $rule.implements;
+    for (var i = 0; i < impl.length; i++)
+      if (it.schema[impl[i]] !== undefined) return true;
+  }
+  return out;
+}
+
+
+/***/ }),
+/* 345 */
+/***/ (function(module, exports, __webpack_require__) {
+
+module.exports = __webpack_require__(509)().Promise
+
+
+/***/ }),
+/* 346 */
+/***/ (function(module, exports) {
+
+// API
+module.exports = abort;
+
+/**
+ * Aborts leftover active jobs
+ *
+ * @param {object} state - current state object
+ */
+function abort(state)
+{
+  Object.keys(state.jobs).forEach(clean.bind(state));
+
+  // reset leftover jobs
+  state.jobs = {};
+}
+
+/**
+ * Cleans up leftover job by invoking abort function for the provided job id
+ *
+ * @this  state
+ * @param {string|number} key - job id to abort
+ */
+function clean(key)
+{
+  if (typeof this.jobs[key] == 'function')
+  {
+    this.jobs[key]();
+  }
+}
+
+
+/***/ }),
+/* 347 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var defer = __webpack_require__(518);
+
+// API
+module.exports = async;
+
+/**
+ * Runs provided callback asynchronously
+ * even if callback itself is not
+ *
+ * @param   {function} callback - callback to invoke
+ * @returns {function} - augmented callback
+ */
+function async(callback)
+{
+  var isAsync = false;
+
+  // check if async happened
+  defer(function() { isAsync = true; });
+
+  return function async_callback(err, result)
+  {
+    if (isAsync)
+    {
+      callback(err, result);
+    }
+    else
+    {
+      defer(function nextTick_callback()
+      {
+        callback(err, result);
+      });
+    }
+  };
+}
+
+
+/***/ }),
+/* 348 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var async = __webpack_require__(347)
+  , abort = __webpack_require__(346)
+  ;
+
+// API
+module.exports = iterate;
+
+/**
+ * Iterates over each job object
+ *
+ * @param {array|object} list - array or object (named list) to iterate over
+ * @param {function} iterator - iterator to run
+ * @param {object} state - current job status
+ * @param {function} callback - invoked when all elements processed
+ */
+function iterate(list, iterator, state, callback)
+{
+  // store current index
+  var key = state['keyedList'] ? state['keyedList'][state.index] : state.index;
+
+  state.jobs[key] = runJob(iterator, key, list[key], function(error, output)
+  {
+    // don't repeat yourself
+    // skip secondary callbacks
+    if (!(key in state.jobs))
+    {
+      return;
+    }
+
+    // clean up jobs
+    delete state.jobs[key];
+
+    if (error)
+    {
+      // don't process rest of the results
+      // stop still active jobs
+      // and reset the list
+      abort(state);
+    }
+    else
+    {
+      state.results[key] = output;
+    }
+
+    // return salvaged results
+    callback(error, state.results);
+  });
+}
+
+/**
+ * Runs iterator over provided job element
+ *
+ * @param   {function} iterator - iterator to invoke
+ * @param   {string|number} key - key/index of the element in the list of jobs
+ * @param   {mixed} item - job description
+ * @param   {function} callback - invoked after iterator is done with the job
+ * @returns {function|mixed} - job abort function or something else
+ */
+function runJob(iterator, key, item, callback)
+{
+  var aborter;
+
+  // allow shortcut if iterator expects only two arguments
+  if (iterator.length == 2)
+  {
+    aborter = iterator(item, async(callback));
+  }
+  // otherwise go with full three arguments
+  else
+  {
+    aborter = iterator(item, key, async(callback));
+  }
+
+  return aborter;
+}
+
+
+/***/ }),
+/* 349 */
+/***/ (function(module, exports) {
+
+// API
+module.exports = state;
+
+/**
+ * Creates initial state object
+ * for iteration over list
+ *
+ * @param   {array|object} list - list to iterate over
+ * @param   {function|null} sortMethod - function to use for keys sort,
+ *                                     or `null` to keep them as is
+ * @returns {object} - initial state object
+ */
+function state(list, sortMethod)
+{
+  var isNamedList = !Array.isArray(list)
+    , initState =
+    {
+      index    : 0,
+      keyedList: isNamedList || sortMethod ? Object.keys(list) : null,
+      jobs     : {},
+      results  : isNamedList ? {} : [],
+      size     : isNamedList ? Object.keys(list).length : list.length
+    }
+    ;
+
+  if (sortMethod)
+  {
+    // sort array keys based on it's values
+    // sort object's keys just on own merit
+    initState.keyedList.sort(isNamedList ? sortMethod : function(a, b)
+    {
+      return sortMethod(list[a], list[b]);
+    });
+  }
+
+  return initState;
+}
+
+
+/***/ }),
+/* 350 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var abort = __webpack_require__(346)
+  , async = __webpack_require__(347)
+  ;
+
+// API
+module.exports = terminator;
+
+/**
+ * Terminates jobs in the attached state context
+ *
+ * @this  AsyncKitState#
+ * @param {function} callback - final callback to invoke after termination
+ */
+function terminator(callback)
+{
+  if (!Object.keys(this.jobs).length)
+  {
+    return;
+  }
+
+  // fast forward iteration index
+  this.index = this.size;
+
+  // abort jobs
+  abort(this);
+
+  // send back results we have so far
+  async(callback)(null, this.results);
+}
+
+
+/***/ }),
+/* 351 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var iterate    = __webpack_require__(348)
+  , initState  = __webpack_require__(349)
+  , terminator = __webpack_require__(350)
+  ;
+
+// Public API
+module.exports = serialOrdered;
+// sorting helpers
+module.exports.ascending  = ascending;
+module.exports.descending = descending;
+
+/**
+ * Runs iterator over provided sorted array elements in series
+ *
+ * @param   {array|object} list - array or object (named list) to iterate over
+ * @param   {function} iterator - iterator to run
+ * @param   {function} sortMethod - custom sort function
+ * @param   {function} callback - invoked when all elements processed
+ * @returns {function} - jobs terminator
+ */
+function serialOrdered(list, iterator, sortMethod, callback)
+{
+  var state = initState(list, sortMethod);
+
+  iterate(list, iterator, state, function iteratorHandler(error, result)
+  {
+    if (error)
+    {
+      callback(error, result);
+      return;
+    }
+
+    state.index++;
+
+    // are we there yet?
+    if (state.index < (state['keyedList'] || list).length)
+    {
+      iterate(list, iterator, state, iteratorHandler);
+      return;
+    }
+
+    // done here
+    callback(null, state.results);
+  });
+
+  return terminator.bind(state, callback);
+}
+
+/*
+ * -- Sort methods
+ */
+
+/**
+ * sort helper to sort array elements in ascending order
+ *
+ * @param   {mixed} a - an item to compare
+ * @param   {mixed} b - an item to compare
+ * @returns {number} - comparison result
+ */
+function ascending(a, b)
+{
+  return a < b ? -1 : a > b ? 1 : 0;
+}
+
+/**
+ * sort helper to sort array elements in descending order
+ *
+ * @param   {mixed} a - an item to compare
+ * @param   {mixed} b - an item to compare
+ * @returns {number} - comparison result
+ */
+function descending(a, b)
+{
+  return -1 * ascending(a, b);
+}
+
+
+/***/ }),
+/* 352 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = {
+  'upgrade-interactive': 'upgradeInteractive',
+  'generate-lock-entry': 'generateLockEntry'
+};
+
+/***/ }),
+/* 353 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.run = undefined;
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+let run = exports.run = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
+    const DEFAULT_LOG_LEVEL = 'info';
+    const audit = new Audit(config, reporter, {
+      groups: flags.groups || (_constants || _load_constants()).OWNED_DEPENDENCY_TYPES,
+      level: flags.level || DEFAULT_LOG_LEVEL
+    });
+    const lockfile = yield (_lockfile || _load_lockfile()).default.fromDirectory(config.lockfileFolder, reporter);
+    const install = new (_install || _load_install()).Install({}, config, reporter, lockfile);
+
+    var _ref2 = yield install.fetchRequestFromCwd();
+
+    const manifest = _ref2.manifest,
+          requests = _ref2.requests,
+          patterns = _ref2.patterns,
+          workspaceLayout = _ref2.workspaceLayout;
+
+    yield install.resolver.init(requests, {
+      workspaceLayout
+    });
+
+    const vulnerabilities = yield audit.performAudit(manifest, lockfile, install.resolver, install.linker, patterns);
+
+    const EXIT_INFO = 1;
+    const EXIT_LOW = 2;
+    const EXIT_MODERATE = 4;
+    const EXIT_HIGH = 8;
+    const EXIT_CRITICAL = 16;
+
+    const exitCode = (vulnerabilities.info ? EXIT_INFO : 0) + (vulnerabilities.low ? EXIT_LOW : 0) + (vulnerabilities.moderate ? EXIT_MODERATE : 0) + (vulnerabilities.high ? EXIT_HIGH : 0) + (vulnerabilities.critical ? EXIT_CRITICAL : 0);
+
+    if (flags.summary) {
+      audit.summary();
+    } else {
+      audit.report();
+    }
+
+    return exitCode;
+  });
+
+  return function run(_x, _x2, _x3, _x4) {
+    return _ref.apply(this, arguments);
+  };
+})();
+
+exports.setFlags = setFlags;
+exports.hasWrapper = hasWrapper;
+
+var _promise;
+
+function _load_promise() {
+  return _promise = __webpack_require__(50);
+}
+
+var _hoistedTreeBuilder;
+
+function _load_hoistedTreeBuilder() {
+  return _hoistedTreeBuilder = __webpack_require__(554);
+}
+
+var _getTransitiveDevDependencies;
+
+function _load_getTransitiveDevDependencies() {
+  return _getTransitiveDevDependencies = __webpack_require__(580);
+}
+
+var _install;
+
+function _load_install() {
+  return _install = __webpack_require__(34);
+}
+
+var _lockfile;
+
+function _load_lockfile() {
+  return _lockfile = _interopRequireDefault(__webpack_require__(19));
+}
+
+var _constants;
+
+function _load_constants() {
+  return _constants = __webpack_require__(8);
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const zlib = __webpack_require__(198);
+
+const gzip = (0, (_promise || _load_promise()).promisify)(zlib.gzip);
+
+function setFlags(commander) {
+  commander.description('Checks for known security issues with the installed packages.');
+  commander.option('--summary', 'Only print the summary.');
+  commander.option('--groups <group_name> [<group_name> ...]', `Only audit dependencies from listed groups. Default: ${(_constants || _load_constants()).OWNED_DEPENDENCY_TYPES.join(', ')}`, groups => groups.split(' '), (_constants || _load_constants()).OWNED_DEPENDENCY_TYPES);
+  commander.option('--level <severity>', `Only print advisories with severity greater than or equal to one of the following: \
+    info|low|moderate|high|critical. Default: info`, 'info');
+}
+
+function hasWrapper(commander, args) {
+  return true;
+}
+
+class Audit {
+
+  constructor(config, reporter, options) {
+    this.severityLevels = ['info', 'low', 'moderate', 'high', 'critical'];
+
+    this.config = config;
+    this.reporter = reporter;
+    this.options = options;
+  }
+
+  _mapHoistedNodes(auditNode, hoistedNodes, transitiveDevDeps) {
+    for (var _iterator = hoistedNodes, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+      var _ref3;
+
+      if (_isArray) {
+        if (_i >= _iterator.length) break;
+        _ref3 = _iterator[_i++];
+      } else {
+        _i = _iterator.next();
+        if (_i.done) break;
+        _ref3 = _i.value;
+      }
+
+      const node = _ref3;
+
+      const pkg = node.manifest.pkg;
+      const requires = Object.assign({}, pkg.dependencies || {}, pkg.optionalDependencies || {});
+      for (var _iterator2 = Object.keys(requires), _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+        var _ref4;
+
+        if (_isArray2) {
+          if (_i2 >= _iterator2.length) break;
+          _ref4 = _iterator2[_i2++];
+        } else {
+          _i2 = _iterator2.next();
+          if (_i2.done) break;
+          _ref4 = _i2.value;
+        }
+
+        const name = _ref4;
+
+        if (!requires[name]) {
+          requires[name] = '*';
+        }
+      }
+      auditNode.dependencies[node.name] = {
+        version: node.version,
+        integrity: pkg._remote ? pkg._remote.integrity || '' : '',
+        requires,
+        dependencies: {},
+        dev: transitiveDevDeps.has(`${node.name}@${node.version}`)
+      };
+      if (node.children) {
+        this._mapHoistedNodes(auditNode.dependencies[node.name], node.children, transitiveDevDeps);
+      }
+    }
+  }
+
+  _mapHoistedTreesToAuditTree(manifest, hoistedTrees, transitiveDevDeps) {
+    const requiresGroups = this.options.groups.map(function (group) {
+      return manifest[group] || {};
+    });
+
+    const auditTree = {
+      name: manifest.name || undefined,
+      version: manifest.version || undefined,
+      install: [],
+      remove: [],
+      metadata: {
+        //TODO: What do we send here? npm sends npm version, node version, etc.
+      },
+      requires: Object.assign({}, ...requiresGroups),
+      integrity: undefined,
+      dependencies: {},
+      dev: false
+    };
+
+    this._mapHoistedNodes(auditTree, hoistedTrees, transitiveDevDeps);
+    return auditTree;
+  }
+
+  _fetchAudit(auditTree) {
+    var _this = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      let responseJson;
+      const registry = (_constants || _load_constants()).YARN_REGISTRY;
+      _this.reporter.verbose(`Audit Request: ${JSON.stringify(auditTree, null, 2)}`);
+      const requestBody = yield gzip(JSON.stringify(auditTree));
+      const response = yield _this.config.requestManager.request({
+        url: `${registry}/-/npm/v1/security/audits`,
+        method: 'POST',
+        body: requestBody,
+        headers: {
+          'Content-Encoding': 'gzip',
+          'Content-Type': 'application/json',
+          Accept: 'application/json'
+        }
+      });
+
+      try {
+        responseJson = JSON.parse(response);
+      } catch (ex) {
+        throw new Error(`Unexpected audit response (Invalid JSON): ${response}`);
+      }
+      if (!responseJson.metadata) {
+        throw new Error(`Unexpected audit response (Missing Metadata): ${JSON.stringify(responseJson, null, 2)}`);
+      }
+      _this.reporter.verbose(`Audit Response: ${JSON.stringify(responseJson, null, 2)}`);
+      return responseJson;
+    })();
+  }
+
+  _insertWorkspacePackagesIntoManifest(manifest, resolver) {
+    if (resolver.workspaceLayout) {
+      const workspaceAggregatorName = resolver.workspaceLayout.virtualManifestName;
+      const workspaceManifest = resolver.workspaceLayout.workspaces[workspaceAggregatorName].manifest;
+
+      manifest.dependencies = Object.assign(manifest.dependencies || {}, workspaceManifest.dependencies);
+      manifest.devDependencies = Object.assign(manifest.devDependencies || {}, workspaceManifest.devDependencies);
+      manifest.optionalDependencies = Object.assign(manifest.optionalDependencies || {}, workspaceManifest.optionalDependencies);
+    }
+  }
+
+  performAudit(manifest, lockfile, resolver, linker, patterns) {
+    var _this2 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      _this2._insertWorkspacePackagesIntoManifest(manifest, resolver);
+      const transitiveDevDeps = (0, (_getTransitiveDevDependencies || _load_getTransitiveDevDependencies()).getTransitiveDevDependencies)(manifest, resolver.workspaceLayout, lockfile);
+      const hoistedTrees = yield (0, (_hoistedTreeBuilder || _load_hoistedTreeBuilder()).buildTree)(resolver, linker, patterns);
+      const auditTree = _this2._mapHoistedTreesToAuditTree(manifest, hoistedTrees, transitiveDevDeps);
+      _this2.auditData = yield _this2._fetchAudit(auditTree);
+      return _this2.auditData.metadata.vulnerabilities;
+    })();
+  }
+
+  summary() {
+    if (!this.auditData) {
+      return;
+    }
+    this.reporter.auditSummary(this.auditData.metadata);
+  }
+
+  report() {
+    if (!this.auditData) {
+      return;
+    }
+
+    const startLoggingAt = Math.max(0, this.severityLevels.indexOf(this.options.level));
+
+    const reportAdvisory = resolution => {
+      const advisory = this.auditData.advisories[resolution.id.toString()];
+
+      if (this.severityLevels.indexOf(advisory.severity) >= startLoggingAt) {
+        this.reporter.auditAdvisory(resolution, advisory);
+      }
+    };
+
+    if (Object.keys(this.auditData.advisories).length !== 0) {
+      // let printedManualReviewHeader = false;
+
+      this.auditData.actions.forEach(action => {
+        action.resolves.forEach(reportAdvisory);
+
+        /* The following block has been temporarily removed
+         * because the actions returned by npm are not valid for yarn.
+         * Removing this action reporting until we can come up with a way
+         * to correctly resolve issues.
+         */
+        // if (action.action === 'update' || action.action === 'install') {
+        //   // these advisories can be resolved automatically by running a yarn command
+        //   const recommendation: AuditActionRecommendation = {
+        //     cmd: `yarn upgrade ${action.module}@${action.target}`,
+        //     isBreaking: action.isMajor,
+        //     action,
+        //   };
+        //   this.reporter.auditAction(recommendation);
+        //   action.resolves.forEach(reportAdvisory);
+        // }
+
+        // if (action.action === 'review') {
+        //   // these advisories cannot be resolved automatically and require manual review
+        //   if (!printedManualReviewHeader) {
+        //     this.reporter.auditManualReview();
+        //   }
+        //   printedManualReviewHeader = true;
+        //   action.resolves.forEach(reportAdvisory);
+        // }
+      });
+    }
+
+    this.summary();
+  }
+}
+exports.default = Audit;
+
+/***/ }),
+/* 354 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.run = exports.clean = exports.noArguments = exports.requireLockfile = undefined;
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+let clean = exports.clean = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter) {
+    const loc = path.join(config.lockfileFolder, (_constants || _load_constants()).CLEAN_FILENAME);
+    const file = yield (_fs || _load_fs()).readFile(loc);
+    const lines = file.split('\n');
+    const filters = (0, (_filter || _load_filter()).ignoreLinesToRegex)(lines);
+
+    let removedFiles = 0;
+    let removedSize = 0;
+
+    // build list of possible module folders
+    const locs = new Set();
+    for (var _iterator = config.registryFolders, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+      var _ref2;
+
+      if (_isArray) {
+        if (_i >= _iterator.length) break;
+        _ref2 = _iterator[_i++];
+      } else {
+        _i = _iterator.next();
+        if (_i.done) break;
+        _ref2 = _i.value;
+      }
+
+      const registryFolder = _ref2;
+
+      locs.add(path.resolve(config.lockfileFolder, registryFolder));
+    }
+
+    const workspaceRootFolder = config.workspaceRootFolder;
+    if (workspaceRootFolder) {
+      const manifest = yield config.findManifest(workspaceRootFolder, false);
+      invariant(manifest && manifest.workspaces, 'We must find a manifest with a "workspaces" property');
+
+      const workspaces = yield config.resolveWorkspaces(workspaceRootFolder, manifest);
+
+      for (var _iterator2 = Object.keys(workspaces), _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+        var _ref3;
+
+        if (_isArray2) {
+          if (_i2 >= _iterator2.length) break;
+          _ref3 = _iterator2[_i2++];
+        } else {
+          _i2 = _iterator2.next();
+          if (_i2.done) break;
+          _ref3 = _i2.value;
+        }
+
+        const workspaceName = _ref3;
+
+        for (var _iterator3 = (_index || _load_index()).registryNames, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
+          var _ref4;
+
+          if (_isArray3) {
+            if (_i3 >= _iterator3.length) break;
+            _ref4 = _iterator3[_i3++];
+          } else {
+            _i3 = _iterator3.next();
+            if (_i3.done) break;
+            _ref4 = _i3.value;
+          }
+
+          const name = _ref4;
+
+          const registry = config.registries[name];
+          locs.add(path.join(workspaces[workspaceName].loc, registry.folder));
+        }
+      }
+    }
+
+    for (var _iterator4 = locs, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
+      var _ref5;
+
+      if (_isArray4) {
+        if (_i4 >= _iterator4.length) break;
+        _ref5 = _iterator4[_i4++];
+      } else {
+        _i4 = _iterator4.next();
+        if (_i4.done) break;
+        _ref5 = _i4.value;
+      }
+
+      const folder = _ref5;
+
+      if (!(yield (_fs || _load_fs()).exists(folder))) {
+        continue;
+      }
+
+      const spinner = reporter.activity();
+      const files = yield (_fs || _load_fs()).walk(folder);
+
+      var _sortFilter = (0, (_filter || _load_filter()).sortFilter)(files, filters);
+
+      const ignoreFiles = _sortFilter.ignoreFiles;
+
+      spinner.end();
+
+      const tick = reporter.progress(ignoreFiles.size);
+      // TODO make sure `main` field of all modules isn't ignored
+
+      for (var _iterator5 = ignoreFiles, _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
+        var _ref6;
+
+        if (_isArray5) {
+          if (_i5 >= _iterator5.length) break;
+          _ref6 = _iterator5[_i5++];
+        } else {
+          _i5 = _iterator5.next();
+          if (_i5.done) break;
+          _ref6 = _i5.value;
+        }
+
+        const file = _ref6;
+
+        const loc = path.join(folder, file);
+        const stat = yield (_fs || _load_fs()).lstat(loc);
+        removedSize += stat.size;
+        removedFiles++;
+      }
+
+      for (var _iterator6 = ignoreFiles, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) {
+        var _ref7;
+
+        if (_isArray6) {
+          if (_i6 >= _iterator6.length) break;
+          _ref7 = _iterator6[_i6++];
+        } else {
+          _i6 = _iterator6.next();
+          if (_i6.done) break;
+          _ref7 = _i6.value;
+        }
+
+        const file = _ref7;
+
+        const loc = path.join(folder, file);
+        yield (_fs || _load_fs()).unlink(loc);
+        tick();
+      }
+    }
+
+    return { removedFiles, removedSize };
+  });
+
+  return function clean(_x, _x2) {
+    return _ref.apply(this, arguments);
+  };
+})();
+
+let runInit = (() => {
+  var _ref8 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (cwd, reporter) {
+    reporter.step(1, 1, reporter.lang('cleanCreatingFile', (_constants || _load_constants()).CLEAN_FILENAME));
+    const cleanLoc = path.join(cwd, (_constants || _load_constants()).CLEAN_FILENAME);
+    yield (_fs || _load_fs()).writeFile(cleanLoc, `${DEFAULT_FILTER}\n`, { flag: 'wx' });
+    reporter.info(reporter.lang('cleanCreatedFile', (_constants || _load_constants()).CLEAN_FILENAME));
+  });
+
+  return function runInit(_x3, _x4) {
+    return _ref8.apply(this, arguments);
+  };
+})();
+
+let runAutoClean = (() => {
+  var _ref9 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter) {
+    reporter.step(1, 1, reporter.lang('cleaning'));
+
+    var _ref10 = yield clean(config, reporter);
+
+    const removedFiles = _ref10.removedFiles,
+          removedSize = _ref10.removedSize;
+
+    reporter.info(reporter.lang('cleanRemovedFiles', removedFiles));
+    reporter.info(reporter.lang('cleanSavedSize', Number((removedSize / 1024 / 1024).toFixed(2))));
+  });
+
+  return function runAutoClean(_x5, _x6) {
+    return _ref9.apply(this, arguments);
+  };
+})();
+
+let checkForCleanFile = (() => {
+  var _ref11 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (cwd) {
+    const cleanLoc = path.join(cwd, (_constants || _load_constants()).CLEAN_FILENAME);
+    const exists = yield (_fs || _load_fs()).exists(cleanLoc);
+    return exists;
+  });
+
+  return function checkForCleanFile(_x7) {
+    return _ref11.apply(this, arguments);
+  };
+})();
+
+let run = exports.run = (() => {
+  var _ref12 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
+    const cleanFileExists = yield checkForCleanFile(config.cwd);
+
+    if (flags.init && cleanFileExists) {
+      reporter.info(reporter.lang('cleanAlreadyExists', (_constants || _load_constants()).CLEAN_FILENAME));
+    } else if (flags.init) {
+      yield runInit(config.cwd, reporter);
+    } else if (flags.force && cleanFileExists) {
+      yield runAutoClean(config, reporter);
+    } else if (cleanFileExists) {
+      reporter.info(reporter.lang('cleanRequiresForce', (_constants || _load_constants()).CLEAN_FILENAME));
+    } else {
+      reporter.info(reporter.lang('cleanDoesNotExist', (_constants || _load_constants()).CLEAN_FILENAME));
+    }
+  });
+
+  return function run(_x8, _x9, _x10, _x11) {
+    return _ref12.apply(this, arguments);
+  };
+})();
+
+exports.setFlags = setFlags;
+exports.hasWrapper = hasWrapper;
+
+var _index;
+
+function _load_index() {
+  return _index = __webpack_require__(57);
+}
+
+var _filter;
+
+function _load_filter() {
+  return _filter = __webpack_require__(372);
+}
+
+var _constants;
+
+function _load_constants() {
+  return _constants = __webpack_require__(8);
+}
+
+var _fs;
+
+function _load_fs() {
+  return _fs = _interopRequireWildcard(__webpack_require__(4));
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const invariant = __webpack_require__(9);
+const path = __webpack_require__(0);
+
+const requireLockfile = exports.requireLockfile = true;
+const noArguments = exports.noArguments = true;
+
+const DEFAULT_FILTER = `
+# test directories
+__tests__
+test
+tests
+powered-test
+
+# asset directories
+docs
+doc
+website
+images
+assets
+
+# examples
+example
+examples
+
+# code coverage directories
+coverage
+.nyc_output
+
+# build scripts
+Makefile
+Gulpfile.js
+Gruntfile.js
+
+# configs
+appveyor.yml
+circle.yml
+codeship-services.yml
+codeship-steps.yml
+wercker.yml
+.tern-project
+.gitattributes
+.editorconfig
+.*ignore
+.eslintrc
+.jshintrc
+.flowconfig
+.documentup.json
+.yarn-metadata.json
+.travis.yml
+
+# misc
+*.md
+`.trim();
+
+function setFlags(commander) {
+  commander.description('Cleans and removes unnecessary files from package dependencies.');
+  commander.usage('autoclean [flags]');
+  commander.option('-I, --init', `Create "${(_constants || _load_constants()).CLEAN_FILENAME}" file with the default entries.`);
+  commander.option('-F, --force', `Run autoclean using the existing "${(_constants || _load_constants()).CLEAN_FILENAME}" file.`);
+}
+
+function hasWrapper(commander) {
+  return true;
+}
+
+/***/ }),
+/* 355 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.examples = exports.run = exports.getCachedPackagesDirs = undefined;
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+let getCachedPackagesDirs = exports.getCachedPackagesDirs = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, currentPath) {
+    const results = [];
+    const stat = yield (_fs || _load_fs()).lstat(currentPath);
+
+    if (!stat.isDirectory()) {
+      return results;
+    }
+
+    const folders = yield (_fs || _load_fs()).readdir(currentPath);
+    for (var _iterator = folders, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+      var _ref2;
+
+      if (_isArray) {
+        if (_i >= _iterator.length) break;
+        _ref2 = _iterator[_i++];
+      } else {
+        _i = _iterator.next();
+        if (_i.done) break;
+        _ref2 = _i.value;
+      }
+
+      const folder = _ref2;
+
+      if (folder[0] === '.') {
+        continue;
+      }
+      const packageParentPath = path.join(currentPath, folder, 'node_modules');
+
+      const candidates = yield (_fs || _load_fs()).readdir(packageParentPath);
+      invariant(candidates.length === 1, `There should only be one folder in a package cache (got ${candidates.join(',')} in ${packageParentPath})`);
+
+      for (var _iterator2 = candidates, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+        var _ref3;
+
+        if (_isArray2) {
+          if (_i2 >= _iterator2.length) break;
+          _ref3 = _iterator2[_i2++];
+        } else {
+          _i2 = _iterator2.next();
+          if (_i2.done) break;
+          _ref3 = _i2.value;
+        }
+
+        const candidate = _ref3;
+
+        const candidatePath = path.join(packageParentPath, candidate);
+        if (candidate.charAt(0) === '@') {
+          const subCandidates = yield (_fs || _load_fs()).readdir(candidatePath);
+          invariant(subCandidates.length === 1, `There should only be one folder in a package cache (got ${subCandidates.join(',')} in ${candidatePath})`);
+
+          for (var _iterator3 = subCandidates, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
+            var _ref4;
+
+            if (_isArray3) {
+              if (_i3 >= _iterator3.length) break;
+              _ref4 = _iterator3[_i3++];
+            } else {
+              _i3 = _iterator3.next();
+              if (_i3.done) break;
+              _ref4 = _i3.value;
+            }
+
+            const subCandidate = _ref4;
+
+            const subCandidatePath = path.join(candidatePath, subCandidate);
+            results.push(subCandidatePath);
+          }
+        } else {
+          results.push(candidatePath);
+        }
+      }
+    }
+
+    return results;
+  });
+
+  return function getCachedPackagesDirs(_x, _x2) {
+    return _ref.apply(this, arguments);
+  };
+})();
+
+let getCachedPackages = (() => {
+  var _ref5 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config) {
+    const paths = yield getCachedPackagesDirs(config, config.cacheFolder);
+    return _getMetadataWithPath(config.readPackageMetadata.bind(config), paths).then(function (packages) {
+      return packages.filter(function (p) {
+        return !!p;
+      });
+    });
+  });
+
+  return function getCachedPackages(_x3) {
+    return _ref5.apply(this, arguments);
+  };
+})();
+
+let list = (() => {
+  var _ref6 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
+    const filterOut = function filterOut({ registry, package: manifest, remote } = {}) {
+      if (flags.pattern && !micromatch.contains(manifest.name, flags.pattern)) {
+        return false;
+      }
+      return true;
+    };
+
+    const forReport = function forReport({ registry, package: manifest, remote } = {}) {
+      return [manifest.name, manifest.version, registry, remote && remote.resolved || ''];
+    };
+
+    const packages = yield getCachedPackages(config);
+    const body = packages.filter(filterOut).map(forReport);
+    reporter.table(['Name', 'Version', 'Registry', 'Resolved'], body);
+  });
+
+  return function list(_x4, _x5, _x6, _x7) {
+    return _ref6.apply(this, arguments);
+  };
+})();
+
+let clean = (() => {
+  var _ref7 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
+    if (config.cacheFolder) {
+      const activity = reporter.activity();
+
+      if (args.length > 0) {
+        // Clear named packages from cache
+        const packages = yield getCachedPackages(config);
+        const shouldDelete = function shouldDelete({ registry, package: manifest, remote } = {}) {
+          return args.indexOf(manifest.name) !== -1;
+        };
+        const packagesToDelete = packages.filter(shouldDelete);
+
+        for (var _iterator4 = packagesToDelete, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
+          var _ref8;
+
+          if (_isArray4) {
+            if (_i4 >= _iterator4.length) break;
+            _ref8 = _iterator4[_i4++];
+          } else {
+            _i4 = _iterator4.next();
+            if (_i4.done) break;
+            _ref8 = _i4.value;
+          }
+
+          const manifest = _ref8;
+
+          let relativePath = path.relative(config.cacheFolder, manifest._path);
+          while (relativePath && relativePath !== '.') {
+            yield (_fs || _load_fs()).unlink(path.resolve(config.cacheFolder, relativePath));
+            relativePath = path.dirname(relativePath);
+          }
+        }
+
+        activity.end();
+        reporter.success(reporter.lang('clearedPackageFromCache', args[0]));
+      } else {
+        // Clear all cache
+        yield (_fs || _load_fs()).unlink(config._cacheRootFolder);
+        yield (_fs || _load_fs()).mkdirp(config.cacheFolder);
+        activity.end();
+        reporter.success(reporter.lang('clearedCache'));
+      }
+    }
+  });
+
+  return function clean(_x8, _x9, _x10, _x11) {
+    return _ref7.apply(this, arguments);
+  };
+})();
+
+exports.hasWrapper = hasWrapper;
+exports.setFlags = setFlags;
+
+var _buildSubCommands2;
+
+function _load_buildSubCommands() {
+  return _buildSubCommands2 = _interopRequireDefault(__webpack_require__(59));
+}
+
+var _fs;
+
+function _load_fs() {
+  return _fs = _interopRequireWildcard(__webpack_require__(4));
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const invariant = __webpack_require__(9);
+const path = __webpack_require__(0);
+const micromatch = __webpack_require__(114);
+
+function hasWrapper(flags, args) {
+  return args[0] !== 'dir';
+}
+
+function _getMetadataWithPath(getMetadataFn, paths) {
+  return Promise.all(paths.map(path => getMetadataFn(path).then(r => {
+    r._path = path;
+    return r;
+  }).catch(error => undefined)));
+}
+
+var _buildSubCommands = (0, (_buildSubCommands2 || _load_buildSubCommands()).default)('cache', {
+  ls(config, reporter, flags, args) {
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      reporter.warn(`\`yarn cache ls\` is deprecated. Please use \`yarn cache list\`.`);
+      yield list(config, reporter, flags, args);
+    })();
+  },
+  list,
+  clean,
+  dir(config, reporter) {
+    reporter.log(config.cacheFolder, { force: true });
+  }
+});
+
+const run = _buildSubCommands.run,
+      _setFlags = _buildSubCommands.setFlags,
+      examples = _buildSubCommands.examples;
+exports.run = run;
+exports.examples = examples;
+function setFlags(commander) {
+  _setFlags(commander);
+  commander.description('Yarn cache list will print out every cached package.');
+  commander.option('--pattern [pattern]', 'filter cached packages by pattern');
+}
+
+/***/ }),
+/* 356 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.run = exports.verifyTreeCheck = exports.noArguments = exports.requireLockfile = undefined;
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+let verifyTreeCheck = exports.verifyTreeCheck = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
+    let errCount = 0;
+    function reportError(msg, ...vars) {
+      reporter.error(reporter.lang(msg, ...vars));
+      errCount++;
+    }
+    // check all dependencies recursively without relying on internal resolver
+    const registryName = 'yarn';
+    const registryFolder = config.registryFolders[0];
+    const cwd = config.workspaceRootFolder ? config.lockfileFolder : config.cwd;
+    const rootManifest = yield config.readManifest(cwd, registryName);
+
+    const dependenciesToCheckVersion = [];
+    if (rootManifest.dependencies) {
+      for (const name in rootManifest.dependencies) {
+        const version = rootManifest.dependencies[name];
+        // skip linked dependencies
+        const isLinkedDependency = /^link:/i.test(version) || /^file:/i.test(version) && config.linkFileDependencies;
+        if (isLinkedDependency) {
+          continue;
+        }
+        dependenciesToCheckVersion.push({
+          name,
+          originalKey: name,
+          parentCwd: cwd,
+          version
+        });
+      }
+    }
+    if (rootManifest.devDependencies && !config.production) {
+      for (const name in rootManifest.devDependencies) {
+        const version = rootManifest.devDependencies[name];
+        // skip linked dependencies
+        const isLinkedDependency = /^link:/i.test(version) || /^file:/i.test(version) && config.linkFileDependencies;
+        if (isLinkedDependency) {
+          continue;
+        }
+        dependenciesToCheckVersion.push({
+          name,
+          originalKey: name,
+          parentCwd: cwd,
+          version
+        });
+      }
+    }
+
+    const locationsVisited = new Set();
+    while (dependenciesToCheckVersion.length) {
+      const dep = dependenciesToCheckVersion.shift();
+      const manifestLoc = path.resolve(dep.parentCwd, registryFolder, dep.name);
+      if (locationsVisited.has(manifestLoc + `@${dep.version}`)) {
+        continue;
+      }
+      locationsVisited.add(manifestLoc + `@${dep.version}`);
+      // When plugnplay is enabled, packages aren't copied to the node_modules folder, so this check doesn't make sense
+      // TODO: We ideally should check that the packages are located inside the cache instead
+      if (config.plugnplayEnabled) {
+        continue;
+      }
+      if (!(yield (_fs || _load_fs()).exists(manifestLoc))) {
+        reportError('packageNotInstalled', `${dep.originalKey}`);
+        continue;
+      }
+      if (!(yield (_fs || _load_fs()).exists(path.join(manifestLoc, 'package.json')))) {
+        continue;
+      }
+      const pkg = yield config.readManifest(manifestLoc, registryName);
+      if (semver.validRange(dep.version, config.looseSemver) && !semver.satisfies(pkg.version, dep.version, config.looseSemver)) {
+        reportError('packageWrongVersion', dep.originalKey, dep.version, pkg.version);
+        continue;
+      }
+      const dependencies = pkg.dependencies;
+      if (dependencies) {
+        for (const subdep in dependencies) {
+          const subDepPath = path.resolve(manifestLoc, registryFolder, subdep);
+          let found = false;
+          const relative = path.relative(cwd, subDepPath);
+          const locations = path.normalize(relative).split(registryFolder + path.sep).filter(function (dir) {
+            return !!dir;
+          });
+          locations.pop();
+          while (locations.length >= 0) {
+            let possiblePath;
+            if (locations.length > 0) {
+              possiblePath = path.join(cwd, registryFolder, locations.join(path.sep + registryFolder + path.sep));
+            } else {
+              possiblePath = cwd;
+            }
+            if (yield (_fs || _load_fs()).exists(path.resolve(possiblePath, registryFolder, subdep))) {
+              dependenciesToCheckVersion.push({
+                name: subdep,
+                originalKey: `${dep.originalKey}#${subdep}`,
+                parentCwd: possiblePath,
+                version: dependencies[subdep]
+              });
+              found = true;
+              break;
+            }
+            if (!locations.length) {
+              break;
+            }
+            locations.pop();
+          }
+          if (!found) {
+            reportError('packageNotInstalled', `${dep.originalKey}#${subdep}`);
+          }
+        }
+      }
+    }
+
+    if (errCount > 0) {
+      throw new (_errors || _load_errors()).MessageError(reporter.lang('foundErrors', errCount));
+    } else {
+      reporter.success(reporter.lang('folderInSync'));
+    }
+  });
+
+  return function verifyTreeCheck(_x, _x2, _x3, _x4) {
+    return _ref.apply(this, arguments);
+  };
+})();
+
+let integrityHashCheck = (() => {
+  var _ref2 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
+    let errCount = 0;
+    function reportError(msg, ...vars) {
+      reporter.error(reporter.lang(msg, ...vars));
+      errCount++;
+    }
+    const integrityChecker = new (_integrityChecker || _load_integrityChecker()).default(config);
+
+    const lockfile = yield (_lockfile || _load_lockfile()).default.fromDirectory(config.cwd);
+    const install = new (_install || _load_install()).Install(flags, config, reporter, lockfile);
+
+    // get patterns that are installed when running `yarn install`
+
+    var _ref3 = yield install.fetchRequestFromCwd();
+
+    const patterns = _ref3.patterns,
+          workspaceLayout = _ref3.workspaceLayout;
+
+
+    const match = yield integrityChecker.check(patterns, lockfile.cache, flags, workspaceLayout);
+    for (var _iterator = match.missingPatterns, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+      var _ref4;
+
+      if (_isArray) {
+        if (_i >= _iterator.length) break;
+        _ref4 = _iterator[_i++];
+      } else {
+        _i = _iterator.next();
+        if (_i.done) break;
+        _ref4 = _i.value;
+      }
+
+      const pattern = _ref4;
+
+      reportError('lockfileNotContainPattern', pattern);
+    }
+    if (match.integrityFileMissing) {
+      reportError('noIntegrityFile');
+    }
+    if (match.integrityMatches === false) {
+      reporter.warn(reporter.lang((_integrityChecker2 || _load_integrityChecker2()).integrityErrors[match.integrityError]));
+      reportError('integrityCheckFailed');
+    }
+
+    if (errCount > 0) {
+      throw new (_errors || _load_errors()).MessageError(reporter.lang('foundErrors', errCount));
+    } else {
+      reporter.success(reporter.lang('folderInSync'));
+    }
+  });
+
+  return function integrityHashCheck(_x5, _x6, _x7, _x8) {
+    return _ref2.apply(this, arguments);
+  };
+})();
+
+let run = exports.run = (() => {
+  var _ref5 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
+    if (flags.verifyTree) {
+      yield verifyTreeCheck(config, reporter, flags, args);
+      return;
+    } else if (flags.integrity) {
+      yield integrityHashCheck(config, reporter, flags, args);
+      return;
+    }
+
+    const lockfile = yield (_lockfile || _load_lockfile()).default.fromDirectory(config.cwd);
+    const install = new (_install || _load_install()).Install(flags, config, reporter, lockfile);
+
+    function humaniseLocation(loc) {
+      const relative = path.relative(path.join(config.cwd, 'node_modules'), loc);
+      const normalized = path.normalize(relative).split(path.sep);
+      return normalized.filter(p => p !== 'node_modules').reduce((result, part) => {
+        const length = result.length;
+        if (length && result[length - 1].startsWith('@') && result[length - 1].indexOf(path.sep) === -1) {
+          result[length - 1] += path.sep + part;
+        } else {
+          result.push(part);
+        }
+        return result;
+      }, []);
+    }
+
+    let warningCount = 0;
+    let errCount = 0;
+    function reportError(msg, ...vars) {
+      reporter.error(reporter.lang(msg, ...vars));
+      errCount++;
+    }
+
+    // get patterns that are installed when running `yarn install`
+
+    var _ref6 = yield install.hydrate();
+
+    const rawPatterns = _ref6.patterns,
+          workspaceLayout = _ref6.workspaceLayout;
+
+    const patterns = yield install.flatten(rawPatterns);
+
+    // check if patterns exist in lockfile
+    for (var _iterator2 = patterns, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+      var _ref7;
+
+      if (_isArray2) {
+        if (_i2 >= _iterator2.length) break;
+        _ref7 = _iterator2[_i2++];
+      } else {
+        _i2 = _iterator2.next();
+        if (_i2.done) break;
+        _ref7 = _i2.value;
+      }
+
+      const pattern = _ref7;
+
+      if (!lockfile.getLocked(pattern) && (!workspaceLayout || !workspaceLayout.getManifestByPattern(pattern))) {
+        reportError('lockfileNotContainPattern', pattern);
+      }
+    }
+
+    const bundledDeps = {};
+    // check if any of the node_modules are out of sync
+    const res = yield install.linker.getFlatHoistedTree(patterns, workspaceLayout);
+    for (var _iterator3 = res, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
+      var _ref9;
+
+      if (_isArray3) {
+        if (_i3 >= _iterator3.length) break;
+        _ref9 = _iterator3[_i3++];
+      } else {
+        _i3 = _iterator3.next();
+        if (_i3.done) break;
+        _ref9 = _i3.value;
+      }
+
+      const _ref8 = _ref9;
+      const loc = _ref8[0];
+      var _ref8$ = _ref8[1];
+      const originalKey = _ref8$.originalKey;
+      const pkg = _ref8$.pkg;
+      const ignore = _ref8$.ignore;
+
+      if (ignore) {
+        continue;
+      }
+
+      const parts = humaniseLocation(loc);
+
+      // grey out hoisted portions of key
+      let human = originalKey;
+      const hoistedParts = parts.slice();
+      const hoistedKey = parts.join('#');
+      if (human !== hoistedKey) {
+        const humanParts = human.split('#');
+
+        for (let i = 0; i < humanParts.length; i++) {
+          const humanPart = humanParts[i];
+
+          if (hoistedParts[0] === humanPart) {
+            hoistedParts.shift();
+
+            if (i < humanParts.length - 1) {
+              humanParts[i] += '#';
+            }
+          } else {
+            humanParts[i] = reporter.format.dim(`${humanPart}#`);
+          }
+        }
+
+        human = humanParts.join('');
+      }
+
+      // skip unnecessary checks for linked dependencies
+      const remoteType = pkg._reference.remote.type;
+      const isLinkedDependency = remoteType === 'link' || remoteType === 'workspace' || remoteType === 'file' && config.linkFileDependencies;
+      const isResolution = pkg._reference.hint === 'resolution';
+      if (isLinkedDependency || isResolution) {
+        continue;
+      }
+
+      if (!(yield (_fs || _load_fs()).exists(loc))) {
+        if (pkg._reference.optional) {
+          reporter.warn(reporter.lang('optionalDepNotInstalled', human));
+        } else {
+          reportError('packageNotInstalled', human);
+        }
+        continue;
+      }
+
+      const pkgLoc = path.join(loc, 'package.json');
+
+      if (yield (_fs || _load_fs()).exists(pkgLoc)) {
+        const packageJson = yield config.readJson(pkgLoc);
+        packageJson.version = semver.clean(packageJson.version);
+
+        if (pkg.version !== packageJson.version) {
+          // node_modules contains wrong version
+          reportError('packageWrongVersion', human, pkg.version, packageJson.version);
+        }
+
+        const deps = Object.assign({}, packageJson.dependencies, packageJson.peerDependencies);
+        bundledDeps[packageJson.name] = packageJson.bundledDependencies || [];
+
+        for (const name in deps) {
+          const range = deps[name];
+          if (!semver.validRange(range, config.looseSemver)) {
+            continue; // exotic
+          }
+
+          const subHuman = `${human}#${name}@${range}`;
+
+          // find the package that this will resolve to, factoring in hoisting
+          const possibles = [];
+          let depLoc;
+          for (let i = parts.length; i >= 0; i--) {
+            const myParts = parts.slice(0, i).concat(name);
+
+            // build package.json location for this position
+            const myDepPkgLoc = path.join(config.cwd, 'node_modules', myParts.join(`${path.sep}node_modules${path.sep}`));
+
+            possibles.push(myDepPkgLoc);
+          }
+          while (possibles.length) {
+            const myDepPkgLoc = possibles.shift();
+            if (yield (_fs || _load_fs()).exists(myDepPkgLoc)) {
+              depLoc = myDepPkgLoc;
+              break;
+            }
+          }
+          if (!depLoc) {
+            // we'll hit the module not install error above when this module is hit
+            continue;
+          }
+
+          const depPkgLoc = path.join(depLoc, 'package.json');
+
+          if (yield (_fs || _load_fs()).exists(depPkgLoc)) {
+            const depPkg = yield config.readJson(depPkgLoc);
+            const foundHuman = `${humaniseLocation(path.dirname(depPkgLoc)).join('#')}@${depPkg.version}`;
+            if (!semver.satisfies(depPkg.version, range, config.looseSemver)) {
+              // module isn't correct semver
+              const resPattern = install.resolutionMap.find(name, originalKey.split('#'));
+              if (resPattern) {
+                const resHuman = `${human}#${resPattern}`;
+
+                var _normalizePattern = (0, (_normalizePattern2 || _load_normalizePattern()).normalizePattern)(resPattern);
+
+                const resRange = _normalizePattern.range;
+
+
+                if (semver.satisfies(depPkg.version, resRange, config.looseSemver)) {
+                  reporter.warn(reporter.lang('incompatibleResolutionVersion', foundHuman, subHuman));
+                  warningCount++;
+                } else {
+                  reportError('packageDontSatisfy', resHuman, foundHuman);
+                }
+              } else {
+                reportError('packageDontSatisfy', subHuman, foundHuman);
+              }
+
+              continue;
+            }
+
+            // check for modules above us that this could be deduped to
+            for (var _iterator4 = possibles, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
+              var _ref10;
+
+              if (_isArray4) {
+                if (_i4 >= _iterator4.length) break;
+                _ref10 = _iterator4[_i4++];
+              } else {
+                _i4 = _iterator4.next();
+                if (_i4.done) break;
+                _ref10 = _i4.value;
+              }
+
+              const loc = _ref10;
+
+              const locPkg = path.join(loc, 'package.json');
+
+              if (!(yield (_fs || _load_fs()).exists(locPkg))) {
+                continue;
+              }
+
+              const packageJson = yield config.readJson(locPkg);
+              const packagePath = originalKey.split('#');
+              const rootDep = packagePath[0];
+              const packageName = packagePath[1] || packageJson.name;
+
+              const bundledDep = bundledDeps[rootDep] && bundledDeps[rootDep].indexOf(packageName) !== -1;
+              if (!bundledDep && (packageJson.version === depPkg.version || semver.satisfies(packageJson.version, range, config.looseSemver) && semver.gt(packageJson.version, depPkg.version, config.looseSemver))) {
+                reporter.warn(reporter.lang('couldBeDeduped', subHuman, packageJson.version, `${humaniseLocation(path.dirname(locPkg)).join('#')}@${packageJson.version}`));
+                warningCount++;
+              }
+              break;
+            }
+          }
+        }
+      }
+    }
+
+    if (warningCount > 1) {
+      reporter.info(reporter.lang('foundWarnings', warningCount));
+    }
+
+    if (errCount > 0) {
+      throw new (_errors || _load_errors()).MessageError(reporter.lang('foundErrors', errCount));
+    } else {
+      reporter.success(reporter.lang('folderInSync'));
+    }
+  });
+
+  return function run(_x9, _x10, _x11, _x12) {
+    return _ref5.apply(this, arguments);
+  };
+})();
+
+exports.hasWrapper = hasWrapper;
+exports.setFlags = setFlags;
+
+var _errors;
+
+function _load_errors() {
+  return _errors = __webpack_require__(6);
+}
+
+var _integrityChecker;
+
+function _load_integrityChecker() {
+  return _integrityChecker = _interopRequireDefault(__webpack_require__(208));
+}
+
+var _integrityChecker2;
+
+function _load_integrityChecker2() {
+  return _integrityChecker2 = __webpack_require__(208);
+}
+
+var _lockfile;
+
+function _load_lockfile() {
+  return _lockfile = _interopRequireDefault(__webpack_require__(19));
+}
+
+var _fs;
+
+function _load_fs() {
+  return _fs = _interopRequireWildcard(__webpack_require__(4));
+}
+
+var _install;
+
+function _load_install() {
+  return _install = __webpack_require__(34);
+}
+
+var _normalizePattern2;
+
+function _load_normalizePattern() {
+  return _normalizePattern2 = __webpack_require__(37);
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const semver = __webpack_require__(22);
+const path = __webpack_require__(0);
+
+const requireLockfile = exports.requireLockfile = false;
+const noArguments = exports.noArguments = true;
+
+function hasWrapper(commander) {
+  return true;
+}
+
+function setFlags(commander) {
+  commander.description('Verifies if versions in the current project’s package.json match that of yarn’s lock file.');
+  commander.option('--integrity');
+  commander.option('--verify-tree');
+}
+
+/***/ }),
+/* 357 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.run = exports.getRegistryFolder = undefined;
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+let getRegistryFolder = exports.getRegistryFolder = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, name) {
+    if (config.modulesFolder) {
+      return config.modulesFolder;
+    }
+
+    const src = path.join(config.linkFolder, name);
+
+    var _ref2 = yield config.readManifest(src);
+
+    const _registry = _ref2._registry;
+
+    invariant(_registry, 'expected registry');
+
+    const registryFolder = config.registries[_registry].folder;
+    return path.join(config.cwd, registryFolder);
+  });
+
+  return function getRegistryFolder(_x, _x2) {
+    return _ref.apply(this, arguments);
+  };
+})();
+
+let run = exports.run = (() => {
+  var _ref3 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
+    if (args.length) {
+      for (var _iterator = args, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+        var _ref4;
+
+        if (_isArray) {
+          if (_i >= _iterator.length) break;
+          _ref4 = _iterator[_i++];
+        } else {
+          _i = _iterator.next();
+          if (_i.done) break;
+          _ref4 = _i.value;
+        }
+
+        const name = _ref4;
+
+        const src = path.join(config.linkFolder, name);
+
+        if (yield (_fs || _load_fs()).exists(src)) {
+          const folder = yield getRegistryFolder(config, name);
+          const dest = path.join(folder, name);
+
+          yield (_fs || _load_fs()).unlink(dest);
+          yield (_fs || _load_fs()).mkdirp(path.dirname(dest));
+          yield (_fs || _load_fs()).symlink(src, dest);
+          reporter.success(reporter.lang('linkUsing', name));
+        } else {
+          throw new (_errors || _load_errors()).MessageError(reporter.lang('linkMissing', name));
+        }
+      }
+    } else {
+      // add cwd module to the global registry
+      const manifest = yield config.readRootManifest();
+      const name = manifest.name;
+      if (!name) {
+        throw new (_errors || _load_errors()).MessageError(reporter.lang('unknownPackageName'));
+      }
+
+      const linkLoc = path.join(config.linkFolder, name);
+      if (yield (_fs || _load_fs()).exists(linkLoc)) {
+        reporter.warn(reporter.lang('linkCollision', name));
+      } else {
+        yield (_fs || _load_fs()).mkdirp(path.dirname(linkLoc));
+        yield (_fs || _load_fs()).symlink(config.cwd, linkLoc);
+
+        // If there is a `bin` defined in the package.json,
+        // link each bin to the global bin
+        if (manifest.bin) {
+          const globalBinFolder = yield (0, (_global || _load_global()).getBinFolder)(config, flags);
+          for (const binName in manifest.bin) {
+            const binSrc = manifest.bin[binName];
+            const binSrcLoc = path.join(linkLoc, binSrc);
+            const binDestLoc = path.join(globalBinFolder, binName);
+            if (yield (_fs || _load_fs()).exists(binDestLoc)) {
+              reporter.warn(reporter.lang('binLinkCollision', binName));
+            } else {
+              if (process.platform === 'win32') {
+                yield cmdShim(binSrcLoc, binDestLoc, { createPwshFile: false });
+              } else {
+                yield (_fs || _load_fs()).symlink(binSrcLoc, binDestLoc);
+              }
+            }
+          }
+        }
+
+        reporter.success(reporter.lang('linkRegistered', name));
+        reporter.info(reporter.lang('linkRegisteredMessage', name));
+      }
+    }
+  });
+
+  return function run(_x3, _x4, _x5, _x6) {
+    return _ref3.apply(this, arguments);
+  };
+})();
+
+exports.hasWrapper = hasWrapper;
+exports.setFlags = setFlags;
+
+var _errors;
+
+function _load_errors() {
+  return _errors = __webpack_require__(6);
+}
+
+var _fs;
+
+function _load_fs() {
+  return _fs = _interopRequireWildcard(__webpack_require__(4));
+}
+
+var _global;
+
+function _load_global() {
+  return _global = __webpack_require__(121);
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const invariant = __webpack_require__(9);
+
+const cmdShim = __webpack_require__(201);
+const path = __webpack_require__(0);
+
+function hasWrapper(commander, args) {
+  return true;
+}
+
+function setFlags(commander) {
+  commander.description('Symlink a package folder during development.');
+}
+
+/***/ }),
+/* 358 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.run = exports.buildTree = exports.requireLockfile = undefined;
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+let buildTree = exports.buildTree = (() => {
+  var _ref2 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (resolver, linker, patterns, opts, onlyFresh, ignoreHoisted) {
+    const treesByKey = {};
+    const trees = [];
+    const flatTree = yield linker.getFlatHoistedTree(patterns);
+
+    // If using workspaces, filter out the virtual manifest
+    const workspaceLayout = resolver.workspaceLayout;
+
+    const hoisted = workspaceLayout && workspaceLayout.virtualManifestName ? flatTree.filter(function ([key]) {
+      return key.indexOf(workspaceLayout.virtualManifestName) === -1;
+    }) : flatTree;
+
+    const hoistedByKey = {};
+    for (var _iterator2 = hoisted, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+      var _ref4;
+
+      if (_isArray2) {
+        if (_i2 >= _iterator2.length) break;
+        _ref4 = _iterator2[_i2++];
+      } else {
+        _i2 = _iterator2.next();
+        if (_i2.done) break;
+        _ref4 = _i2.value;
+      }
+
+      const _ref3 = _ref4;
+      const key = _ref3[0];
+      const info = _ref3[1];
+
+      hoistedByKey[key] = info;
+    }
+
+    // build initial trees
+    for (var _iterator3 = hoisted, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
+      var _ref6;
+
+      if (_isArray3) {
+        if (_i3 >= _iterator3.length) break;
+        _ref6 = _iterator3[_i3++];
+      } else {
+        _i3 = _iterator3.next();
+        if (_i3.done) break;
+        _ref6 = _i3.value;
+      }
+
+      const _ref5 = _ref6;
+      const info = _ref5[1];
+
+      const ref = info.pkg._reference;
+      const hint = null;
+      const parent = getParent(info.key, treesByKey);
+      const children = [];
+      let depth = 0;
+      let color = 'bold';
+      invariant(ref, 'expected reference');
+
+      if (onlyFresh) {
+        let isFresh = false;
+        for (var _iterator5 = ref.patterns, _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
+          var _ref9;
+
+          if (_isArray5) {
+            if (_i5 >= _iterator5.length) break;
+            _ref9 = _iterator5[_i5++];
+          } else {
+            _i5 = _iterator5.next();
+            if (_i5.done) break;
+            _ref9 = _i5.value;
+          }
+
+          const pattern = _ref9;
+
+          if (resolver.isNewPattern(pattern)) {
+            isFresh = true;
+            break;
+          }
+        }
+        if (!isFresh) {
+          continue;
+        }
+      }
+
+      if (info.originalKey !== info.key || opts.reqDepth === 0) {
+        // was hoisted
+        color = null;
+      }
+      // check parent to obtain next depth
+      if (parent && parent.depth > 0) {
+        depth = parent.depth + 1;
+      } else {
+        depth = 0;
+      }
+
+      const topLevel = opts.reqDepth === 0 && !parent;
+      const showAll = opts.reqDepth === -1;
+      const nextDepthIsValid = depth + 1 <= Number(opts.reqDepth);
+
+      if (topLevel || nextDepthIsValid || showAll) {
+        treesByKey[info.key] = {
+          name: `${info.pkg.name}@${info.pkg.version}`,
+          children,
+          hint,
+          color,
+          depth
+        };
+      }
+
+      // add in dummy children for hoisted dependencies
+      const nextChildDepthIsValid = depth + 1 < Number(opts.reqDepth);
+      invariant(ref, 'expected reference');
+      if (!ignoreHoisted && nextDepthIsValid || showAll) {
+        for (var _iterator6 = resolver.dedupePatterns(ref.dependencies), _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) {
+          var _ref10;
+
+          if (_isArray6) {
+            if (_i6 >= _iterator6.length) break;
+            _ref10 = _iterator6[_i6++];
+          } else {
+            _i6 = _iterator6.next();
+            if (_i6.done) break;
+            _ref10 = _i6.value;
+          }
+
+          const pattern = _ref10;
+
+          const pkg = resolver.getStrictResolvedPattern(pattern);
+
+          if (!hoistedByKey[`${info.key}#${pkg.name}`] && (nextChildDepthIsValid || showAll)) {
+            children.push({
+              name: pattern,
+              color: 'dim',
+              shadow: true
+            });
+          }
+        }
+      }
+    }
+
+    // add children
+    for (var _iterator4 = hoisted, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
+      var _ref8;
+
+      if (_isArray4) {
+        if (_i4 >= _iterator4.length) break;
+        _ref8 = _iterator4[_i4++];
+      } else {
+        _i4 = _iterator4.next();
+        if (_i4.done) break;
+        _ref8 = _i4.value;
+      }
+
+      const _ref7 = _ref8;
+      const info = _ref7[1];
+
+      const tree = treesByKey[info.key];
+      const parent = getParent(info.key, treesByKey);
+      if (!tree) {
+        continue;
+      }
+
+      if (info.key.split('#').length === 1) {
+        trees.push(tree);
+        continue;
+      }
+
+      if (parent) {
+        parent.children.push(tree);
+      }
+    }
+
+    return { trees, count: buildCount(trees) };
+  });
+
+  return function buildTree(_x, _x2, _x3, _x4, _x5, _x6) {
+    return _ref2.apply(this, arguments);
+  };
+})();
+
+let run = exports.run = (() => {
+  var _ref11 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
+    const lockfile = yield (_lockfile || _load_lockfile()).default.fromDirectory(config.lockfileFolder, reporter);
+    const install = new (_install || _load_install()).Install(flags, config, reporter, lockfile);
+
+    var _ref12 = yield install.fetchRequestFromCwd();
+
+    const depRequests = _ref12.requests,
+          patterns = _ref12.patterns,
+          manifest = _ref12.manifest,
+          workspaceLayout = _ref12.workspaceLayout;
+
+    yield install.resolver.init(depRequests, {
+      isFlat: install.flags.flat,
+      isFrozen: install.flags.frozenLockfile,
+      workspaceLayout
+    });
+
+    let activePatterns = [];
+    if (config.production) {
+      const devDeps = getDevDeps(manifest);
+      activePatterns = patterns.filter(function (pattern) {
+        return !devDeps.has(pattern);
+      });
+    } else {
+      activePatterns = patterns;
+    }
+
+    const opts = {
+      reqDepth: getReqDepth(flags.depth)
+    };
+
+    var _ref13 = yield buildTree(install.resolver, install.linker, activePatterns, opts);
+
+    let trees = _ref13.trees;
+
+
+    if (args.length) {
+      reporter.warn(reporter.lang('deprecatedListArgs'));
+    }
+    if (args.length || flags.pattern) {
+      trees = trees.filter(function (tree) {
+        return filterTree(tree, args, flags.pattern);
+      });
+    }
+
+    reporter.tree('list', trees, { force: true });
+  });
+
+  return function run(_x7, _x8, _x9, _x10) {
+    return _ref11.apply(this, arguments);
+  };
+})();
+
+exports.getParent = getParent;
+exports.hasWrapper = hasWrapper;
+exports.setFlags = setFlags;
+exports.getReqDepth = getReqDepth;
+exports.filterTree = filterTree;
+exports.getDevDeps = getDevDeps;
+
+var _install;
+
+function _load_install() {
+  return _install = __webpack_require__(34);
+}
+
+var _lockfile;
+
+function _load_lockfile() {
+  return _lockfile = _interopRequireDefault(__webpack_require__(19));
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const invariant = __webpack_require__(9);
+
+const micromatch = __webpack_require__(114);
+
+const requireLockfile = exports.requireLockfile = true;
+
+function buildCount(trees) {
+  if (!trees || !trees.length) {
+    return 0;
+  }
+
+  let count = 0;
+
+  for (var _iterator = trees, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+    var _ref;
+
+    if (_isArray) {
+      if (_i >= _iterator.length) break;
+      _ref = _iterator[_i++];
+    } else {
+      _i = _iterator.next();
+      if (_i.done) break;
+      _ref = _i.value;
+    }
+
+    const tree = _ref;
+
+    if (tree.shadow) {
+      continue;
+    }
+
+    count++;
+    count += buildCount(tree.children);
+  }
+
+  return count;
+}
+
+function getParent(key, treesByKey) {
+  const parentKey = key.slice(0, key.lastIndexOf('#'));
+  return treesByKey[parentKey];
+}
+
+function hasWrapper(commander, args) {
+  return true;
+}
+
+function setFlags(commander) {
+  commander.description('Lists installed packages.');
+  commander.option('--depth [depth]', 'Limit the depth of the shown dependencies');
+  commander.option('--pattern [pattern]', 'Filter dependencies by pattern');
+}
+
+function getReqDepth(inputDepth) {
+  return inputDepth && /^\d+$/.test(inputDepth) ? Number(inputDepth) : -1;
+}
+
+function filterTree(tree, filters, pattern = '') {
+  if (tree.children) {
+    tree.children = tree.children.filter(child => filterTree(child, filters, pattern));
+  }
+
+  const notDim = tree.color !== 'dim';
+  const hasChildren = tree.children == null ? false : tree.children.length > 0;
+  const name = tree.name.slice(0, tree.name.lastIndexOf('@'));
+  const found = micromatch.any(name, filters) || micromatch.contains(name, pattern);
+
+  return notDim && (found || hasChildren);
+}
+
+function getDevDeps(manifest) {
+  if (manifest.devDependencies) {
+    return new Set(Object.keys(manifest.devDependencies).map(key => `${key}@${manifest.devDependencies[key]}`));
+  } else {
+    return new Set();
+  }
+}
+
+/***/ }),
+/* 359 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.run = exports.requireLockfile = undefined;
+
+var _extends2;
+
+function _load_extends() {
+  return _extends2 = _interopRequireDefault(__webpack_require__(21));
+}
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+let run = exports.run = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
+    const isWorkspaceRoot = config.workspaceRootFolder && config.cwd === config.workspaceRootFolder;
+
+    if (!args.length) {
+      throw new (_errors || _load_errors()).MessageError(reporter.lang('tooFewArguments', 1));
+    }
+
+    // running "yarn remove something" in a workspace root is often a mistake
+    if (isWorkspaceRoot && !flags.ignoreWorkspaceRootCheck) {
+      throw new (_errors || _load_errors()).MessageError(reporter.lang('workspacesRemoveRootCheck'));
+    }
+
+    const totalSteps = args.length + 1;
+    let step = 0;
+
+    // load manifests
+    const lockfile = yield (_lockfile || _load_lockfile()).default.fromDirectory(config.lockfileFolder);
+    const rootManifests = yield config.getRootManifests();
+    const manifests = [];
+
+    for (var _iterator = args, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+      var _ref2;
+
+      if (_isArray) {
+        if (_i >= _iterator.length) break;
+        _ref2 = _iterator[_i++];
+      } else {
+        _i = _iterator.next();
+        if (_i.done) break;
+        _ref2 = _i.value;
+      }
+
+      const name = _ref2;
+
+      reporter.step(++step, totalSteps, `Removing module ${name}`, emoji.get('wastebasket'));
+
+      let found = false;
+
+      for (var _iterator2 = Object.keys((_index || _load_index()).registries), _isArray2 = Array.isArray(_iterator2), _i3 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+        var _ref3;
+
+        if (_isArray2) {
+          if (_i3 >= _iterator2.length) break;
+          _ref3 = _iterator2[_i3++];
+        } else {
+          _i3 = _iterator2.next();
+          if (_i3.done) break;
+          _ref3 = _i3.value;
+        }
+
+        const registryName = _ref3;
+
+        const registry = config.registries[registryName];
+        const object = rootManifests[registryName].object;
+
+        for (var _iterator3 = (_constants || _load_constants()).DEPENDENCY_TYPES, _isArray3 = Array.isArray(_iterator3), _i4 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
+          var _ref4;
+
+          if (_isArray3) {
+            if (_i4 >= _iterator3.length) break;
+            _ref4 = _iterator3[_i4++];
+          } else {
+            _i4 = _iterator3.next();
+            if (_i4.done) break;
+            _ref4 = _i4.value;
+          }
+
+          const type = _ref4;
+
+          const deps = object[type];
+          if (deps && deps[name]) {
+            found = true;
+            delete deps[name];
+          }
+        }
+
+        const possibleManifestLoc = path.join(config.cwd, registry.folder, name);
+        if (yield (_fs || _load_fs()).exists(possibleManifestLoc)) {
+          const manifest = yield config.maybeReadManifest(possibleManifestLoc, registryName);
+          if (manifest) {
+            manifests.push([possibleManifestLoc, manifest]);
+          }
+        }
+      }
+
+      if (!found) {
+        throw new (_errors || _load_errors()).MessageError(reporter.lang('moduleNotInManifest'));
+      }
+    }
+
+    // save manifests
+    yield config.saveRootManifests(rootManifests);
+
+    // run hooks - npm runs these one after another
+    var _arr = ['preuninstall', 'uninstall', 'postuninstall'];
+    for (var _i2 = 0; _i2 < _arr.length; _i2++) {
+      const action = _arr[_i2];
+      for (var _iterator4 = manifests, _isArray4 = Array.isArray(_iterator4), _i5 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
+        var _ref6;
+
+        if (_isArray4) {
+          if (_i5 >= _iterator4.length) break;
+          _ref6 = _iterator4[_i5++];
+        } else {
+          _i5 = _iterator4.next();
+          if (_i5.done) break;
+          _ref6 = _i5.value;
+        }
+
+        const _ref5 = _ref6;
+        const loc = _ref5[0];
+
+        yield config.executeLifecycleScript(action, loc);
+      }
+    }
+
+    // reinstall so we can get the updated lockfile
+    reporter.step(++step, totalSteps, reporter.lang('uninstallRegenerate'), emoji.get('hammer'));
+    const installFlags = (0, (_extends2 || _load_extends()).default)({ force: true, workspaceRootIsCwd: true }, flags);
+    const reinstall = new (_install || _load_install()).Install(installFlags, config, new (_index2 || _load_index2()).NoopReporter(), lockfile);
+    yield reinstall.init();
+
+    //
+    reporter.success(reporter.lang('uninstalledPackages'));
+  });
+
+  return function run(_x, _x2, _x3, _x4) {
+    return _ref.apply(this, arguments);
+  };
+})();
+
+exports.setFlags = setFlags;
+exports.hasWrapper = hasWrapper;
+
+var _lockfile;
+
+function _load_lockfile() {
+  return _lockfile = _interopRequireDefault(__webpack_require__(19));
+}
+
+var _index;
+
+function _load_index() {
+  return _index = __webpack_require__(57);
+}
+
+var _install;
+
+function _load_install() {
+  return _install = __webpack_require__(34);
+}
+
+var _errors;
+
+function _load_errors() {
+  return _errors = __webpack_require__(6);
+}
+
+var _index2;
+
+function _load_index2() {
+  return _index2 = __webpack_require__(200);
+}
+
+var _fs;
+
+function _load_fs() {
+  return _fs = _interopRequireWildcard(__webpack_require__(4));
+}
+
+var _constants;
+
+function _load_constants() {
+  return _constants = _interopRequireWildcard(__webpack_require__(8));
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const path = __webpack_require__(0);
+
+const emoji = __webpack_require__(302);
+
+const requireLockfile = exports.requireLockfile = true;
+
+function setFlags(commander) {
+  commander.description('Removes a package from your direct dependencies updating your package.json and yarn.lock.');
+  commander.usage('remove [packages ...] [flags]');
+  commander.option('-W, --ignore-workspace-root-check', 'required to run yarn remove inside a workspace root');
+}
+
+function hasWrapper(commander, args) {
+  return true;
+}
+
+/***/ }),
+/* 360 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.run = exports.getBinEntries = undefined;
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+let getBinEntries = exports.getBinEntries = (() => {
+  var _ref3 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config) {
+    const binFolders = new Set();
+    const binEntries = new Map();
+
+    // Setup the node_modules/.bin folders for analysis
+    for (var _iterator2 = config.registryFolders, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+      var _ref4;
+
+      if (_isArray2) {
+        if (_i2 >= _iterator2.length) break;
+        _ref4 = _iterator2[_i2++];
+      } else {
+        _i2 = _iterator2.next();
+        if (_i2.done) break;
+        _ref4 = _i2.value;
+      }
+
+      const registryFolder = _ref4;
+
+      binFolders.add(path.resolve(config.lockfileFolder, registryFolder, '.bin'));
+    }
+
+    // Same thing, but for the pnp dependencies, located inside the cache
+    if (yield (_fs || _load_fs()).exists(`${config.lockfileFolder}/${(_constants || _load_constants()).PNP_FILENAME}`)) {
+      const pnpApi = (0, (_dynamicRequire || _load_dynamicRequire()).dynamicRequire)(`${config.lockfileFolder}/${(_constants || _load_constants()).PNP_FILENAME}`);
+
+      const packageLocator = pnpApi.findPackageLocator(`${config.cwd}/`);
+      const packageInformation = pnpApi.getPackageInformation(packageLocator);
+
+      for (var _iterator3 = packageInformation.packageDependencies.entries(), _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
+        var _ref6;
+
+        if (_isArray3) {
+          if (_i3 >= _iterator3.length) break;
+          _ref6 = _iterator3[_i3++];
+        } else {
+          _i3 = _iterator3.next();
+          if (_i3.done) break;
+          _ref6 = _i3.value;
+        }
+
+        const _ref5 = _ref6;
+        const name = _ref5[0];
+        const reference = _ref5[1];
+
+        const dependencyInformation = pnpApi.getPackageInformation({ name, reference });
+
+        if (dependencyInformation.packageLocation) {
+          binFolders.add(`${dependencyInformation.packageLocation}/.bin`);
+        }
+      }
+    }
+
+    // Build up a list of possible scripts by exploring the folders marked for analysis
+    for (var _iterator4 = binFolders, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
+      var _ref7;
+
+      if (_isArray4) {
+        if (_i4 >= _iterator4.length) break;
+        _ref7 = _iterator4[_i4++];
+      } else {
+        _i4 = _iterator4.next();
+        if (_i4.done) break;
+        _ref7 = _i4.value;
+      }
+
+      const binFolder = _ref7;
+
+      if (yield (_fs || _load_fs()).exists(binFolder)) {
+        for (var _iterator5 = yield (_fs || _load_fs()).readdir(binFolder), _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
+          var _ref8;
+
+          if (_isArray5) {
+            if (_i5 >= _iterator5.length) break;
+            _ref8 = _iterator5[_i5++];
+          } else {
+            _i5 = _iterator5.next();
+            if (_i5.done) break;
+            _ref8 = _i5.value;
+          }
+
+          const name = _ref8;
+
+          binEntries.set(name, path.join(binFolder, name));
+        }
+      }
+    }
+
+    return binEntries;
+  });
+
+  return function getBinEntries(_x) {
+    return _ref3.apply(this, arguments);
+  };
+})();
+
+let run = exports.run = (() => {
+  var _ref9 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
+    let realRunCommand = (() => {
+      var _ref13 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (action, args) {
+        // build up list of commands
+        const cmds = [];
+
+        if (pkgScripts && action in pkgScripts) {
+          const preAction = `pre${action}`;
+          if (preAction in pkgScripts) {
+            cmds.push([preAction, pkgScripts[preAction]]);
+          }
+
+          const script = scripts.get(action);
+          invariant(script, 'Script must exist');
+          cmds.push([action, script]);
+
+          const postAction = `post${action}`;
+          if (postAction in pkgScripts) {
+            cmds.push([postAction, pkgScripts[postAction]]);
+          }
+        } else if (scripts.has(action)) {
+          const script = scripts.get(action);
+          invariant(script, 'Script must exist');
+          cmds.push([action, script]);
+        }
+
+        if (cmds.length) {
+          const ignoreEngines = !!(flags.ignoreEngines || config.getOption('ignore-engines'));
+          try {
+            yield (0, (_packageCompatibility || _load_packageCompatibility()).checkOne)(pkg, config, ignoreEngines);
+          } catch (err) {
+            throw err instanceof (_errors || _load_errors()).MessageError ? new (_errors || _load_errors()).MessageError(reporter.lang('cannotRunWithIncompatibleEnv')) : err;
+          }
+
+          // Disable wrapper in executed commands
+          process.env.YARN_WRAP_OUTPUT = 'false';
+          for (var _iterator8 = cmds, _isArray8 = Array.isArray(_iterator8), _i8 = 0, _iterator8 = _isArray8 ? _iterator8 : _iterator8[Symbol.iterator]();;) {
+            var _ref15;
+
+            if (_isArray8) {
+              if (_i8 >= _iterator8.length) break;
+              _ref15 = _iterator8[_i8++];
+            } else {
+              _i8 = _iterator8.next();
+              if (_i8.done) break;
+              _ref15 = _i8.value;
+            }
+
+            const _ref14 = _ref15;
+            const stage = _ref14[0];
+            const cmd = _ref14[1];
+
+            // only tack on trailing arguments for default script, ignore for pre and post - #1595
+            const cmdWithArgs = stage === action ? sh`${unquoted(cmd)} ${args}` : cmd;
+            const customShell = config.getOption('script-shell');
+            yield (0, (_executeLifecycleScript || _load_executeLifecycleScript()).execCommand)({
+              stage,
+              config,
+              cmd: cmdWithArgs,
+              cwd: flags.into || config.cwd,
+              isInteractive: true,
+              customShell: customShell ? String(customShell) : undefined
+            });
+          }
+        } else if (action === 'env') {
+          reporter.log(JSON.stringify((yield (0, (_executeLifecycleScript || _load_executeLifecycleScript()).makeEnv)('env', config.cwd, config)), null, 2), { force: true });
+        } else {
+          let suggestion;
+
+          for (const commandName in scripts) {
+            const steps = leven(commandName, action);
+            if (steps < 2) {
+              suggestion = commandName;
+            }
+          }
+
+          let msg = `Command ${JSON.stringify(action)} not found.`;
+          if (suggestion) {
+            msg += ` Did you mean ${JSON.stringify(suggestion)}?`;
+          }
+          throw new (_errors || _load_errors()).MessageError(msg);
+        }
+      });
+
+      return function realRunCommand(_x6, _x7) {
+        return _ref13.apply(this, arguments);
+      };
+    })();
+
+    // list possible scripts if none specified
+
+
+    const pkg = yield config.readManifest(config.cwd);
+
+    const binCommands = new Set();
+    const pkgCommands = new Set();
+
+    const scripts = new Map();
+
+    for (var _iterator6 = yield getBinEntries(config), _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) {
+      var _ref11;
+
+      if (_isArray6) {
+        if (_i6 >= _iterator6.length) break;
+        _ref11 = _iterator6[_i6++];
+      } else {
+        _i6 = _iterator6.next();
+        if (_i6.done) break;
+        _ref11 = _i6.value;
+      }
+
+      const _ref10 = _ref11;
+      const name = _ref10[0];
+      const loc = _ref10[1];
+
+      scripts.set(name, quoteForShell(loc));
+      binCommands.add(name);
+    }
+
+    const pkgScripts = pkg.scripts;
+
+    if (pkgScripts) {
+      for (var _iterator7 = Object.keys(pkgScripts).sort(), _isArray7 = Array.isArray(_iterator7), _i7 = 0, _iterator7 = _isArray7 ? _iterator7 : _iterator7[Symbol.iterator]();;) {
+        var _ref12;
+
+        if (_isArray7) {
+          if (_i7 >= _iterator7.length) break;
+          _ref12 = _iterator7[_i7++];
+        } else {
+          _i7 = _iterator7.next();
+          if (_i7.done) break;
+          _ref12 = _i7.value;
+        }
+
+        const name = _ref12;
+
+        scripts.set(name, pkgScripts[name] || '');
+        pkgCommands.add(name);
+      }
+    }
+
+    function runCommand([action, ...args]) {
+      return (0, (_hooks || _load_hooks()).callThroughHook)('runScript', () => realRunCommand(action, args), { action, args });
+    }
+
+    if (args.length === 0) {
+      if (binCommands.size > 0) {
+        reporter.info(`${reporter.lang('binCommands') + Array.from(binCommands).join(', ')}`);
+      } else {
+        reporter.error(reporter.lang('noBinAvailable'));
+      }
+
+      const printedCommands = new Map();
+
+      for (var _iterator9 = pkgCommands, _isArray9 = Array.isArray(_iterator9), _i9 = 0, _iterator9 = _isArray9 ? _iterator9 : _iterator9[Symbol.iterator]();;) {
+        var _ref16;
+
+        if (_isArray9) {
+          if (_i9 >= _iterator9.length) break;
+          _ref16 = _iterator9[_i9++];
+        } else {
+          _i9 = _iterator9.next();
+          if (_i9.done) break;
+          _ref16 = _i9.value;
+        }
+
+        const pkgCommand = _ref16;
+
+        const action = scripts.get(pkgCommand);
+        invariant(action, 'Action must exists');
+        printedCommands.set(pkgCommand, action);
+      }
+
+      if (pkgCommands.size > 0) {
+        reporter.info(`${reporter.lang('possibleCommands')}`);
+        reporter.list('possibleCommands', Array.from(pkgCommands), toObject(printedCommands));
+        if (!flags.nonInteractive) {
+          yield reporter.question(reporter.lang('commandQuestion')).then(function (answer) {
+            return runCommand(answer.trim().split(' '));
+          }, function () {
+            return reporter.error(reporter.lang('commandNotSpecified'));
+          });
+        }
+      } else {
+        reporter.error(reporter.lang('noScriptsAvailable'));
+      }
+      return Promise.resolve();
+    } else {
+      return runCommand(args);
+    }
+  });
+
+  return function run(_x2, _x3, _x4, _x5) {
+    return _ref9.apply(this, arguments);
+  };
+})();
+
+exports.setFlags = setFlags;
+exports.hasWrapper = hasWrapper;
+
+var _executeLifecycleScript;
+
+function _load_executeLifecycleScript() {
+  return _executeLifecycleScript = __webpack_require__(111);
+}
+
+var _dynamicRequire;
+
+function _load_dynamicRequire() {
+  return _dynamicRequire = __webpack_require__(371);
+}
+
+var _hooks;
+
+function _load_hooks() {
+  return _hooks = __webpack_require__(374);
+}
+
+var _errors;
+
+function _load_errors() {
+  return _errors = __webpack_require__(6);
+}
+
+var _packageCompatibility;
+
+function _load_packageCompatibility() {
+  return _packageCompatibility = __webpack_require__(209);
+}
+
+var _fs;
+
+function _load_fs() {
+  return _fs = _interopRequireWildcard(__webpack_require__(4));
+}
+
+var _constants;
+
+function _load_constants() {
+  return _constants = _interopRequireWildcard(__webpack_require__(8));
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const invariant = __webpack_require__(9);
+
+const leven = __webpack_require__(747);
+const path = __webpack_require__(0);
+
+var _require = __webpack_require__(780);
+
+const quoteForShell = _require.quoteForShell,
+      sh = _require.sh,
+      unquoted = _require.unquoted;
+
+
+function toObject(input) {
+  const output = Object.create(null);
+
+  for (var _iterator = input.entries(), _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+    var _ref2;
+
+    if (_isArray) {
+      if (_i >= _iterator.length) break;
+      _ref2 = _iterator[_i++];
+    } else {
+      _i = _iterator.next();
+      if (_i.done) break;
+      _ref2 = _i.value;
+    }
+
+    const _ref = _ref2;
+    const key = _ref[0];
+    const val = _ref[1];
+
+    output[key] = val;
+  }
+
+  return output;
+}
+
+function setFlags(commander) {
+  commander.description('Runs a defined package script.');
+}
+
+function hasWrapper(commander, args) {
+  return true;
+}
+
+/***/ }),
+/* 361 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.examples = exports.hasWrapper = exports.run = exports.getName = undefined;
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+let getName = exports.getName = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (args, config) {
+    let name = args.shift();
+
+    if (!name) {
+      const pkg = yield config.readRootManifest();
+      name = pkg.name;
+    }
+
+    if (name) {
+      if (!(0, (_validate || _load_validate()).isValidPackageName)(name)) {
+        throw new (_errors || _load_errors()).MessageError(config.reporter.lang('invalidPackageName'));
+      }
+
+      return (_npmRegistry || _load_npmRegistry()).default.escapeName(name);
+    } else {
+      throw new (_errors || _load_errors()).MessageError(config.reporter.lang('unknownPackageName'));
+    }
+  });
+
+  return function getName(_x, _x2) {
+    return _ref.apply(this, arguments);
+  };
+})();
+
+let list = (() => {
+  var _ref2 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
+    const name = yield getName(args, config);
+
+    reporter.step(1, 1, reporter.lang('gettingTags'));
+    const tags = yield config.registries.npm.request(`-/package/${name}/dist-tags`);
+
+    if (tags) {
+      reporter.info(`Package ${name}`);
+      for (const name in tags) {
+        reporter.info(`${name}: ${tags[name]}`);
+      }
+    }
+
+    if (!tags) {
+      throw new (_errors || _load_errors()).MessageError(reporter.lang('packageNotFoundRegistry', name, 'npm'));
+    }
+  });
+
+  return function list(_x3, _x4, _x5, _x6) {
+    return _ref2.apply(this, arguments);
+  };
+})();
+
+let remove = (() => {
+  var _ref3 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
+    if (args.length !== 2) {
+      return false;
+    }
+
+    const name = yield getName(args, config);
+    const tag = args.shift();
+
+    reporter.step(1, 3, reporter.lang('loggingIn'));
+    const revoke = yield (0, (_login || _load_login()).getToken)(config, reporter, name);
+
+    reporter.step(2, 3, reporter.lang('deletingTags'));
+    const result = yield config.registries.npm.request(`-/package/${name}/dist-tags/${encodeURI(tag)}`, {
+      method: 'DELETE'
+    });
+
+    if (result === false) {
+      reporter.error(reporter.lang('deletedTagFail'));
+    } else {
+      reporter.success(reporter.lang('deletedTag'));
+    }
+
+    reporter.step(3, 3, reporter.lang('revokingToken'));
+    yield revoke();
+
+    if (result === false) {
+      throw new Error();
+    } else {
+      return true;
+    }
+  });
+
+  return function remove(_x7, _x8, _x9, _x10) {
+    return _ref3.apply(this, arguments);
+  };
+})();
+
+exports.setFlags = setFlags;
+
+var _buildSubCommands2;
+
+function _load_buildSubCommands() {
+  return _buildSubCommands2 = _interopRequireDefault(__webpack_require__(59));
+}
+
+var _login;
+
+function _load_login() {
+  return _login = __webpack_require__(107);
+}
+
+var _npmRegistry;
+
+function _load_npmRegistry() {
+  return _npmRegistry = _interopRequireDefault(__webpack_require__(88));
+}
+
+var _errors;
+
+function _load_errors() {
+  return _errors = __webpack_require__(6);
+}
+
+var _normalizePattern2;
+
+function _load_normalizePattern() {
+  return _normalizePattern2 = __webpack_require__(37);
+}
+
+var _validate;
+
+function _load_validate() {
+  return _validate = __webpack_require__(125);
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function setFlags(commander) {
+  commander.description('Add, remove, or list tags on a package.');
+}
+
+var _buildSubCommands = (0, (_buildSubCommands2 || _load_buildSubCommands()).default)('tag', {
+  add(config, reporter, flags, args) {
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      if (args.length !== 2) {
+        return false;
+      }
+
+      var _normalizePattern = (0, (_normalizePattern2 || _load_normalizePattern()).normalizePattern)(args.shift());
+
+      const name = _normalizePattern.name,
+            range = _normalizePattern.range,
+            hasVersion = _normalizePattern.hasVersion;
+
+      if (!hasVersion) {
+        throw new (_errors || _load_errors()).MessageError(reporter.lang('requiredVersionInRange'));
+      }
+      if (!(0, (_validate || _load_validate()).isValidPackageName)(name)) {
+        throw new (_errors || _load_errors()).MessageError(reporter.lang('invalidPackageName'));
+      }
+
+      const tag = args.shift();
+
+      reporter.step(1, 3, reporter.lang('loggingIn'));
+      const revoke = yield (0, (_login || _load_login()).getToken)(config, reporter, name);
+
+      reporter.step(2, 3, reporter.lang('creatingTag', tag, range));
+      const result = yield config.registries.npm.request(`-/package/${(_npmRegistry || _load_npmRegistry()).default.escapeName(name)}/dist-tags/${encodeURI(tag)}`, {
+        method: 'PUT',
+        body: range
+      });
+
+      if (result != null && result.ok) {
+        reporter.success(reporter.lang('createdTag'));
+      } else {
+        reporter.error(reporter.lang('createdTagFail'));
+      }
+
+      reporter.step(3, 3, reporter.lang('revokingToken'));
+      yield revoke();
+
+      if (result != null && result.ok) {
+        return true;
+      } else {
+        throw new Error();
+      }
+    })();
+  },
+
+  rm(config, reporter, flags, args) {
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      reporter.warn(`\`yarn tag rm\` is deprecated. Please use \`yarn tag remove\`.`);
+      yield remove(config, reporter, flags, args);
+    })();
+  },
+
+  remove(config, reporter, flags, args) {
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      yield remove(config, reporter, flags, args);
+    })();
+  },
+
+  ls(config, reporter, flags, args) {
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      reporter.warn(`\`yarn tag ls\` is deprecated. Please use \`yarn tag list\`.`);
+      yield list(config, reporter, flags, args);
+    })();
+  },
+
+  list(config, reporter, flags, args) {
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      yield list(config, reporter, flags, args);
+    })();
+  }
+}, ['add <pkg>@<version> [<tag>]', 'remove <pkg> <tag>', 'list [<pkg>]']);
+
+const run = _buildSubCommands.run,
+      hasWrapper = _buildSubCommands.hasWrapper,
+      examples = _buildSubCommands.examples;
+exports.run = run;
+exports.hasWrapper = hasWrapper;
+exports.examples = examples;
+
+/***/ }),
+/* 362 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.run = exports.requireLockfile = undefined;
+
+var _extends2;
+
+function _load_extends() {
+  return _extends2 = _interopRequireDefault(__webpack_require__(21));
+}
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+let run = exports.run = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
+    const outdatedFieldName = flags.latest ? 'latest' : 'wanted';
+    const lockfile = yield (_lockfile || _load_lockfile()).default.fromDirectory(config.lockfileFolder);
+
+    const deps = yield (0, (_upgrade || _load_upgrade()).getOutdated)(config, reporter, (0, (_extends2 || _load_extends()).default)({}, flags, { includeWorkspaceDeps: true }), lockfile, args);
+
+    if (deps.length === 0) {
+      reporter.success(reporter.lang('allDependenciesUpToDate'));
+      return;
+    }
+
+    // Fail early with runtime compatibility checks so that it doesn't fail after you've made your selections
+    const install = new (_install || _load_install()).Install(flags, config, reporter, lockfile);
+    yield install.checkCompatibility();
+
+    const usesWorkspaces = !!config.workspaceRootFolder;
+
+    const maxLengthArr = {
+      name: 'name'.length,
+      current: 'from'.length,
+      range: 'latest'.length,
+      [outdatedFieldName]: 'to'.length,
+      workspaceName: 'workspace'.length
+    };
+
+    const keysWithDynamicLength = ['name', 'current', outdatedFieldName];
+
+    if (!flags.latest) {
+      maxLengthArr.range = 'range'.length;
+      keysWithDynamicLength.push('range');
+    }
+
+    if (usesWorkspaces) {
+      keysWithDynamicLength.push('workspaceName');
+    }
+
+    deps.forEach(function (dep) {
+      return keysWithDynamicLength.forEach(function (key) {
+        maxLengthArr[key] = Math.max(maxLengthArr[key], dep[key].length);
+      });
+    });
+
+    // Depends on maxLengthArr
+    const addPadding = function addPadding(dep) {
+      return function (key) {
+        return `${dep[key]}${' '.repeat(maxLengthArr[key] - dep[key].length)}`;
+      };
+    };
+    const headerPadding = function headerPadding(header, key) {
+      return `${reporter.format.bold.underline(header)}${' '.repeat(maxLengthArr[key] - header.length)}`;
+    };
+
+    const colorizeName = function colorizeName(from, to) {
+      return reporter.format[(0, (_colorForVersions || _load_colorForVersions()).default)(from, to)];
+    };
+
+    const getNameFromHint = function getNameFromHint(hint) {
+      return hint ? `${hint}Dependencies` : 'dependencies';
+    };
+
+    const makeRow = function makeRow(dep) {
+      const padding = addPadding(dep);
+      const name = colorizeName(dep.current, dep[outdatedFieldName])(padding('name'));
+      const current = reporter.format.blue(padding('current'));
+      const latest = (0, (_colorizeDiff || _load_colorizeDiff()).default)(dep.current, padding(outdatedFieldName), reporter);
+      const url = reporter.format.cyan(dep.url);
+      const range = reporter.format.blue(flags.latest ? 'latest' : padding('range'));
+      if (usesWorkspaces) {
+        const workspace = padding('workspaceName');
+        return `${name}  ${range}  ${current}  ❯  ${latest}  ${workspace}  ${url}`;
+      } else {
+        return `${name}  ${range}  ${current}  ❯  ${latest}  ${url}`;
+      }
+    };
+
+    const makeHeaderRow = function makeHeaderRow() {
+      const name = headerPadding('name', 'name');
+      const range = headerPadding('range', 'range');
+      const from = headerPadding('from', 'current');
+      const to = headerPadding('to', outdatedFieldName);
+      const url = reporter.format.bold.underline('url');
+      if (usesWorkspaces) {
+        const workspace = headerPadding('workspace', 'workspaceName');
+        return `  ${name}  ${range}  ${from}     ${to}  ${workspace}  ${url}`;
+      } else {
+        return `  ${name}  ${range}  ${from}     ${to}  ${url}`;
+      }
+    };
+
+    const groupedDeps = deps.reduce(function (acc, dep) {
+      const hint = dep.hint,
+            name = dep.name,
+            upgradeTo = dep.upgradeTo;
+
+      const version = dep[outdatedFieldName];
+      const key = getNameFromHint(hint);
+      const xs = acc[key] || [];
+      acc[key] = xs.concat({
+        name: makeRow(dep),
+        value: dep,
+        short: `${name}@${version}`,
+        upgradeTo
+      });
+      return acc;
+    }, {});
+
+    const flatten = function flatten(xs) {
+      return xs.reduce(function (ys, y) {
+        return ys.concat(Array.isArray(y) ? flatten(y) : y);
+      }, []);
+    };
+
+    const choices = flatten(Object.keys(groupedDeps).map(function (key) {
+      return [new (_inquirer || _load_inquirer()).default.Separator(reporter.format.bold.underline.green(key)), new (_inquirer || _load_inquirer()).default.Separator(makeHeaderRow()), groupedDeps[key], new (_inquirer || _load_inquirer()).default.Separator(' ')];
+    }));
+
+    try {
+      const red = reporter.format.red('<red>');
+      const yellow = reporter.format.yellow('<yellow>');
+      const green = reporter.format.green('<green>');
+      reporter.info(reporter.lang('legendColorsForVersionUpdates', red, yellow, green));
+
+      const answers = yield reporter.prompt('Choose which packages to update.', choices, {
+        name: 'packages',
+        type: 'checkbox',
+        validate: function validate(answer) {
+          return !!answer.length || 'You must choose at least one package.';
+        }
+      });
+
+      const getPattern = function getPattern({ upgradeTo }) {
+        return upgradeTo;
+      };
+      const isHint = function isHint(x) {
+        return function ({ hint }) {
+          return hint === x;
+        };
+      };
+
+      var _arr = [null, 'dev', 'optional', 'peer'];
+      for (var _i = 0; _i < _arr.length; _i++) {
+        const hint = _arr[_i];
+        // Reset dependency flags
+        flags.dev = hint === 'dev';
+        flags.peer = hint === 'peer';
+        flags.optional = hint === 'optional';
+        flags.ignoreWorkspaceRootCheck = true;
+        flags.includeWorkspaceDeps = false;
+        flags.workspaceRootIsCwd = false;
+        const deps = answers.filter(isHint(hint));
+        if (deps.length) {
+          const install = new (_install || _load_install()).Install(flags, config, reporter, lockfile);
+
+          var _ref2 = yield install.fetchRequestFromCwd();
+
+          const packagePatterns = _ref2.requests;
+
+          const depsByWorkspace = deps.reduce(function (acc, dep) {
+            const workspaceLoc = dep.workspaceLoc;
+
+            const xs = acc[workspaceLoc] || [];
+            acc[workspaceLoc] = xs.concat(dep);
+            return acc;
+          }, {});
+          const cwd = config.cwd;
+          for (var _iterator = Object.keys(depsByWorkspace), _isArray = Array.isArray(_iterator), _i2 = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+            var _ref3;
+
+            if (_isArray) {
+              if (_i2 >= _iterator.length) break;
+              _ref3 = _iterator[_i2++];
+            } else {
+              _i2 = _iterator.next();
+              if (_i2.done) break;
+              _ref3 = _i2.value;
+            }
+
+            const loc = _ref3;
+
+            const patterns = depsByWorkspace[loc].map(getPattern);
+            (0, (_upgrade || _load_upgrade()).cleanLockfile)(lockfile, deps, packagePatterns, reporter);
+            reporter.info(reporter.lang('updateInstalling', getNameFromHint(hint)));
+            if (loc !== '') {
+              config.cwd = path.resolve(path.dirname(loc));
+            }
+            const add = new (_add || _load_add()).Add(patterns, flags, config, reporter, lockfile);
+            yield add.init();
+            config.cwd = cwd;
+          }
+        }
+      }
+    } catch (e) {
+      Promise.reject(e);
+    }
+  });
+
+  return function run(_x, _x2, _x3, _x4) {
+    return _ref.apply(this, arguments);
+  };
+})();
+
+exports.setFlags = setFlags;
+exports.hasWrapper = hasWrapper;
+
+var _inquirer;
+
+function _load_inquirer() {
+  return _inquirer = _interopRequireDefault(__webpack_require__(276));
+}
+
+var _lockfile;
+
+function _load_lockfile() {
+  return _lockfile = _interopRequireDefault(__webpack_require__(19));
+}
+
+var _add;
+
+function _load_add() {
+  return _add = __webpack_require__(165);
+}
+
+var _upgrade;
+
+function _load_upgrade() {
+  return _upgrade = __webpack_require__(207);
+}
+
+var _colorForVersions;
+
+function _load_colorForVersions() {
+  return _colorForVersions = _interopRequireDefault(__webpack_require__(369));
+}
+
+var _colorizeDiff;
+
+function _load_colorizeDiff() {
+  return _colorizeDiff = _interopRequireDefault(__webpack_require__(370));
+}
+
+var _install;
+
+function _load_install() {
+  return _install = __webpack_require__(34);
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const path = __webpack_require__(0);
+
+const requireLockfile = exports.requireLockfile = true;
+
+function setFlags(commander) {
+  commander.description('Provides an easy way to update outdated packages.');
+  commander.usage('upgrade-interactive [flags]');
+  commander.option('-S, --scope <scope>', 'upgrade packages under the specified scope');
+  commander.option('--latest', 'list the latest version of packages, ignoring version ranges in package.json');
+  commander.option('-E, --exact', 'install exact version. Only used when --latest is specified.');
+  commander.option('-T, --tilde', 'install most recent release with the same minor version. Only used when --latest is specified.');
+  commander.option('-C, --caret', 'install most recent release with the same major version. Only used when --latest is specified.');
+}
+
+function hasWrapper(commander, args) {
+  return true;
+}
+
+/***/ }),
+/* 363 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.run = exports.setVersion = undefined;
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+let setVersion = exports.setVersion = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args, required) {
+    const pkg = yield config.readRootManifest();
+    const pkgLoc = pkg._loc;
+    const scripts = (0, (_map || _load_map()).default)();
+    let newVersion = flags.newVersion;
+    let identifier = undefined;
+    if (flags.preid) {
+      identifier = flags.preid;
+    }
+    invariant(pkgLoc, 'expected package location');
+
+    if (args.length && !newVersion) {
+      throw new (_errors || _load_errors()).MessageError(reporter.lang('invalidVersionArgument', NEW_VERSION_FLAG));
+    }
+
+    function runLifecycle(lifecycle) {
+      if (scripts[lifecycle]) {
+        return (0, (_executeLifecycleScript || _load_executeLifecycleScript()).execCommand)({ stage: lifecycle, config, cmd: scripts[lifecycle], cwd: config.cwd, isInteractive: true });
+      }
+
+      return Promise.resolve();
+    }
+
+    function isCommitHooksDisabled() {
+      return flags.commitHooks === false || config.getOption('version-commit-hooks') === false;
+    }
+
+    if (pkg.scripts) {
+      // inherit `scripts` from manifest
+      Object.assign(scripts, pkg.scripts);
+    }
+
+    // get old version
+    let oldVersion = pkg.version;
+    if (oldVersion) {
+      reporter.info(`${reporter.lang('currentVersion')}: ${oldVersion}`);
+    } else {
+      oldVersion = '0.0.0';
+    }
+
+    // get new version
+    if (newVersion && !isValidNewVersion(oldVersion, newVersion, config.looseSemver, identifier)) {
+      throw new (_errors || _load_errors()).MessageError(reporter.lang('invalidVersion'));
+    }
+
+    // get new version by bumping old version, if requested
+    if (!newVersion) {
+      if (flags.major) {
+        newVersion = semver.inc(oldVersion, 'major');
+      } else if (flags.minor) {
+        newVersion = semver.inc(oldVersion, 'minor');
+      } else if (flags.patch) {
+        newVersion = semver.inc(oldVersion, 'patch');
+      } else if (flags.premajor) {
+        newVersion = semver.inc(oldVersion, 'premajor', identifier);
+      } else if (flags.preminor) {
+        newVersion = semver.inc(oldVersion, 'preminor', identifier);
+      } else if (flags.prepatch) {
+        newVersion = semver.inc(oldVersion, 'prepatch', identifier);
+      } else if (flags.prerelease) {
+        newVersion = semver.inc(oldVersion, 'prerelease', identifier);
+      }
+    }
+
+    // wasn't passed a version arg so ask interactively
+    while (!newVersion) {
+      // make sure we're not running in non-interactive mode before asking for new version
+      if (flags.nonInteractive || config.nonInteractive) {
+        // if no version is specified, use current version in package.json
+        newVersion = oldVersion;
+        break;
+      }
+
+      // Make sure we dont exit with an error message when pressing Ctrl-C or enter to abort
+      try {
+        newVersion = yield reporter.question(reporter.lang('newVersion'));
+        if (!newVersion) {
+          newVersion = oldVersion;
+        }
+      } catch (err) {
+        newVersion = oldVersion;
+      }
+
+      if (!required && !newVersion) {
+        reporter.info(`${reporter.lang('noVersionOnPublish')}: ${oldVersion}`);
+        return function () {
+          return Promise.resolve();
+        };
+      }
+
+      if (isValidNewVersion(oldVersion, newVersion, config.looseSemver, identifier)) {
+        break;
+      } else {
+        newVersion = null;
+        reporter.error(reporter.lang('invalidSemver'));
+      }
+    }
+    if (newVersion) {
+      newVersion = semver.inc(oldVersion, newVersion, config.looseSemver, identifier) || newVersion;
+    }
+    invariant(newVersion, 'expected new version');
+
+    if (newVersion === pkg.version) {
+      return function () {
+        return Promise.resolve();
+      };
+    }
+
+    yield runLifecycle('preversion');
+
+    // update version
+    reporter.info(`${reporter.lang('newVersion')}: ${newVersion}`);
+    pkg.version = newVersion;
+
+    // update versions in manifests
+    const manifests = yield config.getRootManifests();
+    for (var _iterator = (_index || _load_index()).registryNames, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+      var _ref2;
+
+      if (_isArray) {
+        if (_i >= _iterator.length) break;
+        _ref2 = _iterator[_i++];
+      } else {
+        _i = _iterator.next();
+        if (_i.done) break;
+        _ref2 = _i.value;
+      }
+
+      const registryName = _ref2;
+
+      const manifest = manifests[registryName];
+      if (manifest.exists) {
+        manifest.object.version = newVersion;
+      }
+    }
+    yield config.saveRootManifests(manifests);
+
+    yield runLifecycle('version');
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      invariant(newVersion, 'expected version');
+
+      // check if a new git tag should be created
+      if (flags.gitTagVersion && config.getOption('version-git-tag')) {
+        // add git commit and tag
+        let isGit = false;
+        const parts = config.cwd.split(path.sep);
+        while (parts.length) {
+          isGit = yield (_fs || _load_fs()).exists(path.join(parts.join(path.sep), '.git'));
+          if (isGit) {
+            break;
+          } else {
+            parts.pop();
+          }
+        }
+
+        if (isGit) {
+          const message = (flags.message || String(config.getOption('version-git-message'))).replace(/%s/g, newVersion);
+          const sign = Boolean(config.getOption('version-sign-git-tag'));
+          const flag = sign ? '-sm' : '-am';
+          const prefix = String(config.getOption('version-tag-prefix'));
+          const args = ['commit', '-m', message, ...(isCommitHooksDisabled() ? ['-n'] : [])];
+
+          const gitRoot = (yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(['rev-parse', '--show-toplevel'], { cwd: config.cwd })).trim();
+
+          // add manifest
+          yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(['add', path.relative(gitRoot, pkgLoc)], { cwd: gitRoot });
+
+          // create git commit
+          yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(args, { cwd: gitRoot });
+
+          // create git tag
+          yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(['tag', `${prefix}${newVersion}`, flag, message], { cwd: gitRoot });
+        }
+      }
+
+      yield runLifecycle('postversion');
+    });
+  });
+
+  return function setVersion(_x, _x2, _x3, _x4, _x5) {
+    return _ref.apply(this, arguments);
+  };
+})();
+
+let run = exports.run = (() => {
+  var _ref4 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
+    const commit = yield setVersion(config, reporter, flags, args, true);
+    yield commit();
+  });
+
+  return function run(_x6, _x7, _x8, _x9) {
+    return _ref4.apply(this, arguments);
+  };
+})();
+
+exports.setFlags = setFlags;
+exports.hasWrapper = hasWrapper;
+
+var _index;
+
+function _load_index() {
+  return _index = __webpack_require__(57);
+}
+
+var _executeLifecycleScript;
+
+function _load_executeLifecycleScript() {
+  return _executeLifecycleScript = __webpack_require__(111);
+}
+
+var _errors;
+
+function _load_errors() {
+  return _errors = __webpack_require__(6);
+}
+
+var _gitSpawn;
+
+function _load_gitSpawn() {
+  return _gitSpawn = __webpack_require__(373);
+}
+
+var _fs;
+
+function _load_fs() {
+  return _fs = _interopRequireWildcard(__webpack_require__(4));
+}
+
+var _map;
+
+function _load_map() {
+  return _map = _interopRequireDefault(__webpack_require__(29));
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const invariant = __webpack_require__(9);
+const semver = __webpack_require__(22);
+const path = __webpack_require__(0);
+
+const NEW_VERSION_FLAG = '--new-version [version]';
+function isValidNewVersion(oldVersion, newVersion, looseSemver, identifier) {
+  return !!(semver.valid(newVersion, looseSemver) || semver.inc(oldVersion, newVersion, looseSemver, identifier));
+}
+
+function setFlags(commander) {
+  commander.description('Update the version of your package via the command line.');
+  commander.option(NEW_VERSION_FLAG, 'new version');
+  commander.option('--major', 'auto-increment major version number');
+  commander.option('--minor', 'auto-increment minor version number');
+  commander.option('--patch', 'auto-increment patch version number');
+  commander.option('--premajor', 'auto-increment premajor version number');
+  commander.option('--preminor', 'auto-increment preminor version number');
+  commander.option('--prepatch', 'auto-increment prepatch version number');
+  commander.option('--prerelease', 'auto-increment prerelease version number');
+  commander.option('--preid [preid]', 'add a custom identifier to the prerelease');
+  commander.option('--message [message]', 'message');
+  commander.option('--no-git-tag-version', 'no git tag version');
+  commander.option('--no-commit-hooks', 'bypass git hooks when committing new version');
+}
+
+function hasWrapper(commander, args) {
+  return true;
+}
+
+/***/ }),
+/* 364 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.LocalTarballFetcher = undefined;
+
+var _extends2;
+
+function _load_extends() {
+  return _extends2 = _interopRequireDefault(__webpack_require__(21));
+}
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+var _errors;
+
+function _load_errors() {
+  return _errors = __webpack_require__(6);
+}
+
+var _constants;
+
+function _load_constants() {
+  return _constants = _interopRequireWildcard(__webpack_require__(8));
+}
+
+var _baseFetcher;
+
+function _load_baseFetcher() {
+  return _baseFetcher = _interopRequireDefault(__webpack_require__(167));
+}
+
+var _fs;
+
+function _load_fs() {
+  return _fs = _interopRequireWildcard(__webpack_require__(4));
+}
+
+var _misc;
+
+function _load_misc() {
+  return _misc = __webpack_require__(18);
+}
+
+var _normalizeUrl;
+
+function _load_normalizeUrl() {
+  return _normalizeUrl = _interopRequireDefault(__webpack_require__(402));
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const crypto = __webpack_require__(11);
+const path = __webpack_require__(0);
+const tarFs = __webpack_require__(193);
+const url = __webpack_require__(24);
+const fs = __webpack_require__(5);
+const stream = __webpack_require__(23);
+const gunzip = __webpack_require__(656);
+const invariant = __webpack_require__(9);
+const ssri = __webpack_require__(65);
+
+const RE_URL_NAME_MATCH = /\/(?:(@[^/]+)(?:\/|%2f))?[^/]+\/(?:-|_attachments)\/(?:@[^/]+\/)?([^/]+)$/;
+
+const isHashAlgorithmSupported = name => {
+  const cachedResult = isHashAlgorithmSupported.__cache[name];
+  if (cachedResult != null) {
+    return cachedResult;
+  }
+  let supported = true;
+  try {
+    crypto.createHash(name);
+  } catch (error) {
+    if (error.message !== 'Digest method not supported') {
+      throw error;
+    }
+    supported = false;
+  }
+
+  isHashAlgorithmSupported.__cache[name] = supported;
+  return supported;
+};
+isHashAlgorithmSupported.__cache = {};
+
+class TarballFetcher extends (_baseFetcher || _load_baseFetcher()).default {
+  constructor(...args) {
+    var _temp;
+
+    return _temp = super(...args), this.validateError = null, this.validateIntegrity = null, _temp;
+  }
+
+  setupMirrorFromCache() {
+    var _this = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const tarballMirrorPath = _this.getTarballMirrorPath();
+      const tarballCachePath = _this.getTarballCachePath();
+
+      if (tarballMirrorPath == null) {
+        return;
+      }
+
+      if (!(yield (_fs || _load_fs()).exists(tarballMirrorPath)) && (yield (_fs || _load_fs()).exists(tarballCachePath))) {
+        // The tarball doesn't exists in the offline cache but does in the cache; we import it to the mirror
+        yield (_fs || _load_fs()).mkdirp(path.dirname(tarballMirrorPath));
+        yield (_fs || _load_fs()).copy(tarballCachePath, tarballMirrorPath, _this.reporter);
+      }
+    })();
+  }
+
+  getTarballCachePath() {
+    return path.join(this.dest, (_constants || _load_constants()).TARBALL_FILENAME);
+  }
+
+  getTarballMirrorPath() {
+    var _url$parse = url.parse(this.reference);
+
+    const pathname = _url$parse.pathname;
+
+
+    if (pathname == null) {
+      return null;
+    }
+
+    const match = pathname.match(RE_URL_NAME_MATCH);
+
+    let packageFilename;
+    if (match) {
+      const scope = match[1],
+            tarballBasename = match[2];
+
+      packageFilename = scope ? `${scope}-${tarballBasename}` : tarballBasename;
+    } else {
+      // fallback to base name
+      packageFilename = path.basename(pathname);
+    }
+
+    return this.config.getOfflineMirrorPath(packageFilename);
+  }
+
+  createExtractor(resolve, reject, tarballPath) {
+    const hashInfo = this._supportedIntegrity({ hashOnly: true });
+    const integrityInfo = this._supportedIntegrity({ hashOnly: false });
+
+    const now = new Date();
+
+    const fs = __webpack_require__(5);
+    const patchedFs = Object.assign({}, fs, {
+      utimes: (path, atime, mtime, cb) => {
+        fs.stat(path, (err, stat) => {
+          if (err) {
+            cb(err);
+            return;
+          }
+          if (stat.isDirectory()) {
+            fs.utimes(path, atime, mtime, cb);
+            return;
+          }
+          fs.open(path, 'a', (err, fd) => {
+            if (err) {
+              cb(err);
+              return;
+            }
+            fs.futimes(fd, atime, mtime, err => {
+              if (err) {
+                fs.close(fd, () => cb(err));
+              } else {
+                fs.close(fd, err => cb(err));
+              }
+            });
+          });
+        });
+      }
+    });
+
+    const hashValidateStream = new ssri.integrityStream(hashInfo);
+    const integrityValidateStream = new ssri.integrityStream(integrityInfo);
+
+    const untarStream = tarFs.extract(this.dest, {
+      strip: 1,
+      dmode: 0o755, // all dirs should be readable
+      fmode: 0o644, // all files should be readable
+      chown: false, // don't chown. just leave as it is
+      map: header => {
+        header.mtime = now;
+        return header;
+      },
+      fs: patchedFs
+    });
+    const extractorStream = gunzip();
+
+    hashValidateStream.once('error', err => {
+      this.validateError = err;
+    });
+    integrityValidateStream.once('error', err => {
+      this.validateError = err;
+    });
+    integrityValidateStream.once('integrity', sri => {
+      this.validateIntegrity = sri;
+    });
+
+    untarStream.on('error', err => {
+      reject(new (_errors || _load_errors()).MessageError(this.config.reporter.lang('errorExtractingTarball', err.message, tarballPath)));
+    });
+
+    extractorStream.pipe(untarStream).on('finish', () => {
+      const error = this.validateError;
+      const hexDigest = this.validateIntegrity ? this.validateIntegrity.hexDigest() : '';
+      if (this.config.updateChecksums && this.remote.integrity && this.validateIntegrity && this.remote.integrity !== this.validateIntegrity.toString()) {
+        this.remote.integrity = this.validateIntegrity.toString();
+      } else if (this.validateIntegrity) {
+        this.remote.cacheIntegrity = this.validateIntegrity.toString();
+      }
+
+      if (integrityInfo.integrity && Object.keys(integrityInfo.integrity).length === 0) {
+        return reject(new (_errors || _load_errors()).SecurityError(this.config.reporter.lang('fetchBadIntegrityAlgorithm', this.packageName, this.remote.reference)));
+      }
+
+      if (error) {
+        if (this.config.updateChecksums) {
+          this.remote.integrity = error.found.toString();
+        } else {
+          return reject(new (_errors || _load_errors()).SecurityError(this.config.reporter.lang('fetchBadHashWithPath', this.packageName, this.remote.reference, error.found.toString(), error.expected.toString())));
+        }
+      }
+
+      return resolve({
+        hash: this.hash || hexDigest
+      });
+    });
+
+    return { hashValidateStream, integrityValidateStream, extractorStream };
+  }
+
+  getLocalPaths(override) {
+    const paths = [override ? path.resolve(this.config.cwd, override) : null, this.getTarballMirrorPath(), this.getTarballCachePath()];
+    // $FlowFixMe: https://github.com/facebook/flow/issues/1414
+    return paths.filter(path => path != null);
+  }
+
+  fetchFromLocal(override) {
+    var _this2 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const tarPaths = _this2.getLocalPaths(override);
+      const stream = yield (_fs || _load_fs()).readFirstAvailableStream(tarPaths);
+
+      return new Promise(function (resolve, reject) {
+        if (!stream) {
+          reject(new (_errors || _load_errors()).MessageError(_this2.reporter.lang('tarballNotInNetworkOrCache', _this2.reference, tarPaths)));
+          return;
+        }
+        invariant(stream, 'stream should be available at this point');
+        // $FlowFixMe - This is available https://nodejs.org/api/fs.html#fs_readstream_path
+        const tarballPath = stream.path;
+
+        var _createExtractor = _this2.createExtractor(resolve, reject, tarballPath);
+
+        const hashValidateStream = _createExtractor.hashValidateStream,
+              integrityValidateStream = _createExtractor.integrityValidateStream,
+              extractorStream = _createExtractor.extractorStream;
+
+
+        stream.pipe(hashValidateStream);
+        hashValidateStream.pipe(integrityValidateStream);
+
+        integrityValidateStream.pipe(extractorStream).on('error', function (err) {
+          reject(new (_errors || _load_errors()).MessageError(_this2.config.reporter.lang('fetchErrorCorrupt', err.message, tarballPath)));
+        });
+      });
+    })();
+  }
+
+  fetchFromExternal() {
+    var _this3 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const registry = _this3.config.registries[_this3.registry];
+
+      try {
+        const headers = _this3.requestHeaders();
+        return yield registry.request(_this3.reference, {
+          headers: (0, (_extends2 || _load_extends()).default)({
+            'Accept-Encoding': 'gzip'
+          }, headers),
+          buffer: true,
+          process: function process(req, resolve, reject) {
+            // should we save this to the offline cache?
+            const tarballMirrorPath = _this3.getTarballMirrorPath();
+            const tarballCachePath = _this3.getTarballCachePath();
+
+            var _createExtractor2 = _this3.createExtractor(resolve, reject);
+
+            const hashValidateStream = _createExtractor2.hashValidateStream,
+                  integrityValidateStream = _createExtractor2.integrityValidateStream,
+                  extractorStream = _createExtractor2.extractorStream;
+
+
+            req.pipe(hashValidateStream);
+            hashValidateStream.pipe(integrityValidateStream);
+
+            if (tarballMirrorPath) {
+              integrityValidateStream.pipe(fs.createWriteStream(tarballMirrorPath)).on('error', reject);
+            }
+
+            if (tarballCachePath) {
+              integrityValidateStream.pipe(fs.createWriteStream(tarballCachePath)).on('error', reject);
+            }
+
+            integrityValidateStream.pipe(extractorStream).on('error', reject);
+          }
+        }, _this3.packageName);
+      } catch (err) {
+        const tarballMirrorPath = _this3.getTarballMirrorPath();
+        const tarballCachePath = _this3.getTarballCachePath();
+
+        if (tarballMirrorPath && (yield (_fs || _load_fs()).exists(tarballMirrorPath))) {
+          yield (_fs || _load_fs()).unlink(tarballMirrorPath);
+        }
+
+        if (tarballCachePath && (yield (_fs || _load_fs()).exists(tarballCachePath))) {
+          yield (_fs || _load_fs()).unlink(tarballCachePath);
+        }
+
+        throw err;
+      }
+    })();
+  }
+
+  requestHeaders() {
+    const registry = this.config.registries.yarn;
+    const config = registry.config;
+    const requestParts = urlParts(this.reference);
+    return Object.keys(config).reduce((headers, option) => {
+      const parts = option.split(':');
+      if (parts.length === 3 && parts[1] === '_header') {
+        const registryParts = urlParts(parts[0]);
+        if (requestParts.host === registryParts.host && requestParts.path.startsWith(registryParts.path)) {
+          const headerName = parts[2];
+          const headerValue = config[option];
+          headers[headerName] = headerValue;
+        }
+      }
+      return headers;
+    }, {});
+  }
+
+  _fetch() {
+    const isFilePath = this.reference.startsWith('file:');
+    this.reference = (0, (_misc || _load_misc()).removePrefix)(this.reference, 'file:');
+    const urlParse = url.parse(this.reference);
+
+    // legacy support for local paths in yarn.lock entries
+    const isRelativePath = urlParse.protocol ? urlParse.protocol.match(/^[a-z]:$/i) : urlParse.pathname ? urlParse.pathname.match(/^(?:\.{1,2})?[\\\/]/) : false;
+
+    if (isFilePath || isRelativePath) {
+      return this.fetchFromLocal(this.reference);
+    }
+
+    return this.fetchFromLocal().catch(err => this.fetchFromExternal());
+  }
+
+  _findIntegrity({ hashOnly }) {
+    if (this.remote.integrity && !hashOnly) {
+      return ssri.parse(this.remote.integrity);
+    }
+    if (this.hash) {
+      return ssri.fromHex(this.hash, 'sha1');
+    }
+    return null;
+  }
+
+  _supportedIntegrity({ hashOnly }) {
+    const expectedIntegrity = this._findIntegrity({ hashOnly }) || {};
+    const expectedIntegrityAlgorithms = Object.keys(expectedIntegrity);
+    const shouldValidateIntegrity = (this.hash || this.remote.integrity) && !this.config.updateChecksums;
+
+    if (expectedIntegrityAlgorithms.length === 0 && (!shouldValidateIntegrity || hashOnly)) {
+      const algorithms = this.config.updateChecksums ? ['sha512'] : ['sha1'];
+      // for consistency, return sha1 for packages without a remote integrity (eg. github)
+      return { integrity: null, algorithms };
+    }
+
+    const algorithms = new Set(['sha512', 'sha1']);
+    const integrity = {};
+    for (var _iterator = expectedIntegrityAlgorithms, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+      var _ref;
+
+      if (_isArray) {
+        if (_i >= _iterator.length) break;
+        _ref = _iterator[_i++];
+      } else {
+        _i = _iterator.next();
+        if (_i.done) break;
+        _ref = _i.value;
+      }
+
+      const algorithm = _ref;
+
+      if (isHashAlgorithmSupported(algorithm)) {
+        algorithms.add(algorithm);
+        integrity[algorithm] = expectedIntegrity[algorithm];
+      }
+    }
+
+    return { integrity, algorithms: Array.from(algorithms) };
+  }
+}
+
+exports.default = TarballFetcher;
+class LocalTarballFetcher extends TarballFetcher {
+  _fetch() {
+    return this.fetchFromLocal(this.reference);
+  }
+}
+
+exports.LocalTarballFetcher = LocalTarballFetcher;
+
+
+function urlParts(requestUrl) {
+  const normalizedUrl = (0, (_normalizeUrl || _load_normalizeUrl()).default)(requestUrl);
+  const parsed = url.parse(normalizedUrl);
+  const host = parsed.host || '';
+  const path = parsed.path || '';
+  return { host, path };
+}
+
+/***/ }),
+/* 365 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _misc;
+
+function _load_misc() {
+  return _misc = __webpack_require__(18);
+}
+
+class PackageReference {
+  constructor(request, info, remote) {
+    this.resolver = request.resolver;
+    this.lockfile = request.lockfile;
+    this.requests = [];
+    this.config = request.config;
+    this.hint = request.hint;
+
+    this.isPlugnplay = false;
+
+    this.registry = remote.registry;
+    this.version = info.version;
+    this.name = info.name;
+    this.uid = info._uid;
+
+    this.remote = remote;
+
+    this.dependencies = [];
+
+    this.permissions = {};
+    this.patterns = [];
+    this.optional = null;
+    this.level = Infinity;
+    this.ignore = false;
+    this.incompatible = false;
+    this.fresh = false;
+    this.locations = [];
+    this.addRequest(request);
+  }
+
+  setFresh(fresh) {
+    this.fresh = fresh;
+  }
+
+  addLocation(loc) {
+    if (this.locations.indexOf(loc) === -1) {
+      this.locations.push(loc);
+    }
+  }
+
+  addRequest(request) {
+    this.requests.push(request);
+
+    this.level = Math.min(this.level, request.parentNames.length);
+  }
+
+  prune() {
+    for (var _iterator = this.patterns, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+      var _ref;
+
+      if (_isArray) {
+        if (_i >= _iterator.length) break;
+        _ref = _iterator[_i++];
+      } else {
+        _i = _iterator.next();
+        if (_i.done) break;
+        _ref = _i.value;
+      }
+
+      const selfPattern = _ref;
+
+      // remove ourselves from the resolver
+      this.resolver.removePattern(selfPattern);
+    }
+  }
+
+  addDependencies(deps) {
+    this.dependencies = this.dependencies.concat(deps);
+  }
+
+  setPermission(key, val) {
+    this.permissions[key] = val;
+  }
+
+  hasPermission(key) {
+    if (key in this.permissions) {
+      return this.permissions[key];
+    } else {
+      return false;
+    }
+  }
+
+  addPattern(pattern, manifest) {
+    this.resolver.addPattern(pattern, manifest);
+
+    this.patterns.push(pattern);
+
+    const shrunk = this.lockfile.getLocked(pattern);
+    if (shrunk && shrunk.permissions) {
+      for (var _iterator2 = (0, (_misc || _load_misc()).entries)(shrunk.permissions), _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+        var _ref3;
+
+        if (_isArray2) {
+          if (_i2 >= _iterator2.length) break;
+          _ref3 = _iterator2[_i2++];
+        } else {
+          _i2 = _iterator2.next();
+          if (_i2.done) break;
+          _ref3 = _i2.value;
+        }
+
+        const _ref2 = _ref3;
+        const key = _ref2[0];
+        const perm = _ref2[1];
+
+        this.setPermission(key, perm);
+      }
+    }
+  }
+
+  addOptional(optional) {
+    if (this.optional == null) {
+      // optional is uninitialised
+      this.optional = optional;
+    } else if (!optional) {
+      // otherwise, ignore all subsequent optional assignments and only accept ones making
+      // this not optional
+      this.optional = false;
+    }
+  }
+}
+exports.default = PackageReference;
+
+/***/ }),
+/* 366 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+var _index;
+
+function _load_index() {
+  return _index = __webpack_require__(78);
+}
+
+var _packageRequest;
+
+function _load_packageRequest() {
+  return _packageRequest = _interopRequireDefault(__webpack_require__(122));
+}
+
+var _normalizePattern2;
+
+function _load_normalizePattern() {
+  return _normalizePattern2 = __webpack_require__(37);
+}
+
+var _requestManager;
+
+function _load_requestManager() {
+  return _requestManager = _interopRequireDefault(__webpack_require__(378));
+}
+
+var _blockingQueue;
+
+function _load_blockingQueue() {
+  return _blockingQueue = _interopRequireDefault(__webpack_require__(110));
+}
+
+var _lockfile;
+
+function _load_lockfile() {
+  return _lockfile = _interopRequireDefault(__webpack_require__(19));
+}
+
+var _map;
+
+function _load_map() {
+  return _map = _interopRequireDefault(__webpack_require__(29));
+}
+
+var _workspaceLayout;
+
+function _load_workspaceLayout() {
+  return _workspaceLayout = _interopRequireDefault(__webpack_require__(90));
+}
+
+var _resolutionMap;
+
+function _load_resolutionMap() {
+  return _resolutionMap = _interopRequireDefault(__webpack_require__(214));
+}
+
+var _resolutionMap2;
+
+function _load_resolutionMap2() {
+  return _resolutionMap2 = __webpack_require__(214);
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const invariant = __webpack_require__(9);
+
+const semver = __webpack_require__(22);
+
+class PackageResolver {
+  constructor(config, lockfile, resolutionMap = new (_resolutionMap || _load_resolutionMap()).default(config)) {
+    this.patternsByPackage = (0, (_map || _load_map()).default)();
+    this.fetchingPatterns = new Set();
+    this.fetchingQueue = new (_blockingQueue || _load_blockingQueue()).default('resolver fetching');
+    this.patterns = (0, (_map || _load_map()).default)();
+    this.resolutionMap = resolutionMap;
+    this.usedRegistries = new Set();
+    this.flat = false;
+
+    this.reporter = config.reporter;
+    this.lockfile = lockfile;
+    this.config = config;
+    this.delayedResolveQueue = [];
+  }
+
+  // whether the dependency graph will be flattened
+
+
+  // list of registries that have been used in this resolution
+
+
+  // activity monitor
+
+
+  // patterns we've already resolved or are in the process of resolving
+
+
+  // TODO
+
+
+  // manages and throttles json api http requests
+
+
+  // list of patterns associated with a package
+
+
+  // lockfile instance which we can use to retrieve version info
+
+
+  // a map of dependency patterns to packages
+
+
+  // reporter instance, abstracts out display logic
+
+
+  // environment specific config methods and options
+
+
+  // list of packages need to be resolved later (they found a matching version in the
+  // resolver, but better matches can still arrive later in the resolve process)
+
+
+  /**
+   * TODO description
+   */
+
+  isNewPattern(pattern) {
+    return !!this.patterns[pattern].fresh;
+  }
+
+  updateManifest(ref, newPkg) {
+    // inherit fields
+    const oldPkg = this.patterns[ref.patterns[0]];
+    newPkg._reference = ref;
+    newPkg._remote = ref.remote;
+    newPkg.name = oldPkg.name;
+    newPkg.fresh = oldPkg.fresh;
+    newPkg.prebuiltVariants = oldPkg.prebuiltVariants;
+
+    // update patterns
+    for (var _iterator = ref.patterns, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+      var _ref;
+
+      if (_isArray) {
+        if (_i >= _iterator.length) break;
+        _ref = _iterator[_i++];
+      } else {
+        _i = _iterator.next();
+        if (_i.done) break;
+        _ref = _i.value;
+      }
+
+      const pattern = _ref;
+
+      this.patterns[pattern] = newPkg;
+    }
+
+    return Promise.resolve();
+  }
+
+  updateManifests(newPkgs) {
+    for (var _iterator2 = newPkgs, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+      var _ref2;
+
+      if (_isArray2) {
+        if (_i2 >= _iterator2.length) break;
+        _ref2 = _iterator2[_i2++];
+      } else {
+        _i2 = _iterator2.next();
+        if (_i2.done) break;
+        _ref2 = _i2.value;
+      }
+
+      const newPkg = _ref2;
+
+      if (newPkg._reference) {
+        for (var _iterator3 = newPkg._reference.patterns, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
+          var _ref3;
+
+          if (_isArray3) {
+            if (_i3 >= _iterator3.length) break;
+            _ref3 = _iterator3[_i3++];
+          } else {
+            _i3 = _iterator3.next();
+            if (_i3.done) break;
+            _ref3 = _i3.value;
+          }
+
+          const pattern = _ref3;
+
+          const oldPkg = this.patterns[pattern];
+          newPkg.prebuiltVariants = oldPkg.prebuiltVariants;
+
+          this.patterns[pattern] = newPkg;
+        }
+      }
+    }
+
+    return Promise.resolve();
+  }
+
+  /**
+   * Given a list of patterns, dedupe them to a list of unique patterns.
+   */
+
+  dedupePatterns(patterns) {
+    const deduped = [];
+    const seen = new Set();
+
+    for (var _iterator4 = patterns, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
+      var _ref4;
+
+      if (_isArray4) {
+        if (_i4 >= _iterator4.length) break;
+        _ref4 = _iterator4[_i4++];
+      } else {
+        _i4 = _iterator4.next();
+        if (_i4.done) break;
+        _ref4 = _i4.value;
+      }
+
+      const pattern = _ref4;
+
+      const info = this.getResolvedPattern(pattern);
+      if (seen.has(info)) {
+        continue;
+      }
+
+      seen.add(info);
+      deduped.push(pattern);
+    }
+
+    return deduped;
+  }
+
+  /**
+   * Get a list of all manifests by topological order.
+   */
+
+  getTopologicalManifests(seedPatterns) {
+    const pkgs = new Set();
+    const skip = new Set();
+
+    const add = seedPatterns => {
+      for (var _iterator5 = seedPatterns, _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
+        var _ref5;
+
+        if (_isArray5) {
+          if (_i5 >= _iterator5.length) break;
+          _ref5 = _iterator5[_i5++];
+        } else {
+          _i5 = _iterator5.next();
+          if (_i5.done) break;
+          _ref5 = _i5.value;
+        }
+
+        const pattern = _ref5;
+
+        const pkg = this.getStrictResolvedPattern(pattern);
+        if (skip.has(pkg)) {
+          continue;
+        }
+
+        const ref = pkg._reference;
+        invariant(ref, 'expected reference');
+        skip.add(pkg);
+        add(ref.dependencies);
+        pkgs.add(pkg);
+      }
+    };
+
+    add(seedPatterns);
+
+    return pkgs;
+  }
+
+  /**
+   * Get a list of all manifests by level sort order.
+   */
+
+  getLevelOrderManifests(seedPatterns) {
+    const pkgs = new Set();
+    const skip = new Set();
+
+    const add = seedPatterns => {
+      const refs = [];
+
+      for (var _iterator6 = seedPatterns, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) {
+        var _ref6;
+
+        if (_isArray6) {
+          if (_i6 >= _iterator6.length) break;
+          _ref6 = _iterator6[_i6++];
+        } else {
+          _i6 = _iterator6.next();
+          if (_i6.done) break;
+          _ref6 = _i6.value;
+        }
+
+        const pattern = _ref6;
+
+        const pkg = this.getStrictResolvedPattern(pattern);
+        if (skip.has(pkg)) {
+          continue;
+        }
+
+        const ref = pkg._reference;
+        invariant(ref, 'expected reference');
+
+        refs.push(ref);
+        skip.add(pkg);
+        pkgs.add(pkg);
+      }
+
+      for (var _iterator7 = refs, _isArray7 = Array.isArray(_iterator7), _i7 = 0, _iterator7 = _isArray7 ? _iterator7 : _iterator7[Symbol.iterator]();;) {
+        var _ref7;
+
+        if (_isArray7) {
+          if (_i7 >= _iterator7.length) break;
+          _ref7 = _iterator7[_i7++];
+        } else {
+          _i7 = _iterator7.next();
+          if (_i7.done) break;
+          _ref7 = _i7.value;
+        }
+
+        const ref = _ref7;
+
+        add(ref.dependencies);
+      }
+    };
+
+    add(seedPatterns);
+
+    return pkgs;
+  }
+
+  /**
+   * Get a list of all package names in the dependency graph.
+   */
+
+  getAllDependencyNamesByLevelOrder(seedPatterns) {
+    const names = new Set();
+    for (var _iterator8 = this.getLevelOrderManifests(seedPatterns), _isArray8 = Array.isArray(_iterator8), _i8 = 0, _iterator8 = _isArray8 ? _iterator8 : _iterator8[Symbol.iterator]();;) {
+      var _ref9;
+
+      if (_isArray8) {
+        if (_i8 >= _iterator8.length) break;
+        _ref9 = _iterator8[_i8++];
+      } else {
+        _i8 = _iterator8.next();
+        if (_i8.done) break;
+        _ref9 = _i8.value;
+      }
+
+      const _ref8 = _ref9;
+      const name = _ref8.name;
+
+      names.add(name);
+    }
+    return names;
+  }
+
+  /**
+   * Retrieve all the package info stored for this package name.
+   */
+
+  getAllInfoForPackageName(name) {
+    const patterns = this.patternsByPackage[name] || [];
+    return this.getAllInfoForPatterns(patterns);
+  }
+
+  /**
+   * Retrieve all the package info stored for a list of patterns.
+   */
+
+  getAllInfoForPatterns(patterns) {
+    const infos = [];
+    const seen = new Set();
+
+    for (var _iterator9 = patterns, _isArray9 = Array.isArray(_iterator9), _i9 = 0, _iterator9 = _isArray9 ? _iterator9 : _iterator9[Symbol.iterator]();;) {
+      var _ref10;
+
+      if (_isArray9) {
+        if (_i9 >= _iterator9.length) break;
+        _ref10 = _iterator9[_i9++];
+      } else {
+        _i9 = _iterator9.next();
+        if (_i9.done) break;
+        _ref10 = _i9.value;
+      }
+
+      const pattern = _ref10;
+
+      const info = this.patterns[pattern];
+      if (seen.has(info)) {
+        continue;
+      }
+
+      seen.add(info);
+      infos.push(info);
+    }
+
+    return infos;
+  }
+
+  /**
+   * Get a flat list of all package info.
+   */
+
+  getManifests() {
+    const infos = [];
+    const seen = new Set();
+
+    for (const pattern in this.patterns) {
+      const info = this.patterns[pattern];
+      if (seen.has(info)) {
+        continue;
+      }
+
+      infos.push(info);
+      seen.add(info);
+    }
+
+    return infos;
+  }
+
+  /**
+   * replace pattern in resolver, e.g. `name` is replaced with `name@^1.0.1`
+   */
+  replacePattern(pattern, newPattern) {
+    const pkg = this.getResolvedPattern(pattern);
+    invariant(pkg, `missing package ${pattern}`);
+    const ref = pkg._reference;
+    invariant(ref, 'expected package reference');
+    ref.patterns = [newPattern];
+    this.addPattern(newPattern, pkg);
+    this.removePattern(pattern);
+  }
+
+  /**
+   * Make all versions of this package resolve to it.
+   */
+
+  collapseAllVersionsOfPackage(name, version) {
+    const patterns = this.dedupePatterns(this.patternsByPackage[name]);
+    return this.collapsePackageVersions(name, version, patterns);
+  }
+
+  /**
+   * Make all given patterns resolve to version.
+   */
+  collapsePackageVersions(name, version, patterns) {
+    const human = `${name}@${version}`;
+
+    // get manifest that matches the version we're collapsing too
+    let collapseToReference;
+    let collapseToManifest;
+    let collapseToPattern;
+    for (var _iterator10 = patterns, _isArray10 = Array.isArray(_iterator10), _i10 = 0, _iterator10 = _isArray10 ? _iterator10 : _iterator10[Symbol.iterator]();;) {
+      var _ref11;
+
+      if (_isArray10) {
+        if (_i10 >= _iterator10.length) break;
+        _ref11 = _iterator10[_i10++];
+      } else {
+        _i10 = _iterator10.next();
+        if (_i10.done) break;
+        _ref11 = _i10.value;
+      }
+
+      const pattern = _ref11;
+
+      const _manifest = this.patterns[pattern];
+      if (_manifest.version === version) {
+        collapseToReference = _manifest._reference;
+        collapseToManifest = _manifest;
+        collapseToPattern = pattern;
+        break;
+      }
+    }
+
+    invariant(collapseToReference && collapseToManifest && collapseToPattern, `Couldn't find package manifest for ${human}`);
+
+    for (var _iterator11 = patterns, _isArray11 = Array.isArray(_iterator11), _i11 = 0, _iterator11 = _isArray11 ? _iterator11 : _iterator11[Symbol.iterator]();;) {
+      var _ref12;
+
+      if (_isArray11) {
+        if (_i11 >= _iterator11.length) break;
+        _ref12 = _iterator11[_i11++];
+      } else {
+        _i11 = _iterator11.next();
+        if (_i11.done) break;
+        _ref12 = _i11.value;
+      }
+
+      const pattern = _ref12;
+
+      // don't touch the pattern we're collapsing to
+      if (pattern === collapseToPattern) {
+        continue;
+      }
+
+      // remove this pattern
+      const ref = this.getStrictResolvedPattern(pattern)._reference;
+      invariant(ref, 'expected package reference');
+      const refPatterns = ref.patterns.slice();
+      ref.prune();
+
+      // add pattern to the manifest we're collapsing to
+      for (var _iterator12 = refPatterns, _isArray12 = Array.isArray(_iterator12), _i12 = 0, _iterator12 = _isArray12 ? _iterator12 : _iterator12[Symbol.iterator]();;) {
+        var _ref13;
+
+        if (_isArray12) {
+          if (_i12 >= _iterator12.length) break;
+          _ref13 = _iterator12[_i12++];
+        } else {
+          _i12 = _iterator12.next();
+          if (_i12.done) break;
+          _ref13 = _i12.value;
+        }
+
+        const pattern = _ref13;
+
+        collapseToReference.addPattern(pattern, collapseToManifest);
+      }
+    }
+
+    return collapseToPattern;
+  }
+
+  /**
+   * TODO description
+   */
+
+  addPattern(pattern, info) {
+    this.patterns[pattern] = info;
+
+    const byName = this.patternsByPackage[info.name] = this.patternsByPackage[info.name] || [];
+    if (byName.indexOf(pattern) === -1) {
+      byName.push(pattern);
+    }
+  }
+
+  /**
+   * TODO description
+   */
+
+  removePattern(pattern) {
+    const pkg = this.patterns[pattern];
+    if (!pkg) {
+      return;
+    }
+
+    const byName = this.patternsByPackage[pkg.name];
+    if (!byName) {
+      return;
+    }
+
+    byName.splice(byName.indexOf(pattern), 1);
+    delete this.patterns[pattern];
+  }
+
+  /**
+   * TODO description
+   */
+
+  getResolvedPattern(pattern) {
+    return this.patterns[pattern];
+  }
+
+  /**
+   * TODO description
+   */
+
+  getStrictResolvedPattern(pattern) {
+    const manifest = this.getResolvedPattern(pattern);
+    invariant(manifest, 'expected manifest');
+    return manifest;
+  }
+
+  /**
+   * TODO description
+   */
+
+  getExactVersionMatch(name, version, manifest) {
+    const patterns = this.patternsByPackage[name];
+    if (!patterns) {
+      return null;
+    }
+
+    for (var _iterator13 = patterns, _isArray13 = Array.isArray(_iterator13), _i13 = 0, _iterator13 = _isArray13 ? _iterator13 : _iterator13[Symbol.iterator]();;) {
+      var _ref14;
+
+      if (_isArray13) {
+        if (_i13 >= _iterator13.length) break;
+        _ref14 = _iterator13[_i13++];
+      } else {
+        _i13 = _iterator13.next();
+        if (_i13.done) break;
+        _ref14 = _i13.value;
+      }
+
+      const pattern = _ref14;
+
+      const info = this.getStrictResolvedPattern(pattern);
+      if (info.version === version) {
+        return info;
+      }
+    }
+
+    if (manifest && (0, (_index || _load_index()).getExoticResolver)(version)) {
+      return this.exoticRangeMatch(patterns.map(this.getStrictResolvedPattern.bind(this)), manifest);
+    }
+
+    return null;
+  }
+
+  /**
+   * Get the manifest of the highest known version that satisfies a package range
+   */
+
+  getHighestRangeVersionMatch(name, range, manifest) {
+    const patterns = this.patternsByPackage[name];
+
+    if (!patterns) {
+      return null;
+    }
+
+    const versionNumbers = [];
+    const resolvedPatterns = patterns.map(pattern => {
+      const info = this.getStrictResolvedPattern(pattern);
+      versionNumbers.push(info.version);
+
+      return info;
+    });
+
+    const maxValidRange = semver.maxSatisfying(versionNumbers, range);
+
+    if (!maxValidRange) {
+      return manifest && (0, (_index || _load_index()).getExoticResolver)(range) ? this.exoticRangeMatch(resolvedPatterns, manifest) : null;
+    }
+
+    const indexOfmaxValidRange = versionNumbers.indexOf(maxValidRange);
+    const maxValidRangeManifest = resolvedPatterns[indexOfmaxValidRange];
+
+    return maxValidRangeManifest;
+  }
+
+  /**
+   * Get the manifest of the package that matches an exotic range
+   */
+
+  exoticRangeMatch(resolvedPkgs, manifest) {
+    const remote = manifest._remote;
+    if (!(remote && remote.reference && remote.type === 'copy')) {
+      return null;
+    }
+
+    const matchedPkg = resolvedPkgs.find(({ _remote: pkgRemote }) => pkgRemote && pkgRemote.reference === remote.reference && pkgRemote.type === 'copy');
+
+    if (matchedPkg) {
+      manifest._remote = matchedPkg._remote;
+    }
+
+    return matchedPkg;
+  }
+
+  /**
+   * Determine if LockfileEntry is incorrect, remove it from lockfile cache and consider the pattern as new
+   */
+  isLockfileEntryOutdated(version, range, hasVersion) {
+    return !!(semver.validRange(range) && semver.valid(version) && !(0, (_index || _load_index()).getExoticResolver)(range) && hasVersion && !semver.satisfies(version, range));
+  }
+
+  /**
+   * TODO description
+   */
+
+  find(initialReq) {
+    var _this = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const req = _this.resolveToResolution(initialReq);
+
+      // we've already resolved it with a resolution
+      if (!req) {
+        return;
+      }
+
+      const request = new (_packageRequest || _load_packageRequest()).default(req, _this);
+      const fetchKey = `${req.registry}:${req.pattern}:${String(req.optional)}`;
+      const initialFetch = !_this.fetchingPatterns.has(fetchKey);
+      let fresh = false;
+
+      if (_this.activity) {
+        _this.activity.tick(req.pattern);
+      }
+
+      if (initialFetch) {
+        _this.fetchingPatterns.add(fetchKey);
+
+        const lockfileEntry = _this.lockfile.getLocked(req.pattern);
+
+        if (lockfileEntry) {
+          var _normalizePattern = (0, (_normalizePattern2 || _load_normalizePattern()).normalizePattern)(req.pattern);
+
+          const range = _normalizePattern.range,
+                hasVersion = _normalizePattern.hasVersion;
+
+
+          if (_this.isLockfileEntryOutdated(lockfileEntry.version, range, hasVersion)) {
+            _this.reporter.warn(_this.reporter.lang('incorrectLockfileEntry', req.pattern));
+            _this.removePattern(req.pattern);
+            _this.lockfile.removePattern(req.pattern);
+            fresh = true;
+          }
+        } else {
+          fresh = true;
+        }
+
+        request.init();
+      }
+
+      yield request.find({ fresh, frozen: _this.frozen });
+    })();
+  }
+
+  /**
+   * TODO description
+   */
+
+  init(deps, { isFlat, isFrozen, workspaceLayout } = {
+    isFlat: false,
+    isFrozen: false,
+    workspaceLayout: undefined
+  }) {
+    var _this2 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      _this2.flat = Boolean(isFlat);
+      _this2.frozen = Boolean(isFrozen);
+      _this2.workspaceLayout = workspaceLayout;
+      const activity = _this2.activity = _this2.reporter.activity();
+
+      for (var _iterator14 = deps, _isArray14 = Array.isArray(_iterator14), _i14 = 0, _iterator14 = _isArray14 ? _iterator14 : _iterator14[Symbol.iterator]();;) {
+        var _ref15;
+
+        if (_isArray14) {
+          if (_i14 >= _iterator14.length) break;
+          _ref15 = _iterator14[_i14++];
+        } else {
+          _i14 = _iterator14.next();
+          if (_i14.done) break;
+          _ref15 = _i14.value;
+        }
+
+        const req = _ref15;
+
+        yield _this2.find(req);
+      }
+
+      // all required package versions have been discovered, so now packages that
+      // resolved to existing versions can be resolved to their best available version
+      _this2.resolvePackagesWithExistingVersions();
+
+      for (var _iterator15 = _this2.resolutionMap.delayQueue, _isArray15 = Array.isArray(_iterator15), _i15 = 0, _iterator15 = _isArray15 ? _iterator15 : _iterator15[Symbol.iterator]();;) {
+        var _ref16;
+
+        if (_isArray15) {
+          if (_i15 >= _iterator15.length) break;
+          _ref16 = _iterator15[_i15++];
+        } else {
+          _i15 = _iterator15.next();
+          if (_i15.done) break;
+          _ref16 = _i15.value;
+        }
+
+        const req = _ref16;
+
+        _this2.resolveToResolution(req);
+      }
+
+      if (isFlat) {
+        for (var _iterator16 = deps, _isArray16 = Array.isArray(_iterator16), _i16 = 0, _iterator16 = _isArray16 ? _iterator16 : _iterator16[Symbol.iterator]();;) {
+          var _ref17;
+
+          if (_isArray16) {
+            if (_i16 >= _iterator16.length) break;
+            _ref17 = _iterator16[_i16++];
+          } else {
+            _i16 = _iterator16.next();
+            if (_i16.done) break;
+            _ref17 = _i16.value;
+          }
+
+          const dep = _ref17;
+
+          const name = (0, (_normalizePattern2 || _load_normalizePattern()).normalizePattern)(dep.pattern).name;
+          _this2.optimizeResolutions(name);
+        }
+      }
+
+      activity.end();
+      _this2.activity = null;
+    })();
+  }
+
+  // for a given package, see if a single manifest can satisfy all ranges
+  optimizeResolutions(name) {
+    const patterns = this.dedupePatterns(this.patternsByPackage[name] || []);
+
+    // don't optimize things that already have a lockfile entry:
+    // https://github.com/yarnpkg/yarn/issues/79
+    const collapsablePatterns = patterns.filter(pattern => {
+      const remote = this.patterns[pattern]._remote;
+      return !this.lockfile.getLocked(pattern) && (!remote || remote.type !== 'workspace');
+    });
+    if (collapsablePatterns.length < 2) {
+      return;
+    }
+
+    // reverse sort, so we'll find the maximum satisfying version first
+    const availableVersions = this.getAllInfoForPatterns(collapsablePatterns).map(manifest => manifest.version);
+    availableVersions.sort(semver.rcompare);
+
+    const ranges = collapsablePatterns.map(pattern => (0, (_normalizePattern2 || _load_normalizePattern()).normalizePattern)(pattern).range);
+
+    // find the most recent version that satisfies all patterns (if one exists), and
+    // collapse to that version.
+    for (var _iterator17 = availableVersions, _isArray17 = Array.isArray(_iterator17), _i17 = 0, _iterator17 = _isArray17 ? _iterator17 : _iterator17[Symbol.iterator]();;) {
+      var _ref18;
+
+      if (_isArray17) {
+        if (_i17 >= _iterator17.length) break;
+        _ref18 = _iterator17[_i17++];
+      } else {
+        _i17 = _iterator17.next();
+        if (_i17.done) break;
+        _ref18 = _i17.value;
+      }
+
+      const version = _ref18;
+
+      if (ranges.every(range => semver.satisfies(version, range))) {
+        this.collapsePackageVersions(name, version, collapsablePatterns);
+        return;
+      }
+    }
+  }
+
+  /**
+    * Called by the package requester for packages that this resolver already had
+    * a matching version for. Delay the resolve, because better matches can still be
+    * discovered.
+    */
+
+  reportPackageWithExistingVersion(req, info) {
+    this.delayedResolveQueue.push({ req, info });
+  }
+
+  /**
+    * Executes the resolve to existing versions for packages after the find process,
+    * when all versions that are going to be used have been discovered.
+    */
+
+  resolvePackagesWithExistingVersions() {
+    for (var _iterator18 = this.delayedResolveQueue, _isArray18 = Array.isArray(_iterator18), _i18 = 0, _iterator18 = _isArray18 ? _iterator18 : _iterator18[Symbol.iterator]();;) {
+      var _ref20;
+
+      if (_isArray18) {
+        if (_i18 >= _iterator18.length) break;
+        _ref20 = _iterator18[_i18++];
+      } else {
+        _i18 = _iterator18.next();
+        if (_i18.done) break;
+        _ref20 = _i18.value;
+      }
+
+      const _ref19 = _ref20;
+      const req = _ref19.req,
+            info = _ref19.info;
+
+      req.resolveToExistingVersion(info);
+    }
+  }
+
+  resolveToResolution(req) {
+    const parentNames = req.parentNames,
+          pattern = req.pattern;
+
+
+    if (!parentNames || this.flat) {
+      return req;
+    }
+
+    const resolution = this.resolutionMap.find(pattern, parentNames);
+
+    if (resolution) {
+      const resolutionManifest = this.getResolvedPattern(resolution);
+
+      if (resolutionManifest) {
+        invariant(resolutionManifest._reference, 'resolutions should have a resolved reference');
+        resolutionManifest._reference.patterns.push(pattern);
+        this.addPattern(pattern, resolutionManifest);
+        const lockManifest = this.lockfile.getLocked(pattern);
+        if ((0, (_resolutionMap2 || _load_resolutionMap2()).shouldUpdateLockfile)(lockManifest, resolutionManifest._reference)) {
+          this.lockfile.removePattern(pattern);
+        }
+      } else {
+        this.resolutionMap.addToDelayQueue(req);
+      }
+      return null;
+    }
+
+    return req;
+  }
+}
+exports.default = PackageResolver;
+
+/***/ }),
+/* 367 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _hostedGitResolver;
+
+function _load_hostedGitResolver() {
+  return _hostedGitResolver = _interopRequireDefault(__webpack_require__(109));
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+class GitHubResolver extends (_hostedGitResolver || _load_hostedGitResolver()).default {
+
+  static isVersion(pattern) {
+    // github proto
+    if (pattern.startsWith('github:')) {
+      return true;
+    }
+
+    // github shorthand
+    if (/^[^:@%/\s.-][^:@%/\s]*[/][^:@\s/%]+(?:#.*)?$/.test(pattern)) {
+      return true;
+    }
+
+    return false;
+  }
+
+  static getTarballUrl(parts, hash) {
+    return `https://codeload.${this.hostname}/${parts.user}/${parts.repo}/tar.gz/${hash}`;
+  }
+
+  static getGitSSHUrl(parts) {
+    return `git+ssh://git@${this.hostname}/${parts.user}/${parts.repo}.git` + `${parts.hash ? '#' + decodeURIComponent(parts.hash) : ''}`;
+  }
+
+  static getGitHTTPBaseUrl(parts) {
+    return `https://${this.hostname}/${parts.user}/${parts.repo}`;
+  }
+
+  static getGitHTTPUrl(parts) {
+    return `${GitHubResolver.getGitHTTPBaseUrl(parts)}.git`;
+  }
+
+  static getHTTPFileUrl(parts, filename, commit) {
+    return `https://raw.githubusercontent.com/${parts.user}/${parts.repo}/${commit}/${filename}`;
+  }
+}
+exports.default = GitHubResolver;
+GitHubResolver.protocol = 'github';
+GitHubResolver.hostname = 'github.com';
+
+/***/ }),
+/* 368 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.LINK_PROTOCOL_PREFIX = undefined;
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+var _exoticResolver;
+
+function _load_exoticResolver() {
+  return _exoticResolver = _interopRequireDefault(__webpack_require__(89));
+}
+
+var _misc;
+
+function _load_misc() {
+  return _misc = _interopRequireWildcard(__webpack_require__(18));
+}
+
+var _fs;
+
+function _load_fs() {
+  return _fs = _interopRequireWildcard(__webpack_require__(4));
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const path = __webpack_require__(0);
+
+const LINK_PROTOCOL_PREFIX = exports.LINK_PROTOCOL_PREFIX = 'link:';
+
+class LinkResolver extends (_exoticResolver || _load_exoticResolver()).default {
+  constructor(request, fragment) {
+    super(request, fragment);
+    this.loc = (_misc || _load_misc()).removePrefix(fragment, LINK_PROTOCOL_PREFIX);
+  }
+
+  resolve() {
+    var _this = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      let loc = _this.loc;
+      if (!path.isAbsolute(loc)) {
+        loc = path.resolve(_this.config.lockfileFolder, loc);
+      }
+
+      const name = path.basename(loc);
+      const registry = 'npm';
+
+      const manifest = !(yield (_fs || _load_fs()).exists(`${loc}/package.json`)) || loc === _this.config.lockfileFolder ? { _uid: '', name, version: '0.0.0', _registry: registry } : yield _this.config.readManifest(loc, _this.registry);
+
+      manifest._remote = {
+        type: 'link',
+        registry,
+        hash: null,
+        reference: loc
+      };
+
+      manifest._uid = manifest.version;
+
+      return manifest;
+    })();
+  }
+}
+exports.default = LinkResolver;
+LinkResolver.protocol = 'link';
+
+/***/ }),
+/* 369 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+exports.default = function (from, to) {
+  const validFrom = (_semver || _load_semver()).default.valid(from);
+  const validTo = (_semver || _load_semver()).default.valid(to);
+  let versionBump = 'unknown';
+  if (validFrom && validTo) {
+    versionBump = (0, (_semver2 || _load_semver2()).diffWithUnstable)(validFrom, validTo) || 'unchanged';
+  }
+  return (_constants || _load_constants()).VERSION_COLOR_SCHEME[versionBump];
+};
+
+var _semver;
+
+function _load_semver() {
+  return _semver = _interopRequireDefault(__webpack_require__(22));
+}
+
+var _semver2;
+
+function _load_semver2() {
+  return _semver2 = __webpack_require__(224);
+}
+
+var _constants;
+
+function _load_constants() {
+  return _constants = __webpack_require__(8);
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/***/ }),
+/* 370 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+exports.default = function (from, to, reporter) {
+  const parts = to.split('.');
+  const fromParts = from.split('.');
+
+  const splitIndex = parts.findIndex((part, i) => part !== fromParts[i]);
+  if (splitIndex === -1) {
+    return from;
+  }
+
+  const colorized = reporter.format.green(parts.slice(splitIndex).join('.'));
+  return parts.slice(0, splitIndex).concat(colorized).join('.');
+};
+
+/***/ }),
+/* 371 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+// $FlowFixMe We want this require to be dynamic
+exports.dynamicRequire =  true ? require : require; // eslint-disable-line
+
+/***/ }),
+/* 372 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.sortFilter = sortFilter;
+exports.matchesFilter = matchesFilter;
+exports.ignoreLinesToRegex = ignoreLinesToRegex;
+exports.filterOverridenGitignores = filterOverridenGitignores;
+
+var _misc;
+
+function _load_misc() {
+  return _misc = __webpack_require__(18);
+}
+
+const mm = __webpack_require__(114);
+const path = __webpack_require__(0);
+
+const WHITESPACE_RE = /^\s+$/;
+
+function sortFilter(files, filters, keepFiles = new Set(), possibleKeepFiles = new Set(), ignoreFiles = new Set()) {
+  for (var _iterator = files, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+    var _ref;
+
+    if (_isArray) {
+      if (_i >= _iterator.length) break;
+      _ref = _iterator[_i++];
+    } else {
+      _i = _iterator.next();
+      if (_i.done) break;
+      _ref = _i.value;
+    }
+
+    const file = _ref;
+
+    let keep = false;
+
+    // always keep a file if a ! pattern matches it
+    for (var _iterator5 = filters, _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
+      var _ref5;
+
+      if (_isArray5) {
+        if (_i5 >= _iterator5.length) break;
+        _ref5 = _iterator5[_i5++];
+      } else {
+        _i5 = _iterator5.next();
+        if (_i5.done) break;
+        _ref5 = _i5.value;
+      }
+
+      const filter = _ref5;
+
+      if (filter.isNegation && matchesFilter(filter, file.basename, file.relative)) {
+        keep = true;
+        break;
+      }
+    }
+
+    //
+    if (keep) {
+      keepFiles.add(file.relative);
+      continue;
+    }
+
+    // otherwise don't keep it if a pattern matches it
+    keep = true;
+    for (var _iterator6 = filters, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) {
+      var _ref6;
+
+      if (_isArray6) {
+        if (_i6 >= _iterator6.length) break;
+        _ref6 = _iterator6[_i6++];
+      } else {
+        _i6 = _iterator6.next();
+        if (_i6.done) break;
+        _ref6 = _i6.value;
+      }
+
+      const filter = _ref6;
+
+      if (!filter.isNegation && matchesFilter(filter, file.basename, file.relative)) {
+        keep = false;
+        break;
+      }
+    }
+
+    if (keep) {
+      possibleKeepFiles.add(file.relative);
+    } else {
+      ignoreFiles.add(file.relative);
+    }
+  }
+
+  // exclude file
+  for (var _iterator2 = possibleKeepFiles, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+    var _ref2;
+
+    if (_isArray2) {
+      if (_i2 >= _iterator2.length) break;
+      _ref2 = _iterator2[_i2++];
+    } else {
+      _i2 = _iterator2.next();
+      if (_i2.done) break;
+      _ref2 = _i2.value;
+    }
+
+    const file = _ref2;
+
+    const parts = path.dirname(file).split(path.sep);
+
+    while (parts.length) {
+      const folder = parts.join(path.sep);
+      if (ignoreFiles.has(folder)) {
+        ignoreFiles.add(file);
+        break;
+      }
+      parts.pop();
+    }
+  }
+
+  //
+  for (var _iterator3 = possibleKeepFiles, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
+    var _ref3;
+
+    if (_isArray3) {
+      if (_i3 >= _iterator3.length) break;
+      _ref3 = _iterator3[_i3++];
+    } else {
+      _i3 = _iterator3.next();
+      if (_i3.done) break;
+      _ref3 = _i3.value;
+    }
+
+    const file = _ref3;
+
+    if (!ignoreFiles.has(file)) {
+      keepFiles.add(file);
+    }
+  }
+
+  //
+  for (var _iterator4 = keepFiles, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
+    var _ref4;
+
+    if (_isArray4) {
+      if (_i4 >= _iterator4.length) break;
+      _ref4 = _iterator4[_i4++];
+    } else {
+      _i4 = _iterator4.next();
+      if (_i4.done) break;
+      _ref4 = _i4.value;
+    }
+
+    const file = _ref4;
+
+    const parts = path.dirname(file).split(path.sep);
+
+    while (parts.length) {
+      // deregister this folder from being ignored, any files inside
+      // will still be marked as ignored
+      ignoreFiles.delete(parts.join(path.sep));
+      parts.pop();
+    }
+  }
+
+  return { ignoreFiles, keepFiles };
+}
+
+function matchesFilter(filter, basename, loc) {
+  let filterByBasename = true;
+  if (filter.base && filter.base !== '.') {
+    loc = path.relative(filter.base, loc);
+    filterByBasename = false;
+  }
+  // the micromatch regex expects unix path separators
+  loc = loc.replace(/\\/g, '/');
+
+  return filter.regex.test(loc) || filter.regex.test(`/${loc}`) || filterByBasename && filter.regex.test(basename) || mm.isMatch(loc, filter.pattern);
+}
+
+function ignoreLinesToRegex(lines, base = '.') {
+  return lines
+  // create regex
+  .map(line => {
+    // remove empty lines, comments, etc
+    if (line === '' || line === '!' || line[0] === '#' || WHITESPACE_RE.test(line)) {
+      return null;
+    }
+
+    let pattern = line;
+    let isNegation = false;
+
+    // hide the fact that it's a negation from minimatch since we'll handle this specifically
+    // ourselves
+    if (pattern[0] === '!') {
+      isNegation = true;
+      pattern = pattern.slice(1);
+    }
+
+    // remove trailing slash
+    pattern = (0, (_misc || _load_misc()).removeSuffix)(pattern, '/');
+
+    const regex = mm.makeRe(pattern.trim(), { dot: true, nocase: true });
+
+    if (regex) {
+      return {
+        base,
+        isNegation,
+        pattern,
+        regex
+      };
+    } else {
+      return null;
+    }
+  }).filter(Boolean);
+}
+
+function filterOverridenGitignores(files) {
+  const IGNORE_FILENAMES = ['.yarnignore', '.npmignore', '.gitignore'];
+  const GITIGNORE_NAME = IGNORE_FILENAMES[2];
+  return files.filter(file => IGNORE_FILENAMES.indexOf(file.basename) > -1).reduce((acc, file) => {
+    if (file.basename !== GITIGNORE_NAME) {
+      return [...acc, file];
+    } else {
+      //don't include .gitignore if .npmignore or .yarnignore are present
+      const dir = path.dirname(file.absolute);
+      const higherPriorityIgnoreFilePaths = [path.join(dir, IGNORE_FILENAMES[0]), path.join(dir, IGNORE_FILENAMES[1])];
+      const hasHigherPriorityFiles = files.find(file => higherPriorityIgnoreFilePaths.indexOf(path.normalize(file.absolute)) > -1);
+      if (!hasHigherPriorityFiles) {
+        return [...acc, file];
+      }
+    }
+    return acc;
+  }, []);
+}
+
+/***/ }),
+/* 373 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.spawn = undefined;
+
+var _extends2;
+
+function _load_extends() {
+  return _extends2 = _interopRequireDefault(__webpack_require__(21));
+}
+
+var _path;
+
+function _load_path() {
+  return _path = _interopRequireDefault(__webpack_require__(0));
+}
+
+var _child;
+
+function _load_child() {
+  return _child = _interopRequireWildcard(__webpack_require__(58));
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const BATCH_MODE_ARGS = new Map([['ssh', '-oBatchMode=yes'], ['plink', '-batch']]);
+
+// Suppress any password prompts since we run these in the background
+const env = (0, (_extends2 || _load_extends()).default)({
+  GIT_ASKPASS: '',
+  GIT_TERMINAL_PROMPT: 0
+}, process.env);
+
+const sshCommand = env.GIT_SSH || 'ssh';
+const sshExecutable = (_path || _load_path()).default.basename(sshCommand.toLowerCase(), '.exe');
+const sshBatchArgs = BATCH_MODE_ARGS.get(sshExecutable);
+
+if (!env.GIT_SSH_COMMAND && sshBatchArgs) {
+  // We have to manually specify `GIT_SSH_VARIANT`,
+  // because it's not automatically set when using `GIT_SSH_COMMAND` instead of `GIT_SSH`
+  // See: https://github.com/yarnpkg/yarn/issues/4729
+  env.GIT_SSH_VARIANT = sshExecutable;
+  env.GIT_SSH_COMMAND = `"${sshCommand}" ${sshBatchArgs}`;
+}
+
+const spawn = exports.spawn = (args, opts = {}) => {
+  return (_child || _load_child()).spawn('git', args, (0, (_extends2 || _load_extends()).default)({}, opts, { env }));
+};
+
+/***/ }),
+/* 374 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.callThroughHook = callThroughHook;
+
+
+const YARN_HOOKS_KEY = 'experimentalYarnHooks';
+
+function callThroughHook(type, fn, context) {
+  if (typeof global === 'undefined') {
+    return fn();
+  }
+
+  if (typeof global[YARN_HOOKS_KEY] !== 'object' || !global[YARN_HOOKS_KEY]) {
+    return fn();
+  }
+
+  const hook = global[YARN_HOOKS_KEY][type];
+
+  if (!hook) {
+    return fn();
+  }
+
+  return hook(fn, context);
+}
+
+/***/ }),
+/* 375 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+const lockPromises = new Map();
+
+/**
+ * Acquires a mutex lock over the given key. If the lock can't be acquired, it waits until it's available.
+ * @param key Key to get the lock for.
+ * @return {Promise.<Function>} A Promise that resolves when the lock is acquired, with the function that
+ * must be called to release the lock.
+ */
+
+exports.default = key => {
+  let unlockNext;
+  const willLock = new Promise(resolve => unlockNext = resolve);
+  const lockPromise = lockPromises.get(key) || Promise.resolve();
+  const willUnlock = lockPromise.then(() => unlockNext);
+  lockPromises.set(key, lockPromise.then(() => willLock));
+  return willUnlock;
+};
+
+/***/ }),
+/* 376 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = parsePackagePath;
+exports.isValidPackagePath = isValidPackagePath;
+
+
+/**
+ * Parse input strings like `package-1/package-2` to an array of packages
+ */
+function parsePackagePath(input) {
+  return input.match(/(@[^\/]+\/)?([^/]+)/g) || [];
+}
+
+const WRONG_PATTERNS = /\/$|\/{2,}|\*+$/;
+
+function isValidPackagePath(input) {
+  return !WRONG_PATTERNS.test(input);
+}
+
+/***/ }),
+/* 377 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getPosixPath = getPosixPath;
+exports.resolveWithHome = resolveWithHome;
+
+var _path;
+
+function _load_path() {
+  return _path = __webpack_require__(0);
+}
+
+const userHome = __webpack_require__(67).default;
+
+function getPosixPath(path) {
+  return path.replace(/\\/g, '/');
+}
+
+function resolveWithHome(path) {
+  const homePattern = process.platform === 'win32' ? /^~(\/|\\)/ : /^~\//;
+  if (homePattern.test(path)) {
+    return (0, (_path || _load_path()).resolve)(userHome, path.substr(2));
+  }
+
+  return (0, (_path || _load_path()).resolve)(path);
+}
+
+/***/ }),
+/* 378 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _fs;
+
+function _load_fs() {
+  return _fs = _interopRequireDefault(__webpack_require__(5));
+}
+
+var _http;
+
+function _load_http() {
+  return _http = _interopRequireDefault(__webpack_require__(87));
+}
+
+var _url;
+
+function _load_url() {
+  return _url = _interopRequireDefault(__webpack_require__(24));
+}
+
+var _dnscache;
+
+function _load_dnscache() {
+  return _dnscache = _interopRequireDefault(__webpack_require__(637));
+}
+
+var _invariant;
+
+function _load_invariant() {
+  return _invariant = _interopRequireDefault(__webpack_require__(9));
+}
+
+var _requestCaptureHar;
+
+function _load_requestCaptureHar() {
+  return _requestCaptureHar = _interopRequireDefault(__webpack_require__(799));
+}
+
+var _errors;
+
+function _load_errors() {
+  return _errors = __webpack_require__(6);
+}
+
+var _blockingQueue;
+
+function _load_blockingQueue() {
+  return _blockingQueue = _interopRequireDefault(__webpack_require__(110));
+}
+
+var _constants;
+
+function _load_constants() {
+  return _constants = _interopRequireWildcard(__webpack_require__(8));
+}
+
+var _network;
+
+function _load_network() {
+  return _network = _interopRequireWildcard(__webpack_require__(337));
+}
+
+var _map;
+
+function _load_map() {
+  return _map = _interopRequireDefault(__webpack_require__(29));
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+// Initialize DNS cache so we don't look up the same
+// domains like registry.yarnpkg.com over and over again
+// for each request.
+(0, (_dnscache || _load_dnscache()).default)({
+  enable: true,
+  ttl: 300,
+  cachesize: 10
+});
+
+const successHosts = (0, (_map || _load_map()).default)();
+const controlOffline = (_network || _load_network()).isOffline();
+
+class RequestManager {
+  constructor(reporter) {
+    this.offlineNoRequests = false;
+    this._requestCaptureHar = null;
+    this._requestModule = null;
+    this.offlineQueue = [];
+    this.captureHar = false;
+    this.httpsProxy = '';
+    this.ca = null;
+    this.httpProxy = '';
+    this.strictSSL = true;
+    this.userAgent = '';
+    this.reporter = reporter;
+    this.running = 0;
+    this.queue = [];
+    this.cache = {};
+    this.max = (_constants || _load_constants()).NETWORK_CONCURRENCY;
+    this.maxRetryAttempts = 5;
+  }
+
+  setOptions(opts) {
+    if (opts.userAgent != null) {
+      this.userAgent = opts.userAgent;
+    }
+
+    if (opts.offline != null) {
+      this.offlineNoRequests = opts.offline;
+    }
+
+    if (opts.captureHar != null) {
+      this.captureHar = opts.captureHar;
+    }
+
+    if (opts.httpProxy != null) {
+      this.httpProxy = opts.httpProxy || '';
+    }
+
+    if (opts.httpsProxy === '') {
+      this.httpsProxy = opts.httpProxy || '';
+    } else if (opts.httpsProxy === false) {
+      this.httpsProxy = false;
+    } else {
+      this.httpsProxy = opts.httpsProxy || '';
+    }
+
+    if (opts.strictSSL !== null && typeof opts.strictSSL !== 'undefined') {
+      this.strictSSL = opts.strictSSL;
+    }
+
+    if (opts.ca != null && opts.ca.length > 0) {
+      this.ca = opts.ca;
+    }
+
+    if (opts.networkConcurrency != null) {
+      this.max = opts.networkConcurrency;
+    }
+
+    if (opts.networkTimeout != null) {
+      this.timeout = opts.networkTimeout;
+    }
+
+    if (opts.maxRetryAttempts != null) {
+      this.maxRetryAttempts = opts.maxRetryAttempts;
+    }
+
+    if (opts.cafile != null && opts.cafile != '') {
+      // The CA bundle file can contain one or more certificates with comments/text between each PEM block.
+      // tls.connect wants an array of certificates without any comments/text, so we need to split the string
+      // and strip out any text in between the certificates
+      try {
+        const bundle = (_fs || _load_fs()).default.readFileSync(opts.cafile).toString();
+        const hasPemPrefix = block => block.startsWith('-----BEGIN ');
+        // opts.cafile overrides opts.ca, this matches with npm behavior
+        this.ca = bundle.split(/(-----BEGIN .*\r?\n[^-]+\r?\n--.*)/).filter(hasPemPrefix);
+      } catch (err) {
+        this.reporter.error(`Could not open cafile: ${err.message}`);
+      }
+    }
+
+    if (opts.cert != null) {
+      this.cert = opts.cert;
+    }
+
+    if (opts.key != null) {
+      this.key = opts.key;
+    }
+  }
+
+  /**
+   * Lazy load `request` since it is exceptionally expensive to load and is
+   * often not needed at all.
+   */
+
+  _getRequestModule() {
+    if (!this._requestModule) {
+      const request = __webpack_require__(800);
+      if (this.captureHar) {
+        this._requestCaptureHar = new (_requestCaptureHar || _load_requestCaptureHar()).default(request);
+        this._requestModule = this._requestCaptureHar.request.bind(this._requestCaptureHar);
+      } else {
+        this._requestModule = request;
+      }
+    }
+    return this._requestModule;
+  }
+
+  /**
+   * Queue up a request.
+   */
+
+  request(params) {
+    if (this.offlineNoRequests) {
+      return Promise.reject(new (_errors || _load_errors()).MessageError(this.reporter.lang('cantRequestOffline', params.url)));
+    }
+
+    const cached = this.cache[params.url];
+    if (cached) {
+      return cached;
+    }
+
+    params.method = params.method || 'GET';
+    params.forever = true;
+    params.retryAttempts = 0;
+    params.strictSSL = this.strictSSL;
+    params.headers = Object.assign({
+      'User-Agent': this.userAgent
+    }, params.headers);
+
+    const promise = new Promise((resolve, reject) => {
+      this.queue.push({ params, reject, resolve });
+      this.shiftQueue();
+    });
+
+    // we can't cache a request with a processor
+    if (!params.process) {
+      this.cache[params.url] = promise;
+    }
+
+    return promise;
+  }
+
+  /**
+   * Clear the request cache. This is important as we cache all HTTP requests so you'll
+   * want to do this as soon as you can.
+   */
+
+  clearCache() {
+    this.cache = {};
+    if (this._requestCaptureHar != null) {
+      this._requestCaptureHar.clear();
+    }
+  }
+
+  /**
+   * Check if an error is possibly due to lost or poor network connectivity.
+   */
+
+  isPossibleOfflineError(err) {
+    const code = err.code,
+          hostname = err.hostname;
+
+    if (!code) {
+      return false;
+    }
+
+    // network was previously online but now we're offline
+    const possibleOfflineChange = !controlOffline && !(_network || _load_network()).isOffline();
+    if (code === 'ENOTFOUND' && possibleOfflineChange) {
+      // can't resolve a domain
+      return true;
+    }
+
+    // used to be able to resolve this domain! something is wrong
+    if (code === 'ENOTFOUND' && hostname && successHosts[hostname]) {
+      // can't resolve this domain but we've successfully resolved it before
+      return true;
+    }
+
+    // network was previously offline and we can't resolve the domain
+    if (code === 'ENOTFOUND' && controlOffline) {
+      return true;
+    }
+
+    // connection was reset or dropped
+    if (code === 'ECONNRESET') {
+      return true;
+    }
+
+    // TCP timeout
+    if (code === 'ESOCKETTIMEDOUT' || code === 'ETIMEDOUT') {
+      return true;
+    }
+
+    return false;
+  }
+
+  /**
+   * Queue up request arguments to be retried. Start a network connectivity timer if there
+   * isn't already one.
+   */
+
+  queueForRetry(opts) {
+    if (opts.retryReason) {
+      let containsReason = false;
+
+      for (var _iterator = this.offlineQueue, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+        var _ref;
+
+        if (_isArray) {
+          if (_i >= _iterator.length) break;
+          _ref = _iterator[_i++];
+        } else {
+          _i = _iterator.next();
+          if (_i.done) break;
+          _ref = _i.value;
+        }
+
+        const queuedOpts = _ref;
+
+        if (queuedOpts.retryReason === opts.retryReason) {
+          containsReason = true;
+          break;
+        }
+      }
+
+      if (!containsReason) {
+        this.reporter.info(opts.retryReason);
+      }
+    }
+
+    if (!this.offlineQueue.length) {
+      this.initOfflineRetry();
+    }
+
+    this.offlineQueue.push(opts);
+  }
+
+  /**
+   * Begin timers to retry failed requests when we possibly establish network connectivity
+   * again.
+   */
+
+  initOfflineRetry() {
+    setTimeout(() => {
+      const queue = this.offlineQueue;
+      this.offlineQueue = [];
+      for (var _iterator2 = queue, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+        var _ref2;
+
+        if (_isArray2) {
+          if (_i2 >= _iterator2.length) break;
+          _ref2 = _iterator2[_i2++];
+        } else {
+          _i2 = _iterator2.next();
+          if (_i2.done) break;
+          _ref2 = _i2.value;
+        }
+
+        const opts = _ref2;
+
+        this.execute(opts);
+      }
+    }, 3000);
+  }
+
+  /**
+   * Execute a request.
+   */
+
+  execute(opts) {
+    const params = opts.params;
+    const reporter = this.reporter;
+
+
+    const buildNext = fn => data => {
+      fn(data);
+      this.running--;
+      this.shiftQueue();
+    };
+
+    const resolve = buildNext(opts.resolve);
+
+    const rejectNext = buildNext(opts.reject);
+    const reject = function reject(err) {
+      err.message = `${params.url}: ${err.message}`;
+      rejectNext(err);
+    };
+
+    const queueForRetry = reason => {
+      const attempts = params.retryAttempts || 0;
+      if (attempts >= this.maxRetryAttempts - 1) {
+        return false;
+      }
+      if (opts.params.method && opts.params.method.toUpperCase() !== 'GET') {
+        return false;
+      }
+      params.retryAttempts = attempts + 1;
+      if (typeof params.cleanup === 'function') {
+        params.cleanup();
+      }
+      opts.retryReason = reason;
+      this.queueForRetry(opts);
+      return true;
+    };
+
+    let calledOnError = false;
+    const onError = err => {
+      if (calledOnError) {
+        return;
+      }
+      calledOnError = true;
+
+      if (this.isPossibleOfflineError(err)) {
+        if (!queueForRetry(this.reporter.lang('offlineRetrying'))) {
+          reject(err);
+        }
+      } else {
+        reject(err);
+      }
+    };
+
+    if (!params.process) {
+      const parts = (_url || _load_url()).default.parse(params.url);
+
+      params.callback = (err, res, body) => {
+        if (err) {
+          onError(err);
+          return;
+        }
+
+        successHosts[parts.hostname] = true;
+
+        this.reporter.verbose(this.reporter.lang('verboseRequestFinish', params.url, res.statusCode));
+
+        if (res.statusCode === 408 || res.statusCode >= 500) {
+          const description = `${res.statusCode} ${(_http || _load_http()).default.STATUS_CODES[res.statusCode]}`;
+          if (!queueForRetry(this.reporter.lang('internalServerErrorRetrying', description))) {
+            throw new (_errors || _load_errors()).ResponseError(this.reporter.lang('requestFailed', description), res.statusCode);
+          } else {
+            return;
+          }
+        }
+
+        if (res.statusCode === 401 && res.headers['www-authenticate']) {
+          const authMethods = res.headers['www-authenticate'].split(/,\s*/).map(s => s.toLowerCase());
+
+          if (authMethods.indexOf('otp') !== -1) {
+            reject(new (_errors || _load_errors()).OneTimePasswordError());
+            return;
+          }
+        }
+
+        if (body && typeof body.error === 'string') {
+          reject(new Error(body.error));
+          return;
+        }
+
+        if ([400, 401, 404].concat(params.rejectStatusCode || []).indexOf(res.statusCode) !== -1) {
+          // So this is actually a rejection ... the hosted git resolver uses this to know whether http is supported
+          resolve(false);
+        } else if (res.statusCode >= 400) {
+          const errMsg = body && body.message || reporter.lang('requestError', params.url, res.statusCode);
+          reject(new Error(errMsg));
+        } else {
+          resolve(body);
+        }
+      };
+    }
+
+    if (params.buffer) {
+      params.encoding = null;
+    }
+
+    let proxy = this.httpProxy;
+    if (params.url.startsWith('https:')) {
+      proxy = this.httpsProxy;
+    }
+
+    if (proxy) {
+      // if no proxy is set, do not pass a proxy down to request.
+      // the request library will internally check the HTTP_PROXY and HTTPS_PROXY env vars.
+      params.proxy = String(proxy);
+    } else if (proxy === false) {
+      // passing empty string prevents the underlying library from falling back to the env vars.
+      // an explicit false in the yarn config should override the env var. See #4546.
+      params.proxy = '';
+    }
+
+    if (this.ca != null) {
+      params.ca = this.ca;
+    }
+
+    if (this.cert != null) {
+      params.cert = this.cert;
+    }
+
+    if (this.key != null) {
+      params.key = this.key;
+    }
+
+    if (this.timeout != null) {
+      params.timeout = this.timeout;
+    }
+
+    const request = this._getRequestModule();
+    const req = request(params);
+    this.reporter.verbose(this.reporter.lang('verboseRequestStart', params.method, params.url));
+
+    req.on('error', onError);
+
+    const queue = params.queue;
+    if (queue) {
+      req.on('data', queue.stillActive.bind(queue));
+    }
+
+    const process = params.process;
+    if (process) {
+      req.on('response', res => {
+        if (res.statusCode >= 200 && res.statusCode < 300) {
+          return;
+        }
+
+        const description = `${res.statusCode} ${(_http || _load_http()).default.STATUS_CODES[res.statusCode]}`;
+        reject(new (_errors || _load_errors()).ResponseError(this.reporter.lang('requestFailed', description), res.statusCode));
+
+        req.abort();
+      });
+      process(req, resolve, reject);
+    }
+  }
+
+  /**
+   * Remove an item from the queue. Create it's request options and execute it.
+   */
+
+  shiftQueue() {
+    if (this.running >= this.max || !this.queue.length) {
+      return;
+    }
+
+    const opts = this.queue.shift();
+
+    this.running++;
+    this.execute(opts);
+  }
+
+  saveHar(filename) {
+    if (!this.captureHar) {
+      throw new Error(this.reporter.lang('requestManagerNotSetupHAR'));
+    }
+    // No request may have occurred at all.
+    this._getRequestModule();
+    (0, (_invariant || _load_invariant()).default)(this._requestCaptureHar != null, 'request-capture-har not setup');
+    this._requestCaptureHar.saveHar(filename);
+  }
+}
+exports.default = RequestManager;
+
+/***/ }),
+/* 379 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var crypto_hash_sha512 = __webpack_require__(76).lowlevel.crypto_hash;
+
+/*
+ * This file is a 1:1 port from the OpenBSD blowfish.c and bcrypt_pbkdf.c. As a
+ * result, it retains the original copyright and license. The two files are
+ * under slightly different (but compatible) licenses, and are here combined in
+ * one file.
+ *
+ * Credit for the actual porting work goes to:
+ *  Devi Mandiri <me@devi.web.id>
+ */
+
+/*
+ * The Blowfish portions are under the following license:
+ *
+ * Blowfish block cipher for OpenBSD
+ * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
+ * All rights reserved.
+ *
+ * Implementation advice by David Mazieres <dm@lcs.mit.edu>.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * The bcrypt_pbkdf portions are under the following license:
+ *
+ * Copyright (c) 2013 Ted Unangst <tedu@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/*
+ * Performance improvements (Javascript-specific):
+ *
+ * Copyright 2016, Joyent Inc
+ * Author: Alex Wilson <alex.wilson@joyent.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+// Ported from OpenBSD bcrypt_pbkdf.c v1.9
+
+var BLF_J = 0;
+
+var Blowfish = function() {
+  this.S = [
+    new Uint32Array([
+      0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7,
+      0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
+      0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16,
+      0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e,
+      0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee,
+      0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
+      0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef,
+      0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e,
+      0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60,
+      0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440,
+      0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce,
+      0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a,
+      0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e,
+      0xafd6ba33, 0x6c24cf5c, 0x7a325381, 0x28958677,
+      0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193,
+      0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032,
+      0xef845d5d, 0xe98575b1, 0xdc262302, 0xeb651b88,
+      0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239,
+      0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e,
+      0x21c66842, 0xf6e96c9a, 0x670c9c61, 0xabd388f0,
+      0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3,
+      0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98,
+      0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88,
+      0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe,
+      0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6,
+      0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d,
+      0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b,
+      0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7,
+      0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba,
+      0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463,
+      0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f,
+      0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09,
+      0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3,
+      0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb,
+      0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279,
+      0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8,
+      0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab,
+      0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82,
+      0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db,
+      0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573,
+      0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0,
+      0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b,
+      0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790,
+      0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8,
+      0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4,
+      0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0,
+      0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, 0x8e7594b7,
+      0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c,
+      0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad,
+      0x2f2f2218, 0xbe0e1777, 0xea752dfe, 0x8b021fa1,
+      0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299,
+      0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9,
+      0x165fa266, 0x80957705, 0x93cc7314, 0x211a1477,
+      0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf,
+      0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49,
+      0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af,
+      0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa,
+      0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5,
+      0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41,
+      0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915,
+      0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400,
+      0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915,
+      0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664,
+      0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a]),
+    new Uint32Array([
+      0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623,
+      0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266,
+      0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1,
+      0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e,
+      0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6,
+      0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1,
+      0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e,
+      0x09686b3f, 0x3ebaefc9, 0x3c971814, 0x6b6a70a1,
+      0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737,
+      0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8,
+      0xb03ada37, 0xf0500c0d, 0xf01c1f04, 0x0200b3ff,
+      0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd,
+      0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701,
+      0x3ae5e581, 0x37c2dadc, 0xc8b57634, 0x9af3dda7,
+      0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41,
+      0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331,
+      0x4e548b38, 0x4f6db908, 0x6f420d03, 0xf60a04bf,
+      0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af,
+      0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e,
+      0x5512721f, 0x2e6b7124, 0x501adde6, 0x9f84cd87,
+      0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c,
+      0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2,
+      0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16,
+      0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd,
+      0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b,
+      0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509,
+      0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e,
+      0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3,
+      0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f,
+      0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a,
+      0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4,
+      0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960,
+      0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66,
+      0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28,
+      0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802,
+      0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84,
+      0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510,
+      0x13cca830, 0xeb61bd96, 0x0334fe1e, 0xaa0363cf,
+      0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14,
+      0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e,
+      0x648b1eaf, 0x19bdf0ca, 0xa02369b9, 0x655abb50,
+      0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7,
+      0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8,
+      0xf837889a, 0x97e32d77, 0x11ed935f, 0x16681281,
+      0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99,
+      0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696,
+      0xcdb30aeb, 0x532e3054, 0x8fd948e4, 0x6dbc3128,
+      0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73,
+      0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0,
+      0x45eee2b6, 0xa3aaabea, 0xdb6c4f15, 0xfacb4fd0,
+      0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105,
+      0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250,
+      0xcf62a1f2, 0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3,
+      0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285,
+      0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00,
+      0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061,
+      0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb,
+      0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e,
+      0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735,
+      0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc,
+      0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9,
+      0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340,
+      0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20,
+      0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7]),
+    new Uint32Array([
+      0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934,
+      0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068,
+      0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af,
+      0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840,
+      0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45,
+      0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504,
+      0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a,
+      0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb,
+      0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee,
+      0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6,
+      0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42,
+      0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b,
+      0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2,
+      0x3a6efa74, 0xdd5b4332, 0x6841e7f7, 0xca7820fb,
+      0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527,
+      0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b,
+      0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33,
+      0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c,
+      0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3,
+      0x95c11548, 0xe4c66d22, 0x48c1133f, 0xc70f86dc,
+      0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17,
+      0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564,
+      0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b,
+      0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115,
+      0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922,
+      0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728,
+      0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0,
+      0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e,
+      0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37,
+      0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d,
+      0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804,
+      0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b,
+      0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3,
+      0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb,
+      0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d,
+      0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c,
+      0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350,
+      0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9,
+      0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a,
+      0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe,
+      0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d,
+      0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc,
+      0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f,
+      0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61,
+      0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2,
+      0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9,
+      0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2,
+      0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c,
+      0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e,
+      0xb77f19b6, 0xe0a9dc09, 0x662d09a1, 0xc4324633,
+      0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10,
+      0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169,
+      0xdcb7da83, 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52,
+      0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027,
+      0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5,
+      0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62,
+      0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634,
+      0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76,
+      0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24,
+      0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc,
+      0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4,
+      0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c,
+      0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837,
+      0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0]),
+    new Uint32Array([
+      0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b,
+      0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe,
+      0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b,
+      0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4,
+      0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8,
+      0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6,
+      0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304,
+      0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22,
+      0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4,
+      0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6,
+      0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9,
+      0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59,
+      0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593,
+      0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, 0x022b8b51,
+      0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28,
+      0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c,
+      0xe029ac71, 0xe019a5e6, 0x47b0acfd, 0xed93fa9b,
+      0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28,
+      0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c,
+      0x15056dd4, 0x88f46dba, 0x03a16125, 0x0564f0bd,
+      0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a,
+      0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319,
+      0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb,
+      0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f,
+      0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991,
+      0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32,
+      0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680,
+      0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166,
+      0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae,
+      0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb,
+      0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5,
+      0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47,
+      0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370,
+      0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d,
+      0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84,
+      0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048,
+      0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8,
+      0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd,
+      0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9,
+      0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7,
+      0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38,
+      0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f,
+      0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c,
+      0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525,
+      0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1,
+      0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442,
+      0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, 0x3278e964,
+      0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e,
+      0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8,
+      0xdf359f8d, 0x9b992f2e, 0xe60b6f47, 0x0fe3f11d,
+      0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f,
+      0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299,
+      0xf523f357, 0xa6327623, 0x93a83531, 0x56cccd02,
+      0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc,
+      0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614,
+      0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a,
+      0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6,
+      0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b,
+      0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0,
+      0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060,
+      0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e,
+      0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9,
+      0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f,
+      0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6])
+    ];
+  this.P = new Uint32Array([
+    0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344,
+    0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89,
+    0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
+    0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917,
+    0x9216d5d9, 0x8979fb1b]);
+};
+
+function F(S, x8, i) {
+  return (((S[0][x8[i+3]] +
+            S[1][x8[i+2]]) ^
+            S[2][x8[i+1]]) +
+            S[3][x8[i]]);
+};
+
+Blowfish.prototype.encipher = function(x, x8) {
+  if (x8 === undefined) {
+    x8 = new Uint8Array(x.buffer);
+    if (x.byteOffset !== 0)
+      x8 = x8.subarray(x.byteOffset);
+  }
+  x[0] ^= this.P[0];
+  for (var i = 1; i < 16; i += 2) {
+    x[1] ^= F(this.S, x8, 0) ^ this.P[i];
+    x[0] ^= F(this.S, x8, 4) ^ this.P[i+1];
+  }
+  var t = x[0];
+  x[0] = x[1] ^ this.P[17];
+  x[1] = t;
+};
+
+Blowfish.prototype.decipher = function(x) {
+  var x8 = new Uint8Array(x.buffer);
+  if (x.byteOffset !== 0)
+    x8 = x8.subarray(x.byteOffset);
+  x[0] ^= this.P[17];
+  for (var i = 16; i > 0; i -= 2) {
+    x[1] ^= F(this.S, x8, 0) ^ this.P[i];
+    x[0] ^= F(this.S, x8, 4) ^ this.P[i-1];
+  }
+  var t = x[0];
+  x[0] = x[1] ^ this.P[0];
+  x[1] = t;
+};
+
+function stream2word(data, databytes){
+  var i, temp = 0;
+  for (i = 0; i < 4; i++, BLF_J++) {
+    if (BLF_J >= databytes) BLF_J = 0;
+    temp = (temp << 8) | data[BLF_J];
+  }
+  return temp;
+};
+
+Blowfish.prototype.expand0state = function(key, keybytes) {
+  var d = new Uint32Array(2), i, k;
+  var d8 = new Uint8Array(d.buffer);
+
+  for (i = 0, BLF_J = 0; i < 18; i++) {
+    this.P[i] ^= stream2word(key, keybytes);
+  }
+  BLF_J = 0;
+
+  for (i = 0; i < 18; i += 2) {
+    this.encipher(d, d8);
+    this.P[i]   = d[0];
+    this.P[i+1] = d[1];
+  }
+
+  for (i = 0; i < 4; i++) {
+    for (k = 0; k < 256; k += 2) {
+      this.encipher(d, d8);
+      this.S[i][k]   = d[0];
+      this.S[i][k+1] = d[1];
+    }
+  }
+};
+
+Blowfish.prototype.expandstate = function(data, databytes, key, keybytes) {
+  var d = new Uint32Array(2), i, k;
+
+  for (i = 0, BLF_J = 0; i < 18; i++) {
+    this.P[i] ^= stream2word(key, keybytes);
+  }
+
+  for (i = 0, BLF_J = 0; i < 18; i += 2) {
+    d[0] ^= stream2word(data, databytes);
+    d[1] ^= stream2word(data, databytes);
+    this.encipher(d);
+    this.P[i]   = d[0];
+    this.P[i+1] = d[1];
+  }
+
+  for (i = 0; i < 4; i++) {
+    for (k = 0; k < 256; k += 2) {
+      d[0] ^= stream2word(data, databytes);
+      d[1] ^= stream2word(data, databytes);
+      this.encipher(d);
+      this.S[i][k]   = d[0];
+      this.S[i][k+1] = d[1];
+    }
+  }
+  BLF_J = 0;
+};
+
+Blowfish.prototype.enc = function(data, blocks) {
+  for (var i = 0; i < blocks; i++) {
+    this.encipher(data.subarray(i*2));
+  }
+};
+
+Blowfish.prototype.dec = function(data, blocks) {
+  for (var i = 0; i < blocks; i++) {
+    this.decipher(data.subarray(i*2));
+  }
+};
+
+var BCRYPT_BLOCKS = 8,
+    BCRYPT_HASHSIZE = 32;
+
+function bcrypt_hash(sha2pass, sha2salt, out) {
+  var state = new Blowfish(),
+      cdata = new Uint32Array(BCRYPT_BLOCKS), i,
+      ciphertext = new Uint8Array([79,120,121,99,104,114,111,109,97,116,105,
+            99,66,108,111,119,102,105,115,104,83,119,97,116,68,121,110,97,109,
+            105,116,101]); //"OxychromaticBlowfishSwatDynamite"
+
+  state.expandstate(sha2salt, 64, sha2pass, 64);
+  for (i = 0; i < 64; i++) {
+    state.expand0state(sha2salt, 64);
+    state.expand0state(sha2pass, 64);
+  }
+
+  for (i = 0; i < BCRYPT_BLOCKS; i++)
+    cdata[i] = stream2word(ciphertext, ciphertext.byteLength);
+  for (i = 0; i < 64; i++)
+    state.enc(cdata, cdata.byteLength / 8);
+
+  for (i = 0; i < BCRYPT_BLOCKS; i++) {
+    out[4*i+3] = cdata[i] >>> 24;
+    out[4*i+2] = cdata[i] >>> 16;
+    out[4*i+1] = cdata[i] >>> 8;
+    out[4*i+0] = cdata[i];
+  }
+};
+
+function bcrypt_pbkdf(pass, passlen, salt, saltlen, key, keylen, rounds) {
+  var sha2pass = new Uint8Array(64),
+      sha2salt = new Uint8Array(64),
+      out = new Uint8Array(BCRYPT_HASHSIZE),
+      tmpout = new Uint8Array(BCRYPT_HASHSIZE),
+      countsalt = new Uint8Array(saltlen+4),
+      i, j, amt, stride, dest, count,
+      origkeylen = keylen;
+
+  if (rounds < 1)
+    return -1;
+  if (passlen === 0 || saltlen === 0 || keylen === 0 ||
+      keylen > (out.byteLength * out.byteLength) || saltlen > (1<<20))
+    return -1;
+
+  stride = Math.floor((keylen + out.byteLength - 1) / out.byteLength);
+  amt = Math.floor((keylen + stride - 1) / stride);
+
+  for (i = 0; i < saltlen; i++)
+    countsalt[i] = salt[i];
+
+  crypto_hash_sha512(sha2pass, pass, passlen);
+
+  for (count = 1; keylen > 0; count++) {
+    countsalt[saltlen+0] = count >>> 24;
+    countsalt[saltlen+1] = count >>> 16;
+    countsalt[saltlen+2] = count >>>  8;
+    countsalt[saltlen+3] = count;
+
+    crypto_hash_sha512(sha2salt, countsalt, saltlen + 4);
+    bcrypt_hash(sha2pass, sha2salt, tmpout);
+    for (i = out.byteLength; i--;)
+      out[i] = tmpout[i];
+
+    for (i = 1; i < rounds; i++) {
+      crypto_hash_sha512(sha2salt, tmpout, tmpout.byteLength);
+      bcrypt_hash(sha2pass, sha2salt, tmpout);
+      for (j = 0; j < out.byteLength; j++)
+        out[j] ^= tmpout[j];
+    }
+
+    amt = Math.min(amt, keylen);
+    for (i = 0; i < amt; i++) {
+      dest = i * stride + (count - 1);
+      if (dest >= origkeylen)
+        break;
+      key[dest] = out[i];
+    }
+    keylen -= i;
+  }
+
+  return 0;
+};
+
+module.exports = {
+      BLOCKS: BCRYPT_BLOCKS,
+      HASHSIZE: BCRYPT_HASHSIZE,
+      hash: bcrypt_hash,
+      pbkdf: bcrypt_pbkdf
+};
+
+
+/***/ }),
+/* 380 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var bufferFill = __webpack_require__(594)
+var allocUnsafe = __webpack_require__(593)
+
+module.exports = function alloc (size, fill, encoding) {
+  if (typeof size !== 'number') {
+    throw new TypeError('"size" argument must be a number')
+  }
+
+  if (size < 0) {
+    throw new RangeError('"size" argument must not be negative')
+  }
+
+  if (Buffer.alloc) {
+    return Buffer.alloc(size, fill, encoding)
+  }
+
+  var buffer = allocUnsafe(size)
+
+  if (size === 0) {
+    return buffer
+  }
+
+  if (fill === undefined) {
+    return bufferFill(buffer, 0)
+  }
+
+  if (typeof encoding !== 'string') {
+    encoding = undefined
+  }
+
+  return bufferFill(buffer, fill, encoding)
+}
+
+
+/***/ }),
+/* 381 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+const restoreCursor = __webpack_require__(818);
+
+let hidden = false;
+
+exports.show = stream => {
+	const s = stream || process.stderr;
+
+	if (!s.isTTY) {
+		return;
+	}
+
+	hidden = false;
+	s.write('\u001b[?25h');
+};
+
+exports.hide = stream => {
+	const s = stream || process.stderr;
+
+	if (!s.isTTY) {
+		return;
+	}
+
+	restoreCursor();
+	hidden = true;
+	s.write('\u001b[?25l');
+};
+
+exports.toggle = (force, stream) => {
+	if (force !== undefined) {
+		hidden = force;
+	}
+
+	if (hidden) {
+		exports.show(stream);
+	} else {
+		exports.hide(stream);
+	}
+};
+
+
+/***/ }),
+/* 382 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var objectAssign = __webpack_require__(303);
+var stringWidth = __webpack_require__(945);
+
+function codeRegex(capture){
+  return capture ? /\u001b\[((?:\d*;){0,5}\d*)m/g : /\u001b\[(?:\d*;){0,5}\d*m/g
+}
+
+function strlen(str){
+  var code = codeRegex();
+  var stripped = ("" + str).replace(code,'');
+  var split = stripped.split("\n");
+  return split.reduce(function (memo, s) { return (stringWidth(s) > memo) ? stringWidth(s) : memo }, 0);
+}
+
+function repeat(str,times){
+  return Array(times + 1).join(str);
+}
+
+function pad(str, len, pad, dir) {
+  var length = strlen(str);
+  if (len + 1 >= length) {
+    var padlen = len - length;
+    switch (dir) {
+      case 'right':
+        str = repeat(pad, padlen) + str;
+        break;
+
+      case 'center':
+        var right = Math.ceil((padlen) / 2);
+        var left = padlen - right;
+        str = repeat(pad, left) + str + repeat(pad, right);
+        break;
+
+      default :
+        str = str + repeat(pad,padlen);
+        break;
+    }
+  }
+  return str;
+}
+
+var codeCache = {};
+
+function addToCodeCache(name,on,off){
+  on = '\u001b[' + on + 'm';
+  off = '\u001b[' + off + 'm';
+  codeCache[on] = {set:name,to:true};
+  codeCache[off] = {set:name,to:false};
+  codeCache[name] = {on:on,off:off};
+}
+
+//https://github.com/Marak/colors.js/blob/master/lib/styles.js
+addToCodeCache('bold', 1, 22);
+addToCodeCache('italics', 3, 23);
+addToCodeCache('underline', 4, 24);
+addToCodeCache('inverse', 7, 27);
+addToCodeCache('strikethrough', 9, 29);
+
+
+function updateState(state, controlChars){
+  var controlCode = controlChars[1] ? parseInt(controlChars[1].split(';')[0]) : 0;
+  if ( (controlCode >= 30 && controlCode <= 39)
+     || (controlCode >= 90 && controlCode <= 97)
+  ) {
+    state.lastForegroundAdded = controlChars[0];
+    return;
+  }
+  if ( (controlCode >= 40 && controlCode <= 49)
+     || (controlCode >= 100 && controlCode <= 107)
+  ) {
+    state.lastBackgroundAdded = controlChars[0];
+    return;
+  }
+  if (controlCode === 0) {
+    for (var i in state) {
+      /* istanbul ignore else */
+      if (state.hasOwnProperty(i)) {
+        delete state[i];
+      }
+    }
+    return;
+  }
+  var info = codeCache[controlChars[0]];
+  if (info) {
+    state[info.set] = info.to;
+  }
+}
+
+function readState(line){
+  var code = codeRegex(true);
+  var controlChars = code.exec(line);
+  var state = {};
+  while(controlChars !== null){
+    updateState(state, controlChars);
+    controlChars = code.exec(line);
+  }
+  return state;
+}
+
+function unwindState(state,ret){
+  var lastBackgroundAdded = state.lastBackgroundAdded;
+  var lastForegroundAdded = state.lastForegroundAdded;
+
+  delete state.lastBackgroundAdded;
+  delete state.lastForegroundAdded;
+
+  Object.keys(state).forEach(function(key){
+    if(state[key]){
+      ret += codeCache[key].off;
+    }
+  });
+
+  if(lastBackgroundAdded && (lastBackgroundAdded != '\u001b[49m')){
+    ret += '\u001b[49m';
+  }
+  if(lastForegroundAdded && (lastForegroundAdded != '\u001b[39m')){
+    ret += '\u001b[39m';
+  }
+
+  return ret;
+}
+
+function rewindState(state,ret){
+  var lastBackgroundAdded = state.lastBackgroundAdded;
+  var lastForegroundAdded = state.lastForegroundAdded;
+
+  delete state.lastBackgroundAdded;
+  delete state.lastForegroundAdded;
+
+  Object.keys(state).forEach(function(key){
+    if(state[key]){
+      ret = codeCache[key].on + ret;
+    }
+  });
+
+  if(lastBackgroundAdded && (lastBackgroundAdded != '\u001b[49m')){
+    ret = lastBackgroundAdded + ret;
+  }
+  if(lastForegroundAdded && (lastForegroundAdded != '\u001b[39m')){
+    ret = lastForegroundAdded + ret;
+  }
+
+  return ret;
+}
+
+function truncateWidth(str, desiredLength){
+  if (str.length === strlen(str)) {
+    return str.substr(0, desiredLength);
+  }
+
+  while (strlen(str) > desiredLength){
+    str = str.slice(0, -1);
+  }
+
+  return str;
+}
+
+function truncateWidthWithAnsi(str, desiredLength){
+  var code = codeRegex(true);
+  var split = str.split(codeRegex());
+  var splitIndex = 0;
+  var retLen = 0;
+  var ret = '';
+  var myArray;
+  var state = {};
+
+  while(retLen < desiredLength){
+    myArray = code.exec(str);
+    var toAdd = split[splitIndex];
+    splitIndex++;
+    if (retLen + strlen(toAdd) > desiredLength){
+      toAdd = truncateWidth(toAdd, desiredLength - retLen);
+    }
+    ret += toAdd;
+    retLen += strlen(toAdd);
+
+    if(retLen < desiredLength){
+      if (!myArray) { break; }  // full-width chars may cause a whitespace which cannot be filled
+      ret += myArray[0];
+      updateState(state,myArray);
+    }
+  }
+
+  return unwindState(state,ret);
+}
+
+function truncate(str, desiredLength, truncateChar){
+  truncateChar = truncateChar || '…';
+  var lengthOfStr = strlen(str);
+  if(lengthOfStr <= desiredLength){
+    return str;
+  }
+  desiredLength -= strlen(truncateChar);
+
+  var ret = truncateWidthWithAnsi(str, desiredLength);
+
+  return ret + truncateChar;
+}
+
+
+function defaultOptions(){
+  return{
+    chars: {
+      'top': '─'
+      , 'top-mid': '┬'
+      , 'top-left': '┌'
+      , 'top-right': '┐'
+      , 'bottom': '─'
+      , 'bottom-mid': '┴'
+      , 'bottom-left': '└'
+      , 'bottom-right': '┘'
+      , 'left': '│'
+      , 'left-mid': '├'
+      , 'mid': '─'
+      , 'mid-mid': '┼'
+      , 'right': '│'
+      , 'right-mid': '┤'
+      , 'middle': '│'
+    }
+    , truncate: '…'
+    , colWidths: []
+    , rowHeights: []
+    , colAligns: []
+    , rowAligns: []
+    , style: {
+      'padding-left': 1
+      , 'padding-right': 1
+      , head: ['red']
+      , border: ['grey']
+      , compact : false
+    }
+    , head: []
+  };
+}
+
+function mergeOptions(options,defaults){
+  options = options || {};
+  defaults = defaults || defaultOptions();
+  var ret = objectAssign({}, defaults, options);
+  ret.chars = objectAssign({}, defaults.chars, options.chars);
+  ret.style = objectAssign({}, defaults.style, options.style);
+  return ret;
+}
+
+function wordWrap(maxLength,input){
+  var lines = [];
+  var split = input.split(/(\s+)/g);
+  var line = [];
+  var lineLength = 0;
+  var whitespace;
+  for (var i = 0; i < split.length; i += 2) {
+    var word = split[i];
+    var newLength = lineLength + strlen(word);
+    if (lineLength > 0 && whitespace) {
+      newLength += whitespace.length;
+    }
+    if(newLength > maxLength){
+      if(lineLength !== 0){
+        lines.push(line.join(''));
+      }
+      line = [word];
+      lineLength = strlen(word);
+    } else {
+      line.push(whitespace || '', word);
+      lineLength = newLength;
+    }
+    whitespace = split[i+1];
+  }
+  if(lineLength){
+    lines.push(line.join(''));
+  }
+  return lines;
+}
+
+function multiLineWordWrap(maxLength, input){
+  var output = [];
+  input = input.split('\n');
+  for(var i = 0; i < input.length; i++){
+    output.push.apply(output,wordWrap(maxLength,input[i]));
+  }
+  return output;
+}
+
+function colorizeLines(input){
+  var state = {};
+  var output = [];
+  for(var i = 0; i < input.length; i++){
+    var line = rewindState(state,input[i]) ;
+    state = readState(line);
+    var temp = objectAssign({},state);
+    output.push(unwindState(temp,line));
+  }
+  return output;
+}
+
+module.exports = {
+  strlen:strlen,
+  repeat:repeat,
+  pad:pad,
+  truncate:truncate,
+  mergeOptions:mergeOptions,
+  wordWrap:multiLineWordWrap,
+  colorizeLines:colorizeLines
+};
+
+
+/***/ }),
+/* 383 */
+/***/ (function(module, exports) {
+
+
+/**
+ * slice() reference.
+ */
+
+var slice = Array.prototype.slice;
+
+/**
+ * Expose `co`.
+ */
+
+module.exports = co['default'] = co.co = co;
+
+/**
+ * Wrap the given generator `fn` into a
+ * function that returns a promise.
+ * This is a separate function so that
+ * every `co()` call doesn't create a new,
+ * unnecessary closure.
+ *
+ * @param {GeneratorFunction} fn
+ * @return {Function}
+ * @api public
+ */
+
+co.wrap = function (fn) {
+  createPromise.__generatorFunction__ = fn;
+  return createPromise;
+  function createPromise() {
+    return co.call(this, fn.apply(this, arguments));
+  }
+};
+
+/**
+ * Execute the generator function or a generator
+ * and return a promise.
+ *
+ * @param {Function} fn
+ * @return {Promise}
+ * @api public
+ */
+
+function co(gen) {
+  var ctx = this;
+  var args = slice.call(arguments, 1)
+
+  // we wrap everything in a promise to avoid promise chaining,
+  // which leads to memory leak errors.
+  // see https://github.com/tj/co/issues/180
+  return new Promise(function(resolve, reject) {
+    if (typeof gen === 'function') gen = gen.apply(ctx, args);
+    if (!gen || typeof gen.next !== 'function') return resolve(gen);
+
+    onFulfilled();
+
+    /**
+     * @param {Mixed} res
+     * @return {Promise}
+     * @api private
+     */
+
+    function onFulfilled(res) {
+      var ret;
+      try {
+        ret = gen.next(res);
+      } catch (e) {
+        return reject(e);
+      }
+      next(ret);
+    }
+
+    /**
+     * @param {Error} err
+     * @return {Promise}
+     * @api private
+     */
+
+    function onRejected(err) {
+      var ret;
+      try {
+        ret = gen.throw(err);
+      } catch (e) {
+        return reject(e);
+      }
+      next(ret);
+    }
+
+    /**
+     * Get the next value in the generator,
+     * return a promise.
+     *
+     * @param {Object} ret
+     * @return {Promise}
+     * @api private
+     */
+
+    function next(ret) {
+      if (ret.done) return resolve(ret.value);
+      var value = toPromise.call(ctx, ret.value);
+      if (value && isPromise(value)) return value.then(onFulfilled, onRejected);
+      return onRejected(new TypeError('You may only yield a function, promise, generator, array, or object, '
+        + 'but the following object was passed: "' + String(ret.value) + '"'));
+    }
+  });
+}
+
+/**
+ * Convert a `yield`ed value into a promise.
+ *
+ * @param {Mixed} obj
+ * @return {Promise}
+ * @api private
+ */
+
+function toPromise(obj) {
+  if (!obj) return obj;
+  if (isPromise(obj)) return obj;
+  if (isGeneratorFunction(obj) || isGenerator(obj)) return co.call(this, obj);
+  if ('function' == typeof obj) return thunkToPromise.call(this, obj);
+  if (Array.isArray(obj)) return arrayToPromise.call(this, obj);
+  if (isObject(obj)) return objectToPromise.call(this, obj);
+  return obj;
+}
+
+/**
+ * Convert a thunk to a promise.
+ *
+ * @param {Function}
+ * @return {Promise}
+ * @api private
+ */
+
+function thunkToPromise(fn) {
+  var ctx = this;
+  return new Promise(function (resolve, reject) {
+    fn.call(ctx, function (err, res) {
+      if (err) return reject(err);
+      if (arguments.length > 2) res = slice.call(arguments, 1);
+      resolve(res);
+    });
+  });
+}
+
+/**
+ * Convert an array of "yieldables" to a promise.
+ * Uses `Promise.all()` internally.
+ *
+ * @param {Array} obj
+ * @return {Promise}
+ * @api private
+ */
+
+function arrayToPromise(obj) {
+  return Promise.all(obj.map(toPromise, this));
+}
+
+/**
+ * Convert an object of "yieldables" to a promise.
+ * Uses `Promise.all()` internally.
+ *
+ * @param {Object} obj
+ * @return {Promise}
+ * @api private
+ */
+
+function objectToPromise(obj){
+  var results = new obj.constructor();
+  var keys = Object.keys(obj);
+  var promises = [];
+  for (var i = 0; i < keys.length; i++) {
+    var key = keys[i];
+    var promise = toPromise.call(this, obj[key]);
+    if (promise && isPromise(promise)) defer(promise, key);
+    else results[key] = obj[key];
+  }
+  return Promise.all(promises).then(function () {
+    return results;
+  });
+
+  function defer(promise, key) {
+    // predefine the key in the result
+    results[key] = undefined;
+    promises.push(promise.then(function (res) {
+      results[key] = res;
+    }));
+  }
+}
+
+/**
+ * Check if `obj` is a promise.
+ *
+ * @param {Object} obj
+ * @return {Boolean}
+ * @api private
+ */
+
+function isPromise(obj) {
+  return 'function' == typeof obj.then;
+}
+
+/**
+ * Check if `obj` is a generator.
+ *
+ * @param {Mixed} obj
+ * @return {Boolean}
+ * @api private
+ */
+
+function isGenerator(obj) {
+  return 'function' == typeof obj.next && 'function' == typeof obj.throw;
+}
+
+/**
+ * Check if `obj` is a generator function.
+ *
+ * @param {Mixed} obj
+ * @return {Boolean}
+ * @api private
+ */
+function isGeneratorFunction(obj) {
+  var constructor = obj.constructor;
+  if (!constructor) return false;
+  if ('GeneratorFunction' === constructor.name || 'GeneratorFunction' === constructor.displayName) return true;
+  return isGenerator(constructor.prototype);
+}
+
+/**
+ * Check for plain object.
+ *
+ * @param {Mixed} val
+ * @return {Boolean}
+ * @api private
+ */
+
+function isObject(val) {
+  return Object == val.constructor;
+}
+
+
+/***/ }),
+/* 384 */
+/***/ (function(module, exports, __webpack_require__) {
+
+/* MIT license */
+var cssKeywords = __webpack_require__(610);
+
+// NOTE: conversions should only return primitive values (i.e. arrays, or
+//       values that give correct `typeof` results).
+//       do not use box values types (i.e. Number(), String(), etc.)
+
+var reverseKeywords = {};
+for (var key in cssKeywords) {
+	if (cssKeywords.hasOwnProperty(key)) {
+		reverseKeywords[cssKeywords[key]] = key;
+	}
+}
+
+var convert = module.exports = {
+	rgb: {channels: 3, labels: 'rgb'},
+	hsl: {channels: 3, labels: 'hsl'},
+	hsv: {channels: 3, labels: 'hsv'},
+	hwb: {channels: 3, labels: 'hwb'},
+	cmyk: {channels: 4, labels: 'cmyk'},
+	xyz: {channels: 3, labels: 'xyz'},
+	lab: {channels: 3, labels: 'lab'},
+	lch: {channels: 3, labels: 'lch'},
+	hex: {channels: 1, labels: ['hex']},
+	keyword: {channels: 1, labels: ['keyword']},
+	ansi16: {channels: 1, labels: ['ansi16']},
+	ansi256: {channels: 1, labels: ['ansi256']},
+	hcg: {channels: 3, labels: ['h', 'c', 'g']},
+	apple: {channels: 3, labels: ['r16', 'g16', 'b16']},
+	gray: {channels: 1, labels: ['gray']}
+};
+
+// hide .channels and .labels properties
+for (var model in convert) {
+	if (convert.hasOwnProperty(model)) {
+		if (!('channels' in convert[model])) {
+			throw new Error('missing channels property: ' + model);
+		}
+
+		if (!('labels' in convert[model])) {
+			throw new Error('missing channel labels property: ' + model);
+		}
+
+		if (convert[model].labels.length !== convert[model].channels) {
+			throw new Error('channel and label counts mismatch: ' + model);
+		}
+
+		var channels = convert[model].channels;
+		var labels = convert[model].labels;
+		delete convert[model].channels;
+		delete convert[model].labels;
+		Object.defineProperty(convert[model], 'channels', {value: channels});
+		Object.defineProperty(convert[model], 'labels', {value: labels});
+	}
+}
+
+convert.rgb.hsl = function (rgb) {
+	var r = rgb[0] / 255;
+	var g = rgb[1] / 255;
+	var b = rgb[2] / 255;
+	var min = Math.min(r, g, b);
+	var max = Math.max(r, g, b);
+	var delta = max - min;
+	var h;
+	var s;
+	var l;
+
+	if (max === min) {
+		h = 0;
+	} else if (r === max) {
+		h = (g - b) / delta;
+	} else if (g === max) {
+		h = 2 + (b - r) / delta;
+	} else if (b === max) {
+		h = 4 + (r - g) / delta;
+	}
+
+	h = Math.min(h * 60, 360);
+
+	if (h < 0) {
+		h += 360;
+	}
+
+	l = (min + max) / 2;
+
+	if (max === min) {
+		s = 0;
+	} else if (l <= 0.5) {
+		s = delta / (max + min);
+	} else {
+		s = delta / (2 - max - min);
+	}
+
+	return [h, s * 100, l * 100];
+};
+
+convert.rgb.hsv = function (rgb) {
+	var rdif;
+	var gdif;
+	var bdif;
+	var h;
+	var s;
+
+	var r = rgb[0] / 255;
+	var g = rgb[1] / 255;
+	var b = rgb[2] / 255;
+	var v = Math.max(r, g, b);
+	var diff = v - Math.min(r, g, b);
+	var diffc = function (c) {
+		return (v - c) / 6 / diff + 1 / 2;
+	};
+
+	if (diff === 0) {
+		h = s = 0;
+	} else {
+		s = diff / v;
+		rdif = diffc(r);
+		gdif = diffc(g);
+		bdif = diffc(b);
+
+		if (r === v) {
+			h = bdif - gdif;
+		} else if (g === v) {
+			h = (1 / 3) + rdif - bdif;
+		} else if (b === v) {
+			h = (2 / 3) + gdif - rdif;
+		}
+		if (h < 0) {
+			h += 1;
+		} else if (h > 1) {
+			h -= 1;
+		}
+	}
+
+	return [
+		h * 360,
+		s * 100,
+		v * 100
+	];
+};
+
+convert.rgb.hwb = function (rgb) {
+	var r = rgb[0];
+	var g = rgb[1];
+	var b = rgb[2];
+	var h = convert.rgb.hsl(rgb)[0];
+	var w = 1 / 255 * Math.min(r, Math.min(g, b));
+
+	b = 1 - 1 / 255 * Math.max(r, Math.max(g, b));
+
+	return [h, w * 100, b * 100];
+};
+
+convert.rgb.cmyk = function (rgb) {
+	var r = rgb[0] / 255;
+	var g = rgb[1] / 255;
+	var b = rgb[2] / 255;
+	var c;
+	var m;
+	var y;
+	var k;
+
+	k = Math.min(1 - r, 1 - g, 1 - b);
+	c = (1 - r - k) / (1 - k) || 0;
+	m = (1 - g - k) / (1 - k) || 0;
+	y = (1 - b - k) / (1 - k) || 0;
+
+	return [c * 100, m * 100, y * 100, k * 100];
+};
+
+/**
+ * See https://en.m.wikipedia.org/wiki/Euclidean_distance#Squared_Euclidean_distance
+ * */
+function comparativeDistance(x, y) {
+	return (
+		Math.pow(x[0] - y[0], 2) +
+		Math.pow(x[1] - y[1], 2) +
+		Math.pow(x[2] - y[2], 2)
+	);
+}
+
+convert.rgb.keyword = function (rgb) {
+	var reversed = reverseKeywords[rgb];
+	if (reversed) {
+		return reversed;
+	}
+
+	var currentClosestDistance = Infinity;
+	var currentClosestKeyword;
+
+	for (var keyword in cssKeywords) {
+		if (cssKeywords.hasOwnProperty(keyword)) {
+			var value = cssKeywords[keyword];
+
+			// Compute comparative distance
+			var distance = comparativeDistance(rgb, value);
+
+			// Check if its less, if so set as closest
+			if (distance < currentClosestDistance) {
+				currentClosestDistance = distance;
+				currentClosestKeyword = keyword;
+			}
+		}
+	}
+
+	return currentClosestKeyword;
+};
+
+convert.keyword.rgb = function (keyword) {
+	return cssKeywords[keyword];
+};
+
+convert.rgb.xyz = function (rgb) {
+	var r = rgb[0] / 255;
+	var g = rgb[1] / 255;
+	var b = rgb[2] / 255;
+
+	// assume sRGB
+	r = r > 0.04045 ? Math.pow(((r + 0.055) / 1.055), 2.4) : (r / 12.92);
+	g = g > 0.04045 ? Math.pow(((g + 0.055) / 1.055), 2.4) : (g / 12.92);
+	b = b > 0.04045 ? Math.pow(((b + 0.055) / 1.055), 2.4) : (b / 12.92);
+
+	var x = (r * 0.4124) + (g * 0.3576) + (b * 0.1805);
+	var y = (r * 0.2126) + (g * 0.7152) + (b * 0.0722);
+	var z = (r * 0.0193) + (g * 0.1192) + (b * 0.9505);
+
+	return [x * 100, y * 100, z * 100];
+};
+
+convert.rgb.lab = function (rgb) {
+	var xyz = convert.rgb.xyz(rgb);
+	var x = xyz[0];
+	var y = xyz[1];
+	var z = xyz[2];
+	var l;
+	var a;
+	var b;
+
+	x /= 95.047;
+	y /= 100;
+	z /= 108.883;
+
+	x = x > 0.008856 ? Math.pow(x, 1 / 3) : (7.787 * x) + (16 / 116);
+	y = y > 0.008856 ? Math.pow(y, 1 / 3) : (7.787 * y) + (16 / 116);
+	z = z > 0.008856 ? Math.pow(z, 1 / 3) : (7.787 * z) + (16 / 116);
+
+	l = (116 * y) - 16;
+	a = 500 * (x - y);
+	b = 200 * (y - z);
+
+	return [l, a, b];
+};
+
+convert.hsl.rgb = function (hsl) {
+	var h = hsl[0] / 360;
+	var s = hsl[1] / 100;
+	var l = hsl[2] / 100;
+	var t1;
+	var t2;
+	var t3;
+	var rgb;
+	var val;
+
+	if (s === 0) {
+		val = l * 255;
+		return [val, val, val];
+	}
+
+	if (l < 0.5) {
+		t2 = l * (1 + s);
+	} else {
+		t2 = l + s - l * s;
+	}
+
+	t1 = 2 * l - t2;
+
+	rgb = [0, 0, 0];
+	for (var i = 0; i < 3; i++) {
+		t3 = h + 1 / 3 * -(i - 1);
+		if (t3 < 0) {
+			t3++;
+		}
+		if (t3 > 1) {
+			t3--;
+		}
+
+		if (6 * t3 < 1) {
+			val = t1 + (t2 - t1) * 6 * t3;
+		} else if (2 * t3 < 1) {
+			val = t2;
+		} else if (3 * t3 < 2) {
+			val = t1 + (t2 - t1) * (2 / 3 - t3) * 6;
+		} else {
+			val = t1;
+		}
+
+		rgb[i] = val * 255;
+	}
+
+	return rgb;
+};
+
+convert.hsl.hsv = function (hsl) {
+	var h = hsl[0];
+	var s = hsl[1] / 100;
+	var l = hsl[2] / 100;
+	var smin = s;
+	var lmin = Math.max(l, 0.01);
+	var sv;
+	var v;
+
+	l *= 2;
+	s *= (l <= 1) ? l : 2 - l;
+	smin *= lmin <= 1 ? lmin : 2 - lmin;
+	v = (l + s) / 2;
+	sv = l === 0 ? (2 * smin) / (lmin + smin) : (2 * s) / (l + s);
+
+	return [h, sv * 100, v * 100];
+};
+
+convert.hsv.rgb = function (hsv) {
+	var h = hsv[0] / 60;
+	var s = hsv[1] / 100;
+	var v = hsv[2] / 100;
+	var hi = Math.floor(h) % 6;
+
+	var f = h - Math.floor(h);
+	var p = 255 * v * (1 - s);
+	var q = 255 * v * (1 - (s * f));
+	var t = 255 * v * (1 - (s * (1 - f)));
+	v *= 255;
+
+	switch (hi) {
+		case 0:
+			return [v, t, p];
+		case 1:
+			return [q, v, p];
+		case 2:
+			return [p, v, t];
+		case 3:
+			return [p, q, v];
+		case 4:
+			return [t, p, v];
+		case 5:
+			return [v, p, q];
+	}
+};
+
+convert.hsv.hsl = function (hsv) {
+	var h = hsv[0];
+	var s = hsv[1] / 100;
+	var v = hsv[2] / 100;
+	var vmin = Math.max(v, 0.01);
+	var lmin;
+	var sl;
+	var l;
+
+	l = (2 - s) * v;
+	lmin = (2 - s) * vmin;
+	sl = s * vmin;
+	sl /= (lmin <= 1) ? lmin : 2 - lmin;
+	sl = sl || 0;
+	l /= 2;
+
+	return [h, sl * 100, l * 100];
+};
+
+// http://dev.w3.org/csswg/css-color/#hwb-to-rgb
+convert.hwb.rgb = function (hwb) {
+	var h = hwb[0] / 360;
+	var wh = hwb[1] / 100;
+	var bl = hwb[2] / 100;
+	var ratio = wh + bl;
+	var i;
+	var v;
+	var f;
+	var n;
+
+	// wh + bl cant be > 1
+	if (ratio > 1) {
+		wh /= ratio;
+		bl /= ratio;
+	}
+
+	i = Math.floor(6 * h);
+	v = 1 - bl;
+	f = 6 * h - i;
+
+	if ((i & 0x01) !== 0) {
+		f = 1 - f;
+	}
+
+	n = wh + f * (v - wh); // linear interpolation
+
+	var r;
+	var g;
+	var b;
+	switch (i) {
+		default:
+		case 6:
+		case 0: r = v; g = n; b = wh; break;
+		case 1: r = n; g = v; b = wh; break;
+		case 2: r = wh; g = v; b = n; break;
+		case 3: r = wh; g = n; b = v; break;
+		case 4: r = n; g = wh; b = v; break;
+		case 5: r = v; g = wh; b = n; break;
+	}
+
+	return [r * 255, g * 255, b * 255];
+};
+
+convert.cmyk.rgb = function (cmyk) {
+	var c = cmyk[0] / 100;
+	var m = cmyk[1] / 100;
+	var y = cmyk[2] / 100;
+	var k = cmyk[3] / 100;
+	var r;
+	var g;
+	var b;
+
+	r = 1 - Math.min(1, c * (1 - k) + k);
+	g = 1 - Math.min(1, m * (1 - k) + k);
+	b = 1 - Math.min(1, y * (1 - k) + k);
+
+	return [r * 255, g * 255, b * 255];
+};
+
+convert.xyz.rgb = function (xyz) {
+	var x = xyz[0] / 100;
+	var y = xyz[1] / 100;
+	var z = xyz[2] / 100;
+	var r;
+	var g;
+	var b;
+
+	r = (x * 3.2406) + (y * -1.5372) + (z * -0.4986);
+	g = (x * -0.9689) + (y * 1.8758) + (z * 0.0415);
+	b = (x * 0.0557) + (y * -0.2040) + (z * 1.0570);
+
+	// assume sRGB
+	r = r > 0.0031308
+		? ((1.055 * Math.pow(r, 1.0 / 2.4)) - 0.055)
+		: r * 12.92;
+
+	g = g > 0.0031308
+		? ((1.055 * Math.pow(g, 1.0 / 2.4)) - 0.055)
+		: g * 12.92;
+
+	b = b > 0.0031308
+		? ((1.055 * Math.pow(b, 1.0 / 2.4)) - 0.055)
+		: b * 12.92;
+
+	r = Math.min(Math.max(0, r), 1);
+	g = Math.min(Math.max(0, g), 1);
+	b = Math.min(Math.max(0, b), 1);
+
+	return [r * 255, g * 255, b * 255];
+};
+
+convert.xyz.lab = function (xyz) {
+	var x = xyz[0];
+	var y = xyz[1];
+	var z = xyz[2];
+	var l;
+	var a;
+	var b;
+
+	x /= 95.047;
+	y /= 100;
+	z /= 108.883;
+
+	x = x > 0.008856 ? Math.pow(x, 1 / 3) : (7.787 * x) + (16 / 116);
+	y = y > 0.008856 ? Math.pow(y, 1 / 3) : (7.787 * y) + (16 / 116);
+	z = z > 0.008856 ? Math.pow(z, 1 / 3) : (7.787 * z) + (16 / 116);
+
+	l = (116 * y) - 16;
+	a = 500 * (x - y);
+	b = 200 * (y - z);
+
+	return [l, a, b];
+};
+
+convert.lab.xyz = function (lab) {
+	var l = lab[0];
+	var a = lab[1];
+	var b = lab[2];
+	var x;
+	var y;
+	var z;
+
+	y = (l + 16) / 116;
+	x = a / 500 + y;
+	z = y - b / 200;
+
+	var y2 = Math.pow(y, 3);
+	var x2 = Math.pow(x, 3);
+	var z2 = Math.pow(z, 3);
+	y = y2 > 0.008856 ? y2 : (y - 16 / 116) / 7.787;
+	x = x2 > 0.008856 ? x2 : (x - 16 / 116) / 7.787;
+	z = z2 > 0.008856 ? z2 : (z - 16 / 116) / 7.787;
+
+	x *= 95.047;
+	y *= 100;
+	z *= 108.883;
+
+	return [x, y, z];
+};
+
+convert.lab.lch = function (lab) {
+	var l = lab[0];
+	var a = lab[1];
+	var b = lab[2];
+	var hr;
+	var h;
+	var c;
+
+	hr = Math.atan2(b, a);
+	h = hr * 360 / 2 / Math.PI;
+
+	if (h < 0) {
+		h += 360;
+	}
+
+	c = Math.sqrt(a * a + b * b);
+
+	return [l, c, h];
+};
+
+convert.lch.lab = function (lch) {
+	var l = lch[0];
+	var c = lch[1];
+	var h = lch[2];
+	var a;
+	var b;
+	var hr;
+
+	hr = h / 360 * 2 * Math.PI;
+	a = c * Math.cos(hr);
+	b = c * Math.sin(hr);
+
+	return [l, a, b];
+};
+
+convert.rgb.ansi16 = function (args) {
+	var r = args[0];
+	var g = args[1];
+	var b = args[2];
+	var value = 1 in arguments ? arguments[1] : convert.rgb.hsv(args)[2]; // hsv -> ansi16 optimization
+
+	value = Math.round(value / 50);
+
+	if (value === 0) {
+		return 30;
+	}
+
+	var ansi = 30
+		+ ((Math.round(b / 255) << 2)
+		| (Math.round(g / 255) << 1)
+		| Math.round(r / 255));
+
+	if (value === 2) {
+		ansi += 60;
+	}
+
+	return ansi;
+};
+
+convert.hsv.ansi16 = function (args) {
+	// optimization here; we already know the value and don't need to get
+	// it converted for us.
+	return convert.rgb.ansi16(convert.hsv.rgb(args), args[2]);
+};
+
+convert.rgb.ansi256 = function (args) {
+	var r = args[0];
+	var g = args[1];
+	var b = args[2];
+
+	// we use the extended greyscale palette here, with the exception of
+	// black and white. normal palette only has 4 greyscale shades.
+	if (r === g && g === b) {
+		if (r < 8) {
+			return 16;
+		}
+
+		if (r > 248) {
+			return 231;
+		}
+
+		return Math.round(((r - 8) / 247) * 24) + 232;
+	}
+
+	var ansi = 16
+		+ (36 * Math.round(r / 255 * 5))
+		+ (6 * Math.round(g / 255 * 5))
+		+ Math.round(b / 255 * 5);
+
+	return ansi;
+};
+
+convert.ansi16.rgb = function (args) {
+	var color = args % 10;
+
+	// handle greyscale
+	if (color === 0 || color === 7) {
+		if (args > 50) {
+			color += 3.5;
+		}
+
+		color = color / 10.5 * 255;
+
+		return [color, color, color];
+	}
+
+	var mult = (~~(args > 50) + 1) * 0.5;
+	var r = ((color & 1) * mult) * 255;
+	var g = (((color >> 1) & 1) * mult) * 255;
+	var b = (((color >> 2) & 1) * mult) * 255;
+
+	return [r, g, b];
+};
+
+convert.ansi256.rgb = function (args) {
+	// handle greyscale
+	if (args >= 232) {
+		var c = (args - 232) * 10 + 8;
+		return [c, c, c];
+	}
+
+	args -= 16;
+
+	var rem;
+	var r = Math.floor(args / 36) / 5 * 255;
+	var g = Math.floor((rem = args % 36) / 6) / 5 * 255;
+	var b = (rem % 6) / 5 * 255;
+
+	return [r, g, b];
+};
+
+convert.rgb.hex = function (args) {
+	var integer = ((Math.round(args[0]) & 0xFF) << 16)
+		+ ((Math.round(args[1]) & 0xFF) << 8)
+		+ (Math.round(args[2]) & 0xFF);
+
+	var string = integer.toString(16).toUpperCase();
+	return '000000'.substring(string.length) + string;
+};
+
+convert.hex.rgb = function (args) {
+	var match = args.toString(16).match(/[a-f0-9]{6}|[a-f0-9]{3}/i);
+	if (!match) {
+		return [0, 0, 0];
+	}
+
+	var colorString = match[0];
+
+	if (match[0].length === 3) {
+		colorString = colorString.split('').map(function (char) {
+			return char + char;
+		}).join('');
+	}
+
+	var integer = parseInt(colorString, 16);
+	var r = (integer >> 16) & 0xFF;
+	var g = (integer >> 8) & 0xFF;
+	var b = integer & 0xFF;
+
+	return [r, g, b];
+};
+
+convert.rgb.hcg = function (rgb) {
+	var r = rgb[0] / 255;
+	var g = rgb[1] / 255;
+	var b = rgb[2] / 255;
+	var max = Math.max(Math.max(r, g), b);
+	var min = Math.min(Math.min(r, g), b);
+	var chroma = (max - min);
+	var grayscale;
+	var hue;
+
+	if (chroma < 1) {
+		grayscale = min / (1 - chroma);
+	} else {
+		grayscale = 0;
+	}
+
+	if (chroma <= 0) {
+		hue = 0;
+	} else
+	if (max === r) {
+		hue = ((g - b) / chroma) % 6;
+	} else
+	if (max === g) {
+		hue = 2 + (b - r) / chroma;
+	} else {
+		hue = 4 + (r - g) / chroma + 4;
+	}
+
+	hue /= 6;
+	hue %= 1;
+
+	return [hue * 360, chroma * 100, grayscale * 100];
+};
+
+convert.hsl.hcg = function (hsl) {
+	var s = hsl[1] / 100;
+	var l = hsl[2] / 100;
+	var c = 1;
+	var f = 0;
+
+	if (l < 0.5) {
+		c = 2.0 * s * l;
+	} else {
+		c = 2.0 * s * (1.0 - l);
+	}
+
+	if (c < 1.0) {
+		f = (l - 0.5 * c) / (1.0 - c);
+	}
+
+	return [hsl[0], c * 100, f * 100];
+};
+
+convert.hsv.hcg = function (hsv) {
+	var s = hsv[1] / 100;
+	var v = hsv[2] / 100;
+
+	var c = s * v;
+	var f = 0;
+
+	if (c < 1.0) {
+		f = (v - c) / (1 - c);
+	}
+
+	return [hsv[0], c * 100, f * 100];
+};
+
+convert.hcg.rgb = function (hcg) {
+	var h = hcg[0] / 360;
+	var c = hcg[1] / 100;
+	var g = hcg[2] / 100;
+
+	if (c === 0.0) {
+		return [g * 255, g * 255, g * 255];
+	}
+
+	var pure = [0, 0, 0];
+	var hi = (h % 1) * 6;
+	var v = hi % 1;
+	var w = 1 - v;
+	var mg = 0;
+
+	switch (Math.floor(hi)) {
+		case 0:
+			pure[0] = 1; pure[1] = v; pure[2] = 0; break;
+		case 1:
+			pure[0] = w; pure[1] = 1; pure[2] = 0; break;
+		case 2:
+			pure[0] = 0; pure[1] = 1; pure[2] = v; break;
+		case 3:
+			pure[0] = 0; pure[1] = w; pure[2] = 1; break;
+		case 4:
+			pure[0] = v; pure[1] = 0; pure[2] = 1; break;
+		default:
+			pure[0] = 1; pure[1] = 0; pure[2] = w;
+	}
+
+	mg = (1.0 - c) * g;
+
+	return [
+		(c * pure[0] + mg) * 255,
+		(c * pure[1] + mg) * 255,
+		(c * pure[2] + mg) * 255
+	];
+};
+
+convert.hcg.hsv = function (hcg) {
+	var c = hcg[1] / 100;
+	var g = hcg[2] / 100;
+
+	var v = c + g * (1.0 - c);
+	var f = 0;
+
+	if (v > 0.0) {
+		f = c / v;
+	}
+
+	return [hcg[0], f * 100, v * 100];
+};
+
+convert.hcg.hsl = function (hcg) {
+	var c = hcg[1] / 100;
+	var g = hcg[2] / 100;
+
+	var l = g * (1.0 - c) + 0.5 * c;
+	var s = 0;
+
+	if (l > 0.0 && l < 0.5) {
+		s = c / (2 * l);
+	} else
+	if (l >= 0.5 && l < 1.0) {
+		s = c / (2 * (1 - l));
+	}
+
+	return [hcg[0], s * 100, l * 100];
+};
+
+convert.hcg.hwb = function (hcg) {
+	var c = hcg[1] / 100;
+	var g = hcg[2] / 100;
+	var v = c + g * (1.0 - c);
+	return [hcg[0], (v - c) * 100, (1 - v) * 100];
+};
+
+convert.hwb.hcg = function (hwb) {
+	var w = hwb[1] / 100;
+	var b = hwb[2] / 100;
+	var v = 1 - b;
+	var c = v - w;
+	var g = 0;
+
+	if (c < 1) {
+		g = (v - c) / (1 - c);
+	}
+
+	return [hwb[0], c * 100, g * 100];
+};
+
+convert.apple.rgb = function (apple) {
+	return [(apple[0] / 65535) * 255, (apple[1] / 65535) * 255, (apple[2] / 65535) * 255];
+};
+
+convert.rgb.apple = function (rgb) {
+	return [(rgb[0] / 255) * 65535, (rgb[1] / 255) * 65535, (rgb[2] / 255) * 65535];
+};
+
+convert.gray.rgb = function (args) {
+	return [args[0] / 100 * 255, args[0] / 100 * 255, args[0] / 100 * 255];
+};
+
+convert.gray.hsl = convert.gray.hsv = function (args) {
+	return [0, 0, args[0]];
+};
+
+convert.gray.hwb = function (gray) {
+	return [0, 100, gray[0]];
+};
+
+convert.gray.cmyk = function (gray) {
+	return [0, 0, 0, gray[0]];
+};
+
+convert.gray.lab = function (gray) {
+	return [gray[0], 0, 0];
+};
+
+convert.gray.hex = function (gray) {
+	var val = Math.round(gray[0] / 100 * 255) & 0xFF;
+	var integer = (val << 16) + (val << 8) + val;
+
+	var string = integer.toString(16).toUpperCase();
+	return '000000'.substring(string.length) + string;
+};
+
+convert.rgb.gray = function (rgb) {
+	var val = (rgb[0] + rgb[1] + rgb[2]) / 3;
+	return [val / 255 * 100];
+};
+
+
+/***/ }),
+/* 385 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var util = __webpack_require__(3);
+var Stream = __webpack_require__(23).Stream;
+var DelayedStream = __webpack_require__(634);
+var defer = __webpack_require__(622);
+
+module.exports = CombinedStream;
+function CombinedStream() {
+  this.writable = false;
+  this.readable = true;
+  this.dataSize = 0;
+  this.maxDataSize = 2 * 1024 * 1024;
+  this.pauseStreams = true;
+
+  this._released = false;
+  this._streams = [];
+  this._currentStream = null;
+}
+util.inherits(CombinedStream, Stream);
+
+CombinedStream.create = function(options) {
+  var combinedStream = new this();
+
+  options = options || {};
+  for (var option in options) {
+    combinedStream[option] = options[option];
+  }
+
+  return combinedStream;
+};
+
+CombinedStream.isStreamLike = function(stream) {
+  return (typeof stream !== 'function')
+    && (typeof stream !== 'string')
+    && (typeof stream !== 'boolean')
+    && (typeof stream !== 'number')
+    && (!Buffer.isBuffer(stream));
+};
+
+CombinedStream.prototype.append = function(stream) {
+  var isStreamLike = CombinedStream.isStreamLike(stream);
+
+  if (isStreamLike) {
+    if (!(stream instanceof DelayedStream)) {
+      var newStream = DelayedStream.create(stream, {
+        maxDataSize: Infinity,
+        pauseStream: this.pauseStreams,
+      });
+      stream.on('data', this._checkDataSize.bind(this));
+      stream = newStream;
+    }
+
+    this._handleErrors(stream);
+
+    if (this.pauseStreams) {
+      stream.pause();
+    }
+  }
+
+  this._streams.push(stream);
+  return this;
+};
+
+CombinedStream.prototype.pipe = function(dest, options) {
+  Stream.prototype.pipe.call(this, dest, options);
+  this.resume();
+  return dest;
+};
+
+CombinedStream.prototype._getNext = function() {
+  this._currentStream = null;
+  var stream = this._streams.shift();
+
+
+  if (typeof stream == 'undefined') {
+    this.end();
+    return;
+  }
+
+  if (typeof stream !== 'function') {
+    this._pipeNext(stream);
+    return;
+  }
+
+  var getStream = stream;
+  getStream(function(stream) {
+    var isStreamLike = CombinedStream.isStreamLike(stream);
+    if (isStreamLike) {
+      stream.on('data', this._checkDataSize.bind(this));
+      this._handleErrors(stream);
+    }
+
+    defer(this._pipeNext.bind(this, stream));
+  }.bind(this));
+};
+
+CombinedStream.prototype._pipeNext = function(stream) {
+  this._currentStream = stream;
+
+  var isStreamLike = CombinedStream.isStreamLike(stream);
+  if (isStreamLike) {
+    stream.on('end', this._getNext.bind(this));
+    stream.pipe(this, {end: false});
+    return;
+  }
+
+  var value = stream;
+  this.write(value);
+  this._getNext();
+};
+
+CombinedStream.prototype._handleErrors = function(stream) {
+  var self = this;
+  stream.on('error', function(err) {
+    self._emitError(err);
+  });
+};
+
+CombinedStream.prototype.write = function(data) {
+  this.emit('data', data);
+};
+
+CombinedStream.prototype.pause = function() {
+  if (!this.pauseStreams) {
+    return;
+  }
+
+  if(this.pauseStreams && this._currentStream && typeof(this._currentStream.pause) == 'function') this._currentStream.pause();
+  this.emit('pause');
+};
+
+CombinedStream.prototype.resume = function() {
+  if (!this._released) {
+    this._released = true;
+    this.writable = true;
+    this._getNext();
+  }
+
+  if(this.pauseStreams && this._currentStream && typeof(this._currentStream.resume) == 'function') this._currentStream.resume();
+  this.emit('resume');
+};
+
+CombinedStream.prototype.end = function() {
+  this._reset();
+  this.emit('end');
+};
+
+CombinedStream.prototype.destroy = function() {
+  this._reset();
+  this.emit('close');
+};
+
+CombinedStream.prototype._reset = function() {
+  this.writable = false;
+  this._streams = [];
+  this._currentStream = null;
+};
+
+CombinedStream.prototype._checkDataSize = function() {
+  this._updateDataSize();
+  if (this.dataSize <= this.maxDataSize) {
+    return;
+  }
+
+  var message =
+    'DelayedStream#maxDataSize of ' + this.maxDataSize + ' bytes exceeded.';
+  this._emitError(new Error(message));
+};
+
+CombinedStream.prototype._updateDataSize = function() {
+  this.dataSize = 0;
+
+  var self = this;
+  this._streams.forEach(function(stream) {
+    if (!stream.dataSize) {
+      return;
+    }
+
+    self.dataSize += stream.dataSize;
+  });
+
+  if (this._currentStream && this._currentStream.dataSize) {
+    this.dataSize += this._currentStream.dataSize;
+  }
+};
+
+CombinedStream.prototype._emitError = function(err) {
+  this._reset();
+  this.emit('error', err);
+};
+
+
+/***/ }),
+/* 386 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var stream = __webpack_require__(102)
+var eos = __webpack_require__(173)
+var inherits = __webpack_require__(61)
+var shift = __webpack_require__(942)
+
+var SIGNAL_FLUSH = (Buffer.from && Buffer.from !== Uint8Array.from)
+  ? Buffer.from([0])
+  : new Buffer([0])
+
+var onuncork = function(self, fn) {
+  if (self._corked) self.once('uncork', fn)
+  else fn()
+}
+
+var autoDestroy = function (self, err) {
+  if (self._autoDestroy) self.destroy(err)
+}
+
+var destroyer = function(self, end) {
+  return function(err) {
+    if (err) autoDestroy(self, err.message === 'premature close' ? null : err)
+    else if (end && !self._ended) self.end()
+  }
+}
+
+var end = function(ws, fn) {
+  if (!ws) return fn()
+  if (ws._writableState && ws._writableState.finished) return fn()
+  if (ws._writableState) return ws.end(fn)
+  ws.end()
+  fn()
+}
+
+var toStreams2 = function(rs) {
+  return new (stream.Readable)({objectMode:true, highWaterMark:16}).wrap(rs)
+}
+
+var Duplexify = function(writable, readable, opts) {
+  if (!(this instanceof Duplexify)) return new Duplexify(writable, readable, opts)
+  stream.Duplex.call(this, opts)
+
+  this._writable = null
+  this._readable = null
+  this._readable2 = null
+
+  this._autoDestroy = !opts || opts.autoDestroy !== false
+  this._forwardDestroy = !opts || opts.destroy !== false
+  this._forwardEnd = !opts || opts.end !== false
+  this._corked = 1 // start corked
+  this._ondrain = null
+  this._drained = false
+  this._forwarding = false
+  this._unwrite = null
+  this._unread = null
+  this._ended = false
+
+  this.destroyed = false
+
+  if (writable) this.setWritable(writable)
+  if (readable) this.setReadable(readable)
+}
+
+inherits(Duplexify, stream.Duplex)
+
+Duplexify.obj = function(writable, readable, opts) {
+  if (!opts) opts = {}
+  opts.objectMode = true
+  opts.highWaterMark = 16
+  return new Duplexify(writable, readable, opts)
+}
+
+Duplexify.prototype.cork = function() {
+  if (++this._corked === 1) this.emit('cork')
+}
+
+Duplexify.prototype.uncork = function() {
+  if (this._corked && --this._corked === 0) this.emit('uncork')
+}
+
+Duplexify.prototype.setWritable = function(writable) {
+  if (this._unwrite) this._unwrite()
+
+  if (this.destroyed) {
+    if (writable && writable.destroy) writable.destroy()
+    return
+  }
+
+  if (writable === null || writable === false) {
+    this.end()
+    return
+  }
+
+  var self = this
+  var unend = eos(writable, {writable:true, readable:false}, destroyer(this, this._forwardEnd))
+
+  var ondrain = function() {
+    var ondrain = self._ondrain
+    self._ondrain = null
+    if (ondrain) ondrain()
+  }
+
+  var clear = function() {
+    self._writable.removeListener('drain', ondrain)
+    unend()
+  }
+
+  if (this._unwrite) process.nextTick(ondrain) // force a drain on stream reset to avoid livelocks
+
+  this._writable = writable
+  this._writable.on('drain', ondrain)
+  this._unwrite = clear
+
+  this.uncork() // always uncork setWritable
+}
+
+Duplexify.prototype.setReadable = function(readable) {
+  if (this._unread) this._unread()
+
+  if (this.destroyed) {
+    if (readable && readable.destroy) readable.destroy()
+    return
+  }
+
+  if (readable === null || readable === false) {
+    this.push(null)
+    this.resume()
+    return
+  }
+
+  var self = this
+  var unend = eos(readable, {writable:false, readable:true}, destroyer(this))
+
+  var onreadable = function() {
+    self._forward()
+  }
+
+  var onend = function() {
+    self.push(null)
+  }
+
+  var clear = function() {
+    self._readable2.removeListener('readable', onreadable)
+    self._readable2.removeListener('end', onend)
+    unend()
+  }
+
+  this._drained = true
+  this._readable = readable
+  this._readable2 = readable._readableState ? readable : toStreams2(readable)
+  this._readable2.on('readable', onreadable)
+  this._readable2.on('end', onend)
+  this._unread = clear
+
+  this._forward()
+}
+
+Duplexify.prototype._read = function() {
+  this._drained = true
+  this._forward()
+}
+
+Duplexify.prototype._forward = function() {
+  if (this._forwarding || !this._readable2 || !this._drained) return
+  this._forwarding = true
+
+  var data
+
+  while (this._drained && (data = shift(this._readable2)) !== null) {
+    if (this.destroyed) continue
+    this._drained = this.push(data)
+  }
+
+  this._forwarding = false
+}
+
+Duplexify.prototype.destroy = function(err) {
+  if (this.destroyed) return
+  this.destroyed = true
+
+  var self = this
+  process.nextTick(function() {
+    self._destroy(err)
+  })
+}
+
+Duplexify.prototype._destroy = function(err) {
+  if (err) {
+    var ondrain = this._ondrain
+    this._ondrain = null
+    if (ondrain) ondrain(err)
+    else this.emit('error', err)
+  }
+
+  if (this._forwardDestroy) {
+    if (this._readable && this._readable.destroy) this._readable.destroy()
+    if (this._writable && this._writable.destroy) this._writable.destroy()
+  }
+
+  this.emit('close')
+}
+
+Duplexify.prototype._write = function(data, enc, cb) {
+  if (this.destroyed) return cb()
+  if (this._corked) return onuncork(this, this._write.bind(this, data, enc, cb))
+  if (data === SIGNAL_FLUSH) return this._finish(cb)
+  if (!this._writable) return cb()
+
+  if (this._writable.write(data) === false) this._ondrain = cb
+  else cb()
+}
+
+
+Duplexify.prototype._finish = function(cb) {
+  var self = this
+  this.emit('preend')
+  onuncork(this, function() {
+    end(self._forwardEnd && self._writable, function() {
+      // haxx to not emit prefinish twice
+      if (self._writableState.prefinished === false) self._writableState.prefinished = true
+      self.emit('prefinish')
+      onuncork(self, cb)
+    })
+  })
+}
+
+Duplexify.prototype.end = function(data, enc, cb) {
+  if (typeof data === 'function') return this.end(null, null, data)
+  if (typeof enc === 'function') return this.end(data, null, enc)
+  this._ended = true
+  if (data) this.write(data)
+  if (!this._writableState.ending) this.write(SIGNAL_FLUSH)
+  return stream.Writable.prototype.end.call(this, cb)
+}
+
+module.exports = Duplexify
+
+
+/***/ }),
+/* 387 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var crypto = __webpack_require__(11);
+var BigInteger = __webpack_require__(81).BigInteger;
+var ECPointFp = __webpack_require__(139).ECPointFp;
+var Buffer = __webpack_require__(15).Buffer;
+exports.ECCurves = __webpack_require__(638);
+
+// zero prepad
+function unstupid(hex,len)
+{
+	return (hex.length >= len) ? hex : unstupid("0"+hex,len);
+}
+
+exports.ECKey = function(curve, key, isPublic)
+{
+  var priv;
+	var c = curve();
+	var n = c.getN();
+  var bytes = Math.floor(n.bitLength()/8);
+
+  if(key)
+  {
+    if(isPublic)
+    {
+      var curve = c.getCurve();
+//      var x = key.slice(1,bytes+1); // skip the 04 for uncompressed format
+//      var y = key.slice(bytes+1);
+//      this.P = new ECPointFp(curve,
+//        curve.fromBigInteger(new BigInteger(x.toString("hex"), 16)),
+//        curve.fromBigInteger(new BigInteger(y.toString("hex"), 16)));      
+      this.P = curve.decodePointHex(key.toString("hex"));
+    }else{
+      if(key.length != bytes) return false;
+      priv = new BigInteger(key.toString("hex"), 16);      
+    }
+  }else{
+    var n1 = n.subtract(BigInteger.ONE);
+    var r = new BigInteger(crypto.randomBytes(n.bitLength()));
+    priv = r.mod(n1).add(BigInteger.ONE);
+    this.P = c.getG().multiply(priv);
+  }
+  if(this.P)
+  {
+//  var pubhex = unstupid(this.P.getX().toBigInteger().toString(16),bytes*2)+unstupid(this.P.getY().toBigInteger().toString(16),bytes*2);
+//  this.PublicKey = Buffer.from("04"+pubhex,"hex");
+    this.PublicKey = Buffer.from(c.getCurve().encodeCompressedPointHex(this.P),"hex");
+  }
+  if(priv)
+  {
+    this.PrivateKey = Buffer.from(unstupid(priv.toString(16),bytes*2),"hex");
+    this.deriveSharedSecret = function(key)
+    {
+      if(!key || !key.P) return false;
+      var S = key.P.multiply(priv);
+      return Buffer.from(unstupid(S.getX().toBigInteger().toString(16),bytes*2),"hex");
+   }     
+  }
+}
+
+
+
+/***/ }),
+/* 388 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var matchOperatorsRe = /[|\\{}()[\]^$+*?.]/g;
+
+module.exports = function (str) {
+	if (typeof str !== 'string') {
+		throw new TypeError('Expected a string');
+	}
+
+	return str.replace(matchOperatorsRe, '\\$&');
+};
+
+
+/***/ }),
+/* 389 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+module.exports = function (data, opts) {
+    if (!opts) opts = {};
+    if (typeof opts === 'function') opts = { cmp: opts };
+    var cycles = (typeof opts.cycles === 'boolean') ? opts.cycles : false;
+
+    var cmp = opts.cmp && (function (f) {
+        return function (node) {
+            return function (a, b) {
+                var aobj = { key: a, value: node[a] };
+                var bobj = { key: b, value: node[b] };
+                return f(aobj, bobj);
+            };
+        };
+    })(opts.cmp);
+
+    var seen = [];
+    return (function stringify (node) {
+        if (node && node.toJSON && typeof node.toJSON === 'function') {
+            node = node.toJSON();
+        }
+
+        if (node === undefined) return;
+        if (typeof node == 'number') return isFinite(node) ? '' + node : 'null';
+        if (typeof node !== 'object') return JSON.stringify(node);
+
+        var i, out;
+        if (Array.isArray(node)) {
+            out = '[';
+            for (i = 0; i < node.length; i++) {
+                if (i) out += ',';
+                out += stringify(node[i]) || 'null';
+            }
+            return out + ']';
+        }
+
+        if (node === null) return 'null';
+
+        if (seen.indexOf(node) !== -1) {
+            if (cycles) return JSON.stringify('__cycle__');
+            throw new TypeError('Converting circular structure to JSON');
+        }
+
+        var seenIndex = seen.push(node) - 1;
+        var keys = Object.keys(node).sort(cmp && cmp(node));
+        out = '';
+        for (i = 0; i < keys.length; i++) {
+            var key = keys[i];
+            var value = stringify(node[key]);
+
+            if (!value) continue;
+            if (out) out += ',';
+            out += JSON.stringify(key) + ':' + value;
+        }
+        seen.splice(seenIndex, 1);
+        return '{' + out + '}';
+    })(data);
+};
+
+
+/***/ }),
+/* 390 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var fs = __webpack_require__(5)
+
+module.exports = clone(fs)
+
+function clone (obj) {
+  if (obj === null || typeof obj !== 'object')
+    return obj
+
+  if (obj instanceof Object)
+    var copy = { __proto__: obj.__proto__ }
+  else
+    var copy = Object.create(null)
+
+  Object.getOwnPropertyNames(obj).forEach(function (key) {
+    Object.defineProperty(copy, key, Object.getOwnPropertyDescriptor(obj, key))
+  })
+
+  return copy
+}
+
+
+/***/ }),
+/* 391 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var fs = __webpack_require__(5)
+var polyfills = __webpack_require__(655)
+var legacy = __webpack_require__(654)
+var queue = []
+
+var util = __webpack_require__(3)
+
+function noop () {}
+
+var debug = noop
+if (util.debuglog)
+  debug = util.debuglog('gfs4')
+else if (/\bgfs4\b/i.test(process.env.NODE_DEBUG || ''))
+  debug = function() {
+    var m = util.format.apply(util, arguments)
+    m = 'GFS4: ' + m.split(/\n/).join('\nGFS4: ')
+    console.error(m)
+  }
+
+if (/\bgfs4\b/i.test(process.env.NODE_DEBUG || '')) {
+  process.on('exit', function() {
+    debug(queue)
+    __webpack_require__(28).equal(queue.length, 0)
+  })
+}
+
+module.exports = patch(__webpack_require__(390))
+if (process.env.TEST_GRACEFUL_FS_GLOBAL_PATCH) {
+  module.exports = patch(fs)
+}
+
+// Always patch fs.close/closeSync, because we want to
+// retry() whenever a close happens *anywhere* in the program.
+// This is essential when multiple graceful-fs instances are
+// in play at the same time.
+module.exports.close =
+fs.close = (function (fs$close) { return function (fd, cb) {
+  return fs$close.call(fs, fd, function (err) {
+    if (!err)
+      retry()
+
+    if (typeof cb === 'function')
+      cb.apply(this, arguments)
+  })
+}})(fs.close)
+
+module.exports.closeSync =
+fs.closeSync = (function (fs$closeSync) { return function (fd) {
+  // Note that graceful-fs also retries when fs.closeSync() fails.
+  // Looks like a bug to me, although it's probably a harmless one.
+  var rval = fs$closeSync.apply(fs, arguments)
+  retry()
+  return rval
+}})(fs.closeSync)
+
+function patch (fs) {
+  // Everything that references the open() function needs to be in here
+  polyfills(fs)
+  fs.gracefulify = patch
+  fs.FileReadStream = ReadStream;  // Legacy name.
+  fs.FileWriteStream = WriteStream;  // Legacy name.
+  fs.createReadStream = createReadStream
+  fs.createWriteStream = createWriteStream
+  var fs$readFile = fs.readFile
+  fs.readFile = readFile
+  function readFile (path, options, cb) {
+    if (typeof options === 'function')
+      cb = options, options = null
+
+    return go$readFile(path, options, cb)
+
+    function go$readFile (path, options, cb) {
+      return fs$readFile(path, options, function (err) {
+        if (err && (err.code === 'EMFILE' || err.code === 'ENFILE'))
+          enqueue([go$readFile, [path, options, cb]])
+        else {
+          if (typeof cb === 'function')
+            cb.apply(this, arguments)
+          retry()
+        }
+      })
+    }
+  }
+
+  var fs$writeFile = fs.writeFile
+  fs.writeFile = writeFile
+  function writeFile (path, data, options, cb) {
+    if (typeof options === 'function')
+      cb = options, options = null
+
+    return go$writeFile(path, data, options, cb)
+
+    function go$writeFile (path, data, options, cb) {
+      return fs$writeFile(path, data, options, function (err) {
+        if (err && (err.code === 'EMFILE' || err.code === 'ENFILE'))
+          enqueue([go$writeFile, [path, data, options, cb]])
+        else {
+          if (typeof cb === 'function')
+            cb.apply(this, arguments)
+          retry()
+        }
+      })
+    }
+  }
+
+  var fs$appendFile = fs.appendFile
+  if (fs$appendFile)
+    fs.appendFile = appendFile
+  function appendFile (path, data, options, cb) {
+    if (typeof options === 'function')
+      cb = options, options = null
+
+    return go$appendFile(path, data, options, cb)
+
+    function go$appendFile (path, data, options, cb) {
+      return fs$appendFile(path, data, options, function (err) {
+        if (err && (err.code === 'EMFILE' || err.code === 'ENFILE'))
+          enqueue([go$appendFile, [path, data, options, cb]])
+        else {
+          if (typeof cb === 'function')
+            cb.apply(this, arguments)
+          retry()
+        }
+      })
+    }
+  }
+
+  var fs$readdir = fs.readdir
+  fs.readdir = readdir
+  function readdir (path, options, cb) {
+    var args = [path]
+    if (typeof options !== 'function') {
+      args.push(options)
+    } else {
+      cb = options
+    }
+    args.push(go$readdir$cb)
+
+    return go$readdir(args)
+
+    function go$readdir$cb (err, files) {
+      if (files && files.sort)
+        files.sort()
+
+      if (err && (err.code === 'EMFILE' || err.code === 'ENFILE'))
+        enqueue([go$readdir, [args]])
+      else {
+        if (typeof cb === 'function')
+          cb.apply(this, arguments)
+        retry()
+      }
+    }
+  }
+
+  function go$readdir (args) {
+    return fs$readdir.apply(fs, args)
+  }
+
+  if (process.version.substr(0, 4) === 'v0.8') {
+    var legStreams = legacy(fs)
+    ReadStream = legStreams.ReadStream
+    WriteStream = legStreams.WriteStream
+  }
+
+  var fs$ReadStream = fs.ReadStream
+  ReadStream.prototype = Object.create(fs$ReadStream.prototype)
+  ReadStream.prototype.open = ReadStream$open
+
+  var fs$WriteStream = fs.WriteStream
+  WriteStream.prototype = Object.create(fs$WriteStream.prototype)
+  WriteStream.prototype.open = WriteStream$open
+
+  fs.ReadStream = ReadStream
+  fs.WriteStream = WriteStream
+
+  function ReadStream (path, options) {
+    if (this instanceof ReadStream)
+      return fs$ReadStream.apply(this, arguments), this
+    else
+      return ReadStream.apply(Object.create(ReadStream.prototype), arguments)
+  }
+
+  function ReadStream$open () {
+    var that = this
+    open(that.path, that.flags, that.mode, function (err, fd) {
+      if (err) {
+        if (that.autoClose)
+          that.destroy()
+
+        that.emit('error', err)
+      } else {
+        that.fd = fd
+        that.emit('open', fd)
+        that.read()
+      }
+    })
+  }
+
+  function WriteStream (path, options) {
+    if (this instanceof WriteStream)
+      return fs$WriteStream.apply(this, arguments), this
+    else
+      return WriteStream.apply(Object.create(WriteStream.prototype), arguments)
+  }
+
+  function WriteStream$open () {
+    var that = this
+    open(that.path, that.flags, that.mode, function (err, fd) {
+      if (err) {
+        that.destroy()
+        that.emit('error', err)
+      } else {
+        that.fd = fd
+        that.emit('open', fd)
+      }
+    })
+  }
+
+  function createReadStream (path, options) {
+    return new ReadStream(path, options)
+  }
+
+  function createWriteStream (path, options) {
+    return new WriteStream(path, options)
+  }
+
+  var fs$open = fs.open
+  fs.open = open
+  function open (path, flags, mode, cb) {
+    if (typeof mode === 'function')
+      cb = mode, mode = null
+
+    return go$open(path, flags, mode, cb)
+
+    function go$open (path, flags, mode, cb) {
+      return fs$open(path, flags, mode, function (err, fd) {
+        if (err && (err.code === 'EMFILE' || err.code === 'ENFILE'))
+          enqueue([go$open, [path, flags, mode, cb]])
+        else {
+          if (typeof cb === 'function')
+            cb.apply(this, arguments)
+          retry()
+        }
+      })
+    }
+  }
+
+  return fs
+}
+
+function enqueue (elem) {
+  debug('ENQUEUE', elem[0].name, elem[1])
+  queue.push(elem)
+}
+
+function retry () {
+  var elem = queue.shift()
+  if (elem) {
+    debug('RETRY', elem[0].name, elem[1])
+    elem[0].apply(null, elem[1])
+  }
+}
+
+
+/***/ }),
+/* 392 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/**
+ * `input` type prompt
+ */
+
+var chalk = __webpack_require__(30);
+var { map, takeUntil } = __webpack_require__(63);
+var Base = __webpack_require__(79);
+var observe = __webpack_require__(80);
+
+class InputPrompt extends Base {
+  /**
+   * Start the Inquiry session
+   * @param  {Function} cb      Callback when prompt is done
+   * @return {this}
+   */
+
+  _run(cb) {
+    this.done = cb;
+
+    // Once user confirm (enter key)
+    var events = observe(this.rl);
+    var submit = events.line.pipe(map(this.filterInput.bind(this)));
+
+    var validation = this.handleSubmitEvents(submit);
+    validation.success.forEach(this.onEnd.bind(this));
+    validation.error.forEach(this.onError.bind(this));
+
+    events.keypress
+      .pipe(takeUntil(validation.success))
+      .forEach(this.onKeypress.bind(this));
+
+    // Init
+    this.render();
+
+    return this;
+  }
+
+  /**
+   * Render the prompt to screen
+   * @return {InputPrompt} self
+   */
+
+  render(error) {
+    var bottomContent = '';
+    var appendContent = '';
+    var message = this.getQuestion();
+    var transformer = this.opt.transformer;
+    var isFinal = this.status === 'answered';
+
+    if (isFinal) {
+      appendContent = this.answer;
+    } else {
+      appendContent = this.rl.line;
+    }
+
+    if (transformer) {
+      message += transformer(appendContent, this.answers, { isFinal });
+    } else {
+      message += isFinal ? chalk.cyan(appendContent) : appendContent;
+    }
+
+    if (error) {
+      bottomContent = chalk.red('>> ') + error;
+    }
+
+    this.screen.render(message, bottomContent);
+  }
+
+  /**
+   * When user press `enter` key
+   */
+
+  filterInput(input) {
+    if (!input) {
+      return this.opt.default == null ? '' : this.opt.default;
+    }
+    return input;
+  }
+
+  onEnd(state) {
+    this.answer = state.value;
+    this.status = 'answered';
+
+    // Re-render prompt
+    this.render();
+
+    this.screen.done();
+    this.done(state.value);
+  }
+
+  onError(state) {
+    this.render(state.isValid);
+  }
+
+  /**
+   * When user press a key
+   */
+
+  onKeypress() {
+    // If user press a key, just clear the default value
+    if (this.opt.default) {
+      this.opt.default = undefined;
+    }
+
+    this.render();
+  }
+}
+
+module.exports = InputPrompt;
+
+
+/***/ }),
+/* 393 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var _ = __webpack_require__(38);
+var MuteStream = __webpack_require__(401);
+var readline = __webpack_require__(197);
+
+/**
+ * Base interface class other can inherits from
+ */
+
+class UI {
+  constructor(opt) {
+    // Instantiate the Readline interface
+    // @Note: Don't reassign if already present (allow test to override the Stream)
+    if (!this.rl) {
+      this.rl = readline.createInterface(setupReadlineOptions(opt));
+    }
+    this.rl.resume();
+
+    this.onForceClose = this.onForceClose.bind(this);
+
+    // Make sure new prompt start on a newline when closing
+    process.on('exit', this.onForceClose);
+
+    // Terminate process on SIGINT (which will call process.on('exit') in return)
+    this.rl.on('SIGINT', this.onForceClose);
+  }
+
+  /**
+   * Handle the ^C exit
+   * @return {null}
+   */
+
+  onForceClose() {
+    this.close();
+    process.kill(process.pid, 'SIGINT');
+    console.log('');
+  }
+
+  /**
+   * Close the interface and cleanup listeners
+   */
+
+  close() {
+    // Remove events listeners
+    this.rl.removeListener('SIGINT', this.onForceClose);
+    process.removeListener('exit', this.onForceClose);
+
+    this.rl.output.unmute();
+
+    if (this.activePrompt && typeof this.activePrompt.close === 'function') {
+      this.activePrompt.close();
+    }
+
+    // Close the readline
+    this.rl.output.end();
+    this.rl.pause();
+    this.rl.close();
+  }
+}
+
+function setupReadlineOptions(opt) {
+  opt = opt || {};
+
+  // Default `input` to stdin
+  var input = opt.input || process.stdin;
+
+  // Add mute capabilities to the output
+  var ms = new MuteStream();
+  ms.pipe(opt.output || process.stdout);
+  var output = ms;
+
+  return _.extend(
+    {
+      terminal: true,
+      input: input,
+      output: output
+    },
+    _.omit(opt, ['input', 'output'])
+  );
+}
+
+module.exports = UI;
+
+
+/***/ }),
+/* 394 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var ansiEscapes = __webpack_require__(504);
+
+/**
+ * Move cursor left by `x`
+ * @param  {Readline} rl - Readline instance
+ * @param  {Number}   x  - How far to go left (default to 1)
+ */
+
+exports.left = function(rl, x) {
+  rl.output.write(ansiEscapes.cursorBackward(x));
+};
+
+/**
+ * Move cursor right by `x`
+ * @param  {Readline} rl - Readline instance
+ * @param  {Number}   x  - How far to go left (default to 1)
+ */
+
+exports.right = function(rl, x) {
+  rl.output.write(ansiEscapes.cursorForward(x));
+};
+
+/**
+ * Move cursor up by `x`
+ * @param  {Readline} rl - Readline instance
+ * @param  {Number}   x  - How far to go up (default to 1)
+ */
+
+exports.up = function(rl, x) {
+  rl.output.write(ansiEscapes.cursorUp(x));
+};
+
+/**
+ * Move cursor down by `x`
+ * @param  {Readline} rl - Readline instance
+ * @param  {Number}   x  - How far to go down (default to 1)
+ */
+
+exports.down = function(rl, x) {
+  rl.output.write(ansiEscapes.cursorDown(x));
+};
+
+/**
+ * Clear current line
+ * @param  {Readline} rl  - Readline instance
+ * @param  {Number}   len - number of line to delete
+ */
+exports.clearLine = function(rl, len) {
+  rl.output.write(ansiEscapes.eraseLines(len));
+};
+
+
+/***/ }),
+/* 395 */
+/***/ (function(module, exports) {
+
+module.exports = [["0","\u0000",127],["a140","　，、。．‧；：？！︰…‥﹐﹑﹒·﹔﹕﹖﹗｜–︱—︳╴︴﹏（）︵︶｛｝︷︸〔〕︹︺【】︻︼《》︽︾〈〉︿﹀「」﹁﹂『』﹃﹄﹙﹚"],["a1a1","﹛﹜﹝﹞‘’“”〝〞‵′＃＆＊※§〃○●△▲◎☆★◇◆□■▽▼㊣℅¯￣＿ˍ﹉﹊﹍﹎﹋﹌﹟﹠﹡＋－×÷±√＜＞＝≦≧≠∞≒≡﹢",4,"～∩∪⊥∠∟⊿㏒㏑∫∮∵∴♀♂⊕⊙↑↓←→↖↗↙↘∥∣／"],["a240","＼∕﹨＄￥〒￠￡％＠℃℉﹩﹪﹫㏕㎜㎝㎞㏎㎡㎎㎏㏄°兙兛兞兝兡兣嗧瓩糎▁",7,"▏▎▍▌▋▊▉┼┴┬┤├▔─│▕┌┐└┘╭"],["a2a1","╮╰╯═╞╪╡◢◣◥◤╱╲╳０",9,"Ⅰ",9,"〡",8,"十卄卅Ａ",25,"ａ",21],["a340","ｗｘｙｚΑ",16,"Σ",6,"α",16,"σ",6,"ㄅ",10],["a3a1","ㄐ",25,"˙ˉˊˇˋ"],["a3e1","€"],["a440","一乙丁七乃九了二人儿入八几刀刁力匕十卜又三下丈上丫丸凡久么也乞于亡兀刃勺千叉口土士夕大女子孑孓寸小尢尸山川工己已巳巾干廾弋弓才"],["a4a1","丑丐不中丰丹之尹予云井互五亢仁什仃仆仇仍今介仄元允內六兮公冗凶分切刈勻勾勿化匹午升卅卞厄友及反壬天夫太夭孔少尤尺屯巴幻廿弔引心戈戶手扎支文斗斤方日曰月木欠止歹毋比毛氏水火爪父爻片牙牛犬王丙"],["a540","世丕且丘主乍乏乎以付仔仕他仗代令仙仞充兄冉冊冬凹出凸刊加功包匆北匝仟半卉卡占卯卮去可古右召叮叩叨叼司叵叫另只史叱台句叭叻四囚外"],["a5a1","央失奴奶孕它尼巨巧左市布平幼弁弘弗必戊打扔扒扑斥旦朮本未末札正母民氐永汁汀氾犯玄玉瓜瓦甘生用甩田由甲申疋白皮皿目矛矢石示禾穴立丞丟乒乓乩亙交亦亥仿伉伙伊伕伍伐休伏仲件任仰仳份企伋光兇兆先全"],["a640","共再冰列刑划刎刖劣匈匡匠印危吉吏同吊吐吁吋各向名合吃后吆吒因回囝圳地在圭圬圯圩夙多夷夸妄奸妃好她如妁字存宇守宅安寺尖屹州帆并年"],["a6a1","式弛忙忖戎戌戍成扣扛托收早旨旬旭曲曳有朽朴朱朵次此死氖汝汗汙江池汐汕污汛汍汎灰牟牝百竹米糸缶羊羽老考而耒耳聿肉肋肌臣自至臼舌舛舟艮色艾虫血行衣西阡串亨位住佇佗佞伴佛何估佐佑伽伺伸佃佔似但佣"],["a740","作你伯低伶余佝佈佚兌克免兵冶冷別判利刪刨劫助努劬匣即卵吝吭吞吾否呎吧呆呃吳呈呂君吩告吹吻吸吮吵吶吠吼呀吱含吟听囪困囤囫坊坑址坍"],["a7a1","均坎圾坐坏圻壯夾妝妒妨妞妣妙妖妍妤妓妊妥孝孜孚孛完宋宏尬局屁尿尾岐岑岔岌巫希序庇床廷弄弟彤形彷役忘忌志忍忱快忸忪戒我抄抗抖技扶抉扭把扼找批扳抒扯折扮投抓抑抆改攻攸旱更束李杏材村杜杖杞杉杆杠"],["a840","杓杗步每求汞沙沁沈沉沅沛汪決沐汰沌汨沖沒汽沃汲汾汴沆汶沍沔沘沂灶灼災灸牢牡牠狄狂玖甬甫男甸皂盯矣私秀禿究系罕肖肓肝肘肛肚育良芒"],["a8a1","芋芍見角言谷豆豕貝赤走足身車辛辰迂迆迅迄巡邑邢邪邦那酉釆里防阮阱阪阬並乖乳事些亞享京佯依侍佳使佬供例來侃佰併侈佩佻侖佾侏侑佺兔兒兕兩具其典冽函刻券刷刺到刮制剁劾劻卒協卓卑卦卷卸卹取叔受味呵"],["a940","咖呸咕咀呻呷咄咒咆呼咐呱呶和咚呢周咋命咎固垃坷坪坩坡坦坤坼夜奉奇奈奄奔妾妻委妹妮姑姆姐姍始姓姊妯妳姒姅孟孤季宗定官宜宙宛尚屈居"],["a9a1","屆岷岡岸岩岫岱岳帘帚帖帕帛帑幸庚店府底庖延弦弧弩往征彿彼忝忠忽念忿怏怔怯怵怖怪怕怡性怩怫怛或戕房戾所承拉拌拄抿拂抹拒招披拓拔拋拈抨抽押拐拙拇拍抵拚抱拘拖拗拆抬拎放斧於旺昔易昌昆昂明昀昏昕昊"],["aa40","昇服朋杭枋枕東果杳杷枇枝林杯杰板枉松析杵枚枓杼杪杲欣武歧歿氓氛泣注泳沱泌泥河沽沾沼波沫法泓沸泄油況沮泗泅泱沿治泡泛泊沬泯泜泖泠"],["aaa1","炕炎炒炊炙爬爭爸版牧物狀狎狙狗狐玩玨玟玫玥甽疝疙疚的盂盲直知矽社祀祁秉秈空穹竺糾罔羌羋者肺肥肢肱股肫肩肴肪肯臥臾舍芳芝芙芭芽芟芹花芬芥芯芸芣芰芾芷虎虱初表軋迎返近邵邸邱邶采金長門阜陀阿阻附"],["ab40","陂隹雨青非亟亭亮信侵侯便俠俑俏保促侶俘俟俊俗侮俐俄係俚俎俞侷兗冒冑冠剎剃削前剌剋則勇勉勃勁匍南卻厚叛咬哀咨哎哉咸咦咳哇哂咽咪品"],["aba1","哄哈咯咫咱咻咩咧咿囿垂型垠垣垢城垮垓奕契奏奎奐姜姘姿姣姨娃姥姪姚姦威姻孩宣宦室客宥封屎屏屍屋峙峒巷帝帥帟幽庠度建弈弭彥很待徊律徇後徉怒思怠急怎怨恍恰恨恢恆恃恬恫恪恤扁拜挖按拼拭持拮拽指拱拷"],["ac40","拯括拾拴挑挂政故斫施既春昭映昧是星昨昱昤曷柿染柱柔某柬架枯柵柩柯柄柑枴柚查枸柏柞柳枰柙柢柝柒歪殃殆段毒毗氟泉洋洲洪流津洌洱洞洗"],["aca1","活洽派洶洛泵洹洧洸洩洮洵洎洫炫為炳炬炯炭炸炮炤爰牲牯牴狩狠狡玷珊玻玲珍珀玳甚甭畏界畎畋疫疤疥疢疣癸皆皇皈盈盆盃盅省盹相眉看盾盼眇矜砂研砌砍祆祉祈祇禹禺科秒秋穿突竿竽籽紂紅紀紉紇約紆缸美羿耄"],["ad40","耐耍耑耶胖胥胚胃胄背胡胛胎胞胤胝致舢苧范茅苣苛苦茄若茂茉苒苗英茁苜苔苑苞苓苟苯茆虐虹虻虺衍衫要觔計訂訃貞負赴赳趴軍軌述迦迢迪迥"],["ada1","迭迫迤迨郊郎郁郃酋酊重閂限陋陌降面革韋韭音頁風飛食首香乘亳倌倍倣俯倦倥俸倩倖倆值借倚倒們俺倀倔倨俱倡個候倘俳修倭倪俾倫倉兼冤冥冢凍凌准凋剖剜剔剛剝匪卿原厝叟哨唐唁唷哼哥哲唆哺唔哩哭員唉哮哪"],["ae40","哦唧唇哽唏圃圄埂埔埋埃堉夏套奘奚娑娘娜娟娛娓姬娠娣娩娥娌娉孫屘宰害家宴宮宵容宸射屑展屐峭峽峻峪峨峰島崁峴差席師庫庭座弱徒徑徐恙"],["aea1","恣恥恐恕恭恩息悄悟悚悍悔悌悅悖扇拳挈拿捎挾振捕捂捆捏捉挺捐挽挪挫挨捍捌效敉料旁旅時晉晏晃晒晌晅晁書朔朕朗校核案框桓根桂桔栩梳栗桌桑栽柴桐桀格桃株桅栓栘桁殊殉殷氣氧氨氦氤泰浪涕消涇浦浸海浙涓"],["af40","浬涉浮浚浴浩涌涊浹涅浥涔烊烘烤烙烈烏爹特狼狹狽狸狷玆班琉珮珠珪珞畔畝畜畚留疾病症疲疳疽疼疹痂疸皋皰益盍盎眩真眠眨矩砰砧砸砝破砷"],["afa1","砥砭砠砟砲祕祐祠祟祖神祝祗祚秤秣秧租秦秩秘窄窈站笆笑粉紡紗紋紊素索純紐紕級紜納紙紛缺罟羔翅翁耆耘耕耙耗耽耿胱脂胰脅胭胴脆胸胳脈能脊胼胯臭臬舀舐航舫舨般芻茫荒荔荊茸荐草茵茴荏茲茹茶茗荀茱茨荃"],["b040","虔蚊蚪蚓蚤蚩蚌蚣蚜衰衷袁袂衽衹記訐討訌訕訊託訓訖訏訑豈豺豹財貢起躬軒軔軏辱送逆迷退迺迴逃追逅迸邕郡郝郢酒配酌釘針釗釜釙閃院陣陡"],["b0a1","陛陝除陘陞隻飢馬骨高鬥鬲鬼乾偺偽停假偃偌做偉健偶偎偕偵側偷偏倏偯偭兜冕凰剪副勒務勘動匐匏匙匿區匾參曼商啪啦啄啞啡啃啊唱啖問啕唯啤唸售啜唬啣唳啁啗圈國圉域堅堊堆埠埤基堂堵執培夠奢娶婁婉婦婪婀"],["b140","娼婢婚婆婊孰寇寅寄寂宿密尉專將屠屜屝崇崆崎崛崖崢崑崩崔崙崤崧崗巢常帶帳帷康庸庶庵庾張強彗彬彩彫得徙從徘御徠徜恿患悉悠您惋悴惦悽"],["b1a1","情悻悵惜悼惘惕惆惟悸惚惇戚戛扈掠控捲掖探接捷捧掘措捱掩掉掃掛捫推掄授掙採掬排掏掀捻捩捨捺敝敖救教敗啟敏敘敕敔斜斛斬族旋旌旎晝晚晤晨晦晞曹勗望梁梯梢梓梵桿桶梱梧梗械梃棄梭梆梅梔條梨梟梡梂欲殺"],["b240","毫毬氫涎涼淳淙液淡淌淤添淺清淇淋涯淑涮淞淹涸混淵淅淒渚涵淚淫淘淪深淮淨淆淄涪淬涿淦烹焉焊烽烯爽牽犁猜猛猖猓猙率琅琊球理現琍瓠瓶"],["b2a1","瓷甜產略畦畢異疏痔痕疵痊痍皎盔盒盛眷眾眼眶眸眺硫硃硎祥票祭移窒窕笠笨笛第符笙笞笮粒粗粕絆絃統紮紹紼絀細紳組累終紲紱缽羞羚翌翎習耜聊聆脯脖脣脫脩脰脤舂舵舷舶船莎莞莘荸莢莖莽莫莒莊莓莉莠荷荻荼"],["b340","莆莧處彪蛇蛀蚶蛄蚵蛆蛋蚱蚯蛉術袞袈被袒袖袍袋覓規訪訝訣訥許設訟訛訢豉豚販責貫貨貪貧赧赦趾趺軛軟這逍通逗連速逝逐逕逞造透逢逖逛途"],["b3a1","部郭都酗野釵釦釣釧釭釩閉陪陵陳陸陰陴陶陷陬雀雪雩章竟頂頃魚鳥鹵鹿麥麻傢傍傅備傑傀傖傘傚最凱割剴創剩勞勝勛博厥啻喀喧啼喊喝喘喂喜喪喔喇喋喃喳單喟唾喲喚喻喬喱啾喉喫喙圍堯堪場堤堰報堡堝堠壹壺奠"],["b440","婷媚婿媒媛媧孳孱寒富寓寐尊尋就嵌嵐崴嵇巽幅帽幀幃幾廊廁廂廄弼彭復循徨惑惡悲悶惠愜愣惺愕惰惻惴慨惱愎惶愉愀愒戟扉掣掌描揀揩揉揆揍"],["b4a1","插揣提握揖揭揮捶援揪換摒揚揹敞敦敢散斑斐斯普晰晴晶景暑智晾晷曾替期朝棺棕棠棘棗椅棟棵森棧棹棒棲棣棋棍植椒椎棉棚楮棻款欺欽殘殖殼毯氮氯氬港游湔渡渲湧湊渠渥渣減湛湘渤湖湮渭渦湯渴湍渺測湃渝渾滋"],["b540","溉渙湎湣湄湲湩湟焙焚焦焰無然煮焜牌犄犀猶猥猴猩琺琪琳琢琥琵琶琴琯琛琦琨甥甦畫番痢痛痣痙痘痞痠登發皖皓皴盜睏短硝硬硯稍稈程稅稀窘"],["b5a1","窗窖童竣等策筆筐筒答筍筋筏筑粟粥絞結絨絕紫絮絲絡給絢絰絳善翔翕耋聒肅腕腔腋腑腎脹腆脾腌腓腴舒舜菩萃菸萍菠菅萋菁華菱菴著萊菰萌菌菽菲菊萸萎萄菜萇菔菟虛蛟蛙蛭蛔蛛蛤蛐蛞街裁裂袱覃視註詠評詞証詁"],["b640","詔詛詐詆訴診訶詖象貂貯貼貳貽賁費賀貴買貶貿貸越超趁跎距跋跚跑跌跛跆軻軸軼辜逮逵週逸進逶鄂郵鄉郾酣酥量鈔鈕鈣鈉鈞鈍鈐鈇鈑閔閏開閑"],["b6a1","間閒閎隊階隋陽隅隆隍陲隄雁雅雄集雇雯雲韌項順須飧飪飯飩飲飭馮馭黃黍黑亂傭債傲傳僅傾催傷傻傯僇剿剷剽募勦勤勢勣匯嗟嗨嗓嗦嗎嗜嗇嗑嗣嗤嗯嗚嗡嗅嗆嗥嗉園圓塞塑塘塗塚塔填塌塭塊塢塒塋奧嫁嫉嫌媾媽媼"],["b740","媳嫂媲嵩嵯幌幹廉廈弒彙徬微愚意慈感想愛惹愁愈慎慌慄慍愾愴愧愍愆愷戡戢搓搾搞搪搭搽搬搏搜搔損搶搖搗搆敬斟新暗暉暇暈暖暄暘暍會榔業"],["b7a1","楚楷楠楔極椰概楊楨楫楞楓楹榆楝楣楛歇歲毀殿毓毽溢溯滓溶滂源溝滇滅溥溘溼溺溫滑準溜滄滔溪溧溴煎煙煩煤煉照煜煬煦煌煥煞煆煨煖爺牒猷獅猿猾瑯瑚瑕瑟瑞瑁琿瑙瑛瑜當畸瘀痰瘁痲痱痺痿痴痳盞盟睛睫睦睞督"],["b840","睹睪睬睜睥睨睢矮碎碰碗碘碌碉硼碑碓硿祺祿禁萬禽稜稚稠稔稟稞窟窠筷節筠筮筧粱粳粵經絹綑綁綏絛置罩罪署義羨群聖聘肆肄腱腰腸腥腮腳腫"],["b8a1","腹腺腦舅艇蒂葷落萱葵葦葫葉葬葛萼萵葡董葩葭葆虞虜號蛹蜓蜈蜇蜀蛾蛻蜂蜃蜆蜊衙裟裔裙補裘裝裡裊裕裒覜解詫該詳試詩詰誇詼詣誠話誅詭詢詮詬詹詻訾詨豢貊貉賊資賈賄貲賃賂賅跡跟跨路跳跺跪跤跦躲較載軾輊"],["b940","辟農運遊道遂達逼違遐遇遏過遍遑逾遁鄒鄗酬酪酩釉鈷鉗鈸鈽鉀鈾鉛鉋鉤鉑鈴鉉鉍鉅鈹鈿鉚閘隘隔隕雍雋雉雊雷電雹零靖靴靶預頑頓頊頒頌飼飴"],["b9a1","飽飾馳馱馴髡鳩麂鼎鼓鼠僧僮僥僖僭僚僕像僑僱僎僩兢凳劃劂匱厭嗾嘀嘛嘗嗽嘔嘆嘉嘍嘎嗷嘖嘟嘈嘐嗶團圖塵塾境墓墊塹墅塽壽夥夢夤奪奩嫡嫦嫩嫗嫖嫘嫣孵寞寧寡寥實寨寢寤察對屢嶄嶇幛幣幕幗幔廓廖弊彆彰徹慇"],["ba40","愿態慷慢慣慟慚慘慵截撇摘摔撤摸摟摺摑摧搴摭摻敲斡旗旖暢暨暝榜榨榕槁榮槓構榛榷榻榫榴槐槍榭槌榦槃榣歉歌氳漳演滾漓滴漩漾漠漬漏漂漢"],["baa1","滿滯漆漱漸漲漣漕漫漯澈漪滬漁滲滌滷熔熙煽熊熄熒爾犒犖獄獐瑤瑣瑪瑰瑭甄疑瘧瘍瘋瘉瘓盡監瞄睽睿睡磁碟碧碳碩碣禎福禍種稱窪窩竭端管箕箋筵算箝箔箏箸箇箄粹粽精綻綰綜綽綾綠緊綴網綱綺綢綿綵綸維緒緇綬"],["bb40","罰翠翡翟聞聚肇腐膀膏膈膊腿膂臧臺與舔舞艋蓉蒿蓆蓄蒙蒞蒲蒜蓋蒸蓀蓓蒐蒼蓑蓊蜿蜜蜻蜢蜥蜴蜘蝕蜷蜩裳褂裴裹裸製裨褚裯誦誌語誣認誡誓誤"],["bba1","說誥誨誘誑誚誧豪貍貌賓賑賒赫趙趕跼輔輒輕輓辣遠遘遜遣遙遞遢遝遛鄙鄘鄞酵酸酷酴鉸銀銅銘銖鉻銓銜銨鉼銑閡閨閩閣閥閤隙障際雌雒需靼鞅韶頗領颯颱餃餅餌餉駁骯骰髦魁魂鳴鳶鳳麼鼻齊億儀僻僵價儂儈儉儅凜"],["bc40","劇劈劉劍劊勰厲嘮嘻嘹嘲嘿嘴嘩噓噎噗噴嘶嘯嘰墀墟增墳墜墮墩墦奭嬉嫻嬋嫵嬌嬈寮寬審寫層履嶝嶔幢幟幡廢廚廟廝廣廠彈影德徵慶慧慮慝慕憂"],["bca1","慼慰慫慾憧憐憫憎憬憚憤憔憮戮摩摯摹撞撲撈撐撰撥撓撕撩撒撮播撫撚撬撙撢撳敵敷數暮暫暴暱樣樟槨樁樞標槽模樓樊槳樂樅槭樑歐歎殤毅毆漿潼澄潑潦潔澆潭潛潸潮澎潺潰潤澗潘滕潯潠潟熟熬熱熨牖犛獎獗瑩璋璃"],["bd40","瑾璀畿瘠瘩瘟瘤瘦瘡瘢皚皺盤瞎瞇瞌瞑瞋磋磅確磊碾磕碼磐稿稼穀稽稷稻窯窮箭箱範箴篆篇篁箠篌糊締練緯緻緘緬緝編緣線緞緩綞緙緲緹罵罷羯"],["bda1","翩耦膛膜膝膠膚膘蔗蔽蔚蓮蔬蔭蔓蔑蔣蔡蔔蓬蔥蓿蔆螂蝴蝶蝠蝦蝸蝨蝙蝗蝌蝓衛衝褐複褒褓褕褊誼諒談諄誕請諸課諉諂調誰論諍誶誹諛豌豎豬賠賞賦賤賬賭賢賣賜質賡赭趟趣踫踐踝踢踏踩踟踡踞躺輝輛輟輩輦輪輜輞"],["be40","輥適遮遨遭遷鄰鄭鄧鄱醇醉醋醃鋅銻銷鋪銬鋤鋁銳銼鋒鋇鋰銲閭閱霄霆震霉靠鞍鞋鞏頡頫頜颳養餓餒餘駝駐駟駛駑駕駒駙骷髮髯鬧魅魄魷魯鴆鴉"],["bea1","鴃麩麾黎墨齒儒儘儔儐儕冀冪凝劑劓勳噙噫噹噩噤噸噪器噥噱噯噬噢噶壁墾壇壅奮嬝嬴學寰導彊憲憑憩憊懍憶憾懊懈戰擅擁擋撻撼據擄擇擂操撿擒擔撾整曆曉暹曄曇暸樽樸樺橙橫橘樹橄橢橡橋橇樵機橈歙歷氅濂澱澡"],["bf40","濃澤濁澧澳激澹澶澦澠澴熾燉燐燒燈燕熹燎燙燜燃燄獨璜璣璘璟璞瓢甌甍瘴瘸瘺盧盥瞠瞞瞟瞥磨磚磬磧禦積穎穆穌穋窺篙簑築篤篛篡篩篦糕糖縊"],["bfa1","縑縈縛縣縞縝縉縐罹羲翰翱翮耨膳膩膨臻興艘艙蕊蕙蕈蕨蕩蕃蕉蕭蕪蕞螃螟螞螢融衡褪褲褥褫褡親覦諦諺諫諱謀諜諧諮諾謁謂諷諭諳諶諼豫豭貓賴蹄踱踴蹂踹踵輻輯輸輳辨辦遵遴選遲遼遺鄴醒錠錶鋸錳錯錢鋼錫錄錚"],["c040","錐錦錡錕錮錙閻隧隨險雕霎霑霖霍霓霏靛靜靦鞘頰頸頻頷頭頹頤餐館餞餛餡餚駭駢駱骸骼髻髭鬨鮑鴕鴣鴦鴨鴒鴛默黔龍龜優償儡儲勵嚎嚀嚐嚅嚇"],["c0a1","嚏壕壓壑壎嬰嬪嬤孺尷屨嶼嶺嶽嶸幫彌徽應懂懇懦懋戲戴擎擊擘擠擰擦擬擱擢擭斂斃曙曖檀檔檄檢檜櫛檣橾檗檐檠歜殮毚氈濘濱濟濠濛濤濫濯澀濬濡濩濕濮濰燧營燮燦燥燭燬燴燠爵牆獰獲璩環璦璨癆療癌盪瞳瞪瞰瞬"],["c140","瞧瞭矯磷磺磴磯礁禧禪穗窿簇簍篾篷簌篠糠糜糞糢糟糙糝縮績繆縷縲繃縫總縱繅繁縴縹繈縵縿縯罄翳翼聱聲聰聯聳臆臃膺臂臀膿膽臉膾臨舉艱薪"],["c1a1","薄蕾薜薑薔薯薛薇薨薊虧蟀蟑螳蟒蟆螫螻螺蟈蟋褻褶襄褸褽覬謎謗謙講謊謠謝謄謐豁谿豳賺賽購賸賻趨蹉蹋蹈蹊轄輾轂轅輿避遽還邁邂邀鄹醣醞醜鍍鎂錨鍵鍊鍥鍋錘鍾鍬鍛鍰鍚鍔闊闋闌闈闆隱隸雖霜霞鞠韓顆颶餵騁"],["c240","駿鮮鮫鮪鮭鴻鴿麋黏點黜黝黛鼾齋叢嚕嚮壙壘嬸彝懣戳擴擲擾攆擺擻擷斷曜朦檳檬櫃檻檸櫂檮檯歟歸殯瀉瀋濾瀆濺瀑瀏燻燼燾燸獷獵璧璿甕癖癘"],["c2a1","癒瞽瞿瞻瞼礎禮穡穢穠竄竅簫簧簪簞簣簡糧織繕繞繚繡繒繙罈翹翻職聶臍臏舊藏薩藍藐藉薰薺薹薦蟯蟬蟲蟠覆覲觴謨謹謬謫豐贅蹙蹣蹦蹤蹟蹕軀轉轍邇邃邈醫醬釐鎔鎊鎖鎢鎳鎮鎬鎰鎘鎚鎗闔闖闐闕離雜雙雛雞霤鞣鞦"],["c340","鞭韹額顏題顎顓颺餾餿餽餮馥騎髁鬃鬆魏魎魍鯊鯉鯽鯈鯀鵑鵝鵠黠鼕鼬儳嚥壞壟壢寵龐廬懲懷懶懵攀攏曠曝櫥櫝櫚櫓瀛瀟瀨瀚瀝瀕瀘爆爍牘犢獸"],["c3a1","獺璽瓊瓣疇疆癟癡矇礙禱穫穩簾簿簸簽簷籀繫繭繹繩繪羅繳羶羹羸臘藩藝藪藕藤藥藷蟻蠅蠍蟹蟾襠襟襖襞譁譜識證譚譎譏譆譙贈贊蹼蹲躇蹶蹬蹺蹴轔轎辭邊邋醱醮鏡鏑鏟鏃鏈鏜鏝鏖鏢鏍鏘鏤鏗鏨關隴難霪霧靡韜韻類"],["c440","願顛颼饅饉騖騙鬍鯨鯧鯖鯛鶉鵡鵲鵪鵬麒麗麓麴勸嚨嚷嚶嚴嚼壤孀孃孽寶巉懸懺攘攔攙曦朧櫬瀾瀰瀲爐獻瓏癢癥礦礪礬礫竇競籌籃籍糯糰辮繽繼"],["c4a1","纂罌耀臚艦藻藹蘑藺蘆蘋蘇蘊蠔蠕襤覺觸議譬警譯譟譫贏贍躉躁躅躂醴釋鐘鐃鏽闡霰飄饒饑馨騫騰騷騵鰓鰍鹹麵黨鼯齟齣齡儷儸囁囀囂夔屬巍懼懾攝攜斕曩櫻欄櫺殲灌爛犧瓖瓔癩矓籐纏續羼蘗蘭蘚蠣蠢蠡蠟襪襬覽譴"],["c540","護譽贓躊躍躋轟辯醺鐮鐳鐵鐺鐸鐲鐫闢霸霹露響顧顥饗驅驃驀騾髏魔魑鰭鰥鶯鶴鷂鶸麝黯鼙齜齦齧儼儻囈囊囉孿巔巒彎懿攤權歡灑灘玀瓤疊癮癬"],["c5a1","禳籠籟聾聽臟襲襯觼讀贖贗躑躓轡酈鑄鑑鑒霽霾韃韁顫饕驕驍髒鬚鱉鰱鰾鰻鷓鷗鼴齬齪龔囌巖戀攣攫攪曬欐瓚竊籤籣籥纓纖纔臢蘸蘿蠱變邐邏鑣鑠鑤靨顯饜驚驛驗髓體髑鱔鱗鱖鷥麟黴囑壩攬灞癱癲矗罐羈蠶蠹衢讓讒"],["c640","讖艷贛釀鑪靂靈靄韆顰驟鬢魘鱟鷹鷺鹼鹽鼇齷齲廳欖灣籬籮蠻觀躡釁鑲鑰顱饞髖鬣黌灤矚讚鑷韉驢驥纜讜躪釅鑽鑾鑼鱷鱸黷豔鑿鸚爨驪鬱鸛鸞籲"],["c940","乂乜凵匚厂万丌乇亍囗兀屮彳丏冇与丮亓仂仉仈冘勼卬厹圠夃夬尐巿旡殳毌气爿丱丼仨仜仩仡仝仚刌匜卌圢圣夗夯宁宄尒尻屴屳帄庀庂忉戉扐氕"],["c9a1","氶汃氿氻犮犰玊禸肊阞伎优伬仵伔仱伀价伈伝伂伅伢伓伄仴伒冱刓刉刐劦匢匟卍厊吇囡囟圮圪圴夼妀奼妅奻奾奷奿孖尕尥屼屺屻屾巟幵庄异弚彴忕忔忏扜扞扤扡扦扢扙扠扚扥旯旮朾朹朸朻机朿朼朳氘汆汒汜汏汊汔汋"],["ca40","汌灱牞犴犵玎甪癿穵网艸艼芀艽艿虍襾邙邗邘邛邔阢阤阠阣佖伻佢佉体佤伾佧佒佟佁佘伭伳伿佡冏冹刜刞刡劭劮匉卣卲厎厏吰吷吪呔呅吙吜吥吘"],["caa1","吽呏呁吨吤呇囮囧囥坁坅坌坉坋坒夆奀妦妘妠妗妎妢妐妏妧妡宎宒尨尪岍岏岈岋岉岒岊岆岓岕巠帊帎庋庉庌庈庍弅弝彸彶忒忑忐忭忨忮忳忡忤忣忺忯忷忻怀忴戺抃抌抎抏抔抇扱扻扺扰抁抈扷扽扲扴攷旰旴旳旲旵杅杇"],["cb40","杙杕杌杈杝杍杚杋毐氙氚汸汧汫沄沋沏汱汯汩沚汭沇沕沜汦汳汥汻沎灴灺牣犿犽狃狆狁犺狅玕玗玓玔玒町甹疔疕皁礽耴肕肙肐肒肜芐芏芅芎芑芓"],["cba1","芊芃芄豸迉辿邟邡邥邞邧邠阰阨阯阭丳侘佼侅佽侀侇佶佴侉侄佷佌侗佪侚佹侁佸侐侜侔侞侒侂侕佫佮冞冼冾刵刲刳剆刱劼匊匋匼厒厔咇呿咁咑咂咈呫呺呾呥呬呴呦咍呯呡呠咘呣呧呤囷囹坯坲坭坫坱坰坶垀坵坻坳坴坢"],["cc40","坨坽夌奅妵妺姏姎妲姌姁妶妼姃姖妱妽姀姈妴姇孢孥宓宕屄屇岮岤岠岵岯岨岬岟岣岭岢岪岧岝岥岶岰岦帗帔帙弨弢弣弤彔徂彾彽忞忥怭怦怙怲怋"],["cca1","怴怊怗怳怚怞怬怢怍怐怮怓怑怌怉怜戔戽抭抴拑抾抪抶拊抮抳抯抻抩抰抸攽斨斻昉旼昄昒昈旻昃昋昍昅旽昑昐曶朊枅杬枎枒杶杻枘枆构杴枍枌杺枟枑枙枃杽极杸杹枔欥殀歾毞氝沓泬泫泮泙沶泔沭泧沷泐泂沺泃泆泭泲"],["cd40","泒泝沴沊沝沀泞泀洰泍泇沰泹泏泩泑炔炘炅炓炆炄炑炖炂炚炃牪狖狋狘狉狜狒狔狚狌狑玤玡玭玦玢玠玬玝瓝瓨甿畀甾疌疘皯盳盱盰盵矸矼矹矻矺"],["cda1","矷祂礿秅穸穻竻籵糽耵肏肮肣肸肵肭舠芠苀芫芚芘芛芵芧芮芼芞芺芴芨芡芩苂芤苃芶芢虰虯虭虮豖迒迋迓迍迖迕迗邲邴邯邳邰阹阽阼阺陃俍俅俓侲俉俋俁俔俜俙侻侳俛俇俖侺俀侹俬剄剉勀勂匽卼厗厖厙厘咺咡咭咥哏"],["ce40","哃茍咷咮哖咶哅哆咠呰咼咢咾呲哞咰垵垞垟垤垌垗垝垛垔垘垏垙垥垚垕壴复奓姡姞姮娀姱姝姺姽姼姶姤姲姷姛姩姳姵姠姾姴姭宨屌峐峘峌峗峋峛"],["cea1","峞峚峉峇峊峖峓峔峏峈峆峎峟峸巹帡帢帣帠帤庰庤庢庛庣庥弇弮彖徆怷怹恔恲恞恅恓恇恉恛恌恀恂恟怤恄恘恦恮扂扃拏挍挋拵挎挃拫拹挏挌拸拶挀挓挔拺挕拻拰敁敃斪斿昶昡昲昵昜昦昢昳昫昺昝昴昹昮朏朐柁柲柈枺"],["cf40","柜枻柸柘柀枷柅柫柤柟枵柍枳柷柶柮柣柂枹柎柧柰枲柼柆柭柌枮柦柛柺柉柊柃柪柋欨殂殄殶毖毘毠氠氡洨洴洭洟洼洿洒洊泚洳洄洙洺洚洑洀洝浂"],["cfa1","洁洘洷洃洏浀洇洠洬洈洢洉洐炷炟炾炱炰炡炴炵炩牁牉牊牬牰牳牮狊狤狨狫狟狪狦狣玅珌珂珈珅玹玶玵玴珫玿珇玾珃珆玸珋瓬瓮甮畇畈疧疪癹盄眈眃眄眅眊盷盻盺矧矨砆砑砒砅砐砏砎砉砃砓祊祌祋祅祄秕种秏秖秎窀"],["d040","穾竑笀笁籺籸籹籿粀粁紃紈紁罘羑羍羾耇耎耏耔耷胘胇胠胑胈胂胐胅胣胙胜胊胕胉胏胗胦胍臿舡芔苙苾苹茇苨茀苕茺苫苖苴苬苡苲苵茌苻苶苰苪"],["d0a1","苤苠苺苳苭虷虴虼虳衁衎衧衪衩觓訄訇赲迣迡迮迠郱邽邿郕郅邾郇郋郈釔釓陔陏陑陓陊陎倞倅倇倓倢倰倛俵俴倳倷倬俶俷倗倜倠倧倵倯倱倎党冔冓凊凄凅凈凎剡剚剒剞剟剕剢勍匎厞唦哢唗唒哧哳哤唚哿唄唈哫唑唅哱"],["d140","唊哻哷哸哠唎唃唋圁圂埌堲埕埒垺埆垽垼垸垶垿埇埐垹埁夎奊娙娖娭娮娕娏娗娊娞娳孬宧宭宬尃屖屔峬峿峮峱峷崀峹帩帨庨庮庪庬弳弰彧恝恚恧"],["d1a1","恁悢悈悀悒悁悝悃悕悛悗悇悜悎戙扆拲挐捖挬捄捅挶捃揤挹捋捊挼挩捁挴捘捔捙挭捇挳捚捑挸捗捀捈敊敆旆旃旄旂晊晟晇晑朒朓栟栚桉栲栳栻桋桏栖栱栜栵栫栭栯桎桄栴栝栒栔栦栨栮桍栺栥栠欬欯欭欱欴歭肂殈毦毤"],["d240","毨毣毢毧氥浺浣浤浶洍浡涒浘浢浭浯涑涍淯浿涆浞浧浠涗浰浼浟涂涘洯浨涋浾涀涄洖涃浻浽浵涐烜烓烑烝烋缹烢烗烒烞烠烔烍烅烆烇烚烎烡牂牸"],["d2a1","牷牶猀狺狴狾狶狳狻猁珓珙珥珖玼珧珣珩珜珒珛珔珝珚珗珘珨瓞瓟瓴瓵甡畛畟疰痁疻痄痀疿疶疺皊盉眝眛眐眓眒眣眑眕眙眚眢眧砣砬砢砵砯砨砮砫砡砩砳砪砱祔祛祏祜祓祒祑秫秬秠秮秭秪秜秞秝窆窉窅窋窌窊窇竘笐"],["d340","笄笓笅笏笈笊笎笉笒粄粑粊粌粈粍粅紞紝紑紎紘紖紓紟紒紏紌罜罡罞罠罝罛羖羒翃翂翀耖耾耹胺胲胹胵脁胻脀舁舯舥茳茭荄茙荑茥荖茿荁茦茜茢"],["d3a1","荂荎茛茪茈茼荍茖茤茠茷茯茩荇荅荌荓茞茬荋茧荈虓虒蚢蚨蚖蚍蚑蚞蚇蚗蚆蚋蚚蚅蚥蚙蚡蚧蚕蚘蚎蚝蚐蚔衃衄衭衵衶衲袀衱衿衯袃衾衴衼訒豇豗豻貤貣赶赸趵趷趶軑軓迾迵适迿迻逄迼迶郖郠郙郚郣郟郥郘郛郗郜郤酐"],["d440","酎酏釕釢釚陜陟隼飣髟鬯乿偰偪偡偞偠偓偋偝偲偈偍偁偛偊偢倕偅偟偩偫偣偤偆偀偮偳偗偑凐剫剭剬剮勖勓匭厜啵啶唼啍啐唴唪啑啢唶唵唰啒啅"],["d4a1","唌唲啥啎唹啈唭唻啀啋圊圇埻堔埢埶埜埴堀埭埽堈埸堋埳埏堇埮埣埲埥埬埡堎埼堐埧堁堌埱埩埰堍堄奜婠婘婕婧婞娸娵婭婐婟婥婬婓婤婗婃婝婒婄婛婈媎娾婍娹婌婰婩婇婑婖婂婜孲孮寁寀屙崞崋崝崚崠崌崨崍崦崥崏"],["d540","崰崒崣崟崮帾帴庱庴庹庲庳弶弸徛徖徟悊悐悆悾悰悺惓惔惏惤惙惝惈悱惛悷惊悿惃惍惀挲捥掊掂捽掽掞掭掝掗掫掎捯掇掐据掯捵掜捭掮捼掤挻掟"],["d5a1","捸掅掁掑掍捰敓旍晥晡晛晙晜晢朘桹梇梐梜桭桮梮梫楖桯梣梬梩桵桴梲梏桷梒桼桫桲梪梀桱桾梛梖梋梠梉梤桸桻梑梌梊桽欶欳欷欸殑殏殍殎殌氪淀涫涴涳湴涬淩淢涷淶淔渀淈淠淟淖涾淥淜淝淛淴淊涽淭淰涺淕淂淏淉"],["d640","淐淲淓淽淗淍淣涻烺焍烷焗烴焌烰焄烳焐烼烿焆焓焀烸烶焋焂焎牾牻牼牿猝猗猇猑猘猊猈狿猏猞玈珶珸珵琄琁珽琇琀珺珼珿琌琋珴琈畤畣痎痒痏"],["d6a1","痋痌痑痐皏皉盓眹眯眭眱眲眴眳眽眥眻眵硈硒硉硍硊硌砦硅硐祤祧祩祪祣祫祡离秺秸秶秷窏窔窐笵筇笴笥笰笢笤笳笘笪笝笱笫笭笯笲笸笚笣粔粘粖粣紵紽紸紶紺絅紬紩絁絇紾紿絊紻紨罣羕羜羝羛翊翋翍翐翑翇翏翉耟"],["d740","耞耛聇聃聈脘脥脙脛脭脟脬脞脡脕脧脝脢舑舸舳舺舴舲艴莐莣莨莍荺荳莤荴莏莁莕莙荵莔莩荽莃莌莝莛莪莋荾莥莯莈莗莰荿莦莇莮荶莚虙虖蚿蚷"],["d7a1","蛂蛁蛅蚺蚰蛈蚹蚳蚸蛌蚴蚻蚼蛃蚽蚾衒袉袕袨袢袪袚袑袡袟袘袧袙袛袗袤袬袌袓袎覂觖觙觕訰訧訬訞谹谻豜豝豽貥赽赻赹趼跂趹趿跁軘軞軝軜軗軠軡逤逋逑逜逌逡郯郪郰郴郲郳郔郫郬郩酖酘酚酓酕釬釴釱釳釸釤釹釪"],["d840","釫釷釨釮镺閆閈陼陭陫陱陯隿靪頄飥馗傛傕傔傞傋傣傃傌傎傝偨傜傒傂傇兟凔匒匑厤厧喑喨喥喭啷噅喢喓喈喏喵喁喣喒喤啽喌喦啿喕喡喎圌堩堷"],["d8a1","堙堞堧堣堨埵塈堥堜堛堳堿堶堮堹堸堭堬堻奡媯媔媟婺媢媞婸媦婼媥媬媕媮娷媄媊媗媃媋媩婻婽媌媜媏媓媝寪寍寋寔寑寊寎尌尰崷嵃嵫嵁嵋崿崵嵑嵎嵕崳崺嵒崽崱嵙嵂崹嵉崸崼崲崶嵀嵅幄幁彘徦徥徫惉悹惌惢惎惄愔"],["d940","惲愊愖愅惵愓惸惼惾惁愃愘愝愐惿愄愋扊掔掱掰揎揥揨揯揃撝揳揊揠揶揕揲揵摡揟掾揝揜揄揘揓揂揇揌揋揈揰揗揙攲敧敪敤敜敨敥斌斝斞斮旐旒"],["d9a1","晼晬晻暀晱晹晪晲朁椌棓椄棜椪棬棪棱椏棖棷棫棤棶椓椐棳棡椇棌椈楰梴椑棯棆椔棸棐棽棼棨椋椊椗棎棈棝棞棦棴棑椆棔棩椕椥棇欹欻欿欼殔殗殙殕殽毰毲毳氰淼湆湇渟湉溈渼渽湅湢渫渿湁湝湳渜渳湋湀湑渻渃渮湞"],["da40","湨湜湡渱渨湠湱湫渹渢渰湓湥渧湸湤湷湕湹湒湦渵渶湚焠焞焯烻焮焱焣焥焢焲焟焨焺焛牋牚犈犉犆犅犋猒猋猰猢猱猳猧猲猭猦猣猵猌琮琬琰琫琖"],["daa1","琚琡琭琱琤琣琝琩琠琲瓻甯畯畬痧痚痡痦痝痟痤痗皕皒盚睆睇睄睍睅睊睎睋睌矞矬硠硤硥硜硭硱硪确硰硩硨硞硢祴祳祲祰稂稊稃稌稄窙竦竤筊笻筄筈筌筎筀筘筅粢粞粨粡絘絯絣絓絖絧絪絏絭絜絫絒絔絩絑絟絎缾缿罥"],["db40","罦羢羠羡翗聑聏聐胾胔腃腊腒腏腇脽腍脺臦臮臷臸臹舄舼舽舿艵茻菏菹萣菀菨萒菧菤菼菶萐菆菈菫菣莿萁菝菥菘菿菡菋菎菖菵菉萉萏菞萑萆菂菳"],["dba1","菕菺菇菑菪萓菃菬菮菄菻菗菢萛菛菾蛘蛢蛦蛓蛣蛚蛪蛝蛫蛜蛬蛩蛗蛨蛑衈衖衕袺裗袹袸裀袾袶袼袷袽袲褁裉覕覘覗觝觚觛詎詍訹詙詀詗詘詄詅詒詈詑詊詌詏豟貁貀貺貾貰貹貵趄趀趉跘跓跍跇跖跜跏跕跙跈跗跅軯軷軺"],["dc40","軹軦軮軥軵軧軨軶軫軱軬軴軩逭逴逯鄆鄬鄄郿郼鄈郹郻鄁鄀鄇鄅鄃酡酤酟酢酠鈁鈊鈥鈃鈚鈦鈏鈌鈀鈒釿釽鈆鈄鈧鈂鈜鈤鈙鈗鈅鈖镻閍閌閐隇陾隈"],["dca1","隉隃隀雂雈雃雱雰靬靰靮頇颩飫鳦黹亃亄亶傽傿僆傮僄僊傴僈僂傰僁傺傱僋僉傶傸凗剺剸剻剼嗃嗛嗌嗐嗋嗊嗝嗀嗔嗄嗩喿嗒喍嗏嗕嗢嗖嗈嗲嗍嗙嗂圔塓塨塤塏塍塉塯塕塎塝塙塥塛堽塣塱壼嫇嫄嫋媺媸媱媵媰媿嫈媻嫆"],["dd40","媷嫀嫊媴媶嫍媹媐寖寘寙尟尳嵱嵣嵊嵥嵲嵬嵞嵨嵧嵢巰幏幎幊幍幋廅廌廆廋廇彀徯徭惷慉慊愫慅愶愲愮慆愯慏愩慀戠酨戣戥戤揅揱揫搐搒搉搠搤"],["dda1","搳摃搟搕搘搹搷搢搣搌搦搰搨摁搵搯搊搚摀搥搧搋揧搛搮搡搎敯斒旓暆暌暕暐暋暊暙暔晸朠楦楟椸楎楢楱椿楅楪椹楂楗楙楺楈楉椵楬椳椽楥棰楸椴楩楀楯楄楶楘楁楴楌椻楋椷楜楏楑椲楒椯楻椼歆歅歃歂歈歁殛嗀毻毼"],["de40","毹毷毸溛滖滈溏滀溟溓溔溠溱溹滆滒溽滁溞滉溷溰滍溦滏溲溾滃滜滘溙溒溎溍溤溡溿溳滐滊溗溮溣煇煔煒煣煠煁煝煢煲煸煪煡煂煘煃煋煰煟煐煓"],["dea1","煄煍煚牏犍犌犑犐犎猼獂猻猺獀獊獉瑄瑊瑋瑒瑑瑗瑀瑏瑐瑎瑂瑆瑍瑔瓡瓿瓾瓽甝畹畷榃痯瘏瘃痷痾痼痹痸瘐痻痶痭痵痽皙皵盝睕睟睠睒睖睚睩睧睔睙睭矠碇碚碔碏碄碕碅碆碡碃硹碙碀碖硻祼禂祽祹稑稘稙稒稗稕稢稓"],["df40","稛稐窣窢窞竫筦筤筭筴筩筲筥筳筱筰筡筸筶筣粲粴粯綈綆綀綍絿綅絺綎絻綃絼綌綔綄絽綒罭罫罧罨罬羦羥羧翛翜耡腤腠腷腜腩腛腢腲朡腞腶腧腯"],["dfa1","腄腡舝艉艄艀艂艅蓱萿葖葶葹蒏蒍葥葑葀蒆葧萰葍葽葚葙葴葳葝蔇葞萷萺萴葺葃葸萲葅萩菙葋萯葂萭葟葰萹葎葌葒葯蓅蒎萻葇萶萳葨葾葄萫葠葔葮葐蜋蜄蛷蜌蛺蛖蛵蝍蛸蜎蜉蜁蛶蜍蜅裖裋裍裎裞裛裚裌裐覅覛觟觥觤"],["e040","觡觠觢觜触詶誆詿詡訿詷誂誄詵誃誁詴詺谼豋豊豥豤豦貆貄貅賌赨赩趑趌趎趏趍趓趔趐趒跰跠跬跱跮跐跩跣跢跧跲跫跴輆軿輁輀輅輇輈輂輋遒逿"],["e0a1","遄遉逽鄐鄍鄏鄑鄖鄔鄋鄎酮酯鉈鉒鈰鈺鉦鈳鉥鉞銃鈮鉊鉆鉭鉬鉏鉠鉧鉯鈶鉡鉰鈱鉔鉣鉐鉲鉎鉓鉌鉖鈲閟閜閞閛隒隓隑隗雎雺雽雸雵靳靷靸靲頏頍頎颬飶飹馯馲馰馵骭骫魛鳪鳭鳧麀黽僦僔僗僨僳僛僪僝僤僓僬僰僯僣僠"],["e140","凘劀劁勩勫匰厬嘧嘕嘌嘒嗼嘏嘜嘁嘓嘂嗺嘝嘄嗿嗹墉塼墐墘墆墁塿塴墋塺墇墑墎塶墂墈塻墔墏壾奫嫜嫮嫥嫕嫪嫚嫭嫫嫳嫢嫠嫛嫬嫞嫝嫙嫨嫟孷寠"],["e1a1","寣屣嶂嶀嵽嶆嵺嶁嵷嶊嶉嶈嵾嵼嶍嵹嵿幘幙幓廘廑廗廎廜廕廙廒廔彄彃彯徶愬愨慁慞慱慳慒慓慲慬憀慴慔慺慛慥愻慪慡慖戩戧戫搫摍摛摝摴摶摲摳摽摵摦撦摎撂摞摜摋摓摠摐摿搿摬摫摙摥摷敳斠暡暠暟朅朄朢榱榶槉"],["e240","榠槎榖榰榬榼榑榙榎榧榍榩榾榯榿槄榽榤槔榹槊榚槏榳榓榪榡榞槙榗榐槂榵榥槆歊歍歋殞殟殠毃毄毾滎滵滱漃漥滸漷滻漮漉潎漙漚漧漘漻漒滭漊"],["e2a1","漶潳滹滮漭潀漰漼漵滫漇漎潃漅滽滶漹漜滼漺漟漍漞漈漡熇熐熉熀熅熂熏煻熆熁熗牄牓犗犕犓獃獍獑獌瑢瑳瑱瑵瑲瑧瑮甀甂甃畽疐瘖瘈瘌瘕瘑瘊瘔皸瞁睼瞅瞂睮瞀睯睾瞃碲碪碴碭碨硾碫碞碥碠碬碢碤禘禊禋禖禕禔禓"],["e340","禗禈禒禐稫穊稰稯稨稦窨窫窬竮箈箜箊箑箐箖箍箌箛箎箅箘劄箙箤箂粻粿粼粺綧綷緂綣綪緁緀緅綝緎緄緆緋緌綯綹綖綼綟綦綮綩綡緉罳翢翣翥翞"],["e3a1","耤聝聜膉膆膃膇膍膌膋舕蒗蒤蒡蒟蒺蓎蓂蒬蒮蒫蒹蒴蓁蓍蒪蒚蒱蓐蒝蒧蒻蒢蒔蓇蓌蒛蒩蒯蒨蓖蒘蒶蓏蒠蓗蓔蓒蓛蒰蒑虡蜳蜣蜨蝫蝀蜮蜞蜡蜙蜛蝃蜬蝁蜾蝆蜠蜲蜪蜭蜼蜒蜺蜱蜵蝂蜦蜧蜸蜤蜚蜰蜑裷裧裱裲裺裾裮裼裶裻"],["e440","裰裬裫覝覡覟覞觩觫觨誫誙誋誒誏誖谽豨豩賕賏賗趖踉踂跿踍跽踊踃踇踆踅跾踀踄輐輑輎輍鄣鄜鄠鄢鄟鄝鄚鄤鄡鄛酺酲酹酳銥銤鉶銛鉺銠銔銪銍"],["e4a1","銦銚銫鉹銗鉿銣鋮銎銂銕銢鉽銈銡銊銆銌銙銧鉾銇銩銝銋鈭隞隡雿靘靽靺靾鞃鞀鞂靻鞄鞁靿韎韍頖颭颮餂餀餇馝馜駃馹馻馺駂馽駇骱髣髧鬾鬿魠魡魟鳱鳲鳵麧僿儃儰僸儆儇僶僾儋儌僽儊劋劌勱勯噈噂噌嘵噁噊噉噆噘"],["e540","噚噀嘳嘽嘬嘾嘸嘪嘺圚墫墝墱墠墣墯墬墥墡壿嫿嫴嫽嫷嫶嬃嫸嬂嫹嬁嬇嬅嬏屧嶙嶗嶟嶒嶢嶓嶕嶠嶜嶡嶚嶞幩幝幠幜緳廛廞廡彉徲憋憃慹憱憰憢憉"],["e5a1","憛憓憯憭憟憒憪憡憍慦憳戭摮摰撖撠撅撗撜撏撋撊撌撣撟摨撱撘敶敺敹敻斲斳暵暰暩暲暷暪暯樀樆樗槥槸樕槱槤樠槿槬槢樛樝槾樧槲槮樔槷槧橀樈槦槻樍槼槫樉樄樘樥樏槶樦樇槴樖歑殥殣殢殦氁氀毿氂潁漦潾澇濆澒"],["e640","澍澉澌潢潏澅潚澖潶潬澂潕潲潒潐潗澔澓潝漀潡潫潽潧澐潓澋潩潿澕潣潷潪潻熲熯熛熰熠熚熩熵熝熥熞熤熡熪熜熧熳犘犚獘獒獞獟獠獝獛獡獚獙"],["e6a1","獢璇璉璊璆璁瑽璅璈瑼瑹甈甇畾瘥瘞瘙瘝瘜瘣瘚瘨瘛皜皝皞皛瞍瞏瞉瞈磍碻磏磌磑磎磔磈磃磄磉禚禡禠禜禢禛歶稹窲窴窳箷篋箾箬篎箯箹篊箵糅糈糌糋緷緛緪緧緗緡縃緺緦緶緱緰緮緟罶羬羰羭翭翫翪翬翦翨聤聧膣膟"],["e740","膞膕膢膙膗舖艏艓艒艐艎艑蔤蔻蔏蔀蔩蔎蔉蔍蔟蔊蔧蔜蓻蔫蓺蔈蔌蓴蔪蓲蔕蓷蓫蓳蓼蔒蓪蓩蔖蓾蔨蔝蔮蔂蓽蔞蓶蔱蔦蓧蓨蓰蓯蓹蔘蔠蔰蔋蔙蔯虢"],["e7a1","蝖蝣蝤蝷蟡蝳蝘蝔蝛蝒蝡蝚蝑蝞蝭蝪蝐蝎蝟蝝蝯蝬蝺蝮蝜蝥蝏蝻蝵蝢蝧蝩衚褅褌褔褋褗褘褙褆褖褑褎褉覢覤覣觭觰觬諏諆誸諓諑諔諕誻諗誾諀諅諘諃誺誽諙谾豍貏賥賟賙賨賚賝賧趠趜趡趛踠踣踥踤踮踕踛踖踑踙踦踧"],["e840","踔踒踘踓踜踗踚輬輤輘輚輠輣輖輗遳遰遯遧遫鄯鄫鄩鄪鄲鄦鄮醅醆醊醁醂醄醀鋐鋃鋄鋀鋙銶鋏鋱鋟鋘鋩鋗鋝鋌鋯鋂鋨鋊鋈鋎鋦鋍鋕鋉鋠鋞鋧鋑鋓"],["e8a1","銵鋡鋆銴镼閬閫閮閰隤隢雓霅霈霂靚鞊鞎鞈韐韏頞頝頦頩頨頠頛頧颲餈飺餑餔餖餗餕駜駍駏駓駔駎駉駖駘駋駗駌骳髬髫髳髲髱魆魃魧魴魱魦魶魵魰魨魤魬鳼鳺鳽鳿鳷鴇鴀鳹鳻鴈鴅鴄麃黓鼏鼐儜儓儗儚儑凞匴叡噰噠噮"],["e940","噳噦噣噭噲噞噷圜圛壈墽壉墿墺壂墼壆嬗嬙嬛嬡嬔嬓嬐嬖嬨嬚嬠嬞寯嶬嶱嶩嶧嶵嶰嶮嶪嶨嶲嶭嶯嶴幧幨幦幯廩廧廦廨廥彋徼憝憨憖懅憴懆懁懌憺"],["e9a1","憿憸憌擗擖擐擏擉撽撉擃擛擳擙攳敿敼斢曈暾曀曊曋曏暽暻暺曌朣樴橦橉橧樲橨樾橝橭橶橛橑樨橚樻樿橁橪橤橐橏橔橯橩橠樼橞橖橕橍橎橆歕歔歖殧殪殫毈毇氄氃氆澭濋澣濇澼濎濈潞濄澽澞濊澨瀄澥澮澺澬澪濏澿澸"],["ea40","澢濉澫濍澯澲澰燅燂熿熸燖燀燁燋燔燊燇燏熽燘熼燆燚燛犝犞獩獦獧獬獥獫獪瑿璚璠璔璒璕璡甋疀瘯瘭瘱瘽瘳瘼瘵瘲瘰皻盦瞚瞝瞡瞜瞛瞢瞣瞕瞙"],["eaa1","瞗磝磩磥磪磞磣磛磡磢磭磟磠禤穄穈穇窶窸窵窱窷篞篣篧篝篕篥篚篨篹篔篪篢篜篫篘篟糒糔糗糐糑縒縡縗縌縟縠縓縎縜縕縚縢縋縏縖縍縔縥縤罃罻罼罺羱翯耪耩聬膱膦膮膹膵膫膰膬膴膲膷膧臲艕艖艗蕖蕅蕫蕍蕓蕡蕘"],["eb40","蕀蕆蕤蕁蕢蕄蕑蕇蕣蔾蕛蕱蕎蕮蕵蕕蕧蕠薌蕦蕝蕔蕥蕬虣虥虤螛螏螗螓螒螈螁螖螘蝹螇螣螅螐螑螝螄螔螜螚螉褞褦褰褭褮褧褱褢褩褣褯褬褟觱諠"],["eba1","諢諲諴諵諝謔諤諟諰諈諞諡諨諿諯諻貑貒貐賵賮賱賰賳赬赮趥趧踳踾踸蹀蹅踶踼踽蹁踰踿躽輶輮輵輲輹輷輴遶遹遻邆郺鄳鄵鄶醓醐醑醍醏錧錞錈錟錆錏鍺錸錼錛錣錒錁鍆錭錎錍鋋錝鋺錥錓鋹鋷錴錂錤鋿錩錹錵錪錔錌"],["ec40","錋鋾錉錀鋻錖閼闍閾閹閺閶閿閵閽隩雔霋霒霐鞙鞗鞔韰韸頵頯頲餤餟餧餩馞駮駬駥駤駰駣駪駩駧骹骿骴骻髶髺髹髷鬳鮀鮅鮇魼魾魻鮂鮓鮒鮐魺鮕"],["eca1","魽鮈鴥鴗鴠鴞鴔鴩鴝鴘鴢鴐鴙鴟麈麆麇麮麭黕黖黺鼒鼽儦儥儢儤儠儩勴嚓嚌嚍嚆嚄嚃噾嚂噿嚁壖壔壏壒嬭嬥嬲嬣嬬嬧嬦嬯嬮孻寱寲嶷幬幪徾徻懃憵憼懧懠懥懤懨懞擯擩擣擫擤擨斁斀斶旚曒檍檖檁檥檉檟檛檡檞檇檓檎"],["ed40","檕檃檨檤檑橿檦檚檅檌檒歛殭氉濌澩濴濔濣濜濭濧濦濞濲濝濢濨燡燱燨燲燤燰燢獳獮獯璗璲璫璐璪璭璱璥璯甐甑甒甏疄癃癈癉癇皤盩瞵瞫瞲瞷瞶"],["eda1","瞴瞱瞨矰磳磽礂磻磼磲礅磹磾礄禫禨穜穛穖穘穔穚窾竀竁簅簏篲簀篿篻簎篴簋篳簂簉簃簁篸篽簆篰篱簐簊糨縭縼繂縳顈縸縪繉繀繇縩繌縰縻縶繄縺罅罿罾罽翴翲耬膻臄臌臊臅臇膼臩艛艚艜薃薀薏薧薕薠薋薣蕻薤薚薞"],["ee40","蕷蕼薉薡蕺蕸蕗薎薖薆薍薙薝薁薢薂薈薅蕹蕶薘薐薟虨螾螪螭蟅螰螬螹螵螼螮蟉蟃蟂蟌螷螯蟄蟊螴螶螿螸螽蟞螲褵褳褼褾襁襒褷襂覭覯覮觲觳謞"],["eea1","謘謖謑謅謋謢謏謒謕謇謍謈謆謜謓謚豏豰豲豱豯貕貔賹赯蹎蹍蹓蹐蹌蹇轃轀邅遾鄸醚醢醛醙醟醡醝醠鎡鎃鎯鍤鍖鍇鍼鍘鍜鍶鍉鍐鍑鍠鍭鎏鍌鍪鍹鍗鍕鍒鍏鍱鍷鍻鍡鍞鍣鍧鎀鍎鍙闇闀闉闃闅閷隮隰隬霠霟霘霝霙鞚鞡鞜"],["ef40","鞞鞝韕韔韱顁顄顊顉顅顃餥餫餬餪餳餲餯餭餱餰馘馣馡騂駺駴駷駹駸駶駻駽駾駼騃骾髾髽鬁髼魈鮚鮨鮞鮛鮦鮡鮥鮤鮆鮢鮠鮯鴳鵁鵧鴶鴮鴯鴱鴸鴰"],["efa1","鵅鵂鵃鴾鴷鵀鴽翵鴭麊麉麍麰黈黚黻黿鼤鼣鼢齔龠儱儭儮嚘嚜嚗嚚嚝嚙奰嬼屩屪巀幭幮懘懟懭懮懱懪懰懫懖懩擿攄擽擸攁攃擼斔旛曚曛曘櫅檹檽櫡櫆檺檶檷櫇檴檭歞毉氋瀇瀌瀍瀁瀅瀔瀎濿瀀濻瀦濼濷瀊爁燿燹爃燽獶"],["f040","璸瓀璵瓁璾璶璻瓂甔甓癜癤癙癐癓癗癚皦皽盬矂瞺磿礌礓礔礉礐礒礑禭禬穟簜簩簙簠簟簭簝簦簨簢簥簰繜繐繖繣繘繢繟繑繠繗繓羵羳翷翸聵臑臒"],["f0a1","臐艟艞薴藆藀藃藂薳薵薽藇藄薿藋藎藈藅薱薶藒蘤薸薷薾虩蟧蟦蟢蟛蟫蟪蟥蟟蟳蟤蟔蟜蟓蟭蟘蟣螤蟗蟙蠁蟴蟨蟝襓襋襏襌襆襐襑襉謪謧謣謳謰謵譇謯謼謾謱謥謷謦謶謮謤謻謽謺豂豵貙貘貗賾贄贂贀蹜蹢蹠蹗蹖蹞蹥蹧"],["f140","蹛蹚蹡蹝蹩蹔轆轇轈轋鄨鄺鄻鄾醨醥醧醯醪鎵鎌鎒鎷鎛鎝鎉鎧鎎鎪鎞鎦鎕鎈鎙鎟鎍鎱鎑鎲鎤鎨鎴鎣鎥闒闓闑隳雗雚巂雟雘雝霣霢霥鞬鞮鞨鞫鞤鞪"],["f1a1","鞢鞥韗韙韖韘韺顐顑顒颸饁餼餺騏騋騉騍騄騑騊騅騇騆髀髜鬈鬄鬅鬩鬵魊魌魋鯇鯆鯃鮿鯁鮵鮸鯓鮶鯄鮹鮽鵜鵓鵏鵊鵛鵋鵙鵖鵌鵗鵒鵔鵟鵘鵚麎麌黟鼁鼀鼖鼥鼫鼪鼩鼨齌齕儴儵劖勷厴嚫嚭嚦嚧嚪嚬壚壝壛夒嬽嬾嬿巃幰"],["f240","徿懻攇攐攍攉攌攎斄旞旝曞櫧櫠櫌櫑櫙櫋櫟櫜櫐櫫櫏櫍櫞歠殰氌瀙瀧瀠瀖瀫瀡瀢瀣瀩瀗瀤瀜瀪爌爊爇爂爅犥犦犤犣犡瓋瓅璷瓃甖癠矉矊矄矱礝礛"],["f2a1","礡礜礗礞禰穧穨簳簼簹簬簻糬糪繶繵繸繰繷繯繺繲繴繨罋罊羃羆羷翽翾聸臗臕艤艡艣藫藱藭藙藡藨藚藗藬藲藸藘藟藣藜藑藰藦藯藞藢蠀蟺蠃蟶蟷蠉蠌蠋蠆蟼蠈蟿蠊蠂襢襚襛襗襡襜襘襝襙覈覷覶觶譐譈譊譀譓譖譔譋譕"],["f340","譑譂譒譗豃豷豶貚贆贇贉趬趪趭趫蹭蹸蹳蹪蹯蹻軂轒轑轏轐轓辴酀鄿醰醭鏞鏇鏏鏂鏚鏐鏹鏬鏌鏙鎩鏦鏊鏔鏮鏣鏕鏄鏎鏀鏒鏧镽闚闛雡霩霫霬霨霦"],["f3a1","鞳鞷鞶韝韞韟顜顙顝顗颿颽颻颾饈饇饃馦馧騚騕騥騝騤騛騢騠騧騣騞騜騔髂鬋鬊鬎鬌鬷鯪鯫鯠鯞鯤鯦鯢鯰鯔鯗鯬鯜鯙鯥鯕鯡鯚鵷鶁鶊鶄鶈鵱鶀鵸鶆鶋鶌鵽鵫鵴鵵鵰鵩鶅鵳鵻鶂鵯鵹鵿鶇鵨麔麑黀黼鼭齀齁齍齖齗齘匷嚲"],["f440","嚵嚳壣孅巆巇廮廯忀忁懹攗攖攕攓旟曨曣曤櫳櫰櫪櫨櫹櫱櫮櫯瀼瀵瀯瀷瀴瀱灂瀸瀿瀺瀹灀瀻瀳灁爓爔犨獽獼璺皫皪皾盭矌矎矏矍矲礥礣礧礨礤礩"],["f4a1","禲穮穬穭竷籉籈籊籇籅糮繻繾纁纀羺翿聹臛臙舋艨艩蘢藿蘁藾蘛蘀藶蘄蘉蘅蘌藽蠙蠐蠑蠗蠓蠖襣襦覹觷譠譪譝譨譣譥譧譭趮躆躈躄轙轖轗轕轘轚邍酃酁醷醵醲醳鐋鐓鏻鐠鐏鐔鏾鐕鐐鐨鐙鐍鏵鐀鏷鐇鐎鐖鐒鏺鐉鏸鐊鏿"],["f540","鏼鐌鏶鐑鐆闞闠闟霮霯鞹鞻韽韾顠顢顣顟飁飂饐饎饙饌饋饓騲騴騱騬騪騶騩騮騸騭髇髊髆鬐鬒鬑鰋鰈鯷鰅鰒鯸鱀鰇鰎鰆鰗鰔鰉鶟鶙鶤鶝鶒鶘鶐鶛"],["f5a1","鶠鶔鶜鶪鶗鶡鶚鶢鶨鶞鶣鶿鶩鶖鶦鶧麙麛麚黥黤黧黦鼰鼮齛齠齞齝齙龑儺儹劘劗囃嚽嚾孈孇巋巏廱懽攛欂櫼欃櫸欀灃灄灊灈灉灅灆爝爚爙獾甗癪矐礭礱礯籔籓糲纊纇纈纋纆纍罍羻耰臝蘘蘪蘦蘟蘣蘜蘙蘧蘮蘡蘠蘩蘞蘥"],["f640","蠩蠝蠛蠠蠤蠜蠫衊襭襩襮襫觺譹譸譅譺譻贐贔趯躎躌轞轛轝酆酄酅醹鐿鐻鐶鐩鐽鐼鐰鐹鐪鐷鐬鑀鐱闥闤闣霵霺鞿韡顤飉飆飀饘饖騹騽驆驄驂驁騺"],["f6a1","騿髍鬕鬗鬘鬖鬺魒鰫鰝鰜鰬鰣鰨鰩鰤鰡鶷鶶鶼鷁鷇鷊鷏鶾鷅鷃鶻鶵鷎鶹鶺鶬鷈鶱鶭鷌鶳鷍鶲鹺麜黫黮黭鼛鼘鼚鼱齎齥齤龒亹囆囅囋奱孋孌巕巑廲攡攠攦攢欋欈欉氍灕灖灗灒爞爟犩獿瓘瓕瓙瓗癭皭礵禴穰穱籗籜籙籛籚"],["f740","糴糱纑罏羇臞艫蘴蘵蘳蘬蘲蘶蠬蠨蠦蠪蠥襱覿覾觻譾讄讂讆讅譿贕躕躔躚躒躐躖躗轠轢酇鑌鑐鑊鑋鑏鑇鑅鑈鑉鑆霿韣顪顩飋饔饛驎驓驔驌驏驈驊"],["f7a1","驉驒驐髐鬙鬫鬻魖魕鱆鱈鰿鱄鰹鰳鱁鰼鰷鰴鰲鰽鰶鷛鷒鷞鷚鷋鷐鷜鷑鷟鷩鷙鷘鷖鷵鷕鷝麶黰鼵鼳鼲齂齫龕龢儽劙壨壧奲孍巘蠯彏戁戃戄攩攥斖曫欑欒欏毊灛灚爢玂玁玃癰矔籧籦纕艬蘺虀蘹蘼蘱蘻蘾蠰蠲蠮蠳襶襴襳觾"],["f840","讌讎讋讈豅贙躘轤轣醼鑢鑕鑝鑗鑞韄韅頀驖驙鬞鬟鬠鱒鱘鱐鱊鱍鱋鱕鱙鱌鱎鷻鷷鷯鷣鷫鷸鷤鷶鷡鷮鷦鷲鷰鷢鷬鷴鷳鷨鷭黂黐黲黳鼆鼜鼸鼷鼶齃齏"],["f8a1","齱齰齮齯囓囍孎屭攭曭曮欓灟灡灝灠爣瓛瓥矕礸禷禶籪纗羉艭虃蠸蠷蠵衋讔讕躞躟躠躝醾醽釂鑫鑨鑩雥靆靃靇韇韥驞髕魙鱣鱧鱦鱢鱞鱠鸂鷾鸇鸃鸆鸅鸀鸁鸉鷿鷽鸄麠鼞齆齴齵齶囔攮斸欘欙欗欚灢爦犪矘矙礹籩籫糶纚"],["f940","纘纛纙臠臡虆虇虈襹襺襼襻觿讘讙躥躤躣鑮鑭鑯鑱鑳靉顲饟鱨鱮鱭鸋鸍鸐鸏鸒鸑麡黵鼉齇齸齻齺齹圞灦籯蠼趲躦釃鑴鑸鑶鑵驠鱴鱳鱱鱵鸔鸓黶鼊"],["f9a1","龤灨灥糷虪蠾蠽蠿讞貜躩軉靋顳顴飌饡馫驤驦驧鬤鸕鸗齈戇欞爧虌躨钂钀钁驩驨鬮鸙爩虋讟钃鱹麷癵驫鱺鸝灩灪麤齾齉龘碁銹裏墻恒粧嫺╔╦╗╠╬╣╚╩╝╒╤╕╞╪╡╘╧╛╓╥╖╟╫╢╙╨╜║═╭╮╰╯▓"]]
+
+/***/ }),
+/* 396 */
+/***/ (function(module, exports) {
+
+module.exports = [["a140","",62],["a180","",32],["a240","",62],["a280","",32],["a2ab","",5],["a2e3","€"],["a2ef",""],["a2fd",""],["a340","",62],["a380","",31,"　"],["a440","",62],["a480","",32],["a4f4","",10],["a540","",62],["a580","",32],["a5f7","",7],["a640","",62],["a680","",32],["a6b9","",7],["a6d9","",6],["a6ec",""],["a6f3",""],["a6f6","",8],["a740","",62],["a780","",32],["a7c2","",14],["a7f2","",12],["a896","",10],["a8bc",""],["a8bf","ǹ"],["a8c1",""],["a8ea","",20],["a958",""],["a95b",""],["a95d",""],["a989","〾⿰",11],["a997","",12],["a9f0","",14],["aaa1","",93],["aba1","",93],["aca1","",93],["ada1","",93],["aea1","",93],["afa1","",93],["d7fa","",4],["f8a1","",93],["f9a1","",93],["faa1","",93],["fba1","",93],["fca1","",93],["fda1","",93],["fe50","⺁⺄㑳㑇⺈⺋㖞㘚㘎⺌⺗㥮㤘㧏㧟㩳㧐㭎㱮㳠⺧⺪䁖䅟⺮䌷⺳⺶⺷䎱䎬⺻䏝䓖䙡䙌"],["fe80","䜣䜩䝼䞍⻊䥇䥺䥽䦂䦃䦅䦆䦟䦛䦷䦶䲣䲟䲠䲡䱷䲢䴓",6,"䶮",93]]
+
+/***/ }),
+/* 397 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+module.exports = __webpack_require__(601).isCI
+
+
+/***/ }),
+/* 398 */
+/***/ (function(module, exports) {
+
+var toString = {}.toString;
+
+module.exports = Array.isArray || function (arr) {
+  return toString.call(arr) == '[object Array]';
+};
+
+
+/***/ }),
+/* 399 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var stream = __webpack_require__(23)
+
+
+function isStream (obj) {
+  return obj instanceof stream.Stream
+}
+
+
+function isReadable (obj) {
+  return isStream(obj) && typeof obj._read == 'function' && typeof obj._readableState == 'object'
+}
+
+
+function isWritable (obj) {
+  return isStream(obj) && typeof obj._write == 'function' && typeof obj._writableState == 'object'
+}
+
+
+function isDuplex (obj) {
+  return isReadable(obj) && isWritable(obj)
+}
+
+
+module.exports            = isStream
+module.exports.isReadable = isReadable
+module.exports.isWritable = isWritable
+module.exports.isDuplex   = isDuplex
+
+
+/***/ }),
+/* 400 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*!
+ * mime-types
+ * Copyright(c) 2014 Jonathan Ong
+ * Copyright(c) 2015 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+
+
+/**
+ * Module dependencies.
+ * @private
+ */
+
+var db = __webpack_require__(759)
+var extname = __webpack_require__(0).extname
+
+/**
+ * Module variables.
+ * @private
+ */
+
+var EXTRACT_TYPE_REGEXP = /^\s*([^;\s]*)(?:;|\s|$)/
+var TEXT_TYPE_REGEXP = /^text\//i
+
+/**
+ * Module exports.
+ * @public
+ */
+
+exports.charset = charset
+exports.charsets = { lookup: charset }
+exports.contentType = contentType
+exports.extension = extension
+exports.extensions = Object.create(null)
+exports.lookup = lookup
+exports.types = Object.create(null)
+
+// Populate the extensions/types maps
+populateMaps(exports.extensions, exports.types)
+
+/**
+ * Get the default charset for a MIME type.
+ *
+ * @param {string} type
+ * @return {boolean|string}
+ */
+
+function charset (type) {
+  if (!type || typeof type !== 'string') {
+    return false
+  }
+
+  // TODO: use media-typer
+  var match = EXTRACT_TYPE_REGEXP.exec(type)
+  var mime = match && db[match[1].toLowerCase()]
+
+  if (mime && mime.charset) {
+    return mime.charset
+  }
+
+  // default text/* to utf-8
+  if (match && TEXT_TYPE_REGEXP.test(match[1])) {
+    return 'UTF-8'
+  }
+
+  return false
+}
+
+/**
+ * Create a full Content-Type header given a MIME type or extension.
+ *
+ * @param {string} str
+ * @return {boolean|string}
+ */
+
+function contentType (str) {
+  // TODO: should this even be in this module?
+  if (!str || typeof str !== 'string') {
+    return false
+  }
+
+  var mime = str.indexOf('/') === -1
+    ? exports.lookup(str)
+    : str
+
+  if (!mime) {
+    return false
+  }
+
+  // TODO: use content-type or other module
+  if (mime.indexOf('charset') === -1) {
+    var charset = exports.charset(mime)
+    if (charset) mime += '; charset=' + charset.toLowerCase()
+  }
+
+  return mime
+}
+
+/**
+ * Get the default extension for a MIME type.
+ *
+ * @param {string} type
+ * @return {boolean|string}
+ */
+
+function extension (type) {
+  if (!type || typeof type !== 'string') {
+    return false
+  }
+
+  // TODO: use media-typer
+  var match = EXTRACT_TYPE_REGEXP.exec(type)
+
+  // get extensions
+  var exts = match && exports.extensions[match[1].toLowerCase()]
+
+  if (!exts || !exts.length) {
+    return false
+  }
+
+  return exts[0]
+}
+
+/**
+ * Lookup the MIME type for a file path/extension.
+ *
+ * @param {string} path
+ * @return {boolean|string}
+ */
+
+function lookup (path) {
+  if (!path || typeof path !== 'string') {
+    return false
+  }
+
+  // get the extension ("ext" or ".ext" or full path)
+  var extension = extname('x.' + path)
+    .toLowerCase()
+    .substr(1)
+
+  if (!extension) {
+    return false
+  }
+
+  return exports.types[extension] || false
+}
+
+/**
+ * Populate the extensions and types maps.
+ * @private
+ */
+
+function populateMaps (extensions, types) {
+  // source preference (least -> most)
+  var preference = ['nginx', 'apache', undefined, 'iana']
+
+  Object.keys(db).forEach(function forEachMimeType (type) {
+    var mime = db[type]
+    var exts = mime.extensions
+
+    if (!exts || !exts.length) {
+      return
+    }
+
+    // mime -> extensions
+    extensions[type] = exts
+
+    // extension -> mime
+    for (var i = 0; i < exts.length; i++) {
+      var extension = exts[i]
+
+      if (types[extension]) {
+        var from = preference.indexOf(db[types[extension]].source)
+        var to = preference.indexOf(mime.source)
+
+        if (types[extension] !== 'application/octet-stream' &&
+          (from > to || (from === to && types[extension].substr(0, 12) === 'application/'))) {
+          // skip the remapping
+          continue
+        }
+      }
+
+      // set the extension -> mime
+      types[extension] = type
+    }
+  })
+}
+
+
+/***/ }),
+/* 401 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var Stream = __webpack_require__(23)
+
+module.exports = MuteStream
+
+// var out = new MuteStream(process.stdout)
+// argument auto-pipes
+function MuteStream (opts) {
+  Stream.apply(this)
+  opts = opts || {}
+  this.writable = this.readable = true
+  this.muted = false
+  this.on('pipe', this._onpipe)
+  this.replace = opts.replace
+
+  // For readline-type situations
+  // This much at the start of a line being redrawn after a ctrl char
+  // is seen (such as backspace) won't be redrawn as the replacement
+  this._prompt = opts.prompt || null
+  this._hadControl = false
+}
+
+MuteStream.prototype = Object.create(Stream.prototype)
+
+Object.defineProperty(MuteStream.prototype, 'constructor', {
+  value: MuteStream,
+  enumerable: false
+})
+
+MuteStream.prototype.mute = function () {
+  this.muted = true
+}
+
+MuteStream.prototype.unmute = function () {
+  this.muted = false
+}
+
+Object.defineProperty(MuteStream.prototype, '_onpipe', {
+  value: onPipe,
+  enumerable: false,
+  writable: true,
+  configurable: true
+})
+
+function onPipe (src) {
+  this._src = src
+}
+
+Object.defineProperty(MuteStream.prototype, 'isTTY', {
+  get: getIsTTY,
+  set: setIsTTY,
+  enumerable: true,
+  configurable: true
+})
+
+function getIsTTY () {
+  return( (this._dest) ? this._dest.isTTY
+        : (this._src) ? this._src.isTTY
+        : false
+        )
+}
+
+// basically just get replace the getter/setter with a regular value
+function setIsTTY (isTTY) {
+  Object.defineProperty(this, 'isTTY', {
+    value: isTTY,
+    enumerable: true,
+    writable: true,
+    configurable: true
+  })
+}
+
+Object.defineProperty(MuteStream.prototype, 'rows', {
+  get: function () {
+    return( this._dest ? this._dest.rows
+          : this._src ? this._src.rows
+          : undefined )
+  }, enumerable: true, configurable: true })
+
+Object.defineProperty(MuteStream.prototype, 'columns', {
+  get: function () {
+    return( this._dest ? this._dest.columns
+          : this._src ? this._src.columns
+          : undefined )
+  }, enumerable: true, configurable: true })
+
+
+MuteStream.prototype.pipe = function (dest, options) {
+  this._dest = dest
+  return Stream.prototype.pipe.call(this, dest, options)
+}
+
+MuteStream.prototype.pause = function () {
+  if (this._src) return this._src.pause()
+}
+
+MuteStream.prototype.resume = function () {
+  if (this._src) return this._src.resume()
+}
+
+MuteStream.prototype.write = function (c) {
+  if (this.muted) {
+    if (!this.replace) return true
+    if (c.match(/^\u001b/)) {
+      if(c.indexOf(this._prompt) === 0) {
+        c = c.substr(this._prompt.length);
+        c = c.replace(/./g, this.replace);
+        c = this._prompt + c;
+      }
+      this._hadControl = true
+      return this.emit('data', c)
+    } else {
+      if (this._prompt && this._hadControl &&
+          c.indexOf(this._prompt) === 0) {
+        this._hadControl = false
+        this.emit('data', this._prompt)
+        c = c.substr(this._prompt.length)
+      }
+      c = c.toString().replace(/./g, this.replace)
+    }
+  }
+  this.emit('data', c)
+}
+
+MuteStream.prototype.end = function (c) {
+  if (this.muted) {
+    if (c && this.replace) {
+      c = c.toString().replace(/./g, this.replace)
+    } else {
+      c = null
+    }
+  }
+  if (c) this.emit('data', c)
+  this.emit('end')
+}
+
+function proxy (fn) { return function () {
+  var d = this._dest
+  var s = this._src
+  if (d && d[fn]) d[fn].apply(d, arguments)
+  if (s && s[fn]) s[fn].apply(s, arguments)
+}}
+
+MuteStream.prototype.destroy = proxy('destroy')
+MuteStream.prototype.destroySoon = proxy('destroySoon')
+MuteStream.prototype.close = proxy('close')
+
+
+/***/ }),
+/* 402 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+const url = __webpack_require__(24);
+const punycode = __webpack_require__(332);
+const queryString = __webpack_require__(786);
+const prependHttp = __webpack_require__(777);
+const sortKeys = __webpack_require__(934);
+
+const DEFAULT_PORTS = {
+	'http:': 80,
+	'https:': 443,
+	'ftp:': 21
+};
+
+// Protocols that always contain a `//`` bit
+const slashedProtocol = {
+	http: true,
+	https: true,
+	ftp: true,
+	gopher: true,
+	file: true,
+	'http:': true,
+	'https:': true,
+	'ftp:': true,
+	'gopher:': true,
+	'file:': true
+};
+
+function testParameter(name, filters) {
+	return filters.some(filter => filter instanceof RegExp ? filter.test(name) : filter === name);
+}
+
+module.exports = (str, opts) => {
+	opts = Object.assign({
+		normalizeProtocol: true,
+		normalizeHttps: false,
+		stripFragment: true,
+		stripWWW: true,
+		removeQueryParameters: [/^utm_\w+/i],
+		removeTrailingSlash: true,
+		removeDirectoryIndex: false,
+		sortQueryParameters: true
+	}, opts);
+
+	if (typeof str !== 'string') {
+		throw new TypeError('Expected a string');
+	}
+
+	const hasRelativeProtocol = str.startsWith('//');
+
+	// Prepend protocol
+	str = prependHttp(str.trim()).replace(/^\/\//, 'http://');
+
+	const urlObj = url.parse(str);
+
+	if (opts.normalizeHttps && urlObj.protocol === 'https:') {
+		urlObj.protocol = 'http:';
+	}
+
+	if (!urlObj.hostname && !urlObj.pathname) {
+		throw new Error('Invalid URL');
+	}
+
+	// Prevent these from being used by `url.format`
+	delete urlObj.host;
+	delete urlObj.query;
+
+	// Remove fragment
+	if (opts.stripFragment) {
+		delete urlObj.hash;
+	}
+
+	// Remove default port
+	const port = DEFAULT_PORTS[urlObj.protocol];
+	if (Number(urlObj.port) === port) {
+		delete urlObj.port;
+	}
+
+	// Remove duplicate slashes
+	if (urlObj.pathname) {
+		urlObj.pathname = urlObj.pathname.replace(/\/{2,}/g, '/');
+	}
+
+	// Decode URI octets
+	if (urlObj.pathname) {
+		urlObj.pathname = decodeURI(urlObj.pathname);
+	}
+
+	// Remove directory index
+	if (opts.removeDirectoryIndex === true) {
+		opts.removeDirectoryIndex = [/^index\.[a-z]+$/];
+	}
+
+	if (Array.isArray(opts.removeDirectoryIndex) && opts.removeDirectoryIndex.length > 0) {
+		let pathComponents = urlObj.pathname.split('/');
+		const lastComponent = pathComponents[pathComponents.length - 1];
+
+		if (testParameter(lastComponent, opts.removeDirectoryIndex)) {
+			pathComponents = pathComponents.slice(0, pathComponents.length - 1);
+			urlObj.pathname = pathComponents.slice(1).join('/') + '/';
+		}
+	}
+
+	// Resolve relative paths, but only for slashed protocols
+	if (slashedProtocol[urlObj.protocol]) {
+		const domain = urlObj.protocol + '//' + urlObj.hostname;
+		const relative = url.resolve(domain, urlObj.pathname);
+		urlObj.pathname = relative.replace(domain, '');
+	}
+
+	if (urlObj.hostname) {
+		// IDN to Unicode
+		urlObj.hostname = punycode.toUnicode(urlObj.hostname).toLowerCase();
+
+		// Remove trailing dot
+		urlObj.hostname = urlObj.hostname.replace(/\.$/, '');
+
+		// Remove `www.`
+		if (opts.stripWWW) {
+			urlObj.hostname = urlObj.hostname.replace(/^www\./, '');
+		}
+	}
+
+	// Remove URL with empty query string
+	if (urlObj.search === '?') {
+		delete urlObj.search;
+	}
+
+	const queryParameters = queryString.parse(urlObj.search);
+
+	// Remove query unwanted parameters
+	if (Array.isArray(opts.removeQueryParameters)) {
+		for (const key in queryParameters) {
+			if (testParameter(key, opts.removeQueryParameters)) {
+				delete queryParameters[key];
+			}
+		}
+	}
+
+	// Sort query parameters
+	if (opts.sortQueryParameters) {
+		urlObj.search = queryString.stringify(sortKeys(queryParameters));
+	}
+
+	// Decode query parameters
+	if (urlObj.search !== null) {
+		urlObj.search = decodeURIComponent(urlObj.search);
+	}
+
+	// Take advantage of many of the Node `url` normalizations
+	str = url.format(urlObj);
+
+	// Remove ending `/`
+	if (opts.removeTrailingSlash || urlObj.pathname === '/') {
+		str = str.replace(/\/$/, '');
+	}
+
+	// Restore relative protocol, if applicable
+	if (hasRelativeProtocol && !opts.normalizeProtocol) {
+		str = str.replace(/^http:\/\//, '//');
+	}
+
+	return str;
+};
+
+
+/***/ }),
+/* 403 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var replace = String.prototype.replace;
+var percentTwenties = /%20/g;
+
+module.exports = {
+    'default': 'RFC3986',
+    formatters: {
+        RFC1738: function (value) {
+            return replace.call(value, percentTwenties, '+');
+        },
+        RFC3986: function (value) {
+            return value;
+        }
+    },
+    RFC1738: 'RFC1738',
+    RFC3986: 'RFC3986'
+};
+
+
+/***/ }),
+/* 404 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var stringify = __webpack_require__(785);
+var parse = __webpack_require__(784);
+var formats = __webpack_require__(403);
+
+module.exports = {
+    formats: formats,
+    parse: parse,
+    stringify: stringify
+};
+
+
+/***/ }),
+/* 405 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var has = Object.prototype.hasOwnProperty;
+
+var hexTable = (function () {
+    var array = [];
+    for (var i = 0; i < 256; ++i) {
+        array.push('%' + ((i < 16 ? '0' : '') + i.toString(16)).toUpperCase());
+    }
+
+    return array;
+}());
+
+var compactQueue = function compactQueue(queue) {
+    var obj;
+
+    while (queue.length) {
+        var item = queue.pop();
+        obj = item.obj[item.prop];
+
+        if (Array.isArray(obj)) {
+            var compacted = [];
+
+            for (var j = 0; j < obj.length; ++j) {
+                if (typeof obj[j] !== 'undefined') {
+                    compacted.push(obj[j]);
+                }
+            }
+
+            item.obj[item.prop] = compacted;
+        }
+    }
+
+    return obj;
+};
+
+var arrayToObject = function arrayToObject(source, options) {
+    var obj = options && options.plainObjects ? Object.create(null) : {};
+    for (var i = 0; i < source.length; ++i) {
+        if (typeof source[i] !== 'undefined') {
+            obj[i] = source[i];
+        }
+    }
+
+    return obj;
+};
+
+var merge = function merge(target, source, options) {
+    if (!source) {
+        return target;
+    }
+
+    if (typeof source !== 'object') {
+        if (Array.isArray(target)) {
+            target.push(source);
+        } else if (typeof target === 'object') {
+            if (options.plainObjects || options.allowPrototypes || !has.call(Object.prototype, source)) {
+                target[source] = true;
+            }
+        } else {
+            return [target, source];
+        }
+
+        return target;
+    }
+
+    if (typeof target !== 'object') {
+        return [target].concat(source);
+    }
+
+    var mergeTarget = target;
+    if (Array.isArray(target) && !Array.isArray(source)) {
+        mergeTarget = arrayToObject(target, options);
+    }
+
+    if (Array.isArray(target) && Array.isArray(source)) {
+        source.forEach(function (item, i) {
+            if (has.call(target, i)) {
+                if (target[i] && typeof target[i] === 'object') {
+                    target[i] = merge(target[i], item, options);
+                } else {
+                    target.push(item);
+                }
+            } else {
+                target[i] = item;
+            }
+        });
+        return target;
+    }
+
+    return Object.keys(source).reduce(function (acc, key) {
+        var value = source[key];
+
+        if (has.call(acc, key)) {
+            acc[key] = merge(acc[key], value, options);
+        } else {
+            acc[key] = value;
+        }
+        return acc;
+    }, mergeTarget);
+};
+
+var assign = function assignSingleSource(target, source) {
+    return Object.keys(source).reduce(function (acc, key) {
+        acc[key] = source[key];
+        return acc;
+    }, target);
+};
+
+var decode = function (str) {
+    try {
+        return decodeURIComponent(str.replace(/\+/g, ' '));
+    } catch (e) {
+        return str;
+    }
+};
+
+var encode = function encode(str) {
+    // This code was originally written by Brian White (mscdex) for the io.js core querystring library.
+    // It has been adapted here for stricter adherence to RFC 3986
+    if (str.length === 0) {
+        return str;
+    }
+
+    var string = typeof str === 'string' ? str : String(str);
+
+    var out = '';
+    for (var i = 0; i < string.length; ++i) {
+        var c = string.charCodeAt(i);
+
+        if (
+            c === 0x2D // -
+            || c === 0x2E // .
+            || c === 0x5F // _
+            || c === 0x7E // ~
+            || (c >= 0x30 && c <= 0x39) // 0-9
+            || (c >= 0x41 && c <= 0x5A) // a-z
+            || (c >= 0x61 && c <= 0x7A) // A-Z
+        ) {
+            out += string.charAt(i);
+            continue;
+        }
+
+        if (c < 0x80) {
+            out = out + hexTable[c];
+            continue;
+        }
+
+        if (c < 0x800) {
+            out = out + (hexTable[0xC0 | (c >> 6)] + hexTable[0x80 | (c & 0x3F)]);
+            continue;
+        }
+
+        if (c < 0xD800 || c >= 0xE000) {
+            out = out + (hexTable[0xE0 | (c >> 12)] + hexTable[0x80 | ((c >> 6) & 0x3F)] + hexTable[0x80 | (c & 0x3F)]);
+            continue;
+        }
+
+        i += 1;
+        c = 0x10000 + (((c & 0x3FF) << 10) | (string.charCodeAt(i) & 0x3FF));
+        out += hexTable[0xF0 | (c >> 18)]
+            + hexTable[0x80 | ((c >> 12) & 0x3F)]
+            + hexTable[0x80 | ((c >> 6) & 0x3F)]
+            + hexTable[0x80 | (c & 0x3F)];
+    }
+
+    return out;
+};
+
+var compact = function compact(value) {
+    var queue = [{ obj: { o: value }, prop: 'o' }];
+    var refs = [];
+
+    for (var i = 0; i < queue.length; ++i) {
+        var item = queue[i];
+        var obj = item.obj[item.prop];
+
+        var keys = Object.keys(obj);
+        for (var j = 0; j < keys.length; ++j) {
+            var key = keys[j];
+            var val = obj[key];
+            if (typeof val === 'object' && val !== null && refs.indexOf(val) === -1) {
+                queue.push({ obj: obj, prop: key });
+                refs.push(val);
+            }
+        }
+    }
+
+    return compactQueue(queue);
+};
+
+var isRegExp = function isRegExp(obj) {
+    return Object.prototype.toString.call(obj) === '[object RegExp]';
+};
+
+var isBuffer = function isBuffer(obj) {
+    if (obj === null || typeof obj === 'undefined') {
+        return false;
+    }
+
+    return !!(obj.constructor && obj.constructor.isBuffer && obj.constructor.isBuffer(obj));
+};
+
+module.exports = {
+    arrayToObject: arrayToObject,
+    assign: assign,
+    compact: compact,
+    decode: decode,
+    encode: encode,
+    isBuffer: isBuffer,
+    isRegExp: isRegExp,
+    merge: merge
+};
+
+
+/***/ }),
+/* 406 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+
+/*<replacement>*/
+
+var pna = __webpack_require__(180);
+/*</replacement>*/
+
+module.exports = Readable;
+
+/*<replacement>*/
+var isArray = __webpack_require__(398);
+/*</replacement>*/
+
+/*<replacement>*/
+var Duplex;
+/*</replacement>*/
+
+Readable.ReadableState = ReadableState;
+
+/*<replacement>*/
+var EE = __webpack_require__(77).EventEmitter;
+
+var EElistenerCount = function (emitter, type) {
+  return emitter.listeners(type).length;
+};
+/*</replacement>*/
+
+/*<replacement>*/
+var Stream = __webpack_require__(410);
+/*</replacement>*/
+
+/*<replacement>*/
+
+var Buffer = __webpack_require__(45).Buffer;
+var OurUint8Array = global.Uint8Array || function () {};
+function _uint8ArrayToBuffer(chunk) {
+  return Buffer.from(chunk);
+}
+function _isUint8Array(obj) {
+  return Buffer.isBuffer(obj) || obj instanceof OurUint8Array;
+}
+
+/*</replacement>*/
+
+/*<replacement>*/
+var util = __webpack_require__(113);
+util.inherits = __webpack_require__(61);
+/*</replacement>*/
+
+/*<replacement>*/
+var debugUtil = __webpack_require__(3);
+var debug = void 0;
+if (debugUtil && debugUtil.debuglog) {
+  debug = debugUtil.debuglog('stream');
+} else {
+  debug = function () {};
+}
+/*</replacement>*/
+
+var BufferList = __webpack_require__(793);
+var destroyImpl = __webpack_require__(409);
+var StringDecoder;
+
+util.inherits(Readable, Stream);
+
+var kProxyEvents = ['error', 'close', 'destroy', 'pause', 'resume'];
+
+function prependListener(emitter, event, fn) {
+  // Sadly this is not cacheable as some libraries bundle their own
+  // event emitter implementation with them.
+  if (typeof emitter.prependListener === 'function') return emitter.prependListener(event, fn);
+
+  // This is a hack to make sure that our error handler is attached before any
+  // userland ones.  NEVER DO THIS. This is here only because this code needs
+  // to continue to work with older versions of Node.js that do not include
+  // the prependListener() method. The goal is to eventually remove this hack.
+  if (!emitter._events || !emitter._events[event]) emitter.on(event, fn);else if (isArray(emitter._events[event])) emitter._events[event].unshift(fn);else emitter._events[event] = [fn, emitter._events[event]];
+}
+
+function ReadableState(options, stream) {
+  Duplex = Duplex || __webpack_require__(115);
+
+  options = options || {};
+
+  // Duplex streams are both readable and writable, but share
+  // the same options object.
+  // However, some cases require setting options to different
+  // values for the readable and the writable sides of the duplex stream.
+  // These options can be provided separately as readableXXX and writableXXX.
+  var isDuplex = stream instanceof Duplex;
+
+  // object stream flag. Used to make read(n) ignore n and to
+  // make all the buffer merging and length checks go away
+  this.objectMode = !!options.objectMode;
+
+  if (isDuplex) this.objectMode = this.objectMode || !!options.readableObjectMode;
+
+  // the point at which it stops calling _read() to fill the buffer
+  // Note: 0 is a valid value, means "don't call _read preemptively ever"
+  var hwm = options.highWaterMark;
+  var readableHwm = options.readableHighWaterMark;
+  var defaultHwm = this.objectMode ? 16 : 16 * 1024;
+
+  if (hwm || hwm === 0) this.highWaterMark = hwm;else if (isDuplex && (readableHwm || readableHwm === 0)) this.highWaterMark = readableHwm;else this.highWaterMark = defaultHwm;
+
+  // cast to ints.
+  this.highWaterMark = Math.floor(this.highWaterMark);
+
+  // A linked list is used to store data chunks instead of an array because the
+  // linked list can remove elements from the beginning faster than
+  // array.shift()
+  this.buffer = new BufferList();
+  this.length = 0;
+  this.pipes = null;
+  this.pipesCount = 0;
+  this.flowing = null;
+  this.ended = false;
+  this.endEmitted = false;
+  this.reading = false;
+
+  // a flag to be able to tell if the event 'readable'/'data' is emitted
+  // immediately, or on a later tick.  We set this to true at first, because
+  // any actions that shouldn't happen until "later" should generally also
+  // not happen before the first read call.
+  this.sync = true;
+
+  // whenever we return null, then we set a flag to say
+  // that we're awaiting a 'readable' event emission.
+  this.needReadable = false;
+  this.emittedReadable = false;
+  this.readableListening = false;
+  this.resumeScheduled = false;
+
+  // has it been destroyed
+  this.destroyed = false;
+
+  // Crypto is kind of old and crusty.  Historically, its default string
+  // encoding is 'binary' so we have to make this configurable.
+  // Everything else in the universe uses 'utf8', though.
+  this.defaultEncoding = options.defaultEncoding || 'utf8';
+
+  // the number of writers that are awaiting a drain event in .pipe()s
+  this.awaitDrain = 0;
+
+  // if true, a maybeReadMore has been scheduled
+  this.readingMore = false;
+
+  this.decoder = null;
+  this.encoding = null;
+  if (options.encoding) {
+    if (!StringDecoder) StringDecoder = __webpack_require__(458).StringDecoder;
+    this.decoder = new StringDecoder(options.encoding);
+    this.encoding = options.encoding;
+  }
+}
+
+function Readable(options) {
+  Duplex = Duplex || __webpack_require__(115);
+
+  if (!(this instanceof Readable)) return new Readable(options);
+
+  this._readableState = new ReadableState(options, this);
+
+  // legacy
+  this.readable = true;
+
+  if (options) {
+    if (typeof options.read === 'function') this._read = options.read;
+
+    if (typeof options.destroy === 'function') this._destroy = options.destroy;
+  }
+
+  Stream.call(this);
+}
+
+Object.defineProperty(Readable.prototype, 'destroyed', {
+  get: function () {
+    if (this._readableState === undefined) {
+      return false;
+    }
+    return this._readableState.destroyed;
+  },
+  set: function (value) {
+    // we ignore the value if the stream
+    // has not been initialized yet
+    if (!this._readableState) {
+      return;
+    }
+
+    // backward compatibility, the user is explicitly
+    // managing destroyed
+    this._readableState.destroyed = value;
+  }
+});
+
+Readable.prototype.destroy = destroyImpl.destroy;
+Readable.prototype._undestroy = destroyImpl.undestroy;
+Readable.prototype._destroy = function (err, cb) {
+  this.push(null);
+  cb(err);
+};
+
+// Manually shove something into the read() buffer.
+// This returns true if the highWaterMark has not been hit yet,
+// similar to how Writable.write() returns true if you should
+// write() some more.
+Readable.prototype.push = function (chunk, encoding) {
+  var state = this._readableState;
+  var skipChunkCheck;
+
+  if (!state.objectMode) {
+    if (typeof chunk === 'string') {
+      encoding = encoding || state.defaultEncoding;
+      if (encoding !== state.encoding) {
+        chunk = Buffer.from(chunk, encoding);
+        encoding = '';
+      }
+      skipChunkCheck = true;
+    }
+  } else {
+    skipChunkCheck = true;
+  }
+
+  return readableAddChunk(this, chunk, encoding, false, skipChunkCheck);
+};
+
+// Unshift should *always* be something directly out of read()
+Readable.prototype.unshift = function (chunk) {
+  return readableAddChunk(this, chunk, null, true, false);
+};
+
+function readableAddChunk(stream, chunk, encoding, addToFront, skipChunkCheck) {
+  var state = stream._readableState;
+  if (chunk === null) {
+    state.reading = false;
+    onEofChunk(stream, state);
+  } else {
+    var er;
+    if (!skipChunkCheck) er = chunkInvalid(state, chunk);
+    if (er) {
+      stream.emit('error', er);
+    } else if (state.objectMode || chunk && chunk.length > 0) {
+      if (typeof chunk !== 'string' && !state.objectMode && Object.getPrototypeOf(chunk) !== Buffer.prototype) {
+        chunk = _uint8ArrayToBuffer(chunk);
+      }
+
+      if (addToFront) {
+        if (state.endEmitted) stream.emit('error', new Error('stream.unshift() after end event'));else addChunk(stream, state, chunk, true);
+      } else if (state.ended) {
+        stream.emit('error', new Error('stream.push() after EOF'));
+      } else {
+        state.reading = false;
+        if (state.decoder && !encoding) {
+          chunk = state.decoder.write(chunk);
+          if (state.objectMode || chunk.length !== 0) addChunk(stream, state, chunk, false);else maybeReadMore(stream, state);
+        } else {
+          addChunk(stream, state, chunk, false);
+        }
+      }
+    } else if (!addToFront) {
+      state.reading = false;
+    }
+  }
+
+  return needMoreData(state);
+}
+
+function addChunk(stream, state, chunk, addToFront) {
+  if (state.flowing && state.length === 0 && !state.sync) {
+    stream.emit('data', chunk);
+    stream.read(0);
+  } else {
+    // update the buffer info.
+    state.length += state.objectMode ? 1 : chunk.length;
+    if (addToFront) state.buffer.unshift(chunk);else state.buffer.push(chunk);
+
+    if (state.needReadable) emitReadable(stream);
+  }
+  maybeReadMore(stream, state);
+}
+
+function chunkInvalid(state, chunk) {
+  var er;
+  if (!_isUint8Array(chunk) && typeof chunk !== 'string' && chunk !== undefined && !state.objectMode) {
+    er = new TypeError('Invalid non-string/buffer chunk');
+  }
+  return er;
+}
+
+// if it's past the high water mark, we can push in some more.
+// Also, if we have no data yet, we can stand some
+// more bytes.  This is to work around cases where hwm=0,
+// such as the repl.  Also, if the push() triggered a
+// readable event, and the user called read(largeNumber) such that
+// needReadable was set, then we ought to push more, so that another
+// 'readable' event will be triggered.
+function needMoreData(state) {
+  return !state.ended && (state.needReadable || state.length < state.highWaterMark || state.length === 0);
+}
+
+Readable.prototype.isPaused = function () {
+  return this._readableState.flowing === false;
+};
+
+// backwards compatibility.
+Readable.prototype.setEncoding = function (enc) {
+  if (!StringDecoder) StringDecoder = __webpack_require__(458).StringDecoder;
+  this._readableState.decoder = new StringDecoder(enc);
+  this._readableState.encoding = enc;
+  return this;
+};
+
+// Don't raise the hwm > 8MB
+var MAX_HWM = 0x800000;
+function computeNewHighWaterMark(n) {
+  if (n >= MAX_HWM) {
+    n = MAX_HWM;
+  } else {
+    // Get the next highest power of 2 to prevent increasing hwm excessively in
+    // tiny amounts
+    n--;
+    n |= n >>> 1;
+    n |= n >>> 2;
+    n |= n >>> 4;
+    n |= n >>> 8;
+    n |= n >>> 16;
+    n++;
+  }
+  return n;
+}
+
+// This function is designed to be inlinable, so please take care when making
+// changes to the function body.
+function howMuchToRead(n, state) {
+  if (n <= 0 || state.length === 0 && state.ended) return 0;
+  if (state.objectMode) return 1;
+  if (n !== n) {
+    // Only flow one buffer at a time
+    if (state.flowing && state.length) return state.buffer.head.data.length;else return state.length;
+  }
+  // If we're asking for more than the current hwm, then raise the hwm.
+  if (n > state.highWaterMark) state.highWaterMark = computeNewHighWaterMark(n);
+  if (n <= state.length) return n;
+  // Don't have enough
+  if (!state.ended) {
+    state.needReadable = true;
+    return 0;
+  }
+  return state.length;
+}
+
+// you can override either this method, or the async _read(n) below.
+Readable.prototype.read = function (n) {
+  debug('read', n);
+  n = parseInt(n, 10);
+  var state = this._readableState;
+  var nOrig = n;
+
+  if (n !== 0) state.emittedReadable = false;
+
+  // if we're doing read(0) to trigger a readable event, but we
+  // already have a bunch of data in the buffer, then just trigger
+  // the 'readable' event and move on.
+  if (n === 0 && state.needReadable && (state.length >= state.highWaterMark || state.ended)) {
+    debug('read: emitReadable', state.length, state.ended);
+    if (state.length === 0 && state.ended) endReadable(this);else emitReadable(this);
+    return null;
+  }
+
+  n = howMuchToRead(n, state);
+
+  // if we've ended, and we're now clear, then finish it up.
+  if (n === 0 && state.ended) {
+    if (state.length === 0) endReadable(this);
+    return null;
+  }
+
+  // All the actual chunk generation logic needs to be
+  // *below* the call to _read.  The reason is that in certain
+  // synthetic stream cases, such as passthrough streams, _read
+  // may be a completely synchronous operation which may change
+  // the state of the read buffer, providing enough data when
+  // before there was *not* enough.
+  //
+  // So, the steps are:
+  // 1. Figure out what the state of things will be after we do
+  // a read from the buffer.
+  //
+  // 2. If that resulting state will trigger a _read, then call _read.
+  // Note that this may be asynchronous, or synchronous.  Yes, it is
+  // deeply ugly to write APIs this way, but that still doesn't mean
+  // that the Readable class should behave improperly, as streams are
+  // designed to be sync/async agnostic.
+  // Take note if the _read call is sync or async (ie, if the read call
+  // has returned yet), so that we know whether or not it's safe to emit
+  // 'readable' etc.
+  //
+  // 3. Actually pull the requested chunks out of the buffer and return.
+
+  // if we need a readable event, then we need to do some reading.
+  var doRead = state.needReadable;
+  debug('need readable', doRead);
+
+  // if we currently have less than the highWaterMark, then also read some
+  if (state.length === 0 || state.length - n < state.highWaterMark) {
+    doRead = true;
+    debug('length less than watermark', doRead);
+  }
+
+  // however, if we've ended, then there's no point, and if we're already
+  // reading, then it's unnecessary.
+  if (state.ended || state.reading) {
+    doRead = false;
+    debug('reading or ended', doRead);
+  } else if (doRead) {
+    debug('do read');
+    state.reading = true;
+    state.sync = true;
+    // if the length is currently zero, then we *need* a readable event.
+    if (state.length === 0) state.needReadable = true;
+    // call internal read method
+    this._read(state.highWaterMark);
+    state.sync = false;
+    // If _read pushed data synchronously, then `reading` will be false,
+    // and we need to re-evaluate how much data we can return to the user.
+    if (!state.reading) n = howMuchToRead(nOrig, state);
+  }
+
+  var ret;
+  if (n > 0) ret = fromList(n, state);else ret = null;
+
+  if (ret === null) {
+    state.needReadable = true;
+    n = 0;
+  } else {
+    state.length -= n;
+  }
+
+  if (state.length === 0) {
+    // If we have nothing in the buffer, then we want to know
+    // as soon as we *do* get something into the buffer.
+    if (!state.ended) state.needReadable = true;
+
+    // If we tried to read() past the EOF, then emit end on the next tick.
+    if (nOrig !== n && state.ended) endReadable(this);
+  }
+
+  if (ret !== null) this.emit('data', ret);
+
+  return ret;
+};
+
+function onEofChunk(stream, state) {
+  if (state.ended) return;
+  if (state.decoder) {
+    var chunk = state.decoder.end();
+    if (chunk && chunk.length) {
+      state.buffer.push(chunk);
+      state.length += state.objectMode ? 1 : chunk.length;
+    }
+  }
+  state.ended = true;
+
+  // emit 'readable' now to make sure it gets picked up.
+  emitReadable(stream);
+}
+
+// Don't emit readable right away in sync mode, because this can trigger
+// another read() call => stack overflow.  This way, it might trigger
+// a nextTick recursion warning, but that's not so bad.
+function emitReadable(stream) {
+  var state = stream._readableState;
+  state.needReadable = false;
+  if (!state.emittedReadable) {
+    debug('emitReadable', state.flowing);
+    state.emittedReadable = true;
+    if (state.sync) pna.nextTick(emitReadable_, stream);else emitReadable_(stream);
+  }
+}
+
+function emitReadable_(stream) {
+  debug('emit readable');
+  stream.emit('readable');
+  flow(stream);
+}
+
+// at this point, the user has presumably seen the 'readable' event,
+// and called read() to consume some data.  that may have triggered
+// in turn another _read(n) call, in which case reading = true if
+// it's in progress.
+// However, if we're not ended, or reading, and the length < hwm,
+// then go ahead and try to read some more preemptively.
+function maybeReadMore(stream, state) {
+  if (!state.readingMore) {
+    state.readingMore = true;
+    pna.nextTick(maybeReadMore_, stream, state);
+  }
+}
+
+function maybeReadMore_(stream, state) {
+  var len = state.length;
+  while (!state.reading && !state.flowing && !state.ended && state.length < state.highWaterMark) {
+    debug('maybeReadMore read 0');
+    stream.read(0);
+    if (len === state.length)
+      // didn't get any data, stop spinning.
+      break;else len = state.length;
+  }
+  state.readingMore = false;
+}
+
+// abstract method.  to be overridden in specific implementation classes.
+// call cb(er, data) where data is <= n in length.
+// for virtual (non-string, non-buffer) streams, "length" is somewhat
+// arbitrary, and perhaps not very meaningful.
+Readable.prototype._read = function (n) {
+  this.emit('error', new Error('_read() is not implemented'));
+};
+
+Readable.prototype.pipe = function (dest, pipeOpts) {
+  var src = this;
+  var state = this._readableState;
+
+  switch (state.pipesCount) {
+    case 0:
+      state.pipes = dest;
+      break;
+    case 1:
+      state.pipes = [state.pipes, dest];
+      break;
+    default:
+      state.pipes.push(dest);
+      break;
+  }
+  state.pipesCount += 1;
+  debug('pipe count=%d opts=%j', state.pipesCount, pipeOpts);
+
+  var doEnd = (!pipeOpts || pipeOpts.end !== false) && dest !== process.stdout && dest !== process.stderr;
+
+  var endFn = doEnd ? onend : unpipe;
+  if (state.endEmitted) pna.nextTick(endFn);else src.once('end', endFn);
+
+  dest.on('unpipe', onunpipe);
+  function onunpipe(readable, unpipeInfo) {
+    debug('onunpipe');
+    if (readable === src) {
+      if (unpipeInfo && unpipeInfo.hasUnpiped === false) {
+        unpipeInfo.hasUnpiped = true;
+        cleanup();
+      }
+    }
+  }
+
+  function onend() {
+    debug('onend');
+    dest.end();
+  }
+
+  // when the dest drains, it reduces the awaitDrain counter
+  // on the source.  This would be more elegant with a .once()
+  // handler in flow(), but adding and removing repeatedly is
+  // too slow.
+  var ondrain = pipeOnDrain(src);
+  dest.on('drain', ondrain);
+
+  var cleanedUp = false;
+  function cleanup() {
+    debug('cleanup');
+    // cleanup event handlers once the pipe is broken
+    dest.removeListener('close', onclose);
+    dest.removeListener('finish', onfinish);
+    dest.removeListener('drain', ondrain);
+    dest.removeListener('error', onerror);
+    dest.removeListener('unpipe', onunpipe);
+    src.removeListener('end', onend);
+    src.removeListener('end', unpipe);
+    src.removeListener('data', ondata);
+
+    cleanedUp = true;
+
+    // if the reader is waiting for a drain event from this
+    // specific writer, then it would cause it to never start
+    // flowing again.
+    // So, if this is awaiting a drain, then we just call it now.
+    // If we don't know, then assume that we are waiting for one.
+    if (state.awaitDrain && (!dest._writableState || dest._writableState.needDrain)) ondrain();
+  }
+
+  // If the user pushes more data while we're writing to dest then we'll end up
+  // in ondata again. However, we only want to increase awaitDrain once because
+  // dest will only emit one 'drain' event for the multiple writes.
+  // => Introduce a guard on increasing awaitDrain.
+  var increasedAwaitDrain = false;
+  src.on('data', ondata);
+  function ondata(chunk) {
+    debug('ondata');
+    increasedAwaitDrain = false;
+    var ret = dest.write(chunk);
+    if (false === ret && !increasedAwaitDrain) {
+      // If the user unpiped during `dest.write()`, it is possible
+      // to get stuck in a permanently paused state if that write
+      // also returned false.
+      // => Check whether `dest` is still a piping destination.
+      if ((state.pipesCount === 1 && state.pipes === dest || state.pipesCount > 1 && indexOf(state.pipes, dest) !== -1) && !cleanedUp) {
+        debug('false write response, pause', src._readableState.awaitDrain);
+        src._readableState.awaitDrain++;
+        increasedAwaitDrain = true;
+      }
+      src.pause();
+    }
+  }
+
+  // if the dest has an error, then stop piping into it.
+  // however, don't suppress the throwing behavior for this.
+  function onerror(er) {
+    debug('onerror', er);
+    unpipe();
+    dest.removeListener('error', onerror);
+    if (EElistenerCount(dest, 'error') === 0) dest.emit('error', er);
+  }
+
+  // Make sure our error handler is attached before userland ones.
+  prependListener(dest, 'error', onerror);
+
+  // Both close and finish should trigger unpipe, but only once.
+  function onclose() {
+    dest.removeListener('finish', onfinish);
+    unpipe();
+  }
+  dest.once('close', onclose);
+  function onfinish() {
+    debug('onfinish');
+    dest.removeListener('close', onclose);
+    unpipe();
+  }
+  dest.once('finish', onfinish);
+
+  function unpipe() {
+    debug('unpipe');
+    src.unpipe(dest);
+  }
+
+  // tell the dest that it's being piped to
+  dest.emit('pipe', src);
+
+  // start the flow if it hasn't been started already.
+  if (!state.flowing) {
+    debug('pipe resume');
+    src.resume();
+  }
+
+  return dest;
+};
+
+function pipeOnDrain(src) {
+  return function () {
+    var state = src._readableState;
+    debug('pipeOnDrain', state.awaitDrain);
+    if (state.awaitDrain) state.awaitDrain--;
+    if (state.awaitDrain === 0 && EElistenerCount(src, 'data')) {
+      state.flowing = true;
+      flow(src);
+    }
+  };
+}
+
+Readable.prototype.unpipe = function (dest) {
+  var state = this._readableState;
+  var unpipeInfo = { hasUnpiped: false };
+
+  // if we're not piping anywhere, then do nothing.
+  if (state.pipesCount === 0) return this;
+
+  // just one destination.  most common case.
+  if (state.pipesCount === 1) {
+    // passed in one, but it's not the right one.
+    if (dest && dest !== state.pipes) return this;
+
+    if (!dest) dest = state.pipes;
+
+    // got a match.
+    state.pipes = null;
+    state.pipesCount = 0;
+    state.flowing = false;
+    if (dest) dest.emit('unpipe', this, unpipeInfo);
+    return this;
+  }
+
+  // slow case. multiple pipe destinations.
+
+  if (!dest) {
+    // remove all.
+    var dests = state.pipes;
+    var len = state.pipesCount;
+    state.pipes = null;
+    state.pipesCount = 0;
+    state.flowing = false;
+
+    for (var i = 0; i < len; i++) {
+      dests[i].emit('unpipe', this, unpipeInfo);
+    }return this;
+  }
+
+  // try to find the right one.
+  var index = indexOf(state.pipes, dest);
+  if (index === -1) return this;
+
+  state.pipes.splice(index, 1);
+  state.pipesCount -= 1;
+  if (state.pipesCount === 1) state.pipes = state.pipes[0];
+
+  dest.emit('unpipe', this, unpipeInfo);
+
+  return this;
+};
+
+// set up data events if they are asked for
+// Ensure readable listeners eventually get something
+Readable.prototype.on = function (ev, fn) {
+  var res = Stream.prototype.on.call(this, ev, fn);
+
+  if (ev === 'data') {
+    // Start flowing on next tick if stream isn't explicitly paused
+    if (this._readableState.flowing !== false) this.resume();
+  } else if (ev === 'readable') {
+    var state = this._readableState;
+    if (!state.endEmitted && !state.readableListening) {
+      state.readableListening = state.needReadable = true;
+      state.emittedReadable = false;
+      if (!state.reading) {
+        pna.nextTick(nReadingNextTick, this);
+      } else if (state.length) {
+        emitReadable(this);
+      }
+    }
+  }
+
+  return res;
+};
+Readable.prototype.addListener = Readable.prototype.on;
+
+function nReadingNextTick(self) {
+  debug('readable nexttick read 0');
+  self.read(0);
+}
+
+// pause() and resume() are remnants of the legacy readable stream API
+// If the user uses them, then switch into old mode.
+Readable.prototype.resume = function () {
+  var state = this._readableState;
+  if (!state.flowing) {
+    debug('resume');
+    state.flowing = true;
+    resume(this, state);
+  }
+  return this;
+};
+
+function resume(stream, state) {
+  if (!state.resumeScheduled) {
+    state.resumeScheduled = true;
+    pna.nextTick(resume_, stream, state);
+  }
+}
+
+function resume_(stream, state) {
+  if (!state.reading) {
+    debug('resume read 0');
+    stream.read(0);
+  }
+
+  state.resumeScheduled = false;
+  state.awaitDrain = 0;
+  stream.emit('resume');
+  flow(stream);
+  if (state.flowing && !state.reading) stream.read(0);
+}
+
+Readable.prototype.pause = function () {
+  debug('call pause flowing=%j', this._readableState.flowing);
+  if (false !== this._readableState.flowing) {
+    debug('pause');
+    this._readableState.flowing = false;
+    this.emit('pause');
+  }
+  return this;
+};
+
+function flow(stream) {
+  var state = stream._readableState;
+  debug('flow', state.flowing);
+  while (state.flowing && stream.read() !== null) {}
+}
+
+// wrap an old-style stream as the async data source.
+// This is *not* part of the readable stream interface.
+// It is an ugly unfortunate mess of history.
+Readable.prototype.wrap = function (stream) {
+  var _this = this;
+
+  var state = this._readableState;
+  var paused = false;
+
+  stream.on('end', function () {
+    debug('wrapped end');
+    if (state.decoder && !state.ended) {
+      var chunk = state.decoder.end();
+      if (chunk && chunk.length) _this.push(chunk);
+    }
+
+    _this.push(null);
+  });
+
+  stream.on('data', function (chunk) {
+    debug('wrapped data');
+    if (state.decoder) chunk = state.decoder.write(chunk);
+
+    // don't skip over falsy values in objectMode
+    if (state.objectMode && (chunk === null || chunk === undefined)) return;else if (!state.objectMode && (!chunk || !chunk.length)) return;
+
+    var ret = _this.push(chunk);
+    if (!ret) {
+      paused = true;
+      stream.pause();
+    }
+  });
+
+  // proxy all the other methods.
+  // important when wrapping filters and duplexes.
+  for (var i in stream) {
+    if (this[i] === undefined && typeof stream[i] === 'function') {
+      this[i] = function (method) {
+        return function () {
+          return stream[method].apply(stream, arguments);
+        };
+      }(i);
+    }
+  }
+
+  // proxy certain important events.
+  for (var n = 0; n < kProxyEvents.length; n++) {
+    stream.on(kProxyEvents[n], this.emit.bind(this, kProxyEvents[n]));
+  }
+
+  // when we try to consume some more bytes, simply unpause the
+  // underlying stream.
+  this._read = function (n) {
+    debug('wrapped _read', n);
+    if (paused) {
+      paused = false;
+      stream.resume();
+    }
+  };
+
+  return this;
+};
+
+Object.defineProperty(Readable.prototype, 'readableHighWaterMark', {
+  // making it explicit this property is not enumerable
+  // because otherwise some prototype manipulation in
+  // userland will fail
+  enumerable: false,
+  get: function () {
+    return this._readableState.highWaterMark;
+  }
+});
+
+// exposed for testing purposes only.
+Readable._fromList = fromList;
+
+// Pluck off n bytes from an array of buffers.
+// Length is the combined lengths of all the buffers in the list.
+// This function is designed to be inlinable, so please take care when making
+// changes to the function body.
+function fromList(n, state) {
+  // nothing buffered
+  if (state.length === 0) return null;
+
+  var ret;
+  if (state.objectMode) ret = state.buffer.shift();else if (!n || n >= state.length) {
+    // read it all, truncate the list
+    if (state.decoder) ret = state.buffer.join('');else if (state.buffer.length === 1) ret = state.buffer.head.data;else ret = state.buffer.concat(state.length);
+    state.buffer.clear();
+  } else {
+    // read part of list
+    ret = fromListPartial(n, state.buffer, state.decoder);
+  }
+
+  return ret;
+}
+
+// Extracts only enough buffered data to satisfy the amount requested.
+// This function is designed to be inlinable, so please take care when making
+// changes to the function body.
+function fromListPartial(n, list, hasStrings) {
+  var ret;
+  if (n < list.head.data.length) {
+    // slice is the same for buffers and strings
+    ret = list.head.data.slice(0, n);
+    list.head.data = list.head.data.slice(n);
+  } else if (n === list.head.data.length) {
+    // first chunk is a perfect match
+    ret = list.shift();
+  } else {
+    // result spans more than one buffer
+    ret = hasStrings ? copyFromBufferString(n, list) : copyFromBuffer(n, list);
+  }
+  return ret;
+}
+
+// Copies a specified amount of characters from the list of buffered data
+// chunks.
+// This function is designed to be inlinable, so please take care when making
+// changes to the function body.
+function copyFromBufferString(n, list) {
+  var p = list.head;
+  var c = 1;
+  var ret = p.data;
+  n -= ret.length;
+  while (p = p.next) {
+    var str = p.data;
+    var nb = n > str.length ? str.length : n;
+    if (nb === str.length) ret += str;else ret += str.slice(0, n);
+    n -= nb;
+    if (n === 0) {
+      if (nb === str.length) {
+        ++c;
+        if (p.next) list.head = p.next;else list.head = list.tail = null;
+      } else {
+        list.head = p;
+        p.data = str.slice(nb);
+      }
+      break;
+    }
+    ++c;
+  }
+  list.length -= c;
+  return ret;
+}
+
+// Copies a specified amount of bytes from the list of buffered data chunks.
+// This function is designed to be inlinable, so please take care when making
+// changes to the function body.
+function copyFromBuffer(n, list) {
+  var ret = Buffer.allocUnsafe(n);
+  var p = list.head;
+  var c = 1;
+  p.data.copy(ret);
+  n -= p.data.length;
+  while (p = p.next) {
+    var buf = p.data;
+    var nb = n > buf.length ? buf.length : n;
+    buf.copy(ret, ret.length - n, 0, nb);
+    n -= nb;
+    if (n === 0) {
+      if (nb === buf.length) {
+        ++c;
+        if (p.next) list.head = p.next;else list.head = list.tail = null;
+      } else {
+        list.head = p;
+        p.data = buf.slice(nb);
+      }
+      break;
+    }
+    ++c;
+  }
+  list.length -= c;
+  return ret;
+}
+
+function endReadable(stream) {
+  var state = stream._readableState;
+
+  // If we get here before consuming all the bytes, then that is a
+  // bug in node.  Should never happen.
+  if (state.length > 0) throw new Error('"endReadable()" called on non-empty stream');
+
+  if (!state.endEmitted) {
+    state.ended = true;
+    pna.nextTick(endReadableNT, state, stream);
+  }
+}
+
+function endReadableNT(state, stream) {
+  // Check that we didn't get one last unshift.
+  if (!state.endEmitted && state.length === 0) {
+    state.endEmitted = true;
+    stream.readable = false;
+    stream.emit('end');
+  }
+}
+
+function indexOf(xs, x) {
+  for (var i = 0, l = xs.length; i < l; i++) {
+    if (xs[i] === x) return i;
+  }
+  return -1;
+}
+
+/***/ }),
+/* 407 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+// a transform stream is a readable/writable stream where you do
+// something with the data.  Sometimes it's called a "filter",
+// but that's not a great name for it, since that implies a thing where
+// some bits pass through, and others are simply ignored.  (That would
+// be a valid example of a transform, of course.)
+//
+// While the output is causally related to the input, it's not a
+// necessarily symmetric or synchronous transformation.  For example,
+// a zlib stream might take multiple plain-text writes(), and then
+// emit a single compressed chunk some time in the future.
+//
+// Here's how this works:
+//
+// The Transform stream has all the aspects of the readable and writable
+// stream classes.  When you write(chunk), that calls _write(chunk,cb)
+// internally, and returns false if there's a lot of pending writes
+// buffered up.  When you call read(), that calls _read(n) until
+// there's enough pending readable data buffered up.
+//
+// In a transform stream, the written data is placed in a buffer.  When
+// _read(n) is called, it transforms the queued up data, calling the
+// buffered _write cb's as it consumes chunks.  If consuming a single
+// written chunk would result in multiple output chunks, then the first
+// outputted bit calls the readcb, and subsequent chunks just go into
+// the read buffer, and will cause it to emit 'readable' if necessary.
+//
+// This way, back-pressure is actually determined by the reading side,
+// since _read has to be called to start processing a new chunk.  However,
+// a pathological inflate type of transform can cause excessive buffering
+// here.  For example, imagine a stream where every byte of input is
+// interpreted as an integer from 0-255, and then results in that many
+// bytes of output.  Writing the 4 bytes {ff,ff,ff,ff} would result in
+// 1kb of data being output.  In this case, you could write a very small
+// amount of input, and end up with a very large amount of output.  In
+// such a pathological inflating mechanism, there'd be no way to tell
+// the system to stop doing the transform.  A single 4MB write could
+// cause the system to run out of memory.
+//
+// However, even in such a pathological case, only a single written chunk
+// would be consumed, and then the rest would wait (un-transformed) until
+// the results of the previous transformed chunk were consumed.
+
+
+
+module.exports = Transform;
+
+var Duplex = __webpack_require__(115);
+
+/*<replacement>*/
+var util = __webpack_require__(113);
+util.inherits = __webpack_require__(61);
+/*</replacement>*/
+
+util.inherits(Transform, Duplex);
+
+function afterTransform(er, data) {
+  var ts = this._transformState;
+  ts.transforming = false;
+
+  var cb = ts.writecb;
+
+  if (!cb) {
+    return this.emit('error', new Error('write callback called multiple times'));
+  }
+
+  ts.writechunk = null;
+  ts.writecb = null;
+
+  if (data != null) // single equals check for both `null` and `undefined`
+    this.push(data);
+
+  cb(er);
+
+  var rs = this._readableState;
+  rs.reading = false;
+  if (rs.needReadable || rs.length < rs.highWaterMark) {
+    this._read(rs.highWaterMark);
+  }
+}
+
+function Transform(options) {
+  if (!(this instanceof Transform)) return new Transform(options);
+
+  Duplex.call(this, options);
+
+  this._transformState = {
+    afterTransform: afterTransform.bind(this),
+    needTransform: false,
+    transforming: false,
+    writecb: null,
+    writechunk: null,
+    writeencoding: null
+  };
+
+  // start out asking for a readable event once data is transformed.
+  this._readableState.needReadable = true;
+
+  // we have implemented the _read method, and done the other things
+  // that Readable wants before the first _read call, so unset the
+  // sync guard flag.
+  this._readableState.sync = false;
+
+  if (options) {
+    if (typeof options.transform === 'function') this._transform = options.transform;
+
+    if (typeof options.flush === 'function') this._flush = options.flush;
+  }
+
+  // When the writable side finishes, then flush out anything remaining.
+  this.on('prefinish', prefinish);
+}
+
+function prefinish() {
+  var _this = this;
+
+  if (typeof this._flush === 'function') {
+    this._flush(function (er, data) {
+      done(_this, er, data);
+    });
+  } else {
+    done(this, null, null);
+  }
+}
+
+Transform.prototype.push = function (chunk, encoding) {
+  this._transformState.needTransform = false;
+  return Duplex.prototype.push.call(this, chunk, encoding);
+};
+
+// This is the part where you do stuff!
+// override this function in implementation classes.
+// 'chunk' is an input chunk.
+//
+// Call `push(newChunk)` to pass along transformed output
+// to the readable side.  You may call 'push' zero or more times.
+//
+// Call `cb(err)` when you are done with this chunk.  If you pass
+// an error, then that'll put the hurt on the whole operation.  If you
+// never call cb(), then you'll never get another chunk.
+Transform.prototype._transform = function (chunk, encoding, cb) {
+  throw new Error('_transform() is not implemented');
+};
+
+Transform.prototype._write = function (chunk, encoding, cb) {
+  var ts = this._transformState;
+  ts.writecb = cb;
+  ts.writechunk = chunk;
+  ts.writeencoding = encoding;
+  if (!ts.transforming) {
+    var rs = this._readableState;
+    if (ts.needTransform || rs.needReadable || rs.length < rs.highWaterMark) this._read(rs.highWaterMark);
+  }
+};
+
+// Doesn't matter what the args are here.
+// _transform does all the work.
+// That we got here means that the readable side wants more data.
+Transform.prototype._read = function (n) {
+  var ts = this._transformState;
+
+  if (ts.writechunk !== null && ts.writecb && !ts.transforming) {
+    ts.transforming = true;
+    this._transform(ts.writechunk, ts.writeencoding, ts.afterTransform);
+  } else {
+    // mark that we need a transform, so that any data that comes in
+    // will get processed, now that we've asked for it.
+    ts.needTransform = true;
+  }
+};
+
+Transform.prototype._destroy = function (err, cb) {
+  var _this2 = this;
+
+  Duplex.prototype._destroy.call(this, err, function (err2) {
+    cb(err2);
+    _this2.emit('close');
+  });
+};
+
+function done(stream, er, data) {
+  if (er) return stream.emit('error', er);
+
+  if (data != null) // single equals check for both `null` and `undefined`
+    stream.push(data);
+
+  // if there's nothing in the write buffer, then that means
+  // that nothing more will ever be provided
+  if (stream._writableState.length) throw new Error('Calling transform done when ws.length != 0');
+
+  if (stream._transformState.transforming) throw new Error('Calling transform done when still transforming');
+
+  return stream.push(null);
+}
+
+/***/ }),
+/* 408 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+// A bit simpler than readable streams.
+// Implement an async ._write(chunk, encoding, cb), and it'll handle all
+// the drain event emission and buffering.
+
+
+
+/*<replacement>*/
+
+var pna = __webpack_require__(180);
+/*</replacement>*/
+
+module.exports = Writable;
+
+/* <replacement> */
+function WriteReq(chunk, encoding, cb) {
+  this.chunk = chunk;
+  this.encoding = encoding;
+  this.callback = cb;
+  this.next = null;
+}
+
+// It seems a linked list but it is not
+// there will be only 2 of these for each stream
+function CorkedRequest(state) {
+  var _this = this;
+
+  this.next = null;
+  this.entry = null;
+  this.finish = function () {
+    onCorkedFinish(_this, state);
+  };
+}
+/* </replacement> */
+
+/*<replacement>*/
+var asyncWrite = !process.browser && ['v0.10', 'v0.9.'].indexOf(process.version.slice(0, 5)) > -1 ? setImmediate : pna.nextTick;
+/*</replacement>*/
+
+/*<replacement>*/
+var Duplex;
+/*</replacement>*/
+
+Writable.WritableState = WritableState;
+
+/*<replacement>*/
+var util = __webpack_require__(113);
+util.inherits = __webpack_require__(61);
+/*</replacement>*/
+
+/*<replacement>*/
+var internalUtil = {
+  deprecate: __webpack_require__(956)
+};
+/*</replacement>*/
+
+/*<replacement>*/
+var Stream = __webpack_require__(410);
+/*</replacement>*/
+
+/*<replacement>*/
+
+var Buffer = __webpack_require__(45).Buffer;
+var OurUint8Array = global.Uint8Array || function () {};
+function _uint8ArrayToBuffer(chunk) {
+  return Buffer.from(chunk);
+}
+function _isUint8Array(obj) {
+  return Buffer.isBuffer(obj) || obj instanceof OurUint8Array;
+}
+
+/*</replacement>*/
+
+var destroyImpl = __webpack_require__(409);
+
+util.inherits(Writable, Stream);
+
+function nop() {}
+
+function WritableState(options, stream) {
+  Duplex = Duplex || __webpack_require__(115);
+
+  options = options || {};
+
+  // Duplex streams are both readable and writable, but share
+  // the same options object.
+  // However, some cases require setting options to different
+  // values for the readable and the writable sides of the duplex stream.
+  // These options can be provided separately as readableXXX and writableXXX.
+  var isDuplex = stream instanceof Duplex;
+
+  // object stream flag to indicate whether or not this stream
+  // contains buffers or objects.
+  this.objectMode = !!options.objectMode;
+
+  if (isDuplex) this.objectMode = this.objectMode || !!options.writableObjectMode;
+
+  // the point at which write() starts returning false
+  // Note: 0 is a valid value, means that we always return false if
+  // the entire buffer is not flushed immediately on write()
+  var hwm = options.highWaterMark;
+  var writableHwm = options.writableHighWaterMark;
+  var defaultHwm = this.objectMode ? 16 : 16 * 1024;
+
+  if (hwm || hwm === 0) this.highWaterMark = hwm;else if (isDuplex && (writableHwm || writableHwm === 0)) this.highWaterMark = writableHwm;else this.highWaterMark = defaultHwm;
+
+  // cast to ints.
+  this.highWaterMark = Math.floor(this.highWaterMark);
+
+  // if _final has been called
+  this.finalCalled = false;
+
+  // drain event flag.
+  this.needDrain = false;
+  // at the start of calling end()
+  this.ending = false;
+  // when end() has been called, and returned
+  this.ended = false;
+  // when 'finish' is emitted
+  this.finished = false;
+
+  // has it been destroyed
+  this.destroyed = false;
+
+  // should we decode strings into buffers before passing to _write?
+  // this is here so that some node-core streams can optimize string
+  // handling at a lower level.
+  var noDecode = options.decodeStrings === false;
+  this.decodeStrings = !noDecode;
+
+  // Crypto is kind of old and crusty.  Historically, its default string
+  // encoding is 'binary' so we have to make this configurable.
+  // Everything else in the universe uses 'utf8', though.
+  this.defaultEncoding = options.defaultEncoding || 'utf8';
+
+  // not an actual buffer we keep track of, but a measurement
+  // of how much we're waiting to get pushed to some underlying
+  // socket or file.
+  this.length = 0;
+
+  // a flag to see when we're in the middle of a write.
+  this.writing = false;
+
+  // when true all writes will be buffered until .uncork() call
+  this.corked = 0;
+
+  // a flag to be able to tell if the onwrite cb is called immediately,
+  // or on a later tick.  We set this to true at first, because any
+  // actions that shouldn't happen until "later" should generally also
+  // not happen before the first write call.
+  this.sync = true;
+
+  // a flag to know if we're processing previously buffered items, which
+  // may call the _write() callback in the same tick, so that we don't
+  // end up in an overlapped onwrite situation.
+  this.bufferProcessing = false;
+
+  // the callback that's passed to _write(chunk,cb)
+  this.onwrite = function (er) {
+    onwrite(stream, er);
+  };
+
+  // the callback that the user supplies to write(chunk,encoding,cb)
+  this.writecb = null;
+
+  // the amount that is being written when _write is called.
+  this.writelen = 0;
+
+  this.bufferedRequest = null;
+  this.lastBufferedRequest = null;
+
+  // number of pending user-supplied write callbacks
+  // this must be 0 before 'finish' can be emitted
+  this.pendingcb = 0;
+
+  // emit prefinish if the only thing we're waiting for is _write cbs
+  // This is relevant for synchronous Transform streams
+  this.prefinished = false;
+
+  // True if the error was already emitted and should not be thrown again
+  this.errorEmitted = false;
+
+  // count buffered requests
+  this.bufferedRequestCount = 0;
+
+  // allocate the first CorkedRequest, there is always
+  // one allocated and free to use, and we maintain at most two
+  this.corkedRequestsFree = new CorkedRequest(this);
+}
+
+WritableState.prototype.getBuffer = function getBuffer() {
+  var current = this.bufferedRequest;
+  var out = [];
+  while (current) {
+    out.push(current);
+    current = current.next;
+  }
+  return out;
+};
+
+(function () {
+  try {
+    Object.defineProperty(WritableState.prototype, 'buffer', {
+      get: internalUtil.deprecate(function () {
+        return this.getBuffer();
+      }, '_writableState.buffer is deprecated. Use _writableState.getBuffer ' + 'instead.', 'DEP0003')
+    });
+  } catch (_) {}
+})();
+
+// Test _writableState for inheritance to account for Duplex streams,
+// whose prototype chain only points to Readable.
+var realHasInstance;
+if (typeof Symbol === 'function' && Symbol.hasInstance && typeof Function.prototype[Symbol.hasInstance] === 'function') {
+  realHasInstance = Function.prototype[Symbol.hasInstance];
+  Object.defineProperty(Writable, Symbol.hasInstance, {
+    value: function (object) {
+      if (realHasInstance.call(this, object)) return true;
+      if (this !== Writable) return false;
+
+      return object && object._writableState instanceof WritableState;
+    }
+  });
+} else {
+  realHasInstance = function (object) {
+    return object instanceof this;
+  };
+}
+
+function Writable(options) {
+  Duplex = Duplex || __webpack_require__(115);
+
+  // Writable ctor is applied to Duplexes, too.
+  // `realHasInstance` is necessary because using plain `instanceof`
+  // would return false, as no `_writableState` property is attached.
+
+  // Trying to use the custom `instanceof` for Writable here will also break the
+  // Node.js LazyTransform implementation, which has a non-trivial getter for
+  // `_writableState` that would lead to infinite recursion.
+  if (!realHasInstance.call(Writable, this) && !(this instanceof Duplex)) {
+    return new Writable(options);
+  }
+
+  this._writableState = new WritableState(options, this);
+
+  // legacy.
+  this.writable = true;
+
+  if (options) {
+    if (typeof options.write === 'function') this._write = options.write;
+
+    if (typeof options.writev === 'function') this._writev = options.writev;
+
+    if (typeof options.destroy === 'function') this._destroy = options.destroy;
+
+    if (typeof options.final === 'function') this._final = options.final;
+  }
+
+  Stream.call(this);
+}
+
+// Otherwise people can pipe Writable streams, which is just wrong.
+Writable.prototype.pipe = function () {
+  this.emit('error', new Error('Cannot pipe, not readable'));
+};
+
+function writeAfterEnd(stream, cb) {
+  var er = new Error('write after end');
+  // TODO: defer error events consistently everywhere, not just the cb
+  stream.emit('error', er);
+  pna.nextTick(cb, er);
+}
+
+// Checks that a user-supplied chunk is valid, especially for the particular
+// mode the stream is in. Currently this means that `null` is never accepted
+// and undefined/non-string values are only allowed in object mode.
+function validChunk(stream, state, chunk, cb) {
+  var valid = true;
+  var er = false;
+
+  if (chunk === null) {
+    er = new TypeError('May not write null values to stream');
+  } else if (typeof chunk !== 'string' && chunk !== undefined && !state.objectMode) {
+    er = new TypeError('Invalid non-string/buffer chunk');
+  }
+  if (er) {
+    stream.emit('error', er);
+    pna.nextTick(cb, er);
+    valid = false;
+  }
+  return valid;
+}
+
+Writable.prototype.write = function (chunk, encoding, cb) {
+  var state = this._writableState;
+  var ret = false;
+  var isBuf = !state.objectMode && _isUint8Array(chunk);
+
+  if (isBuf && !Buffer.isBuffer(chunk)) {
+    chunk = _uint8ArrayToBuffer(chunk);
+  }
+
+  if (typeof encoding === 'function') {
+    cb = encoding;
+    encoding = null;
+  }
+
+  if (isBuf) encoding = 'buffer';else if (!encoding) encoding = state.defaultEncoding;
+
+  if (typeof cb !== 'function') cb = nop;
+
+  if (state.ended) writeAfterEnd(this, cb);else if (isBuf || validChunk(this, state, chunk, cb)) {
+    state.pendingcb++;
+    ret = writeOrBuffer(this, state, isBuf, chunk, encoding, cb);
+  }
+
+  return ret;
+};
+
+Writable.prototype.cork = function () {
+  var state = this._writableState;
+
+  state.corked++;
+};
+
+Writable.prototype.uncork = function () {
+  var state = this._writableState;
+
+  if (state.corked) {
+    state.corked--;
+
+    if (!state.writing && !state.corked && !state.finished && !state.bufferProcessing && state.bufferedRequest) clearBuffer(this, state);
+  }
+};
+
+Writable.prototype.setDefaultEncoding = function setDefaultEncoding(encoding) {
+  // node::ParseEncoding() requires lower case.
+  if (typeof encoding === 'string') encoding = encoding.toLowerCase();
+  if (!(['hex', 'utf8', 'utf-8', 'ascii', 'binary', 'base64', 'ucs2', 'ucs-2', 'utf16le', 'utf-16le', 'raw'].indexOf((encoding + '').toLowerCase()) > -1)) throw new TypeError('Unknown encoding: ' + encoding);
+  this._writableState.defaultEncoding = encoding;
+  return this;
+};
+
+function decodeChunk(state, chunk, encoding) {
+  if (!state.objectMode && state.decodeStrings !== false && typeof chunk === 'string') {
+    chunk = Buffer.from(chunk, encoding);
+  }
+  return chunk;
+}
+
+Object.defineProperty(Writable.prototype, 'writableHighWaterMark', {
+  // making it explicit this property is not enumerable
+  // because otherwise some prototype manipulation in
+  // userland will fail
+  enumerable: false,
+  get: function () {
+    return this._writableState.highWaterMark;
+  }
+});
+
+// if we're already writing something, then just put this
+// in the queue, and wait our turn.  Otherwise, call _write
+// If we return false, then we need a drain event, so set that flag.
+function writeOrBuffer(stream, state, isBuf, chunk, encoding, cb) {
+  if (!isBuf) {
+    var newChunk = decodeChunk(state, chunk, encoding);
+    if (chunk !== newChunk) {
+      isBuf = true;
+      encoding = 'buffer';
+      chunk = newChunk;
+    }
+  }
+  var len = state.objectMode ? 1 : chunk.length;
+
+  state.length += len;
+
+  var ret = state.length < state.highWaterMark;
+  // we must ensure that previous needDrain will not be reset to false.
+  if (!ret) state.needDrain = true;
+
+  if (state.writing || state.corked) {
+    var last = state.lastBufferedRequest;
+    state.lastBufferedRequest = {
+      chunk: chunk,
+      encoding: encoding,
+      isBuf: isBuf,
+      callback: cb,
+      next: null
+    };
+    if (last) {
+      last.next = state.lastBufferedRequest;
+    } else {
+      state.bufferedRequest = state.lastBufferedRequest;
+    }
+    state.bufferedRequestCount += 1;
+  } else {
+    doWrite(stream, state, false, len, chunk, encoding, cb);
+  }
+
+  return ret;
+}
+
+function doWrite(stream, state, writev, len, chunk, encoding, cb) {
+  state.writelen = len;
+  state.writecb = cb;
+  state.writing = true;
+  state.sync = true;
+  if (writev) stream._writev(chunk, state.onwrite);else stream._write(chunk, encoding, state.onwrite);
+  state.sync = false;
+}
+
+function onwriteError(stream, state, sync, er, cb) {
+  --state.pendingcb;
+
+  if (sync) {
+    // defer the callback if we are being called synchronously
+    // to avoid piling up things on the stack
+    pna.nextTick(cb, er);
+    // this can emit finish, and it will always happen
+    // after error
+    pna.nextTick(finishMaybe, stream, state);
+    stream._writableState.errorEmitted = true;
+    stream.emit('error', er);
+  } else {
+    // the caller expect this to happen before if
+    // it is async
+    cb(er);
+    stream._writableState.errorEmitted = true;
+    stream.emit('error', er);
+    // this can emit finish, but finish must
+    // always follow error
+    finishMaybe(stream, state);
+  }
+}
+
+function onwriteStateUpdate(state) {
+  state.writing = false;
+  state.writecb = null;
+  state.length -= state.writelen;
+  state.writelen = 0;
+}
+
+function onwrite(stream, er) {
+  var state = stream._writableState;
+  var sync = state.sync;
+  var cb = state.writecb;
+
+  onwriteStateUpdate(state);
+
+  if (er) onwriteError(stream, state, sync, er, cb);else {
+    // Check if we're actually ready to finish, but don't emit yet
+    var finished = needFinish(state);
+
+    if (!finished && !state.corked && !state.bufferProcessing && state.bufferedRequest) {
+      clearBuffer(stream, state);
+    }
+
+    if (sync) {
+      /*<replacement>*/
+      asyncWrite(afterWrite, stream, state, finished, cb);
+      /*</replacement>*/
+    } else {
+      afterWrite(stream, state, finished, cb);
+    }
+  }
+}
+
+function afterWrite(stream, state, finished, cb) {
+  if (!finished) onwriteDrain(stream, state);
+  state.pendingcb--;
+  cb();
+  finishMaybe(stream, state);
+}
+
+// Must force callback to be called on nextTick, so that we don't
+// emit 'drain' before the write() consumer gets the 'false' return
+// value, and has a chance to attach a 'drain' listener.
+function onwriteDrain(stream, state) {
+  if (state.length === 0 && state.needDrain) {
+    state.needDrain = false;
+    stream.emit('drain');
+  }
+}
+
+// if there's something in the buffer waiting, then process it
+function clearBuffer(stream, state) {
+  state.bufferProcessing = true;
+  var entry = state.bufferedRequest;
+
+  if (stream._writev && entry && entry.next) {
+    // Fast case, write everything using _writev()
+    var l = state.bufferedRequestCount;
+    var buffer = new Array(l);
+    var holder = state.corkedRequestsFree;
+    holder.entry = entry;
+
+    var count = 0;
+    var allBuffers = true;
+    while (entry) {
+      buffer[count] = entry;
+      if (!entry.isBuf) allBuffers = false;
+      entry = entry.next;
+      count += 1;
+    }
+    buffer.allBuffers = allBuffers;
+
+    doWrite(stream, state, true, state.length, buffer, '', holder.finish);
+
+    // doWrite is almost always async, defer these to save a bit of time
+    // as the hot path ends with doWrite
+    state.pendingcb++;
+    state.lastBufferedRequest = null;
+    if (holder.next) {
+      state.corkedRequestsFree = holder.next;
+      holder.next = null;
+    } else {
+      state.corkedRequestsFree = new CorkedRequest(state);
+    }
+    state.bufferedRequestCount = 0;
+  } else {
+    // Slow case, write chunks one-by-one
+    while (entry) {
+      var chunk = entry.chunk;
+      var encoding = entry.encoding;
+      var cb = entry.callback;
+      var len = state.objectMode ? 1 : chunk.length;
+
+      doWrite(stream, state, false, len, chunk, encoding, cb);
+      entry = entry.next;
+      state.bufferedRequestCount--;
+      // if we didn't call the onwrite immediately, then
+      // it means that we need to wait until it does.
+      // also, that means that the chunk and cb are currently
+      // being processed, so move the buffer counter past them.
+      if (state.writing) {
+        break;
+      }
+    }
+
+    if (entry === null) state.lastBufferedRequest = null;
+  }
+
+  state.bufferedRequest = entry;
+  state.bufferProcessing = false;
+}
+
+Writable.prototype._write = function (chunk, encoding, cb) {
+  cb(new Error('_write() is not implemented'));
+};
+
+Writable.prototype._writev = null;
+
+Writable.prototype.end = function (chunk, encoding, cb) {
+  var state = this._writableState;
+
+  if (typeof chunk === 'function') {
+    cb = chunk;
+    chunk = null;
+    encoding = null;
+  } else if (typeof encoding === 'function') {
+    cb = encoding;
+    encoding = null;
+  }
+
+  if (chunk !== null && chunk !== undefined) this.write(chunk, encoding);
+
+  // .end() fully uncorks
+  if (state.corked) {
+    state.corked = 1;
+    this.uncork();
+  }
+
+  // ignore unnecessary end() calls.
+  if (!state.ending && !state.finished) endWritable(this, state, cb);
+};
+
+function needFinish(state) {
+  return state.ending && state.length === 0 && state.bufferedRequest === null && !state.finished && !state.writing;
+}
+function callFinal(stream, state) {
+  stream._final(function (err) {
+    state.pendingcb--;
+    if (err) {
+      stream.emit('error', err);
+    }
+    state.prefinished = true;
+    stream.emit('prefinish');
+    finishMaybe(stream, state);
+  });
+}
+function prefinish(stream, state) {
+  if (!state.prefinished && !state.finalCalled) {
+    if (typeof stream._final === 'function') {
+      state.pendingcb++;
+      state.finalCalled = true;
+      pna.nextTick(callFinal, stream, state);
+    } else {
+      state.prefinished = true;
+      stream.emit('prefinish');
+    }
+  }
+}
+
+function finishMaybe(stream, state) {
+  var need = needFinish(state);
+  if (need) {
+    prefinish(stream, state);
+    if (state.pendingcb === 0) {
+      state.finished = true;
+      stream.emit('finish');
+    }
+  }
+  return need;
+}
+
+function endWritable(stream, state, cb) {
+  state.ending = true;
+  finishMaybe(stream, state);
+  if (cb) {
+    if (state.finished) pna.nextTick(cb);else stream.once('finish', cb);
+  }
+  state.ended = true;
+  stream.writable = false;
+}
+
+function onCorkedFinish(corkReq, state, err) {
+  var entry = corkReq.entry;
+  corkReq.entry = null;
+  while (entry) {
+    var cb = entry.callback;
+    state.pendingcb--;
+    cb(err);
+    entry = entry.next;
+  }
+  if (state.corkedRequestsFree) {
+    state.corkedRequestsFree.next = corkReq;
+  } else {
+    state.corkedRequestsFree = corkReq;
+  }
+}
+
+Object.defineProperty(Writable.prototype, 'destroyed', {
+  get: function () {
+    if (this._writableState === undefined) {
+      return false;
+    }
+    return this._writableState.destroyed;
+  },
+  set: function (value) {
+    // we ignore the value if the stream
+    // has not been initialized yet
+    if (!this._writableState) {
+      return;
+    }
+
+    // backward compatibility, the user is explicitly
+    // managing destroyed
+    this._writableState.destroyed = value;
+  }
+});
+
+Writable.prototype.destroy = destroyImpl.destroy;
+Writable.prototype._undestroy = destroyImpl.undestroy;
+Writable.prototype._destroy = function (err, cb) {
+  this.end();
+  cb(err);
+};
+
+/***/ }),
+/* 409 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+/*<replacement>*/
+
+var pna = __webpack_require__(180);
+/*</replacement>*/
+
+// undocumented cb() API, needed for core, not for public API
+function destroy(err, cb) {
+  var _this = this;
+
+  var readableDestroyed = this._readableState && this._readableState.destroyed;
+  var writableDestroyed = this._writableState && this._writableState.destroyed;
+
+  if (readableDestroyed || writableDestroyed) {
+    if (cb) {
+      cb(err);
+    } else if (err && (!this._writableState || !this._writableState.errorEmitted)) {
+      pna.nextTick(emitErrorNT, this, err);
+    }
+    return this;
+  }
+
+  // we set destroyed to true before firing error callbacks in order
+  // to make it re-entrance safe in case destroy() is called within callbacks
+
+  if (this._readableState) {
+    this._readableState.destroyed = true;
+  }
+
+  // if this is a duplex stream mark the writable part as destroyed as well
+  if (this._writableState) {
+    this._writableState.destroyed = true;
+  }
+
+  this._destroy(err || null, function (err) {
+    if (!cb && err) {
+      pna.nextTick(emitErrorNT, _this, err);
+      if (_this._writableState) {
+        _this._writableState.errorEmitted = true;
+      }
+    } else if (cb) {
+      cb(err);
+    }
+  });
+
+  return this;
+}
+
+function undestroy() {
+  if (this._readableState) {
+    this._readableState.destroyed = false;
+    this._readableState.reading = false;
+    this._readableState.ended = false;
+    this._readableState.endEmitted = false;
+  }
+
+  if (this._writableState) {
+    this._writableState.destroyed = false;
+    this._writableState.ended = false;
+    this._writableState.ending = false;
+    this._writableState.finished = false;
+    this._writableState.errorEmitted = false;
+  }
+}
+
+function emitErrorNT(self, err) {
+  self.emit('error', err);
+}
+
+module.exports = {
+  destroy: destroy,
+  undestroy: undestroy
+};
+
+/***/ }),
+/* 410 */
+/***/ (function(module, exports, __webpack_require__) {
+
+module.exports = __webpack_require__(23);
+
+
+/***/ }),
+/* 411 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*!
+ * repeat-element <https://github.com/jonschlinkert/repeat-element>
+ *
+ * Copyright (c) 2015 Jon Schlinkert.
+ * Licensed under the MIT license.
+ */
+
+
+
+module.exports = function repeat(ele, num) {
+  var arr = new Array(num);
+
+  for (var i = 0; i < num; i++) {
+    arr[i] = ele;
+  }
+
+  return arr;
+};
+
+
+/***/ }),
+/* 412 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var tough = __webpack_require__(810)
+
+var Cookie = tough.Cookie
+var CookieJar = tough.CookieJar
+
+exports.parse = function (str) {
+  if (str && str.uri) {
+    str = str.uri
+  }
+  if (typeof str !== 'string') {
+    throw new Error('The cookie function only accepts STRING as param')
+  }
+  return Cookie.parse(str, {loose: true})
+}
+
+// Adapt the sometimes-Async api of tough.CookieJar to our requirements
+function RequestJar (store) {
+  var self = this
+  self._jar = new CookieJar(store, {looseMode: true})
+}
+RequestJar.prototype.setCookie = function (cookieOrStr, uri, options) {
+  var self = this
+  return self._jar.setCookieSync(cookieOrStr, uri, options || {})
+}
+RequestJar.prototype.getCookieString = function (uri) {
+  var self = this
+  return self._jar.getCookieStringSync(uri)
+}
+RequestJar.prototype.getCookies = function (uri) {
+  var self = this
+  return self._jar.getCookiesSync(uri)
+}
+
+exports.jar = function (store) {
+  return new RequestJar(store)
+}
+
+
+/***/ }),
+/* 413 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*!
+ * Copyright (c) 2015, Salesforce.com, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of Salesforce.com nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * "A request-path path-matches a given cookie-path if at least one of the
+ * following conditions holds:"
+ */
+function pathMatch (reqPath, cookiePath) {
+  // "o  The cookie-path and the request-path are identical."
+  if (cookiePath === reqPath) {
+    return true;
+  }
+
+  var idx = reqPath.indexOf(cookiePath);
+  if (idx === 0) {
+    // "o  The cookie-path is a prefix of the request-path, and the last
+    // character of the cookie-path is %x2F ("/")."
+    if (cookiePath.substr(-1) === "/") {
+      return true;
+    }
+
+    // " o  The cookie-path is a prefix of the request-path, and the first
+    // character of the request-path that is not included in the cookie- path
+    // is a %x2F ("/") character."
+    if (reqPath.substr(cookiePath.length, 1) === "/") {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+exports.pathMatch = pathMatch;
+
+
+/***/ }),
+/* 414 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*!
+ * Copyright (c) 2015, Salesforce.com, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of Salesforce.com nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+var pubsuffix = __webpack_require__(415);
+
+// Gives the permutation of all possible domainMatch()es of a given domain. The
+// array is in shortest-to-longest order.  Handy for indexing.
+function permuteDomain (domain) {
+  var pubSuf = pubsuffix.getPublicSuffix(domain);
+  if (!pubSuf) {
+    return null;
+  }
+  if (pubSuf == domain) {
+    return [domain];
+  }
+
+  var prefix = domain.slice(0, -(pubSuf.length + 1)); // ".example.com"
+  var parts = prefix.split('.').reverse();
+  var cur = pubSuf;
+  var permutations = [cur];
+  while (parts.length) {
+    cur = parts.shift() + '.' + cur;
+    permutations.push(cur);
+  }
+  return permutations;
+}
+
+exports.permuteDomain = permuteDomain;
+
+
+/***/ }),
+/* 415 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/****************************************************
+ * AUTOMATICALLY GENERATED by generate-pubsuffix.js *
+ *                  DO NOT EDIT!                    *
+ ****************************************************/
+
+
+
+var punycode = __webpack_require__(332);
+
+module.exports.getPublicSuffix = function getPublicSuffix(domain) {
+  /*!
+   * Copyright (c) 2015, Salesforce.com, Inc.
+   * All rights reserved.
+   *
+   * Redistribution and use in source and binary forms, with or without
+   * modification, are permitted provided that the following conditions are met:
+   *
+   * 1. Redistributions of source code must retain the above copyright notice,
+   * this list of conditions and the following disclaimer.
+   *
+   * 2. Redistributions in binary form must reproduce the above copyright notice,
+   * this list of conditions and the following disclaimer in the documentation
+   * and/or other materials provided with the distribution.
+   *
+   * 3. Neither the name of Salesforce.com nor the names of its contributors may
+   * be used to endorse or promote products derived from this software without
+   * specific prior written permission.
+   *
+   * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+   * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   * POSSIBILITY OF SUCH DAMAGE.
+   */
+  if (!domain) {
+    return null;
+  }
+  if (domain.match(/^\./)) {
+    return null;
+  }
+  var asciiDomain = punycode.toASCII(domain);
+  var converted = false;
+  if (asciiDomain !== domain) {
+    domain = asciiDomain;
+    converted = true;
+  }
+  if (index[domain]) {
+    return null;
+  }
+
+  domain = domain.toLowerCase();
+  var parts = domain.split('.').reverse();
+
+  var suffix = '';
+  var suffixLen = 0;
+  for (var i=0; i<parts.length; i++) {
+    var part = parts[i];
+    var starstr = '*'+suffix;
+    var partstr = part+suffix;
+
+    if (index[starstr]) { // star rule matches
+      suffixLen = i+1;
+      if (index[partstr] === false) { // exception rule matches (NB: false, not undefined)
+        suffixLen--;
+      }
+    } else if (index[partstr]) { // exact match, not exception
+      suffixLen = i+1;
+    }
+
+    suffix = '.'+partstr;
+  }
+
+  if (index['*'+suffix]) { // *.domain exists (e.g. *.kyoto.jp for domain='kyoto.jp');
+    return null;
+  }
+
+  suffixLen = suffixLen || 1;
+  if (parts.length > suffixLen) {
+    var publicSuffix = parts.slice(0,suffixLen+1).reverse().join('.');
+    return converted ? punycode.toUnicode(publicSuffix) : publicSuffix;
+  }
+
+  return null;
+};
+
+// The following generated structure is used under the MPL version 2.0
+// See public-suffix.txt for more information
+
+var index = module.exports.index = Object.freeze(
+{"ac":true,"com.ac":true,"edu.ac":true,"gov.ac":true,"net.ac":true,"mil.ac":true,"org.ac":true,"ad":true,"nom.ad":true,"ae":true,"co.ae":true,"net.ae":true,"org.ae":true,"sch.ae":true,"ac.ae":true,"gov.ae":true,"mil.ae":true,"aero":true,"accident-investigation.aero":true,"accident-prevention.aero":true,"aerobatic.aero":true,"aeroclub.aero":true,"aerodrome.aero":true,"agents.aero":true,"aircraft.aero":true,"airline.aero":true,"airport.aero":true,"air-surveillance.aero":true,"airtraffic.aero":true,"air-traffic-control.aero":true,"ambulance.aero":true,"amusement.aero":true,"association.aero":true,"author.aero":true,"ballooning.aero":true,"broker.aero":true,"caa.aero":true,"cargo.aero":true,"catering.aero":true,"certification.aero":true,"championship.aero":true,"charter.aero":true,"civilaviation.aero":true,"club.aero":true,"conference.aero":true,"consultant.aero":true,"consulting.aero":true,"control.aero":true,"council.aero":true,"crew.aero":true,"design.aero":true,"dgca.aero":true,"educator.aero":true,"emergency.aero":true,"engine.aero":true,"engineer.aero":true,"entertainment.aero":true,"equipment.aero":true,"exchange.aero":true,"express.aero":true,"federation.aero":true,"flight.aero":true,"freight.aero":true,"fuel.aero":true,"gliding.aero":true,"government.aero":true,"groundhandling.aero":true,"group.aero":true,"hanggliding.aero":true,"homebuilt.aero":true,"insurance.aero":true,"journal.aero":true,"journalist.aero":true,"leasing.aero":true,"logistics.aero":true,"magazine.aero":true,"maintenance.aero":true,"media.aero":true,"microlight.aero":true,"modelling.aero":true,"navigation.aero":true,"parachuting.aero":true,"paragliding.aero":true,"passenger-association.aero":true,"pilot.aero":true,"press.aero":true,"production.aero":true,"recreation.aero":true,"repbody.aero":true,"res.aero":true,"research.aero":true,"rotorcraft.aero":true,"safety.aero":true,"scientist.aero":true,"services.aero":true,"show.aero":true,"skydiving.aero":true,"software.aero":true,"student.aero":true,"trader.aero":true,"trading.aero":true,"trainer.aero":true,"union.aero":true,"workinggroup.aero":true,"works.aero":true,"af":true,"gov.af":true,"com.af":true,"org.af":true,"net.af":true,"edu.af":true,"ag":true,"com.ag":true,"org.ag":true,"net.ag":true,"co.ag":true,"nom.ag":true,"ai":true,"off.ai":true,"com.ai":true,"net.ai":true,"org.ai":true,"al":true,"com.al":true,"edu.al":true,"gov.al":true,"mil.al":true,"net.al":true,"org.al":true,"am":true,"ao":true,"ed.ao":true,"gv.ao":true,"og.ao":true,"co.ao":true,"pb.ao":true,"it.ao":true,"aq":true,"ar":true,"com.ar":true,"edu.ar":true,"gob.ar":true,"gov.ar":true,"int.ar":true,"mil.ar":true,"musica.ar":true,"net.ar":true,"org.ar":true,"tur.ar":true,"arpa":true,"e164.arpa":true,"in-addr.arpa":true,"ip6.arpa":true,"iris.arpa":true,"uri.arpa":true,"urn.arpa":true,"as":true,"gov.as":true,"asia":true,"at":true,"ac.at":true,"co.at":true,"gv.at":true,"or.at":true,"au":true,"com.au":true,"net.au":true,"org.au":true,"edu.au":true,"gov.au":true,"asn.au":true,"id.au":true,"info.au":true,"conf.au":true,"oz.au":true,"act.au":true,"nsw.au":true,"nt.au":true,"qld.au":true,"sa.au":true,"tas.au":true,"vic.au":true,"wa.au":true,"act.edu.au":true,"nsw.edu.au":true,"nt.edu.au":true,"qld.edu.au":true,"sa.edu.au":true,"tas.edu.au":true,"vic.edu.au":true,"wa.edu.au":true,"qld.gov.au":true,"sa.gov.au":true,"tas.gov.au":true,"vic.gov.au":true,"wa.gov.au":true,"aw":true,"com.aw":true,"ax":true,"az":true,"com.az":true,"net.az":true,"int.az":true,"gov.az":true,"org.az":true,"edu.az":true,"info.az":true,"pp.az":true,"mil.az":true,"name.az":true,"pro.az":true,"biz.az":true,"ba":true,"com.ba":true,"edu.ba":true,"gov.ba":true,"mil.ba":true,"net.ba":true,"org.ba":true,"bb":true,"biz.bb":true,"co.bb":true,"com.bb":true,"edu.bb":true,"gov.bb":true,"info.bb":true,"net.bb":true,"org.bb":true,"store.bb":true,"tv.bb":true,"*.bd":true,"be":true,"ac.be":true,"bf":true,"gov.bf":true,"bg":true,"a.bg":true,"b.bg":true,"c.bg":true,"d.bg":true,"e.bg":true,"f.bg":true,"g.bg":true,"h.bg":true,"i.bg":true,"j.bg":true,"k.bg":true,"l.bg":true,"m.bg":true,"n.bg":true,"o.bg":true,"p.bg":true,"q.bg":true,"r.bg":true,"s.bg":true,"t.bg":true,"u.bg":true,"v.bg":true,"w.bg":true,"x.bg":true,"y.bg":true,"z.bg":true,"0.bg":true,"1.bg":true,"2.bg":true,"3.bg":true,"4.bg":true,"5.bg":true,"6.bg":true,"7.bg":true,"8.bg":true,"9.bg":true,"bh":true,"com.bh":true,"edu.bh":true,"net.bh":true,"org.bh":true,"gov.bh":true,"bi":true,"co.bi":true,"com.bi":true,"edu.bi":true,"or.bi":true,"org.bi":true,"biz":true,"bj":true,"asso.bj":true,"barreau.bj":true,"gouv.bj":true,"bm":true,"com.bm":true,"edu.bm":true,"gov.bm":true,"net.bm":true,"org.bm":true,"*.bn":true,"bo":true,"com.bo":true,"edu.bo":true,"gob.bo":true,"int.bo":true,"org.bo":true,"net.bo":true,"mil.bo":true,"tv.bo":true,"web.bo":true,"academia.bo":true,"agro.bo":true,"arte.bo":true,"blog.bo":true,"bolivia.bo":true,"ciencia.bo":true,"cooperativa.bo":true,"democracia.bo":true,"deporte.bo":true,"ecologia.bo":true,"economia.bo":true,"empresa.bo":true,"indigena.bo":true,"industria.bo":true,"info.bo":true,"medicina.bo":true,"movimiento.bo":true,"musica.bo":true,"natural.bo":true,"nombre.bo":true,"noticias.bo":true,"patria.bo":true,"politica.bo":true,"profesional.bo":true,"plurinacional.bo":true,"pueblo.bo":true,"revista.bo":true,"salud.bo":true,"tecnologia.bo":true,"tksat.bo":true,"transporte.bo":true,"wiki.bo":true,"br":true,"9guacu.br":true,"abc.br":true,"adm.br":true,"adv.br":true,"agr.br":true,"aju.br":true,"am.br":true,"anani.br":true,"aparecida.br":true,"arq.br":true,"art.br":true,"ato.br":true,"b.br":true,"belem.br":true,"bhz.br":true,"bio.br":true,"blog.br":true,"bmd.br":true,"boavista.br":true,"bsb.br":true,"campinagrande.br":true,"campinas.br":true,"caxias.br":true,"cim.br":true,"cng.br":true,"cnt.br":true,"com.br":true,"contagem.br":true,"coop.br":true,"cri.br":true,"cuiaba.br":true,"curitiba.br":true,"def.br":true,"ecn.br":true,"eco.br":true,"edu.br":true,"emp.br":true,"eng.br":true,"esp.br":true,"etc.br":true,"eti.br":true,"far.br":true,"feira.br":true,"flog.br":true,"floripa.br":true,"fm.br":true,"fnd.br":true,"fortal.br":true,"fot.br":true,"foz.br":true,"fst.br":true,"g12.br":true,"ggf.br":true,"goiania.br":true,"gov.br":true,"ac.gov.br":true,"al.gov.br":true,"am.gov.br":true,"ap.gov.br":true,"ba.gov.br":true,"ce.gov.br":true,"df.gov.br":true,"es.gov.br":true,"go.gov.br":true,"ma.gov.br":true,"mg.gov.br":true,"ms.gov.br":true,"mt.gov.br":true,"pa.gov.br":true,"pb.gov.br":true,"pe.gov.br":true,"pi.gov.br":true,"pr.gov.br":true,"rj.gov.br":true,"rn.gov.br":true,"ro.gov.br":true,"rr.gov.br":true,"rs.gov.br":true,"sc.gov.br":true,"se.gov.br":true,"sp.gov.br":true,"to.gov.br":true,"gru.br":true,"imb.br":true,"ind.br":true,"inf.br":true,"jab.br":true,"jampa.br":true,"jdf.br":true,"joinville.br":true,"jor.br":true,"jus.br":true,"leg.br":true,"lel.br":true,"londrina.br":true,"macapa.br":true,"maceio.br":true,"manaus.br":true,"maringa.br":true,"mat.br":true,"med.br":true,"mil.br":true,"morena.br":true,"mp.br":true,"mus.br":true,"natal.br":true,"net.br":true,"niteroi.br":true,"*.nom.br":true,"not.br":true,"ntr.br":true,"odo.br":true,"org.br":true,"osasco.br":true,"palmas.br":true,"poa.br":true,"ppg.br":true,"pro.br":true,"psc.br":true,"psi.br":true,"pvh.br":true,"qsl.br":true,"radio.br":true,"rec.br":true,"recife.br":true,"ribeirao.br":true,"rio.br":true,"riobranco.br":true,"riopreto.br":true,"salvador.br":true,"sampa.br":true,"santamaria.br":true,"santoandre.br":true,"saobernardo.br":true,"saogonca.br":true,"sjc.br":true,"slg.br":true,"slz.br":true,"sorocaba.br":true,"srv.br":true,"taxi.br":true,"teo.br":true,"the.br":true,"tmp.br":true,"trd.br":true,"tur.br":true,"tv.br":true,"udi.br":true,"vet.br":true,"vix.br":true,"vlog.br":true,"wiki.br":true,"zlg.br":true,"bs":true,"com.bs":true,"net.bs":true,"org.bs":true,"edu.bs":true,"gov.bs":true,"bt":true,"com.bt":true,"edu.bt":true,"gov.bt":true,"net.bt":true,"org.bt":true,"bv":true,"bw":true,"co.bw":true,"org.bw":true,"by":true,"gov.by":true,"mil.by":true,"com.by":true,"of.by":true,"bz":true,"com.bz":true,"net.bz":true,"org.bz":true,"edu.bz":true,"gov.bz":true,"ca":true,"ab.ca":true,"bc.ca":true,"mb.ca":true,"nb.ca":true,"nf.ca":true,"nl.ca":true,"ns.ca":true,"nt.ca":true,"nu.ca":true,"on.ca":true,"pe.ca":true,"qc.ca":true,"sk.ca":true,"yk.ca":true,"gc.ca":true,"cat":true,"cc":true,"cd":true,"gov.cd":true,"cf":true,"cg":true,"ch":true,"ci":true,"org.ci":true,"or.ci":true,"com.ci":true,"co.ci":true,"edu.ci":true,"ed.ci":true,"ac.ci":true,"net.ci":true,"go.ci":true,"asso.ci":true,"xn--aroport-bya.ci":true,"int.ci":true,"presse.ci":true,"md.ci":true,"gouv.ci":true,"*.ck":true,"www.ck":false,"cl":true,"gov.cl":true,"gob.cl":true,"co.cl":true,"mil.cl":true,"cm":true,"co.cm":true,"com.cm":true,"gov.cm":true,"net.cm":true,"cn":true,"ac.cn":true,"com.cn":true,"edu.cn":true,"gov.cn":true,"net.cn":true,"org.cn":true,"mil.cn":true,"xn--55qx5d.cn":true,"xn--io0a7i.cn":true,"xn--od0alg.cn":true,"ah.cn":true,"bj.cn":true,"cq.cn":true,"fj.cn":true,"gd.cn":true,"gs.cn":true,"gz.cn":true,"gx.cn":true,"ha.cn":true,"hb.cn":true,"he.cn":true,"hi.cn":true,"hl.cn":true,"hn.cn":true,"jl.cn":true,"js.cn":true,"jx.cn":true,"ln.cn":true,"nm.cn":true,"nx.cn":true,"qh.cn":true,"sc.cn":true,"sd.cn":true,"sh.cn":true,"sn.cn":true,"sx.cn":true,"tj.cn":true,"xj.cn":true,"xz.cn":true,"yn.cn":true,"zj.cn":true,"hk.cn":true,"mo.cn":true,"tw.cn":true,"co":true,"arts.co":true,"com.co":true,"edu.co":true,"firm.co":true,"gov.co":true,"info.co":true,"int.co":true,"mil.co":true,"net.co":true,"nom.co":true,"org.co":true,"rec.co":true,"web.co":true,"com":true,"coop":true,"cr":true,"ac.cr":true,"co.cr":true,"ed.cr":true,"fi.cr":true,"go.cr":true,"or.cr":true,"sa.cr":true,"cu":true,"com.cu":true,"edu.cu":true,"org.cu":true,"net.cu":true,"gov.cu":true,"inf.cu":true,"cv":true,"cw":true,"com.cw":true,"edu.cw":true,"net.cw":true,"org.cw":true,"cx":true,"gov.cx":true,"cy":true,"ac.cy":true,"biz.cy":true,"com.cy":true,"ekloges.cy":true,"gov.cy":true,"ltd.cy":true,"name.cy":true,"net.cy":true,"org.cy":true,"parliament.cy":true,"press.cy":true,"pro.cy":true,"tm.cy":true,"cz":true,"de":true,"dj":true,"dk":true,"dm":true,"com.dm":true,"net.dm":true,"org.dm":true,"edu.dm":true,"gov.dm":true,"do":true,"art.do":true,"com.do":true,"edu.do":true,"gob.do":true,"gov.do":true,"mil.do":true,"net.do":true,"org.do":true,"sld.do":true,"web.do":true,"dz":true,"com.dz":true,"org.dz":true,"net.dz":true,"gov.dz":true,"edu.dz":true,"asso.dz":true,"pol.dz":true,"art.dz":true,"ec":true,"com.ec":true,"info.ec":true,"net.ec":true,"fin.ec":true,"k12.ec":true,"med.ec":true,"pro.ec":true,"org.ec":true,"edu.ec":true,"gov.ec":true,"gob.ec":true,"mil.ec":true,"edu":true,"ee":true,"edu.ee":true,"gov.ee":true,"riik.ee":true,"lib.ee":true,"med.ee":true,"com.ee":true,"pri.ee":true,"aip.ee":true,"org.ee":true,"fie.ee":true,"eg":true,"com.eg":true,"edu.eg":true,"eun.eg":true,"gov.eg":true,"mil.eg":true,"name.eg":true,"net.eg":true,"org.eg":true,"sci.eg":true,"*.er":true,"es":true,"com.es":true,"nom.es":true,"org.es":true,"gob.es":true,"edu.es":true,"et":true,"com.et":true,"gov.et":true,"org.et":true,"edu.et":true,"biz.et":true,"name.et":true,"info.et":true,"net.et":true,"eu":true,"fi":true,"aland.fi":true,"*.fj":true,"*.fk":true,"fm":true,"fo":true,"fr":true,"com.fr":true,"asso.fr":true,"nom.fr":true,"prd.fr":true,"presse.fr":true,"tm.fr":true,"aeroport.fr":true,"assedic.fr":true,"avocat.fr":true,"avoues.fr":true,"cci.fr":true,"chambagri.fr":true,"chirurgiens-dentistes.fr":true,"experts-comptables.fr":true,"geometre-expert.fr":true,"gouv.fr":true,"greta.fr":true,"huissier-justice.fr":true,"medecin.fr":true,"notaires.fr":true,"pharmacien.fr":true,"port.fr":true,"veterinaire.fr":true,"ga":true,"gb":true,"gd":true,"ge":true,"com.ge":true,"edu.ge":true,"gov.ge":true,"org.ge":true,"mil.ge":true,"net.ge":true,"pvt.ge":true,"gf":true,"gg":true,"co.gg":true,"net.gg":true,"org.gg":true,"gh":true,"com.gh":true,"edu.gh":true,"gov.gh":true,"org.gh":true,"mil.gh":true,"gi":true,"com.gi":true,"ltd.gi":true,"gov.gi":true,"mod.gi":true,"edu.gi":true,"org.gi":true,"gl":true,"co.gl":true,"com.gl":true,"edu.gl":true,"net.gl":true,"org.gl":true,"gm":true,"gn":true,"ac.gn":true,"com.gn":true,"edu.gn":true,"gov.gn":true,"org.gn":true,"net.gn":true,"gov":true,"gp":true,"com.gp":true,"net.gp":true,"mobi.gp":true,"edu.gp":true,"org.gp":true,"asso.gp":true,"gq":true,"gr":true,"com.gr":true,"edu.gr":true,"net.gr":true,"org.gr":true,"gov.gr":true,"gs":true,"gt":true,"com.gt":true,"edu.gt":true,"gob.gt":true,"ind.gt":true,"mil.gt":true,"net.gt":true,"org.gt":true,"*.gu":true,"gw":true,"gy":true,"co.gy":true,"com.gy":true,"edu.gy":true,"gov.gy":true,"net.gy":true,"org.gy":true,"hk":true,"com.hk":true,"edu.hk":true,"gov.hk":true,"idv.hk":true,"net.hk":true,"org.hk":true,"xn--55qx5d.hk":true,"xn--wcvs22d.hk":true,"xn--lcvr32d.hk":true,"xn--mxtq1m.hk":true,"xn--gmqw5a.hk":true,"xn--ciqpn.hk":true,"xn--gmq050i.hk":true,"xn--zf0avx.hk":true,"xn--io0a7i.hk":true,"xn--mk0axi.hk":true,"xn--od0alg.hk":true,"xn--od0aq3b.hk":true,"xn--tn0ag.hk":true,"xn--uc0atv.hk":true,"xn--uc0ay4a.hk":true,"hm":true,"hn":true,"com.hn":true,"edu.hn":true,"org.hn":true,"net.hn":true,"mil.hn":true,"gob.hn":true,"hr":true,"iz.hr":true,"from.hr":true,"name.hr":true,"com.hr":true,"ht":true,"com.ht":true,"shop.ht":true,"firm.ht":true,"info.ht":true,"adult.ht":true,"net.ht":true,"pro.ht":true,"org.ht":true,"med.ht":true,"art.ht":true,"coop.ht":true,"pol.ht":true,"asso.ht":true,"edu.ht":true,"rel.ht":true,"gouv.ht":true,"perso.ht":true,"hu":true,"co.hu":true,"info.hu":true,"org.hu":true,"priv.hu":true,"sport.hu":true,"tm.hu":true,"2000.hu":true,"agrar.hu":true,"bolt.hu":true,"casino.hu":true,"city.hu":true,"erotica.hu":true,"erotika.hu":true,"film.hu":true,"forum.hu":true,"games.hu":true,"hotel.hu":true,"ingatlan.hu":true,"jogasz.hu":true,"konyvelo.hu":true,"lakas.hu":true,"media.hu":true,"news.hu":true,"reklam.hu":true,"sex.hu":true,"shop.hu":true,"suli.hu":true,"szex.hu":true,"tozsde.hu":true,"utazas.hu":true,"video.hu":true,"id":true,"ac.id":true,"biz.id":true,"co.id":true,"desa.id":true,"go.id":true,"mil.id":true,"my.id":true,"net.id":true,"or.id":true,"sch.id":true,"web.id":true,"ie":true,"gov.ie":true,"il":true,"ac.il":true,"co.il":true,"gov.il":true,"idf.il":true,"k12.il":true,"muni.il":true,"net.il":true,"org.il":true,"im":true,"ac.im":true,"co.im":true,"com.im":true,"ltd.co.im":true,"net.im":true,"org.im":true,"plc.co.im":true,"tt.im":true,"tv.im":true,"in":true,"co.in":true,"firm.in":true,"net.in":true,"org.in":true,"gen.in":true,"ind.in":true,"nic.in":true,"ac.in":true,"edu.in":true,"res.in":true,"gov.in":true,"mil.in":true,"info":true,"int":true,"eu.int":true,"io":true,"com.io":true,"iq":true,"gov.iq":true,"edu.iq":true,"mil.iq":true,"com.iq":true,"org.iq":true,"net.iq":true,"ir":true,"ac.ir":true,"co.ir":true,"gov.ir":true,"id.ir":true,"net.ir":true,"org.ir":true,"sch.ir":true,"xn--mgba3a4f16a.ir":true,"xn--mgba3a4fra.ir":true,"is":true,"net.is":true,"com.is":true,"edu.is":true,"gov.is":true,"org.is":true,"int.is":true,"it":true,"gov.it":true,"edu.it":true,"abr.it":true,"abruzzo.it":true,"aosta-valley.it":true,"aostavalley.it":true,"bas.it":true,"basilicata.it":true,"cal.it":true,"calabria.it":true,"cam.it":true,"campania.it":true,"emilia-romagna.it":true,"emiliaromagna.it":true,"emr.it":true,"friuli-v-giulia.it":true,"friuli-ve-giulia.it":true,"friuli-vegiulia.it":true,"friuli-venezia-giulia.it":true,"friuli-veneziagiulia.it":true,"friuli-vgiulia.it":true,"friuliv-giulia.it":true,"friulive-giulia.it":true,"friulivegiulia.it":true,"friulivenezia-giulia.it":true,"friuliveneziagiulia.it":true,"friulivgiulia.it":true,"fvg.it":true,"laz.it":true,"lazio.it":true,"lig.it":true,"liguria.it":true,"lom.it":true,"lombardia.it":true,"lombardy.it":true,"lucania.it":true,"mar.it":true,"marche.it":true,"mol.it":true,"molise.it":true,"piedmont.it":true,"piemonte.it":true,"pmn.it":true,"pug.it":true,"puglia.it":true,"sar.it":true,"sardegna.it":true,"sardinia.it":true,"sic.it":true,"sicilia.it":true,"sicily.it":true,"taa.it":true,"tos.it":true,"toscana.it":true,"trentino-a-adige.it":true,"trentino-aadige.it":true,"trentino-alto-adige.it":true,"trentino-altoadige.it":true,"trentino-s-tirol.it":true,"trentino-stirol.it":true,"trentino-sud-tirol.it":true,"trentino-sudtirol.it":true,"trentino-sued-tirol.it":true,"trentino-suedtirol.it":true,"trentinoa-adige.it":true,"trentinoaadige.it":true,"trentinoalto-adige.it":true,"trentinoaltoadige.it":true,"trentinos-tirol.it":true,"trentinostirol.it":true,"trentinosud-tirol.it":true,"trentinosudtirol.it":true,"trentinosued-tirol.it":true,"trentinosuedtirol.it":true,"tuscany.it":true,"umb.it":true,"umbria.it":true,"val-d-aosta.it":true,"val-daosta.it":true,"vald-aosta.it":true,"valdaosta.it":true,"valle-aosta.it":true,"valle-d-aosta.it":true,"valle-daosta.it":true,"valleaosta.it":true,"valled-aosta.it":true,"valledaosta.it":true,"vallee-aoste.it":true,"valleeaoste.it":true,"vao.it":true,"vda.it":true,"ven.it":true,"veneto.it":true,"ag.it":true,"agrigento.it":true,"al.it":true,"alessandria.it":true,"alto-adige.it":true,"altoadige.it":true,"an.it":true,"ancona.it":true,"andria-barletta-trani.it":true,"andria-trani-barletta.it":true,"andriabarlettatrani.it":true,"andriatranibarletta.it":true,"ao.it":true,"aosta.it":true,"aoste.it":true,"ap.it":true,"aq.it":true,"aquila.it":true,"ar.it":true,"arezzo.it":true,"ascoli-piceno.it":true,"ascolipiceno.it":true,"asti.it":true,"at.it":true,"av.it":true,"avellino.it":true,"ba.it":true,"balsan.it":true,"bari.it":true,"barletta-trani-andria.it":true,"barlettatraniandria.it":true,"belluno.it":true,"benevento.it":true,"bergamo.it":true,"bg.it":true,"bi.it":true,"biella.it":true,"bl.it":true,"bn.it":true,"bo.it":true,"bologna.it":true,"bolzano.it":true,"bozen.it":true,"br.it":true,"brescia.it":true,"brindisi.it":true,"bs.it":true,"bt.it":true,"bz.it":true,"ca.it":true,"cagliari.it":true,"caltanissetta.it":true,"campidano-medio.it":true,"campidanomedio.it":true,"campobasso.it":true,"carbonia-iglesias.it":true,"carboniaiglesias.it":true,"carrara-massa.it":true,"carraramassa.it":true,"caserta.it":true,"catania.it":true,"catanzaro.it":true,"cb.it":true,"ce.it":true,"cesena-forli.it":true,"cesenaforli.it":true,"ch.it":true,"chieti.it":true,"ci.it":true,"cl.it":true,"cn.it":true,"co.it":true,"como.it":true,"cosenza.it":true,"cr.it":true,"cremona.it":true,"crotone.it":true,"cs.it":true,"ct.it":true,"cuneo.it":true,"cz.it":true,"dell-ogliastra.it":true,"dellogliastra.it":true,"en.it":true,"enna.it":true,"fc.it":true,"fe.it":true,"fermo.it":true,"ferrara.it":true,"fg.it":true,"fi.it":true,"firenze.it":true,"florence.it":true,"fm.it":true,"foggia.it":true,"forli-cesena.it":true,"forlicesena.it":true,"fr.it":true,"frosinone.it":true,"ge.it":true,"genoa.it":true,"genova.it":true,"go.it":true,"gorizia.it":true,"gr.it":true,"grosseto.it":true,"iglesias-carbonia.it":true,"iglesiascarbonia.it":true,"im.it":true,"imperia.it":true,"is.it":true,"isernia.it":true,"kr.it":true,"la-spezia.it":true,"laquila.it":true,"laspezia.it":true,"latina.it":true,"lc.it":true,"le.it":true,"lecce.it":true,"lecco.it":true,"li.it":true,"livorno.it":true,"lo.it":true,"lodi.it":true,"lt.it":true,"lu.it":true,"lucca.it":true,"macerata.it":true,"mantova.it":true,"massa-carrara.it":true,"massacarrara.it":true,"matera.it":true,"mb.it":true,"mc.it":true,"me.it":true,"medio-campidano.it":true,"mediocampidano.it":true,"messina.it":true,"mi.it":true,"milan.it":true,"milano.it":true,"mn.it":true,"mo.it":true,"modena.it":true,"monza-brianza.it":true,"monza-e-della-brianza.it":true,"monza.it":true,"monzabrianza.it":true,"monzaebrianza.it":true,"monzaedellabrianza.it":true,"ms.it":true,"mt.it":true,"na.it":true,"naples.it":true,"napoli.it":true,"no.it":true,"novara.it":true,"nu.it":true,"nuoro.it":true,"og.it":true,"ogliastra.it":true,"olbia-tempio.it":true,"olbiatempio.it":true,"or.it":true,"oristano.it":true,"ot.it":true,"pa.it":true,"padova.it":true,"padua.it":true,"palermo.it":true,"parma.it":true,"pavia.it":true,"pc.it":true,"pd.it":true,"pe.it":true,"perugia.it":true,"pesaro-urbino.it":true,"pesarourbino.it":true,"pescara.it":true,"pg.it":true,"pi.it":true,"piacenza.it":true,"pisa.it":true,"pistoia.it":true,"pn.it":true,"po.it":true,"pordenone.it":true,"potenza.it":true,"pr.it":true,"prato.it":true,"pt.it":true,"pu.it":true,"pv.it":true,"pz.it":true,"ra.it":true,"ragusa.it":true,"ravenna.it":true,"rc.it":true,"re.it":true,"reggio-calabria.it":true,"reggio-emilia.it":true,"reggiocalabria.it":true,"reggioemilia.it":true,"rg.it":true,"ri.it":true,"rieti.it":true,"rimini.it":true,"rm.it":true,"rn.it":true,"ro.it":true,"roma.it":true,"rome.it":true,"rovigo.it":true,"sa.it":true,"salerno.it":true,"sassari.it":true,"savona.it":true,"si.it":true,"siena.it":true,"siracusa.it":true,"so.it":true,"sondrio.it":true,"sp.it":true,"sr.it":true,"ss.it":true,"suedtirol.it":true,"sv.it":true,"ta.it":true,"taranto.it":true,"te.it":true,"tempio-olbia.it":true,"tempioolbia.it":true,"teramo.it":true,"terni.it":true,"tn.it":true,"to.it":true,"torino.it":true,"tp.it":true,"tr.it":true,"trani-andria-barletta.it":true,"trani-barletta-andria.it":true,"traniandriabarletta.it":true,"tranibarlettaandria.it":true,"trapani.it":true,"trentino.it":true,"trento.it":true,"treviso.it":true,"trieste.it":true,"ts.it":true,"turin.it":true,"tv.it":true,"ud.it":true,"udine.it":true,"urbino-pesaro.it":true,"urbinopesaro.it":true,"va.it":true,"varese.it":true,"vb.it":true,"vc.it":true,"ve.it":true,"venezia.it":true,"venice.it":true,"verbania.it":true,"vercelli.it":true,"verona.it":true,"vi.it":true,"vibo-valentia.it":true,"vibovalentia.it":true,"vicenza.it":true,"viterbo.it":true,"vr.it":true,"vs.it":true,"vt.it":true,"vv.it":true,"je":true,"co.je":true,"net.je":true,"org.je":true,"*.jm":true,"jo":true,"com.jo":true,"org.jo":true,"net.jo":true,"edu.jo":true,"sch.jo":true,"gov.jo":true,"mil.jo":true,"name.jo":true,"jobs":true,"jp":true,"ac.jp":true,"ad.jp":true,"co.jp":true,"ed.jp":true,"go.jp":true,"gr.jp":true,"lg.jp":true,"ne.jp":true,"or.jp":true,"aichi.jp":true,"akita.jp":true,"aomori.jp":true,"chiba.jp":true,"ehime.jp":true,"fukui.jp":true,"fukuoka.jp":true,"fukushima.jp":true,"gifu.jp":true,"gunma.jp":true,"hiroshima.jp":true,"hokkaido.jp":true,"hyogo.jp":true,"ibaraki.jp":true,"ishikawa.jp":true,"iwate.jp":true,"kagawa.jp":true,"kagoshima.jp":true,"kanagawa.jp":true,"kochi.jp":true,"kumamoto.jp":true,"kyoto.jp":true,"mie.jp":true,"miyagi.jp":true,"miyazaki.jp":true,"nagano.jp":true,"nagasaki.jp":true,"nara.jp":true,"niigata.jp":true,"oita.jp":true,"okayama.jp":true,"okinawa.jp":true,"osaka.jp":true,"saga.jp":true,"saitama.jp":true,"shiga.jp":true,"shimane.jp":true,"shizuoka.jp":true,"tochigi.jp":true,"tokushima.jp":true,"tokyo.jp":true,"tottori.jp":true,"toyama.jp":true,"wakayama.jp":true,"yamagata.jp":true,"yamaguchi.jp":true,"yamanashi.jp":true,"xn--4pvxs.jp":true,"xn--vgu402c.jp":true,"xn--c3s14m.jp":true,"xn--f6qx53a.jp":true,"xn--8pvr4u.jp":true,"xn--uist22h.jp":true,"xn--djrs72d6uy.jp":true,"xn--mkru45i.jp":true,"xn--0trq7p7nn.jp":true,"xn--8ltr62k.jp":true,"xn--2m4a15e.jp":true,"xn--efvn9s.jp":true,"xn--32vp30h.jp":true,"xn--4it797k.jp":true,"xn--1lqs71d.jp":true,"xn--5rtp49c.jp":true,"xn--5js045d.jp":true,"xn--ehqz56n.jp":true,"xn--1lqs03n.jp":true,"xn--qqqt11m.jp":true,"xn--kbrq7o.jp":true,"xn--pssu33l.jp":true,"xn--ntsq17g.jp":true,"xn--uisz3g.jp":true,"xn--6btw5a.jp":true,"xn--1ctwo.jp":true,"xn--6orx2r.jp":true,"xn--rht61e.jp":true,"xn--rht27z.jp":true,"xn--djty4k.jp":true,"xn--nit225k.jp":true,"xn--rht3d.jp":true,"xn--klty5x.jp":true,"xn--kltx9a.jp":true,"xn--kltp7d.jp":true,"xn--uuwu58a.jp":true,"xn--zbx025d.jp":true,"xn--ntso0iqx3a.jp":true,"xn--elqq16h.jp":true,"xn--4it168d.jp":true,"xn--klt787d.jp":true,"xn--rny31h.jp":true,"xn--7t0a264c.jp":true,"xn--5rtq34k.jp":true,"xn--k7yn95e.jp":true,"xn--tor131o.jp":true,"xn--d5qv7z876c.jp":true,"*.kawasaki.jp":true,"*.kitakyushu.jp":true,"*.kobe.jp":true,"*.nagoya.jp":true,"*.sapporo.jp":true,"*.sendai.jp":true,"*.yokohama.jp":true,"city.kawasaki.jp":false,"city.kitakyushu.jp":false,"city.kobe.jp":false,"city.nagoya.jp":false,"city.sapporo.jp":false,"city.sendai.jp":false,"city.yokohama.jp":false,"aisai.aichi.jp":true,"ama.aichi.jp":true,"anjo.aichi.jp":true,"asuke.aichi.jp":true,"chiryu.aichi.jp":true,"chita.aichi.jp":true,"fuso.aichi.jp":true,"gamagori.aichi.jp":true,"handa.aichi.jp":true,"hazu.aichi.jp":true,"hekinan.aichi.jp":true,"higashiura.aichi.jp":true,"ichinomiya.aichi.jp":true,"inazawa.aichi.jp":true,"inuyama.aichi.jp":true,"isshiki.aichi.jp":true,"iwakura.aichi.jp":true,"kanie.aichi.jp":true,"kariya.aichi.jp":true,"kasugai.aichi.jp":true,"kira.aichi.jp":true,"kiyosu.aichi.jp":true,"komaki.aichi.jp":true,"konan.aichi.jp":true,"kota.aichi.jp":true,"mihama.aichi.jp":true,"miyoshi.aichi.jp":true,"nishio.aichi.jp":true,"nisshin.aichi.jp":true,"obu.aichi.jp":true,"oguchi.aichi.jp":true,"oharu.aichi.jp":true,"okazaki.aichi.jp":true,"owariasahi.aichi.jp":true,"seto.aichi.jp":true,"shikatsu.aichi.jp":true,"shinshiro.aichi.jp":true,"shitara.aichi.jp":true,"tahara.aichi.jp":true,"takahama.aichi.jp":true,"tobishima.aichi.jp":true,"toei.aichi.jp":true,"togo.aichi.jp":true,"tokai.aichi.jp":true,"tokoname.aichi.jp":true,"toyoake.aichi.jp":true,"toyohashi.aichi.jp":true,"toyokawa.aichi.jp":true,"toyone.aichi.jp":true,"toyota.aichi.jp":true,"tsushima.aichi.jp":true,"yatomi.aichi.jp":true,"akita.akita.jp":true,"daisen.akita.jp":true,"fujisato.akita.jp":true,"gojome.akita.jp":true,"hachirogata.akita.jp":true,"happou.akita.jp":true,"higashinaruse.akita.jp":true,"honjo.akita.jp":true,"honjyo.akita.jp":true,"ikawa.akita.jp":true,"kamikoani.akita.jp":true,"kamioka.akita.jp":true,"katagami.akita.jp":true,"kazuno.akita.jp":true,"kitaakita.akita.jp":true,"kosaka.akita.jp":true,"kyowa.akita.jp":true,"misato.akita.jp":true,"mitane.akita.jp":true,"moriyoshi.akita.jp":true,"nikaho.akita.jp":true,"noshiro.akita.jp":true,"odate.akita.jp":true,"oga.akita.jp":true,"ogata.akita.jp":true,"semboku.akita.jp":true,"yokote.akita.jp":true,"yurihonjo.akita.jp":true,"aomori.aomori.jp":true,"gonohe.aomori.jp":true,"hachinohe.aomori.jp":true,"hashikami.aomori.jp":true,"hiranai.aomori.jp":true,"hirosaki.aomori.jp":true,"itayanagi.aomori.jp":true,"kuroishi.aomori.jp":true,"misawa.aomori.jp":true,"mutsu.aomori.jp":true,"nakadomari.aomori.jp":true,"noheji.aomori.jp":true,"oirase.aomori.jp":true,"owani.aomori.jp":true,"rokunohe.aomori.jp":true,"sannohe.aomori.jp":true,"shichinohe.aomori.jp":true,"shingo.aomori.jp":true,"takko.aomori.jp":true,"towada.aomori.jp":true,"tsugaru.aomori.jp":true,"tsuruta.aomori.jp":true,"abiko.chiba.jp":true,"asahi.chiba.jp":true,"chonan.chiba.jp":true,"chosei.chiba.jp":true,"choshi.chiba.jp":true,"chuo.chiba.jp":true,"funabashi.chiba.jp":true,"futtsu.chiba.jp":true,"hanamigawa.chiba.jp":true,"ichihara.chiba.jp":true,"ichikawa.chiba.jp":true,"ichinomiya.chiba.jp":true,"inzai.chiba.jp":true,"isumi.chiba.jp":true,"kamagaya.chiba.jp":true,"kamogawa.chiba.jp":true,"kashiwa.chiba.jp":true,"katori.chiba.jp":true,"katsuura.chiba.jp":true,"kimitsu.chiba.jp":true,"kisarazu.chiba.jp":true,"kozaki.chiba.jp":true,"kujukuri.chiba.jp":true,"kyonan.chiba.jp":true,"matsudo.chiba.jp":true,"midori.chiba.jp":true,"mihama.chiba.jp":true,"minamiboso.chiba.jp":true,"mobara.chiba.jp":true,"mutsuzawa.chiba.jp":true,"nagara.chiba.jp":true,"nagareyama.chiba.jp":true,"narashino.chiba.jp":true,"narita.chiba.jp":true,"noda.chiba.jp":true,"oamishirasato.chiba.jp":true,"omigawa.chiba.jp":true,"onjuku.chiba.jp":true,"otaki.chiba.jp":true,"sakae.chiba.jp":true,"sakura.chiba.jp":true,"shimofusa.chiba.jp":true,"shirako.chiba.jp":true,"shiroi.chiba.jp":true,"shisui.chiba.jp":true,"sodegaura.chiba.jp":true,"sosa.chiba.jp":true,"tako.chiba.jp":true,"tateyama.chiba.jp":true,"togane.chiba.jp":true,"tohnosho.chiba.jp":true,"tomisato.chiba.jp":true,"urayasu.chiba.jp":true,"yachimata.chiba.jp":true,"yachiyo.chiba.jp":true,"yokaichiba.chiba.jp":true,"yokoshibahikari.chiba.jp":true,"yotsukaido.chiba.jp":true,"ainan.ehime.jp":true,"honai.ehime.jp":true,"ikata.ehime.jp":true,"imabari.ehime.jp":true,"iyo.ehime.jp":true,"kamijima.ehime.jp":true,"kihoku.ehime.jp":true,"kumakogen.ehime.jp":true,"masaki.ehime.jp":true,"matsuno.ehime.jp":true,"matsuyama.ehime.jp":true,"namikata.ehime.jp":true,"niihama.ehime.jp":true,"ozu.ehime.jp":true,"saijo.ehime.jp":true,"seiyo.ehime.jp":true,"shikokuchuo.ehime.jp":true,"tobe.ehime.jp":true,"toon.ehime.jp":true,"uchiko.ehime.jp":true,"uwajima.ehime.jp":true,"yawatahama.ehime.jp":true,"echizen.fukui.jp":true,"eiheiji.fukui.jp":true,"fukui.fukui.jp":true,"ikeda.fukui.jp":true,"katsuyama.fukui.jp":true,"mihama.fukui.jp":true,"minamiechizen.fukui.jp":true,"obama.fukui.jp":true,"ohi.fukui.jp":true,"ono.fukui.jp":true,"sabae.fukui.jp":true,"sakai.fukui.jp":true,"takahama.fukui.jp":true,"tsuruga.fukui.jp":true,"wakasa.fukui.jp":true,"ashiya.fukuoka.jp":true,"buzen.fukuoka.jp":true,"chikugo.fukuoka.jp":true,"chikuho.fukuoka.jp":true,"chikujo.fukuoka.jp":true,"chikushino.fukuoka.jp":true,"chikuzen.fukuoka.jp":true,"chuo.fukuoka.jp":true,"dazaifu.fukuoka.jp":true,"fukuchi.fukuoka.jp":true,"hakata.fukuoka.jp":true,"higashi.fukuoka.jp":true,"hirokawa.fukuoka.jp":true,"hisayama.fukuoka.jp":true,"iizuka.fukuoka.jp":true,"inatsuki.fukuoka.jp":true,"kaho.fukuoka.jp":true,"kasuga.fukuoka.jp":true,"kasuya.fukuoka.jp":true,"kawara.fukuoka.jp":true,"keisen.fukuoka.jp":true,"koga.fukuoka.jp":true,"kurate.fukuoka.jp":true,"kurogi.fukuoka.jp":true,"kurume.fukuoka.jp":true,"minami.fukuoka.jp":true,"miyako.fukuoka.jp":true,"miyama.fukuoka.jp":true,"miyawaka.fukuoka.jp":true,"mizumaki.fukuoka.jp":true,"munakata.fukuoka.jp":true,"nakagawa.fukuoka.jp":true,"nakama.fukuoka.jp":true,"nishi.fukuoka.jp":true,"nogata.fukuoka.jp":true,"ogori.fukuoka.jp":true,"okagaki.fukuoka.jp":true,"okawa.fukuoka.jp":true,"oki.fukuoka.jp":true,"omuta.fukuoka.jp":true,"onga.fukuoka.jp":true,"onojo.fukuoka.jp":true,"oto.fukuoka.jp":true,"saigawa.fukuoka.jp":true,"sasaguri.fukuoka.jp":true,"shingu.fukuoka.jp":true,"shinyoshitomi.fukuoka.jp":true,"shonai.fukuoka.jp":true,"soeda.fukuoka.jp":true,"sue.fukuoka.jp":true,"tachiarai.fukuoka.jp":true,"tagawa.fukuoka.jp":true,"takata.fukuoka.jp":true,"toho.fukuoka.jp":true,"toyotsu.fukuoka.jp":true,"tsuiki.fukuoka.jp":true,"ukiha.fukuoka.jp":true,"umi.fukuoka.jp":true,"usui.fukuoka.jp":true,"yamada.fukuoka.jp":true,"yame.fukuoka.jp":true,"yanagawa.fukuoka.jp":true,"yukuhashi.fukuoka.jp":true,"aizubange.fukushima.jp":true,"aizumisato.fukushima.jp":true,"aizuwakamatsu.fukushima.jp":true,"asakawa.fukushima.jp":true,"bandai.fukushima.jp":true,"date.fukushima.jp":true,"fukushima.fukushima.jp":true,"furudono.fukushima.jp":true,"futaba.fukushima.jp":true,"hanawa.fukushima.jp":true,"higashi.fukushima.jp":true,"hirata.fukushima.jp":true,"hirono.fukushima.jp":true,"iitate.fukushima.jp":true,"inawashiro.fukushima.jp":true,"ishikawa.fukushima.jp":true,"iwaki.fukushima.jp":true,"izumizaki.fukushima.jp":true,"kagamiishi.fukushima.jp":true,"kaneyama.fukushima.jp":true,"kawamata.fukushima.jp":true,"kitakata.fukushima.jp":true,"kitashiobara.fukushima.jp":true,"koori.fukushima.jp":true,"koriyama.fukushima.jp":true,"kunimi.fukushima.jp":true,"miharu.fukushima.jp":true,"mishima.fukushima.jp":true,"namie.fukushima.jp":true,"nango.fukushima.jp":true,"nishiaizu.fukushima.jp":true,"nishigo.fukushima.jp":true,"okuma.fukushima.jp":true,"omotego.fukushima.jp":true,"ono.fukushima.jp":true,"otama.fukushima.jp":true,"samegawa.fukushima.jp":true,"shimogo.fukushima.jp":true,"shirakawa.fukushima.jp":true,"showa.fukushima.jp":true,"soma.fukushima.jp":true,"sukagawa.fukushima.jp":true,"taishin.fukushima.jp":true,"tamakawa.fukushima.jp":true,"tanagura.fukushima.jp":true,"tenei.fukushima.jp":true,"yabuki.fukushima.jp":true,"yamato.fukushima.jp":true,"yamatsuri.fukushima.jp":true,"yanaizu.fukushima.jp":true,"yugawa.fukushima.jp":true,"anpachi.gifu.jp":true,"ena.gifu.jp":true,"gifu.gifu.jp":true,"ginan.gifu.jp":true,"godo.gifu.jp":true,"gujo.gifu.jp":true,"hashima.gifu.jp":true,"hichiso.gifu.jp":true,"hida.gifu.jp":true,"higashishirakawa.gifu.jp":true,"ibigawa.gifu.jp":true,"ikeda.gifu.jp":true,"kakamigahara.gifu.jp":true,"kani.gifu.jp":true,"kasahara.gifu.jp":true,"kasamatsu.gifu.jp":true,"kawaue.gifu.jp":true,"kitagata.gifu.jp":true,"mino.gifu.jp":true,"minokamo.gifu.jp":true,"mitake.gifu.jp":true,"mizunami.gifu.jp":true,"motosu.gifu.jp":true,"nakatsugawa.gifu.jp":true,"ogaki.gifu.jp":true,"sakahogi.gifu.jp":true,"seki.gifu.jp":true,"sekigahara.gifu.jp":true,"shirakawa.gifu.jp":true,"tajimi.gifu.jp":true,"takayama.gifu.jp":true,"tarui.gifu.jp":true,"toki.gifu.jp":true,"tomika.gifu.jp":true,"wanouchi.gifu.jp":true,"yamagata.gifu.jp":true,"yaotsu.gifu.jp":true,"yoro.gifu.jp":true,"annaka.gunma.jp":true,"chiyoda.gunma.jp":true,"fujioka.gunma.jp":true,"higashiagatsuma.gunma.jp":true,"isesaki.gunma.jp":true,"itakura.gunma.jp":true,"kanna.gunma.jp":true,"kanra.gunma.jp":true,"katashina.gunma.jp":true,"kawaba.gunma.jp":true,"kiryu.gunma.jp":true,"kusatsu.gunma.jp":true,"maebashi.gunma.jp":true,"meiwa.gunma.jp":true,"midori.gunma.jp":true,"minakami.gunma.jp":true,"naganohara.gunma.jp":true,"nakanojo.gunma.jp":true,"nanmoku.gunma.jp":true,"numata.gunma.jp":true,"oizumi.gunma.jp":true,"ora.gunma.jp":true,"ota.gunma.jp":true,"shibukawa.gunma.jp":true,"shimonita.gunma.jp":true,"shinto.gunma.jp":true,"showa.gunma.jp":true,"takasaki.gunma.jp":true,"takayama.gunma.jp":true,"tamamura.gunma.jp":true,"tatebayashi.gunma.jp":true,"tomioka.gunma.jp":true,"tsukiyono.gunma.jp":true,"tsumagoi.gunma.jp":true,"ueno.gunma.jp":true,"yoshioka.gunma.jp":true,"asaminami.hiroshima.jp":true,"daiwa.hiroshima.jp":true,"etajima.hiroshima.jp":true,"fuchu.hiroshima.jp":true,"fukuyama.hiroshima.jp":true,"hatsukaichi.hiroshima.jp":true,"higashihiroshima.hiroshima.jp":true,"hongo.hiroshima.jp":true,"jinsekikogen.hiroshima.jp":true,"kaita.hiroshima.jp":true,"kui.hiroshima.jp":true,"kumano.hiroshima.jp":true,"kure.hiroshima.jp":true,"mihara.hiroshima.jp":true,"miyoshi.hiroshima.jp":true,"naka.hiroshima.jp":true,"onomichi.hiroshima.jp":true,"osakikamijima.hiroshima.jp":true,"otake.hiroshima.jp":true,"saka.hiroshima.jp":true,"sera.hiroshima.jp":true,"seranishi.hiroshima.jp":true,"shinichi.hiroshima.jp":true,"shobara.hiroshima.jp":true,"takehara.hiroshima.jp":true,"abashiri.hokkaido.jp":true,"abira.hokkaido.jp":true,"aibetsu.hokkaido.jp":true,"akabira.hokkaido.jp":true,"akkeshi.hokkaido.jp":true,"asahikawa.hokkaido.jp":true,"ashibetsu.hokkaido.jp":true,"ashoro.hokkaido.jp":true,"assabu.hokkaido.jp":true,"atsuma.hokkaido.jp":true,"bibai.hokkaido.jp":true,"biei.hokkaido.jp":true,"bifuka.hokkaido.jp":true,"bihoro.hokkaido.jp":true,"biratori.hokkaido.jp":true,"chippubetsu.hokkaido.jp":true,"chitose.hokkaido.jp":true,"date.hokkaido.jp":true,"ebetsu.hokkaido.jp":true,"embetsu.hokkaido.jp":true,"eniwa.hokkaido.jp":true,"erimo.hokkaido.jp":true,"esan.hokkaido.jp":true,"esashi.hokkaido.jp":true,"fukagawa.hokkaido.jp":true,"fukushima.hokkaido.jp":true,"furano.hokkaido.jp":true,"furubira.hokkaido.jp":true,"haboro.hokkaido.jp":true,"hakodate.hokkaido.jp":true,"hamatonbetsu.hokkaido.jp":true,"hidaka.hokkaido.jp":true,"higashikagura.hokkaido.jp":true,"higashikawa.hokkaido.jp":true,"hiroo.hokkaido.jp":true,"hokuryu.hokkaido.jp":true,"hokuto.hokkaido.jp":true,"honbetsu.hokkaido.jp":true,"horokanai.hokkaido.jp":true,"horonobe.hokkaido.jp":true,"ikeda.hokkaido.jp":true,"imakane.hokkaido.jp":true,"ishikari.hokkaido.jp":true,"iwamizawa.hokkaido.jp":true,"iwanai.hokkaido.jp":true,"kamifurano.hokkaido.jp":true,"kamikawa.hokkaido.jp":true,"kamishihoro.hokkaido.jp":true,"kamisunagawa.hokkaido.jp":true,"kamoenai.hokkaido.jp":true,"kayabe.hokkaido.jp":true,"kembuchi.hokkaido.jp":true,"kikonai.hokkaido.jp":true,"kimobetsu.hokkaido.jp":true,"kitahiroshima.hokkaido.jp":true,"kitami.hokkaido.jp":true,"kiyosato.hokkaido.jp":true,"koshimizu.hokkaido.jp":true,"kunneppu.hokkaido.jp":true,"kuriyama.hokkaido.jp":true,"kuromatsunai.hokkaido.jp":true,"kushiro.hokkaido.jp":true,"kutchan.hokkaido.jp":true,"kyowa.hokkaido.jp":true,"mashike.hokkaido.jp":true,"matsumae.hokkaido.jp":true,"mikasa.hokkaido.jp":true,"minamifurano.hokkaido.jp":true,"mombetsu.hokkaido.jp":true,"moseushi.hokkaido.jp":true,"mukawa.hokkaido.jp":true,"muroran.hokkaido.jp":true,"naie.hokkaido.jp":true,"nakagawa.hokkaido.jp":true,"nakasatsunai.hokkaido.jp":true,"nakatombetsu.hokkaido.jp":true,"nanae.hokkaido.jp":true,"nanporo.hokkaido.jp":true,"nayoro.hokkaido.jp":true,"nemuro.hokkaido.jp":true,"niikappu.hokkaido.jp":true,"niki.hokkaido.jp":true,"nishiokoppe.hokkaido.jp":true,"noboribetsu.hokkaido.jp":true,"numata.hokkaido.jp":true,"obihiro.hokkaido.jp":true,"obira.hokkaido.jp":true,"oketo.hokkaido.jp":true,"okoppe.hokkaido.jp":true,"otaru.hokkaido.jp":true,"otobe.hokkaido.jp":true,"otofuke.hokkaido.jp":true,"otoineppu.hokkaido.jp":true,"oumu.hokkaido.jp":true,"ozora.hokkaido.jp":true,"pippu.hokkaido.jp":true,"rankoshi.hokkaido.jp":true,"rebun.hokkaido.jp":true,"rikubetsu.hokkaido.jp":true,"rishiri.hokkaido.jp":true,"rishirifuji.hokkaido.jp":true,"saroma.hokkaido.jp":true,"sarufutsu.hokkaido.jp":true,"shakotan.hokkaido.jp":true,"shari.hokkaido.jp":true,"shibecha.hokkaido.jp":true,"shibetsu.hokkaido.jp":true,"shikabe.hokkaido.jp":true,"shikaoi.hokkaido.jp":true,"shimamaki.hokkaido.jp":true,"shimizu.hokkaido.jp":true,"shimokawa.hokkaido.jp":true,"shinshinotsu.hokkaido.jp":true,"shintoku.hokkaido.jp":true,"shiranuka.hokkaido.jp":true,"shiraoi.hokkaido.jp":true,"shiriuchi.hokkaido.jp":true,"sobetsu.hokkaido.jp":true,"sunagawa.hokkaido.jp":true,"taiki.hokkaido.jp":true,"takasu.hokkaido.jp":true,"takikawa.hokkaido.jp":true,"takinoue.hokkaido.jp":true,"teshikaga.hokkaido.jp":true,"tobetsu.hokkaido.jp":true,"tohma.hokkaido.jp":true,"tomakomai.hokkaido.jp":true,"tomari.hokkaido.jp":true,"toya.hokkaido.jp":true,"toyako.hokkaido.jp":true,"toyotomi.hokkaido.jp":true,"toyoura.hokkaido.jp":true,"tsubetsu.hokkaido.jp":true,"tsukigata.hokkaido.jp":true,"urakawa.hokkaido.jp":true,"urausu.hokkaido.jp":true,"uryu.hokkaido.jp":true,"utashinai.hokkaido.jp":true,"wakkanai.hokkaido.jp":true,"wassamu.hokkaido.jp":true,"yakumo.hokkaido.jp":true,"yoichi.hokkaido.jp":true,"aioi.hyogo.jp":true,"akashi.hyogo.jp":true,"ako.hyogo.jp":true,"amagasaki.hyogo.jp":true,"aogaki.hyogo.jp":true,"asago.hyogo.jp":true,"ashiya.hyogo.jp":true,"awaji.hyogo.jp":true,"fukusaki.hyogo.jp":true,"goshiki.hyogo.jp":true,"harima.hyogo.jp":true,"himeji.hyogo.jp":true,"ichikawa.hyogo.jp":true,"inagawa.hyogo.jp":true,"itami.hyogo.jp":true,"kakogawa.hyogo.jp":true,"kamigori.hyogo.jp":true,"kamikawa.hyogo.jp":true,"kasai.hyogo.jp":true,"kasuga.hyogo.jp":true,"kawanishi.hyogo.jp":true,"miki.hyogo.jp":true,"minamiawaji.hyogo.jp":true,"nishinomiya.hyogo.jp":true,"nishiwaki.hyogo.jp":true,"ono.hyogo.jp":true,"sanda.hyogo.jp":true,"sannan.hyogo.jp":true,"sasayama.hyogo.jp":true,"sayo.hyogo.jp":true,"shingu.hyogo.jp":true,"shinonsen.hyogo.jp":true,"shiso.hyogo.jp":true,"sumoto.hyogo.jp":true,"taishi.hyogo.jp":true,"taka.hyogo.jp":true,"takarazuka.hyogo.jp":true,"takasago.hyogo.jp":true,"takino.hyogo.jp":true,"tamba.hyogo.jp":true,"tatsuno.hyogo.jp":true,"toyooka.hyogo.jp":true,"yabu.hyogo.jp":true,"yashiro.hyogo.jp":true,"yoka.hyogo.jp":true,"yokawa.hyogo.jp":true,"ami.ibaraki.jp":true,"asahi.ibaraki.jp":true,"bando.ibaraki.jp":true,"chikusei.ibaraki.jp":true,"daigo.ibaraki.jp":true,"fujishiro.ibaraki.jp":true,"hitachi.ibaraki.jp":true,"hitachinaka.ibaraki.jp":true,"hitachiomiya.ibaraki.jp":true,"hitachiota.ibaraki.jp":true,"ibaraki.ibaraki.jp":true,"ina.ibaraki.jp":true,"inashiki.ibaraki.jp":true,"itako.ibaraki.jp":true,"iwama.ibaraki.jp":true,"joso.ibaraki.jp":true,"kamisu.ibaraki.jp":true,"kasama.ibaraki.jp":true,"kashima.ibaraki.jp":true,"kasumigaura.ibaraki.jp":true,"koga.ibaraki.jp":true,"miho.ibaraki.jp":true,"mito.ibaraki.jp":true,"moriya.ibaraki.jp":true,"naka.ibaraki.jp":true,"namegata.ibaraki.jp":true,"oarai.ibaraki.jp":true,"ogawa.ibaraki.jp":true,"omitama.ibaraki.jp":true,"ryugasaki.ibaraki.jp":true,"sakai.ibaraki.jp":true,"sakuragawa.ibaraki.jp":true,"shimodate.ibaraki.jp":true,"shimotsuma.ibaraki.jp":true,"shirosato.ibaraki.jp":true,"sowa.ibaraki.jp":true,"suifu.ibaraki.jp":true,"takahagi.ibaraki.jp":true,"tamatsukuri.ibaraki.jp":true,"tokai.ibaraki.jp":true,"tomobe.ibaraki.jp":true,"tone.ibaraki.jp":true,"toride.ibaraki.jp":true,"tsuchiura.ibaraki.jp":true,"tsukuba.ibaraki.jp":true,"uchihara.ibaraki.jp":true,"ushiku.ibaraki.jp":true,"yachiyo.ibaraki.jp":true,"yamagata.ibaraki.jp":true,"yawara.ibaraki.jp":true,"yuki.ibaraki.jp":true,"anamizu.ishikawa.jp":true,"hakui.ishikawa.jp":true,"hakusan.ishikawa.jp":true,"kaga.ishikawa.jp":true,"kahoku.ishikawa.jp":true,"kanazawa.ishikawa.jp":true,"kawakita.ishikawa.jp":true,"komatsu.ishikawa.jp":true,"nakanoto.ishikawa.jp":true,"nanao.ishikawa.jp":true,"nomi.ishikawa.jp":true,"nonoichi.ishikawa.jp":true,"noto.ishikawa.jp":true,"shika.ishikawa.jp":true,"suzu.ishikawa.jp":true,"tsubata.ishikawa.jp":true,"tsurugi.ishikawa.jp":true,"uchinada.ishikawa.jp":true,"wajima.ishikawa.jp":true,"fudai.iwate.jp":true,"fujisawa.iwate.jp":true,"hanamaki.iwate.jp":true,"hiraizumi.iwate.jp":true,"hirono.iwate.jp":true,"ichinohe.iwate.jp":true,"ichinoseki.iwate.jp":true,"iwaizumi.iwate.jp":true,"iwate.iwate.jp":true,"joboji.iwate.jp":true,"kamaishi.iwate.jp":true,"kanegasaki.iwate.jp":true,"karumai.iwate.jp":true,"kawai.iwate.jp":true,"kitakami.iwate.jp":true,"kuji.iwate.jp":true,"kunohe.iwate.jp":true,"kuzumaki.iwate.jp":true,"miyako.iwate.jp":true,"mizusawa.iwate.jp":true,"morioka.iwate.jp":true,"ninohe.iwate.jp":true,"noda.iwate.jp":true,"ofunato.iwate.jp":true,"oshu.iwate.jp":true,"otsuchi.iwate.jp":true,"rikuzentakata.iwate.jp":true,"shiwa.iwate.jp":true,"shizukuishi.iwate.jp":true,"sumita.iwate.jp":true,"tanohata.iwate.jp":true,"tono.iwate.jp":true,"yahaba.iwate.jp":true,"yamada.iwate.jp":true,"ayagawa.kagawa.jp":true,"higashikagawa.kagawa.jp":true,"kanonji.kagawa.jp":true,"kotohira.kagawa.jp":true,"manno.kagawa.jp":true,"marugame.kagawa.jp":true,"mitoyo.kagawa.jp":true,"naoshima.kagawa.jp":true,"sanuki.kagawa.jp":true,"tadotsu.kagawa.jp":true,"takamatsu.kagawa.jp":true,"tonosho.kagawa.jp":true,"uchinomi.kagawa.jp":true,"utazu.kagawa.jp":true,"zentsuji.kagawa.jp":true,"akune.kagoshima.jp":true,"amami.kagoshima.jp":true,"hioki.kagoshima.jp":true,"isa.kagoshima.jp":true,"isen.kagoshima.jp":true,"izumi.kagoshima.jp":true,"kagoshima.kagoshima.jp":true,"kanoya.kagoshima.jp":true,"kawanabe.kagoshima.jp":true,"kinko.kagoshima.jp":true,"kouyama.kagoshima.jp":true,"makurazaki.kagoshima.jp":true,"matsumoto.kagoshima.jp":true,"minamitane.kagoshima.jp":true,"nakatane.kagoshima.jp":true,"nishinoomote.kagoshima.jp":true,"satsumasendai.kagoshima.jp":true,"soo.kagoshima.jp":true,"tarumizu.kagoshima.jp":true,"yusui.kagoshima.jp":true,"aikawa.kanagawa.jp":true,"atsugi.kanagawa.jp":true,"ayase.kanagawa.jp":true,"chigasaki.kanagawa.jp":true,"ebina.kanagawa.jp":true,"fujisawa.kanagawa.jp":true,"hadano.kanagawa.jp":true,"hakone.kanagawa.jp":true,"hiratsuka.kanagawa.jp":true,"isehara.kanagawa.jp":true,"kaisei.kanagawa.jp":true,"kamakura.kanagawa.jp":true,"kiyokawa.kanagawa.jp":true,"matsuda.kanagawa.jp":true,"minamiashigara.kanagawa.jp":true,"miura.kanagawa.jp":true,"nakai.kanagawa.jp":true,"ninomiya.kanagawa.jp":true,"odawara.kanagawa.jp":true,"oi.kanagawa.jp":true,"oiso.kanagawa.jp":true,"sagamihara.kanagawa.jp":true,"samukawa.kanagawa.jp":true,"tsukui.kanagawa.jp":true,"yamakita.kanagawa.jp":true,"yamato.kanagawa.jp":true,"yokosuka.kanagawa.jp":true,"yugawara.kanagawa.jp":true,"zama.kanagawa.jp":true,"zushi.kanagawa.jp":true,"aki.kochi.jp":true,"geisei.kochi.jp":true,"hidaka.kochi.jp":true,"higashitsuno.kochi.jp":true,"ino.kochi.jp":true,"kagami.kochi.jp":true,"kami.kochi.jp":true,"kitagawa.kochi.jp":true,"kochi.kochi.jp":true,"mihara.kochi.jp":true,"motoyama.kochi.jp":true,"muroto.kochi.jp":true,"nahari.kochi.jp":true,"nakamura.kochi.jp":true,"nankoku.kochi.jp":true,"nishitosa.kochi.jp":true,"niyodogawa.kochi.jp":true,"ochi.kochi.jp":true,"okawa.kochi.jp":true,"otoyo.kochi.jp":true,"otsuki.kochi.jp":true,"sakawa.kochi.jp":true,"sukumo.kochi.jp":true,"susaki.kochi.jp":true,"tosa.kochi.jp":true,"tosashimizu.kochi.jp":true,"toyo.kochi.jp":true,"tsuno.kochi.jp":true,"umaji.kochi.jp":true,"yasuda.kochi.jp":true,"yusuhara.kochi.jp":true,"amakusa.kumamoto.jp":true,"arao.kumamoto.jp":true,"aso.kumamoto.jp":true,"choyo.kumamoto.jp":true,"gyokuto.kumamoto.jp":true,"kamiamakusa.kumamoto.jp":true,"kikuchi.kumamoto.jp":true,"kumamoto.kumamoto.jp":true,"mashiki.kumamoto.jp":true,"mifune.kumamoto.jp":true,"minamata.kumamoto.jp":true,"minamioguni.kumamoto.jp":true,"nagasu.kumamoto.jp":true,"nishihara.kumamoto.jp":true,"oguni.kumamoto.jp":true,"ozu.kumamoto.jp":true,"sumoto.kumamoto.jp":true,"takamori.kumamoto.jp":true,"uki.kumamoto.jp":true,"uto.kumamoto.jp":true,"yamaga.kumamoto.jp":true,"yamato.kumamoto.jp":true,"yatsushiro.kumamoto.jp":true,"ayabe.kyoto.jp":true,"fukuchiyama.kyoto.jp":true,"higashiyama.kyoto.jp":true,"ide.kyoto.jp":true,"ine.kyoto.jp":true,"joyo.kyoto.jp":true,"kameoka.kyoto.jp":true,"kamo.kyoto.jp":true,"kita.kyoto.jp":true,"kizu.kyoto.jp":true,"kumiyama.kyoto.jp":true,"kyotamba.kyoto.jp":true,"kyotanabe.kyoto.jp":true,"kyotango.kyoto.jp":true,"maizuru.kyoto.jp":true,"minami.kyoto.jp":true,"minamiyamashiro.kyoto.jp":true,"miyazu.kyoto.jp":true,"muko.kyoto.jp":true,"nagaokakyo.kyoto.jp":true,"nakagyo.kyoto.jp":true,"nantan.kyoto.jp":true,"oyamazaki.kyoto.jp":true,"sakyo.kyoto.jp":true,"seika.kyoto.jp":true,"tanabe.kyoto.jp":true,"uji.kyoto.jp":true,"ujitawara.kyoto.jp":true,"wazuka.kyoto.jp":true,"yamashina.kyoto.jp":true,"yawata.kyoto.jp":true,"asahi.mie.jp":true,"inabe.mie.jp":true,"ise.mie.jp":true,"kameyama.mie.jp":true,"kawagoe.mie.jp":true,"kiho.mie.jp":true,"kisosaki.mie.jp":true,"kiwa.mie.jp":true,"komono.mie.jp":true,"kumano.mie.jp":true,"kuwana.mie.jp":true,"matsusaka.mie.jp":true,"meiwa.mie.jp":true,"mihama.mie.jp":true,"minamiise.mie.jp":true,"misugi.mie.jp":true,"miyama.mie.jp":true,"nabari.mie.jp":true,"shima.mie.jp":true,"suzuka.mie.jp":true,"tado.mie.jp":true,"taiki.mie.jp":true,"taki.mie.jp":true,"tamaki.mie.jp":true,"toba.mie.jp":true,"tsu.mie.jp":true,"udono.mie.jp":true,"ureshino.mie.jp":true,"watarai.mie.jp":true,"yokkaichi.mie.jp":true,"furukawa.miyagi.jp":true,"higashimatsushima.miyagi.jp":true,"ishinomaki.miyagi.jp":true,"iwanuma.miyagi.jp":true,"kakuda.miyagi.jp":true,"kami.miyagi.jp":true,"kawasaki.miyagi.jp":true,"marumori.miyagi.jp":true,"matsushima.miyagi.jp":true,"minamisanriku.miyagi.jp":true,"misato.miyagi.jp":true,"murata.miyagi.jp":true,"natori.miyagi.jp":true,"ogawara.miyagi.jp":true,"ohira.miyagi.jp":true,"onagawa.miyagi.jp":true,"osaki.miyagi.jp":true,"rifu.miyagi.jp":true,"semine.miyagi.jp":true,"shibata.miyagi.jp":true,"shichikashuku.miyagi.jp":true,"shikama.miyagi.jp":true,"shiogama.miyagi.jp":true,"shiroishi.miyagi.jp":true,"tagajo.miyagi.jp":true,"taiwa.miyagi.jp":true,"tome.miyagi.jp":true,"tomiya.miyagi.jp":true,"wakuya.miyagi.jp":true,"watari.miyagi.jp":true,"yamamoto.miyagi.jp":true,"zao.miyagi.jp":true,"aya.miyazaki.jp":true,"ebino.miyazaki.jp":true,"gokase.miyazaki.jp":true,"hyuga.miyazaki.jp":true,"kadogawa.miyazaki.jp":true,"kawaminami.miyazaki.jp":true,"kijo.miyazaki.jp":true,"kitagawa.miyazaki.jp":true,"kitakata.miyazaki.jp":true,"kitaura.miyazaki.jp":true,"kobayashi.miyazaki.jp":true,"kunitomi.miyazaki.jp":true,"kushima.miyazaki.jp":true,"mimata.miyazaki.jp":true,"miyakonojo.miyazaki.jp":true,"miyazaki.miyazaki.jp":true,"morotsuka.miyazaki.jp":true,"nichinan.miyazaki.jp":true,"nishimera.miyazaki.jp":true,"nobeoka.miyazaki.jp":true,"saito.miyazaki.jp":true,"shiiba.miyazaki.jp":true,"shintomi.miyazaki.jp":true,"takaharu.miyazaki.jp":true,"takanabe.miyazaki.jp":true,"takazaki.miyazaki.jp":true,"tsuno.miyazaki.jp":true,"achi.nagano.jp":true,"agematsu.nagano.jp":true,"anan.nagano.jp":true,"aoki.nagano.jp":true,"asahi.nagano.jp":true,"azumino.nagano.jp":true,"chikuhoku.nagano.jp":true,"chikuma.nagano.jp":true,"chino.nagano.jp":true,"fujimi.nagano.jp":true,"hakuba.nagano.jp":true,"hara.nagano.jp":true,"hiraya.nagano.jp":true,"iida.nagano.jp":true,"iijima.nagano.jp":true,"iiyama.nagano.jp":true,"iizuna.nagano.jp":true,"ikeda.nagano.jp":true,"ikusaka.nagano.jp":true,"ina.nagano.jp":true,"karuizawa.nagano.jp":true,"kawakami.nagano.jp":true,"kiso.nagano.jp":true,"kisofukushima.nagano.jp":true,"kitaaiki.nagano.jp":true,"komagane.nagano.jp":true,"komoro.nagano.jp":true,"matsukawa.nagano.jp":true,"matsumoto.nagano.jp":true,"miasa.nagano.jp":true,"minamiaiki.nagano.jp":true,"minamimaki.nagano.jp":true,"minamiminowa.nagano.jp":true,"minowa.nagano.jp":true,"miyada.nagano.jp":true,"miyota.nagano.jp":true,"mochizuki.nagano.jp":true,"nagano.nagano.jp":true,"nagawa.nagano.jp":true,"nagiso.nagano.jp":true,"nakagawa.nagano.jp":true,"nakano.nagano.jp":true,"nozawaonsen.nagano.jp":true,"obuse.nagano.jp":true,"ogawa.nagano.jp":true,"okaya.nagano.jp":true,"omachi.nagano.jp":true,"omi.nagano.jp":true,"ookuwa.nagano.jp":true,"ooshika.nagano.jp":true,"otaki.nagano.jp":true,"otari.nagano.jp":true,"sakae.nagano.jp":true,"sakaki.nagano.jp":true,"saku.nagano.jp":true,"sakuho.nagano.jp":true,"shimosuwa.nagano.jp":true,"shinanomachi.nagano.jp":true,"shiojiri.nagano.jp":true,"suwa.nagano.jp":true,"suzaka.nagano.jp":true,"takagi.nagano.jp":true,"takamori.nagano.jp":true,"takayama.nagano.jp":true,"tateshina.nagano.jp":true,"tatsuno.nagano.jp":true,"togakushi.nagano.jp":true,"togura.nagano.jp":true,"tomi.nagano.jp":true,"ueda.nagano.jp":true,"wada.nagano.jp":true,"yamagata.nagano.jp":true,"yamanouchi.nagano.jp":true,"yasaka.nagano.jp":true,"yasuoka.nagano.jp":true,"chijiwa.nagasaki.jp":true,"futsu.nagasaki.jp":true,"goto.nagasaki.jp":true,"hasami.nagasaki.jp":true,"hirado.nagasaki.jp":true,"iki.nagasaki.jp":true,"isahaya.nagasaki.jp":true,"kawatana.nagasaki.jp":true,"kuchinotsu.nagasaki.jp":true,"matsuura.nagasaki.jp":true,"nagasaki.nagasaki.jp":true,"obama.nagasaki.jp":true,"omura.nagasaki.jp":true,"oseto.nagasaki.jp":true,"saikai.nagasaki.jp":true,"sasebo.nagasaki.jp":true,"seihi.nagasaki.jp":true,"shimabara.nagasaki.jp":true,"shinkamigoto.nagasaki.jp":true,"togitsu.nagasaki.jp":true,"tsushima.nagasaki.jp":true,"unzen.nagasaki.jp":true,"ando.nara.jp":true,"gose.nara.jp":true,"heguri.nara.jp":true,"higashiyoshino.nara.jp":true,"ikaruga.nara.jp":true,"ikoma.nara.jp":true,"kamikitayama.nara.jp":true,"kanmaki.nara.jp":true,"kashiba.nara.jp":true,"kashihara.nara.jp":true,"katsuragi.nara.jp":true,"kawai.nara.jp":true,"kawakami.nara.jp":true,"kawanishi.nara.jp":true,"koryo.nara.jp":true,"kurotaki.nara.jp":true,"mitsue.nara.jp":true,"miyake.nara.jp":true,"nara.nara.jp":true,"nosegawa.nara.jp":true,"oji.nara.jp":true,"ouda.nara.jp":true,"oyodo.nara.jp":true,"sakurai.nara.jp":true,"sango.nara.jp":true,"shimoichi.nara.jp":true,"shimokitayama.nara.jp":true,"shinjo.nara.jp":true,"soni.nara.jp":true,"takatori.nara.jp":true,"tawaramoto.nara.jp":true,"tenkawa.nara.jp":true,"tenri.nara.jp":true,"uda.nara.jp":true,"yamatokoriyama.nara.jp":true,"yamatotakada.nara.jp":true,"yamazoe.nara.jp":true,"yoshino.nara.jp":true,"aga.niigata.jp":true,"agano.niigata.jp":true,"gosen.niigata.jp":true,"itoigawa.niigata.jp":true,"izumozaki.niigata.jp":true,"joetsu.niigata.jp":true,"kamo.niigata.jp":true,"kariwa.niigata.jp":true,"kashiwazaki.niigata.jp":true,"minamiuonuma.niigata.jp":true,"mitsuke.niigata.jp":true,"muika.niigata.jp":true,"murakami.niigata.jp":true,"myoko.niigata.jp":true,"nagaoka.niigata.jp":true,"niigata.niigata.jp":true,"ojiya.niigata.jp":true,"omi.niigata.jp":true,"sado.niigata.jp":true,"sanjo.niigata.jp":true,"seiro.niigata.jp":true,"seirou.niigata.jp":true,"sekikawa.niigata.jp":true,"shibata.niigata.jp":true,"tagami.niigata.jp":true,"tainai.niigata.jp":true,"tochio.niigata.jp":true,"tokamachi.niigata.jp":true,"tsubame.niigata.jp":true,"tsunan.niigata.jp":true,"uonuma.niigata.jp":true,"yahiko.niigata.jp":true,"yoita.niigata.jp":true,"yuzawa.niigata.jp":true,"beppu.oita.jp":true,"bungoono.oita.jp":true,"bungotakada.oita.jp":true,"hasama.oita.jp":true,"hiji.oita.jp":true,"himeshima.oita.jp":true,"hita.oita.jp":true,"kamitsue.oita.jp":true,"kokonoe.oita.jp":true,"kuju.oita.jp":true,"kunisaki.oita.jp":true,"kusu.oita.jp":true,"oita.oita.jp":true,"saiki.oita.jp":true,"taketa.oita.jp":true,"tsukumi.oita.jp":true,"usa.oita.jp":true,"usuki.oita.jp":true,"yufu.oita.jp":true,"akaiwa.okayama.jp":true,"asakuchi.okayama.jp":true,"bizen.okayama.jp":true,"hayashima.okayama.jp":true,"ibara.okayama.jp":true,"kagamino.okayama.jp":true,"kasaoka.okayama.jp":true,"kibichuo.okayama.jp":true,"kumenan.okayama.jp":true,"kurashiki.okayama.jp":true,"maniwa.okayama.jp":true,"misaki.okayama.jp":true,"nagi.okayama.jp":true,"niimi.okayama.jp":true,"nishiawakura.okayama.jp":true,"okayama.okayama.jp":true,"satosho.okayama.jp":true,"setouchi.okayama.jp":true,"shinjo.okayama.jp":true,"shoo.okayama.jp":true,"soja.okayama.jp":true,"takahashi.okayama.jp":true,"tamano.okayama.jp":true,"tsuyama.okayama.jp":true,"wake.okayama.jp":true,"yakage.okayama.jp":true,"aguni.okinawa.jp":true,"ginowan.okinawa.jp":true,"ginoza.okinawa.jp":true,"gushikami.okinawa.jp":true,"haebaru.okinawa.jp":true,"higashi.okinawa.jp":true,"hirara.okinawa.jp":true,"iheya.okinawa.jp":true,"ishigaki.okinawa.jp":true,"ishikawa.okinawa.jp":true,"itoman.okinawa.jp":true,"izena.okinawa.jp":true,"kadena.okinawa.jp":true,"kin.okinawa.jp":true,"kitadaito.okinawa.jp":true,"kitanakagusuku.okinawa.jp":true,"kumejima.okinawa.jp":true,"kunigami.okinawa.jp":true,"minamidaito.okinawa.jp":true,"motobu.okinawa.jp":true,"nago.okinawa.jp":true,"naha.okinawa.jp":true,"nakagusuku.okinawa.jp":true,"nakijin.okinawa.jp":true,"nanjo.okinawa.jp":true,"nishihara.okinawa.jp":true,"ogimi.okinawa.jp":true,"okinawa.okinawa.jp":true,"onna.okinawa.jp":true,"shimoji.okinawa.jp":true,"taketomi.okinawa.jp":true,"tarama.okinawa.jp":true,"tokashiki.okinawa.jp":true,"tomigusuku.okinawa.jp":true,"tonaki.okinawa.jp":true,"urasoe.okinawa.jp":true,"uruma.okinawa.jp":true,"yaese.okinawa.jp":true,"yomitan.okinawa.jp":true,"yonabaru.okinawa.jp":true,"yonaguni.okinawa.jp":true,"zamami.okinawa.jp":true,"abeno.osaka.jp":true,"chihayaakasaka.osaka.jp":true,"chuo.osaka.jp":true,"daito.osaka.jp":true,"fujiidera.osaka.jp":true,"habikino.osaka.jp":true,"hannan.osaka.jp":true,"higashiosaka.osaka.jp":true,"higashisumiyoshi.osaka.jp":true,"higashiyodogawa.osaka.jp":true,"hirakata.osaka.jp":true,"ibaraki.osaka.jp":true,"ikeda.osaka.jp":true,"izumi.osaka.jp":true,"izumiotsu.osaka.jp":true,"izumisano.osaka.jp":true,"kadoma.osaka.jp":true,"kaizuka.osaka.jp":true,"kanan.osaka.jp":true,"kashiwara.osaka.jp":true,"katano.osaka.jp":true,"kawachinagano.osaka.jp":true,"kishiwada.osaka.jp":true,"kita.osaka.jp":true,"kumatori.osaka.jp":true,"matsubara.osaka.jp":true,"minato.osaka.jp":true,"minoh.osaka.jp":true,"misaki.osaka.jp":true,"moriguchi.osaka.jp":true,"neyagawa.osaka.jp":true,"nishi.osaka.jp":true,"nose.osaka.jp":true,"osakasayama.osaka.jp":true,"sakai.osaka.jp":true,"sayama.osaka.jp":true,"sennan.osaka.jp":true,"settsu.osaka.jp":true,"shijonawate.osaka.jp":true,"shimamoto.osaka.jp":true,"suita.osaka.jp":true,"tadaoka.osaka.jp":true,"taishi.osaka.jp":true,"tajiri.osaka.jp":true,"takaishi.osaka.jp":true,"takatsuki.osaka.jp":true,"tondabayashi.osaka.jp":true,"toyonaka.osaka.jp":true,"toyono.osaka.jp":true,"yao.osaka.jp":true,"ariake.saga.jp":true,"arita.saga.jp":true,"fukudomi.saga.jp":true,"genkai.saga.jp":true,"hamatama.saga.jp":true,"hizen.saga.jp":true,"imari.saga.jp":true,"kamimine.saga.jp":true,"kanzaki.saga.jp":true,"karatsu.saga.jp":true,"kashima.saga.jp":true,"kitagata.saga.jp":true,"kitahata.saga.jp":true,"kiyama.saga.jp":true,"kouhoku.saga.jp":true,"kyuragi.saga.jp":true,"nishiarita.saga.jp":true,"ogi.saga.jp":true,"omachi.saga.jp":true,"ouchi.saga.jp":true,"saga.saga.jp":true,"shiroishi.saga.jp":true,"taku.saga.jp":true,"tara.saga.jp":true,"tosu.saga.jp":true,"yoshinogari.saga.jp":true,"arakawa.saitama.jp":true,"asaka.saitama.jp":true,"chichibu.saitama.jp":true,"fujimi.saitama.jp":true,"fujimino.saitama.jp":true,"fukaya.saitama.jp":true,"hanno.saitama.jp":true,"hanyu.saitama.jp":true,"hasuda.saitama.jp":true,"hatogaya.saitama.jp":true,"hatoyama.saitama.jp":true,"hidaka.saitama.jp":true,"higashichichibu.saitama.jp":true,"higashimatsuyama.saitama.jp":true,"honjo.saitama.jp":true,"ina.saitama.jp":true,"iruma.saitama.jp":true,"iwatsuki.saitama.jp":true,"kamiizumi.saitama.jp":true,"kamikawa.saitama.jp":true,"kamisato.saitama.jp":true,"kasukabe.saitama.jp":true,"kawagoe.saitama.jp":true,"kawaguchi.saitama.jp":true,"kawajima.saitama.jp":true,"kazo.saitama.jp":true,"kitamoto.saitama.jp":true,"koshigaya.saitama.jp":true,"kounosu.saitama.jp":true,"kuki.saitama.jp":true,"kumagaya.saitama.jp":true,"matsubushi.saitama.jp":true,"minano.saitama.jp":true,"misato.saitama.jp":true,"miyashiro.saitama.jp":true,"miyoshi.saitama.jp":true,"moroyama.saitama.jp":true,"nagatoro.saitama.jp":true,"namegawa.saitama.jp":true,"niiza.saitama.jp":true,"ogano.saitama.jp":true,"ogawa.saitama.jp":true,"ogose.saitama.jp":true,"okegawa.saitama.jp":true,"omiya.saitama.jp":true,"otaki.saitama.jp":true,"ranzan.saitama.jp":true,"ryokami.saitama.jp":true,"saitama.saitama.jp":true,"sakado.saitama.jp":true,"satte.saitama.jp":true,"sayama.saitama.jp":true,"shiki.saitama.jp":true,"shiraoka.saitama.jp":true,"soka.saitama.jp":true,"sugito.saitama.jp":true,"toda.saitama.jp":true,"tokigawa.saitama.jp":true,"tokorozawa.saitama.jp":true,"tsurugashima.saitama.jp":true,"urawa.saitama.jp":true,"warabi.saitama.jp":true,"yashio.saitama.jp":true,"yokoze.saitama.jp":true,"yono.saitama.jp":true,"yorii.saitama.jp":true,"yoshida.saitama.jp":true,"yoshikawa.saitama.jp":true,"yoshimi.saitama.jp":true,"aisho.shiga.jp":true,"gamo.shiga.jp":true,"higashiomi.shiga.jp":true,"hikone.shiga.jp":true,"koka.shiga.jp":true,"konan.shiga.jp":true,"kosei.shiga.jp":true,"koto.shiga.jp":true,"kusatsu.shiga.jp":true,"maibara.shiga.jp":true,"moriyama.shiga.jp":true,"nagahama.shiga.jp":true,"nishiazai.shiga.jp":true,"notogawa.shiga.jp":true,"omihachiman.shiga.jp":true,"otsu.shiga.jp":true,"ritto.shiga.jp":true,"ryuoh.shiga.jp":true,"takashima.shiga.jp":true,"takatsuki.shiga.jp":true,"torahime.shiga.jp":true,"toyosato.shiga.jp":true,"yasu.shiga.jp":true,"akagi.shimane.jp":true,"ama.shimane.jp":true,"gotsu.shimane.jp":true,"hamada.shimane.jp":true,"higashiizumo.shimane.jp":true,"hikawa.shimane.jp":true,"hikimi.shimane.jp":true,"izumo.shimane.jp":true,"kakinoki.shimane.jp":true,"masuda.shimane.jp":true,"matsue.shimane.jp":true,"misato.shimane.jp":true,"nishinoshima.shimane.jp":true,"ohda.shimane.jp":true,"okinoshima.shimane.jp":true,"okuizumo.shimane.jp":true,"shimane.shimane.jp":true,"tamayu.shimane.jp":true,"tsuwano.shimane.jp":true,"unnan.shimane.jp":true,"yakumo.shimane.jp":true,"yasugi.shimane.jp":true,"yatsuka.shimane.jp":true,"arai.shizuoka.jp":true,"atami.shizuoka.jp":true,"fuji.shizuoka.jp":true,"fujieda.shizuoka.jp":true,"fujikawa.shizuoka.jp":true,"fujinomiya.shizuoka.jp":true,"fukuroi.shizuoka.jp":true,"gotemba.shizuoka.jp":true,"haibara.shizuoka.jp":true,"hamamatsu.shizuoka.jp":true,"higashiizu.shizuoka.jp":true,"ito.shizuoka.jp":true,"iwata.shizuoka.jp":true,"izu.shizuoka.jp":true,"izunokuni.shizuoka.jp":true,"kakegawa.shizuoka.jp":true,"kannami.shizuoka.jp":true,"kawanehon.shizuoka.jp":true,"kawazu.shizuoka.jp":true,"kikugawa.shizuoka.jp":true,"kosai.shizuoka.jp":true,"makinohara.shizuoka.jp":true,"matsuzaki.shizuoka.jp":true,"minamiizu.shizuoka.jp":true,"mishima.shizuoka.jp":true,"morimachi.shizuoka.jp":true,"nishiizu.shizuoka.jp":true,"numazu.shizuoka.jp":true,"omaezaki.shizuoka.jp":true,"shimada.shizuoka.jp":true,"shimizu.shizuoka.jp":true,"shimoda.shizuoka.jp":true,"shizuoka.shizuoka.jp":true,"susono.shizuoka.jp":true,"yaizu.shizuoka.jp":true,"yoshida.shizuoka.jp":true,"ashikaga.tochigi.jp":true,"bato.tochigi.jp":true,"haga.tochigi.jp":true,"ichikai.tochigi.jp":true,"iwafune.tochigi.jp":true,"kaminokawa.tochigi.jp":true,"kanuma.tochigi.jp":true,"karasuyama.tochigi.jp":true,"kuroiso.tochigi.jp":true,"mashiko.tochigi.jp":true,"mibu.tochigi.jp":true,"moka.tochigi.jp":true,"motegi.tochigi.jp":true,"nasu.tochigi.jp":true,"nasushiobara.tochigi.jp":true,"nikko.tochigi.jp":true,"nishikata.tochigi.jp":true,"nogi.tochigi.jp":true,"ohira.tochigi.jp":true,"ohtawara.tochigi.jp":true,"oyama.tochigi.jp":true,"sakura.tochigi.jp":true,"sano.tochigi.jp":true,"shimotsuke.tochigi.jp":true,"shioya.tochigi.jp":true,"takanezawa.tochigi.jp":true,"tochigi.tochigi.jp":true,"tsuga.tochigi.jp":true,"ujiie.tochigi.jp":true,"utsunomiya.tochigi.jp":true,"yaita.tochigi.jp":true,"aizumi.tokushima.jp":true,"anan.tokushima.jp":true,"ichiba.tokushima.jp":true,"itano.tokushima.jp":true,"kainan.tokushima.jp":true,"komatsushima.tokushima.jp":true,"matsushige.tokushima.jp":true,"mima.tokushima.jp":true,"minami.tokushima.jp":true,"miyoshi.tokushima.jp":true,"mugi.tokushima.jp":true,"nakagawa.tokushima.jp":true,"naruto.tokushima.jp":true,"sanagochi.tokushima.jp":true,"shishikui.tokushima.jp":true,"tokushima.tokushima.jp":true,"wajiki.tokushima.jp":true,"adachi.tokyo.jp":true,"akiruno.tokyo.jp":true,"akishima.tokyo.jp":true,"aogashima.tokyo.jp":true,"arakawa.tokyo.jp":true,"bunkyo.tokyo.jp":true,"chiyoda.tokyo.jp":true,"chofu.tokyo.jp":true,"chuo.tokyo.jp":true,"edogawa.tokyo.jp":true,"fuchu.tokyo.jp":true,"fussa.tokyo.jp":true,"hachijo.tokyo.jp":true,"hachioji.tokyo.jp":true,"hamura.tokyo.jp":true,"higashikurume.tokyo.jp":true,"higashimurayama.tokyo.jp":true,"higashiyamato.tokyo.jp":true,"hino.tokyo.jp":true,"hinode.tokyo.jp":true,"hinohara.tokyo.jp":true,"inagi.tokyo.jp":true,"itabashi.tokyo.jp":true,"katsushika.tokyo.jp":true,"kita.tokyo.jp":true,"kiyose.tokyo.jp":true,"kodaira.tokyo.jp":true,"koganei.tokyo.jp":true,"kokubunji.tokyo.jp":true,"komae.tokyo.jp":true,"koto.tokyo.jp":true,"kouzushima.tokyo.jp":true,"kunitachi.tokyo.jp":true,"machida.tokyo.jp":true,"meguro.tokyo.jp":true,"minato.tokyo.jp":true,"mitaka.tokyo.jp":true,"mizuho.tokyo.jp":true,"musashimurayama.tokyo.jp":true,"musashino.tokyo.jp":true,"nakano.tokyo.jp":true,"nerima.tokyo.jp":true,"ogasawara.tokyo.jp":true,"okutama.tokyo.jp":true,"ome.tokyo.jp":true,"oshima.tokyo.jp":true,"ota.tokyo.jp":true,"setagaya.tokyo.jp":true,"shibuya.tokyo.jp":true,"shinagawa.tokyo.jp":true,"shinjuku.tokyo.jp":true,"suginami.tokyo.jp":true,"sumida.tokyo.jp":true,"tachikawa.tokyo.jp":true,"taito.tokyo.jp":true,"tama.tokyo.jp":true,"toshima.tokyo.jp":true,"chizu.tottori.jp":true,"hino.tottori.jp":true,"kawahara.tottori.jp":true,"koge.tottori.jp":true,"kotoura.tottori.jp":true,"misasa.tottori.jp":true,"nanbu.tottori.jp":true,"nichinan.tottori.jp":true,"sakaiminato.tottori.jp":true,"tottori.tottori.jp":true,"wakasa.tottori.jp":true,"yazu.tottori.jp":true,"yonago.tottori.jp":true,"asahi.toyama.jp":true,"fuchu.toyama.jp":true,"fukumitsu.toyama.jp":true,"funahashi.toyama.jp":true,"himi.toyama.jp":true,"imizu.toyama.jp":true,"inami.toyama.jp":true,"johana.toyama.jp":true,"kamiichi.toyama.jp":true,"kurobe.toyama.jp":true,"nakaniikawa.toyama.jp":true,"namerikawa.toyama.jp":true,"nanto.toyama.jp":true,"nyuzen.toyama.jp":true,"oyabe.toyama.jp":true,"taira.toyama.jp":true,"takaoka.toyama.jp":true,"tateyama.toyama.jp":true,"toga.toyama.jp":true,"tonami.toyama.jp":true,"toyama.toyama.jp":true,"unazuki.toyama.jp":true,"uozu.toyama.jp":true,"yamada.toyama.jp":true,"arida.wakayama.jp":true,"aridagawa.wakayama.jp":true,"gobo.wakayama.jp":true,"hashimoto.wakayama.jp":true,"hidaka.wakayama.jp":true,"hirogawa.wakayama.jp":true,"inami.wakayama.jp":true,"iwade.wakayama.jp":true,"kainan.wakayama.jp":true,"kamitonda.wakayama.jp":true,"katsuragi.wakayama.jp":true,"kimino.wakayama.jp":true,"kinokawa.wakayama.jp":true,"kitayama.wakayama.jp":true,"koya.wakayama.jp":true,"koza.wakayama.jp":true,"kozagawa.wakayama.jp":true,"kudoyama.wakayama.jp":true,"kushimoto.wakayama.jp":true,"mihama.wakayama.jp":true,"misato.wakayama.jp":true,"nachikatsuura.wakayama.jp":true,"shingu.wakayama.jp":true,"shirahama.wakayama.jp":true,"taiji.wakayama.jp":true,"tanabe.wakayama.jp":true,"wakayama.wakayama.jp":true,"yuasa.wakayama.jp":true,"yura.wakayama.jp":true,"asahi.yamagata.jp":true,"funagata.yamagata.jp":true,"higashine.yamagata.jp":true,"iide.yamagata.jp":true,"kahoku.yamagata.jp":true,"kaminoyama.yamagata.jp":true,"kaneyama.yamagata.jp":true,"kawanishi.yamagata.jp":true,"mamurogawa.yamagata.jp":true,"mikawa.yamagata.jp":true,"murayama.yamagata.jp":true,"nagai.yamagata.jp":true,"nakayama.yamagata.jp":true,"nanyo.yamagata.jp":true,"nishikawa.yamagata.jp":true,"obanazawa.yamagata.jp":true,"oe.yamagata.jp":true,"oguni.yamagata.jp":true,"ohkura.yamagata.jp":true,"oishida.yamagata.jp":true,"sagae.yamagata.jp":true,"sakata.yamagata.jp":true,"sakegawa.yamagata.jp":true,"shinjo.yamagata.jp":true,"shirataka.yamagata.jp":true,"shonai.yamagata.jp":true,"takahata.yamagata.jp":true,"tendo.yamagata.jp":true,"tozawa.yamagata.jp":true,"tsuruoka.yamagata.jp":true,"yamagata.yamagata.jp":true,"yamanobe.yamagata.jp":true,"yonezawa.yamagata.jp":true,"yuza.yamagata.jp":true,"abu.yamaguchi.jp":true,"hagi.yamaguchi.jp":true,"hikari.yamaguchi.jp":true,"hofu.yamaguchi.jp":true,"iwakuni.yamaguchi.jp":true,"kudamatsu.yamaguchi.jp":true,"mitou.yamaguchi.jp":true,"nagato.yamaguchi.jp":true,"oshima.yamaguchi.jp":true,"shimonoseki.yamaguchi.jp":true,"shunan.yamaguchi.jp":true,"tabuse.yamaguchi.jp":true,"tokuyama.yamaguchi.jp":true,"toyota.yamaguchi.jp":true,"ube.yamaguchi.jp":true,"yuu.yamaguchi.jp":true,"chuo.yamanashi.jp":true,"doshi.yamanashi.jp":true,"fuefuki.yamanashi.jp":true,"fujikawa.yamanashi.jp":true,"fujikawaguchiko.yamanashi.jp":true,"fujiyoshida.yamanashi.jp":true,"hayakawa.yamanashi.jp":true,"hokuto.yamanashi.jp":true,"ichikawamisato.yamanashi.jp":true,"kai.yamanashi.jp":true,"kofu.yamanashi.jp":true,"koshu.yamanashi.jp":true,"kosuge.yamanashi.jp":true,"minami-alps.yamanashi.jp":true,"minobu.yamanashi.jp":true,"nakamichi.yamanashi.jp":true,"nanbu.yamanashi.jp":true,"narusawa.yamanashi.jp":true,"nirasaki.yamanashi.jp":true,"nishikatsura.yamanashi.jp":true,"oshino.yamanashi.jp":true,"otsuki.yamanashi.jp":true,"showa.yamanashi.jp":true,"tabayama.yamanashi.jp":true,"tsuru.yamanashi.jp":true,"uenohara.yamanashi.jp":true,"yamanakako.yamanashi.jp":true,"yamanashi.yamanashi.jp":true,"ke":true,"ac.ke":true,"co.ke":true,"go.ke":true,"info.ke":true,"me.ke":true,"mobi.ke":true,"ne.ke":true,"or.ke":true,"sc.ke":true,"kg":true,"org.kg":true,"net.kg":true,"com.kg":true,"edu.kg":true,"gov.kg":true,"mil.kg":true,"*.kh":true,"ki":true,"edu.ki":true,"biz.ki":true,"net.ki":true,"org.ki":true,"gov.ki":true,"info.ki":true,"com.ki":true,"km":true,"org.km":true,"nom.km":true,"gov.km":true,"prd.km":true,"tm.km":true,"edu.km":true,"mil.km":true,"ass.km":true,"com.km":true,"coop.km":true,"asso.km":true,"presse.km":true,"medecin.km":true,"notaires.km":true,"pharmaciens.km":true,"veterinaire.km":true,"gouv.km":true,"kn":true,"net.kn":true,"org.kn":true,"edu.kn":true,"gov.kn":true,"kp":true,"com.kp":true,"edu.kp":true,"gov.kp":true,"org.kp":true,"rep.kp":true,"tra.kp":true,"kr":true,"ac.kr":true,"co.kr":true,"es.kr":true,"go.kr":true,"hs.kr":true,"kg.kr":true,"mil.kr":true,"ms.kr":true,"ne.kr":true,"or.kr":true,"pe.kr":true,"re.kr":true,"sc.kr":true,"busan.kr":true,"chungbuk.kr":true,"chungnam.kr":true,"daegu.kr":true,"daejeon.kr":true,"gangwon.kr":true,"gwangju.kr":true,"gyeongbuk.kr":true,"gyeonggi.kr":true,"gyeongnam.kr":true,"incheon.kr":true,"jeju.kr":true,"jeonbuk.kr":true,"jeonnam.kr":true,"seoul.kr":true,"ulsan.kr":true,"*.kw":true,"ky":true,"edu.ky":true,"gov.ky":true,"com.ky":true,"org.ky":true,"net.ky":true,"kz":true,"org.kz":true,"edu.kz":true,"net.kz":true,"gov.kz":true,"mil.kz":true,"com.kz":true,"la":true,"int.la":true,"net.la":true,"info.la":true,"edu.la":true,"gov.la":true,"per.la":true,"com.la":true,"org.la":true,"lb":true,"com.lb":true,"edu.lb":true,"gov.lb":true,"net.lb":true,"org.lb":true,"lc":true,"com.lc":true,"net.lc":true,"co.lc":true,"org.lc":true,"edu.lc":true,"gov.lc":true,"li":true,"lk":true,"gov.lk":true,"sch.lk":true,"net.lk":true,"int.lk":true,"com.lk":true,"org.lk":true,"edu.lk":true,"ngo.lk":true,"soc.lk":true,"web.lk":true,"ltd.lk":true,"assn.lk":true,"grp.lk":true,"hotel.lk":true,"ac.lk":true,"lr":true,"com.lr":true,"edu.lr":true,"gov.lr":true,"org.lr":true,"net.lr":true,"ls":true,"co.ls":true,"org.ls":true,"lt":true,"gov.lt":true,"lu":true,"lv":true,"com.lv":true,"edu.lv":true,"gov.lv":true,"org.lv":true,"mil.lv":true,"id.lv":true,"net.lv":true,"asn.lv":true,"conf.lv":true,"ly":true,"com.ly":true,"net.ly":true,"gov.ly":true,"plc.ly":true,"edu.ly":true,"sch.ly":true,"med.ly":true,"org.ly":true,"id.ly":true,"ma":true,"co.ma":true,"net.ma":true,"gov.ma":true,"org.ma":true,"ac.ma":true,"press.ma":true,"mc":true,"tm.mc":true,"asso.mc":true,"md":true,"me":true,"co.me":true,"net.me":true,"org.me":true,"edu.me":true,"ac.me":true,"gov.me":true,"its.me":true,"priv.me":true,"mg":true,"org.mg":true,"nom.mg":true,"gov.mg":true,"prd.mg":true,"tm.mg":true,"edu.mg":true,"mil.mg":true,"com.mg":true,"co.mg":true,"mh":true,"mil":true,"mk":true,"com.mk":true,"org.mk":true,"net.mk":true,"edu.mk":true,"gov.mk":true,"inf.mk":true,"name.mk":true,"ml":true,"com.ml":true,"edu.ml":true,"gouv.ml":true,"gov.ml":true,"net.ml":true,"org.ml":true,"presse.ml":true,"*.mm":true,"mn":true,"gov.mn":true,"edu.mn":true,"org.mn":true,"mo":true,"com.mo":true,"net.mo":true,"org.mo":true,"edu.mo":true,"gov.mo":true,"mobi":true,"mp":true,"mq":true,"mr":true,"gov.mr":true,"ms":true,"com.ms":true,"edu.ms":true,"gov.ms":true,"net.ms":true,"org.ms":true,"mt":true,"com.mt":true,"edu.mt":true,"net.mt":true,"org.mt":true,"mu":true,"com.mu":true,"net.mu":true,"org.mu":true,"gov.mu":true,"ac.mu":true,"co.mu":true,"or.mu":true,"museum":true,"academy.museum":true,"agriculture.museum":true,"air.museum":true,"airguard.museum":true,"alabama.museum":true,"alaska.museum":true,"amber.museum":true,"ambulance.museum":true,"american.museum":true,"americana.museum":true,"americanantiques.museum":true,"americanart.museum":true,"amsterdam.museum":true,"and.museum":true,"annefrank.museum":true,"anthro.museum":true,"anthropology.museum":true,"antiques.museum":true,"aquarium.museum":true,"arboretum.museum":true,"archaeological.museum":true,"archaeology.museum":true,"architecture.museum":true,"art.museum":true,"artanddesign.museum":true,"artcenter.museum":true,"artdeco.museum":true,"arteducation.museum":true,"artgallery.museum":true,"arts.museum":true,"artsandcrafts.museum":true,"asmatart.museum":true,"assassination.museum":true,"assisi.museum":true,"association.museum":true,"astronomy.museum":true,"atlanta.museum":true,"austin.museum":true,"australia.museum":true,"automotive.museum":true,"aviation.museum":true,"axis.museum":true,"badajoz.museum":true,"baghdad.museum":true,"bahn.museum":true,"bale.museum":true,"baltimore.museum":true,"barcelona.museum":true,"baseball.museum":true,"basel.museum":true,"baths.museum":true,"bauern.museum":true,"beauxarts.museum":true,"beeldengeluid.museum":true,"bellevue.museum":true,"bergbau.museum":true,"berkeley.museum":true,"berlin.museum":true,"bern.museum":true,"bible.museum":true,"bilbao.museum":true,"bill.museum":true,"birdart.museum":true,"birthplace.museum":true,"bonn.museum":true,"boston.museum":true,"botanical.museum":true,"botanicalgarden.museum":true,"botanicgarden.museum":true,"botany.museum":true,"brandywinevalley.museum":true,"brasil.museum":true,"bristol.museum":true,"british.museum":true,"britishcolumbia.museum":true,"broadcast.museum":true,"brunel.museum":true,"brussel.museum":true,"brussels.museum":true,"bruxelles.museum":true,"building.museum":true,"burghof.museum":true,"bus.museum":true,"bushey.museum":true,"cadaques.museum":true,"california.museum":true,"cambridge.museum":true,"can.museum":true,"canada.museum":true,"capebreton.museum":true,"carrier.museum":true,"cartoonart.museum":true,"casadelamoneda.museum":true,"castle.museum":true,"castres.museum":true,"celtic.museum":true,"center.museum":true,"chattanooga.museum":true,"cheltenham.museum":true,"chesapeakebay.museum":true,"chicago.museum":true,"children.museum":true,"childrens.museum":true,"childrensgarden.museum":true,"chiropractic.museum":true,"chocolate.museum":true,"christiansburg.museum":true,"cincinnati.museum":true,"cinema.museum":true,"circus.museum":true,"civilisation.museum":true,"civilization.museum":true,"civilwar.museum":true,"clinton.museum":true,"clock.museum":true,"coal.museum":true,"coastaldefence.museum":true,"cody.museum":true,"coldwar.museum":true,"collection.museum":true,"colonialwilliamsburg.museum":true,"coloradoplateau.museum":true,"columbia.museum":true,"columbus.museum":true,"communication.museum":true,"communications.museum":true,"community.museum":true,"computer.museum":true,"computerhistory.museum":true,"xn--comunicaes-v6a2o.museum":true,"contemporary.museum":true,"contemporaryart.museum":true,"convent.museum":true,"copenhagen.museum":true,"corporation.museum":true,"xn--correios-e-telecomunicaes-ghc29a.museum":true,"corvette.museum":true,"costume.museum":true,"countryestate.museum":true,"county.museum":true,"crafts.museum":true,"cranbrook.museum":true,"creation.museum":true,"cultural.museum":true,"culturalcenter.museum":true,"culture.museum":true,"cyber.museum":true,"cymru.museum":true,"dali.museum":true,"dallas.museum":true,"database.museum":true,"ddr.museum":true,"decorativearts.museum":true,"delaware.museum":true,"delmenhorst.museum":true,"denmark.museum":true,"depot.museum":true,"design.museum":true,"detroit.museum":true,"dinosaur.museum":true,"discovery.museum":true,"dolls.museum":true,"donostia.museum":true,"durham.museum":true,"eastafrica.museum":true,"eastcoast.museum":true,"education.museum":true,"educational.museum":true,"egyptian.museum":true,"eisenbahn.museum":true,"elburg.museum":true,"elvendrell.museum":true,"embroidery.museum":true,"encyclopedic.museum":true,"england.museum":true,"entomology.museum":true,"environment.museum":true,"environmentalconservation.museum":true,"epilepsy.museum":true,"essex.museum":true,"estate.museum":true,"ethnology.museum":true,"exeter.museum":true,"exhibition.museum":true,"family.museum":true,"farm.museum":true,"farmequipment.museum":true,"farmers.museum":true,"farmstead.museum":true,"field.museum":true,"figueres.museum":true,"filatelia.museum":true,"film.museum":true,"fineart.museum":true,"finearts.museum":true,"finland.museum":true,"flanders.museum":true,"florida.museum":true,"force.museum":true,"fortmissoula.museum":true,"fortworth.museum":true,"foundation.museum":true,"francaise.museum":true,"frankfurt.museum":true,"franziskaner.museum":true,"freemasonry.museum":true,"freiburg.museum":true,"fribourg.museum":true,"frog.museum":true,"fundacio.museum":true,"furniture.museum":true,"gallery.museum":true,"garden.museum":true,"gateway.museum":true,"geelvinck.museum":true,"gemological.museum":true,"geology.museum":true,"georgia.museum":true,"giessen.museum":true,"glas.museum":true,"glass.museum":true,"gorge.museum":true,"grandrapids.museum":true,"graz.museum":true,"guernsey.museum":true,"halloffame.museum":true,"hamburg.museum":true,"handson.museum":true,"harvestcelebration.museum":true,"hawaii.museum":true,"health.museum":true,"heimatunduhren.museum":true,"hellas.museum":true,"helsinki.museum":true,"hembygdsforbund.museum":true,"heritage.museum":true,"histoire.museum":true,"historical.museum":true,"historicalsociety.museum":true,"historichouses.museum":true,"historisch.museum":true,"historisches.museum":true,"history.museum":true,"historyofscience.museum":true,"horology.museum":true,"house.museum":true,"humanities.museum":true,"illustration.museum":true,"imageandsound.museum":true,"indian.museum":true,"indiana.museum":true,"indianapolis.museum":true,"indianmarket.museum":true,"intelligence.museum":true,"interactive.museum":true,"iraq.museum":true,"iron.museum":true,"isleofman.museum":true,"jamison.museum":true,"jefferson.museum":true,"jerusalem.museum":true,"jewelry.museum":true,"jewish.museum":true,"jewishart.museum":true,"jfk.museum":true,"journalism.museum":true,"judaica.museum":true,"judygarland.museum":true,"juedisches.museum":true,"juif.museum":true,"karate.museum":true,"karikatur.museum":true,"kids.museum":true,"koebenhavn.museum":true,"koeln.museum":true,"kunst.museum":true,"kunstsammlung.museum":true,"kunstunddesign.museum":true,"labor.museum":true,"labour.museum":true,"lajolla.museum":true,"lancashire.museum":true,"landes.museum":true,"lans.museum":true,"xn--lns-qla.museum":true,"larsson.museum":true,"lewismiller.museum":true,"lincoln.museum":true,"linz.museum":true,"living.museum":true,"livinghistory.museum":true,"localhistory.museum":true,"london.museum":true,"losangeles.museum":true,"louvre.museum":true,"loyalist.museum":true,"lucerne.museum":true,"luxembourg.museum":true,"luzern.museum":true,"mad.museum":true,"madrid.museum":true,"mallorca.museum":true,"manchester.museum":true,"mansion.museum":true,"mansions.museum":true,"manx.museum":true,"marburg.museum":true,"maritime.museum":true,"maritimo.museum":true,"maryland.museum":true,"marylhurst.museum":true,"media.museum":true,"medical.museum":true,"medizinhistorisches.museum":true,"meeres.museum":true,"memorial.museum":true,"mesaverde.museum":true,"michigan.museum":true,"midatlantic.museum":true,"military.museum":true,"mill.museum":true,"miners.museum":true,"mining.museum":true,"minnesota.museum":true,"missile.museum":true,"missoula.museum":true,"modern.museum":true,"moma.museum":true,"money.museum":true,"monmouth.museum":true,"monticello.museum":true,"montreal.museum":true,"moscow.museum":true,"motorcycle.museum":true,"muenchen.museum":true,"muenster.museum":true,"mulhouse.museum":true,"muncie.museum":true,"museet.museum":true,"museumcenter.museum":true,"museumvereniging.museum":true,"music.museum":true,"national.museum":true,"nationalfirearms.museum":true,"nationalheritage.museum":true,"nativeamerican.museum":true,"naturalhistory.museum":true,"naturalhistorymuseum.museum":true,"naturalsciences.museum":true,"nature.museum":true,"naturhistorisches.museum":true,"natuurwetenschappen.museum":true,"naumburg.museum":true,"naval.museum":true,"nebraska.museum":true,"neues.museum":true,"newhampshire.museum":true,"newjersey.museum":true,"newmexico.museum":true,"newport.museum":true,"newspaper.museum":true,"newyork.museum":true,"niepce.museum":true,"norfolk.museum":true,"north.museum":true,"nrw.museum":true,"nuernberg.museum":true,"nuremberg.museum":true,"nyc.museum":true,"nyny.museum":true,"oceanographic.museum":true,"oceanographique.museum":true,"omaha.museum":true,"online.museum":true,"ontario.museum":true,"openair.museum":true,"oregon.museum":true,"oregontrail.museum":true,"otago.museum":true,"oxford.museum":true,"pacific.museum":true,"paderborn.museum":true,"palace.museum":true,"paleo.museum":true,"palmsprings.museum":true,"panama.museum":true,"paris.museum":true,"pasadena.museum":true,"pharmacy.museum":true,"philadelphia.museum":true,"philadelphiaarea.museum":true,"philately.museum":true,"phoenix.museum":true,"photography.museum":true,"pilots.museum":true,"pittsburgh.museum":true,"planetarium.museum":true,"plantation.museum":true,"plants.museum":true,"plaza.museum":true,"portal.museum":true,"portland.museum":true,"portlligat.museum":true,"posts-and-telecommunications.museum":true,"preservation.museum":true,"presidio.museum":true,"press.museum":true,"project.museum":true,"public.museum":true,"pubol.museum":true,"quebec.museum":true,"railroad.museum":true,"railway.museum":true,"research.museum":true,"resistance.museum":true,"riodejaneiro.museum":true,"rochester.museum":true,"rockart.museum":true,"roma.museum":true,"russia.museum":true,"saintlouis.museum":true,"salem.museum":true,"salvadordali.museum":true,"salzburg.museum":true,"sandiego.museum":true,"sanfrancisco.museum":true,"santabarbara.museum":true,"santacruz.museum":true,"santafe.museum":true,"saskatchewan.museum":true,"satx.museum":true,"savannahga.museum":true,"schlesisches.museum":true,"schoenbrunn.museum":true,"schokoladen.museum":true,"school.museum":true,"schweiz.museum":true,"science.museum":true,"scienceandhistory.museum":true,"scienceandindustry.museum":true,"sciencecenter.museum":true,"sciencecenters.museum":true,"science-fiction.museum":true,"sciencehistory.museum":true,"sciences.museum":true,"sciencesnaturelles.museum":true,"scotland.museum":true,"seaport.museum":true,"settlement.museum":true,"settlers.museum":true,"shell.museum":true,"sherbrooke.museum":true,"sibenik.museum":true,"silk.museum":true,"ski.museum":true,"skole.museum":true,"society.museum":true,"sologne.museum":true,"soundandvision.museum":true,"southcarolina.museum":true,"southwest.museum":true,"space.museum":true,"spy.museum":true,"square.museum":true,"stadt.museum":true,"stalbans.museum":true,"starnberg.museum":true,"state.museum":true,"stateofdelaware.museum":true,"station.museum":true,"steam.museum":true,"steiermark.museum":true,"stjohn.museum":true,"stockholm.museum":true,"stpetersburg.museum":true,"stuttgart.museum":true,"suisse.museum":true,"surgeonshall.museum":true,"surrey.museum":true,"svizzera.museum":true,"sweden.museum":true,"sydney.museum":true,"tank.museum":true,"tcm.museum":true,"technology.museum":true,"telekommunikation.museum":true,"television.museum":true,"texas.museum":true,"textile.museum":true,"theater.museum":true,"time.museum":true,"timekeeping.museum":true,"topology.museum":true,"torino.museum":true,"touch.museum":true,"town.museum":true,"transport.museum":true,"tree.museum":true,"trolley.museum":true,"trust.museum":true,"trustee.museum":true,"uhren.museum":true,"ulm.museum":true,"undersea.museum":true,"university.museum":true,"usa.museum":true,"usantiques.museum":true,"usarts.museum":true,"uscountryestate.museum":true,"usculture.museum":true,"usdecorativearts.museum":true,"usgarden.museum":true,"ushistory.museum":true,"ushuaia.museum":true,"uslivinghistory.museum":true,"utah.museum":true,"uvic.museum":true,"valley.museum":true,"vantaa.museum":true,"versailles.museum":true,"viking.museum":true,"village.museum":true,"virginia.museum":true,"virtual.museum":true,"virtuel.museum":true,"vlaanderen.museum":true,"volkenkunde.museum":true,"wales.museum":true,"wallonie.museum":true,"war.museum":true,"washingtondc.museum":true,"watchandclock.museum":true,"watch-and-clock.museum":true,"western.museum":true,"westfalen.museum":true,"whaling.museum":true,"wildlife.museum":true,"williamsburg.museum":true,"windmill.museum":true,"workshop.museum":true,"york.museum":true,"yorkshire.museum":true,"yosemite.museum":true,"youth.museum":true,"zoological.museum":true,"zoology.museum":true,"xn--9dbhblg6di.museum":true,"xn--h1aegh.museum":true,"mv":true,"aero.mv":true,"biz.mv":true,"com.mv":true,"coop.mv":true,"edu.mv":true,"gov.mv":true,"info.mv":true,"int.mv":true,"mil.mv":true,"museum.mv":true,"name.mv":true,"net.mv":true,"org.mv":true,"pro.mv":true,"mw":true,"ac.mw":true,"biz.mw":true,"co.mw":true,"com.mw":true,"coop.mw":true,"edu.mw":true,"gov.mw":true,"int.mw":true,"museum.mw":true,"net.mw":true,"org.mw":true,"mx":true,"com.mx":true,"org.mx":true,"gob.mx":true,"edu.mx":true,"net.mx":true,"my":true,"com.my":true,"net.my":true,"org.my":true,"gov.my":true,"edu.my":true,"mil.my":true,"name.my":true,"mz":true,"ac.mz":true,"adv.mz":true,"co.mz":true,"edu.mz":true,"gov.mz":true,"mil.mz":true,"net.mz":true,"org.mz":true,"na":true,"info.na":true,"pro.na":true,"name.na":true,"school.na":true,"or.na":true,"dr.na":true,"us.na":true,"mx.na":true,"ca.na":true,"in.na":true,"cc.na":true,"tv.na":true,"ws.na":true,"mobi.na":true,"co.na":true,"com.na":true,"org.na":true,"name":true,"nc":true,"asso.nc":true,"nom.nc":true,"ne":true,"net":true,"nf":true,"com.nf":true,"net.nf":true,"per.nf":true,"rec.nf":true,"web.nf":true,"arts.nf":true,"firm.nf":true,"info.nf":true,"other.nf":true,"store.nf":true,"ng":true,"com.ng":true,"edu.ng":true,"gov.ng":true,"i.ng":true,"mil.ng":true,"mobi.ng":true,"name.ng":true,"net.ng":true,"org.ng":true,"sch.ng":true,"ni":true,"ac.ni":true,"biz.ni":true,"co.ni":true,"com.ni":true,"edu.ni":true,"gob.ni":true,"in.ni":true,"info.ni":true,"int.ni":true,"mil.ni":true,"net.ni":true,"nom.ni":true,"org.ni":true,"web.ni":true,"nl":true,"bv.nl":true,"no":true,"fhs.no":true,"vgs.no":true,"fylkesbibl.no":true,"folkebibl.no":true,"museum.no":true,"idrett.no":true,"priv.no":true,"mil.no":true,"stat.no":true,"dep.no":true,"kommune.no":true,"herad.no":true,"aa.no":true,"ah.no":true,"bu.no":true,"fm.no":true,"hl.no":true,"hm.no":true,"jan-mayen.no":true,"mr.no":true,"nl.no":true,"nt.no":true,"of.no":true,"ol.no":true,"oslo.no":true,"rl.no":true,"sf.no":true,"st.no":true,"svalbard.no":true,"tm.no":true,"tr.no":true,"va.no":true,"vf.no":true,"gs.aa.no":true,"gs.ah.no":true,"gs.bu.no":true,"gs.fm.no":true,"gs.hl.no":true,"gs.hm.no":true,"gs.jan-mayen.no":true,"gs.mr.no":true,"gs.nl.no":true,"gs.nt.no":true,"gs.of.no":true,"gs.ol.no":true,"gs.oslo.no":true,"gs.rl.no":true,"gs.sf.no":true,"gs.st.no":true,"gs.svalbard.no":true,"gs.tm.no":true,"gs.tr.no":true,"gs.va.no":true,"gs.vf.no":true,"akrehamn.no":true,"xn--krehamn-dxa.no":true,"algard.no":true,"xn--lgrd-poac.no":true,"arna.no":true,"brumunddal.no":true,"bryne.no":true,"bronnoysund.no":true,"xn--brnnysund-m8ac.no":true,"drobak.no":true,"xn--drbak-wua.no":true,"egersund.no":true,"fetsund.no":true,"floro.no":true,"xn--flor-jra.no":true,"fredrikstad.no":true,"hokksund.no":true,"honefoss.no":true,"xn--hnefoss-q1a.no":true,"jessheim.no":true,"jorpeland.no":true,"xn--jrpeland-54a.no":true,"kirkenes.no":true,"kopervik.no":true,"krokstadelva.no":true,"langevag.no":true,"xn--langevg-jxa.no":true,"leirvik.no":true,"mjondalen.no":true,"xn--mjndalen-64a.no":true,"mo-i-rana.no":true,"mosjoen.no":true,"xn--mosjen-eya.no":true,"nesoddtangen.no":true,"orkanger.no":true,"osoyro.no":true,"xn--osyro-wua.no":true,"raholt.no":true,"xn--rholt-mra.no":true,"sandnessjoen.no":true,"xn--sandnessjen-ogb.no":true,"skedsmokorset.no":true,"slattum.no":true,"spjelkavik.no":true,"stathelle.no":true,"stavern.no":true,"stjordalshalsen.no":true,"xn--stjrdalshalsen-sqb.no":true,"tananger.no":true,"tranby.no":true,"vossevangen.no":true,"afjord.no":true,"xn--fjord-lra.no":true,"agdenes.no":true,"al.no":true,"xn--l-1fa.no":true,"alesund.no":true,"xn--lesund-hua.no":true,"alstahaug.no":true,"alta.no":true,"xn--lt-liac.no":true,"alaheadju.no":true,"xn--laheadju-7ya.no":true,"alvdal.no":true,"amli.no":true,"xn--mli-tla.no":true,"amot.no":true,"xn--mot-tla.no":true,"andebu.no":true,"andoy.no":true,"xn--andy-ira.no":true,"andasuolo.no":true,"ardal.no":true,"xn--rdal-poa.no":true,"aremark.no":true,"arendal.no":true,"xn--s-1fa.no":true,"aseral.no":true,"xn--seral-lra.no":true,"asker.no":true,"askim.no":true,"askvoll.no":true,"askoy.no":true,"xn--asky-ira.no":true,"asnes.no":true,"xn--snes-poa.no":true,"audnedaln.no":true,"aukra.no":true,"aure.no":true,"aurland.no":true,"aurskog-holand.no":true,"xn--aurskog-hland-jnb.no":true,"austevoll.no":true,"austrheim.no":true,"averoy.no":true,"xn--avery-yua.no":true,"balestrand.no":true,"ballangen.no":true,"balat.no":true,"xn--blt-elab.no":true,"balsfjord.no":true,"bahccavuotna.no":true,"xn--bhccavuotna-k7a.no":true,"bamble.no":true,"bardu.no":true,"beardu.no":true,"beiarn.no":true,"bajddar.no":true,"xn--bjddar-pta.no":true,"baidar.no":true,"xn--bidr-5nac.no":true,"berg.no":true,"bergen.no":true,"berlevag.no":true,"xn--berlevg-jxa.no":true,"bearalvahki.no":true,"xn--bearalvhki-y4a.no":true,"bindal.no":true,"birkenes.no":true,"bjarkoy.no":true,"xn--bjarky-fya.no":true,"bjerkreim.no":true,"bjugn.no":true,"bodo.no":true,"xn--bod-2na.no":true,"badaddja.no":true,"xn--bdddj-mrabd.no":true,"budejju.no":true,"bokn.no":true,"bremanger.no":true,"bronnoy.no":true,"xn--brnny-wuac.no":true,"bygland.no":true,"bykle.no":true,"barum.no":true,"xn--brum-voa.no":true,"bo.telemark.no":true,"xn--b-5ga.telemark.no":true,"bo.nordland.no":true,"xn--b-5ga.nordland.no":true,"bievat.no":true,"xn--bievt-0qa.no":true,"bomlo.no":true,"xn--bmlo-gra.no":true,"batsfjord.no":true,"xn--btsfjord-9za.no":true,"bahcavuotna.no":true,"xn--bhcavuotna-s4a.no":true,"dovre.no":true,"drammen.no":true,"drangedal.no":true,"dyroy.no":true,"xn--dyry-ira.no":true,"donna.no":true,"xn--dnna-gra.no":true,"eid.no":true,"eidfjord.no":true,"eidsberg.no":true,"eidskog.no":true,"eidsvoll.no":true,"eigersund.no":true,"elverum.no":true,"enebakk.no":true,"engerdal.no":true,"etne.no":true,"etnedal.no":true,"evenes.no":true,"evenassi.no":true,"xn--eveni-0qa01ga.no":true,"evje-og-hornnes.no":true,"farsund.no":true,"fauske.no":true,"fuossko.no":true,"fuoisku.no":true,"fedje.no":true,"fet.no":true,"finnoy.no":true,"xn--finny-yua.no":true,"fitjar.no":true,"fjaler.no":true,"fjell.no":true,"flakstad.no":true,"flatanger.no":true,"flekkefjord.no":true,"flesberg.no":true,"flora.no":true,"fla.no":true,"xn--fl-zia.no":true,"folldal.no":true,"forsand.no":true,"fosnes.no":true,"frei.no":true,"frogn.no":true,"froland.no":true,"frosta.no":true,"frana.no":true,"xn--frna-woa.no":true,"froya.no":true,"xn--frya-hra.no":true,"fusa.no":true,"fyresdal.no":true,"forde.no":true,"xn--frde-gra.no":true,"gamvik.no":true,"gangaviika.no":true,"xn--ggaviika-8ya47h.no":true,"gaular.no":true,"gausdal.no":true,"gildeskal.no":true,"xn--gildeskl-g0a.no":true,"giske.no":true,"gjemnes.no":true,"gjerdrum.no":true,"gjerstad.no":true,"gjesdal.no":true,"gjovik.no":true,"xn--gjvik-wua.no":true,"gloppen.no":true,"gol.no":true,"gran.no":true,"grane.no":true,"granvin.no":true,"gratangen.no":true,"grimstad.no":true,"grong.no":true,"kraanghke.no":true,"xn--kranghke-b0a.no":true,"grue.no":true,"gulen.no":true,"hadsel.no":true,"halden.no":true,"halsa.no":true,"hamar.no":true,"hamaroy.no":true,"habmer.no":true,"xn--hbmer-xqa.no":true,"hapmir.no":true,"xn--hpmir-xqa.no":true,"hammerfest.no":true,"hammarfeasta.no":true,"xn--hmmrfeasta-s4ac.no":true,"haram.no":true,"hareid.no":true,"harstad.no":true,"hasvik.no":true,"aknoluokta.no":true,"xn--koluokta-7ya57h.no":true,"hattfjelldal.no":true,"aarborte.no":true,"haugesund.no":true,"hemne.no":true,"hemnes.no":true,"hemsedal.no":true,"heroy.more-og-romsdal.no":true,"xn--hery-ira.xn--mre-og-romsdal-qqb.no":true,"heroy.nordland.no":true,"xn--hery-ira.nordland.no":true,"hitra.no":true,"hjartdal.no":true,"hjelmeland.no":true,"hobol.no":true,"xn--hobl-ira.no":true,"hof.no":true,"hol.no":true,"hole.no":true,"holmestrand.no":true,"holtalen.no":true,"xn--holtlen-hxa.no":true,"hornindal.no":true,"horten.no":true,"hurdal.no":true,"hurum.no":true,"hvaler.no":true,"hyllestad.no":true,"hagebostad.no":true,"xn--hgebostad-g3a.no":true,"hoyanger.no":true,"xn--hyanger-q1a.no":true,"hoylandet.no":true,"xn--hylandet-54a.no":true,"ha.no":true,"xn--h-2fa.no":true,"ibestad.no":true,"inderoy.no":true,"xn--indery-fya.no":true,"iveland.no":true,"jevnaker.no":true,"jondal.no":true,"jolster.no":true,"xn--jlster-bya.no":true,"karasjok.no":true,"karasjohka.no":true,"xn--krjohka-hwab49j.no":true,"karlsoy.no":true,"galsa.no":true,"xn--gls-elac.no":true,"karmoy.no":true,"xn--karmy-yua.no":true,"kautokeino.no":true,"guovdageaidnu.no":true,"klepp.no":true,"klabu.no":true,"xn--klbu-woa.no":true,"kongsberg.no":true,"kongsvinger.no":true,"kragero.no":true,"xn--krager-gya.no":true,"kristiansand.no":true,"kristiansund.no":true,"krodsherad.no":true,"xn--krdsherad-m8a.no":true,"kvalsund.no":true,"rahkkeravju.no":true,"xn--rhkkervju-01af.no":true,"kvam.no":true,"kvinesdal.no":true,"kvinnherad.no":true,"kviteseid.no":true,"kvitsoy.no":true,"xn--kvitsy-fya.no":true,"kvafjord.no":true,"xn--kvfjord-nxa.no":true,"giehtavuoatna.no":true,"kvanangen.no":true,"xn--kvnangen-k0a.no":true,"navuotna.no":true,"xn--nvuotna-hwa.no":true,"kafjord.no":true,"xn--kfjord-iua.no":true,"gaivuotna.no":true,"xn--givuotna-8ya.no":true,"larvik.no":true,"lavangen.no":true,"lavagis.no":true,"loabat.no":true,"xn--loabt-0qa.no":true,"lebesby.no":true,"davvesiida.no":true,"leikanger.no":true,"leirfjord.no":true,"leka.no":true,"leksvik.no":true,"lenvik.no":true,"leangaviika.no":true,"xn--leagaviika-52b.no":true,"lesja.no":true,"levanger.no":true,"lier.no":true,"lierne.no":true,"lillehammer.no":true,"lillesand.no":true,"lindesnes.no":true,"lindas.no":true,"xn--linds-pra.no":true,"lom.no":true,"loppa.no":true,"lahppi.no":true,"xn--lhppi-xqa.no":true,"lund.no":true,"lunner.no":true,"luroy.no":true,"xn--lury-ira.no":true,"luster.no":true,"lyngdal.no":true,"lyngen.no":true,"ivgu.no":true,"lardal.no":true,"lerdal.no":true,"xn--lrdal-sra.no":true,"lodingen.no":true,"xn--ldingen-q1a.no":true,"lorenskog.no":true,"xn--lrenskog-54a.no":true,"loten.no":true,"xn--lten-gra.no":true,"malvik.no":true,"masoy.no":true,"xn--msy-ula0h.no":true,"muosat.no":true,"xn--muost-0qa.no":true,"mandal.no":true,"marker.no":true,"marnardal.no":true,"masfjorden.no":true,"meland.no":true,"meldal.no":true,"melhus.no":true,"meloy.no":true,"xn--mely-ira.no":true,"meraker.no":true,"xn--merker-kua.no":true,"moareke.no":true,"xn--moreke-jua.no":true,"midsund.no":true,"midtre-gauldal.no":true,"modalen.no":true,"modum.no":true,"molde.no":true,"moskenes.no":true,"moss.no":true,"mosvik.no":true,"malselv.no":true,"xn--mlselv-iua.no":true,"malatvuopmi.no":true,"xn--mlatvuopmi-s4a.no":true,"namdalseid.no":true,"aejrie.no":true,"namsos.no":true,"namsskogan.no":true,"naamesjevuemie.no":true,"xn--nmesjevuemie-tcba.no":true,"laakesvuemie.no":true,"nannestad.no":true,"narvik.no":true,"narviika.no":true,"naustdal.no":true,"nedre-eiker.no":true,"nes.akershus.no":true,"nes.buskerud.no":true,"nesna.no":true,"nesodden.no":true,"nesseby.no":true,"unjarga.no":true,"xn--unjrga-rta.no":true,"nesset.no":true,"nissedal.no":true,"nittedal.no":true,"nord-aurdal.no":true,"nord-fron.no":true,"nord-odal.no":true,"norddal.no":true,"nordkapp.no":true,"davvenjarga.no":true,"xn--davvenjrga-y4a.no":true,"nordre-land.no":true,"nordreisa.no":true,"raisa.no":true,"xn--risa-5na.no":true,"nore-og-uvdal.no":true,"notodden.no":true,"naroy.no":true,"xn--nry-yla5g.no":true,"notteroy.no":true,"xn--nttery-byae.no":true,"odda.no":true,"oksnes.no":true,"xn--ksnes-uua.no":true,"oppdal.no":true,"oppegard.no":true,"xn--oppegrd-ixa.no":true,"orkdal.no":true,"orland.no":true,"xn--rland-uua.no":true,"orskog.no":true,"xn--rskog-uua.no":true,"orsta.no":true,"xn--rsta-fra.no":true,"os.hedmark.no":true,"os.hordaland.no":true,"osen.no":true,"osteroy.no":true,"xn--ostery-fya.no":true,"ostre-toten.no":true,"xn--stre-toten-zcb.no":true,"overhalla.no":true,"ovre-eiker.no":true,"xn--vre-eiker-k8a.no":true,"oyer.no":true,"xn--yer-zna.no":true,"oygarden.no":true,"xn--ygarden-p1a.no":true,"oystre-slidre.no":true,"xn--ystre-slidre-ujb.no":true,"porsanger.no":true,"porsangu.no":true,"xn--porsgu-sta26f.no":true,"porsgrunn.no":true,"radoy.no":true,"xn--rady-ira.no":true,"rakkestad.no":true,"rana.no":true,"ruovat.no":true,"randaberg.no":true,"rauma.no":true,"rendalen.no":true,"rennebu.no":true,"rennesoy.no":true,"xn--rennesy-v1a.no":true,"rindal.no":true,"ringebu.no":true,"ringerike.no":true,"ringsaker.no":true,"rissa.no":true,"risor.no":true,"xn--risr-ira.no":true,"roan.no":true,"rollag.no":true,"rygge.no":true,"ralingen.no":true,"xn--rlingen-mxa.no":true,"rodoy.no":true,"xn--rdy-0nab.no":true,"romskog.no":true,"xn--rmskog-bya.no":true,"roros.no":true,"xn--rros-gra.no":true,"rost.no":true,"xn--rst-0na.no":true,"royken.no":true,"xn--ryken-vua.no":true,"royrvik.no":true,"xn--ryrvik-bya.no":true,"rade.no":true,"xn--rde-ula.no":true,"salangen.no":true,"siellak.no":true,"saltdal.no":true,"salat.no":true,"xn--slt-elab.no":true,"xn--slat-5na.no":true,"samnanger.no":true,"sande.more-og-romsdal.no":true,"sande.xn--mre-og-romsdal-qqb.no":true,"sande.vestfold.no":true,"sandefjord.no":true,"sandnes.no":true,"sandoy.no":true,"xn--sandy-yua.no":true,"sarpsborg.no":true,"sauda.no":true,"sauherad.no":true,"sel.no":true,"selbu.no":true,"selje.no":true,"seljord.no":true,"sigdal.no":true,"siljan.no":true,"sirdal.no":true,"skaun.no":true,"skedsmo.no":true,"ski.no":true,"skien.no":true,"skiptvet.no":true,"skjervoy.no":true,"xn--skjervy-v1a.no":true,"skierva.no":true,"xn--skierv-uta.no":true,"skjak.no":true,"xn--skjk-soa.no":true,"skodje.no":true,"skanland.no":true,"xn--sknland-fxa.no":true,"skanit.no":true,"xn--sknit-yqa.no":true,"smola.no":true,"xn--smla-hra.no":true,"snillfjord.no":true,"snasa.no":true,"xn--snsa-roa.no":true,"snoasa.no":true,"snaase.no":true,"xn--snase-nra.no":true,"sogndal.no":true,"sokndal.no":true,"sola.no":true,"solund.no":true,"songdalen.no":true,"sortland.no":true,"spydeberg.no":true,"stange.no":true,"stavanger.no":true,"steigen.no":true,"steinkjer.no":true,"stjordal.no":true,"xn--stjrdal-s1a.no":true,"stokke.no":true,"stor-elvdal.no":true,"stord.no":true,"stordal.no":true,"storfjord.no":true,"omasvuotna.no":true,"strand.no":true,"stranda.no":true,"stryn.no":true,"sula.no":true,"suldal.no":true,"sund.no":true,"sunndal.no":true,"surnadal.no":true,"sveio.no":true,"svelvik.no":true,"sykkylven.no":true,"sogne.no":true,"xn--sgne-gra.no":true,"somna.no":true,"xn--smna-gra.no":true,"sondre-land.no":true,"xn--sndre-land-0cb.no":true,"sor-aurdal.no":true,"xn--sr-aurdal-l8a.no":true,"sor-fron.no":true,"xn--sr-fron-q1a.no":true,"sor-odal.no":true,"xn--sr-odal-q1a.no":true,"sor-varanger.no":true,"xn--sr-varanger-ggb.no":true,"matta-varjjat.no":true,"xn--mtta-vrjjat-k7af.no":true,"sorfold.no":true,"xn--srfold-bya.no":true,"sorreisa.no":true,"xn--srreisa-q1a.no":true,"sorum.no":true,"xn--srum-gra.no":true,"tana.no":true,"deatnu.no":true,"time.no":true,"tingvoll.no":true,"tinn.no":true,"tjeldsund.no":true,"dielddanuorri.no":true,"tjome.no":true,"xn--tjme-hra.no":true,"tokke.no":true,"tolga.no":true,"torsken.no":true,"tranoy.no":true,"xn--trany-yua.no":true,"tromso.no":true,"xn--troms-zua.no":true,"tromsa.no":true,"romsa.no":true,"trondheim.no":true,"troandin.no":true,"trysil.no":true,"trana.no":true,"xn--trna-woa.no":true,"trogstad.no":true,"xn--trgstad-r1a.no":true,"tvedestrand.no":true,"tydal.no":true,"tynset.no":true,"tysfjord.no":true,"divtasvuodna.no":true,"divttasvuotna.no":true,"tysnes.no":true,"tysvar.no":true,"xn--tysvr-vra.no":true,"tonsberg.no":true,"xn--tnsberg-q1a.no":true,"ullensaker.no":true,"ullensvang.no":true,"ulvik.no":true,"utsira.no":true,"vadso.no":true,"xn--vads-jra.no":true,"cahcesuolo.no":true,"xn--hcesuolo-7ya35b.no":true,"vaksdal.no":true,"valle.no":true,"vang.no":true,"vanylven.no":true,"vardo.no":true,"xn--vard-jra.no":true,"varggat.no":true,"xn--vrggt-xqad.no":true,"vefsn.no":true,"vaapste.no":true,"vega.no":true,"vegarshei.no":true,"xn--vegrshei-c0a.no":true,"vennesla.no":true,"verdal.no":true,"verran.no":true,"vestby.no":true,"vestnes.no":true,"vestre-slidre.no":true,"vestre-toten.no":true,"vestvagoy.no":true,"xn--vestvgy-ixa6o.no":true,"vevelstad.no":true,"vik.no":true,"vikna.no":true,"vindafjord.no":true,"volda.no":true,"voss.no":true,"varoy.no":true,"xn--vry-yla5g.no":true,"vagan.no":true,"xn--vgan-qoa.no":true,"voagat.no":true,"vagsoy.no":true,"xn--vgsy-qoa0j.no":true,"vaga.no":true,"xn--vg-yiab.no":true,"valer.ostfold.no":true,"xn--vler-qoa.xn--stfold-9xa.no":true,"valer.hedmark.no":true,"xn--vler-qoa.hedmark.no":true,"*.np":true,"nr":true,"biz.nr":true,"info.nr":true,"gov.nr":true,"edu.nr":true,"org.nr":true,"net.nr":true,"com.nr":true,"nu":true,"nz":true,"ac.nz":true,"co.nz":true,"cri.nz":true,"geek.nz":true,"gen.nz":true,"govt.nz":true,"health.nz":true,"iwi.nz":true,"kiwi.nz":true,"maori.nz":true,"mil.nz":true,"xn--mori-qsa.nz":true,"net.nz":true,"org.nz":true,"parliament.nz":true,"school.nz":true,"om":true,"co.om":true,"com.om":true,"edu.om":true,"gov.om":true,"med.om":true,"museum.om":true,"net.om":true,"org.om":true,"pro.om":true,"onion":true,"org":true,"pa":true,"ac.pa":true,"gob.pa":true,"com.pa":true,"org.pa":true,"sld.pa":true,"edu.pa":true,"net.pa":true,"ing.pa":true,"abo.pa":true,"med.pa":true,"nom.pa":true,"pe":true,"edu.pe":true,"gob.pe":true,"nom.pe":true,"mil.pe":true,"org.pe":true,"com.pe":true,"net.pe":true,"pf":true,"com.pf":true,"org.pf":true,"edu.pf":true,"*.pg":true,"ph":true,"com.ph":true,"net.ph":true,"org.ph":true,"gov.ph":true,"edu.ph":true,"ngo.ph":true,"mil.ph":true,"i.ph":true,"pk":true,"com.pk":true,"net.pk":true,"edu.pk":true,"org.pk":true,"fam.pk":true,"biz.pk":true,"web.pk":true,"gov.pk":true,"gob.pk":true,"gok.pk":true,"gon.pk":true,"gop.pk":true,"gos.pk":true,"info.pk":true,"pl":true,"com.pl":true,"net.pl":true,"org.pl":true,"aid.pl":true,"agro.pl":true,"atm.pl":true,"auto.pl":true,"biz.pl":true,"edu.pl":true,"gmina.pl":true,"gsm.pl":true,"info.pl":true,"mail.pl":true,"miasta.pl":true,"media.pl":true,"mil.pl":true,"nieruchomosci.pl":true,"nom.pl":true,"pc.pl":true,"powiat.pl":true,"priv.pl":true,"realestate.pl":true,"rel.pl":true,"sex.pl":true,"shop.pl":true,"sklep.pl":true,"sos.pl":true,"szkola.pl":true,"targi.pl":true,"tm.pl":true,"tourism.pl":true,"travel.pl":true,"turystyka.pl":true,"gov.pl":true,"ap.gov.pl":true,"ic.gov.pl":true,"is.gov.pl":true,"us.gov.pl":true,"kmpsp.gov.pl":true,"kppsp.gov.pl":true,"kwpsp.gov.pl":true,"psp.gov.pl":true,"wskr.gov.pl":true,"kwp.gov.pl":true,"mw.gov.pl":true,"ug.gov.pl":true,"um.gov.pl":true,"umig.gov.pl":true,"ugim.gov.pl":true,"upow.gov.pl":true,"uw.gov.pl":true,"starostwo.gov.pl":true,"pa.gov.pl":true,"po.gov.pl":true,"psse.gov.pl":true,"pup.gov.pl":true,"rzgw.gov.pl":true,"sa.gov.pl":true,"so.gov.pl":true,"sr.gov.pl":true,"wsa.gov.pl":true,"sko.gov.pl":true,"uzs.gov.pl":true,"wiih.gov.pl":true,"winb.gov.pl":true,"pinb.gov.pl":true,"wios.gov.pl":true,"witd.gov.pl":true,"wzmiuw.gov.pl":true,"piw.gov.pl":true,"wiw.gov.pl":true,"griw.gov.pl":true,"wif.gov.pl":true,"oum.gov.pl":true,"sdn.gov.pl":true,"zp.gov.pl":true,"uppo.gov.pl":true,"mup.gov.pl":true,"wuoz.gov.pl":true,"konsulat.gov.pl":true,"oirm.gov.pl":true,"augustow.pl":true,"babia-gora.pl":true,"bedzin.pl":true,"beskidy.pl":true,"bialowieza.pl":true,"bialystok.pl":true,"bielawa.pl":true,"bieszczady.pl":true,"boleslawiec.pl":true,"bydgoszcz.pl":true,"bytom.pl":true,"cieszyn.pl":true,"czeladz.pl":true,"czest.pl":true,"dlugoleka.pl":true,"elblag.pl":true,"elk.pl":true,"glogow.pl":true,"gniezno.pl":true,"gorlice.pl":true,"grajewo.pl":true,"ilawa.pl":true,"jaworzno.pl":true,"jelenia-gora.pl":true,"jgora.pl":true,"kalisz.pl":true,"kazimierz-dolny.pl":true,"karpacz.pl":true,"kartuzy.pl":true,"kaszuby.pl":true,"katowice.pl":true,"kepno.pl":true,"ketrzyn.pl":true,"klodzko.pl":true,"kobierzyce.pl":true,"kolobrzeg.pl":true,"konin.pl":true,"konskowola.pl":true,"kutno.pl":true,"lapy.pl":true,"lebork.pl":true,"legnica.pl":true,"lezajsk.pl":true,"limanowa.pl":true,"lomza.pl":true,"lowicz.pl":true,"lubin.pl":true,"lukow.pl":true,"malbork.pl":true,"malopolska.pl":true,"mazowsze.pl":true,"mazury.pl":true,"mielec.pl":true,"mielno.pl":true,"mragowo.pl":true,"naklo.pl":true,"nowaruda.pl":true,"nysa.pl":true,"olawa.pl":true,"olecko.pl":true,"olkusz.pl":true,"olsztyn.pl":true,"opoczno.pl":true,"opole.pl":true,"ostroda.pl":true,"ostroleka.pl":true,"ostrowiec.pl":true,"ostrowwlkp.pl":true,"pila.pl":true,"pisz.pl":true,"podhale.pl":true,"podlasie.pl":true,"polkowice.pl":true,"pomorze.pl":true,"pomorskie.pl":true,"prochowice.pl":true,"pruszkow.pl":true,"przeworsk.pl":true,"pulawy.pl":true,"radom.pl":true,"rawa-maz.pl":true,"rybnik.pl":true,"rzeszow.pl":true,"sanok.pl":true,"sejny.pl":true,"slask.pl":true,"slupsk.pl":true,"sosnowiec.pl":true,"stalowa-wola.pl":true,"skoczow.pl":true,"starachowice.pl":true,"stargard.pl":true,"suwalki.pl":true,"swidnica.pl":true,"swiebodzin.pl":true,"swinoujscie.pl":true,"szczecin.pl":true,"szczytno.pl":true,"tarnobrzeg.pl":true,"tgory.pl":true,"turek.pl":true,"tychy.pl":true,"ustka.pl":true,"walbrzych.pl":true,"warmia.pl":true,"warszawa.pl":true,"waw.pl":true,"wegrow.pl":true,"wielun.pl":true,"wlocl.pl":true,"wloclawek.pl":true,"wodzislaw.pl":true,"wolomin.pl":true,"wroclaw.pl":true,"zachpomor.pl":true,"zagan.pl":true,"zarow.pl":true,"zgora.pl":true,"zgorzelec.pl":true,"pm":true,"pn":true,"gov.pn":true,"co.pn":true,"org.pn":true,"edu.pn":true,"net.pn":true,"post":true,"pr":true,"com.pr":true,"net.pr":true,"org.pr":true,"gov.pr":true,"edu.pr":true,"isla.pr":true,"pro.pr":true,"biz.pr":true,"info.pr":true,"name.pr":true,"est.pr":true,"prof.pr":true,"ac.pr":true,"pro":true,"aaa.pro":true,"aca.pro":true,"acct.pro":true,"avocat.pro":true,"bar.pro":true,"cpa.pro":true,"eng.pro":true,"jur.pro":true,"law.pro":true,"med.pro":true,"recht.pro":true,"ps":true,"edu.ps":true,"gov.ps":true,"sec.ps":true,"plo.ps":true,"com.ps":true,"org.ps":true,"net.ps":true,"pt":true,"net.pt":true,"gov.pt":true,"org.pt":true,"edu.pt":true,"int.pt":true,"publ.pt":true,"com.pt":true,"nome.pt":true,"pw":true,"co.pw":true,"ne.pw":true,"or.pw":true,"ed.pw":true,"go.pw":true,"belau.pw":true,"py":true,"com.py":true,"coop.py":true,"edu.py":true,"gov.py":true,"mil.py":true,"net.py":true,"org.py":true,"qa":true,"com.qa":true,"edu.qa":true,"gov.qa":true,"mil.qa":true,"name.qa":true,"net.qa":true,"org.qa":true,"sch.qa":true,"re":true,"asso.re":true,"com.re":true,"nom.re":true,"ro":true,"arts.ro":true,"com.ro":true,"firm.ro":true,"info.ro":true,"nom.ro":true,"nt.ro":true,"org.ro":true,"rec.ro":true,"store.ro":true,"tm.ro":true,"www.ro":true,"rs":true,"ac.rs":true,"co.rs":true,"edu.rs":true,"gov.rs":true,"in.rs":true,"org.rs":true,"ru":true,"ac.ru":true,"edu.ru":true,"gov.ru":true,"int.ru":true,"mil.ru":true,"test.ru":true,"rw":true,"gov.rw":true,"net.rw":true,"edu.rw":true,"ac.rw":true,"com.rw":true,"co.rw":true,"int.rw":true,"mil.rw":true,"gouv.rw":true,"sa":true,"com.sa":true,"net.sa":true,"org.sa":true,"gov.sa":true,"med.sa":true,"pub.sa":true,"edu.sa":true,"sch.sa":true,"sb":true,"com.sb":true,"edu.sb":true,"gov.sb":true,"net.sb":true,"org.sb":true,"sc":true,"com.sc":true,"gov.sc":true,"net.sc":true,"org.sc":true,"edu.sc":true,"sd":true,"com.sd":true,"net.sd":true,"org.sd":true,"edu.sd":true,"med.sd":true,"tv.sd":true,"gov.sd":true,"info.sd":true,"se":true,"a.se":true,"ac.se":true,"b.se":true,"bd.se":true,"brand.se":true,"c.se":true,"d.se":true,"e.se":true,"f.se":true,"fh.se":true,"fhsk.se":true,"fhv.se":true,"g.se":true,"h.se":true,"i.se":true,"k.se":true,"komforb.se":true,"kommunalforbund.se":true,"komvux.se":true,"l.se":true,"lanbib.se":true,"m.se":true,"n.se":true,"naturbruksgymn.se":true,"o.se":true,"org.se":true,"p.se":true,"parti.se":true,"pp.se":true,"press.se":true,"r.se":true,"s.se":true,"t.se":true,"tm.se":true,"u.se":true,"w.se":true,"x.se":true,"y.se":true,"z.se":true,"sg":true,"com.sg":true,"net.sg":true,"org.sg":true,"gov.sg":true,"edu.sg":true,"per.sg":true,"sh":true,"com.sh":true,"net.sh":true,"gov.sh":true,"org.sh":true,"mil.sh":true,"si":true,"sj":true,"sk":true,"sl":true,"com.sl":true,"net.sl":true,"edu.sl":true,"gov.sl":true,"org.sl":true,"sm":true,"sn":true,"art.sn":true,"com.sn":true,"edu.sn":true,"gouv.sn":true,"org.sn":true,"perso.sn":true,"univ.sn":true,"so":true,"com.so":true,"net.so":true,"org.so":true,"sr":true,"st":true,"co.st":true,"com.st":true,"consulado.st":true,"edu.st":true,"embaixada.st":true,"gov.st":true,"mil.st":true,"net.st":true,"org.st":true,"principe.st":true,"saotome.st":true,"store.st":true,"su":true,"sv":true,"com.sv":true,"edu.sv":true,"gob.sv":true,"org.sv":true,"red.sv":true,"sx":true,"gov.sx":true,"sy":true,"edu.sy":true,"gov.sy":true,"net.sy":true,"mil.sy":true,"com.sy":true,"org.sy":true,"sz":true,"co.sz":true,"ac.sz":true,"org.sz":true,"tc":true,"td":true,"tel":true,"tf":true,"tg":true,"th":true,"ac.th":true,"co.th":true,"go.th":true,"in.th":true,"mi.th":true,"net.th":true,"or.th":true,"tj":true,"ac.tj":true,"biz.tj":true,"co.tj":true,"com.tj":true,"edu.tj":true,"go.tj":true,"gov.tj":true,"int.tj":true,"mil.tj":true,"name.tj":true,"net.tj":true,"nic.tj":true,"org.tj":true,"test.tj":true,"web.tj":true,"tk":true,"tl":true,"gov.tl":true,"tm":true,"com.tm":true,"co.tm":true,"org.tm":true,"net.tm":true,"nom.tm":true,"gov.tm":true,"mil.tm":true,"edu.tm":true,"tn":true,"com.tn":true,"ens.tn":true,"fin.tn":true,"gov.tn":true,"ind.tn":true,"intl.tn":true,"nat.tn":true,"net.tn":true,"org.tn":true,"info.tn":true,"perso.tn":true,"tourism.tn":true,"edunet.tn":true,"rnrt.tn":true,"rns.tn":true,"rnu.tn":true,"mincom.tn":true,"agrinet.tn":true,"defense.tn":true,"turen.tn":true,"to":true,"com.to":true,"gov.to":true,"net.to":true,"org.to":true,"edu.to":true,"mil.to":true,"tr":true,"com.tr":true,"info.tr":true,"biz.tr":true,"net.tr":true,"org.tr":true,"web.tr":true,"gen.tr":true,"tv.tr":true,"av.tr":true,"dr.tr":true,"bbs.tr":true,"name.tr":true,"tel.tr":true,"gov.tr":true,"bel.tr":true,"pol.tr":true,"mil.tr":true,"k12.tr":true,"edu.tr":true,"kep.tr":true,"nc.tr":true,"gov.nc.tr":true,"travel":true,"tt":true,"co.tt":true,"com.tt":true,"org.tt":true,"net.tt":true,"biz.tt":true,"info.tt":true,"pro.tt":true,"int.tt":true,"coop.tt":true,"jobs.tt":true,"mobi.tt":true,"travel.tt":true,"museum.tt":true,"aero.tt":true,"name.tt":true,"gov.tt":true,"edu.tt":true,"tv":true,"tw":true,"edu.tw":true,"gov.tw":true,"mil.tw":true,"com.tw":true,"net.tw":true,"org.tw":true,"idv.tw":true,"game.tw":true,"ebiz.tw":true,"club.tw":true,"xn--zf0ao64a.tw":true,"xn--uc0atv.tw":true,"xn--czrw28b.tw":true,"tz":true,"ac.tz":true,"co.tz":true,"go.tz":true,"hotel.tz":true,"info.tz":true,"me.tz":true,"mil.tz":true,"mobi.tz":true,"ne.tz":true,"or.tz":true,"sc.tz":true,"tv.tz":true,"ua":true,"com.ua":true,"edu.ua":true,"gov.ua":true,"in.ua":true,"net.ua":true,"org.ua":true,"cherkassy.ua":true,"cherkasy.ua":true,"chernigov.ua":true,"chernihiv.ua":true,"chernivtsi.ua":true,"chernovtsy.ua":true,"ck.ua":true,"cn.ua":true,"cr.ua":true,"crimea.ua":true,"cv.ua":true,"dn.ua":true,"dnepropetrovsk.ua":true,"dnipropetrovsk.ua":true,"dominic.ua":true,"donetsk.ua":true,"dp.ua":true,"if.ua":true,"ivano-frankivsk.ua":true,"kh.ua":true,"kharkiv.ua":true,"kharkov.ua":true,"kherson.ua":true,"khmelnitskiy.ua":true,"khmelnytskyi.ua":true,"kiev.ua":true,"kirovograd.ua":true,"km.ua":true,"kr.ua":true,"krym.ua":true,"ks.ua":true,"kv.ua":true,"kyiv.ua":true,"lg.ua":true,"lt.ua":true,"lugansk.ua":true,"lutsk.ua":true,"lv.ua":true,"lviv.ua":true,"mk.ua":true,"mykolaiv.ua":true,"nikolaev.ua":true,"od.ua":true,"odesa.ua":true,"odessa.ua":true,"pl.ua":true,"poltava.ua":true,"rivne.ua":true,"rovno.ua":true,"rv.ua":true,"sb.ua":true,"sebastopol.ua":true,"sevastopol.ua":true,"sm.ua":true,"sumy.ua":true,"te.ua":true,"ternopil.ua":true,"uz.ua":true,"uzhgorod.ua":true,"vinnica.ua":true,"vinnytsia.ua":true,"vn.ua":true,"volyn.ua":true,"yalta.ua":true,"zaporizhzhe.ua":true,"zaporizhzhia.ua":true,"zhitomir.ua":true,"zhytomyr.ua":true,"zp.ua":true,"zt.ua":true,"ug":true,"co.ug":true,"or.ug":true,"ac.ug":true,"sc.ug":true,"go.ug":true,"ne.ug":true,"com.ug":true,"org.ug":true,"uk":true,"ac.uk":true,"co.uk":true,"gov.uk":true,"ltd.uk":true,"me.uk":true,"net.uk":true,"nhs.uk":true,"org.uk":true,"plc.uk":true,"police.uk":true,"*.sch.uk":true,"us":true,"dni.us":true,"fed.us":true,"isa.us":true,"kids.us":true,"nsn.us":true,"ak.us":true,"al.us":true,"ar.us":true,"as.us":true,"az.us":true,"ca.us":true,"co.us":true,"ct.us":true,"dc.us":true,"de.us":true,"fl.us":true,"ga.us":true,"gu.us":true,"hi.us":true,"ia.us":true,"id.us":true,"il.us":true,"in.us":true,"ks.us":true,"ky.us":true,"la.us":true,"ma.us":true,"md.us":true,"me.us":true,"mi.us":true,"mn.us":true,"mo.us":true,"ms.us":true,"mt.us":true,"nc.us":true,"nd.us":true,"ne.us":true,"nh.us":true,"nj.us":true,"nm.us":true,"nv.us":true,"ny.us":true,"oh.us":true,"ok.us":true,"or.us":true,"pa.us":true,"pr.us":true,"ri.us":true,"sc.us":true,"sd.us":true,"tn.us":true,"tx.us":true,"ut.us":true,"vi.us":true,"vt.us":true,"va.us":true,"wa.us":true,"wi.us":true,"wv.us":true,"wy.us":true,"k12.ak.us":true,"k12.al.us":true,"k12.ar.us":true,"k12.as.us":true,"k12.az.us":true,"k12.ca.us":true,"k12.co.us":true,"k12.ct.us":true,"k12.dc.us":true,"k12.de.us":true,"k12.fl.us":true,"k12.ga.us":true,"k12.gu.us":true,"k12.ia.us":true,"k12.id.us":true,"k12.il.us":true,"k12.in.us":true,"k12.ks.us":true,"k12.ky.us":true,"k12.la.us":true,"k12.ma.us":true,"k12.md.us":true,"k12.me.us":true,"k12.mi.us":true,"k12.mn.us":true,"k12.mo.us":true,"k12.ms.us":true,"k12.mt.us":true,"k12.nc.us":true,"k12.ne.us":true,"k12.nh.us":true,"k12.nj.us":true,"k12.nm.us":true,"k12.nv.us":true,"k12.ny.us":true,"k12.oh.us":true,"k12.ok.us":true,"k12.or.us":true,"k12.pa.us":true,"k12.pr.us":true,"k12.ri.us":true,"k12.sc.us":true,"k12.tn.us":true,"k12.tx.us":true,"k12.ut.us":true,"k12.vi.us":true,"k12.vt.us":true,"k12.va.us":true,"k12.wa.us":true,"k12.wi.us":true,"k12.wy.us":true,"cc.ak.us":true,"cc.al.us":true,"cc.ar.us":true,"cc.as.us":true,"cc.az.us":true,"cc.ca.us":true,"cc.co.us":true,"cc.ct.us":true,"cc.dc.us":true,"cc.de.us":true,"cc.fl.us":true,"cc.ga.us":true,"cc.gu.us":true,"cc.hi.us":true,"cc.ia.us":true,"cc.id.us":true,"cc.il.us":true,"cc.in.us":true,"cc.ks.us":true,"cc.ky.us":true,"cc.la.us":true,"cc.ma.us":true,"cc.md.us":true,"cc.me.us":true,"cc.mi.us":true,"cc.mn.us":true,"cc.mo.us":true,"cc.ms.us":true,"cc.mt.us":true,"cc.nc.us":true,"cc.nd.us":true,"cc.ne.us":true,"cc.nh.us":true,"cc.nj.us":true,"cc.nm.us":true,"cc.nv.us":true,"cc.ny.us":true,"cc.oh.us":true,"cc.ok.us":true,"cc.or.us":true,"cc.pa.us":true,"cc.pr.us":true,"cc.ri.us":true,"cc.sc.us":true,"cc.sd.us":true,"cc.tn.us":true,"cc.tx.us":true,"cc.ut.us":true,"cc.vi.us":true,"cc.vt.us":true,"cc.va.us":true,"cc.wa.us":true,"cc.wi.us":true,"cc.wv.us":true,"cc.wy.us":true,"lib.ak.us":true,"lib.al.us":true,"lib.ar.us":true,"lib.as.us":true,"lib.az.us":true,"lib.ca.us":true,"lib.co.us":true,"lib.ct.us":true,"lib.dc.us":true,"lib.fl.us":true,"lib.ga.us":true,"lib.gu.us":true,"lib.hi.us":true,"lib.ia.us":true,"lib.id.us":true,"lib.il.us":true,"lib.in.us":true,"lib.ks.us":true,"lib.ky.us":true,"lib.la.us":true,"lib.ma.us":true,"lib.md.us":true,"lib.me.us":true,"lib.mi.us":true,"lib.mn.us":true,"lib.mo.us":true,"lib.ms.us":true,"lib.mt.us":true,"lib.nc.us":true,"lib.nd.us":true,"lib.ne.us":true,"lib.nh.us":true,"lib.nj.us":true,"lib.nm.us":true,"lib.nv.us":true,"lib.ny.us":true,"lib.oh.us":true,"lib.ok.us":true,"lib.or.us":true,"lib.pa.us":true,"lib.pr.us":true,"lib.ri.us":true,"lib.sc.us":true,"lib.sd.us":true,"lib.tn.us":true,"lib.tx.us":true,"lib.ut.us":true,"lib.vi.us":true,"lib.vt.us":true,"lib.va.us":true,"lib.wa.us":true,"lib.wi.us":true,"lib.wy.us":true,"pvt.k12.ma.us":true,"chtr.k12.ma.us":true,"paroch.k12.ma.us":true,"ann-arbor.mi.us":true,"cog.mi.us":true,"dst.mi.us":true,"eaton.mi.us":true,"gen.mi.us":true,"mus.mi.us":true,"tec.mi.us":true,"washtenaw.mi.us":true,"uy":true,"com.uy":true,"edu.uy":true,"gub.uy":true,"mil.uy":true,"net.uy":true,"org.uy":true,"uz":true,"co.uz":true,"com.uz":true,"net.uz":true,"org.uz":true,"va":true,"vc":true,"com.vc":true,"net.vc":true,"org.vc":true,"gov.vc":true,"mil.vc":true,"edu.vc":true,"ve":true,"arts.ve":true,"co.ve":true,"com.ve":true,"e12.ve":true,"edu.ve":true,"firm.ve":true,"gob.ve":true,"gov.ve":true,"info.ve":true,"int.ve":true,"mil.ve":true,"net.ve":true,"org.ve":true,"rec.ve":true,"store.ve":true,"tec.ve":true,"web.ve":true,"vg":true,"vi":true,"co.vi":true,"com.vi":true,"k12.vi":true,"net.vi":true,"org.vi":true,"vn":true,"com.vn":true,"net.vn":true,"org.vn":true,"edu.vn":true,"gov.vn":true,"int.vn":true,"ac.vn":true,"biz.vn":true,"info.vn":true,"name.vn":true,"pro.vn":true,"health.vn":true,"vu":true,"com.vu":true,"edu.vu":true,"net.vu":true,"org.vu":true,"wf":true,"ws":true,"com.ws":true,"net.ws":true,"org.ws":true,"gov.ws":true,"edu.ws":true,"yt":true,"xn--mgbaam7a8h":true,"xn--y9a3aq":true,"xn--54b7fta0cc":true,"xn--90ae":true,"xn--90ais":true,"xn--fiqs8s":true,"xn--fiqz9s":true,"xn--lgbbat1ad8j":true,"xn--wgbh1c":true,"xn--e1a4c":true,"xn--node":true,"xn--qxam":true,"xn--j6w193g":true,"xn--2scrj9c":true,"xn--3hcrj9c":true,"xn--45br5cyl":true,"xn--h2breg3eve":true,"xn--h2brj9c8c":true,"xn--mgbgu82a":true,"xn--rvc1e0am3e":true,"xn--h2brj9c":true,"xn--mgbbh1a71e":true,"xn--fpcrj9c3d":true,"xn--gecrj9c":true,"xn--s9brj9c":true,"xn--45brj9c":true,"xn--xkc2dl3a5ee0h":true,"xn--mgba3a4f16a":true,"xn--mgba3a4fra":true,"xn--mgbtx2b":true,"xn--mgbayh7gpa":true,"xn--3e0b707e":true,"xn--80ao21a":true,"xn--fzc2c9e2c":true,"xn--xkc2al3hye2a":true,"xn--mgbc0a9azcg":true,"xn--d1alf":true,"xn--l1acc":true,"xn--mix891f":true,"xn--mix082f":true,"xn--mgbx4cd0ab":true,"xn--mgb9awbf":true,"xn--mgbai9azgqp6j":true,"xn--mgbai9a5eva00b":true,"xn--ygbi2ammx":true,"xn--90a3ac":true,"xn--o1ac.xn--90a3ac":true,"xn--c1avg.xn--90a3ac":true,"xn--90azh.xn--90a3ac":true,"xn--d1at.xn--90a3ac":true,"xn--o1ach.xn--90a3ac":true,"xn--80au.xn--90a3ac":true,"xn--p1ai":true,"xn--wgbl6a":true,"xn--mgberp4a5d4ar":true,"xn--mgberp4a5d4a87g":true,"xn--mgbqly7c0a67fbc":true,"xn--mgbqly7cvafr":true,"xn--mgbpl2fh":true,"xn--yfro4i67o":true,"xn--clchc0ea0b2g2a9gcd":true,"xn--ogbpf8fl":true,"xn--mgbtf8fl":true,"xn--o3cw4h":true,"xn--12c1fe0br.xn--o3cw4h":true,"xn--12co0c3b4eva.xn--o3cw4h":true,"xn--h3cuzk1di.xn--o3cw4h":true,"xn--o3cyx2a.xn--o3cw4h":true,"xn--m3ch0j3a.xn--o3cw4h":true,"xn--12cfi8ixb8l.xn--o3cw4h":true,"xn--pgbs0dh":true,"xn--kpry57d":true,"xn--kprw13d":true,"xn--nnx388a":true,"xn--j1amh":true,"xn--mgb2ddes":true,"xxx":true,"*.ye":true,"ac.za":true,"agric.za":true,"alt.za":true,"co.za":true,"edu.za":true,"gov.za":true,"grondar.za":true,"law.za":true,"mil.za":true,"net.za":true,"ngo.za":true,"nis.za":true,"nom.za":true,"org.za":true,"school.za":true,"tm.za":true,"web.za":true,"zm":true,"ac.zm":true,"biz.zm":true,"co.zm":true,"com.zm":true,"edu.zm":true,"gov.zm":true,"info.zm":true,"mil.zm":true,"net.zm":true,"org.zm":true,"sch.zm":true,"zw":true,"ac.zw":true,"co.zw":true,"gov.zw":true,"mil.zw":true,"org.zw":true,"aaa":true,"aarp":true,"abarth":true,"abb":true,"abbott":true,"abbvie":true,"abc":true,"able":true,"abogado":true,"abudhabi":true,"academy":true,"accenture":true,"accountant":true,"accountants":true,"aco":true,"active":true,"actor":true,"adac":true,"ads":true,"adult":true,"aeg":true,"aetna":true,"afamilycompany":true,"afl":true,"africa":true,"agakhan":true,"agency":true,"aig":true,"aigo":true,"airbus":true,"airforce":true,"airtel":true,"akdn":true,"alfaromeo":true,"alibaba":true,"alipay":true,"allfinanz":true,"allstate":true,"ally":true,"alsace":true,"alstom":true,"americanexpress":true,"americanfamily":true,"amex":true,"amfam":true,"amica":true,"amsterdam":true,"analytics":true,"android":true,"anquan":true,"anz":true,"aol":true,"apartments":true,"app":true,"apple":true,"aquarelle":true,"arab":true,"aramco":true,"archi":true,"army":true,"art":true,"arte":true,"asda":true,"associates":true,"athleta":true,"attorney":true,"auction":true,"audi":true,"audible":true,"audio":true,"auspost":true,"author":true,"auto":true,"autos":true,"avianca":true,"aws":true,"axa":true,"azure":true,"baby":true,"baidu":true,"banamex":true,"bananarepublic":true,"band":true,"bank":true,"bar":true,"barcelona":true,"barclaycard":true,"barclays":true,"barefoot":true,"bargains":true,"baseball":true,"basketball":true,"bauhaus":true,"bayern":true,"bbc":true,"bbt":true,"bbva":true,"bcg":true,"bcn":true,"beats":true,"beauty":true,"beer":true,"bentley":true,"berlin":true,"best":true,"bestbuy":true,"bet":true,"bharti":true,"bible":true,"bid":true,"bike":true,"bing":true,"bingo":true,"bio":true,"black":true,"blackfriday":true,"blanco":true,"blockbuster":true,"blog":true,"bloomberg":true,"blue":true,"bms":true,"bmw":true,"bnl":true,"bnpparibas":true,"boats":true,"boehringer":true,"bofa":true,"bom":true,"bond":true,"boo":true,"book":true,"booking":true,"boots":true,"bosch":true,"bostik":true,"boston":true,"bot":true,"boutique":true,"box":true,"bradesco":true,"bridgestone":true,"broadway":true,"broker":true,"brother":true,"brussels":true,"budapest":true,"bugatti":true,"build":true,"builders":true,"business":true,"buy":true,"buzz":true,"bzh":true,"cab":true,"cafe":true,"cal":true,"call":true,"calvinklein":true,"cam":true,"camera":true,"camp":true,"cancerresearch":true,"canon":true,"capetown":true,"capital":true,"capitalone":true,"car":true,"caravan":true,"cards":true,"care":true,"career":true,"careers":true,"cars":true,"cartier":true,"casa":true,"case":true,"caseih":true,"cash":true,"casino":true,"catering":true,"catholic":true,"cba":true,"cbn":true,"cbre":true,"cbs":true,"ceb":true,"center":true,"ceo":true,"cern":true,"cfa":true,"cfd":true,"chanel":true,"channel":true,"chase":true,"chat":true,"cheap":true,"chintai":true,"christmas":true,"chrome":true,"chrysler":true,"church":true,"cipriani":true,"circle":true,"cisco":true,"citadel":true,"citi":true,"citic":true,"city":true,"cityeats":true,"claims":true,"cleaning":true,"click":true,"clinic":true,"clinique":true,"clothing":true,"cloud":true,"club":true,"clubmed":true,"coach":true,"codes":true,"coffee":true,"college":true,"cologne":true,"comcast":true,"commbank":true,"community":true,"company":true,"compare":true,"computer":true,"comsec":true,"condos":true,"construction":true,"consulting":true,"contact":true,"contractors":true,"cooking":true,"cookingchannel":true,"cool":true,"corsica":true,"country":true,"coupon":true,"coupons":true,"courses":true,"credit":true,"creditcard":true,"creditunion":true,"cricket":true,"crown":true,"crs":true,"cruise":true,"cruises":true,"csc":true,"cuisinella":true,"cymru":true,"cyou":true,"dabur":true,"dad":true,"dance":true,"data":true,"date":true,"dating":true,"datsun":true,"day":true,"dclk":true,"dds":true,"deal":true,"dealer":true,"deals":true,"degree":true,"delivery":true,"dell":true,"deloitte":true,"delta":true,"democrat":true,"dental":true,"dentist":true,"desi":true,"design":true,"dev":true,"dhl":true,"diamonds":true,"diet":true,"digital":true,"direct":true,"directory":true,"discount":true,"discover":true,"dish":true,"diy":true,"dnp":true,"docs":true,"doctor":true,"dodge":true,"dog":true,"doha":true,"domains":true,"dot":true,"download":true,"drive":true,"dtv":true,"dubai":true,"duck":true,"dunlop":true,"duns":true,"dupont":true,"durban":true,"dvag":true,"dvr":true,"earth":true,"eat":true,"eco":true,"edeka":true,"education":true,"email":true,"emerck":true,"energy":true,"engineer":true,"engineering":true,"enterprises":true,"epost":true,"epson":true,"equipment":true,"ericsson":true,"erni":true,"esq":true,"estate":true,"esurance":true,"etisalat":true,"eurovision":true,"eus":true,"events":true,"everbank":true,"exchange":true,"expert":true,"exposed":true,"express":true,"extraspace":true,"fage":true,"fail":true,"fairwinds":true,"faith":true,"family":true,"fan":true,"fans":true,"farm":true,"farmers":true,"fashion":true,"fast":true,"fedex":true,"feedback":true,"ferrari":true,"ferrero":true,"fiat":true,"fidelity":true,"fido":true,"film":true,"final":true,"finance":true,"financial":true,"fire":true,"firestone":true,"firmdale":true,"fish":true,"fishing":true,"fit":true,"fitness":true,"flickr":true,"flights":true,"flir":true,"florist":true,"flowers":true,"fly":true,"foo":true,"food":true,"foodnetwork":true,"football":true,"ford":true,"forex":true,"forsale":true,"forum":true,"foundation":true,"fox":true,"free":true,"fresenius":true,"frl":true,"frogans":true,"frontdoor":true,"frontier":true,"ftr":true,"fujitsu":true,"fujixerox":true,"fun":true,"fund":true,"furniture":true,"futbol":true,"fyi":true,"gal":true,"gallery":true,"gallo":true,"gallup":true,"game":true,"games":true,"gap":true,"garden":true,"gbiz":true,"gdn":true,"gea":true,"gent":true,"genting":true,"george":true,"ggee":true,"gift":true,"gifts":true,"gives":true,"giving":true,"glade":true,"glass":true,"gle":true,"global":true,"globo":true,"gmail":true,"gmbh":true,"gmo":true,"gmx":true,"godaddy":true,"gold":true,"goldpoint":true,"golf":true,"goo":true,"goodhands":true,"goodyear":true,"goog":true,"google":true,"gop":true,"got":true,"grainger":true,"graphics":true,"gratis":true,"green":true,"gripe":true,"grocery":true,"group":true,"guardian":true,"gucci":true,"guge":true,"guide":true,"guitars":true,"guru":true,"hair":true,"hamburg":true,"hangout":true,"haus":true,"hbo":true,"hdfc":true,"hdfcbank":true,"health":true,"healthcare":true,"help":true,"helsinki":true,"here":true,"hermes":true,"hgtv":true,"hiphop":true,"hisamitsu":true,"hitachi":true,"hiv":true,"hkt":true,"hockey":true,"holdings":true,"holiday":true,"homedepot":true,"homegoods":true,"homes":true,"homesense":true,"honda":true,"honeywell":true,"horse":true,"hospital":true,"host":true,"hosting":true,"hot":true,"hoteles":true,"hotels":true,"hotmail":true,"house":true,"how":true,"hsbc":true,"hughes":true,"hyatt":true,"hyundai":true,"ibm":true,"icbc":true,"ice":true,"icu":true,"ieee":true,"ifm":true,"ikano":true,"imamat":true,"imdb":true,"immo":true,"immobilien":true,"industries":true,"infiniti":true,"ing":true,"ink":true,"institute":true,"insurance":true,"insure":true,"intel":true,"international":true,"intuit":true,"investments":true,"ipiranga":true,"irish":true,"iselect":true,"ismaili":true,"ist":true,"istanbul":true,"itau":true,"itv":true,"iveco":true,"iwc":true,"jaguar":true,"java":true,"jcb":true,"jcp":true,"jeep":true,"jetzt":true,"jewelry":true,"jio":true,"jlc":true,"jll":true,"jmp":true,"jnj":true,"joburg":true,"jot":true,"joy":true,"jpmorgan":true,"jprs":true,"juegos":true,"juniper":true,"kaufen":true,"kddi":true,"kerryhotels":true,"kerrylogistics":true,"kerryproperties":true,"kfh":true,"kia":true,"kim":true,"kinder":true,"kindle":true,"kitchen":true,"kiwi":true,"koeln":true,"komatsu":true,"kosher":true,"kpmg":true,"kpn":true,"krd":true,"kred":true,"kuokgroup":true,"kyoto":true,"lacaixa":true,"ladbrokes":true,"lamborghini":true,"lamer":true,"lancaster":true,"lancia":true,"lancome":true,"land":true,"landrover":true,"lanxess":true,"lasalle":true,"lat":true,"latino":true,"latrobe":true,"law":true,"lawyer":true,"lds":true,"lease":true,"leclerc":true,"lefrak":true,"legal":true,"lego":true,"lexus":true,"lgbt":true,"liaison":true,"lidl":true,"life":true,"lifeinsurance":true,"lifestyle":true,"lighting":true,"like":true,"lilly":true,"limited":true,"limo":true,"lincoln":true,"linde":true,"link":true,"lipsy":true,"live":true,"living":true,"lixil":true,"loan":true,"loans":true,"locker":true,"locus":true,"loft":true,"lol":true,"london":true,"lotte":true,"lotto":true,"love":true,"lpl":true,"lplfinancial":true,"ltd":true,"ltda":true,"lundbeck":true,"lupin":true,"luxe":true,"luxury":true,"macys":true,"madrid":true,"maif":true,"maison":true,"makeup":true,"man":true,"management":true,"mango":true,"map":true,"market":true,"marketing":true,"markets":true,"marriott":true,"marshalls":true,"maserati":true,"mattel":true,"mba":true,"mckinsey":true,"med":true,"media":true,"meet":true,"melbourne":true,"meme":true,"memorial":true,"men":true,"menu":true,"meo":true,"merckmsd":true,"metlife":true,"miami":true,"microsoft":true,"mini":true,"mint":true,"mit":true,"mitsubishi":true,"mlb":true,"mls":true,"mma":true,"mobile":true,"mobily":true,"moda":true,"moe":true,"moi":true,"mom":true,"monash":true,"money":true,"monster":true,"mopar":true,"mormon":true,"mortgage":true,"moscow":true,"moto":true,"motorcycles":true,"mov":true,"movie":true,"movistar":true,"msd":true,"mtn":true,"mtpc":true,"mtr":true,"mutual":true,"nab":true,"nadex":true,"nagoya":true,"nationwide":true,"natura":true,"navy":true,"nba":true,"nec":true,"netbank":true,"netflix":true,"network":true,"neustar":true,"new":true,"newholland":true,"news":true,"next":true,"nextdirect":true,"nexus":true,"nfl":true,"ngo":true,"nhk":true,"nico":true,"nike":true,"nikon":true,"ninja":true,"nissan":true,"nissay":true,"nokia":true,"northwesternmutual":true,"norton":true,"now":true,"nowruz":true,"nowtv":true,"nra":true,"nrw":true,"ntt":true,"nyc":true,"obi":true,"observer":true,"off":true,"office":true,"okinawa":true,"olayan":true,"olayangroup":true,"oldnavy":true,"ollo":true,"omega":true,"one":true,"ong":true,"onl":true,"online":true,"onyourside":true,"ooo":true,"open":true,"oracle":true,"orange":true,"organic":true,"origins":true,"osaka":true,"otsuka":true,"ott":true,"ovh":true,"page":true,"panasonic":true,"panerai":true,"paris":true,"pars":true,"partners":true,"parts":true,"party":true,"passagens":true,"pay":true,"pccw":true,"pet":true,"pfizer":true,"pharmacy":true,"phd":true,"philips":true,"phone":true,"photo":true,"photography":true,"photos":true,"physio":true,"piaget":true,"pics":true,"pictet":true,"pictures":true,"pid":true,"pin":true,"ping":true,"pink":true,"pioneer":true,"pizza":true,"place":true,"play":true,"playstation":true,"plumbing":true,"plus":true,"pnc":true,"pohl":true,"poker":true,"politie":true,"porn":true,"pramerica":true,"praxi":true,"press":true,"prime":true,"prod":true,"productions":true,"prof":true,"progressive":true,"promo":true,"properties":true,"property":true,"protection":true,"pru":true,"prudential":true,"pub":true,"pwc":true,"qpon":true,"quebec":true,"quest":true,"qvc":true,"racing":true,"radio":true,"raid":true,"read":true,"realestate":true,"realtor":true,"realty":true,"recipes":true,"red":true,"redstone":true,"redumbrella":true,"rehab":true,"reise":true,"reisen":true,"reit":true,"reliance":true,"ren":true,"rent":true,"rentals":true,"repair":true,"report":true,"republican":true,"rest":true,"restaurant":true,"review":true,"reviews":true,"rexroth":true,"rich":true,"richardli":true,"ricoh":true,"rightathome":true,"ril":true,"rio":true,"rip":true,"rmit":true,"rocher":true,"rocks":true,"rodeo":true,"rogers":true,"room":true,"rsvp":true,"rugby":true,"ruhr":true,"run":true,"rwe":true,"ryukyu":true,"saarland":true,"safe":true,"safety":true,"sakura":true,"sale":true,"salon":true,"samsclub":true,"samsung":true,"sandvik":true,"sandvikcoromant":true,"sanofi":true,"sap":true,"sapo":true,"sarl":true,"sas":true,"save":true,"saxo":true,"sbi":true,"sbs":true,"sca":true,"scb":true,"schaeffler":true,"schmidt":true,"scholarships":true,"school":true,"schule":true,"schwarz":true,"science":true,"scjohnson":true,"scor":true,"scot":true,"search":true,"seat":true,"secure":true,"security":true,"seek":true,"select":true,"sener":true,"services":true,"ses":true,"seven":true,"sew":true,"sex":true,"sexy":true,"sfr":true,"shangrila":true,"sharp":true,"shaw":true,"shell":true,"shia":true,"shiksha":true,"shoes":true,"shop":true,"shopping":true,"shouji":true,"show":true,"showtime":true,"shriram":true,"silk":true,"sina":true,"singles":true,"site":true,"ski":true,"skin":true,"sky":true,"skype":true,"sling":true,"smart":true,"smile":true,"sncf":true,"soccer":true,"social":true,"softbank":true,"software":true,"sohu":true,"solar":true,"solutions":true,"song":true,"sony":true,"soy":true,"space":true,"spiegel":true,"spot":true,"spreadbetting":true,"srl":true,"srt":true,"stada":true,"staples":true,"star":true,"starhub":true,"statebank":true,"statefarm":true,"statoil":true,"stc":true,"stcgroup":true,"stockholm":true,"storage":true,"store":true,"stream":true,"studio":true,"study":true,"style":true,"sucks":true,"supplies":true,"supply":true,"support":true,"surf":true,"surgery":true,"suzuki":true,"swatch":true,"swiftcover":true,"swiss":true,"sydney":true,"symantec":true,"systems":true,"tab":true,"taipei":true,"talk":true,"taobao":true,"target":true,"tatamotors":true,"tatar":true,"tattoo":true,"tax":true,"taxi":true,"tci":true,"tdk":true,"team":true,"tech":true,"technology":true,"telecity":true,"telefonica":true,"temasek":true,"tennis":true,"teva":true,"thd":true,"theater":true,"theatre":true,"tiaa":true,"tickets":true,"tienda":true,"tiffany":true,"tips":true,"tires":true,"tirol":true,"tjmaxx":true,"tjx":true,"tkmaxx":true,"tmall":true,"today":true,"tokyo":true,"tools":true,"top":true,"toray":true,"toshiba":true,"total":true,"tours":true,"town":true,"toyota":true,"toys":true,"trade":true,"trading":true,"training":true,"travelchannel":true,"travelers":true,"travelersinsurance":true,"trust":true,"trv":true,"tube":true,"tui":true,"tunes":true,"tushu":true,"tvs":true,"ubank":true,"ubs":true,"uconnect":true,"unicom":true,"university":true,"uno":true,"uol":true,"ups":true,"vacations":true,"vana":true,"vanguard":true,"vegas":true,"ventures":true,"verisign":true,"versicherung":true,"vet":true,"viajes":true,"video":true,"vig":true,"viking":true,"villas":true,"vin":true,"vip":true,"virgin":true,"visa":true,"vision":true,"vista":true,"vistaprint":true,"viva":true,"vivo":true,"vlaanderen":true,"vodka":true,"volkswagen":true,"volvo":true,"vote":true,"voting":true,"voto":true,"voyage":true,"vuelos":true,"wales":true,"walmart":true,"walter":true,"wang":true,"wanggou":true,"warman":true,"watch":true,"watches":true,"weather":true,"weatherchannel":true,"webcam":true,"weber":true,"website":true,"wed":true,"wedding":true,"weibo":true,"weir":true,"whoswho":true,"wien":true,"wiki":true,"williamhill":true,"win":true,"windows":true,"wine":true,"winners":true,"wme":true,"wolterskluwer":true,"woodside":true,"work":true,"works":true,"world":true,"wow":true,"wtc":true,"wtf":true,"xbox":true,"xerox":true,"xfinity":true,"xihuan":true,"xin":true,"xn--11b4c3d":true,"xn--1ck2e1b":true,"xn--1qqw23a":true,"xn--30rr7y":true,"xn--3bst00m":true,"xn--3ds443g":true,"xn--3oq18vl8pn36a":true,"xn--3pxu8k":true,"xn--42c2d9a":true,"xn--45q11c":true,"xn--4gbrim":true,"xn--55qw42g":true,"xn--55qx5d":true,"xn--5su34j936bgsg":true,"xn--5tzm5g":true,"xn--6frz82g":true,"xn--6qq986b3xl":true,"xn--80adxhks":true,"xn--80aqecdr1a":true,"xn--80asehdb":true,"xn--80aswg":true,"xn--8y0a063a":true,"xn--9dbq2a":true,"xn--9et52u":true,"xn--9krt00a":true,"xn--b4w605ferd":true,"xn--bck1b9a5dre4c":true,"xn--c1avg":true,"xn--c2br7g":true,"xn--cck2b3b":true,"xn--cg4bki":true,"xn--czr694b":true,"xn--czrs0t":true,"xn--czru2d":true,"xn--d1acj3b":true,"xn--eckvdtc9d":true,"xn--efvy88h":true,"xn--estv75g":true,"xn--fct429k":true,"xn--fhbei":true,"xn--fiq228c5hs":true,"xn--fiq64b":true,"xn--fjq720a":true,"xn--flw351e":true,"xn--fzys8d69uvgm":true,"xn--g2xx48c":true,"xn--gckr3f0f":true,"xn--gk3at1e":true,"xn--hxt814e":true,"xn--i1b6b1a6a2e":true,"xn--imr513n":true,"xn--io0a7i":true,"xn--j1aef":true,"xn--jlq61u9w7b":true,"xn--jvr189m":true,"xn--kcrx77d1x4a":true,"xn--kpu716f":true,"xn--kput3i":true,"xn--mgba3a3ejt":true,"xn--mgba7c0bbn0a":true,"xn--mgbaakc7dvf":true,"xn--mgbab2bd":true,"xn--mgbb9fbpob":true,"xn--mgbca7dzdo":true,"xn--mgbi4ecexp":true,"xn--mgbt3dhd":true,"xn--mk1bu44c":true,"xn--mxtq1m":true,"xn--ngbc5azd":true,"xn--ngbe9e0a":true,"xn--ngbrx":true,"xn--nqv7f":true,"xn--nqv7fs00ema":true,"xn--nyqy26a":true,"xn--p1acf":true,"xn--pbt977c":true,"xn--pssy2u":true,"xn--q9jyb4c":true,"xn--qcka1pmc":true,"xn--rhqv96g":true,"xn--rovu88b":true,"xn--ses554g":true,"xn--t60b56a":true,"xn--tckwe":true,"xn--tiq49xqyj":true,"xn--unup4y":true,"xn--vermgensberater-ctb":true,"xn--vermgensberatung-pwb":true,"xn--vhquv":true,"xn--vuq861b":true,"xn--w4r85el8fhu5dnra":true,"xn--w4rs40l":true,"xn--xhq521b":true,"xn--zfr164b":true,"xperia":true,"xyz":true,"yachts":true,"yahoo":true,"yamaxun":true,"yandex":true,"yodobashi":true,"yoga":true,"yokohama":true,"you":true,"youtube":true,"yun":true,"zappos":true,"zara":true,"zero":true,"zip":true,"zippo":true,"zone":true,"zuerich":true,"cc.ua":true,"inf.ua":true,"ltd.ua":true,"1password.ca":true,"1password.com":true,"1password.eu":true,"beep.pl":true,"*.compute.estate":true,"*.alces.network":true,"alwaysdata.net":true,"cloudfront.net":true,"*.compute.amazonaws.com":true,"*.compute-1.amazonaws.com":true,"*.compute.amazonaws.com.cn":true,"us-east-1.amazonaws.com":true,"cn-north-1.eb.amazonaws.com.cn":true,"elasticbeanstalk.com":true,"ap-northeast-1.elasticbeanstalk.com":true,"ap-northeast-2.elasticbeanstalk.com":true,"ap-south-1.elasticbeanstalk.com":true,"ap-southeast-1.elasticbeanstalk.com":true,"ap-southeast-2.elasticbeanstalk.com":true,"ca-central-1.elasticbeanstalk.com":true,"eu-central-1.elasticbeanstalk.com":true,"eu-west-1.elasticbeanstalk.com":true,"eu-west-2.elasticbeanstalk.com":true,"eu-west-3.elasticbeanstalk.com":true,"sa-east-1.elasticbeanstalk.com":true,"us-east-1.elasticbeanstalk.com":true,"us-east-2.elasticbeanstalk.com":true,"us-gov-west-1.elasticbeanstalk.com":true,"us-west-1.elasticbeanstalk.com":true,"us-west-2.elasticbeanstalk.com":true,"*.elb.amazonaws.com":true,"*.elb.amazonaws.com.cn":true,"s3.amazonaws.com":true,"s3-ap-northeast-1.amazonaws.com":true,"s3-ap-northeast-2.amazonaws.com":true,"s3-ap-south-1.amazonaws.com":true,"s3-ap-southeast-1.amazonaws.com":true,"s3-ap-southeast-2.amazonaws.com":true,"s3-ca-central-1.amazonaws.com":true,"s3-eu-central-1.amazonaws.com":true,"s3-eu-west-1.amazonaws.com":true,"s3-eu-west-2.amazonaws.com":true,"s3-eu-west-3.amazonaws.com":true,"s3-external-1.amazonaws.com":true,"s3-fips-us-gov-west-1.amazonaws.com":true,"s3-sa-east-1.amazonaws.com":true,"s3-us-gov-west-1.amazonaws.com":true,"s3-us-east-2.amazonaws.com":true,"s3-us-west-1.amazonaws.com":true,"s3-us-west-2.amazonaws.com":true,"s3.ap-northeast-2.amazonaws.com":true,"s3.ap-south-1.amazonaws.com":true,"s3.cn-north-1.amazonaws.com.cn":true,"s3.ca-central-1.amazonaws.com":true,"s3.eu-central-1.amazonaws.com":true,"s3.eu-west-2.amazonaws.com":true,"s3.eu-west-3.amazonaws.com":true,"s3.us-east-2.amazonaws.com":true,"s3.dualstack.ap-northeast-1.amazonaws.com":true,"s3.dualstack.ap-northeast-2.amazonaws.com":true,"s3.dualstack.ap-south-1.amazonaws.com":true,"s3.dualstack.ap-southeast-1.amazonaws.com":true,"s3.dualstack.ap-southeast-2.amazonaws.com":true,"s3.dualstack.ca-central-1.amazonaws.com":true,"s3.dualstack.eu-central-1.amazonaws.com":true,"s3.dualstack.eu-west-1.amazonaws.com":true,"s3.dualstack.eu-west-2.amazonaws.com":true,"s3.dualstack.eu-west-3.amazonaws.com":true,"s3.dualstack.sa-east-1.amazonaws.com":true,"s3.dualstack.us-east-1.amazonaws.com":true,"s3.dualstack.us-east-2.amazonaws.com":true,"s3-website-us-east-1.amazonaws.com":true,"s3-website-us-west-1.amazonaws.com":true,"s3-website-us-west-2.amazonaws.com":true,"s3-website-ap-northeast-1.amazonaws.com":true,"s3-website-ap-southeast-1.amazonaws.com":true,"s3-website-ap-southeast-2.amazonaws.com":true,"s3-website-eu-west-1.amazonaws.com":true,"s3-website-sa-east-1.amazonaws.com":true,"s3-website.ap-northeast-2.amazonaws.com":true,"s3-website.ap-south-1.amazonaws.com":true,"s3-website.ca-central-1.amazonaws.com":true,"s3-website.eu-central-1.amazonaws.com":true,"s3-website.eu-west-2.amazonaws.com":true,"s3-website.eu-west-3.amazonaws.com":true,"s3-website.us-east-2.amazonaws.com":true,"t3l3p0rt.net":true,"tele.amune.org":true,"on-aptible.com":true,"user.party.eus":true,"pimienta.org":true,"poivron.org":true,"potager.org":true,"sweetpepper.org":true,"myasustor.com":true,"myfritz.net":true,"*.awdev.ca":true,"*.advisor.ws":true,"backplaneapp.io":true,"betainabox.com":true,"bnr.la":true,"boomla.net":true,"boxfuse.io":true,"square7.ch":true,"bplaced.com":true,"bplaced.de":true,"square7.de":true,"bplaced.net":true,"square7.net":true,"browsersafetymark.io":true,"mycd.eu":true,"ae.org":true,"ar.com":true,"br.com":true,"cn.com":true,"com.de":true,"com.se":true,"de.com":true,"eu.com":true,"gb.com":true,"gb.net":true,"hu.com":true,"hu.net":true,"jp.net":true,"jpn.com":true,"kr.com":true,"mex.com":true,"no.com":true,"qc.com":true,"ru.com":true,"sa.com":true,"se.com":true,"se.net":true,"uk.com":true,"uk.net":true,"us.com":true,"uy.com":true,"za.bz":true,"za.com":true,"africa.com":true,"gr.com":true,"in.net":true,"us.org":true,"co.com":true,"c.la":true,"certmgr.org":true,"xenapponazure.com":true,"virtueeldomein.nl":true,"c66.me":true,"cloud66.ws":true,"jdevcloud.com":true,"wpdevcloud.com":true,"cloudaccess.host":true,"freesite.host":true,"cloudaccess.net":true,"cloudcontrolled.com":true,"cloudcontrolapp.com":true,"co.ca":true,"co.cz":true,"c.cdn77.org":true,"cdn77-ssl.net":true,"r.cdn77.net":true,"rsc.cdn77.org":true,"ssl.origin.cdn77-secure.org":true,"cloudns.asia":true,"cloudns.biz":true,"cloudns.club":true,"cloudns.cc":true,"cloudns.eu":true,"cloudns.in":true,"cloudns.info":true,"cloudns.org":true,"cloudns.pro":true,"cloudns.pw":true,"cloudns.us":true,"co.nl":true,"co.no":true,"webhosting.be":true,"hosting-cluster.nl":true,"dyn.cosidns.de":true,"dynamisches-dns.de":true,"dnsupdater.de":true,"internet-dns.de":true,"l-o-g-i-n.de":true,"dynamic-dns.info":true,"feste-ip.net":true,"knx-server.net":true,"static-access.net":true,"realm.cz":true,"*.cryptonomic.net":true,"cupcake.is":true,"cyon.link":true,"cyon.site":true,"daplie.me":true,"localhost.daplie.me":true,"biz.dk":true,"co.dk":true,"firm.dk":true,"reg.dk":true,"store.dk":true,"debian.net":true,"dedyn.io":true,"dnshome.de":true,"drayddns.com":true,"dreamhosters.com":true,"mydrobo.com":true,"drud.io":true,"drud.us":true,"duckdns.org":true,"dy.fi":true,"tunk.org":true,"dyndns-at-home.com":true,"dyndns-at-work.com":true,"dyndns-blog.com":true,"dyndns-free.com":true,"dyndns-home.com":true,"dyndns-ip.com":true,"dyndns-mail.com":true,"dyndns-office.com":true,"dyndns-pics.com":true,"dyndns-remote.com":true,"dyndns-server.com":true,"dyndns-web.com":true,"dyndns-wiki.com":true,"dyndns-work.com":true,"dyndns.biz":true,"dyndns.info":true,"dyndns.org":true,"dyndns.tv":true,"at-band-camp.net":true,"ath.cx":true,"barrel-of-knowledge.info":true,"barrell-of-knowledge.info":true,"better-than.tv":true,"blogdns.com":true,"blogdns.net":true,"blogdns.org":true,"blogsite.org":true,"boldlygoingnowhere.org":true,"broke-it.net":true,"buyshouses.net":true,"cechire.com":true,"dnsalias.com":true,"dnsalias.net":true,"dnsalias.org":true,"dnsdojo.com":true,"dnsdojo.net":true,"dnsdojo.org":true,"does-it.net":true,"doesntexist.com":true,"doesntexist.org":true,"dontexist.com":true,"dontexist.net":true,"dontexist.org":true,"doomdns.com":true,"doomdns.org":true,"dvrdns.org":true,"dyn-o-saur.com":true,"dynalias.com":true,"dynalias.net":true,"dynalias.org":true,"dynathome.net":true,"dyndns.ws":true,"endofinternet.net":true,"endofinternet.org":true,"endoftheinternet.org":true,"est-a-la-maison.com":true,"est-a-la-masion.com":true,"est-le-patron.com":true,"est-mon-blogueur.com":true,"for-better.biz":true,"for-more.biz":true,"for-our.info":true,"for-some.biz":true,"for-the.biz":true,"forgot.her.name":true,"forgot.his.name":true,"from-ak.com":true,"from-al.com":true,"from-ar.com":true,"from-az.net":true,"from-ca.com":true,"from-co.net":true,"from-ct.com":true,"from-dc.com":true,"from-de.com":true,"from-fl.com":true,"from-ga.com":true,"from-hi.com":true,"from-ia.com":true,"from-id.com":true,"from-il.com":true,"from-in.com":true,"from-ks.com":true,"from-ky.com":true,"from-la.net":true,"from-ma.com":true,"from-md.com":true,"from-me.org":true,"from-mi.com":true,"from-mn.com":true,"from-mo.com":true,"from-ms.com":true,"from-mt.com":true,"from-nc.com":true,"from-nd.com":true,"from-ne.com":true,"from-nh.com":true,"from-nj.com":true,"from-nm.com":true,"from-nv.com":true,"from-ny.net":true,"from-oh.com":true,"from-ok.com":true,"from-or.com":true,"from-pa.com":true,"from-pr.com":true,"from-ri.com":true,"from-sc.com":true,"from-sd.com":true,"from-tn.com":true,"from-tx.com":true,"from-ut.com":true,"from-va.com":true,"from-vt.com":true,"from-wa.com":true,"from-wi.com":true,"from-wv.com":true,"from-wy.com":true,"ftpaccess.cc":true,"fuettertdasnetz.de":true,"game-host.org":true,"game-server.cc":true,"getmyip.com":true,"gets-it.net":true,"go.dyndns.org":true,"gotdns.com":true,"gotdns.org":true,"groks-the.info":true,"groks-this.info":true,"ham-radio-op.net":true,"here-for-more.info":true,"hobby-site.com":true,"hobby-site.org":true,"home.dyndns.org":true,"homedns.org":true,"homeftp.net":true,"homeftp.org":true,"homeip.net":true,"homelinux.com":true,"homelinux.net":true,"homelinux.org":true,"homeunix.com":true,"homeunix.net":true,"homeunix.org":true,"iamallama.com":true,"in-the-band.net":true,"is-a-anarchist.com":true,"is-a-blogger.com":true,"is-a-bookkeeper.com":true,"is-a-bruinsfan.org":true,"is-a-bulls-fan.com":true,"is-a-candidate.org":true,"is-a-caterer.com":true,"is-a-celticsfan.org":true,"is-a-chef.com":true,"is-a-chef.net":true,"is-a-chef.org":true,"is-a-conservative.com":true,"is-a-cpa.com":true,"is-a-cubicle-slave.com":true,"is-a-democrat.com":true,"is-a-designer.com":true,"is-a-doctor.com":true,"is-a-financialadvisor.com":true,"is-a-geek.com":true,"is-a-geek.net":true,"is-a-geek.org":true,"is-a-green.com":true,"is-a-guru.com":true,"is-a-hard-worker.com":true,"is-a-hunter.com":true,"is-a-knight.org":true,"is-a-landscaper.com":true,"is-a-lawyer.com":true,"is-a-liberal.com":true,"is-a-libertarian.com":true,"is-a-linux-user.org":true,"is-a-llama.com":true,"is-a-musician.com":true,"is-a-nascarfan.com":true,"is-a-nurse.com":true,"is-a-painter.com":true,"is-a-patsfan.org":true,"is-a-personaltrainer.com":true,"is-a-photographer.com":true,"is-a-player.com":true,"is-a-republican.com":true,"is-a-rockstar.com":true,"is-a-socialist.com":true,"is-a-soxfan.org":true,"is-a-student.com":true,"is-a-teacher.com":true,"is-a-techie.com":true,"is-a-therapist.com":true,"is-an-accountant.com":true,"is-an-actor.com":true,"is-an-actress.com":true,"is-an-anarchist.com":true,"is-an-artist.com":true,"is-an-engineer.com":true,"is-an-entertainer.com":true,"is-by.us":true,"is-certified.com":true,"is-found.org":true,"is-gone.com":true,"is-into-anime.com":true,"is-into-cars.com":true,"is-into-cartoons.com":true,"is-into-games.com":true,"is-leet.com":true,"is-lost.org":true,"is-not-certified.com":true,"is-saved.org":true,"is-slick.com":true,"is-uberleet.com":true,"is-very-bad.org":true,"is-very-evil.org":true,"is-very-good.org":true,"is-very-nice.org":true,"is-very-sweet.org":true,"is-with-theband.com":true,"isa-geek.com":true,"isa-geek.net":true,"isa-geek.org":true,"isa-hockeynut.com":true,"issmarterthanyou.com":true,"isteingeek.de":true,"istmein.de":true,"kicks-ass.net":true,"kicks-ass.org":true,"knowsitall.info":true,"land-4-sale.us":true,"lebtimnetz.de":true,"leitungsen.de":true,"likes-pie.com":true,"likescandy.com":true,"merseine.nu":true,"mine.nu":true,"misconfused.org":true,"mypets.ws":true,"myphotos.cc":true,"neat-url.com":true,"office-on-the.net":true,"on-the-web.tv":true,"podzone.net":true,"podzone.org":true,"readmyblog.org":true,"saves-the-whales.com":true,"scrapper-site.net":true,"scrapping.cc":true,"selfip.biz":true,"selfip.com":true,"selfip.info":true,"selfip.net":true,"selfip.org":true,"sells-for-less.com":true,"sells-for-u.com":true,"sells-it.net":true,"sellsyourhome.org":true,"servebbs.com":true,"servebbs.net":true,"servebbs.org":true,"serveftp.net":true,"serveftp.org":true,"servegame.org":true,"shacknet.nu":true,"simple-url.com":true,"space-to-rent.com":true,"stuff-4-sale.org":true,"stuff-4-sale.us":true,"teaches-yoga.com":true,"thruhere.net":true,"traeumtgerade.de":true,"webhop.biz":true,"webhop.info":true,"webhop.net":true,"webhop.org":true,"worse-than.tv":true,"writesthisblog.com":true,"ddnss.de":true,"dyn.ddnss.de":true,"dyndns.ddnss.de":true,"dyndns1.de":true,"dyn-ip24.de":true,"home-webserver.de":true,"dyn.home-webserver.de":true,"myhome-server.de":true,"ddnss.org":true,"definima.net":true,"definima.io":true,"ddnsfree.com":true,"ddnsgeek.com":true,"giize.com":true,"gleeze.com":true,"kozow.com":true,"loseyourip.com":true,"ooguy.com":true,"theworkpc.com":true,"casacam.net":true,"dynu.net":true,"accesscam.org":true,"camdvr.org":true,"freeddns.org":true,"mywire.org":true,"webredirect.org":true,"myddns.rocks":true,"blogsite.xyz":true,"dynv6.net":true,"e4.cz":true,"mytuleap.com":true,"enonic.io":true,"customer.enonic.io":true,"eu.org":true,"al.eu.org":true,"asso.eu.org":true,"at.eu.org":true,"au.eu.org":true,"be.eu.org":true,"bg.eu.org":true,"ca.eu.org":true,"cd.eu.org":true,"ch.eu.org":true,"cn.eu.org":true,"cy.eu.org":true,"cz.eu.org":true,"de.eu.org":true,"dk.eu.org":true,"edu.eu.org":true,"ee.eu.org":true,"es.eu.org":true,"fi.eu.org":true,"fr.eu.org":true,"gr.eu.org":true,"hr.eu.org":true,"hu.eu.org":true,"ie.eu.org":true,"il.eu.org":true,"in.eu.org":true,"int.eu.org":true,"is.eu.org":true,"it.eu.org":true,"jp.eu.org":true,"kr.eu.org":true,"lt.eu.org":true,"lu.eu.org":true,"lv.eu.org":true,"mc.eu.org":true,"me.eu.org":true,"mk.eu.org":true,"mt.eu.org":true,"my.eu.org":true,"net.eu.org":true,"ng.eu.org":true,"nl.eu.org":true,"no.eu.org":true,"nz.eu.org":true,"paris.eu.org":true,"pl.eu.org":true,"pt.eu.org":true,"q-a.eu.org":true,"ro.eu.org":true,"ru.eu.org":true,"se.eu.org":true,"si.eu.org":true,"sk.eu.org":true,"tr.eu.org":true,"uk.eu.org":true,"us.eu.org":true,"eu-1.evennode.com":true,"eu-2.evennode.com":true,"eu-3.evennode.com":true,"eu-4.evennode.com":true,"us-1.evennode.com":true,"us-2.evennode.com":true,"us-3.evennode.com":true,"us-4.evennode.com":true,"twmail.cc":true,"twmail.net":true,"twmail.org":true,"mymailer.com.tw":true,"url.tw":true,"apps.fbsbx.com":true,"ru.net":true,"adygeya.ru":true,"bashkiria.ru":true,"bir.ru":true,"cbg.ru":true,"com.ru":true,"dagestan.ru":true,"grozny.ru":true,"kalmykia.ru":true,"kustanai.ru":true,"marine.ru":true,"mordovia.ru":true,"msk.ru":true,"mytis.ru":true,"nalchik.ru":true,"nov.ru":true,"pyatigorsk.ru":true,"spb.ru":true,"vladikavkaz.ru":true,"vladimir.ru":true,"abkhazia.su":true,"adygeya.su":true,"aktyubinsk.su":true,"arkhangelsk.su":true,"armenia.su":true,"ashgabad.su":true,"azerbaijan.su":true,"balashov.su":true,"bashkiria.su":true,"bryansk.su":true,"bukhara.su":true,"chimkent.su":true,"dagestan.su":true,"east-kazakhstan.su":true,"exnet.su":true,"georgia.su":true,"grozny.su":true,"ivanovo.su":true,"jambyl.su":true,"kalmykia.su":true,"kaluga.su":true,"karacol.su":true,"karaganda.su":true,"karelia.su":true,"khakassia.su":true,"krasnodar.su":true,"kurgan.su":true,"kustanai.su":true,"lenug.su":true,"mangyshlak.su":true,"mordovia.su":true,"msk.su":true,"murmansk.su":true,"nalchik.su":true,"navoi.su":true,"north-kazakhstan.su":true,"nov.su":true,"obninsk.su":true,"penza.su":true,"pokrovsk.su":true,"sochi.su":true,"spb.su":true,"tashkent.su":true,"termez.su":true,"togliatti.su":true,"troitsk.su":true,"tselinograd.su":true,"tula.su":true,"tuva.su":true,"vladikavkaz.su":true,"vladimir.su":true,"vologda.su":true,"channelsdvr.net":true,"fastlylb.net":true,"map.fastlylb.net":true,"freetls.fastly.net":true,"map.fastly.net":true,"a.prod.fastly.net":true,"global.prod.fastly.net":true,"a.ssl.fastly.net":true,"b.ssl.fastly.net":true,"global.ssl.fastly.net":true,"fhapp.xyz":true,"fedorainfracloud.org":true,"fedorapeople.org":true,"cloud.fedoraproject.org":true,"app.os.fedoraproject.org":true,"app.os.stg.fedoraproject.org":true,"filegear.me":true,"firebaseapp.com":true,"flynnhub.com":true,"flynnhosting.net":true,"freebox-os.com":true,"freeboxos.com":true,"fbx-os.fr":true,"fbxos.fr":true,"freebox-os.fr":true,"freeboxos.fr":true,"*.futurecms.at":true,"futurehosting.at":true,"futuremailing.at":true,"*.ex.ortsinfo.at":true,"*.kunden.ortsinfo.at":true,"*.statics.cloud":true,"service.gov.uk":true,"github.io":true,"githubusercontent.com":true,"gitlab.io":true,"homeoffice.gov.uk":true,"ro.im":true,"shop.ro":true,"goip.de":true,"*.0emm.com":true,"appspot.com":true,"blogspot.ae":true,"blogspot.al":true,"blogspot.am":true,"blogspot.ba":true,"blogspot.be":true,"blogspot.bg":true,"blogspot.bj":true,"blogspot.ca":true,"blogspot.cf":true,"blogspot.ch":true,"blogspot.cl":true,"blogspot.co.at":true,"blogspot.co.id":true,"blogspot.co.il":true,"blogspot.co.ke":true,"blogspot.co.nz":true,"blogspot.co.uk":true,"blogspot.co.za":true,"blogspot.com":true,"blogspot.com.ar":true,"blogspot.com.au":true,"blogspot.com.br":true,"blogspot.com.by":true,"blogspot.com.co":true,"blogspot.com.cy":true,"blogspot.com.ee":true,"blogspot.com.eg":true,"blogspot.com.es":true,"blogspot.com.mt":true,"blogspot.com.ng":true,"blogspot.com.tr":true,"blogspot.com.uy":true,"blogspot.cv":true,"blogspot.cz":true,"blogspot.de":true,"blogspot.dk":true,"blogspot.fi":true,"blogspot.fr":true,"blogspot.gr":true,"blogspot.hk":true,"blogspot.hr":true,"blogspot.hu":true,"blogspot.ie":true,"blogspot.in":true,"blogspot.is":true,"blogspot.it":true,"blogspot.jp":true,"blogspot.kr":true,"blogspot.li":true,"blogspot.lt":true,"blogspot.lu":true,"blogspot.md":true,"blogspot.mk":true,"blogspot.mr":true,"blogspot.mx":true,"blogspot.my":true,"blogspot.nl":true,"blogspot.no":true,"blogspot.pe":true,"blogspot.pt":true,"blogspot.qa":true,"blogspot.re":true,"blogspot.ro":true,"blogspot.rs":true,"blogspot.ru":true,"blogspot.se":true,"blogspot.sg":true,"blogspot.si":true,"blogspot.sk":true,"blogspot.sn":true,"blogspot.td":true,"blogspot.tw":true,"blogspot.ug":true,"blogspot.vn":true,"cloudfunctions.net":true,"cloud.goog":true,"codespot.com":true,"googleapis.com":true,"googlecode.com":true,"pagespeedmobilizer.com":true,"publishproxy.com":true,"withgoogle.com":true,"withyoutube.com":true,"hashbang.sh":true,"hasura-app.io":true,"hepforge.org":true,"herokuapp.com":true,"herokussl.com":true,"moonscale.net":true,"iki.fi":true,"biz.at":true,"info.at":true,"info.cx":true,"ac.leg.br":true,"al.leg.br":true,"am.leg.br":true,"ap.leg.br":true,"ba.leg.br":true,"ce.leg.br":true,"df.leg.br":true,"es.leg.br":true,"go.leg.br":true,"ma.leg.br":true,"mg.leg.br":true,"ms.leg.br":true,"mt.leg.br":true,"pa.leg.br":true,"pb.leg.br":true,"pe.leg.br":true,"pi.leg.br":true,"pr.leg.br":true,"rj.leg.br":true,"rn.leg.br":true,"ro.leg.br":true,"rr.leg.br":true,"rs.leg.br":true,"sc.leg.br":true,"se.leg.br":true,"sp.leg.br":true,"to.leg.br":true,"pixolino.com":true,"ipifony.net":true,"*.triton.zone":true,"*.cns.joyent.com":true,"js.org":true,"keymachine.de":true,"knightpoint.systems":true,"co.krd":true,"edu.krd":true,"git-repos.de":true,"lcube-server.de":true,"svn-repos.de":true,"linkyard.cloud":true,"linkyard-cloud.ch":true,"we.bs":true,"barsy.bg":true,"barsyonline.com":true,"barsy.de":true,"barsy.eu":true,"barsy.in":true,"barsy.net":true,"barsy.online":true,"barsy.support":true,"*.magentosite.cloud":true,"hb.cldmail.ru":true,"cloud.metacentrum.cz":true,"custom.metacentrum.cz":true,"meteorapp.com":true,"eu.meteorapp.com":true,"co.pl":true,"azurewebsites.net":true,"azure-mobile.net":true,"cloudapp.net":true,"mozilla-iot.org":true,"bmoattachments.org":true,"net.ru":true,"org.ru":true,"pp.ru":true,"bitballoon.com":true,"netlify.com":true,"4u.com":true,"ngrok.io":true,"nh-serv.co.uk":true,"nfshost.com":true,"nsupdate.info":true,"nerdpol.ovh":true,"blogsyte.com":true,"brasilia.me":true,"cable-modem.org":true,"ciscofreak.com":true,"collegefan.org":true,"couchpotatofries.org":true,"damnserver.com":true,"ddns.me":true,"ditchyourip.com":true,"dnsfor.me":true,"dnsiskinky.com":true,"dvrcam.info":true,"dynns.com":true,"eating-organic.net":true,"fantasyleague.cc":true,"geekgalaxy.com":true,"golffan.us":true,"health-carereform.com":true,"homesecuritymac.com":true,"homesecuritypc.com":true,"hopto.me":true,"ilovecollege.info":true,"loginto.me":true,"mlbfan.org":true,"mmafan.biz":true,"myactivedirectory.com":true,"mydissent.net":true,"myeffect.net":true,"mymediapc.net":true,"mypsx.net":true,"mysecuritycamera.com":true,"mysecuritycamera.net":true,"mysecuritycamera.org":true,"net-freaks.com":true,"nflfan.org":true,"nhlfan.net":true,"no-ip.ca":true,"no-ip.co.uk":true,"no-ip.net":true,"noip.us":true,"onthewifi.com":true,"pgafan.net":true,"point2this.com":true,"pointto.us":true,"privatizehealthinsurance.net":true,"quicksytes.com":true,"read-books.org":true,"securitytactics.com":true,"serveexchange.com":true,"servehumour.com":true,"servep2p.com":true,"servesarcasm.com":true,"stufftoread.com":true,"ufcfan.org":true,"unusualperson.com":true,"workisboring.com":true,"3utilities.com":true,"bounceme.net":true,"ddns.net":true,"ddnsking.com":true,"gotdns.ch":true,"hopto.org":true,"myftp.biz":true,"myftp.org":true,"myvnc.com":true,"no-ip.biz":true,"no-ip.info":true,"no-ip.org":true,"noip.me":true,"redirectme.net":true,"servebeer.com":true,"serveblog.net":true,"servecounterstrike.com":true,"serveftp.com":true,"servegame.com":true,"servehalflife.com":true,"servehttp.com":true,"serveirc.com":true,"serveminecraft.net":true,"servemp3.com":true,"servepics.com":true,"servequake.com":true,"sytes.net":true,"webhop.me":true,"zapto.org":true,"stage.nodeart.io":true,"nodum.co":true,"nodum.io":true,"nyc.mn":true,"nom.ae":true,"nom.ai":true,"nom.al":true,"nym.by":true,"nym.bz":true,"nom.cl":true,"nom.gd":true,"nom.gl":true,"nym.gr":true,"nom.gt":true,"nom.hn":true,"nom.im":true,"nym.kz":true,"nym.la":true,"nom.li":true,"nym.li":true,"nym.lt":true,"nym.lu":true,"nym.me":true,"nom.mk":true,"nym.mx":true,"nom.nu":true,"nym.nz":true,"nym.pe":true,"nym.pt":true,"nom.pw":true,"nom.qa":true,"nom.rs":true,"nom.si":true,"nym.sk":true,"nym.su":true,"nym.sx":true,"nym.tw":true,"nom.ug":true,"nom.uy":true,"nom.vc":true,"nom.vg":true,"cya.gg":true,"nid.io":true,"opencraft.hosting":true,"operaunite.com":true,"outsystemscloud.com":true,"ownprovider.com":true,"oy.lc":true,"pgfog.com":true,"pagefrontapp.com":true,"art.pl":true,"gliwice.pl":true,"krakow.pl":true,"poznan.pl":true,"wroc.pl":true,"zakopane.pl":true,"pantheonsite.io":true,"gotpantheon.com":true,"mypep.link":true,"on-web.fr":true,"*.platform.sh":true,"*.platformsh.site":true,"xen.prgmr.com":true,"priv.at":true,"protonet.io":true,"chirurgiens-dentistes-en-france.fr":true,"byen.site":true,"qa2.com":true,"dev-myqnapcloud.com":true,"alpha-myqnapcloud.com":true,"myqnapcloud.com":true,"*.quipelements.com":true,"vapor.cloud":true,"vaporcloud.io":true,"rackmaze.com":true,"rackmaze.net":true,"rhcloud.com":true,"resindevice.io":true,"devices.resinstaging.io":true,"hzc.io":true,"wellbeingzone.eu":true,"ptplus.fit":true,"wellbeingzone.co.uk":true,"sandcats.io":true,"logoip.de":true,"logoip.com":true,"schokokeks.net":true,"scrysec.com":true,"firewall-gateway.com":true,"firewall-gateway.de":true,"my-gateway.de":true,"my-router.de":true,"spdns.de":true,"spdns.eu":true,"firewall-gateway.net":true,"my-firewall.org":true,"myfirewall.org":true,"spdns.org":true,"*.s5y.io":true,"*.sensiosite.cloud":true,"biz.ua":true,"co.ua":true,"pp.ua":true,"shiftedit.io":true,"myshopblocks.com":true,"1kapp.com":true,"appchizi.com":true,"applinzi.com":true,"sinaapp.com":true,"vipsinaapp.com":true,"bounty-full.com":true,"alpha.bounty-full.com":true,"beta.bounty-full.com":true,"static.land":true,"dev.static.land":true,"sites.static.land":true,"apps.lair.io":true,"*.stolos.io":true,"spacekit.io":true,"stackspace.space":true,"storj.farm":true,"temp-dns.com":true,"diskstation.me":true,"dscloud.biz":true,"dscloud.me":true,"dscloud.mobi":true,"dsmynas.com":true,"dsmynas.net":true,"dsmynas.org":true,"familyds.com":true,"familyds.net":true,"familyds.org":true,"i234.me":true,"myds.me":true,"synology.me":true,"vpnplus.to":true,"taifun-dns.de":true,"gda.pl":true,"gdansk.pl":true,"gdynia.pl":true,"med.pl":true,"sopot.pl":true,"cust.dev.thingdust.io":true,"cust.disrec.thingdust.io":true,"cust.prod.thingdust.io":true,"cust.testing.thingdust.io":true,"bloxcms.com":true,"townnews-staging.com":true,"12hp.at":true,"2ix.at":true,"4lima.at":true,"lima-city.at":true,"12hp.ch":true,"2ix.ch":true,"4lima.ch":true,"lima-city.ch":true,"trafficplex.cloud":true,"de.cool":true,"12hp.de":true,"2ix.de":true,"4lima.de":true,"lima-city.de":true,"1337.pictures":true,"clan.rip":true,"lima-city.rocks":true,"webspace.rocks":true,"lima.zone":true,"*.transurl.be":true,"*.transurl.eu":true,"*.transurl.nl":true,"tuxfamily.org":true,"dd-dns.de":true,"diskstation.eu":true,"diskstation.org":true,"dray-dns.de":true,"draydns.de":true,"dyn-vpn.de":true,"dynvpn.de":true,"mein-vigor.de":true,"my-vigor.de":true,"my-wan.de":true,"syno-ds.de":true,"synology-diskstation.de":true,"synology-ds.de":true,"uber.space":true,"hk.com":true,"hk.org":true,"ltd.hk":true,"inc.hk":true,"lib.de.us":true,"2038.io":true,"router.management":true,"v-info.info":true,"wedeploy.io":true,"wedeploy.me":true,"wedeploy.sh":true,"remotewd.com":true,"wmflabs.org":true,"cistron.nl":true,"demon.nl":true,"xs4all.space":true,"official.academy":true,"yolasite.com":true,"ybo.faith":true,"yombo.me":true,"homelink.one":true,"ybo.party":true,"ybo.review":true,"ybo.science":true,"ybo.trade":true,"za.net":true,"za.org":true,"now.sh":true});
+
+// END of automatically generated file
+
+
+/***/ }),
+/* 416 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*!
+ * Copyright (c) 2015, Salesforce.com, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of Salesforce.com nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*jshint unused:false */
+
+function Store() {
+}
+exports.Store = Store;
+
+// Stores may be synchronous, but are still required to use a
+// Continuation-Passing Style API.  The CookieJar itself will expose a "*Sync"
+// API that converts from synchronous-callbacks to imperative style.
+Store.prototype.synchronous = false;
+
+Store.prototype.findCookie = function(domain, path, key, cb) {
+  throw new Error('findCookie is not implemented');
+};
+
+Store.prototype.findCookies = function(domain, path, cb) {
+  throw new Error('findCookies is not implemented');
+};
+
+Store.prototype.putCookie = function(cookie, cb) {
+  throw new Error('putCookie is not implemented');
+};
+
+Store.prototype.updateCookie = function(oldCookie, newCookie, cb) {
+  // recommended default implementation:
+  // return this.putCookie(newCookie, cb);
+  throw new Error('updateCookie is not implemented');
+};
+
+Store.prototype.removeCookie = function(domain, path, key, cb) {
+  throw new Error('removeCookie is not implemented');
+};
+
+Store.prototype.removeCookies = function(domain, path, cb) {
+  throw new Error('removeCookies is not implemented');
+};
+
+Store.prototype.getAllCookies = function(cb) {
+  throw new Error('getAllCookies is not implemented (therefore jar cannot be serialized)');
+};
+
+
+/***/ }),
+/* 417 */
+/***/ (function(module, exports) {
+
+module.exports = function () {
+    // see https://code.google.com/p/v8/wiki/JavaScriptStackTraceApi
+    var origPrepareStackTrace = Error.prepareStackTrace;
+    Error.prepareStackTrace = function (_, stack) { return stack; };
+    var stack = (new Error()).stack;
+    Error.prepareStackTrace = origPrepareStackTrace;
+    return stack[2].getFileName();
+};
+
+
+/***/ }),
+/* 418 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var path = __webpack_require__(0);
+var fs = __webpack_require__(5);
+var parse = path.parse || __webpack_require__(774);
+
+module.exports = function nodeModulesPaths(start, opts) {
+    var modules = opts && opts.moduleDirectory
+        ? [].concat(opts.moduleDirectory)
+        : ['node_modules'];
+
+    // ensure that `start` is an absolute path at this point,
+    // resolving against the process' current working directory
+    var absoluteStart = path.resolve(start);
+
+    if (opts && opts.preserveSymlinks === false) {
+        try {
+            absoluteStart = fs.realpathSync(absoluteStart);
+        } catch (err) {
+            if (err.code !== 'ENOENT') {
+                throw err;
+            }
+        }
+    }
+
+    var prefix = '/';
+    if (/^([A-Za-z]:)/.test(absoluteStart)) {
+        prefix = '';
+    } else if (/^\\\\/.test(absoluteStart)) {
+        prefix = '\\\\';
+    }
+
+    var paths = [absoluteStart];
+    var parsed = parse(absoluteStart);
+    while (parsed.dir !== paths[paths.length - 1]) {
+        paths.push(parsed.dir);
+        parsed = parse(parsed.dir);
+    }
+
+    var dirs = paths.reduce(function (dirs, aPath) {
+        return dirs.concat(modules.map(function (moduleDir) {
+            return path.join(prefix, aPath, moduleDir);
+        }));
+    }, []);
+
+    return opts && opts.paths ? dirs.concat(opts.paths) : dirs;
+};
+
+
+/***/ }),
+/* 419 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return BehaviorSubject; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subject__ = __webpack_require__(36);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_ObjectUnsubscribedError__ = __webpack_require__(189);
+/** PURE_IMPORTS_START tslib,_Subject,_util_ObjectUnsubscribedError PURE_IMPORTS_END */
+
+
+
+var BehaviorSubject = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](BehaviorSubject, _super);
+    function BehaviorSubject(_value) {
+        var _this = _super.call(this) || this;
+        _this._value = _value;
+        return _this;
+    }
+    Object.defineProperty(BehaviorSubject.prototype, "value", {
+        get: function () {
+            return this.getValue();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    BehaviorSubject.prototype._subscribe = function (subscriber) {
+        var subscription = _super.prototype._subscribe.call(this, subscriber);
+        if (subscription && !subscription.closed) {
+            subscriber.next(this._value);
+        }
+        return subscription;
+    };
+    BehaviorSubject.prototype.getValue = function () {
+        if (this.hasError) {
+            throw this.thrownError;
+        }
+        else if (this.closed) {
+            throw new __WEBPACK_IMPORTED_MODULE_2__util_ObjectUnsubscribedError__["a" /* ObjectUnsubscribedError */]();
+        }
+        else {
+            return this._value;
+        }
+    };
+    BehaviorSubject.prototype.next = function (value) {
+        _super.prototype.next.call(this, this._value = value);
+    };
+    return BehaviorSubject;
+}(__WEBPACK_IMPORTED_MODULE_1__Subject__["a" /* Subject */]));
+
+//# sourceMappingURL=BehaviorSubject.js.map
+
+
+/***/ }),
+/* 420 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return empty; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__config__ = __webpack_require__(185);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_hostReportError__ = __webpack_require__(323);
+/** PURE_IMPORTS_START _config,_util_hostReportError PURE_IMPORTS_END */
+
+
+var empty = {
+    closed: true,
+    next: function (value) { },
+    error: function (err) {
+        if (__WEBPACK_IMPORTED_MODULE_0__config__["a" /* config */].useDeprecatedSynchronousErrorHandling) {
+            throw err;
+        }
+        else {
+            __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__util_hostReportError__["a" /* hostReportError */])(err);
+        }
+    },
+    complete: function () { }
+};
+//# sourceMappingURL=Observer.js.map
+
+
+/***/ }),
+/* 421 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Scheduler; });
+var Scheduler = /*@__PURE__*/ (function () {
+    function Scheduler(SchedulerAction, now) {
+        if (now === void 0) {
+            now = Scheduler.now;
+        }
+        this.SchedulerAction = SchedulerAction;
+        this.now = now;
+    }
+    Scheduler.prototype.schedule = function (work, delay, state) {
+        if (delay === void 0) {
+            delay = 0;
+        }
+        return new this.SchedulerAction(this, work).schedule(state, delay);
+    };
+    Scheduler.now = function () { return Date.now(); };
+    return Scheduler;
+}());
+
+//# sourceMappingURL=Scheduler.js.map
+
+
+/***/ }),
+/* 422 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return SubjectSubscription; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscription__ = __webpack_require__(25);
+/** PURE_IMPORTS_START tslib,_Subscription PURE_IMPORTS_END */
+
+
+var SubjectSubscription = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](SubjectSubscription, _super);
+    function SubjectSubscription(subject, subscriber) {
+        var _this = _super.call(this) || this;
+        _this.subject = subject;
+        _this.subscriber = subscriber;
+        _this.closed = false;
+        return _this;
+    }
+    SubjectSubscription.prototype.unsubscribe = function () {
+        if (this.closed) {
+            return;
+        }
+        this.closed = true;
+        var subject = this.subject;
+        var observers = subject.observers;
+        this.subject = null;
+        if (!observers || observers.length === 0 || subject.isStopped || subject.closed) {
+            return;
+        }
+        var subscriberIndex = observers.indexOf(this.subscriber);
+        if (subscriberIndex !== -1) {
+            observers.splice(subscriberIndex, 1);
+        }
+    };
+    return SubjectSubscription;
+}(__WEBPACK_IMPORTED_MODULE_1__Subscription__["a" /* Subscription */]));
+
+//# sourceMappingURL=SubjectSubscription.js.map
+
+
+/***/ }),
+/* 423 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ConnectableObservable; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return connectableObservableDescriptor; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subject__ = __webpack_require__(36);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Observable__ = __webpack_require__(12);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__Subscriber__ = __webpack_require__(7);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__Subscription__ = __webpack_require__(25);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__operators_refCount__ = __webpack_require__(316);
+/** PURE_IMPORTS_START tslib,_Subject,_Observable,_Subscriber,_Subscription,_operators_refCount PURE_IMPORTS_END */
+
+
+
+
+
+
+var ConnectableObservable = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](ConnectableObservable, _super);
+    function ConnectableObservable(source, subjectFactory) {
+        var _this = _super.call(this) || this;
+        _this.source = source;
+        _this.subjectFactory = subjectFactory;
+        _this._refCount = 0;
+        _this._isComplete = false;
+        return _this;
+    }
+    ConnectableObservable.prototype._subscribe = function (subscriber) {
+        return this.getSubject().subscribe(subscriber);
+    };
+    ConnectableObservable.prototype.getSubject = function () {
+        var subject = this._subject;
+        if (!subject || subject.isStopped) {
+            this._subject = this.subjectFactory();
+        }
+        return this._subject;
+    };
+    ConnectableObservable.prototype.connect = function () {
+        var connection = this._connection;
+        if (!connection) {
+            this._isComplete = false;
+            connection = this._connection = new __WEBPACK_IMPORTED_MODULE_4__Subscription__["a" /* Subscription */]();
+            connection.add(this.source
+                .subscribe(new ConnectableSubscriber(this.getSubject(), this)));
+            if (connection.closed) {
+                this._connection = null;
+                connection = __WEBPACK_IMPORTED_MODULE_4__Subscription__["a" /* Subscription */].EMPTY;
+            }
+            else {
+                this._connection = connection;
+            }
+        }
+        return connection;
+    };
+    ConnectableObservable.prototype.refCount = function () {
+        return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_5__operators_refCount__["a" /* refCount */])()(this);
+    };
+    return ConnectableObservable;
+}(__WEBPACK_IMPORTED_MODULE_2__Observable__["a" /* Observable */]));
+
+var connectableProto = ConnectableObservable.prototype;
+var connectableObservableDescriptor = {
+    operator: { value: null },
+    _refCount: { value: 0, writable: true },
+    _subject: { value: null, writable: true },
+    _connection: { value: null, writable: true },
+    _subscribe: { value: connectableProto._subscribe },
+    _isComplete: { value: connectableProto._isComplete, writable: true },
+    getSubject: { value: connectableProto.getSubject },
+    connect: { value: connectableProto.connect },
+    refCount: { value: connectableProto.refCount }
+};
+var ConnectableSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](ConnectableSubscriber, _super);
+    function ConnectableSubscriber(destination, connectable) {
+        var _this = _super.call(this, destination) || this;
+        _this.connectable = connectable;
+        return _this;
+    }
+    ConnectableSubscriber.prototype._error = function (err) {
+        this._unsubscribe();
+        _super.prototype._error.call(this, err);
+    };
+    ConnectableSubscriber.prototype._complete = function () {
+        this.connectable._isComplete = true;
+        this._unsubscribe();
+        _super.prototype._complete.call(this);
+    };
+    ConnectableSubscriber.prototype._unsubscribe = function () {
+        var connectable = this.connectable;
+        if (connectable) {
+            this.connectable = null;
+            var connection = connectable._connection;
+            connectable._refCount = 0;
+            connectable._subject = null;
+            connectable._connection = null;
+            if (connection) {
+                connection.unsubscribe();
+            }
+        }
+    };
+    return ConnectableSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__Subject__["b" /* SubjectSubscriber */]));
+var RefCountOperator = /*@__PURE__*/ (function () {
+    function RefCountOperator(connectable) {
+        this.connectable = connectable;
+    }
+    RefCountOperator.prototype.call = function (subscriber, source) {
+        var connectable = this.connectable;
+        connectable._refCount++;
+        var refCounter = new RefCountSubscriber(subscriber, connectable);
+        var subscription = source.subscribe(refCounter);
+        if (!refCounter.closed) {
+            refCounter.connection = connectable.connect();
+        }
+        return subscription;
+    };
+    return RefCountOperator;
+}());
+var RefCountSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](RefCountSubscriber, _super);
+    function RefCountSubscriber(destination, connectable) {
+        var _this = _super.call(this, destination) || this;
+        _this.connectable = connectable;
+        return _this;
+    }
+    RefCountSubscriber.prototype._unsubscribe = function () {
+        var connectable = this.connectable;
+        if (!connectable) {
+            this.connection = null;
+            return;
+        }
+        this.connectable = null;
+        var refCount = connectable._refCount;
+        if (refCount <= 0) {
+            this.connection = null;
+            return;
+        }
+        connectable._refCount = refCount - 1;
+        if (refCount > 1) {
+            this.connection = null;
+            return;
+        }
+        var connection = this.connection;
+        var sharedConnection = connectable._connection;
+        this.connection = null;
+        if (sharedConnection && (!connection || sharedConnection === connection)) {
+            sharedConnection.unsubscribe();
+        }
+    };
+    return RefCountSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_3__Subscriber__["a" /* Subscriber */]));
+//# sourceMappingURL=ConnectableObservable.js.map
+
+
+/***/ }),
+/* 424 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = merge;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(12);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_isScheduler__ = __webpack_require__(48);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__operators_mergeAll__ = __webpack_require__(315);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__fromArray__ = __webpack_require__(85);
+/** PURE_IMPORTS_START _Observable,_util_isScheduler,_operators_mergeAll,_fromArray PURE_IMPORTS_END */
+
+
+
+
+function merge() {
+    var observables = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        observables[_i] = arguments[_i];
+    }
+    var concurrent = Number.POSITIVE_INFINITY;
+    var scheduler = null;
+    var last = observables[observables.length - 1];
+    if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__util_isScheduler__["a" /* isScheduler */])(last)) {
+        scheduler = observables.pop();
+        if (observables.length > 1 && typeof observables[observables.length - 1] === 'number') {
+            concurrent = observables.pop();
+        }
+    }
+    else if (typeof last === 'number') {
+        concurrent = observables.pop();
+    }
+    if (scheduler === null && observables.length === 1 && observables[0] instanceof __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */]) {
+        return observables[0];
+    }
+    return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__operators_mergeAll__["a" /* mergeAll */])(concurrent)(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__fromArray__["a" /* fromArray */])(observables, scheduler));
+}
+//# sourceMappingURL=merge.js.map
+
+
+/***/ }),
+/* 425 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return NEVER; });
+/* harmony export (immutable) */ __webpack_exports__["a"] = never;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(12);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_noop__ = __webpack_require__(191);
+/** PURE_IMPORTS_START _Observable,_util_noop PURE_IMPORTS_END */
+
+
+var NEVER = /*@__PURE__*/ new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](__WEBPACK_IMPORTED_MODULE_1__util_noop__["a" /* noop */]);
+function never() {
+    return NEVER;
+}
+//# sourceMappingURL=never.js.map
+
+
+/***/ }),
+/* 426 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = race;
+/* unused harmony export RaceOperator */
+/* unused harmony export RaceSubscriber */
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_isArray__ = __webpack_require__(41);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__fromArray__ = __webpack_require__(85);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__ = __webpack_require__(13);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__ = __webpack_require__(14);
+/** PURE_IMPORTS_START tslib,_util_isArray,_fromArray,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+
+
+
+
+
+function race() {
+    var observables = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        observables[_i] = arguments[_i];
+    }
+    if (observables.length === 1) {
+        if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__util_isArray__["a" /* isArray */])(observables[0])) {
+            observables = observables[0];
+        }
+        else {
+            return observables[0];
+        }
+    }
+    return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__fromArray__["a" /* fromArray */])(observables, undefined).lift(new RaceOperator());
+}
+var RaceOperator = /*@__PURE__*/ (function () {
+    function RaceOperator() {
+    }
+    RaceOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new RaceSubscriber(subscriber));
+    };
+    return RaceOperator;
+}());
+
+var RaceSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](RaceSubscriber, _super);
+    function RaceSubscriber(destination) {
+        var _this = _super.call(this, destination) || this;
+        _this.hasFirst = false;
+        _this.observables = [];
+        _this.subscriptions = [];
+        return _this;
+    }
+    RaceSubscriber.prototype._next = function (observable) {
+        this.observables.push(observable);
+    };
+    RaceSubscriber.prototype._complete = function () {
+        var observables = this.observables;
+        var len = observables.length;
+        if (len === 0) {
+            this.destination.complete();
+        }
+        else {
+            for (var i = 0; i < len && !this.hasFirst; i++) {
+                var observable = observables[i];
+                var subscription = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__["a" /* subscribeToResult */])(this, observable, observable, i);
+                if (this.subscriptions) {
+                    this.subscriptions.push(subscription);
+                }
+                this.add(subscription);
+            }
+            this.observables = null;
+        }
+    };
+    RaceSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        if (!this.hasFirst) {
+            this.hasFirst = true;
+            for (var i = 0; i < this.subscriptions.length; i++) {
+                if (i !== outerIndex) {
+                    var subscription = this.subscriptions[i];
+                    subscription.unsubscribe();
+                    this.remove(subscription);
+                }
+            }
+            this.subscriptions = null;
+        }
+        this.destination.next(innerValue);
+    };
+    return RaceSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__["a" /* OuterSubscriber */]));
+
+//# sourceMappingURL=race.js.map
+
+
+/***/ }),
+/* 427 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = timer;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(12);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__scheduler_async__ = __webpack_require__(40);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isNumeric__ = __webpack_require__(190);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_isScheduler__ = __webpack_require__(48);
+/** PURE_IMPORTS_START _Observable,_scheduler_async,_util_isNumeric,_util_isScheduler PURE_IMPORTS_END */
+
+
+
+
+function timer(dueTime, periodOrScheduler, scheduler) {
+    if (dueTime === void 0) {
+        dueTime = 0;
+    }
+    var period = -1;
+    if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_isNumeric__["a" /* isNumeric */])(periodOrScheduler)) {
+        period = Number(periodOrScheduler) < 1 && 1 || Number(periodOrScheduler);
+    }
+    else if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__util_isScheduler__["a" /* isScheduler */])(periodOrScheduler)) {
+        scheduler = periodOrScheduler;
+    }
+    if (!__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__util_isScheduler__["a" /* isScheduler */])(scheduler)) {
+        scheduler = __WEBPACK_IMPORTED_MODULE_1__scheduler_async__["a" /* async */];
+    }
+    return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) {
+        var due = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_isNumeric__["a" /* isNumeric */])(dueTime)
+            ? dueTime
+            : (+dueTime - scheduler.now());
+        return scheduler.schedule(dispatch, due, {
+            index: 0, period: period, subscriber: subscriber
+        });
+    });
+}
+function dispatch(state) {
+    var index = state.index, period = state.period, subscriber = state.subscriber;
+    subscriber.next(index);
+    if (subscriber.closed) {
+        return;
+    }
+    else if (period === -1) {
+        return subscriber.complete();
+    }
+    state.index = index + 1;
+    this.schedule(state, period);
+}
+//# sourceMappingURL=timer.js.map
+
+
+/***/ }),
+/* 428 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = audit;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_tryCatch__ = __webpack_require__(56);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_errorObject__ = __webpack_require__(47);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__ = __webpack_require__(13);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__ = __webpack_require__(14);
+/** PURE_IMPORTS_START tslib,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+
+
+
+
+
+function audit(durationSelector) {
+    return function auditOperatorFunction(source) {
+        return source.lift(new AuditOperator(durationSelector));
+    };
+}
+var AuditOperator = /*@__PURE__*/ (function () {
+    function AuditOperator(durationSelector) {
+        this.durationSelector = durationSelector;
+    }
+    AuditOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new AuditSubscriber(subscriber, this.durationSelector));
+    };
+    return AuditOperator;
+}());
+var AuditSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](AuditSubscriber, _super);
+    function AuditSubscriber(destination, durationSelector) {
+        var _this = _super.call(this, destination) || this;
+        _this.durationSelector = durationSelector;
+        _this.hasValue = false;
+        return _this;
+    }
+    AuditSubscriber.prototype._next = function (value) {
+        this.value = value;
+        this.hasValue = true;
+        if (!this.throttled) {
+            var duration = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__util_tryCatch__["a" /* tryCatch */])(this.durationSelector)(value);
+            if (duration === __WEBPACK_IMPORTED_MODULE_2__util_errorObject__["a" /* errorObject */]) {
+                this.destination.error(__WEBPACK_IMPORTED_MODULE_2__util_errorObject__["a" /* errorObject */].e);
+            }
+            else {
+                var innerSubscription = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__["a" /* subscribeToResult */])(this, duration);
+                if (!innerSubscription || innerSubscription.closed) {
+                    this.clearThrottle();
+                }
+                else {
+                    this.add(this.throttled = innerSubscription);
+                }
+            }
+        }
+    };
+    AuditSubscriber.prototype.clearThrottle = function () {
+        var _a = this, value = _a.value, hasValue = _a.hasValue, throttled = _a.throttled;
+        if (throttled) {
+            this.remove(throttled);
+            this.throttled = null;
+            throttled.unsubscribe();
+        }
+        if (hasValue) {
+            this.value = null;
+            this.hasValue = false;
+            this.destination.next(value);
+        }
+    };
+    AuditSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex) {
+        this.clearThrottle();
+    };
+    AuditSubscriber.prototype.notifyComplete = function () {
+        this.clearThrottle();
+    };
+    return AuditSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__["a" /* OuterSubscriber */]));
+//# sourceMappingURL=audit.js.map
+
+
+/***/ }),
+/* 429 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = concatAll;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__mergeAll__ = __webpack_require__(315);
+/** PURE_IMPORTS_START _mergeAll PURE_IMPORTS_END */
+
+function concatAll() {
+    return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__mergeAll__["a" /* mergeAll */])(1);
+}
+//# sourceMappingURL=concatAll.js.map
+
+
+/***/ }),
+/* 430 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = concatMap;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__mergeMap__ = __webpack_require__(148);
+/** PURE_IMPORTS_START _mergeMap PURE_IMPORTS_END */
+
+function concatMap(project, resultSelector) {
+    return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__mergeMap__["a" /* mergeMap */])(project, resultSelector, 1);
+}
+//# sourceMappingURL=concatMap.js.map
+
+
+/***/ }),
+/* 431 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = distinctUntilChanged;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(56);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(47);
+/** PURE_IMPORTS_START tslib,_Subscriber,_util_tryCatch,_util_errorObject PURE_IMPORTS_END */
+
+
+
+
+function distinctUntilChanged(compare, keySelector) {
+    return function (source) { return source.lift(new DistinctUntilChangedOperator(compare, keySelector)); };
+}
+var DistinctUntilChangedOperator = /*@__PURE__*/ (function () {
+    function DistinctUntilChangedOperator(compare, keySelector) {
+        this.compare = compare;
+        this.keySelector = keySelector;
+    }
+    DistinctUntilChangedOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new DistinctUntilChangedSubscriber(subscriber, this.compare, this.keySelector));
+    };
+    return DistinctUntilChangedOperator;
+}());
+var DistinctUntilChangedSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](DistinctUntilChangedSubscriber, _super);
+    function DistinctUntilChangedSubscriber(destination, compare, keySelector) {
+        var _this = _super.call(this, destination) || this;
+        _this.keySelector = keySelector;
+        _this.hasKey = false;
+        if (typeof compare === 'function') {
+            _this.compare = compare;
+        }
+        return _this;
+    }
+    DistinctUntilChangedSubscriber.prototype.compare = function (x, y) {
+        return x === y;
+    };
+    DistinctUntilChangedSubscriber.prototype._next = function (value) {
+        var keySelector = this.keySelector;
+        var key = value;
+        if (keySelector) {
+            key = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_tryCatch__["a" /* tryCatch */])(this.keySelector)(value);
+            if (key === __WEBPACK_IMPORTED_MODULE_3__util_errorObject__["a" /* errorObject */]) {
+                return this.destination.error(__WEBPACK_IMPORTED_MODULE_3__util_errorObject__["a" /* errorObject */].e);
+            }
+        }
+        var result = false;
+        if (this.hasKey) {
+            result = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_tryCatch__["a" /* tryCatch */])(this.compare)(this.key, key);
+            if (result === __WEBPACK_IMPORTED_MODULE_3__util_errorObject__["a" /* errorObject */]) {
+                return this.destination.error(__WEBPACK_IMPORTED_MODULE_3__util_errorObject__["a" /* errorObject */].e);
+            }
+        }
+        else {
+            this.hasKey = true;
+        }
+        if (Boolean(result) === false) {
+            this.key = key;
+            this.destination.next(value);
+        }
+    };
+    return DistinctUntilChangedSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
+//# sourceMappingURL=distinctUntilChanged.js.map
+
+
+/***/ }),
+/* 432 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = find;
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return FindValueOperator; });
+/* unused harmony export FindValueSubscriber */
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
+/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+
+
+function find(predicate, thisArg) {
+    if (typeof predicate !== 'function') {
+        throw new TypeError('predicate is not a function');
+    }
+    return function (source) { return source.lift(new FindValueOperator(predicate, source, false, thisArg)); };
+}
+var FindValueOperator = /*@__PURE__*/ (function () {
+    function FindValueOperator(predicate, source, yieldIndex, thisArg) {
+        this.predicate = predicate;
+        this.source = source;
+        this.yieldIndex = yieldIndex;
+        this.thisArg = thisArg;
+    }
+    FindValueOperator.prototype.call = function (observer, source) {
+        return source.subscribe(new FindValueSubscriber(observer, this.predicate, this.source, this.yieldIndex, this.thisArg));
+    };
+    return FindValueOperator;
+}());
+
+var FindValueSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](FindValueSubscriber, _super);
+    function FindValueSubscriber(destination, predicate, source, yieldIndex, thisArg) {
+        var _this = _super.call(this, destination) || this;
+        _this.predicate = predicate;
+        _this.source = source;
+        _this.yieldIndex = yieldIndex;
+        _this.thisArg = thisArg;
+        _this.index = 0;
+        return _this;
+    }
+    FindValueSubscriber.prototype.notifyComplete = function (value) {
+        var destination = this.destination;
+        destination.next(value);
+        destination.complete();
+        this.unsubscribe();
+    };
+    FindValueSubscriber.prototype._next = function (value) {
+        var _a = this, predicate = _a.predicate, thisArg = _a.thisArg;
+        var index = this.index++;
+        try {
+            var result = predicate.call(thisArg || this, value, index, this.source);
+            if (result) {
+                this.notifyComplete(this.yieldIndex ? index : value);
+            }
+        }
+        catch (err) {
+            this.destination.error(err);
+        }
+    };
+    FindValueSubscriber.prototype._complete = function () {
+        this.notifyComplete(this.yieldIndex ? -1 : undefined);
+    };
+    return FindValueSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
+
+//# sourceMappingURL=find.js.map
+
+
+/***/ }),
+/* 433 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["b"] = groupBy;
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return GroupedObservable; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Subscription__ = __webpack_require__(25);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__Observable__ = __webpack_require__(12);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__Subject__ = __webpack_require__(36);
+/** PURE_IMPORTS_START tslib,_Subscriber,_Subscription,_Observable,_Subject PURE_IMPORTS_END */
+
+
+
+
+
+function groupBy(keySelector, elementSelector, durationSelector, subjectSelector) {
+    return function (source) {
+        return source.lift(new GroupByOperator(keySelector, elementSelector, durationSelector, subjectSelector));
+    };
+}
+var GroupByOperator = /*@__PURE__*/ (function () {
+    function GroupByOperator(keySelector, elementSelector, durationSelector, subjectSelector) {
+        this.keySelector = keySelector;
+        this.elementSelector = elementSelector;
+        this.durationSelector = durationSelector;
+        this.subjectSelector = subjectSelector;
+    }
+    GroupByOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new GroupBySubscriber(subscriber, this.keySelector, this.elementSelector, this.durationSelector, this.subjectSelector));
+    };
+    return GroupByOperator;
+}());
+var GroupBySubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](GroupBySubscriber, _super);
+    function GroupBySubscriber(destination, keySelector, elementSelector, durationSelector, subjectSelector) {
+        var _this = _super.call(this, destination) || this;
+        _this.keySelector = keySelector;
+        _this.elementSelector = elementSelector;
+        _this.durationSelector = durationSelector;
+        _this.subjectSelector = subjectSelector;
+        _this.groups = null;
+        _this.attemptedToUnsubscribe = false;
+        _this.count = 0;
+        return _this;
+    }
+    GroupBySubscriber.prototype._next = function (value) {
+        var key;
+        try {
+            key = this.keySelector(value);
+        }
+        catch (err) {
+            this.error(err);
+            return;
+        }
+        this._group(value, key);
+    };
+    GroupBySubscriber.prototype._group = function (value, key) {
+        var groups = this.groups;
+        if (!groups) {
+            groups = this.groups = new Map();
+        }
+        var group = groups.get(key);
+        var element;
+        if (this.elementSelector) {
+            try {
+                element = this.elementSelector(value);
+            }
+            catch (err) {
+                this.error(err);
+            }
+        }
+        else {
+            element = value;
+        }
+        if (!group) {
+            group = (this.subjectSelector ? this.subjectSelector() : new __WEBPACK_IMPORTED_MODULE_4__Subject__["a" /* Subject */]());
+            groups.set(key, group);
+            var groupedObservable = new GroupedObservable(key, group, this);
+            this.destination.next(groupedObservable);
+            if (this.durationSelector) {
+                var duration = void 0;
+                try {
+                    duration = this.durationSelector(new GroupedObservable(key, group));
+                }
+                catch (err) {
+                    this.error(err);
+                    return;
+                }
+                this.add(duration.subscribe(new GroupDurationSubscriber(key, group, this)));
+            }
+        }
+        if (!group.closed) {
+            group.next(element);
+        }
+    };
+    GroupBySubscriber.prototype._error = function (err) {
+        var groups = this.groups;
+        if (groups) {
+            groups.forEach(function (group, key) {
+                group.error(err);
+            });
+            groups.clear();
+        }
+        this.destination.error(err);
+    };
+    GroupBySubscriber.prototype._complete = function () {
+        var groups = this.groups;
+        if (groups) {
+            groups.forEach(function (group, key) {
+                group.complete();
+            });
+            groups.clear();
+        }
+        this.destination.complete();
+    };
+    GroupBySubscriber.prototype.removeGroup = function (key) {
+        this.groups.delete(key);
+    };
+    GroupBySubscriber.prototype.unsubscribe = function () {
+        if (!this.closed) {
+            this.attemptedToUnsubscribe = true;
+            if (this.count === 0) {
+                _super.prototype.unsubscribe.call(this);
+            }
+        }
+    };
+    return GroupBySubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
+var GroupDurationSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](GroupDurationSubscriber, _super);
+    function GroupDurationSubscriber(key, group, parent) {
+        var _this = _super.call(this, group) || this;
+        _this.key = key;
+        _this.group = group;
+        _this.parent = parent;
+        return _this;
+    }
+    GroupDurationSubscriber.prototype._next = function (value) {
+        this.complete();
+    };
+    GroupDurationSubscriber.prototype._unsubscribe = function () {
+        var _a = this, parent = _a.parent, key = _a.key;
+        this.key = this.parent = null;
+        if (parent) {
+            parent.removeGroup(key);
+        }
+    };
+    return GroupDurationSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
+var GroupedObservable = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](GroupedObservable, _super);
+    function GroupedObservable(key, groupSubject, refCountSubscription) {
+        var _this = _super.call(this) || this;
+        _this.key = key;
+        _this.groupSubject = groupSubject;
+        _this.refCountSubscription = refCountSubscription;
+        return _this;
+    }
+    GroupedObservable.prototype._subscribe = function (subscriber) {
+        var subscription = new __WEBPACK_IMPORTED_MODULE_2__Subscription__["a" /* Subscription */]();
+        var _a = this, refCountSubscription = _a.refCountSubscription, groupSubject = _a.groupSubject;
+        if (refCountSubscription && !refCountSubscription.closed) {
+            subscription.add(new InnerRefCountSubscription(refCountSubscription));
+        }
+        subscription.add(groupSubject.subscribe(subscriber));
+        return subscription;
+    };
+    return GroupedObservable;
+}(__WEBPACK_IMPORTED_MODULE_3__Observable__["a" /* Observable */]));
+
+var InnerRefCountSubscription = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](InnerRefCountSubscription, _super);
+    function InnerRefCountSubscription(parent) {
+        var _this = _super.call(this) || this;
+        _this.parent = parent;
+        parent.count++;
+        return _this;
+    }
+    InnerRefCountSubscription.prototype.unsubscribe = function () {
+        var parent = this.parent;
+        if (!parent.closed && !this.closed) {
+            _super.prototype.unsubscribe.call(this);
+            parent.count -= 1;
+            if (parent.count === 0 && parent.attemptedToUnsubscribe) {
+                parent.unsubscribe();
+            }
+        }
+    };
+    return InnerRefCountSubscription;
+}(__WEBPACK_IMPORTED_MODULE_2__Subscription__["a" /* Subscription */]));
+//# sourceMappingURL=groupBy.js.map
+
+
+/***/ }),
+/* 434 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["b"] = observeOn;
+/* unused harmony export ObserveOnOperator */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ObserveOnSubscriber; });
+/* unused harmony export ObserveOnMessage */
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Notification__ = __webpack_require__(184);
+/** PURE_IMPORTS_START tslib,_Subscriber,_Notification PURE_IMPORTS_END */
+
+
+
+function observeOn(scheduler, delay) {
+    if (delay === void 0) {
+        delay = 0;
+    }
+    return function observeOnOperatorFunction(source) {
+        return source.lift(new ObserveOnOperator(scheduler, delay));
+    };
+}
+var ObserveOnOperator = /*@__PURE__*/ (function () {
+    function ObserveOnOperator(scheduler, delay) {
+        if (delay === void 0) {
+            delay = 0;
+        }
+        this.scheduler = scheduler;
+        this.delay = delay;
+    }
+    ObserveOnOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new ObserveOnSubscriber(subscriber, this.scheduler, this.delay));
+    };
+    return ObserveOnOperator;
+}());
+
+var ObserveOnSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](ObserveOnSubscriber, _super);
+    function ObserveOnSubscriber(destination, scheduler, delay) {
+        if (delay === void 0) {
+            delay = 0;
+        }
+        var _this = _super.call(this, destination) || this;
+        _this.scheduler = scheduler;
+        _this.delay = delay;
+        return _this;
+    }
+    ObserveOnSubscriber.dispatch = function (arg) {
+        var notification = arg.notification, destination = arg.destination;
+        notification.observe(destination);
+        this.unsubscribe();
+    };
+    ObserveOnSubscriber.prototype.scheduleMessage = function (notification) {
+        var destination = this.destination;
+        destination.add(this.scheduler.schedule(ObserveOnSubscriber.dispatch, this.delay, new ObserveOnMessage(notification, this.destination)));
+    };
+    ObserveOnSubscriber.prototype._next = function (value) {
+        this.scheduleMessage(__WEBPACK_IMPORTED_MODULE_2__Notification__["a" /* Notification */].createNext(value));
+    };
+    ObserveOnSubscriber.prototype._error = function (err) {
+        this.scheduleMessage(__WEBPACK_IMPORTED_MODULE_2__Notification__["a" /* Notification */].createError(err));
+        this.unsubscribe();
+    };
+    ObserveOnSubscriber.prototype._complete = function () {
+        this.scheduleMessage(__WEBPACK_IMPORTED_MODULE_2__Notification__["a" /* Notification */].createComplete());
+        this.unsubscribe();
+    };
+    return ObserveOnSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
+
+var ObserveOnMessage = /*@__PURE__*/ (function () {
+    function ObserveOnMessage(notification, destination) {
+        this.notification = notification;
+        this.destination = destination;
+    }
+    return ObserveOnMessage;
+}());
+
+//# sourceMappingURL=observeOn.js.map
+
+
+/***/ }),
+/* 435 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = tap;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_noop__ = __webpack_require__(191);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_isFunction__ = __webpack_require__(154);
+/** PURE_IMPORTS_START tslib,_Subscriber,_util_noop,_util_isFunction PURE_IMPORTS_END */
+
+
+
+
+function tap(nextOrObserver, error, complete) {
+    return function tapOperatorFunction(source) {
+        return source.lift(new DoOperator(nextOrObserver, error, complete));
+    };
+}
+var DoOperator = /*@__PURE__*/ (function () {
+    function DoOperator(nextOrObserver, error, complete) {
+        this.nextOrObserver = nextOrObserver;
+        this.error = error;
+        this.complete = complete;
+    }
+    DoOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new TapSubscriber(subscriber, this.nextOrObserver, this.error, this.complete));
+    };
+    return DoOperator;
+}());
+var TapSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](TapSubscriber, _super);
+    function TapSubscriber(destination, observerOrNext, error, complete) {
+        var _this = _super.call(this, destination) || this;
+        _this._tapNext = __WEBPACK_IMPORTED_MODULE_2__util_noop__["a" /* noop */];
+        _this._tapError = __WEBPACK_IMPORTED_MODULE_2__util_noop__["a" /* noop */];
+        _this._tapComplete = __WEBPACK_IMPORTED_MODULE_2__util_noop__["a" /* noop */];
+        _this._tapError = error || __WEBPACK_IMPORTED_MODULE_2__util_noop__["a" /* noop */];
+        _this._tapComplete = complete || __WEBPACK_IMPORTED_MODULE_2__util_noop__["a" /* noop */];
+        if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__util_isFunction__["a" /* isFunction */])(observerOrNext)) {
+            _this._context = _this;
+            _this._tapNext = observerOrNext;
+        }
+        else if (observerOrNext) {
+            _this._context = observerOrNext;
+            _this._tapNext = observerOrNext.next || __WEBPACK_IMPORTED_MODULE_2__util_noop__["a" /* noop */];
+            _this._tapError = observerOrNext.error || __WEBPACK_IMPORTED_MODULE_2__util_noop__["a" /* noop */];
+            _this._tapComplete = observerOrNext.complete || __WEBPACK_IMPORTED_MODULE_2__util_noop__["a" /* noop */];
+        }
+        return _this;
+    }
+    TapSubscriber.prototype._next = function (value) {
+        try {
+            this._tapNext.call(this._context, value);
+        }
+        catch (err) {
+            this.destination.error(err);
+            return;
+        }
+        this.destination.next(value);
+    };
+    TapSubscriber.prototype._error = function (err) {
+        try {
+            this._tapError.call(this._context, err);
+        }
+        catch (err) {
+            this.destination.error(err);
+            return;
+        }
+        this.destination.error(err);
+    };
+    TapSubscriber.prototype._complete = function () {
+        try {
+            this._tapComplete.call(this._context);
+        }
+        catch (err) {
+            this.destination.error(err);
+            return;
+        }
+        return this.destination.complete();
+    };
+    return TapSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
+//# sourceMappingURL=tap.js.map
+
+
+/***/ }),
+/* 436 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return defaultThrottleConfig; });
+/* harmony export (immutable) */ __webpack_exports__["a"] = throttle;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(13);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__ = __webpack_require__(14);
+/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+
+
+
+var defaultThrottleConfig = {
+    leading: true,
+    trailing: false
+};
+function throttle(durationSelector, config) {
+    if (config === void 0) {
+        config = defaultThrottleConfig;
+    }
+    return function (source) { return source.lift(new ThrottleOperator(durationSelector, config.leading, config.trailing)); };
+}
+var ThrottleOperator = /*@__PURE__*/ (function () {
+    function ThrottleOperator(durationSelector, leading, trailing) {
+        this.durationSelector = durationSelector;
+        this.leading = leading;
+        this.trailing = trailing;
+    }
+    ThrottleOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new ThrottleSubscriber(subscriber, this.durationSelector, this.leading, this.trailing));
+    };
+    return ThrottleOperator;
+}());
+var ThrottleSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](ThrottleSubscriber, _super);
+    function ThrottleSubscriber(destination, durationSelector, _leading, _trailing) {
+        var _this = _super.call(this, destination) || this;
+        _this.destination = destination;
+        _this.durationSelector = durationSelector;
+        _this._leading = _leading;
+        _this._trailing = _trailing;
+        _this._hasValue = false;
+        return _this;
+    }
+    ThrottleSubscriber.prototype._next = function (value) {
+        this._hasValue = true;
+        this._sendValue = value;
+        if (!this._throttled) {
+            if (this._leading) {
+                this.send();
+            }
+            else {
+                this.throttle(value);
+            }
+        }
+    };
+    ThrottleSubscriber.prototype.send = function () {
+        var _a = this, _hasValue = _a._hasValue, _sendValue = _a._sendValue;
+        if (_hasValue) {
+            this.destination.next(_sendValue);
+            this.throttle(_sendValue);
+        }
+        this._hasValue = false;
+        this._sendValue = null;
+    };
+    ThrottleSubscriber.prototype.throttle = function (value) {
+        var duration = this.tryDurationSelector(value);
+        if (duration) {
+            this.add(this._throttled = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__["a" /* subscribeToResult */])(this, duration));
+        }
+    };
+    ThrottleSubscriber.prototype.tryDurationSelector = function (value) {
+        try {
+            return this.durationSelector(value);
+        }
+        catch (err) {
+            this.destination.error(err);
+            return null;
+        }
+    };
+    ThrottleSubscriber.prototype.throttlingDone = function () {
+        var _a = this, _throttled = _a._throttled, _trailing = _a._trailing;
+        if (_throttled) {
+            _throttled.unsubscribe();
+        }
+        this._throttled = null;
+        if (_trailing) {
+            this.send();
+        }
+    };
+    ThrottleSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        this.throttlingDone();
+    };
+    ThrottleSubscriber.prototype.notifyComplete = function () {
+        this.throttlingDone();
+    };
+    return ThrottleSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__["a" /* OuterSubscriber */]));
+//# sourceMappingURL=throttle.js.map
+
+
+/***/ }),
+/* 437 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = timeoutWith;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__scheduler_async__ = __webpack_require__(40);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isDate__ = __webpack_require__(443);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__ = __webpack_require__(13);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__ = __webpack_require__(14);
+/** PURE_IMPORTS_START tslib,_scheduler_async,_util_isDate,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+
+
+
+
+
+function timeoutWith(due, withObservable, scheduler) {
+    if (scheduler === void 0) {
+        scheduler = __WEBPACK_IMPORTED_MODULE_1__scheduler_async__["a" /* async */];
+    }
+    return function (source) {
+        var absoluteTimeout = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_isDate__["a" /* isDate */])(due);
+        var waitFor = absoluteTimeout ? (+due - scheduler.now()) : Math.abs(due);
+        return source.lift(new TimeoutWithOperator(waitFor, absoluteTimeout, withObservable, scheduler));
+    };
+}
+var TimeoutWithOperator = /*@__PURE__*/ (function () {
+    function TimeoutWithOperator(waitFor, absoluteTimeout, withObservable, scheduler) {
+        this.waitFor = waitFor;
+        this.absoluteTimeout = absoluteTimeout;
+        this.withObservable = withObservable;
+        this.scheduler = scheduler;
+    }
+    TimeoutWithOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new TimeoutWithSubscriber(subscriber, this.absoluteTimeout, this.waitFor, this.withObservable, this.scheduler));
+    };
+    return TimeoutWithOperator;
+}());
+var TimeoutWithSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](TimeoutWithSubscriber, _super);
+    function TimeoutWithSubscriber(destination, absoluteTimeout, waitFor, withObservable, scheduler) {
+        var _this = _super.call(this, destination) || this;
+        _this.absoluteTimeout = absoluteTimeout;
+        _this.waitFor = waitFor;
+        _this.withObservable = withObservable;
+        _this.scheduler = scheduler;
+        _this.action = null;
+        _this.scheduleTimeout();
+        return _this;
+    }
+    TimeoutWithSubscriber.dispatchTimeout = function (subscriber) {
+        var withObservable = subscriber.withObservable;
+        subscriber._unsubscribeAndRecycle();
+        subscriber.add(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__["a" /* subscribeToResult */])(subscriber, withObservable));
+    };
+    TimeoutWithSubscriber.prototype.scheduleTimeout = function () {
+        var action = this.action;
+        if (action) {
+            this.action = action.schedule(this, this.waitFor);
+        }
+        else {
+            this.add(this.action = this.scheduler.schedule(TimeoutWithSubscriber.dispatchTimeout, this.waitFor, this));
+        }
+    };
+    TimeoutWithSubscriber.prototype._next = function (value) {
+        if (!this.absoluteTimeout) {
+            this.scheduleTimeout();
+        }
+        _super.prototype._next.call(this, value);
+    };
+    TimeoutWithSubscriber.prototype._unsubscribe = function () {
+        this.action = null;
+        this.scheduler = null;
+        this.withObservable = null;
+    };
+    return TimeoutWithSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__["a" /* OuterSubscriber */]));
+//# sourceMappingURL=timeoutWith.js.map
+
+
+/***/ }),
+/* 438 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return asap; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__AsapAction__ = __webpack_require__(921);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsapScheduler__ = __webpack_require__(922);
+/** PURE_IMPORTS_START _AsapAction,_AsapScheduler PURE_IMPORTS_END */
+
+
+var asap = /*@__PURE__*/ new __WEBPACK_IMPORTED_MODULE_1__AsapScheduler__["a" /* AsapScheduler */](__WEBPACK_IMPORTED_MODULE_0__AsapAction__["a" /* AsapAction */]);
+//# sourceMappingURL=asap.js.map
+
+
+/***/ }),
+/* 439 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return queue; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__QueueAction__ = __webpack_require__(923);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__QueueScheduler__ = __webpack_require__(924);
+/** PURE_IMPORTS_START _QueueAction,_QueueScheduler PURE_IMPORTS_END */
+
+
+var queue = /*@__PURE__*/ new __WEBPACK_IMPORTED_MODULE_1__QueueScheduler__["a" /* QueueScheduler */](__WEBPACK_IMPORTED_MODULE_0__QueueAction__["a" /* QueueAction */]);
+//# sourceMappingURL=queue.js.map
+
+
+/***/ }),
+/* 440 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return TimeoutError; });
+/** PURE_IMPORTS_START  PURE_IMPORTS_END */
+function TimeoutErrorImpl() {
+    Error.call(this);
+    this.message = 'Timeout has occurred';
+    this.name = 'TimeoutError';
+    return this;
+}
+TimeoutErrorImpl.prototype = /*@__PURE__*/ Object.create(Error.prototype);
+var TimeoutError = TimeoutErrorImpl;
+//# sourceMappingURL=TimeoutError.js.map
+
+
+/***/ }),
+/* 441 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return UnsubscriptionError; });
+/** PURE_IMPORTS_START  PURE_IMPORTS_END */
+function UnsubscriptionErrorImpl(errors) {
+    Error.call(this);
+    this.message = errors ?
+        errors.length + " errors occurred during unsubscription:\n" + errors.map(function (err, i) { return i + 1 + ") " + err.toString(); }).join('\n  ') : '';
+    this.name = 'UnsubscriptionError';
+    this.errors = errors;
+    return this;
+}
+UnsubscriptionErrorImpl.prototype = /*@__PURE__*/ Object.create(Error.prototype);
+var UnsubscriptionError = UnsubscriptionErrorImpl;
+//# sourceMappingURL=UnsubscriptionError.js.map
+
+
+/***/ }),
+/* 442 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return isArrayLike; });
+/** PURE_IMPORTS_START  PURE_IMPORTS_END */
+var isArrayLike = (function (x) { return x && typeof x.length === 'number' && typeof x !== 'function'; });
+//# sourceMappingURL=isArrayLike.js.map
+
+
+/***/ }),
+/* 443 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = isDate;
+/** PURE_IMPORTS_START  PURE_IMPORTS_END */
+function isDate(value) {
+    return value instanceof Date && !isNaN(+value);
+}
+//# sourceMappingURL=isDate.js.map
+
+
+/***/ }),
+/* 444 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = isObject;
+/** PURE_IMPORTS_START  PURE_IMPORTS_END */
+function isObject(x) {
+    return x != null && typeof x === 'object';
+}
+//# sourceMappingURL=isObject.js.map
+
+
+/***/ }),
+/* 445 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = isPromise;
+/** PURE_IMPORTS_START  PURE_IMPORTS_END */
+function isPromise(value) {
+    return value && typeof value.subscribe !== 'function' && typeof value.then === 'function';
+}
+//# sourceMappingURL=isPromise.js.map
+
+
+/***/ }),
+/* 446 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return subscribeTo; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(12);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__subscribeToArray__ = __webpack_require__(447);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__subscribeToPromise__ = __webpack_require__(450);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__subscribeToIterable__ = __webpack_require__(448);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__subscribeToObservable__ = __webpack_require__(449);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__isArrayLike__ = __webpack_require__(442);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__isPromise__ = __webpack_require__(445);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__isObject__ = __webpack_require__(444);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__symbol_iterator__ = __webpack_require__(151);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__symbol_observable__ = __webpack_require__(117);
+/** PURE_IMPORTS_START _Observable,_subscribeToArray,_subscribeToPromise,_subscribeToIterable,_subscribeToObservable,_isArrayLike,_isPromise,_isObject,_symbol_iterator,_symbol_observable PURE_IMPORTS_END */
+
+
+
+
+
+
+
+
+
+
+var subscribeTo = function (result) {
+    if (result instanceof __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */]) {
+        return function (subscriber) {
+            if (result._isScalar) {
+                subscriber.next(result.value);
+                subscriber.complete();
+                return undefined;
+            }
+            else {
+                return result.subscribe(subscriber);
+            }
+        };
+    }
+    else if (result && typeof result[__WEBPACK_IMPORTED_MODULE_9__symbol_observable__["a" /* observable */]] === 'function') {
+        return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_4__subscribeToObservable__["a" /* subscribeToObservable */])(result);
+    }
+    else if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_5__isArrayLike__["a" /* isArrayLike */])(result)) {
+        return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__subscribeToArray__["a" /* subscribeToArray */])(result);
+    }
+    else if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_6__isPromise__["a" /* isPromise */])(result)) {
+        return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__subscribeToPromise__["a" /* subscribeToPromise */])(result);
+    }
+    else if (result && typeof result[__WEBPACK_IMPORTED_MODULE_8__symbol_iterator__["a" /* iterator */]] === 'function') {
+        return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__subscribeToIterable__["a" /* subscribeToIterable */])(result);
+    }
+    else {
+        var value = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_7__isObject__["a" /* isObject */])(result) ? 'an invalid object' : "'" + result + "'";
+        var msg = "You provided " + value + " where a stream was expected."
+            + ' You can provide an Observable, Promise, Array, or Iterable.';
+        throw new TypeError(msg);
+    }
+};
+//# sourceMappingURL=subscribeTo.js.map
+
+
+/***/ }),
+/* 447 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return subscribeToArray; });
+/** PURE_IMPORTS_START  PURE_IMPORTS_END */
+var subscribeToArray = function (array) {
+    return function (subscriber) {
+        for (var i = 0, len = array.length; i < len && !subscriber.closed; i++) {
+            subscriber.next(array[i]);
+        }
+        if (!subscriber.closed) {
+            subscriber.complete();
+        }
+    };
+};
+//# sourceMappingURL=subscribeToArray.js.map
+
+
+/***/ }),
+/* 448 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return subscribeToIterable; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__symbol_iterator__ = __webpack_require__(151);
+/** PURE_IMPORTS_START _symbol_iterator PURE_IMPORTS_END */
+
+var subscribeToIterable = function (iterable) {
+    return function (subscriber) {
+        var iterator = iterable[__WEBPACK_IMPORTED_MODULE_0__symbol_iterator__["a" /* iterator */]]();
+        do {
+            var item = iterator.next();
+            if (item.done) {
+                subscriber.complete();
+                break;
+            }
+            subscriber.next(item.value);
+            if (subscriber.closed) {
+                break;
+            }
+        } while (true);
+        if (typeof iterator.return === 'function') {
+            subscriber.add(function () {
+                if (iterator.return) {
+                    iterator.return();
+                }
+            });
+        }
+        return subscriber;
+    };
+};
+//# sourceMappingURL=subscribeToIterable.js.map
+
+
+/***/ }),
+/* 449 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return subscribeToObservable; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__symbol_observable__ = __webpack_require__(117);
+/** PURE_IMPORTS_START _symbol_observable PURE_IMPORTS_END */
+
+var subscribeToObservable = function (obj) {
+    return function (subscriber) {
+        var obs = obj[__WEBPACK_IMPORTED_MODULE_0__symbol_observable__["a" /* observable */]]();
+        if (typeof obs.subscribe !== 'function') {
+            throw new TypeError('Provided object does not correctly implement Symbol.observable');
+        }
+        else {
+            return obs.subscribe(subscriber);
+        }
+    };
+};
+//# sourceMappingURL=subscribeToObservable.js.map
+
+
+/***/ }),
+/* 450 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return subscribeToPromise; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__hostReportError__ = __webpack_require__(323);
+/** PURE_IMPORTS_START _hostReportError PURE_IMPORTS_END */
+
+var subscribeToPromise = function (promise) {
+    return function (subscriber) {
+        promise.then(function (value) {
+            if (!subscriber.closed) {
+                subscriber.next(value);
+                subscriber.complete();
+            }
+        }, function (err) { return subscriber.error(err); })
+            .then(null, __WEBPACK_IMPORTED_MODULE_0__hostReportError__["a" /* hostReportError */]);
+        return subscriber;
+    };
+};
+//# sourceMappingURL=subscribeToPromise.js.map
+
+
+/***/ }),
+/* 451 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// Note: since nyc uses this module to output coverage, any lines
+// that are in the direct sync flow of nyc's outputCoverage are
+// ignored, since we can never get coverage for them.
+var assert = __webpack_require__(28)
+var signals = __webpack_require__(933)
+
+var EE = __webpack_require__(77)
+/* istanbul ignore if */
+if (typeof EE !== 'function') {
+  EE = EE.EventEmitter
+}
+
+var emitter
+if (process.__signal_exit_emitter__) {
+  emitter = process.__signal_exit_emitter__
+} else {
+  emitter = process.__signal_exit_emitter__ = new EE()
+  emitter.count = 0
+  emitter.emitted = {}
+}
+
+// Because this emitter is a global, we have to check to see if a
+// previous version of this library failed to enable infinite listeners.
+// I know what you're about to say.  But literally everything about
+// signal-exit is a compromise with evil.  Get used to it.
+if (!emitter.infinite) {
+  emitter.setMaxListeners(Infinity)
+  emitter.infinite = true
+}
+
+module.exports = function (cb, opts) {
+  assert.equal(typeof cb, 'function', 'a callback must be provided for exit handler')
+
+  if (loaded === false) {
+    load()
+  }
+
+  var ev = 'exit'
+  if (opts && opts.alwaysLast) {
+    ev = 'afterexit'
+  }
+
+  var remove = function () {
+    emitter.removeListener(ev, cb)
+    if (emitter.listeners('exit').length === 0 &&
+        emitter.listeners('afterexit').length === 0) {
+      unload()
+    }
+  }
+  emitter.on(ev, cb)
+
+  return remove
+}
+
+module.exports.unload = unload
+function unload () {
+  if (!loaded) {
+    return
+  }
+  loaded = false
+
+  signals.forEach(function (sig) {
+    try {
+      process.removeListener(sig, sigListeners[sig])
+    } catch (er) {}
+  })
+  process.emit = originalProcessEmit
+  process.reallyExit = originalProcessReallyExit
+  emitter.count -= 1
+}
+
+function emit (event, code, signal) {
+  if (emitter.emitted[event]) {
+    return
+  }
+  emitter.emitted[event] = true
+  emitter.emit(event, code, signal)
+}
+
+// { <signal>: <listener fn>, ... }
+var sigListeners = {}
+signals.forEach(function (sig) {
+  sigListeners[sig] = function listener () {
+    // If there are no other listeners, an exit is coming!
+    // Simplest way: remove us and then re-send the signal.
+    // We know that this will kill the process, so we can
+    // safely emit now.
+    var listeners = process.listeners(sig)
+    if (listeners.length === emitter.count) {
+      unload()
+      emit('exit', null, sig)
+      /* istanbul ignore next */
+      emit('afterexit', null, sig)
+      /* istanbul ignore next */
+      process.kill(process.pid, sig)
+    }
+  }
+})
+
+module.exports.signals = function () {
+  return signals
+}
+
+module.exports.load = load
+
+var loaded = false
+
+function load () {
+  if (loaded) {
+    return
+  }
+  loaded = true
+
+  // This is the number of onSignalExit's that are in play.
+  // It's important so that we can count the correct number of
+  // listeners on signals, and don't wait for the other one to
+  // handle it instead of us.
+  emitter.count += 1
+
+  signals = signals.filter(function (sig) {
+    try {
+      process.on(sig, sigListeners[sig])
+      return true
+    } catch (er) {
+      return false
+    }
+  })
+
+  process.emit = processEmit
+  process.reallyExit = processReallyExit
+}
+
+var originalProcessReallyExit = process.reallyExit
+function processReallyExit (code) {
+  process.exitCode = code || 0
+  emit('exit', process.exitCode, null)
+  /* istanbul ignore next */
+  emit('afterexit', process.exitCode, null)
+  /* istanbul ignore next */
+  originalProcessReallyExit.call(process, process.exitCode)
+}
+
+var originalProcessEmit = process.emit
+function processEmit (ev, arg) {
+  if (ev === 'exit') {
+    if (arg !== undefined) {
+      process.exitCode = arg
+    }
+    var ret = originalProcessEmit.apply(this, arguments)
+    emit('exit', process.exitCode, null)
+    /* istanbul ignore next */
+    emit('afterexit', process.exitCode, null)
+    return ret
+  } else {
+    return originalProcessEmit.apply(this, arguments)
+  }
+}
+
+
+/***/ }),
+/* 452 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var scan = __webpack_require__(938)
+var parse = __webpack_require__(937)
+
+module.exports = function (source) {
+  return parse(scan(source))
+}
+
+
+/***/ }),
+/* 453 */
+/***/ (function(module, exports) {
+
+module.exports = ["0BSD","AAL","Abstyles","Adobe-2006","Adobe-Glyph","ADSL","AFL-1.1","AFL-1.2","AFL-2.0","AFL-2.1","AFL-3.0","Afmparse","AGPL-1.0","AGPL-3.0-only","AGPL-3.0-or-later","Aladdin","AMDPLPA","AML","AMPAS","ANTLR-PD","Apache-1.0","Apache-1.1","Apache-2.0","APAFML","APL-1.0","APSL-1.0","APSL-1.1","APSL-1.2","APSL-2.0","Artistic-1.0-cl8","Artistic-1.0-Perl","Artistic-1.0","Artistic-2.0","Bahyph","Barr","Beerware","BitTorrent-1.0","BitTorrent-1.1","Borceux","BSD-1-Clause","BSD-2-Clause-FreeBSD","BSD-2-Clause-NetBSD","BSD-2-Clause-Patent","BSD-2-Clause","BSD-3-Clause-Attribution","BSD-3-Clause-Clear","BSD-3-Clause-LBNL","BSD-3-Clause-No-Nuclear-License-2014","BSD-3-Clause-No-Nuclear-License","BSD-3-Clause-No-Nuclear-Warranty","BSD-3-Clause","BSD-4-Clause-UC","BSD-4-Clause","BSD-Protection","BSD-Source-Code","BSL-1.0","bzip2-1.0.5","bzip2-1.0.6","Caldera","CATOSL-1.1","CC-BY-1.0","CC-BY-2.0","CC-BY-2.5","CC-BY-3.0","CC-BY-4.0","CC-BY-NC-1.0","CC-BY-NC-2.0","CC-BY-NC-2.5","CC-BY-NC-3.0","CC-BY-NC-4.0","CC-BY-NC-ND-1.0","CC-BY-NC-ND-2.0","CC-BY-NC-ND-2.5","CC-BY-NC-ND-3.0","CC-BY-NC-ND-4.0","CC-BY-NC-SA-1.0","CC-BY-NC-SA-2.0","CC-BY-NC-SA-2.5","CC-BY-NC-SA-3.0","CC-BY-NC-SA-4.0","CC-BY-ND-1.0","CC-BY-ND-2.0","CC-BY-ND-2.5","CC-BY-ND-3.0","CC-BY-ND-4.0","CC-BY-SA-1.0","CC-BY-SA-2.0","CC-BY-SA-2.5","CC-BY-SA-3.0","CC-BY-SA-4.0","CC0-1.0","CDDL-1.0","CDDL-1.1","CDLA-Permissive-1.0","CDLA-Sharing-1.0","CECILL-1.0","CECILL-1.1","CECILL-2.0","CECILL-2.1","CECILL-B","CECILL-C","ClArtistic","CNRI-Jython","CNRI-Python-GPL-Compatible","CNRI-Python","Condor-1.1","CPAL-1.0","CPL-1.0","CPOL-1.02","Crossword","CrystalStacker","CUA-OPL-1.0","Cube","curl","D-FSL-1.0","diffmark","DOC","Dotseqn","DSDP","dvipdfm","ECL-1.0","ECL-2.0","EFL-1.0","EFL-2.0","eGenix","Entessa","EPL-1.0","EPL-2.0","ErlPL-1.1","EUDatagrid","EUPL-1.0","EUPL-1.1","EUPL-1.2","Eurosym","Fair","Frameworx-1.0","FreeImage","FSFAP","FSFUL","FSFULLR","FTL","GFDL-1.1-only","GFDL-1.1-or-later","GFDL-1.2-only","GFDL-1.2-or-later","GFDL-1.3-only","GFDL-1.3-or-later","Giftware","GL2PS","Glide","Glulxe","gnuplot","GPL-1.0-only","GPL-1.0-or-later","GPL-2.0-only","GPL-2.0-or-later","GPL-3.0-only","GPL-3.0-or-later","gSOAP-1.3b","HaskellReport","HPND","IBM-pibs","ICU","IJG","ImageMagick","iMatix","Imlib2","Info-ZIP","Intel-ACPI","Intel","Interbase-1.0","IPA","IPL-1.0","ISC","JasPer-2.0","JSON","LAL-1.2","LAL-1.3","Latex2e","Leptonica","LGPL-2.0-only","LGPL-2.0-or-later","LGPL-2.1-only","LGPL-2.1-or-later","LGPL-3.0-only","LGPL-3.0-or-later","LGPLLR","Libpng","libtiff","LiLiQ-P-1.1","LiLiQ-R-1.1","LiLiQ-Rplus-1.1","LPL-1.0","LPL-1.02","LPPL-1.0","LPPL-1.1","LPPL-1.2","LPPL-1.3a","LPPL-1.3c","MakeIndex","MirOS","MIT-advertising","MIT-CMU","MIT-enna","MIT-feh","MIT","MITNFA","Motosoto","mpich2","MPL-1.0","MPL-1.1","MPL-2.0-no-copyleft-exception","MPL-2.0","MS-PL","MS-RL","MTLL","Multics","Mup","NASA-1.3","Naumen","NBPL-1.0","NCSA","Net-SNMP","NetCDF","Newsletr","NGPL","NLOD-1.0","NLPL","Nokia","NOSL","Noweb","NPL-1.0","NPL-1.1","NPOSL-3.0","NRL","NTP","OCCT-PL","OCLC-2.0","ODbL-1.0","OFL-1.0","OFL-1.1","OGTSL","OLDAP-1.1","OLDAP-1.2","OLDAP-1.3","OLDAP-1.4","OLDAP-2.0.1","OLDAP-2.0","OLDAP-2.1","OLDAP-2.2.1","OLDAP-2.2.2","OLDAP-2.2","OLDAP-2.3","OLDAP-2.4","OLDAP-2.5","OLDAP-2.6","OLDAP-2.7","OLDAP-2.8","OML","OpenSSL","OPL-1.0","OSET-PL-2.1","OSL-1.0","OSL-1.1","OSL-2.0","OSL-2.1","OSL-3.0","PDDL-1.0","PHP-3.0","PHP-3.01","Plexus","PostgreSQL","psfrag","psutils","Python-2.0","Qhull","QPL-1.0","Rdisc","RHeCos-1.1","RPL-1.1","RPL-1.5","RPSL-1.0","RSA-MD","RSCPL","Ruby","SAX-PD","Saxpath","SCEA","Sendmail","SGI-B-1.0","SGI-B-1.1","SGI-B-2.0","SimPL-2.0","SISSL-1.2","SISSL","Sleepycat","SMLNJ","SMPPL","SNIA","Spencer-86","Spencer-94","Spencer-99","SPL-1.0","SugarCRM-1.1.3","SWL","TCL","TCP-wrappers","TMate","TORQUE-1.1","TOSL","Unicode-DFS-2015","Unicode-DFS-2016","Unicode-TOU","Unlicense","UPL-1.0","Vim","VOSTROM","VSL-1.0","W3C-19980720","W3C-20150513","W3C","Watcom-1.0","Wsuipa","WTFPL","X11","Xerox","XFree86-1.1","xinetd","Xnet","xpp","XSkat","YPL-1.0","YPL-1.1","Zed","Zend-2.0","Zimbra-1.3","Zimbra-1.4","zlib-acknowledgement","Zlib","ZPL-1.1","ZPL-2.0","ZPL-2.1"]
+
+/***/ }),
+/* 454 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// Copyright 2015 Joyent, Inc.
+
+module.exports = {
+	Verifier: Verifier,
+	Signer: Signer
+};
+
+var nacl;
+var stream = __webpack_require__(23);
+var util = __webpack_require__(3);
+var assert = __webpack_require__(16);
+var Buffer = __webpack_require__(15).Buffer;
+var Signature = __webpack_require__(75);
+
+function Verifier(key, hashAlgo) {
+	if (nacl === undefined)
+		nacl = __webpack_require__(76);
+
+	if (hashAlgo.toLowerCase() !== 'sha512')
+		throw (new Error('ED25519 only supports the use of ' +
+		    'SHA-512 hashes'));
+
+	this.key = key;
+	this.chunks = [];
+
+	stream.Writable.call(this, {});
+}
+util.inherits(Verifier, stream.Writable);
+
+Verifier.prototype._write = function (chunk, enc, cb) {
+	this.chunks.push(chunk);
+	cb();
+};
+
+Verifier.prototype.update = function (chunk) {
+	if (typeof (chunk) === 'string')
+		chunk = Buffer.from(chunk, 'binary');
+	this.chunks.push(chunk);
+};
+
+Verifier.prototype.verify = function (signature, fmt) {
+	var sig;
+	if (Signature.isSignature(signature, [2, 0])) {
+		if (signature.type !== 'ed25519')
+			return (false);
+		sig = signature.toBuffer('raw');
+
+	} else if (typeof (signature) === 'string') {
+		sig = Buffer.from(signature, 'base64');
+
+	} else if (Signature.isSignature(signature, [1, 0])) {
+		throw (new Error('signature was created by too old ' +
+		    'a version of sshpk and cannot be verified'));
+	}
+
+	assert.buffer(sig);
+	return (nacl.sign.detached.verify(
+	    new Uint8Array(Buffer.concat(this.chunks)),
+	    new Uint8Array(sig),
+	    new Uint8Array(this.key.part.A.data)));
+};
+
+function Signer(key, hashAlgo) {
+	if (nacl === undefined)
+		nacl = __webpack_require__(76);
+
+	if (hashAlgo.toLowerCase() !== 'sha512')
+		throw (new Error('ED25519 only supports the use of ' +
+		    'SHA-512 hashes'));
+
+	this.key = key;
+	this.chunks = [];
+
+	stream.Writable.call(this, {});
+}
+util.inherits(Signer, stream.Writable);
+
+Signer.prototype._write = function (chunk, enc, cb) {
+	this.chunks.push(chunk);
+	cb();
+};
+
+Signer.prototype.update = function (chunk) {
+	if (typeof (chunk) === 'string')
+		chunk = Buffer.from(chunk, 'binary');
+	this.chunks.push(chunk);
+};
+
+Signer.prototype.sign = function () {
+	var sig = nacl.sign.detached(
+	    new Uint8Array(Buffer.concat(this.chunks)),
+	    new Uint8Array(Buffer.concat([
+		this.key.part.k.data, this.key.part.A.data])));
+	var sigBuf = Buffer.from(sig);
+	var sigObj = Signature.parse(sigBuf, 'ed25519', 'raw');
+	sigObj.hashAlgorithm = 'sha512';
+	return (sigObj);
+};
+
+
+/***/ }),
+/* 455 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// Copyright 2015 Joyent, Inc.
+
+module.exports = {
+	read: read,
+	write: write
+};
+
+var assert = __webpack_require__(16);
+var Buffer = __webpack_require__(15).Buffer;
+var utils = __webpack_require__(26);
+var Key = __webpack_require__(27);
+var PrivateKey = __webpack_require__(33);
+
+var pem = __webpack_require__(86);
+var ssh = __webpack_require__(456);
+var rfc4253 = __webpack_require__(103);
+var dnssec = __webpack_require__(326);
+
+var DNSSEC_PRIVKEY_HEADER_PREFIX = 'Private-key-format: v1';
+
+function read(buf, options) {
+	if (typeof (buf) === 'string') {
+		if (buf.trim().match(/^[-]+[ ]*BEGIN/))
+			return (pem.read(buf, options));
+		if (buf.match(/^\s*ssh-[a-z]/))
+			return (ssh.read(buf, options));
+		if (buf.match(/^\s*ecdsa-/))
+			return (ssh.read(buf, options));
+		if (findDNSSECHeader(buf))
+			return (dnssec.read(buf, options));
+		buf = Buffer.from(buf, 'binary');
+	} else {
+		assert.buffer(buf);
+		if (findPEMHeader(buf))
+			return (pem.read(buf, options));
+		if (findSSHHeader(buf))
+			return (ssh.read(buf, options));
+		if (findDNSSECHeader(buf))
+			return (dnssec.read(buf, options));
+	}
+	if (buf.readUInt32BE(0) < buf.length)
+		return (rfc4253.read(buf, options));
+	throw (new Error('Failed to auto-detect format of key'));
+}
+
+function findSSHHeader(buf) {
+	var offset = 0;
+	while (offset < buf.length &&
+	    (buf[offset] === 32 || buf[offset] === 10 || buf[offset] === 9))
+		++offset;
+	if (offset + 4 <= buf.length &&
+	    buf.slice(offset, offset + 4).toString('ascii') === 'ssh-')
+		return (true);
+	if (offset + 6 <= buf.length &&
+	    buf.slice(offset, offset + 6).toString('ascii') === 'ecdsa-')
+		return (true);
+	return (false);
+}
+
+function findPEMHeader(buf) {
+	var offset = 0;
+	while (offset < buf.length &&
+	    (buf[offset] === 32 || buf[offset] === 10))
+		++offset;
+	if (buf[offset] !== 45)
+		return (false);
+	while (offset < buf.length &&
+	    (buf[offset] === 45))
+		++offset;
+	while (offset < buf.length &&
+	    (buf[offset] === 32))
+		++offset;
+	if (offset + 5 > buf.length ||
+	    buf.slice(offset, offset + 5).toString('ascii') !== 'BEGIN')
+		return (false);
+	return (true);
+}
+
+function findDNSSECHeader(buf) {
+	// private case first
+	if (buf.length <= DNSSEC_PRIVKEY_HEADER_PREFIX.length)
+		return (false);
+	var headerCheck = buf.slice(0, DNSSEC_PRIVKEY_HEADER_PREFIX.length);
+	if (headerCheck.toString('ascii') === DNSSEC_PRIVKEY_HEADER_PREFIX)
+		return (true);
+
+	// public-key RFC3110 ?
+	// 'domain.com. IN KEY ...' or 'domain.com. IN DNSKEY ...'
+	// skip any comment-lines
+	if (typeof (buf) !== 'string') {
+		buf = buf.toString('ascii');
+	}
+	var lines = buf.split('\n');
+	var line = 0;
+	/* JSSTYLED */
+	while (lines[line].match(/^\;/))
+		line++;
+	if (lines[line].toString('ascii').match(/\. IN KEY /))
+		return (true);
+	if (lines[line].toString('ascii').match(/\. IN DNSKEY /))
+		return (true);
+	return (false);
+}
+
+function write(key, options) {
+	throw (new Error('"auto" format cannot be used for writing'));
+}
+
+
+/***/ }),
+/* 456 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// Copyright 2015 Joyent, Inc.
+
+module.exports = {
+	read: read,
+	write: write
+};
+
+var assert = __webpack_require__(16);
+var Buffer = __webpack_require__(15).Buffer;
+var rfc4253 = __webpack_require__(103);
+var utils = __webpack_require__(26);
+var Key = __webpack_require__(27);
+var PrivateKey = __webpack_require__(33);
+
+var sshpriv = __webpack_require__(192);
+
+/*JSSTYLED*/
+var SSHKEY_RE = /^([a-z0-9-]+)[ \t]+([a-zA-Z0-9+\/]+[=]*)([ \t]+([^ \t][^\n]*[\n]*)?)?$/;
+/*JSSTYLED*/
+var SSHKEY_RE2 = /^([a-z0-9-]+)[ \t\n]+([a-zA-Z0-9+\/][a-zA-Z0-9+\/ \t\n=]*)([^a-zA-Z0-9+\/ \t\n=].*)?$/;
+
+function read(buf, options) {
+	if (typeof (buf) !== 'string') {
+		assert.buffer(buf, 'buf');
+		buf = buf.toString('ascii');
+	}
+
+	var trimmed = buf.trim().replace(/[\\\r]/g, '');
+	var m = trimmed.match(SSHKEY_RE);
+	if (!m)
+		m = trimmed.match(SSHKEY_RE2);
+	assert.ok(m, 'key must match regex');
+
+	var type = rfc4253.algToKeyType(m[1]);
+	var kbuf = Buffer.from(m[2], 'base64');
+
+	/*
+	 * This is a bit tricky. If we managed to parse the key and locate the
+	 * key comment with the regex, then do a non-partial read and assert
+	 * that we have consumed all bytes. If we couldn't locate the key
+	 * comment, though, there may be whitespace shenanigans going on that
+	 * have conjoined the comment to the rest of the key. We do a partial
+	 * read in this case to try to make the best out of a sorry situation.
+	 */
+	var key;
+	var ret = {};
+	if (m[4]) {
+		try {
+			key = rfc4253.read(kbuf);
+
+		} catch (e) {
+			m = trimmed.match(SSHKEY_RE2);
+			assert.ok(m, 'key must match regex');
+			kbuf = Buffer.from(m[2], 'base64');
+			key = rfc4253.readInternal(ret, 'public', kbuf);
+		}
+	} else {
+		key = rfc4253.readInternal(ret, 'public', kbuf);
+	}
+
+	assert.strictEqual(type, key.type);
+
+	if (m[4] && m[4].length > 0) {
+		key.comment = m[4];
+
+	} else if (ret.consumed) {
+		/*
+		 * Now the magic: trying to recover the key comment when it's
+		 * gotten conjoined to the key or otherwise shenanigan'd.
+		 *
+		 * Work out how much base64 we used, then drop all non-base64
+		 * chars from the beginning up to this point in the the string.
+		 * Then offset in this and try to make up for missing = chars.
+		 */
+		var data = m[2] + (m[3] ? m[3] : '');
+		var realOffset = Math.ceil(ret.consumed / 3) * 4;
+		data = data.slice(0, realOffset - 2). /*JSSTYLED*/
+		    replace(/[^a-zA-Z0-9+\/=]/g, '') +
+		    data.slice(realOffset - 2);
+
+		var padding = ret.consumed % 3;
+		if (padding > 0 &&
+		    data.slice(realOffset - 1, realOffset) !== '=')
+			realOffset--;
+		while (data.slice(realOffset, realOffset + 1) === '=')
+			realOffset++;
+
+		/* Finally, grab what we think is the comment & clean it up. */
+		var trailer = data.slice(realOffset);
+		trailer = trailer.replace(/[\r\n]/g, ' ').
+		    replace(/^\s+/, '');
+		if (trailer.match(/^[a-zA-Z0-9]/))
+			key.comment = trailer;
+	}
+
+	return (key);
+}
+
+function write(key, options) {
+	assert.object(key);
+	if (!Key.isKey(key))
+		throw (new Error('Must be a public key'));
+
+	var parts = [];
+	var alg = rfc4253.keyTypeToAlg(key);
+	parts.push(alg);
+
+	var buf = rfc4253.write(key);
+	parts.push(buf.toString('base64'));
+
+	if (key.comment)
+		parts.push(key.comment);
+
+	return (Buffer.from(parts.join(' ')));
+}
+
+
+/***/ }),
+/* 457 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// Copyright 2017 Joyent, Inc.
+
+module.exports = {
+	read: read,
+	verify: verify,
+	sign: sign,
+	signAsync: signAsync,
+	write: write
+};
+
+var assert = __webpack_require__(16);
+var asn1 = __webpack_require__(66);
+var Buffer = __webpack_require__(15).Buffer;
+var algs = __webpack_require__(32);
+var utils = __webpack_require__(26);
+var Key = __webpack_require__(27);
+var PrivateKey = __webpack_require__(33);
+var pem = __webpack_require__(86);
+var Identity = __webpack_require__(158);
+var Signature = __webpack_require__(75);
+var Certificate = __webpack_require__(155);
+var pkcs8 = __webpack_require__(157);
+
+/*
+ * This file is based on RFC5280 (X.509).
+ */
+
+/* Helper to read in a single mpint */
+function readMPInt(der, nm) {
+	assert.strictEqual(der.peek(), asn1.Ber.Integer,
+	    nm + ' is not an Integer');
+	return (utils.mpNormalize(der.readString(asn1.Ber.Integer, true)));
+}
+
+function verify(cert, key) {
+	var sig = cert.signatures.x509;
+	assert.object(sig, 'x509 signature');
+
+	var algParts = sig.algo.split('-');
+	if (algParts[0] !== key.type)
+		return (false);
+
+	var blob = sig.cache;
+	if (blob === undefined) {
+		var der = new asn1.BerWriter();
+		writeTBSCert(cert, der);
+		blob = der.buffer;
+	}
+
+	var verifier = key.createVerify(algParts[1]);
+	verifier.write(blob);
+	return (verifier.verify(sig.signature));
+}
+
+function Local(i) {
+	return (asn1.Ber.Context | asn1.Ber.Constructor | i);
+}
+
+function Context(i) {
+	return (asn1.Ber.Context | i);
+}
+
+var SIGN_ALGS = {
+	'rsa-md5': '1.2.840.113549.1.1.4',
+	'rsa-sha1': '1.2.840.113549.1.1.5',
+	'rsa-sha256': '1.2.840.113549.1.1.11',
+	'rsa-sha384': '1.2.840.113549.1.1.12',
+	'rsa-sha512': '1.2.840.113549.1.1.13',
+	'dsa-sha1': '1.2.840.10040.4.3',
+	'dsa-sha256': '2.16.840.1.101.3.4.3.2',
+	'ecdsa-sha1': '1.2.840.10045.4.1',
+	'ecdsa-sha256': '1.2.840.10045.4.3.2',
+	'ecdsa-sha384': '1.2.840.10045.4.3.3',
+	'ecdsa-sha512': '1.2.840.10045.4.3.4',
+	'ed25519-sha512': '1.3.101.112'
+};
+Object.keys(SIGN_ALGS).forEach(function (k) {
+	SIGN_ALGS[SIGN_ALGS[k]] = k;
+});
+SIGN_ALGS['1.3.14.3.2.3'] = 'rsa-md5';
+SIGN_ALGS['1.3.14.3.2.29'] = 'rsa-sha1';
+
+var EXTS = {
+	'issuerKeyId': '2.5.29.35',
+	'altName': '2.5.29.17',
+	'basicConstraints': '2.5.29.19',
+	'keyUsage': '2.5.29.15',
+	'extKeyUsage': '2.5.29.37'
+};
+
+function read(buf, options) {
+	if (typeof (buf) === 'string') {
+		buf = Buffer.from(buf, 'binary');
+	}
+	assert.buffer(buf, 'buf');
+
+	var der = new asn1.BerReader(buf);
+
+	der.readSequence();
+	if (Math.abs(der.length - der.remain) > 1) {
+		throw (new Error('DER sequence does not contain whole byte ' +
+		    'stream'));
+	}
+
+	var tbsStart = der.offset;
+	der.readSequence();
+	var sigOffset = der.offset + der.length;
+	var tbsEnd = sigOffset;
+
+	if (der.peek() === Local(0)) {
+		der.readSequence(Local(0));
+		var version = der.readInt();
+		assert.ok(version <= 3,
+		    'only x.509 versions up to v3 supported');
+	}
+
+	var cert = {};
+	cert.signatures = {};
+	var sig = (cert.signatures.x509 = {});
+	sig.extras = {};
+
+	cert.serial = readMPInt(der, 'serial');
+
+	der.readSequence();
+	var after = der.offset + der.length;
+	var certAlgOid = der.readOID();
+	var certAlg = SIGN_ALGS[certAlgOid];
+	if (certAlg === undefined)
+		throw (new Error('unknown signature algorithm ' + certAlgOid));
+
+	der._offset = after;
+	cert.issuer = Identity.parseAsn1(der);
+
+	der.readSequence();
+	cert.validFrom = readDate(der);
+	cert.validUntil = readDate(der);
+
+	cert.subjects = [Identity.parseAsn1(der)];
+
+	der.readSequence();
+	after = der.offset + der.length;
+	cert.subjectKey = pkcs8.readPkcs8(undefined, 'public', der);
+	der._offset = after;
+
+	/* issuerUniqueID */
+	if (der.peek() === Local(1)) {
+		der.readSequence(Local(1));
+		sig.extras.issuerUniqueID =
+		    buf.slice(der.offset, der.offset + der.length);
+		der._offset += der.length;
+	}
+
+	/* subjectUniqueID */
+	if (der.peek() === Local(2)) {
+		der.readSequence(Local(2));
+		sig.extras.subjectUniqueID =
+		    buf.slice(der.offset, der.offset + der.length);
+		der._offset += der.length;
+	}
+
+	/* extensions */
+	if (der.peek() === Local(3)) {
+		der.readSequence(Local(3));
+		var extEnd = der.offset + der.length;
+		der.readSequence();
+
+		while (der.offset < extEnd)
+			readExtension(cert, buf, der);
+
+		assert.strictEqual(der.offset, extEnd);
+	}
+
+	assert.strictEqual(der.offset, sigOffset);
+
+	der.readSequence();
+	after = der.offset + der.length;
+	var sigAlgOid = der.readOID();
+	var sigAlg = SIGN_ALGS[sigAlgOid];
+	if (sigAlg === undefined)
+		throw (new Error('unknown signature algorithm ' + sigAlgOid));
+	der._offset = after;
+
+	var sigData = der.readString(asn1.Ber.BitString, true);
+	if (sigData[0] === 0)
+		sigData = sigData.slice(1);
+	var algParts = sigAlg.split('-');
+
+	sig.signature = Signature.parse(sigData, algParts[0], 'asn1');
+	sig.signature.hashAlgorithm = algParts[1];
+	sig.algo = sigAlg;
+	sig.cache = buf.slice(tbsStart, tbsEnd);
+
+	return (new Certificate(cert));
+}
+
+function readDate(der) {
+	if (der.peek() === asn1.Ber.UTCTime) {
+		return (utcTimeToDate(der.readString(asn1.Ber.UTCTime)));
+	} else if (der.peek() === asn1.Ber.GeneralizedTime) {
+		return (gTimeToDate(der.readString(asn1.Ber.GeneralizedTime)));
+	} else {
+		throw (new Error('Unsupported date format'));
+	}
+}
+
+/* RFC5280, section 4.2.1.6 (GeneralName type) */
+var ALTNAME = {
+	OtherName: Local(0),
+	RFC822Name: Context(1),
+	DNSName: Context(2),
+	X400Address: Local(3),
+	DirectoryName: Local(4),
+	EDIPartyName: Local(5),
+	URI: Context(6),
+	IPAddress: Context(7),
+	OID: Context(8)
+};
+
+/* RFC5280, section 4.2.1.12 (KeyPurposeId) */
+var EXTPURPOSE = {
+	'serverAuth': '1.3.6.1.5.5.7.3.1',
+	'clientAuth': '1.3.6.1.5.5.7.3.2',
+	'codeSigning': '1.3.6.1.5.5.7.3.3',
+
+	/* See https://github.com/joyent/oid-docs/blob/master/root.md */
+	'joyentDocker': '1.3.6.1.4.1.38678.1.4.1',
+	'joyentCmon': '1.3.6.1.4.1.38678.1.4.2'
+};
+var EXTPURPOSE_REV = {};
+Object.keys(EXTPURPOSE).forEach(function (k) {
+	EXTPURPOSE_REV[EXTPURPOSE[k]] = k;
+});
+
+var KEYUSEBITS = [
+	'signature', 'identity', 'keyEncryption',
+	'encryption', 'keyAgreement', 'ca', 'crl'
+];
+
+function readExtension(cert, buf, der) {
+	der.readSequence();
+	var after = der.offset + der.length;
+	var extId = der.readOID();
+	var id;
+	var sig = cert.signatures.x509;
+	sig.extras.exts = [];
+
+	var critical;
+	if (der.peek() === asn1.Ber.Boolean)
+		critical = der.readBoolean();
+
+	switch (extId) {
+	case (EXTS.basicConstraints):
+		der.readSequence(asn1.Ber.OctetString);
+		der.readSequence();
+		var bcEnd = der.offset + der.length;
+		var ca = false;
+		if (der.peek() === asn1.Ber.Boolean)
+			ca = der.readBoolean();
+		if (cert.purposes === undefined)
+			cert.purposes = [];
+		if (ca === true)
+			cert.purposes.push('ca');
+		var bc = { oid: extId, critical: critical };
+		if (der.offset < bcEnd && der.peek() === asn1.Ber.Integer)
+			bc.pathLen = der.readInt();
+		sig.extras.exts.push(bc);
+		break;
+	case (EXTS.extKeyUsage):
+		der.readSequence(asn1.Ber.OctetString);
+		der.readSequence();
+		if (cert.purposes === undefined)
+			cert.purposes = [];
+		var ekEnd = der.offset + der.length;
+		while (der.offset < ekEnd) {
+			var oid = der.readOID();
+			cert.purposes.push(EXTPURPOSE_REV[oid] || oid);
+		}
+		/*
+		 * This is a bit of a hack: in the case where we have a cert
+		 * that's only allowed to do serverAuth or clientAuth (and not
+		 * the other), we want to make sure all our Subjects are of
+		 * the right type. But we already parsed our Subjects and
+		 * decided if they were hosts or users earlier (since it appears
+		 * first in the cert).
+		 *
+		 * So we go through and mutate them into the right kind here if
+		 * it doesn't match. This might not be hugely beneficial, as it
+		 * seems that single-purpose certs are not often seen in the
+		 * wild.
+		 */
+		if (cert.purposes.indexOf('serverAuth') !== -1 &&
+		    cert.purposes.indexOf('clientAuth') === -1) {
+			cert.subjects.forEach(function (ide) {
+				if (ide.type !== 'host') {
+					ide.type = 'host';
+					ide.hostname = ide.uid ||
+					    ide.email ||
+					    ide.components[0].value;
+				}
+			});
+		} else if (cert.purposes.indexOf('clientAuth') !== -1 &&
+		    cert.purposes.indexOf('serverAuth') === -1) {
+			cert.subjects.forEach(function (ide) {
+				if (ide.type !== 'user') {
+					ide.type = 'user';
+					ide.uid = ide.hostname ||
+					    ide.email ||
+					    ide.components[0].value;
+				}
+			});
+		}
+		sig.extras.exts.push({ oid: extId, critical: critical });
+		break;
+	case (EXTS.keyUsage):
+		der.readSequence(asn1.Ber.OctetString);
+		var bits = der.readString(asn1.Ber.BitString, true);
+		var setBits = readBitField(bits, KEYUSEBITS);
+		setBits.forEach(function (bit) {
+			if (cert.purposes === undefined)
+				cert.purposes = [];
+			if (cert.purposes.indexOf(bit) === -1)
+				cert.purposes.push(bit);
+		});
+		sig.extras.exts.push({ oid: extId, critical: critical,
+		    bits: bits });
+		break;
+	case (EXTS.altName):
+		der.readSequence(asn1.Ber.OctetString);
+		der.readSequence();
+		var aeEnd = der.offset + der.length;
+		while (der.offset < aeEnd) {
+			switch (der.peek()) {
+			case ALTNAME.OtherName:
+			case ALTNAME.EDIPartyName:
+				der.readSequence();
+				der._offset += der.length;
+				break;
+			case ALTNAME.OID:
+				der.readOID(ALTNAME.OID);
+				break;
+			case ALTNAME.RFC822Name:
+				/* RFC822 specifies email addresses */
+				var email = der.readString(ALTNAME.RFC822Name);
+				id = Identity.forEmail(email);
+				if (!cert.subjects[0].equals(id))
+					cert.subjects.push(id);
+				break;
+			case ALTNAME.DirectoryName:
+				der.readSequence(ALTNAME.DirectoryName);
+				id = Identity.parseAsn1(der);
+				if (!cert.subjects[0].equals(id))
+					cert.subjects.push(id);
+				break;
+			case ALTNAME.DNSName:
+				var host = der.readString(
+				    ALTNAME.DNSName);
+				id = Identity.forHost(host);
+				if (!cert.subjects[0].equals(id))
+					cert.subjects.push(id);
+				break;
+			default:
+				der.readString(der.peek());
+				break;
+			}
+		}
+		sig.extras.exts.push({ oid: extId, critical: critical });
+		break;
+	default:
+		sig.extras.exts.push({
+			oid: extId,
+			critical: critical,
+			data: der.readString(asn1.Ber.OctetString, true)
+		});
+		break;
+	}
+
+	der._offset = after;
+}
+
+var UTCTIME_RE =
+    /^([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})?Z$/;
+function utcTimeToDate(t) {
+	var m = t.match(UTCTIME_RE);
+	assert.ok(m, 'timestamps must be in UTC');
+	var d = new Date();
+
+	var thisYear = d.getUTCFullYear();
+	var century = Math.floor(thisYear / 100) * 100;
+
+	var year = parseInt(m[1], 10);
+	if (thisYear % 100 < 50 && year >= 60)
+		year += (century - 1);
+	else
+		year += century;
+	d.setUTCFullYear(year, parseInt(m[2], 10) - 1, parseInt(m[3], 10));
+	d.setUTCHours(parseInt(m[4], 10), parseInt(m[5], 10));
+	if (m[6] && m[6].length > 0)
+		d.setUTCSeconds(parseInt(m[6], 10));
+	return (d);
+}
+
+var GTIME_RE =
+    /^([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})?Z$/;
+function gTimeToDate(t) {
+	var m = t.match(GTIME_RE);
+	assert.ok(m);
+	var d = new Date();
+
+	d.setUTCFullYear(parseInt(m[1], 10), parseInt(m[2], 10) - 1,
+	    parseInt(m[3], 10));
+	d.setUTCHours(parseInt(m[4], 10), parseInt(m[5], 10));
+	if (m[6] && m[6].length > 0)
+		d.setUTCSeconds(parseInt(m[6], 10));
+	return (d);
+}
+
+function zeroPad(n) {
+	var s = '' + n;
+	while (s.length < 2)
+		s = '0' + s;
+	return (s);
+}
+
+function dateToUTCTime(d) {
+	var s = '';
+	s += zeroPad(d.getUTCFullYear() % 100);
+	s += zeroPad(d.getUTCMonth() + 1);
+	s += zeroPad(d.getUTCDate());
+	s += zeroPad(d.getUTCHours());
+	s += zeroPad(d.getUTCMinutes());
+	s += zeroPad(d.getUTCSeconds());
+	s += 'Z';
+	return (s);
+}
+
+function sign(cert, key) {
+	if (cert.signatures.x509 === undefined)
+		cert.signatures.x509 = {};
+	var sig = cert.signatures.x509;
+
+	sig.algo = key.type + '-' + key.defaultHashAlgorithm();
+	if (SIGN_ALGS[sig.algo] === undefined)
+		return (false);
+
+	var der = new asn1.BerWriter();
+	writeTBSCert(cert, der);
+	var blob = der.buffer;
+	sig.cache = blob;
+
+	var signer = key.createSign();
+	signer.write(blob);
+	cert.signatures.x509.signature = signer.sign();
+
+	return (true);
+}
+
+function signAsync(cert, signer, done) {
+	if (cert.signatures.x509 === undefined)
+		cert.signatures.x509 = {};
+	var sig = cert.signatures.x509;
+
+	var der = new asn1.BerWriter();
+	writeTBSCert(cert, der);
+	var blob = der.buffer;
+	sig.cache = blob;
+
+	signer(blob, function (err, signature) {
+		if (err) {
+			done(err);
+			return;
+		}
+		sig.algo = signature.type + '-' + signature.hashAlgorithm;
+		if (SIGN_ALGS[sig.algo] === undefined) {
+			done(new Error('Invalid signing algorithm "' +
+			    sig.algo + '"'));
+			return;
+		}
+		sig.signature = signature;
+		done();
+	});
+}
+
+function write(cert, options) {
+	var sig = cert.signatures.x509;
+	assert.object(sig, 'x509 signature');
+
+	var der = new asn1.BerWriter();
+	der.startSequence();
+	if (sig.cache) {
+		der._ensure(sig.cache.length);
+		sig.cache.copy(der._buf, der._offset);
+		der._offset += sig.cache.length;
+	} else {
+		writeTBSCert(cert, der);
+	}
+
+	der.startSequence();
+	der.writeOID(SIGN_ALGS[sig.algo]);
+	if (sig.algo.match(/^rsa-/))
+		der.writeNull();
+	der.endSequence();
+
+	var sigData = sig.signature.toBuffer('asn1');
+	var data = Buffer.alloc(sigData.length + 1);
+	data[0] = 0;
+	sigData.copy(data, 1);
+	der.writeBuffer(data, asn1.Ber.BitString);
+	der.endSequence();
+
+	return (der.buffer);
+}
+
+function writeTBSCert(cert, der) {
+	var sig = cert.signatures.x509;
+	assert.object(sig, 'x509 signature');
+
+	der.startSequence();
+
+	der.startSequence(Local(0));
+	der.writeInt(2);
+	der.endSequence();
+
+	der.writeBuffer(utils.mpNormalize(cert.serial), asn1.Ber.Integer);
+
+	der.startSequence();
+	der.writeOID(SIGN_ALGS[sig.algo]);
+	if (sig.algo.match(/^rsa-/))
+		der.writeNull();
+	der.endSequence();
+
+	cert.issuer.toAsn1(der);
+
+	der.startSequence();
+	der.writeString(dateToUTCTime(cert.validFrom), asn1.Ber.UTCTime);
+	der.writeString(dateToUTCTime(cert.validUntil), asn1.Ber.UTCTime);
+	der.endSequence();
+
+	var subject = cert.subjects[0];
+	var altNames = cert.subjects.slice(1);
+	subject.toAsn1(der);
+
+	pkcs8.writePkcs8(der, cert.subjectKey);
+
+	if (sig.extras && sig.extras.issuerUniqueID) {
+		der.writeBuffer(sig.extras.issuerUniqueID, Local(1));
+	}
+
+	if (sig.extras && sig.extras.subjectUniqueID) {
+		der.writeBuffer(sig.extras.subjectUniqueID, Local(2));
+	}
+
+	if (altNames.length > 0 || subject.type === 'host' ||
+	    (cert.purposes !== undefined && cert.purposes.length > 0) ||
+	    (sig.extras && sig.extras.exts)) {
+		der.startSequence(Local(3));
+		der.startSequence();
+
+		var exts = [];
+		if (cert.purposes !== undefined && cert.purposes.length > 0) {
+			exts.push({
+				oid: EXTS.basicConstraints,
+				critical: true
+			});
+			exts.push({
+				oid: EXTS.keyUsage,
+				critical: true
+			});
+			exts.push({
+				oid: EXTS.extKeyUsage,
+				critical: true
+			});
+		}
+		exts.push({ oid: EXTS.altName });
+		if (sig.extras && sig.extras.exts)
+			exts = sig.extras.exts;
+
+		for (var i = 0; i < exts.length; ++i) {
+			der.startSequence();
+			der.writeOID(exts[i].oid);
+
+			if (exts[i].critical !== undefined)
+				der.writeBoolean(exts[i].critical);
+
+			if (exts[i].oid === EXTS.altName) {
+				der.startSequence(asn1.Ber.OctetString);
+				der.startSequence();
+				if (subject.type === 'host') {
+					der.writeString(subject.hostname,
+					    Context(2));
+				}
+				for (var j = 0; j < altNames.length; ++j) {
+					if (altNames[j].type === 'host') {
+						der.writeString(
+						    altNames[j].hostname,
+						    ALTNAME.DNSName);
+					} else if (altNames[j].type ===
+					    'email') {
+						der.writeString(
+						    altNames[j].email,
+						    ALTNAME.RFC822Name);
+					} else {
+						/*
+						 * Encode anything else as a
+						 * DN style name for now.
+						 */
+						der.startSequence(
+						    ALTNAME.DirectoryName);
+						altNames[j].toAsn1(der);
+						der.endSequence();
+					}
+				}
+				der.endSequence();
+				der.endSequence();
+			} else if (exts[i].oid === EXTS.basicConstraints) {
+				der.startSequence(asn1.Ber.OctetString);
+				der.startSequence();
+				var ca = (cert.purposes.indexOf('ca') !== -1);
+				var pathLen = exts[i].pathLen;
+				der.writeBoolean(ca);
+				if (pathLen !== undefined)
+					der.writeInt(pathLen);
+				der.endSequence();
+				der.endSequence();
+			} else if (exts[i].oid === EXTS.extKeyUsage) {
+				der.startSequence(asn1.Ber.OctetString);
+				der.startSequence();
+				cert.purposes.forEach(function (purpose) {
+					if (purpose === 'ca')
+						return;
+					if (KEYUSEBITS.indexOf(purpose) !== -1)
+						return;
+					var oid = purpose;
+					if (EXTPURPOSE[purpose] !== undefined)
+						oid = EXTPURPOSE[purpose];
+					der.writeOID(oid);
+				});
+				der.endSequence();
+				der.endSequence();
+			} else if (exts[i].oid === EXTS.keyUsage) {
+				der.startSequence(asn1.Ber.OctetString);
+				/*
+				 * If we parsed this certificate from a byte
+				 * stream (i.e. we didn't generate it in sshpk)
+				 * then we'll have a ".bits" property on the
+				 * ext with the original raw byte contents.
+				 *
+				 * If we have this, use it here instead of
+				 * regenerating it. This guarantees we output
+				 * the same data we parsed, so signatures still
+				 * validate.
+				 */
+				if (exts[i].bits !== undefined) {
+					der.writeBuffer(exts[i].bits,
+					    asn1.Ber.BitString);
+				} else {
+					var bits = writeBitField(cert.purposes,
+					    KEYUSEBITS);
+					der.writeBuffer(bits,
+					    asn1.Ber.BitString);
+				}
+				der.endSequence();
+			} else {
+				der.writeBuffer(exts[i].data,
+				    asn1.Ber.OctetString);
+			}
+
+			der.endSequence();
+		}
+
+		der.endSequence();
+		der.endSequence();
+	}
+
+	der.endSequence();
+}
+
+/*
+ * Reads an ASN.1 BER bitfield out of the Buffer produced by doing
+ * `BerReader#readString(asn1.Ber.BitString)`. That function gives us the raw
+ * contents of the BitString tag, which is a count of unused bits followed by
+ * the bits as a right-padded byte string.
+ *
+ * `bits` is the Buffer, `bitIndex` should contain an array of string names
+ * for the bits in the string, ordered starting with bit #0 in the ASN.1 spec.
+ *
+ * Returns an array of Strings, the names of the bits that were set to 1.
+ */
+function readBitField(bits, bitIndex) {
+	var bitLen = 8 * (bits.length - 1) - bits[0];
+	var setBits = {};
+	for (var i = 0; i < bitLen; ++i) {
+		var byteN = 1 + Math.floor(i / 8);
+		var bit = 7 - (i % 8);
+		var mask = 1 << bit;
+		var bitVal = ((bits[byteN] & mask) !== 0);
+		var name = bitIndex[i];
+		if (bitVal && typeof (name) === 'string') {
+			setBits[name] = true;
+		}
+	}
+	return (Object.keys(setBits));
+}
+
+/*
+ * `setBits` is an array of strings, containing the names for each bit that
+ * sould be set to 1. `bitIndex` is same as in `readBitField()`.
+ *
+ * Returns a Buffer, ready to be written out with `BerWriter#writeString()`.
+ */
+function writeBitField(setBits, bitIndex) {
+	var bitLen = bitIndex.length;
+	var blen = Math.ceil(bitLen / 8);
+	var unused = blen * 8 - bitLen;
+	var bits = Buffer.alloc(1 + blen); // zero-filled
+	bits[0] = unused;
+	for (var i = 0; i < bitLen; ++i) {
+		var byteN = 1 + Math.floor(i / 8);
+		var bit = 7 - (i % 8);
+		var mask = 1 << bit;
+		var name = bitIndex[i];
+		if (name === undefined)
+			continue;
+		var bitVal = (setBits.indexOf(name) !== -1);
+		if (bitVal) {
+			bits[byteN] |= mask;
+		}
+	}
+	return (bits);
+}
+
+
+/***/ }),
+/* 458 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+
+/*<replacement>*/
+
+var Buffer = __webpack_require__(45).Buffer;
+/*</replacement>*/
+
+var isEncoding = Buffer.isEncoding || function (encoding) {
+  encoding = '' + encoding;
+  switch (encoding && encoding.toLowerCase()) {
+    case 'hex':case 'utf8':case 'utf-8':case 'ascii':case 'binary':case 'base64':case 'ucs2':case 'ucs-2':case 'utf16le':case 'utf-16le':case 'raw':
+      return true;
+    default:
+      return false;
+  }
+};
+
+function _normalizeEncoding(enc) {
+  if (!enc) return 'utf8';
+  var retried;
+  while (true) {
+    switch (enc) {
+      case 'utf8':
+      case 'utf-8':
+        return 'utf8';
+      case 'ucs2':
+      case 'ucs-2':
+      case 'utf16le':
+      case 'utf-16le':
+        return 'utf16le';
+      case 'latin1':
+      case 'binary':
+        return 'latin1';
+      case 'base64':
+      case 'ascii':
+      case 'hex':
+        return enc;
+      default:
+        if (retried) return; // undefined
+        enc = ('' + enc).toLowerCase();
+        retried = true;
+    }
+  }
+};
+
+// Do not cache `Buffer.isEncoding` when checking encoding names as some
+// modules monkey-patch it to support additional encodings
+function normalizeEncoding(enc) {
+  var nenc = _normalizeEncoding(enc);
+  if (typeof nenc !== 'string' && (Buffer.isEncoding === isEncoding || !isEncoding(enc))) throw new Error('Unknown encoding: ' + enc);
+  return nenc || enc;
+}
+
+// StringDecoder provides an interface for efficiently splitting a series of
+// buffers into a series of JS strings without breaking apart multi-byte
+// characters.
+exports.StringDecoder = StringDecoder;
+function StringDecoder(encoding) {
+  this.encoding = normalizeEncoding(encoding);
+  var nb;
+  switch (this.encoding) {
+    case 'utf16le':
+      this.text = utf16Text;
+      this.end = utf16End;
+      nb = 4;
+      break;
+    case 'utf8':
+      this.fillLast = utf8FillLast;
+      nb = 4;
+      break;
+    case 'base64':
+      this.text = base64Text;
+      this.end = base64End;
+      nb = 3;
+      break;
+    default:
+      this.write = simpleWrite;
+      this.end = simpleEnd;
+      return;
+  }
+  this.lastNeed = 0;
+  this.lastTotal = 0;
+  this.lastChar = Buffer.allocUnsafe(nb);
+}
+
+StringDecoder.prototype.write = function (buf) {
+  if (buf.length === 0) return '';
+  var r;
+  var i;
+  if (this.lastNeed) {
+    r = this.fillLast(buf);
+    if (r === undefined) return '';
+    i = this.lastNeed;
+    this.lastNeed = 0;
+  } else {
+    i = 0;
+  }
+  if (i < buf.length) return r ? r + this.text(buf, i) : this.text(buf, i);
+  return r || '';
+};
+
+StringDecoder.prototype.end = utf8End;
+
+// Returns only complete characters in a Buffer
+StringDecoder.prototype.text = utf8Text;
+
+// Attempts to complete a partial non-UTF-8 character using bytes from a Buffer
+StringDecoder.prototype.fillLast = function (buf) {
+  if (this.lastNeed <= buf.length) {
+    buf.copy(this.lastChar, this.lastTotal - this.lastNeed, 0, this.lastNeed);
+    return this.lastChar.toString(this.encoding, 0, this.lastTotal);
+  }
+  buf.copy(this.lastChar, this.lastTotal - this.lastNeed, 0, buf.length);
+  this.lastNeed -= buf.length;
+};
+
+// Checks the type of a UTF-8 byte, whether it's ASCII, a leading byte, or a
+// continuation byte. If an invalid byte is detected, -2 is returned.
+function utf8CheckByte(byte) {
+  if (byte <= 0x7F) return 0;else if (byte >> 5 === 0x06) return 2;else if (byte >> 4 === 0x0E) return 3;else if (byte >> 3 === 0x1E) return 4;
+  return byte >> 6 === 0x02 ? -1 : -2;
+}
+
+// Checks at most 3 bytes at the end of a Buffer in order to detect an
+// incomplete multi-byte UTF-8 character. The total number of bytes (2, 3, or 4)
+// needed to complete the UTF-8 character (if applicable) are returned.
+function utf8CheckIncomplete(self, buf, i) {
+  var j = buf.length - 1;
+  if (j < i) return 0;
+  var nb = utf8CheckByte(buf[j]);
+  if (nb >= 0) {
+    if (nb > 0) self.lastNeed = nb - 1;
+    return nb;
+  }
+  if (--j < i || nb === -2) return 0;
+  nb = utf8CheckByte(buf[j]);
+  if (nb >= 0) {
+    if (nb > 0) self.lastNeed = nb - 2;
+    return nb;
+  }
+  if (--j < i || nb === -2) return 0;
+  nb = utf8CheckByte(buf[j]);
+  if (nb >= 0) {
+    if (nb > 0) {
+      if (nb === 2) nb = 0;else self.lastNeed = nb - 3;
+    }
+    return nb;
+  }
+  return 0;
+}
+
+// Validates as many continuation bytes for a multi-byte UTF-8 character as
+// needed or are available. If we see a non-continuation byte where we expect
+// one, we "replace" the validated continuation bytes we've seen so far with
+// a single UTF-8 replacement character ('\ufffd'), to match v8's UTF-8 decoding
+// behavior. The continuation byte check is included three times in the case
+// where all of the continuation bytes for a character exist in the same buffer.
+// It is also done this way as a slight performance increase instead of using a
+// loop.
+function utf8CheckExtraBytes(self, buf, p) {
+  if ((buf[0] & 0xC0) !== 0x80) {
+    self.lastNeed = 0;
+    return '\ufffd';
+  }
+  if (self.lastNeed > 1 && buf.length > 1) {
+    if ((buf[1] & 0xC0) !== 0x80) {
+      self.lastNeed = 1;
+      return '\ufffd';
+    }
+    if (self.lastNeed > 2 && buf.length > 2) {
+      if ((buf[2] & 0xC0) !== 0x80) {
+        self.lastNeed = 2;
+        return '\ufffd';
+      }
+    }
+  }
+}
+
+// Attempts to complete a multi-byte UTF-8 character using bytes from a Buffer.
+function utf8FillLast(buf) {
+  var p = this.lastTotal - this.lastNeed;
+  var r = utf8CheckExtraBytes(this, buf, p);
+  if (r !== undefined) return r;
+  if (this.lastNeed <= buf.length) {
+    buf.copy(this.lastChar, p, 0, this.lastNeed);
+    return this.lastChar.toString(this.encoding, 0, this.lastTotal);
+  }
+  buf.copy(this.lastChar, p, 0, buf.length);
+  this.lastNeed -= buf.length;
+}
+
+// Returns all complete UTF-8 characters in a Buffer. If the Buffer ended on a
+// partial character, the character's bytes are buffered until the required
+// number of bytes are available.
+function utf8Text(buf, i) {
+  var total = utf8CheckIncomplete(this, buf, i);
+  if (!this.lastNeed) return buf.toString('utf8', i);
+  this.lastTotal = total;
+  var end = buf.length - (total - this.lastNeed);
+  buf.copy(this.lastChar, 0, end);
+  return buf.toString('utf8', i, end);
+}
+
+// For UTF-8, a replacement character is added when ending on a partial
+// character.
+function utf8End(buf) {
+  var r = buf && buf.length ? this.write(buf) : '';
+  if (this.lastNeed) return r + '\ufffd';
+  return r;
+}
+
+// UTF-16LE typically needs two bytes per character, but even if we have an even
+// number of bytes available, we need to check if we end on a leading/high
+// surrogate. In that case, we need to wait for the next two bytes in order to
+// decode the last character properly.
+function utf16Text(buf, i) {
+  if ((buf.length - i) % 2 === 0) {
+    var r = buf.toString('utf16le', i);
+    if (r) {
+      var c = r.charCodeAt(r.length - 1);
+      if (c >= 0xD800 && c <= 0xDBFF) {
+        this.lastNeed = 2;
+        this.lastTotal = 4;
+        this.lastChar[0] = buf[buf.length - 2];
+        this.lastChar[1] = buf[buf.length - 1];
+        return r.slice(0, -1);
+      }
+    }
+    return r;
+  }
+  this.lastNeed = 1;
+  this.lastTotal = 2;
+  this.lastChar[0] = buf[buf.length - 1];
+  return buf.toString('utf16le', i, buf.length - 1);
+}
+
+// For UTF-16LE we do not explicitly append special replacement characters if we
+// end on a partial character, we simply let v8 handle that.
+function utf16End(buf) {
+  var r = buf && buf.length ? this.write(buf) : '';
+  if (this.lastNeed) {
+    var end = this.lastTotal - this.lastNeed;
+    return r + this.lastChar.toString('utf16le', 0, end);
+  }
+  return r;
+}
+
+function base64Text(buf, i) {
+  var n = (buf.length - i) % 3;
+  if (n === 0) return buf.toString('base64', i);
+  this.lastNeed = 3 - n;
+  this.lastTotal = 3;
+  if (n === 1) {
+    this.lastChar[0] = buf[buf.length - 1];
+  } else {
+    this.lastChar[0] = buf[buf.length - 2];
+    this.lastChar[1] = buf[buf.length - 1];
+  }
+  return buf.toString('base64', i, buf.length - n);
+}
+
+function base64End(buf) {
+  var r = buf && buf.length ? this.write(buf) : '';
+  if (this.lastNeed) return r + this.lastChar.toString('base64', 0, 3 - this.lastNeed);
+  return r;
+}
+
+// Pass bytes on through for single-byte encodings (e.g. ascii, latin1, hex)
+function simpleWrite(buf) {
+  return buf.toString(this.encoding);
+}
+
+function simpleEnd(buf) {
+  return buf && buf.length ? this.write(buf) : '';
+}
+
+/***/ }),
+/* 459 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var toBuffer = __webpack_require__(462)
+var alloc = __webpack_require__(380)
+
+var ZEROS = '0000000000000000000'
+var SEVENS = '7777777777777777777'
+var ZERO_OFFSET = '0'.charCodeAt(0)
+var USTAR = 'ustar\x0000'
+var MASK = parseInt('7777', 8)
+
+var clamp = function (index, len, defaultValue) {
+  if (typeof index !== 'number') return defaultValue
+  index = ~~index // Coerce to integer.
+  if (index >= len) return len
+  if (index >= 0) return index
+  index += len
+  if (index >= 0) return index
+  return 0
+}
+
+var toType = function (flag) {
+  switch (flag) {
+    case 0:
+      return 'file'
+    case 1:
+      return 'link'
+    case 2:
+      return 'symlink'
+    case 3:
+      return 'character-device'
+    case 4:
+      return 'block-device'
+    case 5:
+      return 'directory'
+    case 6:
+      return 'fifo'
+    case 7:
+      return 'contiguous-file'
+    case 72:
+      return 'pax-header'
+    case 55:
+      return 'pax-global-header'
+    case 27:
+      return 'gnu-long-link-path'
+    case 28:
+    case 30:
+      return 'gnu-long-path'
+  }
+
+  return null
+}
+
+var toTypeflag = function (flag) {
+  switch (flag) {
+    case 'file':
+      return 0
+    case 'link':
+      return 1
+    case 'symlink':
+      return 2
+    case 'character-device':
+      return 3
+    case 'block-device':
+      return 4
+    case 'directory':
+      return 5
+    case 'fifo':
+      return 6
+    case 'contiguous-file':
+      return 7
+    case 'pax-header':
+      return 72
+  }
+
+  return 0
+}
+
+var indexOf = function (block, num, offset, end) {
+  for (; offset < end; offset++) {
+    if (block[offset] === num) return offset
+  }
+  return end
+}
+
+var cksum = function (block) {
+  var sum = 8 * 32
+  for (var i = 0; i < 148; i++) sum += block[i]
+  for (var j = 156; j < 512; j++) sum += block[j]
+  return sum
+}
+
+var encodeOct = function (val, n) {
+  val = val.toString(8)
+  if (val.length > n) return SEVENS.slice(0, n) + ' '
+  else return ZEROS.slice(0, n - val.length) + val + ' '
+}
+
+/* Copied from the node-tar repo and modified to meet
+ * tar-stream coding standard.
+ *
+ * Source: https://github.com/npm/node-tar/blob/51b6627a1f357d2eb433e7378e5f05e83b7aa6cd/lib/header.js#L349
+ */
+function parse256 (buf) {
+  // first byte MUST be either 80 or FF
+  // 80 for positive, FF for 2's comp
+  var positive
+  if (buf[0] === 0x80) positive = true
+  else if (buf[0] === 0xFF) positive = false
+  else return null
+
+  // build up a base-256 tuple from the least sig to the highest
+  var zero = false
+  var tuple = []
+  for (var i = buf.length - 1; i > 0; i--) {
+    var byte = buf[i]
+    if (positive) tuple.push(byte)
+    else if (zero && byte === 0) tuple.push(0)
+    else if (zero) {
+      zero = false
+      tuple.push(0x100 - byte)
+    } else tuple.push(0xFF - byte)
+  }
+
+  var sum = 0
+  var l = tuple.length
+  for (i = 0; i < l; i++) {
+    sum += tuple[i] * Math.pow(256, i)
+  }
+
+  return positive ? sum : -1 * sum
+}
+
+var decodeOct = function (val, offset, length) {
+  val = val.slice(offset, offset + length)
+  offset = 0
+
+  // If prefixed with 0x80 then parse as a base-256 integer
+  if (val[offset] & 0x80) {
+    return parse256(val)
+  } else {
+    // Older versions of tar can prefix with spaces
+    while (offset < val.length && val[offset] === 32) offset++
+    var end = clamp(indexOf(val, 32, offset, val.length), val.length, val.length)
+    while (offset < end && val[offset] === 0) offset++
+    if (end === offset) return 0
+    return parseInt(val.slice(offset, end).toString(), 8)
+  }
+}
+
+var decodeStr = function (val, offset, length, encoding) {
+  return val.slice(offset, indexOf(val, 0, offset, offset + length)).toString(encoding)
+}
+
+var addLength = function (str) {
+  var len = Buffer.byteLength(str)
+  var digits = Math.floor(Math.log(len) / Math.log(10)) + 1
+  if (len + digits >= Math.pow(10, digits)) digits++
+
+  return (len + digits) + str
+}
+
+exports.decodeLongPath = function (buf, encoding) {
+  return decodeStr(buf, 0, buf.length, encoding)
+}
+
+exports.encodePax = function (opts) { // TODO: encode more stuff in pax
+  var result = ''
+  if (opts.name) result += addLength(' path=' + opts.name + '\n')
+  if (opts.linkname) result += addLength(' linkpath=' + opts.linkname + '\n')
+  var pax = opts.pax
+  if (pax) {
+    for (var key in pax) {
+      result += addLength(' ' + key + '=' + pax[key] + '\n')
+    }
+  }
+  return toBuffer(result)
+}
+
+exports.decodePax = function (buf) {
+  var result = {}
+
+  while (buf.length) {
+    var i = 0
+    while (i < buf.length && buf[i] !== 32) i++
+    var len = parseInt(buf.slice(0, i).toString(), 10)
+    if (!len) return result
+
+    var b = buf.slice(i + 1, len - 1).toString()
+    var keyIndex = b.indexOf('=')
+    if (keyIndex === -1) return result
+    result[b.slice(0, keyIndex)] = b.slice(keyIndex + 1)
+
+    buf = buf.slice(len)
+  }
+
+  return result
+}
+
+exports.encode = function (opts) {
+  var buf = alloc(512)
+  var name = opts.name
+  var prefix = ''
+
+  if (opts.typeflag === 5 && name[name.length - 1] !== '/') name += '/'
+  if (Buffer.byteLength(name) !== name.length) return null // utf-8
+
+  while (Buffer.byteLength(name) > 100) {
+    var i = name.indexOf('/')
+    if (i === -1) return null
+    prefix += prefix ? '/' + name.slice(0, i) : name.slice(0, i)
+    name = name.slice(i + 1)
+  }
+
+  if (Buffer.byteLength(name) > 100 || Buffer.byteLength(prefix) > 155) return null
+  if (opts.linkname && Buffer.byteLength(opts.linkname) > 100) return null
+
+  buf.write(name)
+  buf.write(encodeOct(opts.mode & MASK, 6), 100)
+  buf.write(encodeOct(opts.uid, 6), 108)
+  buf.write(encodeOct(opts.gid, 6), 116)
+  buf.write(encodeOct(opts.size, 11), 124)
+  buf.write(encodeOct((opts.mtime.getTime() / 1000) | 0, 11), 136)
+
+  buf[156] = ZERO_OFFSET + toTypeflag(opts.type)
+
+  if (opts.linkname) buf.write(opts.linkname, 157)
+
+  buf.write(USTAR, 257)
+  if (opts.uname) buf.write(opts.uname, 265)
+  if (opts.gname) buf.write(opts.gname, 297)
+  buf.write(encodeOct(opts.devmajor || 0, 6), 329)
+  buf.write(encodeOct(opts.devminor || 0, 6), 337)
+
+  if (prefix) buf.write(prefix, 345)
+
+  buf.write(encodeOct(cksum(buf), 6), 148)
+
+  return buf
+}
+
+exports.decode = function (buf, filenameEncoding) {
+  var typeflag = buf[156] === 0 ? 0 : buf[156] - ZERO_OFFSET
+
+  var name = decodeStr(buf, 0, 100, filenameEncoding)
+  var mode = decodeOct(buf, 100, 8)
+  var uid = decodeOct(buf, 108, 8)
+  var gid = decodeOct(buf, 116, 8)
+  var size = decodeOct(buf, 124, 12)
+  var mtime = decodeOct(buf, 136, 12)
+  var type = toType(typeflag)
+  var linkname = buf[157] === 0 ? null : decodeStr(buf, 157, 100, filenameEncoding)
+  var uname = decodeStr(buf, 265, 32)
+  var gname = decodeStr(buf, 297, 32)
+  var devmajor = decodeOct(buf, 329, 8)
+  var devminor = decodeOct(buf, 337, 8)
+
+  if (buf[345]) name = decodeStr(buf, 345, 155, filenameEncoding) + '/' + name
+
+  // to support old tar versions that use trailing / to indicate dirs
+  if (typeflag === 0 && name && name[name.length - 1] === '/') typeflag = 5
+
+  var c = cksum(buf)
+
+  // checksum is still initial value if header was null.
+  if (c === 8 * 32) return null
+
+  // valid checksum
+  if (c !== decodeOct(buf, 148, 8)) throw new Error('Invalid tar header. Maybe the tar is corrupted or it needs to be gunzipped?')
+
+  return {
+    name: name,
+    mode: mode,
+    uid: uid,
+    gid: gid,
+    size: size,
+    mtime: new Date(1000 * mtime),
+    type: type,
+    linkname: linkname,
+    uname: uname,
+    gname: gname,
+    devmajor: devmajor,
+    devminor: devminor
+  }
+}
+
+
+/***/ }),
+/* 460 */
+/***/ (function(module, exports, __webpack_require__) {
+
+exports.extract = __webpack_require__(949)
+exports.pack = __webpack_require__(950)
+
+
+/***/ }),
+/* 461 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var Transform = __webpack_require__(794)
+  , inherits  = __webpack_require__(3).inherits
+  , xtend     = __webpack_require__(465)
+
+function DestroyableTransform(opts) {
+  Transform.call(this, opts)
+  this._destroyed = false
+}
+
+inherits(DestroyableTransform, Transform)
+
+DestroyableTransform.prototype.destroy = function(err) {
+  if (this._destroyed) return
+  this._destroyed = true
+  
+  var self = this
+  process.nextTick(function() {
+    if (err)
+      self.emit('error', err)
+    self.emit('close')
+  })
+}
+
+// a noop _transform function
+function noop (chunk, enc, callback) {
+  callback(null, chunk)
+}
+
+
+// create a new export function, used by both the main export and
+// the .ctor export, contains common logic for dealing with arguments
+function through2 (construct) {
+  return function (options, transform, flush) {
+    if (typeof options == 'function') {
+      flush     = transform
+      transform = options
+      options   = {}
+    }
+
+    if (typeof transform != 'function')
+      transform = noop
+
+    if (typeof flush != 'function')
+      flush = null
+
+    return construct(options, transform, flush)
+  }
+}
+
+
+// main export, just make me a transform stream!
+module.exports = through2(function (options, transform, flush) {
+  var t2 = new DestroyableTransform(options)
+
+  t2._transform = transform
+
+  if (flush)
+    t2._flush = flush
+
+  return t2
+})
+
+
+// make me a reusable prototype that I can `new`, or implicitly `new`
+// with a constructor call
+module.exports.ctor = through2(function (options, transform, flush) {
+  function Through2 (override) {
+    if (!(this instanceof Through2))
+      return new Through2(override)
+
+    this.options = xtend(options, override)
+
+    DestroyableTransform.call(this, this.options)
+  }
+
+  inherits(Through2, DestroyableTransform)
+
+  Through2.prototype._transform = transform
+
+  if (flush)
+    Through2.prototype._flush = flush
+
+  return Through2
+})
+
+
+module.exports.obj = through2(function (options, transform, flush) {
+  var t2 = new DestroyableTransform(xtend({ objectMode: true, highWaterMark: 16 }, options))
+
+  t2._transform = transform
+
+  if (flush)
+    t2._flush = flush
+
+  return t2
+})
+
+
+/***/ }),
+/* 462 */
+/***/ (function(module, exports) {
+
+module.exports = toBuffer
+
+var makeBuffer = Buffer.from && Buffer.from !== Uint8Array.from ? Buffer.from : bufferFrom
+
+function bufferFrom (buf, enc) {
+  return new Buffer(buf, enc)
+}
+
+function toBuffer (buf, enc) {
+  if (Buffer.isBuffer(buf)) return buf
+  if (typeof buf === 'string') return makeBuffer(buf, enc)
+  if (Array.isArray(buf)) return makeBuffer(buf)
+  throw new Error('Input should be a buffer or a string')
+}
+
+
+/***/ }),
+/* 463 */
+/***/ (function(module, exports) {
+
+/**
+ * Convert array of 16 byte values to UUID string format of the form:
+ * XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
+ */
+var byteToHex = [];
+for (var i = 0; i < 256; ++i) {
+  byteToHex[i] = (i + 0x100).toString(16).substr(1);
+}
+
+function bytesToUuid(buf, offset) {
+  var i = offset || 0;
+  var bth = byteToHex;
+  // join used to fix memory issue caused by concatenation: https://bugs.chromium.org/p/v8/issues/detail?id=3175#c4
+  return ([bth[buf[i++]], bth[buf[i++]], 
+	bth[buf[i++]], bth[buf[i++]], '-',
+	bth[buf[i++]], bth[buf[i++]], '-',
+	bth[buf[i++]], bth[buf[i++]], '-',
+	bth[buf[i++]], bth[buf[i++]], '-',
+	bth[buf[i++]], bth[buf[i++]],
+	bth[buf[i++]], bth[buf[i++]],
+	bth[buf[i++]], bth[buf[i++]]]).join('');
+}
+
+module.exports = bytesToUuid;
+
+
+/***/ }),
+/* 464 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// Unique ID creation requires a high quality random # generator.  In node.js
+// this is pretty straight-forward - we use the crypto API.
+
+var crypto = __webpack_require__(11);
+
+module.exports = function nodeRNG() {
+  return crypto.randomBytes(16);
+};
+
+
+/***/ }),
+/* 465 */
+/***/ (function(module, exports) {
+
+module.exports = extend
+
+var hasOwnProperty = Object.prototype.hasOwnProperty;
+
+function extend() {
+    var target = {}
+
+    for (var i = 0; i < arguments.length; i++) {
+        var source = arguments[i]
+
+        for (var key in source) {
+            if (hasOwnProperty.call(source, key)) {
+                target[key] = source[key]
+            }
+        }
+    }
+
+    return target
+}
+
+
+/***/ }),
+/* 466 */
+/***/ (function(module, exports) {
+
+module.exports = require("constants");
+
+/***/ }),
+/* 467 */
+/***/ (function(module, exports) {
+
+module.exports = require("tls");
+
+/***/ }),
+/* 468 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = handleSignals;
+
+var _child;
+
+function _load_child() {
+  return _child = __webpack_require__(58);
+}
+
+function forwardSignalAndExit(signal) {
+  (0, (_child || _load_child()).forwardSignalToSpawnedProcesses)(signal);
+  // We want to exit immediately here since `SIGTERM` means that
+  // If we lose stdout messages due to abrupt exit, shoot the messenger?
+  process.exit(1); // eslint-disable-line no-process-exit
+}
+function handleSignals() {
+  process.on('SIGTERM', () => {
+    forwardSignalAndExit('SIGTERM');
+  });
+}
+
+/***/ }),
+/* 469 */
+/***/ (function(module, exports) {
+
+
+var defaultConfig = {
+  uncaughtException: false,
+  SIGINT: true,
+  SIGTERM: true,
+  SIGQUIT: true
+}
+
+var DEBUG = false
+
+function ON_DEATH (callback) {
+  var handlers = [];
+  Object.keys(defaultConfig).forEach(function(key) {
+    var val = defaultConfig[key]
+    var handler = null;
+    if (val) {
+      if (DEBUG) {
+        handler = function() {
+          var args = Array.prototype.slice.call(arguments, 0)
+          args.unshift(key)
+          console.log('Trapped ' + key)
+          callback.apply(null, args)
+        };
+        process.on(key, handler)
+      } else {
+        handler = function() {
+          var args = Array.prototype.slice.call(arguments, 0)
+          args.unshift(key)
+          callback.apply(null, args)
+        }
+        process.on(key, handler)
+      }
+      handlers.push([key, handler])
+    }
+  })
+  return function OFF_DEATH() {
+    handlers.forEach(function (args) {
+      var key = args[0];
+      var handler = args[1];
+      process.removeListener(key, handler);
+    })
+  }
+}
+
+module.exports = function (arg) {
+  if (typeof arg === 'object') {
+    if (arg['debug'])
+      DEBUG = arg.debug
+    if (arg['DEBUG'])
+      DEBUG = arg.DEBUG
+    delete arg.debug; delete arg.DEBUG;
+
+    Object.keys(arg).forEach(function(key) {
+      defaultConfig[key] = arg[key]
+    })
+
+    if (DEBUG)
+      console.log('ON_DEATH: debug mode enabled for pid [%d]', process.pid)
+
+    return ON_DEATH
+   } else if (typeof arg === 'function') {
+    return ON_DEATH(arg)
+  }
+}
+
+
+
+/***/ }),
+/* 470 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var util = __webpack_require__(3);
+var onExit = __webpack_require__(451);
+var currentlyUnhandled = __webpack_require__(629);
+
+var installed = false;
+
+module.exports = function (log) {
+	if (installed) {
+		return;
+	}
+
+	installed = true;
+
+	log = log || console.error;
+
+	var listUnhandled = currentlyUnhandled();
+
+	onExit(function () {
+		var unhandledRejections = listUnhandled();
+
+		if (unhandledRejections.length > 0) {
+			unhandledRejections.forEach(function (x) {
+				var err = x.reason;
+
+				if (!(err instanceof Error)) {
+					err = new Error('Promise rejected with value: ' + util.inspect(err));
+				}
+
+				log(err.stack);
+			});
+
+			process.exitCode = 1;
+		}
+	});
+};
+
+
+/***/ }),
+/* 471 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+const fs = __webpack_require__(391);
+const path = __webpack_require__(0);
+const retry = __webpack_require__(819);
+const syncFs = __webpack_require__(779);
+
+const locks = {};
+
+function getLockFile(file) {
+    return `${file}.lock`;
+}
+
+function canonicalPath(file, options, callback) {
+    if (!options.realpath) {
+        return callback(null, path.resolve(file));
+    }
+
+    // Use realpath to resolve symlinks
+    // It also resolves relative paths
+    options.fs.realpath(file, callback);
+}
+
+function acquireLock(file, options, callback) {
+    // Use mkdir to create the lockfile (atomic operation)
+    options.fs.mkdir(getLockFile(file), (err) => {
+        // If successful, we are done
+        if (!err) {
+            return callback();
+        }
+
+        // If error is not EEXIST then some other error occurred while locking
+        if (err.code !== 'EEXIST') {
+            return callback(err);
+        }
+
+        // Otherwise, check if lock is stale by analyzing the file mtime
+        if (options.stale <= 0) {
+            return callback(Object.assign(new Error('Lock file is already being hold'), { code: 'ELOCKED', file }));
+        }
+
+        options.fs.stat(getLockFile(file), (err, stat) => {
+            if (err) {
+                // Retry if the lockfile has been removed (meanwhile)
+                // Skip stale check to avoid recursiveness
+                if (err.code === 'ENOENT') {
+                    return acquireLock(file, Object.assign({}, options, { stale: 0 }), callback);
+                }
+
+                return callback(err);
+            }
+
+            if (!isLockStale(stat, options)) {
+                return callback(Object.assign(new Error('Lock file is already being hold'), { code: 'ELOCKED', file }));
+            }
+
+            // If it's stale, remove it and try again!
+            // Skip stale check to avoid recursiveness
+            removeLock(file, options, (err) => {
+                if (err) {
+                    return callback(err);
+                }
+
+                acquireLock(file, Object.assign({}, options, { stale: 0 }), callback);
+            });
+        });
+    });
+}
+
+function isLockStale(stat, options) {
+    return stat.mtime.getTime() < Date.now() - options.stale;
+}
+
+function removeLock(file, options, callback) {
+    // Remove lockfile, ignoring ENOENT errors
+    options.fs.rmdir(getLockFile(file), (err) => {
+        if (err && err.code !== 'ENOENT') {
+            return callback(err);
+        }
+
+        callback();
+    });
+}
+
+function updateLock(file, options) {
+    const lock = locks[file];
+
+    /* istanbul ignore next */
+    if (lock.updateTimeout) {
+        return;
+    }
+
+    lock.updateDelay = lock.updateDelay || options.update;
+    lock.updateTimeout = setTimeout(() => {
+        const mtime = Date.now() / 1000;
+
+        lock.updateTimeout = null;
+
+        options.fs.utimes(getLockFile(file), mtime, mtime, (err) => {
+            // Ignore if the lock was released
+            if (lock.released) {
+                return;
+            }
+
+            // Verify if we are within the stale threshold
+            if (lock.lastUpdate <= Date.now() - options.stale &&
+                lock.lastUpdate > Date.now() - options.stale * 2) {
+                return compromisedLock(file, lock, Object.assign(new Error(lock.updateError || 'Unable to update lock within the stale \
+threshold'), { code: 'ECOMPROMISED' }));
+            }
+
+            // If the file is older than (stale * 2), we assume the clock is moved manually,
+            // which we consider a valid case
+
+            // If it failed to update the lockfile, keep trying unless
+            // the lockfile was deleted!
+            if (err) {
+                if (err.code === 'ENOENT') {
+                    return compromisedLock(file, lock, Object.assign(err, { code: 'ECOMPROMISED' }));
+                }
+
+                lock.updateError = err;
+                lock.updateDelay = 1000;
+                return updateLock(file, options);
+            }
+
+            // All ok, keep updating..
+            lock.lastUpdate = Date.now();
+            lock.updateError = null;
+            lock.updateDelay = null;
+            updateLock(file, options);
+        });
+    }, lock.updateDelay);
+
+    // Unref the timer so that the nodejs process can exit freely
+    // This is safe because all acquired locks will be automatically released
+    // on process exit
+
+    // We first check that `lock.updateTimeout.unref` exists because some users
+    // may be using this module outside of NodeJS (e.g., in an electron app), 
+    // and in those cases `setTimeout` return an integer.
+    if (lock.updateTimeout.unref) {
+        lock.updateTimeout.unref();
+    }
+}
+
+function compromisedLock(file, lock, err) {
+    lock.released = true;                                    // Signal the lock has been released
+    /* istanbul ignore next */
+    lock.updateTimeout && clearTimeout(lock.updateTimeout);  // Cancel lock mtime update
+
+    if (locks[file] === lock) {
+        delete locks[file];
+    }
+
+    lock.compromised(err);
+}
+
+// -----------------------------------------
+
+function lock(file, options, compromised, callback) {
+    if (typeof options === 'function') {
+        callback = compromised;
+        compromised = options;
+        options = null;
+    }
+
+    if (!callback) {
+        callback = compromised;
+        compromised = null;
+    }
+
+    options = Object.assign({
+        stale: 10000,
+        update: null,
+        realpath: true,
+        retries: 0,
+        fs,
+    }, options);
+
+    options.retries = options.retries || 0;
+    options.retries = typeof options.retries === 'number' ? { retries: options.retries } : options.retries;
+    options.stale = Math.max(options.stale || 0, 2000);
+    options.update = options.update == null ? options.stale / 2 : options.update || 0;
+    options.update = Math.max(Math.min(options.update, options.stale / 2), 1000);
+    compromised = compromised || function (err) { throw err; };
+
+    // Resolve to a canonical file path
+    canonicalPath(file, options, (err, file) => {
+        if (err) {
+            return callback(err);
+        }
+
+        // Attempt to acquire the lock
+        const operation = retry.operation(options.retries);
+
+        operation.attempt(() => {
+            acquireLock(file, options, (err) => {
+                if (operation.retry(err)) {
+                    return;
+                }
+
+                if (err) {
+                    return callback(operation.mainError());
+                }
+
+                // We now own the lock
+                const lock = locks[file] = {
+                    options,
+                    compromised,
+                    lastUpdate: Date.now(),
+                };
+
+                // We must keep the lock fresh to avoid staleness
+                updateLock(file, options);
+
+                callback(null, (releasedCallback) => {
+                    if (lock.released) {
+                        return releasedCallback &&
+                            releasedCallback(Object.assign(new Error('Lock is already released'), { code: 'ERELEASED' }));
+                    }
+
+                    // Not necessary to use realpath twice when unlocking
+                    unlock(file, Object.assign({}, options, { realpath: false }), releasedCallback);
+                });
+            });
+        });
+    });
+}
+
+function unlock(file, options, callback) {
+    if (typeof options === 'function') {
+        callback = options;
+        options = null;
+    }
+
+    options = Object.assign({
+        fs,
+        realpath: true,
+    }, options);
+
+    callback = callback || function () {};
+
+    // Resolve to a canonical file path
+    canonicalPath(file, options, (err, file) => {
+        if (err) {
+            return callback(err);
+        }
+
+        // Skip if the lock is not acquired
+        const lock = locks[file];
+
+        if (!lock) {
+            return callback(Object.assign(new Error('Lock is not acquired/owned by you'), { code: 'ENOTACQUIRED' }));
+        }
+
+        lock.updateTimeout && clearTimeout(lock.updateTimeout);  // Cancel lock mtime update
+        lock.released = true;                                    // Signal the lock has been released
+        delete locks[file];                                      // Delete from locks
+
+        removeLock(file, options, callback);
+    });
+}
+
+function lockSync(file, options, compromised) {
+    if (typeof options === 'function') {
+        compromised = options;
+        options = null;
+    }
+
+    options = options || {};
+    options.fs = syncFs(options.fs || fs);
+    options.retries = options.retries || 0;
+    options.retries = typeof options.retries === 'number' ? { retries: options.retries } : options.retries;
+
+    // Retries are not allowed because it requires the flow to be sync
+    if (options.retries.retries) {
+        throw Object.assign(new Error('Cannot use retries with the sync api'), { code: 'ESYNC' });
+    }
+
+    let err;
+    let release;
+
+    lock(file, options, compromised, (_err, _release) => {
+        err = _err;
+        release = _release;
+    });
+
+    if (err) {
+        throw err;
+    }
+
+    return release;
+}
+
+function unlockSync(file, options) {
+    options = options || {};
+    options.fs = syncFs(options.fs || fs);
+
+    let err;
+
+    unlock(file, options, (_err) => {
+        err = _err;
+    });
+
+    if (err) {
+        throw err;
+    }
+}
+
+function check(file, options, callback) {
+    if (typeof options === 'function') {
+        callback = options;
+        options = null;
+    }
+
+    options = Object.assign({
+        stale: 10000,
+        realpath: true,
+        fs,
+    }, options);
+
+    options.stale = Math.max(options.stale || 0, 2000);
+
+    // Resolve to a canonical file path
+    canonicalPath(file, options, (err, file) => {
+        if (err) {
+            return callback(err);
+        }
+
+        // Check if lockfile exists
+        options.fs.stat(getLockFile(file), (err, stat) => {
+            if (err) {
+                // if does not exist, file is not locked. Otherwise, callback with error
+                return (err.code === 'ENOENT') ? callback(null, false) : callback(err);
+            }
+
+            if (options.stale <= 0) { return callback(null, true); }
+
+            // Otherwise, check if lock is stale by analyzing the file mtime
+            return callback(null, !isLockStale(stat, options));
+        });
+    });
+}
+
+function checkSync(file, options) {
+    options = options || {};
+    options.fs = syncFs(options.fs || fs);
+
+    let err;
+    let locked;
+
+    check(file, options, (_err, _locked) => {
+        err = _err;
+        locked = _locked;
+    });
+
+    if (err) {
+        throw err;
+    }
+
+    return locked;
+}
+
+
+// Remove acquired locks on exit
+/* istanbul ignore next */
+process.on('exit', () => {
+    Object.keys(locks).forEach((file) => {
+        try { locks[file].options.fs.rmdirSync(getLockFile(file)); } catch (e) { /* empty */ }
+    });
+});
+
+module.exports = lock;
+module.exports.lock = lock;
+module.exports.unlock = unlock;
+module.exports.lockSync = lockSync;
+module.exports.unlockSync = unlockSync;
+module.exports.check = check;
+module.exports.checkSync = checkSync;
+
+
+/***/ }),
+/* 472 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var KEYWORDS = [
+  'multipleOf',
+  'maximum',
+  'exclusiveMaximum',
+  'minimum',
+  'exclusiveMinimum',
+  'maxLength',
+  'minLength',
+  'pattern',
+  'additionalItems',
+  'maxItems',
+  'minItems',
+  'uniqueItems',
+  'maxProperties',
+  'minProperties',
+  'required',
+  'additionalProperties',
+  'enum',
+  'format',
+  'const'
+];
+
+module.exports = function (metaSchema, keywordsJsonPointers) {
+  for (var i=0; i<keywordsJsonPointers.length; i++) {
+    metaSchema = JSON.parse(JSON.stringify(metaSchema));
+    var segments = keywordsJsonPointers[i].split('/');
+    var keywords = metaSchema;
+    var j;
+    for (j=1; j<segments.length; j++)
+      keywords = keywords[segments[j]];
+
+    for (j=0; j<KEYWORDS.length; j++) {
+      var key = KEYWORDS[j];
+      var schema = keywords[key];
+      if (schema) {
+        keywords[key] = {
+          anyOf: [
+            schema,
+            { $ref: 'https://raw.githubusercontent.com/epoberezkin/ajv/master/lib/refs/$data.json#' }
+          ]
+        };
+      }
+    }
+  }
+
+  return metaSchema;
+};
+
+
+/***/ }),
+/* 473 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var compileSchema = __webpack_require__(478)
+  , resolve = __webpack_require__(203)
+  , Cache = __webpack_require__(474)
+  , SchemaObject = __webpack_require__(339)
+  , stableStringify = __webpack_require__(389)
+  , formats = __webpack_require__(477)
+  , rules = __webpack_require__(479)
+  , $dataMetaSchema = __webpack_require__(472)
+  , patternGroups = __webpack_require__(500)
+  , util = __webpack_require__(106)
+  , co = __webpack_require__(383);
+
+module.exports = Ajv;
+
+Ajv.prototype.validate = validate;
+Ajv.prototype.compile = compile;
+Ajv.prototype.addSchema = addSchema;
+Ajv.prototype.addMetaSchema = addMetaSchema;
+Ajv.prototype.validateSchema = validateSchema;
+Ajv.prototype.getSchema = getSchema;
+Ajv.prototype.removeSchema = removeSchema;
+Ajv.prototype.addFormat = addFormat;
+Ajv.prototype.errorsText = errorsText;
+
+Ajv.prototype._addSchema = _addSchema;
+Ajv.prototype._compile = _compile;
+
+Ajv.prototype.compileAsync = __webpack_require__(476);
+var customKeyword = __webpack_require__(499);
+Ajv.prototype.addKeyword = customKeyword.add;
+Ajv.prototype.getKeyword = customKeyword.get;
+Ajv.prototype.removeKeyword = customKeyword.remove;
+
+var errorClasses = __webpack_require__(202);
+Ajv.ValidationError = errorClasses.Validation;
+Ajv.MissingRefError = errorClasses.MissingRef;
+Ajv.$dataMetaSchema = $dataMetaSchema;
+
+var META_SCHEMA_ID = 'http://json-schema.org/draft-06/schema';
+
+var META_IGNORE_OPTIONS = [ 'removeAdditional', 'useDefaults', 'coerceTypes' ];
+var META_SUPPORT_DATA = ['/properties'];
+
+/**
+ * Creates validator instance.
+ * Usage: `Ajv(opts)`
+ * @param {Object} opts optional options
+ * @return {Object} ajv instance
+ */
+function Ajv(opts) {
+  if (!(this instanceof Ajv)) return new Ajv(opts);
+  opts = this._opts = util.copy(opts) || {};
+  setLogger(this);
+  this._schemas = {};
+  this._refs = {};
+  this._fragments = {};
+  this._formats = formats(opts.format);
+  var schemaUriFormat = this._schemaUriFormat = this._formats['uri-reference'];
+  this._schemaUriFormatFunc = function (str) { return schemaUriFormat.test(str); };
+
+  this._cache = opts.cache || new Cache;
+  this._loadingSchemas = {};
+  this._compilations = [];
+  this.RULES = rules();
+  this._getId = chooseGetId(opts);
+
+  opts.loopRequired = opts.loopRequired || Infinity;
+  if (opts.errorDataPath == 'property') opts._errorDataPathProperty = true;
+  if (opts.serialize === undefined) opts.serialize = stableStringify;
+  this._metaOpts = getMetaSchemaOptions(this);
+
+  if (opts.formats) addInitialFormats(this);
+  addDraft6MetaSchema(this);
+  if (typeof opts.meta == 'object') this.addMetaSchema(opts.meta);
+  addInitialSchemas(this);
+  if (opts.patternGroups) patternGroups(this);
+}
+
+
+
+/**
+ * Validate data using schema
+ * Schema will be compiled and cached (using serialized JSON as key. [fast-json-stable-stringify](https://github.com/epoberezkin/fast-json-stable-stringify) is used to serialize.
+ * @this   Ajv
+ * @param  {String|Object} schemaKeyRef key, ref or schema object
+ * @param  {Any} data to be validated
+ * @return {Boolean} validation result. Errors from the last validation will be available in `ajv.errors` (and also in compiled schema: `schema.errors`).
+ */
+function validate(schemaKeyRef, data) {
+  var v;
+  if (typeof schemaKeyRef == 'string') {
+    v = this.getSchema(schemaKeyRef);
+    if (!v) throw new Error('no schema with key or ref "' + schemaKeyRef + '"');
+  } else {
+    var schemaObj = this._addSchema(schemaKeyRef);
+    v = schemaObj.validate || this._compile(schemaObj);
+  }
+
+  var valid = v(data);
+  if (v.$async === true)
+    return this._opts.async == '*' ? co(valid) : valid;
+  this.errors = v.errors;
+  return valid;
+}
+
+
+/**
+ * Create validating function for passed schema.
+ * @this   Ajv
+ * @param  {Object} schema schema object
+ * @param  {Boolean} _meta true if schema is a meta-schema. Used internally to compile meta schemas of custom keywords.
+ * @return {Function} validating function
+ */
+function compile(schema, _meta) {
+  var schemaObj = this._addSchema(schema, undefined, _meta);
+  return schemaObj.validate || this._compile(schemaObj);
+}
+
+
+/**
+ * Adds schema to the instance.
+ * @this   Ajv
+ * @param {Object|Array} schema schema or array of schemas. If array is passed, `key` and other parameters will be ignored.
+ * @param {String} key Optional schema key. Can be passed to `validate` method instead of schema object or id/ref. One schema per instance can have empty `id` and `key`.
+ * @param {Boolean} _skipValidation true to skip schema validation. Used internally, option validateSchema should be used instead.
+ * @param {Boolean} _meta true if schema is a meta-schema. Used internally, addMetaSchema should be used instead.
+ * @return {Ajv} this for method chaining
+ */
+function addSchema(schema, key, _skipValidation, _meta) {
+  if (Array.isArray(schema)){
+    for (var i=0; i<schema.length; i++) this.addSchema(schema[i], undefined, _skipValidation, _meta);
+    return this;
+  }
+  var id = this._getId(schema);
+  if (id !== undefined && typeof id != 'string')
+    throw new Error('schema id must be string');
+  key = resolve.normalizeId(key || id);
+  checkUnique(this, key);
+  this._schemas[key] = this._addSchema(schema, _skipValidation, _meta, true);
+  return this;
+}
+
+
+/**
+ * Add schema that will be used to validate other schemas
+ * options in META_IGNORE_OPTIONS are alway set to false
+ * @this   Ajv
+ * @param {Object} schema schema object
+ * @param {String} key optional schema key
+ * @param {Boolean} skipValidation true to skip schema validation, can be used to override validateSchema option for meta-schema
+ * @return {Ajv} this for method chaining
+ */
+function addMetaSchema(schema, key, skipValidation) {
+  this.addSchema(schema, key, skipValidation, true);
+  return this;
+}
+
+
+/**
+ * Validate schema
+ * @this   Ajv
+ * @param {Object} schema schema to validate
+ * @param {Boolean} throwOrLogError pass true to throw (or log) an error if invalid
+ * @return {Boolean} true if schema is valid
+ */
+function validateSchema(schema, throwOrLogError) {
+  var $schema = schema.$schema;
+  if ($schema !== undefined && typeof $schema != 'string')
+    throw new Error('$schema must be a string');
+  $schema = $schema || this._opts.defaultMeta || defaultMeta(this);
+  if (!$schema) {
+    this.logger.warn('meta-schema not available');
+    this.errors = null;
+    return true;
+  }
+  var currentUriFormat = this._formats.uri;
+  this._formats.uri = typeof currentUriFormat == 'function'
+                      ? this._schemaUriFormatFunc
+                      : this._schemaUriFormat;
+  var valid;
+  try { valid = this.validate($schema, schema); }
+  finally { this._formats.uri = currentUriFormat; }
+  if (!valid && throwOrLogError) {
+    var message = 'schema is invalid: ' + this.errorsText();
+    if (this._opts.validateSchema == 'log') this.logger.error(message);
+    else throw new Error(message);
+  }
+  return valid;
+}
+
+
+function defaultMeta(self) {
+  var meta = self._opts.meta;
+  self._opts.defaultMeta = typeof meta == 'object'
+                            ? self._getId(meta) || meta
+                            : self.getSchema(META_SCHEMA_ID)
+                              ? META_SCHEMA_ID
+                              : undefined;
+  return self._opts.defaultMeta;
+}
+
+
+/**
+ * Get compiled schema from the instance by `key` or `ref`.
+ * @this   Ajv
+ * @param  {String} keyRef `key` that was passed to `addSchema` or full schema reference (`schema.id` or resolved id).
+ * @return {Function} schema validating function (with property `schema`).
+ */
+function getSchema(keyRef) {
+  var schemaObj = _getSchemaObj(this, keyRef);
+  switch (typeof schemaObj) {
+    case 'object': return schemaObj.validate || this._compile(schemaObj);
+    case 'string': return this.getSchema(schemaObj);
+    case 'undefined': return _getSchemaFragment(this, keyRef);
+  }
+}
+
+
+function _getSchemaFragment(self, ref) {
+  var res = resolve.schema.call(self, { schema: {} }, ref);
+  if (res) {
+    var schema = res.schema
+      , root = res.root
+      , baseId = res.baseId;
+    var v = compileSchema.call(self, schema, root, undefined, baseId);
+    self._fragments[ref] = new SchemaObject({
+      ref: ref,
+      fragment: true,
+      schema: schema,
+      root: root,
+      baseId: baseId,
+      validate: v
+    });
+    return v;
+  }
+}
+
+
+function _getSchemaObj(self, keyRef) {
+  keyRef = resolve.normalizeId(keyRef);
+  return self._schemas[keyRef] || self._refs[keyRef] || self._fragments[keyRef];
+}
+
+
+/**
+ * Remove cached schema(s).
+ * If no parameter is passed all schemas but meta-schemas are removed.
+ * If RegExp is passed all schemas with key/id matching pattern but meta-schemas are removed.
+ * Even if schema is referenced by other schemas it still can be removed as other schemas have local references.
+ * @this   Ajv
+ * @param  {String|Object|RegExp} schemaKeyRef key, ref, pattern to match key/ref or schema object
+ * @return {Ajv} this for method chaining
+ */
+function removeSchema(schemaKeyRef) {
+  if (schemaKeyRef instanceof RegExp) {
+    _removeAllSchemas(this, this._schemas, schemaKeyRef);
+    _removeAllSchemas(this, this._refs, schemaKeyRef);
+    return this;
+  }
+  switch (typeof schemaKeyRef) {
+    case 'undefined':
+      _removeAllSchemas(this, this._schemas);
+      _removeAllSchemas(this, this._refs);
+      this._cache.clear();
+      return this;
+    case 'string':
+      var schemaObj = _getSchemaObj(this, schemaKeyRef);
+      if (schemaObj) this._cache.del(schemaObj.cacheKey);
+      delete this._schemas[schemaKeyRef];
+      delete this._refs[schemaKeyRef];
+      return this;
+    case 'object':
+      var serialize = this._opts.serialize;
+      var cacheKey = serialize ? serialize(schemaKeyRef) : schemaKeyRef;
+      this._cache.del(cacheKey);
+      var id = this._getId(schemaKeyRef);
+      if (id) {
+        id = resolve.normalizeId(id);
+        delete this._schemas[id];
+        delete this._refs[id];
+      }
+  }
+  return this;
+}
+
+
+function _removeAllSchemas(self, schemas, regex) {
+  for (var keyRef in schemas) {
+    var schemaObj = schemas[keyRef];
+    if (!schemaObj.meta && (!regex || regex.test(keyRef))) {
+      self._cache.del(schemaObj.cacheKey);
+      delete schemas[keyRef];
+    }
+  }
+}
+
+
+/* @this   Ajv */
+function _addSchema(schema, skipValidation, meta, shouldAddSchema) {
+  if (typeof schema != 'object' && typeof schema != 'boolean')
+    throw new Error('schema should be object or boolean');
+  var serialize = this._opts.serialize;
+  var cacheKey = serialize ? serialize(schema) : schema;
+  var cached = this._cache.get(cacheKey);
+  if (cached) return cached;
+
+  shouldAddSchema = shouldAddSchema || this._opts.addUsedSchema !== false;
+
+  var id = resolve.normalizeId(this._getId(schema));
+  if (id && shouldAddSchema) checkUnique(this, id);
+
+  var willValidate = this._opts.validateSchema !== false && !skipValidation;
+  var recursiveMeta;
+  if (willValidate && !(recursiveMeta = id && id == resolve.normalizeId(schema.$schema)))
+    this.validateSchema(schema, true);
+
+  var localRefs = resolve.ids.call(this, schema);
+
+  var schemaObj = new SchemaObject({
+    id: id,
+    schema: schema,
+    localRefs: localRefs,
+    cacheKey: cacheKey,
+    meta: meta
+  });
+
+  if (id[0] != '#' && shouldAddSchema) this._refs[id] = schemaObj;
+  this._cache.put(cacheKey, schemaObj);
+
+  if (willValidate && recursiveMeta) this.validateSchema(schema, true);
+
+  return schemaObj;
+}
+
+
+/* @this   Ajv */
+function _compile(schemaObj, root) {
+  if (schemaObj.compiling) {
+    schemaObj.validate = callValidate;
+    callValidate.schema = schemaObj.schema;
+    callValidate.errors = null;
+    callValidate.root = root ? root : callValidate;
+    if (schemaObj.schema.$async === true)
+      callValidate.$async = true;
+    return callValidate;
+  }
+  schemaObj.compiling = true;
+
+  var currentOpts;
+  if (schemaObj.meta) {
+    currentOpts = this._opts;
+    this._opts = this._metaOpts;
+  }
+
+  var v;
+  try { v = compileSchema.call(this, schemaObj.schema, root, schemaObj.localRefs); }
+  finally {
+    schemaObj.compiling = false;
+    if (schemaObj.meta) this._opts = currentOpts;
+  }
+
+  schemaObj.validate = v;
+  schemaObj.refs = v.refs;
+  schemaObj.refVal = v.refVal;
+  schemaObj.root = v.root;
+  return v;
+
+
+  function callValidate() {
+    var _validate = schemaObj.validate;
+    var result = _validate.apply(null, arguments);
+    callValidate.errors = _validate.errors;
+    return result;
+  }
+}
+
+
+function chooseGetId(opts) {
+  switch (opts.schemaId) {
+    case '$id': return _get$Id;
+    case 'id': return _getId;
+    default: return _get$IdOrId;
+  }
+}
+
+/* @this   Ajv */
+function _getId(schema) {
+  if (schema.$id) this.logger.warn('schema $id ignored', schema.$id);
+  return schema.id;
+}
+
+/* @this   Ajv */
+function _get$Id(schema) {
+  if (schema.id) this.logger.warn('schema id ignored', schema.id);
+  return schema.$id;
+}
+
+
+function _get$IdOrId(schema) {
+  if (schema.$id && schema.id && schema.$id != schema.id)
+    throw new Error('schema $id is different from id');
+  return schema.$id || schema.id;
+}
+
+
+/**
+ * Convert array of error message objects to string
+ * @this   Ajv
+ * @param  {Array<Object>} errors optional array of validation errors, if not passed errors from the instance are used.
+ * @param  {Object} options optional options with properties `separator` and `dataVar`.
+ * @return {String} human readable string with all errors descriptions
+ */
+function errorsText(errors, options) {
+  errors = errors || this.errors;
+  if (!errors) return 'No errors';
+  options = options || {};
+  var separator = options.separator === undefined ? ', ' : options.separator;
+  var dataVar = options.dataVar === undefined ? 'data' : options.dataVar;
+
+  var text = '';
+  for (var i=0; i<errors.length; i++) {
+    var e = errors[i];
+    if (e) text += dataVar + e.dataPath + ' ' + e.message + separator;
+  }
+  return text.slice(0, -separator.length);
+}
+
+
+/**
+ * Add custom format
+ * @this   Ajv
+ * @param {String} name format name
+ * @param {String|RegExp|Function} format string is converted to RegExp; function should return boolean (true when valid)
+ * @return {Ajv} this for method chaining
+ */
+function addFormat(name, format) {
+  if (typeof format == 'string') format = new RegExp(format);
+  this._formats[name] = format;
+  return this;
+}
+
+
+function addDraft6MetaSchema(self) {
+  var $dataSchema;
+  if (self._opts.$data) {
+    $dataSchema = __webpack_require__(501);
+    self.addMetaSchema($dataSchema, $dataSchema.$id, true);
+  }
+  if (self._opts.meta === false) return;
+  var metaSchema = __webpack_require__(502);
+  if (self._opts.$data) metaSchema = $dataMetaSchema(metaSchema, META_SUPPORT_DATA);
+  self.addMetaSchema(metaSchema, META_SCHEMA_ID, true);
+  self._refs['http://json-schema.org/schema'] = META_SCHEMA_ID;
+}
+
+
+function addInitialSchemas(self) {
+  var optsSchemas = self._opts.schemas;
+  if (!optsSchemas) return;
+  if (Array.isArray(optsSchemas)) self.addSchema(optsSchemas);
+  else for (var key in optsSchemas) self.addSchema(optsSchemas[key], key);
+}
+
+
+function addInitialFormats(self) {
+  for (var name in self._opts.formats) {
+    var format = self._opts.formats[name];
+    self.addFormat(name, format);
+  }
+}
+
+
+function checkUnique(self, id) {
+  if (self._schemas[id] || self._refs[id])
+    throw new Error('schema with key or id "' + id + '" already exists');
+}
+
+
+function getMetaSchemaOptions(self) {
+  var metaOpts = util.copy(self._opts);
+  for (var i=0; i<META_IGNORE_OPTIONS.length; i++)
+    delete metaOpts[META_IGNORE_OPTIONS[i]];
+  return metaOpts;
+}
+
+
+function setLogger(self) {
+  var logger = self._opts.logger;
+  if (logger === false) {
+    self.logger = {log: noop, warn: noop, error: noop};
+  } else {
+    if (logger === undefined) logger = console;
+    if (!(typeof logger == 'object' && logger.log && logger.warn && logger.error))
+      throw new Error('logger must implement log, warn and error methods');
+    self.logger = logger;
+  }
+}
+
+
+function noop() {}
+
+
+/***/ }),
+/* 474 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+
+var Cache = module.exports = function Cache() {
+  this._cache = {};
+};
+
+
+Cache.prototype.put = function Cache_put(key, value) {
+  this._cache[key] = value;
+};
+
+
+Cache.prototype.get = function Cache_get(key) {
+  return this._cache[key];
+};
+
+
+Cache.prototype.del = function Cache_del(key) {
+  delete this._cache[key];
+};
+
+
+Cache.prototype.clear = function Cache_clear() {
+  this._cache = {};
+};
+
+
+/***/ }),
+/* 475 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+//all requires must be explicit because browserify won't work with dynamic requires
+module.exports = {
+  '$ref': __webpack_require__(496),
+  allOf: __webpack_require__(481),
+  anyOf: __webpack_require__(482),
+  const: __webpack_require__(483),
+  contains: __webpack_require__(484),
+  dependencies: __webpack_require__(486),
+  'enum': __webpack_require__(487),
+  format: __webpack_require__(488),
+  items: __webpack_require__(489),
+  maximum: __webpack_require__(340),
+  minimum: __webpack_require__(340),
+  maxItems: __webpack_require__(341),
+  minItems: __webpack_require__(341),
+  maxLength: __webpack_require__(342),
+  minLength: __webpack_require__(342),
+  maxProperties: __webpack_require__(343),
+  minProperties: __webpack_require__(343),
+  multipleOf: __webpack_require__(490),
+  not: __webpack_require__(491),
+  oneOf: __webpack_require__(492),
+  pattern: __webpack_require__(493),
+  properties: __webpack_require__(494),
+  propertyNames: __webpack_require__(495),
+  required: __webpack_require__(497),
+  uniqueItems: __webpack_require__(498),
+  validate: __webpack_require__(344)
+};
+
+
+/***/ }),
+/* 476 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var MissingRefError = __webpack_require__(202).MissingRef;
+
+module.exports = compileAsync;
+
+
+/**
+ * Creates validating function for passed schema with asynchronous loading of missing schemas.
+ * `loadSchema` option should be a function that accepts schema uri and returns promise that resolves with the schema.
+ * @this  Ajv
+ * @param {Object}   schema schema object
+ * @param {Boolean}  meta optional true to compile meta-schema; this parameter can be skipped
+ * @param {Function} callback an optional node-style callback, it is called with 2 parameters: error (or null) and validating function.
+ * @return {Promise} promise that resolves with a validating function.
+ */
+function compileAsync(schema, meta, callback) {
+  /* eslint no-shadow: 0 */
+  /* global Promise */
+  /* jshint validthis: true */
+  var self = this;
+  if (typeof this._opts.loadSchema != 'function')
+    throw new Error('options.loadSchema should be a function');
+
+  if (typeof meta == 'function') {
+    callback = meta;
+    meta = undefined;
+  }
+
+  var p = loadMetaSchemaOf(schema).then(function () {
+    var schemaObj = self._addSchema(schema, undefined, meta);
+    return schemaObj.validate || _compileAsync(schemaObj);
+  });
+
+  if (callback) {
+    p.then(
+      function(v) { callback(null, v); },
+      callback
+    );
+  }
+
+  return p;
+
+
+  function loadMetaSchemaOf(sch) {
+    var $schema = sch.$schema;
+    return $schema && !self.getSchema($schema)
+            ? compileAsync.call(self, { $ref: $schema }, true)
+            : Promise.resolve();
+  }
+
+
+  function _compileAsync(schemaObj) {
+    try { return self._compile(schemaObj); }
+    catch(e) {
+      if (e instanceof MissingRefError) return loadMissingSchema(e);
+      throw e;
+    }
+
+
+    function loadMissingSchema(e) {
+      var ref = e.missingSchema;
+      if (added(ref)) throw new Error('Schema ' + ref + ' is loaded but ' + e.missingRef + ' cannot be resolved');
+
+      var schemaPromise = self._loadingSchemas[ref];
+      if (!schemaPromise) {
+        schemaPromise = self._loadingSchemas[ref] = self._opts.loadSchema(ref);
+        schemaPromise.then(removePromise, removePromise);
+      }
+
+      return schemaPromise.then(function (sch) {
+        if (!added(ref)) {
+          return loadMetaSchemaOf(sch).then(function () {
+            if (!added(ref)) self.addSchema(sch, ref, undefined, meta);
+          });
+        }
+      }).then(function() {
+        return _compileAsync(schemaObj);
+      });
+
+      function removePromise() {
+        delete self._loadingSchemas[ref];
+      }
+
+      function added(ref) {
+        return self._refs[ref] || self._schemas[ref];
+      }
+    }
+  }
+}
+
+
+/***/ }),
+/* 477 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var util = __webpack_require__(106);
+
+var DATE = /^\d\d\d\d-(\d\d)-(\d\d)$/;
+var DAYS = [0,31,29,31,30,31,30,31,31,30,31,30,31];
+var TIME = /^(\d\d):(\d\d):(\d\d)(\.\d+)?(z|[+-]\d\d:\d\d)?$/i;
+var HOSTNAME = /^[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?(?:\.[a-z0-9](?:[-0-9a-z]{0,61}[0-9a-z])?)*$/i;
+var URI = /^(?:[a-z][a-z0-9+\-.]*:)(?:\/?\/(?:(?:[a-z0-9\-._~!$&'()*+,;=:]|%[0-9a-f]{2})*@)?(?:\[(?:(?:(?:(?:[0-9a-f]{1,4}:){6}|::(?:[0-9a-f]{1,4}:){5}|(?:[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){4}|(?:(?:[0-9a-f]{1,4}:){0,1}[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){3}|(?:(?:[0-9a-f]{1,4}:){0,2}[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){2}|(?:(?:[0-9a-f]{1,4}:){0,3}[0-9a-f]{1,4})?::[0-9a-f]{1,4}:|(?:(?:[0-9a-f]{1,4}:){0,4}[0-9a-f]{1,4})?::)(?:[0-9a-f]{1,4}:[0-9a-f]{1,4}|(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?))|(?:(?:[0-9a-f]{1,4}:){0,5}[0-9a-f]{1,4})?::[0-9a-f]{1,4}|(?:(?:[0-9a-f]{1,4}:){0,6}[0-9a-f]{1,4})?::)|[Vv][0-9a-f]+\.[a-z0-9\-._~!$&'()*+,;=:]+)\]|(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?)|(?:[a-z0-9\-._~!$&'()*+,;=]|%[0-9a-f]{2})*)(?::\d*)?(?:\/(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})*)*|\/(?:(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})+(?:\/(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})*)*)?|(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})+(?:\/(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})*)*)(?:\?(?:[a-z0-9\-._~!$&'()*+,;=:@/?]|%[0-9a-f]{2})*)?(?:#(?:[a-z0-9\-._~!$&'()*+,;=:@/?]|%[0-9a-f]{2})*)?$/i;
+var URIREF = /^(?:[a-z][a-z0-9+\-.]*:)?(?:\/?\/(?:(?:[a-z0-9\-._~!$&'()*+,;=:]|%[0-9a-f]{2})*@)?(?:\[(?:(?:(?:(?:[0-9a-f]{1,4}:){6}|::(?:[0-9a-f]{1,4}:){5}|(?:[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){4}|(?:(?:[0-9a-f]{1,4}:){0,1}[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){3}|(?:(?:[0-9a-f]{1,4}:){0,2}[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){2}|(?:(?:[0-9a-f]{1,4}:){0,3}[0-9a-f]{1,4})?::[0-9a-f]{1,4}:|(?:(?:[0-9a-f]{1,4}:){0,4}[0-9a-f]{1,4})?::)(?:[0-9a-f]{1,4}:[0-9a-f]{1,4}|(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?))|(?:(?:[0-9a-f]{1,4}:){0,5}[0-9a-f]{1,4})?::[0-9a-f]{1,4}|(?:(?:[0-9a-f]{1,4}:){0,6}[0-9a-f]{1,4})?::)|[Vv][0-9a-f]+\.[a-z0-9\-._~!$&'()*+,;=:]+)\]|(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?)|(?:[a-z0-9\-._~!$&'"()*+,;=]|%[0-9a-f]{2})*)(?::\d*)?(?:\/(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})*)*|\/(?:(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})+(?:\/(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})*)*)?|(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})+(?:\/(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})*)*)?(?:\?(?:[a-z0-9\-._~!$&'"()*+,;=:@/?]|%[0-9a-f]{2})*)?(?:#(?:[a-z0-9\-._~!$&'"()*+,;=:@/?]|%[0-9a-f]{2})*)?$/i;
+// uri-template: https://tools.ietf.org/html/rfc6570
+var URITEMPLATE = /^(?:(?:[^\x00-\x20"'<>%\\^`{|}]|%[0-9a-f]{2})|\{[+#./;?&=,!@|]?(?:[a-z0-9_]|%[0-9a-f]{2})+(?::[1-9][0-9]{0,3}|\*)?(?:,(?:[a-z0-9_]|%[0-9a-f]{2})+(?::[1-9][0-9]{0,3}|\*)?)*\})*$/i;
+// For the source: https://gist.github.com/dperini/729294
+// For test cases: https://mathiasbynens.be/demo/url-regex
+// @todo Delete current URL in favour of the commented out URL rule when this issue is fixed https://github.com/eslint/eslint/issues/7983.
+// var URL = /^(?:(?:https?|ftp):\/\/)(?:\S+(?::\S*)?@)?(?:(?!10(?:\.\d{1,3}){3})(?!127(?:\.\d{1,3}){3})(?!169\.254(?:\.\d{1,3}){2})(?!192\.168(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u{00a1}-\u{ffff}0-9]+-?)*[a-z\u{00a1}-\u{ffff}0-9]+)(?:\.(?:[a-z\u{00a1}-\u{ffff}0-9]+-?)*[a-z\u{00a1}-\u{ffff}0-9]+)*(?:\.(?:[a-z\u{00a1}-\u{ffff}]{2,})))(?::\d{2,5})?(?:\/[^\s]*)?$/iu;
+var URL = /^(?:(?:http[s\u017F]?|ftp):\/\/)(?:(?:[\0-\x08\x0E-\x1F!-\x9F\xA1-\u167F\u1681-\u1FFF\u200B-\u2027\u202A-\u202E\u2030-\u205E\u2060-\u2FFF\u3001-\uD7FF\uE000-\uFEFE\uFF00-\uFFFF]|[\uD800-\uDBFF][\uDC00-\uDFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+(?::(?:[\0-\x08\x0E-\x1F!-\x9F\xA1-\u167F\u1681-\u1FFF\u200B-\u2027\u202A-\u202E\u2030-\u205E\u2060-\u2FFF\u3001-\uD7FF\uE000-\uFEFE\uFF00-\uFFFF]|[\uD800-\uDBFF][\uDC00-\uDFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])*)?@)?(?:(?!10(?:\.[0-9]{1,3}){3})(?!127(?:\.[0-9]{1,3}){3})(?!169\.254(?:\.[0-9]{1,3}){2})(?!192\.168(?:\.[0-9]{1,3}){2})(?!172\.(?:1[6-9]|2[0-9]|3[01])(?:\.[0-9]{1,3}){2})(?:[1-9][0-9]?|1[0-9][0-9]|2[01][0-9]|22[0-3])(?:\.(?:1?[0-9]{1,2}|2[0-4][0-9]|25[0-5])){2}(?:\.(?:[1-9][0-9]?|1[0-9][0-9]|2[0-4][0-9]|25[0-4]))|(?:(?:(?:[0-9KSa-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+-?)*(?:[0-9KSa-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+)(?:\.(?:(?:[0-9KSa-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+-?)*(?:[0-9KSa-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+)*(?:\.(?:(?:[KSa-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF]){2,})))(?::[0-9]{2,5})?(?:\/(?:[\0-\x08\x0E-\x1F!-\x9F\xA1-\u167F\u1681-\u1FFF\u200B-\u2027\u202A-\u202E\u2030-\u205E\u2060-\u2FFF\u3001-\uD7FF\uE000-\uFEFE\uFF00-\uFFFF]|[\uD800-\uDBFF][\uDC00-\uDFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])*)?$/i;
+var UUID = /^(?:urn:uuid:)?[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12}$/i;
+var JSON_POINTER = /^(?:\/(?:[^~/]|~0|~1)*)*$|^#(?:\/(?:[a-z0-9_\-.!$&'()*+,;:=@]|%[0-9a-f]{2}|~0|~1)*)*$/i;
+var RELATIVE_JSON_POINTER = /^(?:0|[1-9][0-9]*)(?:#|(?:\/(?:[^~/]|~0|~1)*)*)$/;
+
+
+module.exports = formats;
+
+function formats(mode) {
+  mode = mode == 'full' ? 'full' : 'fast';
+  return util.copy(formats[mode]);
+}
+
+
+formats.fast = {
+  // date: http://tools.ietf.org/html/rfc3339#section-5.6
+  date: /^\d\d\d\d-[0-1]\d-[0-3]\d$/,
+  // date-time: http://tools.ietf.org/html/rfc3339#section-5.6
+  time: /^[0-2]\d:[0-5]\d:[0-5]\d(?:\.\d+)?(?:z|[+-]\d\d:\d\d)?$/i,
+  'date-time': /^\d\d\d\d-[0-1]\d-[0-3]\d[t\s][0-2]\d:[0-5]\d:[0-5]\d(?:\.\d+)?(?:z|[+-]\d\d:\d\d)$/i,
+  // uri: https://github.com/mafintosh/is-my-json-valid/blob/master/formats.js
+  uri: /^(?:[a-z][a-z0-9+-.]*)(?::|\/)\/?[^\s]*$/i,
+  'uri-reference': /^(?:(?:[a-z][a-z0-9+-.]*:)?\/\/)?[^\s]*$/i,
+  'uri-template': URITEMPLATE,
+  url: URL,
+  // email (sources from jsen validator):
+  // http://stackoverflow.com/questions/201323/using-a-regular-expression-to-validate-an-email-address#answer-8829363
+  // http://www.w3.org/TR/html5/forms.html#valid-e-mail-address (search for 'willful violation')
+  email: /^[a-z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?(?:\.[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?)*$/i,
+  hostname: HOSTNAME,
+  // optimized https://www.safaribooksonline.com/library/view/regular-expressions-cookbook/9780596802837/ch07s16.html
+  ipv4: /^(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?)$/,
+  // optimized http://stackoverflow.com/questions/53497/regular-expression-that-matches-valid-ipv6-addresses
+  ipv6: /^\s*(?:(?:(?:[0-9a-f]{1,4}:){7}(?:[0-9a-f]{1,4}|:))|(?:(?:[0-9a-f]{1,4}:){6}(?::[0-9a-f]{1,4}|(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(?:(?:[0-9a-f]{1,4}:){5}(?:(?:(?::[0-9a-f]{1,4}){1,2})|:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(?:(?:[0-9a-f]{1,4}:){4}(?:(?:(?::[0-9a-f]{1,4}){1,3})|(?:(?::[0-9a-f]{1,4})?:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?:(?:[0-9a-f]{1,4}:){3}(?:(?:(?::[0-9a-f]{1,4}){1,4})|(?:(?::[0-9a-f]{1,4}){0,2}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?:(?:[0-9a-f]{1,4}:){2}(?:(?:(?::[0-9a-f]{1,4}){1,5})|(?:(?::[0-9a-f]{1,4}){0,3}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?:(?:[0-9a-f]{1,4}:){1}(?:(?:(?::[0-9a-f]{1,4}){1,6})|(?:(?::[0-9a-f]{1,4}){0,4}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?::(?:(?:(?::[0-9a-f]{1,4}){1,7})|(?:(?::[0-9a-f]{1,4}){0,5}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(?:%.+)?\s*$/i,
+  regex: regex,
+  // uuid: http://tools.ietf.org/html/rfc4122
+  uuid: UUID,
+  // JSON-pointer: https://tools.ietf.org/html/rfc6901
+  // uri fragment: https://tools.ietf.org/html/rfc3986#appendix-A
+  'json-pointer': JSON_POINTER,
+  // relative JSON-pointer: http://tools.ietf.org/html/draft-luff-relative-json-pointer-00
+  'relative-json-pointer': RELATIVE_JSON_POINTER
+};
+
+
+formats.full = {
+  date: date,
+  time: time,
+  'date-time': date_time,
+  uri: uri,
+  'uri-reference': URIREF,
+  'uri-template': URITEMPLATE,
+  url: URL,
+  email: /^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&''*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/i,
+  hostname: hostname,
+  ipv4: /^(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?)$/,
+  ipv6: /^\s*(?:(?:(?:[0-9a-f]{1,4}:){7}(?:[0-9a-f]{1,4}|:))|(?:(?:[0-9a-f]{1,4}:){6}(?::[0-9a-f]{1,4}|(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(?:(?:[0-9a-f]{1,4}:){5}(?:(?:(?::[0-9a-f]{1,4}){1,2})|:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(?:(?:[0-9a-f]{1,4}:){4}(?:(?:(?::[0-9a-f]{1,4}){1,3})|(?:(?::[0-9a-f]{1,4})?:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?:(?:[0-9a-f]{1,4}:){3}(?:(?:(?::[0-9a-f]{1,4}){1,4})|(?:(?::[0-9a-f]{1,4}){0,2}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?:(?:[0-9a-f]{1,4}:){2}(?:(?:(?::[0-9a-f]{1,4}){1,5})|(?:(?::[0-9a-f]{1,4}){0,3}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?:(?:[0-9a-f]{1,4}:){1}(?:(?:(?::[0-9a-f]{1,4}){1,6})|(?:(?::[0-9a-f]{1,4}){0,4}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?::(?:(?:(?::[0-9a-f]{1,4}){1,7})|(?:(?::[0-9a-f]{1,4}){0,5}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(?:%.+)?\s*$/i,
+  regex: regex,
+  uuid: UUID,
+  'json-pointer': JSON_POINTER,
+  'relative-json-pointer': RELATIVE_JSON_POINTER
+};
+
+
+function date(str) {
+  // full-date from http://tools.ietf.org/html/rfc3339#section-5.6
+  var matches = str.match(DATE);
+  if (!matches) return false;
+
+  var month = +matches[1];
+  var day = +matches[2];
+  return month >= 1 && month <= 12 && day >= 1 && day <= DAYS[month];
+}
+
+
+function time(str, full) {
+  var matches = str.match(TIME);
+  if (!matches) return false;
+
+  var hour = matches[1];
+  var minute = matches[2];
+  var second = matches[3];
+  var timeZone = matches[5];
+  return hour <= 23 && minute <= 59 && second <= 59 && (!full || timeZone);
+}
+
+
+var DATE_TIME_SEPARATOR = /t|\s/i;
+function date_time(str) {
+  // http://tools.ietf.org/html/rfc3339#section-5.6
+  var dateTime = str.split(DATE_TIME_SEPARATOR);
+  return dateTime.length == 2 && date(dateTime[0]) && time(dateTime[1], true);
+}
+
+
+function hostname(str) {
+  // https://tools.ietf.org/html/rfc1034#section-3.5
+  // https://tools.ietf.org/html/rfc1123#section-2
+  return str.length <= 255 && HOSTNAME.test(str);
+}
+
+
+var NOT_URI_FRAGMENT = /\/|:/;
+function uri(str) {
+  // http://jmrware.com/articles/2009/uri_regexp/URI_regex.html + optional protocol + required "."
+  return NOT_URI_FRAGMENT.test(str) && URI.test(str);
+}
+
+
+var Z_ANCHOR = /[^\\]\\Z/;
+function regex(str) {
+  if (Z_ANCHOR.test(str)) return false;
+  try {
+    new RegExp(str);
+    return true;
+  } catch(e) {
+    return false;
+  }
+}
+
+
+/***/ }),
+/* 478 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var resolve = __webpack_require__(203)
+  , util = __webpack_require__(106)
+  , errorClasses = __webpack_require__(202)
+  , stableStringify = __webpack_require__(389);
+
+var validateGenerator = __webpack_require__(344);
+
+/**
+ * Functions below are used inside compiled validations function
+ */
+
+var co = __webpack_require__(383);
+var ucs2length = util.ucs2length;
+var equal = __webpack_require__(204);
+
+// this error is thrown by async schemas to return validation errors via exception
+var ValidationError = errorClasses.Validation;
+
+module.exports = compile;
+
+
+/**
+ * Compiles schema to validation function
+ * @this   Ajv
+ * @param  {Object} schema schema object
+ * @param  {Object} root object with information about the root schema for this schema
+ * @param  {Object} localRefs the hash of local references inside the schema (created by resolve.id), used for inline resolution
+ * @param  {String} baseId base ID for IDs in the schema
+ * @return {Function} validation function
+ */
+function compile(schema, root, localRefs, baseId) {
+  /* jshint validthis: true, evil: true */
+  /* eslint no-shadow: 0 */
+  var self = this
+    , opts = this._opts
+    , refVal = [ undefined ]
+    , refs = {}
+    , patterns = []
+    , patternsHash = {}
+    , defaults = []
+    , defaultsHash = {}
+    , customRules = [];
+
+  root = root || { schema: schema, refVal: refVal, refs: refs };
+
+  var c = checkCompiling.call(this, schema, root, baseId);
+  var compilation = this._compilations[c.index];
+  if (c.compiling) return (compilation.callValidate = callValidate);
+
+  var formats = this._formats;
+  var RULES = this.RULES;
+
+  try {
+    var v = localCompile(schema, root, localRefs, baseId);
+    compilation.validate = v;
+    var cv = compilation.callValidate;
+    if (cv) {
+      cv.schema = v.schema;
+      cv.errors = null;
+      cv.refs = v.refs;
+      cv.refVal = v.refVal;
+      cv.root = v.root;
+      cv.$async = v.$async;
+      if (opts.sourceCode) cv.source = v.source;
+    }
+    return v;
+  } finally {
+    endCompiling.call(this, schema, root, baseId);
+  }
+
+  function callValidate() {
+    var validate = compilation.validate;
+    var result = validate.apply(null, arguments);
+    callValidate.errors = validate.errors;
+    return result;
+  }
+
+  function localCompile(_schema, _root, localRefs, baseId) {
+    var isRoot = !_root || (_root && _root.schema == _schema);
+    if (_root.schema != root.schema)
+      return compile.call(self, _schema, _root, localRefs, baseId);
+
+    var $async = _schema.$async === true;
+
+    var sourceCode = validateGenerator({
+      isTop: true,
+      schema: _schema,
+      isRoot: isRoot,
+      baseId: baseId,
+      root: _root,
+      schemaPath: '',
+      errSchemaPath: '#',
+      errorPath: '""',
+      MissingRefError: errorClasses.MissingRef,
+      RULES: RULES,
+      validate: validateGenerator,
+      util: util,
+      resolve: resolve,
+      resolveRef: resolveRef,
+      usePattern: usePattern,
+      useDefault: useDefault,
+      useCustomRule: useCustomRule,
+      opts: opts,
+      formats: formats,
+      logger: self.logger,
+      self: self
+    });
+
+    sourceCode = vars(refVal, refValCode) + vars(patterns, patternCode)
+                   + vars(defaults, defaultCode) + vars(customRules, customRuleCode)
+                   + sourceCode;
+
+    if (opts.processCode) sourceCode = opts.processCode(sourceCode);
+    // console.log('\n\n\n *** \n', JSON.stringify(sourceCode));
+    var validate;
+    try {
+      var makeValidate = new Function(
+        'self',
+        'RULES',
+        'formats',
+        'root',
+        'refVal',
+        'defaults',
+        'customRules',
+        'co',
+        'equal',
+        'ucs2length',
+        'ValidationError',
+        sourceCode
+      );
+
+      validate = makeValidate(
+        self,
+        RULES,
+        formats,
+        root,
+        refVal,
+        defaults,
+        customRules,
+        co,
+        equal,
+        ucs2length,
+        ValidationError
+      );
+
+      refVal[0] = validate;
+    } catch(e) {
+      self.logger.error('Error compiling schema, function code:', sourceCode);
+      throw e;
+    }
+
+    validate.schema = _schema;
+    validate.errors = null;
+    validate.refs = refs;
+    validate.refVal = refVal;
+    validate.root = isRoot ? validate : _root;
+    if ($async) validate.$async = true;
+    if (opts.sourceCode === true) {
+      validate.source = {
+        code: sourceCode,
+        patterns: patterns,
+        defaults: defaults
+      };
+    }
+
+    return validate;
+  }
+
+  function resolveRef(baseId, ref, isRoot) {
+    ref = resolve.url(baseId, ref);
+    var refIndex = refs[ref];
+    var _refVal, refCode;
+    if (refIndex !== undefined) {
+      _refVal = refVal[refIndex];
+      refCode = 'refVal[' + refIndex + ']';
+      return resolvedRef(_refVal, refCode);
+    }
+    if (!isRoot && root.refs) {
+      var rootRefId = root.refs[ref];
+      if (rootRefId !== undefined) {
+        _refVal = root.refVal[rootRefId];
+        refCode = addLocalRef(ref, _refVal);
+        return resolvedRef(_refVal, refCode);
+      }
+    }
+
+    refCode = addLocalRef(ref);
+    var v = resolve.call(self, localCompile, root, ref);
+    if (v === undefined) {
+      var localSchema = localRefs && localRefs[ref];
+      if (localSchema) {
+        v = resolve.inlineRef(localSchema, opts.inlineRefs)
+            ? localSchema
+            : compile.call(self, localSchema, root, localRefs, baseId);
+      }
+    }
+
+    if (v === undefined) {
+      removeLocalRef(ref);
+    } else {
+      replaceLocalRef(ref, v);
+      return resolvedRef(v, refCode);
+    }
+  }
+
+  function addLocalRef(ref, v) {
+    var refId = refVal.length;
+    refVal[refId] = v;
+    refs[ref] = refId;
+    return 'refVal' + refId;
+  }
+
+  function removeLocalRef(ref) {
+    delete refs[ref];
+  }
+
+  function replaceLocalRef(ref, v) {
+    var refId = refs[ref];
+    refVal[refId] = v;
+  }
+
+  function resolvedRef(refVal, code) {
+    return typeof refVal == 'object' || typeof refVal == 'boolean'
+            ? { code: code, schema: refVal, inline: true }
+            : { code: code, $async: refVal && refVal.$async };
+  }
+
+  function usePattern(regexStr) {
+    var index = patternsHash[regexStr];
+    if (index === undefined) {
+      index = patternsHash[regexStr] = patterns.length;
+      patterns[index] = regexStr;
+    }
+    return 'pattern' + index;
+  }
+
+  function useDefault(value) {
+    switch (typeof value) {
+      case 'boolean':
+      case 'number':
+        return '' + value;
+      case 'string':
+        return util.toQuotedString(value);
+      case 'object':
+        if (value === null) return 'null';
+        var valueStr = stableStringify(value);
+        var index = defaultsHash[valueStr];
+        if (index === undefined) {
+          index = defaultsHash[valueStr] = defaults.length;
+          defaults[index] = value;
+        }
+        return 'default' + index;
+    }
+  }
+
+  function useCustomRule(rule, schema, parentSchema, it) {
+    var validateSchema = rule.definition.validateSchema;
+    if (validateSchema && self._opts.validateSchema !== false) {
+      var valid = validateSchema(schema);
+      if (!valid) {
+        var message = 'keyword schema is invalid: ' + self.errorsText(validateSchema.errors);
+        if (self._opts.validateSchema == 'log') self.logger.error(message);
+        else throw new Error(message);
+      }
+    }
+
+    var compile = rule.definition.compile
+      , inline = rule.definition.inline
+      , macro = rule.definition.macro;
+
+    var validate;
+    if (compile) {
+      validate = compile.call(self, schema, parentSchema, it);
+    } else if (macro) {
+      validate = macro.call(self, schema, parentSchema, it);
+      if (opts.validateSchema !== false) self.validateSchema(validate, true);
+    } else if (inline) {
+      validate = inline.call(self, it, rule.keyword, schema, parentSchema);
+    } else {
+      validate = rule.definition.validate;
+      if (!validate) return;
+    }
+
+    if (validate === undefined)
+      throw new Error('custom keyword "' + rule.keyword + '"failed to compile');
+
+    var index = customRules.length;
+    customRules[index] = validate;
+
+    return {
+      code: 'customRule' + index,
+      validate: validate
+    };
+  }
+}
+
+
+/**
+ * Checks if the schema is currently compiled
+ * @this   Ajv
+ * @param  {Object} schema schema to compile
+ * @param  {Object} root root object
+ * @param  {String} baseId base schema ID
+ * @return {Object} object with properties "index" (compilation index) and "compiling" (boolean)
+ */
+function checkCompiling(schema, root, baseId) {
+  /* jshint validthis: true */
+  var index = compIndex.call(this, schema, root, baseId);
+  if (index >= 0) return { index: index, compiling: true };
+  index = this._compilations.length;
+  this._compilations[index] = {
+    schema: schema,
+    root: root,
+    baseId: baseId
+  };
+  return { index: index, compiling: false };
+}
+
+
+/**
+ * Removes the schema from the currently compiled list
+ * @this   Ajv
+ * @param  {Object} schema schema to compile
+ * @param  {Object} root root object
+ * @param  {String} baseId base schema ID
+ */
+function endCompiling(schema, root, baseId) {
+  /* jshint validthis: true */
+  var i = compIndex.call(this, schema, root, baseId);
+  if (i >= 0) this._compilations.splice(i, 1);
+}
+
+
+/**
+ * Index of schema compilation in the currently compiled list
+ * @this   Ajv
+ * @param  {Object} schema schema to compile
+ * @param  {Object} root root object
+ * @param  {String} baseId base schema ID
+ * @return {Integer} compilation index
+ */
+function compIndex(schema, root, baseId) {
+  /* jshint validthis: true */
+  for (var i=0; i<this._compilations.length; i++) {
+    var c = this._compilations[i];
+    if (c.schema == schema && c.root == root && c.baseId == baseId) return i;
+  }
+  return -1;
+}
+
+
+function patternCode(i, patterns) {
+  return 'var pattern' + i + ' = new RegExp(' + util.toQuotedString(patterns[i]) + ');';
+}
+
+
+function defaultCode(i) {
+  return 'var default' + i + ' = defaults[' + i + '];';
+}
+
+
+function refValCode(i, refVal) {
+  return refVal[i] === undefined ? '' : 'var refVal' + i + ' = refVal[' + i + '];';
+}
+
+
+function customRuleCode(i) {
+  return 'var customRule' + i + ' = customRules[' + i + '];';
+}
+
+
+function vars(arr, statement) {
+  if (!arr.length) return '';
+  var code = '';
+  for (var i=0; i<arr.length; i++)
+    code += statement(i, arr);
+  return code;
+}
+
+
+/***/ }),
+/* 479 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var ruleModules = __webpack_require__(475)
+  , toHash = __webpack_require__(106).toHash;
+
+module.exports = function rules() {
+  var RULES = [
+    { type: 'number',
+      rules: [ { 'maximum': ['exclusiveMaximum'] },
+               { 'minimum': ['exclusiveMinimum'] }, 'multipleOf', 'format'] },
+    { type: 'string',
+      rules: [ 'maxLength', 'minLength', 'pattern', 'format' ] },
+    { type: 'array',
+      rules: [ 'maxItems', 'minItems', 'uniqueItems', 'contains', 'items' ] },
+    { type: 'object',
+      rules: [ 'maxProperties', 'minProperties', 'required', 'dependencies', 'propertyNames',
+               { 'properties': ['additionalProperties', 'patternProperties'] } ] },
+    { rules: [ '$ref', 'const', 'enum', 'not', 'anyOf', 'oneOf', 'allOf' ] }
+  ];
+
+  var ALL = [ 'type' ];
+  var KEYWORDS = [
+    'additionalItems', '$schema', '$id', 'id', 'title',
+    'description', 'default', 'definitions'
+  ];
+  var TYPES = [ 'number', 'integer', 'string', 'array', 'object', 'boolean', 'null' ];
+  RULES.all = toHash(ALL);
+  RULES.types = toHash(TYPES);
+
+  RULES.forEach(function (group) {
+    group.rules = group.rules.map(function (keyword) {
+      var implKeywords;
+      if (typeof keyword == 'object') {
+        var key = Object.keys(keyword)[0];
+        implKeywords = keyword[key];
+        keyword = key;
+        implKeywords.forEach(function (k) {
+          ALL.push(k);
+          RULES.all[k] = true;
+        });
+      }
+      ALL.push(keyword);
+      var rule = RULES.all[keyword] = {
+        keyword: keyword,
+        code: ruleModules[keyword],
+        implements: implKeywords
+      };
+      return rule;
+    });
+
+    if (group.type) RULES.types[group.type] = group;
+  });
+
+  RULES.keywords = toHash(ALL.concat(KEYWORDS));
+  RULES.custom = {};
+
+  return RULES;
+};
+
+
+/***/ }),
+/* 480 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+// https://mathiasbynens.be/notes/javascript-encoding
+// https://github.com/bestiejs/punycode.js - punycode.ucs2.decode
+module.exports = function ucs2length(str) {
+  var length = 0
+    , len = str.length
+    , pos = 0
+    , value;
+  while (pos < len) {
+    length++;
+    value = str.charCodeAt(pos++);
+    if (value >= 0xD800 && value <= 0xDBFF && pos < len) {
+      // high surrogate, and there is a next character
+      value = str.charCodeAt(pos);
+      if ((value & 0xFC00) == 0xDC00) pos++; // low surrogate
+    }
+  }
+  return length;
+};
+
+
+/***/ }),
+/* 481 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function generate_allOf(it, $keyword, $ruleType) {
+  var out = ' ';
+  var $schema = it.schema[$keyword];
+  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
+  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
+  var $breakOnError = !it.opts.allErrors;
+  var $it = it.util.copy(it);
+  var $closingBraces = '';
+  $it.level++;
+  var $nextValid = 'valid' + $it.level;
+  var $currentBaseId = $it.baseId,
+    $allSchemasEmpty = true;
+  var arr1 = $schema;
+  if (arr1) {
+    var $sch, $i = -1,
+      l1 = arr1.length - 1;
+    while ($i < l1) {
+      $sch = arr1[$i += 1];
+      if (it.util.schemaHasRules($sch, it.RULES.all)) {
+        $allSchemasEmpty = false;
+        $it.schema = $sch;
+        $it.schemaPath = $schemaPath + '[' + $i + ']';
+        $it.errSchemaPath = $errSchemaPath + '/' + $i;
+        out += '  ' + (it.validate($it)) + ' ';
+        $it.baseId = $currentBaseId;
+        if ($breakOnError) {
+          out += ' if (' + ($nextValid) + ') { ';
+          $closingBraces += '}';
+        }
+      }
+    }
+  }
+  if ($breakOnError) {
+    if ($allSchemasEmpty) {
+      out += ' if (true) { ';
+    } else {
+      out += ' ' + ($closingBraces.slice(0, -1)) + ' ';
+    }
+  }
+  out = it.util.cleanUpCode(out);
+  return out;
+}
+
+
+/***/ }),
+/* 482 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function generate_anyOf(it, $keyword, $ruleType) {
+  var out = ' ';
+  var $lvl = it.level;
+  var $dataLvl = it.dataLevel;
+  var $schema = it.schema[$keyword];
+  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
+  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
+  var $breakOnError = !it.opts.allErrors;
+  var $data = 'data' + ($dataLvl || '');
+  var $valid = 'valid' + $lvl;
+  var $errs = 'errs__' + $lvl;
+  var $it = it.util.copy(it);
+  var $closingBraces = '';
+  $it.level++;
+  var $nextValid = 'valid' + $it.level;
+  var $noEmptySchema = $schema.every(function($sch) {
+    return it.util.schemaHasRules($sch, it.RULES.all);
+  });
+  if ($noEmptySchema) {
+    var $currentBaseId = $it.baseId;
+    out += ' var ' + ($errs) + ' = errors; var ' + ($valid) + ' = false;  ';
+    var $wasComposite = it.compositeRule;
+    it.compositeRule = $it.compositeRule = true;
+    var arr1 = $schema;
+    if (arr1) {
+      var $sch, $i = -1,
+        l1 = arr1.length - 1;
+      while ($i < l1) {
+        $sch = arr1[$i += 1];
+        $it.schema = $sch;
+        $it.schemaPath = $schemaPath + '[' + $i + ']';
+        $it.errSchemaPath = $errSchemaPath + '/' + $i;
+        out += '  ' + (it.validate($it)) + ' ';
+        $it.baseId = $currentBaseId;
+        out += ' ' + ($valid) + ' = ' + ($valid) + ' || ' + ($nextValid) + '; if (!' + ($valid) + ') { ';
+        $closingBraces += '}';
+      }
+    }
+    it.compositeRule = $it.compositeRule = $wasComposite;
+    out += ' ' + ($closingBraces) + ' if (!' + ($valid) + ') {   var err =   '; /* istanbul ignore else */
+    if (it.createErrors !== false) {
+      out += ' { keyword: \'' + ('anyOf') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: {} ';
+      if (it.opts.messages !== false) {
+        out += ' , message: \'should match some schema in anyOf\' ';
+      }
+      if (it.opts.verbose) {
+        out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+      }
+      out += ' } ';
+    } else {
+      out += ' {} ';
+    }
+    out += ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+    if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+      if (it.async) {
+        out += ' throw new ValidationError(vErrors); ';
+      } else {
+        out += ' validate.errors = vErrors; return false; ';
+      }
+    }
+    out += ' } else {  errors = ' + ($errs) + '; if (vErrors !== null) { if (' + ($errs) + ') vErrors.length = ' + ($errs) + '; else vErrors = null; } ';
+    if (it.opts.allErrors) {
+      out += ' } ';
+    }
+    out = it.util.cleanUpCode(out);
+  } else {
+    if ($breakOnError) {
+      out += ' if (true) { ';
+    }
+  }
+  return out;
+}
+
+
+/***/ }),
+/* 483 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function generate_const(it, $keyword, $ruleType) {
+  var out = ' ';
+  var $lvl = it.level;
+  var $dataLvl = it.dataLevel;
+  var $schema = it.schema[$keyword];
+  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
+  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
+  var $breakOnError = !it.opts.allErrors;
+  var $data = 'data' + ($dataLvl || '');
+  var $valid = 'valid' + $lvl;
+  var $isData = it.opts.$data && $schema && $schema.$data,
+    $schemaValue;
+  if ($isData) {
+    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
+    $schemaValue = 'schema' + $lvl;
+  } else {
+    $schemaValue = $schema;
+  }
+  if (!$isData) {
+    out += ' var schema' + ($lvl) + ' = validate.schema' + ($schemaPath) + ';';
+  }
+  out += 'var ' + ($valid) + ' = equal(' + ($data) + ', schema' + ($lvl) + '); if (!' + ($valid) + ') {   ';
+  var $$outStack = $$outStack || [];
+  $$outStack.push(out);
+  out = ''; /* istanbul ignore else */
+  if (it.createErrors !== false) {
+    out += ' { keyword: \'' + ('const') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: {} ';
+    if (it.opts.messages !== false) {
+      out += ' , message: \'should be equal to constant\' ';
+    }
+    if (it.opts.verbose) {
+      out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+    }
+    out += ' } ';
+  } else {
+    out += ' {} ';
+  }
+  var __err = out;
+  out = $$outStack.pop();
+  if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+    if (it.async) {
+      out += ' throw new ValidationError([' + (__err) + ']); ';
+    } else {
+      out += ' validate.errors = [' + (__err) + ']; return false; ';
+    }
+  } else {
+    out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+  }
+  out += ' }';
+  if ($breakOnError) {
+    out += ' else { ';
+  }
+  return out;
+}
+
+
+/***/ }),
+/* 484 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function generate_contains(it, $keyword, $ruleType) {
+  var out = ' ';
+  var $lvl = it.level;
+  var $dataLvl = it.dataLevel;
+  var $schema = it.schema[$keyword];
+  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
+  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
+  var $breakOnError = !it.opts.allErrors;
+  var $data = 'data' + ($dataLvl || '');
+  var $valid = 'valid' + $lvl;
+  var $errs = 'errs__' + $lvl;
+  var $it = it.util.copy(it);
+  var $closingBraces = '';
+  $it.level++;
+  var $nextValid = 'valid' + $it.level;
+  var $idx = 'i' + $lvl,
+    $dataNxt = $it.dataLevel = it.dataLevel + 1,
+    $nextData = 'data' + $dataNxt,
+    $currentBaseId = it.baseId,
+    $nonEmptySchema = it.util.schemaHasRules($schema, it.RULES.all);
+  out += 'var ' + ($errs) + ' = errors;var ' + ($valid) + ';';
+  if ($nonEmptySchema) {
+    var $wasComposite = it.compositeRule;
+    it.compositeRule = $it.compositeRule = true;
+    $it.schema = $schema;
+    $it.schemaPath = $schemaPath;
+    $it.errSchemaPath = $errSchemaPath;
+    out += ' var ' + ($nextValid) + ' = false; for (var ' + ($idx) + ' = 0; ' + ($idx) + ' < ' + ($data) + '.length; ' + ($idx) + '++) { ';
+    $it.errorPath = it.util.getPathExpr(it.errorPath, $idx, it.opts.jsonPointers, true);
+    var $passData = $data + '[' + $idx + ']';
+    $it.dataPathArr[$dataNxt] = $idx;
+    var $code = it.validate($it);
+    $it.baseId = $currentBaseId;
+    if (it.util.varOccurences($code, $nextData) < 2) {
+      out += ' ' + (it.util.varReplace($code, $nextData, $passData)) + ' ';
+    } else {
+      out += ' var ' + ($nextData) + ' = ' + ($passData) + '; ' + ($code) + ' ';
+    }
+    out += ' if (' + ($nextValid) + ') break; }  ';
+    it.compositeRule = $it.compositeRule = $wasComposite;
+    out += ' ' + ($closingBraces) + ' if (!' + ($nextValid) + ') {';
+  } else {
+    out += ' if (' + ($data) + '.length == 0) {';
+  }
+  var $$outStack = $$outStack || [];
+  $$outStack.push(out);
+  out = ''; /* istanbul ignore else */
+  if (it.createErrors !== false) {
+    out += ' { keyword: \'' + ('contains') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: {} ';
+    if (it.opts.messages !== false) {
+      out += ' , message: \'should contain a valid item\' ';
+    }
+    if (it.opts.verbose) {
+      out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+    }
+    out += ' } ';
+  } else {
+    out += ' {} ';
+  }
+  var __err = out;
+  out = $$outStack.pop();
+  if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+    if (it.async) {
+      out += ' throw new ValidationError([' + (__err) + ']); ';
+    } else {
+      out += ' validate.errors = [' + (__err) + ']; return false; ';
+    }
+  } else {
+    out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+  }
+  out += ' } else { ';
+  if ($nonEmptySchema) {
+    out += '  errors = ' + ($errs) + '; if (vErrors !== null) { if (' + ($errs) + ') vErrors.length = ' + ($errs) + '; else vErrors = null; } ';
+  }
+  if (it.opts.allErrors) {
+    out += ' } ';
+  }
+  out = it.util.cleanUpCode(out);
+  return out;
+}
+
+
+/***/ }),
+/* 485 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function generate_custom(it, $keyword, $ruleType) {
+  var out = ' ';
+  var $lvl = it.level;
+  var $dataLvl = it.dataLevel;
+  var $schema = it.schema[$keyword];
+  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
+  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
+  var $breakOnError = !it.opts.allErrors;
+  var $errorKeyword;
+  var $data = 'data' + ($dataLvl || '');
+  var $valid = 'valid' + $lvl;
+  var $errs = 'errs__' + $lvl;
+  var $isData = it.opts.$data && $schema && $schema.$data,
+    $schemaValue;
+  if ($isData) {
+    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
+    $schemaValue = 'schema' + $lvl;
+  } else {
+    $schemaValue = $schema;
+  }
+  var $rule = this,
+    $definition = 'definition' + $lvl,
+    $rDef = $rule.definition,
+    $closingBraces = '';
+  var $compile, $inline, $macro, $ruleValidate, $validateCode;
+  if ($isData && $rDef.$data) {
+    $validateCode = 'keywordValidate' + $lvl;
+    var $validateSchema = $rDef.validateSchema;
+    out += ' var ' + ($definition) + ' = RULES.custom[\'' + ($keyword) + '\'].definition; var ' + ($validateCode) + ' = ' + ($definition) + '.validate;';
+  } else {
+    $ruleValidate = it.useCustomRule($rule, $schema, it.schema, it);
+    if (!$ruleValidate) return;
+    $schemaValue = 'validate.schema' + $schemaPath;
+    $validateCode = $ruleValidate.code;
+    $compile = $rDef.compile;
+    $inline = $rDef.inline;
+    $macro = $rDef.macro;
+  }
+  var $ruleErrs = $validateCode + '.errors',
+    $i = 'i' + $lvl,
+    $ruleErr = 'ruleErr' + $lvl,
+    $asyncKeyword = $rDef.async;
+  if ($asyncKeyword && !it.async) throw new Error('async keyword in sync schema');
+  if (!($inline || $macro)) {
+    out += '' + ($ruleErrs) + ' = null;';
+  }
+  out += 'var ' + ($errs) + ' = errors;var ' + ($valid) + ';';
+  if ($isData && $rDef.$data) {
+    $closingBraces += '}';
+    out += ' if (' + ($schemaValue) + ' === undefined) { ' + ($valid) + ' = true; } else { ';
+    if ($validateSchema) {
+      $closingBraces += '}';
+      out += ' ' + ($valid) + ' = ' + ($definition) + '.validateSchema(' + ($schemaValue) + '); if (' + ($valid) + ') { ';
+    }
+  }
+  if ($inline) {
+    if ($rDef.statements) {
+      out += ' ' + ($ruleValidate.validate) + ' ';
+    } else {
+      out += ' ' + ($valid) + ' = ' + ($ruleValidate.validate) + '; ';
+    }
+  } else if ($macro) {
+    var $it = it.util.copy(it);
+    var $closingBraces = '';
+    $it.level++;
+    var $nextValid = 'valid' + $it.level;
+    $it.schema = $ruleValidate.validate;
+    $it.schemaPath = '';
+    var $wasComposite = it.compositeRule;
+    it.compositeRule = $it.compositeRule = true;
+    var $code = it.validate($it).replace(/validate\.schema/g, $validateCode);
+    it.compositeRule = $it.compositeRule = $wasComposite;
+    out += ' ' + ($code);
+  } else {
+    var $$outStack = $$outStack || [];
+    $$outStack.push(out);
+    out = '';
+    out += '  ' + ($validateCode) + '.call( ';
+    if (it.opts.passContext) {
+      out += 'this';
+    } else {
+      out += 'self';
+    }
+    if ($compile || $rDef.schema === false) {
+      out += ' , ' + ($data) + ' ';
+    } else {
+      out += ' , ' + ($schemaValue) + ' , ' + ($data) + ' , validate.schema' + (it.schemaPath) + ' ';
+    }
+    out += ' , (dataPath || \'\')';
+    if (it.errorPath != '""') {
+      out += ' + ' + (it.errorPath);
+    }
+    var $parentData = $dataLvl ? 'data' + (($dataLvl - 1) || '') : 'parentData',
+      $parentDataProperty = $dataLvl ? it.dataPathArr[$dataLvl] : 'parentDataProperty';
+    out += ' , ' + ($parentData) + ' , ' + ($parentDataProperty) + ' , rootData )  ';
+    var def_callRuleValidate = out;
+    out = $$outStack.pop();
+    if ($rDef.errors === false) {
+      out += ' ' + ($valid) + ' = ';
+      if ($asyncKeyword) {
+        out += '' + (it.yieldAwait);
+      }
+      out += '' + (def_callRuleValidate) + '; ';
+    } else {
+      if ($asyncKeyword) {
+        $ruleErrs = 'customErrors' + $lvl;
+        out += ' var ' + ($ruleErrs) + ' = null; try { ' + ($valid) + ' = ' + (it.yieldAwait) + (def_callRuleValidate) + '; } catch (e) { ' + ($valid) + ' = false; if (e instanceof ValidationError) ' + ($ruleErrs) + ' = e.errors; else throw e; } ';
+      } else {
+        out += ' ' + ($ruleErrs) + ' = null; ' + ($valid) + ' = ' + (def_callRuleValidate) + '; ';
+      }
+    }
+  }
+  if ($rDef.modifying) {
+    out += ' if (' + ($parentData) + ') ' + ($data) + ' = ' + ($parentData) + '[' + ($parentDataProperty) + '];';
+  }
+  out += '' + ($closingBraces);
+  if ($rDef.valid) {
+    if ($breakOnError) {
+      out += ' if (true) { ';
+    }
+  } else {
+    out += ' if ( ';
+    if ($rDef.valid === undefined) {
+      out += ' !';
+      if ($macro) {
+        out += '' + ($nextValid);
+      } else {
+        out += '' + ($valid);
+      }
+    } else {
+      out += ' ' + (!$rDef.valid) + ' ';
+    }
+    out += ') { ';
+    $errorKeyword = $rule.keyword;
+    var $$outStack = $$outStack || [];
+    $$outStack.push(out);
+    out = '';
+    var $$outStack = $$outStack || [];
+    $$outStack.push(out);
+    out = ''; /* istanbul ignore else */
+    if (it.createErrors !== false) {
+      out += ' { keyword: \'' + ($errorKeyword || 'custom') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { keyword: \'' + ($rule.keyword) + '\' } ';
+      if (it.opts.messages !== false) {
+        out += ' , message: \'should pass "' + ($rule.keyword) + '" keyword validation\' ';
+      }
+      if (it.opts.verbose) {
+        out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+      }
+      out += ' } ';
+    } else {
+      out += ' {} ';
+    }
+    var __err = out;
+    out = $$outStack.pop();
+    if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+      if (it.async) {
+        out += ' throw new ValidationError([' + (__err) + ']); ';
+      } else {
+        out += ' validate.errors = [' + (__err) + ']; return false; ';
+      }
+    } else {
+      out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+    }
+    var def_customError = out;
+    out = $$outStack.pop();
+    if ($inline) {
+      if ($rDef.errors) {
+        if ($rDef.errors != 'full') {
+          out += '  for (var ' + ($i) + '=' + ($errs) + '; ' + ($i) + '<errors; ' + ($i) + '++) { var ' + ($ruleErr) + ' = vErrors[' + ($i) + ']; if (' + ($ruleErr) + '.dataPath === undefined) ' + ($ruleErr) + '.dataPath = (dataPath || \'\') + ' + (it.errorPath) + '; if (' + ($ruleErr) + '.schemaPath === undefined) { ' + ($ruleErr) + '.schemaPath = "' + ($errSchemaPath) + '"; } ';
+          if (it.opts.verbose) {
+            out += ' ' + ($ruleErr) + '.schema = ' + ($schemaValue) + '; ' + ($ruleErr) + '.data = ' + ($data) + '; ';
+          }
+          out += ' } ';
+        }
+      } else {
+        if ($rDef.errors === false) {
+          out += ' ' + (def_customError) + ' ';
+        } else {
+          out += ' if (' + ($errs) + ' == errors) { ' + (def_customError) + ' } else {  for (var ' + ($i) + '=' + ($errs) + '; ' + ($i) + '<errors; ' + ($i) + '++) { var ' + ($ruleErr) + ' = vErrors[' + ($i) + ']; if (' + ($ruleErr) + '.dataPath === undefined) ' + ($ruleErr) + '.dataPath = (dataPath || \'\') + ' + (it.errorPath) + '; if (' + ($ruleErr) + '.schemaPath === undefined) { ' + ($ruleErr) + '.schemaPath = "' + ($errSchemaPath) + '"; } ';
+          if (it.opts.verbose) {
+            out += ' ' + ($ruleErr) + '.schema = ' + ($schemaValue) + '; ' + ($ruleErr) + '.data = ' + ($data) + '; ';
+          }
+          out += ' } } ';
+        }
+      }
+    } else if ($macro) {
+      out += '   var err =   '; /* istanbul ignore else */
+      if (it.createErrors !== false) {
+        out += ' { keyword: \'' + ($errorKeyword || 'custom') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { keyword: \'' + ($rule.keyword) + '\' } ';
+        if (it.opts.messages !== false) {
+          out += ' , message: \'should pass "' + ($rule.keyword) + '" keyword validation\' ';
+        }
+        if (it.opts.verbose) {
+          out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+        }
+        out += ' } ';
+      } else {
+        out += ' {} ';
+      }
+      out += ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+      if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+        if (it.async) {
+          out += ' throw new ValidationError(vErrors); ';
+        } else {
+          out += ' validate.errors = vErrors; return false; ';
+        }
+      }
+    } else {
+      if ($rDef.errors === false) {
+        out += ' ' + (def_customError) + ' ';
+      } else {
+        out += ' if (Array.isArray(' + ($ruleErrs) + ')) { if (vErrors === null) vErrors = ' + ($ruleErrs) + '; else vErrors = vErrors.concat(' + ($ruleErrs) + '); errors = vErrors.length;  for (var ' + ($i) + '=' + ($errs) + '; ' + ($i) + '<errors; ' + ($i) + '++) { var ' + ($ruleErr) + ' = vErrors[' + ($i) + ']; if (' + ($ruleErr) + '.dataPath === undefined) ' + ($ruleErr) + '.dataPath = (dataPath || \'\') + ' + (it.errorPath) + ';  ' + ($ruleErr) + '.schemaPath = "' + ($errSchemaPath) + '";  ';
+        if (it.opts.verbose) {
+          out += ' ' + ($ruleErr) + '.schema = ' + ($schemaValue) + '; ' + ($ruleErr) + '.data = ' + ($data) + '; ';
+        }
+        out += ' } } else { ' + (def_customError) + ' } ';
+      }
+    }
+    out += ' } ';
+    if ($breakOnError) {
+      out += ' else { ';
+    }
+  }
+  return out;
+}
+
+
+/***/ }),
+/* 486 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function generate_dependencies(it, $keyword, $ruleType) {
+  var out = ' ';
+  var $lvl = it.level;
+  var $dataLvl = it.dataLevel;
+  var $schema = it.schema[$keyword];
+  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
+  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
+  var $breakOnError = !it.opts.allErrors;
+  var $data = 'data' + ($dataLvl || '');
+  var $errs = 'errs__' + $lvl;
+  var $it = it.util.copy(it);
+  var $closingBraces = '';
+  $it.level++;
+  var $nextValid = 'valid' + $it.level;
+  var $schemaDeps = {},
+    $propertyDeps = {},
+    $ownProperties = it.opts.ownProperties;
+  for ($property in $schema) {
+    var $sch = $schema[$property];
+    var $deps = Array.isArray($sch) ? $propertyDeps : $schemaDeps;
+    $deps[$property] = $sch;
+  }
+  out += 'var ' + ($errs) + ' = errors;';
+  var $currentErrorPath = it.errorPath;
+  out += 'var missing' + ($lvl) + ';';
+  for (var $property in $propertyDeps) {
+    $deps = $propertyDeps[$property];
+    if ($deps.length) {
+      out += ' if ( ' + ($data) + (it.util.getProperty($property)) + ' !== undefined ';
+      if ($ownProperties) {
+        out += ' && Object.prototype.hasOwnProperty.call(' + ($data) + ', \'' + (it.util.escapeQuotes($property)) + '\') ';
+      }
+      if ($breakOnError) {
+        out += ' && ( ';
+        var arr1 = $deps;
+        if (arr1) {
+          var $propertyKey, $i = -1,
+            l1 = arr1.length - 1;
+          while ($i < l1) {
+            $propertyKey = arr1[$i += 1];
+            if ($i) {
+              out += ' || ';
+            }
+            var $prop = it.util.getProperty($propertyKey),
+              $useData = $data + $prop;
+            out += ' ( ( ' + ($useData) + ' === undefined ';
+            if ($ownProperties) {
+              out += ' || ! Object.prototype.hasOwnProperty.call(' + ($data) + ', \'' + (it.util.escapeQuotes($propertyKey)) + '\') ';
+            }
+            out += ') && (missing' + ($lvl) + ' = ' + (it.util.toQuotedString(it.opts.jsonPointers ? $propertyKey : $prop)) + ') ) ';
+          }
+        }
+        out += ')) {  ';
+        var $propertyPath = 'missing' + $lvl,
+          $missingProperty = '\' + ' + $propertyPath + ' + \'';
+        if (it.opts._errorDataPathProperty) {
+          it.errorPath = it.opts.jsonPointers ? it.util.getPathExpr($currentErrorPath, $propertyPath, true) : $currentErrorPath + ' + ' + $propertyPath;
+        }
+        var $$outStack = $$outStack || [];
+        $$outStack.push(out);
+        out = ''; /* istanbul ignore else */
+        if (it.createErrors !== false) {
+          out += ' { keyword: \'' + ('dependencies') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { property: \'' + (it.util.escapeQuotes($property)) + '\', missingProperty: \'' + ($missingProperty) + '\', depsCount: ' + ($deps.length) + ', deps: \'' + (it.util.escapeQuotes($deps.length == 1 ? $deps[0] : $deps.join(", "))) + '\' } ';
+          if (it.opts.messages !== false) {
+            out += ' , message: \'should have ';
+            if ($deps.length == 1) {
+              out += 'property ' + (it.util.escapeQuotes($deps[0]));
+            } else {
+              out += 'properties ' + (it.util.escapeQuotes($deps.join(", ")));
+            }
+            out += ' when property ' + (it.util.escapeQuotes($property)) + ' is present\' ';
+          }
+          if (it.opts.verbose) {
+            out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+          }
+          out += ' } ';
+        } else {
+          out += ' {} ';
+        }
+        var __err = out;
+        out = $$outStack.pop();
+        if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+          if (it.async) {
+            out += ' throw new ValidationError([' + (__err) + ']); ';
+          } else {
+            out += ' validate.errors = [' + (__err) + ']; return false; ';
+          }
+        } else {
+          out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+        }
+      } else {
+        out += ' ) { ';
+        var arr2 = $deps;
+        if (arr2) {
+          var $propertyKey, i2 = -1,
+            l2 = arr2.length - 1;
+          while (i2 < l2) {
+            $propertyKey = arr2[i2 += 1];
+            var $prop = it.util.getProperty($propertyKey),
+              $missingProperty = it.util.escapeQuotes($propertyKey),
+              $useData = $data + $prop;
+            if (it.opts._errorDataPathProperty) {
+              it.errorPath = it.util.getPath($currentErrorPath, $propertyKey, it.opts.jsonPointers);
+            }
+            out += ' if ( ' + ($useData) + ' === undefined ';
+            if ($ownProperties) {
+              out += ' || ! Object.prototype.hasOwnProperty.call(' + ($data) + ', \'' + (it.util.escapeQuotes($propertyKey)) + '\') ';
+            }
+            out += ') {  var err =   '; /* istanbul ignore else */
+            if (it.createErrors !== false) {
+              out += ' { keyword: \'' + ('dependencies') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { property: \'' + (it.util.escapeQuotes($property)) + '\', missingProperty: \'' + ($missingProperty) + '\', depsCount: ' + ($deps.length) + ', deps: \'' + (it.util.escapeQuotes($deps.length == 1 ? $deps[0] : $deps.join(", "))) + '\' } ';
+              if (it.opts.messages !== false) {
+                out += ' , message: \'should have ';
+                if ($deps.length == 1) {
+                  out += 'property ' + (it.util.escapeQuotes($deps[0]));
+                } else {
+                  out += 'properties ' + (it.util.escapeQuotes($deps.join(", ")));
+                }
+                out += ' when property ' + (it.util.escapeQuotes($property)) + ' is present\' ';
+              }
+              if (it.opts.verbose) {
+                out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+              }
+              out += ' } ';
+            } else {
+              out += ' {} ';
+            }
+            out += ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; } ';
+          }
+        }
+      }
+      out += ' }   ';
+      if ($breakOnError) {
+        $closingBraces += '}';
+        out += ' else { ';
+      }
+    }
+  }
+  it.errorPath = $currentErrorPath;
+  var $currentBaseId = $it.baseId;
+  for (var $property in $schemaDeps) {
+    var $sch = $schemaDeps[$property];
+    if (it.util.schemaHasRules($sch, it.RULES.all)) {
+      out += ' ' + ($nextValid) + ' = true; if ( ' + ($data) + (it.util.getProperty($property)) + ' !== undefined ';
+      if ($ownProperties) {
+        out += ' && Object.prototype.hasOwnProperty.call(' + ($data) + ', \'' + (it.util.escapeQuotes($property)) + '\') ';
+      }
+      out += ') { ';
+      $it.schema = $sch;
+      $it.schemaPath = $schemaPath + it.util.getProperty($property);
+      $it.errSchemaPath = $errSchemaPath + '/' + it.util.escapeFragment($property);
+      out += '  ' + (it.validate($it)) + ' ';
+      $it.baseId = $currentBaseId;
+      out += ' }  ';
+      if ($breakOnError) {
+        out += ' if (' + ($nextValid) + ') { ';
+        $closingBraces += '}';
+      }
+    }
+  }
+  if ($breakOnError) {
+    out += '   ' + ($closingBraces) + ' if (' + ($errs) + ' == errors) {';
+  }
+  out = it.util.cleanUpCode(out);
+  return out;
+}
+
+
+/***/ }),
+/* 487 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function generate_enum(it, $keyword, $ruleType) {
+  var out = ' ';
+  var $lvl = it.level;
+  var $dataLvl = it.dataLevel;
+  var $schema = it.schema[$keyword];
+  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
+  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
+  var $breakOnError = !it.opts.allErrors;
+  var $data = 'data' + ($dataLvl || '');
+  var $valid = 'valid' + $lvl;
+  var $isData = it.opts.$data && $schema && $schema.$data,
+    $schemaValue;
+  if ($isData) {
+    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
+    $schemaValue = 'schema' + $lvl;
+  } else {
+    $schemaValue = $schema;
+  }
+  var $i = 'i' + $lvl,
+    $vSchema = 'schema' + $lvl;
+  if (!$isData) {
+    out += ' var ' + ($vSchema) + ' = validate.schema' + ($schemaPath) + ';';
+  }
+  out += 'var ' + ($valid) + ';';
+  if ($isData) {
+    out += ' if (schema' + ($lvl) + ' === undefined) ' + ($valid) + ' = true; else if (!Array.isArray(schema' + ($lvl) + ')) ' + ($valid) + ' = false; else {';
+  }
+  out += '' + ($valid) + ' = false;for (var ' + ($i) + '=0; ' + ($i) + '<' + ($vSchema) + '.length; ' + ($i) + '++) if (equal(' + ($data) + ', ' + ($vSchema) + '[' + ($i) + '])) { ' + ($valid) + ' = true; break; }';
+  if ($isData) {
+    out += '  }  ';
+  }
+  out += ' if (!' + ($valid) + ') {   ';
+  var $$outStack = $$outStack || [];
+  $$outStack.push(out);
+  out = ''; /* istanbul ignore else */
+  if (it.createErrors !== false) {
+    out += ' { keyword: \'' + ('enum') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { allowedValues: schema' + ($lvl) + ' } ';
+    if (it.opts.messages !== false) {
+      out += ' , message: \'should be equal to one of the allowed values\' ';
+    }
+    if (it.opts.verbose) {
+      out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+    }
+    out += ' } ';
+  } else {
+    out += ' {} ';
+  }
+  var __err = out;
+  out = $$outStack.pop();
+  if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+    if (it.async) {
+      out += ' throw new ValidationError([' + (__err) + ']); ';
+    } else {
+      out += ' validate.errors = [' + (__err) + ']; return false; ';
+    }
+  } else {
+    out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+  }
+  out += ' }';
+  if ($breakOnError) {
+    out += ' else { ';
+  }
+  return out;
+}
+
+
+/***/ }),
+/* 488 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function generate_format(it, $keyword, $ruleType) {
+  var out = ' ';
+  var $lvl = it.level;
+  var $dataLvl = it.dataLevel;
+  var $schema = it.schema[$keyword];
+  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
+  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
+  var $breakOnError = !it.opts.allErrors;
+  var $data = 'data' + ($dataLvl || '');
+  if (it.opts.format === false) {
+    if ($breakOnError) {
+      out += ' if (true) { ';
+    }
+    return out;
+  }
+  var $isData = it.opts.$data && $schema && $schema.$data,
+    $schemaValue;
+  if ($isData) {
+    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
+    $schemaValue = 'schema' + $lvl;
+  } else {
+    $schemaValue = $schema;
+  }
+  var $unknownFormats = it.opts.unknownFormats,
+    $allowUnknown = Array.isArray($unknownFormats);
+  if ($isData) {
+    var $format = 'format' + $lvl,
+      $isObject = 'isObject' + $lvl,
+      $formatType = 'formatType' + $lvl;
+    out += ' var ' + ($format) + ' = formats[' + ($schemaValue) + ']; var ' + ($isObject) + ' = typeof ' + ($format) + ' == \'object\' && !(' + ($format) + ' instanceof RegExp) && ' + ($format) + '.validate; var ' + ($formatType) + ' = ' + ($isObject) + ' && ' + ($format) + '.type || \'string\'; if (' + ($isObject) + ') { ';
+    if (it.async) {
+      out += ' var async' + ($lvl) + ' = ' + ($format) + '.async; ';
+    }
+    out += ' ' + ($format) + ' = ' + ($format) + '.validate; } if (  ';
+    if ($isData) {
+      out += ' (' + ($schemaValue) + ' !== undefined && typeof ' + ($schemaValue) + ' != \'string\') || ';
+    }
+    out += ' (';
+    if ($unknownFormats != 'ignore') {
+      out += ' (' + ($schemaValue) + ' && !' + ($format) + ' ';
+      if ($allowUnknown) {
+        out += ' && self._opts.unknownFormats.indexOf(' + ($schemaValue) + ') == -1 ';
+      }
+      out += ') || ';
+    }
+    out += ' (' + ($format) + ' && ' + ($formatType) + ' == \'' + ($ruleType) + '\' && !(typeof ' + ($format) + ' == \'function\' ? ';
+    if (it.async) {
+      out += ' (async' + ($lvl) + ' ? ' + (it.yieldAwait) + ' ' + ($format) + '(' + ($data) + ') : ' + ($format) + '(' + ($data) + ')) ';
+    } else {
+      out += ' ' + ($format) + '(' + ($data) + ') ';
+    }
+    out += ' : ' + ($format) + '.test(' + ($data) + '))))) {';
+  } else {
+    var $format = it.formats[$schema];
+    if (!$format) {
+      if ($unknownFormats == 'ignore') {
+        it.logger.warn('unknown format "' + $schema + '" ignored in schema at path "' + it.errSchemaPath + '"');
+        if ($breakOnError) {
+          out += ' if (true) { ';
+        }
+        return out;
+      } else if ($allowUnknown && $unknownFormats.indexOf($schema) >= 0) {
+        if ($breakOnError) {
+          out += ' if (true) { ';
+        }
+        return out;
+      } else {
+        throw new Error('unknown format "' + $schema + '" is used in schema at path "' + it.errSchemaPath + '"');
+      }
+    }
+    var $isObject = typeof $format == 'object' && !($format instanceof RegExp) && $format.validate;
+    var $formatType = $isObject && $format.type || 'string';
+    if ($isObject) {
+      var $async = $format.async === true;
+      $format = $format.validate;
+    }
+    if ($formatType != $ruleType) {
+      if ($breakOnError) {
+        out += ' if (true) { ';
+      }
+      return out;
+    }
+    if ($async) {
+      if (!it.async) throw new Error('async format in sync schema');
+      var $formatRef = 'formats' + it.util.getProperty($schema) + '.validate';
+      out += ' if (!(' + (it.yieldAwait) + ' ' + ($formatRef) + '(' + ($data) + '))) { ';
+    } else {
+      out += ' if (! ';
+      var $formatRef = 'formats' + it.util.getProperty($schema);
+      if ($isObject) $formatRef += '.validate';
+      if (typeof $format == 'function') {
+        out += ' ' + ($formatRef) + '(' + ($data) + ') ';
+      } else {
+        out += ' ' + ($formatRef) + '.test(' + ($data) + ') ';
+      }
+      out += ') { ';
+    }
+  }
+  var $$outStack = $$outStack || [];
+  $$outStack.push(out);
+  out = ''; /* istanbul ignore else */
+  if (it.createErrors !== false) {
+    out += ' { keyword: \'' + ('format') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { format:  ';
+    if ($isData) {
+      out += '' + ($schemaValue);
+    } else {
+      out += '' + (it.util.toQuotedString($schema));
+    }
+    out += '  } ';
+    if (it.opts.messages !== false) {
+      out += ' , message: \'should match format "';
+      if ($isData) {
+        out += '\' + ' + ($schemaValue) + ' + \'';
+      } else {
+        out += '' + (it.util.escapeQuotes($schema));
+      }
+      out += '"\' ';
+    }
+    if (it.opts.verbose) {
+      out += ' , schema:  ';
+      if ($isData) {
+        out += 'validate.schema' + ($schemaPath);
+      } else {
+        out += '' + (it.util.toQuotedString($schema));
+      }
+      out += '         , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+    }
+    out += ' } ';
+  } else {
+    out += ' {} ';
+  }
+  var __err = out;
+  out = $$outStack.pop();
+  if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+    if (it.async) {
+      out += ' throw new ValidationError([' + (__err) + ']); ';
+    } else {
+      out += ' validate.errors = [' + (__err) + ']; return false; ';
+    }
+  } else {
+    out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+  }
+  out += ' } ';
+  if ($breakOnError) {
+    out += ' else { ';
+  }
+  return out;
+}
+
+
+/***/ }),
+/* 489 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function generate_items(it, $keyword, $ruleType) {
+  var out = ' ';
+  var $lvl = it.level;
+  var $dataLvl = it.dataLevel;
+  var $schema = it.schema[$keyword];
+  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
+  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
+  var $breakOnError = !it.opts.allErrors;
+  var $data = 'data' + ($dataLvl || '');
+  var $valid = 'valid' + $lvl;
+  var $errs = 'errs__' + $lvl;
+  var $it = it.util.copy(it);
+  var $closingBraces = '';
+  $it.level++;
+  var $nextValid = 'valid' + $it.level;
+  var $idx = 'i' + $lvl,
+    $dataNxt = $it.dataLevel = it.dataLevel + 1,
+    $nextData = 'data' + $dataNxt,
+    $currentBaseId = it.baseId;
+  out += 'var ' + ($errs) + ' = errors;var ' + ($valid) + ';';
+  if (Array.isArray($schema)) {
+    var $additionalItems = it.schema.additionalItems;
+    if ($additionalItems === false) {
+      out += ' ' + ($valid) + ' = ' + ($data) + '.length <= ' + ($schema.length) + '; ';
+      var $currErrSchemaPath = $errSchemaPath;
+      $errSchemaPath = it.errSchemaPath + '/additionalItems';
+      out += '  if (!' + ($valid) + ') {   ';
+      var $$outStack = $$outStack || [];
+      $$outStack.push(out);
+      out = ''; /* istanbul ignore else */
+      if (it.createErrors !== false) {
+        out += ' { keyword: \'' + ('additionalItems') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { limit: ' + ($schema.length) + ' } ';
+        if (it.opts.messages !== false) {
+          out += ' , message: \'should NOT have more than ' + ($schema.length) + ' items\' ';
+        }
+        if (it.opts.verbose) {
+          out += ' , schema: false , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+        }
+        out += ' } ';
+      } else {
+        out += ' {} ';
+      }
+      var __err = out;
+      out = $$outStack.pop();
+      if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+        if (it.async) {
+          out += ' throw new ValidationError([' + (__err) + ']); ';
+        } else {
+          out += ' validate.errors = [' + (__err) + ']; return false; ';
+        }
+      } else {
+        out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+      }
+      out += ' } ';
+      $errSchemaPath = $currErrSchemaPath;
+      if ($breakOnError) {
+        $closingBraces += '}';
+        out += ' else { ';
+      }
+    }
+    var arr1 = $schema;
+    if (arr1) {
+      var $sch, $i = -1,
+        l1 = arr1.length - 1;
+      while ($i < l1) {
+        $sch = arr1[$i += 1];
+        if (it.util.schemaHasRules($sch, it.RULES.all)) {
+          out += ' ' + ($nextValid) + ' = true; if (' + ($data) + '.length > ' + ($i) + ') { ';
+          var $passData = $data + '[' + $i + ']';
+          $it.schema = $sch;
+          $it.schemaPath = $schemaPath + '[' + $i + ']';
+          $it.errSchemaPath = $errSchemaPath + '/' + $i;
+          $it.errorPath = it.util.getPathExpr(it.errorPath, $i, it.opts.jsonPointers, true);
+          $it.dataPathArr[$dataNxt] = $i;
+          var $code = it.validate($it);
+          $it.baseId = $currentBaseId;
+          if (it.util.varOccurences($code, $nextData) < 2) {
+            out += ' ' + (it.util.varReplace($code, $nextData, $passData)) + ' ';
+          } else {
+            out += ' var ' + ($nextData) + ' = ' + ($passData) + '; ' + ($code) + ' ';
+          }
+          out += ' }  ';
+          if ($breakOnError) {
+            out += ' if (' + ($nextValid) + ') { ';
+            $closingBraces += '}';
+          }
+        }
+      }
+    }
+    if (typeof $additionalItems == 'object' && it.util.schemaHasRules($additionalItems, it.RULES.all)) {
+      $it.schema = $additionalItems;
+      $it.schemaPath = it.schemaPath + '.additionalItems';
+      $it.errSchemaPath = it.errSchemaPath + '/additionalItems';
+      out += ' ' + ($nextValid) + ' = true; if (' + ($data) + '.length > ' + ($schema.length) + ') {  for (var ' + ($idx) + ' = ' + ($schema.length) + '; ' + ($idx) + ' < ' + ($data) + '.length; ' + ($idx) + '++) { ';
+      $it.errorPath = it.util.getPathExpr(it.errorPath, $idx, it.opts.jsonPointers, true);
+      var $passData = $data + '[' + $idx + ']';
+      $it.dataPathArr[$dataNxt] = $idx;
+      var $code = it.validate($it);
+      $it.baseId = $currentBaseId;
+      if (it.util.varOccurences($code, $nextData) < 2) {
+        out += ' ' + (it.util.varReplace($code, $nextData, $passData)) + ' ';
+      } else {
+        out += ' var ' + ($nextData) + ' = ' + ($passData) + '; ' + ($code) + ' ';
+      }
+      if ($breakOnError) {
+        out += ' if (!' + ($nextValid) + ') break; ';
+      }
+      out += ' } }  ';
+      if ($breakOnError) {
+        out += ' if (' + ($nextValid) + ') { ';
+        $closingBraces += '}';
+      }
+    }
+  } else if (it.util.schemaHasRules($schema, it.RULES.all)) {
+    $it.schema = $schema;
+    $it.schemaPath = $schemaPath;
+    $it.errSchemaPath = $errSchemaPath;
+    out += '  for (var ' + ($idx) + ' = ' + (0) + '; ' + ($idx) + ' < ' + ($data) + '.length; ' + ($idx) + '++) { ';
+    $it.errorPath = it.util.getPathExpr(it.errorPath, $idx, it.opts.jsonPointers, true);
+    var $passData = $data + '[' + $idx + ']';
+    $it.dataPathArr[$dataNxt] = $idx;
+    var $code = it.validate($it);
+    $it.baseId = $currentBaseId;
+    if (it.util.varOccurences($code, $nextData) < 2) {
+      out += ' ' + (it.util.varReplace($code, $nextData, $passData)) + ' ';
+    } else {
+      out += ' var ' + ($nextData) + ' = ' + ($passData) + '; ' + ($code) + ' ';
+    }
+    if ($breakOnError) {
+      out += ' if (!' + ($nextValid) + ') break; ';
+    }
+    out += ' }';
+  }
+  if ($breakOnError) {
+    out += ' ' + ($closingBraces) + ' if (' + ($errs) + ' == errors) {';
+  }
+  out = it.util.cleanUpCode(out);
+  return out;
+}
+
+
+/***/ }),
+/* 490 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function generate_multipleOf(it, $keyword, $ruleType) {
+  var out = ' ';
+  var $lvl = it.level;
+  var $dataLvl = it.dataLevel;
+  var $schema = it.schema[$keyword];
+  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
+  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
+  var $breakOnError = !it.opts.allErrors;
+  var $data = 'data' + ($dataLvl || '');
+  var $isData = it.opts.$data && $schema && $schema.$data,
+    $schemaValue;
+  if ($isData) {
+    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
+    $schemaValue = 'schema' + $lvl;
+  } else {
+    $schemaValue = $schema;
+  }
+  out += 'var division' + ($lvl) + ';if (';
+  if ($isData) {
+    out += ' ' + ($schemaValue) + ' !== undefined && ( typeof ' + ($schemaValue) + ' != \'number\' || ';
+  }
+  out += ' (division' + ($lvl) + ' = ' + ($data) + ' / ' + ($schemaValue) + ', ';
+  if (it.opts.multipleOfPrecision) {
+    out += ' Math.abs(Math.round(division' + ($lvl) + ') - division' + ($lvl) + ') > 1e-' + (it.opts.multipleOfPrecision) + ' ';
+  } else {
+    out += ' division' + ($lvl) + ' !== parseInt(division' + ($lvl) + ') ';
+  }
+  out += ' ) ';
+  if ($isData) {
+    out += '  )  ';
+  }
+  out += ' ) {   ';
+  var $$outStack = $$outStack || [];
+  $$outStack.push(out);
+  out = ''; /* istanbul ignore else */
+  if (it.createErrors !== false) {
+    out += ' { keyword: \'' + ('multipleOf') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { multipleOf: ' + ($schemaValue) + ' } ';
+    if (it.opts.messages !== false) {
+      out += ' , message: \'should be multiple of ';
+      if ($isData) {
+        out += '\' + ' + ($schemaValue);
+      } else {
+        out += '' + ($schemaValue) + '\'';
+      }
+    }
+    if (it.opts.verbose) {
+      out += ' , schema:  ';
+      if ($isData) {
+        out += 'validate.schema' + ($schemaPath);
+      } else {
+        out += '' + ($schema);
+      }
+      out += '         , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+    }
+    out += ' } ';
+  } else {
+    out += ' {} ';
+  }
+  var __err = out;
+  out = $$outStack.pop();
+  if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+    if (it.async) {
+      out += ' throw new ValidationError([' + (__err) + ']); ';
+    } else {
+      out += ' validate.errors = [' + (__err) + ']; return false; ';
+    }
+  } else {
+    out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+  }
+  out += '} ';
+  if ($breakOnError) {
+    out += ' else { ';
+  }
+  return out;
+}
+
+
+/***/ }),
+/* 491 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function generate_not(it, $keyword, $ruleType) {
+  var out = ' ';
+  var $lvl = it.level;
+  var $dataLvl = it.dataLevel;
+  var $schema = it.schema[$keyword];
+  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
+  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
+  var $breakOnError = !it.opts.allErrors;
+  var $data = 'data' + ($dataLvl || '');
+  var $errs = 'errs__' + $lvl;
+  var $it = it.util.copy(it);
+  $it.level++;
+  var $nextValid = 'valid' + $it.level;
+  if (it.util.schemaHasRules($schema, it.RULES.all)) {
+    $it.schema = $schema;
+    $it.schemaPath = $schemaPath;
+    $it.errSchemaPath = $errSchemaPath;
+    out += ' var ' + ($errs) + ' = errors;  ';
+    var $wasComposite = it.compositeRule;
+    it.compositeRule = $it.compositeRule = true;
+    $it.createErrors = false;
+    var $allErrorsOption;
+    if ($it.opts.allErrors) {
+      $allErrorsOption = $it.opts.allErrors;
+      $it.opts.allErrors = false;
+    }
+    out += ' ' + (it.validate($it)) + ' ';
+    $it.createErrors = true;
+    if ($allErrorsOption) $it.opts.allErrors = $allErrorsOption;
+    it.compositeRule = $it.compositeRule = $wasComposite;
+    out += ' if (' + ($nextValid) + ') {   ';
+    var $$outStack = $$outStack || [];
+    $$outStack.push(out);
+    out = ''; /* istanbul ignore else */
+    if (it.createErrors !== false) {
+      out += ' { keyword: \'' + ('not') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: {} ';
+      if (it.opts.messages !== false) {
+        out += ' , message: \'should NOT be valid\' ';
+      }
+      if (it.opts.verbose) {
+        out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+      }
+      out += ' } ';
+    } else {
+      out += ' {} ';
+    }
+    var __err = out;
+    out = $$outStack.pop();
+    if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+      if (it.async) {
+        out += ' throw new ValidationError([' + (__err) + ']); ';
+      } else {
+        out += ' validate.errors = [' + (__err) + ']; return false; ';
+      }
+    } else {
+      out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+    }
+    out += ' } else {  errors = ' + ($errs) + '; if (vErrors !== null) { if (' + ($errs) + ') vErrors.length = ' + ($errs) + '; else vErrors = null; } ';
+    if (it.opts.allErrors) {
+      out += ' } ';
+    }
+  } else {
+    out += '  var err =   '; /* istanbul ignore else */
+    if (it.createErrors !== false) {
+      out += ' { keyword: \'' + ('not') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: {} ';
+      if (it.opts.messages !== false) {
+        out += ' , message: \'should NOT be valid\' ';
+      }
+      if (it.opts.verbose) {
+        out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+      }
+      out += ' } ';
+    } else {
+      out += ' {} ';
+    }
+    out += ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+    if ($breakOnError) {
+      out += ' if (false) { ';
+    }
+  }
+  return out;
+}
+
+
+/***/ }),
+/* 492 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function generate_oneOf(it, $keyword, $ruleType) {
+  var out = ' ';
+  var $lvl = it.level;
+  var $dataLvl = it.dataLevel;
+  var $schema = it.schema[$keyword];
+  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
+  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
+  var $breakOnError = !it.opts.allErrors;
+  var $data = 'data' + ($dataLvl || '');
+  var $valid = 'valid' + $lvl;
+  var $errs = 'errs__' + $lvl;
+  var $it = it.util.copy(it);
+  var $closingBraces = '';
+  $it.level++;
+  var $nextValid = 'valid' + $it.level;
+  out += 'var ' + ($errs) + ' = errors;var prevValid' + ($lvl) + ' = false;var ' + ($valid) + ' = false;';
+  var $currentBaseId = $it.baseId;
+  var $wasComposite = it.compositeRule;
+  it.compositeRule = $it.compositeRule = true;
+  var arr1 = $schema;
+  if (arr1) {
+    var $sch, $i = -1,
+      l1 = arr1.length - 1;
+    while ($i < l1) {
+      $sch = arr1[$i += 1];
+      if (it.util.schemaHasRules($sch, it.RULES.all)) {
+        $it.schema = $sch;
+        $it.schemaPath = $schemaPath + '[' + $i + ']';
+        $it.errSchemaPath = $errSchemaPath + '/' + $i;
+        out += '  ' + (it.validate($it)) + ' ';
+        $it.baseId = $currentBaseId;
+      } else {
+        out += ' var ' + ($nextValid) + ' = true; ';
+      }
+      if ($i) {
+        out += ' if (' + ($nextValid) + ' && prevValid' + ($lvl) + ') ' + ($valid) + ' = false; else { ';
+        $closingBraces += '}';
+      }
+      out += ' if (' + ($nextValid) + ') ' + ($valid) + ' = prevValid' + ($lvl) + ' = true;';
+    }
+  }
+  it.compositeRule = $it.compositeRule = $wasComposite;
+  out += '' + ($closingBraces) + 'if (!' + ($valid) + ') {   var err =   '; /* istanbul ignore else */
+  if (it.createErrors !== false) {
+    out += ' { keyword: \'' + ('oneOf') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: {} ';
+    if (it.opts.messages !== false) {
+      out += ' , message: \'should match exactly one schema in oneOf\' ';
+    }
+    if (it.opts.verbose) {
+      out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+    }
+    out += ' } ';
+  } else {
+    out += ' {} ';
+  }
+  out += ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+  if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+    if (it.async) {
+      out += ' throw new ValidationError(vErrors); ';
+    } else {
+      out += ' validate.errors = vErrors; return false; ';
+    }
+  }
+  out += '} else {  errors = ' + ($errs) + '; if (vErrors !== null) { if (' + ($errs) + ') vErrors.length = ' + ($errs) + '; else vErrors = null; }';
+  if (it.opts.allErrors) {
+    out += ' } ';
+  }
+  return out;
+}
+
+
+/***/ }),
+/* 493 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function generate_pattern(it, $keyword, $ruleType) {
+  var out = ' ';
+  var $lvl = it.level;
+  var $dataLvl = it.dataLevel;
+  var $schema = it.schema[$keyword];
+  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
+  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
+  var $breakOnError = !it.opts.allErrors;
+  var $data = 'data' + ($dataLvl || '');
+  var $isData = it.opts.$data && $schema && $schema.$data,
+    $schemaValue;
+  if ($isData) {
+    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
+    $schemaValue = 'schema' + $lvl;
+  } else {
+    $schemaValue = $schema;
+  }
+  var $regexp = $isData ? '(new RegExp(' + $schemaValue + '))' : it.usePattern($schema);
+  out += 'if ( ';
+  if ($isData) {
+    out += ' (' + ($schemaValue) + ' !== undefined && typeof ' + ($schemaValue) + ' != \'string\') || ';
+  }
+  out += ' !' + ($regexp) + '.test(' + ($data) + ') ) {   ';
+  var $$outStack = $$outStack || [];
+  $$outStack.push(out);
+  out = ''; /* istanbul ignore else */
+  if (it.createErrors !== false) {
+    out += ' { keyword: \'' + ('pattern') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { pattern:  ';
+    if ($isData) {
+      out += '' + ($schemaValue);
+    } else {
+      out += '' + (it.util.toQuotedString($schema));
+    }
+    out += '  } ';
+    if (it.opts.messages !== false) {
+      out += ' , message: \'should match pattern "';
+      if ($isData) {
+        out += '\' + ' + ($schemaValue) + ' + \'';
+      } else {
+        out += '' + (it.util.escapeQuotes($schema));
+      }
+      out += '"\' ';
+    }
+    if (it.opts.verbose) {
+      out += ' , schema:  ';
+      if ($isData) {
+        out += 'validate.schema' + ($schemaPath);
+      } else {
+        out += '' + (it.util.toQuotedString($schema));
+      }
+      out += '         , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+    }
+    out += ' } ';
+  } else {
+    out += ' {} ';
+  }
+  var __err = out;
+  out = $$outStack.pop();
+  if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+    if (it.async) {
+      out += ' throw new ValidationError([' + (__err) + ']); ';
+    } else {
+      out += ' validate.errors = [' + (__err) + ']; return false; ';
+    }
+  } else {
+    out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+  }
+  out += '} ';
+  if ($breakOnError) {
+    out += ' else { ';
+  }
+  return out;
+}
+
+
+/***/ }),
+/* 494 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function generate_properties(it, $keyword, $ruleType) {
+  var out = ' ';
+  var $lvl = it.level;
+  var $dataLvl = it.dataLevel;
+  var $schema = it.schema[$keyword];
+  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
+  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
+  var $breakOnError = !it.opts.allErrors;
+  var $data = 'data' + ($dataLvl || '');
+  var $valid = 'valid' + $lvl;
+  var $errs = 'errs__' + $lvl;
+  var $it = it.util.copy(it);
+  var $closingBraces = '';
+  $it.level++;
+  var $nextValid = 'valid' + $it.level;
+  var $key = 'key' + $lvl,
+    $idx = 'idx' + $lvl,
+    $dataNxt = $it.dataLevel = it.dataLevel + 1,
+    $nextData = 'data' + $dataNxt,
+    $dataProperties = 'dataProperties' + $lvl;
+  var $schemaKeys = Object.keys($schema || {}),
+    $pProperties = it.schema.patternProperties || {},
+    $pPropertyKeys = Object.keys($pProperties),
+    $aProperties = it.schema.additionalProperties,
+    $someProperties = $schemaKeys.length || $pPropertyKeys.length,
+    $noAdditional = $aProperties === false,
+    $additionalIsSchema = typeof $aProperties == 'object' && Object.keys($aProperties).length,
+    $removeAdditional = it.opts.removeAdditional,
+    $checkAdditional = $noAdditional || $additionalIsSchema || $removeAdditional,
+    $ownProperties = it.opts.ownProperties,
+    $currentBaseId = it.baseId;
+  var $required = it.schema.required;
+  if ($required && !(it.opts.v5 && $required.$data) && $required.length < it.opts.loopRequired) var $requiredHash = it.util.toHash($required);
+  if (it.opts.patternGroups) {
+    var $pgProperties = it.schema.patternGroups || {},
+      $pgPropertyKeys = Object.keys($pgProperties);
+  }
+  out += 'var ' + ($errs) + ' = errors;var ' + ($nextValid) + ' = true;';
+  if ($ownProperties) {
+    out += ' var ' + ($dataProperties) + ' = undefined;';
+  }
+  if ($checkAdditional) {
+    if ($ownProperties) {
+      out += ' ' + ($dataProperties) + ' = ' + ($dataProperties) + ' || Object.keys(' + ($data) + '); for (var ' + ($idx) + '=0; ' + ($idx) + '<' + ($dataProperties) + '.length; ' + ($idx) + '++) { var ' + ($key) + ' = ' + ($dataProperties) + '[' + ($idx) + ']; ';
+    } else {
+      out += ' for (var ' + ($key) + ' in ' + ($data) + ') { ';
+    }
+    if ($someProperties) {
+      out += ' var isAdditional' + ($lvl) + ' = !(false ';
+      if ($schemaKeys.length) {
+        if ($schemaKeys.length > 5) {
+          out += ' || validate.schema' + ($schemaPath) + '[' + ($key) + '] ';
+        } else {
+          var arr1 = $schemaKeys;
+          if (arr1) {
+            var $propertyKey, i1 = -1,
+              l1 = arr1.length - 1;
+            while (i1 < l1) {
+              $propertyKey = arr1[i1 += 1];
+              out += ' || ' + ($key) + ' == ' + (it.util.toQuotedString($propertyKey)) + ' ';
+            }
+          }
+        }
+      }
+      if ($pPropertyKeys.length) {
+        var arr2 = $pPropertyKeys;
+        if (arr2) {
+          var $pProperty, $i = -1,
+            l2 = arr2.length - 1;
+          while ($i < l2) {
+            $pProperty = arr2[$i += 1];
+            out += ' || ' + (it.usePattern($pProperty)) + '.test(' + ($key) + ') ';
+          }
+        }
+      }
+      if (it.opts.patternGroups && $pgPropertyKeys.length) {
+        var arr3 = $pgPropertyKeys;
+        if (arr3) {
+          var $pgProperty, $i = -1,
+            l3 = arr3.length - 1;
+          while ($i < l3) {
+            $pgProperty = arr3[$i += 1];
+            out += ' || ' + (it.usePattern($pgProperty)) + '.test(' + ($key) + ') ';
+          }
+        }
+      }
+      out += ' ); if (isAdditional' + ($lvl) + ') { ';
+    }
+    if ($removeAdditional == 'all') {
+      out += ' delete ' + ($data) + '[' + ($key) + ']; ';
+    } else {
+      var $currentErrorPath = it.errorPath;
+      var $additionalProperty = '\' + ' + $key + ' + \'';
+      if (it.opts._errorDataPathProperty) {
+        it.errorPath = it.util.getPathExpr(it.errorPath, $key, it.opts.jsonPointers);
+      }
+      if ($noAdditional) {
+        if ($removeAdditional) {
+          out += ' delete ' + ($data) + '[' + ($key) + ']; ';
+        } else {
+          out += ' ' + ($nextValid) + ' = false; ';
+          var $currErrSchemaPath = $errSchemaPath;
+          $errSchemaPath = it.errSchemaPath + '/additionalProperties';
+          var $$outStack = $$outStack || [];
+          $$outStack.push(out);
+          out = ''; /* istanbul ignore else */
+          if (it.createErrors !== false) {
+            out += ' { keyword: \'' + ('additionalProperties') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { additionalProperty: \'' + ($additionalProperty) + '\' } ';
+            if (it.opts.messages !== false) {
+              out += ' , message: \'should NOT have additional properties\' ';
+            }
+            if (it.opts.verbose) {
+              out += ' , schema: false , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+            }
+            out += ' } ';
+          } else {
+            out += ' {} ';
+          }
+          var __err = out;
+          out = $$outStack.pop();
+          if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+            if (it.async) {
+              out += ' throw new ValidationError([' + (__err) + ']); ';
+            } else {
+              out += ' validate.errors = [' + (__err) + ']; return false; ';
+            }
+          } else {
+            out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+          }
+          $errSchemaPath = $currErrSchemaPath;
+          if ($breakOnError) {
+            out += ' break; ';
+          }
+        }
+      } else if ($additionalIsSchema) {
+        if ($removeAdditional == 'failing') {
+          out += ' var ' + ($errs) + ' = errors;  ';
+          var $wasComposite = it.compositeRule;
+          it.compositeRule = $it.compositeRule = true;
+          $it.schema = $aProperties;
+          $it.schemaPath = it.schemaPath + '.additionalProperties';
+          $it.errSchemaPath = it.errSchemaPath + '/additionalProperties';
+          $it.errorPath = it.opts._errorDataPathProperty ? it.errorPath : it.util.getPathExpr(it.errorPath, $key, it.opts.jsonPointers);
+          var $passData = $data + '[' + $key + ']';
+          $it.dataPathArr[$dataNxt] = $key;
+          var $code = it.validate($it);
+          $it.baseId = $currentBaseId;
+          if (it.util.varOccurences($code, $nextData) < 2) {
+            out += ' ' + (it.util.varReplace($code, $nextData, $passData)) + ' ';
+          } else {
+            out += ' var ' + ($nextData) + ' = ' + ($passData) + '; ' + ($code) + ' ';
+          }
+          out += ' if (!' + ($nextValid) + ') { errors = ' + ($errs) + '; if (validate.errors !== null) { if (errors) validate.errors.length = errors; else validate.errors = null; } delete ' + ($data) + '[' + ($key) + ']; }  ';
+          it.compositeRule = $it.compositeRule = $wasComposite;
+        } else {
+          $it.schema = $aProperties;
+          $it.schemaPath = it.schemaPath + '.additionalProperties';
+          $it.errSchemaPath = it.errSchemaPath + '/additionalProperties';
+          $it.errorPath = it.opts._errorDataPathProperty ? it.errorPath : it.util.getPathExpr(it.errorPath, $key, it.opts.jsonPointers);
+          var $passData = $data + '[' + $key + ']';
+          $it.dataPathArr[$dataNxt] = $key;
+          var $code = it.validate($it);
+          $it.baseId = $currentBaseId;
+          if (it.util.varOccurences($code, $nextData) < 2) {
+            out += ' ' + (it.util.varReplace($code, $nextData, $passData)) + ' ';
+          } else {
+            out += ' var ' + ($nextData) + ' = ' + ($passData) + '; ' + ($code) + ' ';
+          }
+          if ($breakOnError) {
+            out += ' if (!' + ($nextValid) + ') break; ';
+          }
+        }
+      }
+      it.errorPath = $currentErrorPath;
+    }
+    if ($someProperties) {
+      out += ' } ';
+    }
+    out += ' }  ';
+    if ($breakOnError) {
+      out += ' if (' + ($nextValid) + ') { ';
+      $closingBraces += '}';
+    }
+  }
+  var $useDefaults = it.opts.useDefaults && !it.compositeRule;
+  if ($schemaKeys.length) {
+    var arr4 = $schemaKeys;
+    if (arr4) {
+      var $propertyKey, i4 = -1,
+        l4 = arr4.length - 1;
+      while (i4 < l4) {
+        $propertyKey = arr4[i4 += 1];
+        var $sch = $schema[$propertyKey];
+        if (it.util.schemaHasRules($sch, it.RULES.all)) {
+          var $prop = it.util.getProperty($propertyKey),
+            $passData = $data + $prop,
+            $hasDefault = $useDefaults && $sch.default !== undefined;
+          $it.schema = $sch;
+          $it.schemaPath = $schemaPath + $prop;
+          $it.errSchemaPath = $errSchemaPath + '/' + it.util.escapeFragment($propertyKey);
+          $it.errorPath = it.util.getPath(it.errorPath, $propertyKey, it.opts.jsonPointers);
+          $it.dataPathArr[$dataNxt] = it.util.toQuotedString($propertyKey);
+          var $code = it.validate($it);
+          $it.baseId = $currentBaseId;
+          if (it.util.varOccurences($code, $nextData) < 2) {
+            $code = it.util.varReplace($code, $nextData, $passData);
+            var $useData = $passData;
+          } else {
+            var $useData = $nextData;
+            out += ' var ' + ($nextData) + ' = ' + ($passData) + '; ';
+          }
+          if ($hasDefault) {
+            out += ' ' + ($code) + ' ';
+          } else {
+            if ($requiredHash && $requiredHash[$propertyKey]) {
+              out += ' if ( ' + ($useData) + ' === undefined ';
+              if ($ownProperties) {
+                out += ' || ! Object.prototype.hasOwnProperty.call(' + ($data) + ', \'' + (it.util.escapeQuotes($propertyKey)) + '\') ';
+              }
+              out += ') { ' + ($nextValid) + ' = false; ';
+              var $currentErrorPath = it.errorPath,
+                $currErrSchemaPath = $errSchemaPath,
+                $missingProperty = it.util.escapeQuotes($propertyKey);
+              if (it.opts._errorDataPathProperty) {
+                it.errorPath = it.util.getPath($currentErrorPath, $propertyKey, it.opts.jsonPointers);
+              }
+              $errSchemaPath = it.errSchemaPath + '/required';
+              var $$outStack = $$outStack || [];
+              $$outStack.push(out);
+              out = ''; /* istanbul ignore else */
+              if (it.createErrors !== false) {
+                out += ' { keyword: \'' + ('required') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { missingProperty: \'' + ($missingProperty) + '\' } ';
+                if (it.opts.messages !== false) {
+                  out += ' , message: \'';
+                  if (it.opts._errorDataPathProperty) {
+                    out += 'is a required property';
+                  } else {
+                    out += 'should have required property \\\'' + ($missingProperty) + '\\\'';
+                  }
+                  out += '\' ';
+                }
+                if (it.opts.verbose) {
+                  out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+                }
+                out += ' } ';
+              } else {
+                out += ' {} ';
+              }
+              var __err = out;
+              out = $$outStack.pop();
+              if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+                if (it.async) {
+                  out += ' throw new ValidationError([' + (__err) + ']); ';
+                } else {
+                  out += ' validate.errors = [' + (__err) + ']; return false; ';
+                }
+              } else {
+                out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+              }
+              $errSchemaPath = $currErrSchemaPath;
+              it.errorPath = $currentErrorPath;
+              out += ' } else { ';
+            } else {
+              if ($breakOnError) {
+                out += ' if ( ' + ($useData) + ' === undefined ';
+                if ($ownProperties) {
+                  out += ' || ! Object.prototype.hasOwnProperty.call(' + ($data) + ', \'' + (it.util.escapeQuotes($propertyKey)) + '\') ';
+                }
+                out += ') { ' + ($nextValid) + ' = true; } else { ';
+              } else {
+                out += ' if (' + ($useData) + ' !== undefined ';
+                if ($ownProperties) {
+                  out += ' &&   Object.prototype.hasOwnProperty.call(' + ($data) + ', \'' + (it.util.escapeQuotes($propertyKey)) + '\') ';
+                }
+                out += ' ) { ';
+              }
+            }
+            out += ' ' + ($code) + ' } ';
+          }
+        }
+        if ($breakOnError) {
+          out += ' if (' + ($nextValid) + ') { ';
+          $closingBraces += '}';
+        }
+      }
+    }
+  }
+  if ($pPropertyKeys.length) {
+    var arr5 = $pPropertyKeys;
+    if (arr5) {
+      var $pProperty, i5 = -1,
+        l5 = arr5.length - 1;
+      while (i5 < l5) {
+        $pProperty = arr5[i5 += 1];
+        var $sch = $pProperties[$pProperty];
+        if (it.util.schemaHasRules($sch, it.RULES.all)) {
+          $it.schema = $sch;
+          $it.schemaPath = it.schemaPath + '.patternProperties' + it.util.getProperty($pProperty);
+          $it.errSchemaPath = it.errSchemaPath + '/patternProperties/' + it.util.escapeFragment($pProperty);
+          if ($ownProperties) {
+            out += ' ' + ($dataProperties) + ' = ' + ($dataProperties) + ' || Object.keys(' + ($data) + '); for (var ' + ($idx) + '=0; ' + ($idx) + '<' + ($dataProperties) + '.length; ' + ($idx) + '++) { var ' + ($key) + ' = ' + ($dataProperties) + '[' + ($idx) + ']; ';
+          } else {
+            out += ' for (var ' + ($key) + ' in ' + ($data) + ') { ';
+          }
+          out += ' if (' + (it.usePattern($pProperty)) + '.test(' + ($key) + ')) { ';
+          $it.errorPath = it.util.getPathExpr(it.errorPath, $key, it.opts.jsonPointers);
+          var $passData = $data + '[' + $key + ']';
+          $it.dataPathArr[$dataNxt] = $key;
+          var $code = it.validate($it);
+          $it.baseId = $currentBaseId;
+          if (it.util.varOccurences($code, $nextData) < 2) {
+            out += ' ' + (it.util.varReplace($code, $nextData, $passData)) + ' ';
+          } else {
+            out += ' var ' + ($nextData) + ' = ' + ($passData) + '; ' + ($code) + ' ';
+          }
+          if ($breakOnError) {
+            out += ' if (!' + ($nextValid) + ') break; ';
+          }
+          out += ' } ';
+          if ($breakOnError) {
+            out += ' else ' + ($nextValid) + ' = true; ';
+          }
+          out += ' }  ';
+          if ($breakOnError) {
+            out += ' if (' + ($nextValid) + ') { ';
+            $closingBraces += '}';
+          }
+        }
+      }
+    }
+  }
+  if (it.opts.patternGroups && $pgPropertyKeys.length) {
+    var arr6 = $pgPropertyKeys;
+    if (arr6) {
+      var $pgProperty, i6 = -1,
+        l6 = arr6.length - 1;
+      while (i6 < l6) {
+        $pgProperty = arr6[i6 += 1];
+        var $pgSchema = $pgProperties[$pgProperty],
+          $sch = $pgSchema.schema;
+        if (it.util.schemaHasRules($sch, it.RULES.all)) {
+          $it.schema = $sch;
+          $it.schemaPath = it.schemaPath + '.patternGroups' + it.util.getProperty($pgProperty) + '.schema';
+          $it.errSchemaPath = it.errSchemaPath + '/patternGroups/' + it.util.escapeFragment($pgProperty) + '/schema';
+          out += ' var pgPropCount' + ($lvl) + ' = 0;  ';
+          if ($ownProperties) {
+            out += ' ' + ($dataProperties) + ' = ' + ($dataProperties) + ' || Object.keys(' + ($data) + '); for (var ' + ($idx) + '=0; ' + ($idx) + '<' + ($dataProperties) + '.length; ' + ($idx) + '++) { var ' + ($key) + ' = ' + ($dataProperties) + '[' + ($idx) + ']; ';
+          } else {
+            out += ' for (var ' + ($key) + ' in ' + ($data) + ') { ';
+          }
+          out += ' if (' + (it.usePattern($pgProperty)) + '.test(' + ($key) + ')) { pgPropCount' + ($lvl) + '++; ';
+          $it.errorPath = it.util.getPathExpr(it.errorPath, $key, it.opts.jsonPointers);
+          var $passData = $data + '[' + $key + ']';
+          $it.dataPathArr[$dataNxt] = $key;
+          var $code = it.validate($it);
+          $it.baseId = $currentBaseId;
+          if (it.util.varOccurences($code, $nextData) < 2) {
+            out += ' ' + (it.util.varReplace($code, $nextData, $passData)) + ' ';
+          } else {
+            out += ' var ' + ($nextData) + ' = ' + ($passData) + '; ' + ($code) + ' ';
+          }
+          if ($breakOnError) {
+            out += ' if (!' + ($nextValid) + ') break; ';
+          }
+          out += ' } ';
+          if ($breakOnError) {
+            out += ' else ' + ($nextValid) + ' = true; ';
+          }
+          out += ' }  ';
+          if ($breakOnError) {
+            out += ' if (' + ($nextValid) + ') { ';
+            $closingBraces += '}';
+          }
+          var $pgMin = $pgSchema.minimum,
+            $pgMax = $pgSchema.maximum;
+          if ($pgMin !== undefined || $pgMax !== undefined) {
+            out += ' var ' + ($valid) + ' = true; ';
+            var $currErrSchemaPath = $errSchemaPath;
+            if ($pgMin !== undefined) {
+              var $limit = $pgMin,
+                $reason = 'minimum',
+                $moreOrLess = 'less';
+              out += ' ' + ($valid) + ' = pgPropCount' + ($lvl) + ' >= ' + ($pgMin) + '; ';
+              $errSchemaPath = it.errSchemaPath + '/patternGroups/minimum';
+              out += '  if (!' + ($valid) + ') {   ';
+              var $$outStack = $$outStack || [];
+              $$outStack.push(out);
+              out = ''; /* istanbul ignore else */
+              if (it.createErrors !== false) {
+                out += ' { keyword: \'' + ('patternGroups') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { reason: \'' + ($reason) + '\', limit: ' + ($limit) + ', pattern: \'' + (it.util.escapeQuotes($pgProperty)) + '\' } ';
+                if (it.opts.messages !== false) {
+                  out += ' , message: \'should NOT have ' + ($moreOrLess) + ' than ' + ($limit) + ' properties matching pattern "' + (it.util.escapeQuotes($pgProperty)) + '"\' ';
+                }
+                if (it.opts.verbose) {
+                  out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+                }
+                out += ' } ';
+              } else {
+                out += ' {} ';
+              }
+              var __err = out;
+              out = $$outStack.pop();
+              if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+                if (it.async) {
+                  out += ' throw new ValidationError([' + (__err) + ']); ';
+                } else {
+                  out += ' validate.errors = [' + (__err) + ']; return false; ';
+                }
+              } else {
+                out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+              }
+              out += ' } ';
+              if ($pgMax !== undefined) {
+                out += ' else ';
+              }
+            }
+            if ($pgMax !== undefined) {
+              var $limit = $pgMax,
+                $reason = 'maximum',
+                $moreOrLess = 'more';
+              out += ' ' + ($valid) + ' = pgPropCount' + ($lvl) + ' <= ' + ($pgMax) + '; ';
+              $errSchemaPath = it.errSchemaPath + '/patternGroups/maximum';
+              out += '  if (!' + ($valid) + ') {   ';
+              var $$outStack = $$outStack || [];
+              $$outStack.push(out);
+              out = ''; /* istanbul ignore else */
+              if (it.createErrors !== false) {
+                out += ' { keyword: \'' + ('patternGroups') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { reason: \'' + ($reason) + '\', limit: ' + ($limit) + ', pattern: \'' + (it.util.escapeQuotes($pgProperty)) + '\' } ';
+                if (it.opts.messages !== false) {
+                  out += ' , message: \'should NOT have ' + ($moreOrLess) + ' than ' + ($limit) + ' properties matching pattern "' + (it.util.escapeQuotes($pgProperty)) + '"\' ';
+                }
+                if (it.opts.verbose) {
+                  out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+                }
+                out += ' } ';
+              } else {
+                out += ' {} ';
+              }
+              var __err = out;
+              out = $$outStack.pop();
+              if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+                if (it.async) {
+                  out += ' throw new ValidationError([' + (__err) + ']); ';
+                } else {
+                  out += ' validate.errors = [' + (__err) + ']; return false; ';
+                }
+              } else {
+                out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+              }
+              out += ' } ';
+            }
+            $errSchemaPath = $currErrSchemaPath;
+            if ($breakOnError) {
+              out += ' if (' + ($valid) + ') { ';
+              $closingBraces += '}';
+            }
+          }
+        }
+      }
+    }
+  }
+  if ($breakOnError) {
+    out += ' ' + ($closingBraces) + ' if (' + ($errs) + ' == errors) {';
+  }
+  out = it.util.cleanUpCode(out);
+  return out;
+}
+
+
+/***/ }),
+/* 495 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function generate_propertyNames(it, $keyword, $ruleType) {
+  var out = ' ';
+  var $lvl = it.level;
+  var $dataLvl = it.dataLevel;
+  var $schema = it.schema[$keyword];
+  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
+  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
+  var $breakOnError = !it.opts.allErrors;
+  var $data = 'data' + ($dataLvl || '');
+  var $errs = 'errs__' + $lvl;
+  var $it = it.util.copy(it);
+  var $closingBraces = '';
+  $it.level++;
+  var $nextValid = 'valid' + $it.level;
+  if (it.util.schemaHasRules($schema, it.RULES.all)) {
+    $it.schema = $schema;
+    $it.schemaPath = $schemaPath;
+    $it.errSchemaPath = $errSchemaPath;
+    var $key = 'key' + $lvl,
+      $idx = 'idx' + $lvl,
+      $i = 'i' + $lvl,
+      $invalidName = '\' + ' + $key + ' + \'',
+      $dataNxt = $it.dataLevel = it.dataLevel + 1,
+      $nextData = 'data' + $dataNxt,
+      $dataProperties = 'dataProperties' + $lvl,
+      $ownProperties = it.opts.ownProperties,
+      $currentBaseId = it.baseId;
+    out += ' var ' + ($errs) + ' = errors; ';
+    if ($ownProperties) {
+      out += ' var ' + ($dataProperties) + ' = undefined; ';
+    }
+    if ($ownProperties) {
+      out += ' ' + ($dataProperties) + ' = ' + ($dataProperties) + ' || Object.keys(' + ($data) + '); for (var ' + ($idx) + '=0; ' + ($idx) + '<' + ($dataProperties) + '.length; ' + ($idx) + '++) { var ' + ($key) + ' = ' + ($dataProperties) + '[' + ($idx) + ']; ';
+    } else {
+      out += ' for (var ' + ($key) + ' in ' + ($data) + ') { ';
+    }
+    out += ' var startErrs' + ($lvl) + ' = errors; ';
+    var $passData = $key;
+    var $wasComposite = it.compositeRule;
+    it.compositeRule = $it.compositeRule = true;
+    var $code = it.validate($it);
+    $it.baseId = $currentBaseId;
+    if (it.util.varOccurences($code, $nextData) < 2) {
+      out += ' ' + (it.util.varReplace($code, $nextData, $passData)) + ' ';
+    } else {
+      out += ' var ' + ($nextData) + ' = ' + ($passData) + '; ' + ($code) + ' ';
+    }
+    it.compositeRule = $it.compositeRule = $wasComposite;
+    out += ' if (!' + ($nextValid) + ') { for (var ' + ($i) + '=startErrs' + ($lvl) + '; ' + ($i) + '<errors; ' + ($i) + '++) { vErrors[' + ($i) + '].propertyName = ' + ($key) + '; }   var err =   '; /* istanbul ignore else */
+    if (it.createErrors !== false) {
+      out += ' { keyword: \'' + ('propertyNames') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { propertyName: \'' + ($invalidName) + '\' } ';
+      if (it.opts.messages !== false) {
+        out += ' , message: \'property name \\\'' + ($invalidName) + '\\\' is invalid\' ';
+      }
+      if (it.opts.verbose) {
+        out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+      }
+      out += ' } ';
+    } else {
+      out += ' {} ';
+    }
+    out += ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+    if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+      if (it.async) {
+        out += ' throw new ValidationError(vErrors); ';
+      } else {
+        out += ' validate.errors = vErrors; return false; ';
+      }
+    }
+    if ($breakOnError) {
+      out += ' break; ';
+    }
+    out += ' } }';
+  }
+  if ($breakOnError) {
+    out += ' ' + ($closingBraces) + ' if (' + ($errs) + ' == errors) {';
+  }
+  out = it.util.cleanUpCode(out);
+  return out;
+}
+
+
+/***/ }),
+/* 496 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function generate_ref(it, $keyword, $ruleType) {
+  var out = ' ';
+  var $lvl = it.level;
+  var $dataLvl = it.dataLevel;
+  var $schema = it.schema[$keyword];
+  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
+  var $breakOnError = !it.opts.allErrors;
+  var $data = 'data' + ($dataLvl || '');
+  var $valid = 'valid' + $lvl;
+  var $async, $refCode;
+  if ($schema == '#' || $schema == '#/') {
+    if (it.isRoot) {
+      $async = it.async;
+      $refCode = 'validate';
+    } else {
+      $async = it.root.schema.$async === true;
+      $refCode = 'root.refVal[0]';
+    }
+  } else {
+    var $refVal = it.resolveRef(it.baseId, $schema, it.isRoot);
+    if ($refVal === undefined) {
+      var $message = it.MissingRefError.message(it.baseId, $schema);
+      if (it.opts.missingRefs == 'fail') {
+        it.logger.error($message);
+        var $$outStack = $$outStack || [];
+        $$outStack.push(out);
+        out = ''; /* istanbul ignore else */
+        if (it.createErrors !== false) {
+          out += ' { keyword: \'' + ('$ref') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { ref: \'' + (it.util.escapeQuotes($schema)) + '\' } ';
+          if (it.opts.messages !== false) {
+            out += ' , message: \'can\\\'t resolve reference ' + (it.util.escapeQuotes($schema)) + '\' ';
+          }
+          if (it.opts.verbose) {
+            out += ' , schema: ' + (it.util.toQuotedString($schema)) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+          }
+          out += ' } ';
+        } else {
+          out += ' {} ';
+        }
+        var __err = out;
+        out = $$outStack.pop();
+        if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+          if (it.async) {
+            out += ' throw new ValidationError([' + (__err) + ']); ';
+          } else {
+            out += ' validate.errors = [' + (__err) + ']; return false; ';
+          }
+        } else {
+          out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+        }
+        if ($breakOnError) {
+          out += ' if (false) { ';
+        }
+      } else if (it.opts.missingRefs == 'ignore') {
+        it.logger.warn($message);
+        if ($breakOnError) {
+          out += ' if (true) { ';
+        }
+      } else {
+        throw new it.MissingRefError(it.baseId, $schema, $message);
+      }
+    } else if ($refVal.inline) {
+      var $it = it.util.copy(it);
+      $it.level++;
+      var $nextValid = 'valid' + $it.level;
+      $it.schema = $refVal.schema;
+      $it.schemaPath = '';
+      $it.errSchemaPath = $schema;
+      var $code = it.validate($it).replace(/validate\.schema/g, $refVal.code);
+      out += ' ' + ($code) + ' ';
+      if ($breakOnError) {
+        out += ' if (' + ($nextValid) + ') { ';
+      }
+    } else {
+      $async = $refVal.$async === true;
+      $refCode = $refVal.code;
+    }
+  }
+  if ($refCode) {
+    var $$outStack = $$outStack || [];
+    $$outStack.push(out);
+    out = '';
+    if (it.opts.passContext) {
+      out += ' ' + ($refCode) + '.call(this, ';
+    } else {
+      out += ' ' + ($refCode) + '( ';
+    }
+    out += ' ' + ($data) + ', (dataPath || \'\')';
+    if (it.errorPath != '""') {
+      out += ' + ' + (it.errorPath);
+    }
+    var $parentData = $dataLvl ? 'data' + (($dataLvl - 1) || '') : 'parentData',
+      $parentDataProperty = $dataLvl ? it.dataPathArr[$dataLvl] : 'parentDataProperty';
+    out += ' , ' + ($parentData) + ' , ' + ($parentDataProperty) + ', rootData)  ';
+    var __callValidate = out;
+    out = $$outStack.pop();
+    if ($async) {
+      if (!it.async) throw new Error('async schema referenced by sync schema');
+      if ($breakOnError) {
+        out += ' var ' + ($valid) + '; ';
+      }
+      out += ' try { ' + (it.yieldAwait) + ' ' + (__callValidate) + '; ';
+      if ($breakOnError) {
+        out += ' ' + ($valid) + ' = true; ';
+      }
+      out += ' } catch (e) { if (!(e instanceof ValidationError)) throw e; if (vErrors === null) vErrors = e.errors; else vErrors = vErrors.concat(e.errors); errors = vErrors.length; ';
+      if ($breakOnError) {
+        out += ' ' + ($valid) + ' = false; ';
+      }
+      out += ' } ';
+      if ($breakOnError) {
+        out += ' if (' + ($valid) + ') { ';
+      }
+    } else {
+      out += ' if (!' + (__callValidate) + ') { if (vErrors === null) vErrors = ' + ($refCode) + '.errors; else vErrors = vErrors.concat(' + ($refCode) + '.errors); errors = vErrors.length; } ';
+      if ($breakOnError) {
+        out += ' else { ';
+      }
+    }
+  }
+  return out;
+}
+
+
+/***/ }),
+/* 497 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function generate_required(it, $keyword, $ruleType) {
+  var out = ' ';
+  var $lvl = it.level;
+  var $dataLvl = it.dataLevel;
+  var $schema = it.schema[$keyword];
+  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
+  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
+  var $breakOnError = !it.opts.allErrors;
+  var $data = 'data' + ($dataLvl || '');
+  var $valid = 'valid' + $lvl;
+  var $isData = it.opts.$data && $schema && $schema.$data,
+    $schemaValue;
+  if ($isData) {
+    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
+    $schemaValue = 'schema' + $lvl;
+  } else {
+    $schemaValue = $schema;
+  }
+  var $vSchema = 'schema' + $lvl;
+  if (!$isData) {
+    if ($schema.length < it.opts.loopRequired && it.schema.properties && Object.keys(it.schema.properties).length) {
+      var $required = [];
+      var arr1 = $schema;
+      if (arr1) {
+        var $property, i1 = -1,
+          l1 = arr1.length - 1;
+        while (i1 < l1) {
+          $property = arr1[i1 += 1];
+          var $propertySch = it.schema.properties[$property];
+          if (!($propertySch && it.util.schemaHasRules($propertySch, it.RULES.all))) {
+            $required[$required.length] = $property;
+          }
+        }
+      }
+    } else {
+      var $required = $schema;
+    }
+  }
+  if ($isData || $required.length) {
+    var $currentErrorPath = it.errorPath,
+      $loopRequired = $isData || $required.length >= it.opts.loopRequired,
+      $ownProperties = it.opts.ownProperties;
+    if ($breakOnError) {
+      out += ' var missing' + ($lvl) + '; ';
+      if ($loopRequired) {
+        if (!$isData) {
+          out += ' var ' + ($vSchema) + ' = validate.schema' + ($schemaPath) + '; ';
+        }
+        var $i = 'i' + $lvl,
+          $propertyPath = 'schema' + $lvl + '[' + $i + ']',
+          $missingProperty = '\' + ' + $propertyPath + ' + \'';
+        if (it.opts._errorDataPathProperty) {
+          it.errorPath = it.util.getPathExpr($currentErrorPath, $propertyPath, it.opts.jsonPointers);
+        }
+        out += ' var ' + ($valid) + ' = true; ';
+        if ($isData) {
+          out += ' if (schema' + ($lvl) + ' === undefined) ' + ($valid) + ' = true; else if (!Array.isArray(schema' + ($lvl) + ')) ' + ($valid) + ' = false; else {';
+        }
+        out += ' for (var ' + ($i) + ' = 0; ' + ($i) + ' < ' + ($vSchema) + '.length; ' + ($i) + '++) { ' + ($valid) + ' = ' + ($data) + '[' + ($vSchema) + '[' + ($i) + ']] !== undefined ';
+        if ($ownProperties) {
+          out += ' &&   Object.prototype.hasOwnProperty.call(' + ($data) + ', ' + ($vSchema) + '[' + ($i) + ']) ';
+        }
+        out += '; if (!' + ($valid) + ') break; } ';
+        if ($isData) {
+          out += '  }  ';
+        }
+        out += '  if (!' + ($valid) + ') {   ';
+        var $$outStack = $$outStack || [];
+        $$outStack.push(out);
+        out = ''; /* istanbul ignore else */
+        if (it.createErrors !== false) {
+          out += ' { keyword: \'' + ('required') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { missingProperty: \'' + ($missingProperty) + '\' } ';
+          if (it.opts.messages !== false) {
+            out += ' , message: \'';
+            if (it.opts._errorDataPathProperty) {
+              out += 'is a required property';
+            } else {
+              out += 'should have required property \\\'' + ($missingProperty) + '\\\'';
+            }
+            out += '\' ';
+          }
+          if (it.opts.verbose) {
+            out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+          }
+          out += ' } ';
+        } else {
+          out += ' {} ';
+        }
+        var __err = out;
+        out = $$outStack.pop();
+        if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+          if (it.async) {
+            out += ' throw new ValidationError([' + (__err) + ']); ';
+          } else {
+            out += ' validate.errors = [' + (__err) + ']; return false; ';
+          }
+        } else {
+          out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+        }
+        out += ' } else { ';
+      } else {
+        out += ' if ( ';
+        var arr2 = $required;
+        if (arr2) {
+          var $propertyKey, $i = -1,
+            l2 = arr2.length - 1;
+          while ($i < l2) {
+            $propertyKey = arr2[$i += 1];
+            if ($i) {
+              out += ' || ';
+            }
+            var $prop = it.util.getProperty($propertyKey),
+              $useData = $data + $prop;
+            out += ' ( ( ' + ($useData) + ' === undefined ';
+            if ($ownProperties) {
+              out += ' || ! Object.prototype.hasOwnProperty.call(' + ($data) + ', \'' + (it.util.escapeQuotes($propertyKey)) + '\') ';
+            }
+            out += ') && (missing' + ($lvl) + ' = ' + (it.util.toQuotedString(it.opts.jsonPointers ? $propertyKey : $prop)) + ') ) ';
+          }
+        }
+        out += ') {  ';
+        var $propertyPath = 'missing' + $lvl,
+          $missingProperty = '\' + ' + $propertyPath + ' + \'';
+        if (it.opts._errorDataPathProperty) {
+          it.errorPath = it.opts.jsonPointers ? it.util.getPathExpr($currentErrorPath, $propertyPath, true) : $currentErrorPath + ' + ' + $propertyPath;
+        }
+        var $$outStack = $$outStack || [];
+        $$outStack.push(out);
+        out = ''; /* istanbul ignore else */
+        if (it.createErrors !== false) {
+          out += ' { keyword: \'' + ('required') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { missingProperty: \'' + ($missingProperty) + '\' } ';
+          if (it.opts.messages !== false) {
+            out += ' , message: \'';
+            if (it.opts._errorDataPathProperty) {
+              out += 'is a required property';
+            } else {
+              out += 'should have required property \\\'' + ($missingProperty) + '\\\'';
+            }
+            out += '\' ';
+          }
+          if (it.opts.verbose) {
+            out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+          }
+          out += ' } ';
+        } else {
+          out += ' {} ';
+        }
+        var __err = out;
+        out = $$outStack.pop();
+        if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+          if (it.async) {
+            out += ' throw new ValidationError([' + (__err) + ']); ';
+          } else {
+            out += ' validate.errors = [' + (__err) + ']; return false; ';
+          }
+        } else {
+          out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+        }
+        out += ' } else { ';
+      }
+    } else {
+      if ($loopRequired) {
+        if (!$isData) {
+          out += ' var ' + ($vSchema) + ' = validate.schema' + ($schemaPath) + '; ';
+        }
+        var $i = 'i' + $lvl,
+          $propertyPath = 'schema' + $lvl + '[' + $i + ']',
+          $missingProperty = '\' + ' + $propertyPath + ' + \'';
+        if (it.opts._errorDataPathProperty) {
+          it.errorPath = it.util.getPathExpr($currentErrorPath, $propertyPath, it.opts.jsonPointers);
+        }
+        if ($isData) {
+          out += ' if (' + ($vSchema) + ' && !Array.isArray(' + ($vSchema) + ')) {  var err =   '; /* istanbul ignore else */
+          if (it.createErrors !== false) {
+            out += ' { keyword: \'' + ('required') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { missingProperty: \'' + ($missingProperty) + '\' } ';
+            if (it.opts.messages !== false) {
+              out += ' , message: \'';
+              if (it.opts._errorDataPathProperty) {
+                out += 'is a required property';
+              } else {
+                out += 'should have required property \\\'' + ($missingProperty) + '\\\'';
+              }
+              out += '\' ';
+            }
+            if (it.opts.verbose) {
+              out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+            }
+            out += ' } ';
+          } else {
+            out += ' {} ';
+          }
+          out += ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; } else if (' + ($vSchema) + ' !== undefined) { ';
+        }
+        out += ' for (var ' + ($i) + ' = 0; ' + ($i) + ' < ' + ($vSchema) + '.length; ' + ($i) + '++) { if (' + ($data) + '[' + ($vSchema) + '[' + ($i) + ']] === undefined ';
+        if ($ownProperties) {
+          out += ' || ! Object.prototype.hasOwnProperty.call(' + ($data) + ', ' + ($vSchema) + '[' + ($i) + ']) ';
+        }
+        out += ') {  var err =   '; /* istanbul ignore else */
+        if (it.createErrors !== false) {
+          out += ' { keyword: \'' + ('required') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { missingProperty: \'' + ($missingProperty) + '\' } ';
+          if (it.opts.messages !== false) {
+            out += ' , message: \'';
+            if (it.opts._errorDataPathProperty) {
+              out += 'is a required property';
+            } else {
+              out += 'should have required property \\\'' + ($missingProperty) + '\\\'';
+            }
+            out += '\' ';
+          }
+          if (it.opts.verbose) {
+            out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+          }
+          out += ' } ';
+        } else {
+          out += ' {} ';
+        }
+        out += ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; } } ';
+        if ($isData) {
+          out += '  }  ';
+        }
+      } else {
+        var arr3 = $required;
+        if (arr3) {
+          var $propertyKey, i3 = -1,
+            l3 = arr3.length - 1;
+          while (i3 < l3) {
+            $propertyKey = arr3[i3 += 1];
+            var $prop = it.util.getProperty($propertyKey),
+              $missingProperty = it.util.escapeQuotes($propertyKey),
+              $useData = $data + $prop;
+            if (it.opts._errorDataPathProperty) {
+              it.errorPath = it.util.getPath($currentErrorPath, $propertyKey, it.opts.jsonPointers);
+            }
+            out += ' if ( ' + ($useData) + ' === undefined ';
+            if ($ownProperties) {
+              out += ' || ! Object.prototype.hasOwnProperty.call(' + ($data) + ', \'' + (it.util.escapeQuotes($propertyKey)) + '\') ';
+            }
+            out += ') {  var err =   '; /* istanbul ignore else */
+            if (it.createErrors !== false) {
+              out += ' { keyword: \'' + ('required') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { missingProperty: \'' + ($missingProperty) + '\' } ';
+              if (it.opts.messages !== false) {
+                out += ' , message: \'';
+                if (it.opts._errorDataPathProperty) {
+                  out += 'is a required property';
+                } else {
+                  out += 'should have required property \\\'' + ($missingProperty) + '\\\'';
+                }
+                out += '\' ';
+              }
+              if (it.opts.verbose) {
+                out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+              }
+              out += ' } ';
+            } else {
+              out += ' {} ';
+            }
+            out += ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; } ';
+          }
+        }
+      }
+    }
+    it.errorPath = $currentErrorPath;
+  } else if ($breakOnError) {
+    out += ' if (true) {';
+  }
+  return out;
+}
+
+
+/***/ }),
+/* 498 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function generate_uniqueItems(it, $keyword, $ruleType) {
+  var out = ' ';
+  var $lvl = it.level;
+  var $dataLvl = it.dataLevel;
+  var $schema = it.schema[$keyword];
+  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
+  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
+  var $breakOnError = !it.opts.allErrors;
+  var $data = 'data' + ($dataLvl || '');
+  var $valid = 'valid' + $lvl;
+  var $isData = it.opts.$data && $schema && $schema.$data,
+    $schemaValue;
+  if ($isData) {
+    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
+    $schemaValue = 'schema' + $lvl;
+  } else {
+    $schemaValue = $schema;
+  }
+  if (($schema || $isData) && it.opts.uniqueItems !== false) {
+    if ($isData) {
+      out += ' var ' + ($valid) + '; if (' + ($schemaValue) + ' === false || ' + ($schemaValue) + ' === undefined) ' + ($valid) + ' = true; else if (typeof ' + ($schemaValue) + ' != \'boolean\') ' + ($valid) + ' = false; else { ';
+    }
+    out += ' var ' + ($valid) + ' = true; if (' + ($data) + '.length > 1) { var i = ' + ($data) + '.length, j; outer: for (;i--;) { for (j = i; j--;) { if (equal(' + ($data) + '[i], ' + ($data) + '[j])) { ' + ($valid) + ' = false; break outer; } } } } ';
+    if ($isData) {
+      out += '  }  ';
+    }
+    out += ' if (!' + ($valid) + ') {   ';
+    var $$outStack = $$outStack || [];
+    $$outStack.push(out);
+    out = ''; /* istanbul ignore else */
+    if (it.createErrors !== false) {
+      out += ' { keyword: \'' + ('uniqueItems') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { i: i, j: j } ';
+      if (it.opts.messages !== false) {
+        out += ' , message: \'should NOT have duplicate items (items ## \' + j + \' and \' + i + \' are identical)\' ';
+      }
+      if (it.opts.verbose) {
+        out += ' , schema:  ';
+        if ($isData) {
+          out += 'validate.schema' + ($schemaPath);
+        } else {
+          out += '' + ($schema);
+        }
+        out += '         , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+      }
+      out += ' } ';
+    } else {
+      out += ' {} ';
+    }
+    var __err = out;
+    out = $$outStack.pop();
+    if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+      if (it.async) {
+        out += ' throw new ValidationError([' + (__err) + ']); ';
+      } else {
+        out += ' validate.errors = [' + (__err) + ']; return false; ';
+      }
+    } else {
+      out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+    }
+    out += ' } ';
+    if ($breakOnError) {
+      out += ' else { ';
+    }
+  } else {
+    if ($breakOnError) {
+      out += ' if (true) { ';
+    }
+  }
+  return out;
+}
+
+
+/***/ }),
+/* 499 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var IDENTIFIER = /^[a-z_$][a-z0-9_$-]*$/i;
+var customRuleCode = __webpack_require__(485);
+
+module.exports = {
+  add: addKeyword,
+  get: getKeyword,
+  remove: removeKeyword
+};
+
+/**
+ * Define custom keyword
+ * @this  Ajv
+ * @param {String} keyword custom keyword, should be unique (including different from all standard, custom and macro keywords).
+ * @param {Object} definition keyword definition object with properties `type` (type(s) which the keyword applies to), `validate` or `compile`.
+ * @return {Ajv} this for method chaining
+ */
+function addKeyword(keyword, definition) {
+  /* jshint validthis: true */
+  /* eslint no-shadow: 0 */
+  var RULES = this.RULES;
+
+  if (RULES.keywords[keyword])
+    throw new Error('Keyword ' + keyword + ' is already defined');
+
+  if (!IDENTIFIER.test(keyword))
+    throw new Error('Keyword ' + keyword + ' is not a valid identifier');
+
+  if (definition) {
+    if (definition.macro && definition.valid !== undefined)
+      throw new Error('"valid" option cannot be used with macro keywords');
+
+    var dataType = definition.type;
+    if (Array.isArray(dataType)) {
+      var i, len = dataType.length;
+      for (i=0; i<len; i++) checkDataType(dataType[i]);
+      for (i=0; i<len; i++) _addRule(keyword, dataType[i], definition);
+    } else {
+      if (dataType) checkDataType(dataType);
+      _addRule(keyword, dataType, definition);
+    }
+
+    var $data = definition.$data === true && this._opts.$data;
+    if ($data && !definition.validate)
+      throw new Error('$data support: "validate" function is not defined');
+
+    var metaSchema = definition.metaSchema;
+    if (metaSchema) {
+      if ($data) {
+        metaSchema = {
+          anyOf: [
+            metaSchema,
+            { '$ref': 'https://raw.githubusercontent.com/epoberezkin/ajv/master/lib/refs/$data.json#' }
+          ]
+        };
+      }
+      definition.validateSchema = this.compile(metaSchema, true);
+    }
+  }
+
+  RULES.keywords[keyword] = RULES.all[keyword] = true;
+
+
+  function _addRule(keyword, dataType, definition) {
+    var ruleGroup;
+    for (var i=0; i<RULES.length; i++) {
+      var rg = RULES[i];
+      if (rg.type == dataType) {
+        ruleGroup = rg;
+        break;
+      }
+    }
+
+    if (!ruleGroup) {
+      ruleGroup = { type: dataType, rules: [] };
+      RULES.push(ruleGroup);
+    }
+
+    var rule = {
+      keyword: keyword,
+      definition: definition,
+      custom: true,
+      code: customRuleCode,
+      implements: definition.implements
+    };
+    ruleGroup.rules.push(rule);
+    RULES.custom[keyword] = rule;
+  }
+
+
+  function checkDataType(dataType) {
+    if (!RULES.types[dataType]) throw new Error('Unknown type ' + dataType);
+  }
+
+  return this;
+}
+
+
+/**
+ * Get keyword
+ * @this  Ajv
+ * @param {String} keyword pre-defined or custom keyword.
+ * @return {Object|Boolean} custom keyword definition, `true` if it is a predefined keyword, `false` otherwise.
+ */
+function getKeyword(keyword) {
+  /* jshint validthis: true */
+  var rule = this.RULES.custom[keyword];
+  return rule ? rule.definition : this.RULES.keywords[keyword] || false;
+}
+
+
+/**
+ * Remove keyword
+ * @this  Ajv
+ * @param {String} keyword pre-defined or custom keyword.
+ * @return {Ajv} this for method chaining
+ */
+function removeKeyword(keyword) {
+  /* jshint validthis: true */
+  var RULES = this.RULES;
+  delete RULES.keywords[keyword];
+  delete RULES.all[keyword];
+  delete RULES.custom[keyword];
+  for (var i=0; i<RULES.length; i++) {
+    var rules = RULES[i].rules;
+    for (var j=0; j<rules.length; j++) {
+      if (rules[j].keyword == keyword) {
+        rules.splice(j, 1);
+        break;
+      }
+    }
+  }
+  return this;
+}
+
+
+/***/ }),
+/* 500 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var META_SCHEMA_ID = 'http://json-schema.org/draft-06/schema';
+
+module.exports = function (ajv) {
+  var defaultMeta = ajv._opts.defaultMeta;
+  var metaSchemaRef = typeof defaultMeta == 'string'
+                      ? { $ref: defaultMeta }
+                      : ajv.getSchema(META_SCHEMA_ID)
+                        ? { $ref: META_SCHEMA_ID }
+                        : {};
+
+  ajv.addKeyword('patternGroups', {
+    // implemented in properties.jst
+    metaSchema: {
+      type: 'object',
+      additionalProperties: {
+        type: 'object',
+        required: [ 'schema' ],
+        properties: {
+          maximum: {
+            type: 'integer',
+            minimum: 0
+          },
+          minimum: {
+            type: 'integer',
+            minimum: 0
+          },
+          schema: metaSchemaRef
+        },
+        additionalProperties: false
+      }
+    }
+  });
+  ajv.RULES.all.properties.implements.push('patternGroups');
+};
+
+
+/***/ }),
+/* 501 */
+/***/ (function(module, exports) {
+
+module.exports = {"$schema":"http://json-schema.org/draft-06/schema#","$id":"https://raw.githubusercontent.com/epoberezkin/ajv/master/lib/refs/$data.json#","description":"Meta-schema for $data reference (JSON-schema extension proposal)","type":"object","required":["$data"],"properties":{"$data":{"type":"string","anyOf":[{"format":"relative-json-pointer"},{"format":"json-pointer"}]}},"additionalProperties":false}
+
+/***/ }),
+/* 502 */
+/***/ (function(module, exports) {
+
+module.exports = {"$schema":"http://json-schema.org/draft-06/schema#","$id":"http://json-schema.org/draft-06/schema#","title":"Core schema meta-schema","definitions":{"schemaArray":{"type":"array","minItems":1,"items":{"$ref":"#"}},"nonNegativeInteger":{"type":"integer","minimum":0},"nonNegativeIntegerDefault0":{"allOf":[{"$ref":"#/definitions/nonNegativeInteger"},{"default":0}]},"simpleTypes":{"enum":["array","boolean","integer","null","number","object","string"]},"stringArray":{"type":"array","items":{"type":"string"},"uniqueItems":true,"default":[]}},"type":["object","boolean"],"properties":{"$id":{"type":"string","format":"uri-reference"},"$schema":{"type":"string","format":"uri"},"$ref":{"type":"string","format":"uri-reference"},"title":{"type":"string"},"description":{"type":"string"},"default":{},"examples":{"type":"array","items":{}},"multipleOf":{"type":"number","exclusiveMinimum":0},"maximum":{"type":"number"},"exclusiveMaximum":{"type":"number"},"minimum":{"type":"number"},"exclusiveMinimum":{"type":"number"},"maxLength":{"$ref":"#/definitions/nonNegativeInteger"},"minLength":{"$ref":"#/definitions/nonNegativeIntegerDefault0"},"pattern":{"type":"string","format":"regex"},"additionalItems":{"$ref":"#"},"items":{"anyOf":[{"$ref":"#"},{"$ref":"#/definitions/schemaArray"}],"default":{}},"maxItems":{"$ref":"#/definitions/nonNegativeInteger"},"minItems":{"$ref":"#/definitions/nonNegativeIntegerDefault0"},"uniqueItems":{"type":"boolean","default":false},"contains":{"$ref":"#"},"maxProperties":{"$ref":"#/definitions/nonNegativeInteger"},"minProperties":{"$ref":"#/definitions/nonNegativeIntegerDefault0"},"required":{"$ref":"#/definitions/stringArray"},"additionalProperties":{"$ref":"#"},"definitions":{"type":"object","additionalProperties":{"$ref":"#"},"default":{}},"properties":{"type":"object","additionalProperties":{"$ref":"#"},"default":{}},"patternProperties":{"type":"object","additionalProperties":{"$ref":"#"},"default":{}},"dependencies":{"type":"object","additionalProperties":{"anyOf":[{"$ref":"#"},{"$ref":"#/definitions/stringArray"}]}},"propertyNames":{"$ref":"#"},"const":{},"enum":{"type":"array","minItems":1,"uniqueItems":true},"type":{"anyOf":[{"$ref":"#/definitions/simpleTypes"},{"type":"array","items":{"$ref":"#/definitions/simpleTypes"},"minItems":1,"uniqueItems":true}]},"format":{"type":"string"},"allOf":{"$ref":"#/definitions/schemaArray"},"anyOf":{"$ref":"#/definitions/schemaArray"},"oneOf":{"$ref":"#/definitions/schemaArray"},"not":{"$ref":"#"}},"default":{}}
+
+/***/ }),
+/* 503 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var traverse = module.exports = function (schema, opts, cb) {
+  if (typeof opts == 'function') {
+    cb = opts;
+    opts = {};
+  }
+  _traverse(opts, cb, schema, '', schema);
+};
+
+
+traverse.keywords = {
+  additionalItems: true,
+  items: true,
+  contains: true,
+  additionalProperties: true,
+  propertyNames: true,
+  not: true
+};
+
+traverse.arrayKeywords = {
+  items: true,
+  allOf: true,
+  anyOf: true,
+  oneOf: true
+};
+
+traverse.propsKeywords = {
+  definitions: true,
+  properties: true,
+  patternProperties: true,
+  dependencies: true
+};
+
+traverse.skipKeywords = {
+  enum: true,
+  const: true,
+  required: true,
+  maximum: true,
+  minimum: true,
+  exclusiveMaximum: true,
+  exclusiveMinimum: true,
+  multipleOf: true,
+  maxLength: true,
+  minLength: true,
+  pattern: true,
+  format: true,
+  maxItems: true,
+  minItems: true,
+  uniqueItems: true,
+  maxProperties: true,
+  minProperties: true
+};
+
+
+function _traverse(opts, cb, schema, jsonPtr, rootSchema, parentJsonPtr, parentKeyword, parentSchema, keyIndex) {
+  if (schema && typeof schema == 'object' && !Array.isArray(schema)) {
+    cb(schema, jsonPtr, rootSchema, parentJsonPtr, parentKeyword, parentSchema, keyIndex);
+    for (var key in schema) {
+      var sch = schema[key];
+      if (Array.isArray(sch)) {
+        if (key in traverse.arrayKeywords) {
+          for (var i=0; i<sch.length; i++)
+            _traverse(opts, cb, sch[i], jsonPtr + '/' + key + '/' + i, rootSchema, jsonPtr, key, schema, i);
+        }
+      } else if (key in traverse.propsKeywords) {
+        if (sch && typeof sch == 'object') {
+          for (var prop in sch)
+            _traverse(opts, cb, sch[prop], jsonPtr + '/' + key + '/' + escapeJsonPtr(prop), rootSchema, jsonPtr, key, schema, prop);
+        }
+      } else if (key in traverse.keywords || (opts.allKeys && !(key in traverse.skipKeywords))) {
+        _traverse(opts, cb, sch, jsonPtr + '/' + key, rootSchema, jsonPtr, key, schema);
+      }
+    }
+  }
+}
+
+
+function escapeJsonPtr(str) {
+  return str.replace(/~/g, '~0').replace(/\//g, '~1');
+}
+
+
+/***/ }),
+/* 504 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+const x = module.exports;
+const ESC = '\u001B[';
+const OSC = '\u001B]';
+const BEL = '\u0007';
+const SEP = ';';
+const isTerminalApp = process.env.TERM_PROGRAM === 'Apple_Terminal';
+
+x.cursorTo = (x, y) => {
+	if (typeof x !== 'number') {
+		throw new TypeError('The `x` argument is required');
+	}
+
+	if (typeof y !== 'number') {
+		return ESC + (x + 1) + 'G';
+	}
+
+	return ESC + (y + 1) + ';' + (x + 1) + 'H';
+};
+
+x.cursorMove = (x, y) => {
+	if (typeof x !== 'number') {
+		throw new TypeError('The `x` argument is required');
+	}
+
+	let ret = '';
+
+	if (x < 0) {
+		ret += ESC + (-x) + 'D';
+	} else if (x > 0) {
+		ret += ESC + x + 'C';
+	}
+
+	if (y < 0) {
+		ret += ESC + (-y) + 'A';
+	} else if (y > 0) {
+		ret += ESC + y + 'B';
+	}
+
+	return ret;
+};
+
+x.cursorUp = count => ESC + (typeof count === 'number' ? count : 1) + 'A';
+x.cursorDown = count => ESC + (typeof count === 'number' ? count : 1) + 'B';
+x.cursorForward = count => ESC + (typeof count === 'number' ? count : 1) + 'C';
+x.cursorBackward = count => ESC + (typeof count === 'number' ? count : 1) + 'D';
+
+x.cursorLeft = ESC + 'G';
+x.cursorSavePosition = ESC + (isTerminalApp ? '7' : 's');
+x.cursorRestorePosition = ESC + (isTerminalApp ? '8' : 'u');
+x.cursorGetPosition = ESC + '6n';
+x.cursorNextLine = ESC + 'E';
+x.cursorPrevLine = ESC + 'F';
+x.cursorHide = ESC + '?25l';
+x.cursorShow = ESC + '?25h';
+
+x.eraseLines = count => {
+	let clear = '';
+
+	for (let i = 0; i < count; i++) {
+		clear += x.eraseLine + (i < count - 1 ? x.cursorUp() : '');
+	}
+
+	if (count) {
+		clear += x.cursorLeft;
+	}
+
+	return clear;
+};
+
+x.eraseEndLine = ESC + 'K';
+x.eraseStartLine = ESC + '1K';
+x.eraseLine = ESC + '2K';
+x.eraseDown = ESC + 'J';
+x.eraseUp = ESC + '1J';
+x.eraseScreen = ESC + '2J';
+x.scrollUp = ESC + 'S';
+x.scrollDown = ESC + 'T';
+
+x.clearScreen = '\u001Bc';
+x.beep = BEL;
+
+x.link = (text, url) => {
+	return [
+		OSC,
+		'8',
+		SEP,
+		SEP,
+		url,
+		BEL,
+		text,
+		OSC,
+		'8',
+		SEP,
+		SEP,
+		BEL
+	].join('');
+};
+
+x.image = (buf, opts) => {
+	opts = opts || {};
+
+	let ret = OSC + '1337;File=inline=1';
+
+	if (opts.width) {
+		ret += `;width=${opts.width}`;
+	}
+
+	if (opts.height) {
+		ret += `;height=${opts.height}`;
+	}
+
+	if (opts.preserveAspectRatio === false) {
+		ret += ';preserveAspectRatio=0';
+	}
+
+	return ret + ':' + buf.toString('base64') + BEL;
+};
+
+x.iTerm = {};
+
+x.iTerm.setCwd = cwd => OSC + '50;CurrentDir=' + (cwd || process.cwd()) + BEL;
+
+
+/***/ }),
+/* 505 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function () {
+	return /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-PRZcf-nqry=><]/g;
+};
+
+
+/***/ }),
+/* 506 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/* WEBPACK VAR INJECTION */(function(module) {
+const colorConvert = __webpack_require__(608);
+
+const wrapAnsi16 = (fn, offset) => function () {
+	const code = fn.apply(colorConvert, arguments);
+	return `\u001B[${code + offset}m`;
+};
+
+const wrapAnsi256 = (fn, offset) => function () {
+	const code = fn.apply(colorConvert, arguments);
+	return `\u001B[${38 + offset};5;${code}m`;
+};
+
+const wrapAnsi16m = (fn, offset) => function () {
+	const rgb = fn.apply(colorConvert, arguments);
+	return `\u001B[${38 + offset};2;${rgb[0]};${rgb[1]};${rgb[2]}m`;
+};
+
+function assembleStyles() {
+	const codes = new Map();
+	const styles = {
+		modifier: {
+			reset: [0, 0],
+			// 21 isn't widely supported and 22 does the same thing
+			bold: [1, 22],
+			dim: [2, 22],
+			italic: [3, 23],
+			underline: [4, 24],
+			inverse: [7, 27],
+			hidden: [8, 28],
+			strikethrough: [9, 29]
+		},
+		color: {
+			black: [30, 39],
+			red: [31, 39],
+			green: [32, 39],
+			yellow: [33, 39],
+			blue: [34, 39],
+			magenta: [35, 39],
+			cyan: [36, 39],
+			white: [37, 39],
+			gray: [90, 39],
+
+			// Bright color
+			redBright: [91, 39],
+			greenBright: [92, 39],
+			yellowBright: [93, 39],
+			blueBright: [94, 39],
+			magentaBright: [95, 39],
+			cyanBright: [96, 39],
+			whiteBright: [97, 39]
+		},
+		bgColor: {
+			bgBlack: [40, 49],
+			bgRed: [41, 49],
+			bgGreen: [42, 49],
+			bgYellow: [43, 49],
+			bgBlue: [44, 49],
+			bgMagenta: [45, 49],
+			bgCyan: [46, 49],
+			bgWhite: [47, 49],
+
+			// Bright color
+			bgBlackBright: [100, 49],
+			bgRedBright: [101, 49],
+			bgGreenBright: [102, 49],
+			bgYellowBright: [103, 49],
+			bgBlueBright: [104, 49],
+			bgMagentaBright: [105, 49],
+			bgCyanBright: [106, 49],
+			bgWhiteBright: [107, 49]
+		}
+	};
+
+	// Fix humans
+	styles.color.grey = styles.color.gray;
+
+	for (const groupName of Object.keys(styles)) {
+		const group = styles[groupName];
+
+		for (const styleName of Object.keys(group)) {
+			const style = group[styleName];
+
+			styles[styleName] = {
+				open: `\u001B[${style[0]}m`,
+				close: `\u001B[${style[1]}m`
+			};
+
+			group[styleName] = styles[styleName];
+
+			codes.set(style[0], style[1]);
+		}
+
+		Object.defineProperty(styles, groupName, {
+			value: group,
+			enumerable: false
+		});
+
+		Object.defineProperty(styles, 'codes', {
+			value: codes,
+			enumerable: false
+		});
+	}
+
+	const ansi2ansi = n => n;
+	const rgb2rgb = (r, g, b) => [r, g, b];
+
+	styles.color.close = '\u001B[39m';
+	styles.bgColor.close = '\u001B[49m';
+
+	styles.color.ansi = {
+		ansi: wrapAnsi16(ansi2ansi, 0)
+	};
+	styles.color.ansi256 = {
+		ansi256: wrapAnsi256(ansi2ansi, 0)
+	};
+	styles.color.ansi16m = {
+		rgb: wrapAnsi16m(rgb2rgb, 0)
+	};
+
+	styles.bgColor.ansi = {
+		ansi: wrapAnsi16(ansi2ansi, 10)
+	};
+	styles.bgColor.ansi256 = {
+		ansi256: wrapAnsi256(ansi2ansi, 10)
+	};
+	styles.bgColor.ansi16m = {
+		rgb: wrapAnsi16m(rgb2rgb, 10)
+	};
+
+	for (let key of Object.keys(colorConvert)) {
+		if (typeof colorConvert[key] !== 'object') {
+			continue;
+		}
+
+		const suite = colorConvert[key];
+
+		if (key === 'ansi16') {
+			key = 'ansi';
+		}
+
+		if ('ansi16' in suite) {
+			styles.color.ansi[key] = wrapAnsi16(suite.ansi16, 0);
+			styles.bgColor.ansi[key] = wrapAnsi16(suite.ansi16, 10);
+		}
+
+		if ('ansi256' in suite) {
+			styles.color.ansi256[key] = wrapAnsi256(suite.ansi256, 0);
+			styles.bgColor.ansi256[key] = wrapAnsi256(suite.ansi256, 10);
+		}
+
+		if ('rgb' in suite) {
+			styles.color.ansi16m[key] = wrapAnsi16m(suite.rgb, 0);
+			styles.bgColor.ansi16m[key] = wrapAnsi16m(suite.rgb, 10);
+		}
+	}
+
+	return styles;
+}
+
+// Make the export immutable
+Object.defineProperty(module, 'exports', {
+	enumerable: true,
+	get: assembleStyles
+});
+
+/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(163)(module)))
+
+/***/ }),
+/* 507 */
+/***/ (function(module, exports) {
+
+function webpackEmptyContext(req) {
+	throw new Error("Cannot find module '" + req + "'.");
+}
+webpackEmptyContext.keys = function() { return []; };
+webpackEmptyContext.resolve = webpackEmptyContext;
+module.exports = webpackEmptyContext;
+webpackEmptyContext.id = 507;
+
+/***/ }),
+/* 508 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+    // global key for user preferred registration
+var REGISTRATION_KEY = '@@any-promise/REGISTRATION',
+    // Prior registration (preferred or detected)
+    registered = null
+
+/**
+ * Registers the given implementation.  An implementation must
+ * be registered prior to any call to `require("any-promise")`,
+ * typically on application load.
+ *
+ * If called with no arguments, will return registration in
+ * following priority:
+ *
+ * For Node.js:
+ *
+ * 1. Previous registration
+ * 2. global.Promise if node.js version >= 0.12
+ * 3. Auto detected promise based on first sucessful require of
+ *    known promise libraries. Note this is a last resort, as the
+ *    loaded library is non-deterministic. node.js >= 0.12 will
+ *    always use global.Promise over this priority list.
+ * 4. Throws error.
+ *
+ * For Browser:
+ *
+ * 1. Previous registration
+ * 2. window.Promise
+ * 3. Throws error.
+ *
+ * Options:
+ *
+ * Promise: Desired Promise constructor
+ * global: Boolean - Should the registration be cached in a global variable to
+ * allow cross dependency/bundle registration?  (default true)
+ */
+module.exports = function(root, loadImplementation){
+  return function register(implementation, opts){
+    implementation = implementation || null
+    opts = opts || {}
+    // global registration unless explicitly  {global: false} in options (default true)
+    var registerGlobal = opts.global !== false;
+
+    // load any previous global registration
+    if(registered === null && registerGlobal){
+      registered = root[REGISTRATION_KEY] || null
+    }
+
+    if(registered !== null
+        && implementation !== null
+        && registered.implementation !== implementation){
+      // Throw error if attempting to redefine implementation
+      throw new Error('any-promise already defined as "'+registered.implementation+
+        '".  You can only register an implementation before the first '+
+        ' call to require("any-promise") and an implementation cannot be changed')
+    }
+
+    if(registered === null){
+      // use provided implementation
+      if(implementation !== null && typeof opts.Promise !== 'undefined'){
+        registered = {
+          Promise: opts.Promise,
+          implementation: implementation
+        }
+      } else {
+        // require implementation if implementation is specified but not provided
+        registered = loadImplementation(implementation)
+      }
+
+      if(registerGlobal){
+        // register preference globally in case multiple installations
+        root[REGISTRATION_KEY] = registered
+      }
+    }
+
+    return registered
+  }
+}
+
+
+/***/ }),
+/* 509 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = __webpack_require__(508)(global, loadImplementation);
+
+/**
+ * Node.js version of loadImplementation.
+ *
+ * Requires the given implementation and returns the registration
+ * containing {Promise, implementation}
+ *
+ * If implementation is undefined or global.Promise, loads it
+ * Otherwise uses require
+ */
+function loadImplementation(implementation){
+  var impl = null
+
+  if(shouldPreferGlobalPromise(implementation)){
+    // if no implementation or env specified use global.Promise
+    impl = {
+      Promise: global.Promise,
+      implementation: 'global.Promise'
+    }
+  } else if(implementation){
+    // if implementation specified, require it
+    var lib = !(function webpackMissingModule() { var e = new Error("Cannot find module \".\""); e.code = 'MODULE_NOT_FOUND'; throw e; }())
+    impl = {
+      Promise: lib.Promise || lib,
+      implementation: implementation
+    }
+  } else {
+    // try to auto detect implementation. This is non-deterministic
+    // and should prefer other branches, but this is our last chance
+    // to load something without throwing error
+    impl = tryAutoDetect()
+  }
+
+  if(impl === null){
+    throw new Error('Cannot find any-promise implementation nor'+
+      ' global.Promise. You must install polyfill or call'+
+      ' require("any-promise/register") with your preferred'+
+      ' implementation, e.g. require("any-promise/register/bluebird")'+
+      ' on application load prior to any require("any-promise").')
+  }
+
+  return impl
+}
+
+/**
+ * Determines if the global.Promise should be preferred if an implementation
+ * has not been registered.
+ */
+function shouldPreferGlobalPromise(implementation){
+  if(implementation){
+    return implementation === 'global.Promise'
+  } else if(typeof global.Promise !== 'undefined'){
+    // Load global promise if implementation not specified
+    // Versions < 0.11 did not have global Promise
+    // Do not use for version < 0.12 as version 0.11 contained buggy versions
+    var version = (/v(\d+)\.(\d+)\.(\d+)/).exec(process.version)
+    return !(version && +version[1] == 0 && +version[2] < 12)
+  }
+
+  // do not have global.Promise or another implementation was specified
+  return false
+}
+
+/**
+ * Look for common libs as last resort there is no guarantee that
+ * this will return a desired implementation or even be deterministic.
+ * The priority is also nearly arbitrary. We are only doing this
+ * for older versions of Node.js <0.12 that do not have a reasonable
+ * global.Promise implementation and we the user has not registered
+ * the preference. This preserves the behavior of any-promise <= 0.1
+ * and may be deprecated or removed in the future
+ */
+function tryAutoDetect(){
+  var libs = [
+      "es6-promise",
+      "promise",
+      "native-promise-only",
+      "bluebird",
+      "rsvp",
+      "when",
+      "q",
+      "pinkie",
+      "lie",
+      "vow"]
+  var i = 0, len = libs.length
+  for(; i < len; i++){
+    try {
+      return loadImplementation(libs[i])
+    } catch(e){}
+  }
+  return null
+}
+
+
+/***/ }),
+/* 510 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*!
+ * arr-flatten <https://github.com/jonschlinkert/arr-flatten>
+ *
+ * Copyright (c) 2014-2017, Jon Schlinkert.
+ * Released under the MIT License.
+ */
+
+
+
+module.exports = function (arr) {
+  return flat(arr, []);
+};
+
+function flat(arr, res) {
+  var i = 0, cur;
+  var len = arr.length;
+  for (; i < len; i++) {
+    cur = arr[i];
+    Array.isArray(cur) ? flat(cur, res) : res.push(cur);
+  }
+  return res;
+}
+
+
+/***/ }),
+/* 511 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function (arr, predicate, ctx) {
+	if (typeof Array.prototype.findIndex === 'function') {
+		return arr.findIndex(predicate, ctx);
+	}
+
+	if (typeof predicate !== 'function') {
+		throw new TypeError('predicate must be a function');
+	}
+
+	var list = Object(arr);
+	var len = list.length;
+
+	if (len === 0) {
+		return -1;
+	}
+
+	for (var i = 0; i < len; i++) {
+		if (predicate.call(ctx, list[i], i, list)) {
+			return i;
+		}
+	}
+
+	return -1;
+};
+
+
+/***/ }),
+/* 512 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var rawAsap = __webpack_require__(513);
+var freeTasks = [];
+
+/**
+ * Calls a task as soon as possible after returning, in its own event, with
+ * priority over IO events. An exception thrown in a task can be handled by
+ * `process.on("uncaughtException") or `domain.on("error")`, but will otherwise
+ * crash the process. If the error is handled, all subsequent tasks will
+ * resume.
+ *
+ * @param {{call}} task A callable object, typically a function that takes no
+ * arguments.
+ */
+module.exports = asap;
+function asap(task) {
+    var rawTask;
+    if (freeTasks.length) {
+        rawTask = freeTasks.pop();
+    } else {
+        rawTask = new RawTask();
+    }
+    rawTask.task = task;
+    rawTask.domain = process.domain;
+    rawAsap(rawTask);
+}
+
+function RawTask() {
+    this.task = null;
+    this.domain = null;
+}
+
+RawTask.prototype.call = function () {
+    if (this.domain) {
+        this.domain.enter();
+    }
+    var threw = true;
+    try {
+        this.task.call();
+        threw = false;
+        // If the task throws an exception (presumably) Node.js restores the
+        // domain stack for the next event.
+        if (this.domain) {
+            this.domain.exit();
+        }
+    } finally {
+        // We use try/finally and a threw flag to avoid messing up stack traces
+        // when we catch and release errors.
+        if (threw) {
+            // In Node.js, uncaught exceptions are considered fatal errors.
+            // Re-throw them to interrupt flushing!
+            // Ensure that flushing continues if an uncaught exception is
+            // suppressed listening process.on("uncaughtException") or
+            // domain.on("error").
+            rawAsap.requestFlush();
+        }
+        // If the task threw an error, we do not want to exit the domain here.
+        // Exiting the domain would prevent the domain from catching the error.
+        this.task = null;
+        this.domain = null;
+        freeTasks.push(this);
+    }
+};
+
+
+
+/***/ }),
+/* 513 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var domain; // The domain module is executed on demand
+var hasSetImmediate = typeof setImmediate === "function";
+
+// Use the fastest means possible to execute a task in its own turn, with
+// priority over other events including network IO events in Node.js.
+//
+// An exception thrown by a task will permanently interrupt the processing of
+// subsequent tasks. The higher level `asap` function ensures that if an
+// exception is thrown by a task, that the task queue will continue flushing as
+// soon as possible, but if you use `rawAsap` directly, you are responsible to
+// either ensure that no exceptions are thrown from your task, or to manually
+// call `rawAsap.requestFlush` if an exception is thrown.
+module.exports = rawAsap;
+function rawAsap(task) {
+    if (!queue.length) {
+        requestFlush();
+        flushing = true;
+    }
+    // Avoids a function call
+    queue[queue.length] = task;
+}
+
+var queue = [];
+// Once a flush has been requested, no further calls to `requestFlush` are
+// necessary until the next `flush` completes.
+var flushing = false;
+// The position of the next task to execute in the task queue. This is
+// preserved between calls to `flush` so that it can be resumed if
+// a task throws an exception.
+var index = 0;
+// If a task schedules additional tasks recursively, the task queue can grow
+// unbounded. To prevent memory excaustion, the task queue will periodically
+// truncate already-completed tasks.
+var capacity = 1024;
+
+// The flush function processes all tasks that have been scheduled with
+// `rawAsap` unless and until one of those tasks throws an exception.
+// If a task throws an exception, `flush` ensures that its state will remain
+// consistent and will resume where it left off when called again.
+// However, `flush` does not make any arrangements to be called again if an
+// exception is thrown.
+function flush() {
+    while (index < queue.length) {
+        var currentIndex = index;
+        // Advance the index before calling the task. This ensures that we will
+        // begin flushing on the next task the task throws an error.
+        index = index + 1;
+        queue[currentIndex].call();
+        // Prevent leaking memory for long chains of recursive calls to `asap`.
+        // If we call `asap` within tasks scheduled by `asap`, the queue will
+        // grow, but to avoid an O(n) walk for every task we execute, we don't
+        // shift tasks off the queue after they have been executed.
+        // Instead, we periodically shift 1024 tasks off the queue.
+        if (index > capacity) {
+            // Manually shift all values starting at the index back to the
+            // beginning of the queue.
+            for (var scan = 0, newLength = queue.length - index; scan < newLength; scan++) {
+                queue[scan] = queue[scan + index];
+            }
+            queue.length -= index;
+            index = 0;
+        }
+    }
+    queue.length = 0;
+    index = 0;
+    flushing = false;
+}
+
+rawAsap.requestFlush = requestFlush;
+function requestFlush() {
+    // Ensure flushing is not bound to any domain.
+    // It is not sufficient to exit the domain, because domains exist on a stack.
+    // To execute code outside of any domain, the following dance is necessary.
+    var parentDomain = process.domain;
+    if (parentDomain) {
+        if (!domain) {
+            // Lazy execute the domain module.
+            // Only employed if the user elects to use domains.
+            domain = __webpack_require__(965);
+        }
+        domain.active = process.domain = null;
+    }
+
+    // `setImmediate` is slower that `process.nextTick`, but `process.nextTick`
+    // cannot handle recursion.
+    // `requestFlush` will only be called recursively from `asap.js`, to resume
+    // flushing after an error is thrown into a domain.
+    // Conveniently, `setImmediate` was introduced in the same version
+    // `process.nextTick` started throwing recursion errors.
+    if (flushing && hasSetImmediate) {
+        setImmediate(flush);
+    } else {
+        process.nextTick(flush);
+    }
+
+    if (parentDomain) {
+        domain.active = process.domain = parentDomain;
+    }
+}
+
+
+/***/ }),
+/* 514 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// Copyright 2011 Mark Cavage <mcavage@gmail.com> All rights reserved.
+
+var errors = __webpack_require__(205);
+var types = __webpack_require__(206);
+
+var Reader = __webpack_require__(515);
+var Writer = __webpack_require__(516);
+
+
+// --- Exports
+
+module.exports = {
+
+  Reader: Reader,
+
+  Writer: Writer
+
+};
+
+for (var t in types) {
+  if (types.hasOwnProperty(t))
+    module.exports[t] = types[t];
+}
+for (var e in errors) {
+  if (errors.hasOwnProperty(e))
+    module.exports[e] = errors[e];
+}
+
+
+/***/ }),
+/* 515 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// Copyright 2011 Mark Cavage <mcavage@gmail.com> All rights reserved.
+
+var assert = __webpack_require__(28);
+var Buffer = __webpack_require__(15).Buffer;
+
+var ASN1 = __webpack_require__(206);
+var errors = __webpack_require__(205);
+
+
+// --- Globals
+
+var newInvalidAsn1Error = errors.newInvalidAsn1Error;
+
+
+
+// --- API
+
+function Reader(data) {
+  if (!data || !Buffer.isBuffer(data))
+    throw new TypeError('data must be a node Buffer');
+
+  this._buf = data;
+  this._size = data.length;
+
+  // These hold the "current" state
+  this._len = 0;
+  this._offset = 0;
+}
+
+Object.defineProperty(Reader.prototype, 'length', {
+  enumerable: true,
+  get: function () { return (this._len); }
+});
+
+Object.defineProperty(Reader.prototype, 'offset', {
+  enumerable: true,
+  get: function () { return (this._offset); }
+});
+
+Object.defineProperty(Reader.prototype, 'remain', {
+  get: function () { return (this._size - this._offset); }
+});
+
+Object.defineProperty(Reader.prototype, 'buffer', {
+  get: function () { return (this._buf.slice(this._offset)); }
+});
+
+
+/**
+ * Reads a single byte and advances offset; you can pass in `true` to make this
+ * a "peek" operation (i.e., get the byte, but don't advance the offset).
+ *
+ * @param {Boolean} peek true means don't move offset.
+ * @return {Number} the next byte, null if not enough data.
+ */
+Reader.prototype.readByte = function (peek) {
+  if (this._size - this._offset < 1)
+    return null;
+
+  var b = this._buf[this._offset] & 0xff;
+
+  if (!peek)
+    this._offset += 1;
+
+  return b;
+};
+
+
+Reader.prototype.peek = function () {
+  return this.readByte(true);
+};
+
+
+/**
+ * Reads a (potentially) variable length off the BER buffer.  This call is
+ * not really meant to be called directly, as callers have to manipulate
+ * the internal buffer afterwards.
+ *
+ * As a result of this call, you can call `Reader.length`, until the
+ * next thing called that does a readLength.
+ *
+ * @return {Number} the amount of offset to advance the buffer.
+ * @throws {InvalidAsn1Error} on bad ASN.1
+ */
+Reader.prototype.readLength = function (offset) {
+  if (offset === undefined)
+    offset = this._offset;
+
+  if (offset >= this._size)
+    return null;
+
+  var lenB = this._buf[offset++] & 0xff;
+  if (lenB === null)
+    return null;
+
+  if ((lenB & 0x80) === 0x80) {
+    lenB &= 0x7f;
+
+    if (lenB === 0)
+      throw newInvalidAsn1Error('Indefinite length not supported');
+
+    if (lenB > 4)
+      throw newInvalidAsn1Error('encoding too long');
+
+    if (this._size - offset < lenB)
+      return null;
+
+    this._len = 0;
+    for (var i = 0; i < lenB; i++)
+      this._len = (this._len << 8) + (this._buf[offset++] & 0xff);
+
+  } else {
+    // Wasn't a variable length
+    this._len = lenB;
+  }
+
+  return offset;
+};
+
+
+/**
+ * Parses the next sequence in this BER buffer.
+ *
+ * To get the length of the sequence, call `Reader.length`.
+ *
+ * @return {Number} the sequence's tag.
+ */
+Reader.prototype.readSequence = function (tag) {
+  var seq = this.peek();
+  if (seq === null)
+    return null;
+  if (tag !== undefined && tag !== seq)
+    throw newInvalidAsn1Error('Expected 0x' + tag.toString(16) +
+                              ': got 0x' + seq.toString(16));
+
+  var o = this.readLength(this._offset + 1); // stored in `length`
+  if (o === null)
+    return null;
+
+  this._offset = o;
+  return seq;
+};
+
+
+Reader.prototype.readInt = function () {
+  return this._readTag(ASN1.Integer);
+};
+
+
+Reader.prototype.readBoolean = function () {
+  return (this._readTag(ASN1.Boolean) === 0 ? false : true);
+};
+
+
+Reader.prototype.readEnumeration = function () {
+  return this._readTag(ASN1.Enumeration);
+};
+
+
+Reader.prototype.readString = function (tag, retbuf) {
+  if (!tag)
+    tag = ASN1.OctetString;
+
+  var b = this.peek();
+  if (b === null)
+    return null;
+
+  if (b !== tag)
+    throw newInvalidAsn1Error('Expected 0x' + tag.toString(16) +
+                              ': got 0x' + b.toString(16));
+
+  var o = this.readLength(this._offset + 1); // stored in `length`
+
+  if (o === null)
+    return null;
+
+  if (this.length > this._size - o)
+    return null;
+
+  this._offset = o;
+
+  if (this.length === 0)
+    return retbuf ? Buffer.alloc(0) : '';
+
+  var str = this._buf.slice(this._offset, this._offset + this.length);
+  this._offset += this.length;
+
+  return retbuf ? str : str.toString('utf8');
+};
+
+Reader.prototype.readOID = function (tag) {
+  if (!tag)
+    tag = ASN1.OID;
+
+  var b = this.readString(tag, true);
+  if (b === null)
+    return null;
+
+  var values = [];
+  var value = 0;
+
+  for (var i = 0; i < b.length; i++) {
+    var byte = b[i] & 0xff;
+
+    value <<= 7;
+    value += byte & 0x7f;
+    if ((byte & 0x80) === 0) {
+      values.push(value);
+      value = 0;
+    }
+  }
+
+  value = values.shift();
+  values.unshift(value % 40);
+  values.unshift((value / 40) >> 0);
+
+  return values.join('.');
+};
+
+
+Reader.prototype._readTag = function (tag) {
+  assert.ok(tag !== undefined);
+
+  var b = this.peek();
+
+  if (b === null)
+    return null;
+
+  if (b !== tag)
+    throw newInvalidAsn1Error('Expected 0x' + tag.toString(16) +
+                              ': got 0x' + b.toString(16));
+
+  var o = this.readLength(this._offset + 1); // stored in `length`
+  if (o === null)
+    return null;
+
+  if (this.length > 4)
+    throw newInvalidAsn1Error('Integer too long: ' + this.length);
+
+  if (this.length > this._size - o)
+    return null;
+  this._offset = o;
+
+  var fb = this._buf[this._offset];
+  var value = 0;
+
+  for (var i = 0; i < this.length; i++) {
+    value <<= 8;
+    value |= (this._buf[this._offset++] & 0xff);
+  }
+
+  if ((fb & 0x80) === 0x80 && i !== 4)
+    value -= (1 << (i * 8));
+
+  return value >> 0;
+};
+
+
+
+// --- Exported API
+
+module.exports = Reader;
+
+
+/***/ }),
+/* 516 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// Copyright 2011 Mark Cavage <mcavage@gmail.com> All rights reserved.
+
+var assert = __webpack_require__(28);
+var Buffer = __webpack_require__(15).Buffer;
+var ASN1 = __webpack_require__(206);
+var errors = __webpack_require__(205);
+
+
+// --- Globals
+
+var newInvalidAsn1Error = errors.newInvalidAsn1Error;
+
+var DEFAULT_OPTS = {
+  size: 1024,
+  growthFactor: 8
+};
+
+
+// --- Helpers
+
+function merge(from, to) {
+  assert.ok(from);
+  assert.equal(typeof (from), 'object');
+  assert.ok(to);
+  assert.equal(typeof (to), 'object');
+
+  var keys = Object.getOwnPropertyNames(from);
+  keys.forEach(function (key) {
+    if (to[key])
+      return;
+
+    var value = Object.getOwnPropertyDescriptor(from, key);
+    Object.defineProperty(to, key, value);
+  });
+
+  return to;
+}
+
+
+
+// --- API
+
+function Writer(options) {
+  options = merge(DEFAULT_OPTS, options || {});
+
+  this._buf = Buffer.alloc(options.size || 1024);
+  this._size = this._buf.length;
+  this._offset = 0;
+  this._options = options;
+
+  // A list of offsets in the buffer where we need to insert
+  // sequence tag/len pairs.
+  this._seq = [];
+}
+
+Object.defineProperty(Writer.prototype, 'buffer', {
+  get: function () {
+    if (this._seq.length)
+      throw newInvalidAsn1Error(this._seq.length + ' unended sequence(s)');
+
+    return (this._buf.slice(0, this._offset));
+  }
+});
+
+Writer.prototype.writeByte = function (b) {
+  if (typeof (b) !== 'number')
+    throw new TypeError('argument must be a Number');
+
+  this._ensure(1);
+  this._buf[this._offset++] = b;
+};
+
+
+Writer.prototype.writeInt = function (i, tag) {
+  if (typeof (i) !== 'number')
+    throw new TypeError('argument must be a Number');
+  if (typeof (tag) !== 'number')
+    tag = ASN1.Integer;
+
+  var sz = 4;
+
+  while ((((i & 0xff800000) === 0) || ((i & 0xff800000) === 0xff800000 >> 0)) &&
+        (sz > 1)) {
+    sz--;
+    i <<= 8;
+  }
+
+  if (sz > 4)
+    throw newInvalidAsn1Error('BER ints cannot be > 0xffffffff');
+
+  this._ensure(2 + sz);
+  this._buf[this._offset++] = tag;
+  this._buf[this._offset++] = sz;
+
+  while (sz-- > 0) {
+    this._buf[this._offset++] = ((i & 0xff000000) >>> 24);
+    i <<= 8;
+  }
+
+};
+
+
+Writer.prototype.writeNull = function () {
+  this.writeByte(ASN1.Null);
+  this.writeByte(0x00);
+};
+
+
+Writer.prototype.writeEnumeration = function (i, tag) {
+  if (typeof (i) !== 'number')
+    throw new TypeError('argument must be a Number');
+  if (typeof (tag) !== 'number')
+    tag = ASN1.Enumeration;
+
+  return this.writeInt(i, tag);
+};
+
+
+Writer.prototype.writeBoolean = function (b, tag) {
+  if (typeof (b) !== 'boolean')
+    throw new TypeError('argument must be a Boolean');
+  if (typeof (tag) !== 'number')
+    tag = ASN1.Boolean;
+
+  this._ensure(3);
+  this._buf[this._offset++] = tag;
+  this._buf[this._offset++] = 0x01;
+  this._buf[this._offset++] = b ? 0xff : 0x00;
+};
+
+
+Writer.prototype.writeString = function (s, tag) {
+  if (typeof (s) !== 'string')
+    throw new TypeError('argument must be a string (was: ' + typeof (s) + ')');
+  if (typeof (tag) !== 'number')
+    tag = ASN1.OctetString;
+
+  var len = Buffer.byteLength(s);
+  this.writeByte(tag);
+  this.writeLength(len);
+  if (len) {
+    this._ensure(len);
+    this._buf.write(s, this._offset);
+    this._offset += len;
+  }
+};
+
+
+Writer.prototype.writeBuffer = function (buf, tag) {
+  if (typeof (tag) !== 'number')
+    throw new TypeError('tag must be a number');
+  if (!Buffer.isBuffer(buf))
+    throw new TypeError('argument must be a buffer');
+
+  this.writeByte(tag);
+  this.writeLength(buf.length);
+  this._ensure(buf.length);
+  buf.copy(this._buf, this._offset, 0, buf.length);
+  this._offset += buf.length;
+};
+
+
+Writer.prototype.writeStringArray = function (strings) {
+  if ((!strings instanceof Array))
+    throw new TypeError('argument must be an Array[String]');
+
+  var self = this;
+  strings.forEach(function (s) {
+    self.writeString(s);
+  });
+};
+
+// This is really to solve DER cases, but whatever for now
+Writer.prototype.writeOID = function (s, tag) {
+  if (typeof (s) !== 'string')
+    throw new TypeError('argument must be a string');
+  if (typeof (tag) !== 'number')
+    tag = ASN1.OID;
+
+  if (!/^([0-9]+\.){3,}[0-9]+$/.test(s))
+    throw new Error('argument is not a valid OID string');
+
+  function encodeOctet(bytes, octet) {
+    if (octet < 128) {
+        bytes.push(octet);
+    } else if (octet < 16384) {
+        bytes.push((octet >>> 7) | 0x80);
+        bytes.push(octet & 0x7F);
+    } else if (octet < 2097152) {
+      bytes.push((octet >>> 14) | 0x80);
+      bytes.push(((octet >>> 7) | 0x80) & 0xFF);
+      bytes.push(octet & 0x7F);
+    } else if (octet < 268435456) {
+      bytes.push((octet >>> 21) | 0x80);
+      bytes.push(((octet >>> 14) | 0x80) & 0xFF);
+      bytes.push(((octet >>> 7) | 0x80) & 0xFF);
+      bytes.push(octet & 0x7F);
+    } else {
+      bytes.push(((octet >>> 28) | 0x80) & 0xFF);
+      bytes.push(((octet >>> 21) | 0x80) & 0xFF);
+      bytes.push(((octet >>> 14) | 0x80) & 0xFF);
+      bytes.push(((octet >>> 7) | 0x80) & 0xFF);
+      bytes.push(octet & 0x7F);
+    }
+  }
+
+  var tmp = s.split('.');
+  var bytes = [];
+  bytes.push(parseInt(tmp[0], 10) * 40 + parseInt(tmp[1], 10));
+  tmp.slice(2).forEach(function (b) {
+    encodeOctet(bytes, parseInt(b, 10));
+  });
+
+  var self = this;
+  this._ensure(2 + bytes.length);
+  this.writeByte(tag);
+  this.writeLength(bytes.length);
+  bytes.forEach(function (b) {
+    self.writeByte(b);
+  });
+};
+
+
+Writer.prototype.writeLength = function (len) {
+  if (typeof (len) !== 'number')
+    throw new TypeError('argument must be a Number');
+
+  this._ensure(4);
+
+  if (len <= 0x7f) {
+    this._buf[this._offset++] = len;
+  } else if (len <= 0xff) {
+    this._buf[this._offset++] = 0x81;
+    this._buf[this._offset++] = len;
+  } else if (len <= 0xffff) {
+    this._buf[this._offset++] = 0x82;
+    this._buf[this._offset++] = len >> 8;
+    this._buf[this._offset++] = len;
+  } else if (len <= 0xffffff) {
+    this._buf[this._offset++] = 0x83;
+    this._buf[this._offset++] = len >> 16;
+    this._buf[this._offset++] = len >> 8;
+    this._buf[this._offset++] = len;
+  } else {
+    throw newInvalidAsn1Error('Length too long (> 4 bytes)');
+  }
+};
+
+Writer.prototype.startSequence = function (tag) {
+  if (typeof (tag) !== 'number')
+    tag = ASN1.Sequence | ASN1.Constructor;
+
+  this.writeByte(tag);
+  this._seq.push(this._offset);
+  this._ensure(3);
+  this._offset += 3;
+};
+
+
+Writer.prototype.endSequence = function () {
+  var seq = this._seq.pop();
+  var start = seq + 3;
+  var len = this._offset - start;
+
+  if (len <= 0x7f) {
+    this._shift(start, len, -2);
+    this._buf[seq] = len;
+  } else if (len <= 0xff) {
+    this._shift(start, len, -1);
+    this._buf[seq] = 0x81;
+    this._buf[seq + 1] = len;
+  } else if (len <= 0xffff) {
+    this._buf[seq] = 0x82;
+    this._buf[seq + 1] = len >> 8;
+    this._buf[seq + 2] = len;
+  } else if (len <= 0xffffff) {
+    this._shift(start, len, 1);
+    this._buf[seq] = 0x83;
+    this._buf[seq + 1] = len >> 16;
+    this._buf[seq + 2] = len >> 8;
+    this._buf[seq + 3] = len;
+  } else {
+    throw newInvalidAsn1Error('Sequence too long');
+  }
+};
+
+
+Writer.prototype._shift = function (start, len, shift) {
+  assert.ok(start !== undefined);
+  assert.ok(len !== undefined);
+  assert.ok(shift);
+
+  this._buf.copy(this._buf, start + shift, start, start + len);
+  this._offset += shift;
+};
+
+Writer.prototype._ensure = function (len) {
+  assert.ok(len);
+
+  if (this._size - this._offset < len) {
+    var sz = this._size * this._options.growthFactor;
+    if (sz - this._offset < len)
+      sz += len;
+
+    var buf = Buffer.alloc(sz);
+
+    this._buf.copy(buf, 0, 0, this._offset);
+    this._buf = buf;
+    this._size = sz;
+  }
+};
+
+
+
+// --- Exported API
+
+module.exports = Writer;
+
+
+/***/ }),
+/* 517 */
+/***/ (function(module, exports, __webpack_require__) {
+
+module.exports =
+{
+  parallel      : __webpack_require__(519),
+  serial        : __webpack_require__(520),
+  serialOrdered : __webpack_require__(351)
+};
+
+
+/***/ }),
+/* 518 */
+/***/ (function(module, exports) {
+
+module.exports = defer;
+
+/**
+ * Runs provided function on next iteration of the event loop
+ *
+ * @param {function} fn - function to run
+ */
+function defer(fn)
+{
+  var nextTick = typeof setImmediate == 'function'
+    ? setImmediate
+    : (
+      typeof process == 'object' && typeof process.nextTick == 'function'
+      ? process.nextTick
+      : null
+    );
+
+  if (nextTick)
+  {
+    nextTick(fn);
+  }
+  else
+  {
+    setTimeout(fn, 0);
+  }
+}
+
+
+/***/ }),
+/* 519 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var iterate    = __webpack_require__(348)
+  , initState  = __webpack_require__(349)
+  , terminator = __webpack_require__(350)
+  ;
+
+// Public API
+module.exports = parallel;
+
+/**
+ * Runs iterator over provided array elements in parallel
+ *
+ * @param   {array|object} list - array or object (named list) to iterate over
+ * @param   {function} iterator - iterator to run
+ * @param   {function} callback - invoked when all elements processed
+ * @returns {function} - jobs terminator
+ */
+function parallel(list, iterator, callback)
+{
+  var state = initState(list);
+
+  while (state.index < (state['keyedList'] || list).length)
+  {
+    iterate(list, iterator, state, function(error, result)
+    {
+      if (error)
+      {
+        callback(error, result);
+        return;
+      }
+
+      // looks like it's the last one
+      if (Object.keys(state.jobs).length === 0)
+      {
+        callback(null, state.results);
+        return;
+      }
+    });
+
+    state.index++;
+  }
+
+  return terminator.bind(state, callback);
+}
+
+
+/***/ }),
+/* 520 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var serialOrdered = __webpack_require__(351);
+
+// Public API
+module.exports = serial;
+
+/**
+ * Runs iterator over provided array elements in series
+ *
+ * @param   {array|object} list - array or object (named list) to iterate over
+ * @param   {function} iterator - iterator to run
+ * @param   {function} callback - invoked when all elements processed
+ * @returns {function} - jobs terminator
+ */
+function serial(list, iterator, callback)
+{
+  return serialOrdered(list, iterator, null, callback);
+}
+
+
+/***/ }),
+/* 521 */
+/***/ (function(module, exports, __webpack_require__) {
+
+
+/*!
+ *  Copyright 2010 LearnBoost <dev@learnboost.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Module dependencies.
+ */
+
+var crypto = __webpack_require__(11)
+  , parse = __webpack_require__(24).parse
+  ;
+
+/**
+ * Valid keys.
+ */
+
+var keys = 
+  [ 'acl'
+  , 'location'
+  , 'logging'
+  , 'notification'
+  , 'partNumber'
+  , 'policy'
+  , 'requestPayment'
+  , 'torrent'
+  , 'uploadId'
+  , 'uploads'
+  , 'versionId'
+  , 'versioning'
+  , 'versions'
+  , 'website'
+  ]
+
+/**
+ * Return an "Authorization" header value with the given `options`
+ * in the form of "AWS <key>:<signature>"
+ *
+ * @param {Object} options
+ * @return {String}
+ * @api private
+ */
+
+function authorization (options) {
+  return 'AWS ' + options.key + ':' + sign(options)
+}
+
+module.exports = authorization
+module.exports.authorization = authorization
+
+/**
+ * Simple HMAC-SHA1 Wrapper
+ *
+ * @param {Object} options
+ * @return {String}
+ * @api private
+ */ 
+
+function hmacSha1 (options) {
+  return crypto.createHmac('sha1', options.secret).update(options.message).digest('base64')
+}
+
+module.exports.hmacSha1 = hmacSha1
+
+/**
+ * Create a base64 sha1 HMAC for `options`. 
+ * 
+ * @param {Object} options
+ * @return {String}
+ * @api private
+ */
+
+function sign (options) {
+  options.message = stringToSign(options)
+  return hmacSha1(options)
+}
+module.exports.sign = sign
+
+/**
+ * Create a base64 sha1 HMAC for `options`. 
+ *
+ * Specifically to be used with S3 presigned URLs
+ * 
+ * @param {Object} options
+ * @return {String}
+ * @api private
+ */
+
+function signQuery (options) {
+  options.message = queryStringToSign(options)
+  return hmacSha1(options)
+}
+module.exports.signQuery= signQuery
+
+/**
+ * Return a string for sign() with the given `options`.
+ *
+ * Spec:
+ * 
+ *    <verb>\n
+ *    <md5>\n
+ *    <content-type>\n
+ *    <date>\n
+ *    [headers\n]
+ *    <resource>
+ *
+ * @param {Object} options
+ * @return {String}
+ * @api private
+ */
+
+function stringToSign (options) {
+  var headers = options.amazonHeaders || ''
+  if (headers) headers += '\n'
+  var r = 
+    [ options.verb
+    , options.md5
+    , options.contentType
+    , options.date ? options.date.toUTCString() : ''
+    , headers + options.resource
+    ]
+  return r.join('\n')
+}
+module.exports.stringToSign = stringToSign
+
+/**
+ * Return a string for sign() with the given `options`, but is meant exclusively
+ * for S3 presigned URLs
+ *
+ * Spec:
+ * 
+ *    <date>\n
+ *    <resource>
+ *
+ * @param {Object} options
+ * @return {String}
+ * @api private
+ */
+
+function queryStringToSign (options){
+  return 'GET\n\n\n' + options.date + '\n' + options.resource
+}
+module.exports.queryStringToSign = queryStringToSign
+
+/**
+ * Perform the following:
+ *
+ *  - ignore non-amazon headers
+ *  - lowercase fields
+ *  - sort lexicographically
+ *  - trim whitespace between ":"
+ *  - join with newline
+ *
+ * @param {Object} headers
+ * @return {String}
+ * @api private
+ */
+
+function canonicalizeHeaders (headers) {
+  var buf = []
+    , fields = Object.keys(headers)
+    ;
+  for (var i = 0, len = fields.length; i < len; ++i) {
+    var field = fields[i]
+      , val = headers[field]
+      , field = field.toLowerCase()
+      ;
+    if (0 !== field.indexOf('x-amz')) continue
+    buf.push(field + ':' + val)
+  }
+  return buf.sort().join('\n')
+}
+module.exports.canonicalizeHeaders = canonicalizeHeaders
+
+/**
+ * Perform the following:
+ *
+ *  - ignore non sub-resources
+ *  - sort lexicographically
+ *
+ * @param {String} resource
+ * @return {String}
+ * @api private
+ */
+
+function canonicalizeResource (resource) {
+  var url = parse(resource, true)
+    , path = url.pathname
+    , buf = []
+    ;
+
+  Object.keys(url.query).forEach(function(key){
+    if (!~keys.indexOf(key)) return
+    var val = '' == url.query[key] ? '' : '=' + encodeURIComponent(url.query[key])
+    buf.push(key + val)
+  })
+
+  return path + (buf.length ? '?' + buf.sort().join('&') : '')
+}
+module.exports.canonicalizeResource = canonicalizeResource
+
+
+/***/ }),
+/* 522 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var aws4 = exports,
+    url = __webpack_require__(24),
+    querystring = __webpack_require__(196),
+    crypto = __webpack_require__(11),
+    lru = __webpack_require__(523),
+    credentialsCache = lru(1000)
+
+// http://docs.amazonwebservices.com/general/latest/gr/signature-version-4.html
+
+function hmac(key, string, encoding) {
+  return crypto.createHmac('sha256', key).update(string, 'utf8').digest(encoding)
+}
+
+function hash(string, encoding) {
+  return crypto.createHash('sha256').update(string, 'utf8').digest(encoding)
+}
+
+// This function assumes the string has already been percent encoded
+function encodeRfc3986(urlEncodedString) {
+  return urlEncodedString.replace(/[!'()*]/g, function(c) {
+    return '%' + c.charCodeAt(0).toString(16).toUpperCase()
+  })
+}
+
+// request: { path | body, [host], [method], [headers], [service], [region] }
+// credentials: { accessKeyId, secretAccessKey, [sessionToken] }
+function RequestSigner(request, credentials) {
+
+  if (typeof request === 'string') request = url.parse(request)
+
+  var headers = request.headers = (request.headers || {}),
+      hostParts = this.matchHost(request.hostname || request.host || headers.Host || headers.host)
+
+  this.request = request
+  this.credentials = credentials || this.defaultCredentials()
+
+  this.service = request.service || hostParts[0] || ''
+  this.region = request.region || hostParts[1] || 'us-east-1'
+
+  // SES uses a different domain from the service name
+  if (this.service === 'email') this.service = 'ses'
+
+  if (!request.method && request.body)
+    request.method = 'POST'
+
+  if (!headers.Host && !headers.host) {
+    headers.Host = request.hostname || request.host || this.createHost()
+
+    // If a port is specified explicitly, use it as is
+    if (request.port)
+      headers.Host += ':' + request.port
+  }
+  if (!request.hostname && !request.host)
+    request.hostname = headers.Host || headers.host
+
+  this.isCodeCommitGit = this.service === 'codecommit' && request.method === 'GIT'
+}
+
+RequestSigner.prototype.matchHost = function(host) {
+  var match = (host || '').match(/([^\.]+)\.(?:([^\.]*)\.)?amazonaws\.com$/)
+  var hostParts = (match || []).slice(1, 3)
+
+  // ES's hostParts are sometimes the other way round, if the value that is expected
+  // to be region equals ‘es’ switch them back
+  // e.g. search-cluster-name-aaaa00aaaa0aaa0aaaaaaa0aaa.us-east-1.es.amazonaws.com
+  if (hostParts[1] === 'es')
+    hostParts = hostParts.reverse()
+
+  return hostParts
+}
+
+// http://docs.aws.amazon.com/general/latest/gr/rande.html
+RequestSigner.prototype.isSingleRegion = function() {
+  // Special case for S3 and SimpleDB in us-east-1
+  if (['s3', 'sdb'].indexOf(this.service) >= 0 && this.region === 'us-east-1') return true
+
+  return ['cloudfront', 'ls', 'route53', 'iam', 'importexport', 'sts']
+    .indexOf(this.service) >= 0
+}
+
+RequestSigner.prototype.createHost = function() {
+  var region = this.isSingleRegion() ? '' :
+        (this.service === 's3' && this.region !== 'us-east-1' ? '-' : '.') + this.region,
+      service = this.service === 'ses' ? 'email' : this.service
+  return service + region + '.amazonaws.com'
+}
+
+RequestSigner.prototype.prepareRequest = function() {
+  this.parsePath()
+
+  var request = this.request, headers = request.headers, query
+
+  if (request.signQuery) {
+
+    this.parsedPath.query = query = this.parsedPath.query || {}
+
+    if (this.credentials.sessionToken)
+      query['X-Amz-Security-Token'] = this.credentials.sessionToken
+
+    if (this.service === 's3' && !query['X-Amz-Expires'])
+      query['X-Amz-Expires'] = 86400
+
+    if (query['X-Amz-Date'])
+      this.datetime = query['X-Amz-Date']
+    else
+      query['X-Amz-Date'] = this.getDateTime()
+
+    query['X-Amz-Algorithm'] = 'AWS4-HMAC-SHA256'
+    query['X-Amz-Credential'] = this.credentials.accessKeyId + '/' + this.credentialString()
+    query['X-Amz-SignedHeaders'] = this.signedHeaders()
+
+  } else {
+
+    if (!request.doNotModifyHeaders && !this.isCodeCommitGit) {
+      if (request.body && !headers['Content-Type'] && !headers['content-type'])
+        headers['Content-Type'] = 'application/x-www-form-urlencoded; charset=utf-8'
+
+      if (request.body && !headers['Content-Length'] && !headers['content-length'])
+        headers['Content-Length'] = Buffer.byteLength(request.body)
+
+      if (this.credentials.sessionToken && !headers['X-Amz-Security-Token'] && !headers['x-amz-security-token'])
+        headers['X-Amz-Security-Token'] = this.credentials.sessionToken
+
+      if (this.service === 's3' && !headers['X-Amz-Content-Sha256'] && !headers['x-amz-content-sha256'])
+        headers['X-Amz-Content-Sha256'] = hash(this.request.body || '', 'hex')
+
+      if (headers['X-Amz-Date'] || headers['x-amz-date'])
+        this.datetime = headers['X-Amz-Date'] || headers['x-amz-date']
+      else
+        headers['X-Amz-Date'] = this.getDateTime()
+    }
+
+    delete headers.Authorization
+    delete headers.authorization
+  }
+}
+
+RequestSigner.prototype.sign = function() {
+  if (!this.parsedPath) this.prepareRequest()
+
+  if (this.request.signQuery) {
+    this.parsedPath.query['X-Amz-Signature'] = this.signature()
+  } else {
+    this.request.headers.Authorization = this.authHeader()
+  }
+
+  this.request.path = this.formatPath()
+
+  return this.request
+}
+
+RequestSigner.prototype.getDateTime = function() {
+  if (!this.datetime) {
+    var headers = this.request.headers,
+      date = new Date(headers.Date || headers.date || new Date)
+
+    this.datetime = date.toISOString().replace(/[:\-]|\.\d{3}/g, '')
+
+    // Remove the trailing 'Z' on the timestamp string for CodeCommit git access
+    if (this.isCodeCommitGit) this.datetime = this.datetime.slice(0, -1)
+  }
+  return this.datetime
+}
+
+RequestSigner.prototype.getDate = function() {
+  return this.getDateTime().substr(0, 8)
+}
+
+RequestSigner.prototype.authHeader = function() {
+  return [
+    'AWS4-HMAC-SHA256 Credential=' + this.credentials.accessKeyId + '/' + this.credentialString(),
+    'SignedHeaders=' + this.signedHeaders(),
+    'Signature=' + this.signature(),
+  ].join(', ')
+}
+
+RequestSigner.prototype.signature = function() {
+  var date = this.getDate(),
+      cacheKey = [this.credentials.secretAccessKey, date, this.region, this.service].join(),
+      kDate, kRegion, kService, kCredentials = credentialsCache.get(cacheKey)
+  if (!kCredentials) {
+    kDate = hmac('AWS4' + this.credentials.secretAccessKey, date)
+    kRegion = hmac(kDate, this.region)
+    kService = hmac(kRegion, this.service)
+    kCredentials = hmac(kService, 'aws4_request')
+    credentialsCache.set(cacheKey, kCredentials)
+  }
+  return hmac(kCredentials, this.stringToSign(), 'hex')
+}
+
+RequestSigner.prototype.stringToSign = function() {
+  return [
+    'AWS4-HMAC-SHA256',
+    this.getDateTime(),
+    this.credentialString(),
+    hash(this.canonicalString(), 'hex'),
+  ].join('\n')
+}
+
+RequestSigner.prototype.canonicalString = function() {
+  if (!this.parsedPath) this.prepareRequest()
+
+  var pathStr = this.parsedPath.path,
+      query = this.parsedPath.query,
+      headers = this.request.headers,
+      queryStr = '',
+      normalizePath = this.service !== 's3',
+      decodePath = this.service === 's3' || this.request.doNotEncodePath,
+      decodeSlashesInPath = this.service === 's3',
+      firstValOnly = this.service === 's3',
+      bodyHash
+
+  if (this.service === 's3' && this.request.signQuery) {
+    bodyHash = 'UNSIGNED-PAYLOAD'
+  } else if (this.isCodeCommitGit) {
+    bodyHash = ''
+  } else {
+    bodyHash = headers['X-Amz-Content-Sha256'] || headers['x-amz-content-sha256'] ||
+      hash(this.request.body || '', 'hex')
+  }
+
+  if (query) {
+    queryStr = encodeRfc3986(querystring.stringify(Object.keys(query).sort().reduce(function(obj, key) {
+      if (!key) return obj
+      obj[key] = !Array.isArray(query[key]) ? query[key] :
+        (firstValOnly ? query[key][0] : query[key].slice().sort())
+      return obj
+    }, {})))
+  }
+  if (pathStr !== '/') {
+    if (normalizePath) pathStr = pathStr.replace(/\/{2,}/g, '/')
+    pathStr = pathStr.split('/').reduce(function(path, piece) {
+      if (normalizePath && piece === '..') {
+        path.pop()
+      } else if (!normalizePath || piece !== '.') {
+        if (decodePath) piece = decodeURIComponent(piece)
+        path.push(encodeRfc3986(encodeURIComponent(piece)))
+      }
+      return path
+    }, []).join('/')
+    if (pathStr[0] !== '/') pathStr = '/' + pathStr
+    if (decodeSlashesInPath) pathStr = pathStr.replace(/%2F/g, '/')
+  }
+
+  return [
+    this.request.method || 'GET',
+    pathStr,
+    queryStr,
+    this.canonicalHeaders() + '\n',
+    this.signedHeaders(),
+    bodyHash,
+  ].join('\n')
+}
+
+RequestSigner.prototype.canonicalHeaders = function() {
+  var headers = this.request.headers
+  function trimAll(header) {
+    return header.toString().trim().replace(/\s+/g, ' ')
+  }
+  return Object.keys(headers)
+    .sort(function(a, b) { return a.toLowerCase() < b.toLowerCase() ? -1 : 1 })
+    .map(function(key) { return key.toLowerCase() + ':' + trimAll(headers[key]) })
+    .join('\n')
+}
+
+RequestSigner.prototype.signedHeaders = function() {
+  return Object.keys(this.request.headers)
+    .map(function(key) { return key.toLowerCase() })
+    .sort()
+    .join(';')
+}
+
+RequestSigner.prototype.credentialString = function() {
+  return [
+    this.getDate(),
+    this.region,
+    this.service,
+    'aws4_request',
+  ].join('/')
+}
+
+RequestSigner.prototype.defaultCredentials = function() {
+  var env = process.env
+  return {
+    accessKeyId: env.AWS_ACCESS_KEY_ID || env.AWS_ACCESS_KEY,
+    secretAccessKey: env.AWS_SECRET_ACCESS_KEY || env.AWS_SECRET_KEY,
+    sessionToken: env.AWS_SESSION_TOKEN,
+  }
+}
+
+RequestSigner.prototype.parsePath = function() {
+  var path = this.request.path || '/',
+      queryIx = path.indexOf('?'),
+      query = null
+
+  if (queryIx >= 0) {
+    query = querystring.parse(path.slice(queryIx + 1))
+    path = path.slice(0, queryIx)
+  }
+
+  // S3 doesn't always encode characters > 127 correctly and
+  // all services don't encode characters > 255 correctly
+  // So if there are non-reserved chars (and it's not already all % encoded), just encode them all
+  if (/[^0-9A-Za-z!'()*\-._~%/]/.test(path)) {
+    path = path.split('/').map(function(piece) {
+      return encodeURIComponent(decodeURIComponent(piece))
+    }).join('/')
+  }
+
+  this.parsedPath = {
+    path: path,
+    query: query,
+  }
+}
+
+RequestSigner.prototype.formatPath = function() {
+  var path = this.parsedPath.path,
+      query = this.parsedPath.query
+
+  if (!query) return path
+
+  // Services don't support empty query string keys
+  if (query[''] != null) delete query['']
+
+  return path + '?' + encodeRfc3986(querystring.stringify(query))
+}
+
+aws4.RequestSigner = RequestSigner
+
+aws4.sign = function(request, credentials) {
+  return new RequestSigner(request, credentials).sign()
+}
+
+
+/***/ }),
+/* 523 */
+/***/ (function(module, exports) {
+
+module.exports = function(size) {
+  return new LruCache(size)
+}
+
+function LruCache(size) {
+  this.capacity = size | 0
+  this.map = Object.create(null)
+  this.list = new DoublyLinkedList()
+}
+
+LruCache.prototype.get = function(key) {
+  var node = this.map[key]
+  if (node == null) return undefined
+  this.used(node)
+  return node.val
+}
+
+LruCache.prototype.set = function(key, val) {
+  var node = this.map[key]
+  if (node != null) {
+    node.val = val
+  } else {
+    if (!this.capacity) this.prune()
+    if (!this.capacity) return false
+    node = new DoublyLinkedNode(key, val)
+    this.map[key] = node
+    this.capacity--
+  }
+  this.used(node)
+  return true
+}
+
+LruCache.prototype.used = function(node) {
+  this.list.moveToFront(node)
+}
+
+LruCache.prototype.prune = function() {
+  var node = this.list.pop()
+  if (node != null) {
+    delete this.map[node.key]
+    this.capacity++
+  }
+}
+
+
+function DoublyLinkedList() {
+  this.firstNode = null
+  this.lastNode = null
+}
+
+DoublyLinkedList.prototype.moveToFront = function(node) {
+  if (this.firstNode == node) return
+
+  this.remove(node)
+
+  if (this.firstNode == null) {
+    this.firstNode = node
+    this.lastNode = node
+    node.prev = null
+    node.next = null
+  } else {
+    node.prev = null
+    node.next = this.firstNode
+    node.next.prev = node
+    this.firstNode = node
+  }
+}
+
+DoublyLinkedList.prototype.pop = function() {
+  var lastNode = this.lastNode
+  if (lastNode != null) {
+    this.remove(lastNode)
+  }
+  return lastNode
+}
+
+DoublyLinkedList.prototype.remove = function(node) {
+  if (this.firstNode == node) {
+    this.firstNode = node.next
+  } else if (node.prev != null) {
+    node.prev.next = node.next
+  }
+  if (this.lastNode == node) {
+    this.lastNode = node.prev
+  } else if (node.next != null) {
+    node.next.prev = node.prev
+  }
+}
+
+
+function DoublyLinkedNode(key, val) {
+  this.key = key
+  this.val = val
+  this.prev = null
+  this.next = null
+}
+
+
+/***/ }),
+/* 524 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+exports.default = function (message) {
+  return {
+    useless: true,
+    run() {
+      throw new (_errors || _load_errors()).MessageError(message);
+    },
+    setFlags: () => {},
+    hasWrapper: () => true
+  };
+};
+
+var _errors;
+
+function _load_errors() {
+  return _errors = __webpack_require__(6);
+}
+
+/***/ }),
+/* 525 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.examples = exports.hasWrapper = exports.run = undefined;
+exports.setFlags = setFlags;
+
+var _buildSubCommands2;
+
+function _load_buildSubCommands() {
+  return _buildSubCommands2 = _interopRequireDefault(__webpack_require__(59));
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const notYetImplemented = () => Promise.reject(new Error('This command is not implemented yet.'));
+
+function setFlags(commander) {
+  commander.description('Has not been implemented yet');
+}
+
+var _buildSubCommands = (0, (_buildSubCommands2 || _load_buildSubCommands()).default)('access', {
+  public: notYetImplemented,
+  restricted: notYetImplemented,
+  grant: notYetImplemented,
+  revoke: notYetImplemented,
+  lsPackages: notYetImplemented,
+  lsCollaborators: notYetImplemented,
+  edit: notYetImplemented
+}, ['WARNING: This command yet to be implemented.', 'public [<package>]', 'restricted [<package>]', 'grant <read-only|read-write> <scope:team> [<package>]', 'revoke <scope:team> [<package>]', 'ls-packages [<user>|<scope>|<scope:team>]', 'ls-collaborators [<package> [<user>]]', 'edit [<package>]']);
+
+const run = _buildSubCommands.run,
+      hasWrapper = _buildSubCommands.hasWrapper,
+      examples = _buildSubCommands.examples;
+exports.run = run;
+exports.hasWrapper = hasWrapper;
+exports.examples = examples;
+
+/***/ }),
+/* 526 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.run = undefined;
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+let run = exports.run = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
+    const binFolder = path.join(config.cwd, config.registryFolders[0], '.bin');
+    if (args.length === 0) {
+      reporter.log(binFolder, { force: true });
+    } else {
+      const binEntries = yield (0, (_run || _load_run()).getBinEntries)(config);
+
+      const binName = args[0];
+      const binPath = binEntries.get(binName);
+
+      if (binPath) {
+        reporter.log(binPath, { force: true });
+      } else {
+        reporter.error(reporter.lang('packageBinaryNotFound', binName));
+      }
+    }
+  });
+
+  return function run(_x, _x2, _x3, _x4) {
+    return _ref.apply(this, arguments);
+  };
+})();
+
+exports.hasWrapper = hasWrapper;
+exports.setFlags = setFlags;
+
+var _run;
+
+function _load_run() {
+  return _run = __webpack_require__(360);
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const path = __webpack_require__(0);
+
+function hasWrapper(commander) {
+  return false;
+}
+
+function setFlags(commander) {
+  commander.description('Displays the location of the yarn bin folder.');
+}
+
+/***/ }),
+/* 527 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.examples = exports.run = undefined;
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+exports.hasWrapper = hasWrapper;
+exports.setFlags = setFlags;
+
+var _buildSubCommands2;
+
+function _load_buildSubCommands() {
+  return _buildSubCommands2 = _interopRequireDefault(__webpack_require__(59));
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const CONFIG_KEYS = [
+// 'reporter',
+'registryFolders', 'linkedModules',
+// 'registries',
+'cache', 'cwd', 'looseSemver', 'commandName', 'preferOffline', 'modulesFolder', 'globalFolder', 'linkFolder', 'offline', 'binLinks', 'ignorePlatform', 'ignoreScripts', 'disablePrepublish', 'nonInteractive', 'workspaceRootFolder', 'lockfileFolder', 'networkConcurrency', 'childConcurrency', 'networkTimeout', 'workspacesEnabled', 'workspacesNohoistEnabled', 'pruneOfflineMirror', 'enableMetaFolder', 'enableLockfileVersions', 'linkFileDependencies', 'cacheFolder', 'tempFolder', 'production'];
+/* eslint object-shorthand: 0 */
+
+function hasWrapper(flags, args) {
+  return args[0] !== 'get';
+}
+
+function setFlags(commander) {
+  commander.description('Manages the yarn configuration files.');
+}
+
+var _buildSubCommands = (0, (_buildSubCommands2 || _load_buildSubCommands()).default)('config', {
+  set(config, reporter, flags, args) {
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      if (args.length === 0 || args.length > 2) {
+        return false;
+      }
+      const key = args[0];
+      var _args$ = args[1];
+      const val = _args$ === undefined ? true : _args$;
+
+      const yarnConfig = config.registries.yarn;
+      yield yarnConfig.saveHomeConfig({ [key]: val });
+      reporter.success(reporter.lang('configSet', key, val));
+      return true;
+    })();
+  },
+
+  get(config, reporter, flags, args) {
+    if (args.length !== 1) {
+      return false;
+    }
+
+    reporter.log(String(config.getOption(args[0])), { force: true });
+    return true;
+  },
+
+  delete: (() => {
+    var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
+      if (args.length !== 1) {
+        return false;
+      }
+
+      const key = args[0];
+      const yarnConfig = config.registries.yarn;
+      yield yarnConfig.saveHomeConfig({ [key]: undefined });
+      reporter.success(reporter.lang('configDelete', key));
+      return true;
+    });
+
+    function _delete(_x, _x2, _x3, _x4) {
+      return _ref.apply(this, arguments);
+    }
+
+    return _delete;
+  })(),
+
+  list(config, reporter, flags, args) {
+    if (args.length) {
+      return false;
+    }
+
+    reporter.info(reporter.lang('configYarn'));
+    reporter.inspect(config.registries.yarn.config);
+
+    reporter.info(reporter.lang('configNpm'));
+    reporter.inspect(config.registries.npm.config);
+
+    return true;
+  },
+
+  current(config, reporter, flags, args) {
+    if (args.length) {
+      return false;
+    }
+
+    reporter.log(JSON.stringify(config, CONFIG_KEYS, 2), { force: true });
+
+    return true;
+  }
+});
+
+const run = _buildSubCommands.run,
+      examples = _buildSubCommands.examples;
+exports.run = run;
+exports.examples = examples;
+
+/***/ }),
+/* 528 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.run = undefined;
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+var _extends2;
+
+function _load_extends() {
+  return _extends2 = _interopRequireDefault(__webpack_require__(21));
+}
+
+let run = exports.run = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
+    const builderName = args[0],
+          rest = args.slice(1);
+
+
+    if (!builderName) {
+      throw new (_errors || _load_errors()).MessageError(reporter.lang('invalidPackageName'));
+    }
+
+    var _coerceCreatePackageN = coerceCreatePackageName(builderName);
+
+    const packageName = _coerceCreatePackageN.fullName,
+          commandName = _coerceCreatePackageN.name;
+
+
+    const linkLoc = path.join(config.linkFolder, commandName);
+    if (yield (_fs || _load_fs()).exists(linkLoc)) {
+      reporter.info(reporter.lang('linkUsing', packageName));
+    } else {
+      yield (0, (_global || _load_global()).run)(config, reporter, {}, ['add', packageName]);
+    }
+
+    const binFolder = yield (0, (_global || _load_global()).getBinFolder)(config, {});
+    const command = path.resolve(binFolder, commandName);
+    const env = yield (0, (_executeLifecycleScript || _load_executeLifecycleScript()).makeEnv)('create', config.cwd, config);
+
+    yield (_child || _load_child()).spawn(command, rest, { stdio: `inherit`, shell: true, env });
+  });
+
+  return function run(_x, _x2, _x3, _x4) {
+    return _ref.apply(this, arguments);
+  };
+})();
+
+exports.setFlags = setFlags;
+exports.hasWrapper = hasWrapper;
+exports.parsePackageName = parsePackageName;
+exports.coerceCreatePackageName = coerceCreatePackageName;
+
+var _errors;
+
+function _load_errors() {
+  return _errors = __webpack_require__(6);
+}
+
+var _child;
+
+function _load_child() {
+  return _child = _interopRequireWildcard(__webpack_require__(58));
+}
+
+var _executeLifecycleScript;
+
+function _load_executeLifecycleScript() {
+  return _executeLifecycleScript = __webpack_require__(111);
+}
+
+var _fs;
+
+function _load_fs() {
+  return _fs = _interopRequireWildcard(__webpack_require__(4));
+}
+
+var _global;
+
+function _load_global() {
+  return _global = __webpack_require__(121);
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const path = __webpack_require__(0);
+
+function setFlags(commander) {
+  commander.description('Creates new projects from any create-* starter kits.');
+}
+
+function hasWrapper(commander, args) {
+  return true;
+}
+
+function parsePackageName(str) {
+  if (str.charAt(0) === '/') {
+    throw new Error(`Name should not start with "/", got "${str}"`);
+  }
+  if (str.charAt(0) === '.') {
+    throw new Error(`Name should not start with ".", got "${str}"`);
+  }
+  const parts = str.split('/');
+  const isScoped = str.charAt(0) === '@';
+  if (isScoped && parts[0] === '@') {
+    throw new Error(`Scope should not be empty, got "${str}"`);
+  }
+  const scope = isScoped ? parts[0] : '';
+  const name = parts[isScoped ? 1 : 0] || '';
+  const path = parts.slice(isScoped ? 2 : 1).join('/');
+  const fullName = [scope, name].filter(Boolean).join('/');
+  const full = [scope, name, path].filter(Boolean).join('/');
+
+  return { fullName, name, scope, path, full };
+}
+
+function coerceCreatePackageName(str) {
+  const pkgNameObj = parsePackageName(str);
+  const coercedName = pkgNameObj.name !== '' ? `create-${pkgNameObj.name}` : `create`;
+  const coercedPkgNameObj = (0, (_extends2 || _load_extends()).default)({}, pkgNameObj, {
+    name: coercedName,
+    fullName: [pkgNameObj.scope, coercedName].filter(Boolean).join('/'),
+    full: [pkgNameObj.scope, coercedName, pkgNameObj.path].filter(Boolean).join('/')
+  });
+  return coercedPkgNameObj;
+}
+
+/***/ }),
+/* 529 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.run = undefined;
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+let run = exports.run = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
+    const env = yield (0, (_executeLifecycleScript || _load_executeLifecycleScript()).makeEnv)(`exec`, config.cwd, config);
+
+    if (args.length < 1) {
+      throw new (_errors || _load_errors()).MessageError(reporter.lang('execMissingCommand'));
+    }
+
+    const execName = args[0],
+          rest = args.slice(1);
+
+    yield (_child || _load_child()).spawn(execName, rest, { stdio: 'inherit', env });
+  });
+
+  return function run(_x, _x2, _x3, _x4) {
+    return _ref.apply(this, arguments);
+  };
+})();
+
+exports.setFlags = setFlags;
+exports.hasWrapper = hasWrapper;
+
+var _errors;
+
+function _load_errors() {
+  return _errors = __webpack_require__(6);
+}
+
+var _child;
+
+function _load_child() {
+  return _child = _interopRequireWildcard(__webpack_require__(58));
+}
+
+var _executeLifecycleScript;
+
+function _load_executeLifecycleScript() {
+  return _executeLifecycleScript = __webpack_require__(111);
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function setFlags(commander) {}
+
+function hasWrapper(commander, args) {
+  return true;
+}
+
+/***/ }),
+/* 530 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.examples = exports.run = undefined;
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+let run = exports.run = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
+    let manifest;
+    if (flags.useManifest) {
+      manifest = yield config.readJson(flags.useManifest);
+    } else {
+      manifest = yield config.readRootManifest();
+    }
+    if (!manifest.name) {
+      throw new (_errors || _load_errors()).MessageError(reporter.lang('noName'));
+    }
+    if (!manifest.version) {
+      throw new (_errors || _load_errors()).MessageError(reporter.lang('noVersion'));
+    }
+
+    const entry = {
+      name: manifest.name,
+      version: manifest.version,
+      resolved: flags.resolved,
+      registry: flags.registry || manifest._registry,
+      optionalDependencies: manifest.optionalDependencies,
+      dependencies: manifest.dependencies
+    };
+    const pattern = flags.pattern || `${entry.name}@${entry.version}`;
+    reporter.log((0, (_lockfile || _load_lockfile()).stringify)({
+      [pattern]: (0, (_lockfile || _load_lockfile()).implodeEntry)(pattern, entry)
+    }));
+  });
+
+  return function run(_x, _x2, _x3, _x4) {
+    return _ref.apply(this, arguments);
+  };
+})();
+
+exports.hasWrapper = hasWrapper;
+exports.setFlags = setFlags;
+
+var _errors;
+
+function _load_errors() {
+  return _errors = __webpack_require__(6);
+}
+
+var _lockfile;
+
+function _load_lockfile() {
+  return _lockfile = __webpack_require__(19);
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function hasWrapper(commander, args) {
+  return false;
+}
+
+function setFlags(commander) {
+  commander.description('Generates a lock file entry.');
+  commander.option('--use-manifest <location>', 'description');
+  commander.option('--resolved <resolved>', 'description');
+  commander.option('--registry <registry>', 'description');
+}
+
+const examples = exports.examples = ['generate-lock-entry', 'generate-lock-entry --use-manifest ./package.json', 'generate-lock-entry --resolved local-file.tgz#hash'];
+
+/***/ }),
+/* 531 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.hasWrapper = hasWrapper;
+exports.setFlags = setFlags;
+exports.run = run;
+
+var _index;
+
+function _load_index() {
+  return _index = _interopRequireDefault(__webpack_require__(334));
+}
+
+var _constants;
+
+function _load_constants() {
+  return _constants = _interopRequireWildcard(__webpack_require__(8));
+}
+
+var _misc;
+
+function _load_misc() {
+  return _misc = __webpack_require__(18);
+}
+
+var _aliases;
+
+function _load_aliases() {
+  return _aliases = _interopRequireDefault(__webpack_require__(352));
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const chalk = __webpack_require__(30);
+
+function hasWrapper(flags, args) {
+  return false;
+}
+
+function setFlags(commander) {
+  commander.description('Displays help information.');
+}
+
+function run(config, reporter, commander, args) {
+  if (args.length) {
+    const commandName = args.shift();
+    if (Object.prototype.hasOwnProperty.call((_index || _load_index()).default, commandName)) {
+      const command = (_index || _load_index()).default[commandName];
+      if (command) {
+        command.setFlags(commander);
+        const examples = (command.examples || []).map(example => `    $ yarn ${example}`);
+        if (examples.length) {
+          commander.on('--help', () => {
+            reporter.log(reporter.lang('helpExamples', reporter.rawText(examples.join('\n'))));
+          });
+        }
+        // eslint-disable-next-line yarn-internal/warn-language
+        commander.on('--help', () => reporter.log('  ' + command.getDocsInfo + '\n'));
+        commander.help();
+        return Promise.resolve();
+      }
+    }
+  }
+
+  commander.on('--help', () => {
+    const commandsText = [];
+    for (var _iterator = Object.keys((_index || _load_index()).default).sort((_misc || _load_misc()).sortAlpha), _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+      var _ref;
+
+      if (_isArray) {
+        if (_i >= _iterator.length) break;
+        _ref = _iterator[_i++];
+      } else {
+        _i = _iterator.next();
+        if (_i.done) break;
+        _ref = _i.value;
+      }
+
+      const name = _ref;
+
+      if ((_index || _load_index()).default[name].useless || Object.keys((_aliases || _load_aliases()).default).map(key => (_aliases || _load_aliases()).default[key]).indexOf(name) > -1) {
+        continue;
+      }
+      if ((_aliases || _load_aliases()).default[name]) {
+        commandsText.push(`    - ${(0, (_misc || _load_misc()).hyphenate)(name)} / ${(_aliases || _load_aliases()).default[name]}`);
+      } else {
+        commandsText.push(`    - ${(0, (_misc || _load_misc()).hyphenate)(name)}`);
+      }
+    }
+    reporter.log(reporter.lang('helpCommands', reporter.rawText(commandsText.join('\n'))));
+    reporter.log(reporter.lang('helpCommandsMore', reporter.rawText(chalk.bold('yarn help COMMAND'))));
+    reporter.log(reporter.lang('helpLearnMore', reporter.rawText(chalk.bold((_constants || _load_constants()).YARN_DOCS))));
+  });
+
+  commander.options.sort((_misc || _load_misc()).sortOptionsByFlags);
+
+  commander.help();
+  return Promise.resolve();
+}
+
+/***/ }),
+/* 532 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.run = exports.Import = exports.noArguments = undefined;
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+let run = exports.run = (() => {
+  var _ref5 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
+    const imp = new Import(flags, config, reporter, new (_lockfile || _load_lockfile()).default({ cache: {} }));
+    yield imp.init();
+  });
+
+  return function run(_x, _x2, _x3, _x4) {
+    return _ref5.apply(this, arguments);
+  };
+})();
+
+exports.setFlags = setFlags;
+exports.hasWrapper = hasWrapper;
+
+var _install;
+
+function _load_install() {
+  return _install = __webpack_require__(34);
+}
+
+var _check;
+
+function _load_check() {
+  return _check = __webpack_require__(356);
+}
+
+var _errors;
+
+function _load_errors() {
+  return _errors = __webpack_require__(6);
+}
+
+var _index;
+
+function _load_index() {
+  return _index = __webpack_require__(78);
+}
+
+var _baseResolver;
+
+function _load_baseResolver() {
+  return _baseResolver = _interopRequireDefault(__webpack_require__(123));
+}
+
+var _hostedGitResolver;
+
+function _load_hostedGitResolver() {
+  return _hostedGitResolver = _interopRequireDefault(__webpack_require__(109));
+}
+
+var _hostedGitResolver2;
+
+function _load_hostedGitResolver2() {
+  return _hostedGitResolver2 = __webpack_require__(109);
+}
+
+var _gistResolver;
+
+function _load_gistResolver() {
+  return _gistResolver = _interopRequireDefault(__webpack_require__(216));
+}
+
+var _gistResolver2;
+
+function _load_gistResolver2() {
+  return _gistResolver2 = __webpack_require__(216);
+}
+
+var _gitResolver;
+
+function _load_gitResolver() {
+  return _gitResolver = _interopRequireDefault(__webpack_require__(124));
+}
+
+var _fileResolver;
+
+function _load_fileResolver() {
+  return _fileResolver = _interopRequireDefault(__webpack_require__(215));
+}
+
+var _packageResolver;
+
+function _load_packageResolver() {
+  return _packageResolver = _interopRequireDefault(__webpack_require__(366));
+}
+
+var _packageRequest;
+
+function _load_packageRequest() {
+  return _packageRequest = _interopRequireDefault(__webpack_require__(122));
+}
+
+var _packageReference;
+
+function _load_packageReference() {
+  return _packageReference = _interopRequireDefault(__webpack_require__(365));
+}
+
+var _packageFetcher;
+
+function _load_packageFetcher() {
+  return _packageFetcher = _interopRequireWildcard(__webpack_require__(210));
+}
+
+var _packageLinker;
+
+function _load_packageLinker() {
+  return _packageLinker = _interopRequireDefault(__webpack_require__(211));
+}
+
+var _packageCompatibility;
+
+function _load_packageCompatibility() {
+  return _packageCompatibility = _interopRequireWildcard(__webpack_require__(209));
+}
+
+var _lockfile;
+
+function _load_lockfile() {
+  return _lockfile = _interopRequireDefault(__webpack_require__(19));
+}
+
+var _normalizePattern9;
+
+function _load_normalizePattern() {
+  return _normalizePattern9 = __webpack_require__(37);
+}
+
+var _logicalDependencyTree;
+
+function _load_logicalDependencyTree() {
+  return _logicalDependencyTree = __webpack_require__(582);
+}
+
+var _fs;
+
+function _load_fs() {
+  return _fs = _interopRequireWildcard(__webpack_require__(4));
+}
+
+var _misc;
+
+function _load_misc() {
+  return _misc = _interopRequireWildcard(__webpack_require__(18));
+}
+
+var _constants;
+
+function _load_constants() {
+  return _constants = __webpack_require__(8);
+}
+
+var _semver;
+
+function _load_semver() {
+  return _semver = _interopRequireDefault(__webpack_require__(22));
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const invariant = __webpack_require__(9);
+const path = __webpack_require__(0);
+const uuid = __webpack_require__(119);
+const ssri = __webpack_require__(65);
+const nodeVersion = process.versions.node.split('-')[0];
+
+const noArguments = exports.noArguments = true;
+
+class ImportResolver extends (_baseResolver || _load_baseResolver()).default {
+  getCwd() {
+    if (this.request.parentRequest) {
+      const parent = this.resolver.getStrictResolvedPattern(this.request.parentRequest.pattern);
+      invariant(parent._loc, 'expected package location');
+      return path.dirname(parent._loc);
+    }
+    return this.config.cwd;
+  }
+
+  resolveHostedGit(info, Resolver) {
+    var _normalizePattern = (0, (_normalizePattern9 || _load_normalizePattern()).normalizePattern)(this.pattern);
+
+    const range = _normalizePattern.range;
+
+    const exploded = (0, (_hostedGitResolver2 || _load_hostedGitResolver2()).explodeHostedGitFragment)(range, this.reporter);
+    const hash = info.gitHead;
+    invariant(hash, 'expected package gitHead');
+    const url = Resolver.getTarballUrl(exploded, hash);
+    info._uid = hash;
+    info._remote = {
+      resolved: url,
+      type: 'tarball',
+      registry: this.registry,
+      reference: url,
+      hash: null
+    };
+    return info;
+  }
+
+  resolveGist(info, Resolver) {
+    var _normalizePattern2 = (0, (_normalizePattern9 || _load_normalizePattern()).normalizePattern)(this.pattern);
+
+    const range = _normalizePattern2.range;
+
+    var _explodeGistFragment = (0, (_gistResolver2 || _load_gistResolver2()).explodeGistFragment)(range, this.reporter);
+
+    const id = _explodeGistFragment.id;
+
+    const hash = info.gitHead;
+    invariant(hash, 'expected package gitHead');
+    const url = `https://gist.github.com/${id}.git`;
+    info._uid = hash;
+    info._remote = {
+      resolved: `${url}#${hash}`,
+      type: 'git',
+      registry: this.registry,
+      reference: url,
+      hash
+    };
+    return info;
+  }
+
+  resolveGit(info, Resolver) {
+    const url = info._resolved;
+    const hash = info.gitHead;
+    invariant(url, 'expected package _resolved');
+    invariant(hash, 'expected package gitHead');
+    info._uid = hash;
+    info._remote = {
+      resolved: `${url}#${hash}`,
+      type: 'git',
+      registry: this.registry,
+      reference: url,
+      hash
+    };
+    return info;
+  }
+
+  resolveFile(info, Resolver) {
+    var _normalizePattern3 = (0, (_normalizePattern9 || _load_normalizePattern()).normalizePattern)(this.pattern);
+
+    const range = _normalizePattern3.range;
+
+    let loc = (_misc || _load_misc()).removePrefix(range, 'file:');
+    if (!path.isAbsolute(loc)) {
+      loc = path.join(this.config.cwd, loc);
+    }
+    info._uid = info.version;
+    info._remote = {
+      type: 'copy',
+      registry: this.registry,
+      hash: `${uuid.v4()}-${new Date().getTime()}`,
+      reference: loc
+    };
+    return info;
+  }
+
+  resolveRegistry(info) {
+    let url = info._resolved;
+    const hash = info._shasum;
+    invariant(url, 'expected package _resolved');
+    invariant(hash, 'expected package _shasum');
+    if (this.config.getOption('registry') === (_constants || _load_constants()).YARN_REGISTRY) {
+      url = url.replace((_constants || _load_constants()).NPM_REGISTRY_RE, (_constants || _load_constants()).YARN_REGISTRY);
+    }
+    info._uid = info.version;
+    info._remote = {
+      resolved: `${url}#${hash}`,
+      type: 'tarball',
+      registry: this.registry,
+      reference: url,
+      integrity: info._integrity ? ssri.parse(info._integrity) : ssri.fromHex(hash, 'sha1'),
+      hash
+    };
+    return info;
+  }
+
+  resolveImport(info) {
+    var _normalizePattern4 = (0, (_normalizePattern9 || _load_normalizePattern()).normalizePattern)(this.pattern);
+
+    const range = _normalizePattern4.range;
+
+    const Resolver = (0, (_index || _load_index()).getExoticResolver)(range);
+    if (Resolver && Resolver.prototype instanceof (_hostedGitResolver || _load_hostedGitResolver()).default) {
+      return this.resolveHostedGit(info, Resolver);
+    } else if (Resolver && Resolver === (_gistResolver || _load_gistResolver()).default) {
+      return this.resolveGist(info, Resolver);
+    } else if (Resolver && Resolver === (_gitResolver || _load_gitResolver()).default) {
+      return this.resolveGit(info, Resolver);
+    } else if (Resolver && Resolver === (_fileResolver || _load_fileResolver()).default) {
+      return this.resolveFile(info, Resolver);
+    }
+    return this.resolveRegistry(info);
+  }
+
+  resolveLocation(loc) {
+    var _this = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const info = yield _this.config.tryManifest(loc, 'npm', false);
+      if (!info) {
+        return null;
+      }
+      return _this.resolveImport(info);
+    })();
+  }
+
+  resolveFixedVersion(fixedVersionPattern) {
+    var _this2 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      var _normalizePattern5 = (0, (_normalizePattern9 || _load_normalizePattern()).normalizePattern)(fixedVersionPattern);
+
+      const range = _normalizePattern5.range;
+
+      const exoticResolver = (0, (_index || _load_index()).getExoticResolver)(range);
+      const manifest = exoticResolver ? yield _this2.request.findExoticVersionInfo(exoticResolver, range) : yield _this2.request.findVersionOnRegistry(fixedVersionPattern);
+      return manifest;
+    })();
+  }
+
+  _resolveFromFixedVersions() {
+    var _this3 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      invariant(_this3.request instanceof ImportPackageRequest, 'request must be ImportPackageRequest');
+
+      var _normalizePattern6 = (0, (_normalizePattern9 || _load_normalizePattern()).normalizePattern)(_this3.pattern);
+
+      const name = _normalizePattern6.name;
+
+      invariant(_this3.request.dependencyTree instanceof (_logicalDependencyTree || _load_logicalDependencyTree()).LogicalDependencyTree, 'dependencyTree on request must be LogicalDependencyTree');
+      const fixedVersionPattern = _this3.request.dependencyTree.getFixedVersionPattern(name, _this3.request.parentNames);
+      const info = yield _this3.config.getCache(`import-resolver-${fixedVersionPattern}`, function () {
+        return _this3.resolveFixedVersion(fixedVersionPattern);
+      });
+      if (info) {
+        return info;
+      }
+      throw new (_errors || _load_errors()).MessageError(_this3.reporter.lang('importResolveFailed', name, _this3.getCwd()));
+    })();
+  }
+
+  _resolveFromNodeModules() {
+    var _this4 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      var _normalizePattern7 = (0, (_normalizePattern9 || _load_normalizePattern()).normalizePattern)(_this4.pattern);
+
+      const name = _normalizePattern7.name;
+
+      let cwd = _this4.getCwd();
+      while (!path.relative(_this4.config.cwd, cwd).startsWith('..')) {
+        const loc = path.join(cwd, 'node_modules', name);
+        const info = yield _this4.config.getCache(`import-resolver-${loc}`, function () {
+          return _this4.resolveLocation(loc);
+        });
+        if (info) {
+          return info;
+        }
+        cwd = path.resolve(cwd, '../..');
+      }
+      throw new (_errors || _load_errors()).MessageError(_this4.reporter.lang('importResolveFailed', name, _this4.getCwd()));
+    })();
+  }
+
+  resolve() {
+    if (this.request instanceof ImportPackageRequest && this.request.dependencyTree) {
+      return this._resolveFromFixedVersions();
+    } else {
+      return this._resolveFromNodeModules();
+    }
+  }
+}
+
+class ImportPackageRequest extends (_packageRequest || _load_packageRequest()).default {
+  constructor(req, dependencyTree, resolver) {
+    super(req, resolver);
+    this.import = this.parentRequest instanceof ImportPackageRequest ? this.parentRequest.import : true;
+    this.dependencyTree = dependencyTree;
+  }
+
+  getRootName() {
+    return this.resolver instanceof ImportPackageResolver && this.resolver.rootName || 'root';
+  }
+
+  getParentHumanName() {
+    return [this.getRootName()].concat(this.parentNames).join(' > ');
+  }
+
+  reportResolvedRangeMatch(info, resolved) {
+    if (info.version === resolved.version) {
+      return;
+    }
+    this.reporter.warn(this.reporter.lang('importResolvedRangeMatch', resolved.version, resolved.name, info.version, this.getParentHumanName()));
+  }
+
+  _findResolvedManifest(info) {
+    var _normalizePattern8 = (0, (_normalizePattern9 || _load_normalizePattern()).normalizePattern)(this.pattern);
+
+    const range = _normalizePattern8.range,
+          name = _normalizePattern8.name;
+
+    const solvedRange = (_semver || _load_semver()).default.validRange(range) ? info.version : range;
+    const resolved = this.resolver.getExactVersionMatch(name, solvedRange, info);
+    if (resolved) {
+      return resolved;
+    }
+    invariant(info._remote, 'expected package remote');
+    const ref = new (_packageReference || _load_packageReference()).default(this, info, info._remote);
+    info._reference = ref;
+    return info;
+  }
+
+  resolveToExistingVersion(info) {
+    const resolved = this._findResolvedManifest(info);
+    invariant(resolved, 'should have found a resolved reference');
+    const ref = resolved._reference;
+    invariant(ref, 'should have a package reference');
+    ref.addRequest(this);
+    ref.addPattern(this.pattern, resolved);
+    ref.addOptional(this.optional);
+  }
+
+  findVersionInfo() {
+    if (!this.import) {
+      this.reporter.verbose(this.reporter.lang('skippingImport', this.pattern, this.getParentHumanName()));
+      return super.findVersionInfo();
+    }
+    const resolver = new ImportResolver(this, this.pattern);
+    return resolver.resolve().catch(() => {
+      this.import = false;
+      this.reporter.warn(this.reporter.lang('importFailed', this.pattern, this.getParentHumanName()));
+      return super.findVersionInfo();
+    });
+  }
+}
+
+class ImportPackageResolver extends (_packageResolver || _load_packageResolver()).default {
+  constructor(config, lockfile) {
+    super(config, lockfile);
+    this.next = [];
+    this.rootName = 'root';
+  }
+
+  find(req) {
+    this.next.push(req);
+    return Promise.resolve();
+  }
+
+  findOne(req) {
+    var _this5 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      if (_this5.activity) {
+        _this5.activity.tick(req.pattern);
+      }
+      const request = new ImportPackageRequest(req, _this5.dependencyTree, _this5);
+      yield request.find({ fresh: false });
+    })();
+  }
+
+  findAll(deps) {
+    var _this6 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      yield Promise.all(deps.map(function (dep) {
+        return _this6.findOne(dep);
+      }));
+      deps = _this6.next;
+      _this6.next = [];
+      if (!deps.length) {
+        // all required package versions have been discovered, so now packages that
+        // resolved to existing versions can be resolved to their best available version
+        _this6.resolvePackagesWithExistingVersions();
+        return;
+      }
+      yield _this6.findAll(deps);
+    })();
+  }
+
+  resetOptional() {
+    for (const pattern in this.patterns) {
+      const ref = this.patterns[pattern]._reference;
+      invariant(ref, 'expected reference');
+      ref.optional = null;
+      for (var _iterator = ref.requests, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+        var _ref;
+
+        if (_isArray) {
+          if (_i >= _iterator.length) break;
+          _ref = _iterator[_i++];
+        } else {
+          _i = _iterator.next();
+          if (_i.done) break;
+          _ref = _i.value;
+        }
+
+        const req = _ref;
+
+        ref.addOptional(req.optional);
+      }
+    }
+  }
+
+  init(deps, { isFlat, isFrozen, workspaceLayout } = { isFlat: false, isFrozen: false, workspaceLayout: undefined }) {
+    var _this7 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      _this7.flat = Boolean(isFlat);
+      const activity = _this7.activity = _this7.reporter.activity();
+      yield _this7.findAll(deps);
+      _this7.resetOptional();
+      activity.end();
+      _this7.activity = null;
+    })();
+  }
+}
+
+class Import extends (_install || _load_install()).Install {
+  constructor(flags, config, reporter, lockfile) {
+    super(flags, config, reporter, lockfile);
+    this.resolver = new ImportPackageResolver(this.config, this.lockfile);
+    this.linker = new (_packageLinker || _load_packageLinker()).default(config, this.resolver);
+  }
+  createLogicalDependencyTree(packageJson, packageLock) {
+    invariant(packageJson, 'package.json should exist');
+    invariant(packageLock, 'package-lock.json should exist');
+    invariant(this.resolver instanceof ImportPackageResolver, 'resolver should be an ImportPackageResolver');
+    try {
+      this.resolver.dependencyTree = new (_logicalDependencyTree || _load_logicalDependencyTree()).LogicalDependencyTree(packageJson, packageLock);
+    } catch (e) {
+      throw new (_errors || _load_errors()).MessageError(this.reporter.lang('importSourceFilesCorrupted'));
+    }
+  }
+  getExternalLockfileContents() {
+    var _this8 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      try {
+        var _ref2 = yield Promise.all([(_fs || _load_fs()).readFile(path.join(_this8.config.cwd, (_constants || _load_constants()).NODE_PACKAGE_JSON)), (_fs || _load_fs()).readFile(path.join(_this8.config.cwd, (_constants || _load_constants()).NPM_LOCK_FILENAME))]);
+
+        const packageJson = _ref2[0],
+              packageLock = _ref2[1];
+
+        return { packageJson, packageLock };
+      } catch (e) {
+        return { packageJson: null, packageLock: null };
+      }
+    })();
+  }
+  init() {
+    var _this9 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      if (yield (_fs || _load_fs()).exists(path.join(_this9.config.cwd, (_constants || _load_constants()).LOCKFILE_FILENAME))) {
+        throw new (_errors || _load_errors()).MessageError(_this9.reporter.lang('lockfileExists'));
+      }
+
+      var _ref3 = yield _this9.getExternalLockfileContents();
+
+      const packageJson = _ref3.packageJson,
+            packageLock = _ref3.packageLock;
+
+      const importSource = packageJson && packageLock && (_semver || _load_semver()).default.satisfies(nodeVersion, '>=5.0.0') ? 'package-lock.json' : 'node_modules';
+      if (importSource === 'package-lock.json') {
+        _this9.reporter.info(_this9.reporter.lang('importPackageLock'));
+        _this9.createLogicalDependencyTree(packageJson, packageLock);
+      }
+      if (importSource === 'node_modules') {
+        _this9.reporter.info(_this9.reporter.lang('importNodeModules'));
+        yield (0, (_check || _load_check()).verifyTreeCheck)(_this9.config, _this9.reporter, {}, []);
+      }
+
+      var _ref4 = yield _this9.fetchRequestFromCwd();
+
+      const requests = _ref4.requests,
+            patterns = _ref4.patterns,
+            manifest = _ref4.manifest;
+
+      if (manifest.name && _this9.resolver instanceof ImportPackageResolver) {
+        _this9.resolver.rootName = manifest.name;
+      }
+      yield _this9.resolver.init(requests, { isFlat: _this9.flags.flat, isFrozen: _this9.flags.frozenLockfile });
+      const manifests = yield (_packageFetcher || _load_packageFetcher()).fetch(_this9.resolver.getManifests(), _this9.config);
+      _this9.resolver.updateManifests(manifests);
+      yield (_packageCompatibility || _load_packageCompatibility()).check(_this9.resolver.getManifests(), _this9.config, _this9.flags.ignoreEngines);
+      yield _this9.linker.resolvePeerModules();
+      yield _this9.saveLockfileAndIntegrity(patterns);
+      return patterns;
+    })();
+  }
+}
+
+exports.Import = Import;
+function setFlags(commander) {
+  commander.description('Generates yarn.lock from an npm package-lock.json file or an existing npm-installed node_modules folder.');
+}
+
+function hasWrapper(commander, args) {
+  return true;
+}
+
+/***/ }),
+/* 533 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.run = undefined;
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+let run = exports.run = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
+    if (args.length > 2) {
+      reporter.error(reporter.lang('tooManyArguments', 2));
+      return;
+    }
+
+    let packageName = args.shift() || '.';
+
+    // Handle the case when we are referencing a local package.
+    if (packageName === '.') {
+      packageName = (yield config.readRootManifest()).name;
+    }
+
+    const packageInput = (_npmRegistry || _load_npmRegistry()).default.escapeName(packageName);
+
+    var _parsePackageName = (0, (_parsePackageName2 || _load_parsePackageName()).default)(packageInput);
+
+    const name = _parsePackageName.name,
+          version = _parsePackageName.version;
+
+
+    let result;
+    try {
+      result = yield config.registries.npm.request(name, { unfiltered: true });
+    } catch (e) {
+      reporter.error(reporter.lang('infoFail'));
+      return;
+    }
+    if (!result) {
+      reporter.error(reporter.lang('infoFail'));
+      return;
+    }
+
+    result = clean(result);
+
+    const versions = result.versions;
+    // $FlowFixMe
+    result.versions = Object.keys(versions).sort(semver.compareLoose);
+    result.version = version || result['dist-tags'].latest;
+    result = Object.assign(result, versions[result.version]);
+
+    const fieldPath = args.shift();
+    const fields = fieldPath ? fieldPath.split('.') : [];
+
+    // Readmes can be long so exclude them unless explicitly asked for.
+    if (fields[0] !== 'readme') {
+      delete result.readme;
+    }
+
+    result = fields.reduce(function (prev, cur) {
+      return prev && prev[cur];
+    }, result);
+    reporter.inspect(result);
+  });
+
+  return function run(_x, _x2, _x3, _x4) {
+    return _ref.apply(this, arguments);
+  };
+})();
+
+exports.setFlags = setFlags;
+exports.hasWrapper = hasWrapper;
+
+var _npmRegistry;
+
+function _load_npmRegistry() {
+  return _npmRegistry = _interopRequireDefault(__webpack_require__(88));
+}
+
+var _parsePackageName2;
+
+function _load_parsePackageName() {
+  return _parsePackageName2 = _interopRequireDefault(__webpack_require__(588));
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const semver = __webpack_require__(22);
+
+function clean(object) {
+  if (Array.isArray(object)) {
+    const result = [];
+    object.forEach(item => {
+      item = clean(item);
+      if (item) {
+        result.push(item);
+      }
+    });
+    return result;
+  } else if (typeof object === 'object') {
+    const result = {};
+    for (const key in object) {
+      if (key.startsWith('_')) {
+        continue;
+      }
+
+      const item = clean(object[key]);
+      if (item) {
+        result[key] = item;
+      }
+    }
+    return result;
+  } else if (object) {
+    return object;
+  } else {
+    return null;
+  }
+}
+
+function setFlags(commander) {
+  commander.description('Shows information about a package.');
+}
+
+function hasWrapper(commander, args) {
+  return true;
+}
+
+/***/ }),
+/* 534 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getGitConfigInfo = exports.run = exports.shouldRunInCurrentCwd = undefined;
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+let run = exports.run = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
+    const manifests = yield config.getRootManifests();
+
+    let repository = {};
+    const author = {
+      name: config.getOption('init-author-name'),
+      email: config.getOption('init-author-email'),
+      url: config.getOption('init-author-url')
+    };
+    if (yield (_fs || _load_fs()).exists(path.join(config.cwd, '.git'))) {
+      // get git origin of the cwd
+      try {
+        repository = {
+          type: 'git',
+          url: yield (_child || _load_child()).spawn('git', ['config', 'remote.origin.url'], {
+            cwd: config.cwd
+          })
+        };
+      } catch (ex) {
+        // Ignore - Git repo may not have an origin URL yet (eg. if it only exists locally)
+      }
+
+      if (author.name === undefined) {
+        author.name = yield getGitConfigInfo('user.name');
+      }
+
+      if (author.email === undefined) {
+        author.email = yield getGitConfigInfo('user.email');
+      }
+    }
+
+    const keys = [{
+      key: 'name',
+      question: 'name',
+      default: path.basename(config.cwd),
+      validation: (_validate || _load_validate()).isValidPackageName,
+      validationError: 'invalidPackageName'
+    }, {
+      key: 'version',
+      question: 'version',
+      default: String(config.getOption('init-version'))
+    }, {
+      key: 'description',
+      question: 'description',
+      default: ''
+    }, {
+      key: 'main',
+      question: 'entry point',
+      default: 'index.js'
+    }, {
+      key: 'repository',
+      question: 'repository url',
+      default: (0, (_util || _load_util()).extractRepositoryUrl)(repository)
+    }, {
+      key: 'author',
+      question: 'author',
+      default: (0, (_util || _load_util()).stringifyPerson)(author)
+    }, {
+      key: 'license',
+      question: 'license',
+      default: String(config.getOption('init-license'))
+    }, {
+      key: 'private',
+      question: 'private',
+      default: config.getOption('init-private') || '',
+      inputFormatter: yn
+    }];
+
+    // get answers
+    const pkg = {};
+    for (var _iterator = keys, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+      var _ref2;
+
+      if (_isArray) {
+        if (_i >= _iterator.length) break;
+        _ref2 = _iterator[_i++];
+      } else {
+        _i = _iterator.next();
+        if (_i.done) break;
+        _ref2 = _i.value;
+      }
+
+      const entry = _ref2;
+      const yes = flags.yes,
+            privateFlag = flags.private;
+      const manifestKey = entry.key;
+      let question = entry.question,
+          def = entry.default;
+
+
+      for (var _iterator4 = (_index || _load_index()).registryNames, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
+        var _ref5;
+
+        if (_isArray4) {
+          if (_i4 >= _iterator4.length) break;
+          _ref5 = _iterator4[_i4++];
+        } else {
+          _i4 = _iterator4.next();
+          if (_i4.done) break;
+          _ref5 = _i4.value;
+        }
+
+        const registryName = _ref5;
+        const object = manifests[registryName].object;
+
+        let val = objectPath.get(object, manifestKey);
+        if (!val) {
+          break;
+        }
+        if (typeof val === 'object') {
+          if (manifestKey === 'author') {
+            val = (0, (_util || _load_util()).stringifyPerson)(val);
+          } else if (manifestKey === 'repository') {
+            val = (0, (_util || _load_util()).extractRepositoryUrl)(val);
+          }
+        }
+        def = val;
+      }
+
+      if (manifestKey === 'private' && privateFlag) {
+        def = true;
+      }
+
+      if (def) {
+        question += ` (${String(def)})`;
+      }
+
+      let answer;
+      let validAnswer = false;
+
+      if (yes) {
+        answer = def;
+      } else {
+        // loop until a valid answer is provided, if validation is on entry
+        if (entry.validation) {
+          while (!validAnswer) {
+            answer = (yield reporter.question(question)) || def;
+            // validate answer
+            if (entry.validation(String(answer))) {
+              validAnswer = true;
+            } else {
+              reporter.error(reporter.lang('invalidPackageName'));
+            }
+          }
+        } else {
+          answer = (yield reporter.question(question)) || def;
+        }
+      }
+
+      if (answer) {
+        if (entry.inputFormatter) {
+          answer = entry.inputFormatter(answer);
+        }
+        objectPath.set(pkg, manifestKey, answer);
+      }
+    }
+
+    if (pkg.repository && (_githubResolver || _load_githubResolver()).default.isVersion(pkg.repository)) {
+      pkg.repository = `https://github.com/${pkg.repository}`;
+    }
+
+    // save answers
+    const targetManifests = [];
+    for (var _iterator2 = (_index || _load_index()).registryNames, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+      var _ref3;
+
+      if (_isArray2) {
+        if (_i2 >= _iterator2.length) break;
+        _ref3 = _iterator2[_i2++];
+      } else {
+        _i2 = _iterator2.next();
+        if (_i2.done) break;
+        _ref3 = _i2.value;
+      }
+
+      const registryName = _ref3;
+
+      const info = manifests[registryName];
+      if (info.exists) {
+        targetManifests.push(info);
+      }
+    }
+    if (!targetManifests.length) {
+      targetManifests.push(manifests.npm);
+    }
+    for (var _iterator3 = targetManifests, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
+      var _ref4;
+
+      if (_isArray3) {
+        if (_i3 >= _iterator3.length) break;
+        _ref4 = _iterator3[_i3++];
+      } else {
+        _i3 = _iterator3.next();
+        if (_i3.done) break;
+        _ref4 = _i3.value;
+      }
+
+      const targetManifest = _ref4;
+
+      Object.assign(targetManifest.object, pkg);
+      reporter.success(`Saved ${path.basename(targetManifest.loc)}`);
+    }
+
+    yield config.saveRootManifests(manifests);
+  });
+
+  return function run(_x, _x2, _x3, _x4) {
+    return _ref.apply(this, arguments);
+  };
+})();
+
+let getGitConfigInfo = exports.getGitConfigInfo = (() => {
+  var _ref6 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (credential, spawn = (_child || _load_child()).spawn) {
+    try {
+      // try to get author default based on git config
+      return yield spawn('git', ['config', credential]);
+    } catch (e) {
+      return '';
+    }
+  });
+
+  return function getGitConfigInfo(_x5) {
+    return _ref6.apply(this, arguments);
+  };
+})();
+
+exports.setFlags = setFlags;
+exports.hasWrapper = hasWrapper;
+
+var _util;
+
+function _load_util() {
+  return _util = __webpack_require__(221);
+}
+
+var _index;
+
+function _load_index() {
+  return _index = __webpack_require__(57);
+}
+
+var _githubResolver;
+
+function _load_githubResolver() {
+  return _githubResolver = _interopRequireDefault(__webpack_require__(367));
+}
+
+var _child;
+
+function _load_child() {
+  return _child = _interopRequireWildcard(__webpack_require__(58));
+}
+
+var _fs;
+
+function _load_fs() {
+  return _fs = _interopRequireWildcard(__webpack_require__(4));
+}
+
+var _validate;
+
+function _load_validate() {
+  return _validate = _interopRequireWildcard(__webpack_require__(125));
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const objectPath = __webpack_require__(304);
+const path = __webpack_require__(0);
+const yn = __webpack_require__(962);
+
+function setFlags(commander) {
+  commander.description('Interactively creates or updates a package.json file.');
+  commander.option('-y, --yes', 'use default options');
+  commander.option('-p, --private', 'use default options and private true');
+}
+
+function hasWrapper(commander, args) {
+  return true;
+}
+
+const shouldRunInCurrentCwd = exports.shouldRunInCurrentCwd = true;
+
+/***/ }),
+/* 535 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.examples = exports.run = undefined;
+
+var _extends2;
+
+function _load_extends() {
+  return _extends2 = _interopRequireDefault(__webpack_require__(21));
+}
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+let getManifests = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, flags) {
+    const lockfile = yield (_lockfile || _load_lockfile()).default.fromDirectory(config.cwd);
+    const install = new (_install || _load_install()).Install((0, (_extends2 || _load_extends()).default)({ skipIntegrityCheck: true }, flags), config, new (_baseReporter || _load_baseReporter()).default(), lockfile);
+    yield install.hydrate(true);
+
+    let manifests = install.resolver.getManifests();
+
+    // sort by name
+    manifests = manifests.sort(function (a, b) {
+      if (!a.name && !b.name) {
+        return 0;
+      }
+
+      if (!a.name) {
+        return 1;
+      }
+
+      if (!b.name) {
+        return -1;
+      }
+
+      return a.name.localeCompare(b.name);
+    });
+
+    // filter ignored manifests
+    manifests = manifests.filter(function (manifest) {
+      const ref = manifest._reference;
+      return !!ref && !ref.ignore;
+    });
+
+    return manifests;
+  });
+
+  return function getManifests(_x, _x2) {
+    return _ref.apply(this, arguments);
+  };
+})();
+
+let list = (() => {
+  var _ref2 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
+    const manifests = yield getManifests(config, flags);
+    const manifestsByLicense = new Map();
+
+    for (var _iterator = manifests, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+      var _ref4;
+
+      if (_isArray) {
+        if (_i >= _iterator.length) break;
+        _ref4 = _iterator[_i++];
+      } else {
+        _i = _iterator.next();
+        if (_i.done) break;
+        _ref4 = _i.value;
+      }
+
+      const _ref3 = _ref4;
+      const name = _ref3.name,
+            version = _ref3.version,
+            license = _ref3.license,
+            repository = _ref3.repository,
+            homepage = _ref3.homepage,
+            author = _ref3.author;
+
+      const licenseKey = license || 'UNKNOWN';
+      const url = repository ? repository.url : homepage;
+      const vendorUrl = homepage || author && author.url;
+      const vendorName = author && author.name;
+
+      if (!manifestsByLicense.has(licenseKey)) {
+        manifestsByLicense.set(licenseKey, new Map());
+      }
+
+      const byLicense = manifestsByLicense.get(licenseKey);
+      invariant(byLicense, 'expected value');
+      byLicense.set(`${name}@${version}`, {
+        name,
+        version,
+        url,
+        vendorUrl,
+        vendorName
+      });
+    }
+
+    if (flags.json) {
+      const body = [];
+
+      manifestsByLicense.forEach(function (license, licenseKey) {
+        license.forEach(function ({ name, version, url, vendorUrl, vendorName }) {
+          body.push([name, version, licenseKey, url || 'Unknown', vendorUrl || 'Unknown', vendorName || 'Unknown']);
+        });
+      });
+
+      reporter.table(['Name', 'Version', 'License', 'URL', 'VendorUrl', 'VendorName'], body);
+    } else {
+      const trees = [];
+
+      manifestsByLicense.forEach(function (license, licenseKey) {
+        const licenseTree = [];
+
+        license.forEach(function ({ name, version, url, vendorUrl, vendorName }) {
+          const children = [];
+
+          if (url) {
+            children.push({ name: `${reporter.format.bold('URL:')} ${url}` });
+          }
+
+          if (vendorUrl) {
+            children.push({ name: `${reporter.format.bold('VendorUrl:')} ${vendorUrl}` });
+          }
+
+          if (vendorName) {
+            children.push({ name: `${reporter.format.bold('VendorName:')} ${vendorName}` });
+          }
+
+          licenseTree.push({
+            name: `${name}@${version}`,
+            children
+          });
+        });
+
+        trees.push({
+          name: licenseKey,
+          children: licenseTree
+        });
+      });
+
+      reporter.tree('licenses', trees, { force: true });
+    }
+  });
+
+  return function list(_x3, _x4, _x5, _x6) {
+    return _ref2.apply(this, arguments);
+  };
+})();
+
+exports.hasWrapper = hasWrapper;
+exports.setFlags = setFlags;
+
+var _baseReporter;
+
+function _load_baseReporter() {
+  return _baseReporter = _interopRequireDefault(__webpack_require__(108));
+}
+
+var _install;
+
+function _load_install() {
+  return _install = __webpack_require__(34);
+}
+
+var _lockfile;
+
+function _load_lockfile() {
+  return _lockfile = _interopRequireDefault(__webpack_require__(19));
+}
+
+var _buildSubCommands2;
+
+function _load_buildSubCommands() {
+  return _buildSubCommands2 = _interopRequireDefault(__webpack_require__(59));
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const invariant = __webpack_require__(9);
+
+function hasWrapper(flags, args) {
+  return args[0] != 'generate-disclaimer';
+}
+
+function setFlags(commander) {
+  commander.description('Lists licenses for installed packages.');
+}
+
+var _buildSubCommands = (0, (_buildSubCommands2 || _load_buildSubCommands()).default)('licenses', {
+  ls(config, reporter, flags, args) {
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      reporter.warn(`\`yarn licenses ls\` is deprecated. Please use \`yarn licenses list\`.`);
+      yield list(config, reporter, flags, args);
+    })();
+  },
+
+  list(config, reporter, flags, args) {
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      yield list(config, reporter, flags, args);
+    })();
+  },
+
+  generateDisclaimer(config, reporter, flags, args) {
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      /* eslint-disable no-console */
+
+      // `reporter.log` dumps a bunch of ANSI escapes to clear the current line and
+      // is for abstracting the console output so it can be consumed by other tools
+      // (JSON output being the primary one). This command is only for text consumption
+      // and you should just be dumping it to a TXT file. Using a reporter here has the
+      // potential to mess up the output since it might print ansi escapes.
+      const manifests = yield getManifests(config, flags);
+      const manifest = yield config.readRootManifest();
+
+      // Create a map of license text to manifest so that packages with exactly
+      // the same license text are grouped together.
+      const manifestsByLicense = new Map();
+      for (var _iterator2 = manifests, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+        var _ref5;
+
+        if (_isArray2) {
+          if (_i2 >= _iterator2.length) break;
+          _ref5 = _iterator2[_i2++];
+        } else {
+          _i2 = _iterator2.next();
+          if (_i2.done) break;
+          _ref5 = _i2.value;
+        }
+
+        const manifest = _ref5;
+        const licenseText = manifest.licenseText,
+              noticeText = manifest.noticeText;
+
+        let licenseKey;
+        if (!licenseText) {
+          continue;
+        }
+
+        if (!noticeText) {
+          licenseKey = licenseText;
+        } else {
+          licenseKey = `${licenseText}\n\nNOTICE\n\n${noticeText}`;
+        }
+
+        if (!manifestsByLicense.has(licenseKey)) {
+          manifestsByLicense.set(licenseKey, new Map());
+        }
+
+        const byLicense = manifestsByLicense.get(licenseKey);
+        invariant(byLicense, 'expected value');
+        byLicense.set(manifest.name, manifest);
+      }
+
+      console.log('THE FOLLOWING SETS FORTH ATTRIBUTION NOTICES FOR THIRD PARTY SOFTWARE THAT MAY BE CONTAINED ' + `IN PORTIONS OF THE ${String(manifest.name).toUpperCase().replace(/-/g, ' ')} PRODUCT.`);
+      console.log();
+
+      for (var _iterator3 = manifestsByLicense, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
+        var _ref7;
+
+        if (_isArray3) {
+          if (_i3 >= _iterator3.length) break;
+          _ref7 = _iterator3[_i3++];
+        } else {
+          _i3 = _iterator3.next();
+          if (_i3.done) break;
+          _ref7 = _i3.value;
+        }
+
+        const _ref6 = _ref7;
+        const licenseKey = _ref6[0];
+        const manifests = _ref6[1];
+
+        console.log('-----');
+        console.log();
+
+        const names = [];
+        const urls = [];
+        for (var _iterator4 = manifests, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
+          var _ref9;
+
+          if (_isArray4) {
+            if (_i4 >= _iterator4.length) break;
+            _ref9 = _iterator4[_i4++];
+          } else {
+            _i4 = _iterator4.next();
+            if (_i4.done) break;
+            _ref9 = _i4.value;
+          }
+
+          const _ref8 = _ref9;
+          const name = _ref8[0];
+          const repository = _ref8[1].repository;
+
+          names.push(name);
+          if (repository && repository.url) {
+            urls.push(manifests.size === 1 ? repository.url : `${repository.url} (${name})`);
+          }
+        }
+
+        const heading = [];
+        heading.push(`The following software may be included in this product: ${names.join(', ')}.`);
+        if (urls.length > 0) {
+          heading.push(`A copy of the source code may be downloaded from ${urls.join(', ')}.`);
+        }
+        heading.push('This software contains the following license and notice below:');
+
+        console.log(heading.join(' '));
+        console.log();
+
+        if (licenseKey) {
+          console.log(licenseKey.trim());
+        } else {
+          // what do we do here? base it on `license`?
+        }
+
+        console.log();
+      }
+    })();
+  }
+});
+
+const run = _buildSubCommands.run,
+      examples = _buildSubCommands.examples;
+exports.run = run;
+exports.examples = examples;
+
+/***/ }),
+/* 536 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.run = undefined;
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+let run = exports.run = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
+    yield config.registries.yarn.saveHomeConfig({
+      username: undefined,
+      email: undefined
+    });
+
+    reporter.success(reporter.lang('clearedCredentials'));
+  });
+
+  return function run(_x, _x2, _x3, _x4) {
+    return _ref.apply(this, arguments);
+  };
+})();
+
+exports.setFlags = setFlags;
+exports.hasWrapper = hasWrapper;
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function setFlags(commander) {
+  commander.description('Clears registry username and email.');
+}
+
+function hasWrapper(commander, args) {
+  return true;
+}
+
+/***/ }),
+/* 537 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.run = undefined;
+
+var _extends2;
+
+function _load_extends() {
+  return _extends2 = _interopRequireDefault(__webpack_require__(21));
+}
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+let run = exports.run = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
+    const pnpPath = `${config.lockfileFolder}/${(_constants || _load_constants()).PNP_FILENAME}`;
+
+    let nodeOptions = process.env.NODE_OPTIONS || '';
+    if (yield (_fs || _load_fs()).exists(pnpPath)) {
+      nodeOptions = `--require ${pnpPath} ${nodeOptions}`;
+    }
+
+    try {
+      yield (_child || _load_child()).spawn((_constants || _load_constants()).NODE_BIN_PATH, args, {
+        stdio: 'inherit',
+        cwd: flags.into || config.cwd,
+        env: (0, (_extends2 || _load_extends()).default)({}, process.env, { NODE_OPTIONS: nodeOptions })
+      });
+    } catch (err) {
+      throw err;
+    }
+  });
+
+  return function run(_x, _x2, _x3, _x4) {
+    return _ref.apply(this, arguments);
+  };
+})();
+
+exports.setFlags = setFlags;
+exports.hasWrapper = hasWrapper;
+
+var _child;
+
+function _load_child() {
+  return _child = _interopRequireWildcard(__webpack_require__(58));
+}
+
+var _fs;
+
+function _load_fs() {
+  return _fs = _interopRequireWildcard(__webpack_require__(4));
+}
+
+var _constants;
+
+function _load_constants() {
+  return _constants = __webpack_require__(8);
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function setFlags(commander) {
+  commander.description('Runs Node with the same version that the one used by Yarn itself, and by default from the project root');
+  commander.usage('node [--into PATH] [... args]');
+  commander.option('--into <path>', 'Sets the cwd to the specified location');
+}
+
+function hasWrapper(commander, args) {
+  return true;
+}
+
+/***/ }),
+/* 538 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.run = exports.requireLockfile = undefined;
+
+var _extends2;
+
+function _load_extends() {
+  return _extends2 = _interopRequireDefault(__webpack_require__(21));
+}
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+let run = exports.run = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
+    const lockfile = yield (_lockfile || _load_lockfile()).default.fromDirectory(config.lockfileFolder);
+    const install = new (_install || _load_install()).Install((0, (_extends2 || _load_extends()).default)({}, flags, { includeWorkspaceDeps: true }), config, reporter, lockfile);
+    let deps = yield (_packageRequest || _load_packageRequest()).default.getOutdatedPackages(lockfile, install, config, reporter);
+
+    if (args.length) {
+      const requested = new Set(args);
+
+      deps = deps.filter(function ({ name }) {
+        return requested.has(name);
+      });
+    }
+
+    const getNameFromHint = function getNameFromHint(hint) {
+      return hint ? `${hint}Dependencies` : 'dependencies';
+    };
+    const colorizeName = function colorizeName({ current, latest, name }) {
+      return reporter.format[(0, (_colorForVersions || _load_colorForVersions()).default)(current, latest)](name);
+    };
+
+    if (deps.length) {
+      const usesWorkspaces = !!config.workspaceRootFolder;
+      const body = deps.map(function (info) {
+        const row = [colorizeName(info), info.current, (0, (_colorizeDiff || _load_colorizeDiff()).default)(info.current, info.wanted, reporter), reporter.format.cyan(info.latest), info.workspaceName || '', getNameFromHint(info.hint), reporter.format.cyan(info.url)];
+        if (!usesWorkspaces) {
+          row.splice(4, 1);
+        }
+        return row;
+      });
+
+      const red = reporter.format.red('<red>');
+      const yellow = reporter.format.yellow('<yellow>');
+      const green = reporter.format.green('<green>');
+      reporter.info(reporter.lang('legendColorsForVersionUpdates', red, yellow, green));
+
+      const header = ['Package', 'Current', 'Wanted', 'Latest', 'Workspace', 'Package Type', 'URL'];
+      if (!usesWorkspaces) {
+        header.splice(4, 1);
+      }
+      reporter.table(header, body);
+
+      return 1;
+    }
+    return 0;
+  });
+
+  return function run(_x, _x2, _x3, _x4) {
+    return _ref.apply(this, arguments);
+  };
+})();
+
+exports.setFlags = setFlags;
+exports.hasWrapper = hasWrapper;
+
+var _packageRequest;
+
+function _load_packageRequest() {
+  return _packageRequest = _interopRequireDefault(__webpack_require__(122));
+}
+
+var _lockfile;
+
+function _load_lockfile() {
+  return _lockfile = _interopRequireDefault(__webpack_require__(19));
+}
+
+var _install;
+
+function _load_install() {
+  return _install = __webpack_require__(34);
+}
+
+var _colorForVersions;
+
+function _load_colorForVersions() {
+  return _colorForVersions = _interopRequireDefault(__webpack_require__(369));
+}
+
+var _colorizeDiff;
+
+function _load_colorizeDiff() {
+  return _colorizeDiff = _interopRequireDefault(__webpack_require__(370));
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const requireLockfile = exports.requireLockfile = true;
+
+function setFlags(commander) {
+  commander.description('Checks for outdated package dependencies.');
+  commander.usage('outdated [packages ...]');
+}
+
+function hasWrapper(commander, args) {
+  return true;
+}
+
+/***/ }),
+/* 539 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.examples = exports.hasWrapper = exports.run = exports.mutate = undefined;
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+let mutate = exports.mutate = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (args, config, reporter, buildMessages, mutator) {
+    if (args.length !== 2 && args.length !== 1) {
+      return false;
+    }
+
+    const username = args.shift();
+    const name = yield (0, (_tag || _load_tag()).getName)(args, config);
+    if (!(0, (_validate || _load_validate()).isValidPackageName)(name)) {
+      throw new (_errors || _load_errors()).MessageError(reporter.lang('invalidPackageName'));
+    }
+
+    const msgs = buildMessages(username, name);
+    reporter.step(1, 3, reporter.lang('loggingIn'));
+    const revoke = yield (0, (_login || _load_login()).getToken)(config, reporter, name);
+
+    reporter.step(2, 3, msgs.info);
+    const user = yield config.registries.npm.request(`-/user/org.couchdb.user:${username}`);
+    let error = false;
+    if (user) {
+      // get package
+      const pkg = yield config.registries.npm.request((_npmRegistry || _load_npmRegistry()).default.escapeName(name));
+      if (pkg) {
+        pkg.maintainers = pkg.maintainers || [];
+        error = mutator({ name: user.name, email: user.email }, pkg);
+      } else {
+        error = true;
+        reporter.error(reporter.lang('unknownPackage', name));
+      }
+
+      // update package
+      if (pkg && !error) {
+        const res = yield config.registries.npm.request(`${(_npmRegistry || _load_npmRegistry()).default.escapeName(name)}/-rev/${pkg._rev}`, {
+          method: 'PUT',
+          body: {
+            _id: pkg._id,
+            _rev: pkg._rev,
+            maintainers: pkg.maintainers
+          }
+        });
+
+        if (res != null && res.success) {
+          reporter.success(msgs.success);
+        } else {
+          error = true;
+          reporter.error(msgs.error);
+        }
+      }
+    } else {
+      error = true;
+      reporter.error(reporter.lang('unknownUser', username));
+    }
+
+    reporter.step(3, 3, reporter.lang('revokingToken'));
+    yield revoke();
+
+    if (error) {
+      throw new Error();
+    } else {
+      return true;
+    }
+  });
+
+  return function mutate(_x, _x2, _x3, _x4, _x5) {
+    return _ref.apply(this, arguments);
+  };
+})();
+
+let list = (() => {
+  var _ref2 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
+    if (args.length > 1) {
+      return false;
+    }
+    const name = yield (0, (_tag || _load_tag()).getName)(args, config);
+    reporter.step(1, 1, reporter.lang('ownerGetting', name));
+    const pkg = yield config.registries.npm.request(name, { unfiltered: true });
+    if (pkg) {
+      const owners = pkg.maintainers;
+      if (!owners || !owners.length) {
+        reporter.warn(reporter.lang('ownerNone'));
+      } else {
+        for (var _iterator = owners, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+          var _ref3;
+
+          if (_isArray) {
+            if (_i >= _iterator.length) break;
+            _ref3 = _iterator[_i++];
+          } else {
+            _i = _iterator.next();
+            if (_i.done) break;
+            _ref3 = _i.value;
+          }
+
+          const owner = _ref3;
+
+          reporter.info(`${owner.name} <${owner.email}>`);
+        }
+      }
+    } else {
+      reporter.error(reporter.lang('ownerGettingFailed'));
+    }
+
+    if (pkg) {
+      return true;
+    } else {
+      throw new Error();
+    }
+  });
+
+  return function list(_x6, _x7, _x8, _x9) {
+    return _ref2.apply(this, arguments);
+  };
+})();
+
+exports.setFlags = setFlags;
+
+var _errors;
+
+function _load_errors() {
+  return _errors = __webpack_require__(6);
+}
+
+var _buildSubCommands2;
+
+function _load_buildSubCommands() {
+  return _buildSubCommands2 = _interopRequireDefault(__webpack_require__(59));
+}
+
+var _validate;
+
+function _load_validate() {
+  return _validate = __webpack_require__(125);
+}
+
+var _tag;
+
+function _load_tag() {
+  return _tag = __webpack_require__(361);
+}
+
+var _login;
+
+function _load_login() {
+  return _login = __webpack_require__(107);
+}
+
+var _npmRegistry;
+
+function _load_npmRegistry() {
+  return _npmRegistry = _interopRequireDefault(__webpack_require__(88));
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function remove(config, reporter, flags, args) {
+  return mutate(args, config, reporter, (username, name) => ({
+    info: reporter.lang('ownerRemoving', username, name),
+    success: reporter.lang('ownerRemoved'),
+    error: reporter.lang('ownerRemoveError')
+  }), (user, pkg) => {
+    let found = false;
+
+    pkg.maintainers = pkg.maintainers.filter(o => {
+      const match = o.name === user.name;
+      found = found || match;
+      return !match;
+    });
+
+    if (!found) {
+      reporter.error(reporter.lang('userNotAnOwner', user.name));
+    }
+
+    return found;
+  });
+}
+
+function setFlags(commander) {
+  commander.description('Manages package owners.');
+}
+
+var _buildSubCommands = (0, (_buildSubCommands2 || _load_buildSubCommands()).default)('owner', {
+  add(config, reporter, flags, args) {
+    return mutate(args, config, reporter, (username, name) => ({
+      info: reporter.lang('ownerAdding', username, name),
+      success: reporter.lang('ownerAdded'),
+      error: reporter.lang('ownerAddingFailed')
+    }), (user, pkg) => {
+      for (var _iterator2 = pkg.maintainers, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+        var _ref4;
+
+        if (_isArray2) {
+          if (_i2 >= _iterator2.length) break;
+          _ref4 = _iterator2[_i2++];
+        } else {
+          _i2 = _iterator2.next();
+          if (_i2.done) break;
+          _ref4 = _i2.value;
+        }
+
+        const owner = _ref4;
+
+        if (owner.name === user) {
+          reporter.error(reporter.lang('ownerAlready'));
+          return true;
+        }
+      }
+
+      pkg.maintainers.push(user);
+
+      return false;
+    });
+  },
+
+  rm(config, reporter, flags, args) {
+    reporter.warn(`\`yarn owner rm\` is deprecated. Please use \`yarn owner remove\`.`);
+    return remove(config, reporter, flags, args);
+  },
+
+  remove(config, reporter, flags, args) {
+    return remove(config, reporter, flags, args);
+  },
+
+  ls(config, reporter, flags, args) {
+    reporter.warn(`\`yarn owner ls\` is deprecated. Please use \`yarn owner list\`.`);
+    return list(config, reporter, flags, args);
+  },
+
+  list(config, reporter, flags, args) {
+    return list(config, reporter, flags, args);
+  }
+}, ['add <user> [[<@scope>/]<pkg>]', 'remove <user> [[<@scope>/]<pkg>]', 'list [<@scope>/]<pkg>']);
+
+const run = _buildSubCommands.run,
+      hasWrapper = _buildSubCommands.hasWrapper,
+      examples = _buildSubCommands.examples;
+exports.run = run;
+exports.hasWrapper = hasWrapper;
+exports.examples = examples;
+
+/***/ }),
+/* 540 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.examples = exports.setFlags = exports.run = undefined;
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+let fetchReleases = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, { includePrereleases = false } = {}) {
+    const token = process.env.GITHUB_TOKEN;
+    const tokenUrlParameter = token ? `?access_token=${token}` : '';
+    const request = yield config.requestManager.request({
+      url: `https://api.github.com/repos/yarnpkg/yarn/releases${tokenUrlParameter}`,
+      json: true
+    });
+
+    const releases = request.filter(function (release) {
+      if (release.draft) {
+        return false;
+      }
+
+      if (release.prerelease && !includePrereleases) {
+        return false;
+      }
+
+      // $FlowFixMe
+      release.version = semver.coerce(release.tag_name);
+
+      if (!release.version) {
+        return false;
+      }
+
+      if (!getBundleAsset(release)) {
+        return false;
+      }
+
+      return true;
+    });
+
+    releases.sort(function (a, b) {
+      // $FlowFixMe
+      return -semver.compare(a.version, b.version);
+    });
+
+    return releases;
+  });
+
+  return function fetchReleases(_x) {
+    return _ref.apply(this, arguments);
+  };
+})();
+
+exports.hasWrapper = hasWrapper;
+
+var _buildSubCommands2;
+
+function _load_buildSubCommands() {
+  return _buildSubCommands2 = _interopRequireDefault(__webpack_require__(59));
+}
+
+var _rc;
+
+function _load_rc() {
+  return _rc = __webpack_require__(335);
+}
+
+var _fs;
+
+function _load_fs() {
+  return _fs = _interopRequireWildcard(__webpack_require__(4));
+}
+
+var _lockfile;
+
+function _load_lockfile() {
+  return _lockfile = __webpack_require__(19);
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const chalk = __webpack_require__(30);
+const invariant = __webpack_require__(9);
+const path = __webpack_require__(0);
+const semver = __webpack_require__(22);
+
+function getBundleAsset(release) {
+  return release.assets.find(asset => {
+    return asset.name.match(/^yarn-[0-9]+\.[0-9]+\.[0-9]+\.js$/);
+  });
+}
+
+function fetchBundle(config, url) {
+  return config.requestManager.request({
+    url,
+    buffer: true
+  });
+}
+
+function hasWrapper(flags, args) {
+  return false;
+}
+
+var _buildSubCommands = (0, (_buildSubCommands2 || _load_buildSubCommands()).default)('policies', {
+  setVersion(config, reporter, flags, args) {
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      let range = args[0] || 'latest';
+      let allowRc = flags.rc;
+
+      reporter.log(`Resolving ${chalk.yellow(range)} to a url...`);
+
+      if (range === 'rc') {
+        range = 'latest';
+        allowRc = true;
+      }
+
+      if (range === 'latest') {
+        range = '*';
+      }
+
+      let bundleUrl;
+      let bundleVersion;
+
+      if (range === 'nightly' || range === 'nightlies') {
+        bundleUrl = 'https://nightly.yarnpkg.com/latest.js';
+        bundleVersion = 'nightly';
+      } else if (range === 'berry' || range === 'v2' || range === '2') {
+        bundleUrl = 'https://github.com/yarnpkg/berry/raw/master/packages/berry-cli/bin/berry.js';
+        bundleVersion = 'berry';
+      } else {
+        const releases = yield fetchReleases(config, {
+          includePrereleases: allowRc
+        });
+
+        const release = releases.find(function (release) {
+          // $FlowFixMe
+          return semver.satisfies(release.version, range);
+        });
+
+        if (!release) {
+          throw new Error(`Release not found: ${range}`);
+        }
+
+        const asset = getBundleAsset(release);
+        invariant(asset, 'The bundle asset should exist');
+
+        bundleUrl = asset.browser_download_url;
+        bundleVersion = release.version.version;
+      }
+
+      reporter.log(`Downloading ${chalk.green(bundleUrl)}...`);
+
+      const bundle = yield fetchBundle(config, bundleUrl);
+      const rc = (0, (_rc || _load_rc()).getRcConfigForCwd)(config.lockfileFolder, []);
+
+      const yarnPath = path.resolve(config.lockfileFolder, `.yarn/releases/yarn-${bundleVersion}.js`);
+      reporter.log(`Saving it into ${chalk.magenta(yarnPath)}...`);
+      yield (_fs || _load_fs()).mkdirp(path.dirname(yarnPath));
+      yield (_fs || _load_fs()).writeFile(yarnPath, bundle);
+      yield (_fs || _load_fs()).chmod(yarnPath, 0o755);
+
+      const rcPath = `${config.lockfileFolder}/.yarnrc`;
+      reporter.log(`Updating ${chalk.magenta(rcPath)}...`);
+      rc['yarn-path'] = path.relative(config.lockfileFolder, yarnPath);
+      yield (_fs || _load_fs()).writeFilePreservingEol(rcPath, `${(0, (_lockfile || _load_lockfile()).stringify)(rc)}\n`);
+
+      reporter.log(`Done!`);
+    })();
+  }
+});
+
+const run = _buildSubCommands.run,
+      setFlags = _buildSubCommands.setFlags,
+      examples = _buildSubCommands.examples;
+exports.run = run;
+exports.setFlags = setFlags;
+exports.examples = examples;
+
+/***/ }),
+/* 541 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.run = undefined;
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+let publish = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, pkg, flags, dir) {
+    let access = flags.access;
+
+    // if no access level is provided, check package.json for `publishConfig.access`
+    // see: https://docs.npmjs.com/files/package.json#publishconfig
+    if (!access && pkg && pkg.publishConfig && pkg.publishConfig.access) {
+      access = pkg.publishConfig.access;
+    }
+
+    // validate access argument
+    if (access && access !== 'public' && access !== 'restricted') {
+      throw new (_errors || _load_errors()).MessageError(config.reporter.lang('invalidAccess'));
+    }
+
+    // TODO this might modify package.json, do we need to reload it?
+    yield config.executeLifecycleScript('prepublish');
+    yield config.executeLifecycleScript('prepare');
+    yield config.executeLifecycleScript('prepublishOnly');
+    yield config.executeLifecycleScript('prepack');
+
+    // get tarball stream
+    const stat = yield (_fs || _load_fs()).lstat(dir);
+    let stream;
+    if (stat.isDirectory()) {
+      stream = yield (0, (_pack || _load_pack()).pack)(config);
+    } else if (stat.isFile()) {
+      stream = fs2.createReadStream(dir);
+    } else {
+      throw new Error("Don't know how to handle this file type");
+    }
+    const buffer = yield new Promise(function (resolve, reject) {
+      const data = [];
+      invariant(stream, 'expected stream');
+      stream.on('data', data.push.bind(data)).on('end', function () {
+        return resolve(Buffer.concat(data));
+      }).on('error', reject);
+    });
+
+    yield config.executeLifecycleScript('postpack');
+
+    // copy normalized package and remove internal keys as they may be sensitive or yarn specific
+    pkg = Object.assign({}, pkg);
+    for (const key in pkg) {
+      if (key[0] === '_') {
+        delete pkg[key];
+      }
+    }
+
+    const tag = flags.tag || 'latest';
+    const tbName = `${pkg.name}-${pkg.version}.tgz`;
+    const tbURI = `${pkg.name}/-/${tbName}`;
+
+    // create body
+    const root = {
+      _id: pkg.name,
+      access,
+      name: pkg.name,
+      description: pkg.description,
+      'dist-tags': {
+        [tag]: pkg.version
+      },
+      versions: {
+        [pkg.version]: pkg
+      },
+      readme: pkg.readme || '',
+      _attachments: {
+        [tbName]: {
+          content_type: 'application/octet-stream',
+          data: buffer.toString('base64'),
+          length: buffer.length
+        }
+      }
+    };
+
+    pkg._id = `${pkg.name}@${pkg.version}`;
+    pkg.dist = pkg.dist || {};
+    pkg.dist.shasum = crypto.createHash('sha1').update(buffer).digest('hex');
+    pkg.dist.integrity = ssri.fromData(buffer).toString();
+
+    const registry = String(config.getOption('registry'));
+    pkg.dist.tarball = url.resolve(registry, tbURI).replace(/^https:\/\//, 'http://');
+
+    // publish package
+    try {
+      yield config.registries.npm.request((_npmRegistry || _load_npmRegistry()).default.escapeName(pkg.name), {
+        registry: pkg && pkg.publishConfig && pkg.publishConfig.registry,
+        method: 'PUT',
+        body: root
+      });
+    } catch (error) {
+      throw new (_errors || _load_errors()).MessageError(config.reporter.lang('publishFail', error.message));
+    }
+
+    yield config.executeLifecycleScript('publish');
+    yield config.executeLifecycleScript('postpublish');
+  });
+
+  return function publish(_x, _x2, _x3, _x4) {
+    return _ref.apply(this, arguments);
+  };
+})();
+
+let run = exports.run = (() => {
+  var _ref2 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
+    // validate arguments
+    const dir = args[0] ? (_path || _load_path()).default.resolve(config.cwd, args[0]) : config.cwd;
+    if (args.length > 1) {
+      throw new (_errors || _load_errors()).MessageError(reporter.lang('tooManyArguments', 1));
+    }
+    if (!(yield (_fs || _load_fs()).exists(dir))) {
+      throw new (_errors || _load_errors()).MessageError(reporter.lang('unknownFolderOrTarball'));
+    }
+
+    const stat = yield (_fs || _load_fs()).lstat(dir);
+    let publishPath = dir;
+    if (stat.isDirectory()) {
+      config.cwd = (_path || _load_path()).default.resolve(dir);
+      publishPath = config.cwd;
+    }
+
+    // validate package fields that are required for publishing
+    // $FlowFixMe
+    const pkg = yield config.readRootManifest();
+    if (pkg.private) {
+      throw new (_errors || _load_errors()).MessageError(reporter.lang('publishPrivate'));
+    }
+    if (!pkg.name) {
+      throw new (_errors || _load_errors()).MessageError(reporter.lang('noName'));
+    }
+
+    let registry = '';
+
+    if (pkg && pkg.publishConfig && pkg.publishConfig.registry) {
+      registry = pkg.publishConfig.registry;
+    }
+
+    reporter.step(1, 4, reporter.lang('bumpingVersion'));
+    const commitVersion = yield (0, (_version || _load_version()).setVersion)(config, reporter, flags, [], false);
+
+    //
+    reporter.step(2, 4, reporter.lang('loggingIn'));
+    const revoke = yield (0, (_login || _load_login()).getToken)(config, reporter, pkg.name, flags, registry);
+
+    //
+    reporter.step(3, 4, reporter.lang('publishing'));
+    yield publish(config, pkg, flags, publishPath);
+    yield commitVersion();
+    reporter.success(reporter.lang('published'));
+
+    //
+    reporter.step(4, 4, reporter.lang('revokingToken'));
+    yield revoke();
+  });
+
+  return function run(_x5, _x6, _x7, _x8) {
+    return _ref2.apply(this, arguments);
+  };
+})();
+
+exports.setFlags = setFlags;
+exports.hasWrapper = hasWrapper;
+
+var _npmRegistry;
+
+function _load_npmRegistry() {
+  return _npmRegistry = _interopRequireDefault(__webpack_require__(88));
+}
+
+var _errors;
+
+function _load_errors() {
+  return _errors = __webpack_require__(6);
+}
+
+var _version;
+
+function _load_version() {
+  return _version = __webpack_require__(363);
+}
+
+var _fs;
+
+function _load_fs() {
+  return _fs = _interopRequireWildcard(__webpack_require__(4));
+}
+
+var _pack;
+
+function _load_pack() {
+  return _pack = __webpack_require__(166);
+}
+
+var _login;
+
+function _load_login() {
+  return _login = __webpack_require__(107);
+}
+
+var _path;
+
+function _load_path() {
+  return _path = _interopRequireDefault(__webpack_require__(0));
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const invariant = __webpack_require__(9);
+
+const crypto = __webpack_require__(11);
+const url = __webpack_require__(24);
+const fs2 = __webpack_require__(5);
+const ssri = __webpack_require__(65);
+
+function setFlags(commander) {
+  (0, (_version || _load_version()).setFlags)(commander);
+  commander.description('Publishes a package to the npm registry.');
+  commander.usage('publish [<tarball>|<folder>] [--tag <tag>] [--access <public|restricted>]');
+  commander.option('--access [access]', 'access');
+  commander.option('--tag [tag]', 'tag');
+}
+
+function hasWrapper(commander, args) {
+  return true;
+}
+
+/***/ }),
+/* 542 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.examples = exports.hasWrapper = exports.run = undefined;
+
+var _extends2;
+
+function _load_extends() {
+  return _extends2 = _interopRequireDefault(__webpack_require__(21));
+}
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+let removeTeamUser = (() => {
+  var _ref2 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (parts, config, reporter) {
+    reporter.step(2, 3, reporter.lang('teamRemovingUser'));
+    reporter.inspect((yield config.registries.npm.request(`team/${parts.scope}/${parts.team}/user`, {
+      method: 'DELETE',
+      body: {
+        user: parts.user
+      }
+    })));
+    return true;
+  });
+
+  return function removeTeamUser(_x5, _x6, _x7) {
+    return _ref2.apply(this, arguments);
+  };
+})();
+
+let list = (() => {
+  var _ref3 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (parts, config, reporter) {
+    reporter.step(2, 3, reporter.lang('teamListing'));
+    const uriParams = '?format=cli';
+    if (parts.team) {
+      reporter.inspect((yield config.registries.npm.request(`team/${parts.scope}/${parts.team}/user${uriParams}`)));
+    } else {
+      reporter.inspect((yield config.registries.npm.request(`org/${parts.scope}/team${uriParams}`)));
+    }
+    return true;
+  });
+
+  return function list(_x8, _x9, _x10) {
+    return _ref3.apply(this, arguments);
+  };
+})();
+
+exports.setFlags = setFlags;
+
+var _buildSubCommands2;
+
+function _load_buildSubCommands() {
+  return _buildSubCommands2 = _interopRequireDefault(__webpack_require__(59));
+}
+
+var _login;
+
+function _load_login() {
+  return _login = __webpack_require__(107);
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function explodeScopeTeam(arg, requireTeam, reporter) {
+  var _arg$split = arg.split(':');
+
+  const scope = _arg$split[0],
+        team = _arg$split[1],
+        parts = _arg$split.slice(2);
+
+  if (parts.length) {
+    return false;
+  }
+
+  if (requireTeam && !team) {
+    return false;
+  }
+
+  return {
+    scope: scope || '',
+    team: team || '',
+    user: ''
+  };
+}
+
+function warnDeprecation(reporter, deprecationWarning) {
+  const command = 'yarn team';
+  reporter.warn(reporter.lang('deprecatedCommand', `${command} ${deprecationWarning.deprecatedCommand}`, `${command} ${deprecationWarning.currentCommand}`));
+}
+
+function wrapRequired(callback, requireTeam, deprecationInfo) {
+  return (() => {
+    var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
+      if (deprecationInfo) {
+        warnDeprecation(reporter, deprecationInfo);
+      }
+
+      if (!args.length) {
+        return false;
+      }
+
+      const parts = explodeScopeTeam(args[0], requireTeam, reporter);
+      if (!parts) {
+        return false;
+      }
+
+      reporter.step(1, 3, reporter.lang('loggingIn'));
+      const revoke = yield (0, (_login || _load_login()).getToken)(config, reporter);
+
+      const res = yield callback(parts, config, reporter, flags, args);
+      if (!res) {
+        return res;
+      }
+
+      reporter.step(3, 3, reporter.lang('revokingToken'));
+      yield revoke();
+      return true;
+    });
+
+    return function (_x, _x2, _x3, _x4) {
+      return _ref.apply(this, arguments);
+    };
+  })();
+}
+
+function wrapRequiredTeam(callback, requireTeam = true, subCommandDeprecated) {
+  return wrapRequired(function (parts, config, reporter, flags, args) {
+    if (args.length === 1) {
+      return callback(parts, config, reporter, flags, args);
+    } else {
+      return false;
+    }
+  }, requireTeam, subCommandDeprecated);
+}
+
+function wrapRequiredUser(callback, subCommandDeprecated) {
+  return wrapRequired(function (parts, config, reporter, flags, args) {
+    if (args.length === 2) {
+      return callback((0, (_extends2 || _load_extends()).default)({
+        user: args[1]
+      }, parts), config, reporter, flags, args);
+    } else {
+      return false;
+    }
+  }, true, subCommandDeprecated);
+}
+
+function setFlags(commander) {
+  commander.description('Maintain team memberships');
+}
+
+var _buildSubCommands = (0, (_buildSubCommands2 || _load_buildSubCommands()).default)('team', {
+  create: wrapRequiredTeam((() => {
+    var _ref4 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (parts, config, reporter, flags, args) {
+      reporter.step(2, 3, reporter.lang('teamCreating'));
+      reporter.inspect((yield config.registries.npm.request(`team/${parts.scope}`, {
+        method: 'PUT',
+        body: {
+          team: parts.team
+        }
+      })));
+      return true;
+    });
+
+    return function (_x11, _x12, _x13, _x14, _x15) {
+      return _ref4.apply(this, arguments);
+    };
+  })()),
+
+  destroy: wrapRequiredTeam((() => {
+    var _ref5 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (parts, config, reporter, flags, args) {
+      reporter.step(2, 3, reporter.lang('teamRemoving'));
+      reporter.inspect((yield config.registries.npm.request(`team/${parts.scope}/${parts.team}`, {
+        method: 'DELETE'
+      })));
+      return true;
+    });
+
+    return function (_x16, _x17, _x18, _x19, _x20) {
+      return _ref5.apply(this, arguments);
+    };
+  })()),
+
+  add: wrapRequiredUser((() => {
+    var _ref6 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (parts, config, reporter, flags, args) {
+      reporter.step(2, 3, reporter.lang('teamAddingUser'));
+      reporter.inspect((yield config.registries.npm.request(`team/${parts.scope}/${parts.team}/user`, {
+        method: 'PUT',
+        body: {
+          user: parts.user
+        }
+      })));
+      return true;
+    });
+
+    return function (_x21, _x22, _x23, _x24, _x25) {
+      return _ref6.apply(this, arguments);
+    };
+  })()),
+
+  rm: wrapRequiredUser(function (parts, config, reporter, flags, args) {
+    removeTeamUser(parts, config, reporter);
+  }, {
+    deprecatedCommand: 'rm',
+    currentCommand: 'remove'
+  }),
+
+  remove: wrapRequiredUser(function (parts, config, reporter, flags, args) {
+    removeTeamUser(parts, config, reporter);
+  }),
+
+  ls: wrapRequiredTeam(function (parts, config, reporter, flags, args) {
+    list(parts, config, reporter);
+  }, false, {
+    deprecatedCommand: 'ls',
+    currentCommand: 'list'
+  }),
+
+  list: wrapRequiredTeam(function (parts, config, reporter, flags, args) {
+    list(parts, config, reporter);
+  }, false)
+}, ['create <scope:team>', 'destroy <scope:team>', 'add <scope:team> <user>', 'remove <scope:team> <user>', 'list <scope>|<scope:team>']);
+
+const run = _buildSubCommands.run,
+      hasWrapper = _buildSubCommands.hasWrapper,
+      examples = _buildSubCommands.examples;
+exports.run = run;
+exports.hasWrapper = hasWrapper;
+exports.examples = examples;
+
+/***/ }),
+/* 543 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.run = undefined;
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+let run = exports.run = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
+    if (args.length) {
+      for (var _iterator = args, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+        var _ref2;
+
+        if (_isArray) {
+          if (_i >= _iterator.length) break;
+          _ref2 = _iterator[_i++];
+        } else {
+          _i = _iterator.next();
+          if (_i.done) break;
+          _ref2 = _i.value;
+        }
+
+        const name = _ref2;
+
+        const linkLoc = path.join(config.linkFolder, name);
+        if (yield (_fs || _load_fs()).exists(linkLoc)) {
+          yield (_fs || _load_fs()).unlink(path.join((yield (0, (_link || _load_link()).getRegistryFolder)(config, name)), name));
+          reporter.success(reporter.lang('linkDisusing', name));
+          reporter.info(reporter.lang('linkDisusingMessage', name));
+        } else {
+          throw new (_errors || _load_errors()).MessageError(reporter.lang('linkMissing', name));
+        }
+      }
+    } else {
+      // remove from registry
+      const manifest = yield config.readRootManifest();
+      const name = manifest.name;
+      if (!name) {
+        throw new (_errors || _load_errors()).MessageError(reporter.lang('unknownPackageName'));
+      }
+
+      const linkLoc = path.join(config.linkFolder, name);
+      if (yield (_fs || _load_fs()).exists(linkLoc)) {
+        // If there is a `bin` defined in the package.json,
+        // link each bin to the global bin
+        if (manifest.bin) {
+          const globalBinFolder = yield (0, (_global || _load_global()).getBinFolder)(config, flags);
+          for (const binName in manifest.bin) {
+            const binDestLoc = path.join(globalBinFolder, binName);
+            if (yield (_fs || _load_fs()).exists(binDestLoc)) {
+              yield (_fs || _load_fs()).unlink(binDestLoc);
+              if (process.platform === 'win32') {
+                yield (_fs || _load_fs()).unlink(binDestLoc + '.cmd');
+              }
+            }
+          }
+        }
+
+        yield (_fs || _load_fs()).unlink(linkLoc);
+
+        reporter.success(reporter.lang('linkUnregistered', name));
+        reporter.info(reporter.lang('linkUnregisteredMessage', name));
+      } else {
+        throw new (_errors || _load_errors()).MessageError(reporter.lang('linkMissing', name));
+      }
+    }
+  });
+
+  return function run(_x, _x2, _x3, _x4) {
+    return _ref.apply(this, arguments);
+  };
+})();
+
+exports.setFlags = setFlags;
+exports.hasWrapper = hasWrapper;
+
+var _errors;
+
+function _load_errors() {
+  return _errors = __webpack_require__(6);
+}
+
+var _fs;
+
+function _load_fs() {
+  return _fs = _interopRequireWildcard(__webpack_require__(4));
+}
+
+var _link;
+
+function _load_link() {
+  return _link = __webpack_require__(357);
+}
+
+var _global;
+
+function _load_global() {
+  return _global = __webpack_require__(121);
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const path = __webpack_require__(0);
+
+function setFlags(commander) {
+  commander.description('Unlink a previously created symlink for a package.');
+}
+
+function hasWrapper(commander, args) {
+  return true;
+}
+
+/***/ }),
+/* 544 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.clearAll = exports.clearSome = exports.run = undefined;
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+let run = exports.run = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
+    if (!config.plugnplayEnabled) {
+      throw new (_errors || _load_errors()).MessageError(reporter.lang('unplugDisabled'));
+    }
+    if (!args.length && flags.clear) {
+      throw new (_errors || _load_errors()).MessageError(reporter.lang('tooFewArguments', 1));
+    }
+    if (args.length && flags.clearAll) {
+      throw new (_errors || _load_errors()).MessageError(reporter.lang('noArguments'));
+    }
+
+    if (flags.clearAll) {
+      yield clearAll(config);
+    } else if (flags.clear) {
+      yield clearSome(config, new Set(args));
+    } else if (args.length > 0) {
+      const lockfile = yield (_lockfile || _load_lockfile()).default.fromDirectory(config.lockfileFolder, reporter);
+      yield (0, (_install || _load_install()).wrapLifecycle)(config, flags, (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+        const install = new (_install || _load_install()).Install(flags, config, reporter, lockfile);
+        install.linker.unplugged = args;
+        yield install.init();
+      }));
+    }
+
+    const unpluggedPackageFolders = yield config.listUnpluggedPackageFolders();
+
+    for (var _iterator = unpluggedPackageFolders.values(), _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+      var _ref3;
+
+      if (_isArray) {
+        if (_i >= _iterator.length) break;
+        _ref3 = _iterator[_i++];
+      } else {
+        _i = _iterator.next();
+        if (_i.done) break;
+        _ref3 = _i.value;
+      }
+
+      const target = _ref3;
+
+      reporter.log(target, { force: true });
+    }
+  });
+
+  return function run(_x, _x2, _x3, _x4) {
+    return _ref.apply(this, arguments);
+  };
+})();
+
+let clearSome = exports.clearSome = (() => {
+  var _ref4 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, filters) {
+    const unpluggedPackageFolders = yield config.listUnpluggedPackageFolders();
+    const removeList = [];
+
+    for (var _iterator2 = unpluggedPackageFolders.entries(), _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+      var _ref6;
+
+      if (_isArray2) {
+        if (_i2 >= _iterator2.length) break;
+        _ref6 = _iterator2[_i2++];
+      } else {
+        _i2 = _iterator2.next();
+        if (_i2.done) break;
+        _ref6 = _i2.value;
+      }
+
+      const _ref5 = _ref6;
+      const unpluggedName = _ref5[0];
+      const target = _ref5[1];
+
+      var _ref8 = yield (_fs || _load_fs()).readJson(path.join(target, 'package.json'));
+
+      const name = _ref8.name;
+
+      const toBeRemoved = filters.has(name);
+
+      if (toBeRemoved) {
+        removeList.push(path.join(config.getUnpluggedPath(), unpluggedName));
+      }
+    }
+
+    if (removeList.length === unpluggedPackageFolders.size) {
+      yield (_fs || _load_fs()).unlink(config.getUnpluggedPath());
+    } else {
+      for (var _iterator3 = removeList, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
+        var _ref7;
+
+        if (_isArray3) {
+          if (_i3 >= _iterator3.length) break;
+          _ref7 = _iterator3[_i3++];
+        } else {
+          _i3 = _iterator3.next();
+          if (_i3.done) break;
+          _ref7 = _i3.value;
+        }
+
+        const unpluggedPackagePath = _ref7;
+
+        yield (_fs || _load_fs()).unlink(unpluggedPackagePath);
+      }
+    }
+  });
+
+  return function clearSome(_x5, _x6) {
+    return _ref4.apply(this, arguments);
+  };
+})();
+
+let clearAll = exports.clearAll = (() => {
+  var _ref9 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config) {
+    yield (_fs || _load_fs()).unlink(config.getUnpluggedPath());
+  });
+
+  return function clearAll(_x7) {
+    return _ref9.apply(this, arguments);
+  };
+})();
+
+exports.hasWrapper = hasWrapper;
+exports.setFlags = setFlags;
+
+var _lockfile;
+
+function _load_lockfile() {
+  return _lockfile = _interopRequireDefault(__webpack_require__(19));
+}
+
+var _install;
+
+function _load_install() {
+  return _install = __webpack_require__(34);
+}
+
+var _errors;
+
+function _load_errors() {
+  return _errors = __webpack_require__(6);
+}
+
+var _fs;
+
+function _load_fs() {
+  return _fs = _interopRequireWildcard(__webpack_require__(4));
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const path = __webpack_require__(0);
+
+function hasWrapper(commander) {
+  return true;
+}
+
+function setFlags(commander) {
+  commander.description('Temporarily copies a package (with an optional @range suffix) outside of the global cache for debugging purposes');
+  commander.usage('unplug [packages ...] [flags]');
+  commander.option('--clear', 'Delete the selected packages');
+  commander.option('--clear-all', 'Delete all unplugged packages');
+}
+
+/***/ }),
+/* 545 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.run = undefined;
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+let run = exports.run = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
+    const versions = { yarn: (_yarnVersion || _load_yarnVersion()).version };
+
+    const pkg = yield config.maybeReadManifest(config.cwd);
+    if (pkg && pkg.name && pkg.version) {
+      versions[pkg.name] = pkg.version;
+    }
+
+    Object.assign(versions, process.versions);
+
+    reporter.inspect(versions);
+  });
+
+  return function run(_x, _x2, _x3, _x4) {
+    return _ref.apply(this, arguments);
+  };
+})();
+
+exports.setFlags = setFlags;
+exports.hasWrapper = hasWrapper;
+
+var _yarnVersion;
+
+function _load_yarnVersion() {
+  return _yarnVersion = __webpack_require__(120);
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function setFlags(commander) {
+  commander.description('Displays version information of currently installed Yarn, Node.js, and its dependencies.');
+}
+
+function hasWrapper(commander, args) {
+  return true;
+}
+
+/***/ }),
+/* 546 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.run = exports.requireLockfile = undefined;
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+let cleanQuery = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, query) {
+    // if a location was passed then turn it into a hash query
+    if (path.isAbsolute(query) && (yield (_fs || _load_fs()).exists(query))) {
+      // absolute path
+      query = path.relative(config.cwd, query);
+    }
+
+    // remove references to node_modules with hashes
+    query = query.replace(/([\\/]|^)node_modules[\\/]/g, '#');
+
+    // remove trailing hashes
+    query = query.replace(/^#+/g, '');
+
+    // remove trailing paths from each part of the query, skip second part of path for scoped packages
+    let queryParts = query.split('#');
+    queryParts = queryParts.map(function (part) {
+      let parts = part.split(/[\\/]/g);
+
+      if (part[0] === '@') {
+        parts = parts.slice(0, 2);
+      } else {
+        parts = parts.slice(0, 1);
+      }
+
+      return parts.join('/');
+    });
+    query = queryParts.join('#');
+
+    return query;
+  });
+
+  return function cleanQuery(_x, _x2) {
+    return _ref.apply(this, arguments);
+  };
+})();
+
+let getPackageSize = (() => {
+  var _ref2 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (tuple) {
+    const loc = tuple[0];
+
+
+    const files = yield (_fs || _load_fs()).walk(loc, null, new Set([(_constants || _load_constants()).METADATA_FILENAME, (_constants || _load_constants()).TARBALL_FILENAME]));
+
+    const sizes = yield Promise.all(files.map(function (walkFile) {
+      return (_fs || _load_fs()).getFileSizeOnDisk(walkFile.absolute);
+    }));
+
+    return sum(sizes);
+  });
+
+  return function getPackageSize(_x3) {
+    return _ref2.apply(this, arguments);
+  };
+})();
+
+let run = exports.run = (() => {
+  var _ref6 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
+    if (!args.length) {
+      throw new (_errors || _load_errors()).MessageError(reporter.lang('missingWhyDependency'));
+    }
+    if (args.length > 1) {
+      throw new (_errors || _load_errors()).MessageError(reporter.lang('tooManyArguments', 1));
+    }
+
+    const query = yield cleanQuery(config, args[0]);
+
+    reporter.step(1, 4, reporter.lang('whyStart', args[0]), emoji.get('thinking_face'));
+
+    // init
+    reporter.step(2, 4, reporter.lang('whyInitGraph'), emoji.get('truck'));
+    const lockfile = yield (_lockfile || _load_lockfile()).default.fromDirectory(config.lockfileFolder, reporter);
+    const install = new (_install || _load_install()).Install(flags, config, reporter, lockfile);
+
+    var _ref7 = yield install.fetchRequestFromCwd();
+
+    const depRequests = _ref7.requests,
+          patterns = _ref7.patterns,
+          workspaceLayout = _ref7.workspaceLayout;
+
+    yield install.resolver.init(depRequests, {
+      isFlat: install.flags.flat,
+      isFrozen: install.flags.frozenLockfile,
+      workspaceLayout
+    });
+    const hoisted = yield install.linker.getFlatHoistedTree(patterns);
+
+    // finding
+    reporter.step(3, 4, reporter.lang('whyFinding'), emoji.get('mag'));
+
+    const matches = queryWhy(query, hoisted);
+
+    if (matches.length <= 0) {
+      reporter.error(reporter.lang('whyUnknownMatch'));
+      return;
+    }
+
+    const processMatch = (() => {
+      var _ref8 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (match) {
+        const matchInfo = match[1];
+
+        const matchRef = matchInfo.pkg._reference;
+        invariant(matchRef, 'expected reference');
+
+        const distinctMatchPatterns = new Set(matchRef.patterns);
+        const reasons = [];
+
+        // reason: dependency of these modules
+        if (matchInfo.originalParentPath.length > 0) {
+          reasons.push({
+            type: 'whyDependedOn',
+            typeSimple: 'whyDependedOnSimple',
+            value: toStandardPathString(matchInfo.originalParentPath)
+          });
+        }
+
+        // reason: exists in manifest
+        let rootType;
+        for (var _iterator3 = distinctMatchPatterns, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
+          var _ref9;
+
+          if (_isArray3) {
+            if (_i3 >= _iterator3.length) break;
+            _ref9 = _iterator3[_i3++];
+          } else {
+            _i3 = _iterator3.next();
+            if (_i3.done) break;
+            _ref9 = _i3.value;
+          }
+
+          const pattern = _ref9;
+
+          rootType = install.rootPatternsToOrigin[pattern];
+          if (rootType) {
+            reasons.push({
+              type: 'whySpecified',
+              typeSimple: 'whySpecifiedSimple',
+              value: rootType
+            });
+          }
+        }
+
+        // reason: this is hoisted from these modules
+        for (var _iterator4 = matchInfo.previousPaths, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
+          var _ref10;
+
+          if (_isArray4) {
+            if (_i4 >= _iterator4.length) break;
+            _ref10 = _iterator4[_i4++];
+          } else {
+            _i4 = _iterator4.next();
+            if (_i4.done) break;
+            _ref10 = _i4.value;
+          }
+
+          const path = _ref10;
+
+          reasons.push({
+            type: 'whyHoistedFrom',
+            typeSimple: 'whyHoistedFromSimple',
+            value: toStandardPathString(path)
+          });
+        }
+
+        // package sizes
+        let packageSize = 0;
+        let directSizes = [];
+        let transitiveSizes = [];
+        try {
+          packageSize = yield getPackageSize(match);
+        } catch (e) {}
+
+        const dependencies = Array.from(collect(hoisted, new Set(), match));
+        const transitiveDependencies = Array.from(collect(hoisted, new Set(), match, { recursive: true }));
+
+        try {
+          directSizes = yield Promise.all(dependencies.map(getPackageSize));
+          transitiveSizes = yield Promise.all(transitiveDependencies.map(getPackageSize));
+        } catch (e) {}
+
+        const transitiveKeys = new Set(transitiveDependencies.map(function ([, info]) {
+          return info.key;
+        }));
+        const sharedDependencies = getSharedDependencies(hoisted, transitiveKeys);
+
+        // prepare output: populate reporter
+        reporter.info(reporter.lang('whyMatch', `${matchInfo.key}@${matchInfo.pkg.version}`));
+        //
+        // reason: hoisted/nohoist
+        if (matchInfo.isNohoist) {
+          reasons.push({
+            type: 'whyNotHoisted',
+            typeSimple: 'whyNotHoistedSimple',
+            value: matchInfo.nohoistList
+          });
+        } else if (query === matchInfo.originalKey) {
+          reporter.info(reporter.lang('whyHoistedTo', matchInfo.key));
+        }
+
+        if (reasons.length === 1) {
+          reporter.info(reporter.lang(reasons[0].typeSimple, reasons[0].value));
+        } else if (reasons.length > 1) {
+          reporter.info(reporter.lang('whyReasons'));
+          reporter.list('reasons', reasons.map(function (reason) {
+            return reporter.lang(reason.type, reason.value);
+          }));
+        } else {
+          reporter.error(reporter.lang('whyWhoKnows'));
+        }
+
+        if (packageSize) {
+          // stats: file size of this dependency without any dependencies
+          reporter.info(reporter.lang('whyDiskSizeWithout', bytes(packageSize)));
+
+          // stats: file size of this dependency including dependencies that aren't shared
+          reporter.info(reporter.lang('whyDiskSizeUnique', bytes(packageSize + sum(directSizes))));
+
+          // stats: file size of this dependency including dependencies
+          reporter.info(reporter.lang('whyDiskSizeTransitive', bytes(packageSize + sum(transitiveSizes))));
+
+          // stats: shared transitive dependencies
+          reporter.info(reporter.lang('whySharedDependencies', sharedDependencies.size));
+        }
+      });
+
+      return function processMatch(_x8) {
+        return _ref8.apply(this, arguments);
+      };
+    })();
+
+    reporter.step(4, 4, reporter.lang('whyCalculating'), emoji.get('aerial_tramway'));
+    for (var _iterator5 = matches, _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
+      var _ref11;
+
+      if (_isArray5) {
+        if (_i5 >= _iterator5.length) break;
+        _ref11 = _iterator5[_i5++];
+      } else {
+        _i5 = _iterator5.next();
+        if (_i5.done) break;
+        _ref11 = _i5.value;
+      }
+
+      const match = _ref11;
+
+      yield processMatch(match);
+    }
+  });
+
+  return function run(_x4, _x5, _x6, _x7) {
+    return _ref6.apply(this, arguments);
+  };
+})();
+
+exports.setFlags = setFlags;
+exports.hasWrapper = hasWrapper;
+exports.queryWhy = queryWhy;
+
+var _install;
+
+function _load_install() {
+  return _install = __webpack_require__(34);
+}
+
+var _constants;
+
+function _load_constants() {
+  return _constants = __webpack_require__(8);
+}
+
+var _fs;
+
+function _load_fs() {
+  return _fs = _interopRequireWildcard(__webpack_require__(4));
+}
+
+var _lockfile;
+
+function _load_lockfile() {
+  return _lockfile = _interopRequireDefault(__webpack_require__(19));
+}
+
+var _errors;
+
+function _load_errors() {
+  return _errors = __webpack_require__(6);
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const requireLockfile = exports.requireLockfile = true;
+
+const invariant = __webpack_require__(9);
+const bytes = __webpack_require__(596);
+const emoji = __webpack_require__(302);
+const path = __webpack_require__(0);
+
+function sum(array) {
+  return array.length ? array.reduce((a, b) => a + b, 0) : 0;
+}
+
+function collect(hoistManifests, allDependencies, dependency, { recursive } = { recursive: false }) {
+  const depInfo = dependency[1];
+
+  const deps = depInfo.pkg.dependencies;
+
+  if (!deps) {
+    return allDependencies;
+  }
+
+  const dependencyKeys = new Set(Object.keys(deps));
+  const directDependencies = [];
+
+  for (var _iterator = hoistManifests, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+    var _ref3;
+
+    if (_isArray) {
+      if (_i >= _iterator.length) break;
+      _ref3 = _iterator[_i++];
+    } else {
+      _i = _iterator.next();
+      if (_i.done) break;
+      _ref3 = _i.value;
+    }
+
+    const dep = _ref3;
+    const info = dep[1];
+
+
+    if (!allDependencies.has(dep) && dependencyKeys.has(info.key)) {
+      allDependencies.add(dep);
+      directDependencies.push(dep);
+    }
+  }
+
+  if (recursive) {
+    directDependencies.forEach(dependency => collect(hoistManifests, allDependencies, dependency, { recursive: true }));
+  }
+
+  return allDependencies;
+}
+
+function getSharedDependencies(hoistManifests, transitiveKeys) {
+  const sharedDependencies = new Set();
+  for (var _iterator2 = hoistManifests, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+    var _ref5;
+
+    if (_isArray2) {
+      if (_i2 >= _iterator2.length) break;
+      _ref5 = _iterator2[_i2++];
+    } else {
+      _i2 = _iterator2.next();
+      if (_i2.done) break;
+      _ref5 = _i2.value;
+    }
+
+    const _ref4 = _ref5;
+    const info = _ref4[1];
+
+    if (!transitiveKeys.has(info.key) && info.pkg.dependencies) {
+      Object.keys(info.pkg.dependencies).forEach(dependency => {
+        if (transitiveKeys.has(dependency) && !sharedDependencies.has(dependency)) {
+          sharedDependencies.add(dependency);
+        }
+      });
+    }
+  }
+  return sharedDependencies;
+}
+
+function setFlags(commander) {
+  commander.description('Identifies why a package has been installed, detailing which other packages depend on it.');
+}
+
+function hasWrapper(commander, args) {
+  return true;
+}
+
+// to conform to the current standard '#' as package tree separator
+function toStandardPathString(pathString) {
+  const str = pathString.replace(/\//g, '#');
+  if (str[0] === '#') {
+    return str.slice(1);
+  }
+  return str;
+}
+
+function queryWhy(pattern, hoisted) {
+  const nohoistPattern = `#${pattern}`;
+  const found = [];
+  for (var _iterator6 = hoisted, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) {
+    var _ref13;
+
+    if (_isArray6) {
+      if (_i6 >= _iterator6.length) break;
+      _ref13 = _iterator6[_i6++];
+    } else {
+      _i6 = _iterator6.next();
+      if (_i6.done) break;
+      _ref13 = _i6.value;
+    }
+
+    const _ref12 = _ref13;
+    const loc = _ref12[0];
+    const info = _ref12[1];
+
+    if (info.key === pattern || info.previousPaths.indexOf(pattern) >= 0 || info.key.endsWith(nohoistPattern)) {
+      found.push([loc, info]);
+    }
+  }
+  return found;
+}
+
+/***/ }),
+/* 547 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.run = undefined;
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+let run = exports.run = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
+    const workspaceRootFolder = config.workspaceRootFolder;
+
+
+    if (!workspaceRootFolder) {
+      throw new (_errors || _load_errors()).MessageError(reporter.lang('workspaceRootNotFound', config.cwd));
+    }
+
+    if (flags.originalArgs < 1) {
+      throw new (_errors || _load_errors()).MessageError(reporter.lang('workspaceMissingWorkspace'));
+    }
+
+    if (flags.originalArgs < 2) {
+      throw new (_errors || _load_errors()).MessageError(reporter.lang('workspaceMissingCommand'));
+    }
+
+    const manifest = yield config.findManifest(workspaceRootFolder, false);
+    invariant(manifest && manifest.workspaces, 'We must find a manifest with a "workspaces" property');
+
+    const workspaces = yield config.resolveWorkspaces(workspaceRootFolder, manifest);
+
+    var _ref2 = flags.originalArgs || [];
+
+    const workspaceName = _ref2[0],
+          rest = _ref2.slice(1);
+
+    if (!Object.prototype.hasOwnProperty.call(workspaces, workspaceName)) {
+      throw new (_errors || _load_errors()).MessageError(reporter.lang('workspaceUnknownWorkspace', workspaceName));
+    }
+
+    const workspace = workspaces[workspaceName];
+
+    try {
+      yield (_child || _load_child()).spawn((_constants || _load_constants()).NODE_BIN_PATH, [(_constants || _load_constants()).YARN_BIN_PATH, ...rest], {
+        stdio: 'inherit',
+        cwd: workspace.loc
+      });
+    } catch (err) {
+      throw err;
+    }
+  });
+
+  return function run(_x, _x2, _x3, _x4) {
+    return _ref.apply(this, arguments);
+  };
+})();
+
+exports.setFlags = setFlags;
+exports.hasWrapper = hasWrapper;
+
+var _errors;
+
+function _load_errors() {
+  return _errors = __webpack_require__(6);
+}
+
+var _child;
+
+function _load_child() {
+  return _child = _interopRequireWildcard(__webpack_require__(58));
+}
+
+var _constants;
+
+function _load_constants() {
+  return _constants = __webpack_require__(8);
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const invariant = __webpack_require__(9);
+
+function setFlags(commander) {}
+
+function hasWrapper(commander, args) {
+  return true;
+}
+
+/***/ }),
+/* 548 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.examples = exports.setFlags = exports.run = exports.runScript = exports.info = undefined;
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+let info = exports.info = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
+    const workspaceRootFolder = config.workspaceRootFolder;
+
+
+    if (!workspaceRootFolder) {
+      throw new (_errors || _load_errors()).MessageError(reporter.lang('workspaceRootNotFound', config.cwd));
+    }
+
+    const manifest = yield config.findManifest(workspaceRootFolder, false);
+    invariant(manifest && manifest.workspaces, 'We must find a manifest with a "workspaces" property');
+
+    const workspaces = yield config.resolveWorkspaces(workspaceRootFolder, manifest);
+
+    const publicData = {};
+
+    for (var _iterator = Object.keys(workspaces), _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+      var _ref2;
+
+      if (_isArray) {
+        if (_i >= _iterator.length) break;
+        _ref2 = _iterator[_i++];
+      } else {
+        _i = _iterator.next();
+        if (_i.done) break;
+        _ref2 = _i.value;
+      }
+
+      const workspaceName = _ref2;
+      var _workspaces$workspace = workspaces[workspaceName];
+      const loc = _workspaces$workspace.loc,
+            manifest = _workspaces$workspace.manifest;
+
+
+      const workspaceDependencies = new Set();
+      const mismatchedWorkspaceDependencies = new Set();
+
+      for (var _iterator2 = (_constants || _load_constants()).DEPENDENCY_TYPES, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+        var _ref3;
+
+        if (_isArray2) {
+          if (_i2 >= _iterator2.length) break;
+          _ref3 = _iterator2[_i2++];
+        } else {
+          _i2 = _iterator2.next();
+          if (_i2.done) break;
+          _ref3 = _i2.value;
+        }
+
+        const dependencyType = _ref3;
+
+        if (dependencyType !== 'peerDependencies') {
+          for (var _iterator3 = Object.keys(manifest[dependencyType] || {}), _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
+            var _ref4;
+
+            if (_isArray3) {
+              if (_i3 >= _iterator3.length) break;
+              _ref4 = _iterator3[_i3++];
+            } else {
+              _i3 = _iterator3.next();
+              if (_i3.done) break;
+              _ref4 = _i3.value;
+            }
+
+            const dependencyName = _ref4;
+
+            if (Object.prototype.hasOwnProperty.call(workspaces, dependencyName)) {
+              invariant(manifest && manifest[dependencyType], 'The request should exist');
+              const requestedRange = manifest[dependencyType][dependencyName];
+              if (semver.satisfies(workspaces[dependencyName].manifest.version, requestedRange)) {
+                workspaceDependencies.add(dependencyName);
+              } else {
+                mismatchedWorkspaceDependencies.add(dependencyName);
+              }
+            }
+          }
+        }
+      }
+
+      publicData[workspaceName] = {
+        location: path.relative(config.lockfileFolder, loc).replace(/\\/g, '/'),
+        workspaceDependencies: Array.from(workspaceDependencies),
+        mismatchedWorkspaceDependencies: Array.from(mismatchedWorkspaceDependencies)
+      };
+    }
+
+    reporter.log(JSON.stringify(publicData, null, 2), { force: true });
+  });
+
+  return function info(_x, _x2, _x3, _x4) {
+    return _ref.apply(this, arguments);
+  };
+})();
+
+let runScript = exports.runScript = (() => {
+  var _ref5 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
+    const workspaceRootFolder = config.workspaceRootFolder;
+
+
+    if (!workspaceRootFolder) {
+      throw new (_errors || _load_errors()).MessageError(reporter.lang('workspaceRootNotFound', config.cwd));
+    }
+
+    const manifest = yield config.findManifest(workspaceRootFolder, false);
+    invariant(manifest && manifest.workspaces, 'We must find a manifest with a "workspaces" property');
+
+    const workspaces = yield config.resolveWorkspaces(workspaceRootFolder, manifest);
+
+    try {
+      var _ref6 = flags.originalArgs || [];
+
+      const _ = _ref6[0],
+            rest = _ref6.slice(1);
+
+      for (var _iterator4 = Object.keys(workspaces), _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
+        var _ref7;
+
+        if (_isArray4) {
+          if (_i4 >= _iterator4.length) break;
+          _ref7 = _iterator4[_i4++];
+        } else {
+          _i4 = _iterator4.next();
+          if (_i4.done) break;
+          _ref7 = _i4.value;
+        }
+
+        const workspaceName = _ref7;
+        const loc = workspaces[workspaceName].loc;
+
+
+        yield (_child || _load_child()).spawn((_constants2 || _load_constants2()).NODE_BIN_PATH, [(_constants2 || _load_constants2()).YARN_BIN_PATH, ...rest], {
+          stdio: 'inherit',
+          cwd: loc
+        });
+      }
+    } catch (err) {
+      throw err;
+    }
+  });
+
+  return function runScript(_x5, _x6, _x7, _x8) {
+    return _ref5.apply(this, arguments);
+  };
+})();
+
+exports.hasWrapper = hasWrapper;
+
+var _errors;
+
+function _load_errors() {
+  return _errors = __webpack_require__(6);
+}
+
+var _buildSubCommands2;
+
+function _load_buildSubCommands() {
+  return _buildSubCommands2 = _interopRequireDefault(__webpack_require__(59));
+}
+
+var _constants;
+
+function _load_constants() {
+  return _constants = __webpack_require__(8);
+}
+
+var _child;
+
+function _load_child() {
+  return _child = _interopRequireWildcard(__webpack_require__(58));
+}
+
+var _constants2;
+
+function _load_constants2() {
+  return _constants2 = __webpack_require__(8);
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const invariant = __webpack_require__(9);
+const path = __webpack_require__(0);
+const semver = __webpack_require__(22);
+
+function hasWrapper(commander, args) {
+  return true;
+}
+
+var _buildSubCommands = (0, (_buildSubCommands2 || _load_buildSubCommands()).default)('workspaces', {
+  info(config, reporter, flags, args) {
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      yield info(config, reporter, flags, args);
+    })();
+  },
+  run(config, reporter, flags, args) {
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      yield runScript(config, reporter, flags, args);
+    })();
+  }
+});
+
+const run = _buildSubCommands.run,
+      setFlags = _buildSubCommands.setFlags,
+      examples = _buildSubCommands.examples;
+exports.run = run;
+exports.setFlags = setFlags;
+exports.examples = examples;
+
+/***/ }),
+/* 549 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/* WEBPACK VAR INJECTION */(function(module) {
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.autoRun = exports.main = undefined;
+
+var _extends2;
+
+function _load_extends() {
+  return _extends2 = _interopRequireDefault(__webpack_require__(21));
+}
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+let main = exports.main = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* ({
+    startArgs,
+    args,
+    endArgs
+  }) {
+    const collect = function collect(val, acc) {
+      acc.push(val);
+      return acc;
+    };
+
+    (0, (_loudRejection || _load_loudRejection()).default)();
+    (0, (_signalHandler || _load_signalHandler()).default)();
+
+    // set global options
+    (_commander || _load_commander()).default.version((_yarnVersion || _load_yarnVersion()).version, '-v, --version');
+    (_commander || _load_commander()).default.usage('[command] [flags]');
+    (_commander || _load_commander()).default.option('--no-default-rc', 'prevent Yarn from automatically detecting yarnrc and npmrc files');
+    (_commander || _load_commander()).default.option('--use-yarnrc <path>', 'specifies a yarnrc file that Yarn should use (.yarnrc only, not .npmrc)', collect, []);
+    (_commander || _load_commander()).default.option('--verbose', 'output verbose messages on internal operations');
+    (_commander || _load_commander()).default.option('--offline', 'trigger an error if any required dependencies are not available in local cache');
+    (_commander || _load_commander()).default.option('--prefer-offline', 'use network only if dependencies are not available in local cache');
+    (_commander || _load_commander()).default.option('--enable-pnp, --pnp', "enable the Plug'n'Play installation");
+    (_commander || _load_commander()).default.option('--disable-pnp', "disable the Plug'n'Play installation");
+    (_commander || _load_commander()).default.option('--strict-semver');
+    (_commander || _load_commander()).default.option('--json', 'format Yarn log messages as lines of JSON (see jsonlines.org)');
+    (_commander || _load_commander()).default.option('--ignore-scripts', "don't run lifecycle scripts");
+    (_commander || _load_commander()).default.option('--har', 'save HAR output of network traffic');
+    (_commander || _load_commander()).default.option('--ignore-platform', 'ignore platform checks');
+    (_commander || _load_commander()).default.option('--ignore-engines', 'ignore engines check');
+    (_commander || _load_commander()).default.option('--ignore-optional', 'ignore optional dependencies');
+    (_commander || _load_commander()).default.option('--force', 'install and build packages even if they were built before, overwrite lockfile');
+    (_commander || _load_commander()).default.option('--skip-integrity-check', 'run install without checking if node_modules is installed');
+    (_commander || _load_commander()).default.option('--check-files', 'install will verify file tree of packages for consistency');
+    (_commander || _load_commander()).default.option('--no-bin-links', "don't generate bin links when setting up packages");
+    (_commander || _load_commander()).default.option('--flat', 'only allow one version of a package');
+    (_commander || _load_commander()).default.option('--prod, --production [prod]', '', (_conversion || _load_conversion()).boolify);
+    (_commander || _load_commander()).default.option('--no-lockfile', "don't read or generate a lockfile");
+    (_commander || _load_commander()).default.option('--pure-lockfile', "don't generate a lockfile");
+    (_commander || _load_commander()).default.option('--frozen-lockfile', "don't generate a lockfile and fail if an update is needed");
+    (_commander || _load_commander()).default.option('--update-checksums', 'update package checksums from current repository');
+    (_commander || _load_commander()).default.option('--link-duplicates', 'create hardlinks to the repeated modules in node_modules');
+    (_commander || _load_commander()).default.option('--link-folder <path>', 'specify a custom folder to store global links');
+    (_commander || _load_commander()).default.option('--global-folder <path>', 'specify a custom folder to store global packages');
+    (_commander || _load_commander()).default.option('--modules-folder <path>', 'rather than installing modules into the node_modules folder relative to the cwd, output them here');
+    (_commander || _load_commander()).default.option('--preferred-cache-folder <path>', 'specify a custom folder to store the yarn cache if possible');
+    (_commander || _load_commander()).default.option('--cache-folder <path>', 'specify a custom folder that must be used to store the yarn cache');
+    (_commander || _load_commander()).default.option('--mutex <type>[:specifier]', 'use a mutex to ensure only one yarn instance is executing');
+    (_commander || _load_commander()).default.option('--emoji [bool]', 'enable emoji in output', (_conversion || _load_conversion()).boolify, process.platform === 'darwin' || process.env.TERM_PROGRAM === 'Hyper' || process.env.TERM_PROGRAM === 'HyperTerm' || process.env.TERM_PROGRAM === 'Terminus');
+    (_commander || _load_commander()).default.option('-s, --silent', 'skip Yarn console logs, other types of logs (script output) will be printed');
+    (_commander || _load_commander()).default.option('--cwd <cwd>', 'working directory to use', process.cwd());
+    (_commander || _load_commander()).default.option('--proxy <host>', '');
+    (_commander || _load_commander()).default.option('--https-proxy <host>', '');
+    (_commander || _load_commander()).default.option('--registry <url>', 'override configuration registry');
+    (_commander || _load_commander()).default.option('--no-progress', 'disable progress bar');
+    (_commander || _load_commander()).default.option('--network-concurrency <number>', 'maximum number of concurrent network requests', parseInt);
+    (_commander || _load_commander()).default.option('--network-timeout <milliseconds>', 'TCP timeout for network requests', parseInt);
+    (_commander || _load_commander()).default.option('--non-interactive', 'do not show interactive prompts');
+    (_commander || _load_commander()).default.option('--scripts-prepend-node-path [bool]', 'prepend the node executable dir to the PATH in scripts', (_conversion || _load_conversion()).boolify);
+    (_commander || _load_commander()).default.option('--no-node-version-check', 'do not warn when using a potentially unsupported Node version');
+    (_commander || _load_commander()).default.option('--focus', 'Focus on a single workspace by installing remote copies of its sibling workspaces.');
+    (_commander || _load_commander()).default.option('--otp <otpcode>', 'one-time password for two factor authentication');
+
+    // if -v is the first command, then always exit after returning the version
+    if (args[0] === '-v') {
+      console.log((_yarnVersion || _load_yarnVersion()).version.trim());
+      process.exitCode = 0;
+      return;
+    }
+
+    // get command name
+    const firstNonFlagIndex = args.findIndex(function (arg, idx, arr) {
+      const isOption = arg.startsWith('-');
+      const prev = idx > 0 && arr[idx - 1];
+      const prevOption = prev && prev.startsWith('-') && (_commander || _load_commander()).default.optionFor(prev);
+      const boundToPrevOption = prevOption && (prevOption.optional || prevOption.required);
+
+      return !isOption && !boundToPrevOption;
+    });
+    let preCommandArgs;
+    let commandName = '';
+    if (firstNonFlagIndex > -1) {
+      preCommandArgs = args.slice(0, firstNonFlagIndex);
+      commandName = args[firstNonFlagIndex];
+      args = args.slice(firstNonFlagIndex + 1);
+    } else {
+      preCommandArgs = args;
+      args = [];
+    }
+
+    let isKnownCommand = Object.prototype.hasOwnProperty.call((_index3 || _load_index3()).default, commandName);
+    const isHelp = function isHelp(arg) {
+      return arg === '--help' || arg === '-h';
+    };
+    const helpInPre = preCommandArgs.findIndex(isHelp);
+    const helpInArgs = args.findIndex(isHelp);
+    const setHelpMode = function setHelpMode() {
+      if (isKnownCommand) {
+        args.unshift(commandName);
+      }
+      commandName = 'help';
+      isKnownCommand = true;
+    };
+
+    if (helpInPre > -1) {
+      preCommandArgs.splice(helpInPre);
+      setHelpMode();
+    } else if (isKnownCommand && helpInArgs === 0) {
+      args.splice(helpInArgs);
+      setHelpMode();
+    }
+
+    if (!commandName) {
+      commandName = 'install';
+      isKnownCommand = true;
+    }
+
+    if (!isKnownCommand) {
+      // if command is not recognized, then set default to `run`
+      args.unshift(commandName);
+      commandName = 'run';
+    }
+    const command = (_index3 || _load_index3()).default[commandName];
+
+    let warnAboutRunDashDash = false;
+    // we are using "yarn <script> -abc", "yarn run <script> -abc", or "yarn node -abc", we want -abc
+    // to be script options, not yarn options
+    const PROXY_COMMANDS = new Set([`run`, `create`, `node`]);
+    if (PROXY_COMMANDS.has(commandName)) {
+      if (endArgs.length === 0) {
+        let preservedArgs = 0;
+        // the "run" and "create" command take one argument that we want to parse as usual (the
+        // script/package name), hence the splice(1)
+        if (command === (_index3 || _load_index3()).default.run || command === (_index3 || _load_index3()).default.create) {
+          preservedArgs += 1;
+        }
+        // If the --into option immediately follows the command (or the script name in the "run/create"
+        // case), we parse them as regular options so that we can cd into them
+        if (args[preservedArgs] === `--into`) {
+          preservedArgs += 2;
+        }
+        endArgs = ['--', ...args.splice(preservedArgs)];
+      } else {
+        warnAboutRunDashDash = true;
+      }
+    }
+
+    (_commander || _load_commander()).default.originalArgs = args;
+    args = [...preCommandArgs, ...args];
+
+    command.setFlags((_commander || _load_commander()).default);
+    (_commander || _load_commander()).default.parse([...startArgs,
+    // we use this for https://github.com/tj/commander.js/issues/346, otherwise
+    // it will strip some args that match with any options
+    'this-arg-will-get-stripped-later', ...(0, (_rc || _load_rc()).getRcArgs)(commandName, args), ...args]);
+    (_commander || _load_commander()).default.args = (_commander || _load_commander()).default.args.concat(endArgs.slice(1));
+
+    // we strip cmd
+    console.assert((_commander || _load_commander()).default.args.length >= 1);
+    console.assert((_commander || _load_commander()).default.args[0] === 'this-arg-will-get-stripped-later');
+    (_commander || _load_commander()).default.args.shift();
+
+    //
+    const Reporter = (_commander || _load_commander()).default.json ? (_index || _load_index()).JSONReporter : (_index || _load_index()).ConsoleReporter;
+    const reporter = new Reporter({
+      emoji: process.stdout.isTTY && (_commander || _load_commander()).default.emoji,
+      verbose: (_commander || _load_commander()).default.verbose,
+      noProgress: !(_commander || _load_commander()).default.progress,
+      isSilent: (0, (_conversion || _load_conversion()).boolifyWithDefault)(process.env.YARN_SILENT, false) || (_commander || _load_commander()).default.silent,
+      nonInteractive: (_commander || _load_commander()).default.nonInteractive
+    });
+
+    const exit = function exit(exitCode) {
+      process.exitCode = exitCode || 0;
+      reporter.close();
+    };
+
+    reporter.initPeakMemoryCounter();
+
+    const config = new (_config || _load_config()).default(reporter);
+    const outputWrapperEnabled = (0, (_conversion || _load_conversion()).boolifyWithDefault)(process.env.YARN_WRAP_OUTPUT, true);
+    const shouldWrapOutput = outputWrapperEnabled && !(_commander || _load_commander()).default.json && command.hasWrapper((_commander || _load_commander()).default, (_commander || _load_commander()).default.args);
+
+    if (shouldWrapOutput) {
+      reporter.header(commandName, { name: 'yarn', version: (_yarnVersion || _load_yarnVersion()).version });
+    }
+
+    if ((_commander || _load_commander()).default.nodeVersionCheck && !(_semver || _load_semver()).default.satisfies(process.versions.node, (_constants || _load_constants()).SUPPORTED_NODE_VERSIONS)) {
+      reporter.warn(reporter.lang('unsupportedNodeVersion', process.versions.node, (_constants || _load_constants()).SUPPORTED_NODE_VERSIONS));
+    }
+
+    if (command.noArguments && (_commander || _load_commander()).default.args.length) {
+      reporter.error(reporter.lang('noArguments'));
+      reporter.info(command.getDocsInfo);
+      exit(1);
+      return;
+    }
+
+    //
+    if ((_commander || _load_commander()).default.yes) {
+      reporter.warn(reporter.lang('yesWarning'));
+    }
+
+    //
+    if (!(_commander || _load_commander()).default.offline && (_network || _load_network()).isOffline()) {
+      reporter.warn(reporter.lang('networkWarning'));
+    }
+
+    //
+    const run = function run() {
+      (0, (_invariant || _load_invariant()).default)(command, 'missing command');
+
+      if (warnAboutRunDashDash) {
+        reporter.warn(reporter.lang('dashDashDeprecation'));
+      }
+
+      return command.run(config, reporter, (_commander || _load_commander()).default, (_commander || _load_commander()).default.args).then(function (exitCode) {
+        if (shouldWrapOutput) {
+          reporter.footer(false);
+        }
+        return exitCode;
+      });
+    };
+
+    //
+    const runEventuallyWithFile = function runEventuallyWithFile(mutexFilename, isFirstTime) {
+      return new Promise(function (resolve) {
+        const lockFilename = mutexFilename || (_path || _load_path()).default.join(config.cwd, (_constants || _load_constants()).SINGLE_INSTANCE_FILENAME);
+        (_properLockfile || _load_properLockfile()).default.lock(lockFilename, { realpath: false }, function (err, release) {
+          if (err) {
+            if (isFirstTime) {
+              reporter.warn(reporter.lang('waitingInstance'));
+            }
+            setTimeout(function () {
+              resolve(runEventuallyWithFile(mutexFilename, false));
+            }, 200); // do not starve the CPU
+          } else {
+            (0, (_death || _load_death()).default)(function () {
+              process.exitCode = 1;
+            });
+            resolve(run().then(function () {
+              return new Promise(function (resolve) {
+                return release(resolve);
+              });
+            }));
+          }
+        });
+      });
+    };
+
+    const runEventuallyWithNetwork = function runEventuallyWithNetwork(mutexPort) {
+      return new Promise(function (resolve, reject) {
+        const connectionOptions = {
+          port: +mutexPort || (_constants || _load_constants()).SINGLE_INSTANCE_PORT,
+          host: 'localhost'
+        };
+
+        function startServer() {
+          const clients = new Set();
+          const server = (_http || _load_http()).default.createServer(manager);
+
+          // The server must not prevent us from exiting
+          server.unref();
+
+          // No socket must timeout, so that they aren't closed before we exit
+          server.timeout = 0;
+
+          // If we fail to setup the server, we ask the existing one for its name
+          server.on('error', () => {
+            reportServerName();
+          });
+
+          // If we succeed, keep track of all the connected sockets to close them later
+          server.on('connection', socket => {
+            clients.add(socket);
+            socket.on('close', () => {
+              clients.delete(socket);
+            });
+          });
+
+          server.listen(connectionOptions, () => {
+            // Don't forget to kill the sockets if we're being killed via signals
+            (0, (_death || _load_death()).default)(killSockets);
+
+            // Also kill the sockets if we finish, whether it's a success or a failure
+            run().then(res => {
+              killSockets();
+              resolve(res);
+            }, err => {
+              killSockets();
+              reject(err);
+            });
+          });
+
+          function manager(request, response) {
+            response.writeHead(200);
+            response.end(JSON.stringify({ cwd: config.cwd, pid: process.pid }));
+          }
+
+          function killSockets() {
+            try {
+              server.close();
+            } catch (err) {
+              // best effort
+            }
+
+            for (var _iterator = clients, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+              var _ref2;
+
+              if (_isArray) {
+                if (_i >= _iterator.length) break;
+                _ref2 = _iterator[_i++];
+              } else {
+                _i = _iterator.next();
+                if (_i.done) break;
+                _ref2 = _i.value;
+              }
+
+              const socket = _ref2;
+
+              try {
+                socket.destroy();
+              } catch (err) {
+                // best effort
+              }
+            }
+
+            // If the process hasn't exited in the next 5s, it has stalled and we abort
+            const timeout = setTimeout(() => {
+              console.error('Process stalled');
+              if (process._getActiveHandles) {
+                console.error('Active handles:');
+                // $FlowFixMe: getActiveHandles is undocumented, but it exists
+                for (var _iterator2 = process._getActiveHandles(), _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+                  var _ref3;
+
+                  if (_isArray2) {
+                    if (_i2 >= _iterator2.length) break;
+                    _ref3 = _iterator2[_i2++];
+                  } else {
+                    _i2 = _iterator2.next();
+                    if (_i2.done) break;
+                    _ref3 = _i2.value;
+                  }
+
+                  const handle = _ref3;
+
+                  console.error(`  - ${handle.constructor.name}`);
+                }
+              }
+              // eslint-disable-next-line no-process-exit
+              process.exit(1);
+            }, 5000);
+
+            // This timeout must not prevent us from exiting
+            // $FlowFixMe: Node's setTimeout returns a Timeout, not a Number
+            timeout.unref();
+          }
+        }
+
+        function reportServerName() {
+          const request = (_http || _load_http()).default.get(connectionOptions, response => {
+            const buffers = [];
+
+            response.on('data', buffer => {
+              buffers.push(buffer);
+            });
+
+            response.on('end', () => {
+              try {
+                var _JSON$parse = JSON.parse(Buffer.concat(buffers).toString());
+
+                const cwd = _JSON$parse.cwd,
+                      pid = _JSON$parse.pid;
+
+                reporter.warn(reporter.lang('waitingNamedInstance', pid, cwd));
+              } catch (error) {
+                reporter.verbose(error);
+                reject(new Error(reporter.lang('mutexPortBusy', connectionOptions.port)));
+                return;
+              }
+              waitForTheNetwork();
+            });
+
+            response.on('error', () => {
+              startServer();
+            });
+          });
+
+          request.on('error', () => {
+            startServer();
+          });
+        }
+
+        function waitForTheNetwork() {
+          const socket = (_net || _load_net()).default.createConnection(connectionOptions);
+
+          socket.on('error', () => {
+            // catch & ignore, the retry is handled in 'close'
+          });
+
+          socket.on('close', () => {
+            startServer();
+          });
+        }
+
+        startServer();
+      });
+    };
+
+    function onUnexpectedError(err) {
+      function indent(str) {
+        return '\n  ' + str.trim().split('\n').join('\n  ');
+      }
+
+      const log = [];
+      log.push(`Arguments: ${indent(process.argv.join(' '))}`);
+      log.push(`PATH: ${indent(process.env.PATH || 'undefined')}`);
+      log.push(`Yarn version: ${indent((_yarnVersion || _load_yarnVersion()).version)}`);
+      log.push(`Node version: ${indent(process.versions.node)}`);
+      log.push(`Platform: ${indent(process.platform + ' ' + process.arch)}`);
+
+      log.push(`Trace: ${indent(err.stack)}`);
+
+      // add manifests
+      for (var _iterator3 = (_index2 || _load_index2()).registryNames, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
+        var _ref4;
+
+        if (_isArray3) {
+          if (_i3 >= _iterator3.length) break;
+          _ref4 = _iterator3[_i3++];
+        } else {
+          _i3 = _iterator3.next();
+          if (_i3.done) break;
+          _ref4 = _i3.value;
+        }
+
+        const registryName = _ref4;
+
+        const possibleLoc = (_path || _load_path()).default.join(config.cwd, (_index2 || _load_index2()).registries[registryName].filename);
+        const manifest = (_fs || _load_fs()).default.existsSync(possibleLoc) ? (_fs || _load_fs()).default.readFileSync(possibleLoc, 'utf8') : 'No manifest';
+        log.push(`${registryName} manifest: ${indent(manifest)}`);
+      }
+
+      // lockfile
+      const lockLoc = (_path || _load_path()).default.join(config.lockfileFolder || config.cwd, // lockfileFolder might not be set at this point
+      (_constants || _load_constants()).LOCKFILE_FILENAME);
+      const lockfile = (_fs || _load_fs()).default.existsSync(lockLoc) ? (_fs || _load_fs()).default.readFileSync(lockLoc, 'utf8') : 'No lockfile';
+      log.push(`Lockfile: ${indent(lockfile)}`);
+
+      const errorReportLoc = writeErrorReport(log);
+
+      reporter.error(reporter.lang('unexpectedError', err.message));
+
+      if (errorReportLoc) {
+        reporter.info(reporter.lang('bugReport', errorReportLoc));
+      }
+    }
+
+    function writeErrorReport(log) {
+      const errorReportLoc = config.enableMetaFolder ? (_path || _load_path()).default.join(config.cwd, (_constants || _load_constants()).META_FOLDER, 'yarn-error.log') : (_path || _load_path()).default.join(config.cwd, 'yarn-error.log');
+
+      try {
+        (_fs || _load_fs()).default.writeFileSync(errorReportLoc, log.join('\n\n') + '\n');
+      } catch (err) {
+        reporter.error(reporter.lang('fileWriteError', errorReportLoc, err.message));
+        return undefined;
+      }
+
+      return errorReportLoc;
+    }
+
+    const cwd = command.shouldRunInCurrentCwd ? (_commander || _load_commander()).default.cwd : findProjectRoot((_commander || _load_commander()).default.cwd);
+
+    const folderOptionKeys = ['linkFolder', 'globalFolder', 'preferredCacheFolder', 'cacheFolder', 'modulesFolder'];
+
+    // Resolve all folder options relative to cwd
+    const resolvedFolderOptions = {};
+    folderOptionKeys.forEach(function (folderOptionKey) {
+      const folderOption = (_commander || _load_commander()).default[folderOptionKey];
+      const resolvedFolderOption = folderOption ? (_path || _load_path()).default.resolve((_commander || _load_commander()).default.cwd, folderOption) : folderOption;
+      resolvedFolderOptions[folderOptionKey] = resolvedFolderOption;
+    });
+
+    yield config.init((0, (_extends2 || _load_extends()).default)({
+      cwd,
+      commandName
+    }, resolvedFolderOptions, {
+      enablePnp: (_commander || _load_commander()).default.pnp,
+      disablePnp: (_commander || _load_commander()).default.disablePnp,
+      enableDefaultRc: (_commander || _load_commander()).default.defaultRc,
+      extraneousYarnrcFiles: (_commander || _load_commander()).default.useYarnrc,
+      binLinks: (_commander || _load_commander()).default.binLinks,
+      preferOffline: (_commander || _load_commander()).default.preferOffline,
+      captureHar: (_commander || _load_commander()).default.har,
+      ignorePlatform: (_commander || _load_commander()).default.ignorePlatform,
+      ignoreEngines: (_commander || _load_commander()).default.ignoreEngines,
+      ignoreScripts: (_commander || _load_commander()).default.ignoreScripts,
+      offline: (_commander || _load_commander()).default.preferOffline || (_commander || _load_commander()).default.offline,
+      looseSemver: !(_commander || _load_commander()).default.strictSemver,
+      production: (_commander || _load_commander()).default.production,
+      httpProxy: (_commander || _load_commander()).default.proxy,
+      httpsProxy: (_commander || _load_commander()).default.httpsProxy,
+      registry: (_commander || _load_commander()).default.registry,
+      networkConcurrency: (_commander || _load_commander()).default.networkConcurrency,
+      networkTimeout: (_commander || _load_commander()).default.networkTimeout,
+      nonInteractive: (_commander || _load_commander()).default.nonInteractive,
+      updateChecksums: (_commander || _load_commander()).default.updateChecksums,
+      focus: (_commander || _load_commander()).default.focus,
+      otp: (_commander || _load_commander()).default.otp
+    })).then(function () {
+      // lockfile check must happen after config.init sets lockfileFolder
+      if (command.requireLockfile && !(_fs || _load_fs()).default.existsSync((_path || _load_path()).default.join(config.lockfileFolder, (_constants || _load_constants()).LOCKFILE_FILENAME))) {
+        throw new (_errors || _load_errors()).MessageError(reporter.lang('noRequiredLockfile'));
+      }
+
+      // option "no-progress" stored in yarn config
+      const noProgressConfig = config.registries.yarn.getOption('no-progress');
+
+      if (noProgressConfig) {
+        reporter.disableProgress();
+      }
+
+      // verbose logs outputs process.uptime() with this line we can sync uptime to absolute time on the computer
+      reporter.verbose(`current time: ${new Date().toISOString()}`);
+
+      const mutex = (_commander || _load_commander()).default.mutex;
+      if (mutex && typeof mutex === 'string') {
+        const separatorLoc = mutex.indexOf(':');
+        let mutexType;
+        let mutexSpecifier;
+        if (separatorLoc === -1) {
+          mutexType = mutex;
+          mutexSpecifier = undefined;
+        } else {
+          mutexType = mutex.substring(0, separatorLoc);
+          mutexSpecifier = mutex.substring(separatorLoc + 1);
+        }
+
+        if (mutexType === 'file') {
+          return runEventuallyWithFile(mutexSpecifier, true).then(exit);
+        } else if (mutexType === 'network') {
+          return runEventuallyWithNetwork(mutexSpecifier).then(exit);
+        } else {
+          throw new (_errors || _load_errors()).MessageError(`Unknown single instance type ${mutexType}`);
+        }
+      } else {
+        return run().then(exit);
+      }
+    }).catch(function (err) {
+      reporter.verbose(err.stack);
+
+      if (err instanceof (_errors2 || _load_errors2()).ProcessTermError && reporter.isSilent) {
+        return exit(err.EXIT_CODE || 1);
+      }
+
+      if (err instanceof (_errors || _load_errors()).MessageError) {
+        reporter.error(err.message);
+      } else {
+        onUnexpectedError(err);
+      }
+
+      if (command.getDocsInfo) {
+        reporter.info(command.getDocsInfo);
+      }
+
+      if (err instanceof (_errors2 || _load_errors2()).ProcessTermError) {
+        return exit(err.EXIT_CODE || 1);
+      }
+
+      return exit(1);
+    });
+  });
+
+  return function main(_x) {
+    return _ref.apply(this, arguments);
+  };
+})();
+
+let start = (() => {
+  var _ref5 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+    const rc = (0, (_rc || _load_rc()).getRcConfigForCwd)(process.cwd(), process.argv.slice(2));
+    const yarnPath = rc['yarn-path'] || rc['yarnPath'];
+
+    if (yarnPath && !(0, (_conversion || _load_conversion()).boolifyWithDefault)(process.env.YARN_IGNORE_PATH, false)) {
+      const argv = process.argv.slice(2);
+      const opts = { stdio: 'inherit', env: Object.assign({}, process.env, { YARN_IGNORE_PATH: 1 }) };
+      let exitCode = 0;
+
+      try {
+        if (yarnPath.endsWith(`.js`)) {
+          exitCode = yield (0, (_child || _load_child()).spawnp)(process.execPath, [yarnPath, ...argv], opts);
+        } else {
+          exitCode = yield (0, (_child || _load_child()).spawnp)(yarnPath, argv, opts);
+        }
+      } catch (firstError) {
+        try {
+          exitCode = yield (0, (_child || _load_child()).forkp)(yarnPath, argv, opts);
+        } catch (error) {
+          throw firstError;
+        }
+      }
+
+      process.exitCode = exitCode;
+    } else {
+      // ignore all arguments after a --
+      const doubleDashIndex = process.argv.findIndex(function (element) {
+        return element === '--';
+      });
+      const startArgs = process.argv.slice(0, 2);
+      const args = process.argv.slice(2, doubleDashIndex === -1 ? process.argv.length : doubleDashIndex);
+      const endArgs = doubleDashIndex === -1 ? [] : process.argv.slice(doubleDashIndex);
+
+      yield main({ startArgs, args, endArgs });
+    }
+  });
+
+  return function start() {
+    return _ref5.apply(this, arguments);
+  };
+})();
+
+// When this module is compiled via Webpack, its child
+// count will be 0 since it is a single-file bundle.
+
+
+var _http;
+
+function _load_http() {
+  return _http = _interopRequireDefault(__webpack_require__(87));
+}
+
+var _net;
+
+function _load_net() {
+  return _net = _interopRequireDefault(__webpack_require__(164));
+}
+
+var _path;
+
+function _load_path() {
+  return _path = _interopRequireDefault(__webpack_require__(0));
+}
+
+var _commander;
+
+function _load_commander() {
+  return _commander = _interopRequireDefault(__webpack_require__(338));
+}
+
+var _fs;
+
+function _load_fs() {
+  return _fs = _interopRequireDefault(__webpack_require__(5));
+}
+
+var _invariant;
+
+function _load_invariant() {
+  return _invariant = _interopRequireDefault(__webpack_require__(9));
+}
+
+var _properLockfile;
+
+function _load_properLockfile() {
+  return _properLockfile = _interopRequireDefault(__webpack_require__(471));
+}
+
+var _loudRejection;
+
+function _load_loudRejection() {
+  return _loudRejection = _interopRequireDefault(__webpack_require__(470));
+}
+
+var _death;
+
+function _load_death() {
+  return _death = _interopRequireDefault(__webpack_require__(469));
+}
+
+var _semver;
+
+function _load_semver() {
+  return _semver = _interopRequireDefault(__webpack_require__(22));
+}
+
+var _index;
+
+function _load_index() {
+  return _index = __webpack_require__(200);
+}
+
+var _index2;
+
+function _load_index2() {
+  return _index2 = __webpack_require__(57);
+}
+
+var _index3;
+
+function _load_index3() {
+  return _index3 = _interopRequireDefault(__webpack_require__(334));
+}
+
+var _constants;
+
+function _load_constants() {
+  return _constants = _interopRequireWildcard(__webpack_require__(8));
+}
+
+var _network;
+
+function _load_network() {
+  return _network = _interopRequireWildcard(__webpack_require__(337));
+}
+
+var _errors;
+
+function _load_errors() {
+  return _errors = __webpack_require__(6);
+}
+
+var _config;
+
+function _load_config() {
+  return _config = _interopRequireDefault(__webpack_require__(162));
+}
+
+var _rc;
+
+function _load_rc() {
+  return _rc = __webpack_require__(335);
+}
+
+var _child;
+
+function _load_child() {
+  return _child = __webpack_require__(58);
+}
+
+var _yarnVersion;
+
+function _load_yarnVersion() {
+  return _yarnVersion = __webpack_require__(120);
+}
+
+var _signalHandler;
+
+function _load_signalHandler() {
+  return _signalHandler = _interopRequireDefault(__webpack_require__(468));
+}
+
+var _conversion;
+
+function _load_conversion() {
+  return _conversion = __webpack_require__(336);
+}
+
+var _errors2;
+
+function _load_errors2() {
+  return _errors2 = __webpack_require__(6);
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+process.stdout.prependListener('error', err => {
+  // swallow err only if downstream consumer process closed pipe early
+  if (err.code === 'EPIPE' || err.code === 'ERR_STREAM_DESTROYED') {
+    return;
+  }
+  throw err;
+});
+
+function findProjectRoot(base) {
+  let prev = null;
+  let dir = base;
+
+  do {
+    if ((_fs || _load_fs()).default.existsSync((_path || _load_path()).default.join(dir, (_constants || _load_constants()).NODE_PACKAGE_JSON))) {
+      return dir;
+    }
+
+    prev = dir;
+    dir = (_path || _load_path()).default.dirname(dir);
+  } while (dir !== prev);
+
+  return base;
+}
+
+const autoRun = exports.autoRun = module.children.length === 0;
+
+if (__webpack_require__.c[__webpack_require__.s] === module) {
+  start().catch(error => {
+    console.error(error.stack || error.message || error);
+    process.exitCode = 1;
+  });
+}
+
+exports.default = start;
+/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(163)(module)))
+
+/***/ }),
+/* 550 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+var _baseFetcher;
+
+function _load_baseFetcher() {
+  return _baseFetcher = _interopRequireDefault(__webpack_require__(167));
+}
+
+var _fs;
+
+function _load_fs() {
+  return _fs = _interopRequireWildcard(__webpack_require__(4));
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+class CopyFetcher extends (_baseFetcher || _load_baseFetcher()).default {
+  _fetch() {
+    var _this = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      yield (_fs || _load_fs()).copy(_this.reference, _this.dest, _this.reporter);
+      return {
+        hash: _this.hash || '',
+        resolved: null
+      };
+    })();
+  }
+}
+exports.default = CopyFetcher;
+
+/***/ }),
+/* 551 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+var _errors;
+
+function _load_errors() {
+  return _errors = __webpack_require__(6);
+}
+
+var _baseFetcher;
+
+function _load_baseFetcher() {
+  return _baseFetcher = _interopRequireDefault(__webpack_require__(167));
+}
+
+var _git;
+
+function _load_git() {
+  return _git = _interopRequireDefault(__webpack_require__(219));
+}
+
+var _fs;
+
+function _load_fs() {
+  return _fs = _interopRequireWildcard(__webpack_require__(4));
+}
+
+var _constants;
+
+function _load_constants() {
+  return _constants = _interopRequireWildcard(__webpack_require__(8));
+}
+
+var _crypto;
+
+function _load_crypto() {
+  return _crypto = _interopRequireWildcard(__webpack_require__(168));
+}
+
+var _install;
+
+function _load_install() {
+  return _install = __webpack_require__(34);
+}
+
+var _lockfile;
+
+function _load_lockfile() {
+  return _lockfile = _interopRequireDefault(__webpack_require__(19));
+}
+
+var _config;
+
+function _load_config() {
+  return _config = _interopRequireDefault(__webpack_require__(162));
+}
+
+var _pack;
+
+function _load_pack() {
+  return _pack = __webpack_require__(166);
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const tarFs = __webpack_require__(193);
+const url = __webpack_require__(24);
+const path = __webpack_require__(0);
+const fs = __webpack_require__(5);
+
+const invariant = __webpack_require__(9);
+
+const PACKED_FLAG = '1';
+
+class GitFetcher extends (_baseFetcher || _load_baseFetcher()).default {
+  setupMirrorFromCache() {
+    var _this = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const tarballMirrorPath = _this.getTarballMirrorPath();
+      const tarballCachePath = _this.getTarballCachePath();
+
+      if (tarballMirrorPath == null) {
+        return;
+      }
+
+      if (!(yield (_fs || _load_fs()).exists(tarballMirrorPath)) && (yield (_fs || _load_fs()).exists(tarballCachePath))) {
+        // The tarball doesn't exists in the offline cache but does in the cache; we import it to the mirror
+        yield (_fs || _load_fs()).mkdirp(path.dirname(tarballMirrorPath));
+        yield (_fs || _load_fs()).copy(tarballCachePath, tarballMirrorPath, _this.reporter);
+      }
+    })();
+  }
+
+  getTarballMirrorPath({ withCommit = true } = {}) {
+    var _url$parse = url.parse(this.reference);
+
+    const pathname = _url$parse.pathname;
+
+
+    if (pathname == null) {
+      return null;
+    }
+
+    const hash = this.hash;
+
+    let packageFilename = withCommit && hash ? `${path.basename(pathname)}-${hash}` : `${path.basename(pathname)}`;
+
+    if (packageFilename.startsWith(':')) {
+      packageFilename = packageFilename.substr(1);
+    }
+
+    return this.config.getOfflineMirrorPath(packageFilename);
+  }
+
+  getTarballCachePath() {
+    return path.join(this.dest, (_constants || _load_constants()).TARBALL_FILENAME);
+  }
+
+  getLocalPaths(override) {
+    const paths = [override ? path.resolve(this.config.cwd, override) : null, this.getTarballMirrorPath(), this.getTarballMirrorPath({ withCommit: false }), this.getTarballCachePath()];
+    // $FlowFixMe: https://github.com/facebook/flow/issues/1414
+    return paths.filter(path => path != null);
+  }
+
+  fetchFromLocal(override) {
+    var _this2 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const tarPaths = _this2.getLocalPaths(override);
+      const stream = yield (_fs || _load_fs()).readFirstAvailableStream(tarPaths);
+
+      return new Promise(function (resolve, reject) {
+        if (!stream) {
+          reject(new (_errors || _load_errors()).MessageError(_this2.reporter.lang('tarballNotInNetworkOrCache', _this2.reference, tarPaths)));
+          return;
+        }
+        invariant(stream, 'cachedStream should be available at this point');
+        // $FlowFixMe - This is available https://nodejs.org/api/fs.html#fs_readstream_path
+        const tarballPath = stream.path;
+
+        const untarStream = _this2._createUntarStream(_this2.dest);
+
+        const hashStream = new (_crypto || _load_crypto()).HashStream();
+        stream.pipe(hashStream).pipe(untarStream).on('finish', function () {
+          const expectHash = _this2.hash;
+          invariant(expectHash, 'Commit hash required');
+
+          const actualHash = hashStream.getHash();
+
+          // This condition is disabled because "expectHash" actually is the commit hash
+          // This is a design issue that we'll need to fix (https://github.com/yarnpkg/yarn/pull/3449)
+          if (true) {
+            resolve({
+              hash: expectHash
+            });
+          } else {
+            reject(new (_errors || _load_errors()).SecurityError(_this2.config.reporter.lang('fetchBadHashWithPath', _this2.packageName, _this2.remote.reference, expectHash, actualHash)));
+          }
+        }).on('error', function (err) {
+          reject(new (_errors || _load_errors()).MessageError(this.reporter.lang('fetchErrorCorrupt', err.message, tarballPath)));
+        });
+      });
+    })();
+  }
+
+  hasPrepareScript(git) {
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const manifestFile = yield git.getFile('package.json');
+
+      if (manifestFile) {
+        const scripts = JSON.parse(manifestFile).scripts;
+        const hasPrepareScript = Boolean(scripts && scripts.prepare);
+        return hasPrepareScript;
+      }
+
+      return false;
+    })();
+  }
+
+  fetchFromExternal() {
+    var _this3 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const hash = _this3.hash;
+      invariant(hash, 'Commit hash required');
+
+      const gitUrl = (_git || _load_git()).default.npmUrlToGitUrl(_this3.reference);
+      const git = new (_git || _load_git()).default(_this3.config, gitUrl, hash);
+      yield git.init();
+
+      if (yield _this3.hasPrepareScript(git)) {
+        yield _this3.fetchFromInstallAndPack(git);
+      } else {
+        yield _this3.fetchFromGitArchive(git);
+      }
+
+      return {
+        hash
+      };
+    })();
+  }
+
+  fetchFromInstallAndPack(git) {
+    var _this4 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const prepareDirectory = _this4.config.getTemp(`${(_crypto || _load_crypto()).hash(git.gitUrl.repository)}.${git.hash}.prepare`);
+      yield (_fs || _load_fs()).unlink(prepareDirectory);
+
+      yield git.clone(prepareDirectory);
+
+      var _ref = yield Promise.all([(_config || _load_config()).default.create({
+        binLinks: true,
+        cwd: prepareDirectory,
+        disablePrepublish: true,
+        production: false
+      }, _this4.reporter), (_lockfile || _load_lockfile()).default.fromDirectory(prepareDirectory, _this4.reporter)]);
+
+      const prepareConfig = _ref[0],
+            prepareLockFile = _ref[1];
+
+      yield (0, (_install || _load_install()).install)(prepareConfig, _this4.reporter, {}, prepareLockFile);
+
+      const tarballMirrorPath = _this4.getTarballMirrorPath();
+      const tarballCachePath = _this4.getTarballCachePath();
+
+      if (tarballMirrorPath) {
+        yield _this4._packToTarball(prepareConfig, tarballMirrorPath);
+      }
+      if (tarballCachePath) {
+        yield _this4._packToTarball(prepareConfig, tarballCachePath);
+      }
+
+      yield _this4._packToDirectory(prepareConfig, _this4.dest);
+
+      yield (_fs || _load_fs()).unlink(prepareDirectory);
+    })();
+  }
+
+  _packToTarball(config, path) {
+    var _this5 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const tarballStream = yield _this5._createTarballStream(config);
+      yield new Promise(function (resolve, reject) {
+        const writeStream = fs.createWriteStream(path);
+        tarballStream.on('error', reject);
+        writeStream.on('error', reject);
+        writeStream.on('end', resolve);
+        writeStream.on('open', function () {
+          tarballStream.pipe(writeStream);
+        });
+        writeStream.once('finish', resolve);
+      });
+    })();
+  }
+
+  _packToDirectory(config, dest) {
+    var _this6 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const tarballStream = yield _this6._createTarballStream(config);
+      yield new Promise(function (resolve, reject) {
+        const untarStream = _this6._createUntarStream(dest);
+        tarballStream.on('error', reject);
+        untarStream.on('error', reject);
+        untarStream.on('end', resolve);
+        untarStream.once('finish', resolve);
+        tarballStream.pipe(untarStream);
+      });
+    })();
+  }
+
+  _createTarballStream(config) {
+    let savedPackedHeader = false;
+    return (0, (_pack || _load_pack()).packTarball)(config, {
+      mapHeader(header) {
+        if (!savedPackedHeader) {
+          savedPackedHeader = true;
+          header.pax = header.pax || {};
+          // add a custom data on the first header
+          // in order to distinguish a tar from "git archive" and a tar from "pack" command
+          header.pax.packed = PACKED_FLAG;
+        }
+        return header;
+      }
+    });
+  }
+
+  _createUntarStream(dest) {
+    const PREFIX = 'package/';
+    let isPackedTarball = undefined;
+    return tarFs.extract(dest, {
+      dmode: 0o555, // all dirs should be readable
+      fmode: 0o444, // all files should be readable
+      chown: false, // don't chown. just leave as it is
+      map: header => {
+        if (isPackedTarball === undefined) {
+          isPackedTarball = header.pax && header.pax.packed === PACKED_FLAG;
+        }
+        if (isPackedTarball) {
+          header.name = header.name.substr(PREFIX.length);
+        }
+      }
+    });
+  }
+
+  fetchFromGitArchive(git) {
+    var _this7 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      yield git.clone(_this7.dest);
+      const tarballMirrorPath = _this7.getTarballMirrorPath();
+      const tarballCachePath = _this7.getTarballCachePath();
+
+      if (tarballMirrorPath) {
+        yield git.archive(tarballMirrorPath);
+      }
+
+      if (tarballCachePath) {
+        yield git.archive(tarballCachePath);
+      }
+    })();
+  }
+
+  _fetch() {
+    return this.fetchFromLocal().catch(err => this.fetchFromExternal());
+  }
+}
+exports.default = GitFetcher;
+
+/***/ }),
+/* 552 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.workspace = exports.tarball = exports.git = exports.copy = exports.base = undefined;
+
+var _baseFetcher;
+
+function _load_baseFetcher() {
+  return _baseFetcher = _interopRequireDefault(__webpack_require__(167));
+}
+
+var _copyFetcher;
+
+function _load_copyFetcher() {
+  return _copyFetcher = _interopRequireDefault(__webpack_require__(550));
+}
+
+var _gitFetcher;
+
+function _load_gitFetcher() {
+  return _gitFetcher = _interopRequireDefault(__webpack_require__(551));
+}
+
+var _tarballFetcher;
+
+function _load_tarballFetcher() {
+  return _tarballFetcher = _interopRequireDefault(__webpack_require__(364));
+}
+
+var _workspaceFetcher;
+
+function _load_workspaceFetcher() {
+  return _workspaceFetcher = _interopRequireDefault(__webpack_require__(553));
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+exports.base = (_baseFetcher || _load_baseFetcher()).default;
+exports.copy = (_copyFetcher || _load_copyFetcher()).default;
+exports.git = (_gitFetcher || _load_gitFetcher()).default;
+exports.tarball = (_tarballFetcher || _load_tarballFetcher()).default;
+exports.workspace = (_workspaceFetcher || _load_workspaceFetcher()).default;
+
+/***/ }),
+/* 553 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _extends2;
+
+function _load_extends() {
+  return _extends2 = _interopRequireDefault(__webpack_require__(21));
+}
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+var _packageFetcher;
+
+function _load_packageFetcher() {
+  return _packageFetcher = __webpack_require__(210);
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+class WorkspaceFetcher {
+  constructor(dest, remote, config) {
+    this.config = config;
+    this.dest = dest;
+    this.registry = remote.registry;
+    this.workspaceDir = remote.reference;
+    this.registryRemote = remote.registryRemote;
+  }
+
+  setupMirrorFromCache() {
+    return Promise.resolve();
+  }
+
+  fetch() {
+    var _this = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const pkg = yield _this.config.readManifest(_this.workspaceDir, _this.registry);
+
+      if (_this.registryRemote) {
+        yield _this.fetchRemoteWorkspace(_this.registryRemote, pkg);
+      }
+
+      return {
+        resolved: null,
+        hash: '',
+        cached: false,
+        dest: _this.dest,
+        package: (0, (_extends2 || _load_extends()).default)({}, pkg, {
+          _uid: pkg.version
+        })
+      };
+    })();
+  }
+
+  fetchRemoteWorkspace(remote, manifest) {
+    return (0, (_packageFetcher || _load_packageFetcher()).fetchOneRemote)(remote, manifest.name, manifest.version, this.dest, this.config);
+  }
+}
+exports.default = WorkspaceFetcher;
+
+/***/ }),
+/* 554 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.buildTree = undefined;
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+let buildTree = exports.buildTree = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (resolver, linker, patterns, ignoreHoisted) {
+    const treesByKey = {};
+    const trees = [];
+    const flatTree = yield linker.getFlatHoistedTree(patterns);
+
+    // If using workspaces, filter out the virtual manifest
+    const workspaceLayout = resolver.workspaceLayout;
+
+    const hoisted = workspaceLayout && workspaceLayout.virtualManifestName ? flatTree.filter(function ([key]) {
+      return key.indexOf(workspaceLayout.virtualManifestName) === -1;
+    }) : flatTree;
+
+    const hoistedByKey = {};
+    for (var _iterator = hoisted, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+      var _ref3;
+
+      if (_isArray) {
+        if (_i >= _iterator.length) break;
+        _ref3 = _iterator[_i++];
+      } else {
+        _i = _iterator.next();
+        if (_i.done) break;
+        _ref3 = _i.value;
+      }
+
+      const _ref2 = _ref3;
+      const key = _ref2[0];
+      const info = _ref2[1];
+
+      hoistedByKey[key] = info;
+    }
+
+    // build initial trees
+    for (var _iterator2 = hoisted, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+      var _ref5;
+
+      if (_isArray2) {
+        if (_i2 >= _iterator2.length) break;
+        _ref5 = _iterator2[_i2++];
+      } else {
+        _i2 = _iterator2.next();
+        if (_i2.done) break;
+        _ref5 = _i2.value;
+      }
+
+      const _ref4 = _ref5;
+      const info = _ref4[1];
+
+      const ref = info.pkg._reference;
+      // const parent = getParent(info.key, treesByKey);
+      const children = [];
+      // let depth = 0;
+      invariant(ref, 'expected reference');
+
+      // check parent to obtain next depth
+      // if (parent && parent.depth > 0) {
+      //   depth = parent.depth + 1;
+      // } else {
+      //   depth = 0;
+      // }
+
+      treesByKey[info.key] = {
+        name: info.pkg.name,
+        version: info.pkg.version,
+        children,
+        manifest: info
+      };
+    }
+
+    // add children
+    for (var _iterator3 = hoisted, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
+      var _ref7;
+
+      if (_isArray3) {
+        if (_i3 >= _iterator3.length) break;
+        _ref7 = _iterator3[_i3++];
+      } else {
+        _i3 = _iterator3.next();
+        if (_i3.done) break;
+        _ref7 = _i3.value;
+      }
+
+      const _ref6 = _ref7;
+      const info = _ref6[1];
+
+      const tree = treesByKey[info.key];
+      const parent = getParent(info.key, treesByKey);
+      if (!tree) {
+        continue;
+      }
+
+      if (info.key.split('#').length === 1) {
+        trees.push(tree);
+        continue;
+      }
+
+      if (parent) {
+        parent.children.push(tree);
+      }
+    }
+
+    return trees;
+  });
+
+  return function buildTree(_x, _x2, _x3, _x4) {
+    return _ref.apply(this, arguments);
+  };
+})();
+
+exports.getParent = getParent;
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const invariant = __webpack_require__(9);
+
+function getParent(key, treesByKey) {
+  const parentKey = key.slice(0, key.lastIndexOf('#'));
+  return treesByKey[parentKey];
+}
+
+/***/ }),
+/* 555 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+const semver = __webpack_require__(22);
+
+// This isn't really a "proper" constraint resolver. We just return the highest semver
+// version in the versions passed that satisfies the input range. This vastly reduces
+// the complexity and is very efficient for package resolution.
+
+class PackageConstraintResolver {
+  constructor(config, reporter) {
+    this.reporter = reporter;
+    this.config = config;
+  }
+
+  reduce(versions, range) {
+    if (range === 'latest') {
+      // Usually versions are already ordered and the last one is the latest
+      return Promise.resolve(versions[versions.length - 1]);
+    } else {
+      return Promise.resolve(semver.maxSatisfying(versions, range, this.config.looseSemver));
+    }
+  }
+}
+exports.default = PackageConstraintResolver;
+
+/***/ }),
+/* 556 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.NohoistResolver = exports.HoistManifest = undefined;
+
+var _extends2;
+
+function _load_extends() {
+  return _extends2 = _interopRequireDefault(__webpack_require__(21));
+}
+
+var _config;
+
+function _load_config() {
+  return _config = _interopRequireDefault(__webpack_require__(162));
+}
+
+var _misc;
+
+function _load_misc() {
+  return _misc = __webpack_require__(18);
+}
+
+var _micromatch;
+
+function _load_micromatch() {
+  return _micromatch = _interopRequireDefault(__webpack_require__(114));
+}
+
+var _workspaceLayout2;
+
+function _load_workspaceLayout() {
+  return _workspaceLayout2 = _interopRequireDefault(__webpack_require__(90));
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const invariant = __webpack_require__(9);
+
+const path = __webpack_require__(0);
+
+let historyCounter = 0;
+
+const LINK_TYPES = new Set(['workspace', 'link']);
+class HoistManifest {
+  constructor(key, parts, pkg, loc, isDirectRequire, isRequired, isIncompatible) {
+    this.isDirectRequire = isDirectRequire;
+    this.isRequired = isRequired;
+    this.isIncompatible = isIncompatible;
+
+    this.loc = loc;
+    this.pkg = pkg;
+    this.key = key;
+    this.parts = parts;
+    this.originalKey = key;
+    this.previousPaths = [];
+
+    this.history = [];
+    this.addHistory(`Start position = ${key}`);
+
+    this.isNohoist = false;
+    this.originalParentPath = '';
+
+    this.shallowPaths = [];
+    this.isShallow = false;
+  }
+
+  //focus
+
+
+  // nohoist info
+
+
+  addHistory(msg) {
+    this.history.push(`${++historyCounter}: ${msg}`);
+  }
+}
+
+exports.HoistManifest = HoistManifest;
+class PackageHoister {
+  constructor(config, resolver, { ignoreOptional, workspaceLayout } = {}) {
+    this.resolver = resolver;
+    this.config = config;
+
+    this.ignoreOptional = ignoreOptional;
+
+    this.taintedKeys = new Map();
+    this.levelQueue = [];
+    this.tree = new Map();
+
+    this.workspaceLayout = workspaceLayout;
+
+    this.nohoistResolver = new NohoistResolver(config, resolver);
+  }
+
+  /**
+   * Taint this key and prevent any modules from being hoisted to it.
+   */
+
+  taintKey(key, info) {
+    const existingTaint = this.taintedKeys.get(key);
+    if (existingTaint && existingTaint.loc !== info.loc) {
+      return false;
+    } else {
+      this.taintedKeys.set(key, info);
+      return true;
+    }
+  }
+
+  /**
+   * Implode an array of ancestry parts into a key.
+   */
+
+  implodeKey(parts) {
+    return parts.join('#');
+  }
+
+  /**
+   * Seed the hoister with patterns taken from the included resolver.
+   */
+
+  seed(patterns) {
+    this.prepass(patterns);
+
+    for (var _iterator = this.resolver.dedupePatterns(patterns), _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+      var _ref;
+
+      if (_isArray) {
+        if (_i >= _iterator.length) break;
+        _ref = _iterator[_i++];
+      } else {
+        _i = _iterator.next();
+        if (_i.done) break;
+        _ref = _i.value;
+      }
+
+      const pattern = _ref;
+
+      this._seed(pattern, { isDirectRequire: true });
+    }
+
+    while (true) {
+      let queue = this.levelQueue;
+      if (!queue.length) {
+        this._propagateRequired();
+        return;
+      }
+
+      this.levelQueue = [];
+
+      // sort queue to get determinism between runs
+      queue = queue.sort(([aPattern], [bPattern]) => {
+        return (0, (_misc || _load_misc()).sortAlpha)(aPattern, bPattern);
+      });
+
+      // sort the queue again to hoist packages without peer dependencies first
+      let sortedQueue = [];
+      const availableSet = new Set();
+
+      let hasChanged = true;
+      while (queue.length > 0 && hasChanged) {
+        hasChanged = false;
+
+        const queueCopy = queue;
+        queue = [];
+        for (let t = 0; t < queueCopy.length; ++t) {
+          const queueItem = queueCopy[t];
+          const pattern = queueItem[0];
+          const pkg = this.resolver.getStrictResolvedPattern(pattern);
+
+          const peerDependencies = Object.keys(pkg.peerDependencies || {});
+          const areDependenciesFulfilled = peerDependencies.every(peerDependency => availableSet.has(peerDependency));
+
+          if (areDependenciesFulfilled) {
+            // Move the package inside our sorted queue
+            sortedQueue.push(queueItem);
+
+            // Add it to our set, so that we know it is available
+            availableSet.add(pattern);
+
+            // Schedule a next pass, in case other packages had peer dependencies on this one
+            hasChanged = true;
+          } else {
+            queue.push(queueItem);
+          }
+        }
+      }
+
+      // We might end up with some packages left in the queue, that have not been sorted. We reach this codepath if two
+      // packages have a cyclic dependency, or if the peer dependency is provided by a parent package. In these case,
+      // nothing we can do, so we just add all of these packages to the end of the sorted queue.
+      sortedQueue = sortedQueue.concat(queue);
+
+      for (var _iterator2 = sortedQueue, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+        var _ref3;
+
+        if (_isArray2) {
+          if (_i2 >= _iterator2.length) break;
+          _ref3 = _iterator2[_i2++];
+        } else {
+          _i2 = _iterator2.next();
+          if (_i2.done) break;
+          _ref3 = _i2.value;
+        }
+
+        const _ref2 = _ref3;
+        const pattern = _ref2[0];
+        const parent = _ref2[1];
+
+        const info = this._seed(pattern, { isDirectRequire: false, parent });
+        if (info) {
+          this.hoist(info);
+        }
+      }
+    }
+  }
+
+  /**
+   * Seed the hoister with a specific pattern.
+   */
+
+  _seed(pattern, { isDirectRequire, parent }) {
+    //
+    const pkg = this.resolver.getStrictResolvedPattern(pattern);
+    const ref = pkg._reference;
+    invariant(ref, 'expected reference');
+
+    //
+    let parentParts = [];
+
+    const isIncompatible = ref.incompatible;
+    const isMarkedAsOptional = ref.optional && this.ignoreOptional;
+
+    let isRequired = isDirectRequire && !ref.ignore && !isIncompatible && !isMarkedAsOptional;
+
+    if (parent) {
+      if (!this.tree.get(parent.key)) {
+        return null;
+      }
+      // non ignored dependencies inherit parent's ignored status
+      // parent may transition from ignored to non ignored when hoisted if it is used in another non ignored branch
+      if (!isDirectRequire && !isIncompatible && parent.isRequired && !isMarkedAsOptional) {
+        isRequired = true;
+      }
+      parentParts = parent.parts;
+    }
+
+    //
+    const loc = this.config.generateModuleCachePath(ref);
+    const parts = parentParts.concat(pkg.name);
+    const key = this.implodeKey(parts);
+    const info = new HoistManifest(key, parts, pkg, loc, isDirectRequire, isRequired, isIncompatible);
+
+    this.nohoistResolver.initNohoist(info, parent);
+
+    this.tree.set(key, info);
+    this.taintKey(key, info);
+
+    //
+    const pushed = new Set();
+    for (var _iterator3 = ref.dependencies, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
+      var _ref4;
+
+      if (_isArray3) {
+        if (_i3 >= _iterator3.length) break;
+        _ref4 = _iterator3[_i3++];
+      } else {
+        _i3 = _iterator3.next();
+        if (_i3.done) break;
+        _ref4 = _i3.value;
+      }
+
+      const depPattern = _ref4;
+
+      if (!pushed.has(depPattern)) {
+        this.levelQueue.push([depPattern, info]);
+        pushed.add(depPattern);
+      }
+    }
+
+    return info;
+  }
+
+  /**
+   * Propagate inherited ignore statuses from non-ignored to ignored packages
+   */
+
+  _propagateRequired() {
+    //
+    const toVisit = [];
+
+    // enumerate all non-ignored packages
+    for (var _iterator4 = this.tree.entries(), _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
+      var _ref5;
+
+      if (_isArray4) {
+        if (_i4 >= _iterator4.length) break;
+        _ref5 = _iterator4[_i4++];
+      } else {
+        _i4 = _iterator4.next();
+        if (_i4.done) break;
+        _ref5 = _i4.value;
+      }
+
+      const entry = _ref5;
+
+      if (entry[1].isRequired) {
+        toVisit.push(entry[1]);
+      }
+    }
+
+    // visit them
+    while (toVisit.length) {
+      const info = toVisit.shift();
+      const ref = info.pkg._reference;
+      invariant(ref, 'expected reference');
+
+      for (var _iterator5 = ref.dependencies, _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
+        var _ref6;
+
+        if (_isArray5) {
+          if (_i5 >= _iterator5.length) break;
+          _ref6 = _iterator5[_i5++];
+        } else {
+          _i5 = _iterator5.next();
+          if (_i5.done) break;
+          _ref6 = _i5.value;
+        }
+
+        const depPattern = _ref6;
+
+        const depinfo = this._lookupDependency(info, depPattern);
+
+        if (!depinfo) {
+          continue;
+        }
+
+        const depRef = depinfo.pkg._reference;
+
+        // If it's marked as optional, but the parent is required and the
+        // dependency was not listed in `optionalDependencies`, then we mark the
+        // dependency as required.
+        const isMarkedAsOptional = depRef && depRef.optional && this.ignoreOptional && !(info.isRequired && depRef.hint !== 'optional');
+
+        if (!depinfo.isRequired && !depinfo.isIncompatible && !isMarkedAsOptional) {
+          depinfo.isRequired = true;
+          depinfo.addHistory(`Mark as non-ignored because of usage by ${info.key}`);
+          toVisit.push(depinfo);
+        }
+      }
+    }
+  }
+
+  /**
+   * Looks up the package a dependency resolves to
+   */
+
+  _lookupDependency(info, depPattern) {
+    //
+    const pkg = this.resolver.getStrictResolvedPattern(depPattern);
+    const ref = pkg._reference;
+    invariant(ref, 'expected reference');
+
+    //
+    for (let i = info.parts.length; i >= 0; i--) {
+      const checkParts = info.parts.slice(0, i).concat(pkg.name);
+      const checkKey = this.implodeKey(checkParts);
+      const existing = this.tree.get(checkKey);
+      if (existing) {
+        return existing;
+      }
+    }
+
+    return null;
+  }
+
+  /**
+   * Find the highest position we can hoist this module to.
+   */
+
+  getNewParts(key, info, parts) {
+    let stepUp = false;
+
+    const highestHoistingPoint = this.nohoistResolver.highestHoistingPoint(info) || 0;
+    const fullKey = this.implodeKey(parts);
+    const stack = []; // stack of removed parts
+    const name = parts.pop();
+
+    if (info.isNohoist) {
+      info.addHistory(`Marked as nohoist, will not be hoisted above '${parts[highestHoistingPoint]}'`);
+    }
+
+    for (let i = parts.length - 1; i >= highestHoistingPoint; i--) {
+      const checkParts = parts.slice(0, i).concat(name);
+      const checkKey = this.implodeKey(checkParts);
+      info.addHistory(`Looked at ${checkKey} for a match`);
+
+      const existing = this.tree.get(checkKey);
+
+      if (existing) {
+        if (existing.loc === info.loc) {
+          // switch to non ignored if earlier deduped version was ignored (must be compatible)
+          if (!existing.isRequired && info.isRequired) {
+            existing.addHistory(`Deduped ${fullKey} to this item, marking as required`);
+            existing.isRequired = true;
+          } else {
+            existing.addHistory(`Deduped ${fullKey} to this item`);
+          }
+
+          return { parts: checkParts, duplicate: true };
+        } else {
+          // everything above will be shadowed and this is a conflict
+          info.addHistory(`Found a collision at ${checkKey}`);
+          break;
+        }
+      }
+
+      const existingTaint = this.taintedKeys.get(checkKey);
+      if (existingTaint && existingTaint.loc !== info.loc) {
+        info.addHistory(`Broken by ${checkKey}`);
+        break;
+      }
+    }
+
+    const peerDependencies = Object.keys(info.pkg.peerDependencies || {});
+
+    // remove redundant parts that wont collide
+    hoistLoop: while (parts.length > highestHoistingPoint) {
+      // we must not hoist a package higher than its peer dependencies
+      for (var _iterator6 = peerDependencies, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) {
+        var _ref7;
+
+        if (_isArray6) {
+          if (_i6 >= _iterator6.length) break;
+          _ref7 = _iterator6[_i6++];
+        } else {
+          _i6 = _iterator6.next();
+          if (_i6.done) break;
+          _ref7 = _i6.value;
+        }
+
+        const peerDependency = _ref7;
+
+        const checkParts = parts.concat(peerDependency);
+        const checkKey = this.implodeKey(checkParts);
+        info.addHistory(`Looked at ${checkKey} for a peer dependency match`);
+
+        const existing = this.tree.get(checkKey);
+
+        if (existing) {
+          info.addHistory(`Found a peer dependency requirement at ${checkKey}`);
+          break hoistLoop;
+        }
+      }
+
+      const checkParts = parts.concat(name);
+      const checkKey = this.implodeKey(checkParts);
+
+      //
+      const existing = this.tree.get(checkKey);
+      if (existing) {
+        stepUp = true;
+        break;
+      }
+
+      // check if we're trying to hoist ourselves to a previously unflattened module key,
+      // this will result in a conflict and we'll need to move ourselves up
+      if (key !== checkKey && this.taintedKeys.has(checkKey)) {
+        stepUp = true;
+        break;
+      }
+
+      //
+      stack.push(parts.pop());
+    }
+
+    //
+    parts.push(name);
+
+    //
+    const isValidPosition = parts => {
+      // nohoist package can't be hoisted to the "root"
+      if (parts.length <= highestHoistingPoint) {
+        return false;
+      }
+      const key = this.implodeKey(parts);
+      const existing = this.tree.get(key);
+      if (existing && existing.loc === info.loc) {
+        return true;
+      }
+
+      // ensure there's no taint or the taint is us
+      const existingTaint = this.taintedKeys.get(key);
+      if (existingTaint && existingTaint.loc !== info.loc) {
+        return false;
+      }
+
+      return true;
+    };
+
+    // we need to special case when we attempt to hoist to the top level as the `existing` logic
+    // wont be hit in the above `while` loop and we could conflict
+    if (!isValidPosition(parts)) {
+      stepUp = true;
+    }
+
+    // sometimes we need to step up to a parent module to install ourselves
+    while (stepUp && stack.length) {
+      info.addHistory(`Stepping up from ${this.implodeKey(parts)}`);
+
+      parts.pop(); // remove `name`
+      parts.push(stack.pop(), name);
+
+      if (isValidPosition(parts)) {
+        info.addHistory(`Found valid position ${this.implodeKey(parts)}`);
+        stepUp = false;
+      }
+    }
+
+    return { parts, duplicate: false };
+  }
+
+  /**
+   * Hoist all seeded patterns to their highest positions.
+   */
+
+  hoist(info) {
+    const oldKey = info.key,
+          rawParts = info.parts;
+
+    // remove this item from the `tree` map so we can ignore it
+
+    this.tree.delete(oldKey);
+
+    var _getNewParts = this.getNewParts(oldKey, info, rawParts.slice());
+
+    const parts = _getNewParts.parts,
+          duplicate = _getNewParts.duplicate;
+
+
+    const newKey = this.implodeKey(parts);
+    if (duplicate) {
+      info.addHistory(`Satisfied from above by ${newKey}`);
+      this.declareRename(info, rawParts, parts);
+      this.updateHoistHistory(this.nohoistResolver._originalPath(info), this.implodeKey(parts));
+      return;
+    }
+
+    // update to the new key
+    if (oldKey === newKey) {
+      info.addHistory(`Didn't hoist - see reason above`);
+      this.setKey(info, oldKey, rawParts);
+      return;
+    }
+
+    //
+    this.declareRename(info, rawParts, parts);
+    this.setKey(info, newKey, parts);
+  }
+
+  /**
+   * Declare that a module has been hoisted and update our internal references.
+   */
+
+  declareRename(info, oldParts, newParts) {
+    // go down the tree from our new position reserving our name
+    this.taintParents(info, oldParts.slice(0, -1), newParts.length - 1);
+  }
+
+  /**
+   * Crawl upwards through a list of ancestry parts and taint a package name.
+   */
+
+  taintParents(info, processParts, start) {
+    for (let i = start; i < processParts.length; i++) {
+      const parts = processParts.slice(0, i).concat(info.pkg.name);
+      const key = this.implodeKey(parts);
+
+      if (this.taintKey(key, info)) {
+        info.addHistory(`Tainted ${key} to prevent collisions`);
+      }
+    }
+  }
+
+  updateHoistHistory(fromPath, toKey) {
+    const info = this.tree.get(toKey);
+    invariant(info, `expect to find hoist-to ${toKey}`);
+    info.previousPaths.push(fromPath);
+  }
+
+  /**
+   * Update the key of a module and update our references.
+   */
+
+  setKey(info, newKey, parts) {
+    const oldKey = info.key;
+
+    info.key = newKey;
+    info.parts = parts;
+    this.tree.set(newKey, info);
+
+    if (oldKey === newKey) {
+      return;
+    }
+
+    const fromInfo = this.tree.get(newKey);
+    invariant(fromInfo, `expect to find hoist-from ${newKey}`);
+    info.previousPaths.push(this.nohoistResolver._originalPath(fromInfo));
+    info.addHistory(`New position = ${newKey}`);
+  }
+
+  /**
+   * Perform a prepass and if there's multiple versions of the same package, hoist the one with
+   * the most dependents to the top.
+   */
+
+  prepass(patterns) {
+    patterns = this.resolver.dedupePatterns(patterns).sort();
+
+    const visited = new Map();
+
+    const occurences = {};
+
+    // visitor to be used inside add() to mark occurences of packages
+    const visitAdd = (pkg, ancestry, pattern) => {
+      const versions = occurences[pkg.name] = occurences[pkg.name] || {};
+      const version = versions[pkg.version] = versions[pkg.version] || {
+        occurences: new Set(),
+        pattern
+      };
+
+      if (ancestry.length) {
+        version.occurences.add(ancestry[ancestry.length - 1]);
+      }
+    };
+
+    // add an occurring package to the above data structure
+    const add = (pattern, ancestry, ancestryPatterns) => {
+      const pkg = this.resolver.getStrictResolvedPattern(pattern);
+      if (ancestry.indexOf(pkg) >= 0) {
+        // prevent recursive dependencies
+        return;
+      }
+
+      let visitedPattern = visited.get(pattern);
+
+      if (visitedPattern) {
+        // if a package has been visited before, simply increment occurrences of packages
+        // like last time this package was visited
+        visitedPattern.forEach(visitPkg => {
+          visitAdd(visitPkg.pkg, visitPkg.ancestry, visitPkg.pattern);
+        });
+
+        visitAdd(pkg, ancestry, pattern);
+
+        return;
+      }
+
+      const ref = pkg._reference;
+      invariant(ref, 'expected reference');
+
+      visitAdd(pkg, ancestry, pattern);
+
+      for (var _iterator7 = ref.dependencies, _isArray7 = Array.isArray(_iterator7), _i7 = 0, _iterator7 = _isArray7 ? _iterator7 : _iterator7[Symbol.iterator]();;) {
+        var _ref8;
+
+        if (_isArray7) {
+          if (_i7 >= _iterator7.length) break;
+          _ref8 = _iterator7[_i7++];
+        } else {
+          _i7 = _iterator7.next();
+          if (_i7.done) break;
+          _ref8 = _i7.value;
+        }
+
+        const depPattern = _ref8;
+
+        const depAncestry = ancestry.concat(pkg);
+        const depAncestryPatterns = ancestryPatterns.concat(depPattern);
+        add(depPattern, depAncestry, depAncestryPatterns);
+      }
+
+      visitedPattern = visited.get(pattern) || [];
+      visited.set(pattern, visitedPattern);
+      visitedPattern.push({ pkg, ancestry, pattern });
+
+      ancestryPatterns.forEach(ancestryPattern => {
+        const visitedAncestryPattern = visited.get(ancestryPattern);
+        if (visitedAncestryPattern) {
+          visitedAncestryPattern.push({ pkg, ancestry, pattern });
+        }
+      });
+    };
+
+    // get a list of root package names since we can't hoist other dependencies to these spots!
+    const rootPackageNames = new Set();
+    for (var _iterator8 = patterns, _isArray8 = Array.isArray(_iterator8), _i8 = 0, _iterator8 = _isArray8 ? _iterator8 : _iterator8[Symbol.iterator]();;) {
+      var _ref9;
+
+      if (_isArray8) {
+        if (_i8 >= _iterator8.length) break;
+        _ref9 = _iterator8[_i8++];
+      } else {
+        _i8 = _iterator8.next();
+        if (_i8.done) break;
+        _ref9 = _i8.value;
+      }
+
+      const pattern = _ref9;
+
+      const pkg = this.resolver.getStrictResolvedPattern(pattern);
+      rootPackageNames.add(pkg.name);
+      add(pattern, [], []);
+    }
+
+    for (var _iterator9 = Object.keys(occurences).sort(), _isArray9 = Array.isArray(_iterator9), _i9 = 0, _iterator9 = _isArray9 ? _iterator9 : _iterator9[Symbol.iterator]();;) {
+      var _ref10;
+
+      if (_isArray9) {
+        if (_i9 >= _iterator9.length) break;
+        _ref10 = _iterator9[_i9++];
+      } else {
+        _i9 = _iterator9.next();
+        if (_i9.done) break;
+        _ref10 = _i9.value;
+      }
+
+      const packageName = _ref10;
+
+      const versionOccurences = occurences[packageName];
+      const versions = Object.keys(versionOccurences);
+
+      if (versions.length === 1) {
+        // only one package type so we'll hoist this to the top anyway
+        continue;
+      }
+
+      if (this.tree.get(packageName)) {
+        // a transitive dependency of a previously hoisted dependency exists
+        continue;
+      }
+
+      if (rootPackageNames.has(packageName)) {
+        // can't replace top level packages
+        continue;
+      }
+
+      let mostOccurenceCount;
+      let mostOccurencePattern;
+      for (var _iterator10 = Object.keys(versionOccurences).sort(), _isArray10 = Array.isArray(_iterator10), _i10 = 0, _iterator10 = _isArray10 ? _iterator10 : _iterator10[Symbol.iterator]();;) {
+        var _ref11;
+
+        if (_isArray10) {
+          if (_i10 >= _iterator10.length) break;
+          _ref11 = _iterator10[_i10++];
+        } else {
+          _i10 = _iterator10.next();
+          if (_i10.done) break;
+          _ref11 = _i10.value;
+        }
+
+        const version = _ref11;
+        var _versionOccurences$ve = versionOccurences[version];
+        const occurences = _versionOccurences$ve.occurences,
+              pattern = _versionOccurences$ve.pattern;
+
+        const occurenceCount = occurences.size;
+
+        if (!mostOccurenceCount || occurenceCount > mostOccurenceCount) {
+          mostOccurenceCount = occurenceCount;
+          mostOccurencePattern = pattern;
+        }
+      }
+      invariant(mostOccurencePattern, 'expected most occurring pattern');
+      invariant(mostOccurenceCount, 'expected most occurring count');
+
+      // only hoist this module if it occured more than once
+      if (mostOccurenceCount > 1) {
+        this._seed(mostOccurencePattern, { isDirectRequire: false });
+      }
+    }
+  }
+
+  markShallowWorkspaceEntries() {
+    const targetWorkspace = this.config.focusedWorkspaceName;
+    const targetHoistManifest = this.tree.get(targetWorkspace);
+    invariant(targetHoistManifest, `targetHoistManifest from ${targetWorkspace} missing`);
+
+    //dedupe with a set
+    const dependentWorkspaces = Array.from(new Set(this._getDependentWorkspaces(targetHoistManifest)));
+
+    const entries = Array.from(this.tree);
+    entries.forEach(([key, info]) => {
+      const splitPath = key.split('#');
+
+      //mark the workspace and any un-hoisted dependencies it has for shallow installation
+      const isShallowDependency = dependentWorkspaces.some(w => {
+        if (splitPath[0] !== w) {
+          //entry is not related to the workspace
+          return false;
+        }
+        if (!splitPath[1]) {
+          //entry is the workspace
+          return true;
+        }
+        //don't bother marking dev dependencies or nohoist packages for shallow installation
+        const treeEntry = this.tree.get(w);
+        invariant(treeEntry, 'treeEntry is not defined for ' + w);
+        const pkg = treeEntry.pkg;
+        return !info.isNohoist && (!pkg.devDependencies || !(splitPath[1] in pkg.devDependencies));
+      });
+
+      if (isShallowDependency) {
+        info.shallowPaths = [null];
+        return;
+      }
+
+      //if package foo is at TARGET_WORKSPACE/node_modules/foo, the hoisted version of foo
+      //should be installed under each shallow workspace that uses it
+      //(unless that workspace has its own version of foo, in which case that should be installed)
+      if (splitPath.length !== 2 || splitPath[0] !== targetWorkspace) {
+        return;
+      }
+      const unhoistedDependency = splitPath[1];
+      const unhoistedInfo = this.tree.get(unhoistedDependency);
+      if (!unhoistedInfo) {
+        return;
+      }
+      dependentWorkspaces.forEach(w => {
+        if (this._packageDependsOnHoistedPackage(w, unhoistedDependency, false)) {
+          unhoistedInfo.shallowPaths.push(w);
+        }
+      });
+    });
+  }
+
+  _getDependentWorkspaces(parent, allowDevDeps = true, alreadySeen = new Set()) {
+    const parentName = parent.pkg.name;
+    if (alreadySeen.has(parentName)) {
+      return [];
+    }
+
+    alreadySeen.add(parentName);
+    invariant(this.workspaceLayout, 'missing workspaceLayout');
+    var _workspaceLayout = this.workspaceLayout;
+    const virtualManifestName = _workspaceLayout.virtualManifestName,
+          workspaces = _workspaceLayout.workspaces;
+
+
+    const directDependencies = [];
+    const ignored = [];
+    Object.keys(workspaces).forEach(workspace => {
+      if (alreadySeen.has(workspace) || workspace === virtualManifestName) {
+        return;
+      }
+
+      //skip a workspace if a different version of it is already being installed under the parent workspace
+      let info = this.tree.get(`${parentName}#${workspace}`);
+      if (info) {
+        const workspaceVersion = workspaces[workspace].manifest.version;
+        if (info.isNohoist && info.originalParentPath.startsWith(`/${WS_ROOT_ALIAS}/${parentName}`) && info.pkg.version === workspaceVersion) {
+          //nohoist installations are exceptions
+          directDependencies.push(info.key);
+        } else {
+          ignored.push(workspace);
+        }
+        return;
+      }
+
+      const searchPath = `/${WS_ROOT_ALIAS}/${parentName}`;
+      info = this.tree.get(workspace);
+      invariant(info, 'missing workspace tree entry ' + workspace);
+      if (!info.previousPaths.some(p => p.startsWith(searchPath))) {
+        return;
+      }
+      if (allowDevDeps || !parent.pkg.devDependencies || !(workspace in parent.pkg.devDependencies)) {
+        directDependencies.push(workspace);
+      }
+    });
+
+    let nested = directDependencies.map(d => {
+      const dependencyEntry = this.tree.get(d);
+      invariant(dependencyEntry, 'missing dependencyEntry ' + d);
+      return this._getDependentWorkspaces(dependencyEntry, false, alreadySeen);
+    });
+    nested = [].concat.apply([], nested); //flatten
+
+    const directDependencyNames = directDependencies.map(d => d.split('#').slice(-1)[0]);
+
+    return directDependencyNames.concat(nested).filter(w => ignored.indexOf(w) === -1);
+  }
+
+  _packageDependsOnHoistedPackage(p, hoisted, checkDevDeps = true, checked = new Set()) {
+    //don't check the same package more than once, and ignore any package that has its own version of hoisted
+    if (checked.has(p) || this.tree.has(`${p}#${hoisted}`)) {
+      return false;
+    }
+    checked.add(p);
+    const info = this.tree.get(p);
+    if (!info) {
+      return false;
+    }
+
+    const pkg = info.pkg;
+    if (!pkg) {
+      return false;
+    }
+
+    let deps = [];
+    if (pkg.dependencies) {
+      deps = deps.concat(Object.keys(pkg.dependencies));
+    }
+    if (checkDevDeps && pkg.devDependencies) {
+      deps = deps.concat(Object.keys(pkg.devDependencies));
+    }
+
+    if (deps.indexOf(hoisted) !== -1) {
+      return true;
+    }
+    return deps.some(dep => this._packageDependsOnHoistedPackage(dep, hoisted, false, checked));
+  }
+
+  /**
+   * Produce a flattened list of module locations and manifests.
+   */
+
+  init() {
+    const flatTree = [];
+
+    //
+    for (var _iterator11 = this.tree.entries(), _isArray11 = Array.isArray(_iterator11), _i11 = 0, _iterator11 = _isArray11 ? _iterator11 : _iterator11[Symbol.iterator]();;) {
+      var _ref13;
+
+      if (_isArray11) {
+        if (_i11 >= _iterator11.length) break;
+        _ref13 = _iterator11[_i11++];
+      } else {
+        _i11 = _iterator11.next();
+        if (_i11.done) break;
+        _ref13 = _i11.value;
+      }
+
+      const _ref12 = _ref13;
+      const key = _ref12[0];
+      const info = _ref12[1];
+
+      // decompress the location and push it to the flat tree. this path could be made
+      const parts = [];
+      const keyParts = key.split('#');
+      for (let i = 0; i < keyParts.length; i++) {
+        const key = keyParts.slice(0, i + 1).join('#');
+        const hoisted = this.tree.get(key);
+        invariant(hoisted, `expected hoisted manifest for "${key}"`);
+        parts.push(this.config.getFolder(hoisted.pkg));
+        parts.push(keyParts[i]);
+      }
+
+      const shallowLocs = [];
+      if (this.config.modulesFolder) {
+        // remove the first part which will be the folder name and replace it with a
+        // hardcoded modules folder
+        parts.splice(0, 1, this.config.modulesFolder);
+      } else {
+        // first part will be the registry-specific module folder
+        parts.splice(0, 0, this.config.lockfileFolder);
+      }
+
+      info.shallowPaths.forEach(shallowPath => {
+        const shallowCopyParts = parts.slice();
+        shallowCopyParts[0] = this.config.cwd;
+        if (this.config.modulesFolder) {
+          //add back the module folder name for the shallow installation
+          const treeEntry = this.tree.get(keyParts[0]);
+          invariant(treeEntry, 'expected treeEntry for ' + keyParts[0]);
+          const moduleFolderName = this.config.getFolder(treeEntry.pkg);
+          shallowCopyParts.splice(1, 0, moduleFolderName);
+        }
+
+        if (shallowPath) {
+          const targetWorkspace = this.config.focusedWorkspaceName;
+          const treeEntry = this.tree.get(`${targetWorkspace}#${shallowPath}`) || this.tree.get(shallowPath);
+          invariant(treeEntry, 'expected treeEntry for ' + shallowPath);
+          const moduleFolderName = this.config.getFolder(treeEntry.pkg);
+          shallowCopyParts.splice(1, 0, moduleFolderName, shallowPath);
+        }
+        shallowLocs.push(path.join(...shallowCopyParts));
+      });
+
+      const loc = path.join(...parts);
+      flatTree.push([loc, info]);
+      shallowLocs.forEach(shallowLoc => {
+        const newManifest = (0, (_extends2 || _load_extends()).default)({}, info, { isShallow: true });
+        flatTree.push([shallowLoc, newManifest]);
+      });
+    }
+
+    // remove ignored modules from the tree
+    const visibleFlatTree = [];
+    for (var _iterator12 = flatTree, _isArray12 = Array.isArray(_iterator12), _i12 = 0, _iterator12 = _isArray12 ? _iterator12 : _iterator12[Symbol.iterator]();;) {
+      var _ref15;
+
+      if (_isArray12) {
+        if (_i12 >= _iterator12.length) break;
+        _ref15 = _iterator12[_i12++];
+      } else {
+        _i12 = _iterator12.next();
+        if (_i12.done) break;
+        _ref15 = _i12.value;
+      }
+
+      const _ref14 = _ref15;
+      const loc = _ref14[0];
+      const info = _ref14[1];
+
+      const ref = info.pkg._reference;
+      invariant(ref, 'expected reference');
+      if (!info.isRequired) {
+        info.addHistory('Deleted as this module was ignored');
+      } else {
+        visibleFlatTree.push([loc, info]);
+      }
+    }
+    return visibleFlatTree;
+  }
+}
+
+exports.default = PackageHoister;
+const WS_ROOT_ALIAS = '_project_';
+class NohoistResolver {
+  constructor(config, resolver) {
+    this.initNohoist = (info, parent) => {
+      let parentNohoistList;
+      let originalParentPath = info.originalParentPath;
+
+      if (parent) {
+        parentNohoistList = parent.nohoistList;
+        originalParentPath = this._originalPath(parent);
+      } else {
+        invariant(this._isTopPackage(info), `${info.key} doesn't have parent nor a top package`);
+        if (info.pkg.name !== this._wsRootPackageName) {
+          parentNohoistList = this._wsRootNohoistList;
+          originalParentPath = this._wsRootPackageName || '';
+        }
+      }
+
+      info.originalParentPath = originalParentPath;
+      let nohoistList = this._extractNohoistList(info.pkg, this._originalPath(info)) || [];
+      if (parentNohoistList) {
+        nohoistList = nohoistList.concat(parentNohoistList);
+      }
+      info.nohoistList = nohoistList.length > 0 ? nohoistList : null;
+      info.isNohoist = this._isNohoist(info);
+    };
+
+    this.highestHoistingPoint = info => {
+      return info.isNohoist && info.parts.length > 1 ? 1 : null;
+    };
+
+    this._isNohoist = info => {
+      if (this._isTopPackage(info)) {
+        return false;
+      }
+      if (info.nohoistList && info.nohoistList.length > 0 && (_micromatch || _load_micromatch()).default.any(this._originalPath(info), info.nohoistList)) {
+        return true;
+      }
+      if (this._config.plugnplayEnabled) {
+        return true;
+      }
+      return false;
+    };
+
+    this._isRootPackage = pkg => {
+      return pkg.name === this._wsRootPackageName;
+    };
+
+    this._originalPath = info => {
+      return this._makePath(info.originalParentPath, info.pkg.name);
+    };
+
+    this._isTopPackage = info => {
+      const parentParts = info.parts.slice(0, -1);
+      const result = !parentParts || parentParts.length <= 0 || parentParts.length === 1 && parentParts[0] === this._wsRootPackageName;
+      return result;
+    };
+
+    this._isLink = info => {
+      return info.pkg._remote != null && LINK_TYPES.has(info.pkg._remote.type);
+    };
+
+    this._extractNohoistList = (pkg, pathPrefix) => {
+      let nohoistList;
+      const ws = this._config.getWorkspaces(pkg);
+
+      if (ws && ws.nohoist) {
+        nohoistList = ws.nohoist.map(p => this._makePath(pathPrefix, p));
+      }
+      return nohoistList;
+    };
+
+    this._resolver = resolver;
+    this._config = config;
+    if (resolver.workspaceLayout) {
+      this._wsRootPackageName = resolver.workspaceLayout.virtualManifestName;
+
+      var _resolver$workspaceLa = resolver.workspaceLayout.getWorkspaceManifest(this._wsRootPackageName);
+
+      const manifest = _resolver$workspaceLa.manifest;
+
+      this._wsRootNohoistList = this._extractNohoistList(manifest, manifest.name);
+    }
+  }
+
+  /**
+   * examine the top level packages to find the root package
+   */
+
+
+  /**
+   * find the highest hoisting point for the given HoistManifest.
+   * algorithm: a nohoist package should never be hoisted beyond the top of its branch, i.e.
+   * the first element of its parts. Therefore the highest possible hoisting index is 1,
+   * unless the package has only 1 part (itself), in such case returns null just like any hoisted package
+   *
+   */
+
+  // private functions
+
+  _makePath(...args) {
+    const parts = args.map(s => s === this._wsRootPackageName ? WS_ROOT_ALIAS : s);
+    const result = parts.join('/');
+    return result[0] === '/' ? result : '/' + result;
+  }
+
+  // extract nohoist from package.json then prefix them with branch path
+  // so we can matched against the branch tree ("originalPath") later
+}
+
+exports.NohoistResolver = NohoistResolver;
+
+/***/ }),
+/* 557 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+var _config;
+
+function _load_config() {
+  return _config = _interopRequireDefault(__webpack_require__(162));
+}
+
+var _executeLifecycleScript;
+
+function _load_executeLifecycleScript() {
+  return _executeLifecycleScript = _interopRequireDefault(__webpack_require__(111));
+}
+
+var _crypto;
+
+function _load_crypto() {
+  return _crypto = _interopRequireWildcard(__webpack_require__(168));
+}
+
+var _fs;
+
+function _load_fs() {
+  return _fs = _interopRequireWildcard(__webpack_require__(4));
+}
+
+var _packageNameUtils;
+
+function _load_packageNameUtils() {
+  return _packageNameUtils = __webpack_require__(222);
+}
+
+var _pack;
+
+function _load_pack() {
+  return _pack = __webpack_require__(166);
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const fs = __webpack_require__(5);
+
+const invariant = __webpack_require__(9);
+const path = __webpack_require__(0);
+
+const INSTALL_STAGES = ['preinstall', 'install', 'postinstall'];
+
+class PackageInstallScripts {
+  constructor(config, resolver, force) {
+    this.installed = 0;
+    this.resolver = resolver;
+    this.reporter = config.reporter;
+    this.config = config;
+    this.force = force;
+    this.artifacts = {};
+  }
+
+  setForce(force) {
+    this.force = force;
+  }
+
+  setArtifacts(artifacts) {
+    this.artifacts = artifacts;
+  }
+
+  getArtifacts() {
+    return this.artifacts;
+  }
+
+  getInstallCommands(pkg) {
+    const scripts = pkg.scripts;
+    if (scripts) {
+      const cmds = [];
+      for (var _iterator = INSTALL_STAGES, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+        var _ref;
+
+        if (_isArray) {
+          if (_i >= _iterator.length) break;
+          _ref = _iterator[_i++];
+        } else {
+          _i = _iterator.next();
+          if (_i.done) break;
+          _ref = _i.value;
+        }
+
+        const stage = _ref;
+
+        const cmd = scripts[stage];
+        if (cmd) {
+          cmds.push([stage, cmd]);
+        }
+      }
+      return cmds;
+    } else {
+      return [];
+    }
+  }
+
+  walk(loc) {
+    var _this = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const files = yield (_fs || _load_fs()).walk(loc, null, new Set(_this.config.registryFolders));
+      const mtimes = new Map();
+      for (var _iterator2 = files, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+        var _ref2;
+
+        if (_isArray2) {
+          if (_i2 >= _iterator2.length) break;
+          _ref2 = _iterator2[_i2++];
+        } else {
+          _i2 = _iterator2.next();
+          if (_i2.done) break;
+          _ref2 = _i2.value;
+        }
+
+        const file = _ref2;
+
+        mtimes.set(file.relative, file.mtime);
+      }
+      return mtimes;
+    })();
+  }
+
+  saveBuildArtifacts(loc, pkg, beforeFiles, spinner) {
+    var _this2 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const afterFiles = yield _this2.walk(loc);
+
+      // work out what files have been created/modified
+      const buildArtifacts = [];
+      for (var _iterator3 = afterFiles, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
+        var _ref4;
+
+        if (_isArray3) {
+          if (_i3 >= _iterator3.length) break;
+          _ref4 = _iterator3[_i3++];
+        } else {
+          _i3 = _iterator3.next();
+          if (_i3.done) break;
+          _ref4 = _i3.value;
+        }
+
+        const _ref3 = _ref4;
+        const file = _ref3[0];
+        const mtime = _ref3[1];
+
+        if (!beforeFiles.has(file) || beforeFiles.get(file) !== mtime) {
+          buildArtifacts.push(file);
+        }
+      }
+
+      if (!buildArtifacts.length) {
+        // nothing else to do here since we have no build artifacts
+        return;
+      }
+
+      // set build artifacts
+      const ref = pkg._reference;
+      invariant(ref, 'expected reference');
+      _this2.artifacts[`${pkg.name}@${pkg.version}`] = buildArtifacts;
+    })();
+  }
+
+  install(cmds, pkg, spinner) {
+    var _this3 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const ref = pkg._reference;
+      invariant(ref, 'expected reference');
+      const locs = ref.locations;
+
+      let updateProgress;
+
+      if (cmds.length > 0) {
+        updateProgress = function updateProgress(data) {
+          const dataStr = data.toString() // turn buffer into string
+          .trim(); // trim whitespace
+
+          invariant(spinner && spinner.tick, 'We should have spinner and its ticker here');
+          if (dataStr) {
+            spinner.tick(dataStr
+            // Only get the last line
+            .substr(dataStr.lastIndexOf('\n') + 1)
+            // change tabs to spaces as they can interfere with the console
+            .replace(/\t/g, ' '));
+          }
+        };
+      }
+
+      try {
+        for (var _iterator4 = cmds, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
+          var _ref6;
+
+          if (_isArray4) {
+            if (_i4 >= _iterator4.length) break;
+            _ref6 = _iterator4[_i4++];
+          } else {
+            _i4 = _iterator4.next();
+            if (_i4.done) break;
+            _ref6 = _i4.value;
+          }
+
+          const _ref5 = _ref6;
+          const stage = _ref5[0];
+          const cmd = _ref5[1];
+
+          yield Promise.all(locs.map((() => {
+            var _ref7 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (loc) {
+              var _ref8 = yield (0, (_executeLifecycleScript || _load_executeLifecycleScript()).default)({
+                stage,
+                config: _this3.config,
+                cwd: loc,
+                cmd,
+                isInteractive: false,
+                updateProgress
+              });
+
+              const stdout = _ref8.stdout;
+
+              _this3.reporter.verbose(stdout);
+            });
+
+            return function (_x) {
+              return _ref7.apply(this, arguments);
+            };
+          })()));
+        }
+      } catch (err) {
+        err.message = `${locs.join(', ')}: ${err.message}`;
+
+        invariant(ref, 'expected reference');
+
+        if (ref.optional) {
+          ref.ignore = true;
+          ref.incompatible = true;
+          _this3.reporter.warn(_this3.reporter.lang('optionalModuleScriptFail', err.message));
+          _this3.reporter.info(_this3.reporter.lang('optionalModuleFail'));
+
+          // Cleanup node_modules
+          try {
+            yield Promise.all(locs.map((() => {
+              var _ref9 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (loc) {
+                yield (_fs || _load_fs()).unlink(loc);
+              });
+
+              return function (_x2) {
+                return _ref9.apply(this, arguments);
+              };
+            })()));
+          } catch (e) {
+            _this3.reporter.error(_this3.reporter.lang('optionalModuleCleanupFail', e.message));
+          }
+        } else {
+          throw err;
+        }
+      }
+    })();
+  }
+
+  packageCanBeInstalled(pkg) {
+    const cmds = this.getInstallCommands(pkg);
+    if (!cmds.length) {
+      return false;
+    }
+    if (this.config.packBuiltPackages && pkg.prebuiltVariants) {
+      for (const variant in pkg.prebuiltVariants) {
+        if (pkg._remote && pkg._remote.reference && pkg._remote.reference.includes(variant)) {
+          return false;
+        }
+      }
+    }
+    const ref = pkg._reference;
+    invariant(ref, 'Missing package reference');
+    if (!ref.fresh && !this.force) {
+      // this package hasn't been touched
+      return false;
+    }
+
+    // Don't run lifecycle scripts for hoisted packages
+    if (!ref.locations.length) {
+      return false;
+    }
+
+    // we haven't actually written this module out
+    if (ref.ignore) {
+      return false;
+    }
+    return true;
+  }
+
+  runCommand(spinner, pkg) {
+    var _this4 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const cmds = _this4.getInstallCommands(pkg);
+      spinner.setPrefix(++_this4.installed, pkg.name);
+      yield _this4.install(cmds, pkg, spinner);
+    })();
+  }
+
+  // detect if there is a circularDependency in the dependency tree
+  detectCircularDependencies(root, seenManifests, pkg) {
+    const ref = pkg._reference;
+    invariant(ref, 'expected reference');
+
+    const deps = ref.dependencies;
+    for (var _iterator5 = deps, _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
+      var _ref10;
+
+      if (_isArray5) {
+        if (_i5 >= _iterator5.length) break;
+        _ref10 = _iterator5[_i5++];
+      } else {
+        _i5 = _iterator5.next();
+        if (_i5.done) break;
+        _ref10 = _i5.value;
+      }
+
+      const dep = _ref10;
+
+      const pkgDep = this.resolver.getStrictResolvedPattern(dep);
+      if (seenManifests.has(pkgDep)) {
+        // there is a cycle but not with the root
+        continue;
+      }
+      seenManifests.add(pkgDep);
+      // found a dependency pointing to root
+      if (pkgDep == root) {
+        return true;
+      }
+      if (this.detectCircularDependencies(root, seenManifests, pkgDep)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  // find the next package to be installed
+  findInstallablePackage(workQueue, installed) {
+    for (var _iterator6 = workQueue, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) {
+      var _ref11;
+
+      if (_isArray6) {
+        if (_i6 >= _iterator6.length) break;
+        _ref11 = _iterator6[_i6++];
+      } else {
+        _i6 = _iterator6.next();
+        if (_i6.done) break;
+        _ref11 = _i6.value;
+      }
+
+      const pkg = _ref11;
+
+      const ref = pkg._reference;
+      invariant(ref, 'expected reference');
+      const deps = ref.dependencies;
+
+      let dependenciesFulfilled = true;
+      for (var _iterator7 = deps, _isArray7 = Array.isArray(_iterator7), _i7 = 0, _iterator7 = _isArray7 ? _iterator7 : _iterator7[Symbol.iterator]();;) {
+        var _ref12;
+
+        if (_isArray7) {
+          if (_i7 >= _iterator7.length) break;
+          _ref12 = _iterator7[_i7++];
+        } else {
+          _i7 = _iterator7.next();
+          if (_i7.done) break;
+          _ref12 = _i7.value;
+        }
+
+        const dep = _ref12;
+
+        const pkgDep = this.resolver.getStrictResolvedPattern(dep);
+        if (!installed.has(pkgDep)) {
+          dependenciesFulfilled = false;
+          break;
+        }
+      }
+
+      // all dependencies are installed
+      if (dependenciesFulfilled) {
+        return pkg;
+      }
+
+      // detect circular dependency, mark this pkg as installable to break the circle
+      if (this.detectCircularDependencies(pkg, new Set(), pkg)) {
+        return pkg;
+      }
+    }
+    return null;
+  }
+
+  worker(spinner, workQueue, installed, waitQueue) {
+    var _this5 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      while (workQueue.size > 0) {
+        // find a installable package
+        const pkg = _this5.findInstallablePackage(workQueue, installed);
+
+        // can't find a package to install, register into waitQueue
+        if (pkg == null) {
+          spinner.clear();
+          yield new Promise(function (resolve) {
+            return waitQueue.add(resolve);
+          });
+          continue;
+        }
+
+        // found a package to install
+        workQueue.delete(pkg);
+        if (_this5.packageCanBeInstalled(pkg)) {
+          yield _this5.runCommand(spinner, pkg);
+        }
+        installed.add(pkg);
+        for (var _iterator8 = waitQueue, _isArray8 = Array.isArray(_iterator8), _i8 = 0, _iterator8 = _isArray8 ? _iterator8 : _iterator8[Symbol.iterator]();;) {
+          var _ref13;
+
+          if (_isArray8) {
+            if (_i8 >= _iterator8.length) break;
+            _ref13 = _iterator8[_i8++];
+          } else {
+            _i8 = _iterator8.next();
+            if (_i8.done) break;
+            _ref13 = _i8.value;
+          }
+
+          const workerResolve = _ref13;
+
+          workerResolve();
+        }
+        waitQueue.clear();
+      }
+    })();
+  }
+
+  init(seedPatterns) {
+    var _this6 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const workQueue = new Set();
+      const installed = new Set();
+      const pkgs = _this6.resolver.getTopologicalManifests(seedPatterns);
+      let installablePkgs = 0;
+      // A map to keep track of what files exist before installation
+      const beforeFilesMap = new Map();
+      for (var _iterator9 = pkgs, _isArray9 = Array.isArray(_iterator9), _i9 = 0, _iterator9 = _isArray9 ? _iterator9 : _iterator9[Symbol.iterator]();;) {
+        var _ref14;
+
+        if (_isArray9) {
+          if (_i9 >= _iterator9.length) break;
+          _ref14 = _iterator9[_i9++];
+        } else {
+          _i9 = _iterator9.next();
+          if (_i9.done) break;
+          _ref14 = _i9.value;
+        }
+
+        const pkg = _ref14;
+
+        if (_this6.packageCanBeInstalled(pkg)) {
+          const ref = pkg._reference;
+          invariant(ref, 'expected reference');
+          yield Promise.all(ref.locations.map((() => {
+            var _ref19 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (loc) {
+              beforeFilesMap.set(loc, (yield _this6.walk(loc)));
+              installablePkgs += 1;
+            });
+
+            return function (_x6) {
+              return _ref19.apply(this, arguments);
+            };
+          })()));
+        }
+        workQueue.add(pkg);
+      }
+
+      const set = _this6.reporter.activitySet(installablePkgs, Math.min(installablePkgs, _this6.config.childConcurrency));
+
+      // waitQueue acts like a semaphore to allow workers to register to be notified
+      // when there are more work added to the work queue
+      const waitQueue = new Set();
+      yield Promise.all(set.spinners.map(function (spinner) {
+        return _this6.worker(spinner, workQueue, installed, waitQueue);
+      }));
+      // generate built package as prebuilt one for offline mirror
+      const offlineMirrorPath = _this6.config.getOfflineMirrorPath();
+      if (_this6.config.packBuiltPackages && offlineMirrorPath) {
+        for (var _iterator10 = pkgs, _isArray10 = Array.isArray(_iterator10), _i10 = 0, _iterator10 = _isArray10 ? _iterator10 : _iterator10[Symbol.iterator]();;) {
+          var _ref15;
+
+          if (_isArray10) {
+            if (_i10 >= _iterator10.length) break;
+            _ref15 = _iterator10[_i10++];
+          } else {
+            _i10 = _iterator10.next();
+            if (_i10.done) break;
+            _ref15 = _i10.value;
+          }
+
+          const pkg = _ref15;
+
+          if (_this6.packageCanBeInstalled(pkg)) {
+            let prebuiltPath = path.join(offlineMirrorPath, 'prebuilt');
+            yield (_fs || _load_fs()).mkdirp(prebuiltPath);
+            const prebuiltFilename = (0, (_packageNameUtils || _load_packageNameUtils()).getPlatformSpecificPackageFilename)(pkg);
+            prebuiltPath = path.join(prebuiltPath, prebuiltFilename + '.tgz');
+            const ref = pkg._reference;
+            invariant(ref, 'expected reference');
+            const builtPackagePaths = ref.locations;
+
+            yield Promise.all(builtPackagePaths.map((() => {
+              var _ref16 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (builtPackagePath) {
+                // don't use pack command, we want to avoid the file filters logic
+                const stream = yield (0, (_pack || _load_pack()).packWithIgnoreAndHeaders)(builtPackagePath);
+
+                const hash = yield new Promise(function (resolve, reject) {
+                  const validateStream = new (_crypto || _load_crypto()).HashStream();
+                  stream.pipe(validateStream).pipe(fs.createWriteStream(prebuiltPath)).on('error', reject).on('close', function () {
+                    return resolve(validateStream.getHash());
+                  });
+                });
+                pkg.prebuiltVariants = pkg.prebuiltVariants || {};
+                pkg.prebuiltVariants[prebuiltFilename] = hash;
+              });
+
+              return function (_x3) {
+                return _ref16.apply(this, arguments);
+              };
+            })()));
+          }
+        }
+      } else {
+        // cache all build artifacts
+        for (var _iterator11 = pkgs, _isArray11 = Array.isArray(_iterator11), _i11 = 0, _iterator11 = _isArray11 ? _iterator11 : _iterator11[Symbol.iterator]();;) {
+          var _ref17;
+
+          if (_isArray11) {
+            if (_i11 >= _iterator11.length) break;
+            _ref17 = _iterator11[_i11++];
+          } else {
+            _i11 = _iterator11.next();
+            if (_i11.done) break;
+            _ref17 = _i11.value;
+          }
+
+          const pkg = _ref17;
+
+          if (_this6.packageCanBeInstalled(pkg)) {
+            const ref = pkg._reference;
+            invariant(ref, 'expected reference');
+            const beforeFiles = ref.locations.map(function (loc) {
+              return beforeFilesMap.get(loc);
+            });
+            yield Promise.all(beforeFiles.map((() => {
+              var _ref18 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (b, index) {
+                invariant(b, 'files before installation should always be recorded');
+                yield _this6.saveBuildArtifacts(ref.locations[index], pkg, b, set.spinners[0]);
+              });
+
+              return function (_x4, _x5) {
+                return _ref18.apply(this, arguments);
+              };
+            })()));
+          }
+        }
+      }
+
+      set.end();
+    })();
+  }
+}
+exports.default = PackageInstallScripts;
+
+/***/ }),
+/* 558 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+var _extends2;
+
+function _load_extends() {
+  return _extends2 = _interopRequireDefault(__webpack_require__(21));
+}
+
+var _misc;
+
+function _load_misc() {
+  return _misc = __webpack_require__(18);
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const objectPath = __webpack_require__(304);
+
+const path = __webpack_require__(0);
+
+class BaseRegistry {
+  constructor(cwd, registries, requestManager, reporter, enableDefaultRc, extraneousRcFiles) {
+    this.reporter = reporter;
+    this.requestManager = requestManager;
+    this.registries = registries;
+    this.config = {};
+    this.folder = '';
+    this.token = '';
+    this.loc = '';
+    this.cwd = cwd;
+    this.enableDefaultRc = enableDefaultRc;
+    this.extraneousRcFiles = extraneousRcFiles;
+  }
+
+  // the filename to use for package metadata
+
+
+  //
+
+
+  //
+
+  //
+
+
+  //
+
+
+  //
+
+
+  //
+
+
+  //
+
+
+  //
+
+
+  // absolute folder name to insert modules
+
+
+  // relative folder name to put these modules
+
+
+  setToken(token) {
+    this.token = token;
+  }
+
+  setOtp(otp) {
+    this.otp = otp;
+  }
+
+  getOption(key) {
+    return this.config[key];
+  }
+
+  getAvailableRegistries() {
+    const config = this.config;
+    return Object.keys(config).reduce((registries, option) => {
+      if (option === 'registry' || option.split(':')[1] === 'registry') {
+        registries.push(config[option]);
+      }
+      return registries;
+    }, []);
+  }
+
+  loadConfig() {
+    return Promise.resolve();
+  }
+
+  checkOutdated(config, name, range) {
+    return Promise.reject(new Error('unimplemented'));
+  }
+
+  saveHomeConfig(config) {
+    return Promise.reject(new Error('unimplemented'));
+  }
+
+  request(pathname, opts = {}) {
+    return this.requestManager.request((0, (_extends2 || _load_extends()).default)({
+      url: pathname
+    }, opts));
+  }
+
+  init(overrides = {}) {
+    var _this = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      _this.mergeEnv('yarn_');
+      yield _this.loadConfig();
+
+      for (var _iterator = Object.keys(overrides), _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+        var _ref;
+
+        if (_isArray) {
+          if (_i >= _iterator.length) break;
+          _ref = _iterator[_i++];
+        } else {
+          _i = _iterator.next();
+          if (_i.done) break;
+          _ref = _i.value;
+        }
+
+        const override = _ref;
+
+        const val = overrides[override];
+
+        if (val !== undefined) {
+          _this.config[override] = val;
+        }
+      }
+      _this.loc = path.join(_this.cwd, _this.folder);
+    })();
+  }
+
+  static normalizeConfig(config) {
+    for (const key in config) {
+      config[key] = BaseRegistry.normalizeConfigOption(config[key]);
+    }
+    return config;
+  }
+
+  static normalizeConfigOption(val) {
+    if (val === 'true') {
+      return true;
+    } else if (val === 'false') {
+      return false;
+    } else {
+      return val;
+    }
+  }
+
+  mergeEnv(prefix) {
+    // try environment variables
+    for (const envKey in process.env) {
+      let key = envKey.toLowerCase();
+
+      // only accept keys prefixed with the prefix
+      if (key.indexOf(prefix.toLowerCase()) !== 0) {
+        continue;
+      }
+
+      const val = BaseRegistry.normalizeConfigOption(process.env[envKey]);
+
+      // remove config prefix
+      key = (0, (_misc || _load_misc()).removePrefix)(key, prefix.toLowerCase());
+
+      // replace dunders with dots
+      key = key.replace(/__/g, '.');
+
+      // replace underscores with dashes ignoring keys that start with an underscore
+      key = key.replace(/([^_])_/g, '$1-');
+
+      // set it via a path
+      objectPath.set(this.config, key, val);
+    }
+  }
+}
+exports.default = BaseRegistry;
+
+/***/ }),
+/* 559 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.DEFAULTS = undefined;
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+var _constants;
+
+function _load_constants() {
+  return _constants = __webpack_require__(8);
+}
+
+var _npmRegistry;
+
+function _load_npmRegistry() {
+  return _npmRegistry = _interopRequireDefault(__webpack_require__(88));
+}
+
+var _lockfile;
+
+function _load_lockfile() {
+  return _lockfile = __webpack_require__(19);
+}
+
+var _fs;
+
+function _load_fs() {
+  return _fs = _interopRequireWildcard(__webpack_require__(4));
+}
+
+var _yarnVersion;
+
+function _load_yarnVersion() {
+  return _yarnVersion = __webpack_require__(120);
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const userHome = __webpack_require__(67).default;
+const path = __webpack_require__(0);
+
+const DEFAULTS = exports.DEFAULTS = {
+  'version-tag-prefix': 'v',
+  'version-git-tag': true,
+  'version-commit-hooks': true,
+  'version-git-sign': false,
+  'version-git-message': 'v%s',
+
+  'init-version': '1.0.0',
+  'init-license': 'MIT',
+
+  'save-prefix': '^',
+  'bin-links': true,
+  'ignore-scripts': false,
+  'ignore-optional': false,
+  registry: (_constants || _load_constants()).YARN_REGISTRY,
+  'strict-ssl': true,
+  'user-agent': [`yarn/${(_yarnVersion || _load_yarnVersion()).version}`, 'npm/?', `node/${process.version}`, process.platform, process.arch].join(' ')
+};
+
+const RELATIVE_KEYS = ['yarn-offline-mirror', 'cache-folder', 'global-folder', 'offline-cache-folder', 'yarn-path'];
+const FOLDER_KEY = ['yarn-offline-mirror', 'cache-folder', 'global-folder', 'offline-cache-folder'];
+
+const npmMap = {
+  'version-git-sign': 'sign-git-tag',
+  'version-tag-prefix': 'tag-version-prefix',
+  'version-git-tag': 'git-tag-version',
+  'version-commit-hooks': 'commit-hooks',
+  'version-git-message': 'message'
+};
+
+class YarnRegistry extends (_npmRegistry || _load_npmRegistry()).default {
+  constructor(cwd, registries, requestManager, reporter, enableDefaultRc, extraneousRcFiles) {
+    super(cwd, registries, requestManager, reporter, enableDefaultRc, extraneousRcFiles);
+
+    this.homeConfigLoc = path.join(userHome, '.yarnrc');
+    this.homeConfig = {};
+  }
+
+  getOption(key) {
+    let val = this.config[key];
+
+    // if this isn't set in a yarn config, then use npm
+    if (typeof val === 'undefined') {
+      val = this.registries.npm.getOption(npmMap[key]);
+    }
+
+    if (typeof val === 'undefined') {
+      val = this.registries.npm.getOption(key);
+    }
+
+    // if this isn't set in a yarn config or npm config, then use the default (or undefined)
+    if (typeof val === 'undefined') {
+      val = DEFAULTS[key];
+    }
+
+    return val;
+  }
+
+  loadConfig() {
+    var _this = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const locations = yield _this.getPossibleConfigLocations('yarnrc', _this.reporter);
+
+      for (var _iterator = locations, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+        var _ref2;
+
+        if (_isArray) {
+          if (_i >= _iterator.length) break;
+          _ref2 = _iterator[_i++];
+        } else {
+          _i = _iterator.next();
+          if (_i.done) break;
+          _ref2 = _i.value;
+        }
+
+        const _ref = _ref2;
+        const isHome = _ref[0];
+        const loc = _ref[1];
+        const file = _ref[2];
+
+        var _parse = (0, (_lockfile || _load_lockfile()).parse)(file, loc);
+
+        const config = _parse.object;
+
+
+        if (isHome) {
+          _this.homeConfig = config;
+        }
+
+        for (var _iterator2 = RELATIVE_KEYS, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+          var _ref3;
+
+          if (_isArray2) {
+            if (_i2 >= _iterator2.length) break;
+            _ref3 = _iterator2[_i2++];
+          } else {
+            _i2 = _iterator2.next();
+            if (_i2.done) break;
+            _ref3 = _i2.value;
+          }
+
+          const key = _ref3;
+
+          const valueLoc = config[key];
+
+          if (!_this.config[key] && valueLoc) {
+            const resolvedLoc = config[key] = path.resolve(path.dirname(loc), valueLoc);
+
+            if (FOLDER_KEY.includes(key)) {
+              yield (_fs || _load_fs()).mkdirp(resolvedLoc);
+            }
+          }
+        }
+
+        // merge with any existing environment variables
+        const env = config.env;
+        if (env) {
+          const existingEnv = _this.config.env;
+          if (existingEnv) {
+            _this.config.env = Object.assign({}, env, existingEnv);
+          }
+        }
+
+        _this.config = Object.assign({}, config, _this.config);
+      }
+
+      // default yarn config
+      _this.config = Object.assign({}, DEFAULTS, _this.config);
+    })();
+  }
+
+  saveHomeConfig(config) {
+    var _this2 = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      YarnRegistry.normalizeConfig(config);
+
+      for (const key in config) {
+        const val = config[key];
+
+        // if the current config key was taken from home config then update
+        // the global config
+        if (_this2.homeConfig[key] === _this2.config[key]) {
+          _this2.config[key] = val;
+        }
+
+        // update just the home config
+        _this2.homeConfig[key] = config[key];
+      }
+
+      yield (_fs || _load_fs()).writeFilePreservingEol(_this2.homeConfigLoc, `${(0, (_lockfile || _load_lockfile()).stringify)(_this2.homeConfig)}\n`);
+    })();
+  }
+}
+exports.default = YarnRegistry;
+YarnRegistry.filename = 'yarn.json';
+
+/***/ }),
+/* 560 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _jsonReporter;
+
+function _load_jsonReporter() {
+  return _jsonReporter = _interopRequireDefault(__webpack_require__(213));
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+class BufferReporter extends (_jsonReporter || _load_jsonReporter()).default {
+  constructor(opts) {
+    super(opts);
+    this._buffer = [];
+  }
+
+  _dump(type, data, error) {
+    this._buffer.push({
+      type,
+      data,
+      error: !!error
+    });
+  }
+
+  getBuffer() {
+    return this._buffer;
+  }
+
+  getBufferText() {
+    return this._buffer.map(({ data }) => typeof data === 'string' ? data : JSON.stringify(data)).join('');
+  }
+
+  getBufferJson() {
+    return JSON.parse(this.getBufferText());
+  }
+}
+exports.default = BufferReporter;
+
+/***/ }),
+/* 561 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+var _baseReporter;
+
+function _load_baseReporter() {
+  return _baseReporter = _interopRequireDefault(__webpack_require__(108));
+}
+
+var _progressBar;
+
+function _load_progressBar() {
+  return _progressBar = _interopRequireDefault(__webpack_require__(563));
+}
+
+var _spinnerProgress;
+
+function _load_spinnerProgress() {
+  return _spinnerProgress = _interopRequireDefault(__webpack_require__(564));
+}
+
+var _util;
+
+function _load_util() {
+  return _util = __webpack_require__(212);
+}
+
+var _misc;
+
+function _load_misc() {
+  return _misc = __webpack_require__(18);
+}
+
+var _treeHelper;
+
+function _load_treeHelper() {
+  return _treeHelper = __webpack_require__(562);
+}
+
+var _inquirer;
+
+function _load_inquirer() {
+  return _inquirer = _interopRequireDefault(__webpack_require__(276));
+}
+
+var _cliTable;
+
+function _load_cliTable() {
+  return _cliTable = _interopRequireDefault(__webpack_require__(602));
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var _require = __webpack_require__(3);
+
+const inspect = _require.inspect;
+
+const readline = __webpack_require__(197);
+const chalk = __webpack_require__(30);
+const stripAnsi = __webpack_require__(329);
+const read = __webpack_require__(790);
+const tty = __webpack_require__(104);
+
+const AUDIT_COL_WIDTHS = [15, 62];
+
+const auditSeverityColors = {
+  info: chalk.bold,
+  low: chalk.bold,
+  moderate: chalk.yellow,
+  high: chalk.red,
+  critical: chalk.bgRed
+};
+
+// fixes bold on windows
+if (process.platform === 'win32' && !(process.env.TERM && /^xterm/i.test(process.env.TERM))) {
+  chalk.bold._styles[0].close += '\u001b[m';
+}
+
+class ConsoleReporter extends (_baseReporter || _load_baseReporter()).default {
+  constructor(opts) {
+    super(opts);
+
+    this._lastCategorySize = 0;
+    this._spinners = new Set();
+    this.format = chalk;
+    this.format.stripColor = stripAnsi;
+    this.isSilent = !!opts.isSilent;
+  }
+
+  _prependEmoji(msg, emoji) {
+    if (this.emoji && emoji && this.isTTY) {
+      msg = `${emoji}  ${msg}`;
+    }
+    return msg;
+  }
+
+  _logCategory(category, color, msg) {
+    this._lastCategorySize = category.length;
+    this._log(`${this.format[color](category)} ${msg}`);
+  }
+
+  _verbose(msg) {
+    this._logCategory('verbose', 'grey', `${process.uptime()} ${msg}`);
+  }
+
+  _verboseInspect(obj) {
+    this.inspect(obj);
+  }
+
+  close() {
+    for (var _iterator = this._spinners, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+      var _ref;
+
+      if (_isArray) {
+        if (_i >= _iterator.length) break;
+        _ref = _iterator[_i++];
+      } else {
+        _i = _iterator.next();
+        if (_i.done) break;
+        _ref = _i.value;
+      }
+
+      const spinner = _ref;
+
+      spinner.stop();
+    }
+    this._spinners.clear();
+    this.stopProgress();
+    super.close();
+  }
+
+  table(head, body) {
+    //
+    head = head.map(field => this.format.underline(field));
+
+    //
+    const rows = [head].concat(body);
+
+    // get column widths
+    const cols = [];
+    for (let i = 0; i < head.length; i++) {
+      const widths = rows.map(row => this.format.stripColor(row[i]).length);
+      cols[i] = Math.max(...widths);
+    }
+
+    //
+    const builtRows = rows.map(row => {
+      for (let i = 0; i < row.length; i++) {
+        const field = row[i];
+        const padding = cols[i] - this.format.stripColor(field).length;
+
+        row[i] = field + ' '.repeat(padding);
+      }
+      return row.join(' ');
+    });
+
+    this.log(builtRows.join('\n'));
+  }
+
+  step(current, total, msg, emoji) {
+    msg = this._prependEmoji(msg, emoji);
+
+    if (msg.endsWith('?')) {
+      msg = `${(0, (_misc || _load_misc()).removeSuffix)(msg, '?')}...?`;
+    } else {
+      msg += '...';
+    }
+
+    this.log(`${this.format.dim(`[${current}/${total}]`)} ${msg}`);
+  }
+
+  inspect(value) {
+    if (typeof value !== 'number' && typeof value !== 'string') {
+      value = inspect(value, {
+        breakLength: 0,
+        colors: this.isTTY,
+        depth: null,
+        maxArrayLength: null
+      });
+    }
+
+    this.log(String(value), { force: true });
+  }
+
+  list(key, items, hints) {
+    const gutterWidth = (this._lastCategorySize || 2) - 1;
+
+    if (hints) {
+      for (var _iterator2 = items, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+        var _ref2;
+
+        if (_isArray2) {
+          if (_i2 >= _iterator2.length) break;
+          _ref2 = _iterator2[_i2++];
+        } else {
+          _i2 = _iterator2.next();
+          if (_i2.done) break;
+          _ref2 = _i2.value;
+        }
+
+        const item = _ref2;
+
+        this._log(`${' '.repeat(gutterWidth)}- ${this.format.bold(item)}`);
+        this._log(`  ${' '.repeat(gutterWidth)} ${hints[item]}`);
+      }
+    } else {
+      for (var _iterator3 = items, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
+        var _ref3;
+
+        if (_isArray3) {
+          if (_i3 >= _iterator3.length) break;
+          _ref3 = _iterator3[_i3++];
+        } else {
+          _i3 = _iterator3.next();
+          if (_i3.done) break;
+          _ref3 = _i3.value;
+        }
+
+        const item = _ref3;
+
+        this._log(`${' '.repeat(gutterWidth)}- ${item}`);
+      }
+    }
+  }
+
+  header(command, pkg) {
+    this.log(this.format.bold(`${pkg.name} ${command} v${pkg.version}`));
+  }
+
+  footer(showPeakMemory) {
+    this.stopProgress();
+
+    const totalTime = (this.getTotalTime() / 1000).toFixed(2);
+    let msg = `Done in ${totalTime}s.`;
+    if (showPeakMemory) {
+      const peakMemory = (this.peakMemory / 1024 / 1024).toFixed(2);
+      msg += ` Peak memory usage ${peakMemory}MB.`;
+    }
+    this.log(this._prependEmoji(msg, '✨'));
+  }
+
+  log(msg, { force = false } = {}) {
+    this._lastCategorySize = 0;
+    this._log(msg, { force });
+  }
+
+  _log(msg, { force = false } = {}) {
+    if (this.isSilent && !force) {
+      return;
+    }
+    (0, (_util || _load_util()).clearLine)(this.stdout);
+    this.stdout.write(`${msg}\n`);
+  }
+
+  success(msg) {
+    this._logCategory('success', 'green', msg);
+  }
+
+  error(msg) {
+    (0, (_util || _load_util()).clearLine)(this.stderr);
+    this.stderr.write(`${this.format.red('error')} ${msg}\n`);
+  }
+
+  info(msg) {
+    this._logCategory('info', 'blue', msg);
+  }
+
+  command(command) {
+    this.log(this.format.dim(`$ ${command}`));
+  }
+
+  warn(msg) {
+    (0, (_util || _load_util()).clearLine)(this.stderr);
+    this.stderr.write(`${this.format.yellow('warning')} ${msg}\n`);
+  }
+
+  question(question, options = {}) {
+    if (!process.stdout.isTTY) {
+      return Promise.reject(new Error("Can't answer a question unless a user TTY"));
+    }
+
+    return new Promise((resolve, reject) => {
+      read({
+        prompt: `${this.format.dim('question')} ${question}: `,
+        silent: !!options.password,
+        output: this.stdout,
+        input: this.stdin
+      }, (err, answer) => {
+        if (err) {
+          if (err.message === 'canceled') {
+            process.exitCode = 1;
+          }
+          reject(err);
+        } else {
+          if (!answer && options.required) {
+            this.error(this.lang('answerRequired'));
+            resolve(this.question(question, options));
+          } else {
+            resolve(answer);
+          }
+        }
+      });
+    });
+  }
+  // handles basic tree output to console
+  tree(key, trees, { force = false } = {}) {
+    this.stopProgress();
+    //
+    if (this.isSilent && !force) {
+      return;
+    }
+    const output = ({ name, children, hint, color }, titlePrefix, childrenPrefix) => {
+      const formatter = this.format;
+      const out = (0, (_treeHelper || _load_treeHelper()).getFormattedOutput)({
+        prefix: titlePrefix,
+        hint,
+        color,
+        name,
+        formatter
+      });
+      this.stdout.write(out);
+
+      if (children && children.length) {
+        (0, (_treeHelper || _load_treeHelper()).recurseTree)((0, (_treeHelper || _load_treeHelper()).sortTrees)(children), childrenPrefix, output);
+      }
+    };
+    (0, (_treeHelper || _load_treeHelper()).recurseTree)((0, (_treeHelper || _load_treeHelper()).sortTrees)(trees), '', output);
+  }
+
+  activitySet(total, workers) {
+    if (!this.isTTY || this.noProgress) {
+      return super.activitySet(total, workers);
+    }
+
+    const spinners = [];
+    const reporterSpinners = this._spinners;
+
+    for (let i = 1; i < workers; i++) {
+      this.log('');
+    }
+
+    for (let i = 0; i < workers; i++) {
+      const spinner = new (_spinnerProgress || _load_spinnerProgress()).default(this.stderr, i);
+      reporterSpinners.add(spinner);
+      spinner.start();
+
+      let prefix = null;
+      let current = 0;
+      const updatePrefix = () => {
+        spinner.setPrefix(`${this.format.dim(`[${current === 0 ? '-' : current}/${total}]`)} `);
+      };
+      const clear = () => {
+        prefix = null;
+        current = 0;
+        updatePrefix();
+        spinner.setText('waiting...');
+      };
+      clear();
+
+      spinners.unshift({
+        clear,
+
+        setPrefix(_current, _prefix) {
+          current = _current;
+          prefix = _prefix;
+          spinner.setText(prefix);
+          updatePrefix();
+        },
+
+        tick(msg) {
+          if (prefix) {
+            msg = `${prefix}: ${msg}`;
+          }
+          spinner.setText(msg);
+        },
+
+        end() {
+          spinner.stop();
+          reporterSpinners.delete(spinner);
+        }
+      });
+    }
+
+    return {
+      spinners,
+      end: () => {
+        for (var _iterator4 = spinners, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
+          var _ref4;
+
+          if (_isArray4) {
+            if (_i4 >= _iterator4.length) break;
+            _ref4 = _iterator4[_i4++];
+          } else {
+            _i4 = _iterator4.next();
+            if (_i4.done) break;
+            _ref4 = _i4.value;
+          }
+
+          const spinner = _ref4;
+
+          spinner.end();
+        }
+        readline.moveCursor(this.stdout, 0, -workers + 1);
+      }
+    };
+  }
+
+  activity() {
+    if (!this.isTTY) {
+      return {
+        tick() {},
+        end() {}
+      };
+    }
+    const reporterSpinners = this._spinners;
+
+    const spinner = new (_spinnerProgress || _load_spinnerProgress()).default(this.stderr);
+    spinner.start();
+
+    reporterSpinners.add(spinner);
+
+    return {
+      tick(name) {
+        spinner.setText(name);
+      },
+
+      end() {
+        spinner.stop();
+        reporterSpinners.delete(spinner);
+      }
+    };
+  }
+
+  select(header, question, options) {
+    if (!this.isTTY) {
+      return Promise.reject(new Error("Can't answer a question unless a user TTY"));
+    }
+
+    const rl = readline.createInterface({
+      input: this.stdin,
+      output: this.stdout,
+      terminal: true
+    });
+
+    const questions = options.map(opt => opt.name);
+    const answers = options.map(opt => opt.value);
+
+    function toIndex(input) {
+      const index = answers.indexOf(input);
+
+      if (index >= 0) {
+        return index;
+      } else {
+        return +input;
+      }
+    }
+
+    return new Promise(resolve => {
+      this.info(header);
+
+      for (let i = 0; i < questions.length; i++) {
+        this.log(`  ${this.format.dim(`${i + 1})`)} ${questions[i]}`);
+      }
+
+      const ask = () => {
+        rl.question(`${question}: `, input => {
+          let index = toIndex(input);
+
+          if (isNaN(index)) {
+            this.log('Not a number');
+            ask();
+            return;
+          }
+
+          if (index <= 0 || index > options.length) {
+            this.log('Outside answer range');
+            ask();
+            return;
+          }
+
+          // get index
+          index--;
+          rl.close();
+          resolve(answers[index]);
+        });
+      };
+
+      ask();
+    });
+  }
+
+  progress(count) {
+    if (this.noProgress || count <= 0) {
+      return function () {
+        // noop
+      };
+    }
+
+    if (!this.isTTY) {
+      return function () {
+        // TODO what should the behaviour here be? we could buffer progress messages maybe
+      };
+    }
+
+    // Clear any potentially old progress bars
+    this.stopProgress();
+
+    const bar = this._progressBar = new (_progressBar || _load_progressBar()).default(count, this.stderr, progress => {
+      if (progress === this._progressBar) {
+        this._progressBar = null;
+      }
+    });
+
+    bar.render();
+
+    return function () {
+      bar.tick();
+    };
+  }
+
+  stopProgress() {
+    if (this._progressBar) {
+      this._progressBar.stop();
+    }
+  }
+
+  prompt(message, choices, options = {}) {
+    var _this = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      if (!process.stdout.isTTY) {
+        return Promise.reject(new Error("Can't answer a question unless a user TTY"));
+      }
+
+      let pageSize;
+      if (process.stdout instanceof tty.WriteStream) {
+        pageSize = process.stdout.rows - 2;
+      }
+
+      const rl = readline.createInterface({
+        input: _this.stdin,
+        output: _this.stdout,
+        terminal: true
+      });
+
+      // $FlowFixMe: Need to update the type of Inquirer
+      const prompt = (_inquirer || _load_inquirer()).default.createPromptModule({
+        input: _this.stdin,
+        output: _this.stdout
+      });
+
+      var _options$name = options.name;
+      const name = _options$name === undefined ? 'prompt' : _options$name;
+      var _options$type = options.type;
+      const type = _options$type === undefined ? 'input' : _options$type,
+            validate = options.validate;
+
+      const answers = yield prompt([{ name, type, message, choices, pageSize, validate }]);
+
+      rl.close();
+
+      return answers[name];
+    })();
+  }
+
+  auditSummary(auditMetadata) {
+    const totalDependencies = auditMetadata.totalDependencies,
+          vulnerabilities = auditMetadata.vulnerabilities;
+
+    const totalVulnerabilities = vulnerabilities.info + vulnerabilities.low + vulnerabilities.moderate + vulnerabilities.high + vulnerabilities.critical;
+    const summary = this.lang('auditSummary', totalVulnerabilities > 0 ? this.rawText(chalk.red(totalVulnerabilities.toString())) : totalVulnerabilities, totalDependencies);
+    this._log(summary);
+
+    if (totalVulnerabilities) {
+      const severities = [];
+      if (vulnerabilities.info) {
+        severities.push(this.lang('auditInfo', vulnerabilities.info));
+      }
+      if (vulnerabilities.low) {
+        severities.push(this.lang('auditLow', vulnerabilities.low));
+      }
+      if (vulnerabilities.moderate) {
+        severities.push(this.lang('auditModerate', vulnerabilities.moderate));
+      }
+      if (vulnerabilities.high) {
+        severities.push(this.lang('auditHigh', vulnerabilities.high));
+      }
+      if (vulnerabilities.critical) {
+        severities.push(this.lang('auditCritical', vulnerabilities.critical));
+      }
+      this._log(`${this.lang('auditSummarySeverity')} ${severities.join(' | ')}`);
+    }
+  }
+
+  auditAction(recommendation) {
+    const label = recommendation.action.resolves.length === 1 ? 'vulnerability' : 'vulnerabilities';
+    this._log(this.lang('auditResolveCommand', this.rawText(chalk.inverse(recommendation.cmd)), recommendation.action.resolves.length, this.rawText(label)));
+    if (recommendation.isBreaking) {
+      this._log(this.lang('auditSemverMajorChange'));
+    }
+  }
+
+  auditManualReview() {
+    const tableOptions = {
+      colWidths: [78]
+    };
+    const table = new (_cliTable || _load_cliTable()).default(tableOptions);
+    table.push([{
+      content: this.lang('auditManualReview'),
+      vAlign: 'center',
+      hAlign: 'center'
+    }]);
+
+    this._log(table.toString());
+  }
+
+  auditAdvisory(resolution, auditAdvisory) {
+    function colorSeverity(severity, message) {
+      return auditSeverityColors[severity](message || severity);
+    }
+
+    function makeAdvisoryTableRow(patchedIn) {
+      const patchRows = [];
+
+      if (patchedIn) {
+        patchRows.push({ 'Patched in': patchedIn });
+      }
+
+      return [{ [chalk.bold(colorSeverity(auditAdvisory.severity))]: chalk.bold(auditAdvisory.title) }, { Package: auditAdvisory.module_name }, ...patchRows, { 'Dependency of': `${resolution.path.split('>')[0]} ${resolution.dev ? '[dev]' : ''}` }, { Path: resolution.path.split('>').join(' > ') }, { 'More info': `https://www.npmjs.com/advisories/${auditAdvisory.id}` }];
+    }
+
+    const tableOptions = {
+      colWidths: AUDIT_COL_WIDTHS,
+      wordWrap: true
+    };
+    const table = new (_cliTable || _load_cliTable()).default(tableOptions);
+    const patchedIn = auditAdvisory.patched_versions.replace(' ', '') === '<0.0.0' ? 'No patch available' : auditAdvisory.patched_versions;
+    table.push(...makeAdvisoryTableRow(patchedIn));
+    this._log(table.toString());
+  }
+}
+exports.default = ConsoleReporter;
+
+/***/ }),
+/* 562 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.sortTrees = sortTrees;
+exports.recurseTree = recurseTree;
+exports.getFormattedOutput = getFormattedOutput;
+
+
+// public
+
+
+// types
+function sortTrees(trees) {
+  return trees.sort(function (tree1, tree2) {
+    return tree1.name.localeCompare(tree2.name);
+  });
+}
+
+function recurseTree(tree, prefix, recurseFunc) {
+  const treeLen = tree.length;
+  const treeEnd = treeLen - 1;
+  for (let i = 0; i < treeLen; i++) {
+    const atEnd = i === treeEnd;
+    recurseFunc(tree[i], prefix + getLastIndentChar(atEnd), prefix + getNextIndentChar(atEnd));
+  }
+}
+
+function getFormattedOutput(fmt) {
+  const item = formatColor(fmt.color, fmt.name, fmt.formatter);
+  const suffix = getSuffix(fmt.hint, fmt.formatter);
+  return `${fmt.prefix}─ ${item}${suffix}\n`;
+}
+
+function getNextIndentChar(end) {
+  return end ? '   ' : '│  ';
+}
+
+function getLastIndentChar(end) {
+  return end ? '└' : '├';
+}
+
+function getSuffix(hint, formatter) {
+  return hint ? ` (${formatter.grey(hint)})` : '';
+}
+
+function formatColor(color, strToFormat, formatter) {
+  return color ? formatter[color](strToFormat) : strToFormat;
+}
+
+/***/ }),
+/* 563 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _util;
+
+function _load_util() {
+  return _util = __webpack_require__(212);
+}
+
+class ProgressBar {
+  constructor(total, stdout = process.stderr, callback) {
+    this.stdout = stdout;
+    this.total = total;
+    this.chars = ProgressBar.bars[0];
+    this.delay = 60;
+    this.curr = 0;
+    this._callback = callback;
+    (0, (_util || _load_util()).clearLine)(stdout);
+  }
+
+  tick() {
+    if (this.curr >= this.total) {
+      return;
+    }
+
+    this.curr++;
+
+    // schedule render
+    if (!this.id) {
+      this.id = setTimeout(() => this.render(), this.delay);
+    }
+  }
+
+  cancelTick() {
+    if (this.id) {
+      clearTimeout(this.id);
+      this.id = null;
+    }
+  }
+
+  stop() {
+    // "stop" by setting current to end so `tick` becomes noop
+    this.curr = this.total;
+
+    this.cancelTick();
+    (0, (_util || _load_util()).clearLine)(this.stdout);
+    if (this._callback) {
+      this._callback(this);
+    }
+  }
+
+  render() {
+    // clear throttle
+    this.cancelTick();
+
+    let ratio = this.curr / this.total;
+    ratio = Math.min(Math.max(ratio, 0), 1);
+
+    // progress without bar
+    let bar = ` ${this.curr}/${this.total}`;
+
+    // calculate size of actual bar
+    // $FlowFixMe: investigate process.stderr.columns flow error
+    const availableSpace = Math.max(0, this.stdout.columns - bar.length - 3);
+    const width = Math.min(this.total, availableSpace);
+    const completeLength = Math.round(width * ratio);
+    const complete = this.chars[0].repeat(completeLength);
+    const incomplete = this.chars[1].repeat(width - completeLength);
+    bar = `[${complete}${incomplete}]${bar}`;
+
+    (0, (_util || _load_util()).toStartOfLine)(this.stdout);
+    this.stdout.write(bar);
+  }
+}
+exports.default = ProgressBar;
+ProgressBar.bars = [['#', '-']];
+
+/***/ }),
+/* 564 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _util;
+
+function _load_util() {
+  return _util = __webpack_require__(212);
+}
+
+class Spinner {
+  constructor(stdout = process.stderr, lineNumber = 0) {
+    this.current = 0;
+    this.prefix = '';
+    this.lineNumber = lineNumber;
+    this.stdout = stdout;
+    this.delay = 60;
+    this.chars = Spinner.spinners[28].split('');
+    this.text = '';
+    this.id = null;
+  }
+
+  setPrefix(prefix) {
+    this.prefix = prefix;
+  }
+  setText(text) {
+    this.text = text;
+  }
+  start() {
+    this.current = 0;
+    this.render();
+  }
+  render() {
+    if (this.id) {
+      clearTimeout(this.id);
+    }
+    // build line ensuring we don't wrap to the next line
+    let msg = `${this.prefix}${this.chars[this.current]} ${this.text}`;
+    const columns = typeof this.stdout.columns === 'number' ? this.stdout.columns : 100;
+    msg = msg.slice(0, columns);
+    (0, (_util || _load_util()).writeOnNthLine)(this.stdout, this.lineNumber, msg);
+    this.current = ++this.current % this.chars.length;
+    this.id = setTimeout(() => this.render(), this.delay);
+  }
+  stop() {
+    if (this.id) {
+      clearTimeout(this.id);
+      this.id = null;
+    }
+    (0, (_util || _load_util()).clearNthLine)(this.stdout, this.lineNumber);
+  }
+}
+exports.default = Spinner;
+Spinner.spinners = ['|/-\\', '⠂-–—–-', '◐◓◑◒', '◴◷◶◵', '◰◳◲◱', '▖▘▝▗', '■□▪▫', '▌▀▐▄', '▉▊▋▌▍▎▏▎▍▌▋▊▉', '▁▃▄▅▆▇█▇▆▅▄▃', '←↖↑↗→↘↓↙', '┤┘┴└├┌┬┐', '◢◣◤◥', '.oO°Oo.', '.oO@*', '🌍🌎🌏', '◡◡ ⊙⊙ ◠◠', '☱☲☴', '⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏', '⠋⠙⠚⠞⠖⠦⠴⠲⠳⠓', '⠄⠆⠇⠋⠙⠸⠰⠠⠰⠸⠙⠋⠇⠆', '⠋⠙⠚⠒⠂⠂⠒⠲⠴⠦⠖⠒⠐⠐⠒⠓⠋', '⠁⠉⠙⠚⠒⠂⠂⠒⠲⠴⠤⠄⠄⠤⠴⠲⠒⠂⠂⠒⠚⠙⠉⠁', '⠈⠉⠋⠓⠒⠐⠐⠒⠖⠦⠤⠠⠠⠤⠦⠖⠒⠐⠐⠒⠓⠋⠉⠈', '⠁⠁⠉⠙⠚⠒⠂⠂⠒⠲⠴⠤⠄⠄⠤⠠⠠⠤⠦⠖⠒⠐⠐⠒⠓⠋⠉⠈⠈', '⢄⢂⢁⡁⡈⡐⡠', '⢹⢺⢼⣸⣇⡧⡗⡏', '⣾⣽⣻⢿⡿⣟⣯⣷', '⠁⠂⠄⡀⢀⠠⠐⠈'];
+
+/***/ }),
+/* 565 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _jsonReporter;
+
+function _load_jsonReporter() {
+  return _jsonReporter = _interopRequireDefault(__webpack_require__(213));
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var _require = __webpack_require__(77);
+
+const EventEmitter = _require.EventEmitter;
+class EventReporter extends (_jsonReporter || _load_jsonReporter()).default {
+
+  constructor(opts) {
+    super(opts);
+
+    // $FlowFixMe: looks like a flow bug
+    EventEmitter.call(this);
+  }
+
+  _dump(type, data) {
+    this.emit(type, data);
+  }
+}
+
+exports.default = EventReporter;
+Object.assign(EventReporter.prototype, EventEmitter.prototype);
+
+/***/ }),
+/* 566 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+function formatFunction(...strs) {
+  return strs.join(' ');
+}
+
+const defaultFormatter = exports.defaultFormatter = {
+  bold: formatFunction,
+  dim: formatFunction,
+  italic: formatFunction,
+  underline: formatFunction,
+  inverse: formatFunction,
+  strikethrough: formatFunction,
+  black: formatFunction,
+  red: formatFunction,
+  green: formatFunction,
+  yellow: formatFunction,
+  blue: formatFunction,
+  magenta: formatFunction,
+  cyan: formatFunction,
+  white: formatFunction,
+  gray: formatFunction,
+  grey: formatFunction,
+  stripColor: formatFunction
+};
+
+/***/ }),
+/* 567 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+/* eslint max-len: 0 */
+
+const messages = {
+  upToDate: 'Already up-to-date.',
+  folderInSync: 'Folder in sync.',
+  nothingToInstall: 'Nothing to install.',
+  resolvingPackages: 'Resolving packages',
+  checkingManifest: 'Validating package.json',
+  fetchingPackages: 'Fetching packages',
+  linkingDependencies: 'Linking dependencies',
+  rebuildingPackages: 'Rebuilding all packages',
+  buildingFreshPackages: 'Building fresh packages',
+  cleaningModules: 'Cleaning modules',
+  bumpingVersion: 'Bumping version',
+  savingHar: 'Saving HAR file: $0',
+  answer: 'Answer?',
+  usage: 'Usage',
+  installCommandRenamed: '`install` has been replaced with `add` to add new dependencies. Run $0 instead.',
+  globalFlagRemoved: '`--global` has been deprecated. Please run $0 instead.',
+  waitingInstance: 'Waiting for the other yarn instance to finish (pid $0, inside $1)',
+  waitingNamedInstance: 'Waiting for the other yarn instance to finish ($0)',
+  offlineRetrying: 'There appears to be trouble with your network connection. Retrying...',
+  internalServerErrorRetrying: 'There appears to be trouble with the npm registry (returned $1). Retrying...',
+  clearedCache: 'Cleared cache.',
+  couldntClearPackageFromCache: "Couldn't clear package $0 from cache",
+  clearedPackageFromCache: 'Cleared package $0 from cache',
+  packWroteTarball: 'Wrote tarball to $0.',
+
+  helpExamples: '  Examples:\n$0\n',
+  helpCommands: '  Commands:\n$0\n',
+  helpCommandsMore: '  Run `$0` for more information on specific commands.',
+  helpLearnMore: '  Visit $0 to learn more about Yarn.\n',
+
+  manifestPotentialTypo: 'Potential typo $0, did you mean $1?',
+  manifestBuiltinModule: '$0 is also the name of a node core module',
+  manifestNameDot: "Name can't start with a dot",
+  manifestNameIllegalChars: 'Name contains illegal characters',
+  manifestNameBlacklisted: 'Name is blacklisted',
+  manifestLicenseInvalid: 'License should be a valid SPDX license expression',
+  manifestLicenseNone: 'No license field',
+  manifestStringExpected: '$0 is not a string',
+  manifestDependencyCollision: '$0 has dependency $1 with range $2 that collides with a dependency in $3 of the same name with version $4',
+  manifestDirectoryNotFound: 'Unable to read $0 directory of module $1',
+
+  verboseFileCopy: 'Copying $0 to $1.',
+  verboseFileLink: 'Creating hardlink at $0 to $1.',
+  verboseFileSymlink: 'Creating symlink at $0 to $1.',
+  verboseFileSkip: 'Skipping copying of file $0 as the file at $1 is the same size ($2) and mtime ($3).',
+  verboseFileSkipSymlink: 'Skipping copying of $0 as the file at $1 is the same symlink ($2).',
+  verboseFileSkipHardlink: 'Skipping copying of $0 as the file at $1 is the same hardlink ($2).',
+  verboseFileRemoveExtraneous: 'Removing extraneous file $0.',
+  verboseFilePhantomExtraneous: "File $0 would be marked as extraneous but has been removed as it's listed as a phantom file.",
+  verboseFileSkipArtifact: 'Skipping copying of $0 as the file is marked as a built artifact and subject to change.',
+  verboseFileFolder: 'Creating directory $0.',
+
+  verboseRequestStart: 'Performing $0 request to $1.',
+  verboseRequestFinish: 'Request $0 finished with status code $1.',
+
+  configSet: 'Set $0 to $1.',
+  configDelete: 'Deleted $0.',
+  configNpm: 'npm config',
+  configYarn: 'yarn config',
+
+  couldntFindPackagejson: "Couldn't find a package.json file in $0",
+  couldntFindMatch: "Couldn't find match for $0 in $1 for $2.",
+  couldntFindPackageInCache: "Couldn't find any versions for $0 that matches $1 in our cache (possible versions are $2). This is usually caused by a missing entry in the lockfile, running Yarn without the --offline flag may help fix this issue.",
+  couldntFindVersionThatMatchesRange: "Couldn't find any versions for $0 that matches $1",
+  chooseVersionFromList: 'Please choose a version of $0 from this list:',
+  moduleNotInManifest: "This module isn't specified in a package.json file.",
+  moduleAlreadyInManifest: '$0 is already in $1. Please remove existing entry first before adding it to $2.',
+  unknownFolderOrTarball: "Passed folder/tarball doesn't exist,",
+  unknownPackage: "Couldn't find package $0.",
+  unknownPackageName: "Couldn't find package name.",
+  unknownUser: "Couldn't find user $0.",
+  unknownRegistryResolver: 'Unknown registry resolver $0',
+  userNotAnOwner: "User $0 isn't an owner of this package.",
+  invalidVersionArgument: 'Use the $0 flag to create a new version.',
+  invalidVersion: 'Invalid version supplied.',
+  requiredVersionInRange: 'Required version in range.',
+  packageNotFoundRegistry: "Couldn't find package $0 on the $1 registry.",
+  requiredPackageNotFoundRegistry: "Couldn't find package $0 required by $1 on the $2 registry.",
+  doesntExist: "Package $1 refers to a non-existing file '$0'.",
+  missingRequiredPackageKey: `Package $0 doesn't have a $1.`,
+  invalidAccess: 'Invalid argument for access, expected public or restricted.',
+  invalidCommand: 'Invalid subcommand. Try $0',
+  invalidGistFragment: 'Invalid gist fragment $0.',
+  invalidHostedGitFragment: 'Invalid hosted git fragment $0.',
+  invalidFragment: 'Invalid fragment $0.',
+  invalidPackageName: 'Invalid package name.',
+  invalidPackageVersion: "Can't add $0: invalid package version $1.",
+  couldntFindManifestIn: "Couldn't find manifest in $0.",
+  shrinkwrapWarning: 'npm-shrinkwrap.json found. This will not be updated or respected. See https://yarnpkg.com/en/docs/migrating-from-npm for more information.',
+  npmLockfileWarning: 'package-lock.json found. Your project contains lock files generated by tools other than Yarn. It is advised not to mix package managers in order to avoid resolution inconsistencies caused by unsynchronized lock files. To clear this warning, remove package-lock.json.',
+  lockfileOutdated: 'Outdated lockfile. Please run `yarn install` and try again.',
+  lockfileMerged: 'Merge conflict detected in yarn.lock and successfully merged.',
+  lockfileConflict: 'A merge conflict was found in yarn.lock but it could not be successfully merged, regenerating yarn.lock from scratch.',
+  ignoredScripts: 'Ignored scripts due to flag.',
+  missingAddDependencies: 'Missing list of packages to add to your project.',
+  yesWarning: 'The yes flag has been set. This will automatically answer yes to all questions, which may have security implications.',
+  networkWarning: "You don't appear to have an internet connection. Try the --offline flag to use the cache for registry queries.",
+  flatGlobalError: 'The package $0 requires a flat dependency graph. Add `"flat": true` to your package.json and try again.',
+  noName: `Package doesn't have a name.`,
+  noVersion: `Package doesn't have a version.`,
+  answerRequired: 'An answer is required.',
+  missingWhyDependency: 'Missing package name, folder or path to file to identify why a package has been installed',
+  bugReport: 'If you think this is a bug, please open a bug report with the information provided in $0.',
+  unexpectedError: 'An unexpected error occurred: $0.',
+  jsonError: 'Error parsing JSON at $0, $1.',
+  noPermission: 'Cannot create $0 due to insufficient permissions.',
+  noGlobalFolder: 'Cannot find a suitable global folder. Tried these: $0',
+  allDependenciesUpToDate: 'All of your dependencies are up to date.',
+  legendColorsForVersionUpdates: 'Color legend : \n $0    : Major Update backward-incompatible updates \n $1 : Minor Update backward-compatible features \n $2  : Patch Update backward-compatible bug fixes',
+  frozenLockfileError: 'Your lockfile needs to be updated, but yarn was run with `--frozen-lockfile`.',
+  fileWriteError: 'Could not write file $0: $1',
+  multiplePackagesCantUnpackInSameDestination: 'Pattern $0 is trying to unpack in the same destination $1 as pattern $2. This could result in non-deterministic behavior, skipping.',
+  incorrectLockfileEntry: 'Lockfile has incorrect entry for $0. Ignoring it.',
+
+  invalidResolutionName: 'Resolution field $0 does not end with a valid package name and will be ignored',
+  invalidResolutionVersion: 'Resolution field $0 has an invalid version entry and may be ignored',
+  incompatibleResolutionVersion: 'Resolution field $0 is incompatible with requested version $1',
+
+  yarnOutdated: "Your current version of Yarn is out of date. The latest version is $0, while you're on $1.",
+  yarnOutdatedInstaller: 'To upgrade, download the latest installer at $0.',
+  yarnOutdatedCommand: 'To upgrade, run the following command:',
+
+  tooManyArguments: 'Too many arguments, maximum of $0.',
+  tooFewArguments: 'Not enough arguments, expected at least $0.',
+  noArguments: "This command doesn't require any arguments.",
+
+  ownerRemoving: 'Removing owner $0 from package $1.',
+  ownerRemoved: 'Owner removed.',
+  ownerRemoveError: "Couldn't remove owner.",
+  ownerGetting: 'Getting owners for package $0',
+  ownerGettingFailed: "Couldn't get list of owners.",
+  ownerAlready: 'This user is already an owner of this package.',
+  ownerAdded: 'Added owner.',
+  ownerAdding: 'Adding owner $0 to package $1',
+  ownerAddingFailed: "Couldn't add owner.",
+  ownerNone: 'No owners.',
+
+  teamCreating: 'Creating team',
+  teamRemoving: 'Removing team',
+  teamAddingUser: 'Adding user to team',
+  teamRemovingUser: 'Removing user from team',
+  teamListing: 'Listing teams',
+
+  cleaning: 'Cleaning modules',
+  cleanCreatingFile: 'Creating $0',
+  cleanCreatedFile: 'Created $0. Please review the contents of this file then run "yarn autoclean --force" to perform a clean.',
+  cleanAlreadyExists: '$0 already exists. To revert to the default file, delete $0 then rerun this command.',
+  cleanRequiresForce: 'This command required the "--force" flag to perform the clean. This is a destructive operation. Files specified in $0 will be deleted.',
+  cleanDoesNotExist: '$0 does not exist. Autoclean will delete files specified by $0. Run "autoclean --init" to create $0 with the default entries.',
+
+  binLinkCollision: "There's already a linked binary called $0 in your global Yarn bin. Could not link this package's $0 bin entry.",
+  linkCollision: "There's already a package called $0 registered. This command has had no effect. If this command was run in another folder with the same name, the other folder is still linked. Please run yarn unlink in the other folder if you want to register this folder.",
+  linkMissing: 'No registered package found called $0.',
+  linkRegistered: 'Registered $0.',
+  linkRegisteredMessage: 'You can now run `yarn link $0` in the projects where you want to use this package and it will be used instead.',
+  linkUnregistered: 'Unregistered $0.',
+  linkUnregisteredMessage: 'You can now run `yarn unlink $0` in the projects where you no longer want to use this package.',
+  linkUsing: 'Using linked package for $0.',
+  linkDisusing: 'Removed linked package $0.',
+  linkDisusingMessage: 'You will need to run `yarn install --force` to re-install the package that was linked.',
+  linkTargetMissing: 'The target of linked package $0 is missing. Removing link.',
+
+  createInvalidBin: 'Invalid bin entry found in package $0.',
+  createMissingPackage: 'Package not found - this is probably an internal error, and should be reported at https://github.com/yarnpkg/yarn/issues.',
+
+  workspacesAddRootCheck: 'Running this command will add the dependency to the workspace root rather than the workspace itself, which might not be what you want - if you really meant it, make it explicit by running this command again with the -W flag (or --ignore-workspace-root-check).',
+  workspacesRemoveRootCheck: 'Running this command will remove the dependency from the workspace root rather than the workspace itself, which might not be what you want - if you really meant it, make it explicit by running this command again with the -W flag (or --ignore-workspace-root-check).',
+  workspacesFocusRootCheck: 'This command can only be run inside an individual workspace.',
+  workspacesRequirePrivateProjects: 'Workspaces can only be enabled in private projects.',
+  workspacesSettingMustBeArray: 'The workspaces field in package.json must be an array.',
+  workspacesDisabled: 'Your project root defines workspaces but the feature is disabled in your Yarn config. Please check "workspaces-experimental" in your .yarnrc file.',
+
+  workspacesNohoistRequirePrivatePackages: 'nohoist config is ignored in $0 because it is not a private package. If you think nohoist should be allowed in public packages, please submit an issue for your use case.',
+  workspacesNohoistDisabled: `$0 defines nohoist but the feature is disabled in your Yarn config ("workspaces-nohoist-experimental" in .yarnrc file)`,
+
+  workspaceRootNotFound: "Cannot find the root of your workspace - are you sure you're currently in a workspace?",
+  workspaceMissingWorkspace: 'Missing workspace name.',
+  workspaceMissingCommand: 'Missing command name.',
+  workspaceUnknownWorkspace: 'Unknown workspace $0.',
+  workspaceVersionMandatory: 'Missing version in workspace at $0, ignoring.',
+  workspaceNameMandatory: 'Missing name in workspace at $0, ignoring.',
+  workspaceNameDuplicate: 'There are more than one workspace with name $0',
+
+  cacheFolderSkipped: 'Skipping preferred cache folder $0 because it is not writable.',
+  cacheFolderMissing: "Yarn hasn't been able to find a cache folder it can use. Please use the explicit --cache-folder option to tell it what location to use, or make one of the preferred locations writable.",
+  cacheFolderSelected: 'Selected the next writable cache folder in the list, will be $0.',
+
+  execMissingCommand: 'Missing command name.',
+
+  noScriptsAvailable: 'There are no scripts specified inside package.json.',
+  noBinAvailable: 'There are no binary scripts available.',
+  dashDashDeprecation: `From Yarn 1.0 onwards, scripts don't require "--" for options to be forwarded. In a future version, any explicit "--" will be forwarded as-is to the scripts.`,
+  commandNotSpecified: 'No command specified.',
+  binCommands: 'Commands available from binary scripts: ',
+  possibleCommands: 'Project commands',
+  commandQuestion: 'Which command would you like to run?',
+  commandFailedWithCode: 'Command failed with exit code $0.',
+  commandFailedWithSignal: 'Command failed with signal $0.',
+  packageRequiresNodeGyp: 'This package requires node-gyp, which is not currently installed. Yarn will attempt to automatically install it. If this fails, you can run "yarn global add node-gyp" to manually install it.',
+  nodeGypAutoInstallFailed: 'Failed to auto-install node-gyp. Please run "yarn global add node-gyp" manually. Error: $0',
+
+  foundIncompatible: 'Found incompatible module.',
+  incompatibleEngine: 'The engine $0 is incompatible with this module. Expected version $1. Got $2',
+  incompatibleCPU: 'The CPU architecture $0 is incompatible with this module.',
+  incompatibleOS: 'The platform $0 is incompatible with this module.',
+  invalidEngine: 'The engine $0 appears to be invalid.',
+  cannotRunWithIncompatibleEnv: 'Commands cannot run with an incompatible environment.',
+
+  optionalCompatibilityExcluded: '$0 is an optional dependency and failed compatibility check. Excluding it from installation.',
+  optionalModuleFail: 'This module is OPTIONAL, you can safely ignore this error',
+  optionalModuleScriptFail: 'Error running install script for optional dependency: $0',
+  optionalModuleCleanupFail: 'Could not cleanup build artifacts from failed install: $0',
+
+  unmetPeer: '$0 has unmet peer dependency $1.',
+  incorrectPeer: '$0 has incorrect peer dependency $1.',
+  selectedPeer: 'Selecting $1 at level $2 as the peer dependency of $0.',
+  missingBundledDependency: '$0 is missing a bundled dependency $1. This should be reported to the package maintainer.',
+
+  savedNewDependency: 'Saved 1 new dependency.',
+  savedNewDependencies: 'Saved $0 new dependencies.',
+  directDependencies: 'Direct dependencies',
+  allDependencies: 'All dependencies',
+
+  foundWarnings: 'Found $0 warnings.',
+  foundErrors: 'Found $0 errors.',
+
+  savedLockfile: 'Saved lockfile.',
+  noRequiredLockfile: 'No lockfile in this directory. Run `yarn install` to generate one.',
+  noLockfileFound: 'No lockfile found.',
+
+  invalidSemver: 'Invalid semver version',
+  newVersion: 'New version',
+  currentVersion: 'Current version',
+  noVersionOnPublish: 'Proceeding with current version',
+
+  manualVersionResolution: 'Unable to find a suitable version for $0, please choose one by typing one of the numbers below:',
+  manualVersionResolutionOption: '$0 which resolved to $1',
+
+  createdTag: 'Created tag.',
+  createdTagFail: "Couldn't add tag.",
+  deletedTag: 'Deleted tag.',
+  deletedTagFail: "Couldn't delete tag.",
+  gettingTags: 'Getting tags',
+  deletingTags: 'Deleting tag',
+  creatingTag: 'Creating tag $0 = $1',
+
+  whyStart: 'Why do we have the module $0?',
+  whyFinding: 'Finding dependency',
+  whyCalculating: 'Calculating file sizes',
+  whyUnknownMatch: "We couldn't find a match!",
+  whyInitGraph: 'Initialising dependency graph',
+  whyWhoKnows: "We don't know why this module exists",
+  whyDiskSizeWithout: 'Disk size without dependencies: $0',
+  whyDiskSizeUnique: 'Disk size with unique dependencies: $0',
+  whyDiskSizeTransitive: 'Disk size with transitive dependencies: $0',
+  whySharedDependencies: 'Number of shared dependencies: $0',
+  whyHoistedTo: `Has been hoisted to $0`,
+
+  whyHoistedFromSimple: `This module exists because it's hoisted from $0.`,
+  whyNotHoistedSimple: `This module exists here because it's in the nohoist list $0.`,
+  whyDependedOnSimple: `This module exists because $0 depends on it.`,
+  whySpecifiedSimple: `This module exists because it's specified in $0.`,
+  whyReasons: 'Reasons this module exists',
+  whyHoistedFrom: 'Hoisted from $0',
+  whyNotHoisted: `in the nohoist list $0`,
+  whyDependedOn: '$0 depends on it',
+  whySpecified: `Specified in $0`,
+
+  whyMatch: `\r=> Found $0`,
+
+  uninstalledPackages: 'Uninstalled packages.',
+  uninstallRegenerate: 'Regenerating lockfile and installing missing dependencies',
+
+  cleanRemovedFiles: 'Removed $0 files',
+  cleanSavedSize: 'Saved $0 MB.',
+
+  configFileFound: 'Found configuration file $0.',
+  configPossibleFile: 'Checking for configuration file $0.',
+
+  npmUsername: 'npm username',
+  npmPassword: 'npm password',
+  npmEmail: 'npm email',
+  npmOneTimePassword: 'npm one-time password',
+
+  loggingIn: 'Logging in',
+  loggedIn: 'Logged in.',
+  notRevokingEnvToken: 'Not revoking login token, specified via environment variable.',
+  notRevokingConfigToken: 'Not revoking login token, specified via config file.',
+  noTokenToRevoke: 'No login token to revoke.',
+  revokingToken: 'Revoking token',
+  revokedToken: 'Revoked login token.',
+
+  loginAsPublic: 'Logging in as public',
+  incorrectCredentials: 'Incorrect username or password.',
+  incorrectOneTimePassword: 'Incorrect one-time password.',
+  twoFactorAuthenticationEnabled: 'Two factor authentication enabled.',
+  clearedCredentials: 'Cleared login credentials.',
+
+  publishFail: "Couldn't publish package: $0",
+  publishPrivate: 'Package marked as private, not publishing.',
+  published: 'Published.',
+  publishing: 'Publishing',
+
+  nonInteractiveNoVersionSpecified: 'You must specify a new version with --new-version when running with --non-interactive.',
+  nonInteractiveNoToken: "No token found and can't prompt for login when running with --non-interactive.",
+
+  infoFail: 'Received invalid response from npm.',
+  malformedRegistryResponse: 'Received malformed response from registry for $0. The registry may be down.',
+  registryNoVersions: 'No valid versions found for $0. The package may be unpublished.',
+
+  cantRequestOffline: "Can't make a request in offline mode ($0)",
+  requestManagerNotSetupHAR: 'RequestManager was not setup to capture HAR files',
+  requestError: 'Request $0 returned a $1',
+  requestFailed: 'Request failed $0',
+  tarballNotInNetworkOrCache: '$0: Tarball is not in network and can not be located in cache ($1)',
+  fetchBadIntegrityCache: 'Incorrect integrity when fetching from the cache for $0. Cache has $1 and remote has $2. Run `yarn cache clean` to fix the problem',
+  fetchBadHashCache: 'Incorrect hash when fetching from the cache for $0. Cache has $1 and remote has $2. Run `yarn cache clean` to fix the problem',
+  fetchBadHashWithPath: "Integrity check failed for $0 (computed integrity doesn't match our records, got $2)",
+  fetchBadIntegrityAlgorithm: 'Integrity checked failed for $0 (none of the specified algorithms are supported)',
+  fetchErrorCorrupt: '$0. Mirror tarball appears to be corrupt. You can resolve this by running:\n\n  rm -rf $1\n  yarn install',
+  errorExtractingTarball: 'Extracting tar content of $1 failed, the file appears to be corrupt: $0',
+  updateInstalling: 'Installing $0...',
+  hostedGitResolveError: 'Error connecting to repository. Please, check the url.',
+
+  unknownFetcherFor: 'Unknown fetcher for $0',
+
+  downloadGitWithoutCommit: 'Downloading the git repo $0 over plain git without a commit hash',
+  downloadHTTPWithoutCommit: 'Downloading the git repo $0 over HTTP without a commit hash',
+
+  unplugDisabled: "Packages can only be unplugged when Plug'n'Play is enabled.",
+
+  plugnplaySuggestV2L1: "Plug'n'Play support has been greatly improved on the Yarn v2 development branch.",
+  plugnplaySuggestV2L2: 'Please give it a try and tell us what you think! - https://next.yarnpkg.com/getting-started/install',
+  plugnplayWindowsSupport: "Plug'n'Play on Windows doesn't support the cache and project to be kept on separate drives",
+
+  packageInstalledWithBinaries: 'Installed $0 with binaries:',
+  packageHasBinaries: '$0 has binaries:',
+  packageHasNoBinaries: '$0 has no binaries',
+  packageBinaryNotFound: "Couldn't find a binary named $0",
+
+  couldBeDeduped: '$0 could be deduped from $1 to $2',
+  lockfileNotContainPattern: 'Lockfile does not contain pattern: $0',
+  integrityCheckFailed: 'Integrity check failed',
+  noIntegrityFile: "Couldn't find an integrity file",
+  integrityFailedExpectedIsNotAJSON: 'Integrity check: integrity file is not a json',
+  integrityCheckLinkedModulesDontMatch: "Integrity check: Linked modules don't match",
+  integrityFlagsDontMatch: "Integrity check: Flags don't match",
+  integrityLockfilesDontMatch: "Integrity check: Lock files don't match",
+  integrityFailedFilesMissing: 'Integrity check: Files are missing',
+  integrityPatternsDontMatch: "Integrity check: Top level patterns don't match",
+  integrityModulesFoldersMissing: 'Integrity check: Some module folders are missing',
+  integritySystemParamsDontMatch: "Integrity check: System parameters don't match",
+  packageNotInstalled: '$0 not installed',
+  optionalDepNotInstalled: 'Optional dependency $0 not installed',
+  packageWrongVersion: '$0 is wrong version: expected $1, got $2',
+  packageDontSatisfy: "$0 doesn't satisfy found match of $1",
+
+  lockfileExists: 'Lockfile already exists, not importing.',
+  skippingImport: 'Skipping import of $0 for $1',
+  importFailed: 'Import of $0 for $1 failed, resolving normally.',
+  importResolveFailed: 'Import of $0 failed starting in $1',
+  importResolvedRangeMatch: 'Using version $0 of $1 instead of $2 for $3',
+  importSourceFilesCorrupted: 'Failed to import from package-lock.json, source file(s) corrupted',
+  importPackageLock: 'found npm package-lock.json, converting to yarn.lock',
+  importNodeModules: 'creating yarn.lock from local node_modules folder',
+  packageContainsYarnAsGlobal: 'Installing Yarn via Yarn will result in you having two separate versions of Yarn installed at the same time, which is not recommended. To update Yarn please follow https://yarnpkg.com/en/docs/install .',
+
+  scopeNotValid: 'The specified scope is not valid.',
+
+  deprecatedCommand: '$0 is deprecated. Please use $1.',
+  deprecatedListArgs: 'Filtering by arguments is deprecated. Please use the pattern option instead.',
+  implicitFileDeprecated: 'Using the "file:" protocol implicitly is deprecated. Please either prepend the protocol or prepend the path $0 with "./".',
+  unsupportedNodeVersion: 'You are using Node $0 which is not supported and may encounter bugs or unexpected behavior. Yarn supports the following semver range: $1',
+
+  verboseUpgradeBecauseRequested: 'Considering upgrade of $0 to $1 because it was directly requested.',
+  verboseUpgradeBecauseOutdated: 'Considering upgrade of $0 to $1 because a newer version exists in the registry.',
+  verboseUpgradeNotUnlocking: 'Not unlocking $0 in the lockfile because it is a new or direct dependency.',
+  verboseUpgradeUnlocking: 'Unlocking $0 in the lockfile.',
+  folderMissing: "Directory $0 doesn't exist",
+  mutexPortBusy: 'Cannot use the network mutex on port $0. It is probably used by another app.',
+
+  auditRunning: 'Auditing packages',
+  auditSummary: '$0 vulnerabilities found - Packages audited: $1',
+  auditSummarySeverity: 'Severity:',
+  auditCritical: '$0 Critical',
+  auditHigh: '$0 High',
+  auditModerate: '$0 Moderate',
+  auditLow: '$0 Low',
+  auditInfo: '$0 Info',
+  auditResolveCommand: '# Run $0 to resolve $1 $2',
+  auditSemverMajorChange: 'SEMVER WARNING: Recommended action is a potentially breaking change',
+  auditManualReview: 'Manual Review\nSome vulnerabilities require your attention to resolve\n\nVisit https://go.npm.me/audit-guide for additional guidance',
+  auditRunAuditForDetails: 'Security audit found potential problems. Run "yarn audit" for additional details.',
+  auditOffline: 'Skipping audit. Security audit cannot be performed in offline mode.'
+};
+
+exports.default = messages;
+
+/***/ }),
+/* 568 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.en = undefined;
+
+var _en;
+
+function _load_en() {
+  return _en = _interopRequireDefault(__webpack_require__(567));
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+exports.en = (_en || _load_en()).default;
+
+/***/ }),
+/* 569 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+var _baseReporter;
+
+function _load_baseReporter() {
+  return _baseReporter = _interopRequireDefault(__webpack_require__(108));
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/* eslint no-unused-vars: 0 */
+
+class NoopReporter extends (_baseReporter || _load_baseReporter()).default {
+  lang(key, ...args) {
+    return 'do nothing';
+  }
+  verbose(msg) {}
+  verboseInspect(val) {}
+  initPeakMemoryCounter() {}
+  checkPeakMemory() {}
+  close() {}
+  getTotalTime() {
+    return 0;
+  }
+  list(key, items, hints) {}
+  tree(key, obj) {}
+  step(current, total, message, emoji) {}
+  error(message) {}
+  info(message) {}
+  warn(message) {}
+  success(message) {}
+  log(message) {}
+  command(command) {}
+  inspect(value) {}
+  header(command, pkg) {}
+  footer(showPeakMemory) {}
+  table(head, body) {}
+
+  activity() {
+    return {
+      tick(name) {},
+      end() {}
+    };
+  }
+
+  activitySet(total, workers) {
+    return {
+      spinners: Array(workers).fill({
+        clear() {},
+        setPrefix() {},
+        tick() {},
+        end() {}
+      }),
+      end() {}
+    };
+  }
+
+  question(question, options = {}) {
+    return Promise.reject(new Error('Not implemented'));
+  }
+
+  questionAffirm(question) {
+    var _this = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      yield _this.question(question);
+      return false;
+    })();
+  }
+
+  select(header, question, options) {
+    return Promise.reject(new Error('Not implemented'));
+  }
+
+  progress(total) {
+    return function () {};
+  }
+
+  disableProgress() {
+    this.noProgress = true;
+  }
+
+  prompt(message, choices, options = {}) {
+    return Promise.reject(new Error('Not implemented'));
+  }
+}
+exports.default = NoopReporter;
+
+/***/ }),
+/* 570 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _extends2;
+
+function _load_extends() {
+  return _extends2 = _interopRequireDefault(__webpack_require__(21));
+}
+
+var _packageRequest;
+
+function _load_packageRequest() {
+  return _packageRequest = _interopRequireDefault(__webpack_require__(122));
+}
+
+var _baseResolver;
+
+function _load_baseResolver() {
+  return _baseResolver = _interopRequireDefault(__webpack_require__(123));
+}
+
+var _workspaceLayout;
+
+function _load_workspaceLayout() {
+  return _workspaceLayout = _interopRequireDefault(__webpack_require__(90));
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const invariant = __webpack_require__(9);
+
+class WorkspaceResolver extends (_baseResolver || _load_baseResolver()).default {
+  static isWorkspace(pattern, workspaceLayout) {
+    return !!workspaceLayout && !!workspaceLayout.getManifestByPattern(pattern);
+  }
+
+  constructor(request, fragment, workspaceLayout) {
+    super(request, fragment);
+    this.workspaceLayout = workspaceLayout;
+  }
+
+  resolve(downloadedManifest) {
+    const workspace = this.workspaceLayout.getManifestByPattern(this.request.pattern);
+    invariant(workspace, 'expected workspace');
+    const manifest = workspace.manifest,
+          loc = workspace.loc;
+
+    if (manifest._remote && manifest._remote.registryRemote) {
+      return Promise.resolve(manifest); //already downloaded
+    }
+    const registry = manifest._registry;
+    invariant(registry, 'expected reference');
+    let hash = '';
+    let registryRemote;
+    if (downloadedManifest && manifest.version === downloadedManifest.version) {
+      registryRemote = downloadedManifest._remote;
+      invariant(registryRemote, 'missing remote info');
+      hash = registryRemote.hash;
+      //override any local changes to manifest
+      Object.keys(manifest).forEach(k => k.startsWith('_') || delete manifest[k]);
+      Object.assign(manifest, downloadedManifest);
+    } else if (manifest._remote && manifest._remote.hash) {
+      invariant(workspace.manifest._remote, 'missing remote info');
+      registryRemote = workspace.manifest._remote.registryRemote;
+      hash = manifest._remote.hash;
+    }
+    if (registryRemote) {
+      registryRemote = (0, (_extends2 || _load_extends()).default)({}, registryRemote);
+    }
+
+    manifest._remote = Object.assign(manifest._remote || {}, {
+      type: 'workspace',
+      registryRemote,
+      registry,
+      hash,
+      reference: loc
+    });
+
+    manifest._uid = manifest.version;
+
+    return Promise.resolve(manifest);
+  }
+}
+exports.default = WorkspaceResolver;
+
+/***/ }),
+/* 571 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+var _hostedGitResolver;
+
+function _load_hostedGitResolver() {
+  return _hostedGitResolver = _interopRequireDefault(__webpack_require__(109));
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+class BitbucketResolver extends (_hostedGitResolver || _load_hostedGitResolver()).default {
+
+  static getTarballUrl(parts, hash) {
+    return `https://${this.hostname}/${parts.user}/${parts.repo}/get/${hash}.tar.gz`;
+  }
+
+  static getGitHTTPBaseUrl(parts) {
+    return `https://${this.hostname}/${parts.user}/${parts.repo}`;
+  }
+
+  static getGitHTTPUrl(parts) {
+    return `${BitbucketResolver.getGitHTTPBaseUrl(parts)}.git`;
+  }
+
+  static getGitSSHUrl(parts) {
+    return `git+ssh://git@${this.hostname}/${parts.user}/${parts.repo}.git` + `${parts.hash ? '#' + decodeURIComponent(parts.hash) : ''}`;
+  }
+
+  static getHTTPFileUrl(parts, filename, commit) {
+    return `https://${this.hostname}/${parts.user}/${parts.repo}/raw/${commit}/${filename}`;
+  }
+
+  hasHTTPCapability(url) {
+    var _this = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      // We don't follow redirects and reject a 302 since this means BitBucket
+      // won't allow us to use the HTTP protocol for `git` access.
+      // Most probably a private repo and this 302 is to a login page.
+      const bitbucketHTTPSupport = yield _this.config.requestManager.request({
+        url,
+        method: 'HEAD',
+        queue: _this.resolver.fetchingQueue,
+        followRedirect: false,
+        rejectStatusCode: 302
+      });
+      return bitbucketHTTPSupport !== false;
+    })();
+  }
+}
+exports.default = BitbucketResolver;
+BitbucketResolver.hostname = 'bitbucket.org';
+BitbucketResolver.protocol = 'bitbucket';
+
+/***/ }),
+/* 572 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _hostedGitResolver;
+
+function _load_hostedGitResolver() {
+  return _hostedGitResolver = _interopRequireDefault(__webpack_require__(109));
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+class GitLabResolver extends (_hostedGitResolver || _load_hostedGitResolver()).default {
+
+  static getTarballUrl(parts, hash) {
+    return `https://${this.hostname}/${parts.user}/${parts.repo}/repository/archive.tar.gz?ref=${hash}`;
+  }
+
+  static getGitHTTPBaseUrl(parts) {
+    return `https://${this.hostname}/${parts.user}/${parts.repo}`;
+  }
+
+  static getGitHTTPUrl(parts) {
+    return `${GitLabResolver.getGitHTTPBaseUrl(parts)}.git`;
+  }
+
+  static getGitSSHUrl(parts) {
+    return `git+ssh://git@${this.hostname}/${parts.user}/${parts.repo}.git` + `${parts.hash ? '#' + decodeURIComponent(parts.hash) : ''}`;
+  }
+
+  static getHTTPFileUrl(parts, filename, commit) {
+    return `https://${this.hostname}/${parts.user}/${parts.repo}/raw/${commit}/${filename}`;
+  }
+}
+exports.default = GitLabResolver;
+GitLabResolver.hostname = 'gitlab.com';
+GitLabResolver.protocol = 'gitlab';
+
+/***/ }),
+/* 573 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _errors;
+
+function _load_errors() {
+  return _errors = __webpack_require__(6);
+}
+
+var _exoticResolver;
+
+function _load_exoticResolver() {
+  return _exoticResolver = _interopRequireDefault(__webpack_require__(89));
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+class RegistryResolver extends (_exoticResolver || _load_exoticResolver()).default {
+  constructor(request, fragment) {
+    super(request, fragment);
+
+    const match = fragment.match(/^(\S+):(@?.*?)(@(.*?)|)$/);
+    if (match) {
+      this.range = match[4] || 'latest';
+      this.name = match[2];
+    } else {
+      throw new (_errors || _load_errors()).MessageError(this.reporter.lang('invalidFragment', fragment));
+    }
+
+    // $FlowFixMe
+    this.registry = this.constructor.protocol;
+  }
+
+  resolve() {
+    return this.fork(this.constructor.factory, false, this.name, this.range);
+  }
+}
+exports.default = RegistryResolver;
+
+/***/ }),
+/* 574 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+var _tarballFetcher;
+
+function _load_tarballFetcher() {
+  return _tarballFetcher = _interopRequireDefault(__webpack_require__(364));
+}
+
+var _exoticResolver;
+
+function _load_exoticResolver() {
+  return _exoticResolver = _interopRequireDefault(__webpack_require__(89));
+}
+
+var _gitResolver;
+
+function _load_gitResolver() {
+  return _gitResolver = _interopRequireDefault(__webpack_require__(124));
+}
+
+var _guessName;
+
+function _load_guessName() {
+  return _guessName = _interopRequireDefault(__webpack_require__(169));
+}
+
+var _version;
+
+function _load_version() {
+  return _version = _interopRequireWildcard(__webpack_require__(226));
+}
+
+var _crypto;
+
+function _load_crypto() {
+  return _crypto = _interopRequireWildcard(__webpack_require__(168));
+}
+
+var _fs;
+
+function _load_fs() {
+  return _fs = _interopRequireWildcard(__webpack_require__(4));
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const invariant = __webpack_require__(9);
+
+class TarballResolver extends (_exoticResolver || _load_exoticResolver()).default {
+  constructor(request, fragment) {
+    super(request, fragment);
+
+    var _versionUtil$explodeH = (_version || _load_version()).explodeHashedUrl(fragment);
+
+    const hash = _versionUtil$explodeH.hash,
+          url = _versionUtil$explodeH.url;
+
+    this.hash = hash;
+    this.url = url;
+  }
+
+  static isVersion(pattern) {
+    // we can sometimes match git urls which we don't want
+    if ((_gitResolver || _load_gitResolver()).default.isVersion(pattern)) {
+      return false;
+    }
+
+    // full http url
+    if (pattern.startsWith('http://') || pattern.startsWith('https://')) {
+      return true;
+    }
+
+    // local file reference - ignore patterns with names
+    if (pattern.indexOf('@') < 0) {
+      if (pattern.endsWith('.tgz') || pattern.endsWith('.tar.gz')) {
+        return true;
+      }
+    }
+
+    return false;
+  }
+
+  resolve() {
+    var _this = this;
+
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      const shrunk = _this.request.getLocked('tarball');
+      if (shrunk) {
+        return shrunk;
+      }
+
+      const url = _this.url;
+      let hash = _this.hash,
+          registry = _this.registry;
+
+      let pkgJson;
+
+      // generate temp directory
+      const dest = _this.config.getTemp((_crypto || _load_crypto()).hash(url));
+
+      if (yield _this.config.isValidModuleDest(dest)) {
+        var _ref = yield _this.config.readPackageMetadata(dest);
+        // load from local cache
+
+
+        pkgJson = _ref.package;
+        hash = _ref.hash;
+        registry = _ref.registry;
+      } else {
+        // delete if invalid
+        yield (_fs || _load_fs()).unlink(dest);
+
+        const fetcher = new (_tarballFetcher || _load_tarballFetcher()).default(dest, {
+          type: 'tarball',
+          reference: url,
+          registry,
+          hash
+        }, _this.config);
+
+        // fetch file and get it's hash
+        const fetched = yield fetcher.fetch({
+          name: (0, (_guessName || _load_guessName()).default)(url),
+          version: '0.0.0',
+          _registry: 'npm'
+        });
+        pkgJson = fetched.package;
+        hash = fetched.hash;
+
+        registry = pkgJson._registry;
+        invariant(registry, 'expected registry');
+      }
+
+      // use the commit/tarball hash as the uid as we can't rely on the version as it's not
+      // in the registry
+      pkgJson._uid = hash;
+
+      // set remote so it can be "fetched"
+      pkgJson._remote = {
+        type: 'copy',
+        resolved: `${url}#${hash}`,
+        hash,
+        registry,
+        reference: dest
+      };
+
+      return pkgJson;
+    })();
+  }
+}
+exports.default = TarballResolver;
+
+/***/ }),
+/* 575 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _baseResolver;
+
+function _load_baseResolver() {
+  return _baseResolver = _interopRequireDefault(__webpack_require__(123));
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+class RegistryResolver extends (_baseResolver || _load_baseResolver()).default {
+  constructor(request, name, range) {
+    super(request, `${name}@${range}`);
+    this.name = name;
+    this.range = range;
+
+    this.registryConfig = request.config.registries[this.constructor.registry].config;
+  }
+
+}
+exports.default = RegistryResolver;
+
+/***/ }),
+/* 576 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _npmResolver;
+
+function _load_npmResolver() {
+  return _npmResolver = _interopRequireDefault(__webpack_require__(217));
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+class YarnResolver extends (_npmResolver || _load_npmResolver()).default {}
+exports.default = YarnResolver;
+
+/***/ }),
+/* 577 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = envReplace;
+const ENV_EXPR = /(\\*)\$\{([^}]+)\}/g;
+
+function envReplace(value, env = process.env) {
+  if (typeof value !== 'string' || !value) {
+    return value;
+  }
+
+  return value.replace(ENV_EXPR, (match, esc, envVarName) => {
+    if (esc.length && esc.length % 2) {
+      return match;
+    }
+    if (undefined === env[envVarName]) {
+      throw new Error('Failed to replace env in config: ' + match);
+    }
+    return env[envVarName] || '';
+  });
+}
+
+/***/ }),
+/* 578 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.fixCmdWinSlashes = fixCmdWinSlashes;
+function fixCmdWinSlashes(cmd) {
+  function findQuotes(quoteSymbol) {
+    const quotes = [];
+    const addQuote = (_, index) => {
+      quotes.push({ from: index, to: index + _.length });
+      return _;
+    };
+    const regEx = new RegExp(quoteSymbol + '.*' + quoteSymbol);
+    cmd.replace(regEx, addQuote);
+    return quotes;
+  }
+  const quotes = findQuotes('"').concat(findQuotes("'"));
+
+  function isInsideQuotes(index) {
+    return quotes.reduce((result, quote) => {
+      return result || quote.from <= index && index <= quote.to;
+    }, false);
+  }
+
+  const cmdPrePattern = '((?:^|&&|&|\\|\\||\\|)\\s*)';
+  const cmdPattern = '(".*?"|\'.*?\'|\\S*)';
+  const regExp = new RegExp(`${cmdPrePattern}${cmdPattern}`, 'g');
+  return cmd.replace(regExp, (whole, pre, cmd, index) => {
+    if ((pre[0] === '&' || pre[0] === '|') && isInsideQuotes(index)) {
+      return whole;
+    }
+    return pre + cmd.replace(/\//g, '\\');
+  });
+}
+
+/***/ }),
+/* 579 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.generatePnpMap = undefined;
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+let getPackageInformationStores = (() => {
+  var _ref17 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, seedPatterns, { resolver, reporter, targetPath, workspaceLayout }) {
+    const targetDirectory = path.dirname(targetPath);
+    const offlineCacheFolder = config.offlineCacheFolder;
+
+    const packageInformationStores = new Map();
+    const blacklistedLocations = new Set();
+
+    const getCachePath = function getCachePath(fsPath) {
+      const cacheRelativePath = normalizePath(path.relative(config.cacheFolder, fsPath));
+
+      // if fsPath is not inside cacheRelativePath, we just skip it
+      if (cacheRelativePath.match(/^\.\.\//)) {
+        return null;
+      }
+
+      return cacheRelativePath;
+    };
+
+    const resolveOfflineCacheFolder = function resolveOfflineCacheFolder(fsPath) {
+      if (!offlineCacheFolder) {
+        return fsPath;
+      }
+
+      const cacheRelativePath = getCachePath(fsPath);
+
+      // if fsPath is not inside the cache, we shouldn't replace it (workspace)
+      if (!cacheRelativePath) {
+        return fsPath;
+      }
+
+      const components = cacheRelativePath.split(/\//g);
+      const cacheEntry = components[0],
+            internalPath = components.slice(1);
+
+
+      return path.resolve(offlineCacheFolder, `${cacheEntry}${OFFLINE_CACHE_EXTENSION}`, internalPath.join('/'));
+    };
+
+    const normalizePath = function normalizePath(fsPath) {
+      return process.platform === 'win32' ? fsPath.replace(backwardSlashRegExp, '/') : fsPath;
+    };
+
+    const normalizeDirectoryPath = function normalizeDirectoryPath(fsPath) {
+      let relativePath = normalizePath(path.relative(targetDirectory, resolveOfflineCacheFolder(fsPath)));
+
+      if (!relativePath.match(/^\.{0,2}\//) && !path.isAbsolute(relativePath)) {
+        relativePath = `./${relativePath}`;
+      }
+
+      return relativePath.replace(/\/?$/, '/');
+    };
+
+    const getHashFrom = function getHashFrom(data) {
+      const hashGenerator = crypto.createHash('sha1');
+
+      for (var _iterator10 = data, _isArray10 = Array.isArray(_iterator10), _i10 = 0, _iterator10 = _isArray10 ? _iterator10 : _iterator10[Symbol.iterator]();;) {
+        var _ref18;
+
+        if (_isArray10) {
+          if (_i10 >= _iterator10.length) break;
+          _ref18 = _iterator10[_i10++];
+        } else {
+          _i10 = _iterator10.next();
+          if (_i10.done) break;
+          _ref18 = _i10.value;
+        }
+
+        const datum = _ref18;
+
+        hashGenerator.update(datum);
+      }
+
+      return hashGenerator.digest('hex');
+    };
+
+    const getResolverEntry = function getResolverEntry(pattern) {
+      const pkg = resolver.getStrictResolvedPattern(pattern);
+      const ref = pkg._reference;
+
+      if (!ref) {
+        return null;
+      }
+
+      invariant(ref.locations.length <= 1, 'Must have at most one location (usually in the cache)');
+      const loc = ref.locations[0];
+
+      if (!loc) {
+        return null;
+      }
+
+      return { pkg, ref, loc };
+    };
+
+    const visit = (() => {
+      var _ref19 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (precomputedResolutions, seedPatterns, parentData = []) {
+        const resolutions = new Map(precomputedResolutions);
+        const locations = new Map();
+
+        // This first pass will compute the package reference of each of the given patterns
+        // They will usually be the package version, but not always. We need to do this in a pre-process pass, because the
+        // dependencies might depend on one another, so if we need to replace one of them, we need to compute it first
+        for (var _iterator11 = seedPatterns, _isArray11 = Array.isArray(_iterator11), _i11 = 0, _iterator11 = _isArray11 ? _iterator11 : _iterator11[Symbol.iterator]();;) {
+          var _ref20;
+
+          if (_isArray11) {
+            if (_i11 >= _iterator11.length) break;
+            _ref20 = _iterator11[_i11++];
+          } else {
+            _i11 = _iterator11.next();
+            if (_i11.done) break;
+            _ref20 = _i11.value;
+          }
+
+          const pattern = _ref20;
+
+          const entry = getResolverEntry(pattern);
+
+          if (!entry) {
+            continue;
+          }
+
+          const pkg = entry.pkg,
+                ref = entry.ref;
+          let loc = entry.loc;
+
+
+          const packageName = pkg.name;
+          let packageReference = pkg.version;
+
+          // If we have peer dependencies, then we generate a new virtual reference based on the parent one
+          // We cannot generate this reference based on what those peer references resolve to, because they might not have
+          // been computed yet (for example, consider the case where A has a peer dependency on B, and B a peer dependency
+          // on A; it's valid, but it prevents us from computing A and B - and it's even worse with 3+ packages involved)
+          const peerDependencies = new Set(Array.from(Object.keys(pkg.peerDependencies || {})));
+
+          // As an optimization, we only setup virtual packages if their underlying packages are referenced multiple times
+          // in the tree. This allow us to avoid having to create symlinks in the majority of cases
+          if (peerDependencies.size > 0 && ref.requests.length > 1) {
+            const hash = getHashFrom([...parentData, packageName, packageReference]);
+
+            let symlinkSource;
+            let symlinkFile;
+
+            switch (ref.remote.type) {
+              case 'workspace':
+                {
+                  symlinkSource = loc;
+                  symlinkFile = path.resolve(config.lockfileFolder, '.pnp', 'workspaces', `pnp-${hash}`, packageName);
+
+                  loc = symlinkFile;
+                }
+                break;
+
+              default:
+                {
+                  const isFromCache = getCachePath(loc);
+
+                  const hashName = isFromCache && offlineCacheFolder ? `pnp-${hash}${OFFLINE_CACHE_EXTENSION}` : `pnp-${hash}`;
+                  const newLoc = path.resolve(config.lockfileFolder, '.pnp', 'externals', hashName, 'node_modules', packageName);
+
+                  // The `node_modules/<pkgName>` part is already there when the package comes from the cache
+                  if (isFromCache) {
+                    const getBase = function getBase(source) {
+                      return path.resolve(source, '../'.repeat(1 + packageName.split('/').length));
+                    };
+                    symlinkSource = resolveOfflineCacheFolder(getBase(loc));
+                    symlinkFile = getBase(newLoc);
+                  } else {
+                    symlinkSource = loc;
+                    symlinkFile = newLoc;
+                  }
+
+                  loc = newLoc;
+                }
+                break;
+            }
+
+            yield (_fs || _load_fs()).mkdirp(path.dirname(symlinkFile));
+            yield (_fs || _load_fs()).symlink(symlinkSource, symlinkFile);
+
+            packageReference = `pnp:${hash}`;
+
+            // We blacklist this path so that we can print a nicer error message if someone tries to require it (it usually
+            // means that they're using realpath on the return value of require.resolve)
+            blacklistedLocations.add(normalizeDirectoryPath(loc));
+          }
+
+          // Now that we have the final reference, we need to store it
+          resolutions.set(packageName, packageReference);
+          locations.set(packageName, loc);
+        }
+
+        // Now that we have the final references, we can start the main loop, which will insert the packages into the store
+        // if they aren't already there, and recurse over their own children
+        for (var _iterator12 = seedPatterns, _isArray12 = Array.isArray(_iterator12), _i12 = 0, _iterator12 = _isArray12 ? _iterator12 : _iterator12[Symbol.iterator]();;) {
+          var _ref21;
+
+          if (_isArray12) {
+            if (_i12 >= _iterator12.length) break;
+            _ref21 = _iterator12[_i12++];
+          } else {
+            _i12 = _iterator12.next();
+            if (_i12.done) break;
+            _ref21 = _i12.value;
+          }
+
+          const pattern = _ref21;
+
+          const entry = getResolverEntry(pattern);
+
+          if (!entry) {
+            continue;
+          }
+
+          const pkg = entry.pkg,
+                ref = entry.ref;
+
+
+          const packageName = pkg.name;
+
+          const packageReference = resolutions.get(packageName);
+          invariant(packageReference, `Package reference should have been computed during the pre-pass`);
+
+          const loc = locations.get(packageName);
+          invariant(loc, `Package location should have been computed during the pre-pass`);
+
+          // We can early exit if the package is already registered with the exact same name and reference, since even if
+          // we might get slightly different dependencies (depending on how things were optimized), both sets are valid
+          let packageInformationStore = packageInformationStores.get(packageName);
+
+          if (!packageInformationStore) {
+            packageInformationStore = new Map();
+            packageInformationStores.set(packageName, packageInformationStore);
+          }
+
+          let packageInformation = packageInformationStore.get(packageReference);
+
+          if (packageInformation) {
+            continue;
+          }
+
+          packageInformation = {
+            packageLocation: normalizeDirectoryPath(loc),
+            packageDependencies: new Map()
+          };
+
+          // Split the dependencies between direct/peer - we will only recurse on the former
+          const peerDependencies = new Set(Array.from(Object.keys(pkg.peerDependencies || {})));
+          const directDependencies = ref.dependencies.filter(function (pattern) {
+            const pkg = resolver.getStrictResolvedPattern(pattern);
+            return !pkg || !peerDependencies.has(pkg.name);
+          });
+
+          // We inject the partial information in the store right now so that we won't cycle indefinitely
+          packageInformationStore.set(packageReference, packageInformation);
+
+          // We must inject the peer dependencies before iterating; one of our dependencies might have a peer dependency
+          // on one of our peer dependencies, so it must be available from the start (we don't have to do that for direct
+          // dependencies, because the "visit" function that will iterate over them will automatically add the to the
+          // candidate resolutions as part of the first step, cf above)
+
+          for (var _iterator13 = peerDependencies, _isArray13 = Array.isArray(_iterator13), _i13 = 0, _iterator13 = _isArray13 ? _iterator13 : _iterator13[Symbol.iterator]();;) {
+            var _ref22;
+
+            if (_isArray13) {
+              if (_i13 >= _iterator13.length) break;
+              _ref22 = _iterator13[_i13++];
+            } else {
+              _i13 = _iterator13.next();
+              if (_i13.done) break;
+              _ref22 = _i13.value;
+            }
+
+            const dependencyName = _ref22;
+
+            const dependencyReference = resolutions.get(dependencyName);
+
+            if (dependencyReference) {
+              packageInformation.packageDependencies.set(dependencyName, dependencyReference);
+            }
+          }
+
+          const childResolutions = yield visit(packageInformation.packageDependencies, directDependencies, [packageName, packageReference]);
+
+          // We can now inject into our package the resolutions we got from the visit function
+          for (var _iterator14 = childResolutions.entries(), _isArray14 = Array.isArray(_iterator14), _i14 = 0, _iterator14 = _isArray14 ? _iterator14 : _iterator14[Symbol.iterator]();;) {
+            var _ref24;
+
+            if (_isArray14) {
+              if (_i14 >= _iterator14.length) break;
+              _ref24 = _iterator14[_i14++];
+            } else {
+              _i14 = _iterator14.next();
+              if (_i14.done) break;
+              _ref24 = _i14.value;
+            }
+
+            const _ref23 = _ref24;
+            const name = _ref23[0];
+            const reference = _ref23[1];
+
+            packageInformation.packageDependencies.set(name, reference);
+          }
+
+          // Finally, unless a package depends on a previous version of itself (that would be weird but correct...), we
+          // inject them an implicit dependency to themselves (so that they can require themselves)
+          if (!packageInformation.packageDependencies.has(packageName)) {
+            packageInformation.packageDependencies.set(packageName, packageReference);
+          }
+        }
+
+        return resolutions;
+      });
+
+      return function visit(_x4, _x5) {
+        return _ref19.apply(this, arguments);
+      };
+    })();
+
+    // If we have workspaces, we need to iterate over them all in order to add them to the map
+    // This is because they might not be declared as dependencies of the top-level project (and with reason, since the
+    // top-level package might depend on a different than the one provided in the workspaces - cf Babel, which depends
+    // on an old version of itself in order to compile itself)
+    if (workspaceLayout) {
+      for (var _iterator15 = Object.keys(workspaceLayout.workspaces), _isArray15 = Array.isArray(_iterator15), _i15 = 0, _iterator15 = _isArray15 ? _iterator15 : _iterator15[Symbol.iterator]();;) {
+        var _ref25;
+
+        if (_isArray15) {
+          if (_i15 >= _iterator15.length) break;
+          _ref25 = _iterator15[_i15++];
+        } else {
+          _i15 = _iterator15.next();
+          if (_i15.done) break;
+          _ref25 = _i15.value;
+        }
+
+        const name = _ref25;
+
+        const pkg = workspaceLayout.workspaces[name].manifest;
+
+        // Skip the aggregator, since it's essentially a duplicate of the top-level package that we'll iterate later on
+        if (pkg.workspaces) {
+          continue;
+        }
+
+        const ref = pkg._reference;
+        invariant(ref, `Workspaces should have a reference`);
+
+        invariant(ref.locations.length === 1, `Workspaces should have exactly one location`);
+        const loc = ref.locations[0];
+        invariant(loc, `Workspaces should have a location`);
+
+        let packageInformationStore = packageInformationStores.get(name);
+
+        if (!packageInformationStore) {
+          packageInformationStore = new Map();
+          packageInformationStores.set(name, packageInformationStore);
+        }
+
+        packageInformationStore.set(pkg.version, {
+          packageLocation: normalizeDirectoryPath(loc),
+          packageDependencies: yield visit(new Map(), ref.dependencies, [name, pkg.version])
+        });
+      }
+    }
+
+    // Register the top-level package in our map
+    // This will recurse on each of its dependencies as well.
+    packageInformationStores.set(null, new Map([[null, {
+      packageLocation: normalizeDirectoryPath(config.lockfileFolder),
+      packageDependencies: yield visit(new Map(), seedPatterns)
+    }]]));
+
+    return [packageInformationStores, blacklistedLocations];
+  });
+
+  return function getPackageInformationStores(_x, _x2, _x3) {
+    return _ref17.apply(this, arguments);
+  };
+})();
+
+let generatePnpMap = exports.generatePnpMap = (() => {
+  var _ref26 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, seedPatterns, { resolver, reporter, workspaceLayout, targetPath }) {
+    var _ref27 = yield getPackageInformationStores(config, seedPatterns, {
+      resolver,
+      reporter,
+      targetPath,
+      workspaceLayout
+    });
+
+    const packageInformationStores = _ref27[0],
+          blacklistedLocations = _ref27[1];
+
+
+    const setupStaticTables = [generateMaps(packageInformationStores, blacklistedLocations), generateFindPackageLocator(packageInformationStores)].join(``);
+
+    return pnpApi.replace(/\$\$SHEBANG/g, config.plugnplayShebang).replace(/\$\$BLACKLIST/g, JSON.stringify(config.plugnplayBlacklist)).replace(/\$\$SETUP_STATIC_TABLES\(\);/g, setupStaticTables);
+  });
+
+  return function generatePnpMap(_x6, _x7, _x8) {
+    return _ref26.apply(this, arguments);
+  };
+})();
+
+var _fs;
+
+function _load_fs() {
+  return _fs = _interopRequireWildcard(__webpack_require__(4));
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/* babel-plugin-inline-import './generate-pnp-map-api.tpl.js' */const pnpApi = '#!$$SHEBANG\n\n/* eslint-disable max-len, flowtype/require-valid-file-annotation, flowtype/require-return-type */\n/* global packageInformationStores, $$BLACKLIST, $$SETUP_STATIC_TABLES */\n\n// Used for the resolveUnqualified part of the resolution (ie resolving folder/index.js & file extensions)\n// Deconstructed so that they aren\'t affected by any fs monkeypatching occuring later during the execution\nconst {statSync, lstatSync, readlinkSync, readFileSync, existsSync, realpathSync} = require(\'fs\');\n\nconst Module = require(\'module\');\nconst path = require(\'path\');\nconst StringDecoder = require(\'string_decoder\');\n\nconst ignorePattern = $$BLACKLIST ? new RegExp($$BLACKLIST) : null;\n\nconst pnpFile = path.resolve(__dirname, __filename);\nconst builtinModules = new Set(Module.builtinModules || Object.keys(process.binding(\'natives\')));\n\nconst topLevelLocator = {name: null, reference: null};\nconst blacklistedLocator = {name: NaN, reference: NaN};\n\n// Used for compatibility purposes - cf setupCompatibilityLayer\nconst patchedModules = [];\nconst fallbackLocators = [topLevelLocator];\n\n// Matches backslashes of Windows paths\nconst backwardSlashRegExp = /\\\\/g;\n\n// Matches if the path must point to a directory (ie ends with /)\nconst isDirRegExp = /\\/$/;\n\n// Matches if the path starts with a valid path qualifier (./, ../, /)\n// eslint-disable-next-line no-unused-vars\nconst isStrictRegExp = /^\\.{0,2}\\//;\n\n// Splits a require request into its components, or return null if the request is a file path\nconst pathRegExp = /^(?![a-zA-Z]:[\\\\\\/]|\\\\\\\\|\\.{0,2}(?:\\/|$))((?:@[^\\/]+\\/)?[^\\/]+)\\/?(.*|)$/;\n\n// Keep a reference around ("module" is a common name in this context, so better rename it to something more significant)\nconst pnpModule = module;\n\n/**\n * Used to disable the resolution hooks (for when we want to fallback to the previous resolution - we then need\n * a way to "reset" the environment temporarily)\n */\n\nlet enableNativeHooks = true;\n\n/**\n * Simple helper function that assign an error code to an error, so that it can more easily be caught and used\n * by third-parties.\n */\n\nfunction makeError(code, message, data = {}) {\n  const error = new Error(message);\n  return Object.assign(error, {code, data});\n}\n\n/**\n * Ensures that the returned locator isn\'t a blacklisted one.\n *\n * Blacklisted packages are packages that cannot be used because their dependencies cannot be deduced. This only\n * happens with peer dependencies, which effectively have different sets of dependencies depending on their parents.\n *\n * In order to deambiguate those different sets of dependencies, the Yarn implementation of PnP will generate a\n * symlink for each combination of <package name>/<package version>/<dependent package> it will find, and will\n * blacklist the target of those symlinks. By doing this, we ensure that files loaded through a specific path\n * will always have the same set of dependencies, provided the symlinks are correctly preserved.\n *\n * Unfortunately, some tools do not preserve them, and when it happens PnP isn\'t able anymore to deduce the set of\n * dependencies based on the path of the file that makes the require calls. But since we\'ve blacklisted those paths,\n * we\'re able to print a more helpful error message that points out that a third-party package is doing something\n * incompatible!\n */\n\n// eslint-disable-next-line no-unused-vars\nfunction blacklistCheck(locator) {\n  if (locator === blacklistedLocator) {\n    throw makeError(\n      `BLACKLISTED`,\n      [\n        `A package has been resolved through a blacklisted path - this is usually caused by one of your tools calling`,\n        `"realpath" on the return value of "require.resolve". Since the returned values use symlinks to disambiguate`,\n        `peer dependencies, they must be passed untransformed to "require".`,\n      ].join(` `)\n    );\n  }\n\n  return locator;\n}\n\n$$SETUP_STATIC_TABLES();\n\n/**\n * Returns the module that should be used to resolve require calls. It\'s usually the direct parent, except if we\'re\n * inside an eval expression.\n */\n\nfunction getIssuerModule(parent) {\n  let issuer = parent;\n\n  while (issuer && (issuer.id === \'[eval]\' || issuer.id === \'<repl>\' || !issuer.filename)) {\n    issuer = issuer.parent;\n  }\n\n  return issuer;\n}\n\n/**\n * Returns information about a package in a safe way (will throw if they cannot be retrieved)\n */\n\nfunction getPackageInformationSafe(packageLocator) {\n  const packageInformation = exports.getPackageInformation(packageLocator);\n\n  if (!packageInformation) {\n    throw makeError(\n      `INTERNAL`,\n      `Couldn\'t find a matching entry in the dependency tree for the specified parent (this is probably an internal error)`\n    );\n  }\n\n  return packageInformation;\n}\n\n/**\n * Implements the node resolution for folder access and extension selection\n */\n\nfunction applyNodeExtensionResolution(unqualifiedPath, {extensions}) {\n  // We use this "infinite while" so that we can restart the process as long as we hit package folders\n  while (true) {\n    let stat;\n\n    try {\n      stat = statSync(unqualifiedPath);\n    } catch (error) {}\n\n    // If the file exists and is a file, we can stop right there\n\n    if (stat && !stat.isDirectory()) {\n      // If the very last component of the resolved path is a symlink to a file, we then resolve it to a file. We only\n      // do this first the last component, and not the rest of the path! This allows us to support the case of bin\n      // symlinks, where a symlink in "/xyz/pkg-name/.bin/bin-name" will point somewhere else (like "/xyz/pkg-name/index.js").\n      // In such a case, we want relative requires to be resolved relative to "/xyz/pkg-name/" rather than "/xyz/pkg-name/.bin/".\n      //\n      // Also note that the reason we must use readlink on the last component (instead of realpath on the whole path)\n      // is that we must preserve the other symlinks, in particular those used by pnp to deambiguate packages using\n      // peer dependencies. For example, "/xyz/.pnp/local/pnp-01234569/.bin/bin-name" should see its relative requires\n      // be resolved relative to "/xyz/.pnp/local/pnp-0123456789/" rather than "/xyz/pkg-with-peers/", because otherwise\n      // we would lose the information that would tell us what are the dependencies of pkg-with-peers relative to its\n      // ancestors.\n\n      if (lstatSync(unqualifiedPath).isSymbolicLink()) {\n        unqualifiedPath = path.normalize(path.resolve(path.dirname(unqualifiedPath), readlinkSync(unqualifiedPath)));\n      }\n\n      return unqualifiedPath;\n    }\n\n    // If the file is a directory, we must check if it contains a package.json with a "main" entry\n\n    if (stat && stat.isDirectory()) {\n      let pkgJson;\n\n      try {\n        pkgJson = JSON.parse(readFileSync(`${unqualifiedPath}/package.json`, \'utf-8\'));\n      } catch (error) {}\n\n      let nextUnqualifiedPath;\n\n      if (pkgJson && pkgJson.main) {\n        nextUnqualifiedPath = path.resolve(unqualifiedPath, pkgJson.main);\n      }\n\n      // If the "main" field changed the path, we start again from this new location\n\n      if (nextUnqualifiedPath && nextUnqualifiedPath !== unqualifiedPath) {\n        const resolution = applyNodeExtensionResolution(nextUnqualifiedPath, {extensions});\n\n        if (resolution !== null) {\n          return resolution;\n        }\n      }\n    }\n\n    // Otherwise we check if we find a file that match one of the supported extensions\n\n    const qualifiedPath = extensions\n      .map(extension => {\n        return `${unqualifiedPath}${extension}`;\n      })\n      .find(candidateFile => {\n        return existsSync(candidateFile);\n      });\n\n    if (qualifiedPath) {\n      return qualifiedPath;\n    }\n\n    // Otherwise, we check if the path is a folder - in such a case, we try to use its index\n\n    if (stat && stat.isDirectory()) {\n      const indexPath = extensions\n        .map(extension => {\n          return `${unqualifiedPath}/index${extension}`;\n        })\n        .find(candidateFile => {\n          return existsSync(candidateFile);\n        });\n\n      if (indexPath) {\n        return indexPath;\n      }\n    }\n\n    // Otherwise there\'s nothing else we can do :(\n\n    return null;\n  }\n}\n\n/**\n * This function creates fake modules that can be used with the _resolveFilename function.\n * Ideally it would be nice to be able to avoid this, since it causes useless allocations\n * and cannot be cached efficiently (we recompute the nodeModulePaths every time).\n *\n * Fortunately, this should only affect the fallback, and there hopefully shouldn\'t be a\n * lot of them.\n */\n\nfunction makeFakeModule(path) {\n  const fakeModule = new Module(path, false);\n  fakeModule.filename = path;\n  fakeModule.paths = Module._nodeModulePaths(path);\n  return fakeModule;\n}\n\n/**\n * Normalize path to posix format.\n */\n\nfunction normalizePath(fsPath) {\n  fsPath = path.normalize(fsPath);\n\n  if (process.platform === \'win32\') {\n    fsPath = fsPath.replace(backwardSlashRegExp, \'/\');\n  }\n\n  return fsPath;\n}\n\n/**\n * Forward the resolution to the next resolver (usually the native one)\n */\n\nfunction callNativeResolution(request, issuer) {\n  if (issuer.endsWith(\'/\')) {\n    issuer += \'internal.js\';\n  }\n\n  try {\n    enableNativeHooks = false;\n\n    // Since we would need to create a fake module anyway (to call _resolveLookupPath that\n    // would give us the paths to give to _resolveFilename), we can as well not use\n    // the {paths} option at all, since it internally makes _resolveFilename create another\n    // fake module anyway.\n    return Module._resolveFilename(request, makeFakeModule(issuer), false);\n  } finally {\n    enableNativeHooks = true;\n  }\n}\n\n/**\n * This key indicates which version of the standard is implemented by this resolver. The `std` key is the\n * Plug\'n\'Play standard, and any other key are third-party extensions. Third-party extensions are not allowed\n * to override the standard, and can only offer new methods.\n *\n * If an new version of the Plug\'n\'Play standard is released and some extensions conflict with newly added\n * functions, they\'ll just have to fix the conflicts and bump their own version number.\n */\n\nexports.VERSIONS = {std: 1};\n\n/**\n * Useful when used together with getPackageInformation to fetch information about the top-level package.\n */\n\nexports.topLevel = {name: null, reference: null};\n\n/**\n * Gets the package information for a given locator. Returns null if they cannot be retrieved.\n */\n\nexports.getPackageInformation = function getPackageInformation({name, reference}) {\n  const packageInformationStore = packageInformationStores.get(name);\n\n  if (!packageInformationStore) {\n    return null;\n  }\n\n  const packageInformation = packageInformationStore.get(reference);\n\n  if (!packageInformation) {\n    return null;\n  }\n\n  return packageInformation;\n};\n\n/**\n * Transforms a request (what\'s typically passed as argument to the require function) into an unqualified path.\n * This path is called "unqualified" because it only changes the package name to the package location on the disk,\n * which means that the end result still cannot be directly accessed (for example, it doesn\'t try to resolve the\n * file extension, or to resolve directories to their "index.js" content). Use the "resolveUnqualified" function\n * to convert them to fully-qualified paths, or just use "resolveRequest" that do both operations in one go.\n *\n * Note that it is extremely important that the `issuer` path ends with a forward slash if the issuer is to be\n * treated as a folder (ie. "/tmp/foo/" rather than "/tmp/foo" if "foo" is a directory). Otherwise relative\n * imports won\'t be computed correctly (they\'ll get resolved relative to "/tmp/" instead of "/tmp/foo/").\n */\n\nexports.resolveToUnqualified = function resolveToUnqualified(request, issuer, {considerBuiltins = true} = {}) {\n  // The \'pnpapi\' request is reserved and will always return the path to the PnP file, from everywhere\n\n  if (request === `pnpapi`) {\n    return pnpFile;\n  }\n\n  // Bailout if the request is a native module\n\n  if (considerBuiltins && builtinModules.has(request)) {\n    return null;\n  }\n\n  // We allow disabling the pnp resolution for some subpaths. This is because some projects, often legacy,\n  // contain multiple levels of dependencies (ie. a yarn.lock inside a subfolder of a yarn.lock). This is\n  // typically solved using workspaces, but not all of them have been converted already.\n\n  if (ignorePattern && ignorePattern.test(normalizePath(issuer))) {\n    const result = callNativeResolution(request, issuer);\n\n    if (result === false) {\n      throw makeError(\n        `BUILTIN_NODE_RESOLUTION_FAIL`,\n        `The builtin node resolution algorithm was unable to resolve the module referenced by "${request}" and requested from "${issuer}" (it didn\'t go through the pnp resolver because the issuer was explicitely ignored by the regexp "$$BLACKLIST")`,\n        {\n          request,\n          issuer,\n        }\n      );\n    }\n\n    return result;\n  }\n\n  let unqualifiedPath;\n\n  // If the request is a relative or absolute path, we just return it normalized\n\n  const dependencyNameMatch = request.match(pathRegExp);\n\n  if (!dependencyNameMatch) {\n    if (path.isAbsolute(request)) {\n      unqualifiedPath = path.normalize(request);\n    } else if (issuer.match(isDirRegExp)) {\n      unqualifiedPath = path.normalize(path.resolve(issuer, request));\n    } else {\n      unqualifiedPath = path.normalize(path.resolve(path.dirname(issuer), request));\n    }\n  }\n\n  // Things are more hairy if it\'s a package require - we then need to figure out which package is needed, and in\n  // particular the exact version for the given location on the dependency tree\n\n  if (dependencyNameMatch) {\n    const [, dependencyName, subPath] = dependencyNameMatch;\n\n    const issuerLocator = exports.findPackageLocator(issuer);\n\n    // If the issuer file doesn\'t seem to be owned by a package managed through pnp, then we resort to using the next\n    // resolution algorithm in the chain, usually the native Node resolution one\n\n    if (!issuerLocator) {\n      const result = callNativeResolution(request, issuer);\n\n      if (result === false) {\n        throw makeError(\n          `BUILTIN_NODE_RESOLUTION_FAIL`,\n          `The builtin node resolution algorithm was unable to resolve the module referenced by "${request}" and requested from "${issuer}" (it didn\'t go through the pnp resolver because the issuer doesn\'t seem to be part of the Yarn-managed dependency tree)`,\n          {\n            request,\n            issuer,\n          }\n        );\n      }\n\n      return result;\n    }\n\n    const issuerInformation = getPackageInformationSafe(issuerLocator);\n\n    // We obtain the dependency reference in regard to the package that request it\n\n    let dependencyReference = issuerInformation.packageDependencies.get(dependencyName);\n\n    // If we can\'t find it, we check if we can potentially load it from the packages that have been defined as potential fallbacks.\n    // It\'s a bit of a hack, but it improves compatibility with the existing Node ecosystem. Hopefully we should eventually be able\n    // to kill this logic and become stricter once pnp gets enough traction and the affected packages fix themselves.\n\n    if (issuerLocator !== topLevelLocator) {\n      for (let t = 0, T = fallbackLocators.length; dependencyReference === undefined && t < T; ++t) {\n        const fallbackInformation = getPackageInformationSafe(fallbackLocators[t]);\n        dependencyReference = fallbackInformation.packageDependencies.get(dependencyName);\n      }\n    }\n\n    // If we can\'t find the path, and if the package making the request is the top-level, we can offer nicer error messages\n\n    if (!dependencyReference) {\n      if (dependencyReference === null) {\n        if (issuerLocator === topLevelLocator) {\n          throw makeError(\n            `MISSING_PEER_DEPENDENCY`,\n            `You seem to be requiring a peer dependency ("${dependencyName}"), but it is not installed (which might be because you\'re the top-level package)`,\n            {request, issuer, dependencyName}\n          );\n        } else {\n          throw makeError(\n            `MISSING_PEER_DEPENDENCY`,\n            `Package "${issuerLocator.name}@${issuerLocator.reference}" is trying to access a peer dependency ("${dependencyName}") that should be provided by its direct ancestor but isn\'t`,\n            {request, issuer, issuerLocator: Object.assign({}, issuerLocator), dependencyName}\n          );\n        }\n      } else {\n        if (issuerLocator === topLevelLocator) {\n          throw makeError(\n            `UNDECLARED_DEPENDENCY`,\n            `You cannot require a package ("${dependencyName}") that is not declared in your dependencies (via "${issuer}")`,\n            {request, issuer, dependencyName}\n          );\n        } else {\n          const candidates = Array.from(issuerInformation.packageDependencies.keys());\n          throw makeError(\n            `UNDECLARED_DEPENDENCY`,\n            `Package "${issuerLocator.name}@${issuerLocator.reference}" (via "${issuer}") is trying to require the package "${dependencyName}" (via "${request}") without it being listed in its dependencies (${candidates.join(\n              `, `\n            )})`,\n            {request, issuer, issuerLocator: Object.assign({}, issuerLocator), dependencyName, candidates}\n          );\n        }\n      }\n    }\n\n    // We need to check that the package exists on the filesystem, because it might not have been installed\n\n    const dependencyLocator = {name: dependencyName, reference: dependencyReference};\n    const dependencyInformation = exports.getPackageInformation(dependencyLocator);\n    const dependencyLocation = path.resolve(__dirname, dependencyInformation.packageLocation);\n\n    if (!dependencyLocation) {\n      throw makeError(\n        `MISSING_DEPENDENCY`,\n        `Package "${dependencyLocator.name}@${dependencyLocator.reference}" is a valid dependency, but hasn\'t been installed and thus cannot be required (it might be caused if you install a partial tree, such as on production environments)`,\n        {request, issuer, dependencyLocator: Object.assign({}, dependencyLocator)}\n      );\n    }\n\n    // Now that we know which package we should resolve to, we only have to find out the file location\n\n    if (subPath) {\n      unqualifiedPath = path.resolve(dependencyLocation, subPath);\n    } else {\n      unqualifiedPath = dependencyLocation;\n    }\n  }\n\n  return path.normalize(unqualifiedPath);\n};\n\n/**\n * Transforms an unqualified path into a qualified path by using the Node resolution algorithm (which automatically\n * appends ".js" / ".json", and transforms directory accesses into "index.js").\n */\n\nexports.resolveUnqualified = function resolveUnqualified(\n  unqualifiedPath,\n  {extensions = Object.keys(Module._extensions)} = {}\n) {\n  const qualifiedPath = applyNodeExtensionResolution(unqualifiedPath, {extensions});\n\n  if (qualifiedPath) {\n    return path.normalize(qualifiedPath);\n  } else {\n    throw makeError(\n      `QUALIFIED_PATH_RESOLUTION_FAILED`,\n      `Couldn\'t find a suitable Node resolution for unqualified path "${unqualifiedPath}"`,\n      {unqualifiedPath}\n    );\n  }\n};\n\n/**\n * Transforms a request into a fully qualified path.\n *\n * Note that it is extremely important that the `issuer` path ends with a forward slash if the issuer is to be\n * treated as a folder (ie. "/tmp/foo/" rather than "/tmp/foo" if "foo" is a directory). Otherwise relative\n * imports won\'t be computed correctly (they\'ll get resolved relative to "/tmp/" instead of "/tmp/foo/").\n */\n\nexports.resolveRequest = function resolveRequest(request, issuer, {considerBuiltins, extensions} = {}) {\n  let unqualifiedPath;\n\n  try {\n    unqualifiedPath = exports.resolveToUnqualified(request, issuer, {considerBuiltins});\n  } catch (originalError) {\n    // If we get a BUILTIN_NODE_RESOLUTION_FAIL error there, it means that we\'ve had to use the builtin node\n    // resolution, which usually shouldn\'t happen. It might be because the user is trying to require something\n    // from a path loaded through a symlink (which is not possible, because we need something normalized to\n    // figure out which package is making the require call), so we try to make the same request using a fully\n    // resolved issuer and throws a better and more actionable error if it works.\n    if (originalError.code === `BUILTIN_NODE_RESOLUTION_FAIL`) {\n      let realIssuer;\n\n      try {\n        realIssuer = realpathSync(issuer);\n      } catch (error) {}\n\n      if (realIssuer) {\n        if (issuer.endsWith(`/`)) {\n          realIssuer = realIssuer.replace(/\\/?$/, `/`);\n        }\n\n        try {\n          exports.resolveToUnqualified(request, realIssuer, {considerBuiltins});\n        } catch (error) {\n          // If an error was thrown, the problem doesn\'t seem to come from a path not being normalized, so we\n          // can just throw the original error which was legit.\n          throw originalError;\n        }\n\n        // If we reach this stage, it means that resolveToUnqualified didn\'t fail when using the fully resolved\n        // file path, which is very likely caused by a module being invoked through Node with a path not being\n        // correctly normalized (ie you should use "node $(realpath script.js)" instead of "node script.js").\n        throw makeError(\n          `SYMLINKED_PATH_DETECTED`,\n          `A pnp module ("${request}") has been required from what seems to be a symlinked path ("${issuer}"). This is not possible, you must ensure that your modules are invoked through their fully resolved path on the filesystem (in this case "${realIssuer}").`,\n          {\n            request,\n            issuer,\n            realIssuer,\n          }\n        );\n      }\n    }\n    throw originalError;\n  }\n\n  if (unqualifiedPath === null) {\n    return null;\n  }\n\n  try {\n    return exports.resolveUnqualified(unqualifiedPath, {extensions});\n  } catch (resolutionError) {\n    if (resolutionError.code === \'QUALIFIED_PATH_RESOLUTION_FAILED\') {\n      Object.assign(resolutionError.data, {request, issuer});\n    }\n    throw resolutionError;\n  }\n};\n\n/**\n * Setups the hook into the Node environment.\n *\n * From this point on, any call to `require()` will go through the "resolveRequest" function, and the result will\n * be used as path of the file to load.\n */\n\nexports.setup = function setup() {\n  // A small note: we don\'t replace the cache here (and instead use the native one). This is an effort to not\n  // break code similar to "delete require.cache[require.resolve(FOO)]", where FOO is a package located outside\n  // of the Yarn dependency tree. In this case, we defer the load to the native loader. If we were to replace the\n  // cache by our own, the native loader would populate its own cache, which wouldn\'t be exposed anymore, so the\n  // delete call would be broken.\n\n  const originalModuleLoad = Module._load;\n\n  Module._load = function(request, parent, isMain) {\n    if (!enableNativeHooks) {\n      return originalModuleLoad.call(Module, request, parent, isMain);\n    }\n\n    // Builtins are managed by the regular Node loader\n\n    if (builtinModules.has(request)) {\n      try {\n        enableNativeHooks = false;\n        return originalModuleLoad.call(Module, request, parent, isMain);\n      } finally {\n        enableNativeHooks = true;\n      }\n    }\n\n    // The \'pnpapi\' name is reserved to return the PnP api currently in use by the program\n\n    if (request === `pnpapi`) {\n      return pnpModule.exports;\n    }\n\n    // Request `Module._resolveFilename` (ie. `resolveRequest`) to tell us which file we should load\n\n    const modulePath = Module._resolveFilename(request, parent, isMain);\n\n    // Check if the module has already been created for the given file\n\n    const cacheEntry = Module._cache[modulePath];\n\n    if (cacheEntry) {\n      return cacheEntry.exports;\n    }\n\n    // Create a new module and store it into the cache\n\n    const module = new Module(modulePath, parent);\n    Module._cache[modulePath] = module;\n\n    // The main module is exposed as global variable\n\n    if (isMain) {\n      process.mainModule = module;\n      module.id = \'.\';\n    }\n\n    // Try to load the module, and remove it from the cache if it fails\n\n    let hasThrown = true;\n\n    try {\n      module.load(modulePath);\n      hasThrown = false;\n    } finally {\n      if (hasThrown) {\n        delete Module._cache[modulePath];\n      }\n    }\n\n    // Some modules might have to be patched for compatibility purposes\n\n    for (const [filter, patchFn] of patchedModules) {\n      if (filter.test(request)) {\n        module.exports = patchFn(exports.findPackageLocator(parent.filename), module.exports);\n      }\n    }\n\n    return module.exports;\n  };\n\n  const originalModuleResolveFilename = Module._resolveFilename;\n\n  Module._resolveFilename = function(request, parent, isMain, options) {\n    if (!enableNativeHooks) {\n      return originalModuleResolveFilename.call(Module, request, parent, isMain, options);\n    }\n\n    let issuers;\n\n    if (options) {\n      const optionNames = new Set(Object.keys(options));\n      optionNames.delete(\'paths\');\n\n      if (optionNames.size > 0) {\n        throw makeError(\n          `UNSUPPORTED`,\n          `Some options passed to require() aren\'t supported by PnP yet (${Array.from(optionNames).join(\', \')})`\n        );\n      }\n\n      if (options.paths) {\n        issuers = options.paths.map(entry => `${path.normalize(entry)}/`);\n      }\n    }\n\n    if (!issuers) {\n      const issuerModule = getIssuerModule(parent);\n      const issuer = issuerModule ? issuerModule.filename : `${process.cwd()}/`;\n\n      issuers = [issuer];\n    }\n\n    let firstError;\n\n    for (const issuer of issuers) {\n      let resolution;\n\n      try {\n        resolution = exports.resolveRequest(request, issuer);\n      } catch (error) {\n        firstError = firstError || error;\n        continue;\n      }\n\n      return resolution !== null ? resolution : request;\n    }\n\n    throw firstError;\n  };\n\n  const originalFindPath = Module._findPath;\n\n  Module._findPath = function(request, paths, isMain) {\n    if (!enableNativeHooks) {\n      return originalFindPath.call(Module, request, paths, isMain);\n    }\n\n    for (const path of paths) {\n      let resolution;\n\n      try {\n        resolution = exports.resolveRequest(request, path);\n      } catch (error) {\n        continue;\n      }\n\n      if (resolution) {\n        return resolution;\n      }\n    }\n\n    return false;\n  };\n\n  process.versions.pnp = String(exports.VERSIONS.std);\n};\n\nexports.setupCompatibilityLayer = () => {\n  // ESLint currently doesn\'t have any portable way for shared configs to specify their own\n  // plugins that should be used (https://github.com/eslint/eslint/issues/10125). This will\n  // likely get fixed at some point, but it\'ll take time and in the meantime we\'ll just add\n  // additional fallback entries for common shared configs.\n\n  for (const name of [`react-scripts`]) {\n    const packageInformationStore = packageInformationStores.get(name);\n    if (packageInformationStore) {\n      for (const reference of packageInformationStore.keys()) {\n        fallbackLocators.push({name, reference});\n      }\n    }\n  }\n\n  // Modern versions of `resolve` support a specific entry point that custom resolvers can use\n  // to inject a specific resolution logic without having to patch the whole package.\n  //\n  // Cf: https://github.com/browserify/resolve/pull/174\n\n  patchedModules.push([\n    /^\\.\\/normalize-options\\.js$/,\n    (issuer, normalizeOptions) => {\n      if (!issuer || issuer.name !== \'resolve\') {\n        return normalizeOptions;\n      }\n\n      return (request, opts) => {\n        opts = opts || {};\n\n        if (opts.forceNodeResolution) {\n          return opts;\n        }\n\n        opts.preserveSymlinks = true;\n        opts.paths = function(request, basedir, getNodeModulesDir, opts) {\n          // Extract the name of the package being requested (1=full name, 2=scope name, 3=local name)\n          const parts = request.match(/^((?:(@[^\\/]+)\\/)?([^\\/]+))/);\n\n          // make sure that basedir ends with a slash\n          if (basedir.charAt(basedir.length - 1) !== \'/\') {\n            basedir = path.join(basedir, \'/\');\n          }\n          // This is guaranteed to return the path to the "package.json" file from the given package\n          const manifestPath = exports.resolveToUnqualified(`${parts[1]}/package.json`, basedir);\n\n          // The first dirname strips the package.json, the second strips the local named folder\n          let nodeModules = path.dirname(path.dirname(manifestPath));\n\n          // Strips the scope named folder if needed\n          if (parts[2]) {\n            nodeModules = path.dirname(nodeModules);\n          }\n\n          return [nodeModules];\n        };\n\n        return opts;\n      };\n    },\n  ]);\n};\n\nif (module.parent && module.parent.id === \'internal/preload\') {\n  exports.setupCompatibilityLayer();\n\n  exports.setup();\n}\n\nif (process.mainModule === module) {\n  exports.setupCompatibilityLayer();\n\n  const reportError = (code, message, data) => {\n    process.stdout.write(`${JSON.stringify([{code, message, data}, null])}\\n`);\n  };\n\n  const reportSuccess = resolution => {\n    process.stdout.write(`${JSON.stringify([null, resolution])}\\n`);\n  };\n\n  const processResolution = (request, issuer) => {\n    try {\n      reportSuccess(exports.resolveRequest(request, issuer));\n    } catch (error) {\n      reportError(error.code, error.message, error.data);\n    }\n  };\n\n  const processRequest = data => {\n    try {\n      const [request, issuer] = JSON.parse(data);\n      processResolution(request, issuer);\n    } catch (error) {\n      reportError(`INVALID_JSON`, error.message, error.data);\n    }\n  };\n\n  if (process.argv.length > 2) {\n    if (process.argv.length !== 4) {\n      process.stderr.write(`Usage: ${process.argv[0]} ${process.argv[1]} <request> <issuer>\\n`);\n      process.exitCode = 64; /* EX_USAGE */\n    } else {\n      processResolution(process.argv[2], process.argv[3]);\n    }\n  } else {\n    let buffer = \'\';\n    const decoder = new StringDecoder.StringDecoder();\n\n    process.stdin.on(\'data\', chunk => {\n      buffer += decoder.write(chunk);\n\n      do {\n        const index = buffer.indexOf(\'\\n\');\n        if (index === -1) {\n          break;\n        }\n\n        const line = buffer.slice(0, index);\n        buffer = buffer.slice(index + 1);\n\n        processRequest(line);\n      } while (true);\n    });\n  }\n}\n';
+
+
+const crypto = __webpack_require__(11);
+const invariant = __webpack_require__(9);
+const path = __webpack_require__(0);
+
+const backwardSlashRegExp = /\\/g;
+
+const OFFLINE_CACHE_EXTENSION = `.zip`;
+
+function generateMaps(packageInformationStores, blacklistedLocations) {
+  let code = ``;
+
+  // Bake the information stores into our generated code
+  code += `let packageInformationStores = new Map([\n`;
+  for (var _iterator = packageInformationStores, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+    var _ref2;
+
+    if (_isArray) {
+      if (_i >= _iterator.length) break;
+      _ref2 = _iterator[_i++];
+    } else {
+      _i = _iterator.next();
+      if (_i.done) break;
+      _ref2 = _i.value;
+    }
+
+    const _ref = _ref2;
+    const packageName = _ref[0];
+    const packageInformationStore = _ref[1];
+
+    code += `  [${JSON.stringify(packageName)}, new Map([\n`;
+    for (var _iterator4 = packageInformationStore, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
+      var _ref7;
+
+      if (_isArray4) {
+        if (_i4 >= _iterator4.length) break;
+        _ref7 = _iterator4[_i4++];
+      } else {
+        _i4 = _iterator4.next();
+        if (_i4.done) break;
+        _ref7 = _i4.value;
+      }
+
+      const _ref6 = _ref7;
+      const packageReference = _ref6[0];
+      var _ref6$ = _ref6[1];
+      const packageLocation = _ref6$.packageLocation;
+      const packageDependencies = _ref6$.packageDependencies;
+
+      code += `    [${JSON.stringify(packageReference)}, {\n`;
+      code += `      packageLocation: path.resolve(__dirname, ${JSON.stringify(packageLocation)}),\n`;
+      code += `      packageDependencies: new Map([\n`;
+      for (var _iterator5 = packageDependencies.entries(), _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
+        var _ref9;
+
+        if (_isArray5) {
+          if (_i5 >= _iterator5.length) break;
+          _ref9 = _iterator5[_i5++];
+        } else {
+          _i5 = _iterator5.next();
+          if (_i5.done) break;
+          _ref9 = _i5.value;
+        }
+
+        const _ref8 = _ref9;
+        const dependencyName = _ref8[0];
+        const dependencyReference = _ref8[1];
+
+        code += `        [${JSON.stringify(dependencyName)}, ${JSON.stringify(dependencyReference)}],\n`;
+      }
+      code += `      ]),\n`;
+      code += `    }],\n`;
+    }
+    code += `  ])],\n`;
+  }
+  code += `]);\n`;
+
+  code += `\n`;
+
+  // Also bake an inverse map that will allow us to find the package information based on the path
+  code += `let locatorsByLocations = new Map([\n`;
+  for (var _iterator2 = blacklistedLocations, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+    var _ref3;
+
+    if (_isArray2) {
+      if (_i2 >= _iterator2.length) break;
+      _ref3 = _iterator2[_i2++];
+    } else {
+      _i2 = _iterator2.next();
+      if (_i2.done) break;
+      _ref3 = _i2.value;
+    }
+
+    const blacklistedLocation = _ref3;
+
+    code += `  [${JSON.stringify(blacklistedLocation)}, blacklistedLocator],\n`;
+  }
+  for (var _iterator3 = packageInformationStores, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
+    var _ref5;
+
+    if (_isArray3) {
+      if (_i3 >= _iterator3.length) break;
+      _ref5 = _iterator3[_i3++];
+    } else {
+      _i3 = _iterator3.next();
+      if (_i3.done) break;
+      _ref5 = _i3.value;
+    }
+
+    const _ref4 = _ref5;
+    const packageName = _ref4[0];
+    const packageInformationStore = _ref4[1];
+
+    for (var _iterator6 = packageInformationStore, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) {
+      var _ref11;
+
+      if (_isArray6) {
+        if (_i6 >= _iterator6.length) break;
+        _ref11 = _iterator6[_i6++];
+      } else {
+        _i6 = _iterator6.next();
+        if (_i6.done) break;
+        _ref11 = _i6.value;
+      }
+
+      const _ref10 = _ref11;
+      const packageReference = _ref10[0];
+      const packageLocation = _ref10[1].packageLocation;
+
+      if (packageName !== null) {
+        code += `  [${JSON.stringify(packageLocation)}, ${JSON.stringify({
+          name: packageName,
+          reference: packageReference
+        })}],\n`;
+      } else {
+        code += `  [${JSON.stringify(packageLocation)}, topLevelLocator],\n`;
+      }
+    }
+  }
+  code += `]);\n`;
+
+  return code;
+}
+
+function generateFindPackageLocator(packageInformationStores) {
+  let code = ``;
+
+  // We get the list of each string length we'll need to check in order to find the current package context
+  const lengths = new Map();
+
+  for (var _iterator7 = packageInformationStores.values(), _isArray7 = Array.isArray(_iterator7), _i7 = 0, _iterator7 = _isArray7 ? _iterator7 : _iterator7[Symbol.iterator]();;) {
+    var _ref12;
+
+    if (_isArray7) {
+      if (_i7 >= _iterator7.length) break;
+      _ref12 = _iterator7[_i7++];
+    } else {
+      _i7 = _iterator7.next();
+      if (_i7.done) break;
+      _ref12 = _i7.value;
+    }
+
+    const packageInformationStore = _ref12;
+
+    for (var _iterator9 = packageInformationStore.values(), _isArray9 = Array.isArray(_iterator9), _i9 = 0, _iterator9 = _isArray9 ? _iterator9 : _iterator9[Symbol.iterator]();;) {
+      var _ref16;
+
+      if (_isArray9) {
+        if (_i9 >= _iterator9.length) break;
+        _ref16 = _iterator9[_i9++];
+      } else {
+        _i9 = _iterator9.next();
+        if (_i9.done) break;
+        _ref16 = _i9.value;
+      }
+
+      const _ref15 = _ref16;
+      const packageLocation = _ref15.packageLocation;
+
+      if (packageLocation === null) {
+        continue;
+      }
+
+      const length = packageLocation.length;
+      const count = (lengths.get(length) || 0) + 1;
+
+      lengths.set(length, count);
+    }
+  }
+
+  // We must try the larger lengths before the smaller ones, because smaller ones might also match the longest ones
+  // (for instance, /project/path will match /project/path/.pnp/global/node_modules/pnp-cf5f9c17b8f8db)
+  const sortedLengths = Array.from(lengths.entries()).sort((a, b) => {
+    return b[0] - a[0];
+  });
+
+  // Generate a function that, given a file path, returns the associated package name
+  code += `exports.findPackageLocator = function findPackageLocator(location) {\n`;
+  code += `  let relativeLocation = normalizePath(path.relative(__dirname, location));\n`;
+  code += `\n`;
+  code += `  if (!relativeLocation.match(isStrictRegExp))\n`;
+  code += `    relativeLocation = \`./\${relativeLocation}\`;\n`;
+  code += `\n`;
+  code += `  if (location.match(isDirRegExp) && relativeLocation.charAt(relativeLocation.length - 1) !== '/')\n`;
+  code += `    relativeLocation = \`\${relativeLocation}/\`;\n`;
+  code += `\n`;
+  code += `  let match;\n`;
+
+  for (var _iterator8 = sortedLengths, _isArray8 = Array.isArray(_iterator8), _i8 = 0, _iterator8 = _isArray8 ? _iterator8 : _iterator8[Symbol.iterator]();;) {
+    var _ref14;
+
+    if (_isArray8) {
+      if (_i8 >= _iterator8.length) break;
+      _ref14 = _iterator8[_i8++];
+    } else {
+      _i8 = _iterator8.next();
+      if (_i8.done) break;
+      _ref14 = _i8.value;
+    }
+
+    const _ref13 = _ref14;
+    const length = _ref13[0];
+
+    code += `\n`;
+    code += `  if (relativeLocation.length >= ${length} && relativeLocation[${length - 1}] === '/')\n`;
+    code += `    if (match = locatorsByLocations.get(relativeLocation.substr(0, ${length})))\n`;
+    code += `      return blacklistCheck(match);\n`;
+  }
+
+  code += `\n`;
+  code += `  return null;\n`;
+  code += `};\n`;
+
+  return code;
+}
+
+/***/ }),
+/* 580 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getTransitiveDevDependencies = getTransitiveDevDependencies;
+function dependenciesObjectToPatterns(dependencies) {
+  if (!dependencies) {
+    return [];
+  }
+  return Object.keys(dependencies).map(name => `${name}@${(dependencies || {})[name]}`);
+}
+
+// Enumerate all the transitive dependencies of a set of top-level packages
+function getTransitiveDependencies(lockfile, roots) {
+  // Queue of dependency patterns to visit; set of already-visited patterns
+  const queue = [];
+  const patterns = new Set();
+
+  const enqueue = pattern => {
+    if (patterns.has(pattern)) {
+      return;
+    }
+    patterns.add(pattern);
+    queue.push(pattern);
+  };
+
+  roots.forEach(enqueue);
+
+  // Final result set
+  const transitiveDependencies = new Set();
+
+  while (queue.length > 0) {
+    const pattern = queue.shift();
+    const lockManifest = lockfile.getLocked(pattern);
+
+    if (!lockManifest) {
+      continue;
+    }
+
+    // Add the dependency to the result set
+    transitiveDependencies.add(`${lockManifest.name}@${lockManifest.version}`);
+
+    // Enqueue any dependencies of the dependency for processing
+
+    const dependencyPatterns = dependenciesObjectToPatterns(lockManifest.dependencies);
+    dependencyPatterns.forEach(enqueue);
+
+    const optionalDependencyPatterns = dependenciesObjectToPatterns(lockManifest.optionalDependencies);
+    optionalDependencyPatterns.forEach(enqueue);
+  }
+
+  return transitiveDependencies;
+}
+
+function setDifference(x, y) {
+  return new Set([...x].filter(value => !y.has(value)));
+}
+
+// Given a manifest, an optional workspace layout, and a lockfile, enumerate
+// all package versions that:
+// i) are present in the lockfile
+// ii) are a transitive dependency of some top-level devDependency
+// iii) are not a transitive dependency of some top-level production dependency
+function getTransitiveDevDependencies(packageManifest, workspaceLayout, lockfile) {
+  // Enumerate the top-level package manifest as well as any workspace manifests
+  const manifests = [packageManifest];
+  if (workspaceLayout) {
+    for (var _iterator = Object.keys(workspaceLayout.workspaces), _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+      var _ref;
+
+      if (_isArray) {
+        if (_i >= _iterator.length) break;
+        _ref = _iterator[_i++];
+      } else {
+        _i = _iterator.next();
+        if (_i.done) break;
+        _ref = _i.value;
+      }
+
+      const name = _ref;
+
+      manifests.push(workspaceLayout.workspaces[name].manifest);
+    }
+  }
+
+  // Collect all the top-level production and development dependencies across all manifests
+  let productionRoots = [];
+  let developmentRoots = [];
+  for (var _iterator2 = manifests, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+    var _ref2;
+
+    if (_isArray2) {
+      if (_i2 >= _iterator2.length) break;
+      _ref2 = _iterator2[_i2++];
+    } else {
+      _i2 = _iterator2.next();
+      if (_i2.done) break;
+      _ref2 = _i2.value;
+    }
+
+    const manifest = _ref2;
+
+    productionRoots = productionRoots.concat(dependenciesObjectToPatterns(manifest.dependencies));
+    productionRoots = productionRoots.concat(dependenciesObjectToPatterns(manifest.optionalDependencies));
+    developmentRoots = developmentRoots.concat(dependenciesObjectToPatterns(manifest.devDependencies));
+  }
+
+  // Enumerate all the transitive production and development dependencies
+  const productionDependencies = getTransitiveDependencies(lockfile, productionRoots);
+  const developmentDependencies = getTransitiveDependencies(lockfile, developmentRoots);
+
+  // Exclude any development dependencies that are also production dependencies
+  return setDifference(developmentDependencies, productionDependencies);
+}
+
+/***/ }),
+/* 581 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.parseRefs = exports.resolveVersion = exports.isCommitSha = undefined;
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+var _misc;
+
+function _load_misc() {
+  return _misc = __webpack_require__(18);
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const semver = __webpack_require__(22);
+
+const REF_PREFIX = 'refs/';
+const REF_TAG_PREFIX = 'refs/tags/';
+const REF_BRANCH_PREFIX = 'refs/heads/';
+const REF_PR_PREFIX = 'refs/pull/';
+
+// This regex is designed to match output from git of the style:
+//   ebeb6eafceb61dd08441ffe086c77eb472842494  refs/tags/v0.21.0
+// and extract the hash and ref name as capture groups
+const GIT_REF_LINE_REGEXP = /^([a-fA-F0-9]+)\s+(refs\/(?:tags|heads|pull|remotes)\/.*)$/;
+
+const COMMIT_SHA_REGEXP = /^[a-f0-9]{5,40}$/;
+const REF_NAME_REGEXP = /^refs\/(tags|heads)\/(.+)$/;
+
+const isCommitSha = exports.isCommitSha = target => COMMIT_SHA_REGEXP.test(target);
+
+const tryVersionAsGitCommit = ({ version, refs, git }) => {
+  const lowercaseVersion = version.toLowerCase();
+  if (!isCommitSha(lowercaseVersion)) {
+    return Promise.resolve(null);
+  }
+  for (var _iterator = refs.entries(), _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+    var _ref2;
+
+    if (_isArray) {
+      if (_i >= _iterator.length) break;
+      _ref2 = _iterator[_i++];
+    } else {
+      _i = _iterator.next();
+      if (_i.done) break;
+      _ref2 = _i.value;
+    }
+
+    const _ref = _ref2;
+    const ref = _ref[0];
+    const sha = _ref[1];
+
+    if (sha.startsWith(lowercaseVersion)) {
+      return Promise.resolve({ sha, ref });
+    }
+  }
+  return git.resolveCommit(lowercaseVersion);
+};
+
+const tryEmptyVersionAsDefaultBranch = ({ version, git }) => version.trim() === '' ? git.resolveDefaultBranch() : Promise.resolve(null);
+
+const tryWildcardVersionAsDefaultBranch = ({ version, git }) => version === '*' ? git.resolveDefaultBranch() : Promise.resolve(null);
+
+const tryRef = (refs, ref) => {
+  const sha = refs.get(ref);
+  return sha ? { sha, ref } : null;
+};
+
+const tryVersionAsFullRef = ({ version, refs }) => version.startsWith('refs/') ? tryRef(refs, version) : null;
+
+const tryVersionAsTagName = ({ version, refs }) => tryRef(refs, `${REF_TAG_PREFIX}${version}`);
+
+const tryVersionAsPullRequestNo = ({ version, refs }) => tryRef(refs, `${REF_PR_PREFIX}${version}`);
+
+const tryVersionAsBranchName = ({ version, refs }) => tryRef(refs, `${REF_BRANCH_PREFIX}${version}`);
+
+const tryVersionAsDirectRef = ({ version, refs }) => tryRef(refs, `${REF_PREFIX}${version}`);
+
+const computeSemverNames = ({ config, refs }) => {
+  const names = {
+    tags: [],
+    heads: []
+  };
+  for (var _iterator2 = refs.keys(), _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+    var _ref3;
+
+    if (_isArray2) {
+      if (_i2 >= _iterator2.length) break;
+      _ref3 = _iterator2[_i2++];
+    } else {
+      _i2 = _iterator2.next();
+      if (_i2.done) break;
+      _ref3 = _i2.value;
+    }
+
+    const ref = _ref3;
+
+    const match = REF_NAME_REGEXP.exec(ref);
+    if (!match) {
+      continue;
+    }
+    const type = match[1],
+          name = match[2];
+
+    if (semver.valid(name, config.looseSemver)) {
+      names[type].push(name);
+    }
+  }
+  return names;
+};
+
+const findSemver = (version, config, namesList) => config.resolveConstraints(namesList, version);
+
+const tryVersionAsTagSemver = (() => {
+  var _ref4 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* ({ version, config, refs }, names) {
+    const result = yield findSemver(version.replace(/^semver:/, ''), config, names.tags);
+    return result ? tryRef(refs, `${REF_TAG_PREFIX}${result}`) : null;
+  });
+
+  return function tryVersionAsTagSemver(_x, _x2) {
+    return _ref4.apply(this, arguments);
+  };
+})();
+
+const tryVersionAsBranchSemver = (() => {
+  var _ref5 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* ({ version, config, refs }, names) {
+    const result = yield findSemver(version.replace(/^semver:/, ''), config, names.heads);
+    return result ? tryRef(refs, `${REF_BRANCH_PREFIX}${result}`) : null;
+  });
+
+  return function tryVersionAsBranchSemver(_x3, _x4) {
+    return _ref5.apply(this, arguments);
+  };
+})();
+
+const tryVersionAsSemverRange = (() => {
+  var _ref6 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (options) {
+    const names = computeSemverNames(options);
+    return (yield tryVersionAsTagSemver(options, names)) || tryVersionAsBranchSemver(options, names);
+  });
+
+  return function tryVersionAsSemverRange(_x5) {
+    return _ref6.apply(this, arguments);
+  };
+})();
+
+const VERSION_RESOLUTION_STEPS = [tryEmptyVersionAsDefaultBranch, tryVersionAsGitCommit, tryVersionAsFullRef, tryVersionAsTagName, tryVersionAsPullRequestNo, tryVersionAsBranchName, tryVersionAsSemverRange, tryWildcardVersionAsDefaultBranch, tryVersionAsDirectRef];
+
+/**
+ * Resolve a git-url hash (version) to a git commit sha and branch/tag ref
+ * Returns null if the version cannot be resolved to any commit
+ */
+
+const resolveVersion = exports.resolveVersion = (() => {
+  var _ref7 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (options) {
+    for (var _iterator3 = VERSION_RESOLUTION_STEPS, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
+      var _ref8;
+
+      if (_isArray3) {
+        if (_i3 >= _iterator3.length) break;
+        _ref8 = _iterator3[_i3++];
+      } else {
+        _i3 = _iterator3.next();
+        if (_i3.done) break;
+        _ref8 = _i3.value;
+      }
+
+      const testFunction = _ref8;
+
+      const result = yield testFunction(options);
+      if (result !== null) {
+        return result;
+      }
+    }
+    return null;
+  });
+
+  return function resolveVersion(_x6) {
+    return _ref7.apply(this, arguments);
+  };
+})();
+
+/**
+ * Parse Git ref lines into hash of ref names to SHA hashes
+ */
+
+const parseRefs = exports.parseRefs = stdout => {
+  // store references
+  const refs = new Map();
+
+  // line delimited
+  const refLines = stdout.split('\n');
+
+  for (var _iterator4 = refLines, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
+    var _ref9;
+
+    if (_isArray4) {
+      if (_i4 >= _iterator4.length) break;
+      _ref9 = _iterator4[_i4++];
+    } else {
+      _i4 = _iterator4.next();
+      if (_i4.done) break;
+      _ref9 = _i4.value;
+    }
+
+    const line = _ref9;
+
+    const match = GIT_REF_LINE_REGEXP.exec(line);
+
+    if (match) {
+      const sha = match[1],
+            tagName = match[2];
+
+      // As documented in gitrevisions:
+      //   https://www.kernel.org/pub/software/scm/git/docs/gitrevisions.html#_specifying_revisions
+      // "A suffix ^ followed by an empty brace pair means the object could be a tag,
+      //   and dereference the tag recursively until a non-tag object is found."
+      // In other words, the hash without ^{} is the hash of the tag,
+      //   and the hash with ^{} is the hash of the commit at which the tag was made.
+
+      const name = (0, (_misc || _load_misc()).removeSuffix)(tagName, '^{}');
+
+      refs.set(name, sha);
+    }
+  }
+
+  return refs;
+};
+
+/***/ }),
+/* 582 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.LogicalDependencyTree = undefined;
+
+var _npmLogicalTree;
+
+function _load_npmLogicalTree() {
+  return _npmLogicalTree = _interopRequireDefault(__webpack_require__(766));
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+class LogicalDependencyTree {
+  constructor(packageJson, packageLock) {
+    this.tree = (0, (_npmLogicalTree || _load_npmLogicalTree()).default)(JSON.parse(packageJson), JSON.parse(packageLock));
+  }
+
+  _findNode(name, parentNames) {
+    const parentTree = parentNames ? parentNames.reduce((node, ancestor) => {
+      const ancestorNode = node.dependencies.get(ancestor);
+      return ancestorNode;
+    }, this.tree) : this.tree;
+    const node = parentTree.dependencies.get(name);
+    return node;
+  }
+  getFixedVersionPattern(name, parentNames) {
+    const node = this._findNode(name, parentNames);
+    const version = node.version;
+    return `${node.name}@${version}`;
+  }
+}
+exports.LogicalDependencyTree = LogicalDependencyTree;
+
+/***/ }),
+/* 583 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+var _constants;
+
+function _load_constants() {
+  return _constants = __webpack_require__(8);
+}
+
+var _util;
+
+function _load_util() {
+  return _util = __webpack_require__(221);
+}
+
+var _index;
+
+function _load_index() {
+  return _index = __webpack_require__(78);
+}
+
+var _inferLicense;
+
+function _load_inferLicense() {
+  return _inferLicense = _interopRequireDefault(__webpack_require__(584));
+}
+
+var _fs;
+
+function _load_fs() {
+  return _fs = _interopRequireWildcard(__webpack_require__(4));
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const semver = __webpack_require__(22);
+const path = __webpack_require__(0);
+const url = __webpack_require__(24);
+
+const LICENSE_RENAMES = {
+  'MIT/X11': 'MIT',
+  X11: 'MIT'
+};
+
+exports.default = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (info, moduleLoc, reporter, warn, looseSemver) {
+    const files = yield (_fs || _load_fs()).readdir(moduleLoc);
+
+    // clean info.version
+    if (typeof info.version === 'string') {
+      info.version = semver.clean(info.version, looseSemver) || info.version;
+    }
+
+    // if name or version aren't set then set them to empty strings
+    info.name = info.name || '';
+    info.version = info.version || '';
+
+    // if the man field is a string then coerce it to an array
+    if (typeof info.man === 'string') {
+      info.man = [info.man];
+    }
+
+    // if the keywords field is a string then split it on any whitespace
+    if (typeof info.keywords === 'string') {
+      info.keywords = info.keywords.split(/\s+/g);
+    }
+
+    // if there's no contributors field but an authors field then expand it
+    if (!info.contributors && files.indexOf('AUTHORS') >= 0) {
+      const authorsFilepath = path.join(moduleLoc, 'AUTHORS');
+      const authorsFilestats = yield (_fs || _load_fs()).stat(authorsFilepath);
+      if (authorsFilestats.isFile()) {
+        let authors = yield (_fs || _load_fs()).readFile(authorsFilepath);
+        authors = authors.split(/\r?\n/g) // split on lines
+        .map(function (line) {
+          return line.replace(/^\s*#.*$/, '').trim();
+        }) // remove comments
+        .filter(function (line) {
+          return !!line;
+        }); // remove empty lines
+        info.contributors = authors;
+      }
+    }
+
+    // expand people fields to objects
+    if (typeof info.author === 'string' || typeof info.author === 'object') {
+      info.author = (0, (_util || _load_util()).normalizePerson)(info.author);
+    }
+    if (Array.isArray(info.contributors)) {
+      info.contributors = info.contributors.map((_util || _load_util()).normalizePerson);
+    }
+    if (Array.isArray(info.maintainers)) {
+      info.maintainers = info.maintainers.map((_util || _load_util()).normalizePerson);
+    }
+
+    // if there's no readme field then load the README file from the cwd
+    if (!info.readme) {
+      const readmeCandidates = files.filter(function (filename) {
+        const lower = filename.toLowerCase();
+        return lower === 'readme' || lower.indexOf('readme.') === 0;
+      }).sort(function (filename1, filename2) {
+        // favor files with extensions
+        return filename2.indexOf('.') - filename1.indexOf('.');
+      });
+
+      for (var _iterator = readmeCandidates, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+        var _ref2;
+
+        if (_isArray) {
+          if (_i >= _iterator.length) break;
+          _ref2 = _iterator[_i++];
+        } else {
+          _i = _iterator.next();
+          if (_i.done) break;
+          _ref2 = _i.value;
+        }
+
+        const readmeFilename = _ref2;
+
+        const readmeFilepath = path.join(moduleLoc, readmeFilename);
+        const readmeFileStats = yield (_fs || _load_fs()).stat(readmeFilepath);
+        if (readmeFileStats.isFile()) {
+          info.readmeFilename = readmeFilename;
+          info.readme = yield (_fs || _load_fs()).readFile(readmeFilepath);
+          break;
+        }
+      }
+    }
+
+    // if there's no description then take the first paragraph from the readme
+    if (!info.description && info.readme) {
+      const desc = (0, (_util || _load_util()).extractDescription)(info.readme);
+      if (desc) {
+        info.description = desc;
+      }
+    }
+
+    // support array of engine keys
+    if (Array.isArray(info.engines)) {
+      const engines = {};
+      for (var _iterator2 = info.engines, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+        var _ref3;
+
+        if (_isArray2) {
+          if (_i2 >= _iterator2.length) break;
+          _ref3 = _iterator2[_i2++];
+        } else {
+          _i2 = _iterator2.next();
+          if (_i2.done) break;
+          _ref3 = _i2.value;
+        }
+
+        const str = _ref3;
+
+        if (typeof str === 'string') {
+          var _str$trim$split = str.trim().split(/ +/g);
+
+          const name = _str$trim$split[0],
+                patternParts = _str$trim$split.slice(1);
+
+          engines[name] = patternParts.join(' ');
+        }
+      }
+      info.engines = engines;
+    }
+
+    // if the repository field is a string then assume it's a git repo and expand it
+    if (typeof info.repository === 'string') {
+      info.repository = {
+        type: 'git',
+        url: info.repository
+      };
+    }
+
+    const repo = info.repository;
+
+    // explode info.repository.url if it's a hosted git shorthand
+    if (repo && typeof repo === 'object' && typeof repo.url === 'string') {
+      repo.url = (0, (_index || _load_index()).hostedGitFragmentToGitUrl)(repo.url, reporter);
+    }
+
+    // allow bugs to be specified as a string, expand it to an object with a single url prop
+    if (typeof info.bugs === 'string') {
+      info.bugs = { url: info.bugs };
+    }
+
+    // normalize homepage url to http
+    if (typeof info.homepage === 'string') {
+      const parts = url.parse(info.homepage);
+      parts.protocol = parts.protocol || 'http:';
+      if (parts.pathname && !parts.hostname) {
+        parts.hostname = parts.pathname;
+        parts.pathname = '';
+      }
+      info.homepage = url.format(parts);
+    }
+
+    // if the `bin` field is as string then expand it to an object with a single property
+    // based on the original `bin` field and `name field`
+    // { name: "foo", bin: "cli.js" } -> { name: "foo", bin: { foo: "cli.js" } }
+    if (typeof info.name === 'string' && typeof info.bin === 'string' && info.bin.length > 0) {
+      // Remove scoped package name for consistency with NPM's bin field fixing behaviour
+      const name = info.name.replace(/^@[^\/]+\//, '');
+      info.bin = { [name]: info.bin };
+    }
+
+    // bundleDependencies is an alias for bundledDependencies
+    if (info.bundledDependencies) {
+      info.bundleDependencies = info.bundledDependencies;
+      delete info.bundledDependencies;
+    }
+
+    let scripts;
+
+    // dummy script object to shove file inferred scripts onto
+    if (info.scripts && typeof info.scripts === 'object') {
+      scripts = info.scripts;
+    } else {
+      scripts = {};
+    }
+
+    // if there's a server.js file and no start script then set it to `node server.js`
+    if (!scripts.start && files.indexOf('server.js') >= 0) {
+      scripts.start = 'node server.js';
+    }
+
+    // if there's a binding.gyp file and no install script then set it to `node-gyp rebuild`
+    if (!scripts.install && files.indexOf('binding.gyp') >= 0) {
+      scripts.install = 'node-gyp rebuild';
+    }
+
+    // set scripts if we've polluted the empty object
+    if (Object.keys(scripts).length) {
+      info.scripts = scripts;
+    }
+
+    const dirs = info.directories;
+
+    if (dirs && typeof dirs === 'object') {
+      const binDir = dirs.bin;
+
+      if (!info.bin && binDir && typeof binDir === 'string') {
+        const bin = info.bin = {};
+        const fullBinDir = path.join(moduleLoc, binDir);
+
+        if (yield (_fs || _load_fs()).exists(fullBinDir)) {
+          for (var _iterator3 = yield (_fs || _load_fs()).readdir(fullBinDir), _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
+            var _ref4;
+
+            if (_isArray3) {
+              if (_i3 >= _iterator3.length) break;
+              _ref4 = _iterator3[_i3++];
+            } else {
+              _i3 = _iterator3.next();
+              if (_i3.done) break;
+              _ref4 = _i3.value;
+            }
+
+            const scriptName = _ref4;
+
+            if (scriptName[0] === '.') {
+              continue;
+            }
+            bin[scriptName] = path.join('.', binDir, scriptName);
+          }
+        } else {
+          warn(reporter.lang('manifestDirectoryNotFound', binDir, info.name));
+        }
+      }
+
+      const manDir = dirs.man;
+
+      if (!info.man && typeof manDir === 'string') {
+        const man = info.man = [];
+        const fullManDir = path.join(moduleLoc, manDir);
+
+        if (yield (_fs || _load_fs()).exists(fullManDir)) {
+          for (var _iterator4 = yield (_fs || _load_fs()).readdir(fullManDir), _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
+            var _ref5;
+
+            if (_isArray4) {
+              if (_i4 >= _iterator4.length) break;
+              _ref5 = _iterator4[_i4++];
+            } else {
+              _i4 = _iterator4.next();
+              if (_i4.done) break;
+              _ref5 = _i4.value;
+            }
+
+            const filename = _ref5;
+
+            if (/^(.*?)\.[0-9]$/.test(filename)) {
+              man.push(path.join('.', manDir, filename));
+            }
+          }
+        } else {
+          warn(reporter.lang('manifestDirectoryNotFound', manDir, info.name));
+        }
+      }
+    }
+
+    delete info.directories;
+
+    // normalize licenses field
+    const licenses = info.licenses;
+    if (Array.isArray(licenses) && !info.license) {
+      let licenseTypes = [];
+
+      for (var _iterator5 = licenses, _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
+        var _ref6;
+
+        if (_isArray5) {
+          if (_i5 >= _iterator5.length) break;
+          _ref6 = _iterator5[_i5++];
+        } else {
+          _i5 = _iterator5.next();
+          if (_i5.done) break;
+          _ref6 = _i5.value;
+        }
+
+        let license = _ref6;
+
+        if (license && typeof license === 'object') {
+          license = license.type;
+        }
+        if (typeof license === 'string') {
+          licenseTypes.push(license);
+        }
+      }
+
+      licenseTypes = licenseTypes.filter((_util || _load_util()).isValidLicense);
+
+      if (licenseTypes.length === 1) {
+        info.license = licenseTypes[0];
+      } else if (licenseTypes.length) {
+        info.license = `(${licenseTypes.join(' OR ')})`;
+      }
+    }
+
+    const license = info.license;
+
+    // normalize license
+    if (license && typeof license === 'object') {
+      info.license = license.type;
+    }
+
+    // get license file
+    const licenseFile = files.find(function (filename) {
+      const lower = filename.toLowerCase();
+      return lower === 'license' || lower.startsWith('license.') || lower === 'unlicense' || lower.startsWith('unlicense.');
+    });
+    if (licenseFile) {
+      const licenseFilepath = path.join(moduleLoc, licenseFile);
+      const licenseFileStats = yield (_fs || _load_fs()).stat(licenseFilepath);
+      if (licenseFileStats.isFile()) {
+        const licenseContent = yield (_fs || _load_fs()).readFile(licenseFilepath);
+        const inferredLicense = (0, (_inferLicense || _load_inferLicense()).default)(licenseContent);
+        info.licenseText = licenseContent;
+
+        const license = info.license;
+
+        if (typeof license === 'string') {
+          if (inferredLicense && (0, (_util || _load_util()).isValidLicense)(inferredLicense) && !(0, (_util || _load_util()).isValidLicense)(license)) {
+            // some packages don't specify their license version but we can infer it based on their license file
+            const basicLicense = license.toLowerCase().replace(/(-like|\*)$/g, '');
+            const expandedLicense = inferredLicense.toLowerCase();
+            if (expandedLicense.startsWith(basicLicense)) {
+              // TODO consider doing something to notify the user
+              info.license = inferredLicense;
+            }
+          }
+        } else if (inferredLicense) {
+          // if there's no license then infer it based on the license file
+          info.license = inferredLicense;
+        } else {
+          // valid expression to refer to a license in a file
+          info.license = `SEE LICENSE IN ${licenseFile}`;
+        }
+      }
+    }
+
+    if (typeof info.license === 'string') {
+      // sometimes licenses are known by different names, reduce them
+      info.license = LICENSE_RENAMES[info.license] || info.license;
+    } else if (typeof info.readme === 'string') {
+      // the license might be at the bottom of the README
+      const inferredLicense = (0, (_inferLicense || _load_inferLicense()).default)(info.readme);
+      if (inferredLicense) {
+        info.license = inferredLicense;
+      }
+    }
+
+    // get notice file
+    const noticeFile = files.find(function (filename) {
+      const lower = filename.toLowerCase();
+      return lower === 'notice' || lower.startsWith('notice.');
+    });
+    if (noticeFile) {
+      const noticeFilepath = path.join(moduleLoc, noticeFile);
+      const noticeFileStats = yield (_fs || _load_fs()).stat(noticeFilepath);
+      if (noticeFileStats.isFile()) {
+        info.noticeText = yield (_fs || _load_fs()).readFile(noticeFilepath);
+      }
+    }
+
+    for (var _iterator6 = (_constants || _load_constants()).MANIFEST_FIELDS, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) {
+      var _ref7;
+
+      if (_isArray6) {
+        if (_i6 >= _iterator6.length) break;
+        _ref7 = _iterator6[_i6++];
+      } else {
+        _i6 = _iterator6.next();
+        if (_i6.done) break;
+        _ref7 = _i6.value;
+      }
+
+      const dependencyType = _ref7;
+
+      const dependencyList = info[dependencyType];
+      if (dependencyList && typeof dependencyList === 'object') {
+        delete dependencyList['//'];
+        for (const name in dependencyList) {
+          dependencyList[name] = dependencyList[name] || '';
+        }
+      }
+    }
+  });
+
+  return function (_x, _x2, _x3, _x4, _x5) {
+    return _ref.apply(this, arguments);
+  };
+})();
+
+/***/ }),
+/* 584 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = inferLicense;
+
+var _licenses;
+
+function _load_licenses() {
+  return _licenses = _interopRequireDefault(__webpack_require__(585));
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function clean(str) {
+  return str.replace(/[^A-Za-z\s]/g, ' ').replace(/[\s]+/g, ' ').trim().toLowerCase();
+}
+
+const REGEXES = {
+  Apache: [/Apache License\b/],
+  BSD: [/BSD\b/],
+  ISC: [/The ISC License/, /ISC\b/],
+  MIT: [/MIT\b/],
+  Unlicense: [/http:\/\/unlicense.org\//],
+  WTFPL: [/DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE/, /WTFPL\b/]
+};
+
+function inferLicense(license) {
+  // check if we have any explicit licenses
+  const cleanLicense = clean(license);
+  for (const licenseName in (_licenses || _load_licenses()).default) {
+    const testLicense = (_licenses || _load_licenses()).default[licenseName];
+    if (cleanLicense.search(testLicense) >= 0) {
+      return licenseName;
+    }
+  }
+
+  // infer based on some keywords
+  for (const licenseName in REGEXES) {
+    for (var _iterator = REGEXES[licenseName], _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+      var _ref;
+
+      if (_isArray) {
+        if (_i >= _iterator.length) break;
+        _ref = _iterator[_i++];
+      } else {
+        _i = _iterator.next();
+        if (_i.done) break;
+        _ref = _i.value;
+      }
+
+      const regex = _ref;
+
+      if (license.search(regex) >= 0) {
+        return `${licenseName}*`;
+      }
+    }
+  }
+
+  return null;
+}
+
+/***/ }),
+/* 585 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+
+/* eslint-disable max-len */
+
+/**
+ * DO NOT EDIT THIS FILE MANUALLY.
+ * THIS FILE WAS GENERATED BY "generate-licenses-js.js".
+ */
+
+exports.default = {
+  'Apache-2.0': new RegExp('(licensed under the apache license version the license you may not use this file except in compliance with the license you may obtain a copy of the license at http www apache org licenses license unless required by applicable law or agreed to in writing software distributed under the license is distributed on an as is basis without warranties or conditions of any kind either express or implied see the license for the specific language governing permissions and limitations under the license$|apache license version january http www apache org licenses terms and conditions for use reproduction and distribution definitions license shall mean the terms and conditions for use reproduction and distribution as defined by sections through of this document licensor shall mean the copyright owner or entity authorized by the copyright owner that is granting the license legal entity shall mean the union of the acting entity and all other entities that control are controlled by or are under common control with that entity for the purposes of this definition control means i the power direct or indirect to cause the direction or management of such entity whether by contract or otherwise or ii ownership of fifty percent or more of the outstanding shares or iii beneficial ownership of such entity you or your shall mean an individual or legal entity exercising permissions granted by this license source form shall mean the preferred form for making modifications including but not limited to software source code documentation source and configuration files object form shall mean any form resulting from mechanical transformation or translation of a source form including but not limited to compiled object code generated documentation and conversions to other media types work shall mean the work of authorship whether in source or object form made available under the license as indicated by a copyright notice that is included in or attached to the work an example is provided in the appendix below derivative works shall mean any work whether in source or object form that is based on or derived from the work and for which the editorial revisions annotations elaborations or other modifications represent as a whole an original work of authorship for the purposes of this license derivative works shall not include works that remain separable from or merely link or bind by name to the interfaces of the work and derivative works thereof contribution shall mean any work of authorship including the original version of the work and any modifications or additions to that work or derivative works thereof that is intentionally submitted to licensor for inclusion in the work by the copyright owner or by an individual or legal entity authorized to submit on behalf of the copyright owner for the purposes of this definition submitted means any form of electronic verbal or written communication sent to the licensor or its representatives including but not limited to communication on electronic mailing lists source code control systems and issue tracking systems that are managed by or on behalf of the licensor for the purpose of discussing and improving the work but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as not a contribution contributor shall mean licensor and any individual or legal entity on behalf of whom a contribution has been received by licensor and subsequently incorporated within the work grant of copyright license subject to the terms and conditions of this license each contributor hereby grants to you a perpetual worldwide non exclusive no charge royalty free irrevocable copyright license to reproduce prepare derivative works of publicly display publicly perform sublicense and distribute the work and such derivative works in source or object form grant of patent license subject to the terms and conditions of this license each contributor hereby grants to you a perpetual worldwide non exclusive no charge royalty free irrevocable except as stated in this section patent license to make have made use offer to sell sell import and otherwise transfer the work where such license applies only to those patent claims licensable by such contributor that are necessarily infringed by their contribution s alone or by combination of their contribution s with the work to which such contribution s was submitted if you institute patent litigation against any entity including a cross claim or counterclaim in a lawsuit alleging that the work or a contribution incorporated within the work constitutes direct or contributory patent infringement then any patent licenses granted to you under this license for that work shall terminate as of the date such litigation is filed redistribution you may reproduce and distribute copies of the work or derivative works thereof in any medium with or without modifications and in source or object form provided that you meet the following conditions a you must give any other recipients of the work or derivative works a copy of this license and b you must cause any modified files to carry prominent notices stating that you changed the files and c you must retain in the source form of any derivative works that you distribute all copyright patent trademark and attribution notices from the source form of the work excluding those notices that do not pertain to any part of the derivative works and d if the work includes a notice text file as part of its distribution then any derivative works that you distribute must include a readable copy of the attribution notices contained within such notice file excluding those notices that do not pertain to any part of the derivative works in at least one of the following places within a notice text file distributed as part of the derivative works within the source form or documentation if provided along with the derivative works or within a display generated by the derivative works if and wherever such third party notices normally appear the contents of the notice file are for informational purposes only and do not modify the license you may add your own attribution notices within derivative works that you distribute alongside or as an addendum to the notice text from the work provided that such additional attribution notices cannot be construed as modifying the license you may add your own copyright statement to your modifications and may provide additional or different license terms and conditions for use reproduction or distribution of your modifications or for any such derivative works as a whole provided your use reproduction and distribution of the work otherwise complies with the conditions stated in this license submission of contributions unless you explicitly state otherwise any contribution intentionally submitted for inclusion in the work by you to the licensor shall be under the terms and conditions of this license without any additional terms or conditions notwithstanding the above nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with licensor regarding such contributions trademarks this license does not grant permission to use the trade names trademarks service marks or product names of the licensor except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the notice file disclaimer of warranty unless required by applicable law or agreed to in writing licensor provides the work and each contributor provides its contributions on an as is basis without warranties or conditions of any kind either express or implied including without limitation any warranties or conditions of title non infringement merchantability or fitness for a particular purpose you are solely responsible for determining the appropriateness of using or redistributing the work and assume any risks associated with your exercise of permissions under this license limitation of liability in no event and under no legal theory whether in tort including negligence contract or otherwise unless required by applicable law such as deliberate and grossly negligent acts or agreed to in writing shall any contributor be liable to you for damages including any direct indirect special incidental or consequential damages of any character arising as a result of this license or out of the use or inability to use the work including but not limited to damages for loss of goodwill work stoppage computer failure or malfunction or any and all other commercial damages or losses even if such contributor has been advised of the possibility of such damages accepting warranty or additional liability while redistributing the work or derivative works thereof you may choose to offer and charge a fee for acceptance of support warranty indemnity or other liability obligations and or rights consistent with this license however in accepting such obligations you may act only on your own behalf and on your sole responsibility not on behalf of any other contributor and only if you agree to indemnify defend and hold each contributor harmless for any liability incurred by or claims asserted against such contributor by reason of your accepting any such warranty or additional liability end of terms and conditions$)', 'g'),
+  'BSD-2-Clause': new RegExp('(redistribution and use in source and binary forms with or without modification are permitted provided that the following conditions are met redistributions of source code must retain the above copyright notice this list of conditions and the following disclaimer redistributions in binary form must reproduce the above copyright notice this list of conditions and the following disclaimer in the documentation and or other materials provided with the distribution this(.*?| )is provided by the copyright holders and contributors as is and any express or implied warranties including but not limited to the implied warranties of merchantability and fitness for a particular purpose are disclaimed in no event shall(.*?| )be liable for any direct indirect incidental special exemplary or consequential damages including but not limited to procurement of substitute goods or services loss of use data or profits or business interruption however caused and on any theory of liability whether in contract strict liability or tort including negligence or otherwise arising in any way out of the use of this(.*?| )even if advised of the possibility of such damage$|redistribution and use in source and binary forms with or without modification are permitted provided that the following conditions are met redistributions of source code must retain the above copyright notice this list of conditions and the following disclaimer redistributions in binary form must reproduce the above copyright notice this list of conditions and the following disclaimer in the documentation and or other materials provided with the distribution this software is provided by the copyright holders and contributors as is and any express or implied warranties including but not limited to the implied warranties of merchantability and fitness for a particular purpose are disclaimed in no event shall(.*?| )be liable for any direct indirect incidental special exemplary or consequential damages including but not limited to procurement of substitute goods or services loss of use data or profits or business interruption however caused and on any theory of liability whether in contract strict liability or tort including negligence or otherwise arising in any way out of the use of this software even if advised of the possibility of such damage$)', 'g'),
+  'BSD-3-Clause': new RegExp('(redistribution and use in source and binary forms with or without modification are permitted provided that the following conditions are met redistributions of source code must retain the above copyright notice this list of conditions and the following disclaimer redistributions in binary form must reproduce the above copyright notice this list of conditions and the following disclaimer in the documentation and or other materials provided with the distribution neither the name of(.*?| )nor the names of the contributors may be used to endorse or promote products derived from this software without specific prior written permission this software is provided by the copyright holders and contributors as is and any express or implied warranties including but not limited to the implied warranties of merchantability and fitness for a particular purpose are disclaimed in no event shall(.*?| )be liable for any direct indirect incidental special exemplary or consequential damages including but not limited to procurement of substitute goods or services loss of use data or profits or business interruption however caused and on any theory of liability whether in contract strict liability or tort including negligence or otherwise arising in any way out of the use of this software even if advised of the possibility of such damage$|(redistribution and use in source and binary forms with or without modification are permitted provided that the following conditions are met redistributions of source code must retain the above copyright notice this list of conditions and the following disclaimer redistributions in binary form must reproduce the above copyright notice this list of conditions and the following disclaimer in the documentation and or other materials provided with the distribution the names of any contributors may not be used to endorse or promote products derived from this software without specific prior written permission this software is provided by the copyright holders and contributors as is and any express or implied warranties including but not limited to the implied warranties of merchantability and fitness for a particular purpose are disclaimed in no event shall the copyright holders and contributors be liable for any direct indirect incidental special exemplary or consequential damages including but not limited to procurement of substitute goods or services loss of use data or profits or business interruption however caused and on any theory of liability whether in contract strict liability or tort including negligence or otherwise arising in any way out of the use of this software even if advised of the possibility of such damage$|redistribution and use in source and binary forms with or without modification are permitted provided that the following conditions are met redistributions of source code must retain the above copyright notice this list of conditions and the following disclaimer redistributions in binary form must reproduce the above copyright notice this list of conditions and the following disclaimer in the documentation and or other materials provided with the distribution neither the name(.*?| )nor the names of(.*?| )contributors may be used to endorse or promote products derived from this software without specific prior written permission this software is provided by(.*?| )as is and any express or implied warranties including but not limited to the implied warranties of merchantability and fitness for a particular purpose are disclaimed in no event shall(.*?| )be liable for any direct indirect incidental special exemplary or consequential damages including but not limited to procurement of substitute goods or services loss of use data or profits or business interruption however caused and on any theory of liability whether in contract strict liability or tort including negligence or otherwise arising in any way out of the use of this software even if advised of the possibility of such damage$))', 'g'),
+  MIT: new RegExp('permission is hereby granted free of charge to any person obtaining a copy of this software and associated documentation files the software to deal in the software without restriction including without limitation the rights to use copy modify merge publish distribute sublicense and or sell copies of the software and to permit persons to whom the software is furnished to do so subject to the following conditions the above copyright notice and this permission notice shall be included in all copies or substantial portions of the software the software is provided as is without warranty of any kind express or implied including but not limited to the warranties of merchantability fitness for a particular purpose and noninfringement in no event shall the authors or copyright holders be liable for any claim damages or other liability whether in an action of contract tort or otherwise arising from out of or in connection with the software or the use or other dealings in the software$', 'g'),
+  Unlicense: new RegExp('this is free and unencumbered software released into the public domain anyone is free to copy modify publish use compile sell or distribute this software either in source code form or as a compiled binary for any purpose commercial or non commercial and by any means in jurisdictions that recognize copyright laws the author or authors of this software dedicate any and all copyright interest in the software to the public domain we make this dedication for the benefit of the public at large and to the detriment of our heirs and successors we intend this dedication to be an overt act of relinquishment in perpetuity of all present and future rights to this software under copyright law the software is provided as is without warranty of any kind express or implied including but not limited to the warranties of merchantability fitness for a particular purpose and noninfringement in no event shall the authors be liable for any claim damages or other liability whether in an action of contract tort or otherwise arising from out of or in connection with the software or the use or other dealings in the software for more information please refer to wildcard$', 'g')
+};
+
+/***/ }),
+/* 586 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+exports.default = function (info, moduleLoc, lockfileFolder) {
+  // It won't work if we don't yet know what's the folder we'll use as root. It's not a
+  // big deal tho, because it only happens when trying to figure out the root, and we
+  // don't need to know the dependencies / devDependencies at this time.
+  if (!lockfileFolder) {
+    return;
+  }
+
+  for (var _iterator = (_constants || _load_constants()).DEPENDENCY_TYPES, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+    var _ref;
+
+    if (_isArray) {
+      if (_i >= _iterator.length) break;
+      _ref = _iterator[_i++];
+    } else {
+      _i = _iterator.next();
+      if (_i.done) break;
+      _ref = _i.value;
+    }
+
+    const dependencyType = _ref;
+
+    const dependencies = info[dependencyType];
+    if (!dependencies) {
+      continue;
+    }
+
+    for (var _iterator2 = Object.keys(dependencies), _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+      var _ref2;
+
+      if (_isArray2) {
+        if (_i2 >= _iterator2.length) break;
+        _ref2 = _iterator2[_i2++];
+      } else {
+        _i2 = _iterator2.next();
+        if (_i2.done) break;
+        _ref2 = _i2.value;
+      }
+
+      const name = _ref2;
+
+      let value = dependencies[name];
+
+      if (path.isAbsolute(value)) {
+        value = (_fileResolver || _load_fileResolver()).FILE_PROTOCOL_PREFIX + value;
+      }
+
+      let prefix;
+      if (value.startsWith((_fileResolver || _load_fileResolver()).FILE_PROTOCOL_PREFIX)) {
+        prefix = (_fileResolver || _load_fileResolver()).FILE_PROTOCOL_PREFIX;
+      } else if (value.startsWith((_linkResolver || _load_linkResolver()).LINK_PROTOCOL_PREFIX)) {
+        prefix = (_linkResolver || _load_linkResolver()).LINK_PROTOCOL_PREFIX;
+      } else {
+        continue;
+      }
+      (0, (_invariant || _load_invariant()).default)(prefix, 'prefix is definitely defined here');
+
+      const unprefixed = value.substr(prefix.length);
+      const hasPathPrefix = /^\.(\/|$)/.test(unprefixed);
+
+      const absoluteTarget = path.resolve(lockfileFolder, moduleLoc, unprefixed);
+      let relativeTarget = path.relative(lockfileFolder, absoluteTarget) || '.';
+
+      if (absoluteTarget === lockfileFolder) {
+        relativeTarget = '.';
+      } else if (hasPathPrefix) {
+        // TODO: This logic should be removed during the next major bump
+        // If the original value was using the "./" prefix, then we output a similar path.
+        // We need to do this because otherwise it would cause problems with already existing
+        // lockfile, which would see some of their entries being unrecognized.
+        relativeTarget = relativeTarget.replace(/^(?!\.{0,2}\/)/, `./`);
+      }
+
+      dependencies[name] = prefix + relativeTarget.replace(/\\/g, '/');
+    }
+  }
+};
+
+var _constants;
+
+function _load_constants() {
+  return _constants = __webpack_require__(8);
+}
+
+var _fileResolver;
+
+function _load_fileResolver() {
+  return _fileResolver = __webpack_require__(215);
+}
+
+var _linkResolver;
+
+function _load_linkResolver() {
+  return _linkResolver = __webpack_require__(368);
+}
+
+var _invariant;
+
+function _load_invariant() {
+  return _invariant = _interopRequireDefault(__webpack_require__(9));
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const path = __webpack_require__(0);
+
+/***/ }),
+/* 587 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = {
+  autohr: 'author',
+  autor: 'author',
+  contributers: 'contributors',
+  depdenencies: 'dependencies',
+  dependancies: 'dependencies',
+  dependecies: 'dependencies',
+  depends: 'dependencies',
+  'dev-dependencies': 'devDependencies',
+  devDependences: 'devDependencies',
+  devDepenencies: 'devDependencies',
+  devEependencies: 'devDependencies',
+  devdependencies: 'devDependencies',
+  hampage: 'homepage',
+  hompage: 'homepage',
+  prefereGlobal: 'preferGlobal',
+  publicationConfig: 'publishConfig',
+  repo: 'repository',
+  repostitory: 'repository',
+  script: 'scripts'
+};
+
+/***/ }),
+/* 588 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = parsePackageName;
+
+
+const PKG_INPUT = /(^\S?[^\s@]+)(?:@(\S+))?$/;
+
+function parsePackageName(input) {
+  var _PKG_INPUT$exec = PKG_INPUT.exec(input);
+
+  const name = _PKG_INPUT$exec[1],
+        version = _PKG_INPUT$exec[2];
+
+  return { name, version };
+}
+
+/***/ }),
+/* 589 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+let makePortableProxyScriptUnix = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (source, destination, options) {
+    const environment = options.extraEnvironment ? Array.from(options.extraEnvironment.entries()).map(function ([key, value]) {
+      return `${key}="${value}"`;
+    }).join(' ') + ' ' : '';
+
+    const prependedArguments = options.prependArguments ? ' ' + options.prependArguments.map(function (arg) {
+      return `"${arg}"`;
+    }).join(' ') : '';
+    const appendedArguments = options.appendArguments ? ' ' + options.appendArguments.map(function (arg) {
+      return `"${arg}"`;
+    }).join(' ') : '';
+
+    const filePath = `${destination}/${options.proxyBasename || path.basename(source)}`;
+
+    // Unless impossible we want to preserve any symlinks used to call us when forwarding the call to the binary (so we
+    // cannot use realpath or transform relative paths into absolute ones), but we also need to tell the sh interpreter
+    // that the symlink should be resolved relative to the script directory (hence dirname "$0" at runtime).
+    const sourcePath = path.isAbsolute(source) ? source : `$(dirname "$0")/../${source}`;
+
+    yield (_fs || _load_fs()).mkdirp(destination);
+
+    if (process.platform === 'win32') {
+      yield (_fs || _load_fs()).writeFile(filePath + '.cmd', `@${environment}"${sourcePath}" ${prependedArguments} ${appendedArguments} %*\r\n`);
+    } else {
+      yield (_fs || _load_fs()).writeFile(filePath, `#!/bin/sh\n\n${environment}exec "${sourcePath}"${prependedArguments} "$@"${appendedArguments}\n`);
+      yield (_fs || _load_fs()).chmod(filePath, 0o755);
+    }
+  });
+
+  return function makePortableProxyScriptUnix(_x, _x2, _x3) {
+    return _ref.apply(this, arguments);
+  };
+})();
+
+exports.makePortableProxyScript = makePortableProxyScript;
+
+var _fs;
+
+function _load_fs() {
+  return _fs = _interopRequireWildcard(__webpack_require__(4));
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const path = __webpack_require__(0);
+
+function makePortableProxyScript(source, destination,
+// $FlowFixMe Flow doesn't support exact types with empty default values
+options = {}) {
+  return makePortableProxyScriptUnix(source, destination, options);
+}
+
+/***/ }),
+/* 590 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.findRc = findRc;
+
+var _fs;
+
+function _load_fs() {
+  return _fs = __webpack_require__(5);
+}
+
+var _path;
+
+function _load_path() {
+  return _path = _interopRequireWildcard(__webpack_require__(0));
+}
+
+var _constants;
+
+function _load_constants() {
+  return _constants = __webpack_require__(8);
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+const etc = '/etc';
+
+const isWin = process.platform === 'win32';
+const home = isWin ? process.env.USERPROFILE : process.env.HOME;
+
+function getRcPaths(name, cwd) {
+  const configPaths = [];
+
+  function pushConfigPath(...segments) {
+    configPaths.push((_path || _load_path()).join(...segments));
+    if (segments[segments.length - 1] === `.${name}rc`) {
+      configPaths.push((_path || _load_path()).join(...segments.slice(0, -1), `.${name}rc.yml`));
+    }
+  }
+
+  function unshiftConfigPath(...segments) {
+    if (segments[segments.length - 1] === `.${name}rc`) {
+      configPaths.unshift((_path || _load_path()).join(...segments.slice(0, -1), `.${name}rc.yml`));
+    }
+    configPaths.unshift((_path || _load_path()).join(...segments));
+  }
+
+  if (!isWin) {
+    pushConfigPath(etc, name, 'config');
+    pushConfigPath(etc, `${name}rc`);
+  }
+
+  if (home) {
+    pushConfigPath((_constants || _load_constants()).CONFIG_DIRECTORY);
+    pushConfigPath(home, '.config', name, 'config');
+    pushConfigPath(home, '.config', name);
+    pushConfigPath(home, `.${name}`, 'config');
+    pushConfigPath(home, `.${name}rc`);
+  }
+
+  // add .yarnrc locations relative to the cwd
+  while (true) {
+    unshiftConfigPath(cwd, `.${name}rc`);
+
+    const upperCwd = (_path || _load_path()).dirname(cwd);
+    if (upperCwd === cwd) {
+      // we've reached the root
+      break;
+    } else {
+      // continue since there's still more directories to search
+      cwd = upperCwd;
+    }
+  }
+
+  const envVariable = `${name}_config`.toUpperCase();
+
+  if (process.env[envVariable]) {
+    pushConfigPath(process.env[envVariable]);
+  }
+
+  return configPaths;
+}
+
+function parseRcPaths(paths, parser) {
+  return Object.assign({}, ...paths.map(path => {
+    try {
+      return parser((0, (_fs || _load_fs()).readFileSync)(path).toString(), path);
+    } catch (error) {
+      return {};
+    }
+  }));
+}
+
+function findRc(name, cwd, parser) {
+  return parseRcPaths(getRcPaths(name, cwd), parser);
+}
+
+/***/ }),
+/* 591 */
+/***/ (function(module, exports, __webpack_require__) {
+
+module.exports = { "default": __webpack_require__(623), __esModule: true };
+
+/***/ }),
+/* 592 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var DuplexStream = __webpack_require__(791)
+  , util         = __webpack_require__(3)
+  , Buffer       = __webpack_require__(45).Buffer
+
+
+function BufferList (callback) {
+  if (!(this instanceof BufferList))
+    return new BufferList(callback)
+
+  this._bufs  = []
+  this.length = 0
+
+  if (typeof callback == 'function') {
+    this._callback = callback
+
+    var piper = function piper (err) {
+      if (this._callback) {
+        this._callback(err)
+        this._callback = null
+      }
+    }.bind(this)
+
+    this.on('pipe', function onPipe (src) {
+      src.on('error', piper)
+    })
+    this.on('unpipe', function onUnpipe (src) {
+      src.removeListener('error', piper)
+    })
+  } else {
+    this.append(callback)
+  }
+
+  DuplexStream.call(this)
+}
+
+
+util.inherits(BufferList, DuplexStream)
+
+
+BufferList.prototype._offset = function _offset (offset) {
+  var tot = 0, i = 0, _t
+  if (offset === 0) return [ 0, 0 ]
+  for (; i < this._bufs.length; i++) {
+    _t = tot + this._bufs[i].length
+    if (offset < _t || i == this._bufs.length - 1)
+      return [ i, offset - tot ]
+    tot = _t
+  }
+}
+
+
+BufferList.prototype.append = function append (buf) {
+  var i = 0
+
+  if (Buffer.isBuffer(buf)) {
+    this._appendBuffer(buf);
+  } else if (Array.isArray(buf)) {
+    for (; i < buf.length; i++)
+      this.append(buf[i])
+  } else if (buf instanceof BufferList) {
+    // unwrap argument into individual BufferLists
+    for (; i < buf._bufs.length; i++)
+      this.append(buf._bufs[i])
+  } else if (buf != null) {
+    // coerce number arguments to strings, since Buffer(number) does
+    // uninitialized memory allocation
+    if (typeof buf == 'number')
+      buf = buf.toString()
+
+    this._appendBuffer(Buffer.from(buf));
+  }
+
+  return this
+}
+
+
+BufferList.prototype._appendBuffer = function appendBuffer (buf) {
+  this._bufs.push(buf)
+  this.length += buf.length
+}
+
+
+BufferList.prototype._write = function _write (buf, encoding, callback) {
+  this._appendBuffer(buf)
+
+  if (typeof callback == 'function')
+    callback()
+}
+
+
+BufferList.prototype._read = function _read (size) {
+  if (!this.length)
+    return this.push(null)
+
+  size = Math.min(size, this.length)
+  this.push(this.slice(0, size))
+  this.consume(size)
+}
+
+
+BufferList.prototype.end = function end (chunk) {
+  DuplexStream.prototype.end.call(this, chunk)
+
+  if (this._callback) {
+    this._callback(null, this.slice())
+    this._callback = null
+  }
+}
+
+
+BufferList.prototype.get = function get (index) {
+  return this.slice(index, index + 1)[0]
+}
+
+
+BufferList.prototype.slice = function slice (start, end) {
+  if (typeof start == 'number' && start < 0)
+    start += this.length
+  if (typeof end == 'number' && end < 0)
+    end += this.length
+  return this.copy(null, 0, start, end)
+}
+
+
+BufferList.prototype.copy = function copy (dst, dstStart, srcStart, srcEnd) {
+  if (typeof srcStart != 'number' || srcStart < 0)
+    srcStart = 0
+  if (typeof srcEnd != 'number' || srcEnd > this.length)
+    srcEnd = this.length
+  if (srcStart >= this.length)
+    return dst || Buffer.alloc(0)
+  if (srcEnd <= 0)
+    return dst || Buffer.alloc(0)
+
+  var copy   = !!dst
+    , off    = this._offset(srcStart)
+    , len    = srcEnd - srcStart
+    , bytes  = len
+    , bufoff = (copy && dstStart) || 0
+    , start  = off[1]
+    , l
+    , i
+
+  // copy/slice everything
+  if (srcStart === 0 && srcEnd == this.length) {
+    if (!copy) { // slice, but full concat if multiple buffers
+      return this._bufs.length === 1
+        ? this._bufs[0]
+        : Buffer.concat(this._bufs, this.length)
+    }
+
+    // copy, need to copy individual buffers
+    for (i = 0; i < this._bufs.length; i++) {
+      this._bufs[i].copy(dst, bufoff)
+      bufoff += this._bufs[i].length
+    }
+
+    return dst
+  }
+
+  // easy, cheap case where it's a subset of one of the buffers
+  if (bytes <= this._bufs[off[0]].length - start) {
+    return copy
+      ? this._bufs[off[0]].copy(dst, dstStart, start, start + bytes)
+      : this._bufs[off[0]].slice(start, start + bytes)
+  }
+
+  if (!copy) // a slice, we need something to copy in to
+    dst = Buffer.allocUnsafe(len)
+
+  for (i = off[0]; i < this._bufs.length; i++) {
+    l = this._bufs[i].length - start
+
+    if (bytes > l) {
+      this._bufs[i].copy(dst, bufoff, start)
+    } else {
+      this._bufs[i].copy(dst, bufoff, start, start + bytes)
+      break
+    }
+
+    bufoff += l
+    bytes -= l
+
+    if (start)
+      start = 0
+  }
+
+  return dst
+}
+
+BufferList.prototype.shallowSlice = function shallowSlice (start, end) {
+  start = start || 0
+  end = end || this.length
+
+  if (start < 0)
+    start += this.length
+  if (end < 0)
+    end += this.length
+
+  var startOffset = this._offset(start)
+    , endOffset = this._offset(end)
+    , buffers = this._bufs.slice(startOffset[0], endOffset[0] + 1)
+
+  if (endOffset[1] == 0)
+    buffers.pop()
+  else
+    buffers[buffers.length-1] = buffers[buffers.length-1].slice(0, endOffset[1])
+
+  if (startOffset[1] != 0)
+    buffers[0] = buffers[0].slice(startOffset[1])
+
+  return new BufferList(buffers)
+}
+
+BufferList.prototype.toString = function toString (encoding, start, end) {
+  return this.slice(start, end).toString(encoding)
+}
+
+BufferList.prototype.consume = function consume (bytes) {
+  while (this._bufs.length) {
+    if (bytes >= this._bufs[0].length) {
+      bytes -= this._bufs[0].length
+      this.length -= this._bufs[0].length
+      this._bufs.shift()
+    } else {
+      this._bufs[0] = this._bufs[0].slice(bytes)
+      this.length -= bytes
+      break
+    }
+  }
+  return this
+}
+
+
+BufferList.prototype.duplicate = function duplicate () {
+  var i = 0
+    , copy = new BufferList()
+
+  for (; i < this._bufs.length; i++)
+    copy.append(this._bufs[i])
+
+  return copy
+}
+
+
+BufferList.prototype.destroy = function destroy () {
+  this._bufs.length = 0
+  this.length = 0
+  this.push(null)
+}
+
+
+;(function () {
+  var methods = {
+      'readDoubleBE' : 8
+    , 'readDoubleLE' : 8
+    , 'readFloatBE'  : 4
+    , 'readFloatLE'  : 4
+    , 'readInt32BE'  : 4
+    , 'readInt32LE'  : 4
+    , 'readUInt32BE' : 4
+    , 'readUInt32LE' : 4
+    , 'readInt16BE'  : 2
+    , 'readInt16LE'  : 2
+    , 'readUInt16BE' : 2
+    , 'readUInt16LE' : 2
+    , 'readInt8'     : 1
+    , 'readUInt8'    : 1
+  }
+
+  for (var m in methods) {
+    (function (m) {
+      BufferList.prototype[m] = function (offset) {
+        return this.slice(offset, offset + methods[m])[m](0)
+      }
+    }(m))
+  }
+}())
+
+
+module.exports = BufferList
+
+
+/***/ }),
+/* 593 */
+/***/ (function(module, exports) {
+
+function allocUnsafe (size) {
+  if (typeof size !== 'number') {
+    throw new TypeError('"size" argument must be a number')
+  }
+
+  if (size < 0) {
+    throw new RangeError('"size" argument must not be negative')
+  }
+
+  if (Buffer.allocUnsafe) {
+    return Buffer.allocUnsafe(size)
+  } else {
+    return new Buffer(size)
+  }
+}
+
+module.exports = allocUnsafe
+
+
+/***/ }),
+/* 594 */
+/***/ (function(module, exports) {
+
+/* Node.js 6.4.0 and up has full support */
+var hasFullSupport = (function () {
+  try {
+    if (!Buffer.isEncoding('latin1')) {
+      return false
+    }
+
+    var buf = Buffer.alloc ? Buffer.alloc(4) : new Buffer(4)
+
+    buf.fill('ab', 'ucs2')
+
+    return (buf.toString('hex') === '61006200')
+  } catch (_) {
+    return false
+  }
+}())
+
+function isSingleByte (val) {
+  return (val.length === 1 && val.charCodeAt(0) < 256)
+}
+
+function fillWithNumber (buffer, val, start, end) {
+  if (start < 0 || end > buffer.length) {
+    throw new RangeError('Out of range index')
+  }
+
+  start = start >>> 0
+  end = end === undefined ? buffer.length : end >>> 0
+
+  if (end > start) {
+    buffer.fill(val, start, end)
+  }
+
+  return buffer
+}
+
+function fillWithBuffer (buffer, val, start, end) {
+  if (start < 0 || end > buffer.length) {
+    throw new RangeError('Out of range index')
+  }
+
+  if (end <= start) {
+    return buffer
+  }
+
+  start = start >>> 0
+  end = end === undefined ? buffer.length : end >>> 0
+
+  var pos = start
+  var len = val.length
+  while (pos <= (end - len)) {
+    val.copy(buffer, pos)
+    pos += len
+  }
+
+  if (pos !== end) {
+    val.copy(buffer, pos, 0, end - pos)
+  }
+
+  return buffer
+}
+
+function fill (buffer, val, start, end, encoding) {
+  if (hasFullSupport) {
+    return buffer.fill(val, start, end, encoding)
+  }
+
+  if (typeof val === 'number') {
+    return fillWithNumber(buffer, val, start, end)
+  }
+
+  if (typeof val === 'string') {
+    if (typeof start === 'string') {
+      encoding = start
+      start = 0
+      end = buffer.length
+    } else if (typeof end === 'string') {
+      encoding = end
+      end = buffer.length
+    }
+
+    if (encoding !== undefined && typeof encoding !== 'string') {
+      throw new TypeError('encoding must be a string')
+    }
+
+    if (encoding === 'latin1') {
+      encoding = 'binary'
+    }
+
+    if (typeof encoding === 'string' && !Buffer.isEncoding(encoding)) {
+      throw new TypeError('Unknown encoding: ' + encoding)
+    }
+
+    if (val === '') {
+      return fillWithNumber(buffer, 0, start, end)
+    }
+
+    if (isSingleByte(val)) {
+      return fillWithNumber(buffer, val.charCodeAt(0), start, end)
+    }
+
+    val = new Buffer(val, encoding)
+  }
+
+  if (Buffer.isBuffer(val)) {
+    return fillWithBuffer(buffer, val, start, end)
+  }
+
+  // Other values (e.g. undefined, boolean, object) results in zero-fill
+  return fillWithNumber(buffer, 0, start, end)
+}
+
+module.exports = fill
+
+
+/***/ }),
+/* 595 */
+/***/ (function(module, exports) {
+
+var toString = Object.prototype.toString
+
+var isModern = (
+  typeof Buffer.alloc === 'function' &&
+  typeof Buffer.allocUnsafe === 'function' &&
+  typeof Buffer.from === 'function'
+)
+
+function isArrayBuffer (input) {
+  return toString.call(input).slice(8, -1) === 'ArrayBuffer'
+}
+
+function fromArrayBuffer (obj, byteOffset, length) {
+  byteOffset >>>= 0
+
+  var maxLength = obj.byteLength - byteOffset
+
+  if (maxLength < 0) {
+    throw new RangeError("'offset' is out of bounds")
+  }
+
+  if (length === undefined) {
+    length = maxLength
+  } else {
+    length >>>= 0
+
+    if (length > maxLength) {
+      throw new RangeError("'length' is out of bounds")
+    }
+  }
+
+  return isModern
+    ? Buffer.from(obj.slice(byteOffset, byteOffset + length))
+    : new Buffer(new Uint8Array(obj.slice(byteOffset, byteOffset + length)))
+}
+
+function fromString (string, encoding) {
+  if (typeof encoding !== 'string' || encoding === '') {
+    encoding = 'utf8'
+  }
+
+  if (!Buffer.isEncoding(encoding)) {
+    throw new TypeError('"encoding" must be a valid string encoding')
+  }
+
+  return isModern
+    ? Buffer.from(string, encoding)
+    : new Buffer(string, encoding)
+}
+
+function bufferFrom (value, encodingOrOffset, length) {
+  if (typeof value === 'number') {
+    throw new TypeError('"value" argument must not be a number')
+  }
+
+  if (isArrayBuffer(value)) {
+    return fromArrayBuffer(value, encodingOrOffset, length)
+  }
+
+  if (typeof value === 'string') {
+    return fromString(value, encodingOrOffset)
+  }
+
+  return isModern
+    ? Buffer.from(value)
+    : new Buffer(value)
+}
+
+module.exports = bufferFrom
+
+
+/***/ }),
+/* 596 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*!
+ * bytes
+ * Copyright(c) 2012-2014 TJ Holowaychuk
+ * Copyright(c) 2015 Jed Watson
+ * MIT Licensed
+ */
+
+
+
+/**
+ * Module exports.
+ * @public
+ */
+
+module.exports = bytes;
+module.exports.format = format;
+module.exports.parse = parse;
+
+/**
+ * Module variables.
+ * @private
+ */
+
+var formatThousandsRegExp = /\B(?=(\d{3})+(?!\d))/g;
+
+var formatDecimalsRegExp = /(?:\.0*|(\.[^0]+)0+)$/;
+
+var map = {
+  b:  1,
+  kb: 1 << 10,
+  mb: 1 << 20,
+  gb: 1 << 30,
+  tb: ((1 << 30) * 1024)
+};
+
+var parseRegExp = /^((-|\+)?(\d+(?:\.\d+)?)) *(kb|mb|gb|tb)$/i;
+
+/**
+ * Convert the given value in bytes into a string or parse to string to an integer in bytes.
+ *
+ * @param {string|number} value
+ * @param {{
+ *  case: [string],
+ *  decimalPlaces: [number]
+ *  fixedDecimals: [boolean]
+ *  thousandsSeparator: [string]
+ *  unitSeparator: [string]
+ *  }} [options] bytes options.
+ *
+ * @returns {string|number|null}
+ */
+
+function bytes(value, options) {
+  if (typeof value === 'string') {
+    return parse(value);
+  }
+
+  if (typeof value === 'number') {
+    return format(value, options);
+  }
+
+  return null;
+}
+
+/**
+ * Format the given value in bytes into a string.
+ *
+ * If the value is negative, it is kept as such. If it is a float,
+ * it is rounded.
+ *
+ * @param {number} value
+ * @param {object} [options]
+ * @param {number} [options.decimalPlaces=2]
+ * @param {number} [options.fixedDecimals=false]
+ * @param {string} [options.thousandsSeparator=]
+ * @param {string} [options.unit=]
+ * @param {string} [options.unitSeparator=]
+ *
+ * @returns {string|null}
+ * @public
+ */
+
+function format(value, options) {
+  if (!Number.isFinite(value)) {
+    return null;
+  }
+
+  var mag = Math.abs(value);
+  var thousandsSeparator = (options && options.thousandsSeparator) || '';
+  var unitSeparator = (options && options.unitSeparator) || '';
+  var decimalPlaces = (options && options.decimalPlaces !== undefined) ? options.decimalPlaces : 2;
+  var fixedDecimals = Boolean(options && options.fixedDecimals);
+  var unit = (options && options.unit) || '';
+
+  if (!unit || !map[unit.toLowerCase()]) {
+    if (mag >= map.tb) {
+      unit = 'TB';
+    } else if (mag >= map.gb) {
+      unit = 'GB';
+    } else if (mag >= map.mb) {
+      unit = 'MB';
+    } else if (mag >= map.kb) {
+      unit = 'KB';
+    } else {
+      unit = 'B';
+    }
+  }
+
+  var val = value / map[unit.toLowerCase()];
+  var str = val.toFixed(decimalPlaces);
+
+  if (!fixedDecimals) {
+    str = str.replace(formatDecimalsRegExp, '$1');
+  }
+
+  if (thousandsSeparator) {
+    str = str.replace(formatThousandsRegExp, thousandsSeparator);
+  }
+
+  return str + unitSeparator + unit;
+}
+
+/**
+ * Parse the string value into an integer in bytes.
+ *
+ * If no unit is given, it is assumed the value is in bytes.
+ *
+ * @param {number|string} val
+ *
+ * @returns {number|null}
+ * @public
+ */
+
+function parse(val) {
+  if (typeof val === 'number' && !isNaN(val)) {
+    return val;
+  }
+
+  if (typeof val !== 'string') {
+    return null;
+  }
+
+  // Test if the string passed is valid
+  var results = parseRegExp.exec(val);
+  var floatValue;
+  var unit = 'b';
+
+  if (!results) {
+    // Nothing could be extracted from the given string
+    floatValue = parseInt(val, 10);
+    unit = 'b'
+  } else {
+    // Retrieve the value and the unit
+    floatValue = parseFloat(results[1]);
+    unit = results[4].toLowerCase();
+  }
+
+  return Math.floor(map[unit] * floatValue);
+}
+
+
+/***/ }),
+/* 597 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = (flag, argv) => {
+	argv = argv || process.argv;
+	const prefix = flag.startsWith('-') ? '' : (flag.length === 1 ? '-' : '--');
+	const pos = argv.indexOf(prefix + flag);
+	const terminatorPos = argv.indexOf('--');
+	return pos !== -1 && (terminatorPos === -1 ? true : pos < terminatorPos);
+};
+
+
+/***/ }),
+/* 598 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+const os = __webpack_require__(49);
+const hasFlag = __webpack_require__(597);
+
+const env = process.env;
+
+let forceColor;
+if (hasFlag('no-color') ||
+	hasFlag('no-colors') ||
+	hasFlag('color=false')) {
+	forceColor = false;
+} else if (hasFlag('color') ||
+	hasFlag('colors') ||
+	hasFlag('color=true') ||
+	hasFlag('color=always')) {
+	forceColor = true;
+}
+if ('FORCE_COLOR' in env) {
+	forceColor = env.FORCE_COLOR.length === 0 || parseInt(env.FORCE_COLOR, 10) !== 0;
+}
+
+function translateLevel(level) {
+	if (level === 0) {
+		return false;
+	}
+
+	return {
+		level,
+		hasBasic: true,
+		has256: level >= 2,
+		has16m: level >= 3
+	};
+}
+
+function supportsColor(stream) {
+	if (forceColor === false) {
+		return 0;
+	}
+
+	if (hasFlag('color=16m') ||
+		hasFlag('color=full') ||
+		hasFlag('color=truecolor')) {
+		return 3;
+	}
+
+	if (hasFlag('color=256')) {
+		return 2;
+	}
+
+	if (stream && !stream.isTTY && forceColor !== true) {
+		return 0;
+	}
+
+	const min = forceColor ? 1 : 0;
+
+	if (process.platform === 'win32') {
+		// Node.js 7.5.0 is the first version of Node.js to include a patch to
+		// libuv that enables 256 color output on Windows. Anything earlier and it
+		// won't work. However, here we target Node.js 8 at minimum as it is an LTS
+		// release, and Node.js 7 is not. Windows 10 build 10586 is the first Windows
+		// release that supports 256 colors. Windows 10 build 14931 is the first release
+		// that supports 16m/TrueColor.
+		const osRelease = os.release().split('.');
+		if (
+			Number(process.versions.node.split('.')[0]) >= 8 &&
+			Number(osRelease[0]) >= 10 &&
+			Number(osRelease[2]) >= 10586
+		) {
+			return Number(osRelease[2]) >= 14931 ? 3 : 2;
+		}
+
+		return 1;
+	}
+
+	if ('CI' in env) {
+		if (['TRAVIS', 'CIRCLECI', 'APPVEYOR', 'GITLAB_CI'].some(sign => sign in env) || env.CI_NAME === 'codeship') {
+			return 1;
+		}
+
+		return min;
+	}
+
+	if ('TEAMCITY_VERSION' in env) {
+		return /^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(env.TEAMCITY_VERSION) ? 1 : 0;
+	}
+
+	if (env.COLORTERM === 'truecolor') {
+		return 3;
+	}
+
+	if ('TERM_PROGRAM' in env) {
+		const version = parseInt((env.TERM_PROGRAM_VERSION || '').split('.')[0], 10);
+
+		switch (env.TERM_PROGRAM) {
+			case 'iTerm.app':
+				return version >= 3 ? 3 : 2;
+			case 'Apple_Terminal':
+				return 2;
+			// No default
+		}
+	}
+
+	if (/-256(color)?$/i.test(env.TERM)) {
+		return 2;
+	}
+
+	if (/^screen|^xterm|^vt100|^rxvt|color|ansi|cygwin|linux/i.test(env.TERM)) {
+		return 1;
+	}
+
+	if ('COLORTERM' in env) {
+		return 1;
+	}
+
+	if (env.TERM === 'dumb') {
+		return min;
+	}
+
+	return min;
+}
+
+function getSupportLevel(stream) {
+	const level = supportsColor(stream);
+	return translateLevel(level);
+}
+
+module.exports = {
+	supportsColor: getSupportLevel,
+	stdout: getSupportLevel(process.stdout),
+	stderr: getSupportLevel(process.stderr)
+};
+
+
+/***/ }),
+/* 599 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+const TEMPLATE_REGEX = /(?:\\(u[a-f\d]{4}|x[a-f\d]{2}|.))|(?:\{(~)?(\w+(?:\([^)]*\))?(?:\.\w+(?:\([^)]*\))?)*)(?:[ \t]|(?=\r?\n)))|(\})|((?:.|[\r\n\f])+?)/gi;
+const STYLE_REGEX = /(?:^|\.)(\w+)(?:\(([^)]*)\))?/g;
+const STRING_REGEX = /^(['"])((?:\\.|(?!\1)[^\\])*)\1$/;
+const ESCAPE_REGEX = /\\(u[a-f\d]{4}|x[a-f\d]{2}|.)|([^\\])/gi;
+
+const ESCAPES = new Map([
+	['n', '\n'],
+	['r', '\r'],
+	['t', '\t'],
+	['b', '\b'],
+	['f', '\f'],
+	['v', '\v'],
+	['0', '\0'],
+	['\\', '\\'],
+	['e', '\u001B'],
+	['a', '\u0007']
+]);
+
+function unescape(c) {
+	if ((c[0] === 'u' && c.length === 5) || (c[0] === 'x' && c.length === 3)) {
+		return String.fromCharCode(parseInt(c.slice(1), 16));
+	}
+
+	return ESCAPES.get(c) || c;
+}
+
+function parseArguments(name, args) {
+	const results = [];
+	const chunks = args.trim().split(/\s*,\s*/g);
+	let matches;
+
+	for (const chunk of chunks) {
+		if (!isNaN(chunk)) {
+			results.push(Number(chunk));
+		} else if ((matches = chunk.match(STRING_REGEX))) {
+			results.push(matches[2].replace(ESCAPE_REGEX, (m, escape, chr) => escape ? unescape(escape) : chr));
+		} else {
+			throw new Error(`Invalid Chalk template style argument: ${chunk} (in style '${name}')`);
+		}
+	}
+
+	return results;
+}
+
+function parseStyle(style) {
+	STYLE_REGEX.lastIndex = 0;
+
+	const results = [];
+	let matches;
+
+	while ((matches = STYLE_REGEX.exec(style)) !== null) {
+		const name = matches[1];
+
+		if (matches[2]) {
+			const args = parseArguments(name, matches[2]);
+			results.push([name].concat(args));
+		} else {
+			results.push([name]);
+		}
+	}
+
+	return results;
+}
+
+function buildStyle(chalk, styles) {
+	const enabled = {};
+
+	for (const layer of styles) {
+		for (const style of layer.styles) {
+			enabled[style[0]] = layer.inverse ? null : style.slice(1);
+		}
+	}
+
+	let current = chalk;
+	for (const styleName of Object.keys(enabled)) {
+		if (Array.isArray(enabled[styleName])) {
+			if (!(styleName in current)) {
+				throw new Error(`Unknown Chalk style: ${styleName}`);
+			}
+
+			if (enabled[styleName].length > 0) {
+				current = current[styleName].apply(current, enabled[styleName]);
+			} else {
+				current = current[styleName];
+			}
+		}
+	}
+
+	return current;
+}
+
+module.exports = (chalk, tmp) => {
+	const styles = [];
+	const chunks = [];
+	let chunk = [];
+
+	// eslint-disable-next-line max-params
+	tmp.replace(TEMPLATE_REGEX, (m, escapeChar, inverse, style, close, chr) => {
+		if (escapeChar) {
+			chunk.push(unescape(escapeChar));
+		} else if (style) {
+			const str = chunk.join('');
+			chunk = [];
+			chunks.push(styles.length === 0 ? str : buildStyle(chalk, styles)(str));
+			styles.push({inverse, styles: parseStyle(style)});
+		} else if (close) {
+			if (styles.length === 0) {
+				throw new Error('Found extraneous } in Chalk template literal');
+			}
+
+			chunks.push(buildStyle(chalk, styles)(chunk.join('')));
+			chunk = [];
+			styles.pop();
+		} else {
+			chunk.push(chr);
+		}
+	});
+
+	chunks.push(chunk.join(''));
+
+	if (styles.length > 0) {
+		const errMsg = `Chalk template literal is missing ${styles.length} closing bracket${styles.length === 1 ? '' : 's'} (\`}\`)`;
+		throw new Error(errMsg);
+	}
+
+	return chunks.join('');
+};
+
+
+/***/ }),
+/* 600 */
+/***/ (function(module, exports, __webpack_require__) {
+
+module.exports = chownr
+chownr.sync = chownrSync
+
+var fs = __webpack_require__(5)
+, path = __webpack_require__(0)
+
+function chownr (p, uid, gid, cb) {
+  fs.readdir(p, function (er, children) {
+    // any error other than ENOTDIR means it's not readable, or
+    // doesn't exist.  give up.
+    if (er && er.code !== "ENOTDIR") return cb(er)
+    if (er || !children.length) return fs.chown(p, uid, gid, cb)
+
+    var len = children.length
+    , errState = null
+    children.forEach(function (child) {
+      var pathChild = path.resolve(p, child);
+      fs.lstat(pathChild, function(er, stats) {
+        if (er)
+          return cb(er)
+        if (!stats.isSymbolicLink())
+          chownr(pathChild, uid, gid, then)
+        else
+          then()
+        })
+    })
+    function then (er) {
+      if (errState) return
+      if (er) return cb(errState = er)
+      if (-- len === 0) return fs.chown(p, uid, gid, cb)
+    }
+  })
+}
+
+function chownrSync (p, uid, gid) {
+  var children
+  try {
+    children = fs.readdirSync(p)
+  } catch (er) {
+    if (er && er.code === "ENOTDIR") return fs.chownSync(p, uid, gid)
+    throw er
+  }
+  if (!children.length) return fs.chownSync(p, uid, gid)
+
+  children.forEach(function (child) {
+    var pathChild = path.resolve(p, child)
+    var stats = fs.lstatSync(pathChild)
+    if (!stats.isSymbolicLink())
+      chownrSync(pathChild, uid, gid)
+  })
+  return fs.chownSync(p, uid, gid)
+}
+
+
+/***/ }),
+/* 601 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var env = process.env
+
+var vendors = [
+  // Constant, Name, Envs
+  ['TRAVIS', 'Travis CI', 'TRAVIS'],
+  ['CIRCLE', 'CircleCI', 'CIRCLECI'],
+  ['GITLAB', 'GitLab CI', 'GITLAB_CI'],
+  ['APPVEYOR', 'AppVeyor', 'APPVEYOR'],
+  ['CODESHIP', 'Codeship', {CI_NAME: 'codeship'}],
+  ['DRONE', 'Drone', 'DRONE'],
+  ['MAGNUM', 'Magnum CI', 'MAGNUM'],
+  ['SEMAPHORE', 'Semaphore', 'SEMAPHORE'],
+  ['JENKINS', 'Jenkins', 'JENKINS_URL', 'BUILD_ID'],
+  ['BAMBOO', 'Bamboo', 'bamboo_planKey'],
+  ['TFS', 'Team Foundation Server', 'TF_BUILD'],
+  ['TEAMCITY', 'TeamCity', 'TEAMCITY_VERSION'],
+  ['BUILDKITE', 'Buildkite', 'BUILDKITE'],
+  ['HUDSON', 'Hudson', 'HUDSON_URL'],
+  ['TASKCLUSTER', 'TaskCluster', 'TASK_ID', 'RUN_ID'],
+  ['GOCD', 'GoCD', 'GO_PIPELINE_LABEL'],
+  ['BITBUCKET', 'Bitbucket Pipelines', 'BITBUCKET_COMMIT'],
+  ['CODEBUILD', 'AWS CodeBuild', 'CODEBUILD_BUILD_ARN']
+]
+
+exports.name = null
+
+vendors.forEach(function (vendor) {
+  var constant = vendor.shift()
+  var name = vendor.shift()
+  var isCI = vendor.every(function (obj) {
+    if (typeof obj === 'string') return !!env[obj]
+    return Object.keys(obj).every(function (k) {
+      return env[k] === obj[k]
+    })
+  })
+  exports[constant] = isCI
+  if (isCI) exports.name = name
+})
+
+exports.isCI = !!(
+  env.CI ||                      // Travis CI, CircleCI, Gitlab CI, Appveyor, CodeShip
+  env.CONTINUOUS_INTEGRATION ||  // Travis CI
+  env.BUILD_NUMBER ||            // Jenkins, TeamCity
+  exports.name ||
+  false
+)
+
+
+/***/ }),
+/* 602 */
+/***/ (function(module, exports, __webpack_require__) {
+
+module.exports = __webpack_require__(605);
+
+/***/ }),
+/* 603 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var kindOf = __webpack_require__(179);
+var utils = __webpack_require__(382);
+
+/**
+ * A representation of a cell within the table.
+ * Implementations must have `init` and `draw` methods,
+ * as well as `colSpan`, `rowSpan`, `desiredHeight` and `desiredWidth` properties.
+ * @param options
+ * @constructor
+ */
+function Cell(options){
+  this.setOptions(options);
+}
+
+Cell.prototype.setOptions = function(options){
+  if(['boolean', 'number', 'string'].indexOf(kindOf(options)) !== -1){
+    options = {content:''+options};
+  }
+  options = options || {};
+  this.options = options;
+  var content = options.content;
+  if (['boolean', 'number', 'string'].indexOf(kindOf(content)) !== -1) {
+    this.content = String(content);
+  } else if (!content) {
+    this.content = '';
+  } else {
+    throw new Error('Content needs to be a primitive, got: ' + (typeof  content));
+  }
+  this.colSpan = options.colSpan || 1;
+  this.rowSpan = options.rowSpan || 1;
+};
+
+Cell.prototype.mergeTableOptions = function(tableOptions,cells){
+  this.cells = cells;
+
+  var optionsChars = this.options.chars || {};
+  var tableChars = tableOptions.chars;
+  var chars = this.chars = {};
+  CHAR_NAMES.forEach(function(name){
+     setOption(optionsChars,tableChars,name,chars);
+  });
+
+  this.truncate = this.options.truncate || tableOptions.truncate;
+
+  var style = this.options.style = this.options.style || {};
+  var tableStyle = tableOptions.style;
+  setOption(style, tableStyle, 'padding-left', this);
+  setOption(style, tableStyle, 'padding-right', this);
+  this.head = style.head || tableStyle.head;
+  this.border = style.border || tableStyle.border;
+
+  var fixedWidth = tableOptions.colWidths[this.x];
+  if(tableOptions.wordWrap && fixedWidth){
+    fixedWidth -= this.paddingLeft + this.paddingRight;
+    if(this.colSpan){
+      var i = 1;
+      while(i<this.colSpan){
+        fixedWidth += tableOptions.colWidths[this.x + i];
+        i++;
+      }
+    }
+    this.lines = utils.colorizeLines(utils.wordWrap(fixedWidth,this.content));
+  }
+  else {
+    this.lines = utils.colorizeLines(this.content.split('\n'));
+  }
+
+  this.desiredWidth = utils.strlen(this.content) + this.paddingLeft + this.paddingRight;
+  this.desiredHeight = this.lines.length;
+};
+
+/**
+ * Each cell will have it's `x` and `y` values set by the `layout-manager` prior to
+ * `init` being called;
+ * @type {Number}
+ */
+
+Cell.prototype.x = null;
+Cell.prototype.y = null;
+
+/**
+ * Initializes the Cells data structure.
+ *
+ * @param tableOptions - A fully populated set of tableOptions.
+ * In addition to the standard default values, tableOptions must have fully populated the
+ * `colWidths` and `rowWidths` arrays. Those arrays must have lengths equal to the number
+ * of columns or rows (respectively) in this table, and each array item must be a Number.
+ *
+ */
+Cell.prototype.init = function(tableOptions){
+  var x = this.x;
+  var y = this.y;
+  this.widths = tableOptions.colWidths.slice(x, x + this.colSpan);
+  this.heights = tableOptions.rowHeights.slice(y, y + this.rowSpan);
+  this.width = this.widths.reduce(sumPlusOne, -1);
+  this.height = this.heights.reduce(sumPlusOne, -1);
+
+  this.hAlign = this.options.hAlign || tableOptions.colAligns[x];
+  this.vAlign = this.options.vAlign || tableOptions.rowAligns[y];
+
+  this.drawRight = x + this.colSpan == tableOptions.colWidths.length;
+};
+
+/**
+ * Draws the given line of the cell.
+ * This default implementation defers to methods `drawTop`, `drawBottom`, `drawLine` and `drawEmpty`.
+ * @param lineNum - can be `top`, `bottom` or a numerical line number.
+ * @param spanningCell - will be a number if being called from a RowSpanCell, and will represent how
+ * many rows below it's being called from. Otherwise it's undefined.
+ * @returns {String} The representation of this line.
+ */
+Cell.prototype.draw = function(lineNum,spanningCell){
+  if(lineNum == 'top') return this.drawTop(this.drawRight);
+  if(lineNum == 'bottom') return this.drawBottom(this.drawRight);
+  var padLen = Math.max(this.height - this.lines.length, 0);
+  var padTop;
+  switch (this.vAlign){
+    case 'center':
+      padTop = Math.ceil(padLen / 2);
+      break;
+    case 'bottom':
+      padTop = padLen;
+      break;
+    default :
+      padTop = 0;
+  }
+  if( (lineNum < padTop) || (lineNum >= (padTop + this.lines.length))){
+    return this.drawEmpty(this.drawRight,spanningCell);
+  }
+  var forceTruncation = (this.lines.length > this.height) && (lineNum + 1 >= this.height);
+  return this.drawLine(lineNum - padTop, this.drawRight, forceTruncation,spanningCell);
+};
+
+/**
+ * Renders the top line of the cell.
+ * @param drawRight - true if this method should render the right edge of the cell.
+ * @returns {String}
+ */
+Cell.prototype.drawTop = function(drawRight){
+  var content = [];
+  if(this.cells){  //TODO: cells should always exist - some tests don't fill it in though
+    this.widths.forEach(function(width,index){
+      content.push(this._topLeftChar(index));
+      content.push(
+        utils.repeat(this.chars[this.y == 0 ? 'top' : 'mid'],width)
+      );
+    },this);
+  }
+  else {
+    content.push(this._topLeftChar(0));
+    content.push(utils.repeat(this.chars[this.y == 0 ? 'top' : 'mid'],this.width));
+  }
+  if(drawRight){
+    content.push(this.chars[this.y == 0 ? 'topRight' : 'rightMid']);
+  }
+  return this.wrapWithStyleColors('border',content.join(''));
+};
+
+Cell.prototype._topLeftChar = function(offset){
+  var x = this.x+offset;
+  var leftChar;
+  if(this.y == 0){
+    leftChar = x == 0 ? 'topLeft' : (offset == 0 ? 'topMid' : 'top');
+  } else  {
+    if(x == 0){
+      leftChar = 'leftMid';
+    }
+    else {
+      leftChar = offset == 0 ? 'midMid' : 'bottomMid';
+      if(this.cells){  //TODO: cells should always exist - some tests don't fill it in though
+        var spanAbove = this.cells[this.y-1][x] instanceof Cell.ColSpanCell;
+        if(spanAbove){
+          leftChar = offset == 0 ? 'topMid' : 'mid';
+        }
+        if(offset == 0){
+          var i = 1;
+          while(this.cells[this.y][x-i] instanceof Cell.ColSpanCell){
+            i++;
+          }
+          if(this.cells[this.y][x-i] instanceof Cell.RowSpanCell){
+            leftChar = 'leftMid';
+          }
+        }
+      }
+    }
+  }
+  return this.chars[leftChar];
+};
+
+Cell.prototype.wrapWithStyleColors = function(styleProperty,content){
+  if(this[styleProperty] && this[styleProperty].length){
+    try {
+      var colors = __webpack_require__(621);
+      for(var i = this[styleProperty].length - 1; i >= 0; i--){
+        colors = colors[this[styleProperty][i]];
+      }
+      return colors(content);
+    } catch (e) {
+      return content;
+    }
+  }
+  else {
+    return content;
+  }
+};
+
+/**
+ * Renders a line of text.
+ * @param lineNum - Which line of text to render. This is not necessarily the line within the cell.
+ * There may be top-padding above the first line of text.
+ * @param drawRight - true if this method should render the right edge of the cell.
+ * @param forceTruncationSymbol - `true` if the rendered text should end with the truncation symbol even
+ * if the text fits. This is used when the cell is vertically truncated. If `false` the text should
+ * only include the truncation symbol if the text will not fit horizontally within the cell width.
+ * @param spanningCell - a number of if being called from a RowSpanCell. (how many rows below). otherwise undefined.
+ * @returns {String}
+ */
+Cell.prototype.drawLine = function(lineNum,drawRight,forceTruncationSymbol,spanningCell){
+  var left = this.chars[this.x == 0 ? 'left' : 'middle'];
+  if(this.x && spanningCell && this.cells){
+    var cellLeft = this.cells[this.y+spanningCell][this.x-1];
+    while(cellLeft instanceof ColSpanCell){
+      cellLeft = this.cells[cellLeft.y][cellLeft.x-1];
+    }
+    if(!(cellLeft instanceof RowSpanCell)){
+      left = this.chars['rightMid'];
+    }
+  }
+  var leftPadding = utils.repeat(' ', this.paddingLeft);
+  var right = (drawRight ? this.chars['right'] : '');
+  var rightPadding = utils.repeat(' ', this.paddingRight);
+  var line = this.lines[lineNum];
+  var len = this.width - (this.paddingLeft + this.paddingRight);
+  if(forceTruncationSymbol) line += this.truncate || '…';
+  var content = utils.truncate(line,len,this.truncate);
+  content = utils.pad(content, len, ' ', this.hAlign);
+  content = leftPadding + content + rightPadding;
+  return this.stylizeLine(left,content,right);
+};
+
+Cell.prototype.stylizeLine = function(left,content,right){
+  left = this.wrapWithStyleColors('border',left);
+  right = this.wrapWithStyleColors('border',right);
+  if(this.y === 0){
+    content = this.wrapWithStyleColors('head',content);
+  }
+  return left + content + right;
+};
+
+/**
+ * Renders the bottom line of the cell.
+ * @param drawRight - true if this method should render the right edge of the cell.
+ * @returns {String}
+ */
+Cell.prototype.drawBottom = function(drawRight){
+  var left = this.chars[this.x == 0 ? 'bottomLeft' : 'bottomMid'];
+  var content = utils.repeat(this.chars.bottom,this.width);
+  var right = drawRight ? this.chars['bottomRight'] : '';
+  return this.wrapWithStyleColors('border',left + content + right);
+};
+
+/**
+ * Renders a blank line of text within the cell. Used for top and/or bottom padding.
+ * @param drawRight - true if this method should render the right edge of the cell.
+ * @param spanningCell - a number of if being called from a RowSpanCell. (how many rows below). otherwise undefined.
+ * @returns {String}
+ */
+Cell.prototype.drawEmpty = function(drawRight,spanningCell){
+  var left = this.chars[this.x == 0 ? 'left' : 'middle'];
+  if(this.x && spanningCell && this.cells){
+    var cellLeft = this.cells[this.y+spanningCell][this.x-1];
+    while(cellLeft instanceof ColSpanCell){
+      cellLeft = this.cells[cellLeft.y][cellLeft.x-1];
+    }
+    if(!(cellLeft instanceof RowSpanCell)){
+      left = this.chars['rightMid'];
+    }
+  }
+  var right = (drawRight ? this.chars['right'] : '');
+  var content = utils.repeat(' ',this.width);
+  return this.stylizeLine(left , content , right);
+};
+
+/**
+ * A Cell that doesn't do anything. It just draws empty lines.
+ * Used as a placeholder in column spanning.
+ * @constructor
+ */
+function ColSpanCell(){}
+
+ColSpanCell.prototype.draw = function(){
+  return '';
+};
+
+ColSpanCell.prototype.init = function(tableOptions){};
+
+
+/**
+ * A placeholder Cell for a Cell that spans multiple rows.
+ * It delegates rendering to the original cell, but adds the appropriate offset.
+ * @param originalCell
+ * @constructor
+ */
+function RowSpanCell(originalCell){
+  this.originalCell = originalCell;
+}
+
+RowSpanCell.prototype.init = function(tableOptions){
+  var y = this.y;
+  var originalY = this.originalCell.y;
+  this.cellOffset = y - originalY;
+  this.offset = findDimension(tableOptions.rowHeights,originalY,this.cellOffset);
+};
+
+RowSpanCell.prototype.draw = function(lineNum){
+  if(lineNum == 'top'){
+    return this.originalCell.draw(this.offset,this.cellOffset);
+  }
+  if(lineNum == 'bottom'){
+    return this.originalCell.draw('bottom');
+  }
+  return this.originalCell.draw(this.offset + 1 + lineNum);
+};
+
+ColSpanCell.prototype.mergeTableOptions =
+RowSpanCell.prototype.mergeTableOptions = function(){};
+
+// HELPER FUNCTIONS
+function setOption(objA,objB,nameB,targetObj){
+  var nameA = nameB.split('-');
+  if(nameA.length > 1) {
+    nameA[1] = nameA[1].charAt(0).toUpperCase() + nameA[1].substr(1);
+    nameA = nameA.join('');
+    targetObj[nameA] = objA[nameA] || objA[nameB] || objB[nameA] || objB[nameB];
+  }
+  else {
+    targetObj[nameB] = objA[nameB] || objB[nameB];
+  }
+}
+
+function findDimension(dimensionTable, startingIndex, span){
+  var ret = dimensionTable[startingIndex];
+  for(var i = 1; i < span; i++){
+    ret += 1 + dimensionTable[startingIndex + i];
+  }
+  return ret;
+}
+
+function sumPlusOne(a,b){
+  return a+b+1;
+}
+
+var CHAR_NAMES = [  'top'
+  , 'top-mid'
+  , 'top-left'
+  , 'top-right'
+  , 'bottom'
+  , 'bottom-mid'
+  , 'bottom-left'
+  , 'bottom-right'
+  , 'left'
+  , 'left-mid'
+  , 'mid'
+  , 'mid-mid'
+  , 'right'
+  , 'right-mid'
+  , 'middle'
+];
+module.exports = Cell;
+module.exports.ColSpanCell = ColSpanCell;
+module.exports.RowSpanCell = RowSpanCell;
+
+
+/***/ }),
+/* 604 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var kindOf = __webpack_require__(179);
+var objectAssign = __webpack_require__(303);
+var Cell = __webpack_require__(603);
+var RowSpanCell = Cell.RowSpanCell;
+var ColSpanCell = Cell.ColSpanCell;
+
+(function(){
+  function layoutTable(table){
+    table.forEach(function(row,rowIndex){
+      row.forEach(function(cell,columnIndex){
+        cell.y = rowIndex;
+        cell.x = columnIndex;
+        for(var y = rowIndex; y >= 0; y--){
+          var row2 = table[y];
+          var xMax = (y === rowIndex) ? columnIndex : row2.length;
+          for(var x = 0; x < xMax; x++){
+            var cell2 = row2[x];
+            while(cellsConflict(cell,cell2)){
+              cell.x++;
+            }
+          }
+        }
+      });
+    });
+  }
+
+  function maxWidth(table) {
+    var mw = 0;
+    table.forEach(function (row) {
+      row.forEach(function (cell) {
+        mw = Math.max(mw,cell.x + (cell.colSpan || 1));
+      });
+    });
+    return mw;
+  }
+
+  function maxHeight(table){
+    return table.length;
+  }
+
+  function cellsConflict(cell1,cell2){
+    var yMin1 = cell1.y;
+    var yMax1 = cell1.y - 1 + (cell1.rowSpan || 1);
+    var yMin2 = cell2.y;
+    var yMax2 = cell2.y - 1 + (cell2.rowSpan || 1);
+    var yConflict = !(yMin1 > yMax2 || yMin2 > yMax1);
+
+    var xMin1= cell1.x;
+    var xMax1 = cell1.x - 1 + (cell1.colSpan || 1);
+    var xMin2= cell2.x;
+    var xMax2 = cell2.x - 1 + (cell2.colSpan || 1);
+    var xConflict = !(xMin1 > xMax2 || xMin2 > xMax1);
+
+    return yConflict && xConflict;
+  }
+
+  function conflictExists(rows,x,y){
+    var i_max = Math.min(rows.length-1,y);
+    var cell = {x:x,y:y};
+    for(var i = 0; i <= i_max; i++){
+      var row = rows[i];
+      for(var j = 0; j < row.length; j++){
+        if(cellsConflict(cell,row[j])){
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+
+  function allBlank(rows,y,xMin,xMax){
+    for(var x = xMin; x < xMax; x++){
+      if(conflictExists(rows,x,y)){
+        return false;
+      }
+    }
+    return true;
+  }
+
+  function addRowSpanCells(table){
+    table.forEach(function(row,rowIndex){
+      row.forEach(function(cell){
+        for(var i = 1; i < cell.rowSpan; i++){
+          var rowSpanCell = new RowSpanCell(cell);
+          rowSpanCell.x = cell.x;
+          rowSpanCell.y = cell.y + i;
+          rowSpanCell.colSpan = cell.colSpan;
+          insertCell(rowSpanCell,table[rowIndex+i]);
+        }
+      });
+    });
+  }
+
+  function addColSpanCells(cellRows){
+    for(var rowIndex = cellRows.length-1; rowIndex >= 0; rowIndex--) {
+      var cellColumns = cellRows[rowIndex];
+      for (var columnIndex = 0; columnIndex < cellColumns.length; columnIndex++) {
+        var cell = cellColumns[columnIndex];
+        for (var k = 1; k < cell.colSpan; k++) {
+          var colSpanCell = new ColSpanCell();
+          colSpanCell.x = cell.x + k;
+          colSpanCell.y = cell.y;
+          cellColumns.splice(columnIndex + 1, 0, colSpanCell);
+        }
+      }
+    }
+  }
+
+  function insertCell(cell,row){
+    var x = 0;
+    while(x < row.length && (row[x].x < cell.x)) {
+      x++;
+    }
+    row.splice(x,0,cell);
+  }
+
+  function fillInTable(table){
+    var h_max = maxHeight(table);
+    var w_max = maxWidth(table);
+    for(var y = 0; y < h_max; y++){
+      for(var x = 0; x < w_max; x++){
+        if(!conflictExists(table,x,y)){
+          var opts = {x:x,y:y,colSpan:1,rowSpan:1};
+          x++;
+          while(x < w_max && !conflictExists(table,x,y)){
+            opts.colSpan++;
+            x++;
+          }
+          var y2 = y + 1;
+          while(y2 < h_max && allBlank(table,y2,opts.x,opts.x+opts.colSpan)){
+            opts.rowSpan++;
+            y2++;
+          }
+
+          var cell = new Cell(opts);
+          cell.x = opts.x;
+          cell.y = opts.y;
+          insertCell(cell,table[y]);
+        }
+      }
+    }
+  }
+
+  function generateCells(rows){
+    return rows.map(function(row){
+      if(kindOf(row) !== 'array'){
+        var key = Object.keys(row)[0];
+        row = row[key];
+        if(kindOf(row) === 'array'){
+          row = row.slice();
+          row.unshift(key);
+        }
+        else {
+          row = [key,row];
+        }
+      }
+      return row.map(function(cell){
+        return new Cell(cell);
+      });
+    });
+  }
+
+  function makeTableLayout(rows){
+    var cellRows = generateCells(rows);
+    layoutTable(cellRows);
+    fillInTable(cellRows);
+    addRowSpanCells(cellRows);
+    addColSpanCells(cellRows);
+    return cellRows;
+  }
+
+  module.exports = {
+    makeTableLayout: makeTableLayout,
+    layoutTable: layoutTable,
+    addRowSpanCells: addRowSpanCells,
+    maxWidth:maxWidth,
+    fillInTable:fillInTable,
+    computeWidths:makeComputeWidths('colSpan','desiredWidth','x',1),
+    computeHeights:makeComputeWidths('rowSpan','desiredHeight','y',1)
+  };
+})();
+
+function makeComputeWidths(colSpan,desiredWidth,x,forcedMin){
+  return function(vals,table){
+    var result = [];
+    var spanners = [];
+    table.forEach(function(row){
+      row.forEach(function(cell){
+        if((cell[colSpan] || 1) > 1){
+          spanners.push(cell);
+        }
+        else {
+          result[cell[x]] = Math.max(result[cell[x]] || 0, cell[desiredWidth] || 0, forcedMin);
+        }
+      });
+    });
+
+    vals.forEach(function(val,index){
+      if(kindOf(val) === 'number'){
+        result[index] = val;
+      }
+    });
+
+    //spanners.forEach(function(cell){
+    for(var k = spanners.length - 1; k >=0; k--){
+      var cell = spanners[k];
+      var span = cell[colSpan];
+      var col = cell[x];
+      var existingWidth = result[col];
+      var editableCols = kindOf(vals[col]) === 'number' ? 0 : 1;
+      for(var i = 1; i < span; i ++){
+        existingWidth += 1 + result[col + i];
+        if(kindOf(vals[col + i]) !== 'number'){
+          editableCols++;
+        }
+      }
+      if(cell[desiredWidth] > existingWidth){
+        i = 0;
+        while(editableCols > 0 && cell[desiredWidth] > existingWidth){
+          if(kindOf(vals[col+i]) !== 'number'){
+            var dif = Math.round( (cell[desiredWidth] - existingWidth) / editableCols );
+            existingWidth += dif;
+            result[col + i] += dif;
+            editableCols--;
+          }
+          i++;
+        }
+      }
+    }
+
+    objectAssign(vals,result);
+    for(var j = 0; j < vals.length; j++){
+      vals[j] = Math.max(forcedMin, vals[j] || 0);
+    }
+  };
+}
+
+
+/***/ }),
+/* 605 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var utils = __webpack_require__(382);
+var tableLayout = __webpack_require__(604);
+
+function Table(options){
+  this.options = utils.mergeOptions(options);
+}
+
+Table.prototype.__proto__ = Array.prototype;
+
+Table.prototype.toString = function(){
+  var array = this;
+  var headersPresent = this.options.head && this.options.head.length;
+  if(headersPresent){
+    array = [this.options.head];
+    if(this.length){
+      array.push.apply(array,this);
+    }
+  }
+  else {
+    this.options.style.head=[];
+  }
+
+  var cells = tableLayout.makeTableLayout(array);
+
+  cells.forEach(function(row){
+    row.forEach(function(cell){
+      cell.mergeTableOptions(this.options,cells);
+    },this);
+  },this);
+
+  tableLayout.computeWidths(this.options.colWidths,cells);
+  tableLayout.computeHeights(this.options.rowHeights,cells);
+
+  cells.forEach(function(row,rowIndex){
+    row.forEach(function(cell,cellIndex){
+      cell.init(this.options);
+    },this);
+  },this);
+
+  var result = [];
+
+  for(var rowIndex = 0; rowIndex < cells.length; rowIndex++){
+    var row = cells[rowIndex];
+    var heightOfRow = this.options.rowHeights[rowIndex];
+
+    if(rowIndex === 0 || !this.options.style.compact || (rowIndex == 1 && headersPresent)){
+      doDraw(row,'top',result);
+    }
+
+    for(var lineNum = 0; lineNum < heightOfRow; lineNum++){
+      doDraw(row,lineNum,result);
+    }
+
+    if(rowIndex + 1 == cells.length){
+      doDraw(row,'bottom',result);
+    }
+  }
+
+  return result.join('\n');
+};
+
+function doDraw(row,lineNum,result){
+  var line = [];
+  row.forEach(function(cell){
+    line.push(cell.draw(lineNum));
+  });
+  var str = line.join('');
+  if(str.length) result.push(str);
+}
+
+Table.prototype.__defineGetter__('width', function (){
+  var str = this.toString().split("\n");
+  return str[0].length;
+});
+
+module.exports = Table;
+
+
+/***/ }),
+/* 606 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+exports = module.exports = cliWidth;
+
+function normalizeOpts(options) {
+  var defaultOpts = {
+    defaultWidth: 0,
+    output: process.stdout,
+    tty: __webpack_require__(104)
+  };
+
+  if (!options) {
+    return defaultOpts;
+  } else {
+    Object.keys(defaultOpts).forEach(function (key) {
+      if (!options[key]) {
+        options[key] = defaultOpts[key];
+      }
+    });
+
+    return options;
+  }
+}
+
+function cliWidth(options) {
+  var opts = normalizeOpts(options);
+
+  if (opts.output.getWindowSize) {
+    return opts.output.getWindowSize()[0] || opts.defaultWidth;
+  } else {
+    if (opts.tty.getWindowSize) {
+      return opts.tty.getWindowSize()[1] || opts.defaultWidth;
+    } else {
+      if (opts.output.columns) {
+        return opts.output.columns;
+      } else {
+        if (process.env.CLI_WIDTH) {
+          var width = parseInt(process.env.CLI_WIDTH, 10);
+
+          if (!isNaN(width) && width !== 0) {
+            return width;
+          }
+        }
+      }
+
+      return opts.defaultWidth;
+    }
+  }
+};
+
+
+/***/ }),
+/* 607 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/* eslint-disable babel/new-cap, xo/throw-new-error */
+
+module.exports = function (str, pos) {
+	if (str === null || str === undefined) {
+		throw TypeError();
+	}
+
+	str = String(str);
+
+	var size = str.length;
+	var i = pos ? Number(pos) : 0;
+
+	if (Number.isNaN(i)) {
+		i = 0;
+	}
+
+	if (i < 0 || i >= size) {
+		return undefined;
+	}
+
+	var first = str.charCodeAt(i);
+
+	if (first >= 0xD800 && first <= 0xDBFF && size > i + 1) {
+		var second = str.charCodeAt(i + 1);
+
+		if (second >= 0xDC00 && second <= 0xDFFF) {
+			return ((first - 0xD800) * 0x400) + second - 0xDC00 + 0x10000;
+		}
+	}
+
+	return first;
+};
+
+
+/***/ }),
+/* 608 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var conversions = __webpack_require__(384);
+var route = __webpack_require__(609);
+
+var convert = {};
+
+var models = Object.keys(conversions);
+
+function wrapRaw(fn) {
+	var wrappedFn = function (args) {
+		if (args === undefined || args === null) {
+			return args;
+		}
+
+		if (arguments.length > 1) {
+			args = Array.prototype.slice.call(arguments);
+		}
+
+		return fn(args);
+	};
+
+	// preserve .conversion property if there is one
+	if ('conversion' in fn) {
+		wrappedFn.conversion = fn.conversion;
+	}
+
+	return wrappedFn;
+}
+
+function wrapRounded(fn) {
+	var wrappedFn = function (args) {
+		if (args === undefined || args === null) {
+			return args;
+		}
+
+		if (arguments.length > 1) {
+			args = Array.prototype.slice.call(arguments);
+		}
+
+		var result = fn(args);
+
+		// we're assuming the result is an array here.
+		// see notice in conversions.js; don't use box types
+		// in conversion functions.
+		if (typeof result === 'object') {
+			for (var len = result.length, i = 0; i < len; i++) {
+				result[i] = Math.round(result[i]);
+			}
+		}
+
+		return result;
+	};
+
+	// preserve .conversion property if there is one
+	if ('conversion' in fn) {
+		wrappedFn.conversion = fn.conversion;
+	}
+
+	return wrappedFn;
+}
+
+models.forEach(function (fromModel) {
+	convert[fromModel] = {};
+
+	Object.defineProperty(convert[fromModel], 'channels', {value: conversions[fromModel].channels});
+	Object.defineProperty(convert[fromModel], 'labels', {value: conversions[fromModel].labels});
+
+	var routes = route(fromModel);
+	var routeModels = Object.keys(routes);
+
+	routeModels.forEach(function (toModel) {
+		var fn = routes[toModel];
+
+		convert[fromModel][toModel] = wrapRounded(fn);
+		convert[fromModel][toModel].raw = wrapRaw(fn);
+	});
+});
+
+module.exports = convert;
+
+
+/***/ }),
+/* 609 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var conversions = __webpack_require__(384);
+
+/*
+	this function routes a model to all other models.
+
+	all functions that are routed have a property `.conversion` attached
+	to the returned synthetic function. This property is an array
+	of strings, each with the steps in between the 'from' and 'to'
+	color models (inclusive).
+
+	conversions that are not possible simply are not included.
+*/
+
+function buildGraph() {
+	var graph = {};
+	// https://jsperf.com/object-keys-vs-for-in-with-closure/3
+	var models = Object.keys(conversions);
+
+	for (var len = models.length, i = 0; i < len; i++) {
+		graph[models[i]] = {
+			// http://jsperf.com/1-vs-infinity
+			// micro-opt, but this is simple.
+			distance: -1,
+			parent: null
+		};
+	}
+
+	return graph;
+}
+
+// https://en.wikipedia.org/wiki/Breadth-first_search
+function deriveBFS(fromModel) {
+	var graph = buildGraph();
+	var queue = [fromModel]; // unshift -> queue -> pop
+
+	graph[fromModel].distance = 0;
+
+	while (queue.length) {
+		var current = queue.pop();
+		var adjacents = Object.keys(conversions[current]);
+
+		for (var len = adjacents.length, i = 0; i < len; i++) {
+			var adjacent = adjacents[i];
+			var node = graph[adjacent];
+
+			if (node.distance === -1) {
+				node.distance = graph[current].distance + 1;
+				node.parent = current;
+				queue.unshift(adjacent);
+			}
+		}
+	}
+
+	return graph;
+}
+
+function link(from, to) {
+	return function (args) {
+		return to(from(args));
+	};
+}
+
+function wrapConversion(toModel, graph) {
+	var path = [graph[toModel].parent, toModel];
+	var fn = conversions[graph[toModel].parent][toModel];
+
+	var cur = graph[toModel].parent;
+	while (graph[cur].parent) {
+		path.unshift(graph[cur].parent);
+		fn = link(conversions[graph[cur].parent][cur], fn);
+		cur = graph[cur].parent;
+	}
+
+	fn.conversion = path;
+	return fn;
+}
+
+module.exports = function (fromModel) {
+	var graph = deriveBFS(fromModel);
+	var conversion = {};
+
+	var models = Object.keys(graph);
+	for (var len = models.length, i = 0; i < len; i++) {
+		var toModel = models[i];
+		var node = graph[toModel];
+
+		if (node.parent === null) {
+			// no possible conversion, or this node is the source model.
+			continue;
+		}
+
+		conversion[toModel] = wrapConversion(toModel, graph);
+	}
+
+	return conversion;
+};
+
+
+
+/***/ }),
+/* 610 */
+/***/ (function(module, exports) {
+
+module.exports = {
+	"aliceblue": [240, 248, 255],
+	"antiquewhite": [250, 235, 215],
+	"aqua": [0, 255, 255],
+	"aquamarine": [127, 255, 212],
+	"azure": [240, 255, 255],
+	"beige": [245, 245, 220],
+	"bisque": [255, 228, 196],
+	"black": [0, 0, 0],
+	"blanchedalmond": [255, 235, 205],
+	"blue": [0, 0, 255],
+	"blueviolet": [138, 43, 226],
+	"brown": [165, 42, 42],
+	"burlywood": [222, 184, 135],
+	"cadetblue": [95, 158, 160],
+	"chartreuse": [127, 255, 0],
+	"chocolate": [210, 105, 30],
+	"coral": [255, 127, 80],
+	"cornflowerblue": [100, 149, 237],
+	"cornsilk": [255, 248, 220],
+	"crimson": [220, 20, 60],
+	"cyan": [0, 255, 255],
+	"darkblue": [0, 0, 139],
+	"darkcyan": [0, 139, 139],
+	"darkgoldenrod": [184, 134, 11],
+	"darkgray": [169, 169, 169],
+	"darkgreen": [0, 100, 0],
+	"darkgrey": [169, 169, 169],
+	"darkkhaki": [189, 183, 107],
+	"darkmagenta": [139, 0, 139],
+	"darkolivegreen": [85, 107, 47],
+	"darkorange": [255, 140, 0],
+	"darkorchid": [153, 50, 204],
+	"darkred": [139, 0, 0],
+	"darksalmon": [233, 150, 122],
+	"darkseagreen": [143, 188, 143],
+	"darkslateblue": [72, 61, 139],
+	"darkslategray": [47, 79, 79],
+	"darkslategrey": [47, 79, 79],
+	"darkturquoise": [0, 206, 209],
+	"darkviolet": [148, 0, 211],
+	"deeppink": [255, 20, 147],
+	"deepskyblue": [0, 191, 255],
+	"dimgray": [105, 105, 105],
+	"dimgrey": [105, 105, 105],
+	"dodgerblue": [30, 144, 255],
+	"firebrick": [178, 34, 34],
+	"floralwhite": [255, 250, 240],
+	"forestgreen": [34, 139, 34],
+	"fuchsia": [255, 0, 255],
+	"gainsboro": [220, 220, 220],
+	"ghostwhite": [248, 248, 255],
+	"gold": [255, 215, 0],
+	"goldenrod": [218, 165, 32],
+	"gray": [128, 128, 128],
+	"green": [0, 128, 0],
+	"greenyellow": [173, 255, 47],
+	"grey": [128, 128, 128],
+	"honeydew": [240, 255, 240],
+	"hotpink": [255, 105, 180],
+	"indianred": [205, 92, 92],
+	"indigo": [75, 0, 130],
+	"ivory": [255, 255, 240],
+	"khaki": [240, 230, 140],
+	"lavender": [230, 230, 250],
+	"lavenderblush": [255, 240, 245],
+	"lawngreen": [124, 252, 0],
+	"lemonchiffon": [255, 250, 205],
+	"lightblue": [173, 216, 230],
+	"lightcoral": [240, 128, 128],
+	"lightcyan": [224, 255, 255],
+	"lightgoldenrodyellow": [250, 250, 210],
+	"lightgray": [211, 211, 211],
+	"lightgreen": [144, 238, 144],
+	"lightgrey": [211, 211, 211],
+	"lightpink": [255, 182, 193],
+	"lightsalmon": [255, 160, 122],
+	"lightseagreen": [32, 178, 170],
+	"lightskyblue": [135, 206, 250],
+	"lightslategray": [119, 136, 153],
+	"lightslategrey": [119, 136, 153],
+	"lightsteelblue": [176, 196, 222],
+	"lightyellow": [255, 255, 224],
+	"lime": [0, 255, 0],
+	"limegreen": [50, 205, 50],
+	"linen": [250, 240, 230],
+	"magenta": [255, 0, 255],
+	"maroon": [128, 0, 0],
+	"mediumaquamarine": [102, 205, 170],
+	"mediumblue": [0, 0, 205],
+	"mediumorchid": [186, 85, 211],
+	"mediumpurple": [147, 112, 219],
+	"mediumseagreen": [60, 179, 113],
+	"mediumslateblue": [123, 104, 238],
+	"mediumspringgreen": [0, 250, 154],
+	"mediumturquoise": [72, 209, 204],
+	"mediumvioletred": [199, 21, 133],
+	"midnightblue": [25, 25, 112],
+	"mintcream": [245, 255, 250],
+	"mistyrose": [255, 228, 225],
+	"moccasin": [255, 228, 181],
+	"navajowhite": [255, 222, 173],
+	"navy": [0, 0, 128],
+	"oldlace": [253, 245, 230],
+	"olive": [128, 128, 0],
+	"olivedrab": [107, 142, 35],
+	"orange": [255, 165, 0],
+	"orangered": [255, 69, 0],
+	"orchid": [218, 112, 214],
+	"palegoldenrod": [238, 232, 170],
+	"palegreen": [152, 251, 152],
+	"paleturquoise": [175, 238, 238],
+	"palevioletred": [219, 112, 147],
+	"papayawhip": [255, 239, 213],
+	"peachpuff": [255, 218, 185],
+	"peru": [205, 133, 63],
+	"pink": [255, 192, 203],
+	"plum": [221, 160, 221],
+	"powderblue": [176, 224, 230],
+	"purple": [128, 0, 128],
+	"rebeccapurple": [102, 51, 153],
+	"red": [255, 0, 0],
+	"rosybrown": [188, 143, 143],
+	"royalblue": [65, 105, 225],
+	"saddlebrown": [139, 69, 19],
+	"salmon": [250, 128, 114],
+	"sandybrown": [244, 164, 96],
+	"seagreen": [46, 139, 87],
+	"seashell": [255, 245, 238],
+	"sienna": [160, 82, 45],
+	"silver": [192, 192, 192],
+	"skyblue": [135, 206, 235],
+	"slateblue": [106, 90, 205],
+	"slategray": [112, 128, 144],
+	"slategrey": [112, 128, 144],
+	"snow": [255, 250, 250],
+	"springgreen": [0, 255, 127],
+	"steelblue": [70, 130, 180],
+	"tan": [210, 180, 140],
+	"teal": [0, 128, 128],
+	"thistle": [216, 191, 216],
+	"tomato": [255, 99, 71],
+	"turquoise": [64, 224, 208],
+	"violet": [238, 130, 238],
+	"wheat": [245, 222, 179],
+	"white": [255, 255, 255],
+	"whitesmoke": [245, 245, 245],
+	"yellow": [255, 255, 0],
+	"yellowgreen": [154, 205, 50]
+};
+
+/***/ }),
+/* 611 */
+/***/ (function(module, exports, __webpack_require__) {
+
+/*
+
+The MIT License (MIT)
+
+Original Library
+  - Copyright (c) Marak Squires
+
+Additional functionality
+ - Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+*/
+
+var colors = {};
+module['exports'] = colors;
+
+colors.themes = {};
+
+var util = __webpack_require__(3);
+var ansiStyles = colors.styles = __webpack_require__(618);
+var defineProps = Object.defineProperties;
+var newLineRegex = new RegExp(/[\r\n]+/g);
+
+colors.supportsColor = __webpack_require__(620).supportsColor;
+
+if (typeof colors.enabled === 'undefined') {
+  colors.enabled = colors.supportsColor() !== false;
+}
+
+colors.enable = function() {
+  colors.enabled = true;
+};
+
+colors.disable = function() {
+  colors.enabled = false;
+};
+
+colors.stripColors = colors.strip = function(str) {
+  return ('' + str).replace(/\x1B\[\d+m/g, '');
+};
+
+// eslint-disable-next-line no-unused-vars
+var stylize = colors.stylize = function stylize(str, style) {
+  if (!colors.enabled) {
+    return str+'';
+  }
+
+  return ansiStyles[style].open + str + ansiStyles[style].close;
+};
+
+var matchOperatorsRe = /[|\\{}()[\]^$+*?.]/g;
+var escapeStringRegexp = function(str) {
+  if (typeof str !== 'string') {
+    throw new TypeError('Expected a string');
+  }
+  return str.replace(matchOperatorsRe, '\\$&');
+};
+
+function build(_styles) {
+  var builder = function builder() {
+    return applyStyle.apply(builder, arguments);
+  };
+  builder._styles = _styles;
+  // __proto__ is used because we must return a function, but there is
+  // no way to create a function with a different prototype.
+  builder.__proto__ = proto;
+  return builder;
+}
+
+var styles = (function() {
+  var ret = {};
+  ansiStyles.grey = ansiStyles.gray;
+  Object.keys(ansiStyles).forEach(function(key) {
+    ansiStyles[key].closeRe =
+      new RegExp(escapeStringRegexp(ansiStyles[key].close), 'g');
+    ret[key] = {
+      get: function() {
+        return build(this._styles.concat(key));
+      },
+    };
+  });
+  return ret;
+})();
+
+var proto = defineProps(function colors() {}, styles);
+
+function applyStyle() {
+  var args = Array.prototype.slice.call(arguments);
+
+  var str = args.map(function(arg) {
+    if (arg != undefined && arg.constructor === String) {
+      return arg;
+    } else {
+      return util.inspect(arg);
+    }
+  }).join(' ');
+
+  if (!colors.enabled || !str) {
+    return str;
+  }
+
+  var newLinesPresent = str.indexOf('\n') != -1;
+
+  var nestedStyles = this._styles;
+
+  var i = nestedStyles.length;
+  while (i--) {
+    var code = ansiStyles[nestedStyles[i]];
+    str = code.open + str.replace(code.closeRe, code.open) + code.close;
+    if (newLinesPresent) {
+      str = str.replace(newLineRegex, function(match) {
+        return code.close + match + code.open;
+      });
+    }
+  }
+
+  return str;
+}
+
+colors.setTheme = function(theme) {
+  if (typeof theme === 'string') {
+    console.log('colors.setTheme now only accepts an object, not a string.  ' +
+      'If you are trying to set a theme from a file, it is now your (the ' +
+      'caller\'s) responsibility to require the file.  The old syntax ' +
+      'looked like colors.setTheme(__dirname + ' +
+      '\'/../themes/generic-logging.js\'); The new syntax looks like '+
+      'colors.setTheme(require(__dirname + ' +
+      '\'/../themes/generic-logging.js\'));');
+    return;
+  }
+  for (var style in theme) {
+    (function(style) {
+      colors[style] = function(str) {
+        if (typeof theme[style] === 'object') {
+          var out = str;
+          for (var i in theme[style]) {
+            out = colors[theme[style][i]](out);
+          }
+          return out;
+        }
+        return colors[theme[style]](str);
+      };
+    })(style);
+  }
+};
+
+function init() {
+  var ret = {};
+  Object.keys(styles).forEach(function(name) {
+    ret[name] = {
+      get: function() {
+        return build([name]);
+      },
+    };
+  });
+  return ret;
+}
+
+var sequencer = function sequencer(map, str) {
+  var exploded = str.split('');
+  exploded = exploded.map(map);
+  return exploded.join('');
+};
+
+// custom formatter methods
+colors.trap = __webpack_require__(612);
+colors.zalgo = __webpack_require__(613);
+
+// maps
+colors.maps = {};
+colors.maps.america = __webpack_require__(614)(colors);
+colors.maps.zebra = __webpack_require__(617)(colors);
+colors.maps.rainbow = __webpack_require__(615)(colors);
+colors.maps.random = __webpack_require__(616)(colors);
+
+for (var map in colors.maps) {
+  (function(map) {
+    colors[map] = function(str) {
+      return sequencer(colors.maps[map], str);
+    };
+  })(map);
+}
+
+defineProps(colors, init());
+
+
+/***/ }),
+/* 612 */
+/***/ (function(module, exports) {
+
+module['exports'] = function runTheTrap(text, options) {
+  var result = '';
+  text = text || 'Run the trap, drop the bass';
+  text = text.split('');
+  var trap = {
+    a: ['\u0040', '\u0104', '\u023a', '\u0245', '\u0394', '\u039b', '\u0414'],
+    b: ['\u00df', '\u0181', '\u0243', '\u026e', '\u03b2', '\u0e3f'],
+    c: ['\u00a9', '\u023b', '\u03fe'],
+    d: ['\u00d0', '\u018a', '\u0500', '\u0501', '\u0502', '\u0503'],
+    e: ['\u00cb', '\u0115', '\u018e', '\u0258', '\u03a3', '\u03be', '\u04bc',
+         '\u0a6c'],
+    f: ['\u04fa'],
+    g: ['\u0262'],
+    h: ['\u0126', '\u0195', '\u04a2', '\u04ba', '\u04c7', '\u050a'],
+    i: ['\u0f0f'],
+    j: ['\u0134'],
+    k: ['\u0138', '\u04a0', '\u04c3', '\u051e'],
+    l: ['\u0139'],
+    m: ['\u028d', '\u04cd', '\u04ce', '\u0520', '\u0521', '\u0d69'],
+    n: ['\u00d1', '\u014b', '\u019d', '\u0376', '\u03a0', '\u048a'],
+    o: ['\u00d8', '\u00f5', '\u00f8', '\u01fe', '\u0298', '\u047a', '\u05dd',
+         '\u06dd', '\u0e4f'],
+    p: ['\u01f7', '\u048e'],
+    q: ['\u09cd'],
+    r: ['\u00ae', '\u01a6', '\u0210', '\u024c', '\u0280', '\u042f'],
+    s: ['\u00a7', '\u03de', '\u03df', '\u03e8'],
+    t: ['\u0141', '\u0166', '\u0373'],
+    u: ['\u01b1', '\u054d'],
+    v: ['\u05d8'],
+    w: ['\u0428', '\u0460', '\u047c', '\u0d70'],
+    x: ['\u04b2', '\u04fe', '\u04fc', '\u04fd'],
+    y: ['\u00a5', '\u04b0', '\u04cb'],
+    z: ['\u01b5', '\u0240'],
+  };
+  text.forEach(function(c) {
+    c = c.toLowerCase();
+    var chars = trap[c] || [' '];
+    var rand = Math.floor(Math.random() * chars.length);
+    if (typeof trap[c] !== 'undefined') {
+      result += trap[c][rand];
+    } else {
+      result += c;
+    }
+  });
+  return result;
+};
+
+
+/***/ }),
+/* 613 */
+/***/ (function(module, exports) {
+
+// please no
+module['exports'] = function zalgo(text, options) {
+  text = text || '   he is here   ';
+  var soul = {
+    'up': [
+      '̍', '̎', '̄', '̅',
+      '̿', '̑', '̆', '̐',
+      '͒', '͗', '͑', '̇',
+      '̈', '̊', '͂', '̓',
+      '̈', '͊', '͋', '͌',
+      '̃', '̂', '̌', '͐',
+      '̀', '́', '̋', '̏',
+      '̒', '̓', '̔', '̽',
+      '̉', 'ͣ', 'ͤ', 'ͥ',
+      'ͦ', 'ͧ', 'ͨ', 'ͩ',
+      'ͪ', 'ͫ', 'ͬ', 'ͭ',
+      'ͮ', 'ͯ', '̾', '͛',
+      '͆', '̚',
+    ],
+    'down': [
+      '̖', '̗', '̘', '̙',
+      '̜', '̝', '̞', '̟',
+      '̠', '̤', '̥', '̦',
+      '̩', '̪', '̫', '̬',
+      '̭', '̮', '̯', '̰',
+      '̱', '̲', '̳', '̹',
+      '̺', '̻', '̼', 'ͅ',
+      '͇', '͈', '͉', '͍',
+      '͎', '͓', '͔', '͕',
+      '͖', '͙', '͚', '̣',
+    ],
+    'mid': [
+      '̕', '̛', '̀', '́',
+      '͘', '̡', '̢', '̧',
+      '̨', '̴', '̵', '̶',
+      '͜', '͝', '͞',
+      '͟', '͠', '͢', '̸',
+      '̷', '͡', ' ҉',
+    ],
+  };
+  var all = [].concat(soul.up, soul.down, soul.mid);
+
+  function randomNumber(range) {
+    var r = Math.floor(Math.random() * range);
+    return r;
+  }
+
+  function isChar(character) {
+    var bool = false;
+    all.filter(function(i) {
+      bool = (i === character);
+    });
+    return bool;
+  }
+
+
+  function heComes(text, options) {
+    var result = '';
+    var counts;
+    var l;
+    options = options || {};
+    options['up'] =
+      typeof options['up'] !== 'undefined' ? options['up'] : true;
+    options['mid'] =
+      typeof options['mid'] !== 'undefined' ? options['mid'] : true;
+    options['down'] =
+      typeof options['down'] !== 'undefined' ? options['down'] : true;
+    options['size'] =
+      typeof options['size'] !== 'undefined' ? options['size'] : 'maxi';
+    text = text.split('');
+    for (l in text) {
+      if (isChar(l)) {
+        continue;
+      }
+      result = result + text[l];
+      counts = {'up': 0, 'down': 0, 'mid': 0};
+      switch (options.size) {
+      case 'mini':
+        counts.up = randomNumber(8);
+        counts.mid = randomNumber(2);
+        counts.down = randomNumber(8);
+        break;
+      case 'maxi':
+        counts.up = randomNumber(16) + 3;
+        counts.mid = randomNumber(4) + 1;
+        counts.down = randomNumber(64) + 3;
+        break;
+      default:
+        counts.up = randomNumber(8) + 1;
+        counts.mid = randomNumber(6) / 2;
+        counts.down = randomNumber(8) + 1;
+        break;
+      }
+
+      var arr = ['up', 'mid', 'down'];
+      for (var d in arr) {
+        var index = arr[d];
+        for (var i = 0; i <= counts[index]; i++) {
+          if (options[index]) {
+            result = result + soul[index][randomNumber(soul[index].length)];
+          }
+        }
+      }
+    }
+    return result;
+  }
+  // don't summon him
+  return heComes(text, options);
+};
+
+
+
+/***/ }),
+/* 614 */
+/***/ (function(module, exports) {
+
+module['exports'] = function(colors) {
+  return function(letter, i, exploded) {
+    if (letter === ' ') return letter;
+    switch (i%3) {
+      case 0: return colors.red(letter);
+      case 1: return colors.white(letter);
+      case 2: return colors.blue(letter);
+    }
+  };
+};
+
+
+/***/ }),
+/* 615 */
+/***/ (function(module, exports) {
+
+module['exports'] = function(colors) {
+  // RoY G BiV
+  var rainbowColors = ['red', 'yellow', 'green', 'blue', 'magenta'];
+  return function(letter, i, exploded) {
+    if (letter === ' ') {
+      return letter;
+    } else {
+      return colors[rainbowColors[i++ % rainbowColors.length]](letter);
+    }
+  };
+};
+
+
+
+/***/ }),
+/* 616 */
+/***/ (function(module, exports) {
+
+module['exports'] = function(colors) {
+  var available = ['underline', 'inverse', 'grey', 'yellow', 'red', 'green',
+    'blue', 'white', 'cyan', 'magenta'];
+  return function(letter, i, exploded) {
+    return letter === ' ' ? letter :
+      colors[
+        available[Math.round(Math.random() * (available.length - 2))]
+      ](letter);
+  };
+};
+
+
+/***/ }),
+/* 617 */
+/***/ (function(module, exports) {
+
+module['exports'] = function(colors) {
+  return function(letter, i, exploded) {
+    return i % 2 === 0 ? letter : colors.inverse(letter);
+  };
+};
+
+
+/***/ }),
+/* 618 */
+/***/ (function(module, exports) {
+
+/*
+The MIT License (MIT)
+
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+*/
+
+var styles = {};
+module['exports'] = styles;
+
+var codes = {
+  reset: [0, 0],
+
+  bold: [1, 22],
+  dim: [2, 22],
+  italic: [3, 23],
+  underline: [4, 24],
+  inverse: [7, 27],
+  hidden: [8, 28],
+  strikethrough: [9, 29],
+
+  black: [30, 39],
+  red: [31, 39],
+  green: [32, 39],
+  yellow: [33, 39],
+  blue: [34, 39],
+  magenta: [35, 39],
+  cyan: [36, 39],
+  white: [37, 39],
+  gray: [90, 39],
+  grey: [90, 39],
+
+  bgBlack: [40, 49],
+  bgRed: [41, 49],
+  bgGreen: [42, 49],
+  bgYellow: [43, 49],
+  bgBlue: [44, 49],
+  bgMagenta: [45, 49],
+  bgCyan: [46, 49],
+  bgWhite: [47, 49],
+
+  // legacy styles for colors pre v1.0.0
+  blackBG: [40, 49],
+  redBG: [41, 49],
+  greenBG: [42, 49],
+  yellowBG: [43, 49],
+  blueBG: [44, 49],
+  magentaBG: [45, 49],
+  cyanBG: [46, 49],
+  whiteBG: [47, 49],
+
+};
+
+Object.keys(codes).forEach(function(key) {
+  var val = codes[key];
+  var style = styles[key] = [];
+  style.open = '\u001b[' + val[0] + 'm';
+  style.close = '\u001b[' + val[1] + 'm';
+});
+
+
+/***/ }),
+/* 619 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*
+MIT License
+
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+
+
+module.exports = function(flag, argv) {
+  argv = argv || process.argv;
+
+  var terminatorPos = argv.indexOf('--');
+  var prefix = /^-{1,2}/.test(flag) ? '' : '--';
+  var pos = argv.indexOf(prefix + flag);
+
+  return pos !== -1 && (terminatorPos === -1 ? true : pos < terminatorPos);
+};
+
+
+/***/ }),
+/* 620 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*
+The MIT License (MIT)
+
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+*/
+
+
+
+var os = __webpack_require__(49);
+var hasFlag = __webpack_require__(619);
+
+var env = process.env;
+
+var forceColor = void 0;
+if (hasFlag('no-color') || hasFlag('no-colors') || hasFlag('color=false')) {
+  forceColor = false;
+} else if (hasFlag('color') || hasFlag('colors') || hasFlag('color=true')
+           || hasFlag('color=always')) {
+  forceColor = true;
+}
+if ('FORCE_COLOR' in env) {
+  forceColor = env.FORCE_COLOR.length === 0
+    || parseInt(env.FORCE_COLOR, 10) !== 0;
+}
+
+function translateLevel(level) {
+  if (level === 0) {
+    return false;
+  }
+
+  return {
+    level: level,
+    hasBasic: true,
+    has256: level >= 2,
+    has16m: level >= 3,
+  };
+}
+
+function supportsColor(stream) {
+  if (forceColor === false) {
+    return 0;
+  }
+
+  if (hasFlag('color=16m') || hasFlag('color=full')
+      || hasFlag('color=truecolor')) {
+    return 3;
+  }
+
+  if (hasFlag('color=256')) {
+    return 2;
+  }
+
+  if (stream && !stream.isTTY && forceColor !== true) {
+    return 0;
+  }
+
+  var min = forceColor ? 1 : 0;
+
+  if (process.platform === 'win32') {
+    // Node.js 7.5.0 is the first version of Node.js to include a patch to
+    // libuv that enables 256 color output on Windows. Anything earlier and it
+    // won't work. However, here we target Node.js 8 at minimum as it is an LTS
+    // release, and Node.js 7 is not. Windows 10 build 10586 is the first
+    // Windows release that supports 256 colors. Windows 10 build 14931 is the
+    // first release that supports 16m/TrueColor.
+    var osRelease = os.release().split('.');
+    if (Number(process.versions.node.split('.')[0]) >= 8
+        && Number(osRelease[0]) >= 10 && Number(osRelease[2]) >= 10586) {
+      return Number(osRelease[2]) >= 14931 ? 3 : 2;
+    }
+
+    return 1;
+  }
+
+  if ('CI' in env) {
+    if (['TRAVIS', 'CIRCLECI', 'APPVEYOR', 'GITLAB_CI'].some(function(sign) {
+      return sign in env;
+    }) || env.CI_NAME === 'codeship') {
+      return 1;
+    }
+
+    return min;
+  }
+
+  if ('TEAMCITY_VERSION' in env) {
+    return (/^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(env.TEAMCITY_VERSION) ? 1 : 0
+    );
+  }
+
+  if ('TERM_PROGRAM' in env) {
+    var version = parseInt((env.TERM_PROGRAM_VERSION || '').split('.')[0], 10);
+
+    switch (env.TERM_PROGRAM) {
+      case 'iTerm.app':
+        return version >= 3 ? 3 : 2;
+      case 'Hyper':
+        return 3;
+      case 'Apple_Terminal':
+        return 2;
+      // No default
+    }
+  }
+
+  if (/-256(color)?$/i.test(env.TERM)) {
+    return 2;
+  }
+
+  if (/^screen|^xterm|^vt100|^rxvt|color|ansi|cygwin|linux/i.test(env.TERM)) {
+    return 1;
+  }
+
+  if ('COLORTERM' in env) {
+    return 1;
+  }
+
+  if (env.TERM === 'dumb') {
+    return min;
+  }
+
+  return min;
+}
+
+function getSupportLevel(stream) {
+  var level = supportsColor(stream);
+  return translateLevel(level);
+}
+
+module.exports = {
+  supportsColor: getSupportLevel,
+  stdout: getSupportLevel(process.stdout),
+  stderr: getSupportLevel(process.stderr),
+};
+
+
+/***/ }),
+/* 621 */
+/***/ (function(module, exports, __webpack_require__) {
+
+//
+// Remark: Requiring this file will use the "safe" colors API,
+// which will not touch String.prototype.
+//
+//   var colors = require('colors/safe');
+//   colors.red("foo")
+//
+//
+var colors = __webpack_require__(611);
+module['exports'] = colors;
+
+
+/***/ }),
+/* 622 */
+/***/ (function(module, exports) {
+
+module.exports = defer;
+
+/**
+ * Runs provided function on next iteration of the event loop
+ *
+ * @param {function} fn - function to run
+ */
+function defer(fn)
+{
+  var nextTick = typeof setImmediate == 'function'
+    ? setImmediate
+    : (
+      typeof process == 'object' && typeof process.nextTick == 'function'
+      ? process.nextTick
+      : null
+    );
+
+  if (nextTick)
+  {
+    nextTick(fn);
+  }
+  else
+  {
+    setTimeout(fn, 0);
+  }
+}
+
+
+/***/ }),
+/* 623 */
+/***/ (function(module, exports, __webpack_require__) {
+
+__webpack_require__(627);
+module.exports = __webpack_require__(31).Object.assign;
+
+
+/***/ }),
+/* 624 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+// 19.1.2.1 Object.assign(target, source, ...)
+var getKeys = __webpack_require__(171);
+var gOPS = __webpack_require__(625);
+var pIE = __webpack_require__(626);
+var toObject = __webpack_require__(172);
+var IObject = __webpack_require__(170);
+var $assign = Object.assign;
+
+// should work with symbols and should have deterministic property order (V8 bug)
+module.exports = !$assign || __webpack_require__(112)(function () {
+  var A = {};
+  var B = {};
+  // eslint-disable-next-line no-undef
+  var S = Symbol();
+  var K = 'abcdefghijklmnopqrst';
+  A[S] = 7;
+  K.split('').forEach(function (k) { B[k] = k; });
+  return $assign({}, A)[S] != 7 || Object.keys($assign({}, B)).join('') != K;
+}) ? function assign(target, source) { // eslint-disable-line no-unused-vars
+  var T = toObject(target);
+  var aLen = arguments.length;
+  var index = 1;
+  var getSymbols = gOPS.f;
+  var isEnum = pIE.f;
+  while (aLen > index) {
+    var S = IObject(arguments[index++]);
+    var keys = getSymbols ? getKeys(S).concat(getSymbols(S)) : getKeys(S);
+    var length = keys.length;
+    var j = 0;
+    var key;
+    while (length > j) if (isEnum.call(S, key = keys[j++])) T[key] = S[key];
+  } return T;
+} : $assign;
+
+
+/***/ }),
+/* 625 */
+/***/ (function(module, exports) {
+
+exports.f = Object.getOwnPropertySymbols;
+
+
+/***/ }),
+/* 626 */
+/***/ (function(module, exports) {
+
+exports.f = {}.propertyIsEnumerable;
+
+
+/***/ }),
+/* 627 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// 19.1.3.1 Object.assign(target, source)
+var $export = __webpack_require__(60);
+
+$export($export.S + $export.F, 'Object', { assign: __webpack_require__(624) });
+
+
+/***/ }),
+/* 628 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var arrayFindIndex = __webpack_require__(511);
+
+module.exports = function () {
+	var unhandledRejections = [];
+
+	function onUnhandledRejection(reason, promise) {
+		unhandledRejections.push({reason: reason, promise: promise});
+	}
+
+	function onRejectionHandled(promise) {
+		var index = arrayFindIndex(unhandledRejections, function (x) {
+			return x.promise === promise;
+		});
+
+		unhandledRejections.splice(index, 1);
+	}
+
+	function currentlyUnhandled() {
+		return unhandledRejections.map(function (entry) {
+			return {
+				reason: entry.reason,
+				promise: entry.promise
+			};
+		});
+	}
+
+	return {
+		onUnhandledRejection: onUnhandledRejection,
+		onRejectionHandled: onRejectionHandled,
+		currentlyUnhandled: currentlyUnhandled
+	};
+};
+
+
+/***/ }),
+/* 629 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var core = __webpack_require__(628);
+
+module.exports = function (p) {
+	p = p || process;
+	var c = core();
+
+	p.on('unhandledRejection', c.onUnhandledRejection);
+	p.on('rejectionHandled', c.onRejectionHandled);
+
+	return c.currentlyUnhandled;
+};
+
+
+/***/ }),
+/* 630 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var token = '%[a-f0-9]{2}';
+var singleMatcher = new RegExp(token, 'gi');
+var multiMatcher = new RegExp('(' + token + ')+', 'gi');
+
+function decodeComponents(components, split) {
+	try {
+		// Try to decode the entire string first
+		return decodeURIComponent(components.join(''));
+	} catch (err) {
+		// Do nothing
+	}
+
+	if (components.length === 1) {
+		return components;
+	}
+
+	split = split || 1;
+
+	// Split the array in 2 parts
+	var left = components.slice(0, split);
+	var right = components.slice(split);
+
+	return Array.prototype.concat.call([], decodeComponents(left), decodeComponents(right));
+}
+
+function decode(input) {
+	try {
+		return decodeURIComponent(input);
+	} catch (err) {
+		var tokens = input.match(singleMatcher);
+
+		for (var i = 1; i < tokens.length; i++) {
+			input = decodeComponents(tokens, i).join('');
+
+			tokens = input.match(singleMatcher);
+		}
+
+		return input;
+	}
+}
+
+function customDecodeURIComponent(input) {
+	// Keep track of all the replacements and prefill the map with the `BOM`
+	var replaceMap = {
+		'%FE%FF': '\uFFFD\uFFFD',
+		'%FF%FE': '\uFFFD\uFFFD'
+	};
+
+	var match = multiMatcher.exec(input);
+	while (match) {
+		try {
+			// Decode as big chunks as possible
+			replaceMap[match[0]] = decodeURIComponent(match[0]);
+		} catch (err) {
+			var result = decode(match[0]);
+
+			if (result !== match[0]) {
+				replaceMap[match[0]] = result;
+			}
+		}
+
+		match = multiMatcher.exec(input);
+	}
+
+	// Add `%C2` at the end of the map to make sure it does not replace the combinator before everything else
+	replaceMap['%C2'] = '\uFFFD';
+
+	var entries = Object.keys(replaceMap);
+
+	for (var i = 0; i < entries.length; i++) {
+		// Replace all decoded components
+		var key = entries[i];
+		input = input.replace(new RegExp(key, 'g'), replaceMap[key]);
+	}
+
+	return input;
+}
+
+module.exports = function (encodedURI) {
+	if (typeof encodedURI !== 'string') {
+		throw new TypeError('Expected `encodedURI` to be of type `string`, got `' + typeof encodedURI + '`');
+	}
+
+	try {
+		encodedURI = encodedURI.replace(/\+/g, ' ');
+
+		// Try the built in decoder first
+		return decodeURIComponent(encodedURI);
+	} catch (err) {
+		// Fallback to a more advanced decoder
+		return customDecodeURIComponent(encodedURI);
+	}
+};
+
+
+/***/ }),
+/* 631 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var pSlice = Array.prototype.slice;
+var objectKeys = __webpack_require__(633);
+var isArguments = __webpack_require__(632);
+
+var deepEqual = module.exports = function (actual, expected, opts) {
+  if (!opts) opts = {};
+  // 7.1. All identical values are equivalent, as determined by ===.
+  if (actual === expected) {
+    return true;
+
+  } else if (actual instanceof Date && expected instanceof Date) {
+    return actual.getTime() === expected.getTime();
+
+  // 7.3. Other pairs that do not both pass typeof value == 'object',
+  // equivalence is determined by ==.
+  } else if (!actual || !expected || typeof actual != 'object' && typeof expected != 'object') {
+    return opts.strict ? actual === expected : actual == expected;
+
+  // 7.4. For all other Object pairs, including Array objects, equivalence is
+  // determined by having the same number of owned properties (as verified
+  // with Object.prototype.hasOwnProperty.call), the same set of keys
+  // (although not necessarily the same order), equivalent values for every
+  // corresponding key, and an identical 'prototype' property. Note: this
+  // accounts for both named and indexed properties on Arrays.
+  } else {
+    return objEquiv(actual, expected, opts);
+  }
+}
+
+function isUndefinedOrNull(value) {
+  return value === null || value === undefined;
+}
+
+function isBuffer (x) {
+  if (!x || typeof x !== 'object' || typeof x.length !== 'number') return false;
+  if (typeof x.copy !== 'function' || typeof x.slice !== 'function') {
+    return false;
+  }
+  if (x.length > 0 && typeof x[0] !== 'number') return false;
+  return true;
+}
+
+function objEquiv(a, b, opts) {
+  var i, key;
+  if (isUndefinedOrNull(a) || isUndefinedOrNull(b))
+    return false;
+  // an identical 'prototype' property.
+  if (a.prototype !== b.prototype) return false;
+  //~~~I've managed to break Object.keys through screwy arguments passing.
+  //   Converting to array solves the problem.
+  if (isArguments(a)) {
+    if (!isArguments(b)) {
+      return false;
+    }
+    a = pSlice.call(a);
+    b = pSlice.call(b);
+    return deepEqual(a, b, opts);
+  }
+  if (isBuffer(a)) {
+    if (!isBuffer(b)) {
+      return false;
+    }
+    if (a.length !== b.length) return false;
+    for (i = 0; i < a.length; i++) {
+      if (a[i] !== b[i]) return false;
+    }
+    return true;
+  }
+  try {
+    var ka = objectKeys(a),
+        kb = objectKeys(b);
+  } catch (e) {//happens when one is a string literal and the other isn't
+    return false;
+  }
+  // having the same number of owned properties (keys incorporates
+  // hasOwnProperty)
+  if (ka.length != kb.length)
+    return false;
+  //the same set of keys (although not necessarily the same order),
+  ka.sort();
+  kb.sort();
+  //~~~cheap key test
+  for (i = ka.length - 1; i >= 0; i--) {
+    if (ka[i] != kb[i])
+      return false;
+  }
+  //equivalent values for every corresponding key, and
+  //~~~possibly expensive deep test
+  for (i = ka.length - 1; i >= 0; i--) {
+    key = ka[i];
+    if (!deepEqual(a[key], b[key], opts)) return false;
+  }
+  return typeof a === typeof b;
+}
+
+
+/***/ }),
+/* 632 */
+/***/ (function(module, exports) {
+
+var supportsArgumentsClass = (function(){
+  return Object.prototype.toString.call(arguments)
+})() == '[object Arguments]';
+
+exports = module.exports = supportsArgumentsClass ? supported : unsupported;
+
+exports.supported = supported;
+function supported(object) {
+  return Object.prototype.toString.call(object) == '[object Arguments]';
+};
+
+exports.unsupported = unsupported;
+function unsupported(object){
+  return object &&
+    typeof object == 'object' &&
+    typeof object.length == 'number' &&
+    Object.prototype.hasOwnProperty.call(object, 'callee') &&
+    !Object.prototype.propertyIsEnumerable.call(object, 'callee') ||
+    false;
+};
+
+
+/***/ }),
+/* 633 */
+/***/ (function(module, exports) {
+
+exports = module.exports = typeof Object.keys === 'function'
+  ? Object.keys : shim;
+
+exports.shim = shim;
+function shim (obj) {
+  var keys = [];
+  for (var key in obj) keys.push(key);
+  return keys;
+}
+
+
+/***/ }),
+/* 634 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var Stream = __webpack_require__(23).Stream;
+var util = __webpack_require__(3);
+
+module.exports = DelayedStream;
+function DelayedStream() {
+  this.source = null;
+  this.dataSize = 0;
+  this.maxDataSize = 1024 * 1024;
+  this.pauseStream = true;
+
+  this._maxDataSizeExceeded = false;
+  this._released = false;
+  this._bufferedEvents = [];
+}
+util.inherits(DelayedStream, Stream);
+
+DelayedStream.create = function(source, options) {
+  var delayedStream = new this();
+
+  options = options || {};
+  for (var option in options) {
+    delayedStream[option] = options[option];
+  }
+
+  delayedStream.source = source;
+
+  var realEmit = source.emit;
+  source.emit = function() {
+    delayedStream._handleEmit(arguments);
+    return realEmit.apply(source, arguments);
+  };
+
+  source.on('error', function() {});
+  if (delayedStream.pauseStream) {
+    source.pause();
+  }
+
+  return delayedStream;
+};
+
+Object.defineProperty(DelayedStream.prototype, 'readable', {
+  configurable: true,
+  enumerable: true,
+  get: function() {
+    return this.source.readable;
+  }
+});
+
+DelayedStream.prototype.setEncoding = function() {
+  return this.source.setEncoding.apply(this.source, arguments);
+};
+
+DelayedStream.prototype.resume = function() {
+  if (!this._released) {
+    this.release();
+  }
+
+  this.source.resume();
+};
+
+DelayedStream.prototype.pause = function() {
+  this.source.pause();
+};
+
+DelayedStream.prototype.release = function() {
+  this._released = true;
+
+  this._bufferedEvents.forEach(function(args) {
+    this.emit.apply(this, args);
+  }.bind(this));
+  this._bufferedEvents = [];
+};
+
+DelayedStream.prototype.pipe = function() {
+  var r = Stream.prototype.pipe.apply(this, arguments);
+  this.resume();
+  return r;
+};
+
+DelayedStream.prototype._handleEmit = function(args) {
+  if (this._released) {
+    this.emit.apply(this, args);
+    return;
+  }
+
+  if (args[0] === 'data') {
+    this.dataSize += args[1].length;
+    this._checkIfMaxDataSizeExceeded();
+  }
+
+  this._bufferedEvents.push(args);
+};
+
+DelayedStream.prototype._checkIfMaxDataSizeExceeded = function() {
+  if (this._maxDataSizeExceeded) {
+    return;
+  }
+
+  if (this.dataSize <= this.maxDataSize) {
+    return;
+  }
+
+  this._maxDataSizeExceeded = true;
+  var message =
+    'DelayedStream#maxDataSize of ' + this.maxDataSize + ' bytes exceeded.'
+  this.emit('error', new Error(message));
+};
+
+
+/***/ }),
+/* 635 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+// detect either spaces or tabs but not both to properly handle tabs
+// for indentation and spaces for alignment
+const INDENT_RE = /^(?:( )+|\t+)/;
+
+function getMostUsed(indents) {
+	let result = 0;
+	let maxUsed = 0;
+	let maxWeight = 0;
+
+	for (const entry of indents) {
+		// TODO: use destructuring when targeting Node.js 6
+		const key = entry[0];
+		const val = entry[1];
+
+		const u = val[0];
+		const w = val[1];
+
+		if (u > maxUsed || (u === maxUsed && w > maxWeight)) {
+			maxUsed = u;
+			maxWeight = w;
+			result = Number(key);
+		}
+	}
+
+	return result;
+}
+
+module.exports = str => {
+	if (typeof str !== 'string') {
+		throw new TypeError('Expected a string');
+	}
+
+	// used to see if tabs or spaces are the most used
+	let tabs = 0;
+	let spaces = 0;
+
+	// remember the size of previous line's indentation
+	let prev = 0;
+
+	// remember how many indents/unindents as occurred for a given size
+	// and how much lines follow a given indentation
+	//
+	// indents = {
+	//    3: [1, 0],
+	//    4: [1, 5],
+	//    5: [1, 0],
+	//   12: [1, 0],
+	// }
+	const indents = new Map();
+
+	// pointer to the array of last used indent
+	let current;
+
+	// whether the last action was an indent (opposed to an unindent)
+	let isIndent;
+
+	for (const line of str.split(/\n/g)) {
+		if (!line) {
+			// ignore empty lines
+			continue;
+		}
+
+		let indent;
+		const matches = line.match(INDENT_RE);
+
+		if (matches) {
+			indent = matches[0].length;
+
+			if (matches[1]) {
+				spaces++;
+			} else {
+				tabs++;
+			}
+		} else {
+			indent = 0;
+		}
+
+		const diff = indent - prev;
+		prev = indent;
+
+		if (diff) {
+			// an indent or unindent has been detected
+
+			isIndent = diff > 0;
+
+			current = indents.get(isIndent ? diff : -diff);
+
+			if (current) {
+				current[0]++;
+			} else {
+				current = [1, 0];
+				indents.set(diff, current);
+			}
+		} else if (current) {
+			// if the last action was an indent, increment the weight
+			current[1] += Number(isIndent);
+		}
+	}
+
+	const amount = getMostUsed(indents);
+
+	let type;
+	let indent;
+	if (!amount) {
+		type = null;
+		indent = '';
+	} else if (spaces >= tabs) {
+		type = 'space';
+		indent = ' '.repeat(amount);
+	} else {
+		type = 'tab';
+		indent = '\t'.repeat(amount);
+	}
+
+	return {
+		amount,
+		type,
+		indent
+	};
+};
+
+
+/***/ }),
+/* 636 */
+/***/ (function(module, exports, __webpack_require__) {
+
+/*
+* Copyright (c) 2013, Yahoo! Inc. All rights reserved.
+* Copyrights licensed under the New BSD License.
+* See the accompanying LICENSE file for terms.
+*/
+
+var CacheObject = function (conf) {
+    conf = conf || {};
+    conf.ttl = parseInt(conf.ttl, 10) || 300; //0 is not permissible
+    conf.cachesize = parseInt(conf.cachesize, 10) || 1000; //0 is not permissible
+    
+    this.ttl = conf.ttl * 1000;
+    this.max = conf.cachesize;
+
+    this.count = 0;
+    this.data = {};
+    var next = __webpack_require__(512);
+
+    this.set = function (key, value, callback) {
+        var self = this;
+        next(function () {
+            if (self.data[key]) {
+                if (self.data[key].newer) {
+                    if (self.data[key].older) {
+                        self.data[key].newer.older = self.data[key].older;
+                        self.data[key].older.newer = self.data[key].newer;
+                    } else {
+                        self.tail = self.data[key].newer;
+                        delete self.tail.older;
+                    }
+
+                    self.data[key].older = self.head;
+                    self.head.newer = self.data[key];
+                    delete self.data[key].newer;
+                    self.head = self.data[key];
+                }
+
+                self.head.val = value;
+                self.head.hit = 0;
+                self.head.ts = Date.now();
+            } else {
+                // key is not exist
+                self.data[key] = {
+                    "key" : key,
+                    "val" : value,
+                    "hit" : 0,
+                    "ts" : Date.now()
+                };
+
+                if (!self.head) {
+                    // cache is empty
+                    self.head = self.data[key];
+                    self.tail = self.data[key];
+                } else {
+                    // insert the new entry to the front
+                    self.head.newer = self.data[key];
+                    self.data[key].older = self.head;
+                    self.head = self.data[key];
+                }
+
+                if (self.count >= self.max) {
+                    // remove the tail
+                    var temp = self.tail;
+                    self.tail = self.tail.newer;
+                    delete self.tail.next;
+                    delete self.data[temp.key];
+                } else {
+                    self.count = self.count + 1;
+                }
+            }
+            /* jshint -W030 */
+            callback && callback(null, value);
+        });
+    };
+
+    this.get = function (key, callback) {
+        var self = this;
+        if (!callback) {
+            throw('cache.get callback is required.');
+        }
+
+        next(function () {
+            if (!self.data[key]) {
+                return callback(null, undefined);
+            }
+            var value;
+            if (conf.ttl !== 0 && (Date.now() - self.data[key].ts) >= self.ttl) {
+                if (self.data[key].newer) {
+                    if (self.data[key].older) {
+                        // in the middle of the list
+                        self.data[key].newer.older = self.data[key].older;
+                        self.data[key].older.newer = self.data[key].newer;
+                    } else {
+                        // tail
+                        self.tail = self.data[key].newer;
+                        delete self.tail.older;
+                    }
+                } else {
+                    // the first item
+                    if (self.data[key].older) {
+                        self.head = self.data[key].older;
+                        delete self.head.newer;
+                    } else {
+                        // 1 items
+                        delete self.head;
+                        delete self.tail;
+                    }
+                }
+
+                delete self.data[key];
+                self.count = self.count - 1;
+            } else {
+                self.data[key].hit = self.data[key].hit + 1;
+                value = self.data[key].val;
+            }
+            callback(null, value);
+        });
+    };
+};
+
+module.exports = CacheObject;
+
+
+/***/ }),
+/* 637 */
+/***/ (function(module, exports, __webpack_require__) {
+
+/*
+* Copyright (c) 2013, Yahoo! Inc. All rights reserved.
+* Copyrights licensed under the New BSD License.
+* See the accompanying LICENSE file for terms.
+*/
+
+var CacheObject = __webpack_require__(636),
+    deepCopy = __webpack_require__(749),
+    dns = __webpack_require__(964);
+
+
+// original function storage
+var EnhanceDns = function (conf) {
+        conf = conf || {};
+        conf.ttl = parseInt(conf.ttl, 10) || 300; //0 is not allowed ie it ttl is set to 0, it will take the default
+        conf.cachesize = parseInt(conf.cachesize, 10); //0 is allowed but it will disable the caching
+
+        if (isNaN(conf.cachesize)) {
+            conf.cachesize = 1000; //set default cache size to 1000 records max
+        }
+        if (!conf.enable || conf.cachesize <= 0 || dns.internalCache) {
+            //cache already exists, means this code has already execute ie method are already overwritten
+            return dns;
+        }
+        
+        // original function storage
+        var backup_object = {
+                lookup : dns.lookup,
+                resolve : dns.resolve,
+                resolve4 : dns.resolve4,
+                resolve6 : dns.resolve6,
+                resolveMx : dns.resolveMx,
+                resolveTxt : dns.resolveTxt,
+                resolveSrv : dns.resolveSrv,
+                resolveNs : dns.resolveNs,
+                resolveCname : dns.resolveCname,
+                reverse : dns.reverse
+            },
+            // cache storage instance
+            cache = conf.cache ? /*istanbul ignore next*/ new conf.cache(conf) : new CacheObject(conf);
+        
+        // insert cache object to the instance
+        dns.internalCache = cache;
+
+        // override dns.lookup method
+        dns.lookup = function (domain, options, callback) {
+            var family = 0;
+            var hints = 0;
+            var all = false;
+            if (arguments.length === 2) {
+                callback = options;
+                options = family;
+            } else if (typeof options === 'object') {
+                if (options.family) {
+                    family = +options.family;
+                    if (family !== 4 && family !== 6) {
+                        callback(new Error('invalid argument: `family` must be 4 or 6'));
+                        return;
+                    }
+                }
+                /*istanbul ignore next - "hints" require node 0.12+*/
+                if (options.hints) {
+                    hints = +options.hints;
+                }
+                all = (options.all === true);
+            } else if (options) {
+                family = +options;
+                if (family !== 4 && family !== 6) {
+                    callback(new Error('invalid argument: `family` must be 4 or 6'));
+                    return;
+                }
+            }
+
+            cache.get('lookup_' + domain + '_' + family + '_' + hints + '_' + all, function (error, record) {
+                if (record) {
+                    /*istanbul ignore next - "all" option require node 4+*/
+                    if (Array.isArray(record)) {
+                        return callback(error, record);
+                    }
+                    return callback(error, record.address, record.family);
+                }
+
+                try{
+                    backup_object.lookup(domain, options, function (err, address, family_r) {
+                        if (err) {
+                            return callback(err);
+                        }
+                        var value;
+                        /*istanbul ignore next - "all" option require node 4+*/
+                        if (Array.isArray(address)) {
+                            value = address;
+                        } else {
+                            value = {
+                                'address' : address,
+                                'family' : family_r
+                            };
+                        }
+                        cache.set('lookup_' + domain + '_' + family + '_' + hints + '_' +  all, value, function () {
+                            callback(err, address, family_r);
+                        });
+                    });
+                } catch (err) {
+                    /*istanbul ignore next - doesn't throw in node 0.10*/
+                    callback(err);
+                }
+            });
+        };
+
+        // override dns.resolve method
+        dns.resolve = function (domain, type, callback) {
+            var type_new, callback_new;
+
+            if (typeof type === 'string') {
+                type_new = type;
+                callback_new = callback;
+            } else {
+                type_new = "A";
+                callback_new = type;
+            }
+
+            cache.get('resolve_' + domain + '_' + type_new, function (error, record) {
+                if (record) {
+                    return callback_new(error, deepCopy(record), true);
+                }
+                try {
+                    backup_object.resolve(domain, type_new, function (err, addresses) {
+                        if (err) {
+                            return callback_new(err);
+                        }
+                        cache.set('resolve_' + domain + '_' + type_new, addresses, function () {
+                            callback_new(err, deepCopy(addresses), false);
+                        });
+                    });
+                } catch (err) {
+                    /*istanbul ignore next - doesn't throw in node 0.10*/
+                    callback_new(err);
+                }
+            });
+        };
+
+        // override dns.resolve4 method
+        dns.resolve4 = function (domain, callback) {
+            cache.get('resolve4_' + domain, function (error, record) {
+                if (record) {
+                    return callback(error, deepCopy(record));
+                }
+                try {
+                    backup_object.resolve4(domain, function (err, addresses) {
+                        if (err) {
+                            return callback(err);
+                        }
+                        cache.set('resolve4_' + domain, addresses, function () {
+                            callback(err, deepCopy(addresses));
+                        });
+                    });
+                } catch (err) {
+                    /*istanbul ignore next - doesn't throw in node 0.10*/
+                    callback(err);
+                }
+            });
+        };
+
+        // override dns.resolve6 method
+        dns.resolve6 = function (domain, callback) {
+            cache.get('resolve6_' + domain, function (error, record) {
+                if (record) {
+                    return callback(error, deepCopy(record));
+                }
+                try {
+                    backup_object.resolve6(domain, function (err, addresses) {
+                        if (err) {
+                            return callback(err);
+                        }
+                        cache.set('resolve6_' + domain, addresses, function () {
+                            callback(err, deepCopy(addresses));
+                        });
+                    });
+                } catch (err) {
+                    /*istanbul ignore next - doesn't throw in node 0.10*/
+                    callback(err);
+                }
+            });
+        };
+
+        // override dns.resolveMx method
+        dns.resolveMx = function (domain, callback) {
+            cache.get('resolveMx_' + domain, function (error, record) {
+                if (record) {
+                    return callback(error, deepCopy(record));
+                }
+                try {
+                    backup_object.resolveMx(domain, function (err, addresses) {
+                        if (err) {
+                            return callback(err);
+                        }
+                        cache.set('resolveMx_' + domain, addresses, function () {
+                            callback(err, deepCopy(addresses));
+                        });
+                    });
+                } catch (err) {
+                    /*istanbul ignore next - doesn't throw in node 0.10*/
+                    callback(err);
+                }
+            });
+        };
+
+        // override dns.resolveTxt method
+        dns.resolveTxt = function (domain, callback) {
+            cache.get('resolveTxt_' + domain, function (error, record) {
+                if (record) {
+                    return callback(error, deepCopy(record));
+                }
+                try {
+                    backup_object.resolveTxt(domain, function (err, addresses) {
+                        if (err) {
+                            return callback(err);
+                        }
+                        cache.set('resolveTxt_' + domain, addresses, function () {
+                            callback(err, deepCopy(addresses));
+                        });
+                    });
+                } catch (err) {
+                    /*istanbul ignore next - doesn't throw in node 0.10*/
+                    callback(err);
+                }
+            });
+        };
+
+        // override dns.resolveSrv method
+        dns.resolveSrv = function (domain, callback) {
+            cache.get('resolveSrv_' + domain, function (error, record) {
+                if (record) {
+                    return callback(error, deepCopy(record));
+                }
+                try {
+                    backup_object.resolveSrv(domain, function (err, addresses) {
+                        if (err) {
+                            return callback(err);
+                        }
+                        cache.set('resolveSrv_' + domain, addresses, function () {
+                            callback(err, deepCopy(addresses));
+                        });
+                    });
+                } catch (err) {
+                    /*istanbul ignore next - doesn't throw in node 0.10*/
+                    callback(err);
+                }
+            });
+        };
+
+        // override dns.resolveNs method
+        dns.resolveNs = function (domain, callback) {
+            cache.get('resolveNs_' + domain, function (error, record) {
+                if (record) {
+                    return callback(error, deepCopy(record));
+                }
+                try {
+                    backup_object.resolveNs(domain, function (err, addresses) {
+                        if (err) {
+                            return callback(err);
+                        }
+                        cache.set('resolveNs_' + domain, addresses, function () {
+                            callback(err, deepCopy(addresses));
+                        });
+                    });
+                } catch (err) {
+                    /*istanbul ignore next - doesn't throw in node 0.10*/
+                    callback(err);
+                }
+            });
+        };
+
+        // override dns.resolveCname method
+        dns.resolveCname = function (domain, callback) {
+            cache.get('resolveCname_' + domain, function (error, record) {
+                if (record) {
+                    return callback(error, deepCopy(record));
+                }
+                try {
+                    backup_object.resolveCname(domain, function (err, addresses) {
+                        if (err) {
+                            return callback(err);
+                        }
+                        cache.set('resolveCname_' + domain, addresses, function () {
+                            callback(err, deepCopy(addresses));
+                        });
+                    });
+                } catch (err) {
+                    /*istanbul ignore next - doesn't throw in node 0.10*/
+                    callback(err);
+                }
+            });
+        };
+
+        // override dns.reverse method
+        dns.reverse = function (ip, callback) {
+            cache.get('reverse_' + ip, function (error, record) {
+                if (record) {
+                    return callback(error, deepCopy(record));
+                }
+                try {
+                    backup_object.reverse(ip, function (err, addresses) {
+                        if (err) {
+                            return callback(err);
+                        }
+                        cache.set('reverse_' + ip, addresses, function () {
+                            callback(err, deepCopy(addresses));
+                        });
+                    });
+                } catch (err) {
+                    /*istanbul ignore next - doesn't throw in node 0.10*/
+                    callback(err);
+                }
+            });
+        };
+        return dns;
+};
+
+module.exports = function(conf) {
+    return new EnhanceDns(conf);
+};
+
+
+/***/ }),
+/* 638 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// Named EC curves
+
+// Requires ec.js, jsbn.js, and jsbn2.js
+var BigInteger = __webpack_require__(81).BigInteger
+var ECCurveFp = __webpack_require__(139).ECCurveFp
+
+
+// ----------------
+// X9ECParameters
+
+// constructor
+function X9ECParameters(curve,g,n,h) {
+    this.curve = curve;
+    this.g = g;
+    this.n = n;
+    this.h = h;
+}
+
+function x9getCurve() {
+    return this.curve;
+}
+
+function x9getG() {
+    return this.g;
+}
+
+function x9getN() {
+    return this.n;
+}
+
+function x9getH() {
+    return this.h;
+}
+
+X9ECParameters.prototype.getCurve = x9getCurve;
+X9ECParameters.prototype.getG = x9getG;
+X9ECParameters.prototype.getN = x9getN;
+X9ECParameters.prototype.getH = x9getH;
+
+// ----------------
+// SECNamedCurves
+
+function fromHex(s) { return new BigInteger(s, 16); }
+
+function secp128r1() {
+    // p = 2^128 - 2^97 - 1
+    var p = fromHex("FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF");
+    var a = fromHex("FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFC");
+    var b = fromHex("E87579C11079F43DD824993C2CEE5ED3");
+    //byte[] S = Hex.decode("000E0D4D696E6768756151750CC03A4473D03679");
+    var n = fromHex("FFFFFFFE0000000075A30D1B9038A115");
+    var h = BigInteger.ONE;
+    var curve = new ECCurveFp(p, a, b);
+    var G = curve.decodePointHex("04"
+                + "161FF7528B899B2D0C28607CA52C5B86"
+		+ "CF5AC8395BAFEB13C02DA292DDED7A83");
+    return new X9ECParameters(curve, G, n, h);
+}
+
+function secp160k1() {
+    // p = 2^160 - 2^32 - 2^14 - 2^12 - 2^9 - 2^8 - 2^7 - 2^3 - 2^2 - 1
+    var p = fromHex("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73");
+    var a = BigInteger.ZERO;
+    var b = fromHex("7");
+    //byte[] S = null;
+    var n = fromHex("0100000000000000000001B8FA16DFAB9ACA16B6B3");
+    var h = BigInteger.ONE;
+    var curve = new ECCurveFp(p, a, b);
+    var G = curve.decodePointHex("04"
+                + "3B4C382CE37AA192A4019E763036F4F5DD4D7EBB"
+                + "938CF935318FDCED6BC28286531733C3F03C4FEE");
+    return new X9ECParameters(curve, G, n, h);
+}
+
+function secp160r1() {
+    // p = 2^160 - 2^31 - 1
+    var p = fromHex("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF");
+    var a = fromHex("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFC");
+    var b = fromHex("1C97BEFC54BD7A8B65ACF89F81D4D4ADC565FA45");
+    //byte[] S = Hex.decode("1053CDE42C14D696E67687561517533BF3F83345");
+    var n = fromHex("0100000000000000000001F4C8F927AED3CA752257");
+    var h = BigInteger.ONE;
+    var curve = new ECCurveFp(p, a, b);
+    var G = curve.decodePointHex("04"
+		+ "4A96B5688EF573284664698968C38BB913CBFC82"
+		+ "23A628553168947D59DCC912042351377AC5FB32");
+    return new X9ECParameters(curve, G, n, h);
+}
+
+function secp192k1() {
+    // p = 2^192 - 2^32 - 2^12 - 2^8 - 2^7 - 2^6 - 2^3 - 1
+    var p = fromHex("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFEE37");
+    var a = BigInteger.ZERO;
+    var b = fromHex("3");
+    //byte[] S = null;
+    var n = fromHex("FFFFFFFFFFFFFFFFFFFFFFFE26F2FC170F69466A74DEFD8D");
+    var h = BigInteger.ONE;
+    var curve = new ECCurveFp(p, a, b);
+    var G = curve.decodePointHex("04"
+                + "DB4FF10EC057E9AE26B07D0280B7F4341DA5D1B1EAE06C7D"
+                + "9B2F2F6D9C5628A7844163D015BE86344082AA88D95E2F9D");
+    return new X9ECParameters(curve, G, n, h);
+}
+
+function secp192r1() {
+    // p = 2^192 - 2^64 - 1
+    var p = fromHex("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF");
+    var a = fromHex("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC");
+    var b = fromHex("64210519E59C80E70FA7E9AB72243049FEB8DEECC146B9B1");
+    //byte[] S = Hex.decode("3045AE6FC8422F64ED579528D38120EAE12196D5");
+    var n = fromHex("FFFFFFFFFFFFFFFFFFFFFFFF99DEF836146BC9B1B4D22831");
+    var h = BigInteger.ONE;
+    var curve = new ECCurveFp(p, a, b);
+    var G = curve.decodePointHex("04"
+                + "188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF1012"
+                + "07192B95FFC8DA78631011ED6B24CDD573F977A11E794811");
+    return new X9ECParameters(curve, G, n, h);
+}
+
+function secp224r1() {
+    // p = 2^224 - 2^96 + 1
+    var p = fromHex("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001");
+    var a = fromHex("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFE");
+    var b = fromHex("B4050A850C04B3ABF54132565044B0B7D7BFD8BA270B39432355FFB4");
+    //byte[] S = Hex.decode("BD71344799D5C7FCDC45B59FA3B9AB8F6A948BC5");
+    var n = fromHex("FFFFFFFFFFFFFFFFFFFFFFFFFFFF16A2E0B8F03E13DD29455C5C2A3D");
+    var h = BigInteger.ONE;
+    var curve = new ECCurveFp(p, a, b);
+    var G = curve.decodePointHex("04"
+                + "B70E0CBD6BB4BF7F321390B94A03C1D356C21122343280D6115C1D21"
+                + "BD376388B5F723FB4C22DFE6CD4375A05A07476444D5819985007E34");
+    return new X9ECParameters(curve, G, n, h);
+}
+
+function secp256r1() {
+    // p = 2^224 (2^32 - 1) + 2^192 + 2^96 - 1
+    var p = fromHex("FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF");
+    var a = fromHex("FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC");
+    var b = fromHex("5AC635D8AA3A93E7B3EBBD55769886BC651D06B0CC53B0F63BCE3C3E27D2604B");
+    //byte[] S = Hex.decode("C49D360886E704936A6678E1139D26B7819F7E90");
+    var n = fromHex("FFFFFFFF00000000FFFFFFFFFFFFFFFFBCE6FAADA7179E84F3B9CAC2FC632551");
+    var h = BigInteger.ONE;
+    var curve = new ECCurveFp(p, a, b);
+    var G = curve.decodePointHex("04"
+                + "6B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C296"
+		+ "4FE342E2FE1A7F9B8EE7EB4A7C0F9E162BCE33576B315ECECBB6406837BF51F5");
+    return new X9ECParameters(curve, G, n, h);
+}
+
+// TODO: make this into a proper hashtable
+function getSECCurveByName(name) {
+    if(name == "secp128r1") return secp128r1();
+    if(name == "secp160k1") return secp160k1();
+    if(name == "secp160r1") return secp160r1();
+    if(name == "secp192k1") return secp192k1();
+    if(name == "secp192r1") return secp192r1();
+    if(name == "secp224r1") return secp224r1();
+    if(name == "secp256r1") return secp256r1();
+    return null;
+}
+
+module.exports = {
+  "secp128r1":secp128r1,
+  "secp160k1":secp160k1,
+  "secp160r1":secp160r1,
+  "secp192k1":secp192k1,
+  "secp192r1":secp192r1,
+  "secp224r1":secp224r1,
+  "secp256r1":secp256r1
+}
+
+
+/***/ }),
+/* 639 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*!
+ * expand-brackets <https://github.com/jonschlinkert/expand-brackets>
+ *
+ * Copyright (c) 2015 Jon Schlinkert.
+ * Licensed under the MIT license.
+ */
+
+
+
+var isPosixBracket = __webpack_require__(739);
+
+/**
+ * POSIX character classes
+ */
+
+var POSIX = {
+  alnum: 'a-zA-Z0-9',
+  alpha: 'a-zA-Z',
+  blank: ' \\t',
+  cntrl: '\\x00-\\x1F\\x7F',
+  digit: '0-9',
+  graph: '\\x21-\\x7E',
+  lower: 'a-z',
+  print: '\\x20-\\x7E',
+  punct: '-!"#$%&\'()\\*+,./:;<=>?@[\\]^_`{|}~',
+  space: ' \\t\\r\\n\\v\\f',
+  upper: 'A-Z',
+  word:  'A-Za-z0-9_',
+  xdigit: 'A-Fa-f0-9',
+};
+
+/**
+ * Expose `brackets`
+ */
+
+module.exports = brackets;
+
+function brackets(str) {
+  if (!isPosixBracket(str)) {
+    return str;
+  }
+
+  var negated = false;
+  if (str.indexOf('[^') !== -1) {
+    negated = true;
+    str = str.split('[^').join('[');
+  }
+  if (str.indexOf('[!') !== -1) {
+    negated = true;
+    str = str.split('[!').join('[');
+  }
+
+  var a = str.split('[');
+  var b = str.split(']');
+  var imbalanced = a.length !== b.length;
+
+  var parts = str.split(/(?::\]\[:|\[?\[:|:\]\]?)/);
+  var len = parts.length, i = 0;
+  var end = '', beg = '';
+  var res = [];
+
+  // start at the end (innermost) first
+  while (len--) {
+    var inner = parts[i++];
+    if (inner === '^[!' || inner === '[!') {
+      inner = '';
+      negated = true;
+    }
+
+    var prefix = negated ? '^' : '';
+    var ch = POSIX[inner];
+
+    if (ch) {
+      res.push('[' + prefix + ch + ']');
+    } else if (inner) {
+      if (/^\[?\w-\w\]?$/.test(inner)) {
+        if (i === parts.length) {
+          res.push('[' + prefix + inner);
+        } else if (i === 1) {
+          res.push(prefix + inner + ']');
+        } else {
+          res.push(prefix + inner);
+        }
+      } else {
+        if (i === 1) {
+          beg += inner;
+        } else if (i === parts.length) {
+          end += inner;
+        } else {
+          res.push('[' + prefix + inner + ']');
+        }
+      }
+    }
+  }
+
+  var result = res.join('|');
+  var rlen = res.length || 1;
+  if (rlen > 1) {
+    result = '(?:' + result + ')';
+    rlen = 1;
+  }
+  if (beg) {
+    rlen++;
+    if (beg.charAt(0) === '[') {
+      if (imbalanced) {
+        beg = '\\[' + beg.slice(1);
+      } else {
+        beg += ']';
+      }
+    }
+    result = beg + result;
+  }
+  if (end) {
+    rlen++;
+    if (end.slice(-1) === ']') {
+      if (imbalanced) {
+        end = end.slice(0, end.length - 1) + '\\]';
+      } else {
+        end = '[' + end;
+      }
+    }
+    result += end;
+  }
+
+  if (rlen > 1) {
+    result = result.split('][').join(']|[');
+    if (result.indexOf('|') !== -1 && !/\(\?/.test(result)) {
+      result = '(?:' + result + ')';
+    }
+  }
+
+  result = result.replace(/\[+=|=\]+/g, '\\b');
+  return result;
+}
+
+brackets.makeRe = function(pattern) {
+  try {
+    return new RegExp(brackets(pattern));
+  } catch (err) {}
+};
+
+brackets.isMatch = function(str, pattern) {
+  try {
+    return brackets.makeRe(pattern).test(str);
+  } catch (err) {
+    return false;
+  }
+};
+
+brackets.match = function(arr, pattern) {
+  var len = arr.length, i = 0;
+  var res = arr.slice();
+
+  var re = brackets.makeRe(pattern);
+  while (i < len) {
+    var ele = arr[i++];
+    if (!re.test(ele)) {
+      continue;
+    }
+    res.splice(i, 1);
+  }
+  return res;
+};
+
+
+/***/ }),
+/* 640 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*!
+ * expand-range <https://github.com/jonschlinkert/expand-range>
+ *
+ * Copyright (c) 2014-2015, Jon Schlinkert.
+ * Licensed under the MIT license.
+ */
+
+
+
+var fill = __webpack_require__(641);
+
+module.exports = function expandRange(str, options, fn) {
+  if (typeof str !== 'string') {
+    throw new TypeError('expand-range expects a string.');
+  }
+
+  if (typeof options === 'function') {
+    fn = options;
+    options = {};
+  }
+
+  if (typeof options === 'boolean') {
+    options = {};
+    options.makeRe = true;
+  }
+
+  // create arguments to pass to fill-range
+  var opts = options || {};
+  var args = str.split('..');
+  var len = args.length;
+  if (len > 3) { return str; }
+
+  // if only one argument, it can't expand so return it
+  if (len === 1) { return args; }
+
+  // if `true`, tell fill-range to regexify the string
+  if (typeof fn === 'boolean' && fn === true) {
+    opts.makeRe = true;
+  }
+
+  args.push(opts);
+  return fill.apply(null, args.concat(fn));
+};
+
+
+/***/ }),
+/* 641 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*!
+ * fill-range <https://github.com/jonschlinkert/fill-range>
+ *
+ * Copyright (c) 2014-2018, Jon Schlinkert.
+ * Released under the MIT License.
+ */
+
+
+
+var isObject = __webpack_require__(643);
+var isNumber = __webpack_require__(642);
+var randomize = __webpack_require__(787);
+var repeatStr = __webpack_require__(797);
+var repeat = __webpack_require__(411);
+
+/**
+ * Expose `fillRange`
+ */
+
+module.exports = fillRange;
+
+/**
+ * Return a range of numbers or letters.
+ *
+ * @param  {String} `a` Start of the range
+ * @param  {String} `b` End of the range
+ * @param  {String} `step` Increment or decrement to use.
+ * @param  {Function} `fn` Custom function to modify each element in the range.
+ * @return {Array}
+ */
+
+function fillRange(a, b, step, options, fn) {
+  if (a == null || b == null) {
+    throw new Error('fill-range expects the first and second args to be strings.');
+  }
+
+  if (typeof step === 'function') {
+    fn = step; options = {}; step = null;
+  }
+
+  if (typeof options === 'function') {
+    fn = options; options = {};
+  }
+
+  if (isObject(step)) {
+    options = step; step = '';
+  }
+
+  var expand, regex = false, sep = '';
+  var opts = options || {};
+
+  if (typeof opts.silent === 'undefined') {
+    opts.silent = true;
+  }
+
+  step = step || opts.step;
+
+  // store a ref to unmodified arg
+  var origA = a, origB = b;
+
+  b = (b.toString() === '-0') ? 0 : b;
+
+  if (opts.optimize || opts.makeRe) {
+    step = step ? (step += '~') : step;
+    expand = true;
+    regex = true;
+    sep = '~';
+  }
+
+  // handle special step characters
+  if (typeof step === 'string') {
+    var match = stepRe().exec(step);
+
+    if (match) {
+      var i = match.index;
+      var m = match[0];
+
+      // repeat string
+      if (m === '+') {
+        return repeat(a, b);
+
+      // randomize a, `b` times
+      } else if (m === '?') {
+        return [randomize(a, b)];
+
+      // expand right, no regex reduction
+      } else if (m === '>') {
+        step = step.substr(0, i) + step.substr(i + 1);
+        expand = true;
+
+      // expand to an array, or if valid create a reduced
+      // string for a regex logic `or`
+      } else if (m === '|') {
+        step = step.substr(0, i) + step.substr(i + 1);
+        expand = true;
+        regex = true;
+        sep = m;
+
+      // expand to an array, or if valid create a reduced
+      // string for a regex range
+      } else if (m === '~') {
+        step = step.substr(0, i) + step.substr(i + 1);
+        expand = true;
+        regex = true;
+        sep = m;
+      }
+    } else if (!isNumber(step)) {
+      if (!opts.silent) {
+        throw new TypeError('fill-range: invalid step.');
+      }
+      return null;
+    }
+  }
+
+  if (/[.&*()[\]^%$#@!]/.test(a) || /[.&*()[\]^%$#@!]/.test(b)) {
+    if (!opts.silent) {
+      throw new RangeError('fill-range: invalid range arguments.');
+    }
+    return null;
+  }
+
+  // has neither a letter nor number, or has both letters and numbers
+  // this needs to be after the step logic
+  if (!noAlphaNum(a) || !noAlphaNum(b) || hasBoth(a) || hasBoth(b)) {
+    if (!opts.silent) {
+      throw new RangeError('fill-range: invalid range arguments.');
+    }
+    return null;
+  }
+
+  // validate arguments
+  var isNumA = isNumber(zeros(a));
+  var isNumB = isNumber(zeros(b));
+
+  if ((!isNumA && isNumB) || (isNumA && !isNumB)) {
+    if (!opts.silent) {
+      throw new TypeError('fill-range: first range argument is incompatible with second.');
+    }
+    return null;
+  }
+
+  // by this point both are the same, so we
+  // can use A to check going forward.
+  var isNum = isNumA;
+  var num = formatStep(step);
+
+  // is the range alphabetical? or numeric?
+  if (isNum) {
+    // if numeric, coerce to an integer
+    a = +a; b = +b;
+  } else {
+    // otherwise, get the charCode to expand alpha ranges
+    a = a.charCodeAt(0);
+    b = b.charCodeAt(0);
+  }
+
+  // is the pattern descending?
+  var isDescending = a > b;
+
+  // don't create a character class if the args are < 0
+  if (a < 0 || b < 0) {
+    expand = false;
+    regex = false;
+  }
+
+  // detect padding
+  var padding = isPadded(origA, origB);
+  var res, pad, arr = [];
+  var ii = 0;
+
+  // character classes, ranges and logical `or`
+  if (regex) {
+    if (shouldExpand(a, b, num, isNum, padding, opts)) {
+      // make sure the correct separator is used
+      if (sep === '|' || sep === '~') {
+        sep = detectSeparator(a, b, num, isNum, isDescending);
+      }
+      return wrap([origA, origB], sep, opts);
+    }
+  }
+
+  while (isDescending ? (a >= b) : (a <= b)) {
+    if (padding && isNum) {
+      pad = padding(a);
+    }
+
+    // custom function
+    if (typeof fn === 'function') {
+      res = fn(a, isNum, pad, ii++);
+
+    // letters
+    } else if (!isNum) {
+      if (regex && isInvalidChar(a)) {
+        res = null;
+      } else {
+        res = String.fromCharCode(a);
+      }
+
+    // numbers
+    } else {
+      res = formatPadding(a, pad);
+    }
+
+    // add result to the array, filtering any nulled values
+    if (res !== null) arr.push(res);
+
+    // increment or decrement
+    if (isDescending) {
+      a -= num;
+    } else {
+      a += num;
+    }
+  }
+
+  // now that the array is expanded, we need to handle regex
+  // character classes, ranges or logical `or` that wasn't
+  // already handled before the loop
+  if ((regex || expand) && !opts.noexpand) {
+    // make sure the correct separator is used
+    if (sep === '|' || sep === '~') {
+      sep = detectSeparator(a, b, num, isNum, isDescending);
+    }
+    if (arr.length === 1 || a < 0 || b < 0) { return arr; }
+    return wrap(arr, sep, opts);
+  }
+
+  return arr;
+}
+
+/**
+ * Wrap the string with the correct regex
+ * syntax.
+ */
+
+function wrap(arr, sep, opts) {
+  if (sep === '~') { sep = '-'; }
+  var str = arr.join(sep);
+  var pre = opts && opts.regexPrefix;
+
+  // regex logical `or`
+  if (sep === '|') {
+    str = pre ? pre + str : str;
+    str = '(' + str + ')';
+  }
+
+  // regex character class
+  if (sep === '-') {
+    str = (pre && pre === '^')
+      ? pre + str
+      : str;
+    str = '[' + str + ']';
+  }
+  return [str];
+}
+
+/**
+ * Check for invalid characters
+ */
+
+function isCharClass(a, b, step, isNum, isDescending) {
+  if (isDescending) { return false; }
+  if (isNum) { return a <= 9 && b <= 9; }
+  if (a < b) { return step === 1; }
+  return false;
+}
+
+/**
+ * Detect the correct separator to use
+ */
+
+function shouldExpand(a, b, num, isNum, padding, opts) {
+  if (isNum && (a > 9 || b > 9)) { return false; }
+  return !padding && num === 1 && a < b;
+}
+
+/**
+ * Detect the correct separator to use
+ */
+
+function detectSeparator(a, b, step, isNum, isDescending) {
+  var isChar = isCharClass(a, b, step, isNum, isDescending);
+  if (!isChar) {
+    return '|';
+  }
+  return '~';
+}
+
+/**
+ * Correctly format the step based on type
+ */
+
+function formatStep(step) {
+  return Math.abs(step >> 0) || 1;
+}
+
+/**
+ * Format padding, taking leading `-` into account
+ */
+
+function formatPadding(ch, pad) {
+  var res = pad ? pad + ch : ch;
+  if (pad && ch.toString().charAt(0) === '-') {
+    res = '-' + pad + ch.toString().substr(1);
+  }
+  return res.toString();
+}
+
+/**
+ * Check for invalid characters
+ */
+
+function isInvalidChar(str) {
+  var ch = toStr(str);
+  return ch === '\\'
+    || ch === '['
+    || ch === ']'
+    || ch === '^'
+    || ch === '('
+    || ch === ')'
+    || ch === '`';
+}
+
+/**
+ * Convert to a string from a charCode
+ */
+
+function toStr(ch) {
+  return String.fromCharCode(ch);
+}
+
+
+/**
+ * Step regex
+ */
+
+function stepRe() {
+  return /\?|>|\||\+|\~/g;
+}
+
+/**
+ * Return true if `val` has either a letter
+ * or a number
+ */
+
+function noAlphaNum(val) {
+  return /[a-z0-9]/i.test(val);
+}
+
+/**
+ * Return true if `val` has both a letter and
+ * a number (invalid)
+ */
+
+function hasBoth(val) {
+  return /[a-z][0-9]|[0-9][a-z]/i.test(val);
+}
+
+/**
+ * Normalize zeros for checks
+ */
+
+function zeros(val) {
+  if (/^-*0+$/.test(val.toString())) {
+    return '0';
+  }
+  return val;
+}
+
+/**
+ * Return true if `val` has leading zeros,
+ * or a similar valid pattern.
+ */
+
+function hasZeros(val) {
+  return /[^.]\.|^-*0+[0-9]/.test(val);
+}
+
+/**
+ * If the string is padded, returns a curried function with
+ * the a cached padding string, or `false` if no padding.
+ *
+ * @param  {*} `origA` String or number.
+ * @return {String|Boolean}
+ */
+
+function isPadded(origA, origB) {
+  if (hasZeros(origA) || hasZeros(origB)) {
+    var alen = length(origA);
+    var blen = length(origB);
+
+    var len = alen >= blen
+      ? alen
+      : blen;
+
+    return function (a) {
+      return repeatStr('0', len - length(a));
+    };
+  }
+  return false;
+}
+
+/**
+ * Get the string length of `val`
+ */
+
+function length(val) {
+  return val.toString().length;
+}
+
+
+/***/ }),
+/* 642 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*!
+ * is-number <https://github.com/jonschlinkert/is-number>
+ *
+ * Copyright (c) 2014-2015, Jon Schlinkert.
+ * Licensed under the MIT License.
+ */
+
+
+
+var typeOf = __webpack_require__(179);
+
+module.exports = function isNumber(num) {
+  var type = typeOf(num);
+  if (type !== 'number' && type !== 'string') {
+    return false;
+  }
+  var n = +num;
+  return (n - n + 1) >= 0 && num !== '';
+};
+
+
+/***/ }),
+/* 643 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*!
+ * isobject <https://github.com/jonschlinkert/isobject>
+ *
+ * Copyright (c) 2014-2015, Jon Schlinkert.
+ * Licensed under the MIT License.
+ */
+
+
+
+var isArray = __webpack_require__(398);
+
+module.exports = function isObject(val) {
+  return val != null && typeof val === 'object' && isArray(val) === false;
+};
+
+
+/***/ }),
+/* 644 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*!
+ * extglob <https://github.com/jonschlinkert/extglob>
+ *
+ * Copyright (c) 2015, Jon Schlinkert.
+ * Licensed under the MIT License.
+ */
+
+
+
+/**
+ * Module dependencies
+ */
+
+var isExtglob = __webpack_require__(177);
+var re, cache = {};
+
+/**
+ * Expose `extglob`
+ */
+
+module.exports = extglob;
+
+/**
+ * Convert the given extglob `string` to a regex-compatible
+ * string.
+ *
+ * ```js
+ * var extglob = require('extglob');
+ * extglob('!(a?(b))');
+ * //=> '(?!a(?:b)?)[^/]*?'
+ * ```
+ *
+ * @param {String} `str` The string to convert.
+ * @param {Object} `options`
+ *   @option {Boolean} [options] `esc` If `false` special characters will not be escaped. Defaults to `true`.
+ *   @option {Boolean} [options] `regex` If `true` a regular expression is returned instead of a string.
+ * @return {String}
+ * @api public
+ */
+
+
+function extglob(str, opts) {
+  opts = opts || {};
+  var o = {}, i = 0;
+
+  // fix common character reversals
+  // '*!(.js)' => '*.!(js)'
+  str = str.replace(/!\(([^\w*()])/g, '$1!(');
+
+  // support file extension negation
+  str = str.replace(/([*\/])\.!\([*]\)/g, function (m, ch) {
+    if (ch === '/') {
+      return escape('\\/[^.]+');
+    }
+    return escape('[^.]+');
+  });
+
+  // create a unique key for caching by
+  // combining the string and options
+  var key = str
+    + String(!!opts.regex)
+    + String(!!opts.contains)
+    + String(!!opts.escape);
+
+  if (cache.hasOwnProperty(key)) {
+    return cache[key];
+  }
+
+  if (!(re instanceof RegExp)) {
+    re = regex();
+  }
+
+  opts.negate = false;
+  var m;
+
+  while (m = re.exec(str)) {
+    var prefix = m[1];
+    var inner = m[3];
+    if (prefix === '!') {
+      opts.negate = true;
+    }
+
+    var id = '__EXTGLOB_' + (i++) + '__';
+    // use the prefix of the _last_ (outtermost) pattern
+    o[id] = wrap(inner, prefix, opts.escape);
+    str = str.split(m[0]).join(id);
+  }
+
+  var keys = Object.keys(o);
+  var len = keys.length;
+
+  // we have to loop again to allow us to convert
+  // patterns in reverse order (starting with the
+  // innermost/last pattern first)
+  while (len--) {
+    var prop = keys[len];
+    str = str.split(prop).join(o[prop]);
+  }
+
+  var result = opts.regex
+    ? toRegex(str, opts.contains, opts.negate)
+    : str;
+
+  result = result.split('.').join('\\.');
+
+  // cache the result and return it
+  return (cache[key] = result);
+}
+
+/**
+ * Convert `string` to a regex string.
+ *
+ * @param  {String} `str`
+ * @param  {String} `prefix` Character that determines how to wrap the string.
+ * @param  {Boolean} `esc` If `false` special characters will not be escaped. Defaults to `true`.
+ * @return {String}
+ */
+
+function wrap(inner, prefix, esc) {
+  if (esc) inner = escape(inner);
+
+  switch (prefix) {
+    case '!':
+      return '(?!' + inner + ')[^/]' + (esc ? '%%%~' : '*?');
+    case '@':
+      return '(?:' + inner + ')';
+    case '+':
+      return '(?:' + inner + ')+';
+    case '*':
+      return '(?:' + inner + ')' + (esc ? '%%' : '*')
+    case '?':
+      return '(?:' + inner + '|)';
+    default:
+      return inner;
+  }
+}
+
+function escape(str) {
+  str = str.split('*').join('[^/]%%%~');
+  str = str.split('.').join('\\.');
+  return str;
+}
+
+/**
+ * extglob regex.
+ */
+
+function regex() {
+  return /(\\?[@?!+*$]\\?)(\(([^()]*?)\))/;
+}
+
+/**
+ * Negation regex
+ */
+
+function negate(str) {
+  return '(?!^' + str + ').*$';
+}
+
+/**
+ * Create the regex to do the matching. If
+ * the leading character in the `pattern` is `!`
+ * a negation regex is returned.
+ *
+ * @param {String} `pattern`
+ * @param {Boolean} `contains` Allow loose matching.
+ * @param {Boolean} `isNegated` True if the pattern is a negation pattern.
+ */
+
+function toRegex(pattern, contains, isNegated) {
+  var prefix = contains ? '^' : '';
+  var after = contains ? '$' : '';
+  pattern = ('(?:' + pattern + ')' + after);
+  if (isNegated) {
+    pattern = prefix + negate(pattern);
+  }
+  return new RegExp(prefix + pattern);
+}
+
+
+/***/ }),
+/* 645 */
+/***/ (function(module, exports, __webpack_require__) {
+
+/*
+ * extsprintf.js: extended POSIX-style sprintf
+ */
+
+var mod_assert = __webpack_require__(28);
+var mod_util = __webpack_require__(3);
+
+/*
+ * Public interface
+ */
+exports.sprintf = jsSprintf;
+exports.printf = jsPrintf;
+exports.fprintf = jsFprintf;
+
+/*
+ * Stripped down version of s[n]printf(3c).  We make a best effort to throw an
+ * exception when given a format string we don't understand, rather than
+ * ignoring it, so that we won't break existing programs if/when we go implement
+ * the rest of this.
+ *
+ * This implementation currently supports specifying
+ *	- field alignment ('-' flag),
+ * 	- zero-pad ('0' flag)
+ *	- always show numeric sign ('+' flag),
+ *	- field width
+ *	- conversions for strings, decimal integers, and floats (numbers).
+ *	- argument size specifiers.  These are all accepted but ignored, since
+ *	  Javascript has no notion of the physical size of an argument.
+ *
+ * Everything else is currently unsupported, most notably precision, unsigned
+ * numbers, non-decimal numbers, and characters.
+ */
+function jsSprintf(fmt)
+{
+	var regex = [
+	    '([^%]*)',				/* normal text */
+	    '%',				/* start of format */
+	    '([\'\\-+ #0]*?)',			/* flags (optional) */
+	    '([1-9]\\d*)?',			/* width (optional) */
+	    '(\\.([1-9]\\d*))?',		/* precision (optional) */
+	    '[lhjztL]*?',			/* length mods (ignored) */
+	    '([diouxXfFeEgGaAcCsSp%jr])'	/* conversion */
+	].join('');
+
+	var re = new RegExp(regex);
+	var args = Array.prototype.slice.call(arguments, 1);
+	var flags, width, precision, conversion;
+	var left, pad, sign, arg, match;
+	var ret = '';
+	var argn = 1;
+
+	mod_assert.equal('string', typeof (fmt));
+
+	while ((match = re.exec(fmt)) !== null) {
+		ret += match[1];
+		fmt = fmt.substring(match[0].length);
+
+		flags = match[2] || '';
+		width = match[3] || 0;
+		precision = match[4] || '';
+		conversion = match[6];
+		left = false;
+		sign = false;
+		pad = ' ';
+
+		if (conversion == '%') {
+			ret += '%';
+			continue;
+		}
+
+		if (args.length === 0)
+			throw (new Error('too few args to sprintf'));
+
+		arg = args.shift();
+		argn++;
+
+		if (flags.match(/[\' #]/))
+			throw (new Error(
+			    'unsupported flags: ' + flags));
+
+		if (precision.length > 0)
+			throw (new Error(
+			    'non-zero precision not supported'));
+
+		if (flags.match(/-/))
+			left = true;
+
+		if (flags.match(/0/))
+			pad = '0';
+
+		if (flags.match(/\+/))
+			sign = true;
+
+		switch (conversion) {
+		case 's':
+			if (arg === undefined || arg === null)
+				throw (new Error('argument ' + argn +
+				    ': attempted to print undefined or null ' +
+				    'as a string'));
+			ret += doPad(pad, width, left, arg.toString());
+			break;
+
+		case 'd':
+			arg = Math.floor(arg);
+			/*jsl:fallthru*/
+		case 'f':
+			sign = sign && arg > 0 ? '+' : '';
+			ret += sign + doPad(pad, width, left,
+			    arg.toString());
+			break;
+
+		case 'x':
+			ret += doPad(pad, width, left, arg.toString(16));
+			break;
+
+		case 'j': /* non-standard */
+			if (width === 0)
+				width = 10;
+			ret += mod_util.inspect(arg, false, width);
+			break;
+
+		case 'r': /* non-standard */
+			ret += dumpException(arg);
+			break;
+
+		default:
+			throw (new Error('unsupported conversion: ' +
+			    conversion));
+		}
+	}
+
+	ret += fmt;
+	return (ret);
+}
+
+function jsPrintf() {
+	var args = Array.prototype.slice.call(arguments);
+	args.unshift(process.stdout);
+	jsFprintf.apply(null, args);
+}
+
+function jsFprintf(stream) {
+	var args = Array.prototype.slice.call(arguments, 1);
+	return (stream.write(jsSprintf.apply(this, args)));
+}
+
+function doPad(chr, width, left, str)
+{
+	var ret = str;
+
+	while (ret.length < width) {
+		if (left)
+			ret += chr;
+		else
+			ret = chr + ret;
+	}
+
+	return (ret);
+}
+
+/*
+ * This function dumps long stack traces for exceptions having a cause() method.
+ * See node-verror for an example.
+ */
+function dumpException(ex)
+{
+	var ret;
+
+	if (!(ex instanceof Error))
+		throw (new Error(jsSprintf('invalid type for %%r: %j', ex)));
+
+	/* Note that V8 prepends "ex.stack" with ex.toString(). */
+	ret = 'EXCEPTION: ' + ex.constructor.name + ': ' + ex.stack;
+
+	if (ex.cause && typeof (ex.cause) === 'function') {
+		var cex = ex.cause();
+		if (cex) {
+			ret += '\nCaused by: ' + dumpException(cex);
+		}
+	}
+
+	return (ret);
+}
+
+
+/***/ }),
+/* 646 */
+/***/ (function(module, exports) {
+
+/*!
+ * filename-regex <https://github.com/regexps/filename-regex>
+ *
+ * Copyright (c) 2014-2015, Jon Schlinkert
+ * Licensed under the MIT license.
+ */
+
+module.exports = function filenameRegex() {
+  return /([^\\\/]+)$/;
+};
+
+
+/***/ }),
+/* 647 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*!
+ * for-in <https://github.com/jonschlinkert/for-in>
+ *
+ * Copyright (c) 2014-2017, Jon Schlinkert.
+ * Released under the MIT License.
+ */
+
+
+
+module.exports = function forIn(obj, fn, thisArg) {
+  for (var key in obj) {
+    if (fn.call(thisArg, obj[key], key, obj) === false) {
+      break;
+    }
+  }
+};
+
+
+/***/ }),
+/* 648 */
+/***/ (function(module, exports, __webpack_require__) {
+
+module.exports = ForeverAgent
+ForeverAgent.SSL = ForeverAgentSSL
+
+var util = __webpack_require__(3)
+  , Agent = __webpack_require__(87).Agent
+  , net = __webpack_require__(164)
+  , tls = __webpack_require__(467)
+  , AgentSSL = __webpack_require__(195).Agent
+  
+function getConnectionName(host, port) {  
+  var name = ''
+  if (typeof host === 'string') {
+    name = host + ':' + port
+  } else {
+    // For node.js v012.0 and iojs-v1.5.1, host is an object. And any existing localAddress is part of the connection name.
+    name = host.host + ':' + host.port + ':' + (host.localAddress ? (host.localAddress + ':') : ':')
+  }
+  return name
+}    
+
+function ForeverAgent(options) {
+  var self = this
+  self.options = options || {}
+  self.requests = {}
+  self.sockets = {}
+  self.freeSockets = {}
+  self.maxSockets = self.options.maxSockets || Agent.defaultMaxSockets
+  self.minSockets = self.options.minSockets || ForeverAgent.defaultMinSockets
+  self.on('free', function(socket, host, port) {
+    var name = getConnectionName(host, port)
+
+    if (self.requests[name] && self.requests[name].length) {
+      self.requests[name].shift().onSocket(socket)
+    } else if (self.sockets[name].length < self.minSockets) {
+      if (!self.freeSockets[name]) self.freeSockets[name] = []
+      self.freeSockets[name].push(socket)
+      
+      // if an error happens while we don't use the socket anyway, meh, throw the socket away
+      var onIdleError = function() {
+        socket.destroy()
+      }
+      socket._onIdleError = onIdleError
+      socket.on('error', onIdleError)
+    } else {
+      // If there are no pending requests just destroy the
+      // socket and it will get removed from the pool. This
+      // gets us out of timeout issues and allows us to
+      // default to Connection:keep-alive.
+      socket.destroy()
+    }
+  })
+
+}
+util.inherits(ForeverAgent, Agent)
+
+ForeverAgent.defaultMinSockets = 5
+
+
+ForeverAgent.prototype.createConnection = net.createConnection
+ForeverAgent.prototype.addRequestNoreuse = Agent.prototype.addRequest
+ForeverAgent.prototype.addRequest = function(req, host, port) {
+  var name = getConnectionName(host, port)
+  
+  if (typeof host !== 'string') {
+    var options = host
+    port = options.port
+    host = options.host
+  }
+
+  if (this.freeSockets[name] && this.freeSockets[name].length > 0 && !req.useChunkedEncodingByDefault) {
+    var idleSocket = this.freeSockets[name].pop()
+    idleSocket.removeListener('error', idleSocket._onIdleError)
+    delete idleSocket._onIdleError
+    req._reusedSocket = true
+    req.onSocket(idleSocket)
+  } else {
+    this.addRequestNoreuse(req, host, port)
+  }
+}
+
+ForeverAgent.prototype.removeSocket = function(s, name, host, port) {
+  if (this.sockets[name]) {
+    var index = this.sockets[name].indexOf(s)
+    if (index !== -1) {
+      this.sockets[name].splice(index, 1)
+    }
+  } else if (this.sockets[name] && this.sockets[name].length === 0) {
+    // don't leak
+    delete this.sockets[name]
+    delete this.requests[name]
+  }
+  
+  if (this.freeSockets[name]) {
+    var index = this.freeSockets[name].indexOf(s)
+    if (index !== -1) {
+      this.freeSockets[name].splice(index, 1)
+      if (this.freeSockets[name].length === 0) {
+        delete this.freeSockets[name]
+      }
+    }
+  }
+
+  if (this.requests[name] && this.requests[name].length) {
+    // If we have pending requests and a socket gets closed a new one
+    // needs to be created to take over in the pool for the one that closed.
+    this.createSocket(name, host, port).emit('free')
+  }
+}
+
+function ForeverAgentSSL (options) {
+  ForeverAgent.call(this, options)
+}
+util.inherits(ForeverAgentSSL, ForeverAgent)
+
+ForeverAgentSSL.prototype.createConnection = createConnectionSSL
+ForeverAgentSSL.prototype.addRequestNoreuse = AgentSSL.prototype.addRequest
+
+function createConnectionSSL (port, host, options) {
+  if (typeof port === 'object') {
+    options = port;
+  } else if (typeof host === 'object') {
+    options = host;
+  } else if (typeof options === 'object') {
+    options = options;
+  } else {
+    options = {};
+  }
+
+  if (typeof port === 'number') {
+    options.port = port;
+  }
+
+  if (typeof host === 'string') {
+    options.host = host;
+  }
+
+  return tls.connect(options);
+}
+
+
+/***/ }),
+/* 649 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var CombinedStream = __webpack_require__(385);
+var util = __webpack_require__(3);
+var path = __webpack_require__(0);
+var http = __webpack_require__(87);
+var https = __webpack_require__(195);
+var parseUrl = __webpack_require__(24).parse;
+var fs = __webpack_require__(5);
+var mime = __webpack_require__(400);
+var asynckit = __webpack_require__(517);
+var populate = __webpack_require__(650);
+
+// Public API
+module.exports = FormData;
+
+// make it a Stream
+util.inherits(FormData, CombinedStream);
+
+/**
+ * Create readable "multipart/form-data" streams.
+ * Can be used to submit forms
+ * and file uploads to other web applications.
+ *
+ * @constructor
+ * @param {Object} options - Properties to be added/overriden for FormData and CombinedStream
+ */
+function FormData(options) {
+  if (!(this instanceof FormData)) {
+    return new FormData();
+  }
+
+  this._overheadLength = 0;
+  this._valueLength = 0;
+  this._valuesToMeasure = [];
+
+  CombinedStream.call(this);
+
+  options = options || {};
+  for (var option in options) {
+    this[option] = options[option];
+  }
+}
+
+FormData.LINE_BREAK = '\r\n';
+FormData.DEFAULT_CONTENT_TYPE = 'application/octet-stream';
+
+FormData.prototype.append = function(field, value, options) {
+
+  options = options || {};
+
+  // allow filename as single option
+  if (typeof options == 'string') {
+    options = {filename: options};
+  }
+
+  var append = CombinedStream.prototype.append.bind(this);
+
+  // all that streamy business can't handle numbers
+  if (typeof value == 'number') {
+    value = '' + value;
+  }
+
+  // https://github.com/felixge/node-form-data/issues/38
+  if (util.isArray(value)) {
+    // Please convert your array into string
+    // the way web server expects it
+    this._error(new Error('Arrays are not supported.'));
+    return;
+  }
+
+  var header = this._multiPartHeader(field, value, options);
+  var footer = this._multiPartFooter();
+
+  append(header);
+  append(value);
+  append(footer);
+
+  // pass along options.knownLength
+  this._trackLength(header, value, options);
+};
+
+FormData.prototype._trackLength = function(header, value, options) {
+  var valueLength = 0;
+
+  // used w/ getLengthSync(), when length is known.
+  // e.g. for streaming directly from a remote server,
+  // w/ a known file a size, and not wanting to wait for
+  // incoming file to finish to get its size.
+  if (options.knownLength != null) {
+    valueLength += +options.knownLength;
+  } else if (Buffer.isBuffer(value)) {
+    valueLength = value.length;
+  } else if (typeof value === 'string') {
+    valueLength = Buffer.byteLength(value);
+  }
+
+  this._valueLength += valueLength;
+
+  // @check why add CRLF? does this account for custom/multiple CRLFs?
+  this._overheadLength +=
+    Buffer.byteLength(header) +
+    FormData.LINE_BREAK.length;
+
+  // empty or either doesn't have path or not an http response
+  if (!value || ( !value.path && !(value.readable && value.hasOwnProperty('httpVersion')) )) {
+    return;
+  }
+
+  // no need to bother with the length
+  if (!options.knownLength) {
+    this._valuesToMeasure.push(value);
+  }
+};
+
+FormData.prototype._lengthRetriever = function(value, callback) {
+
+  if (value.hasOwnProperty('fd')) {
+
+    // take read range into a account
+    // `end` = Infinity –> read file till the end
+    //
+    // TODO: Looks like there is bug in Node fs.createReadStream
+    // it doesn't respect `end` options without `start` options
+    // Fix it when node fixes it.
+    // https://github.com/joyent/node/issues/7819
+    if (value.end != undefined && value.end != Infinity && value.start != undefined) {
+
+      // when end specified
+      // no need to calculate range
+      // inclusive, starts with 0
+      callback(null, value.end + 1 - (value.start ? value.start : 0));
+
+    // not that fast snoopy
+    } else {
+      // still need to fetch file size from fs
+      fs.stat(value.path, function(err, stat) {
+
+        var fileSize;
+
+        if (err) {
+          callback(err);
+          return;
+        }
+
+        // update final size based on the range options
+        fileSize = stat.size - (value.start ? value.start : 0);
+        callback(null, fileSize);
+      });
+    }
+
+  // or http response
+  } else if (value.hasOwnProperty('httpVersion')) {
+    callback(null, +value.headers['content-length']);
+
+  // or request stream http://github.com/mikeal/request
+  } else if (value.hasOwnProperty('httpModule')) {
+    // wait till response come back
+    value.on('response', function(response) {
+      value.pause();
+      callback(null, +response.headers['content-length']);
+    });
+    value.resume();
+
+  // something else
+  } else {
+    callback('Unknown stream');
+  }
+};
+
+FormData.prototype._multiPartHeader = function(field, value, options) {
+  // custom header specified (as string)?
+  // it becomes responsible for boundary
+  // (e.g. to handle extra CRLFs on .NET servers)
+  if (typeof options.header == 'string') {
+    return options.header;
+  }
+
+  var contentDisposition = this._getContentDisposition(value, options);
+  var contentType = this._getContentType(value, options);
+
+  var contents = '';
+  var headers  = {
+    // add custom disposition as third element or keep it two elements if not
+    'Content-Disposition': ['form-data', 'name="' + field + '"'].concat(contentDisposition || []),
+    // if no content type. allow it to be empty array
+    'Content-Type': [].concat(contentType || [])
+  };
+
+  // allow custom headers.
+  if (typeof options.header == 'object') {
+    populate(headers, options.header);
+  }
+
+  var header;
+  for (var prop in headers) {
+    if (!headers.hasOwnProperty(prop)) continue;
+    header = headers[prop];
+
+    // skip nullish headers.
+    if (header == null) {
+      continue;
+    }
+
+    // convert all headers to arrays.
+    if (!Array.isArray(header)) {
+      header = [header];
+    }
+
+    // add non-empty headers.
+    if (header.length) {
+      contents += prop + ': ' + header.join('; ') + FormData.LINE_BREAK;
+    }
+  }
+
+  return '--' + this.getBoundary() + FormData.LINE_BREAK + contents + FormData.LINE_BREAK;
+};
+
+FormData.prototype._getContentDisposition = function(value, options) {
+
+  var filename
+    , contentDisposition
+    ;
+
+  if (typeof options.filepath === 'string') {
+    // custom filepath for relative paths
+    filename = path.normalize(options.filepath).replace(/\\/g, '/');
+  } else if (options.filename || value.name || value.path) {
+    // custom filename take precedence
+    // formidable and the browser add a name property
+    // fs- and request- streams have path property
+    filename = path.basename(options.filename || value.name || value.path);
+  } else if (value.readable && value.hasOwnProperty('httpVersion')) {
+    // or try http response
+    filename = path.basename(value.client._httpMessage.path);
+  }
+
+  if (filename) {
+    contentDisposition = 'filename="' + filename + '"';
+  }
+
+  return contentDisposition;
+};
+
+FormData.prototype._getContentType = function(value, options) {
+
+  // use custom content-type above all
+  var contentType = options.contentType;
+
+  // or try `name` from formidable, browser
+  if (!contentType && value.name) {
+    contentType = mime.lookup(value.name);
+  }
+
+  // or try `path` from fs-, request- streams
+  if (!contentType && value.path) {
+    contentType = mime.lookup(value.path);
+  }
+
+  // or if it's http-reponse
+  if (!contentType && value.readable && value.hasOwnProperty('httpVersion')) {
+    contentType = value.headers['content-type'];
+  }
+
+  // or guess it from the filepath or filename
+  if (!contentType && (options.filepath || options.filename)) {
+    contentType = mime.lookup(options.filepath || options.filename);
+  }
+
+  // fallback to the default content type if `value` is not simple value
+  if (!contentType && typeof value == 'object') {
+    contentType = FormData.DEFAULT_CONTENT_TYPE;
+  }
+
+  return contentType;
+};
+
+FormData.prototype._multiPartFooter = function() {
+  return function(next) {
+    var footer = FormData.LINE_BREAK;
+
+    var lastPart = (this._streams.length === 0);
+    if (lastPart) {
+      footer += this._lastBoundary();
+    }
+
+    next(footer);
+  }.bind(this);
+};
+
+FormData.prototype._lastBoundary = function() {
+  return '--' + this.getBoundary() + '--' + FormData.LINE_BREAK;
+};
+
+FormData.prototype.getHeaders = function(userHeaders) {
+  var header;
+  var formHeaders = {
+    'content-type': 'multipart/form-data; boundary=' + this.getBoundary()
+  };
+
+  for (header in userHeaders) {
+    if (userHeaders.hasOwnProperty(header)) {
+      formHeaders[header.toLowerCase()] = userHeaders[header];
+    }
+  }
+
+  return formHeaders;
+};
+
+FormData.prototype.getBoundary = function() {
+  if (!this._boundary) {
+    this._generateBoundary();
+  }
+
+  return this._boundary;
+};
+
+FormData.prototype._generateBoundary = function() {
+  // This generates a 50 character boundary similar to those used by Firefox.
+  // They are optimized for boyer-moore parsing.
+  var boundary = '--------------------------';
+  for (var i = 0; i < 24; i++) {
+    boundary += Math.floor(Math.random() * 10).toString(16);
+  }
+
+  this._boundary = boundary;
+};
+
+// Note: getLengthSync DOESN'T calculate streams length
+// As workaround one can calculate file size manually
+// and add it as knownLength option
+FormData.prototype.getLengthSync = function() {
+  var knownLength = this._overheadLength + this._valueLength;
+
+  // Don't get confused, there are 3 "internal" streams for each keyval pair
+  // so it basically checks if there is any value added to the form
+  if (this._streams.length) {
+    knownLength += this._lastBoundary().length;
+  }
+
+  // https://github.com/form-data/form-data/issues/40
+  if (!this.hasKnownLength()) {
+    // Some async length retrievers are present
+    // therefore synchronous length calculation is false.
+    // Please use getLength(callback) to get proper length
+    this._error(new Error('Cannot calculate proper length in synchronous way.'));
+  }
+
+  return knownLength;
+};
+
+// Public API to check if length of added values is known
+// https://github.com/form-data/form-data/issues/196
+// https://github.com/form-data/form-data/issues/262
+FormData.prototype.hasKnownLength = function() {
+  var hasKnownLength = true;
+
+  if (this._valuesToMeasure.length) {
+    hasKnownLength = false;
+  }
+
+  return hasKnownLength;
+};
+
+FormData.prototype.getLength = function(cb) {
+  var knownLength = this._overheadLength + this._valueLength;
+
+  if (this._streams.length) {
+    knownLength += this._lastBoundary().length;
+  }
+
+  if (!this._valuesToMeasure.length) {
+    process.nextTick(cb.bind(this, null, knownLength));
+    return;
+  }
+
+  asynckit.parallel(this._valuesToMeasure, this._lengthRetriever, function(err, values) {
+    if (err) {
+      cb(err);
+      return;
+    }
+
+    values.forEach(function(length) {
+      knownLength += length;
+    });
+
+    cb(null, knownLength);
+  });
+};
+
+FormData.prototype.submit = function(params, cb) {
+  var request
+    , options
+    , defaults = {method: 'post'}
+    ;
+
+  // parse provided url if it's string
+  // or treat it as options object
+  if (typeof params == 'string') {
+
+    params = parseUrl(params);
+    options = populate({
+      port: params.port,
+      path: params.pathname,
+      host: params.hostname,
+      protocol: params.protocol
+    }, defaults);
+
+  // use custom params
+  } else {
+
+    options = populate(params, defaults);
+    // if no port provided use default one
+    if (!options.port) {
+      options.port = options.protocol == 'https:' ? 443 : 80;
+    }
+  }
+
+  // put that good code in getHeaders to some use
+  options.headers = this.getHeaders(params.headers);
+
+  // https if specified, fallback to http in any other case
+  if (options.protocol == 'https:') {
+    request = https.request(options);
+  } else {
+    request = http.request(options);
+  }
+
+  // get content length and fire away
+  this.getLength(function(err, length) {
+    if (err) {
+      this._error(err);
+      return;
+    }
+
+    // add content length
+    request.setHeader('Content-Length', length);
+
+    this.pipe(request);
+    if (cb) {
+      request.on('error', cb);
+      request.on('response', cb.bind(this, null));
+    }
+  }.bind(this));
+
+  return request;
+};
+
+FormData.prototype._error = function(err) {
+  if (!this.error) {
+    this.error = err;
+    this.pause();
+    this.emit('error', err);
+  }
+};
+
+FormData.prototype.toString = function () {
+  return '[object FormData]';
+};
+
+
+/***/ }),
+/* 650 */
+/***/ (function(module, exports) {
+
+// populates missing values
+module.exports = function(dst, src) {
+
+  Object.keys(src).forEach(function(prop)
+  {
+    dst[prop] = dst[prop] || src[prop];
+  });
+
+  return dst;
+};
+
+
+/***/ }),
+/* 651 */
+/***/ (function(module, exports, __webpack_require__) {
+
+module.exports = __webpack_require__(5).constants || __webpack_require__(466)
+
+
+/***/ }),
+/* 652 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*!
+ * glob-base <https://github.com/jonschlinkert/glob-base>
+ *
+ * Copyright (c) 2015, Jon Schlinkert.
+ * Licensed under the MIT License.
+ */
+
+
+
+var path = __webpack_require__(0);
+var parent = __webpack_require__(653);
+var isGlob = __webpack_require__(178);
+
+module.exports = function globBase(pattern) {
+  if (typeof pattern !== 'string') {
+    throw new TypeError('glob-base expects a string.');
+  }
+
+  var res = {};
+  res.base = parent(pattern);
+  res.isGlob = isGlob(pattern);
+
+  if (res.base !== '.') {
+    res.glob = pattern.substr(res.base.length);
+    if (res.glob.charAt(0) === '/') {
+      res.glob = res.glob.substr(1);
+    }
+  } else {
+    res.glob = pattern;
+  }
+
+  if (!res.isGlob) {
+    res.base = dirname(pattern);
+    res.glob = res.base !== '.'
+      ? pattern.substr(res.base.length)
+      : pattern;
+  }
+
+  if (res.glob.substr(0, 2) === './') {
+    res.glob = res.glob.substr(2);
+  }
+  if (res.glob.charAt(0) === '/') {
+    res.glob = res.glob.substr(1);
+  }
+  return res;
+};
+
+function dirname(glob) {
+  if (glob.slice(-1) === '/') return glob;
+  return path.dirname(glob);
+}
+
+
+/***/ }),
+/* 653 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var path = __webpack_require__(0);
+var isglob = __webpack_require__(178);
+
+module.exports = function globParent(str) {
+	str += 'a'; // preserves full path in case of trailing path separator
+	do {str = path.dirname(str)} while (isglob(str));
+	return str;
+};
+
+
+/***/ }),
+/* 654 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var Stream = __webpack_require__(23).Stream
+
+module.exports = legacy
+
+function legacy (fs) {
+  return {
+    ReadStream: ReadStream,
+    WriteStream: WriteStream
+  }
+
+  function ReadStream (path, options) {
+    if (!(this instanceof ReadStream)) return new ReadStream(path, options);
+
+    Stream.call(this);
+
+    var self = this;
+
+    this.path = path;
+    this.fd = null;
+    this.readable = true;
+    this.paused = false;
+
+    this.flags = 'r';
+    this.mode = 438; /*=0666*/
+    this.bufferSize = 64 * 1024;
+
+    options = options || {};
+
+    // Mixin options into this
+    var keys = Object.keys(options);
+    for (var index = 0, length = keys.length; index < length; index++) {
+      var key = keys[index];
+      this[key] = options[key];
+    }
+
+    if (this.encoding) this.setEncoding(this.encoding);
+
+    if (this.start !== undefined) {
+      if ('number' !== typeof this.start) {
+        throw TypeError('start must be a Number');
+      }
+      if (this.end === undefined) {
+        this.end = Infinity;
+      } else if ('number' !== typeof this.end) {
+        throw TypeError('end must be a Number');
+      }
+
+      if (this.start > this.end) {
+        throw new Error('start must be <= end');
+      }
+
+      this.pos = this.start;
+    }
+
+    if (this.fd !== null) {
+      process.nextTick(function() {
+        self._read();
+      });
+      return;
+    }
+
+    fs.open(this.path, this.flags, this.mode, function (err, fd) {
+      if (err) {
+        self.emit('error', err);
+        self.readable = false;
+        return;
+      }
+
+      self.fd = fd;
+      self.emit('open', fd);
+      self._read();
+    })
+  }
+
+  function WriteStream (path, options) {
+    if (!(this instanceof WriteStream)) return new WriteStream(path, options);
+
+    Stream.call(this);
+
+    this.path = path;
+    this.fd = null;
+    this.writable = true;
+
+    this.flags = 'w';
+    this.encoding = 'binary';
+    this.mode = 438; /*=0666*/
+    this.bytesWritten = 0;
+
+    options = options || {};
+
+    // Mixin options into this
+    var keys = Object.keys(options);
+    for (var index = 0, length = keys.length; index < length; index++) {
+      var key = keys[index];
+      this[key] = options[key];
+    }
+
+    if (this.start !== undefined) {
+      if ('number' !== typeof this.start) {
+        throw TypeError('start must be a Number');
+      }
+      if (this.start < 0) {
+        throw new Error('start must be >= zero');
+      }
+
+      this.pos = this.start;
+    }
+
+    this.busy = false;
+    this._queue = [];
+
+    if (this.fd === null) {
+      this._open = fs.open;
+      this._queue.push([this._open, this.path, this.flags, this.mode, undefined]);
+      this.flush();
+    }
+  }
+}
+
+
+/***/ }),
+/* 655 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var fs = __webpack_require__(390)
+var constants = __webpack_require__(466)
+
+var origCwd = process.cwd
+var cwd = null
+
+var platform = process.env.GRACEFUL_FS_PLATFORM || process.platform
+
+process.cwd = function() {
+  if (!cwd)
+    cwd = origCwd.call(process)
+  return cwd
+}
+try {
+  process.cwd()
+} catch (er) {}
+
+var chdir = process.chdir
+process.chdir = function(d) {
+  cwd = null
+  chdir.call(process, d)
+}
+
+module.exports = patch
+
+function patch (fs) {
+  // (re-)implement some things that are known busted or missing.
+
+  // lchmod, broken prior to 0.6.2
+  // back-port the fix here.
+  if (constants.hasOwnProperty('O_SYMLINK') &&
+      process.version.match(/^v0\.6\.[0-2]|^v0\.5\./)) {
+    patchLchmod(fs)
+  }
+
+  // lutimes implementation, or no-op
+  if (!fs.lutimes) {
+    patchLutimes(fs)
+  }
+
+  // https://github.com/isaacs/node-graceful-fs/issues/4
+  // Chown should not fail on einval or eperm if non-root.
+  // It should not fail on enosys ever, as this just indicates
+  // that a fs doesn't support the intended operation.
+
+  fs.chown = chownFix(fs.chown)
+  fs.fchown = chownFix(fs.fchown)
+  fs.lchown = chownFix(fs.lchown)
+
+  fs.chmod = chmodFix(fs.chmod)
+  fs.fchmod = chmodFix(fs.fchmod)
+  fs.lchmod = chmodFix(fs.lchmod)
+
+  fs.chownSync = chownFixSync(fs.chownSync)
+  fs.fchownSync = chownFixSync(fs.fchownSync)
+  fs.lchownSync = chownFixSync(fs.lchownSync)
+
+  fs.chmodSync = chmodFixSync(fs.chmodSync)
+  fs.fchmodSync = chmodFixSync(fs.fchmodSync)
+  fs.lchmodSync = chmodFixSync(fs.lchmodSync)
+
+  fs.stat = statFix(fs.stat)
+  fs.fstat = statFix(fs.fstat)
+  fs.lstat = statFix(fs.lstat)
+
+  fs.statSync = statFixSync(fs.statSync)
+  fs.fstatSync = statFixSync(fs.fstatSync)
+  fs.lstatSync = statFixSync(fs.lstatSync)
+
+  // if lchmod/lchown do not exist, then make them no-ops
+  if (!fs.lchmod) {
+    fs.lchmod = function (path, mode, cb) {
+      if (cb) process.nextTick(cb)
+    }
+    fs.lchmodSync = function () {}
+  }
+  if (!fs.lchown) {
+    fs.lchown = function (path, uid, gid, cb) {
+      if (cb) process.nextTick(cb)
+    }
+    fs.lchownSync = function () {}
+  }
+
+  // on Windows, A/V software can lock the directory, causing this
+  // to fail with an EACCES or EPERM if the directory contains newly
+  // created files.  Try again on failure, for up to 60 seconds.
+
+  // Set the timeout this long because some Windows Anti-Virus, such as Parity
+  // bit9, may lock files for up to a minute, causing npm package install
+  // failures. Also, take care to yield the scheduler. Windows scheduling gives
+  // CPU to a busy looping process, which can cause the program causing the lock
+  // contention to be starved of CPU by node, so the contention doesn't resolve.
+  if (platform === "win32") {
+    fs.rename = (function (fs$rename) { return function (from, to, cb) {
+      var start = Date.now()
+      var backoff = 0;
+      fs$rename(from, to, function CB (er) {
+        if (er
+            && (er.code === "EACCES" || er.code === "EPERM")
+            && Date.now() - start < 60000) {
+          setTimeout(function() {
+            fs.stat(to, function (stater, st) {
+              if (stater && stater.code === "ENOENT")
+                fs$rename(from, to, CB);
+              else
+                cb(er)
+            })
+          }, backoff)
+          if (backoff < 100)
+            backoff += 10;
+          return;
+        }
+        if (cb) cb(er)
+      })
+    }})(fs.rename)
+  }
+
+  // if read() returns EAGAIN, then just try it again.
+  fs.read = (function (fs$read) { return function (fd, buffer, offset, length, position, callback_) {
+    var callback
+    if (callback_ && typeof callback_ === 'function') {
+      var eagCounter = 0
+      callback = function (er, _, __) {
+        if (er && er.code === 'EAGAIN' && eagCounter < 10) {
+          eagCounter ++
+          return fs$read.call(fs, fd, buffer, offset, length, position, callback)
+        }
+        callback_.apply(this, arguments)
+      }
+    }
+    return fs$read.call(fs, fd, buffer, offset, length, position, callback)
+  }})(fs.read)
+
+  fs.readSync = (function (fs$readSync) { return function (fd, buffer, offset, length, position) {
+    var eagCounter = 0
+    while (true) {
+      try {
+        return fs$readSync.call(fs, fd, buffer, offset, length, position)
+      } catch (er) {
+        if (er.code === 'EAGAIN' && eagCounter < 10) {
+          eagCounter ++
+          continue
+        }
+        throw er
+      }
+    }
+  }})(fs.readSync)
+}
+
+function patchLchmod (fs) {
+  fs.lchmod = function (path, mode, callback) {
+    fs.open( path
+           , constants.O_WRONLY | constants.O_SYMLINK
+           , mode
+           , function (err, fd) {
+      if (err) {
+        if (callback) callback(err)
+        return
+      }
+      // prefer to return the chmod error, if one occurs,
+      // but still try to close, and report closing errors if they occur.
+      fs.fchmod(fd, mode, function (err) {
+        fs.close(fd, function(err2) {
+          if (callback) callback(err || err2)
+        })
+      })
+    })
+  }
+
+  fs.lchmodSync = function (path, mode) {
+    var fd = fs.openSync(path, constants.O_WRONLY | constants.O_SYMLINK, mode)
+
+    // prefer to return the chmod error, if one occurs,
+    // but still try to close, and report closing errors if they occur.
+    var threw = true
+    var ret
+    try {
+      ret = fs.fchmodSync(fd, mode)
+      threw = false
+    } finally {
+      if (threw) {
+        try {
+          fs.closeSync(fd)
+        } catch (er) {}
+      } else {
+        fs.closeSync(fd)
+      }
+    }
+    return ret
+  }
+}
+
+function patchLutimes (fs) {
+  if (constants.hasOwnProperty("O_SYMLINK")) {
+    fs.lutimes = function (path, at, mt, cb) {
+      fs.open(path, constants.O_SYMLINK, function (er, fd) {
+        if (er) {
+          if (cb) cb(er)
+          return
+        }
+        fs.futimes(fd, at, mt, function (er) {
+          fs.close(fd, function (er2) {
+            if (cb) cb(er || er2)
+          })
+        })
+      })
+    }
+
+    fs.lutimesSync = function (path, at, mt) {
+      var fd = fs.openSync(path, constants.O_SYMLINK)
+      var ret
+      var threw = true
+      try {
+        ret = fs.futimesSync(fd, at, mt)
+        threw = false
+      } finally {
+        if (threw) {
+          try {
+            fs.closeSync(fd)
+          } catch (er) {}
+        } else {
+          fs.closeSync(fd)
+        }
+      }
+      return ret
+    }
+
+  } else {
+    fs.lutimes = function (_a, _b, _c, cb) { if (cb) process.nextTick(cb) }
+    fs.lutimesSync = function () {}
+  }
+}
+
+function chmodFix (orig) {
+  if (!orig) return orig
+  return function (target, mode, cb) {
+    return orig.call(fs, target, mode, function (er) {
+      if (chownErOk(er)) er = null
+      if (cb) cb.apply(this, arguments)
+    })
+  }
+}
+
+function chmodFixSync (orig) {
+  if (!orig) return orig
+  return function (target, mode) {
+    try {
+      return orig.call(fs, target, mode)
+    } catch (er) {
+      if (!chownErOk(er)) throw er
+    }
+  }
+}
+
+
+function chownFix (orig) {
+  if (!orig) return orig
+  return function (target, uid, gid, cb) {
+    return orig.call(fs, target, uid, gid, function (er) {
+      if (chownErOk(er)) er = null
+      if (cb) cb.apply(this, arguments)
+    })
+  }
+}
+
+function chownFixSync (orig) {
+  if (!orig) return orig
+  return function (target, uid, gid) {
+    try {
+      return orig.call(fs, target, uid, gid)
+    } catch (er) {
+      if (!chownErOk(er)) throw er
+    }
+  }
+}
+
+
+function statFix (orig) {
+  if (!orig) return orig
+  // Older versions of Node erroneously returned signed integers for
+  // uid + gid.
+  return function (target, cb) {
+    return orig.call(fs, target, function (er, stats) {
+      if (!stats) return cb.apply(this, arguments)
+      if (stats.uid < 0) stats.uid += 0x100000000
+      if (stats.gid < 0) stats.gid += 0x100000000
+      if (cb) cb.apply(this, arguments)
+    })
+  }
+}
+
+function statFixSync (orig) {
+  if (!orig) return orig
+  // Older versions of Node erroneously returned signed integers for
+  // uid + gid.
+  return function (target) {
+    var stats = orig.call(fs, target)
+    if (stats.uid < 0) stats.uid += 0x100000000
+    if (stats.gid < 0) stats.gid += 0x100000000
+    return stats;
+  }
+}
+
+// ENOSYS means that the fs doesn't support the op. Just ignore
+// that, because it doesn't matter.
+//
+// if there's no getuid, or if getuid() is something other
+// than 0, and the error is EINVAL or EPERM, then just ignore
+// it.
+//
+// This specific case is a silent failure in cp, install, tar,
+// and most other unix tools that manage permissions.
+//
+// When running as root, or if other types of errors are
+// encountered, then it's strict.
+function chownErOk (er) {
+  if (!er)
+    return true
+
+  if (er.code === "ENOSYS")
+    return true
+
+  var nonroot = !process.getuid || process.getuid() !== 0
+  if (nonroot) {
+    if (er.code === "EINVAL" || er.code === "EPERM")
+      return true
+  }
+
+  return false
+}
+
+
+/***/ }),
+/* 656 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var zlib = __webpack_require__(198)
+var peek = __webpack_require__(775)
+var through = __webpack_require__(461)
+var pumpify = __webpack_require__(782)
+var isGzip = __webpack_require__(737)
+var isDeflate = __webpack_require__(732)
+
+var isCompressed = function (data) {
+  if (isGzip(data)) return 1
+  if (isDeflate(data)) return 2
+  return 0
+}
+
+var gunzip = function (maxRecursion) {
+  if (!(maxRecursion >= 0)) maxRecursion = 3
+
+  return peek({newline: false, maxBuffer: 10}, function (data, swap) {
+    if (maxRecursion < 0) return swap(new Error('Maximum recursion reached'))
+    switch (isCompressed(data)) {
+      case 1:
+        swap(null, pumpify(zlib.createGunzip(), gunzip(maxRecursion - 1)))
+        break
+      case 2:
+        swap(null, pumpify(zlib.createInflate(), gunzip(maxRecursion - 1)))
+        break
+      default:
+        swap(null, through())
+    }
+  })
+}
+
+module.exports = gunzip
+
+
+/***/ }),
+/* 657 */
+/***/ (function(module, exports) {
+
+module.exports = {"$id":"afterRequest.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","optional":true,"required":["lastAccess","eTag","hitCount"],"properties":{"expires":{"type":"string","pattern":"^(\\d{4})(-)?(\\d\\d)(-)?(\\d\\d)(T)?(\\d\\d)(:)?(\\d\\d)(:)?(\\d\\d)(\\.\\d+)?(Z|([+-])(\\d\\d)(:)?(\\d\\d))?"},"lastAccess":{"type":"string","pattern":"^(\\d{4})(-)?(\\d\\d)(-)?(\\d\\d)(T)?(\\d\\d)(:)?(\\d\\d)(:)?(\\d\\d)(\\.\\d+)?(Z|([+-])(\\d\\d)(:)?(\\d\\d))?"},"eTag":{"type":"string"},"hitCount":{"type":"integer"},"comment":{"type":"string"}}}
+
+/***/ }),
+/* 658 */
+/***/ (function(module, exports) {
+
+module.exports = {"$id":"beforeRequest.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","optional":true,"required":["lastAccess","eTag","hitCount"],"properties":{"expires":{"type":"string","pattern":"^(\\d{4})(-)?(\\d\\d)(-)?(\\d\\d)(T)?(\\d\\d)(:)?(\\d\\d)(:)?(\\d\\d)(\\.\\d+)?(Z|([+-])(\\d\\d)(:)?(\\d\\d))?"},"lastAccess":{"type":"string","pattern":"^(\\d{4})(-)?(\\d\\d)(-)?(\\d\\d)(T)?(\\d\\d)(:)?(\\d\\d)(:)?(\\d\\d)(\\.\\d+)?(Z|([+-])(\\d\\d)(:)?(\\d\\d))?"},"eTag":{"type":"string"},"hitCount":{"type":"integer"},"comment":{"type":"string"}}}
+
+/***/ }),
+/* 659 */
+/***/ (function(module, exports) {
+
+module.exports = {"$id":"browser.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","required":["name","version"],"properties":{"name":{"type":"string"},"version":{"type":"string"},"comment":{"type":"string"}}}
+
+/***/ }),
+/* 660 */
+/***/ (function(module, exports) {
+
+module.exports = {"$id":"cache.json#","$schema":"http://json-schema.org/draft-06/schema#","properties":{"beforeRequest":{"oneOf":[{"type":"null"},{"$ref":"beforeRequest.json#"}]},"afterRequest":{"oneOf":[{"type":"null"},{"$ref":"afterRequest.json#"}]},"comment":{"type":"string"}}}
+
+/***/ }),
+/* 661 */
+/***/ (function(module, exports) {
+
+module.exports = {"$id":"content.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","required":["size","mimeType"],"properties":{"size":{"type":"integer"},"compression":{"type":"integer"},"mimeType":{"type":"string"},"text":{"type":"string"},"encoding":{"type":"string"},"comment":{"type":"string"}}}
+
+/***/ }),
+/* 662 */
+/***/ (function(module, exports) {
+
+module.exports = {"$id":"cookie.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","required":["name","value"],"properties":{"name":{"type":"string"},"value":{"type":"string"},"path":{"type":"string"},"domain":{"type":"string"},"expires":{"type":["string","null"],"format":"date-time"},"httpOnly":{"type":"boolean"},"secure":{"type":"boolean"},"comment":{"type":"string"}}}
+
+/***/ }),
+/* 663 */
+/***/ (function(module, exports) {
+
+module.exports = {"$id":"creator.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","required":["name","version"],"properties":{"name":{"type":"string"},"version":{"type":"string"},"comment":{"type":"string"}}}
+
+/***/ }),
+/* 664 */
+/***/ (function(module, exports) {
+
+module.exports = {"$id":"entry.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","optional":true,"required":["startedDateTime","time","request","response","cache","timings"],"properties":{"pageref":{"type":"string"},"startedDateTime":{"type":"string","format":"date-time","pattern":"^(\\d{4})(-)?(\\d\\d)(-)?(\\d\\d)(T)?(\\d\\d)(:)?(\\d\\d)(:)?(\\d\\d)(\\.\\d+)?(Z|([+-])(\\d\\d)(:)?(\\d\\d))"},"time":{"type":"number","min":0},"request":{"$ref":"request.json#"},"response":{"$ref":"response.json#"},"cache":{"$ref":"cache.json#"},"timings":{"$ref":"timings.json#"},"serverIPAddress":{"type":"string","oneOf":[{"format":"ipv4"},{"format":"ipv6"}]},"connection":{"type":"string"},"comment":{"type":"string"}}}
+
+/***/ }),
+/* 665 */
+/***/ (function(module, exports) {
+
+module.exports = {"$id":"har.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","required":["log"],"properties":{"log":{"$ref":"log.json#"}}}
+
+/***/ }),
+/* 666 */
+/***/ (function(module, exports) {
+
+module.exports = {"$id":"header.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","required":["name","value"],"properties":{"name":{"type":"string"},"value":{"type":"string"},"comment":{"type":"string"}}}
+
+/***/ }),
+/* 667 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+module.exports = {
+  afterRequest: __webpack_require__(657),
+  beforeRequest: __webpack_require__(658),
+  browser: __webpack_require__(659),
+  cache: __webpack_require__(660),
+  content: __webpack_require__(661),
+  cookie: __webpack_require__(662),
+  creator: __webpack_require__(663),
+  entry: __webpack_require__(664),
+  har: __webpack_require__(665),
+  header: __webpack_require__(666),
+  log: __webpack_require__(668),
+  page: __webpack_require__(669),
+  pageTimings: __webpack_require__(670),
+  postData: __webpack_require__(671),
+  query: __webpack_require__(672),
+  request: __webpack_require__(673),
+  response: __webpack_require__(674),
+  timings: __webpack_require__(675)
+}
+
+
+/***/ }),
+/* 668 */
+/***/ (function(module, exports) {
+
+module.exports = {"$id":"log.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","required":["version","creator","entries"],"properties":{"version":{"type":"string"},"creator":{"$ref":"creator.json#"},"browser":{"$ref":"browser.json#"},"pages":{"type":"array","items":{"$ref":"page.json#"}},"entries":{"type":"array","items":{"$ref":"entry.json#"}},"comment":{"type":"string"}}}
+
+/***/ }),
+/* 669 */
+/***/ (function(module, exports) {
+
+module.exports = {"$id":"page.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","optional":true,"required":["startedDateTime","id","title","pageTimings"],"properties":{"startedDateTime":{"type":"string","format":"date-time","pattern":"^(\\d{4})(-)?(\\d\\d)(-)?(\\d\\d)(T)?(\\d\\d)(:)?(\\d\\d)(:)?(\\d\\d)(\\.\\d+)?(Z|([+-])(\\d\\d)(:)?(\\d\\d))"},"id":{"type":"string","unique":true},"title":{"type":"string"},"pageTimings":{"$ref":"pageTimings.json#"},"comment":{"type":"string"}}}
+
+/***/ }),
+/* 670 */
+/***/ (function(module, exports) {
+
+module.exports = {"$id":"pageTimings.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","properties":{"onContentLoad":{"type":"number","min":-1},"onLoad":{"type":"number","min":-1},"comment":{"type":"string"}}}
+
+/***/ }),
+/* 671 */
+/***/ (function(module, exports) {
+
+module.exports = {"$id":"postData.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","optional":true,"required":["mimeType"],"properties":{"mimeType":{"type":"string"},"text":{"type":"string"},"params":{"type":"array","required":["name"],"properties":{"name":{"type":"string"},"value":{"type":"string"},"fileName":{"type":"string"},"contentType":{"type":"string"},"comment":{"type":"string"}}},"comment":{"type":"string"}}}
+
+/***/ }),
+/* 672 */
+/***/ (function(module, exports) {
+
+module.exports = {"$id":"query.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","required":["name","value"],"properties":{"name":{"type":"string"},"value":{"type":"string"},"comment":{"type":"string"}}}
+
+/***/ }),
+/* 673 */
+/***/ (function(module, exports) {
+
+module.exports = {"$id":"request.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","required":["method","url","httpVersion","cookies","headers","queryString","headersSize","bodySize"],"properties":{"method":{"type":"string"},"url":{"type":"string","format":"uri"},"httpVersion":{"type":"string"},"cookies":{"type":"array","items":{"$ref":"cookie.json#"}},"headers":{"type":"array","items":{"$ref":"header.json#"}},"queryString":{"type":"array","items":{"$ref":"query.json#"}},"postData":{"$ref":"postData.json#"},"headersSize":{"type":"integer"},"bodySize":{"type":"integer"},"comment":{"type":"string"}}}
+
+/***/ }),
+/* 674 */
+/***/ (function(module, exports) {
+
+module.exports = {"$id":"response.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","required":["status","statusText","httpVersion","cookies","headers","content","redirectURL","headersSize","bodySize"],"properties":{"status":{"type":"integer"},"statusText":{"type":"string"},"httpVersion":{"type":"string"},"cookies":{"type":"array","items":{"$ref":"cookie.json#"}},"headers":{"type":"array","items":{"$ref":"header.json#"}},"content":{"$ref":"content.json#"},"redirectURL":{"type":"string"},"headersSize":{"type":"integer"},"bodySize":{"type":"integer"},"comment":{"type":"string"}}}
+
+/***/ }),
+/* 675 */
+/***/ (function(module, exports) {
+
+module.exports = {"$id":"timings.json#","$schema":"http://json-schema.org/draft-06/schema#","required":["send","wait","receive"],"properties":{"dns":{"type":"number","min":-1},"connect":{"type":"number","min":-1},"blocked":{"type":"number","min":-1},"send":{"type":"number","min":-1},"wait":{"type":"number","min":-1},"receive":{"type":"number","min":-1},"ssl":{"type":"number","min":-1},"comment":{"type":"string"}}}
+
+/***/ }),
+/* 676 */
+/***/ (function(module, exports) {
+
+function HARError (errors) {
+  var message = 'validation failed'
+
+  this.name = 'HARError'
+  this.message = message
+  this.errors = errors
+
+  if (typeof Error.captureStackTrace === 'function') {
+    Error.captureStackTrace(this, this.constructor)
+  } else {
+    this.stack = (new Error(message)).stack
+  }
+}
+
+HARError.prototype = Error.prototype
+
+module.exports = HARError
+
+
+/***/ }),
+/* 677 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var Ajv = __webpack_require__(473)
+var HARError = __webpack_require__(676)
+var schemas = __webpack_require__(667)
+
+var ajv
+
+function validate (name, data) {
+  data = data || {}
+
+  // validator config
+  ajv = ajv || new Ajv({
+    allErrors: true,
+    schemas: schemas
+  })
+
+  var validate = ajv.getSchema(name + '.json')
+
+  return new Promise(function (resolve, reject) {
+    var valid = validate(data)
+
+    !valid ? reject(new HARError(validate.errors)) : resolve(data)
+  })
+}
+
+exports.afterRequest = function (data) {
+  return validate('afterRequest', data)
+}
+
+exports.beforeRequest = function (data) {
+  return validate('beforeRequest', data)
+}
+
+exports.browser = function (data) {
+  return validate('browser', data)
+}
+
+exports.cache = function (data) {
+  return validate('cache', data)
+}
+
+exports.content = function (data) {
+  return validate('content', data)
+}
+
+exports.cookie = function (data) {
+  return validate('cookie', data)
+}
+
+exports.creator = function (data) {
+  return validate('creator', data)
+}
+
+exports.entry = function (data) {
+  return validate('entry', data)
+}
+
+exports.har = function (data) {
+  return validate('har', data)
+}
+
+exports.header = function (data) {
+  return validate('header', data)
+}
+
+exports.log = function (data) {
+  return validate('log', data)
+}
+
+exports.page = function (data) {
+  return validate('page', data)
+}
+
+exports.pageTimings = function (data) {
+  return validate('pageTimings', data)
+}
+
+exports.postData = function (data) {
+  return validate('postData', data)
+}
+
+exports.query = function (data) {
+  return validate('query', data)
+}
+
+exports.request = function (data) {
+  return validate('request', data)
+}
+
+exports.response = function (data) {
+  return validate('response', data)
+}
+
+exports.timings = function (data) {
+  return validate('timings', data)
+}
+
+
+/***/ }),
+/* 678 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var pkg = __webpack_require__(944);
+
+/* @private
+ *
+ * constructs a set of all dependencies recursively
+ *
+ * @method depsFor
+ * @param {String} name of package to assemble unique deps for
+ * @param {String} dir (optional) path to begin resolving from
+ * @return {Array} a unique set of all deps
+ */
+module.exports = function depsFor(name, dir) {
+  var dependencies = [];
+  var visited = Object.create(null);
+
+  (function again(name, dir) {
+    var thePackage = pkg(name, dir);
+
+    if (thePackage === null) { return; }
+
+    var key = thePackage.name + thePackage.version + thePackage.baseDir;
+
+    if (visited[key]) { return; }
+    visited[key] = true;
+
+    dependencies.push(thePackage);
+
+    return Object.keys(thePackage.dependencies || {}).forEach(function(dep) {
+      again(dep, thePackage.baseDir);
+    });
+  }(name, dir));
+
+  return dependencies;
+};
+
+
+
+/***/ }),
+/* 679 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var resolve = __webpack_require__(814);
+var path = __webpack_require__(0);
+
+/* @private
+ *
+ * @method resolvePkg
+ * @param {String} name
+ * @param {String} dir
+ * @return {String}
+ */
+module.exports = function resolvePkg(name, dir) {
+  if (name === './') {
+    return path.resolve(name, 'package.json');
+  }
+
+  if (name[name.length - 1] !== '/') {
+    name += '/';
+  }
+
+  if (name.charAt(0) === '/') {
+    return name + 'package.json';
+  }
+
+  try {
+    return resolve.sync(name + 'package.json', {
+      basedir: dir || __dirname,
+      preserveSymlinks: false
+    });
+  } catch(err) {
+    if (err.code === 'MODULE_NOT_FOUND') {
+      return null;
+    }
+
+    throw err;
+  }
+};
+
+
+/***/ }),
+/* 680 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// Copyright 2015 Joyent, Inc.
+
+var parser = __webpack_require__(681);
+var signer = __webpack_require__(682);
+var verify = __webpack_require__(683);
+var utils = __webpack_require__(174);
+
+
+
+///--- API
+
+module.exports = {
+
+  parse: parser.parseRequest,
+  parseRequest: parser.parseRequest,
+
+  sign: signer.signRequest,
+  signRequest: signer.signRequest,
+  createSigner: signer.createSigner,
+  isSigner: signer.isSigner,
+
+  sshKeyToPEM: utils.sshKeyToPEM,
+  sshKeyFingerprint: utils.fingerprint,
+  pemToRsaSSHKey: utils.pemToRsaSSHKey,
+
+  verify: verify.verifySignature,
+  verifySignature: verify.verifySignature,
+  verifyHMAC: verify.verifyHMAC
+};
+
+
+/***/ }),
+/* 681 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// Copyright 2012 Joyent, Inc.  All rights reserved.
+
+var assert = __webpack_require__(16);
+var util = __webpack_require__(3);
+var utils = __webpack_require__(174);
+
+
+
+///--- Globals
+
+var HASH_ALGOS = utils.HASH_ALGOS;
+var PK_ALGOS = utils.PK_ALGOS;
+var HttpSignatureError = utils.HttpSignatureError;
+var InvalidAlgorithmError = utils.InvalidAlgorithmError;
+var validateAlgorithm = utils.validateAlgorithm;
+
+var State = {
+  New: 0,
+  Params: 1
+};
+
+var ParamsState = {
+  Name: 0,
+  Quote: 1,
+  Value: 2,
+  Comma: 3
+};
+
+
+///--- Specific Errors
+
+
+function ExpiredRequestError(message) {
+  HttpSignatureError.call(this, message, ExpiredRequestError);
+}
+util.inherits(ExpiredRequestError, HttpSignatureError);
+
+
+function InvalidHeaderError(message) {
+  HttpSignatureError.call(this, message, InvalidHeaderError);
+}
+util.inherits(InvalidHeaderError, HttpSignatureError);
+
+
+function InvalidParamsError(message) {
+  HttpSignatureError.call(this, message, InvalidParamsError);
+}
+util.inherits(InvalidParamsError, HttpSignatureError);
+
+
+function MissingHeaderError(message) {
+  HttpSignatureError.call(this, message, MissingHeaderError);
+}
+util.inherits(MissingHeaderError, HttpSignatureError);
+
+function StrictParsingError(message) {
+  HttpSignatureError.call(this, message, StrictParsingError);
+}
+util.inherits(StrictParsingError, HttpSignatureError);
+
+///--- Exported API
+
+module.exports = {
+
+  /**
+   * Parses the 'Authorization' header out of an http.ServerRequest object.
+   *
+   * Note that this API will fully validate the Authorization header, and throw
+   * on any error.  It will not however check the signature, or the keyId format
+   * as those are specific to your environment.  You can use the options object
+   * to pass in extra constraints.
+   *
+   * As a response object you can expect this:
+   *
+   *     {
+   *       "scheme": "Signature",
+   *       "params": {
+   *         "keyId": "foo",
+   *         "algorithm": "rsa-sha256",
+   *         "headers": [
+   *           "date" or "x-date",
+   *           "digest"
+   *         ],
+   *         "signature": "base64"
+   *       },
+   *       "signingString": "ready to be passed to crypto.verify()"
+   *     }
+   *
+   * @param {Object} request an http.ServerRequest.
+   * @param {Object} options an optional options object with:
+   *                   - clockSkew: allowed clock skew in seconds (default 300).
+   *                   - headers: required header names (def: date or x-date)
+   *                   - algorithms: algorithms to support (default: all).
+   *                   - strict: should enforce latest spec parsing
+   *                             (default: false).
+   * @return {Object} parsed out object (see above).
+   * @throws {TypeError} on invalid input.
+   * @throws {InvalidHeaderError} on an invalid Authorization header error.
+   * @throws {InvalidParamsError} if the params in the scheme are invalid.
+   * @throws {MissingHeaderError} if the params indicate a header not present,
+   *                              either in the request headers from the params,
+   *                              or not in the params from a required header
+   *                              in options.
+   * @throws {StrictParsingError} if old attributes are used in strict parsing
+   *                              mode.
+   * @throws {ExpiredRequestError} if the value of date or x-date exceeds skew.
+   */
+  parseRequest: function parseRequest(request, options) {
+    assert.object(request, 'request');
+    assert.object(request.headers, 'request.headers');
+    if (options === undefined) {
+      options = {};
+    }
+    if (options.headers === undefined) {
+      options.headers = [request.headers['x-date'] ? 'x-date' : 'date'];
+    }
+    assert.object(options, 'options');
+    assert.arrayOfString(options.headers, 'options.headers');
+    assert.optionalFinite(options.clockSkew, 'options.clockSkew');
+
+    var authzHeaderName = options.authorizationHeaderName || 'authorization';
+
+    if (!request.headers[authzHeaderName]) {
+      throw new MissingHeaderError('no ' + authzHeaderName + ' header ' +
+                                   'present in the request');
+    }
+
+    options.clockSkew = options.clockSkew || 300;
+
+
+    var i = 0;
+    var state = State.New;
+    var substate = ParamsState.Name;
+    var tmpName = '';
+    var tmpValue = '';
+
+    var parsed = {
+      scheme: '',
+      params: {},
+      signingString: ''
+    };
+
+    var authz = request.headers[authzHeaderName];
+    for (i = 0; i < authz.length; i++) {
+      var c = authz.charAt(i);
+
+      switch (Number(state)) {
+
+      case State.New:
+        if (c !== ' ') parsed.scheme += c;
+        else state = State.Params;
+        break;
+
+      case State.Params:
+        switch (Number(substate)) {
+
+        case ParamsState.Name:
+          var code = c.charCodeAt(0);
+          // restricted name of A-Z / a-z
+          if ((code >= 0x41 && code <= 0x5a) || // A-Z
+              (code >= 0x61 && code <= 0x7a)) { // a-z
+            tmpName += c;
+          } else if (c === '=') {
+            if (tmpName.length === 0)
+              throw new InvalidHeaderError('bad param format');
+            substate = ParamsState.Quote;
+          } else {
+            throw new InvalidHeaderError('bad param format');
+          }
+          break;
+
+        case ParamsState.Quote:
+          if (c === '"') {
+            tmpValue = '';
+            substate = ParamsState.Value;
+          } else {
+            throw new InvalidHeaderError('bad param format');
+          }
+          break;
+
+        case ParamsState.Value:
+          if (c === '"') {
+            parsed.params[tmpName] = tmpValue;
+            substate = ParamsState.Comma;
+          } else {
+            tmpValue += c;
+          }
+          break;
+
+        case ParamsState.Comma:
+          if (c === ',') {
+            tmpName = '';
+            substate = ParamsState.Name;
+          } else {
+            throw new InvalidHeaderError('bad param format');
+          }
+          break;
+
+        default:
+          throw new Error('Invalid substate');
+        }
+        break;
+
+      default:
+        throw new Error('Invalid substate');
+      }
+
+    }
+
+    if (!parsed.params.headers || parsed.params.headers === '') {
+      if (request.headers['x-date']) {
+        parsed.params.headers = ['x-date'];
+      } else {
+        parsed.params.headers = ['date'];
+      }
+    } else {
+      parsed.params.headers = parsed.params.headers.split(' ');
+    }
+
+    // Minimally validate the parsed object
+    if (!parsed.scheme || parsed.scheme !== 'Signature')
+      throw new InvalidHeaderError('scheme was not "Signature"');
+
+    if (!parsed.params.keyId)
+      throw new InvalidHeaderError('keyId was not specified');
+
+    if (!parsed.params.algorithm)
+      throw new InvalidHeaderError('algorithm was not specified');
+
+    if (!parsed.params.signature)
+      throw new InvalidHeaderError('signature was not specified');
+
+    // Check the algorithm against the official list
+    parsed.params.algorithm = parsed.params.algorithm.toLowerCase();
+    try {
+      validateAlgorithm(parsed.params.algorithm);
+    } catch (e) {
+      if (e instanceof InvalidAlgorithmError)
+        throw (new InvalidParamsError(parsed.params.algorithm + ' is not ' +
+          'supported'));
+      else
+        throw (e);
+    }
+
+    // Build the signingString
+    for (i = 0; i < parsed.params.headers.length; i++) {
+      var h = parsed.params.headers[i].toLowerCase();
+      parsed.params.headers[i] = h;
+
+      if (h === 'request-line') {
+        if (!options.strict) {
+          /*
+           * We allow headers from the older spec drafts if strict parsing isn't
+           * specified in options.
+           */
+          parsed.signingString +=
+            request.method + ' ' + request.url + ' HTTP/' + request.httpVersion;
+        } else {
+          /* Strict parsing doesn't allow older draft headers. */
+          throw (new StrictParsingError('request-line is not a valid header ' +
+            'with strict parsing enabled.'));
+        }
+      } else if (h === '(request-target)') {
+        parsed.signingString +=
+          '(request-target): ' + request.method.toLowerCase() + ' ' +
+          request.url;
+      } else {
+        var value = request.headers[h];
+        if (value === undefined)
+          throw new MissingHeaderError(h + ' was not in the request');
+        parsed.signingString += h + ': ' + value;
+      }
+
+      if ((i + 1) < parsed.params.headers.length)
+        parsed.signingString += '\n';
+    }
+
+    // Check against the constraints
+    var date;
+    if (request.headers.date || request.headers['x-date']) {
+        if (request.headers['x-date']) {
+          date = new Date(request.headers['x-date']);
+        } else {
+          date = new Date(request.headers.date);
+        }
+      var now = new Date();
+      var skew = Math.abs(now.getTime() - date.getTime());
+
+      if (skew > options.clockSkew * 1000) {
+        throw new ExpiredRequestError('clock skew of ' +
+                                      (skew / 1000) +
+                                      's was greater than ' +
+                                      options.clockSkew + 's');
+      }
+    }
+
+    options.headers.forEach(function (hdr) {
+      // Remember that we already checked any headers in the params
+      // were in the request, so if this passes we're good.
+      if (parsed.params.headers.indexOf(hdr.toLowerCase()) < 0)
+        throw new MissingHeaderError(hdr + ' was not a signed header');
+    });
+
+    if (options.algorithms) {
+      if (options.algorithms.indexOf(parsed.params.algorithm) === -1)
+        throw new InvalidParamsError(parsed.params.algorithm +
+                                     ' is not a supported algorithm');
+    }
+
+    parsed.algorithm = parsed.params.algorithm.toUpperCase();
+    parsed.keyId = parsed.params.keyId;
+    return parsed;
+  }
+
+};
+
+
+/***/ }),
+/* 682 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// Copyright 2012 Joyent, Inc.  All rights reserved.
+
+var assert = __webpack_require__(16);
+var crypto = __webpack_require__(11);
+var http = __webpack_require__(87);
+var util = __webpack_require__(3);
+var sshpk = __webpack_require__(328);
+var jsprim = __webpack_require__(746);
+var utils = __webpack_require__(174);
+
+var sprintf = __webpack_require__(3).format;
+
+var HASH_ALGOS = utils.HASH_ALGOS;
+var PK_ALGOS = utils.PK_ALGOS;
+var InvalidAlgorithmError = utils.InvalidAlgorithmError;
+var HttpSignatureError = utils.HttpSignatureError;
+var validateAlgorithm = utils.validateAlgorithm;
+
+///--- Globals
+
+var AUTHZ_FMT =
+  'Signature keyId="%s",algorithm="%s",headers="%s",signature="%s"';
+
+///--- Specific Errors
+
+function MissingHeaderError(message) {
+  HttpSignatureError.call(this, message, MissingHeaderError);
+}
+util.inherits(MissingHeaderError, HttpSignatureError);
+
+function StrictParsingError(message) {
+  HttpSignatureError.call(this, message, StrictParsingError);
+}
+util.inherits(StrictParsingError, HttpSignatureError);
+
+/* See createSigner() */
+function RequestSigner(options) {
+  assert.object(options, 'options');
+
+  var alg = [];
+  if (options.algorithm !== undefined) {
+    assert.string(options.algorithm, 'options.algorithm');
+    alg = validateAlgorithm(options.algorithm);
+  }
+  this.rs_alg = alg;
+
+  /*
+   * RequestSigners come in two varieties: ones with an rs_signFunc, and ones
+   * with an rs_signer.
+   *
+   * rs_signFunc-based RequestSigners have to build up their entire signing
+   * string within the rs_lines array and give it to rs_signFunc as a single
+   * concat'd blob. rs_signer-based RequestSigners can add a line at a time to
+   * their signing state by using rs_signer.update(), thus only needing to
+   * buffer the hash function state and one line at a time.
+   */
+  if (options.sign !== undefined) {
+    assert.func(options.sign, 'options.sign');
+    this.rs_signFunc = options.sign;
+
+  } else if (alg[0] === 'hmac' && options.key !== undefined) {
+    assert.string(options.keyId, 'options.keyId');
+    this.rs_keyId = options.keyId;
+
+    if (typeof (options.key) !== 'string' && !Buffer.isBuffer(options.key))
+      throw (new TypeError('options.key for HMAC must be a string or Buffer'));
+
+    /*
+     * Make an rs_signer for HMACs, not a rs_signFunc -- HMACs digest their
+     * data in chunks rather than requiring it all to be given in one go
+     * at the end, so they are more similar to signers than signFuncs.
+     */
+    this.rs_signer = crypto.createHmac(alg[1].toUpperCase(), options.key);
+    this.rs_signer.sign = function () {
+      var digest = this.digest('base64');
+      return ({
+        hashAlgorithm: alg[1],
+        toString: function () { return (digest); }
+      });
+    };
+
+  } else if (options.key !== undefined) {
+    var key = options.key;
+    if (typeof (key) === 'string' || Buffer.isBuffer(key))
+      key = sshpk.parsePrivateKey(key);
+
+    assert.ok(sshpk.PrivateKey.isPrivateKey(key, [1, 2]),
+      'options.key must be a sshpk.PrivateKey');
+    this.rs_key = key;
+
+    assert.string(options.keyId, 'options.keyId');
+    this.rs_keyId = options.keyId;
+
+    if (!PK_ALGOS[key.type]) {
+      throw (new InvalidAlgorithmError(key.type.toUpperCase() + ' type ' +
+        'keys are not supported'));
+    }
+
+    if (alg[0] !== undefined && key.type !== alg[0]) {
+      throw (new InvalidAlgorithmError('options.key must be a ' +
+        alg[0].toUpperCase() + ' key, was given a ' +
+        key.type.toUpperCase() + ' key instead'));
+    }
+
+    this.rs_signer = key.createSign(alg[1]);
+
+  } else {
+    throw (new TypeError('options.sign (func) or options.key is required'));
+  }
+
+  this.rs_headers = [];
+  this.rs_lines = [];
+}
+
+/**
+ * Adds a header to be signed, with its value, into this signer.
+ *
+ * @param {String} header
+ * @param {String} value
+ * @return {String} value written
+ */
+RequestSigner.prototype.writeHeader = function (header, value) {
+  assert.string(header, 'header');
+  header = header.toLowerCase();
+  assert.string(value, 'value');
+
+  this.rs_headers.push(header);
+
+  if (this.rs_signFunc) {
+    this.rs_lines.push(header + ': ' + value);
+
+  } else {
+    var line = header + ': ' + value;
+    if (this.rs_headers.length > 0)
+      line = '\n' + line;
+    this.rs_signer.update(line);
+  }
+
+  return (value);
+};
+
+/**
+ * Adds a default Date header, returning its value.
+ *
+ * @return {String}
+ */
+RequestSigner.prototype.writeDateHeader = function () {
+  return (this.writeHeader('date', jsprim.rfc1123(new Date())));
+};
+
+/**
+ * Adds the request target line to be signed.
+ *
+ * @param {String} method, HTTP method (e.g. 'get', 'post', 'put')
+ * @param {String} path
+ */
+RequestSigner.prototype.writeTarget = function (method, path) {
+  assert.string(method, 'method');
+  assert.string(path, 'path');
+  method = method.toLowerCase();
+  this.writeHeader('(request-target)', method + ' ' + path);
+};
+
+/**
+ * Calculate the value for the Authorization header on this request
+ * asynchronously.
+ *
+ * @param {Func} callback (err, authz)
+ */
+RequestSigner.prototype.sign = function (cb) {
+  assert.func(cb, 'callback');
+
+  if (this.rs_headers.length < 1)
+    throw (new Error('At least one header must be signed'));
+
+  var alg, authz;
+  if (this.rs_signFunc) {
+    var data = this.rs_lines.join('\n');
+    var self = this;
+    this.rs_signFunc(data, function (err, sig) {
+      if (err) {
+        cb(err);
+        return;
+      }
+      try {
+        assert.object(sig, 'signature');
+        assert.string(sig.keyId, 'signature.keyId');
+        assert.string(sig.algorithm, 'signature.algorithm');
+        assert.string(sig.signature, 'signature.signature');
+        alg = validateAlgorithm(sig.algorithm);
+
+        authz = sprintf(AUTHZ_FMT,
+          sig.keyId,
+          sig.algorithm,
+          self.rs_headers.join(' '),
+          sig.signature);
+      } catch (e) {
+        cb(e);
+        return;
+      }
+      cb(null, authz);
+    });
+
+  } else {
+    try {
+      var sigObj = this.rs_signer.sign();
+    } catch (e) {
+      cb(e);
+      return;
+    }
+    alg = (this.rs_alg[0] || this.rs_key.type) + '-' + sigObj.hashAlgorithm;
+    var signature = sigObj.toString();
+    authz = sprintf(AUTHZ_FMT,
+      this.rs_keyId,
+      alg,
+      this.rs_headers.join(' '),
+      signature);
+    cb(null, authz);
+  }
+};
+
+///--- Exported API
+
+module.exports = {
+  /**
+   * Identifies whether a given object is a request signer or not.
+   *
+   * @param {Object} object, the object to identify
+   * @returns {Boolean}
+   */
+  isSigner: function (obj) {
+    if (typeof (obj) === 'object' && obj instanceof RequestSigner)
+      return (true);
+    return (false);
+  },
+
+  /**
+   * Creates a request signer, used to asynchronously build a signature
+   * for a request (does not have to be an http.ClientRequest).
+   *
+   * @param {Object} options, either:
+   *                   - {String} keyId
+   *                   - {String|Buffer} key
+   *                   - {String} algorithm (optional, required for HMAC)
+   *                 or:
+   *                   - {Func} sign (data, cb)
+   * @return {RequestSigner}
+   */
+  createSigner: function createSigner(options) {
+    return (new RequestSigner(options));
+  },
+
+  /**
+   * Adds an 'Authorization' header to an http.ClientRequest object.
+   *
+   * Note that this API will add a Date header if it's not already set. Any
+   * other headers in the options.headers array MUST be present, or this
+   * will throw.
+   *
+   * You shouldn't need to check the return type; it's just there if you want
+   * to be pedantic.
+   *
+   * The optional flag indicates whether parsing should use strict enforcement
+   * of the version draft-cavage-http-signatures-04 of the spec or beyond.
+   * The default is to be loose and support
+   * older versions for compatibility.
+   *
+   * @param {Object} request an instance of http.ClientRequest.
+   * @param {Object} options signing parameters object:
+   *                   - {String} keyId required.
+   *                   - {String} key required (either a PEM or HMAC key).
+   *                   - {Array} headers optional; defaults to ['date'].
+   *                   - {String} algorithm optional (unless key is HMAC);
+   *                              default is the same as the sshpk default
+   *                              signing algorithm for the type of key given
+   *                   - {String} httpVersion optional; defaults to '1.1'.
+   *                   - {Boolean} strict optional; defaults to 'false'.
+   * @return {Boolean} true if Authorization (and optionally Date) were added.
+   * @throws {TypeError} on bad parameter types (input).
+   * @throws {InvalidAlgorithmError} if algorithm was bad or incompatible with
+   *                                 the given key.
+   * @throws {sshpk.KeyParseError} if key was bad.
+   * @throws {MissingHeaderError} if a header to be signed was specified but
+   *                              was not present.
+   */
+  signRequest: function signRequest(request, options) {
+    assert.object(request, 'request');
+    assert.object(options, 'options');
+    assert.optionalString(options.algorithm, 'options.algorithm');
+    assert.string(options.keyId, 'options.keyId');
+    assert.optionalArrayOfString(options.headers, 'options.headers');
+    assert.optionalString(options.httpVersion, 'options.httpVersion');
+
+    if (!request.getHeader('Date'))
+      request.setHeader('Date', jsprim.rfc1123(new Date()));
+    if (!options.headers)
+      options.headers = ['date'];
+    if (!options.httpVersion)
+      options.httpVersion = '1.1';
+
+    var alg = [];
+    if (options.algorithm) {
+      options.algorithm = options.algorithm.toLowerCase();
+      alg = validateAlgorithm(options.algorithm);
+    }
+
+    var i;
+    var stringToSign = '';
+    for (i = 0; i < options.headers.length; i++) {
+      if (typeof (options.headers[i]) !== 'string')
+        throw new TypeError('options.headers must be an array of Strings');
+
+      var h = options.headers[i].toLowerCase();
+
+      if (h === 'request-line') {
+        if (!options.strict) {
+          /**
+           * We allow headers from the older spec drafts if strict parsing isn't
+           * specified in options.
+           */
+          stringToSign +=
+            request.method + ' ' + request.path + ' HTTP/' +
+            options.httpVersion;
+        } else {
+          /* Strict parsing doesn't allow older draft headers. */
+          throw (new StrictParsingError('request-line is not a valid header ' +
+            'with strict parsing enabled.'));
+        }
+      } else if (h === '(request-target)') {
+        stringToSign +=
+          '(request-target): ' + request.method.toLowerCase() + ' ' +
+          request.path;
+      } else {
+        var value = request.getHeader(h);
+        if (value === undefined || value === '') {
+          throw new MissingHeaderError(h + ' was not in the request');
+        }
+        stringToSign += h + ': ' + value;
+      }
+
+      if ((i + 1) < options.headers.length)
+        stringToSign += '\n';
+    }
+
+    /* This is just for unit tests. */
+    if (request.hasOwnProperty('_stringToSign')) {
+      request._stringToSign = stringToSign;
+    }
+
+    var signature;
+    if (alg[0] === 'hmac') {
+      if (typeof (options.key) !== 'string' && !Buffer.isBuffer(options.key))
+        throw (new TypeError('options.key must be a string or Buffer'));
+
+      var hmac = crypto.createHmac(alg[1].toUpperCase(), options.key);
+      hmac.update(stringToSign);
+      signature = hmac.digest('base64');
+
+    } else {
+      var key = options.key;
+      if (typeof (key) === 'string' || Buffer.isBuffer(key))
+        key = sshpk.parsePrivateKey(options.key);
+
+      assert.ok(sshpk.PrivateKey.isPrivateKey(key, [1, 2]),
+        'options.key must be a sshpk.PrivateKey');
+
+      if (!PK_ALGOS[key.type]) {
+        throw (new InvalidAlgorithmError(key.type.toUpperCase() + ' type ' +
+          'keys are not supported'));
+      }
+
+      if (alg[0] !== undefined && key.type !== alg[0]) {
+        throw (new InvalidAlgorithmError('options.key must be a ' +
+          alg[0].toUpperCase() + ' key, was given a ' +
+          key.type.toUpperCase() + ' key instead'));
+      }
+
+      var signer = key.createSign(alg[1]);
+      signer.update(stringToSign);
+      var sigObj = signer.sign();
+      if (!HASH_ALGOS[sigObj.hashAlgorithm]) {
+        throw (new InvalidAlgorithmError(sigObj.hashAlgorithm.toUpperCase() +
+          ' is not a supported hash algorithm'));
+      }
+      options.algorithm = key.type + '-' + sigObj.hashAlgorithm;
+      signature = sigObj.toString();
+      assert.notStrictEqual(signature, '', 'empty signature produced');
+    }
+
+    var authzHeaderName = options.authorizationHeaderName || 'Authorization';
+
+    request.setHeader(authzHeaderName, sprintf(AUTHZ_FMT,
+                                               options.keyId,
+                                               options.algorithm,
+                                               options.headers.join(' '),
+                                               signature));
+
+    return true;
+  }
+
+};
+
+
+/***/ }),
+/* 683 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// Copyright 2015 Joyent, Inc.
+
+var assert = __webpack_require__(16);
+var crypto = __webpack_require__(11);
+var sshpk = __webpack_require__(328);
+var utils = __webpack_require__(174);
+
+var HASH_ALGOS = utils.HASH_ALGOS;
+var PK_ALGOS = utils.PK_ALGOS;
+var InvalidAlgorithmError = utils.InvalidAlgorithmError;
+var HttpSignatureError = utils.HttpSignatureError;
+var validateAlgorithm = utils.validateAlgorithm;
+
+///--- Exported API
+
+module.exports = {
+  /**
+   * Verify RSA/DSA signature against public key.  You are expected to pass in
+   * an object that was returned from `parse()`.
+   *
+   * @param {Object} parsedSignature the object you got from `parse`.
+   * @param {String} pubkey RSA/DSA private key PEM.
+   * @return {Boolean} true if valid, false otherwise.
+   * @throws {TypeError} if you pass in bad arguments.
+   * @throws {InvalidAlgorithmError}
+   */
+  verifySignature: function verifySignature(parsedSignature, pubkey) {
+    assert.object(parsedSignature, 'parsedSignature');
+    if (typeof (pubkey) === 'string' || Buffer.isBuffer(pubkey))
+      pubkey = sshpk.parseKey(pubkey);
+    assert.ok(sshpk.Key.isKey(pubkey, [1, 1]), 'pubkey must be a sshpk.Key');
+
+    var alg = validateAlgorithm(parsedSignature.algorithm);
+    if (alg[0] === 'hmac' || alg[0] !== pubkey.type)
+      return (false);
+
+    var v = pubkey.createVerify(alg[1]);
+    v.update(parsedSignature.signingString);
+    return (v.verify(parsedSignature.params.signature, 'base64'));
+  },
+
+  /**
+   * Verify HMAC against shared secret.  You are expected to pass in an object
+   * that was returned from `parse()`.
+   *
+   * @param {Object} parsedSignature the object you got from `parse`.
+   * @param {String} secret HMAC shared secret.
+   * @return {Boolean} true if valid, false otherwise.
+   * @throws {TypeError} if you pass in bad arguments.
+   * @throws {InvalidAlgorithmError}
+   */
+  verifyHMAC: function verifyHMAC(parsedSignature, secret) {
+    assert.object(parsedSignature, 'parsedHMAC');
+    assert.string(secret, 'secret');
+
+    var alg = validateAlgorithm(parsedSignature.algorithm);
+    if (alg[0] !== 'hmac')
+      return (false);
+
+    var hashAlg = alg[1].toUpperCase();
+
+    var hmac = crypto.createHmac(hashAlg, secret);
+    hmac.update(parsedSignature.signingString);
+
+    /*
+     * Now double-hash to avoid leaking timing information - there's
+     * no easy constant-time compare in JS, so we use this approach
+     * instead. See for more info:
+     * https://www.isecpartners.com/blog/2011/february/double-hmac-
+     * verification.aspx
+     */
+    var h1 = crypto.createHmac(hashAlg, secret);
+    h1.update(hmac.digest());
+    h1 = h1.digest();
+    var h2 = crypto.createHmac(hashAlg, secret);
+    h2.update(new Buffer(parsedSignature.params.signature, 'base64'));
+    h2 = h2.digest();
+
+    /* Node 0.8 returns strings from .digest(). */
+    if (typeof (h1) === 'string')
+      return (h1 === h2);
+    /* And node 0.10 lacks the .equals() method on Buffers. */
+    if (Buffer.isBuffer(h1) && !h1.equals)
+      return (h1.toString('binary') === h2.toString('binary'));
+
+    return (h1.equals(h2));
+  }
+};
+
+
+/***/ }),
+/* 684 */
+/***/ (function(module, exports) {
+
+exports.parse = exports.decode = decode
+
+exports.stringify = exports.encode = encode
+
+exports.safe = safe
+exports.unsafe = unsafe
+
+var eol = typeof process !== 'undefined' &&
+  process.platform === 'win32' ? '\r\n' : '\n'
+
+function encode (obj, opt) {
+  var children = []
+  var out = ''
+
+  if (typeof opt === 'string') {
+    opt = {
+      section: opt,
+      whitespace: false
+    }
+  } else {
+    opt = opt || {}
+    opt.whitespace = opt.whitespace === true
+  }
+
+  var separator = opt.whitespace ? ' = ' : '='
+
+  Object.keys(obj).forEach(function (k, _, __) {
+    var val = obj[k]
+    if (val && Array.isArray(val)) {
+      val.forEach(function (item) {
+        out += safe(k + '[]') + separator + safe(item) + '\n'
+      })
+    } else if (val && typeof val === 'object') {
+      children.push(k)
+    } else {
+      out += safe(k) + separator + safe(val) + eol
+    }
+  })
+
+  if (opt.section && out.length) {
+    out = '[' + safe(opt.section) + ']' + eol + out
+  }
+
+  children.forEach(function (k, _, __) {
+    var nk = dotSplit(k).join('\\.')
+    var section = (opt.section ? opt.section + '.' : '') + nk
+    var child = encode(obj[k], {
+      section: section,
+      whitespace: opt.whitespace
+    })
+    if (out.length && child.length) {
+      out += eol
+    }
+    out += child
+  })
+
+  return out
+}
+
+function dotSplit (str) {
+  return str.replace(/\1/g, '\u0002LITERAL\\1LITERAL\u0002')
+    .replace(/\\\./g, '\u0001')
+    .split(/\./).map(function (part) {
+      return part.replace(/\1/g, '\\.')
+      .replace(/\2LITERAL\\1LITERAL\2/g, '\u0001')
+    })
+}
+
+function decode (str) {
+  var out = {}
+  var p = out
+  var section = null
+  //          section     |key      = value
+  var re = /^\[([^\]]*)\]$|^([^=]+)(=(.*))?$/i
+  var lines = str.split(/[\r\n]+/g)
+
+  lines.forEach(function (line, _, __) {
+    if (!line || line.match(/^\s*[;#]/)) return
+    var match = line.match(re)
+    if (!match) return
+    if (match[1] !== undefined) {
+      section = unsafe(match[1])
+      p = out[section] = out[section] || {}
+      return
+    }
+    var key = unsafe(match[2])
+    var value = match[3] ? unsafe(match[4]) : true
+    switch (value) {
+      case 'true':
+      case 'false':
+      case 'null': value = JSON.parse(value)
+    }
+
+    // Convert keys with '[]' suffix to an array
+    if (key.length > 2 && key.slice(-2) === '[]') {
+      key = key.substring(0, key.length - 2)
+      if (!p[key]) {
+        p[key] = []
+      } else if (!Array.isArray(p[key])) {
+        p[key] = [p[key]]
+      }
+    }
+
+    // safeguard against resetting a previously defined
+    // array by accidentally forgetting the brackets
+    if (Array.isArray(p[key])) {
+      p[key].push(value)
+    } else {
+      p[key] = value
+    }
+  })
+
+  // {a:{y:1},"a.b":{x:2}} --> {a:{y:1,b:{x:2}}}
+  // use a filter to return the keys that have to be deleted.
+  Object.keys(out).filter(function (k, _, __) {
+    if (!out[k] ||
+      typeof out[k] !== 'object' ||
+      Array.isArray(out[k])) {
+      return false
+    }
+    // see if the parent section is also an object.
+    // if so, add it to that, and mark this one for deletion
+    var parts = dotSplit(k)
+    var p = out
+    var l = parts.pop()
+    var nl = l.replace(/\\\./g, '.')
+    parts.forEach(function (part, _, __) {
+      if (!p[part] || typeof p[part] !== 'object') p[part] = {}
+      p = p[part]
+    })
+    if (p === out && nl === l) {
+      return false
+    }
+    p[nl] = out[k]
+    return true
+  }).forEach(function (del, _, __) {
+    delete out[del]
+  })
+
+  return out
+}
+
+function isQuoted (val) {
+  return (val.charAt(0) === '"' && val.slice(-1) === '"') ||
+    (val.charAt(0) === "'" && val.slice(-1) === "'")
+}
+
+function safe (val) {
+  return (typeof val !== 'string' ||
+    val.match(/[=\r\n]/) ||
+    val.match(/^\[/) ||
+    (val.length > 1 &&
+     isQuoted(val)) ||
+    val !== val.trim())
+      ? JSON.stringify(val)
+      : val.replace(/;/g, '\\;').replace(/#/g, '\\#')
+}
+
+function unsafe (val, doUnesc) {
+  val = (val || '').trim()
+  if (isQuoted(val)) {
+    // remove the single quotes before calling JSON.parse
+    if (val.charAt(0) === "'") {
+      val = val.substr(1, val.length - 2)
+    }
+    try { val = JSON.parse(val) } catch (_) {}
+  } else {
+    // walk the val to find the first not-escaped ; character
+    var esc = false
+    var unesc = ''
+    for (var i = 0, l = val.length; i < l; i++) {
+      var c = val.charAt(i)
+      if (esc) {
+        if ('\\;#'.indexOf(c) !== -1) {
+          unesc += c
+        } else {
+          unesc += '\\' + c
+        }
+        esc = false
+      } else if (';#'.indexOf(c) !== -1) {
+        break
+      } else if (c === '\\') {
+        esc = true
+      } else {
+        unesc += c
+      }
+    }
+    if (esc) {
+      unesc += '\\'
+    }
+    return unesc.trim()
+  }
+  return val
+}
+
+
+/***/ }),
+/* 685 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var _ = __webpack_require__(38);
+
+/**
+ * Choice object
+ * Normalize input as choice object
+ * @constructor
+ * @param {String|Object} val  Choice value. If an object is passed, it should contains
+ *                             at least one of `value` or `name` property
+ */
+
+module.exports = class Choice {
+  constructor(val, answers) {
+    // Don't process Choice and Separator object
+    if (val instanceof Choice || val.type === 'separator') {
+      return val;
+    }
+
+    if (_.isString(val)) {
+      this.name = val;
+      this.value = val;
+      this.short = val;
+    } else {
+      _.extend(this, val, {
+        name: val.name || val.value,
+        value: 'value' in val ? val.value : val.name,
+        short: val.short || val.name || val.value
+      });
+    }
+
+    if (_.isFunction(val.disabled)) {
+      this.disabled = val.disabled(answers);
+    } else {
+      this.disabled = val.disabled;
+    }
+  }
+};
+
+
+/***/ }),
+/* 686 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var assert = __webpack_require__(28);
+var _ = __webpack_require__(38);
+var Separator = __webpack_require__(175);
+var Choice = __webpack_require__(685);
+
+/**
+ * Choices collection
+ * Collection of multiple `choice` object
+ * @constructor
+ * @param {Array} choices  All `choice` to keep in the collection
+ */
+
+module.exports = class Choices {
+  constructor(choices, answers) {
+    this.choices = choices.map(val => {
+      if (val.type === 'separator') {
+        if (!(val instanceof Separator)) {
+          val = new Separator(val.line);
+        }
+        return val;
+      }
+      return new Choice(val, answers);
+    });
+
+    this.realChoices = this.choices
+      .filter(Separator.exclude)
+      .filter(item => !item.disabled);
+
+    Object.defineProperty(this, 'length', {
+      get() {
+        return this.choices.length;
+      },
+      set(val) {
+        this.choices.length = val;
+      }
+    });
+
+    Object.defineProperty(this, 'realLength', {
+      get() {
+        return this.realChoices.length;
+      },
+      set() {
+        throw new Error('Cannot set `realLength` of a Choices collection');
+      }
+    });
+  }
+
+  /**
+   * Get a valid choice from the collection
+   * @param  {Number} selector  The selected choice index
+   * @return {Choice|Undefined} Return the matched choice or undefined
+   */
+
+  getChoice(selector) {
+    assert(_.isNumber(selector));
+    return this.realChoices[selector];
+  }
+
+  /**
+   * Get a raw element from the collection
+   * @param  {Number} selector  The selected index value
+   * @return {Choice|Undefined} Return the matched choice or undefined
+   */
+
+  get(selector) {
+    assert(_.isNumber(selector));
+    return this.choices[selector];
+  }
+
+  /**
+   * Match the valid choices against a where clause
+   * @param  {Object} whereClause Lodash `where` clause
+   * @return {Array}              Matching choices or empty array
+   */
+
+  where(whereClause) {
+    return _.filter(this.realChoices, whereClause);
+  }
+
+  /**
+   * Pluck a particular key from the choices
+   * @param  {String} propertyName Property name to select
+   * @return {Array}               Selected properties
+   */
+
+  pluck(propertyName) {
+    return _.map(this.realChoices, propertyName);
+  }
+
+  // Expose usual Array methods
+  indexOf() {
+    return this.choices.indexOf.apply(this.choices, arguments);
+  }
+
+  forEach() {
+    return this.choices.forEach.apply(this.choices, arguments);
+  }
+
+  filter() {
+    return this.choices.filter.apply(this.choices, arguments);
+  }
+
+  find(func) {
+    return _.find(this.choices, func);
+  }
+
+  push() {
+    var objs = _.map(arguments, val => new Choice(val));
+    this.choices.push.apply(this.choices, objs);
+    this.realChoices = this.choices.filter(Separator.exclude);
+    return this.choices;
+  }
+};
+
+
+/***/ }),
+/* 687 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/**
+ * `list` type prompt
+ */
+
+var _ = __webpack_require__(38);
+var chalk = __webpack_require__(30);
+var cliCursor = __webpack_require__(381);
+var figures = __webpack_require__(270);
+var { map, takeUntil } = __webpack_require__(63);
+var Base = __webpack_require__(79);
+var observe = __webpack_require__(80);
+var Paginator = __webpack_require__(176);
+
+class CheckboxPrompt extends Base {
+  constructor(questions, rl, answers) {
+    super(questions, rl, answers);
+
+    if (!this.opt.choices) {
+      this.throwParamError('choices');
+    }
+
+    if (_.isArray(this.opt.default)) {
+      this.opt.choices.forEach(function(choice) {
+        if (this.opt.default.indexOf(choice.value) >= 0) {
+          choice.checked = true;
+        }
+      }, this);
+    }
+
+    this.pointer = 0;
+    this.firstRender = true;
+
+    // Make sure no default is set (so it won't be printed)
+    this.opt.default = null;
+
+    this.paginator = new Paginator(this.screen);
+  }
+
+  /**
+   * Start the Inquiry session
+   * @param  {Function} cb      Callback when prompt is done
+   * @return {this}
+   */
+
+  _run(cb) {
+    this.done = cb;
+
+    var events = observe(this.rl);
+
+    var validation = this.handleSubmitEvents(
+      events.line.pipe(map(this.getCurrentValue.bind(this)))
+    );
+    validation.success.forEach(this.onEnd.bind(this));
+    validation.error.forEach(this.onError.bind(this));
+
+    events.normalizedUpKey
+      .pipe(takeUntil(validation.success))
+      .forEach(this.onUpKey.bind(this));
+    events.normalizedDownKey
+      .pipe(takeUntil(validation.success))
+      .forEach(this.onDownKey.bind(this));
+    events.numberKey
+      .pipe(takeUntil(validation.success))
+      .forEach(this.onNumberKey.bind(this));
+    events.spaceKey
+      .pipe(takeUntil(validation.success))
+      .forEach(this.onSpaceKey.bind(this));
+    events.aKey.pipe(takeUntil(validation.success)).forEach(this.onAllKey.bind(this));
+    events.iKey.pipe(takeUntil(validation.success)).forEach(this.onInverseKey.bind(this));
+
+    // Init the prompt
+    cliCursor.hide();
+    this.render();
+    this.firstRender = false;
+
+    return this;
+  }
+
+  /**
+   * Render the prompt to screen
+   * @return {CheckboxPrompt} self
+   */
+
+  render(error) {
+    // Render question
+    var message = this.getQuestion();
+    var bottomContent = '';
+
+    if (this.firstRender) {
+      message +=
+        '(Press ' +
+        chalk.cyan.bold('<space>') +
+        ' to select, ' +
+        chalk.cyan.bold('<a>') +
+        ' to toggle all, ' +
+        chalk.cyan.bold('<i>') +
+        ' to invert selection)';
+    }
+
+    // Render choices or answer depending on the state
+    if (this.status === 'answered') {
+      message += chalk.cyan(this.selection.join(', '));
+    } else {
+      var choicesStr = renderChoices(this.opt.choices, this.pointer);
+      var indexPosition = this.opt.choices.indexOf(
+        this.opt.choices.getChoice(this.pointer)
+      );
+      message +=
+        '\n' + this.paginator.paginate(choicesStr, indexPosition, this.opt.pageSize);
+    }
+
+    if (error) {
+      bottomContent = chalk.red('>> ') + error;
+    }
+
+    this.screen.render(message, bottomContent);
+  }
+
+  /**
+   * When user press `enter` key
+   */
+
+  onEnd(state) {
+    this.status = 'answered';
+
+    // Rerender prompt (and clean subline error)
+    this.render();
+
+    this.screen.done();
+    cliCursor.show();
+    this.done(state.value);
+  }
+
+  onError(state) {
+    this.render(state.isValid);
+  }
+
+  getCurrentValue() {
+    var choices = this.opt.choices.filter(function(choice) {
+      return Boolean(choice.checked) && !choice.disabled;
+    });
+
+    this.selection = _.map(choices, 'short');
+    return _.map(choices, 'value');
+  }
+
+  onUpKey() {
+    var len = this.opt.choices.realLength;
+    this.pointer = this.pointer > 0 ? this.pointer - 1 : len - 1;
+    this.render();
+  }
+
+  onDownKey() {
+    var len = this.opt.choices.realLength;
+    this.pointer = this.pointer < len - 1 ? this.pointer + 1 : 0;
+    this.render();
+  }
+
+  onNumberKey(input) {
+    if (input <= this.opt.choices.realLength) {
+      this.pointer = input - 1;
+      this.toggleChoice(this.pointer);
+    }
+    this.render();
+  }
+
+  onSpaceKey() {
+    this.toggleChoice(this.pointer);
+    this.render();
+  }
+
+  onAllKey() {
+    var shouldBeChecked = Boolean(
+      this.opt.choices.find(function(choice) {
+        return choice.type !== 'separator' && !choice.checked;
+      })
+    );
+
+    this.opt.choices.forEach(function(choice) {
+      if (choice.type !== 'separator') {
+        choice.checked = shouldBeChecked;
+      }
+    });
+
+    this.render();
+  }
+
+  onInverseKey() {
+    this.opt.choices.forEach(function(choice) {
+      if (choice.type !== 'separator') {
+        choice.checked = !choice.checked;
+      }
+    });
+
+    this.render();
+  }
+
+  toggleChoice(index) {
+    var item = this.opt.choices.getChoice(index);
+    if (item !== undefined) {
+      this.opt.choices.getChoice(index).checked = !item.checked;
+    }
+  }
+}
+
+/**
+ * Function for rendering checkbox choices
+ * @param  {Number} pointer Position of the pointer
+ * @return {String}         Rendered content
+ */
+
+function renderChoices(choices, pointer) {
+  var output = '';
+  var separatorOffset = 0;
+
+  choices.forEach(function(choice, i) {
+    if (choice.type === 'separator') {
+      separatorOffset++;
+      output += ' ' + choice + '\n';
+      return;
+    }
+
+    if (choice.disabled) {
+      separatorOffset++;
+      output += ' - ' + choice.name;
+      output += ' (' + (_.isString(choice.disabled) ? choice.disabled : 'Disabled') + ')';
+    } else {
+      var line = getCheckbox(choice.checked) + ' ' + choice.name;
+      if (i - separatorOffset === pointer) {
+        output += chalk.cyan(figures.pointer + line);
+      } else {
+        output += ' ' + line;
+      }
+    }
+
+    output += '\n';
+  });
+
+  return output.replace(/\n$/, '');
+}
+
+/**
+ * Get the checkbox
+ * @param  {Boolean} checked - add a X or not to the checkbox
+ * @return {String} Composited checkbox string
+ */
+
+function getCheckbox(checked) {
+  return checked ? chalk.green(figures.radioOn) : figures.radioOff;
+}
+
+module.exports = CheckboxPrompt;
+
+
+/***/ }),
+/* 688 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/**
+ * `confirm` type prompt
+ */
+
+var _ = __webpack_require__(38);
+var chalk = __webpack_require__(30);
+var { take, takeUntil } = __webpack_require__(63);
+var Base = __webpack_require__(79);
+var observe = __webpack_require__(80);
+
+class ConfirmPrompt extends Base {
+  constructor(questions, rl, answers) {
+    super(questions, rl, answers);
+
+    var rawDefault = true;
+
+    _.extend(this.opt, {
+      filter: function(input) {
+        var value = rawDefault;
+        if (input != null && input !== '') {
+          value = /^y(es)?/i.test(input);
+        }
+        return value;
+      }
+    });
+
+    if (_.isBoolean(this.opt.default)) {
+      rawDefault = this.opt.default;
+    }
+
+    this.opt.default = rawDefault ? 'Y/n' : 'y/N';
+
+    return this;
+  }
+
+  /**
+   * Start the Inquiry session
+   * @param  {Function} cb   Callback when prompt is done
+   * @return {this}
+   */
+
+  _run(cb) {
+    this.done = cb;
+
+    // Once user confirm (enter key)
+    var events = observe(this.rl);
+    events.keypress.pipe(takeUntil(events.line)).forEach(this.onKeypress.bind(this));
+
+    events.line.pipe(take(1)).forEach(this.onEnd.bind(this));
+
+    // Init
+    this.render();
+
+    return this;
+  }
+
+  /**
+   * Render the prompt to screen
+   * @return {ConfirmPrompt} self
+   */
+
+  render(answer) {
+    var message = this.getQuestion();
+
+    if (typeof answer === 'boolean') {
+      message += chalk.cyan(answer ? 'Yes' : 'No');
+    } else {
+      message += this.rl.line;
+    }
+
+    this.screen.render(message);
+
+    return this;
+  }
+
+  /**
+   * When user press `enter` key
+   */
+
+  onEnd(input) {
+    this.status = 'answered';
+
+    var output = this.opt.filter(input);
+    this.render(output);
+
+    this.screen.done();
+    this.done(output);
+  }
+
+  /**
+   * When user press a key
+   */
+
+  onKeypress() {
+    this.render();
+  }
+}
+
+module.exports = ConfirmPrompt;
+
+
+/***/ }),
+/* 689 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/**
+ * `editor` type prompt
+ */
+
+var chalk = __webpack_require__(30);
+var editAsync = __webpack_require__(709).editAsync;
+var Base = __webpack_require__(79);
+var observe = __webpack_require__(80);
+var { Subject } = __webpack_require__(182);
+
+class EditorPrompt extends Base {
+  /**
+   * Start the Inquiry session
+   * @param  {Function} cb      Callback when prompt is done
+   * @return {this}
+   */
+
+  _run(cb) {
+    this.done = cb;
+
+    this.editorResult = new Subject();
+
+    // Open Editor on "line" (Enter Key)
+    var events = observe(this.rl);
+    this.lineSubscription = events.line.subscribe(this.startExternalEditor.bind(this));
+
+    // Trigger Validation when editor closes
+    var validation = this.handleSubmitEvents(this.editorResult);
+    validation.success.forEach(this.onEnd.bind(this));
+    validation.error.forEach(this.onError.bind(this));
+
+    // Prevents default from being printed on screen (can look weird with multiple lines)
+    this.currentText = this.opt.default;
+    this.opt.default = null;
+
+    // Init
+    this.render();
+
+    return this;
+  }
+
+  /**
+   * Render the prompt to screen
+   * @return {EditorPrompt} self
+   */
+
+  render(error) {
+    var bottomContent = '';
+    var message = this.getQuestion();
+
+    if (this.status === 'answered') {
+      message += chalk.dim('Received');
+    } else {
+      message += chalk.dim('Press <enter> to launch your preferred editor.');
+    }
+
+    if (error) {
+      bottomContent = chalk.red('>> ') + error;
+    }
+
+    this.screen.render(message, bottomContent);
+  }
+
+  /**
+   * Launch $EDITOR on user press enter
+   */
+
+  startExternalEditor() {
+    // Pause Readline to prevent stdin and stdout from being modified while the editor is showing
+    this.rl.pause();
+    editAsync(this.currentText, this.endExternalEditor.bind(this));
+  }
+
+  endExternalEditor(error, result) {
+    this.rl.resume();
+    if (error) {
+      this.editorResult.error(error);
+    } else {
+      this.editorResult.next(result);
+    }
+  }
+
+  onEnd(state) {
+    this.editorResult.unsubscribe();
+    this.lineSubscription.unsubscribe();
+    this.answer = state.value;
+    this.status = 'answered';
+    // Re-render prompt
+    this.render();
+    this.screen.done();
+    this.done(this.answer);
+  }
+
+  onError(state) {
+    this.render(state.isValid);
+  }
+}
+
+module.exports = EditorPrompt;
+
+
+/***/ }),
+/* 690 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/**
+ * `rawlist` type prompt
+ */
+
+var _ = __webpack_require__(38);
+var chalk = __webpack_require__(30);
+var { map, takeUntil } = __webpack_require__(63);
+var Base = __webpack_require__(79);
+var Separator = __webpack_require__(175);
+var observe = __webpack_require__(80);
+var Paginator = __webpack_require__(176);
+
+class ExpandPrompt extends Base {
+  constructor(questions, rl, answers) {
+    super(questions, rl, answers);
+
+    if (!this.opt.choices) {
+      this.throwParamError('choices');
+    }
+
+    this.validateChoices(this.opt.choices);
+
+    // Add the default `help` (/expand) option
+    this.opt.choices.push({
+      key: 'h',
+      name: 'Help, list all options',
+      value: 'help'
+    });
+
+    this.opt.validate = choice => {
+      if (choice == null) {
+        return 'Please enter a valid command';
+      }
+
+      return choice !== 'help';
+    };
+
+    // Setup the default string (capitalize the default key)
+    this.opt.default = this.generateChoicesString(this.opt.choices, this.opt.default);
+
+    this.paginator = new Paginator(this.screen);
+  }
+
+  /**
+   * Start the Inquiry session
+   * @param  {Function} cb      Callback when prompt is done
+   * @return {this}
+   */
+
+  _run(cb) {
+    this.done = cb;
+
+    // Save user answer and update prompt to show selected option.
+    var events = observe(this.rl);
+    var validation = this.handleSubmitEvents(
+      events.line.pipe(map(this.getCurrentValue.bind(this)))
+    );
+    validation.success.forEach(this.onSubmit.bind(this));
+    validation.error.forEach(this.onError.bind(this));
+    this.keypressObs = events.keypress
+      .pipe(takeUntil(validation.success))
+      .forEach(this.onKeypress.bind(this));
+
+    // Init the prompt
+    this.render();
+
+    return this;
+  }
+
+  /**
+   * Render the prompt to screen
+   * @return {ExpandPrompt} self
+   */
+
+  render(error, hint) {
+    var message = this.getQuestion();
+    var bottomContent = '';
+
+    if (this.status === 'answered') {
+      message += chalk.cyan(this.answer);
+    } else if (this.status === 'expanded') {
+      var choicesStr = renderChoices(this.opt.choices, this.selectedKey);
+      message += this.paginator.paginate(choicesStr, this.selectedKey, this.opt.pageSize);
+      message += '\n  Answer: ';
+    }
+
+    message += this.rl.line;
+
+    if (error) {
+      bottomContent = chalk.red('>> ') + error;
+    }
+
+    if (hint) {
+      bottomContent = chalk.cyan('>> ') + hint;
+    }
+
+    this.screen.render(message, bottomContent);
+  }
+
+  getCurrentValue(input) {
+    if (!input) {
+      input = this.rawDefault;
+    }
+    var selected = this.opt.choices.where({ key: input.toLowerCase().trim() })[0];
+    if (!selected) {
+      return null;
+    }
+
+    return selected.value;
+  }
+
+  /**
+   * Generate the prompt choices string
+   * @return {String}  Choices string
+   */
+
+  getChoices() {
+    var output = '';
+
+    this.opt.choices.forEach(choice => {
+      output += '\n  ';
+
+      if (choice.type === 'separator') {
+        output += ' ' + choice;
+        return;
+      }
+
+      var choiceStr = choice.key + ') ' + choice.name;
+      if (this.selectedKey === choice.key) {
+        choiceStr = chalk.cyan(choiceStr);
+      }
+      output += choiceStr;
+    });
+
+    return output;
+  }
+
+  onError(state) {
+    if (state.value === 'help') {
+      this.selectedKey = '';
+      this.status = 'expanded';
+      this.render();
+      return;
+    }
+    this.render(state.isValid);
+  }
+
+  /**
+   * When user press `enter` key
+   */
+
+  onSubmit(state) {
+    this.status = 'answered';
+    var choice = this.opt.choices.where({ value: state.value })[0];
+    this.answer = choice.short || choice.name;
+
+    // Re-render prompt
+    this.render();
+    this.screen.done();
+    this.done(state.value);
+  }
+
+  /**
+   * When user press a key
+   */
+
+  onKeypress() {
+    this.selectedKey = this.rl.line.toLowerCase();
+    var selected = this.opt.choices.where({ key: this.selectedKey })[0];
+    if (this.status === 'expanded') {
+      this.render();
+    } else {
+      this.render(null, selected ? selected.name : null);
+    }
+  }
+
+  /**
+   * Validate the choices
+   * @param {Array} choices
+   */
+
+  validateChoices(choices) {
+    var formatError;
+    var errors = [];
+    var keymap = {};
+    choices.filter(Separator.exclude).forEach(choice => {
+      if (!choice.key || choice.key.length !== 1) {
+        formatError = true;
+      }
+      if (keymap[choice.key]) {
+        errors.push(choice.key);
+      }
+      keymap[choice.key] = true;
+      choice.key = String(choice.key).toLowerCase();
+    });
+
+    if (formatError) {
+      throw new Error(
+        'Format error: `key` param must be a single letter and is required.'
+      );
+    }
+    if (keymap.h) {
+      throw new Error(
+        'Reserved key error: `key` param cannot be `h` - this value is reserved.'
+      );
+    }
+    if (errors.length) {
+      throw new Error(
+        'Duplicate key error: `key` param must be unique. Duplicates: ' +
+          _.uniq(errors).join(', ')
+      );
+    }
+  }
+
+  /**
+   * Generate a string out of the choices keys
+   * @param  {Array}  choices
+   * @param  {Number|String} default - the choice index or name to capitalize
+   * @return {String} The rendered choices key string
+   */
+  generateChoicesString(choices, defaultChoice) {
+    var defIndex = choices.realLength - 1;
+    if (_.isNumber(defaultChoice) && this.opt.choices.getChoice(defaultChoice)) {
+      defIndex = defaultChoice;
+    } else if (_.isString(defaultChoice)) {
+      let index = _.findIndex(
+        choices.realChoices,
+        ({ value }) => value === defaultChoice
+      );
+      defIndex = index === -1 ? defIndex : index;
+    }
+    var defStr = this.opt.choices.pluck('key');
+    this.rawDefault = defStr[defIndex];
+    defStr[defIndex] = String(defStr[defIndex]).toUpperCase();
+    return defStr.join('');
+  }
+}
+
+/**
+ * Function for rendering checkbox choices
+ * @param  {String} pointer Selected key
+ * @return {String}         Rendered content
+ */
+
+function renderChoices(choices, pointer) {
+  var output = '';
+
+  choices.forEach(choice => {
+    output += '\n  ';
+
+    if (choice.type === 'separator') {
+      output += ' ' + choice;
+      return;
+    }
+
+    var choiceStr = choice.key + ') ' + choice.name;
+    if (pointer === choice.key) {
+      choiceStr = chalk.cyan(choiceStr);
+    }
+    output += choiceStr;
+  });
+
+  return output;
+}
+
+module.exports = ExpandPrompt;
+
+
+/***/ }),
+/* 691 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/**
+ * `list` type prompt
+ */
+
+var _ = __webpack_require__(38);
+var chalk = __webpack_require__(30);
+var figures = __webpack_require__(270);
+var cliCursor = __webpack_require__(381);
+var runAsync = __webpack_require__(181);
+var { flatMap, map, take, takeUntil } = __webpack_require__(63);
+var Base = __webpack_require__(79);
+var observe = __webpack_require__(80);
+var Paginator = __webpack_require__(176);
+
+class ListPrompt extends Base {
+  constructor(questions, rl, answers) {
+    super(questions, rl, answers);
+
+    if (!this.opt.choices) {
+      this.throwParamError('choices');
+    }
+
+    this.firstRender = true;
+    this.selected = 0;
+
+    var def = this.opt.default;
+
+    // If def is a Number, then use as index. Otherwise, check for value.
+    if (_.isNumber(def) && def >= 0 && def < this.opt.choices.realLength) {
+      this.selected = def;
+    } else if (!_.isNumber(def) && def != null) {
+      let index = _.findIndex(this.opt.choices.realChoices, ({ value }) => value === def);
+      this.selected = Math.max(index, 0);
+    }
+
+    // Make sure no default is set (so it won't be printed)
+    this.opt.default = null;
+
+    this.paginator = new Paginator(this.screen);
+  }
+
+  /**
+   * Start the Inquiry session
+   * @param  {Function} cb      Callback when prompt is done
+   * @return {this}
+   */
+
+  _run(cb) {
+    this.done = cb;
+
+    var self = this;
+
+    var events = observe(this.rl);
+    events.normalizedUpKey.pipe(takeUntil(events.line)).forEach(this.onUpKey.bind(this));
+    events.normalizedDownKey
+      .pipe(takeUntil(events.line))
+      .forEach(this.onDownKey.bind(this));
+    events.numberKey.pipe(takeUntil(events.line)).forEach(this.onNumberKey.bind(this));
+    events.line
+      .pipe(
+        take(1),
+        map(this.getCurrentValue.bind(this)),
+        flatMap(value => runAsync(self.opt.filter)(value).catch(err => err))
+      )
+      .forEach(this.onSubmit.bind(this));
+
+    // Init the prompt
+    cliCursor.hide();
+    this.render();
+
+    return this;
+  }
+
+  /**
+   * Render the prompt to screen
+   * @return {ListPrompt} self
+   */
+
+  render() {
+    // Render question
+    var message = this.getQuestion();
+
+    if (this.firstRender) {
+      message += chalk.dim('(Use arrow keys)');
+    }
+
+    // Render choices or answer depending on the state
+    if (this.status === 'answered') {
+      message += chalk.cyan(this.opt.choices.getChoice(this.selected).short);
+    } else {
+      var choicesStr = listRender(this.opt.choices, this.selected);
+      var indexPosition = this.opt.choices.indexOf(
+        this.opt.choices.getChoice(this.selected)
+      );
+      message +=
+        '\n' + this.paginator.paginate(choicesStr, indexPosition, this.opt.pageSize);
+    }
+
+    this.firstRender = false;
+
+    this.screen.render(message);
+  }
+
+  /**
+   * When user press `enter` key
+   */
+
+  onSubmit(value) {
+    this.status = 'answered';
+
+    // Rerender prompt
+    this.render();
+
+    this.screen.done();
+    cliCursor.show();
+    this.done(value);
+  }
+
+  getCurrentValue() {
+    return this.opt.choices.getChoice(this.selected).value;
+  }
+
+  /**
+   * When user press a key
+   */
+  onUpKey() {
+    var len = this.opt.choices.realLength;
+    this.selected = this.selected > 0 ? this.selected - 1 : len - 1;
+    this.render();
+  }
+
+  onDownKey() {
+    var len = this.opt.choices.realLength;
+    this.selected = this.selected < len - 1 ? this.selected + 1 : 0;
+    this.render();
+  }
+
+  onNumberKey(input) {
+    if (input <= this.opt.choices.realLength) {
+      this.selected = input - 1;
+    }
+    this.render();
+  }
+}
+
+/**
+ * Function for rendering list choices
+ * @param  {Number} pointer Position of the pointer
+ * @return {String}         Rendered content
+ */
+function listRender(choices, pointer) {
+  var output = '';
+  var separatorOffset = 0;
+
+  choices.forEach((choice, i) => {
+    if (choice.type === 'separator') {
+      separatorOffset++;
+      output += '  ' + choice + '\n';
+      return;
+    }
+
+    if (choice.disabled) {
+      separatorOffset++;
+      output += '  - ' + choice.name;
+      output += ' (' + (_.isString(choice.disabled) ? choice.disabled : 'Disabled') + ')';
+      output += '\n';
+      return;
+    }
+
+    var isSelected = i - separatorOffset === pointer;
+    var line = (isSelected ? figures.pointer + ' ' : '  ') + choice.name;
+    if (isSelected) {
+      line = chalk.cyan(line);
+    }
+    output += line + ' \n';
+  });
+
+  return output.replace(/\n$/, '');
+}
+
+module.exports = ListPrompt;
+
+
+/***/ }),
+/* 692 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/**
+ * `input` type prompt
+ */
+
+var Input = __webpack_require__(392);
+
+/**
+ * Extention of the Input prompt specifically for use with number inputs.
+ */
+
+class NumberPrompt extends Input {
+  filterInput(input) {
+    if (input && typeof input === 'string') {
+      input = input.trim();
+      // Match a number in the input
+      let numberMatch = input.match(/(^-?\d+|^\d+\.\d*|^\d*\.\d+)(e\d+)?$/);
+      // If a number is found, return that input.
+      if (numberMatch) {
+        return Number(numberMatch[0]);
+      }
+    }
+    // If the input was invalid return the default value.
+    return this.opt.default == null ? NaN : this.opt.default;
+  }
+}
+
+module.exports = NumberPrompt;
+
+
+/***/ }),
+/* 693 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/**
+ * `password` type prompt
+ */
+
+var chalk = __webpack_require__(30);
+var { map, takeUntil } = __webpack_require__(63);
+var Base = __webpack_require__(79);
+var observe = __webpack_require__(80);
+
+function mask(input, maskChar) {
+  input = String(input);
+  maskChar = typeof maskChar === 'string' ? maskChar : '*';
+  if (input.length === 0) {
+    return '';
+  }
+
+  return new Array(input.length + 1).join(maskChar);
+}
+
+class PasswordPrompt extends Base {
+  /**
+   * Start the Inquiry session
+   * @param  {Function} cb      Callback when prompt is done
+   * @return {this}
+   */
+
+  _run(cb) {
+    this.done = cb;
+
+    var events = observe(this.rl);
+
+    // Once user confirm (enter key)
+    var submit = events.line.pipe(map(this.filterInput.bind(this)));
+
+    var validation = this.handleSubmitEvents(submit);
+    validation.success.forEach(this.onEnd.bind(this));
+    validation.error.forEach(this.onError.bind(this));
+
+    if (this.opt.mask) {
+      events.keypress
+        .pipe(takeUntil(validation.success))
+        .forEach(this.onKeypress.bind(this));
+    }
+
+    // Init
+    this.render();
+
+    return this;
+  }
+
+  /**
+   * Render the prompt to screen
+   * @return {PasswordPrompt} self
+   */
+
+  render(error) {
+    var message = this.getQuestion();
+    var bottomContent = '';
+
+    if (this.status === 'answered') {
+      message += this.opt.mask
+        ? chalk.cyan(mask(this.answer, this.opt.mask))
+        : chalk.italic.dim('[hidden]');
+    } else if (this.opt.mask) {
+      message += mask(this.rl.line || '', this.opt.mask);
+    } else {
+      message += chalk.italic.dim('[input is hidden] ');
+    }
+
+    if (error) {
+      bottomContent = '\n' + chalk.red('>> ') + error;
+    }
+
+    this.screen.render(message, bottomContent);
+  }
+
+  /**
+   * When user press `enter` key
+   */
+
+  filterInput(input) {
+    if (!input) {
+      return this.opt.default == null ? '' : this.opt.default;
+    }
+    return input;
+  }
+
+  onEnd(state) {
+    this.status = 'answered';
+    this.answer = state.value;
+
+    // Re-render prompt
+    this.render();
+
+    this.screen.done();
+    this.done(state.value);
+  }
+
+  onError(state) {
+    this.render(state.isValid);
+  }
+
+  onKeypress() {
+    this.render();
+  }
+}
+
+module.exports = PasswordPrompt;
+
+
+/***/ }),
+/* 694 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/**
+ * `rawlist` type prompt
+ */
+
+var _ = __webpack_require__(38);
+var chalk = __webpack_require__(30);
+var { map, takeUntil } = __webpack_require__(63);
+var Base = __webpack_require__(79);
+var Separator = __webpack_require__(175);
+var observe = __webpack_require__(80);
+var Paginator = __webpack_require__(176);
+
+class RawListPrompt extends Base {
+  constructor(questions, rl, answers) {
+    super(questions, rl, answers);
+
+    if (!this.opt.choices) {
+      this.throwParamError('choices');
+    }
+
+    this.opt.validChoices = this.opt.choices.filter(Separator.exclude);
+
+    this.selected = 0;
+    this.rawDefault = 0;
+
+    _.extend(this.opt, {
+      validate: function(val) {
+        return val != null;
+      }
+    });
+
+    var def = this.opt.default;
+    if (_.isNumber(def) && def >= 0 && def < this.opt.choices.realLength) {
+      this.selected = def;
+      this.rawDefault = def;
+    } else if (!_.isNumber(def) && def != null) {
+      let index = _.findIndex(this.opt.choices.realChoices, ({ value }) => value === def);
+      let safeIndex = Math.max(index, 0);
+      this.selected = safeIndex;
+      this.rawDefault = safeIndex;
+    }
+
+    // Make sure no default is set (so it won't be printed)
+    this.opt.default = null;
+
+    this.paginator = new Paginator();
+  }
+
+  /**
+   * Start the Inquiry session
+   * @param  {Function} cb      Callback when prompt is done
+   * @return {this}
+   */
+
+  _run(cb) {
+    this.done = cb;
+
+    // Once user confirm (enter key)
+    var events = observe(this.rl);
+    var submit = events.line.pipe(map(this.getCurrentValue.bind(this)));
+
+    var validation = this.handleSubmitEvents(submit);
+    validation.success.forEach(this.onEnd.bind(this));
+    validation.error.forEach(this.onError.bind(this));
+
+    events.keypress
+      .pipe(takeUntil(validation.success))
+      .forEach(this.onKeypress.bind(this));
+
+    // Init the prompt
+    this.render();
+
+    return this;
+  }
+
+  /**
+   * Render the prompt to screen
+   * @return {RawListPrompt} self
+   */
+
+  render(error) {
+    // Render question
+    var message = this.getQuestion();
+    var bottomContent = '';
+
+    if (this.status === 'answered') {
+      message += chalk.cyan(this.answer);
+    } else {
+      var choicesStr = renderChoices(this.opt.choices, this.selected);
+      message += this.paginator.paginate(choicesStr, this.selected, this.opt.pageSize);
+      message += '\n  Answer: ';
+    }
+
+    message += this.rl.line;
+
+    if (error) {
+      bottomContent = '\n' + chalk.red('>> ') + error;
+    }
+
+    this.screen.render(message, bottomContent);
+  }
+
+  /**
+   * When user press `enter` key
+   */
+
+  getCurrentValue(index) {
+    if (index == null || index === '') {
+      index = this.rawDefault;
+    } else {
+      index -= 1;
+    }
+
+    var choice = this.opt.choices.getChoice(index);
+    return choice ? choice.value : null;
+  }
+
+  onEnd(state) {
+    this.status = 'answered';
+    this.answer = state.value;
+
+    // Re-render prompt
+    this.render();
+
+    this.screen.done();
+    this.done(state.value);
+  }
+
+  onError() {
+    this.render('Please enter a valid index');
+  }
+
+  /**
+   * When user press a key
+   */
+
+  onKeypress() {
+    var index = this.rl.line.length ? Number(this.rl.line) - 1 : 0;
+
+    if (this.opt.choices.getChoice(index)) {
+      this.selected = index;
+    } else {
+      this.selected = undefined;
+    }
+
+    this.render();
+  }
+}
+
+/**
+ * Function for rendering list choices
+ * @param  {Number} pointer Position of the pointer
+ * @return {String}         Rendered content
+ */
+
+function renderChoices(choices, pointer) {
+  var output = '';
+  var separatorOffset = 0;
+
+  choices.forEach(function(choice, i) {
+    output += '\n  ';
+
+    if (choice.type === 'separator') {
+      separatorOffset++;
+      output += ' ' + choice;
+      return;
+    }
+
+    var index = i - separatorOffset;
+    var display = index + 1 + ') ' + choice.name;
+    if (index === pointer) {
+      display = chalk.cyan(display);
+    }
+    output += display;
+  });
+
+  return output;
+}
+
+module.exports = RawListPrompt;
+
+
+/***/ }),
+/* 695 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/**
+ * Sticky bottom bar user interface
+ */
+
+var through = __webpack_require__(953);
+var Base = __webpack_require__(393);
+var rlUtils = __webpack_require__(394);
+var _ = __webpack_require__(38);
+
+class BottomBar extends Base {
+  constructor(opt) {
+    opt = opt || {};
+
+    super(opt);
+
+    this.log = through(this.writeLog.bind(this));
+    this.bottomBar = opt.bottomBar || '';
+    this.render();
+  }
+
+  /**
+   * Render the prompt to screen
+   * @return {BottomBar} self
+   */
+
+  render() {
+    this.write(this.bottomBar);
+    return this;
+  }
+
+  clean() {
+    rlUtils.clearLine(this.rl, this.bottomBar.split('\n').length);
+    return this;
+  }
+
+  /**
+   * Update the bottom bar content and rerender
+   * @param  {String} bottomBar Bottom bar content
+   * @return {BottomBar}           self
+   */
+
+  updateBottomBar(bottomBar) {
+    rlUtils.clearLine(this.rl, 1);
+    this.rl.output.unmute();
+    this.clean();
+    this.bottomBar = bottomBar;
+    this.render();
+    this.rl.output.mute();
+    return this;
+  }
+
+  /**
+   * Write out log data
+   * @param {String} data - The log data to be output
+   * @return {BottomBar} self
+   */
+
+  writeLog(data) {
+    this.rl.output.unmute();
+    this.clean();
+    this.rl.output.write(this.enforceLF(data.toString()));
+    this.render();
+    this.rl.output.mute();
+    return this;
+  }
+
+  /**
+   * Make sure line end on a line feed
+   * @param  {String} str Input string
+   * @return {String}     The input string with a final line feed
+   */
+
+  enforceLF(str) {
+    return str.match(/[\r\n]$/) ? str : str + '\n';
+  }
+
+  /**
+   * Helper for writing message in Prompt
+   * @param {BottomBar} prompt  - The Prompt object that extends tty
+   * @param {String} message - The message to be output
+   */
+  write(message) {
+    var msgLines = message.split(/\n/);
+    this.height = msgLines.length;
+
+    // Write message to screen and setPrompt to control backspace
+    this.rl.setPrompt(_.last(msgLines));
+
+    if (this.rl.output.rows === 0 && this.rl.output.columns === 0) {
+      /* When it's a tty through serial port there's no terminal info and the render will malfunction,
+         so we need enforce the cursor to locate to the leftmost position for rendering. */
+      rlUtils.left(this.rl, message.length + this.rl.line.length);
+    }
+    this.rl.output.write(message);
+  }
+}
+
+module.exports = BottomBar;
+
+
+/***/ }),
+/* 696 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var _ = __webpack_require__(38);
+var { defer, empty, from, of } = __webpack_require__(182);
+var { concatMap, filter, publish, reduce } = __webpack_require__(63);
+var runAsync = __webpack_require__(181);
+var utils = __webpack_require__(698);
+var Base = __webpack_require__(393);
+
+/**
+ * Base interface class other can inherits from
+ */
+
+class PromptUI extends Base {
+  constructor(prompts, opt) {
+    super(opt);
+    this.prompts = prompts;
+  }
+
+  run(questions) {
+    // Keep global reference to the answers
+    this.answers = {};
+
+    // Make sure questions is an array.
+    if (_.isPlainObject(questions)) {
+      questions = [questions];
+    }
+
+    // Create an observable, unless we received one as parameter.
+    // Note: As this is a public interface, we cannot do an instanceof check as we won't
+    // be using the exact same object in memory.
+    var obs = _.isArray(questions) ? from(questions) : questions;
+
+    this.process = obs.pipe(
+      concatMap(this.processQuestion.bind(this)),
+      publish() // Creates a hot Observable. It prevents duplicating prompts.
+    );
+
+    this.process.connect();
+
+    return this.process
+      .pipe(
+        reduce((answers, answer) => {
+          _.set(this.answers, answer.name, answer.answer);
+          return this.answers;
+        }, {})
+      )
+      .toPromise(Promise)
+      .then(this.onCompletion.bind(this));
+  }
+
+  /**
+   * Once all prompt are over
+   */
+
+  onCompletion() {
+    this.close();
+
+    return this.answers;
+  }
+
+  processQuestion(question) {
+    question = _.clone(question);
+    return defer(() => {
+      var obs = of(question);
+
+      return obs.pipe(
+        concatMap(this.setDefaultType.bind(this)),
+        concatMap(this.filterIfRunnable.bind(this)),
+        concatMap(() =>
+          utils.fetchAsyncQuestionProperty(question, 'message', this.answers)
+        ),
+        concatMap(() =>
+          utils.fetchAsyncQuestionProperty(question, 'default', this.answers)
+        ),
+        concatMap(() =>
+          utils.fetchAsyncQuestionProperty(question, 'choices', this.answers)
+        ),
+        concatMap(this.fetchAnswer.bind(this))
+      );
+    });
+  }
+
+  fetchAnswer(question) {
+    var Prompt = this.prompts[question.type];
+    this.activePrompt = new Prompt(question, this.rl, this.answers);
+    return defer(() =>
+      from(
+        this.activePrompt.run().then(answer => ({ name: question.name, answer: answer }))
+      )
+    );
+  }
+
+  setDefaultType(question) {
+    // Default type to input
+    if (!this.prompts[question.type]) {
+      question.type = 'input';
+    }
+    return defer(() => of(question));
+  }
+
+  filterIfRunnable(question) {
+    if (question.when === false) {
+      return empty();
+    }
+
+    if (!_.isFunction(question.when)) {
+      return of(question);
+    }
+
+    var answers = this.answers;
+    return defer(() =>
+      from(
+        runAsync(question.when)(answers).then(shouldRun => {
+          if (shouldRun) {
+            return question;
+          }
+        })
+      ).pipe(filter(val => val != null))
+    );
+  }
+}
+
+module.exports = PromptUI;
+
+
+/***/ }),
+/* 697 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var _ = __webpack_require__(38);
+var util = __webpack_require__(394);
+var cliWidth = __webpack_require__(606);
+var stripAnsi = __webpack_require__(329);
+var stringWidth = __webpack_require__(728);
+
+function height(content) {
+  return content.split('\n').length;
+}
+
+function lastLine(content) {
+  return _.last(content.split('\n'));
+}
+
+class ScreenManager {
+  constructor(rl) {
+    // These variables are keeping information to allow correct prompt re-rendering
+    this.height = 0;
+    this.extraLinesUnderPrompt = 0;
+
+    this.rl = rl;
+  }
+
+  render(content, bottomContent) {
+    this.rl.output.unmute();
+    this.clean(this.extraLinesUnderPrompt);
+
+    /**
+     * Write message to screen and setPrompt to control backspace
+     */
+
+    var promptLine = lastLine(content);
+    var rawPromptLine = stripAnsi(promptLine);
+
+    // Remove the rl.line from our prompt. We can't rely on the content of
+    // rl.line (mainly because of the password prompt), so just rely on it's
+    // length.
+    var prompt = rawPromptLine;
+    if (this.rl.line.length) {
+      prompt = prompt.slice(0, -this.rl.line.length);
+    }
+    this.rl.setPrompt(prompt);
+
+    // SetPrompt will change cursor position, now we can get correct value
+    var cursorPos = this.rl._getCursorPos();
+    var width = this.normalizedCliWidth();
+
+    content = this.forceLineReturn(content, width);
+    if (bottomContent) {
+      bottomContent = this.forceLineReturn(bottomContent, width);
+    }
+    // Manually insert an extra line if we're at the end of the line.
+    // This prevent the cursor from appearing at the beginning of the
+    // current line.
+    if (rawPromptLine.length % width === 0) {
+      content += '\n';
+    }
+    var fullContent = content + (bottomContent ? '\n' + bottomContent : '');
+    this.rl.output.write(fullContent);
+
+    /**
+     * Re-adjust the cursor at the correct position.
+     */
+
+    // We need to consider parts of the prompt under the cursor as part of the bottom
+    // content in order to correctly cleanup and re-render.
+    var promptLineUpDiff = Math.floor(rawPromptLine.length / width) - cursorPos.rows;
+    var bottomContentHeight =
+      promptLineUpDiff + (bottomContent ? height(bottomContent) : 0);
+    if (bottomContentHeight > 0) {
+      util.up(this.rl, bottomContentHeight);
+    }
+
+    // Reset cursor at the beginning of the line
+    util.left(this.rl, stringWidth(lastLine(fullContent)));
+
+    // Adjust cursor on the right
+    if (cursorPos.cols > 0) {
+      util.right(this.rl, cursorPos.cols);
+    }
+
+    /**
+     * Set up state for next re-rendering
+     */
+    this.extraLinesUnderPrompt = bottomContentHeight;
+    this.height = height(fullContent);
+
+    this.rl.output.mute();
+  }
+
+  clean(extraLines) {
+    if (extraLines > 0) {
+      util.down(this.rl, extraLines);
+    }
+    util.clearLine(this.rl, this.height);
+  }
+
+  done() {
+    this.rl.setPrompt('');
+    this.rl.output.unmute();
+    this.rl.output.write('\n');
+  }
+
+  releaseCursor() {
+    if (this.extraLinesUnderPrompt > 0) {
+      util.down(this.rl, this.extraLinesUnderPrompt);
+    }
+  }
+
+  normalizedCliWidth() {
+    var width = cliWidth({
+      defaultWidth: 80,
+      output: this.rl.output
+    });
+    return width;
+  }
+
+  breakLines(lines, width) {
+    // Break lines who're longer than the cli width so we can normalize the natural line
+    // returns behavior across terminals.
+    width = width || this.normalizedCliWidth();
+    var regex = new RegExp('(?:(?:\\033[[0-9;]*m)*.?){1,' + width + '}', 'g');
+    return lines.map(line => {
+      var chunk = line.match(regex);
+      // Last match is always empty
+      chunk.pop();
+      return chunk || '';
+    });
+  }
+
+  forceLineReturn(content, width) {
+    width = width || this.normalizedCliWidth();
+    return _.flatten(this.breakLines(content.split('\n'), width)).join('\n');
+  }
+}
+
+module.exports = ScreenManager;
+
+
+/***/ }),
+/* 698 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var _ = __webpack_require__(38);
+var { from, of } = __webpack_require__(182);
+var runAsync = __webpack_require__(181);
+
+/**
+ * Resolve a question property value if it is passed as a function.
+ * This method will overwrite the property on the question object with the received value.
+ * @param  {Object} question - Question object
+ * @param  {String} prop     - Property to fetch name
+ * @param  {Object} answers  - Answers object
+ * @return {Rx.Observable}   - Observable emitting once value is known
+ */
+
+exports.fetchAsyncQuestionProperty = function(question, prop, answers) {
+  if (!_.isFunction(question[prop])) {
+    return of(question);
+  }
+
+  return from(
+    runAsync(question[prop])(answers).then(value => {
+      question[prop] = value;
+      return question;
+    })
+  );
+};
+
+
+/***/ }),
+/* 699 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var util = __webpack_require__(3),
+  Match = __webpack_require__ (142);
+
+
+/**
+ * This is a superclass for the individual detectors for
+ * each of the detectable members of the ISO 2022 family
+ * of encodings.
+ */
+
+function ISO_2022() {}
+
+ISO_2022.prototype.match = function(det) {
+
+  /**
+   * Matching function shared among the 2022 detectors JP, CN and KR
+   * Counts up the number of legal an unrecognized escape sequences in
+   * the sample of text, and computes a score based on the total number &
+   * the proportion that fit the encoding.
+   *
+   *
+   * @param text the byte buffer containing text to analyse
+   * @param textLen  the size of the text in the byte.
+   * @param escapeSequences the byte escape sequences to test for.
+   * @return match quality, in the range of 0-100.
+   */
+
+  var i, j;
+  var escN;
+  var hits   = 0;
+  var misses = 0;
+  var shifts = 0;
+  var quality;
+
+  // TODO: refactor me
+  var text = det.fInputBytes;
+  var textLen = det.fInputLen;
+
+  scanInput:
+    for (i = 0; i < textLen; i++) {
+      if (text[i] == 0x1b) {
+        checkEscapes:
+          for (escN = 0; escN < this.escapeSequences.length; escN++) {
+            var seq = this.escapeSequences[escN];
+
+            if ((textLen - i) < seq.length)
+              continue checkEscapes;
+
+            for (j = 1; j < seq.length; j++)
+              if (seq[j] != text[i + j])
+                continue checkEscapes;
+
+
+            hits++;
+            i += seq.length - 1;
+            continue scanInput;
+          }
+
+          misses++;
+      }
+
+      // Shift in/out
+      if (text[i] == 0x0e || text[i] == 0x0f)
+        shifts++;
+
+    }
+
+  if (hits == 0)
+    return null;
+
+  //
+  // Initial quality is based on relative proportion of recongized vs.
+  //   unrecognized escape sequences.
+  //   All good:  quality = 100;
+  //   half or less good: quality = 0;
+  //   linear inbetween.
+  quality = (100 * hits - 100 * misses) / (hits + misses);
+
+  // Back off quality if there were too few escape sequences seen.
+  //   Include shifts in this computation, so that KR does not get penalized
+  //   for having only a single Escape sequence, but many shifts.
+  if (hits + shifts < 5)
+    quality -= (5 - (hits + shifts)) * 10;
+
+  return quality <= 0 ? null : new Match(det, this, quality);
+};
+
+module.exports.ISO_2022_JP = function() {
+  this.name = function() {
+    return 'ISO-2022-JP';
+  };
+  this.escapeSequences = [
+    [ 0x1b, 0x24, 0x28, 0x43 ],   // KS X 1001:1992
+    [ 0x1b, 0x24, 0x28, 0x44 ],   // JIS X 212-1990
+    [ 0x1b, 0x24, 0x40 ],         // JIS C 6226-1978
+    [ 0x1b, 0x24, 0x41 ],         // GB 2312-80
+    [ 0x1b, 0x24, 0x42 ],         // JIS X 208-1983
+    [ 0x1b, 0x26, 0x40 ],         // JIS X 208 1990, 1997
+    [ 0x1b, 0x28, 0x42 ],         // ASCII
+    [ 0x1b, 0x28, 0x48 ],         // JIS-Roman
+    [ 0x1b, 0x28, 0x49 ],         // Half-width katakana
+    [ 0x1b, 0x28, 0x4a ],         // JIS-Roman
+    [ 0x1b, 0x2e, 0x41 ],         // ISO 8859-1
+    [ 0x1b, 0x2e, 0x46 ]          // ISO 8859-7
+  ];
+};
+util.inherits(module.exports.ISO_2022_JP, ISO_2022);
+
+
+
+module.exports.ISO_2022_KR = function() {
+  this.name = function() {
+    return 'ISO-2022-KR';
+  };
+  this.escapeSequences = [
+    [ 0x1b, 0x24, 0x29, 0x43 ]
+  ];
+};
+util.inherits(module.exports.ISO_2022_KR, ISO_2022);
+
+
+
+module.exports.ISO_2022_CN = function() {
+  this.name = function() {
+    return 'ISO-2022-CN';
+  };
+  this.escapeSequences = [
+    [ 0x1b, 0x24, 0x29, 0x41 ],   // GB 2312-80
+    [ 0x1b, 0x24, 0x29, 0x47 ],   // CNS 11643-1992 Plane 1
+    [ 0x1b, 0x24, 0x2A, 0x48 ],   // CNS 11643-1992 Plane 2
+    [ 0x1b, 0x24, 0x29, 0x45 ],   // ISO-IR-165
+    [ 0x1b, 0x24, 0x2B, 0x49 ],   // CNS 11643-1992 Plane 3
+    [ 0x1b, 0x24, 0x2B, 0x4A ],   // CNS 11643-1992 Plane 4
+    [ 0x1b, 0x24, 0x2B, 0x4B ],   // CNS 11643-1992 Plane 5
+    [ 0x1b, 0x24, 0x2B, 0x4C ],   // CNS 11643-1992 Plane 6
+    [ 0x1b, 0x24, 0x2B, 0x4D ],   // CNS 11643-1992 Plane 7
+    [ 0x1b, 0x4e ],               // SS2
+    [ 0x1b, 0x4f ]                // SS3
+  ];
+};
+util.inherits(module.exports.ISO_2022_CN, ISO_2022);
+
+
+/***/ }),
+/* 700 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var util = __webpack_require__(3),
+  Match = __webpack_require__ (142);
+
+/**
+ * Binary search implementation (recursive)
+ */
+function binarySearch(arr, searchValue) {
+  function find(arr, searchValue, left, right) {
+    if (right < left)
+      return -1;
+
+    /*
+    int mid = mid = (left + right) / 2;
+    There is a bug in the above line;
+    Joshua Bloch suggests the following replacement:
+    */
+    var mid = Math.floor((left + right) >>> 1);
+    if (searchValue > arr[mid])
+      return find(arr, searchValue, mid + 1, right);
+
+    if (searchValue < arr[mid])
+      return find(arr, searchValue, left, mid - 1);
+
+    return mid;
+  };
+
+  return find(arr, searchValue, 0, arr.length - 1);
+};
+
+// 'Character'  iterated character class.
+//    Recognizers for specific mbcs encodings make their 'characters' available
+//    by providing a nextChar() function that fills in an instance of iteratedChar
+//    with the next char from the input.
+//    The returned characters are not converted to Unicode, but remain as the raw
+//    bytes (concatenated into an int) from the codepage data.
+//
+//  For Asian charsets, use the raw input rather than the input that has been
+//   stripped of markup.  Detection only considers multi-byte chars, effectively
+//   stripping markup anyway, and double byte chars do occur in markup too.
+//
+function IteratedChar() {
+
+  this.charValue = 0; // 1-4 bytes from the raw input data
+  this.index     = 0;
+  this.nextIndex = 0;
+  this.error     = false;
+  this.done      = false;
+
+  this.reset = function() {
+    this.charValue = 0;
+    this.index     = -1;
+    this.nextIndex = 0;
+    this.error     = false;
+    this.done      = false;
+  };
+
+  this.nextByte = function(det) {
+    if (this.nextIndex >= det.fRawLength) {
+      this.done = true;
+      return -1;
+    }
+    var byteValue = det.fRawInput[this.nextIndex++] & 0x00ff;
+    return byteValue;
+  };
+};
+
+
+
+/**
+ * Asian double or multi-byte - charsets.
+ * Match is determined mostly by the input data adhering to the
+ * encoding scheme for the charset, and, optionally,
+ * frequency-of-occurence of characters.
+ */
+
+function mbcs() {};
+
+/**
+ * Test the match of this charset with the input text data
+ *      which is obtained via the CharsetDetector object.
+ *
+ * @param det  The CharsetDetector, which contains the input text
+ *             to be checked for being in this charset.
+ * @return     Two values packed into one int  (Damn java, anyhow)
+ *             bits 0-7:  the match confidence, ranging from 0-100
+ *             bits 8-15: The match reason, an enum-like value.
+ */
+mbcs.prototype.match = function(det) {
+
+  var singleByteCharCount = 0,  //TODO Do we really need this?
+    doubleByteCharCount = 0,
+    commonCharCount     = 0,
+    badCharCount        = 0,
+    totalCharCount      = 0,
+    confidence          = 0;
+
+  var iter = new IteratedChar();
+
+  detectBlock: {
+    for (iter.reset(); this.nextChar(iter, det);) {
+      totalCharCount++;
+      if (iter.error) {
+        badCharCount++;
+      } else {
+        var cv = iter.charValue & 0xFFFFFFFF;
+
+        if (cv <= 0xff) {
+          singleByteCharCount++;
+        } else {
+          doubleByteCharCount++;
+          if (this.commonChars != null) {
+            // NOTE: This assumes that there are no 4-byte common chars.
+            if (binarySearch(this.commonChars, cv) >= 0) {
+              commonCharCount++;
+            }
+          }
+        }
+      }
+      if (badCharCount >= 2 && badCharCount * 5 >= doubleByteCharCount) {
+        // console.log('its here!')
+        // Bail out early if the byte data is not matching the encoding scheme.
+        break detectBlock;
+      }
+    }
+
+    if (doubleByteCharCount <= 10 && badCharCount== 0) {
+      // Not many multi-byte chars.
+      if (doubleByteCharCount == 0 && totalCharCount < 10) {
+        // There weren't any multibyte sequences, and there was a low density of non-ASCII single bytes.
+        // We don't have enough data to have any confidence.
+        // Statistical analysis of single byte non-ASCII charcters would probably help here.
+        confidence = 0;
+      }
+      else {
+        //   ASCII or ISO file?  It's probably not our encoding,
+        //   but is not incompatible with our encoding, so don't give it a zero.
+        confidence = 10;
+      }
+      break detectBlock;
+    }
+
+    //
+    //  No match if there are too many characters that don't fit the encoding scheme.
+    //    (should we have zero tolerance for these?)
+    //
+    if (doubleByteCharCount < 20 * badCharCount) {
+      confidence = 0;
+      break detectBlock;
+    }
+
+    if (this.commonChars == null) {
+      // We have no statistics on frequently occuring characters.
+      //  Assess confidence purely on having a reasonable number of
+      //  multi-byte characters (the more the better
+      confidence = 30 + doubleByteCharCount - 20 * badCharCount;
+      if (confidence > 100) {
+        confidence = 100;
+      }
+    } else {
+      //
+      // Frequency of occurence statistics exist.
+      //
+      var maxVal = Math.log(parseFloat(doubleByteCharCount) / 4);
+      var scaleFactor = 90.0 / maxVal;
+      confidence = Math.floor(Math.log(commonCharCount + 1) * scaleFactor + 10);
+      confidence = Math.min(confidence, 100);
+    }
+  }   // end of detectBlock:
+
+  return confidence == 0 ? null : new Match(det, this, confidence);
+};
+
+/**
+ * Get the next character (however many bytes it is) from the input data
+ *    Subclasses for specific charset encodings must implement this function
+ *    to get characters according to the rules of their encoding scheme.
+ *
+ *  This function is not a method of class iteratedChar only because
+ *   that would require a lot of extra derived classes, which is awkward.
+ * @param it  The iteratedChar 'struct' into which the returned char is placed.
+ * @param det The charset detector, which is needed to get at the input byte data
+ *            being iterated over.
+ * @return    True if a character was returned, false at end of input.
+ */
+
+mbcs.prototype.nextChar = function(iter, det) {};
+
+
+
+/**
+ * Shift-JIS charset recognizer.
+ */
+module.exports.sjis = function() {
+  this.name = function() {
+    return 'Shift-JIS';
+  };
+  this.language = function() {
+    return 'ja';
+  };
+
+  // TODO:  This set of data comes from the character frequency-
+  //        of-occurence analysis tool.  The data needs to be moved
+  //        into a resource and loaded from there.
+  this.commonChars = [
+    0x8140, 0x8141, 0x8142, 0x8145, 0x815b, 0x8169, 0x816a, 0x8175, 0x8176, 0x82a0,
+    0x82a2, 0x82a4, 0x82a9, 0x82aa, 0x82ab, 0x82ad, 0x82af, 0x82b1, 0x82b3, 0x82b5,
+    0x82b7, 0x82bd, 0x82be, 0x82c1, 0x82c4, 0x82c5, 0x82c6, 0x82c8, 0x82c9, 0x82cc,
+    0x82cd, 0x82dc, 0x82e0, 0x82e7, 0x82e8, 0x82e9, 0x82ea, 0x82f0, 0x82f1, 0x8341,
+    0x8343, 0x834e, 0x834f, 0x8358, 0x835e, 0x8362, 0x8367, 0x8375, 0x8376, 0x8389,
+    0x838a, 0x838b, 0x838d, 0x8393, 0x8e96, 0x93fa, 0x95aa
+  ];
+
+  this.nextChar = function(iter, det) {
+    iter.index = iter.nextIndex;
+    iter.error = false;
+
+    var firstByte;
+    firstByte = iter.charValue = iter.nextByte(det);
+    if (firstByte < 0)
+      return false;
+
+    if (firstByte <= 0x7f || (firstByte > 0xa0 && firstByte <= 0xdf))
+      return true;
+
+    var secondByte = iter.nextByte(det);
+    if (secondByte < 0)
+      return false;
+
+    iter.charValue = (firstByte << 8) | secondByte;
+    if (! ((secondByte >= 0x40 && secondByte <= 0x7f) || (secondByte >= 0x80 && secondByte <= 0xff))) {
+      // Illegal second byte value.
+      iter.error = true;
+    }
+    return true;
+  };
+};
+util.inherits(module.exports.sjis, mbcs);
+
+
+
+/**
+ *   Big5 charset recognizer.
+ */
+module.exports.big5 = function() {
+  this.name = function() {
+    return 'Big5';
+  };
+  this.language = function() {
+    return 'zh';
+  };
+  // TODO:  This set of data comes from the character frequency-
+  //        of-occurence analysis tool.  The data needs to be moved
+  //        into a resource and loaded from there.
+  this.commonChars = [
+    0xa140, 0xa141, 0xa142, 0xa143, 0xa147, 0xa149, 0xa175, 0xa176, 0xa440, 0xa446,
+    0xa447, 0xa448, 0xa451, 0xa454, 0xa457, 0xa464, 0xa46a, 0xa46c, 0xa477, 0xa4a3,
+    0xa4a4, 0xa4a7, 0xa4c1, 0xa4ce, 0xa4d1, 0xa4df, 0xa4e8, 0xa4fd, 0xa540, 0xa548,
+    0xa558, 0xa569, 0xa5cd, 0xa5e7, 0xa657, 0xa661, 0xa662, 0xa668, 0xa670, 0xa6a8,
+    0xa6b3, 0xa6b9, 0xa6d3, 0xa6db, 0xa6e6, 0xa6f2, 0xa740, 0xa751, 0xa759, 0xa7da,
+    0xa8a3, 0xa8a5, 0xa8ad, 0xa8d1, 0xa8d3, 0xa8e4, 0xa8fc, 0xa9c0, 0xa9d2, 0xa9f3,
+    0xaa6b, 0xaaba, 0xaabe, 0xaacc, 0xaafc, 0xac47, 0xac4f, 0xacb0, 0xacd2, 0xad59,
+    0xaec9, 0xafe0, 0xb0ea, 0xb16f, 0xb2b3, 0xb2c4, 0xb36f, 0xb44c, 0xb44e, 0xb54c,
+    0xb5a5, 0xb5bd, 0xb5d0, 0xb5d8, 0xb671, 0xb7ed, 0xb867, 0xb944, 0xbad8, 0xbb44,
+    0xbba1, 0xbdd1, 0xc2c4, 0xc3b9, 0xc440, 0xc45f
+  ];
+  this.nextChar = function(iter, det) {
+    iter.index = iter.nextIndex;
+    iter.error = false;
+
+    var firstByte = iter.charValue = iter.nextByte(det);
+
+    if (firstByte < 0)
+      return false;
+
+    // single byte character.
+    if (firstByte <= 0x7f || firstByte == 0xff)
+      return true;
+
+    var secondByte = iter.nextByte(det);
+
+    if (secondByte < 0)
+      return false;
+
+    iter.charValue = (iter.charValue << 8) | secondByte;
+
+    if (secondByte < 0x40 || secondByte == 0x7f || secondByte == 0xff)
+      iter.error = true;
+
+    return true;
+  };
+};
+util.inherits(module.exports.big5, mbcs);
+
+
+
+/**
+ *  EUC charset recognizers.  One abstract class that provides the common function
+ *  for getting the next character according to the EUC encoding scheme,
+ *  and nested derived classes for EUC_KR, EUC_JP, EUC_CN.
+ *
+ *  Get the next character value for EUC based encodings.
+ *  Character 'value' is simply the raw bytes that make up the character
+ *     packed into an int.
+ */
+function eucNextChar(iter, det) {
+  iter.index = iter.nextIndex;
+  iter.error = false;
+  var firstByte  = 0;
+  var secondByte = 0;
+  var thirdByte  = 0;
+  //int fourthByte = 0;
+  buildChar: {
+    firstByte = iter.charValue = iter.nextByte(det);
+    if (firstByte < 0) {
+      // Ran off the end of the input data
+      iter.done = true;
+      break buildChar;
+    }
+    if (firstByte <= 0x8d) {
+      // single byte char
+      break buildChar;
+    }
+    secondByte = iter.nextByte(det);
+    iter.charValue = (iter.charValue << 8) | secondByte;
+    if (firstByte >= 0xA1 && firstByte <= 0xfe) {
+      // Two byte Char
+      if (secondByte < 0xa1) {
+        iter.error = true;
+      }
+      break buildChar;
+    }
+    if (firstByte == 0x8e) {
+      // Code Set 2.
+      //   In EUC-JP, total char size is 2 bytes, only one byte of actual char value.
+      //   In EUC-TW, total char size is 4 bytes, three bytes contribute to char value.
+      // We don't know which we've got.
+      // Treat it like EUC-JP.  If the data really was EUC-TW, the following two
+      //   bytes will look like a well formed 2 byte char.
+      if (secondByte < 0xa1) {
+        iter.error = true;
+      }
+      break buildChar;
+    }
+    if (firstByte == 0x8f) {
+      // Code set 3.
+      // Three byte total char size, two bytes of actual char value.
+      thirdByte = iter.nextByte(det);
+      iter.charValue = (iter.charValue << 8) | thirdByte;
+      if (thirdByte < 0xa1) {
+        iter.error = true;
+      }
+    }
+  }
+  return iter.done == false;
+};
+
+
+
+/**
+ * The charset recognize for EUC-JP.  A singleton instance of this class
+ *    is created and kept by the public CharsetDetector class
+ */
+module.exports.euc_jp = function() {
+  this.name = function() {
+    return 'EUC-JP';
+  };
+  this.language = function() {
+    return 'ja';
+  };
+
+  // TODO:  This set of data comes from the character frequency-
+  //        of-occurence analysis tool.  The data needs to be moved
+  //        into a resource and loaded from there.
+  this.commonChars = [
+    0xa1a1, 0xa1a2, 0xa1a3, 0xa1a6, 0xa1bc, 0xa1ca, 0xa1cb, 0xa1d6, 0xa1d7, 0xa4a2,
+    0xa4a4, 0xa4a6, 0xa4a8, 0xa4aa, 0xa4ab, 0xa4ac, 0xa4ad, 0xa4af, 0xa4b1, 0xa4b3,
+    0xa4b5, 0xa4b7, 0xa4b9, 0xa4bb, 0xa4bd, 0xa4bf, 0xa4c0, 0xa4c1, 0xa4c3, 0xa4c4,
+    0xa4c6, 0xa4c7, 0xa4c8, 0xa4c9, 0xa4ca, 0xa4cb, 0xa4ce, 0xa4cf, 0xa4d0, 0xa4de,
+    0xa4df, 0xa4e1, 0xa4e2, 0xa4e4, 0xa4e8, 0xa4e9, 0xa4ea, 0xa4eb, 0xa4ec, 0xa4ef,
+    0xa4f2, 0xa4f3, 0xa5a2, 0xa5a3, 0xa5a4, 0xa5a6, 0xa5a7, 0xa5aa, 0xa5ad, 0xa5af,
+    0xa5b0, 0xa5b3, 0xa5b5, 0xa5b7, 0xa5b8, 0xa5b9, 0xa5bf, 0xa5c3, 0xa5c6, 0xa5c7,
+    0xa5c8, 0xa5c9, 0xa5cb, 0xa5d0, 0xa5d5, 0xa5d6, 0xa5d7, 0xa5de, 0xa5e0, 0xa5e1,
+    0xa5e5, 0xa5e9, 0xa5ea, 0xa5eb, 0xa5ec, 0xa5ed, 0xa5f3, 0xb8a9, 0xb9d4, 0xbaee,
+    0xbbc8, 0xbef0, 0xbfb7, 0xc4ea, 0xc6fc, 0xc7bd, 0xcab8, 0xcaf3, 0xcbdc, 0xcdd1
+  ];
+
+  this.nextChar = eucNextChar;
+};
+util.inherits(module.exports.euc_jp, mbcs);
+
+
+
+/**
+ * The charset recognize for EUC-KR.  A singleton instance of this class
+ *    is created and kept by the public CharsetDetector class
+ */
+module.exports.euc_kr = function() {
+  this.name = function() {
+    return 'EUC-KR';
+  };
+  this.language = function() {
+    return 'ko';
+  };
+
+  // TODO:  This set of data comes from the character frequency-
+  //        of-occurence analysis tool.  The data needs to be moved
+  //        into a resource and loaded from there.
+  this.commonChars = [
+    0xb0a1, 0xb0b3, 0xb0c5, 0xb0cd, 0xb0d4, 0xb0e6, 0xb0ed, 0xb0f8, 0xb0fa, 0xb0fc,
+    0xb1b8, 0xb1b9, 0xb1c7, 0xb1d7, 0xb1e2, 0xb3aa, 0xb3bb, 0xb4c2, 0xb4cf, 0xb4d9,
+    0xb4eb, 0xb5a5, 0xb5b5, 0xb5bf, 0xb5c7, 0xb5e9, 0xb6f3, 0xb7af, 0xb7c2, 0xb7ce,
+    0xb8a6, 0xb8ae, 0xb8b6, 0xb8b8, 0xb8bb, 0xb8e9, 0xb9ab, 0xb9ae, 0xb9cc, 0xb9ce,
+    0xb9fd, 0xbab8, 0xbace, 0xbad0, 0xbaf1, 0xbbe7, 0xbbf3, 0xbbfd, 0xbcad, 0xbcba,
+    0xbcd2, 0xbcf6, 0xbdba, 0xbdc0, 0xbdc3, 0xbdc5, 0xbec6, 0xbec8, 0xbedf, 0xbeee,
+    0xbef8, 0xbefa, 0xbfa1, 0xbfa9, 0xbfc0, 0xbfe4, 0xbfeb, 0xbfec, 0xbff8, 0xc0a7,
+    0xc0af, 0xc0b8, 0xc0ba, 0xc0bb, 0xc0bd, 0xc0c7, 0xc0cc, 0xc0ce, 0xc0cf, 0xc0d6,
+    0xc0da, 0xc0e5, 0xc0fb, 0xc0fc, 0xc1a4, 0xc1a6, 0xc1b6, 0xc1d6, 0xc1df, 0xc1f6,
+    0xc1f8, 0xc4a1, 0xc5cd, 0xc6ae, 0xc7cf, 0xc7d1, 0xc7d2, 0xc7d8, 0xc7e5, 0xc8ad
+  ];
+
+  this.nextChar = eucNextChar;
+};
+util.inherits(module.exports.euc_kr, mbcs);
+
+
+
+/**
+ *   GB-18030 recognizer. Uses simplified Chinese statistics.
+ */
+module.exports.gb_18030 = function() {
+  this.name = function() {
+    return 'GB18030';
+  };
+  this.language = function() {
+    return 'zh';
+  };
+
+  /*
+   *  Get the next character value for EUC based encodings.
+   *  Character 'value' is simply the raw bytes that make up the character
+   *     packed into an int.
+   */
+  this.nextChar = function(iter, det) {
+    iter.index = iter.nextIndex;
+    iter.error = false;
+    var firstByte  = 0;
+    var secondByte = 0;
+    var thirdByte  = 0;
+    var fourthByte = 0;
+    buildChar: {
+      firstByte = iter.charValue = iter.nextByte(det);
+      if (firstByte < 0) {
+        // Ran off the end of the input data
+        iter.done = true;
+        break buildChar;
+      }
+      if (firstByte <= 0x80) {
+        // single byte char
+        break buildChar;
+      }
+      secondByte = iter.nextByte(det);
+      iter.charValue = (iter.charValue << 8) | secondByte;
+      if (firstByte >= 0x81 && firstByte <= 0xFE) {
+        // Two byte Char
+        if ((secondByte >= 0x40 && secondByte <= 0x7E) || (secondByte >=80 && secondByte <= 0xFE)) {
+          break buildChar;
+        }
+        // Four byte char
+        if (secondByte >= 0x30 && secondByte <= 0x39) {
+          thirdByte = iter.nextByte(det);
+          if (thirdByte >= 0x81 && thirdByte <= 0xFE) {
+            fourthByte = iter.nextByte(det);
+            if (fourthByte >= 0x30 && fourthByte <= 0x39) {
+              iter.charValue = (iter.charValue << 16) | (thirdByte << 8) | fourthByte;
+              break buildChar;
+            }
+          }
+        }
+        iter.error = true;
+        break buildChar;
+      }
+    }
+    return iter.done == false;
+  };
+
+  // TODO:  This set of data comes from the character frequency-
+  //        of-occurence analysis tool.  The data needs to be moved
+  //        into a resource and loaded from there.
+  this.commonChars = [
+    0xa1a1, 0xa1a2, 0xa1a3, 0xa1a4, 0xa1b0, 0xa1b1, 0xa1f1, 0xa1f3, 0xa3a1, 0xa3ac,
+    0xa3ba, 0xb1a8, 0xb1b8, 0xb1be, 0xb2bb, 0xb3c9, 0xb3f6, 0xb4f3, 0xb5bd, 0xb5c4,
+    0xb5e3, 0xb6af, 0xb6d4, 0xb6e0, 0xb7a2, 0xb7a8, 0xb7bd, 0xb7d6, 0xb7dd, 0xb8b4,
+    0xb8df, 0xb8f6, 0xb9ab, 0xb9c9, 0xb9d8, 0xb9fa, 0xb9fd, 0xbacd, 0xbba7, 0xbbd6,
+    0xbbe1, 0xbbfa, 0xbcbc, 0xbcdb, 0xbcfe, 0xbdcc, 0xbecd, 0xbedd, 0xbfb4, 0xbfc6,
+    0xbfc9, 0xc0b4, 0xc0ed, 0xc1cb, 0xc2db, 0xc3c7, 0xc4dc, 0xc4ea, 0xc5cc, 0xc6f7,
+    0xc7f8, 0xc8ab, 0xc8cb, 0xc8d5, 0xc8e7, 0xc9cf, 0xc9fa, 0xcab1, 0xcab5, 0xcac7,
+    0xcad0, 0xcad6, 0xcaf5, 0xcafd, 0xccec, 0xcdf8, 0xceaa, 0xcec4, 0xced2, 0xcee5,
+    0xcfb5, 0xcfc2, 0xcfd6, 0xd0c2, 0xd0c5, 0xd0d0, 0xd0d4, 0xd1a7, 0xd2aa, 0xd2b2,
+    0xd2b5, 0xd2bb, 0xd2d4, 0xd3c3, 0xd3d0, 0xd3fd, 0xd4c2, 0xd4da, 0xd5e2, 0xd6d0
+  ];
+};
+util.inherits(module.exports.gb_18030, mbcs);
+
+
+/***/ }),
+/* 701 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var util = __webpack_require__(3),
+  Match = __webpack_require__ (142);
+
+/**
+ * This class recognizes single-byte encodings. Because the encoding scheme is so
+ * simple, language statistics are used to do the matching.
+ */
+
+function NGramParser(theNgramList, theByteMap) {
+  var N_GRAM_MASK = 0xFFFFFF;
+
+  this.byteIndex = 0;
+  this.ngram = 0;
+
+  this.ngramList = theNgramList;
+  this.byteMap = theByteMap;
+
+  this.ngramCount = 0;
+  this.hitCount = 0;
+
+  this.spaceChar;
+
+  /*
+   * Binary search for value in table, which must have exactly 64 entries.
+   */
+  this.search = function(table, value) {
+    var index = 0;
+
+    if (table[index + 32] <= value) index += 32;
+    if (table[index + 16] <= value) index += 16;
+    if (table[index + 8]  <= value) index += 8;
+    if (table[index + 4]  <= value) index += 4;
+    if (table[index + 2]  <= value) index += 2;
+    if (table[index + 1]  <= value) index += 1;
+    if (table[index]      > value)  index -= 1;
+
+    if (index < 0 || table[index] != value)
+      return -1;
+
+    return index;
+  };
+
+  this.lookup = function(thisNgram) {
+    this.ngramCount += 1;
+    if (this.search(this.ngramList, thisNgram) >= 0) {
+      this.hitCount += 1;
+    }
+  };
+
+  this.addByte = function(b) {
+    this.ngram = ((this.ngram << 8) + (b & 0xFF)) & N_GRAM_MASK;
+    this.lookup(this.ngram);
+  }
+
+  this.nextByte = function(det) {
+    if (this.byteIndex >= det.fInputLen)
+      return -1;
+
+    return det.fInputBytes[this.byteIndex++] & 0xFF;
+  }
+
+  this.parse = function(det, spaceCh) {
+    var b, ignoreSpace = false;
+    this.spaceChar = spaceCh;
+
+    while ((b = this.nextByte(det)) >= 0) {
+      var mb = this.byteMap[b];
+
+      // TODO: 0x20 might not be a space in all character sets...
+      if (mb != 0) {
+        if (!(mb == this.spaceChar && ignoreSpace)) {
+          this.addByte(mb);
+        }
+
+        ignoreSpace = (mb == this.spaceChar);
+      }
+    }
+
+    // TODO: Is this OK? The buffer could have ended in the middle of a word...
+    this.addByte(this.spaceChar);
+
+    var rawPercent = this.hitCount / this.ngramCount;
+
+    // TODO - This is a bit of a hack to take care of a case
+    // were we were getting a confidence of 135...
+    if (rawPercent > 0.33)
+      return 98;
+
+    return Math.floor(rawPercent * 300.0);
+  };
+};
+
+function NGramsPlusLang(la, ng) {
+  this.fLang = la;
+  this.fNGrams = ng;
+};
+
+function sbcs() {};
+sbcs.prototype.spaceChar = 0x20;
+sbcs.prototype.ngrams = function() {};
+sbcs.prototype.byteMap = function() {};
+sbcs.prototype.match = function(det) {
+
+  var ngrams = this.ngrams();
+  var multiple = (Array.isArray(ngrams) && ngrams[0] instanceof NGramsPlusLang);
+
+  if (!multiple) {
+    var parser = new NGramParser(ngrams, this.byteMap());
+    var confidence = parser.parse(det, this.spaceChar);
+    return confidence <= 0 ? null : new Match(det, this, confidence);
+  }
+
+  var bestConfidenceSoFar = -1;
+  var lang = null;
+
+  for (var i = ngrams.length - 1; i >= 0; i--) {
+    var ngl = ngrams[i];
+
+    var parser = new NGramParser(ngl.fNGrams, this.byteMap());
+    var confidence = parser.parse(det, this.spaceChar);
+    if (confidence > bestConfidenceSoFar) {
+      bestConfidenceSoFar = confidence;
+      lang = ngl.fLang;
+    }
+  }
+
+  var name = this.name(det);
+  return bestConfidenceSoFar <= 0 ? null : new Match(det, this, bestConfidenceSoFar, name, lang);
+};
+
+
+module.exports.ISO_8859_1 = function() {
+  this.byteMap = function() {
+    return [
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
+      0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F,
+      0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
+      0x78, 0x79, 0x7A, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
+      0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F,
+      0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
+      0x78, 0x79, 0x7A, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0xAA, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0xB5, 0x20, 0x20,
+      0x20, 0x20, 0xBA, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7,
+      0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF,
+      0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0x20,
+      0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xDF,
+      0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7,
+      0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF,
+      0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0x20,
+      0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF
+    ];
+  };
+
+  this.ngrams = function() {
+    return [
+      new NGramsPlusLang('da', [
+        0x206166, 0x206174, 0x206465, 0x20656E, 0x206572, 0x20666F, 0x206861, 0x206920,
+        0x206D65, 0x206F67, 0x2070E5, 0x207369, 0x207374, 0x207469, 0x207669, 0x616620,
+        0x616E20, 0x616E64, 0x617220, 0x617420, 0x646520, 0x64656E, 0x646572, 0x646574,
+        0x652073, 0x656420, 0x656465, 0x656E20, 0x656E64, 0x657220, 0x657265, 0x657320,
+        0x657420, 0x666F72, 0x676520, 0x67656E, 0x676572, 0x696765, 0x696C20, 0x696E67,
+        0x6B6520, 0x6B6B65, 0x6C6572, 0x6C6967, 0x6C6C65, 0x6D6564, 0x6E6465, 0x6E6520,
+        0x6E6720, 0x6E6765, 0x6F6720, 0x6F6D20, 0x6F7220, 0x70E520, 0x722064, 0x722065,
+        0x722073, 0x726520, 0x737465, 0x742073, 0x746520, 0x746572, 0x74696C, 0x766572
+      ]),
+      new NGramsPlusLang('de', [
+        0x20616E, 0x206175, 0x206265, 0x206461, 0x206465, 0x206469, 0x206569, 0x206765,
+        0x206861, 0x20696E, 0x206D69, 0x207363, 0x207365, 0x20756E, 0x207665, 0x20766F,
+        0x207765, 0x207A75, 0x626572, 0x636820, 0x636865, 0x636874, 0x646173, 0x64656E,
+        0x646572, 0x646965, 0x652064, 0x652073, 0x65696E, 0x656974, 0x656E20, 0x657220,
+        0x657320, 0x67656E, 0x68656E, 0x687420, 0x696368, 0x696520, 0x696E20, 0x696E65,
+        0x697420, 0x6C6963, 0x6C6C65, 0x6E2061, 0x6E2064, 0x6E2073, 0x6E6420, 0x6E6465,
+        0x6E6520, 0x6E6720, 0x6E6765, 0x6E7465, 0x722064, 0x726465, 0x726569, 0x736368,
+        0x737465, 0x742064, 0x746520, 0x74656E, 0x746572, 0x756E64, 0x756E67, 0x766572
+      ]),
+      new NGramsPlusLang('en', [
+        0x206120, 0x20616E, 0x206265, 0x20636F, 0x20666F, 0x206861, 0x206865, 0x20696E,
+        0x206D61, 0x206F66, 0x207072, 0x207265, 0x207361, 0x207374, 0x207468, 0x20746F,
+        0x207768, 0x616964, 0x616C20, 0x616E20, 0x616E64, 0x617320, 0x617420, 0x617465,
+        0x617469, 0x642061, 0x642074, 0x652061, 0x652073, 0x652074, 0x656420, 0x656E74,
+        0x657220, 0x657320, 0x666F72, 0x686174, 0x686520, 0x686572, 0x696420, 0x696E20,
+        0x696E67, 0x696F6E, 0x697320, 0x6E2061, 0x6E2074, 0x6E6420, 0x6E6720, 0x6E7420,
+        0x6F6620, 0x6F6E20, 0x6F7220, 0x726520, 0x727320, 0x732061, 0x732074, 0x736169,
+        0x737420, 0x742074, 0x746572, 0x746861, 0x746865, 0x74696F, 0x746F20, 0x747320
+      ]),
+      new NGramsPlusLang('es', [
+        0x206120, 0x206361, 0x20636F, 0x206465, 0x20656C, 0x20656E, 0x206573, 0x20696E,
+        0x206C61, 0x206C6F, 0x207061, 0x20706F, 0x207072, 0x207175, 0x207265, 0x207365,
+        0x20756E, 0x207920, 0x612063, 0x612064, 0x612065, 0x61206C, 0x612070, 0x616369,
+        0x61646F, 0x616C20, 0x617220, 0x617320, 0x6369F3, 0x636F6E, 0x646520, 0x64656C,
+        0x646F20, 0x652064, 0x652065, 0x65206C, 0x656C20, 0x656E20, 0x656E74, 0x657320,
+        0x657374, 0x69656E, 0x69F36E, 0x6C6120, 0x6C6F73, 0x6E2065, 0x6E7465, 0x6F2064,
+        0x6F2065, 0x6F6E20, 0x6F7220, 0x6F7320, 0x706172, 0x717565, 0x726120, 0x726573,
+        0x732064, 0x732065, 0x732070, 0x736520, 0x746520, 0x746F20, 0x756520, 0xF36E20
+      ]),
+      new NGramsPlusLang('fr', [
+        0x206175, 0x20636F, 0x206461, 0x206465, 0x206475, 0x20656E, 0x206574, 0x206C61,
+        0x206C65, 0x207061, 0x20706F, 0x207072, 0x207175, 0x207365, 0x20736F, 0x20756E,
+        0x20E020, 0x616E74, 0x617469, 0x636520, 0x636F6E, 0x646520, 0x646573, 0x647520,
+        0x652061, 0x652063, 0x652064, 0x652065, 0x65206C, 0x652070, 0x652073, 0x656E20,
+        0x656E74, 0x657220, 0x657320, 0x657420, 0x657572, 0x696F6E, 0x697320, 0x697420,
+        0x6C6120, 0x6C6520, 0x6C6573, 0x6D656E, 0x6E2064, 0x6E6520, 0x6E7320, 0x6E7420,
+        0x6F6E20, 0x6F6E74, 0x6F7572, 0x717565, 0x72206C, 0x726520, 0x732061, 0x732064,
+        0x732065, 0x73206C, 0x732070, 0x742064, 0x746520, 0x74696F, 0x756520, 0x757220
+      ]),
+      new NGramsPlusLang('it', [
+        0x20616C, 0x206368, 0x20636F, 0x206465, 0x206469, 0x206520, 0x20696C, 0x20696E,
+        0x206C61, 0x207065, 0x207072, 0x20756E, 0x612063, 0x612064, 0x612070, 0x612073,
+        0x61746F, 0x636865, 0x636F6E, 0x64656C, 0x646920, 0x652061, 0x652063, 0x652064,
+        0x652069, 0x65206C, 0x652070, 0x652073, 0x656C20, 0x656C6C, 0x656E74, 0x657220,
+        0x686520, 0x692061, 0x692063, 0x692064, 0x692073, 0x696120, 0x696C20, 0x696E20,
+        0x696F6E, 0x6C6120, 0x6C6520, 0x6C6920, 0x6C6C61, 0x6E6520, 0x6E6920, 0x6E6F20,
+        0x6E7465, 0x6F2061, 0x6F2064, 0x6F2069, 0x6F2073, 0x6F6E20, 0x6F6E65, 0x706572,
+        0x726120, 0x726520, 0x736920, 0x746120, 0x746520, 0x746920, 0x746F20, 0x7A696F
+      ]),
+      new NGramsPlusLang('nl', [
+        0x20616C, 0x206265, 0x206461, 0x206465, 0x206469, 0x206565, 0x20656E, 0x206765,
+        0x206865, 0x20696E, 0x206D61, 0x206D65, 0x206F70, 0x207465, 0x207661, 0x207665,
+        0x20766F, 0x207765, 0x207A69, 0x61616E, 0x616172, 0x616E20, 0x616E64, 0x617220,
+        0x617420, 0x636874, 0x646520, 0x64656E, 0x646572, 0x652062, 0x652076, 0x65656E,
+        0x656572, 0x656E20, 0x657220, 0x657273, 0x657420, 0x67656E, 0x686574, 0x696520,
+        0x696E20, 0x696E67, 0x697320, 0x6E2062, 0x6E2064, 0x6E2065, 0x6E2068, 0x6E206F,
+        0x6E2076, 0x6E6465, 0x6E6720, 0x6F6E64, 0x6F6F72, 0x6F7020, 0x6F7220, 0x736368,
+        0x737465, 0x742064, 0x746520, 0x74656E, 0x746572, 0x76616E, 0x766572, 0x766F6F
+      ]),
+      new NGramsPlusLang('no', [
+        0x206174, 0x206176, 0x206465, 0x20656E, 0x206572, 0x20666F, 0x206861, 0x206920,
+        0x206D65, 0x206F67, 0x2070E5, 0x207365, 0x20736B, 0x20736F, 0x207374, 0x207469,
+        0x207669, 0x20E520, 0x616E64, 0x617220, 0x617420, 0x646520, 0x64656E, 0x646574,
+        0x652073, 0x656420, 0x656E20, 0x656E65, 0x657220, 0x657265, 0x657420, 0x657474,
+        0x666F72, 0x67656E, 0x696B6B, 0x696C20, 0x696E67, 0x6B6520, 0x6B6B65, 0x6C6520,
+        0x6C6C65, 0x6D6564, 0x6D656E, 0x6E2073, 0x6E6520, 0x6E6720, 0x6E6765, 0x6E6E65,
+        0x6F6720, 0x6F6D20, 0x6F7220, 0x70E520, 0x722073, 0x726520, 0x736F6D, 0x737465,
+        0x742073, 0x746520, 0x74656E, 0x746572, 0x74696C, 0x747420, 0x747465, 0x766572
+      ]),
+      new NGramsPlusLang('pt', [
+        0x206120, 0x20636F, 0x206461, 0x206465, 0x20646F, 0x206520, 0x206573, 0x206D61,
+        0x206E6F, 0x206F20, 0x207061, 0x20706F, 0x207072, 0x207175, 0x207265, 0x207365,
+        0x20756D, 0x612061, 0x612063, 0x612064, 0x612070, 0x616465, 0x61646F, 0x616C20,
+        0x617220, 0x617261, 0x617320, 0x636F6D, 0x636F6E, 0x646120, 0x646520, 0x646F20,
+        0x646F73, 0x652061, 0x652064, 0x656D20, 0x656E74, 0x657320, 0x657374, 0x696120,
+        0x696361, 0x6D656E, 0x6E7465, 0x6E746F, 0x6F2061, 0x6F2063, 0x6F2064, 0x6F2065,
+        0x6F2070, 0x6F7320, 0x706172, 0x717565, 0x726120, 0x726573, 0x732061, 0x732064,
+        0x732065, 0x732070, 0x737461, 0x746520, 0x746F20, 0x756520, 0xE36F20, 0xE7E36F
+      ]),
+      new NGramsPlusLang('sv', [
+        0x206174, 0x206176, 0x206465, 0x20656E, 0x2066F6, 0x206861, 0x206920, 0x20696E,
+        0x206B6F, 0x206D65, 0x206F63, 0x2070E5, 0x20736B, 0x20736F, 0x207374, 0x207469,
+        0x207661, 0x207669, 0x20E472, 0x616465, 0x616E20, 0x616E64, 0x617220, 0x617474,
+        0x636820, 0x646520, 0x64656E, 0x646572, 0x646574, 0x656420, 0x656E20, 0x657220,
+        0x657420, 0x66F672, 0x67656E, 0x696C6C, 0x696E67, 0x6B6120, 0x6C6C20, 0x6D6564,
+        0x6E2073, 0x6E6120, 0x6E6465, 0x6E6720, 0x6E6765, 0x6E696E, 0x6F6368, 0x6F6D20,
+        0x6F6E20, 0x70E520, 0x722061, 0x722073, 0x726120, 0x736B61, 0x736F6D, 0x742073,
+        0x746120, 0x746520, 0x746572, 0x74696C, 0x747420, 0x766172, 0xE47220, 0xF67220,
+      ])
+    ];
+  };
+
+  this.name = function(det) {
+    return (det && det.fC1Bytes) ? 'windows-1252' : 'ISO-8859-1';
+  };
+};
+util.inherits(module.exports.ISO_8859_1, sbcs);
+
+
+module.exports.ISO_8859_2 = function() {
+  this.byteMap = function() {
+    return [
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
+      0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F,
+      0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
+      0x78, 0x79, 0x7A, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
+      0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F,
+      0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
+      0x78, 0x79, 0x7A, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0xB1, 0x20, 0xB3, 0x20, 0xB5, 0xB6, 0x20,
+      0x20, 0xB9, 0xBA, 0xBB, 0xBC, 0x20, 0xBE, 0xBF,
+      0x20, 0xB1, 0x20, 0xB3, 0x20, 0xB5, 0xB6, 0xB7,
+      0x20, 0xB9, 0xBA, 0xBB, 0xBC, 0x20, 0xBE, 0xBF,
+      0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7,
+      0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF,
+      0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0x20,
+      0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xDF,
+      0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7,
+      0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF,
+      0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0x20,
+      0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0x20
+    ];
+  }
+
+  this.ngrams = function() {
+    return [
+      new NGramsPlusLang('cs', [
+        0x206120, 0x206279, 0x20646F, 0x206A65, 0x206E61, 0x206E65, 0x206F20, 0x206F64,
+        0x20706F, 0x207072, 0x2070F8, 0x20726F, 0x207365, 0x20736F, 0x207374, 0x20746F,
+        0x207620, 0x207679, 0x207A61, 0x612070, 0x636520, 0x636820, 0x652070, 0x652073,
+        0x652076, 0x656D20, 0x656EED, 0x686F20, 0x686F64, 0x697374, 0x6A6520, 0x6B7465,
+        0x6C6520, 0x6C6920, 0x6E6120, 0x6EE920, 0x6EEC20, 0x6EED20, 0x6F2070, 0x6F646E,
+        0x6F6A69, 0x6F7374, 0x6F7520, 0x6F7661, 0x706F64, 0x706F6A, 0x70726F, 0x70F865,
+        0x736520, 0x736F75, 0x737461, 0x737469, 0x73746E, 0x746572, 0x746EED, 0x746F20,
+        0x752070, 0xBE6520, 0xE16EED, 0xE9686F, 0xED2070, 0xED2073, 0xED6D20, 0xF86564,
+      ]),
+      new NGramsPlusLang('hu', [
+        0x206120, 0x20617A, 0x206265, 0x206567, 0x20656C, 0x206665, 0x206861, 0x20686F,
+        0x206973, 0x206B65, 0x206B69, 0x206BF6, 0x206C65, 0x206D61, 0x206D65, 0x206D69,
+        0x206E65, 0x20737A, 0x207465, 0x20E973, 0x612061, 0x61206B, 0x61206D, 0x612073,
+        0x616B20, 0x616E20, 0x617A20, 0x62616E, 0x62656E, 0x656779, 0x656B20, 0x656C20,
+        0x656C65, 0x656D20, 0x656E20, 0x657265, 0x657420, 0x657465, 0x657474, 0x677920,
+        0x686F67, 0x696E74, 0x697320, 0x6B2061, 0x6BF67A, 0x6D6567, 0x6D696E, 0x6E2061,
+        0x6E616B, 0x6E656B, 0x6E656D, 0x6E7420, 0x6F6779, 0x732061, 0x737A65, 0x737A74,
+        0x737AE1, 0x73E967, 0x742061, 0x747420, 0x74E173, 0x7A6572, 0xE16E20, 0xE97320,
+      ]),
+      new NGramsPlusLang('pl', [
+        0x20637A, 0x20646F, 0x206920, 0x206A65, 0x206B6F, 0x206D61, 0x206D69, 0x206E61,
+        0x206E69, 0x206F64, 0x20706F, 0x207072, 0x207369, 0x207720, 0x207769, 0x207779,
+        0x207A20, 0x207A61, 0x612070, 0x612077, 0x616E69, 0x636820, 0x637A65, 0x637A79,
+        0x646F20, 0x647A69, 0x652070, 0x652073, 0x652077, 0x65207A, 0x65676F, 0x656A20,
+        0x656D20, 0x656E69, 0x676F20, 0x696120, 0x696520, 0x69656A, 0x6B6120, 0x6B6920,
+        0x6B6965, 0x6D6965, 0x6E6120, 0x6E6961, 0x6E6965, 0x6F2070, 0x6F7761, 0x6F7769,
+        0x706F6C, 0x707261, 0x70726F, 0x70727A, 0x727A65, 0x727A79, 0x7369EA, 0x736B69,
+        0x737461, 0x776965, 0x796368, 0x796D20, 0x7A6520, 0x7A6965, 0x7A7920, 0xF37720,
+      ]),
+      new NGramsPlusLang('ro', [
+        0x206120, 0x206163, 0x206361, 0x206365, 0x20636F, 0x206375, 0x206465, 0x206469,
+        0x206C61, 0x206D61, 0x207065, 0x207072, 0x207365, 0x2073E3, 0x20756E, 0x20BA69,
+        0x20EE6E, 0x612063, 0x612064, 0x617265, 0x617420, 0x617465, 0x617520, 0x636172,
+        0x636F6E, 0x637520, 0x63E320, 0x646520, 0x652061, 0x652063, 0x652064, 0x652070,
+        0x652073, 0x656120, 0x656920, 0x656C65, 0x656E74, 0x657374, 0x692061, 0x692063,
+        0x692064, 0x692070, 0x696520, 0x696920, 0x696E20, 0x6C6120, 0x6C6520, 0x6C6F72,
+        0x6C7569, 0x6E6520, 0x6E7472, 0x6F7220, 0x70656E, 0x726520, 0x726561, 0x727520,
+        0x73E320, 0x746520, 0x747275, 0x74E320, 0x756920, 0x756C20, 0xBA6920, 0xEE6E20,
+      ])
+    ];
+  };
+
+  this.name = function(det) {
+    return (det && det.fC1Bytes) ? 'windows-1250' : 'ISO-8859-2';
+  };
+};
+util.inherits(module.exports.ISO_8859_2, sbcs);
+
+
+module.exports.ISO_8859_5 = function() {
+  this.byteMap = function() {
+    return [
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
+      0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F,
+      0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
+      0x78, 0x79, 0x7A, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
+      0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F,
+      0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
+      0x78, 0x79, 0x7A, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7,
+      0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0x20, 0xFE, 0xFF,
+      0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7,
+      0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xDF,
+      0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7,
+      0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF,
+      0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7,
+      0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xDF,
+      0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7,
+      0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF,
+      0x20, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7,
+      0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0x20, 0xFE, 0xFF
+    ];
+  };
+
+  this.ngrams = function() {
+    return [
+      0x20D220, 0x20D2DE, 0x20D4DE, 0x20D7D0, 0x20D820, 0x20DAD0, 0x20DADE, 0x20DDD0,
+      0x20DDD5, 0x20DED1, 0x20DFDE, 0x20DFE0, 0x20E0D0, 0x20E1DE, 0x20E1E2, 0x20E2DE,
+      0x20E7E2, 0x20EDE2, 0xD0DDD8, 0xD0E2EC, 0xD3DE20, 0xD5DBEC, 0xD5DDD8, 0xD5E1E2,
+      0xD5E220, 0xD820DF, 0xD8D520, 0xD8D820, 0xD8EF20, 0xDBD5DD, 0xDBD820, 0xDBECDD,
+      0xDDD020, 0xDDD520, 0xDDD8D5, 0xDDD8EF, 0xDDDE20, 0xDDDED2, 0xDE20D2, 0xDE20DF,
+      0xDE20E1, 0xDED220, 0xDED2D0, 0xDED3DE, 0xDED920, 0xDEDBEC, 0xDEDC20, 0xDEE1E2,
+      0xDFDEDB, 0xDFE0D5, 0xDFE0D8, 0xDFE0DE, 0xE0D0D2, 0xE0D5D4, 0xE1E2D0, 0xE1E2D2,
+      0xE1E2D8, 0xE1EF20, 0xE2D5DB, 0xE2DE20, 0xE2DEE0, 0xE2EC20, 0xE7E2DE, 0xEBE520
+    ];
+  };
+
+  this.name = function(det) {
+    return 'ISO-8859-5';
+  };
+
+  this.language = function() {
+    return 'ru';
+  };
+};
+util.inherits(module.exports.ISO_8859_5, sbcs);
+
+
+module.exports.ISO_8859_6 = function() {
+  this.byteMap = function() {
+    return [
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
+      0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F,
+      0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
+      0x78, 0x79, 0x7A, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
+      0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F,
+      0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
+      0x78, 0x79, 0x7A, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7,
+      0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF,
+      0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7,
+      0xD8, 0xD9, 0xDA, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7,
+      0xE8, 0xE9, 0xEA, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20
+    ];
+  };
+
+  this.ngrams = function() {
+    return [
+      0x20C7E4, 0x20C7E6, 0x20C8C7, 0x20D9E4, 0x20E1EA, 0x20E4E4, 0x20E5E6, 0x20E8C7,
+      0xC720C7, 0xC7C120, 0xC7CA20, 0xC7D120, 0xC7E420, 0xC7E4C3, 0xC7E4C7, 0xC7E4C8,
+      0xC7E4CA, 0xC7E4CC, 0xC7E4CD, 0xC7E4CF, 0xC7E4D3, 0xC7E4D9, 0xC7E4E2, 0xC7E4E5,
+      0xC7E4E8, 0xC7E4EA, 0xC7E520, 0xC7E620, 0xC7E6CA, 0xC820C7, 0xC920C7, 0xC920E1,
+      0xC920E4, 0xC920E5, 0xC920E8, 0xCA20C7, 0xCF20C7, 0xCFC920, 0xD120C7, 0xD1C920,
+      0xD320C7, 0xD920C7, 0xD9E4E9, 0xE1EA20, 0xE420C7, 0xE4C920, 0xE4E920, 0xE4EA20,
+      0xE520C7, 0xE5C720, 0xE5C920, 0xE5E620, 0xE620C7, 0xE720C7, 0xE7C720, 0xE8C7E4,
+      0xE8E620, 0xE920C7, 0xEA20C7, 0xEA20E5, 0xEA20E8, 0xEAC920, 0xEAD120, 0xEAE620
+    ];
+  };
+
+  this.name = function(det) {
+    return 'ISO-8859-6';
+  };
+
+  this.language = function() {
+    return 'ar';
+  };
+};
+util.inherits(module.exports.ISO_8859_6, sbcs);
+
+
+module.exports.ISO_8859_7 = function() {
+  this.byteMap = function() {
+    return [
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
+      0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F,
+      0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
+      0x78, 0x79, 0x7A, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
+      0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F,
+      0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
+      0x78, 0x79, 0x7A, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0xA1, 0xA2, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0xDC, 0x20,
+      0xDD, 0xDE, 0xDF, 0x20, 0xFC, 0x20, 0xFD, 0xFE,
+      0xC0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7,
+      0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF,
+      0xF0, 0xF1, 0x20, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7,
+      0xF8, 0xF9, 0xFA, 0xFB, 0xDC, 0xDD, 0xDE, 0xDF,
+      0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7,
+      0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF,
+      0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7,
+      0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0x20
+    ];
+  };
+
+  this.ngrams = function() {
+    return [
+      0x20E1ED, 0x20E1F0, 0x20E3E9, 0x20E4E9, 0x20E5F0, 0x20E720, 0x20EAE1, 0x20ECE5,
+      0x20EDE1, 0x20EF20, 0x20F0E1, 0x20F0EF, 0x20F0F1, 0x20F3F4, 0x20F3F5, 0x20F4E7,
+      0x20F4EF, 0xDFE120, 0xE120E1, 0xE120F4, 0xE1E920, 0xE1ED20, 0xE1F0FC, 0xE1F220,
+      0xE3E9E1, 0xE5E920, 0xE5F220, 0xE720F4, 0xE7ED20, 0xE7F220, 0xE920F4, 0xE9E120,
+      0xE9EADE, 0xE9F220, 0xEAE1E9, 0xEAE1F4, 0xECE520, 0xED20E1, 0xED20E5, 0xED20F0,
+      0xEDE120, 0xEFF220, 0xEFF520, 0xF0EFF5, 0xF0F1EF, 0xF0FC20, 0xF220E1, 0xF220E5,
+      0xF220EA, 0xF220F0, 0xF220F4, 0xF3E520, 0xF3E720, 0xF3F4EF, 0xF4E120, 0xF4E1E9,
+      0xF4E7ED, 0xF4E7F2, 0xF4E9EA, 0xF4EF20, 0xF4EFF5, 0xF4F9ED, 0xF9ED20, 0xFEED20
+    ];
+  };
+
+  this.name = function(det) {
+    return (det && det.fC1Bytes) ? 'windows-1253' : 'ISO-8859-7';
+  };
+
+  this.language = function() {
+    return 'el';
+  };
+};
+util.inherits(module.exports.ISO_8859_7, sbcs);
+
+module.exports.ISO_8859_8 = function() {
+
+  this.byteMap = function() {
+    return [
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
+      0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F,
+      0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
+      0x78, 0x79, 0x7A, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
+      0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F,
+      0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
+      0x78, 0x79, 0x7A, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0xB5, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7,
+      0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF,
+      0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7,
+      0xF8, 0xF9, 0xFA, 0x20, 0x20, 0x20, 0x20, 0x20
+    ];
+  };
+
+  this.ngrams = function() {
+    return [
+      new NGramsPlusLang('he', [
+        0x20E0E5, 0x20E0E7, 0x20E0E9, 0x20E0FA, 0x20E1E9, 0x20E1EE, 0x20E4E0, 0x20E4E5,
+        0x20E4E9, 0x20E4EE, 0x20E4F2, 0x20E4F9, 0x20E4FA, 0x20ECE0, 0x20ECE4, 0x20EEE0,
+        0x20F2EC, 0x20F9EC, 0xE0FA20, 0xE420E0, 0xE420E1, 0xE420E4, 0xE420EC, 0xE420EE,
+        0xE420F9, 0xE4E5E0, 0xE5E020, 0xE5ED20, 0xE5EF20, 0xE5F820, 0xE5FA20, 0xE920E4,
+        0xE9E420, 0xE9E5FA, 0xE9E9ED, 0xE9ED20, 0xE9EF20, 0xE9F820, 0xE9FA20, 0xEC20E0,
+        0xEC20E4, 0xECE020, 0xECE420, 0xED20E0, 0xED20E1, 0xED20E4, 0xED20EC, 0xED20EE,
+        0xED20F9, 0xEEE420, 0xEF20E4, 0xF0E420, 0xF0E920, 0xF0E9ED, 0xF2EC20, 0xF820E4,
+        0xF8E9ED, 0xF9EC20, 0xFA20E0, 0xFA20E1, 0xFA20E4, 0xFA20EC, 0xFA20EE, 0xFA20F9,
+      ]),
+      new NGramsPlusLang('he', [
+        0x20E0E5, 0x20E0EC, 0x20E4E9, 0x20E4EC, 0x20E4EE, 0x20E4F0, 0x20E9F0, 0x20ECF2,
+        0x20ECF9, 0x20EDE5, 0x20EDE9, 0x20EFE5, 0x20EFE9, 0x20F8E5, 0x20F8E9, 0x20FAE0,
+        0x20FAE5, 0x20FAE9, 0xE020E4, 0xE020EC, 0xE020ED, 0xE020FA, 0xE0E420, 0xE0E5E4,
+        0xE0EC20, 0xE0EE20, 0xE120E4, 0xE120ED, 0xE120FA, 0xE420E4, 0xE420E9, 0xE420EC,
+        0xE420ED, 0xE420EF, 0xE420F8, 0xE420FA, 0xE4EC20, 0xE5E020, 0xE5E420, 0xE7E020,
+        0xE9E020, 0xE9E120, 0xE9E420, 0xEC20E4, 0xEC20ED, 0xEC20FA, 0xECF220, 0xECF920,
+        0xEDE9E9, 0xEDE9F0, 0xEDE9F8, 0xEE20E4, 0xEE20ED, 0xEE20FA, 0xEEE120, 0xEEE420,
+        0xF2E420, 0xF920E4, 0xF920ED, 0xF920FA, 0xF9E420, 0xFAE020, 0xFAE420, 0xFAE5E9,
+      ])
+    ];
+  };
+
+  this.name = function(det) {
+    return (det && det.fC1Bytes) ? 'windows-1255' : 'ISO-8859-8';
+  };
+
+  this.language = function() {
+    return 'he';
+  };
+
+};
+util.inherits(module.exports.ISO_8859_8, sbcs);
+
+
+module.exports.ISO_8859_9 = function() {
+  this.byteMap = function() {
+    return [
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
+      0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F,
+      0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
+      0x78, 0x79, 0x7A, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
+      0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F,
+      0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
+      0x78, 0x79, 0x7A, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0xAA, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0xB5, 0x20, 0x20,
+      0x20, 0x20, 0xBA, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7,
+      0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF,
+      0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0x20,
+      0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0x69, 0xFE, 0xDF,
+      0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7,
+      0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF,
+      0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0x20,
+      0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF
+    ];
+  };
+
+  this.ngrams = function() {
+    return [
+      0x206261, 0x206269, 0x206275, 0x206461, 0x206465, 0x206765, 0x206861, 0x20696C,
+      0x206B61, 0x206B6F, 0x206D61, 0x206F6C, 0x207361, 0x207461, 0x207665, 0x207961,
+      0x612062, 0x616B20, 0x616C61, 0x616D61, 0x616E20, 0x616EFD, 0x617220, 0x617261,
+      0x6172FD, 0x6173FD, 0x617961, 0x626972, 0x646120, 0x646520, 0x646920, 0x652062,
+      0x65206B, 0x656469, 0x656E20, 0x657220, 0x657269, 0x657369, 0x696C65, 0x696E20,
+      0x696E69, 0x697220, 0x6C616E, 0x6C6172, 0x6C6520, 0x6C6572, 0x6E2061, 0x6E2062,
+      0x6E206B, 0x6E6461, 0x6E6465, 0x6E6520, 0x6E6920, 0x6E696E, 0x6EFD20, 0x72696E,
+      0x72FD6E, 0x766520, 0x796120, 0x796F72, 0xFD6E20, 0xFD6E64, 0xFD6EFD, 0xFDF0FD
+    ];
+  };
+
+  this.name = function(det) {
+    return (det && det.fC1Bytes) ? 'windows-1254' : 'ISO-8859-9';
+  };
+
+  this.language = function() {
+    return 'tr';
+  };
+};
+util.inherits(module.exports.ISO_8859_9, sbcs);
+
+
+module.exports.windows_1251 = function() {
+  this.byteMap = function() {
+    return [
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
+      0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F,
+      0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
+      0x78, 0x79, 0x7A, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
+      0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F,
+      0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
+      0x78, 0x79, 0x7A, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x90, 0x83, 0x20, 0x83, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x9A, 0x20, 0x9C, 0x9D, 0x9E, 0x9F,
+      0x90, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x9A, 0x20, 0x9C, 0x9D, 0x9E, 0x9F,
+      0x20, 0xA2, 0xA2, 0xBC, 0x20, 0xB4, 0x20, 0x20,
+      0xB8, 0x20, 0xBA, 0x20, 0x20, 0x20, 0x20, 0xBF,
+      0x20, 0x20, 0xB3, 0xB3, 0xB4, 0xB5, 0x20, 0x20,
+      0xB8, 0x20, 0xBA, 0x20, 0xBC, 0xBE, 0xBE, 0xBF,
+      0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7,
+      0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF,
+      0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7,
+      0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF,
+      0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7,
+      0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF,
+      0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7,
+      0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF
+    ];
+  };
+
+  this.ngrams = function() {
+    return [
+      0x20E220, 0x20E2EE, 0x20E4EE, 0x20E7E0, 0x20E820, 0x20EAE0, 0x20EAEE, 0x20EDE0,
+      0x20EDE5, 0x20EEE1, 0x20EFEE, 0x20EFF0, 0x20F0E0, 0x20F1EE, 0x20F1F2, 0x20F2EE,
+      0x20F7F2, 0x20FDF2, 0xE0EDE8, 0xE0F2FC, 0xE3EE20, 0xE5EBFC, 0xE5EDE8, 0xE5F1F2,
+      0xE5F220, 0xE820EF, 0xE8E520, 0xE8E820, 0xE8FF20, 0xEBE5ED, 0xEBE820, 0xEBFCED,
+      0xEDE020, 0xEDE520, 0xEDE8E5, 0xEDE8FF, 0xEDEE20, 0xEDEEE2, 0xEE20E2, 0xEE20EF,
+      0xEE20F1, 0xEEE220, 0xEEE2E0, 0xEEE3EE, 0xEEE920, 0xEEEBFC, 0xEEEC20, 0xEEF1F2,
+      0xEFEEEB, 0xEFF0E5, 0xEFF0E8, 0xEFF0EE, 0xF0E0E2, 0xF0E5E4, 0xF1F2E0, 0xF1F2E2,
+      0xF1F2E8, 0xF1FF20, 0xF2E5EB, 0xF2EE20, 0xF2EEF0, 0xF2FC20, 0xF7F2EE, 0xFBF520
+    ];
+  };
+
+  this.name = function(det) {
+    return 'windows-1251';
+  };
+
+  this.language = function() {
+    return 'ru';
+  };
+};
+util.inherits(module.exports.windows_1251, sbcs);
+
+
+module.exports.windows_1256 = function() {
+  this.byteMap = function() {
+    return [
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
+      0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F,
+      0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
+      0x78, 0x79, 0x7A, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
+      0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F,
+      0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
+      0x78, 0x79, 0x7A, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x81, 0x20, 0x83, 0x20, 0x20, 0x20, 0x20,
+      0x88, 0x20, 0x8A, 0x20, 0x9C, 0x8D, 0x8E, 0x8F,
+      0x90, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x98, 0x20, 0x9A, 0x20, 0x9C, 0x20, 0x20, 0x9F,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0xAA, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0xB5, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7,
+      0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF,
+      0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0x20,
+      0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xDF,
+      0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7,
+      0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF,
+      0x20, 0x20, 0x20, 0x20, 0xF4, 0x20, 0x20, 0x20,
+      0x20, 0xF9, 0x20, 0xFB, 0xFC, 0x20, 0x20, 0xFF
+    ];
+  };
+
+  this.ngrams = function() {
+    return [
+      0x20C7E1, 0x20C7E4, 0x20C8C7, 0x20DAE1, 0x20DDED, 0x20E1E1, 0x20E3E4, 0x20E6C7,
+      0xC720C7, 0xC7C120, 0xC7CA20, 0xC7D120, 0xC7E120, 0xC7E1C3, 0xC7E1C7, 0xC7E1C8,
+      0xC7E1CA, 0xC7E1CC, 0xC7E1CD, 0xC7E1CF, 0xC7E1D3, 0xC7E1DA, 0xC7E1DE, 0xC7E1E3,
+      0xC7E1E6, 0xC7E1ED, 0xC7E320, 0xC7E420, 0xC7E4CA, 0xC820C7, 0xC920C7, 0xC920DD,
+      0xC920E1, 0xC920E3, 0xC920E6, 0xCA20C7, 0xCF20C7, 0xCFC920, 0xD120C7, 0xD1C920,
+      0xD320C7, 0xDA20C7, 0xDAE1EC, 0xDDED20, 0xE120C7, 0xE1C920, 0xE1EC20, 0xE1ED20,
+      0xE320C7, 0xE3C720, 0xE3C920, 0xE3E420, 0xE420C7, 0xE520C7, 0xE5C720, 0xE6C7E1,
+      0xE6E420, 0xEC20C7, 0xED20C7, 0xED20E3, 0xED20E6, 0xEDC920, 0xEDD120, 0xEDE420
+    ];
+  };
+
+  this.name = function(det) {
+    return 'windows-1256';
+  };
+
+  this.language = function() {
+    return 'ar';
+  };
+};
+util.inherits(module.exports.windows_1256, sbcs);
+
+
+module.exports.KOI8_R = function() {
+  this.byteMap = function() {
+    return [
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
+      0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F,
+      0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
+      0x78, 0x79, 0x7A, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
+      0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F,
+      0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
+      0x78, 0x79, 0x7A, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0xA3, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0xA3, 0x20, 0x20, 0x20, 0x20,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+      0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7,
+      0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF,
+      0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7,
+      0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xDF,
+      0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7,
+      0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF,
+      0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7,
+      0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xDF
+    ];
+  };
+
+  this.ngrams = function() {
+    return [
+      0x20C4CF, 0x20C920, 0x20CBC1, 0x20CBCF, 0x20CEC1, 0x20CEC5, 0x20CFC2, 0x20D0CF,
+      0x20D0D2, 0x20D2C1, 0x20D3CF, 0x20D3D4, 0x20D4CF, 0x20D720, 0x20D7CF, 0x20DAC1,
+      0x20DCD4, 0x20DED4, 0xC1CEC9, 0xC1D4D8, 0xC5CCD8, 0xC5CEC9, 0xC5D3D4, 0xC5D420,
+      0xC7CF20, 0xC920D0, 0xC9C520, 0xC9C920, 0xC9D120, 0xCCC5CE, 0xCCC920, 0xCCD8CE,
+      0xCEC120, 0xCEC520, 0xCEC9C5, 0xCEC9D1, 0xCECF20, 0xCECFD7, 0xCF20D0, 0xCF20D3,
+      0xCF20D7, 0xCFC7CF, 0xCFCA20, 0xCFCCD8, 0xCFCD20, 0xCFD3D4, 0xCFD720, 0xCFD7C1,
+      0xD0CFCC, 0xD0D2C5, 0xD0D2C9, 0xD0D2CF, 0xD2C1D7, 0xD2C5C4, 0xD3D120, 0xD3D4C1,
+      0xD3D4C9, 0xD3D4D7, 0xD4C5CC, 0xD4CF20, 0xD4CFD2, 0xD4D820, 0xD9C820, 0xDED4CF
+    ];
+  };
+
+  this.name = function(det) {
+    return 'KOI8-R';
+  };
+
+  this.language = function() {
+    return 'ru';
+  };
+};
+util.inherits(module.exports.KOI8_R, sbcs);
+
+
+/*
+module.exports.ISO_8859_7 = function() {
+  this.byteMap = function() {
+    return [
+
+    ];
+  };
+
+  this.ngrams = function() {
+    return [
+
+    ];
+  };
+
+  this.name = function(det) {
+    if (typeof det == 'undefined')
+      return 'ISO-8859-7';
+    return det.fC1Bytes ? 'windows-1253' : 'ISO-8859-7';
+  };
+
+  this.language = function() {
+    return 'el';
+  };
+};
+util.inherits(module.exports.ISO_8859_7, sbcs);
+*/
+
+
+
+/***/ }),
+/* 702 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var util = __webpack_require__(3),
+  Match = __webpack_require__ (142);
+
+/**
+ * This class matches UTF-16 and UTF-32, both big- and little-endian. The
+ * BOM will be used if it is present.
+ */
+module.exports.UTF_16BE = function() {
+  this.name = function() {
+    return 'UTF-16BE';
+  };
+  this.match = function(det) {
+    var input = det.fRawInput;
+
+    if (input.length >= 2 && ((input[0] & 0xff) == 0xfe && (input[1] & 0xff) == 0xff)) {
+      return new Match(det, this, 100); // confidence = 100
+    }
+
+    // TODO: Do some statistics to check for unsigned UTF-16BE
+    return null;
+  };
+};
+
+module.exports.UTF_16LE = function() {
+  this.name = function() {
+    return 'UTF-16LE';
+  };
+  this.match = function(det) {
+    var input = det.fRawInput;
+
+    if (input.length >= 2 && ((input[0] & 0xff) == 0xff && (input[1] & 0xff) == 0xfe)) {
+      // LE BOM is present.
+      if (input.length >= 4 && input[2] == 0x00 && input[3] == 0x00) {
+        // It is probably UTF-32 LE, not UTF-16
+        return null;
+      }
+      return new Match(det, this, 100); // confidence = 100
+    }
+
+    // TODO: Do some statistics to check for unsigned UTF-16LE
+    return null;
+  }
+};
+
+function UTF_32() {};
+UTF_32.prototype.match = function(det) {
+  var input      = det.fRawInput,
+    limit      = (det.fRawLength / 4) * 4,
+    numValid   = 0,
+    numInvalid = 0,
+    hasBOM     = false,
+    confidence = 0;
+
+  if (limit == 0) {
+    return null;
+  }
+
+  if (this.getChar(input, 0) == 0x0000FEFF) {
+    hasBOM = true;
+  }
+
+  for (var i = 0; i < limit; i += 4) {
+    var ch = this.getChar(input, i);
+
+    if (ch < 0 || ch >= 0x10FFFF || (ch >= 0xD800 && ch <= 0xDFFF)) {
+      numInvalid += 1;
+    } else {
+      numValid += 1;
+    }
+  }
+
+  // Cook up some sort of confidence score, based on presence of a BOM
+  //    and the existence of valid and/or invalid multi-byte sequences.
+  if (hasBOM && numInvalid == 0) {
+    confidence = 100;
+  } else if (hasBOM && numValid > numInvalid * 10) {
+    confidence = 80;
+  } else if (numValid > 3 && numInvalid == 0) {
+    confidence = 100;
+  } else if (numValid > 0 && numInvalid == 0) {
+    confidence = 80;
+  } else if (numValid > numInvalid * 10) {
+    // Probably corrupt UTF-32BE data.  Valid sequences aren't likely by chance.
+    confidence = 25;
+  }
+
+  // return confidence == 0 ? null : new CharsetMatch(det, this, confidence);
+  return confidence == 0 ? null : new Match(det, this, confidence);
+};
+
+module.exports.UTF_32BE = function() {
+  this.name = function() {
+    return 'UTF-32BE';
+  };
+  this.getChar = function(input, index) {
+    return (input[index + 0] & 0xff) << 24 | (input[index + 1] & 0xff) << 16 |
+         (input[index + 2] & 0xff) <<  8 | (input[index + 3] & 0xff);
+  };
+};
+util.inherits(module.exports.UTF_32BE, UTF_32);
+
+module.exports.UTF_32LE = function() {
+  this.name = function() {
+    return 'UTF-32LE';
+  };
+  this.getChar = function(input, index) {
+    return (input[index + 3] & 0xff) << 24 | (input[index + 2] & 0xff) << 16 |
+         (input[index + 1] & 0xff) <<  8 | (input[index + 0] & 0xff);
+  };
+};
+util.inherits(module.exports.UTF_32LE, UTF_32);
+
+
+/***/ }),
+/* 703 */
+/***/ (function(module, exports, __webpack_require__) {
+
+
+var Match = __webpack_require__ (142);
+
+/**
+ * Charset recognizer for UTF-8
+ */
+module.exports = function() {
+  this.name = function() {
+    return 'UTF-8';
+  };
+  this.match = function(det) {
+
+    var hasBOM = false,
+      numValid = 0,
+      numInvalid = 0,
+      input = det.fRawInput,
+      trailBytes = 0,
+      confidence;
+
+    if (det.fRawLength >= 3 &&
+      (input[0] & 0xff) == 0xef && (input[1] & 0xff) == 0xbb && (input[2] & 0xff) == 0xbf) {
+      hasBOM = true;
+    }
+
+    // Scan for multi-byte sequences
+    for (var i = 0; i < det.fRawLength; i++) {
+      var b = input[i];
+      if ((b & 0x80) == 0)
+        continue; // ASCII
+
+      // Hi bit on char found.  Figure out how long the sequence should be
+      if ((b & 0x0e0) == 0x0c0) {
+        trailBytes = 1;
+      } else if ((b & 0x0f0) == 0x0e0) {
+        trailBytes = 2;
+      } else if ((b & 0x0f8) == 0xf0) {
+        trailBytes = 3;
+      } else {
+        numInvalid++;
+        if (numInvalid > 5)
+          break;
+        trailBytes = 0;
+      }
+
+      // Verify that we've got the right number of trail bytes in the sequence
+      for (;;) {
+        i++;
+        if (i >= det.fRawLength)
+          break;
+
+        if ((input[i] & 0xc0) != 0x080) {
+          numInvalid++;
+          break;
+        }
+        if (--trailBytes == 0) {
+          numValid++;
+          break;
+        }
+      }
+    }
+
+    // Cook up some sort of confidence score, based on presense of a BOM
+    //    and the existence of valid and/or invalid multi-byte sequences.
+    confidence = 0;
+    if (hasBOM && numInvalid == 0)
+      confidence = 100;
+    else if (hasBOM && numValid > numInvalid * 10)
+      confidence = 80;
+    else if (numValid > 3 && numInvalid == 0)
+      confidence = 100;
+    else if (numValid > 0 && numInvalid == 0)
+      confidence = 80;
+    else if (numValid == 0 && numInvalid == 0)
+      // Plain ASCII.
+      confidence = 10;
+    else if (numValid > numInvalid * 10)
+      // Probably corruput utf-8 data.  Valid sequences aren't likely by chance.
+      confidence = 25;
+    else
+      return null
+
+    return new Match(det, this, confidence);
+  };
+};
+
+
+/***/ }),
+/* 704 */
+/***/ (function(module, exports, __webpack_require__) {
+
+
+var fs = __webpack_require__(5);
+
+var utf8  = __webpack_require__(703),
+  unicode = __webpack_require__(702),
+  mbcs    = __webpack_require__(700),
+  sbcs    = __webpack_require__(701),
+  iso2022 = __webpack_require__(699);
+
+var self = this;
+
+var recognisers = [
+  new utf8,
+  new unicode.UTF_16BE,
+  new unicode.UTF_16LE,
+  new unicode.UTF_32BE,
+  new unicode.UTF_32LE,
+  new mbcs.sjis,
+  new mbcs.big5,
+  new mbcs.euc_jp,
+  new mbcs.euc_kr,
+  new mbcs.gb_18030,
+  new iso2022.ISO_2022_JP,
+  new iso2022.ISO_2022_KR,
+  new iso2022.ISO_2022_CN,
+  new sbcs.ISO_8859_1,
+  new sbcs.ISO_8859_2,
+  new sbcs.ISO_8859_5,
+  new sbcs.ISO_8859_6,
+  new sbcs.ISO_8859_7,
+  new sbcs.ISO_8859_8,
+  new sbcs.ISO_8859_9,
+  new sbcs.windows_1251,
+  new sbcs.windows_1256,
+  new sbcs.KOI8_R
+];
+
+module.exports.detect = function(buffer, opts) {
+
+  // Tally up the byte occurence statistics.
+  var fByteStats = [];
+  for (var i = 0; i < 256; i++)
+    fByteStats[i] = 0;
+
+  for (var i = buffer.length - 1; i >= 0; i--)
+    fByteStats[buffer[i] & 0x00ff]++;
+
+  var fC1Bytes = false;
+  for (var i = 0x80; i <= 0x9F; i += 1) {
+    if (fByteStats[i] != 0) {
+      fC1Bytes = true;
+      break;
+    }
+  }
+
+  var context = {
+    fByteStats:  fByteStats,
+    fC1Bytes:    fC1Bytes,
+    fRawInput:   buffer,
+    fRawLength:  buffer.length,
+    fInputBytes: buffer,
+    fInputLen:   buffer.length
+  };
+
+  var matches = recognisers.map(function(rec) {
+    return rec.match(context);
+  }).filter(function(match) {
+    return !!match;
+  }).sort(function(a, b) {
+    return b.confidence - a.confidence;
+  });
+
+  if (opts && opts.returnAllMatches === true) {
+    return matches;
+  }
+  else {
+    return matches.length > 0 ? matches[0].name : null;
+  }
+};
+
+module.exports.detectFile = function(filepath, opts, cb) {
+  if (typeof opts === 'function') {
+    cb = opts;
+    opts = undefined;
+  }
+
+  var fd;
+
+  var handler = function(err, buffer) {
+    if (fd) {
+      fs.closeSync(fd);
+    }
+
+    if (err) return cb(err, null);
+    cb(null, self.detect(buffer, opts));
+  };
+
+  if (opts && opts.sampleSize) {
+    fd = fs.openSync(filepath, 'r'),
+      sample = Buffer.allocUnsafe(opts.sampleSize);
+
+    fs.read(fd, sample, 0, opts.sampleSize, null, function(err) {
+      handler(err, sample);
+    });
+    return;
+  }
+
+  fs.readFile(filepath, handler);
+};
+
+module.exports.detectFileSync = function(filepath, opts) {
+  if (opts && opts.sampleSize) {
+    var fd = fs.openSync(filepath, 'r'),
+      sample = Buffer.allocUnsafe(opts.sampleSize);
+
+    fs.readSync(fd, sample, 0, opts.sampleSize);
+    fs.closeSync(fd);
+    return self.detect(sample, opts);
+  }
+
+  return self.detect(fs.readFileSync(filepath), opts);
+};
+
+// Wrappers for the previous functions to return all encodings
+module.exports.detectAll = function(buffer, opts) {
+  if (typeof opts !== 'object') {
+    opts = {};
+  }
+  opts.returnAllMatches = true;
+  return self.detect(buffer, opts);
+}
+
+module.exports.detectFileAll = function(filepath, opts, cb) {
+  if (typeof opts === 'function') {
+    cb = opts;
+    opts = undefined;
+  }
+  if (typeof opts !== 'object') {
+    opts = {};
+  }
+  opts.returnAllMatches = true;
+  self.detectFile(filepath, opts, cb);
+}
+
+module.exports.detectFileAllSync = function(filepath, opts) {
+  if (typeof opts !== 'object') {
+    opts = {};
+  }
+  opts.returnAllMatches = true;
+  return self.detectFileSync(filepath, opts);
+}
+
+
+/***/ }),
+/* 705 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/***
+ * Node External Editor
+ *
+ * Kevin Gravier <kevin@mrkmg.com>
+ * MIT 2018
+ */
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var CreateFileError = /** @class */ (function (_super) {
+    __extends(CreateFileError, _super);
+    function CreateFileError(originalError) {
+        var _newTarget = this.constructor;
+        var _this = _super.call(this, "Failed to create temporary file for editor") || this;
+        _this.originalError = originalError;
+        var proto = _newTarget.prototype;
+        if (Object.setPrototypeOf) {
+            Object.setPrototypeOf(_this, proto);
+        }
+        else {
+            _this.__proto__ = _newTarget.prototype;
+        }
+        return _this;
+    }
+    return CreateFileError;
+}(Error));
+exports.CreateFileError = CreateFileError;
+
+
+/***/ }),
+/* 706 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/***
+ * Node External Editor
+ *
+ * Kevin Gravier <kevin@mrkmg.com>
+ * MIT 2018
+ */
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var LaunchEditorError = /** @class */ (function (_super) {
+    __extends(LaunchEditorError, _super);
+    function LaunchEditorError(originalError) {
+        var _newTarget = this.constructor;
+        var _this = _super.call(this, "Failed launch editor") || this;
+        _this.originalError = originalError;
+        var proto = _newTarget.prototype;
+        if (Object.setPrototypeOf) {
+            Object.setPrototypeOf(_this, proto);
+        }
+        else {
+            _this.__proto__ = _newTarget.prototype;
+        }
+        return _this;
+    }
+    return LaunchEditorError;
+}(Error));
+exports.LaunchEditorError = LaunchEditorError;
+
+
+/***/ }),
+/* 707 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/***
+ * Node External Editor
+ *
+ * Kevin Gravier <kevin@mrkmg.com>
+ * MIT 2018
+ */
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var ReadFileError = /** @class */ (function (_super) {
+    __extends(ReadFileError, _super);
+    function ReadFileError(originalError) {
+        var _newTarget = this.constructor;
+        var _this = _super.call(this, "Failed to read temporary file") || this;
+        _this.originalError = originalError;
+        var proto = _newTarget.prototype;
+        if (Object.setPrototypeOf) {
+            Object.setPrototypeOf(_this, proto);
+        }
+        else {
+            _this.__proto__ = _newTarget.prototype;
+        }
+        return _this;
+    }
+    return ReadFileError;
+}(Error));
+exports.ReadFileError = ReadFileError;
+
+
+/***/ }),
+/* 708 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/***
+ * Node External Editor
+ *
+ * Kevin Gravier <kevin@mrkmg.com>
+ * MIT 2018
+ */
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var RemoveFileError = /** @class */ (function (_super) {
+    __extends(RemoveFileError, _super);
+    function RemoveFileError(originalError) {
+        var _newTarget = this.constructor;
+        var _this = _super.call(this, "Failed to cleanup temporary file") || this;
+        _this.originalError = originalError;
+        var proto = _newTarget.prototype;
+        if (Object.setPrototypeOf) {
+            Object.setPrototypeOf(_this, proto);
+        }
+        else {
+            _this.__proto__ = _newTarget.prototype;
+        }
+        return _this;
+    }
+    return RemoveFileError;
+}(Error));
+exports.RemoveFileError = RemoveFileError;
+
+
+/***/ }),
+/* 709 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/***
+ * Node External Editor
+ *
+ * Kevin Gravier <kevin@mrkmg.com>
+ * MIT 2018
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+var chardet_1 = __webpack_require__(704);
+var child_process_1 = __webpack_require__(331);
+var fs_1 = __webpack_require__(5);
+var iconv_lite_1 = __webpack_require__(726);
+var tmp_1 = __webpack_require__(954);
+var CreateFileError_1 = __webpack_require__(705);
+exports.CreateFileError = CreateFileError_1.CreateFileError;
+var LaunchEditorError_1 = __webpack_require__(706);
+exports.LaunchEditorError = LaunchEditorError_1.LaunchEditorError;
+var ReadFileError_1 = __webpack_require__(707);
+exports.ReadFileError = ReadFileError_1.ReadFileError;
+var RemoveFileError_1 = __webpack_require__(708);
+exports.RemoveFileError = RemoveFileError_1.RemoveFileError;
+function edit(text) {
+    if (text === void 0) { text = ""; }
+    var editor = new ExternalEditor(text);
+    editor.run();
+    editor.cleanup();
+    return editor.text;
+}
+exports.edit = edit;
+function editAsync(text, callback) {
+    if (text === void 0) { text = ""; }
+    var editor = new ExternalEditor(text);
+    editor.runAsync(function (err, result) {
+        if (err) {
+            setImmediate(callback, err, null);
+        }
+        else {
+            try {
+                editor.cleanup();
+                setImmediate(callback, null, result);
+            }
+            catch (cleanupError) {
+                setImmediate(callback, cleanupError, null);
+            }
+        }
+    });
+}
+exports.editAsync = editAsync;
+var ExternalEditor = /** @class */ (function () {
+    function ExternalEditor(text) {
+        if (text === void 0) { text = ""; }
+        this.text = "";
+        this.text = text;
+        this.determineEditor();
+        this.createTemporaryFile();
+    }
+    ExternalEditor.splitStringBySpace = function (str) {
+        var pieces = [];
+        var currentString = "";
+        for (var strIndex = 0; strIndex < str.length; strIndex++) {
+            var currentLetter = str[strIndex];
+            if (strIndex > 0 && currentLetter === " " && str[strIndex - 1] !== "\\" && currentString.length > 0) {
+                pieces.push(currentString);
+                currentString = "";
+            }
+            else {
+                currentString += currentLetter;
+            }
+        }
+        if (currentString.length > 0) {
+            pieces.push(currentString);
+        }
+        return pieces;
+    };
+    Object.defineProperty(ExternalEditor.prototype, "temp_file", {
+        get: function () {
+            console.log("DEPRECATED: temp_file. Use tempFile moving forward.");
+            return this.tempFile;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(ExternalEditor.prototype, "last_exit_status", {
+        get: function () {
+            console.log("DEPRECATED: last_exit_status. Use lastExitStatus moving forward.");
+            return this.lastExitStatus;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    ExternalEditor.prototype.run = function () {
+        this.launchEditor();
+        this.readTemporaryFile();
+        return this.text;
+    };
+    ExternalEditor.prototype.runAsync = function (callback) {
+        var _this = this;
+        try {
+            this.launchEditorAsync(function () {
+                try {
+                    _this.readTemporaryFile();
+                    setImmediate(callback, null, _this.text);
+                }
+                catch (readError) {
+                    setImmediate(callback, readError, null);
+                }
+            });
+        }
+        catch (launchError) {
+            setImmediate(callback, launchError, null);
+        }
+    };
+    ExternalEditor.prototype.cleanup = function () {
+        this.removeTemporaryFile();
+    };
+    ExternalEditor.prototype.determineEditor = function () {
+        var editor = process.env.VISUAL ? process.env.VISUAL :
+            process.env.EDITOR ? process.env.EDITOR :
+                /^win/.test(process.platform) ? "notepad" :
+                    "vim";
+        var editorOpts = ExternalEditor.splitStringBySpace(editor).map(function (piece) { return piece.replace("\\ ", " "); });
+        var bin = editorOpts.shift();
+        this.editor = { args: editorOpts, bin: bin };
+    };
+    ExternalEditor.prototype.createTemporaryFile = function () {
+        try {
+            this.tempFile = tmp_1.tmpNameSync({});
+            fs_1.writeFileSync(this.tempFile, this.text, { encoding: "utf8" });
+        }
+        catch (createFileError) {
+            throw new CreateFileError_1.CreateFileError(createFileError);
+        }
+    };
+    ExternalEditor.prototype.readTemporaryFile = function () {
+        try {
+            var tempFileBuffer = fs_1.readFileSync(this.tempFile);
+            if (tempFileBuffer.length === 0) {
+                this.text = "";
+            }
+            else {
+                var encoding = chardet_1.detect(tempFileBuffer).toString();
+                if (!iconv_lite_1.encodingExists(encoding)) {
+                    // Probably a bad idea, but will at least prevent crashing
+                    encoding = "utf8";
+                }
+                this.text = iconv_lite_1.decode(tempFileBuffer, encoding);
+            }
+        }
+        catch (readFileError) {
+            throw new ReadFileError_1.ReadFileError(readFileError);
+        }
+    };
+    ExternalEditor.prototype.removeTemporaryFile = function () {
+        try {
+            fs_1.unlinkSync(this.tempFile);
+        }
+        catch (removeFileError) {
+            throw new RemoveFileError_1.RemoveFileError(removeFileError);
+        }
+    };
+    ExternalEditor.prototype.launchEditor = function () {
+        try {
+            var editorProcess = child_process_1.spawnSync(this.editor.bin, this.editor.args.concat([this.tempFile]), { stdio: "inherit" });
+            this.lastExitStatus = editorProcess.status;
+        }
+        catch (launchError) {
+            throw new LaunchEditorError_1.LaunchEditorError(launchError);
+        }
+    };
+    ExternalEditor.prototype.launchEditorAsync = function (callback) {
+        var _this = this;
+        try {
+            var editorProcess = child_process_1.spawn(this.editor.bin, this.editor.args.concat([this.tempFile]), { stdio: "inherit" });
+            editorProcess.on("exit", function (code) {
+                _this.lastExitStatus = code;
+                setImmediate(callback);
+            });
+        }
+        catch (launchError) {
+            throw new LaunchEditorError_1.LaunchEditorError(launchError);
+        }
+    };
+    return ExternalEditor;
+}());
+exports.ExternalEditor = ExternalEditor;
+
+
+/***/ }),
+/* 710 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var Buffer = __webpack_require__(15).Buffer;
+
+// Multibyte codec. In this scheme, a character is represented by 1 or more bytes.
+// Our codec supports UTF-16 surrogates, extensions for GB18030 and unicode sequences.
+// To save memory and loading time, we read table files only when requested.
+
+exports._dbcs = DBCSCodec;
+
+var UNASSIGNED = -1,
+    GB18030_CODE = -2,
+    SEQ_START  = -10,
+    NODE_START = -1000,
+    UNASSIGNED_NODE = new Array(0x100),
+    DEF_CHAR = -1;
+
+for (var i = 0; i < 0x100; i++)
+    UNASSIGNED_NODE[i] = UNASSIGNED;
+
+
+// Class DBCSCodec reads and initializes mapping tables.
+function DBCSCodec(codecOptions, iconv) {
+    this.encodingName = codecOptions.encodingName;
+    if (!codecOptions)
+        throw new Error("DBCS codec is called without the data.")
+    if (!codecOptions.table)
+        throw new Error("Encoding '" + this.encodingName + "' has no data.");
+
+    // Load tables.
+    var mappingTable = codecOptions.table();
+
+
+    // Decode tables: MBCS -> Unicode.
+
+    // decodeTables is a trie, encoded as an array of arrays of integers. Internal arrays are trie nodes and all have len = 256.
+    // Trie root is decodeTables[0].
+    // Values: >=  0 -> unicode character code. can be > 0xFFFF
+    //         == UNASSIGNED -> unknown/unassigned sequence.
+    //         == GB18030_CODE -> this is the end of a GB18030 4-byte sequence.
+    //         <= NODE_START -> index of the next node in our trie to process next byte.
+    //         <= SEQ_START  -> index of the start of a character code sequence, in decodeTableSeq.
+    this.decodeTables = [];
+    this.decodeTables[0] = UNASSIGNED_NODE.slice(0); // Create root node.
+
+    // Sometimes a MBCS char corresponds to a sequence of unicode chars. We store them as arrays of integers here. 
+    this.decodeTableSeq = [];
+
+    // Actual mapping tables consist of chunks. Use them to fill up decode tables.
+    for (var i = 0; i < mappingTable.length; i++)
+        this._addDecodeChunk(mappingTable[i]);
+
+    this.defaultCharUnicode = iconv.defaultCharUnicode;
+
+    
+    // Encode tables: Unicode -> DBCS.
+
+    // `encodeTable` is array mapping from unicode char to encoded char. All its values are integers for performance.
+    // Because it can be sparse, it is represented as array of buckets by 256 chars each. Bucket can be null.
+    // Values: >=  0 -> it is a normal char. Write the value (if <=256 then 1 byte, if <=65536 then 2 bytes, etc.).
+    //         == UNASSIGNED -> no conversion found. Output a default char.
+    //         <= SEQ_START  -> it's an index in encodeTableSeq, see below. The character starts a sequence.
+    this.encodeTable = [];
+    
+    // `encodeTableSeq` is used when a sequence of unicode characters is encoded as a single code. We use a tree of
+    // objects where keys correspond to characters in sequence and leafs are the encoded dbcs values. A special DEF_CHAR key
+    // means end of sequence (needed when one sequence is a strict subsequence of another).
+    // Objects are kept separately from encodeTable to increase performance.
+    this.encodeTableSeq = [];
+
+    // Some chars can be decoded, but need not be encoded.
+    var skipEncodeChars = {};
+    if (codecOptions.encodeSkipVals)
+        for (var i = 0; i < codecOptions.encodeSkipVals.length; i++) {
+            var val = codecOptions.encodeSkipVals[i];
+            if (typeof val === 'number')
+                skipEncodeChars[val] = true;
+            else
+                for (var j = val.from; j <= val.to; j++)
+                    skipEncodeChars[j] = true;
+        }
+        
+    // Use decode trie to recursively fill out encode tables.
+    this._fillEncodeTable(0, 0, skipEncodeChars);
+
+    // Add more encoding pairs when needed.
+    if (codecOptions.encodeAdd) {
+        for (var uChar in codecOptions.encodeAdd)
+            if (Object.prototype.hasOwnProperty.call(codecOptions.encodeAdd, uChar))
+                this._setEncodeChar(uChar.charCodeAt(0), codecOptions.encodeAdd[uChar]);
+    }
+
+    this.defCharSB  = this.encodeTable[0][iconv.defaultCharSingleByte.charCodeAt(0)];
+    if (this.defCharSB === UNASSIGNED) this.defCharSB = this.encodeTable[0]['?'];
+    if (this.defCharSB === UNASSIGNED) this.defCharSB = "?".charCodeAt(0);
+
+
+    // Load & create GB18030 tables when needed.
+    if (typeof codecOptions.gb18030 === 'function') {
+        this.gb18030 = codecOptions.gb18030(); // Load GB18030 ranges.
+
+        // Add GB18030 decode tables.
+        var thirdByteNodeIdx = this.decodeTables.length;
+        var thirdByteNode = this.decodeTables[thirdByteNodeIdx] = UNASSIGNED_NODE.slice(0);
+
+        var fourthByteNodeIdx = this.decodeTables.length;
+        var fourthByteNode = this.decodeTables[fourthByteNodeIdx] = UNASSIGNED_NODE.slice(0);
+
+        for (var i = 0x81; i <= 0xFE; i++) {
+            var secondByteNodeIdx = NODE_START - this.decodeTables[0][i];
+            var secondByteNode = this.decodeTables[secondByteNodeIdx];
+            for (var j = 0x30; j <= 0x39; j++)
+                secondByteNode[j] = NODE_START - thirdByteNodeIdx;
+        }
+        for (var i = 0x81; i <= 0xFE; i++)
+            thirdByteNode[i] = NODE_START - fourthByteNodeIdx;
+        for (var i = 0x30; i <= 0x39; i++)
+            fourthByteNode[i] = GB18030_CODE
+    }        
+}
+
+DBCSCodec.prototype.encoder = DBCSEncoder;
+DBCSCodec.prototype.decoder = DBCSDecoder;
+
+// Decoder helpers
+DBCSCodec.prototype._getDecodeTrieNode = function(addr) {
+    var bytes = [];
+    for (; addr > 0; addr >>= 8)
+        bytes.push(addr & 0xFF);
+    if (bytes.length == 0)
+        bytes.push(0);
+
+    var node = this.decodeTables[0];
+    for (var i = bytes.length-1; i > 0; i--) { // Traverse nodes deeper into the trie.
+        var val = node[bytes[i]];
+
+        if (val == UNASSIGNED) { // Create new node.
+            node[bytes[i]] = NODE_START - this.decodeTables.length;
+            this.decodeTables.push(node = UNASSIGNED_NODE.slice(0));
+        }
+        else if (val <= NODE_START) { // Existing node.
+            node = this.decodeTables[NODE_START - val];
+        }
+        else
+            throw new Error("Overwrite byte in " + this.encodingName + ", addr: " + addr.toString(16));
+    }
+    return node;
+}
+
+
+DBCSCodec.prototype._addDecodeChunk = function(chunk) {
+    // First element of chunk is the hex mbcs code where we start.
+    var curAddr = parseInt(chunk[0], 16);
+
+    // Choose the decoding node where we'll write our chars.
+    var writeTable = this._getDecodeTrieNode(curAddr);
+    curAddr = curAddr & 0xFF;
+
+    // Write all other elements of the chunk to the table.
+    for (var k = 1; k < chunk.length; k++) {
+        var part = chunk[k];
+        if (typeof part === "string") { // String, write as-is.
+            for (var l = 0; l < part.length;) {
+                var code = part.charCodeAt(l++);
+                if (0xD800 <= code && code < 0xDC00) { // Decode surrogate
+                    var codeTrail = part.charCodeAt(l++);
+                    if (0xDC00 <= codeTrail && codeTrail < 0xE000)
+                        writeTable[curAddr++] = 0x10000 + (code - 0xD800) * 0x400 + (codeTrail - 0xDC00);
+                    else
+                        throw new Error("Incorrect surrogate pair in "  + this.encodingName + " at chunk " + chunk[0]);
+                }
+                else if (0x0FF0 < code && code <= 0x0FFF) { // Character sequence (our own encoding used)
+                    var len = 0xFFF - code + 2;
+                    var seq = [];
+                    for (var m = 0; m < len; m++)
+                        seq.push(part.charCodeAt(l++)); // Simple variation: don't support surrogates or subsequences in seq.
+
+                    writeTable[curAddr++] = SEQ_START - this.decodeTableSeq.length;
+                    this.decodeTableSeq.push(seq);
+                }
+                else
+                    writeTable[curAddr++] = code; // Basic char
+            }
+        } 
+        else if (typeof part === "number") { // Integer, meaning increasing sequence starting with prev character.
+            var charCode = writeTable[curAddr - 1] + 1;
+            for (var l = 0; l < part; l++)
+                writeTable[curAddr++] = charCode++;
+        }
+        else
+            throw new Error("Incorrect type '" + typeof part + "' given in "  + this.encodingName + " at chunk " + chunk[0]);
+    }
+    if (curAddr > 0xFF)
+        throw new Error("Incorrect chunk in "  + this.encodingName + " at addr " + chunk[0] + ": too long" + curAddr);
+}
+
+// Encoder helpers
+DBCSCodec.prototype._getEncodeBucket = function(uCode) {
+    var high = uCode >> 8; // This could be > 0xFF because of astral characters.
+    if (this.encodeTable[high] === undefined)
+        this.encodeTable[high] = UNASSIGNED_NODE.slice(0); // Create bucket on demand.
+    return this.encodeTable[high];
+}
+
+DBCSCodec.prototype._setEncodeChar = function(uCode, dbcsCode) {
+    var bucket = this._getEncodeBucket(uCode);
+    var low = uCode & 0xFF;
+    if (bucket[low] <= SEQ_START)
+        this.encodeTableSeq[SEQ_START-bucket[low]][DEF_CHAR] = dbcsCode; // There's already a sequence, set a single-char subsequence of it.
+    else if (bucket[low] == UNASSIGNED)
+        bucket[low] = dbcsCode;
+}
+
+DBCSCodec.prototype._setEncodeSequence = function(seq, dbcsCode) {
+    
+    // Get the root of character tree according to first character of the sequence.
+    var uCode = seq[0];
+    var bucket = this._getEncodeBucket(uCode);
+    var low = uCode & 0xFF;
+
+    var node;
+    if (bucket[low] <= SEQ_START) {
+        // There's already a sequence with  - use it.
+        node = this.encodeTableSeq[SEQ_START-bucket[low]];
+    }
+    else {
+        // There was no sequence object - allocate a new one.
+        node = {};
+        if (bucket[low] !== UNASSIGNED) node[DEF_CHAR] = bucket[low]; // If a char was set before - make it a single-char subsequence.
+        bucket[low] = SEQ_START - this.encodeTableSeq.length;
+        this.encodeTableSeq.push(node);
+    }
+
+    // Traverse the character tree, allocating new nodes as needed.
+    for (var j = 1; j < seq.length-1; j++) {
+        var oldVal = node[uCode];
+        if (typeof oldVal === 'object')
+            node = oldVal;
+        else {
+            node = node[uCode] = {}
+            if (oldVal !== undefined)
+                node[DEF_CHAR] = oldVal
+        }
+    }
+
+    // Set the leaf to given dbcsCode.
+    uCode = seq[seq.length-1];
+    node[uCode] = dbcsCode;
+}
+
+DBCSCodec.prototype._fillEncodeTable = function(nodeIdx, prefix, skipEncodeChars) {
+    var node = this.decodeTables[nodeIdx];
+    for (var i = 0; i < 0x100; i++) {
+        var uCode = node[i];
+        var mbCode = prefix + i;
+        if (skipEncodeChars[mbCode])
+            continue;
+
+        if (uCode >= 0)
+            this._setEncodeChar(uCode, mbCode);
+        else if (uCode <= NODE_START)
+            this._fillEncodeTable(NODE_START - uCode, mbCode << 8, skipEncodeChars);
+        else if (uCode <= SEQ_START)
+            this._setEncodeSequence(this.decodeTableSeq[SEQ_START - uCode], mbCode);
+    }
+}
+
+
+
+// == Encoder ==================================================================
+
+function DBCSEncoder(options, codec) {
+    // Encoder state
+    this.leadSurrogate = -1;
+    this.seqObj = undefined;
+    
+    // Static data
+    this.encodeTable = codec.encodeTable;
+    this.encodeTableSeq = codec.encodeTableSeq;
+    this.defaultCharSingleByte = codec.defCharSB;
+    this.gb18030 = codec.gb18030;
+}
+
+DBCSEncoder.prototype.write = function(str) {
+    var newBuf = Buffer.alloc(str.length * (this.gb18030 ? 4 : 3)),
+        leadSurrogate = this.leadSurrogate,
+        seqObj = this.seqObj, nextChar = -1,
+        i = 0, j = 0;
+
+    while (true) {
+        // 0. Get next character.
+        if (nextChar === -1) {
+            if (i == str.length) break;
+            var uCode = str.charCodeAt(i++);
+        }
+        else {
+            var uCode = nextChar;
+            nextChar = -1;    
+        }
+
+        // 1. Handle surrogates.
+        if (0xD800 <= uCode && uCode < 0xE000) { // Char is one of surrogates.
+            if (uCode < 0xDC00) { // We've got lead surrogate.
+                if (leadSurrogate === -1) {
+                    leadSurrogate = uCode;
+                    continue;
+                } else {
+                    leadSurrogate = uCode;
+                    // Double lead surrogate found.
+                    uCode = UNASSIGNED;
+                }
+            } else { // We've got trail surrogate.
+                if (leadSurrogate !== -1) {
+                    uCode = 0x10000 + (leadSurrogate - 0xD800) * 0x400 + (uCode - 0xDC00);
+                    leadSurrogate = -1;
+                } else {
+                    // Incomplete surrogate pair - only trail surrogate found.
+                    uCode = UNASSIGNED;
+                }
+                
+            }
+        }
+        else if (leadSurrogate !== -1) {
+            // Incomplete surrogate pair - only lead surrogate found.
+            nextChar = uCode; uCode = UNASSIGNED; // Write an error, then current char.
+            leadSurrogate = -1;
+        }
+
+        // 2. Convert uCode character.
+        var dbcsCode = UNASSIGNED;
+        if (seqObj !== undefined && uCode != UNASSIGNED) { // We are in the middle of the sequence
+            var resCode = seqObj[uCode];
+            if (typeof resCode === 'object') { // Sequence continues.
+                seqObj = resCode;
+                continue;
+
+            } else if (typeof resCode == 'number') { // Sequence finished. Write it.
+                dbcsCode = resCode;
+
+            } else if (resCode == undefined) { // Current character is not part of the sequence.
+
+                // Try default character for this sequence
+                resCode = seqObj[DEF_CHAR];
+                if (resCode !== undefined) {
+                    dbcsCode = resCode; // Found. Write it.
+                    nextChar = uCode; // Current character will be written too in the next iteration.
+
+                } else {
+                    // TODO: What if we have no default? (resCode == undefined)
+                    // Then, we should write first char of the sequence as-is and try the rest recursively.
+                    // Didn't do it for now because no encoding has this situation yet.
+                    // Currently, just skip the sequence and write current char.
+                }
+            }
+            seqObj = undefined;
+        }
+        else if (uCode >= 0) {  // Regular character
+            var subtable = this.encodeTable[uCode >> 8];
+            if (subtable !== undefined)
+                dbcsCode = subtable[uCode & 0xFF];
+            
+            if (dbcsCode <= SEQ_START) { // Sequence start
+                seqObj = this.encodeTableSeq[SEQ_START-dbcsCode];
+                continue;
+            }
+
+            if (dbcsCode == UNASSIGNED && this.gb18030) {
+                // Use GB18030 algorithm to find character(s) to write.
+                var idx = findIdx(this.gb18030.uChars, uCode);
+                if (idx != -1) {
+                    var dbcsCode = this.gb18030.gbChars[idx] + (uCode - this.gb18030.uChars[idx]);
+                    newBuf[j++] = 0x81 + Math.floor(dbcsCode / 12600); dbcsCode = dbcsCode % 12600;
+                    newBuf[j++] = 0x30 + Math.floor(dbcsCode / 1260); dbcsCode = dbcsCode % 1260;
+                    newBuf[j++] = 0x81 + Math.floor(dbcsCode / 10); dbcsCode = dbcsCode % 10;
+                    newBuf[j++] = 0x30 + dbcsCode;
+                    continue;
+                }
+            }
+        }
+
+        // 3. Write dbcsCode character.
+        if (dbcsCode === UNASSIGNED)
+            dbcsCode = this.defaultCharSingleByte;
+        
+        if (dbcsCode < 0x100) {
+            newBuf[j++] = dbcsCode;
+        }
+        else if (dbcsCode < 0x10000) {
+            newBuf[j++] = dbcsCode >> 8;   // high byte
+            newBuf[j++] = dbcsCode & 0xFF; // low byte
+        }
+        else {
+            newBuf[j++] = dbcsCode >> 16;
+            newBuf[j++] = (dbcsCode >> 8) & 0xFF;
+            newBuf[j++] = dbcsCode & 0xFF;
+        }
+    }
+
+    this.seqObj = seqObj;
+    this.leadSurrogate = leadSurrogate;
+    return newBuf.slice(0, j);
+}
+
+DBCSEncoder.prototype.end = function() {
+    if (this.leadSurrogate === -1 && this.seqObj === undefined)
+        return; // All clean. Most often case.
+
+    var newBuf = Buffer.alloc(10), j = 0;
+
+    if (this.seqObj) { // We're in the sequence.
+        var dbcsCode = this.seqObj[DEF_CHAR];
+        if (dbcsCode !== undefined) { // Write beginning of the sequence.
+            if (dbcsCode < 0x100) {
+                newBuf[j++] = dbcsCode;
+            }
+            else {
+                newBuf[j++] = dbcsCode >> 8;   // high byte
+                newBuf[j++] = dbcsCode & 0xFF; // low byte
+            }
+        } else {
+            // See todo above.
+        }
+        this.seqObj = undefined;
+    }
+
+    if (this.leadSurrogate !== -1) {
+        // Incomplete surrogate pair - only lead surrogate found.
+        newBuf[j++] = this.defaultCharSingleByte;
+        this.leadSurrogate = -1;
+    }
+    
+    return newBuf.slice(0, j);
+}
+
+// Export for testing
+DBCSEncoder.prototype.findIdx = findIdx;
+
+
+// == Decoder ==================================================================
+
+function DBCSDecoder(options, codec) {
+    // Decoder state
+    this.nodeIdx = 0;
+    this.prevBuf = Buffer.alloc(0);
+
+    // Static data
+    this.decodeTables = codec.decodeTables;
+    this.decodeTableSeq = codec.decodeTableSeq;
+    this.defaultCharUnicode = codec.defaultCharUnicode;
+    this.gb18030 = codec.gb18030;
+}
+
+DBCSDecoder.prototype.write = function(buf) {
+    var newBuf = Buffer.alloc(buf.length*2),
+        nodeIdx = this.nodeIdx, 
+        prevBuf = this.prevBuf, prevBufOffset = this.prevBuf.length,
+        seqStart = -this.prevBuf.length, // idx of the start of current parsed sequence.
+        uCode;
+
+    if (prevBufOffset > 0) // Make prev buf overlap a little to make it easier to slice later.
+        prevBuf = Buffer.concat([prevBuf, buf.slice(0, 10)]);
+    
+    for (var i = 0, j = 0; i < buf.length; i++) {
+        var curByte = (i >= 0) ? buf[i] : prevBuf[i + prevBufOffset];
+
+        // Lookup in current trie node.
+        var uCode = this.decodeTables[nodeIdx][curByte];
+
+        if (uCode >= 0) { 
+            // Normal character, just use it.
+        }
+        else if (uCode === UNASSIGNED) { // Unknown char.
+            // TODO: Callback with seq.
+            //var curSeq = (seqStart >= 0) ? buf.slice(seqStart, i+1) : prevBuf.slice(seqStart + prevBufOffset, i+1 + prevBufOffset);
+            i = seqStart; // Try to parse again, after skipping first byte of the sequence ('i' will be incremented by 'for' cycle).
+            uCode = this.defaultCharUnicode.charCodeAt(0);
+        }
+        else if (uCode === GB18030_CODE) {
+            var curSeq = (seqStart >= 0) ? buf.slice(seqStart, i+1) : prevBuf.slice(seqStart + prevBufOffset, i+1 + prevBufOffset);
+            var ptr = (curSeq[0]-0x81)*12600 + (curSeq[1]-0x30)*1260 + (curSeq[2]-0x81)*10 + (curSeq[3]-0x30);
+            var idx = findIdx(this.gb18030.gbChars, ptr);
+            uCode = this.gb18030.uChars[idx] + ptr - this.gb18030.gbChars[idx];
+        }
+        else if (uCode <= NODE_START) { // Go to next trie node.
+            nodeIdx = NODE_START - uCode;
+            continue;
+        }
+        else if (uCode <= SEQ_START) { // Output a sequence of chars.
+            var seq = this.decodeTableSeq[SEQ_START - uCode];
+            for (var k = 0; k < seq.length - 1; k++) {
+                uCode = seq[k];
+                newBuf[j++] = uCode & 0xFF;
+                newBuf[j++] = uCode >> 8;
+            }
+            uCode = seq[seq.length-1];
+        }
+        else
+            throw new Error("iconv-lite internal error: invalid decoding table value " + uCode + " at " + nodeIdx + "/" + curByte);
+
+        // Write the character to buffer, handling higher planes using surrogate pair.
+        if (uCode > 0xFFFF) { 
+            uCode -= 0x10000;
+            var uCodeLead = 0xD800 + Math.floor(uCode / 0x400);
+            newBuf[j++] = uCodeLead & 0xFF;
+            newBuf[j++] = uCodeLead >> 8;
+
+            uCode = 0xDC00 + uCode % 0x400;
+        }
+        newBuf[j++] = uCode & 0xFF;
+        newBuf[j++] = uCode >> 8;
+
+        // Reset trie node.
+        nodeIdx = 0; seqStart = i+1;
+    }
+
+    this.nodeIdx = nodeIdx;
+    this.prevBuf = (seqStart >= 0) ? buf.slice(seqStart) : prevBuf.slice(seqStart + prevBufOffset);
+    return newBuf.slice(0, j).toString('ucs2');
+}
+
+DBCSDecoder.prototype.end = function() {
+    var ret = '';
+
+    // Try to parse all remaining chars.
+    while (this.prevBuf.length > 0) {
+        // Skip 1 character in the buffer.
+        ret += this.defaultCharUnicode;
+        var buf = this.prevBuf.slice(1);
+
+        // Parse remaining as usual.
+        this.prevBuf = Buffer.alloc(0);
+        this.nodeIdx = 0;
+        if (buf.length > 0)
+            ret += this.write(buf);
+    }
+
+    this.nodeIdx = 0;
+    return ret;
+}
+
+// Binary search for GB18030. Returns largest i such that table[i] <= val.
+function findIdx(table, val) {
+    if (table[0] > val)
+        return -1;
+
+    var l = 0, r = table.length;
+    while (l < r-1) { // always table[l] <= val < table[r]
+        var mid = l + Math.floor((r-l+1)/2);
+        if (table[mid] <= val)
+            l = mid;
+        else
+            r = mid;
+    }
+    return l;
+}
+
+
+
+/***/ }),
+/* 711 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+// Description of supported double byte encodings and aliases.
+// Tables are not require()-d until they are needed to speed up library load.
+// require()-s are direct to support Browserify.
+
+module.exports = {
+    
+    // == Japanese/ShiftJIS ====================================================
+    // All japanese encodings are based on JIS X set of standards:
+    // JIS X 0201 - Single-byte encoding of ASCII + ¥ + Kana chars at 0xA1-0xDF.
+    // JIS X 0208 - Main set of 6879 characters, placed in 94x94 plane, to be encoded by 2 bytes. 
+    //              Has several variations in 1978, 1983, 1990 and 1997.
+    // JIS X 0212 - Supplementary plane of 6067 chars in 94x94 plane. 1990. Effectively dead.
+    // JIS X 0213 - Extension and modern replacement of 0208 and 0212. Total chars: 11233.
+    //              2 planes, first is superset of 0208, second - revised 0212.
+    //              Introduced in 2000, revised 2004. Some characters are in Unicode Plane 2 (0x2xxxx)
+
+    // Byte encodings are:
+    //  * Shift_JIS: Compatible with 0201, uses not defined chars in top half as lead bytes for double-byte
+    //               encoding of 0208. Lead byte ranges: 0x81-0x9F, 0xE0-0xEF; Trail byte ranges: 0x40-0x7E, 0x80-0x9E, 0x9F-0xFC.
+    //               Windows CP932 is a superset of Shift_JIS. Some companies added more chars, notably KDDI.
+    //  * EUC-JP:    Up to 3 bytes per character. Used mostly on *nixes.
+    //               0x00-0x7F       - lower part of 0201
+    //               0x8E, 0xA1-0xDF - upper part of 0201
+    //               (0xA1-0xFE)x2   - 0208 plane (94x94).
+    //               0x8F, (0xA1-0xFE)x2 - 0212 plane (94x94).
+    //  * JIS X 208: 7-bit, direct encoding of 0208. Byte ranges: 0x21-0x7E (94 values). Uncommon.
+    //               Used as-is in ISO2022 family.
+    //  * ISO2022-JP: Stateful encoding, with escape sequences to switch between ASCII, 
+    //                0201-1976 Roman, 0208-1978, 0208-1983.
+    //  * ISO2022-JP-1: Adds esc seq for 0212-1990.
+    //  * ISO2022-JP-2: Adds esc seq for GB2313-1980, KSX1001-1992, ISO8859-1, ISO8859-7.
+    //  * ISO2022-JP-3: Adds esc seq for 0201-1976 Kana set, 0213-2000 Planes 1, 2.
+    //  * ISO2022-JP-2004: Adds 0213-2004 Plane 1.
+    //
+    // After JIS X 0213 appeared, Shift_JIS-2004, EUC-JISX0213 and ISO2022-JP-2004 followed, with just changing the planes.
+    //
+    // Overall, it seems that it's a mess :( http://www8.plala.or.jp/tkubota1/unicode-symbols-map2.html
+
+    'shiftjis': {
+        type: '_dbcs',
+        table: function() { return __webpack_require__(721) },
+        encodeAdd: {'\u00a5': 0x5C, '\u203E': 0x7E},
+        encodeSkipVals: [{from: 0xED40, to: 0xF940}],
+    },
+    'csshiftjis': 'shiftjis',
+    'mskanji': 'shiftjis',
+    'sjis': 'shiftjis',
+    'windows31j': 'shiftjis',
+    'ms31j': 'shiftjis',
+    'xsjis': 'shiftjis',
+    'windows932': 'shiftjis',
+    'ms932': 'shiftjis',
+    '932': 'shiftjis',
+    'cp932': 'shiftjis',
+
+    'eucjp': {
+        type: '_dbcs',
+        table: function() { return __webpack_require__(719) },
+        encodeAdd: {'\u00a5': 0x5C, '\u203E': 0x7E},
+    },
+
+    // TODO: KDDI extension to Shift_JIS
+    // TODO: IBM CCSID 942 = CP932, but F0-F9 custom chars and other char changes.
+    // TODO: IBM CCSID 943 = Shift_JIS = CP932 with original Shift_JIS lower 128 chars.
+
+
+    // == Chinese/GBK ==========================================================
+    // http://en.wikipedia.org/wiki/GBK
+    // We mostly implement W3C recommendation: https://www.w3.org/TR/encoding/#gbk-encoder
+
+    // Oldest GB2312 (1981, ~7600 chars) is a subset of CP936
+    'gb2312': 'cp936',
+    'gb231280': 'cp936',
+    'gb23121980': 'cp936',
+    'csgb2312': 'cp936',
+    'csiso58gb231280': 'cp936',
+    'euccn': 'cp936',
+
+    // Microsoft's CP936 is a subset and approximation of GBK.
+    'windows936': 'cp936',
+    'ms936': 'cp936',
+    '936': 'cp936',
+    'cp936': {
+        type: '_dbcs',
+        table: function() { return __webpack_require__(277) },
+    },
+
+    // GBK (~22000 chars) is an extension of CP936 that added user-mapped chars and some other.
+    'gbk': {
+        type: '_dbcs',
+        table: function() { return __webpack_require__(277).concat(__webpack_require__(396)) },
+    },
+    'xgbk': 'gbk',
+    'isoir58': 'gbk',
+
+    // GB18030 is an algorithmic extension of GBK.
+    // Main source: https://www.w3.org/TR/encoding/#gbk-encoder
+    // http://icu-project.org/docs/papers/gb18030.html
+    // http://source.icu-project.org/repos/icu/data/trunk/charset/data/xml/gb-18030-2000.xml
+    // http://www.khngai.com/chinese/charmap/tblgbk.php?page=0
+    'gb18030': {
+        type: '_dbcs',
+        table: function() { return __webpack_require__(277).concat(__webpack_require__(396)) },
+        gb18030: function() { return __webpack_require__(720) },
+        encodeSkipVals: [0x80],
+        encodeAdd: {'€': 0xA2E3},
+    },
+
+    'chinese': 'gb18030',
+
+
+    // == Korean ===============================================================
+    // EUC-KR, KS_C_5601 and KS X 1001 are exactly the same.
+    'windows949': 'cp949',
+    'ms949': 'cp949',
+    '949': 'cp949',
+    'cp949': {
+        type: '_dbcs',
+        table: function() { return __webpack_require__(718) },
+    },
+
+    'cseuckr': 'cp949',
+    'csksc56011987': 'cp949',
+    'euckr': 'cp949',
+    'isoir149': 'cp949',
+    'korean': 'cp949',
+    'ksc56011987': 'cp949',
+    'ksc56011989': 'cp949',
+    'ksc5601': 'cp949',
+
+
+    // == Big5/Taiwan/Hong Kong ================================================
+    // There are lots of tables for Big5 and cp950. Please see the following links for history:
+    // http://moztw.org/docs/big5/  http://www.haible.de/bruno/charsets/conversion-tables/Big5.html
+    // Variations, in roughly number of defined chars:
+    //  * Windows CP 950: Microsoft variant of Big5. Canonical: http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP950.TXT
+    //  * Windows CP 951: Microsoft variant of Big5-HKSCS-2001. Seems to be never public. http://me.abelcheung.org/articles/research/what-is-cp951/
+    //  * Big5-2003 (Taiwan standard) almost superset of cp950.
+    //  * Unicode-at-on (UAO) / Mozilla 1.8. Falling out of use on the Web. Not supported by other browsers.
+    //  * Big5-HKSCS (-2001, -2004, -2008). Hong Kong standard. 
+    //    many unicode code points moved from PUA to Supplementary plane (U+2XXXX) over the years.
+    //    Plus, it has 4 combining sequences.
+    //    Seems that Mozilla refused to support it for 10 yrs. https://bugzilla.mozilla.org/show_bug.cgi?id=162431 https://bugzilla.mozilla.org/show_bug.cgi?id=310299
+    //    because big5-hkscs is the only encoding to include astral characters in non-algorithmic way.
+    //    Implementations are not consistent within browsers; sometimes labeled as just big5.
+    //    MS Internet Explorer switches from big5 to big5-hkscs when a patch applied.
+    //    Great discussion & recap of what's going on https://bugzilla.mozilla.org/show_bug.cgi?id=912470#c31
+    //    In the encoder, it might make sense to support encoding old PUA mappings to Big5 bytes seq-s.
+    //    Official spec: http://www.ogcio.gov.hk/en/business/tech_promotion/ccli/terms/doc/2003cmp_2008.txt
+    //                   http://www.ogcio.gov.hk/tc/business/tech_promotion/ccli/terms/doc/hkscs-2008-big5-iso.txt
+    // 
+    // Current understanding of how to deal with Big5(-HKSCS) is in the Encoding Standard, http://encoding.spec.whatwg.org/#big5-encoder
+    // Unicode mapping (http://www.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/OTHER/BIG5.TXT) is said to be wrong.
+
+    'windows950': 'cp950',
+    'ms950': 'cp950',
+    '950': 'cp950',
+    'cp950': {
+        type: '_dbcs',
+        table: function() { return __webpack_require__(395) },
+    },
+
+    // Big5 has many variations and is an extension of cp950. We use Encoding Standard's as a consensus.
+    'big5': 'big5hkscs',
+    'big5hkscs': {
+        type: '_dbcs',
+        table: function() { return __webpack_require__(395).concat(__webpack_require__(717)) },
+        encodeSkipVals: [0xa2cc],
+    },
+
+    'cnbig5': 'big5hkscs',
+    'csbig5': 'big5hkscs',
+    'xxbig5': 'big5hkscs',
+};
+
+
+/***/ }),
+/* 712 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+// Update this array if you add/rename/remove files in this directory.
+// We support Browserify by skipping automatic module discovery and requiring modules directly.
+var modules = [
+    __webpack_require__(713),
+    __webpack_require__(722),
+    __webpack_require__(723),
+    __webpack_require__(714),
+    __webpack_require__(716),
+    __webpack_require__(715),
+    __webpack_require__(710),
+    __webpack_require__(711),
+];
+
+// Put all encoding/alias/codec definitions to single object and export it. 
+for (var i = 0; i < modules.length; i++) {
+    var module = modules[i];
+    for (var enc in module)
+        if (Object.prototype.hasOwnProperty.call(module, enc))
+            exports[enc] = module[enc];
+}
+
+
+/***/ }),
+/* 713 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var Buffer = __webpack_require__(15).Buffer;
+
+// Export Node.js internal encodings.
+
+module.exports = {
+    // Encodings
+    utf8:   { type: "_internal", bomAware: true},
+    cesu8:  { type: "_internal", bomAware: true},
+    unicode11utf8: "utf8",
+
+    ucs2:   { type: "_internal", bomAware: true},
+    utf16le: "ucs2",
+
+    binary: { type: "_internal" },
+    base64: { type: "_internal" },
+    hex:    { type: "_internal" },
+
+    // Codec.
+    _internal: InternalCodec,
+};
+
+//------------------------------------------------------------------------------
+
+function InternalCodec(codecOptions, iconv) {
+    this.enc = codecOptions.encodingName;
+    this.bomAware = codecOptions.bomAware;
+
+    if (this.enc === "base64")
+        this.encoder = InternalEncoderBase64;
+    else if (this.enc === "cesu8") {
+        this.enc = "utf8"; // Use utf8 for decoding.
+        this.encoder = InternalEncoderCesu8;
+
+        // Add decoder for versions of Node not supporting CESU-8
+        if (Buffer.from('eda0bdedb2a9', 'hex').toString() !== '💩') {
+            this.decoder = InternalDecoderCesu8;
+            this.defaultCharUnicode = iconv.defaultCharUnicode;
+        }
+    }
+}
+
+InternalCodec.prototype.encoder = InternalEncoder;
+InternalCodec.prototype.decoder = InternalDecoder;
+
+//------------------------------------------------------------------------------
+
+// We use node.js internal decoder. Its signature is the same as ours.
+var StringDecoder = __webpack_require__(333).StringDecoder;
+
+if (!StringDecoder.prototype.end) // Node v0.8 doesn't have this method.
+    StringDecoder.prototype.end = function() {};
+
+
+function InternalDecoder(options, codec) {
+    StringDecoder.call(this, codec.enc);
+}
+
+InternalDecoder.prototype = StringDecoder.prototype;
+
+
+//------------------------------------------------------------------------------
+// Encoder is mostly trivial
+
+function InternalEncoder(options, codec) {
+    this.enc = codec.enc;
+}
+
+InternalEncoder.prototype.write = function(str) {
+    return Buffer.from(str, this.enc);
+}
+
+InternalEncoder.prototype.end = function() {
+}
+
+
+//------------------------------------------------------------------------------
+// Except base64 encoder, which must keep its state.
+
+function InternalEncoderBase64(options, codec) {
+    this.prevStr = '';
+}
+
+InternalEncoderBase64.prototype.write = function(str) {
+    str = this.prevStr + str;
+    var completeQuads = str.length - (str.length % 4);
+    this.prevStr = str.slice(completeQuads);
+    str = str.slice(0, completeQuads);
+
+    return Buffer.from(str, "base64");
+}
+
+InternalEncoderBase64.prototype.end = function() {
+    return Buffer.from(this.prevStr, "base64");
+}
+
+
+//------------------------------------------------------------------------------
+// CESU-8 encoder is also special.
+
+function InternalEncoderCesu8(options, codec) {
+}
+
+InternalEncoderCesu8.prototype.write = function(str) {
+    var buf = Buffer.alloc(str.length * 3), bufIdx = 0;
+    for (var i = 0; i < str.length; i++) {
+        var charCode = str.charCodeAt(i);
+        // Naive implementation, but it works because CESU-8 is especially easy
+        // to convert from UTF-16 (which all JS strings are encoded in).
+        if (charCode < 0x80)
+            buf[bufIdx++] = charCode;
+        else if (charCode < 0x800) {
+            buf[bufIdx++] = 0xC0 + (charCode >>> 6);
+            buf[bufIdx++] = 0x80 + (charCode & 0x3f);
+        }
+        else { // charCode will always be < 0x10000 in javascript.
+            buf[bufIdx++] = 0xE0 + (charCode >>> 12);
+            buf[bufIdx++] = 0x80 + ((charCode >>> 6) & 0x3f);
+            buf[bufIdx++] = 0x80 + (charCode & 0x3f);
+        }
+    }
+    return buf.slice(0, bufIdx);
+}
+
+InternalEncoderCesu8.prototype.end = function() {
+}
+
+//------------------------------------------------------------------------------
+// CESU-8 decoder is not implemented in Node v4.0+
+
+function InternalDecoderCesu8(options, codec) {
+    this.acc = 0;
+    this.contBytes = 0;
+    this.accBytes = 0;
+    this.defaultCharUnicode = codec.defaultCharUnicode;
+}
+
+InternalDecoderCesu8.prototype.write = function(buf) {
+    var acc = this.acc, contBytes = this.contBytes, accBytes = this.accBytes, 
+        res = '';
+    for (var i = 0; i < buf.length; i++) {
+        var curByte = buf[i];
+        if ((curByte & 0xC0) !== 0x80) { // Leading byte
+            if (contBytes > 0) { // Previous code is invalid
+                res += this.defaultCharUnicode;
+                contBytes = 0;
+            }
+
+            if (curByte < 0x80) { // Single-byte code
+                res += String.fromCharCode(curByte);
+            } else if (curByte < 0xE0) { // Two-byte code
+                acc = curByte & 0x1F;
+                contBytes = 1; accBytes = 1;
+            } else if (curByte < 0xF0) { // Three-byte code
+                acc = curByte & 0x0F;
+                contBytes = 2; accBytes = 1;
+            } else { // Four or more are not supported for CESU-8.
+                res += this.defaultCharUnicode;
+            }
+        } else { // Continuation byte
+            if (contBytes > 0) { // We're waiting for it.
+                acc = (acc << 6) | (curByte & 0x3f);
+                contBytes--; accBytes++;
+                if (contBytes === 0) {
+                    // Check for overlong encoding, but support Modified UTF-8 (encoding NULL as C0 80)
+                    if (accBytes === 2 && acc < 0x80 && acc > 0)
+                        res += this.defaultCharUnicode;
+                    else if (accBytes === 3 && acc < 0x800)
+                        res += this.defaultCharUnicode;
+                    else
+                        // Actually add character.
+                        res += String.fromCharCode(acc);
+                }
+            } else { // Unexpected continuation byte
+                res += this.defaultCharUnicode;
+            }
+        }
+    }
+    this.acc = acc; this.contBytes = contBytes; this.accBytes = accBytes;
+    return res;
+}
+
+InternalDecoderCesu8.prototype.end = function() {
+    var res = 0;
+    if (this.contBytes > 0)
+        res += this.defaultCharUnicode;
+    return res;
+}
+
+
+/***/ }),
+/* 714 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var Buffer = __webpack_require__(15).Buffer;
+
+// Single-byte codec. Needs a 'chars' string parameter that contains 256 or 128 chars that
+// correspond to encoded bytes (if 128 - then lower half is ASCII). 
+
+exports._sbcs = SBCSCodec;
+function SBCSCodec(codecOptions, iconv) {
+    if (!codecOptions)
+        throw new Error("SBCS codec is called without the data.")
+    
+    // Prepare char buffer for decoding.
+    if (!codecOptions.chars || (codecOptions.chars.length !== 128 && codecOptions.chars.length !== 256))
+        throw new Error("Encoding '"+codecOptions.type+"' has incorrect 'chars' (must be of len 128 or 256)");
+    
+    if (codecOptions.chars.length === 128) {
+        var asciiString = "";
+        for (var i = 0; i < 128; i++)
+            asciiString += String.fromCharCode(i);
+        codecOptions.chars = asciiString + codecOptions.chars;
+    }
+
+    this.decodeBuf = Buffer.from(codecOptions.chars, 'ucs2');
+    
+    // Encoding buffer.
+    var encodeBuf = Buffer.alloc(65536, iconv.defaultCharSingleByte.charCodeAt(0));
+
+    for (var i = 0; i < codecOptions.chars.length; i++)
+        encodeBuf[codecOptions.chars.charCodeAt(i)] = i;
+
+    this.encodeBuf = encodeBuf;
+}
+
+SBCSCodec.prototype.encoder = SBCSEncoder;
+SBCSCodec.prototype.decoder = SBCSDecoder;
+
+
+function SBCSEncoder(options, codec) {
+    this.encodeBuf = codec.encodeBuf;
+}
+
+SBCSEncoder.prototype.write = function(str) {
+    var buf = Buffer.alloc(str.length);
+    for (var i = 0; i < str.length; i++)
+        buf[i] = this.encodeBuf[str.charCodeAt(i)];
+    
+    return buf;
+}
+
+SBCSEncoder.prototype.end = function() {
+}
+
+
+function SBCSDecoder(options, codec) {
+    this.decodeBuf = codec.decodeBuf;
+}
+
+SBCSDecoder.prototype.write = function(buf) {
+    // Strings are immutable in JS -> we use ucs2 buffer to speed up computations.
+    var decodeBuf = this.decodeBuf;
+    var newBuf = Buffer.alloc(buf.length*2);
+    var idx1 = 0, idx2 = 0;
+    for (var i = 0; i < buf.length; i++) {
+        idx1 = buf[i]*2; idx2 = i*2;
+        newBuf[idx2] = decodeBuf[idx1];
+        newBuf[idx2+1] = decodeBuf[idx1+1];
+    }
+    return newBuf.toString('ucs2');
+}
+
+SBCSDecoder.prototype.end = function() {
+}
+
+
+/***/ }),
+/* 715 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+// Generated data for sbcs codec. Don't edit manually. Regenerate using generation/gen-sbcs.js script.
+module.exports = {
+  "437": "cp437",
+  "737": "cp737",
+  "775": "cp775",
+  "850": "cp850",
+  "852": "cp852",
+  "855": "cp855",
+  "856": "cp856",
+  "857": "cp857",
+  "858": "cp858",
+  "860": "cp860",
+  "861": "cp861",
+  "862": "cp862",
+  "863": "cp863",
+  "864": "cp864",
+  "865": "cp865",
+  "866": "cp866",
+  "869": "cp869",
+  "874": "windows874",
+  "922": "cp922",
+  "1046": "cp1046",
+  "1124": "cp1124",
+  "1125": "cp1125",
+  "1129": "cp1129",
+  "1133": "cp1133",
+  "1161": "cp1161",
+  "1162": "cp1162",
+  "1163": "cp1163",
+  "1250": "windows1250",
+  "1251": "windows1251",
+  "1252": "windows1252",
+  "1253": "windows1253",
+  "1254": "windows1254",
+  "1255": "windows1255",
+  "1256": "windows1256",
+  "1257": "windows1257",
+  "1258": "windows1258",
+  "28591": "iso88591",
+  "28592": "iso88592",
+  "28593": "iso88593",
+  "28594": "iso88594",
+  "28595": "iso88595",
+  "28596": "iso88596",
+  "28597": "iso88597",
+  "28598": "iso88598",
+  "28599": "iso88599",
+  "28600": "iso885910",
+  "28601": "iso885911",
+  "28603": "iso885913",
+  "28604": "iso885914",
+  "28605": "iso885915",
+  "28606": "iso885916",
+  "windows874": {
+    "type": "_sbcs",
+    "chars": "€����…�����������‘’“”•–—�������� กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรฤลฦวศษสหฬอฮฯะัาำิีึืฺุู����฿เแโใไๅๆ็่้๊๋์ํ๎๏๐๑๒๓๔๕๖๗๘๙๚๛����"
+  },
+  "win874": "windows874",
+  "cp874": "windows874",
+  "windows1250": {
+    "type": "_sbcs",
+    "chars": "€�‚�„…†‡�‰Š‹ŚŤŽŹ�‘’“”•–—�™š›śťžź ˇ˘Ł¤Ą¦§¨©Ş«¬­®Ż°±˛ł´µ¶·¸ąş»Ľ˝ľżŔÁÂĂÄĹĆÇČÉĘËĚÍÎĎĐŃŇÓÔŐÖ×ŘŮÚŰÜÝŢßŕáâăäĺćçčéęëěíîďđńňóôőö÷řůúűüýţ˙"
+  },
+  "win1250": "windows1250",
+  "cp1250": "windows1250",
+  "windows1251": {
+    "type": "_sbcs",
+    "chars": "ЂЃ‚ѓ„…†‡€‰Љ‹ЊЌЋЏђ‘’“”•–—�™љ›њќћџ ЎўЈ¤Ґ¦§Ё©Є«¬­®Ї°±Ііґµ¶·ё№є»јЅѕїАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюя"
+  },
+  "win1251": "windows1251",
+  "cp1251": "windows1251",
+  "windows1252": {
+    "type": "_sbcs",
+    "chars": "€�‚ƒ„…†‡ˆ‰Š‹Œ�Ž��‘’“”•–—˜™š›œ�žŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ"
+  },
+  "win1252": "windows1252",
+  "cp1252": "windows1252",
+  "windows1253": {
+    "type": "_sbcs",
+    "chars": "€�‚ƒ„…†‡�‰�‹�����‘’“”•–—�™�›���� ΅Ά£¤¥¦§¨©�«¬­®―°±²³΄µ¶·ΈΉΊ»Ό½ΎΏΐΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡ�ΣΤΥΦΧΨΩΪΫάέήίΰαβγδεζηθικλμνξοπρςστυφχψωϊϋόύώ�"
+  },
+  "win1253": "windows1253",
+  "cp1253": "windows1253",
+  "windows1254": {
+    "type": "_sbcs",
+    "chars": "€�‚ƒ„…†‡ˆ‰Š‹Œ����‘’“”•–—˜™š›œ��Ÿ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏĞÑÒÓÔÕÖ×ØÙÚÛÜİŞßàáâãäåæçèéêëìíîïğñòóôõö÷øùúûüışÿ"
+  },
+  "win1254": "windows1254",
+  "cp1254": "windows1254",
+  "windows1255": {
+    "type": "_sbcs",
+    "chars": "€�‚ƒ„…†‡ˆ‰�‹�����‘’“”•–—˜™�›���� ¡¢£₪¥¦§¨©×«¬­®¯°±²³´µ¶·¸¹÷»¼½¾¿ְֱֲֳִֵֶַָֹֺֻּֽ־ֿ׀ׁׂ׃װױײ׳״�������אבגדהוזחטיךכלםמןנסעףפץצקרשת��‎‏�"
+  },
+  "win1255": "windows1255",
+  "cp1255": "windows1255",
+  "windows1256": {
+    "type": "_sbcs",
+    "chars": "€پ‚ƒ„…†‡ˆ‰ٹ‹Œچژڈگ‘’“”•–—ک™ڑ›œ‌‍ں ،¢£¤¥¦§¨©ھ«¬­®¯°±²³´µ¶·¸¹؛»¼½¾؟ہءآأؤإئابةتثجحخدذرزسشصض×طظعغـفقكàلâمنهوçèéêëىيîïًٌٍَôُِ÷ّùْûü‎‏ے"
+  },
+  "win1256": "windows1256",
+  "cp1256": "windows1256",
+  "windows1257": {
+    "type": "_sbcs",
+    "chars": "€�‚�„…†‡�‰�‹�¨ˇ¸�‘’“”•–—�™�›�¯˛� �¢£¤�¦§Ø©Ŗ«¬­®Æ°±²³´µ¶·ø¹ŗ»¼½¾æĄĮĀĆÄÅĘĒČÉŹĖĢĶĪĻŠŃŅÓŌÕÖ×ŲŁŚŪÜŻŽßąįāćäåęēčéźėģķīļšńņóōõö÷ųłśūüżž˙"
+  },
+  "win1257": "windows1257",
+  "cp1257": "windows1257",
+  "windows1258": {
+    "type": "_sbcs",
+    "chars": "€�‚ƒ„…†‡ˆ‰�‹Œ����‘’“”•–—˜™�›œ��Ÿ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂĂÄÅÆÇÈÉÊË̀ÍÎÏĐÑ̉ÓÔƠÖ×ØÙÚÛÜỮßàáâăäåæçèéêë́íîïđṇ̃óôơö÷øùúûüư₫ÿ"
+  },
+  "win1258": "windows1258",
+  "cp1258": "windows1258",
+  "iso88591": {
+    "type": "_sbcs",
+    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ"
+  },
+  "cp28591": "iso88591",
+  "iso88592": {
+    "type": "_sbcs",
+    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ Ą˘Ł¤ĽŚ§¨ŠŞŤŹ­ŽŻ°ą˛ł´ľśˇ¸šşťź˝žżŔÁÂĂÄĹĆÇČÉĘËĚÍÎĎĐŃŇÓÔŐÖ×ŘŮÚŰÜÝŢßŕáâăäĺćçčéęëěíîďđńňóôőö÷řůúűüýţ˙"
+  },
+  "cp28592": "iso88592",
+  "iso88593": {
+    "type": "_sbcs",
+    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ Ħ˘£¤�Ĥ§¨İŞĞĴ­�Ż°ħ²³´µĥ·¸ışğĵ½�żÀÁÂ�ÄĊĈÇÈÉÊËÌÍÎÏ�ÑÒÓÔĠÖ×ĜÙÚÛÜŬŜßàáâ�äċĉçèéêëìíîï�ñòóôġö÷ĝùúûüŭŝ˙"
+  },
+  "cp28593": "iso88593",
+  "iso88594": {
+    "type": "_sbcs",
+    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ĄĸŖ¤ĨĻ§¨ŠĒĢŦ­Ž¯°ą˛ŗ´ĩļˇ¸šēģŧŊžŋĀÁÂÃÄÅÆĮČÉĘËĖÍÎĪĐŅŌĶÔÕÖ×ØŲÚÛÜŨŪßāáâãäåæįčéęëėíîīđņōķôõö÷øųúûüũū˙"
+  },
+  "cp28594": "iso88594",
+  "iso88595": {
+    "type": "_sbcs",
+    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ЁЂЃЄЅІЇЈЉЊЋЌ­ЎЏАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюя№ёђѓєѕіїјљњћќ§ўџ"
+  },
+  "cp28595": "iso88595",
+  "iso88596": {
+    "type": "_sbcs",
+    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ���¤�������،­�������������؛���؟�ءآأؤإئابةتثجحخدذرزسشصضطظعغ�����ـفقكلمنهوىيًٌٍَُِّْ�������������"
+  },
+  "cp28596": "iso88596",
+  "iso88597": {
+    "type": "_sbcs",
+    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ‘’£€₯¦§¨©ͺ«¬­�―°±²³΄΅Ά·ΈΉΊ»Ό½ΎΏΐΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡ�ΣΤΥΦΧΨΩΪΫάέήίΰαβγδεζηθικλμνξοπρςστυφχψωϊϋόύώ�"
+  },
+  "cp28597": "iso88597",
+  "iso88598": {
+    "type": "_sbcs",
+    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ �¢£¤¥¦§¨©×«¬­®¯°±²³´µ¶·¸¹÷»¼½¾��������������������������������‗אבגדהוזחטיךכלםמןנסעףפץצקרשת��‎‏�"
+  },
+  "cp28598": "iso88598",
+  "iso88599": {
+    "type": "_sbcs",
+    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏĞÑÒÓÔÕÖ×ØÙÚÛÜİŞßàáâãäåæçèéêëìíîïğñòóôõö÷øùúûüışÿ"
+  },
+  "cp28599": "iso88599",
+  "iso885910": {
+    "type": "_sbcs",
+    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ĄĒĢĪĨĶ§ĻĐŠŦŽ­ŪŊ°ąēģīĩķ·ļđšŧž―ūŋĀÁÂÃÄÅÆĮČÉĘËĖÍÎÏÐŅŌÓÔÕÖŨØŲÚÛÜÝÞßāáâãäåæįčéęëėíîïðņōóôõöũøųúûüýþĸ"
+  },
+  "cp28600": "iso885910",
+  "iso885911": {
+    "type": "_sbcs",
+    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรฤลฦวศษสหฬอฮฯะัาำิีึืฺุู����฿เแโใไๅๆ็่้๊๋์ํ๎๏๐๑๒๓๔๕๖๗๘๙๚๛����"
+  },
+  "cp28601": "iso885911",
+  "iso885913": {
+    "type": "_sbcs",
+    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ”¢£¤„¦§Ø©Ŗ«¬­®Æ°±²³“µ¶·ø¹ŗ»¼½¾æĄĮĀĆÄÅĘĒČÉŹĖĢĶĪĻŠŃŅÓŌÕÖ×ŲŁŚŪÜŻŽßąįāćäåęēčéźėģķīļšńņóōõö÷ųłśūüżž’"
+  },
+  "cp28603": "iso885913",
+  "iso885914": {
+    "type": "_sbcs",
+    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ Ḃḃ£ĊċḊ§Ẁ©ẂḋỲ­®ŸḞḟĠġṀṁ¶ṖẁṗẃṠỳẄẅṡÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏŴÑÒÓÔÕÖṪØÙÚÛÜÝŶßàáâãäåæçèéêëìíîïŵñòóôõöṫøùúûüýŷÿ"
+  },
+  "cp28604": "iso885914",
+  "iso885915": {
+    "type": "_sbcs",
+    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ¡¢£€¥Š§š©ª«¬­®¯°±²³Žµ¶·ž¹º»ŒœŸ¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ"
+  },
+  "cp28605": "iso885915",
+  "iso885916": {
+    "type": "_sbcs",
+    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ĄąŁ€„Š§š©Ș«Ź­źŻ°±ČłŽ”¶·žčș»ŒœŸżÀÁÂĂÄĆÆÇÈÉÊËÌÍÎÏĐŃÒÓÔŐÖŚŰÙÚÛÜĘȚßàáâăäćæçèéêëìíîïđńòóôőöśűùúûüęțÿ"
+  },
+  "cp28606": "iso885916",
+  "cp437": {
+    "type": "_sbcs",
+    "chars": "ÇüéâäàåçêëèïîìÄÅÉæÆôöòûùÿÖÜ¢£¥₧ƒáíóúñѪº¿⌐¬½¼¡«»░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀αßΓπΣσµτΦΘΩδ∞φε∩≡±≥≤⌠⌡÷≈°∙·√ⁿ²■ "
+  },
+  "ibm437": "cp437",
+  "csibm437": "cp437",
+  "cp737": {
+    "type": "_sbcs",
+    "chars": "ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩαβγδεζηθικλμνξοπρσςτυφχψ░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀ωάέήϊίόύϋώΆΈΉΊΌΎΏ±≥≤ΪΫ÷≈°∙·√ⁿ²■ "
+  },
+  "ibm737": "cp737",
+  "csibm737": "cp737",
+  "cp775": {
+    "type": "_sbcs",
+    "chars": "ĆüéāäģåćłēŖŗīŹÄÅÉæÆōöĢ¢ŚśÖÜø£ØפĀĪóŻżź”¦©®¬½¼Ł«»░▒▓│┤ĄČĘĖ╣║╗╝ĮŠ┐└┴┬├─┼ŲŪ╚╔╩╦╠═╬Žąčęėįšųūž┘┌█▄▌▐▀ÓßŌŃõÕµńĶķĻļņĒŅ’­±“¾¶§÷„°∙·¹³²■ "
+  },
+  "ibm775": "cp775",
+  "csibm775": "cp775",
+  "cp850": {
+    "type": "_sbcs",
+    "chars": "ÇüéâäàåçêëèïîìÄÅÉæÆôöòûùÿÖÜø£Ø׃áíóúñѪº¿®¬½¼¡«»░▒▓│┤ÁÂÀ©╣║╗╝¢¥┐└┴┬├─┼ãÃ╚╔╩╦╠═╬¤ðÐÊËÈıÍÎÏ┘┌█▄¦Ì▀ÓßÔÒõÕµþÞÚÛÙýݯ´­±‗¾¶§÷¸°¨·¹³²■ "
+  },
+  "ibm850": "cp850",
+  "csibm850": "cp850",
+  "cp852": {
+    "type": "_sbcs",
+    "chars": "ÇüéâäůćçłëŐőîŹÄĆÉĹĺôöĽľŚśÖÜŤťŁ×čáíóúĄąŽžĘ꬟Ⱥ«»░▒▓│┤ÁÂĚŞ╣║╗╝Żż┐└┴┬├─┼Ăă╚╔╩╦╠═╬¤đĐĎËďŇÍÎě┘┌█▄ŢŮ▀ÓßÔŃńňŠšŔÚŕŰýÝţ´­˝˛ˇ˘§÷¸°¨˙űŘř■ "
+  },
+  "ibm852": "cp852",
+  "csibm852": "cp852",
+  "cp855": {
+    "type": "_sbcs",
+    "chars": "ђЂѓЃёЁєЄѕЅіІїЇјЈљЉњЊћЋќЌўЎџЏюЮъЪаАбБцЦдДеЕфФгГ«»░▒▓│┤хХиИ╣║╗╝йЙ┐└┴┬├─┼кК╚╔╩╦╠═╬¤лЛмМнНоОп┘┌█▄Пя▀ЯрРсСтТуУжЖвВьЬ№­ыЫзЗшШэЭщЩчЧ§■ "
+  },
+  "ibm855": "cp855",
+  "csibm855": "cp855",
+  "cp856": {
+    "type": "_sbcs",
+    "chars": "אבגדהוזחטיךכלםמןנסעףפץצקרשת�£�×����������®¬½¼�«»░▒▓│┤���©╣║╗╝¢¥┐└┴┬├─┼��╚╔╩╦╠═╬¤���������┘┌█▄¦�▀������µ�������¯´­±‗¾¶§÷¸°¨·¹³²■ "
+  },
+  "ibm856": "cp856",
+  "csibm856": "cp856",
+  "cp857": {
+    "type": "_sbcs",
+    "chars": "ÇüéâäàåçêëèïîıÄÅÉæÆôöòûùİÖÜø£ØŞşáíóúñÑĞ𿮬½¼¡«»░▒▓│┤ÁÂÀ©╣║╗╝¢¥┐└┴┬├─┼ãÃ╚╔╩╦╠═╬¤ºªÊËÈ�ÍÎÏ┘┌█▄¦Ì▀ÓßÔÒõÕµ�×ÚÛÙìÿ¯´­±�¾¶§÷¸°¨·¹³²■ "
+  },
+  "ibm857": "cp857",
+  "csibm857": "cp857",
+  "cp858": {
+    "type": "_sbcs",
+    "chars": "ÇüéâäàåçêëèïîìÄÅÉæÆôöòûùÿÖÜø£Ø׃áíóúñѪº¿®¬½¼¡«»░▒▓│┤ÁÂÀ©╣║╗╝¢¥┐└┴┬├─┼ãÃ╚╔╩╦╠═╬¤ðÐÊËÈ€ÍÎÏ┘┌█▄¦Ì▀ÓßÔÒõÕµþÞÚÛÙýݯ´­±‗¾¶§÷¸°¨·¹³²■ "
+  },
+  "ibm858": "cp858",
+  "csibm858": "cp858",
+  "cp860": {
+    "type": "_sbcs",
+    "chars": "ÇüéâãàÁçêÊèÍÔìÃÂÉÀÈôõòÚùÌÕÜ¢£Ù₧ÓáíóúñѪº¿Ò¬½¼¡«»░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀αßΓπΣσµτΦΘΩδ∞φε∩≡±≥≤⌠⌡÷≈°∙·√ⁿ²■ "
+  },
+  "ibm860": "cp860",
+  "csibm860": "cp860",
+  "cp861": {
+    "type": "_sbcs",
+    "chars": "ÇüéâäàåçêëèÐðÞÄÅÉæÆôöþûÝýÖÜø£Ø₧ƒáíóúÁÍÓÚ¿⌐¬½¼¡«»░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀αßΓπΣσµτΦΘΩδ∞φε∩≡±≥≤⌠⌡÷≈°∙·√ⁿ²■ "
+  },
+  "ibm861": "cp861",
+  "csibm861": "cp861",
+  "cp862": {
+    "type": "_sbcs",
+    "chars": "אבגדהוזחטיךכלםמןנסעףפץצקרשת¢£¥₧ƒáíóúñѪº¿⌐¬½¼¡«»░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀αßΓπΣσµτΦΘΩδ∞φε∩≡±≥≤⌠⌡÷≈°∙·√ⁿ²■ "
+  },
+  "ibm862": "cp862",
+  "csibm862": "cp862",
+  "cp863": {
+    "type": "_sbcs",
+    "chars": "ÇüéâÂà¶çêëèïî‗À§ÉÈÊôËÏûù¤ÔÜ¢£ÙÛƒ¦´óú¨¸³¯Î⌐¬½¼¾«»░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀αßΓπΣσµτΦΘΩδ∞φε∩≡±≥≤⌠⌡÷≈°∙·√ⁿ²■ "
+  },
+  "ibm863": "cp863",
+  "csibm863": "cp863",
+  "cp864": {
+    "type": "_sbcs",
+    "chars": "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\b\t\n\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f !\"#$٪&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~°·∙√▒─│┼┤┬├┴┐┌└┘β∞φ±½¼≈«»ﻷﻸ��ﻻﻼ� ­ﺂ£¤ﺄ��ﺎﺏﺕﺙ،ﺝﺡﺥ٠١٢٣٤٥٦٧٨٩ﻑ؛ﺱﺵﺹ؟¢ﺀﺁﺃﺅﻊﺋﺍﺑﺓﺗﺛﺟﺣﺧﺩﺫﺭﺯﺳﺷﺻﺿﻁﻅﻋﻏ¦¬÷×ﻉـﻓﻗﻛﻟﻣﻧﻫﻭﻯﻳﺽﻌﻎﻍﻡﹽّﻥﻩﻬﻰﻲﻐﻕﻵﻶﻝﻙﻱ■�"
+  },
+  "ibm864": "cp864",
+  "csibm864": "cp864",
+  "cp865": {
+    "type": "_sbcs",
+    "chars": "ÇüéâäàåçêëèïîìÄÅÉæÆôöòûùÿÖÜø£Ø₧ƒáíóúñѪº¿⌐¬½¼¡«¤░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀αßΓπΣσµτΦΘΩδ∞φε∩≡±≥≤⌠⌡÷≈°∙·√ⁿ²■ "
+  },
+  "ibm865": "cp865",
+  "csibm865": "cp865",
+  "cp866": {
+    "type": "_sbcs",
+    "chars": "АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмноп░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀рстуфхцчшщъыьэюяЁёЄєЇїЎў°∙·√№¤■ "
+  },
+  "ibm866": "cp866",
+  "csibm866": "cp866",
+  "cp869": {
+    "type": "_sbcs",
+    "chars": "������Ά�·¬¦‘’Έ―ΉΊΪΌ��ΎΫ©Ώ²³ά£έήίϊΐόύΑΒΓΔΕΖΗ½ΘΙ«»░▒▓│┤ΚΛΜΝ╣║╗╝ΞΟ┐└┴┬├─┼ΠΡ╚╔╩╦╠═╬ΣΤΥΦΧΨΩαβγ┘┌█▄δε▀ζηθικλμνξοπρσςτ΄­±υφχ§ψ΅°¨ωϋΰώ■ "
+  },
+  "ibm869": "cp869",
+  "csibm869": "cp869",
+  "cp922": {
+    "type": "_sbcs",
+    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ¡¢£¤¥¦§¨©ª«¬­®‾°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏŠÑÒÓÔÕÖ×ØÙÚÛÜÝŽßàáâãäåæçèéêëìíîïšñòóôõö÷øùúûüýžÿ"
+  },
+  "ibm922": "cp922",
+  "csibm922": "cp922",
+  "cp1046": {
+    "type": "_sbcs",
+    "chars": "ﺈ×÷ﹱˆ■│─┐┌└┘ﹹﹻﹽﹿﹷﺊﻰﻳﻲﻎﻏﻐﻶﻸﻺﻼ ¤ﺋﺑﺗﺛﺟﺣ،­ﺧﺳ٠١٢٣٤٥٦٧٨٩ﺷ؛ﺻﺿﻊ؟ﻋءآأؤإئابةتثجحخدذرزسشصضطﻇعغﻌﺂﺄﺎﻓـفقكلمنهوىيًٌٍَُِّْﻗﻛﻟﻵﻷﻹﻻﻣﻧﻬﻩ�"
+  },
+  "ibm1046": "cp1046",
+  "csibm1046": "cp1046",
+  "cp1124": {
+    "type": "_sbcs",
+    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ЁЂҐЄЅІЇЈЉЊЋЌ­ЎЏАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюя№ёђґєѕіїјљњћќ§ўџ"
+  },
+  "ibm1124": "cp1124",
+  "csibm1124": "cp1124",
+  "cp1125": {
+    "type": "_sbcs",
+    "chars": "АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмноп░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀рстуфхцчшщъыьэюяЁёҐґЄєІіЇї·√№¤■ "
+  },
+  "ibm1125": "cp1125",
+  "csibm1125": "cp1125",
+  "cp1129": {
+    "type": "_sbcs",
+    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ¡¢£¤¥¦§œ©ª«¬­®¯°±²³Ÿµ¶·Œ¹º»¼½¾¿ÀÁÂĂÄÅÆÇÈÉÊË̀ÍÎÏĐÑ̉ÓÔƠÖ×ØÙÚÛÜỮßàáâăäåæçèéêë́íîïđṇ̃óôơö÷øùúûüư₫ÿ"
+  },
+  "ibm1129": "cp1129",
+  "csibm1129": "cp1129",
+  "cp1133": {
+    "type": "_sbcs",
+    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ກຂຄງຈສຊຍດຕຖທນບປຜຝພຟມຢຣລວຫອຮ���ຯະາຳິີຶືຸູຼັົຽ���ເແໂໃໄ່້໊໋໌ໍໆ�ໜໝ₭����������������໐໑໒໓໔໕໖໗໘໙��¢¬¦�"
+  },
+  "ibm1133": "cp1133",
+  "csibm1133": "cp1133",
+  "cp1161": {
+    "type": "_sbcs",
+    "chars": "��������������������������������่กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรฤลฦวศษสหฬอฮฯะัาำิีึืฺุู้๊๋€฿เแโใไๅๆ็่้๊๋์ํ๎๏๐๑๒๓๔๕๖๗๘๙๚๛¢¬¦ "
+  },
+  "ibm1161": "cp1161",
+  "csibm1161": "cp1161",
+  "cp1162": {
+    "type": "_sbcs",
+    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรฤลฦวศษสหฬอฮฯะัาำิีึืฺุู����฿เแโใไๅๆ็่้๊๋์ํ๎๏๐๑๒๓๔๕๖๗๘๙๚๛����"
+  },
+  "ibm1162": "cp1162",
+  "csibm1162": "cp1162",
+  "cp1163": {
+    "type": "_sbcs",
+    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ¡¢£€¥¦§œ©ª«¬­®¯°±²³Ÿµ¶·Œ¹º»¼½¾¿ÀÁÂĂÄÅÆÇÈÉÊË̀ÍÎÏĐÑ̉ÓÔƠÖ×ØÙÚÛÜỮßàáâăäåæçèéêë́íîïđṇ̃óôơö÷øùúûüư₫ÿ"
+  },
+  "ibm1163": "cp1163",
+  "csibm1163": "cp1163",
+  "maccroatian": {
+    "type": "_sbcs",
+    "chars": "ÄÅÇÉÑÖÜáàâäãåçéèêëíìîïñóòôöõúùûü†°¢£§•¶ß®Š™´¨≠ŽØ∞±≤≥∆µ∂∑∏š∫ªºΩžø¿¡¬√ƒ≈Ć«Č… ÀÃÕŒœĐ—“”‘’÷◊�©⁄¤‹›Æ»–·‚„‰ÂćÁčÈÍÎÏÌÓÔđÒÚÛÙıˆ˜¯πË˚¸Êæˇ"
+  },
+  "maccyrillic": {
+    "type": "_sbcs",
+    "chars": "АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ†°¢£§•¶І®©™Ђђ≠Ѓѓ∞±≤≥іµ∂ЈЄєЇїЉљЊњјЅ¬√ƒ≈∆«»… ЋћЌќѕ–—“”‘’÷„ЎўЏџ№Ёёяабвгдежзийклмнопрстуфхцчшщъыьэю¤"
+  },
+  "macgreek": {
+    "type": "_sbcs",
+    "chars": "Ĺ²É³ÖÜ΅àâä΄¨çéèê룙î‰ôö¦­ùûü†ΓΔΘΛΞΠß®©ΣΪ§≠°·Α±≤≥¥ΒΕΖΗΙΚΜΦΫΨΩάΝ¬ΟΡ≈Τ«»… ΥΧΆΈœ–―“”‘’÷ΉΊΌΎέήίόΏύαβψδεφγηιξκλμνοπώρστθωςχυζϊϋΐΰ�"
+  },
+  "maciceland": {
+    "type": "_sbcs",
+    "chars": "ÄÅÇÉÑÖÜáàâäãåçéèêëíìîïñóòôöõúùûüÝ°¢£§•¶ß®©™´¨≠ÆØ∞±≤≥¥µ∂∑∏π∫ªºΩæø¿¡¬√ƒ≈∆«»… ÀÃÕŒœ–—“”‘’÷◊ÿŸ⁄¤ÐðÞþý·‚„‰ÂÊÁËÈÍÎÏÌÓÔ�ÒÚÛÙıˆ˜¯˘˙˚¸˝˛ˇ"
+  },
+  "macroman": {
+    "type": "_sbcs",
+    "chars": "ÄÅÇÉÑÖÜáàâäãåçéèêëíìîïñóòôöõúùûü†°¢£§•¶ß®©™´¨≠ÆØ∞±≤≥¥µ∂∑∏π∫ªºΩæø¿¡¬√ƒ≈∆«»… ÀÃÕŒœ–—“”‘’÷◊ÿŸ⁄¤‹›fifl‡·‚„‰ÂÊÁËÈÍÎÏÌÓÔ�ÒÚÛÙıˆ˜¯˘˙˚¸˝˛ˇ"
+  },
+  "macromania": {
+    "type": "_sbcs",
+    "chars": "ÄÅÇÉÑÖÜáàâäãåçéèêëíìîïñóòôöõúùûü†°¢£§•¶ß®©™´¨≠ĂŞ∞±≤≥¥µ∂∑∏π∫ªºΩăş¿¡¬√ƒ≈∆«»… ÀÃÕŒœ–—“”‘’÷◊ÿŸ⁄¤‹›Ţţ‡·‚„‰ÂÊÁËÈÍÎÏÌÓÔ�ÒÚÛÙıˆ˜¯˘˙˚¸˝˛ˇ"
+  },
+  "macthai": {
+    "type": "_sbcs",
+    "chars": "«»…“”�•‘’� กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรฤลฦวศษสหฬอฮฯะัาำิีึืฺุู​–—฿เแโใไๅๆ็่้๊๋์ํ™๏๐๑๒๓๔๕๖๗๘๙®©����"
+  },
+  "macturkish": {
+    "type": "_sbcs",
+    "chars": "ÄÅÇÉÑÖÜáàâäãåçéèêëíìîïñóòôöõúùûü†°¢£§•¶ß®©™´¨≠ÆØ∞±≤≥¥µ∂∑∏π∫ªºΩæø¿¡¬√ƒ≈∆«»… ÀÃÕŒœ–—“”‘’÷◊ÿŸĞğİıŞş‡·‚„‰ÂÊÁËÈÍÎÏÌÓÔ�ÒÚÛÙ�ˆ˜¯˘˙˚¸˝˛ˇ"
+  },
+  "macukraine": {
+    "type": "_sbcs",
+    "chars": "АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ†°Ґ£§•¶І®©™Ђђ≠Ѓѓ∞±≤≥іµґЈЄєЇїЉљЊњјЅ¬√ƒ≈∆«»… ЋћЌќѕ–—“”‘’÷„ЎўЏџ№Ёёяабвгдежзийклмнопрстуфхцчшщъыьэю¤"
+  },
+  "koi8r": {
+    "type": "_sbcs",
+    "chars": "─│┌┐└┘├┤┬┴┼▀▄█▌▐░▒▓⌠■∙√≈≤≥ ⌡°²·÷═║╒ё╓╔╕╖╗╘╙╚╛╜╝╞╟╠╡Ё╢╣╤╥╦╧╨╩╪╫╬©юабцдефгхийклмнопярстужвьызшэщчъЮАБЦДЕФГХИЙКЛМНОПЯРСТУЖВЬЫЗШЭЩЧЪ"
+  },
+  "koi8u": {
+    "type": "_sbcs",
+    "chars": "─│┌┐└┘├┤┬┴┼▀▄█▌▐░▒▓⌠■∙√≈≤≥ ⌡°²·÷═║╒ёє╔ії╗╘╙╚╛ґ╝╞╟╠╡ЁЄ╣ІЇ╦╧╨╩╪Ґ╬©юабцдефгхийклмнопярстужвьызшэщчъЮАБЦДЕФГХИЙКЛМНОПЯРСТУЖВЬЫЗШЭЩЧЪ"
+  },
+  "koi8ru": {
+    "type": "_sbcs",
+    "chars": "─│┌┐└┘├┤┬┴┼▀▄█▌▐░▒▓⌠■∙√≈≤≥ ⌡°²·÷═║╒ёє╔ії╗╘╙╚╛ґў╞╟╠╡ЁЄ╣ІЇ╦╧╨╩╪ҐЎ©юабцдефгхийклмнопярстужвьызшэщчъЮАБЦДЕФГХИЙКЛМНОПЯРСТУЖВЬЫЗШЭЩЧЪ"
+  },
+  "koi8t": {
+    "type": "_sbcs",
+    "chars": "қғ‚Ғ„…†‡�‰ҳ‹ҲҷҶ�Қ‘’“”•–—�™�›�����ӯӮё¤ӣ¦§���«¬­®�°±²Ё�Ӣ¶·�№�»���©юабцдефгхийклмнопярстужвьызшэщчъЮАБЦДЕФГХИЙКЛМНОПЯРСТУЖВЬЫЗШЭЩЧЪ"
+  },
+  "armscii8": {
+    "type": "_sbcs",
+    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ �և։)(»«—.՝,-֊…՜՛՞ԱաԲբԳգԴդԵեԶզԷէԸըԹթԺժԻիԼլԽխԾծԿկՀհՁձՂղՃճՄմՅյՆնՇշՈոՉչՊպՋջՌռՍսՎվՏտՐրՑցՒւՓփՔքՕօՖֆ՚�"
+  },
+  "rk1048": {
+    "type": "_sbcs",
+    "chars": "ЂЃ‚ѓ„…†‡€‰Љ‹ЊҚҺЏђ‘’“”•–—�™љ›њқһџ ҰұӘ¤Ө¦§Ё©Ғ«¬­®Ү°±Ііөµ¶·ё№ғ»әҢңүАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюя"
+  },
+  "tcvn": {
+    "type": "_sbcs",
+    "chars": "\u0000ÚỤ\u0003ỪỬỮ\u0007\b\t\n\u000b\f\r\u000e\u000f\u0010ỨỰỲỶỸÝỴ\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~ÀẢÃÁẠẶẬÈẺẼÉẸỆÌỈĨÍỊÒỎÕÓỌỘỜỞỠỚỢÙỦŨ ĂÂÊÔƠƯĐăâêôơưđẶ̀̀̉̃́àảãáạẲằẳẵắẴẮẦẨẪẤỀặầẩẫấậèỂẻẽéẹềểễếệìỉỄẾỒĩíịòỔỏõóọồổỗốộờởỡớợùỖủũúụừửữứựỳỷỹýỵỐ"
+  },
+  "georgianacademy": {
+    "type": "_sbcs",
+    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿აბგდევზთიკლმნოპჟრსტუფქღყშჩცძწჭხჯჰჱჲჳჴჵჶçèéêëìíîïðñòóôõö÷øùúûüýþÿ"
+  },
+  "georgianps": {
+    "type": "_sbcs",
+    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿აბგდევზჱთიკლმნჲოპჟრსტჳუფქღყშჩცძწჭხჴჯჰჵæçèéêëìíîïðñòóôõö÷øùúûüýþÿ"
+  },
+  "pt154": {
+    "type": "_sbcs",
+    "chars": "ҖҒӮғ„…ҶҮҲүҠӢҢҚҺҸҗ‘’“”•–—ҳҷҡӣңқһҹ ЎўЈӨҘҰ§Ё©Ә«¬ӯ®Ҝ°ұІіҙө¶·ё№ә»јҪҫҝАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюя"
+  },
+  "viscii": {
+    "type": "_sbcs",
+    "chars": "\u0000\u0001Ẳ\u0003\u0004ẴẪ\u0007\b\t\n\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013Ỷ\u0015\u0016\u0017\u0018Ỹ\u001a\u001b\u001c\u001dỴ\u001f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~ẠẮẰẶẤẦẨẬẼẸẾỀỂỄỆỐỒỔỖỘỢỚỜỞỊỎỌỈỦŨỤỲÕắằặấầẩậẽẹếềểễệốồổỗỠƠộờởịỰỨỪỬơớƯÀÁÂÃẢĂẳẵÈÉÊẺÌÍĨỳĐứÒÓÔạỷừửÙÚỹỵÝỡưàáâãảăữẫèéêẻìíĩỉđựòóôõỏọụùúũủýợỮ"
+  },
+  "iso646cn": {
+    "type": "_sbcs",
+    "chars": "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\b\t\n\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f !\"#¥%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}‾��������������������������������������������������������������������������������������������������������������������������������"
+  },
+  "iso646jp": {
+    "type": "_sbcs",
+    "chars": "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\b\t\n\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[¥]^_`abcdefghijklmnopqrstuvwxyz{|}‾��������������������������������������������������������������������������������������������������������������������������������"
+  },
+  "hproman8": {
+    "type": "_sbcs",
+    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ÀÂÈÊËÎÏ´ˋˆ¨˜ÙÛ₤¯Ýý°ÇçÑñ¡¿¤£¥§ƒ¢âêôûáéóúàèòùäëöüÅîØÆåíøæÄìÖÜÉïßÔÁÃãÐðÍÌÓÒÕõŠšÚŸÿÞþ·µ¶¾—¼½ªº«■»±�"
+  },
+  "macintosh": {
+    "type": "_sbcs",
+    "chars": "ÄÅÇÉÑÖÜáàâäãåçéèêëíìîïñóòôöõúùûü†°¢£§•¶ß®©™´¨≠ÆØ∞±≤≥¥µ∂∑∏π∫ªºΩæø¿¡¬√ƒ≈∆«»… ÀÃÕŒœ–—“”‘’÷◊ÿŸ⁄¤‹›fifl‡·‚„‰ÂÊÁËÈÍÎÏÌÓÔ�ÒÚÛÙıˆ˜¯˘˙˚¸˝˛ˇ"
+  },
+  "ascii": {
+    "type": "_sbcs",
+    "chars": "��������������������������������������������������������������������������������������������������������������������������������"
+  },
+  "tis620": {
+    "type": "_sbcs",
+    "chars": "���������������������������������กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรฤลฦวศษสหฬอฮฯะัาำิีึืฺุู����฿เแโใไๅๆ็่้๊๋์ํ๎๏๐๑๒๓๔๕๖๗๘๙๚๛����"
+  }
+}
+
+/***/ }),
+/* 716 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+// Manually added data to be used by sbcs codec in addition to generated one.
+
+module.exports = {
+    // Not supported by iconv, not sure why.
+    "10029": "maccenteuro",
+    "maccenteuro": {
+        "type": "_sbcs",
+        "chars": "ÄĀāÉĄÖÜáąČäčĆć鏟ĎíďĒēĖóėôöõúĚěü†°Ę£§•¶ß®©™ę¨≠ģĮįĪ≤≥īĶ∂∑łĻļĽľĹĺŅņѬ√ńŇ∆«»… ňŐÕőŌ–—“”‘’÷◊ōŔŕŘ‹›řŖŗŠ‚„šŚśÁŤťÍŽžŪÓÔūŮÚůŰűŲųÝýķŻŁżĢˇ"
+    },
+
+    "808": "cp808",
+    "ibm808": "cp808",
+    "cp808": {
+        "type": "_sbcs",
+        "chars": "АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмноп░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀рстуфхцчшщъыьэюяЁёЄєЇїЎў°∙·√№€■ "
+    },
+
+    "mik": {
+        "type": "_sbcs",
+        "chars": "АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюя└┴┬├─┼╣║╚╔╩╦╠═╬┐░▒▓│┤№§╗╝┘┌█▄▌▐▀αßΓπΣσµτΦΘΩδ∞φε∩≡±≥≤⌠⌡÷≈°∙·√ⁿ²■ "
+    },
+
+    // Aliases of generated encodings.
+    "ascii8bit": "ascii",
+    "usascii": "ascii",
+    "ansix34": "ascii",
+    "ansix341968": "ascii",
+    "ansix341986": "ascii",
+    "csascii": "ascii",
+    "cp367": "ascii",
+    "ibm367": "ascii",
+    "isoir6": "ascii",
+    "iso646us": "ascii",
+    "iso646irv": "ascii",
+    "us": "ascii",
+
+    "latin1": "iso88591",
+    "latin2": "iso88592",
+    "latin3": "iso88593",
+    "latin4": "iso88594",
+    "latin5": "iso88599",
+    "latin6": "iso885910",
+    "latin7": "iso885913",
+    "latin8": "iso885914",
+    "latin9": "iso885915",
+    "latin10": "iso885916",
+
+    "csisolatin1": "iso88591",
+    "csisolatin2": "iso88592",
+    "csisolatin3": "iso88593",
+    "csisolatin4": "iso88594",
+    "csisolatincyrillic": "iso88595",
+    "csisolatinarabic": "iso88596",
+    "csisolatingreek" : "iso88597",
+    "csisolatinhebrew": "iso88598",
+    "csisolatin5": "iso88599",
+    "csisolatin6": "iso885910",
+
+    "l1": "iso88591",
+    "l2": "iso88592",
+    "l3": "iso88593",
+    "l4": "iso88594",
+    "l5": "iso88599",
+    "l6": "iso885910",
+    "l7": "iso885913",
+    "l8": "iso885914",
+    "l9": "iso885915",
+    "l10": "iso885916",
+
+    "isoir14": "iso646jp",
+    "isoir57": "iso646cn",
+    "isoir100": "iso88591",
+    "isoir101": "iso88592",
+    "isoir109": "iso88593",
+    "isoir110": "iso88594",
+    "isoir144": "iso88595",
+    "isoir127": "iso88596",
+    "isoir126": "iso88597",
+    "isoir138": "iso88598",
+    "isoir148": "iso88599",
+    "isoir157": "iso885910",
+    "isoir166": "tis620",
+    "isoir179": "iso885913",
+    "isoir199": "iso885914",
+    "isoir203": "iso885915",
+    "isoir226": "iso885916",
+
+    "cp819": "iso88591",
+    "ibm819": "iso88591",
+
+    "cyrillic": "iso88595",
+
+    "arabic": "iso88596",
+    "arabic8": "iso88596",
+    "ecma114": "iso88596",
+    "asmo708": "iso88596",
+
+    "greek" : "iso88597",
+    "greek8" : "iso88597",
+    "ecma118" : "iso88597",
+    "elot928" : "iso88597",
+
+    "hebrew": "iso88598",
+    "hebrew8": "iso88598",
+
+    "turkish": "iso88599",
+    "turkish8": "iso88599",
+
+    "thai": "iso885911",
+    "thai8": "iso885911",
+
+    "celtic": "iso885914",
+    "celtic8": "iso885914",
+    "isoceltic": "iso885914",
+
+    "tis6200": "tis620",
+    "tis62025291": "tis620",
+    "tis62025330": "tis620",
+
+    "10000": "macroman",
+    "10006": "macgreek",
+    "10007": "maccyrillic",
+    "10079": "maciceland",
+    "10081": "macturkish",
+
+    "cspc8codepage437": "cp437",
+    "cspc775baltic": "cp775",
+    "cspc850multilingual": "cp850",
+    "cspcp852": "cp852",
+    "cspc862latinhebrew": "cp862",
+    "cpgr": "cp869",
+
+    "msee": "cp1250",
+    "mscyrl": "cp1251",
+    "msansi": "cp1252",
+    "msgreek": "cp1253",
+    "msturk": "cp1254",
+    "mshebr": "cp1255",
+    "msarab": "cp1256",
+    "winbaltrim": "cp1257",
+
+    "cp20866": "koi8r",
+    "20866": "koi8r",
+    "ibm878": "koi8r",
+    "cskoi8r": "koi8r",
+
+    "cp21866": "koi8u",
+    "21866": "koi8u",
+    "ibm1168": "koi8u",
+
+    "strk10482002": "rk1048",
+
+    "tcvn5712": "tcvn",
+    "tcvn57121": "tcvn",
+
+    "gb198880": "iso646cn",
+    "cn": "iso646cn",
+
+    "csiso14jisc6220ro": "iso646jp",
+    "jisc62201969ro": "iso646jp",
+    "jp": "iso646jp",
+
+    "cshproman8": "hproman8",
+    "r8": "hproman8",
+    "roman8": "hproman8",
+    "xroman8": "hproman8",
+    "ibm1051": "hproman8",
+
+    "mac": "macintosh",
+    "csmacintosh": "macintosh",
+};
+
+
+
+/***/ }),
+/* 717 */
+/***/ (function(module, exports) {
+
+module.exports = [["8740","䏰䰲䘃䖦䕸𧉧䵷䖳𧲱䳢𧳅㮕䜶䝄䱇䱀𤊿𣘗𧍒𦺋𧃒䱗𪍑䝏䗚䲅𧱬䴇䪤䚡𦬣爥𥩔𡩣𣸆𣽡晍囻"],["8767","綕夝𨮹㷴霴𧯯寛𡵞媤㘥𩺰嫑宷峼杮薓𩥅瑡璝㡵𡵓𣚞𦀡㻬"],["87a1","𥣞㫵竼龗𤅡𨤍𣇪𠪊𣉞䌊蒄龖鐯䤰蘓墖靊鈘秐稲晠権袝瑌篅枂稬剏遆㓦珄𥶹瓆鿇垳䤯呌䄱𣚎堘穲𧭥讏䚮𦺈䆁𥶙箮𢒼鿈𢓁𢓉𢓌鿉蔄𣖻䂴鿊䓡𪷿拁灮鿋"],["8840","㇀",4,"𠄌㇅𠃑𠃍㇆㇇𠃋𡿨㇈𠃊㇉㇊㇋㇌𠄎㇍㇎ĀÁǍÀĒÉĚÈŌÓǑÒ࿿Ê̄Ế࿿Ê̌ỀÊāáǎàɑēéěèīíǐìōóǒòūúǔùǖǘǚ"],["88a1","ǜü࿿ê̄ế࿿ê̌ềêɡ⏚⏛"],["8940","𪎩𡅅"],["8943","攊"],["8946","丽滝鵎釟"],["894c","𧜵撑会伨侨兖兴农凤务动医华发变团声处备夲头学实実岚庆总斉柾栄桥济炼电纤纬纺织经统缆缷艺苏药视设询车轧轮"],["89a1","琑糼緍楆竉刧"],["89ab","醌碸酞肼"],["89b0","贋胶𠧧"],["89b5","肟黇䳍鷉鸌䰾𩷶𧀎鸊𪄳㗁"],["89c1","溚舾甙"],["89c5","䤑马骏龙禇𨑬𡷊𠗐𢫦两亁亀亇亿仫伷㑌侽㹈倃傈㑽㒓㒥円夅凛凼刅争剹劐匧㗇厩㕑厰㕓参吣㕭㕲㚁咓咣咴咹哐哯唘唣唨㖘唿㖥㖿嗗㗅"],["8a40","𧶄唥"],["8a43","𠱂𠴕𥄫喐𢳆㧬𠍁蹆𤶸𩓥䁓𨂾睺𢰸㨴䟕𨅝𦧲𤷪擝𠵼𠾴𠳕𡃴撍蹾𠺖𠰋𠽤𢲩𨉖𤓓"],["8a64","𠵆𩩍𨃩䟴𤺧𢳂骲㩧𩗴㿭㔆𥋇𩟔𧣈𢵄鵮頕"],["8a76","䏙𦂥撴哣𢵌𢯊𡁷㧻𡁯"],["8aa1","𦛚𦜖𧦠擪𥁒𠱃蹨𢆡𨭌𠜱"],["8aac","䠋𠆩㿺塳𢶍"],["8ab2","𤗈𠓼𦂗𠽌𠶖啹䂻䎺"],["8abb","䪴𢩦𡂝膪飵𠶜捹㧾𢝵跀嚡摼㹃"],["8ac9","𪘁𠸉𢫏𢳉"],["8ace","𡃈𣧂㦒㨆𨊛㕸𥹉𢃇噒𠼱𢲲𩜠㒼氽𤸻"],["8adf","𧕴𢺋𢈈𪙛𨳍𠹺𠰴𦠜羓𡃏𢠃𢤹㗻𥇣𠺌𠾍𠺪㾓𠼰𠵇𡅏𠹌"],["8af6","𠺫𠮩𠵈𡃀𡄽㿹𢚖搲𠾭"],["8b40","𣏴𧘹𢯎𠵾𠵿𢱑𢱕㨘𠺘𡃇𠼮𪘲𦭐𨳒𨶙𨳊閪哌苄喹"],["8b55","𩻃鰦骶𧝞𢷮煀腭胬尜𦕲脴㞗卟𨂽醶𠻺𠸏𠹷𠻻㗝𤷫㘉𠳖嚯𢞵𡃉𠸐𠹸𡁸𡅈𨈇𡑕𠹹𤹐𢶤婔𡀝𡀞𡃵𡃶垜𠸑"],["8ba1","𧚔𨋍𠾵𠹻𥅾㜃𠾶𡆀𥋘𪊽𤧚𡠺𤅷𨉼墙剨㘚𥜽箲孨䠀䬬鼧䧧鰟鮍𥭴𣄽嗻㗲嚉丨夂𡯁屮靑𠂆乛亻㔾尣彑忄㣺扌攵歺氵氺灬爫丬犭𤣩罒礻糹罓𦉪㓁"],["8bde","𦍋耂肀𦘒𦥑卝衤见𧢲讠贝钅镸长门𨸏韦页风飞饣𩠐鱼鸟黄歯龜丷𠂇阝户钢"],["8c40","倻淾𩱳龦㷉袏𤅎灷峵䬠𥇍㕙𥴰愢𨨲辧釶熑朙玺𣊁𪄇㲋𡦀䬐磤琂冮𨜏䀉橣𪊺䈣蘏𠩯稪𩥇𨫪靕灍匤𢁾鏴盙𨧣龧矝亣俰傼丯众龨吴綋墒壐𡶶庒庙忂𢜒斋"],["8ca1","𣏹椙橃𣱣泿"],["8ca7","爀𤔅玌㻛𤨓嬕璹讃𥲤𥚕窓篬糃繬苸薗龩袐龪躹龫迏蕟駠鈡龬𨶹𡐿䁱䊢娚"],["8cc9","顨杫䉶圽"],["8cce","藖𤥻芿𧄍䲁𦵴嵻𦬕𦾾龭龮宖龯曧繛湗秊㶈䓃𣉖𢞖䎚䔶"],["8ce6","峕𣬚諹屸㴒𣕑嵸龲煗䕘𤃬𡸣䱷㥸㑊𠆤𦱁諌侴𠈹妿腬顖𩣺弻"],["8d40","𠮟"],["8d42","𢇁𨥭䄂䚻𩁹㼇龳𪆵䃸㟖䛷𦱆䅼𨚲𧏿䕭㣔𥒚䕡䔛䶉䱻䵶䗪㿈𤬏㙡䓞䒽䇭崾嵈嵖㷼㠏嶤嶹㠠㠸幂庽弥徃㤈㤔㤿㥍惗愽峥㦉憷憹懏㦸戬抐拥挘㧸嚱"],["8da1","㨃揢揻搇摚㩋擀崕嘡龟㪗斆㪽旿晓㫲暒㬢朖㭂枤栀㭘桊梄㭲㭱㭻椉楃牜楤榟榅㮼槖㯝橥橴橱檂㯬檙㯲檫檵櫔櫶殁毁毪汵沪㳋洂洆洦涁㳯涤涱渕渘温溆𨧀溻滢滚齿滨滩漤漴㵆𣽁澁澾㵪㵵熷岙㶊瀬㶑灐灔灯灿炉𠌥䏁㗱𠻘"],["8e40","𣻗垾𦻓焾𥟠㙎榢𨯩孴穉𥣡𩓙穥穽𥦬窻窰竂竃燑𦒍䇊竚竝竪䇯咲𥰁笋筕笩𥌎𥳾箢筯莜𥮴𦱿篐萡箒箸𥴠㶭𥱥蒒篺簆簵𥳁籄粃𤢂粦晽𤕸糉糇糦籴糳糵糎"],["8ea1","繧䔝𦹄絝𦻖璍綉綫焵綳緒𤁗𦀩緤㴓緵𡟹緥𨍭縝𦄡𦅚繮纒䌫鑬縧罀罁罇礶𦋐駡羗𦍑羣𡙡𠁨䕜𣝦䔃𨌺翺𦒉者耈耝耨耯𪂇𦳃耻耼聡𢜔䦉𦘦𣷣𦛨朥肧𨩈脇脚墰𢛶汿𦒘𤾸擧𡒊舘𡡞橓𤩥𤪕䑺舩𠬍𦩒𣵾俹𡓽蓢荢𦬊𤦧𣔰𡝳𣷸芪椛芳䇛"],["8f40","蕋苐茚𠸖𡞴㛁𣅽𣕚艻苢茘𣺋𦶣𦬅𦮗𣗎㶿茝嗬莅䔋𦶥莬菁菓㑾𦻔橗蕚㒖𦹂𢻯葘𥯤葱㷓䓤檧葊𣲵祘蒨𦮖𦹷𦹃蓞萏莑䒠蒓蓤𥲑䉀𥳀䕃蔴嫲𦺙䔧蕳䔖枿蘖"],["8fa1","𨘥𨘻藁𧂈蘂𡖂𧃍䕫䕪蘨㙈𡢢号𧎚虾蝱𪃸蟮𢰧螱蟚蠏噡虬桖䘏衅衆𧗠𣶹𧗤衞袜䙛袴袵揁装睷𧜏覇覊覦覩覧覼𨨥觧𧤤𧪽誜瞓釾誐𧩙竩𧬺𣾏䜓𧬸煼謌謟𥐰𥕥謿譌譍誩𤩺讐讛誯𡛟䘕衏貛𧵔𧶏貫㜥𧵓賖𧶘𧶽贒贃𡤐賛灜贑𤳉㻐起"],["9040","趩𨀂𡀔𤦊㭼𨆼𧄌竧躭躶軃鋔輙輭𨍥𨐒辥錃𪊟𠩐辳䤪𨧞𨔽𣶻廸𣉢迹𪀔𨚼𨔁𢌥㦀𦻗逷𨔼𧪾遡𨕬𨘋邨𨜓郄𨛦邮都酧㫰醩釄粬𨤳𡺉鈎沟鉁鉢𥖹銹𨫆𣲛𨬌𥗛"],["90a1","𠴱錬鍫𨫡𨯫炏嫃𨫢𨫥䥥鉄𨯬𨰹𨯿鍳鑛躼閅閦鐦閠濶䊹𢙺𨛘𡉼𣸮䧟氜陻隖䅬隣𦻕懚隶磵𨫠隽双䦡𦲸𠉴𦐐𩂯𩃥𤫑𡤕𣌊霱虂霶䨏䔽䖅𤫩灵孁霛靜𩇕靗孊𩇫靟鐥僐𣂷𣂼鞉鞟鞱鞾韀韒韠𥑬韮琜𩐳響韵𩐝𧥺䫑頴頳顋顦㬎𧅵㵑𠘰𤅜"],["9140","𥜆飊颷飈飇䫿𦴧𡛓喰飡飦飬鍸餹𤨩䭲𩡗𩤅駵騌騻騐驘𥜥㛄𩂱𩯕髠髢𩬅髴䰎鬔鬭𨘀倴鬴𦦨㣃𣁽魐魀𩴾婅𡡣鮎𤉋鰂鯿鰌𩹨鷔𩾷𪆒𪆫𪃡𪄣𪇟鵾鶃𪄴鸎梈"],["91a1","鷄𢅛𪆓𪈠𡤻𪈳鴹𪂹𪊴麐麕麞麢䴴麪麯𤍤黁㭠㧥㴝伲㞾𨰫鼂鼈䮖鐤𦶢鼗鼖鼹嚟嚊齅馸𩂋韲葿齢齩竜龎爖䮾𤥵𤦻煷𤧸𤍈𤩑玞𨯚𡣺禟𨥾𨸶鍩鏳𨩄鋬鎁鏋𨥬𤒹爗㻫睲穃烐𤑳𤏸煾𡟯炣𡢾𣖙㻇𡢅𥐯𡟸㜢𡛻𡠹㛡𡝴𡣑𥽋㜣𡛀坛𤨥𡏾𡊨"],["9240","𡏆𡒶蔃𣚦蔃葕𤦔𧅥𣸱𥕜𣻻𧁒䓴𣛮𩦝𦼦柹㜳㰕㷧塬𡤢栐䁗𣜿𤃡𤂋𤄏𦰡哋嚞𦚱嚒𠿟𠮨𠸍鏆𨬓鎜仸儫㠙𤐶亼𠑥𠍿佋侊𥙑婨𠆫𠏋㦙𠌊𠐔㐵伩𠋀𨺳𠉵諚𠈌亘"],["92a1","働儍侢伃𤨎𣺊佂倮偬傁俌俥偘僼兙兛兝兞湶𣖕𣸹𣺿浲𡢄𣺉冨凃𠗠䓝𠒣𠒒𠒑赺𨪜𠜎剙劤𠡳勡鍮䙺熌𤎌𠰠𤦬𡃤槑𠸝瑹㻞璙琔瑖玘䮎𤪼𤂍叐㖄爏𤃉喴𠍅响𠯆圝鉝雴鍦埝垍坿㘾壋媙𨩆𡛺𡝯𡜐娬妸銏婾嫏娒𥥆𡧳𡡡𤊕㛵洅瑃娡𥺃"],["9340","媁𨯗𠐓鏠璌𡌃焅䥲鐈𨧻鎽㞠尞岞幞幈𡦖𡥼𣫮廍孏𡤃𡤄㜁𡢠㛝𡛾㛓脪𨩇𡶺𣑲𨦨弌弎𡤧𡞫婫𡜻孄蘔𧗽衠恾𢡠𢘫忛㺸𢖯𢖾𩂈𦽳懀𠀾𠁆𢘛憙憘恵𢲛𢴇𤛔𩅍"],["93a1","摱𤙥𢭪㨩𢬢𣑐𩣪𢹸挷𪑛撶挱揑𤧣𢵧护𢲡搻敫楲㯴𣂎𣊭𤦉𣊫唍𣋠𡣙𩐿曎𣊉𣆳㫠䆐𥖄𨬢𥖏𡛼𥕛𥐥磮𣄃𡠪𣈴㑤𣈏𣆂𤋉暎𦴤晫䮓昰𧡰𡷫晣𣋒𣋡昞𥡲㣑𣠺𣞼㮙𣞢𣏾瓐㮖枏𤘪梶栞㯄檾㡣𣟕𤒇樳橒櫉欅𡤒攑梘橌㯗橺歗𣿀𣲚鎠鋲𨯪𨫋"],["9440","銉𨀞𨧜鑧涥漋𤧬浧𣽿㶏渄𤀼娽渊塇洤硂焻𤌚𤉶烱牐犇犔𤞏𤜥兹𤪤𠗫瑺𣻸𣙟𤩊𤤗𥿡㼆㺱𤫟𨰣𣼵悧㻳瓌琼鎇琷䒟𦷪䕑疃㽣𤳙𤴆㽘畕癳𪗆㬙瑨𨫌𤦫𤦎㫻"],["94a1","㷍𤩎㻿𤧅𤣳釺圲鍂𨫣𡡤僟𥈡𥇧睸𣈲眎眏睻𤚗𣞁㩞𤣰琸璛㺿𤪺𤫇䃈𤪖𦆮錇𥖁砞碍碈磒珐祙𧝁𥛣䄎禛蒖禥樭𣻺稺秴䅮𡛦䄲鈵秱𠵌𤦌𠊙𣶺𡝮㖗啫㕰㚪𠇔𠰍竢婙𢛵𥪯𥪜娍𠉛磰娪𥯆竾䇹籝籭䈑𥮳𥺼𥺦糍𤧹𡞰粎籼粮檲緜縇緓罎𦉡"],["9540","𦅜𧭈綗𥺂䉪𦭵𠤖柖𠁎𣗏埄𦐒𦏸𤥢翝笧𠠬𥫩𥵃笌𥸎駦虅驣樜𣐿㧢𤧷𦖭騟𦖠蒀𧄧𦳑䓪脷䐂胆脉腂𦞴飃𦩂艢艥𦩑葓𦶧蘐𧈛媆䅿𡡀嬫𡢡嫤𡣘蚠蜨𣶏蠭𧐢娂"],["95a1","衮佅袇袿裦襥襍𥚃襔𧞅𧞄𨯵𨯙𨮜𨧹㺭蒣䛵䛏㟲訽訜𩑈彍鈫𤊄旔焩烄𡡅鵭貟賩𧷜妚矃姰䍮㛔踪躧𤰉輰轊䋴汘澻𢌡䢛潹溋𡟚鯩㚵𤤯邻邗啱䤆醻鐄𨩋䁢𨫼鐧𨰝𨰻蓥訫閙閧閗閖𨴴瑅㻂𤣿𤩂𤏪㻧𣈥随𨻧𨹦𨹥㻌𤧭𤩸𣿮琒瑫㻼靁𩂰"],["9640","桇䨝𩂓𥟟靝鍨𨦉𨰦𨬯𦎾銺嬑譩䤼珹𤈛鞛靱餸𠼦巁𨯅𤪲頟𩓚鋶𩗗釥䓀𨭐𤩧𨭤飜𨩅㼀鈪䤥萔餻饍𧬆㷽馛䭯馪驜𨭥𥣈檏騡嫾騯𩣱䮐𩥈馼䮽䮗鍽塲𡌂堢𤦸"],["96a1","𡓨硄𢜟𣶸棅㵽鑘㤧慐𢞁𢥫愇鱏鱓鱻鰵鰐魿鯏𩸭鮟𪇵𪃾鴡䲮𤄄鸘䲰鴌𪆴𪃭𪃳𩤯鶥蒽𦸒𦿟𦮂藼䔳𦶤𦺄𦷰萠藮𦸀𣟗𦁤秢𣖜𣙀䤭𤧞㵢鏛銾鍈𠊿碹鉷鑍俤㑀遤𥕝砽硔碶硋𡝗𣇉𤥁㚚佲濚濙瀞瀞吔𤆵垻壳垊鴖埗焴㒯𤆬燫𦱀𤾗嬨𡞵𨩉"],["9740","愌嫎娋䊼𤒈㜬䭻𨧼鎻鎸𡣖𠼝葲𦳀𡐓𤋺𢰦𤏁妔𣶷𦝁綨𦅛𦂤𤦹𤦋𨧺鋥珢㻩璴𨭣𡢟㻡𤪳櫘珳珻㻖𤨾𤪔𡟙𤩦𠎧𡐤𤧥瑈𤤖炥𤥶銄珦鍟𠓾錱𨫎𨨖鎆𨯧𥗕䤵𨪂煫"],["97a1","𤥃𠳿嚤𠘚𠯫𠲸唂秄𡟺緾𡛂𤩐𡡒䔮鐁㜊𨫀𤦭妰𡢿𡢃𧒄媡㛢𣵛㚰鉟婹𨪁𡡢鍴㳍𠪴䪖㦊僴㵩㵌𡎜煵䋻𨈘渏𩃤䓫浗𧹏灧沯㳖𣿭𣸭渂漌㵯𠏵畑㚼㓈䚀㻚䡱姄鉮䤾轁𨰜𦯀堒埈㛖𡑒烾𤍢𤩱𢿣𡊰𢎽梹楧𡎘𣓥𧯴𣛟𨪃𣟖𣏺𤲟樚𣚭𦲷萾䓟䓎"],["9840","𦴦𦵑𦲂𦿞漗𧄉茽𡜺菭𦲀𧁓𡟛妉媂𡞳婡婱𡤅𤇼㜭姯𡜼㛇熎鎐暚𤊥婮娫𤊓樫𣻹𧜶𤑛𤋊焝𤉙𨧡侰𦴨峂𤓎𧹍𤎽樌𤉖𡌄炦焳𤏩㶥泟勇𤩏繥姫崯㷳彜𤩝𡟟綤萦"],["98a1","咅𣫺𣌀𠈔坾𠣕𠘙㿥𡾞𪊶瀃𩅛嵰玏糓𨩙𩐠俈翧狍猐𧫴猸猹𥛶獁獈㺩𧬘遬燵𤣲珡臶㻊県㻑沢国琙琞琟㻢㻰㻴㻺瓓㼎㽓畂畭畲疍㽼痈痜㿀癍㿗癴㿜発𤽜熈嘣覀塩䀝睃䀹条䁅㗛瞘䁪䁯属瞾矋売砘点砜䂨砹硇硑硦葈𥔵礳栃礲䄃"],["9940","䄉禑禙辻稆込䅧窑䆲窼艹䇄竏竛䇏両筢筬筻簒簛䉠䉺类粜䊌粸䊔糭输烀𠳏総緔緐緽羮羴犟䎗耠耥笹耮耱联㷌垴炠肷胩䏭脌猪脎脒畠脔䐁㬹腖腙腚"],["99a1","䐓堺腼膄䐥膓䐭膥埯臁臤艔䒏芦艶苊苘苿䒰荗险榊萅烵葤惣蒈䔄蒾蓡蓸蔐蔸蕒䔻蕯蕰藠䕷虲蚒蚲蛯际螋䘆䘗袮裿褤襇覑𧥧訩訸誔誴豑賔賲贜䞘塟跃䟭仮踺嗘坔蹱嗵躰䠷軎転軤軭軲辷迁迊迌逳駄䢭飠鈓䤞鈨鉘鉫銱銮銿"],["9a40","鋣鋫鋳鋴鋽鍃鎄鎭䥅䥑麿鐗匁鐝鐭鐾䥪鑔鑹锭関䦧间阳䧥枠䨤靀䨵鞲韂噔䫤惨颹䬙飱塄餎餙冴餜餷饂饝饢䭰駅䮝騼鬏窃魩鮁鯝鯱鯴䱭鰠㝯𡯂鵉鰺"],["9aa1","黾噐鶓鶽鷀鷼银辶鹻麬麱麽黆铜黢黱黸竈齄𠂔𠊷𠎠椚铃妬𠓗塀铁㞹𠗕𠘕𠙶𡚺块煳𠫂𠫍𠮿呪吆𠯋咞𠯻𠰻𠱓𠱥𠱼惧𠲍噺𠲵𠳝𠳭𠵯𠶲𠷈楕鰯螥𠸄𠸎𠻗𠾐𠼭𠹳尠𠾼帋𡁜𡁏𡁶朞𡁻𡂈𡂖㙇𡂿𡃓𡄯𡄻卤蒭𡋣𡍵𡌶讁𡕷𡘙𡟃𡟇乸炻𡠭𡥪"],["9b40","𡨭𡩅𡰪𡱰𡲬𡻈拃𡻕𡼕熘桕𢁅槩㛈𢉼𢏗𢏺𢜪𢡱𢥏苽𢥧𢦓𢫕覥𢫨辠𢬎鞸𢬿顇骽𢱌"],["9b62","𢲈𢲷𥯨𢴈𢴒𢶷𢶕𢹂𢽴𢿌𣀳𣁦𣌟𣏞徱晈暿𧩹𣕧𣗳爁𤦺矗𣘚𣜖纇𠍆墵朎"],["9ba1","椘𣪧𧙗𥿢𣸑𣺹𧗾𢂚䣐䪸𤄙𨪚𤋮𤌍𤀻𤌴𤎖𤩅𠗊凒𠘑妟𡺨㮾𣳿𤐄𤓖垈𤙴㦛𤜯𨗨𩧉㝢𢇃譞𨭎駖𤠒𤣻𤨕爉𤫀𠱸奥𤺥𤾆𠝹軚𥀬劏圿煱𥊙𥐙𣽊𤪧喼𥑆𥑮𦭒釔㑳𥔿𧘲𥕞䜘𥕢𥕦𥟇𤤿𥡝偦㓻𣏌惞𥤃䝼𨥈𥪮𥮉𥰆𡶐垡煑澶𦄂𧰒遖𦆲𤾚譢𦐂𦑊"],["9c40","嵛𦯷輶𦒄𡤜諪𤧶𦒈𣿯𦔒䯀𦖿𦚵𢜛鑥𥟡憕娧晉侻嚹𤔡𦛼乪𤤴陖涏𦲽㘘襷𦞙𦡮𦐑𦡞營𦣇筂𩃀𠨑𦤦鄄𦤹穅鷰𦧺騦𦨭㙟𦑩𠀡禃𦨴𦭛崬𣔙菏𦮝䛐𦲤画补𦶮墶"],["9ca1","㜜𢖍𧁋𧇍㱔𧊀𧊅銁𢅺𧊋錰𧋦𤧐氹钟𧑐𠻸蠧裵𢤦𨑳𡞱溸𤨪𡠠㦤㚹尐秣䔿暶𩲭𩢤襃𧟌𧡘囖䃟𡘊㦡𣜯𨃨𡏅熭荦𧧝𩆨婧䲷𧂯𨦫𧧽𧨊𧬋𧵦𤅺筃祾𨀉澵𪋟樃𨌘厢𦸇鎿栶靝𨅯𨀣𦦵𡏭𣈯𨁈嶅𨰰𨂃圕頣𨥉嶫𤦈斾槕叒𤪥𣾁㰑朶𨂐𨃴𨄮𡾡𨅏"],["9d40","𨆉𨆯𨈚𨌆𨌯𨎊㗊𨑨𨚪䣺揦𨥖砈鉕𨦸䏲𨧧䏟𨧨𨭆𨯔姸𨰉輋𨿅𩃬筑𩄐𩄼㷷𩅞𤫊运犏嚋𩓧𩗩𩖰𩖸𩜲𩣑𩥉𩥪𩧃𩨨𩬎𩵚𩶛纟𩻸𩼣䲤镇𪊓熢𪋿䶑递𪗋䶜𠲜达嗁"],["9da1","辺𢒰边𤪓䔉繿潖檱仪㓤𨬬𧢝㜺躀𡟵𨀤𨭬𨮙𧨾𦚯㷫𧙕𣲷𥘵𥥖亚𥺁𦉘嚿𠹭踎孭𣺈𤲞揞拐𡟶𡡻攰嘭𥱊吚𥌑㷆𩶘䱽嘢嘞罉𥻘奵𣵀蝰东𠿪𠵉𣚺脗鵞贘瘻鱅癎瞹鍅吲腈苷嘥脲萘肽嗪祢噃吖𠺝㗎嘅嗱曱𨋢㘭甴嗰喺咗啲𠱁𠲖廐𥅈𠹶𢱢"],["9e40","𠺢麫絚嗞𡁵抝靭咔賍燶酶揼掹揾啩𢭃鱲𢺳冚㓟𠶧冧呍唞唓癦踭𦢊疱肶蠄螆裇膶萜𡃁䓬猄𤜆宐茋𦢓噻𢛴𧴯𤆣𧵳𦻐𧊶酰𡇙鈈𣳼𪚩𠺬𠻹牦𡲢䝎𤿂𧿹𠿫䃺"],["9ea1","鱝攟𢶠䣳𤟠𩵼𠿬𠸊恢𧖣𠿭"],["9ead","𦁈𡆇熣纎鵐业丄㕷嬍沲卧㚬㧜卽㚥𤘘墚𤭮舭呋垪𥪕𠥹"],["9ec5","㩒𢑥獴𩺬䴉鯭𣳾𩼰䱛𤾩𩖞𩿞葜𣶶𧊲𦞳𣜠挮紥𣻷𣸬㨪逈勌㹴㙺䗩𠒎癀嫰𠺶硺𧼮墧䂿噼鮋嵴癔𪐴麅䳡痹㟻愙𣃚𤏲"],["9ef5","噝𡊩垧𤥣𩸆刴𧂮㖭汊鵼"],["9f40","籖鬹埞𡝬屓擓𩓐𦌵𧅤蚭𠴨𦴢𤫢𠵱"],["9f4f","凾𡼏嶎霃𡷑麁遌笟鬂峑箣扨挵髿篏鬪籾鬮籂粆鰕篼鬉鼗鰛𤤾齚啳寃俽麘俲剠㸆勑坧偖妷帒韈鶫轜呩鞴饀鞺匬愰"],["9fa1","椬叚鰊鴂䰻陁榀傦畆𡝭駚剳"],["9fae","酙隁酜"],["9fb2","酑𨺗捿𦴣櫊嘑醎畺抅𠏼獏籰𥰡𣳽"],["9fc1","𤤙盖鮝个𠳔莾衂"],["9fc9","届槀僭坺刟巵从氱𠇲伹咜哚劚趂㗾弌㗳"],["9fdb","歒酼龥鮗頮颴骺麨麄煺笔"],["9fe7","毺蠘罸"],["9feb","嘠𪙊蹷齓"],["9ff0","跔蹏鸜踁抂𨍽踨蹵竓𤩷稾磘泪詧瘇"],["a040","𨩚鼦泎蟖痃𪊲硓咢贌狢獱謭猂瓱賫𤪻蘯徺袠䒷"],["a055","𡠻𦸅"],["a058","詾𢔛"],["a05b","惽癧髗鵄鍮鮏蟵"],["a063","蠏賷猬霡鮰㗖犲䰇籑饊𦅙慙䰄麖慽"],["a073","坟慯抦戹拎㩜懢厪𣏵捤栂㗒"],["a0a1","嵗𨯂迚𨸹"],["a0a6","僙𡵆礆匲阸𠼻䁥"],["a0ae","矾"],["a0b0","糂𥼚糚稭聦聣絍甅瓲覔舚朌聢𧒆聛瓰脃眤覉𦟌畓𦻑螩蟎臈螌詉貭譃眫瓸蓚㘵榲趦"],["a0d4","覩瑨涹蟁𤀑瓧㷛煶悤憜㳑煢恷"],["a0e2","罱𨬭牐惩䭾删㰘𣳇𥻗𧙖𥔱𡥄𡋾𩤃𦷜𧂭峁𦆭𨨏𣙷𠃮𦡆𤼎䕢嬟𦍌齐麦𦉫"],["a3c0","␀",31,"␡"],["c6a1","①",9,"⑴",9,"ⅰ",9,"丶丿亅亠冂冖冫勹匸卩厶夊宀巛⼳广廴彐彡攴无疒癶辵隶¨ˆヽヾゝゞ〃仝々〆〇ー［］✽ぁ",23],["c740","す",58,"ァアィイ"],["c7a1","ゥ",81,"А",5,"ЁЖ",4],["c840","Л",26,"ёж",25,"⇧↸↹㇏𠃌乚𠂊刂䒑"],["c8a1","龰冈龱𧘇"],["c8cd","￢￤＇＂㈱№℡゛゜⺀⺄⺆⺇⺈⺊⺌⺍⺕⺜⺝⺥⺧⺪⺬⺮⺶⺼⺾⻆⻊⻌⻍⻏⻖⻗⻞⻣"],["c8f5","ʃɐɛɔɵœøŋʊɪ"],["f9fe","￭"],["fa40","𠕇鋛𠗟𣿅蕌䊵珯况㙉𤥂𨧤鍄𡧛苮𣳈砼杄拟𤤳𨦪𠊠𦮳𡌅侫𢓭倈𦴩𧪄𣘀𤪱𢔓倩𠍾徤𠎀𠍇滛𠐟偽儁㑺儎顬㝃萖𤦤𠒇兠𣎴兪𠯿𢃼𠋥𢔰𠖎𣈳𡦃宂蝽𠖳𣲙冲冸"],["faa1","鴴凉减凑㳜凓𤪦决凢卂凭菍椾𣜭彻刋刦刼劵剗劔効勅簕蕂勠蘍𦬓包𨫞啉滙𣾀𠥔𣿬匳卄𠯢泋𡜦栛珕恊㺪㣌𡛨燝䒢卭却𨚫卾卿𡖖𡘓矦厓𨪛厠厫厮玧𥝲㽙玜叁叅汉义埾叙㪫𠮏叠𣿫𢶣叶𠱷吓灹唫晗浛呭𦭓𠵴啝咏咤䞦𡜍𠻝㶴𠵍"],["fb40","𨦼𢚘啇䳭启琗喆喩嘅𡣗𤀺䕒𤐵暳𡂴嘷曍𣊊暤暭噍噏磱囱鞇叾圀囯园𨭦㘣𡉏坆𤆥汮炋坂㚱𦱾埦𡐖堃𡑔𤍣堦𤯵塜墪㕡壠壜𡈼壻寿坃𪅐𤉸鏓㖡够梦㛃湙"],["fba1","𡘾娤啓𡚒蔅姉𠵎𦲁𦴪𡟜姙𡟻𡞲𦶦浱𡠨𡛕姹𦹅媫婣㛦𤦩婷㜈媖瑥嫓𦾡𢕔㶅𡤑㜲𡚸広勐孶斈孼𧨎䀄䡝𠈄寕慠𡨴𥧌𠖥寳宝䴐尅𡭄尓珎尔𡲥𦬨屉䣝岅峩峯嶋𡷹𡸷崐崘嵆𡺤岺巗苼㠭𤤁𢁉𢅳芇㠶㯂帮檊幵幺𤒼𠳓厦亷廐厨𡝱帉廴𨒂"],["fc40","廹廻㢠廼栾鐛弍𠇁弢㫞䢮𡌺强𦢈𢏐彘𢑱彣鞽𦹮彲鍀𨨶徧嶶㵟𥉐𡽪𧃸𢙨釖𠊞𨨩怱暅𡡷㥣㷇㘹垐𢞴祱㹀悞悤悳𤦂𤦏𧩓璤僡媠慤萤慂慈𦻒憁凴𠙖憇宪𣾷"],["fca1","𢡟懓𨮝𩥝懐㤲𢦀𢣁怣慜攞掋𠄘担𡝰拕𢸍捬𤧟㨗搸揸𡎎𡟼撐澊𢸶頔𤂌𥜝擡擥鑻㩦携㩗敍漖𤨨𤨣斅敭敟𣁾斵𤥀䬷旑䃘𡠩无旣忟𣐀昘𣇷𣇸晄𣆤𣆥晋𠹵晧𥇦晳晴𡸽𣈱𨗴𣇈𥌓矅𢣷馤朂𤎜𤨡㬫槺𣟂杞杧杢𤇍𩃭柗䓩栢湐鈼栁𣏦𦶠桝"],["fd40","𣑯槡樋𨫟楳棃𣗍椁椀㴲㨁𣘼㮀枬楡𨩊䋼椶榘㮡𠏉荣傐槹𣙙𢄪橅𣜃檝㯳枱櫈𩆜㰍欝𠤣惞欵歴𢟍溵𣫛𠎵𡥘㝀吡𣭚毡𣻼毜氷𢒋𤣱𦭑汚舦汹𣶼䓅𣶽𤆤𤤌𤤀"],["fda1","𣳉㛥㳫𠴲鮃𣇹𢒑羏样𦴥𦶡𦷫涖浜湼漄𤥿𤂅𦹲蔳𦽴凇沜渝萮𨬡港𣸯瑓𣾂秌湏媑𣁋濸㜍澝𣸰滺𡒗𤀽䕕鏰潄潜㵎潴𩅰㴻澟𤅄濓𤂑𤅕𤀹𣿰𣾴𤄿凟𤅖𤅗𤅀𦇝灋灾炧炁烌烕烖烟䄄㷨熴熖𤉷焫煅媈煊煮岜𤍥煏鍢𤋁焬𤑚𤨧𤨢熺𨯨炽爎"],["fe40","鑂爕夑鑃爤鍁𥘅爮牀𤥴梽牕牗㹕𣁄栍漽犂猪猫𤠣𨠫䣭𨠄猨献珏玪𠰺𦨮珉瑉𤇢𡛧𤨤昣㛅𤦷𤦍𤧻珷琕椃𤨦琹𠗃㻗瑜𢢭瑠𨺲瑇珤瑶莹瑬㜰瑴鏱樬璂䥓𤪌"],["fea1","𤅟𤩹𨮏孆𨰃𡢞瓈𡦈甎瓩甞𨻙𡩋寗𨺬鎅畍畊畧畮𤾂㼄𤴓疎瑝疞疴瘂瘬癑癏癯癶𦏵皐臯㟸𦤑𦤎皡皥皷盌𦾟葢𥂝𥅽𡸜眞眦着撯𥈠睘𣊬瞯𨥤𨥨𡛁矴砉𡍶𤨒棊碯磇磓隥礮𥗠磗礴碱𧘌辸袄𨬫𦂃𢘜禆褀椂禀𥡗禝𧬹礼禩渪𧄦㺨秆𩄍秔"]]
+
+/***/ }),
+/* 718 */
+/***/ (function(module, exports) {
+
+module.exports = [["0","\u0000",127],["8141","갂갃갅갆갋",4,"갘갞갟갡갢갣갥",6,"갮갲갳갴"],["8161","갵갶갷갺갻갽갾갿걁",9,"걌걎",5,"걕"],["8181","걖걗걙걚걛걝",18,"걲걳걵걶걹걻",4,"겂겇겈겍겎겏겑겒겓겕",6,"겞겢",5,"겫겭겮겱",6,"겺겾겿곀곂곃곅곆곇곉곊곋곍",7,"곖곘",7,"곢곣곥곦곩곫곭곮곲곴곷",4,"곾곿괁괂괃괅괇",4,"괎괐괒괓"],["8241","괔괕괖괗괙괚괛괝괞괟괡",7,"괪괫괮",5],["8261","괶괷괹괺괻괽",6,"굆굈굊",5,"굑굒굓굕굖굗"],["8281","굙",7,"굢굤",7,"굮굯굱굲굷굸굹굺굾궀궃",4,"궊궋궍궎궏궑",10,"궞",5,"궥",17,"궸",7,"귂귃귅귆귇귉",6,"귒귔",7,"귝귞귟귡귢귣귥",18],["8341","귺귻귽귾긂",5,"긊긌긎",5,"긕",7],["8361","긝",18,"긲긳긵긶긹긻긼"],["8381","긽긾긿깂깄깇깈깉깋깏깑깒깓깕깗",4,"깞깢깣깤깦깧깪깫깭깮깯깱",6,"깺깾",5,"꺆",5,"꺍",46,"꺿껁껂껃껅",6,"껎껒",5,"껚껛껝",8],["8441","껦껧껩껪껬껮",5,"껵껶껷껹껺껻껽",8],["8461","꼆꼉꼊꼋꼌꼎꼏꼑",18],["8481","꼤",7,"꼮꼯꼱꼳꼵",6,"꼾꽀꽄꽅꽆꽇꽊",5,"꽑",10,"꽞",5,"꽦",18,"꽺",5,"꾁꾂꾃꾅꾆꾇꾉",6,"꾒꾓꾔꾖",5,"꾝",26,"꾺꾻꾽꾾"],["8541","꾿꿁",5,"꿊꿌꿏",4,"꿕",6,"꿝",4],["8561","꿢",5,"꿪",5,"꿲꿳꿵꿶꿷꿹",6,"뀂뀃"],["8581","뀅",6,"뀍뀎뀏뀑뀒뀓뀕",6,"뀞",9,"뀩",26,"끆끇끉끋끍끏끐끑끒끖끘끚끛끜끞",29,"끾끿낁낂낃낅",6,"낎낐낒",5,"낛낝낞낣낤"],["8641","낥낦낧낪낰낲낶낷낹낺낻낽",6,"냆냊",5,"냒"],["8661","냓냕냖냗냙",6,"냡냢냣냤냦",10],["8681","냱",22,"넊넍넎넏넑넔넕넖넗넚넞",4,"넦넧넩넪넫넭",6,"넶넺",5,"녂녃녅녆녇녉",6,"녒녓녖녗녙녚녛녝녞녟녡",22,"녺녻녽녾녿놁놃",4,"놊놌놎놏놐놑놕놖놗놙놚놛놝"],["8741","놞",9,"놩",15],["8761","놹",18,"뇍뇎뇏뇑뇒뇓뇕"],["8781","뇖",5,"뇞뇠",7,"뇪뇫뇭뇮뇯뇱",7,"뇺뇼뇾",5,"눆눇눉눊눍",6,"눖눘눚",5,"눡",18,"눵",6,"눽",26,"뉙뉚뉛뉝뉞뉟뉡",6,"뉪",4],["8841","뉯",4,"뉶",5,"뉽",6,"늆늇늈늊",4],["8861","늏늒늓늕늖늗늛",4,"늢늤늧늨늩늫늭늮늯늱늲늳늵늶늷"],["8881","늸",15,"닊닋닍닎닏닑닓",4,"닚닜닞닟닠닡닣닧닩닪닰닱닲닶닼닽닾댂댃댅댆댇댉",6,"댒댖",5,"댝",54,"덗덙덚덝덠덡덢덣"],["8941","덦덨덪덬덭덯덲덳덵덶덷덹",6,"뎂뎆",5,"뎍"],["8961","뎎뎏뎑뎒뎓뎕",10,"뎢",5,"뎩뎪뎫뎭"],["8981","뎮",21,"돆돇돉돊돍돏돑돒돓돖돘돚돜돞돟돡돢돣돥돦돧돩",18,"돽",18,"됑",6,"됙됚됛됝됞됟됡",6,"됪됬",7,"됵",15],["8a41","둅",10,"둒둓둕둖둗둙",6,"둢둤둦"],["8a61","둧",4,"둭",18,"뒁뒂"],["8a81","뒃",4,"뒉",19,"뒞",5,"뒥뒦뒧뒩뒪뒫뒭",7,"뒶뒸뒺",5,"듁듂듃듅듆듇듉",6,"듑듒듓듔듖",5,"듞듟듡듢듥듧",4,"듮듰듲",5,"듹",26,"딖딗딙딚딝"],["8b41","딞",5,"딦딫",4,"딲딳딵딶딷딹",6,"땂땆"],["8b61","땇땈땉땊땎땏땑땒땓땕",6,"땞땢",8],["8b81","땫",52,"떢떣떥떦떧떩떬떭떮떯떲떶",4,"떾떿뗁뗂뗃뗅",6,"뗎뗒",5,"뗙",18,"뗭",18],["8c41","똀",15,"똒똓똕똖똗똙",4],["8c61","똞",6,"똦",5,"똭",6,"똵",5],["8c81","똻",12,"뙉",26,"뙥뙦뙧뙩",50,"뚞뚟뚡뚢뚣뚥",5,"뚭뚮뚯뚰뚲",16],["8d41","뛃",16,"뛕",8],["8d61","뛞",17,"뛱뛲뛳뛵뛶뛷뛹뛺"],["8d81","뛻",4,"뜂뜃뜄뜆",33,"뜪뜫뜭뜮뜱",6,"뜺뜼",7,"띅띆띇띉띊띋띍",6,"띖",9,"띡띢띣띥띦띧띩",6,"띲띴띶",5,"띾띿랁랂랃랅",6,"랎랓랔랕랚랛랝랞"],["8e41","랟랡",6,"랪랮",5,"랶랷랹",8],["8e61","럂",4,"럈럊",19],["8e81","럞",13,"럮럯럱럲럳럵",6,"럾렂",4,"렊렋렍렎렏렑",6,"렚렜렞",5,"렦렧렩렪렫렭",6,"렶렺",5,"롁롂롃롅",11,"롒롔",7,"롞롟롡롢롣롥",6,"롮롰롲",5,"롹롺롻롽",7],["8f41","뢅",7,"뢎",17],["8f61","뢠",7,"뢩",6,"뢱뢲뢳뢵뢶뢷뢹",4],["8f81","뢾뢿룂룄룆",5,"룍룎룏룑룒룓룕",7,"룞룠룢",5,"룪룫룭룮룯룱",6,"룺룼룾",5,"뤅",18,"뤙",6,"뤡",26,"뤾뤿륁륂륃륅",6,"륍륎륐륒",5],["9041","륚륛륝륞륟륡",6,"륪륬륮",5,"륶륷륹륺륻륽"],["9061","륾",5,"릆릈릋릌릏",15],["9081","릟",12,"릮릯릱릲릳릵",6,"릾맀맂",5,"맊맋맍맓",4,"맚맜맟맠맢맦맧맩맪맫맭",6,"맶맻",4,"먂",5,"먉",11,"먖",33,"먺먻먽먾먿멁멃멄멅멆"],["9141","멇멊멌멏멐멑멒멖멗멙멚멛멝",6,"멦멪",5],["9161","멲멳멵멶멷멹",9,"몆몈몉몊몋몍",5],["9181","몓",20,"몪몭몮몯몱몳",4,"몺몼몾",5,"뫅뫆뫇뫉",14,"뫚",33,"뫽뫾뫿묁묂묃묅",7,"묎묐묒",5,"묙묚묛묝묞묟묡",6],["9241","묨묪묬",7,"묷묹묺묿",4,"뭆뭈뭊뭋뭌뭎뭑뭒"],["9261","뭓뭕뭖뭗뭙",7,"뭢뭤",7,"뭭",4],["9281","뭲",21,"뮉뮊뮋뮍뮎뮏뮑",18,"뮥뮦뮧뮩뮪뮫뮭",6,"뮵뮶뮸",7,"믁믂믃믅믆믇믉",6,"믑믒믔",35,"믺믻믽믾밁"],["9341","밃",4,"밊밎밐밒밓밙밚밠밡밢밣밦밨밪밫밬밮밯밲밳밵"],["9361","밶밷밹",6,"뱂뱆뱇뱈뱊뱋뱎뱏뱑",8],["9381","뱚뱛뱜뱞",37,"벆벇벉벊벍벏",4,"벖벘벛",4,"벢벣벥벦벩",6,"벲벶",5,"벾벿볁볂볃볅",7,"볎볒볓볔볖볗볙볚볛볝",22,"볷볹볺볻볽"],["9441","볾",5,"봆봈봊",5,"봑봒봓봕",8],["9461","봞",5,"봥",6,"봭",12],["9481","봺",5,"뵁",6,"뵊뵋뵍뵎뵏뵑",6,"뵚",9,"뵥뵦뵧뵩",22,"붂붃붅붆붋",4,"붒붔붖붗붘붛붝",6,"붥",10,"붱",6,"붹",24],["9541","뷒뷓뷖뷗뷙뷚뷛뷝",11,"뷪",5,"뷱"],["9561","뷲뷳뷵뷶뷷뷹",6,"븁븂븄븆",5,"븎븏븑븒븓"],["9581","븕",6,"븞븠",35,"빆빇빉빊빋빍빏",4,"빖빘빜빝빞빟빢빣빥빦빧빩빫",4,"빲빶",4,"빾빿뺁뺂뺃뺅",6,"뺎뺒",5,"뺚",13,"뺩",14],["9641","뺸",23,"뻒뻓"],["9661","뻕뻖뻙",6,"뻡뻢뻦",5,"뻭",8],["9681","뻶",10,"뼂",5,"뼊",13,"뼚뼞",33,"뽂뽃뽅뽆뽇뽉",6,"뽒뽓뽔뽖",44],["9741","뾃",16,"뾕",8],["9761","뾞",17,"뾱",7],["9781","뾹",11,"뿆",5,"뿎뿏뿑뿒뿓뿕",6,"뿝뿞뿠뿢",89,"쀽쀾쀿"],["9841","쁀",16,"쁒",5,"쁙쁚쁛"],["9861","쁝쁞쁟쁡",6,"쁪",15],["9881","쁺",21,"삒삓삕삖삗삙",6,"삢삤삦",5,"삮삱삲삷",4,"삾샂샃샄샆샇샊샋샍샎샏샑",6,"샚샞",5,"샦샧샩샪샫샭",6,"샶샸샺",5,"섁섂섃섅섆섇섉",6,"섑섒섓섔섖",5,"섡섢섥섨섩섪섫섮"],["9941","섲섳섴섵섷섺섻섽섾섿셁",6,"셊셎",5,"셖셗"],["9961","셙셚셛셝",6,"셦셪",5,"셱셲셳셵셶셷셹셺셻"],["9981","셼",8,"솆",5,"솏솑솒솓솕솗",4,"솞솠솢솣솤솦솧솪솫솭솮솯솱",11,"솾",5,"쇅쇆쇇쇉쇊쇋쇍",6,"쇕쇖쇙",6,"쇡쇢쇣쇥쇦쇧쇩",6,"쇲쇴",7,"쇾쇿숁숂숃숅",6,"숎숐숒",5,"숚숛숝숞숡숢숣"],["9a41","숤숥숦숧숪숬숮숰숳숵",16],["9a61","쉆쉇쉉",6,"쉒쉓쉕쉖쉗쉙",6,"쉡쉢쉣쉤쉦"],["9a81","쉧",4,"쉮쉯쉱쉲쉳쉵",6,"쉾슀슂",5,"슊",5,"슑",6,"슙슚슜슞",5,"슦슧슩슪슫슮",5,"슶슸슺",33,"싞싟싡싢싥",5,"싮싰싲싳싴싵싷싺싽싾싿쌁",6,"쌊쌋쌎쌏"],["9b41","쌐쌑쌒쌖쌗쌙쌚쌛쌝",6,"쌦쌧쌪",8],["9b61","쌳",17,"썆",7],["9b81","썎",25,"썪썫썭썮썯썱썳",4,"썺썻썾",5,"쎅쎆쎇쎉쎊쎋쎍",50,"쏁",22,"쏚"],["9c41","쏛쏝쏞쏡쏣",4,"쏪쏫쏬쏮",5,"쏶쏷쏹",5],["9c61","쏿",8,"쐉",6,"쐑",9],["9c81","쐛",8,"쐥",6,"쐭쐮쐯쐱쐲쐳쐵",6,"쐾",9,"쑉",26,"쑦쑧쑩쑪쑫쑭",6,"쑶쑷쑸쑺",5,"쒁",18,"쒕",6,"쒝",12],["9d41","쒪",13,"쒹쒺쒻쒽",8],["9d61","쓆",25],["9d81","쓠",8,"쓪",5,"쓲쓳쓵쓶쓷쓹쓻쓼쓽쓾씂",9,"씍씎씏씑씒씓씕",6,"씝",10,"씪씫씭씮씯씱",6,"씺씼씾",5,"앆앇앋앏앐앑앒앖앚앛앜앟앢앣앥앦앧앩",6,"앲앶",5,"앾앿얁얂얃얅얆얈얉얊얋얎얐얒얓얔"],["9e41","얖얙얚얛얝얞얟얡",7,"얪",9,"얶"],["9e61","얷얺얿",4,"엋엍엏엒엓엕엖엗엙",6,"엢엤엦엧"],["9e81","엨엩엪엫엯엱엲엳엵엸엹엺엻옂옃옄옉옊옋옍옎옏옑",6,"옚옝",6,"옦옧옩옪옫옯옱옲옶옸옺옼옽옾옿왂왃왅왆왇왉",6,"왒왖",5,"왞왟왡",10,"왭왮왰왲",5,"왺왻왽왾왿욁",6,"욊욌욎",5,"욖욗욙욚욛욝",6,"욦"],["9f41","욨욪",5,"욲욳욵욶욷욻",4,"웂웄웆",5,"웎"],["9f61","웏웑웒웓웕",6,"웞웟웢",5,"웪웫웭웮웯웱웲"],["9f81","웳",4,"웺웻웼웾",5,"윆윇윉윊윋윍",6,"윖윘윚",5,"윢윣윥윦윧윩",6,"윲윴윶윸윹윺윻윾윿읁읂읃읅",4,"읋읎읐읙읚읛읝읞읟읡",6,"읩읪읬",7,"읶읷읹읺읻읿잀잁잂잆잋잌잍잏잒잓잕잙잛",4,"잢잧",4,"잮잯잱잲잳잵잶잷"],["a041","잸잹잺잻잾쟂",5,"쟊쟋쟍쟏쟑",6,"쟙쟚쟛쟜"],["a061","쟞",5,"쟥쟦쟧쟩쟪쟫쟭",13],["a081","쟻",4,"젂젃젅젆젇젉젋",4,"젒젔젗",4,"젞젟젡젢젣젥",6,"젮젰젲",5,"젹젺젻젽젾젿졁",6,"졊졋졎",5,"졕",26,"졲졳졵졶졷졹졻",4,"좂좄좈좉좊좎",5,"좕",7,"좞좠좢좣좤"],["a141","좥좦좧좩",18,"좾좿죀죁"],["a161","죂죃죅죆죇죉죊죋죍",6,"죖죘죚",5,"죢죣죥"],["a181","죦",14,"죶",5,"죾죿줁줂줃줇",4,"줎　、。·‥…¨〃­―∥＼∼‘’“”〔〕〈",9,"±×÷≠≤≥∞∴°′″℃Å￠￡￥♂♀∠⊥⌒∂∇≡≒§※☆★○●◎◇◆□■△▲▽▼→←↑↓↔〓≪≫√∽∝∵∫∬∈∋⊆⊇⊂⊃∪∩∧∨￢"],["a241","줐줒",5,"줙",18],["a261","줭",6,"줵",18],["a281","쥈",7,"쥒쥓쥕쥖쥗쥙",6,"쥢쥤",7,"쥭쥮쥯⇒⇔∀∃´～ˇ˘˝˚˙¸˛¡¿ː∮∑∏¤℉‰◁◀▷▶♤♠♡♥♧♣⊙◈▣◐◑▒▤▥▨▧▦▩♨☏☎☜☞¶†‡↕↗↙↖↘♭♩♪♬㉿㈜№㏇™㏂㏘℡€®"],["a341","쥱쥲쥳쥵",6,"쥽",10,"즊즋즍즎즏"],["a361","즑",6,"즚즜즞",16],["a381","즯",16,"짂짃짅짆짉짋",4,"짒짔짗짘짛！",58,"￦］",32,"￣"],["a441","짞짟짡짣짥짦짨짩짪짫짮짲",5,"짺짻짽짾짿쨁쨂쨃쨄"],["a461","쨅쨆쨇쨊쨎",5,"쨕쨖쨗쨙",12],["a481","쨦쨧쨨쨪",28,"ㄱ",93],["a541","쩇",4,"쩎쩏쩑쩒쩓쩕",6,"쩞쩢",5,"쩩쩪"],["a561","쩫",17,"쩾",5,"쪅쪆"],["a581","쪇",16,"쪙",14,"ⅰ",9],["a5b0","Ⅰ",9],["a5c1","Α",16,"Σ",6],["a5e1","α",16,"σ",6],["a641","쪨",19,"쪾쪿쫁쫂쫃쫅"],["a661","쫆",5,"쫎쫐쫒쫔쫕쫖쫗쫚",5,"쫡",6],["a681","쫨쫩쫪쫫쫭",6,"쫵",18,"쬉쬊─│┌┐┘└├┬┤┴┼━┃┏┓┛┗┣┳┫┻╋┠┯┨┷┿┝┰┥┸╂┒┑┚┙┖┕┎┍┞┟┡┢┦┧┩┪┭┮┱┲┵┶┹┺┽┾╀╁╃",7],["a741","쬋",4,"쬑쬒쬓쬕쬖쬗쬙",6,"쬢",7],["a761","쬪",22,"쭂쭃쭄"],["a781","쭅쭆쭇쭊쭋쭍쭎쭏쭑",6,"쭚쭛쭜쭞",5,"쭥",7,"㎕㎖㎗ℓ㎘㏄㎣㎤㎥㎦㎙",9,"㏊㎍㎎㎏㏏㎈㎉㏈㎧㎨㎰",9,"㎀",4,"㎺",5,"㎐",4,"Ω㏀㏁㎊㎋㎌㏖㏅㎭㎮㎯㏛㎩㎪㎫㎬㏝㏐㏓㏃㏉㏜㏆"],["a841","쭭",10,"쭺",14],["a861","쮉",18,"쮝",6],["a881","쮤",19,"쮹",11,"ÆЪĦ"],["a8a6","IJ"],["a8a8","ĿŁØŒºÞŦŊ"],["a8b1","㉠",27,"ⓐ",25,"①",14,"½⅓⅔¼¾⅛⅜⅝⅞"],["a941","쯅",14,"쯕",10],["a961","쯠쯡쯢쯣쯥쯦쯨쯪",18],["a981","쯽",14,"찎찏찑찒찓찕",6,"찞찟찠찣찤æđðħıijĸŀłøœßþŧŋʼn㈀",27,"⒜",25,"⑴",14,"¹²³⁴ⁿ₁₂₃₄"],["aa41","찥찦찪찫찭찯찱",6,"찺찿",4,"챆챇챉챊챋챍챎"],["aa61","챏",4,"챖챚",5,"챡챢챣챥챧챩",6,"챱챲"],["aa81","챳챴챶",29,"ぁ",82],["ab41","첔첕첖첗첚첛첝첞첟첡",6,"첪첮",5,"첶첷첹"],["ab61","첺첻첽",6,"쳆쳈쳊",5,"쳑쳒쳓쳕",5],["ab81","쳛",8,"쳥",6,"쳭쳮쳯쳱",12,"ァ",85],["ac41","쳾쳿촀촂",5,"촊촋촍촎촏촑",6,"촚촜촞촟촠"],["ac61","촡촢촣촥촦촧촩촪촫촭",11,"촺",4],["ac81","촿",28,"쵝쵞쵟А",5,"ЁЖ",25],["acd1","а",5,"ёж",25],["ad41","쵡쵢쵣쵥",6,"쵮쵰쵲",5,"쵹",7],["ad61","춁",6,"춉",10,"춖춗춙춚춛춝춞춟"],["ad81","춠춡춢춣춦춨춪",5,"춱",18,"췅"],["ae41","췆",5,"췍췎췏췑",16],["ae61","췢",5,"췩췪췫췭췮췯췱",6,"췺췼췾",4],["ae81","츃츅츆츇츉츊츋츍",6,"츕츖츗츘츚",5,"츢츣츥츦츧츩츪츫"],["af41","츬츭츮츯츲츴츶",19],["af61","칊",13,"칚칛칝칞칢",5,"칪칬"],["af81","칮",5,"칶칷칹칺칻칽",6,"캆캈캊",5,"캒캓캕캖캗캙"],["b041","캚",5,"캢캦",5,"캮",12],["b061","캻",5,"컂",19],["b081","컖",13,"컦컧컩컪컭",6,"컶컺",5,"가각간갇갈갉갊감",7,"같",4,"갠갤갬갭갯갰갱갸갹갼걀걋걍걔걘걜거걱건걷걸걺검겁것겄겅겆겉겊겋게겐겔겜겝겟겠겡겨격겪견겯결겸겹겻겼경곁계곈곌곕곗고곡곤곧골곪곬곯곰곱곳공곶과곽관괄괆"],["b141","켂켃켅켆켇켉",6,"켒켔켖",5,"켝켞켟켡켢켣"],["b161","켥",6,"켮켲",5,"켹",11],["b181","콅",14,"콖콗콙콚콛콝",6,"콦콨콪콫콬괌괍괏광괘괜괠괩괬괭괴괵괸괼굄굅굇굉교굔굘굡굣구국군굳굴굵굶굻굼굽굿궁궂궈궉권궐궜궝궤궷귀귁귄귈귐귑귓규균귤그극근귿글긁금급긋긍긔기긱긴긷길긺김깁깃깅깆깊까깍깎깐깔깖깜깝깟깠깡깥깨깩깬깰깸"],["b241","콭콮콯콲콳콵콶콷콹",6,"쾁쾂쾃쾄쾆",5,"쾍"],["b261","쾎",18,"쾢",5,"쾩"],["b281","쾪",5,"쾱",18,"쿅",6,"깹깻깼깽꺄꺅꺌꺼꺽꺾껀껄껌껍껏껐껑께껙껜껨껫껭껴껸껼꼇꼈꼍꼐꼬꼭꼰꼲꼴꼼꼽꼿꽁꽂꽃꽈꽉꽐꽜꽝꽤꽥꽹꾀꾄꾈꾐꾑꾕꾜꾸꾹꾼꿀꿇꿈꿉꿋꿍꿎꿔꿜꿨꿩꿰꿱꿴꿸뀀뀁뀄뀌뀐뀔뀜뀝뀨끄끅끈끊끌끎끓끔끕끗끙"],["b341","쿌",19,"쿢쿣쿥쿦쿧쿩"],["b361","쿪",5,"쿲쿴쿶",5,"쿽쿾쿿퀁퀂퀃퀅",5],["b381","퀋",5,"퀒",5,"퀙",19,"끝끼끽낀낄낌낍낏낑나낙낚난낟날낡낢남납낫",4,"낱낳내낵낸낼냄냅냇냈냉냐냑냔냘냠냥너넉넋넌널넒넓넘넙넛넜넝넣네넥넨넬넴넵넷넸넹녀녁년녈념녑녔녕녘녜녠노녹논놀놂놈놉놋농높놓놔놘놜놨뇌뇐뇔뇜뇝"],["b441","퀮",5,"퀶퀷퀹퀺퀻퀽",6,"큆큈큊",5],["b461","큑큒큓큕큖큗큙",6,"큡",10,"큮큯"],["b481","큱큲큳큵",6,"큾큿킀킂",18,"뇟뇨뇩뇬뇰뇹뇻뇽누눅눈눋눌눔눕눗눙눠눴눼뉘뉜뉠뉨뉩뉴뉵뉼늄늅늉느늑는늘늙늚늠늡늣능늦늪늬늰늴니닉닌닐닒님닙닛닝닢다닥닦단닫",4,"닳담답닷",4,"닿대댁댄댈댐댑댓댔댕댜더덕덖던덛덜덞덟덤덥"],["b541","킕",14,"킦킧킩킪킫킭",5],["b561","킳킶킸킺",5,"탂탃탅탆탇탊",5,"탒탖",4],["b581","탛탞탟탡탢탣탥",6,"탮탲",5,"탹",11,"덧덩덫덮데덱덴델뎀뎁뎃뎄뎅뎌뎐뎔뎠뎡뎨뎬도독돈돋돌돎돐돔돕돗동돛돝돠돤돨돼됐되된될됨됩됫됴두둑둔둘둠둡둣둥둬뒀뒈뒝뒤뒨뒬뒵뒷뒹듀듄듈듐듕드득든듣들듦듬듭듯등듸디딕딘딛딜딤딥딧딨딩딪따딱딴딸"],["b641","턅",7,"턎",17],["b661","턠",15,"턲턳턵턶턷턹턻턼턽턾"],["b681","턿텂텆",5,"텎텏텑텒텓텕",6,"텞텠텢",5,"텩텪텫텭땀땁땃땄땅땋때땍땐땔땜땝땟땠땡떠떡떤떨떪떫떰떱떳떴떵떻떼떽뗀뗄뗌뗍뗏뗐뗑뗘뗬또똑똔똘똥똬똴뙈뙤뙨뚜뚝뚠뚤뚫뚬뚱뛔뛰뛴뛸뜀뜁뜅뜨뜩뜬뜯뜰뜸뜹뜻띄띈띌띔띕띠띤띨띰띱띳띵라락란랄람랍랏랐랑랒랖랗"],["b741","텮",13,"텽",6,"톅톆톇톉톊"],["b761","톋",20,"톢톣톥톦톧"],["b781","톩",6,"톲톴톶톷톸톹톻톽톾톿퇁",14,"래랙랜랠램랩랫랬랭랴략랸럇량러럭런럴럼럽럿렀렁렇레렉렌렐렘렙렛렝려력련렬렴렵렷렸령례롄롑롓로록론롤롬롭롯롱롸롼뢍뢨뢰뢴뢸룀룁룃룅료룐룔룝룟룡루룩룬룰룸룹룻룽뤄뤘뤠뤼뤽륀륄륌륏륑류륙륜률륨륩"],["b841","퇐",7,"퇙",17],["b861","퇫",8,"퇵퇶퇷퇹",13],["b881","툈툊",5,"툑",24,"륫륭르륵른를름릅릇릉릊릍릎리릭린릴림립릿링마막만많",4,"맘맙맛망맞맡맣매맥맨맬맴맵맷맸맹맺먀먁먈먕머먹먼멀멂멈멉멋멍멎멓메멕멘멜멤멥멧멨멩며멱면멸몃몄명몇몌모목몫몬몰몲몸몹못몽뫄뫈뫘뫙뫼"],["b941","툪툫툮툯툱툲툳툵",6,"툾퉀퉂",5,"퉉퉊퉋퉌"],["b961","퉍",14,"퉝",6,"퉥퉦퉧퉨"],["b981","퉩",22,"튂튃튅튆튇튉튊튋튌묀묄묍묏묑묘묜묠묩묫무묵묶문묻물묽묾뭄뭅뭇뭉뭍뭏뭐뭔뭘뭡뭣뭬뮈뮌뮐뮤뮨뮬뮴뮷므믄믈믐믓미믹민믿밀밂밈밉밋밌밍및밑바",4,"받",4,"밤밥밧방밭배백밴밸뱀뱁뱃뱄뱅뱉뱌뱍뱐뱝버벅번벋벌벎범법벗"],["ba41","튍튎튏튒튓튔튖",5,"튝튞튟튡튢튣튥",6,"튭"],["ba61","튮튯튰튲",5,"튺튻튽튾틁틃",4,"틊틌",5],["ba81","틒틓틕틖틗틙틚틛틝",6,"틦",9,"틲틳틵틶틷틹틺벙벚베벡벤벧벨벰벱벳벴벵벼벽변별볍볏볐병볕볘볜보복볶본볼봄봅봇봉봐봔봤봬뵀뵈뵉뵌뵐뵘뵙뵤뵨부북분붇불붉붊붐붑붓붕붙붚붜붤붰붸뷔뷕뷘뷜뷩뷰뷴뷸븀븃븅브븍븐블븜븝븟비빅빈빌빎빔빕빗빙빚빛빠빡빤"],["bb41","틻",4,"팂팄팆",5,"팏팑팒팓팕팗",4,"팞팢팣"],["bb61","팤팦팧팪팫팭팮팯팱",6,"팺팾",5,"퍆퍇퍈퍉"],["bb81","퍊",31,"빨빪빰빱빳빴빵빻빼빽뺀뺄뺌뺍뺏뺐뺑뺘뺙뺨뻐뻑뻔뻗뻘뻠뻣뻤뻥뻬뼁뼈뼉뼘뼙뼛뼜뼝뽀뽁뽄뽈뽐뽑뽕뾔뾰뿅뿌뿍뿐뿔뿜뿟뿡쀼쁑쁘쁜쁠쁨쁩삐삑삔삘삠삡삣삥사삭삯산삳살삵삶삼삽삿샀상샅새색샌샐샘샙샛샜생샤"],["bc41","퍪",17,"퍾퍿펁펂펃펅펆펇"],["bc61","펈펉펊펋펎펒",5,"펚펛펝펞펟펡",6,"펪펬펮"],["bc81","펯",4,"펵펶펷펹펺펻펽",6,"폆폇폊",5,"폑",5,"샥샨샬샴샵샷샹섀섄섈섐섕서",4,"섣설섦섧섬섭섯섰성섶세섹센셀셈셉셋셌셍셔셕션셜셤셥셧셨셩셰셴셸솅소속솎손솔솖솜솝솟송솥솨솩솬솰솽쇄쇈쇌쇔쇗쇘쇠쇤쇨쇰쇱쇳쇼쇽숀숄숌숍숏숑수숙순숟술숨숩숫숭"],["bd41","폗폙",7,"폢폤",7,"폮폯폱폲폳폵폶폷"],["bd61","폸폹폺폻폾퐀퐂",5,"퐉",13],["bd81","퐗",5,"퐞",25,"숯숱숲숴쉈쉐쉑쉔쉘쉠쉥쉬쉭쉰쉴쉼쉽쉿슁슈슉슐슘슛슝스슥슨슬슭슴습슷승시식신싣실싫심십싯싱싶싸싹싻싼쌀쌈쌉쌌쌍쌓쌔쌕쌘쌜쌤쌥쌨쌩썅써썩썬썰썲썸썹썼썽쎄쎈쎌쏀쏘쏙쏜쏟쏠쏢쏨쏩쏭쏴쏵쏸쐈쐐쐤쐬쐰"],["be41","퐸",7,"푁푂푃푅",14],["be61","푔",7,"푝푞푟푡푢푣푥",7,"푮푰푱푲"],["be81","푳",4,"푺푻푽푾풁풃",4,"풊풌풎",5,"풕",8,"쐴쐼쐽쑈쑤쑥쑨쑬쑴쑵쑹쒀쒔쒜쒸쒼쓩쓰쓱쓴쓸쓺쓿씀씁씌씐씔씜씨씩씬씰씸씹씻씽아악안앉않알앍앎앓암압앗았앙앝앞애액앤앨앰앱앳앴앵야약얀얄얇얌얍얏양얕얗얘얜얠얩어억언얹얻얼얽얾엄",6,"엌엎"],["bf41","풞",10,"풪",14],["bf61","풹",18,"퓍퓎퓏퓑퓒퓓퓕"],["bf81","퓖",5,"퓝퓞퓠",7,"퓩퓪퓫퓭퓮퓯퓱",6,"퓹퓺퓼에엑엔엘엠엡엣엥여역엮연열엶엷염",5,"옅옆옇예옌옐옘옙옛옜오옥온올옭옮옰옳옴옵옷옹옻와왁완왈왐왑왓왔왕왜왝왠왬왯왱외왹왼욀욈욉욋욍요욕욘욜욤욥욧용우욱운울욹욺움웁웃웅워웍원월웜웝웠웡웨"],["c041","퓾",5,"픅픆픇픉픊픋픍",6,"픖픘",5],["c061","픞",25],["c081","픸픹픺픻픾픿핁핂핃핅",6,"핎핐핒",5,"핚핛핝핞핟핡핢핣웩웬웰웸웹웽위윅윈윌윔윕윗윙유육윤율윰윱윳융윷으윽은을읊음읍읏응",7,"읜읠읨읫이익인일읽읾잃임입잇있잉잊잎자작잔잖잗잘잚잠잡잣잤장잦재잭잰잴잼잽잿쟀쟁쟈쟉쟌쟎쟐쟘쟝쟤쟨쟬저적전절젊"],["c141","핤핦핧핪핬핮",5,"핶핷핹핺핻핽",6,"햆햊햋"],["c161","햌햍햎햏햑",19,"햦햧"],["c181","햨",31,"점접젓정젖제젝젠젤젬젭젯젱져젼졀졈졉졌졍졔조족존졸졺좀좁좃종좆좇좋좌좍좔좝좟좡좨좼좽죄죈죌죔죕죗죙죠죡죤죵주죽준줄줅줆줌줍줏중줘줬줴쥐쥑쥔쥘쥠쥡쥣쥬쥰쥴쥼즈즉즌즐즘즙즛증지직진짇질짊짐집짓"],["c241","헊헋헍헎헏헑헓",4,"헚헜헞",5,"헦헧헩헪헫헭헮"],["c261","헯",4,"헶헸헺",5,"혂혃혅혆혇혉",6,"혒"],["c281","혖",5,"혝혞혟혡혢혣혥",7,"혮",9,"혺혻징짖짙짚짜짝짠짢짤짧짬짭짯짰짱째짹짼쨀쨈쨉쨋쨌쨍쨔쨘쨩쩌쩍쩐쩔쩜쩝쩟쩠쩡쩨쩽쪄쪘쪼쪽쫀쫄쫌쫍쫏쫑쫓쫘쫙쫠쫬쫴쬈쬐쬔쬘쬠쬡쭁쭈쭉쭌쭐쭘쭙쭝쭤쭸쭹쮜쮸쯔쯤쯧쯩찌찍찐찔찜찝찡찢찧차착찬찮찰참찹찻"],["c341","혽혾혿홁홂홃홄홆홇홊홌홎홏홐홒홓홖홗홙홚홛홝",4],["c361","홢",4,"홨홪",5,"홲홳홵",11],["c381","횁횂횄횆",5,"횎횏횑횒횓횕",7,"횞횠횢",5,"횩횪찼창찾채책챈챌챔챕챗챘챙챠챤챦챨챰챵처척천철첨첩첫첬청체첵첸첼쳄쳅쳇쳉쳐쳔쳤쳬쳰촁초촉촌촐촘촙촛총촤촨촬촹최쵠쵤쵬쵭쵯쵱쵸춈추축춘출춤춥춧충춰췄췌췐취췬췰췸췹췻췽츄츈츌츔츙츠측츤츨츰츱츳층"],["c441","횫횭횮횯횱",7,"횺횼",7,"훆훇훉훊훋"],["c461","훍훎훏훐훒훓훕훖훘훚",5,"훡훢훣훥훦훧훩",4],["c481","훮훯훱훲훳훴훶",5,"훾훿휁휂휃휅",11,"휒휓휔치칙친칟칠칡침칩칫칭카칵칸칼캄캅캇캉캐캑캔캘캠캡캣캤캥캬캭컁커컥컨컫컬컴컵컷컸컹케켁켄켈켐켑켓켕켜켠켤켬켭켯켰켱켸코콕콘콜콤콥콧콩콰콱콴콸쾀쾅쾌쾡쾨쾰쿄쿠쿡쿤쿨쿰쿱쿳쿵쿼퀀퀄퀑퀘퀭퀴퀵퀸퀼"],["c541","휕휖휗휚휛휝휞휟휡",6,"휪휬휮",5,"휶휷휹"],["c561","휺휻휽",6,"흅흆흈흊",5,"흒흓흕흚",4],["c581","흟흢흤흦흧흨흪흫흭흮흯흱흲흳흵",6,"흾흿힀힂",5,"힊힋큄큅큇큉큐큔큘큠크큭큰클큼큽킁키킥킨킬킴킵킷킹타탁탄탈탉탐탑탓탔탕태택탠탤탬탭탯탰탱탸턍터턱턴털턺텀텁텃텄텅테텍텐텔템텝텟텡텨텬텼톄톈토톡톤톨톰톱톳통톺톼퇀퇘퇴퇸툇툉툐투툭툰툴툼툽툿퉁퉈퉜"],["c641","힍힎힏힑",6,"힚힜힞",5],["c6a1","퉤튀튁튄튈튐튑튕튜튠튤튬튱트특튼튿틀틂틈틉틋틔틘틜틤틥티틱틴틸팀팁팃팅파팍팎판팔팖팜팝팟팠팡팥패팩팬팰팸팹팻팼팽퍄퍅퍼퍽펀펄펌펍펏펐펑페펙펜펠펨펩펫펭펴편펼폄폅폈평폐폘폡폣포폭폰폴폼폽폿퐁"],["c7a1","퐈퐝푀푄표푠푤푭푯푸푹푼푿풀풂품풉풋풍풔풩퓌퓐퓔퓜퓟퓨퓬퓰퓸퓻퓽프픈플픔픕픗피픽핀필핌핍핏핑하학한할핥함합핫항해핵핸핼햄햅햇했행햐향허헉헌헐헒험헙헛헝헤헥헨헬헴헵헷헹혀혁현혈혐협혓혔형혜혠"],["c8a1","혤혭호혹혼홀홅홈홉홋홍홑화확환활홧황홰홱홴횃횅회획횐횔횝횟횡효횬횰횹횻후훅훈훌훑훔훗훙훠훤훨훰훵훼훽휀휄휑휘휙휜휠휨휩휫휭휴휵휸휼흄흇흉흐흑흔흖흗흘흙흠흡흣흥흩희흰흴흼흽힁히힉힌힐힘힙힛힝"],["caa1","伽佳假價加可呵哥嘉嫁家暇架枷柯歌珂痂稼苛茄街袈訶賈跏軻迦駕刻却各恪慤殼珏脚覺角閣侃刊墾奸姦干幹懇揀杆柬桿澗癎看磵稈竿簡肝艮艱諫間乫喝曷渴碣竭葛褐蝎鞨勘坎堪嵌感憾戡敢柑橄減甘疳監瞰紺邯鑑鑒龕"],["cba1","匣岬甲胛鉀閘剛堈姜岡崗康强彊慷江畺疆糠絳綱羌腔舡薑襁講鋼降鱇介价個凱塏愷愾慨改槪漑疥皆盖箇芥蓋豈鎧開喀客坑更粳羹醵倨去居巨拒据據擧渠炬祛距踞車遽鉅鋸乾件健巾建愆楗腱虔蹇鍵騫乞傑杰桀儉劍劒檢"],["cca1","瞼鈐黔劫怯迲偈憩揭擊格檄激膈覡隔堅牽犬甄絹繭肩見譴遣鵑抉決潔結缺訣兼慊箝謙鉗鎌京俓倞傾儆勁勍卿坰境庚徑慶憬擎敬景暻更梗涇炅烱璟璥瓊痙硬磬竟競絅經耕耿脛莖警輕逕鏡頃頸驚鯨係啓堺契季屆悸戒桂械"],["cda1","棨溪界癸磎稽系繫繼計誡谿階鷄古叩告呱固姑孤尻庫拷攷故敲暠枯槁沽痼皐睾稿羔考股膏苦苽菰藁蠱袴誥賈辜錮雇顧高鼓哭斛曲梏穀谷鵠困坤崑昆梱棍滾琨袞鯤汨滑骨供公共功孔工恐恭拱控攻珙空蚣貢鞏串寡戈果瓜"],["cea1","科菓誇課跨過鍋顆廓槨藿郭串冠官寬慣棺款灌琯瓘管罐菅觀貫關館刮恝括适侊光匡壙廣曠洸炚狂珖筐胱鑛卦掛罫乖傀塊壞怪愧拐槐魁宏紘肱轟交僑咬喬嬌嶠巧攪敎校橋狡皎矯絞翹膠蕎蛟較轎郊餃驕鮫丘久九仇俱具勾"],["cfa1","區口句咎嘔坵垢寇嶇廐懼拘救枸柩構歐毆毬求溝灸狗玖球瞿矩究絿耉臼舅舊苟衢謳購軀逑邱鉤銶駒驅鳩鷗龜國局菊鞠鞫麴君窘群裙軍郡堀屈掘窟宮弓穹窮芎躬倦券勸卷圈拳捲權淃眷厥獗蕨蹶闕机櫃潰詭軌饋句晷歸貴"],["d0a1","鬼龜叫圭奎揆槻珪硅窺竅糾葵規赳逵閨勻均畇筠菌鈞龜橘克剋劇戟棘極隙僅劤勤懃斤根槿瑾筋芹菫覲謹近饉契今妗擒昑檎琴禁禽芩衾衿襟金錦伋及急扱汲級給亘兢矜肯企伎其冀嗜器圻基埼夔奇妓寄岐崎己幾忌技旗旣"],["d1a1","朞期杞棋棄機欺氣汽沂淇玘琦琪璂璣畸畿碁磯祁祇祈祺箕紀綺羈耆耭肌記譏豈起錡錤飢饑騎騏驥麒緊佶吉拮桔金喫儺喇奈娜懦懶拏拿癩",5,"那樂",4,"諾酪駱亂卵暖欄煖爛蘭難鸞捏捺南嵐枏楠湳濫男藍襤拉"],["d2a1","納臘蠟衲囊娘廊",4,"乃來內奈柰耐冷女年撚秊念恬拈捻寧寗努勞奴弩怒擄櫓爐瑙盧",5,"駑魯",10,"濃籠聾膿農惱牢磊腦賂雷尿壘",7,"嫩訥杻紐勒",5,"能菱陵尼泥匿溺多茶"],["d3a1","丹亶但單團壇彖斷旦檀段湍短端簞緞蛋袒鄲鍛撻澾獺疸達啖坍憺擔曇淡湛潭澹痰聃膽蕁覃談譚錟沓畓答踏遝唐堂塘幢戇撞棠當糖螳黨代垈坮大對岱帶待戴擡玳臺袋貸隊黛宅德悳倒刀到圖堵塗導屠島嶋度徒悼挑掉搗桃"],["d4a1","棹櫂淘渡滔濤燾盜睹禱稻萄覩賭跳蹈逃途道都鍍陶韜毒瀆牘犢獨督禿篤纛讀墩惇敦旽暾沌焞燉豚頓乭突仝冬凍動同憧東桐棟洞潼疼瞳童胴董銅兜斗杜枓痘竇荳讀豆逗頭屯臀芚遁遯鈍得嶝橙燈登等藤謄鄧騰喇懶拏癩羅"],["d5a1","蘿螺裸邏樂洛烙珞絡落諾酪駱丹亂卵欄欒瀾爛蘭鸞剌辣嵐擥攬欖濫籃纜藍襤覽拉臘蠟廊朗浪狼琅瑯螂郞來崍徠萊冷掠略亮倆兩凉梁樑粮粱糧良諒輛量侶儷勵呂廬慮戾旅櫚濾礪藜蠣閭驢驪麗黎力曆歷瀝礫轢靂憐戀攣漣"],["d6a1","煉璉練聯蓮輦連鍊冽列劣洌烈裂廉斂殮濂簾獵令伶囹寧岺嶺怜玲笭羚翎聆逞鈴零靈領齡例澧禮醴隷勞怒撈擄櫓潞瀘爐盧老蘆虜路輅露魯鷺鹵碌祿綠菉錄鹿麓論壟弄朧瀧瓏籠聾儡瀨牢磊賂賚賴雷了僚寮廖料燎療瞭聊蓼"],["d7a1","遼鬧龍壘婁屢樓淚漏瘻累縷蔞褸鏤陋劉旒柳榴流溜瀏琉瑠留瘤硫謬類六戮陸侖倫崙淪綸輪律慄栗率隆勒肋凜凌楞稜綾菱陵俚利厘吏唎履悧李梨浬犁狸理璃異痢籬罹羸莉裏裡里釐離鯉吝潾燐璘藺躪隣鱗麟林淋琳臨霖砬"],["d8a1","立笠粒摩瑪痲碼磨馬魔麻寞幕漠膜莫邈万卍娩巒彎慢挽晩曼滿漫灣瞞萬蔓蠻輓饅鰻唜抹末沫茉襪靺亡妄忘忙望網罔芒茫莽輞邙埋妹媒寐昧枚梅每煤罵買賣邁魅脈貊陌驀麥孟氓猛盲盟萌冪覓免冕勉棉沔眄眠綿緬面麵滅"],["d9a1","蔑冥名命明暝椧溟皿瞑茗蓂螟酩銘鳴袂侮冒募姆帽慕摸摹暮某模母毛牟牡瑁眸矛耗芼茅謀謨貌木沐牧目睦穆鶩歿沒夢朦蒙卯墓妙廟描昴杳渺猫竗苗錨務巫憮懋戊拇撫无楙武毋無珷畝繆舞茂蕪誣貿霧鵡墨默們刎吻問文"],["daa1","汶紊紋聞蚊門雯勿沕物味媚尾嵋彌微未梶楣渼湄眉米美薇謎迷靡黴岷悶愍憫敏旻旼民泯玟珉緡閔密蜜謐剝博拍搏撲朴樸泊珀璞箔粕縛膊舶薄迫雹駁伴半反叛拌搬攀斑槃泮潘班畔瘢盤盼磐磻礬絆般蟠返頒飯勃拔撥渤潑"],["dba1","發跋醱鉢髮魃倣傍坊妨尨幇彷房放方旁昉枋榜滂磅紡肪膀舫芳蒡蚌訪謗邦防龐倍俳北培徘拜排杯湃焙盃背胚裴裵褙賠輩配陪伯佰帛柏栢白百魄幡樊煩燔番磻繁蕃藩飜伐筏罰閥凡帆梵氾汎泛犯範范法琺僻劈壁擘檗璧癖"],["dca1","碧蘗闢霹便卞弁變辨辯邊別瞥鱉鼈丙倂兵屛幷昞昺柄棅炳甁病秉竝輧餠騈保堡報寶普步洑湺潽珤甫菩補褓譜輔伏僕匐卜宓復服福腹茯蔔複覆輹輻馥鰒本乶俸奉封峯峰捧棒烽熢琫縫蓬蜂逢鋒鳳不付俯傅剖副否咐埠夫婦"],["dda1","孚孵富府復扶敷斧浮溥父符簿缶腐腑膚艀芙莩訃負賦賻赴趺部釜阜附駙鳧北分吩噴墳奔奮忿憤扮昐汾焚盆粉糞紛芬賁雰不佛弗彿拂崩朋棚硼繃鵬丕備匕匪卑妃婢庇悲憊扉批斐枇榧比毖毗毘沸泌琵痺砒碑秕秘粃緋翡肥"],["dea1","脾臂菲蜚裨誹譬費鄙非飛鼻嚬嬪彬斌檳殯浜濱瀕牝玭貧賓頻憑氷聘騁乍事些仕伺似使俟僿史司唆嗣四士奢娑寫寺射巳師徙思捨斜斯柶査梭死沙泗渣瀉獅砂社祀祠私篩紗絲肆舍莎蓑蛇裟詐詞謝賜赦辭邪飼駟麝削數朔索"],["dfa1","傘刪山散汕珊産疝算蒜酸霰乷撒殺煞薩三參杉森渗芟蔘衫揷澁鈒颯上傷像償商喪嘗孀尙峠常床庠廂想桑橡湘爽牀狀相祥箱翔裳觴詳象賞霜塞璽賽嗇塞穡索色牲生甥省笙墅壻嶼序庶徐恕抒捿敍暑曙書栖棲犀瑞筮絮緖署"],["e0a1","胥舒薯西誓逝鋤黍鼠夕奭席惜昔晳析汐淅潟石碩蓆釋錫仙僊先善嬋宣扇敾旋渲煽琁瑄璇璿癬禪線繕羨腺膳船蘚蟬詵跣選銑鐥饍鮮卨屑楔泄洩渫舌薛褻設說雪齧剡暹殲纖蟾贍閃陝攝涉燮葉城姓宬性惺成星晟猩珹盛省筬"],["e1a1","聖聲腥誠醒世勢歲洗稅笹細說貰召嘯塑宵小少巢所掃搔昭梳沼消溯瀟炤燒甦疏疎瘙笑篠簫素紹蔬蕭蘇訴逍遡邵銷韶騷俗屬束涑粟續謖贖速孫巽損蓀遜飡率宋悚松淞訟誦送頌刷殺灑碎鎖衰釗修受嗽囚垂壽嫂守岫峀帥愁"],["e2a1","戍手授搜收數樹殊水洙漱燧狩獸琇璲瘦睡秀穗竪粹綏綬繡羞脩茱蒐蓚藪袖誰讐輸遂邃酬銖銹隋隧隨雖需須首髓鬚叔塾夙孰宿淑潚熟琡璹肅菽巡徇循恂旬栒楯橓殉洵淳珣盾瞬筍純脣舜荀蓴蕣詢諄醇錞順馴戌術述鉥崇崧"],["e3a1","嵩瑟膝蝨濕拾習褶襲丞乘僧勝升承昇繩蠅陞侍匙嘶始媤尸屎屍市弑恃施是時枾柴猜矢示翅蒔蓍視試詩諡豕豺埴寔式息拭植殖湜熄篒蝕識軾食飾伸侁信呻娠宸愼新晨燼申神紳腎臣莘薪藎蜃訊身辛辰迅失室實悉審尋心沁"],["e4a1","沈深瀋甚芯諶什十拾雙氏亞俄兒啞娥峨我牙芽莪蛾衙訝阿雅餓鴉鵝堊岳嶽幄惡愕握樂渥鄂鍔顎鰐齷安岸按晏案眼雁鞍顔鮟斡謁軋閼唵岩巖庵暗癌菴闇壓押狎鴨仰央怏昻殃秧鴦厓哀埃崖愛曖涯碍艾隘靄厄扼掖液縊腋額"],["e5a1","櫻罌鶯鸚也倻冶夜惹揶椰爺耶若野弱掠略約若葯蒻藥躍亮佯兩凉壤孃恙揚攘敭暘梁楊樣洋瀁煬痒瘍禳穰糧羊良襄諒讓釀陽量養圄御於漁瘀禦語馭魚齬億憶抑檍臆偃堰彦焉言諺孼蘖俺儼嚴奄掩淹嶪業円予余勵呂女如廬"],["e6a1","旅歟汝濾璵礖礪與艅茹輿轝閭餘驪麗黎亦力域役易曆歷疫繹譯轢逆驛嚥堧姸娟宴年延憐戀捐挻撚椽沇沿涎涓淵演漣烟然煙煉燃燕璉硏硯秊筵緣練縯聯衍軟輦蓮連鉛鍊鳶列劣咽悅涅烈熱裂說閱厭廉念捻染殮炎焰琰艶苒"],["e7a1","簾閻髥鹽曄獵燁葉令囹塋寧嶺嶸影怜映暎楹榮永泳渶潁濚瀛瀯煐營獰玲瑛瑩瓔盈穎纓羚聆英詠迎鈴鍈零霙靈領乂倪例刈叡曳汭濊猊睿穢芮藝蘂禮裔詣譽豫醴銳隸霓預五伍俉傲午吾吳嗚塢墺奧娛寤悟惡懊敖旿晤梧汚澳"],["e8a1","烏熬獒筽蜈誤鰲鼇屋沃獄玉鈺溫瑥瘟穩縕蘊兀壅擁瓮甕癰翁邕雍饔渦瓦窩窪臥蛙蝸訛婉完宛梡椀浣玩琓琬碗緩翫脘腕莞豌阮頑曰往旺枉汪王倭娃歪矮外嵬巍猥畏了僚僥凹堯夭妖姚寥寮尿嶢拗搖撓擾料曜樂橈燎燿瑤療"],["e9a1","窈窯繇繞耀腰蓼蟯要謠遙遼邀饒慾欲浴縟褥辱俑傭冗勇埇墉容庸慂榕涌湧溶熔瑢用甬聳茸蓉踊鎔鏞龍于佑偶優又友右宇寓尤愚憂旴牛玗瑀盂祐禑禹紆羽芋藕虞迂遇郵釪隅雨雩勖彧旭昱栯煜稶郁頊云暈橒殞澐熉耘芸蕓"],["eaa1","運隕雲韻蔚鬱亐熊雄元原員圓園垣媛嫄寃怨愿援沅洹湲源爰猿瑗苑袁轅遠阮院願鴛月越鉞位偉僞危圍委威尉慰暐渭爲瑋緯胃萎葦蔿蝟衛褘謂違韋魏乳侑儒兪劉唯喩孺宥幼幽庾悠惟愈愉揄攸有杻柔柚柳楡楢油洧流游溜"],["eba1","濡猶猷琉瑜由留癒硫紐維臾萸裕誘諛諭踰蹂遊逾遺酉釉鍮類六堉戮毓肉育陸倫允奫尹崙淪潤玧胤贇輪鈗閏律慄栗率聿戎瀜絨融隆垠恩慇殷誾銀隱乙吟淫蔭陰音飮揖泣邑凝應膺鷹依倚儀宜意懿擬椅毅疑矣義艤薏蟻衣誼"],["eca1","議醫二以伊利吏夷姨履已弛彛怡易李梨泥爾珥理異痍痢移罹而耳肄苡荑裏裡貽貳邇里離飴餌匿溺瀷益翊翌翼謚人仁刃印吝咽因姻寅引忍湮燐璘絪茵藺蚓認隣靭靷鱗麟一佚佾壹日溢逸鎰馹任壬妊姙恁林淋稔臨荏賃入卄"],["eda1","立笠粒仍剩孕芿仔刺咨姉姿子字孜恣慈滋炙煮玆瓷疵磁紫者自茨蔗藉諮資雌作勺嚼斫昨灼炸爵綽芍酌雀鵲孱棧殘潺盞岑暫潛箴簪蠶雜丈仗匠場墻壯奬將帳庄張掌暲杖樟檣欌漿牆狀獐璋章粧腸臟臧莊葬蔣薔藏裝贓醬長"],["eea1","障再哉在宰才材栽梓渽滓災縡裁財載齋齎爭箏諍錚佇低儲咀姐底抵杵楮樗沮渚狙猪疽箸紵苧菹著藷詛貯躇這邸雎齟勣吊嫡寂摘敵滴狄炙的積笛籍績翟荻謫賊赤跡蹟迪迹適鏑佃佺傳全典前剪塡塼奠專展廛悛戰栓殿氈澱"],["efa1","煎琠田甸畑癲筌箋箭篆纏詮輾轉鈿銓錢鐫電顚顫餞切截折浙癤竊節絶占岾店漸点粘霑鮎點接摺蝶丁井亭停偵呈姃定幀庭廷征情挺政整旌晶晸柾楨檉正汀淀淨渟湞瀞炡玎珽町睛碇禎程穽精綎艇訂諪貞鄭酊釘鉦鋌錠霆靖"],["f0a1","靜頂鼎制劑啼堤帝弟悌提梯濟祭第臍薺製諸蹄醍除際霽題齊俎兆凋助嘲弔彫措操早晁曺曹朝條棗槽漕潮照燥爪璪眺祖祚租稠窕粗糟組繰肇藻蚤詔調趙躁造遭釣阻雕鳥族簇足鏃存尊卒拙猝倧宗從悰慫棕淙琮種終綜縱腫"],["f1a1","踪踵鍾鐘佐坐左座挫罪主住侏做姝胄呪周嗾奏宙州廚晝朱柱株注洲湊澍炷珠疇籌紂紬綢舟蛛註誅走躊輳週酎酒鑄駐竹粥俊儁准埈寯峻晙樽浚準濬焌畯竣蠢逡遵雋駿茁中仲衆重卽櫛楫汁葺增憎曾拯烝甑症繒蒸證贈之只"],["f2a1","咫地址志持指摯支旨智枝枳止池沚漬知砥祉祗紙肢脂至芝芷蜘誌識贄趾遲直稙稷織職唇嗔塵振搢晉晋桭榛殄津溱珍瑨璡畛疹盡眞瞋秦縉縝臻蔯袗診賑軫辰進鎭陣陳震侄叱姪嫉帙桎瓆疾秩窒膣蛭質跌迭斟朕什執潗緝輯"],["f3a1","鏶集徵懲澄且侘借叉嗟嵯差次此磋箚茶蹉車遮捉搾着窄錯鑿齪撰澯燦璨瓚竄簒纂粲纘讚贊鑽餐饌刹察擦札紮僭參塹慘慙懺斬站讒讖倉倡創唱娼廠彰愴敞昌昶暢槍滄漲猖瘡窓脹艙菖蒼債埰寀寨彩採砦綵菜蔡采釵冊柵策"],["f4a1","責凄妻悽處倜刺剔尺慽戚拓擲斥滌瘠脊蹠陟隻仟千喘天川擅泉淺玔穿舛薦賤踐遷釧闡阡韆凸哲喆徹撤澈綴輟轍鐵僉尖沾添甛瞻簽籤詹諂堞妾帖捷牒疊睫諜貼輒廳晴淸聽菁請靑鯖切剃替涕滯締諦逮遞體初剿哨憔抄招梢"],["f5a1","椒楚樵炒焦硝礁礎秒稍肖艸苕草蕉貂超酢醋醮促囑燭矗蜀觸寸忖村邨叢塚寵悤憁摠總聰蔥銃撮催崔最墜抽推椎楸樞湫皺秋芻萩諏趨追鄒酋醜錐錘鎚雛騶鰍丑畜祝竺筑築縮蓄蹙蹴軸逐春椿瑃出朮黜充忠沖蟲衝衷悴膵萃"],["f6a1","贅取吹嘴娶就炊翠聚脆臭趣醉驟鷲側仄厠惻測層侈値嗤峙幟恥梔治淄熾痔痴癡稚穉緇緻置致蚩輜雉馳齒則勅飭親七柒漆侵寢枕沈浸琛砧針鍼蟄秤稱快他咤唾墮妥惰打拖朶楕舵陀馱駝倬卓啄坼度托拓擢晫柝濁濯琢琸託"],["f7a1","鐸呑嘆坦彈憚歎灘炭綻誕奪脫探眈耽貪塔搭榻宕帑湯糖蕩兌台太怠態殆汰泰笞胎苔跆邰颱宅擇澤撑攄兎吐土討慟桶洞痛筒統通堆槌腿褪退頹偸套妬投透鬪慝特闖坡婆巴把播擺杷波派爬琶破罷芭跛頗判坂板版瓣販辦鈑"],["f8a1","阪八叭捌佩唄悖敗沛浿牌狽稗覇貝彭澎烹膨愎便偏扁片篇編翩遍鞭騙貶坪平枰萍評吠嬖幣廢弊斃肺蔽閉陛佈包匍匏咆哺圃布怖抛抱捕暴泡浦疱砲胞脯苞葡蒲袍褒逋鋪飽鮑幅暴曝瀑爆輻俵剽彪慓杓標漂瓢票表豹飇飄驃"],["f9a1","品稟楓諷豊風馮彼披疲皮被避陂匹弼必泌珌畢疋筆苾馝乏逼下何厦夏廈昰河瑕荷蝦賀遐霞鰕壑學虐謔鶴寒恨悍旱汗漢澣瀚罕翰閑閒限韓割轄函含咸啣喊檻涵緘艦銜陷鹹合哈盒蛤閤闔陜亢伉姮嫦巷恒抗杭桁沆港缸肛航"],["faa1","行降項亥偕咳垓奚孩害懈楷海瀣蟹解該諧邂駭骸劾核倖幸杏荇行享向嚮珦鄕響餉饗香噓墟虛許憲櫶獻軒歇險驗奕爀赫革俔峴弦懸晛泫炫玄玹現眩睍絃絢縣舷衒見賢鉉顯孑穴血頁嫌俠協夾峽挾浹狹脅脇莢鋏頰亨兄刑型"],["fba1","形泂滎瀅灐炯熒珩瑩荊螢衡逈邢鎣馨兮彗惠慧暳蕙蹊醯鞋乎互呼壕壺好岵弧戶扈昊晧毫浩淏湖滸澔濠濩灝狐琥瑚瓠皓祜糊縞胡芦葫蒿虎號蝴護豪鎬頀顥惑或酷婚昏混渾琿魂忽惚笏哄弘汞泓洪烘紅虹訌鴻化和嬅樺火畵"],["fca1","禍禾花華話譁貨靴廓擴攫確碻穫丸喚奐宦幻患換歡晥桓渙煥環紈還驩鰥活滑猾豁闊凰幌徨恍惶愰慌晃晄榥況湟滉潢煌璜皇篁簧荒蝗遑隍黃匯回廻徊恢悔懷晦會檜淮澮灰獪繪膾茴蛔誨賄劃獲宖橫鐄哮嚆孝效斅曉梟涍淆"],["fda1","爻肴酵驍侯候厚后吼喉嗅帿後朽煦珝逅勛勳塤壎焄熏燻薰訓暈薨喧暄煊萱卉喙毁彙徽揮暉煇諱輝麾休携烋畦虧恤譎鷸兇凶匈洶胸黑昕欣炘痕吃屹紇訖欠欽歆吸恰洽翕興僖凞喜噫囍姬嬉希憙憘戱晞曦熙熹熺犧禧稀羲詰"]]
+
+/***/ }),
+/* 719 */
+/***/ (function(module, exports) {
+
+module.exports = [["0","\u0000",127],["8ea1","｡",62],["a1a1","　、。，．・：；？！゛゜´｀¨＾￣＿ヽヾゝゞ〃仝々〆〇ー―‐／＼～∥｜…‥‘’“”（）〔〕［］｛｝〈",9,"＋－±×÷＝≠＜＞≦≧∞∴♂♀°′″℃￥＄￠￡％＃＆＊＠§☆★○●◎◇"],["a2a1","◆□■△▲▽▼※〒→←↑↓〓"],["a2ba","∈∋⊆⊇⊂⊃∪∩"],["a2ca","∧∨￢⇒⇔∀∃"],["a2dc","∠⊥⌒∂∇≡≒≪≫√∽∝∵∫∬"],["a2f2","ʼn♯♭♪†‡¶"],["a2fe","◯"],["a3b0","０",9],["a3c1","Ａ",25],["a3e1","ａ",25],["a4a1","ぁ",82],["a5a1","ァ",85],["a6a1","Α",16,"Σ",6],["a6c1","α",16,"σ",6],["a7a1","А",5,"ЁЖ",25],["a7d1","а",5,"ёж",25],["a8a1","─│┌┐┘└├┬┤┴┼━┃┏┓┛┗┣┳┫┻╋┠┯┨┷┿┝┰┥┸╂"],["ada1","①",19,"Ⅰ",9],["adc0","㍉㌔㌢㍍㌘㌧㌃㌶㍑㍗㌍㌦㌣㌫㍊㌻㎜㎝㎞㎎㎏㏄㎡"],["addf","㍻〝〟№㏍℡㊤",4,"㈱㈲㈹㍾㍽㍼≒≡∫∮∑√⊥∠∟⊿∵∩∪"],["b0a1","亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵梓圧斡扱宛姐虻飴絢綾鮎或粟袷安庵按暗案闇鞍杏以伊位依偉囲夷委威尉惟意慰易椅為畏異移維緯胃萎衣謂違遺医井亥域育郁磯一壱溢逸稲茨芋鰯允印咽員因姻引飲淫胤蔭"],["b1a1","院陰隠韻吋右宇烏羽迂雨卯鵜窺丑碓臼渦嘘唄欝蔚鰻姥厩浦瓜閏噂云運雲荏餌叡営嬰影映曳栄永泳洩瑛盈穎頴英衛詠鋭液疫益駅悦謁越閲榎厭円園堰奄宴延怨掩援沿演炎焔煙燕猿縁艶苑薗遠鉛鴛塩於汚甥凹央奥往応"],["b2a1","押旺横欧殴王翁襖鴬鴎黄岡沖荻億屋憶臆桶牡乙俺卸恩温穏音下化仮何伽価佳加可嘉夏嫁家寡科暇果架歌河火珂禍禾稼箇花苛茄荷華菓蝦課嘩貨迦過霞蚊俄峨我牙画臥芽蛾賀雅餓駕介会解回塊壊廻快怪悔恢懐戒拐改"],["b3a1","魁晦械海灰界皆絵芥蟹開階貝凱劾外咳害崖慨概涯碍蓋街該鎧骸浬馨蛙垣柿蛎鈎劃嚇各廓拡撹格核殻獲確穫覚角赫較郭閣隔革学岳楽額顎掛笠樫橿梶鰍潟割喝恰括活渇滑葛褐轄且鰹叶椛樺鞄株兜竃蒲釜鎌噛鴨栢茅萱"],["b4a1","粥刈苅瓦乾侃冠寒刊勘勧巻喚堪姦完官寛干幹患感慣憾換敢柑桓棺款歓汗漢澗潅環甘監看竿管簡緩缶翰肝艦莞観諌貫還鑑間閑関陥韓館舘丸含岸巌玩癌眼岩翫贋雁頑顔願企伎危喜器基奇嬉寄岐希幾忌揮机旗既期棋棄"],["b5a1","機帰毅気汽畿祈季稀紀徽規記貴起軌輝飢騎鬼亀偽儀妓宜戯技擬欺犠疑祇義蟻誼議掬菊鞠吉吃喫桔橘詰砧杵黍却客脚虐逆丘久仇休及吸宮弓急救朽求汲泣灸球究窮笈級糾給旧牛去居巨拒拠挙渠虚許距鋸漁禦魚亨享京"],["b6a1","供侠僑兇競共凶協匡卿叫喬境峡強彊怯恐恭挟教橋況狂狭矯胸脅興蕎郷鏡響饗驚仰凝尭暁業局曲極玉桐粁僅勤均巾錦斤欣欽琴禁禽筋緊芹菌衿襟謹近金吟銀九倶句区狗玖矩苦躯駆駈駒具愚虞喰空偶寓遇隅串櫛釧屑屈"],["b7a1","掘窟沓靴轡窪熊隈粂栗繰桑鍬勲君薫訓群軍郡卦袈祁係傾刑兄啓圭珪型契形径恵慶慧憩掲携敬景桂渓畦稽系経継繋罫茎荊蛍計詣警軽頚鶏芸迎鯨劇戟撃激隙桁傑欠決潔穴結血訣月件倹倦健兼券剣喧圏堅嫌建憲懸拳捲"],["b8a1","検権牽犬献研硯絹県肩見謙賢軒遣鍵険顕験鹸元原厳幻弦減源玄現絃舷言諺限乎個古呼固姑孤己庫弧戸故枯湖狐糊袴股胡菰虎誇跨鈷雇顧鼓五互伍午呉吾娯後御悟梧檎瑚碁語誤護醐乞鯉交佼侯候倖光公功効勾厚口向"],["b9a1","后喉坑垢好孔孝宏工巧巷幸広庚康弘恒慌抗拘控攻昂晃更杭校梗構江洪浩港溝甲皇硬稿糠紅紘絞綱耕考肯肱腔膏航荒行衡講貢購郊酵鉱砿鋼閤降項香高鴻剛劫号合壕拷濠豪轟麹克刻告国穀酷鵠黒獄漉腰甑忽惚骨狛込"],["baa1","此頃今困坤墾婚恨懇昏昆根梱混痕紺艮魂些佐叉唆嵯左差査沙瑳砂詐鎖裟坐座挫債催再最哉塞妻宰彩才採栽歳済災采犀砕砦祭斎細菜裁載際剤在材罪財冴坂阪堺榊肴咲崎埼碕鷺作削咋搾昨朔柵窄策索錯桜鮭笹匙冊刷"],["bba1","察拶撮擦札殺薩雑皐鯖捌錆鮫皿晒三傘参山惨撒散桟燦珊産算纂蚕讃賛酸餐斬暫残仕仔伺使刺司史嗣四士始姉姿子屍市師志思指支孜斯施旨枝止死氏獅祉私糸紙紫肢脂至視詞詩試誌諮資賜雌飼歯事似侍児字寺慈持時"],["bca1","次滋治爾璽痔磁示而耳自蒔辞汐鹿式識鴫竺軸宍雫七叱執失嫉室悉湿漆疾質実蔀篠偲柴芝屡蕊縞舎写射捨赦斜煮社紗者謝車遮蛇邪借勺尺杓灼爵酌釈錫若寂弱惹主取守手朱殊狩珠種腫趣酒首儒受呪寿授樹綬需囚収周"],["bda1","宗就州修愁拾洲秀秋終繍習臭舟蒐衆襲讐蹴輯週酋酬集醜什住充十従戎柔汁渋獣縦重銃叔夙宿淑祝縮粛塾熟出術述俊峻春瞬竣舜駿准循旬楯殉淳準潤盾純巡遵醇順処初所暑曙渚庶緒署書薯藷諸助叙女序徐恕鋤除傷償"],["bea1","勝匠升召哨商唱嘗奨妾娼宵将小少尚庄床廠彰承抄招掌捷昇昌昭晶松梢樟樵沼消渉湘焼焦照症省硝礁祥称章笑粧紹肖菖蒋蕉衝裳訟証詔詳象賞醤鉦鍾鐘障鞘上丈丞乗冗剰城場壌嬢常情擾条杖浄状畳穣蒸譲醸錠嘱埴飾"],["bfa1","拭植殖燭織職色触食蝕辱尻伸信侵唇娠寝審心慎振新晋森榛浸深申疹真神秦紳臣芯薪親診身辛進針震人仁刃塵壬尋甚尽腎訊迅陣靭笥諏須酢図厨逗吹垂帥推水炊睡粋翠衰遂酔錐錘随瑞髄崇嵩数枢趨雛据杉椙菅頗雀裾"],["c0a1","澄摺寸世瀬畝是凄制勢姓征性成政整星晴棲栖正清牲生盛精聖声製西誠誓請逝醒青静斉税脆隻席惜戚斥昔析石積籍績脊責赤跡蹟碩切拙接摂折設窃節説雪絶舌蝉仙先千占宣専尖川戦扇撰栓栴泉浅洗染潜煎煽旋穿箭線"],["c1a1","繊羨腺舛船薦詮賎践選遷銭銑閃鮮前善漸然全禅繕膳糎噌塑岨措曾曽楚狙疏疎礎祖租粗素組蘇訴阻遡鼠僧創双叢倉喪壮奏爽宋層匝惣想捜掃挿掻操早曹巣槍槽漕燥争痩相窓糟総綜聡草荘葬蒼藻装走送遭鎗霜騒像増憎"],["c2a1","臓蔵贈造促側則即息捉束測足速俗属賊族続卒袖其揃存孫尊損村遜他多太汰詑唾堕妥惰打柁舵楕陀駄騨体堆対耐岱帯待怠態戴替泰滞胎腿苔袋貸退逮隊黛鯛代台大第醍題鷹滝瀧卓啄宅托択拓沢濯琢託鐸濁諾茸凧蛸只"],["c3a1","叩但達辰奪脱巽竪辿棚谷狸鱈樽誰丹単嘆坦担探旦歎淡湛炭短端箪綻耽胆蛋誕鍛団壇弾断暖檀段男談値知地弛恥智池痴稚置致蜘遅馳築畜竹筑蓄逐秩窒茶嫡着中仲宙忠抽昼柱注虫衷註酎鋳駐樗瀦猪苧著貯丁兆凋喋寵"],["c4a1","帖帳庁弔張彫徴懲挑暢朝潮牒町眺聴脹腸蝶調諜超跳銚長頂鳥勅捗直朕沈珍賃鎮陳津墜椎槌追鎚痛通塚栂掴槻佃漬柘辻蔦綴鍔椿潰坪壷嬬紬爪吊釣鶴亭低停偵剃貞呈堤定帝底庭廷弟悌抵挺提梯汀碇禎程締艇訂諦蹄逓"],["c5a1","邸鄭釘鼎泥摘擢敵滴的笛適鏑溺哲徹撤轍迭鉄典填天展店添纏甜貼転顛点伝殿澱田電兎吐堵塗妬屠徒斗杜渡登菟賭途都鍍砥砺努度土奴怒倒党冬凍刀唐塔塘套宕島嶋悼投搭東桃梼棟盗淘湯涛灯燈当痘祷等答筒糖統到"],["c6a1","董蕩藤討謄豆踏逃透鐙陶頭騰闘働動同堂導憧撞洞瞳童胴萄道銅峠鴇匿得徳涜特督禿篤毒独読栃橡凸突椴届鳶苫寅酉瀞噸屯惇敦沌豚遁頓呑曇鈍奈那内乍凪薙謎灘捺鍋楢馴縄畷南楠軟難汝二尼弐迩匂賑肉虹廿日乳入"],["c7a1","如尿韮任妊忍認濡禰祢寧葱猫熱年念捻撚燃粘乃廼之埜嚢悩濃納能脳膿農覗蚤巴把播覇杷波派琶破婆罵芭馬俳廃拝排敗杯盃牌背肺輩配倍培媒梅楳煤狽買売賠陪這蝿秤矧萩伯剥博拍柏泊白箔粕舶薄迫曝漠爆縛莫駁麦"],["c8a1","函箱硲箸肇筈櫨幡肌畑畠八鉢溌発醗髪伐罰抜筏閥鳩噺塙蛤隼伴判半反叛帆搬斑板氾汎版犯班畔繁般藩販範釆煩頒飯挽晩番盤磐蕃蛮匪卑否妃庇彼悲扉批披斐比泌疲皮碑秘緋罷肥被誹費避非飛樋簸備尾微枇毘琵眉美"],["c9a1","鼻柊稗匹疋髭彦膝菱肘弼必畢筆逼桧姫媛紐百謬俵彪標氷漂瓢票表評豹廟描病秒苗錨鋲蒜蛭鰭品彬斌浜瀕貧賓頻敏瓶不付埠夫婦富冨布府怖扶敷斧普浮父符腐膚芙譜負賦赴阜附侮撫武舞葡蕪部封楓風葺蕗伏副復幅服"],["caa1","福腹複覆淵弗払沸仏物鮒分吻噴墳憤扮焚奮粉糞紛雰文聞丙併兵塀幣平弊柄並蔽閉陛米頁僻壁癖碧別瞥蔑箆偏変片篇編辺返遍便勉娩弁鞭保舗鋪圃捕歩甫補輔穂募墓慕戊暮母簿菩倣俸包呆報奉宝峰峯崩庖抱捧放方朋"],["cba1","法泡烹砲縫胞芳萌蓬蜂褒訪豊邦鋒飽鳳鵬乏亡傍剖坊妨帽忘忙房暴望某棒冒紡肪膨謀貌貿鉾防吠頬北僕卜墨撲朴牧睦穆釦勃没殆堀幌奔本翻凡盆摩磨魔麻埋妹昧枚毎哩槙幕膜枕鮪柾鱒桝亦俣又抹末沫迄侭繭麿万慢満"],["cca1","漫蔓味未魅巳箕岬密蜜湊蓑稔脈妙粍民眠務夢無牟矛霧鵡椋婿娘冥名命明盟迷銘鳴姪牝滅免棉綿緬面麺摸模茂妄孟毛猛盲網耗蒙儲木黙目杢勿餅尤戻籾貰問悶紋門匁也冶夜爺耶野弥矢厄役約薬訳躍靖柳薮鑓愉愈油癒"],["cda1","諭輸唯佑優勇友宥幽悠憂揖有柚湧涌猶猷由祐裕誘遊邑郵雄融夕予余与誉輿預傭幼妖容庸揚揺擁曜楊様洋溶熔用窯羊耀葉蓉要謡踊遥陽養慾抑欲沃浴翌翼淀羅螺裸来莱頼雷洛絡落酪乱卵嵐欄濫藍蘭覧利吏履李梨理璃"],["cea1","痢裏裡里離陸律率立葎掠略劉流溜琉留硫粒隆竜龍侶慮旅虜了亮僚両凌寮料梁涼猟療瞭稜糧良諒遼量陵領力緑倫厘林淋燐琳臨輪隣鱗麟瑠塁涙累類令伶例冷励嶺怜玲礼苓鈴隷零霊麗齢暦歴列劣烈裂廉恋憐漣煉簾練聯"],["cfa1","蓮連錬呂魯櫓炉賂路露労婁廊弄朗楼榔浪漏牢狼篭老聾蝋郎六麓禄肋録論倭和話歪賄脇惑枠鷲亙亘鰐詫藁蕨椀湾碗腕"],["d0a1","弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞亟亠亢亰亳亶从仍仄仆仂仗仞仭仟价伉佚估佛佝佗佇佶侈侏侘佻佩佰侑佯來侖儘俔俟俎俘俛俑俚俐俤俥倚倨倔倪倥倅伜俶倡倩倬俾俯們倆偃假會偕偐偈做偖偬偸傀傚傅傴傲"],["d1a1","僉僊傳僂僖僞僥僭僣僮價僵儉儁儂儖儕儔儚儡儺儷儼儻儿兀兒兌兔兢竸兩兪兮冀冂囘册冉冏冑冓冕冖冤冦冢冩冪冫决冱冲冰况冽凅凉凛几處凩凭凰凵凾刄刋刔刎刧刪刮刳刹剏剄剋剌剞剔剪剴剩剳剿剽劍劔劒剱劈劑辨"],["d2a1","辧劬劭劼劵勁勍勗勞勣勦飭勠勳勵勸勹匆匈甸匍匐匏匕匚匣匯匱匳匸區卆卅丗卉卍凖卞卩卮夘卻卷厂厖厠厦厥厮厰厶參簒雙叟曼燮叮叨叭叺吁吽呀听吭吼吮吶吩吝呎咏呵咎呟呱呷呰咒呻咀呶咄咐咆哇咢咸咥咬哄哈咨"],["d3a1","咫哂咤咾咼哘哥哦唏唔哽哮哭哺哢唹啀啣啌售啜啅啖啗唸唳啝喙喀咯喊喟啻啾喘喞單啼喃喩喇喨嗚嗅嗟嗄嗜嗤嗔嘔嗷嘖嗾嗽嘛嗹噎噐營嘴嘶嘲嘸噫噤嘯噬噪嚆嚀嚊嚠嚔嚏嚥嚮嚶嚴囂嚼囁囃囀囈囎囑囓囗囮囹圀囿圄圉"],["d4a1","圈國圍圓團圖嗇圜圦圷圸坎圻址坏坩埀垈坡坿垉垓垠垳垤垪垰埃埆埔埒埓堊埖埣堋堙堝塲堡塢塋塰毀塒堽塹墅墹墟墫墺壞墻墸墮壅壓壑壗壙壘壥壜壤壟壯壺壹壻壼壽夂夊夐夛梦夥夬夭夲夸夾竒奕奐奎奚奘奢奠奧奬奩"],["d5a1","奸妁妝佞侫妣妲姆姨姜妍姙姚娥娟娑娜娉娚婀婬婉娵娶婢婪媚媼媾嫋嫂媽嫣嫗嫦嫩嫖嫺嫻嬌嬋嬖嬲嫐嬪嬶嬾孃孅孀孑孕孚孛孥孩孰孳孵學斈孺宀它宦宸寃寇寉寔寐寤實寢寞寥寫寰寶寳尅將專對尓尠尢尨尸尹屁屆屎屓"],["d6a1","屐屏孱屬屮乢屶屹岌岑岔妛岫岻岶岼岷峅岾峇峙峩峽峺峭嶌峪崋崕崗嵜崟崛崑崔崢崚崙崘嵌嵒嵎嵋嵬嵳嵶嶇嶄嶂嶢嶝嶬嶮嶽嶐嶷嶼巉巍巓巒巖巛巫已巵帋帚帙帑帛帶帷幄幃幀幎幗幔幟幢幤幇幵并幺麼广庠廁廂廈廐廏"],["d7a1","廖廣廝廚廛廢廡廨廩廬廱廳廰廴廸廾弃弉彝彜弋弑弖弩弭弸彁彈彌彎弯彑彖彗彙彡彭彳彷徃徂彿徊很徑徇從徙徘徠徨徭徼忖忻忤忸忱忝悳忿怡恠怙怐怩怎怱怛怕怫怦怏怺恚恁恪恷恟恊恆恍恣恃恤恂恬恫恙悁悍惧悃悚"],["d8a1","悄悛悖悗悒悧悋惡悸惠惓悴忰悽惆悵惘慍愕愆惶惷愀惴惺愃愡惻惱愍愎慇愾愨愧慊愿愼愬愴愽慂慄慳慷慘慙慚慫慴慯慥慱慟慝慓慵憙憖憇憬憔憚憊憑憫憮懌懊應懷懈懃懆憺懋罹懍懦懣懶懺懴懿懽懼懾戀戈戉戍戌戔戛"],["d9a1","戞戡截戮戰戲戳扁扎扞扣扛扠扨扼抂抉找抒抓抖拔抃抔拗拑抻拏拿拆擔拈拜拌拊拂拇抛拉挌拮拱挧挂挈拯拵捐挾捍搜捏掖掎掀掫捶掣掏掉掟掵捫捩掾揩揀揆揣揉插揶揄搖搴搆搓搦搶攝搗搨搏摧摯摶摎攪撕撓撥撩撈撼"],["daa1","據擒擅擇撻擘擂擱擧舉擠擡抬擣擯攬擶擴擲擺攀擽攘攜攅攤攣攫攴攵攷收攸畋效敖敕敍敘敞敝敲數斂斃變斛斟斫斷旃旆旁旄旌旒旛旙无旡旱杲昊昃旻杳昵昶昴昜晏晄晉晁晞晝晤晧晨晟晢晰暃暈暎暉暄暘暝曁暹曉暾暼"],["dba1","曄暸曖曚曠昿曦曩曰曵曷朏朖朞朦朧霸朮朿朶杁朸朷杆杞杠杙杣杤枉杰枩杼杪枌枋枦枡枅枷柯枴柬枳柩枸柤柞柝柢柮枹柎柆柧檜栞框栩桀桍栲桎梳栫桙档桷桿梟梏梭梔條梛梃檮梹桴梵梠梺椏梍桾椁棊椈棘椢椦棡椌棍"],["dca1","棔棧棕椶椒椄棗棣椥棹棠棯椨椪椚椣椡棆楹楷楜楸楫楔楾楮椹楴椽楙椰楡楞楝榁楪榲榮槐榿槁槓榾槎寨槊槝榻槃榧樮榑榠榜榕榴槞槨樂樛槿權槹槲槧樅榱樞槭樔槫樊樒櫁樣樓橄樌橲樶橸橇橢橙橦橈樸樢檐檍檠檄檢檣"],["dda1","檗蘗檻櫃櫂檸檳檬櫞櫑櫟檪櫚櫪櫻欅蘖櫺欒欖鬱欟欸欷盜欹飮歇歃歉歐歙歔歛歟歡歸歹歿殀殄殃殍殘殕殞殤殪殫殯殲殱殳殷殼毆毋毓毟毬毫毳毯麾氈氓气氛氤氣汞汕汢汪沂沍沚沁沛汾汨汳沒沐泄泱泓沽泗泅泝沮沱沾"],["dea1","沺泛泯泙泪洟衍洶洫洽洸洙洵洳洒洌浣涓浤浚浹浙涎涕濤涅淹渕渊涵淇淦涸淆淬淞淌淨淒淅淺淙淤淕淪淮渭湮渮渙湲湟渾渣湫渫湶湍渟湃渺湎渤滿渝游溂溪溘滉溷滓溽溯滄溲滔滕溏溥滂溟潁漑灌滬滸滾漿滲漱滯漲滌"],["dfa1","漾漓滷澆潺潸澁澀潯潛濳潭澂潼潘澎澑濂潦澳澣澡澤澹濆澪濟濕濬濔濘濱濮濛瀉瀋濺瀑瀁瀏濾瀛瀚潴瀝瀘瀟瀰瀾瀲灑灣炙炒炯烱炬炸炳炮烟烋烝烙焉烽焜焙煥煕熈煦煢煌煖煬熏燻熄熕熨熬燗熹熾燒燉燔燎燠燬燧燵燼"],["e0a1","燹燿爍爐爛爨爭爬爰爲爻爼爿牀牆牋牘牴牾犂犁犇犒犖犢犧犹犲狃狆狄狎狒狢狠狡狹狷倏猗猊猜猖猝猴猯猩猥猾獎獏默獗獪獨獰獸獵獻獺珈玳珎玻珀珥珮珞璢琅瑯琥珸琲琺瑕琿瑟瑙瑁瑜瑩瑰瑣瑪瑶瑾璋璞璧瓊瓏瓔珱"],["e1a1","瓠瓣瓧瓩瓮瓲瓰瓱瓸瓷甄甃甅甌甎甍甕甓甞甦甬甼畄畍畊畉畛畆畚畩畤畧畫畭畸當疆疇畴疊疉疂疔疚疝疥疣痂疳痃疵疽疸疼疱痍痊痒痙痣痞痾痿痼瘁痰痺痲痳瘋瘍瘉瘟瘧瘠瘡瘢瘤瘴瘰瘻癇癈癆癜癘癡癢癨癩癪癧癬癰"],["e2a1","癲癶癸發皀皃皈皋皎皖皓皙皚皰皴皸皹皺盂盍盖盒盞盡盥盧盪蘯盻眈眇眄眩眤眞眥眦眛眷眸睇睚睨睫睛睥睿睾睹瞎瞋瞑瞠瞞瞰瞶瞹瞿瞼瞽瞻矇矍矗矚矜矣矮矼砌砒礦砠礪硅碎硴碆硼碚碌碣碵碪碯磑磆磋磔碾碼磅磊磬"],["e3a1","磧磚磽磴礇礒礑礙礬礫祀祠祗祟祚祕祓祺祿禊禝禧齋禪禮禳禹禺秉秕秧秬秡秣稈稍稘稙稠稟禀稱稻稾稷穃穗穉穡穢穩龝穰穹穽窈窗窕窘窖窩竈窰窶竅竄窿邃竇竊竍竏竕竓站竚竝竡竢竦竭竰笂笏笊笆笳笘笙笞笵笨笶筐"],["e4a1","筺笄筍笋筌筅筵筥筴筧筰筱筬筮箝箘箟箍箜箚箋箒箏筝箙篋篁篌篏箴篆篝篩簑簔篦篥籠簀簇簓篳篷簗簍篶簣簧簪簟簷簫簽籌籃籔籏籀籐籘籟籤籖籥籬籵粃粐粤粭粢粫粡粨粳粲粱粮粹粽糀糅糂糘糒糜糢鬻糯糲糴糶糺紆"],["e5a1","紂紜紕紊絅絋紮紲紿紵絆絳絖絎絲絨絮絏絣經綉絛綏絽綛綺綮綣綵緇綽綫總綢綯緜綸綟綰緘緝緤緞緻緲緡縅縊縣縡縒縱縟縉縋縢繆繦縻縵縹繃縷縲縺繧繝繖繞繙繚繹繪繩繼繻纃緕繽辮繿纈纉續纒纐纓纔纖纎纛纜缸缺"],["e6a1","罅罌罍罎罐网罕罔罘罟罠罨罩罧罸羂羆羃羈羇羌羔羞羝羚羣羯羲羹羮羶羸譱翅翆翊翕翔翡翦翩翳翹飜耆耄耋耒耘耙耜耡耨耿耻聊聆聒聘聚聟聢聨聳聲聰聶聹聽聿肄肆肅肛肓肚肭冐肬胛胥胙胝胄胚胖脉胯胱脛脩脣脯腋"],["e7a1","隋腆脾腓腑胼腱腮腥腦腴膃膈膊膀膂膠膕膤膣腟膓膩膰膵膾膸膽臀臂膺臉臍臑臙臘臈臚臟臠臧臺臻臾舁舂舅與舊舍舐舖舩舫舸舳艀艙艘艝艚艟艤艢艨艪艫舮艱艷艸艾芍芒芫芟芻芬苡苣苟苒苴苳苺莓范苻苹苞茆苜茉苙"],["e8a1","茵茴茖茲茱荀茹荐荅茯茫茗茘莅莚莪莟莢莖茣莎莇莊荼莵荳荵莠莉莨菴萓菫菎菽萃菘萋菁菷萇菠菲萍萢萠莽萸蔆菻葭萪萼蕚蒄葷葫蒭葮蒂葩葆萬葯葹萵蓊葢蒹蒿蒟蓙蓍蒻蓚蓐蓁蓆蓖蒡蔡蓿蓴蔗蔘蔬蔟蔕蔔蓼蕀蕣蕘蕈"],["e9a1","蕁蘂蕋蕕薀薤薈薑薊薨蕭薔薛藪薇薜蕷蕾薐藉薺藏薹藐藕藝藥藜藹蘊蘓蘋藾藺蘆蘢蘚蘰蘿虍乕虔號虧虱蚓蚣蚩蚪蚋蚌蚶蚯蛄蛆蚰蛉蠣蚫蛔蛞蛩蛬蛟蛛蛯蜒蜆蜈蜀蜃蛻蜑蜉蜍蛹蜊蜴蜿蜷蜻蜥蜩蜚蝠蝟蝸蝌蝎蝴蝗蝨蝮蝙"],["eaa1","蝓蝣蝪蠅螢螟螂螯蟋螽蟀蟐雖螫蟄螳蟇蟆螻蟯蟲蟠蠏蠍蟾蟶蟷蠎蟒蠑蠖蠕蠢蠡蠱蠶蠹蠧蠻衄衂衒衙衞衢衫袁衾袞衵衽袵衲袂袗袒袮袙袢袍袤袰袿袱裃裄裔裘裙裝裹褂裼裴裨裲褄褌褊褓襃褞褥褪褫襁襄褻褶褸襌褝襠襞"],["eba1","襦襤襭襪襯襴襷襾覃覈覊覓覘覡覩覦覬覯覲覺覽覿觀觚觜觝觧觴觸訃訖訐訌訛訝訥訶詁詛詒詆詈詼詭詬詢誅誂誄誨誡誑誥誦誚誣諄諍諂諚諫諳諧諤諱謔諠諢諷諞諛謌謇謚諡謖謐謗謠謳鞫謦謫謾謨譁譌譏譎證譖譛譚譫"],["eca1","譟譬譯譴譽讀讌讎讒讓讖讙讚谺豁谿豈豌豎豐豕豢豬豸豺貂貉貅貊貍貎貔豼貘戝貭貪貽貲貳貮貶賈賁賤賣賚賽賺賻贄贅贊贇贏贍贐齎贓賍贔贖赧赭赱赳趁趙跂趾趺跏跚跖跌跛跋跪跫跟跣跼踈踉跿踝踞踐踟蹂踵踰踴蹊"],["eda1","蹇蹉蹌蹐蹈蹙蹤蹠踪蹣蹕蹶蹲蹼躁躇躅躄躋躊躓躑躔躙躪躡躬躰軆躱躾軅軈軋軛軣軼軻軫軾輊輅輕輒輙輓輜輟輛輌輦輳輻輹轅轂輾轌轉轆轎轗轜轢轣轤辜辟辣辭辯辷迚迥迢迪迯邇迴逅迹迺逑逕逡逍逞逖逋逧逶逵逹迸"],["eea1","遏遐遑遒逎遉逾遖遘遞遨遯遶隨遲邂遽邁邀邊邉邏邨邯邱邵郢郤扈郛鄂鄒鄙鄲鄰酊酖酘酣酥酩酳酲醋醉醂醢醫醯醪醵醴醺釀釁釉釋釐釖釟釡釛釼釵釶鈞釿鈔鈬鈕鈑鉞鉗鉅鉉鉤鉈銕鈿鉋鉐銜銖銓銛鉚鋏銹銷鋩錏鋺鍄錮"],["efa1","錙錢錚錣錺錵錻鍜鍠鍼鍮鍖鎰鎬鎭鎔鎹鏖鏗鏨鏥鏘鏃鏝鏐鏈鏤鐚鐔鐓鐃鐇鐐鐶鐫鐵鐡鐺鑁鑒鑄鑛鑠鑢鑞鑪鈩鑰鑵鑷鑽鑚鑼鑾钁鑿閂閇閊閔閖閘閙閠閨閧閭閼閻閹閾闊濶闃闍闌闕闔闖關闡闥闢阡阨阮阯陂陌陏陋陷陜陞"],["f0a1","陝陟陦陲陬隍隘隕隗險隧隱隲隰隴隶隸隹雎雋雉雍襍雜霍雕雹霄霆霈霓霎霑霏霖霙霤霪霰霹霽霾靄靆靈靂靉靜靠靤靦靨勒靫靱靹鞅靼鞁靺鞆鞋鞏鞐鞜鞨鞦鞣鞳鞴韃韆韈韋韜韭齏韲竟韶韵頏頌頸頤頡頷頽顆顏顋顫顯顰"],["f1a1","顱顴顳颪颯颱颶飄飃飆飩飫餃餉餒餔餘餡餝餞餤餠餬餮餽餾饂饉饅饐饋饑饒饌饕馗馘馥馭馮馼駟駛駝駘駑駭駮駱駲駻駸騁騏騅駢騙騫騷驅驂驀驃騾驕驍驛驗驟驢驥驤驩驫驪骭骰骼髀髏髑髓體髞髟髢髣髦髯髫髮髴髱髷"],["f2a1","髻鬆鬘鬚鬟鬢鬣鬥鬧鬨鬩鬪鬮鬯鬲魄魃魏魍魎魑魘魴鮓鮃鮑鮖鮗鮟鮠鮨鮴鯀鯊鮹鯆鯏鯑鯒鯣鯢鯤鯔鯡鰺鯲鯱鯰鰕鰔鰉鰓鰌鰆鰈鰒鰊鰄鰮鰛鰥鰤鰡鰰鱇鰲鱆鰾鱚鱠鱧鱶鱸鳧鳬鳰鴉鴈鳫鴃鴆鴪鴦鶯鴣鴟鵄鴕鴒鵁鴿鴾鵆鵈"],["f3a1","鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻鶸鶺鷆鷏鷂鷙鷓鷸鷦鷭鷯鷽鸚鸛鸞鹵鹹鹽麁麈麋麌麒麕麑麝麥麩麸麪麭靡黌黎黏黐黔黜點黝黠黥黨黯黴黶黷黹黻黼黽鼇鼈皷鼕鼡鼬鼾齊齒齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠"],["f4a1","堯槇遙瑤凜熙"],["f9a1","纊褜鍈銈蓜俉炻昱棈鋹曻彅丨仡仼伀伃伹佖侒侊侚侔俍偀倢俿倞偆偰偂傔僴僘兊兤冝冾凬刕劜劦勀勛匀匇匤卲厓厲叝﨎咜咊咩哿喆坙坥垬埈埇﨏塚增墲夋奓奛奝奣妤妺孖寀甯寘寬尞岦岺峵崧嵓﨑嵂嵭嶸嶹巐弡弴彧德"],["faa1","忞恝悅悊惞惕愠惲愑愷愰憘戓抦揵摠撝擎敎昀昕昻昉昮昞昤晥晗晙晴晳暙暠暲暿曺朎朗杦枻桒柀栁桄棏﨓楨﨔榘槢樰橫橆橳橾櫢櫤毖氿汜沆汯泚洄涇浯涖涬淏淸淲淼渹湜渧渼溿澈澵濵瀅瀇瀨炅炫焏焄煜煆煇凞燁燾犱"],["fba1","犾猤猪獷玽珉珖珣珒琇珵琦琪琩琮瑢璉璟甁畯皂皜皞皛皦益睆劯砡硎硤硺礰礼神祥禔福禛竑竧靖竫箞精絈絜綷綠緖繒罇羡羽茁荢荿菇菶葈蒴蕓蕙蕫﨟薰蘒﨡蠇裵訒訷詹誧誾諟諸諶譓譿賰賴贒赶﨣軏﨤逸遧郞都鄕鄧釚"],["fca1","釗釞釭釮釤釥鈆鈐鈊鈺鉀鈼鉎鉙鉑鈹鉧銧鉷鉸鋧鋗鋙鋐﨧鋕鋠鋓錥錡鋻﨨錞鋿錝錂鍰鍗鎤鏆鏞鏸鐱鑅鑈閒隆﨩隝隯霳霻靃靍靏靑靕顗顥飯飼餧館馞驎髙髜魵魲鮏鮱鮻鰀鵰鵫鶴鸙黑"],["fcf1","ⅰ",9,"￢￤＇＂"],["8fa2af","˘ˇ¸˙˝¯˛˚～΄΅"],["8fa2c2","¡¦¿"],["8fa2eb","ºª©®™¤№"],["8fa6e1","ΆΈΉΊΪ"],["8fa6e7","Ό"],["8fa6e9","ΎΫ"],["8fa6ec","Ώ"],["8fa6f1","άέήίϊΐόςύϋΰώ"],["8fa7c2","Ђ",10,"ЎЏ"],["8fa7f2","ђ",10,"ўџ"],["8fa9a1","ÆĐ"],["8fa9a4","Ħ"],["8fa9a6","IJ"],["8fa9a8","ŁĿ"],["8fa9ab","ŊØŒ"],["8fa9af","ŦÞ"],["8fa9c1","æđðħıijĸłŀʼnŋøœßŧþ"],["8faaa1","ÁÀÄÂĂǍĀĄÅÃĆĈČÇĊĎÉÈËÊĚĖĒĘ"],["8faaba","ĜĞĢĠĤÍÌÏÎǏİĪĮĨĴĶĹĽĻŃŇŅÑÓÒÖÔǑŐŌÕŔŘŖŚŜŠŞŤŢÚÙÜÛŬǓŰŪŲŮŨǗǛǙǕŴÝŸŶŹŽŻ"],["8faba1","áàäâăǎāąåãćĉčçċďéèëêěėēęǵĝğ"],["8fabbd","ġĥíìïîǐ"],["8fabc5","īįĩĵķĺľļńňņñóòöôǒőōõŕřŗśŝšşťţúùüûŭǔűūųůũǘǜǚǖŵýÿŷźžż"],["8fb0a1","丂丄丅丌丒丟丣两丨丫丮丯丰丵乀乁乄乇乑乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘佟佣佪佬佮佱佷佸佹佺佽佾侁侂侄"],["8fb1a1","侅侉侊侌侎侐侒侓侔侗侙侚侞侟侲侷侹侻侼侽侾俀俁俅俆俈俉俋俌俍俏俒俜俠俢俰俲俼俽俿倀倁倄倇倊倌倎倐倓倗倘倛倜倝倞倢倧倮倰倲倳倵偀偁偂偅偆偊偌偎偑偒偓偗偙偟偠偢偣偦偧偪偭偰偱倻傁傃傄傆傊傎傏傐"],["8fb2a1","傒傓傔傖傛傜傞",4,"傪傯傰傹傺傽僀僃僄僇僌僎僐僓僔僘僜僝僟僢僤僦僨僩僯僱僶僺僾儃儆儇儈儋儌儍儎僲儐儗儙儛儜儝儞儣儧儨儬儭儯儱儳儴儵儸儹兂兊兏兓兕兗兘兟兤兦兾冃冄冋冎冘冝冡冣冭冸冺冼冾冿凂"],["8fb3a1","凈减凑凒凓凕凘凞凢凥凮凲凳凴凷刁刂刅划刓刕刖刘刢刨刱刲刵刼剅剉剕剗剘剚剜剟剠剡剦剮剷剸剹劀劂劅劊劌劓劕劖劗劘劚劜劤劥劦劧劯劰劶劷劸劺劻劽勀勄勆勈勌勏勑勔勖勛勜勡勥勨勩勪勬勰勱勴勶勷匀匃匊匋"],["8fb4a1","匌匑匓匘匛匜匞匟匥匧匨匩匫匬匭匰匲匵匼匽匾卂卌卋卙卛卡卣卥卬卭卲卹卾厃厇厈厎厓厔厙厝厡厤厪厫厯厲厴厵厷厸厺厽叀叅叏叒叓叕叚叝叞叠另叧叵吂吓吚吡吧吨吪启吱吴吵呃呄呇呍呏呞呢呤呦呧呩呫呭呮呴呿"],["8fb5a1","咁咃咅咈咉咍咑咕咖咜咟咡咦咧咩咪咭咮咱咷咹咺咻咿哆哊响哎哠哪哬哯哶哼哾哿唀唁唅唈唉唌唍唎唕唪唫唲唵唶唻唼唽啁啇啉啊啍啐啑啘啚啛啞啠啡啤啦啿喁喂喆喈喎喏喑喒喓喔喗喣喤喭喲喿嗁嗃嗆嗉嗋嗌嗎嗑嗒"],["8fb6a1","嗓嗗嗘嗛嗞嗢嗩嗶嗿嘅嘈嘊嘍",5,"嘙嘬嘰嘳嘵嘷嘹嘻嘼嘽嘿噀噁噃噄噆噉噋噍噏噔噞噠噡噢噣噦噩噭噯噱噲噵嚄嚅嚈嚋嚌嚕嚙嚚嚝嚞嚟嚦嚧嚨嚩嚫嚬嚭嚱嚳嚷嚾囅囉囊囋囏囐囌囍囙囜囝囟囡囤",4,"囱囫园"],["8fb7a1","囶囷圁圂圇圊圌圑圕圚圛圝圠圢圣圤圥圩圪圬圮圯圳圴圽圾圿坅坆坌坍坒坢坥坧坨坫坭",4,"坳坴坵坷坹坺坻坼坾垁垃垌垔垗垙垚垜垝垞垟垡垕垧垨垩垬垸垽埇埈埌埏埕埝埞埤埦埧埩埭埰埵埶埸埽埾埿堃堄堈堉埡"],["8fb8a1","堌堍堛堞堟堠堦堧堭堲堹堿塉塌塍塏塐塕塟塡塤塧塨塸塼塿墀墁墇墈墉墊墌墍墏墐墔墖墝墠墡墢墦墩墱墲壄墼壂壈壍壎壐壒壔壖壚壝壡壢壩壳夅夆夋夌夒夓夔虁夝夡夣夤夨夯夰夳夵夶夿奃奆奒奓奙奛奝奞奟奡奣奫奭"],["8fb9a1","奯奲奵奶她奻奼妋妌妎妒妕妗妟妤妧妭妮妯妰妳妷妺妼姁姃姄姈姊姍姒姝姞姟姣姤姧姮姯姱姲姴姷娀娄娌娍娎娒娓娞娣娤娧娨娪娭娰婄婅婇婈婌婐婕婞婣婥婧婭婷婺婻婾媋媐媓媖媙媜媞媟媠媢媧媬媱媲媳媵媸媺媻媿"],["8fbaa1","嫄嫆嫈嫏嫚嫜嫠嫥嫪嫮嫵嫶嫽嬀嬁嬈嬗嬴嬙嬛嬝嬡嬥嬭嬸孁孋孌孒孖孞孨孮孯孼孽孾孿宁宄宆宊宎宐宑宓宔宖宨宩宬宭宯宱宲宷宺宼寀寁寍寏寖",4,"寠寯寱寴寽尌尗尞尟尣尦尩尫尬尮尰尲尵尶屙屚屜屢屣屧屨屩"],["8fbba1","屭屰屴屵屺屻屼屽岇岈岊岏岒岝岟岠岢岣岦岪岲岴岵岺峉峋峒峝峗峮峱峲峴崁崆崍崒崫崣崤崦崧崱崴崹崽崿嵂嵃嵆嵈嵕嵑嵙嵊嵟嵠嵡嵢嵤嵪嵭嵰嵹嵺嵾嵿嶁嶃嶈嶊嶒嶓嶔嶕嶙嶛嶟嶠嶧嶫嶰嶴嶸嶹巃巇巋巐巎巘巙巠巤"],["8fbca1","巩巸巹帀帇帍帒帔帕帘帟帠帮帨帲帵帾幋幐幉幑幖幘幛幜幞幨幪",4,"幰庀庋庎庢庤庥庨庪庬庱庳庽庾庿廆廌廋廎廑廒廔廕廜廞廥廫异弆弇弈弎弙弜弝弡弢弣弤弨弫弬弮弰弴弶弻弽弿彀彄彅彇彍彐彔彘彛彠彣彤彧"],["8fbda1","彯彲彴彵彸彺彽彾徉徍徏徖徜徝徢徧徫徤徬徯徰徱徸忄忇忈忉忋忐",4,"忞忡忢忨忩忪忬忭忮忯忲忳忶忺忼怇怊怍怓怔怗怘怚怟怤怭怳怵恀恇恈恉恌恑恔恖恗恝恡恧恱恾恿悂悆悈悊悎悑悓悕悘悝悞悢悤悥您悰悱悷"],["8fbea1","悻悾惂惄惈惉惊惋惎惏惔惕惙惛惝惞惢惥惲惵惸惼惽愂愇愊愌愐",4,"愖愗愙愜愞愢愪愫愰愱愵愶愷愹慁慅慆慉慞慠慬慲慸慻慼慿憀憁憃憄憋憍憒憓憗憘憜憝憟憠憥憨憪憭憸憹憼懀懁懂懎懏懕懜懝懞懟懡懢懧懩懥"],["8fbfa1","懬懭懯戁戃戄戇戓戕戜戠戢戣戧戩戫戹戽扂扃扄扆扌扐扑扒扔扖扚扜扤扭扯扳扺扽抍抎抏抐抦抨抳抶抷抺抾抿拄拎拕拖拚拪拲拴拼拽挃挄挊挋挍挐挓挖挘挩挪挭挵挶挹挼捁捂捃捄捆捊捋捎捒捓捔捘捛捥捦捬捭捱捴捵"],["8fc0a1","捸捼捽捿掂掄掇掊掐掔掕掙掚掞掤掦掭掮掯掽揁揅揈揎揑揓揔揕揜揠揥揪揬揲揳揵揸揹搉搊搐搒搔搘搞搠搢搤搥搩搪搯搰搵搽搿摋摏摑摒摓摔摚摛摜摝摟摠摡摣摭摳摴摻摽撅撇撏撐撑撘撙撛撝撟撡撣撦撨撬撳撽撾撿"],["8fc1a1","擄擉擊擋擌擎擐擑擕擗擤擥擩擪擭擰擵擷擻擿攁攄攈攉攊攏攓攔攖攙攛攞攟攢攦攩攮攱攺攼攽敃敇敉敐敒敔敟敠敧敫敺敽斁斅斊斒斕斘斝斠斣斦斮斲斳斴斿旂旈旉旎旐旔旖旘旟旰旲旴旵旹旾旿昀昄昈昉昍昑昒昕昖昝"],["8fc2a1","昞昡昢昣昤昦昩昪昫昬昮昰昱昳昹昷晀晅晆晊晌晑晎晗晘晙晛晜晠晡曻晪晫晬晾晳晵晿晷晸晹晻暀晼暋暌暍暐暒暙暚暛暜暟暠暤暭暱暲暵暻暿曀曂曃曈曌曎曏曔曛曟曨曫曬曮曺朅朇朎朓朙朜朠朢朳朾杅杇杈杌杔杕杝"],["8fc3a1","杦杬杮杴杶杻极构枎枏枑枓枖枘枙枛枰枱枲枵枻枼枽柹柀柂柃柅柈柉柒柗柙柜柡柦柰柲柶柷桒栔栙栝栟栨栧栬栭栯栰栱栳栻栿桄桅桊桌桕桗桘桛桫桮",4,"桵桹桺桻桼梂梄梆梈梖梘梚梜梡梣梥梩梪梮梲梻棅棈棌棏"],["8fc4a1","棐棑棓棖棙棜棝棥棨棪棫棬棭棰棱棵棶棻棼棽椆椉椊椐椑椓椖椗椱椳椵椸椻楂楅楉楎楗楛楣楤楥楦楨楩楬楰楱楲楺楻楿榀榍榒榖榘榡榥榦榨榫榭榯榷榸榺榼槅槈槑槖槗槢槥槮槯槱槳槵槾樀樁樃樏樑樕樚樝樠樤樨樰樲"],["8fc5a1","樴樷樻樾樿橅橆橉橊橎橐橑橒橕橖橛橤橧橪橱橳橾檁檃檆檇檉檋檑檛檝檞檟檥檫檯檰檱檴檽檾檿櫆櫉櫈櫌櫐櫔櫕櫖櫜櫝櫤櫧櫬櫰櫱櫲櫼櫽欂欃欆欇欉欏欐欑欗欛欞欤欨欫欬欯欵欶欻欿歆歊歍歒歖歘歝歠歧歫歮歰歵歽"],["8fc6a1","歾殂殅殗殛殟殠殢殣殨殩殬殭殮殰殸殹殽殾毃毄毉毌毖毚毡毣毦毧毮毱毷毹毿氂氄氅氉氍氎氐氒氙氟氦氧氨氬氮氳氵氶氺氻氿汊汋汍汏汒汔汙汛汜汫汭汯汴汶汸汹汻沅沆沇沉沔沕沗沘沜沟沰沲沴泂泆泍泏泐泑泒泔泖"],["8fc7a1","泚泜泠泧泩泫泬泮泲泴洄洇洊洎洏洑洓洚洦洧洨汧洮洯洱洹洼洿浗浞浟浡浥浧浯浰浼涂涇涑涒涔涖涗涘涪涬涴涷涹涽涿淄淈淊淎淏淖淛淝淟淠淢淥淩淯淰淴淶淼渀渄渞渢渧渲渶渹渻渼湄湅湈湉湋湏湑湒湓湔湗湜湝湞"],["8fc8a1","湢湣湨湳湻湽溍溓溙溠溧溭溮溱溳溻溿滀滁滃滇滈滊滍滎滏滫滭滮滹滻滽漄漈漊漌漍漖漘漚漛漦漩漪漯漰漳漶漻漼漭潏潑潒潓潗潙潚潝潞潡潢潨潬潽潾澃澇澈澋澌澍澐澒澓澔澖澚澟澠澥澦澧澨澮澯澰澵澶澼濅濇濈濊"],["8fc9a1","濚濞濨濩濰濵濹濼濽瀀瀅瀆瀇瀍瀗瀠瀣瀯瀴瀷瀹瀼灃灄灈灉灊灋灔灕灝灞灎灤灥灬灮灵灶灾炁炅炆炔",4,"炛炤炫炰炱炴炷烊烑烓烔烕烖烘烜烤烺焃",4,"焋焌焏焞焠焫焭焯焰焱焸煁煅煆煇煊煋煐煒煗煚煜煞煠"],["8fcaa1","煨煹熀熅熇熌熒熚熛熠熢熯熰熲熳熺熿燀燁燄燋燌燓燖燙燚燜燸燾爀爇爈爉爓爗爚爝爟爤爫爯爴爸爹牁牂牃牅牎牏牐牓牕牖牚牜牞牠牣牨牫牮牯牱牷牸牻牼牿犄犉犍犎犓犛犨犭犮犱犴犾狁狇狉狌狕狖狘狟狥狳狴狺狻"],["8fcba1","狾猂猄猅猇猋猍猒猓猘猙猞猢猤猧猨猬猱猲猵猺猻猽獃獍獐獒獖獘獝獞獟獠獦獧獩獫獬獮獯獱獷獹獼玀玁玃玅玆玎玐玓玕玗玘玜玞玟玠玢玥玦玪玫玭玵玷玹玼玽玿珅珆珉珋珌珏珒珓珖珙珝珡珣珦珧珩珴珵珷珹珺珻珽"],["8fcca1","珿琀琁琄琇琊琑琚琛琤琦琨",9,"琹瑀瑃瑄瑆瑇瑋瑍瑑瑒瑗瑝瑢瑦瑧瑨瑫瑭瑮瑱瑲璀璁璅璆璇璉璏璐璑璒璘璙璚璜璟璠璡璣璦璨璩璪璫璮璯璱璲璵璹璻璿瓈瓉瓌瓐瓓瓘瓚瓛瓞瓟瓤瓨瓪瓫瓯瓴瓺瓻瓼瓿甆"],["8fcda1","甒甖甗甠甡甤甧甩甪甯甶甹甽甾甿畀畃畇畈畎畐畒畗畞畟畡畯畱畹",5,"疁疅疐疒疓疕疙疜疢疤疴疺疿痀痁痄痆痌痎痏痗痜痟痠痡痤痧痬痮痯痱痹瘀瘂瘃瘄瘇瘈瘊瘌瘏瘒瘓瘕瘖瘙瘛瘜瘝瘞瘣瘥瘦瘩瘭瘲瘳瘵瘸瘹"],["8fcea1","瘺瘼癊癀癁癃癄癅癉癋癕癙癟癤癥癭癮癯癱癴皁皅皌皍皕皛皜皝皟皠皢",6,"皪皭皽盁盅盉盋盌盎盔盙盠盦盨盬盰盱盶盹盼眀眆眊眎眒眔眕眗眙眚眜眢眨眭眮眯眴眵眶眹眽眾睂睅睆睊睍睎睏睒睖睗睜睞睟睠睢"],["8fcfa1","睤睧睪睬睰睲睳睴睺睽瞀瞄瞌瞍瞔瞕瞖瞚瞟瞢瞧瞪瞮瞯瞱瞵瞾矃矉矑矒矕矙矞矟矠矤矦矪矬矰矱矴矸矻砅砆砉砍砎砑砝砡砢砣砭砮砰砵砷硃硄硇硈硌硎硒硜硞硠硡硣硤硨硪确硺硾碊碏碔碘碡碝碞碟碤碨碬碭碰碱碲碳"],["8fd0a1","碻碽碿磇磈磉磌磎磒磓磕磖磤磛磟磠磡磦磪磲磳礀磶磷磺磻磿礆礌礐礚礜礞礟礠礥礧礩礭礱礴礵礻礽礿祄祅祆祊祋祏祑祔祘祛祜祧祩祫祲祹祻祼祾禋禌禑禓禔禕禖禘禛禜禡禨禩禫禯禱禴禸离秂秄秇秈秊秏秔秖秚秝秞"],["8fd1a1","秠秢秥秪秫秭秱秸秼稂稃稇稉稊稌稑稕稛稞稡稧稫稭稯稰稴稵稸稹稺穄穅穇穈穌穕穖穙穜穝穟穠穥穧穪穭穵穸穾窀窂窅窆窊窋窐窑窔窞窠窣窬窳窵窹窻窼竆竉竌竎竑竛竨竩竫竬竱竴竻竽竾笇笔笟笣笧笩笪笫笭笮笯笰"],["8fd2a1","笱笴笽笿筀筁筇筎筕筠筤筦筩筪筭筯筲筳筷箄箉箎箐箑箖箛箞箠箥箬箯箰箲箵箶箺箻箼箽篂篅篈篊篔篖篗篙篚篛篨篪篲篴篵篸篹篺篼篾簁簂簃簄簆簉簋簌簎簏簙簛簠簥簦簨簬簱簳簴簶簹簺籆籊籕籑籒籓籙",5],["8fd3a1","籡籣籧籩籭籮籰籲籹籼籽粆粇粏粔粞粠粦粰粶粷粺粻粼粿糄糇糈糉糍糏糓糔糕糗糙糚糝糦糩糫糵紃紇紈紉紏紑紒紓紖紝紞紣紦紪紭紱紼紽紾絀絁絇絈絍絑絓絗絙絚絜絝絥絧絪絰絸絺絻絿綁綂綃綅綆綈綋綌綍綑綖綗綝"],["8fd4a1","綞綦綧綪綳綶綷綹緂",4,"緌緍緎緗緙縀緢緥緦緪緫緭緱緵緶緹緺縈縐縑縕縗縜縝縠縧縨縬縭縯縳縶縿繄繅繇繎繐繒繘繟繡繢繥繫繮繯繳繸繾纁纆纇纊纍纑纕纘纚纝纞缼缻缽缾缿罃罄罇罏罒罓罛罜罝罡罣罤罥罦罭"],["8fd5a1","罱罽罾罿羀羋羍羏羐羑羖羗羜羡羢羦羪羭羴羼羿翀翃翈翎翏翛翟翣翥翨翬翮翯翲翺翽翾翿耇耈耊耍耎耏耑耓耔耖耝耞耟耠耤耦耬耮耰耴耵耷耹耺耼耾聀聄聠聤聦聭聱聵肁肈肎肜肞肦肧肫肸肹胈胍胏胒胔胕胗胘胠胭胮"],["8fd6a1","胰胲胳胶胹胺胾脃脋脖脗脘脜脞脠脤脧脬脰脵脺脼腅腇腊腌腒腗腠腡腧腨腩腭腯腷膁膐膄膅膆膋膎膖膘膛膞膢膮膲膴膻臋臃臅臊臎臏臕臗臛臝臞臡臤臫臬臰臱臲臵臶臸臹臽臿舀舃舏舓舔舙舚舝舡舢舨舲舴舺艃艄艅艆"],["8fd7a1","艋艎艏艑艖艜艠艣艧艭艴艻艽艿芀芁芃芄芇芉芊芎芑芔芖芘芚芛芠芡芣芤芧芨芩芪芮芰芲芴芷芺芼芾芿苆苐苕苚苠苢苤苨苪苭苯苶苷苽苾茀茁茇茈茊茋荔茛茝茞茟茡茢茬茭茮茰茳茷茺茼茽荂荃荄荇荍荎荑荕荖荗荰荸"],["8fd8a1","荽荿莀莂莄莆莍莒莔莕莘莙莛莜莝莦莧莩莬莾莿菀菇菉菏菐菑菔菝荓菨菪菶菸菹菼萁萆萊萏萑萕萙莭萯萹葅葇葈葊葍葏葑葒葖葘葙葚葜葠葤葥葧葪葰葳葴葶葸葼葽蒁蒅蒒蒓蒕蒞蒦蒨蒩蒪蒯蒱蒴蒺蒽蒾蓀蓂蓇蓈蓌蓏蓓"],["8fd9a1","蓜蓧蓪蓯蓰蓱蓲蓷蔲蓺蓻蓽蔂蔃蔇蔌蔎蔐蔜蔞蔢蔣蔤蔥蔧蔪蔫蔯蔳蔴蔶蔿蕆蕏",4,"蕖蕙蕜",6,"蕤蕫蕯蕹蕺蕻蕽蕿薁薅薆薉薋薌薏薓薘薝薟薠薢薥薧薴薶薷薸薼薽薾薿藂藇藊藋藎薭藘藚藟藠藦藨藭藳藶藼"],["8fdaa1","藿蘀蘄蘅蘍蘎蘐蘑蘒蘘蘙蘛蘞蘡蘧蘩蘶蘸蘺蘼蘽虀虂虆虒虓虖虗虘虙虝虠",4,"虩虬虯虵虶虷虺蚍蚑蚖蚘蚚蚜蚡蚦蚧蚨蚭蚱蚳蚴蚵蚷蚸蚹蚿蛀蛁蛃蛅蛑蛒蛕蛗蛚蛜蛠蛣蛥蛧蚈蛺蛼蛽蜄蜅蜇蜋蜎蜏蜐蜓蜔蜙蜞蜟蜡蜣"],["8fdba1","蜨蜮蜯蜱蜲蜹蜺蜼蜽蜾蝀蝃蝅蝍蝘蝝蝡蝤蝥蝯蝱蝲蝻螃",6,"螋螌螐螓螕螗螘螙螞螠螣螧螬螭螮螱螵螾螿蟁蟈蟉蟊蟎蟕蟖蟙蟚蟜蟟蟢蟣蟤蟪蟫蟭蟱蟳蟸蟺蟿蠁蠃蠆蠉蠊蠋蠐蠙蠒蠓蠔蠘蠚蠛蠜蠞蠟蠨蠭蠮蠰蠲蠵"],["8fdca1","蠺蠼衁衃衅衈衉衊衋衎衑衕衖衘衚衜衟衠衤衩衱衹衻袀袘袚袛袜袟袠袨袪袺袽袾裀裊",4,"裑裒裓裛裞裧裯裰裱裵裷褁褆褍褎褏褕褖褘褙褚褜褠褦褧褨褰褱褲褵褹褺褾襀襂襅襆襉襏襒襗襚襛襜襡襢襣襫襮襰襳襵襺"],["8fdda1","襻襼襽覉覍覐覔覕覛覜覟覠覥覰覴覵覶覷覼觔",4,"觥觩觫觭觱觳觶觹觽觿訄訅訇訏訑訒訔訕訞訠訢訤訦訫訬訯訵訷訽訾詀詃詅詇詉詍詎詓詖詗詘詜詝詡詥詧詵詶詷詹詺詻詾詿誀誃誆誋誏誐誒誖誗誙誟誧誩誮誯誳"],["8fdea1","誶誷誻誾諃諆諈諉諊諑諓諔諕諗諝諟諬諰諴諵諶諼諿謅謆謋謑謜謞謟謊謭謰謷謼譂",4,"譈譒譓譔譙譍譞譣譭譶譸譹譼譾讁讄讅讋讍讏讔讕讜讞讟谸谹谽谾豅豇豉豋豏豑豓豔豗豘豛豝豙豣豤豦豨豩豭豳豵豶豻豾貆"],["8fdfa1","貇貋貐貒貓貙貛貜貤貹貺賅賆賉賋賏賖賕賙賝賡賨賬賯賰賲賵賷賸賾賿贁贃贉贒贗贛赥赩赬赮赿趂趄趈趍趐趑趕趞趟趠趦趫趬趯趲趵趷趹趻跀跅跆跇跈跊跎跑跔跕跗跙跤跥跧跬跰趼跱跲跴跽踁踄踅踆踋踑踔踖踠踡踢"],["8fe0a1","踣踦踧踱踳踶踷踸踹踽蹀蹁蹋蹍蹎蹏蹔蹛蹜蹝蹞蹡蹢蹩蹬蹭蹯蹰蹱蹹蹺蹻躂躃躉躐躒躕躚躛躝躞躢躧躩躭躮躳躵躺躻軀軁軃軄軇軏軑軔軜軨軮軰軱軷軹軺軭輀輂輇輈輏輐輖輗輘輞輠輡輣輥輧輨輬輭輮輴輵輶輷輺轀轁"],["8fe1a1","轃轇轏轑",4,"轘轝轞轥辝辠辡辤辥辦辵辶辸达迀迁迆迊迋迍运迒迓迕迠迣迤迨迮迱迵迶迻迾适逄逈逌逘逛逨逩逯逪逬逭逳逴逷逿遃遄遌遛遝遢遦遧遬遰遴遹邅邈邋邌邎邐邕邗邘邙邛邠邡邢邥邰邲邳邴邶邽郌邾郃"],["8fe2a1","郄郅郇郈郕郗郘郙郜郝郟郥郒郶郫郯郰郴郾郿鄀鄄鄅鄆鄈鄍鄐鄔鄖鄗鄘鄚鄜鄞鄠鄥鄢鄣鄧鄩鄮鄯鄱鄴鄶鄷鄹鄺鄼鄽酃酇酈酏酓酗酙酚酛酡酤酧酭酴酹酺酻醁醃醅醆醊醎醑醓醔醕醘醞醡醦醨醬醭醮醰醱醲醳醶醻醼醽醿"],["8fe3a1","釂釃釅釓釔釗釙釚釞釤釥釩釪釬",5,"釷釹釻釽鈀鈁鈄鈅鈆鈇鈉鈊鈌鈐鈒鈓鈖鈘鈜鈝鈣鈤鈥鈦鈨鈮鈯鈰鈳鈵鈶鈸鈹鈺鈼鈾鉀鉂鉃鉆鉇鉊鉍鉎鉏鉑鉘鉙鉜鉝鉠鉡鉥鉧鉨鉩鉮鉯鉰鉵",4,"鉻鉼鉽鉿銈銉銊銍銎銒銗"],["8fe4a1","銙銟銠銤銥銧銨銫銯銲銶銸銺銻銼銽銿",4,"鋅鋆鋇鋈鋋鋌鋍鋎鋐鋓鋕鋗鋘鋙鋜鋝鋟鋠鋡鋣鋥鋧鋨鋬鋮鋰鋹鋻鋿錀錂錈錍錑錔錕錜錝錞錟錡錤錥錧錩錪錳錴錶錷鍇鍈鍉鍐鍑鍒鍕鍗鍘鍚鍞鍤鍥鍧鍩鍪鍭鍯鍰鍱鍳鍴鍶"],["8fe5a1","鍺鍽鍿鎀鎁鎂鎈鎊鎋鎍鎏鎒鎕鎘鎛鎞鎡鎣鎤鎦鎨鎫鎴鎵鎶鎺鎩鏁鏄鏅鏆鏇鏉",4,"鏓鏙鏜鏞鏟鏢鏦鏧鏹鏷鏸鏺鏻鏽鐁鐂鐄鐈鐉鐍鐎鐏鐕鐖鐗鐟鐮鐯鐱鐲鐳鐴鐻鐿鐽鑃鑅鑈鑊鑌鑕鑙鑜鑟鑡鑣鑨鑫鑭鑮鑯鑱鑲钄钃镸镹"],["8fe6a1","镾閄閈閌閍閎閝閞閟閡閦閩閫閬閴閶閺閽閿闆闈闉闋闐闑闒闓闙闚闝闞闟闠闤闦阝阞阢阤阥阦阬阱阳阷阸阹阺阼阽陁陒陔陖陗陘陡陮陴陻陼陾陿隁隂隃隄隉隑隖隚隝隟隤隥隦隩隮隯隳隺雊雒嶲雘雚雝雞雟雩雯雱雺霂"],["8fe7a1","霃霅霉霚霛霝霡霢霣霨霱霳靁靃靊靎靏靕靗靘靚靛靣靧靪靮靳靶靷靸靻靽靿鞀鞉鞕鞖鞗鞙鞚鞞鞟鞢鞬鞮鞱鞲鞵鞶鞸鞹鞺鞼鞾鞿韁韄韅韇韉韊韌韍韎韐韑韔韗韘韙韝韞韠韛韡韤韯韱韴韷韸韺頇頊頙頍頎頔頖頜頞頠頣頦"],["8fe8a1","頫頮頯頰頲頳頵頥頾顄顇顊顑顒顓顖顗顙顚顢顣顥顦顪顬颫颭颮颰颴颷颸颺颻颿飂飅飈飌飡飣飥飦飧飪飳飶餂餇餈餑餕餖餗餚餛餜餟餢餦餧餫餱",4,"餹餺餻餼饀饁饆饇饈饍饎饔饘饙饛饜饞饟饠馛馝馟馦馰馱馲馵"],["8fe9a1","馹馺馽馿駃駉駓駔駙駚駜駞駧駪駫駬駰駴駵駹駽駾騂騃騄騋騌騐騑騖騞騠騢騣騤騧騭騮騳騵騶騸驇驁驄驊驋驌驎驑驔驖驝骪骬骮骯骲骴骵骶骹骻骾骿髁髃髆髈髎髐髒髕髖髗髛髜髠髤髥髧髩髬髲髳髵髹髺髽髿",4],["8feaa1","鬄鬅鬈鬉鬋鬌鬍鬎鬐鬒鬖鬙鬛鬜鬠鬦鬫鬭鬳鬴鬵鬷鬹鬺鬽魈魋魌魕魖魗魛魞魡魣魥魦魨魪",4,"魳魵魷魸魹魿鮀鮄鮅鮆鮇鮉鮊鮋鮍鮏鮐鮔鮚鮝鮞鮦鮧鮩鮬鮰鮱鮲鮷鮸鮻鮼鮾鮿鯁鯇鯈鯎鯐鯗鯘鯝鯟鯥鯧鯪鯫鯯鯳鯷鯸"],["8feba1","鯹鯺鯽鯿鰀鰂鰋鰏鰑鰖鰘鰙鰚鰜鰞鰢鰣鰦",4,"鰱鰵鰶鰷鰽鱁鱃鱄鱅鱉鱊鱎鱏鱐鱓鱔鱖鱘鱛鱝鱞鱟鱣鱩鱪鱜鱫鱨鱮鱰鱲鱵鱷鱻鳦鳲鳷鳹鴋鴂鴑鴗鴘鴜鴝鴞鴯鴰鴲鴳鴴鴺鴼鵅鴽鵂鵃鵇鵊鵓鵔鵟鵣鵢鵥鵩鵪鵫鵰鵶鵷鵻"],["8feca1","鵼鵾鶃鶄鶆鶊鶍鶎鶒鶓鶕鶖鶗鶘鶡鶪鶬鶮鶱鶵鶹鶼鶿鷃鷇鷉鷊鷔鷕鷖鷗鷚鷞鷟鷠鷥鷧鷩鷫鷮鷰鷳鷴鷾鸊鸂鸇鸎鸐鸑鸒鸕鸖鸙鸜鸝鹺鹻鹼麀麂麃麄麅麇麎麏麖麘麛麞麤麨麬麮麯麰麳麴麵黆黈黋黕黟黤黧黬黭黮黰黱黲黵"],["8feda1","黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃",4,"齓齕齖齗齘齚齝齞齨齩齭",4,"齳齵齺齽龏龐龑龒龔龖龗龞龡龢龣龥"]]
+
+/***/ }),
+/* 720 */
+/***/ (function(module, exports) {
+
+module.exports = {"uChars":[128,165,169,178,184,216,226,235,238,244,248,251,253,258,276,284,300,325,329,334,364,463,465,467,469,471,473,475,477,506,594,610,712,716,730,930,938,962,970,1026,1104,1106,8209,8215,8218,8222,8231,8241,8244,8246,8252,8365,8452,8454,8458,8471,8482,8556,8570,8596,8602,8713,8720,8722,8726,8731,8737,8740,8742,8748,8751,8760,8766,8777,8781,8787,8802,8808,8816,8854,8858,8870,8896,8979,9322,9372,9548,9588,9616,9622,9634,9652,9662,9672,9676,9680,9702,9735,9738,9793,9795,11906,11909,11913,11917,11928,11944,11947,11951,11956,11960,11964,11979,12284,12292,12312,12319,12330,12351,12436,12447,12535,12543,12586,12842,12850,12964,13200,13215,13218,13253,13263,13267,13270,13384,13428,13727,13839,13851,14617,14703,14801,14816,14964,15183,15471,15585,16471,16736,17208,17325,17330,17374,17623,17997,18018,18212,18218,18301,18318,18760,18811,18814,18820,18823,18844,18848,18872,19576,19620,19738,19887,40870,59244,59336,59367,59413,59417,59423,59431,59437,59443,59452,59460,59478,59493,63789,63866,63894,63976,63986,64016,64018,64021,64025,64034,64037,64042,65074,65093,65107,65112,65127,65132,65375,65510,65536],"gbChars":[0,36,38,45,50,81,89,95,96,100,103,104,105,109,126,133,148,172,175,179,208,306,307,308,309,310,311,312,313,341,428,443,544,545,558,741,742,749,750,805,819,820,7922,7924,7925,7927,7934,7943,7944,7945,7950,8062,8148,8149,8152,8164,8174,8236,8240,8262,8264,8374,8380,8381,8384,8388,8390,8392,8393,8394,8396,8401,8406,8416,8419,8424,8437,8439,8445,8482,8485,8496,8521,8603,8936,8946,9046,9050,9063,9066,9076,9092,9100,9108,9111,9113,9131,9162,9164,9218,9219,11329,11331,11334,11336,11346,11361,11363,11366,11370,11372,11375,11389,11682,11686,11687,11692,11694,11714,11716,11723,11725,11730,11736,11982,11989,12102,12336,12348,12350,12384,12393,12395,12397,12510,12553,12851,12962,12973,13738,13823,13919,13933,14080,14298,14585,14698,15583,15847,16318,16434,16438,16481,16729,17102,17122,17315,17320,17402,17418,17859,17909,17911,17915,17916,17936,17939,17961,18664,18703,18814,18962,19043,33469,33470,33471,33484,33485,33490,33497,33501,33505,33513,33520,33536,33550,37845,37921,37948,38029,38038,38064,38065,38066,38069,38075,38076,38078,39108,39109,39113,39114,39115,39116,39265,39394,189000]}
+
+/***/ }),
+/* 721 */
+/***/ (function(module, exports) {
+
+module.exports = [["0","\u0000",128],["a1","｡",62],["8140","　、。，．・：；？！゛゜´｀¨＾￣＿ヽヾゝゞ〃仝々〆〇ー―‐／＼～∥｜…‥‘’“”（）〔〕［］｛｝〈",9,"＋－±×"],["8180","÷＝≠＜＞≦≧∞∴♂♀°′″℃￥＄￠￡％＃＆＊＠§☆★○●◎◇◆□■△▲▽▼※〒→←↑↓〓"],["81b8","∈∋⊆⊇⊂⊃∪∩"],["81c8","∧∨￢⇒⇔∀∃"],["81da","∠⊥⌒∂∇≡≒≪≫√∽∝∵∫∬"],["81f0","ʼn♯♭♪†‡¶"],["81fc","◯"],["824f","０",9],["8260","Ａ",25],["8281","ａ",25],["829f","ぁ",82],["8340","ァ",62],["8380","ム",22],["839f","Α",16,"Σ",6],["83bf","α",16,"σ",6],["8440","А",5,"ЁЖ",25],["8470","а",5,"ёж",7],["8480","о",17],["849f","─│┌┐┘└├┬┤┴┼━┃┏┓┛┗┣┳┫┻╋┠┯┨┷┿┝┰┥┸╂"],["8740","①",19,"Ⅰ",9],["875f","㍉㌔㌢㍍㌘㌧㌃㌶㍑㍗㌍㌦㌣㌫㍊㌻㎜㎝㎞㎎㎏㏄㎡"],["877e","㍻"],["8780","〝〟№㏍℡㊤",4,"㈱㈲㈹㍾㍽㍼≒≡∫∮∑√⊥∠∟⊿∵∩∪"],["889f","亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵梓圧斡扱宛姐虻飴絢綾鮎或粟袷安庵按暗案闇鞍杏以伊位依偉囲夷委威尉惟意慰易椅為畏異移維緯胃萎衣謂違遺医井亥域育郁磯一壱溢逸稲茨芋鰯允印咽員因姻引飲淫胤蔭"],["8940","院陰隠韻吋右宇烏羽迂雨卯鵜窺丑碓臼渦嘘唄欝蔚鰻姥厩浦瓜閏噂云運雲荏餌叡営嬰影映曳栄永泳洩瑛盈穎頴英衛詠鋭液疫益駅悦謁越閲榎厭円"],["8980","園堰奄宴延怨掩援沿演炎焔煙燕猿縁艶苑薗遠鉛鴛塩於汚甥凹央奥往応押旺横欧殴王翁襖鴬鴎黄岡沖荻億屋憶臆桶牡乙俺卸恩温穏音下化仮何伽価佳加可嘉夏嫁家寡科暇果架歌河火珂禍禾稼箇花苛茄荷華菓蝦課嘩貨迦過霞蚊俄峨我牙画臥芽蛾賀雅餓駕介会解回塊壊廻快怪悔恢懐戒拐改"],["8a40","魁晦械海灰界皆絵芥蟹開階貝凱劾外咳害崖慨概涯碍蓋街該鎧骸浬馨蛙垣柿蛎鈎劃嚇各廓拡撹格核殻獲確穫覚角赫較郭閣隔革学岳楽額顎掛笠樫"],["8a80","橿梶鰍潟割喝恰括活渇滑葛褐轄且鰹叶椛樺鞄株兜竃蒲釜鎌噛鴨栢茅萱粥刈苅瓦乾侃冠寒刊勘勧巻喚堪姦完官寛干幹患感慣憾換敢柑桓棺款歓汗漢澗潅環甘監看竿管簡緩缶翰肝艦莞観諌貫還鑑間閑関陥韓館舘丸含岸巌玩癌眼岩翫贋雁頑顔願企伎危喜器基奇嬉寄岐希幾忌揮机旗既期棋棄"],["8b40","機帰毅気汽畿祈季稀紀徽規記貴起軌輝飢騎鬼亀偽儀妓宜戯技擬欺犠疑祇義蟻誼議掬菊鞠吉吃喫桔橘詰砧杵黍却客脚虐逆丘久仇休及吸宮弓急救"],["8b80","朽求汲泣灸球究窮笈級糾給旧牛去居巨拒拠挙渠虚許距鋸漁禦魚亨享京供侠僑兇競共凶協匡卿叫喬境峡強彊怯恐恭挟教橋況狂狭矯胸脅興蕎郷鏡響饗驚仰凝尭暁業局曲極玉桐粁僅勤均巾錦斤欣欽琴禁禽筋緊芹菌衿襟謹近金吟銀九倶句区狗玖矩苦躯駆駈駒具愚虞喰空偶寓遇隅串櫛釧屑屈"],["8c40","掘窟沓靴轡窪熊隈粂栗繰桑鍬勲君薫訓群軍郡卦袈祁係傾刑兄啓圭珪型契形径恵慶慧憩掲携敬景桂渓畦稽系経継繋罫茎荊蛍計詣警軽頚鶏芸迎鯨"],["8c80","劇戟撃激隙桁傑欠決潔穴結血訣月件倹倦健兼券剣喧圏堅嫌建憲懸拳捲検権牽犬献研硯絹県肩見謙賢軒遣鍵険顕験鹸元原厳幻弦減源玄現絃舷言諺限乎個古呼固姑孤己庫弧戸故枯湖狐糊袴股胡菰虎誇跨鈷雇顧鼓五互伍午呉吾娯後御悟梧檎瑚碁語誤護醐乞鯉交佼侯候倖光公功効勾厚口向"],["8d40","后喉坑垢好孔孝宏工巧巷幸広庚康弘恒慌抗拘控攻昂晃更杭校梗構江洪浩港溝甲皇硬稿糠紅紘絞綱耕考肯肱腔膏航荒行衡講貢購郊酵鉱砿鋼閤降"],["8d80","項香高鴻剛劫号合壕拷濠豪轟麹克刻告国穀酷鵠黒獄漉腰甑忽惚骨狛込此頃今困坤墾婚恨懇昏昆根梱混痕紺艮魂些佐叉唆嵯左差査沙瑳砂詐鎖裟坐座挫債催再最哉塞妻宰彩才採栽歳済災采犀砕砦祭斎細菜裁載際剤在材罪財冴坂阪堺榊肴咲崎埼碕鷺作削咋搾昨朔柵窄策索錯桜鮭笹匙冊刷"],["8e40","察拶撮擦札殺薩雑皐鯖捌錆鮫皿晒三傘参山惨撒散桟燦珊産算纂蚕讃賛酸餐斬暫残仕仔伺使刺司史嗣四士始姉姿子屍市師志思指支孜斯施旨枝止"],["8e80","死氏獅祉私糸紙紫肢脂至視詞詩試誌諮資賜雌飼歯事似侍児字寺慈持時次滋治爾璽痔磁示而耳自蒔辞汐鹿式識鴫竺軸宍雫七叱執失嫉室悉湿漆疾質実蔀篠偲柴芝屡蕊縞舎写射捨赦斜煮社紗者謝車遮蛇邪借勺尺杓灼爵酌釈錫若寂弱惹主取守手朱殊狩珠種腫趣酒首儒受呪寿授樹綬需囚収周"],["8f40","宗就州修愁拾洲秀秋終繍習臭舟蒐衆襲讐蹴輯週酋酬集醜什住充十従戎柔汁渋獣縦重銃叔夙宿淑祝縮粛塾熟出術述俊峻春瞬竣舜駿准循旬楯殉淳"],["8f80","準潤盾純巡遵醇順処初所暑曙渚庶緒署書薯藷諸助叙女序徐恕鋤除傷償勝匠升召哨商唱嘗奨妾娼宵将小少尚庄床廠彰承抄招掌捷昇昌昭晶松梢樟樵沼消渉湘焼焦照症省硝礁祥称章笑粧紹肖菖蒋蕉衝裳訟証詔詳象賞醤鉦鍾鐘障鞘上丈丞乗冗剰城場壌嬢常情擾条杖浄状畳穣蒸譲醸錠嘱埴飾"],["9040","拭植殖燭織職色触食蝕辱尻伸信侵唇娠寝審心慎振新晋森榛浸深申疹真神秦紳臣芯薪親診身辛進針震人仁刃塵壬尋甚尽腎訊迅陣靭笥諏須酢図厨"],["9080","逗吹垂帥推水炊睡粋翠衰遂酔錐錘随瑞髄崇嵩数枢趨雛据杉椙菅頗雀裾澄摺寸世瀬畝是凄制勢姓征性成政整星晴棲栖正清牲生盛精聖声製西誠誓請逝醒青静斉税脆隻席惜戚斥昔析石積籍績脊責赤跡蹟碩切拙接摂折設窃節説雪絶舌蝉仙先千占宣専尖川戦扇撰栓栴泉浅洗染潜煎煽旋穿箭線"],["9140","繊羨腺舛船薦詮賎践選遷銭銑閃鮮前善漸然全禅繕膳糎噌塑岨措曾曽楚狙疏疎礎祖租粗素組蘇訴阻遡鼠僧創双叢倉喪壮奏爽宋層匝惣想捜掃挿掻"],["9180","操早曹巣槍槽漕燥争痩相窓糟総綜聡草荘葬蒼藻装走送遭鎗霜騒像増憎臓蔵贈造促側則即息捉束測足速俗属賊族続卒袖其揃存孫尊損村遜他多太汰詑唾堕妥惰打柁舵楕陀駄騨体堆対耐岱帯待怠態戴替泰滞胎腿苔袋貸退逮隊黛鯛代台大第醍題鷹滝瀧卓啄宅托択拓沢濯琢託鐸濁諾茸凧蛸只"],["9240","叩但達辰奪脱巽竪辿棚谷狸鱈樽誰丹単嘆坦担探旦歎淡湛炭短端箪綻耽胆蛋誕鍛団壇弾断暖檀段男談値知地弛恥智池痴稚置致蜘遅馳築畜竹筑蓄"],["9280","逐秩窒茶嫡着中仲宙忠抽昼柱注虫衷註酎鋳駐樗瀦猪苧著貯丁兆凋喋寵帖帳庁弔張彫徴懲挑暢朝潮牒町眺聴脹腸蝶調諜超跳銚長頂鳥勅捗直朕沈珍賃鎮陳津墜椎槌追鎚痛通塚栂掴槻佃漬柘辻蔦綴鍔椿潰坪壷嬬紬爪吊釣鶴亭低停偵剃貞呈堤定帝底庭廷弟悌抵挺提梯汀碇禎程締艇訂諦蹄逓"],["9340","邸鄭釘鼎泥摘擢敵滴的笛適鏑溺哲徹撤轍迭鉄典填天展店添纏甜貼転顛点伝殿澱田電兎吐堵塗妬屠徒斗杜渡登菟賭途都鍍砥砺努度土奴怒倒党冬"],["9380","凍刀唐塔塘套宕島嶋悼投搭東桃梼棟盗淘湯涛灯燈当痘祷等答筒糖統到董蕩藤討謄豆踏逃透鐙陶頭騰闘働動同堂導憧撞洞瞳童胴萄道銅峠鴇匿得徳涜特督禿篤毒独読栃橡凸突椴届鳶苫寅酉瀞噸屯惇敦沌豚遁頓呑曇鈍奈那内乍凪薙謎灘捺鍋楢馴縄畷南楠軟難汝二尼弐迩匂賑肉虹廿日乳入"],["9440","如尿韮任妊忍認濡禰祢寧葱猫熱年念捻撚燃粘乃廼之埜嚢悩濃納能脳膿農覗蚤巴把播覇杷波派琶破婆罵芭馬俳廃拝排敗杯盃牌背肺輩配倍培媒梅"],["9480","楳煤狽買売賠陪這蝿秤矧萩伯剥博拍柏泊白箔粕舶薄迫曝漠爆縛莫駁麦函箱硲箸肇筈櫨幡肌畑畠八鉢溌発醗髪伐罰抜筏閥鳩噺塙蛤隼伴判半反叛帆搬斑板氾汎版犯班畔繁般藩販範釆煩頒飯挽晩番盤磐蕃蛮匪卑否妃庇彼悲扉批披斐比泌疲皮碑秘緋罷肥被誹費避非飛樋簸備尾微枇毘琵眉美"],["9540","鼻柊稗匹疋髭彦膝菱肘弼必畢筆逼桧姫媛紐百謬俵彪標氷漂瓢票表評豹廟描病秒苗錨鋲蒜蛭鰭品彬斌浜瀕貧賓頻敏瓶不付埠夫婦富冨布府怖扶敷"],["9580","斧普浮父符腐膚芙譜負賦赴阜附侮撫武舞葡蕪部封楓風葺蕗伏副復幅服福腹複覆淵弗払沸仏物鮒分吻噴墳憤扮焚奮粉糞紛雰文聞丙併兵塀幣平弊柄並蔽閉陛米頁僻壁癖碧別瞥蔑箆偏変片篇編辺返遍便勉娩弁鞭保舗鋪圃捕歩甫補輔穂募墓慕戊暮母簿菩倣俸包呆報奉宝峰峯崩庖抱捧放方朋"],["9640","法泡烹砲縫胞芳萌蓬蜂褒訪豊邦鋒飽鳳鵬乏亡傍剖坊妨帽忘忙房暴望某棒冒紡肪膨謀貌貿鉾防吠頬北僕卜墨撲朴牧睦穆釦勃没殆堀幌奔本翻凡盆"],["9680","摩磨魔麻埋妹昧枚毎哩槙幕膜枕鮪柾鱒桝亦俣又抹末沫迄侭繭麿万慢満漫蔓味未魅巳箕岬密蜜湊蓑稔脈妙粍民眠務夢無牟矛霧鵡椋婿娘冥名命明盟迷銘鳴姪牝滅免棉綿緬面麺摸模茂妄孟毛猛盲網耗蒙儲木黙目杢勿餅尤戻籾貰問悶紋門匁也冶夜爺耶野弥矢厄役約薬訳躍靖柳薮鑓愉愈油癒"],["9740","諭輸唯佑優勇友宥幽悠憂揖有柚湧涌猶猷由祐裕誘遊邑郵雄融夕予余与誉輿預傭幼妖容庸揚揺擁曜楊様洋溶熔用窯羊耀葉蓉要謡踊遥陽養慾抑欲"],["9780","沃浴翌翼淀羅螺裸来莱頼雷洛絡落酪乱卵嵐欄濫藍蘭覧利吏履李梨理璃痢裏裡里離陸律率立葎掠略劉流溜琉留硫粒隆竜龍侶慮旅虜了亮僚両凌寮料梁涼猟療瞭稜糧良諒遼量陵領力緑倫厘林淋燐琳臨輪隣鱗麟瑠塁涙累類令伶例冷励嶺怜玲礼苓鈴隷零霊麗齢暦歴列劣烈裂廉恋憐漣煉簾練聯"],["9840","蓮連錬呂魯櫓炉賂路露労婁廊弄朗楼榔浪漏牢狼篭老聾蝋郎六麓禄肋録論倭和話歪賄脇惑枠鷲亙亘鰐詫藁蕨椀湾碗腕"],["989f","弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞亟亠亢亰亳亶从仍仄仆仂仗仞仭仟价伉佚估佛佝佗佇佶侈侏侘佻佩佰侑佯來侖儘俔俟俎俘俛俑俚俐俤俥倚倨倔倪倥倅伜俶倡倩倬俾俯們倆偃假會偕偐偈做偖偬偸傀傚傅傴傲"],["9940","僉僊傳僂僖僞僥僭僣僮價僵儉儁儂儖儕儔儚儡儺儷儼儻儿兀兒兌兔兢竸兩兪兮冀冂囘册冉冏冑冓冕冖冤冦冢冩冪冫决冱冲冰况冽凅凉凛几處凩凭"],["9980","凰凵凾刄刋刔刎刧刪刮刳刹剏剄剋剌剞剔剪剴剩剳剿剽劍劔劒剱劈劑辨辧劬劭劼劵勁勍勗勞勣勦飭勠勳勵勸勹匆匈甸匍匐匏匕匚匣匯匱匳匸區卆卅丗卉卍凖卞卩卮夘卻卷厂厖厠厦厥厮厰厶參簒雙叟曼燮叮叨叭叺吁吽呀听吭吼吮吶吩吝呎咏呵咎呟呱呷呰咒呻咀呶咄咐咆哇咢咸咥咬哄哈咨"],["9a40","咫哂咤咾咼哘哥哦唏唔哽哮哭哺哢唹啀啣啌售啜啅啖啗唸唳啝喙喀咯喊喟啻啾喘喞單啼喃喩喇喨嗚嗅嗟嗄嗜嗤嗔嘔嗷嘖嗾嗽嘛嗹噎噐營嘴嘶嘲嘸"],["9a80","噫噤嘯噬噪嚆嚀嚊嚠嚔嚏嚥嚮嚶嚴囂嚼囁囃囀囈囎囑囓囗囮囹圀囿圄圉圈國圍圓團圖嗇圜圦圷圸坎圻址坏坩埀垈坡坿垉垓垠垳垤垪垰埃埆埔埒埓堊埖埣堋堙堝塲堡塢塋塰毀塒堽塹墅墹墟墫墺壞墻墸墮壅壓壑壗壙壘壥壜壤壟壯壺壹壻壼壽夂夊夐夛梦夥夬夭夲夸夾竒奕奐奎奚奘奢奠奧奬奩"],["9b40","奸妁妝佞侫妣妲姆姨姜妍姙姚娥娟娑娜娉娚婀婬婉娵娶婢婪媚媼媾嫋嫂媽嫣嫗嫦嫩嫖嫺嫻嬌嬋嬖嬲嫐嬪嬶嬾孃孅孀孑孕孚孛孥孩孰孳孵學斈孺宀"],["9b80","它宦宸寃寇寉寔寐寤實寢寞寥寫寰寶寳尅將專對尓尠尢尨尸尹屁屆屎屓屐屏孱屬屮乢屶屹岌岑岔妛岫岻岶岼岷峅岾峇峙峩峽峺峭嶌峪崋崕崗嵜崟崛崑崔崢崚崙崘嵌嵒嵎嵋嵬嵳嵶嶇嶄嶂嶢嶝嶬嶮嶽嶐嶷嶼巉巍巓巒巖巛巫已巵帋帚帙帑帛帶帷幄幃幀幎幗幔幟幢幤幇幵并幺麼广庠廁廂廈廐廏"],["9c40","廖廣廝廚廛廢廡廨廩廬廱廳廰廴廸廾弃弉彝彜弋弑弖弩弭弸彁彈彌彎弯彑彖彗彙彡彭彳彷徃徂彿徊很徑徇從徙徘徠徨徭徼忖忻忤忸忱忝悳忿怡恠"],["9c80","怙怐怩怎怱怛怕怫怦怏怺恚恁恪恷恟恊恆恍恣恃恤恂恬恫恙悁悍惧悃悚悄悛悖悗悒悧悋惡悸惠惓悴忰悽惆悵惘慍愕愆惶惷愀惴惺愃愡惻惱愍愎慇愾愨愧慊愿愼愬愴愽慂慄慳慷慘慙慚慫慴慯慥慱慟慝慓慵憙憖憇憬憔憚憊憑憫憮懌懊應懷懈懃懆憺懋罹懍懦懣懶懺懴懿懽懼懾戀戈戉戍戌戔戛"],["9d40","戞戡截戮戰戲戳扁扎扞扣扛扠扨扼抂抉找抒抓抖拔抃抔拗拑抻拏拿拆擔拈拜拌拊拂拇抛拉挌拮拱挧挂挈拯拵捐挾捍搜捏掖掎掀掫捶掣掏掉掟掵捫"],["9d80","捩掾揩揀揆揣揉插揶揄搖搴搆搓搦搶攝搗搨搏摧摯摶摎攪撕撓撥撩撈撼據擒擅擇撻擘擂擱擧舉擠擡抬擣擯攬擶擴擲擺攀擽攘攜攅攤攣攫攴攵攷收攸畋效敖敕敍敘敞敝敲數斂斃變斛斟斫斷旃旆旁旄旌旒旛旙无旡旱杲昊昃旻杳昵昶昴昜晏晄晉晁晞晝晤晧晨晟晢晰暃暈暎暉暄暘暝曁暹曉暾暼"],["9e40","曄暸曖曚曠昿曦曩曰曵曷朏朖朞朦朧霸朮朿朶杁朸朷杆杞杠杙杣杤枉杰枩杼杪枌枋枦枡枅枷柯枴柬枳柩枸柤柞柝柢柮枹柎柆柧檜栞框栩桀桍栲桎"],["9e80","梳栫桙档桷桿梟梏梭梔條梛梃檮梹桴梵梠梺椏梍桾椁棊椈棘椢椦棡椌棍棔棧棕椶椒椄棗棣椥棹棠棯椨椪椚椣椡棆楹楷楜楸楫楔楾楮椹楴椽楙椰楡楞楝榁楪榲榮槐榿槁槓榾槎寨槊槝榻槃榧樮榑榠榜榕榴槞槨樂樛槿權槹槲槧樅榱樞槭樔槫樊樒櫁樣樓橄樌橲樶橸橇橢橙橦橈樸樢檐檍檠檄檢檣"],["9f40","檗蘗檻櫃櫂檸檳檬櫞櫑櫟檪櫚櫪櫻欅蘖櫺欒欖鬱欟欸欷盜欹飮歇歃歉歐歙歔歛歟歡歸歹歿殀殄殃殍殘殕殞殤殪殫殯殲殱殳殷殼毆毋毓毟毬毫毳毯"],["9f80","麾氈氓气氛氤氣汞汕汢汪沂沍沚沁沛汾汨汳沒沐泄泱泓沽泗泅泝沮沱沾沺泛泯泙泪洟衍洶洫洽洸洙洵洳洒洌浣涓浤浚浹浙涎涕濤涅淹渕渊涵淇淦涸淆淬淞淌淨淒淅淺淙淤淕淪淮渭湮渮渙湲湟渾渣湫渫湶湍渟湃渺湎渤滿渝游溂溪溘滉溷滓溽溯滄溲滔滕溏溥滂溟潁漑灌滬滸滾漿滲漱滯漲滌"],["e040","漾漓滷澆潺潸澁澀潯潛濳潭澂潼潘澎澑濂潦澳澣澡澤澹濆澪濟濕濬濔濘濱濮濛瀉瀋濺瀑瀁瀏濾瀛瀚潴瀝瀘瀟瀰瀾瀲灑灣炙炒炯烱炬炸炳炮烟烋烝"],["e080","烙焉烽焜焙煥煕熈煦煢煌煖煬熏燻熄熕熨熬燗熹熾燒燉燔燎燠燬燧燵燼燹燿爍爐爛爨爭爬爰爲爻爼爿牀牆牋牘牴牾犂犁犇犒犖犢犧犹犲狃狆狄狎狒狢狠狡狹狷倏猗猊猜猖猝猴猯猩猥猾獎獏默獗獪獨獰獸獵獻獺珈玳珎玻珀珥珮珞璢琅瑯琥珸琲琺瑕琿瑟瑙瑁瑜瑩瑰瑣瑪瑶瑾璋璞璧瓊瓏瓔珱"],["e140","瓠瓣瓧瓩瓮瓲瓰瓱瓸瓷甄甃甅甌甎甍甕甓甞甦甬甼畄畍畊畉畛畆畚畩畤畧畫畭畸當疆疇畴疊疉疂疔疚疝疥疣痂疳痃疵疽疸疼疱痍痊痒痙痣痞痾痿"],["e180","痼瘁痰痺痲痳瘋瘍瘉瘟瘧瘠瘡瘢瘤瘴瘰瘻癇癈癆癜癘癡癢癨癩癪癧癬癰癲癶癸發皀皃皈皋皎皖皓皙皚皰皴皸皹皺盂盍盖盒盞盡盥盧盪蘯盻眈眇眄眩眤眞眥眦眛眷眸睇睚睨睫睛睥睿睾睹瞎瞋瞑瞠瞞瞰瞶瞹瞿瞼瞽瞻矇矍矗矚矜矣矮矼砌砒礦砠礪硅碎硴碆硼碚碌碣碵碪碯磑磆磋磔碾碼磅磊磬"],["e240","磧磚磽磴礇礒礑礙礬礫祀祠祗祟祚祕祓祺祿禊禝禧齋禪禮禳禹禺秉秕秧秬秡秣稈稍稘稙稠稟禀稱稻稾稷穃穗穉穡穢穩龝穰穹穽窈窗窕窘窖窩竈窰"],["e280","窶竅竄窿邃竇竊竍竏竕竓站竚竝竡竢竦竭竰笂笏笊笆笳笘笙笞笵笨笶筐筺笄筍笋筌筅筵筥筴筧筰筱筬筮箝箘箟箍箜箚箋箒箏筝箙篋篁篌篏箴篆篝篩簑簔篦篥籠簀簇簓篳篷簗簍篶簣簧簪簟簷簫簽籌籃籔籏籀籐籘籟籤籖籥籬籵粃粐粤粭粢粫粡粨粳粲粱粮粹粽糀糅糂糘糒糜糢鬻糯糲糴糶糺紆"],["e340","紂紜紕紊絅絋紮紲紿紵絆絳絖絎絲絨絮絏絣經綉絛綏絽綛綺綮綣綵緇綽綫總綢綯緜綸綟綰緘緝緤緞緻緲緡縅縊縣縡縒縱縟縉縋縢繆繦縻縵縹繃縷"],["e380","縲縺繧繝繖繞繙繚繹繪繩繼繻纃緕繽辮繿纈纉續纒纐纓纔纖纎纛纜缸缺罅罌罍罎罐网罕罔罘罟罠罨罩罧罸羂羆羃羈羇羌羔羞羝羚羣羯羲羹羮羶羸譱翅翆翊翕翔翡翦翩翳翹飜耆耄耋耒耘耙耜耡耨耿耻聊聆聒聘聚聟聢聨聳聲聰聶聹聽聿肄肆肅肛肓肚肭冐肬胛胥胙胝胄胚胖脉胯胱脛脩脣脯腋"],["e440","隋腆脾腓腑胼腱腮腥腦腴膃膈膊膀膂膠膕膤膣腟膓膩膰膵膾膸膽臀臂膺臉臍臑臙臘臈臚臟臠臧臺臻臾舁舂舅與舊舍舐舖舩舫舸舳艀艙艘艝艚艟艤"],["e480","艢艨艪艫舮艱艷艸艾芍芒芫芟芻芬苡苣苟苒苴苳苺莓范苻苹苞茆苜茉苙茵茴茖茲茱荀茹荐荅茯茫茗茘莅莚莪莟莢莖茣莎莇莊荼莵荳荵莠莉莨菴萓菫菎菽萃菘萋菁菷萇菠菲萍萢萠莽萸蔆菻葭萪萼蕚蒄葷葫蒭葮蒂葩葆萬葯葹萵蓊葢蒹蒿蒟蓙蓍蒻蓚蓐蓁蓆蓖蒡蔡蓿蓴蔗蔘蔬蔟蔕蔔蓼蕀蕣蕘蕈"],["e540","蕁蘂蕋蕕薀薤薈薑薊薨蕭薔薛藪薇薜蕷蕾薐藉薺藏薹藐藕藝藥藜藹蘊蘓蘋藾藺蘆蘢蘚蘰蘿虍乕虔號虧虱蚓蚣蚩蚪蚋蚌蚶蚯蛄蛆蚰蛉蠣蚫蛔蛞蛩蛬"],["e580","蛟蛛蛯蜒蜆蜈蜀蜃蛻蜑蜉蜍蛹蜊蜴蜿蜷蜻蜥蜩蜚蝠蝟蝸蝌蝎蝴蝗蝨蝮蝙蝓蝣蝪蠅螢螟螂螯蟋螽蟀蟐雖螫蟄螳蟇蟆螻蟯蟲蟠蠏蠍蟾蟶蟷蠎蟒蠑蠖蠕蠢蠡蠱蠶蠹蠧蠻衄衂衒衙衞衢衫袁衾袞衵衽袵衲袂袗袒袮袙袢袍袤袰袿袱裃裄裔裘裙裝裹褂裼裴裨裲褄褌褊褓襃褞褥褪褫襁襄褻褶褸襌褝襠襞"],["e640","襦襤襭襪襯襴襷襾覃覈覊覓覘覡覩覦覬覯覲覺覽覿觀觚觜觝觧觴觸訃訖訐訌訛訝訥訶詁詛詒詆詈詼詭詬詢誅誂誄誨誡誑誥誦誚誣諄諍諂諚諫諳諧"],["e680","諤諱謔諠諢諷諞諛謌謇謚諡謖謐謗謠謳鞫謦謫謾謨譁譌譏譎證譖譛譚譫譟譬譯譴譽讀讌讎讒讓讖讙讚谺豁谿豈豌豎豐豕豢豬豸豺貂貉貅貊貍貎貔豼貘戝貭貪貽貲貳貮貶賈賁賤賣賚賽賺賻贄贅贊贇贏贍贐齎贓賍贔贖赧赭赱赳趁趙跂趾趺跏跚跖跌跛跋跪跫跟跣跼踈踉跿踝踞踐踟蹂踵踰踴蹊"],["e740","蹇蹉蹌蹐蹈蹙蹤蹠踪蹣蹕蹶蹲蹼躁躇躅躄躋躊躓躑躔躙躪躡躬躰軆躱躾軅軈軋軛軣軼軻軫軾輊輅輕輒輙輓輜輟輛輌輦輳輻輹轅轂輾轌轉轆轎轗轜"],["e780","轢轣轤辜辟辣辭辯辷迚迥迢迪迯邇迴逅迹迺逑逕逡逍逞逖逋逧逶逵逹迸遏遐遑遒逎遉逾遖遘遞遨遯遶隨遲邂遽邁邀邊邉邏邨邯邱邵郢郤扈郛鄂鄒鄙鄲鄰酊酖酘酣酥酩酳酲醋醉醂醢醫醯醪醵醴醺釀釁釉釋釐釖釟釡釛釼釵釶鈞釿鈔鈬鈕鈑鉞鉗鉅鉉鉤鉈銕鈿鉋鉐銜銖銓銛鉚鋏銹銷鋩錏鋺鍄錮"],["e840","錙錢錚錣錺錵錻鍜鍠鍼鍮鍖鎰鎬鎭鎔鎹鏖鏗鏨鏥鏘鏃鏝鏐鏈鏤鐚鐔鐓鐃鐇鐐鐶鐫鐵鐡鐺鑁鑒鑄鑛鑠鑢鑞鑪鈩鑰鑵鑷鑽鑚鑼鑾钁鑿閂閇閊閔閖閘閙"],["e880","閠閨閧閭閼閻閹閾闊濶闃闍闌闕闔闖關闡闥闢阡阨阮阯陂陌陏陋陷陜陞陝陟陦陲陬隍隘隕隗險隧隱隲隰隴隶隸隹雎雋雉雍襍雜霍雕雹霄霆霈霓霎霑霏霖霙霤霪霰霹霽霾靄靆靈靂靉靜靠靤靦靨勒靫靱靹鞅靼鞁靺鞆鞋鞏鞐鞜鞨鞦鞣鞳鞴韃韆韈韋韜韭齏韲竟韶韵頏頌頸頤頡頷頽顆顏顋顫顯顰"],["e940","顱顴顳颪颯颱颶飄飃飆飩飫餃餉餒餔餘餡餝餞餤餠餬餮餽餾饂饉饅饐饋饑饒饌饕馗馘馥馭馮馼駟駛駝駘駑駭駮駱駲駻駸騁騏騅駢騙騫騷驅驂驀驃"],["e980","騾驕驍驛驗驟驢驥驤驩驫驪骭骰骼髀髏髑髓體髞髟髢髣髦髯髫髮髴髱髷髻鬆鬘鬚鬟鬢鬣鬥鬧鬨鬩鬪鬮鬯鬲魄魃魏魍魎魑魘魴鮓鮃鮑鮖鮗鮟鮠鮨鮴鯀鯊鮹鯆鯏鯑鯒鯣鯢鯤鯔鯡鰺鯲鯱鯰鰕鰔鰉鰓鰌鰆鰈鰒鰊鰄鰮鰛鰥鰤鰡鰰鱇鰲鱆鰾鱚鱠鱧鱶鱸鳧鳬鳰鴉鴈鳫鴃鴆鴪鴦鶯鴣鴟鵄鴕鴒鵁鴿鴾鵆鵈"],["ea40","鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻鶸鶺鷆鷏鷂鷙鷓鷸鷦鷭鷯鷽鸚鸛鸞鹵鹹鹽麁麈麋麌麒麕麑麝麥麩麸麪麭靡黌黎黏黐黔黜點黝黠黥黨黯"],["ea80","黴黶黷黹黻黼黽鼇鼈皷鼕鼡鼬鼾齊齒齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠堯槇遙瑤凜熙"],["ed40","纊褜鍈銈蓜俉炻昱棈鋹曻彅丨仡仼伀伃伹佖侒侊侚侔俍偀倢俿倞偆偰偂傔僴僘兊兤冝冾凬刕劜劦勀勛匀匇匤卲厓厲叝﨎咜咊咩哿喆坙坥垬埈埇﨏"],["ed80","塚增墲夋奓奛奝奣妤妺孖寀甯寘寬尞岦岺峵崧嵓﨑嵂嵭嶸嶹巐弡弴彧德忞恝悅悊惞惕愠惲愑愷愰憘戓抦揵摠撝擎敎昀昕昻昉昮昞昤晥晗晙晴晳暙暠暲暿曺朎朗杦枻桒柀栁桄棏﨓楨﨔榘槢樰橫橆橳橾櫢櫤毖氿汜沆汯泚洄涇浯涖涬淏淸淲淼渹湜渧渼溿澈澵濵瀅瀇瀨炅炫焏焄煜煆煇凞燁燾犱"],["ee40","犾猤猪獷玽珉珖珣珒琇珵琦琪琩琮瑢璉璟甁畯皂皜皞皛皦益睆劯砡硎硤硺礰礼神祥禔福禛竑竧靖竫箞精絈絜綷綠緖繒罇羡羽茁荢荿菇菶葈蒴蕓蕙"],["ee80","蕫﨟薰蘒﨡蠇裵訒訷詹誧誾諟諸諶譓譿賰賴贒赶﨣軏﨤逸遧郞都鄕鄧釚釗釞釭釮釤釥鈆鈐鈊鈺鉀鈼鉎鉙鉑鈹鉧銧鉷鉸鋧鋗鋙鋐﨧鋕鋠鋓錥錡鋻﨨錞鋿錝錂鍰鍗鎤鏆鏞鏸鐱鑅鑈閒隆﨩隝隯霳霻靃靍靏靑靕顗顥飯飼餧館馞驎髙髜魵魲鮏鮱鮻鰀鵰鵫鶴鸙黑"],["eeef","ⅰ",9,"￢￤＇＂"],["f040","",62],["f080","",124],["f140","",62],["f180","",124],["f240","",62],["f280","",124],["f340","",62],["f380","",124],["f440","",62],["f480","",124],["f540","",62],["f580","",124],["f640","",62],["f680","",124],["f740","",62],["f780","",124],["f840","",62],["f880","",124],["f940",""],["fa40","ⅰ",9,"Ⅰ",9,"￢￤＇＂㈱№℡∵纊褜鍈銈蓜俉炻昱棈鋹曻彅丨仡仼伀伃伹佖侒侊侚侔俍偀倢俿倞偆偰偂傔僴僘兊"],["fa80","兤冝冾凬刕劜劦勀勛匀匇匤卲厓厲叝﨎咜咊咩哿喆坙坥垬埈埇﨏塚增墲夋奓奛奝奣妤妺孖寀甯寘寬尞岦岺峵崧嵓﨑嵂嵭嶸嶹巐弡弴彧德忞恝悅悊惞惕愠惲愑愷愰憘戓抦揵摠撝擎敎昀昕昻昉昮昞昤晥晗晙晴晳暙暠暲暿曺朎朗杦枻桒柀栁桄棏﨓楨﨔榘槢樰橫橆橳橾櫢櫤毖氿汜沆汯泚洄涇浯"],["fb40","涖涬淏淸淲淼渹湜渧渼溿澈澵濵瀅瀇瀨炅炫焏焄煜煆煇凞燁燾犱犾猤猪獷玽珉珖珣珒琇珵琦琪琩琮瑢璉璟甁畯皂皜皞皛皦益睆劯砡硎硤硺礰礼神"],["fb80","祥禔福禛竑竧靖竫箞精絈絜綷綠緖繒罇羡羽茁荢荿菇菶葈蒴蕓蕙蕫﨟薰蘒﨡蠇裵訒訷詹誧誾諟諸諶譓譿賰賴贒赶﨣軏﨤逸遧郞都鄕鄧釚釗釞釭釮釤釥鈆鈐鈊鈺鉀鈼鉎鉙鉑鈹鉧銧鉷鉸鋧鋗鋙鋐﨧鋕鋠鋓錥錡鋻﨨錞鋿錝錂鍰鍗鎤鏆鏞鏸鐱鑅鑈閒隆﨩隝隯霳霻靃靍靏靑靕顗顥飯飼餧館馞驎髙"],["fc40","髜魵魲鮏鮱鮻鰀鵰鵫鶴鸙黑"]]
+
+/***/ }),
+/* 722 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var Buffer = __webpack_require__(15).Buffer;
+
+// Note: UTF16-LE (or UCS2) codec is Node.js native. See encodings/internal.js
+
+// == UTF16-BE codec. ==========================================================
+
+exports.utf16be = Utf16BECodec;
+function Utf16BECodec() {
+}
+
+Utf16BECodec.prototype.encoder = Utf16BEEncoder;
+Utf16BECodec.prototype.decoder = Utf16BEDecoder;
+Utf16BECodec.prototype.bomAware = true;
+
+
+// -- Encoding
+
+function Utf16BEEncoder() {
+}
+
+Utf16BEEncoder.prototype.write = function(str) {
+    var buf = Buffer.from(str, 'ucs2');
+    for (var i = 0; i < buf.length; i += 2) {
+        var tmp = buf[i]; buf[i] = buf[i+1]; buf[i+1] = tmp;
+    }
+    return buf;
+}
+
+Utf16BEEncoder.prototype.end = function() {
+}
+
+
+// -- Decoding
+
+function Utf16BEDecoder() {
+    this.overflowByte = -1;
+}
+
+Utf16BEDecoder.prototype.write = function(buf) {
+    if (buf.length == 0)
+        return '';
+
+    var buf2 = Buffer.alloc(buf.length + 1),
+        i = 0, j = 0;
+
+    if (this.overflowByte !== -1) {
+        buf2[0] = buf[0];
+        buf2[1] = this.overflowByte;
+        i = 1; j = 2;
+    }
+
+    for (; i < buf.length-1; i += 2, j+= 2) {
+        buf2[j] = buf[i+1];
+        buf2[j+1] = buf[i];
+    }
+
+    this.overflowByte = (i == buf.length-1) ? buf[buf.length-1] : -1;
+
+    return buf2.slice(0, j).toString('ucs2');
+}
+
+Utf16BEDecoder.prototype.end = function() {
+}
+
+
+// == UTF-16 codec =============================================================
+// Decoder chooses automatically from UTF-16LE and UTF-16BE using BOM and space-based heuristic.
+// Defaults to UTF-16LE, as it's prevalent and default in Node.
+// http://en.wikipedia.org/wiki/UTF-16 and http://encoding.spec.whatwg.org/#utf-16le
+// Decoder default can be changed: iconv.decode(buf, 'utf16', {defaultEncoding: 'utf-16be'});
+
+// Encoder uses UTF-16LE and prepends BOM (which can be overridden with addBOM: false).
+
+exports.utf16 = Utf16Codec;
+function Utf16Codec(codecOptions, iconv) {
+    this.iconv = iconv;
+}
+
+Utf16Codec.prototype.encoder = Utf16Encoder;
+Utf16Codec.prototype.decoder = Utf16Decoder;
+
+
+// -- Encoding (pass-through)
+
+function Utf16Encoder(options, codec) {
+    options = options || {};
+    if (options.addBOM === undefined)
+        options.addBOM = true;
+    this.encoder = codec.iconv.getEncoder('utf-16le', options);
+}
+
+Utf16Encoder.prototype.write = function(str) {
+    return this.encoder.write(str);
+}
+
+Utf16Encoder.prototype.end = function() {
+    return this.encoder.end();
+}
+
+
+// -- Decoding
+
+function Utf16Decoder(options, codec) {
+    this.decoder = null;
+    this.initialBytes = [];
+    this.initialBytesLen = 0;
+
+    this.options = options || {};
+    this.iconv = codec.iconv;
+}
+
+Utf16Decoder.prototype.write = function(buf) {
+    if (!this.decoder) {
+        // Codec is not chosen yet. Accumulate initial bytes.
+        this.initialBytes.push(buf);
+        this.initialBytesLen += buf.length;
+        
+        if (this.initialBytesLen < 16) // We need more bytes to use space heuristic (see below)
+            return '';
+
+        // We have enough bytes -> detect endianness.
+        var buf = Buffer.concat(this.initialBytes),
+            encoding = detectEncoding(buf, this.options.defaultEncoding);
+        this.decoder = this.iconv.getDecoder(encoding, this.options);
+        this.initialBytes.length = this.initialBytesLen = 0;
+    }
+
+    return this.decoder.write(buf);
+}
+
+Utf16Decoder.prototype.end = function() {
+    if (!this.decoder) {
+        var buf = Buffer.concat(this.initialBytes),
+            encoding = detectEncoding(buf, this.options.defaultEncoding);
+        this.decoder = this.iconv.getDecoder(encoding, this.options);
+
+        var res = this.decoder.write(buf),
+            trail = this.decoder.end();
+
+        return trail ? (res + trail) : res;
+    }
+    return this.decoder.end();
+}
+
+function detectEncoding(buf, defaultEncoding) {
+    var enc = defaultEncoding || 'utf-16le';
+
+    if (buf.length >= 2) {
+        // Check BOM.
+        if (buf[0] == 0xFE && buf[1] == 0xFF) // UTF-16BE BOM
+            enc = 'utf-16be';
+        else if (buf[0] == 0xFF && buf[1] == 0xFE) // UTF-16LE BOM
+            enc = 'utf-16le';
+        else {
+            // No BOM found. Try to deduce encoding from initial content.
+            // Most of the time, the content has ASCII chars (U+00**), but the opposite (U+**00) is uncommon.
+            // So, we count ASCII as if it was LE or BE, and decide from that.
+            var asciiCharsLE = 0, asciiCharsBE = 0, // Counts of chars in both positions
+                _len = Math.min(buf.length - (buf.length % 2), 64); // Len is always even.
+
+            for (var i = 0; i < _len; i += 2) {
+                if (buf[i] === 0 && buf[i+1] !== 0) asciiCharsBE++;
+                if (buf[i] !== 0 && buf[i+1] === 0) asciiCharsLE++;
+            }
+
+            if (asciiCharsBE > asciiCharsLE)
+                enc = 'utf-16be';
+            else if (asciiCharsBE < asciiCharsLE)
+                enc = 'utf-16le';
+        }
+    }
+
+    return enc;
+}
+
+
+
+
+/***/ }),
+/* 723 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var Buffer = __webpack_require__(15).Buffer;
+
+// UTF-7 codec, according to https://tools.ietf.org/html/rfc2152
+// See also below a UTF-7-IMAP codec, according to http://tools.ietf.org/html/rfc3501#section-5.1.3
+
+exports.utf7 = Utf7Codec;
+exports.unicode11utf7 = 'utf7'; // Alias UNICODE-1-1-UTF-7
+function Utf7Codec(codecOptions, iconv) {
+    this.iconv = iconv;
+};
+
+Utf7Codec.prototype.encoder = Utf7Encoder;
+Utf7Codec.prototype.decoder = Utf7Decoder;
+Utf7Codec.prototype.bomAware = true;
+
+
+// -- Encoding
+
+var nonDirectChars = /[^A-Za-z0-9'\(\),-\.\/:\? \n\r\t]+/g;
+
+function Utf7Encoder(options, codec) {
+    this.iconv = codec.iconv;
+}
+
+Utf7Encoder.prototype.write = function(str) {
+    // Naive implementation.
+    // Non-direct chars are encoded as "+<base64>-"; single "+" char is encoded as "+-".
+    return Buffer.from(str.replace(nonDirectChars, function(chunk) {
+        return "+" + (chunk === '+' ? '' : 
+            this.iconv.encode(chunk, 'utf16-be').toString('base64').replace(/=+$/, '')) 
+            + "-";
+    }.bind(this)));
+}
+
+Utf7Encoder.prototype.end = function() {
+}
+
+
+// -- Decoding
+
+function Utf7Decoder(options, codec) {
+    this.iconv = codec.iconv;
+    this.inBase64 = false;
+    this.base64Accum = '';
+}
+
+var base64Regex = /[A-Za-z0-9\/+]/;
+var base64Chars = [];
+for (var i = 0; i < 256; i++)
+    base64Chars[i] = base64Regex.test(String.fromCharCode(i));
+
+var plusChar = '+'.charCodeAt(0), 
+    minusChar = '-'.charCodeAt(0),
+    andChar = '&'.charCodeAt(0);
+
+Utf7Decoder.prototype.write = function(buf) {
+    var res = "", lastI = 0,
+        inBase64 = this.inBase64,
+        base64Accum = this.base64Accum;
+
+    // The decoder is more involved as we must handle chunks in stream.
+
+    for (var i = 0; i < buf.length; i++) {
+        if (!inBase64) { // We're in direct mode.
+            // Write direct chars until '+'
+            if (buf[i] == plusChar) {
+                res += this.iconv.decode(buf.slice(lastI, i), "ascii"); // Write direct chars.
+                lastI = i+1;
+                inBase64 = true;
+            }
+        } else { // We decode base64.
+            if (!base64Chars[buf[i]]) { // Base64 ended.
+                if (i == lastI && buf[i] == minusChar) {// "+-" -> "+"
+                    res += "+";
+                } else {
+                    var b64str = base64Accum + buf.slice(lastI, i).toString();
+                    res += this.iconv.decode(Buffer.from(b64str, 'base64'), "utf16-be");
+                }
+
+                if (buf[i] != minusChar) // Minus is absorbed after base64.
+                    i--;
+
+                lastI = i+1;
+                inBase64 = false;
+                base64Accum = '';
+            }
+        }
+    }
+
+    if (!inBase64) {
+        res += this.iconv.decode(buf.slice(lastI), "ascii"); // Write direct chars.
+    } else {
+        var b64str = base64Accum + buf.slice(lastI).toString();
+
+        var canBeDecoded = b64str.length - (b64str.length % 8); // Minimal chunk: 2 quads -> 2x3 bytes -> 3 chars.
+        base64Accum = b64str.slice(canBeDecoded); // The rest will be decoded in future.
+        b64str = b64str.slice(0, canBeDecoded);
+
+        res += this.iconv.decode(Buffer.from(b64str, 'base64'), "utf16-be");
+    }
+
+    this.inBase64 = inBase64;
+    this.base64Accum = base64Accum;
+
+    return res;
+}
+
+Utf7Decoder.prototype.end = function() {
+    var res = "";
+    if (this.inBase64 && this.base64Accum.length > 0)
+        res = this.iconv.decode(Buffer.from(this.base64Accum, 'base64'), "utf16-be");
+
+    this.inBase64 = false;
+    this.base64Accum = '';
+    return res;
+}
+
+
+// UTF-7-IMAP codec.
+// RFC3501 Sec. 5.1.3 Modified UTF-7 (http://tools.ietf.org/html/rfc3501#section-5.1.3)
+// Differences:
+//  * Base64 part is started by "&" instead of "+"
+//  * Direct characters are 0x20-0x7E, except "&" (0x26)
+//  * In Base64, "," is used instead of "/"
+//  * Base64 must not be used to represent direct characters.
+//  * No implicit shift back from Base64 (should always end with '-')
+//  * String must end in non-shifted position.
+//  * "-&" while in base64 is not allowed.
+
+
+exports.utf7imap = Utf7IMAPCodec;
+function Utf7IMAPCodec(codecOptions, iconv) {
+    this.iconv = iconv;
+};
+
+Utf7IMAPCodec.prototype.encoder = Utf7IMAPEncoder;
+Utf7IMAPCodec.prototype.decoder = Utf7IMAPDecoder;
+Utf7IMAPCodec.prototype.bomAware = true;
+
+
+// -- Encoding
+
+function Utf7IMAPEncoder(options, codec) {
+    this.iconv = codec.iconv;
+    this.inBase64 = false;
+    this.base64Accum = Buffer.alloc(6);
+    this.base64AccumIdx = 0;
+}
+
+Utf7IMAPEncoder.prototype.write = function(str) {
+    var inBase64 = this.inBase64,
+        base64Accum = this.base64Accum,
+        base64AccumIdx = this.base64AccumIdx,
+        buf = Buffer.alloc(str.length*5 + 10), bufIdx = 0;
+
+    for (var i = 0; i < str.length; i++) {
+        var uChar = str.charCodeAt(i);
+        if (0x20 <= uChar && uChar <= 0x7E) { // Direct character or '&'.
+            if (inBase64) {
+                if (base64AccumIdx > 0) {
+                    bufIdx += buf.write(base64Accum.slice(0, base64AccumIdx).toString('base64').replace(/\//g, ',').replace(/=+$/, ''), bufIdx);
+                    base64AccumIdx = 0;
+                }
+
+                buf[bufIdx++] = minusChar; // Write '-', then go to direct mode.
+                inBase64 = false;
+            }
+
+            if (!inBase64) {
+                buf[bufIdx++] = uChar; // Write direct character
+
+                if (uChar === andChar)  // Ampersand -> '&-'
+                    buf[bufIdx++] = minusChar;
+            }
+
+        } else { // Non-direct character
+            if (!inBase64) {
+                buf[bufIdx++] = andChar; // Write '&', then go to base64 mode.
+                inBase64 = true;
+            }
+            if (inBase64) {
+                base64Accum[base64AccumIdx++] = uChar >> 8;
+                base64Accum[base64AccumIdx++] = uChar & 0xFF;
+
+                if (base64AccumIdx == base64Accum.length) {
+                    bufIdx += buf.write(base64Accum.toString('base64').replace(/\//g, ','), bufIdx);
+                    base64AccumIdx = 0;
+                }
+            }
+        }
+    }
+
+    this.inBase64 = inBase64;
+    this.base64AccumIdx = base64AccumIdx;
+
+    return buf.slice(0, bufIdx);
+}
+
+Utf7IMAPEncoder.prototype.end = function() {
+    var buf = Buffer.alloc(10), bufIdx = 0;
+    if (this.inBase64) {
+        if (this.base64AccumIdx > 0) {
+            bufIdx += buf.write(this.base64Accum.slice(0, this.base64AccumIdx).toString('base64').replace(/\//g, ',').replace(/=+$/, ''), bufIdx);
+            this.base64AccumIdx = 0;
+        }
+
+        buf[bufIdx++] = minusChar; // Write '-', then go to direct mode.
+        this.inBase64 = false;
+    }
+
+    return buf.slice(0, bufIdx);
+}
+
+
+// -- Decoding
+
+function Utf7IMAPDecoder(options, codec) {
+    this.iconv = codec.iconv;
+    this.inBase64 = false;
+    this.base64Accum = '';
+}
+
+var base64IMAPChars = base64Chars.slice();
+base64IMAPChars[','.charCodeAt(0)] = true;
+
+Utf7IMAPDecoder.prototype.write = function(buf) {
+    var res = "", lastI = 0,
+        inBase64 = this.inBase64,
+        base64Accum = this.base64Accum;
+
+    // The decoder is more involved as we must handle chunks in stream.
+    // It is forgiving, closer to standard UTF-7 (for example, '-' is optional at the end).
+
+    for (var i = 0; i < buf.length; i++) {
+        if (!inBase64) { // We're in direct mode.
+            // Write direct chars until '&'
+            if (buf[i] == andChar) {
+                res += this.iconv.decode(buf.slice(lastI, i), "ascii"); // Write direct chars.
+                lastI = i+1;
+                inBase64 = true;
+            }
+        } else { // We decode base64.
+            if (!base64IMAPChars[buf[i]]) { // Base64 ended.
+                if (i == lastI && buf[i] == minusChar) { // "&-" -> "&"
+                    res += "&";
+                } else {
+                    var b64str = base64Accum + buf.slice(lastI, i).toString().replace(/,/g, '/');
+                    res += this.iconv.decode(Buffer.from(b64str, 'base64'), "utf16-be");
+                }
+
+                if (buf[i] != minusChar) // Minus may be absorbed after base64.
+                    i--;
+
+                lastI = i+1;
+                inBase64 = false;
+                base64Accum = '';
+            }
+        }
+    }
+
+    if (!inBase64) {
+        res += this.iconv.decode(buf.slice(lastI), "ascii"); // Write direct chars.
+    } else {
+        var b64str = base64Accum + buf.slice(lastI).toString().replace(/,/g, '/');
+
+        var canBeDecoded = b64str.length - (b64str.length % 8); // Minimal chunk: 2 quads -> 2x3 bytes -> 3 chars.
+        base64Accum = b64str.slice(canBeDecoded); // The rest will be decoded in future.
+        b64str = b64str.slice(0, canBeDecoded);
+
+        res += this.iconv.decode(Buffer.from(b64str, 'base64'), "utf16-be");
+    }
+
+    this.inBase64 = inBase64;
+    this.base64Accum = base64Accum;
+
+    return res;
+}
+
+Utf7IMAPDecoder.prototype.end = function() {
+    var res = "";
+    if (this.inBase64 && this.base64Accum.length > 0)
+        res = this.iconv.decode(Buffer.from(this.base64Accum, 'base64'), "utf16-be");
+
+    this.inBase64 = false;
+    this.base64Accum = '';
+    return res;
+}
+
+
+
+
+/***/ }),
+/* 724 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var BOMChar = '\uFEFF';
+
+exports.PrependBOM = PrependBOMWrapper
+function PrependBOMWrapper(encoder, options) {
+    this.encoder = encoder;
+    this.addBOM = true;
+}
+
+PrependBOMWrapper.prototype.write = function(str) {
+    if (this.addBOM) {
+        str = BOMChar + str;
+        this.addBOM = false;
+    }
+
+    return this.encoder.write(str);
+}
+
+PrependBOMWrapper.prototype.end = function() {
+    return this.encoder.end();
+}
+
+
+//------------------------------------------------------------------------------
+
+exports.StripBOM = StripBOMWrapper;
+function StripBOMWrapper(decoder, options) {
+    this.decoder = decoder;
+    this.pass = false;
+    this.options = options || {};
+}
+
+StripBOMWrapper.prototype.write = function(buf) {
+    var res = this.decoder.write(buf);
+    if (this.pass || !res)
+        return res;
+
+    if (res[0] === BOMChar) {
+        res = res.slice(1);
+        if (typeof this.options.stripBOM === 'function')
+            this.options.stripBOM();
+    }
+
+    this.pass = true;
+    return res;
+}
+
+StripBOMWrapper.prototype.end = function() {
+    return this.decoder.end();
+}
+
+
+
+/***/ }),
+/* 725 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var Buffer = __webpack_require__(64).Buffer;
+// Note: not polyfilled with safer-buffer on a purpose, as overrides Buffer
+
+// == Extend Node primitives to use iconv-lite =================================
+
+module.exports = function (iconv) {
+    var original = undefined; // Place to keep original methods.
+
+    // Node authors rewrote Buffer internals to make it compatible with
+    // Uint8Array and we cannot patch key functions since then.
+    // Note: this does use older Buffer API on a purpose
+    iconv.supportsNodeEncodingsExtension = !(Buffer.from || new Buffer(0) instanceof Uint8Array);
+
+    iconv.extendNodeEncodings = function extendNodeEncodings() {
+        if (original) return;
+        original = {};
+
+        if (!iconv.supportsNodeEncodingsExtension) {
+            console.error("ACTION NEEDED: require('iconv-lite').extendNodeEncodings() is not supported in your version of Node");
+            console.error("See more info at https://github.com/ashtuchkin/iconv-lite/wiki/Node-v4-compatibility");
+            return;
+        }
+
+        var nodeNativeEncodings = {
+            'hex': true, 'utf8': true, 'utf-8': true, 'ascii': true, 'binary': true, 
+            'base64': true, 'ucs2': true, 'ucs-2': true, 'utf16le': true, 'utf-16le': true,
+        };
+
+        Buffer.isNativeEncoding = function(enc) {
+            return enc && nodeNativeEncodings[enc.toLowerCase()];
+        }
+
+        // -- SlowBuffer -----------------------------------------------------------
+        var SlowBuffer = __webpack_require__(64).SlowBuffer;
+
+        original.SlowBufferToString = SlowBuffer.prototype.toString;
+        SlowBuffer.prototype.toString = function(encoding, start, end) {
+            encoding = String(encoding || 'utf8').toLowerCase();
+
+            // Use native conversion when possible
+            if (Buffer.isNativeEncoding(encoding))
+                return original.SlowBufferToString.call(this, encoding, start, end);
+
+            // Otherwise, use our decoding method.
+            if (typeof start == 'undefined') start = 0;
+            if (typeof end == 'undefined') end = this.length;
+            return iconv.decode(this.slice(start, end), encoding);
+        }
+
+        original.SlowBufferWrite = SlowBuffer.prototype.write;
+        SlowBuffer.prototype.write = function(string, offset, length, encoding) {
+            // Support both (string, offset, length, encoding)
+            // and the legacy (string, encoding, offset, length)
+            if (isFinite(offset)) {
+                if (!isFinite(length)) {
+                    encoding = length;
+                    length = undefined;
+                }
+            } else {  // legacy
+                var swap = encoding;
+                encoding = offset;
+                offset = length;
+                length = swap;
+            }
+
+            offset = +offset || 0;
+            var remaining = this.length - offset;
+            if (!length) {
+                length = remaining;
+            } else {
+                length = +length;
+                if (length > remaining) {
+                    length = remaining;
+                }
+            }
+            encoding = String(encoding || 'utf8').toLowerCase();
+
+            // Use native conversion when possible
+            if (Buffer.isNativeEncoding(encoding))
+                return original.SlowBufferWrite.call(this, string, offset, length, encoding);
+
+            if (string.length > 0 && (length < 0 || offset < 0))
+                throw new RangeError('attempt to write beyond buffer bounds');
+
+            // Otherwise, use our encoding method.
+            var buf = iconv.encode(string, encoding);
+            if (buf.length < length) length = buf.length;
+            buf.copy(this, offset, 0, length);
+            return length;
+        }
+
+        // -- Buffer ---------------------------------------------------------------
+
+        original.BufferIsEncoding = Buffer.isEncoding;
+        Buffer.isEncoding = function(encoding) {
+            return Buffer.isNativeEncoding(encoding) || iconv.encodingExists(encoding);
+        }
+
+        original.BufferByteLength = Buffer.byteLength;
+        Buffer.byteLength = SlowBuffer.byteLength = function(str, encoding) {
+            encoding = String(encoding || 'utf8').toLowerCase();
+
+            // Use native conversion when possible
+            if (Buffer.isNativeEncoding(encoding))
+                return original.BufferByteLength.call(this, str, encoding);
+
+            // Slow, I know, but we don't have a better way yet.
+            return iconv.encode(str, encoding).length;
+        }
+
+        original.BufferToString = Buffer.prototype.toString;
+        Buffer.prototype.toString = function(encoding, start, end) {
+            encoding = String(encoding || 'utf8').toLowerCase();
+
+            // Use native conversion when possible
+            if (Buffer.isNativeEncoding(encoding))
+                return original.BufferToString.call(this, encoding, start, end);
+
+            // Otherwise, use our decoding method.
+            if (typeof start == 'undefined') start = 0;
+            if (typeof end == 'undefined') end = this.length;
+            return iconv.decode(this.slice(start, end), encoding);
+        }
+
+        original.BufferWrite = Buffer.prototype.write;
+        Buffer.prototype.write = function(string, offset, length, encoding) {
+            var _offset = offset, _length = length, _encoding = encoding;
+            // Support both (string, offset, length, encoding)
+            // and the legacy (string, encoding, offset, length)
+            if (isFinite(offset)) {
+                if (!isFinite(length)) {
+                    encoding = length;
+                    length = undefined;
+                }
+            } else {  // legacy
+                var swap = encoding;
+                encoding = offset;
+                offset = length;
+                length = swap;
+            }
+
+            encoding = String(encoding || 'utf8').toLowerCase();
+
+            // Use native conversion when possible
+            if (Buffer.isNativeEncoding(encoding))
+                return original.BufferWrite.call(this, string, _offset, _length, _encoding);
+
+            offset = +offset || 0;
+            var remaining = this.length - offset;
+            if (!length) {
+                length = remaining;
+            } else {
+                length = +length;
+                if (length > remaining) {
+                    length = remaining;
+                }
+            }
+
+            if (string.length > 0 && (length < 0 || offset < 0))
+                throw new RangeError('attempt to write beyond buffer bounds');
+
+            // Otherwise, use our encoding method.
+            var buf = iconv.encode(string, encoding);
+            if (buf.length < length) length = buf.length;
+            buf.copy(this, offset, 0, length);
+            return length;
+
+            // TODO: Set _charsWritten.
+        }
+
+
+        // -- Readable -------------------------------------------------------------
+        if (iconv.supportsStreams) {
+            var Readable = __webpack_require__(23).Readable;
+
+            original.ReadableSetEncoding = Readable.prototype.setEncoding;
+            Readable.prototype.setEncoding = function setEncoding(enc, options) {
+                // Use our own decoder, it has the same interface.
+                // We cannot use original function as it doesn't handle BOM-s.
+                this._readableState.decoder = iconv.getDecoder(enc, options);
+                this._readableState.encoding = enc;
+            }
+
+            Readable.prototype.collect = iconv._collect;
+        }
+    }
+
+    // Remove iconv-lite Node primitive extensions.
+    iconv.undoExtendNodeEncodings = function undoExtendNodeEncodings() {
+        if (!iconv.supportsNodeEncodingsExtension)
+            return;
+        if (!original)
+            throw new Error("require('iconv-lite').undoExtendNodeEncodings(): Nothing to undo; extendNodeEncodings() is not called.")
+
+        delete Buffer.isNativeEncoding;
+
+        var SlowBuffer = __webpack_require__(64).SlowBuffer;
+
+        SlowBuffer.prototype.toString = original.SlowBufferToString;
+        SlowBuffer.prototype.write = original.SlowBufferWrite;
+
+        Buffer.isEncoding = original.BufferIsEncoding;
+        Buffer.byteLength = original.BufferByteLength;
+        Buffer.prototype.toString = original.BufferToString;
+        Buffer.prototype.write = original.BufferWrite;
+
+        if (iconv.supportsStreams) {
+            var Readable = __webpack_require__(23).Readable;
+
+            Readable.prototype.setEncoding = original.ReadableSetEncoding;
+            delete Readable.prototype.collect;
+        }
+
+        original = undefined;
+    }
+}
+
+
+/***/ }),
+/* 726 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+// Some environments don't have global Buffer (e.g. React Native).
+// Solution would be installing npm modules "buffer" and "stream" explicitly.
+var Buffer = __webpack_require__(15).Buffer;
+
+var bomHandling = __webpack_require__(724),
+    iconv = module.exports;
+
+// All codecs and aliases are kept here, keyed by encoding name/alias.
+// They are lazy loaded in `iconv.getCodec` from `encodings/index.js`.
+iconv.encodings = null;
+
+// Characters emitted in case of error.
+iconv.defaultCharUnicode = '�';
+iconv.defaultCharSingleByte = '?';
+
+// Public API.
+iconv.encode = function encode(str, encoding, options) {
+    str = "" + (str || ""); // Ensure string.
+
+    var encoder = iconv.getEncoder(encoding, options);
+
+    var res = encoder.write(str);
+    var trail = encoder.end();
+    
+    return (trail && trail.length > 0) ? Buffer.concat([res, trail]) : res;
+}
+
+iconv.decode = function decode(buf, encoding, options) {
+    if (typeof buf === 'string') {
+        if (!iconv.skipDecodeWarning) {
+            console.error('Iconv-lite warning: decode()-ing strings is deprecated. Refer to https://github.com/ashtuchkin/iconv-lite/wiki/Use-Buffers-when-decoding');
+            iconv.skipDecodeWarning = true;
+        }
+
+        buf = Buffer.from("" + (buf || ""), "binary"); // Ensure buffer.
+    }
+
+    var decoder = iconv.getDecoder(encoding, options);
+
+    var res = decoder.write(buf);
+    var trail = decoder.end();
+
+    return trail ? (res + trail) : res;
+}
+
+iconv.encodingExists = function encodingExists(enc) {
+    try {
+        iconv.getCodec(enc);
+        return true;
+    } catch (e) {
+        return false;
+    }
+}
+
+// Legacy aliases to convert functions
+iconv.toEncoding = iconv.encode;
+iconv.fromEncoding = iconv.decode;
+
+// Search for a codec in iconv.encodings. Cache codec data in iconv._codecDataCache.
+iconv._codecDataCache = {};
+iconv.getCodec = function getCodec(encoding) {
+    if (!iconv.encodings)
+        iconv.encodings = __webpack_require__(712); // Lazy load all encoding definitions.
+    
+    // Canonicalize encoding name: strip all non-alphanumeric chars and appended year.
+    var enc = iconv._canonicalizeEncoding(encoding);
+
+    // Traverse iconv.encodings to find actual codec.
+    var codecOptions = {};
+    while (true) {
+        var codec = iconv._codecDataCache[enc];
+        if (codec)
+            return codec;
+
+        var codecDef = iconv.encodings[enc];
+
+        switch (typeof codecDef) {
+            case "string": // Direct alias to other encoding.
+                enc = codecDef;
+                break;
+
+            case "object": // Alias with options. Can be layered.
+                for (var key in codecDef)
+                    codecOptions[key] = codecDef[key];
+
+                if (!codecOptions.encodingName)
+                    codecOptions.encodingName = enc;
+                
+                enc = codecDef.type;
+                break;
+
+            case "function": // Codec itself.
+                if (!codecOptions.encodingName)
+                    codecOptions.encodingName = enc;
+
+                // The codec function must load all tables and return object with .encoder and .decoder methods.
+                // It'll be called only once (for each different options object).
+                codec = new codecDef(codecOptions, iconv);
+
+                iconv._codecDataCache[codecOptions.encodingName] = codec; // Save it to be reused later.
+                return codec;
+
+            default:
+                throw new Error("Encoding not recognized: '" + encoding + "' (searched as: '"+enc+"')");
+        }
+    }
+}
+
+iconv._canonicalizeEncoding = function(encoding) {
+    // Canonicalize encoding name: strip all non-alphanumeric chars and appended year.
+    return (''+encoding).toLowerCase().replace(/:\d{4}$|[^0-9a-z]/g, "");
+}
+
+iconv.getEncoder = function getEncoder(encoding, options) {
+    var codec = iconv.getCodec(encoding),
+        encoder = new codec.encoder(options, codec);
+
+    if (codec.bomAware && options && options.addBOM)
+        encoder = new bomHandling.PrependBOM(encoder, options);
+
+    return encoder;
+}
+
+iconv.getDecoder = function getDecoder(encoding, options) {
+    var codec = iconv.getCodec(encoding),
+        decoder = new codec.decoder(options, codec);
+
+    if (codec.bomAware && !(options && options.stripBOM === false))
+        decoder = new bomHandling.StripBOM(decoder, options);
+
+    return decoder;
+}
+
+
+// Load extensions in Node. All of them are omitted in Browserify build via 'browser' field in package.json.
+var nodeVer = typeof process !== 'undefined' && process.versions && process.versions.node;
+if (nodeVer) {
+
+    // Load streaming support in Node v0.10+
+    var nodeVerArr = nodeVer.split(".").map(Number);
+    if (nodeVerArr[0] > 0 || nodeVerArr[1] >= 10) {
+        __webpack_require__(727)(iconv);
+    }
+
+    // Load Node primitive extensions.
+    __webpack_require__(725)(iconv);
+}
+
+if (false) {
+    console.error("iconv-lite warning: javascript files use encoding different from utf-8. See https://github.com/ashtuchkin/iconv-lite/wiki/Javascript-source-file-encodings for more info.");
+}
+
+
+/***/ }),
+/* 727 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var Buffer = __webpack_require__(64).Buffer,
+    Transform = __webpack_require__(23).Transform;
+
+
+// == Exports ==================================================================
+module.exports = function(iconv) {
+    
+    // Additional Public API.
+    iconv.encodeStream = function encodeStream(encoding, options) {
+        return new IconvLiteEncoderStream(iconv.getEncoder(encoding, options), options);
+    }
+
+    iconv.decodeStream = function decodeStream(encoding, options) {
+        return new IconvLiteDecoderStream(iconv.getDecoder(encoding, options), options);
+    }
+
+    iconv.supportsStreams = true;
+
+
+    // Not published yet.
+    iconv.IconvLiteEncoderStream = IconvLiteEncoderStream;
+    iconv.IconvLiteDecoderStream = IconvLiteDecoderStream;
+    iconv._collect = IconvLiteDecoderStream.prototype.collect;
+};
+
+
+// == Encoder stream =======================================================
+function IconvLiteEncoderStream(conv, options) {
+    this.conv = conv;
+    options = options || {};
+    options.decodeStrings = false; // We accept only strings, so we don't need to decode them.
+    Transform.call(this, options);
+}
+
+IconvLiteEncoderStream.prototype = Object.create(Transform.prototype, {
+    constructor: { value: IconvLiteEncoderStream }
+});
+
+IconvLiteEncoderStream.prototype._transform = function(chunk, encoding, done) {
+    if (typeof chunk != 'string')
+        return done(new Error("Iconv encoding stream needs strings as its input."));
+    try {
+        var res = this.conv.write(chunk);
+        if (res && res.length) this.push(res);
+        done();
+    }
+    catch (e) {
+        done(e);
+    }
+}
+
+IconvLiteEncoderStream.prototype._flush = function(done) {
+    try {
+        var res = this.conv.end();
+        if (res && res.length) this.push(res);
+        done();
+    }
+    catch (e) {
+        done(e);
+    }
+}
+
+IconvLiteEncoderStream.prototype.collect = function(cb) {
+    var chunks = [];
+    this.on('error', cb);
+    this.on('data', function(chunk) { chunks.push(chunk); });
+    this.on('end', function() {
+        cb(null, Buffer.concat(chunks));
+    });
+    return this;
+}
+
+
+// == Decoder stream =======================================================
+function IconvLiteDecoderStream(conv, options) {
+    this.conv = conv;
+    options = options || {};
+    options.encoding = this.encoding = 'utf8'; // We output strings.
+    Transform.call(this, options);
+}
+
+IconvLiteDecoderStream.prototype = Object.create(Transform.prototype, {
+    constructor: { value: IconvLiteDecoderStream }
+});
+
+IconvLiteDecoderStream.prototype._transform = function(chunk, encoding, done) {
+    if (!Buffer.isBuffer(chunk))
+        return done(new Error("Iconv decoding stream needs buffers as its input."));
+    try {
+        var res = this.conv.write(chunk);
+        if (res && res.length) this.push(res, this.encoding);
+        done();
+    }
+    catch (e) {
+        done(e);
+    }
+}
+
+IconvLiteDecoderStream.prototype._flush = function(done) {
+    try {
+        var res = this.conv.end();
+        if (res && res.length) this.push(res, this.encoding);                
+        done();
+    }
+    catch (e) {
+        done(e);
+    }
+}
+
+IconvLiteDecoderStream.prototype.collect = function(cb) {
+    var res = '';
+    this.on('error', cb);
+    this.on('data', function(chunk) { res += chunk; });
+    this.on('end', function() {
+        cb(null, res);
+    });
+    return this;
+}
+
+
+
+/***/ }),
+/* 728 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+const stripAnsi = __webpack_require__(329);
+const isFullwidthCodePoint = __webpack_require__(736);
+
+module.exports = str => {
+	if (typeof str !== 'string' || str.length === 0) {
+		return 0;
+	}
+
+	str = stripAnsi(str);
+
+	let width = 0;
+
+	for (let i = 0; i < str.length; i++) {
+		const code = str.codePointAt(i);
+
+		// Ignore control characters
+		if (code <= 0x1F || (code >= 0x7F && code <= 0x9F)) {
+			continue;
+		}
+
+		// Ignore combining characters
+		if (code >= 0x300 && code <= 0x36F) {
+			continue;
+		}
+
+		// Surrogates
+		if (code > 0xFFFF) {
+			i++;
+		}
+
+		width += isFullwidthCodePoint(code) ? 2 : 1;
+	}
+
+	return width;
+};
+
+
+/***/ }),
+/* 729 */
+/***/ (function(module, exports) {
+
+/*!
+ * Determine if an object is a Buffer
+ *
+ * @author   Feross Aboukhadijeh <https://feross.org>
+ * @license  MIT
+ */
+
+// The _isBuffer check is for Safari 5-7 support, because it's missing
+// Object.prototype.constructor. Remove this eventually
+module.exports = function (obj) {
+  return obj != null && (isBuffer(obj) || isSlowBuffer(obj) || !!obj._isBuffer)
+}
+
+function isBuffer (obj) {
+  return !!obj.constructor && typeof obj.constructor.isBuffer === 'function' && obj.constructor.isBuffer(obj)
+}
+
+// For Node v0.10 support. Remove this eventually.
+function isSlowBuffer (obj) {
+  return typeof obj.readFloatLE === 'function' && typeof obj.slice === 'function' && isBuffer(obj.slice(0, 0))
+}
+
+
+/***/ }),
+/* 730 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+const builtinModules = __webpack_require__(731);
+
+const moduleSet = new Set(builtinModules);
+
+module.exports = moduleName => {
+	if (typeof moduleName !== 'string') {
+		throw new TypeError('Expected a string');
+	}
+
+	return moduleSet.has(moduleName);
+};
+
+
+/***/ }),
+/* 731 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+const blacklist = [
+	'freelist',
+	'sys'
+];
+
+module.exports = Object.keys(process.binding('natives'))
+	.filter(x => !/^_|^internal|\//.test(x) && blacklist.indexOf(x) === -1)
+	.sort();
+
+
+/***/ }),
+/* 732 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+module.exports = function (buf) {
+  if (!buf || buf.length < 2) return false
+  return buf[0] === 0x78 && (buf[1] === 1 || buf[1] === 0x9c || buf[1] === 0xda)
+}
+
+
+/***/ }),
+/* 733 */
+/***/ (function(module, exports) {
+
+/*!
+ * is-dotfile <https://github.com/jonschlinkert/is-dotfile>
+ *
+ * Copyright (c) 2015-2017, Jon Schlinkert.
+ * Released under the MIT License.
+ */
+
+module.exports = function(str) {
+  if (str.charCodeAt(0) === 46 /* . */ && str.indexOf('/', 1) === -1) {
+    return true;
+  }
+  var slash = str.lastIndexOf('/');
+  return slash !== -1 ? str.charCodeAt(slash + 1) === 46  /* . */ : false;
+};
+
+
+/***/ }),
+/* 734 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*!
+ * is-equal-shallow <https://github.com/jonschlinkert/is-equal-shallow>
+ *
+ * Copyright (c) 2015, Jon Schlinkert.
+ * Licensed under the MIT License.
+ */
+
+
+
+var isPrimitive = __webpack_require__(740);
+
+module.exports = function isEqual(a, b) {
+  if (!a && !b) { return true; }
+  if (!a && b || a && !b) { return false; }
+
+  var numKeysA = 0, numKeysB = 0, key;
+  for (key in b) {
+    numKeysB++;
+    if (!isPrimitive(b[key]) || !a.hasOwnProperty(key) || (a[key] !== b[key])) {
+      return false;
+    }
+  }
+  for (key in a) {
+    numKeysA++;
+  }
+  return numKeysA === numKeysB;
+};
+
+
+/***/ }),
+/* 735 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*!
+ * is-extendable <https://github.com/jonschlinkert/is-extendable>
+ *
+ * Copyright (c) 2015, Jon Schlinkert.
+ * Licensed under the MIT License.
+ */
+
+
+
+module.exports = function isExtendable(val) {
+  return typeof val !== 'undefined' && val !== null
+    && (typeof val === 'object' || typeof val === 'function');
+};
+
+
+/***/ }),
+/* 736 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/* eslint-disable yoda */
+module.exports = x => {
+	if (Number.isNaN(x)) {
+		return false;
+	}
+
+	// code points are derived from:
+	// http://www.unix.org/Public/UNIDATA/EastAsianWidth.txt
+	if (
+		x >= 0x1100 && (
+			x <= 0x115f ||  // Hangul Jamo
+			x === 0x2329 || // LEFT-POINTING ANGLE BRACKET
+			x === 0x232a || // RIGHT-POINTING ANGLE BRACKET
+			// CJK Radicals Supplement .. Enclosed CJK Letters and Months
+			(0x2e80 <= x && x <= 0x3247 && x !== 0x303f) ||
+			// Enclosed CJK Letters and Months .. CJK Unified Ideographs Extension A
+			(0x3250 <= x && x <= 0x4dbf) ||
+			// CJK Unified Ideographs .. Yi Radicals
+			(0x4e00 <= x && x <= 0xa4c6) ||
+			// Hangul Jamo Extended-A
+			(0xa960 <= x && x <= 0xa97c) ||
+			// Hangul Syllables
+			(0xac00 <= x && x <= 0xd7a3) ||
+			// CJK Compatibility Ideographs
+			(0xf900 <= x && x <= 0xfaff) ||
+			// Vertical Forms
+			(0xfe10 <= x && x <= 0xfe19) ||
+			// CJK Compatibility Forms .. Small Form Variants
+			(0xfe30 <= x && x <= 0xfe6b) ||
+			// Halfwidth and Fullwidth Forms
+			(0xff01 <= x && x <= 0xff60) ||
+			(0xffe0 <= x && x <= 0xffe6) ||
+			// Kana Supplement
+			(0x1b000 <= x && x <= 0x1b001) ||
+			// Enclosed Ideographic Supplement
+			(0x1f200 <= x && x <= 0x1f251) ||
+			// CJK Unified Ideographs Extension B .. Tertiary Ideographic Plane
+			(0x20000 <= x && x <= 0x3fffd)
+		)
+	) {
+		return true;
+	}
+
+	return false;
+};
+
+
+/***/ }),
+/* 737 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+/**
+ * Check if a Buffer/Uint8Array is a GZIP file
+ *
+ * @param {Buffer} buf
+ * @api public
+ */
+
+module.exports = function (buf) {
+    if (!buf || buf.length < 3) {
+        return false;
+    }
+
+    return buf[0] === 31 && buf[1] === 139 && buf[2] === 8;
+};
+
+
+/***/ }),
+/* 738 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var toString = Object.prototype.toString;
+
+module.exports = function (x) {
+	var prototype;
+	return toString.call(x) === '[object Object]' && (prototype = Object.getPrototypeOf(x), prototype === null || prototype === Object.getPrototypeOf({}));
+};
+
+
+/***/ }),
+/* 739 */
+/***/ (function(module, exports) {
+
+/*!
+ * is-posix-bracket <https://github.com/jonschlinkert/is-posix-bracket>
+ *
+ * Copyright (c) 2015-2016, Jon Schlinkert.
+ * Licensed under the MIT License.
+ */
+
+module.exports = function isPosixBracket(str) {
+  return typeof str === 'string' && /\[([:.=+])(?:[^\[\]]|)+\1\]/.test(str);
+};
+
+
+/***/ }),
+/* 740 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*!
+ * is-primitive <https://github.com/jonschlinkert/is-primitive>
+ *
+ * Copyright (c) 2014-2015, Jon Schlinkert.
+ * Licensed under the MIT License.
+ */
+
+
+
+// see http://jsperf.com/testing-value-is-primitive/7
+module.exports = function isPrimitive(value) {
+  return value == null || (typeof value !== 'function' && typeof value !== 'object');
+};
+
+
+/***/ }),
+/* 741 */
+/***/ (function(module, exports) {
+
+module.exports = isPromise;
+
+function isPromise(obj) {
+  return !!obj && (typeof obj === 'object' || typeof obj === 'function') && typeof obj.then === 'function';
+}
+
+
+/***/ }),
+/* 742 */
+/***/ (function(module, exports) {
+
+module.exports      = isTypedArray
+isTypedArray.strict = isStrictTypedArray
+isTypedArray.loose  = isLooseTypedArray
+
+var toString = Object.prototype.toString
+var names = {
+    '[object Int8Array]': true
+  , '[object Int16Array]': true
+  , '[object Int32Array]': true
+  , '[object Uint8Array]': true
+  , '[object Uint8ClampedArray]': true
+  , '[object Uint16Array]': true
+  , '[object Uint32Array]': true
+  , '[object Float32Array]': true
+  , '[object Float64Array]': true
+}
+
+function isTypedArray(arr) {
+  return (
+       isStrictTypedArray(arr)
+    || isLooseTypedArray(arr)
+  )
+}
+
+function isStrictTypedArray(arr) {
+  return (
+       arr instanceof Int8Array
+    || arr instanceof Int16Array
+    || arr instanceof Int32Array
+    || arr instanceof Uint8Array
+    || arr instanceof Uint8ClampedArray
+    || arr instanceof Uint16Array
+    || arr instanceof Uint32Array
+    || arr instanceof Float32Array
+    || arr instanceof Float64Array
+  )
+}
+
+function isLooseTypedArray(arr) {
+  return names[toString.call(arr)]
+}
+
+
+/***/ }),
+/* 743 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
+ * is-windows <https://github.com/jonschlinkert/is-windows>
+ *
+ * Copyright © 2015-2018, Jon Schlinkert.
+ * Released under the MIT License.
+ */
+
+(function(factory) {
+  if (exports && typeof exports === 'object' && typeof module !== 'undefined') {
+    module.exports = factory();
+  } else if (true) {
+    !(__WEBPACK_AMD_DEFINE_ARRAY__ = [], __WEBPACK_AMD_DEFINE_FACTORY__ = (factory),
+				__WEBPACK_AMD_DEFINE_RESULT__ = (typeof __WEBPACK_AMD_DEFINE_FACTORY__ === 'function' ?
+				(__WEBPACK_AMD_DEFINE_FACTORY__.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__)) : __WEBPACK_AMD_DEFINE_FACTORY__),
+				__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__));
+  } else if (typeof window !== 'undefined') {
+    window.isWindows = factory();
+  } else if (typeof global !== 'undefined') {
+    global.isWindows = factory();
+  } else if (typeof self !== 'undefined') {
+    self.isWindows = factory();
+  } else {
+    this.isWindows = factory();
+  }
+})(function() {
+  'use strict';
+  return function isWindows() {
+    return process && (process.platform === 'win32' || /^(msys|cygwin)$/.test(process.env.OSTYPE));
+  };
+});
+
+
+/***/ }),
+/* 744 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/**
+ * JSONSchema Validator - Validates JavaScript objects using JSON Schemas
+ *	(http://www.json.com/json-schema-proposal/)
+ *
+ * Copyright (c) 2007 Kris Zyp SitePen (www.sitepen.com)
+ * Licensed under the MIT (MIT-LICENSE.txt) license.
+To use the validator call the validate function with an instance object and an optional schema object.
+If a schema is provided, it will be used to validate. If the instance object refers to a schema (self-validating),
+that schema will be used to validate and the schema parameter is not necessary (if both exist,
+both validations will occur).
+The validate method will return an array of validation errors. If there are no errors, then an
+empty list will be returned. A validation error will have two properties:
+"property" which indicates which property had the error
+"message" which indicates what the error was
+ */
+(function (root, factory) {
+    if (true) {
+        // AMD. Register as an anonymous module.
+        !(__WEBPACK_AMD_DEFINE_ARRAY__ = [], __WEBPACK_AMD_DEFINE_RESULT__ = function () {
+            return factory();
+        }.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__),
+				__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__));
+    } else if (typeof module === 'object' && module.exports) {
+        // Node. Does not work with strict CommonJS, but
+        // only CommonJS-like environments that support module.exports,
+        // like Node.
+        module.exports = factory();
+    } else {
+        // Browser globals
+        root.jsonSchema = factory();
+    }
+}(this, function () {// setup primitive classes to be JSON Schema types
+var exports = validate
+exports.Integer = {type:"integer"};
+var primitiveConstructors = {
+	String: String,
+	Boolean: Boolean,
+	Number: Number,
+	Object: Object,
+	Array: Array,
+	Date: Date
+}
+exports.validate = validate;
+function validate(/*Any*/instance,/*Object*/schema) {
+		// Summary:
+		//  	To use the validator call JSONSchema.validate with an instance object and an optional schema object.
+		// 		If a schema is provided, it will be used to validate. If the instance object refers to a schema (self-validating),
+		// 		that schema will be used to validate and the schema parameter is not necessary (if both exist,
+		// 		both validations will occur).
+		// 		The validate method will return an object with two properties:
+		// 			valid: A boolean indicating if the instance is valid by the schema
+		// 			errors: An array of validation errors. If there are no errors, then an
+		// 					empty list will be returned. A validation error will have two properties:
+		// 						property: which indicates which property had the error
+		// 						message: which indicates what the error was
+		//
+		return validate(instance, schema, {changing: false});//, coerce: false, existingOnly: false});
+	};
+exports.checkPropertyChange = function(/*Any*/value,/*Object*/schema, /*String*/property) {
+		// Summary:
+		// 		The checkPropertyChange method will check to see if an value can legally be in property with the given schema
+		// 		This is slightly different than the validate method in that it will fail if the schema is readonly and it will
+		// 		not check for self-validation, it is assumed that the passed in value is already internally valid.
+		// 		The checkPropertyChange method will return the same object type as validate, see JSONSchema.validate for
+		// 		information.
+		//
+		return validate(value, schema, {changing: property || "property"});
+	};
+var validate = exports._validate = function(/*Any*/instance,/*Object*/schema,/*Object*/options) {
+
+	if (!options) options = {};
+	var _changing = options.changing;
+
+	function getType(schema){
+		return schema.type || (primitiveConstructors[schema.name] == schema && schema.name.toLowerCase());
+	}
+	var errors = [];
+	// validate a value against a property definition
+	function checkProp(value, schema, path,i){
+
+		var l;
+		path += path ? typeof i == 'number' ? '[' + i + ']' : typeof i == 'undefined' ? '' : '.' + i : i;
+		function addError(message){
+			errors.push({property:path,message:message});
+		}
+
+		if((typeof schema != 'object' || schema instanceof Array) && (path || typeof schema != 'function') && !(schema && getType(schema))){
+			if(typeof schema == 'function'){
+				if(!(value instanceof schema)){
+					addError("is not an instance of the class/constructor " + schema.name);
+				}
+			}else if(schema){
+				addError("Invalid schema/property definition " + schema);
+			}
+			return null;
+		}
+		if(_changing && schema.readonly){
+			addError("is a readonly field, it can not be changed");
+		}
+		if(schema['extends']){ // if it extends another schema, it must pass that schema as well
+			checkProp(value,schema['extends'],path,i);
+		}
+		// validate a value against a type definition
+		function checkType(type,value){
+			if(type){
+				if(typeof type == 'string' && type != 'any' &&
+						(type == 'null' ? value !== null : typeof value != type) &&
+						!(value instanceof Array && type == 'array') &&
+						!(value instanceof Date && type == 'date') &&
+						!(type == 'integer' && value%1===0)){
+					return [{property:path,message:(typeof value) + " value found, but a " + type + " is required"}];
+				}
+				if(type instanceof Array){
+					var unionErrors=[];
+					for(var j = 0; j < type.length; j++){ // a union type
+						if(!(unionErrors=checkType(type[j],value)).length){
+							break;
+						}
+					}
+					if(unionErrors.length){
+						return unionErrors;
+					}
+				}else if(typeof type == 'object'){
+					var priorErrors = errors;
+					errors = [];
+					checkProp(value,type,path);
+					var theseErrors = errors;
+					errors = priorErrors;
+					return theseErrors;
+				}
+			}
+			return [];
+		}
+		if(value === undefined){
+			if(schema.required){
+				addError("is missing and it is required");
+			}
+		}else{
+			errors = errors.concat(checkType(getType(schema),value));
+			if(schema.disallow && !checkType(schema.disallow,value).length){
+				addError(" disallowed value was matched");
+			}
+			if(value !== null){
+				if(value instanceof Array){
+					if(schema.items){
+						var itemsIsArray = schema.items instanceof Array;
+						var propDef = schema.items;
+						for (i = 0, l = value.length; i < l; i += 1) {
+							if (itemsIsArray)
+								propDef = schema.items[i];
+							if (options.coerce)
+								value[i] = options.coerce(value[i], propDef);
+							errors.concat(checkProp(value[i],propDef,path,i));
+						}
+					}
+					if(schema.minItems && value.length < schema.minItems){
+						addError("There must be a minimum of " + schema.minItems + " in the array");
+					}
+					if(schema.maxItems && value.length > schema.maxItems){
+						addError("There must be a maximum of " + schema.maxItems + " in the array");
+					}
+				}else if(schema.properties || schema.additionalProperties){
+					errors.concat(checkObj(value, schema.properties, path, schema.additionalProperties));
+				}
+				if(schema.pattern && typeof value == 'string' && !value.match(schema.pattern)){
+					addError("does not match the regex pattern " + schema.pattern);
+				}
+				if(schema.maxLength && typeof value == 'string' && value.length > schema.maxLength){
+					addError("may only be " + schema.maxLength + " characters long");
+				}
+				if(schema.minLength && typeof value == 'string' && value.length < schema.minLength){
+					addError("must be at least " + schema.minLength + " characters long");
+				}
+				if(typeof schema.minimum !== undefined && typeof value == typeof schema.minimum &&
+						schema.minimum > value){
+					addError("must have a minimum value of " + schema.minimum);
+				}
+				if(typeof schema.maximum !== undefined && typeof value == typeof schema.maximum &&
+						schema.maximum < value){
+					addError("must have a maximum value of " + schema.maximum);
+				}
+				if(schema['enum']){
+					var enumer = schema['enum'];
+					l = enumer.length;
+					var found;
+					for(var j = 0; j < l; j++){
+						if(enumer[j]===value){
+							found=1;
+							break;
+						}
+					}
+					if(!found){
+						addError("does not have a value in the enumeration " + enumer.join(", "));
+					}
+				}
+				if(typeof schema.maxDecimal == 'number' &&
+					(value.toString().match(new RegExp("\\.[0-9]{" + (schema.maxDecimal + 1) + ",}")))){
+					addError("may only have " + schema.maxDecimal + " digits of decimal places");
+				}
+			}
+		}
+		return null;
+	}
+	// validate an object against a schema
+	function checkObj(instance,objTypeDef,path,additionalProp){
+
+		if(typeof objTypeDef =='object'){
+			if(typeof instance != 'object' || instance instanceof Array){
+				errors.push({property:path,message:"an object is required"});
+			}
+			
+			for(var i in objTypeDef){ 
+				if(objTypeDef.hasOwnProperty(i)){
+					var value = instance[i];
+					// skip _not_ specified properties
+					if (value === undefined && options.existingOnly) continue;
+					var propDef = objTypeDef[i];
+					// set default
+					if(value === undefined && propDef["default"]){
+						value = instance[i] = propDef["default"];
+					}
+					if(options.coerce && i in instance){
+						value = instance[i] = options.coerce(value, propDef);
+					}
+					checkProp(value,propDef,path,i);
+				}
+			}
+		}
+		for(i in instance){
+			if(instance.hasOwnProperty(i) && !(i.charAt(0) == '_' && i.charAt(1) == '_') && objTypeDef && !objTypeDef[i] && additionalProp===false){
+				if (options.filter) {
+					delete instance[i];
+					continue;
+				} else {
+					errors.push({property:path,message:(typeof value) + "The property " + i +
+						" is not defined in the schema and the schema does not allow additional properties"});
+				}
+			}
+			var requires = objTypeDef && objTypeDef[i] && objTypeDef[i].requires;
+			if(requires && !(requires in instance)){
+				errors.push({property:path,message:"the presence of the property " + i + " requires that " + requires + " also be present"});
+			}
+			value = instance[i];
+			if(additionalProp && (!(objTypeDef && typeof objTypeDef == 'object') || !(i in objTypeDef))){
+				if(options.coerce){
+					value = instance[i] = options.coerce(value, additionalProp);
+				}
+				checkProp(value,additionalProp,path,i);
+			}
+			if(!_changing && value && value.$schema){
+				errors = errors.concat(checkProp(value,value.$schema,path,i));
+			}
+		}
+		return errors;
+	}
+	if(schema){
+		checkProp(instance,schema,'',_changing || '');
+	}
+	if(!_changing && instance && instance.$schema){
+		checkProp(instance,instance.$schema,'','');
+	}
+	return {valid:!errors.length,errors:errors};
+};
+exports.mustBeValid = function(result){
+	//	summary:
+	//		This checks to ensure that the result is valid and will throw an appropriate error message if it is not
+	// result: the result returned from checkPropertyChange or validate
+	if(!result.valid){
+		throw new TypeError(result.errors.map(function(error){return "for property " + error.property + ': ' + error.message;}).join(", \n"));
+	}
+}
+
+return exports;
+}));
+
+
+/***/ }),
+/* 745 */
+/***/ (function(module, exports) {
+
+exports = module.exports = stringify
+exports.getSerialize = serializer
+
+function stringify(obj, replacer, spaces, cycleReplacer) {
+  return JSON.stringify(obj, serializer(replacer, cycleReplacer), spaces)
+}
+
+function serializer(replacer, cycleReplacer) {
+  var stack = [], keys = []
+
+  if (cycleReplacer == null) cycleReplacer = function(key, value) {
+    if (stack[0] === value) return "[Circular ~]"
+    return "[Circular ~." + keys.slice(0, stack.indexOf(value)).join(".") + "]"
+  }
+
+  return function(key, value) {
+    if (stack.length > 0) {
+      var thisPos = stack.indexOf(this)
+      ~thisPos ? stack.splice(thisPos + 1) : stack.push(this)
+      ~thisPos ? keys.splice(thisPos, Infinity, key) : keys.push(key)
+      if (~stack.indexOf(value)) value = cycleReplacer.call(this, key, value)
+    }
+    else stack.push(value)
+
+    return replacer == null ? value : replacer.call(this, key, value)
+  }
+}
+
+
+/***/ }),
+/* 746 */
+/***/ (function(module, exports, __webpack_require__) {
+
+/*
+ * lib/jsprim.js: utilities for primitive JavaScript types
+ */
+
+var mod_assert = __webpack_require__(16);
+var mod_util = __webpack_require__(3);
+
+var mod_extsprintf = __webpack_require__(645);
+var mod_verror = __webpack_require__(960);
+var mod_jsonschema = __webpack_require__(744);
+
+/*
+ * Public interface
+ */
+exports.deepCopy = deepCopy;
+exports.deepEqual = deepEqual;
+exports.isEmpty = isEmpty;
+exports.hasKey = hasKey;
+exports.forEachKey = forEachKey;
+exports.pluck = pluck;
+exports.flattenObject = flattenObject;
+exports.flattenIter = flattenIter;
+exports.validateJsonObject = validateJsonObjectJS;
+exports.validateJsonObjectJS = validateJsonObjectJS;
+exports.randElt = randElt;
+exports.extraProperties = extraProperties;
+exports.mergeObjects = mergeObjects;
+
+exports.startsWith = startsWith;
+exports.endsWith = endsWith;
+
+exports.parseInteger = parseInteger;
+
+exports.iso8601 = iso8601;
+exports.rfc1123 = rfc1123;
+exports.parseDateTime = parseDateTime;
+
+exports.hrtimediff = hrtimeDiff;
+exports.hrtimeDiff = hrtimeDiff;
+exports.hrtimeAccum = hrtimeAccum;
+exports.hrtimeAdd = hrtimeAdd;
+exports.hrtimeNanosec = hrtimeNanosec;
+exports.hrtimeMicrosec = hrtimeMicrosec;
+exports.hrtimeMillisec = hrtimeMillisec;
+
+
+/*
+ * Deep copy an acyclic *basic* Javascript object.  This only handles basic
+ * scalars (strings, numbers, booleans) and arbitrarily deep arrays and objects
+ * containing these.  This does *not* handle instances of other classes.
+ */
+function deepCopy(obj)
+{
+	var ret, key;
+	var marker = '__deepCopy';
+
+	if (obj && obj[marker])
+		throw (new Error('attempted deep copy of cyclic object'));
+
+	if (obj && obj.constructor == Object) {
+		ret = {};
+		obj[marker] = true;
+
+		for (key in obj) {
+			if (key == marker)
+				continue;
+
+			ret[key] = deepCopy(obj[key]);
+		}
+
+		delete (obj[marker]);
+		return (ret);
+	}
+
+	if (obj && obj.constructor == Array) {
+		ret = [];
+		obj[marker] = true;
+
+		for (key = 0; key < obj.length; key++)
+			ret.push(deepCopy(obj[key]));
+
+		delete (obj[marker]);
+		return (ret);
+	}
+
+	/*
+	 * It must be a primitive type -- just return it.
+	 */
+	return (obj);
+}
+
+function deepEqual(obj1, obj2)
+{
+	if (typeof (obj1) != typeof (obj2))
+		return (false);
+
+	if (obj1 === null || obj2 === null || typeof (obj1) != 'object')
+		return (obj1 === obj2);
+
+	if (obj1.constructor != obj2.constructor)
+		return (false);
+
+	var k;
+	for (k in obj1) {
+		if (!obj2.hasOwnProperty(k))
+			return (false);
+
+		if (!deepEqual(obj1[k], obj2[k]))
+			return (false);
+	}
+
+	for (k in obj2) {
+		if (!obj1.hasOwnProperty(k))
+			return (false);
+	}
+
+	return (true);
+}
+
+function isEmpty(obj)
+{
+	var key;
+	for (key in obj)
+		return (false);
+	return (true);
+}
+
+function hasKey(obj, key)
+{
+	mod_assert.equal(typeof (key), 'string');
+	return (Object.prototype.hasOwnProperty.call(obj, key));
+}
+
+function forEachKey(obj, callback)
+{
+	for (var key in obj) {
+		if (hasKey(obj, key)) {
+			callback(key, obj[key]);
+		}
+	}
+}
+
+function pluck(obj, key)
+{
+	mod_assert.equal(typeof (key), 'string');
+	return (pluckv(obj, key));
+}
+
+function pluckv(obj, key)
+{
+	if (obj === null || typeof (obj) !== 'object')
+		return (undefined);
+
+	if (obj.hasOwnProperty(key))
+		return (obj[key]);
+
+	var i = key.indexOf('.');
+	if (i == -1)
+		return (undefined);
+
+	var key1 = key.substr(0, i);
+	if (!obj.hasOwnProperty(key1))
+		return (undefined);
+
+	return (pluckv(obj[key1], key.substr(i + 1)));
+}
+
+/*
+ * Invoke callback(row) for each entry in the array that would be returned by
+ * flattenObject(data, depth).  This is just like flattenObject(data,
+ * depth).forEach(callback), except that the intermediate array is never
+ * created.
+ */
+function flattenIter(data, depth, callback)
+{
+	doFlattenIter(data, depth, [], callback);
+}
+
+function doFlattenIter(data, depth, accum, callback)
+{
+	var each;
+	var key;
+
+	if (depth === 0) {
+		each = accum.slice(0);
+		each.push(data);
+		callback(each);
+		return;
+	}
+
+	mod_assert.ok(data !== null);
+	mod_assert.equal(typeof (data), 'object');
+	mod_assert.equal(typeof (depth), 'number');
+	mod_assert.ok(depth >= 0);
+
+	for (key in data) {
+		each = accum.slice(0);
+		each.push(key);
+		doFlattenIter(data[key], depth - 1, each, callback);
+	}
+}
+
+function flattenObject(data, depth)
+{
+	if (depth === 0)
+		return ([ data ]);
+
+	mod_assert.ok(data !== null);
+	mod_assert.equal(typeof (data), 'object');
+	mod_assert.equal(typeof (depth), 'number');
+	mod_assert.ok(depth >= 0);
+
+	var rv = [];
+	var key;
+
+	for (key in data) {
+		flattenObject(data[key], depth - 1).forEach(function (p) {
+			rv.push([ key ].concat(p));
+		});
+	}
+
+	return (rv);
+}
+
+function startsWith(str, prefix)
+{
+	return (str.substr(0, prefix.length) == prefix);
+}
+
+function endsWith(str, suffix)
+{
+	return (str.substr(
+	    str.length - suffix.length, suffix.length) == suffix);
+}
+
+function iso8601(d)
+{
+	if (typeof (d) == 'number')
+		d = new Date(d);
+	mod_assert.ok(d.constructor === Date);
+	return (mod_extsprintf.sprintf('%4d-%02d-%02dT%02d:%02d:%02d.%03dZ',
+	    d.getUTCFullYear(), d.getUTCMonth() + 1, d.getUTCDate(),
+	    d.getUTCHours(), d.getUTCMinutes(), d.getUTCSeconds(),
+	    d.getUTCMilliseconds()));
+}
+
+var RFC1123_MONTHS = [
+    'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
+    'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
+var RFC1123_DAYS = [
+    'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
+
+function rfc1123(date) {
+	return (mod_extsprintf.sprintf('%s, %02d %s %04d %02d:%02d:%02d GMT',
+	    RFC1123_DAYS[date.getUTCDay()], date.getUTCDate(),
+	    RFC1123_MONTHS[date.getUTCMonth()], date.getUTCFullYear(),
+	    date.getUTCHours(), date.getUTCMinutes(),
+	    date.getUTCSeconds()));
+}
+
+/*
+ * Parses a date expressed as a string, as either a number of milliseconds since
+ * the epoch or any string format that Date accepts, giving preference to the
+ * former where these two sets overlap (e.g., small numbers).
+ */
+function parseDateTime(str)
+{
+	/*
+	 * This is irritatingly implicit, but significantly more concise than
+	 * alternatives.  The "+str" will convert a string containing only a
+	 * number directly to a Number, or NaN for other strings.  Thus, if the
+	 * conversion succeeds, we use it (this is the milliseconds-since-epoch
+	 * case).  Otherwise, we pass the string directly to the Date
+	 * constructor to parse.
+	 */
+	var numeric = +str;
+	if (!isNaN(numeric)) {
+		return (new Date(numeric));
+	} else {
+		return (new Date(str));
+	}
+}
+
+
+/*
+ * Number.*_SAFE_INTEGER isn't present before node v0.12, so we hardcode
+ * the ES6 definitions here, while allowing for them to someday be higher.
+ */
+var MAX_SAFE_INTEGER = Number.MAX_SAFE_INTEGER || 9007199254740991;
+var MIN_SAFE_INTEGER = Number.MIN_SAFE_INTEGER || -9007199254740991;
+
+
+/*
+ * Default options for parseInteger().
+ */
+var PI_DEFAULTS = {
+	base: 10,
+	allowSign: true,
+	allowPrefix: false,
+	allowTrailing: false,
+	allowImprecise: false,
+	trimWhitespace: false,
+	leadingZeroIsOctal: false
+};
+
+var CP_0 = 0x30;
+var CP_9 = 0x39;
+
+var CP_A = 0x41;
+var CP_B = 0x42;
+var CP_O = 0x4f;
+var CP_T = 0x54;
+var CP_X = 0x58;
+var CP_Z = 0x5a;
+
+var CP_a = 0x61;
+var CP_b = 0x62;
+var CP_o = 0x6f;
+var CP_t = 0x74;
+var CP_x = 0x78;
+var CP_z = 0x7a;
+
+var PI_CONV_DEC = 0x30;
+var PI_CONV_UC = 0x37;
+var PI_CONV_LC = 0x57;
+
+
+/*
+ * A stricter version of parseInt() that provides options for changing what
+ * is an acceptable string (for example, disallowing trailing characters).
+ */
+function parseInteger(str, uopts)
+{
+	mod_assert.string(str, 'str');
+	mod_assert.optionalObject(uopts, 'options');
+
+	var baseOverride = false;
+	var options = PI_DEFAULTS;
+
+	if (uopts) {
+		baseOverride = hasKey(uopts, 'base');
+		options = mergeObjects(options, uopts);
+		mod_assert.number(options.base, 'options.base');
+		mod_assert.ok(options.base >= 2, 'options.base >= 2');
+		mod_assert.ok(options.base <= 36, 'options.base <= 36');
+		mod_assert.bool(options.allowSign, 'options.allowSign');
+		mod_assert.bool(options.allowPrefix, 'options.allowPrefix');
+		mod_assert.bool(options.allowTrailing,
+		    'options.allowTrailing');
+		mod_assert.bool(options.allowImprecise,
+		    'options.allowImprecise');
+		mod_assert.bool(options.trimWhitespace,
+		    'options.trimWhitespace');
+		mod_assert.bool(options.leadingZeroIsOctal,
+		    'options.leadingZeroIsOctal');
+
+		if (options.leadingZeroIsOctal) {
+			mod_assert.ok(!baseOverride,
+			    '"base" and "leadingZeroIsOctal" are ' +
+			    'mutually exclusive');
+		}
+	}
+
+	var c;
+	var pbase = -1;
+	var base = options.base;
+	var start;
+	var mult = 1;
+	var value = 0;
+	var idx = 0;
+	var len = str.length;
+
+	/* Trim any whitespace on the left side. */
+	if (options.trimWhitespace) {
+		while (idx < len && isSpace(str.charCodeAt(idx))) {
+			++idx;
+		}
+	}
+
+	/* Check the number for a leading sign. */
+	if (options.allowSign) {
+		if (str[idx] === '-') {
+			idx += 1;
+			mult = -1;
+		} else if (str[idx] === '+') {
+			idx += 1;
+		}
+	}
+
+	/* Parse the base-indicating prefix if there is one. */
+	if (str[idx] === '0') {
+		if (options.allowPrefix) {
+			pbase = prefixToBase(str.charCodeAt(idx + 1));
+			if (pbase !== -1 && (!baseOverride || pbase === base)) {
+				base = pbase;
+				idx += 2;
+			}
+		}
+
+		if (pbase === -1 && options.leadingZeroIsOctal) {
+			base = 8;
+		}
+	}
+
+	/* Parse the actual digits. */
+	for (start = idx; idx < len; ++idx) {
+		c = translateDigit(str.charCodeAt(idx));
+		if (c !== -1 && c < base) {
+			value *= base;
+			value += c;
+		} else {
+			break;
+		}
+	}
+
+	/* If we didn't parse any digits, we have an invalid number. */
+	if (start === idx) {
+		return (new Error('invalid number: ' + JSON.stringify(str)));
+	}
+
+	/* Trim any whitespace on the right side. */
+	if (options.trimWhitespace) {
+		while (idx < len && isSpace(str.charCodeAt(idx))) {
+			++idx;
+		}
+	}
+
+	/* Check for trailing characters. */
+	if (idx < len && !options.allowTrailing) {
+		return (new Error('trailing characters after number: ' +
+		    JSON.stringify(str.slice(idx))));
+	}
+
+	/* If our value is 0, we return now, to avoid returning -0. */
+	if (value === 0) {
+		return (0);
+	}
+
+	/* Calculate our final value. */
+	var result = value * mult;
+
+	/*
+	 * If the string represents a value that cannot be precisely represented
+	 * by JavaScript, then we want to check that:
+	 *
+	 * - We never increased the value past MAX_SAFE_INTEGER
+	 * - We don't make the result negative and below MIN_SAFE_INTEGER
+	 *
+	 * Because we only ever increment the value during parsing, there's no
+	 * chance of moving past MAX_SAFE_INTEGER and then dropping below it
+	 * again, losing precision in the process. This means that we only need
+	 * to do our checks here, at the end.
+	 */
+	if (!options.allowImprecise &&
+	    (value > MAX_SAFE_INTEGER || result < MIN_SAFE_INTEGER)) {
+		return (new Error('number is outside of the supported range: ' +
+		    JSON.stringify(str.slice(start, idx))));
+	}
+
+	return (result);
+}
+
+
+/*
+ * Interpret a character code as a base-36 digit.
+ */
+function translateDigit(d)
+{
+	if (d >= CP_0 && d <= CP_9) {
+		/* '0' to '9' -> 0 to 9 */
+		return (d - PI_CONV_DEC);
+	} else if (d >= CP_A && d <= CP_Z) {
+		/* 'A' - 'Z' -> 10 to 35 */
+		return (d - PI_CONV_UC);
+	} else if (d >= CP_a && d <= CP_z) {
+		/* 'a' - 'z' -> 10 to 35 */
+		return (d - PI_CONV_LC);
+	} else {
+		/* Invalid character code */
+		return (-1);
+	}
+}
+
+
+/*
+ * Test if a value matches the ECMAScript definition of trimmable whitespace.
+ */
+function isSpace(c)
+{
+	return (c === 0x20) ||
+	    (c >= 0x0009 && c <= 0x000d) ||
+	    (c === 0x00a0) ||
+	    (c === 0x1680) ||
+	    (c === 0x180e) ||
+	    (c >= 0x2000 && c <= 0x200a) ||
+	    (c === 0x2028) ||
+	    (c === 0x2029) ||
+	    (c === 0x202f) ||
+	    (c === 0x205f) ||
+	    (c === 0x3000) ||
+	    (c === 0xfeff);
+}
+
+
+/*
+ * Determine which base a character indicates (e.g., 'x' indicates hex).
+ */
+function prefixToBase(c)
+{
+	if (c === CP_b || c === CP_B) {
+		/* 0b/0B (binary) */
+		return (2);
+	} else if (c === CP_o || c === CP_O) {
+		/* 0o/0O (octal) */
+		return (8);
+	} else if (c === CP_t || c === CP_T) {
+		/* 0t/0T (decimal) */
+		return (10);
+	} else if (c === CP_x || c === CP_X) {
+		/* 0x/0X (hexadecimal) */
+		return (16);
+	} else {
+		/* Not a meaningful character */
+		return (-1);
+	}
+}
+
+
+function validateJsonObjectJS(schema, input)
+{
+	var report = mod_jsonschema.validate(input, schema);
+
+	if (report.errors.length === 0)
+		return (null);
+
+	/* Currently, we only do anything useful with the first error. */
+	var error = report.errors[0];
+
+	/* The failed property is given by a URI with an irrelevant prefix. */
+	var propname = error['property'];
+	var reason = error['message'].toLowerCase();
+	var i, j;
+
+	/*
+	 * There's at least one case where the property error message is
+	 * confusing at best.  We work around this here.
+	 */
+	if ((i = reason.indexOf('the property ')) != -1 &&
+	    (j = reason.indexOf(' is not defined in the schema and the ' +
+	    'schema does not allow additional properties')) != -1) {
+		i += 'the property '.length;
+		if (propname === '')
+			propname = reason.substr(i, j - i);
+		else
+			propname = propname + '.' + reason.substr(i, j - i);
+
+		reason = 'unsupported property';
+	}
+
+	var rv = new mod_verror.VError('property "%s": %s', propname, reason);
+	rv.jsv_details = error;
+	return (rv);
+}
+
+function randElt(arr)
+{
+	mod_assert.ok(Array.isArray(arr) && arr.length > 0,
+	    'randElt argument must be a non-empty array');
+
+	return (arr[Math.floor(Math.random() * arr.length)]);
+}
+
+function assertHrtime(a)
+{
+	mod_assert.ok(a[0] >= 0 && a[1] >= 0,
+	    'negative numbers not allowed in hrtimes');
+	mod_assert.ok(a[1] < 1e9, 'nanoseconds column overflow');
+}
+
+/*
+ * Compute the time elapsed between hrtime readings A and B, where A is later
+ * than B.  hrtime readings come from Node's process.hrtime().  There is no
+ * defined way to represent negative deltas, so it's illegal to diff B from A
+ * where the time denoted by B is later than the time denoted by A.  If this
+ * becomes valuable, we can define a representation and extend the
+ * implementation to support it.
+ */
+function hrtimeDiff(a, b)
+{
+	assertHrtime(a);
+	assertHrtime(b);
+	mod_assert.ok(a[0] > b[0] || (a[0] == b[0] && a[1] >= b[1]),
+	    'negative differences not allowed');
+
+	var rv = [ a[0] - b[0], 0 ];
+
+	if (a[1] >= b[1]) {
+		rv[1] = a[1] - b[1];
+	} else {
+		rv[0]--;
+		rv[1] = 1e9 - (b[1] - a[1]);
+	}
+
+	return (rv);
+}
+
+/*
+ * Convert a hrtime reading from the array format returned by Node's
+ * process.hrtime() into a scalar number of nanoseconds.
+ */
+function hrtimeNanosec(a)
+{
+	assertHrtime(a);
+
+	return (Math.floor(a[0] * 1e9 + a[1]));
+}
+
+/*
+ * Convert a hrtime reading from the array format returned by Node's
+ * process.hrtime() into a scalar number of microseconds.
+ */
+function hrtimeMicrosec(a)
+{
+	assertHrtime(a);
+
+	return (Math.floor(a[0] * 1e6 + a[1] / 1e3));
+}
+
+/*
+ * Convert a hrtime reading from the array format returned by Node's
+ * process.hrtime() into a scalar number of milliseconds.
+ */
+function hrtimeMillisec(a)
+{
+	assertHrtime(a);
+
+	return (Math.floor(a[0] * 1e3 + a[1] / 1e6));
+}
+
+/*
+ * Add two hrtime readings A and B, overwriting A with the result of the
+ * addition.  This function is useful for accumulating several hrtime intervals
+ * into a counter.  Returns A.
+ */
+function hrtimeAccum(a, b)
+{
+	assertHrtime(a);
+	assertHrtime(b);
+
+	/*
+	 * Accumulate the nanosecond component.
+	 */
+	a[1] += b[1];
+	if (a[1] >= 1e9) {
+		/*
+		 * The nanosecond component overflowed, so carry to the seconds
+		 * field.
+		 */
+		a[0]++;
+		a[1] -= 1e9;
+	}
+
+	/*
+	 * Accumulate the seconds component.
+	 */
+	a[0] += b[0];
+
+	return (a);
+}
+
+/*
+ * Add two hrtime readings A and B, returning the result as a new hrtime array.
+ * Does not modify either input argument.
+ */
+function hrtimeAdd(a, b)
+{
+	assertHrtime(a);
+
+	var rv = [ a[0], a[1] ];
+
+	return (hrtimeAccum(rv, b));
+}
+
+
+/*
+ * Check an object for unexpected properties.  Accepts the object to check, and
+ * an array of allowed property names (strings).  Returns an array of key names
+ * that were found on the object, but did not appear in the list of allowed
+ * properties.  If no properties were found, the returned array will be of
+ * zero length.
+ */
+function extraProperties(obj, allowed)
+{
+	mod_assert.ok(typeof (obj) === 'object' && obj !== null,
+	    'obj argument must be a non-null object');
+	mod_assert.ok(Array.isArray(allowed),
+	    'allowed argument must be an array of strings');
+	for (var i = 0; i < allowed.length; i++) {
+		mod_assert.ok(typeof (allowed[i]) === 'string',
+		    'allowed argument must be an array of strings');
+	}
+
+	return (Object.keys(obj).filter(function (key) {
+		return (allowed.indexOf(key) === -1);
+	}));
+}
+
+/*
+ * Given three sets of properties "provided" (may be undefined), "overrides"
+ * (required), and "defaults" (may be undefined), construct an object containing
+ * the union of these sets with "overrides" overriding "provided", and
+ * "provided" overriding "defaults".  None of the input objects are modified.
+ */
+function mergeObjects(provided, overrides, defaults)
+{
+	var rv, k;
+
+	rv = {};
+	if (defaults) {
+		for (k in defaults)
+			rv[k] = defaults[k];
+	}
+
+	if (provided) {
+		for (k in provided)
+			rv[k] = provided[k];
+	}
+
+	if (overrides) {
+		for (k in overrides)
+			rv[k] = overrides[k];
+	}
+
+	return (rv);
+}
+
+
+/***/ }),
+/* 747 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/* eslint-disable no-nested-ternary */
+
+var arr = [];
+var charCodeCache = [];
+
+module.exports = function (a, b) {
+	if (a === b) {
+		return 0;
+	}
+
+	var swap = a;
+
+	// Swapping the strings if `a` is longer than `b` so we know which one is the
+	// shortest & which one is the longest
+	if (a.length > b.length) {
+		a = b;
+		b = swap;
+	}
+
+	var aLen = a.length;
+	var bLen = b.length;
+
+	if (aLen === 0) {
+		return bLen;
+	}
+
+	if (bLen === 0) {
+		return aLen;
+	}
+
+	// Performing suffix trimming:
+	// We can linearly drop suffix common to both strings since they
+	// don't increase distance at all
+	// Note: `~-` is the bitwise way to perform a `- 1` operation
+	while (aLen > 0 && (a.charCodeAt(~-aLen) === b.charCodeAt(~-bLen))) {
+		aLen--;
+		bLen--;
+	}
+
+	if (aLen === 0) {
+		return bLen;
+	}
+
+	// Performing prefix trimming
+	// We can linearly drop prefix common to both strings since they
+	// don't increase distance at all
+	var start = 0;
+
+	while (start < aLen && (a.charCodeAt(start) === b.charCodeAt(start))) {
+		start++;
+	}
+
+	aLen -= start;
+	bLen -= start;
+
+	if (aLen === 0) {
+		return bLen;
+	}
+
+	var bCharCode;
+	var ret;
+	var tmp;
+	var tmp2;
+	var i = 0;
+	var j = 0;
+
+	while (i < aLen) {
+		charCodeCache[start + i] = a.charCodeAt(start + i);
+		arr[i] = ++i;
+	}
+
+	while (j < bLen) {
+		bCharCode = b.charCodeAt(start + j);
+		tmp = j++;
+		ret = j;
+
+		for (i = 0; i < aLen; i++) {
+			tmp2 = bCharCode === charCodeCache[start + i] ? tmp : tmp + 1;
+			tmp = arr[i];
+			ret = arr[i] = tmp > ret ? tmp2 > ret ? ret + 1 : tmp2 : tmp2 > tmp ? tmp + 1 : tmp2;
+		}
+	}
+
+	return ret;
+};
+
+
+/***/ }),
+/* 748 */
+/***/ (function(module, exports, __webpack_require__) {
+
+/* WEBPACK VAR INJECTION */(function(module) {/**
+ * lodash (Custom Build) <https://lodash.com/>
+ * Build: `lodash modularize exports="npm" -o ./`
+ * Copyright jQuery Foundation and other contributors <https://jquery.org/>
+ * Released under MIT license <https://lodash.com/license>
+ * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
+ * Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+ */
+
+/** Used as the size to enable large array optimizations. */
+var LARGE_ARRAY_SIZE = 200;
+
+/** Used to stand-in for `undefined` hash values. */
+var HASH_UNDEFINED = '__lodash_hash_undefined__';
+
+/** Used as references for various `Number` constants. */
+var MAX_SAFE_INTEGER = 9007199254740991;
+
+/** `Object#toString` result references. */
+var argsTag = '[object Arguments]',
+    arrayTag = '[object Array]',
+    boolTag = '[object Boolean]',
+    dateTag = '[object Date]',
+    errorTag = '[object Error]',
+    funcTag = '[object Function]',
+    genTag = '[object GeneratorFunction]',
+    mapTag = '[object Map]',
+    numberTag = '[object Number]',
+    objectTag = '[object Object]',
+    promiseTag = '[object Promise]',
+    regexpTag = '[object RegExp]',
+    setTag = '[object Set]',
+    stringTag = '[object String]',
+    symbolTag = '[object Symbol]',
+    weakMapTag = '[object WeakMap]';
+
+var arrayBufferTag = '[object ArrayBuffer]',
+    dataViewTag = '[object DataView]',
+    float32Tag = '[object Float32Array]',
+    float64Tag = '[object Float64Array]',
+    int8Tag = '[object Int8Array]',
+    int16Tag = '[object Int16Array]',
+    int32Tag = '[object Int32Array]',
+    uint8Tag = '[object Uint8Array]',
+    uint8ClampedTag = '[object Uint8ClampedArray]',
+    uint16Tag = '[object Uint16Array]',
+    uint32Tag = '[object Uint32Array]';
+
+/**
+ * Used to match `RegExp`
+ * [syntax characters](http://ecma-international.org/ecma-262/6.0/#sec-patterns).
+ */
+var reRegExpChar = /[\\^$.*+?()[\]{}|]/g;
+
+/** Used to match `RegExp` flags from their coerced string values. */
+var reFlags = /\w*$/;
+
+/** Used to detect host constructors (Safari). */
+var reIsHostCtor = /^\[object .+?Constructor\]$/;
+
+/** Used to detect unsigned integer values. */
+var reIsUint = /^(?:0|[1-9]\d*)$/;
+
+/** Used to identify `toStringTag` values supported by `_.clone`. */
+var cloneableTags = {};
+cloneableTags[argsTag] = cloneableTags[arrayTag] =
+cloneableTags[arrayBufferTag] = cloneableTags[dataViewTag] =
+cloneableTags[boolTag] = cloneableTags[dateTag] =
+cloneableTags[float32Tag] = cloneableTags[float64Tag] =
+cloneableTags[int8Tag] = cloneableTags[int16Tag] =
+cloneableTags[int32Tag] = cloneableTags[mapTag] =
+cloneableTags[numberTag] = cloneableTags[objectTag] =
+cloneableTags[regexpTag] = cloneableTags[setTag] =
+cloneableTags[stringTag] = cloneableTags[symbolTag] =
+cloneableTags[uint8Tag] = cloneableTags[uint8ClampedTag] =
+cloneableTags[uint16Tag] = cloneableTags[uint32Tag] = true;
+cloneableTags[errorTag] = cloneableTags[funcTag] =
+cloneableTags[weakMapTag] = false;
+
+/** Used to determine if values are of the language type `Object`. */
+var objectTypes = {
+  'function': true,
+  'object': true
+};
+
+/** Detect free variable `exports`. */
+var freeExports = (objectTypes[typeof exports] && exports && !exports.nodeType)
+  ? exports
+  : undefined;
+
+/** Detect free variable `module`. */
+var freeModule = (objectTypes[typeof module] && module && !module.nodeType)
+  ? module
+  : undefined;
+
+/** Detect the popular CommonJS extension `module.exports`. */
+var moduleExports = (freeModule && freeModule.exports === freeExports)
+  ? freeExports
+  : undefined;
+
+/** Detect free variable `global` from Node.js. */
+var freeGlobal = checkGlobal(freeExports && freeModule && typeof global == 'object' && global);
+
+/** Detect free variable `self`. */
+var freeSelf = checkGlobal(objectTypes[typeof self] && self);
+
+/** Detect free variable `window`. */
+var freeWindow = checkGlobal(objectTypes[typeof window] && window);
+
+/** Detect `this` as the global object. */
+var thisGlobal = checkGlobal(objectTypes[typeof this] && this);
+
+/**
+ * Used as a reference to the global object.
+ *
+ * The `this` value is used if it's the global object to avoid Greasemonkey's
+ * restricted `window` object, otherwise the `window` object is used.
+ */
+var root = freeGlobal ||
+  ((freeWindow !== (thisGlobal && thisGlobal.window)) && freeWindow) ||
+    freeSelf || thisGlobal || Function('return this')();
+
+/**
+ * Adds the key-value `pair` to `map`.
+ *
+ * @private
+ * @param {Object} map The map to modify.
+ * @param {Array} pair The key-value pair to add.
+ * @returns {Object} Returns `map`.
+ */
+function addMapEntry(map, pair) {
+  // Don't return `Map#set` because it doesn't return the map instance in IE 11.
+  map.set(pair[0], pair[1]);
+  return map;
+}
+
+/**
+ * Adds `value` to `set`.
+ *
+ * @private
+ * @param {Object} set The set to modify.
+ * @param {*} value The value to add.
+ * @returns {Object} Returns `set`.
+ */
+function addSetEntry(set, value) {
+  set.add(value);
+  return set;
+}
+
+/**
+ * A specialized version of `_.forEach` for arrays without support for
+ * iteratee shorthands.
+ *
+ * @private
+ * @param {Array} array The array to iterate over.
+ * @param {Function} iteratee The function invoked per iteration.
+ * @returns {Array} Returns `array`.
+ */
+function arrayEach(array, iteratee) {
+  var index = -1,
+      length = array.length;
+
+  while (++index < length) {
+    if (iteratee(array[index], index, array) === false) {
+      break;
+    }
+  }
+  return array;
+}
+
+/**
+ * Appends the elements of `values` to `array`.
+ *
+ * @private
+ * @param {Array} array The array to modify.
+ * @param {Array} values The values to append.
+ * @returns {Array} Returns `array`.
+ */
+function arrayPush(array, values) {
+  var index = -1,
+      length = values.length,
+      offset = array.length;
+
+  while (++index < length) {
+    array[offset + index] = values[index];
+  }
+  return array;
+}
+
+/**
+ * A specialized version of `_.reduce` for arrays without support for
+ * iteratee shorthands.
+ *
+ * @private
+ * @param {Array} array The array to iterate over.
+ * @param {Function} iteratee The function invoked per iteration.
+ * @param {*} [accumulator] The initial value.
+ * @param {boolean} [initAccum] Specify using the first element of `array` as
+ *  the initial value.
+ * @returns {*} Returns the accumulated value.
+ */
+function arrayReduce(array, iteratee, accumulator, initAccum) {
+  var index = -1,
+      length = array.length;
+
+  if (initAccum && length) {
+    accumulator = array[++index];
+  }
+  while (++index < length) {
+    accumulator = iteratee(accumulator, array[index], index, array);
+  }
+  return accumulator;
+}
+
+/**
+ * The base implementation of `_.times` without support for iteratee shorthands
+ * or max array length checks.
+ *
+ * @private
+ * @param {number} n The number of times to invoke `iteratee`.
+ * @param {Function} iteratee The function invoked per iteration.
+ * @returns {Array} Returns the array of results.
+ */
+function baseTimes(n, iteratee) {
+  var index = -1,
+      result = Array(n);
+
+  while (++index < n) {
+    result[index] = iteratee(index);
+  }
+  return result;
+}
+
+/**
+ * Checks if `value` is a global object.
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @returns {null|Object} Returns `value` if it's a global object, else `null`.
+ */
+function checkGlobal(value) {
+  return (value && value.Object === Object) ? value : null;
+}
+
+/**
+ * Checks if `value` is a host object in IE < 9.
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is a host object, else `false`.
+ */
+function isHostObject(value) {
+  // Many host objects are `Object` objects that can coerce to strings
+  // despite having improperly defined `toString` methods.
+  var result = false;
+  if (value != null && typeof value.toString != 'function') {
+    try {
+      result = !!(value + '');
+    } catch (e) {}
+  }
+  return result;
+}
+
+/**
+ * Converts `map` to its key-value pairs.
+ *
+ * @private
+ * @param {Object} map The map to convert.
+ * @returns {Array} Returns the key-value pairs.
+ */
+function mapToArray(map) {
+  var index = -1,
+      result = Array(map.size);
+
+  map.forEach(function(value, key) {
+    result[++index] = [key, value];
+  });
+  return result;
+}
+
+/**
+ * Converts `set` to an array of its values.
+ *
+ * @private
+ * @param {Object} set The set to convert.
+ * @returns {Array} Returns the values.
+ */
+function setToArray(set) {
+  var index = -1,
+      result = Array(set.size);
+
+  set.forEach(function(value) {
+    result[++index] = value;
+  });
+  return result;
+}
+
+/** Used for built-in method references. */
+var arrayProto = Array.prototype,
+    objectProto = Object.prototype;
+
+/** Used to resolve the decompiled source of functions. */
+var funcToString = Function.prototype.toString;
+
+/** Used to check objects for own properties. */
+var hasOwnProperty = objectProto.hasOwnProperty;
+
+/**
+ * Used to resolve the
+ * [`toStringTag`](http://ecma-international.org/ecma-262/6.0/#sec-object.prototype.tostring)
+ * of values.
+ */
+var objectToString = objectProto.toString;
+
+/** Used to detect if a method is native. */
+var reIsNative = RegExp('^' +
+  funcToString.call(hasOwnProperty).replace(reRegExpChar, '\\$&')
+  .replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g, '$1.*?') + '$'
+);
+
+/** Built-in value references. */
+var Buffer = moduleExports ? root.Buffer : undefined,
+    Symbol = root.Symbol,
+    Uint8Array = root.Uint8Array,
+    getOwnPropertySymbols = Object.getOwnPropertySymbols,
+    objectCreate = Object.create,
+    propertyIsEnumerable = objectProto.propertyIsEnumerable,
+    splice = arrayProto.splice;
+
+/* Built-in method references for those with the same name as other `lodash` methods. */
+var nativeGetPrototype = Object.getPrototypeOf,
+    nativeKeys = Object.keys;
+
+/* Built-in method references that are verified to be native. */
+var DataView = getNative(root, 'DataView'),
+    Map = getNative(root, 'Map'),
+    Promise = getNative(root, 'Promise'),
+    Set = getNative(root, 'Set'),
+    WeakMap = getNative(root, 'WeakMap'),
+    nativeCreate = getNative(Object, 'create');
+
+/** Used to detect maps, sets, and weakmaps. */
+var dataViewCtorString = toSource(DataView),
+    mapCtorString = toSource(Map),
+    promiseCtorString = toSource(Promise),
+    setCtorString = toSource(Set),
+    weakMapCtorString = toSource(WeakMap);
+
+/** Used to convert symbols to primitives and strings. */
+var symbolProto = Symbol ? Symbol.prototype : undefined,
+    symbolValueOf = symbolProto ? symbolProto.valueOf : undefined;
+
+/**
+ * Creates a hash object.
+ *
+ * @private
+ * @constructor
+ * @param {Array} [entries] The key-value pairs to cache.
+ */
+function Hash(entries) {
+  var index = -1,
+      length = entries ? entries.length : 0;
+
+  this.clear();
+  while (++index < length) {
+    var entry = entries[index];
+    this.set(entry[0], entry[1]);
+  }
+}
+
+/**
+ * Removes all key-value entries from the hash.
+ *
+ * @private
+ * @name clear
+ * @memberOf Hash
+ */
+function hashClear() {
+  this.__data__ = nativeCreate ? nativeCreate(null) : {};
+}
+
+/**
+ * Removes `key` and its value from the hash.
+ *
+ * @private
+ * @name delete
+ * @memberOf Hash
+ * @param {Object} hash The hash to modify.
+ * @param {string} key The key of the value to remove.
+ * @returns {boolean} Returns `true` if the entry was removed, else `false`.
+ */
+function hashDelete(key) {
+  return this.has(key) && delete this.__data__[key];
+}
+
+/**
+ * Gets the hash value for `key`.
+ *
+ * @private
+ * @name get
+ * @memberOf Hash
+ * @param {string} key The key of the value to get.
+ * @returns {*} Returns the entry value.
+ */
+function hashGet(key) {
+  var data = this.__data__;
+  if (nativeCreate) {
+    var result = data[key];
+    return result === HASH_UNDEFINED ? undefined : result;
+  }
+  return hasOwnProperty.call(data, key) ? data[key] : undefined;
+}
+
+/**
+ * Checks if a hash value for `key` exists.
+ *
+ * @private
+ * @name has
+ * @memberOf Hash
+ * @param {string} key The key of the entry to check.
+ * @returns {boolean} Returns `true` if an entry for `key` exists, else `false`.
+ */
+function hashHas(key) {
+  var data = this.__data__;
+  return nativeCreate ? data[key] !== undefined : hasOwnProperty.call(data, key);
+}
+
+/**
+ * Sets the hash `key` to `value`.
+ *
+ * @private
+ * @name set
+ * @memberOf Hash
+ * @param {string} key The key of the value to set.
+ * @param {*} value The value to set.
+ * @returns {Object} Returns the hash instance.
+ */
+function hashSet(key, value) {
+  var data = this.__data__;
+  data[key] = (nativeCreate && value === undefined) ? HASH_UNDEFINED : value;
+  return this;
+}
+
+// Add methods to `Hash`.
+Hash.prototype.clear = hashClear;
+Hash.prototype['delete'] = hashDelete;
+Hash.prototype.get = hashGet;
+Hash.prototype.has = hashHas;
+Hash.prototype.set = hashSet;
+
+/**
+ * Creates an list cache object.
+ *
+ * @private
+ * @constructor
+ * @param {Array} [entries] The key-value pairs to cache.
+ */
+function ListCache(entries) {
+  var index = -1,
+      length = entries ? entries.length : 0;
+
+  this.clear();
+  while (++index < length) {
+    var entry = entries[index];
+    this.set(entry[0], entry[1]);
+  }
+}
+
+/**
+ * Removes all key-value entries from the list cache.
+ *
+ * @private
+ * @name clear
+ * @memberOf ListCache
+ */
+function listCacheClear() {
+  this.__data__ = [];
+}
+
+/**
+ * Removes `key` and its value from the list cache.
+ *
+ * @private
+ * @name delete
+ * @memberOf ListCache
+ * @param {string} key The key of the value to remove.
+ * @returns {boolean} Returns `true` if the entry was removed, else `false`.
+ */
+function listCacheDelete(key) {
+  var data = this.__data__,
+      index = assocIndexOf(data, key);
+
+  if (index < 0) {
+    return false;
+  }
+  var lastIndex = data.length - 1;
+  if (index == lastIndex) {
+    data.pop();
+  } else {
+    splice.call(data, index, 1);
+  }
+  return true;
+}
+
+/**
+ * Gets the list cache value for `key`.
+ *
+ * @private
+ * @name get
+ * @memberOf ListCache
+ * @param {string} key The key of the value to get.
+ * @returns {*} Returns the entry value.
+ */
+function listCacheGet(key) {
+  var data = this.__data__,
+      index = assocIndexOf(data, key);
+
+  return index < 0 ? undefined : data[index][1];
+}
+
+/**
+ * Checks if a list cache value for `key` exists.
+ *
+ * @private
+ * @name has
+ * @memberOf ListCache
+ * @param {string} key The key of the entry to check.
+ * @returns {boolean} Returns `true` if an entry for `key` exists, else `false`.
+ */
+function listCacheHas(key) {
+  return assocIndexOf(this.__data__, key) > -1;
+}
+
+/**
+ * Sets the list cache `key` to `value`.
+ *
+ * @private
+ * @name set
+ * @memberOf ListCache
+ * @param {string} key The key of the value to set.
+ * @param {*} value The value to set.
+ * @returns {Object} Returns the list cache instance.
+ */
+function listCacheSet(key, value) {
+  var data = this.__data__,
+      index = assocIndexOf(data, key);
+
+  if (index < 0) {
+    data.push([key, value]);
+  } else {
+    data[index][1] = value;
+  }
+  return this;
+}
+
+// Add methods to `ListCache`.
+ListCache.prototype.clear = listCacheClear;
+ListCache.prototype['delete'] = listCacheDelete;
+ListCache.prototype.get = listCacheGet;
+ListCache.prototype.has = listCacheHas;
+ListCache.prototype.set = listCacheSet;
+
+/**
+ * Creates a map cache object to store key-value pairs.
+ *
+ * @private
+ * @constructor
+ * @param {Array} [entries] The key-value pairs to cache.
+ */
+function MapCache(entries) {
+  var index = -1,
+      length = entries ? entries.length : 0;
+
+  this.clear();
+  while (++index < length) {
+    var entry = entries[index];
+    this.set(entry[0], entry[1]);
+  }
+}
+
+/**
+ * Removes all key-value entries from the map.
+ *
+ * @private
+ * @name clear
+ * @memberOf MapCache
+ */
+function mapCacheClear() {
+  this.__data__ = {
+    'hash': new Hash,
+    'map': new (Map || ListCache),
+    'string': new Hash
+  };
+}
+
+/**
+ * Removes `key` and its value from the map.
+ *
+ * @private
+ * @name delete
+ * @memberOf MapCache
+ * @param {string} key The key of the value to remove.
+ * @returns {boolean} Returns `true` if the entry was removed, else `false`.
+ */
+function mapCacheDelete(key) {
+  return getMapData(this, key)['delete'](key);
+}
+
+/**
+ * Gets the map value for `key`.
+ *
+ * @private
+ * @name get
+ * @memberOf MapCache
+ * @param {string} key The key of the value to get.
+ * @returns {*} Returns the entry value.
+ */
+function mapCacheGet(key) {
+  return getMapData(this, key).get(key);
+}
+
+/**
+ * Checks if a map value for `key` exists.
+ *
+ * @private
+ * @name has
+ * @memberOf MapCache
+ * @param {string} key The key of the entry to check.
+ * @returns {boolean} Returns `true` if an entry for `key` exists, else `false`.
+ */
+function mapCacheHas(key) {
+  return getMapData(this, key).has(key);
+}
+
+/**
+ * Sets the map `key` to `value`.
+ *
+ * @private
+ * @name set
+ * @memberOf MapCache
+ * @param {string} key The key of the value to set.
+ * @param {*} value The value to set.
+ * @returns {Object} Returns the map cache instance.
+ */
+function mapCacheSet(key, value) {
+  getMapData(this, key).set(key, value);
+  return this;
+}
+
+// Add methods to `MapCache`.
+MapCache.prototype.clear = mapCacheClear;
+MapCache.prototype['delete'] = mapCacheDelete;
+MapCache.prototype.get = mapCacheGet;
+MapCache.prototype.has = mapCacheHas;
+MapCache.prototype.set = mapCacheSet;
+
+/**
+ * Creates a stack cache object to store key-value pairs.
+ *
+ * @private
+ * @constructor
+ * @param {Array} [entries] The key-value pairs to cache.
+ */
+function Stack(entries) {
+  this.__data__ = new ListCache(entries);
+}
+
+/**
+ * Removes all key-value entries from the stack.
+ *
+ * @private
+ * @name clear
+ * @memberOf Stack
+ */
+function stackClear() {
+  this.__data__ = new ListCache;
+}
+
+/**
+ * Removes `key` and its value from the stack.
+ *
+ * @private
+ * @name delete
+ * @memberOf Stack
+ * @param {string} key The key of the value to remove.
+ * @returns {boolean} Returns `true` if the entry was removed, else `false`.
+ */
+function stackDelete(key) {
+  return this.__data__['delete'](key);
+}
+
+/**
+ * Gets the stack value for `key`.
+ *
+ * @private
+ * @name get
+ * @memberOf Stack
+ * @param {string} key The key of the value to get.
+ * @returns {*} Returns the entry value.
+ */
+function stackGet(key) {
+  return this.__data__.get(key);
+}
+
+/**
+ * Checks if a stack value for `key` exists.
+ *
+ * @private
+ * @name has
+ * @memberOf Stack
+ * @param {string} key The key of the entry to check.
+ * @returns {boolean} Returns `true` if an entry for `key` exists, else `false`.
+ */
+function stackHas(key) {
+  return this.__data__.has(key);
+}
+
+/**
+ * Sets the stack `key` to `value`.
+ *
+ * @private
+ * @name set
+ * @memberOf Stack
+ * @param {string} key The key of the value to set.
+ * @param {*} value The value to set.
+ * @returns {Object} Returns the stack cache instance.
+ */
+function stackSet(key, value) {
+  var cache = this.__data__;
+  if (cache instanceof ListCache && cache.__data__.length == LARGE_ARRAY_SIZE) {
+    cache = this.__data__ = new MapCache(cache.__data__);
+  }
+  cache.set(key, value);
+  return this;
+}
+
+// Add methods to `Stack`.
+Stack.prototype.clear = stackClear;
+Stack.prototype['delete'] = stackDelete;
+Stack.prototype.get = stackGet;
+Stack.prototype.has = stackHas;
+Stack.prototype.set = stackSet;
+
+/**
+ * Assigns `value` to `key` of `object` if the existing value is not equivalent
+ * using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+ * for equality comparisons.
+ *
+ * @private
+ * @param {Object} object The object to modify.
+ * @param {string} key The key of the property to assign.
+ * @param {*} value The value to assign.
+ */
+function assignValue(object, key, value) {
+  var objValue = object[key];
+  if (!(hasOwnProperty.call(object, key) && eq(objValue, value)) ||
+      (value === undefined && !(key in object))) {
+    object[key] = value;
+  }
+}
+
+/**
+ * Gets the index at which the `key` is found in `array` of key-value pairs.
+ *
+ * @private
+ * @param {Array} array The array to search.
+ * @param {*} key The key to search for.
+ * @returns {number} Returns the index of the matched value, else `-1`.
+ */
+function assocIndexOf(array, key) {
+  var length = array.length;
+  while (length--) {
+    if (eq(array[length][0], key)) {
+      return length;
+    }
+  }
+  return -1;
+}
+
+/**
+ * The base implementation of `_.assign` without support for multiple sources
+ * or `customizer` functions.
+ *
+ * @private
+ * @param {Object} object The destination object.
+ * @param {Object} source The source object.
+ * @returns {Object} Returns `object`.
+ */
+function baseAssign(object, source) {
+  return object && copyObject(source, keys(source), object);
+}
+
+/**
+ * The base implementation of `_.clone` and `_.cloneDeep` which tracks
+ * traversed objects.
+ *
+ * @private
+ * @param {*} value The value to clone.
+ * @param {boolean} [isDeep] Specify a deep clone.
+ * @param {boolean} [isFull] Specify a clone including symbols.
+ * @param {Function} [customizer] The function to customize cloning.
+ * @param {string} [key] The key of `value`.
+ * @param {Object} [object] The parent object of `value`.
+ * @param {Object} [stack] Tracks traversed objects and their clone counterparts.
+ * @returns {*} Returns the cloned value.
+ */
+function baseClone(value, isDeep, isFull, customizer, key, object, stack) {
+  var result;
+  if (customizer) {
+    result = object ? customizer(value, key, object, stack) : customizer(value);
+  }
+  if (result !== undefined) {
+    return result;
+  }
+  if (!isObject(value)) {
+    return value;
+  }
+  var isArr = isArray(value);
+  if (isArr) {
+    result = initCloneArray(value);
+    if (!isDeep) {
+      return copyArray(value, result);
+    }
+  } else {
+    var tag = getTag(value),
+        isFunc = tag == funcTag || tag == genTag;
+
+    if (isBuffer(value)) {
+      return cloneBuffer(value, isDeep);
+    }
+    if (tag == objectTag || tag == argsTag || (isFunc && !object)) {
+      if (isHostObject(value)) {
+        return object ? value : {};
+      }
+      result = initCloneObject(isFunc ? {} : value);
+      if (!isDeep) {
+        return copySymbols(value, baseAssign(result, value));
+      }
+    } else {
+      if (!cloneableTags[tag]) {
+        return object ? value : {};
+      }
+      result = initCloneByTag(value, tag, baseClone, isDeep);
+    }
+  }
+  // Check for circular references and return its corresponding clone.
+  stack || (stack = new Stack);
+  var stacked = stack.get(value);
+  if (stacked) {
+    return stacked;
+  }
+  stack.set(value, result);
+
+  if (!isArr) {
+    var props = isFull ? getAllKeys(value) : keys(value);
+  }
+  // Recursively populate clone (susceptible to call stack limits).
+  arrayEach(props || value, function(subValue, key) {
+    if (props) {
+      key = subValue;
+      subValue = value[key];
+    }
+    assignValue(result, key, baseClone(subValue, isDeep, isFull, customizer, key, value, stack));
+  });
+  return result;
+}
+
+/**
+ * The base implementation of `_.create` without support for assigning
+ * properties to the created object.
+ *
+ * @private
+ * @param {Object} prototype The object to inherit from.
+ * @returns {Object} Returns the new object.
+ */
+function baseCreate(proto) {
+  return isObject(proto) ? objectCreate(proto) : {};
+}
+
+/**
+ * The base implementation of `getAllKeys` and `getAllKeysIn` which uses
+ * `keysFunc` and `symbolsFunc` to get the enumerable property names and
+ * symbols of `object`.
+ *
+ * @private
+ * @param {Object} object The object to query.
+ * @param {Function} keysFunc The function to get the keys of `object`.
+ * @param {Function} symbolsFunc The function to get the symbols of `object`.
+ * @returns {Array} Returns the array of property names and symbols.
+ */
+function baseGetAllKeys(object, keysFunc, symbolsFunc) {
+  var result = keysFunc(object);
+  return isArray(object) ? result : arrayPush(result, symbolsFunc(object));
+}
+
+/**
+ * The base implementation of `_.has` without support for deep paths.
+ *
+ * @private
+ * @param {Object} object The object to query.
+ * @param {Array|string} key The key to check.
+ * @returns {boolean} Returns `true` if `key` exists, else `false`.
+ */
+function baseHas(object, key) {
+  // Avoid a bug in IE 10-11 where objects with a [[Prototype]] of `null`,
+  // that are composed entirely of index properties, return `false` for
+  // `hasOwnProperty` checks of them.
+  return hasOwnProperty.call(object, key) ||
+    (typeof object == 'object' && key in object && getPrototype(object) === null);
+}
+
+/**
+ * The base implementation of `_.keys` which doesn't skip the constructor
+ * property of prototypes or treat sparse arrays as dense.
+ *
+ * @private
+ * @param {Object} object The object to query.
+ * @returns {Array} Returns the array of property names.
+ */
+function baseKeys(object) {
+  return nativeKeys(Object(object));
+}
+
+/**
+ * The base implementation of `_.property` without support for deep paths.
+ *
+ * @private
+ * @param {string} key The key of the property to get.
+ * @returns {Function} Returns the new accessor function.
+ */
+function baseProperty(key) {
+  return function(object) {
+    return object == null ? undefined : object[key];
+  };
+}
+
+/**
+ * Creates a clone of  `buffer`.
+ *
+ * @private
+ * @param {Buffer} buffer The buffer to clone.
+ * @param {boolean} [isDeep] Specify a deep clone.
+ * @returns {Buffer} Returns the cloned buffer.
+ */
+function cloneBuffer(buffer, isDeep) {
+  if (isDeep) {
+    return buffer.slice();
+  }
+  var result = new buffer.constructor(buffer.length);
+  buffer.copy(result);
+  return result;
+}
+
+/**
+ * Creates a clone of `arrayBuffer`.
+ *
+ * @private
+ * @param {ArrayBuffer} arrayBuffer The array buffer to clone.
+ * @returns {ArrayBuffer} Returns the cloned array buffer.
+ */
+function cloneArrayBuffer(arrayBuffer) {
+  var result = new arrayBuffer.constructor(arrayBuffer.byteLength);
+  new Uint8Array(result).set(new Uint8Array(arrayBuffer));
+  return result;
+}
+
+/**
+ * Creates a clone of `dataView`.
+ *
+ * @private
+ * @param {Object} dataView The data view to clone.
+ * @param {boolean} [isDeep] Specify a deep clone.
+ * @returns {Object} Returns the cloned data view.
+ */
+function cloneDataView(dataView, isDeep) {
+  var buffer = isDeep ? cloneArrayBuffer(dataView.buffer) : dataView.buffer;
+  return new dataView.constructor(buffer, dataView.byteOffset, dataView.byteLength);
+}
+
+/**
+ * Creates a clone of `map`.
+ *
+ * @private
+ * @param {Object} map The map to clone.
+ * @param {Function} cloneFunc The function to clone values.
+ * @param {boolean} [isDeep] Specify a deep clone.
+ * @returns {Object} Returns the cloned map.
+ */
+function cloneMap(map, isDeep, cloneFunc) {
+  var array = isDeep ? cloneFunc(mapToArray(map), true) : mapToArray(map);
+  return arrayReduce(array, addMapEntry, new map.constructor);
+}
+
+/**
+ * Creates a clone of `regexp`.
+ *
+ * @private
+ * @param {Object} regexp The regexp to clone.
+ * @returns {Object} Returns the cloned regexp.
+ */
+function cloneRegExp(regexp) {
+  var result = new regexp.constructor(regexp.source, reFlags.exec(regexp));
+  result.lastIndex = regexp.lastIndex;
+  return result;
+}
+
+/**
+ * Creates a clone of `set`.
+ *
+ * @private
+ * @param {Object} set The set to clone.
+ * @param {Function} cloneFunc The function to clone values.
+ * @param {boolean} [isDeep] Specify a deep clone.
+ * @returns {Object} Returns the cloned set.
+ */
+function cloneSet(set, isDeep, cloneFunc) {
+  var array = isDeep ? cloneFunc(setToArray(set), true) : setToArray(set);
+  return arrayReduce(array, addSetEntry, new set.constructor);
+}
+
+/**
+ * Creates a clone of the `symbol` object.
+ *
+ * @private
+ * @param {Object} symbol The symbol object to clone.
+ * @returns {Object} Returns the cloned symbol object.
+ */
+function cloneSymbol(symbol) {
+  return symbolValueOf ? Object(symbolValueOf.call(symbol)) : {};
+}
+
+/**
+ * Creates a clone of `typedArray`.
+ *
+ * @private
+ * @param {Object} typedArray The typed array to clone.
+ * @param {boolean} [isDeep] Specify a deep clone.
+ * @returns {Object} Returns the cloned typed array.
+ */
+function cloneTypedArray(typedArray, isDeep) {
+  var buffer = isDeep ? cloneArrayBuffer(typedArray.buffer) : typedArray.buffer;
+  return new typedArray.constructor(buffer, typedArray.byteOffset, typedArray.length);
+}
+
+/**
+ * Copies the values of `source` to `array`.
+ *
+ * @private
+ * @param {Array} source The array to copy values from.
+ * @param {Array} [array=[]] The array to copy values to.
+ * @returns {Array} Returns `array`.
+ */
+function copyArray(source, array) {
+  var index = -1,
+      length = source.length;
+
+  array || (array = Array(length));
+  while (++index < length) {
+    array[index] = source[index];
+  }
+  return array;
+}
+
+/**
+ * Copies properties of `source` to `object`.
+ *
+ * @private
+ * @param {Object} source The object to copy properties from.
+ * @param {Array} props The property identifiers to copy.
+ * @param {Object} [object={}] The object to copy properties to.
+ * @param {Function} [customizer] The function to customize copied values.
+ * @returns {Object} Returns `object`.
+ */
+function copyObject(source, props, object, customizer) {
+  object || (object = {});
+
+  var index = -1,
+      length = props.length;
+
+  while (++index < length) {
+    var key = props[index];
+
+    var newValue = customizer
+      ? customizer(object[key], source[key], key, object, source)
+      : source[key];
+
+    assignValue(object, key, newValue);
+  }
+  return object;
+}
+
+/**
+ * Copies own symbol properties of `source` to `object`.
+ *
+ * @private
+ * @param {Object} source The object to copy symbols from.
+ * @param {Object} [object={}] The object to copy symbols to.
+ * @returns {Object} Returns `object`.
+ */
+function copySymbols(source, object) {
+  return copyObject(source, getSymbols(source), object);
+}
+
+/**
+ * Creates an array of own enumerable property names and symbols of `object`.
+ *
+ * @private
+ * @param {Object} object The object to query.
+ * @returns {Array} Returns the array of property names and symbols.
+ */
+function getAllKeys(object) {
+  return baseGetAllKeys(object, keys, getSymbols);
+}
+
+/**
+ * Gets the "length" property value of `object`.
+ *
+ * **Note:** This function is used to avoid a
+ * [JIT bug](https://bugs.webkit.org/show_bug.cgi?id=142792) that affects
+ * Safari on at least iOS 8.1-8.3 ARM64.
+ *
+ * @private
+ * @param {Object} object The object to query.
+ * @returns {*} Returns the "length" value.
+ */
+var getLength = baseProperty('length');
+
+/**
+ * Gets the data for `map`.
+ *
+ * @private
+ * @param {Object} map The map to query.
+ * @param {string} key The reference key.
+ * @returns {*} Returns the map data.
+ */
+function getMapData(map, key) {
+  var data = map.__data__;
+  return isKeyable(key)
+    ? data[typeof key == 'string' ? 'string' : 'hash']
+    : data.map;
+}
+
+/**
+ * Gets the native function at `key` of `object`.
+ *
+ * @private
+ * @param {Object} object The object to query.
+ * @param {string} key The key of the method to get.
+ * @returns {*} Returns the function if it's native, else `undefined`.
+ */
+function getNative(object, key) {
+  var value = object[key];
+  return isNative(value) ? value : undefined;
+}
+
+/**
+ * Gets the `[[Prototype]]` of `value`.
+ *
+ * @private
+ * @param {*} value The value to query.
+ * @returns {null|Object} Returns the `[[Prototype]]`.
+ */
+function getPrototype(value) {
+  return nativeGetPrototype(Object(value));
+}
+
+/**
+ * Creates an array of the own enumerable symbol properties of `object`.
+ *
+ * @private
+ * @param {Object} object The object to query.
+ * @returns {Array} Returns the array of symbols.
+ */
+function getSymbols(object) {
+  // Coerce `object` to an object to avoid non-object errors in V8.
+  // See https://bugs.chromium.org/p/v8/issues/detail?id=3443 for more details.
+  return getOwnPropertySymbols(Object(object));
+}
+
+// Fallback for IE < 11.
+if (!getOwnPropertySymbols) {
+  getSymbols = function() {
+    return [];
+  };
+}
+
+/**
+ * Gets the `toStringTag` of `value`.
+ *
+ * @private
+ * @param {*} value The value to query.
+ * @returns {string} Returns the `toStringTag`.
+ */
+function getTag(value) {
+  return objectToString.call(value);
+}
+
+// Fallback for data views, maps, sets, and weak maps in IE 11,
+// for data views in Edge, and promises in Node.js.
+if ((DataView && getTag(new DataView(new ArrayBuffer(1))) != dataViewTag) ||
+    (Map && getTag(new Map) != mapTag) ||
+    (Promise && getTag(Promise.resolve()) != promiseTag) ||
+    (Set && getTag(new Set) != setTag) ||
+    (WeakMap && getTag(new WeakMap) != weakMapTag)) {
+  getTag = function(value) {
+    var result = objectToString.call(value),
+        Ctor = result == objectTag ? value.constructor : undefined,
+        ctorString = Ctor ? toSource(Ctor) : undefined;
+
+    if (ctorString) {
+      switch (ctorString) {
+        case dataViewCtorString: return dataViewTag;
+        case mapCtorString: return mapTag;
+        case promiseCtorString: return promiseTag;
+        case setCtorString: return setTag;
+        case weakMapCtorString: return weakMapTag;
+      }
+    }
+    return result;
+  };
+}
+
+/**
+ * Initializes an array clone.
+ *
+ * @private
+ * @param {Array} array The array to clone.
+ * @returns {Array} Returns the initialized clone.
+ */
+function initCloneArray(array) {
+  var length = array.length,
+      result = array.constructor(length);
+
+  // Add properties assigned by `RegExp#exec`.
+  if (length && typeof array[0] == 'string' && hasOwnProperty.call(array, 'index')) {
+    result.index = array.index;
+    result.input = array.input;
+  }
+  return result;
+}
+
+/**
+ * Initializes an object clone.
+ *
+ * @private
+ * @param {Object} object The object to clone.
+ * @returns {Object} Returns the initialized clone.
+ */
+function initCloneObject(object) {
+  return (typeof object.constructor == 'function' && !isPrototype(object))
+    ? baseCreate(getPrototype(object))
+    : {};
+}
+
+/**
+ * Initializes an object clone based on its `toStringTag`.
+ *
+ * **Note:** This function only supports cloning values with tags of
+ * `Boolean`, `Date`, `Error`, `Number`, `RegExp`, or `String`.
+ *
+ * @private
+ * @param {Object} object The object to clone.
+ * @param {string} tag The `toStringTag` of the object to clone.
+ * @param {Function} cloneFunc The function to clone values.
+ * @param {boolean} [isDeep] Specify a deep clone.
+ * @returns {Object} Returns the initialized clone.
+ */
+function initCloneByTag(object, tag, cloneFunc, isDeep) {
+  var Ctor = object.constructor;
+  switch (tag) {
+    case arrayBufferTag:
+      return cloneArrayBuffer(object);
+
+    case boolTag:
+    case dateTag:
+      return new Ctor(+object);
+
+    case dataViewTag:
+      return cloneDataView(object, isDeep);
+
+    case float32Tag: case float64Tag:
+    case int8Tag: case int16Tag: case int32Tag:
+    case uint8Tag: case uint8ClampedTag: case uint16Tag: case uint32Tag:
+      return cloneTypedArray(object, isDeep);
+
+    case mapTag:
+      return cloneMap(object, isDeep, cloneFunc);
+
+    case numberTag:
+    case stringTag:
+      return new Ctor(object);
+
+    case regexpTag:
+      return cloneRegExp(object);
+
+    case setTag:
+      return cloneSet(object, isDeep, cloneFunc);
+
+    case symbolTag:
+      return cloneSymbol(object);
+  }
+}
+
+/**
+ * Creates an array of index keys for `object` values of arrays,
+ * `arguments` objects, and strings, otherwise `null` is returned.
+ *
+ * @private
+ * @param {Object} object The object to query.
+ * @returns {Array|null} Returns index keys, else `null`.
+ */
+function indexKeys(object) {
+  var length = object ? object.length : undefined;
+  if (isLength(length) &&
+      (isArray(object) || isString(object) || isArguments(object))) {
+    return baseTimes(length, String);
+  }
+  return null;
+}
+
+/**
+ * Checks if `value` is a valid array-like index.
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @param {number} [length=MAX_SAFE_INTEGER] The upper bounds of a valid index.
+ * @returns {boolean} Returns `true` if `value` is a valid index, else `false`.
+ */
+function isIndex(value, length) {
+  length = length == null ? MAX_SAFE_INTEGER : length;
+  return !!length &&
+    (typeof value == 'number' || reIsUint.test(value)) &&
+    (value > -1 && value % 1 == 0 && value < length);
+}
+
+/**
+ * Checks if `value` is suitable for use as unique object key.
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is suitable, else `false`.
+ */
+function isKeyable(value) {
+  var type = typeof value;
+  return (type == 'string' || type == 'number' || type == 'symbol' || type == 'boolean')
+    ? (value !== '__proto__')
+    : (value === null);
+}
+
+/**
+ * Checks if `value` is likely a prototype object.
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is a prototype, else `false`.
+ */
+function isPrototype(value) {
+  var Ctor = value && value.constructor,
+      proto = (typeof Ctor == 'function' && Ctor.prototype) || objectProto;
+
+  return value === proto;
+}
+
+/**
+ * Converts `func` to its source code.
+ *
+ * @private
+ * @param {Function} func The function to process.
+ * @returns {string} Returns the source code.
+ */
+function toSource(func) {
+  if (func != null) {
+    try {
+      return funcToString.call(func);
+    } catch (e) {}
+    try {
+      return (func + '');
+    } catch (e) {}
+  }
+  return '';
+}
+
+/**
+ * Performs a
+ * [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+ * comparison between two values to determine if they are equivalent.
+ *
+ * @static
+ * @memberOf _
+ * @since 4.0.0
+ * @category Lang
+ * @param {*} value The value to compare.
+ * @param {*} other The other value to compare.
+ * @returns {boolean} Returns `true` if the values are equivalent, else `false`.
+ * @example
+ *
+ * var object = { 'user': 'fred' };
+ * var other = { 'user': 'fred' };
+ *
+ * _.eq(object, object);
+ * // => true
+ *
+ * _.eq(object, other);
+ * // => false
+ *
+ * _.eq('a', 'a');
+ * // => true
+ *
+ * _.eq('a', Object('a'));
+ * // => false
+ *
+ * _.eq(NaN, NaN);
+ * // => true
+ */
+function eq(value, other) {
+  return value === other || (value !== value && other !== other);
+}
+
+/**
+ * Checks if `value` is likely an `arguments` object.
+ *
+ * @static
+ * @memberOf _
+ * @since 0.1.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is correctly classified,
+ *  else `false`.
+ * @example
+ *
+ * _.isArguments(function() { return arguments; }());
+ * // => true
+ *
+ * _.isArguments([1, 2, 3]);
+ * // => false
+ */
+function isArguments(value) {
+  // Safari 8.1 incorrectly makes `arguments.callee` enumerable in strict mode.
+  return isArrayLikeObject(value) && hasOwnProperty.call(value, 'callee') &&
+    (!propertyIsEnumerable.call(value, 'callee') || objectToString.call(value) == argsTag);
+}
+
+/**
+ * Checks if `value` is classified as an `Array` object.
+ *
+ * @static
+ * @memberOf _
+ * @since 0.1.0
+ * @type {Function}
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is correctly classified,
+ *  else `false`.
+ * @example
+ *
+ * _.isArray([1, 2, 3]);
+ * // => true
+ *
+ * _.isArray(document.body.children);
+ * // => false
+ *
+ * _.isArray('abc');
+ * // => false
+ *
+ * _.isArray(_.noop);
+ * // => false
+ */
+var isArray = Array.isArray;
+
+/**
+ * Checks if `value` is array-like. A value is considered array-like if it's
+ * not a function and has a `value.length` that's an integer greater than or
+ * equal to `0` and less than or equal to `Number.MAX_SAFE_INTEGER`.
+ *
+ * @static
+ * @memberOf _
+ * @since 4.0.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is array-like, else `false`.
+ * @example
+ *
+ * _.isArrayLike([1, 2, 3]);
+ * // => true
+ *
+ * _.isArrayLike(document.body.children);
+ * // => true
+ *
+ * _.isArrayLike('abc');
+ * // => true
+ *
+ * _.isArrayLike(_.noop);
+ * // => false
+ */
+function isArrayLike(value) {
+  return value != null && isLength(getLength(value)) && !isFunction(value);
+}
+
+/**
+ * This method is like `_.isArrayLike` except that it also checks if `value`
+ * is an object.
+ *
+ * @static
+ * @memberOf _
+ * @since 4.0.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is an array-like object,
+ *  else `false`.
+ * @example
+ *
+ * _.isArrayLikeObject([1, 2, 3]);
+ * // => true
+ *
+ * _.isArrayLikeObject(document.body.children);
+ * // => true
+ *
+ * _.isArrayLikeObject('abc');
+ * // => false
+ *
+ * _.isArrayLikeObject(_.noop);
+ * // => false
+ */
+function isArrayLikeObject(value) {
+  return isObjectLike(value) && isArrayLike(value);
+}
+
+/**
+ * Checks if `value` is a buffer.
+ *
+ * @static
+ * @memberOf _
+ * @since 4.3.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is a buffer, else `false`.
+ * @example
+ *
+ * _.isBuffer(new Buffer(2));
+ * // => true
+ *
+ * _.isBuffer(new Uint8Array(2));
+ * // => false
+ */
+var isBuffer = !Buffer ? constant(false) : function(value) {
+  return value instanceof Buffer;
+};
+
+/**
+ * Checks if `value` is classified as a `Function` object.
+ *
+ * @static
+ * @memberOf _
+ * @since 0.1.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is correctly classified,
+ *  else `false`.
+ * @example
+ *
+ * _.isFunction(_);
+ * // => true
+ *
+ * _.isFunction(/abc/);
+ * // => false
+ */
+function isFunction(value) {
+  // The use of `Object#toString` avoids issues with the `typeof` operator
+  // in Safari 8 which returns 'object' for typed array and weak map constructors,
+  // and PhantomJS 1.9 which returns 'function' for `NodeList` instances.
+  var tag = isObject(value) ? objectToString.call(value) : '';
+  return tag == funcTag || tag == genTag;
+}
+
+/**
+ * Checks if `value` is a valid array-like length.
+ *
+ * **Note:** This function is loosely based on
+ * [`ToLength`](http://ecma-international.org/ecma-262/6.0/#sec-tolength).
+ *
+ * @static
+ * @memberOf _
+ * @since 4.0.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is a valid length,
+ *  else `false`.
+ * @example
+ *
+ * _.isLength(3);
+ * // => true
+ *
+ * _.isLength(Number.MIN_VALUE);
+ * // => false
+ *
+ * _.isLength(Infinity);
+ * // => false
+ *
+ * _.isLength('3');
+ * // => false
+ */
+function isLength(value) {
+  return typeof value == 'number' &&
+    value > -1 && value % 1 == 0 && value <= MAX_SAFE_INTEGER;
+}
+
+/**
+ * Checks if `value` is the
+ * [language type](http://www.ecma-international.org/ecma-262/6.0/#sec-ecmascript-language-types)
+ * of `Object`. (e.g. arrays, functions, objects, regexes, `new Number(0)`, and `new String('')`)
+ *
+ * @static
+ * @memberOf _
+ * @since 0.1.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is an object, else `false`.
+ * @example
+ *
+ * _.isObject({});
+ * // => true
+ *
+ * _.isObject([1, 2, 3]);
+ * // => true
+ *
+ * _.isObject(_.noop);
+ * // => true
+ *
+ * _.isObject(null);
+ * // => false
+ */
+function isObject(value) {
+  var type = typeof value;
+  return !!value && (type == 'object' || type == 'function');
+}
+
+/**
+ * Checks if `value` is object-like. A value is object-like if it's not `null`
+ * and has a `typeof` result of "object".
+ *
+ * @static
+ * @memberOf _
+ * @since 4.0.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is object-like, else `false`.
+ * @example
+ *
+ * _.isObjectLike({});
+ * // => true
+ *
+ * _.isObjectLike([1, 2, 3]);
+ * // => true
+ *
+ * _.isObjectLike(_.noop);
+ * // => false
+ *
+ * _.isObjectLike(null);
+ * // => false
+ */
+function isObjectLike(value) {
+  return !!value && typeof value == 'object';
+}
+
+/**
+ * Checks if `value` is a native function.
+ *
+ * @static
+ * @memberOf _
+ * @since 3.0.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is a native function,
+ *  else `false`.
+ * @example
+ *
+ * _.isNative(Array.prototype.push);
+ * // => true
+ *
+ * _.isNative(_);
+ * // => false
+ */
+function isNative(value) {
+  if (!isObject(value)) {
+    return false;
+  }
+  var pattern = (isFunction(value) || isHostObject(value)) ? reIsNative : reIsHostCtor;
+  return pattern.test(toSource(value));
+}
+
+/**
+ * Checks if `value` is classified as a `String` primitive or object.
+ *
+ * @static
+ * @since 0.1.0
+ * @memberOf _
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is correctly classified,
+ *  else `false`.
+ * @example
+ *
+ * _.isString('abc');
+ * // => true
+ *
+ * _.isString(1);
+ * // => false
+ */
+function isString(value) {
+  return typeof value == 'string' ||
+    (!isArray(value) && isObjectLike(value) && objectToString.call(value) == stringTag);
+}
+
+/**
+ * Creates an array of the own enumerable property names of `object`.
+ *
+ * **Note:** Non-object values are coerced to objects. See the
+ * [ES spec](http://ecma-international.org/ecma-262/6.0/#sec-object.keys)
+ * for more details.
+ *
+ * @static
+ * @since 0.1.0
+ * @memberOf _
+ * @category Object
+ * @param {Object} object The object to query.
+ * @returns {Array} Returns the array of property names.
+ * @example
+ *
+ * function Foo() {
+ *   this.a = 1;
+ *   this.b = 2;
+ * }
+ *
+ * Foo.prototype.c = 3;
+ *
+ * _.keys(new Foo);
+ * // => ['a', 'b'] (iteration order is not guaranteed)
+ *
+ * _.keys('hi');
+ * // => ['0', '1']
+ */
+function keys(object) {
+  var isProto = isPrototype(object);
+  if (!(isProto || isArrayLike(object))) {
+    return baseKeys(object);
+  }
+  var indexes = indexKeys(object),
+      skipIndexes = !!indexes,
+      result = indexes || [],
+      length = result.length;
+
+  for (var key in object) {
+    if (baseHas(object, key) &&
+        !(skipIndexes && (key == 'length' || isIndex(key, length))) &&
+        !(isProto && key == 'constructor')) {
+      result.push(key);
+    }
+  }
+  return result;
+}
+
+/**
+ * Creates a function that returns `value`.
+ *
+ * @static
+ * @memberOf _
+ * @since 2.4.0
+ * @category Util
+ * @param {*} value The value to return from the new function.
+ * @returns {Function} Returns the new constant function.
+ * @example
+ *
+ * var object = { 'user': 'fred' };
+ * var getter = _.constant(object);
+ *
+ * getter() === object;
+ * // => true
+ */
+function constant(value) {
+  return function() {
+    return value;
+  };
+}
+
+module.exports = baseClone;
+
+/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(163)(module)))
+
+/***/ }),
+/* 749 */
+/***/ (function(module, exports, __webpack_require__) {
+
+/**
+ * lodash 4.3.2 (Custom Build) <https://lodash.com/>
+ * Build: `lodash modularize exports="npm" -o ./`
+ * Copyright 2012-2016 The Dojo Foundation <http://dojofoundation.org/>
+ * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
+ * Copyright 2009-2016 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+ * Available under MIT license <https://lodash.com/license>
+ */
+var baseClone = __webpack_require__(748);
+
+/**
+ * Creates a shallow clone of `value`.
+ *
+ * **Note:** This method is loosely based on the
+ * [structured clone algorithm](https://mdn.io/Structured_clone_algorithm)
+ * and supports cloning arrays, array buffers, booleans, date objects, maps,
+ * numbers, `Object` objects, regexes, sets, strings, symbols, and typed
+ * arrays. The own enumerable properties of `arguments` objects are cloned
+ * as plain objects. An empty object is returned for uncloneable values such
+ * as error objects, functions, DOM nodes, and WeakMaps.
+ *
+ * @static
+ * @memberOf _
+ * @category Lang
+ * @param {*} value The value to clone.
+ * @returns {*} Returns the cloned value.
+ * @example
+ *
+ * var objects = [{ 'a': 1 }, { 'b': 2 }];
+ *
+ * var shallow = _.clone(objects);
+ * console.log(shallow[0] === objects[0]);
+ * // => true
+ */
+function clone(value) {
+  return baseClone(value, false, true);
+}
+
+module.exports = clone;
+
+
+/***/ }),
+/* 750 */
+/***/ (function(module, exports) {
+
+/**
+ * lodash (Custom Build) <https://lodash.com/>
+ * Build: `lodash modularize exports="npm" -o ./`
+ * Copyright jQuery Foundation and other contributors <https://jquery.org/>
+ * Released under MIT license <https://lodash.com/license>
+ * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
+ * Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+ */
+
+/** Used as references for various `Number` constants. */
+var MAX_SAFE_INTEGER = 9007199254740991;
+
+/** `Object#toString` result references. */
+var argsTag = '[object Arguments]',
+    funcTag = '[object Function]',
+    genTag = '[object GeneratorFunction]',
+    mapTag = '[object Map]',
+    objectTag = '[object Object]',
+    promiseTag = '[object Promise]',
+    setTag = '[object Set]',
+    stringTag = '[object String]',
+    weakMapTag = '[object WeakMap]';
+
+var dataViewTag = '[object DataView]';
+
+/**
+ * Used to match `RegExp`
+ * [syntax characters](http://ecma-international.org/ecma-262/7.0/#sec-patterns).
+ */
+var reRegExpChar = /[\\^$.*+?()[\]{}|]/g;
+
+/** Used to detect host constructors (Safari). */
+var reIsHostCtor = /^\[object .+?Constructor\]$/;
+
+/** Used to detect unsigned integer values. */
+var reIsUint = /^(?:0|[1-9]\d*)$/;
+
+/** Used to compose unicode character classes. */
+var rsAstralRange = '\\ud800-\\udfff',
+    rsComboMarksRange = '\\u0300-\\u036f\\ufe20-\\ufe23',
+    rsComboSymbolsRange = '\\u20d0-\\u20f0',
+    rsVarRange = '\\ufe0e\\ufe0f';
+
+/** Used to compose unicode capture groups. */
+var rsAstral = '[' + rsAstralRange + ']',
+    rsCombo = '[' + rsComboMarksRange + rsComboSymbolsRange + ']',
+    rsFitz = '\\ud83c[\\udffb-\\udfff]',
+    rsModifier = '(?:' + rsCombo + '|' + rsFitz + ')',
+    rsNonAstral = '[^' + rsAstralRange + ']',
+    rsRegional = '(?:\\ud83c[\\udde6-\\uddff]){2}',
+    rsSurrPair = '[\\ud800-\\udbff][\\udc00-\\udfff]',
+    rsZWJ = '\\u200d';
+
+/** Used to compose unicode regexes. */
+var reOptMod = rsModifier + '?',
+    rsOptVar = '[' + rsVarRange + ']?',
+    rsOptJoin = '(?:' + rsZWJ + '(?:' + [rsNonAstral, rsRegional, rsSurrPair].join('|') + ')' + rsOptVar + reOptMod + ')*',
+    rsSeq = rsOptVar + reOptMod + rsOptJoin,
+    rsSymbol = '(?:' + [rsNonAstral + rsCombo + '?', rsCombo, rsRegional, rsSurrPair, rsAstral].join('|') + ')';
+
+/** Used to match [string symbols](https://mathiasbynens.be/notes/javascript-unicode). */
+var reUnicode = RegExp(rsFitz + '(?=' + rsFitz + ')|' + rsSymbol + rsSeq, 'g');
+
+/** Used to detect strings with [zero-width joiners or code points from the astral planes](http://eev.ee/blog/2015/09/12/dark-corners-of-unicode/). */
+var reHasUnicode = RegExp('[' + rsZWJ + rsAstralRange  + rsComboMarksRange + rsComboSymbolsRange + rsVarRange + ']');
+
+/** Detect free variable `global` from Node.js. */
+var freeGlobal = typeof global == 'object' && global && global.Object === Object && global;
+
+/** Detect free variable `self`. */
+var freeSelf = typeof self == 'object' && self && self.Object === Object && self;
+
+/** Used as a reference to the global object. */
+var root = freeGlobal || freeSelf || Function('return this')();
+
+/**
+ * A specialized version of `_.map` for arrays without support for iteratee
+ * shorthands.
+ *
+ * @private
+ * @param {Array} [array] The array to iterate over.
+ * @param {Function} iteratee The function invoked per iteration.
+ * @returns {Array} Returns the new mapped array.
+ */
+function arrayMap(array, iteratee) {
+  var index = -1,
+      length = array ? array.length : 0,
+      result = Array(length);
+
+  while (++index < length) {
+    result[index] = iteratee(array[index], index, array);
+  }
+  return result;
+}
+
+/**
+ * Converts an ASCII `string` to an array.
+ *
+ * @private
+ * @param {string} string The string to convert.
+ * @returns {Array} Returns the converted array.
+ */
+function asciiToArray(string) {
+  return string.split('');
+}
+
+/**
+ * The base implementation of `_.times` without support for iteratee shorthands
+ * or max array length checks.
+ *
+ * @private
+ * @param {number} n The number of times to invoke `iteratee`.
+ * @param {Function} iteratee The function invoked per iteration.
+ * @returns {Array} Returns the array of results.
+ */
+function baseTimes(n, iteratee) {
+  var index = -1,
+      result = Array(n);
+
+  while (++index < n) {
+    result[index] = iteratee(index);
+  }
+  return result;
+}
+
+/**
+ * The base implementation of `_.values` and `_.valuesIn` which creates an
+ * array of `object` property values corresponding to the property names
+ * of `props`.
+ *
+ * @private
+ * @param {Object} object The object to query.
+ * @param {Array} props The property names to get values for.
+ * @returns {Object} Returns the array of property values.
+ */
+function baseValues(object, props) {
+  return arrayMap(props, function(key) {
+    return object[key];
+  });
+}
+
+/**
+ * Gets the value at `key` of `object`.
+ *
+ * @private
+ * @param {Object} [object] The object to query.
+ * @param {string} key The key of the property to get.
+ * @returns {*} Returns the property value.
+ */
+function getValue(object, key) {
+  return object == null ? undefined : object[key];
+}
+
+/**
+ * Checks if `string` contains Unicode symbols.
+ *
+ * @private
+ * @param {string} string The string to inspect.
+ * @returns {boolean} Returns `true` if a symbol is found, else `false`.
+ */
+function hasUnicode(string) {
+  return reHasUnicode.test(string);
+}
+
+/**
+ * Checks if `value` is a host object in IE < 9.
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is a host object, else `false`.
+ */
+function isHostObject(value) {
+  // Many host objects are `Object` objects that can coerce to strings
+  // despite having improperly defined `toString` methods.
+  var result = false;
+  if (value != null && typeof value.toString != 'function') {
+    try {
+      result = !!(value + '');
+    } catch (e) {}
+  }
+  return result;
+}
+
+/**
+ * Converts `iterator` to an array.
+ *
+ * @private
+ * @param {Object} iterator The iterator to convert.
+ * @returns {Array} Returns the converted array.
+ */
+function iteratorToArray(iterator) {
+  var data,
+      result = [];
+
+  while (!(data = iterator.next()).done) {
+    result.push(data.value);
+  }
+  return result;
+}
+
+/**
+ * Converts `map` to its key-value pairs.
+ *
+ * @private
+ * @param {Object} map The map to convert.
+ * @returns {Array} Returns the key-value pairs.
+ */
+function mapToArray(map) {
+  var index = -1,
+      result = Array(map.size);
+
+  map.forEach(function(value, key) {
+    result[++index] = [key, value];
+  });
+  return result;
+}
+
+/**
+ * Creates a unary function that invokes `func` with its argument transformed.
+ *
+ * @private
+ * @param {Function} func The function to wrap.
+ * @param {Function} transform The argument transform.
+ * @returns {Function} Returns the new function.
+ */
+function overArg(func, transform) {
+  return function(arg) {
+    return func(transform(arg));
+  };
+}
+
+/**
+ * Converts `set` to an array of its values.
+ *
+ * @private
+ * @param {Object} set The set to convert.
+ * @returns {Array} Returns the values.
+ */
+function setToArray(set) {
+  var index = -1,
+      result = Array(set.size);
+
+  set.forEach(function(value) {
+    result[++index] = value;
+  });
+  return result;
+}
+
+/**
+ * Converts `string` to an array.
+ *
+ * @private
+ * @param {string} string The string to convert.
+ * @returns {Array} Returns the converted array.
+ */
+function stringToArray(string) {
+  return hasUnicode(string)
+    ? unicodeToArray(string)
+    : asciiToArray(string);
+}
+
+/**
+ * Converts a Unicode `string` to an array.
+ *
+ * @private
+ * @param {string} string The string to convert.
+ * @returns {Array} Returns the converted array.
+ */
+function unicodeToArray(string) {
+  return string.match(reUnicode) || [];
+}
+
+/** Used for built-in method references. */
+var funcProto = Function.prototype,
+    objectProto = Object.prototype;
+
+/** Used to detect overreaching core-js shims. */
+var coreJsData = root['__core-js_shared__'];
+
+/** Used to detect methods masquerading as native. */
+var maskSrcKey = (function() {
+  var uid = /[^.]+$/.exec(coreJsData && coreJsData.keys && coreJsData.keys.IE_PROTO || '');
+  return uid ? ('Symbol(src)_1.' + uid) : '';
+}());
+
+/** Used to resolve the decompiled source of functions. */
+var funcToString = funcProto.toString;
+
+/** Used to check objects for own properties. */
+var hasOwnProperty = objectProto.hasOwnProperty;
+
+/**
+ * Used to resolve the
+ * [`toStringTag`](http://ecma-international.org/ecma-262/7.0/#sec-object.prototype.tostring)
+ * of values.
+ */
+var objectToString = objectProto.toString;
+
+/** Used to detect if a method is native. */
+var reIsNative = RegExp('^' +
+  funcToString.call(hasOwnProperty).replace(reRegExpChar, '\\$&')
+  .replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g, '$1.*?') + '$'
+);
+
+/** Built-in value references. */
+var Symbol = root.Symbol,
+    iteratorSymbol = Symbol ? Symbol.iterator : undefined,
+    propertyIsEnumerable = objectProto.propertyIsEnumerable;
+
+/* Built-in method references for those with the same name as other `lodash` methods. */
+var nativeKeys = overArg(Object.keys, Object);
+
+/* Built-in method references that are verified to be native. */
+var DataView = getNative(root, 'DataView'),
+    Map = getNative(root, 'Map'),
+    Promise = getNative(root, 'Promise'),
+    Set = getNative(root, 'Set'),
+    WeakMap = getNative(root, 'WeakMap');
+
+/** Used to detect maps, sets, and weakmaps. */
+var dataViewCtorString = toSource(DataView),
+    mapCtorString = toSource(Map),
+    promiseCtorString = toSource(Promise),
+    setCtorString = toSource(Set),
+    weakMapCtorString = toSource(WeakMap);
+
+/**
+ * Creates an array of the enumerable property names of the array-like `value`.
+ *
+ * @private
+ * @param {*} value The value to query.
+ * @param {boolean} inherited Specify returning inherited property names.
+ * @returns {Array} Returns the array of property names.
+ */
+function arrayLikeKeys(value, inherited) {
+  // Safari 8.1 makes `arguments.callee` enumerable in strict mode.
+  // Safari 9 makes `arguments.length` enumerable in strict mode.
+  var result = (isArray(value) || isArguments(value))
+    ? baseTimes(value.length, String)
+    : [];
+
+  var length = result.length,
+      skipIndexes = !!length;
+
+  for (var key in value) {
+    if ((inherited || hasOwnProperty.call(value, key)) &&
+        !(skipIndexes && (key == 'length' || isIndex(key, length)))) {
+      result.push(key);
+    }
+  }
+  return result;
+}
+
+/**
+ * The base implementation of `getTag`.
+ *
+ * @private
+ * @param {*} value The value to query.
+ * @returns {string} Returns the `toStringTag`.
+ */
+function baseGetTag(value) {
+  return objectToString.call(value);
+}
+
+/**
+ * The base implementation of `_.isNative` without bad shim checks.
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is a native function,
+ *  else `false`.
+ */
+function baseIsNative(value) {
+  if (!isObject(value) || isMasked(value)) {
+    return false;
+  }
+  var pattern = (isFunction(value) || isHostObject(value)) ? reIsNative : reIsHostCtor;
+  return pattern.test(toSource(value));
+}
+
+/**
+ * The base implementation of `_.keys` which doesn't treat sparse arrays as dense.
+ *
+ * @private
+ * @param {Object} object The object to query.
+ * @returns {Array} Returns the array of property names.
+ */
+function baseKeys(object) {
+  if (!isPrototype(object)) {
+    return nativeKeys(object);
+  }
+  var result = [];
+  for (var key in Object(object)) {
+    if (hasOwnProperty.call(object, key) && key != 'constructor') {
+      result.push(key);
+    }
+  }
+  return result;
+}
+
+/**
+ * Copies the values of `source` to `array`.
+ *
+ * @private
+ * @param {Array} source The array to copy values from.
+ * @param {Array} [array=[]] The array to copy values to.
+ * @returns {Array} Returns `array`.
+ */
+function copyArray(source, array) {
+  var index = -1,
+      length = source.length;
+
+  array || (array = Array(length));
+  while (++index < length) {
+    array[index] = source[index];
+  }
+  return array;
+}
+
+/**
+ * Gets the native function at `key` of `object`.
+ *
+ * @private
+ * @param {Object} object The object to query.
+ * @param {string} key The key of the method to get.
+ * @returns {*} Returns the function if it's native, else `undefined`.
+ */
+function getNative(object, key) {
+  var value = getValue(object, key);
+  return baseIsNative(value) ? value : undefined;
+}
+
+/**
+ * Gets the `toStringTag` of `value`.
+ *
+ * @private
+ * @param {*} value The value to query.
+ * @returns {string} Returns the `toStringTag`.
+ */
+var getTag = baseGetTag;
+
+// Fallback for data views, maps, sets, and weak maps in IE 11,
+// for data views in Edge < 14, and promises in Node.js.
+if ((DataView && getTag(new DataView(new ArrayBuffer(1))) != dataViewTag) ||
+    (Map && getTag(new Map) != mapTag) ||
+    (Promise && getTag(Promise.resolve()) != promiseTag) ||
+    (Set && getTag(new Set) != setTag) ||
+    (WeakMap && getTag(new WeakMap) != weakMapTag)) {
+  getTag = function(value) {
+    var result = objectToString.call(value),
+        Ctor = result == objectTag ? value.constructor : undefined,
+        ctorString = Ctor ? toSource(Ctor) : undefined;
+
+    if (ctorString) {
+      switch (ctorString) {
+        case dataViewCtorString: return dataViewTag;
+        case mapCtorString: return mapTag;
+        case promiseCtorString: return promiseTag;
+        case setCtorString: return setTag;
+        case weakMapCtorString: return weakMapTag;
+      }
+    }
+    return result;
+  };
+}
+
+/**
+ * Checks if `value` is a valid array-like index.
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @param {number} [length=MAX_SAFE_INTEGER] The upper bounds of a valid index.
+ * @returns {boolean} Returns `true` if `value` is a valid index, else `false`.
+ */
+function isIndex(value, length) {
+  length = length == null ? MAX_SAFE_INTEGER : length;
+  return !!length &&
+    (typeof value == 'number' || reIsUint.test(value)) &&
+    (value > -1 && value % 1 == 0 && value < length);
+}
+
+/**
+ * Checks if `func` has its source masked.
+ *
+ * @private
+ * @param {Function} func The function to check.
+ * @returns {boolean} Returns `true` if `func` is masked, else `false`.
+ */
+function isMasked(func) {
+  return !!maskSrcKey && (maskSrcKey in func);
+}
+
+/**
+ * Checks if `value` is likely a prototype object.
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is a prototype, else `false`.
+ */
+function isPrototype(value) {
+  var Ctor = value && value.constructor,
+      proto = (typeof Ctor == 'function' && Ctor.prototype) || objectProto;
+
+  return value === proto;
+}
+
+/**
+ * Converts `func` to its source code.
+ *
+ * @private
+ * @param {Function} func The function to process.
+ * @returns {string} Returns the source code.
+ */
+function toSource(func) {
+  if (func != null) {
+    try {
+      return funcToString.call(func);
+    } catch (e) {}
+    try {
+      return (func + '');
+    } catch (e) {}
+  }
+  return '';
+}
+
+/**
+ * Checks if `value` is likely an `arguments` object.
+ *
+ * @static
+ * @memberOf _
+ * @since 0.1.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is an `arguments` object,
+ *  else `false`.
+ * @example
+ *
+ * _.isArguments(function() { return arguments; }());
+ * // => true
+ *
+ * _.isArguments([1, 2, 3]);
+ * // => false
+ */
+function isArguments(value) {
+  // Safari 8.1 makes `arguments.callee` enumerable in strict mode.
+  return isArrayLikeObject(value) && hasOwnProperty.call(value, 'callee') &&
+    (!propertyIsEnumerable.call(value, 'callee') || objectToString.call(value) == argsTag);
+}
+
+/**
+ * Checks if `value` is classified as an `Array` object.
+ *
+ * @static
+ * @memberOf _
+ * @since 0.1.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is an array, else `false`.
+ * @example
+ *
+ * _.isArray([1, 2, 3]);
+ * // => true
+ *
+ * _.isArray(document.body.children);
+ * // => false
+ *
+ * _.isArray('abc');
+ * // => false
+ *
+ * _.isArray(_.noop);
+ * // => false
+ */
+var isArray = Array.isArray;
+
+/**
+ * Checks if `value` is array-like. A value is considered array-like if it's
+ * not a function and has a `value.length` that's an integer greater than or
+ * equal to `0` and less than or equal to `Number.MAX_SAFE_INTEGER`.
+ *
+ * @static
+ * @memberOf _
+ * @since 4.0.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is array-like, else `false`.
+ * @example
+ *
+ * _.isArrayLike([1, 2, 3]);
+ * // => true
+ *
+ * _.isArrayLike(document.body.children);
+ * // => true
+ *
+ * _.isArrayLike('abc');
+ * // => true
+ *
+ * _.isArrayLike(_.noop);
+ * // => false
+ */
+function isArrayLike(value) {
+  return value != null && isLength(value.length) && !isFunction(value);
+}
+
+/**
+ * This method is like `_.isArrayLike` except that it also checks if `value`
+ * is an object.
+ *
+ * @static
+ * @memberOf _
+ * @since 4.0.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is an array-like object,
+ *  else `false`.
+ * @example
+ *
+ * _.isArrayLikeObject([1, 2, 3]);
+ * // => true
+ *
+ * _.isArrayLikeObject(document.body.children);
+ * // => true
+ *
+ * _.isArrayLikeObject('abc');
+ * // => false
+ *
+ * _.isArrayLikeObject(_.noop);
+ * // => false
+ */
+function isArrayLikeObject(value) {
+  return isObjectLike(value) && isArrayLike(value);
+}
+
+/**
+ * Checks if `value` is classified as a `Function` object.
+ *
+ * @static
+ * @memberOf _
+ * @since 0.1.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is a function, else `false`.
+ * @example
+ *
+ * _.isFunction(_);
+ * // => true
+ *
+ * _.isFunction(/abc/);
+ * // => false
+ */
+function isFunction(value) {
+  // The use of `Object#toString` avoids issues with the `typeof` operator
+  // in Safari 8-9 which returns 'object' for typed array and other constructors.
+  var tag = isObject(value) ? objectToString.call(value) : '';
+  return tag == funcTag || tag == genTag;
+}
+
+/**
+ * Checks if `value` is a valid array-like length.
+ *
+ * **Note:** This method is loosely based on
+ * [`ToLength`](http://ecma-international.org/ecma-262/7.0/#sec-tolength).
+ *
+ * @static
+ * @memberOf _
+ * @since 4.0.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is a valid length, else `false`.
+ * @example
+ *
+ * _.isLength(3);
+ * // => true
+ *
+ * _.isLength(Number.MIN_VALUE);
+ * // => false
+ *
+ * _.isLength(Infinity);
+ * // => false
+ *
+ * _.isLength('3');
+ * // => false
+ */
+function isLength(value) {
+  return typeof value == 'number' &&
+    value > -1 && value % 1 == 0 && value <= MAX_SAFE_INTEGER;
+}
+
+/**
+ * Checks if `value` is the
+ * [language type](http://www.ecma-international.org/ecma-262/7.0/#sec-ecmascript-language-types)
+ * of `Object`. (e.g. arrays, functions, objects, regexes, `new Number(0)`, and `new String('')`)
+ *
+ * @static
+ * @memberOf _
+ * @since 0.1.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is an object, else `false`.
+ * @example
+ *
+ * _.isObject({});
+ * // => true
+ *
+ * _.isObject([1, 2, 3]);
+ * // => true
+ *
+ * _.isObject(_.noop);
+ * // => true
+ *
+ * _.isObject(null);
+ * // => false
+ */
+function isObject(value) {
+  var type = typeof value;
+  return !!value && (type == 'object' || type == 'function');
+}
+
+/**
+ * Checks if `value` is object-like. A value is object-like if it's not `null`
+ * and has a `typeof` result of "object".
+ *
+ * @static
+ * @memberOf _
+ * @since 4.0.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is object-like, else `false`.
+ * @example
+ *
+ * _.isObjectLike({});
+ * // => true
+ *
+ * _.isObjectLike([1, 2, 3]);
+ * // => true
+ *
+ * _.isObjectLike(_.noop);
+ * // => false
+ *
+ * _.isObjectLike(null);
+ * // => false
+ */
+function isObjectLike(value) {
+  return !!value && typeof value == 'object';
+}
+
+/**
+ * Checks if `value` is classified as a `String` primitive or object.
+ *
+ * @static
+ * @since 0.1.0
+ * @memberOf _
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is a string, else `false`.
+ * @example
+ *
+ * _.isString('abc');
+ * // => true
+ *
+ * _.isString(1);
+ * // => false
+ */
+function isString(value) {
+  return typeof value == 'string' ||
+    (!isArray(value) && isObjectLike(value) && objectToString.call(value) == stringTag);
+}
+
+/**
+ * Converts `value` to an array.
+ *
+ * @static
+ * @since 0.1.0
+ * @memberOf _
+ * @category Lang
+ * @param {*} value The value to convert.
+ * @returns {Array} Returns the converted array.
+ * @example
+ *
+ * _.toArray({ 'a': 1, 'b': 2 });
+ * // => [1, 2]
+ *
+ * _.toArray('abc');
+ * // => ['a', 'b', 'c']
+ *
+ * _.toArray(1);
+ * // => []
+ *
+ * _.toArray(null);
+ * // => []
+ */
+function toArray(value) {
+  if (!value) {
+    return [];
+  }
+  if (isArrayLike(value)) {
+    return isString(value) ? stringToArray(value) : copyArray(value);
+  }
+  if (iteratorSymbol && value[iteratorSymbol]) {
+    return iteratorToArray(value[iteratorSymbol]());
+  }
+  var tag = getTag(value),
+      func = tag == mapTag ? mapToArray : (tag == setTag ? setToArray : values);
+
+  return func(value);
+}
+
+/**
+ * Creates an array of the own enumerable property names of `object`.
+ *
+ * **Note:** Non-object values are coerced to objects. See the
+ * [ES spec](http://ecma-international.org/ecma-262/7.0/#sec-object.keys)
+ * for more details.
+ *
+ * @static
+ * @since 0.1.0
+ * @memberOf _
+ * @category Object
+ * @param {Object} object The object to query.
+ * @returns {Array} Returns the array of property names.
+ * @example
+ *
+ * function Foo() {
+ *   this.a = 1;
+ *   this.b = 2;
+ * }
+ *
+ * Foo.prototype.c = 3;
+ *
+ * _.keys(new Foo);
+ * // => ['a', 'b'] (iteration order is not guaranteed)
+ *
+ * _.keys('hi');
+ * // => ['0', '1']
+ */
+function keys(object) {
+  return isArrayLike(object) ? arrayLikeKeys(object) : baseKeys(object);
+}
+
+/**
+ * Creates an array of the own enumerable string keyed property values of `object`.
+ *
+ * **Note:** Non-object values are coerced to objects.
+ *
+ * @static
+ * @since 0.1.0
+ * @memberOf _
+ * @category Object
+ * @param {Object} object The object to query.
+ * @returns {Array} Returns the array of property values.
+ * @example
+ *
+ * function Foo() {
+ *   this.a = 1;
+ *   this.b = 2;
+ * }
+ *
+ * Foo.prototype.c = 3;
+ *
+ * _.values(new Foo);
+ * // => [1, 2] (iteration order is not guaranteed)
+ *
+ * _.values('hi');
+ * // => ['h', 'i']
+ */
+function values(object) {
+  return object ? baseValues(object, keys(object)) : [];
+}
+
+module.exports = toArray;
+
+
+/***/ }),
+/* 751 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var crypto = __webpack_require__(11)
+var max = Math.pow(2, 32)
+
+module.exports = random
+module.exports.cryptographic = true
+
+function random () {
+  var buf = crypto
+    .randomBytes(4)
+    .toString('hex')
+
+  return parseInt(buf, 16) / max
+}
+
+
+/***/ }),
+/* 752 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var chars = {}, unesc, temp;
+
+function reverse(object, prepender) {
+  return Object.keys(object).reduce(function(reversed, key) {
+    var newKey = prepender ? prepender + key : key; // Optionally prepend a string to key.
+    reversed[object[key]] = newKey; // Swap key and value.
+    return reversed; // Return the result.
+  }, {});
+}
+
+/**
+ * Regex for common characters
+ */
+
+chars.escapeRegex = {
+  '?': /\?/g,
+  '@': /\@/g,
+  '!': /\!/g,
+  '+': /\+/g,
+  '*': /\*/g,
+  '(': /\(/g,
+  ')': /\)/g,
+  '[': /\[/g,
+  ']': /\]/g
+};
+
+/**
+ * Escape characters
+ */
+
+chars.ESC = {
+  '?': '__UNESC_QMRK__',
+  '@': '__UNESC_AMPE__',
+  '!': '__UNESC_EXCL__',
+  '+': '__UNESC_PLUS__',
+  '*': '__UNESC_STAR__',
+  ',': '__UNESC_COMMA__',
+  '(': '__UNESC_LTPAREN__',
+  ')': '__UNESC_RTPAREN__',
+  '[': '__UNESC_LTBRACK__',
+  ']': '__UNESC_RTBRACK__'
+};
+
+/**
+ * Unescape characters
+ */
+
+chars.UNESC = unesc || (unesc = reverse(chars.ESC, '\\'));
+
+chars.ESC_TEMP = {
+  '?': '__TEMP_QMRK__',
+  '@': '__TEMP_AMPE__',
+  '!': '__TEMP_EXCL__',
+  '*': '__TEMP_STAR__',
+  '+': '__TEMP_PLUS__',
+  ',': '__TEMP_COMMA__',
+  '(': '__TEMP_LTPAREN__',
+  ')': '__TEMP_RTPAREN__',
+  '[': '__TEMP_LTBRACK__',
+  ']': '__TEMP_RTBRACK__'
+};
+
+chars.TEMP = temp || (temp = reverse(chars.ESC_TEMP));
+
+module.exports = chars;
+
+
+/***/ }),
+/* 753 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*!
+ * micromatch <https://github.com/jonschlinkert/micromatch>
+ *
+ * Copyright (c) 2014-2015, Jon Schlinkert.
+ * Licensed under the MIT License.
+ */
+
+
+
+var utils = __webpack_require__(300);
+var Glob = __webpack_require__(754);
+
+/**
+ * Expose `expand`
+ */
+
+module.exports = expand;
+
+/**
+ * Expand a glob pattern to resolve braces and
+ * similar patterns before converting to regex.
+ *
+ * @param  {String|Array} `pattern`
+ * @param  {Array} `files`
+ * @param  {Options} `opts`
+ * @return {Array}
+ */
+
+function expand(pattern, options) {
+  if (typeof pattern !== 'string') {
+    throw new TypeError('micromatch.expand(): argument should be a string.');
+  }
+
+  var glob = new Glob(pattern, options || {});
+  var opts = glob.options;
+
+  if (!utils.isGlob(pattern)) {
+    glob.pattern = glob.pattern.replace(/([\/.])/g, '\\$1');
+    return glob;
+  }
+
+  glob.pattern = glob.pattern.replace(/(\+)(?!\()/g, '\\$1');
+  glob.pattern = glob.pattern.split('$').join('\\$');
+
+  if (typeof opts.braces !== 'boolean' && typeof opts.nobraces !== 'boolean') {
+    opts.braces = true;
+  }
+
+  if (glob.pattern === '.*') {
+    return {
+      pattern: '\\.' + star,
+      tokens: tok,
+      options: opts
+    };
+  }
+
+  if (glob.pattern === '*') {
+    return {
+      pattern: oneStar(opts.dot),
+      tokens: tok,
+      options: opts
+    };
+  }
+
+  // parse the glob pattern into tokens
+  glob.parse();
+  var tok = glob.tokens;
+  tok.is.negated = opts.negated;
+
+  // dotfile handling
+  if ((opts.dotfiles === true || tok.is.dotfile) && opts.dot !== false) {
+    opts.dotfiles = true;
+    opts.dot = true;
+  }
+
+  if ((opts.dotdirs === true || tok.is.dotdir) && opts.dot !== false) {
+    opts.dotdirs = true;
+    opts.dot = true;
+  }
+
+  // check for braces with a dotfile pattern
+  if (/[{,]\./.test(glob.pattern)) {
+    opts.makeRe = false;
+    opts.dot = true;
+  }
+
+  if (opts.nonegate !== true) {
+    opts.negated = glob.negated;
+  }
+
+  // if the leading character is a dot or a slash, escape it
+  if (glob.pattern.charAt(0) === '.' && glob.pattern.charAt(1) !== '/') {
+    glob.pattern = '\\' + glob.pattern;
+  }
+
+  /**
+   * Extended globs
+   */
+
+  // expand braces, e.g `{1..5}`
+  glob.track('before braces');
+  if (tok.is.braces) {
+    glob.braces();
+  }
+  glob.track('after braces');
+
+  // expand extglobs, e.g `foo/!(a|b)`
+  glob.track('before extglob');
+  if (tok.is.extglob) {
+    glob.extglob();
+  }
+  glob.track('after extglob');
+
+  // expand brackets, e.g `[[:alpha:]]`
+  glob.track('before brackets');
+  if (tok.is.brackets) {
+    glob.brackets();
+  }
+  glob.track('after brackets');
+
+  // special patterns
+  glob._replace('[!', '[^');
+  glob._replace('(?', '(%~');
+  glob._replace(/\[\]/, '\\[\\]');
+  glob._replace('/[', '/' + (opts.dot ? dotfiles : nodot) + '[', true);
+  glob._replace('/?', '/' + (opts.dot ? dotfiles : nodot) + '[^/]', true);
+  glob._replace('/.', '/(?=.)\\.', true);
+
+  // windows drives
+  glob._replace(/^(\w):([\\\/]+?)/gi, '(?=.)$1:$2', true);
+
+  // negate slashes in exclusion ranges
+  if (glob.pattern.indexOf('[^') !== -1) {
+    glob.pattern = negateSlash(glob.pattern);
+  }
+
+  if (opts.globstar !== false && glob.pattern === '**') {
+    glob.pattern = globstar(opts.dot);
+
+  } else {
+    glob.pattern = balance(glob.pattern, '[', ']');
+    glob.escape(glob.pattern);
+
+    // if the pattern has `**`
+    if (tok.is.globstar) {
+      glob.pattern = collapse(glob.pattern, '/**');
+      glob.pattern = collapse(glob.pattern, '**/');
+      glob._replace('/**/', '(?:/' + globstar(opts.dot) + '/|/)', true);
+      glob._replace(/\*{2,}/g, '**');
+
+      // 'foo/*'
+      glob._replace(/(\w+)\*(?!\/)/g, '$1[^/]*?', true);
+      glob._replace(/\*\*\/\*(\w)/g, globstar(opts.dot) + '\\/' + (opts.dot ? dotfiles : nodot) + '[^/]*?$1', true);
+
+      if (opts.dot !== true) {
+        glob._replace(/\*\*\/(.)/g, '(?:**\\/|)$1');
+      }
+
+      // 'foo/**' or '{**,*}', but not 'foo**'
+      if (tok.path.dirname !== '' || /,\*\*|\*\*,/.test(glob.orig)) {
+        glob._replace('**', globstar(opts.dot), true);
+      }
+    }
+
+    // ends with /*
+    glob._replace(/\/\*$/, '\\/' + oneStar(opts.dot), true);
+    // ends with *, no slashes
+    glob._replace(/(?!\/)\*$/, star, true);
+    // has 'n*.' (partial wildcard w/ file extension)
+    glob._replace(/([^\/]+)\*/, '$1' + oneStar(true), true);
+    // has '*'
+    glob._replace('*', oneStar(opts.dot), true);
+    glob._replace('?.', '?\\.', true);
+    glob._replace('?:', '?:', true);
+
+    glob._replace(/\?+/g, function(match) {
+      var len = match.length;
+      if (len === 1) {
+        return qmark;
+      }
+      return qmark + '{' + len + '}';
+    });
+
+    // escape '.abc' => '\\.abc'
+    glob._replace(/\.([*\w]+)/g, '\\.$1');
+    // fix '[^\\\\/]'
+    glob._replace(/\[\^[\\\/]+\]/g, qmark);
+    // '///' => '\/'
+    glob._replace(/\/+/g, '\\/');
+    // '\\\\\\' => '\\'
+    glob._replace(/\\{2,}/g, '\\');
+  }
+
+  // unescape previously escaped patterns
+  glob.unescape(glob.pattern);
+  glob._replace('__UNESC_STAR__', '*');
+
+  // escape dots that follow qmarks
+  glob._replace('?.', '?\\.');
+
+  // remove unnecessary slashes in character classes
+  glob._replace('[^\\/]', qmark);
+
+  if (glob.pattern.length > 1) {
+    if (/^[\[?*]/.test(glob.pattern)) {
+      // only prepend the string if we don't want to match dotfiles
+      glob.pattern = (opts.dot ? dotfiles : nodot) + glob.pattern;
+    }
+  }
+
+  return glob;
+}
+
+/**
+ * Collapse repeated character sequences.
+ *
+ * ```js
+ * collapse('a/../../../b', '../');
+ * //=> 'a/../b'
+ * ```
+ *
+ * @param  {String} `str`
+ * @param  {String} `ch` Character sequence to collapse
+ * @return {String}
+ */
+
+function collapse(str, ch) {
+  var res = str.split(ch);
+  var isFirst = res[0] === '';
+  var isLast = res[res.length - 1] === '';
+  res = res.filter(Boolean);
+  if (isFirst) res.unshift('');
+  if (isLast) res.push('');
+  return res.join(ch);
+}
+
+/**
+ * Negate slashes in exclusion ranges, per glob spec:
+ *
+ * ```js
+ * negateSlash('[^foo]');
+ * //=> '[^\\/foo]'
+ * ```
+ *
+ * @param  {String} `str` glob pattern
+ * @return {String}
+ */
+
+function negateSlash(str) {
+  return str.replace(/\[\^([^\]]*?)\]/g, function(match, inner) {
+    if (inner.indexOf('/') === -1) {
+      inner = '\\/' + inner;
+    }
+    return '[^' + inner + ']';
+  });
+}
+
+/**
+ * Escape imbalanced braces/bracket. This is a very
+ * basic, naive implementation that only does enough
+ * to serve the purpose.
+ */
+
+function balance(str, a, b) {
+  var aarr = str.split(a);
+  var alen = aarr.join('').length;
+  var blen = str.split(b).join('').length;
+
+  if (alen !== blen) {
+    str = aarr.join('\\' + a);
+    return str.split(b).join('\\' + b);
+  }
+  return str;
+}
+
+/**
+ * Special patterns to be converted to regex.
+ * Heuristics are used to simplify patterns
+ * and speed up processing.
+ */
+
+/* eslint no-multi-spaces: 0 */
+var qmark       = '[^/]';
+var star        = qmark + '*?';
+var nodot       = '(?!\\.)(?=.)';
+var dotfileGlob = '(?:\\/|^)\\.{1,2}($|\\/)';
+var dotfiles    = '(?!' + dotfileGlob + ')(?=.)';
+var twoStarDot  = '(?:(?!' + dotfileGlob + ').)*?';
+
+/**
+ * Create a regex for `*`.
+ *
+ * If `dot` is true, or the pattern does not begin with
+ * a leading star, then return the simpler regex.
+ */
+
+function oneStar(dotfile) {
+  return dotfile ? '(?!' + dotfileGlob + ')(?=.)' + star : (nodot + star);
+}
+
+function globstar(dotfile) {
+  if (dotfile) { return twoStarDot; }
+  return '(?:(?!(?:\\/|^)\\.).)*?';
+}
+
+
+/***/ }),
+/* 754 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var chars = __webpack_require__(752);
+var utils = __webpack_require__(300);
+
+/**
+ * Expose `Glob`
+ */
+
+var Glob = module.exports = function Glob(pattern, options) {
+  if (!(this instanceof Glob)) {
+    return new Glob(pattern, options);
+  }
+  this.options = options || {};
+  this.pattern = pattern;
+  this.history = [];
+  this.tokens = {};
+  this.init(pattern);
+};
+
+/**
+ * Initialize defaults
+ */
+
+Glob.prototype.init = function(pattern) {
+  this.orig = pattern;
+  this.negated = this.isNegated();
+  this.options.track = this.options.track || false;
+  this.options.makeRe = true;
+};
+
+/**
+ * Push a change into `glob.history`. Useful
+ * for debugging.
+ */
+
+Glob.prototype.track = function(msg) {
+  if (this.options.track) {
+    this.history.push({msg: msg, pattern: this.pattern});
+  }
+};
+
+/**
+ * Return true if `glob.pattern` was negated
+ * with `!`, also remove the `!` from the pattern.
+ *
+ * @return {Boolean}
+ */
+
+Glob.prototype.isNegated = function() {
+  if (this.pattern.charCodeAt(0) === 33 /* '!' */) {
+    this.pattern = this.pattern.slice(1);
+    return true;
+  }
+  return false;
+};
+
+/**
+ * Expand braces in the given glob pattern.
+ *
+ * We only need to use the [braces] lib when
+ * patterns are nested.
+ */
+
+Glob.prototype.braces = function() {
+  if (this.options.nobraces !== true && this.options.nobrace !== true) {
+    // naive/fast check for imbalanced characters
+    var a = this.pattern.match(/[\{\(\[]/g);
+    var b = this.pattern.match(/[\}\)\]]/g);
+
+    // if imbalanced, don't optimize the pattern
+    if (a && b && (a.length !== b.length)) {
+      this.options.makeRe = false;
+    }
+
+    // expand brace patterns and join the resulting array
+    var expanded = utils.braces(this.pattern, this.options);
+    this.pattern = expanded.join('|');
+  }
+};
+
+/**
+ * Expand bracket expressions in `glob.pattern`
+ */
+
+Glob.prototype.brackets = function() {
+  if (this.options.nobrackets !== true) {
+    this.pattern = utils.brackets(this.pattern);
+  }
+};
+
+/**
+ * Expand bracket expressions in `glob.pattern`
+ */
+
+Glob.prototype.extglob = function() {
+  if (this.options.noextglob === true) return;
+
+  if (utils.isExtglob(this.pattern)) {
+    this.pattern = utils.extglob(this.pattern, {escape: true});
+  }
+};
+
+/**
+ * Parse the given pattern
+ */
+
+Glob.prototype.parse = function(pattern) {
+  this.tokens = utils.parseGlob(pattern || this.pattern, true);
+  return this.tokens;
+};
+
+/**
+ * Replace `a` with `b`. Also tracks the change before and
+ * after each replacement. This is disabled by default, but
+ * can be enabled by setting `options.track` to true.
+ *
+ * Also, when the pattern is a string, `.split()` is used,
+ * because it's much faster than replace.
+ *
+ * @param  {RegExp|String} `a`
+ * @param  {String} `b`
+ * @param  {Boolean} `escape` When `true`, escapes `*` and `?` in the replacement.
+ * @return {String}
+ */
+
+Glob.prototype._replace = function(a, b, escape) {
+  this.track('before (find): "' + a + '" (replace with): "' + b + '"');
+  if (escape) b = esc(b);
+  if (a && b && typeof a === 'string') {
+    this.pattern = this.pattern.split(a).join(b);
+  } else {
+    this.pattern = this.pattern.replace(a, b);
+  }
+  this.track('after');
+};
+
+/**
+ * Escape special characters in the given string.
+ *
+ * @param  {String} `str` Glob pattern
+ * @return {String}
+ */
+
+Glob.prototype.escape = function(str) {
+  this.track('before escape: ');
+  var re = /["\\](['"]?[^"'\\]['"]?)/g;
+
+  this.pattern = str.replace(re, function($0, $1) {
+    var o = chars.ESC;
+    var ch = o && o[$1];
+    if (ch) {
+      return ch;
+    }
+    if (/[a-z]/i.test($0)) {
+      return $0.split('\\').join('');
+    }
+    return $0;
+  });
+
+  this.track('after escape: ');
+};
+
+/**
+ * Unescape special characters in the given string.
+ *
+ * @param  {String} `str`
+ * @return {String}
+ */
+
+Glob.prototype.unescape = function(str) {
+  var re = /__([A-Z]+)_([A-Z]+)__/g;
+  this.pattern = str.replace(re, function($0, $1) {
+    return chars[$1][$0];
+  });
+  this.pattern = unesc(this.pattern);
+};
+
+/**
+ * Escape/unescape utils
+ */
+
+function esc(str) {
+  str = str.split('?').join('%~');
+  str = str.split('*').join('%%');
+  return str;
+}
+
+function unesc(str) {
+  str = str.split('%~').join('?');
+  str = str.split('%%').join('*');
+  return str;
+}
+
+
+/***/ }),
+/* 755 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*!
+ * arr-diff <https://github.com/jonschlinkert/arr-diff>
+ *
+ * Copyright (c) 2014 Jon Schlinkert, contributors.
+ * Licensed under the MIT License
+ */
+
+
+
+var flatten = __webpack_require__(510);
+var slice = [].slice;
+
+/**
+ * Return the difference between the first array and
+ * additional arrays.
+ *
+ * ```js
+ * var diff = require('{%= name %}');
+ *
+ * var a = ['a', 'b', 'c', 'd'];
+ * var b = ['b', 'c'];
+ *
+ * console.log(diff(a, b))
+ * //=> ['a', 'd']
+ * ```
+ *
+ * @param  {Array} `a`
+ * @param  {Array} `b`
+ * @return {Array}
+ * @api public
+ */
+
+function diff(arr, arrays) {
+  var argsLen = arguments.length;
+  var len = arr.length, i = -1;
+  var res = [], arrays;
+
+  if (argsLen === 1) {
+    return arr;
+  }
+
+  if (argsLen > 2) {
+    arrays = flatten(slice.call(arguments, 1));
+  }
+
+  while (++i < len) {
+    if (!~arrays.indexOf(arr[i])) {
+      res.push(arr[i]);
+    }
+  }
+  return res;
+}
+
+/**
+ * Expose `diff`
+ */
+
+module.exports = diff;
+
+
+/***/ }),
+/* 756 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*!
+ * array-unique <https://github.com/jonschlinkert/array-unique>
+ *
+ * Copyright (c) 2014-2015, Jon Schlinkert.
+ * Licensed under the MIT License.
+ */
+
+
+
+module.exports = function unique(arr) {
+  if (!Array.isArray(arr)) {
+    throw new TypeError('array-unique expects an array.');
+  }
+
+  var len = arr.length;
+  var i = -1;
+
+  while (i++ < len) {
+    var j = i + 1;
+
+    for (; j < arr.length; ++j) {
+      if (arr[i] === arr[j]) {
+        arr.splice(j--, 1);
+      }
+    }
+  }
+  return arr;
+};
+
+
+/***/ }),
+/* 757 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*!
+ * braces <https://github.com/jonschlinkert/braces>
+ *
+ * Copyright (c) 2014-2015, Jon Schlinkert.
+ * Licensed under the MIT license.
+ */
+
+
+
+/**
+ * Module dependencies
+ */
+
+var expand = __webpack_require__(640);
+var repeat = __webpack_require__(411);
+var tokens = __webpack_require__(778);
+
+/**
+ * Expose `braces`
+ */
+
+module.exports = function(str, options) {
+  if (typeof str !== 'string') {
+    throw new Error('braces expects a string');
+  }
+  return braces(str, options);
+};
+
+/**
+ * Expand `{foo,bar}` or `{1..5}` braces in the
+ * given `string`.
+ *
+ * @param  {String} `str`
+ * @param  {Array} `arr`
+ * @param  {Object} `options`
+ * @return {Array}
+ */
+
+function braces(str, arr, options) {
+  if (str === '') {
+    return [];
+  }
+
+  if (!Array.isArray(arr)) {
+    options = arr;
+    arr = [];
+  }
+
+  var opts = options || {};
+  arr = arr || [];
+
+  if (typeof opts.nodupes === 'undefined') {
+    opts.nodupes = true;
+  }
+
+  var fn = opts.fn;
+  var es6;
+
+  if (typeof opts === 'function') {
+    fn = opts;
+    opts = {};
+  }
+
+  if (!(patternRe instanceof RegExp)) {
+    patternRe = patternRegex();
+  }
+
+  var matches = str.match(patternRe) || [];
+  var m = matches[0];
+
+  switch(m) {
+    case '\\,':
+      return escapeCommas(str, arr, opts);
+    case '\\.':
+      return escapeDots(str, arr, opts);
+    case '\/.':
+      return escapePaths(str, arr, opts);
+    case ' ':
+      return splitWhitespace(str);
+    case '{,}':
+      return exponential(str, opts, braces);
+    case '{}':
+      return emptyBraces(str, arr, opts);
+    case '\\{':
+    case '\\}':
+      return escapeBraces(str, arr, opts);
+    case '${':
+      if (!/\{[^{]+\{/.test(str)) {
+        return arr.concat(str);
+      } else {
+        es6 = true;
+        str = tokens.before(str, es6Regex());
+      }
+  }
+
+  if (!(braceRe instanceof RegExp)) {
+    braceRe = braceRegex();
+  }
+
+  var match = braceRe.exec(str);
+  if (match == null) {
+    return [str];
+  }
+
+  var outter = match[1];
+  var inner = match[2];
+  if (inner === '') { return [str]; }
+
+  var segs, segsLength;
+
+  if (inner.indexOf('..') !== -1) {
+    segs = expand(inner, opts, fn) || inner.split(',');
+    segsLength = segs.length;
+
+  } else if (inner[0] === '"' || inner[0] === '\'') {
+    return arr.concat(str.split(/['"]/).join(''));
+
+  } else {
+    segs = inner.split(',');
+    if (opts.makeRe) {
+      return braces(str.replace(outter, wrap(segs, '|')), opts);
+    }
+
+    segsLength = segs.length;
+    if (segsLength === 1 && opts.bash) {
+      segs[0] = wrap(segs[0], '\\');
+    }
+  }
+
+  var len = segs.length;
+  var i = 0, val;
+
+  while (len--) {
+    var path = segs[i++];
+
+    if (/(\.[^.\/])/.test(path)) {
+      if (segsLength > 1) {
+        return segs;
+      } else {
+        return [str];
+      }
+    }
+
+    val = splice(str, outter, path);
+
+    if (/\{[^{}]+?\}/.test(val)) {
+      arr = braces(val, arr, opts);
+    } else if (val !== '') {
+      if (opts.nodupes && arr.indexOf(val) !== -1) { continue; }
+      arr.push(es6 ? tokens.after(val) : val);
+    }
+  }
+
+  if (opts.strict) { return filter(arr, filterEmpty); }
+  return arr;
+}
+
+/**
+ * Expand exponential ranges
+ *
+ *   `a{,}{,}` => ['a', 'a', 'a', 'a']
+ */
+
+function exponential(str, options, fn) {
+  if (typeof options === 'function') {
+    fn = options;
+    options = null;
+  }
+
+  var opts = options || {};
+  var esc = '__ESC_EXP__';
+  var exp = 0;
+  var res;
+
+  var parts = str.split('{,}');
+  if (opts.nodupes) {
+    return fn(parts.join(''), opts);
+  }
+
+  exp = parts.length - 1;
+  res = fn(parts.join(esc), opts);
+  var len = res.length;
+  var arr = [];
+  var i = 0;
+
+  while (len--) {
+    var ele = res[i++];
+    var idx = ele.indexOf(esc);
+
+    if (idx === -1) {
+      arr.push(ele);
+
+    } else {
+      ele = ele.split('__ESC_EXP__').join('');
+      if (!!ele && opts.nodupes !== false) {
+        arr.push(ele);
+
+      } else {
+        var num = Math.pow(2, exp);
+        arr.push.apply(arr, repeat(ele, num));
+      }
+    }
+  }
+  return arr;
+}
+
+/**
+ * Wrap a value with parens, brackets or braces,
+ * based on the given character/separator.
+ *
+ * @param  {String|Array} `val`
+ * @param  {String} `ch`
+ * @return {String}
+ */
+
+function wrap(val, ch) {
+  if (ch === '|') {
+    return '(' + val.join(ch) + ')';
+  }
+  if (ch === ',') {
+    return '{' + val.join(ch) + '}';
+  }
+  if (ch === '-') {
+    return '[' + val.join(ch) + ']';
+  }
+  if (ch === '\\') {
+    return '\\{' + val + '\\}';
+  }
+}
+
+/**
+ * Handle empty braces: `{}`
+ */
+
+function emptyBraces(str, arr, opts) {
+  return braces(str.split('{}').join('\\{\\}'), arr, opts);
+}
+
+/**
+ * Filter out empty-ish values
+ */
+
+function filterEmpty(ele) {
+  return !!ele && ele !== '\\';
+}
+
+/**
+ * Handle patterns with whitespace
+ */
+
+function splitWhitespace(str) {
+  var segs = str.split(' ');
+  var len = segs.length;
+  var res = [];
+  var i = 0;
+
+  while (len--) {
+    res.push.apply(res, braces(segs[i++]));
+  }
+  return res;
+}
+
+/**
+ * Handle escaped braces: `\\{foo,bar}`
+ */
+
+function escapeBraces(str, arr, opts) {
+  if (!/\{[^{]+\{/.test(str)) {
+    return arr.concat(str.split('\\').join(''));
+  } else {
+    str = str.split('\\{').join('__LT_BRACE__');
+    str = str.split('\\}').join('__RT_BRACE__');
+    return map(braces(str, arr, opts), function(ele) {
+      ele = ele.split('__LT_BRACE__').join('{');
+      return ele.split('__RT_BRACE__').join('}');
+    });
+  }
+}
+
+/**
+ * Handle escaped dots: `{1\\.2}`
+ */
+
+function escapeDots(str, arr, opts) {
+  if (!/[^\\]\..+\\\./.test(str)) {
+    return arr.concat(str.split('\\').join(''));
+  } else {
+    str = str.split('\\.').join('__ESC_DOT__');
+    return map(braces(str, arr, opts), function(ele) {
+      return ele.split('__ESC_DOT__').join('.');
+    });
+  }
+}
+
+/**
+ * Handle escaped dots: `{1\\.2}`
+ */
+
+function escapePaths(str, arr, opts) {
+  str = str.split('\/.').join('__ESC_PATH__');
+  return map(braces(str, arr, opts), function(ele) {
+    return ele.split('__ESC_PATH__').join('\/.');
+  });
+}
+
+/**
+ * Handle escaped commas: `{a\\,b}`
+ */
+
+function escapeCommas(str, arr, opts) {
+  if (!/\w,/.test(str)) {
+    return arr.concat(str.split('\\').join(''));
+  } else {
+    str = str.split('\\,').join('__ESC_COMMA__');
+    return map(braces(str, arr, opts), function(ele) {
+      return ele.split('__ESC_COMMA__').join(',');
+    });
+  }
+}
+
+/**
+ * Regex for common patterns
+ */
+
+function patternRegex() {
+  return /\${|( (?=[{,}])|(?=[{,}]) )|{}|{,}|\\,(?=.*[{}])|\/\.(?=.*[{}])|\\\.(?={)|\\{|\\}/;
+}
+
+/**
+ * Braces regex.
+ */
+
+function braceRegex() {
+  return /.*(\\?\{([^}]+)\})/;
+}
+
+/**
+ * es6 delimiter regex.
+ */
+
+function es6Regex() {
+  return /\$\{([^}]+)\}/;
+}
+
+var braceRe;
+var patternRe;
+
+/**
+ * Faster alternative to `String.replace()` when the
+ * index of the token to be replaces can't be supplied
+ */
+
+function splice(str, token, replacement) {
+  var i = str.indexOf(token);
+  return str.substr(0, i) + replacement
+    + str.substr(i + token.length);
+}
+
+/**
+ * Fast array map
+ */
+
+function map(arr, fn) {
+  if (arr == null) {
+    return [];
+  }
+
+  var len = arr.length;
+  var res = new Array(len);
+  var i = -1;
+
+  while (++i < len) {
+    res[i] = fn(arr[i], i, arr);
+  }
+
+  return res;
+}
+
+/**
+ * Fast array filter
+ */
+
+function filter(arr, cb) {
+  if (arr == null) return [];
+  if (typeof cb !== 'function') {
+    throw new TypeError('braces: filter expects a callback function.');
+  }
+
+  var len = arr.length;
+  var res = arr.slice();
+  var i = 0;
+
+  while (len--) {
+    if (!cb(arr[len], i++)) {
+      res.splice(len, 1);
+    }
+  }
+  return res;
+}
+
+
+/***/ }),
+/* 758 */
+/***/ (function(module, exports) {
+
+module.exports = {"application/1d-interleaved-parityfec":{"source":"iana"},"application/3gpdash-qoe-report+xml":{"source":"iana","compressible":true},"application/3gpp-ims+xml":{"source":"iana","compressible":true},"application/a2l":{"source":"iana"},"application/activemessage":{"source":"iana"},"application/activity+json":{"source":"iana","compressible":true},"application/alto-costmap+json":{"source":"iana","compressible":true},"application/alto-costmapfilter+json":{"source":"iana","compressible":true},"application/alto-directory+json":{"source":"iana","compressible":true},"application/alto-endpointcost+json":{"source":"iana","compressible":true},"application/alto-endpointcostparams+json":{"source":"iana","compressible":true},"application/alto-endpointprop+json":{"source":"iana","compressible":true},"application/alto-endpointpropparams+json":{"source":"iana","compressible":true},"application/alto-error+json":{"source":"iana","compressible":true},"application/alto-networkmap+json":{"source":"iana","compressible":true},"application/alto-networkmapfilter+json":{"source":"iana","compressible":true},"application/aml":{"source":"iana"},"application/andrew-inset":{"source":"iana","extensions":["ez"]},"application/applefile":{"source":"iana"},"application/applixware":{"source":"apache","extensions":["aw"]},"application/atf":{"source":"iana"},"application/atfx":{"source":"iana"},"application/atom+xml":{"source":"iana","compressible":true,"extensions":["atom"]},"application/atomcat+xml":{"source":"iana","compressible":true,"extensions":["atomcat"]},"application/atomdeleted+xml":{"source":"iana","compressible":true},"application/atomicmail":{"source":"iana"},"application/atomsvc+xml":{"source":"iana","compressible":true,"extensions":["atomsvc"]},"application/atxml":{"source":"iana"},"application/auth-policy+xml":{"source":"iana","compressible":true},"application/bacnet-xdd+zip":{"source":"iana","compressible":false},"application/batch-smtp":{"source":"iana"},"application/bdoc":{"compressible":false,"extensions":["bdoc"]},"application/beep+xml":{"source":"iana","compressible":true},"application/calendar+json":{"source":"iana","compressible":true},"application/calendar+xml":{"source":"iana","compressible":true},"application/call-completion":{"source":"iana"},"application/cals-1840":{"source":"iana"},"application/cbor":{"source":"iana"},"application/cccex":{"source":"iana"},"application/ccmp+xml":{"source":"iana","compressible":true},"application/ccxml+xml":{"source":"iana","compressible":true,"extensions":["ccxml"]},"application/cdfx+xml":{"source":"iana","compressible":true},"application/cdmi-capability":{"source":"iana","extensions":["cdmia"]},"application/cdmi-container":{"source":"iana","extensions":["cdmic"]},"application/cdmi-domain":{"source":"iana","extensions":["cdmid"]},"application/cdmi-object":{"source":"iana","extensions":["cdmio"]},"application/cdmi-queue":{"source":"iana","extensions":["cdmiq"]},"application/cdni":{"source":"iana"},"application/cea":{"source":"iana"},"application/cea-2018+xml":{"source":"iana","compressible":true},"application/cellml+xml":{"source":"iana","compressible":true},"application/cfw":{"source":"iana"},"application/clue_info+xml":{"source":"iana","compressible":true},"application/cms":{"source":"iana"},"application/cnrp+xml":{"source":"iana","compressible":true},"application/coap-group+json":{"source":"iana","compressible":true},"application/coap-payload":{"source":"iana"},"application/commonground":{"source":"iana"},"application/conference-info+xml":{"source":"iana","compressible":true},"application/cose":{"source":"iana"},"application/cose-key":{"source":"iana"},"application/cose-key-set":{"source":"iana"},"application/cpl+xml":{"source":"iana","compressible":true},"application/csrattrs":{"source":"iana"},"application/csta+xml":{"source":"iana","compressible":true},"application/cstadata+xml":{"source":"iana","compressible":true},"application/csvm+json":{"source":"iana","compressible":true},"application/cu-seeme":{"source":"apache","extensions":["cu"]},"application/cwt":{"source":"iana"},"application/cybercash":{"source":"iana"},"application/dart":{"compressible":true},"application/dash+xml":{"source":"iana","compressible":true,"extensions":["mpd"]},"application/dashdelta":{"source":"iana"},"application/davmount+xml":{"source":"iana","compressible":true,"extensions":["davmount"]},"application/dca-rft":{"source":"iana"},"application/dcd":{"source":"iana"},"application/dec-dx":{"source":"iana"},"application/dialog-info+xml":{"source":"iana","compressible":true},"application/dicom":{"source":"iana"},"application/dicom+json":{"source":"iana","compressible":true},"application/dicom+xml":{"source":"iana","compressible":true},"application/dii":{"source":"iana"},"application/dit":{"source":"iana"},"application/dns":{"source":"iana"},"application/dns+json":{"source":"iana","compressible":true},"application/docbook+xml":{"source":"apache","compressible":true,"extensions":["dbk"]},"application/dskpp+xml":{"source":"iana","compressible":true},"application/dssc+der":{"source":"iana","extensions":["dssc"]},"application/dssc+xml":{"source":"iana","compressible":true,"extensions":["xdssc"]},"application/dvcs":{"source":"iana"},"application/ecmascript":{"source":"iana","compressible":true,"extensions":["ecma","es"]},"application/edi-consent":{"source":"iana"},"application/edi-x12":{"source":"iana","compressible":false},"application/edifact":{"source":"iana","compressible":false},"application/efi":{"source":"iana"},"application/emergencycalldata.comment+xml":{"source":"iana","compressible":true},"application/emergencycalldata.control+xml":{"source":"iana","compressible":true},"application/emergencycalldata.deviceinfo+xml":{"source":"iana","compressible":true},"application/emergencycalldata.ecall.msd":{"source":"iana"},"application/emergencycalldata.providerinfo+xml":{"source":"iana","compressible":true},"application/emergencycalldata.serviceinfo+xml":{"source":"iana","compressible":true},"application/emergencycalldata.subscriberinfo+xml":{"source":"iana","compressible":true},"application/emergencycalldata.veds+xml":{"source":"iana","compressible":true},"application/emma+xml":{"source":"iana","compressible":true,"extensions":["emma"]},"application/emotionml+xml":{"source":"iana","compressible":true},"application/encaprtp":{"source":"iana"},"application/epp+xml":{"source":"iana","compressible":true},"application/epub+zip":{"source":"iana","compressible":false,"extensions":["epub"]},"application/eshop":{"source":"iana"},"application/exi":{"source":"iana","extensions":["exi"]},"application/fastinfoset":{"source":"iana"},"application/fastsoap":{"source":"iana"},"application/fdt+xml":{"source":"iana","compressible":true},"application/fhir+json":{"source":"iana","compressible":true},"application/fhir+xml":{"source":"iana","compressible":true},"application/fido.trusted-apps+json":{"compressible":true},"application/fits":{"source":"iana"},"application/font-sfnt":{"source":"iana"},"application/font-tdpfr":{"source":"iana","extensions":["pfr"]},"application/font-woff":{"source":"iana","compressible":false},"application/framework-attributes+xml":{"source":"iana","compressible":true},"application/geo+json":{"source":"iana","compressible":true,"extensions":["geojson"]},"application/geo+json-seq":{"source":"iana"},"application/geoxacml+xml":{"source":"iana","compressible":true},"application/gltf-buffer":{"source":"iana"},"application/gml+xml":{"source":"iana","compressible":true,"extensions":["gml"]},"application/gpx+xml":{"source":"apache","compressible":true,"extensions":["gpx"]},"application/gxf":{"source":"apache","extensions":["gxf"]},"application/gzip":{"source":"iana","compressible":false,"extensions":["gz"]},"application/h224":{"source":"iana"},"application/held+xml":{"source":"iana","compressible":true},"application/hjson":{"extensions":["hjson"]},"application/http":{"source":"iana"},"application/hyperstudio":{"source":"iana","extensions":["stk"]},"application/ibe-key-request+xml":{"source":"iana","compressible":true},"application/ibe-pkg-reply+xml":{"source":"iana","compressible":true},"application/ibe-pp-data":{"source":"iana"},"application/iges":{"source":"iana"},"application/im-iscomposing+xml":{"source":"iana","compressible":true},"application/index":{"source":"iana"},"application/index.cmd":{"source":"iana"},"application/index.obj":{"source":"iana"},"application/index.response":{"source":"iana"},"application/index.vnd":{"source":"iana"},"application/inkml+xml":{"source":"iana","compressible":true,"extensions":["ink","inkml"]},"application/iotp":{"source":"iana"},"application/ipfix":{"source":"iana","extensions":["ipfix"]},"application/ipp":{"source":"iana"},"application/isup":{"source":"iana"},"application/its+xml":{"source":"iana","compressible":true},"application/java-archive":{"source":"apache","compressible":false,"extensions":["jar","war","ear"]},"application/java-serialized-object":{"source":"apache","compressible":false,"extensions":["ser"]},"application/java-vm":{"source":"apache","compressible":false,"extensions":["class"]},"application/javascript":{"source":"iana","charset":"UTF-8","compressible":true,"extensions":["js","mjs"]},"application/jf2feed+json":{"source":"iana","compressible":true},"application/jose":{"source":"iana"},"application/jose+json":{"source":"iana","compressible":true},"application/jrd+json":{"source":"iana","compressible":true},"application/json":{"source":"iana","charset":"UTF-8","compressible":true,"extensions":["json","map"]},"application/json-patch+json":{"source":"iana","compressible":true},"application/json-seq":{"source":"iana"},"application/json5":{"extensions":["json5"]},"application/jsonml+json":{"source":"apache","compressible":true,"extensions":["jsonml"]},"application/jwk+json":{"source":"iana","compressible":true},"application/jwk-set+json":{"source":"iana","compressible":true},"application/jwt":{"source":"iana"},"application/kpml-request+xml":{"source":"iana","compressible":true},"application/kpml-response+xml":{"source":"iana","compressible":true},"application/ld+json":{"source":"iana","compressible":true,"extensions":["jsonld"]},"application/lgr+xml":{"source":"iana","compressible":true},"application/link-format":{"source":"iana"},"application/load-control+xml":{"source":"iana","compressible":true},"application/lost+xml":{"source":"iana","compressible":true,"extensions":["lostxml"]},"application/lostsync+xml":{"source":"iana","compressible":true},"application/lxf":{"source":"iana"},"application/mac-binhex40":{"source":"iana","extensions":["hqx"]},"application/mac-compactpro":{"source":"apache","extensions":["cpt"]},"application/macwriteii":{"source":"iana"},"application/mads+xml":{"source":"iana","compressible":true,"extensions":["mads"]},"application/manifest+json":{"charset":"UTF-8","compressible":true,"extensions":["webmanifest"]},"application/marc":{"source":"iana","extensions":["mrc"]},"application/marcxml+xml":{"source":"iana","compressible":true,"extensions":["mrcx"]},"application/mathematica":{"source":"iana","extensions":["ma","nb","mb"]},"application/mathml+xml":{"source":"iana","compressible":true,"extensions":["mathml"]},"application/mathml-content+xml":{"source":"iana","compressible":true},"application/mathml-presentation+xml":{"source":"iana","compressible":true},"application/mbms-associated-procedure-description+xml":{"source":"iana","compressible":true},"application/mbms-deregister+xml":{"source":"iana","compressible":true},"application/mbms-envelope+xml":{"source":"iana","compressible":true},"application/mbms-msk+xml":{"source":"iana","compressible":true},"application/mbms-msk-response+xml":{"source":"iana","compressible":true},"application/mbms-protection-description+xml":{"source":"iana","compressible":true},"application/mbms-reception-report+xml":{"source":"iana","compressible":true},"application/mbms-register+xml":{"source":"iana","compressible":true},"application/mbms-register-response+xml":{"source":"iana","compressible":true},"application/mbms-schedule+xml":{"source":"iana","compressible":true},"application/mbms-user-service-description+xml":{"source":"iana","compressible":true},"application/mbox":{"source":"iana","extensions":["mbox"]},"application/media-policy-dataset+xml":{"source":"iana","compressible":true},"application/media_control+xml":{"source":"iana","compressible":true},"application/mediaservercontrol+xml":{"source":"iana","compressible":true,"extensions":["mscml"]},"application/merge-patch+json":{"source":"iana","compressible":true},"application/metalink+xml":{"source":"apache","compressible":true,"extensions":["metalink"]},"application/metalink4+xml":{"source":"iana","compressible":true,"extensions":["meta4"]},"application/mets+xml":{"source":"iana","compressible":true,"extensions":["mets"]},"application/mf4":{"source":"iana"},"application/mikey":{"source":"iana"},"application/mmt-usd+xml":{"source":"iana","compressible":true},"application/mods+xml":{"source":"iana","compressible":true,"extensions":["mods"]},"application/moss-keys":{"source":"iana"},"application/moss-signature":{"source":"iana"},"application/mosskey-data":{"source":"iana"},"application/mosskey-request":{"source":"iana"},"application/mp21":{"source":"iana","extensions":["m21","mp21"]},"application/mp4":{"source":"iana","extensions":["mp4s","m4p"]},"application/mpeg4-generic":{"source":"iana"},"application/mpeg4-iod":{"source":"iana"},"application/mpeg4-iod-xmt":{"source":"iana"},"application/mrb-consumer+xml":{"source":"iana","compressible":true},"application/mrb-publish+xml":{"source":"iana","compressible":true},"application/msc-ivr+xml":{"source":"iana","compressible":true},"application/msc-mixer+xml":{"source":"iana","compressible":true},"application/msword":{"source":"iana","compressible":false,"extensions":["doc","dot"]},"application/mud+json":{"source":"iana","compressible":true},"application/mxf":{"source":"iana","extensions":["mxf"]},"application/n-quads":{"source":"iana"},"application/n-triples":{"source":"iana"},"application/nasdata":{"source":"iana"},"application/news-checkgroups":{"source":"iana"},"application/news-groupinfo":{"source":"iana"},"application/news-transmission":{"source":"iana"},"application/nlsml+xml":{"source":"iana","compressible":true},"application/node":{"source":"iana"},"application/nss":{"source":"iana"},"application/ocsp-request":{"source":"iana"},"application/ocsp-response":{"source":"iana"},"application/octet-stream":{"source":"iana","compressible":false,"extensions":["bin","dms","lrf","mar","so","dist","distz","pkg","bpk","dump","elc","deploy","exe","dll","deb","dmg","iso","img","msi","msp","msm","buffer"]},"application/oda":{"source":"iana","extensions":["oda"]},"application/odx":{"source":"iana"},"application/oebps-package+xml":{"source":"iana","compressible":true,"extensions":["opf"]},"application/ogg":{"source":"iana","compressible":false,"extensions":["ogx"]},"application/omdoc+xml":{"source":"apache","compressible":true,"extensions":["omdoc"]},"application/onenote":{"source":"apache","extensions":["onetoc","onetoc2","onetmp","onepkg"]},"application/oxps":{"source":"iana","extensions":["oxps"]},"application/p2p-overlay+xml":{"source":"iana","compressible":true},"application/parityfec":{"source":"iana"},"application/passport":{"source":"iana"},"application/patch-ops-error+xml":{"source":"iana","compressible":true,"extensions":["xer"]},"application/pdf":{"source":"iana","compressible":false,"extensions":["pdf"]},"application/pdx":{"source":"iana"},"application/pgp-encrypted":{"source":"iana","compressible":false,"extensions":["pgp"]},"application/pgp-keys":{"source":"iana"},"application/pgp-signature":{"source":"iana","extensions":["asc","sig"]},"application/pics-rules":{"source":"apache","extensions":["prf"]},"application/pidf+xml":{"source":"iana","compressible":true},"application/pidf-diff+xml":{"source":"iana","compressible":true},"application/pkcs10":{"source":"iana","extensions":["p10"]},"application/pkcs12":{"source":"iana"},"application/pkcs7-mime":{"source":"iana","extensions":["p7m","p7c"]},"application/pkcs7-signature":{"source":"iana","extensions":["p7s"]},"application/pkcs8":{"source":"iana","extensions":["p8"]},"application/pkcs8-encrypted":{"source":"iana"},"application/pkix-attr-cert":{"source":"iana","extensions":["ac"]},"application/pkix-cert":{"source":"iana","extensions":["cer"]},"application/pkix-crl":{"source":"iana","extensions":["crl"]},"application/pkix-pkipath":{"source":"iana","extensions":["pkipath"]},"application/pkixcmp":{"source":"iana","extensions":["pki"]},"application/pls+xml":{"source":"iana","compressible":true,"extensions":["pls"]},"application/poc-settings+xml":{"source":"iana","compressible":true},"application/postscript":{"source":"iana","compressible":true,"extensions":["ai","eps","ps"]},"application/ppsp-tracker+json":{"source":"iana","compressible":true},"application/problem+json":{"source":"iana","compressible":true},"application/problem+xml":{"source":"iana","compressible":true},"application/provenance+xml":{"source":"iana","compressible":true},"application/prs.alvestrand.titrax-sheet":{"source":"iana"},"application/prs.cww":{"source":"iana","extensions":["cww"]},"application/prs.hpub+zip":{"source":"iana","compressible":false},"application/prs.nprend":{"source":"iana"},"application/prs.plucker":{"source":"iana"},"application/prs.rdf-xml-crypt":{"source":"iana"},"application/prs.xsf+xml":{"source":"iana","compressible":true},"application/pskc+xml":{"source":"iana","compressible":true,"extensions":["pskcxml"]},"application/qsig":{"source":"iana"},"application/raml+yaml":{"compressible":true,"extensions":["raml"]},"application/raptorfec":{"source":"iana"},"application/rdap+json":{"source":"iana","compressible":true},"application/rdf+xml":{"source":"iana","compressible":true,"extensions":["rdf","owl"]},"application/reginfo+xml":{"source":"iana","compressible":true,"extensions":["rif"]},"application/relax-ng-compact-syntax":{"source":"iana","extensions":["rnc"]},"application/remote-printing":{"source":"iana"},"application/reputon+json":{"source":"iana","compressible":true},"application/resource-lists+xml":{"source":"iana","compressible":true,"extensions":["rl"]},"application/resource-lists-diff+xml":{"source":"iana","compressible":true,"extensions":["rld"]},"application/rfc+xml":{"source":"iana","compressible":true},"application/riscos":{"source":"iana"},"application/rlmi+xml":{"source":"iana","compressible":true},"application/rls-services+xml":{"source":"iana","compressible":true,"extensions":["rs"]},"application/route-apd+xml":{"source":"iana","compressible":true},"application/route-s-tsid+xml":{"source":"iana","compressible":true},"application/route-usd+xml":{"source":"iana","compressible":true},"application/rpki-ghostbusters":{"source":"iana","extensions":["gbr"]},"application/rpki-manifest":{"source":"iana","extensions":["mft"]},"application/rpki-publication":{"source":"iana"},"application/rpki-roa":{"source":"iana","extensions":["roa"]},"application/rpki-updown":{"source":"iana"},"application/rsd+xml":{"source":"apache","compressible":true,"extensions":["rsd"]},"application/rss+xml":{"source":"apache","compressible":true,"extensions":["rss"]},"application/rtf":{"source":"iana","compressible":true,"extensions":["rtf"]},"application/rtploopback":{"source":"iana"},"application/rtx":{"source":"iana"},"application/samlassertion+xml":{"source":"iana","compressible":true},"application/samlmetadata+xml":{"source":"iana","compressible":true},"application/sbml+xml":{"source":"iana","compressible":true,"extensions":["sbml"]},"application/scaip+xml":{"source":"iana","compressible":true},"application/scim+json":{"source":"iana","compressible":true},"application/scvp-cv-request":{"source":"iana","extensions":["scq"]},"application/scvp-cv-response":{"source":"iana","extensions":["scs"]},"application/scvp-vp-request":{"source":"iana","extensions":["spq"]},"application/scvp-vp-response":{"source":"iana","extensions":["spp"]},"application/sdp":{"source":"iana","extensions":["sdp"]},"application/secevent+jwt":{"source":"iana"},"application/senml+cbor":{"source":"iana"},"application/senml+json":{"source":"iana","compressible":true},"application/senml+xml":{"source":"iana","compressible":true},"application/senml-exi":{"source":"iana"},"application/sensml+cbor":{"source":"iana"},"application/sensml+json":{"source":"iana","compressible":true},"application/sensml+xml":{"source":"iana","compressible":true},"application/sensml-exi":{"source":"iana"},"application/sep+xml":{"source":"iana","compressible":true},"application/sep-exi":{"source":"iana"},"application/session-info":{"source":"iana"},"application/set-payment":{"source":"iana"},"application/set-payment-initiation":{"source":"iana","extensions":["setpay"]},"application/set-registration":{"source":"iana"},"application/set-registration-initiation":{"source":"iana","extensions":["setreg"]},"application/sgml":{"source":"iana"},"application/sgml-open-catalog":{"source":"iana"},"application/shf+xml":{"source":"iana","compressible":true,"extensions":["shf"]},"application/sieve":{"source":"iana"},"application/simple-filter+xml":{"source":"iana","compressible":true},"application/simple-message-summary":{"source":"iana"},"application/simplesymbolcontainer":{"source":"iana"},"application/slate":{"source":"iana"},"application/smil":{"source":"iana"},"application/smil+xml":{"source":"iana","compressible":true,"extensions":["smi","smil"]},"application/smpte336m":{"source":"iana"},"application/soap+fastinfoset":{"source":"iana"},"application/soap+xml":{"source":"iana","compressible":true},"application/sparql-query":{"source":"iana","extensions":["rq"]},"application/sparql-results+xml":{"source":"iana","compressible":true,"extensions":["srx"]},"application/spirits-event+xml":{"source":"iana","compressible":true},"application/sql":{"source":"iana"},"application/srgs":{"source":"iana","extensions":["gram"]},"application/srgs+xml":{"source":"iana","compressible":true,"extensions":["grxml"]},"application/sru+xml":{"source":"iana","compressible":true,"extensions":["sru"]},"application/ssdl+xml":{"source":"apache","compressible":true,"extensions":["ssdl"]},"application/ssml+xml":{"source":"iana","compressible":true,"extensions":["ssml"]},"application/stix+json":{"source":"iana","compressible":true},"application/tamp-apex-update":{"source":"iana"},"application/tamp-apex-update-confirm":{"source":"iana"},"application/tamp-community-update":{"source":"iana"},"application/tamp-community-update-confirm":{"source":"iana"},"application/tamp-error":{"source":"iana"},"application/tamp-sequence-adjust":{"source":"iana"},"application/tamp-sequence-adjust-confirm":{"source":"iana"},"application/tamp-status-query":{"source":"iana"},"application/tamp-status-response":{"source":"iana"},"application/tamp-update":{"source":"iana"},"application/tamp-update-confirm":{"source":"iana"},"application/tar":{"compressible":true},"application/taxii+json":{"source":"iana","compressible":true},"application/tei+xml":{"source":"iana","compressible":true,"extensions":["tei","teicorpus"]},"application/thraud+xml":{"source":"iana","compressible":true,"extensions":["tfi"]},"application/timestamp-query":{"source":"iana"},"application/timestamp-reply":{"source":"iana"},"application/timestamped-data":{"source":"iana","extensions":["tsd"]},"application/tlsrpt+gzip":{"source":"iana"},"application/tlsrpt+json":{"source":"iana","compressible":true},"application/tnauthlist":{"source":"iana"},"application/trickle-ice-sdpfrag":{"source":"iana"},"application/trig":{"source":"iana"},"application/ttml+xml":{"source":"iana","compressible":true},"application/tve-trigger":{"source":"iana"},"application/ulpfec":{"source":"iana"},"application/urc-grpsheet+xml":{"source":"iana","compressible":true},"application/urc-ressheet+xml":{"source":"iana","compressible":true},"application/urc-targetdesc+xml":{"source":"iana","compressible":true},"application/urc-uisocketdesc+xml":{"source":"iana","compressible":true},"application/vcard+json":{"source":"iana","compressible":true},"application/vcard+xml":{"source":"iana","compressible":true},"application/vemmi":{"source":"iana"},"application/vividence.scriptfile":{"source":"apache"},"application/vnd.1000minds.decision-model+xml":{"source":"iana","compressible":true},"application/vnd.3gpp-prose+xml":{"source":"iana","compressible":true},"application/vnd.3gpp-prose-pc3ch+xml":{"source":"iana","compressible":true},"application/vnd.3gpp-v2x-local-service-information":{"source":"iana"},"application/vnd.3gpp.access-transfer-events+xml":{"source":"iana","compressible":true},"application/vnd.3gpp.bsf+xml":{"source":"iana","compressible":true},"application/vnd.3gpp.gmop+xml":{"source":"iana","compressible":true},"application/vnd.3gpp.mcdata-payload":{"source":"iana"},"application/vnd.3gpp.mcdata-signalling":{"source":"iana"},"application/vnd.3gpp.mcptt-affiliation-command+xml":{"source":"iana","compressible":true},"application/vnd.3gpp.mcptt-floor-request+xml":{"source":"iana","compressible":true},"application/vnd.3gpp.mcptt-info+xml":{"source":"iana","compressible":true},"application/vnd.3gpp.mcptt-location-info+xml":{"source":"iana","compressible":true},"application/vnd.3gpp.mcptt-mbms-usage-info+xml":{"source":"iana","compressible":true},"application/vnd.3gpp.mcptt-signed+xml":{"source":"iana","compressible":true},"application/vnd.3gpp.mid-call+xml":{"source":"iana","compressible":true},"application/vnd.3gpp.pic-bw-large":{"source":"iana","extensions":["plb"]},"application/vnd.3gpp.pic-bw-small":{"source":"iana","extensions":["psb"]},"application/vnd.3gpp.pic-bw-var":{"source":"iana","extensions":["pvb"]},"application/vnd.3gpp.sms":{"source":"iana"},"application/vnd.3gpp.sms+xml":{"source":"iana","compressible":true},"application/vnd.3gpp.srvcc-ext+xml":{"source":"iana","compressible":true},"application/vnd.3gpp.srvcc-info+xml":{"source":"iana","compressible":true},"application/vnd.3gpp.state-and-event-info+xml":{"source":"iana","compressible":true},"application/vnd.3gpp.ussd+xml":{"source":"iana","compressible":true},"application/vnd.3gpp2.bcmcsinfo+xml":{"source":"iana","compressible":true},"application/vnd.3gpp2.sms":{"source":"iana"},"application/vnd.3gpp2.tcap":{"source":"iana","extensions":["tcap"]},"application/vnd.3lightssoftware.imagescal":{"source":"iana"},"application/vnd.3m.post-it-notes":{"source":"iana","extensions":["pwn"]},"application/vnd.accpac.simply.aso":{"source":"iana","extensions":["aso"]},"application/vnd.accpac.simply.imp":{"source":"iana","extensions":["imp"]},"application/vnd.acucobol":{"source":"iana","extensions":["acu"]},"application/vnd.acucorp":{"source":"iana","extensions":["atc","acutc"]},"application/vnd.adobe.air-application-installer-package+zip":{"source":"apache","compressible":false,"extensions":["air"]},"application/vnd.adobe.flash.movie":{"source":"iana"},"application/vnd.adobe.formscentral.fcdt":{"source":"iana","extensions":["fcdt"]},"application/vnd.adobe.fxp":{"source":"iana","extensions":["fxp","fxpl"]},"application/vnd.adobe.partial-upload":{"source":"iana"},"application/vnd.adobe.xdp+xml":{"source":"iana","compressible":true,"extensions":["xdp"]},"application/vnd.adobe.xfdf":{"source":"iana","extensions":["xfdf"]},"application/vnd.aether.imp":{"source":"iana"},"application/vnd.afpc.afplinedata":{"source":"iana"},"application/vnd.afpc.modca":{"source":"iana"},"application/vnd.ah-barcode":{"source":"iana"},"application/vnd.ahead.space":{"source":"iana","extensions":["ahead"]},"application/vnd.airzip.filesecure.azf":{"source":"iana","extensions":["azf"]},"application/vnd.airzip.filesecure.azs":{"source":"iana","extensions":["azs"]},"application/vnd.amadeus+json":{"source":"iana","compressible":true},"application/vnd.amazon.ebook":{"source":"apache","extensions":["azw"]},"application/vnd.amazon.mobi8-ebook":{"source":"iana"},"application/vnd.americandynamics.acc":{"source":"iana","extensions":["acc"]},"application/vnd.amiga.ami":{"source":"iana","extensions":["ami"]},"application/vnd.amundsen.maze+xml":{"source":"iana","compressible":true},"application/vnd.android.package-archive":{"source":"apache","compressible":false,"extensions":["apk"]},"application/vnd.anki":{"source":"iana"},"application/vnd.anser-web-certificate-issue-initiation":{"source":"iana","extensions":["cii"]},"application/vnd.anser-web-funds-transfer-initiation":{"source":"apache","extensions":["fti"]},"application/vnd.antix.game-component":{"source":"iana","extensions":["atx"]},"application/vnd.apache.thrift.binary":{"source":"iana"},"application/vnd.apache.thrift.compact":{"source":"iana"},"application/vnd.apache.thrift.json":{"source":"iana"},"application/vnd.api+json":{"source":"iana","compressible":true},"application/vnd.apothekende.reservation+json":{"source":"iana","compressible":true},"application/vnd.apple.installer+xml":{"source":"iana","compressible":true,"extensions":["mpkg"]},"application/vnd.apple.mpegurl":{"source":"iana","extensions":["m3u8"]},"application/vnd.apple.pkpass":{"compressible":false,"extensions":["pkpass"]},"application/vnd.arastra.swi":{"source":"iana"},"application/vnd.aristanetworks.swi":{"source":"iana","extensions":["swi"]},"application/vnd.artisan+json":{"source":"iana","compressible":true},"application/vnd.artsquare":{"source":"iana"},"application/vnd.astraea-software.iota":{"source":"iana","extensions":["iota"]},"application/vnd.audiograph":{"source":"iana","extensions":["aep"]},"application/vnd.autopackage":{"source":"iana"},"application/vnd.avalon+json":{"source":"iana","compressible":true},"application/vnd.avistar+xml":{"source":"iana","compressible":true},"application/vnd.balsamiq.bmml+xml":{"source":"iana","compressible":true},"application/vnd.balsamiq.bmpr":{"source":"iana"},"application/vnd.banana-accounting":{"source":"iana"},"application/vnd.bbf.usp.msg":{"source":"iana"},"application/vnd.bbf.usp.msg+json":{"source":"iana","compressible":true},"application/vnd.bekitzur-stech+json":{"source":"iana","compressible":true},"application/vnd.bint.med-content":{"source":"iana"},"application/vnd.biopax.rdf+xml":{"source":"iana","compressible":true},"application/vnd.blink-idb-value-wrapper":{"source":"iana"},"application/vnd.blueice.multipass":{"source":"iana","extensions":["mpm"]},"application/vnd.bluetooth.ep.oob":{"source":"iana"},"application/vnd.bluetooth.le.oob":{"source":"iana"},"application/vnd.bmi":{"source":"iana","extensions":["bmi"]},"application/vnd.businessobjects":{"source":"iana","extensions":["rep"]},"application/vnd.byu.uapi+json":{"source":"iana","compressible":true},"application/vnd.cab-jscript":{"source":"iana"},"application/vnd.canon-cpdl":{"source":"iana"},"application/vnd.canon-lips":{"source":"iana"},"application/vnd.capasystems-pg+json":{"source":"iana","compressible":true},"application/vnd.cendio.thinlinc.clientconf":{"source":"iana"},"application/vnd.century-systems.tcp_stream":{"source":"iana"},"application/vnd.chemdraw+xml":{"source":"iana","compressible":true,"extensions":["cdxml"]},"application/vnd.chess-pgn":{"source":"iana"},"application/vnd.chipnuts.karaoke-mmd":{"source":"iana","extensions":["mmd"]},"application/vnd.cinderella":{"source":"iana","extensions":["cdy"]},"application/vnd.cirpack.isdn-ext":{"source":"iana"},"application/vnd.citationstyles.style+xml":{"source":"iana","compressible":true,"extensions":["csl"]},"application/vnd.claymore":{"source":"iana","extensions":["cla"]},"application/vnd.cloanto.rp9":{"source":"iana","extensions":["rp9"]},"application/vnd.clonk.c4group":{"source":"iana","extensions":["c4g","c4d","c4f","c4p","c4u"]},"application/vnd.cluetrust.cartomobile-config":{"source":"iana","extensions":["c11amc"]},"application/vnd.cluetrust.cartomobile-config-pkg":{"source":"iana","extensions":["c11amz"]},"application/vnd.coffeescript":{"source":"iana"},"application/vnd.collabio.xodocuments.document":{"source":"iana"},"application/vnd.collabio.xodocuments.document-template":{"source":"iana"},"application/vnd.collabio.xodocuments.presentation":{"source":"iana"},"application/vnd.collabio.xodocuments.presentation-template":{"source":"iana"},"application/vnd.collabio.xodocuments.spreadsheet":{"source":"iana"},"application/vnd.collabio.xodocuments.spreadsheet-template":{"source":"iana"},"application/vnd.collection+json":{"source":"iana","compressible":true},"application/vnd.collection.doc+json":{"source":"iana","compressible":true},"application/vnd.collection.next+json":{"source":"iana","compressible":true},"application/vnd.comicbook+zip":{"source":"iana","compressible":false},"application/vnd.comicbook-rar":{"source":"iana"},"application/vnd.commerce-battelle":{"source":"iana"},"application/vnd.commonspace":{"source":"iana","extensions":["csp"]},"application/vnd.contact.cmsg":{"source":"iana","extensions":["cdbcmsg"]},"application/vnd.coreos.ignition+json":{"source":"iana","compressible":true},"application/vnd.cosmocaller":{"source":"iana","extensions":["cmc"]},"application/vnd.crick.clicker":{"source":"iana","extensions":["clkx"]},"application/vnd.crick.clicker.keyboard":{"source":"iana","extensions":["clkk"]},"application/vnd.crick.clicker.palette":{"source":"iana","extensions":["clkp"]},"application/vnd.crick.clicker.template":{"source":"iana","extensions":["clkt"]},"application/vnd.crick.clicker.wordbank":{"source":"iana","extensions":["clkw"]},"application/vnd.criticaltools.wbs+xml":{"source":"iana","compressible":true,"extensions":["wbs"]},"application/vnd.ctc-posml":{"source":"iana","extensions":["pml"]},"application/vnd.ctct.ws+xml":{"source":"iana","compressible":true},"application/vnd.cups-pdf":{"source":"iana"},"application/vnd.cups-postscript":{"source":"iana"},"application/vnd.cups-ppd":{"source":"iana","extensions":["ppd"]},"application/vnd.cups-raster":{"source":"iana"},"application/vnd.cups-raw":{"source":"iana"},"application/vnd.curl":{"source":"iana"},"application/vnd.curl.car":{"source":"apache","extensions":["car"]},"application/vnd.curl.pcurl":{"source":"apache","extensions":["pcurl"]},"application/vnd.cyan.dean.root+xml":{"source":"iana","compressible":true},"application/vnd.cybank":{"source":"iana"},"application/vnd.d2l.coursepackage1p0+zip":{"source":"iana","compressible":false},"application/vnd.dart":{"source":"iana","compressible":true,"extensions":["dart"]},"application/vnd.data-vision.rdz":{"source":"iana","extensions":["rdz"]},"application/vnd.datapackage+json":{"source":"iana","compressible":true},"application/vnd.dataresource+json":{"source":"iana","compressible":true},"application/vnd.debian.binary-package":{"source":"iana"},"application/vnd.dece.data":{"source":"iana","extensions":["uvf","uvvf","uvd","uvvd"]},"application/vnd.dece.ttml+xml":{"source":"iana","compressible":true,"extensions":["uvt","uvvt"]},"application/vnd.dece.unspecified":{"source":"iana","extensions":["uvx","uvvx"]},"application/vnd.dece.zip":{"source":"iana","extensions":["uvz","uvvz"]},"application/vnd.denovo.fcselayout-link":{"source":"iana","extensions":["fe_launch"]},"application/vnd.desmume-movie":{"source":"iana"},"application/vnd.desmume.movie":{"source":"apache"},"application/vnd.dir-bi.plate-dl-nosuffix":{"source":"iana"},"application/vnd.dm.delegation+xml":{"source":"iana","compressible":true},"application/vnd.dna":{"source":"iana","extensions":["dna"]},"application/vnd.document+json":{"source":"iana","compressible":true},"application/vnd.dolby.mlp":{"source":"apache","extensions":["mlp"]},"application/vnd.dolby.mobile.1":{"source":"iana"},"application/vnd.dolby.mobile.2":{"source":"iana"},"application/vnd.doremir.scorecloud-binary-document":{"source":"iana"},"application/vnd.dpgraph":{"source":"iana","extensions":["dpg"]},"application/vnd.dreamfactory":{"source":"iana","extensions":["dfac"]},"application/vnd.drive+json":{"source":"iana","compressible":true},"application/vnd.ds-keypoint":{"source":"apache","extensions":["kpxx"]},"application/vnd.dtg.local":{"source":"iana"},"application/vnd.dtg.local.flash":{"source":"iana"},"application/vnd.dtg.local.html":{"source":"iana"},"application/vnd.dvb.ait":{"source":"iana","extensions":["ait"]},"application/vnd.dvb.dvbj":{"source":"iana"},"application/vnd.dvb.esgcontainer":{"source":"iana"},"application/vnd.dvb.ipdcdftnotifaccess":{"source":"iana"},"application/vnd.dvb.ipdcesgaccess":{"source":"iana"},"application/vnd.dvb.ipdcesgaccess2":{"source":"iana"},"application/vnd.dvb.ipdcesgpdd":{"source":"iana"},"application/vnd.dvb.ipdcroaming":{"source":"iana"},"application/vnd.dvb.iptv.alfec-base":{"source":"iana"},"application/vnd.dvb.iptv.alfec-enhancement":{"source":"iana"},"application/vnd.dvb.notif-aggregate-root+xml":{"source":"iana","compressible":true},"application/vnd.dvb.notif-container+xml":{"source":"iana","compressible":true},"application/vnd.dvb.notif-generic+xml":{"source":"iana","compressible":true},"application/vnd.dvb.notif-ia-msglist+xml":{"source":"iana","compressible":true},"application/vnd.dvb.notif-ia-registration-request+xml":{"source":"iana","compressible":true},"application/vnd.dvb.notif-ia-registration-response+xml":{"source":"iana","compressible":true},"application/vnd.dvb.notif-init+xml":{"source":"iana","compressible":true},"application/vnd.dvb.pfr":{"source":"iana"},"application/vnd.dvb.service":{"source":"iana","extensions":["svc"]},"application/vnd.dxr":{"source":"iana"},"application/vnd.dynageo":{"source":"iana","extensions":["geo"]},"application/vnd.dzr":{"source":"iana"},"application/vnd.easykaraoke.cdgdownload":{"source":"iana"},"application/vnd.ecdis-update":{"source":"iana"},"application/vnd.ecip.rlp":{"source":"iana"},"application/vnd.ecowin.chart":{"source":"iana","extensions":["mag"]},"application/vnd.ecowin.filerequest":{"source":"iana"},"application/vnd.ecowin.fileupdate":{"source":"iana"},"application/vnd.ecowin.series":{"source":"iana"},"application/vnd.ecowin.seriesrequest":{"source":"iana"},"application/vnd.ecowin.seriesupdate":{"source":"iana"},"application/vnd.efi.img":{"source":"iana"},"application/vnd.efi.iso":{"source":"iana"},"application/vnd.emclient.accessrequest+xml":{"source":"iana","compressible":true},"application/vnd.enliven":{"source":"iana","extensions":["nml"]},"application/vnd.enphase.envoy":{"source":"iana"},"application/vnd.eprints.data+xml":{"source":"iana","compressible":true},"application/vnd.epson.esf":{"source":"iana","extensions":["esf"]},"application/vnd.epson.msf":{"source":"iana","extensions":["msf"]},"application/vnd.epson.quickanime":{"source":"iana","extensions":["qam"]},"application/vnd.epson.salt":{"source":"iana","extensions":["slt"]},"application/vnd.epson.ssf":{"source":"iana","extensions":["ssf"]},"application/vnd.ericsson.quickcall":{"source":"iana"},"application/vnd.espass-espass+zip":{"source":"iana","compressible":false},"application/vnd.eszigno3+xml":{"source":"iana","compressible":true,"extensions":["es3","et3"]},"application/vnd.etsi.aoc+xml":{"source":"iana","compressible":true},"application/vnd.etsi.asic-e+zip":{"source":"iana","compressible":false},"application/vnd.etsi.asic-s+zip":{"source":"iana","compressible":false},"application/vnd.etsi.cug+xml":{"source":"iana","compressible":true},"application/vnd.etsi.iptvcommand+xml":{"source":"iana","compressible":true},"application/vnd.etsi.iptvdiscovery+xml":{"source":"iana","compressible":true},"application/vnd.etsi.iptvprofile+xml":{"source":"iana","compressible":true},"application/vnd.etsi.iptvsad-bc+xml":{"source":"iana","compressible":true},"application/vnd.etsi.iptvsad-cod+xml":{"source":"iana","compressible":true},"application/vnd.etsi.iptvsad-npvr+xml":{"source":"iana","compressible":true},"application/vnd.etsi.iptvservice+xml":{"source":"iana","compressible":true},"application/vnd.etsi.iptvsync+xml":{"source":"iana","compressible":true},"application/vnd.etsi.iptvueprofile+xml":{"source":"iana","compressible":true},"application/vnd.etsi.mcid+xml":{"source":"iana","compressible":true},"application/vnd.etsi.mheg5":{"source":"iana"},"application/vnd.etsi.overload-control-policy-dataset+xml":{"source":"iana","compressible":true},"application/vnd.etsi.pstn+xml":{"source":"iana","compressible":true},"application/vnd.etsi.sci+xml":{"source":"iana","compressible":true},"application/vnd.etsi.simservs+xml":{"source":"iana","compressible":true},"application/vnd.etsi.timestamp-token":{"source":"iana"},"application/vnd.etsi.tsl+xml":{"source":"iana","compressible":true},"application/vnd.etsi.tsl.der":{"source":"iana"},"application/vnd.eudora.data":{"source":"iana"},"application/vnd.evolv.ecig.profile":{"source":"iana"},"application/vnd.evolv.ecig.settings":{"source":"iana"},"application/vnd.evolv.ecig.theme":{"source":"iana"},"application/vnd.ezpix-album":{"source":"iana","extensions":["ez2"]},"application/vnd.ezpix-package":{"source":"iana","extensions":["ez3"]},"application/vnd.f-secure.mobile":{"source":"iana"},"application/vnd.fastcopy-disk-image":{"source":"iana"},"application/vnd.fdf":{"source":"iana","extensions":["fdf"]},"application/vnd.fdsn.mseed":{"source":"iana","extensions":["mseed"]},"application/vnd.fdsn.seed":{"source":"iana","extensions":["seed","dataless"]},"application/vnd.ffsns":{"source":"iana"},"application/vnd.filmit.zfc":{"source":"iana"},"application/vnd.fints":{"source":"iana"},"application/vnd.firemonkeys.cloudcell":{"source":"iana"},"application/vnd.flographit":{"source":"iana","extensions":["gph"]},"application/vnd.fluxtime.clip":{"source":"iana","extensions":["ftc"]},"application/vnd.font-fontforge-sfd":{"source":"iana"},"application/vnd.framemaker":{"source":"iana","extensions":["fm","frame","maker","book"]},"application/vnd.frogans.fnc":{"source":"iana","extensions":["fnc"]},"application/vnd.frogans.ltf":{"source":"iana","extensions":["ltf"]},"application/vnd.fsc.weblaunch":{"source":"iana","extensions":["fsc"]},"application/vnd.fujitsu.oasys":{"source":"iana","extensions":["oas"]},"application/vnd.fujitsu.oasys2":{"source":"iana","extensions":["oa2"]},"application/vnd.fujitsu.oasys3":{"source":"iana","extensions":["oa3"]},"application/vnd.fujitsu.oasysgp":{"source":"iana","extensions":["fg5"]},"application/vnd.fujitsu.oasysprs":{"source":"iana","extensions":["bh2"]},"application/vnd.fujixerox.art-ex":{"source":"iana"},"application/vnd.fujixerox.art4":{"source":"iana"},"application/vnd.fujixerox.ddd":{"source":"iana","extensions":["ddd"]},"application/vnd.fujixerox.docuworks":{"source":"iana","extensions":["xdw"]},"application/vnd.fujixerox.docuworks.binder":{"source":"iana","extensions":["xbd"]},"application/vnd.fujixerox.docuworks.container":{"source":"iana"},"application/vnd.fujixerox.hbpl":{"source":"iana"},"application/vnd.fut-misnet":{"source":"iana"},"application/vnd.fuzzysheet":{"source":"iana","extensions":["fzs"]},"application/vnd.genomatix.tuxedo":{"source":"iana","extensions":["txd"]},"application/vnd.geo+json":{"source":"iana","compressible":true},"application/vnd.geocube+xml":{"source":"iana","compressible":true},"application/vnd.geogebra.file":{"source":"iana","extensions":["ggb"]},"application/vnd.geogebra.tool":{"source":"iana","extensions":["ggt"]},"application/vnd.geometry-explorer":{"source":"iana","extensions":["gex","gre"]},"application/vnd.geonext":{"source":"iana","extensions":["gxt"]},"application/vnd.geoplan":{"source":"iana","extensions":["g2w"]},"application/vnd.geospace":{"source":"iana","extensions":["g3w"]},"application/vnd.gerber":{"source":"iana"},"application/vnd.globalplatform.card-content-mgt":{"source":"iana"},"application/vnd.globalplatform.card-content-mgt-response":{"source":"iana"},"application/vnd.gmx":{"source":"iana","extensions":["gmx"]},"application/vnd.google-apps.document":{"compressible":false,"extensions":["gdoc"]},"application/vnd.google-apps.presentation":{"compressible":false,"extensions":["gslides"]},"application/vnd.google-apps.spreadsheet":{"compressible":false,"extensions":["gsheet"]},"application/vnd.google-earth.kml+xml":{"source":"iana","compressible":true,"extensions":["kml"]},"application/vnd.google-earth.kmz":{"source":"iana","compressible":false,"extensions":["kmz"]},"application/vnd.gov.sk.e-form+xml":{"source":"iana","compressible":true},"application/vnd.gov.sk.e-form+zip":{"source":"iana","compressible":false},"application/vnd.gov.sk.xmldatacontainer+xml":{"source":"iana","compressible":true},"application/vnd.grafeq":{"source":"iana","extensions":["gqf","gqs"]},"application/vnd.gridmp":{"source":"iana"},"application/vnd.groove-account":{"source":"iana","extensions":["gac"]},"application/vnd.groove-help":{"source":"iana","extensions":["ghf"]},"application/vnd.groove-identity-message":{"source":"iana","extensions":["gim"]},"application/vnd.groove-injector":{"source":"iana","extensions":["grv"]},"application/vnd.groove-tool-message":{"source":"iana","extensions":["gtm"]},"application/vnd.groove-tool-template":{"source":"iana","extensions":["tpl"]},"application/vnd.groove-vcard":{"source":"iana","extensions":["vcg"]},"application/vnd.hal+json":{"source":"iana","compressible":true},"application/vnd.hal+xml":{"source":"iana","compressible":true,"extensions":["hal"]},"application/vnd.handheld-entertainment+xml":{"source":"iana","compressible":true,"extensions":["zmm"]},"application/vnd.hbci":{"source":"iana","extensions":["hbci"]},"application/vnd.hc+json":{"source":"iana","compressible":true},"application/vnd.hcl-bireports":{"source":"iana"},"application/vnd.hdt":{"source":"iana"},"application/vnd.heroku+json":{"source":"iana","compressible":true},"application/vnd.hhe.lesson-player":{"source":"iana","extensions":["les"]},"application/vnd.hp-hpgl":{"source":"iana","extensions":["hpgl"]},"application/vnd.hp-hpid":{"source":"iana","extensions":["hpid"]},"application/vnd.hp-hps":{"source":"iana","extensions":["hps"]},"application/vnd.hp-jlyt":{"source":"iana","extensions":["jlt"]},"application/vnd.hp-pcl":{"source":"iana","extensions":["pcl"]},"application/vnd.hp-pclxl":{"source":"iana","extensions":["pclxl"]},"application/vnd.httphone":{"source":"iana"},"application/vnd.hydrostatix.sof-data":{"source":"iana","extensions":["sfd-hdstx"]},"application/vnd.hyper+json":{"source":"iana","compressible":true},"application/vnd.hyper-item+json":{"source":"iana","compressible":true},"application/vnd.hyperdrive+json":{"source":"iana","compressible":true},"application/vnd.hzn-3d-crossword":{"source":"iana"},"application/vnd.ibm.afplinedata":{"source":"iana"},"application/vnd.ibm.electronic-media":{"source":"iana"},"application/vnd.ibm.minipay":{"source":"iana","extensions":["mpy"]},"application/vnd.ibm.modcap":{"source":"iana","extensions":["afp","listafp","list3820"]},"application/vnd.ibm.rights-management":{"source":"iana","extensions":["irm"]},"application/vnd.ibm.secure-container":{"source":"iana","extensions":["sc"]},"application/vnd.iccprofile":{"source":"iana","extensions":["icc","icm"]},"application/vnd.ieee.1905":{"source":"iana"},"application/vnd.igloader":{"source":"iana","extensions":["igl"]},"application/vnd.imagemeter.folder+zip":{"source":"iana","compressible":false},"application/vnd.imagemeter.image+zip":{"source":"iana","compressible":false},"application/vnd.immervision-ivp":{"source":"iana","extensions":["ivp"]},"application/vnd.immervision-ivu":{"source":"iana","extensions":["ivu"]},"application/vnd.ims.imsccv1p1":{"source":"iana"},"application/vnd.ims.imsccv1p2":{"source":"iana"},"application/vnd.ims.imsccv1p3":{"source":"iana"},"application/vnd.ims.lis.v2.result+json":{"source":"iana","compressible":true},"application/vnd.ims.lti.v2.toolconsumerprofile+json":{"source":"iana","compressible":true},"application/vnd.ims.lti.v2.toolproxy+json":{"source":"iana","compressible":true},"application/vnd.ims.lti.v2.toolproxy.id+json":{"source":"iana","compressible":true},"application/vnd.ims.lti.v2.toolsettings+json":{"source":"iana","compressible":true},"application/vnd.ims.lti.v2.toolsettings.simple+json":{"source":"iana","compressible":true},"application/vnd.informedcontrol.rms+xml":{"source":"iana","compressible":true},"application/vnd.informix-visionary":{"source":"iana"},"application/vnd.infotech.project":{"source":"iana"},"application/vnd.infotech.project+xml":{"source":"iana","compressible":true},"application/vnd.innopath.wamp.notification":{"source":"iana"},"application/vnd.insors.igm":{"source":"iana","extensions":["igm"]},"application/vnd.intercon.formnet":{"source":"iana","extensions":["xpw","xpx"]},"application/vnd.intergeo":{"source":"iana","extensions":["i2g"]},"application/vnd.intertrust.digibox":{"source":"iana"},"application/vnd.intertrust.nncp":{"source":"iana"},"application/vnd.intu.qbo":{"source":"iana","extensions":["qbo"]},"application/vnd.intu.qfx":{"source":"iana","extensions":["qfx"]},"application/vnd.iptc.g2.catalogitem+xml":{"source":"iana","compressible":true},"application/vnd.iptc.g2.conceptitem+xml":{"source":"iana","compressible":true},"application/vnd.iptc.g2.knowledgeitem+xml":{"source":"iana","compressible":true},"application/vnd.iptc.g2.newsitem+xml":{"source":"iana","compressible":true},"application/vnd.iptc.g2.newsmessage+xml":{"source":"iana","compressible":true},"application/vnd.iptc.g2.packageitem+xml":{"source":"iana","compressible":true},"application/vnd.iptc.g2.planningitem+xml":{"source":"iana","compressible":true},"application/vnd.ipunplugged.rcprofile":{"source":"iana","extensions":["rcprofile"]},"application/vnd.irepository.package+xml":{"source":"iana","compressible":true,"extensions":["irp"]},"application/vnd.is-xpr":{"source":"iana","extensions":["xpr"]},"application/vnd.isac.fcs":{"source":"iana","extensions":["fcs"]},"application/vnd.jam":{"source":"iana","extensions":["jam"]},"application/vnd.japannet-directory-service":{"source":"iana"},"application/vnd.japannet-jpnstore-wakeup":{"source":"iana"},"application/vnd.japannet-payment-wakeup":{"source":"iana"},"application/vnd.japannet-registration":{"source":"iana"},"application/vnd.japannet-registration-wakeup":{"source":"iana"},"application/vnd.japannet-setstore-wakeup":{"source":"iana"},"application/vnd.japannet-verification":{"source":"iana"},"application/vnd.japannet-verification-wakeup":{"source":"iana"},"application/vnd.jcp.javame.midlet-rms":{"source":"iana","extensions":["rms"]},"application/vnd.jisp":{"source":"iana","extensions":["jisp"]},"application/vnd.joost.joda-archive":{"source":"iana","extensions":["joda"]},"application/vnd.jsk.isdn-ngn":{"source":"iana"},"application/vnd.kahootz":{"source":"iana","extensions":["ktz","ktr"]},"application/vnd.kde.karbon":{"source":"iana","extensions":["karbon"]},"application/vnd.kde.kchart":{"source":"iana","extensions":["chrt"]},"application/vnd.kde.kformula":{"source":"iana","extensions":["kfo"]},"application/vnd.kde.kivio":{"source":"iana","extensions":["flw"]},"application/vnd.kde.kontour":{"source":"iana","extensions":["kon"]},"application/vnd.kde.kpresenter":{"source":"iana","extensions":["kpr","kpt"]},"application/vnd.kde.kspread":{"source":"iana","extensions":["ksp"]},"application/vnd.kde.kword":{"source":"iana","extensions":["kwd","kwt"]},"application/vnd.kenameaapp":{"source":"iana","extensions":["htke"]},"application/vnd.kidspiration":{"source":"iana","extensions":["kia"]},"application/vnd.kinar":{"source":"iana","extensions":["kne","knp"]},"application/vnd.koan":{"source":"iana","extensions":["skp","skd","skt","skm"]},"application/vnd.kodak-descriptor":{"source":"iana","extensions":["sse"]},"application/vnd.las.las+json":{"source":"iana","compressible":true},"application/vnd.las.las+xml":{"source":"iana","compressible":true,"extensions":["lasxml"]},"application/vnd.leap+json":{"source":"iana","compressible":true},"application/vnd.liberty-request+xml":{"source":"iana","compressible":true},"application/vnd.llamagraphics.life-balance.desktop":{"source":"iana","extensions":["lbd"]},"application/vnd.llamagraphics.life-balance.exchange+xml":{"source":"iana","compressible":true,"extensions":["lbe"]},"application/vnd.lotus-1-2-3":{"source":"iana","extensions":["123"]},"application/vnd.lotus-approach":{"source":"iana","extensions":["apr"]},"application/vnd.lotus-freelance":{"source":"iana","extensions":["pre"]},"application/vnd.lotus-notes":{"source":"iana","extensions":["nsf"]},"application/vnd.lotus-organizer":{"source":"iana","extensions":["org"]},"application/vnd.lotus-screencam":{"source":"iana","extensions":["scm"]},"application/vnd.lotus-wordpro":{"source":"iana","extensions":["lwp"]},"application/vnd.macports.portpkg":{"source":"iana","extensions":["portpkg"]},"application/vnd.mapbox-vector-tile":{"source":"iana"},"application/vnd.marlin.drm.actiontoken+xml":{"source":"iana","compressible":true},"application/vnd.marlin.drm.conftoken+xml":{"source":"iana","compressible":true},"application/vnd.marlin.drm.license+xml":{"source":"iana","compressible":true},"application/vnd.marlin.drm.mdcf":{"source":"iana"},"application/vnd.mason+json":{"source":"iana","compressible":true},"application/vnd.maxmind.maxmind-db":{"source":"iana"},"application/vnd.mcd":{"source":"iana","extensions":["mcd"]},"application/vnd.medcalcdata":{"source":"iana","extensions":["mc1"]},"application/vnd.mediastation.cdkey":{"source":"iana","extensions":["cdkey"]},"application/vnd.meridian-slingshot":{"source":"iana"},"application/vnd.mfer":{"source":"iana","extensions":["mwf"]},"application/vnd.mfmp":{"source":"iana","extensions":["mfm"]},"application/vnd.micro+json":{"source":"iana","compressible":true},"application/vnd.micrografx.flo":{"source":"iana","extensions":["flo"]},"application/vnd.micrografx.igx":{"source":"iana","extensions":["igx"]},"application/vnd.microsoft.portable-executable":{"source":"iana"},"application/vnd.microsoft.windows.thumbnail-cache":{"source":"iana"},"application/vnd.miele+json":{"source":"iana","compressible":true},"application/vnd.mif":{"source":"iana","extensions":["mif"]},"application/vnd.minisoft-hp3000-save":{"source":"iana"},"application/vnd.mitsubishi.misty-guard.trustweb":{"source":"iana"},"application/vnd.mobius.daf":{"source":"iana","extensions":["daf"]},"application/vnd.mobius.dis":{"source":"iana","extensions":["dis"]},"application/vnd.mobius.mbk":{"source":"iana","extensions":["mbk"]},"application/vnd.mobius.mqy":{"source":"iana","extensions":["mqy"]},"application/vnd.mobius.msl":{"source":"iana","extensions":["msl"]},"application/vnd.mobius.plc":{"source":"iana","extensions":["plc"]},"application/vnd.mobius.txf":{"source":"iana","extensions":["txf"]},"application/vnd.mophun.application":{"source":"iana","extensions":["mpn"]},"application/vnd.mophun.certificate":{"source":"iana","extensions":["mpc"]},"application/vnd.motorola.flexsuite":{"source":"iana"},"application/vnd.motorola.flexsuite.adsi":{"source":"iana"},"application/vnd.motorola.flexsuite.fis":{"source":"iana"},"application/vnd.motorola.flexsuite.gotap":{"source":"iana"},"application/vnd.motorola.flexsuite.kmr":{"source":"iana"},"application/vnd.motorola.flexsuite.ttc":{"source":"iana"},"application/vnd.motorola.flexsuite.wem":{"source":"iana"},"application/vnd.motorola.iprm":{"source":"iana"},"application/vnd.mozilla.xul+xml":{"source":"iana","compressible":true,"extensions":["xul"]},"application/vnd.ms-3mfdocument":{"source":"iana"},"application/vnd.ms-artgalry":{"source":"iana","extensions":["cil"]},"application/vnd.ms-asf":{"source":"iana"},"application/vnd.ms-cab-compressed":{"source":"iana","extensions":["cab"]},"application/vnd.ms-color.iccprofile":{"source":"apache"},"application/vnd.ms-excel":{"source":"iana","compressible":false,"extensions":["xls","xlm","xla","xlc","xlt","xlw"]},"application/vnd.ms-excel.addin.macroenabled.12":{"source":"iana","extensions":["xlam"]},"application/vnd.ms-excel.sheet.binary.macroenabled.12":{"source":"iana","extensions":["xlsb"]},"application/vnd.ms-excel.sheet.macroenabled.12":{"source":"iana","extensions":["xlsm"]},"application/vnd.ms-excel.template.macroenabled.12":{"source":"iana","extensions":["xltm"]},"application/vnd.ms-fontobject":{"source":"iana","compressible":true,"extensions":["eot"]},"application/vnd.ms-htmlhelp":{"source":"iana","extensions":["chm"]},"application/vnd.ms-ims":{"source":"iana","extensions":["ims"]},"application/vnd.ms-lrm":{"source":"iana","extensions":["lrm"]},"application/vnd.ms-office.activex+xml":{"source":"iana","compressible":true},"application/vnd.ms-officetheme":{"source":"iana","extensions":["thmx"]},"application/vnd.ms-opentype":{"source":"apache","compressible":true},"application/vnd.ms-outlook":{"compressible":false,"extensions":["msg"]},"application/vnd.ms-package.obfuscated-opentype":{"source":"apache"},"application/vnd.ms-pki.seccat":{"source":"apache","extensions":["cat"]},"application/vnd.ms-pki.stl":{"source":"apache","extensions":["stl"]},"application/vnd.ms-playready.initiator+xml":{"source":"iana","compressible":true},"application/vnd.ms-powerpoint":{"source":"iana","compressible":false,"extensions":["ppt","pps","pot"]},"application/vnd.ms-powerpoint.addin.macroenabled.12":{"source":"iana","extensions":["ppam"]},"application/vnd.ms-powerpoint.presentation.macroenabled.12":{"source":"iana","extensions":["pptm"]},"application/vnd.ms-powerpoint.slide.macroenabled.12":{"source":"iana","extensions":["sldm"]},"application/vnd.ms-powerpoint.slideshow.macroenabled.12":{"source":"iana","extensions":["ppsm"]},"application/vnd.ms-powerpoint.template.macroenabled.12":{"source":"iana","extensions":["potm"]},"application/vnd.ms-printdevicecapabilities+xml":{"source":"iana","compressible":true},"application/vnd.ms-printing.printticket+xml":{"source":"apache","compressible":true},"application/vnd.ms-printschematicket+xml":{"source":"iana","compressible":true},"application/vnd.ms-project":{"source":"iana","extensions":["mpp","mpt"]},"application/vnd.ms-tnef":{"source":"iana"},"application/vnd.ms-windows.devicepairing":{"source":"iana"},"application/vnd.ms-windows.nwprinting.oob":{"source":"iana"},"application/vnd.ms-windows.printerpairing":{"source":"iana"},"application/vnd.ms-windows.wsd.oob":{"source":"iana"},"application/vnd.ms-wmdrm.lic-chlg-req":{"source":"iana"},"application/vnd.ms-wmdrm.lic-resp":{"source":"iana"},"application/vnd.ms-wmdrm.meter-chlg-req":{"source":"iana"},"application/vnd.ms-wmdrm.meter-resp":{"source":"iana"},"application/vnd.ms-word.document.macroenabled.12":{"source":"iana","extensions":["docm"]},"application/vnd.ms-word.template.macroenabled.12":{"source":"iana","extensions":["dotm"]},"application/vnd.ms-works":{"source":"iana","extensions":["wps","wks","wcm","wdb"]},"application/vnd.ms-wpl":{"source":"iana","extensions":["wpl"]},"application/vnd.ms-xpsdocument":{"source":"iana","compressible":false,"extensions":["xps"]},"application/vnd.msa-disk-image":{"source":"iana"},"application/vnd.mseq":{"source":"iana","extensions":["mseq"]},"application/vnd.msign":{"source":"iana"},"application/vnd.multiad.creator":{"source":"iana"},"application/vnd.multiad.creator.cif":{"source":"iana"},"application/vnd.music-niff":{"source":"iana"},"application/vnd.musician":{"source":"iana","extensions":["mus"]},"application/vnd.muvee.style":{"source":"iana","extensions":["msty"]},"application/vnd.mynfc":{"source":"iana","extensions":["taglet"]},"application/vnd.ncd.control":{"source":"iana"},"application/vnd.ncd.reference":{"source":"iana"},"application/vnd.nearst.inv+json":{"source":"iana","compressible":true},"application/vnd.nervana":{"source":"iana"},"application/vnd.netfpx":{"source":"iana"},"application/vnd.neurolanguage.nlu":{"source":"iana","extensions":["nlu"]},"application/vnd.nimn":{"source":"iana"},"application/vnd.nintendo.nitro.rom":{"source":"iana"},"application/vnd.nintendo.snes.rom":{"source":"iana"},"application/vnd.nitf":{"source":"iana","extensions":["ntf","nitf"]},"application/vnd.noblenet-directory":{"source":"iana","extensions":["nnd"]},"application/vnd.noblenet-sealer":{"source":"iana","extensions":["nns"]},"application/vnd.noblenet-web":{"source":"iana","extensions":["nnw"]},"application/vnd.nokia.catalogs":{"source":"iana"},"application/vnd.nokia.conml+wbxml":{"source":"iana"},"application/vnd.nokia.conml+xml":{"source":"iana","compressible":true},"application/vnd.nokia.iptv.config+xml":{"source":"iana","compressible":true},"application/vnd.nokia.isds-radio-presets":{"source":"iana"},"application/vnd.nokia.landmark+wbxml":{"source":"iana"},"application/vnd.nokia.landmark+xml":{"source":"iana","compressible":true},"application/vnd.nokia.landmarkcollection+xml":{"source":"iana","compressible":true},"application/vnd.nokia.n-gage.ac+xml":{"source":"iana","compressible":true},"application/vnd.nokia.n-gage.data":{"source":"iana","extensions":["ngdat"]},"application/vnd.nokia.n-gage.symbian.install":{"source":"iana","extensions":["n-gage"]},"application/vnd.nokia.ncd":{"source":"iana"},"application/vnd.nokia.pcd+wbxml":{"source":"iana"},"application/vnd.nokia.pcd+xml":{"source":"iana","compressible":true},"application/vnd.nokia.radio-preset":{"source":"iana","extensions":["rpst"]},"application/vnd.nokia.radio-presets":{"source":"iana","extensions":["rpss"]},"application/vnd.novadigm.edm":{"source":"iana","extensions":["edm"]},"application/vnd.novadigm.edx":{"source":"iana","extensions":["edx"]},"application/vnd.novadigm.ext":{"source":"iana","extensions":["ext"]},"application/vnd.ntt-local.content-share":{"source":"iana"},"application/vnd.ntt-local.file-transfer":{"source":"iana"},"application/vnd.ntt-local.ogw_remote-access":{"source":"iana"},"application/vnd.ntt-local.sip-ta_remote":{"source":"iana"},"application/vnd.ntt-local.sip-ta_tcp_stream":{"source":"iana"},"application/vnd.oasis.opendocument.chart":{"source":"iana","extensions":["odc"]},"application/vnd.oasis.opendocument.chart-template":{"source":"iana","extensions":["otc"]},"application/vnd.oasis.opendocument.database":{"source":"iana","extensions":["odb"]},"application/vnd.oasis.opendocument.formula":{"source":"iana","extensions":["odf"]},"application/vnd.oasis.opendocument.formula-template":{"source":"iana","extensions":["odft"]},"application/vnd.oasis.opendocument.graphics":{"source":"iana","compressible":false,"extensions":["odg"]},"application/vnd.oasis.opendocument.graphics-template":{"source":"iana","extensions":["otg"]},"application/vnd.oasis.opendocument.image":{"source":"iana","extensions":["odi"]},"application/vnd.oasis.opendocument.image-template":{"source":"iana","extensions":["oti"]},"application/vnd.oasis.opendocument.presentation":{"source":"iana","compressible":false,"extensions":["odp"]},"application/vnd.oasis.opendocument.presentation-template":{"source":"iana","extensions":["otp"]},"application/vnd.oasis.opendocument.spreadsheet":{"source":"iana","compressible":false,"extensions":["ods"]},"application/vnd.oasis.opendocument.spreadsheet-template":{"source":"iana","extensions":["ots"]},"application/vnd.oasis.opendocument.text":{"source":"iana","compressible":false,"extensions":["odt"]},"application/vnd.oasis.opendocument.text-master":{"source":"iana","extensions":["odm"]},"application/vnd.oasis.opendocument.text-template":{"source":"iana","extensions":["ott"]},"application/vnd.oasis.opendocument.text-web":{"source":"iana","extensions":["oth"]},"application/vnd.obn":{"source":"iana"},"application/vnd.ocf+cbor":{"source":"iana"},"application/vnd.oftn.l10n+json":{"source":"iana","compressible":true},"application/vnd.oipf.contentaccessdownload+xml":{"source":"iana","compressible":true},"application/vnd.oipf.contentaccessstreaming+xml":{"source":"iana","compressible":true},"application/vnd.oipf.cspg-hexbinary":{"source":"iana"},"application/vnd.oipf.dae.svg+xml":{"source":"iana","compressible":true},"application/vnd.oipf.dae.xhtml+xml":{"source":"iana","compressible":true},"application/vnd.oipf.mippvcontrolmessage+xml":{"source":"iana","compressible":true},"application/vnd.oipf.pae.gem":{"source":"iana"},"application/vnd.oipf.spdiscovery+xml":{"source":"iana","compressible":true},"application/vnd.oipf.spdlist+xml":{"source":"iana","compressible":true},"application/vnd.oipf.ueprofile+xml":{"source":"iana","compressible":true},"application/vnd.oipf.userprofile+xml":{"source":"iana","compressible":true},"application/vnd.olpc-sugar":{"source":"iana","extensions":["xo"]},"application/vnd.oma-scws-config":{"source":"iana"},"application/vnd.oma-scws-http-request":{"source":"iana"},"application/vnd.oma-scws-http-response":{"source":"iana"},"application/vnd.oma.bcast.associated-procedure-parameter+xml":{"source":"iana","compressible":true},"application/vnd.oma.bcast.drm-trigger+xml":{"source":"iana","compressible":true},"application/vnd.oma.bcast.imd+xml":{"source":"iana","compressible":true},"application/vnd.oma.bcast.ltkm":{"source":"iana"},"application/vnd.oma.bcast.notification+xml":{"source":"iana","compressible":true},"application/vnd.oma.bcast.provisioningtrigger":{"source":"iana"},"application/vnd.oma.bcast.sgboot":{"source":"iana"},"application/vnd.oma.bcast.sgdd+xml":{"source":"iana","compressible":true},"application/vnd.oma.bcast.sgdu":{"source":"iana"},"application/vnd.oma.bcast.simple-symbol-container":{"source":"iana"},"application/vnd.oma.bcast.smartcard-trigger+xml":{"source":"iana","compressible":true},"application/vnd.oma.bcast.sprov+xml":{"source":"iana","compressible":true},"application/vnd.oma.bcast.stkm":{"source":"iana"},"application/vnd.oma.cab-address-book+xml":{"source":"iana","compressible":true},"application/vnd.oma.cab-feature-handler+xml":{"source":"iana","compressible":true},"application/vnd.oma.cab-pcc+xml":{"source":"iana","compressible":true},"application/vnd.oma.cab-subs-invite+xml":{"source":"iana","compressible":true},"application/vnd.oma.cab-user-prefs+xml":{"source":"iana","compressible":true},"application/vnd.oma.dcd":{"source":"iana"},"application/vnd.oma.dcdc":{"source":"iana"},"application/vnd.oma.dd2+xml":{"source":"iana","compressible":true,"extensions":["dd2"]},"application/vnd.oma.drm.risd+xml":{"source":"iana","compressible":true},"application/vnd.oma.group-usage-list+xml":{"source":"iana","compressible":true},"application/vnd.oma.lwm2m+json":{"source":"iana","compressible":true},"application/vnd.oma.lwm2m+tlv":{"source":"iana"},"application/vnd.oma.pal+xml":{"source":"iana","compressible":true},"application/vnd.oma.poc.detailed-progress-report+xml":{"source":"iana","compressible":true},"application/vnd.oma.poc.final-report+xml":{"source":"iana","compressible":true},"application/vnd.oma.poc.groups+xml":{"source":"iana","compressible":true},"application/vnd.oma.poc.invocation-descriptor+xml":{"source":"iana","compressible":true},"application/vnd.oma.poc.optimized-progress-report+xml":{"source":"iana","compressible":true},"application/vnd.oma.push":{"source":"iana"},"application/vnd.oma.scidm.messages+xml":{"source":"iana","compressible":true},"application/vnd.oma.xcap-directory+xml":{"source":"iana","compressible":true},"application/vnd.omads-email+xml":{"source":"iana","compressible":true},"application/vnd.omads-file+xml":{"source":"iana","compressible":true},"application/vnd.omads-folder+xml":{"source":"iana","compressible":true},"application/vnd.omaloc-supl-init":{"source":"iana"},"application/vnd.onepager":{"source":"iana"},"application/vnd.onepagertamp":{"source":"iana"},"application/vnd.onepagertamx":{"source":"iana"},"application/vnd.onepagertat":{"source":"iana"},"application/vnd.onepagertatp":{"source":"iana"},"application/vnd.onepagertatx":{"source":"iana"},"application/vnd.openblox.game+xml":{"source":"iana","compressible":true},"application/vnd.openblox.game-binary":{"source":"iana"},"application/vnd.openeye.oeb":{"source":"iana"},"application/vnd.openofficeorg.extension":{"source":"apache","extensions":["oxt"]},"application/vnd.openstreetmap.data+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.custom-properties+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.customxmlproperties+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.drawing+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.drawingml.chart+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.drawingml.chartshapes+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.drawingml.diagramcolors+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.drawingml.diagramdata+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.drawingml.diagramlayout+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.drawingml.diagramstyle+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.extended-properties+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.presentationml.commentauthors+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.presentationml.comments+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.presentationml.handoutmaster+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.presentationml.notesmaster+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.presentationml.notesslide+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.presentationml.presentation":{"source":"iana","compressible":false,"extensions":["pptx"]},"application/vnd.openxmlformats-officedocument.presentationml.presentation.main+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.presentationml.presprops+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.presentationml.slide":{"source":"iana","extensions":["sldx"]},"application/vnd.openxmlformats-officedocument.presentationml.slide+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.presentationml.slidelayout+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.presentationml.slidemaster+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.presentationml.slideshow":{"source":"iana","extensions":["ppsx"]},"application/vnd.openxmlformats-officedocument.presentationml.slideshow.main+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.presentationml.slideupdateinfo+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.presentationml.tablestyles+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.presentationml.tags+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.presentationml.template":{"source":"iana","extensions":["potx"]},"application/vnd.openxmlformats-officedocument.presentationml.template.main+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.presentationml.viewprops+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.spreadsheetml.calcchain+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.spreadsheetml.chartsheet+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.spreadsheetml.comments+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.spreadsheetml.connections+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.spreadsheetml.dialogsheet+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.spreadsheetml.externallink+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.spreadsheetml.pivotcachedefinition+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.spreadsheetml.pivotcacherecords+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.spreadsheetml.pivottable+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.spreadsheetml.querytable+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.spreadsheetml.revisionheaders+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.spreadsheetml.revisionlog+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.spreadsheetml.sharedstrings+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet":{"source":"iana","compressible":false,"extensions":["xlsx"]},"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.spreadsheetml.sheetmetadata+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.spreadsheetml.table+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.spreadsheetml.tablesinglecells+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.spreadsheetml.template":{"source":"iana","extensions":["xltx"]},"application/vnd.openxmlformats-officedocument.spreadsheetml.template.main+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.spreadsheetml.usernames+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.spreadsheetml.volatiledependencies+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.theme+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.themeoverride+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.vmldrawing":{"source":"iana"},"application/vnd.openxmlformats-officedocument.wordprocessingml.comments+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.wordprocessingml.document":{"source":"iana","compressible":false,"extensions":["docx"]},"application/vnd.openxmlformats-officedocument.wordprocessingml.document.glossary+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.wordprocessingml.endnotes+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.wordprocessingml.fonttable+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.wordprocessingml.footer+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.wordprocessingml.footnotes+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.wordprocessingml.template":{"source":"iana","extensions":["dotx"]},"application/vnd.openxmlformats-officedocument.wordprocessingml.template.main+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.wordprocessingml.websettings+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-package.core-properties+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-package.digital-signature-xmlsignature+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-package.relationships+xml":{"source":"iana","compressible":true},"application/vnd.oracle.resource+json":{"source":"iana","compressible":true},"application/vnd.orange.indata":{"source":"iana"},"application/vnd.osa.netdeploy":{"source":"iana"},"application/vnd.osgeo.mapguide.package":{"source":"iana","extensions":["mgp"]},"application/vnd.osgi.bundle":{"source":"iana"},"application/vnd.osgi.dp":{"source":"iana","extensions":["dp"]},"application/vnd.osgi.subsystem":{"source":"iana","extensions":["esa"]},"application/vnd.otps.ct-kip+xml":{"source":"iana","compressible":true},"application/vnd.oxli.countgraph":{"source":"iana"},"application/vnd.pagerduty+json":{"source":"iana","compressible":true},"application/vnd.palm":{"source":"iana","extensions":["pdb","pqa","oprc"]},"application/vnd.panoply":{"source":"iana"},"application/vnd.paos+xml":{"source":"iana","compressible":true},"application/vnd.paos.xml":{"source":"apache"},"application/vnd.patentdive":{"source":"iana"},"application/vnd.pawaafile":{"source":"iana","extensions":["paw"]},"application/vnd.pcos":{"source":"iana"},"application/vnd.pg.format":{"source":"iana","extensions":["str"]},"application/vnd.pg.osasli":{"source":"iana","extensions":["ei6"]},"application/vnd.piaccess.application-licence":{"source":"iana"},"application/vnd.picsel":{"source":"iana","extensions":["efif"]},"application/vnd.pmi.widget":{"source":"iana","extensions":["wg"]},"application/vnd.poc.group-advertisement+xml":{"source":"iana","compressible":true},"application/vnd.pocketlearn":{"source":"iana","extensions":["plf"]},"application/vnd.powerbuilder6":{"source":"iana","extensions":["pbd"]},"application/vnd.powerbuilder6-s":{"source":"iana"},"application/vnd.powerbuilder7":{"source":"iana"},"application/vnd.powerbuilder7-s":{"source":"iana"},"application/vnd.powerbuilder75":{"source":"iana"},"application/vnd.powerbuilder75-s":{"source":"iana"},"application/vnd.preminet":{"source":"iana"},"application/vnd.previewsystems.box":{"source":"iana","extensions":["box"]},"application/vnd.proteus.magazine":{"source":"iana","extensions":["mgz"]},"application/vnd.psfs":{"source":"iana"},"application/vnd.publishare-delta-tree":{"source":"iana","extensions":["qps"]},"application/vnd.pvi.ptid1":{"source":"iana","extensions":["ptid"]},"application/vnd.pwg-multiplexed":{"source":"iana"},"application/vnd.pwg-xhtml-print+xml":{"source":"iana","compressible":true},"application/vnd.qualcomm.brew-app-res":{"source":"iana"},"application/vnd.quarantainenet":{"source":"iana"},"application/vnd.quark.quarkxpress":{"source":"iana","extensions":["qxd","qxt","qwd","qwt","qxl","qxb"]},"application/vnd.quobject-quoxdocument":{"source":"iana"},"application/vnd.radisys.moml+xml":{"source":"iana","compressible":true},"application/vnd.radisys.msml+xml":{"source":"iana","compressible":true},"application/vnd.radisys.msml-audit+xml":{"source":"iana","compressible":true},"application/vnd.radisys.msml-audit-conf+xml":{"source":"iana","compressible":true},"application/vnd.radisys.msml-audit-conn+xml":{"source":"iana","compressible":true},"application/vnd.radisys.msml-audit-dialog+xml":{"source":"iana","compressible":true},"application/vnd.radisys.msml-audit-stream+xml":{"source":"iana","compressible":true},"application/vnd.radisys.msml-conf+xml":{"source":"iana","compressible":true},"application/vnd.radisys.msml-dialog+xml":{"source":"iana","compressible":true},"application/vnd.radisys.msml-dialog-base+xml":{"source":"iana","compressible":true},"application/vnd.radisys.msml-dialog-fax-detect+xml":{"source":"iana","compressible":true},"application/vnd.radisys.msml-dialog-fax-sendrecv+xml":{"source":"iana","compressible":true},"application/vnd.radisys.msml-dialog-group+xml":{"source":"iana","compressible":true},"application/vnd.radisys.msml-dialog-speech+xml":{"source":"iana","compressible":true},"application/vnd.radisys.msml-dialog-transform+xml":{"source":"iana","compressible":true},"application/vnd.rainstor.data":{"source":"iana"},"application/vnd.rapid":{"source":"iana"},"application/vnd.rar":{"source":"iana"},"application/vnd.realvnc.bed":{"source":"iana","extensions":["bed"]},"application/vnd.recordare.musicxml":{"source":"iana","extensions":["mxl"]},"application/vnd.recordare.musicxml+xml":{"source":"iana","compressible":true,"extensions":["musicxml"]},"application/vnd.renlearn.rlprint":{"source":"iana"},"application/vnd.restful+json":{"source":"iana","compressible":true},"application/vnd.rig.cryptonote":{"source":"iana","extensions":["cryptonote"]},"application/vnd.rim.cod":{"source":"apache","extensions":["cod"]},"application/vnd.rn-realmedia":{"source":"apache","extensions":["rm"]},"application/vnd.rn-realmedia-vbr":{"source":"apache","extensions":["rmvb"]},"application/vnd.route66.link66+xml":{"source":"iana","compressible":true,"extensions":["link66"]},"application/vnd.rs-274x":{"source":"iana"},"application/vnd.ruckus.download":{"source":"iana"},"application/vnd.s3sms":{"source":"iana"},"application/vnd.sailingtracker.track":{"source":"iana","extensions":["st"]},"application/vnd.sbm.cid":{"source":"iana"},"application/vnd.sbm.mid2":{"source":"iana"},"application/vnd.scribus":{"source":"iana"},"application/vnd.sealed.3df":{"source":"iana"},"application/vnd.sealed.csf":{"source":"iana"},"application/vnd.sealed.doc":{"source":"iana"},"application/vnd.sealed.eml":{"source":"iana"},"application/vnd.sealed.mht":{"source":"iana"},"application/vnd.sealed.net":{"source":"iana"},"application/vnd.sealed.ppt":{"source":"iana"},"application/vnd.sealed.tiff":{"source":"iana"},"application/vnd.sealed.xls":{"source":"iana"},"application/vnd.sealedmedia.softseal.html":{"source":"iana"},"application/vnd.sealedmedia.softseal.pdf":{"source":"iana"},"application/vnd.seemail":{"source":"iana","extensions":["see"]},"application/vnd.sema":{"source":"iana","extensions":["sema"]},"application/vnd.semd":{"source":"iana","extensions":["semd"]},"application/vnd.semf":{"source":"iana","extensions":["semf"]},"application/vnd.shana.informed.formdata":{"source":"iana","extensions":["ifm"]},"application/vnd.shana.informed.formtemplate":{"source":"iana","extensions":["itp"]},"application/vnd.shana.informed.interchange":{"source":"iana","extensions":["iif"]},"application/vnd.shana.informed.package":{"source":"iana","extensions":["ipk"]},"application/vnd.shootproof+json":{"source":"iana","compressible":true},"application/vnd.sigrok.session":{"source":"iana"},"application/vnd.simtech-mindmapper":{"source":"iana","extensions":["twd","twds"]},"application/vnd.siren+json":{"source":"iana","compressible":true},"application/vnd.smaf":{"source":"iana","extensions":["mmf"]},"application/vnd.smart.notebook":{"source":"iana"},"application/vnd.smart.teacher":{"source":"iana","extensions":["teacher"]},"application/vnd.software602.filler.form+xml":{"source":"iana","compressible":true},"application/vnd.software602.filler.form-xml-zip":{"source":"iana"},"application/vnd.solent.sdkm+xml":{"source":"iana","compressible":true,"extensions":["sdkm","sdkd"]},"application/vnd.spotfire.dxp":{"source":"iana","extensions":["dxp"]},"application/vnd.spotfire.sfs":{"source":"iana","extensions":["sfs"]},"application/vnd.sqlite3":{"source":"iana"},"application/vnd.sss-cod":{"source":"iana"},"application/vnd.sss-dtf":{"source":"iana"},"application/vnd.sss-ntf":{"source":"iana"},"application/vnd.stardivision.calc":{"source":"apache","extensions":["sdc"]},"application/vnd.stardivision.draw":{"source":"apache","extensions":["sda"]},"application/vnd.stardivision.impress":{"source":"apache","extensions":["sdd"]},"application/vnd.stardivision.math":{"source":"apache","extensions":["smf"]},"application/vnd.stardivision.writer":{"source":"apache","extensions":["sdw","vor"]},"application/vnd.stardivision.writer-global":{"source":"apache","extensions":["sgl"]},"application/vnd.stepmania.package":{"source":"iana","extensions":["smzip"]},"application/vnd.stepmania.stepchart":{"source":"iana","extensions":["sm"]},"application/vnd.street-stream":{"source":"iana"},"application/vnd.sun.wadl+xml":{"source":"iana","compressible":true,"extensions":["wadl"]},"application/vnd.sun.xml.calc":{"source":"apache","extensions":["sxc"]},"application/vnd.sun.xml.calc.template":{"source":"apache","extensions":["stc"]},"application/vnd.sun.xml.draw":{"source":"apache","extensions":["sxd"]},"application/vnd.sun.xml.draw.template":{"source":"apache","extensions":["std"]},"application/vnd.sun.xml.impress":{"source":"apache","extensions":["sxi"]},"application/vnd.sun.xml.impress.template":{"source":"apache","extensions":["sti"]},"application/vnd.sun.xml.math":{"source":"apache","extensions":["sxm"]},"application/vnd.sun.xml.writer":{"source":"apache","extensions":["sxw"]},"application/vnd.sun.xml.writer.global":{"source":"apache","extensions":["sxg"]},"application/vnd.sun.xml.writer.template":{"source":"apache","extensions":["stw"]},"application/vnd.sus-calendar":{"source":"iana","extensions":["sus","susp"]},"application/vnd.svd":{"source":"iana","extensions":["svd"]},"application/vnd.swiftview-ics":{"source":"iana"},"application/vnd.symbian.install":{"source":"apache","extensions":["sis","sisx"]},"application/vnd.syncml+xml":{"source":"iana","compressible":true,"extensions":["xsm"]},"application/vnd.syncml.dm+wbxml":{"source":"iana","extensions":["bdm"]},"application/vnd.syncml.dm+xml":{"source":"iana","compressible":true,"extensions":["xdm"]},"application/vnd.syncml.dm.notification":{"source":"iana"},"application/vnd.syncml.dmddf+wbxml":{"source":"iana"},"application/vnd.syncml.dmddf+xml":{"source":"iana","compressible":true},"application/vnd.syncml.dmtnds+wbxml":{"source":"iana"},"application/vnd.syncml.dmtnds+xml":{"source":"iana","compressible":true},"application/vnd.syncml.ds.notification":{"source":"iana"},"application/vnd.tableschema+json":{"source":"iana","compressible":true},"application/vnd.tao.intent-module-archive":{"source":"iana","extensions":["tao"]},"application/vnd.tcpdump.pcap":{"source":"iana","extensions":["pcap","cap","dmp"]},"application/vnd.think-cell.ppttc+json":{"source":"iana","compressible":true},"application/vnd.tmd.mediaflex.api+xml":{"source":"iana","compressible":true},"application/vnd.tml":{"source":"iana"},"application/vnd.tmobile-livetv":{"source":"iana","extensions":["tmo"]},"application/vnd.tri.onesource":{"source":"iana"},"application/vnd.trid.tpt":{"source":"iana","extensions":["tpt"]},"application/vnd.triscape.mxs":{"source":"iana","extensions":["mxs"]},"application/vnd.trueapp":{"source":"iana","extensions":["tra"]},"application/vnd.truedoc":{"source":"iana"},"application/vnd.ubisoft.webplayer":{"source":"iana"},"application/vnd.ufdl":{"source":"iana","extensions":["ufd","ufdl"]},"application/vnd.uiq.theme":{"source":"iana","extensions":["utz"]},"application/vnd.umajin":{"source":"iana","extensions":["umj"]},"application/vnd.unity":{"source":"iana","extensions":["unityweb"]},"application/vnd.uoml+xml":{"source":"iana","compressible":true,"extensions":["uoml"]},"application/vnd.uplanet.alert":{"source":"iana"},"application/vnd.uplanet.alert-wbxml":{"source":"iana"},"application/vnd.uplanet.bearer-choice":{"source":"iana"},"application/vnd.uplanet.bearer-choice-wbxml":{"source":"iana"},"application/vnd.uplanet.cacheop":{"source":"iana"},"application/vnd.uplanet.cacheop-wbxml":{"source":"iana"},"application/vnd.uplanet.channel":{"source":"iana"},"application/vnd.uplanet.channel-wbxml":{"source":"iana"},"application/vnd.uplanet.list":{"source":"iana"},"application/vnd.uplanet.list-wbxml":{"source":"iana"},"application/vnd.uplanet.listcmd":{"source":"iana"},"application/vnd.uplanet.listcmd-wbxml":{"source":"iana"},"application/vnd.uplanet.signal":{"source":"iana"},"application/vnd.uri-map":{"source":"iana"},"application/vnd.valve.source.material":{"source":"iana"},"application/vnd.vcx":{"source":"iana","extensions":["vcx"]},"application/vnd.vd-study":{"source":"iana"},"application/vnd.vectorworks":{"source":"iana"},"application/vnd.vel+json":{"source":"iana","compressible":true},"application/vnd.verimatrix.vcas":{"source":"iana"},"application/vnd.vidsoft.vidconference":{"source":"iana"},"application/vnd.visio":{"source":"iana","extensions":["vsd","vst","vss","vsw"]},"application/vnd.visionary":{"source":"iana","extensions":["vis"]},"application/vnd.vividence.scriptfile":{"source":"iana"},"application/vnd.vsf":{"source":"iana","extensions":["vsf"]},"application/vnd.wap.sic":{"source":"iana"},"application/vnd.wap.slc":{"source":"iana"},"application/vnd.wap.wbxml":{"source":"iana","extensions":["wbxml"]},"application/vnd.wap.wmlc":{"source":"iana","extensions":["wmlc"]},"application/vnd.wap.wmlscriptc":{"source":"iana","extensions":["wmlsc"]},"application/vnd.webturbo":{"source":"iana","extensions":["wtb"]},"application/vnd.wfa.p2p":{"source":"iana"},"application/vnd.wfa.wsc":{"source":"iana"},"application/vnd.windows.devicepairing":{"source":"iana"},"application/vnd.wmc":{"source":"iana"},"application/vnd.wmf.bootstrap":{"source":"iana"},"application/vnd.wolfram.mathematica":{"source":"iana"},"application/vnd.wolfram.mathematica.package":{"source":"iana"},"application/vnd.wolfram.player":{"source":"iana","extensions":["nbp"]},"application/vnd.wordperfect":{"source":"iana","extensions":["wpd"]},"application/vnd.wqd":{"source":"iana","extensions":["wqd"]},"application/vnd.wrq-hp3000-labelled":{"source":"iana"},"application/vnd.wt.stf":{"source":"iana","extensions":["stf"]},"application/vnd.wv.csp+wbxml":{"source":"iana"},"application/vnd.wv.csp+xml":{"source":"iana","compressible":true},"application/vnd.wv.ssp+xml":{"source":"iana","compressible":true},"application/vnd.xacml+json":{"source":"iana","compressible":true},"application/vnd.xara":{"source":"iana","extensions":["xar"]},"application/vnd.xfdl":{"source":"iana","extensions":["xfdl"]},"application/vnd.xfdl.webform":{"source":"iana"},"application/vnd.xmi+xml":{"source":"iana","compressible":true},"application/vnd.xmpie.cpkg":{"source":"iana"},"application/vnd.xmpie.dpkg":{"source":"iana"},"application/vnd.xmpie.plan":{"source":"iana"},"application/vnd.xmpie.ppkg":{"source":"iana"},"application/vnd.xmpie.xlim":{"source":"iana"},"application/vnd.yamaha.hv-dic":{"source":"iana","extensions":["hvd"]},"application/vnd.yamaha.hv-script":{"source":"iana","extensions":["hvs"]},"application/vnd.yamaha.hv-voice":{"source":"iana","extensions":["hvp"]},"application/vnd.yamaha.openscoreformat":{"source":"iana","extensions":["osf"]},"application/vnd.yamaha.openscoreformat.osfpvg+xml":{"source":"iana","compressible":true,"extensions":["osfpvg"]},"application/vnd.yamaha.remote-setup":{"source":"iana"},"application/vnd.yamaha.smaf-audio":{"source":"iana","extensions":["saf"]},"application/vnd.yamaha.smaf-phrase":{"source":"iana","extensions":["spf"]},"application/vnd.yamaha.through-ngn":{"source":"iana"},"application/vnd.yamaha.tunnel-udpencap":{"source":"iana"},"application/vnd.yaoweme":{"source":"iana"},"application/vnd.yellowriver-custom-menu":{"source":"iana","extensions":["cmp"]},"application/vnd.youtube.yt":{"source":"iana"},"application/vnd.zul":{"source":"iana","extensions":["zir","zirz"]},"application/vnd.zzazz.deck+xml":{"source":"iana","compressible":true,"extensions":["zaz"]},"application/voicexml+xml":{"source":"iana","compressible":true,"extensions":["vxml"]},"application/voucher-cms+json":{"source":"iana","compressible":true},"application/vq-rtcpxr":{"source":"iana"},"application/wasm":{"compressible":true,"extensions":["wasm"]},"application/watcherinfo+xml":{"source":"iana","compressible":true},"application/webpush-options+json":{"source":"iana","compressible":true},"application/whoispp-query":{"source":"iana"},"application/whoispp-response":{"source":"iana"},"application/widget":{"source":"iana","extensions":["wgt"]},"application/winhlp":{"source":"apache","extensions":["hlp"]},"application/wita":{"source":"iana"},"application/wordperfect5.1":{"source":"iana"},"application/wsdl+xml":{"source":"iana","compressible":true,"extensions":["wsdl"]},"application/wspolicy+xml":{"source":"iana","compressible":true,"extensions":["wspolicy"]},"application/x-7z-compressed":{"source":"apache","compressible":false,"extensions":["7z"]},"application/x-abiword":{"source":"apache","extensions":["abw"]},"application/x-ace-compressed":{"source":"apache","extensions":["ace"]},"application/x-amf":{"source":"apache"},"application/x-apple-diskimage":{"source":"apache","extensions":["dmg"]},"application/x-arj":{"compressible":false,"extensions":["arj"]},"application/x-authorware-bin":{"source":"apache","extensions":["aab","x32","u32","vox"]},"application/x-authorware-map":{"source":"apache","extensions":["aam"]},"application/x-authorware-seg":{"source":"apache","extensions":["aas"]},"application/x-bcpio":{"source":"apache","extensions":["bcpio"]},"application/x-bdoc":{"compressible":false,"extensions":["bdoc"]},"application/x-bittorrent":{"source":"apache","extensions":["torrent"]},"application/x-blorb":{"source":"apache","extensions":["blb","blorb"]},"application/x-bzip":{"source":"apache","compressible":false,"extensions":["bz"]},"application/x-bzip2":{"source":"apache","compressible":false,"extensions":["bz2","boz"]},"application/x-cbr":{"source":"apache","extensions":["cbr","cba","cbt","cbz","cb7"]},"application/x-cdlink":{"source":"apache","extensions":["vcd"]},"application/x-cfs-compressed":{"source":"apache","extensions":["cfs"]},"application/x-chat":{"source":"apache","extensions":["chat"]},"application/x-chess-pgn":{"source":"apache","extensions":["pgn"]},"application/x-chrome-extension":{"extensions":["crx"]},"application/x-cocoa":{"source":"nginx","extensions":["cco"]},"application/x-compress":{"source":"apache"},"application/x-conference":{"source":"apache","extensions":["nsc"]},"application/x-cpio":{"source":"apache","extensions":["cpio"]},"application/x-csh":{"source":"apache","extensions":["csh"]},"application/x-deb":{"compressible":false},"application/x-debian-package":{"source":"apache","extensions":["deb","udeb"]},"application/x-dgc-compressed":{"source":"apache","extensions":["dgc"]},"application/x-director":{"source":"apache","extensions":["dir","dcr","dxr","cst","cct","cxt","w3d","fgd","swa"]},"application/x-doom":{"source":"apache","extensions":["wad"]},"application/x-dtbncx+xml":{"source":"apache","compressible":true,"extensions":["ncx"]},"application/x-dtbook+xml":{"source":"apache","compressible":true,"extensions":["dtb"]},"application/x-dtbresource+xml":{"source":"apache","compressible":true,"extensions":["res"]},"application/x-dvi":{"source":"apache","compressible":false,"extensions":["dvi"]},"application/x-envoy":{"source":"apache","extensions":["evy"]},"application/x-eva":{"source":"apache","extensions":["eva"]},"application/x-font-bdf":{"source":"apache","extensions":["bdf"]},"application/x-font-dos":{"source":"apache"},"application/x-font-framemaker":{"source":"apache"},"application/x-font-ghostscript":{"source":"apache","extensions":["gsf"]},"application/x-font-libgrx":{"source":"apache"},"application/x-font-linux-psf":{"source":"apache","extensions":["psf"]},"application/x-font-pcf":{"source":"apache","extensions":["pcf"]},"application/x-font-snf":{"source":"apache","extensions":["snf"]},"application/x-font-speedo":{"source":"apache"},"application/x-font-sunos-news":{"source":"apache"},"application/x-font-type1":{"source":"apache","extensions":["pfa","pfb","pfm","afm"]},"application/x-font-vfont":{"source":"apache"},"application/x-freearc":{"source":"apache","extensions":["arc"]},"application/x-futuresplash":{"source":"apache","extensions":["spl"]},"application/x-gca-compressed":{"source":"apache","extensions":["gca"]},"application/x-glulx":{"source":"apache","extensions":["ulx"]},"application/x-gnumeric":{"source":"apache","extensions":["gnumeric"]},"application/x-gramps-xml":{"source":"apache","extensions":["gramps"]},"application/x-gtar":{"source":"apache","extensions":["gtar"]},"application/x-gzip":{"source":"apache"},"application/x-hdf":{"source":"apache","extensions":["hdf"]},"application/x-httpd-php":{"compressible":true,"extensions":["php"]},"application/x-install-instructions":{"source":"apache","extensions":["install"]},"application/x-iso9660-image":{"source":"apache","extensions":["iso"]},"application/x-java-archive-diff":{"source":"nginx","extensions":["jardiff"]},"application/x-java-jnlp-file":{"source":"apache","compressible":false,"extensions":["jnlp"]},"application/x-javascript":{"compressible":true},"application/x-latex":{"source":"apache","compressible":false,"extensions":["latex"]},"application/x-lua-bytecode":{"extensions":["luac"]},"application/x-lzh-compressed":{"source":"apache","extensions":["lzh","lha"]},"application/x-makeself":{"source":"nginx","extensions":["run"]},"application/x-mie":{"source":"apache","extensions":["mie"]},"application/x-mobipocket-ebook":{"source":"apache","extensions":["prc","mobi"]},"application/x-mpegurl":{"compressible":false},"application/x-ms-application":{"source":"apache","extensions":["application"]},"application/x-ms-shortcut":{"source":"apache","extensions":["lnk"]},"application/x-ms-wmd":{"source":"apache","extensions":["wmd"]},"application/x-ms-wmz":{"source":"apache","extensions":["wmz"]},"application/x-ms-xbap":{"source":"apache","extensions":["xbap"]},"application/x-msaccess":{"source":"apache","extensions":["mdb"]},"application/x-msbinder":{"source":"apache","extensions":["obd"]},"application/x-mscardfile":{"source":"apache","extensions":["crd"]},"application/x-msclip":{"source":"apache","extensions":["clp"]},"application/x-msdos-program":{"extensions":["exe"]},"application/x-msdownload":{"source":"apache","extensions":["exe","dll","com","bat","msi"]},"application/x-msmediaview":{"source":"apache","extensions":["mvb","m13","m14"]},"application/x-msmetafile":{"source":"apache","extensions":["wmf","wmz","emf","emz"]},"application/x-msmoney":{"source":"apache","extensions":["mny"]},"application/x-mspublisher":{"source":"apache","extensions":["pub"]},"application/x-msschedule":{"source":"apache","extensions":["scd"]},"application/x-msterminal":{"source":"apache","extensions":["trm"]},"application/x-mswrite":{"source":"apache","extensions":["wri"]},"application/x-netcdf":{"source":"apache","extensions":["nc","cdf"]},"application/x-ns-proxy-autoconfig":{"compressible":true,"extensions":["pac"]},"application/x-nzb":{"source":"apache","extensions":["nzb"]},"application/x-perl":{"source":"nginx","extensions":["pl","pm"]},"application/x-pilot":{"source":"nginx","extensions":["prc","pdb"]},"application/x-pkcs12":{"source":"apache","compressible":false,"extensions":["p12","pfx"]},"application/x-pkcs7-certificates":{"source":"apache","extensions":["p7b","spc"]},"application/x-pkcs7-certreqresp":{"source":"apache","extensions":["p7r"]},"application/x-rar-compressed":{"source":"apache","compressible":false,"extensions":["rar"]},"application/x-redhat-package-manager":{"source":"nginx","extensions":["rpm"]},"application/x-research-info-systems":{"source":"apache","extensions":["ris"]},"application/x-sea":{"source":"nginx","extensions":["sea"]},"application/x-sh":{"source":"apache","compressible":true,"extensions":["sh"]},"application/x-shar":{"source":"apache","extensions":["shar"]},"application/x-shockwave-flash":{"source":"apache","compressible":false,"extensions":["swf"]},"application/x-silverlight-app":{"source":"apache","extensions":["xap"]},"application/x-sql":{"source":"apache","extensions":["sql"]},"application/x-stuffit":{"source":"apache","compressible":false,"extensions":["sit"]},"application/x-stuffitx":{"source":"apache","extensions":["sitx"]},"application/x-subrip":{"source":"apache","extensions":["srt"]},"application/x-sv4cpio":{"source":"apache","extensions":["sv4cpio"]},"application/x-sv4crc":{"source":"apache","extensions":["sv4crc"]},"application/x-t3vm-image":{"source":"apache","extensions":["t3"]},"application/x-tads":{"source":"apache","extensions":["gam"]},"application/x-tar":{"source":"apache","compressible":true,"extensions":["tar"]},"application/x-tcl":{"source":"apache","extensions":["tcl","tk"]},"application/x-tex":{"source":"apache","extensions":["tex"]},"application/x-tex-tfm":{"source":"apache","extensions":["tfm"]},"application/x-texinfo":{"source":"apache","extensions":["texinfo","texi"]},"application/x-tgif":{"source":"apache","extensions":["obj"]},"application/x-ustar":{"source":"apache","extensions":["ustar"]},"application/x-virtualbox-hdd":{"compressible":true,"extensions":["hdd"]},"application/x-virtualbox-ova":{"compressible":true,"extensions":["ova"]},"application/x-virtualbox-ovf":{"compressible":true,"extensions":["ovf"]},"application/x-virtualbox-vbox":{"compressible":true,"extensions":["vbox"]},"application/x-virtualbox-vbox-extpack":{"compressible":false,"extensions":["vbox-extpack"]},"application/x-virtualbox-vdi":{"compressible":true,"extensions":["vdi"]},"application/x-virtualbox-vhd":{"compressible":true,"extensions":["vhd"]},"application/x-virtualbox-vmdk":{"compressible":true,"extensions":["vmdk"]},"application/x-wais-source":{"source":"apache","extensions":["src"]},"application/x-web-app-manifest+json":{"compressible":true,"extensions":["webapp"]},"application/x-www-form-urlencoded":{"source":"iana","compressible":true},"application/x-x509-ca-cert":{"source":"apache","extensions":["der","crt","pem"]},"application/x-xfig":{"source":"apache","extensions":["fig"]},"application/x-xliff+xml":{"source":"apache","compressible":true,"extensions":["xlf"]},"application/x-xpinstall":{"source":"apache","compressible":false,"extensions":["xpi"]},"application/x-xz":{"source":"apache","extensions":["xz"]},"application/x-zmachine":{"source":"apache","extensions":["z1","z2","z3","z4","z5","z6","z7","z8"]},"application/x400-bp":{"source":"iana"},"application/xacml+xml":{"source":"iana","compressible":true},"application/xaml+xml":{"source":"apache","compressible":true,"extensions":["xaml"]},"application/xcap-att+xml":{"source":"iana","compressible":true},"application/xcap-caps+xml":{"source":"iana","compressible":true},"application/xcap-diff+xml":{"source":"iana","compressible":true,"extensions":["xdf"]},"application/xcap-el+xml":{"source":"iana","compressible":true},"application/xcap-error+xml":{"source":"iana","compressible":true},"application/xcap-ns+xml":{"source":"iana","compressible":true},"application/xcon-conference-info+xml":{"source":"iana","compressible":true},"application/xcon-conference-info-diff+xml":{"source":"iana","compressible":true},"application/xenc+xml":{"source":"iana","compressible":true,"extensions":["xenc"]},"application/xhtml+xml":{"source":"iana","compressible":true,"extensions":["xhtml","xht"]},"application/xhtml-voice+xml":{"source":"apache","compressible":true},"application/xliff+xml":{"source":"iana","compressible":true},"application/xml":{"source":"iana","compressible":true,"extensions":["xml","xsl","xsd","rng"]},"application/xml-dtd":{"source":"iana","compressible":true,"extensions":["dtd"]},"application/xml-external-parsed-entity":{"source":"iana"},"application/xml-patch+xml":{"source":"iana","compressible":true},"application/xmpp+xml":{"source":"iana","compressible":true},"application/xop+xml":{"source":"iana","compressible":true,"extensions":["xop"]},"application/xproc+xml":{"source":"apache","compressible":true,"extensions":["xpl"]},"application/xslt+xml":{"source":"iana","compressible":true,"extensions":["xslt"]},"application/xspf+xml":{"source":"apache","compressible":true,"extensions":["xspf"]},"application/xv+xml":{"source":"iana","compressible":true,"extensions":["mxml","xhvml","xvml","xvm"]},"application/yang":{"source":"iana","extensions":["yang"]},"application/yang-data+json":{"source":"iana","compressible":true},"application/yang-data+xml":{"source":"iana","compressible":true},"application/yang-patch+json":{"source":"iana","compressible":true},"application/yang-patch+xml":{"source":"iana","compressible":true},"application/yin+xml":{"source":"iana","compressible":true,"extensions":["yin"]},"application/zip":{"source":"iana","compressible":false,"extensions":["zip"]},"application/zlib":{"source":"iana"},"audio/1d-interleaved-parityfec":{"source":"iana"},"audio/32kadpcm":{"source":"iana"},"audio/3gpp":{"source":"iana","compressible":false,"extensions":["3gpp"]},"audio/3gpp2":{"source":"iana"},"audio/aac":{"source":"iana"},"audio/ac3":{"source":"iana"},"audio/adpcm":{"source":"apache","extensions":["adp"]},"audio/amr":{"source":"iana"},"audio/amr-wb":{"source":"iana"},"audio/amr-wb+":{"source":"iana"},"audio/aptx":{"source":"iana"},"audio/asc":{"source":"iana"},"audio/atrac-advanced-lossless":{"source":"iana"},"audio/atrac-x":{"source":"iana"},"audio/atrac3":{"source":"iana"},"audio/basic":{"source":"iana","compressible":false,"extensions":["au","snd"]},"audio/bv16":{"source":"iana"},"audio/bv32":{"source":"iana"},"audio/clearmode":{"source":"iana"},"audio/cn":{"source":"iana"},"audio/dat12":{"source":"iana"},"audio/dls":{"source":"iana"},"audio/dsr-es201108":{"source":"iana"},"audio/dsr-es202050":{"source":"iana"},"audio/dsr-es202211":{"source":"iana"},"audio/dsr-es202212":{"source":"iana"},"audio/dv":{"source":"iana"},"audio/dvi4":{"source":"iana"},"audio/eac3":{"source":"iana"},"audio/encaprtp":{"source":"iana"},"audio/evrc":{"source":"iana"},"audio/evrc-qcp":{"source":"iana"},"audio/evrc0":{"source":"iana"},"audio/evrc1":{"source":"iana"},"audio/evrcb":{"source":"iana"},"audio/evrcb0":{"source":"iana"},"audio/evrcb1":{"source":"iana"},"audio/evrcnw":{"source":"iana"},"audio/evrcnw0":{"source":"iana"},"audio/evrcnw1":{"source":"iana"},"audio/evrcwb":{"source":"iana"},"audio/evrcwb0":{"source":"iana"},"audio/evrcwb1":{"source":"iana"},"audio/evs":{"source":"iana"},"audio/fwdred":{"source":"iana"},"audio/g711-0":{"source":"iana"},"audio/g719":{"source":"iana"},"audio/g722":{"source":"iana"},"audio/g7221":{"source":"iana"},"audio/g723":{"source":"iana"},"audio/g726-16":{"source":"iana"},"audio/g726-24":{"source":"iana"},"audio/g726-32":{"source":"iana"},"audio/g726-40":{"source":"iana"},"audio/g728":{"source":"iana"},"audio/g729":{"source":"iana"},"audio/g7291":{"source":"iana"},"audio/g729d":{"source":"iana"},"audio/g729e":{"source":"iana"},"audio/gsm":{"source":"iana"},"audio/gsm-efr":{"source":"iana"},"audio/gsm-hr-08":{"source":"iana"},"audio/ilbc":{"source":"iana"},"audio/ip-mr_v2.5":{"source":"iana"},"audio/isac":{"source":"apache"},"audio/l16":{"source":"iana"},"audio/l20":{"source":"iana"},"audio/l24":{"source":"iana","compressible":false},"audio/l8":{"source":"iana"},"audio/lpc":{"source":"iana"},"audio/melp":{"source":"iana"},"audio/melp1200":{"source":"iana"},"audio/melp2400":{"source":"iana"},"audio/melp600":{"source":"iana"},"audio/midi":{"source":"apache","extensions":["mid","midi","kar","rmi"]},"audio/mobile-xmf":{"source":"iana"},"audio/mp3":{"compressible":false,"extensions":["mp3"]},"audio/mp4":{"source":"iana","compressible":false,"extensions":["m4a","mp4a"]},"audio/mp4a-latm":{"source":"iana"},"audio/mpa":{"source":"iana"},"audio/mpa-robust":{"source":"iana"},"audio/mpeg":{"source":"iana","compressible":false,"extensions":["mpga","mp2","mp2a","mp3","m2a","m3a"]},"audio/mpeg4-generic":{"source":"iana"},"audio/musepack":{"source":"apache"},"audio/ogg":{"source":"iana","compressible":false,"extensions":["oga","ogg","spx"]},"audio/opus":{"source":"iana"},"audio/parityfec":{"source":"iana"},"audio/pcma":{"source":"iana"},"audio/pcma-wb":{"source":"iana"},"audio/pcmu":{"source":"iana"},"audio/pcmu-wb":{"source":"iana"},"audio/prs.sid":{"source":"iana"},"audio/qcelp":{"source":"iana"},"audio/raptorfec":{"source":"iana"},"audio/red":{"source":"iana"},"audio/rtp-enc-aescm128":{"source":"iana"},"audio/rtp-midi":{"source":"iana"},"audio/rtploopback":{"source":"iana"},"audio/rtx":{"source":"iana"},"audio/s3m":{"source":"apache","extensions":["s3m"]},"audio/silk":{"source":"apache","extensions":["sil"]},"audio/smv":{"source":"iana"},"audio/smv-qcp":{"source":"iana"},"audio/smv0":{"source":"iana"},"audio/sp-midi":{"source":"iana"},"audio/speex":{"source":"iana"},"audio/t140c":{"source":"iana"},"audio/t38":{"source":"iana"},"audio/telephone-event":{"source":"iana"},"audio/tone":{"source":"iana"},"audio/uemclip":{"source":"iana"},"audio/ulpfec":{"source":"iana"},"audio/usac":{"source":"iana"},"audio/vdvi":{"source":"iana"},"audio/vmr-wb":{"source":"iana"},"audio/vnd.3gpp.iufp":{"source":"iana"},"audio/vnd.4sb":{"source":"iana"},"audio/vnd.audiokoz":{"source":"iana"},"audio/vnd.celp":{"source":"iana"},"audio/vnd.cisco.nse":{"source":"iana"},"audio/vnd.cmles.radio-events":{"source":"iana"},"audio/vnd.cns.anp1":{"source":"iana"},"audio/vnd.cns.inf1":{"source":"iana"},"audio/vnd.dece.audio":{"source":"iana","extensions":["uva","uvva"]},"audio/vnd.digital-winds":{"source":"iana","extensions":["eol"]},"audio/vnd.dlna.adts":{"source":"iana"},"audio/vnd.dolby.heaac.1":{"source":"iana"},"audio/vnd.dolby.heaac.2":{"source":"iana"},"audio/vnd.dolby.mlp":{"source":"iana"},"audio/vnd.dolby.mps":{"source":"iana"},"audio/vnd.dolby.pl2":{"source":"iana"},"audio/vnd.dolby.pl2x":{"source":"iana"},"audio/vnd.dolby.pl2z":{"source":"iana"},"audio/vnd.dolby.pulse.1":{"source":"iana"},"audio/vnd.dra":{"source":"iana","extensions":["dra"]},"audio/vnd.dts":{"source":"iana","extensions":["dts"]},"audio/vnd.dts.hd":{"source":"iana","extensions":["dtshd"]},"audio/vnd.dvb.file":{"source":"iana"},"audio/vnd.everad.plj":{"source":"iana"},"audio/vnd.hns.audio":{"source":"iana"},"audio/vnd.lucent.voice":{"source":"iana","extensions":["lvp"]},"audio/vnd.ms-playready.media.pya":{"source":"iana","extensions":["pya"]},"audio/vnd.nokia.mobile-xmf":{"source":"iana"},"audio/vnd.nortel.vbk":{"source":"iana"},"audio/vnd.nuera.ecelp4800":{"source":"iana","extensions":["ecelp4800"]},"audio/vnd.nuera.ecelp7470":{"source":"iana","extensions":["ecelp7470"]},"audio/vnd.nuera.ecelp9600":{"source":"iana","extensions":["ecelp9600"]},"audio/vnd.octel.sbc":{"source":"iana"},"audio/vnd.presonus.multitrack":{"source":"iana"},"audio/vnd.qcelp":{"source":"iana"},"audio/vnd.rhetorex.32kadpcm":{"source":"iana"},"audio/vnd.rip":{"source":"iana","extensions":["rip"]},"audio/vnd.rn-realaudio":{"compressible":false},"audio/vnd.sealedmedia.softseal.mpeg":{"source":"iana"},"audio/vnd.vmx.cvsd":{"source":"iana"},"audio/vnd.wave":{"compressible":false},"audio/vorbis":{"source":"iana","compressible":false},"audio/vorbis-config":{"source":"iana"},"audio/wav":{"compressible":false,"extensions":["wav"]},"audio/wave":{"compressible":false,"extensions":["wav"]},"audio/webm":{"source":"apache","compressible":false,"extensions":["weba"]},"audio/x-aac":{"source":"apache","compressible":false,"extensions":["aac"]},"audio/x-aiff":{"source":"apache","extensions":["aif","aiff","aifc"]},"audio/x-caf":{"source":"apache","compressible":false,"extensions":["caf"]},"audio/x-flac":{"source":"apache","extensions":["flac"]},"audio/x-m4a":{"source":"nginx","extensions":["m4a"]},"audio/x-matroska":{"source":"apache","extensions":["mka"]},"audio/x-mpegurl":{"source":"apache","extensions":["m3u"]},"audio/x-ms-wax":{"source":"apache","extensions":["wax"]},"audio/x-ms-wma":{"source":"apache","extensions":["wma"]},"audio/x-pn-realaudio":{"source":"apache","extensions":["ram","ra"]},"audio/x-pn-realaudio-plugin":{"source":"apache","extensions":["rmp"]},"audio/x-realaudio":{"source":"nginx","extensions":["ra"]},"audio/x-tta":{"source":"apache"},"audio/x-wav":{"source":"apache","extensions":["wav"]},"audio/xm":{"source":"apache","extensions":["xm"]},"chemical/x-cdx":{"source":"apache","extensions":["cdx"]},"chemical/x-cif":{"source":"apache","extensions":["cif"]},"chemical/x-cmdf":{"source":"apache","extensions":["cmdf"]},"chemical/x-cml":{"source":"apache","extensions":["cml"]},"chemical/x-csml":{"source":"apache","extensions":["csml"]},"chemical/x-pdb":{"source":"apache"},"chemical/x-xyz":{"source":"apache","extensions":["xyz"]},"font/collection":{"source":"iana","extensions":["ttc"]},"font/otf":{"source":"iana","compressible":true,"extensions":["otf"]},"font/sfnt":{"source":"iana"},"font/ttf":{"source":"iana","extensions":["ttf"]},"font/woff":{"source":"iana","extensions":["woff"]},"font/woff2":{"source":"iana","extensions":["woff2"]},"image/aces":{"source":"iana"},"image/apng":{"compressible":false,"extensions":["apng"]},"image/bmp":{"source":"iana","compressible":true,"extensions":["bmp"]},"image/cgm":{"source":"iana","extensions":["cgm"]},"image/dicom-rle":{"source":"iana"},"image/emf":{"source":"iana"},"image/fits":{"source":"iana"},"image/g3fax":{"source":"iana","extensions":["g3"]},"image/gif":{"source":"iana","compressible":false,"extensions":["gif"]},"image/ief":{"source":"iana","extensions":["ief"]},"image/jls":{"source":"iana"},"image/jp2":{"source":"iana","compressible":false,"extensions":["jp2","jpg2"]},"image/jpeg":{"source":"iana","compressible":false,"extensions":["jpeg","jpg","jpe"]},"image/jpm":{"source":"iana","compressible":false,"extensions":["jpm"]},"image/jpx":{"source":"iana","compressible":false,"extensions":["jpx","jpf"]},"image/ktx":{"source":"iana","extensions":["ktx"]},"image/naplps":{"source":"iana"},"image/pjpeg":{"compressible":false},"image/png":{"source":"iana","compressible":false,"extensions":["png"]},"image/prs.btif":{"source":"iana","extensions":["btif"]},"image/prs.pti":{"source":"iana"},"image/pwg-raster":{"source":"iana"},"image/sgi":{"source":"apache","extensions":["sgi"]},"image/svg+xml":{"source":"iana","compressible":true,"extensions":["svg","svgz"]},"image/t38":{"source":"iana"},"image/tiff":{"source":"iana","compressible":false,"extensions":["tiff","tif"]},"image/tiff-fx":{"source":"iana"},"image/vnd.adobe.photoshop":{"source":"iana","compressible":true,"extensions":["psd"]},"image/vnd.airzip.accelerator.azv":{"source":"iana"},"image/vnd.cns.inf2":{"source":"iana"},"image/vnd.dece.graphic":{"source":"iana","extensions":["uvi","uvvi","uvg","uvvg"]},"image/vnd.djvu":{"source":"iana","extensions":["djvu","djv"]},"image/vnd.dvb.subtitle":{"source":"iana","extensions":["sub"]},"image/vnd.dwg":{"source":"iana","extensions":["dwg"]},"image/vnd.dxf":{"source":"iana","extensions":["dxf"]},"image/vnd.fastbidsheet":{"source":"iana","extensions":["fbs"]},"image/vnd.fpx":{"source":"iana","extensions":["fpx"]},"image/vnd.fst":{"source":"iana","extensions":["fst"]},"image/vnd.fujixerox.edmics-mmr":{"source":"iana","extensions":["mmr"]},"image/vnd.fujixerox.edmics-rlc":{"source":"iana","extensions":["rlc"]},"image/vnd.globalgraphics.pgb":{"source":"iana"},"image/vnd.microsoft.icon":{"source":"iana"},"image/vnd.mix":{"source":"iana"},"image/vnd.mozilla.apng":{"source":"iana"},"image/vnd.ms-modi":{"source":"iana","extensions":["mdi"]},"image/vnd.ms-photo":{"source":"apache","extensions":["wdp"]},"image/vnd.net-fpx":{"source":"iana","extensions":["npx"]},"image/vnd.radiance":{"source":"iana"},"image/vnd.sealed.png":{"source":"iana"},"image/vnd.sealedmedia.softseal.gif":{"source":"iana"},"image/vnd.sealedmedia.softseal.jpg":{"source":"iana"},"image/vnd.svf":{"source":"iana"},"image/vnd.tencent.tap":{"source":"iana"},"image/vnd.valve.source.texture":{"source":"iana"},"image/vnd.wap.wbmp":{"source":"iana","extensions":["wbmp"]},"image/vnd.xiff":{"source":"iana","extensions":["xif"]},"image/vnd.zbrush.pcx":{"source":"iana"},"image/webp":{"source":"apache","extensions":["webp"]},"image/wmf":{"source":"iana"},"image/x-3ds":{"source":"apache","extensions":["3ds"]},"image/x-cmu-raster":{"source":"apache","extensions":["ras"]},"image/x-cmx":{"source":"apache","extensions":["cmx"]},"image/x-freehand":{"source":"apache","extensions":["fh","fhc","fh4","fh5","fh7"]},"image/x-icon":{"source":"apache","compressible":true,"extensions":["ico"]},"image/x-jng":{"source":"nginx","extensions":["jng"]},"image/x-mrsid-image":{"source":"apache","extensions":["sid"]},"image/x-ms-bmp":{"source":"nginx","compressible":true,"extensions":["bmp"]},"image/x-pcx":{"source":"apache","extensions":["pcx"]},"image/x-pict":{"source":"apache","extensions":["pic","pct"]},"image/x-portable-anymap":{"source":"apache","extensions":["pnm"]},"image/x-portable-bitmap":{"source":"apache","extensions":["pbm"]},"image/x-portable-graymap":{"source":"apache","extensions":["pgm"]},"image/x-portable-pixmap":{"source":"apache","extensions":["ppm"]},"image/x-rgb":{"source":"apache","extensions":["rgb"]},"image/x-tga":{"source":"apache","extensions":["tga"]},"image/x-xbitmap":{"source":"apache","extensions":["xbm"]},"image/x-xcf":{"compressible":false},"image/x-xpixmap":{"source":"apache","extensions":["xpm"]},"image/x-xwindowdump":{"source":"apache","extensions":["xwd"]},"message/cpim":{"source":"iana"},"message/delivery-status":{"source":"iana"},"message/disposition-notification":{"source":"iana","extensions":["disposition-notification"]},"message/external-body":{"source":"iana"},"message/feedback-report":{"source":"iana"},"message/global":{"source":"iana","extensions":["u8msg"]},"message/global-delivery-status":{"source":"iana","extensions":["u8dsn"]},"message/global-disposition-notification":{"source":"iana","extensions":["u8mdn"]},"message/global-headers":{"source":"iana","extensions":["u8hdr"]},"message/http":{"source":"iana","compressible":false},"message/imdn+xml":{"source":"iana","compressible":true},"message/news":{"source":"iana"},"message/partial":{"source":"iana","compressible":false},"message/rfc822":{"source":"iana","compressible":true,"extensions":["eml","mime"]},"message/s-http":{"source":"iana"},"message/sip":{"source":"iana"},"message/sipfrag":{"source":"iana"},"message/tracking-status":{"source":"iana"},"message/vnd.si.simp":{"source":"iana"},"message/vnd.wfa.wsc":{"source":"iana","extensions":["wsc"]},"model/3mf":{"source":"iana"},"model/gltf+json":{"source":"iana","compressible":true,"extensions":["gltf"]},"model/gltf-binary":{"source":"iana","compressible":true,"extensions":["glb"]},"model/iges":{"source":"iana","compressible":false,"extensions":["igs","iges"]},"model/mesh":{"source":"iana","compressible":false,"extensions":["msh","mesh","silo"]},"model/stl":{"source":"iana"},"model/vnd.collada+xml":{"source":"iana","compressible":true,"extensions":["dae"]},"model/vnd.dwf":{"source":"iana","extensions":["dwf"]},"model/vnd.flatland.3dml":{"source":"iana"},"model/vnd.gdl":{"source":"iana","extensions":["gdl"]},"model/vnd.gs-gdl":{"source":"apache"},"model/vnd.gs.gdl":{"source":"iana"},"model/vnd.gtw":{"source":"iana","extensions":["gtw"]},"model/vnd.moml+xml":{"source":"iana","compressible":true},"model/vnd.mts":{"source":"iana","extensions":["mts"]},"model/vnd.opengex":{"source":"iana"},"model/vnd.parasolid.transmit.binary":{"source":"iana"},"model/vnd.parasolid.transmit.text":{"source":"iana"},"model/vnd.rosette.annotated-data-model":{"source":"iana"},"model/vnd.usdz+zip":{"source":"iana","compressible":false},"model/vnd.valve.source.compiled-map":{"source":"iana"},"model/vnd.vtu":{"source":"iana","extensions":["vtu"]},"model/vrml":{"source":"iana","compressible":false,"extensions":["wrl","vrml"]},"model/x3d+binary":{"source":"apache","compressible":false,"extensions":["x3db","x3dbz"]},"model/x3d+fastinfoset":{"source":"iana"},"model/x3d+vrml":{"source":"apache","compressible":false,"extensions":["x3dv","x3dvz"]},"model/x3d+xml":{"source":"iana","compressible":true,"extensions":["x3d","x3dz"]},"model/x3d-vrml":{"source":"iana"},"multipart/alternative":{"source":"iana","compressible":false},"multipart/appledouble":{"source":"iana"},"multipart/byteranges":{"source":"iana"},"multipart/digest":{"source":"iana"},"multipart/encrypted":{"source":"iana","compressible":false},"multipart/form-data":{"source":"iana","compressible":false},"multipart/header-set":{"source":"iana"},"multipart/mixed":{"source":"iana","compressible":false},"multipart/multilingual":{"source":"iana"},"multipart/parallel":{"source":"iana"},"multipart/related":{"source":"iana","compressible":false},"multipart/report":{"source":"iana"},"multipart/signed":{"source":"iana","compressible":false},"multipart/vnd.bint.med-plus":{"source":"iana"},"multipart/voice-message":{"source":"iana"},"multipart/x-mixed-replace":{"source":"iana"},"text/1d-interleaved-parityfec":{"source":"iana"},"text/cache-manifest":{"source":"iana","compressible":true,"extensions":["appcache","manifest"]},"text/calendar":{"source":"iana","extensions":["ics","ifb"]},"text/calender":{"compressible":true},"text/cmd":{"compressible":true},"text/coffeescript":{"extensions":["coffee","litcoffee"]},"text/css":{"source":"iana","charset":"UTF-8","compressible":true,"extensions":["css"]},"text/csv":{"source":"iana","compressible":true,"extensions":["csv"]},"text/csv-schema":{"source":"iana"},"text/directory":{"source":"iana"},"text/dns":{"source":"iana"},"text/ecmascript":{"source":"iana"},"text/encaprtp":{"source":"iana"},"text/enriched":{"source":"iana"},"text/fwdred":{"source":"iana"},"text/grammar-ref-list":{"source":"iana"},"text/html":{"source":"iana","compressible":true,"extensions":["html","htm","shtml"]},"text/jade":{"extensions":["jade"]},"text/javascript":{"source":"iana","compressible":true},"text/jcr-cnd":{"source":"iana"},"text/jsx":{"compressible":true,"extensions":["jsx"]},"text/less":{"extensions":["less"]},"text/markdown":{"source":"iana","compressible":true,"extensions":["markdown","md"]},"text/mathml":{"source":"nginx","extensions":["mml"]},"text/mizar":{"source":"iana"},"text/n3":{"source":"iana","compressible":true,"extensions":["n3"]},"text/parameters":{"source":"iana"},"text/parityfec":{"source":"iana"},"text/plain":{"source":"iana","compressible":true,"extensions":["txt","text","conf","def","list","log","in","ini"]},"text/provenance-notation":{"source":"iana"},"text/prs.fallenstein.rst":{"source":"iana"},"text/prs.lines.tag":{"source":"iana","extensions":["dsc"]},"text/prs.prop.logic":{"source":"iana"},"text/raptorfec":{"source":"iana"},"text/red":{"source":"iana"},"text/rfc822-headers":{"source":"iana"},"text/richtext":{"source":"iana","compressible":true,"extensions":["rtx"]},"text/rtf":{"source":"iana","compressible":true,"extensions":["rtf"]},"text/rtp-enc-aescm128":{"source":"iana"},"text/rtploopback":{"source":"iana"},"text/rtx":{"source":"iana"},"text/sgml":{"source":"iana","extensions":["sgml","sgm"]},"text/shex":{"extensions":["shex"]},"text/slim":{"extensions":["slim","slm"]},"text/strings":{"source":"iana"},"text/stylus":{"extensions":["stylus","styl"]},"text/t140":{"source":"iana"},"text/tab-separated-values":{"source":"iana","compressible":true,"extensions":["tsv"]},"text/troff":{"source":"iana","extensions":["t","tr","roff","man","me","ms"]},"text/turtle":{"source":"iana","charset":"UTF-8","extensions":["ttl"]},"text/ulpfec":{"source":"iana"},"text/uri-list":{"source":"iana","compressible":true,"extensions":["uri","uris","urls"]},"text/vcard":{"source":"iana","compressible":true,"extensions":["vcard"]},"text/vnd.a":{"source":"iana"},"text/vnd.abc":{"source":"iana"},"text/vnd.ascii-art":{"source":"iana"},"text/vnd.curl":{"source":"iana","extensions":["curl"]},"text/vnd.curl.dcurl":{"source":"apache","extensions":["dcurl"]},"text/vnd.curl.mcurl":{"source":"apache","extensions":["mcurl"]},"text/vnd.curl.scurl":{"source":"apache","extensions":["scurl"]},"text/vnd.debian.copyright":{"source":"iana"},"text/vnd.dmclientscript":{"source":"iana"},"text/vnd.dvb.subtitle":{"source":"iana","extensions":["sub"]},"text/vnd.esmertec.theme-descriptor":{"source":"iana"},"text/vnd.fly":{"source":"iana","extensions":["fly"]},"text/vnd.fmi.flexstor":{"source":"iana","extensions":["flx"]},"text/vnd.gml":{"source":"iana"},"text/vnd.graphviz":{"source":"iana","extensions":["gv"]},"text/vnd.hgl":{"source":"iana"},"text/vnd.in3d.3dml":{"source":"iana","extensions":["3dml"]},"text/vnd.in3d.spot":{"source":"iana","extensions":["spot"]},"text/vnd.iptc.newsml":{"source":"iana"},"text/vnd.iptc.nitf":{"source":"iana"},"text/vnd.latex-z":{"source":"iana"},"text/vnd.motorola.reflex":{"source":"iana"},"text/vnd.ms-mediapackage":{"source":"iana"},"text/vnd.net2phone.commcenter.command":{"source":"iana"},"text/vnd.radisys.msml-basic-layout":{"source":"iana"},"text/vnd.si.uricatalogue":{"source":"iana"},"text/vnd.sun.j2me.app-descriptor":{"source":"iana","extensions":["jad"]},"text/vnd.trolltech.linguist":{"source":"iana"},"text/vnd.wap.si":{"source":"iana"},"text/vnd.wap.sl":{"source":"iana"},"text/vnd.wap.wml":{"source":"iana","extensions":["wml"]},"text/vnd.wap.wmlscript":{"source":"iana","extensions":["wmls"]},"text/vtt":{"charset":"UTF-8","compressible":true,"extensions":["vtt"]},"text/x-asm":{"source":"apache","extensions":["s","asm"]},"text/x-c":{"source":"apache","extensions":["c","cc","cxx","cpp","h","hh","dic"]},"text/x-component":{"source":"nginx","extensions":["htc"]},"text/x-fortran":{"source":"apache","extensions":["f","for","f77","f90"]},"text/x-gwt-rpc":{"compressible":true},"text/x-handlebars-template":{"extensions":["hbs"]},"text/x-java-source":{"source":"apache","extensions":["java"]},"text/x-jquery-tmpl":{"compressible":true},"text/x-lua":{"extensions":["lua"]},"text/x-markdown":{"compressible":true,"extensions":["mkd"]},"text/x-nfo":{"source":"apache","extensions":["nfo"]},"text/x-opml":{"source":"apache","extensions":["opml"]},"text/x-org":{"compressible":true,"extensions":["org"]},"text/x-pascal":{"source":"apache","extensions":["p","pas"]},"text/x-processing":{"compressible":true,"extensions":["pde"]},"text/x-sass":{"extensions":["sass"]},"text/x-scss":{"extensions":["scss"]},"text/x-setext":{"source":"apache","extensions":["etx"]},"text/x-sfv":{"source":"apache","extensions":["sfv"]},"text/x-suse-ymp":{"compressible":true,"extensions":["ymp"]},"text/x-uuencode":{"source":"apache","extensions":["uu"]},"text/x-vcalendar":{"source":"apache","extensions":["vcs"]},"text/x-vcard":{"source":"apache","extensions":["vcf"]},"text/xml":{"source":"iana","compressible":true,"extensions":["xml"]},"text/xml-external-parsed-entity":{"source":"iana"},"text/yaml":{"extensions":["yaml","yml"]},"video/1d-interleaved-parityfec":{"source":"iana"},"video/3gpp":{"source":"iana","extensions":["3gp","3gpp"]},"video/3gpp-tt":{"source":"iana"},"video/3gpp2":{"source":"iana","extensions":["3g2"]},"video/bmpeg":{"source":"iana"},"video/bt656":{"source":"iana"},"video/celb":{"source":"iana"},"video/dv":{"source":"iana"},"video/encaprtp":{"source":"iana"},"video/h261":{"source":"iana","extensions":["h261"]},"video/h263":{"source":"iana","extensions":["h263"]},"video/h263-1998":{"source":"iana"},"video/h263-2000":{"source":"iana"},"video/h264":{"source":"iana","extensions":["h264"]},"video/h264-rcdo":{"source":"iana"},"video/h264-svc":{"source":"iana"},"video/h265":{"source":"iana"},"video/iso.segment":{"source":"iana"},"video/jpeg":{"source":"iana","extensions":["jpgv"]},"video/jpeg2000":{"source":"iana"},"video/jpm":{"source":"apache","extensions":["jpm","jpgm"]},"video/mj2":{"source":"iana","extensions":["mj2","mjp2"]},"video/mp1s":{"source":"iana"},"video/mp2p":{"source":"iana"},"video/mp2t":{"source":"iana","extensions":["ts"]},"video/mp4":{"source":"iana","compressible":false,"extensions":["mp4","mp4v","mpg4"]},"video/mp4v-es":{"source":"iana"},"video/mpeg":{"source":"iana","compressible":false,"extensions":["mpeg","mpg","mpe","m1v","m2v"]},"video/mpeg4-generic":{"source":"iana"},"video/mpv":{"source":"iana"},"video/nv":{"source":"iana"},"video/ogg":{"source":"iana","compressible":false,"extensions":["ogv"]},"video/parityfec":{"source":"iana"},"video/pointer":{"source":"iana"},"video/quicktime":{"source":"iana","compressible":false,"extensions":["qt","mov"]},"video/raptorfec":{"source":"iana"},"video/raw":{"source":"iana"},"video/rtp-enc-aescm128":{"source":"iana"},"video/rtploopback":{"source":"iana"},"video/rtx":{"source":"iana"},"video/smpte291":{"source":"iana"},"video/smpte292m":{"source":"iana"},"video/ulpfec":{"source":"iana"},"video/vc1":{"source":"iana"},"video/vnd.cctv":{"source":"iana"},"video/vnd.dece.hd":{"source":"iana","extensions":["uvh","uvvh"]},"video/vnd.dece.mobile":{"source":"iana","extensions":["uvm","uvvm"]},"video/vnd.dece.mp4":{"source":"iana"},"video/vnd.dece.pd":{"source":"iana","extensions":["uvp","uvvp"]},"video/vnd.dece.sd":{"source":"iana","extensions":["uvs","uvvs"]},"video/vnd.dece.video":{"source":"iana","extensions":["uvv","uvvv"]},"video/vnd.directv.mpeg":{"source":"iana"},"video/vnd.directv.mpeg-tts":{"source":"iana"},"video/vnd.dlna.mpeg-tts":{"source":"iana"},"video/vnd.dvb.file":{"source":"iana","extensions":["dvb"]},"video/vnd.fvt":{"source":"iana","extensions":["fvt"]},"video/vnd.hns.video":{"source":"iana"},"video/vnd.iptvforum.1dparityfec-1010":{"source":"iana"},"video/vnd.iptvforum.1dparityfec-2005":{"source":"iana"},"video/vnd.iptvforum.2dparityfec-1010":{"source":"iana"},"video/vnd.iptvforum.2dparityfec-2005":{"source":"iana"},"video/vnd.iptvforum.ttsavc":{"source":"iana"},"video/vnd.iptvforum.ttsmpeg2":{"source":"iana"},"video/vnd.motorola.video":{"source":"iana"},"video/vnd.motorola.videop":{"source":"iana"},"video/vnd.mpegurl":{"source":"iana","extensions":["mxu","m4u"]},"video/vnd.ms-playready.media.pyv":{"source":"iana","extensions":["pyv"]},"video/vnd.nokia.interleaved-multimedia":{"source":"iana"},"video/vnd.nokia.mp4vr":{"source":"iana"},"video/vnd.nokia.videovoip":{"source":"iana"},"video/vnd.objectvideo":{"source":"iana"},"video/vnd.radgamettools.bink":{"source":"iana"},"video/vnd.radgamettools.smacker":{"source":"iana"},"video/vnd.sealed.mpeg1":{"source":"iana"},"video/vnd.sealed.mpeg4":{"source":"iana"},"video/vnd.sealed.swf":{"source":"iana"},"video/vnd.sealedmedia.softseal.mov":{"source":"iana"},"video/vnd.uvvu.mp4":{"source":"iana","extensions":["uvu","uvvu"]},"video/vnd.vivo":{"source":"iana","extensions":["viv"]},"video/vp8":{"source":"iana"},"video/webm":{"source":"apache","compressible":false,"extensions":["webm"]},"video/x-f4v":{"source":"apache","extensions":["f4v"]},"video/x-fli":{"source":"apache","extensions":["fli"]},"video/x-flv":{"source":"apache","compressible":false,"extensions":["flv"]},"video/x-m4v":{"source":"apache","extensions":["m4v"]},"video/x-matroska":{"source":"apache","compressible":false,"extensions":["mkv","mk3d","mks"]},"video/x-mng":{"source":"apache","extensions":["mng"]},"video/x-ms-asf":{"source":"apache","extensions":["asf","asx"]},"video/x-ms-vob":{"source":"apache","extensions":["vob"]},"video/x-ms-wm":{"source":"apache","extensions":["wm"]},"video/x-ms-wmv":{"source":"apache","compressible":false,"extensions":["wmv"]},"video/x-ms-wmx":{"source":"apache","extensions":["wmx"]},"video/x-ms-wvx":{"source":"apache","extensions":["wvx"]},"video/x-msvideo":{"source":"apache","extensions":["avi"]},"video/x-sgi-movie":{"source":"apache","extensions":["movie"]},"video/x-smv":{"source":"apache","extensions":["smv"]},"x-conference/x-cooltalk":{"source":"apache","extensions":["ice"]},"x-shader/x-fragment":{"compressible":true},"x-shader/x-vertex":{"compressible":true}}
+
+/***/ }),
+/* 759 */
+/***/ (function(module, exports, __webpack_require__) {
+
+/*!
+ * mime-db
+ * Copyright(c) 2014 Jonathan Ong
+ * MIT Licensed
+ */
+
+/**
+ * Module exports.
+ */
+
+module.exports = __webpack_require__(758)
+
+
+/***/ }),
+/* 760 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = (to, from) => {
+	// TODO: use `Reflect.ownKeys()` when targeting Node.js 6
+	for (const prop of Object.getOwnPropertyNames(from).concat(Object.getOwnPropertySymbols(from))) {
+		Object.defineProperty(to, prop, Object.getOwnPropertyDescriptor(from, prop));
+	}
+
+	return to;
+};
+
+
+/***/ }),
+/* 761 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+const mkdirp = __webpack_require__(145)
+
+module.exports = function (dir, opts) {
+  return new Promise((resolve, reject) => {
+    mkdirp(dir, opts, (err, made) => err === null ? resolve(made) : reject(err))
+  })
+}
+
+
+/***/ }),
+/* 762 */
+/***/ (function(module, exports, __webpack_require__) {
+
+
+var Promise = __webpack_require__(345)
+var fs
+try {
+  fs = __webpack_require__(391)
+} catch(err) {
+  fs = __webpack_require__(5)
+}
+
+var api = [
+  'appendFile',
+  'chmod',
+  'chown',
+  'close',
+  'fchmod',
+  'fchown',
+  'fdatasync',
+  'fstat',
+  'fsync',
+  'ftruncate',
+  'futimes',
+  'lchown',
+  'link',
+  'lstat',
+  'mkdir',
+  'open',
+  'read',
+  'readFile',
+  'readdir',
+  'readlink',
+  'realpath',
+  'rename',
+  'rmdir',
+  'stat',
+  'symlink',
+  'truncate',
+  'unlink',
+  'utimes',
+  'write',
+  'writeFile'
+]
+
+typeof fs.access === 'function' && api.push('access')
+typeof fs.copyFile === 'function' && api.push('copyFile')
+typeof fs.mkdtemp === 'function' && api.push('mkdtemp')
+
+__webpack_require__(951).withCallback(fs, exports, api)
+
+exports.exists = function (filename, callback) {
+  // callback
+  if (typeof callback === 'function') {
+    return fs.stat(filename, function (err) {
+      callback(null, !err);
+    })
+  }
+  // or promise
+  return new Promise(function (resolve) {
+    fs.stat(filename, function (err) {
+      resolve(!err)
+    })
+  })
+}
+
+
+/***/ }),
+/* 763 */
+/***/ (function(module, exports, __webpack_require__) {
+
+/*jslint node: true*/
+var toArray = __webpack_require__(750);
+var emojiByName = __webpack_require__(764);
+
+"use strict";
+
+/**
+ * regex to parse emoji in a string - finds emoji, e.g. :coffee:
+ */
+var emojiNameRegex = /:([a-zA-Z0-9_\-\+]+):/g;
+
+/**
+ * regex to trim whitespace
+ * use instead of String.prototype.trim() for IE8 supprt
+ */
+var trimSpaceRegex = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;
+
+/**
+ * Removes colons on either side
+ * of the string if present
+ * @param  {string} str
+ * @return {string}
+ */
+function stripColons (str) {
+  var colonIndex = str.indexOf(':');
+  if (colonIndex > -1) {
+    // :emoji: (http://www.emoji-cheat-sheet.com/)
+    if (colonIndex === str.length - 1) {
+      str = str.substring(0, colonIndex);
+      return stripColons(str);
+    } else {
+      str = str.substr(colonIndex + 1);
+      return stripColons(str);
+    }
+  }
+
+  return str;
+}
+
+/**
+ * Adds colons to either side
+ * of the string
+ * @param {string} str
+ * @return {string}
+ */
+function wrapColons (str) {
+  return (typeof str === 'string' && str.length > 0) ? ':' + str + ':' : str;
+}
+
+/**
+ * Ensure that the word is wrapped in colons
+ * by only adding them, if they are not there.
+ * @param {string} str
+ * @return {string}
+ */
+function ensureColons (str) {
+  return (typeof str === 'string' && str[0] !== ':') ? wrapColons(str) : str;
+}
+
+// Non spacing mark, some emoticons have them. It's the 'Variant Form',
+// which provides more information so that emoticons can be rendered as
+// more colorful graphics. FE0E is a unicode text version, where as FE0F
+// should be rendered as a graphical version. The code gracefully degrades.
+var NON_SPACING_MARK = String.fromCharCode(65039); // 65039 - '️' - 0xFE0F;
+var nonSpacingRegex = new RegExp(NON_SPACING_MARK, 'g')
+
+// Remove the non-spacing-mark from the code, never send a stripped version
+// to the client, as it kills graphical emoticons.
+function stripNSB (code) {
+  return code.replace(nonSpacingRegex, '');
+};
+
+// Reversed hash table, where as emojiByName contains a { heart: '❤' }
+// dictionary emojiByCode contains { ❤: 'heart' }. The codes are normalized
+// to the text version.
+var emojiByCode = Object.keys(emojiByName).reduce(function(h,k) {
+  h[stripNSB(emojiByName[k])] = k;
+  return h;
+}, {});
+
+/**
+ * Emoji namespace
+ */
+var Emoji = {
+  emoji: emojiByName,
+};
+
+/**
+ * get emoji code from name
+ * @param  {string} emoji
+ * @return {string}
+ */
+Emoji._get = function _get (emoji) {
+  if (emojiByName.hasOwnProperty(emoji)) {
+    return emojiByName[emoji];
+  }
+
+  return ensureColons(emoji);
+};
+
+/**
+ * get emoji code from :emoji: string or name
+ * @param  {string} emoji
+ * @return {string}
+ */
+Emoji.get = function get (emoji) {
+  emoji = stripColons(emoji);
+
+  return Emoji._get(emoji);
+};
+
+/**
+ * find the emoji by either code or name
+ * @param {string} nameOrCode The emoji to find, either `coffee`, `:coffee:` or `☕`;
+ * @return {object}
+ */
+Emoji.find = function find (nameOrCode) {
+  return Emoji.findByName(nameOrCode) || Emoji.findByCode(nameOrCode);
+};
+
+/**
+ * find the emoji by name
+ * @param {string} name The emoji to find either `coffee` or `:coffee:`;
+ * @return {object}
+ */
+Emoji.findByName = function findByName (name) {
+  var stripped = stripColons(name);
+  var emoji = emojiByName[stripped];
+
+  return emoji ? ({ emoji: emoji, key: stripped }) : undefined;
+};
+
+/**
+ * find the emoji by code (emoji)
+ * @param {string} code The emoji to find; for example `☕` or `☔`
+ * @return {object}
+ */
+Emoji.findByCode = function findByCode (code) {
+  var stripped = stripNSB(code);
+  var name = emojiByCode[stripped];
+
+  // lookup emoji to ensure the Variant Form is returned
+  return name ? ({ emoji: emojiByName[name], key: name }) : undefined;
+};
+
+
+/**
+ * Check if an emoji is known by this library
+ * @param {string} nameOrCode The emoji to validate, either `coffee`, `:coffee:` or `☕`;
+ * @return {object}
+ */
+Emoji.hasEmoji = function hasEmoji (nameOrCode) {
+  return Emoji.hasEmojiByName(nameOrCode) || Emoji.hasEmojiByCode(nameOrCode);
+};
+
+/**
+ * Check if an emoji with given name is known by this library
+ * @param {string} name The emoji to validate either `coffee` or `:coffee:`;
+ * @return {object}
+ */
+Emoji.hasEmojiByName = function hasEmojiByName (name) {
+  var result = Emoji.findByName(name);
+  return !!result && result.key === stripColons(name);
+};
+
+/**
+ * Check if a given emoji is known by this library
+ * @param {string} code The emoji to validate; for example `☕` or `☔`
+ * @return {object}
+ */
+Emoji.hasEmojiByCode = function hasEmojiByCode (code) {
+  var result = Emoji.findByCode(code);
+  return !!result && stripNSB(result.emoji) === stripNSB(code);
+};
+
+/**
+ * get emoji name from code
+ * @param  {string} emoji
+ * @param  {boolean} includeColons should the result include the ::
+ * @return {string}
+ */
+Emoji.which = function which (emoji_code, includeColons) {
+  var code = stripNSB(emoji_code);
+  var word = emojiByCode[code];
+
+  return includeColons ? wrapColons(word) : word;
+};
+
+/**
+ * emojify a string (replace :emoji: with an emoji)
+ * @param  {string} str
+ * @param  {function} on_missing (gets emoji name without :: and returns a proper emoji if no emoji was found)
+ * @param  {function} format (wrap the returned emoji in a custom element)
+ * @return {string}
+ */
+Emoji.emojify = function emojify (str, on_missing, format) {
+  if (!str) return '';
+
+  return str.split(emojiNameRegex) // parse emoji via regex
+            .map(function parseEmoji(s, i) {
+              // every second element is an emoji, e.g. "test :fast_forward:" -> [ "test ", "fast_forward" ]
+              if (i % 2 === 0) return s;
+              var emoji = Emoji._get(s);
+              var isMissing = emoji.indexOf(':') > -1;
+
+              if (isMissing && typeof on_missing === 'function') {
+                return on_missing(s);
+              }
+
+              if (!isMissing && typeof format === 'function') {
+                return format(emoji, s);
+              }
+
+              return emoji;
+            })
+            .join('') // convert back to string
+  ;
+};
+
+/**
+ * return a random emoji
+ * @return {string}
+ */
+Emoji.random = function random () {
+  var emojiKeys = Object.keys(emojiByName);
+  var randomIndex = Math.floor(Math.random() * emojiKeys.length);
+  var key = emojiKeys[randomIndex];
+  var emoji = Emoji._get(key);
+  return { key: key, emoji: emoji };
+}
+
+/**
+ *  return an collection of potential emoji matches
+ *  @param {string} str
+ *  @return {Array.<Object>}
+ */
+Emoji.search = function search (str) {
+  var emojiKeys = Object.keys(emojiByName);
+  var matcher = stripColons(str)
+  var matchingKeys = emojiKeys.filter(function(key) {
+    return key.toString().indexOf(matcher) === 0;
+  });
+  return matchingKeys.map(function(key) {
+    return {
+      key: key,
+      emoji: Emoji._get(key),
+    };
+  });
+}
+
+/**
+ * unemojify a string (replace emoji with :emoji:)
+ * @param  {string} str
+ * @return {string}
+ */
+Emoji.unemojify = function unemojify (str) {
+  if (!str) return '';
+  var words = toArray(str);
+
+  return words.map(function(word) {
+    return Emoji.which(word, true) || word;
+  }).join('');
+};
+
+/**
+ * replace emojis with replacement value
+ * @param {string} str
+ * @param {function|string} the string or callback function to replace the emoji with
+ * @param {boolean} should trailing whitespaces be cleaned? Defaults false
+ * @return {string}
+ */
+Emoji.replace = function replace (str, replacement, cleanSpaces) {
+  if (!str) return '';
+
+  var replace = typeof replacement === 'function' ? replacement : function() { return replacement; };
+  var words = toArray(str);
+
+  var replaced = words.map(function(word, idx) {
+    var emoji = Emoji.findByCode(word);
+    
+    if (emoji && cleanSpaces && words[idx + 1] === ' ') {
+      words[idx + 1] = '';
+    }
+
+    return emoji ? replace(emoji) : word;
+  }).join('');
+
+  return cleanSpaces ? replaced.replace(trimSpaceRegex, '') : replaced;
+};
+
+
+/**
+ * remove all emojis from a string
+ * @param {string} str
+ * @return {string}
+ */
+Emoji.strip = function strip (str) {
+  return Emoji.replace(str, '', true);
+};
+
+module.exports = Emoji;
+
+
+/***/ }),
+/* 764 */
+/***/ (function(module, exports) {
+
+module.exports = {"100":"💯","1234":"🔢","interrobang":"⁉️","tm":"™️","information_source":"ℹ️","left_right_arrow":"↔️","arrow_up_down":"↕️","arrow_upper_left":"↖️","arrow_upper_right":"↗️","arrow_lower_right":"↘️","arrow_lower_left":"↙️","keyboard":"⌨","sunny":"☀️","cloud":"☁️","umbrella":"☔️","showman":"☃","comet":"☄","ballot_box_with_check":"☑️","coffee":"☕️","shamrock":"☘","skull_and_crossbones":"☠","radioactive_sign":"☢","biohazard_sign":"☣","orthodox_cross":"☦","wheel_of_dharma":"☸","white_frowning_face":"☹","aries":"♈️","taurus":"♉️","sagittarius":"♐️","capricorn":"♑️","aquarius":"♒️","pisces":"♓️","spades":"♠️","clubs":"♣️","hearts":"♥️","diamonds":"♦️","hotsprings":"♨️","hammer_and_pick":"⚒","anchor":"⚓️","crossed_swords":"⚔","scales":"⚖","alembic":"⚗","gear":"⚙","scissors":"✂️","white_check_mark":"✅","airplane":"✈️","email":"✉️","envelope":"✉️","black_nib":"✒️","heavy_check_mark":"✔️","heavy_multiplication_x":"✖️","star_of_david":"✡","sparkles":"✨","eight_spoked_asterisk":"✳️","eight_pointed_black_star":"✴️","snowflake":"❄️","sparkle":"❇️","question":"❓","grey_question":"❔","grey_exclamation":"❕","exclamation":"❗️","heavy_exclamation_mark":"❗️","heavy_heart_exclamation_mark_ornament":"❣","heart":"❤️","heavy_plus_sign":"➕","heavy_minus_sign":"➖","heavy_division_sign":"➗","arrow_heading_up":"⤴️","arrow_heading_down":"⤵️","wavy_dash":"〰️","congratulations":"㊗️","secret":"㊙️","copyright":"©️","registered":"®️","bangbang":"‼️","leftwards_arrow_with_hook":"↩️","arrow_right_hook":"↪️","watch":"⌚️","hourglass":"⌛️","fast_forward":"⏩","rewind":"⏪","arrow_double_up":"⏫","arrow_double_down":"⏬","black_right_pointing_double_triangle_with_vertical_bar":"⏭","black_left_pointing_double_triangle_with_vertical_bar":"⏮","black_right_pointing_triangle_with_double_vertical_bar":"⏯","alarm_clock":"⏰","stopwatch":"⏱","timer_clock":"⏲","hourglass_flowing_sand":"⏳","double_vertical_bar":"⏸","black_square_for_stop":"⏹","black_circle_for_record":"⏺","m":"Ⓜ️","black_small_square":"▪️","white_small_square":"▫️","arrow_forward":"▶️","arrow_backward":"◀️","white_medium_square":"◻️","black_medium_square":"◼️","white_medium_small_square":"◽️","black_medium_small_square":"◾️","phone":"☎️","telephone":"☎️","point_up":"☝️","star_and_crescent":"☪","peace_symbol":"☮","yin_yang":"☯","relaxed":"☺️","gemini":"♊️","cancer":"♋️","leo":"♌️","virgo":"♍️","libra":"♎️","scorpius":"♏️","recycle":"♻️","wheelchair":"♿️","atom_symbol":"⚛","fleur_de_lis":"⚜","warning":"⚠️","zap":"⚡️","white_circle":"⚪️","black_circle":"⚫️","coffin":"⚰","funeral_urn":"⚱","soccer":"⚽️","baseball":"⚾️","snowman":"⛄️","partly_sunny":"⛅️","thunder_cloud_and_rain":"⛈","ophiuchus":"⛎","pick":"⛏","helmet_with_white_cross":"⛑","chains":"⛓","no_entry":"⛔️","shinto_shrine":"⛩","church":"⛪️","mountain":"⛰","umbrella_on_ground":"⛱","fountain":"⛲️","golf":"⛳️","ferry":"⛴","boat":"⛵️","sailboat":"⛵️","skier":"⛷","ice_skate":"⛸","person_with_ball":"⛹","tent":"⛺️","fuelpump":"⛽️","fist":"✊","hand":"✋","raised_hand":"✋","v":"✌️","writing_hand":"✍","pencil2":"✏️","latin_cross":"✝","x":"❌","negative_squared_cross_mark":"❎","arrow_right":"➡️","curly_loop":"➰","loop":"➿","arrow_left":"⬅️","arrow_up":"⬆️","arrow_down":"⬇️","black_large_square":"⬛️","white_large_square":"⬜️","star":"⭐️","o":"⭕️","part_alternation_mark":"〽️","mahjong":"🀄️","black_joker":"🃏","a":"🅰️","b":"🅱️","o2":"🅾️","parking":"🅿️","ab":"🆎","cl":"🆑","cool":"🆒","free":"🆓","id":"🆔","new":"🆕","ng":"🆖","ok":"🆗","sos":"🆘","up":"🆙","vs":"🆚","koko":"🈁","sa":"🈂️","u7121":"🈚️","u6307":"🈯️","u7981":"🈲","u7a7a":"🈳","u5408":"🈴","u6e80":"🈵","u6709":"🈶","u6708":"🈷️","u7533":"🈸","u5272":"🈹","u55b6":"🈺","ideograph_advantage":"🉐","accept":"🉑","cyclone":"🌀","foggy":"🌁","closed_umbrella":"🌂","night_with_stars":"🌃","sunrise_over_mountains":"🌄","sunrise":"🌅","city_sunset":"🌆","city_sunrise":"🌇","rainbow":"🌈","bridge_at_night":"🌉","ocean":"🌊","volcano":"🌋","milky_way":"🌌","earth_africa":"🌍","earth_americas":"🌎","earth_asia":"🌏","globe_with_meridians":"🌐","new_moon":"🌑","waxing_crescent_moon":"🌒","first_quarter_moon":"🌓","moon":"🌔","waxing_gibbous_moon":"🌔","full_moon":"🌕","waning_gibbous_moon":"🌖","last_quarter_moon":"🌗","waning_crescent_moon":"🌘","crescent_moon":"🌙","new_moon_with_face":"🌚","first_quarter_moon_with_face":"🌛","last_quarter_moon_with_face":"🌜","full_moon_with_face":"🌝","sun_with_face":"🌞","star2":"🌟","stars":"🌠","thermometer":"🌡","mostly_sunny":"🌤","sun_small_cloud":"🌤","barely_sunny":"🌥","sun_behind_cloud":"🌥","partly_sunny_rain":"🌦","sun_behind_rain_cloud":"🌦","rain_cloud":"🌧","snow_cloud":"🌨","lightning":"🌩","lightning_cloud":"🌩","tornado":"🌪","tornado_cloud":"🌪","fog":"🌫","wind_blowing_face":"🌬","hotdog":"🌭","taco":"🌮","burrito":"🌯","chestnut":"🌰","seedling":"🌱","evergreen_tree":"🌲","deciduous_tree":"🌳","palm_tree":"🌴","cactus":"🌵","hot_pepper":"🌶","tulip":"🌷","cherry_blossom":"🌸","rose":"🌹","hibiscus":"🌺","sunflower":"🌻","blossom":"🌼","corn":"🌽","ear_of_rice":"🌾","herb":"🌿","four_leaf_clover":"🍀","maple_leaf":"🍁","fallen_leaf":"🍂","leaves":"🍃","mushroom":"🍄","tomato":"🍅","eggplant":"🍆","grapes":"🍇","melon":"🍈","watermelon":"🍉","tangerine":"🍊","lemon":"🍋","banana":"🍌","pineapple":"🍍","apple":"🍎","green_apple":"🍏","pear":"🍐","peach":"🍑","cherries":"🍒","strawberry":"🍓","hamburger":"🍔","pizza":"🍕","meat_on_bone":"🍖","poultry_leg":"🍗","rice_cracker":"🍘","rice_ball":"🍙","rice":"🍚","curry":"🍛","ramen":"🍜","spaghetti":"🍝","bread":"🍞","fries":"🍟","sweet_potato":"🍠","dango":"🍡","oden":"🍢","sushi":"🍣","fried_shrimp":"🍤","fish_cake":"🍥","icecream":"🍦","shaved_ice":"🍧","ice_cream":"🍨","doughnut":"🍩","cookie":"🍪","chocolate_bar":"🍫","candy":"🍬","lollipop":"🍭","custard":"🍮","honey_pot":"🍯","cake":"🍰","bento":"🍱","stew":"🍲","egg":"🍳","fork_and_knife":"🍴","tea":"🍵","sake":"🍶","wine_glass":"🍷","cocktail":"🍸","tropical_drink":"🍹","beer":"🍺","beers":"🍻","baby_bottle":"🍼","knife_fork_plate":"🍽","champagne":"🍾","popcorn":"🍿","ribbon":"🎀","gift":"🎁","birthday":"🎂","jack_o_lantern":"🎃","christmas_tree":"🎄","santa":"🎅","fireworks":"🎆","sparkler":"🎇","balloon":"🎈","tada":"🎉","confetti_ball":"🎊","tanabata_tree":"🎋","crossed_flags":"🎌","bamboo":"🎍","dolls":"🎎","flags":"🎏","wind_chime":"🎐","rice_scene":"🎑","school_satchel":"🎒","mortar_board":"🎓","medal":"🎖","reminder_ribbon":"🎗","studio_microphone":"🎙","level_slider":"🎚","control_knobs":"🎛","film_frames":"🎞","admission_tickets":"🎟","carousel_horse":"🎠","ferris_wheel":"🎡","roller_coaster":"🎢","fishing_pole_and_fish":"🎣","microphone":"🎤","movie_camera":"🎥","cinema":"🎦","headphones":"🎧","art":"🎨","tophat":"🎩","circus_tent":"🎪","ticket":"🎫","clapper":"🎬","performing_arts":"🎭","video_game":"🎮","dart":"🎯","slot_machine":"🎰","8ball":"🎱","game_die":"🎲","bowling":"🎳","flower_playing_cards":"🎴","musical_note":"🎵","notes":"🎶","saxophone":"🎷","guitar":"🎸","musical_keyboard":"🎹","trumpet":"🎺","violin":"🎻","musical_score":"🎼","running_shirt_with_sash":"🎽","tennis":"🎾","ski":"🎿","basketball":"🏀","checkered_flag":"🏁","snowboarder":"🏂","runner":"🏃","running":"🏃","surfer":"🏄","sports_medal":"🏅","trophy":"🏆","horse_racing":"🏇","football":"🏈","rugby_football":"🏉","swimmer":"🏊","weight_lifter":"🏋","golfer":"🏌","racing_motorcycle":"🏍","racing_car":"🏎","cricket_bat_and_ball":"🏏","volleyball":"🏐","field_hockey_stick_and_ball":"🏑","ice_hockey_stick_and_puck":"🏒","table_tennis_paddle_and_ball":"🏓","snow_capped_mountain":"🏔","camping":"🏕","beach_with_umbrella":"🏖","building_construction":"🏗","house_buildings":"🏘","cityscape":"🏙","derelict_house_building":"🏚","classical_building":"🏛","desert":"🏜","desert_island":"🏝","national_park":"🏞","stadium":"🏟","house":"🏠","house_with_garden":"🏡","office":"🏢","post_office":"🏣","european_post_office":"🏤","hospital":"🏥","bank":"🏦","atm":"🏧","hotel":"🏨","love_hotel":"🏩","convenience_store":"🏪","school":"🏫","department_store":"🏬","factory":"🏭","izakaya_lantern":"🏮","lantern":"🏮","japanese_castle":"🏯","european_castle":"🏰","waving_white_flag":"🏳","waving_black_flag":"🏴","rosette":"🏵","label":"🏷","badminton_racquet_and_shuttlecock":"🏸","bow_and_arrow":"🏹","amphora":"🏺","skin-tone-2":"🏻","skin-tone-3":"🏼","skin-tone-4":"🏽","skin-tone-5":"🏾","skin-tone-6":"🏿","rat":"🐀","mouse2":"🐁","ox":"🐂","water_buffalo":"🐃","cow2":"🐄","tiger2":"🐅","leopard":"🐆","rabbit2":"🐇","cat2":"🐈","dragon":"🐉","crocodile":"🐊","whale2":"🐋","snail":"🐌","snake":"🐍","racehorse":"🐎","ram":"🐏","goat":"🐐","sheep":"🐑","monkey":"🐒","rooster":"🐓","chicken":"🐔","dog2":"🐕","pig2":"🐖","boar":"🐗","elephant":"🐘","octopus":"🐙","shell":"🐚","bug":"🐛","ant":"🐜","bee":"🐝","honeybee":"🐝","beetle":"🐞","fish":"🐟","tropical_fish":"🐠","blowfish":"🐡","turtle":"🐢","hatching_chick":"🐣","baby_chick":"🐤","hatched_chick":"🐥","bird":"🐦","penguin":"🐧","koala":"🐨","poodle":"🐩","dromedary_camel":"🐪","camel":"🐫","dolphin":"🐬","flipper":"🐬","mouse":"🐭","cow":"🐮","tiger":"🐯","rabbit":"🐰","cat":"🐱","dragon_face":"🐲","whale":"🐳","horse":"🐴","monkey_face":"🐵","dog":"🐶","pig":"🐷","frog":"🐸","hamster":"🐹","wolf":"🐺","bear":"🐻","panda_face":"🐼","pig_nose":"🐽","feet":"🐾","paw_prints":"🐾","chipmunk":"🐿","eyes":"👀","eye":"👁","ear":"👂","nose":"👃","lips":"👄","tongue":"👅","point_up_2":"👆","point_down":"👇","point_left":"👈","point_right":"👉","facepunch":"👊","punch":"👊","wave":"👋","ok_hand":"👌","+1":"👍","thumbsup":"👍","-1":"👎","thumbsdown":"👎","clap":"👏","open_hands":"👐","crown":"👑","womans_hat":"👒","eyeglasses":"👓","necktie":"👔","shirt":"👕","tshirt":"👕","jeans":"👖","dress":"👗","kimono":"👘","bikini":"👙","womans_clothes":"👚","purse":"👛","handbag":"👜","pouch":"👝","mans_shoe":"👞","shoe":"👞","athletic_shoe":"👟","high_heel":"👠","sandal":"👡","boot":"👢","footprints":"👣","bust_in_silhouette":"👤","busts_in_silhouette":"👥","boy":"👦","girl":"👧","man":"👨","woman":"👩","family":"👨‍👩‍👦","man-woman-boy":"👨‍👩‍👦","couple":"👫","man_and_woman_holding_hands":"👫","two_men_holding_hands":"👬","two_women_holding_hands":"👭","cop":"👮","dancers":"👯","bride_with_veil":"👰","person_with_blond_hair":"👱","man_with_gua_pi_mao":"👲","man_with_turban":"👳","older_man":"👴","older_woman":"👵","baby":"👶","construction_worker":"👷","princess":"👸","japanese_ogre":"👹","japanese_goblin":"👺","ghost":"👻","angel":"👼","alien":"👽","space_invader":"👾","imp":"👿","skull":"💀","information_desk_person":"💁","guardsman":"💂","dancer":"💃","lipstick":"💄","nail_care":"💅","massage":"💆","haircut":"💇","barber":"💈","syringe":"💉","pill":"💊","kiss":"💋","love_letter":"💌","ring":"💍","gem":"💎","couplekiss":"💏","bouquet":"💐","couple_with_heart":"💑","wedding":"💒","heartbeat":"💓","broken_heart":"💔","two_hearts":"💕","sparkling_heart":"💖","heartpulse":"💗","cupid":"💘","blue_heart":"💙","green_heart":"💚","yellow_heart":"💛","purple_heart":"💜","gift_heart":"💝","revolving_hearts":"💞","heart_decoration":"💟","diamond_shape_with_a_dot_inside":"💠","bulb":"💡","anger":"💢","bomb":"💣","zzz":"💤","boom":"💥","collision":"💥","sweat_drops":"💦","droplet":"💧","dash":"💨","hankey":"💩","poop":"💩","shit":"💩","muscle":"💪","dizzy":"💫","speech_balloon":"💬","thought_balloon":"💭","white_flower":"💮","moneybag":"💰","currency_exchange":"💱","heavy_dollar_sign":"💲","credit_card":"💳","yen":"💴","dollar":"💵","euro":"💶","pound":"💷","money_with_wings":"💸","chart":"💹","seat":"💺","computer":"💻","briefcase":"💼","minidisc":"💽","floppy_disk":"💾","cd":"💿","dvd":"📀","file_folder":"📁","open_file_folder":"📂","page_with_curl":"📃","page_facing_up":"📄","date":"📅","calendar":"📆","card_index":"📇","chart_with_upwards_trend":"📈","chart_with_downwards_trend":"📉","bar_chart":"📊","clipboard":"📋","pushpin":"📌","round_pushpin":"📍","paperclip":"📎","straight_ruler":"📏","triangular_ruler":"📐","bookmark_tabs":"📑","ledger":"📒","notebook":"📓","notebook_with_decorative_cover":"📔","closed_book":"📕","book":"📖","open_book":"📖","green_book":"📗","blue_book":"📘","orange_book":"📙","books":"📚","name_badge":"📛","scroll":"📜","memo":"📝","pencil":"📝","telephone_receiver":"📞","pager":"📟","fax":"📠","satellite":"🛰","loudspeaker":"📢","mega":"📣","outbox_tray":"📤","inbox_tray":"📥","package":"📦","e-mail":"📧","incoming_envelope":"📨","envelope_with_arrow":"📩","mailbox_closed":"📪","mailbox":"📫","mailbox_with_mail":"📬","mailbox_with_no_mail":"📭","postbox":"📮","postal_horn":"📯","newspaper":"📰","iphone":"📱","calling":"📲","vibration_mode":"📳","mobile_phone_off":"📴","no_mobile_phones":"📵","signal_strength":"📶","camera":"📷","camera_with_flash":"📸","video_camera":"📹","tv":"📺","radio":"📻","vhs":"📼","film_projector":"📽","prayer_beads":"📿","twisted_rightwards_arrows":"🔀","repeat":"🔁","repeat_one":"🔂","arrows_clockwise":"🔃","arrows_counterclockwise":"🔄","low_brightness":"🔅","high_brightness":"🔆","mute":"🔇","speaker":"🔈","sound":"🔉","loud_sound":"🔊","battery":"🔋","electric_plug":"🔌","mag":"🔍","mag_right":"🔎","lock_with_ink_pen":"🔏","closed_lock_with_key":"🔐","key":"🔑","lock":"🔒","unlock":"🔓","bell":"🔔","no_bell":"🔕","bookmark":"🔖","link":"🔗","radio_button":"🔘","back":"🔙","end":"🔚","on":"🔛","soon":"🔜","top":"🔝","underage":"🔞","keycap_ten":"🔟","capital_abcd":"🔠","abcd":"🔡","symbols":"🔣","abc":"🔤","fire":"🔥","flashlight":"🔦","wrench":"🔧","hammer":"🔨","nut_and_bolt":"🔩","hocho":"🔪","knife":"🔪","gun":"🔫","microscope":"🔬","telescope":"🔭","crystal_ball":"🔮","six_pointed_star":"🔯","beginner":"🔰","trident":"🔱","black_square_button":"🔲","white_square_button":"🔳","red_circle":"🔴","large_blue_circle":"🔵","large_orange_diamond":"🔶","large_blue_diamond":"🔷","small_orange_diamond":"🔸","small_blue_diamond":"🔹","small_red_triangle":"🔺","small_red_triangle_down":"🔻","arrow_up_small":"🔼","arrow_down_small":"🔽","om_symbol":"🕉","dove_of_peace":"🕊","kaaba":"🕋","mosque":"🕌","synagogue":"🕍","menorah_with_nine_branches":"🕎","clock1":"🕐","clock2":"🕑","clock3":"🕒","clock4":"🕓","clock5":"🕔","clock6":"🕕","clock7":"🕖","clock8":"🕗","clock9":"🕘","clock10":"🕙","clock11":"🕚","clock12":"🕛","clock130":"🕜","clock230":"🕝","clock330":"🕞","clock430":"🕟","clock530":"🕠","clock630":"🕡","clock730":"🕢","clock830":"🕣","clock930":"🕤","clock1030":"🕥","clock1130":"🕦","clock1230":"🕧","candle":"🕯","mantelpiece_clock":"🕰","hole":"🕳","man_in_business_suit_levitating":"🕴","sleuth_or_spy":"🕵","dark_sunglasses":"🕶","spider":"🕷","spider_web":"🕸","joystick":"🕹","linked_paperclips":"🖇","lower_left_ballpoint_pen":"🖊","lower_left_fountain_pen":"🖋","lower_left_paintbrush":"🖌","lower_left_crayon":"🖍","raised_hand_with_fingers_splayed":"🖐","middle_finger":"🖕","reversed_hand_with_middle_finger_extended":"🖕","spock-hand":"🖖","desktop_computer":"🖥","printer":"🖨","three_button_mouse":"🖱","trackball":"🖲","frame_with_picture":"🖼","card_index_dividers":"🗂","card_file_box":"🗃","file_cabinet":"🗄","wastebasket":"🗑","spiral_note_pad":"🗒","spiral_calendar_pad":"🗓","compression":"🗜","old_key":"🗝","rolled_up_newspaper":"🗞","dagger_knife":"🗡","speaking_head_in_silhouette":"🗣","left_speech_bubble":"🗨","right_anger_bubble":"🗯","ballot_box_with_ballot":"🗳","world_map":"🗺","mount_fuji":"🗻","tokyo_tower":"🗼","statue_of_liberty":"🗽","japan":"🗾","moyai":"🗿","grinning":"😀","grin":"😁","joy":"😂","smiley":"😃","smile":"😄","sweat_smile":"😅","laughing":"😆","satisfied":"😆","innocent":"😇","smiling_imp":"😈","wink":"😉","blush":"😊","yum":"😋","relieved":"😌","heart_eyes":"😍","sunglasses":"😎","smirk":"😏","neutral_face":"😐","expressionless":"😑","unamused":"😒","sweat":"😓","pensive":"😔","confused":"😕","confounded":"😖","kissing":"😗","kissing_heart":"😘","kissing_smiling_eyes":"😙","kissing_closed_eyes":"😚","stuck_out_tongue":"😛","stuck_out_tongue_winking_eye":"😜","stuck_out_tongue_closed_eyes":"😝","disappointed":"😞","worried":"😟","angry":"😠","rage":"😡","cry":"😢","persevere":"😣","triumph":"😤","disappointed_relieved":"😥","frowning":"😦","anguished":"😧","fearful":"😨","weary":"😩","sleepy":"😪","tired_face":"😫","grimacing":"😬","sob":"😭","open_mouth":"😮","hushed":"😯","cold_sweat":"😰","scream":"😱","astonished":"😲","flushed":"😳","sleeping":"😴","dizzy_face":"😵","no_mouth":"😶","mask":"😷","smile_cat":"😸","joy_cat":"😹","smiley_cat":"😺","heart_eyes_cat":"😻","smirk_cat":"😼","kissing_cat":"😽","pouting_cat":"😾","crying_cat_face":"😿","scream_cat":"🙀","slightly_frowning_face":"🙁","slightly_smiling_face":"🙂","upside_down_face":"🙃","face_with_rolling_eyes":"🙄","no_good":"🙅","ok_woman":"🙆","bow":"🙇","see_no_evil":"🙈","hear_no_evil":"🙉","speak_no_evil":"🙊","raising_hand":"🙋","raised_hands":"🙌","person_frowning":"🙍","person_with_pouting_face":"🙎","pray":"🙏","rocket":"🚀","helicopter":"🚁","steam_locomotive":"🚂","railway_car":"🚃","bullettrain_side":"🚄","bullettrain_front":"🚅","train2":"🚆","metro":"🚇","light_rail":"🚈","station":"🚉","tram":"🚊","train":"🚋","bus":"🚌","oncoming_bus":"🚍","trolleybus":"🚎","busstop":"🚏","minibus":"🚐","ambulance":"🚑","fire_engine":"🚒","police_car":"🚓","oncoming_police_car":"🚔","taxi":"🚕","oncoming_taxi":"🚖","car":"🚗","red_car":"🚗","oncoming_automobile":"🚘","blue_car":"🚙","truck":"🚚","articulated_lorry":"🚛","tractor":"🚜","monorail":"🚝","mountain_railway":"🚞","suspension_railway":"🚟","mountain_cableway":"🚠","aerial_tramway":"🚡","ship":"🚢","rowboat":"🚣","speedboat":"🚤","traffic_light":"🚥","vertical_traffic_light":"🚦","construction":"🚧","rotating_light":"🚨","triangular_flag_on_post":"🚩","door":"🚪","no_entry_sign":"🚫","smoking":"🚬","no_smoking":"🚭","put_litter_in_its_place":"🚮","do_not_litter":"🚯","potable_water":"🚰","non-potable_water":"🚱","bike":"🚲","no_bicycles":"🚳","bicyclist":"🚴","mountain_bicyclist":"🚵","walking":"🚶","no_pedestrians":"🚷","children_crossing":"🚸","mens":"🚹","womens":"🚺","restroom":"🚻","baby_symbol":"🚼","toilet":"🚽","wc":"🚾","shower":"🚿","bath":"🛀","bathtub":"🛁","passport_control":"🛂","customs":"🛃","baggage_claim":"🛄","left_luggage":"🛅","couch_and_lamp":"🛋","sleeping_accommodation":"🛌","shopping_bags":"🛍","bellhop_bell":"🛎","bed":"🛏","place_of_worship":"🛐","hammer_and_wrench":"🛠","shield":"🛡","oil_drum":"🛢","motorway":"🛣","railway_track":"🛤","motor_boat":"🛥","small_airplane":"🛩","airplane_departure":"🛫","airplane_arriving":"🛬","passenger_ship":"🛳","zipper_mouth_face":"🤐","money_mouth_face":"🤑","face_with_thermometer":"🤒","nerd_face":"🤓","thinking_face":"🤔","face_with_head_bandage":"🤕","robot_face":"🤖","hugging_face":"🤗","the_horns":"🤘","sign_of_the_horns":"🤘","crab":"🦀","lion_face":"🦁","scorpion":"🦂","turkey":"🦃","unicorn_face":"🦄","cheese_wedge":"🧀","hash":"#️⃣","keycap_star":"*⃣","zero":"0️⃣","one":"1️⃣","two":"2️⃣","three":"3️⃣","four":"4️⃣","five":"5️⃣","six":"6️⃣","seven":"7️⃣","eight":"8️⃣","nine":"9️⃣","flag-ac":"🇦🇨","flag-ad":"🇦🇩","flag-ae":"🇦🇪","flag-af":"🇦🇫","flag-ag":"🇦🇬","flag-ai":"🇦🇮","flag-al":"🇦🇱","flag-am":"🇦🇲","flag-ao":"🇦🇴","flag-aq":"🇦🇶","flag-ar":"🇦🇷","flag-as":"🇦🇸","flag-at":"🇦🇹","flag-au":"🇦🇺","flag-aw":"🇦🇼","flag-ax":"🇦🇽","flag-az":"🇦🇿","flag-ba":"🇧🇦","flag-bb":"🇧🇧","flag-bd":"🇧🇩","flag-be":"🇧🇪","flag-bf":"🇧🇫","flag-bg":"🇧🇬","flag-bh":"🇧🇭","flag-bi":"🇧🇮","flag-bj":"🇧🇯","flag-bl":"🇧🇱","flag-bm":"🇧🇲","flag-bn":"🇧🇳","flag-bo":"🇧🇴","flag-bq":"🇧🇶","flag-br":"🇧🇷","flag-bs":"🇧🇸","flag-bt":"🇧🇹","flag-bv":"🇧🇻","flag-bw":"🇧🇼","flag-by":"🇧🇾","flag-bz":"🇧🇿","flag-ca":"🇨🇦","flag-cc":"🇨🇨","flag-cd":"🇨🇩","flag-cf":"🇨🇫","flag-cg":"🇨🇬","flag-ch":"🇨🇭","flag-ci":"🇨🇮","flag-ck":"🇨🇰","flag-cl":"🇨🇱","flag-cm":"🇨🇲","flag-cn":"🇨🇳","cn":"🇨🇳","flag-co":"🇨🇴","flag-cp":"🇨🇵","flag-cr":"🇨🇷","flag-cu":"🇨🇺","flag-cv":"🇨🇻","flag-cw":"🇨🇼","flag-cx":"🇨🇽","flag-cy":"🇨🇾","flag-cz":"🇨🇿","flag-de":"🇩🇪","de":"🇩🇪","flag-dg":"🇩🇬","flag-dj":"🇩🇯","flag-dk":"🇩🇰","flag-dm":"🇩🇲","flag-do":"🇩🇴","flag-dz":"🇩🇿","flag-ea":"🇪🇦","flag-ec":"🇪🇨","flag-ee":"🇪🇪","flag-eg":"🇪🇬","flag-eh":"🇪🇭","flag-er":"🇪🇷","flag-es":"🇪🇸","es":"🇪🇸","flag-et":"🇪🇹","flag-eu":"🇪🇺","flag-fi":"🇫🇮","flag-fj":"🇫🇯","flag-fk":"🇫🇰","flag-fm":"🇫🇲","flag-fo":"🇫🇴","flag-fr":"🇫🇷","fr":"🇫🇷","flag-ga":"🇬🇦","flag-gb":"🇬🇧","gb":"🇬🇧","uk":"🇬🇧","flag-gd":"🇬🇩","flag-ge":"🇬🇪","flag-gf":"🇬🇫","flag-gg":"🇬🇬","flag-gh":"🇬🇭","flag-gi":"🇬🇮","flag-gl":"🇬🇱","flag-gm":"🇬🇲","flag-gn":"🇬🇳","flag-gp":"🇬🇵","flag-gq":"🇬🇶","flag-gr":"🇬🇷","flag-gs":"🇬🇸","flag-gt":"🇬🇹","flag-gu":"🇬🇺","flag-gw":"🇬🇼","flag-gy":"🇬🇾","flag-hk":"🇭🇰","flag-hm":"🇭🇲","flag-hn":"🇭🇳","flag-hr":"🇭🇷","flag-ht":"🇭🇹","flag-hu":"🇭🇺","flag-ic":"🇮🇨","flag-id":"🇮🇩","flag-ie":"🇮🇪","flag-il":"🇮🇱","flag-im":"🇮🇲","flag-in":"🇮🇳","flag-io":"🇮🇴","flag-iq":"🇮🇶","flag-ir":"🇮🇷","flag-is":"🇮🇸","flag-it":"🇮🇹","it":"🇮🇹","flag-je":"🇯🇪","flag-jm":"🇯🇲","flag-jo":"🇯🇴","flag-jp":"🇯🇵","jp":"🇯🇵","flag-ke":"🇰🇪","flag-kg":"🇰🇬","flag-kh":"🇰🇭","flag-ki":"🇰🇮","flag-km":"🇰🇲","flag-kn":"🇰🇳","flag-kp":"🇰🇵","flag-kr":"🇰🇷","kr":"🇰🇷","flag-kw":"🇰🇼","flag-ky":"🇰🇾","flag-kz":"🇰🇿","flag-la":"🇱🇦","flag-lb":"🇱🇧","flag-lc":"🇱🇨","flag-li":"🇱🇮","flag-lk":"🇱🇰","flag-lr":"🇱🇷","flag-ls":"🇱🇸","flag-lt":"🇱🇹","flag-lu":"🇱🇺","flag-lv":"🇱🇻","flag-ly":"🇱🇾","flag-ma":"🇲🇦","flag-mc":"🇲🇨","flag-md":"🇲🇩","flag-me":"🇲🇪","flag-mf":"🇲🇫","flag-mg":"🇲🇬","flag-mh":"🇲🇭","flag-mk":"🇲🇰","flag-ml":"🇲🇱","flag-mm":"🇲🇲","flag-mn":"🇲🇳","flag-mo":"🇲🇴","flag-mp":"🇲🇵","flag-mq":"🇲🇶","flag-mr":"🇲🇷","flag-ms":"🇲🇸","flag-mt":"🇲🇹","flag-mu":"🇲🇺","flag-mv":"🇲🇻","flag-mw":"🇲🇼","flag-mx":"🇲🇽","flag-my":"🇲🇾","flag-mz":"🇲🇿","flag-na":"🇳🇦","flag-nc":"🇳🇨","flag-ne":"🇳🇪","flag-nf":"🇳🇫","flag-ng":"🇳🇬","flag-ni":"🇳🇮","flag-nl":"🇳🇱","flag-no":"🇳🇴","flag-np":"🇳🇵","flag-nr":"🇳🇷","flag-nu":"🇳🇺","flag-nz":"🇳🇿","flag-om":"🇴🇲","flag-pa":"🇵🇦","flag-pe":"🇵🇪","flag-pf":"🇵🇫","flag-pg":"🇵🇬","flag-ph":"🇵🇭","flag-pk":"🇵🇰","flag-pl":"🇵🇱","flag-pm":"🇵🇲","flag-pn":"🇵🇳","flag-pr":"🇵🇷","flag-ps":"🇵🇸","flag-pt":"🇵🇹","flag-pw":"🇵🇼","flag-py":"🇵🇾","flag-qa":"🇶🇦","flag-re":"🇷🇪","flag-ro":"🇷🇴","flag-rs":"🇷🇸","flag-ru":"🇷🇺","ru":"🇷🇺","flag-rw":"🇷🇼","flag-sa":"🇸🇦","flag-sb":"🇸🇧","flag-sc":"🇸🇨","flag-sd":"🇸🇩","flag-se":"🇸🇪","flag-sg":"🇸🇬","flag-sh":"🇸🇭","flag-si":"🇸🇮","flag-sj":"🇸🇯","flag-sk":"🇸🇰","flag-sl":"🇸🇱","flag-sm":"🇸🇲","flag-sn":"🇸🇳","flag-so":"🇸🇴","flag-sr":"🇸🇷","flag-ss":"🇸🇸","flag-st":"🇸🇹","flag-sv":"🇸🇻","flag-sx":"🇸🇽","flag-sy":"🇸🇾","flag-sz":"🇸🇿","flag-ta":"🇹🇦","flag-tc":"🇹🇨","flag-td":"🇹🇩","flag-tf":"🇹🇫","flag-tg":"🇹🇬","flag-th":"🇹🇭","flag-tj":"🇹🇯","flag-tk":"🇹🇰","flag-tl":"🇹🇱","flag-tm":"🇹🇲","flag-tn":"🇹🇳","flag-to":"🇹🇴","flag-tr":"🇹🇷","flag-tt":"🇹🇹","flag-tv":"🇹🇻","flag-tw":"🇹🇼","flag-tz":"🇹🇿","flag-ua":"🇺🇦","flag-ug":"🇺🇬","flag-um":"🇺🇲","flag-us":"🇺🇸","us":"🇺🇸","flag-uy":"🇺🇾","flag-uz":"🇺🇿","flag-va":"🇻🇦","flag-vc":"🇻🇨","flag-ve":"🇻🇪","flag-vg":"🇻🇬","flag-vi":"🇻🇮","flag-vn":"🇻🇳","flag-vu":"🇻🇺","flag-wf":"🇼🇫","flag-ws":"🇼🇸","flag-xk":"🇽🇰","flag-ye":"🇾🇪","flag-yt":"🇾🇹","flag-za":"🇿🇦","flag-zm":"🇿🇲","flag-zw":"🇿🇼","man-man-boy":"👨‍👨‍👦","man-man-boy-boy":"👨‍👨‍👦‍👦","man-man-girl":"👨‍👨‍👧","man-man-girl-boy":"👨‍👨‍👧‍👦","man-man-girl-girl":"👨‍👨‍👧‍👧","man-woman-boy-boy":"👨‍👩‍👦‍👦","man-woman-girl":"👨‍👩‍👧","man-woman-girl-boy":"👨‍👩‍👧‍👦","man-woman-girl-girl":"👨‍👩‍👧‍👧","man-heart-man":"👨‍❤️‍👨","man-kiss-man":"👨‍❤️‍💋‍👨","woman-woman-boy":"👩‍👩‍👦","woman-woman-boy-boy":"👩‍👩‍👦‍👦","woman-woman-girl":"👩‍👩‍👧","woman-woman-girl-boy":"👩‍👩‍👧‍👦","woman-woman-girl-girl":"👩‍👩‍👧‍👧","woman-heart-woman":"👩‍❤️‍👩","woman-kiss-woman":"👩‍❤️‍💋‍👩"}
+
+/***/ }),
+/* 765 */
+/***/ (function(module, exports, __webpack_require__) {
+
+/*!
+ * normalize-path <https://github.com/jonschlinkert/normalize-path>
+ *
+ * Copyright (c) 2014-2017, Jon Schlinkert.
+ * Released under the MIT License.
+ */
+
+var removeTrailingSeparator = __webpack_require__(796);
+
+module.exports = function normalizePath(str, stripTrailing) {
+  if (typeof str !== 'string') {
+    throw new TypeError('expected a string');
+  }
+  str = str.replace(/[\\\/]+/g, '/');
+  if (stripTrailing !== false) {
+    str = removeTrailingSeparator(str);
+  }
+  return str;
+};
+
+
+/***/ }),
+/* 766 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+let path
+
+class LogicalTree {
+  constructor (name, address, opts) {
+    this.name = name
+    this.version = opts.version
+    this.address = address || ''
+    this.optional = !!opts.optional
+    this.dev = !!opts.dev
+    this.bundled = !!opts.bundled
+    this.resolved = opts.resolved
+    this.integrity = opts.integrity
+    this.dependencies = new Map()
+    this.requiredBy = new Set()
+  }
+
+  get isRoot () { return !this.requiredBy.size }
+
+  addDep (dep) {
+    this.dependencies.set(dep.name, dep)
+    dep.requiredBy.add(this)
+    return this
+  }
+
+  delDep (dep) {
+    this.dependencies.delete(dep.name)
+    dep.requiredBy.delete(this)
+    return this
+  }
+
+  getDep (name) {
+    return this.dependencies.get(name)
+  }
+
+  path (prefix) {
+    if (this.isRoot) {
+      // The address of the root is the prefix itself.
+      return prefix || ''
+    } else {
+      if (!path) { path = __webpack_require__(0) }
+      return path.join(
+        prefix || '',
+        'node_modules',
+        this.address.replace(/:/g, '/node_modules/')
+      )
+    }
+  }
+
+  // This finds cycles _from_ a given node: if some deeper dep has
+  // its own cycle, but that cycle does not refer to this node,
+  // it will return false.
+  hasCycle (_seen, _from) {
+    if (!_seen) { _seen = new Set() }
+    if (!_from) { _from = this }
+    for (let dep of this.dependencies.values()) {
+      if (_seen.has(dep)) { continue }
+      _seen.add(dep)
+      if (dep === _from || dep.hasCycle(_seen, _from)) {
+        return true
+      }
+    }
+    return false
+  }
+
+  forEachAsync (fn, opts, _pending) {
+    if (!opts) { opts = _pending || {} }
+    if (!_pending) { _pending = new Map() }
+    const P = opts.Promise || Promise
+    if (_pending.has(this)) {
+      return P.resolve(this.hasCycle() || _pending.get(this))
+    }
+    const pending = P.resolve().then(() => {
+      return fn(this, () => {
+        return promiseMap(
+          this.dependencies.values(),
+          dep => dep.forEachAsync(fn, opts, _pending),
+          opts
+        )
+      })
+    })
+    _pending.set(this, pending)
+    return pending
+  }
+
+  forEach (fn, _seen) {
+    if (!_seen) { _seen = new Set() }
+    if (_seen.has(this)) { return }
+    _seen.add(this)
+    fn(this, () => {
+      for (let dep of this.dependencies.values()) {
+        dep.forEach(fn, _seen)
+      }
+    })
+  }
+}
+
+module.exports = lockTree
+function lockTree (pkg, pkgLock, opts) {
+  const tree = makeNode(pkg.name, null, pkg)
+  const allDeps = new Map()
+  Array.from(
+    new Set(Object.keys(pkg.devDependencies || {})
+    .concat(Object.keys(pkg.optionalDependencies || {}))
+    .concat(Object.keys(pkg.dependencies || {})))
+  ).forEach(name => {
+    let dep = allDeps.get(name)
+    if (!dep) {
+      const depNode = (pkgLock.dependencies || {})[name]
+      dep = makeNode(name, name, depNode)
+    }
+    addChild(dep, tree, allDeps, pkgLock)
+  })
+  return tree
+}
+
+module.exports.node = makeNode
+function makeNode (name, address, opts) {
+  return new LogicalTree(name, address, opts || {})
+}
+
+function addChild (dep, tree, allDeps, pkgLock) {
+  tree.addDep(dep)
+  allDeps.set(dep.address, dep)
+  const addr = dep.address
+  const lockNode = atAddr(pkgLock, addr)
+  Object.keys(lockNode.requires || {}).forEach(name => {
+    const tdepAddr = reqAddr(pkgLock, name, addr)
+    let tdep = allDeps.get(tdepAddr)
+    if (!tdep) {
+      tdep = makeNode(name, tdepAddr, atAddr(pkgLock, tdepAddr))
+      addChild(tdep, dep, allDeps, pkgLock)
+    } else {
+      dep.addDep(tdep)
+    }
+  })
+}
+
+module.exports._reqAddr = reqAddr
+function reqAddr (pkgLock, name, fromAddr) {
+  const lockNode = atAddr(pkgLock, fromAddr)
+  const child = (lockNode.dependencies || {})[name]
+  if (child) {
+    return `${fromAddr}:${name}`
+  } else {
+    const parts = fromAddr.split(':')
+    while (parts.length) {
+      parts.pop()
+      const joined = parts.join(':')
+      const parent = atAddr(pkgLock, joined)
+      if (parent) {
+        const child = (parent.dependencies || {})[name]
+        if (child) {
+          return `${joined}${parts.length ? ':' : ''}${name}`
+        }
+      }
+    }
+    const err = new Error(`${name} not accessible from ${fromAddr}`)
+    err.pkgLock = pkgLock
+    err.target = name
+    err.from = fromAddr
+    throw err
+  }
+}
+
+module.exports._atAddr = atAddr
+function atAddr (pkgLock, addr) {
+  if (!addr.length) { return pkgLock }
+  const parts = addr.split(':')
+  return parts.reduce((acc, next) => {
+    return acc && (acc.dependencies || {})[next]
+  }, pkgLock)
+}
+
+function promiseMap (arr, fn, opts, _index) {
+  _index = _index || 0
+  const P = (opts && opts.Promise) || Promise
+  if (P.map) {
+    return P.map(arr, fn, opts)
+  } else {
+    if (!(arr instanceof Array)) {
+      arr = Array.from(arr)
+    }
+    if (_index >= arr.length) {
+      return P.resolve()
+    } else {
+      return P.resolve(fn(arr[_index], _index, arr))
+      .then(() => promiseMap(arr, fn, opts, _index + 1))
+    }
+  }
+}
+
+
+/***/ }),
+/* 767 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = Number.isNaN || function (x) {
+	return x !== x;
+};
+
+
+/***/ }),
+/* 768 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var crypto = __webpack_require__(11)
+  , qs = __webpack_require__(196)
+  ;
+
+function sha1 (key, body) {
+  return crypto.createHmac('sha1', key).update(body).digest('base64')
+}
+
+function rsa (key, body) {
+  return crypto.createSign("RSA-SHA1").update(body).sign(key, 'base64');
+}
+
+function rfc3986 (str) {
+  return encodeURIComponent(str)
+    .replace(/!/g,'%21')
+    .replace(/\*/g,'%2A')
+    .replace(/\(/g,'%28')
+    .replace(/\)/g,'%29')
+    .replace(/'/g,'%27')
+    ;
+}
+
+// Maps object to bi-dimensional array
+// Converts { foo: 'A', bar: [ 'b', 'B' ]} to
+// [ ['foo', 'A'], ['bar', 'b'], ['bar', 'B'] ]
+function map (obj) {
+  var key, val, arr = []
+  for (key in obj) {
+    val = obj[key]
+    if (Array.isArray(val))
+      for (var i = 0; i < val.length; i++)
+        arr.push([key, val[i]])
+    else if (typeof val === "object")
+      for (var prop in val)
+        arr.push([key + '[' + prop + ']', val[prop]]);
+    else
+      arr.push([key, val])
+  }
+  return arr
+}
+
+// Compare function for sort
+function compare (a, b) {
+  return a > b ? 1 : a < b ? -1 : 0
+}
+
+function generateBase (httpMethod, base_uri, params) {
+  // adapted from https://dev.twitter.com/docs/auth/oauth and 
+  // https://dev.twitter.com/docs/auth/creating-signature
+
+  // Parameter normalization
+  // http://tools.ietf.org/html/rfc5849#section-3.4.1.3.2
+  var normalized = map(params)
+  // 1.  First, the name and value of each parameter are encoded
+  .map(function (p) {
+    return [ rfc3986(p[0]), rfc3986(p[1] || '') ]
+  })
+  // 2.  The parameters are sorted by name, using ascending byte value
+  //     ordering.  If two or more parameters share the same name, they
+  //     are sorted by their value.
+  .sort(function (a, b) {
+    return compare(a[0], b[0]) || compare(a[1], b[1])
+  })
+  // 3.  The name of each parameter is concatenated to its corresponding
+  //     value using an "=" character (ASCII code 61) as a separator, even
+  //     if the value is empty.
+  .map(function (p) { return p.join('=') })
+   // 4.  The sorted name/value pairs are concatenated together into a
+   //     single string by using an "&" character (ASCII code 38) as
+   //     separator.
+  .join('&')
+
+  var base = [
+    rfc3986(httpMethod ? httpMethod.toUpperCase() : 'GET'),
+    rfc3986(base_uri),
+    rfc3986(normalized)
+  ].join('&')
+
+  return base
+}
+
+function hmacsign (httpMethod, base_uri, params, consumer_secret, token_secret) {
+  var base = generateBase(httpMethod, base_uri, params)
+  var key = [
+    consumer_secret || '',
+    token_secret || ''
+  ].map(rfc3986).join('&')
+
+  return sha1(key, base)
+}
+
+function rsasign (httpMethod, base_uri, params, private_key, token_secret) {
+  var base = generateBase(httpMethod, base_uri, params)
+  var key = private_key || ''
+
+  return rsa(key, base)
+}
+
+function plaintext (consumer_secret, token_secret) {
+  var key = [
+    consumer_secret || '',
+    token_secret || ''
+  ].map(rfc3986).join('&')
+
+  return key
+}
+
+function sign (signMethod, httpMethod, base_uri, params, consumer_secret, token_secret) {
+  var method
+  var skipArgs = 1
+
+  switch (signMethod) {
+    case 'RSA-SHA1':
+      method = rsasign
+      break
+    case 'HMAC-SHA1':
+      method = hmacsign
+      break
+    case 'PLAINTEXT':
+      method = plaintext
+      skipArgs = 4
+      break
+    default:
+     throw new Error("Signature method not supported: " + signMethod)
+  }
+
+  return method.apply(null, [].slice.call(arguments, skipArgs))
+}
+
+exports.hmacsign = hmacsign
+exports.rsasign = rsasign
+exports.plaintext = plaintext
+exports.sign = sign
+exports.rfc3986 = rfc3986
+exports.generateBase = generateBase
+
+
+
+/***/ }),
+/* 769 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*!
+ * object.omit <https://github.com/jonschlinkert/object.omit>
+ *
+ * Copyright (c) 2014-2015, Jon Schlinkert.
+ * Licensed under the MIT License.
+ */
+
+
+
+var isObject = __webpack_require__(735);
+var forOwn = __webpack_require__(770);
+
+module.exports = function omit(obj, keys) {
+  if (!isObject(obj)) return {};
+
+  keys = [].concat.apply([], [].slice.call(arguments, 1));
+  var last = keys[keys.length - 1];
+  var res = {}, fn;
+
+  if (typeof last === 'function') {
+    fn = keys.pop();
+  }
+
+  var isFunction = typeof fn === 'function';
+  if (!keys.length && !isFunction) {
+    return obj;
+  }
+
+  forOwn(obj, function(value, key) {
+    if (keys.indexOf(key) === -1) {
+
+      if (!isFunction) {
+        res[key] = value;
+      } else if (fn(value, key, obj)) {
+        res[key] = value;
+      }
+    }
+  });
+  return res;
+};
+
+
+/***/ }),
+/* 770 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*!
+ * for-own <https://github.com/jonschlinkert/for-own>
+ *
+ * Copyright (c) 2014-2017, Jon Schlinkert.
+ * Released under the MIT License.
+ */
+
+
+
+var forIn = __webpack_require__(647);
+var hasOwn = Object.prototype.hasOwnProperty;
+
+module.exports = function forOwn(obj, fn, thisArg) {
+  forIn(obj, function(val, key) {
+    if (hasOwn.call(obj, key)) {
+      return fn.call(thisArg, obj[key], key, obj);
+    }
+  });
+};
+
+
+/***/ }),
+/* 771 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+const mimicFn = __webpack_require__(760);
+
+module.exports = (fn, opts) => {
+	// TODO: Remove this in v3
+	if (opts === true) {
+		throw new TypeError('The second argument is now an options object');
+	}
+
+	if (typeof fn !== 'function') {
+		throw new TypeError('Expected a function');
+	}
+
+	opts = opts || {};
+
+	let ret;
+	let called = false;
+	const fnName = fn.displayName || fn.name || '<anonymous>';
+
+	const onetime = function () {
+		if (called) {
+			if (opts.throw === true) {
+				throw new Error(`Function \`${fnName}\` can only be called once`);
+			}
+
+			return ret;
+		}
+
+		called = true;
+		ret = fn.apply(this, arguments);
+		fn = null;
+
+		return ret;
+	};
+
+	mimicFn(onetime, fn);
+
+	return onetime;
+};
+
+
+/***/ }),
+/* 772 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var isWindows = process.platform === 'win32';
+var trailingSlashRe = isWindows ? /[^:]\\$/ : /.\/$/;
+
+// https://github.com/nodejs/node/blob/3e7a14381497a3b73dda68d05b5130563cdab420/lib/os.js#L25-L43
+module.exports = function () {
+	var path;
+
+	if (isWindows) {
+		path = process.env.TEMP ||
+			process.env.TMP ||
+			(process.env.SystemRoot || process.env.windir) + '\\temp';
+	} else {
+		path = process.env.TMPDIR ||
+			process.env.TMP ||
+			process.env.TEMP ||
+			'/tmp';
+	}
+
+	if (trailingSlashRe.test(path)) {
+		path = path.slice(0, -1);
+	}
+
+	return path;
+};
+
+
+/***/ }),
+/* 773 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*!
+ * parse-glob <https://github.com/jonschlinkert/parse-glob>
+ *
+ * Copyright (c) 2015, Jon Schlinkert.
+ * Licensed under the MIT License.
+ */
+
+
+
+var isGlob = __webpack_require__(178);
+var findBase = __webpack_require__(652);
+var extglob = __webpack_require__(177);
+var dotfile = __webpack_require__(733);
+
+/**
+ * Expose `cache`
+ */
+
+var cache = module.exports.cache = {};
+
+/**
+ * Parse a glob pattern into tokens.
+ *
+ * When no paths or '**' are in the glob, we use a
+ * different strategy for parsing the filename, since
+ * file names can contain braces and other difficult
+ * patterns. such as:
+ *
+ *  - `*.{a,b}`
+ *  - `(**|*.js)`
+ */
+
+module.exports = function parseGlob(glob) {
+  if (cache.hasOwnProperty(glob)) {
+    return cache[glob];
+  }
+
+  var tok = {};
+  tok.orig = glob;
+  tok.is = {};
+
+  // unescape dots and slashes in braces/brackets
+  glob = escape(glob);
+
+  var parsed = findBase(glob);
+  tok.is.glob = parsed.isGlob;
+
+  tok.glob = parsed.glob;
+  tok.base = parsed.base;
+  var segs = /([^\/]*)$/.exec(glob);
+
+  tok.path = {};
+  tok.path.dirname = '';
+  tok.path.basename = segs[1] || '';
+  tok.path.dirname = glob.split(tok.path.basename).join('') || '';
+  var basename = (tok.path.basename || '').split('.') || '';
+  tok.path.filename = basename[0] || '';
+  tok.path.extname = basename.slice(1).join('.') || '';
+  tok.path.ext = '';
+
+  if (isGlob(tok.path.dirname) && !tok.path.basename) {
+    if (!/\/$/.test(tok.glob)) {
+      tok.path.basename = tok.glob;
+    }
+    tok.path.dirname = tok.base;
+  }
+
+  if (glob.indexOf('/') === -1 && !tok.is.globstar) {
+    tok.path.dirname = '';
+    tok.path.basename = tok.orig;
+  }
+
+  var dot = tok.path.basename.indexOf('.');
+  if (dot !== -1) {
+    tok.path.filename = tok.path.basename.slice(0, dot);
+    tok.path.extname = tok.path.basename.slice(dot);
+  }
+
+  if (tok.path.extname.charAt(0) === '.') {
+    var exts = tok.path.extname.split('.');
+    tok.path.ext = exts[exts.length - 1];
+  }
+
+  // unescape dots and slashes in braces/brackets
+  tok.glob = unescape(tok.glob);
+  tok.path.dirname = unescape(tok.path.dirname);
+  tok.path.basename = unescape(tok.path.basename);
+  tok.path.filename = unescape(tok.path.filename);
+  tok.path.extname = unescape(tok.path.extname);
+
+  // Booleans
+  var is = (glob && tok.is.glob);
+  tok.is.negated  = glob && glob.charAt(0) === '!';
+  tok.is.extglob  = glob && extglob(glob);
+  tok.is.braces   = has(is, glob, '{');
+  tok.is.brackets = has(is, glob, '[:');
+  tok.is.globstar = has(is, glob, '**');
+  tok.is.dotfile  = dotfile(tok.path.basename) || dotfile(tok.path.filename);
+  tok.is.dotdir   = dotdir(tok.path.dirname);
+  return (cache[glob] = tok);
+}
+
+/**
+ * Returns true if the glob matches dot-directories.
+ *
+ * @param  {Object} `tok` The tokens object
+ * @param  {Object} `path` The path object
+ * @return {Object}
+ */
+
+function dotdir(base) {
+  if (base.indexOf('/.') !== -1) {
+    return true;
+  }
+  if (base.charAt(0) === '.' && base.charAt(1) !== '/') {
+    return true;
+  }
+  return false;
+}
+
+/**
+ * Returns true if the pattern has the given `ch`aracter(s)
+ *
+ * @param  {Object} `glob` The glob pattern.
+ * @param  {Object} `ch` The character to test for
+ * @return {Object}
+ */
+
+function has(is, glob, ch) {
+  return is && glob.indexOf(ch) !== -1;
+}
+
+/**
+ * Escape/unescape utils
+ */
+
+function escape(str) {
+  var re = /\{([^{}]*?)}|\(([^()]*?)\)|\[([^\[\]]*?)\]/g;
+  return str.replace(re, function (outter, braces, parens, brackets) {
+    var inner = braces || parens || brackets;
+    if (!inner) { return outter; }
+    return outter.split(inner).join(esc(inner));
+  });
+}
+
+function esc(str) {
+  str = str.split('/').join('__SLASH__');
+  str = str.split('.').join('__DOT__');
+  return str;
+}
+
+function unescape(str) {
+  str = str.split('__SLASH__').join('/');
+  str = str.split('__DOT__').join('.');
+  return str;
+}
+
+
+/***/ }),
+/* 774 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var isWindows = process.platform === 'win32';
+
+// Regex to split a windows path into three parts: [*, device, slash,
+// tail] windows-only
+var splitDeviceRe =
+    /^([a-zA-Z]:|[\\\/]{2}[^\\\/]+[\\\/]+[^\\\/]+)?([\\\/])?([\s\S]*?)$/;
+
+// Regex to split the tail part of the above into [*, dir, basename, ext]
+var splitTailRe =
+    /^([\s\S]*?)((?:\.{1,2}|[^\\\/]+?|)(\.[^.\/\\]*|))(?:[\\\/]*)$/;
+
+var win32 = {};
+
+// Function to split a filename into [root, dir, basename, ext]
+function win32SplitPath(filename) {
+  // Separate device+slash from tail
+  var result = splitDeviceRe.exec(filename),
+      device = (result[1] || '') + (result[2] || ''),
+      tail = result[3] || '';
+  // Split the tail into dir, basename and extension
+  var result2 = splitTailRe.exec(tail),
+      dir = result2[1],
+      basename = result2[2],
+      ext = result2[3];
+  return [device, dir, basename, ext];
+}
+
+win32.parse = function(pathString) {
+  if (typeof pathString !== 'string') {
+    throw new TypeError(
+        "Parameter 'pathString' must be a string, not " + typeof pathString
+    );
+  }
+  var allParts = win32SplitPath(pathString);
+  if (!allParts || allParts.length !== 4) {
+    throw new TypeError("Invalid path '" + pathString + "'");
+  }
+  return {
+    root: allParts[0],
+    dir: allParts[0] + allParts[1].slice(0, -1),
+    base: allParts[2],
+    ext: allParts[3],
+    name: allParts[2].slice(0, allParts[2].length - allParts[3].length)
+  };
+};
+
+
+
+// Split a filename into [root, dir, basename, ext], unix version
+// 'root' is just a slash, or nothing.
+var splitPathRe =
+    /^(\/?|)([\s\S]*?)((?:\.{1,2}|[^\/]+?|)(\.[^.\/]*|))(?:[\/]*)$/;
+var posix = {};
+
+
+function posixSplitPath(filename) {
+  return splitPathRe.exec(filename).slice(1);
+}
+
+
+posix.parse = function(pathString) {
+  if (typeof pathString !== 'string') {
+    throw new TypeError(
+        "Parameter 'pathString' must be a string, not " + typeof pathString
+    );
+  }
+  var allParts = posixSplitPath(pathString);
+  if (!allParts || allParts.length !== 4) {
+    throw new TypeError("Invalid path '" + pathString + "'");
+  }
+  allParts[1] = allParts[1] || '';
+  allParts[2] = allParts[2] || '';
+  allParts[3] = allParts[3] || '';
+
+  return {
+    root: allParts[0],
+    dir: allParts[0] + allParts[1].slice(0, -1),
+    base: allParts[2],
+    ext: allParts[3],
+    name: allParts[2].slice(0, allParts[2].length - allParts[3].length)
+  };
+};
+
+
+if (isWindows)
+  module.exports = win32.parse;
+else /* posix */
+  module.exports = posix.parse;
+
+module.exports.posix = posix.parse;
+module.exports.win32 = win32.parse;
+
+
+/***/ }),
+/* 775 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var duplexify = __webpack_require__(386)
+var through = __webpack_require__(461)
+var bufferFrom = __webpack_require__(595)
+
+var noop = function() {}
+
+var isObject = function(data) {
+  return !Buffer.isBuffer(data) && typeof data !== 'string'
+}
+
+var peek = function(opts, onpeek) {
+  if (typeof opts === 'number') opts = {maxBuffer:opts}
+  if (typeof opts === 'function') return peek(null, opts)
+  if (!opts) opts = {}
+
+  var maxBuffer = typeof opts.maxBuffer === 'number' ? opts.maxBuffer : 65535
+  var strict = opts.strict
+  var newline = opts.newline !== false
+
+  var buffer = []
+  var bufferSize = 0
+  var dup = duplexify.obj()
+
+  var peeker = through.obj({highWaterMark:1}, function(data, enc, cb) {
+    if (isObject(data)) return ready(data, null, cb)
+    if (!Buffer.isBuffer(data)) data = bufferFrom(data)
+
+    if (newline) {
+      var nl = Array.prototype.indexOf.call(data, 10)
+      if (nl > 0 && data[nl-1] === 13) nl--
+
+      if (nl > -1) {
+        buffer.push(data.slice(0, nl))
+        return ready(Buffer.concat(buffer), data.slice(nl), cb)
+      }
+    }
+
+    buffer.push(data)
+    bufferSize += data.length
+
+    if (bufferSize < maxBuffer) return cb()
+    if (strict) return cb(new Error('No newline found'))
+    ready(Buffer.concat(buffer), null, cb)
+  })
+
+  var onpreend = function() {
+    if (strict) return dup.destroy(new Error('No newline found'))
+    dup.cork()
+    ready(Buffer.concat(buffer), null, function(err) {
+      if (err) return dup.destroy(err)
+      dup.uncork()
+    })
+  }
+
+  var ready = function(data, overflow, cb) {
+    dup.removeListener('preend', onpreend)
+    onpeek(data, function(err, parser) {
+      if (err) return cb(err)
+
+      dup.setWritable(parser)
+      dup.setReadable(parser)
+
+      if (data) parser.write(data)
+      if (overflow) parser.write(overflow)
+
+      overflow = buffer = peeker = null // free the data
+      cb()
+    })
+  }
+
+  dup.on('preend', onpreend)
+  dup.setWritable(peeker)
+
+  return dup
+}
+
+module.exports = peek
+
+
+/***/ }),
+/* 776 */
+/***/ (function(module, exports) {
+
+// Generated by CoffeeScript 1.12.2
+(function() {
+  var getNanoSeconds, hrtime, loadTime, moduleLoadTime, nodeLoadTime, upTime;
+
+  if ((typeof performance !== "undefined" && performance !== null) && performance.now) {
+    module.exports = function() {
+      return performance.now();
+    };
+  } else if ((typeof process !== "undefined" && process !== null) && process.hrtime) {
+    module.exports = function() {
+      return (getNanoSeconds() - nodeLoadTime) / 1e6;
+    };
+    hrtime = process.hrtime;
+    getNanoSeconds = function() {
+      var hr;
+      hr = hrtime();
+      return hr[0] * 1e9 + hr[1];
+    };
+    moduleLoadTime = getNanoSeconds();
+    upTime = process.uptime() * 1e9;
+    nodeLoadTime = moduleLoadTime - upTime;
+  } else if (Date.now) {
+    module.exports = function() {
+      return Date.now() - loadTime;
+    };
+    loadTime = Date.now();
+  } else {
+    module.exports = function() {
+      return new Date().getTime() - loadTime;
+    };
+    loadTime = new Date().getTime();
+  }
+
+}).call(this);
+
+//# sourceMappingURL=performance-now.js.map
+
+
+/***/ }),
+/* 777 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = (url, opts) => {
+	if (typeof url !== 'string') {
+		throw new TypeError(`Expected \`url\` to be of type \`string\`, got \`${typeof url}\``);
+	}
+
+	url = url.trim();
+	opts = Object.assign({https: false}, opts);
+
+	if (/^\.*\/|^(?!localhost)\w+:/.test(url)) {
+		return url;
+	}
+
+	return url.replace(/^(?!(?:\w+:)?\/\/)/, opts.https ? 'https://' : 'http://');
+};
+
+
+/***/ }),
+/* 778 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*!
+ * preserve <https://github.com/jonschlinkert/preserve>
+ *
+ * Copyright (c) 2014-2015, Jon Schlinkert.
+ * Licensed under the MIT license.
+ */
+
+
+
+/**
+ * Replace tokens in `str` with a temporary, heuristic placeholder.
+ *
+ * ```js
+ * tokens.before('{a\\,b}');
+ * //=> '{__ID1__}'
+ * ```
+ *
+ * @param  {String} `str`
+ * @return {String} String with placeholders.
+ * @api public
+ */
+
+exports.before = function before(str, re) {
+  return str.replace(re, function (match) {
+    var id = randomize();
+    cache[id] = match;
+    return '__ID' + id + '__';
+  });
+};
+
+/**
+ * Replace placeholders in `str` with original tokens.
+ *
+ * ```js
+ * tokens.after('{__ID1__}');
+ * //=> '{a\\,b}'
+ * ```
+ *
+ * @param  {String} `str` String with placeholders
+ * @return {String} `str` String with original tokens.
+ * @api public
+ */
+
+exports.after = function after(str) {
+  return str.replace(/__ID(.{5})__/g, function (_, id) {
+    return cache[id];
+  });
+};
+
+function randomize() {
+  return Math.random().toString().slice(2, 7);
+}
+
+var cache = {};
+
+/***/ }),
+/* 779 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+function makeSync(fs, name) {
+    const fn = fs[`${name}Sync`];
+
+    return function () {
+        const callback = arguments[arguments.length - 1];
+        const args = Array.prototype.slice.call(arguments, 0, -1);
+        let ret;
+
+        try {
+            ret = fn.apply(fs, args);
+        } catch (err) {
+            return callback(err);
+        }
+
+        callback(null, ret);
+    };
+}
+
+function syncFs(fs) {
+    const fns = ['mkdir', 'realpath', 'stat', 'rmdir', 'utimes'];
+    const obj = {};
+
+    // Create the sync versions of the methods that we need
+    fns.forEach((name) => {
+        obj[name] = makeSync(fs, name);
+    });
+
+    // Copy the rest of the functions
+    for (const key in fs) {
+        if (!obj[key]) {
+            obj[key] = fs[key];
+        }
+    }
+
+    return obj;
+}
+
+module.exports = syncFs;
+
+
+/***/ }),
+/* 780 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+/**
+ * Key a method on your object with this symbol and you can get special
+ * formatting for that value! See ShellStringText, ShellStringUnquoted, or
+ * shellStringSemicolon for examples.
+ * @ignore
+ */
+const formatSymbol = Symbol('format');
+/**
+ * This symbol is for implementing advanced behaviors like the need for extra
+ * carets in Windows shell strings that use pipes. If present, it's called in
+ * an earlier phase than formatSymbol, and is passed a mutable context that can
+ * be read during the format phase to influence formatting.
+ * @ignore
+ */
+const preformatSymbol = Symbol('preformat');
+
+// When minimum Node version becomes 6, replace calls to sticky with /.../y and
+// inline execFrom.
+let stickySupported = true;
+try {
+  new RegExp('', 'y');
+} catch (e) {
+  stickySupported = false;
+}
+const sticky = stickySupported ? source => new RegExp(source, 'y') : source => new RegExp(`^(?:${source})`);
+const execFrom = stickySupported ? (re, haystack, index) => (re.lastIndex = index, re.exec(haystack)) : (re, haystack, index) => re.exec(haystack.substr(index));
+
+function quoteForCmd(text, forceQuote) {
+  let caretDepth = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+  // See the below blog post for an explanation of this function and
+  // quoteForWin32:
+  // https://blogs.msdn.microsoft.com/twistylittlepassagesallalike/2011/04/23/everyone-quotes-command-line-arguments-the-wrong-way/
+  if (!text.length) {
+    return '""';
+  }
+  if (/[\n\r]/.test(text)) {
+    throw new Error("Line breaks can't be quoted on Windows");
+  }
+  const caretEscape = /["%]/.test(text);
+  text = quoteForWin32(text, forceQuote || !caretEscape && /[&()<>^|]/.test(text));
+  if (caretEscape) {
+    // See Win32Context for explanation of what caretDepth is for.
+    do {
+      text = text.replace(/[\t "%&()<>^|]/g, '^$&');
+    } while (caretDepth--);
+  }
+  return text;
+}
+const quoteForWin32 = (text, forceQuote) => forceQuote || /[\t "]/.test(text) ? `"${text.replace(/\\+(?=$|")/g, '$&$&').replace(/"/g, '\\"')}"` : text;
+const cmdMetaChars = /[\t\n\r "%&()<>^|]/;
+class Win32Context {
+  constructor() {
+    this.currentScope = newScope(null);
+    this.scopesByObject = new Map();
+  }
+  read(text) {
+    // When cmd.exe pipes to or from a batch file, it spawns a second copy of
+    // itself to run the inner command. This necessitates doubling up on carets
+    // so that escaped characters survive both cmd.exe invocations. See:
+    // https://stackoverflow.com/questions/8192318/why-does-delayed-expansion-fail-when-inside-a-piped-block-of-code#8194279
+    // https://ss64.com/nt/syntax-redirection.html
+    //
+    // Parentheses can create an additional subshell, requiring additional
+    // escaping... it's a mess.
+    //
+    // So here's what we do about it: we read all unquoted text in a shell
+    // string and put it through this tiny parser that looks for pipes,
+    // sequence operators (&, &&, ||), and parentheses. This can't be part of
+    // the main Puka parsing, because it can be affected by `unquoted(...)`
+    // values provided at evaluation time.
+    //
+    // Then, after associating each thing that needs to be quoted with a scope
+    // (via `mark()`), we can determine the depth of caret escaping required
+    // in each scope and pass it (via `Formatter::quote()`) to `quoteForCmd()`.
+    //
+    // See also `ShellStringText`, which holds the logic for the previous
+    // paragraph.
+    const length = text.length;
+    for (let pos = 0, match; pos < length;) {
+      if (match = execFrom(reUnimportant, text, pos)) {
+        pos += match[0].length;
+      }
+      if (pos >= length) break;
+      if (match = execFrom(reSeqOp, text, pos)) {
+        this.seq();
+        pos += match[0].length;
+      } else {
+        const char = text.charCodeAt(pos);
+        if (char === CARET) {
+          pos += 2;
+        } else if (char === QUOTE) {
+          // If you were foolish enough to leave a dangling quotation mark in
+          // an unquoted span... you're likely to have bigger problems than
+          // incorrect escaping. So we just do the simplest thing of looking for
+          // the end quote only in this piece of text.
+          pos += execFrom(reNotQuote, text, pos + 1)[0].length + 2;
+        } else {
+          if (char === OPEN_PAREN) {
+            this.enterScope();
+          } else if (char === CLOSE_PAREN) {
+            this.exitScope();
+          } else {
+            // (char === '|')
+            this.currentScope.depthDelta = 1;
+          }
+          pos++;
+        }
+      }
+    }
+  }
+  enterScope() {
+    this.currentScope = newScope(this.currentScope);
+  }
+  exitScope() {
+    this.currentScope = this.currentScope.parent || (this.currentScope.parent = newScope(null));
+  }
+  seq() {
+    // | binds tighter than sequence operators, so the latter create new sibling
+    // scopes for future |s to mutate.
+    this.currentScope = newScope(this.currentScope.parent);
+  }
+  mark(obj) {
+    this.scopesByObject.set(obj, this.currentScope);
+  }
+  at(obj) {
+    return { depth: getDepth(this.scopesByObject.get(obj)) };
+  }
+}
+const getDepth = scope => scope === null ? 0 : scope.depth !== -1 ? scope.depth : scope.depth = getDepth(scope.parent) + scope.depthDelta;
+const newScope = parent => ({ parent, depthDelta: 0, depth: -1 });
+const CARET = '^'.charCodeAt();
+const QUOTE = '"'.charCodeAt();
+const OPEN_PAREN = '('.charCodeAt();
+const CLOSE_PAREN = ')'.charCodeAt();
+const reNotQuote = sticky('[^"]*');
+const reSeqOp = sticky('&&?|\\|\\|');
+const reUnimportant = sticky('(?:>&|[^"$&()^|])+');
+
+const quoteForSh = (text, forceQuote) => text.length ? forceQuote || shMetaChars.test(text) ? `'${text.replace(/'/g, "'\\''")}'`.replace(/^(?:'')+(?!$)/, '').replace(/\\'''/g, "\\'") : text : "''";
+const shMetaChars = /[\t\n\r "#$&'()*;<>?\\`|~]/;
+
+/**
+ * To get a Formatter, call `Formatter.for`.
+ *
+ * To create a new Formatter, pass an object to `Formatter.declare`.
+ *
+ * To set the global default Formatter, assign to `Formatter.default`.
+ *
+ * @class
+ * @property {Formatter} default - The Formatter to be used when no platform
+ * is provided—for example, when creating strings with `sh`.
+ * @ignore
+ */
+function Formatter() {}
+Object.assign(Formatter, /** @lends Formatter */{
+  /**
+   * Gets a Formatter that has been declared for the provided platform, or
+   * the base `'sh'` formatter if there is no Formatter specific to this
+   * platform, or the Formatter for the current platform if no specific platform
+   * is provided.
+   */
+  for(platform) {
+    return platform == null ? Formatter.default || (Formatter.default = Formatter.for(process.platform)) : Formatter._registry.get(platform) || Formatter._registry.get('sh');
+  },
+  /**
+   * Creates a new Formatter or mutates the properties on an existing
+   * Formatter. The `platform` key on the provided properties object determines
+   * when the Formatter is retrieved.
+   */
+  declare(props) {
+    const platform = props && props.platform || 'sh';
+    const existingFormatter = Formatter._registry.get(platform);
+    const formatter = Object.assign(existingFormatter || new Formatter(), props);
+    formatter.emptyString === void 0 && (formatter.emptyString = formatter.quote('', true));
+    existingFormatter || Formatter._registry.set(formatter.platform, formatter);
+  },
+  _registry: new Map(),
+  prototype: {
+    platform: 'sh',
+    quote: quoteForSh,
+    metaChars: shMetaChars,
+    hasExtraMetaChars: false,
+    statementSeparator: ';',
+    createContext() {
+      return defaultContext;
+    }
+  }
+});
+const defaultContext = {
+  at() {}
+};
+Formatter.declare();
+Formatter.declare({
+  platform: 'win32',
+  quote(text, forceQuote, opts) {
+    return quoteForCmd(text, forceQuote, opts && opts.depth || 0);
+  },
+  metaChars: cmdMetaChars,
+  hasExtraMetaChars: true,
+  statementSeparator: '&',
+  createContext(root) {
+    const context = new this.Context();
+    root[preformatSymbol](context);
+    return context;
+  },
+  Context: Win32Context
+});
+
+const isObject = any => any === Object(any);
+function memoize(f) {
+  const cache = new WeakMap();
+  return arg => {
+    let result = cache.get(arg);
+    if (result === void 0) {
+      result = f(arg);
+      cache.set(arg, result);
+    }
+    return result;
+  };
+}
+
+/**
+ * Represents a contiguous span of text that may or must be quoted. The contents
+ * may already contain quoted segments, which will always be quoted. If unquoted
+ * segments also require quoting, the entire span will be quoted together.
+ * @ignore
+ */
+class ShellStringText {
+  constructor(contents, untested) {
+    this.contents = contents;
+    this.untested = untested;
+  }
+  [formatSymbol](formatter, context) {
+    const unformattedContents = this.contents;
+    const length = unformattedContents.length;
+    const contents = new Array(length);
+    for (let i = 0; i < length; i++) {
+      const c = unformattedContents[i];
+      contents[i] = isObject(c) && formatSymbol in c ? c[formatSymbol](formatter) : c;
+    }
+    for (let unquoted = true, i = 0; i < length; i++) {
+      const content = contents[i];
+      if (content === null) {
+        unquoted = !unquoted;
+      } else {
+        if (unquoted && (formatter.hasExtraMetaChars || this.untested && this.untested.has(i)) && formatter.metaChars.test(content)) {
+          return formatter.quote(contents.join(''), false, context.at(this));
+        }
+      }
+    }
+    const parts = [];
+    for (let quoted = null, i = 0; i < length; i++) {
+      const content = contents[i];
+      if (content === null) {
+        quoted = quoted ? (parts.push(formatter.quote(quoted.join(''), true, context.at(this))), null) : [];
+      } else {
+        (quoted || parts).push(content);
+      }
+    }
+    const result = parts.join('');
+    return result.length ? result : formatter.emptyString;
+  }
+  [preformatSymbol](context) {
+    context.mark(this);
+  }
+}
+
+/**
+ * Represents a contiguous span of text that will not be quoted.
+ * @ignore
+ */
+class ShellStringUnquoted {
+  constructor(value) {
+    this.value = value;
+  }
+  [formatSymbol]() {
+    return this.value;
+  }
+  [preformatSymbol](context) {
+    context.read(this.value);
+  }
+}
+
+/**
+ * Represents a semicolon... or an ampersand, on Windows.
+ * @ignore
+ */
+const shellStringSemicolon = {
+  [formatSymbol](formatter) {
+    return formatter.statementSeparator;
+  },
+  [preformatSymbol](context) {
+    context.seq();
+  }
+};
+
+const PLACEHOLDER = {};
+const parse = memoize(templateSpans => {
+  // These are the token types our DSL can recognize. Their values won't escape
+  // this function.
+  const TOKEN_TEXT = 0;
+  const TOKEN_QUOTE = 1;
+  const TOKEN_SEMI = 2;
+  const TOKEN_UNQUOTED = 3;
+  const TOKEN_SPACE = 4;
+  const TOKEN_REDIRECT = 5;
+  const result = [];
+  let placeholderCount = 0;
+  let prefix = null;
+  let onlyPrefixOnce = false;
+  let contents = [];
+  let quote = 0;
+  const lastSpan = templateSpans.length - 1;
+  for (let spanIndex = 0; spanIndex <= lastSpan; spanIndex++) {
+    const templateSpan = templateSpans[spanIndex];
+    const posEnd = templateSpan.length;
+    let tokenStart = 0;
+    if (spanIndex) {
+      placeholderCount++;
+      contents.push(PLACEHOLDER);
+    }
+    // For each span, we first do a recognizing pass in which we use regular
+    // expressions to identify the positions of tokens in the text, and then
+    // a second pass that actually splits the text into the minimum number of
+    // substrings necessary.
+    const recognized = []; // [type1, index1, type2, index2...]
+    let firstWordBreak = -1;
+    let lastWordBreak = -1;
+    {
+      let pos = 0,
+          match;
+      while (pos < posEnd) {
+        if (quote) {
+          if (match = execFrom(quote === CHAR_SQUO ? reQuotation1 : reQuotation2, templateSpan, pos)) {
+            recognized.push(TOKEN_TEXT, pos);
+            pos += match[0].length;
+          }
+          if (pos < posEnd) {
+            recognized.push(TOKEN_QUOTE, pos++);
+            quote = 0;
+          }
+        } else {
+          if (match = execFrom(reText, templateSpan, pos)) {
+            const setBreaks = match[1] != null;
+            setBreaks && firstWordBreak < 0 && (firstWordBreak = pos);
+            recognized.push(setBreaks ? TOKEN_UNQUOTED : TOKEN_TEXT, pos);
+            pos += match[0].length;
+            setBreaks && (lastWordBreak = pos);
+          }
+          if (match = execFrom(reRedirectOrSpace, templateSpan, pos)) {
+            firstWordBreak < 0 && (firstWordBreak = pos);
+            lastWordBreak = pos;
+            recognized.push(match[1] ? TOKEN_REDIRECT : TOKEN_SPACE, pos);
+            pos += match[0].length;
+          }
+          const char = templateSpan.charCodeAt(pos);
+          if (char === CHAR_SEMI) {
+            firstWordBreak < 0 && (firstWordBreak = pos);
+            recognized.push(TOKEN_SEMI, pos++);
+            lastWordBreak = pos;
+          } else if (char === CHAR_SQUO || char === CHAR_DQUO) {
+            recognized.push(TOKEN_QUOTE, pos++);
+            quote = char;
+          }
+        }
+      }
+    }
+    // Word breaks are only important if they separate words with placeholders,
+    // so we can ignore the first/last break if this is the first/last span.
+    spanIndex === 0 && (firstWordBreak = -1);
+    spanIndex === lastSpan && (lastWordBreak = posEnd);
+    // Here begins the second pass mentioned above. This loop runs one more
+    // iteration than there are tokens in recognized, because it handles tokens
+    // on a one-iteration delay; hence the i <= iEnd instead of i < iEnd.
+    const iEnd = recognized.length;
+    for (let i = 0, type = -1; i <= iEnd; i += 2) {
+      let typeNext = -1,
+          pos;
+      if (i === iEnd) {
+        pos = posEnd;
+      } else {
+        typeNext = recognized[i];
+        pos = recognized[i + 1];
+        // If the next token is space or redirect, but there's another word
+        // break in this span, then we can handle that token the same way we
+        // would handle unquoted text because it isn't being attached to a
+        // placeholder.
+        typeNext >= TOKEN_SPACE && pos !== lastWordBreak && (typeNext = TOKEN_UNQUOTED);
+      }
+      const breakHere = pos === firstWordBreak || pos === lastWordBreak;
+      if (pos && (breakHere || typeNext !== type)) {
+        let value = type === TOKEN_QUOTE ? null : type === TOKEN_SEMI ? shellStringSemicolon : templateSpan.substring(tokenStart, pos);
+        if (type >= TOKEN_SEMI) {
+          // This branch handles semicolons, unquoted text, spaces, and
+          // redirects. shellStringSemicolon is already a formatSymbol object;
+          // the rest need to be wrapped.
+          type === TOKEN_SEMI || (value = new ShellStringUnquoted(value));
+          // We don't need to check placeholderCount here like we do below;
+          // that's only relevant during the first word break of the span, and
+          // because this iteration of the loop is processing the token that
+          // was checked for breaks in the previous iteration, it will have
+          // already been handled. For the same reason, prefix is guaranteed to
+          // be null.
+          if (contents.length) {
+            result.push(new ShellStringText(contents, null));
+            contents = [];
+          }
+          // Only spaces and redirects become prefixes, but not if they've been
+          // rewritten to unquoted above.
+          if (type >= TOKEN_SPACE) {
+            prefix = value;
+            onlyPrefixOnce = type === TOKEN_SPACE;
+          } else {
+            result.push(value);
+          }
+        } else {
+          contents.push(value);
+        }
+        tokenStart = pos;
+      }
+      if (breakHere) {
+        if (placeholderCount) {
+          result.push({ contents, placeholderCount, prefix, onlyPrefixOnce });
+        } else {
+          // There's no prefix to handle in this branch; a prefix prior to this
+          // span would mean placeholderCount > 0, and a prefix in this span
+          // can't be created because spaces and redirects get rewritten to
+          // unquoted before the last word break.
+          contents.length && result.push(new ShellStringText(contents, null));
+        }
+        placeholderCount = 0;prefix = null;onlyPrefixOnce = false;
+        contents = [];
+      }
+      type = typeNext;
+    }
+  }
+  if (quote) {
+    throw new SyntaxError(`String is missing a ${String.fromCharCode(quote)} character`);
+  }
+  return result;
+});
+const CHAR_SEMI = ';'.charCodeAt();
+const CHAR_SQUO = "'".charCodeAt();
+const CHAR_DQUO = '"'.charCodeAt();
+const reQuotation1 = sticky("[^']+");
+const reQuotation2 = sticky('[^"]+');
+const reText = sticky('[^\\s"#$&\'();<>\\\\`|]+|([#$&()\\\\`|]+)');
+const reRedirectOrSpace = sticky('((?:\\s+\\d+|\\s*)[<>]+\\s*)|\\s+');
+
+class BitSet {
+  constructor() {
+    this.vector = new Int32Array(1);
+  }
+  has(n) {
+    return (this.vector[n >>> 5] & 1 << n) !== 0;
+  }
+  add(n) {
+    const i = n >>> 5,
+          requiredLength = i + 1;
+    let vector = this.vector;var _vector = vector;
+    let length = _vector.length;
+    if (requiredLength > length) {
+      while (requiredLength > (length *= 2));
+      const oldValues = vector;
+      vector = new Int32Array(length);
+      vector.set(oldValues);
+      this.vector = vector;
+    }
+    vector[i] |= 1 << n;
+  }
+}
+
+function evaluate(template, values) {
+  values = values.map(toStringishArray);
+  const children = [];
+  let valuesStart = 0;
+  for (let i = 0, iMax = template.length; i < iMax; i++) {
+    const word = template[i];
+    if (formatSymbol in word) {
+      children.push(word);
+      continue;
+    }
+    const contents = word.contents,
+          placeholderCount = word.placeholderCount,
+          prefix = word.prefix,
+          onlyPrefixOnce = word.onlyPrefixOnce;
+    const kMax = contents.length;
+    const valuesEnd = valuesStart + placeholderCount;
+    const tuples = cartesianProduct(values, valuesStart, valuesEnd);
+    valuesStart = valuesEnd;
+    for (let j = 0, jMax = tuples.length; j < jMax; j++) {
+      const needSpace = j > 0;
+      const tuple = tuples[j];
+      (needSpace || prefix) && children.push(needSpace && (onlyPrefixOnce || !prefix) ? unquotedSpace : prefix);
+      let interpolatedContents = [];
+      let untested = null;
+      let quoting = false;
+      let tupleIndex = 0;
+      for (let k = 0; k < kMax; k++) {
+        const content = contents[k];
+        if (content === PLACEHOLDER) {
+          const value = tuple[tupleIndex++];
+          if (quoting) {
+            interpolatedContents.push(value);
+          } else {
+            if (isObject(value) && formatSymbol in value) {
+              if (interpolatedContents.length) {
+                children.push(new ShellStringText(interpolatedContents, untested));
+                interpolatedContents = [];
+                untested = null;
+              }
+              children.push(value);
+            } else {
+              (untested || (untested = new BitSet())).add(interpolatedContents.length);
+              interpolatedContents.push(value);
+            }
+          }
+        } else {
+          interpolatedContents.push(content);
+          content === null && (quoting = !quoting);
+        }
+      }
+      if (interpolatedContents.length) {
+        children.push(new ShellStringText(interpolatedContents, untested));
+      }
+    }
+  }
+  return children;
+}
+const primToStringish = value => value == null ? '' + value : value;
+function toStringishArray(value) {
+  let array;
+  switch (true) {
+    default:
+      if (isObject(value)) {
+        if (Array.isArray(value)) {
+          array = value;break;
+        }
+        if (Symbol.iterator in value) {
+          array = Array.from(value);break;
+        }
+      }
+      array = [value];
+  }
+  return array.map(primToStringish);
+}
+function cartesianProduct(arrs, start, end) {
+  const size = end - start;
+  let resultLength = 1;
+  for (let i = start; i < end; i++) {
+    resultLength *= arrs[i].length;
+  }
+  if (resultLength > 1e6) {
+    throw new RangeError("Far too many elements to interpolate");
+  }
+  const result = new Array(resultLength);
+  const indices = new Array(size).fill(0);
+  for (let i = 0; i < resultLength; i++) {
+    const value = result[i] = new Array(size);
+    for (let j = 0; j < size; j++) {
+      value[j] = arrs[j + start][indices[j]];
+    }
+    for (let j = size - 1; j >= 0; j--) {
+      if (++indices[j] < arrs[j + start].length) break;
+      indices[j] = 0;
+    }
+  }
+  return result;
+}
+const unquotedSpace = new ShellStringUnquoted(' ');
+
+/**
+ * A ShellString represents a shell command after it has been interpolated, but
+ * before it has been formatted for a particular platform. ShellStrings are
+ * useful if you want to prepare a command for a different platform than the
+ * current one, for instance.
+ *
+ * To create a ShellString, use `ShellString.sh` the same way you would use
+ * top-level `sh`.
+ */
+class ShellString {
+  /** @hideconstructor */
+  constructor(children) {
+    this.children = children;
+  }
+  /**
+   * `ShellString.sh` is a template tag just like `sh`; the only difference is
+   * that this function returns a ShellString which has not yet been formatted
+   * into a String.
+   * @returns {ShellString}
+   * @function sh
+   * @static
+   * @memberof ShellString
+   */
+  static sh(templateSpans) {
+    for (var _len = arguments.length, values = Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+      values[_key - 1] = arguments[_key];
+    }
+    return new ShellString(evaluate(parse(templateSpans), values));
+  }
+  /**
+   * A method to format a ShellString into a regular String formatted for a
+   * particular platform.
+   *
+   * @param {String} [platform] a value that `process.platform` might take:
+   * `'win32'`, `'linux'`, etc.; determines how the string is to be formatted.
+   * When omitted, effectively the same as `process.platform`.
+   * @returns {String}
+   */
+  toString(platform) {
+    return this[formatSymbol](Formatter.for(platform));
+  }
+  [formatSymbol](formatter) {
+    let context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : formatter.createContext(this);
+    return this.children.map(child => child[formatSymbol](formatter, context)).join('');
+  }
+  [preformatSymbol](context) {
+    const children = this.children;
+    for (let i = 0, iMax = children.length; i < iMax; i++) {
+      const child = children[i];
+      if (preformatSymbol in child) {
+        child[preformatSymbol](context);
+      }
+    }
+  }
+}
+
+/**
+ * A Windows-specific version of {@link quoteForShell}.
+ * @param {String} text to be quoted
+ * @param {Boolean} [forceQuote] whether to always add quotes even if the string
+ * is already safe. Defaults to `false`.
+ */
+
+/**
+ * A Unix-specific version of {@link quoteForShell}.
+ * @param {String} text to be quoted
+ * @param {Boolean} [forceQuote] whether to always add quotes even if the string
+ * is already safe. Defaults to `false`.
+ */
+
+/**
+ * Quotes a string for injecting into a shell command.
+ *
+ * This function is exposed for some hypothetical case when the `sh` DSL simply
+ * won't do; `sh` is expected to be the more convenient option almost always.
+ * Compare:
+ *
+ * ```javascript
+ * console.log('cmd' + args.map(a => ' ' + quoteForShell(a)).join(''));
+ * console.log(sh`cmd ${args}`); // same as above
+ *
+ * console.log('cmd' + args.map(a => ' ' + quoteForShell(a, true)).join(''));
+ * console.log(sh`cmd "${args}"`); // same as above
+ * ```
+ *
+ * Additionally, on Windows, `sh` checks the entire command string for pipes,
+ * which subtly change how arguments need to be quoted. If your commands may
+ * involve pipes, you are strongly encouraged to use `sh` and not try to roll
+ * your own with `quoteForShell`.
+ *
+ * @param {String} text to be quoted
+ * @param {Boolean} [forceQuote] whether to always add quotes even if the string
+ * is already safe. Defaults to `false`.
+ * @param {String} [platform] a value that `process.platform` might take:
+ * `'win32'`, `'linux'`, etc.; determines how the string is to be formatted.
+ * When omitted, effectively the same as `process.platform`.
+ *
+ * @returns {String} a string that is safe for the current (or specified)
+ * platform.
+ */
+function quoteForShell(text, forceQuote, platform) {
+  return Formatter.for(platform).quote(text, forceQuote);
+}
+
+/**
+ * A string template tag for safely constructing cross-platform shell commands.
+ *
+ * An `sh` template is not actually treated as a literal string to be
+ * interpolated; instead, it is a tiny DSL designed to make working with shell
+ * strings safe, simple, and straightforward. To get started quickly, see the
+ * examples below. {@link #the-sh-dsl More detailed documentation} is available
+ * further down.
+ *
+ * @name sh
+ * @example
+ * const title = '"this" & "that"';
+ * sh`script --title=${title}`; // => "script '--title=\"this\" & \"that\"'"
+ * // Note: these examples show results for non-Windows platforms.
+ * // On Windows, the above would instead be
+ * // 'script ^"--title=\\^"this\\^" ^& \\^"that\\^"^"'.
+ *
+ * const names = ['file1', 'file 2'];
+ * sh`rimraf ${names}.txt`; // => "rimraf file1.txt 'file 2.txt'"
+ *
+ * const cmd1 = ['cat', 'file 1.txt', 'file 2.txt'];
+ * const cmd2 = ['use-input', '-abc'];
+ * sh`${cmd1}|${cmd2}`; // => "cat 'file 1.txt' 'file 2.txt'|use-input -abc"
+ *
+ * @returns {String} - a string formatted for the platform Node is currently
+ * running on.
+ */
+const sh = function () {
+  return ShellString.sh.apply(ShellString, arguments).toString();
+};
+
+/**
+ * This function permits raw strings to be interpolated into a `sh` template.
+ *
+ * **IMPORTANT**: If you're using Puka due to security concerns, make sure you
+ * don't pass any untrusted content to `unquoted`. This may be obvious, but
+ * stray punctuation in an `unquoted` section can compromise the safety of the
+ * entire shell command.
+ *
+ * @param value - any value (it will be treated as a string)
+ *
+ * @example
+ * const both = true;
+ * sh`foo ${unquoted(both ? '&&' : '||')} bar`; // => 'foo && bar'
+ */
+const unquoted = value => new ShellStringUnquoted(value);
+
+exports.Formatter = Formatter;
+exports.ShellString = ShellString;
+exports.ShellStringText = ShellStringText;
+exports.ShellStringUnquoted = ShellStringUnquoted;
+exports.quoteForCmd = quoteForCmd;
+exports.quoteForSh = quoteForSh;
+exports.quoteForShell = quoteForShell;
+exports.sh = sh;
+exports.shellStringSemicolon = shellStringSemicolon;
+exports.formatSymbol = formatSymbol;
+exports.preformatSymbol = preformatSymbol;
+exports.unquoted = unquoted;
+
+
+/***/ }),
+/* 781 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var once = __webpack_require__(83)
+var eos = __webpack_require__(173)
+var fs = __webpack_require__(5) // we only need fs to get the ReadStream and WriteStream prototypes
+
+var noop = function () {}
+
+var isFn = function (fn) {
+  return typeof fn === 'function'
+}
+
+var isFS = function (stream) {
+  if (!fs) return false // browser
+  return (stream instanceof (fs.ReadStream || noop) || stream instanceof (fs.WriteStream || noop)) && isFn(stream.close)
+}
+
+var isRequest = function (stream) {
+  return stream.setHeader && isFn(stream.abort)
+}
+
+var destroyer = function (stream, reading, writing, callback) {
+  callback = once(callback)
+
+  var closed = false
+  stream.on('close', function () {
+    closed = true
+  })
+
+  eos(stream, {readable: reading, writable: writing}, function (err) {
+    if (err) return callback(err)
+    closed = true
+    callback()
+  })
+
+  var destroyed = false
+  return function (err) {
+    if (closed) return
+    if (destroyed) return
+    destroyed = true
+
+    if (isFS(stream)) return stream.close(noop) // use close for fs streams to avoid fd leaks
+    if (isRequest(stream)) return stream.abort() // request.destroy just do .end - .abort is what we want
+
+    if (isFn(stream.destroy)) return stream.destroy()
+
+    callback(err || new Error('stream was destroyed'))
+  }
+}
+
+var call = function (fn) {
+  fn()
+}
+
+var pipe = function (from, to) {
+  return from.pipe(to)
+}
+
+var pump = function () {
+  var streams = Array.prototype.slice.call(arguments)
+  var callback = isFn(streams[streams.length - 1] || noop) && streams.pop() || noop
+
+  if (Array.isArray(streams[0])) streams = streams[0]
+  if (streams.length < 2) throw new Error('pump requires two streams per minimum')
+
+  var error
+  var destroys = streams.map(function (stream, i) {
+    var reading = i < streams.length - 1
+    var writing = i > 0
+    return destroyer(stream, reading, writing, function (err) {
+      if (!error) error = err
+      if (err) destroys.forEach(call)
+      if (reading) return
+      destroys.forEach(call)
+      callback(error)
+    })
+  })
+
+  return streams.reduce(pipe)
+}
+
+module.exports = pump
+
+
+/***/ }),
+/* 782 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var pump = __webpack_require__(783)
+var inherits = __webpack_require__(61)
+var Duplexify = __webpack_require__(386)
+
+var toArray = function(args) {
+  if (!args.length) return []
+  return Array.isArray(args[0]) ? args[0] : Array.prototype.slice.call(args)
+}
+
+var define = function(opts) {
+  var Pumpify = function() {
+    var streams = toArray(arguments)
+    if (!(this instanceof Pumpify)) return new Pumpify(streams)
+    Duplexify.call(this, null, null, opts)
+    if (streams.length) this.setPipeline(streams)
+  }
+
+  inherits(Pumpify, Duplexify)
+
+  Pumpify.prototype.setPipeline = function() {
+    var streams = toArray(arguments)
+    var self = this
+    var ended = false
+    var w = streams[0]
+    var r = streams[streams.length-1]
+
+    r = r.readable ? r : null
+    w = w.writable ? w : null
+
+    var onclose = function() {
+      streams[0].emit('error', new Error('stream was destroyed'))
+    }
+
+    this.on('close', onclose)
+    this.on('prefinish', function() {
+      if (!ended) self.cork()
+    })
+
+    pump(streams, function(err) {
+      self.removeListener('close', onclose)
+      if (err) return self.destroy(err.message === 'premature close' ? null : err)
+      ended = true
+      // pump ends after the last stream is not writable *but*
+      // pumpify still forwards the readable part so we need to catch errors
+      // still, so reenable autoDestroy in this case
+      if (self._autoDestroy === false) self._autoDestroy = true
+      self.uncork()
+    })
+
+    if (this.destroyed) return onclose()
+    this.setWritable(w)
+    this.setReadable(r)
+  }
+
+  return Pumpify
+}
+
+module.exports = define({autoDestroy:false, destroy:false})
+module.exports.obj = define({autoDestroy: false, destroy:false, objectMode:true, highWaterMark:16})
+module.exports.ctor = define
+
+
+/***/ }),
+/* 783 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var once = __webpack_require__(83)
+var eos = __webpack_require__(173)
+var fs = __webpack_require__(5) // we only need fs to get the ReadStream and WriteStream prototypes
+
+var noop = function () {}
+var ancient = /^v?\.0/.test(process.version)
+
+var isFn = function (fn) {
+  return typeof fn === 'function'
+}
+
+var isFS = function (stream) {
+  if (!ancient) return false // newer node version do not need to care about fs is a special way
+  if (!fs) return false // browser
+  return (stream instanceof (fs.ReadStream || noop) || stream instanceof (fs.WriteStream || noop)) && isFn(stream.close)
+}
+
+var isRequest = function (stream) {
+  return stream.setHeader && isFn(stream.abort)
+}
+
+var destroyer = function (stream, reading, writing, callback) {
+  callback = once(callback)
+
+  var closed = false
+  stream.on('close', function () {
+    closed = true
+  })
+
+  eos(stream, {readable: reading, writable: writing}, function (err) {
+    if (err) return callback(err)
+    closed = true
+    callback()
+  })
+
+  var destroyed = false
+  return function (err) {
+    if (closed) return
+    if (destroyed) return
+    destroyed = true
+
+    if (isFS(stream)) return stream.close(noop) // use close for fs streams to avoid fd leaks
+    if (isRequest(stream)) return stream.abort() // request.destroy just do .end - .abort is what we want
+
+    if (isFn(stream.destroy)) return stream.destroy()
+
+    callback(err || new Error('stream was destroyed'))
+  }
+}
+
+var call = function (fn) {
+  fn()
+}
+
+var pipe = function (from, to) {
+  return from.pipe(to)
+}
+
+var pump = function () {
+  var streams = Array.prototype.slice.call(arguments)
+  var callback = isFn(streams[streams.length - 1] || noop) && streams.pop() || noop
+
+  if (Array.isArray(streams[0])) streams = streams[0]
+  if (streams.length < 2) throw new Error('pump requires two streams per minimum')
+
+  var error
+  var destroys = streams.map(function (stream, i) {
+    var reading = i < streams.length - 1
+    var writing = i > 0
+    return destroyer(stream, reading, writing, function (err) {
+      if (!error) error = err
+      if (err) destroys.forEach(call)
+      if (reading) return
+      destroys.forEach(call)
+      callback(error)
+    })
+  })
+
+  streams.reduce(pipe)
+}
+
+module.exports = pump
+
+
+/***/ }),
+/* 784 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var utils = __webpack_require__(405);
+
+var has = Object.prototype.hasOwnProperty;
+
+var defaults = {
+    allowDots: false,
+    allowPrototypes: false,
+    arrayLimit: 20,
+    decoder: utils.decode,
+    delimiter: '&',
+    depth: 5,
+    parameterLimit: 1000,
+    plainObjects: false,
+    strictNullHandling: false
+};
+
+var parseValues = function parseQueryStringValues(str, options) {
+    var obj = {};
+    var cleanStr = options.ignoreQueryPrefix ? str.replace(/^\?/, '') : str;
+    var limit = options.parameterLimit === Infinity ? undefined : options.parameterLimit;
+    var parts = cleanStr.split(options.delimiter, limit);
+
+    for (var i = 0; i < parts.length; ++i) {
+        var part = parts[i];
+
+        var bracketEqualsPos = part.indexOf(']=');
+        var pos = bracketEqualsPos === -1 ? part.indexOf('=') : bracketEqualsPos + 1;
+
+        var key, val;
+        if (pos === -1) {
+            key = options.decoder(part, defaults.decoder);
+            val = options.strictNullHandling ? null : '';
+        } else {
+            key = options.decoder(part.slice(0, pos), defaults.decoder);
+            val = options.decoder(part.slice(pos + 1), defaults.decoder);
+        }
+        if (has.call(obj, key)) {
+            obj[key] = [].concat(obj[key]).concat(val);
+        } else {
+            obj[key] = val;
+        }
+    }
+
+    return obj;
+};
+
+var parseObject = function (chain, val, options) {
+    var leaf = val;
+
+    for (var i = chain.length - 1; i >= 0; --i) {
+        var obj;
+        var root = chain[i];
+
+        if (root === '[]') {
+            obj = [];
+            obj = obj.concat(leaf);
+        } else {
+            obj = options.plainObjects ? Object.create(null) : {};
+            var cleanRoot = root.charAt(0) === '[' && root.charAt(root.length - 1) === ']' ? root.slice(1, -1) : root;
+            var index = parseInt(cleanRoot, 10);
+            if (
+                !isNaN(index)
+                && root !== cleanRoot
+                && String(index) === cleanRoot
+                && index >= 0
+                && (options.parseArrays && index <= options.arrayLimit)
+            ) {
+                obj = [];
+                obj[index] = leaf;
+            } else {
+                obj[cleanRoot] = leaf;
+            }
+        }
+
+        leaf = obj;
+    }
+
+    return leaf;
+};
+
+var parseKeys = function parseQueryStringKeys(givenKey, val, options) {
+    if (!givenKey) {
+        return;
+    }
+
+    // Transform dot notation to bracket notation
+    var key = options.allowDots ? givenKey.replace(/\.([^.[]+)/g, '[$1]') : givenKey;
+
+    // The regex chunks
+
+    var brackets = /(\[[^[\]]*])/;
+    var child = /(\[[^[\]]*])/g;
+
+    // Get the parent
+
+    var segment = brackets.exec(key);
+    var parent = segment ? key.slice(0, segment.index) : key;
+
+    // Stash the parent if it exists
+
+    var keys = [];
+    if (parent) {
+        // If we aren't using plain objects, optionally prefix keys
+        // that would overwrite object prototype properties
+        if (!options.plainObjects && has.call(Object.prototype, parent)) {
+            if (!options.allowPrototypes) {
+                return;
+            }
+        }
+
+        keys.push(parent);
+    }
+
+    // Loop through children appending to the array until we hit depth
+
+    var i = 0;
+    while ((segment = child.exec(key)) !== null && i < options.depth) {
+        i += 1;
+        if (!options.plainObjects && has.call(Object.prototype, segment[1].slice(1, -1))) {
+            if (!options.allowPrototypes) {
+                return;
+            }
+        }
+        keys.push(segment[1]);
+    }
+
+    // If there's a remainder, just add whatever is left
+
+    if (segment) {
+        keys.push('[' + key.slice(segment.index) + ']');
+    }
+
+    return parseObject(keys, val, options);
+};
+
+module.exports = function (str, opts) {
+    var options = opts ? utils.assign({}, opts) : {};
+
+    if (options.decoder !== null && options.decoder !== undefined && typeof options.decoder !== 'function') {
+        throw new TypeError('Decoder has to be a function.');
+    }
+
+    options.ignoreQueryPrefix = options.ignoreQueryPrefix === true;
+    options.delimiter = typeof options.delimiter === 'string' || utils.isRegExp(options.delimiter) ? options.delimiter : defaults.delimiter;
+    options.depth = typeof options.depth === 'number' ? options.depth : defaults.depth;
+    options.arrayLimit = typeof options.arrayLimit === 'number' ? options.arrayLimit : defaults.arrayLimit;
+    options.parseArrays = options.parseArrays !== false;
+    options.decoder = typeof options.decoder === 'function' ? options.decoder : defaults.decoder;
+    options.allowDots = typeof options.allowDots === 'boolean' ? options.allowDots : defaults.allowDots;
+    options.plainObjects = typeof options.plainObjects === 'boolean' ? options.plainObjects : defaults.plainObjects;
+    options.allowPrototypes = typeof options.allowPrototypes === 'boolean' ? options.allowPrototypes : defaults.allowPrototypes;
+    options.parameterLimit = typeof options.parameterLimit === 'number' ? options.parameterLimit : defaults.parameterLimit;
+    options.strictNullHandling = typeof options.strictNullHandling === 'boolean' ? options.strictNullHandling : defaults.strictNullHandling;
+
+    if (str === '' || str === null || typeof str === 'undefined') {
+        return options.plainObjects ? Object.create(null) : {};
+    }
+
+    var tempObj = typeof str === 'string' ? parseValues(str, options) : str;
+    var obj = options.plainObjects ? Object.create(null) : {};
+
+    // Iterate over the keys and setup the new object
+
+    var keys = Object.keys(tempObj);
+    for (var i = 0; i < keys.length; ++i) {
+        var key = keys[i];
+        var newObj = parseKeys(key, tempObj[key], options);
+        obj = utils.merge(obj, newObj, options);
+    }
+
+    return utils.compact(obj);
+};
+
+
+/***/ }),
+/* 785 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var utils = __webpack_require__(405);
+var formats = __webpack_require__(403);
+
+var arrayPrefixGenerators = {
+    brackets: function brackets(prefix) { // eslint-disable-line func-name-matching
+        return prefix + '[]';
+    },
+    indices: function indices(prefix, key) { // eslint-disable-line func-name-matching
+        return prefix + '[' + key + ']';
+    },
+    repeat: function repeat(prefix) { // eslint-disable-line func-name-matching
+        return prefix;
+    }
+};
+
+var toISO = Date.prototype.toISOString;
+
+var defaults = {
+    delimiter: '&',
+    encode: true,
+    encoder: utils.encode,
+    encodeValuesOnly: false,
+    serializeDate: function serializeDate(date) { // eslint-disable-line func-name-matching
+        return toISO.call(date);
+    },
+    skipNulls: false,
+    strictNullHandling: false
+};
+
+var stringify = function stringify( // eslint-disable-line func-name-matching
+    object,
+    prefix,
+    generateArrayPrefix,
+    strictNullHandling,
+    skipNulls,
+    encoder,
+    filter,
+    sort,
+    allowDots,
+    serializeDate,
+    formatter,
+    encodeValuesOnly
+) {
+    var obj = object;
+    if (typeof filter === 'function') {
+        obj = filter(prefix, obj);
+    } else if (obj instanceof Date) {
+        obj = serializeDate(obj);
+    } else if (obj === null) {
+        if (strictNullHandling) {
+            return encoder && !encodeValuesOnly ? encoder(prefix, defaults.encoder) : prefix;
+        }
+
+        obj = '';
+    }
+
+    if (typeof obj === 'string' || typeof obj === 'number' || typeof obj === 'boolean' || utils.isBuffer(obj)) {
+        if (encoder) {
+            var keyValue = encodeValuesOnly ? prefix : encoder(prefix, defaults.encoder);
+            return [formatter(keyValue) + '=' + formatter(encoder(obj, defaults.encoder))];
+        }
+        return [formatter(prefix) + '=' + formatter(String(obj))];
+    }
+
+    var values = [];
+
+    if (typeof obj === 'undefined') {
+        return values;
+    }
+
+    var objKeys;
+    if (Array.isArray(filter)) {
+        objKeys = filter;
+    } else {
+        var keys = Object.keys(obj);
+        objKeys = sort ? keys.sort(sort) : keys;
+    }
+
+    for (var i = 0; i < objKeys.length; ++i) {
+        var key = objKeys[i];
+
+        if (skipNulls && obj[key] === null) {
+            continue;
+        }
+
+        if (Array.isArray(obj)) {
+            values = values.concat(stringify(
+                obj[key],
+                generateArrayPrefix(prefix, key),
+                generateArrayPrefix,
+                strictNullHandling,
+                skipNulls,
+                encoder,
+                filter,
+                sort,
+                allowDots,
+                serializeDate,
+                formatter,
+                encodeValuesOnly
+            ));
+        } else {
+            values = values.concat(stringify(
+                obj[key],
+                prefix + (allowDots ? '.' + key : '[' + key + ']'),
+                generateArrayPrefix,
+                strictNullHandling,
+                skipNulls,
+                encoder,
+                filter,
+                sort,
+                allowDots,
+                serializeDate,
+                formatter,
+                encodeValuesOnly
+            ));
+        }
+    }
+
+    return values;
+};
+
+module.exports = function (object, opts) {
+    var obj = object;
+    var options = opts ? utils.assign({}, opts) : {};
+
+    if (options.encoder !== null && options.encoder !== undefined && typeof options.encoder !== 'function') {
+        throw new TypeError('Encoder has to be a function.');
+    }
+
+    var delimiter = typeof options.delimiter === 'undefined' ? defaults.delimiter : options.delimiter;
+    var strictNullHandling = typeof options.strictNullHandling === 'boolean' ? options.strictNullHandling : defaults.strictNullHandling;
+    var skipNulls = typeof options.skipNulls === 'boolean' ? options.skipNulls : defaults.skipNulls;
+    var encode = typeof options.encode === 'boolean' ? options.encode : defaults.encode;
+    var encoder = typeof options.encoder === 'function' ? options.encoder : defaults.encoder;
+    var sort = typeof options.sort === 'function' ? options.sort : null;
+    var allowDots = typeof options.allowDots === 'undefined' ? false : options.allowDots;
+    var serializeDate = typeof options.serializeDate === 'function' ? options.serializeDate : defaults.serializeDate;
+    var encodeValuesOnly = typeof options.encodeValuesOnly === 'boolean' ? options.encodeValuesOnly : defaults.encodeValuesOnly;
+    if (typeof options.format === 'undefined') {
+        options.format = formats['default'];
+    } else if (!Object.prototype.hasOwnProperty.call(formats.formatters, options.format)) {
+        throw new TypeError('Unknown format option provided.');
+    }
+    var formatter = formats.formatters[options.format];
+    var objKeys;
+    var filter;
+
+    if (typeof options.filter === 'function') {
+        filter = options.filter;
+        obj = filter('', obj);
+    } else if (Array.isArray(options.filter)) {
+        filter = options.filter;
+        objKeys = filter;
+    }
+
+    var keys = [];
+
+    if (typeof obj !== 'object' || obj === null) {
+        return '';
+    }
+
+    var arrayFormat;
+    if (options.arrayFormat in arrayPrefixGenerators) {
+        arrayFormat = options.arrayFormat;
+    } else if ('indices' in options) {
+        arrayFormat = options.indices ? 'indices' : 'repeat';
+    } else {
+        arrayFormat = 'indices';
+    }
+
+    var generateArrayPrefix = arrayPrefixGenerators[arrayFormat];
+
+    if (!objKeys) {
+        objKeys = Object.keys(obj);
+    }
+
+    if (sort) {
+        objKeys.sort(sort);
+    }
+
+    for (var i = 0; i < objKeys.length; ++i) {
+        var key = objKeys[i];
+
+        if (skipNulls && obj[key] === null) {
+            continue;
+        }
+
+        keys = keys.concat(stringify(
+            obj[key],
+            key,
+            generateArrayPrefix,
+            strictNullHandling,
+            skipNulls,
+            encode ? encoder : null,
+            filter,
+            sort,
+            allowDots,
+            serializeDate,
+            formatter,
+            encodeValuesOnly
+        ));
+    }
+
+    var joined = keys.join(delimiter);
+    var prefix = options.addQueryPrefix === true ? '?' : '';
+
+    return joined.length > 0 ? prefix + joined : '';
+};
+
+
+/***/ }),
+/* 786 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var strictUriEncode = __webpack_require__(943);
+var objectAssign = __webpack_require__(303);
+var decodeComponent = __webpack_require__(630);
+
+function encoderForArrayFormat(opts) {
+	switch (opts.arrayFormat) {
+		case 'index':
+			return function (key, value, index) {
+				return value === null ? [
+					encode(key, opts),
+					'[',
+					index,
+					']'
+				].join('') : [
+					encode(key, opts),
+					'[',
+					encode(index, opts),
+					']=',
+					encode(value, opts)
+				].join('');
+			};
+
+		case 'bracket':
+			return function (key, value) {
+				return value === null ? encode(key, opts) : [
+					encode(key, opts),
+					'[]=',
+					encode(value, opts)
+				].join('');
+			};
+
+		default:
+			return function (key, value) {
+				return value === null ? encode(key, opts) : [
+					encode(key, opts),
+					'=',
+					encode(value, opts)
+				].join('');
+			};
+	}
+}
+
+function parserForArrayFormat(opts) {
+	var result;
+
+	switch (opts.arrayFormat) {
+		case 'index':
+			return function (key, value, accumulator) {
+				result = /\[(\d*)\]$/.exec(key);
+
+				key = key.replace(/\[\d*\]$/, '');
+
+				if (!result) {
+					accumulator[key] = value;
+					return;
+				}
+
+				if (accumulator[key] === undefined) {
+					accumulator[key] = {};
+				}
+
+				accumulator[key][result[1]] = value;
+			};
+
+		case 'bracket':
+			return function (key, value, accumulator) {
+				result = /(\[\])$/.exec(key);
+				key = key.replace(/\[\]$/, '');
+
+				if (!result) {
+					accumulator[key] = value;
+					return;
+				} else if (accumulator[key] === undefined) {
+					accumulator[key] = [value];
+					return;
+				}
+
+				accumulator[key] = [].concat(accumulator[key], value);
+			};
+
+		default:
+			return function (key, value, accumulator) {
+				if (accumulator[key] === undefined) {
+					accumulator[key] = value;
+					return;
+				}
+
+				accumulator[key] = [].concat(accumulator[key], value);
+			};
+	}
+}
+
+function encode(value, opts) {
+	if (opts.encode) {
+		return opts.strict ? strictUriEncode(value) : encodeURIComponent(value);
+	}
+
+	return value;
+}
+
+function keysSorter(input) {
+	if (Array.isArray(input)) {
+		return input.sort();
+	} else if (typeof input === 'object') {
+		return keysSorter(Object.keys(input)).sort(function (a, b) {
+			return Number(a) - Number(b);
+		}).map(function (key) {
+			return input[key];
+		});
+	}
+
+	return input;
+}
+
+function extract(str) {
+	var queryStart = str.indexOf('?');
+	if (queryStart === -1) {
+		return '';
+	}
+	return str.slice(queryStart + 1);
+}
+
+function parse(str, opts) {
+	opts = objectAssign({arrayFormat: 'none'}, opts);
+
+	var formatter = parserForArrayFormat(opts);
+
+	// Create an object with no prototype
+	// https://github.com/sindresorhus/query-string/issues/47
+	var ret = Object.create(null);
+
+	if (typeof str !== 'string') {
+		return ret;
+	}
+
+	str = str.trim().replace(/^[?#&]/, '');
+
+	if (!str) {
+		return ret;
+	}
+
+	str.split('&').forEach(function (param) {
+		var parts = param.replace(/\+/g, ' ').split('=');
+		// Firefox (pre 40) decodes `%3D` to `=`
+		// https://github.com/sindresorhus/query-string/pull/37
+		var key = parts.shift();
+		var val = parts.length > 0 ? parts.join('=') : undefined;
+
+		// missing `=` should be `null`:
+		// http://w3.org/TR/2012/WD-url-20120524/#collect-url-parameters
+		val = val === undefined ? null : decodeComponent(val);
+
+		formatter(decodeComponent(key), val, ret);
+	});
+
+	return Object.keys(ret).sort().reduce(function (result, key) {
+		var val = ret[key];
+		if (Boolean(val) && typeof val === 'object' && !Array.isArray(val)) {
+			// Sort object keys, not values
+			result[key] = keysSorter(val);
+		} else {
+			result[key] = val;
+		}
+
+		return result;
+	}, Object.create(null));
+}
+
+exports.extract = extract;
+exports.parse = parse;
+
+exports.stringify = function (obj, opts) {
+	var defaults = {
+		encode: true,
+		strict: true,
+		arrayFormat: 'none'
+	};
+
+	opts = objectAssign(defaults, opts);
+
+	if (opts.sort === false) {
+		opts.sort = function () {};
+	}
+
+	var formatter = encoderForArrayFormat(opts);
+
+	return obj ? Object.keys(obj).sort(opts.sort).map(function (key) {
+		var val = obj[key];
+
+		if (val === undefined) {
+			return '';
+		}
+
+		if (val === null) {
+			return encode(key, opts);
+		}
+
+		if (Array.isArray(val)) {
+			var result = [];
+
+			val.slice().forEach(function (val2) {
+				if (val2 === undefined) {
+					return;
+				}
+
+				result.push(formatter(key, val2, result.length));
+			});
+
+			return result.join('&');
+		}
+
+		return encode(key, opts) + '=' + encode(val, opts);
+	}).filter(function (x) {
+		return x.length > 0;
+	}).join('&') : '';
+};
+
+exports.parseUrl = function (str, opts) {
+	return {
+		url: str.split('?')[0] || '',
+		query: parse(extract(str), opts)
+	};
+};
+
+
+/***/ }),
+/* 787 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*!
+ * randomatic <https://github.com/jonschlinkert/randomatic>
+ *
+ * Copyright (c) 2014-2017, Jon Schlinkert.
+ * Released under the MIT License.
+ */
+
+
+
+var isNumber = __webpack_require__(788);
+var typeOf = __webpack_require__(789);
+var mathRandom = __webpack_require__(751);
+
+/**
+ * Expose `randomatic`
+ */
+
+module.exports = randomatic;
+module.exports.isCrypto = !!mathRandom.cryptographic;
+
+/**
+ * Available mask characters
+ */
+
+var type = {
+  lower: 'abcdefghijklmnopqrstuvwxyz',
+  upper: 'ABCDEFGHIJKLMNOPQRSTUVWXYZ',
+  number: '0123456789',
+  special: '~!@#$%^&()_+-={}[];\',.'
+};
+
+type.all = type.lower + type.upper + type.number + type.special;
+
+/**
+ * Generate random character sequences of a specified `length`,
+ * based on the given `pattern`.
+ *
+ * @param {String} `pattern` The pattern to use for generating the random string.
+ * @param {String} `length` The length of the string to generate.
+ * @param {String} `options`
+ * @return {String}
+ * @api public
+ */
+
+function randomatic(pattern, length, options) {
+  if (typeof pattern === 'undefined') {
+    throw new Error('randomatic expects a string or number.');
+  }
+
+  var custom = false;
+  if (arguments.length === 1) {
+    if (typeof pattern === 'string') {
+      length = pattern.length;
+
+    } else if (isNumber(pattern)) {
+      options = {};
+      length = pattern;
+      pattern = '*';
+    }
+  }
+
+  if (typeOf(length) === 'object' && length.hasOwnProperty('chars')) {
+    options = length;
+    pattern = options.chars;
+    length = pattern.length;
+    custom = true;
+  }
+
+  var opts = options || {};
+  var mask = '';
+  var res = '';
+
+  // Characters to be used
+  if (pattern.indexOf('?') !== -1) mask += opts.chars;
+  if (pattern.indexOf('a') !== -1) mask += type.lower;
+  if (pattern.indexOf('A') !== -1) mask += type.upper;
+  if (pattern.indexOf('0') !== -1) mask += type.number;
+  if (pattern.indexOf('!') !== -1) mask += type.special;
+  if (pattern.indexOf('*') !== -1) mask += type.all;
+  if (custom) mask += pattern;
+
+  while (length--) {
+    res += mask.charAt(parseInt(mathRandom() * mask.length, 10));
+  }
+  return res;
+};
+
+
+/***/ }),
+/* 788 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*!
+ * is-number <https://github.com/jonschlinkert/is-number>
+ *
+ * Copyright (c) 2014-2017, Jon Schlinkert.
+ * Released under the MIT License.
+ */
+
+
+
+module.exports = function isNumber(num) {
+  var type = typeof num;
+
+  if (type === 'string' || num instanceof String) {
+    // an empty string would be coerced to true with the below logic
+    if (!num.trim()) return false;
+  } else if (type !== 'number' && !(num instanceof Number)) {
+    return false;
+  }
+
+  return (num - num + 1) >= 0;
+};
+
+
+/***/ }),
+/* 789 */
+/***/ (function(module, exports) {
+
+var toString = Object.prototype.toString;
+
+module.exports = function kindOf(val) {
+  if (val === void 0) return 'undefined';
+  if (val === null) return 'null';
+
+  var type = typeof val;
+  if (type === 'boolean') return 'boolean';
+  if (type === 'string') return 'string';
+  if (type === 'number') return 'number';
+  if (type === 'symbol') return 'symbol';
+  if (type === 'function') {
+    return isGeneratorFn(val) ? 'generatorfunction' : 'function';
+  }
+
+  if (isArray(val)) return 'array';
+  if (isBuffer(val)) return 'buffer';
+  if (isArguments(val)) return 'arguments';
+  if (isDate(val)) return 'date';
+  if (isError(val)) return 'error';
+  if (isRegexp(val)) return 'regexp';
+
+  switch (ctorName(val)) {
+    case 'Symbol': return 'symbol';
+    case 'Promise': return 'promise';
+
+    // Set, Map, WeakSet, WeakMap
+    case 'WeakMap': return 'weakmap';
+    case 'WeakSet': return 'weakset';
+    case 'Map': return 'map';
+    case 'Set': return 'set';
+
+    // 8-bit typed arrays
+    case 'Int8Array': return 'int8array';
+    case 'Uint8Array': return 'uint8array';
+    case 'Uint8ClampedArray': return 'uint8clampedarray';
+
+    // 16-bit typed arrays
+    case 'Int16Array': return 'int16array';
+    case 'Uint16Array': return 'uint16array';
+
+    // 32-bit typed arrays
+    case 'Int32Array': return 'int32array';
+    case 'Uint32Array': return 'uint32array';
+    case 'Float32Array': return 'float32array';
+    case 'Float64Array': return 'float64array';
+  }
+
+  if (isGeneratorObj(val)) {
+    return 'generator';
+  }
+
+  // Non-plain objects
+  type = toString.call(val);
+  switch (type) {
+    case '[object Object]': return 'object';
+    // iterators
+    case '[object Map Iterator]': return 'mapiterator';
+    case '[object Set Iterator]': return 'setiterator';
+    case '[object String Iterator]': return 'stringiterator';
+    case '[object Array Iterator]': return 'arrayiterator';
+  }
+
+  // other
+  return type.slice(8, -1).toLowerCase().replace(/\s/g, '');
+};
+
+function ctorName(val) {
+  return val.constructor ? val.constructor.name : null;
+}
+
+function isArray(val) {
+  if (Array.isArray) return Array.isArray(val);
+  return val instanceof Array;
+}
+
+function isError(val) {
+  return val instanceof Error || (typeof val.message === 'string' && val.constructor && typeof val.constructor.stackTraceLimit === 'number');
+}
+
+function isDate(val) {
+  if (val instanceof Date) return true;
+  return typeof val.toDateString === 'function'
+    && typeof val.getDate === 'function'
+    && typeof val.setDate === 'function';
+}
+
+function isRegexp(val) {
+  if (val instanceof RegExp) return true;
+  return typeof val.flags === 'string'
+    && typeof val.ignoreCase === 'boolean'
+    && typeof val.multiline === 'boolean'
+    && typeof val.global === 'boolean';
+}
+
+function isGeneratorFn(name, val) {
+  return ctorName(name) === 'GeneratorFunction';
+}
+
+function isGeneratorObj(val) {
+  return typeof val.throw === 'function'
+    && typeof val.return === 'function'
+    && typeof val.next === 'function';
+}
+
+function isArguments(val) {
+  try {
+    if (typeof val.length === 'number' && typeof val.callee === 'function') {
+      return true;
+    }
+  } catch (err) {
+    if (err.message.indexOf('callee') !== -1) {
+      return true;
+    }
+  }
+  return false;
+}
+
+/**
+ * If you need to support Safari 5-7 (8-10 yr-old browser),
+ * take a look at https://github.com/feross/is-buffer
+ */
+
+function isBuffer(val) {
+  if (val.constructor && typeof val.constructor.isBuffer === 'function') {
+    return val.constructor.isBuffer(val);
+  }
+  return false;
+}
+
+
+/***/ }),
+/* 790 */
+/***/ (function(module, exports, __webpack_require__) {
+
+
+module.exports = read
+
+var readline = __webpack_require__(197)
+var Mute = __webpack_require__(401)
+
+function read (opts, cb) {
+  if (opts.num) {
+    throw new Error('read() no longer accepts a char number limit')
+  }
+
+  if (typeof opts.default !== 'undefined' &&
+      typeof opts.default !== 'string' &&
+      typeof opts.default !== 'number') {
+    throw new Error('default value must be string or number')
+  }
+
+  var input = opts.input || process.stdin
+  var output = opts.output || process.stdout
+  var prompt = (opts.prompt || '').trim() + ' '
+  var silent = opts.silent
+  var editDef = false
+  var timeout = opts.timeout
+
+  var def = opts.default || ''
+  if (def) {
+    if (silent) {
+      prompt += '(<default hidden>) '
+    } else if (opts.edit) {
+      editDef = true
+    } else {
+      prompt += '(' + def + ') '
+    }
+  }
+  var terminal = !!(opts.terminal || output.isTTY)
+
+  var m = new Mute({ replace: opts.replace, prompt: prompt })
+  m.pipe(output, {end: false})
+  output = m
+  var rlOpts = { input: input, output: output, terminal: terminal }
+
+  if (process.version.match(/^v0\.6/)) {
+    var rl = readline.createInterface(rlOpts.input, rlOpts.output)
+  } else {
+    var rl = readline.createInterface(rlOpts)
+  }
+
+
+  output.unmute()
+  rl.setPrompt(prompt)
+  rl.prompt()
+  if (silent) {
+    output.mute()
+  } else if (editDef) {
+    rl.line = def
+    rl.cursor = def.length
+    rl._refreshLine()
+  }
+
+  var called = false
+  rl.on('line', onLine)
+  rl.on('error', onError)
+
+  rl.on('SIGINT', function () {
+    rl.close()
+    onError(new Error('canceled'))
+  })
+
+  var timer
+  if (timeout) {
+    timer = setTimeout(function () {
+      onError(new Error('timed out'))
+    }, timeout)
+  }
+
+  function done () {
+    called = true
+    rl.close()
+
+    if (process.version.match(/^v0\.6/)) {
+      rl.input.removeAllListeners('data')
+      rl.input.removeAllListeners('keypress')
+      rl.input.pause()
+    }
+
+    clearTimeout(timer)
+    output.mute()
+    output.end()
+  }
+
+  function onError (er) {
+    if (called) return
+    done()
+    return cb(er)
+  }
+
+  function onLine (line) {
+    if (called) return
+    if (silent && terminal) {
+      output.unmute()
+      output.write('\r\n')
+    }
+    done()
+    // truncate the \n at the end.
+    line = line.replace(/\r?\n$/, '')
+    var isDefault = !!(editDef && line === def)
+    if (def && !line) {
+      isDefault = true
+      line = def
+    }
+    cb(null, line, isDefault)
+  }
+}
+
+
+/***/ }),
+/* 791 */
+/***/ (function(module, exports, __webpack_require__) {
+
+module.exports = __webpack_require__(102).Duplex
+
+
+/***/ }),
+/* 792 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+// a passthrough stream.
+// basically just the most minimal sort of Transform stream.
+// Every written chunk gets output as-is.
+
+
+
+module.exports = PassThrough;
+
+var Transform = __webpack_require__(407);
+
+/*<replacement>*/
+var util = __webpack_require__(113);
+util.inherits = __webpack_require__(61);
+/*</replacement>*/
+
+util.inherits(PassThrough, Transform);
+
+function PassThrough(options) {
+  if (!(this instanceof PassThrough)) return new PassThrough(options);
+
+  Transform.call(this, options);
+}
+
+PassThrough.prototype._transform = function (chunk, encoding, cb) {
+  cb(null, chunk);
+};
+
+/***/ }),
+/* 793 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+var Buffer = __webpack_require__(45).Buffer;
+var util = __webpack_require__(3);
+
+function copyBuffer(src, target, offset) {
+  src.copy(target, offset);
+}
+
+module.exports = function () {
+  function BufferList() {
+    _classCallCheck(this, BufferList);
+
+    this.head = null;
+    this.tail = null;
+    this.length = 0;
+  }
+
+  BufferList.prototype.push = function push(v) {
+    var entry = { data: v, next: null };
+    if (this.length > 0) this.tail.next = entry;else this.head = entry;
+    this.tail = entry;
+    ++this.length;
+  };
+
+  BufferList.prototype.unshift = function unshift(v) {
+    var entry = { data: v, next: this.head };
+    if (this.length === 0) this.tail = entry;
+    this.head = entry;
+    ++this.length;
+  };
+
+  BufferList.prototype.shift = function shift() {
+    if (this.length === 0) return;
+    var ret = this.head.data;
+    if (this.length === 1) this.head = this.tail = null;else this.head = this.head.next;
+    --this.length;
+    return ret;
+  };
+
+  BufferList.prototype.clear = function clear() {
+    this.head = this.tail = null;
+    this.length = 0;
+  };
+
+  BufferList.prototype.join = function join(s) {
+    if (this.length === 0) return '';
+    var p = this.head;
+    var ret = '' + p.data;
+    while (p = p.next) {
+      ret += s + p.data;
+    }return ret;
+  };
+
+  BufferList.prototype.concat = function concat(n) {
+    if (this.length === 0) return Buffer.alloc(0);
+    if (this.length === 1) return this.head.data;
+    var ret = Buffer.allocUnsafe(n >>> 0);
+    var p = this.head;
+    var i = 0;
+    while (p) {
+      copyBuffer(p.data, ret, i);
+      i += p.data.length;
+      p = p.next;
+    }
+    return ret;
+  };
+
+  return BufferList;
+}();
+
+if (util && util.inspect && util.inspect.custom) {
+  module.exports.prototype[util.inspect.custom] = function () {
+    var obj = util.inspect({ length: this.length });
+    return this.constructor.name + ' ' + obj;
+  };
+}
+
+/***/ }),
+/* 794 */
+/***/ (function(module, exports, __webpack_require__) {
+
+module.exports = __webpack_require__(102).Transform
+
+
+/***/ }),
+/* 795 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*!
+ * regex-cache <https://github.com/jonschlinkert/regex-cache>
+ *
+ * Copyright (c) 2015-2017, Jon Schlinkert.
+ * Released under the MIT License.
+ */
+
+
+
+var equal = __webpack_require__(734);
+var basic = {};
+var cache = {};
+
+/**
+ * Expose `regexCache`
+ */
+
+module.exports = regexCache;
+
+/**
+ * Memoize the results of a call to the new RegExp constructor.
+ *
+ * @param  {Function} fn [description]
+ * @param  {String} str [description]
+ * @param  {Options} options [description]
+ * @param  {Boolean} nocompare [description]
+ * @return {RegExp}
+ */
+
+function regexCache(fn, str, opts) {
+  var key = '_default_', regex, cached;
+
+  if (!str && !opts) {
+    if (typeof fn !== 'function') {
+      return fn;
+    }
+    return basic[key] || (basic[key] = fn(str));
+  }
+
+  var isString = typeof str === 'string';
+  if (isString) {
+    if (!opts) {
+      return basic[str] || (basic[str] = fn(str));
+    }
+    key = str;
+  } else {
+    opts = str;
+  }
+
+  cached = cache[key];
+  if (cached && equal(cached.opts, opts)) {
+    return cached.regex;
+  }
+
+  memo(key, opts, (regex = fn(str, opts)));
+  return regex;
+}
+
+function memo(key, opts, regex) {
+  cache[key] = {regex: regex, opts: opts};
+}
+
+/**
+ * Expose `cache`
+ */
+
+module.exports.cache = cache;
+module.exports.basic = basic;
+
+
+/***/ }),
+/* 796 */
+/***/ (function(module, exports) {
+
+var isWin = process.platform === 'win32';
+
+module.exports = function (str) {
+	var i = str.length - 1;
+	if (i < 2) {
+		return str;
+	}
+	while (isSeparator(str, i)) {
+		i--;
+	}
+	return str.substr(0, i + 1);
+};
+
+function isSeparator(str, i) {
+	var char = str[i];
+	return i > 0 && (char === '/' || (isWin && char === '\\'));
+}
+
+
+/***/ }),
+/* 797 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*!
+ * repeat-string <https://github.com/jonschlinkert/repeat-string>
+ *
+ * Copyright (c) 2014-2015, Jon Schlinkert.
+ * Licensed under the MIT License.
+ */
+
+
+
+/**
+ * Results cache
+ */
+
+var res = '';
+var cache;
+
+/**
+ * Expose `repeat`
+ */
+
+module.exports = repeat;
+
+/**
+ * Repeat the given `string` the specified `number`
+ * of times.
+ *
+ * **Example:**
+ *
+ * ```js
+ * var repeat = require('repeat-string');
+ * repeat('A', 5);
+ * //=> AAAAA
+ * ```
+ *
+ * @param {String} `string` The string to repeat
+ * @param {Number} `number` The number of times to repeat the string
+ * @return {String} Repeated string
+ * @api public
+ */
+
+function repeat(str, num) {
+  if (typeof str !== 'string') {
+    throw new TypeError('expected a string');
+  }
+
+  // cover common, quick use cases
+  if (num === 1) return str;
+  if (num === 2) return str + str;
+
+  var max = str.length * num;
+  if (cache !== str || typeof cache === 'undefined') {
+    cache = str;
+    res = '';
+  } else if (res.length >= max) {
+    return res.substr(0, max);
+  }
+
+  while (max > res.length && num > 1) {
+    if (num & 1) {
+      res += str;
+    }
+
+    num >>= 1;
+    str += str;
+  }
+
+  res += str;
+  res = res.substr(0, max);
+  return res;
+}
+
+
+/***/ }),
+/* 798 */
+/***/ (function(module, exports) {
+
+module.exports = {"name":"request-capture-har","version":"1.2.2","description":"Wrapper for request module that saves all traffic as a HAR file, useful for auto mocking a client","main":"request-capture-har.js","scripts":{"test":"semistandard","travis":"npm test && node request-capture-har.js"},"repository":{"type":"git","url":"git+https://github.com/paulirish/node-request-capture-har.git"},"keywords":["http","request","har"],"author":"Lars Thorup <lars@zealake.com> (http://github.com/larsthorup)","license":"MIT","bugs":{"url":"https://github.com/paulirish/node-request-capture-har/issues"},"homepage":"https://github.com/paulirish/node-request-capture-har#readme","files":["request-capture-har.js"],"devDependencies":{"semistandard":"^8.0.0"}}
+
+/***/ }),
+/* 799 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var fs = __webpack_require__(5);
+var pkg = __webpack_require__(798);
+
+function buildHarHeaders (headers) {
+  return headers ? Object.keys(headers).map(function (key) {
+    return {
+      name: key,
+      // header values are required to be strings
+      value: headers[key].toString()
+    };
+  }) : [];
+}
+
+function appendPostData (entry, request) {
+  if (!request.body) return;
+
+  entry.request.postData = {
+    mimeType: 'application/octet-stream',
+    text: request.body
+  };
+}
+
+function toMs (num) {
+  return Math.round(num * 1000) / 1000;
+}
+
+function HarWrapper (requestModule) {
+  this.requestModule = requestModule;
+  this.clear();
+}
+
+HarWrapper.prototype.request = function (options) {
+  // include detailed timing data in response object
+  Object.assign(options, { time: true });
+  var self = this;
+  // make call to true request module
+  return this.requestModule(options, function (err, incomingMessage, response) {
+    // create new har entry with reponse timings
+    if (!err) {
+      self.entries.push(self.buildHarEntry(incomingMessage));
+    }
+
+    // fire any callback provided in options, as request has ignored it
+    //     https://github.com/request/request/blob/v2.75.0/index.js#L40
+    if (typeof options.callback === 'function') {
+      options.callback.apply(null, arguments);
+    }
+  });
+};
+
+HarWrapper.prototype.clear = function () {
+  this.entries = [];
+  this.earliestTime = new Date(2099, 1, 1);
+};
+
+HarWrapper.prototype.saveHar = function (fileName) {
+  var httpArchive = {
+    log: {
+      version: '1.2',
+      creator: {name: 'request-capture-har', version: pkg.version},
+      pages: [{
+        startedDateTime: new Date(this.earliestTime).toISOString(),
+        id: 'request-capture-har',
+        title: 'request-capture-har',
+        pageTimings: { }
+      }],
+      entries: this.entries
+    }
+  };
+  fs.writeFileSync(fileName, JSON.stringify(httpArchive, null, 2));
+};
+
+HarWrapper.prototype.buildTimings = function (entry, response) {
+  var startTs = response.request.startTime;
+  var endTs = startTs + response.elapsedTime;
+  var totalTime = endTs - startTs;
+
+  if (new Date(startTs) < this.earliestTime) {
+    this.earliestTime = new Date(startTs);
+  }
+  entry.startedDateTime = new Date(startTs).toISOString();
+  entry.time = totalTime;
+
+  // new timing data added in request 2.81.0
+  if (response.timingPhases) {
+    entry.timings = {
+      'blocked': toMs(response.timingPhases.wait),
+      'dns': toMs(response.timingPhases.dns),
+      'connect': toMs(response.timingPhases.tcp),
+      'send': 0,
+      'wait': toMs(response.timingPhases.firstByte),
+      'receive': toMs(response.timingPhases.download)
+    };
+    return;
+  }
+
+  var responseStartTs = response.request.response.responseStartTime;
+
+  var waitingTime = responseStartTs - startTs;
+  var receiveTime = endTs - responseStartTs;
+  entry.timings = {
+    send: 0,
+    wait: waitingTime,
+    receive: receiveTime
+  };
+};
+
+HarWrapper.prototype.buildHarEntry = function (response) {
+  var entry = {
+    request: {
+      method: response.request.method,
+      url: response.request.uri.href,
+      httpVersion: 'HTTP/' + response.httpVersion,
+      cookies: [],
+      headers: buildHarHeaders(response.request.headers),
+      queryString: [],
+      headersSize: -1,
+      bodySize: -1
+    },
+    response: {
+      status: response.statusCode,
+      statusText: response.statusMessage,
+      httpVersion: 'HTTP/' + response.httpVersion,
+      cookies: [],
+      headers: buildHarHeaders(response.headers),
+      _transferSize: response.body.length,
+      content: {
+        size: response.body.length,
+        mimeType: response.headers['content-type']
+      },
+      redirectURL: '',
+      headersSize: -1,
+      bodySize: -1
+    },
+    cache: {}
+  };
+  this.buildTimings(entry, response);
+  appendPostData(entry, response.request);
+  return entry;
+};
+
+module.exports = HarWrapper;
+
+
+/***/ }),
+/* 800 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+// Copyright 2010-2012 Mikeal Rogers
+//
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+//
+//        http://www.apache.org/licenses/LICENSE-2.0
+//
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+
+
+
+var extend = __webpack_require__(269)
+var cookies = __webpack_require__(412)
+var helpers = __webpack_require__(305)
+
+var paramsHaveRequestBody = helpers.paramsHaveRequestBody
+
+// organize params for patch, post, put, head, del
+function initParams (uri, options, callback) {
+  if (typeof options === 'function') {
+    callback = options
+  }
+
+  var params = {}
+  if (typeof options === 'object') {
+    extend(params, options, {uri: uri})
+  } else if (typeof uri === 'string') {
+    extend(params, {uri: uri})
+  } else {
+    extend(params, uri)
+  }
+
+  params.callback = callback || params.callback
+  return params
+}
+
+function request (uri, options, callback) {
+  if (typeof uri === 'undefined') {
+    throw new Error('undefined is not a valid uri or options object.')
+  }
+
+  var params = initParams(uri, options, callback)
+
+  if (params.method === 'HEAD' && paramsHaveRequestBody(params)) {
+    throw new Error('HTTP HEAD requests MUST NOT include a request body.')
+  }
+
+  return new request.Request(params)
+}
+
+function verbFunc (verb) {
+  var method = verb.toUpperCase()
+  return function (uri, options, callback) {
+    var params = initParams(uri, options, callback)
+    params.method = method
+    return request(params, params.callback)
+  }
+}
+
+// define like this to please codeintel/intellisense IDEs
+request.get = verbFunc('get')
+request.head = verbFunc('head')
+request.options = verbFunc('options')
+request.post = verbFunc('post')
+request.put = verbFunc('put')
+request.patch = verbFunc('patch')
+request.del = verbFunc('delete')
+request['delete'] = verbFunc('delete')
+
+request.jar = function (store) {
+  return cookies.jar(store)
+}
+
+request.cookie = function (str) {
+  return cookies.parse(str)
+}
+
+function wrapRequestMethod (method, options, requester, verb) {
+  return function (uri, opts, callback) {
+    var params = initParams(uri, opts, callback)
+
+    var target = {}
+    extend(true, target, options, params)
+
+    target.pool = params.pool || options.pool
+
+    if (verb) {
+      target.method = verb.toUpperCase()
+    }
+
+    if (typeof requester === 'function') {
+      method = requester
+    }
+
+    return method(target, target.callback)
+  }
+}
+
+request.defaults = function (options, requester) {
+  var self = this
+
+  options = options || {}
+
+  if (typeof options === 'function') {
+    requester = options
+    options = {}
+  }
+
+  var defaults = wrapRequestMethod(self, options, requester)
+
+  var verbs = ['get', 'head', 'post', 'put', 'patch', 'del', 'delete']
+  verbs.forEach(function (verb) {
+    defaults[verb] = wrapRequestMethod(self[verb], options, requester, verb)
+  })
+
+  defaults.cookie = wrapRequestMethod(self.cookie, options, requester)
+  defaults.jar = self.jar
+  defaults.defaults = self.defaults
+  return defaults
+}
+
+request.forever = function (agentOptions, optionsArg) {
+  var options = {}
+  if (optionsArg) {
+    extend(options, optionsArg)
+  }
+  if (agentOptions) {
+    options.agentOptions = agentOptions
+  }
+
+  options.forever = true
+  return request.defaults(options)
+}
+
+// Exports
+
+module.exports = request
+request.Request = __webpack_require__(813)
+request.initParams = initParams
+
+// Backwards compatibility for request.debug
+Object.defineProperty(request, 'debug', {
+  enumerable: true,
+  get: function () {
+    return request.Request.debug
+  },
+  set: function (debug) {
+    request.Request.debug = debug
+  }
+})
+
+
+/***/ }),
+/* 801 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var caseless = __webpack_require__(231)
+var uuid = __webpack_require__(119)
+var helpers = __webpack_require__(305)
+
+var md5 = helpers.md5
+var toBase64 = helpers.toBase64
+
+function Auth (request) {
+  // define all public properties here
+  this.request = request
+  this.hasAuth = false
+  this.sentAuth = false
+  this.bearerToken = null
+  this.user = null
+  this.pass = null
+}
+
+Auth.prototype.basic = function (user, pass, sendImmediately) {
+  var self = this
+  if (typeof user !== 'string' || (pass !== undefined && typeof pass !== 'string')) {
+    self.request.emit('error', new Error('auth() received invalid user or password'))
+  }
+  self.user = user
+  self.pass = pass
+  self.hasAuth = true
+  var header = user + ':' + (pass || '')
+  if (sendImmediately || typeof sendImmediately === 'undefined') {
+    var authHeader = 'Basic ' + toBase64(header)
+    self.sentAuth = true
+    return authHeader
+  }
+}
+
+Auth.prototype.bearer = function (bearer, sendImmediately) {
+  var self = this
+  self.bearerToken = bearer
+  self.hasAuth = true
+  if (sendImmediately || typeof sendImmediately === 'undefined') {
+    if (typeof bearer === 'function') {
+      bearer = bearer()
+    }
+    var authHeader = 'Bearer ' + (bearer || '')
+    self.sentAuth = true
+    return authHeader
+  }
+}
+
+Auth.prototype.digest = function (method, path, authHeader) {
+  // TODO: More complete implementation of RFC 2617.
+  //   - handle challenge.domain
+  //   - support qop="auth-int" only
+  //   - handle Authentication-Info (not necessarily?)
+  //   - check challenge.stale (not necessarily?)
+  //   - increase nc (not necessarily?)
+  // For reference:
+  // http://tools.ietf.org/html/rfc2617#section-3
+  // https://github.com/bagder/curl/blob/master/lib/http_digest.c
+
+  var self = this
+
+  var challenge = {}
+  var re = /([a-z0-9_-]+)=(?:"([^"]+)"|([a-z0-9_-]+))/gi
+  for (;;) {
+    var match = re.exec(authHeader)
+    if (!match) {
+      break
+    }
+    challenge[match[1]] = match[2] || match[3]
+  }
+
+  /**
+   * RFC 2617: handle both MD5 and MD5-sess algorithms.
+   *
+   * If the algorithm directive's value is "MD5" or unspecified, then HA1 is
+   *   HA1=MD5(username:realm:password)
+   * If the algorithm directive's value is "MD5-sess", then HA1 is
+   *   HA1=MD5(MD5(username:realm:password):nonce:cnonce)
+   */
+  var ha1Compute = function (algorithm, user, realm, pass, nonce, cnonce) {
+    var ha1 = md5(user + ':' + realm + ':' + pass)
+    if (algorithm && algorithm.toLowerCase() === 'md5-sess') {
+      return md5(ha1 + ':' + nonce + ':' + cnonce)
+    } else {
+      return ha1
+    }
+  }
+
+  var qop = /(^|,)\s*auth\s*($|,)/.test(challenge.qop) && 'auth'
+  var nc = qop && '00000001'
+  var cnonce = qop && uuid().replace(/-/g, '')
+  var ha1 = ha1Compute(challenge.algorithm, self.user, challenge.realm, self.pass, challenge.nonce, cnonce)
+  var ha2 = md5(method + ':' + path)
+  var digestResponse = qop
+    ? md5(ha1 + ':' + challenge.nonce + ':' + nc + ':' + cnonce + ':' + qop + ':' + ha2)
+    : md5(ha1 + ':' + challenge.nonce + ':' + ha2)
+  var authValues = {
+    username: self.user,
+    realm: challenge.realm,
+    nonce: challenge.nonce,
+    uri: path,
+    qop: qop,
+    response: digestResponse,
+    nc: nc,
+    cnonce: cnonce,
+    algorithm: challenge.algorithm,
+    opaque: challenge.opaque
+  }
+
+  authHeader = []
+  for (var k in authValues) {
+    if (authValues[k]) {
+      if (k === 'qop' || k === 'nc' || k === 'algorithm') {
+        authHeader.push(k + '=' + authValues[k])
+      } else {
+        authHeader.push(k + '="' + authValues[k] + '"')
+      }
+    }
+  }
+  authHeader = 'Digest ' + authHeader.join(', ')
+  self.sentAuth = true
+  return authHeader
+}
+
+Auth.prototype.onRequest = function (user, pass, sendImmediately, bearer) {
+  var self = this
+  var request = self.request
+
+  var authHeader
+  if (bearer === undefined && user === undefined) {
+    self.request.emit('error', new Error('no auth mechanism defined'))
+  } else if (bearer !== undefined) {
+    authHeader = self.bearer(bearer, sendImmediately)
+  } else {
+    authHeader = self.basic(user, pass, sendImmediately)
+  }
+  if (authHeader) {
+    request.setHeader('authorization', authHeader)
+  }
+}
+
+Auth.prototype.onResponse = function (response) {
+  var self = this
+  var request = self.request
+
+  if (!self.hasAuth || self.sentAuth) { return null }
+
+  var c = caseless(response.headers)
+
+  var authHeader = c.get('www-authenticate')
+  var authVerb = authHeader && authHeader.split(' ')[0].toLowerCase()
+  request.debug('reauth', authVerb)
+
+  switch (authVerb) {
+    case 'basic':
+      return self.basic(self.user, self.pass, true)
+
+    case 'bearer':
+      return self.bearer(self.bearerToken, true)
+
+    case 'digest':
+      return self.digest(request.method, request.path, authHeader)
+  }
+}
+
+exports.Auth = Auth
+
+
+/***/ }),
+/* 802 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+function formatHostname (hostname) {
+  // canonicalize the hostname, so that 'oogle.com' won't match 'google.com'
+  return hostname.replace(/^\.*/, '.').toLowerCase()
+}
+
+function parseNoProxyZone (zone) {
+  zone = zone.trim().toLowerCase()
+
+  var zoneParts = zone.split(':', 2)
+  var zoneHost = formatHostname(zoneParts[0])
+  var zonePort = zoneParts[1]
+  var hasPort = zone.indexOf(':') > -1
+
+  return {hostname: zoneHost, port: zonePort, hasPort: hasPort}
+}
+
+function uriInNoProxy (uri, noProxy) {
+  var port = uri.port || (uri.protocol === 'https:' ? '443' : '80')
+  var hostname = formatHostname(uri.hostname)
+  var noProxyList = noProxy.split(',')
+
+  // iterate through the noProxyList until it finds a match.
+  return noProxyList.map(parseNoProxyZone).some(function (noProxyZone) {
+    var isMatchedAt = hostname.indexOf(noProxyZone.hostname)
+    var hostnameMatched = (
+      isMatchedAt > -1 &&
+        (isMatchedAt === hostname.length - noProxyZone.hostname.length)
+    )
+
+    if (noProxyZone.hasPort) {
+      return (port === noProxyZone.port) && hostnameMatched
+    }
+
+    return hostnameMatched
+  })
+}
+
+function getProxyFromURI (uri) {
+  // Decide the proper request proxy to use based on the request URI object and the
+  // environmental variables (NO_PROXY, HTTP_PROXY, etc.)
+  // respect NO_PROXY environment variables (see: http://lynx.isc.org/current/breakout/lynx_help/keystrokes/environments.html)
+
+  var noProxy = process.env.NO_PROXY || process.env.no_proxy || ''
+
+  // if the noProxy is a wildcard then return null
+
+  if (noProxy === '*') {
+    return null
+  }
+
+  // if the noProxy is not empty and the uri is found return null
+
+  if (noProxy !== '' && uriInNoProxy(uri, noProxy)) {
+    return null
+  }
+
+  // Check for HTTP or HTTPS Proxy in environment Else default to null
+
+  if (uri.protocol === 'http:') {
+    return process.env.HTTP_PROXY ||
+      process.env.http_proxy || null
+  }
+
+  if (uri.protocol === 'https:') {
+    return process.env.HTTPS_PROXY ||
+      process.env.https_proxy ||
+      process.env.HTTP_PROXY ||
+      process.env.http_proxy || null
+  }
+
+  // if none of that works, return null
+  // (What uri protocol are you using then?)
+
+  return null
+}
+
+module.exports = getProxyFromURI
+
+
+/***/ }),
+/* 803 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var fs = __webpack_require__(5)
+var qs = __webpack_require__(196)
+var validate = __webpack_require__(677)
+var extend = __webpack_require__(269)
+
+function Har (request) {
+  this.request = request
+}
+
+Har.prototype.reducer = function (obj, pair) {
+  // new property ?
+  if (obj[pair.name] === undefined) {
+    obj[pair.name] = pair.value
+    return obj
+  }
+
+  // existing? convert to array
+  var arr = [
+    obj[pair.name],
+    pair.value
+  ]
+
+  obj[pair.name] = arr
+
+  return obj
+}
+
+Har.prototype.prep = function (data) {
+  // construct utility properties
+  data.queryObj = {}
+  data.headersObj = {}
+  data.postData.jsonObj = false
+  data.postData.paramsObj = false
+
+  // construct query objects
+  if (data.queryString && data.queryString.length) {
+    data.queryObj = data.queryString.reduce(this.reducer, {})
+  }
+
+  // construct headers objects
+  if (data.headers && data.headers.length) {
+    // loweCase header keys
+    data.headersObj = data.headers.reduceRight(function (headers, header) {
+      headers[header.name] = header.value
+      return headers
+    }, {})
+  }
+
+  // construct Cookie header
+  if (data.cookies && data.cookies.length) {
+    var cookies = data.cookies.map(function (cookie) {
+      return cookie.name + '=' + cookie.value
+    })
+
+    if (cookies.length) {
+      data.headersObj.cookie = cookies.join('; ')
+    }
+  }
+
+  // prep body
+  function some (arr) {
+    return arr.some(function (type) {
+      return data.postData.mimeType.indexOf(type) === 0
+    })
+  }
+
+  if (some([
+    'multipart/mixed',
+    'multipart/related',
+    'multipart/form-data',
+    'multipart/alternative'])) {
+    // reset values
+    data.postData.mimeType = 'multipart/form-data'
+  } else if (some([
+    'application/x-www-form-urlencoded'])) {
+    if (!data.postData.params) {
+      data.postData.text = ''
+    } else {
+      data.postData.paramsObj = data.postData.params.reduce(this.reducer, {})
+
+      // always overwrite
+      data.postData.text = qs.stringify(data.postData.paramsObj)
+    }
+  } else if (some([
+    'text/json',
+    'text/x-json',
+    'application/json',
+    'application/x-json'])) {
+    data.postData.mimeType = 'application/json'
+
+    if (data.postData.text) {
+      try {
+        data.postData.jsonObj = JSON.parse(data.postData.text)
+      } catch (e) {
+        this.request.debug(e)
+
+        // force back to text/plain
+        data.postData.mimeType = 'text/plain'
+      }
+    }
+  }
+
+  return data
+}
+
+Har.prototype.options = function (options) {
+  // skip if no har property defined
+  if (!options.har) {
+    return options
+  }
+
+  var har = {}
+  extend(har, options.har)
+
+  // only process the first entry
+  if (har.log && har.log.entries) {
+    har = har.log.entries[0]
+  }
+
+  // add optional properties to make validation successful
+  har.url = har.url || options.url || options.uri || options.baseUrl || '/'
+  har.httpVersion = har.httpVersion || 'HTTP/1.1'
+  har.queryString = har.queryString || []
+  har.headers = har.headers || []
+  har.cookies = har.cookies || []
+  har.postData = har.postData || {}
+  har.postData.mimeType = har.postData.mimeType || 'application/octet-stream'
+
+  har.bodySize = 0
+  har.headersSize = 0
+  har.postData.size = 0
+
+  if (!validate.request(har)) {
+    return options
+  }
+
+  // clean up and get some utility properties
+  var req = this.prep(har)
+
+  // construct new options
+  if (req.url) {
+    options.url = req.url
+  }
+
+  if (req.method) {
+    options.method = req.method
+  }
+
+  if (Object.keys(req.queryObj).length) {
+    options.qs = req.queryObj
+  }
+
+  if (Object.keys(req.headersObj).length) {
+    options.headers = req.headersObj
+  }
+
+  function test (type) {
+    return req.postData.mimeType.indexOf(type) === 0
+  }
+  if (test('application/x-www-form-urlencoded')) {
+    options.form = req.postData.paramsObj
+  } else if (test('application/json')) {
+    if (req.postData.jsonObj) {
+      options.body = req.postData.jsonObj
+      options.json = true
+    }
+  } else if (test('multipart/form-data')) {
+    options.formData = {}
+
+    req.postData.params.forEach(function (param) {
+      var attachment = {}
+
+      if (!param.fileName && !param.fileName && !param.contentType) {
+        options.formData[param.name] = param.value
+        return
+      }
+
+      // attempt to read from disk!
+      if (param.fileName && !param.value) {
+        attachment.value = fs.createReadStream(param.fileName)
+      } else if (param.value) {
+        attachment.value = param.value
+      }
+
+      if (param.fileName) {
+        attachment.options = {
+          filename: param.fileName,
+          contentType: param.contentType ? param.contentType : null
+        }
+      }
+
+      options.formData[param.name] = attachment
+    })
+  } else {
+    if (req.postData.text) {
+      options.body = req.postData.text
+    }
+  }
+
+  return options
+}
+
+exports.Har = Har
+
+
+/***/ }),
+/* 804 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var crypto = __webpack_require__(11)
+
+function randomString (size) {
+  var bits = (size + 1) * 6
+  var buffer = crypto.randomBytes(Math.ceil(bits / 8))
+  var string = buffer.toString('base64').replace(/\+/g, '-').replace(/\//g, '_').replace(/=/g, '')
+  return string.slice(0, size)
+}
+
+function calculatePayloadHash (payload, algorithm, contentType) {
+  var hash = crypto.createHash(algorithm)
+  hash.update('hawk.1.payload\n')
+  hash.update((contentType ? contentType.split(';')[0].trim().toLowerCase() : '') + '\n')
+  hash.update(payload || '')
+  hash.update('\n')
+  return hash.digest('base64')
+}
+
+exports.calculateMac = function (credentials, opts) {
+  var normalized = 'hawk.1.header\n' +
+    opts.ts + '\n' +
+    opts.nonce + '\n' +
+    (opts.method || '').toUpperCase() + '\n' +
+    opts.resource + '\n' +
+    opts.host.toLowerCase() + '\n' +
+    opts.port + '\n' +
+    (opts.hash || '') + '\n'
+
+  if (opts.ext) {
+    normalized = normalized + opts.ext.replace('\\', '\\\\').replace('\n', '\\n')
+  }
+
+  normalized = normalized + '\n'
+
+  if (opts.app) {
+    normalized = normalized + opts.app + '\n' + (opts.dlg || '') + '\n'
+  }
+
+  var hmac = crypto.createHmac(credentials.algorithm, credentials.key).update(normalized)
+  var digest = hmac.digest('base64')
+  return digest
+}
+
+exports.header = function (uri, method, opts) {
+  var timestamp = opts.timestamp || Math.floor((Date.now() + (opts.localtimeOffsetMsec || 0)) / 1000)
+  var credentials = opts.credentials
+  if (!credentials || !credentials.id || !credentials.key || !credentials.algorithm) {
+    return ''
+  }
+
+  if (['sha1', 'sha256'].indexOf(credentials.algorithm) === -1) {
+    return ''
+  }
+
+  var artifacts = {
+    ts: timestamp,
+    nonce: opts.nonce || randomString(6),
+    method: method,
+    resource: uri.pathname + (uri.search || ''),
+    host: uri.hostname,
+    port: uri.port || (uri.protocol === 'http:' ? 80 : 443),
+    hash: opts.hash,
+    ext: opts.ext,
+    app: opts.app,
+    dlg: opts.dlg
+  }
+
+  if (!artifacts.hash && (opts.payload || opts.payload === '')) {
+    artifacts.hash = calculatePayloadHash(opts.payload, credentials.algorithm, opts.contentType)
+  }
+
+  var mac = exports.calculateMac(credentials, artifacts)
+
+  var hasExt = artifacts.ext !== null && artifacts.ext !== undefined && artifacts.ext !== ''
+  var header = 'Hawk id="' + credentials.id +
+    '", ts="' + artifacts.ts +
+    '", nonce="' + artifacts.nonce +
+    (artifacts.hash ? '", hash="' + artifacts.hash : '') +
+    (hasExt ? '", ext="' + artifacts.ext.replace(/\\/g, '\\\\').replace(/"/g, '\\"') : '') +
+    '", mac="' + mac + '"'
+
+  if (artifacts.app) {
+    header = header + ', app="' + artifacts.app + (artifacts.dlg ? '", dlg="' + artifacts.dlg : '') + '"'
+  }
+
+  return header
+}
+
+
+/***/ }),
+/* 805 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var uuid = __webpack_require__(119)
+var CombinedStream = __webpack_require__(385)
+var isstream = __webpack_require__(399)
+var Buffer = __webpack_require__(45).Buffer
+
+function Multipart (request) {
+  this.request = request
+  this.boundary = uuid()
+  this.chunked = false
+  this.body = null
+}
+
+Multipart.prototype.isChunked = function (options) {
+  var self = this
+  var chunked = false
+  var parts = options.data || options
+
+  if (!parts.forEach) {
+    self.request.emit('error', new Error('Argument error, options.multipart.'))
+  }
+
+  if (options.chunked !== undefined) {
+    chunked = options.chunked
+  }
+
+  if (self.request.getHeader('transfer-encoding') === 'chunked') {
+    chunked = true
+  }
+
+  if (!chunked) {
+    parts.forEach(function (part) {
+      if (typeof part.body === 'undefined') {
+        self.request.emit('error', new Error('Body attribute missing in multipart.'))
+      }
+      if (isstream(part.body)) {
+        chunked = true
+      }
+    })
+  }
+
+  return chunked
+}
+
+Multipart.prototype.setHeaders = function (chunked) {
+  var self = this
+
+  if (chunked && !self.request.hasHeader('transfer-encoding')) {
+    self.request.setHeader('transfer-encoding', 'chunked')
+  }
+
+  var header = self.request.getHeader('content-type')
+
+  if (!header || header.indexOf('multipart') === -1) {
+    self.request.setHeader('content-type', 'multipart/related; boundary=' + self.boundary)
+  } else {
+    if (header.indexOf('boundary') !== -1) {
+      self.boundary = header.replace(/.*boundary=([^\s;]+).*/, '$1')
+    } else {
+      self.request.setHeader('content-type', header + '; boundary=' + self.boundary)
+    }
+  }
+}
+
+Multipart.prototype.build = function (parts, chunked) {
+  var self = this
+  var body = chunked ? new CombinedStream() : []
+
+  function add (part) {
+    if (typeof part === 'number') {
+      part = part.toString()
+    }
+    return chunked ? body.append(part) : body.push(Buffer.from(part))
+  }
+
+  if (self.request.preambleCRLF) {
+    add('\r\n')
+  }
+
+  parts.forEach(function (part) {
+    var preamble = '--' + self.boundary + '\r\n'
+    Object.keys(part).forEach(function (key) {
+      if (key === 'body') { return }
+      preamble += key + ': ' + part[key] + '\r\n'
+    })
+    preamble += '\r\n'
+    add(preamble)
+    add(part.body)
+    add('\r\n')
+  })
+  add('--' + self.boundary + '--')
+
+  if (self.request.postambleCRLF) {
+    add('\r\n')
+  }
+
+  return body
+}
+
+Multipart.prototype.onRequest = function (options) {
+  var self = this
+
+  var chunked = self.isChunked(options)
+  var parts = options.data || options
+
+  self.setHeaders(chunked)
+  self.chunked = chunked
+  self.body = self.build(parts, chunked)
+}
+
+exports.Multipart = Multipart
+
+
+/***/ }),
+/* 806 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var url = __webpack_require__(24)
+var qs = __webpack_require__(404)
+var caseless = __webpack_require__(231)
+var uuid = __webpack_require__(119)
+var oauth = __webpack_require__(768)
+var crypto = __webpack_require__(11)
+var Buffer = __webpack_require__(45).Buffer
+
+function OAuth (request) {
+  this.request = request
+  this.params = null
+}
+
+OAuth.prototype.buildParams = function (_oauth, uri, method, query, form, qsLib) {
+  var oa = {}
+  for (var i in _oauth) {
+    oa['oauth_' + i] = _oauth[i]
+  }
+  if (!oa.oauth_version) {
+    oa.oauth_version = '1.0'
+  }
+  if (!oa.oauth_timestamp) {
+    oa.oauth_timestamp = Math.floor(Date.now() / 1000).toString()
+  }
+  if (!oa.oauth_nonce) {
+    oa.oauth_nonce = uuid().replace(/-/g, '')
+  }
+  if (!oa.oauth_signature_method) {
+    oa.oauth_signature_method = 'HMAC-SHA1'
+  }
+
+  var consumer_secret_or_private_key = oa.oauth_consumer_secret || oa.oauth_private_key // eslint-disable-line camelcase
+  delete oa.oauth_consumer_secret
+  delete oa.oauth_private_key
+
+  var token_secret = oa.oauth_token_secret // eslint-disable-line camelcase
+  delete oa.oauth_token_secret
+
+  var realm = oa.oauth_realm
+  delete oa.oauth_realm
+  delete oa.oauth_transport_method
+
+  var baseurl = uri.protocol + '//' + uri.host + uri.pathname
+  var params = qsLib.parse([].concat(query, form, qsLib.stringify(oa)).join('&'))
+
+  oa.oauth_signature = oauth.sign(
+    oa.oauth_signature_method,
+    method,
+    baseurl,
+    params,
+    consumer_secret_or_private_key, // eslint-disable-line camelcase
+    token_secret // eslint-disable-line camelcase
+  )
+
+  if (realm) {
+    oa.realm = realm
+  }
+
+  return oa
+}
+
+OAuth.prototype.buildBodyHash = function (_oauth, body) {
+  if (['HMAC-SHA1', 'RSA-SHA1'].indexOf(_oauth.signature_method || 'HMAC-SHA1') < 0) {
+    this.request.emit('error', new Error('oauth: ' + _oauth.signature_method +
+      ' signature_method not supported with body_hash signing.'))
+  }
+
+  var shasum = crypto.createHash('sha1')
+  shasum.update(body || '')
+  var sha1 = shasum.digest('hex')
+
+  return Buffer.from(sha1, 'hex').toString('base64')
+}
+
+OAuth.prototype.concatParams = function (oa, sep, wrap) {
+  wrap = wrap || ''
+
+  var params = Object.keys(oa).filter(function (i) {
+    return i !== 'realm' && i !== 'oauth_signature'
+  }).sort()
+
+  if (oa.realm) {
+    params.splice(0, 0, 'realm')
+  }
+  params.push('oauth_signature')
+
+  return params.map(function (i) {
+    return i + '=' + wrap + oauth.rfc3986(oa[i]) + wrap
+  }).join(sep)
+}
+
+OAuth.prototype.onRequest = function (_oauth) {
+  var self = this
+  self.params = _oauth
+
+  var uri = self.request.uri || {}
+  var method = self.request.method || ''
+  var headers = caseless(self.request.headers)
+  var body = self.request.body || ''
+  var qsLib = self.request.qsLib || qs
+
+  var form
+  var query
+  var contentType = headers.get('content-type') || ''
+  var formContentType = 'application/x-www-form-urlencoded'
+  var transport = _oauth.transport_method || 'header'
+
+  if (contentType.slice(0, formContentType.length) === formContentType) {
+    contentType = formContentType
+    form = body
+  }
+  if (uri.query) {
+    query = uri.query
+  }
+  if (transport === 'body' && (method !== 'POST' || contentType !== formContentType)) {
+    self.request.emit('error', new Error('oauth: transport_method of body requires POST ' +
+      'and content-type ' + formContentType))
+  }
+
+  if (!form && typeof _oauth.body_hash === 'boolean') {
+    _oauth.body_hash = self.buildBodyHash(_oauth, self.request.body.toString())
+  }
+
+  var oa = self.buildParams(_oauth, uri, method, query, form, qsLib)
+
+  switch (transport) {
+    case 'header':
+      self.request.setHeader('Authorization', 'OAuth ' + self.concatParams(oa, ',', '"'))
+      break
+
+    case 'query':
+      var href = self.request.uri.href += (query ? '&' : '?') + self.concatParams(oa, '&')
+      self.request.uri = url.parse(href)
+      self.request.path = self.request.uri.path
+      break
+
+    case 'body':
+      self.request.body = (form ? form + '&' : '') + self.concatParams(oa, '&')
+      break
+
+    default:
+      self.request.emit('error', new Error('oauth: transport_method invalid'))
+  }
+}
+
+exports.OAuth = OAuth
+
+
+/***/ }),
+/* 807 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var qs = __webpack_require__(404)
+var querystring = __webpack_require__(196)
+
+function Querystring (request) {
+  this.request = request
+  this.lib = null
+  this.useQuerystring = null
+  this.parseOptions = null
+  this.stringifyOptions = null
+}
+
+Querystring.prototype.init = function (options) {
+  if (this.lib) { return }
+
+  this.useQuerystring = options.useQuerystring
+  this.lib = (this.useQuerystring ? querystring : qs)
+
+  this.parseOptions = options.qsParseOptions || {}
+  this.stringifyOptions = options.qsStringifyOptions || {}
+}
+
+Querystring.prototype.stringify = function (obj) {
+  return (this.useQuerystring)
+    ? this.rfc3986(this.lib.stringify(obj,
+      this.stringifyOptions.sep || null,
+      this.stringifyOptions.eq || null,
+      this.stringifyOptions))
+    : this.lib.stringify(obj, this.stringifyOptions)
+}
+
+Querystring.prototype.parse = function (str) {
+  return (this.useQuerystring)
+    ? this.lib.parse(str,
+      this.parseOptions.sep || null,
+      this.parseOptions.eq || null,
+      this.parseOptions)
+    : this.lib.parse(str, this.parseOptions)
+}
+
+Querystring.prototype.rfc3986 = function (str) {
+  return str.replace(/[!'()*]/g, function (c) {
+    return '%' + c.charCodeAt(0).toString(16).toUpperCase()
+  })
+}
+
+Querystring.prototype.unescape = querystring.unescape
+
+exports.Querystring = Querystring
+
+
+/***/ }),
+/* 808 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var url = __webpack_require__(24)
+var isUrl = /^https?:/
+
+function Redirect (request) {
+  this.request = request
+  this.followRedirect = true
+  this.followRedirects = true
+  this.followAllRedirects = false
+  this.followOriginalHttpMethod = false
+  this.allowRedirect = function () { return true }
+  this.maxRedirects = 10
+  this.redirects = []
+  this.redirectsFollowed = 0
+  this.removeRefererHeader = false
+}
+
+Redirect.prototype.onRequest = function (options) {
+  var self = this
+
+  if (options.maxRedirects !== undefined) {
+    self.maxRedirects = options.maxRedirects
+  }
+  if (typeof options.followRedirect === 'function') {
+    self.allowRedirect = options.followRedirect
+  }
+  if (options.followRedirect !== undefined) {
+    self.followRedirects = !!options.followRedirect
+  }
+  if (options.followAllRedirects !== undefined) {
+    self.followAllRedirects = options.followAllRedirects
+  }
+  if (self.followRedirects || self.followAllRedirects) {
+    self.redirects = self.redirects || []
+  }
+  if (options.removeRefererHeader !== undefined) {
+    self.removeRefererHeader = options.removeRefererHeader
+  }
+  if (options.followOriginalHttpMethod !== undefined) {
+    self.followOriginalHttpMethod = options.followOriginalHttpMethod
+  }
+}
+
+Redirect.prototype.redirectTo = function (response) {
+  var self = this
+  var request = self.request
+
+  var redirectTo = null
+  if (response.statusCode >= 300 && response.statusCode < 400 && response.caseless.has('location')) {
+    var location = response.caseless.get('location')
+    request.debug('redirect', location)
+
+    if (self.followAllRedirects) {
+      redirectTo = location
+    } else if (self.followRedirects) {
+      switch (request.method) {
+        case 'PATCH':
+        case 'PUT':
+        case 'POST':
+        case 'DELETE':
+          // Do not follow redirects
+          break
+        default:
+          redirectTo = location
+          break
+      }
+    }
+  } else if (response.statusCode === 401) {
+    var authHeader = request._auth.onResponse(response)
+    if (authHeader) {
+      request.setHeader('authorization', authHeader)
+      redirectTo = request.uri
+    }
+  }
+  return redirectTo
+}
+
+Redirect.prototype.onResponse = function (response) {
+  var self = this
+  var request = self.request
+
+  var redirectTo = self.redirectTo(response)
+  if (!redirectTo || !self.allowRedirect.call(request, response)) {
+    return false
+  }
+
+  request.debug('redirect to', redirectTo)
+
+  // ignore any potential response body.  it cannot possibly be useful
+  // to us at this point.
+  // response.resume should be defined, but check anyway before calling. Workaround for browserify.
+  if (response.resume) {
+    response.resume()
+  }
+
+  if (self.redirectsFollowed >= self.maxRedirects) {
+    request.emit('error', new Error('Exceeded maxRedirects. Probably stuck in a redirect loop ' + request.uri.href))
+    return false
+  }
+  self.redirectsFollowed += 1
+
+  if (!isUrl.test(redirectTo)) {
+    redirectTo = url.resolve(request.uri.href, redirectTo)
+  }
+
+  var uriPrev = request.uri
+  request.uri = url.parse(redirectTo)
+
+  // handle the case where we change protocol from https to http or vice versa
+  if (request.uri.protocol !== uriPrev.protocol) {
+    delete request.agent
+  }
+
+  self.redirects.push({ statusCode: response.statusCode, redirectUri: redirectTo })
+
+  if (self.followAllRedirects && request.method !== 'HEAD' &&
+    response.statusCode !== 401 && response.statusCode !== 307) {
+    request.method = self.followOriginalHttpMethod ? request.method : 'GET'
+  }
+  // request.method = 'GET' // Force all redirects to use GET || commented out fixes #215
+  delete request.src
+  delete request.req
+  delete request._started
+  if (response.statusCode !== 401 && response.statusCode !== 307) {
+    // Remove parameters from the previous response, unless this is the second request
+    // for a server that requires digest authentication.
+    delete request.body
+    delete request._form
+    if (request.headers) {
+      request.removeHeader('host')
+      request.removeHeader('content-type')
+      request.removeHeader('content-length')
+      if (request.uri.hostname !== request.originalHost.split(':')[0]) {
+        // Remove authorization if changing hostnames (but not if just
+        // changing ports or protocols).  This matches the behavior of curl:
+        // https://github.com/bagder/curl/blob/6beb0eee/lib/http.c#L710
+        request.removeHeader('authorization')
+      }
+    }
+  }
+
+  if (!self.removeRefererHeader) {
+    request.setHeader('referer', uriPrev.href)
+  }
+
+  request.emit('redirect')
+
+  request.init()
+
+  return true
+}
+
+exports.Redirect = Redirect
+
+
+/***/ }),
+/* 809 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var url = __webpack_require__(24)
+var tunnel = __webpack_require__(955)
+
+var defaultProxyHeaderWhiteList = [
+  'accept',
+  'accept-charset',
+  'accept-encoding',
+  'accept-language',
+  'accept-ranges',
+  'cache-control',
+  'content-encoding',
+  'content-language',
+  'content-location',
+  'content-md5',
+  'content-range',
+  'content-type',
+  'connection',
+  'date',
+  'expect',
+  'max-forwards',
+  'pragma',
+  'referer',
+  'te',
+  'user-agent',
+  'via'
+]
+
+var defaultProxyHeaderExclusiveList = [
+  'proxy-authorization'
+]
+
+function constructProxyHost (uriObject) {
+  var port = uriObject.port
+  var protocol = uriObject.protocol
+  var proxyHost = uriObject.hostname + ':'
+
+  if (port) {
+    proxyHost += port
+  } else if (protocol === 'https:') {
+    proxyHost += '443'
+  } else {
+    proxyHost += '80'
+  }
+
+  return proxyHost
+}
+
+function constructProxyHeaderWhiteList (headers, proxyHeaderWhiteList) {
+  var whiteList = proxyHeaderWhiteList
+    .reduce(function (set, header) {
+      set[header.toLowerCase()] = true
+      return set
+    }, {})
+
+  return Object.keys(headers)
+    .filter(function (header) {
+      return whiteList[header.toLowerCase()]
+    })
+    .reduce(function (set, header) {
+      set[header] = headers[header]
+      return set
+    }, {})
+}
+
+function constructTunnelOptions (request, proxyHeaders) {
+  var proxy = request.proxy
+
+  var tunnelOptions = {
+    proxy: {
+      host: proxy.hostname,
+      port: +proxy.port,
+      proxyAuth: proxy.auth,
+      headers: proxyHeaders
+    },
+    headers: request.headers,
+    ca: request.ca,
+    cert: request.cert,
+    key: request.key,
+    passphrase: request.passphrase,
+    pfx: request.pfx,
+    ciphers: request.ciphers,
+    rejectUnauthorized: request.rejectUnauthorized,
+    secureOptions: request.secureOptions,
+    secureProtocol: request.secureProtocol
+  }
+
+  return tunnelOptions
+}
+
+function constructTunnelFnName (uri, proxy) {
+  var uriProtocol = (uri.protocol === 'https:' ? 'https' : 'http')
+  var proxyProtocol = (proxy.protocol === 'https:' ? 'Https' : 'Http')
+  return [uriProtocol, proxyProtocol].join('Over')
+}
+
+function getTunnelFn (request) {
+  var uri = request.uri
+  var proxy = request.proxy
+  var tunnelFnName = constructTunnelFnName(uri, proxy)
+  return tunnel[tunnelFnName]
+}
+
+function Tunnel (request) {
+  this.request = request
+  this.proxyHeaderWhiteList = defaultProxyHeaderWhiteList
+  this.proxyHeaderExclusiveList = []
+  if (typeof request.tunnel !== 'undefined') {
+    this.tunnelOverride = request.tunnel
+  }
+}
+
+Tunnel.prototype.isEnabled = function () {
+  var self = this
+  var request = self.request
+    // Tunnel HTTPS by default. Allow the user to override this setting.
+
+  // If self.tunnelOverride is set (the user specified a value), use it.
+  if (typeof self.tunnelOverride !== 'undefined') {
+    return self.tunnelOverride
+  }
+
+  // If the destination is HTTPS, tunnel.
+  if (request.uri.protocol === 'https:') {
+    return true
+  }
+
+  // Otherwise, do not use tunnel.
+  return false
+}
+
+Tunnel.prototype.setup = function (options) {
+  var self = this
+  var request = self.request
+
+  options = options || {}
+
+  if (typeof request.proxy === 'string') {
+    request.proxy = url.parse(request.proxy)
+  }
+
+  if (!request.proxy || !request.tunnel) {
+    return false
+  }
+
+  // Setup Proxy Header Exclusive List and White List
+  if (options.proxyHeaderWhiteList) {
+    self.proxyHeaderWhiteList = options.proxyHeaderWhiteList
+  }
+  if (options.proxyHeaderExclusiveList) {
+    self.proxyHeaderExclusiveList = options.proxyHeaderExclusiveList
+  }
+
+  var proxyHeaderExclusiveList = self.proxyHeaderExclusiveList.concat(defaultProxyHeaderExclusiveList)
+  var proxyHeaderWhiteList = self.proxyHeaderWhiteList.concat(proxyHeaderExclusiveList)
+
+  // Setup Proxy Headers and Proxy Headers Host
+  // Only send the Proxy White Listed Header names
+  var proxyHeaders = constructProxyHeaderWhiteList(request.headers, proxyHeaderWhiteList)
+  proxyHeaders.host = constructProxyHost(request.uri)
+
+  proxyHeaderExclusiveList.forEach(request.removeHeader, request)
+
+  // Set Agent from Tunnel Data
+  var tunnelFn = getTunnelFn(request)
+  var tunnelOptions = constructTunnelOptions(request, proxyHeaders)
+  request.agent = tunnelFn(tunnelOptions)
+
+  return true
+}
+
+Tunnel.defaultProxyHeaderWhiteList = defaultProxyHeaderWhiteList
+Tunnel.defaultProxyHeaderExclusiveList = defaultProxyHeaderExclusiveList
+exports.Tunnel = Tunnel
+
+
+/***/ }),
+/* 810 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*!
+ * Copyright (c) 2015, Salesforce.com, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of Salesforce.com nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+var net = __webpack_require__(164);
+var urlParse = __webpack_require__(24).parse;
+var pubsuffix = __webpack_require__(415);
+var Store = __webpack_require__(416).Store;
+var MemoryCookieStore = __webpack_require__(811).MemoryCookieStore;
+var pathMatch = __webpack_require__(413).pathMatch;
+var VERSION = __webpack_require__(812).version;
+
+var punycode;
+try {
+  punycode = __webpack_require__(332);
+} catch(e) {
+  console.warn("cookie: can't load punycode; won't use punycode for domain normalization");
+}
+
+// From RFC6265 S4.1.1
+// note that it excludes \x3B ";"
+var COOKIE_OCTETS = /^[\x21\x23-\x2B\x2D-\x3A\x3C-\x5B\x5D-\x7E]+$/;
+
+var CONTROL_CHARS = /[\x00-\x1F]/;
+
+// From Chromium // '\r', '\n' and '\0' should be treated as a terminator in
+// the "relaxed" mode, see:
+// https://github.com/ChromiumWebApps/chromium/blob/b3d3b4da8bb94c1b2e061600df106d590fda3620/net/cookies/parsed_cookie.cc#L60
+var TERMINATORS = ['\n', '\r', '\0'];
+
+// RFC6265 S4.1.1 defines path value as 'any CHAR except CTLs or ";"'
+// Note ';' is \x3B
+var PATH_VALUE = /[\x20-\x3A\x3C-\x7E]+/;
+
+// date-time parsing constants (RFC6265 S5.1.1)
+
+var DATE_DELIM = /[\x09\x20-\x2F\x3B-\x40\x5B-\x60\x7B-\x7E]/;
+
+var MONTH_TO_NUM = {
+  jan:0, feb:1, mar:2, apr:3, may:4, jun:5,
+  jul:6, aug:7, sep:8, oct:9, nov:10, dec:11
+};
+var NUM_TO_MONTH = [
+  'Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec'
+];
+var NUM_TO_DAY = [
+  'Sun','Mon','Tue','Wed','Thu','Fri','Sat'
+];
+
+var MAX_TIME = 2147483647000; // 31-bit max
+var MIN_TIME = 0; // 31-bit min
+
+/*
+ * Parses a Natural number (i.e., non-negative integer) with either the
+ *    <min>*<max>DIGIT ( non-digit *OCTET )
+ * or
+ *    <min>*<max>DIGIT
+ * grammar (RFC6265 S5.1.1).
+ *
+ * The "trailingOK" boolean controls if the grammar accepts a
+ * "( non-digit *OCTET )" trailer.
+ */
+function parseDigits(token, minDigits, maxDigits, trailingOK) {
+  var count = 0;
+  while (count < token.length) {
+    var c = token.charCodeAt(count);
+    // "non-digit = %x00-2F / %x3A-FF"
+    if (c <= 0x2F || c >= 0x3A) {
+      break;
+    }
+    count++;
+  }
+
+  // constrain to a minimum and maximum number of digits.
+  if (count < minDigits || count > maxDigits) {
+    return null;
+  }
+
+  if (!trailingOK && count != token.length) {
+    return null;
+  }
+
+  return parseInt(token.substr(0,count), 10);
+}
+
+function parseTime(token) {
+  var parts = token.split(':');
+  var result = [0,0,0];
+
+  /* RF6256 S5.1.1:
+   *      time            = hms-time ( non-digit *OCTET )
+   *      hms-time        = time-field ":" time-field ":" time-field
+   *      time-field      = 1*2DIGIT
+   */
+
+  if (parts.length !== 3) {
+    return null;
+  }
+
+  for (var i = 0; i < 3; i++) {
+    // "time-field" must be strictly "1*2DIGIT", HOWEVER, "hms-time" can be
+    // followed by "( non-digit *OCTET )" so therefore the last time-field can
+    // have a trailer
+    var trailingOK = (i == 2);
+    var num = parseDigits(parts[i], 1, 2, trailingOK);
+    if (num === null) {
+      return null;
+    }
+    result[i] = num;
+  }
+
+  return result;
+}
+
+function parseMonth(token) {
+  token = String(token).substr(0,3).toLowerCase();
+  var num = MONTH_TO_NUM[token];
+  return num >= 0 ? num : null;
+}
+
+/*
+ * RFC6265 S5.1.1 date parser (see RFC for full grammar)
+ */
+function parseDate(str) {
+  if (!str) {
+    return;
+  }
+
+  /* RFC6265 S5.1.1:
+   * 2. Process each date-token sequentially in the order the date-tokens
+   * appear in the cookie-date
+   */
+  var tokens = str.split(DATE_DELIM);
+  if (!tokens) {
+    return;
+  }
+
+  var hour = null;
+  var minute = null;
+  var second = null;
+  var dayOfMonth = null;
+  var month = null;
+  var year = null;
+
+  for (var i=0; i<tokens.length; i++) {
+    var token = tokens[i].trim();
+    if (!token.length) {
+      continue;
+    }
+
+    var result;
+
+    /* 2.1. If the found-time flag is not set and the token matches the time
+     * production, set the found-time flag and set the hour- value,
+     * minute-value, and second-value to the numbers denoted by the digits in
+     * the date-token, respectively.  Skip the remaining sub-steps and continue
+     * to the next date-token.
+     */
+    if (second === null) {
+      result = parseTime(token);
+      if (result) {
+        hour = result[0];
+        minute = result[1];
+        second = result[2];
+        continue;
+      }
+    }
+
+    /* 2.2. If the found-day-of-month flag is not set and the date-token matches
+     * the day-of-month production, set the found-day-of- month flag and set
+     * the day-of-month-value to the number denoted by the date-token.  Skip
+     * the remaining sub-steps and continue to the next date-token.
+     */
+    if (dayOfMonth === null) {
+      // "day-of-month = 1*2DIGIT ( non-digit *OCTET )"
+      result = parseDigits(token, 1, 2, true);
+      if (result !== null) {
+        dayOfMonth = result;
+        continue;
+      }
+    }
+
+    /* 2.3. If the found-month flag is not set and the date-token matches the
+     * month production, set the found-month flag and set the month-value to
+     * the month denoted by the date-token.  Skip the remaining sub-steps and
+     * continue to the next date-token.
+     */
+    if (month === null) {
+      result = parseMonth(token);
+      if (result !== null) {
+        month = result;
+        continue;
+      }
+    }
+
+    /* 2.4. If the found-year flag is not set and the date-token matches the
+     * year production, set the found-year flag and set the year-value to the
+     * number denoted by the date-token.  Skip the remaining sub-steps and
+     * continue to the next date-token.
+     */
+    if (year === null) {
+      // "year = 2*4DIGIT ( non-digit *OCTET )"
+      result = parseDigits(token, 2, 4, true);
+      if (result !== null) {
+        year = result;
+        /* From S5.1.1:
+         * 3.  If the year-value is greater than or equal to 70 and less
+         * than or equal to 99, increment the year-value by 1900.
+         * 4.  If the year-value is greater than or equal to 0 and less
+         * than or equal to 69, increment the year-value by 2000.
+         */
+        if (year >= 70 && year <= 99) {
+          year += 1900;
+        } else if (year >= 0 && year <= 69) {
+          year += 2000;
+        }
+      }
+    }
+  }
+
+  /* RFC 6265 S5.1.1
+   * "5. Abort these steps and fail to parse the cookie-date if:
+   *     *  at least one of the found-day-of-month, found-month, found-
+   *        year, or found-time flags is not set,
+   *     *  the day-of-month-value is less than 1 or greater than 31,
+   *     *  the year-value is less than 1601,
+   *     *  the hour-value is greater than 23,
+   *     *  the minute-value is greater than 59, or
+   *     *  the second-value is greater than 59.
+   *     (Note that leap seconds cannot be represented in this syntax.)"
+   *
+   * So, in order as above:
+   */
+  if (
+    dayOfMonth === null || month === null || year === null || second === null ||
+    dayOfMonth < 1 || dayOfMonth > 31 ||
+    year < 1601 ||
+    hour > 23 ||
+    minute > 59 ||
+    second > 59
+  ) {
+    return;
+  }
+
+  return new Date(Date.UTC(year, month, dayOfMonth, hour, minute, second));
+}
+
+function formatDate(date) {
+  var d = date.getUTCDate(); d = d >= 10 ? d : '0'+d;
+  var h = date.getUTCHours(); h = h >= 10 ? h : '0'+h;
+  var m = date.getUTCMinutes(); m = m >= 10 ? m : '0'+m;
+  var s = date.getUTCSeconds(); s = s >= 10 ? s : '0'+s;
+  return NUM_TO_DAY[date.getUTCDay()] + ', ' +
+    d+' '+ NUM_TO_MONTH[date.getUTCMonth()] +' '+ date.getUTCFullYear() +' '+
+    h+':'+m+':'+s+' GMT';
+}
+
+// S5.1.2 Canonicalized Host Names
+function canonicalDomain(str) {
+  if (str == null) {
+    return null;
+  }
+  str = str.trim().replace(/^\./,''); // S4.1.2.3 & S5.2.3: ignore leading .
+
+  // convert to IDN if any non-ASCII characters
+  if (punycode && /[^\u0001-\u007f]/.test(str)) {
+    str = punycode.toASCII(str);
+  }
+
+  return str.toLowerCase();
+}
+
+// S5.1.3 Domain Matching
+function domainMatch(str, domStr, canonicalize) {
+  if (str == null || domStr == null) {
+    return null;
+  }
+  if (canonicalize !== false) {
+    str = canonicalDomain(str);
+    domStr = canonicalDomain(domStr);
+  }
+
+  /*
+   * "The domain string and the string are identical. (Note that both the
+   * domain string and the string will have been canonicalized to lower case at
+   * this point)"
+   */
+  if (str == domStr) {
+    return true;
+  }
+
+  /* "All of the following [three] conditions hold:" (order adjusted from the RFC) */
+
+  /* "* The string is a host name (i.e., not an IP address)." */
+  if (net.isIP(str)) {
+    return false;
+  }
+
+  /* "* The domain string is a suffix of the string" */
+  var idx = str.indexOf(domStr);
+  if (idx <= 0) {
+    return false; // it's a non-match (-1) or prefix (0)
+  }
+
+  // e.g "a.b.c".indexOf("b.c") === 2
+  // 5 === 3+2
+  if (str.length !== domStr.length + idx) { // it's not a suffix
+    return false;
+  }
+
+  /* "* The last character of the string that is not included in the domain
+  * string is a %x2E (".") character." */
+  if (str.substr(idx-1,1) !== '.') {
+    return false;
+  }
+
+  return true;
+}
+
+
+// RFC6265 S5.1.4 Paths and Path-Match
+
+/*
+ * "The user agent MUST use an algorithm equivalent to the following algorithm
+ * to compute the default-path of a cookie:"
+ *
+ * Assumption: the path (and not query part or absolute uri) is passed in.
+ */
+function defaultPath(path) {
+  // "2. If the uri-path is empty or if the first character of the uri-path is not
+  // a %x2F ("/") character, output %x2F ("/") and skip the remaining steps.
+  if (!path || path.substr(0,1) !== "/") {
+    return "/";
+  }
+
+  // "3. If the uri-path contains no more than one %x2F ("/") character, output
+  // %x2F ("/") and skip the remaining step."
+  if (path === "/") {
+    return path;
+  }
+
+  var rightSlash = path.lastIndexOf("/");
+  if (rightSlash === 0) {
+    return "/";
+  }
+
+  // "4. Output the characters of the uri-path from the first character up to,
+  // but not including, the right-most %x2F ("/")."
+  return path.slice(0, rightSlash);
+}
+
+function trimTerminator(str) {
+  for (var t = 0; t < TERMINATORS.length; t++) {
+    var terminatorIdx = str.indexOf(TERMINATORS[t]);
+    if (terminatorIdx !== -1) {
+      str = str.substr(0,terminatorIdx);
+    }
+  }
+
+  return str;
+}
+
+function parseCookiePair(cookiePair, looseMode) {
+  cookiePair = trimTerminator(cookiePair);
+
+  var firstEq = cookiePair.indexOf('=');
+  if (looseMode) {
+    if (firstEq === 0) { // '=' is immediately at start
+      cookiePair = cookiePair.substr(1);
+      firstEq = cookiePair.indexOf('='); // might still need to split on '='
+    }
+  } else { // non-loose mode
+    if (firstEq <= 0) { // no '=' or is at start
+      return; // needs to have non-empty "cookie-name"
+    }
+  }
+
+  var cookieName, cookieValue;
+  if (firstEq <= 0) {
+    cookieName = "";
+    cookieValue = cookiePair.trim();
+  } else {
+    cookieName = cookiePair.substr(0, firstEq).trim();
+    cookieValue = cookiePair.substr(firstEq+1).trim();
+  }
+
+  if (CONTROL_CHARS.test(cookieName) || CONTROL_CHARS.test(cookieValue)) {
+    return;
+  }
+
+  var c = new Cookie();
+  c.key = cookieName;
+  c.value = cookieValue;
+  return c;
+}
+
+function parse(str, options) {
+  if (!options || typeof options !== 'object') {
+    options = {};
+  }
+  str = str.trim();
+
+  // We use a regex to parse the "name-value-pair" part of S5.2
+  var firstSemi = str.indexOf(';'); // S5.2 step 1
+  var cookiePair = (firstSemi === -1) ? str : str.substr(0, firstSemi);
+  var c = parseCookiePair(cookiePair, !!options.loose);
+  if (!c) {
+    return;
+  }
+
+  if (firstSemi === -1) {
+    return c;
+  }
+
+  // S5.2.3 "unparsed-attributes consist of the remainder of the set-cookie-string
+  // (including the %x3B (";") in question)." plus later on in the same section
+  // "discard the first ";" and trim".
+  var unparsed = str.slice(firstSemi + 1).trim();
+
+  // "If the unparsed-attributes string is empty, skip the rest of these
+  // steps."
+  if (unparsed.length === 0) {
+    return c;
+  }
+
+  /*
+   * S5.2 says that when looping over the items "[p]rocess the attribute-name
+   * and attribute-value according to the requirements in the following
+   * subsections" for every item.  Plus, for many of the individual attributes
+   * in S5.3 it says to use the "attribute-value of the last attribute in the
+   * cookie-attribute-list".  Therefore, in this implementation, we overwrite
+   * the previous value.
+   */
+  var cookie_avs = unparsed.split(';');
+  while (cookie_avs.length) {
+    var av = cookie_avs.shift().trim();
+    if (av.length === 0) { // happens if ";;" appears
+      continue;
+    }
+    var av_sep = av.indexOf('=');
+    var av_key, av_value;
+
+    if (av_sep === -1) {
+      av_key = av;
+      av_value = null;
+    } else {
+      av_key = av.substr(0,av_sep);
+      av_value = av.substr(av_sep+1);
+    }
+
+    av_key = av_key.trim().toLowerCase();
+
+    if (av_value) {
+      av_value = av_value.trim();
+    }
+
+    switch(av_key) {
+    case 'expires': // S5.2.1
+      if (av_value) {
+        var exp = parseDate(av_value);
+        // "If the attribute-value failed to parse as a cookie date, ignore the
+        // cookie-av."
+        if (exp) {
+          // over and underflow not realistically a concern: V8's getTime() seems to
+          // store something larger than a 32-bit time_t (even with 32-bit node)
+          c.expires = exp;
+        }
+      }
+      break;
+
+    case 'max-age': // S5.2.2
+      if (av_value) {
+        // "If the first character of the attribute-value is not a DIGIT or a "-"
+        // character ...[or]... If the remainder of attribute-value contains a
+        // non-DIGIT character, ignore the cookie-av."
+        if (/^-?[0-9]+$/.test(av_value)) {
+          var delta = parseInt(av_value, 10);
+          // "If delta-seconds is less than or equal to zero (0), let expiry-time
+          // be the earliest representable date and time."
+          c.setMaxAge(delta);
+        }
+      }
+      break;
+
+    case 'domain': // S5.2.3
+      // "If the attribute-value is empty, the behavior is undefined.  However,
+      // the user agent SHOULD ignore the cookie-av entirely."
+      if (av_value) {
+        // S5.2.3 "Let cookie-domain be the attribute-value without the leading %x2E
+        // (".") character."
+        var domain = av_value.trim().replace(/^\./, '');
+        if (domain) {
+          // "Convert the cookie-domain to lower case."
+          c.domain = domain.toLowerCase();
+        }
+      }
+      break;
+
+    case 'path': // S5.2.4
+      /*
+       * "If the attribute-value is empty or if the first character of the
+       * attribute-value is not %x2F ("/"):
+       *   Let cookie-path be the default-path.
+       * Otherwise:
+       *   Let cookie-path be the attribute-value."
+       *
+       * We'll represent the default-path as null since it depends on the
+       * context of the parsing.
+       */
+      c.path = av_value && av_value[0] === "/" ? av_value : null;
+      break;
+
+    case 'secure': // S5.2.5
+      /*
+       * "If the attribute-name case-insensitively matches the string "Secure",
+       * the user agent MUST append an attribute to the cookie-attribute-list
+       * with an attribute-name of Secure and an empty attribute-value."
+       */
+      c.secure = true;
+      break;
+
+    case 'httponly': // S5.2.6 -- effectively the same as 'secure'
+      c.httpOnly = true;
+      break;
+
+    default:
+      c.extensions = c.extensions || [];
+      c.extensions.push(av);
+      break;
+    }
+  }
+
+  return c;
+}
+
+// avoid the V8 deoptimization monster!
+function jsonParse(str) {
+  var obj;
+  try {
+    obj = JSON.parse(str);
+  } catch (e) {
+    return e;
+  }
+  return obj;
+}
+
+function fromJSON(str) {
+  if (!str) {
+    return null;
+  }
+
+  var obj;
+  if (typeof str === 'string') {
+    obj = jsonParse(str);
+    if (obj instanceof Error) {
+      return null;
+    }
+  } else {
+    // assume it's an Object
+    obj = str;
+  }
+
+  var c = new Cookie();
+  for (var i=0; i<Cookie.serializableProperties.length; i++) {
+    var prop = Cookie.serializableProperties[i];
+    if (obj[prop] === undefined ||
+        obj[prop] === Cookie.prototype[prop])
+    {
+      continue; // leave as prototype default
+    }
+
+    if (prop === 'expires' ||
+        prop === 'creation' ||
+        prop === 'lastAccessed')
+    {
+      if (obj[prop] === null) {
+        c[prop] = null;
+      } else {
+        c[prop] = obj[prop] == "Infinity" ?
+          "Infinity" : new Date(obj[prop]);
+      }
+    } else {
+      c[prop] = obj[prop];
+    }
+  }
+
+  return c;
+}
+
+/* Section 5.4 part 2:
+ * "*  Cookies with longer paths are listed before cookies with
+ *     shorter paths.
+ *
+ *  *  Among cookies that have equal-length path fields, cookies with
+ *     earlier creation-times are listed before cookies with later
+ *     creation-times."
+ */
+
+function cookieCompare(a,b) {
+  var cmp = 0;
+
+  // descending for length: b CMP a
+  var aPathLen = a.path ? a.path.length : 0;
+  var bPathLen = b.path ? b.path.length : 0;
+  cmp = bPathLen - aPathLen;
+  if (cmp !== 0) {
+    return cmp;
+  }
+
+  // ascending for time: a CMP b
+  var aTime = a.creation ? a.creation.getTime() : MAX_TIME;
+  var bTime = b.creation ? b.creation.getTime() : MAX_TIME;
+  cmp = aTime - bTime;
+  if (cmp !== 0) {
+    return cmp;
+  }
+
+  // break ties for the same millisecond (precision of JavaScript's clock)
+  cmp = a.creationIndex - b.creationIndex;
+
+  return cmp;
+}
+
+// Gives the permutation of all possible pathMatch()es of a given path. The
+// array is in longest-to-shortest order.  Handy for indexing.
+function permutePath(path) {
+  if (path === '/') {
+    return ['/'];
+  }
+  if (path.lastIndexOf('/') === path.length-1) {
+    path = path.substr(0,path.length-1);
+  }
+  var permutations = [path];
+  while (path.length > 1) {
+    var lindex = path.lastIndexOf('/');
+    if (lindex === 0) {
+      break;
+    }
+    path = path.substr(0,lindex);
+    permutations.push(path);
+  }
+  permutations.push('/');
+  return permutations;
+}
+
+function getCookieContext(url) {
+  if (url instanceof Object) {
+    return url;
+  }
+  // NOTE: decodeURI will throw on malformed URIs (see GH-32).
+  // Therefore, we will just skip decoding for such URIs.
+  try {
+    url = decodeURI(url);
+  }
+  catch(err) {
+    // Silently swallow error
+  }
+
+  return urlParse(url);
+}
+
+function Cookie(options) {
+  options = options || {};
+
+  Object.keys(options).forEach(function(prop) {
+    if (Cookie.prototype.hasOwnProperty(prop) &&
+        Cookie.prototype[prop] !== options[prop] &&
+        prop.substr(0,1) !== '_')
+    {
+      this[prop] = options[prop];
+    }
+  }, this);
+
+  this.creation = this.creation || new Date();
+
+  // used to break creation ties in cookieCompare():
+  Object.defineProperty(this, 'creationIndex', {
+    configurable: false,
+    enumerable: false, // important for assert.deepEqual checks
+    writable: true,
+    value: ++Cookie.cookiesCreated
+  });
+}
+
+Cookie.cookiesCreated = 0; // incremented each time a cookie is created
+
+Cookie.parse = parse;
+Cookie.fromJSON = fromJSON;
+
+Cookie.prototype.key = "";
+Cookie.prototype.value = "";
+
+// the order in which the RFC has them:
+Cookie.prototype.expires = "Infinity"; // coerces to literal Infinity
+Cookie.prototype.maxAge = null; // takes precedence over expires for TTL
+Cookie.prototype.domain = null;
+Cookie.prototype.path = null;
+Cookie.prototype.secure = false;
+Cookie.prototype.httpOnly = false;
+Cookie.prototype.extensions = null;
+
+// set by the CookieJar:
+Cookie.prototype.hostOnly = null; // boolean when set
+Cookie.prototype.pathIsDefault = null; // boolean when set
+Cookie.prototype.creation = null; // Date when set; defaulted by Cookie.parse
+Cookie.prototype.lastAccessed = null; // Date when set
+Object.defineProperty(Cookie.prototype, 'creationIndex', {
+  configurable: true,
+  enumerable: false,
+  writable: true,
+  value: 0
+});
+
+Cookie.serializableProperties = Object.keys(Cookie.prototype)
+  .filter(function(prop) {
+    return !(
+      Cookie.prototype[prop] instanceof Function ||
+      prop === 'creationIndex' ||
+      prop.substr(0,1) === '_'
+    );
+  });
+
+Cookie.prototype.inspect = function inspect() {
+  var now = Date.now();
+  return 'Cookie="'+this.toString() +
+    '; hostOnly='+(this.hostOnly != null ? this.hostOnly : '?') +
+    '; aAge='+(this.lastAccessed ? (now-this.lastAccessed.getTime())+'ms' : '?') +
+    '; cAge='+(this.creation ? (now-this.creation.getTime())+'ms' : '?') +
+    '"';
+};
+
+Cookie.prototype.toJSON = function() {
+  var obj = {};
+
+  var props = Cookie.serializableProperties;
+  for (var i=0; i<props.length; i++) {
+    var prop = props[i];
+    if (this[prop] === Cookie.prototype[prop]) {
+      continue; // leave as prototype default
+    }
+
+    if (prop === 'expires' ||
+        prop === 'creation' ||
+        prop === 'lastAccessed')
+    {
+      if (this[prop] === null) {
+        obj[prop] = null;
+      } else {
+        obj[prop] = this[prop] == "Infinity" ? // intentionally not ===
+          "Infinity" : this[prop].toISOString();
+      }
+    } else if (prop === 'maxAge') {
+      if (this[prop] !== null) {
+        // again, intentionally not ===
+        obj[prop] = (this[prop] == Infinity || this[prop] == -Infinity) ?
+          this[prop].toString() : this[prop];
+      }
+    } else {
+      if (this[prop] !== Cookie.prototype[prop]) {
+        obj[prop] = this[prop];
+      }
+    }
+  }
+
+  return obj;
+};
+
+Cookie.prototype.clone = function() {
+  return fromJSON(this.toJSON());
+};
+
+Cookie.prototype.validate = function validate() {
+  if (!COOKIE_OCTETS.test(this.value)) {
+    return false;
+  }
+  if (this.expires != Infinity && !(this.expires instanceof Date) && !parseDate(this.expires)) {
+    return false;
+  }
+  if (this.maxAge != null && this.maxAge <= 0) {
+    return false; // "Max-Age=" non-zero-digit *DIGIT
+  }
+  if (this.path != null && !PATH_VALUE.test(this.path)) {
+    return false;
+  }
+
+  var cdomain = this.cdomain();
+  if (cdomain) {
+    if (cdomain.match(/\.$/)) {
+      return false; // S4.1.2.3 suggests that this is bad. domainMatch() tests confirm this
+    }
+    var suffix = pubsuffix.getPublicSuffix(cdomain);
+    if (suffix == null) { // it's a public suffix
+      return false;
+    }
+  }
+  return true;
+};
+
+Cookie.prototype.setExpires = function setExpires(exp) {
+  if (exp instanceof Date) {
+    this.expires = exp;
+  } else {
+    this.expires = parseDate(exp) || "Infinity";
+  }
+};
+
+Cookie.prototype.setMaxAge = function setMaxAge(age) {
+  if (age === Infinity || age === -Infinity) {
+    this.maxAge = age.toString(); // so JSON.stringify() works
+  } else {
+    this.maxAge = age;
+  }
+};
+
+// gives Cookie header format
+Cookie.prototype.cookieString = function cookieString() {
+  var val = this.value;
+  if (val == null) {
+    val = '';
+  }
+  if (this.key === '') {
+    return val;
+  }
+  return this.key+'='+val;
+};
+
+// gives Set-Cookie header format
+Cookie.prototype.toString = function toString() {
+  var str = this.cookieString();
+
+  if (this.expires != Infinity) {
+    if (this.expires instanceof Date) {
+      str += '; Expires='+formatDate(this.expires);
+    } else {
+      str += '; Expires='+this.expires;
+    }
+  }
+
+  if (this.maxAge != null && this.maxAge != Infinity) {
+    str += '; Max-Age='+this.maxAge;
+  }
+
+  if (this.domain && !this.hostOnly) {
+    str += '; Domain='+this.domain;
+  }
+  if (this.path) {
+    str += '; Path='+this.path;
+  }
+
+  if (this.secure) {
+    str += '; Secure';
+  }
+  if (this.httpOnly) {
+    str += '; HttpOnly';
+  }
+  if (this.extensions) {
+    this.extensions.forEach(function(ext) {
+      str += '; '+ext;
+    });
+  }
+
+  return str;
+};
+
+// TTL() partially replaces the "expiry-time" parts of S5.3 step 3 (setCookie()
+// elsewhere)
+// S5.3 says to give the "latest representable date" for which we use Infinity
+// For "expired" we use 0
+Cookie.prototype.TTL = function TTL(now) {
+  /* RFC6265 S4.1.2.2 If a cookie has both the Max-Age and the Expires
+   * attribute, the Max-Age attribute has precedence and controls the
+   * expiration date of the cookie.
+   * (Concurs with S5.3 step 3)
+   */
+  if (this.maxAge != null) {
+    return this.maxAge<=0 ? 0 : this.maxAge*1000;
+  }
+
+  var expires = this.expires;
+  if (expires != Infinity) {
+    if (!(expires instanceof Date)) {
+      expires = parseDate(expires) || Infinity;
+    }
+
+    if (expires == Infinity) {
+      return Infinity;
+    }
+
+    return expires.getTime() - (now || Date.now());
+  }
+
+  return Infinity;
+};
+
+// expiryTime() replaces the "expiry-time" parts of S5.3 step 3 (setCookie()
+// elsewhere)
+Cookie.prototype.expiryTime = function expiryTime(now) {
+  if (this.maxAge != null) {
+    var relativeTo = now || this.creation || new Date();
+    var age = (this.maxAge <= 0) ? -Infinity : this.maxAge*1000;
+    return relativeTo.getTime() + age;
+  }
+
+  if (this.expires == Infinity) {
+    return Infinity;
+  }
+  return this.expires.getTime();
+};
+
+// expiryDate() replaces the "expiry-time" parts of S5.3 step 3 (setCookie()
+// elsewhere), except it returns a Date
+Cookie.prototype.expiryDate = function expiryDate(now) {
+  var millisec = this.expiryTime(now);
+  if (millisec == Infinity) {
+    return new Date(MAX_TIME);
+  } else if (millisec == -Infinity) {
+    return new Date(MIN_TIME);
+  } else {
+    return new Date(millisec);
+  }
+};
+
+// This replaces the "persistent-flag" parts of S5.3 step 3
+Cookie.prototype.isPersistent = function isPersistent() {
+  return (this.maxAge != null || this.expires != Infinity);
+};
+
+// Mostly S5.1.2 and S5.2.3:
+Cookie.prototype.cdomain =
+Cookie.prototype.canonicalizedDomain = function canonicalizedDomain() {
+  if (this.domain == null) {
+    return null;
+  }
+  return canonicalDomain(this.domain);
+};
+
+function CookieJar(store, options) {
+  if (typeof options === "boolean") {
+    options = {rejectPublicSuffixes: options};
+  } else if (options == null) {
+    options = {};
+  }
+  if (options.rejectPublicSuffixes != null) {
+    this.rejectPublicSuffixes = options.rejectPublicSuffixes;
+  }
+  if (options.looseMode != null) {
+    this.enableLooseMode = options.looseMode;
+  }
+
+  if (!store) {
+    store = new MemoryCookieStore();
+  }
+  this.store = store;
+}
+CookieJar.prototype.store = null;
+CookieJar.prototype.rejectPublicSuffixes = true;
+CookieJar.prototype.enableLooseMode = false;
+var CAN_BE_SYNC = [];
+
+CAN_BE_SYNC.push('setCookie');
+CookieJar.prototype.setCookie = function(cookie, url, options, cb) {
+  var err;
+  var context = getCookieContext(url);
+  if (options instanceof Function) {
+    cb = options;
+    options = {};
+  }
+
+  var host = canonicalDomain(context.hostname);
+  var loose = this.enableLooseMode;
+  if (options.loose != null) {
+    loose = options.loose;
+  }
+
+  // S5.3 step 1
+  if (!(cookie instanceof Cookie)) {
+    cookie = Cookie.parse(cookie, { loose: loose });
+  }
+  if (!cookie) {
+    err = new Error("Cookie failed to parse");
+    return cb(options.ignoreError ? null : err);
+  }
+
+  // S5.3 step 2
+  var now = options.now || new Date(); // will assign later to save effort in the face of errors
+
+  // S5.3 step 3: NOOP; persistent-flag and expiry-time is handled by getCookie()
+
+  // S5.3 step 4: NOOP; domain is null by default
+
+  // S5.3 step 5: public suffixes
+  if (this.rejectPublicSuffixes && cookie.domain) {
+    var suffix = pubsuffix.getPublicSuffix(cookie.cdomain());
+    if (suffix == null) { // e.g. "com"
+      err = new Error("Cookie has domain set to a public suffix");
+      return cb(options.ignoreError ? null : err);
+    }
+  }
+
+  // S5.3 step 6:
+  if (cookie.domain) {
+    if (!domainMatch(host, cookie.cdomain(), false)) {
+      err = new Error("Cookie not in this host's domain. Cookie:"+cookie.cdomain()+" Request:"+host);
+      return cb(options.ignoreError ? null : err);
+    }
+
+    if (cookie.hostOnly == null) { // don't reset if already set
+      cookie.hostOnly = false;
+    }
+
+  } else {
+    cookie.hostOnly = true;
+    cookie.domain = host;
+  }
+
+  //S5.2.4 If the attribute-value is empty or if the first character of the
+  //attribute-value is not %x2F ("/"):
+  //Let cookie-path be the default-path.
+  if (!cookie.path || cookie.path[0] !== '/') {
+    cookie.path = defaultPath(context.pathname);
+    cookie.pathIsDefault = true;
+  }
+
+  // S5.3 step 8: NOOP; secure attribute
+  // S5.3 step 9: NOOP; httpOnly attribute
+
+  // S5.3 step 10
+  if (options.http === false && cookie.httpOnly) {
+    err = new Error("Cookie is HttpOnly and this isn't an HTTP API");
+    return cb(options.ignoreError ? null : err);
+  }
+
+  var store = this.store;
+
+  if (!store.updateCookie) {
+    store.updateCookie = function(oldCookie, newCookie, cb) {
+      this.putCookie(newCookie, cb);
+    };
+  }
+
+  function withCookie(err, oldCookie) {
+    if (err) {
+      return cb(err);
+    }
+
+    var next = function(err) {
+      if (err) {
+        return cb(err);
+      } else {
+        cb(null, cookie);
+      }
+    };
+
+    if (oldCookie) {
+      // S5.3 step 11 - "If the cookie store contains a cookie with the same name,
+      // domain, and path as the newly created cookie:"
+      if (options.http === false && oldCookie.httpOnly) { // step 11.2
+        err = new Error("old Cookie is HttpOnly and this isn't an HTTP API");
+        return cb(options.ignoreError ? null : err);
+      }
+      cookie.creation = oldCookie.creation; // step 11.3
+      cookie.creationIndex = oldCookie.creationIndex; // preserve tie-breaker
+      cookie.lastAccessed = now;
+      // Step 11.4 (delete cookie) is implied by just setting the new one:
+      store.updateCookie(oldCookie, cookie, next); // step 12
+
+    } else {
+      cookie.creation = cookie.lastAccessed = now;
+      store.putCookie(cookie, next); // step 12
+    }
+  }
+
+  store.findCookie(cookie.domain, cookie.path, cookie.key, withCookie);
+};
+
+// RFC6365 S5.4
+CAN_BE_SYNC.push('getCookies');
+CookieJar.prototype.getCookies = function(url, options, cb) {
+  var context = getCookieContext(url);
+  if (options instanceof Function) {
+    cb = options;
+    options = {};
+  }
+
+  var host = canonicalDomain(context.hostname);
+  var path = context.pathname || '/';
+
+  var secure = options.secure;
+  if (secure == null && context.protocol &&
+      (context.protocol == 'https:' || context.protocol == 'wss:'))
+  {
+    secure = true;
+  }
+
+  var http = options.http;
+  if (http == null) {
+    http = true;
+  }
+
+  var now = options.now || Date.now();
+  var expireCheck = options.expire !== false;
+  var allPaths = !!options.allPaths;
+  var store = this.store;
+
+  function matchingCookie(c) {
+    // "Either:
+    //   The cookie's host-only-flag is true and the canonicalized
+    //   request-host is identical to the cookie's domain.
+    // Or:
+    //   The cookie's host-only-flag is false and the canonicalized
+    //   request-host domain-matches the cookie's domain."
+    if (c.hostOnly) {
+      if (c.domain != host) {
+        return false;
+      }
+    } else {
+      if (!domainMatch(host, c.domain, false)) {
+        return false;
+      }
+    }
+
+    // "The request-uri's path path-matches the cookie's path."
+    if (!allPaths && !pathMatch(path, c.path)) {
+      return false;
+    }
+
+    // "If the cookie's secure-only-flag is true, then the request-uri's
+    // scheme must denote a "secure" protocol"
+    if (c.secure && !secure) {
+      return false;
+    }
+
+    // "If the cookie's http-only-flag is true, then exclude the cookie if the
+    // cookie-string is being generated for a "non-HTTP" API"
+    if (c.httpOnly && !http) {
+      return false;
+    }
+
+    // deferred from S5.3
+    // non-RFC: allow retention of expired cookies by choice
+    if (expireCheck && c.expiryTime() <= now) {
+      store.removeCookie(c.domain, c.path, c.key, function(){}); // result ignored
+      return false;
+    }
+
+    return true;
+  }
+
+  store.findCookies(host, allPaths ? null : path, function(err,cookies) {
+    if (err) {
+      return cb(err);
+    }
+
+    cookies = cookies.filter(matchingCookie);
+
+    // sorting of S5.4 part 2
+    if (options.sort !== false) {
+      cookies = cookies.sort(cookieCompare);
+    }
+
+    // S5.4 part 3
+    var now = new Date();
+    cookies.forEach(function(c) {
+      c.lastAccessed = now;
+    });
+    // TODO persist lastAccessed
+
+    cb(null,cookies);
+  });
+};
+
+CAN_BE_SYNC.push('getCookieString');
+CookieJar.prototype.getCookieString = function(/*..., cb*/) {
+  var args = Array.prototype.slice.call(arguments,0);
+  var cb = args.pop();
+  var next = function(err,cookies) {
+    if (err) {
+      cb(err);
+    } else {
+      cb(null, cookies
+        .sort(cookieCompare)
+        .map(function(c){
+          return c.cookieString();
+        })
+        .join('; '));
+    }
+  };
+  args.push(next);
+  this.getCookies.apply(this,args);
+};
+
+CAN_BE_SYNC.push('getSetCookieStrings');
+CookieJar.prototype.getSetCookieStrings = function(/*..., cb*/) {
+  var args = Array.prototype.slice.call(arguments,0);
+  var cb = args.pop();
+  var next = function(err,cookies) {
+    if (err) {
+      cb(err);
+    } else {
+      cb(null, cookies.map(function(c){
+        return c.toString();
+      }));
+    }
+  };
+  args.push(next);
+  this.getCookies.apply(this,args);
+};
+
+CAN_BE_SYNC.push('serialize');
+CookieJar.prototype.serialize = function(cb) {
+  var type = this.store.constructor.name;
+  if (type === 'Object') {
+    type = null;
+  }
+
+  // update README.md "Serialization Format" if you change this, please!
+  var serialized = {
+    // The version of tough-cookie that serialized this jar. Generally a good
+    // practice since future versions can make data import decisions based on
+    // known past behavior. When/if this matters, use `semver`.
+    version: 'tough-cookie@'+VERSION,
+
+    // add the store type, to make humans happy:
+    storeType: type,
+
+    // CookieJar configuration:
+    rejectPublicSuffixes: !!this.rejectPublicSuffixes,
+
+    // this gets filled from getAllCookies:
+    cookies: []
+  };
+
+  if (!(this.store.getAllCookies &&
+        typeof this.store.getAllCookies === 'function'))
+  {
+    return cb(new Error('store does not support getAllCookies and cannot be serialized'));
+  }
+
+  this.store.getAllCookies(function(err,cookies) {
+    if (err) {
+      return cb(err);
+    }
+
+    serialized.cookies = cookies.map(function(cookie) {
+      // convert to serialized 'raw' cookies
+      cookie = (cookie instanceof Cookie) ? cookie.toJSON() : cookie;
+
+      // Remove the index so new ones get assigned during deserialization
+      delete cookie.creationIndex;
+
+      return cookie;
+    });
+
+    return cb(null, serialized);
+  });
+};
+
+// well-known name that JSON.stringify calls
+CookieJar.prototype.toJSON = function() {
+  return this.serializeSync();
+};
+
+// use the class method CookieJar.deserialize instead of calling this directly
+CAN_BE_SYNC.push('_importCookies');
+CookieJar.prototype._importCookies = function(serialized, cb) {
+  var jar = this;
+  var cookies = serialized.cookies;
+  if (!cookies || !Array.isArray(cookies)) {
+    return cb(new Error('serialized jar has no cookies array'));
+  }
+  cookies = cookies.slice(); // do not modify the original
+
+  function putNext(err) {
+    if (err) {
+      return cb(err);
+    }
+
+    if (!cookies.length) {
+      return cb(err, jar);
+    }
+
+    var cookie;
+    try {
+      cookie = fromJSON(cookies.shift());
+    } catch (e) {
+      return cb(e);
+    }
+
+    if (cookie === null) {
+      return putNext(null); // skip this cookie
+    }
+
+    jar.store.putCookie(cookie, putNext);
+  }
+
+  putNext();
+};
+
+CookieJar.deserialize = function(strOrObj, store, cb) {
+  if (arguments.length !== 3) {
+    // store is optional
+    cb = store;
+    store = null;
+  }
+
+  var serialized;
+  if (typeof strOrObj === 'string') {
+    serialized = jsonParse(strOrObj);
+    if (serialized instanceof Error) {
+      return cb(serialized);
+    }
+  } else {
+    serialized = strOrObj;
+  }
+
+  var jar = new CookieJar(store, serialized.rejectPublicSuffixes);
+  jar._importCookies(serialized, function(err) {
+    if (err) {
+      return cb(err);
+    }
+    cb(null, jar);
+  });
+};
+
+CookieJar.deserializeSync = function(strOrObj, store) {
+  var serialized = typeof strOrObj === 'string' ?
+    JSON.parse(strOrObj) : strOrObj;
+  var jar = new CookieJar(store, serialized.rejectPublicSuffixes);
+
+  // catch this mistake early:
+  if (!jar.store.synchronous) {
+    throw new Error('CookieJar store is not synchronous; use async API instead.');
+  }
+
+  jar._importCookiesSync(serialized);
+  return jar;
+};
+CookieJar.fromJSON = CookieJar.deserializeSync;
+
+CAN_BE_SYNC.push('clone');
+CookieJar.prototype.clone = function(newStore, cb) {
+  if (arguments.length === 1) {
+    cb = newStore;
+    newStore = null;
+  }
+
+  this.serialize(function(err,serialized) {
+    if (err) {
+      return cb(err);
+    }
+    CookieJar.deserialize(newStore, serialized, cb);
+  });
+};
+
+// Use a closure to provide a true imperative API for synchronous stores.
+function syncWrap(method) {
+  return function() {
+    if (!this.store.synchronous) {
+      throw new Error('CookieJar store is not synchronous; use async API instead.');
+    }
+
+    var args = Array.prototype.slice.call(arguments);
+    var syncErr, syncResult;
+    args.push(function syncCb(err, result) {
+      syncErr = err;
+      syncResult = result;
+    });
+    this[method].apply(this, args);
+
+    if (syncErr) {
+      throw syncErr;
+    }
+    return syncResult;
+  };
+}
+
+// wrap all declared CAN_BE_SYNC methods in the sync wrapper
+CAN_BE_SYNC.forEach(function(method) {
+  CookieJar.prototype[method+'Sync'] = syncWrap(method);
+});
+
+module.exports = {
+  CookieJar: CookieJar,
+  Cookie: Cookie,
+  Store: Store,
+  MemoryCookieStore: MemoryCookieStore,
+  parseDate: parseDate,
+  formatDate: formatDate,
+  parse: parse,
+  fromJSON: fromJSON,
+  domainMatch: domainMatch,
+  defaultPath: defaultPath,
+  pathMatch: pathMatch,
+  getPublicSuffix: pubsuffix.getPublicSuffix,
+  cookieCompare: cookieCompare,
+  permuteDomain: __webpack_require__(414).permuteDomain,
+  permutePath: permutePath,
+  canonicalDomain: canonicalDomain
+};
+
+
+/***/ }),
+/* 811 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*!
+ * Copyright (c) 2015, Salesforce.com, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of Salesforce.com nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+var Store = __webpack_require__(416).Store;
+var permuteDomain = __webpack_require__(414).permuteDomain;
+var pathMatch = __webpack_require__(413).pathMatch;
+var util = __webpack_require__(3);
+
+function MemoryCookieStore() {
+  Store.call(this);
+  this.idx = {};
+}
+util.inherits(MemoryCookieStore, Store);
+exports.MemoryCookieStore = MemoryCookieStore;
+MemoryCookieStore.prototype.idx = null;
+
+// Since it's just a struct in RAM, this Store is synchronous
+MemoryCookieStore.prototype.synchronous = true;
+
+// force a default depth:
+MemoryCookieStore.prototype.inspect = function() {
+  return "{ idx: "+util.inspect(this.idx, false, 2)+' }';
+};
+
+MemoryCookieStore.prototype.findCookie = function(domain, path, key, cb) {
+  if (!this.idx[domain]) {
+    return cb(null,undefined);
+  }
+  if (!this.idx[domain][path]) {
+    return cb(null,undefined);
+  }
+  return cb(null,this.idx[domain][path][key]||null);
+};
+
+MemoryCookieStore.prototype.findCookies = function(domain, path, cb) {
+  var results = [];
+  if (!domain) {
+    return cb(null,[]);
+  }
+
+  var pathMatcher;
+  if (!path) {
+    // null means "all paths"
+    pathMatcher = function matchAll(domainIndex) {
+      for (var curPath in domainIndex) {
+        var pathIndex = domainIndex[curPath];
+        for (var key in pathIndex) {
+          results.push(pathIndex[key]);
+        }
+      }
+    };
+
+  } else {
+    pathMatcher = function matchRFC(domainIndex) {
+       //NOTE: we should use path-match algorithm from S5.1.4 here
+       //(see : https://github.com/ChromiumWebApps/chromium/blob/b3d3b4da8bb94c1b2e061600df106d590fda3620/net/cookies/canonical_cookie.cc#L299)
+       Object.keys(domainIndex).forEach(function (cookiePath) {
+         if (pathMatch(path, cookiePath)) {
+           var pathIndex = domainIndex[cookiePath];
+
+           for (var key in pathIndex) {
+             results.push(pathIndex[key]);
+           }
+         }
+       });
+     };
+  }
+
+  var domains = permuteDomain(domain) || [domain];
+  var idx = this.idx;
+  domains.forEach(function(curDomain) {
+    var domainIndex = idx[curDomain];
+    if (!domainIndex) {
+      return;
+    }
+    pathMatcher(domainIndex);
+  });
+
+  cb(null,results);
+};
+
+MemoryCookieStore.prototype.putCookie = function(cookie, cb) {
+  if (!this.idx[cookie.domain]) {
+    this.idx[cookie.domain] = {};
+  }
+  if (!this.idx[cookie.domain][cookie.path]) {
+    this.idx[cookie.domain][cookie.path] = {};
+  }
+  this.idx[cookie.domain][cookie.path][cookie.key] = cookie;
+  cb(null);
+};
+
+MemoryCookieStore.prototype.updateCookie = function(oldCookie, newCookie, cb) {
+  // updateCookie() may avoid updating cookies that are identical.  For example,
+  // lastAccessed may not be important to some stores and an equality
+  // comparison could exclude that field.
+  this.putCookie(newCookie,cb);
+};
+
+MemoryCookieStore.prototype.removeCookie = function(domain, path, key, cb) {
+  if (this.idx[domain] && this.idx[domain][path] && this.idx[domain][path][key]) {
+    delete this.idx[domain][path][key];
+  }
+  cb(null);
+};
+
+MemoryCookieStore.prototype.removeCookies = function(domain, path, cb) {
+  if (this.idx[domain]) {
+    if (path) {
+      delete this.idx[domain][path];
+    } else {
+      delete this.idx[domain];
+    }
+  }
+  return cb(null);
+};
+
+MemoryCookieStore.prototype.getAllCookies = function(cb) {
+  var cookies = [];
+  var idx = this.idx;
+
+  var domains = Object.keys(idx);
+  domains.forEach(function(domain) {
+    var paths = Object.keys(idx[domain]);
+    paths.forEach(function(path) {
+      var keys = Object.keys(idx[domain][path]);
+      keys.forEach(function(key) {
+        if (key !== null) {
+          cookies.push(idx[domain][path][key]);
+        }
+      });
+    });
+  });
+
+  // Sort by creationIndex so deserializing retains the creation order.
+  // When implementing your own store, this SHOULD retain the order too
+  cookies.sort(function(a,b) {
+    return (a.creationIndex||0) - (b.creationIndex||0);
+  });
+
+  cb(null, cookies);
+};
+
+
+/***/ }),
+/* 812 */
+/***/ (function(module, exports) {
+
+module.exports = {"author":{"name":"Jeremy Stashewsky","email":"jstashewsky@salesforce.com","website":"https://github.com/stash"},"contributors":[{"name":"Alexander Savin","website":"https://github.com/apsavin"},{"name":"Ian Livingstone","website":"https://github.com/ianlivingstone"},{"name":"Ivan Nikulin","website":"https://github.com/inikulin"},{"name":"Lalit Kapoor","website":"https://github.com/lalitkapoor"},{"name":"Sam Thompson","website":"https://github.com/sambthompson"},{"name":"Sebastian Mayr","website":"https://github.com/Sebmaster"}],"license":"BSD-3-Clause","name":"tough-cookie","description":"RFC6265 Cookies and Cookie Jar for node.js","keywords":["HTTP","cookie","cookies","set-cookie","cookiejar","jar","RFC6265","RFC2965"],"version":"2.3.4","homepage":"https://github.com/salesforce/tough-cookie","repository":{"type":"git","url":"git://github.com/salesforce/tough-cookie.git"},"bugs":{"url":"https://github.com/salesforce/tough-cookie/issues"},"main":"./lib/cookie","files":["lib"],"scripts":{"suffixup":"curl -o public_suffix_list.dat https://publicsuffix.org/list/public_suffix_list.dat && ./generate-pubsuffix.js","test":"vows test/*_test.js"},"engines":{"node":">=0.8"},"devDependencies":{"async":"^1.4.2","string.prototype.repeat":"^0.2.0","vows":"^0.8.1"},"dependencies":{"punycode":"^1.4.1"}}
+
+/***/ }),
+/* 813 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var http = __webpack_require__(87)
+var https = __webpack_require__(195)
+var url = __webpack_require__(24)
+var util = __webpack_require__(3)
+var stream = __webpack_require__(23)
+var zlib = __webpack_require__(198)
+var aws2 = __webpack_require__(521)
+var aws4 = __webpack_require__(522)
+var httpSignature = __webpack_require__(680)
+var mime = __webpack_require__(400)
+var caseless = __webpack_require__(231)
+var ForeverAgent = __webpack_require__(648)
+var FormData = __webpack_require__(649)
+var extend = __webpack_require__(269)
+var isstream = __webpack_require__(399)
+var isTypedArray = __webpack_require__(742).strict
+var helpers = __webpack_require__(305)
+var cookies = __webpack_require__(412)
+var getProxyFromURI = __webpack_require__(802)
+var Querystring = __webpack_require__(807).Querystring
+var Har = __webpack_require__(803).Har
+var Auth = __webpack_require__(801).Auth
+var OAuth = __webpack_require__(806).OAuth
+var hawk = __webpack_require__(804)
+var Multipart = __webpack_require__(805).Multipart
+var Redirect = __webpack_require__(808).Redirect
+var Tunnel = __webpack_require__(809).Tunnel
+var now = __webpack_require__(776)
+var Buffer = __webpack_require__(45).Buffer
+
+var safeStringify = helpers.safeStringify
+var isReadStream = helpers.isReadStream
+var toBase64 = helpers.toBase64
+var defer = helpers.defer
+var copy = helpers.copy
+var version = helpers.version
+var globalCookieJar = cookies.jar()
+
+var globalPool = {}
+
+function filterForNonReserved (reserved, options) {
+  // Filter out properties that are not reserved.
+  // Reserved values are passed in at call site.
+
+  var object = {}
+  for (var i in options) {
+    var notReserved = (reserved.indexOf(i) === -1)
+    if (notReserved) {
+      object[i] = options[i]
+    }
+  }
+  return object
+}
+
+function filterOutReservedFunctions (reserved, options) {
+  // Filter out properties that are functions and are reserved.
+  // Reserved values are passed in at call site.
+
+  var object = {}
+  for (var i in options) {
+    var isReserved = !(reserved.indexOf(i) === -1)
+    var isFunction = (typeof options[i] === 'function')
+    if (!(isReserved && isFunction)) {
+      object[i] = options[i]
+    }
+  }
+  return object
+}
+
+// Return a simpler request object to allow serialization
+function requestToJSON () {
+  var self = this
+  return {
+    uri: self.uri,
+    method: self.method,
+    headers: self.headers
+  }
+}
+
+// Return a simpler response object to allow serialization
+function responseToJSON () {
+  var self = this
+  return {
+    statusCode: self.statusCode,
+    body: self.body,
+    headers: self.headers,
+    request: requestToJSON.call(self.request)
+  }
+}
+
+function Request (options) {
+  // if given the method property in options, set property explicitMethod to true
+
+  // extend the Request instance with any non-reserved properties
+  // remove any reserved functions from the options object
+  // set Request instance to be readable and writable
+  // call init
+
+  var self = this
+
+  // start with HAR, then override with additional options
+  if (options.har) {
+    self._har = new Har(self)
+    options = self._har.options(options)
+  }
+
+  stream.Stream.call(self)
+  var reserved = Object.keys(Request.prototype)
+  var nonReserved = filterForNonReserved(reserved, options)
+
+  extend(self, nonReserved)
+  options = filterOutReservedFunctions(reserved, options)
+
+  self.readable = true
+  self.writable = true
+  if (options.method) {
+    self.explicitMethod = true
+  }
+  self._qs = new Querystring(self)
+  self._auth = new Auth(self)
+  self._oauth = new OAuth(self)
+  self._multipart = new Multipart(self)
+  self._redirect = new Redirect(self)
+  self._tunnel = new Tunnel(self)
+  self.init(options)
+}
+
+util.inherits(Request, stream.Stream)
+
+// Debugging
+Request.debug = process.env.NODE_DEBUG && /\brequest\b/.test(process.env.NODE_DEBUG)
+function debug () {
+  if (Request.debug) {
+    console.error('REQUEST %s', util.format.apply(util, arguments))
+  }
+}
+Request.prototype.debug = debug
+
+Request.prototype.init = function (options) {
+  // init() contains all the code to setup the request object.
+  // the actual outgoing request is not started until start() is called
+  // this function is called from both the constructor and on redirect.
+  var self = this
+  if (!options) {
+    options = {}
+  }
+  self.headers = self.headers ? copy(self.headers) : {}
+
+  // Delete headers with value undefined since they break
+  // ClientRequest.OutgoingMessage.setHeader in node 0.12
+  for (var headerName in self.headers) {
+    if (typeof self.headers[headerName] === 'undefined') {
+      delete self.headers[headerName]
+    }
+  }
+
+  caseless.httpify(self, self.headers)
+
+  if (!self.method) {
+    self.method = options.method || 'GET'
+  }
+  if (!self.localAddress) {
+    self.localAddress = options.localAddress
+  }
+
+  self._qs.init(options)
+
+  debug(options)
+  if (!self.pool && self.pool !== false) {
+    self.pool = globalPool
+  }
+  self.dests = self.dests || []
+  self.__isRequestRequest = true
+
+  // Protect against double callback
+  if (!self._callback && self.callback) {
+    self._callback = self.callback
+    self.callback = function () {
+      if (self._callbackCalled) {
+        return // Print a warning maybe?
+      }
+      self._callbackCalled = true
+      self._callback.apply(self, arguments)
+    }
+    self.on('error', self.callback.bind())
+    self.on('complete', self.callback.bind(self, null))
+  }
+
+  // People use this property instead all the time, so support it
+  if (!self.uri && self.url) {
+    self.uri = self.url
+    delete self.url
+  }
+
+  // If there's a baseUrl, then use it as the base URL (i.e. uri must be
+  // specified as a relative path and is appended to baseUrl).
+  if (self.baseUrl) {
+    if (typeof self.baseUrl !== 'string') {
+      return self.emit('error', new Error('options.baseUrl must be a string'))
+    }
+
+    if (typeof self.uri !== 'string') {
+      return self.emit('error', new Error('options.uri must be a string when using options.baseUrl'))
+    }
+
+    if (self.uri.indexOf('//') === 0 || self.uri.indexOf('://') !== -1) {
+      return self.emit('error', new Error('options.uri must be a path when using options.baseUrl'))
+    }
+
+    // Handle all cases to make sure that there's only one slash between
+    // baseUrl and uri.
+    var baseUrlEndsWithSlash = self.baseUrl.lastIndexOf('/') === self.baseUrl.length - 1
+    var uriStartsWithSlash = self.uri.indexOf('/') === 0
+
+    if (baseUrlEndsWithSlash && uriStartsWithSlash) {
+      self.uri = self.baseUrl + self.uri.slice(1)
+    } else if (baseUrlEndsWithSlash || uriStartsWithSlash) {
+      self.uri = self.baseUrl + self.uri
+    } else if (self.uri === '') {
+      self.uri = self.baseUrl
+    } else {
+      self.uri = self.baseUrl + '/' + self.uri
+    }
+    delete self.baseUrl
+  }
+
+  // A URI is needed by this point, emit error if we haven't been able to get one
+  if (!self.uri) {
+    return self.emit('error', new Error('options.uri is a required argument'))
+  }
+
+  // If a string URI/URL was given, parse it into a URL object
+  if (typeof self.uri === 'string') {
+    self.uri = url.parse(self.uri)
+  }
+
+  // Some URL objects are not from a URL parsed string and need href added
+  if (!self.uri.href) {
+    self.uri.href = url.format(self.uri)
+  }
+
+  // DEPRECATED: Warning for users of the old Unix Sockets URL Scheme
+  if (self.uri.protocol === 'unix:') {
+    return self.emit('error', new Error('`unix://` URL scheme is no longer supported. Please use the format `http://unix:SOCKET:PATH`'))
+  }
+
+  // Support Unix Sockets
+  if (self.uri.host === 'unix') {
+    self.enableUnixSocket()
+  }
+
+  if (self.strictSSL === false) {
+    self.rejectUnauthorized = false
+  }
+
+  if (!self.uri.pathname) { self.uri.pathname = '/' }
+
+  if (!(self.uri.host || (self.uri.hostname && self.uri.port)) && !self.uri.isUnix) {
+    // Invalid URI: it may generate lot of bad errors, like 'TypeError: Cannot call method `indexOf` of undefined' in CookieJar
+    // Detect and reject it as soon as possible
+    var faultyUri = url.format(self.uri)
+    var message = 'Invalid URI "' + faultyUri + '"'
+    if (Object.keys(options).length === 0) {
+      // No option ? This can be the sign of a redirect
+      // As this is a case where the user cannot do anything (they didn't call request directly with this URL)
+      // they should be warned that it can be caused by a redirection (can save some hair)
+      message += '. This can be caused by a crappy redirection.'
+    }
+    // This error was fatal
+    self.abort()
+    return self.emit('error', new Error(message))
+  }
+
+  if (!self.hasOwnProperty('proxy')) {
+    self.proxy = getProxyFromURI(self.uri)
+  }
+
+  self.tunnel = self._tunnel.isEnabled()
+  if (self.proxy) {
+    self._tunnel.setup(options)
+  }
+
+  self._redirect.onRequest(options)
+
+  self.setHost = false
+  if (!self.hasHeader('host')) {
+    var hostHeaderName = self.originalHostHeaderName || 'host'
+    // When used with an IPv6 address, `host` will provide
+    // the correct bracketed format, unlike using `hostname` and
+    // optionally adding the `port` when necessary.
+    self.setHeader(hostHeaderName, self.uri.host)
+    self.setHost = true
+  }
+
+  self.jar(self._jar || options.jar)
+
+  if (!self.uri.port) {
+    if (self.uri.protocol === 'http:') { self.uri.port = 80 } else if (self.uri.protocol === 'https:') { self.uri.port = 443 }
+  }
+
+  if (self.proxy && !self.tunnel) {
+    self.port = self.proxy.port
+    self.host = self.proxy.hostname
+  } else {
+    self.port = self.uri.port
+    self.host = self.uri.hostname
+  }
+
+  if (options.form) {
+    self.form(options.form)
+  }
+
+  if (options.formData) {
+    var formData = options.formData
+    var requestForm = self.form()
+    var appendFormValue = function (key, value) {
+      if (value && value.hasOwnProperty('value') && value.hasOwnProperty('options')) {
+        requestForm.append(key, value.value, value.options)
+      } else {
+        requestForm.append(key, value)
+      }
+    }
+    for (var formKey in formData) {
+      if (formData.hasOwnProperty(formKey)) {
+        var formValue = formData[formKey]
+        if (formValue instanceof Array) {
+          for (var j = 0; j < formValue.length; j++) {
+            appendFormValue(formKey, formValue[j])
+          }
+        } else {
+          appendFormValue(formKey, formValue)
+        }
+      }
+    }
+  }
+
+  if (options.qs) {
+    self.qs(options.qs)
+  }
+
+  if (self.uri.path) {
+    self.path = self.uri.path
+  } else {
+    self.path = self.uri.pathname + (self.uri.search || '')
+  }
+
+  if (self.path.length === 0) {
+    self.path = '/'
+  }
+
+  // Auth must happen last in case signing is dependent on other headers
+  if (options.aws) {
+    self.aws(options.aws)
+  }
+
+  if (options.hawk) {
+    self.hawk(options.hawk)
+  }
+
+  if (options.httpSignature) {
+    self.httpSignature(options.httpSignature)
+  }
+
+  if (options.auth) {
+    if (Object.prototype.hasOwnProperty.call(options.auth, 'username')) {
+      options.auth.user = options.auth.username
+    }
+    if (Object.prototype.hasOwnProperty.call(options.auth, 'password')) {
+      options.auth.pass = options.auth.password
+    }
+
+    self.auth(
+      options.auth.user,
+      options.auth.pass,
+      options.auth.sendImmediately,
+      options.auth.bearer
+    )
+  }
+
+  if (self.gzip && !self.hasHeader('accept-encoding')) {
+    self.setHeader('accept-encoding', 'gzip, deflate')
+  }
+
+  if (self.uri.auth && !self.hasHeader('authorization')) {
+    var uriAuthPieces = self.uri.auth.split(':').map(function (item) { return self._qs.unescape(item) })
+    self.auth(uriAuthPieces[0], uriAuthPieces.slice(1).join(':'), true)
+  }
+
+  if (!self.tunnel && self.proxy && self.proxy.auth && !self.hasHeader('proxy-authorization')) {
+    var proxyAuthPieces = self.proxy.auth.split(':').map(function (item) { return self._qs.unescape(item) })
+    var authHeader = 'Basic ' + toBase64(proxyAuthPieces.join(':'))
+    self.setHeader('proxy-authorization', authHeader)
+  }
+
+  if (self.proxy && !self.tunnel) {
+    self.path = (self.uri.protocol + '//' + self.uri.host + self.path)
+  }
+
+  if (options.json) {
+    self.json(options.json)
+  }
+  if (options.multipart) {
+    self.multipart(options.multipart)
+  }
+
+  if (options.time) {
+    self.timing = true
+
+    // NOTE: elapsedTime is deprecated in favor of .timings
+    self.elapsedTime = self.elapsedTime || 0
+  }
+
+  function setContentLength () {
+    if (isTypedArray(self.body)) {
+      self.body = Buffer.from(self.body)
+    }
+
+    if (!self.hasHeader('content-length')) {
+      var length
+      if (typeof self.body === 'string') {
+        length = Buffer.byteLength(self.body)
+      } else if (Array.isArray(self.body)) {
+        length = self.body.reduce(function (a, b) { return a + b.length }, 0)
+      } else {
+        length = self.body.length
+      }
+
+      if (length) {
+        self.setHeader('content-length', length)
+      } else {
+        self.emit('error', new Error('Argument error, options.body.'))
+      }
+    }
+  }
+  if (self.body && !isstream(self.body)) {
+    setContentLength()
+  }
+
+  if (options.oauth) {
+    self.oauth(options.oauth)
+  } else if (self._oauth.params && self.hasHeader('authorization')) {
+    self.oauth(self._oauth.params)
+  }
+
+  var protocol = self.proxy && !self.tunnel ? self.proxy.protocol : self.uri.protocol
+  var defaultModules = {'http:': http, 'https:': https}
+  var httpModules = self.httpModules || {}
+
+  self.httpModule = httpModules[protocol] || defaultModules[protocol]
+
+  if (!self.httpModule) {
+    return self.emit('error', new Error('Invalid protocol: ' + protocol))
+  }
+
+  if (options.ca) {
+    self.ca = options.ca
+  }
+
+  if (!self.agent) {
+    if (options.agentOptions) {
+      self.agentOptions = options.agentOptions
+    }
+
+    if (options.agentClass) {
+      self.agentClass = options.agentClass
+    } else if (options.forever) {
+      var v = version()
+      // use ForeverAgent in node 0.10- only
+      if (v.major === 0 && v.minor <= 10) {
+        self.agentClass = protocol === 'http:' ? ForeverAgent : ForeverAgent.SSL
+      } else {
+        self.agentClass = self.httpModule.Agent
+        self.agentOptions = self.agentOptions || {}
+        self.agentOptions.keepAlive = true
+      }
+    } else {
+      self.agentClass = self.httpModule.Agent
+    }
+  }
+
+  if (self.pool === false) {
+    self.agent = false
+  } else {
+    self.agent = self.agent || self.getNewAgent()
+  }
+
+  self.on('pipe', function (src) {
+    if (self.ntick && self._started) {
+      self.emit('error', new Error('You cannot pipe to this stream after the outbound request has started.'))
+    }
+    self.src = src
+    if (isReadStream(src)) {
+      if (!self.hasHeader('content-type')) {
+        self.setHeader('content-type', mime.lookup(src.path))
+      }
+    } else {
+      if (src.headers) {
+        for (var i in src.headers) {
+          if (!self.hasHeader(i)) {
+            self.setHeader(i, src.headers[i])
+          }
+        }
+      }
+      if (self._json && !self.hasHeader('content-type')) {
+        self.setHeader('content-type', 'application/json')
+      }
+      if (src.method && !self.explicitMethod) {
+        self.method = src.method
+      }
+    }
+
+  // self.on('pipe', function () {
+  //   console.error('You have already piped to this stream. Pipeing twice is likely to break the request.')
+  // })
+  })
+
+  defer(function () {
+    if (self._aborted) {
+      return
+    }
+
+    var end = function () {
+      if (self._form) {
+        if (!self._auth.hasAuth) {
+          self._form.pipe(self)
+        } else if (self._auth.hasAuth && self._auth.sentAuth) {
+          self._form.pipe(self)
+        }
+      }
+      if (self._multipart && self._multipart.chunked) {
+        self._multipart.body.pipe(self)
+      }
+      if (self.body) {
+        if (isstream(self.body)) {
+          self.body.pipe(self)
+        } else {
+          setContentLength()
+          if (Array.isArray(self.body)) {
+            self.body.forEach(function (part) {
+              self.write(part)
+            })
+          } else {
+            self.write(self.body)
+          }
+          self.end()
+        }
+      } else if (self.requestBodyStream) {
+        console.warn('options.requestBodyStream is deprecated, please pass the request object to stream.pipe.')
+        self.requestBodyStream.pipe(self)
+      } else if (!self.src) {
+        if (self._auth.hasAuth && !self._auth.sentAuth) {
+          self.end()
+          return
+        }
+        if (self.method !== 'GET' && typeof self.method !== 'undefined') {
+          self.setHeader('content-length', 0)
+        }
+        self.end()
+      }
+    }
+
+    if (self._form && !self.hasHeader('content-length')) {
+      // Before ending the request, we had to compute the length of the whole form, asyncly
+      self.setHeader(self._form.getHeaders(), true)
+      self._form.getLength(function (err, length) {
+        if (!err && !isNaN(length)) {
+          self.setHeader('content-length', length)
+        }
+        end()
+      })
+    } else {
+      end()
+    }
+
+    self.ntick = true
+  })
+}
+
+Request.prototype.getNewAgent = function () {
+  var self = this
+  var Agent = self.agentClass
+  var options = {}
+  if (self.agentOptions) {
+    for (var i in self.agentOptions) {
+      options[i] = self.agentOptions[i]
+    }
+  }
+  if (self.ca) {
+    options.ca = self.ca
+  }
+  if (self.ciphers) {
+    options.ciphers = self.ciphers
+  }
+  if (self.secureProtocol) {
+    options.secureProtocol = self.secureProtocol
+  }
+  if (self.secureOptions) {
+    options.secureOptions = self.secureOptions
+  }
+  if (typeof self.rejectUnauthorized !== 'undefined') {
+    options.rejectUnauthorized = self.rejectUnauthorized
+  }
+
+  if (self.cert && self.key) {
+    options.key = self.key
+    options.cert = self.cert
+  }
+
+  if (self.pfx) {
+    options.pfx = self.pfx
+  }
+
+  if (self.passphrase) {
+    options.passphrase = self.passphrase
+  }
+
+  var poolKey = ''
+
+  // different types of agents are in different pools
+  if (Agent !== self.httpModule.Agent) {
+    poolKey += Agent.name
+  }
+
+  // ca option is only relevant if proxy or destination are https
+  var proxy = self.proxy
+  if (typeof proxy === 'string') {
+    proxy = url.parse(proxy)
+  }
+  var isHttps = (proxy && proxy.protocol === 'https:') || this.uri.protocol === 'https:'
+
+  if (isHttps) {
+    if (options.ca) {
+      if (poolKey) {
+        poolKey += ':'
+      }
+      poolKey += options.ca
+    }
+
+    if (typeof options.rejectUnauthorized !== 'undefined') {
+      if (poolKey) {
+        poolKey += ':'
+      }
+      poolKey += options.rejectUnauthorized
+    }
+
+    if (options.cert) {
+      if (poolKey) {
+        poolKey += ':'
+      }
+      poolKey += options.cert.toString('ascii') + options.key.toString('ascii')
+    }
+
+    if (options.pfx) {
+      if (poolKey) {
+        poolKey += ':'
+      }
+      poolKey += options.pfx.toString('ascii')
+    }
+
+    if (options.ciphers) {
+      if (poolKey) {
+        poolKey += ':'
+      }
+      poolKey += options.ciphers
+    }
+
+    if (options.secureProtocol) {
+      if (poolKey) {
+        poolKey += ':'
+      }
+      poolKey += options.secureProtocol
+    }
+
+    if (options.secureOptions) {
+      if (poolKey) {
+        poolKey += ':'
+      }
+      poolKey += options.secureOptions
+    }
+  }
+
+  if (self.pool === globalPool && !poolKey && Object.keys(options).length === 0 && self.httpModule.globalAgent) {
+    // not doing anything special.  Use the globalAgent
+    return self.httpModule.globalAgent
+  }
+
+  // we're using a stored agent.  Make sure it's protocol-specific
+  poolKey = self.uri.protocol + poolKey
+
+  // generate a new agent for this setting if none yet exists
+  if (!self.pool[poolKey]) {
+    self.pool[poolKey] = new Agent(options)
+    // properly set maxSockets on new agents
+    if (self.pool.maxSockets) {
+      self.pool[poolKey].maxSockets = self.pool.maxSockets
+    }
+  }
+
+  return self.pool[poolKey]
+}
+
+Request.prototype.start = function () {
+  // start() is called once we are ready to send the outgoing HTTP request.
+  // this is usually called on the first write(), end() or on nextTick()
+  var self = this
+
+  if (self.timing) {
+    // All timings will be relative to this request's startTime.  In order to do this,
+    // we need to capture the wall-clock start time (via Date), immediately followed
+    // by the high-resolution timer (via now()).  While these two won't be set
+    // at the _exact_ same time, they should be close enough to be able to calculate
+    // high-resolution, monotonically non-decreasing timestamps relative to startTime.
+    var startTime = new Date().getTime()
+    var startTimeNow = now()
+  }
+
+  if (self._aborted) {
+    return
+  }
+
+  self._started = true
+  self.method = self.method || 'GET'
+  self.href = self.uri.href
+
+  if (self.src && self.src.stat && self.src.stat.size && !self.hasHeader('content-length')) {
+    self.setHeader('content-length', self.src.stat.size)
+  }
+  if (self._aws) {
+    self.aws(self._aws, true)
+  }
+
+  // We have a method named auth, which is completely different from the http.request
+  // auth option.  If we don't remove it, we're gonna have a bad time.
+  var reqOptions = copy(self)
+  delete reqOptions.auth
+
+  debug('make request', self.uri.href)
+
+  // node v6.8.0 now supports a `timeout` value in `http.request()`, but we
+  // should delete it for now since we handle timeouts manually for better
+  // consistency with node versions before v6.8.0
+  delete reqOptions.timeout
+
+  try {
+    self.req = self.httpModule.request(reqOptions)
+  } catch (err) {
+    self.emit('error', err)
+    return
+  }
+
+  if (self.timing) {
+    self.startTime = startTime
+    self.startTimeNow = startTimeNow
+
+    // Timing values will all be relative to startTime (by comparing to startTimeNow
+    // so we have an accurate clock)
+    self.timings = {}
+  }
+
+  var timeout
+  if (self.timeout && !self.timeoutTimer) {
+    if (self.timeout < 0) {
+      timeout = 0
+    } else if (typeof self.timeout === 'number' && isFinite(self.timeout)) {
+      timeout = self.timeout
+    }
+  }
+
+  self.req.on('response', self.onRequestResponse.bind(self))
+  self.req.on('error', self.onRequestError.bind(self))
+  self.req.on('drain', function () {
+    self.emit('drain')
+  })
+
+  self.req.on('socket', function (socket) {
+    // `._connecting` was the old property which was made public in node v6.1.0
+    var isConnecting = socket._connecting || socket.connecting
+    if (self.timing) {
+      self.timings.socket = now() - self.startTimeNow
+
+      if (isConnecting) {
+        var onLookupTiming = function () {
+          self.timings.lookup = now() - self.startTimeNow
+        }
+
+        var onConnectTiming = function () {
+          self.timings.connect = now() - self.startTimeNow
+        }
+
+        socket.once('lookup', onLookupTiming)
+        socket.once('connect', onConnectTiming)
+
+        // clean up timing event listeners if needed on error
+        self.req.once('error', function () {
+          socket.removeListener('lookup', onLookupTiming)
+          socket.removeListener('connect', onConnectTiming)
+        })
+      }
+    }
+
+    var setReqTimeout = function () {
+      // This timeout sets the amount of time to wait *between* bytes sent
+      // from the server once connected.
+      //
+      // In particular, it's useful for erroring if the server fails to send
+      // data halfway through streaming a response.
+      self.req.setTimeout(timeout, function () {
+        if (self.req) {
+          self.abort()
+          var e = new Error('ESOCKETTIMEDOUT')
+          e.code = 'ESOCKETTIMEDOUT'
+          e.connect = false
+          self.emit('error', e)
+        }
+      })
+    }
+    if (timeout !== undefined) {
+      // Only start the connection timer if we're actually connecting a new
+      // socket, otherwise if we're already connected (because this is a
+      // keep-alive connection) do not bother. This is important since we won't
+      // get a 'connect' event for an already connected socket.
+      if (isConnecting) {
+        var onReqSockConnect = function () {
+          socket.removeListener('connect', onReqSockConnect)
+          clearTimeout(self.timeoutTimer)
+          self.timeoutTimer = null
+          setReqTimeout()
+        }
+
+        socket.on('connect', onReqSockConnect)
+
+        self.req.on('error', function (err) { // eslint-disable-line handle-callback-err
+          socket.removeListener('connect', onReqSockConnect)
+        })
+
+        // Set a timeout in memory - this block will throw if the server takes more
+        // than `timeout` to write the HTTP status and headers (corresponding to
+        // the on('response') event on the client). NB: this measures wall-clock
+        // time, not the time between bytes sent by the server.
+        self.timeoutTimer = setTimeout(function () {
+          socket.removeListener('connect', onReqSockConnect)
+          self.abort()
+          var e = new Error('ETIMEDOUT')
+          e.code = 'ETIMEDOUT'
+          e.connect = true
+          self.emit('error', e)
+        }, timeout)
+      } else {
+        // We're already connected
+        setReqTimeout()
+      }
+    }
+    self.emit('socket', socket)
+  })
+
+  self.emit('request', self.req)
+}
+
+Request.prototype.onRequestError = function (error) {
+  var self = this
+  if (self._aborted) {
+    return
+  }
+  if (self.req && self.req._reusedSocket && error.code === 'ECONNRESET' &&
+    self.agent.addRequestNoreuse) {
+    self.agent = { addRequest: self.agent.addRequestNoreuse.bind(self.agent) }
+    self.start()
+    self.req.end()
+    return
+  }
+  if (self.timeout && self.timeoutTimer) {
+    clearTimeout(self.timeoutTimer)
+    self.timeoutTimer = null
+  }
+  self.emit('error', error)
+}
+
+Request.prototype.onRequestResponse = function (response) {
+  var self = this
+
+  if (self.timing) {
+    self.timings.response = now() - self.startTimeNow
+  }
+
+  debug('onRequestResponse', self.uri.href, response.statusCode, response.headers)
+  response.on('end', function () {
+    if (self.timing) {
+      self.timings.end = now() - self.startTimeNow
+      response.timingStart = self.startTime
+
+      // fill in the blanks for any periods that didn't trigger, such as
+      // no lookup or connect due to keep alive
+      if (!self.timings.socket) {
+        self.timings.socket = 0
+      }
+      if (!self.timings.lookup) {
+        self.timings.lookup = self.timings.socket
+      }
+      if (!self.timings.connect) {
+        self.timings.connect = self.timings.lookup
+      }
+      if (!self.timings.response) {
+        self.timings.response = self.timings.connect
+      }
+
+      debug('elapsed time', self.timings.end)
+
+      // elapsedTime includes all redirects
+      self.elapsedTime += Math.round(self.timings.end)
+
+      // NOTE: elapsedTime is deprecated in favor of .timings
+      response.elapsedTime = self.elapsedTime
+
+      // timings is just for the final fetch
+      response.timings = self.timings
+
+      // pre-calculate phase timings as well
+      response.timingPhases = {
+        wait: self.timings.socket,
+        dns: self.timings.lookup - self.timings.socket,
+        tcp: self.timings.connect - self.timings.lookup,
+        firstByte: self.timings.response - self.timings.connect,
+        download: self.timings.end - self.timings.response,
+        total: self.timings.end
+      }
+    }
+    debug('response end', self.uri.href, response.statusCode, response.headers)
+  })
+
+  if (self._aborted) {
+    debug('aborted', self.uri.href)
+    response.resume()
+    return
+  }
+
+  self.response = response
+  response.request = self
+  response.toJSON = responseToJSON
+
+  // XXX This is different on 0.10, because SSL is strict by default
+  if (self.httpModule === https &&
+    self.strictSSL && (!response.hasOwnProperty('socket') ||
+    !response.socket.authorized)) {
+    debug('strict ssl error', self.uri.href)
+    var sslErr = response.hasOwnProperty('socket') ? response.socket.authorizationError : self.uri.href + ' does not support SSL'
+    self.emit('error', new Error('SSL Error: ' + sslErr))
+    return
+  }
+
+  // Save the original host before any redirect (if it changes, we need to
+  // remove any authorization headers).  Also remember the case of the header
+  // name because lots of broken servers expect Host instead of host and we
+  // want the caller to be able to specify this.
+  self.originalHost = self.getHeader('host')
+  if (!self.originalHostHeaderName) {
+    self.originalHostHeaderName = self.hasHeader('host')
+  }
+  if (self.setHost) {
+    self.removeHeader('host')
+  }
+  if (self.timeout && self.timeoutTimer) {
+    clearTimeout(self.timeoutTimer)
+    self.timeoutTimer = null
+  }
+
+  var targetCookieJar = (self._jar && self._jar.setCookie) ? self._jar : globalCookieJar
+  var addCookie = function (cookie) {
+    // set the cookie if it's domain in the href's domain.
+    try {
+      targetCookieJar.setCookie(cookie, self.uri.href, {ignoreError: true})
+    } catch (e) {
+      self.emit('error', e)
+    }
+  }
+
+  response.caseless = caseless(response.headers)
+
+  if (response.caseless.has('set-cookie') && (!self._disableCookies)) {
+    var headerName = response.caseless.has('set-cookie')
+    if (Array.isArray(response.headers[headerName])) {
+      response.headers[headerName].forEach(addCookie)
+    } else {
+      addCookie(response.headers[headerName])
+    }
+  }
+
+  if (self._redirect.onResponse(response)) {
+    return // Ignore the rest of the response
+  } else {
+    // Be a good stream and emit end when the response is finished.
+    // Hack to emit end on close because of a core bug that never fires end
+    response.on('close', function () {
+      if (!self._ended) {
+        self.response.emit('end')
+      }
+    })
+
+    response.once('end', function () {
+      self._ended = true
+    })
+
+    var noBody = function (code) {
+      return (
+        self.method === 'HEAD' ||
+        // Informational
+        (code >= 100 && code < 200) ||
+        // No Content
+        code === 204 ||
+        // Not Modified
+        code === 304
+      )
+    }
+
+    var responseContent
+    if (self.gzip && !noBody(response.statusCode)) {
+      var contentEncoding = response.headers['content-encoding'] || 'identity'
+      contentEncoding = contentEncoding.trim().toLowerCase()
+
+      // Be more lenient with decoding compressed responses, since (very rarely)
+      // servers send slightly invalid gzip responses that are still accepted
+      // by common browsers.
+      // Always using Z_SYNC_FLUSH is what cURL does.
+      var zlibOptions = {
+        flush: zlib.Z_SYNC_FLUSH,
+        finishFlush: zlib.Z_SYNC_FLUSH
+      }
+
+      if (contentEncoding === 'gzip') {
+        responseContent = zlib.createGunzip(zlibOptions)
+        response.pipe(responseContent)
+      } else if (contentEncoding === 'deflate') {
+        responseContent = zlib.createInflate(zlibOptions)
+        response.pipe(responseContent)
+      } else {
+        // Since previous versions didn't check for Content-Encoding header,
+        // ignore any invalid values to preserve backwards-compatibility
+        if (contentEncoding !== 'identity') {
+          debug('ignoring unrecognized Content-Encoding ' + contentEncoding)
+        }
+        responseContent = response
+      }
+    } else {
+      responseContent = response
+    }
+
+    if (self.encoding) {
+      if (self.dests.length !== 0) {
+        console.error('Ignoring encoding parameter as this stream is being piped to another stream which makes the encoding option invalid.')
+      } else {
+        responseContent.setEncoding(self.encoding)
+      }
+    }
+
+    if (self._paused) {
+      responseContent.pause()
+    }
+
+    self.responseContent = responseContent
+
+    self.emit('response', response)
+
+    self.dests.forEach(function (dest) {
+      self.pipeDest(dest)
+    })
+
+    responseContent.on('data', function (chunk) {
+      if (self.timing && !self.responseStarted) {
+        self.responseStartTime = (new Date()).getTime()
+
+        // NOTE: responseStartTime is deprecated in favor of .timings
+        response.responseStartTime = self.responseStartTime
+      }
+      self._destdata = true
+      self.emit('data', chunk)
+    })
+    responseContent.once('end', function (chunk) {
+      self.emit('end', chunk)
+    })
+    responseContent.on('error', function (error) {
+      self.emit('error', error)
+    })
+    responseContent.on('close', function () { self.emit('close') })
+
+    if (self.callback) {
+      self.readResponseBody(response)
+    } else { // if no callback
+      self.on('end', function () {
+        if (self._aborted) {
+          debug('aborted', self.uri.href)
+          return
+        }
+        self.emit('complete', response)
+      })
+    }
+  }
+  debug('finish init function', self.uri.href)
+}
+
+Request.prototype.readResponseBody = function (response) {
+  var self = this
+  debug("reading response's body")
+  var buffers = []
+  var bufferLength = 0
+  var strings = []
+
+  self.on('data', function (chunk) {
+    if (!Buffer.isBuffer(chunk)) {
+      strings.push(chunk)
+    } else if (chunk.length) {
+      bufferLength += chunk.length
+      buffers.push(chunk)
+    }
+  })
+  self.on('end', function () {
+    debug('end event', self.uri.href)
+    if (self._aborted) {
+      debug('aborted', self.uri.href)
+      // `buffer` is defined in the parent scope and used in a closure it exists for the life of the request.
+      // This can lead to leaky behavior if the user retains a reference to the request object.
+      buffers = []
+      bufferLength = 0
+      return
+    }
+
+    if (bufferLength) {
+      debug('has body', self.uri.href, bufferLength)
+      response.body = Buffer.concat(buffers, bufferLength)
+      if (self.encoding !== null) {
+        response.body = response.body.toString(self.encoding)
+      }
+      // `buffer` is defined in the parent scope and used in a closure it exists for the life of the Request.
+      // This can lead to leaky behavior if the user retains a reference to the request object.
+      buffers = []
+      bufferLength = 0
+    } else if (strings.length) {
+      // The UTF8 BOM [0xEF,0xBB,0xBF] is converted to [0xFE,0xFF] in the JS UTC16/UCS2 representation.
+      // Strip this value out when the encoding is set to 'utf8', as upstream consumers won't expect it and it breaks JSON.parse().
+      if (self.encoding === 'utf8' && strings[0].length > 0 && strings[0][0] === '\uFEFF') {
+        strings[0] = strings[0].substring(1)
+      }
+      response.body = strings.join('')
+    }
+
+    if (self._json) {
+      try {
+        response.body = JSON.parse(response.body, self._jsonReviver)
+      } catch (e) {
+        debug('invalid JSON received', self.uri.href)
+      }
+    }
+    debug('emitting complete', self.uri.href)
+    if (typeof response.body === 'undefined' && !self._json) {
+      response.body = self.encoding === null ? Buffer.alloc(0) : ''
+    }
+    self.emit('complete', response, response.body)
+  })
+}
+
+Request.prototype.abort = function () {
+  var self = this
+  self._aborted = true
+
+  if (self.req) {
+    self.req.abort()
+  } else if (self.response) {
+    self.response.destroy()
+  }
+
+  self.emit('abort')
+}
+
+Request.prototype.pipeDest = function (dest) {
+  var self = this
+  var response = self.response
+  // Called after the response is received
+  if (dest.headers && !dest.headersSent) {
+    if (response.caseless.has('content-type')) {
+      var ctname = response.caseless.has('content-type')
+      if (dest.setHeader) {
+        dest.setHeader(ctname, response.headers[ctname])
+      } else {
+        dest.headers[ctname] = response.headers[ctname]
+      }
+    }
+
+    if (response.caseless.has('content-length')) {
+      var clname = response.caseless.has('content-length')
+      if (dest.setHeader) {
+        dest.setHeader(clname, response.headers[clname])
+      } else {
+        dest.headers[clname] = response.headers[clname]
+      }
+    }
+  }
+  if (dest.setHeader && !dest.headersSent) {
+    for (var i in response.headers) {
+      // If the response content is being decoded, the Content-Encoding header
+      // of the response doesn't represent the piped content, so don't pass it.
+      if (!self.gzip || i !== 'content-encoding') {
+        dest.setHeader(i, response.headers[i])
+      }
+    }
+    dest.statusCode = response.statusCode
+  }
+  if (self.pipefilter) {
+    self.pipefilter(response, dest)
+  }
+}
+
+Request.prototype.qs = function (q, clobber) {
+  var self = this
+  var base
+  if (!clobber && self.uri.query) {
+    base = self._qs.parse(self.uri.query)
+  } else {
+    base = {}
+  }
+
+  for (var i in q) {
+    base[i] = q[i]
+  }
+
+  var qs = self._qs.stringify(base)
+
+  if (qs === '') {
+    return self
+  }
+
+  self.uri = url.parse(self.uri.href.split('?')[0] + '?' + qs)
+  self.url = self.uri
+  self.path = self.uri.path
+
+  if (self.uri.host === 'unix') {
+    self.enableUnixSocket()
+  }
+
+  return self
+}
+Request.prototype.form = function (form) {
+  var self = this
+  if (form) {
+    if (!/^application\/x-www-form-urlencoded\b/.test(self.getHeader('content-type'))) {
+      self.setHeader('content-type', 'application/x-www-form-urlencoded')
+    }
+    self.body = (typeof form === 'string')
+      ? self._qs.rfc3986(form.toString('utf8'))
+      : self._qs.stringify(form).toString('utf8')
+    return self
+  }
+  // create form-data object
+  self._form = new FormData()
+  self._form.on('error', function (err) {
+    err.message = 'form-data: ' + err.message
+    self.emit('error', err)
+    self.abort()
+  })
+  return self._form
+}
+Request.prototype.multipart = function (multipart) {
+  var self = this
+
+  self._multipart.onRequest(multipart)
+
+  if (!self._multipart.chunked) {
+    self.body = self._multipart.body
+  }
+
+  return self
+}
+Request.prototype.json = function (val) {
+  var self = this
+
+  if (!self.hasHeader('accept')) {
+    self.setHeader('accept', 'application/json')
+  }
+
+  if (typeof self.jsonReplacer === 'function') {
+    self._jsonReplacer = self.jsonReplacer
+  }
+
+  self._json = true
+  if (typeof val === 'boolean') {
+    if (self.body !== undefined) {
+      if (!/^application\/x-www-form-urlencoded\b/.test(self.getHeader('content-type'))) {
+        self.body = safeStringify(self.body, self._jsonReplacer)
+      } else {
+        self.body = self._qs.rfc3986(self.body)
+      }
+      if (!self.hasHeader('content-type')) {
+        self.setHeader('content-type', 'application/json')
+      }
+    }
+  } else {
+    self.body = safeStringify(val, self._jsonReplacer)
+    if (!self.hasHeader('content-type')) {
+      self.setHeader('content-type', 'application/json')
+    }
+  }
+
+  if (typeof self.jsonReviver === 'function') {
+    self._jsonReviver = self.jsonReviver
+  }
+
+  return self
+}
+Request.prototype.getHeader = function (name, headers) {
+  var self = this
+  var result, re, match
+  if (!headers) {
+    headers = self.headers
+  }
+  Object.keys(headers).forEach(function (key) {
+    if (key.length !== name.length) {
+      return
+    }
+    re = new RegExp(name, 'i')
+    match = key.match(re)
+    if (match) {
+      result = headers[key]
+    }
+  })
+  return result
+}
+Request.prototype.enableUnixSocket = function () {
+  // Get the socket & request paths from the URL
+  var unixParts = this.uri.path.split(':')
+  var host = unixParts[0]
+  var path = unixParts[1]
+  // Apply unix properties to request
+  this.socketPath = host
+  this.uri.pathname = path
+  this.uri.path = path
+  this.uri.host = host
+  this.uri.hostname = host
+  this.uri.isUnix = true
+}
+
+Request.prototype.auth = function (user, pass, sendImmediately, bearer) {
+  var self = this
+
+  self._auth.onRequest(user, pass, sendImmediately, bearer)
+
+  return self
+}
+Request.prototype.aws = function (opts, now) {
+  var self = this
+
+  if (!now) {
+    self._aws = opts
+    return self
+  }
+
+  if (opts.sign_version === 4 || opts.sign_version === '4') {
+    // use aws4
+    var options = {
+      host: self.uri.host,
+      path: self.uri.path,
+      method: self.method,
+      headers: {
+        'content-type': self.getHeader('content-type') || ''
+      },
+      body: self.body
+    }
+    var signRes = aws4.sign(options, {
+      accessKeyId: opts.key,
+      secretAccessKey: opts.secret,
+      sessionToken: opts.session
+    })
+    self.setHeader('authorization', signRes.headers.Authorization)
+    self.setHeader('x-amz-date', signRes.headers['X-Amz-Date'])
+    if (signRes.headers['X-Amz-Security-Token']) {
+      self.setHeader('x-amz-security-token', signRes.headers['X-Amz-Security-Token'])
+    }
+  } else {
+    // default: use aws-sign2
+    var date = new Date()
+    self.setHeader('date', date.toUTCString())
+    var auth = {
+      key: opts.key,
+      secret: opts.secret,
+      verb: self.method.toUpperCase(),
+      date: date,
+      contentType: self.getHeader('content-type') || '',
+      md5: self.getHeader('content-md5') || '',
+      amazonHeaders: aws2.canonicalizeHeaders(self.headers)
+    }
+    var path = self.uri.path
+    if (opts.bucket && path) {
+      auth.resource = '/' + opts.bucket + path
+    } else if (opts.bucket && !path) {
+      auth.resource = '/' + opts.bucket
+    } else if (!opts.bucket && path) {
+      auth.resource = path
+    } else if (!opts.bucket && !path) {
+      auth.resource = '/'
+    }
+    auth.resource = aws2.canonicalizeResource(auth.resource)
+    self.setHeader('authorization', aws2.authorization(auth))
+  }
+
+  return self
+}
+Request.prototype.httpSignature = function (opts) {
+  var self = this
+  httpSignature.signRequest({
+    getHeader: function (header) {
+      return self.getHeader(header, self.headers)
+    },
+    setHeader: function (header, value) {
+      self.setHeader(header, value)
+    },
+    method: self.method,
+    path: self.path
+  }, opts)
+  debug('httpSignature authorization', self.getHeader('authorization'))
+
+  return self
+}
+Request.prototype.hawk = function (opts) {
+  var self = this
+  self.setHeader('Authorization', hawk.header(self.uri, self.method, opts))
+}
+Request.prototype.oauth = function (_oauth) {
+  var self = this
+
+  self._oauth.onRequest(_oauth)
+
+  return self
+}
+
+Request.prototype.jar = function (jar) {
+  var self = this
+  var cookies
+
+  if (self._redirect.redirectsFollowed === 0) {
+    self.originalCookieHeader = self.getHeader('cookie')
+  }
+
+  if (!jar) {
+    // disable cookies
+    cookies = false
+    self._disableCookies = true
+  } else {
+    var targetCookieJar = (jar && jar.getCookieString) ? jar : globalCookieJar
+    var urihref = self.uri.href
+    // fetch cookie in the Specified host
+    if (targetCookieJar) {
+      cookies = targetCookieJar.getCookieString(urihref)
+    }
+  }
+
+  // if need cookie and cookie is not empty
+  if (cookies && cookies.length) {
+    if (self.originalCookieHeader) {
+      // Don't overwrite existing Cookie header
+      self.setHeader('cookie', self.originalCookieHeader + '; ' + cookies)
+    } else {
+      self.setHeader('cookie', cookies)
+    }
+  }
+  self._jar = jar
+  return self
+}
+
+// Stream API
+Request.prototype.pipe = function (dest, opts) {
+  var self = this
+
+  if (self.response) {
+    if (self._destdata) {
+      self.emit('error', new Error('You cannot pipe after data has been emitted from the response.'))
+    } else if (self._ended) {
+      self.emit('error', new Error('You cannot pipe after the response has been ended.'))
+    } else {
+      stream.Stream.prototype.pipe.call(self, dest, opts)
+      self.pipeDest(dest)
+      return dest
+    }
+  } else {
+    self.dests.push(dest)
+    stream.Stream.prototype.pipe.call(self, dest, opts)
+    return dest
+  }
+}
+Request.prototype.write = function () {
+  var self = this
+  if (self._aborted) { return }
+
+  if (!self._started) {
+    self.start()
+  }
+  if (self.req) {
+    return self.req.write.apply(self.req, arguments)
+  }
+}
+Request.prototype.end = function (chunk) {
+  var self = this
+  if (self._aborted) { return }
+
+  if (chunk) {
+    self.write(chunk)
+  }
+  if (!self._started) {
+    self.start()
+  }
+  if (self.req) {
+    self.req.end()
+  }
+}
+Request.prototype.pause = function () {
+  var self = this
+  if (!self.responseContent) {
+    self._paused = true
+  } else {
+    self.responseContent.pause.apply(self.responseContent, arguments)
+  }
+}
+Request.prototype.resume = function () {
+  var self = this
+  if (!self.responseContent) {
+    self._paused = false
+  } else {
+    self.responseContent.resume.apply(self.responseContent, arguments)
+  }
+}
+Request.prototype.destroy = function () {
+  var self = this
+  if (!self._ended) {
+    self.end()
+  } else if (self.response) {
+    self.response.destroy()
+  }
+}
+
+Request.defaultProxyHeaderWhiteList =
+  Tunnel.defaultProxyHeaderWhiteList.slice()
+
+Request.defaultProxyHeaderExclusiveList =
+  Tunnel.defaultProxyHeaderExclusiveList.slice()
+
+// Exports
+
+Request.prototype.toJSON = requestToJSON
+module.exports = Request
+
+
+/***/ }),
+/* 814 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var core = __webpack_require__(306);
+var async = __webpack_require__(815);
+async.core = core;
+async.isCore = function isCore(x) { return core[x]; };
+async.sync = __webpack_require__(817);
+
+exports = async;
+module.exports = async;
+
+
+/***/ }),
+/* 815 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var core = __webpack_require__(306);
+var fs = __webpack_require__(5);
+var path = __webpack_require__(0);
+var caller = __webpack_require__(417);
+var nodeModulesPaths = __webpack_require__(418);
+
+var defaultIsFile = function isFile(file, cb) {
+    fs.stat(file, function (err, stat) {
+        if (!err) {
+            return cb(null, stat.isFile() || stat.isFIFO());
+        }
+        if (err.code === 'ENOENT' || err.code === 'ENOTDIR') return cb(null, false);
+        return cb(err);
+    });
+};
+
+module.exports = function resolve(x, options, callback) {
+    var cb = callback;
+    var opts = options || {};
+    if (typeof opts === 'function') {
+        cb = opts;
+        opts = {};
+    }
+    if (typeof x !== 'string') {
+        var err = new TypeError('Path must be a string.');
+        return process.nextTick(function () {
+            cb(err);
+        });
+    }
+
+    var isFile = opts.isFile || defaultIsFile;
+    var readFile = opts.readFile || fs.readFile;
+
+    var extensions = opts.extensions || ['.js'];
+    var basedir = opts.basedir || path.dirname(caller());
+    var parent = opts.filename || basedir;
+
+    opts.paths = opts.paths || [];
+
+    if (/^(?:\.\.?(?:\/|$)|\/|([A-Za-z]:)?[/\\])/.test(x)) {
+        var res = path.resolve(basedir, x);
+        if (x === '..' || x.slice(-1) === '/') res += '/';
+        if (/\/$/.test(x) && res === basedir) {
+            loadAsDirectory(res, opts.package, onfile);
+        } else loadAsFile(res, opts.package, onfile);
+    } else loadNodeModules(x, basedir, function (err, n, pkg) {
+        if (err) cb(err);
+        else if (n) cb(null, n, pkg);
+        else if (core[x]) return cb(null, x);
+        else {
+            var moduleError = new Error("Cannot find module '" + x + "' from '" + parent + "'");
+            moduleError.code = 'MODULE_NOT_FOUND';
+            cb(moduleError);
+        }
+    });
+
+    function onfile(err, m, pkg) {
+        if (err) cb(err);
+        else if (m) cb(null, m, pkg);
+        else loadAsDirectory(res, function (err, d, pkg) {
+            if (err) cb(err);
+            else if (d) cb(null, d, pkg);
+            else {
+                var moduleError = new Error("Cannot find module '" + x + "' from '" + parent + "'");
+                moduleError.code = 'MODULE_NOT_FOUND';
+                cb(moduleError);
+            }
+        });
+    }
+
+    function loadAsFile(x, thePackage, callback) {
+        var loadAsFilePackage = thePackage;
+        var cb = callback;
+        if (typeof loadAsFilePackage === 'function') {
+            cb = loadAsFilePackage;
+            loadAsFilePackage = undefined;
+        }
+
+        var exts = [''].concat(extensions);
+        load(exts, x, loadAsFilePackage);
+
+        function load(exts, x, loadPackage) {
+            if (exts.length === 0) return cb(null, undefined, loadPackage);
+            var file = x + exts[0];
+
+            var pkg = loadPackage;
+            if (pkg) onpkg(null, pkg);
+            else loadpkg(path.dirname(file), onpkg);
+
+            function onpkg(err, pkg_, dir) {
+                pkg = pkg_;
+                if (err) return cb(err);
+                if (dir && pkg && opts.pathFilter) {
+                    var rfile = path.relative(dir, file);
+                    var rel = rfile.slice(0, rfile.length - exts[0].length);
+                    var r = opts.pathFilter(pkg, x, rel);
+                    if (r) return load(
+                        [''].concat(extensions.slice()),
+                        path.resolve(dir, r),
+                        pkg
+                    );
+                }
+                isFile(file, onex);
+            }
+            function onex(err, ex) {
+                if (err) return cb(err);
+                if (ex) return cb(null, file, pkg);
+                load(exts.slice(1), x, pkg);
+            }
+        }
+    }
+
+    function loadpkg(dir, cb) {
+        if (dir === '' || dir === '/') return cb(null);
+        if (process.platform === 'win32' && (/^\w:[/\\]*$/).test(dir)) {
+            return cb(null);
+        }
+        if (/[/\\]node_modules[/\\]*$/.test(dir)) return cb(null);
+
+        var pkgfile = path.join(dir, 'package.json');
+        isFile(pkgfile, function (err, ex) {
+            // on err, ex is false
+            if (!ex) return loadpkg(path.dirname(dir), cb);
+
+            readFile(pkgfile, function (err, body) {
+                if (err) cb(err);
+                try { var pkg = JSON.parse(body); } catch (jsonErr) {}
+
+                if (pkg && opts.packageFilter) {
+                    pkg = opts.packageFilter(pkg, pkgfile);
+                }
+                cb(null, pkg, dir);
+            });
+        });
+    }
+
+    function loadAsDirectory(x, loadAsDirectoryPackage, callback) {
+        var cb = callback;
+        var fpkg = loadAsDirectoryPackage;
+        if (typeof fpkg === 'function') {
+            cb = fpkg;
+            fpkg = opts.package;
+        }
+
+        var pkgfile = path.join(x, 'package.json');
+        isFile(pkgfile, function (err, ex) {
+            if (err) return cb(err);
+            if (!ex) return loadAsFile(path.join(x, 'index'), fpkg, cb);
+
+            readFile(pkgfile, function (err, body) {
+                if (err) return cb(err);
+                try {
+                    var pkg = JSON.parse(body);
+                } catch (jsonErr) {}
+
+                if (opts.packageFilter) {
+                    pkg = opts.packageFilter(pkg, pkgfile);
+                }
+
+                if (pkg.main) {
+                    if (pkg.main === '.' || pkg.main === './') {
+                        pkg.main = 'index';
+                    }
+                    loadAsFile(path.resolve(x, pkg.main), pkg, function (err, m, pkg) {
+                        if (err) return cb(err);
+                        if (m) return cb(null, m, pkg);
+                        if (!pkg) return loadAsFile(path.join(x, 'index'), pkg, cb);
+
+                        var dir = path.resolve(x, pkg.main);
+                        loadAsDirectory(dir, pkg, function (err, n, pkg) {
+                            if (err) return cb(err);
+                            if (n) return cb(null, n, pkg);
+                            loadAsFile(path.join(x, 'index'), pkg, cb);
+                        });
+                    });
+                    return;
+                }
+
+                loadAsFile(path.join(x, '/index'), pkg, cb);
+            });
+        });
+    }
+
+    function processDirs(cb, dirs) {
+        if (dirs.length === 0) return cb(null, undefined);
+        var dir = dirs[0];
+
+        var file = path.join(dir, x);
+        loadAsFile(file, opts.package, onfile);
+
+        function onfile(err, m, pkg) {
+            if (err) return cb(err);
+            if (m) return cb(null, m, pkg);
+            loadAsDirectory(path.join(dir, x), opts.package, ondir);
+        }
+
+        function ondir(err, n, pkg) {
+            if (err) return cb(err);
+            if (n) return cb(null, n, pkg);
+            processDirs(cb, dirs.slice(1));
+        }
+    }
+    function loadNodeModules(x, start, cb) {
+        processDirs(cb, nodeModulesPaths(start, opts));
+    }
+};
+
+
+/***/ }),
+/* 816 */
+/***/ (function(module, exports) {
+
+module.exports = {"assert":true,"async_hooks":">= 8","buffer_ieee754":"< 0.9.7","buffer":true,"child_process":true,"cluster":true,"console":true,"constants":true,"crypto":true,"_debugger":"< 8","dgram":true,"dns":true,"domain":true,"events":true,"freelist":"< 6","fs":true,"fs/promises":">= 10 && < 10.1","_http_agent":">= 0.11.1","_http_client":">= 0.11.1","_http_common":">= 0.11.1","_http_incoming":">= 0.11.1","_http_outgoing":">= 0.11.1","_http_server":">= 0.11.1","http":true,"http2":">= 8.8","https":true,"inspector":">= 8.0.0","_linklist":"< 8","module":true,"net":true,"node-inspect/lib/_inspect":">= 7.6.0","node-inspect/lib/internal/inspect_client":">= 7.6.0","node-inspect/lib/internal/inspect_repl":">= 7.6.0","os":true,"path":true,"perf_hooks":">= 8.5","process":">= 1","punycode":true,"querystring":true,"readline":true,"repl":true,"smalloc":">= 0.11.5 && < 3","_stream_duplex":">= 0.9.4","_stream_transform":">= 0.9.4","_stream_wrap":">= 1.4.1","_stream_passthrough":">= 0.9.4","_stream_readable":">= 0.9.4","_stream_writable":">= 0.9.4","stream":true,"string_decoder":true,"sys":true,"timers":true,"_tls_common":">= 0.11.13","_tls_legacy":">= 0.11.3 && < 10","_tls_wrap":">= 0.11.3","tls":true,"trace_events":">= 10","tty":true,"url":true,"util":true,"v8/tools/arguments":">= 10","v8/tools/codemap":[">= 4.4.0 && < 5",">= 5.2.0"],"v8/tools/consarray":[">= 4.4.0 && < 5",">= 5.2.0"],"v8/tools/csvparser":[">= 4.4.0 && < 5",">= 5.2.0"],"v8/tools/logreader":[">= 4.4.0 && < 5",">= 5.2.0"],"v8/tools/profile_view":[">= 4.4.0 && < 5",">= 5.2.0"],"v8/tools/splaytree":[">= 4.4.0 && < 5",">= 5.2.0"],"v8":">= 1","vm":true,"zlib":true}
+
+/***/ }),
+/* 817 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var core = __webpack_require__(306);
+var fs = __webpack_require__(5);
+var path = __webpack_require__(0);
+var caller = __webpack_require__(417);
+var nodeModulesPaths = __webpack_require__(418);
+
+var defaultIsFile = function isFile(file) {
+    try {
+        var stat = fs.statSync(file);
+    } catch (e) {
+        if (e && (e.code === 'ENOENT' || e.code === 'ENOTDIR')) return false;
+        throw e;
+    }
+    return stat.isFile() || stat.isFIFO();
+};
+
+module.exports = function (x, options) {
+    if (typeof x !== 'string') {
+        throw new TypeError('Path must be a string.');
+    }
+    var opts = options || {};
+    var isFile = opts.isFile || defaultIsFile;
+    var readFileSync = opts.readFileSync || fs.readFileSync;
+
+    var extensions = opts.extensions || ['.js'];
+    var basedir = opts.basedir || path.dirname(caller());
+    var parent = opts.filename || basedir;
+
+    opts.paths = opts.paths || [];
+
+    if (/^(?:\.\.?(?:\/|$)|\/|([A-Za-z]:)?[/\\])/.test(x)) {
+        var res = path.resolve(basedir, x);
+        if (x === '..' || x.slice(-1) === '/') res += '/';
+        var m = loadAsFileSync(res) || loadAsDirectorySync(res);
+        if (m) return m;
+    } else {
+        var n = loadNodeModulesSync(x, basedir);
+        if (n) return n;
+    }
+
+    if (core[x]) return x;
+
+    var err = new Error("Cannot find module '" + x + "' from '" + parent + "'");
+    err.code = 'MODULE_NOT_FOUND';
+    throw err;
+
+    function loadAsFileSync(x) {
+        var pkg = loadpkg(path.dirname(x));
+
+        if (pkg && pkg.dir && pkg.pkg && opts.pathFilter) {
+            var rfile = path.relative(pkg.dir, x);
+            var r = opts.pathFilter(pkg.pkg, x, rfile);
+            if (r) {
+                x = path.resolve(pkg.dir, r); // eslint-disable-line no-param-reassign
+            }
+        }
+
+        if (isFile(x)) {
+            return x;
+        }
+
+        for (var i = 0; i < extensions.length; i++) {
+            var file = x + extensions[i];
+            if (isFile(file)) {
+                return file;
+            }
+        }
+    }
+
+    function loadpkg(dir) {
+        if (dir === '' || dir === '/') return;
+        if (process.platform === 'win32' && (/^\w:[/\\]*$/).test(dir)) {
+            return;
+        }
+        if (/[/\\]node_modules[/\\]*$/.test(dir)) return;
+
+        var pkgfile = path.join(dir, 'package.json');
+
+        if (!isFile(pkgfile)) {
+            return loadpkg(path.dirname(dir));
+        }
+
+        var body = readFileSync(pkgfile);
+
+        try {
+            var pkg = JSON.parse(body);
+        } catch (jsonErr) {}
+
+        if (pkg && opts.packageFilter) {
+            pkg = opts.packageFilter(pkg, dir);
+        }
+
+        return { pkg: pkg, dir: dir };
+    }
+
+    function loadAsDirectorySync(x) {
+        var pkgfile = path.join(x, '/package.json');
+        if (isFile(pkgfile)) {
+            try {
+                var body = readFileSync(pkgfile, 'UTF8');
+                var pkg = JSON.parse(body);
+
+                if (opts.packageFilter) {
+                    pkg = opts.packageFilter(pkg, x);
+                }
+
+                if (pkg.main) {
+                    if (pkg.main === '.' || pkg.main === './') {
+                        pkg.main = 'index';
+                    }
+                    var m = loadAsFileSync(path.resolve(x, pkg.main));
+                    if (m) return m;
+                    var n = loadAsDirectorySync(path.resolve(x, pkg.main));
+                    if (n) return n;
+                }
+            } catch (e) {}
+        }
+
+        return loadAsFileSync(path.join(x, '/index'));
+    }
+
+    function loadNodeModulesSync(x, start) {
+        var dirs = nodeModulesPaths(start, opts);
+        for (var i = 0; i < dirs.length; i++) {
+            var dir = dirs[i];
+            var m = loadAsFileSync(path.join(dir, '/', x));
+            if (m) return m;
+            var n = loadAsDirectorySync(path.join(dir, '/', x));
+            if (n) return n;
+        }
+    }
+};
+
+
+/***/ }),
+/* 818 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+const onetime = __webpack_require__(771);
+const signalExit = __webpack_require__(451);
+
+module.exports = onetime(() => {
+	signalExit(() => {
+		process.stderr.write('\u001b[?25h');
+	}, {alwaysLast: true});
+});
+
+
+/***/ }),
+/* 819 */
+/***/ (function(module, exports, __webpack_require__) {
+
+module.exports = __webpack_require__(820);
+
+/***/ }),
+/* 820 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var RetryOperation = __webpack_require__(821);
+
+exports.operation = function(options) {
+  var timeouts = exports.timeouts(options);
+  return new RetryOperation(timeouts, {
+      forever: options && options.forever,
+      unref: options && options.unref
+  });
+};
+
+exports.timeouts = function(options) {
+  if (options instanceof Array) {
+    return [].concat(options);
+  }
+
+  var opts = {
+    retries: 10,
+    factor: 2,
+    minTimeout: 1 * 1000,
+    maxTimeout: Infinity,
+    randomize: false
+  };
+  for (var key in options) {
+    opts[key] = options[key];
+  }
+
+  if (opts.minTimeout > opts.maxTimeout) {
+    throw new Error('minTimeout is greater than maxTimeout');
+  }
+
+  var timeouts = [];
+  for (var i = 0; i < opts.retries; i++) {
+    timeouts.push(this.createTimeout(i, opts));
+  }
+
+  if (options && options.forever && !timeouts.length) {
+    timeouts.push(this.createTimeout(i, opts));
+  }
+
+  // sort the array numerically ascending
+  timeouts.sort(function(a,b) {
+    return a - b;
+  });
+
+  return timeouts;
+};
+
+exports.createTimeout = function(attempt, opts) {
+  var random = (opts.randomize)
+    ? (Math.random() + 1)
+    : 1;
+
+  var timeout = Math.round(random * opts.minTimeout * Math.pow(opts.factor, attempt));
+  timeout = Math.min(timeout, opts.maxTimeout);
+
+  return timeout;
+};
+
+exports.wrap = function(obj, options, methods) {
+  if (options instanceof Array) {
+    methods = options;
+    options = null;
+  }
+
+  if (!methods) {
+    methods = [];
+    for (var key in obj) {
+      if (typeof obj[key] === 'function') {
+        methods.push(key);
+      }
+    }
+  }
+
+  for (var i = 0; i < methods.length; i++) {
+    var method   = methods[i];
+    var original = obj[method];
+
+    obj[method] = function retryWrapper() {
+      var op       = exports.operation(options);
+      var args     = Array.prototype.slice.call(arguments);
+      var callback = args.pop();
+
+      args.push(function(err) {
+        if (op.retry(err)) {
+          return;
+        }
+        if (err) {
+          arguments[0] = op.mainError();
+        }
+        callback.apply(this, arguments);
+      });
+
+      op.attempt(function() {
+        original.apply(obj, args);
+      });
+    };
+    obj[method].options = options;
+  }
+};
+
+
+/***/ }),
+/* 821 */
+/***/ (function(module, exports) {
+
+function RetryOperation(timeouts, options) {
+  // Compatibility for the old (timeouts, retryForever) signature
+  if (typeof options === 'boolean') {
+    options = { forever: options };
+  }
+
+  this._timeouts = timeouts;
+  this._options = options || {};
+  this._fn = null;
+  this._errors = [];
+  this._attempts = 1;
+  this._operationTimeout = null;
+  this._operationTimeoutCb = null;
+  this._timeout = null;
+
+  if (this._options.forever) {
+    this._cachedTimeouts = this._timeouts.slice(0);
+  }
+}
+module.exports = RetryOperation;
+
+RetryOperation.prototype.stop = function() {
+  if (this._timeout) {
+    clearTimeout(this._timeout);
+  }
+
+  this._timeouts       = [];
+  this._cachedTimeouts = null;
+};
+
+RetryOperation.prototype.retry = function(err) {
+  if (this._timeout) {
+    clearTimeout(this._timeout);
+  }
+
+  if (!err) {
+    return false;
+  }
+
+  this._errors.push(err);
+
+  var timeout = this._timeouts.shift();
+  if (timeout === undefined) {
+    if (this._cachedTimeouts) {
+      // retry forever, only keep last error
+      this._errors.splice(this._errors.length - 1, this._errors.length);
+      this._timeouts = this._cachedTimeouts.slice(0);
+      timeout = this._timeouts.shift();
+    } else {
+      return false;
+    }
+  }
+
+  var self = this;
+  var timer = setTimeout(function() {
+    self._attempts++;
+
+    if (self._operationTimeoutCb) {
+      self._timeout = setTimeout(function() {
+        self._operationTimeoutCb(self._attempts);
+      }, self._operationTimeout);
+
+      if (this._options.unref) {
+          self._timeout.unref();
+      }
+    }
+
+    self._fn(self._attempts);
+  }, timeout);
+
+  if (this._options.unref) {
+      timer.unref();
+  }
+
+  return true;
+};
+
+RetryOperation.prototype.attempt = function(fn, timeoutOps) {
+  this._fn = fn;
+
+  if (timeoutOps) {
+    if (timeoutOps.timeout) {
+      this._operationTimeout = timeoutOps.timeout;
+    }
+    if (timeoutOps.cb) {
+      this._operationTimeoutCb = timeoutOps.cb;
+    }
+  }
+
+  var self = this;
+  if (this._operationTimeoutCb) {
+    this._timeout = setTimeout(function() {
+      self._operationTimeoutCb();
+    }, self._operationTimeout);
+  }
+
+  this._fn(this._attempts);
+};
+
+RetryOperation.prototype.try = function(fn) {
+  console.log('Using RetryOperation.try() is deprecated');
+  this.attempt(fn);
+};
+
+RetryOperation.prototype.start = function(fn) {
+  console.log('Using RetryOperation.start() is deprecated');
+  this.attempt(fn);
+};
+
+RetryOperation.prototype.start = RetryOperation.prototype.try;
+
+RetryOperation.prototype.errors = function() {
+  return this._errors;
+};
+
+RetryOperation.prototype.attempts = function() {
+  return this._attempts;
+};
+
+RetryOperation.prototype.mainError = function() {
+  if (this._errors.length === 0) {
+    return null;
+  }
+
+  var counts = {};
+  var mainError = null;
+  var mainErrorCount = 0;
+
+  for (var i = 0; i < this._errors.length; i++) {
+    var error = this._errors[i];
+    var message = error.message;
+    var count = (counts[message] || 0) + 1;
+
+    counts[message] = count;
+
+    if (count >= mainErrorCount) {
+      mainError = error;
+      mainErrorCount = count;
+    }
+  }
+
+  return mainError;
+};
+
+
+/***/ }),
+/* 822 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return SubscribeOnObservable; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Observable__ = __webpack_require__(12);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__scheduler_asap__ = __webpack_require__(438);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_isNumeric__ = __webpack_require__(190);
+/** PURE_IMPORTS_START tslib,_Observable,_scheduler_asap,_util_isNumeric PURE_IMPORTS_END */
+
+
+
+
+var SubscribeOnObservable = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](SubscribeOnObservable, _super);
+    function SubscribeOnObservable(source, delayTime, scheduler) {
+        if (delayTime === void 0) {
+            delayTime = 0;
+        }
+        if (scheduler === void 0) {
+            scheduler = __WEBPACK_IMPORTED_MODULE_2__scheduler_asap__["a" /* asap */];
+        }
+        var _this = _super.call(this) || this;
+        _this.source = source;
+        _this.delayTime = delayTime;
+        _this.scheduler = scheduler;
+        if (!__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__util_isNumeric__["a" /* isNumeric */])(delayTime) || delayTime < 0) {
+            _this.delayTime = 0;
+        }
+        if (!scheduler || typeof scheduler.schedule !== 'function') {
+            _this.scheduler = __WEBPACK_IMPORTED_MODULE_2__scheduler_asap__["a" /* asap */];
+        }
+        return _this;
+    }
+    SubscribeOnObservable.create = function (source, delay, scheduler) {
+        if (delay === void 0) {
+            delay = 0;
+        }
+        if (scheduler === void 0) {
+            scheduler = __WEBPACK_IMPORTED_MODULE_2__scheduler_asap__["a" /* asap */];
+        }
+        return new SubscribeOnObservable(source, delay, scheduler);
+    };
+    SubscribeOnObservable.dispatch = function (arg) {
+        var source = arg.source, subscriber = arg.subscriber;
+        return this.add(source.subscribe(subscriber));
+    };
+    SubscribeOnObservable.prototype._subscribe = function (subscriber) {
+        var delay = this.delayTime;
+        var source = this.source;
+        var scheduler = this.scheduler;
+        return scheduler.schedule(SubscribeOnObservable.dispatch, delay, {
+            source: source, subscriber: subscriber
+        });
+    };
+    return SubscribeOnObservable;
+}(__WEBPACK_IMPORTED_MODULE_1__Observable__["a" /* Observable */]));
+
+//# sourceMappingURL=SubscribeOnObservable.js.map
+
+
+/***/ }),
+/* 823 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = bindCallback;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(12);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsyncSubject__ = __webpack_require__(183);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__operators_map__ = __webpack_require__(46);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_canReportError__ = __webpack_require__(322);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_isArray__ = __webpack_require__(41);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_isScheduler__ = __webpack_require__(48);
+/** PURE_IMPORTS_START _Observable,_AsyncSubject,_operators_map,_util_canReportError,_util_isArray,_util_isScheduler PURE_IMPORTS_END */
+
+
+
+
+
+
+function bindCallback(callbackFunc, resultSelector, scheduler) {
+    if (resultSelector) {
+        if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_5__util_isScheduler__["a" /* isScheduler */])(resultSelector)) {
+            scheduler = resultSelector;
+        }
+        else {
+            return function () {
+                var args = [];
+                for (var _i = 0; _i < arguments.length; _i++) {
+                    args[_i] = arguments[_i];
+                }
+                return bindCallback(callbackFunc, scheduler).apply(void 0, args).pipe(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__operators_map__["a" /* map */])(function (args) { return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_4__util_isArray__["a" /* isArray */])(args) ? resultSelector.apply(void 0, args) : resultSelector(args); }));
+            };
+        }
+    }
+    return function () {
+        var args = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            args[_i] = arguments[_i];
+        }
+        var context = this;
+        var subject;
+        var params = {
+            context: context,
+            subject: subject,
+            callbackFunc: callbackFunc,
+            scheduler: scheduler,
+        };
+        return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) {
+            if (!scheduler) {
+                if (!subject) {
+                    subject = new __WEBPACK_IMPORTED_MODULE_1__AsyncSubject__["a" /* AsyncSubject */]();
+                    var handler = function () {
+                        var innerArgs = [];
+                        for (var _i = 0; _i < arguments.length; _i++) {
+                            innerArgs[_i] = arguments[_i];
+                        }
+                        subject.next(innerArgs.length <= 1 ? innerArgs[0] : innerArgs);
+                        subject.complete();
+                    };
+                    try {
+                        callbackFunc.apply(context, args.concat([handler]));
+                    }
+                    catch (err) {
+                        if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__util_canReportError__["a" /* canReportError */])(subject)) {
+                            subject.error(err);
+                        }
+                        else {
+                            console.warn(err);
+                        }
+                    }
+                }
+                return subject.subscribe(subscriber);
+            }
+            else {
+                var state = {
+                    args: args, subscriber: subscriber, params: params,
+                };
+                return scheduler.schedule(dispatch, 0, state);
+            }
+        });
+    };
+}
+function dispatch(state) {
+    var _this = this;
+    var self = this;
+    var args = state.args, subscriber = state.subscriber, params = state.params;
+    var callbackFunc = params.callbackFunc, context = params.context, scheduler = params.scheduler;
+    var subject = params.subject;
+    if (!subject) {
+        subject = params.subject = new __WEBPACK_IMPORTED_MODULE_1__AsyncSubject__["a" /* AsyncSubject */]();
+        var handler = function () {
+            var innerArgs = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                innerArgs[_i] = arguments[_i];
+            }
+            var value = innerArgs.length <= 1 ? innerArgs[0] : innerArgs;
+            _this.add(scheduler.schedule(dispatchNext, 0, { value: value, subject: subject }));
+        };
+        try {
+            callbackFunc.apply(context, args.concat([handler]));
+        }
+        catch (err) {
+            subject.error(err);
+        }
+    }
+    this.add(subject.subscribe(subscriber));
+}
+function dispatchNext(state) {
+    var value = state.value, subject = state.subject;
+    subject.next(value);
+    subject.complete();
+}
+function dispatchError(state) {
+    var err = state.err, subject = state.subject;
+    subject.error(err);
+}
+//# sourceMappingURL=bindCallback.js.map
+
+
+/***/ }),
+/* 824 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = bindNodeCallback;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(12);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsyncSubject__ = __webpack_require__(183);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__operators_map__ = __webpack_require__(46);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_canReportError__ = __webpack_require__(322);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_isScheduler__ = __webpack_require__(48);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_isArray__ = __webpack_require__(41);
+/** PURE_IMPORTS_START _Observable,_AsyncSubject,_operators_map,_util_canReportError,_util_isScheduler,_util_isArray PURE_IMPORTS_END */
+
+
+
+
+
+
+function bindNodeCallback(callbackFunc, resultSelector, scheduler) {
+    if (resultSelector) {
+        if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_4__util_isScheduler__["a" /* isScheduler */])(resultSelector)) {
+            scheduler = resultSelector;
+        }
+        else {
+            return function () {
+                var args = [];
+                for (var _i = 0; _i < arguments.length; _i++) {
+                    args[_i] = arguments[_i];
+                }
+                return bindNodeCallback(callbackFunc, scheduler).apply(void 0, args).pipe(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__operators_map__["a" /* map */])(function (args) { return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_5__util_isArray__["a" /* isArray */])(args) ? resultSelector.apply(void 0, args) : resultSelector(args); }));
+            };
+        }
+    }
+    return function () {
+        var args = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            args[_i] = arguments[_i];
+        }
+        var params = {
+            subject: undefined,
+            args: args,
+            callbackFunc: callbackFunc,
+            scheduler: scheduler,
+            context: this,
+        };
+        return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) {
+            var context = params.context;
+            var subject = params.subject;
+            if (!scheduler) {
+                if (!subject) {
+                    subject = params.subject = new __WEBPACK_IMPORTED_MODULE_1__AsyncSubject__["a" /* AsyncSubject */]();
+                    var handler = function () {
+                        var innerArgs = [];
+                        for (var _i = 0; _i < arguments.length; _i++) {
+                            innerArgs[_i] = arguments[_i];
+                        }
+                        var err = innerArgs.shift();
+                        if (err) {
+                            subject.error(err);
+                            return;
+                        }
+                        subject.next(innerArgs.length <= 1 ? innerArgs[0] : innerArgs);
+                        subject.complete();
+                    };
+                    try {
+                        callbackFunc.apply(context, args.concat([handler]));
+                    }
+                    catch (err) {
+                        if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__util_canReportError__["a" /* canReportError */])(subject)) {
+                            subject.error(err);
+                        }
+                        else {
+                            console.warn(err);
+                        }
+                    }
+                }
+                return subject.subscribe(subscriber);
+            }
+            else {
+                return scheduler.schedule(dispatch, 0, { params: params, subscriber: subscriber, context: context });
+            }
+        });
+    };
+}
+function dispatch(state) {
+    var _this = this;
+    var params = state.params, subscriber = state.subscriber, context = state.context;
+    var callbackFunc = params.callbackFunc, args = params.args, scheduler = params.scheduler;
+    var subject = params.subject;
+    if (!subject) {
+        subject = params.subject = new __WEBPACK_IMPORTED_MODULE_1__AsyncSubject__["a" /* AsyncSubject */]();
+        var handler = function () {
+            var innerArgs = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                innerArgs[_i] = arguments[_i];
+            }
+            var err = innerArgs.shift();
+            if (err) {
+                _this.add(scheduler.schedule(dispatchError, 0, { err: err, subject: subject }));
+            }
+            else {
+                var value = innerArgs.length <= 1 ? innerArgs[0] : innerArgs;
+                _this.add(scheduler.schedule(dispatchNext, 0, { value: value, subject: subject }));
+            }
+        };
+        try {
+            callbackFunc.apply(context, args.concat([handler]));
+        }
+        catch (err) {
+            this.add(scheduler.schedule(dispatchError, 0, { err: err, subject: subject }));
+        }
+    }
+    this.add(subject.subscribe(subscriber));
+}
+function dispatchNext(arg) {
+    var value = arg.value, subject = arg.subject;
+    subject.next(value);
+    subject.complete();
+}
+function dispatchError(arg) {
+    var err = arg.err, subject = arg.subject;
+    subject.error(err);
+}
+//# sourceMappingURL=bindNodeCallback.js.map
+
+
+/***/ }),
+/* 825 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = forkJoin;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Observable__ = __webpack_require__(12);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isArray__ = __webpack_require__(41);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__empty__ = __webpack_require__(39);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__ = __webpack_require__(14);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__OuterSubscriber__ = __webpack_require__(13);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__operators_map__ = __webpack_require__(46);
+/** PURE_IMPORTS_START tslib,_Observable,_util_isArray,_empty,_util_subscribeToResult,_OuterSubscriber,_operators_map PURE_IMPORTS_END */
+
+
+
+
+
+
+
+function forkJoin() {
+    var sources = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        sources[_i] = arguments[_i];
+    }
+    var resultSelector;
+    if (typeof sources[sources.length - 1] === 'function') {
+        resultSelector = sources.pop();
+    }
+    if (sources.length === 1 && __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_isArray__["a" /* isArray */])(sources[0])) {
+        sources = sources[0];
+    }
+    if (sources.length === 0) {
+        return __WEBPACK_IMPORTED_MODULE_3__empty__["b" /* EMPTY */];
+    }
+    if (resultSelector) {
+        return forkJoin(sources).pipe(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_6__operators_map__["a" /* map */])(function (args) { return resultSelector.apply(void 0, args); }));
+    }
+    return new __WEBPACK_IMPORTED_MODULE_1__Observable__["a" /* Observable */](function (subscriber) {
+        return new ForkJoinSubscriber(subscriber, sources);
+    });
+}
+var ForkJoinSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](ForkJoinSubscriber, _super);
+    function ForkJoinSubscriber(destination, sources) {
+        var _this = _super.call(this, destination) || this;
+        _this.sources = sources;
+        _this.completed = 0;
+        _this.haveValues = 0;
+        var len = sources.length;
+        _this.values = new Array(len);
+        for (var i = 0; i < len; i++) {
+            var source = sources[i];
+            var innerSubscription = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__["a" /* subscribeToResult */])(_this, source, null, i);
+            if (innerSubscription) {
+                _this.add(innerSubscription);
+            }
+        }
+        return _this;
+    }
+    ForkJoinSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        this.values[outerIndex] = innerValue;
+        if (!innerSub._hasValue) {
+            innerSub._hasValue = true;
+            this.haveValues++;
+        }
+    };
+    ForkJoinSubscriber.prototype.notifyComplete = function (innerSub) {
+        var _a = this, destination = _a.destination, haveValues = _a.haveValues, values = _a.values;
+        var len = values.length;
+        if (!innerSub._hasValue) {
+            destination.complete();
+            return;
+        }
+        this.completed++;
+        if (this.completed !== len) {
+            return;
+        }
+        if (haveValues === len) {
+            destination.next(values);
+        }
+        destination.complete();
+    };
+    return ForkJoinSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_5__OuterSubscriber__["a" /* OuterSubscriber */]));
+//# sourceMappingURL=forkJoin.js.map
+
+
+/***/ }),
+/* 826 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = fromEvent;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(12);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_isArray__ = __webpack_require__(41);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isFunction__ = __webpack_require__(154);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__operators_map__ = __webpack_require__(46);
+/** PURE_IMPORTS_START _Observable,_util_isArray,_util_isFunction,_operators_map PURE_IMPORTS_END */
+
+
+
+
+var toString = Object.prototype.toString;
+function fromEvent(target, eventName, options, resultSelector) {
+    if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_isFunction__["a" /* isFunction */])(options)) {
+        resultSelector = options;
+        options = undefined;
+    }
+    if (resultSelector) {
+        return fromEvent(target, eventName, options).pipe(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__operators_map__["a" /* map */])(function (args) { return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__util_isArray__["a" /* isArray */])(args) ? resultSelector.apply(void 0, args) : resultSelector(args); }));
+    }
+    return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) {
+        function handler(e) {
+            if (arguments.length > 1) {
+                subscriber.next(Array.prototype.slice.call(arguments));
+            }
+            else {
+                subscriber.next(e);
+            }
+        }
+        setupSubscription(target, eventName, handler, subscriber, options);
+    });
+}
+function setupSubscription(sourceObj, eventName, handler, subscriber, options) {
+    var unsubscribe;
+    if (isEventTarget(sourceObj)) {
+        var source_1 = sourceObj;
+        sourceObj.addEventListener(eventName, handler, options);
+        unsubscribe = function () { return source_1.removeEventListener(eventName, handler, options); };
+    }
+    else if (isJQueryStyleEventEmitter(sourceObj)) {
+        var source_2 = sourceObj;
+        sourceObj.on(eventName, handler);
+        unsubscribe = function () { return source_2.off(eventName, handler); };
+    }
+    else if (isNodeStyleEventEmitter(sourceObj)) {
+        var source_3 = sourceObj;
+        sourceObj.addListener(eventName, handler);
+        unsubscribe = function () { return source_3.removeListener(eventName, handler); };
+    }
+    else if (sourceObj && sourceObj.length) {
+        for (var i = 0, len = sourceObj.length; i < len; i++) {
+            setupSubscription(sourceObj[i], eventName, handler, subscriber, options);
+        }
+    }
+    else {
+        throw new TypeError('Invalid event target');
+    }
+    subscriber.add(unsubscribe);
+}
+function isNodeStyleEventEmitter(sourceObj) {
+    return sourceObj && typeof sourceObj.addListener === 'function' && typeof sourceObj.removeListener === 'function';
+}
+function isJQueryStyleEventEmitter(sourceObj) {
+    return sourceObj && typeof sourceObj.on === 'function' && typeof sourceObj.off === 'function';
+}
+function isEventTarget(sourceObj) {
+    return sourceObj && typeof sourceObj.addEventListener === 'function' && typeof sourceObj.removeEventListener === 'function';
+}
+//# sourceMappingURL=fromEvent.js.map
+
+
+/***/ }),
+/* 827 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = fromEventPattern;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(12);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_isArray__ = __webpack_require__(41);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isFunction__ = __webpack_require__(154);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__operators_map__ = __webpack_require__(46);
+/** PURE_IMPORTS_START _Observable,_util_isArray,_util_isFunction,_operators_map PURE_IMPORTS_END */
+
+
+
+
+function fromEventPattern(addHandler, removeHandler, resultSelector) {
+    if (resultSelector) {
+        return fromEventPattern(addHandler, removeHandler).pipe(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__operators_map__["a" /* map */])(function (args) { return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__util_isArray__["a" /* isArray */])(args) ? resultSelector.apply(void 0, args) : resultSelector(args); }));
+    }
+    return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) {
+        var handler = function () {
+            var e = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                e[_i] = arguments[_i];
+            }
+            return subscriber.next(e.length === 1 ? e[0] : e);
+        };
+        var retValue;
+        try {
+            retValue = addHandler(handler);
+        }
+        catch (err) {
+            subscriber.error(err);
+            return undefined;
+        }
+        if (!__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_isFunction__["a" /* isFunction */])(removeHandler)) {
+            return undefined;
+        }
+        return function () { return removeHandler(handler, retValue); };
+    });
+}
+//# sourceMappingURL=fromEventPattern.js.map
+
+
+/***/ }),
+/* 828 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = fromIterable;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(12);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscription__ = __webpack_require__(25);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__symbol_iterator__ = __webpack_require__(151);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_subscribeToIterable__ = __webpack_require__(448);
+/** PURE_IMPORTS_START _Observable,_Subscription,_symbol_iterator,_util_subscribeToIterable PURE_IMPORTS_END */
+
+
+
+
+function fromIterable(input, scheduler) {
+    if (!input) {
+        throw new Error('Iterable cannot be null');
+    }
+    if (!scheduler) {
+        return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__util_subscribeToIterable__["a" /* subscribeToIterable */])(input));
+    }
+    else {
+        return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) {
+            var sub = new __WEBPACK_IMPORTED_MODULE_1__Subscription__["a" /* Subscription */]();
+            var iterator;
+            sub.add(function () {
+                if (iterator && typeof iterator.return === 'function') {
+                    iterator.return();
+                }
+            });
+            sub.add(scheduler.schedule(function () {
+                iterator = input[__WEBPACK_IMPORTED_MODULE_2__symbol_iterator__["a" /* iterator */]]();
+                sub.add(scheduler.schedule(function () {
+                    if (subscriber.closed) {
+                        return;
+                    }
+                    var value;
+                    var done;
+                    try {
+                        var result = iterator.next();
+                        value = result.value;
+                        done = result.done;
+                    }
+                    catch (err) {
+                        subscriber.error(err);
+                        return;
+                    }
+                    if (done) {
+                        subscriber.complete();
+                    }
+                    else {
+                        subscriber.next(value);
+                        this.schedule();
+                    }
+                }));
+            }));
+            return sub;
+        });
+    }
+}
+//# sourceMappingURL=fromIterable.js.map
+
+
+/***/ }),
+/* 829 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = fromObservable;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(12);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscription__ = __webpack_require__(25);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__symbol_observable__ = __webpack_require__(117);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_subscribeToObservable__ = __webpack_require__(449);
+/** PURE_IMPORTS_START _Observable,_Subscription,_symbol_observable,_util_subscribeToObservable PURE_IMPORTS_END */
+
+
+
+
+function fromObservable(input, scheduler) {
+    if (!scheduler) {
+        return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__util_subscribeToObservable__["a" /* subscribeToObservable */])(input));
+    }
+    else {
+        return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) {
+            var sub = new __WEBPACK_IMPORTED_MODULE_1__Subscription__["a" /* Subscription */]();
+            sub.add(scheduler.schedule(function () {
+                var observable = input[__WEBPACK_IMPORTED_MODULE_2__symbol_observable__["a" /* observable */]]();
+                sub.add(observable.subscribe({
+                    next: function (value) { sub.add(scheduler.schedule(function () { return subscriber.next(value); })); },
+                    error: function (err) { sub.add(scheduler.schedule(function () { return subscriber.error(err); })); },
+                    complete: function () { sub.add(scheduler.schedule(function () { return subscriber.complete(); })); },
+                }));
+            }));
+            return sub;
+        });
+    }
+}
+//# sourceMappingURL=fromObservable.js.map
+
+
+/***/ }),
+/* 830 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = fromPromise;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(12);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscription__ = __webpack_require__(25);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToPromise__ = __webpack_require__(450);
+/** PURE_IMPORTS_START _Observable,_Subscription,_util_subscribeToPromise PURE_IMPORTS_END */
+
+
+
+function fromPromise(input, scheduler) {
+    if (!scheduler) {
+        return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_subscribeToPromise__["a" /* subscribeToPromise */])(input));
+    }
+    else {
+        return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) {
+            var sub = new __WEBPACK_IMPORTED_MODULE_1__Subscription__["a" /* Subscription */]();
+            sub.add(scheduler.schedule(function () {
+                return input.then(function (value) {
+                    sub.add(scheduler.schedule(function () {
+                        subscriber.next(value);
+                        sub.add(scheduler.schedule(function () { return subscriber.complete(); }));
+                    }));
+                }, function (err) {
+                    sub.add(scheduler.schedule(function () { return subscriber.error(err); }));
+                });
+            }));
+            return sub;
+        });
+    }
+}
+//# sourceMappingURL=fromPromise.js.map
+
+
+/***/ }),
+/* 831 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = generate;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(12);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_identity__ = __webpack_require__(118);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isScheduler__ = __webpack_require__(48);
+/** PURE_IMPORTS_START _Observable,_util_identity,_util_isScheduler PURE_IMPORTS_END */
+
+
+
+function generate(initialStateOrOptions, condition, iterate, resultSelectorOrObservable, scheduler) {
+    var resultSelector;
+    var initialState;
+    if (arguments.length == 1) {
+        var options = initialStateOrOptions;
+        initialState = options.initialState;
+        condition = options.condition;
+        iterate = options.iterate;
+        resultSelector = options.resultSelector || __WEBPACK_IMPORTED_MODULE_1__util_identity__["a" /* identity */];
+        scheduler = options.scheduler;
+    }
+    else if (resultSelectorOrObservable === undefined || __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_isScheduler__["a" /* isScheduler */])(resultSelectorOrObservable)) {
+        initialState = initialStateOrOptions;
+        resultSelector = __WEBPACK_IMPORTED_MODULE_1__util_identity__["a" /* identity */];
+        scheduler = resultSelectorOrObservable;
+    }
+    else {
+        initialState = initialStateOrOptions;
+        resultSelector = resultSelectorOrObservable;
+    }
+    return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) {
+        var state = initialState;
+        if (scheduler) {
+            return scheduler.schedule(dispatch, 0, {
+                subscriber: subscriber,
+                iterate: iterate,
+                condition: condition,
+                resultSelector: resultSelector,
+                state: state
+            });
+        }
+        do {
+            if (condition) {
+                var conditionResult = void 0;
+                try {
+                    conditionResult = condition(state);
+                }
+                catch (err) {
+                    subscriber.error(err);
+                    return undefined;
+                }
+                if (!conditionResult) {
+                    subscriber.complete();
+                    break;
+                }
+            }
+            var value = void 0;
+            try {
+                value = resultSelector(state);
+            }
+            catch (err) {
+                subscriber.error(err);
+                return undefined;
+            }
+            subscriber.next(value);
+            if (subscriber.closed) {
+                break;
+            }
+            try {
+                state = iterate(state);
+            }
+            catch (err) {
+                subscriber.error(err);
+                return undefined;
+            }
+        } while (true);
+        return undefined;
+    });
+}
+function dispatch(state) {
+    var subscriber = state.subscriber, condition = state.condition;
+    if (subscriber.closed) {
+        return undefined;
+    }
+    if (state.needIterate) {
+        try {
+            state.state = state.iterate(state.state);
+        }
+        catch (err) {
+            subscriber.error(err);
+            return undefined;
+        }
+    }
+    else {
+        state.needIterate = true;
+    }
+    if (condition) {
+        var conditionResult = void 0;
+        try {
+            conditionResult = condition(state.state);
+        }
+        catch (err) {
+            subscriber.error(err);
+            return undefined;
+        }
+        if (!conditionResult) {
+            subscriber.complete();
+            return undefined;
+        }
+        if (subscriber.closed) {
+            return undefined;
+        }
+    }
+    var value;
+    try {
+        value = state.resultSelector(state.state);
+    }
+    catch (err) {
+        subscriber.error(err);
+        return undefined;
+    }
+    if (subscriber.closed) {
+        return undefined;
+    }
+    subscriber.next(value);
+    if (subscriber.closed) {
+        return undefined;
+    }
+    return this.schedule(state);
+}
+//# sourceMappingURL=generate.js.map
+
+
+/***/ }),
+/* 832 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = iif;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__defer__ = __webpack_require__(310);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__empty__ = __webpack_require__(39);
+/** PURE_IMPORTS_START _defer,_empty PURE_IMPORTS_END */
+
+
+function iif(condition, trueResult, falseResult) {
+    if (trueResult === void 0) {
+        trueResult = __WEBPACK_IMPORTED_MODULE_1__empty__["b" /* EMPTY */];
+    }
+    if (falseResult === void 0) {
+        falseResult = __WEBPACK_IMPORTED_MODULE_1__empty__["b" /* EMPTY */];
+    }
+    return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__defer__["a" /* defer */])(function () { return condition() ? trueResult : falseResult; });
+}
+//# sourceMappingURL=iif.js.map
+
+
+/***/ }),
+/* 833 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = interval;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(12);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__scheduler_async__ = __webpack_require__(40);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isNumeric__ = __webpack_require__(190);
+/** PURE_IMPORTS_START _Observable,_scheduler_async,_util_isNumeric PURE_IMPORTS_END */
+
+
+
+function interval(period, scheduler) {
+    if (period === void 0) {
+        period = 0;
+    }
+    if (scheduler === void 0) {
+        scheduler = __WEBPACK_IMPORTED_MODULE_1__scheduler_async__["a" /* async */];
+    }
+    if (!__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_isNumeric__["a" /* isNumeric */])(period) || period < 0) {
+        period = 0;
+    }
+    if (!scheduler || typeof scheduler.schedule !== 'function') {
+        scheduler = __WEBPACK_IMPORTED_MODULE_1__scheduler_async__["a" /* async */];
+    }
+    return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) {
+        subscriber.add(scheduler.schedule(dispatch, period, { subscriber: subscriber, counter: 0, period: period }));
+        return subscriber;
+    });
+}
+function dispatch(state) {
+    var subscriber = state.subscriber, counter = state.counter, period = state.period;
+    subscriber.next(counter);
+    this.schedule({ subscriber: subscriber, counter: counter + 1, period: period }, period);
+}
+//# sourceMappingURL=interval.js.map
+
+
+/***/ }),
+/* 834 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = onErrorResumeNext;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(12);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__from__ = __webpack_require__(62);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isArray__ = __webpack_require__(41);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__empty__ = __webpack_require__(39);
+/** PURE_IMPORTS_START _Observable,_from,_util_isArray,_empty PURE_IMPORTS_END */
+
+
+
+
+function onErrorResumeNext() {
+    var sources = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        sources[_i] = arguments[_i];
+    }
+    if (sources.length === 0) {
+        return __WEBPACK_IMPORTED_MODULE_3__empty__["b" /* EMPTY */];
+    }
+    var first = sources[0], remainder = sources.slice(1);
+    if (sources.length === 1 && __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_isArray__["a" /* isArray */])(first)) {
+        return onErrorResumeNext.apply(void 0, first);
+    }
+    return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) {
+        var subNext = function () { return subscriber.add(onErrorResumeNext.apply(void 0, remainder).subscribe(subscriber)); };
+        return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__from__["a" /* from */])(first).subscribe({
+            next: function (value) { subscriber.next(value); },
+            error: subNext,
+            complete: subNext,
+        });
+    });
+}
+//# sourceMappingURL=onErrorResumeNext.js.map
+
+
+/***/ }),
+/* 835 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = pairs;
+/* unused harmony export dispatch */
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(12);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscription__ = __webpack_require__(25);
+/** PURE_IMPORTS_START _Observable,_Subscription PURE_IMPORTS_END */
+
+
+function pairs(obj, scheduler) {
+    if (!scheduler) {
+        return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) {
+            var keys = Object.keys(obj);
+            for (var i = 0; i < keys.length && !subscriber.closed; i++) {
+                var key = keys[i];
+                if (obj.hasOwnProperty(key)) {
+                    subscriber.next([key, obj[key]]);
+                }
+            }
+            subscriber.complete();
+        });
+    }
+    else {
+        return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) {
+            var keys = Object.keys(obj);
+            var subscription = new __WEBPACK_IMPORTED_MODULE_1__Subscription__["a" /* Subscription */]();
+            subscription.add(scheduler.schedule(dispatch, 0, { keys: keys, index: 0, subscriber: subscriber, subscription: subscription, obj: obj }));
+            return subscription;
+        });
+    }
+}
+function dispatch(state) {
+    var keys = state.keys, index = state.index, subscriber = state.subscriber, subscription = state.subscription, obj = state.obj;
+    if (!subscriber.closed) {
+        if (index < keys.length) {
+            var key = keys[index];
+            subscriber.next([key, obj[key]]);
+            subscription.add(this.schedule({ keys: keys, index: index + 1, subscriber: subscriber, subscription: subscription, obj: obj }));
+        }
+        else {
+            subscriber.complete();
+        }
+    }
+}
+//# sourceMappingURL=pairs.js.map
+
+
+/***/ }),
+/* 836 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = range;
+/* unused harmony export dispatch */
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(12);
+/** PURE_IMPORTS_START _Observable PURE_IMPORTS_END */
+
+function range(start, count, scheduler) {
+    if (start === void 0) {
+        start = 0;
+    }
+    if (count === void 0) {
+        count = 0;
+    }
+    return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) {
+        var index = 0;
+        var current = start;
+        if (scheduler) {
+            return scheduler.schedule(dispatch, 0, {
+                index: index, count: count, start: start, subscriber: subscriber
+            });
+        }
+        else {
+            do {
+                if (index++ >= count) {
+                    subscriber.complete();
+                    break;
+                }
+                subscriber.next(current++);
+                if (subscriber.closed) {
+                    break;
+                }
+            } while (true);
+        }
+        return undefined;
+    });
+}
+function dispatch(state) {
+    var start = state.start, index = state.index, count = state.count, subscriber = state.subscriber;
+    if (index >= count) {
+        subscriber.complete();
+        return;
+    }
+    subscriber.next(start);
+    if (subscriber.closed) {
+        return;
+    }
+    state.index = index + 1;
+    state.start = start + 1;
+    this.schedule(state);
+}
+//# sourceMappingURL=range.js.map
+
+
+/***/ }),
+/* 837 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = using;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(12);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__from__ = __webpack_require__(62);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__empty__ = __webpack_require__(39);
+/** PURE_IMPORTS_START _Observable,_from,_empty PURE_IMPORTS_END */
+
+
+
+function using(resourceFactory, observableFactory) {
+    return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) {
+        var resource;
+        try {
+            resource = resourceFactory();
+        }
+        catch (err) {
+            subscriber.error(err);
+            return undefined;
+        }
+        var result;
+        try {
+            result = observableFactory(resource);
+        }
+        catch (err) {
+            subscriber.error(err);
+            return undefined;
+        }
+        var source = result ? __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__from__["a" /* from */])(result) : __WEBPACK_IMPORTED_MODULE_2__empty__["b" /* EMPTY */];
+        var subscription = source.subscribe(subscriber);
+        return function () {
+            subscription.unsubscribe();
+            if (resource) {
+                resource.unsubscribe();
+            }
+        };
+    });
+}
+//# sourceMappingURL=using.js.map
+
+
+/***/ }),
+/* 838 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = auditTime;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__scheduler_async__ = __webpack_require__(40);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__audit__ = __webpack_require__(428);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__observable_timer__ = __webpack_require__(427);
+/** PURE_IMPORTS_START _scheduler_async,_audit,_observable_timer PURE_IMPORTS_END */
+
+
+
+function auditTime(duration, scheduler) {
+    if (scheduler === void 0) {
+        scheduler = __WEBPACK_IMPORTED_MODULE_0__scheduler_async__["a" /* async */];
+    }
+    return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__audit__["a" /* audit */])(function () { return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__observable_timer__["a" /* timer */])(duration, scheduler); });
+}
+//# sourceMappingURL=auditTime.js.map
+
+
+/***/ }),
+/* 839 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = buffer;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(13);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__ = __webpack_require__(14);
+/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+
+
+
+function buffer(closingNotifier) {
+    return function bufferOperatorFunction(source) {
+        return source.lift(new BufferOperator(closingNotifier));
+    };
+}
+var BufferOperator = /*@__PURE__*/ (function () {
+    function BufferOperator(closingNotifier) {
+        this.closingNotifier = closingNotifier;
+    }
+    BufferOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new BufferSubscriber(subscriber, this.closingNotifier));
+    };
+    return BufferOperator;
+}());
+var BufferSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](BufferSubscriber, _super);
+    function BufferSubscriber(destination, closingNotifier) {
+        var _this = _super.call(this, destination) || this;
+        _this.buffer = [];
+        _this.add(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__["a" /* subscribeToResult */])(_this, closingNotifier));
+        return _this;
+    }
+    BufferSubscriber.prototype._next = function (value) {
+        this.buffer.push(value);
+    };
+    BufferSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        var buffer = this.buffer;
+        this.buffer = [];
+        this.destination.next(buffer);
+    };
+    return BufferSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__["a" /* OuterSubscriber */]));
+//# sourceMappingURL=buffer.js.map
+
+
+/***/ }),
+/* 840 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = bufferCount;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
+/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+
+
+function bufferCount(bufferSize, startBufferEvery) {
+    if (startBufferEvery === void 0) {
+        startBufferEvery = null;
+    }
+    return function bufferCountOperatorFunction(source) {
+        return source.lift(new BufferCountOperator(bufferSize, startBufferEvery));
+    };
+}
+var BufferCountOperator = /*@__PURE__*/ (function () {
+    function BufferCountOperator(bufferSize, startBufferEvery) {
+        this.bufferSize = bufferSize;
+        this.startBufferEvery = startBufferEvery;
+        if (!startBufferEvery || bufferSize === startBufferEvery) {
+            this.subscriberClass = BufferCountSubscriber;
+        }
+        else {
+            this.subscriberClass = BufferSkipCountSubscriber;
+        }
+    }
+    BufferCountOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new this.subscriberClass(subscriber, this.bufferSize, this.startBufferEvery));
+    };
+    return BufferCountOperator;
+}());
+var BufferCountSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](BufferCountSubscriber, _super);
+    function BufferCountSubscriber(destination, bufferSize) {
+        var _this = _super.call(this, destination) || this;
+        _this.bufferSize = bufferSize;
+        _this.buffer = [];
+        return _this;
+    }
+    BufferCountSubscriber.prototype._next = function (value) {
+        var buffer = this.buffer;
+        buffer.push(value);
+        if (buffer.length == this.bufferSize) {
+            this.destination.next(buffer);
+            this.buffer = [];
+        }
+    };
+    BufferCountSubscriber.prototype._complete = function () {
+        var buffer = this.buffer;
+        if (buffer.length > 0) {
+            this.destination.next(buffer);
+        }
+        _super.prototype._complete.call(this);
+    };
+    return BufferCountSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
+var BufferSkipCountSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](BufferSkipCountSubscriber, _super);
+    function BufferSkipCountSubscriber(destination, bufferSize, startBufferEvery) {
+        var _this = _super.call(this, destination) || this;
+        _this.bufferSize = bufferSize;
+        _this.startBufferEvery = startBufferEvery;
+        _this.buffers = [];
+        _this.count = 0;
+        return _this;
+    }
+    BufferSkipCountSubscriber.prototype._next = function (value) {
+        var _a = this, bufferSize = _a.bufferSize, startBufferEvery = _a.startBufferEvery, buffers = _a.buffers, count = _a.count;
+        this.count++;
+        if (count % startBufferEvery === 0) {
+            buffers.push([]);
+        }
+        for (var i = buffers.length; i--;) {
+            var buffer = buffers[i];
+            buffer.push(value);
+            if (buffer.length === bufferSize) {
+                buffers.splice(i, 1);
+                this.destination.next(buffer);
+            }
+        }
+    };
+    BufferSkipCountSubscriber.prototype._complete = function () {
+        var _a = this, buffers = _a.buffers, destination = _a.destination;
+        while (buffers.length > 0) {
+            var buffer = buffers.shift();
+            if (buffer.length > 0) {
+                destination.next(buffer);
+            }
+        }
+        _super.prototype._complete.call(this);
+    };
+    return BufferSkipCountSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
+//# sourceMappingURL=bufferCount.js.map
+
+
+/***/ }),
+/* 841 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = bufferTime;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__scheduler_async__ = __webpack_require__(40);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Subscriber__ = __webpack_require__(7);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_isScheduler__ = __webpack_require__(48);
+/** PURE_IMPORTS_START tslib,_scheduler_async,_Subscriber,_util_isScheduler PURE_IMPORTS_END */
+
+
+
+
+function bufferTime(bufferTimeSpan) {
+    var length = arguments.length;
+    var scheduler = __WEBPACK_IMPORTED_MODULE_1__scheduler_async__["a" /* async */];
+    if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__util_isScheduler__["a" /* isScheduler */])(arguments[arguments.length - 1])) {
+        scheduler = arguments[arguments.length - 1];
+        length--;
+    }
+    var bufferCreationInterval = null;
+    if (length >= 2) {
+        bufferCreationInterval = arguments[1];
+    }
+    var maxBufferSize = Number.POSITIVE_INFINITY;
+    if (length >= 3) {
+        maxBufferSize = arguments[2];
+    }
+    return function bufferTimeOperatorFunction(source) {
+        return source.lift(new BufferTimeOperator(bufferTimeSpan, bufferCreationInterval, maxBufferSize, scheduler));
+    };
+}
+var BufferTimeOperator = /*@__PURE__*/ (function () {
+    function BufferTimeOperator(bufferTimeSpan, bufferCreationInterval, maxBufferSize, scheduler) {
+        this.bufferTimeSpan = bufferTimeSpan;
+        this.bufferCreationInterval = bufferCreationInterval;
+        this.maxBufferSize = maxBufferSize;
+        this.scheduler = scheduler;
+    }
+    BufferTimeOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new BufferTimeSubscriber(subscriber, this.bufferTimeSpan, this.bufferCreationInterval, this.maxBufferSize, this.scheduler));
+    };
+    return BufferTimeOperator;
+}());
+var Context = /*@__PURE__*/ (function () {
+    function Context() {
+        this.buffer = [];
+    }
+    return Context;
+}());
+var BufferTimeSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](BufferTimeSubscriber, _super);
+    function BufferTimeSubscriber(destination, bufferTimeSpan, bufferCreationInterval, maxBufferSize, scheduler) {
+        var _this = _super.call(this, destination) || this;
+        _this.bufferTimeSpan = bufferTimeSpan;
+        _this.bufferCreationInterval = bufferCreationInterval;
+        _this.maxBufferSize = maxBufferSize;
+        _this.scheduler = scheduler;
+        _this.contexts = [];
+        var context = _this.openContext();
+        _this.timespanOnly = bufferCreationInterval == null || bufferCreationInterval < 0;
+        if (_this.timespanOnly) {
+            var timeSpanOnlyState = { subscriber: _this, context: context, bufferTimeSpan: bufferTimeSpan };
+            _this.add(context.closeAction = scheduler.schedule(dispatchBufferTimeSpanOnly, bufferTimeSpan, timeSpanOnlyState));
+        }
+        else {
+            var closeState = { subscriber: _this, context: context };
+            var creationState = { bufferTimeSpan: bufferTimeSpan, bufferCreationInterval: bufferCreationInterval, subscriber: _this, scheduler: scheduler };
+            _this.add(context.closeAction = scheduler.schedule(dispatchBufferClose, bufferTimeSpan, closeState));
+            _this.add(scheduler.schedule(dispatchBufferCreation, bufferCreationInterval, creationState));
+        }
+        return _this;
+    }
+    BufferTimeSubscriber.prototype._next = function (value) {
+        var contexts = this.contexts;
+        var len = contexts.length;
+        var filledBufferContext;
+        for (var i = 0; i < len; i++) {
+            var context_1 = contexts[i];
+            var buffer = context_1.buffer;
+            buffer.push(value);
+            if (buffer.length == this.maxBufferSize) {
+                filledBufferContext = context_1;
+            }
+        }
+        if (filledBufferContext) {
+            this.onBufferFull(filledBufferContext);
+        }
+    };
+    BufferTimeSubscriber.prototype._error = function (err) {
+        this.contexts.length = 0;
+        _super.prototype._error.call(this, err);
+    };
+    BufferTimeSubscriber.prototype._complete = function () {
+        var _a = this, contexts = _a.contexts, destination = _a.destination;
+        while (contexts.length > 0) {
+            var context_2 = contexts.shift();
+            destination.next(context_2.buffer);
+        }
+        _super.prototype._complete.call(this);
+    };
+    BufferTimeSubscriber.prototype._unsubscribe = function () {
+        this.contexts = null;
+    };
+    BufferTimeSubscriber.prototype.onBufferFull = function (context) {
+        this.closeContext(context);
+        var closeAction = context.closeAction;
+        closeAction.unsubscribe();
+        this.remove(closeAction);
+        if (!this.closed && this.timespanOnly) {
+            context = this.openContext();
+            var bufferTimeSpan = this.bufferTimeSpan;
+            var timeSpanOnlyState = { subscriber: this, context: context, bufferTimeSpan: bufferTimeSpan };
+            this.add(context.closeAction = this.scheduler.schedule(dispatchBufferTimeSpanOnly, bufferTimeSpan, timeSpanOnlyState));
+        }
+    };
+    BufferTimeSubscriber.prototype.openContext = function () {
+        var context = new Context();
+        this.contexts.push(context);
+        return context;
+    };
+    BufferTimeSubscriber.prototype.closeContext = function (context) {
+        this.destination.next(context.buffer);
+        var contexts = this.contexts;
+        var spliceIndex = contexts ? contexts.indexOf(context) : -1;
+        if (spliceIndex >= 0) {
+            contexts.splice(contexts.indexOf(context), 1);
+        }
+    };
+    return BufferTimeSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_2__Subscriber__["a" /* Subscriber */]));
+function dispatchBufferTimeSpanOnly(state) {
+    var subscriber = state.subscriber;
+    var prevContext = state.context;
+    if (prevContext) {
+        subscriber.closeContext(prevContext);
+    }
+    if (!subscriber.closed) {
+        state.context = subscriber.openContext();
+        state.context.closeAction = this.schedule(state, state.bufferTimeSpan);
+    }
+}
+function dispatchBufferCreation(state) {
+    var bufferCreationInterval = state.bufferCreationInterval, bufferTimeSpan = state.bufferTimeSpan, subscriber = state.subscriber, scheduler = state.scheduler;
+    var context = subscriber.openContext();
+    var action = this;
+    if (!subscriber.closed) {
+        subscriber.add(context.closeAction = scheduler.schedule(dispatchBufferClose, bufferTimeSpan, { subscriber: subscriber, context: context }));
+        action.schedule(state, bufferCreationInterval);
+    }
+}
+function dispatchBufferClose(arg) {
+    var subscriber = arg.subscriber, context = arg.context;
+    subscriber.closeContext(context);
+}
+//# sourceMappingURL=bufferTime.js.map
+
+
+/***/ }),
+/* 842 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = bufferToggle;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscription__ = __webpack_require__(25);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__ = __webpack_require__(14);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__ = __webpack_require__(13);
+/** PURE_IMPORTS_START tslib,_Subscription,_util_subscribeToResult,_OuterSubscriber PURE_IMPORTS_END */
+
+
+
+
+function bufferToggle(openings, closingSelector) {
+    return function bufferToggleOperatorFunction(source) {
+        return source.lift(new BufferToggleOperator(openings, closingSelector));
+    };
+}
+var BufferToggleOperator = /*@__PURE__*/ (function () {
+    function BufferToggleOperator(openings, closingSelector) {
+        this.openings = openings;
+        this.closingSelector = closingSelector;
+    }
+    BufferToggleOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new BufferToggleSubscriber(subscriber, this.openings, this.closingSelector));
+    };
+    return BufferToggleOperator;
+}());
+var BufferToggleSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](BufferToggleSubscriber, _super);
+    function BufferToggleSubscriber(destination, openings, closingSelector) {
+        var _this = _super.call(this, destination) || this;
+        _this.openings = openings;
+        _this.closingSelector = closingSelector;
+        _this.contexts = [];
+        _this.add(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__["a" /* subscribeToResult */])(_this, openings));
+        return _this;
+    }
+    BufferToggleSubscriber.prototype._next = function (value) {
+        var contexts = this.contexts;
+        var len = contexts.length;
+        for (var i = 0; i < len; i++) {
+            contexts[i].buffer.push(value);
+        }
+    };
+    BufferToggleSubscriber.prototype._error = function (err) {
+        var contexts = this.contexts;
+        while (contexts.length > 0) {
+            var context_1 = contexts.shift();
+            context_1.subscription.unsubscribe();
+            context_1.buffer = null;
+            context_1.subscription = null;
+        }
+        this.contexts = null;
+        _super.prototype._error.call(this, err);
+    };
+    BufferToggleSubscriber.prototype._complete = function () {
+        var contexts = this.contexts;
+        while (contexts.length > 0) {
+            var context_2 = contexts.shift();
+            this.destination.next(context_2.buffer);
+            context_2.subscription.unsubscribe();
+            context_2.buffer = null;
+            context_2.subscription = null;
+        }
+        this.contexts = null;
+        _super.prototype._complete.call(this);
+    };
+    BufferToggleSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        outerValue ? this.closeBuffer(outerValue) : this.openBuffer(innerValue);
+    };
+    BufferToggleSubscriber.prototype.notifyComplete = function (innerSub) {
+        this.closeBuffer(innerSub.context);
+    };
+    BufferToggleSubscriber.prototype.openBuffer = function (value) {
+        try {
+            var closingSelector = this.closingSelector;
+            var closingNotifier = closingSelector.call(this, value);
+            if (closingNotifier) {
+                this.trySubscribe(closingNotifier);
+            }
+        }
+        catch (err) {
+            this._error(err);
+        }
+    };
+    BufferToggleSubscriber.prototype.closeBuffer = function (context) {
+        var contexts = this.contexts;
+        if (contexts && context) {
+            var buffer = context.buffer, subscription = context.subscription;
+            this.destination.next(buffer);
+            contexts.splice(contexts.indexOf(context), 1);
+            this.remove(subscription);
+            subscription.unsubscribe();
+        }
+    };
+    BufferToggleSubscriber.prototype.trySubscribe = function (closingNotifier) {
+        var contexts = this.contexts;
+        var buffer = [];
+        var subscription = new __WEBPACK_IMPORTED_MODULE_1__Subscription__["a" /* Subscription */]();
+        var context = { buffer: buffer, subscription: subscription };
+        contexts.push(context);
+        var innerSubscription = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__["a" /* subscribeToResult */])(this, closingNotifier, context);
+        if (!innerSubscription || innerSubscription.closed) {
+            this.closeBuffer(context);
+        }
+        else {
+            innerSubscription.context = context;
+            this.add(innerSubscription);
+            subscription.add(innerSubscription);
+        }
+    };
+    return BufferToggleSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__["a" /* OuterSubscriber */]));
+//# sourceMappingURL=bufferToggle.js.map
+
+
+/***/ }),
+/* 843 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = bufferWhen;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscription__ = __webpack_require__(25);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(56);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(47);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__ = __webpack_require__(13);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__ = __webpack_require__(14);
+/** PURE_IMPORTS_START tslib,_Subscription,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+
+
+
+
+
+
+function bufferWhen(closingSelector) {
+    return function (source) {
+        return source.lift(new BufferWhenOperator(closingSelector));
+    };
+}
+var BufferWhenOperator = /*@__PURE__*/ (function () {
+    function BufferWhenOperator(closingSelector) {
+        this.closingSelector = closingSelector;
+    }
+    BufferWhenOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new BufferWhenSubscriber(subscriber, this.closingSelector));
+    };
+    return BufferWhenOperator;
+}());
+var BufferWhenSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](BufferWhenSubscriber, _super);
+    function BufferWhenSubscriber(destination, closingSelector) {
+        var _this = _super.call(this, destination) || this;
+        _this.closingSelector = closingSelector;
+        _this.subscribing = false;
+        _this.openBuffer();
+        return _this;
+    }
+    BufferWhenSubscriber.prototype._next = function (value) {
+        this.buffer.push(value);
+    };
+    BufferWhenSubscriber.prototype._complete = function () {
+        var buffer = this.buffer;
+        if (buffer) {
+            this.destination.next(buffer);
+        }
+        _super.prototype._complete.call(this);
+    };
+    BufferWhenSubscriber.prototype._unsubscribe = function () {
+        this.buffer = null;
+        this.subscribing = false;
+    };
+    BufferWhenSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        this.openBuffer();
+    };
+    BufferWhenSubscriber.prototype.notifyComplete = function () {
+        if (this.subscribing) {
+            this.complete();
+        }
+        else {
+            this.openBuffer();
+        }
+    };
+    BufferWhenSubscriber.prototype.openBuffer = function () {
+        var closingSubscription = this.closingSubscription;
+        if (closingSubscription) {
+            this.remove(closingSubscription);
+            closingSubscription.unsubscribe();
+        }
+        var buffer = this.buffer;
+        if (this.buffer) {
+            this.destination.next(buffer);
+        }
+        this.buffer = [];
+        var closingNotifier = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_tryCatch__["a" /* tryCatch */])(this.closingSelector)();
+        if (closingNotifier === __WEBPACK_IMPORTED_MODULE_3__util_errorObject__["a" /* errorObject */]) {
+            this.error(__WEBPACK_IMPORTED_MODULE_3__util_errorObject__["a" /* errorObject */].e);
+        }
+        else {
+            closingSubscription = new __WEBPACK_IMPORTED_MODULE_1__Subscription__["a" /* Subscription */]();
+            this.closingSubscription = closingSubscription;
+            this.add(closingSubscription);
+            this.subscribing = true;
+            closingSubscription.add(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__["a" /* subscribeToResult */])(this, closingNotifier));
+            this.subscribing = false;
+        }
+    };
+    return BufferWhenSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__["a" /* OuterSubscriber */]));
+//# sourceMappingURL=bufferWhen.js.map
+
+
+/***/ }),
+/* 844 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = catchError;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(13);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__InnerSubscriber__ = __webpack_require__(84);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_subscribeToResult__ = __webpack_require__(14);
+/** PURE_IMPORTS_START tslib,_OuterSubscriber,_InnerSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+
+
+
+
+function catchError(selector) {
+    return function catchErrorOperatorFunction(source) {
+        var operator = new CatchOperator(selector);
+        var caught = source.lift(operator);
+        return (operator.caught = caught);
+    };
+}
+var CatchOperator = /*@__PURE__*/ (function () {
+    function CatchOperator(selector) {
+        this.selector = selector;
+    }
+    CatchOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new CatchSubscriber(subscriber, this.selector, this.caught));
+    };
+    return CatchOperator;
+}());
+var CatchSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](CatchSubscriber, _super);
+    function CatchSubscriber(destination, selector, caught) {
+        var _this = _super.call(this, destination) || this;
+        _this.selector = selector;
+        _this.caught = caught;
+        return _this;
+    }
+    CatchSubscriber.prototype.error = function (err) {
+        if (!this.isStopped) {
+            var result = void 0;
+            try {
+                result = this.selector(err, this.caught);
+            }
+            catch (err2) {
+                _super.prototype.error.call(this, err2);
+                return;
+            }
+            this._unsubscribeAndRecycle();
+            var innerSubscriber = new __WEBPACK_IMPORTED_MODULE_2__InnerSubscriber__["a" /* InnerSubscriber */](this, undefined, undefined);
+            this.add(innerSubscriber);
+            __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__util_subscribeToResult__["a" /* subscribeToResult */])(this, result, undefined, undefined, innerSubscriber);
+        }
+    };
+    return CatchSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__["a" /* OuterSubscriber */]));
+//# sourceMappingURL=catchError.js.map
+
+
+/***/ }),
+/* 845 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = combineAll;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__observable_combineLatest__ = __webpack_require__(309);
+/** PURE_IMPORTS_START _observable_combineLatest PURE_IMPORTS_END */
+
+function combineAll(project) {
+    return function (source) { return source.lift(new __WEBPACK_IMPORTED_MODULE_0__observable_combineLatest__["b" /* CombineLatestOperator */](project)); };
+}
+//# sourceMappingURL=combineAll.js.map
+
+
+/***/ }),
+/* 846 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = combineLatest;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_isArray__ = __webpack_require__(41);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__observable_combineLatest__ = __webpack_require__(309);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__observable_from__ = __webpack_require__(62);
+/** PURE_IMPORTS_START _util_isArray,_observable_combineLatest,_observable_from PURE_IMPORTS_END */
+
+
+
+var none = {};
+function combineLatest() {
+    var observables = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        observables[_i] = arguments[_i];
+    }
+    var project = null;
+    if (typeof observables[observables.length - 1] === 'function') {
+        project = observables.pop();
+    }
+    if (observables.length === 1 && __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__util_isArray__["a" /* isArray */])(observables[0])) {
+        observables = observables[0].slice();
+    }
+    return function (source) { return source.lift.call(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__observable_from__["a" /* from */])([source].concat(observables)), new __WEBPACK_IMPORTED_MODULE_1__observable_combineLatest__["b" /* CombineLatestOperator */](project)); };
+}
+//# sourceMappingURL=combineLatest.js.map
+
+
+/***/ }),
+/* 847 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = concat;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__observable_concat__ = __webpack_require__(186);
+/** PURE_IMPORTS_START _observable_concat PURE_IMPORTS_END */
+
+function concat() {
+    var observables = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        observables[_i] = arguments[_i];
+    }
+    return function (source) { return source.lift.call(__WEBPACK_IMPORTED_MODULE_0__observable_concat__["a" /* concat */].apply(void 0, [source].concat(observables))); };
+}
+//# sourceMappingURL=concat.js.map
+
+
+/***/ }),
+/* 848 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = concatMapTo;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__concatMap__ = __webpack_require__(430);
+/** PURE_IMPORTS_START _concatMap PURE_IMPORTS_END */
+
+function concatMapTo(innerObservable, resultSelector) {
+    return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__concatMap__["a" /* concatMap */])(function () { return innerObservable; }, resultSelector);
+}
+//# sourceMappingURL=concatMapTo.js.map
+
+
+/***/ }),
+/* 849 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = count;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
+/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+
+
+function count(predicate) {
+    return function (source) { return source.lift(new CountOperator(predicate, source)); };
+}
+var CountOperator = /*@__PURE__*/ (function () {
+    function CountOperator(predicate, source) {
+        this.predicate = predicate;
+        this.source = source;
+    }
+    CountOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new CountSubscriber(subscriber, this.predicate, this.source));
+    };
+    return CountOperator;
+}());
+var CountSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](CountSubscriber, _super);
+    function CountSubscriber(destination, predicate, source) {
+        var _this = _super.call(this, destination) || this;
+        _this.predicate = predicate;
+        _this.source = source;
+        _this.count = 0;
+        _this.index = 0;
+        return _this;
+    }
+    CountSubscriber.prototype._next = function (value) {
+        if (this.predicate) {
+            this._tryPredicate(value);
+        }
+        else {
+            this.count++;
+        }
+    };
+    CountSubscriber.prototype._tryPredicate = function (value) {
+        var result;
+        try {
+            result = this.predicate(value, this.index++, this.source);
+        }
+        catch (err) {
+            this.destination.error(err);
+            return;
+        }
+        if (result) {
+            this.count++;
+        }
+    };
+    CountSubscriber.prototype._complete = function () {
+        this.destination.next(this.count);
+        this.destination.complete();
+    };
+    return CountSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
+//# sourceMappingURL=count.js.map
+
+
+/***/ }),
+/* 850 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = debounce;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(13);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__ = __webpack_require__(14);
+/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+
+
+
+function debounce(durationSelector) {
+    return function (source) { return source.lift(new DebounceOperator(durationSelector)); };
+}
+var DebounceOperator = /*@__PURE__*/ (function () {
+    function DebounceOperator(durationSelector) {
+        this.durationSelector = durationSelector;
+    }
+    DebounceOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new DebounceSubscriber(subscriber, this.durationSelector));
+    };
+    return DebounceOperator;
+}());
+var DebounceSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](DebounceSubscriber, _super);
+    function DebounceSubscriber(destination, durationSelector) {
+        var _this = _super.call(this, destination) || this;
+        _this.durationSelector = durationSelector;
+        _this.hasValue = false;
+        _this.durationSubscription = null;
+        return _this;
+    }
+    DebounceSubscriber.prototype._next = function (value) {
+        try {
+            var result = this.durationSelector.call(this, value);
+            if (result) {
+                this._tryNext(value, result);
+            }
+        }
+        catch (err) {
+            this.destination.error(err);
+        }
+    };
+    DebounceSubscriber.prototype._complete = function () {
+        this.emitValue();
+        this.destination.complete();
+    };
+    DebounceSubscriber.prototype._tryNext = function (value, duration) {
+        var subscription = this.durationSubscription;
+        this.value = value;
+        this.hasValue = true;
+        if (subscription) {
+            subscription.unsubscribe();
+            this.remove(subscription);
+        }
+        subscription = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__["a" /* subscribeToResult */])(this, duration);
+        if (subscription && !subscription.closed) {
+            this.add(this.durationSubscription = subscription);
+        }
+    };
+    DebounceSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        this.emitValue();
+    };
+    DebounceSubscriber.prototype.notifyComplete = function () {
+        this.emitValue();
+    };
+    DebounceSubscriber.prototype.emitValue = function () {
+        if (this.hasValue) {
+            var value = this.value;
+            var subscription = this.durationSubscription;
+            if (subscription) {
+                this.durationSubscription = null;
+                subscription.unsubscribe();
+                this.remove(subscription);
+            }
+            this.value = null;
+            this.hasValue = false;
+            _super.prototype._next.call(this, value);
+        }
+    };
+    return DebounceSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__["a" /* OuterSubscriber */]));
+//# sourceMappingURL=debounce.js.map
+
+
+/***/ }),
+/* 851 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = debounceTime;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__scheduler_async__ = __webpack_require__(40);
+/** PURE_IMPORTS_START tslib,_Subscriber,_scheduler_async PURE_IMPORTS_END */
+
+
+
+function debounceTime(dueTime, scheduler) {
+    if (scheduler === void 0) {
+        scheduler = __WEBPACK_IMPORTED_MODULE_2__scheduler_async__["a" /* async */];
+    }
+    return function (source) { return source.lift(new DebounceTimeOperator(dueTime, scheduler)); };
+}
+var DebounceTimeOperator = /*@__PURE__*/ (function () {
+    function DebounceTimeOperator(dueTime, scheduler) {
+        this.dueTime = dueTime;
+        this.scheduler = scheduler;
+    }
+    DebounceTimeOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new DebounceTimeSubscriber(subscriber, this.dueTime, this.scheduler));
+    };
+    return DebounceTimeOperator;
+}());
+var DebounceTimeSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](DebounceTimeSubscriber, _super);
+    function DebounceTimeSubscriber(destination, dueTime, scheduler) {
+        var _this = _super.call(this, destination) || this;
+        _this.dueTime = dueTime;
+        _this.scheduler = scheduler;
+        _this.debouncedSubscription = null;
+        _this.lastValue = null;
+        _this.hasValue = false;
+        return _this;
+    }
+    DebounceTimeSubscriber.prototype._next = function (value) {
+        this.clearDebounce();
+        this.lastValue = value;
+        this.hasValue = true;
+        this.add(this.debouncedSubscription = this.scheduler.schedule(dispatchNext, this.dueTime, this));
+    };
+    DebounceTimeSubscriber.prototype._complete = function () {
+        this.debouncedNext();
+        this.destination.complete();
+    };
+    DebounceTimeSubscriber.prototype.debouncedNext = function () {
+        this.clearDebounce();
+        if (this.hasValue) {
+            var lastValue = this.lastValue;
+            this.lastValue = null;
+            this.hasValue = false;
+            this.destination.next(lastValue);
+        }
+    };
+    DebounceTimeSubscriber.prototype.clearDebounce = function () {
+        var debouncedSubscription = this.debouncedSubscription;
+        if (debouncedSubscription !== null) {
+            this.remove(debouncedSubscription);
+            debouncedSubscription.unsubscribe();
+            this.debouncedSubscription = null;
+        }
+    };
+    return DebounceTimeSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
+function dispatchNext(subscriber) {
+    subscriber.debouncedNext();
+}
+//# sourceMappingURL=debounceTime.js.map
+
+
+/***/ }),
+/* 852 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = delay;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__scheduler_async__ = __webpack_require__(40);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isDate__ = __webpack_require__(443);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__Subscriber__ = __webpack_require__(7);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__Notification__ = __webpack_require__(184);
+/** PURE_IMPORTS_START tslib,_scheduler_async,_util_isDate,_Subscriber,_Notification PURE_IMPORTS_END */
+
+
+
+
+
+function delay(delay, scheduler) {
+    if (scheduler === void 0) {
+        scheduler = __WEBPACK_IMPORTED_MODULE_1__scheduler_async__["a" /* async */];
+    }
+    var absoluteDelay = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_isDate__["a" /* isDate */])(delay);
+    var delayFor = absoluteDelay ? (+delay - scheduler.now()) : Math.abs(delay);
+    return function (source) { return source.lift(new DelayOperator(delayFor, scheduler)); };
+}
+var DelayOperator = /*@__PURE__*/ (function () {
+    function DelayOperator(delay, scheduler) {
+        this.delay = delay;
+        this.scheduler = scheduler;
+    }
+    DelayOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new DelaySubscriber(subscriber, this.delay, this.scheduler));
+    };
+    return DelayOperator;
+}());
+var DelaySubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](DelaySubscriber, _super);
+    function DelaySubscriber(destination, delay, scheduler) {
+        var _this = _super.call(this, destination) || this;
+        _this.delay = delay;
+        _this.scheduler = scheduler;
+        _this.queue = [];
+        _this.active = false;
+        _this.errored = false;
+        return _this;
+    }
+    DelaySubscriber.dispatch = function (state) {
+        var source = state.source;
+        var queue = source.queue;
+        var scheduler = state.scheduler;
+        var destination = state.destination;
+        while (queue.length > 0 && (queue[0].time - scheduler.now()) <= 0) {
+            queue.shift().notification.observe(destination);
+        }
+        if (queue.length > 0) {
+            var delay_1 = Math.max(0, queue[0].time - scheduler.now());
+            this.schedule(state, delay_1);
+        }
+        else {
+            this.unsubscribe();
+            source.active = false;
+        }
+    };
+    DelaySubscriber.prototype._schedule = function (scheduler) {
+        this.active = true;
+        var destination = this.destination;
+        destination.add(scheduler.schedule(DelaySubscriber.dispatch, this.delay, {
+            source: this, destination: this.destination, scheduler: scheduler
+        }));
+    };
+    DelaySubscriber.prototype.scheduleNotification = function (notification) {
+        if (this.errored === true) {
+            return;
+        }
+        var scheduler = this.scheduler;
+        var message = new DelayMessage(scheduler.now() + this.delay, notification);
+        this.queue.push(message);
+        if (this.active === false) {
+            this._schedule(scheduler);
+        }
+    };
+    DelaySubscriber.prototype._next = function (value) {
+        this.scheduleNotification(__WEBPACK_IMPORTED_MODULE_4__Notification__["a" /* Notification */].createNext(value));
+    };
+    DelaySubscriber.prototype._error = function (err) {
+        this.errored = true;
+        this.queue = [];
+        this.destination.error(err);
+        this.unsubscribe();
+    };
+    DelaySubscriber.prototype._complete = function () {
+        this.scheduleNotification(__WEBPACK_IMPORTED_MODULE_4__Notification__["a" /* Notification */].createComplete());
+        this.unsubscribe();
+    };
+    return DelaySubscriber;
+}(__WEBPACK_IMPORTED_MODULE_3__Subscriber__["a" /* Subscriber */]));
+var DelayMessage = /*@__PURE__*/ (function () {
+    function DelayMessage(time, notification) {
+        this.time = time;
+        this.notification = notification;
+    }
+    return DelayMessage;
+}());
+//# sourceMappingURL=delay.js.map
+
+
+/***/ }),
+/* 853 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = delayWhen;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Observable__ = __webpack_require__(12);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__ = __webpack_require__(13);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__ = __webpack_require__(14);
+/** PURE_IMPORTS_START tslib,_Subscriber,_Observable,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+
+
+
+
+
+function delayWhen(delayDurationSelector, subscriptionDelay) {
+    if (subscriptionDelay) {
+        return function (source) {
+            return new SubscriptionDelayObservable(source, subscriptionDelay)
+                .lift(new DelayWhenOperator(delayDurationSelector));
+        };
+    }
+    return function (source) { return source.lift(new DelayWhenOperator(delayDurationSelector)); };
+}
+var DelayWhenOperator = /*@__PURE__*/ (function () {
+    function DelayWhenOperator(delayDurationSelector) {
+        this.delayDurationSelector = delayDurationSelector;
+    }
+    DelayWhenOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new DelayWhenSubscriber(subscriber, this.delayDurationSelector));
+    };
+    return DelayWhenOperator;
+}());
+var DelayWhenSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](DelayWhenSubscriber, _super);
+    function DelayWhenSubscriber(destination, delayDurationSelector) {
+        var _this = _super.call(this, destination) || this;
+        _this.delayDurationSelector = delayDurationSelector;
+        _this.completed = false;
+        _this.delayNotifierSubscriptions = [];
+        _this.index = 0;
+        return _this;
+    }
+    DelayWhenSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        this.destination.next(outerValue);
+        this.removeSubscription(innerSub);
+        this.tryComplete();
+    };
+    DelayWhenSubscriber.prototype.notifyError = function (error, innerSub) {
+        this._error(error);
+    };
+    DelayWhenSubscriber.prototype.notifyComplete = function (innerSub) {
+        var value = this.removeSubscription(innerSub);
+        if (value) {
+            this.destination.next(value);
+        }
+        this.tryComplete();
+    };
+    DelayWhenSubscriber.prototype._next = function (value) {
+        var index = this.index++;
+        try {
+            var delayNotifier = this.delayDurationSelector(value, index);
+            if (delayNotifier) {
+                this.tryDelay(delayNotifier, value);
+            }
+        }
+        catch (err) {
+            this.destination.error(err);
+        }
+    };
+    DelayWhenSubscriber.prototype._complete = function () {
+        this.completed = true;
+        this.tryComplete();
+        this.unsubscribe();
+    };
+    DelayWhenSubscriber.prototype.removeSubscription = function (subscription) {
+        subscription.unsubscribe();
+        var subscriptionIdx = this.delayNotifierSubscriptions.indexOf(subscription);
+        if (subscriptionIdx !== -1) {
+            this.delayNotifierSubscriptions.splice(subscriptionIdx, 1);
+        }
+        return subscription.outerValue;
+    };
+    DelayWhenSubscriber.prototype.tryDelay = function (delayNotifier, value) {
+        var notifierSubscription = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__["a" /* subscribeToResult */])(this, delayNotifier, value);
+        if (notifierSubscription && !notifierSubscription.closed) {
+            var destination = this.destination;
+            destination.add(notifierSubscription);
+            this.delayNotifierSubscriptions.push(notifierSubscription);
+        }
+    };
+    DelayWhenSubscriber.prototype.tryComplete = function () {
+        if (this.completed && this.delayNotifierSubscriptions.length === 0) {
+            this.destination.complete();
+        }
+    };
+    return DelayWhenSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__["a" /* OuterSubscriber */]));
+var SubscriptionDelayObservable = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](SubscriptionDelayObservable, _super);
+    function SubscriptionDelayObservable(source, subscriptionDelay) {
+        var _this = _super.call(this) || this;
+        _this.source = source;
+        _this.subscriptionDelay = subscriptionDelay;
+        return _this;
+    }
+    SubscriptionDelayObservable.prototype._subscribe = function (subscriber) {
+        this.subscriptionDelay.subscribe(new SubscriptionDelaySubscriber(subscriber, this.source));
+    };
+    return SubscriptionDelayObservable;
+}(__WEBPACK_IMPORTED_MODULE_2__Observable__["a" /* Observable */]));
+var SubscriptionDelaySubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](SubscriptionDelaySubscriber, _super);
+    function SubscriptionDelaySubscriber(parent, source) {
+        var _this = _super.call(this) || this;
+        _this.parent = parent;
+        _this.source = source;
+        _this.sourceSubscribed = false;
+        return _this;
+    }
+    SubscriptionDelaySubscriber.prototype._next = function (unused) {
+        this.subscribeToSource();
+    };
+    SubscriptionDelaySubscriber.prototype._error = function (err) {
+        this.unsubscribe();
+        this.parent.error(err);
+    };
+    SubscriptionDelaySubscriber.prototype._complete = function () {
+        this.unsubscribe();
+        this.subscribeToSource();
+    };
+    SubscriptionDelaySubscriber.prototype.subscribeToSource = function () {
+        if (!this.sourceSubscribed) {
+            this.sourceSubscribed = true;
+            this.unsubscribe();
+            this.source.subscribe(this.parent);
+        }
+    };
+    return SubscriptionDelaySubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
+//# sourceMappingURL=delayWhen.js.map
+
+
+/***/ }),
+/* 854 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = dematerialize;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
+/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+
+
+function dematerialize() {
+    return function dematerializeOperatorFunction(source) {
+        return source.lift(new DeMaterializeOperator());
+    };
+}
+var DeMaterializeOperator = /*@__PURE__*/ (function () {
+    function DeMaterializeOperator() {
+    }
+    DeMaterializeOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new DeMaterializeSubscriber(subscriber));
+    };
+    return DeMaterializeOperator;
+}());
+var DeMaterializeSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](DeMaterializeSubscriber, _super);
+    function DeMaterializeSubscriber(destination) {
+        return _super.call(this, destination) || this;
+    }
+    DeMaterializeSubscriber.prototype._next = function (value) {
+        value.observe(this.destination);
+    };
+    return DeMaterializeSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
+//# sourceMappingURL=dematerialize.js.map
+
+
+/***/ }),
+/* 855 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = distinct;
+/* unused harmony export DistinctSubscriber */
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(13);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__ = __webpack_require__(14);
+/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+
+
+
+function distinct(keySelector, flushes) {
+    return function (source) { return source.lift(new DistinctOperator(keySelector, flushes)); };
+}
+var DistinctOperator = /*@__PURE__*/ (function () {
+    function DistinctOperator(keySelector, flushes) {
+        this.keySelector = keySelector;
+        this.flushes = flushes;
+    }
+    DistinctOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new DistinctSubscriber(subscriber, this.keySelector, this.flushes));
+    };
+    return DistinctOperator;
+}());
+var DistinctSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](DistinctSubscriber, _super);
+    function DistinctSubscriber(destination, keySelector, flushes) {
+        var _this = _super.call(this, destination) || this;
+        _this.keySelector = keySelector;
+        _this.values = new Set();
+        if (flushes) {
+            _this.add(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__["a" /* subscribeToResult */])(_this, flushes));
+        }
+        return _this;
+    }
+    DistinctSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        this.values.clear();
+    };
+    DistinctSubscriber.prototype.notifyError = function (error, innerSub) {
+        this._error(error);
+    };
+    DistinctSubscriber.prototype._next = function (value) {
+        if (this.keySelector) {
+            this._useKeySelector(value);
+        }
+        else {
+            this._finalizeNext(value, value);
+        }
+    };
+    DistinctSubscriber.prototype._useKeySelector = function (value) {
+        var key;
+        var destination = this.destination;
+        try {
+            key = this.keySelector(value);
+        }
+        catch (err) {
+            destination.error(err);
+            return;
+        }
+        this._finalizeNext(key, value);
+    };
+    DistinctSubscriber.prototype._finalizeNext = function (key, value) {
+        var values = this.values;
+        if (!values.has(key)) {
+            values.add(key);
+            this.destination.next(value);
+        }
+    };
+    return DistinctSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__["a" /* OuterSubscriber */]));
+
+//# sourceMappingURL=distinct.js.map
+
+
+/***/ }),
+/* 856 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = distinctUntilKeyChanged;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__distinctUntilChanged__ = __webpack_require__(431);
+/** PURE_IMPORTS_START _distinctUntilChanged PURE_IMPORTS_END */
+
+function distinctUntilKeyChanged(key, compare) {
+    return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__distinctUntilChanged__["a" /* distinctUntilChanged */])(function (x, y) { return compare ? compare(x[key], y[key]) : x[key] === y[key]; });
+}
+//# sourceMappingURL=distinctUntilKeyChanged.js.map
+
+
+/***/ }),
+/* 857 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = elementAt;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_ArgumentOutOfRangeError__ = __webpack_require__(152);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__filter__ = __webpack_require__(147);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__throwIfEmpty__ = __webpack_require__(188);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__defaultIfEmpty__ = __webpack_require__(146);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__take__ = __webpack_require__(319);
+/** PURE_IMPORTS_START _util_ArgumentOutOfRangeError,_filter,_throwIfEmpty,_defaultIfEmpty,_take PURE_IMPORTS_END */
+
+
+
+
+
+function elementAt(index, defaultValue) {
+    if (index < 0) {
+        throw new __WEBPACK_IMPORTED_MODULE_0__util_ArgumentOutOfRangeError__["a" /* ArgumentOutOfRangeError */]();
+    }
+    var hasDefaultValue = arguments.length >= 2;
+    return function (source) {
+        return source.pipe(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__filter__["a" /* filter */])(function (v, i) { return i === index; }), __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_4__take__["a" /* take */])(1), hasDefaultValue
+            ? __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__defaultIfEmpty__["a" /* defaultIfEmpty */])(defaultValue)
+            : __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__throwIfEmpty__["a" /* throwIfEmpty */])(function () { return new __WEBPACK_IMPORTED_MODULE_0__util_ArgumentOutOfRangeError__["a" /* ArgumentOutOfRangeError */](); }));
+    };
+}
+//# sourceMappingURL=elementAt.js.map
+
+
+/***/ }),
+/* 858 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = endWith;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__observable_fromArray__ = __webpack_require__(85);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__observable_scalar__ = __webpack_require__(312);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__observable_empty__ = __webpack_require__(39);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__observable_concat__ = __webpack_require__(186);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_isScheduler__ = __webpack_require__(48);
+/** PURE_IMPORTS_START _observable_fromArray,_observable_scalar,_observable_empty,_observable_concat,_util_isScheduler PURE_IMPORTS_END */
+
+
+
+
+
+function endWith() {
+    var array = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        array[_i] = arguments[_i];
+    }
+    return function (source) {
+        var scheduler = array[array.length - 1];
+        if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_4__util_isScheduler__["a" /* isScheduler */])(scheduler)) {
+            array.pop();
+        }
+        else {
+            scheduler = null;
+        }
+        var len = array.length;
+        if (len === 1 && !scheduler) {
+            return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__observable_concat__["a" /* concat */])(source, __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__observable_scalar__["a" /* scalar */])(array[0]));
+        }
+        else if (len > 0) {
+            return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__observable_concat__["a" /* concat */])(source, __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__observable_fromArray__["a" /* fromArray */])(array, scheduler));
+        }
+        else {
+            return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__observable_concat__["a" /* concat */])(source, __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__observable_empty__["a" /* empty */])(scheduler));
+        }
+    };
+}
+//# sourceMappingURL=endWith.js.map
+
+
+/***/ }),
+/* 859 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = every;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
+/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+
+
+function every(predicate, thisArg) {
+    return function (source) { return source.lift(new EveryOperator(predicate, thisArg, source)); };
+}
+var EveryOperator = /*@__PURE__*/ (function () {
+    function EveryOperator(predicate, thisArg, source) {
+        this.predicate = predicate;
+        this.thisArg = thisArg;
+        this.source = source;
+    }
+    EveryOperator.prototype.call = function (observer, source) {
+        return source.subscribe(new EverySubscriber(observer, this.predicate, this.thisArg, this.source));
+    };
+    return EveryOperator;
+}());
+var EverySubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](EverySubscriber, _super);
+    function EverySubscriber(destination, predicate, thisArg, source) {
+        var _this = _super.call(this, destination) || this;
+        _this.predicate = predicate;
+        _this.thisArg = thisArg;
+        _this.source = source;
+        _this.index = 0;
+        _this.thisArg = thisArg || _this;
+        return _this;
+    }
+    EverySubscriber.prototype.notifyComplete = function (everyValueMatch) {
+        this.destination.next(everyValueMatch);
+        this.destination.complete();
+    };
+    EverySubscriber.prototype._next = function (value) {
+        var result = false;
+        try {
+            result = this.predicate.call(this.thisArg, value, this.index++, this.source);
+        }
+        catch (err) {
+            this.destination.error(err);
+            return;
+        }
+        if (!result) {
+            this.notifyComplete(false);
+        }
+    };
+    EverySubscriber.prototype._complete = function () {
+        this.notifyComplete(true);
+    };
+    return EverySubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
+//# sourceMappingURL=every.js.map
+
+
+/***/ }),
+/* 860 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = exhaust;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(13);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__ = __webpack_require__(14);
+/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+
+
+
+function exhaust() {
+    return function (source) { return source.lift(new SwitchFirstOperator()); };
+}
+var SwitchFirstOperator = /*@__PURE__*/ (function () {
+    function SwitchFirstOperator() {
+    }
+    SwitchFirstOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new SwitchFirstSubscriber(subscriber));
+    };
+    return SwitchFirstOperator;
+}());
+var SwitchFirstSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](SwitchFirstSubscriber, _super);
+    function SwitchFirstSubscriber(destination) {
+        var _this = _super.call(this, destination) || this;
+        _this.hasCompleted = false;
+        _this.hasSubscription = false;
+        return _this;
+    }
+    SwitchFirstSubscriber.prototype._next = function (value) {
+        if (!this.hasSubscription) {
+            this.hasSubscription = true;
+            this.add(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__["a" /* subscribeToResult */])(this, value));
+        }
+    };
+    SwitchFirstSubscriber.prototype._complete = function () {
+        this.hasCompleted = true;
+        if (!this.hasSubscription) {
+            this.destination.complete();
+        }
+    };
+    SwitchFirstSubscriber.prototype.notifyComplete = function (innerSub) {
+        this.remove(innerSub);
+        this.hasSubscription = false;
+        if (this.hasCompleted) {
+            this.destination.complete();
+        }
+    };
+    return SwitchFirstSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__["a" /* OuterSubscriber */]));
+//# sourceMappingURL=exhaust.js.map
+
+
+/***/ }),
+/* 861 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = exhaustMap;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(13);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__InnerSubscriber__ = __webpack_require__(84);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_subscribeToResult__ = __webpack_require__(14);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__map__ = __webpack_require__(46);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__observable_from__ = __webpack_require__(62);
+/** PURE_IMPORTS_START tslib,_OuterSubscriber,_InnerSubscriber,_util_subscribeToResult,_map,_observable_from PURE_IMPORTS_END */
+
+
+
+
+
+
+function exhaustMap(project, resultSelector) {
+    if (resultSelector) {
+        return function (source) { return source.pipe(exhaustMap(function (a, i) { return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_5__observable_from__["a" /* from */])(project(a, i)).pipe(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_4__map__["a" /* map */])(function (b, ii) { return resultSelector(a, b, i, ii); })); })); };
+    }
+    return function (source) {
+        return source.lift(new ExhauseMapOperator(project));
+    };
+}
+var ExhauseMapOperator = /*@__PURE__*/ (function () {
+    function ExhauseMapOperator(project) {
+        this.project = project;
+    }
+    ExhauseMapOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new ExhaustMapSubscriber(subscriber, this.project));
+    };
+    return ExhauseMapOperator;
+}());
+var ExhaustMapSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](ExhaustMapSubscriber, _super);
+    function ExhaustMapSubscriber(destination, project) {
+        var _this = _super.call(this, destination) || this;
+        _this.project = project;
+        _this.hasSubscription = false;
+        _this.hasCompleted = false;
+        _this.index = 0;
+        return _this;
+    }
+    ExhaustMapSubscriber.prototype._next = function (value) {
+        if (!this.hasSubscription) {
+            this.tryNext(value);
+        }
+    };
+    ExhaustMapSubscriber.prototype.tryNext = function (value) {
+        var result;
+        var index = this.index++;
+        try {
+            result = this.project(value, index);
+        }
+        catch (err) {
+            this.destination.error(err);
+            return;
+        }
+        this.hasSubscription = true;
+        this._innerSub(result, value, index);
+    };
+    ExhaustMapSubscriber.prototype._innerSub = function (result, value, index) {
+        var innerSubscriber = new __WEBPACK_IMPORTED_MODULE_2__InnerSubscriber__["a" /* InnerSubscriber */](this, undefined, undefined);
+        var destination = this.destination;
+        destination.add(innerSubscriber);
+        __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__util_subscribeToResult__["a" /* subscribeToResult */])(this, result, value, index, innerSubscriber);
+    };
+    ExhaustMapSubscriber.prototype._complete = function () {
+        this.hasCompleted = true;
+        if (!this.hasSubscription) {
+            this.destination.complete();
+        }
+        this.unsubscribe();
+    };
+    ExhaustMapSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        this.destination.next(innerValue);
+    };
+    ExhaustMapSubscriber.prototype.notifyError = function (err) {
+        this.destination.error(err);
+    };
+    ExhaustMapSubscriber.prototype.notifyComplete = function (innerSub) {
+        var destination = this.destination;
+        destination.remove(innerSub);
+        this.hasSubscription = false;
+        if (this.hasCompleted) {
+            this.destination.complete();
+        }
+    };
+    return ExhaustMapSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__["a" /* OuterSubscriber */]));
+//# sourceMappingURL=exhaustMap.js.map
+
+
+/***/ }),
+/* 862 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = expand;
+/* unused harmony export ExpandOperator */
+/* unused harmony export ExpandSubscriber */
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_tryCatch__ = __webpack_require__(56);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_errorObject__ = __webpack_require__(47);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__ = __webpack_require__(13);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__ = __webpack_require__(14);
+/** PURE_IMPORTS_START tslib,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+
+
+
+
+
+function expand(project, concurrent, scheduler) {
+    if (concurrent === void 0) {
+        concurrent = Number.POSITIVE_INFINITY;
+    }
+    if (scheduler === void 0) {
+        scheduler = undefined;
+    }
+    concurrent = (concurrent || 0) < 1 ? Number.POSITIVE_INFINITY : concurrent;
+    return function (source) { return source.lift(new ExpandOperator(project, concurrent, scheduler)); };
+}
+var ExpandOperator = /*@__PURE__*/ (function () {
+    function ExpandOperator(project, concurrent, scheduler) {
+        this.project = project;
+        this.concurrent = concurrent;
+        this.scheduler = scheduler;
+    }
+    ExpandOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new ExpandSubscriber(subscriber, this.project, this.concurrent, this.scheduler));
+    };
+    return ExpandOperator;
+}());
+
+var ExpandSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](ExpandSubscriber, _super);
+    function ExpandSubscriber(destination, project, concurrent, scheduler) {
+        var _this = _super.call(this, destination) || this;
+        _this.project = project;
+        _this.concurrent = concurrent;
+        _this.scheduler = scheduler;
+        _this.index = 0;
+        _this.active = 0;
+        _this.hasCompleted = false;
+        if (concurrent < Number.POSITIVE_INFINITY) {
+            _this.buffer = [];
+        }
+        return _this;
+    }
+    ExpandSubscriber.dispatch = function (arg) {
+        var subscriber = arg.subscriber, result = arg.result, value = arg.value, index = arg.index;
+        subscriber.subscribeToProjection(result, value, index);
+    };
+    ExpandSubscriber.prototype._next = function (value) {
+        var destination = this.destination;
+        if (destination.closed) {
+            this._complete();
+            return;
+        }
+        var index = this.index++;
+        if (this.active < this.concurrent) {
+            destination.next(value);
+            var result = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__util_tryCatch__["a" /* tryCatch */])(this.project)(value, index);
+            if (result === __WEBPACK_IMPORTED_MODULE_2__util_errorObject__["a" /* errorObject */]) {
+                destination.error(__WEBPACK_IMPORTED_MODULE_2__util_errorObject__["a" /* errorObject */].e);
+            }
+            else if (!this.scheduler) {
+                this.subscribeToProjection(result, value, index);
+            }
+            else {
+                var state = { subscriber: this, result: result, value: value, index: index };
+                var destination_1 = this.destination;
+                destination_1.add(this.scheduler.schedule(ExpandSubscriber.dispatch, 0, state));
+            }
+        }
+        else {
+            this.buffer.push(value);
+        }
+    };
+    ExpandSubscriber.prototype.subscribeToProjection = function (result, value, index) {
+        this.active++;
+        var destination = this.destination;
+        destination.add(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__["a" /* subscribeToResult */])(this, result, value, index));
+    };
+    ExpandSubscriber.prototype._complete = function () {
+        this.hasCompleted = true;
+        if (this.hasCompleted && this.active === 0) {
+            this.destination.complete();
+        }
+        this.unsubscribe();
+    };
+    ExpandSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        this._next(innerValue);
+    };
+    ExpandSubscriber.prototype.notifyComplete = function (innerSub) {
+        var buffer = this.buffer;
+        var destination = this.destination;
+        destination.remove(innerSub);
+        this.active--;
+        if (buffer && buffer.length > 0) {
+            this._next(buffer.shift());
+        }
+        if (this.hasCompleted && this.active === 0) {
+            this.destination.complete();
+        }
+    };
+    return ExpandSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__["a" /* OuterSubscriber */]));
+
+//# sourceMappingURL=expand.js.map
+
+
+/***/ }),
+/* 863 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = finalize;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Subscription__ = __webpack_require__(25);
+/** PURE_IMPORTS_START tslib,_Subscriber,_Subscription PURE_IMPORTS_END */
+
+
+
+function finalize(callback) {
+    return function (source) { return source.lift(new FinallyOperator(callback)); };
+}
+var FinallyOperator = /*@__PURE__*/ (function () {
+    function FinallyOperator(callback) {
+        this.callback = callback;
+    }
+    FinallyOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new FinallySubscriber(subscriber, this.callback));
+    };
+    return FinallyOperator;
+}());
+var FinallySubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](FinallySubscriber, _super);
+    function FinallySubscriber(destination, callback) {
+        var _this = _super.call(this, destination) || this;
+        _this.add(new __WEBPACK_IMPORTED_MODULE_2__Subscription__["a" /* Subscription */](callback));
+        return _this;
+    }
+    return FinallySubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
+//# sourceMappingURL=finalize.js.map
+
+
+/***/ }),
+/* 864 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = findIndex;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__operators_find__ = __webpack_require__(432);
+/** PURE_IMPORTS_START _operators_find PURE_IMPORTS_END */
+
+function findIndex(predicate, thisArg) {
+    return function (source) { return source.lift(new __WEBPACK_IMPORTED_MODULE_0__operators_find__["b" /* FindValueOperator */](predicate, source, true, thisArg)); };
+}
+//# sourceMappingURL=findIndex.js.map
+
+
+/***/ }),
+/* 865 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = first;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_EmptyError__ = __webpack_require__(153);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__filter__ = __webpack_require__(147);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__take__ = __webpack_require__(319);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__defaultIfEmpty__ = __webpack_require__(146);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__throwIfEmpty__ = __webpack_require__(188);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_identity__ = __webpack_require__(118);
+/** PURE_IMPORTS_START _util_EmptyError,_filter,_take,_defaultIfEmpty,_throwIfEmpty,_util_identity PURE_IMPORTS_END */
+
+
+
+
+
+
+function first(predicate, defaultValue) {
+    var hasDefaultValue = arguments.length >= 2;
+    return function (source) { return source.pipe(predicate ? __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__filter__["a" /* filter */])(function (v, i) { return predicate(v, i, source); }) : __WEBPACK_IMPORTED_MODULE_5__util_identity__["a" /* identity */], __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__take__["a" /* take */])(1), hasDefaultValue ? __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__defaultIfEmpty__["a" /* defaultIfEmpty */])(defaultValue) : __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_4__throwIfEmpty__["a" /* throwIfEmpty */])(function () { return new __WEBPACK_IMPORTED_MODULE_0__util_EmptyError__["a" /* EmptyError */](); })); };
+}
+//# sourceMappingURL=first.js.map
+
+
+/***/ }),
+/* 866 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = ignoreElements;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
+/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+
+
+function ignoreElements() {
+    return function ignoreElementsOperatorFunction(source) {
+        return source.lift(new IgnoreElementsOperator());
+    };
+}
+var IgnoreElementsOperator = /*@__PURE__*/ (function () {
+    function IgnoreElementsOperator() {
+    }
+    IgnoreElementsOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new IgnoreElementsSubscriber(subscriber));
+    };
+    return IgnoreElementsOperator;
+}());
+var IgnoreElementsSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](IgnoreElementsSubscriber, _super);
+    function IgnoreElementsSubscriber() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    IgnoreElementsSubscriber.prototype._next = function (unused) {
+    };
+    return IgnoreElementsSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
+//# sourceMappingURL=ignoreElements.js.map
+
+
+/***/ }),
+/* 867 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = isEmpty;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
+/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+
+
+function isEmpty() {
+    return function (source) { return source.lift(new IsEmptyOperator()); };
+}
+var IsEmptyOperator = /*@__PURE__*/ (function () {
+    function IsEmptyOperator() {
+    }
+    IsEmptyOperator.prototype.call = function (observer, source) {
+        return source.subscribe(new IsEmptySubscriber(observer));
+    };
+    return IsEmptyOperator;
+}());
+var IsEmptySubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](IsEmptySubscriber, _super);
+    function IsEmptySubscriber(destination) {
+        return _super.call(this, destination) || this;
+    }
+    IsEmptySubscriber.prototype.notifyComplete = function (isEmpty) {
+        var destination = this.destination;
+        destination.next(isEmpty);
+        destination.complete();
+    };
+    IsEmptySubscriber.prototype._next = function (value) {
+        this.notifyComplete(false);
+    };
+    IsEmptySubscriber.prototype._complete = function () {
+        this.notifyComplete(true);
+    };
+    return IsEmptySubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
+//# sourceMappingURL=isEmpty.js.map
+
+
+/***/ }),
+/* 868 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = last;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_EmptyError__ = __webpack_require__(153);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__filter__ = __webpack_require__(147);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__takeLast__ = __webpack_require__(320);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__throwIfEmpty__ = __webpack_require__(188);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__defaultIfEmpty__ = __webpack_require__(146);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_identity__ = __webpack_require__(118);
+/** PURE_IMPORTS_START _util_EmptyError,_filter,_takeLast,_throwIfEmpty,_defaultIfEmpty,_util_identity PURE_IMPORTS_END */
+
+
+
+
+
+
+function last(predicate, defaultValue) {
+    var hasDefaultValue = arguments.length >= 2;
+    return function (source) { return source.pipe(predicate ? __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__filter__["a" /* filter */])(function (v, i) { return predicate(v, i, source); }) : __WEBPACK_IMPORTED_MODULE_5__util_identity__["a" /* identity */], __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__takeLast__["a" /* takeLast */])(1), hasDefaultValue ? __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_4__defaultIfEmpty__["a" /* defaultIfEmpty */])(defaultValue) : __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__throwIfEmpty__["a" /* throwIfEmpty */])(function () { return new __WEBPACK_IMPORTED_MODULE_0__util_EmptyError__["a" /* EmptyError */](); })); };
+}
+//# sourceMappingURL=last.js.map
+
+
+/***/ }),
+/* 869 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = mapTo;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
+/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+
+
+function mapTo(value) {
+    return function (source) { return source.lift(new MapToOperator(value)); };
+}
+var MapToOperator = /*@__PURE__*/ (function () {
+    function MapToOperator(value) {
+        this.value = value;
+    }
+    MapToOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new MapToSubscriber(subscriber, this.value));
+    };
+    return MapToOperator;
+}());
+var MapToSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](MapToSubscriber, _super);
+    function MapToSubscriber(destination, value) {
+        var _this = _super.call(this, destination) || this;
+        _this.value = value;
+        return _this;
+    }
+    MapToSubscriber.prototype._next = function (x) {
+        this.destination.next(this.value);
+    };
+    return MapToSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
+//# sourceMappingURL=mapTo.js.map
+
+
+/***/ }),
+/* 870 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = materialize;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Notification__ = __webpack_require__(184);
+/** PURE_IMPORTS_START tslib,_Subscriber,_Notification PURE_IMPORTS_END */
+
+
+
+function materialize() {
+    return function materializeOperatorFunction(source) {
+        return source.lift(new MaterializeOperator());
+    };
+}
+var MaterializeOperator = /*@__PURE__*/ (function () {
+    function MaterializeOperator() {
+    }
+    MaterializeOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new MaterializeSubscriber(subscriber));
+    };
+    return MaterializeOperator;
+}());
+var MaterializeSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](MaterializeSubscriber, _super);
+    function MaterializeSubscriber(destination) {
+        return _super.call(this, destination) || this;
+    }
+    MaterializeSubscriber.prototype._next = function (value) {
+        this.destination.next(__WEBPACK_IMPORTED_MODULE_2__Notification__["a" /* Notification */].createNext(value));
+    };
+    MaterializeSubscriber.prototype._error = function (err) {
+        var destination = this.destination;
+        destination.next(__WEBPACK_IMPORTED_MODULE_2__Notification__["a" /* Notification */].createError(err));
+        destination.complete();
+    };
+    MaterializeSubscriber.prototype._complete = function () {
+        var destination = this.destination;
+        destination.next(__WEBPACK_IMPORTED_MODULE_2__Notification__["a" /* Notification */].createComplete());
+        destination.complete();
+    };
+    return MaterializeSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
+//# sourceMappingURL=materialize.js.map
+
+
+/***/ }),
+/* 871 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = max;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__reduce__ = __webpack_require__(187);
+/** PURE_IMPORTS_START _reduce PURE_IMPORTS_END */
+
+function max(comparer) {
+    var max = (typeof comparer === 'function')
+        ? function (x, y) { return comparer(x, y) > 0 ? x : y; }
+        : function (x, y) { return x > y ? x : y; };
+    return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__reduce__["a" /* reduce */])(max);
+}
+//# sourceMappingURL=max.js.map
+
+
+/***/ }),
+/* 872 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = merge;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__observable_merge__ = __webpack_require__(424);
+/** PURE_IMPORTS_START _observable_merge PURE_IMPORTS_END */
+
+function merge() {
+    var observables = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        observables[_i] = arguments[_i];
+    }
+    return function (source) { return source.lift.call(__WEBPACK_IMPORTED_MODULE_0__observable_merge__["a" /* merge */].apply(void 0, [source].concat(observables))); };
+}
+//# sourceMappingURL=merge.js.map
+
+
+/***/ }),
+/* 873 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = mergeMapTo;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__mergeMap__ = __webpack_require__(148);
+/** PURE_IMPORTS_START _mergeMap PURE_IMPORTS_END */
+
+function mergeMapTo(innerObservable, resultSelector, concurrent) {
+    if (concurrent === void 0) {
+        concurrent = Number.POSITIVE_INFINITY;
+    }
+    if (typeof resultSelector === 'function') {
+        return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__mergeMap__["a" /* mergeMap */])(function () { return innerObservable; }, resultSelector, concurrent);
+    }
+    if (typeof resultSelector === 'number') {
+        concurrent = resultSelector;
+    }
+    return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__mergeMap__["a" /* mergeMap */])(function () { return innerObservable; }, concurrent);
+}
+//# sourceMappingURL=mergeMapTo.js.map
+
+
+/***/ }),
+/* 874 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = mergeScan;
+/* unused harmony export MergeScanOperator */
+/* unused harmony export MergeScanSubscriber */
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_tryCatch__ = __webpack_require__(56);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_errorObject__ = __webpack_require__(47);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_subscribeToResult__ = __webpack_require__(14);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__ = __webpack_require__(13);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__InnerSubscriber__ = __webpack_require__(84);
+/** PURE_IMPORTS_START tslib,_util_tryCatch,_util_errorObject,_util_subscribeToResult,_OuterSubscriber,_InnerSubscriber PURE_IMPORTS_END */
+
+
+
+
+
+
+function mergeScan(accumulator, seed, concurrent) {
+    if (concurrent === void 0) {
+        concurrent = Number.POSITIVE_INFINITY;
+    }
+    return function (source) { return source.lift(new MergeScanOperator(accumulator, seed, concurrent)); };
+}
+var MergeScanOperator = /*@__PURE__*/ (function () {
+    function MergeScanOperator(accumulator, seed, concurrent) {
+        this.accumulator = accumulator;
+        this.seed = seed;
+        this.concurrent = concurrent;
+    }
+    MergeScanOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new MergeScanSubscriber(subscriber, this.accumulator, this.seed, this.concurrent));
+    };
+    return MergeScanOperator;
+}());
+
+var MergeScanSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](MergeScanSubscriber, _super);
+    function MergeScanSubscriber(destination, accumulator, acc, concurrent) {
+        var _this = _super.call(this, destination) || this;
+        _this.accumulator = accumulator;
+        _this.acc = acc;
+        _this.concurrent = concurrent;
+        _this.hasValue = false;
+        _this.hasCompleted = false;
+        _this.buffer = [];
+        _this.active = 0;
+        _this.index = 0;
+        return _this;
+    }
+    MergeScanSubscriber.prototype._next = function (value) {
+        if (this.active < this.concurrent) {
+            var index = this.index++;
+            var ish = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__util_tryCatch__["a" /* tryCatch */])(this.accumulator)(this.acc, value);
+            var destination = this.destination;
+            if (ish === __WEBPACK_IMPORTED_MODULE_2__util_errorObject__["a" /* errorObject */]) {
+                destination.error(__WEBPACK_IMPORTED_MODULE_2__util_errorObject__["a" /* errorObject */].e);
+            }
+            else {
+                this.active++;
+                this._innerSub(ish, value, index);
+            }
+        }
+        else {
+            this.buffer.push(value);
+        }
+    };
+    MergeScanSubscriber.prototype._innerSub = function (ish, value, index) {
+        var innerSubscriber = new __WEBPACK_IMPORTED_MODULE_5__InnerSubscriber__["a" /* InnerSubscriber */](this, undefined, undefined);
+        var destination = this.destination;
+        destination.add(innerSubscriber);
+        __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__util_subscribeToResult__["a" /* subscribeToResult */])(this, ish, value, index, innerSubscriber);
+    };
+    MergeScanSubscriber.prototype._complete = function () {
+        this.hasCompleted = true;
+        if (this.active === 0 && this.buffer.length === 0) {
+            if (this.hasValue === false) {
+                this.destination.next(this.acc);
+            }
+            this.destination.complete();
+        }
+        this.unsubscribe();
+    };
+    MergeScanSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        var destination = this.destination;
+        this.acc = innerValue;
+        this.hasValue = true;
+        destination.next(innerValue);
+    };
+    MergeScanSubscriber.prototype.notifyComplete = function (innerSub) {
+        var buffer = this.buffer;
+        var destination = this.destination;
+        destination.remove(innerSub);
+        this.active--;
+        if (buffer.length > 0) {
+            this._next(buffer.shift());
+        }
+        else if (this.active === 0 && this.hasCompleted) {
+            if (this.hasValue === false) {
+                this.destination.next(this.acc);
+            }
+            this.destination.complete();
+        }
+    };
+    return MergeScanSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__["a" /* OuterSubscriber */]));
+
+//# sourceMappingURL=mergeScan.js.map
+
+
+/***/ }),
+/* 875 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = min;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__reduce__ = __webpack_require__(187);
+/** PURE_IMPORTS_START _reduce PURE_IMPORTS_END */
+
+function min(comparer) {
+    var min = (typeof comparer === 'function')
+        ? function (x, y) { return comparer(x, y) < 0 ? x : y; }
+        : function (x, y) { return x < y ? x : y; };
+    return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__reduce__["a" /* reduce */])(min);
+}
+//# sourceMappingURL=min.js.map
+
+
+/***/ }),
+/* 876 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = onErrorResumeNext;
+/* unused harmony export onErrorResumeNextStatic */
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__observable_from__ = __webpack_require__(62);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isArray__ = __webpack_require__(41);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__ = __webpack_require__(13);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__InnerSubscriber__ = __webpack_require__(84);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__ = __webpack_require__(14);
+/** PURE_IMPORTS_START tslib,_observable_from,_util_isArray,_OuterSubscriber,_InnerSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+
+
+
+
+
+
+function onErrorResumeNext() {
+    var nextSources = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        nextSources[_i] = arguments[_i];
+    }
+    if (nextSources.length === 1 && __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_isArray__["a" /* isArray */])(nextSources[0])) {
+        nextSources = nextSources[0];
+    }
+    return function (source) { return source.lift(new OnErrorResumeNextOperator(nextSources)); };
+}
+function onErrorResumeNextStatic() {
+    var nextSources = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        nextSources[_i] = arguments[_i];
+    }
+    var source = null;
+    if (nextSources.length === 1 && __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_isArray__["a" /* isArray */])(nextSources[0])) {
+        nextSources = nextSources[0];
+    }
+    source = nextSources.shift();
+    return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__observable_from__["a" /* from */])(source, null).lift(new OnErrorResumeNextOperator(nextSources));
+}
+var OnErrorResumeNextOperator = /*@__PURE__*/ (function () {
+    function OnErrorResumeNextOperator(nextSources) {
+        this.nextSources = nextSources;
+    }
+    OnErrorResumeNextOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new OnErrorResumeNextSubscriber(subscriber, this.nextSources));
+    };
+    return OnErrorResumeNextOperator;
+}());
+var OnErrorResumeNextSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](OnErrorResumeNextSubscriber, _super);
+    function OnErrorResumeNextSubscriber(destination, nextSources) {
+        var _this = _super.call(this, destination) || this;
+        _this.destination = destination;
+        _this.nextSources = nextSources;
+        return _this;
+    }
+    OnErrorResumeNextSubscriber.prototype.notifyError = function (error, innerSub) {
+        this.subscribeToNextSource();
+    };
+    OnErrorResumeNextSubscriber.prototype.notifyComplete = function (innerSub) {
+        this.subscribeToNextSource();
+    };
+    OnErrorResumeNextSubscriber.prototype._error = function (err) {
+        this.subscribeToNextSource();
+        this.unsubscribe();
+    };
+    OnErrorResumeNextSubscriber.prototype._complete = function () {
+        this.subscribeToNextSource();
+        this.unsubscribe();
+    };
+    OnErrorResumeNextSubscriber.prototype.subscribeToNextSource = function () {
+        var next = this.nextSources.shift();
+        if (next) {
+            var innerSubscriber = new __WEBPACK_IMPORTED_MODULE_4__InnerSubscriber__["a" /* InnerSubscriber */](this, undefined, undefined);
+            var destination = this.destination;
+            destination.add(innerSubscriber);
+            __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__["a" /* subscribeToResult */])(this, next, undefined, undefined, innerSubscriber);
+        }
+        else {
+            this.destination.complete();
+        }
+    };
+    return OnErrorResumeNextSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__["a" /* OuterSubscriber */]));
+//# sourceMappingURL=onErrorResumeNext.js.map
+
+
+/***/ }),
+/* 877 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = pairwise;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
+/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+
+
+function pairwise() {
+    return function (source) { return source.lift(new PairwiseOperator()); };
+}
+var PairwiseOperator = /*@__PURE__*/ (function () {
+    function PairwiseOperator() {
+    }
+    PairwiseOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new PairwiseSubscriber(subscriber));
+    };
+    return PairwiseOperator;
+}());
+var PairwiseSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](PairwiseSubscriber, _super);
+    function PairwiseSubscriber(destination) {
+        var _this = _super.call(this, destination) || this;
+        _this.hasPrev = false;
+        return _this;
+    }
+    PairwiseSubscriber.prototype._next = function (value) {
+        if (this.hasPrev) {
+            this.destination.next([this.prev, value]);
+        }
+        else {
+            this.hasPrev = true;
+        }
+        this.prev = value;
+    };
+    return PairwiseSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
+//# sourceMappingURL=pairwise.js.map
+
+
+/***/ }),
+/* 878 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = partition;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_not__ = __webpack_require__(931);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__filter__ = __webpack_require__(147);
+/** PURE_IMPORTS_START _util_not,_filter PURE_IMPORTS_END */
+
+
+function partition(predicate, thisArg) {
+    return function (source) {
+        return [
+            __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__filter__["a" /* filter */])(predicate, thisArg)(source),
+            __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__filter__["a" /* filter */])(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__util_not__["a" /* not */])(predicate, thisArg))(source)
+        ];
+    };
+}
+//# sourceMappingURL=partition.js.map
+
+
+/***/ }),
+/* 879 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = pluck;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__map__ = __webpack_require__(46);
+/** PURE_IMPORTS_START _map PURE_IMPORTS_END */
+
+function pluck() {
+    var properties = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        properties[_i] = arguments[_i];
+    }
+    var length = properties.length;
+    if (length === 0) {
+        throw new Error('list of properties cannot be empty.');
+    }
+    return function (source) { return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__map__["a" /* map */])(plucker(properties, length))(source); };
+}
+function plucker(props, length) {
+    var mapper = function (x) {
+        var currentProp = x;
+        for (var i = 0; i < length; i++) {
+            var p = currentProp[props[i]];
+            if (typeof p !== 'undefined') {
+                currentProp = p;
+            }
+            else {
+                return undefined;
+            }
+        }
+        return currentProp;
+    };
+    return mapper;
+}
+//# sourceMappingURL=pluck.js.map
+
+
+/***/ }),
+/* 880 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = publish;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Subject__ = __webpack_require__(36);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__multicast__ = __webpack_require__(116);
+/** PURE_IMPORTS_START _Subject,_multicast PURE_IMPORTS_END */
+
+
+function publish(selector) {
+    return selector ?
+        __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__multicast__["a" /* multicast */])(function () { return new __WEBPACK_IMPORTED_MODULE_0__Subject__["a" /* Subject */](); }, selector) :
+        __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__multicast__["a" /* multicast */])(new __WEBPACK_IMPORTED_MODULE_0__Subject__["a" /* Subject */]());
+}
+//# sourceMappingURL=publish.js.map
+
+
+/***/ }),
+/* 881 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = publishBehavior;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__BehaviorSubject__ = __webpack_require__(419);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__multicast__ = __webpack_require__(116);
+/** PURE_IMPORTS_START _BehaviorSubject,_multicast PURE_IMPORTS_END */
+
+
+function publishBehavior(value) {
+    return function (source) { return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__multicast__["a" /* multicast */])(new __WEBPACK_IMPORTED_MODULE_0__BehaviorSubject__["a" /* BehaviorSubject */](value))(source); };
+}
+//# sourceMappingURL=publishBehavior.js.map
+
+
+/***/ }),
+/* 882 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = publishLast;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__AsyncSubject__ = __webpack_require__(183);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__multicast__ = __webpack_require__(116);
+/** PURE_IMPORTS_START _AsyncSubject,_multicast PURE_IMPORTS_END */
+
+
+function publishLast() {
+    return function (source) { return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__multicast__["a" /* multicast */])(new __WEBPACK_IMPORTED_MODULE_0__AsyncSubject__["a" /* AsyncSubject */]())(source); };
+}
+//# sourceMappingURL=publishLast.js.map
+
+
+/***/ }),
+/* 883 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = publishReplay;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__ReplaySubject__ = __webpack_require__(308);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__multicast__ = __webpack_require__(116);
+/** PURE_IMPORTS_START _ReplaySubject,_multicast PURE_IMPORTS_END */
+
+
+function publishReplay(bufferSize, windowTime, selectorOrScheduler, scheduler) {
+    if (selectorOrScheduler && typeof selectorOrScheduler !== 'function') {
+        scheduler = selectorOrScheduler;
+    }
+    var selector = typeof selectorOrScheduler === 'function' ? selectorOrScheduler : undefined;
+    var subject = new __WEBPACK_IMPORTED_MODULE_0__ReplaySubject__["a" /* ReplaySubject */](bufferSize, windowTime, scheduler);
+    return function (source) { return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__multicast__["a" /* multicast */])(function () { return subject; }, selector)(source); };
+}
+//# sourceMappingURL=publishReplay.js.map
+
+
+/***/ }),
+/* 884 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = race;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_isArray__ = __webpack_require__(41);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__observable_race__ = __webpack_require__(426);
+/** PURE_IMPORTS_START _util_isArray,_observable_race PURE_IMPORTS_END */
+
+
+function race() {
+    var observables = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        observables[_i] = arguments[_i];
+    }
+    return function raceOperatorFunction(source) {
+        if (observables.length === 1 && __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__util_isArray__["a" /* isArray */])(observables[0])) {
+            observables = observables[0];
+        }
+        return source.lift.call(__WEBPACK_IMPORTED_MODULE_1__observable_race__["a" /* race */].apply(void 0, [source].concat(observables)));
+    };
+}
+//# sourceMappingURL=race.js.map
+
+
+/***/ }),
+/* 885 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = repeat;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__observable_empty__ = __webpack_require__(39);
+/** PURE_IMPORTS_START tslib,_Subscriber,_observable_empty PURE_IMPORTS_END */
+
+
+
+function repeat(count) {
+    if (count === void 0) {
+        count = -1;
+    }
+    return function (source) {
+        if (count === 0) {
+            return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__observable_empty__["a" /* empty */])();
+        }
+        else if (count < 0) {
+            return source.lift(new RepeatOperator(-1, source));
+        }
+        else {
+            return source.lift(new RepeatOperator(count - 1, source));
+        }
+    };
+}
+var RepeatOperator = /*@__PURE__*/ (function () {
+    function RepeatOperator(count, source) {
+        this.count = count;
+        this.source = source;
+    }
+    RepeatOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new RepeatSubscriber(subscriber, this.count, this.source));
+    };
+    return RepeatOperator;
+}());
+var RepeatSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](RepeatSubscriber, _super);
+    function RepeatSubscriber(destination, count, source) {
+        var _this = _super.call(this, destination) || this;
+        _this.count = count;
+        _this.source = source;
+        return _this;
+    }
+    RepeatSubscriber.prototype.complete = function () {
+        if (!this.isStopped) {
+            var _a = this, source = _a.source, count = _a.count;
+            if (count === 0) {
+                return _super.prototype.complete.call(this);
+            }
+            else if (count > -1) {
+                this.count = count - 1;
+            }
+            source.subscribe(this._unsubscribeAndRecycle());
+        }
+    };
+    return RepeatSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
+//# sourceMappingURL=repeat.js.map
+
+
+/***/ }),
+/* 886 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = repeatWhen;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subject__ = __webpack_require__(36);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(56);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(47);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__ = __webpack_require__(13);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__ = __webpack_require__(14);
+/** PURE_IMPORTS_START tslib,_Subject,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+
+
+
+
+
+
+function repeatWhen(notifier) {
+    return function (source) { return source.lift(new RepeatWhenOperator(notifier)); };
+}
+var RepeatWhenOperator = /*@__PURE__*/ (function () {
+    function RepeatWhenOperator(notifier) {
+        this.notifier = notifier;
+    }
+    RepeatWhenOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new RepeatWhenSubscriber(subscriber, this.notifier, source));
+    };
+    return RepeatWhenOperator;
+}());
+var RepeatWhenSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](RepeatWhenSubscriber, _super);
+    function RepeatWhenSubscriber(destination, notifier, source) {
+        var _this = _super.call(this, destination) || this;
+        _this.notifier = notifier;
+        _this.source = source;
+        _this.sourceIsBeingSubscribedTo = true;
+        return _this;
+    }
+    RepeatWhenSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        this.sourceIsBeingSubscribedTo = true;
+        this.source.subscribe(this);
+    };
+    RepeatWhenSubscriber.prototype.notifyComplete = function (innerSub) {
+        if (this.sourceIsBeingSubscribedTo === false) {
+            return _super.prototype.complete.call(this);
+        }
+    };
+    RepeatWhenSubscriber.prototype.complete = function () {
+        this.sourceIsBeingSubscribedTo = false;
+        if (!this.isStopped) {
+            if (!this.retries) {
+                this.subscribeToRetries();
+            }
+            if (!this.retriesSubscription || this.retriesSubscription.closed) {
+                return _super.prototype.complete.call(this);
+            }
+            this._unsubscribeAndRecycle();
+            this.notifications.next();
+        }
+    };
+    RepeatWhenSubscriber.prototype._unsubscribe = function () {
+        var _a = this, notifications = _a.notifications, retriesSubscription = _a.retriesSubscription;
+        if (notifications) {
+            notifications.unsubscribe();
+            this.notifications = null;
+        }
+        if (retriesSubscription) {
+            retriesSubscription.unsubscribe();
+            this.retriesSubscription = null;
+        }
+        this.retries = null;
+    };
+    RepeatWhenSubscriber.prototype._unsubscribeAndRecycle = function () {
+        var _unsubscribe = this._unsubscribe;
+        this._unsubscribe = null;
+        _super.prototype._unsubscribeAndRecycle.call(this);
+        this._unsubscribe = _unsubscribe;
+        return this;
+    };
+    RepeatWhenSubscriber.prototype.subscribeToRetries = function () {
+        this.notifications = new __WEBPACK_IMPORTED_MODULE_1__Subject__["a" /* Subject */]();
+        var retries = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_tryCatch__["a" /* tryCatch */])(this.notifier)(this.notifications);
+        if (retries === __WEBPACK_IMPORTED_MODULE_3__util_errorObject__["a" /* errorObject */]) {
+            return _super.prototype.complete.call(this);
+        }
+        this.retries = retries;
+        this.retriesSubscription = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__["a" /* subscribeToResult */])(this, retries);
+    };
+    return RepeatWhenSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__["a" /* OuterSubscriber */]));
+//# sourceMappingURL=repeatWhen.js.map
+
+
+/***/ }),
+/* 887 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = retry;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
+/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+
+
+function retry(count) {
+    if (count === void 0) {
+        count = -1;
+    }
+    return function (source) { return source.lift(new RetryOperator(count, source)); };
+}
+var RetryOperator = /*@__PURE__*/ (function () {
+    function RetryOperator(count, source) {
+        this.count = count;
+        this.source = source;
+    }
+    RetryOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new RetrySubscriber(subscriber, this.count, this.source));
+    };
+    return RetryOperator;
+}());
+var RetrySubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](RetrySubscriber, _super);
+    function RetrySubscriber(destination, count, source) {
+        var _this = _super.call(this, destination) || this;
+        _this.count = count;
+        _this.source = source;
+        return _this;
+    }
+    RetrySubscriber.prototype.error = function (err) {
+        if (!this.isStopped) {
+            var _a = this, source = _a.source, count = _a.count;
+            if (count === 0) {
+                return _super.prototype.error.call(this, err);
+            }
+            else if (count > -1) {
+                this.count = count - 1;
+            }
+            source.subscribe(this._unsubscribeAndRecycle());
+        }
+    };
+    return RetrySubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
+//# sourceMappingURL=retry.js.map
+
+
+/***/ }),
+/* 888 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = retryWhen;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subject__ = __webpack_require__(36);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(56);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(47);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__ = __webpack_require__(13);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__ = __webpack_require__(14);
+/** PURE_IMPORTS_START tslib,_Subject,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+
+
+
+
+
+
+function retryWhen(notifier) {
+    return function (source) { return source.lift(new RetryWhenOperator(notifier, source)); };
+}
+var RetryWhenOperator = /*@__PURE__*/ (function () {
+    function RetryWhenOperator(notifier, source) {
+        this.notifier = notifier;
+        this.source = source;
+    }
+    RetryWhenOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new RetryWhenSubscriber(subscriber, this.notifier, this.source));
+    };
+    return RetryWhenOperator;
+}());
+var RetryWhenSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](RetryWhenSubscriber, _super);
+    function RetryWhenSubscriber(destination, notifier, source) {
+        var _this = _super.call(this, destination) || this;
+        _this.notifier = notifier;
+        _this.source = source;
+        return _this;
+    }
+    RetryWhenSubscriber.prototype.error = function (err) {
+        if (!this.isStopped) {
+            var errors = this.errors;
+            var retries = this.retries;
+            var retriesSubscription = this.retriesSubscription;
+            if (!retries) {
+                errors = new __WEBPACK_IMPORTED_MODULE_1__Subject__["a" /* Subject */]();
+                retries = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_tryCatch__["a" /* tryCatch */])(this.notifier)(errors);
+                if (retries === __WEBPACK_IMPORTED_MODULE_3__util_errorObject__["a" /* errorObject */]) {
+                    return _super.prototype.error.call(this, __WEBPACK_IMPORTED_MODULE_3__util_errorObject__["a" /* errorObject */].e);
+                }
+                retriesSubscription = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__["a" /* subscribeToResult */])(this, retries);
+            }
+            else {
+                this.errors = null;
+                this.retriesSubscription = null;
+            }
+            this._unsubscribeAndRecycle();
+            this.errors = errors;
+            this.retries = retries;
+            this.retriesSubscription = retriesSubscription;
+            errors.next(err);
+        }
+    };
+    RetryWhenSubscriber.prototype._unsubscribe = function () {
+        var _a = this, errors = _a.errors, retriesSubscription = _a.retriesSubscription;
+        if (errors) {
+            errors.unsubscribe();
+            this.errors = null;
+        }
+        if (retriesSubscription) {
+            retriesSubscription.unsubscribe();
+            this.retriesSubscription = null;
+        }
+        this.retries = null;
+    };
+    RetryWhenSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        var _unsubscribe = this._unsubscribe;
+        this._unsubscribe = null;
+        this._unsubscribeAndRecycle();
+        this._unsubscribe = _unsubscribe;
+        this.source.subscribe(this);
+    };
+    return RetryWhenSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__["a" /* OuterSubscriber */]));
+//# sourceMappingURL=retryWhen.js.map
+
+
+/***/ }),
+/* 889 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = sample;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(13);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__ = __webpack_require__(14);
+/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+
+
+
+function sample(notifier) {
+    return function (source) { return source.lift(new SampleOperator(notifier)); };
+}
+var SampleOperator = /*@__PURE__*/ (function () {
+    function SampleOperator(notifier) {
+        this.notifier = notifier;
+    }
+    SampleOperator.prototype.call = function (subscriber, source) {
+        var sampleSubscriber = new SampleSubscriber(subscriber);
+        var subscription = source.subscribe(sampleSubscriber);
+        subscription.add(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__["a" /* subscribeToResult */])(sampleSubscriber, this.notifier));
+        return subscription;
+    };
+    return SampleOperator;
+}());
+var SampleSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](SampleSubscriber, _super);
+    function SampleSubscriber() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.hasValue = false;
+        return _this;
+    }
+    SampleSubscriber.prototype._next = function (value) {
+        this.value = value;
+        this.hasValue = true;
+    };
+    SampleSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        this.emitValue();
+    };
+    SampleSubscriber.prototype.notifyComplete = function () {
+        this.emitValue();
+    };
+    SampleSubscriber.prototype.emitValue = function () {
+        if (this.hasValue) {
+            this.hasValue = false;
+            this.destination.next(this.value);
+        }
+    };
+    return SampleSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__["a" /* OuterSubscriber */]));
+//# sourceMappingURL=sample.js.map
+
+
+/***/ }),
+/* 890 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = sampleTime;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__scheduler_async__ = __webpack_require__(40);
+/** PURE_IMPORTS_START tslib,_Subscriber,_scheduler_async PURE_IMPORTS_END */
+
+
+
+function sampleTime(period, scheduler) {
+    if (scheduler === void 0) {
+        scheduler = __WEBPACK_IMPORTED_MODULE_2__scheduler_async__["a" /* async */];
+    }
+    return function (source) { return source.lift(new SampleTimeOperator(period, scheduler)); };
+}
+var SampleTimeOperator = /*@__PURE__*/ (function () {
+    function SampleTimeOperator(period, scheduler) {
+        this.period = period;
+        this.scheduler = scheduler;
+    }
+    SampleTimeOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new SampleTimeSubscriber(subscriber, this.period, this.scheduler));
+    };
+    return SampleTimeOperator;
+}());
+var SampleTimeSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](SampleTimeSubscriber, _super);
+    function SampleTimeSubscriber(destination, period, scheduler) {
+        var _this = _super.call(this, destination) || this;
+        _this.period = period;
+        _this.scheduler = scheduler;
+        _this.hasValue = false;
+        _this.add(scheduler.schedule(dispatchNotification, period, { subscriber: _this, period: period }));
+        return _this;
+    }
+    SampleTimeSubscriber.prototype._next = function (value) {
+        this.lastValue = value;
+        this.hasValue = true;
+    };
+    SampleTimeSubscriber.prototype.notifyNext = function () {
+        if (this.hasValue) {
+            this.hasValue = false;
+            this.destination.next(this.lastValue);
+        }
+    };
+    return SampleTimeSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
+function dispatchNotification(state) {
+    var subscriber = state.subscriber, period = state.period;
+    subscriber.notifyNext();
+    this.schedule(state, period);
+}
+//# sourceMappingURL=sampleTime.js.map
+
+
+/***/ }),
+/* 891 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = sequenceEqual;
+/* unused harmony export SequenceEqualOperator */
+/* unused harmony export SequenceEqualSubscriber */
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(56);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(47);
+/** PURE_IMPORTS_START tslib,_Subscriber,_util_tryCatch,_util_errorObject PURE_IMPORTS_END */
+
+
+
+
+function sequenceEqual(compareTo, comparor) {
+    return function (source) { return source.lift(new SequenceEqualOperator(compareTo, comparor)); };
+}
+var SequenceEqualOperator = /*@__PURE__*/ (function () {
+    function SequenceEqualOperator(compareTo, comparor) {
+        this.compareTo = compareTo;
+        this.comparor = comparor;
+    }
+    SequenceEqualOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new SequenceEqualSubscriber(subscriber, this.compareTo, this.comparor));
+    };
+    return SequenceEqualOperator;
+}());
+
+var SequenceEqualSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](SequenceEqualSubscriber, _super);
+    function SequenceEqualSubscriber(destination, compareTo, comparor) {
+        var _this = _super.call(this, destination) || this;
+        _this.compareTo = compareTo;
+        _this.comparor = comparor;
+        _this._a = [];
+        _this._b = [];
+        _this._oneComplete = false;
+        _this.destination.add(compareTo.subscribe(new SequenceEqualCompareToSubscriber(destination, _this)));
+        return _this;
+    }
+    SequenceEqualSubscriber.prototype._next = function (value) {
+        if (this._oneComplete && this._b.length === 0) {
+            this.emit(false);
+        }
+        else {
+            this._a.push(value);
+            this.checkValues();
+        }
+    };
+    SequenceEqualSubscriber.prototype._complete = function () {
+        if (this._oneComplete) {
+            this.emit(this._a.length === 0 && this._b.length === 0);
+        }
+        else {
+            this._oneComplete = true;
+        }
+        this.unsubscribe();
+    };
+    SequenceEqualSubscriber.prototype.checkValues = function () {
+        var _c = this, _a = _c._a, _b = _c._b, comparor = _c.comparor;
+        while (_a.length > 0 && _b.length > 0) {
+            var a = _a.shift();
+            var b = _b.shift();
+            var areEqual = false;
+            if (comparor) {
+                areEqual = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_tryCatch__["a" /* tryCatch */])(comparor)(a, b);
+                if (areEqual === __WEBPACK_IMPORTED_MODULE_3__util_errorObject__["a" /* errorObject */]) {
+                    this.destination.error(__WEBPACK_IMPORTED_MODULE_3__util_errorObject__["a" /* errorObject */].e);
+                }
+            }
+            else {
+                areEqual = a === b;
+            }
+            if (!areEqual) {
+                this.emit(false);
+            }
+        }
+    };
+    SequenceEqualSubscriber.prototype.emit = function (value) {
+        var destination = this.destination;
+        destination.next(value);
+        destination.complete();
+    };
+    SequenceEqualSubscriber.prototype.nextB = function (value) {
+        if (this._oneComplete && this._a.length === 0) {
+            this.emit(false);
+        }
+        else {
+            this._b.push(value);
+            this.checkValues();
+        }
+    };
+    SequenceEqualSubscriber.prototype.completeB = function () {
+        if (this._oneComplete) {
+            this.emit(this._a.length === 0 && this._b.length === 0);
+        }
+        else {
+            this._oneComplete = true;
+        }
+    };
+    return SequenceEqualSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
+
+var SequenceEqualCompareToSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](SequenceEqualCompareToSubscriber, _super);
+    function SequenceEqualCompareToSubscriber(destination, parent) {
+        var _this = _super.call(this, destination) || this;
+        _this.parent = parent;
+        return _this;
+    }
+    SequenceEqualCompareToSubscriber.prototype._next = function (value) {
+        this.parent.nextB(value);
+    };
+    SequenceEqualCompareToSubscriber.prototype._error = function (err) {
+        this.parent.error(err);
+        this.unsubscribe();
+    };
+    SequenceEqualCompareToSubscriber.prototype._complete = function () {
+        this.parent.completeB();
+        this.unsubscribe();
+    };
+    return SequenceEqualCompareToSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
+//# sourceMappingURL=sequenceEqual.js.map
+
+
+/***/ }),
+/* 892 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = share;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__multicast__ = __webpack_require__(116);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__refCount__ = __webpack_require__(316);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Subject__ = __webpack_require__(36);
+/** PURE_IMPORTS_START _multicast,_refCount,_Subject PURE_IMPORTS_END */
+
+
+
+function shareSubjectFactory() {
+    return new __WEBPACK_IMPORTED_MODULE_2__Subject__["a" /* Subject */]();
+}
+function share() {
+    return function (source) { return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__refCount__["a" /* refCount */])()(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__multicast__["a" /* multicast */])(shareSubjectFactory)(source)); };
+}
+//# sourceMappingURL=share.js.map
+
+
+/***/ }),
+/* 893 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = shareReplay;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__ReplaySubject__ = __webpack_require__(308);
+/** PURE_IMPORTS_START _ReplaySubject PURE_IMPORTS_END */
+
+function shareReplay(bufferSize, windowTime, scheduler) {
+    if (bufferSize === void 0) {
+        bufferSize = Number.POSITIVE_INFINITY;
+    }
+    if (windowTime === void 0) {
+        windowTime = Number.POSITIVE_INFINITY;
+    }
+    return function (source) { return source.lift(shareReplayOperator(bufferSize, windowTime, scheduler)); };
+}
+function shareReplayOperator(bufferSize, windowTime, scheduler) {
+    var subject;
+    var refCount = 0;
+    var subscription;
+    var hasError = false;
+    var isComplete = false;
+    return function shareReplayOperation(source) {
+        refCount++;
+        if (!subject || hasError) {
+            hasError = false;
+            subject = new __WEBPACK_IMPORTED_MODULE_0__ReplaySubject__["a" /* ReplaySubject */](bufferSize, windowTime, scheduler);
+            subscription = source.subscribe({
+                next: function (value) { subject.next(value); },
+                error: function (err) {
+                    hasError = true;
+                    subject.error(err);
+                },
+                complete: function () {
+                    isComplete = true;
+                    subject.complete();
+                },
+            });
+        }
+        var innerSub = subject.subscribe(this);
+        return function () {
+            refCount--;
+            innerSub.unsubscribe();
+            if (subscription && refCount === 0 && isComplete) {
+                subscription.unsubscribe();
+            }
+        };
+    };
+}
+//# sourceMappingURL=shareReplay.js.map
+
+
+/***/ }),
+/* 894 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = single;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_EmptyError__ = __webpack_require__(153);
+/** PURE_IMPORTS_START tslib,_Subscriber,_util_EmptyError PURE_IMPORTS_END */
+
+
+
+function single(predicate) {
+    return function (source) { return source.lift(new SingleOperator(predicate, source)); };
+}
+var SingleOperator = /*@__PURE__*/ (function () {
+    function SingleOperator(predicate, source) {
+        this.predicate = predicate;
+        this.source = source;
+    }
+    SingleOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new SingleSubscriber(subscriber, this.predicate, this.source));
+    };
+    return SingleOperator;
+}());
+var SingleSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](SingleSubscriber, _super);
+    function SingleSubscriber(destination, predicate, source) {
+        var _this = _super.call(this, destination) || this;
+        _this.predicate = predicate;
+        _this.source = source;
+        _this.seenValue = false;
+        _this.index = 0;
+        return _this;
+    }
+    SingleSubscriber.prototype.applySingleValue = function (value) {
+        if (this.seenValue) {
+            this.destination.error('Sequence contains more than one element');
+        }
+        else {
+            this.seenValue = true;
+            this.singleValue = value;
+        }
+    };
+    SingleSubscriber.prototype._next = function (value) {
+        var index = this.index++;
+        if (this.predicate) {
+            this.tryNext(value, index);
+        }
+        else {
+            this.applySingleValue(value);
+        }
+    };
+    SingleSubscriber.prototype.tryNext = function (value, index) {
+        try {
+            if (this.predicate(value, index, this.source)) {
+                this.applySingleValue(value);
+            }
+        }
+        catch (err) {
+            this.destination.error(err);
+        }
+    };
+    SingleSubscriber.prototype._complete = function () {
+        var destination = this.destination;
+        if (this.index > 0) {
+            destination.next(this.seenValue ? this.singleValue : undefined);
+            destination.complete();
+        }
+        else {
+            destination.error(new __WEBPACK_IMPORTED_MODULE_2__util_EmptyError__["a" /* EmptyError */]);
+        }
+    };
+    return SingleSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
+//# sourceMappingURL=single.js.map
+
+
+/***/ }),
+/* 895 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = skip;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
+/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+
+
+function skip(count) {
+    return function (source) { return source.lift(new SkipOperator(count)); };
+}
+var SkipOperator = /*@__PURE__*/ (function () {
+    function SkipOperator(total) {
+        this.total = total;
+    }
+    SkipOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new SkipSubscriber(subscriber, this.total));
+    };
+    return SkipOperator;
+}());
+var SkipSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](SkipSubscriber, _super);
+    function SkipSubscriber(destination, total) {
+        var _this = _super.call(this, destination) || this;
+        _this.total = total;
+        _this.count = 0;
+        return _this;
+    }
+    SkipSubscriber.prototype._next = function (x) {
+        if (++this.count > this.total) {
+            this.destination.next(x);
+        }
+    };
+    return SkipSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
+//# sourceMappingURL=skip.js.map
+
+
+/***/ }),
+/* 896 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = skipLast;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_ArgumentOutOfRangeError__ = __webpack_require__(152);
+/** PURE_IMPORTS_START tslib,_Subscriber,_util_ArgumentOutOfRangeError PURE_IMPORTS_END */
+
+
+
+function skipLast(count) {
+    return function (source) { return source.lift(new SkipLastOperator(count)); };
+}
+var SkipLastOperator = /*@__PURE__*/ (function () {
+    function SkipLastOperator(_skipCount) {
+        this._skipCount = _skipCount;
+        if (this._skipCount < 0) {
+            throw new __WEBPACK_IMPORTED_MODULE_2__util_ArgumentOutOfRangeError__["a" /* ArgumentOutOfRangeError */];
+        }
+    }
+    SkipLastOperator.prototype.call = function (subscriber, source) {
+        if (this._skipCount === 0) {
+            return source.subscribe(new __WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */](subscriber));
+        }
+        else {
+            return source.subscribe(new SkipLastSubscriber(subscriber, this._skipCount));
+        }
+    };
+    return SkipLastOperator;
+}());
+var SkipLastSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](SkipLastSubscriber, _super);
+    function SkipLastSubscriber(destination, _skipCount) {
+        var _this = _super.call(this, destination) || this;
+        _this._skipCount = _skipCount;
+        _this._count = 0;
+        _this._ring = new Array(_skipCount);
+        return _this;
+    }
+    SkipLastSubscriber.prototype._next = function (value) {
+        var skipCount = this._skipCount;
+        var count = this._count++;
+        if (count < skipCount) {
+            this._ring[count] = value;
+        }
+        else {
+            var currentIndex = count % skipCount;
+            var ring = this._ring;
+            var oldValue = ring[currentIndex];
+            ring[currentIndex] = value;
+            this.destination.next(oldValue);
+        }
+    };
+    return SkipLastSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
+//# sourceMappingURL=skipLast.js.map
+
+
+/***/ }),
+/* 897 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = skipUntil;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(13);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__InnerSubscriber__ = __webpack_require__(84);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_subscribeToResult__ = __webpack_require__(14);
+/** PURE_IMPORTS_START tslib,_OuterSubscriber,_InnerSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+
+
+
+
+function skipUntil(notifier) {
+    return function (source) { return source.lift(new SkipUntilOperator(notifier)); };
+}
+var SkipUntilOperator = /*@__PURE__*/ (function () {
+    function SkipUntilOperator(notifier) {
+        this.notifier = notifier;
+    }
+    SkipUntilOperator.prototype.call = function (destination, source) {
+        return source.subscribe(new SkipUntilSubscriber(destination, this.notifier));
+    };
+    return SkipUntilOperator;
+}());
+var SkipUntilSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](SkipUntilSubscriber, _super);
+    function SkipUntilSubscriber(destination, notifier) {
+        var _this = _super.call(this, destination) || this;
+        _this.hasValue = false;
+        var innerSubscriber = new __WEBPACK_IMPORTED_MODULE_2__InnerSubscriber__["a" /* InnerSubscriber */](_this, undefined, undefined);
+        _this.add(innerSubscriber);
+        _this.innerSubscription = innerSubscriber;
+        __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__util_subscribeToResult__["a" /* subscribeToResult */])(_this, notifier, undefined, undefined, innerSubscriber);
+        return _this;
+    }
+    SkipUntilSubscriber.prototype._next = function (value) {
+        if (this.hasValue) {
+            _super.prototype._next.call(this, value);
+        }
+    };
+    SkipUntilSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        this.hasValue = true;
+        if (this.innerSubscription) {
+            this.innerSubscription.unsubscribe();
+        }
+    };
+    SkipUntilSubscriber.prototype.notifyComplete = function () {
+    };
+    return SkipUntilSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__["a" /* OuterSubscriber */]));
+//# sourceMappingURL=skipUntil.js.map
+
+
+/***/ }),
+/* 898 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = skipWhile;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
+/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+
+
+function skipWhile(predicate) {
+    return function (source) { return source.lift(new SkipWhileOperator(predicate)); };
+}
+var SkipWhileOperator = /*@__PURE__*/ (function () {
+    function SkipWhileOperator(predicate) {
+        this.predicate = predicate;
+    }
+    SkipWhileOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new SkipWhileSubscriber(subscriber, this.predicate));
+    };
+    return SkipWhileOperator;
+}());
+var SkipWhileSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](SkipWhileSubscriber, _super);
+    function SkipWhileSubscriber(destination, predicate) {
+        var _this = _super.call(this, destination) || this;
+        _this.predicate = predicate;
+        _this.skipping = true;
+        _this.index = 0;
+        return _this;
+    }
+    SkipWhileSubscriber.prototype._next = function (value) {
+        var destination = this.destination;
+        if (this.skipping) {
+            this.tryCallPredicate(value);
+        }
+        if (!this.skipping) {
+            destination.next(value);
+        }
+    };
+    SkipWhileSubscriber.prototype.tryCallPredicate = function (value) {
+        try {
+            var result = this.predicate(value, this.index++);
+            this.skipping = Boolean(result);
+        }
+        catch (err) {
+            this.destination.error(err);
+        }
+    };
+    return SkipWhileSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
+//# sourceMappingURL=skipWhile.js.map
+
+
+/***/ }),
+/* 899 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = startWith;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__observable_fromArray__ = __webpack_require__(85);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__observable_scalar__ = __webpack_require__(312);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__observable_empty__ = __webpack_require__(39);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__observable_concat__ = __webpack_require__(186);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_isScheduler__ = __webpack_require__(48);
+/** PURE_IMPORTS_START _observable_fromArray,_observable_scalar,_observable_empty,_observable_concat,_util_isScheduler PURE_IMPORTS_END */
+
+
+
+
+
+function startWith() {
+    var array = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        array[_i] = arguments[_i];
+    }
+    return function (source) {
+        var scheduler = array[array.length - 1];
+        if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_4__util_isScheduler__["a" /* isScheduler */])(scheduler)) {
+            array.pop();
+        }
+        else {
+            scheduler = null;
+        }
+        var len = array.length;
+        if (len === 1 && !scheduler) {
+            return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__observable_concat__["a" /* concat */])(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__observable_scalar__["a" /* scalar */])(array[0]), source);
+        }
+        else if (len > 0) {
+            return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__observable_concat__["a" /* concat */])(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__observable_fromArray__["a" /* fromArray */])(array, scheduler), source);
+        }
+        else {
+            return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__observable_concat__["a" /* concat */])(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__observable_empty__["a" /* empty */])(scheduler), source);
+        }
+    };
+}
+//# sourceMappingURL=startWith.js.map
+
+
+/***/ }),
+/* 900 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = subscribeOn;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__observable_SubscribeOnObservable__ = __webpack_require__(822);
+/** PURE_IMPORTS_START _observable_SubscribeOnObservable PURE_IMPORTS_END */
+
+function subscribeOn(scheduler, delay) {
+    if (delay === void 0) {
+        delay = 0;
+    }
+    return function subscribeOnOperatorFunction(source) {
+        return source.lift(new SubscribeOnOperator(scheduler, delay));
+    };
+}
+var SubscribeOnOperator = /*@__PURE__*/ (function () {
+    function SubscribeOnOperator(scheduler, delay) {
+        this.scheduler = scheduler;
+        this.delay = delay;
+    }
+    SubscribeOnOperator.prototype.call = function (subscriber, source) {
+        return new __WEBPACK_IMPORTED_MODULE_0__observable_SubscribeOnObservable__["a" /* SubscribeOnObservable */](source, this.delay, this.scheduler).subscribe(subscriber);
+    };
+    return SubscribeOnOperator;
+}());
+//# sourceMappingURL=subscribeOn.js.map
+
+
+/***/ }),
+/* 901 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = switchAll;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__switchMap__ = __webpack_require__(318);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_identity__ = __webpack_require__(118);
+/** PURE_IMPORTS_START _switchMap,_util_identity PURE_IMPORTS_END */
+
+
+function switchAll() {
+    return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__switchMap__["a" /* switchMap */])(__WEBPACK_IMPORTED_MODULE_1__util_identity__["a" /* identity */]);
+}
+//# sourceMappingURL=switchAll.js.map
+
+
+/***/ }),
+/* 902 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = switchMapTo;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__switchMap__ = __webpack_require__(318);
+/** PURE_IMPORTS_START _switchMap PURE_IMPORTS_END */
+
+function switchMapTo(innerObservable, resultSelector) {
+    return resultSelector ? __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__switchMap__["a" /* switchMap */])(function () { return innerObservable; }, resultSelector) : __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__switchMap__["a" /* switchMap */])(function () { return innerObservable; });
+}
+//# sourceMappingURL=switchMapTo.js.map
+
+
+/***/ }),
+/* 903 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = takeUntil;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(13);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__ = __webpack_require__(14);
+/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+
+
+
+function takeUntil(notifier) {
+    return function (source) { return source.lift(new TakeUntilOperator(notifier)); };
+}
+var TakeUntilOperator = /*@__PURE__*/ (function () {
+    function TakeUntilOperator(notifier) {
+        this.notifier = notifier;
+    }
+    TakeUntilOperator.prototype.call = function (subscriber, source) {
+        var takeUntilSubscriber = new TakeUntilSubscriber(subscriber);
+        var notifierSubscription = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__["a" /* subscribeToResult */])(takeUntilSubscriber, this.notifier);
+        if (notifierSubscription && !takeUntilSubscriber.seenValue) {
+            takeUntilSubscriber.add(notifierSubscription);
+            return source.subscribe(takeUntilSubscriber);
+        }
+        return takeUntilSubscriber;
+    };
+    return TakeUntilOperator;
+}());
+var TakeUntilSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](TakeUntilSubscriber, _super);
+    function TakeUntilSubscriber(destination) {
+        var _this = _super.call(this, destination) || this;
+        _this.seenValue = false;
+        return _this;
+    }
+    TakeUntilSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        this.seenValue = true;
+        this.complete();
+    };
+    TakeUntilSubscriber.prototype.notifyComplete = function () {
+    };
+    return TakeUntilSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__["a" /* OuterSubscriber */]));
+//# sourceMappingURL=takeUntil.js.map
+
+
+/***/ }),
+/* 904 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = takeWhile;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
+/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+
+
+function takeWhile(predicate) {
+    return function (source) { return source.lift(new TakeWhileOperator(predicate)); };
+}
+var TakeWhileOperator = /*@__PURE__*/ (function () {
+    function TakeWhileOperator(predicate) {
+        this.predicate = predicate;
+    }
+    TakeWhileOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new TakeWhileSubscriber(subscriber, this.predicate));
+    };
+    return TakeWhileOperator;
+}());
+var TakeWhileSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](TakeWhileSubscriber, _super);
+    function TakeWhileSubscriber(destination, predicate) {
+        var _this = _super.call(this, destination) || this;
+        _this.predicate = predicate;
+        _this.index = 0;
+        return _this;
+    }
+    TakeWhileSubscriber.prototype._next = function (value) {
+        var destination = this.destination;
+        var result;
+        try {
+            result = this.predicate(value, this.index++);
+        }
+        catch (err) {
+            destination.error(err);
+            return;
+        }
+        this.nextOrComplete(value, result);
+    };
+    TakeWhileSubscriber.prototype.nextOrComplete = function (value, predicateResult) {
+        var destination = this.destination;
+        if (Boolean(predicateResult)) {
+            destination.next(value);
+        }
+        else {
+            destination.complete();
+        }
+    };
+    return TakeWhileSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
+//# sourceMappingURL=takeWhile.js.map
+
+
+/***/ }),
+/* 905 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = throttleTime;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__scheduler_async__ = __webpack_require__(40);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__throttle__ = __webpack_require__(436);
+/** PURE_IMPORTS_START tslib,_Subscriber,_scheduler_async,_throttle PURE_IMPORTS_END */
+
+
+
+
+function throttleTime(duration, scheduler, config) {
+    if (scheduler === void 0) {
+        scheduler = __WEBPACK_IMPORTED_MODULE_2__scheduler_async__["a" /* async */];
+    }
+    if (config === void 0) {
+        config = __WEBPACK_IMPORTED_MODULE_3__throttle__["b" /* defaultThrottleConfig */];
+    }
+    return function (source) { return source.lift(new ThrottleTimeOperator(duration, scheduler, config.leading, config.trailing)); };
+}
+var ThrottleTimeOperator = /*@__PURE__*/ (function () {
+    function ThrottleTimeOperator(duration, scheduler, leading, trailing) {
+        this.duration = duration;
+        this.scheduler = scheduler;
+        this.leading = leading;
+        this.trailing = trailing;
+    }
+    ThrottleTimeOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new ThrottleTimeSubscriber(subscriber, this.duration, this.scheduler, this.leading, this.trailing));
+    };
+    return ThrottleTimeOperator;
+}());
+var ThrottleTimeSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](ThrottleTimeSubscriber, _super);
+    function ThrottleTimeSubscriber(destination, duration, scheduler, leading, trailing) {
+        var _this = _super.call(this, destination) || this;
+        _this.duration = duration;
+        _this.scheduler = scheduler;
+        _this.leading = leading;
+        _this.trailing = trailing;
+        _this._hasTrailingValue = false;
+        _this._trailingValue = null;
+        return _this;
+    }
+    ThrottleTimeSubscriber.prototype._next = function (value) {
+        if (this.throttled) {
+            if (this.trailing) {
+                this._trailingValue = value;
+                this._hasTrailingValue = true;
+            }
+        }
+        else {
+            this.add(this.throttled = this.scheduler.schedule(dispatchNext, this.duration, { subscriber: this }));
+            if (this.leading) {
+                this.destination.next(value);
+            }
+        }
+    };
+    ThrottleTimeSubscriber.prototype._complete = function () {
+        if (this._hasTrailingValue) {
+            this.destination.next(this._trailingValue);
+            this.destination.complete();
+        }
+        else {
+            this.destination.complete();
+        }
+    };
+    ThrottleTimeSubscriber.prototype.clearThrottle = function () {
+        var throttled = this.throttled;
+        if (throttled) {
+            if (this.trailing && this._hasTrailingValue) {
+                this.destination.next(this._trailingValue);
+                this._trailingValue = null;
+                this._hasTrailingValue = false;
+            }
+            throttled.unsubscribe();
+            this.remove(throttled);
+            this.throttled = null;
+        }
+    };
+    return ThrottleTimeSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
+function dispatchNext(arg) {
+    var subscriber = arg.subscriber;
+    subscriber.clearThrottle();
+}
+//# sourceMappingURL=throttleTime.js.map
+
+
+/***/ }),
+/* 906 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = timeInterval;
+/* unused harmony export TimeInterval */
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__scheduler_async__ = __webpack_require__(40);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__scan__ = __webpack_require__(317);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__observable_defer__ = __webpack_require__(310);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__map__ = __webpack_require__(46);
+/** PURE_IMPORTS_START _scheduler_async,_scan,_observable_defer,_map PURE_IMPORTS_END */
+
+
+
+
+function timeInterval(scheduler) {
+    if (scheduler === void 0) {
+        scheduler = __WEBPACK_IMPORTED_MODULE_0__scheduler_async__["a" /* async */];
+    }
+    return function (source) {
+        return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__observable_defer__["a" /* defer */])(function () {
+            return source.pipe(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__scan__["a" /* scan */])(function (_a, value) {
+                var current = _a.current;
+                return ({ value: value, current: scheduler.now(), last: current });
+            }, { current: scheduler.now(), value: undefined, last: undefined }), __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__map__["a" /* map */])(function (_a) {
+                var current = _a.current, last = _a.last, value = _a.value;
+                return new TimeInterval(value, current - last);
+            }));
+        });
+    };
+}
+var TimeInterval = /*@__PURE__*/ (function () {
+    function TimeInterval(value, interval) {
+        this.value = value;
+        this.interval = interval;
+    }
+    return TimeInterval;
+}());
+
+//# sourceMappingURL=timeInterval.js.map
+
+
+/***/ }),
+/* 907 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = timeout;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__scheduler_async__ = __webpack_require__(40);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_TimeoutError__ = __webpack_require__(440);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__timeoutWith__ = __webpack_require__(437);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__observable_throwError__ = __webpack_require__(313);
+/** PURE_IMPORTS_START _scheduler_async,_util_TimeoutError,_timeoutWith,_observable_throwError PURE_IMPORTS_END */
+
+
+
+
+function timeout(due, scheduler) {
+    if (scheduler === void 0) {
+        scheduler = __WEBPACK_IMPORTED_MODULE_0__scheduler_async__["a" /* async */];
+    }
+    return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__timeoutWith__["a" /* timeoutWith */])(due, __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__observable_throwError__["a" /* throwError */])(new __WEBPACK_IMPORTED_MODULE_1__util_TimeoutError__["a" /* TimeoutError */]()), scheduler);
+}
+//# sourceMappingURL=timeout.js.map
+
+
+/***/ }),
+/* 908 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = timestamp;
+/* unused harmony export Timestamp */
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__scheduler_async__ = __webpack_require__(40);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__map__ = __webpack_require__(46);
+/** PURE_IMPORTS_START _scheduler_async,_map PURE_IMPORTS_END */
+
+
+function timestamp(scheduler) {
+    if (scheduler === void 0) {
+        scheduler = __WEBPACK_IMPORTED_MODULE_0__scheduler_async__["a" /* async */];
+    }
+    return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__map__["a" /* map */])(function (value) { return new Timestamp(value, scheduler.now()); });
+}
+var Timestamp = /*@__PURE__*/ (function () {
+    function Timestamp(value, timestamp) {
+        this.value = value;
+        this.timestamp = timestamp;
+    }
+    return Timestamp;
+}());
+
+//# sourceMappingURL=timestamp.js.map
+
+
+/***/ }),
+/* 909 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = toArray;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__reduce__ = __webpack_require__(187);
+/** PURE_IMPORTS_START _reduce PURE_IMPORTS_END */
+
+function toArrayReducer(arr, item, index) {
+    if (index === 0) {
+        return [item];
+    }
+    arr.push(item);
+    return arr;
+}
+function toArray() {
+    return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__reduce__["a" /* reduce */])(toArrayReducer, []);
+}
+//# sourceMappingURL=toArray.js.map
+
+
+/***/ }),
+/* 910 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = window;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subject__ = __webpack_require__(36);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__OuterSubscriber__ = __webpack_require__(13);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_subscribeToResult__ = __webpack_require__(14);
+/** PURE_IMPORTS_START tslib,_Subject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+
+
+
+
+function window(windowBoundaries) {
+    return function windowOperatorFunction(source) {
+        return source.lift(new WindowOperator(windowBoundaries));
+    };
+}
+var WindowOperator = /*@__PURE__*/ (function () {
+    function WindowOperator(windowBoundaries) {
+        this.windowBoundaries = windowBoundaries;
+    }
+    WindowOperator.prototype.call = function (subscriber, source) {
+        var windowSubscriber = new WindowSubscriber(subscriber);
+        var sourceSubscription = source.subscribe(windowSubscriber);
+        if (!sourceSubscription.closed) {
+            windowSubscriber.add(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__util_subscribeToResult__["a" /* subscribeToResult */])(windowSubscriber, this.windowBoundaries));
+        }
+        return sourceSubscription;
+    };
+    return WindowOperator;
+}());
+var WindowSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](WindowSubscriber, _super);
+    function WindowSubscriber(destination) {
+        var _this = _super.call(this, destination) || this;
+        _this.window = new __WEBPACK_IMPORTED_MODULE_1__Subject__["a" /* Subject */]();
+        destination.next(_this.window);
+        return _this;
+    }
+    WindowSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        this.openWindow();
+    };
+    WindowSubscriber.prototype.notifyError = function (error, innerSub) {
+        this._error(error);
+    };
+    WindowSubscriber.prototype.notifyComplete = function (innerSub) {
+        this._complete();
+    };
+    WindowSubscriber.prototype._next = function (value) {
+        this.window.next(value);
+    };
+    WindowSubscriber.prototype._error = function (err) {
+        this.window.error(err);
+        this.destination.error(err);
+    };
+    WindowSubscriber.prototype._complete = function () {
+        this.window.complete();
+        this.destination.complete();
+    };
+    WindowSubscriber.prototype._unsubscribe = function () {
+        this.window = null;
+    };
+    WindowSubscriber.prototype.openWindow = function () {
+        var prevWindow = this.window;
+        if (prevWindow) {
+            prevWindow.complete();
+        }
+        var destination = this.destination;
+        var newWindow = this.window = new __WEBPACK_IMPORTED_MODULE_1__Subject__["a" /* Subject */]();
+        destination.next(newWindow);
+    };
+    return WindowSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_2__OuterSubscriber__["a" /* OuterSubscriber */]));
+//# sourceMappingURL=window.js.map
+
+
+/***/ }),
+/* 911 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = windowCount;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Subject__ = __webpack_require__(36);
+/** PURE_IMPORTS_START tslib,_Subscriber,_Subject PURE_IMPORTS_END */
+
+
+
+function windowCount(windowSize, startWindowEvery) {
+    if (startWindowEvery === void 0) {
+        startWindowEvery = 0;
+    }
+    return function windowCountOperatorFunction(source) {
+        return source.lift(new WindowCountOperator(windowSize, startWindowEvery));
+    };
+}
+var WindowCountOperator = /*@__PURE__*/ (function () {
+    function WindowCountOperator(windowSize, startWindowEvery) {
+        this.windowSize = windowSize;
+        this.startWindowEvery = startWindowEvery;
+    }
+    WindowCountOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new WindowCountSubscriber(subscriber, this.windowSize, this.startWindowEvery));
+    };
+    return WindowCountOperator;
+}());
+var WindowCountSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](WindowCountSubscriber, _super);
+    function WindowCountSubscriber(destination, windowSize, startWindowEvery) {
+        var _this = _super.call(this, destination) || this;
+        _this.destination = destination;
+        _this.windowSize = windowSize;
+        _this.startWindowEvery = startWindowEvery;
+        _this.windows = [new __WEBPACK_IMPORTED_MODULE_2__Subject__["a" /* Subject */]()];
+        _this.count = 0;
+        destination.next(_this.windows[0]);
+        return _this;
+    }
+    WindowCountSubscriber.prototype._next = function (value) {
+        var startWindowEvery = (this.startWindowEvery > 0) ? this.startWindowEvery : this.windowSize;
+        var destination = this.destination;
+        var windowSize = this.windowSize;
+        var windows = this.windows;
+        var len = windows.length;
+        for (var i = 0; i < len && !this.closed; i++) {
+            windows[i].next(value);
+        }
+        var c = this.count - windowSize + 1;
+        if (c >= 0 && c % startWindowEvery === 0 && !this.closed) {
+            windows.shift().complete();
+        }
+        if (++this.count % startWindowEvery === 0 && !this.closed) {
+            var window_1 = new __WEBPACK_IMPORTED_MODULE_2__Subject__["a" /* Subject */]();
+            windows.push(window_1);
+            destination.next(window_1);
+        }
+    };
+    WindowCountSubscriber.prototype._error = function (err) {
+        var windows = this.windows;
+        if (windows) {
+            while (windows.length > 0 && !this.closed) {
+                windows.shift().error(err);
+            }
+        }
+        this.destination.error(err);
+    };
+    WindowCountSubscriber.prototype._complete = function () {
+        var windows = this.windows;
+        if (windows) {
+            while (windows.length > 0 && !this.closed) {
+                windows.shift().complete();
+            }
+        }
+        this.destination.complete();
+    };
+    WindowCountSubscriber.prototype._unsubscribe = function () {
+        this.count = 0;
+        this.windows = null;
+    };
+    return WindowCountSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
+//# sourceMappingURL=windowCount.js.map
+
+
+/***/ }),
+/* 912 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = windowTime;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subject__ = __webpack_require__(36);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__scheduler_async__ = __webpack_require__(40);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__Subscriber__ = __webpack_require__(7);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_isNumeric__ = __webpack_require__(190);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_isScheduler__ = __webpack_require__(48);
+/** PURE_IMPORTS_START tslib,_Subject,_scheduler_async,_Subscriber,_util_isNumeric,_util_isScheduler PURE_IMPORTS_END */
+
+
+
+
+
+
+function windowTime(windowTimeSpan) {
+    var scheduler = __WEBPACK_IMPORTED_MODULE_2__scheduler_async__["a" /* async */];
+    var windowCreationInterval = null;
+    var maxWindowSize = Number.POSITIVE_INFINITY;
+    if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_5__util_isScheduler__["a" /* isScheduler */])(arguments[3])) {
+        scheduler = arguments[3];
+    }
+    if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_5__util_isScheduler__["a" /* isScheduler */])(arguments[2])) {
+        scheduler = arguments[2];
+    }
+    else if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_4__util_isNumeric__["a" /* isNumeric */])(arguments[2])) {
+        maxWindowSize = arguments[2];
+    }
+    if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_5__util_isScheduler__["a" /* isScheduler */])(arguments[1])) {
+        scheduler = arguments[1];
+    }
+    else if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_4__util_isNumeric__["a" /* isNumeric */])(arguments[1])) {
+        windowCreationInterval = arguments[1];
+    }
+    return function windowTimeOperatorFunction(source) {
+        return source.lift(new WindowTimeOperator(windowTimeSpan, windowCreationInterval, maxWindowSize, scheduler));
+    };
+}
+var WindowTimeOperator = /*@__PURE__*/ (function () {
+    function WindowTimeOperator(windowTimeSpan, windowCreationInterval, maxWindowSize, scheduler) {
+        this.windowTimeSpan = windowTimeSpan;
+        this.windowCreationInterval = windowCreationInterval;
+        this.maxWindowSize = maxWindowSize;
+        this.scheduler = scheduler;
+    }
+    WindowTimeOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new WindowTimeSubscriber(subscriber, this.windowTimeSpan, this.windowCreationInterval, this.maxWindowSize, this.scheduler));
+    };
+    return WindowTimeOperator;
+}());
+var CountedSubject = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](CountedSubject, _super);
+    function CountedSubject() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this._numberOfNextedValues = 0;
+        return _this;
+    }
+    CountedSubject.prototype.next = function (value) {
+        this._numberOfNextedValues++;
+        _super.prototype.next.call(this, value);
+    };
+    Object.defineProperty(CountedSubject.prototype, "numberOfNextedValues", {
+        get: function () {
+            return this._numberOfNextedValues;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return CountedSubject;
+}(__WEBPACK_IMPORTED_MODULE_1__Subject__["a" /* Subject */]));
+var WindowTimeSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](WindowTimeSubscriber, _super);
+    function WindowTimeSubscriber(destination, windowTimeSpan, windowCreationInterval, maxWindowSize, scheduler) {
+        var _this = _super.call(this, destination) || this;
+        _this.destination = destination;
+        _this.windowTimeSpan = windowTimeSpan;
+        _this.windowCreationInterval = windowCreationInterval;
+        _this.maxWindowSize = maxWindowSize;
+        _this.scheduler = scheduler;
+        _this.windows = [];
+        var window = _this.openWindow();
+        if (windowCreationInterval !== null && windowCreationInterval >= 0) {
+            var closeState = { subscriber: _this, window: window, context: null };
+            var creationState = { windowTimeSpan: windowTimeSpan, windowCreationInterval: windowCreationInterval, subscriber: _this, scheduler: scheduler };
+            _this.add(scheduler.schedule(dispatchWindowClose, windowTimeSpan, closeState));
+            _this.add(scheduler.schedule(dispatchWindowCreation, windowCreationInterval, creationState));
+        }
+        else {
+            var timeSpanOnlyState = { subscriber: _this, window: window, windowTimeSpan: windowTimeSpan };
+            _this.add(scheduler.schedule(dispatchWindowTimeSpanOnly, windowTimeSpan, timeSpanOnlyState));
+        }
+        return _this;
+    }
+    WindowTimeSubscriber.prototype._next = function (value) {
+        var windows = this.windows;
+        var len = windows.length;
+        for (var i = 0; i < len; i++) {
+            var window_1 = windows[i];
+            if (!window_1.closed) {
+                window_1.next(value);
+                if (window_1.numberOfNextedValues >= this.maxWindowSize) {
+                    this.closeWindow(window_1);
+                }
+            }
+        }
+    };
+    WindowTimeSubscriber.prototype._error = function (err) {
+        var windows = this.windows;
+        while (windows.length > 0) {
+            windows.shift().error(err);
+        }
+        this.destination.error(err);
+    };
+    WindowTimeSubscriber.prototype._complete = function () {
+        var windows = this.windows;
+        while (windows.length > 0) {
+            var window_2 = windows.shift();
+            if (!window_2.closed) {
+                window_2.complete();
+            }
+        }
+        this.destination.complete();
+    };
+    WindowTimeSubscriber.prototype.openWindow = function () {
+        var window = new CountedSubject();
+        this.windows.push(window);
+        var destination = this.destination;
+        destination.next(window);
+        return window;
+    };
+    WindowTimeSubscriber.prototype.closeWindow = function (window) {
+        window.complete();
+        var windows = this.windows;
+        windows.splice(windows.indexOf(window), 1);
+    };
+    return WindowTimeSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_3__Subscriber__["a" /* Subscriber */]));
+function dispatchWindowTimeSpanOnly(state) {
+    var subscriber = state.subscriber, windowTimeSpan = state.windowTimeSpan, window = state.window;
+    if (window) {
+        subscriber.closeWindow(window);
+    }
+    state.window = subscriber.openWindow();
+    this.schedule(state, windowTimeSpan);
+}
+function dispatchWindowCreation(state) {
+    var windowTimeSpan = state.windowTimeSpan, subscriber = state.subscriber, scheduler = state.scheduler, windowCreationInterval = state.windowCreationInterval;
+    var window = subscriber.openWindow();
+    var action = this;
+    var context = { action: action, subscription: null };
+    var timeSpanState = { subscriber: subscriber, window: window, context: context };
+    context.subscription = scheduler.schedule(dispatchWindowClose, windowTimeSpan, timeSpanState);
+    action.add(context.subscription);
+    action.schedule(state, windowCreationInterval);
+}
+function dispatchWindowClose(state) {
+    var subscriber = state.subscriber, window = state.window, context = state.context;
+    if (context && context.action && context.subscription) {
+        context.action.remove(context.subscription);
+    }
+    subscriber.closeWindow(window);
+}
+//# sourceMappingURL=windowTime.js.map
+
+
+/***/ }),
+/* 913 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = windowToggle;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subject__ = __webpack_require__(36);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Subscription__ = __webpack_require__(25);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_tryCatch__ = __webpack_require__(56);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_errorObject__ = __webpack_require__(47);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__OuterSubscriber__ = __webpack_require__(13);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__util_subscribeToResult__ = __webpack_require__(14);
+/** PURE_IMPORTS_START tslib,_Subject,_Subscription,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+
+
+
+
+
+
+
+function windowToggle(openings, closingSelector) {
+    return function (source) { return source.lift(new WindowToggleOperator(openings, closingSelector)); };
+}
+var WindowToggleOperator = /*@__PURE__*/ (function () {
+    function WindowToggleOperator(openings, closingSelector) {
+        this.openings = openings;
+        this.closingSelector = closingSelector;
+    }
+    WindowToggleOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new WindowToggleSubscriber(subscriber, this.openings, this.closingSelector));
+    };
+    return WindowToggleOperator;
+}());
+var WindowToggleSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](WindowToggleSubscriber, _super);
+    function WindowToggleSubscriber(destination, openings, closingSelector) {
+        var _this = _super.call(this, destination) || this;
+        _this.openings = openings;
+        _this.closingSelector = closingSelector;
+        _this.contexts = [];
+        _this.add(_this.openSubscription = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_6__util_subscribeToResult__["a" /* subscribeToResult */])(_this, openings, openings));
+        return _this;
+    }
+    WindowToggleSubscriber.prototype._next = function (value) {
+        var contexts = this.contexts;
+        if (contexts) {
+            var len = contexts.length;
+            for (var i = 0; i < len; i++) {
+                contexts[i].window.next(value);
+            }
+        }
+    };
+    WindowToggleSubscriber.prototype._error = function (err) {
+        var contexts = this.contexts;
+        this.contexts = null;
+        if (contexts) {
+            var len = contexts.length;
+            var index = -1;
+            while (++index < len) {
+                var context_1 = contexts[index];
+                context_1.window.error(err);
+                context_1.subscription.unsubscribe();
+            }
+        }
+        _super.prototype._error.call(this, err);
+    };
+    WindowToggleSubscriber.prototype._complete = function () {
+        var contexts = this.contexts;
+        this.contexts = null;
+        if (contexts) {
+            var len = contexts.length;
+            var index = -1;
+            while (++index < len) {
+                var context_2 = contexts[index];
+                context_2.window.complete();
+                context_2.subscription.unsubscribe();
+            }
+        }
+        _super.prototype._complete.call(this);
+    };
+    WindowToggleSubscriber.prototype._unsubscribe = function () {
+        var contexts = this.contexts;
+        this.contexts = null;
+        if (contexts) {
+            var len = contexts.length;
+            var index = -1;
+            while (++index < len) {
+                var context_3 = contexts[index];
+                context_3.window.unsubscribe();
+                context_3.subscription.unsubscribe();
+            }
+        }
+    };
+    WindowToggleSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        if (outerValue === this.openings) {
+            var closingSelector = this.closingSelector;
+            var closingNotifier = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__util_tryCatch__["a" /* tryCatch */])(closingSelector)(innerValue);
+            if (closingNotifier === __WEBPACK_IMPORTED_MODULE_4__util_errorObject__["a" /* errorObject */]) {
+                return this.error(__WEBPACK_IMPORTED_MODULE_4__util_errorObject__["a" /* errorObject */].e);
+            }
+            else {
+                var window_1 = new __WEBPACK_IMPORTED_MODULE_1__Subject__["a" /* Subject */]();
+                var subscription = new __WEBPACK_IMPORTED_MODULE_2__Subscription__["a" /* Subscription */]();
+                var context_4 = { window: window_1, subscription: subscription };
+                this.contexts.push(context_4);
+                var innerSubscription = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_6__util_subscribeToResult__["a" /* subscribeToResult */])(this, closingNotifier, context_4);
+                if (innerSubscription.closed) {
+                    this.closeWindow(this.contexts.length - 1);
+                }
+                else {
+                    innerSubscription.context = context_4;
+                    subscription.add(innerSubscription);
+                }
+                this.destination.next(window_1);
+            }
+        }
+        else {
+            this.closeWindow(this.contexts.indexOf(outerValue));
+        }
+    };
+    WindowToggleSubscriber.prototype.notifyError = function (err) {
+        this.error(err);
+    };
+    WindowToggleSubscriber.prototype.notifyComplete = function (inner) {
+        if (inner !== this.openSubscription) {
+            this.closeWindow(this.contexts.indexOf(inner.context));
+        }
+    };
+    WindowToggleSubscriber.prototype.closeWindow = function (index) {
+        if (index === -1) {
+            return;
+        }
+        var contexts = this.contexts;
+        var context = contexts[index];
+        var window = context.window, subscription = context.subscription;
+        contexts.splice(index, 1);
+        window.complete();
+        subscription.unsubscribe();
+    };
+    return WindowToggleSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_5__OuterSubscriber__["a" /* OuterSubscriber */]));
+//# sourceMappingURL=windowToggle.js.map
+
+
+/***/ }),
+/* 914 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = windowWhen;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subject__ = __webpack_require__(36);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(56);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(47);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__ = __webpack_require__(13);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__ = __webpack_require__(14);
+/** PURE_IMPORTS_START tslib,_Subject,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+
+
+
+
+
+
+function windowWhen(closingSelector) {
+    return function windowWhenOperatorFunction(source) {
+        return source.lift(new WindowOperator(closingSelector));
+    };
+}
+var WindowOperator = /*@__PURE__*/ (function () {
+    function WindowOperator(closingSelector) {
+        this.closingSelector = closingSelector;
+    }
+    WindowOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new WindowSubscriber(subscriber, this.closingSelector));
+    };
+    return WindowOperator;
+}());
+var WindowSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](WindowSubscriber, _super);
+    function WindowSubscriber(destination, closingSelector) {
+        var _this = _super.call(this, destination) || this;
+        _this.destination = destination;
+        _this.closingSelector = closingSelector;
+        _this.openWindow();
+        return _this;
+    }
+    WindowSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        this.openWindow(innerSub);
+    };
+    WindowSubscriber.prototype.notifyError = function (error, innerSub) {
+        this._error(error);
+    };
+    WindowSubscriber.prototype.notifyComplete = function (innerSub) {
+        this.openWindow(innerSub);
+    };
+    WindowSubscriber.prototype._next = function (value) {
+        this.window.next(value);
+    };
+    WindowSubscriber.prototype._error = function (err) {
+        this.window.error(err);
+        this.destination.error(err);
+        this.unsubscribeClosingNotification();
+    };
+    WindowSubscriber.prototype._complete = function () {
+        this.window.complete();
+        this.destination.complete();
+        this.unsubscribeClosingNotification();
+    };
+    WindowSubscriber.prototype.unsubscribeClosingNotification = function () {
+        if (this.closingNotification) {
+            this.closingNotification.unsubscribe();
+        }
+    };
+    WindowSubscriber.prototype.openWindow = function (innerSub) {
+        if (innerSub === void 0) {
+            innerSub = null;
+        }
+        if (innerSub) {
+            this.remove(innerSub);
+            innerSub.unsubscribe();
+        }
+        var prevWindow = this.window;
+        if (prevWindow) {
+            prevWindow.complete();
+        }
+        var window = this.window = new __WEBPACK_IMPORTED_MODULE_1__Subject__["a" /* Subject */]();
+        this.destination.next(window);
+        var closingNotifier = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_tryCatch__["a" /* tryCatch */])(this.closingSelector)();
+        if (closingNotifier === __WEBPACK_IMPORTED_MODULE_3__util_errorObject__["a" /* errorObject */]) {
+            var err = __WEBPACK_IMPORTED_MODULE_3__util_errorObject__["a" /* errorObject */].e;
+            this.destination.error(err);
+            this.window.error(err);
+        }
+        else {
+            this.add(this.closingNotification = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__["a" /* subscribeToResult */])(this, closingNotifier));
+        }
+    };
+    return WindowSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__["a" /* OuterSubscriber */]));
+//# sourceMappingURL=windowWhen.js.map
+
+
+/***/ }),
+/* 915 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = withLatestFrom;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(13);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__ = __webpack_require__(14);
+/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+
+
+
+function withLatestFrom() {
+    var args = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        args[_i] = arguments[_i];
+    }
+    return function (source) {
+        var project;
+        if (typeof args[args.length - 1] === 'function') {
+            project = args.pop();
+        }
+        var observables = args;
+        return source.lift(new WithLatestFromOperator(observables, project));
+    };
+}
+var WithLatestFromOperator = /*@__PURE__*/ (function () {
+    function WithLatestFromOperator(observables, project) {
+        this.observables = observables;
+        this.project = project;
+    }
+    WithLatestFromOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new WithLatestFromSubscriber(subscriber, this.observables, this.project));
+    };
+    return WithLatestFromOperator;
+}());
+var WithLatestFromSubscriber = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](WithLatestFromSubscriber, _super);
+    function WithLatestFromSubscriber(destination, observables, project) {
+        var _this = _super.call(this, destination) || this;
+        _this.observables = observables;
+        _this.project = project;
+        _this.toRespond = [];
+        var len = observables.length;
+        _this.values = new Array(len);
+        for (var i = 0; i < len; i++) {
+            _this.toRespond.push(i);
+        }
+        for (var i = 0; i < len; i++) {
+            var observable = observables[i];
+            _this.add(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__["a" /* subscribeToResult */])(_this, observable, observable, i));
+        }
+        return _this;
+    }
+    WithLatestFromSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        this.values[outerIndex] = innerValue;
+        var toRespond = this.toRespond;
+        if (toRespond.length > 0) {
+            var found = toRespond.indexOf(outerIndex);
+            if (found !== -1) {
+                toRespond.splice(found, 1);
+            }
+        }
+    };
+    WithLatestFromSubscriber.prototype.notifyComplete = function () {
+    };
+    WithLatestFromSubscriber.prototype._next = function (value) {
+        if (this.toRespond.length === 0) {
+            var args = [value].concat(this.values);
+            if (this.project) {
+                this._tryProject(args);
+            }
+            else {
+                this.destination.next(args);
+            }
+        }
+    };
+    WithLatestFromSubscriber.prototype._tryProject = function (args) {
+        var result;
+        try {
+            result = this.project.apply(this, args);
+        }
+        catch (err) {
+            this.destination.error(err);
+            return;
+        }
+        this.destination.next(result);
+    };
+    return WithLatestFromSubscriber;
+}(__WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__["a" /* OuterSubscriber */]));
+//# sourceMappingURL=withLatestFrom.js.map
+
+
+/***/ }),
+/* 916 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = zip;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__observable_zip__ = __webpack_require__(314);
+/** PURE_IMPORTS_START _observable_zip PURE_IMPORTS_END */
+
+function zip() {
+    var observables = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        observables[_i] = arguments[_i];
+    }
+    return function zipOperatorFunction(source) {
+        return source.lift.call(__WEBPACK_IMPORTED_MODULE_0__observable_zip__["a" /* zip */].apply(void 0, [source].concat(observables)));
+    };
+}
+//# sourceMappingURL=zip.js.map
+
+
+/***/ }),
+/* 917 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = zipAll;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__observable_zip__ = __webpack_require__(314);
+/** PURE_IMPORTS_START _observable_zip PURE_IMPORTS_END */
+
+function zipAll(project) {
+    return function (source) { return source.lift(new __WEBPACK_IMPORTED_MODULE_0__observable_zip__["b" /* ZipOperator */](project)); };
+}
+//# sourceMappingURL=zipAll.js.map
+
+
+/***/ }),
+/* 918 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Action; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscription__ = __webpack_require__(25);
+/** PURE_IMPORTS_START tslib,_Subscription PURE_IMPORTS_END */
+
+
+var Action = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](Action, _super);
+    function Action(scheduler, work) {
+        return _super.call(this) || this;
+    }
+    Action.prototype.schedule = function (state, delay) {
+        if (delay === void 0) {
+            delay = 0;
+        }
+        return this;
+    };
+    return Action;
+}(__WEBPACK_IMPORTED_MODULE_1__Subscription__["a" /* Subscription */]));
+
+//# sourceMappingURL=Action.js.map
+
+
+/***/ }),
+/* 919 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AnimationFrameAction; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsyncAction__ = __webpack_require__(149);
+/** PURE_IMPORTS_START tslib,_AsyncAction PURE_IMPORTS_END */
+
+
+var AnimationFrameAction = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](AnimationFrameAction, _super);
+    function AnimationFrameAction(scheduler, work) {
+        var _this = _super.call(this, scheduler, work) || this;
+        _this.scheduler = scheduler;
+        _this.work = work;
+        return _this;
+    }
+    AnimationFrameAction.prototype.requestAsyncId = function (scheduler, id, delay) {
+        if (delay === void 0) {
+            delay = 0;
+        }
+        if (delay !== null && delay > 0) {
+            return _super.prototype.requestAsyncId.call(this, scheduler, id, delay);
+        }
+        scheduler.actions.push(this);
+        return scheduler.scheduled || (scheduler.scheduled = requestAnimationFrame(function () { return scheduler.flush(null); }));
+    };
+    AnimationFrameAction.prototype.recycleAsyncId = function (scheduler, id, delay) {
+        if (delay === void 0) {
+            delay = 0;
+        }
+        if ((delay !== null && delay > 0) || (delay === null && this.delay > 0)) {
+            return _super.prototype.recycleAsyncId.call(this, scheduler, id, delay);
+        }
+        if (scheduler.actions.length === 0) {
+            cancelAnimationFrame(id);
+            scheduler.scheduled = undefined;
+        }
+        return undefined;
+    };
+    return AnimationFrameAction;
+}(__WEBPACK_IMPORTED_MODULE_1__AsyncAction__["a" /* AsyncAction */]));
+
+//# sourceMappingURL=AnimationFrameAction.js.map
+
+
+/***/ }),
+/* 920 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AnimationFrameScheduler; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsyncScheduler__ = __webpack_require__(150);
+/** PURE_IMPORTS_START tslib,_AsyncScheduler PURE_IMPORTS_END */
+
+
+var AnimationFrameScheduler = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](AnimationFrameScheduler, _super);
+    function AnimationFrameScheduler() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    AnimationFrameScheduler.prototype.flush = function (action) {
+        this.active = true;
+        this.scheduled = undefined;
+        var actions = this.actions;
+        var error;
+        var index = -1;
+        var count = actions.length;
+        action = action || actions.shift();
+        do {
+            if (error = action.execute(action.state, action.delay)) {
+                break;
+            }
+        } while (++index < count && (action = actions.shift()));
+        this.active = false;
+        if (error) {
+            while (++index < count && (action = actions.shift())) {
+                action.unsubscribe();
+            }
+            throw error;
+        }
+    };
+    return AnimationFrameScheduler;
+}(__WEBPACK_IMPORTED_MODULE_1__AsyncScheduler__["a" /* AsyncScheduler */]));
+
+//# sourceMappingURL=AnimationFrameScheduler.js.map
+
+
+/***/ }),
+/* 921 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AsapAction; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_Immediate__ = __webpack_require__(927);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__AsyncAction__ = __webpack_require__(149);
+/** PURE_IMPORTS_START tslib,_util_Immediate,_AsyncAction PURE_IMPORTS_END */
+
+
+
+var AsapAction = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](AsapAction, _super);
+    function AsapAction(scheduler, work) {
+        var _this = _super.call(this, scheduler, work) || this;
+        _this.scheduler = scheduler;
+        _this.work = work;
+        return _this;
+    }
+    AsapAction.prototype.requestAsyncId = function (scheduler, id, delay) {
+        if (delay === void 0) {
+            delay = 0;
+        }
+        if (delay !== null && delay > 0) {
+            return _super.prototype.requestAsyncId.call(this, scheduler, id, delay);
+        }
+        scheduler.actions.push(this);
+        return scheduler.scheduled || (scheduler.scheduled = __WEBPACK_IMPORTED_MODULE_1__util_Immediate__["a" /* Immediate */].setImmediate(scheduler.flush.bind(scheduler, null)));
+    };
+    AsapAction.prototype.recycleAsyncId = function (scheduler, id, delay) {
+        if (delay === void 0) {
+            delay = 0;
+        }
+        if ((delay !== null && delay > 0) || (delay === null && this.delay > 0)) {
+            return _super.prototype.recycleAsyncId.call(this, scheduler, id, delay);
+        }
+        if (scheduler.actions.length === 0) {
+            __WEBPACK_IMPORTED_MODULE_1__util_Immediate__["a" /* Immediate */].clearImmediate(id);
+            scheduler.scheduled = undefined;
+        }
+        return undefined;
+    };
+    return AsapAction;
+}(__WEBPACK_IMPORTED_MODULE_2__AsyncAction__["a" /* AsyncAction */]));
+
+//# sourceMappingURL=AsapAction.js.map
+
+
+/***/ }),
+/* 922 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AsapScheduler; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsyncScheduler__ = __webpack_require__(150);
+/** PURE_IMPORTS_START tslib,_AsyncScheduler PURE_IMPORTS_END */
+
+
+var AsapScheduler = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](AsapScheduler, _super);
+    function AsapScheduler() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    AsapScheduler.prototype.flush = function (action) {
+        this.active = true;
+        this.scheduled = undefined;
+        var actions = this.actions;
+        var error;
+        var index = -1;
+        var count = actions.length;
+        action = action || actions.shift();
+        do {
+            if (error = action.execute(action.state, action.delay)) {
+                break;
+            }
+        } while (++index < count && (action = actions.shift()));
+        this.active = false;
+        if (error) {
+            while (++index < count && (action = actions.shift())) {
+                action.unsubscribe();
+            }
+            throw error;
+        }
+    };
+    return AsapScheduler;
+}(__WEBPACK_IMPORTED_MODULE_1__AsyncScheduler__["a" /* AsyncScheduler */]));
+
+//# sourceMappingURL=AsapScheduler.js.map
+
+
+/***/ }),
+/* 923 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return QueueAction; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsyncAction__ = __webpack_require__(149);
+/** PURE_IMPORTS_START tslib,_AsyncAction PURE_IMPORTS_END */
+
+
+var QueueAction = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](QueueAction, _super);
+    function QueueAction(scheduler, work) {
+        var _this = _super.call(this, scheduler, work) || this;
+        _this.scheduler = scheduler;
+        _this.work = work;
+        return _this;
+    }
+    QueueAction.prototype.schedule = function (state, delay) {
+        if (delay === void 0) {
+            delay = 0;
+        }
+        if (delay > 0) {
+            return _super.prototype.schedule.call(this, state, delay);
+        }
+        this.delay = delay;
+        this.state = state;
+        this.scheduler.flush(this);
+        return this;
+    };
+    QueueAction.prototype.execute = function (state, delay) {
+        return (delay > 0 || this.closed) ?
+            _super.prototype.execute.call(this, state, delay) :
+            this._execute(state, delay);
+    };
+    QueueAction.prototype.requestAsyncId = function (scheduler, id, delay) {
+        if (delay === void 0) {
+            delay = 0;
+        }
+        if ((delay !== null && delay > 0) || (delay === null && this.delay > 0)) {
+            return _super.prototype.requestAsyncId.call(this, scheduler, id, delay);
+        }
+        return scheduler.flush(this);
+    };
+    return QueueAction;
+}(__WEBPACK_IMPORTED_MODULE_1__AsyncAction__["a" /* AsyncAction */]));
+
+//# sourceMappingURL=QueueAction.js.map
+
+
+/***/ }),
+/* 924 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return QueueScheduler; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsyncScheduler__ = __webpack_require__(150);
+/** PURE_IMPORTS_START tslib,_AsyncScheduler PURE_IMPORTS_END */
+
+
+var QueueScheduler = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](QueueScheduler, _super);
+    function QueueScheduler() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    return QueueScheduler;
+}(__WEBPACK_IMPORTED_MODULE_1__AsyncScheduler__["a" /* AsyncScheduler */]));
+
+//# sourceMappingURL=QueueScheduler.js.map
+
+
+/***/ }),
+/* 925 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return VirtualTimeScheduler; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return VirtualAction; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsyncAction__ = __webpack_require__(149);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__AsyncScheduler__ = __webpack_require__(150);
+/** PURE_IMPORTS_START tslib,_AsyncAction,_AsyncScheduler PURE_IMPORTS_END */
+
+
+
+var VirtualTimeScheduler = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](VirtualTimeScheduler, _super);
+    function VirtualTimeScheduler(SchedulerAction, maxFrames) {
+        if (SchedulerAction === void 0) {
+            SchedulerAction = VirtualAction;
+        }
+        if (maxFrames === void 0) {
+            maxFrames = Number.POSITIVE_INFINITY;
+        }
+        var _this = _super.call(this, SchedulerAction, function () { return _this.frame; }) || this;
+        _this.maxFrames = maxFrames;
+        _this.frame = 0;
+        _this.index = -1;
+        return _this;
+    }
+    VirtualTimeScheduler.prototype.flush = function () {
+        var _a = this, actions = _a.actions, maxFrames = _a.maxFrames;
+        var error, action;
+        while ((action = actions.shift()) && (this.frame = action.delay) <= maxFrames) {
+            if (error = action.execute(action.state, action.delay)) {
+                break;
+            }
+        }
+        if (error) {
+            while (action = actions.shift()) {
+                action.unsubscribe();
+            }
+            throw error;
+        }
+    };
+    VirtualTimeScheduler.frameTimeFactor = 10;
+    return VirtualTimeScheduler;
+}(__WEBPACK_IMPORTED_MODULE_2__AsyncScheduler__["a" /* AsyncScheduler */]));
+
+var VirtualAction = /*@__PURE__*/ (function (_super) {
+    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](VirtualAction, _super);
+    function VirtualAction(scheduler, work, index) {
+        if (index === void 0) {
+            index = scheduler.index += 1;
+        }
+        var _this = _super.call(this, scheduler, work) || this;
+        _this.scheduler = scheduler;
+        _this.work = work;
+        _this.index = index;
+        _this.active = true;
+        _this.index = scheduler.index = index;
+        return _this;
+    }
+    VirtualAction.prototype.schedule = function (state, delay) {
+        if (delay === void 0) {
+            delay = 0;
+        }
+        if (!this.id) {
+            return _super.prototype.schedule.call(this, state, delay);
+        }
+        this.active = false;
+        var action = new VirtualAction(this.scheduler, this.work);
+        this.add(action);
+        return action.schedule(state, delay);
+    };
+    VirtualAction.prototype.requestAsyncId = function (scheduler, id, delay) {
+        if (delay === void 0) {
+            delay = 0;
+        }
+        this.delay = scheduler.frame + delay;
+        var actions = scheduler.actions;
+        actions.push(this);
+        actions.sort(VirtualAction.sortActions);
+        return true;
+    };
+    VirtualAction.prototype.recycleAsyncId = function (scheduler, id, delay) {
+        if (delay === void 0) {
+            delay = 0;
+        }
+        return undefined;
+    };
+    VirtualAction.prototype._execute = function (state, delay) {
+        if (this.active === true) {
+            return _super.prototype._execute.call(this, state, delay);
+        }
+    };
+    VirtualAction.sortActions = function (a, b) {
+        if (a.delay === b.delay) {
+            if (a.index === b.index) {
+                return 0;
+            }
+            else if (a.index > b.index) {
+                return 1;
+            }
+            else {
+                return -1;
+            }
+        }
+        else if (a.delay > b.delay) {
+            return 1;
+        }
+        else {
+            return -1;
+        }
+    };
+    return VirtualAction;
+}(__WEBPACK_IMPORTED_MODULE_1__AsyncAction__["a" /* AsyncAction */]));
+
+//# sourceMappingURL=VirtualTimeScheduler.js.map
+
+
+/***/ }),
+/* 926 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return animationFrame; });
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__AnimationFrameAction__ = __webpack_require__(919);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AnimationFrameScheduler__ = __webpack_require__(920);
+/** PURE_IMPORTS_START _AnimationFrameAction,_AnimationFrameScheduler PURE_IMPORTS_END */
+
+
+var animationFrame = /*@__PURE__*/ new __WEBPACK_IMPORTED_MODULE_1__AnimationFrameScheduler__["a" /* AnimationFrameScheduler */](__WEBPACK_IMPORTED_MODULE_0__AnimationFrameAction__["a" /* AnimationFrameAction */]);
+//# sourceMappingURL=animationFrame.js.map
+
+
+/***/ }),
+/* 927 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Immediate; });
+/** PURE_IMPORTS_START  PURE_IMPORTS_END */
+var nextHandle = 1;
+var tasksByHandle = {};
+function runIfPresent(handle) {
+    var cb = tasksByHandle[handle];
+    if (cb) {
+        cb();
+    }
+}
+var Immediate = {
+    setImmediate: function (cb) {
+        var handle = nextHandle++;
+        tasksByHandle[handle] = cb;
+        Promise.resolve().then(function () { return runIfPresent(handle); });
+        return handle;
+    },
+    clearImmediate: function (handle) {
+        delete tasksByHandle[handle];
+    },
+};
+//# sourceMappingURL=Immediate.js.map
+
+
+/***/ }),
+/* 928 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = isInteropObservable;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__symbol_observable__ = __webpack_require__(117);
+/** PURE_IMPORTS_START _symbol_observable PURE_IMPORTS_END */
+
+function isInteropObservable(input) {
+    return input && typeof input[__WEBPACK_IMPORTED_MODULE_0__symbol_observable__["a" /* observable */]] === 'function';
+}
+//# sourceMappingURL=isInteropObservable.js.map
+
+
+/***/ }),
+/* 929 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = isIterable;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__symbol_iterator__ = __webpack_require__(151);
+/** PURE_IMPORTS_START _symbol_iterator PURE_IMPORTS_END */
+
+function isIterable(input) {
+    return input && typeof input[__WEBPACK_IMPORTED_MODULE_0__symbol_iterator__["a" /* iterator */]] === 'function';
+}
+//# sourceMappingURL=isIterable.js.map
+
+
+/***/ }),
+/* 930 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = isObservable;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(12);
+/** PURE_IMPORTS_START _Observable PURE_IMPORTS_END */
+
+function isObservable(obj) {
+    return !!obj && (obj instanceof __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */] || (typeof obj.lift === 'function' && typeof obj.subscribe === 'function'));
+}
+//# sourceMappingURL=isObservable.js.map
+
+
+/***/ }),
+/* 931 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = not;
+/** PURE_IMPORTS_START  PURE_IMPORTS_END */
+function not(pred, thisArg) {
+    function notPred() {
+        return !(notPred.pred.apply(notPred.thisArg, arguments));
+    }
+    notPred.pred = pred;
+    notPred.thisArg = thisArg;
+    return notPred;
+}
+//# sourceMappingURL=not.js.map
+
+
+/***/ }),
+/* 932 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (immutable) */ __webpack_exports__["a"] = toSubscriber;
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Subscriber__ = __webpack_require__(7);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__symbol_rxSubscriber__ = __webpack_require__(321);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Observer__ = __webpack_require__(420);
+/** PURE_IMPORTS_START _Subscriber,_symbol_rxSubscriber,_Observer PURE_IMPORTS_END */
+
+
+
+function toSubscriber(nextOrObserver, error, complete) {
+    if (nextOrObserver) {
+        if (nextOrObserver instanceof __WEBPACK_IMPORTED_MODULE_0__Subscriber__["a" /* Subscriber */]) {
+            return nextOrObserver;
+        }
+        if (nextOrObserver[__WEBPACK_IMPORTED_MODULE_1__symbol_rxSubscriber__["a" /* rxSubscriber */]]) {
+            return nextOrObserver[__WEBPACK_IMPORTED_MODULE_1__symbol_rxSubscriber__["a" /* rxSubscriber */]]();
+        }
+    }
+    if (!nextOrObserver && !error && !complete) {
+        return new __WEBPACK_IMPORTED_MODULE_0__Subscriber__["a" /* Subscriber */](__WEBPACK_IMPORTED_MODULE_2__Observer__["a" /* empty */]);
+    }
+    return new __WEBPACK_IMPORTED_MODULE_0__Subscriber__["a" /* Subscriber */](nextOrObserver, error, complete);
+}
+//# sourceMappingURL=toSubscriber.js.map
+
+
+/***/ }),
+/* 933 */
+/***/ (function(module, exports) {
+
+// This is not the set of all possible signals.
+//
+// It IS, however, the set of all signals that trigger
+// an exit on either Linux or BSD systems.  Linux is a
+// superset of the signal names supported on BSD, and
+// the unknown signals just fail to register, so we can
+// catch that easily enough.
+//
+// Don't bother with SIGKILL.  It's uncatchable, which
+// means that we can't fire any callbacks anyway.
+//
+// If a user does happen to register a handler on a non-
+// fatal signal like SIGWINCH or something, and then
+// exit, it'll end up firing `process.emit('exit')`, so
+// the handler will be fired anyway.
+//
+// SIGBUS, SIGFPE, SIGSEGV and SIGILL, when not raised
+// artificially, inherently leave the process in a
+// state from which it is not safe to try and enter JS
+// listeners.
+module.exports = [
+  'SIGABRT',
+  'SIGALRM',
+  'SIGHUP',
+  'SIGINT',
+  'SIGTERM'
+]
+
+if (process.platform !== 'win32') {
+  module.exports.push(
+    'SIGVTALRM',
+    'SIGXCPU',
+    'SIGXFSZ',
+    'SIGUSR2',
+    'SIGTRAP',
+    'SIGSYS',
+    'SIGQUIT',
+    'SIGIOT'
+    // should detect profiler and enable/disable accordingly.
+    // see #21
+    // 'SIGPROF'
+  )
+}
+
+if (process.platform === 'linux') {
+  module.exports.push(
+    'SIGIO',
+    'SIGPOLL',
+    'SIGPWR',
+    'SIGSTKFLT',
+    'SIGUNUSED'
+  )
+}
+
+
+/***/ }),
+/* 934 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+const isPlainObj = __webpack_require__(738);
+
+module.exports = (obj, opts) => {
+	if (!isPlainObj(obj)) {
+		throw new TypeError('Expected a plain object');
+	}
+
+	opts = opts || {};
+
+	// DEPRECATED
+	if (typeof opts === 'function') {
+		throw new TypeError('Specify the compare function as an option instead');
+	}
+
+	const deep = opts.deep;
+	const seenInput = [];
+	const seenOutput = [];
+
+	const sortKeys = x => {
+		const seenIndex = seenInput.indexOf(x);
+
+		if (seenIndex !== -1) {
+			return seenOutput[seenIndex];
+		}
+
+		const ret = {};
+		const keys = Object.keys(x).sort(opts.compare);
+
+		seenInput.push(x);
+		seenOutput.push(ret);
+
+		for (let i = 0; i < keys.length; i++) {
+			const key = keys[i];
+			const val = x[key];
+
+			if (deep && Array.isArray(val)) {
+				const retArr = [];
+
+				for (let j = 0; j < val.length; j++) {
+					retArr[j] = isPlainObj(val[j]) ? sortKeys(val[j]) : val[j];
+				}
+
+				ret[key] = retArr;
+				continue;
+			}
+
+			ret[key] = deep && isPlainObj(val) ? sortKeys(val) : val;
+		}
+
+		return ret;
+	};
+
+	return sortKeys(obj);
+};
+
+
+/***/ }),
+/* 935 */
+/***/ (function(module, exports, __webpack_require__) {
+
+/*
+Copyright 2015 Kyle E. Mitchell
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+var parse = __webpack_require__(452)
+var spdxLicenseIds = __webpack_require__(453)
+
+function valid (string) {
+  try {
+    parse(string)
+    return true
+  } catch (error) {
+    return false
+  }
+}
+
+// Common transpositions of license identifier acronyms
+var transpositions = [
+  ['APGL', 'AGPL'],
+  ['Gpl', 'GPL'],
+  ['GLP', 'GPL'],
+  ['APL', 'Apache'],
+  ['ISD', 'ISC'],
+  ['GLP', 'GPL'],
+  ['IST', 'ISC'],
+  ['Claude', 'Clause'],
+  [' or later', '+'],
+  [' International', ''],
+  ['GNU', 'GPL'],
+  ['GUN', 'GPL'],
+  ['+', ''],
+  ['GNU GPL', 'GPL'],
+  ['GNU/GPL', 'GPL'],
+  ['GNU GLP', 'GPL'],
+  ['GNU General Public License', 'GPL'],
+  ['Gnu public license', 'GPL'],
+  ['GNU Public License', 'GPL'],
+  ['GNU GENERAL PUBLIC LICENSE', 'GPL'],
+  ['MTI', 'MIT'],
+  ['Mozilla Public License', 'MPL'],
+  ['WTH', 'WTF'],
+  ['-License', '']
+]
+
+var TRANSPOSED = 0
+var CORRECT = 1
+
+// Simple corrections to nearly valid identifiers.
+var transforms = [
+  // e.g. 'mit'
+  function (argument) {
+    return argument.toUpperCase()
+  },
+  // e.g. 'MIT '
+  function (argument) {
+    return argument.trim()
+  },
+  // e.g. 'M.I.T.'
+  function (argument) {
+    return argument.replace(/\./g, '')
+  },
+  // e.g. 'Apache- 2.0'
+  function (argument) {
+    return argument.replace(/\s+/g, '')
+  },
+  // e.g. 'CC BY 4.0''
+  function (argument) {
+    return argument.replace(/\s+/g, '-')
+  },
+  // e.g. 'LGPLv2.1'
+  function (argument) {
+    return argument.replace('v', '-')
+  },
+  // e.g. 'Apache 2.0'
+  function (argument) {
+    return argument.replace(/,?\s*(\d)/, '-$1')
+  },
+  // e.g. 'GPL 2'
+  function (argument) {
+    return argument.replace(/,?\s*(\d)/, '-$1.0')
+  },
+  // e.g. 'Apache Version 2.0'
+  function (argument) {
+    return argument
+      .replace(/,?\s*(V\.|v\.|V|v|Version|version)\s*(\d)/, '-$2')
+  },
+  // e.g. 'Apache Version 2'
+  function (argument) {
+    return argument
+      .replace(/,?\s*(V\.|v\.|V|v|Version|version)\s*(\d)/, '-$2.0')
+  },
+  // e.g. 'ZLIB'
+  function (argument) {
+    return argument[0].toUpperCase() + argument.slice(1)
+  },
+  // e.g. 'MPL/2.0'
+  function (argument) {
+    return argument.replace('/', '-')
+  },
+  // e.g. 'Apache 2'
+  function (argument) {
+    return argument
+      .replace(/\s*V\s*(\d)/, '-$1')
+      .replace(/(\d)$/, '$1.0')
+  },
+  // e.g. 'GPL-2.0', 'GPL-3.0'
+  function (argument) {
+    if (argument.indexOf('3.0') !== -1) {
+      return argument + '-or-later'
+    } else {
+      return argument + '-only'
+    }
+  },
+  // e.g. 'GPL-2.0-'
+  function (argument) {
+    return argument + 'only'
+  },
+  // e.g. 'GPL2'
+  function (argument) {
+    return argument.replace(/(\d)$/, '-$1.0')
+  },
+  // e.g. 'BSD 3'
+  function (argument) {
+    return argument.replace(/(-| )?(\d)$/, '-$2-Clause')
+  },
+  // e.g. 'BSD clause 3'
+  function (argument) {
+    return argument.replace(/(-| )clause(-| )(\d)/, '-$3-Clause')
+  },
+  // e.g. 'BY-NC-4.0'
+  function (argument) {
+    return 'CC-' + argument
+  },
+  // e.g. 'BY-NC'
+  function (argument) {
+    return 'CC-' + argument + '-4.0'
+  },
+  // e.g. 'Attribution-NonCommercial'
+  function (argument) {
+    return argument
+      .replace('Attribution', 'BY')
+      .replace('NonCommercial', 'NC')
+      .replace('NoDerivatives', 'ND')
+      .replace(/ (\d)/, '-$1')
+      .replace(/ ?International/, '')
+  },
+  // e.g. 'Attribution-NonCommercial'
+  function (argument) {
+    return 'CC-' +
+      argument
+        .replace('Attribution', 'BY')
+        .replace('NonCommercial', 'NC')
+        .replace('NoDerivatives', 'ND')
+        .replace(/ (\d)/, '-$1')
+        .replace(/ ?International/, '') +
+      '-4.0'
+  }
+]
+
+var licensesWithVersions = spdxLicenseIds
+  .map(function (id) {
+    var match = /^(.*)-\d+\.\d+$/.exec(id)
+    return match
+      ? [match[0], match[1]]
+      : [id, null]
+  })
+  .reduce(function (objectMap, item) {
+    var key = item[1]
+    objectMap[key] = objectMap[key] || []
+    objectMap[key].push(item[0])
+    return objectMap
+  }, {})
+
+var licensesWithOneVersion = Object.keys(licensesWithVersions)
+  .map(function makeEntries (key) {
+    return [key, licensesWithVersions[key]]
+  })
+  .filter(function identifySoleVersions (item) {
+    return (
+      // Licenses has just one valid version suffix.
+      item[1].length === 1 &&
+      item[0] !== null &&
+      // APL will be considered Apache, rather than APL-1.0
+      item[0] !== 'APL'
+    )
+  })
+  .map(function createLastResorts (item) {
+    return [item[0], item[1][0]]
+  })
+
+licensesWithVersions = undefined
+
+// If all else fails, guess that strings containing certain substrings
+// meant to identify certain licenses.
+var lastResorts = [
+  ['UNLI', 'Unlicense'],
+  ['WTF', 'WTFPL'],
+  ['2 CLAUSE', 'BSD-2-Clause'],
+  ['2-CLAUSE', 'BSD-2-Clause'],
+  ['3 CLAUSE', 'BSD-3-Clause'],
+  ['3-CLAUSE', 'BSD-3-Clause'],
+  ['AFFERO', 'AGPL-3.0-or-later'],
+  ['AGPL', 'AGPL-3.0-or-later'],
+  ['APACHE', 'Apache-2.0'],
+  ['ARTISTIC', 'Artistic-2.0'],
+  ['Affero', 'AGPL-3.0-or-later'],
+  ['BEER', 'Beerware'],
+  ['BOOST', 'BSL-1.0'],
+  ['BSD', 'BSD-2-Clause'],
+  ['CDDL', 'CDDL-1.1'],
+  ['ECLIPSE', 'EPL-1.0'],
+  ['FUCK', 'WTFPL'],
+  ['GNU', 'GPL-3.0-or-later'],
+  ['LGPL', 'LGPL-3.0-or-later'],
+  ['GPLV1', 'GPL-1.0-only'],
+  ['GPLV2', 'GPL-2.0-only'],
+  ['GPL', 'GPL-3.0-or-later'],
+  ['MIT +NO-FALSE-ATTRIBS', 'MITNFA'],
+  ['MIT', 'MIT'],
+  ['MPL', 'MPL-2.0'],
+  ['X11', 'X11'],
+  ['ZLIB', 'Zlib']
+].concat(licensesWithOneVersion)
+
+var SUBSTRING = 0
+var IDENTIFIER = 1
+
+var validTransformation = function (identifier) {
+  for (var i = 0; i < transforms.length; i++) {
+    var transformed = transforms[i](identifier).trim()
+    if (transformed !== identifier && valid(transformed)) {
+      return transformed
+    }
+  }
+  return null
+}
+
+var validLastResort = function (identifier) {
+  var upperCased = identifier.toUpperCase()
+  for (var i = 0; i < lastResorts.length; i++) {
+    var lastResort = lastResorts[i]
+    if (upperCased.indexOf(lastResort[SUBSTRING]) > -1) {
+      return lastResort[IDENTIFIER]
+    }
+  }
+  return null
+}
+
+var anyCorrection = function (identifier, check) {
+  for (var i = 0; i < transpositions.length; i++) {
+    var transposition = transpositions[i]
+    var transposed = transposition[TRANSPOSED]
+    if (identifier.indexOf(transposed) > -1) {
+      var corrected = identifier.replace(
+        transposed,
+        transposition[CORRECT]
+      )
+      var checked = check(corrected)
+      if (checked !== null) {
+        return checked
+      }
+    }
+  }
+  return null
+}
+
+module.exports = function (identifier) {
+  var validArugment = (
+    typeof identifier === 'string' &&
+    identifier.trim().length !== 0
+  )
+  if (!validArugment) {
+    throw Error('Invalid argument. Expected non-empty string.')
+  }
+  identifier = identifier.replace(/\+$/, '').trim()
+  if (valid(identifier)) {
+    return upgradeGPLs(identifier)
+  }
+  var transformed = validTransformation(identifier)
+  if (transformed !== null) {
+    return upgradeGPLs(transformed)
+  }
+  transformed = anyCorrection(identifier, function (argument) {
+    if (valid(argument)) {
+      return argument
+    }
+    return validTransformation(argument)
+  })
+  if (transformed !== null) {
+    return upgradeGPLs(transformed)
+  }
+  transformed = validLastResort(identifier)
+  if (transformed !== null) {
+    return upgradeGPLs(transformed)
+  }
+  transformed = anyCorrection(identifier, validLastResort)
+  if (transformed !== null) {
+    return upgradeGPLs(transformed)
+  }
+  return null
+}
+
+function upgradeGPLs (value) {
+  if ([
+    'GPL-1.0', 'LGPL-1.0', 'AGPL-1.0',
+    'GPL-2.0', 'LGPL-2.0', 'AGPL-2.0',
+    'LGPL-2.1'
+  ].indexOf(value) !== -1) {
+    return value + '-only'
+  } else if (['GPL-3.0', 'LGPL-3.0', 'AGPL-3.0'].indexOf(value) !== -1) {
+    return value + '-or-later'
+  } else {
+    return value
+  }
+}
+
+
+/***/ }),
+/* 936 */
+/***/ (function(module, exports) {
+
+module.exports = ["389-exception","Autoconf-exception-2.0","Autoconf-exception-3.0","Bison-exception-2.2","Bootloader-exception","CLISP-exception-2.0","Classpath-exception-2.0","DigiRule-FOSS-exception","FLTK-exception","Fawkes-Runtime-exception","Font-exception-2.0","GCC-exception-2.0","GCC-exception-3.1","LZMA-exception","Libtool-exception","Linux-syscall-note","Nokia-Qt-exception-1.1","OCCT-exception-1.0","Qwt-exception-1.0","WxWindows-exception-3.1","eCos-exception-2.0","freertos-exception-2.0","gnu-javamail-exception","i2p-gpl-java-exception","mif-exception","openvpn-openssl-exception","u-boot-exception-2.0"]
+
+/***/ }),
+/* 937 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+// The ABNF grammar in the spec is totally ambiguous.
+//
+// This parser follows the operator precedence defined in the
+// `Order of Precedence and Parentheses` section.
+
+module.exports = function (tokens) {
+  var index = 0
+
+  function hasMore () {
+    return index < tokens.length
+  }
+
+  function token () {
+    return hasMore() ? tokens[index] : null
+  }
+
+  function next () {
+    if (!hasMore()) {
+      throw new Error()
+    }
+    index++
+  }
+
+  function parseOperator (operator) {
+    var t = token()
+    if (t && t.type === 'OPERATOR' && operator === t.string) {
+      next()
+      return t.string
+    }
+  }
+
+  function parseWith () {
+    if (parseOperator('WITH')) {
+      var t = token()
+      if (t && t.type === 'EXCEPTION') {
+        next()
+        return t.string
+      }
+      throw new Error('Expected exception after `WITH`')
+    }
+  }
+
+  function parseLicenseRef () {
+    // TODO: Actually, everything is concatenated into one string
+    // for backward-compatibility but it could be better to return
+    // a nice structure.
+    var begin = index
+    var string = ''
+    var t = token()
+    if (t.type === 'DOCUMENTREF') {
+      next()
+      string += 'DocumentRef-' + t.string + ':'
+      if (!parseOperator(':')) {
+        throw new Error('Expected `:` after `DocumentRef-...`')
+      }
+    }
+    t = token()
+    if (t.type === 'LICENSEREF') {
+      next()
+      string += 'LicenseRef-' + t.string
+      return {license: string}
+    }
+    index = begin
+  }
+
+  function parseLicense () {
+    var t = token()
+    if (t && t.type === 'LICENSE') {
+      next()
+      var node = {license: t.string}
+      if (parseOperator('+')) {
+        node.plus = true
+      }
+      var exception = parseWith()
+      if (exception) {
+        node.exception = exception
+      }
+      return node
+    }
+  }
+
+  function parseParenthesizedExpression () {
+    var left = parseOperator('(')
+    if (!left) {
+      return
+    }
+
+    var expr = parseExpression()
+
+    if (!parseOperator(')')) {
+      throw new Error('Expected `)`')
+    }
+
+    return expr
+  }
+
+  function parseAtom () {
+    return (
+      parseParenthesizedExpression() ||
+      parseLicenseRef() ||
+      parseLicense()
+    )
+  }
+
+  function makeBinaryOpParser (operator, nextParser) {
+    return function parseBinaryOp () {
+      var left = nextParser()
+      if (!left) {
+        return
+      }
+
+      if (!parseOperator(operator)) {
+        return left
+      }
+
+      var right = parseBinaryOp()
+      if (!right) {
+        throw new Error('Expected expression')
+      }
+      return {
+        left: left,
+        conjunction: operator.toLowerCase(),
+        right: right
+      }
+    }
+  }
+
+  var parseAnd = makeBinaryOpParser('AND', parseAtom)
+  var parseExpression = makeBinaryOpParser('OR', parseAnd)
+
+  var node = parseExpression()
+  if (!node || hasMore()) {
+    throw new Error('Syntax error')
+  }
+  return node
+}
+
+
+/***/ }),
+/* 938 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var licenses = []
+  .concat(__webpack_require__(453))
+  .concat(__webpack_require__(939))
+var exceptions = __webpack_require__(936)
+
+module.exports = function (source) {
+  var index = 0
+
+  function hasMore () {
+    return index < source.length
+  }
+
+  // `value` can be a regexp or a string.
+  // If it is recognized, the matching source string is returned and
+  // the index is incremented. Otherwise `undefined` is returned.
+  function read (value) {
+    if (value instanceof RegExp) {
+      var chars = source.slice(index)
+      var match = chars.match(value)
+      if (match) {
+        index += match[0].length
+        return match[0]
+      }
+    } else {
+      if (source.indexOf(value, index) === index) {
+        index += value.length
+        return value
+      }
+    }
+  }
+
+  function skipWhitespace () {
+    read(/[ ]*/)
+  }
+
+  function operator () {
+    var string
+    var possibilities = ['WITH', 'AND', 'OR', '(', ')', ':', '+']
+    for (var i = 0; i < possibilities.length; i++) {
+      string = read(possibilities[i])
+      if (string) {
+        break
+      }
+    }
+
+    if (string === '+' && index > 1 && source[index - 2] === ' ') {
+      throw new Error('Space before `+`')
+    }
+
+    return string && {
+      type: 'OPERATOR',
+      string: string
+    }
+  }
+
+  function idstring () {
+    return read(/[A-Za-z0-9-.]+/)
+  }
+
+  function expectIdstring () {
+    var string = idstring()
+    if (!string) {
+      throw new Error('Expected idstring at offset ' + index)
+    }
+    return string
+  }
+
+  function documentRef () {
+    if (read('DocumentRef-')) {
+      var string = expectIdstring()
+      return {type: 'DOCUMENTREF', string: string}
+    }
+  }
+
+  function licenseRef () {
+    if (read('LicenseRef-')) {
+      var string = expectIdstring()
+      return {type: 'LICENSEREF', string: string}
+    }
+  }
+
+  function identifier () {
+    var begin = index
+    var string = idstring()
+
+    if (licenses.indexOf(string) !== -1) {
+      return {
+        type: 'LICENSE',
+        string: string
+      }
+    } else if (exceptions.indexOf(string) !== -1) {
+      return {
+        type: 'EXCEPTION',
+        string: string
+      }
+    }
+
+    index = begin
+  }
+
+  // Tries to read the next token. Returns `undefined` if no token is
+  // recognized.
+  function parseToken () {
+    // Ordering matters
+    return (
+      operator() ||
+      documentRef() ||
+      licenseRef() ||
+      identifier()
+    )
+  }
+
+  var tokens = []
+  while (hasMore()) {
+    skipWhitespace()
+    if (!hasMore()) {
+      break
+    }
+
+    var token = parseToken()
+    if (!token) {
+      throw new Error('Unexpected `' + source[index] +
+                      '` at offset ' + index)
+    }
+
+    tokens.push(token)
+  }
+  return tokens
+}
+
+
+/***/ }),
+/* 939 */
+/***/ (function(module, exports) {
+
+module.exports = ["AGPL-3.0","eCos-2.0","GFDL-1.1","GFDL-1.2","GFDL-1.3","GPL-1.0","GPL-2.0-with-autoconf-exception","GPL-2.0-with-bison-exception","GPL-2.0-with-classpath-exception","GPL-2.0-with-font-exception","GPL-2.0-with-GCC-exception","GPL-2.0","GPL-3.0-with-autoconf-exception","GPL-3.0-with-GCC-exception","GPL-3.0","LGPL-2.0","LGPL-2.1","LGPL-3.0","Nunit","StandardML-NJ","wxWindows"]
+
+/***/ }),
+/* 940 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// Copyright 2017 Joyent, Inc.
+
+module.exports = {
+	read: read,
+	verify: verify,
+	sign: sign,
+	signAsync: signAsync,
+	write: write,
+
+	/* Internal private API */
+	fromBuffer: fromBuffer,
+	toBuffer: toBuffer
+};
+
+var assert = __webpack_require__(16);
+var SSHBuffer = __webpack_require__(159);
+var crypto = __webpack_require__(11);
+var Buffer = __webpack_require__(15).Buffer;
+var algs = __webpack_require__(32);
+var Key = __webpack_require__(27);
+var PrivateKey = __webpack_require__(33);
+var Identity = __webpack_require__(158);
+var rfc4253 = __webpack_require__(103);
+var Signature = __webpack_require__(75);
+var utils = __webpack_require__(26);
+var Certificate = __webpack_require__(155);
+
+function verify(cert, key) {
+	/*
+	 * We always give an issuerKey, so if our verify() is being called then
+	 * there was no signature. Return false.
+	 */
+	return (false);
+}
+
+var TYPES = {
+	'user': 1,
+	'host': 2
+};
+Object.keys(TYPES).forEach(function (k) { TYPES[TYPES[k]] = k; });
+
+var ECDSA_ALGO = /^ecdsa-sha2-([^@-]+)-cert-v01@openssh.com$/;
+
+function read(buf, options) {
+	if (Buffer.isBuffer(buf))
+		buf = buf.toString('ascii');
+	var parts = buf.trim().split(/[ \t\n]+/g);
+	if (parts.length < 2 || parts.length > 3)
+		throw (new Error('Not a valid SSH certificate line'));
+
+	var algo = parts[0];
+	var data = parts[1];
+
+	data = Buffer.from(data, 'base64');
+	return (fromBuffer(data, algo));
+}
+
+function fromBuffer(data, algo, partial) {
+	var sshbuf = new SSHBuffer({ buffer: data });
+	var innerAlgo = sshbuf.readString();
+	if (algo !== undefined && innerAlgo !== algo)
+		throw (new Error('SSH certificate algorithm mismatch'));
+	if (algo === undefined)
+		algo = innerAlgo;
+
+	var cert = {};
+	cert.signatures = {};
+	cert.signatures.openssh = {};
+
+	cert.signatures.openssh.nonce = sshbuf.readBuffer();
+
+	var key = {};
+	var parts = (key.parts = []);
+	key.type = getAlg(algo);
+
+	var partCount = algs.info[key.type].parts.length;
+	while (parts.length < partCount)
+		parts.push(sshbuf.readPart());
+	assert.ok(parts.length >= 1, 'key must have at least one part');
+
+	var algInfo = algs.info[key.type];
+	if (key.type === 'ecdsa') {
+		var res = ECDSA_ALGO.exec(algo);
+		assert.ok(res !== null);
+		assert.strictEqual(res[1], parts[0].data.toString());
+	}
+
+	for (var i = 0; i < algInfo.parts.length; ++i) {
+		parts[i].name = algInfo.parts[i];
+		if (parts[i].name !== 'curve' &&
+		    algInfo.normalize !== false) {
+			var p = parts[i];
+			p.data = utils.mpNormalize(p.data);
+		}
+	}
+
+	cert.subjectKey = new Key(key);
+
+	cert.serial = sshbuf.readInt64();
+
+	var type = TYPES[sshbuf.readInt()];
+	assert.string(type, 'valid cert type');
+
+	cert.signatures.openssh.keyId = sshbuf.readString();
+
+	var principals = [];
+	var pbuf = sshbuf.readBuffer();
+	var psshbuf = new SSHBuffer({ buffer: pbuf });
+	while (!psshbuf.atEnd())
+		principals.push(psshbuf.readString());
+	if (principals.length === 0)
+		principals = ['*'];
+
+	cert.subjects = principals.map(function (pr) {
+		if (type === 'user')
+			return (Identity.forUser(pr));
+		else if (type === 'host')
+			return (Identity.forHost(pr));
+		throw (new Error('Unknown identity type ' + type));
+	});
+
+	cert.validFrom = int64ToDate(sshbuf.readInt64());
+	cert.validUntil = int64ToDate(sshbuf.readInt64());
+
+	cert.signatures.openssh.critical = sshbuf.readBuffer();
+	cert.signatures.openssh.exts = sshbuf.readBuffer();
+
+	/* reserved */
+	sshbuf.readBuffer();
+
+	var signingKeyBuf = sshbuf.readBuffer();
+	cert.issuerKey = rfc4253.read(signingKeyBuf);
+
+	/*
+	 * OpenSSH certs don't give the identity of the issuer, just their
+	 * public key. So, we use an Identity that matches anything. The
+	 * isSignedBy() function will later tell you if the key matches.
+	 */
+	cert.issuer = Identity.forHost('**');
+
+	var sigBuf = sshbuf.readBuffer();
+	cert.signatures.openssh.signature =
+	    Signature.parse(sigBuf, cert.issuerKey.type, 'ssh');
+
+	if (partial !== undefined) {
+		partial.remainder = sshbuf.remainder();
+		partial.consumed = sshbuf._offset;
+	}
+
+	return (new Certificate(cert));
+}
+
+function int64ToDate(buf) {
+	var i = buf.readUInt32BE(0) * 4294967296;
+	i += buf.readUInt32BE(4);
+	var d = new Date();
+	d.setTime(i * 1000);
+	d.sourceInt64 = buf;
+	return (d);
+}
+
+function dateToInt64(date) {
+	if (date.sourceInt64 !== undefined)
+		return (date.sourceInt64);
+	var i = Math.round(date.getTime() / 1000);
+	var upper = Math.floor(i / 4294967296);
+	var lower = Math.floor(i % 4294967296);
+	var buf = Buffer.alloc(8);
+	buf.writeUInt32BE(upper, 0);
+	buf.writeUInt32BE(lower, 4);
+	return (buf);
+}
+
+function sign(cert, key) {
+	if (cert.signatures.openssh === undefined)
+		cert.signatures.openssh = {};
+	try {
+		var blob = toBuffer(cert, true);
+	} catch (e) {
+		delete (cert.signatures.openssh);
+		return (false);
+	}
+	var sig = cert.signatures.openssh;
+	var hashAlgo = undefined;
+	if (key.type === 'rsa' || key.type === 'dsa')
+		hashAlgo = 'sha1';
+	var signer = key.createSign(hashAlgo);
+	signer.write(blob);
+	sig.signature = signer.sign();
+	return (true);
+}
+
+function signAsync(cert, signer, done) {
+	if (cert.signatures.openssh === undefined)
+		cert.signatures.openssh = {};
+	try {
+		var blob = toBuffer(cert, true);
+	} catch (e) {
+		delete (cert.signatures.openssh);
+		done(e);
+		return;
+	}
+	var sig = cert.signatures.openssh;
+
+	signer(blob, function (err, signature) {
+		if (err) {
+			done(err);
+			return;
+		}
+		try {
+			/*
+			 * This will throw if the signature isn't of a
+			 * type/algo that can be used for SSH.
+			 */
+			signature.toBuffer('ssh');
+		} catch (e) {
+			done(e);
+			return;
+		}
+		sig.signature = signature;
+		done();
+	});
+}
+
+function write(cert, options) {
+	if (options === undefined)
+		options = {};
+
+	var blob = toBuffer(cert);
+	var out = getCertType(cert.subjectKey) + ' ' + blob.toString('base64');
+	if (options.comment)
+		out = out + ' ' + options.comment;
+	return (out);
+}
+
+
+function toBuffer(cert, noSig) {
+	assert.object(cert.signatures.openssh, 'signature for openssh format');
+	var sig = cert.signatures.openssh;
+
+	if (sig.nonce === undefined)
+		sig.nonce = crypto.randomBytes(16);
+	var buf = new SSHBuffer({});
+	buf.writeString(getCertType(cert.subjectKey));
+	buf.writeBuffer(sig.nonce);
+
+	var key = cert.subjectKey;
+	var algInfo = algs.info[key.type];
+	algInfo.parts.forEach(function (part) {
+		buf.writePart(key.part[part]);
+	});
+
+	buf.writeInt64(cert.serial);
+
+	var type = cert.subjects[0].type;
+	assert.notStrictEqual(type, 'unknown');
+	cert.subjects.forEach(function (id) {
+		assert.strictEqual(id.type, type);
+	});
+	type = TYPES[type];
+	buf.writeInt(type);
+
+	if (sig.keyId === undefined) {
+		sig.keyId = cert.subjects[0].type + '_' +
+		    (cert.subjects[0].uid || cert.subjects[0].hostname);
+	}
+	buf.writeString(sig.keyId);
+
+	var sub = new SSHBuffer({});
+	cert.subjects.forEach(function (id) {
+		if (type === TYPES.host)
+			sub.writeString(id.hostname);
+		else if (type === TYPES.user)
+			sub.writeString(id.uid);
+	});
+	buf.writeBuffer(sub.toBuffer());
+
+	buf.writeInt64(dateToInt64(cert.validFrom));
+	buf.writeInt64(dateToInt64(cert.validUntil));
+
+	if (sig.critical === undefined)
+		sig.critical = Buffer.alloc(0);
+	buf.writeBuffer(sig.critical);
+
+	if (sig.exts === undefined)
+		sig.exts = Buffer.alloc(0);
+	buf.writeBuffer(sig.exts);
+
+	/* reserved */
+	buf.writeBuffer(Buffer.alloc(0));
+
+	sub = rfc4253.write(cert.issuerKey);
+	buf.writeBuffer(sub);
+
+	if (!noSig)
+		buf.writeBuffer(sig.signature.toBuffer('ssh'));
+
+	return (buf.toBuffer());
+}
+
+function getAlg(certType) {
+	if (certType === 'ssh-rsa-cert-v01@openssh.com')
+		return ('rsa');
+	if (certType === 'ssh-dss-cert-v01@openssh.com')
+		return ('dsa');
+	if (certType.match(ECDSA_ALGO))
+		return ('ecdsa');
+	if (certType === 'ssh-ed25519-cert-v01@openssh.com')
+		return ('ed25519');
+	throw (new Error('Unsupported cert type ' + certType));
+}
+
+function getCertType(key) {
+	if (key.type === 'rsa')
+		return ('ssh-rsa-cert-v01@openssh.com');
+	if (key.type === 'dsa')
+		return ('ssh-dss-cert-v01@openssh.com');
+	if (key.type === 'ecdsa')
+		return ('ecdsa-sha2-' + key.curve + '-cert-v01@openssh.com');
+	if (key.type === 'ed25519')
+		return ('ssh-ed25519-cert-v01@openssh.com');
+	throw (new Error('Unsupported key type ' + key.type));
+}
+
+
+/***/ }),
+/* 941 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// Copyright 2016 Joyent, Inc.
+
+var x509 = __webpack_require__(457);
+
+module.exports = {
+	read: read,
+	verify: x509.verify,
+	sign: x509.sign,
+	write: write
+};
+
+var assert = __webpack_require__(16);
+var asn1 = __webpack_require__(66);
+var Buffer = __webpack_require__(15).Buffer;
+var algs = __webpack_require__(32);
+var utils = __webpack_require__(26);
+var Key = __webpack_require__(27);
+var PrivateKey = __webpack_require__(33);
+var pem = __webpack_require__(86);
+var Identity = __webpack_require__(158);
+var Signature = __webpack_require__(75);
+var Certificate = __webpack_require__(155);
+
+function read(buf, options) {
+	if (typeof (buf) !== 'string') {
+		assert.buffer(buf, 'buf');
+		buf = buf.toString('ascii');
+	}
+
+	var lines = buf.trim().split(/[\r\n]+/g);
+
+	var m = lines[0].match(/*JSSTYLED*/
+	    /[-]+[ ]*BEGIN CERTIFICATE[ ]*[-]+/);
+	assert.ok(m, 'invalid PEM header');
+
+	var m2 = lines[lines.length - 1].match(/*JSSTYLED*/
+	    /[-]+[ ]*END CERTIFICATE[ ]*[-]+/);
+	assert.ok(m2, 'invalid PEM footer');
+
+	var headers = {};
+	while (true) {
+		lines = lines.slice(1);
+		m = lines[0].match(/*JSSTYLED*/
+		    /^([A-Za-z0-9-]+): (.+)$/);
+		if (!m)
+			break;
+		headers[m[1].toLowerCase()] = m[2];
+	}
+
+	/* Chop off the first and last lines */
+	lines = lines.slice(0, -1).join('');
+	buf = Buffer.from(lines, 'base64');
+
+	return (x509.read(buf, options));
+}
+
+function write(cert, options) {
+	var dbuf = x509.write(cert, options);
+
+	var header = 'CERTIFICATE';
+	var tmp = dbuf.toString('base64');
+	var len = tmp.length + (tmp.length / 64) +
+	    18 + 16 + header.length*2 + 10;
+	var buf = Buffer.alloc(len);
+	var o = 0;
+	o += buf.write('-----BEGIN ' + header + '-----\n', o);
+	for (var i = 0; i < tmp.length; ) {
+		var limit = i + 64;
+		if (limit > tmp.length)
+			limit = tmp.length;
+		o += buf.write(tmp.slice(i, limit), o);
+		buf[o++] = 10;
+		i = limit;
+	}
+	o += buf.write('-----END ' + header + '-----\n', o);
+
+	return (buf.slice(0, o));
+}
+
+
+/***/ }),
+/* 942 */
+/***/ (function(module, exports) {
+
+module.exports = shift
+
+function shift (stream) {
+  var rs = stream._readableState
+  if (!rs) return null
+  return rs.objectMode ? stream.read() : stream.read(getStateLength(rs))
+}
+
+function getStateLength (state) {
+  if (state.buffer.length) {
+    // Since node 6.3.0 state.buffer is a BufferList not an array
+    if (state.buffer.head) {
+      return state.buffer.head.data.length
+    }
+
+    return state.buffer[0].length
+  }
+
+  return state.length
+}
+
+
+/***/ }),
+/* 943 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function (str) {
+	return encodeURIComponent(str).replace(/[!'()*]/g, function (c) {
+		return '%' + c.charCodeAt(0).toString(16).toUpperCase();
+	});
+};
+
+
+/***/ }),
+/* 944 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var resolvePkg = __webpack_require__(679);
+
+/* @private
+ *
+ * given the name of a descendent module this module locates and returns its
+ * package.json. In addition, it provides the baseDir.
+ *
+ * @method pkg
+ * @param {String} name
+ * @param {String} dir (optional) root directory to begin resolution
+ */
+module.exports = function pkg(name, dir) {
+  if (name !== './') { name += '/'; }
+
+  var packagePath = resolvePkg(name, dir);
+  if (packagePath === null) { return null; }
+
+  var thePackage = require(packagePath);
+
+  thePackage.baseDir = packagePath.slice(0, packagePath.length - 12 /* index of `/package.json` */);
+
+  return thePackage;
+};
+
+
+/***/ }),
+/* 945 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var stripAnsi = __webpack_require__(947);
+var codePointAt = __webpack_require__(607);
+var isFullwidthCodePoint = __webpack_require__(946);
+
+// https://github.com/nodejs/io.js/blob/cff7300a578be1b10001f2d967aaedc88aee6402/lib/readline.js#L1345
+module.exports = function (str) {
+	if (typeof str !== 'string' || str.length === 0) {
+		return 0;
+	}
+
+	var width = 0;
+
+	str = stripAnsi(str);
+
+	for (var i = 0; i < str.length; i++) {
+		var code = codePointAt(str, i);
+
+		// ignore control characters
+		if (code <= 0x1f || (code >= 0x7f && code <= 0x9f)) {
+			continue;
+		}
+
+		// surrogates
+		if (code >= 0x10000) {
+			i++;
+		}
+
+		if (isFullwidthCodePoint(code)) {
+			width += 2;
+		} else {
+			width++;
+		}
+	}
+
+	return width;
+};
+
+
+/***/ }),
+/* 946 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var numberIsNan = __webpack_require__(767);
+
+module.exports = function (x) {
+	if (numberIsNan(x)) {
+		return false;
+	}
+
+	// https://github.com/nodejs/io.js/blob/cff7300a578be1b10001f2d967aaedc88aee6402/lib/readline.js#L1369
+
+	// code points are derived from:
+	// http://www.unix.org/Public/UNIDATA/EastAsianWidth.txt
+	if (x >= 0x1100 && (
+		x <= 0x115f ||  // Hangul Jamo
+		0x2329 === x || // LEFT-POINTING ANGLE BRACKET
+		0x232a === x || // RIGHT-POINTING ANGLE BRACKET
+		// CJK Radicals Supplement .. Enclosed CJK Letters and Months
+		(0x2e80 <= x && x <= 0x3247 && x !== 0x303f) ||
+		// Enclosed CJK Letters and Months .. CJK Unified Ideographs Extension A
+		0x3250 <= x && x <= 0x4dbf ||
+		// CJK Unified Ideographs .. Yi Radicals
+		0x4e00 <= x && x <= 0xa4c6 ||
+		// Hangul Jamo Extended-A
+		0xa960 <= x && x <= 0xa97c ||
+		// Hangul Syllables
+		0xac00 <= x && x <= 0xd7a3 ||
+		// CJK Compatibility Ideographs
+		0xf900 <= x && x <= 0xfaff ||
+		// Vertical Forms
+		0xfe10 <= x && x <= 0xfe19 ||
+		// CJK Compatibility Forms .. Small Form Variants
+		0xfe30 <= x && x <= 0xfe6b ||
+		// Halfwidth and Fullwidth Forms
+		0xff01 <= x && x <= 0xff60 ||
+		0xffe0 <= x && x <= 0xffe6 ||
+		// Kana Supplement
+		0x1b000 <= x && x <= 0x1b001 ||
+		// Enclosed Ideographic Supplement
+		0x1f200 <= x && x <= 0x1f251 ||
+		// CJK Unified Ideographs Extension B .. Tertiary Ideographic Plane
+		0x20000 <= x && x <= 0x3fffd)) {
+		return true;
+	}
+
+	return false;
+}
+
+
+/***/ }),
+/* 947 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var ansiRegex = __webpack_require__(505)();
+
+module.exports = function (str) {
+	return typeof str === 'string' ? str.replace(ansiRegex, '') : str;
+};
+
+
+/***/ }),
+/* 948 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+module.exports = () => {
+	const pattern = [
+		'[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[a-zA-Z\\d]*)*)?\\u0007)',
+		'(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PRZcf-ntqry=><~]))'
+	].join('|');
+
+	return new RegExp(pattern, 'g');
+};
+
+
+/***/ }),
+/* 949 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var util = __webpack_require__(3)
+var bl = __webpack_require__(592)
+var xtend = __webpack_require__(465)
+var headers = __webpack_require__(459)
+
+var Writable = __webpack_require__(102).Writable
+var PassThrough = __webpack_require__(102).PassThrough
+
+var noop = function () {}
+
+var overflow = function (size) {
+  size &= 511
+  return size && 512 - size
+}
+
+var emptyStream = function (self, offset) {
+  var s = new Source(self, offset)
+  s.end()
+  return s
+}
+
+var mixinPax = function (header, pax) {
+  if (pax.path) header.name = pax.path
+  if (pax.linkpath) header.linkname = pax.linkpath
+  if (pax.size) header.size = parseInt(pax.size, 10)
+  header.pax = pax
+  return header
+}
+
+var Source = function (self, offset) {
+  this._parent = self
+  this.offset = offset
+  PassThrough.call(this)
+}
+
+util.inherits(Source, PassThrough)
+
+Source.prototype.destroy = function (err) {
+  this._parent.destroy(err)
+}
+
+var Extract = function (opts) {
+  if (!(this instanceof Extract)) return new Extract(opts)
+  Writable.call(this, opts)
+
+  opts = opts || {}
+
+  this._offset = 0
+  this._buffer = bl()
+  this._missing = 0
+  this._partial = false
+  this._onparse = noop
+  this._header = null
+  this._stream = null
+  this._overflow = null
+  this._cb = null
+  this._locked = false
+  this._destroyed = false
+  this._pax = null
+  this._paxGlobal = null
+  this._gnuLongPath = null
+  this._gnuLongLinkPath = null
+
+  var self = this
+  var b = self._buffer
+
+  var oncontinue = function () {
+    self._continue()
+  }
+
+  var onunlock = function (err) {
+    self._locked = false
+    if (err) return self.destroy(err)
+    if (!self._stream) oncontinue()
+  }
+
+  var onstreamend = function () {
+    self._stream = null
+    var drain = overflow(self._header.size)
+    if (drain) self._parse(drain, ondrain)
+    else self._parse(512, onheader)
+    if (!self._locked) oncontinue()
+  }
+
+  var ondrain = function () {
+    self._buffer.consume(overflow(self._header.size))
+    self._parse(512, onheader)
+    oncontinue()
+  }
+
+  var onpaxglobalheader = function () {
+    var size = self._header.size
+    self._paxGlobal = headers.decodePax(b.slice(0, size))
+    b.consume(size)
+    onstreamend()
+  }
+
+  var onpaxheader = function () {
+    var size = self._header.size
+    self._pax = headers.decodePax(b.slice(0, size))
+    if (self._paxGlobal) self._pax = xtend(self._paxGlobal, self._pax)
+    b.consume(size)
+    onstreamend()
+  }
+
+  var ongnulongpath = function () {
+    var size = self._header.size
+    this._gnuLongPath = headers.decodeLongPath(b.slice(0, size), opts.filenameEncoding)
+    b.consume(size)
+    onstreamend()
+  }
+
+  var ongnulonglinkpath = function () {
+    var size = self._header.size
+    this._gnuLongLinkPath = headers.decodeLongPath(b.slice(0, size), opts.filenameEncoding)
+    b.consume(size)
+    onstreamend()
+  }
+
+  var onheader = function () {
+    var offset = self._offset
+    var header
+    try {
+      header = self._header = headers.decode(b.slice(0, 512), opts.filenameEncoding)
+    } catch (err) {
+      self.emit('error', err)
+    }
+    b.consume(512)
+
+    if (!header) {
+      self._parse(512, onheader)
+      oncontinue()
+      return
+    }
+    if (header.type === 'gnu-long-path') {
+      self._parse(header.size, ongnulongpath)
+      oncontinue()
+      return
+    }
+    if (header.type === 'gnu-long-link-path') {
+      self._parse(header.size, ongnulonglinkpath)
+      oncontinue()
+      return
+    }
+    if (header.type === 'pax-global-header') {
+      self._parse(header.size, onpaxglobalheader)
+      oncontinue()
+      return
+    }
+    if (header.type === 'pax-header') {
+      self._parse(header.size, onpaxheader)
+      oncontinue()
+      return
+    }
+
+    if (self._gnuLongPath) {
+      header.name = self._gnuLongPath
+      self._gnuLongPath = null
+    }
+
+    if (self._gnuLongLinkPath) {
+      header.linkname = self._gnuLongLinkPath
+      self._gnuLongLinkPath = null
+    }
+
+    if (self._pax) {
+      self._header = header = mixinPax(header, self._pax)
+      self._pax = null
+    }
+
+    self._locked = true
+
+    if (!header.size || header.type === 'directory') {
+      self._parse(512, onheader)
+      self.emit('entry', header, emptyStream(self, offset), onunlock)
+      return
+    }
+
+    self._stream = new Source(self, offset)
+
+    self.emit('entry', header, self._stream, onunlock)
+    self._parse(header.size, onstreamend)
+    oncontinue()
+  }
+
+  this._onheader = onheader
+  this._parse(512, onheader)
+}
+
+util.inherits(Extract, Writable)
+
+Extract.prototype.destroy = function (err) {
+  if (this._destroyed) return
+  this._destroyed = true
+
+  if (err) this.emit('error', err)
+  this.emit('close')
+  if (this._stream) this._stream.emit('close')
+}
+
+Extract.prototype._parse = function (size, onparse) {
+  if (this._destroyed) return
+  this._offset += size
+  this._missing = size
+  if (onparse === this._onheader) this._partial = false
+  this._onparse = onparse
+}
+
+Extract.prototype._continue = function () {
+  if (this._destroyed) return
+  var cb = this._cb
+  this._cb = noop
+  if (this._overflow) this._write(this._overflow, undefined, cb)
+  else cb()
+}
+
+Extract.prototype._write = function (data, enc, cb) {
+  if (this._destroyed) return
+
+  var s = this._stream
+  var b = this._buffer
+  var missing = this._missing
+  if (data.length) this._partial = true
+
+  // we do not reach end-of-chunk now. just forward it
+
+  if (data.length < missing) {
+    this._missing -= data.length
+    this._overflow = null
+    if (s) return s.write(data, cb)
+    b.append(data)
+    return cb()
+  }
+
+  // end-of-chunk. the parser should call cb.
+
+  this._cb = cb
+  this._missing = 0
+
+  var overflow = null
+  if (data.length > missing) {
+    overflow = data.slice(missing)
+    data = data.slice(0, missing)
+  }
+
+  if (s) s.end(data)
+  else b.append(data)
+
+  this._overflow = overflow
+  this._onparse()
+}
+
+Extract.prototype._final = function (cb) {
+  if (this._partial) return this.destroy(new Error('Unexpected end of data'))
+  cb()
+}
+
+module.exports = Extract
+
+
+/***/ }),
+/* 950 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var constants = __webpack_require__(651)
+var eos = __webpack_require__(173)
+var util = __webpack_require__(3)
+var alloc = __webpack_require__(380)
+var toBuffer = __webpack_require__(462)
+
+var Readable = __webpack_require__(102).Readable
+var Writable = __webpack_require__(102).Writable
+var StringDecoder = __webpack_require__(333).StringDecoder
+
+var headers = __webpack_require__(459)
+
+var DMODE = parseInt('755', 8)
+var FMODE = parseInt('644', 8)
+
+var END_OF_TAR = alloc(1024)
+
+var noop = function () {}
+
+var overflow = function (self, size) {
+  size &= 511
+  if (size) self.push(END_OF_TAR.slice(0, 512 - size))
+}
+
+function modeToType (mode) {
+  switch (mode & constants.S_IFMT) {
+    case constants.S_IFBLK: return 'block-device'
+    case constants.S_IFCHR: return 'character-device'
+    case constants.S_IFDIR: return 'directory'
+    case constants.S_IFIFO: return 'fifo'
+    case constants.S_IFLNK: return 'symlink'
+  }
+
+  return 'file'
+}
+
+var Sink = function (to) {
+  Writable.call(this)
+  this.written = 0
+  this._to = to
+  this._destroyed = false
+}
+
+util.inherits(Sink, Writable)
+
+Sink.prototype._write = function (data, enc, cb) {
+  this.written += data.length
+  if (this._to.push(data)) return cb()
+  this._to._drain = cb
+}
+
+Sink.prototype.destroy = function () {
+  if (this._destroyed) return
+  this._destroyed = true
+  this.emit('close')
+}
+
+var LinkSink = function () {
+  Writable.call(this)
+  this.linkname = ''
+  this._decoder = new StringDecoder('utf-8')
+  this._destroyed = false
+}
+
+util.inherits(LinkSink, Writable)
+
+LinkSink.prototype._write = function (data, enc, cb) {
+  this.linkname += this._decoder.write(data)
+  cb()
+}
+
+LinkSink.prototype.destroy = function () {
+  if (this._destroyed) return
+  this._destroyed = true
+  this.emit('close')
+}
+
+var Void = function () {
+  Writable.call(this)
+  this._destroyed = false
+}
+
+util.inherits(Void, Writable)
+
+Void.prototype._write = function (data, enc, cb) {
+  cb(new Error('No body allowed for this entry'))
+}
+
+Void.prototype.destroy = function () {
+  if (this._destroyed) return
+  this._destroyed = true
+  this.emit('close')
+}
+
+var Pack = function (opts) {
+  if (!(this instanceof Pack)) return new Pack(opts)
+  Readable.call(this, opts)
+
+  this._drain = noop
+  this._finalized = false
+  this._finalizing = false
+  this._destroyed = false
+  this._stream = null
+}
+
+util.inherits(Pack, Readable)
+
+Pack.prototype.entry = function (header, buffer, callback) {
+  if (this._stream) throw new Error('already piping an entry')
+  if (this._finalized || this._destroyed) return
+
+  if (typeof buffer === 'function') {
+    callback = buffer
+    buffer = null
+  }
+
+  if (!callback) callback = noop
+
+  var self = this
+
+  if (!header.size || header.type === 'symlink') header.size = 0
+  if (!header.type) header.type = modeToType(header.mode)
+  if (!header.mode) header.mode = header.type === 'directory' ? DMODE : FMODE
+  if (!header.uid) header.uid = 0
+  if (!header.gid) header.gid = 0
+  if (!header.mtime) header.mtime = new Date()
+
+  if (typeof buffer === 'string') buffer = toBuffer(buffer)
+  if (Buffer.isBuffer(buffer)) {
+    header.size = buffer.length
+    this._encode(header)
+    this.push(buffer)
+    overflow(self, header.size)
+    process.nextTick(callback)
+    return new Void()
+  }
+
+  if (header.type === 'symlink' && !header.linkname) {
+    var linkSink = new LinkSink()
+    eos(linkSink, function (err) {
+      if (err) { // stream was closed
+        self.destroy()
+        return callback(err)
+      }
+
+      header.linkname = linkSink.linkname
+      self._encode(header)
+      callback()
+    })
+
+    return linkSink
+  }
+
+  this._encode(header)
+
+  if (header.type !== 'file' && header.type !== 'contiguous-file') {
+    process.nextTick(callback)
+    return new Void()
+  }
+
+  var sink = new Sink(this)
+
+  this._stream = sink
+
+  eos(sink, function (err) {
+    self._stream = null
+
+    if (err) { // stream was closed
+      self.destroy()
+      return callback(err)
+    }
+
+    if (sink.written !== header.size) { // corrupting tar
+      self.destroy()
+      return callback(new Error('size mismatch'))
+    }
+
+    overflow(self, header.size)
+    if (self._finalizing) self.finalize()
+    callback()
+  })
+
+  return sink
+}
+
+Pack.prototype.finalize = function () {
+  if (this._stream) {
+    this._finalizing = true
+    return
+  }
+
+  if (this._finalized) return
+  this._finalized = true
+  this.push(END_OF_TAR)
+  this.push(null)
+}
+
+Pack.prototype.destroy = function (err) {
+  if (this._destroyed) return
+  this._destroyed = true
+
+  if (err) this.emit('error', err)
+  this.emit('close')
+  if (this._stream && this._stream.destroy) this._stream.destroy()
+}
+
+Pack.prototype._encode = function (header) {
+  if (!header.pax) {
+    var buf = headers.encode(header)
+    if (buf) {
+      this.push(buf)
+      return
+    }
+  }
+  this._encodePax(header)
+}
+
+Pack.prototype._encodePax = function (header) {
+  var paxHeader = headers.encodePax({
+    name: header.name,
+    linkname: header.linkname,
+    pax: header.pax
+  })
+
+  var newHeader = {
+    name: 'PaxHeader',
+    mode: header.mode,
+    uid: header.uid,
+    gid: header.gid,
+    size: paxHeader.length,
+    mtime: header.mtime,
+    type: 'pax-header',
+    linkname: header.linkname && 'PaxHeader',
+    uname: header.uname,
+    gname: header.gname,
+    devmajor: header.devmajor,
+    devminor: header.devminor
+  }
+
+  this.push(headers.encode(newHeader))
+  this.push(paxHeader)
+  overflow(this, paxHeader.length)
+
+  newHeader.size = header.size
+  newHeader.type = header.type
+  this.push(headers.encode(newHeader))
+}
+
+Pack.prototype._read = function (n) {
+  var drain = this._drain
+  this._drain = noop
+  drain()
+}
+
+module.exports = Pack
+
+
+/***/ }),
+/* 951 */
+/***/ (function(module, exports, __webpack_require__) {
+
+
+var thenify = __webpack_require__(952)
+
+module.exports = thenifyAll
+thenifyAll.withCallback = withCallback
+thenifyAll.thenify = thenify
+
+/**
+ * Promisifies all the selected functions in an object.
+ *
+ * @param {Object} source the source object for the async functions
+ * @param {Object} [destination] the destination to set all the promisified methods
+ * @param {Array} [methods] an array of method names of `source`
+ * @return {Object}
+ * @api public
+ */
+
+function thenifyAll(source, destination, methods) {
+  return promisifyAll(source, destination, methods, thenify)
+}
+
+/**
+ * Promisifies all the selected functions in an object and backward compatible with callback.
+ *
+ * @param {Object} source the source object for the async functions
+ * @param {Object} [destination] the destination to set all the promisified methods
+ * @param {Array} [methods] an array of method names of `source`
+ * @return {Object}
+ * @api public
+ */
+
+function withCallback(source, destination, methods) {
+  return promisifyAll(source, destination, methods, thenify.withCallback)
+}
+
+function promisifyAll(source, destination, methods, promisify) {
+  if (!destination) {
+    destination = {};
+    methods = Object.keys(source)
+  }
+
+  if (Array.isArray(destination)) {
+    methods = destination
+    destination = {}
+  }
+
+  if (!methods) {
+    methods = Object.keys(source)
+  }
+
+  if (typeof source === 'function') destination = promisify(source)
+
+  methods.forEach(function (name) {
+    // promisify only if it's a function
+    if (typeof source[name] === 'function') destination[name] = promisify(source[name])
+  })
+
+  // proxy the rest
+  Object.keys(source).forEach(function (name) {
+    if (deprecated(source, name)) return
+    if (destination[name]) return
+    destination[name] = source[name]
+  })
+
+  return destination
+}
+
+function deprecated(source, name) {
+  var desc = Object.getOwnPropertyDescriptor(source, name)
+  if (!desc || !desc.get) return false
+  if (desc.get.name === 'deprecated') return true
+  return false
+}
+
+
+/***/ }),
+/* 952 */
+/***/ (function(module, exports, __webpack_require__) {
+
+
+var Promise = __webpack_require__(345)
+var assert = __webpack_require__(28)
+
+module.exports = thenify
+
+/**
+ * Turn async functions into promises
+ *
+ * @param {Function} $$__fn__$$
+ * @return {Function}
+ * @api public
+ */
+
+function thenify($$__fn__$$, options) {
+  assert(typeof $$__fn__$$ === 'function')
+  return eval(createWrapper($$__fn__$$.name, options))
+}
+
+/**
+ * Turn async functions into promises and backward compatible with callback
+ *
+ * @param {Function} $$__fn__$$
+ * @return {Function}
+ * @api public
+ */
+
+thenify.withCallback = function ($$__fn__$$, options) {
+  assert(typeof $$__fn__$$ === 'function')
+  options = options || {}
+  options.withCallback = true
+  if (options.multiArgs === undefined) options.multiArgs = true
+  return eval(createWrapper($$__fn__$$.name, options))
+}
+
+function createCallback(resolve, reject, multiArgs) {
+  return function(err, value) {
+    if (err) return reject(err)
+    var length = arguments.length
+
+    if (length <= 2 || !multiArgs) return resolve(value)
+
+    if (Array.isArray(multiArgs)) {
+      var values = {}
+      for (var i = 1; i < length; i++) values[multiArgs[i - 1]] = arguments[i]
+      return resolve(values)
+    }
+
+    var values = new Array(length - 1)
+    for (var i = 1; i < length; ++i) values[i - 1] = arguments[i]
+    resolve(values)
+  }
+}
+
+function createWrapper(name, options) {
+  name = (name || '').replace(/\s|bound(?!$)/g, '')
+  options = options || {}
+  // default to true
+  var multiArgs = options.multiArgs !== undefined ? options.multiArgs : true
+  multiArgs = 'var multiArgs = ' + JSON.stringify(multiArgs) + '\n'
+
+  var withCallback = options.withCallback ?
+    'var lastType = typeof arguments[len - 1]\n'
+    + 'if (lastType === "function") return $$__fn__$$.apply(self, arguments)\n'
+   : ''
+
+  return '(function ' + name + '() {\n'
+    + 'var self = this\n'
+    + 'var len = arguments.length\n'
+    + multiArgs
+    + withCallback
+    + 'var args = new Array(len + 1)\n'
+    + 'for (var i = 0; i < len; ++i) args[i] = arguments[i]\n'
+    + 'var lastIndex = i\n'
+    + 'return new Promise(function (resolve, reject) {\n'
+      + 'args[lastIndex] = createCallback(resolve, reject, multiArgs)\n'
+      + '$$__fn__$$.apply(self, args)\n'
+    + '})\n'
+  + '})'
+}
+
+
+/***/ }),
+/* 953 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var Stream = __webpack_require__(23)
+
+// through
+//
+// a stream that does nothing but re-emit the input.
+// useful for aggregating a series of changing but not ending streams into one stream)
+
+exports = module.exports = through
+through.through = through
+
+//create a readable writable stream.
+
+function through (write, end, opts) {
+  write = write || function (data) { this.queue(data) }
+  end = end || function () { this.queue(null) }
+
+  var ended = false, destroyed = false, buffer = [], _ended = false
+  var stream = new Stream()
+  stream.readable = stream.writable = true
+  stream.paused = false
+
+//  stream.autoPause   = !(opts && opts.autoPause   === false)
+  stream.autoDestroy = !(opts && opts.autoDestroy === false)
+
+  stream.write = function (data) {
+    write.call(this, data)
+    return !stream.paused
+  }
+
+  function drain() {
+    while(buffer.length && !stream.paused) {
+      var data = buffer.shift()
+      if(null === data)
+        return stream.emit('end')
+      else
+        stream.emit('data', data)
+    }
+  }
+
+  stream.queue = stream.push = function (data) {
+//    console.error(ended)
+    if(_ended) return stream
+    if(data === null) _ended = true
+    buffer.push(data)
+    drain()
+    return stream
+  }
+
+  //this will be registered as the first 'end' listener
+  //must call destroy next tick, to make sure we're after any
+  //stream piped from here.
+  //this is only a problem if end is not emitted synchronously.
+  //a nicer way to do this is to make sure this is the last listener for 'end'
+
+  stream.on('end', function () {
+    stream.readable = false
+    if(!stream.writable && stream.autoDestroy)
+      process.nextTick(function () {
+        stream.destroy()
+      })
+  })
+
+  function _end () {
+    stream.writable = false
+    end.call(stream)
+    if(!stream.readable && stream.autoDestroy)
+      stream.destroy()
+  }
+
+  stream.end = function (data) {
+    if(ended) return
+    ended = true
+    if(arguments.length) stream.write(data)
+    _end() // will emit or queue
+    return stream
+  }
+
+  stream.destroy = function () {
+    if(destroyed) return
+    destroyed = true
+    ended = true
+    buffer.length = 0
+    stream.writable = stream.readable = false
+    stream.emit('close')
+    return stream
+  }
+
+  stream.pause = function () {
+    if(stream.paused) return
+    stream.paused = true
+    return stream
+  }
+
+  stream.resume = function () {
+    if(stream.paused) {
+      stream.paused = false
+      stream.emit('resume')
+    }
+    drain()
+    //may have become paused again,
+    //as drain emits 'data'.
+    if(!stream.paused)
+      stream.emit('drain')
+    return stream
+  }
+  return stream
+}
+
+
+
+/***/ }),
+/* 954 */
+/***/ (function(module, exports, __webpack_require__) {
+
+/*!
+ * Tmp
+ *
+ * Copyright (c) 2011-2017 KARASZI Istvan <github@spam.raszi.hu>
+ *
+ * MIT Licensed
+ */
+
+/*
+ * Module dependencies.
+ */
+const fs = __webpack_require__(5);
+const path = __webpack_require__(0);
+const crypto = __webpack_require__(11);
+const osTmpDir = __webpack_require__(772);
+const _c = process.binding('constants');
+
+/*
+ * The working inner variables.
+ */
+const
+  /**
+   * The temporary directory.
+   * @type {string}
+   */
+  tmpDir = osTmpDir(),
+
+  // the random characters to choose from
+  RANDOM_CHARS = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz',
+
+  TEMPLATE_PATTERN = /XXXXXX/,
+
+  DEFAULT_TRIES = 3,
+
+  CREATE_FLAGS = (_c.O_CREAT || _c.fs.O_CREAT) | (_c.O_EXCL || _c.fs.O_EXCL) | (_c.O_RDWR || _c.fs.O_RDWR),
+
+  EBADF = _c.EBADF || _c.os.errno.EBADF,
+  ENOENT = _c.ENOENT || _c.os.errno.ENOENT,
+
+  DIR_MODE = 448 /* 0o700 */,
+  FILE_MODE = 384 /* 0o600 */,
+
+  // this will hold the objects need to be removed on exit
+  _removeObjects = [];
+
+var
+  _gracefulCleanup = false,
+  _uncaughtException = false;
+
+/**
+ * Random name generator based on crypto.
+ * Adapted from http://blog.tompawlak.org/how-to-generate-random-values-nodejs-javascript
+ *
+ * @param {number} howMany
+ * @returns {string} the generated random name
+ * @private
+ */
+function _randomChars(howMany) {
+  var
+    value = [],
+    rnd = null;
+
+  // make sure that we do not fail because we ran out of entropy
+  try {
+    rnd = crypto.randomBytes(howMany);
+  } catch (e) {
+    rnd = crypto.pseudoRandomBytes(howMany);
+  }
+
+  for (var i = 0; i < howMany; i++) {
+    value.push(RANDOM_CHARS[rnd[i] % RANDOM_CHARS.length]);
+  }
+
+  return value.join('');
+}
+
+/**
+ * Checks whether the `obj` parameter is defined or not.
+ *
+ * @param {Object} obj
+ * @returns {boolean} true if the object is undefined
+ * @private
+ */
+function _isUndefined(obj) {
+  return typeof obj === 'undefined';
+}
+
+/**
+ * Parses the function arguments.
+ *
+ * This function helps to have optional arguments.
+ *
+ * @param {(Options|Function)} options
+ * @param {Function} callback
+ * @returns {Array} parsed arguments
+ * @private
+ */
+function _parseArguments(options, callback) {
+  if (typeof options == 'function') {
+    return [callback || {}, options];
+  }
+
+  if (_isUndefined(options)) {
+    return [{}, callback];
+  }
+
+  return [options, callback];
+}
+
+/**
+ * Generates a new temporary name.
+ *
+ * @param {Object} opts
+ * @returns {string} the new random name according to opts
+ * @private
+ */
+function _generateTmpName(opts) {
+  if (opts.name) {
+    return path.join(opts.dir || tmpDir, opts.name);
+  }
+
+  // mkstemps like template
+  if (opts.template) {
+    return opts.template.replace(TEMPLATE_PATTERN, _randomChars(6));
+  }
+
+  // prefix and postfix
+  const name = [
+    opts.prefix || 'tmp-',
+    process.pid,
+    _randomChars(12),
+    opts.postfix || ''
+  ].join('');
+
+  return path.join(opts.dir || tmpDir, name);
+}
+
+/**
+ * Gets a temporary file name.
+ *
+ * @param {(Options|tmpNameCallback)} options options or callback
+ * @param {?tmpNameCallback} callback the callback function
+ */
+function tmpName(options, callback) {
+  var
+    args = _parseArguments(options, callback),
+    opts = args[0],
+    cb = args[1],
+    tries = opts.name ? 1 : opts.tries || DEFAULT_TRIES;
+
+  if (isNaN(tries) || tries < 0)
+    return cb(new Error('Invalid tries'));
+
+  if (opts.template && !opts.template.match(TEMPLATE_PATTERN))
+    return cb(new Error('Invalid template provided'));
+
+  (function _getUniqueName() {
+    const name = _generateTmpName(opts);
+
+    // check whether the path exists then retry if needed
+    fs.stat(name, function (err) {
+      if (!err) {
+        if (tries-- > 0) return _getUniqueName();
+
+        return cb(new Error('Could not get a unique tmp filename, max tries reached ' + name));
+      }
+
+      cb(null, name);
+    });
+  }());
+}
+
+/**
+ * Synchronous version of tmpName.
+ *
+ * @param {Object} options
+ * @returns {string} the generated random name
+ * @throws {Error} if the options are invalid or could not generate a filename
+ */
+function tmpNameSync(options) {
+  var
+    args = _parseArguments(options),
+    opts = args[0],
+    tries = opts.name ? 1 : opts.tries || DEFAULT_TRIES;
+
+  if (isNaN(tries) || tries < 0)
+    throw new Error('Invalid tries');
+
+  if (opts.template && !opts.template.match(TEMPLATE_PATTERN))
+    throw new Error('Invalid template provided');
+
+  do {
+    const name = _generateTmpName(opts);
+    try {
+      fs.statSync(name);
+    } catch (e) {
+      return name;
+    }
+  } while (tries-- > 0);
+
+  throw new Error('Could not get a unique tmp filename, max tries reached');
+}
+
+/**
+ * Creates and opens a temporary file.
+ *
+ * @param {(Options|fileCallback)} options the config options or the callback function
+ * @param {?fileCallback} callback
+ */
+function file(options, callback) {
+  var
+    args = _parseArguments(options, callback),
+    opts = args[0],
+    cb = args[1];
+
+  opts.postfix = (_isUndefined(opts.postfix)) ? '.tmp' : opts.postfix;
+
+  // gets a temporary filename
+  tmpName(opts, function _tmpNameCreated(err, name) {
+    if (err) return cb(err);
+
+    // create and open the file
+    fs.open(name, CREATE_FLAGS, opts.mode || FILE_MODE, function _fileCreated(err, fd) {
+      if (err) return cb(err);
+
+      if (opts.discardDescriptor) {
+        return fs.close(fd, function _discardCallback(err) {
+          if (err) {
+            // Low probability, and the file exists, so this could be
+            // ignored.  If it isn't we certainly need to unlink the
+            // file, and if that fails too its error is more
+            // important.
+            try {
+              fs.unlinkSync(name);
+            } catch (e) {
+              if (!isENOENT(e)) {
+                err = e;
+              }
+            }
+            return cb(err);
+          }
+          cb(null, name, undefined, _prepareTmpFileRemoveCallback(name, -1, opts));
+        });
+      }
+      if (opts.detachDescriptor) {
+        return cb(null, name, fd, _prepareTmpFileRemoveCallback(name, -1, opts));
+      }
+      cb(null, name, fd, _prepareTmpFileRemoveCallback(name, fd, opts));
+    });
+  });
+}
+
+/**
+ * Synchronous version of file.
+ *
+ * @param {Options} options
+ * @returns {FileSyncObject} object consists of name, fd and removeCallback
+ * @throws {Error} if cannot create a file
+ */
+function fileSync(options) {
+  var
+    args = _parseArguments(options),
+    opts = args[0];
+
+  opts.postfix = opts.postfix || '.tmp';
+
+  const discardOrDetachDescriptor = opts.discardDescriptor || opts.detachDescriptor;
+  const name = tmpNameSync(opts);
+  var fd = fs.openSync(name, CREATE_FLAGS, opts.mode || FILE_MODE);
+  if (opts.discardDescriptor) {
+    fs.closeSync(fd); 
+    fd = undefined;
+  }
+
+  return {
+    name: name,
+    fd: fd,
+    removeCallback: _prepareTmpFileRemoveCallback(name, discardOrDetachDescriptor ? -1 : fd, opts)
+  };
+}
+
+/**
+ * Removes files and folders in a directory recursively.
+ *
+ * @param {string} root
+ * @private
+ */
+function _rmdirRecursiveSync(root) {
+  const dirs = [root];
+
+  do {
+    var
+      dir = dirs.pop(),
+      deferred = false,
+      files = fs.readdirSync(dir);
+
+    for (var i = 0, length = files.length; i < length; i++) {
+      var
+        file = path.join(dir, files[i]),
+        stat = fs.lstatSync(file); // lstat so we don't recurse into symlinked directories
+
+      if (stat.isDirectory()) {
+        if (!deferred) {
+          deferred = true;
+          dirs.push(dir);
+        }
+        dirs.push(file);
+      } else {
+        fs.unlinkSync(file);
+      }
+    }
+
+    if (!deferred) {
+      fs.rmdirSync(dir);
+    }
+  } while (dirs.length !== 0);
+}
+
+/**
+ * Creates a temporary directory.
+ *
+ * @param {(Options|dirCallback)} options the options or the callback function
+ * @param {?dirCallback} callback
+ */
+function dir(options, callback) {
+  var
+    args = _parseArguments(options, callback),
+    opts = args[0],
+    cb = args[1];
+
+  // gets a temporary filename
+  tmpName(opts, function _tmpNameCreated(err, name) {
+    if (err) return cb(err);
+
+    // create the directory
+    fs.mkdir(name, opts.mode || DIR_MODE, function _dirCreated(err) {
+      if (err) return cb(err);
+
+      cb(null, name, _prepareTmpDirRemoveCallback(name, opts));
+    });
+  });
+}
+
+/**
+ * Synchronous version of dir.
+ *
+ * @param {Options} options
+ * @returns {DirSyncObject} object consists of name and removeCallback
+ * @throws {Error} if it cannot create a directory
+ */
+function dirSync(options) {
+  var
+    args = _parseArguments(options),
+    opts = args[0];
+
+  const name = tmpNameSync(opts);
+  fs.mkdirSync(name, opts.mode || DIR_MODE);
+
+  return {
+    name: name,
+    removeCallback: _prepareTmpDirRemoveCallback(name, opts)
+  };
+}
+
+/**
+ * Prepares the callback for removal of the temporary file.
+ *
+ * @param {string} name the path of the file
+ * @param {number} fd file descriptor
+ * @param {Object} opts
+ * @returns {fileCallback}
+ * @private
+ */
+function _prepareTmpFileRemoveCallback(name, fd, opts) {
+  const removeCallback = _prepareRemoveCallback(function _removeCallback(fdPath) {
+    try {
+      if (0 <= fdPath[0]) {
+        fs.closeSync(fdPath[0]);
+      }
+    }
+    catch (e) {
+      // under some node/windows related circumstances, a temporary file
+      // may have not be created as expected or the file was already closed
+      // by the user, in which case we will simply ignore the error
+      if (!isEBADF(e) && !isENOENT(e)) {
+        // reraise any unanticipated error
+        throw e;
+      }
+    }
+    try {
+      fs.unlinkSync(fdPath[1]);
+    }
+    catch (e) {
+      if (!isENOENT(e)) {
+        // reraise any unanticipated error
+        throw e;
+      }
+    }
+  }, [fd, name]);
+
+  if (!opts.keep) {
+    _removeObjects.unshift(removeCallback);
+  }
+
+  return removeCallback;
+}
+
+/**
+ * Prepares the callback for removal of the temporary directory.
+ *
+ * @param {string} name
+ * @param {Object} opts
+ * @returns {Function} the callback
+ * @private
+ */
+function _prepareTmpDirRemoveCallback(name, opts) {
+  const removeFunction = opts.unsafeCleanup ? _rmdirRecursiveSync : fs.rmdirSync.bind(fs);
+  const removeCallback = _prepareRemoveCallback(removeFunction, name);
+
+  if (!opts.keep) {
+    _removeObjects.unshift(removeCallback);
+  }
+
+  return removeCallback;
+}
+
+/**
+ * Creates a guarded function wrapping the removeFunction call.
+ *
+ * @param {Function} removeFunction
+ * @param {Object} arg
+ * @returns {Function}
+ * @private
+ */
+function _prepareRemoveCallback(removeFunction, arg) {
+  var called = false;
+
+  return function _cleanupCallback(next) {
+    if (!called) {
+      const index = _removeObjects.indexOf(_cleanupCallback);
+      if (index >= 0) {
+        _removeObjects.splice(index, 1);
+      }
+
+      called = true;
+      removeFunction(arg);
+    }
+
+    if (next) next(null);
+  };
+}
+
+/**
+ * The garbage collector.
+ *
+ * @private
+ */
+function _garbageCollector() {
+  if (_uncaughtException && !_gracefulCleanup) {
+    return;
+  }
+
+  // the function being called removes itself from _removeObjects,
+  // loop until _removeObjects is empty
+  while (_removeObjects.length) {
+    try {
+      _removeObjects[0].call(null);
+    } catch (e) {
+      // already removed?
+    }
+  }
+}
+
+/**
+ * Helper for testing against EBADF to compensate changes made to Node 7.x under Windows.
+ */
+function isEBADF(error) {
+  return isExpectedError(error, -EBADF, 'EBADF');
+}
+
+/**
+ * Helper for testing against ENOENT to compensate changes made to Node 7.x under Windows.
+ */
+function isENOENT(error) {
+  return isExpectedError(error, -ENOENT, 'ENOENT');
+}
+
+/**
+ * Helper to determine whether the expected error code matches the actual code and errno,
+ * which will differ between the supported node versions.
+ *
+ * - Node >= 7.0:
+ *   error.code {String}
+ *   error.errno {String|Number} any numerical value will be negated
+ *
+ * - Node >= 6.0 < 7.0:
+ *   error.code {String}
+ *   error.errno {Number} negated
+ *
+ * - Node >= 4.0 < 6.0: introduces SystemError
+ *   error.code {String}
+ *   error.errno {Number} negated
+ *
+ * - Node >= 0.10 < 4.0:
+ *   error.code {Number} negated
+ *   error.errno n/a
+ */
+function isExpectedError(error, code, errno) {
+  return error.code == code || error.code == errno;
+}
+
+/**
+ * Sets the graceful cleanup.
+ *
+ * Also removes the created files and directories when an uncaught exception occurs.
+ */
+function setGracefulCleanup() {
+  _gracefulCleanup = true;
+}
+
+const version = process.versions.node.split('.').map(function (value) {
+  return parseInt(value, 10);
+});
+
+if (version[0] === 0 && (version[1] < 9 || version[1] === 9 && version[2] < 5)) {
+  process.addListener('uncaughtException', function _uncaughtExceptionThrown(err) {
+    _uncaughtException = true;
+    _garbageCollector();
+
+    throw err;
+  });
+}
+
+process.addListener('exit', function _exit(code) {
+  if (code) _uncaughtException = true;
+  _garbageCollector();
+});
+
+/**
+ * Configuration options.
+ *
+ * @typedef {Object} Options
+ * @property {?number} tries the number of tries before give up the name generation
+ * @property {?string} template the "mkstemp" like filename template
+ * @property {?string} name fix name
+ * @property {?string} dir the tmp directory to use
+ * @property {?string} prefix prefix for the generated name
+ * @property {?string} postfix postfix for the generated name
+ */
+
+/**
+ * @typedef {Object} FileSyncObject
+ * @property {string} name the name of the file
+ * @property {string} fd the file descriptor
+ * @property {fileCallback} removeCallback the callback function to remove the file
+ */
+
+/**
+ * @typedef {Object} DirSyncObject
+ * @property {string} name the name of the directory
+ * @property {fileCallback} removeCallback the callback function to remove the directory
+ */
+
+/**
+ * @callback tmpNameCallback
+ * @param {?Error} err the error object if anything goes wrong
+ * @param {string} name the temporary file name
+ */
+
+/**
+ * @callback fileCallback
+ * @param {?Error} err the error object if anything goes wrong
+ * @param {string} name the temporary file name
+ * @param {number} fd the file descriptor
+ * @param {cleanupCallback} fn the cleanup callback function
+ */
+
+/**
+ * @callback dirCallback
+ * @param {?Error} err the error object if anything goes wrong
+ * @param {string} name the temporary file name
+ * @param {cleanupCallback} fn the cleanup callback function
+ */
+
+/**
+ * Removes the temporary created file or directory.
+ *
+ * @callback cleanupCallback
+ * @param {simpleCallback} [next] function to call after entry was removed
+ */
+
+/**
+ * Callback function for function composition.
+ * @see {@link https://github.com/raszi/node-tmp/issues/57|raszi/node-tmp#57}
+ *
+ * @callback simpleCallback
+ */
+
+// exporting all the needed methods
+module.exports.tmpdir = tmpDir;
+
+module.exports.dir = dir;
+module.exports.dirSync = dirSync;
+
+module.exports.file = file;
+module.exports.fileSync = fileSync;
+
+module.exports.tmpName = tmpName;
+module.exports.tmpNameSync = tmpNameSync;
+
+module.exports.setGracefulCleanup = setGracefulCleanup;
+
+
+/***/ }),
+/* 955 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var net = __webpack_require__(164)
+  , tls = __webpack_require__(467)
+  , http = __webpack_require__(87)
+  , https = __webpack_require__(195)
+  , events = __webpack_require__(77)
+  , assert = __webpack_require__(28)
+  , util = __webpack_require__(3)
+  , Buffer = __webpack_require__(45).Buffer
+  ;
+
+exports.httpOverHttp = httpOverHttp
+exports.httpsOverHttp = httpsOverHttp
+exports.httpOverHttps = httpOverHttps
+exports.httpsOverHttps = httpsOverHttps
+
+
+function httpOverHttp(options) {
+  var agent = new TunnelingAgent(options)
+  agent.request = http.request
+  return agent
+}
+
+function httpsOverHttp(options) {
+  var agent = new TunnelingAgent(options)
+  agent.request = http.request
+  agent.createSocket = createSecureSocket
+  agent.defaultPort = 443
+  return agent
+}
+
+function httpOverHttps(options) {
+  var agent = new TunnelingAgent(options)
+  agent.request = https.request
+  return agent
+}
+
+function httpsOverHttps(options) {
+  var agent = new TunnelingAgent(options)
+  agent.request = https.request
+  agent.createSocket = createSecureSocket
+  agent.defaultPort = 443
+  return agent
+}
+
+
+function TunnelingAgent(options) {
+  var self = this
+  self.options = options || {}
+  self.proxyOptions = self.options.proxy || {}
+  self.maxSockets = self.options.maxSockets || http.Agent.defaultMaxSockets
+  self.requests = []
+  self.sockets = []
+
+  self.on('free', function onFree(socket, host, port) {
+    for (var i = 0, len = self.requests.length; i < len; ++i) {
+      var pending = self.requests[i]
+      if (pending.host === host && pending.port === port) {
+        // Detect the request to connect same origin server,
+        // reuse the connection.
+        self.requests.splice(i, 1)
+        pending.request.onSocket(socket)
+        return
+      }
+    }
+    socket.destroy()
+    self.removeSocket(socket)
+  })
+}
+util.inherits(TunnelingAgent, events.EventEmitter)
+
+TunnelingAgent.prototype.addRequest = function addRequest(req, options) {
+  var self = this
+
+   // Legacy API: addRequest(req, host, port, path)
+  if (typeof options === 'string') {
+    options = {
+      host: options,
+      port: arguments[2],
+      path: arguments[3]
+    };
+  }
+
+  if (self.sockets.length >= this.maxSockets) {
+    // We are over limit so we'll add it to the queue.
+    self.requests.push({host: options.host, port: options.port, request: req})
+    return
+  }
+
+  // If we are under maxSockets create a new one.
+  self.createConnection({host: options.host, port: options.port, request: req})
+}
+
+TunnelingAgent.prototype.createConnection = function createConnection(pending) {
+  var self = this
+
+  self.createSocket(pending, function(socket) {
+    socket.on('free', onFree)
+    socket.on('close', onCloseOrRemove)
+    socket.on('agentRemove', onCloseOrRemove)
+    pending.request.onSocket(socket)
+
+    function onFree() {
+      self.emit('free', socket, pending.host, pending.port)
+    }
+
+    function onCloseOrRemove(err) {
+      self.removeSocket(socket)
+      socket.removeListener('free', onFree)
+      socket.removeListener('close', onCloseOrRemove)
+      socket.removeListener('agentRemove', onCloseOrRemove)
+    }
+  })
+}
+
+TunnelingAgent.prototype.createSocket = function createSocket(options, cb) {
+  var self = this
+  var placeholder = {}
+  self.sockets.push(placeholder)
+
+  var connectOptions = mergeOptions({}, self.proxyOptions,
+    { method: 'CONNECT'
+    , path: options.host + ':' + options.port
+    , agent: false
+    }
+  )
+  if (connectOptions.proxyAuth) {
+    connectOptions.headers = connectOptions.headers || {}
+    connectOptions.headers['Proxy-Authorization'] = 'Basic ' +
+        Buffer.from(connectOptions.proxyAuth).toString('base64')
+  }
+
+  debug('making CONNECT request')
+  var connectReq = self.request(connectOptions)
+  connectReq.useChunkedEncodingByDefault = false // for v0.6
+  connectReq.once('response', onResponse) // for v0.6
+  connectReq.once('upgrade', onUpgrade)   // for v0.6
+  connectReq.once('connect', onConnect)   // for v0.7 or later
+  connectReq.once('error', onError)
+  connectReq.end()
+
+  function onResponse(res) {
+    // Very hacky. This is necessary to avoid http-parser leaks.
+    res.upgrade = true
+  }
+
+  function onUpgrade(res, socket, head) {
+    // Hacky.
+    process.nextTick(function() {
+      onConnect(res, socket, head)
+    })
+  }
+
+  function onConnect(res, socket, head) {
+    connectReq.removeAllListeners()
+    socket.removeAllListeners()
+
+    if (res.statusCode === 200) {
+      assert.equal(head.length, 0)
+      debug('tunneling connection has established')
+      self.sockets[self.sockets.indexOf(placeholder)] = socket
+      cb(socket)
+    } else {
+      debug('tunneling socket could not be established, statusCode=%d', res.statusCode)
+      var error = new Error('tunneling socket could not be established, ' + 'statusCode=' + res.statusCode)
+      error.code = 'ECONNRESET'
+      options.request.emit('error', error)
+      self.removeSocket(placeholder)
+    }
+  }
+
+  function onError(cause) {
+    connectReq.removeAllListeners()
+
+    debug('tunneling socket could not be established, cause=%s\n', cause.message, cause.stack)
+    var error = new Error('tunneling socket could not be established, ' + 'cause=' + cause.message)
+    error.code = 'ECONNRESET'
+    options.request.emit('error', error)
+    self.removeSocket(placeholder)
+  }
+}
+
+TunnelingAgent.prototype.removeSocket = function removeSocket(socket) {
+  var pos = this.sockets.indexOf(socket)
+  if (pos === -1) return
+
+  this.sockets.splice(pos, 1)
+
+  var pending = this.requests.shift()
+  if (pending) {
+    // If we have pending requests and a socket gets closed a new one
+    // needs to be created to take over in the pool for the one that closed.
+    this.createConnection(pending)
+  }
+}
+
+function createSecureSocket(options, cb) {
+  var self = this
+  TunnelingAgent.prototype.createSocket.call(self, options, function(socket) {
+    // 0 is dummy port for v0.6
+    var secureSocket = tls.connect(0, mergeOptions({}, self.options,
+      { servername: options.host
+      , socket: socket
+      }
+    ))
+    self.sockets[self.sockets.indexOf(socket)] = secureSocket
+    cb(secureSocket)
+  })
+}
+
+
+function mergeOptions(target) {
+  for (var i = 1, len = arguments.length; i < len; ++i) {
+    var overrides = arguments[i]
+    if (typeof overrides === 'object') {
+      var keys = Object.keys(overrides)
+      for (var j = 0, keyLen = keys.length; j < keyLen; ++j) {
+        var k = keys[j]
+        if (overrides[k] !== undefined) {
+          target[k] = overrides[k]
+        }
+      }
+    }
+  }
+  return target
+}
+
+
+var debug
+if (process.env.NODE_DEBUG && /\btunnel\b/.test(process.env.NODE_DEBUG)) {
+  debug = function() {
+    var args = Array.prototype.slice.call(arguments)
+    if (typeof args[0] === 'string') {
+      args[0] = 'TUNNEL: ' + args[0]
+    } else {
+      args.unshift('TUNNEL:')
+    }
+    console.error.apply(console, args)
+  }
+} else {
+  debug = function() {}
+}
+exports.debug = debug // for test
+
+
+/***/ }),
+/* 956 */
+/***/ (function(module, exports, __webpack_require__) {
+
+
+/**
+ * For Node.js, simply re-export the core `util.deprecate` function.
+ */
+
+module.exports = __webpack_require__(3).deprecate;
+
+
+/***/ }),
+/* 957 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var rng = __webpack_require__(464);
+var bytesToUuid = __webpack_require__(463);
+
+// **`v1()` - Generate time-based UUID**
+//
+// Inspired by https://github.com/LiosK/UUID.js
+// and http://docs.python.org/library/uuid.html
+
+var _nodeId;
+var _clockseq;
+
+// Previous uuid creation time
+var _lastMSecs = 0;
+var _lastNSecs = 0;
+
+// See https://github.com/broofa/node-uuid for API details
+function v1(options, buf, offset) {
+  var i = buf && offset || 0;
+  var b = buf || [];
+
+  options = options || {};
+  var node = options.node || _nodeId;
+  var clockseq = options.clockseq !== undefined ? options.clockseq : _clockseq;
+
+  // node and clockseq need to be initialized to random values if they're not
+  // specified.  We do this lazily to minimize issues related to insufficient
+  // system entropy.  See #189
+  if (node == null || clockseq == null) {
+    var seedBytes = rng();
+    if (node == null) {
+      // Per 4.5, create and 48-bit node id, (47 random bits + multicast bit = 1)
+      node = _nodeId = [
+        seedBytes[0] | 0x01,
+        seedBytes[1], seedBytes[2], seedBytes[3], seedBytes[4], seedBytes[5]
+      ];
+    }
+    if (clockseq == null) {
+      // Per 4.2.2, randomize (14 bit) clockseq
+      clockseq = _clockseq = (seedBytes[6] << 8 | seedBytes[7]) & 0x3fff;
+    }
+  }
+
+  // UUID timestamps are 100 nano-second units since the Gregorian epoch,
+  // (1582-10-15 00:00).  JSNumbers aren't precise enough for this, so
+  // time is handled internally as 'msecs' (integer milliseconds) and 'nsecs'
+  // (100-nanoseconds offset from msecs) since unix epoch, 1970-01-01 00:00.
+  var msecs = options.msecs !== undefined ? options.msecs : new Date().getTime();
+
+  // Per 4.2.1.2, use count of uuid's generated during the current clock
+  // cycle to simulate higher resolution clock
+  var nsecs = options.nsecs !== undefined ? options.nsecs : _lastNSecs + 1;
+
+  // Time since last uuid creation (in msecs)
+  var dt = (msecs - _lastMSecs) + (nsecs - _lastNSecs)/10000;
+
+  // Per 4.2.1.2, Bump clockseq on clock regression
+  if (dt < 0 && options.clockseq === undefined) {
+    clockseq = clockseq + 1 & 0x3fff;
+  }
+
+  // Reset nsecs if clock regresses (new clockseq) or we've moved onto a new
+  // time interval
+  if ((dt < 0 || msecs > _lastMSecs) && options.nsecs === undefined) {
+    nsecs = 0;
+  }
+
+  // Per 4.2.1.2 Throw error if too many uuids are requested
+  if (nsecs >= 10000) {
+    throw new Error('uuid.v1(): Can\'t create more than 10M uuids/sec');
+  }
+
+  _lastMSecs = msecs;
+  _lastNSecs = nsecs;
+  _clockseq = clockseq;
+
+  // Per 4.1.4 - Convert from unix epoch to Gregorian epoch
+  msecs += 12219292800000;
+
+  // `time_low`
+  var tl = ((msecs & 0xfffffff) * 10000 + nsecs) % 0x100000000;
+  b[i++] = tl >>> 24 & 0xff;
+  b[i++] = tl >>> 16 & 0xff;
+  b[i++] = tl >>> 8 & 0xff;
+  b[i++] = tl & 0xff;
+
+  // `time_mid`
+  var tmh = (msecs / 0x100000000 * 10000) & 0xfffffff;
+  b[i++] = tmh >>> 8 & 0xff;
+  b[i++] = tmh & 0xff;
+
+  // `time_high_and_version`
+  b[i++] = tmh >>> 24 & 0xf | 0x10; // include version
+  b[i++] = tmh >>> 16 & 0xff;
+
+  // `clock_seq_hi_and_reserved` (Per 4.2.2 - include variant)
+  b[i++] = clockseq >>> 8 | 0x80;
+
+  // `clock_seq_low`
+  b[i++] = clockseq & 0xff;
+
+  // `node`
+  for (var n = 0; n < 6; ++n) {
+    b[i + n] = node[n];
+  }
+
+  return buf ? buf : bytesToUuid(b);
+}
+
+module.exports = v1;
+
+
+/***/ }),
+/* 958 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var rng = __webpack_require__(464);
+var bytesToUuid = __webpack_require__(463);
+
+function v4(options, buf, offset) {
+  var i = buf && offset || 0;
+
+  if (typeof(options) == 'string') {
+    buf = options === 'binary' ? new Array(16) : null;
+    options = null;
+  }
+  options = options || {};
+
+  var rnds = options.random || (options.rng || rng)();
+
+  // Per 4.4, set bits for version and `clock_seq_hi_and_reserved`
+  rnds[6] = (rnds[6] & 0x0f) | 0x40;
+  rnds[8] = (rnds[8] & 0x3f) | 0x80;
+
+  // Copy bytes to buffer, if provided
+  if (buf) {
+    for (var ii = 0; ii < 16; ++ii) {
+      buf[i + ii] = rnds[ii];
+    }
+  }
+
+  return buf || bytesToUuid(rnds);
+}
+
+module.exports = v4;
+
+
+/***/ }),
+/* 959 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var parse = __webpack_require__(452);
+var correct = __webpack_require__(935);
+
+var genericWarning = (
+  'license should be ' +
+  'a valid SPDX license expression (without "LicenseRef"), ' +
+  '"UNLICENSED", or ' +
+  '"SEE LICENSE IN <filename>"'
+);
+
+var fileReferenceRE = /^SEE LICEN[CS]E IN (.+)$/;
+
+function startsWith(prefix, string) {
+  return string.slice(0, prefix.length) === prefix;
+}
+
+function usesLicenseRef(ast) {
+  if (ast.hasOwnProperty('license')) {
+    var license = ast.license;
+    return (
+      startsWith('LicenseRef', license) ||
+      startsWith('DocumentRef', license)
+    );
+  } else {
+    return (
+      usesLicenseRef(ast.left) ||
+      usesLicenseRef(ast.right)
+    );
+  }
+}
+
+module.exports = function(argument) {
+  var ast;
+
+  try {
+    ast = parse(argument);
+  } catch (e) {
+    var match
+    if (
+      argument === 'UNLICENSED' ||
+      argument === 'UNLICENCED'
+    ) {
+      return {
+        validForOldPackages: true,
+        validForNewPackages: true,
+        unlicensed: true
+      };
+    } else if (match = fileReferenceRE.exec(argument)) {
+      return {
+        validForOldPackages: true,
+        validForNewPackages: true,
+        inFile: match[1]
+      };
+    } else {
+      var result = {
+        validForOldPackages: false,
+        validForNewPackages: false,
+        warnings: [genericWarning]
+      };
+      if (argument.trim().length !== 0) {
+        var corrected = correct(argument);
+        if (corrected) {
+          result.warnings.push(
+            'license is similar to the valid expression "' + corrected + '"'
+          );
+        }
+      }
+      return result;
+    }
+  }
+
+  if (usesLicenseRef(ast)) {
+    return {
+      validForNewPackages: false,
+      validForOldPackages: false,
+      spdx: true,
+      warnings: [genericWarning]
+    };
+  } else {
+    return {
+      validForNewPackages: true,
+      validForOldPackages: true,
+      spdx: true
+    };
+  }
+};
+
+
+/***/ }),
+/* 960 */
+/***/ (function(module, exports, __webpack_require__) {
+
+/*
+ * verror.js: richer JavaScript errors
+ */
+
+var mod_assertplus = __webpack_require__(16);
+var mod_util = __webpack_require__(3);
+
+var mod_extsprintf = __webpack_require__(961);
+var mod_isError = __webpack_require__(113).isError;
+var sprintf = mod_extsprintf.sprintf;
+
+/*
+ * Public interface
+ */
+
+/* So you can 'var VError = require('verror')' */
+module.exports = VError;
+/* For compatibility */
+VError.VError = VError;
+/* Other exported classes */
+VError.SError = SError;
+VError.WError = WError;
+VError.MultiError = MultiError;
+
+/*
+ * Common function used to parse constructor arguments for VError, WError, and
+ * SError.  Named arguments to this function:
+ *
+ *     strict		force strict interpretation of sprintf arguments, even
+ *     			if the options in "argv" don't say so
+ *
+ *     argv		error's constructor arguments, which are to be
+ *     			interpreted as described in README.md.  For quick
+ *     			reference, "argv" has one of the following forms:
+ *
+ *          [ sprintf_args... ]           (argv[0] is a string)
+ *          [ cause, sprintf_args... ]    (argv[0] is an Error)
+ *          [ options, sprintf_args... ]  (argv[0] is an object)
+ *
+ * This function normalizes these forms, producing an object with the following
+ * properties:
+ *
+ *    options           equivalent to "options" in third form.  This will never
+ *    			be a direct reference to what the caller passed in
+ *    			(i.e., it may be a shallow copy), so it can be freely
+ *    			modified.
+ *
+ *    shortmessage      result of sprintf(sprintf_args), taking options.strict
+ *    			into account as described in README.md.
+ */
+function parseConstructorArguments(args)
+{
+	var argv, options, sprintf_args, shortmessage, k;
+
+	mod_assertplus.object(args, 'args');
+	mod_assertplus.bool(args.strict, 'args.strict');
+	mod_assertplus.array(args.argv, 'args.argv');
+	argv = args.argv;
+
+	/*
+	 * First, figure out which form of invocation we've been given.
+	 */
+	if (argv.length === 0) {
+		options = {};
+		sprintf_args = [];
+	} else if (mod_isError(argv[0])) {
+		options = { 'cause': argv[0] };
+		sprintf_args = argv.slice(1);
+	} else if (typeof (argv[0]) === 'object') {
+		options = {};
+		for (k in argv[0]) {
+			options[k] = argv[0][k];
+		}
+		sprintf_args = argv.slice(1);
+	} else {
+		mod_assertplus.string(argv[0],
+		    'first argument to VError, SError, or WError ' +
+		    'constructor must be a string, object, or Error');
+		options = {};
+		sprintf_args = argv;
+	}
+
+	/*
+	 * Now construct the error's message.
+	 *
+	 * extsprintf (which we invoke here with our caller's arguments in order
+	 * to construct this Error's message) is strict in its interpretation of
+	 * values to be processed by the "%s" specifier.  The value passed to
+	 * extsprintf must actually be a string or something convertible to a
+	 * String using .toString().  Passing other values (notably "null" and
+	 * "undefined") is considered a programmer error.  The assumption is
+	 * that if you actually want to print the string "null" or "undefined",
+	 * then that's easy to do that when you're calling extsprintf; on the
+	 * other hand, if you did NOT want that (i.e., there's actually a bug
+	 * where the program assumes some variable is non-null and tries to
+	 * print it, which might happen when constructing a packet or file in
+	 * some specific format), then it's better to stop immediately than
+	 * produce bogus output.
+	 *
+	 * However, sometimes the bug is only in the code calling VError, and a
+	 * programmer might prefer to have the error message contain "null" or
+	 * "undefined" rather than have the bug in the error path crash the
+	 * program (making the first bug harder to identify).  For that reason,
+	 * by default VError converts "null" or "undefined" arguments to their
+	 * string representations and passes those to extsprintf.  Programmers
+	 * desiring the strict behavior can use the SError class or pass the
+	 * "strict" option to the VError constructor.
+	 */
+	mod_assertplus.object(options);
+	if (!options.strict && !args.strict) {
+		sprintf_args = sprintf_args.map(function (a) {
+			return (a === null ? 'null' :
+			    a === undefined ? 'undefined' : a);
+		});
+	}
+
+	if (sprintf_args.length === 0) {
+		shortmessage = '';
+	} else {
+		shortmessage = sprintf.apply(null, sprintf_args);
+	}
+
+	return ({
+	    'options': options,
+	    'shortmessage': shortmessage
+	});
+}
+
+/*
+ * See README.md for reference documentation.
+ */
+function VError()
+{
+	var args, obj, parsed, cause, ctor, message, k;
+
+	args = Array.prototype.slice.call(arguments, 0);
+
+	/*
+	 * This is a regrettable pattern, but JavaScript's built-in Error class
+	 * is defined to work this way, so we allow the constructor to be called
+	 * without "new".
+	 */
+	if (!(this instanceof VError)) {
+		obj = Object.create(VError.prototype);
+		VError.apply(obj, arguments);
+		return (obj);
+	}
+
+	/*
+	 * For convenience and backwards compatibility, we support several
+	 * different calling forms.  Normalize them here.
+	 */
+	parsed = parseConstructorArguments({
+	    'argv': args,
+	    'strict': false
+	});
+
+	/*
+	 * If we've been given a name, apply it now.
+	 */
+	if (parsed.options.name) {
+		mod_assertplus.string(parsed.options.name,
+		    'error\'s "name" must be a string');
+		this.name = parsed.options.name;
+	}
+
+	/*
+	 * For debugging, we keep track of the original short message (attached
+	 * this Error particularly) separately from the complete message (which
+	 * includes the messages of our cause chain).
+	 */
+	this.jse_shortmsg = parsed.shortmessage;
+	message = parsed.shortmessage;
+
+	/*
+	 * If we've been given a cause, record a reference to it and update our
+	 * message appropriately.
+	 */
+	cause = parsed.options.cause;
+	if (cause) {
+		mod_assertplus.ok(mod_isError(cause), 'cause is not an Error');
+		this.jse_cause = cause;
+
+		if (!parsed.options.skipCauseMessage) {
+			message += ': ' + cause.message;
+		}
+	}
+
+	/*
+	 * If we've been given an object with properties, shallow-copy that
+	 * here.  We don't want to use a deep copy in case there are non-plain
+	 * objects here, but we don't want to use the original object in case
+	 * the caller modifies it later.
+	 */
+	this.jse_info = {};
+	if (parsed.options.info) {
+		for (k in parsed.options.info) {
+			this.jse_info[k] = parsed.options.info[k];
+		}
+	}
+
+	this.message = message;
+	Error.call(this, message);
+
+	if (Error.captureStackTrace) {
+		ctor = parsed.options.constructorOpt || this.constructor;
+		Error.captureStackTrace(this, ctor);
+	}
+
+	return (this);
+}
+
+mod_util.inherits(VError, Error);
+VError.prototype.name = 'VError';
+
+VError.prototype.toString = function ve_toString()
+{
+	var str = (this.hasOwnProperty('name') && this.name ||
+		this.constructor.name || this.constructor.prototype.name);
+	if (this.message)
+		str += ': ' + this.message;
+
+	return (str);
+};
+
+/*
+ * This method is provided for compatibility.  New callers should use
+ * VError.cause() instead.  That method also uses the saner `null` return value
+ * when there is no cause.
+ */
+VError.prototype.cause = function ve_cause()
+{
+	var cause = VError.cause(this);
+	return (cause === null ? undefined : cause);
+};
+
+/*
+ * Static methods
+ *
+ * These class-level methods are provided so that callers can use them on
+ * instances of Errors that are not VErrors.  New interfaces should be provided
+ * only using static methods to eliminate the class of programming mistake where
+ * people fail to check whether the Error object has the corresponding methods.
+ */
+
+VError.cause = function (err)
+{
+	mod_assertplus.ok(mod_isError(err), 'err must be an Error');
+	return (mod_isError(err.jse_cause) ? err.jse_cause : null);
+};
+
+VError.info = function (err)
+{
+	var rv, cause, k;
+
+	mod_assertplus.ok(mod_isError(err), 'err must be an Error');
+	cause = VError.cause(err);
+	if (cause !== null) {
+		rv = VError.info(cause);
+	} else {
+		rv = {};
+	}
+
+	if (typeof (err.jse_info) == 'object' && err.jse_info !== null) {
+		for (k in err.jse_info) {
+			rv[k] = err.jse_info[k];
+		}
+	}
+
+	return (rv);
+};
+
+VError.findCauseByName = function (err, name)
+{
+	var cause;
+
+	mod_assertplus.ok(mod_isError(err), 'err must be an Error');
+	mod_assertplus.string(name, 'name');
+	mod_assertplus.ok(name.length > 0, 'name cannot be empty');
+
+	for (cause = err; cause !== null; cause = VError.cause(cause)) {
+		mod_assertplus.ok(mod_isError(cause));
+		if (cause.name == name) {
+			return (cause);
+		}
+	}
+
+	return (null);
+};
+
+VError.hasCauseWithName = function (err, name)
+{
+	return (VError.findCauseByName(err, name) !== null);
+};
+
+VError.fullStack = function (err)
+{
+	mod_assertplus.ok(mod_isError(err), 'err must be an Error');
+
+	var cause = VError.cause(err);
+
+	if (cause) {
+		return (err.stack + '\ncaused by: ' + VError.fullStack(cause));
+	}
+
+	return (err.stack);
+};
+
+VError.errorFromList = function (errors)
+{
+	mod_assertplus.arrayOfObject(errors, 'errors');
+
+	if (errors.length === 0) {
+		return (null);
+	}
+
+	errors.forEach(function (e) {
+		mod_assertplus.ok(mod_isError(e));
+	});
+
+	if (errors.length == 1) {
+		return (errors[0]);
+	}
+
+	return (new MultiError(errors));
+};
+
+VError.errorForEach = function (err, func)
+{
+	mod_assertplus.ok(mod_isError(err), 'err must be an Error');
+	mod_assertplus.func(func, 'func');
+
+	if (err instanceof MultiError) {
+		err.errors().forEach(function iterError(e) { func(e); });
+	} else {
+		func(err);
+	}
+};
+
+
+/*
+ * SError is like VError, but stricter about types.  You cannot pass "null" or
+ * "undefined" as string arguments to the formatter.
+ */
+function SError()
+{
+	var args, obj, parsed, options;
+
+	args = Array.prototype.slice.call(arguments, 0);
+	if (!(this instanceof SError)) {
+		obj = Object.create(SError.prototype);
+		SError.apply(obj, arguments);
+		return (obj);
+	}
+
+	parsed = parseConstructorArguments({
+	    'argv': args,
+	    'strict': true
+	});
+
+	options = parsed.options;
+	VError.call(this, options, '%s', parsed.shortmessage);
+
+	return (this);
+}
+
+/*
+ * We don't bother setting SError.prototype.name because once constructed,
+ * SErrors are just like VErrors.
+ */
+mod_util.inherits(SError, VError);
+
+
+/*
+ * Represents a collection of errors for the purpose of consumers that generally
+ * only deal with one error.  Callers can extract the individual errors
+ * contained in this object, but may also just treat it as a normal single
+ * error, in which case a summary message will be printed.
+ */
+function MultiError(errors)
+{
+	mod_assertplus.array(errors, 'list of errors');
+	mod_assertplus.ok(errors.length > 0, 'must be at least one error');
+	this.ase_errors = errors;
+
+	VError.call(this, {
+	    'cause': errors[0]
+	}, 'first of %d error%s', errors.length, errors.length == 1 ? '' : 's');
+}
+
+mod_util.inherits(MultiError, VError);
+MultiError.prototype.name = 'MultiError';
+
+MultiError.prototype.errors = function me_errors()
+{
+	return (this.ase_errors.slice(0));
+};
+
+
+/*
+ * See README.md for reference details.
+ */
+function WError()
+{
+	var args, obj, parsed, options;
+
+	args = Array.prototype.slice.call(arguments, 0);
+	if (!(this instanceof WError)) {
+		obj = Object.create(WError.prototype);
+		WError.apply(obj, args);
+		return (obj);
+	}
+
+	parsed = parseConstructorArguments({
+	    'argv': args,
+	    'strict': false
+	});
+
+	options = parsed.options;
+	options['skipCauseMessage'] = true;
+	VError.call(this, options, '%s', parsed.shortmessage);
+
+	return (this);
+}
+
+mod_util.inherits(WError, VError);
+WError.prototype.name = 'WError';
+
+WError.prototype.toString = function we_toString()
+{
+	var str = (this.hasOwnProperty('name') && this.name ||
+		this.constructor.name || this.constructor.prototype.name);
+	if (this.message)
+		str += ': ' + this.message;
+	if (this.jse_cause && this.jse_cause.message)
+		str += '; caused by ' + this.jse_cause.toString();
+
+	return (str);
+};
+
+/*
+ * For purely historical reasons, WError's cause() function allows you to set
+ * the cause.
+ */
+WError.prototype.cause = function we_cause(c)
+{
+	if (mod_isError(c))
+		this.jse_cause = c;
+
+	return (this.jse_cause);
+};
+
+
+/***/ }),
+/* 961 */
+/***/ (function(module, exports, __webpack_require__) {
+
+/*
+ * extsprintf.js: extended POSIX-style sprintf
+ */
+
+var mod_assert = __webpack_require__(28);
+var mod_util = __webpack_require__(3);
+
+/*
+ * Public interface
+ */
+exports.sprintf = jsSprintf;
+exports.printf = jsPrintf;
+exports.fprintf = jsFprintf;
+
+/*
+ * Stripped down version of s[n]printf(3c).  We make a best effort to throw an
+ * exception when given a format string we don't understand, rather than
+ * ignoring it, so that we won't break existing programs if/when we go implement
+ * the rest of this.
+ *
+ * This implementation currently supports specifying
+ *	- field alignment ('-' flag),
+ * 	- zero-pad ('0' flag)
+ *	- always show numeric sign ('+' flag),
+ *	- field width
+ *	- conversions for strings, decimal integers, and floats (numbers).
+ *	- argument size specifiers.  These are all accepted but ignored, since
+ *	  Javascript has no notion of the physical size of an argument.
+ *
+ * Everything else is currently unsupported, most notably precision, unsigned
+ * numbers, non-decimal numbers, and characters.
+ */
+function jsSprintf(ofmt)
+{
+	var regex = [
+	    '([^%]*)',				/* normal text */
+	    '%',				/* start of format */
+	    '([\'\\-+ #0]*?)',			/* flags (optional) */
+	    '([1-9]\\d*)?',			/* width (optional) */
+	    '(\\.([1-9]\\d*))?',		/* precision (optional) */
+	    '[lhjztL]*?',			/* length mods (ignored) */
+	    '([diouxXfFeEgGaAcCsSp%jr])'	/* conversion */
+	].join('');
+
+	var re = new RegExp(regex);
+
+	/* variadic arguments used to fill in conversion specifiers */
+	var args = Array.prototype.slice.call(arguments, 1);
+	/* remaining format string */
+	var fmt = ofmt;
+
+	/* components of the current conversion specifier */
+	var flags, width, precision, conversion;
+	var left, pad, sign, arg, match;
+
+	/* return value */
+	var ret = '';
+
+	/* current variadic argument (1-based) */
+	var argn = 1;
+	/* 0-based position in the format string that we've read */
+	var posn = 0;
+	/* 1-based position in the format string of the current conversion */
+	var convposn;
+	/* current conversion specifier */
+	var curconv;
+
+	mod_assert.equal('string', typeof (fmt),
+	    'first argument must be a format string');
+
+	while ((match = re.exec(fmt)) !== null) {
+		ret += match[1];
+		fmt = fmt.substring(match[0].length);
+
+		/*
+		 * Update flags related to the current conversion specifier's
+		 * position so that we can report clear error messages.
+		 */
+		curconv = match[0].substring(match[1].length);
+		convposn = posn + match[1].length + 1;
+		posn += match[0].length;
+
+		flags = match[2] || '';
+		width = match[3] || 0;
+		precision = match[4] || '';
+		conversion = match[6];
+		left = false;
+		sign = false;
+		pad = ' ';
+
+		if (conversion == '%') {
+			ret += '%';
+			continue;
+		}
+
+		if (args.length === 0) {
+			throw (jsError(ofmt, convposn, curconv,
+			    'has no matching argument ' +
+			    '(too few arguments passed)'));
+		}
+
+		arg = args.shift();
+		argn++;
+
+		if (flags.match(/[\' #]/)) {
+			throw (jsError(ofmt, convposn, curconv,
+			    'uses unsupported flags'));
+		}
+
+		if (precision.length > 0) {
+			throw (jsError(ofmt, convposn, curconv,
+			    'uses non-zero precision (not supported)'));
+		}
+
+		if (flags.match(/-/))
+			left = true;
+
+		if (flags.match(/0/))
+			pad = '0';
+
+		if (flags.match(/\+/))
+			sign = true;
+
+		switch (conversion) {
+		case 's':
+			if (arg === undefined || arg === null) {
+				throw (jsError(ofmt, convposn, curconv,
+				    'attempted to print undefined or null ' +
+				    'as a string (argument ' + argn + ' to ' +
+				    'sprintf)'));
+			}
+			ret += doPad(pad, width, left, arg.toString());
+			break;
+
+		case 'd':
+			arg = Math.floor(arg);
+			/*jsl:fallthru*/
+		case 'f':
+			sign = sign && arg > 0 ? '+' : '';
+			ret += sign + doPad(pad, width, left,
+			    arg.toString());
+			break;
+
+		case 'x':
+			ret += doPad(pad, width, left, arg.toString(16));
+			break;
+
+		case 'j': /* non-standard */
+			if (width === 0)
+				width = 10;
+			ret += mod_util.inspect(arg, false, width);
+			break;
+
+		case 'r': /* non-standard */
+			ret += dumpException(arg);
+			break;
+
+		default:
+			throw (jsError(ofmt, convposn, curconv,
+			    'is not supported'));
+		}
+	}
+
+	ret += fmt;
+	return (ret);
+}
+
+function jsError(fmtstr, convposn, curconv, reason) {
+	mod_assert.equal(typeof (fmtstr), 'string');
+	mod_assert.equal(typeof (curconv), 'string');
+	mod_assert.equal(typeof (convposn), 'number');
+	mod_assert.equal(typeof (reason), 'string');
+	return (new Error('format string "' + fmtstr +
+	    '": conversion specifier "' + curconv + '" at character ' +
+	    convposn + ' ' + reason));
+}
+
+function jsPrintf() {
+	var args = Array.prototype.slice.call(arguments);
+	args.unshift(process.stdout);
+	jsFprintf.apply(null, args);
+}
+
+function jsFprintf(stream) {
+	var args = Array.prototype.slice.call(arguments, 1);
+	return (stream.write(jsSprintf.apply(this, args)));
+}
+
+function doPad(chr, width, left, str)
+{
+	var ret = str;
+
+	while (ret.length < width) {
+		if (left)
+			ret += chr;
+		else
+			ret = chr + ret;
+	}
+
+	return (ret);
+}
+
+/*
+ * This function dumps long stack traces for exceptions having a cause() method.
+ * See node-verror for an example.
+ */
+function dumpException(ex)
+{
+	var ret;
+
+	if (!(ex instanceof Error))
+		throw (new Error(jsSprintf('invalid type for %%r: %j', ex)));
+
+	/* Note that V8 prepends "ex.stack" with ex.toString(). */
+	ret = 'EXCEPTION: ' + ex.constructor.name + ': ' + ex.stack;
+
+	if (ex.cause && typeof (ex.cause) === 'function') {
+		var cex = ex.cause();
+		if (cex) {
+			ret += '\nCaused by: ' + dumpException(cex);
+		}
+	}
+
+	return (ret);
+}
+
+
+/***/ }),
+/* 962 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+const lenient = __webpack_require__(963);
+
+module.exports = (val, opts) => {
+	val = String(val).trim();
+	opts = Object.assign({
+		lenient: false,
+		default: null
+	}, opts);
+
+	if (opts.default !== null && typeof opts.default !== 'boolean') {
+		throw new TypeError(`Expected the \`default\` option to be of type \`boolean\`, got \`${typeof opts.default}\``);
+	}
+
+	if (/^(?:y|yes|true|1)$/i.test(val)) {
+		return true;
+	}
+
+	if (/^(?:n|no|false|0)$/i.test(val)) {
+		return false;
+	}
+
+	if (opts.lenient === true) {
+		return lenient(val, opts);
+	}
+
+	return opts.default;
+};
+
+
+/***/ }),
+/* 963 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+const YES_MATCH_SCORE_THRESHOLD = 2;
+const NO_MATCH_SCORE_THRESHOLD = 1.25;
+
+const yMatch = new Map([
+	[5, 0.25],
+	[6, 0.25],
+	[7, 0.25],
+	['t', 0.75],
+	['y', 1],
+	['u', 0.75],
+	['g', 0.25],
+	['h', 0.25],
+	['k', 0.25]
+]);
+
+const eMatch = new Map([
+	[2, 0.25],
+	[3, 0.25],
+	[4, 0.25],
+	['w', 0.75],
+	['e', 1],
+	['r', 0.75],
+	['s', 0.25],
+	['d', 0.25],
+	['f', 0.25]
+]);
+
+const sMatch = new Map([
+	['q', 0.25],
+	['w', 0.25],
+	['e', 0.25],
+	['a', 0.75],
+	['s', 1],
+	['d', 0.75],
+	['z', 0.25],
+	['x', 0.25],
+	['c', 0.25]
+]);
+
+const nMatch = new Map([
+	['h', 0.25],
+	['j', 0.25],
+	['k', 0.25],
+	['b', 0.75],
+	['n', 1],
+	['m', 0.75]
+]);
+
+const oMatch = new Map([
+	[9, 0.25],
+	[0, 0.25],
+	['i', 0.75],
+	['o', 1],
+	['p', 0.75],
+	['k', 0.25],
+	['l', 0.25]
+]);
+
+function getYesMatchScore(val) {
+	let score = 0;
+	const y = val[0];
+	const e = val[1];
+	const s = val[2];
+
+	if (yMatch.has(y)) {
+		score += yMatch.get(y);
+	}
+
+	if (eMatch.has(e)) {
+		score += eMatch.get(e);
+	}
+
+	if (sMatch.has(s)) {
+		score += sMatch.get(s);
+	}
+
+	return score;
+}
+
+function getNoMatchScore(val) {
+	let score = 0;
+	const n = val[0];
+	const o = val[1];
+
+	if (nMatch.has(n)) {
+		score += nMatch.get(n);
+	}
+
+	if (oMatch.has(o)) {
+		score += oMatch.get(o);
+	}
+
+	return score;
+}
+
+module.exports = (val, opts) => {
+	if (getYesMatchScore(val) >= YES_MATCH_SCORE_THRESHOLD) {
+		return true;
+	}
+
+	if (getNoMatchScore(val) >= NO_MATCH_SCORE_THRESHOLD) {
+		return false;
+	}
+
+	return opts.default;
+};
+
+
+/***/ }),
+/* 964 */
+/***/ (function(module, exports) {
+
+module.exports = require("dns");
+
+/***/ }),
+/* 965 */
+/***/ (function(module, exports) {
+
+module.exports = require("domain");
+
+/***/ })
+/******/ ]);
\ No newline at end of file
diff --git a/ui/.yarn/releases/yarn-3.5.0.cjs b/ui/.yarn/releases/yarn-3.5.0.cjs
deleted file mode 100755
index 093e64a9fe469..0000000000000
--- a/ui/.yarn/releases/yarn-3.5.0.cjs
+++ /dev/null
@@ -1,873 +0,0 @@
-#!/usr/bin/env node
-/* eslint-disable */
-//prettier-ignore
-(()=>{var Qge=Object.create;var AS=Object.defineProperty;var bge=Object.getOwnPropertyDescriptor;var Sge=Object.getOwnPropertyNames;var vge=Object.getPrototypeOf,xge=Object.prototype.hasOwnProperty;var J=(r=>typeof require<"u"?require:typeof Proxy<"u"?new Proxy(r,{get:(e,t)=>(typeof require<"u"?require:e)[t]}):r)(function(r){if(typeof require<"u")return require.apply(this,arguments);throw new Error('Dynamic require of "'+r+'" is not supported')});var Pge=(r,e)=>()=>(r&&(e=r(r=0)),e);var w=(r,e)=>()=>(e||r((e={exports:{}}).exports,e),e.exports),ut=(r,e)=>{for(var t in e)AS(r,t,{get:e[t],enumerable:!0})},Dge=(r,e,t,i)=>{if(e&&typeof e=="object"||typeof e=="function")for(let n of Sge(e))!xge.call(r,n)&&n!==t&&AS(r,n,{get:()=>e[n],enumerable:!(i=bge(e,n))||i.enumerable});return r};var Pe=(r,e,t)=>(t=r!=null?Qge(vge(r)):{},Dge(e||!r||!r.__esModule?AS(t,"default",{value:r,enumerable:!0}):t,r));var QK=w((GXe,BK)=>{BK.exports=wK;wK.sync=Zge;var IK=J("fs");function Xge(r,e){var t=e.pathExt!==void 0?e.pathExt:process.env.PATHEXT;if(!t||(t=t.split(";"),t.indexOf("")!==-1))return!0;for(var i=0;i<t.length;i++){var n=t[i].toLowerCase();if(n&&r.substr(-n.length).toLowerCase()===n)return!0}return!1}function yK(r,e,t){return!r.isSymbolicLink()&&!r.isFile()?!1:Xge(e,t)}function wK(r,e,t){IK.stat(r,function(i,n){t(i,i?!1:yK(n,r,e))})}function Zge(r,e){return yK(IK.statSync(r),r,e)}});var PK=w((YXe,xK)=>{xK.exports=SK;SK.sync=_ge;var bK=J("fs");function SK(r,e,t){bK.stat(r,function(i,n){t(i,i?!1:vK(n,e))})}function _ge(r,e){return vK(bK.statSync(r),e)}function vK(r,e){return r.isFile()&&$ge(r,e)}function $ge(r,e){var t=r.mode,i=r.uid,n=r.gid,s=e.uid!==void 0?e.uid:process.getuid&&process.getuid(),o=e.gid!==void 0?e.gid:process.getgid&&process.getgid(),a=parseInt("100",8),l=parseInt("010",8),c=parseInt("001",8),u=a|l,g=t&c||t&l&&n===o||t&a&&i===s||t&u&&s===0;return g}});var kK=w((qXe,DK)=>{var jXe=J("fs"),sI;process.platform==="win32"||global.TESTING_WINDOWS?sI=QK():sI=PK();DK.exports=SS;SS.sync=efe;function SS(r,e,t){if(typeof e=="function"&&(t=e,e={}),!t){if(typeof Promise!="function")throw new TypeError("callback not provided");return new Promise(function(i,n){SS(r,e||{},function(s,o){s?n(s):i(o)})})}sI(r,e||{},function(i,n){i&&(i.code==="EACCES"||e&&e.ignoreErrors)&&(i=null,n=!1),t(i,n)})}function efe(r,e){try{return sI.sync(r,e||{})}catch(t){if(e&&e.ignoreErrors||t.code==="EACCES")return!1;throw t}}});var MK=w((JXe,OK)=>{var vg=process.platform==="win32"||process.env.OSTYPE==="cygwin"||process.env.OSTYPE==="msys",RK=J("path"),tfe=vg?";":":",FK=kK(),NK=r=>Object.assign(new Error(`not found: ${r}`),{code:"ENOENT"}),LK=(r,e)=>{let t=e.colon||tfe,i=r.match(/\//)||vg&&r.match(/\\/)?[""]:[...vg?[process.cwd()]:[],...(e.path||process.env.PATH||"").split(t)],n=vg?e.pathExt||process.env.PATHEXT||".EXE;.CMD;.BAT;.COM":"",s=vg?n.split(t):[""];return vg&&r.indexOf(".")!==-1&&s[0]!==""&&s.unshift(""),{pathEnv:i,pathExt:s,pathExtExe:n}},TK=(r,e,t)=>{typeof e=="function"&&(t=e,e={}),e||(e={});let{pathEnv:i,pathExt:n,pathExtExe:s}=LK(r,e),o=[],a=c=>new Promise((u,g)=>{if(c===i.length)return e.all&&o.length?u(o):g(NK(r));let f=i[c],h=/^".*"$/.test(f)?f.slice(1,-1):f,p=RK.join(h,r),C=!h&&/^\.[\\\/]/.test(r)?r.slice(0,2)+p:p;u(l(C,c,0))}),l=(c,u,g)=>new Promise((f,h)=>{if(g===n.length)return f(a(u+1));let p=n[g];FK(c+p,{pathExt:s},(C,y)=>{if(!C&&y)if(e.all)o.push(c+p);else return f(c+p);return f(l(c,u,g+1))})});return t?a(0).then(c=>t(null,c),t):a(0)},rfe=(r,e)=>{e=e||{};let{pathEnv:t,pathExt:i,pathExtExe:n}=LK(r,e),s=[];for(let o=0;o<t.length;o++){let a=t[o],l=/^".*"$/.test(a)?a.slice(1,-1):a,c=RK.join(l,r),u=!l&&/^\.[\\\/]/.test(r)?r.slice(0,2)+c:c;for(let g=0;g<i.length;g++){let f=u+i[g];try{if(FK.sync(f,{pathExt:n}))if(e.all)s.push(f);else return f}catch{}}}if(e.all&&s.length)return s;if(e.nothrow)return null;throw NK(r)};OK.exports=TK;TK.sync=rfe});var UK=w((WXe,vS)=>{"use strict";var KK=(r={})=>{let e=r.env||process.env;return(r.platform||process.platform)!=="win32"?"PATH":Object.keys(e).reverse().find(i=>i.toUpperCase()==="PATH")||"Path"};vS.exports=KK;vS.exports.default=KK});var jK=w((zXe,YK)=>{"use strict";var HK=J("path"),ife=MK(),nfe=UK();function GK(r,e){let t=r.options.env||process.env,i=process.cwd(),n=r.options.cwd!=null,s=n&&process.chdir!==void 0&&!process.chdir.disabled;if(s)try{process.chdir(r.options.cwd)}catch{}let o;try{o=ife.sync(r.command,{path:t[nfe({env:t})],pathExt:e?HK.delimiter:void 0})}catch{}finally{s&&process.chdir(i)}return o&&(o=HK.resolve(n?r.options.cwd:"",o)),o}function sfe(r){return GK(r)||GK(r,!0)}YK.exports=sfe});var qK=w((VXe,PS)=>{"use strict";var xS=/([()\][%!^"`<>&|;, *?])/g;function ofe(r){return r=r.replace(xS,"^$1"),r}function afe(r,e){return r=`${r}`,r=r.replace(/(\\*)"/g,'$1$1\\"'),r=r.replace(/(\\*)$/,"$1$1"),r=`"${r}"`,r=r.replace(xS,"^$1"),e&&(r=r.replace(xS,"^$1")),r}PS.exports.command=ofe;PS.exports.argument=afe});var WK=w((XXe,JK)=>{"use strict";JK.exports=/^#!(.*)/});var VK=w((ZXe,zK)=>{"use strict";var Afe=WK();zK.exports=(r="")=>{let e=r.match(Afe);if(!e)return null;let[t,i]=e[0].replace(/#! ?/,"").split(" "),n=t.split("/").pop();return n==="env"?i:i?`${n} ${i}`:n}});var ZK=w((_Xe,XK)=>{"use strict";var DS=J("fs"),lfe=VK();function cfe(r){let t=Buffer.alloc(150),i;try{i=DS.openSync(r,"r"),DS.readSync(i,t,0,150,0),DS.closeSync(i)}catch{}return lfe(t.toString())}XK.exports=cfe});var tU=w(($Xe,eU)=>{"use strict";var ufe=J("path"),_K=jK(),$K=qK(),gfe=ZK(),ffe=process.platform==="win32",hfe=/\.(?:com|exe)$/i,pfe=/node_modules[\\/].bin[\\/][^\\/]+\.cmd$/i;function dfe(r){r.file=_K(r);let e=r.file&&gfe(r.file);return e?(r.args.unshift(r.file),r.command=e,_K(r)):r.file}function Cfe(r){if(!ffe)return r;let e=dfe(r),t=!hfe.test(e);if(r.options.forceShell||t){let i=pfe.test(e);r.command=ufe.normalize(r.command),r.command=$K.command(r.command),r.args=r.args.map(s=>$K.argument(s,i));let n=[r.command].concat(r.args).join(" ");r.args=["/d","/s","/c",`"${n}"`],r.command=process.env.comspec||"cmd.exe",r.options.windowsVerbatimArguments=!0}return r}function mfe(r,e,t){e&&!Array.isArray(e)&&(t=e,e=null),e=e?e.slice(0):[],t=Object.assign({},t);let i={command:r,args:e,options:t,file:void 0,original:{command:r,args:e}};return t.shell?i:Cfe(i)}eU.exports=mfe});var nU=w((eZe,iU)=>{"use strict";var kS=process.platform==="win32";function RS(r,e){return Object.assign(new Error(`${e} ${r.command} ENOENT`),{code:"ENOENT",errno:"ENOENT",syscall:`${e} ${r.command}`,path:r.command,spawnargs:r.args})}function Efe(r,e){if(!kS)return;let t=r.emit;r.emit=function(i,n){if(i==="exit"){let s=rU(n,e,"spawn");if(s)return t.call(r,"error",s)}return t.apply(r,arguments)}}function rU(r,e){return kS&&r===1&&!e.file?RS(e.original,"spawn"):null}function Ife(r,e){return kS&&r===1&&!e.file?RS(e.original,"spawnSync"):null}iU.exports={hookChildProcess:Efe,verifyENOENT:rU,verifyENOENTSync:Ife,notFoundError:RS}});var LS=w((tZe,xg)=>{"use strict";var sU=J("child_process"),FS=tU(),NS=nU();function oU(r,e,t){let i=FS(r,e,t),n=sU.spawn(i.command,i.args,i.options);return NS.hookChildProcess(n,i),n}function yfe(r,e,t){let i=FS(r,e,t),n=sU.spawnSync(i.command,i.args,i.options);return n.error=n.error||NS.verifyENOENTSync(n.status,i),n}xg.exports=oU;xg.exports.spawn=oU;xg.exports.sync=yfe;xg.exports._parse=FS;xg.exports._enoent=NS});var AU=w((rZe,aU)=>{"use strict";function wfe(r,e){function t(){this.constructor=r}t.prototype=e.prototype,r.prototype=new t}function Wl(r,e,t,i){this.message=r,this.expected=e,this.found=t,this.location=i,this.name="SyntaxError",typeof Error.captureStackTrace=="function"&&Error.captureStackTrace(this,Wl)}wfe(Wl,Error);Wl.buildMessage=function(r,e){var t={literal:function(c){return'"'+n(c.text)+'"'},class:function(c){var u="",g;for(g=0;g<c.parts.length;g++)u+=c.parts[g]instanceof Array?s(c.parts[g][0])+"-"+s(c.parts[g][1]):s(c.parts[g]);return"["+(c.inverted?"^":"")+u+"]"},any:function(c){return"any character"},end:function(c){return"end of input"},other:function(c){return c.description}};function i(c){return c.charCodeAt(0).toString(16).toUpperCase()}function n(c){return c.replace(/\\/g,"\\\\").replace(/"/g,'\\"').replace(/\0/g,"\\0").replace(/\t/g,"\\t").replace(/\n/g,"\\n").replace(/\r/g,"\\r").replace(/[\x00-\x0F]/g,function(u){return"\\x0"+i(u)}).replace(/[\x10-\x1F\x7F-\x9F]/g,function(u){return"\\x"+i(u)})}function s(c){return c.replace(/\\/g,"\\\\").replace(/\]/g,"\\]").replace(/\^/g,"\\^").replace(/-/g,"\\-").replace(/\0/g,"\\0").replace(/\t/g,"\\t").replace(/\n/g,"\\n").replace(/\r/g,"\\r").replace(/[\x00-\x0F]/g,function(u){return"\\x0"+i(u)}).replace(/[\x10-\x1F\x7F-\x9F]/g,function(u){return"\\x"+i(u)})}function o(c){return t[c.type](c)}function a(c){var u=new Array(c.length),g,f;for(g=0;g<c.length;g++)u[g]=o(c[g]);if(u.sort(),u.length>0){for(g=1,f=1;g<u.length;g++)u[g-1]!==u[g]&&(u[f]=u[g],f++);u.length=f}switch(u.length){case 1:return u[0];case 2:return u[0]+" or "+u[1];default:return u.slice(0,-1).join(", ")+", or "+u[u.length-1]}}function l(c){return c?'"'+n(c)+'"':"end of input"}return"Expected "+a(r)+" but "+l(e)+" found."};function Bfe(r,e){e=e!==void 0?e:{};var t={},i={Start:bA},n=bA,s=function(m){return m||[]},o=function(m,b,N){return[{command:m,type:b}].concat(N||[])},a=function(m,b){return[{command:m,type:b||";"}]},l=function(m){return m},c=";",u=me(";",!1),g="&",f=me("&",!1),h=function(m,b){return b?{chain:m,then:b}:{chain:m}},p=function(m,b){return{type:m,line:b}},C="&&",y=me("&&",!1),B="||",v=me("||",!1),D=function(m,b){return b?{...m,then:b}:m},L=function(m,b){return{type:m,chain:b}},H="|&",j=me("|&",!1),$="|",V=me("|",!1),W="=",_=me("=",!1),A=function(m,b){return{name:m,args:[b]}},ae=function(m){return{name:m,args:[]}},ge="(",re=me("(",!1),O=")",F=me(")",!1),ue=function(m,b){return{type:"subshell",subshell:m,args:b}},he="{",ke=me("{",!1),Fe="}",Ne=me("}",!1),oe=function(m,b){return{type:"group",group:m,args:b}},le=function(m,b){return{type:"command",args:b,envs:m}},we=function(m){return{type:"envs",envs:m}},fe=function(m){return m},Ae=function(m){return m},qe=/^[0-9]/,ne=Je([["0","9"]],!1,!1),Y=function(m,b,N){return{type:"redirection",subtype:b,fd:m!==null?parseInt(m):null,args:[N]}},pe=">>",ie=me(">>",!1),de=">&",_e=me(">&",!1),Pt=">",It=me(">",!1),Or="<<<",ii=me("<<<",!1),gi="<&",hr=me("<&",!1),fi="<",ni=me("<",!1),Os=function(m){return{type:"argument",segments:[].concat(...m)}},pr=function(m){return m},Ii="$'",es=me("$'",!1),ua="'",pA=me("'",!1),ag=function(m){return[{type:"text",text:m}]},ts='""',dA=me('""',!1),ga=function(){return{type:"text",text:""}},yp='"',CA=me('"',!1),mA=function(m){return m},wr=function(m){return{type:"arithmetic",arithmetic:m,quoted:!0}},kl=function(m){return{type:"shell",shell:m,quoted:!0}},Ag=function(m){return{type:"variable",...m,quoted:!0}},Io=function(m){return{type:"text",text:m}},lg=function(m){return{type:"arithmetic",arithmetic:m,quoted:!1}},wp=function(m){return{type:"shell",shell:m,quoted:!1}},Bp=function(m){return{type:"variable",...m,quoted:!1}},vr=function(m){return{type:"glob",pattern:m}},se=/^[^']/,yo=Je(["'"],!0,!1),kn=function(m){return m.join("")},cg=/^[^$"]/,Qt=Je(["$",'"'],!0,!1),Rl=`\\
-`,Rn=me(`\\
-`,!1),rs=function(){return""},is="\\",gt=me("\\",!1),wo=/^[\\$"`]/,At=Je(["\\","$",'"',"`"],!1,!1),an=function(m){return m},S="\\a",Tt=me("\\a",!1),ug=function(){return"a"},Fl="\\b",Qp=me("\\b",!1),bp=function(){return"\b"},Sp=/^[Ee]/,vp=Je(["E","e"],!1,!1),xp=function(){return"\x1B"},G="\\f",yt=me("\\f",!1),EA=function(){return"\f"},Ji="\\n",Nl=me("\\n",!1),Xe=function(){return`
-`},fa="\\r",gg=me("\\r",!1),FE=function(){return"\r"},Pp="\\t",NE=me("\\t",!1),ar=function(){return"	"},Fn="\\v",Ll=me("\\v",!1),Dp=function(){return"\v"},Ms=/^[\\'"?]/,ha=Je(["\\","'",'"',"?"],!1,!1),An=function(m){return String.fromCharCode(parseInt(m,16))},Te="\\x",fg=me("\\x",!1),Tl="\\u",Ks=me("\\u",!1),Ol="\\U",IA=me("\\U",!1),hg=function(m){return String.fromCodePoint(parseInt(m,16))},pg=/^[0-7]/,pa=Je([["0","7"]],!1,!1),da=/^[0-9a-fA-f]/,rt=Je([["0","9"],["a","f"],["A","f"]],!1,!1),Bo=nt(),yA="-",Ml=me("-",!1),Us="+",Kl=me("+",!1),LE=".",kp=me(".",!1),dg=function(m,b,N){return{type:"number",value:(m==="-"?-1:1)*parseFloat(b.join("")+"."+N.join(""))}},Rp=function(m,b){return{type:"number",value:(m==="-"?-1:1)*parseInt(b.join(""))}},TE=function(m){return{type:"variable",...m}},Ul=function(m){return{type:"variable",name:m}},OE=function(m){return m},Cg="*",wA=me("*",!1),Rr="/",ME=me("/",!1),Hs=function(m,b,N){return{type:b==="*"?"multiplication":"division",right:N}},Gs=function(m,b){return b.reduce((N,U)=>({left:N,...U}),m)},mg=function(m,b,N){return{type:b==="+"?"addition":"subtraction",right:N}},BA="$((",R=me("$((",!1),q="))",Ce=me("))",!1),Ke=function(m){return m},Re="$(",ze=me("$(",!1),dt=function(m){return m},Ft="${",Nn=me("${",!1),qb=":-",S1=me(":-",!1),v1=function(m,b){return{name:m,defaultValue:b}},Jb=":-}",x1=me(":-}",!1),P1=function(m){return{name:m,defaultValue:[]}},Wb=":+",D1=me(":+",!1),k1=function(m,b){return{name:m,alternativeValue:b}},zb=":+}",R1=me(":+}",!1),F1=function(m){return{name:m,alternativeValue:[]}},Vb=function(m){return{name:m}},N1="$",L1=me("$",!1),T1=function(m){return e.isGlobPattern(m)},O1=function(m){return m},Xb=/^[a-zA-Z0-9_]/,Zb=Je([["a","z"],["A","Z"],["0","9"],"_"],!1,!1),_b=function(){return T()},$b=/^[$@*?#a-zA-Z0-9_\-]/,eS=Je(["$","@","*","?","#",["a","z"],["A","Z"],["0","9"],"_","-"],!1,!1),M1=/^[(){}<>$|&; \t"']/,Eg=Je(["(",")","{","}","<",">","$","|","&",";"," ","	",'"',"'"],!1,!1),tS=/^[<>&; \t"']/,rS=Je(["<",">","&",";"," ","	",'"',"'"],!1,!1),KE=/^[ \t]/,UE=Je([" ","	"],!1,!1),Q=0,Me=0,QA=[{line:1,column:1}],d=0,E=[],I=0,k;if("startRule"in e){if(!(e.startRule in i))throw new Error(`Can't start parsing from rule "`+e.startRule+'".');n=i[e.startRule]}function T(){return r.substring(Me,Q)}function Z(){return Et(Me,Q)}function te(m,b){throw b=b!==void 0?b:Et(Me,Q),Ri([lt(m)],r.substring(Me,Q),b)}function Be(m,b){throw b=b!==void 0?b:Et(Me,Q),Ln(m,b)}function me(m,b){return{type:"literal",text:m,ignoreCase:b}}function Je(m,b,N){return{type:"class",parts:m,inverted:b,ignoreCase:N}}function nt(){return{type:"any"}}function wt(){return{type:"end"}}function lt(m){return{type:"other",description:m}}function it(m){var b=QA[m],N;if(b)return b;for(N=m-1;!QA[N];)N--;for(b=QA[N],b={line:b.line,column:b.column};N<m;)r.charCodeAt(N)===10?(b.line++,b.column=1):b.column++,N++;return QA[m]=b,b}function Et(m,b){var N=it(m),U=it(b);return{start:{offset:m,line:N.line,column:N.column},end:{offset:b,line:U.line,column:U.column}}}function Qe(m){Q<d||(Q>d&&(d=Q,E=[]),E.push(m))}function Ln(m,b){return new Wl(m,null,null,b)}function Ri(m,b,N){return new Wl(Wl.buildMessage(m,b),m,b,N)}function bA(){var m,b;return m=Q,b=Mr(),b===t&&(b=null),b!==t&&(Me=m,b=s(b)),m=b,m}function Mr(){var m,b,N,U,ce;if(m=Q,b=Kr(),b!==t){for(N=[],U=He();U!==t;)N.push(U),U=He();N!==t?(U=Ca(),U!==t?(ce=ns(),ce===t&&(ce=null),ce!==t?(Me=m,b=o(b,U,ce),m=b):(Q=m,m=t)):(Q=m,m=t)):(Q=m,m=t)}else Q=m,m=t;if(m===t)if(m=Q,b=Kr(),b!==t){for(N=[],U=He();U!==t;)N.push(U),U=He();N!==t?(U=Ca(),U===t&&(U=null),U!==t?(Me=m,b=a(b,U),m=b):(Q=m,m=t)):(Q=m,m=t)}else Q=m,m=t;return m}function ns(){var m,b,N,U,ce;for(m=Q,b=[],N=He();N!==t;)b.push(N),N=He();if(b!==t)if(N=Mr(),N!==t){for(U=[],ce=He();ce!==t;)U.push(ce),ce=He();U!==t?(Me=m,b=l(N),m=b):(Q=m,m=t)}else Q=m,m=t;else Q=m,m=t;return m}function Ca(){var m;return r.charCodeAt(Q)===59?(m=c,Q++):(m=t,I===0&&Qe(u)),m===t&&(r.charCodeAt(Q)===38?(m=g,Q++):(m=t,I===0&&Qe(f))),m}function Kr(){var m,b,N;return m=Q,b=K1(),b!==t?(N=age(),N===t&&(N=null),N!==t?(Me=m,b=h(b,N),m=b):(Q=m,m=t)):(Q=m,m=t),m}function age(){var m,b,N,U,ce,Se,ht;for(m=Q,b=[],N=He();N!==t;)b.push(N),N=He();if(b!==t)if(N=Age(),N!==t){for(U=[],ce=He();ce!==t;)U.push(ce),ce=He();if(U!==t)if(ce=Kr(),ce!==t){for(Se=[],ht=He();ht!==t;)Se.push(ht),ht=He();Se!==t?(Me=m,b=p(N,ce),m=b):(Q=m,m=t)}else Q=m,m=t;else Q=m,m=t}else Q=m,m=t;else Q=m,m=t;return m}function Age(){var m;return r.substr(Q,2)===C?(m=C,Q+=2):(m=t,I===0&&Qe(y)),m===t&&(r.substr(Q,2)===B?(m=B,Q+=2):(m=t,I===0&&Qe(v))),m}function K1(){var m,b,N;return m=Q,b=uge(),b!==t?(N=lge(),N===t&&(N=null),N!==t?(Me=m,b=D(b,N),m=b):(Q=m,m=t)):(Q=m,m=t),m}function lge(){var m,b,N,U,ce,Se,ht;for(m=Q,b=[],N=He();N!==t;)b.push(N),N=He();if(b!==t)if(N=cge(),N!==t){for(U=[],ce=He();ce!==t;)U.push(ce),ce=He();if(U!==t)if(ce=K1(),ce!==t){for(Se=[],ht=He();ht!==t;)Se.push(ht),ht=He();Se!==t?(Me=m,b=L(N,ce),m=b):(Q=m,m=t)}else Q=m,m=t;else Q=m,m=t}else Q=m,m=t;else Q=m,m=t;return m}function cge(){var m;return r.substr(Q,2)===H?(m=H,Q+=2):(m=t,I===0&&Qe(j)),m===t&&(r.charCodeAt(Q)===124?(m=$,Q++):(m=t,I===0&&Qe(V))),m}function HE(){var m,b,N,U,ce,Se;if(m=Q,b=Z1(),b!==t)if(r.charCodeAt(Q)===61?(N=W,Q++):(N=t,I===0&&Qe(_)),N!==t)if(U=G1(),U!==t){for(ce=[],Se=He();Se!==t;)ce.push(Se),Se=He();ce!==t?(Me=m,b=A(b,U),m=b):(Q=m,m=t)}else Q=m,m=t;else Q=m,m=t;else Q=m,m=t;if(m===t)if(m=Q,b=Z1(),b!==t)if(r.charCodeAt(Q)===61?(N=W,Q++):(N=t,I===0&&Qe(_)),N!==t){for(U=[],ce=He();ce!==t;)U.push(ce),ce=He();U!==t?(Me=m,b=ae(b),m=b):(Q=m,m=t)}else Q=m,m=t;else Q=m,m=t;return m}function uge(){var m,b,N,U,ce,Se,ht,Bt,Jr,hi,ss;for(m=Q,b=[],N=He();N!==t;)b.push(N),N=He();if(b!==t)if(r.charCodeAt(Q)===40?(N=ge,Q++):(N=t,I===0&&Qe(re)),N!==t){for(U=[],ce=He();ce!==t;)U.push(ce),ce=He();if(U!==t)if(ce=Mr(),ce!==t){for(Se=[],ht=He();ht!==t;)Se.push(ht),ht=He();if(Se!==t)if(r.charCodeAt(Q)===41?(ht=O,Q++):(ht=t,I===0&&Qe(F)),ht!==t){for(Bt=[],Jr=He();Jr!==t;)Bt.push(Jr),Jr=He();if(Bt!==t){for(Jr=[],hi=Fp();hi!==t;)Jr.push(hi),hi=Fp();if(Jr!==t){for(hi=[],ss=He();ss!==t;)hi.push(ss),ss=He();hi!==t?(Me=m,b=ue(ce,Jr),m=b):(Q=m,m=t)}else Q=m,m=t}else Q=m,m=t}else Q=m,m=t;else Q=m,m=t}else Q=m,m=t;else Q=m,m=t}else Q=m,m=t;else Q=m,m=t;if(m===t){for(m=Q,b=[],N=He();N!==t;)b.push(N),N=He();if(b!==t)if(r.charCodeAt(Q)===123?(N=he,Q++):(N=t,I===0&&Qe(ke)),N!==t){for(U=[],ce=He();ce!==t;)U.push(ce),ce=He();if(U!==t)if(ce=Mr(),ce!==t){for(Se=[],ht=He();ht!==t;)Se.push(ht),ht=He();if(Se!==t)if(r.charCodeAt(Q)===125?(ht=Fe,Q++):(ht=t,I===0&&Qe(Ne)),ht!==t){for(Bt=[],Jr=He();Jr!==t;)Bt.push(Jr),Jr=He();if(Bt!==t){for(Jr=[],hi=Fp();hi!==t;)Jr.push(hi),hi=Fp();if(Jr!==t){for(hi=[],ss=He();ss!==t;)hi.push(ss),ss=He();hi!==t?(Me=m,b=oe(ce,Jr),m=b):(Q=m,m=t)}else Q=m,m=t}else Q=m,m=t}else Q=m,m=t;else Q=m,m=t}else Q=m,m=t;else Q=m,m=t}else Q=m,m=t;else Q=m,m=t;if(m===t){for(m=Q,b=[],N=He();N!==t;)b.push(N),N=He();if(b!==t){for(N=[],U=HE();U!==t;)N.push(U),U=HE();if(N!==t){for(U=[],ce=He();ce!==t;)U.push(ce),ce=He();if(U!==t){if(ce=[],Se=H1(),Se!==t)for(;Se!==t;)ce.push(Se),Se=H1();else ce=t;if(ce!==t){for(Se=[],ht=He();ht!==t;)Se.push(ht),ht=He();Se!==t?(Me=m,b=le(N,ce),m=b):(Q=m,m=t)}else Q=m,m=t}else Q=m,m=t}else Q=m,m=t}else Q=m,m=t;if(m===t){for(m=Q,b=[],N=He();N!==t;)b.push(N),N=He();if(b!==t){if(N=[],U=HE(),U!==t)for(;U!==t;)N.push(U),U=HE();else N=t;if(N!==t){for(U=[],ce=He();ce!==t;)U.push(ce),ce=He();U!==t?(Me=m,b=we(N),m=b):(Q=m,m=t)}else Q=m,m=t}else Q=m,m=t}}}return m}function U1(){var m,b,N,U,ce;for(m=Q,b=[],N=He();N!==t;)b.push(N),N=He();if(b!==t){if(N=[],U=GE(),U!==t)for(;U!==t;)N.push(U),U=GE();else N=t;if(N!==t){for(U=[],ce=He();ce!==t;)U.push(ce),ce=He();U!==t?(Me=m,b=fe(N),m=b):(Q=m,m=t)}else Q=m,m=t}else Q=m,m=t;return m}function H1(){var m,b,N;for(m=Q,b=[],N=He();N!==t;)b.push(N),N=He();if(b!==t?(N=Fp(),N!==t?(Me=m,b=Ae(N),m=b):(Q=m,m=t)):(Q=m,m=t),m===t){for(m=Q,b=[],N=He();N!==t;)b.push(N),N=He();b!==t?(N=GE(),N!==t?(Me=m,b=Ae(N),m=b):(Q=m,m=t)):(Q=m,m=t)}return m}function Fp(){var m,b,N,U,ce;for(m=Q,b=[],N=He();N!==t;)b.push(N),N=He();return b!==t?(qe.test(r.charAt(Q))?(N=r.charAt(Q),Q++):(N=t,I===0&&Qe(ne)),N===t&&(N=null),N!==t?(U=gge(),U!==t?(ce=GE(),ce!==t?(Me=m,b=Y(N,U,ce),m=b):(Q=m,m=t)):(Q=m,m=t)):(Q=m,m=t)):(Q=m,m=t),m}function gge(){var m;return r.substr(Q,2)===pe?(m=pe,Q+=2):(m=t,I===0&&Qe(ie)),m===t&&(r.substr(Q,2)===de?(m=de,Q+=2):(m=t,I===0&&Qe(_e)),m===t&&(r.charCodeAt(Q)===62?(m=Pt,Q++):(m=t,I===0&&Qe(It)),m===t&&(r.substr(Q,3)===Or?(m=Or,Q+=3):(m=t,I===0&&Qe(ii)),m===t&&(r.substr(Q,2)===gi?(m=gi,Q+=2):(m=t,I===0&&Qe(hr)),m===t&&(r.charCodeAt(Q)===60?(m=fi,Q++):(m=t,I===0&&Qe(ni))))))),m}function GE(){var m,b,N;for(m=Q,b=[],N=He();N!==t;)b.push(N),N=He();return b!==t?(N=G1(),N!==t?(Me=m,b=Ae(N),m=b):(Q=m,m=t)):(Q=m,m=t),m}function G1(){var m,b,N;if(m=Q,b=[],N=Y1(),N!==t)for(;N!==t;)b.push(N),N=Y1();else b=t;return b!==t&&(Me=m,b=Os(b)),m=b,m}function Y1(){var m,b;return m=Q,b=fge(),b!==t&&(Me=m,b=pr(b)),m=b,m===t&&(m=Q,b=hge(),b!==t&&(Me=m,b=pr(b)),m=b,m===t&&(m=Q,b=pge(),b!==t&&(Me=m,b=pr(b)),m=b,m===t&&(m=Q,b=dge(),b!==t&&(Me=m,b=pr(b)),m=b))),m}function fge(){var m,b,N,U;return m=Q,r.substr(Q,2)===Ii?(b=Ii,Q+=2):(b=t,I===0&&Qe(es)),b!==t?(N=Ege(),N!==t?(r.charCodeAt(Q)===39?(U=ua,Q++):(U=t,I===0&&Qe(pA)),U!==t?(Me=m,b=ag(N),m=b):(Q=m,m=t)):(Q=m,m=t)):(Q=m,m=t),m}function hge(){var m,b,N,U;return m=Q,r.charCodeAt(Q)===39?(b=ua,Q++):(b=t,I===0&&Qe(pA)),b!==t?(N=Cge(),N!==t?(r.charCodeAt(Q)===39?(U=ua,Q++):(U=t,I===0&&Qe(pA)),U!==t?(Me=m,b=ag(N),m=b):(Q=m,m=t)):(Q=m,m=t)):(Q=m,m=t),m}function pge(){var m,b,N,U;if(m=Q,r.substr(Q,2)===ts?(b=ts,Q+=2):(b=t,I===0&&Qe(dA)),b!==t&&(Me=m,b=ga()),m=b,m===t)if(m=Q,r.charCodeAt(Q)===34?(b=yp,Q++):(b=t,I===0&&Qe(CA)),b!==t){for(N=[],U=j1();U!==t;)N.push(U),U=j1();N!==t?(r.charCodeAt(Q)===34?(U=yp,Q++):(U=t,I===0&&Qe(CA)),U!==t?(Me=m,b=mA(N),m=b):(Q=m,m=t)):(Q=m,m=t)}else Q=m,m=t;return m}function dge(){var m,b,N;if(m=Q,b=[],N=q1(),N!==t)for(;N!==t;)b.push(N),N=q1();else b=t;return b!==t&&(Me=m,b=mA(b)),m=b,m}function j1(){var m,b;return m=Q,b=V1(),b!==t&&(Me=m,b=wr(b)),m=b,m===t&&(m=Q,b=X1(),b!==t&&(Me=m,b=kl(b)),m=b,m===t&&(m=Q,b=oS(),b!==t&&(Me=m,b=Ag(b)),m=b,m===t&&(m=Q,b=mge(),b!==t&&(Me=m,b=Io(b)),m=b))),m}function q1(){var m,b;return m=Q,b=V1(),b!==t&&(Me=m,b=lg(b)),m=b,m===t&&(m=Q,b=X1(),b!==t&&(Me=m,b=wp(b)),m=b,m===t&&(m=Q,b=oS(),b!==t&&(Me=m,b=Bp(b)),m=b,m===t&&(m=Q,b=wge(),b!==t&&(Me=m,b=vr(b)),m=b,m===t&&(m=Q,b=yge(),b!==t&&(Me=m,b=Io(b)),m=b)))),m}function Cge(){var m,b,N;for(m=Q,b=[],se.test(r.charAt(Q))?(N=r.charAt(Q),Q++):(N=t,I===0&&Qe(yo));N!==t;)b.push(N),se.test(r.charAt(Q))?(N=r.charAt(Q),Q++):(N=t,I===0&&Qe(yo));return b!==t&&(Me=m,b=kn(b)),m=b,m}function mge(){var m,b,N;if(m=Q,b=[],N=J1(),N===t&&(cg.test(r.charAt(Q))?(N=r.charAt(Q),Q++):(N=t,I===0&&Qe(Qt))),N!==t)for(;N!==t;)b.push(N),N=J1(),N===t&&(cg.test(r.charAt(Q))?(N=r.charAt(Q),Q++):(N=t,I===0&&Qe(Qt)));else b=t;return b!==t&&(Me=m,b=kn(b)),m=b,m}function J1(){var m,b,N;return m=Q,r.substr(Q,2)===Rl?(b=Rl,Q+=2):(b=t,I===0&&Qe(Rn)),b!==t&&(Me=m,b=rs()),m=b,m===t&&(m=Q,r.charCodeAt(Q)===92?(b=is,Q++):(b=t,I===0&&Qe(gt)),b!==t?(wo.test(r.charAt(Q))?(N=r.charAt(Q),Q++):(N=t,I===0&&Qe(At)),N!==t?(Me=m,b=an(N),m=b):(Q=m,m=t)):(Q=m,m=t)),m}function Ege(){var m,b,N;for(m=Q,b=[],N=W1(),N===t&&(se.test(r.charAt(Q))?(N=r.charAt(Q),Q++):(N=t,I===0&&Qe(yo)));N!==t;)b.push(N),N=W1(),N===t&&(se.test(r.charAt(Q))?(N=r.charAt(Q),Q++):(N=t,I===0&&Qe(yo)));return b!==t&&(Me=m,b=kn(b)),m=b,m}function W1(){var m,b,N;return m=Q,r.substr(Q,2)===S?(b=S,Q+=2):(b=t,I===0&&Qe(Tt)),b!==t&&(Me=m,b=ug()),m=b,m===t&&(m=Q,r.substr(Q,2)===Fl?(b=Fl,Q+=2):(b=t,I===0&&Qe(Qp)),b!==t&&(Me=m,b=bp()),m=b,m===t&&(m=Q,r.charCodeAt(Q)===92?(b=is,Q++):(b=t,I===0&&Qe(gt)),b!==t?(Sp.test(r.charAt(Q))?(N=r.charAt(Q),Q++):(N=t,I===0&&Qe(vp)),N!==t?(Me=m,b=xp(),m=b):(Q=m,m=t)):(Q=m,m=t),m===t&&(m=Q,r.substr(Q,2)===G?(b=G,Q+=2):(b=t,I===0&&Qe(yt)),b!==t&&(Me=m,b=EA()),m=b,m===t&&(m=Q,r.substr(Q,2)===Ji?(b=Ji,Q+=2):(b=t,I===0&&Qe(Nl)),b!==t&&(Me=m,b=Xe()),m=b,m===t&&(m=Q,r.substr(Q,2)===fa?(b=fa,Q+=2):(b=t,I===0&&Qe(gg)),b!==t&&(Me=m,b=FE()),m=b,m===t&&(m=Q,r.substr(Q,2)===Pp?(b=Pp,Q+=2):(b=t,I===0&&Qe(NE)),b!==t&&(Me=m,b=ar()),m=b,m===t&&(m=Q,r.substr(Q,2)===Fn?(b=Fn,Q+=2):(b=t,I===0&&Qe(Ll)),b!==t&&(Me=m,b=Dp()),m=b,m===t&&(m=Q,r.charCodeAt(Q)===92?(b=is,Q++):(b=t,I===0&&Qe(gt)),b!==t?(Ms.test(r.charAt(Q))?(N=r.charAt(Q),Q++):(N=t,I===0&&Qe(ha)),N!==t?(Me=m,b=an(N),m=b):(Q=m,m=t)):(Q=m,m=t),m===t&&(m=Ige()))))))))),m}function Ige(){var m,b,N,U,ce,Se,ht,Bt,Jr,hi,ss,aS;return m=Q,r.charCodeAt(Q)===92?(b=is,Q++):(b=t,I===0&&Qe(gt)),b!==t?(N=iS(),N!==t?(Me=m,b=An(N),m=b):(Q=m,m=t)):(Q=m,m=t),m===t&&(m=Q,r.substr(Q,2)===Te?(b=Te,Q+=2):(b=t,I===0&&Qe(fg)),b!==t?(N=Q,U=Q,ce=iS(),ce!==t?(Se=Tn(),Se!==t?(ce=[ce,Se],U=ce):(Q=U,U=t)):(Q=U,U=t),U===t&&(U=iS()),U!==t?N=r.substring(N,Q):N=U,N!==t?(Me=m,b=An(N),m=b):(Q=m,m=t)):(Q=m,m=t),m===t&&(m=Q,r.substr(Q,2)===Tl?(b=Tl,Q+=2):(b=t,I===0&&Qe(Ks)),b!==t?(N=Q,U=Q,ce=Tn(),ce!==t?(Se=Tn(),Se!==t?(ht=Tn(),ht!==t?(Bt=Tn(),Bt!==t?(ce=[ce,Se,ht,Bt],U=ce):(Q=U,U=t)):(Q=U,U=t)):(Q=U,U=t)):(Q=U,U=t),U!==t?N=r.substring(N,Q):N=U,N!==t?(Me=m,b=An(N),m=b):(Q=m,m=t)):(Q=m,m=t),m===t&&(m=Q,r.substr(Q,2)===Ol?(b=Ol,Q+=2):(b=t,I===0&&Qe(IA)),b!==t?(N=Q,U=Q,ce=Tn(),ce!==t?(Se=Tn(),Se!==t?(ht=Tn(),ht!==t?(Bt=Tn(),Bt!==t?(Jr=Tn(),Jr!==t?(hi=Tn(),hi!==t?(ss=Tn(),ss!==t?(aS=Tn(),aS!==t?(ce=[ce,Se,ht,Bt,Jr,hi,ss,aS],U=ce):(Q=U,U=t)):(Q=U,U=t)):(Q=U,U=t)):(Q=U,U=t)):(Q=U,U=t)):(Q=U,U=t)):(Q=U,U=t)):(Q=U,U=t),U!==t?N=r.substring(N,Q):N=U,N!==t?(Me=m,b=hg(N),m=b):(Q=m,m=t)):(Q=m,m=t)))),m}function iS(){var m;return pg.test(r.charAt(Q))?(m=r.charAt(Q),Q++):(m=t,I===0&&Qe(pa)),m}function Tn(){var m;return da.test(r.charAt(Q))?(m=r.charAt(Q),Q++):(m=t,I===0&&Qe(rt)),m}function yge(){var m,b,N,U,ce;if(m=Q,b=[],N=Q,r.charCodeAt(Q)===92?(U=is,Q++):(U=t,I===0&&Qe(gt)),U!==t?(r.length>Q?(ce=r.charAt(Q),Q++):(ce=t,I===0&&Qe(Bo)),ce!==t?(Me=N,U=an(ce),N=U):(Q=N,N=t)):(Q=N,N=t),N===t&&(N=Q,U=Q,I++,ce=_1(),I--,ce===t?U=void 0:(Q=U,U=t),U!==t?(r.length>Q?(ce=r.charAt(Q),Q++):(ce=t,I===0&&Qe(Bo)),ce!==t?(Me=N,U=an(ce),N=U):(Q=N,N=t)):(Q=N,N=t)),N!==t)for(;N!==t;)b.push(N),N=Q,r.charCodeAt(Q)===92?(U=is,Q++):(U=t,I===0&&Qe(gt)),U!==t?(r.length>Q?(ce=r.charAt(Q),Q++):(ce=t,I===0&&Qe(Bo)),ce!==t?(Me=N,U=an(ce),N=U):(Q=N,N=t)):(Q=N,N=t),N===t&&(N=Q,U=Q,I++,ce=_1(),I--,ce===t?U=void 0:(Q=U,U=t),U!==t?(r.length>Q?(ce=r.charAt(Q),Q++):(ce=t,I===0&&Qe(Bo)),ce!==t?(Me=N,U=an(ce),N=U):(Q=N,N=t)):(Q=N,N=t));else b=t;return b!==t&&(Me=m,b=kn(b)),m=b,m}function nS(){var m,b,N,U,ce,Se;if(m=Q,r.charCodeAt(Q)===45?(b=yA,Q++):(b=t,I===0&&Qe(Ml)),b===t&&(r.charCodeAt(Q)===43?(b=Us,Q++):(b=t,I===0&&Qe(Kl))),b===t&&(b=null),b!==t){if(N=[],qe.test(r.charAt(Q))?(U=r.charAt(Q),Q++):(U=t,I===0&&Qe(ne)),U!==t)for(;U!==t;)N.push(U),qe.test(r.charAt(Q))?(U=r.charAt(Q),Q++):(U=t,I===0&&Qe(ne));else N=t;if(N!==t)if(r.charCodeAt(Q)===46?(U=LE,Q++):(U=t,I===0&&Qe(kp)),U!==t){if(ce=[],qe.test(r.charAt(Q))?(Se=r.charAt(Q),Q++):(Se=t,I===0&&Qe(ne)),Se!==t)for(;Se!==t;)ce.push(Se),qe.test(r.charAt(Q))?(Se=r.charAt(Q),Q++):(Se=t,I===0&&Qe(ne));else ce=t;ce!==t?(Me=m,b=dg(b,N,ce),m=b):(Q=m,m=t)}else Q=m,m=t;else Q=m,m=t}else Q=m,m=t;if(m===t){if(m=Q,r.charCodeAt(Q)===45?(b=yA,Q++):(b=t,I===0&&Qe(Ml)),b===t&&(r.charCodeAt(Q)===43?(b=Us,Q++):(b=t,I===0&&Qe(Kl))),b===t&&(b=null),b!==t){if(N=[],qe.test(r.charAt(Q))?(U=r.charAt(Q),Q++):(U=t,I===0&&Qe(ne)),U!==t)for(;U!==t;)N.push(U),qe.test(r.charAt(Q))?(U=r.charAt(Q),Q++):(U=t,I===0&&Qe(ne));else N=t;N!==t?(Me=m,b=Rp(b,N),m=b):(Q=m,m=t)}else Q=m,m=t;if(m===t&&(m=Q,b=oS(),b!==t&&(Me=m,b=TE(b)),m=b,m===t&&(m=Q,b=Hl(),b!==t&&(Me=m,b=Ul(b)),m=b,m===t)))if(m=Q,r.charCodeAt(Q)===40?(b=ge,Q++):(b=t,I===0&&Qe(re)),b!==t){for(N=[],U=He();U!==t;)N.push(U),U=He();if(N!==t)if(U=z1(),U!==t){for(ce=[],Se=He();Se!==t;)ce.push(Se),Se=He();ce!==t?(r.charCodeAt(Q)===41?(Se=O,Q++):(Se=t,I===0&&Qe(F)),Se!==t?(Me=m,b=OE(U),m=b):(Q=m,m=t)):(Q=m,m=t)}else Q=m,m=t;else Q=m,m=t}else Q=m,m=t}return m}function sS(){var m,b,N,U,ce,Se,ht,Bt;if(m=Q,b=nS(),b!==t){for(N=[],U=Q,ce=[],Se=He();Se!==t;)ce.push(Se),Se=He();if(ce!==t)if(r.charCodeAt(Q)===42?(Se=Cg,Q++):(Se=t,I===0&&Qe(wA)),Se===t&&(r.charCodeAt(Q)===47?(Se=Rr,Q++):(Se=t,I===0&&Qe(ME))),Se!==t){for(ht=[],Bt=He();Bt!==t;)ht.push(Bt),Bt=He();ht!==t?(Bt=nS(),Bt!==t?(Me=U,ce=Hs(b,Se,Bt),U=ce):(Q=U,U=t)):(Q=U,U=t)}else Q=U,U=t;else Q=U,U=t;for(;U!==t;){for(N.push(U),U=Q,ce=[],Se=He();Se!==t;)ce.push(Se),Se=He();if(ce!==t)if(r.charCodeAt(Q)===42?(Se=Cg,Q++):(Se=t,I===0&&Qe(wA)),Se===t&&(r.charCodeAt(Q)===47?(Se=Rr,Q++):(Se=t,I===0&&Qe(ME))),Se!==t){for(ht=[],Bt=He();Bt!==t;)ht.push(Bt),Bt=He();ht!==t?(Bt=nS(),Bt!==t?(Me=U,ce=Hs(b,Se,Bt),U=ce):(Q=U,U=t)):(Q=U,U=t)}else Q=U,U=t;else Q=U,U=t}N!==t?(Me=m,b=Gs(b,N),m=b):(Q=m,m=t)}else Q=m,m=t;return m}function z1(){var m,b,N,U,ce,Se,ht,Bt;if(m=Q,b=sS(),b!==t){for(N=[],U=Q,ce=[],Se=He();Se!==t;)ce.push(Se),Se=He();if(ce!==t)if(r.charCodeAt(Q)===43?(Se=Us,Q++):(Se=t,I===0&&Qe(Kl)),Se===t&&(r.charCodeAt(Q)===45?(Se=yA,Q++):(Se=t,I===0&&Qe(Ml))),Se!==t){for(ht=[],Bt=He();Bt!==t;)ht.push(Bt),Bt=He();ht!==t?(Bt=sS(),Bt!==t?(Me=U,ce=mg(b,Se,Bt),U=ce):(Q=U,U=t)):(Q=U,U=t)}else Q=U,U=t;else Q=U,U=t;for(;U!==t;){for(N.push(U),U=Q,ce=[],Se=He();Se!==t;)ce.push(Se),Se=He();if(ce!==t)if(r.charCodeAt(Q)===43?(Se=Us,Q++):(Se=t,I===0&&Qe(Kl)),Se===t&&(r.charCodeAt(Q)===45?(Se=yA,Q++):(Se=t,I===0&&Qe(Ml))),Se!==t){for(ht=[],Bt=He();Bt!==t;)ht.push(Bt),Bt=He();ht!==t?(Bt=sS(),Bt!==t?(Me=U,ce=mg(b,Se,Bt),U=ce):(Q=U,U=t)):(Q=U,U=t)}else Q=U,U=t;else Q=U,U=t}N!==t?(Me=m,b=Gs(b,N),m=b):(Q=m,m=t)}else Q=m,m=t;return m}function V1(){var m,b,N,U,ce,Se;if(m=Q,r.substr(Q,3)===BA?(b=BA,Q+=3):(b=t,I===0&&Qe(R)),b!==t){for(N=[],U=He();U!==t;)N.push(U),U=He();if(N!==t)if(U=z1(),U!==t){for(ce=[],Se=He();Se!==t;)ce.push(Se),Se=He();ce!==t?(r.substr(Q,2)===q?(Se=q,Q+=2):(Se=t,I===0&&Qe(Ce)),Se!==t?(Me=m,b=Ke(U),m=b):(Q=m,m=t)):(Q=m,m=t)}else Q=m,m=t;else Q=m,m=t}else Q=m,m=t;return m}function X1(){var m,b,N,U;return m=Q,r.substr(Q,2)===Re?(b=Re,Q+=2):(b=t,I===0&&Qe(ze)),b!==t?(N=Mr(),N!==t?(r.charCodeAt(Q)===41?(U=O,Q++):(U=t,I===0&&Qe(F)),U!==t?(Me=m,b=dt(N),m=b):(Q=m,m=t)):(Q=m,m=t)):(Q=m,m=t),m}function oS(){var m,b,N,U,ce,Se;return m=Q,r.substr(Q,2)===Ft?(b=Ft,Q+=2):(b=t,I===0&&Qe(Nn)),b!==t?(N=Hl(),N!==t?(r.substr(Q,2)===qb?(U=qb,Q+=2):(U=t,I===0&&Qe(S1)),U!==t?(ce=U1(),ce!==t?(r.charCodeAt(Q)===125?(Se=Fe,Q++):(Se=t,I===0&&Qe(Ne)),Se!==t?(Me=m,b=v1(N,ce),m=b):(Q=m,m=t)):(Q=m,m=t)):(Q=m,m=t)):(Q=m,m=t)):(Q=m,m=t),m===t&&(m=Q,r.substr(Q,2)===Ft?(b=Ft,Q+=2):(b=t,I===0&&Qe(Nn)),b!==t?(N=Hl(),N!==t?(r.substr(Q,3)===Jb?(U=Jb,Q+=3):(U=t,I===0&&Qe(x1)),U!==t?(Me=m,b=P1(N),m=b):(Q=m,m=t)):(Q=m,m=t)):(Q=m,m=t),m===t&&(m=Q,r.substr(Q,2)===Ft?(b=Ft,Q+=2):(b=t,I===0&&Qe(Nn)),b!==t?(N=Hl(),N!==t?(r.substr(Q,2)===Wb?(U=Wb,Q+=2):(U=t,I===0&&Qe(D1)),U!==t?(ce=U1(),ce!==t?(r.charCodeAt(Q)===125?(Se=Fe,Q++):(Se=t,I===0&&Qe(Ne)),Se!==t?(Me=m,b=k1(N,ce),m=b):(Q=m,m=t)):(Q=m,m=t)):(Q=m,m=t)):(Q=m,m=t)):(Q=m,m=t),m===t&&(m=Q,r.substr(Q,2)===Ft?(b=Ft,Q+=2):(b=t,I===0&&Qe(Nn)),b!==t?(N=Hl(),N!==t?(r.substr(Q,3)===zb?(U=zb,Q+=3):(U=t,I===0&&Qe(R1)),U!==t?(Me=m,b=F1(N),m=b):(Q=m,m=t)):(Q=m,m=t)):(Q=m,m=t),m===t&&(m=Q,r.substr(Q,2)===Ft?(b=Ft,Q+=2):(b=t,I===0&&Qe(Nn)),b!==t?(N=Hl(),N!==t?(r.charCodeAt(Q)===125?(U=Fe,Q++):(U=t,I===0&&Qe(Ne)),U!==t?(Me=m,b=Vb(N),m=b):(Q=m,m=t)):(Q=m,m=t)):(Q=m,m=t),m===t&&(m=Q,r.charCodeAt(Q)===36?(b=N1,Q++):(b=t,I===0&&Qe(L1)),b!==t?(N=Hl(),N!==t?(Me=m,b=Vb(N),m=b):(Q=m,m=t)):(Q=m,m=t)))))),m}function wge(){var m,b,N;return m=Q,b=Bge(),b!==t?(Me=Q,N=T1(b),N?N=void 0:N=t,N!==t?(Me=m,b=O1(b),m=b):(Q=m,m=t)):(Q=m,m=t),m}function Bge(){var m,b,N,U,ce;if(m=Q,b=[],N=Q,U=Q,I++,ce=$1(),I--,ce===t?U=void 0:(Q=U,U=t),U!==t?(r.length>Q?(ce=r.charAt(Q),Q++):(ce=t,I===0&&Qe(Bo)),ce!==t?(Me=N,U=an(ce),N=U):(Q=N,N=t)):(Q=N,N=t),N!==t)for(;N!==t;)b.push(N),N=Q,U=Q,I++,ce=$1(),I--,ce===t?U=void 0:(Q=U,U=t),U!==t?(r.length>Q?(ce=r.charAt(Q),Q++):(ce=t,I===0&&Qe(Bo)),ce!==t?(Me=N,U=an(ce),N=U):(Q=N,N=t)):(Q=N,N=t);else b=t;return b!==t&&(Me=m,b=kn(b)),m=b,m}function Z1(){var m,b,N;if(m=Q,b=[],Xb.test(r.charAt(Q))?(N=r.charAt(Q),Q++):(N=t,I===0&&Qe(Zb)),N!==t)for(;N!==t;)b.push(N),Xb.test(r.charAt(Q))?(N=r.charAt(Q),Q++):(N=t,I===0&&Qe(Zb));else b=t;return b!==t&&(Me=m,b=_b()),m=b,m}function Hl(){var m,b,N;if(m=Q,b=[],$b.test(r.charAt(Q))?(N=r.charAt(Q),Q++):(N=t,I===0&&Qe(eS)),N!==t)for(;N!==t;)b.push(N),$b.test(r.charAt(Q))?(N=r.charAt(Q),Q++):(N=t,I===0&&Qe(eS));else b=t;return b!==t&&(Me=m,b=_b()),m=b,m}function _1(){var m;return M1.test(r.charAt(Q))?(m=r.charAt(Q),Q++):(m=t,I===0&&Qe(Eg)),m}function $1(){var m;return tS.test(r.charAt(Q))?(m=r.charAt(Q),Q++):(m=t,I===0&&Qe(rS)),m}function He(){var m,b;if(m=[],KE.test(r.charAt(Q))?(b=r.charAt(Q),Q++):(b=t,I===0&&Qe(UE)),b!==t)for(;b!==t;)m.push(b),KE.test(r.charAt(Q))?(b=r.charAt(Q),Q++):(b=t,I===0&&Qe(UE));else m=t;return m}if(k=n(),k!==t&&Q===r.length)return k;throw k!==t&&Q<r.length&&Qe(wt()),Ri(E,d<r.length?r.charAt(d):null,d<r.length?Et(d,d+1):Et(d,d))}aU.exports={SyntaxError:Wl,parse:Bfe}});var uU=w((dZe,cU)=>{"use strict";function Qfe(r,e){function t(){this.constructor=r}t.prototype=e.prototype,r.prototype=new t}function Vl(r,e,t,i){this.message=r,this.expected=e,this.found=t,this.location=i,this.name="SyntaxError",typeof Error.captureStackTrace=="function"&&Error.captureStackTrace(this,Vl)}Qfe(Vl,Error);Vl.buildMessage=function(r,e){var t={literal:function(c){return'"'+n(c.text)+'"'},class:function(c){var u="",g;for(g=0;g<c.parts.length;g++)u+=c.parts[g]instanceof Array?s(c.parts[g][0])+"-"+s(c.parts[g][1]):s(c.parts[g]);return"["+(c.inverted?"^":"")+u+"]"},any:function(c){return"any character"},end:function(c){return"end of input"},other:function(c){return c.description}};function i(c){return c.charCodeAt(0).toString(16).toUpperCase()}function n(c){return c.replace(/\\/g,"\\\\").replace(/"/g,'\\"').replace(/\0/g,"\\0").replace(/\t/g,"\\t").replace(/\n/g,"\\n").replace(/\r/g,"\\r").replace(/[\x00-\x0F]/g,function(u){return"\\x0"+i(u)}).replace(/[\x10-\x1F\x7F-\x9F]/g,function(u){return"\\x"+i(u)})}function s(c){return c.replace(/\\/g,"\\\\").replace(/\]/g,"\\]").replace(/\^/g,"\\^").replace(/-/g,"\\-").replace(/\0/g,"\\0").replace(/\t/g,"\\t").replace(/\n/g,"\\n").replace(/\r/g,"\\r").replace(/[\x00-\x0F]/g,function(u){return"\\x0"+i(u)}).replace(/[\x10-\x1F\x7F-\x9F]/g,function(u){return"\\x"+i(u)})}function o(c){return t[c.type](c)}function a(c){var u=new Array(c.length),g,f;for(g=0;g<c.length;g++)u[g]=o(c[g]);if(u.sort(),u.length>0){for(g=1,f=1;g<u.length;g++)u[g-1]!==u[g]&&(u[f]=u[g],f++);u.length=f}switch(u.length){case 1:return u[0];case 2:return u[0]+" or "+u[1];default:return u.slice(0,-1).join(", ")+", or "+u[u.length-1]}}function l(c){return c?'"'+n(c)+'"':"end of input"}return"Expected "+a(r)+" but "+l(e)+" found."};function bfe(r,e){e=e!==void 0?e:{};var t={},i={resolution:le},n=le,s="/",o=ge("/",!1),a=function(ne,Y){return{from:ne,descriptor:Y}},l=function(ne){return{descriptor:ne}},c="@",u=ge("@",!1),g=function(ne,Y){return{fullName:ne,description:Y}},f=function(ne){return{fullName:ne}},h=function(){return W()},p=/^[^\/@]/,C=re(["/","@"],!0,!1),y=/^[^\/]/,B=re(["/"],!0,!1),v=0,D=0,L=[{line:1,column:1}],H=0,j=[],$=0,V;if("startRule"in e){if(!(e.startRule in i))throw new Error(`Can't start parsing from rule "`+e.startRule+'".');n=i[e.startRule]}function W(){return r.substring(D,v)}function _(){return ke(D,v)}function A(ne,Y){throw Y=Y!==void 0?Y:ke(D,v),oe([ue(ne)],r.substring(D,v),Y)}function ae(ne,Y){throw Y=Y!==void 0?Y:ke(D,v),Ne(ne,Y)}function ge(ne,Y){return{type:"literal",text:ne,ignoreCase:Y}}function re(ne,Y,pe){return{type:"class",parts:ne,inverted:Y,ignoreCase:pe}}function O(){return{type:"any"}}function F(){return{type:"end"}}function ue(ne){return{type:"other",description:ne}}function he(ne){var Y=L[ne],pe;if(Y)return Y;for(pe=ne-1;!L[pe];)pe--;for(Y=L[pe],Y={line:Y.line,column:Y.column};pe<ne;)r.charCodeAt(pe)===10?(Y.line++,Y.column=1):Y.column++,pe++;return L[ne]=Y,Y}function ke(ne,Y){var pe=he(ne),ie=he(Y);return{start:{offset:ne,line:pe.line,column:pe.column},end:{offset:Y,line:ie.line,column:ie.column}}}function Fe(ne){v<H||(v>H&&(H=v,j=[]),j.push(ne))}function Ne(ne,Y){return new Vl(ne,null,null,Y)}function oe(ne,Y,pe){return new Vl(Vl.buildMessage(ne,Y),ne,Y,pe)}function le(){var ne,Y,pe,ie;return ne=v,Y=we(),Y!==t?(r.charCodeAt(v)===47?(pe=s,v++):(pe=t,$===0&&Fe(o)),pe!==t?(ie=we(),ie!==t?(D=ne,Y=a(Y,ie),ne=Y):(v=ne,ne=t)):(v=ne,ne=t)):(v=ne,ne=t),ne===t&&(ne=v,Y=we(),Y!==t&&(D=ne,Y=l(Y)),ne=Y),ne}function we(){var ne,Y,pe,ie;return ne=v,Y=fe(),Y!==t?(r.charCodeAt(v)===64?(pe=c,v++):(pe=t,$===0&&Fe(u)),pe!==t?(ie=qe(),ie!==t?(D=ne,Y=g(Y,ie),ne=Y):(v=ne,ne=t)):(v=ne,ne=t)):(v=ne,ne=t),ne===t&&(ne=v,Y=fe(),Y!==t&&(D=ne,Y=f(Y)),ne=Y),ne}function fe(){var ne,Y,pe,ie,de;return ne=v,r.charCodeAt(v)===64?(Y=c,v++):(Y=t,$===0&&Fe(u)),Y!==t?(pe=Ae(),pe!==t?(r.charCodeAt(v)===47?(ie=s,v++):(ie=t,$===0&&Fe(o)),ie!==t?(de=Ae(),de!==t?(D=ne,Y=h(),ne=Y):(v=ne,ne=t)):(v=ne,ne=t)):(v=ne,ne=t)):(v=ne,ne=t),ne===t&&(ne=v,Y=Ae(),Y!==t&&(D=ne,Y=h()),ne=Y),ne}function Ae(){var ne,Y,pe;if(ne=v,Y=[],p.test(r.charAt(v))?(pe=r.charAt(v),v++):(pe=t,$===0&&Fe(C)),pe!==t)for(;pe!==t;)Y.push(pe),p.test(r.charAt(v))?(pe=r.charAt(v),v++):(pe=t,$===0&&Fe(C));else Y=t;return Y!==t&&(D=ne,Y=h()),ne=Y,ne}function qe(){var ne,Y,pe;if(ne=v,Y=[],y.test(r.charAt(v))?(pe=r.charAt(v),v++):(pe=t,$===0&&Fe(B)),pe!==t)for(;pe!==t;)Y.push(pe),y.test(r.charAt(v))?(pe=r.charAt(v),v++):(pe=t,$===0&&Fe(B));else Y=t;return Y!==t&&(D=ne,Y=h()),ne=Y,ne}if(V=n(),V!==t&&v===r.length)return V;throw V!==t&&v<r.length&&Fe(F()),oe(j,H<r.length?r.charAt(H):null,H<r.length?ke(H,H+1):ke(H,H))}cU.exports={SyntaxError:Vl,parse:bfe}});var Zl=w((mZe,Xl)=>{"use strict";function fU(r){return typeof r>"u"||r===null}function Sfe(r){return typeof r=="object"&&r!==null}function vfe(r){return Array.isArray(r)?r:fU(r)?[]:[r]}function xfe(r,e){var t,i,n,s;if(e)for(s=Object.keys(e),t=0,i=s.length;t<i;t+=1)n=s[t],r[n]=e[n];return r}function Pfe(r,e){var t="",i;for(i=0;i<e;i+=1)t+=r;return t}function Dfe(r){return r===0&&Number.NEGATIVE_INFINITY===1/r}Xl.exports.isNothing=fU;Xl.exports.isObject=Sfe;Xl.exports.toArray=vfe;Xl.exports.repeat=Pfe;Xl.exports.isNegativeZero=Dfe;Xl.exports.extend=xfe});var kg=w((EZe,hU)=>{"use strict";function Wp(r,e){Error.call(this),this.name="YAMLException",this.reason=r,this.mark=e,this.message=(this.reason||"(unknown reason)")+(this.mark?" "+this.mark.toString():""),Error.captureStackTrace?Error.captureStackTrace(this,this.constructor):this.stack=new Error().stack||""}Wp.prototype=Object.create(Error.prototype);Wp.prototype.constructor=Wp;Wp.prototype.toString=function(e){var t=this.name+": ";return t+=this.reason||"(unknown reason)",!e&&this.mark&&(t+=" "+this.mark.toString()),t};hU.exports=Wp});var CU=w((IZe,dU)=>{"use strict";var pU=Zl();function HS(r,e,t,i,n){this.name=r,this.buffer=e,this.position=t,this.line=i,this.column=n}HS.prototype.getSnippet=function(e,t){var i,n,s,o,a;if(!this.buffer)return null;for(e=e||4,t=t||75,i="",n=this.position;n>0&&`\0\r
-\x85\u2028\u2029`.indexOf(this.buffer.charAt(n-1))===-1;)if(n-=1,this.position-n>t/2-1){i=" ... ",n+=5;break}for(s="",o=this.position;o<this.buffer.length&&`\0\r
-\x85\u2028\u2029`.indexOf(this.buffer.charAt(o))===-1;)if(o+=1,o-this.position>t/2-1){s=" ... ",o-=5;break}return a=this.buffer.slice(n,o),pU.repeat(" ",e)+i+a+s+`
-`+pU.repeat(" ",e+this.position-n+i.length)+"^"};HS.prototype.toString=function(e){var t,i="";return this.name&&(i+='in "'+this.name+'" '),i+="at line "+(this.line+1)+", column "+(this.column+1),e||(t=this.getSnippet(),t&&(i+=`:
-`+t)),i};dU.exports=HS});var si=w((yZe,EU)=>{"use strict";var mU=kg(),kfe=["kind","resolve","construct","instanceOf","predicate","represent","defaultStyle","styleAliases"],Rfe=["scalar","sequence","mapping"];function Ffe(r){var e={};return r!==null&&Object.keys(r).forEach(function(t){r[t].forEach(function(i){e[String(i)]=t})}),e}function Nfe(r,e){if(e=e||{},Object.keys(e).forEach(function(t){if(kfe.indexOf(t)===-1)throw new mU('Unknown option "'+t+'" is met in definition of "'+r+'" YAML type.')}),this.tag=r,this.kind=e.kind||null,this.resolve=e.resolve||function(){return!0},this.construct=e.construct||function(t){return t},this.instanceOf=e.instanceOf||null,this.predicate=e.predicate||null,this.represent=e.represent||null,this.defaultStyle=e.defaultStyle||null,this.styleAliases=Ffe(e.styleAliases||null),Rfe.indexOf(this.kind)===-1)throw new mU('Unknown kind "'+this.kind+'" is specified for "'+r+'" YAML type.')}EU.exports=Nfe});var _l=w((wZe,yU)=>{"use strict";var IU=Zl(),gI=kg(),Lfe=si();function GS(r,e,t){var i=[];return r.include.forEach(function(n){t=GS(n,e,t)}),r[e].forEach(function(n){t.forEach(function(s,o){s.tag===n.tag&&s.kind===n.kind&&i.push(o)}),t.push(n)}),t.filter(function(n,s){return i.indexOf(s)===-1})}function Tfe(){var r={scalar:{},sequence:{},mapping:{},fallback:{}},e,t;function i(n){r[n.kind][n.tag]=r.fallback[n.tag]=n}for(e=0,t=arguments.length;e<t;e+=1)arguments[e].forEach(i);return r}function Rg(r){this.include=r.include||[],this.implicit=r.implicit||[],this.explicit=r.explicit||[],this.implicit.forEach(function(e){if(e.loadKind&&e.loadKind!=="scalar")throw new gI("There is a non-scalar type in the implicit list of a schema. Implicit resolving of such types is not supported.")}),this.compiledImplicit=GS(this,"implicit",[]),this.compiledExplicit=GS(this,"explicit",[]),this.compiledTypeMap=Tfe(this.compiledImplicit,this.compiledExplicit)}Rg.DEFAULT=null;Rg.create=function(){var e,t;switch(arguments.length){case 1:e=Rg.DEFAULT,t=arguments[0];break;case 2:e=arguments[0],t=arguments[1];break;default:throw new gI("Wrong number of arguments for Schema.create function")}if(e=IU.toArray(e),t=IU.toArray(t),!e.every(function(i){return i instanceof Rg}))throw new gI("Specified list of super schemas (or a single Schema object) contains a non-Schema object.");if(!t.every(function(i){return i instanceof Lfe}))throw new gI("Specified list of YAML types (or a single Type object) contains a non-Type object.");return new Rg({include:e,explicit:t})};yU.exports=Rg});var BU=w((BZe,wU)=>{"use strict";var Ofe=si();wU.exports=new Ofe("tag:yaml.org,2002:str",{kind:"scalar",construct:function(r){return r!==null?r:""}})});var bU=w((QZe,QU)=>{"use strict";var Mfe=si();QU.exports=new Mfe("tag:yaml.org,2002:seq",{kind:"sequence",construct:function(r){return r!==null?r:[]}})});var vU=w((bZe,SU)=>{"use strict";var Kfe=si();SU.exports=new Kfe("tag:yaml.org,2002:map",{kind:"mapping",construct:function(r){return r!==null?r:{}}})});var fI=w((SZe,xU)=>{"use strict";var Ufe=_l();xU.exports=new Ufe({explicit:[BU(),bU(),vU()]})});var DU=w((vZe,PU)=>{"use strict";var Hfe=si();function Gfe(r){if(r===null)return!0;var e=r.length;return e===1&&r==="~"||e===4&&(r==="null"||r==="Null"||r==="NULL")}function Yfe(){return null}function jfe(r){return r===null}PU.exports=new Hfe("tag:yaml.org,2002:null",{kind:"scalar",resolve:Gfe,construct:Yfe,predicate:jfe,represent:{canonical:function(){return"~"},lowercase:function(){return"null"},uppercase:function(){return"NULL"},camelcase:function(){return"Null"}},defaultStyle:"lowercase"})});var RU=w((xZe,kU)=>{"use strict";var qfe=si();function Jfe(r){if(r===null)return!1;var e=r.length;return e===4&&(r==="true"||r==="True"||r==="TRUE")||e===5&&(r==="false"||r==="False"||r==="FALSE")}function Wfe(r){return r==="true"||r==="True"||r==="TRUE"}function zfe(r){return Object.prototype.toString.call(r)==="[object Boolean]"}kU.exports=new qfe("tag:yaml.org,2002:bool",{kind:"scalar",resolve:Jfe,construct:Wfe,predicate:zfe,represent:{lowercase:function(r){return r?"true":"false"},uppercase:function(r){return r?"TRUE":"FALSE"},camelcase:function(r){return r?"True":"False"}},defaultStyle:"lowercase"})});var NU=w((PZe,FU)=>{"use strict";var Vfe=Zl(),Xfe=si();function Zfe(r){return 48<=r&&r<=57||65<=r&&r<=70||97<=r&&r<=102}function _fe(r){return 48<=r&&r<=55}function $fe(r){return 48<=r&&r<=57}function ehe(r){if(r===null)return!1;var e=r.length,t=0,i=!1,n;if(!e)return!1;if(n=r[t],(n==="-"||n==="+")&&(n=r[++t]),n==="0"){if(t+1===e)return!0;if(n=r[++t],n==="b"){for(t++;t<e;t++)if(n=r[t],n!=="_"){if(n!=="0"&&n!=="1")return!1;i=!0}return i&&n!=="_"}if(n==="x"){for(t++;t<e;t++)if(n=r[t],n!=="_"){if(!Zfe(r.charCodeAt(t)))return!1;i=!0}return i&&n!=="_"}for(;t<e;t++)if(n=r[t],n!=="_"){if(!_fe(r.charCodeAt(t)))return!1;i=!0}return i&&n!=="_"}if(n==="_")return!1;for(;t<e;t++)if(n=r[t],n!=="_"){if(n===":")break;if(!$fe(r.charCodeAt(t)))return!1;i=!0}return!i||n==="_"?!1:n!==":"?!0:/^(:[0-5]?[0-9])+$/.test(r.slice(t))}function the(r){var e=r,t=1,i,n,s=[];return e.indexOf("_")!==-1&&(e=e.replace(/_/g,"")),i=e[0],(i==="-"||i==="+")&&(i==="-"&&(t=-1),e=e.slice(1),i=e[0]),e==="0"?0:i==="0"?e[1]==="b"?t*parseInt(e.slice(2),2):e[1]==="x"?t*parseInt(e,16):t*parseInt(e,8):e.indexOf(":")!==-1?(e.split(":").forEach(function(o){s.unshift(parseInt(o,10))}),e=0,n=1,s.forEach(function(o){e+=o*n,n*=60}),t*e):t*parseInt(e,10)}function rhe(r){return Object.prototype.toString.call(r)==="[object Number]"&&r%1===0&&!Vfe.isNegativeZero(r)}FU.exports=new Xfe("tag:yaml.org,2002:int",{kind:"scalar",resolve:ehe,construct:the,predicate:rhe,represent:{binary:function(r){return r>=0?"0b"+r.toString(2):"-0b"+r.toString(2).slice(1)},octal:function(r){return r>=0?"0"+r.toString(8):"-0"+r.toString(8).slice(1)},decimal:function(r){return r.toString(10)},hexadecimal:function(r){return r>=0?"0x"+r.toString(16).toUpperCase():"-0x"+r.toString(16).toUpperCase().slice(1)}},defaultStyle:"decimal",styleAliases:{binary:[2,"bin"],octal:[8,"oct"],decimal:[10,"dec"],hexadecimal:[16,"hex"]}})});var OU=w((DZe,TU)=>{"use strict";var LU=Zl(),ihe=si(),nhe=new RegExp("^(?:[-+]?(?:0|[1-9][0-9_]*)(?:\\.[0-9_]*)?(?:[eE][-+]?[0-9]+)?|\\.[0-9_]+(?:[eE][-+]?[0-9]+)?|[-+]?[0-9][0-9_]*(?::[0-5]?[0-9])+\\.[0-9_]*|[-+]?\\.(?:inf|Inf|INF)|\\.(?:nan|NaN|NAN))$");function she(r){return!(r===null||!nhe.test(r)||r[r.length-1]==="_")}function ohe(r){var e,t,i,n;return e=r.replace(/_/g,"").toLowerCase(),t=e[0]==="-"?-1:1,n=[],"+-".indexOf(e[0])>=0&&(e=e.slice(1)),e===".inf"?t===1?Number.POSITIVE_INFINITY:Number.NEGATIVE_INFINITY:e===".nan"?NaN:e.indexOf(":")>=0?(e.split(":").forEach(function(s){n.unshift(parseFloat(s,10))}),e=0,i=1,n.forEach(function(s){e+=s*i,i*=60}),t*e):t*parseFloat(e,10)}var ahe=/^[-+]?[0-9]+e/;function Ahe(r,e){var t;if(isNaN(r))switch(e){case"lowercase":return".nan";case"uppercase":return".NAN";case"camelcase":return".NaN"}else if(Number.POSITIVE_INFINITY===r)switch(e){case"lowercase":return".inf";case"uppercase":return".INF";case"camelcase":return".Inf"}else if(Number.NEGATIVE_INFINITY===r)switch(e){case"lowercase":return"-.inf";case"uppercase":return"-.INF";case"camelcase":return"-.Inf"}else if(LU.isNegativeZero(r))return"-0.0";return t=r.toString(10),ahe.test(t)?t.replace("e",".e"):t}function lhe(r){return Object.prototype.toString.call(r)==="[object Number]"&&(r%1!==0||LU.isNegativeZero(r))}TU.exports=new ihe("tag:yaml.org,2002:float",{kind:"scalar",resolve:she,construct:ohe,predicate:lhe,represent:Ahe,defaultStyle:"lowercase"})});var YS=w((kZe,MU)=>{"use strict";var che=_l();MU.exports=new che({include:[fI()],implicit:[DU(),RU(),NU(),OU()]})});var jS=w((RZe,KU)=>{"use strict";var uhe=_l();KU.exports=new uhe({include:[YS()]})});var YU=w((FZe,GU)=>{"use strict";var ghe=si(),UU=new RegExp("^([0-9][0-9][0-9][0-9])-([0-9][0-9])-([0-9][0-9])$"),HU=new RegExp("^([0-9][0-9][0-9][0-9])-([0-9][0-9]?)-([0-9][0-9]?)(?:[Tt]|[ \\t]+)([0-9][0-9]?):([0-9][0-9]):([0-9][0-9])(?:\\.([0-9]*))?(?:[ \\t]*(Z|([-+])([0-9][0-9]?)(?::([0-9][0-9]))?))?$");function fhe(r){return r===null?!1:UU.exec(r)!==null||HU.exec(r)!==null}function hhe(r){var e,t,i,n,s,o,a,l=0,c=null,u,g,f;if(e=UU.exec(r),e===null&&(e=HU.exec(r)),e===null)throw new Error("Date resolve error");if(t=+e[1],i=+e[2]-1,n=+e[3],!e[4])return new Date(Date.UTC(t,i,n));if(s=+e[4],o=+e[5],a=+e[6],e[7]){for(l=e[7].slice(0,3);l.length<3;)l+="0";l=+l}return e[9]&&(u=+e[10],g=+(e[11]||0),c=(u*60+g)*6e4,e[9]==="-"&&(c=-c)),f=new Date(Date.UTC(t,i,n,s,o,a,l)),c&&f.setTime(f.getTime()-c),f}function phe(r){return r.toISOString()}GU.exports=new ghe("tag:yaml.org,2002:timestamp",{kind:"scalar",resolve:fhe,construct:hhe,instanceOf:Date,represent:phe})});var qU=w((NZe,jU)=>{"use strict";var dhe=si();function Che(r){return r==="<<"||r===null}jU.exports=new dhe("tag:yaml.org,2002:merge",{kind:"scalar",resolve:Che})});var zU=w((LZe,WU)=>{"use strict";var $l;try{JU=J,$l=JU("buffer").Buffer}catch{}var JU,mhe=si(),qS=`ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=
-\r`;function Ehe(r){if(r===null)return!1;var e,t,i=0,n=r.length,s=qS;for(t=0;t<n;t++)if(e=s.indexOf(r.charAt(t)),!(e>64)){if(e<0)return!1;i+=6}return i%8===0}function Ihe(r){var e,t,i=r.replace(/[\r\n=]/g,""),n=i.length,s=qS,o=0,a=[];for(e=0;e<n;e++)e%4===0&&e&&(a.push(o>>16&255),a.push(o>>8&255),a.push(o&255)),o=o<<6|s.indexOf(i.charAt(e));return t=n%4*6,t===0?(a.push(o>>16&255),a.push(o>>8&255),a.push(o&255)):t===18?(a.push(o>>10&255),a.push(o>>2&255)):t===12&&a.push(o>>4&255),$l?$l.from?$l.from(a):new $l(a):a}function yhe(r){var e="",t=0,i,n,s=r.length,o=qS;for(i=0;i<s;i++)i%3===0&&i&&(e+=o[t>>18&63],e+=o[t>>12&63],e+=o[t>>6&63],e+=o[t&63]),t=(t<<8)+r[i];return n=s%3,n===0?(e+=o[t>>18&63],e+=o[t>>12&63],e+=o[t>>6&63],e+=o[t&63]):n===2?(e+=o[t>>10&63],e+=o[t>>4&63],e+=o[t<<2&63],e+=o[64]):n===1&&(e+=o[t>>2&63],e+=o[t<<4&63],e+=o[64],e+=o[64]),e}function whe(r){return $l&&$l.isBuffer(r)}WU.exports=new mhe("tag:yaml.org,2002:binary",{kind:"scalar",resolve:Ehe,construct:Ihe,predicate:whe,represent:yhe})});var XU=w((TZe,VU)=>{"use strict";var Bhe=si(),Qhe=Object.prototype.hasOwnProperty,bhe=Object.prototype.toString;function She(r){if(r===null)return!0;var e=[],t,i,n,s,o,a=r;for(t=0,i=a.length;t<i;t+=1){if(n=a[t],o=!1,bhe.call(n)!=="[object Object]")return!1;for(s in n)if(Qhe.call(n,s))if(!o)o=!0;else return!1;if(!o)return!1;if(e.indexOf(s)===-1)e.push(s);else return!1}return!0}function vhe(r){return r!==null?r:[]}VU.exports=new Bhe("tag:yaml.org,2002:omap",{kind:"sequence",resolve:She,construct:vhe})});var _U=w((OZe,ZU)=>{"use strict";var xhe=si(),Phe=Object.prototype.toString;function Dhe(r){if(r===null)return!0;var e,t,i,n,s,o=r;for(s=new Array(o.length),e=0,t=o.length;e<t;e+=1){if(i=o[e],Phe.call(i)!=="[object Object]"||(n=Object.keys(i),n.length!==1))return!1;s[e]=[n[0],i[n[0]]]}return!0}function khe(r){if(r===null)return[];var e,t,i,n,s,o=r;for(s=new Array(o.length),e=0,t=o.length;e<t;e+=1)i=o[e],n=Object.keys(i),s[e]=[n[0],i[n[0]]];return s}ZU.exports=new xhe("tag:yaml.org,2002:pairs",{kind:"sequence",resolve:Dhe,construct:khe})});var e2=w((MZe,$U)=>{"use strict";var Rhe=si(),Fhe=Object.prototype.hasOwnProperty;function Nhe(r){if(r===null)return!0;var e,t=r;for(e in t)if(Fhe.call(t,e)&&t[e]!==null)return!1;return!0}function Lhe(r){return r!==null?r:{}}$U.exports=new Rhe("tag:yaml.org,2002:set",{kind:"mapping",resolve:Nhe,construct:Lhe})});var Fg=w((KZe,t2)=>{"use strict";var The=_l();t2.exports=new The({include:[jS()],implicit:[YU(),qU()],explicit:[zU(),XU(),_U(),e2()]})});var i2=w((UZe,r2)=>{"use strict";var Ohe=si();function Mhe(){return!0}function Khe(){}function Uhe(){return""}function Hhe(r){return typeof r>"u"}r2.exports=new Ohe("tag:yaml.org,2002:js/undefined",{kind:"scalar",resolve:Mhe,construct:Khe,predicate:Hhe,represent:Uhe})});var s2=w((HZe,n2)=>{"use strict";var Ghe=si();function Yhe(r){if(r===null||r.length===0)return!1;var e=r,t=/\/([gim]*)$/.exec(r),i="";return!(e[0]==="/"&&(t&&(i=t[1]),i.length>3||e[e.length-i.length-1]!=="/"))}function jhe(r){var e=r,t=/\/([gim]*)$/.exec(r),i="";return e[0]==="/"&&(t&&(i=t[1]),e=e.slice(1,e.length-i.length-1)),new RegExp(e,i)}function qhe(r){var e="/"+r.source+"/";return r.global&&(e+="g"),r.multiline&&(e+="m"),r.ignoreCase&&(e+="i"),e}function Jhe(r){return Object.prototype.toString.call(r)==="[object RegExp]"}n2.exports=new Ghe("tag:yaml.org,2002:js/regexp",{kind:"scalar",resolve:Yhe,construct:jhe,predicate:Jhe,represent:qhe})});var A2=w((GZe,a2)=>{"use strict";var hI;try{o2=J,hI=o2("esprima")}catch{typeof window<"u"&&(hI=window.esprima)}var o2,Whe=si();function zhe(r){if(r===null)return!1;try{var e="("+r+")",t=hI.parse(e,{range:!0});return!(t.type!=="Program"||t.body.length!==1||t.body[0].type!=="ExpressionStatement"||t.body[0].expression.type!=="ArrowFunctionExpression"&&t.body[0].expression.type!=="FunctionExpression")}catch{return!1}}function Vhe(r){var e="("+r+")",t=hI.parse(e,{range:!0}),i=[],n;if(t.type!=="Program"||t.body.length!==1||t.body[0].type!=="ExpressionStatement"||t.body[0].expression.type!=="ArrowFunctionExpression"&&t.body[0].expression.type!=="FunctionExpression")throw new Error("Failed to resolve function");return t.body[0].expression.params.forEach(function(s){i.push(s.name)}),n=t.body[0].expression.body.range,t.body[0].expression.body.type==="BlockStatement"?new Function(i,e.slice(n[0]+1,n[1]-1)):new Function(i,"return "+e.slice(n[0],n[1]))}function Xhe(r){return r.toString()}function Zhe(r){return Object.prototype.toString.call(r)==="[object Function]"}a2.exports=new Whe("tag:yaml.org,2002:js/function",{kind:"scalar",resolve:zhe,construct:Vhe,predicate:Zhe,represent:Xhe})});var zp=w((YZe,c2)=>{"use strict";var l2=_l();c2.exports=l2.DEFAULT=new l2({include:[Fg()],explicit:[i2(),s2(),A2()]})});var P2=w((jZe,Vp)=>{"use strict";var ya=Zl(),C2=kg(),_he=CU(),m2=Fg(),$he=zp(),DA=Object.prototype.hasOwnProperty,pI=1,E2=2,I2=3,dI=4,JS=1,epe=2,u2=3,tpe=/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F-\x84\x86-\x9F\uFFFE\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF]/,rpe=/[\x85\u2028\u2029]/,ipe=/[,\[\]\{\}]/,y2=/^(?:!|!!|![a-z\-]+!)$/i,w2=/^(?:!|[^,\[\]\{\}])(?:%[0-9a-f]{2}|[0-9a-z\-#;\/\?:@&=\+\$,_\.!~\*'\(\)\[\]])*$/i;function g2(r){return Object.prototype.toString.call(r)}function vo(r){return r===10||r===13}function tc(r){return r===9||r===32}function un(r){return r===9||r===32||r===10||r===13}function Ng(r){return r===44||r===91||r===93||r===123||r===125}function npe(r){var e;return 48<=r&&r<=57?r-48:(e=r|32,97<=e&&e<=102?e-97+10:-1)}function spe(r){return r===120?2:r===117?4:r===85?8:0}function ope(r){return 48<=r&&r<=57?r-48:-1}function f2(r){return r===48?"\0":r===97?"\x07":r===98?"\b":r===116||r===9?"	":r===110?`
-`:r===118?"\v":r===102?"\f":r===114?"\r":r===101?"\x1B":r===32?" ":r===34?'"':r===47?"/":r===92?"\\":r===78?"\x85":r===95?"\xA0":r===76?"\u2028":r===80?"\u2029":""}function ape(r){return r<=65535?String.fromCharCode(r):String.fromCharCode((r-65536>>10)+55296,(r-65536&1023)+56320)}var B2=new Array(256),Q2=new Array(256);for(ec=0;ec<256;ec++)B2[ec]=f2(ec)?1:0,Q2[ec]=f2(ec);var ec;function Ape(r,e){this.input=r,this.filename=e.filename||null,this.schema=e.schema||$he,this.onWarning=e.onWarning||null,this.legacy=e.legacy||!1,this.json=e.json||!1,this.listener=e.listener||null,this.implicitTypes=this.schema.compiledImplicit,this.typeMap=this.schema.compiledTypeMap,this.length=r.length,this.position=0,this.line=0,this.lineStart=0,this.lineIndent=0,this.documents=[]}function b2(r,e){return new C2(e,new _he(r.filename,r.input,r.position,r.line,r.position-r.lineStart))}function ft(r,e){throw b2(r,e)}function CI(r,e){r.onWarning&&r.onWarning.call(null,b2(r,e))}var h2={YAML:function(e,t,i){var n,s,o;e.version!==null&&ft(e,"duplication of %YAML directive"),i.length!==1&&ft(e,"YAML directive accepts exactly one argument"),n=/^([0-9]+)\.([0-9]+)$/.exec(i[0]),n===null&&ft(e,"ill-formed argument of the YAML directive"),s=parseInt(n[1],10),o=parseInt(n[2],10),s!==1&&ft(e,"unacceptable YAML version of the document"),e.version=i[0],e.checkLineBreaks=o<2,o!==1&&o!==2&&CI(e,"unsupported YAML version of the document")},TAG:function(e,t,i){var n,s;i.length!==2&&ft(e,"TAG directive accepts exactly two arguments"),n=i[0],s=i[1],y2.test(n)||ft(e,"ill-formed tag handle (first argument) of the TAG directive"),DA.call(e.tagMap,n)&&ft(e,'there is a previously declared suffix for "'+n+'" tag handle'),w2.test(s)||ft(e,"ill-formed tag prefix (second argument) of the TAG directive"),e.tagMap[n]=s}};function PA(r,e,t,i){var n,s,o,a;if(e<t){if(a=r.input.slice(e,t),i)for(n=0,s=a.length;n<s;n+=1)o=a.charCodeAt(n),o===9||32<=o&&o<=1114111||ft(r,"expected valid JSON character");else tpe.test(a)&&ft(r,"the stream contains non-printable characters");r.result+=a}}function p2(r,e,t,i){var n,s,o,a;for(ya.isObject(t)||ft(r,"cannot merge mappings; the provided source object is unacceptable"),n=Object.keys(t),o=0,a=n.length;o<a;o+=1)s=n[o],DA.call(e,s)||(e[s]=t[s],i[s]=!0)}function Lg(r,e,t,i,n,s,o,a){var l,c;if(Array.isArray(n))for(n=Array.prototype.slice.call(n),l=0,c=n.length;l<c;l+=1)Array.isArray(n[l])&&ft(r,"nested arrays are not supported inside keys"),typeof n=="object"&&g2(n[l])==="[object Object]"&&(n[l]="[object Object]");if(typeof n=="object"&&g2(n)==="[object Object]"&&(n="[object Object]"),n=String(n),e===null&&(e={}),i==="tag:yaml.org,2002:merge")if(Array.isArray(s))for(l=0,c=s.length;l<c;l+=1)p2(r,e,s[l],t);else p2(r,e,s,t);else!r.json&&!DA.call(t,n)&&DA.call(e,n)&&(r.line=o||r.line,r.position=a||r.position,ft(r,"duplicated mapping key")),e[n]=s,delete t[n];return e}function WS(r){var e;e=r.input.charCodeAt(r.position),e===10?r.position++:e===13?(r.position++,r.input.charCodeAt(r.position)===10&&r.position++):ft(r,"a line break is expected"),r.line+=1,r.lineStart=r.position}function zr(r,e,t){for(var i=0,n=r.input.charCodeAt(r.position);n!==0;){for(;tc(n);)n=r.input.charCodeAt(++r.position);if(e&&n===35)do n=r.input.charCodeAt(++r.position);while(n!==10&&n!==13&&n!==0);if(vo(n))for(WS(r),n=r.input.charCodeAt(r.position),i++,r.lineIndent=0;n===32;)r.lineIndent++,n=r.input.charCodeAt(++r.position);else break}return t!==-1&&i!==0&&r.lineIndent<t&&CI(r,"deficient indentation"),i}function mI(r){var e=r.position,t;return t=r.input.charCodeAt(e),!!((t===45||t===46)&&t===r.input.charCodeAt(e+1)&&t===r.input.charCodeAt(e+2)&&(e+=3,t=r.input.charCodeAt(e),t===0||un(t)))}function zS(r,e){e===1?r.result+=" ":e>1&&(r.result+=ya.repeat(`
-`,e-1))}function lpe(r,e,t){var i,n,s,o,a,l,c,u,g=r.kind,f=r.result,h;if(h=r.input.charCodeAt(r.position),un(h)||Ng(h)||h===35||h===38||h===42||h===33||h===124||h===62||h===39||h===34||h===37||h===64||h===96||(h===63||h===45)&&(n=r.input.charCodeAt(r.position+1),un(n)||t&&Ng(n)))return!1;for(r.kind="scalar",r.result="",s=o=r.position,a=!1;h!==0;){if(h===58){if(n=r.input.charCodeAt(r.position+1),un(n)||t&&Ng(n))break}else if(h===35){if(i=r.input.charCodeAt(r.position-1),un(i))break}else{if(r.position===r.lineStart&&mI(r)||t&&Ng(h))break;if(vo(h))if(l=r.line,c=r.lineStart,u=r.lineIndent,zr(r,!1,-1),r.lineIndent>=e){a=!0,h=r.input.charCodeAt(r.position);continue}else{r.position=o,r.line=l,r.lineStart=c,r.lineIndent=u;break}}a&&(PA(r,s,o,!1),zS(r,r.line-l),s=o=r.position,a=!1),tc(h)||(o=r.position+1),h=r.input.charCodeAt(++r.position)}return PA(r,s,o,!1),r.result?!0:(r.kind=g,r.result=f,!1)}function cpe(r,e){var t,i,n;if(t=r.input.charCodeAt(r.position),t!==39)return!1;for(r.kind="scalar",r.result="",r.position++,i=n=r.position;(t=r.input.charCodeAt(r.position))!==0;)if(t===39)if(PA(r,i,r.position,!0),t=r.input.charCodeAt(++r.position),t===39)i=r.position,r.position++,n=r.position;else return!0;else vo(t)?(PA(r,i,n,!0),zS(r,zr(r,!1,e)),i=n=r.position):r.position===r.lineStart&&mI(r)?ft(r,"unexpected end of the document within a single quoted scalar"):(r.position++,n=r.position);ft(r,"unexpected end of the stream within a single quoted scalar")}function upe(r,e){var t,i,n,s,o,a;if(a=r.input.charCodeAt(r.position),a!==34)return!1;for(r.kind="scalar",r.result="",r.position++,t=i=r.position;(a=r.input.charCodeAt(r.position))!==0;){if(a===34)return PA(r,t,r.position,!0),r.position++,!0;if(a===92){if(PA(r,t,r.position,!0),a=r.input.charCodeAt(++r.position),vo(a))zr(r,!1,e);else if(a<256&&B2[a])r.result+=Q2[a],r.position++;else if((o=spe(a))>0){for(n=o,s=0;n>0;n--)a=r.input.charCodeAt(++r.position),(o=npe(a))>=0?s=(s<<4)+o:ft(r,"expected hexadecimal character");r.result+=ape(s),r.position++}else ft(r,"unknown escape sequence");t=i=r.position}else vo(a)?(PA(r,t,i,!0),zS(r,zr(r,!1,e)),t=i=r.position):r.position===r.lineStart&&mI(r)?ft(r,"unexpected end of the document within a double quoted scalar"):(r.position++,i=r.position)}ft(r,"unexpected end of the stream within a double quoted scalar")}function gpe(r,e){var t=!0,i,n=r.tag,s,o=r.anchor,a,l,c,u,g,f={},h,p,C,y;if(y=r.input.charCodeAt(r.position),y===91)l=93,g=!1,s=[];else if(y===123)l=125,g=!0,s={};else return!1;for(r.anchor!==null&&(r.anchorMap[r.anchor]=s),y=r.input.charCodeAt(++r.position);y!==0;){if(zr(r,!0,e),y=r.input.charCodeAt(r.position),y===l)return r.position++,r.tag=n,r.anchor=o,r.kind=g?"mapping":"sequence",r.result=s,!0;t||ft(r,"missed comma between flow collection entries"),p=h=C=null,c=u=!1,y===63&&(a=r.input.charCodeAt(r.position+1),un(a)&&(c=u=!0,r.position++,zr(r,!0,e))),i=r.line,Tg(r,e,pI,!1,!0),p=r.tag,h=r.result,zr(r,!0,e),y=r.input.charCodeAt(r.position),(u||r.line===i)&&y===58&&(c=!0,y=r.input.charCodeAt(++r.position),zr(r,!0,e),Tg(r,e,pI,!1,!0),C=r.result),g?Lg(r,s,f,p,h,C):c?s.push(Lg(r,null,f,p,h,C)):s.push(h),zr(r,!0,e),y=r.input.charCodeAt(r.position),y===44?(t=!0,y=r.input.charCodeAt(++r.position)):t=!1}ft(r,"unexpected end of the stream within a flow collection")}function fpe(r,e){var t,i,n=JS,s=!1,o=!1,a=e,l=0,c=!1,u,g;if(g=r.input.charCodeAt(r.position),g===124)i=!1;else if(g===62)i=!0;else return!1;for(r.kind="scalar",r.result="";g!==0;)if(g=r.input.charCodeAt(++r.position),g===43||g===45)JS===n?n=g===43?u2:epe:ft(r,"repeat of a chomping mode identifier");else if((u=ope(g))>=0)u===0?ft(r,"bad explicit indentation width of a block scalar; it cannot be less than one"):o?ft(r,"repeat of an indentation width identifier"):(a=e+u-1,o=!0);else break;if(tc(g)){do g=r.input.charCodeAt(++r.position);while(tc(g));if(g===35)do g=r.input.charCodeAt(++r.position);while(!vo(g)&&g!==0)}for(;g!==0;){for(WS(r),r.lineIndent=0,g=r.input.charCodeAt(r.position);(!o||r.lineIndent<a)&&g===32;)r.lineIndent++,g=r.input.charCodeAt(++r.position);if(!o&&r.lineIndent>a&&(a=r.lineIndent),vo(g)){l++;continue}if(r.lineIndent<a){n===u2?r.result+=ya.repeat(`
-`,s?1+l:l):n===JS&&s&&(r.result+=`
-`);break}for(i?tc(g)?(c=!0,r.result+=ya.repeat(`
-`,s?1+l:l)):c?(c=!1,r.result+=ya.repeat(`
-`,l+1)):l===0?s&&(r.result+=" "):r.result+=ya.repeat(`
-`,l):r.result+=ya.repeat(`
-`,s?1+l:l),s=!0,o=!0,l=0,t=r.position;!vo(g)&&g!==0;)g=r.input.charCodeAt(++r.position);PA(r,t,r.position,!1)}return!0}function d2(r,e){var t,i=r.tag,n=r.anchor,s=[],o,a=!1,l;for(r.anchor!==null&&(r.anchorMap[r.anchor]=s),l=r.input.charCodeAt(r.position);l!==0&&!(l!==45||(o=r.input.charCodeAt(r.position+1),!un(o)));){if(a=!0,r.position++,zr(r,!0,-1)&&r.lineIndent<=e){s.push(null),l=r.input.charCodeAt(r.position);continue}if(t=r.line,Tg(r,e,I2,!1,!0),s.push(r.result),zr(r,!0,-1),l=r.input.charCodeAt(r.position),(r.line===t||r.lineIndent>e)&&l!==0)ft(r,"bad indentation of a sequence entry");else if(r.lineIndent<e)break}return a?(r.tag=i,r.anchor=n,r.kind="sequence",r.result=s,!0):!1}function hpe(r,e,t){var i,n,s,o,a=r.tag,l=r.anchor,c={},u={},g=null,f=null,h=null,p=!1,C=!1,y;for(r.anchor!==null&&(r.anchorMap[r.anchor]=c),y=r.input.charCodeAt(r.position);y!==0;){if(i=r.input.charCodeAt(r.position+1),s=r.line,o=r.position,(y===63||y===58)&&un(i))y===63?(p&&(Lg(r,c,u,g,f,null),g=f=h=null),C=!0,p=!0,n=!0):p?(p=!1,n=!0):ft(r,"incomplete explicit mapping pair; a key node is missed; or followed by a non-tabulated empty line"),r.position+=1,y=i;else if(Tg(r,t,E2,!1,!0))if(r.line===s){for(y=r.input.charCodeAt(r.position);tc(y);)y=r.input.charCodeAt(++r.position);if(y===58)y=r.input.charCodeAt(++r.position),un(y)||ft(r,"a whitespace character is expected after the key-value separator within a block mapping"),p&&(Lg(r,c,u,g,f,null),g=f=h=null),C=!0,p=!1,n=!1,g=r.tag,f=r.result;else if(C)ft(r,"can not read an implicit mapping pair; a colon is missed");else return r.tag=a,r.anchor=l,!0}else if(C)ft(r,"can not read a block mapping entry; a multiline key may not be an implicit key");else return r.tag=a,r.anchor=l,!0;else break;if((r.line===s||r.lineIndent>e)&&(Tg(r,e,dI,!0,n)&&(p?f=r.result:h=r.result),p||(Lg(r,c,u,g,f,h,s,o),g=f=h=null),zr(r,!0,-1),y=r.input.charCodeAt(r.position)),r.lineIndent>e&&y!==0)ft(r,"bad indentation of a mapping entry");else if(r.lineIndent<e)break}return p&&Lg(r,c,u,g,f,null),C&&(r.tag=a,r.anchor=l,r.kind="mapping",r.result=c),C}function ppe(r){var e,t=!1,i=!1,n,s,o;if(o=r.input.charCodeAt(r.position),o!==33)return!1;if(r.tag!==null&&ft(r,"duplication of a tag property"),o=r.input.charCodeAt(++r.position),o===60?(t=!0,o=r.input.charCodeAt(++r.position)):o===33?(i=!0,n="!!",o=r.input.charCodeAt(++r.position)):n="!",e=r.position,t){do o=r.input.charCodeAt(++r.position);while(o!==0&&o!==62);r.position<r.length?(s=r.input.slice(e,r.position),o=r.input.charCodeAt(++r.position)):ft(r,"unexpected end of the stream within a verbatim tag")}else{for(;o!==0&&!un(o);)o===33&&(i?ft(r,"tag suffix cannot contain exclamation marks"):(n=r.input.slice(e-1,r.position+1),y2.test(n)||ft(r,"named tag handle cannot contain such characters"),i=!0,e=r.position+1)),o=r.input.charCodeAt(++r.position);s=r.input.slice(e,r.position),ipe.test(s)&&ft(r,"tag suffix cannot contain flow indicator characters")}return s&&!w2.test(s)&&ft(r,"tag name cannot contain such characters: "+s),t?r.tag=s:DA.call(r.tagMap,n)?r.tag=r.tagMap[n]+s:n==="!"?r.tag="!"+s:n==="!!"?r.tag="tag:yaml.org,2002:"+s:ft(r,'undeclared tag handle "'+n+'"'),!0}function dpe(r){var e,t;if(t=r.input.charCodeAt(r.position),t!==38)return!1;for(r.anchor!==null&&ft(r,"duplication of an anchor property"),t=r.input.charCodeAt(++r.position),e=r.position;t!==0&&!un(t)&&!Ng(t);)t=r.input.charCodeAt(++r.position);return r.position===e&&ft(r,"name of an anchor node must contain at least one character"),r.anchor=r.input.slice(e,r.position),!0}function Cpe(r){var e,t,i;if(i=r.input.charCodeAt(r.position),i!==42)return!1;for(i=r.input.charCodeAt(++r.position),e=r.position;i!==0&&!un(i)&&!Ng(i);)i=r.input.charCodeAt(++r.position);return r.position===e&&ft(r,"name of an alias node must contain at least one character"),t=r.input.slice(e,r.position),DA.call(r.anchorMap,t)||ft(r,'unidentified alias "'+t+'"'),r.result=r.anchorMap[t],zr(r,!0,-1),!0}function Tg(r,e,t,i,n){var s,o,a,l=1,c=!1,u=!1,g,f,h,p,C;if(r.listener!==null&&r.listener("open",r),r.tag=null,r.anchor=null,r.kind=null,r.result=null,s=o=a=dI===t||I2===t,i&&zr(r,!0,-1)&&(c=!0,r.lineIndent>e?l=1:r.lineIndent===e?l=0:r.lineIndent<e&&(l=-1)),l===1)for(;ppe(r)||dpe(r);)zr(r,!0,-1)?(c=!0,a=s,r.lineIndent>e?l=1:r.lineIndent===e?l=0:r.lineIndent<e&&(l=-1)):a=!1;if(a&&(a=c||n),(l===1||dI===t)&&(pI===t||E2===t?p=e:p=e+1,C=r.position-r.lineStart,l===1?a&&(d2(r,C)||hpe(r,C,p))||gpe(r,p)?u=!0:(o&&fpe(r,p)||cpe(r,p)||upe(r,p)?u=!0:Cpe(r)?(u=!0,(r.tag!==null||r.anchor!==null)&&ft(r,"alias node should not have any properties")):lpe(r,p,pI===t)&&(u=!0,r.tag===null&&(r.tag="?")),r.anchor!==null&&(r.anchorMap[r.anchor]=r.result)):l===0&&(u=a&&d2(r,C))),r.tag!==null&&r.tag!=="!")if(r.tag==="?"){for(r.result!==null&&r.kind!=="scalar"&&ft(r,'unacceptable node kind for !<?> tag; it should be "scalar", not "'+r.kind+'"'),g=0,f=r.implicitTypes.length;g<f;g+=1)if(h=r.implicitTypes[g],h.resolve(r.result)){r.result=h.construct(r.result),r.tag=h.tag,r.anchor!==null&&(r.anchorMap[r.anchor]=r.result);break}}else DA.call(r.typeMap[r.kind||"fallback"],r.tag)?(h=r.typeMap[r.kind||"fallback"][r.tag],r.result!==null&&h.kind!==r.kind&&ft(r,"unacceptable node kind for !<"+r.tag+'> tag; it should be "'+h.kind+'", not "'+r.kind+'"'),h.resolve(r.result)?(r.result=h.construct(r.result),r.anchor!==null&&(r.anchorMap[r.anchor]=r.result)):ft(r,"cannot resolve a node with !<"+r.tag+"> explicit tag")):ft(r,"unknown tag !<"+r.tag+">");return r.listener!==null&&r.listener("close",r),r.tag!==null||r.anchor!==null||u}function mpe(r){var e=r.position,t,i,n,s=!1,o;for(r.version=null,r.checkLineBreaks=r.legacy,r.tagMap={},r.anchorMap={};(o=r.input.charCodeAt(r.position))!==0&&(zr(r,!0,-1),o=r.input.charCodeAt(r.position),!(r.lineIndent>0||o!==37));){for(s=!0,o=r.input.charCodeAt(++r.position),t=r.position;o!==0&&!un(o);)o=r.input.charCodeAt(++r.position);for(i=r.input.slice(t,r.position),n=[],i.length<1&&ft(r,"directive name must not be less than one character in length");o!==0;){for(;tc(o);)o=r.input.charCodeAt(++r.position);if(o===35){do o=r.input.charCodeAt(++r.position);while(o!==0&&!vo(o));break}if(vo(o))break;for(t=r.position;o!==0&&!un(o);)o=r.input.charCodeAt(++r.position);n.push(r.input.slice(t,r.position))}o!==0&&WS(r),DA.call(h2,i)?h2[i](r,i,n):CI(r,'unknown document directive "'+i+'"')}if(zr(r,!0,-1),r.lineIndent===0&&r.input.charCodeAt(r.position)===45&&r.input.charCodeAt(r.position+1)===45&&r.input.charCodeAt(r.position+2)===45?(r.position+=3,zr(r,!0,-1)):s&&ft(r,"directives end mark is expected"),Tg(r,r.lineIndent-1,dI,!1,!0),zr(r,!0,-1),r.checkLineBreaks&&rpe.test(r.input.slice(e,r.position))&&CI(r,"non-ASCII line breaks are interpreted as content"),r.documents.push(r.result),r.position===r.lineStart&&mI(r)){r.input.charCodeAt(r.position)===46&&(r.position+=3,zr(r,!0,-1));return}if(r.position<r.length-1)ft(r,"end of the stream or a document separator is expected");else return}function S2(r,e){r=String(r),e=e||{},r.length!==0&&(r.charCodeAt(r.length-1)!==10&&r.charCodeAt(r.length-1)!==13&&(r+=`
-`),r.charCodeAt(0)===65279&&(r=r.slice(1)));var t=new Ape(r,e),i=r.indexOf("\0");for(i!==-1&&(t.position=i,ft(t,"null byte is not allowed in input")),t.input+="\0";t.input.charCodeAt(t.position)===32;)t.lineIndent+=1,t.position+=1;for(;t.position<t.length-1;)mpe(t);return t.documents}function v2(r,e,t){e!==null&&typeof e=="object"&&typeof t>"u"&&(t=e,e=null);var i=S2(r,t);if(typeof e!="function")return i;for(var n=0,s=i.length;n<s;n+=1)e(i[n])}function x2(r,e){var t=S2(r,e);if(t.length!==0){if(t.length===1)return t[0];throw new C2("expected a single document in the stream, but found more")}}function Epe(r,e,t){return typeof e=="object"&&e!==null&&typeof t>"u"&&(t=e,e=null),v2(r,e,ya.extend({schema:m2},t))}function Ipe(r,e){return x2(r,ya.extend({schema:m2},e))}Vp.exports.loadAll=v2;Vp.exports.load=x2;Vp.exports.safeLoadAll=Epe;Vp.exports.safeLoad=Ipe});var _2=w((qZe,_S)=>{"use strict";var Zp=Zl(),_p=kg(),ype=zp(),wpe=Fg(),O2=Object.prototype.toString,M2=Object.prototype.hasOwnProperty,Bpe=9,Xp=10,Qpe=13,bpe=32,Spe=33,vpe=34,K2=35,xpe=37,Ppe=38,Dpe=39,kpe=42,U2=44,Rpe=45,H2=58,Fpe=61,Npe=62,Lpe=63,Tpe=64,G2=91,Y2=93,Ope=96,j2=123,Mpe=124,q2=125,Ni={};Ni[0]="\\0";Ni[7]="\\a";Ni[8]="\\b";Ni[9]="\\t";Ni[10]="\\n";Ni[11]="\\v";Ni[12]="\\f";Ni[13]="\\r";Ni[27]="\\e";Ni[34]='\\"';Ni[92]="\\\\";Ni[133]="\\N";Ni[160]="\\_";Ni[8232]="\\L";Ni[8233]="\\P";var Kpe=["y","Y","yes","Yes","YES","on","On","ON","n","N","no","No","NO","off","Off","OFF"];function Upe(r,e){var t,i,n,s,o,a,l;if(e===null)return{};for(t={},i=Object.keys(e),n=0,s=i.length;n<s;n+=1)o=i[n],a=String(e[o]),o.slice(0,2)==="!!"&&(o="tag:yaml.org,2002:"+o.slice(2)),l=r.compiledTypeMap.fallback[o],l&&M2.call(l.styleAliases,a)&&(a=l.styleAliases[a]),t[o]=a;return t}function D2(r){var e,t,i;if(e=r.toString(16).toUpperCase(),r<=255)t="x",i=2;else if(r<=65535)t="u",i=4;else if(r<=4294967295)t="U",i=8;else throw new _p("code point within a string may not be greater than 0xFFFFFFFF");return"\\"+t+Zp.repeat("0",i-e.length)+e}function Hpe(r){this.schema=r.schema||ype,this.indent=Math.max(1,r.indent||2),this.noArrayIndent=r.noArrayIndent||!1,this.skipInvalid=r.skipInvalid||!1,this.flowLevel=Zp.isNothing(r.flowLevel)?-1:r.flowLevel,this.styleMap=Upe(this.schema,r.styles||null),this.sortKeys=r.sortKeys||!1,this.lineWidth=r.lineWidth||80,this.noRefs=r.noRefs||!1,this.noCompatMode=r.noCompatMode||!1,this.condenseFlow=r.condenseFlow||!1,this.implicitTypes=this.schema.compiledImplicit,this.explicitTypes=this.schema.compiledExplicit,this.tag=null,this.result="",this.duplicates=[],this.usedDuplicates=null}function k2(r,e){for(var t=Zp.repeat(" ",e),i=0,n=-1,s="",o,a=r.length;i<a;)n=r.indexOf(`
-`,i),n===-1?(o=r.slice(i),i=a):(o=r.slice(i,n+1),i=n+1),o.length&&o!==`
-`&&(s+=t),s+=o;return s}function VS(r,e){return`
-`+Zp.repeat(" ",r.indent*e)}function Gpe(r,e){var t,i,n;for(t=0,i=r.implicitTypes.length;t<i;t+=1)if(n=r.implicitTypes[t],n.resolve(e))return!0;return!1}function ZS(r){return r===bpe||r===Bpe}function Og(r){return 32<=r&&r<=126||161<=r&&r<=55295&&r!==8232&&r!==8233||57344<=r&&r<=65533&&r!==65279||65536<=r&&r<=1114111}function Ype(r){return Og(r)&&!ZS(r)&&r!==65279&&r!==Qpe&&r!==Xp}function R2(r,e){return Og(r)&&r!==65279&&r!==U2&&r!==G2&&r!==Y2&&r!==j2&&r!==q2&&r!==H2&&(r!==K2||e&&Ype(e))}function jpe(r){return Og(r)&&r!==65279&&!ZS(r)&&r!==Rpe&&r!==Lpe&&r!==H2&&r!==U2&&r!==G2&&r!==Y2&&r!==j2&&r!==q2&&r!==K2&&r!==Ppe&&r!==kpe&&r!==Spe&&r!==Mpe&&r!==Fpe&&r!==Npe&&r!==Dpe&&r!==vpe&&r!==xpe&&r!==Tpe&&r!==Ope}function J2(r){var e=/^\n* /;return e.test(r)}var W2=1,z2=2,V2=3,X2=4,EI=5;function qpe(r,e,t,i,n){var s,o,a,l=!1,c=!1,u=i!==-1,g=-1,f=jpe(r.charCodeAt(0))&&!ZS(r.charCodeAt(r.length-1));if(e)for(s=0;s<r.length;s++){if(o=r.charCodeAt(s),!Og(o))return EI;a=s>0?r.charCodeAt(s-1):null,f=f&&R2(o,a)}else{for(s=0;s<r.length;s++){if(o=r.charCodeAt(s),o===Xp)l=!0,u&&(c=c||s-g-1>i&&r[g+1]!==" ",g=s);else if(!Og(o))return EI;a=s>0?r.charCodeAt(s-1):null,f=f&&R2(o,a)}c=c||u&&s-g-1>i&&r[g+1]!==" "}return!l&&!c?f&&!n(r)?W2:z2:t>9&&J2(r)?EI:c?X2:V2}function Jpe(r,e,t,i){r.dump=function(){if(e.length===0)return"''";if(!r.noCompatMode&&Kpe.indexOf(e)!==-1)return"'"+e+"'";var n=r.indent*Math.max(1,t),s=r.lineWidth===-1?-1:Math.max(Math.min(r.lineWidth,40),r.lineWidth-n),o=i||r.flowLevel>-1&&t>=r.flowLevel;function a(l){return Gpe(r,l)}switch(qpe(e,o,r.indent,s,a)){case W2:return e;case z2:return"'"+e.replace(/'/g,"''")+"'";case V2:return"|"+F2(e,r.indent)+N2(k2(e,n));case X2:return">"+F2(e,r.indent)+N2(k2(Wpe(e,s),n));case EI:return'"'+zpe(e,s)+'"';default:throw new _p("impossible error: invalid scalar style")}}()}function F2(r,e){var t=J2(r)?String(e):"",i=r[r.length-1]===`
-`,n=i&&(r[r.length-2]===`
-`||r===`
-`),s=n?"+":i?"":"-";return t+s+`
-`}function N2(r){return r[r.length-1]===`
-`?r.slice(0,-1):r}function Wpe(r,e){for(var t=/(\n+)([^\n]*)/g,i=function(){var c=r.indexOf(`
-`);return c=c!==-1?c:r.length,t.lastIndex=c,L2(r.slice(0,c),e)}(),n=r[0]===`
-`||r[0]===" ",s,o;o=t.exec(r);){var a=o[1],l=o[2];s=l[0]===" ",i+=a+(!n&&!s&&l!==""?`
-`:"")+L2(l,e),n=s}return i}function L2(r,e){if(r===""||r[0]===" ")return r;for(var t=/ [^ ]/g,i,n=0,s,o=0,a=0,l="";i=t.exec(r);)a=i.index,a-n>e&&(s=o>n?o:a,l+=`
-`+r.slice(n,s),n=s+1),o=a;return l+=`
-`,r.length-n>e&&o>n?l+=r.slice(n,o)+`
-`+r.slice(o+1):l+=r.slice(n),l.slice(1)}function zpe(r){for(var e="",t,i,n,s=0;s<r.length;s++){if(t=r.charCodeAt(s),t>=55296&&t<=56319&&(i=r.charCodeAt(s+1),i>=56320&&i<=57343)){e+=D2((t-55296)*1024+i-56320+65536),s++;continue}n=Ni[t],e+=!n&&Og(t)?r[s]:n||D2(t)}return e}function Vpe(r,e,t){var i="",n=r.tag,s,o;for(s=0,o=t.length;s<o;s+=1)rc(r,e,t[s],!1,!1)&&(s!==0&&(i+=","+(r.condenseFlow?"":" ")),i+=r.dump);r.tag=n,r.dump="["+i+"]"}function Xpe(r,e,t,i){var n="",s=r.tag,o,a;for(o=0,a=t.length;o<a;o+=1)rc(r,e+1,t[o],!0,!0)&&((!i||o!==0)&&(n+=VS(r,e)),r.dump&&Xp===r.dump.charCodeAt(0)?n+="-":n+="- ",n+=r.dump);r.tag=s,r.dump=n||"[]"}function Zpe(r,e,t){var i="",n=r.tag,s=Object.keys(t),o,a,l,c,u;for(o=0,a=s.length;o<a;o+=1)u="",o!==0&&(u+=", "),r.condenseFlow&&(u+='"'),l=s[o],c=t[l],rc(r,e,l,!1,!1)&&(r.dump.length>1024&&(u+="? "),u+=r.dump+(r.condenseFlow?'"':"")+":"+(r.condenseFlow?"":" "),rc(r,e,c,!1,!1)&&(u+=r.dump,i+=u));r.tag=n,r.dump="{"+i+"}"}function _pe(r,e,t,i){var n="",s=r.tag,o=Object.keys(t),a,l,c,u,g,f;if(r.sortKeys===!0)o.sort();else if(typeof r.sortKeys=="function")o.sort(r.sortKeys);else if(r.sortKeys)throw new _p("sortKeys must be a boolean or a function");for(a=0,l=o.length;a<l;a+=1)f="",(!i||a!==0)&&(f+=VS(r,e)),c=o[a],u=t[c],rc(r,e+1,c,!0,!0,!0)&&(g=r.tag!==null&&r.tag!=="?"||r.dump&&r.dump.length>1024,g&&(r.dump&&Xp===r.dump.charCodeAt(0)?f+="?":f+="? "),f+=r.dump,g&&(f+=VS(r,e)),rc(r,e+1,u,!0,g)&&(r.dump&&Xp===r.dump.charCodeAt(0)?f+=":":f+=": ",f+=r.dump,n+=f));r.tag=s,r.dump=n||"{}"}function T2(r,e,t){var i,n,s,o,a,l;for(n=t?r.explicitTypes:r.implicitTypes,s=0,o=n.length;s<o;s+=1)if(a=n[s],(a.instanceOf||a.predicate)&&(!a.instanceOf||typeof e=="object"&&e instanceof a.instanceOf)&&(!a.predicate||a.predicate(e))){if(r.tag=t?a.tag:"?",a.represent){if(l=r.styleMap[a.tag]||a.defaultStyle,O2.call(a.represent)==="[object Function]")i=a.represent(e,l);else if(M2.call(a.represent,l))i=a.represent[l](e,l);else throw new _p("!<"+a.tag+'> tag resolver accepts not "'+l+'" style');r.dump=i}return!0}return!1}function rc(r,e,t,i,n,s){r.tag=null,r.dump=t,T2(r,t,!1)||T2(r,t,!0);var o=O2.call(r.dump);i&&(i=r.flowLevel<0||r.flowLevel>e);var a=o==="[object Object]"||o==="[object Array]",l,c;if(a&&(l=r.duplicates.indexOf(t),c=l!==-1),(r.tag!==null&&r.tag!=="?"||c||r.indent!==2&&e>0)&&(n=!1),c&&r.usedDuplicates[l])r.dump="*ref_"+l;else{if(a&&c&&!r.usedDuplicates[l]&&(r.usedDuplicates[l]=!0),o==="[object Object]")i&&Object.keys(r.dump).length!==0?(_pe(r,e,r.dump,n),c&&(r.dump="&ref_"+l+r.dump)):(Zpe(r,e,r.dump),c&&(r.dump="&ref_"+l+" "+r.dump));else if(o==="[object Array]"){var u=r.noArrayIndent&&e>0?e-1:e;i&&r.dump.length!==0?(Xpe(r,u,r.dump,n),c&&(r.dump="&ref_"+l+r.dump)):(Vpe(r,u,r.dump),c&&(r.dump="&ref_"+l+" "+r.dump))}else if(o==="[object String]")r.tag!=="?"&&Jpe(r,r.dump,e,s);else{if(r.skipInvalid)return!1;throw new _p("unacceptable kind of an object to dump "+o)}r.tag!==null&&r.tag!=="?"&&(r.dump="!<"+r.tag+"> "+r.dump)}return!0}function $pe(r,e){var t=[],i=[],n,s;for(XS(r,t,i),n=0,s=i.length;n<s;n+=1)e.duplicates.push(t[i[n]]);e.usedDuplicates=new Array(s)}function XS(r,e,t){var i,n,s;if(r!==null&&typeof r=="object")if(n=e.indexOf(r),n!==-1)t.indexOf(n)===-1&&t.push(n);else if(e.push(r),Array.isArray(r))for(n=0,s=r.length;n<s;n+=1)XS(r[n],e,t);else for(i=Object.keys(r),n=0,s=i.length;n<s;n+=1)XS(r[i[n]],e,t)}function Z2(r,e){e=e||{};var t=new Hpe(e);return t.noRefs||$pe(r,t),rc(t,0,r,!0,!0)?t.dump+`
-`:""}function ede(r,e){return Z2(r,Zp.extend({schema:wpe},e))}_S.exports.dump=Z2;_S.exports.safeDump=ede});var eH=w((JZe,Fr)=>{"use strict";var II=P2(),$2=_2();function yI(r){return function(){throw new Error("Function "+r+" is deprecated and cannot be used.")}}Fr.exports.Type=si();Fr.exports.Schema=_l();Fr.exports.FAILSAFE_SCHEMA=fI();Fr.exports.JSON_SCHEMA=YS();Fr.exports.CORE_SCHEMA=jS();Fr.exports.DEFAULT_SAFE_SCHEMA=Fg();Fr.exports.DEFAULT_FULL_SCHEMA=zp();Fr.exports.load=II.load;Fr.exports.loadAll=II.loadAll;Fr.exports.safeLoad=II.safeLoad;Fr.exports.safeLoadAll=II.safeLoadAll;Fr.exports.dump=$2.dump;Fr.exports.safeDump=$2.safeDump;Fr.exports.YAMLException=kg();Fr.exports.MINIMAL_SCHEMA=fI();Fr.exports.SAFE_SCHEMA=Fg();Fr.exports.DEFAULT_SCHEMA=zp();Fr.exports.scan=yI("scan");Fr.exports.parse=yI("parse");Fr.exports.compose=yI("compose");Fr.exports.addConstructor=yI("addConstructor")});var rH=w((WZe,tH)=>{"use strict";var tde=eH();tH.exports=tde});var nH=w((zZe,iH)=>{"use strict";function rde(r,e){function t(){this.constructor=r}t.prototype=e.prototype,r.prototype=new t}function ic(r,e,t,i){this.message=r,this.expected=e,this.found=t,this.location=i,this.name="SyntaxError",typeof Error.captureStackTrace=="function"&&Error.captureStackTrace(this,ic)}rde(ic,Error);ic.buildMessage=function(r,e){var t={literal:function(c){return'"'+n(c.text)+'"'},class:function(c){var u="",g;for(g=0;g<c.parts.length;g++)u+=c.parts[g]instanceof Array?s(c.parts[g][0])+"-"+s(c.parts[g][1]):s(c.parts[g]);return"["+(c.inverted?"^":"")+u+"]"},any:function(c){return"any character"},end:function(c){return"end of input"},other:function(c){return c.description}};function i(c){return c.charCodeAt(0).toString(16).toUpperCase()}function n(c){return c.replace(/\\/g,"\\\\").replace(/"/g,'\\"').replace(/\0/g,"\\0").replace(/\t/g,"\\t").replace(/\n/g,"\\n").replace(/\r/g,"\\r").replace(/[\x00-\x0F]/g,function(u){return"\\x0"+i(u)}).replace(/[\x10-\x1F\x7F-\x9F]/g,function(u){return"\\x"+i(u)})}function s(c){return c.replace(/\\/g,"\\\\").replace(/\]/g,"\\]").replace(/\^/g,"\\^").replace(/-/g,"\\-").replace(/\0/g,"\\0").replace(/\t/g,"\\t").replace(/\n/g,"\\n").replace(/\r/g,"\\r").replace(/[\x00-\x0F]/g,function(u){return"\\x0"+i(u)}).replace(/[\x10-\x1F\x7F-\x9F]/g,function(u){return"\\x"+i(u)})}function o(c){return t[c.type](c)}function a(c){var u=new Array(c.length),g,f;for(g=0;g<c.length;g++)u[g]=o(c[g]);if(u.sort(),u.length>0){for(g=1,f=1;g<u.length;g++)u[g-1]!==u[g]&&(u[f]=u[g],f++);u.length=f}switch(u.length){case 1:return u[0];case 2:return u[0]+" or "+u[1];default:return u.slice(0,-1).join(", ")+", or "+u[u.length-1]}}function l(c){return c?'"'+n(c)+'"':"end of input"}return"Expected "+a(r)+" but "+l(e)+" found."};function ide(r,e){e=e!==void 0?e:{};var t={},i={Start:Ks},n=Ks,s=function(R){return[].concat(...R)},o="-",a=ar("-",!1),l=function(R){return R},c=function(R){return Object.assign({},...R)},u="#",g=ar("#",!1),f=Ll(),h=function(){return{}},p=":",C=ar(":",!1),y=function(R,q){return{[R]:q}},B=",",v=ar(",",!1),D=function(R,q){return q},L=function(R,q,Ce){return Object.assign({},...[R].concat(q).map(Ke=>({[Ke]:Ce})))},H=function(R){return R},j=function(R){return R},$=Ms("correct indentation"),V=" ",W=ar(" ",!1),_=function(R){return R.length===BA*mg},A=function(R){return R.length===(BA+1)*mg},ae=function(){return BA++,!0},ge=function(){return BA--,!0},re=function(){return gg()},O=Ms("pseudostring"),F=/^[^\r\n\t ?:,\][{}#&*!|>'"%@`\-]/,ue=Fn(["\r",`
-`,"	"," ","?",":",",","]","[","{","}","#","&","*","!","|",">","'",'"',"%","@","`","-"],!0,!1),he=/^[^\r\n\t ,\][{}:#"']/,ke=Fn(["\r",`
-`,"	"," ",",","]","[","{","}",":","#",'"',"'"],!0,!1),Fe=function(){return gg().replace(/^ *| *$/g,"")},Ne="--",oe=ar("--",!1),le=/^[a-zA-Z\/0-9]/,we=Fn([["a","z"],["A","Z"],"/",["0","9"]],!1,!1),fe=/^[^\r\n\t :,]/,Ae=Fn(["\r",`
-`,"	"," ",":",","],!0,!1),qe="null",ne=ar("null",!1),Y=function(){return null},pe="true",ie=ar("true",!1),de=function(){return!0},_e="false",Pt=ar("false",!1),It=function(){return!1},Or=Ms("string"),ii='"',gi=ar('"',!1),hr=function(){return""},fi=function(R){return R},ni=function(R){return R.join("")},Os=/^[^"\\\0-\x1F\x7F]/,pr=Fn(['"',"\\",["\0",""],"\x7F"],!0,!1),Ii='\\"',es=ar('\\"',!1),ua=function(){return'"'},pA="\\\\",ag=ar("\\\\",!1),ts=function(){return"\\"},dA="\\/",ga=ar("\\/",!1),yp=function(){return"/"},CA="\\b",mA=ar("\\b",!1),wr=function(){return"\b"},kl="\\f",Ag=ar("\\f",!1),Io=function(){return"\f"},lg="\\n",wp=ar("\\n",!1),Bp=function(){return`
-`},vr="\\r",se=ar("\\r",!1),yo=function(){return"\r"},kn="\\t",cg=ar("\\t",!1),Qt=function(){return"	"},Rl="\\u",Rn=ar("\\u",!1),rs=function(R,q,Ce,Ke){return String.fromCharCode(parseInt(`0x${R}${q}${Ce}${Ke}`))},is=/^[0-9a-fA-F]/,gt=Fn([["0","9"],["a","f"],["A","F"]],!1,!1),wo=Ms("blank space"),At=/^[ \t]/,an=Fn([" ","	"],!1,!1),S=Ms("white space"),Tt=/^[ \t\n\r]/,ug=Fn([" ","	",`
-`,"\r"],!1,!1),Fl=`\r
-`,Qp=ar(`\r
-`,!1),bp=`
-`,Sp=ar(`
-`,!1),vp="\r",xp=ar("\r",!1),G=0,yt=0,EA=[{line:1,column:1}],Ji=0,Nl=[],Xe=0,fa;if("startRule"in e){if(!(e.startRule in i))throw new Error(`Can't start parsing from rule "`+e.startRule+'".');n=i[e.startRule]}function gg(){return r.substring(yt,G)}function FE(){return An(yt,G)}function Pp(R,q){throw q=q!==void 0?q:An(yt,G),Tl([Ms(R)],r.substring(yt,G),q)}function NE(R,q){throw q=q!==void 0?q:An(yt,G),fg(R,q)}function ar(R,q){return{type:"literal",text:R,ignoreCase:q}}function Fn(R,q,Ce){return{type:"class",parts:R,inverted:q,ignoreCase:Ce}}function Ll(){return{type:"any"}}function Dp(){return{type:"end"}}function Ms(R){return{type:"other",description:R}}function ha(R){var q=EA[R],Ce;if(q)return q;for(Ce=R-1;!EA[Ce];)Ce--;for(q=EA[Ce],q={line:q.line,column:q.column};Ce<R;)r.charCodeAt(Ce)===10?(q.line++,q.column=1):q.column++,Ce++;return EA[R]=q,q}function An(R,q){var Ce=ha(R),Ke=ha(q);return{start:{offset:R,line:Ce.line,column:Ce.column},end:{offset:q,line:Ke.line,column:Ke.column}}}function Te(R){G<Ji||(G>Ji&&(Ji=G,Nl=[]),Nl.push(R))}function fg(R,q){return new ic(R,null,null,q)}function Tl(R,q,Ce){return new ic(ic.buildMessage(R,q),R,q,Ce)}function Ks(){var R;return R=hg(),R}function Ol(){var R,q,Ce;for(R=G,q=[],Ce=IA();Ce!==t;)q.push(Ce),Ce=IA();return q!==t&&(yt=R,q=s(q)),R=q,R}function IA(){var R,q,Ce,Ke,Re;return R=G,q=da(),q!==t?(r.charCodeAt(G)===45?(Ce=o,G++):(Ce=t,Xe===0&&Te(a)),Ce!==t?(Ke=Rr(),Ke!==t?(Re=pa(),Re!==t?(yt=R,q=l(Re),R=q):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)):(G=R,R=t),R}function hg(){var R,q,Ce;for(R=G,q=[],Ce=pg();Ce!==t;)q.push(Ce),Ce=pg();return q!==t&&(yt=R,q=c(q)),R=q,R}function pg(){var R,q,Ce,Ke,Re,ze,dt,Ft,Nn;if(R=G,q=Rr(),q===t&&(q=null),q!==t){if(Ce=G,r.charCodeAt(G)===35?(Ke=u,G++):(Ke=t,Xe===0&&Te(g)),Ke!==t){if(Re=[],ze=G,dt=G,Xe++,Ft=Gs(),Xe--,Ft===t?dt=void 0:(G=dt,dt=t),dt!==t?(r.length>G?(Ft=r.charAt(G),G++):(Ft=t,Xe===0&&Te(f)),Ft!==t?(dt=[dt,Ft],ze=dt):(G=ze,ze=t)):(G=ze,ze=t),ze!==t)for(;ze!==t;)Re.push(ze),ze=G,dt=G,Xe++,Ft=Gs(),Xe--,Ft===t?dt=void 0:(G=dt,dt=t),dt!==t?(r.length>G?(Ft=r.charAt(G),G++):(Ft=t,Xe===0&&Te(f)),Ft!==t?(dt=[dt,Ft],ze=dt):(G=ze,ze=t)):(G=ze,ze=t);else Re=t;Re!==t?(Ke=[Ke,Re],Ce=Ke):(G=Ce,Ce=t)}else G=Ce,Ce=t;if(Ce===t&&(Ce=null),Ce!==t){if(Ke=[],Re=Hs(),Re!==t)for(;Re!==t;)Ke.push(Re),Re=Hs();else Ke=t;Ke!==t?(yt=R,q=h(),R=q):(G=R,R=t)}else G=R,R=t}else G=R,R=t;if(R===t&&(R=G,q=da(),q!==t?(Ce=Ml(),Ce!==t?(Ke=Rr(),Ke===t&&(Ke=null),Ke!==t?(r.charCodeAt(G)===58?(Re=p,G++):(Re=t,Xe===0&&Te(C)),Re!==t?(ze=Rr(),ze===t&&(ze=null),ze!==t?(dt=pa(),dt!==t?(yt=R,q=y(Ce,dt),R=q):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)):(G=R,R=t),R===t&&(R=G,q=da(),q!==t?(Ce=Us(),Ce!==t?(Ke=Rr(),Ke===t&&(Ke=null),Ke!==t?(r.charCodeAt(G)===58?(Re=p,G++):(Re=t,Xe===0&&Te(C)),Re!==t?(ze=Rr(),ze===t&&(ze=null),ze!==t?(dt=pa(),dt!==t?(yt=R,q=y(Ce,dt),R=q):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)):(G=R,R=t),R===t))){if(R=G,q=da(),q!==t)if(Ce=Us(),Ce!==t)if(Ke=Rr(),Ke!==t)if(Re=LE(),Re!==t){if(ze=[],dt=Hs(),dt!==t)for(;dt!==t;)ze.push(dt),dt=Hs();else ze=t;ze!==t?(yt=R,q=y(Ce,Re),R=q):(G=R,R=t)}else G=R,R=t;else G=R,R=t;else G=R,R=t;else G=R,R=t;if(R===t)if(R=G,q=da(),q!==t)if(Ce=Us(),Ce!==t){if(Ke=[],Re=G,ze=Rr(),ze===t&&(ze=null),ze!==t?(r.charCodeAt(G)===44?(dt=B,G++):(dt=t,Xe===0&&Te(v)),dt!==t?(Ft=Rr(),Ft===t&&(Ft=null),Ft!==t?(Nn=Us(),Nn!==t?(yt=Re,ze=D(Ce,Nn),Re=ze):(G=Re,Re=t)):(G=Re,Re=t)):(G=Re,Re=t)):(G=Re,Re=t),Re!==t)for(;Re!==t;)Ke.push(Re),Re=G,ze=Rr(),ze===t&&(ze=null),ze!==t?(r.charCodeAt(G)===44?(dt=B,G++):(dt=t,Xe===0&&Te(v)),dt!==t?(Ft=Rr(),Ft===t&&(Ft=null),Ft!==t?(Nn=Us(),Nn!==t?(yt=Re,ze=D(Ce,Nn),Re=ze):(G=Re,Re=t)):(G=Re,Re=t)):(G=Re,Re=t)):(G=Re,Re=t);else Ke=t;Ke!==t?(Re=Rr(),Re===t&&(Re=null),Re!==t?(r.charCodeAt(G)===58?(ze=p,G++):(ze=t,Xe===0&&Te(C)),ze!==t?(dt=Rr(),dt===t&&(dt=null),dt!==t?(Ft=pa(),Ft!==t?(yt=R,q=L(Ce,Ke,Ft),R=q):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)}else G=R,R=t;else G=R,R=t}return R}function pa(){var R,q,Ce,Ke,Re,ze,dt;if(R=G,q=G,Xe++,Ce=G,Ke=Gs(),Ke!==t?(Re=rt(),Re!==t?(r.charCodeAt(G)===45?(ze=o,G++):(ze=t,Xe===0&&Te(a)),ze!==t?(dt=Rr(),dt!==t?(Ke=[Ke,Re,ze,dt],Ce=Ke):(G=Ce,Ce=t)):(G=Ce,Ce=t)):(G=Ce,Ce=t)):(G=Ce,Ce=t),Xe--,Ce!==t?(G=q,q=void 0):q=t,q!==t?(Ce=Hs(),Ce!==t?(Ke=Bo(),Ke!==t?(Re=Ol(),Re!==t?(ze=yA(),ze!==t?(yt=R,q=H(Re),R=q):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)):(G=R,R=t),R===t&&(R=G,q=Gs(),q!==t?(Ce=Bo(),Ce!==t?(Ke=hg(),Ke!==t?(Re=yA(),Re!==t?(yt=R,q=H(Ke),R=q):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)):(G=R,R=t),R===t))if(R=G,q=Kl(),q!==t){if(Ce=[],Ke=Hs(),Ke!==t)for(;Ke!==t;)Ce.push(Ke),Ke=Hs();else Ce=t;Ce!==t?(yt=R,q=j(q),R=q):(G=R,R=t)}else G=R,R=t;return R}function da(){var R,q,Ce;for(Xe++,R=G,q=[],r.charCodeAt(G)===32?(Ce=V,G++):(Ce=t,Xe===0&&Te(W));Ce!==t;)q.push(Ce),r.charCodeAt(G)===32?(Ce=V,G++):(Ce=t,Xe===0&&Te(W));return q!==t?(yt=G,Ce=_(q),Ce?Ce=void 0:Ce=t,Ce!==t?(q=[q,Ce],R=q):(G=R,R=t)):(G=R,R=t),Xe--,R===t&&(q=t,Xe===0&&Te($)),R}function rt(){var R,q,Ce;for(R=G,q=[],r.charCodeAt(G)===32?(Ce=V,G++):(Ce=t,Xe===0&&Te(W));Ce!==t;)q.push(Ce),r.charCodeAt(G)===32?(Ce=V,G++):(Ce=t,Xe===0&&Te(W));return q!==t?(yt=G,Ce=A(q),Ce?Ce=void 0:Ce=t,Ce!==t?(q=[q,Ce],R=q):(G=R,R=t)):(G=R,R=t),R}function Bo(){var R;return yt=G,R=ae(),R?R=void 0:R=t,R}function yA(){var R;return yt=G,R=ge(),R?R=void 0:R=t,R}function Ml(){var R;return R=Ul(),R===t&&(R=kp()),R}function Us(){var R,q,Ce;if(R=Ul(),R===t){if(R=G,q=[],Ce=dg(),Ce!==t)for(;Ce!==t;)q.push(Ce),Ce=dg();else q=t;q!==t&&(yt=R,q=re()),R=q}return R}function Kl(){var R;return R=Rp(),R===t&&(R=TE(),R===t&&(R=Ul(),R===t&&(R=kp()))),R}function LE(){var R;return R=Rp(),R===t&&(R=Ul(),R===t&&(R=dg())),R}function kp(){var R,q,Ce,Ke,Re,ze;if(Xe++,R=G,F.test(r.charAt(G))?(q=r.charAt(G),G++):(q=t,Xe===0&&Te(ue)),q!==t){for(Ce=[],Ke=G,Re=Rr(),Re===t&&(Re=null),Re!==t?(he.test(r.charAt(G))?(ze=r.charAt(G),G++):(ze=t,Xe===0&&Te(ke)),ze!==t?(Re=[Re,ze],Ke=Re):(G=Ke,Ke=t)):(G=Ke,Ke=t);Ke!==t;)Ce.push(Ke),Ke=G,Re=Rr(),Re===t&&(Re=null),Re!==t?(he.test(r.charAt(G))?(ze=r.charAt(G),G++):(ze=t,Xe===0&&Te(ke)),ze!==t?(Re=[Re,ze],Ke=Re):(G=Ke,Ke=t)):(G=Ke,Ke=t);Ce!==t?(yt=R,q=Fe(),R=q):(G=R,R=t)}else G=R,R=t;return Xe--,R===t&&(q=t,Xe===0&&Te(O)),R}function dg(){var R,q,Ce,Ke,Re;if(R=G,r.substr(G,2)===Ne?(q=Ne,G+=2):(q=t,Xe===0&&Te(oe)),q===t&&(q=null),q!==t)if(le.test(r.charAt(G))?(Ce=r.charAt(G),G++):(Ce=t,Xe===0&&Te(we)),Ce!==t){for(Ke=[],fe.test(r.charAt(G))?(Re=r.charAt(G),G++):(Re=t,Xe===0&&Te(Ae));Re!==t;)Ke.push(Re),fe.test(r.charAt(G))?(Re=r.charAt(G),G++):(Re=t,Xe===0&&Te(Ae));Ke!==t?(yt=R,q=Fe(),R=q):(G=R,R=t)}else G=R,R=t;else G=R,R=t;return R}function Rp(){var R,q;return R=G,r.substr(G,4)===qe?(q=qe,G+=4):(q=t,Xe===0&&Te(ne)),q!==t&&(yt=R,q=Y()),R=q,R}function TE(){var R,q;return R=G,r.substr(G,4)===pe?(q=pe,G+=4):(q=t,Xe===0&&Te(ie)),q!==t&&(yt=R,q=de()),R=q,R===t&&(R=G,r.substr(G,5)===_e?(q=_e,G+=5):(q=t,Xe===0&&Te(Pt)),q!==t&&(yt=R,q=It()),R=q),R}function Ul(){var R,q,Ce,Ke;return Xe++,R=G,r.charCodeAt(G)===34?(q=ii,G++):(q=t,Xe===0&&Te(gi)),q!==t?(r.charCodeAt(G)===34?(Ce=ii,G++):(Ce=t,Xe===0&&Te(gi)),Ce!==t?(yt=R,q=hr(),R=q):(G=R,R=t)):(G=R,R=t),R===t&&(R=G,r.charCodeAt(G)===34?(q=ii,G++):(q=t,Xe===0&&Te(gi)),q!==t?(Ce=OE(),Ce!==t?(r.charCodeAt(G)===34?(Ke=ii,G++):(Ke=t,Xe===0&&Te(gi)),Ke!==t?(yt=R,q=fi(Ce),R=q):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)),Xe--,R===t&&(q=t,Xe===0&&Te(Or)),R}function OE(){var R,q,Ce;if(R=G,q=[],Ce=Cg(),Ce!==t)for(;Ce!==t;)q.push(Ce),Ce=Cg();else q=t;return q!==t&&(yt=R,q=ni(q)),R=q,R}function Cg(){var R,q,Ce,Ke,Re,ze;return Os.test(r.charAt(G))?(R=r.charAt(G),G++):(R=t,Xe===0&&Te(pr)),R===t&&(R=G,r.substr(G,2)===Ii?(q=Ii,G+=2):(q=t,Xe===0&&Te(es)),q!==t&&(yt=R,q=ua()),R=q,R===t&&(R=G,r.substr(G,2)===pA?(q=pA,G+=2):(q=t,Xe===0&&Te(ag)),q!==t&&(yt=R,q=ts()),R=q,R===t&&(R=G,r.substr(G,2)===dA?(q=dA,G+=2):(q=t,Xe===0&&Te(ga)),q!==t&&(yt=R,q=yp()),R=q,R===t&&(R=G,r.substr(G,2)===CA?(q=CA,G+=2):(q=t,Xe===0&&Te(mA)),q!==t&&(yt=R,q=wr()),R=q,R===t&&(R=G,r.substr(G,2)===kl?(q=kl,G+=2):(q=t,Xe===0&&Te(Ag)),q!==t&&(yt=R,q=Io()),R=q,R===t&&(R=G,r.substr(G,2)===lg?(q=lg,G+=2):(q=t,Xe===0&&Te(wp)),q!==t&&(yt=R,q=Bp()),R=q,R===t&&(R=G,r.substr(G,2)===vr?(q=vr,G+=2):(q=t,Xe===0&&Te(se)),q!==t&&(yt=R,q=yo()),R=q,R===t&&(R=G,r.substr(G,2)===kn?(q=kn,G+=2):(q=t,Xe===0&&Te(cg)),q!==t&&(yt=R,q=Qt()),R=q,R===t&&(R=G,r.substr(G,2)===Rl?(q=Rl,G+=2):(q=t,Xe===0&&Te(Rn)),q!==t?(Ce=wA(),Ce!==t?(Ke=wA(),Ke!==t?(Re=wA(),Re!==t?(ze=wA(),ze!==t?(yt=R,q=rs(Ce,Ke,Re,ze),R=q):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)))))))))),R}function wA(){var R;return is.test(r.charAt(G))?(R=r.charAt(G),G++):(R=t,Xe===0&&Te(gt)),R}function Rr(){var R,q;if(Xe++,R=[],At.test(r.charAt(G))?(q=r.charAt(G),G++):(q=t,Xe===0&&Te(an)),q!==t)for(;q!==t;)R.push(q),At.test(r.charAt(G))?(q=r.charAt(G),G++):(q=t,Xe===0&&Te(an));else R=t;return Xe--,R===t&&(q=t,Xe===0&&Te(wo)),R}function ME(){var R,q;if(Xe++,R=[],Tt.test(r.charAt(G))?(q=r.charAt(G),G++):(q=t,Xe===0&&Te(ug)),q!==t)for(;q!==t;)R.push(q),Tt.test(r.charAt(G))?(q=r.charAt(G),G++):(q=t,Xe===0&&Te(ug));else R=t;return Xe--,R===t&&(q=t,Xe===0&&Te(S)),R}function Hs(){var R,q,Ce,Ke,Re,ze;if(R=G,q=Gs(),q!==t){for(Ce=[],Ke=G,Re=Rr(),Re===t&&(Re=null),Re!==t?(ze=Gs(),ze!==t?(Re=[Re,ze],Ke=Re):(G=Ke,Ke=t)):(G=Ke,Ke=t);Ke!==t;)Ce.push(Ke),Ke=G,Re=Rr(),Re===t&&(Re=null),Re!==t?(ze=Gs(),ze!==t?(Re=[Re,ze],Ke=Re):(G=Ke,Ke=t)):(G=Ke,Ke=t);Ce!==t?(q=[q,Ce],R=q):(G=R,R=t)}else G=R,R=t;return R}function Gs(){var R;return r.substr(G,2)===Fl?(R=Fl,G+=2):(R=t,Xe===0&&Te(Qp)),R===t&&(r.charCodeAt(G)===10?(R=bp,G++):(R=t,Xe===0&&Te(Sp)),R===t&&(r.charCodeAt(G)===13?(R=vp,G++):(R=t,Xe===0&&Te(xp)))),R}let mg=2,BA=0;if(fa=n(),fa!==t&&G===r.length)return fa;throw fa!==t&&G<r.length&&Te(Dp()),Tl(Nl,Ji<r.length?r.charAt(Ji):null,Ji<r.length?An(Ji,Ji+1):An(Ji,Ji))}iH.exports={SyntaxError:ic,parse:ide}});var cH=w(($Ze,ev)=>{"use strict";var Ade=r=>{let e=!1,t=!1,i=!1;for(let n=0;n<r.length;n++){let s=r[n];e&&/[a-zA-Z]/.test(s)&&s.toUpperCase()===s?(r=r.slice(0,n)+"-"+r.slice(n),e=!1,i=t,t=!0,n++):t&&i&&/[a-zA-Z]/.test(s)&&s.toLowerCase()===s?(r=r.slice(0,n-1)+"-"+r.slice(n-1),i=t,t=!1,e=!0):(e=s.toLowerCase()===s&&s.toUpperCase()!==s,i=t,t=s.toUpperCase()===s&&s.toLowerCase()!==s)}return r},lH=(r,e)=>{if(!(typeof r=="string"||Array.isArray(r)))throw new TypeError("Expected the input to be `string | string[]`");e=Object.assign({pascalCase:!1},e);let t=n=>e.pascalCase?n.charAt(0).toUpperCase()+n.slice(1):n;return Array.isArray(r)?r=r.map(n=>n.trim()).filter(n=>n.length).join("-"):r=r.trim(),r.length===0?"":r.length===1?e.pascalCase?r.toUpperCase():r.toLowerCase():(r!==r.toLowerCase()&&(r=Ade(r)),r=r.replace(/^[_.\- ]+/,"").toLowerCase().replace(/[_.\- ]+(\w|$)/g,(n,s)=>s.toUpperCase()).replace(/\d+(\w|$)/g,n=>n.toUpperCase()),t(r))};ev.exports=lH;ev.exports.default=lH});var uH=w((e_e,lde)=>{lde.exports=[{name:"AppVeyor",constant:"APPVEYOR",env:"APPVEYOR",pr:"APPVEYOR_PULL_REQUEST_NUMBER"},{name:"Azure Pipelines",constant:"AZURE_PIPELINES",env:"SYSTEM_TEAMFOUNDATIONCOLLECTIONURI",pr:"SYSTEM_PULLREQUEST_PULLREQUESTID"},{name:"Appcircle",constant:"APPCIRCLE",env:"AC_APPCIRCLE"},{name:"Bamboo",constant:"BAMBOO",env:"bamboo_planKey"},{name:"Bitbucket Pipelines",constant:"BITBUCKET",env:"BITBUCKET_COMMIT",pr:"BITBUCKET_PR_ID"},{name:"Bitrise",constant:"BITRISE",env:"BITRISE_IO",pr:"BITRISE_PULL_REQUEST"},{name:"Buddy",constant:"BUDDY",env:"BUDDY_WORKSPACE_ID",pr:"BUDDY_EXECUTION_PULL_REQUEST_ID"},{name:"Buildkite",constant:"BUILDKITE",env:"BUILDKITE",pr:{env:"BUILDKITE_PULL_REQUEST",ne:"false"}},{name:"CircleCI",constant:"CIRCLE",env:"CIRCLECI",pr:"CIRCLE_PULL_REQUEST"},{name:"Cirrus CI",constant:"CIRRUS",env:"CIRRUS_CI",pr:"CIRRUS_PR"},{name:"AWS CodeBuild",constant:"CODEBUILD",env:"CODEBUILD_BUILD_ARN"},{name:"Codefresh",constant:"CODEFRESH",env:"CF_BUILD_ID",pr:{any:["CF_PULL_REQUEST_NUMBER","CF_PULL_REQUEST_ID"]}},{name:"Codeship",constant:"CODESHIP",env:{CI_NAME:"codeship"}},{name:"Drone",constant:"DRONE",env:"DRONE",pr:{DRONE_BUILD_EVENT:"pull_request"}},{name:"dsari",constant:"DSARI",env:"DSARI"},{name:"GitHub Actions",constant:"GITHUB_ACTIONS",env:"GITHUB_ACTIONS",pr:{GITHUB_EVENT_NAME:"pull_request"}},{name:"GitLab CI",constant:"GITLAB",env:"GITLAB_CI",pr:"CI_MERGE_REQUEST_ID"},{name:"GoCD",constant:"GOCD",env:"GO_PIPELINE_LABEL"},{name:"LayerCI",constant:"LAYERCI",env:"LAYERCI",pr:"LAYERCI_PULL_REQUEST"},{name:"Hudson",constant:"HUDSON",env:"HUDSON_URL"},{name:"Jenkins",constant:"JENKINS",env:["JENKINS_URL","BUILD_ID"],pr:{any:["ghprbPullId","CHANGE_ID"]}},{name:"Magnum CI",constant:"MAGNUM",env:"MAGNUM"},{name:"Netlify CI",constant:"NETLIFY",env:"NETLIFY",pr:{env:"PULL_REQUEST",ne:"false"}},{name:"Nevercode",constant:"NEVERCODE",env:"NEVERCODE",pr:{env:"NEVERCODE_PULL_REQUEST",ne:"false"}},{name:"Render",constant:"RENDER",env:"RENDER",pr:{IS_PULL_REQUEST:"true"}},{name:"Sail CI",constant:"SAIL",env:"SAILCI",pr:"SAIL_PULL_REQUEST_NUMBER"},{name:"Semaphore",constant:"SEMAPHORE",env:"SEMAPHORE",pr:"PULL_REQUEST_NUMBER"},{name:"Screwdriver",constant:"SCREWDRIVER",env:"SCREWDRIVER",pr:{env:"SD_PULL_REQUEST",ne:"false"}},{name:"Shippable",constant:"SHIPPABLE",env:"SHIPPABLE",pr:{IS_PULL_REQUEST:"true"}},{name:"Solano CI",constant:"SOLANO",env:"TDDIUM",pr:"TDDIUM_PR_ID"},{name:"Strider CD",constant:"STRIDER",env:"STRIDER"},{name:"TaskCluster",constant:"TASKCLUSTER",env:["TASK_ID","RUN_ID"]},{name:"TeamCity",constant:"TEAMCITY",env:"TEAMCITY_VERSION"},{name:"Travis CI",constant:"TRAVIS",env:"TRAVIS",pr:{env:"TRAVIS_PULL_REQUEST",ne:"false"}},{name:"Vercel",constant:"VERCEL",env:"NOW_BUILDER"},{name:"Visual Studio App Center",constant:"APPCENTER",env:"APPCENTER_BUILD_ID"}]});var nc=w(Mn=>{"use strict";var fH=uH(),xo=process.env;Object.defineProperty(Mn,"_vendors",{value:fH.map(function(r){return r.constant})});Mn.name=null;Mn.isPR=null;fH.forEach(function(r){let t=(Array.isArray(r.env)?r.env:[r.env]).every(function(i){return gH(i)});if(Mn[r.constant]=t,t)switch(Mn.name=r.name,typeof r.pr){case"string":Mn.isPR=!!xo[r.pr];break;case"object":"env"in r.pr?Mn.isPR=r.pr.env in xo&&xo[r.pr.env]!==r.pr.ne:"any"in r.pr?Mn.isPR=r.pr.any.some(function(i){return!!xo[i]}):Mn.isPR=gH(r.pr);break;default:Mn.isPR=null}});Mn.isCI=!!(xo.CI||xo.CONTINUOUS_INTEGRATION||xo.BUILD_NUMBER||xo.RUN_ID||Mn.name);function gH(r){return typeof r=="string"?!!xo[r]:Object.keys(r).every(function(e){return xo[e]===r[e]})}});var gn={};ut(gn,{KeyRelationship:()=>sc,applyCascade:()=>nd,base64RegExp:()=>mH,colorStringAlphaRegExp:()=>CH,colorStringRegExp:()=>dH,computeKey:()=>kA,getPrintable:()=>Vr,hasExactLength:()=>BH,hasForbiddenKeys:()=>Hde,hasKeyRelationship:()=>av,hasMaxLength:()=>Qde,hasMinLength:()=>Bde,hasMutuallyExclusiveKeys:()=>Gde,hasRequiredKeys:()=>Ude,hasUniqueItems:()=>bde,isArray:()=>pde,isAtLeast:()=>xde,isAtMost:()=>Pde,isBase64:()=>Mde,isBoolean:()=>gde,isDate:()=>hde,isDict:()=>Cde,isEnum:()=>Vi,isHexColor:()=>Ode,isISO8601:()=>Tde,isInExclusiveRange:()=>kde,isInInclusiveRange:()=>Dde,isInstanceOf:()=>Ede,isInteger:()=>Rde,isJSON:()=>Kde,isLiteral:()=>cde,isLowerCase:()=>Fde,isNegative:()=>Sde,isNullable:()=>wde,isNumber:()=>fde,isObject:()=>mde,isOneOf:()=>Ide,isOptional:()=>yde,isPositive:()=>vde,isString:()=>id,isTuple:()=>dde,isUUID4:()=>Lde,isUnknown:()=>wH,isUpperCase:()=>Nde,iso8601RegExp:()=>ov,makeCoercionFn:()=>oc,makeSetter:()=>yH,makeTrait:()=>IH,makeValidator:()=>bt,matchesRegExp:()=>sd,plural:()=>vI,pushError:()=>pt,simpleKeyRegExp:()=>pH,uuid4RegExp:()=>EH});function bt({test:r}){return IH(r)()}function Vr(r){return r===null?"null":r===void 0?"undefined":r===""?"an empty string":JSON.stringify(r)}function kA(r,e){var t,i,n;return typeof e=="number"?`${(t=r==null?void 0:r.p)!==null&&t!==void 0?t:"."}[${e}]`:pH.test(e)?`${(i=r==null?void 0:r.p)!==null&&i!==void 0?i:""}.${e}`:`${(n=r==null?void 0:r.p)!==null&&n!==void 0?n:"."}[${JSON.stringify(e)}]`}function oc(r,e){return t=>{let i=r[e];return r[e]=t,oc(r,e).bind(null,i)}}function yH(r,e){return t=>{r[e]=t}}function vI(r,e,t){return r===1?e:t}function pt({errors:r,p:e}={},t){return r==null||r.push(`${e!=null?e:"."}: ${t}`),!1}function cde(r){return bt({test:(e,t)=>e!==r?pt(t,`Expected a literal (got ${Vr(r)})`):!0})}function Vi(r){let e=Array.isArray(r)?r:Object.values(r),t=new Set(e);return bt({test:(i,n)=>t.has(i)?!0:pt(n,`Expected a valid enumeration value (got ${Vr(i)})`)})}var pH,dH,CH,mH,EH,ov,IH,wH,id,ude,gde,fde,hde,pde,dde,Cde,mde,Ede,Ide,nd,yde,wde,Bde,Qde,BH,bde,Sde,vde,xde,Pde,Dde,kde,Rde,sd,Fde,Nde,Lde,Tde,Ode,Mde,Kde,Ude,Hde,Gde,sc,Yde,av,as=Pge(()=>{pH=/^[a-zA-Z_][a-zA-Z0-9_]*$/,dH=/^#[0-9a-f]{6}$/i,CH=/^#[0-9a-f]{6}([0-9a-f]{2})?$/i,mH=/^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/,EH=/^[a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[89aAbB][a-f0-9]{3}-[a-f0-9]{12}$/i,ov=/^(?:[1-9]\d{3}(-?)(?:(?:0[1-9]|1[0-2])\1(?:0[1-9]|1\d|2[0-8])|(?:0[13-9]|1[0-2])\1(?:29|30)|(?:0[13578]|1[02])(?:\1)31|00[1-9]|0[1-9]\d|[12]\d{2}|3(?:[0-5]\d|6[0-5]))|(?:[1-9]\d(?:0[48]|[2468][048]|[13579][26])|(?:[2468][048]|[13579][26])00)(?:(-?)02(?:\2)29|-?366))T(?:[01]\d|2[0-3])(:?)[0-5]\d(?:\3[0-5]\d)?(?:Z|[+-][01]\d(?:\3[0-5]\d)?)$/,IH=r=>()=>r;wH=()=>bt({test:(r,e)=>!0});id=()=>bt({test:(r,e)=>typeof r!="string"?pt(e,`Expected a string (got ${Vr(r)})`):!0});ude=new Map([["true",!0],["True",!0],["1",!0],[1,!0],["false",!1],["False",!1],["0",!1],[0,!1]]),gde=()=>bt({test:(r,e)=>{var t;if(typeof r!="boolean"){if(typeof(e==null?void 0:e.coercions)<"u"){if(typeof(e==null?void 0:e.coercion)>"u")return pt(e,"Unbound coercion result");let i=ude.get(r);if(typeof i<"u")return e.coercions.push([(t=e.p)!==null&&t!==void 0?t:".",e.coercion.bind(null,i)]),!0}return pt(e,`Expected a boolean (got ${Vr(r)})`)}return!0}}),fde=()=>bt({test:(r,e)=>{var t;if(typeof r!="number"){if(typeof(e==null?void 0:e.coercions)<"u"){if(typeof(e==null?void 0:e.coercion)>"u")return pt(e,"Unbound coercion result");let i;if(typeof r=="string"){let n;try{n=JSON.parse(r)}catch{}if(typeof n=="number")if(JSON.stringify(n)===r)i=n;else return pt(e,`Received a number that can't be safely represented by the runtime (${r})`)}if(typeof i<"u")return e.coercions.push([(t=e.p)!==null&&t!==void 0?t:".",e.coercion.bind(null,i)]),!0}return pt(e,`Expected a number (got ${Vr(r)})`)}return!0}}),hde=()=>bt({test:(r,e)=>{var t;if(!(r instanceof Date)){if(typeof(e==null?void 0:e.coercions)<"u"){if(typeof(e==null?void 0:e.coercion)>"u")return pt(e,"Unbound coercion result");let i;if(typeof r=="string"&&ov.test(r))i=new Date(r);else{let n;if(typeof r=="string"){let s;try{s=JSON.parse(r)}catch{}typeof s=="number"&&(n=s)}else typeof r=="number"&&(n=r);if(typeof n<"u")if(Number.isSafeInteger(n)||!Number.isSafeInteger(n*1e3))i=new Date(n*1e3);else return pt(e,`Received a timestamp that can't be safely represented by the runtime (${r})`)}if(typeof i<"u")return e.coercions.push([(t=e.p)!==null&&t!==void 0?t:".",e.coercion.bind(null,i)]),!0}return pt(e,`Expected a date (got ${Vr(r)})`)}return!0}}),pde=(r,{delimiter:e}={})=>bt({test:(t,i)=>{var n;if(typeof t=="string"&&typeof e<"u"&&typeof(i==null?void 0:i.coercions)<"u"){if(typeof(i==null?void 0:i.coercion)>"u")return pt(i,"Unbound coercion result");t=t.split(e),i.coercions.push([(n=i.p)!==null&&n!==void 0?n:".",i.coercion.bind(null,t)])}if(!Array.isArray(t))return pt(i,`Expected an array (got ${Vr(t)})`);let s=!0;for(let o=0,a=t.length;o<a&&(s=r(t[o],Object.assign(Object.assign({},i),{p:kA(i,o),coercion:oc(t,o)}))&&s,!(!s&&(i==null?void 0:i.errors)==null));++o);return s}}),dde=(r,{delimiter:e}={})=>{let t=BH(r.length);return bt({test:(i,n)=>{var s;if(typeof i=="string"&&typeof e<"u"&&typeof(n==null?void 0:n.coercions)<"u"){if(typeof(n==null?void 0:n.coercion)>"u")return pt(n,"Unbound coercion result");i=i.split(e),n.coercions.push([(s=n.p)!==null&&s!==void 0?s:".",n.coercion.bind(null,i)])}if(!Array.isArray(i))return pt(n,`Expected a tuple (got ${Vr(i)})`);let o=t(i,Object.assign({},n));for(let a=0,l=i.length;a<l&&a<r.length&&(o=r[a](i[a],Object.assign(Object.assign({},n),{p:kA(n,a),coercion:oc(i,a)}))&&o,!(!o&&(n==null?void 0:n.errors)==null));++a);return o}})},Cde=(r,{keys:e=null}={})=>bt({test:(t,i)=>{if(typeof t!="object"||t===null)return pt(i,`Expected an object (got ${Vr(t)})`);let n=Object.keys(t),s=!0;for(let o=0,a=n.length;o<a&&(s||(i==null?void 0:i.errors)!=null);++o){let l=n[o],c=t[l];if(l==="__proto__"||l==="constructor"){s=pt(Object.assign(Object.assign({},i),{p:kA(i,l)}),"Unsafe property name");continue}if(e!==null&&!e(l,i)){s=!1;continue}if(!r(c,Object.assign(Object.assign({},i),{p:kA(i,l),coercion:oc(t,l)}))){s=!1;continue}}return s}}),mde=(r,{extra:e=null}={})=>{let t=Object.keys(r);return bt({test:(i,n)=>{if(typeof i!="object"||i===null)return pt(n,`Expected an object (got ${Vr(i)})`);let s=new Set([...t,...Object.keys(i)]),o={},a=!0;for(let l of s){if(l==="constructor"||l==="__proto__")a=pt(Object.assign(Object.assign({},n),{p:kA(n,l)}),"Unsafe property name");else{let c=Object.prototype.hasOwnProperty.call(r,l)?r[l]:void 0,u=Object.prototype.hasOwnProperty.call(i,l)?i[l]:void 0;typeof c<"u"?a=c(u,Object.assign(Object.assign({},n),{p:kA(n,l),coercion:oc(i,l)}))&&a:e===null?a=pt(Object.assign(Object.assign({},n),{p:kA(n,l)}),`Extraneous property (got ${Vr(u)})`):Object.defineProperty(o,l,{enumerable:!0,get:()=>u,set:yH(i,l)})}if(!a&&(n==null?void 0:n.errors)==null)break}return e!==null&&(a||(n==null?void 0:n.errors)!=null)&&(a=e(o,n)&&a),a}})},Ede=r=>bt({test:(e,t)=>e instanceof r?!0:pt(t,`Expected an instance of ${r.name} (got ${Vr(e)})`)}),Ide=(r,{exclusive:e=!1}={})=>bt({test:(t,i)=>{var n,s,o;let a=[],l=typeof(i==null?void 0:i.errors)<"u"?[]:void 0;for(let c=0,u=r.length;c<u;++c){let g=typeof(i==null?void 0:i.errors)<"u"?[]:void 0,f=typeof(i==null?void 0:i.coercions)<"u"?[]:void 0;if(r[c](t,Object.assign(Object.assign({},i),{errors:g,coercions:f,p:`${(n=i==null?void 0:i.p)!==null&&n!==void 0?n:"."}#${c+1}`}))){if(a.push([`#${c+1}`,f]),!e)break}else l==null||l.push(g[0])}if(a.length===1){let[,c]=a[0];return typeof c<"u"&&((s=i==null?void 0:i.coercions)===null||s===void 0||s.push(...c)),!0}return a.length>1?pt(i,`Expected to match exactly a single predicate (matched ${a.join(", ")})`):(o=i==null?void 0:i.errors)===null||o===void 0||o.push(...l),!1}}),nd=(r,e)=>bt({test:(t,i)=>{var n,s;let o={value:t},a=typeof(i==null?void 0:i.coercions)<"u"?oc(o,"value"):void 0,l=typeof(i==null?void 0:i.coercions)<"u"?[]:void 0;if(!r(t,Object.assign(Object.assign({},i),{coercion:a,coercions:l})))return!1;let c=[];if(typeof l<"u")for(let[,u]of l)c.push(u());try{if(typeof(i==null?void 0:i.coercions)<"u"){if(o.value!==t){if(typeof(i==null?void 0:i.coercion)>"u")return pt(i,"Unbound coercion result");i.coercions.push([(n=i.p)!==null&&n!==void 0?n:".",i.coercion.bind(null,o.value)])}(s=i==null?void 0:i.coercions)===null||s===void 0||s.push(...l)}return e.every(u=>u(o.value,i))}finally{for(let u of c)u()}}}),yde=r=>bt({test:(e,t)=>typeof e>"u"?!0:r(e,t)}),wde=r=>bt({test:(e,t)=>e===null?!0:r(e,t)}),Bde=r=>bt({test:(e,t)=>e.length>=r?!0:pt(t,`Expected to have a length of at least ${r} elements (got ${e.length})`)}),Qde=r=>bt({test:(e,t)=>e.length<=r?!0:pt(t,`Expected to have a length of at most ${r} elements (got ${e.length})`)}),BH=r=>bt({test:(e,t)=>e.length!==r?pt(t,`Expected to have a length of exactly ${r} elements (got ${e.length})`):!0}),bde=({map:r}={})=>bt({test:(e,t)=>{let i=new Set,n=new Set;for(let s=0,o=e.length;s<o;++s){let a=e[s],l=typeof r<"u"?r(a):a;if(i.has(l)){if(n.has(l))continue;pt(t,`Expected to contain unique elements; got a duplicate with ${Vr(e)}`),n.add(l)}else i.add(l)}return n.size===0}}),Sde=()=>bt({test:(r,e)=>r<=0?!0:pt(e,`Expected to be negative (got ${r})`)}),vde=()=>bt({test:(r,e)=>r>=0?!0:pt(e,`Expected to be positive (got ${r})`)}),xde=r=>bt({test:(e,t)=>e>=r?!0:pt(t,`Expected to be at least ${r} (got ${e})`)}),Pde=r=>bt({test:(e,t)=>e<=r?!0:pt(t,`Expected to be at most ${r} (got ${e})`)}),Dde=(r,e)=>bt({test:(t,i)=>t>=r&&t<=e?!0:pt(i,`Expected to be in the [${r}; ${e}] range (got ${t})`)}),kde=(r,e)=>bt({test:(t,i)=>t>=r&&t<e?!0:pt(i,`Expected to be in the [${r}; ${e}[ range (got ${t})`)}),Rde=({unsafe:r=!1}={})=>bt({test:(e,t)=>e!==Math.round(e)?pt(t,`Expected to be an integer (got ${e})`):Number.isSafeInteger(e)?!0:pt(t,`Expected to be a safe integer (got ${e})`)}),sd=r=>bt({test:(e,t)=>r.test(e)?!0:pt(t,`Expected to match the pattern ${r.toString()} (got ${Vr(e)})`)}),Fde=()=>bt({test:(r,e)=>r!==r.toLowerCase()?pt(e,`Expected to be all-lowercase (got ${r})`):!0}),Nde=()=>bt({test:(r,e)=>r!==r.toUpperCase()?pt(e,`Expected to be all-uppercase (got ${r})`):!0}),Lde=()=>bt({test:(r,e)=>EH.test(r)?!0:pt(e,`Expected to be a valid UUID v4 (got ${Vr(r)})`)}),Tde=()=>bt({test:(r,e)=>ov.test(r)?!1:pt(e,`Expected to be a valid ISO 8601 date string (got ${Vr(r)})`)}),Ode=({alpha:r=!1})=>bt({test:(e,t)=>(r?dH.test(e):CH.test(e))?!0:pt(t,`Expected to be a valid hexadecimal color string (got ${Vr(e)})`)}),Mde=()=>bt({test:(r,e)=>mH.test(r)?!0:pt(e,`Expected to be a valid base 64 string (got ${Vr(r)})`)}),Kde=(r=wH())=>bt({test:(e,t)=>{let i;try{i=JSON.parse(e)}catch{return pt(t,`Expected to be a valid JSON string (got ${Vr(e)})`)}return r(i,t)}}),Ude=r=>{let e=new Set(r);return bt({test:(t,i)=>{let n=new Set(Object.keys(t)),s=[];for(let o of e)n.has(o)||s.push(o);return s.length>0?pt(i,`Missing required ${vI(s.length,"property","properties")} ${s.map(o=>`"${o}"`).join(", ")}`):!0}})},Hde=r=>{let e=new Set(r);return bt({test:(t,i)=>{let n=new Set(Object.keys(t)),s=[];for(let o of e)n.has(o)&&s.push(o);return s.length>0?pt(i,`Forbidden ${vI(s.length,"property","properties")} ${s.map(o=>`"${o}"`).join(", ")}`):!0}})},Gde=r=>{let e=new Set(r);return bt({test:(t,i)=>{let n=new Set(Object.keys(t)),s=[];for(let o of e)n.has(o)&&s.push(o);return s.length>1?pt(i,`Mutually exclusive properties ${s.map(o=>`"${o}"`).join(", ")}`):!0}})};(function(r){r.Forbids="Forbids",r.Requires="Requires"})(sc||(sc={}));Yde={[sc.Forbids]:{expect:!1,message:"forbids using"},[sc.Requires]:{expect:!0,message:"requires using"}},av=(r,e,t,{ignore:i=[]}={})=>{let n=new Set(i),s=new Set(t),o=Yde[e];return bt({test:(a,l)=>{let c=new Set(Object.keys(a));if(!c.has(r)||n.has(a[r]))return!0;let u=[];for(let g of s)(c.has(g)&&!n.has(a[g]))!==o.expect&&u.push(g);return u.length>=1?pt(l,`Property "${r}" ${o.message} ${vI(u.length,"property","properties")} ${u.map(g=>`"${g}"`).join(", ")}`):!0}})}});var UH=w((e$e,KH)=>{"use strict";KH.exports=(r,...e)=>new Promise(t=>{t(r(...e))})});var Yg=w((t$e,pv)=>{"use strict";var oCe=UH(),HH=r=>{if(r<1)throw new TypeError("Expected `concurrency` to be a number from 1 and up");let e=[],t=0,i=()=>{t--,e.length>0&&e.shift()()},n=(a,l,...c)=>{t++;let u=oCe(a,...c);l(u),u.then(i,i)},s=(a,l,...c)=>{t<r?n(a,l,...c):e.push(n.bind(null,a,l,...c))},o=(a,...l)=>new Promise(c=>s(a,c,...l));return Object.defineProperties(o,{activeCount:{get:()=>t},pendingCount:{get:()=>e.length}}),o};pv.exports=HH;pv.exports.default=HH});var cd=w((i$e,GH)=>{var aCe="2.0.0",ACe=Number.MAX_SAFE_INTEGER||9007199254740991,lCe=16;GH.exports={SEMVER_SPEC_VERSION:aCe,MAX_LENGTH:256,MAX_SAFE_INTEGER:ACe,MAX_SAFE_COMPONENT_LENGTH:lCe}});var ud=w((n$e,YH)=>{var cCe=typeof process=="object"&&process.env&&process.env.NODE_DEBUG&&/\bsemver\b/i.test(process.env.NODE_DEBUG)?(...r)=>console.error("SEMVER",...r):()=>{};YH.exports=cCe});var ac=w((FA,jH)=>{var{MAX_SAFE_COMPONENT_LENGTH:dv}=cd(),uCe=ud();FA=jH.exports={};var gCe=FA.re=[],et=FA.src=[],tt=FA.t={},fCe=0,St=(r,e,t)=>{let i=fCe++;uCe(i,e),tt[r]=i,et[i]=e,gCe[i]=new RegExp(e,t?"g":void 0)};St("NUMERICIDENTIFIER","0|[1-9]\\d*");St("NUMERICIDENTIFIERLOOSE","[0-9]+");St("NONNUMERICIDENTIFIER","\\d*[a-zA-Z-][a-zA-Z0-9-]*");St("MAINVERSION",`(${et[tt.NUMERICIDENTIFIER]})\\.(${et[tt.NUMERICIDENTIFIER]})\\.(${et[tt.NUMERICIDENTIFIER]})`);St("MAINVERSIONLOOSE",`(${et[tt.NUMERICIDENTIFIERLOOSE]})\\.(${et[tt.NUMERICIDENTIFIERLOOSE]})\\.(${et[tt.NUMERICIDENTIFIERLOOSE]})`);St("PRERELEASEIDENTIFIER",`(?:${et[tt.NUMERICIDENTIFIER]}|${et[tt.NONNUMERICIDENTIFIER]})`);St("PRERELEASEIDENTIFIERLOOSE",`(?:${et[tt.NUMERICIDENTIFIERLOOSE]}|${et[tt.NONNUMERICIDENTIFIER]})`);St("PRERELEASE",`(?:-(${et[tt.PRERELEASEIDENTIFIER]}(?:\\.${et[tt.PRERELEASEIDENTIFIER]})*))`);St("PRERELEASELOOSE",`(?:-?(${et[tt.PRERELEASEIDENTIFIERLOOSE]}(?:\\.${et[tt.PRERELEASEIDENTIFIERLOOSE]})*))`);St("BUILDIDENTIFIER","[0-9A-Za-z-]+");St("BUILD",`(?:\\+(${et[tt.BUILDIDENTIFIER]}(?:\\.${et[tt.BUILDIDENTIFIER]})*))`);St("FULLPLAIN",`v?${et[tt.MAINVERSION]}${et[tt.PRERELEASE]}?${et[tt.BUILD]}?`);St("FULL",`^${et[tt.FULLPLAIN]}$`);St("LOOSEPLAIN",`[v=\\s]*${et[tt.MAINVERSIONLOOSE]}${et[tt.PRERELEASELOOSE]}?${et[tt.BUILD]}?`);St("LOOSE",`^${et[tt.LOOSEPLAIN]}$`);St("GTLT","((?:<|>)?=?)");St("XRANGEIDENTIFIERLOOSE",`${et[tt.NUMERICIDENTIFIERLOOSE]}|x|X|\\*`);St("XRANGEIDENTIFIER",`${et[tt.NUMERICIDENTIFIER]}|x|X|\\*`);St("XRANGEPLAIN",`[v=\\s]*(${et[tt.XRANGEIDENTIFIER]})(?:\\.(${et[tt.XRANGEIDENTIFIER]})(?:\\.(${et[tt.XRANGEIDENTIFIER]})(?:${et[tt.PRERELEASE]})?${et[tt.BUILD]}?)?)?`);St("XRANGEPLAINLOOSE",`[v=\\s]*(${et[tt.XRANGEIDENTIFIERLOOSE]})(?:\\.(${et[tt.XRANGEIDENTIFIERLOOSE]})(?:\\.(${et[tt.XRANGEIDENTIFIERLOOSE]})(?:${et[tt.PRERELEASELOOSE]})?${et[tt.BUILD]}?)?)?`);St("XRANGE",`^${et[tt.GTLT]}\\s*${et[tt.XRANGEPLAIN]}$`);St("XRANGELOOSE",`^${et[tt.GTLT]}\\s*${et[tt.XRANGEPLAINLOOSE]}$`);St("COERCE",`(^|[^\\d])(\\d{1,${dv}})(?:\\.(\\d{1,${dv}}))?(?:\\.(\\d{1,${dv}}))?(?:$|[^\\d])`);St("COERCERTL",et[tt.COERCE],!0);St("LONETILDE","(?:~>?)");St("TILDETRIM",`(\\s*)${et[tt.LONETILDE]}\\s+`,!0);FA.tildeTrimReplace="$1~";St("TILDE",`^${et[tt.LONETILDE]}${et[tt.XRANGEPLAIN]}$`);St("TILDELOOSE",`^${et[tt.LONETILDE]}${et[tt.XRANGEPLAINLOOSE]}$`);St("LONECARET","(?:\\^)");St("CARETTRIM",`(\\s*)${et[tt.LONECARET]}\\s+`,!0);FA.caretTrimReplace="$1^";St("CARET",`^${et[tt.LONECARET]}${et[tt.XRANGEPLAIN]}$`);St("CARETLOOSE",`^${et[tt.LONECARET]}${et[tt.XRANGEPLAINLOOSE]}$`);St("COMPARATORLOOSE",`^${et[tt.GTLT]}\\s*(${et[tt.LOOSEPLAIN]})$|^$`);St("COMPARATOR",`^${et[tt.GTLT]}\\s*(${et[tt.FULLPLAIN]})$|^$`);St("COMPARATORTRIM",`(\\s*)${et[tt.GTLT]}\\s*(${et[tt.LOOSEPLAIN]}|${et[tt.XRANGEPLAIN]})`,!0);FA.comparatorTrimReplace="$1$2$3";St("HYPHENRANGE",`^\\s*(${et[tt.XRANGEPLAIN]})\\s+-\\s+(${et[tt.XRANGEPLAIN]})\\s*$`);St("HYPHENRANGELOOSE",`^\\s*(${et[tt.XRANGEPLAINLOOSE]})\\s+-\\s+(${et[tt.XRANGEPLAINLOOSE]})\\s*$`);St("STAR","(<|>)?=?\\s*\\*");St("GTE0","^\\s*>=\\s*0.0.0\\s*$");St("GTE0PRE","^\\s*>=\\s*0.0.0-0\\s*$")});var gd=w((s$e,qH)=>{var hCe=["includePrerelease","loose","rtl"],pCe=r=>r?typeof r!="object"?{loose:!0}:hCe.filter(e=>r[e]).reduce((e,t)=>(e[t]=!0,e),{}):{};qH.exports=pCe});var FI=w((o$e,zH)=>{var JH=/^[0-9]+$/,WH=(r,e)=>{let t=JH.test(r),i=JH.test(e);return t&&i&&(r=+r,e=+e),r===e?0:t&&!i?-1:i&&!t?1:r<e?-1:1},dCe=(r,e)=>WH(e,r);zH.exports={compareIdentifiers:WH,rcompareIdentifiers:dCe}});var Ti=w((a$e,_H)=>{var NI=ud(),{MAX_LENGTH:VH,MAX_SAFE_INTEGER:LI}=cd(),{re:XH,t:ZH}=ac(),CCe=gd(),{compareIdentifiers:fd}=FI(),Hn=class{constructor(e,t){if(t=CCe(t),e instanceof Hn){if(e.loose===!!t.loose&&e.includePrerelease===!!t.includePrerelease)return e;e=e.version}else if(typeof e!="string")throw new TypeError(`Invalid Version: ${e}`);if(e.length>VH)throw new TypeError(`version is longer than ${VH} characters`);NI("SemVer",e,t),this.options=t,this.loose=!!t.loose,this.includePrerelease=!!t.includePrerelease;let i=e.trim().match(t.loose?XH[ZH.LOOSE]:XH[ZH.FULL]);if(!i)throw new TypeError(`Invalid Version: ${e}`);if(this.raw=e,this.major=+i[1],this.minor=+i[2],this.patch=+i[3],this.major>LI||this.major<0)throw new TypeError("Invalid major version");if(this.minor>LI||this.minor<0)throw new TypeError("Invalid minor version");if(this.patch>LI||this.patch<0)throw new TypeError("Invalid patch version");i[4]?this.prerelease=i[4].split(".").map(n=>{if(/^[0-9]+$/.test(n)){let s=+n;if(s>=0&&s<LI)return s}return n}):this.prerelease=[],this.build=i[5]?i[5].split("."):[],this.format()}format(){return this.version=`${this.major}.${this.minor}.${this.patch}`,this.prerelease.length&&(this.version+=`-${this.prerelease.join(".")}`),this.version}toString(){return this.version}compare(e){if(NI("SemVer.compare",this.version,this.options,e),!(e instanceof Hn)){if(typeof e=="string"&&e===this.version)return 0;e=new Hn(e,this.options)}return e.version===this.version?0:this.compareMain(e)||this.comparePre(e)}compareMain(e){return e instanceof Hn||(e=new Hn(e,this.options)),fd(this.major,e.major)||fd(this.minor,e.minor)||fd(this.patch,e.patch)}comparePre(e){if(e instanceof Hn||(e=new Hn(e,this.options)),this.prerelease.length&&!e.prerelease.length)return-1;if(!this.prerelease.length&&e.prerelease.length)return 1;if(!this.prerelease.length&&!e.prerelease.length)return 0;let t=0;do{let i=this.prerelease[t],n=e.prerelease[t];if(NI("prerelease compare",t,i,n),i===void 0&&n===void 0)return 0;if(n===void 0)return 1;if(i===void 0)return-1;if(i===n)continue;return fd(i,n)}while(++t)}compareBuild(e){e instanceof Hn||(e=new Hn(e,this.options));let t=0;do{let i=this.build[t],n=e.build[t];if(NI("prerelease compare",t,i,n),i===void 0&&n===void 0)return 0;if(n===void 0)return 1;if(i===void 0)return-1;if(i===n)continue;return fd(i,n)}while(++t)}inc(e,t){switch(e){case"premajor":this.prerelease.length=0,this.patch=0,this.minor=0,this.major++,this.inc("pre",t);break;case"preminor":this.prerelease.length=0,this.patch=0,this.minor++,this.inc("pre",t);break;case"prepatch":this.prerelease.length=0,this.inc("patch",t),this.inc("pre",t);break;case"prerelease":this.prerelease.length===0&&this.inc("patch",t),this.inc("pre",t);break;case"major":(this.minor!==0||this.patch!==0||this.prerelease.length===0)&&this.major++,this.minor=0,this.patch=0,this.prerelease=[];break;case"minor":(this.patch!==0||this.prerelease.length===0)&&this.minor++,this.patch=0,this.prerelease=[];break;case"patch":this.prerelease.length===0&&this.patch++,this.prerelease=[];break;case"pre":if(this.prerelease.length===0)this.prerelease=[0];else{let i=this.prerelease.length;for(;--i>=0;)typeof this.prerelease[i]=="number"&&(this.prerelease[i]++,i=-2);i===-1&&this.prerelease.push(0)}t&&(this.prerelease[0]===t?isNaN(this.prerelease[1])&&(this.prerelease=[t,0]):this.prerelease=[t,0]);break;default:throw new Error(`invalid increment argument: ${e}`)}return this.format(),this.raw=this.version,this}};_H.exports=Hn});var Ac=w((A$e,rG)=>{var{MAX_LENGTH:mCe}=cd(),{re:$H,t:eG}=ac(),tG=Ti(),ECe=gd(),ICe=(r,e)=>{if(e=ECe(e),r instanceof tG)return r;if(typeof r!="string"||r.length>mCe||!(e.loose?$H[eG.LOOSE]:$H[eG.FULL]).test(r))return null;try{return new tG(r,e)}catch{return null}};rG.exports=ICe});var nG=w((l$e,iG)=>{var yCe=Ac(),wCe=(r,e)=>{let t=yCe(r,e);return t?t.version:null};iG.exports=wCe});var oG=w((c$e,sG)=>{var BCe=Ac(),QCe=(r,e)=>{let t=BCe(r.trim().replace(/^[=v]+/,""),e);return t?t.version:null};sG.exports=QCe});var AG=w((u$e,aG)=>{var bCe=Ti(),SCe=(r,e,t,i)=>{typeof t=="string"&&(i=t,t=void 0);try{return new bCe(r,t).inc(e,i).version}catch{return null}};aG.exports=SCe});var As=w((g$e,cG)=>{var lG=Ti(),vCe=(r,e,t)=>new lG(r,t).compare(new lG(e,t));cG.exports=vCe});var TI=w((f$e,uG)=>{var xCe=As(),PCe=(r,e,t)=>xCe(r,e,t)===0;uG.exports=PCe});var hG=w((h$e,fG)=>{var gG=Ac(),DCe=TI(),kCe=(r,e)=>{if(DCe(r,e))return null;{let t=gG(r),i=gG(e),n=t.prerelease.length||i.prerelease.length,s=n?"pre":"",o=n?"prerelease":"";for(let a in t)if((a==="major"||a==="minor"||a==="patch")&&t[a]!==i[a])return s+a;return o}};fG.exports=kCe});var dG=w((p$e,pG)=>{var RCe=Ti(),FCe=(r,e)=>new RCe(r,e).major;pG.exports=FCe});var mG=w((d$e,CG)=>{var NCe=Ti(),LCe=(r,e)=>new NCe(r,e).minor;CG.exports=LCe});var IG=w((C$e,EG)=>{var TCe=Ti(),OCe=(r,e)=>new TCe(r,e).patch;EG.exports=OCe});var wG=w((m$e,yG)=>{var MCe=Ac(),KCe=(r,e)=>{let t=MCe(r,e);return t&&t.prerelease.length?t.prerelease:null};yG.exports=KCe});var QG=w((E$e,BG)=>{var UCe=As(),HCe=(r,e,t)=>UCe(e,r,t);BG.exports=HCe});var SG=w((I$e,bG)=>{var GCe=As(),YCe=(r,e)=>GCe(r,e,!0);bG.exports=YCe});var OI=w((y$e,xG)=>{var vG=Ti(),jCe=(r,e,t)=>{let i=new vG(r,t),n=new vG(e,t);return i.compare(n)||i.compareBuild(n)};xG.exports=jCe});var DG=w((w$e,PG)=>{var qCe=OI(),JCe=(r,e)=>r.sort((t,i)=>qCe(t,i,e));PG.exports=JCe});var RG=w((B$e,kG)=>{var WCe=OI(),zCe=(r,e)=>r.sort((t,i)=>WCe(i,t,e));kG.exports=zCe});var hd=w((Q$e,FG)=>{var VCe=As(),XCe=(r,e,t)=>VCe(r,e,t)>0;FG.exports=XCe});var MI=w((b$e,NG)=>{var ZCe=As(),_Ce=(r,e,t)=>ZCe(r,e,t)<0;NG.exports=_Ce});var Cv=w((S$e,LG)=>{var $Ce=As(),eme=(r,e,t)=>$Ce(r,e,t)!==0;LG.exports=eme});var KI=w((v$e,TG)=>{var tme=As(),rme=(r,e,t)=>tme(r,e,t)>=0;TG.exports=rme});var UI=w((x$e,OG)=>{var ime=As(),nme=(r,e,t)=>ime(r,e,t)<=0;OG.exports=nme});var mv=w((P$e,MG)=>{var sme=TI(),ome=Cv(),ame=hd(),Ame=KI(),lme=MI(),cme=UI(),ume=(r,e,t,i)=>{switch(e){case"===":return typeof r=="object"&&(r=r.version),typeof t=="object"&&(t=t.version),r===t;case"!==":return typeof r=="object"&&(r=r.version),typeof t=="object"&&(t=t.version),r!==t;case"":case"=":case"==":return sme(r,t,i);case"!=":return ome(r,t,i);case">":return ame(r,t,i);case">=":return Ame(r,t,i);case"<":return lme(r,t,i);case"<=":return cme(r,t,i);default:throw new TypeError(`Invalid operator: ${e}`)}};MG.exports=ume});var UG=w((D$e,KG)=>{var gme=Ti(),fme=Ac(),{re:HI,t:GI}=ac(),hme=(r,e)=>{if(r instanceof gme)return r;if(typeof r=="number"&&(r=String(r)),typeof r!="string")return null;e=e||{};let t=null;if(!e.rtl)t=r.match(HI[GI.COERCE]);else{let i;for(;(i=HI[GI.COERCERTL].exec(r))&&(!t||t.index+t[0].length!==r.length);)(!t||i.index+i[0].length!==t.index+t[0].length)&&(t=i),HI[GI.COERCERTL].lastIndex=i.index+i[1].length+i[2].length;HI[GI.COERCERTL].lastIndex=-1}return t===null?null:fme(`${t[2]}.${t[3]||"0"}.${t[4]||"0"}`,e)};KG.exports=hme});var GG=w((k$e,HG)=>{"use strict";HG.exports=function(r){r.prototype[Symbol.iterator]=function*(){for(let e=this.head;e;e=e.next)yield e.value}}});var YI=w((R$e,YG)=>{"use strict";YG.exports=Ht;Ht.Node=lc;Ht.create=Ht;function Ht(r){var e=this;if(e instanceof Ht||(e=new Ht),e.tail=null,e.head=null,e.length=0,r&&typeof r.forEach=="function")r.forEach(function(n){e.push(n)});else if(arguments.length>0)for(var t=0,i=arguments.length;t<i;t++)e.push(arguments[t]);return e}Ht.prototype.removeNode=function(r){if(r.list!==this)throw new Error("removing node which does not belong to this list");var e=r.next,t=r.prev;return e&&(e.prev=t),t&&(t.next=e),r===this.head&&(this.head=e),r===this.tail&&(this.tail=t),r.list.length--,r.next=null,r.prev=null,r.list=null,e};Ht.prototype.unshiftNode=function(r){if(r!==this.head){r.list&&r.list.removeNode(r);var e=this.head;r.list=this,r.next=e,e&&(e.prev=r),this.head=r,this.tail||(this.tail=r),this.length++}};Ht.prototype.pushNode=function(r){if(r!==this.tail){r.list&&r.list.removeNode(r);var e=this.tail;r.list=this,r.prev=e,e&&(e.next=r),this.tail=r,this.head||(this.head=r),this.length++}};Ht.prototype.push=function(){for(var r=0,e=arguments.length;r<e;r++)dme(this,arguments[r]);return this.length};Ht.prototype.unshift=function(){for(var r=0,e=arguments.length;r<e;r++)Cme(this,arguments[r]);return this.length};Ht.prototype.pop=function(){if(!!this.tail){var r=this.tail.value;return this.tail=this.tail.prev,this.tail?this.tail.next=null:this.head=null,this.length--,r}};Ht.prototype.shift=function(){if(!!this.head){var r=this.head.value;return this.head=this.head.next,this.head?this.head.prev=null:this.tail=null,this.length--,r}};Ht.prototype.forEach=function(r,e){e=e||this;for(var t=this.head,i=0;t!==null;i++)r.call(e,t.value,i,this),t=t.next};Ht.prototype.forEachReverse=function(r,e){e=e||this;for(var t=this.tail,i=this.length-1;t!==null;i--)r.call(e,t.value,i,this),t=t.prev};Ht.prototype.get=function(r){for(var e=0,t=this.head;t!==null&&e<r;e++)t=t.next;if(e===r&&t!==null)return t.value};Ht.prototype.getReverse=function(r){for(var e=0,t=this.tail;t!==null&&e<r;e++)t=t.prev;if(e===r&&t!==null)return t.value};Ht.prototype.map=function(r,e){e=e||this;for(var t=new Ht,i=this.head;i!==null;)t.push(r.call(e,i.value,this)),i=i.next;return t};Ht.prototype.mapReverse=function(r,e){e=e||this;for(var t=new Ht,i=this.tail;i!==null;)t.push(r.call(e,i.value,this)),i=i.prev;return t};Ht.prototype.reduce=function(r,e){var t,i=this.head;if(arguments.length>1)t=e;else if(this.head)i=this.head.next,t=this.head.value;else throw new TypeError("Reduce of empty list with no initial value");for(var n=0;i!==null;n++)t=r(t,i.value,n),i=i.next;return t};Ht.prototype.reduceReverse=function(r,e){var t,i=this.tail;if(arguments.length>1)t=e;else if(this.tail)i=this.tail.prev,t=this.tail.value;else throw new TypeError("Reduce of empty list with no initial value");for(var n=this.length-1;i!==null;n--)t=r(t,i.value,n),i=i.prev;return t};Ht.prototype.toArray=function(){for(var r=new Array(this.length),e=0,t=this.head;t!==null;e++)r[e]=t.value,t=t.next;return r};Ht.prototype.toArrayReverse=function(){for(var r=new Array(this.length),e=0,t=this.tail;t!==null;e++)r[e]=t.value,t=t.prev;return r};Ht.prototype.slice=function(r,e){e=e||this.length,e<0&&(e+=this.length),r=r||0,r<0&&(r+=this.length);var t=new Ht;if(e<r||e<0)return t;r<0&&(r=0),e>this.length&&(e=this.length);for(var i=0,n=this.head;n!==null&&i<r;i++)n=n.next;for(;n!==null&&i<e;i++,n=n.next)t.push(n.value);return t};Ht.prototype.sliceReverse=function(r,e){e=e||this.length,e<0&&(e+=this.length),r=r||0,r<0&&(r+=this.length);var t=new Ht;if(e<r||e<0)return t;r<0&&(r=0),e>this.length&&(e=this.length);for(var i=this.length,n=this.tail;n!==null&&i>e;i--)n=n.prev;for(;n!==null&&i>r;i--,n=n.prev)t.push(n.value);return t};Ht.prototype.splice=function(r,e,...t){r>this.length&&(r=this.length-1),r<0&&(r=this.length+r);for(var i=0,n=this.head;n!==null&&i<r;i++)n=n.next;for(var s=[],i=0;n&&i<e;i++)s.push(n.value),n=this.removeNode(n);n===null&&(n=this.tail),n!==this.head&&n!==this.tail&&(n=n.prev);for(var i=0;i<t.length;i++)n=pme(this,n,t[i]);return s};Ht.prototype.reverse=function(){for(var r=this.head,e=this.tail,t=r;t!==null;t=t.prev){var i=t.prev;t.prev=t.next,t.next=i}return this.head=e,this.tail=r,this};function pme(r,e,t){var i=e===r.head?new lc(t,null,e,r):new lc(t,e,e.next,r);return i.next===null&&(r.tail=i),i.prev===null&&(r.head=i),r.length++,i}function dme(r,e){r.tail=new lc(e,r.tail,null,r),r.head||(r.head=r.tail),r.length++}function Cme(r,e){r.head=new lc(e,null,r.head,r),r.tail||(r.tail=r.head),r.length++}function lc(r,e,t,i){if(!(this instanceof lc))return new lc(r,e,t,i);this.list=i,this.value=r,e?(e.next=this,this.prev=e):this.prev=null,t?(t.prev=this,this.next=t):this.next=null}try{GG()(Ht)}catch{}});var zG=w((F$e,WG)=>{"use strict";var mme=YI(),cc=Symbol("max"),ba=Symbol("length"),jg=Symbol("lengthCalculator"),dd=Symbol("allowStale"),uc=Symbol("maxAge"),Qa=Symbol("dispose"),jG=Symbol("noDisposeOnSet"),di=Symbol("lruList"),Vs=Symbol("cache"),JG=Symbol("updateAgeOnGet"),Ev=()=>1,yv=class{constructor(e){if(typeof e=="number"&&(e={max:e}),e||(e={}),e.max&&(typeof e.max!="number"||e.max<0))throw new TypeError("max must be a non-negative number");let t=this[cc]=e.max||1/0,i=e.length||Ev;if(this[jg]=typeof i!="function"?Ev:i,this[dd]=e.stale||!1,e.maxAge&&typeof e.maxAge!="number")throw new TypeError("maxAge must be a number");this[uc]=e.maxAge||0,this[Qa]=e.dispose,this[jG]=e.noDisposeOnSet||!1,this[JG]=e.updateAgeOnGet||!1,this.reset()}set max(e){if(typeof e!="number"||e<0)throw new TypeError("max must be a non-negative number");this[cc]=e||1/0,pd(this)}get max(){return this[cc]}set allowStale(e){this[dd]=!!e}get allowStale(){return this[dd]}set maxAge(e){if(typeof e!="number")throw new TypeError("maxAge must be a non-negative number");this[uc]=e,pd(this)}get maxAge(){return this[uc]}set lengthCalculator(e){typeof e!="function"&&(e=Ev),e!==this[jg]&&(this[jg]=e,this[ba]=0,this[di].forEach(t=>{t.length=this[jg](t.value,t.key),this[ba]+=t.length})),pd(this)}get lengthCalculator(){return this[jg]}get length(){return this[ba]}get itemCount(){return this[di].length}rforEach(e,t){t=t||this;for(let i=this[di].tail;i!==null;){let n=i.prev;qG(this,e,i,t),i=n}}forEach(e,t){t=t||this;for(let i=this[di].head;i!==null;){let n=i.next;qG(this,e,i,t),i=n}}keys(){return this[di].toArray().map(e=>e.key)}values(){return this[di].toArray().map(e=>e.value)}reset(){this[Qa]&&this[di]&&this[di].length&&this[di].forEach(e=>this[Qa](e.key,e.value)),this[Vs]=new Map,this[di]=new mme,this[ba]=0}dump(){return this[di].map(e=>jI(this,e)?!1:{k:e.key,v:e.value,e:e.now+(e.maxAge||0)}).toArray().filter(e=>e)}dumpLru(){return this[di]}set(e,t,i){if(i=i||this[uc],i&&typeof i!="number")throw new TypeError("maxAge must be a number");let n=i?Date.now():0,s=this[jg](t,e);if(this[Vs].has(e)){if(s>this[cc])return qg(this,this[Vs].get(e)),!1;let l=this[Vs].get(e).value;return this[Qa]&&(this[jG]||this[Qa](e,l.value)),l.now=n,l.maxAge=i,l.value=t,this[ba]+=s-l.length,l.length=s,this.get(e),pd(this),!0}let o=new wv(e,t,s,n,i);return o.length>this[cc]?(this[Qa]&&this[Qa](e,t),!1):(this[ba]+=o.length,this[di].unshift(o),this[Vs].set(e,this[di].head),pd(this),!0)}has(e){if(!this[Vs].has(e))return!1;let t=this[Vs].get(e).value;return!jI(this,t)}get(e){return Iv(this,e,!0)}peek(e){return Iv(this,e,!1)}pop(){let e=this[di].tail;return e?(qg(this,e),e.value):null}del(e){qg(this,this[Vs].get(e))}load(e){this.reset();let t=Date.now();for(let i=e.length-1;i>=0;i--){let n=e[i],s=n.e||0;if(s===0)this.set(n.k,n.v);else{let o=s-t;o>0&&this.set(n.k,n.v,o)}}}prune(){this[Vs].forEach((e,t)=>Iv(this,t,!1))}},Iv=(r,e,t)=>{let i=r[Vs].get(e);if(i){let n=i.value;if(jI(r,n)){if(qg(r,i),!r[dd])return}else t&&(r[JG]&&(i.value.now=Date.now()),r[di].unshiftNode(i));return n.value}},jI=(r,e)=>{if(!e||!e.maxAge&&!r[uc])return!1;let t=Date.now()-e.now;return e.maxAge?t>e.maxAge:r[uc]&&t>r[uc]},pd=r=>{if(r[ba]>r[cc])for(let e=r[di].tail;r[ba]>r[cc]&&e!==null;){let t=e.prev;qg(r,e),e=t}},qg=(r,e)=>{if(e){let t=e.value;r[Qa]&&r[Qa](t.key,t.value),r[ba]-=t.length,r[Vs].delete(t.key),r[di].removeNode(e)}},wv=class{constructor(e,t,i,n,s){this.key=e,this.value=t,this.length=i,this.now=n,this.maxAge=s||0}},qG=(r,e,t,i)=>{let n=t.value;jI(r,n)&&(qg(r,t),r[dd]||(n=void 0)),n&&e.call(i,n.value,n.key,r)};WG.exports=yv});var ls=w((N$e,_G)=>{var gc=class{constructor(e,t){if(t=Ime(t),e instanceof gc)return e.loose===!!t.loose&&e.includePrerelease===!!t.includePrerelease?e:new gc(e.raw,t);if(e instanceof Bv)return this.raw=e.value,this.set=[[e]],this.format(),this;if(this.options=t,this.loose=!!t.loose,this.includePrerelease=!!t.includePrerelease,this.raw=e,this.set=e.split(/\s*\|\|\s*/).map(i=>this.parseRange(i.trim())).filter(i=>i.length),!this.set.length)throw new TypeError(`Invalid SemVer Range: ${e}`);if(this.set.length>1){let i=this.set[0];if(this.set=this.set.filter(n=>!XG(n[0])),this.set.length===0)this.set=[i];else if(this.set.length>1){for(let n of this.set)if(n.length===1&&bme(n[0])){this.set=[n];break}}}this.format()}format(){return this.range=this.set.map(e=>e.join(" ").trim()).join("||").trim(),this.range}toString(){return this.range}parseRange(e){e=e.trim();let i=`parseRange:${Object.keys(this.options).join(",")}:${e}`,n=VG.get(i);if(n)return n;let s=this.options.loose,o=s?Oi[Qi.HYPHENRANGELOOSE]:Oi[Qi.HYPHENRANGE];e=e.replace(o,Lme(this.options.includePrerelease)),Gr("hyphen replace",e),e=e.replace(Oi[Qi.COMPARATORTRIM],wme),Gr("comparator trim",e,Oi[Qi.COMPARATORTRIM]),e=e.replace(Oi[Qi.TILDETRIM],Bme),e=e.replace(Oi[Qi.CARETTRIM],Qme),e=e.split(/\s+/).join(" ");let a=s?Oi[Qi.COMPARATORLOOSE]:Oi[Qi.COMPARATOR],l=e.split(" ").map(f=>Sme(f,this.options)).join(" ").split(/\s+/).map(f=>Nme(f,this.options)).filter(this.options.loose?f=>!!f.match(a):()=>!0).map(f=>new Bv(f,this.options)),c=l.length,u=new Map;for(let f of l){if(XG(f))return[f];u.set(f.value,f)}u.size>1&&u.has("")&&u.delete("");let g=[...u.values()];return VG.set(i,g),g}intersects(e,t){if(!(e instanceof gc))throw new TypeError("a Range is required");return this.set.some(i=>ZG(i,t)&&e.set.some(n=>ZG(n,t)&&i.every(s=>n.every(o=>s.intersects(o,t)))))}test(e){if(!e)return!1;if(typeof e=="string")try{e=new yme(e,this.options)}catch{return!1}for(let t=0;t<this.set.length;t++)if(Tme(this.set[t],e,this.options))return!0;return!1}};_G.exports=gc;var Eme=zG(),VG=new Eme({max:1e3}),Ime=gd(),Bv=Cd(),Gr=ud(),yme=Ti(),{re:Oi,t:Qi,comparatorTrimReplace:wme,tildeTrimReplace:Bme,caretTrimReplace:Qme}=ac(),XG=r=>r.value==="<0.0.0-0",bme=r=>r.value==="",ZG=(r,e)=>{let t=!0,i=r.slice(),n=i.pop();for(;t&&i.length;)t=i.every(s=>n.intersects(s,e)),n=i.pop();return t},Sme=(r,e)=>(Gr("comp",r,e),r=Pme(r,e),Gr("caret",r),r=vme(r,e),Gr("tildes",r),r=kme(r,e),Gr("xrange",r),r=Fme(r,e),Gr("stars",r),r),Zi=r=>!r||r.toLowerCase()==="x"||r==="*",vme=(r,e)=>r.trim().split(/\s+/).map(t=>xme(t,e)).join(" "),xme=(r,e)=>{let t=e.loose?Oi[Qi.TILDELOOSE]:Oi[Qi.TILDE];return r.replace(t,(i,n,s,o,a)=>{Gr("tilde",r,i,n,s,o,a);let l;return Zi(n)?l="":Zi(s)?l=`>=${n}.0.0 <${+n+1}.0.0-0`:Zi(o)?l=`>=${n}.${s}.0 <${n}.${+s+1}.0-0`:a?(Gr("replaceTilde pr",a),l=`>=${n}.${s}.${o}-${a} <${n}.${+s+1}.0-0`):l=`>=${n}.${s}.${o} <${n}.${+s+1}.0-0`,Gr("tilde return",l),l})},Pme=(r,e)=>r.trim().split(/\s+/).map(t=>Dme(t,e)).join(" "),Dme=(r,e)=>{Gr("caret",r,e);let t=e.loose?Oi[Qi.CARETLOOSE]:Oi[Qi.CARET],i=e.includePrerelease?"-0":"";return r.replace(t,(n,s,o,a,l)=>{Gr("caret",r,n,s,o,a,l);let c;return Zi(s)?c="":Zi(o)?c=`>=${s}.0.0${i} <${+s+1}.0.0-0`:Zi(a)?s==="0"?c=`>=${s}.${o}.0${i} <${s}.${+o+1}.0-0`:c=`>=${s}.${o}.0${i} <${+s+1}.0.0-0`:l?(Gr("replaceCaret pr",l),s==="0"?o==="0"?c=`>=${s}.${o}.${a}-${l} <${s}.${o}.${+a+1}-0`:c=`>=${s}.${o}.${a}-${l} <${s}.${+o+1}.0-0`:c=`>=${s}.${o}.${a}-${l} <${+s+1}.0.0-0`):(Gr("no pr"),s==="0"?o==="0"?c=`>=${s}.${o}.${a}${i} <${s}.${o}.${+a+1}-0`:c=`>=${s}.${o}.${a}${i} <${s}.${+o+1}.0-0`:c=`>=${s}.${o}.${a} <${+s+1}.0.0-0`),Gr("caret return",c),c})},kme=(r,e)=>(Gr("replaceXRanges",r,e),r.split(/\s+/).map(t=>Rme(t,e)).join(" ")),Rme=(r,e)=>{r=r.trim();let t=e.loose?Oi[Qi.XRANGELOOSE]:Oi[Qi.XRANGE];return r.replace(t,(i,n,s,o,a,l)=>{Gr("xRange",r,i,n,s,o,a,l);let c=Zi(s),u=c||Zi(o),g=u||Zi(a),f=g;return n==="="&&f&&(n=""),l=e.includePrerelease?"-0":"",c?n===">"||n==="<"?i="<0.0.0-0":i="*":n&&f?(u&&(o=0),a=0,n===">"?(n=">=",u?(s=+s+1,o=0,a=0):(o=+o+1,a=0)):n==="<="&&(n="<",u?s=+s+1:o=+o+1),n==="<"&&(l="-0"),i=`${n+s}.${o}.${a}${l}`):u?i=`>=${s}.0.0${l} <${+s+1}.0.0-0`:g&&(i=`>=${s}.${o}.0${l} <${s}.${+o+1}.0-0`),Gr("xRange return",i),i})},Fme=(r,e)=>(Gr("replaceStars",r,e),r.trim().replace(Oi[Qi.STAR],"")),Nme=(r,e)=>(Gr("replaceGTE0",r,e),r.trim().replace(Oi[e.includePrerelease?Qi.GTE0PRE:Qi.GTE0],"")),Lme=r=>(e,t,i,n,s,o,a,l,c,u,g,f,h)=>(Zi(i)?t="":Zi(n)?t=`>=${i}.0.0${r?"-0":""}`:Zi(s)?t=`>=${i}.${n}.0${r?"-0":""}`:o?t=`>=${t}`:t=`>=${t}${r?"-0":""}`,Zi(c)?l="":Zi(u)?l=`<${+c+1}.0.0-0`:Zi(g)?l=`<${c}.${+u+1}.0-0`:f?l=`<=${c}.${u}.${g}-${f}`:r?l=`<${c}.${u}.${+g+1}-0`:l=`<=${l}`,`${t} ${l}`.trim()),Tme=(r,e,t)=>{for(let i=0;i<r.length;i++)if(!r[i].test(e))return!1;if(e.prerelease.length&&!t.includePrerelease){for(let i=0;i<r.length;i++)if(Gr(r[i].semver),r[i].semver!==Bv.ANY&&r[i].semver.prerelease.length>0){let n=r[i].semver;if(n.major===e.major&&n.minor===e.minor&&n.patch===e.patch)return!0}return!1}return!0}});var Cd=w((L$e,iY)=>{var md=Symbol("SemVer ANY"),Jg=class{static get ANY(){return md}constructor(e,t){if(t=Ome(t),e instanceof Jg){if(e.loose===!!t.loose)return e;e=e.value}bv("comparator",e,t),this.options=t,this.loose=!!t.loose,this.parse(e),this.semver===md?this.value="":this.value=this.operator+this.semver.version,bv("comp",this)}parse(e){let t=this.options.loose?$G[eY.COMPARATORLOOSE]:$G[eY.COMPARATOR],i=e.match(t);if(!i)throw new TypeError(`Invalid comparator: ${e}`);this.operator=i[1]!==void 0?i[1]:"",this.operator==="="&&(this.operator=""),i[2]?this.semver=new tY(i[2],this.options.loose):this.semver=md}toString(){return this.value}test(e){if(bv("Comparator.test",e,this.options.loose),this.semver===md||e===md)return!0;if(typeof e=="string")try{e=new tY(e,this.options)}catch{return!1}return Qv(e,this.operator,this.semver,this.options)}intersects(e,t){if(!(e instanceof Jg))throw new TypeError("a Comparator is required");if((!t||typeof t!="object")&&(t={loose:!!t,includePrerelease:!1}),this.operator==="")return this.value===""?!0:new rY(e.value,t).test(this.value);if(e.operator==="")return e.value===""?!0:new rY(this.value,t).test(e.semver);let i=(this.operator===">="||this.operator===">")&&(e.operator===">="||e.operator===">"),n=(this.operator==="<="||this.operator==="<")&&(e.operator==="<="||e.operator==="<"),s=this.semver.version===e.semver.version,o=(this.operator===">="||this.operator==="<=")&&(e.operator===">="||e.operator==="<="),a=Qv(this.semver,"<",e.semver,t)&&(this.operator===">="||this.operator===">")&&(e.operator==="<="||e.operator==="<"),l=Qv(this.semver,">",e.semver,t)&&(this.operator==="<="||this.operator==="<")&&(e.operator===">="||e.operator===">");return i||n||s&&o||a||l}};iY.exports=Jg;var Ome=gd(),{re:$G,t:eY}=ac(),Qv=mv(),bv=ud(),tY=Ti(),rY=ls()});var Ed=w((T$e,nY)=>{var Mme=ls(),Kme=(r,e,t)=>{try{e=new Mme(e,t)}catch{return!1}return e.test(r)};nY.exports=Kme});var oY=w((O$e,sY)=>{var Ume=ls(),Hme=(r,e)=>new Ume(r,e).set.map(t=>t.map(i=>i.value).join(" ").trim().split(" "));sY.exports=Hme});var AY=w((M$e,aY)=>{var Gme=Ti(),Yme=ls(),jme=(r,e,t)=>{let i=null,n=null,s=null;try{s=new Yme(e,t)}catch{return null}return r.forEach(o=>{s.test(o)&&(!i||n.compare(o)===-1)&&(i=o,n=new Gme(i,t))}),i};aY.exports=jme});var cY=w((K$e,lY)=>{var qme=Ti(),Jme=ls(),Wme=(r,e,t)=>{let i=null,n=null,s=null;try{s=new Jme(e,t)}catch{return null}return r.forEach(o=>{s.test(o)&&(!i||n.compare(o)===1)&&(i=o,n=new qme(i,t))}),i};lY.exports=Wme});var fY=w((U$e,gY)=>{var Sv=Ti(),zme=ls(),uY=hd(),Vme=(r,e)=>{r=new zme(r,e);let t=new Sv("0.0.0");if(r.test(t)||(t=new Sv("0.0.0-0"),r.test(t)))return t;t=null;for(let i=0;i<r.set.length;++i){let n=r.set[i],s=null;n.forEach(o=>{let a=new Sv(o.semver.version);switch(o.operator){case">":a.prerelease.length===0?a.patch++:a.prerelease.push(0),a.raw=a.format();case"":case">=":(!s||uY(a,s))&&(s=a);break;case"<":case"<=":break;default:throw new Error(`Unexpected operation: ${o.operator}`)}}),s&&(!t||uY(t,s))&&(t=s)}return t&&r.test(t)?t:null};gY.exports=Vme});var pY=w((H$e,hY)=>{var Xme=ls(),Zme=(r,e)=>{try{return new Xme(r,e).range||"*"}catch{return null}};hY.exports=Zme});var qI=w((G$e,EY)=>{var _me=Ti(),mY=Cd(),{ANY:$me}=mY,eEe=ls(),tEe=Ed(),dY=hd(),CY=MI(),rEe=UI(),iEe=KI(),nEe=(r,e,t,i)=>{r=new _me(r,i),e=new eEe(e,i);let n,s,o,a,l;switch(t){case">":n=dY,s=rEe,o=CY,a=">",l=">=";break;case"<":n=CY,s=iEe,o=dY,a="<",l="<=";break;default:throw new TypeError('Must provide a hilo val of "<" or ">"')}if(tEe(r,e,i))return!1;for(let c=0;c<e.set.length;++c){let u=e.set[c],g=null,f=null;if(u.forEach(h=>{h.semver===$me&&(h=new mY(">=0.0.0")),g=g||h,f=f||h,n(h.semver,g.semver,i)?g=h:o(h.semver,f.semver,i)&&(f=h)}),g.operator===a||g.operator===l||(!f.operator||f.operator===a)&&s(r,f.semver))return!1;if(f.operator===l&&o(r,f.semver))return!1}return!0};EY.exports=nEe});var yY=w((Y$e,IY)=>{var sEe=qI(),oEe=(r,e,t)=>sEe(r,e,">",t);IY.exports=oEe});var BY=w((j$e,wY)=>{var aEe=qI(),AEe=(r,e,t)=>aEe(r,e,"<",t);wY.exports=AEe});var SY=w((q$e,bY)=>{var QY=ls(),lEe=(r,e,t)=>(r=new QY(r,t),e=new QY(e,t),r.intersects(e));bY.exports=lEe});var xY=w((J$e,vY)=>{var cEe=Ed(),uEe=As();vY.exports=(r,e,t)=>{let i=[],n=null,s=null,o=r.sort((u,g)=>uEe(u,g,t));for(let u of o)cEe(u,e,t)?(s=u,n||(n=u)):(s&&i.push([n,s]),s=null,n=null);n&&i.push([n,null]);let a=[];for(let[u,g]of i)u===g?a.push(u):!g&&u===o[0]?a.push("*"):g?u===o[0]?a.push(`<=${g}`):a.push(`${u} - ${g}`):a.push(`>=${u}`);let l=a.join(" || "),c=typeof e.raw=="string"?e.raw:String(e);return l.length<c.length?l:e}});var FY=w((W$e,RY)=>{var PY=ls(),JI=Cd(),{ANY:vv}=JI,Id=Ed(),xv=As(),gEe=(r,e,t={})=>{if(r===e)return!0;r=new PY(r,t),e=new PY(e,t);let i=!1;e:for(let n of r.set){for(let s of e.set){let o=fEe(n,s,t);if(i=i||o!==null,o)continue e}if(i)return!1}return!0},fEe=(r,e,t)=>{if(r===e)return!0;if(r.length===1&&r[0].semver===vv){if(e.length===1&&e[0].semver===vv)return!0;t.includePrerelease?r=[new JI(">=0.0.0-0")]:r=[new JI(">=0.0.0")]}if(e.length===1&&e[0].semver===vv){if(t.includePrerelease)return!0;e=[new JI(">=0.0.0")]}let i=new Set,n,s;for(let h of r)h.operator===">"||h.operator===">="?n=DY(n,h,t):h.operator==="<"||h.operator==="<="?s=kY(s,h,t):i.add(h.semver);if(i.size>1)return null;let o;if(n&&s){if(o=xv(n.semver,s.semver,t),o>0)return null;if(o===0&&(n.operator!==">="||s.operator!=="<="))return null}for(let h of i){if(n&&!Id(h,String(n),t)||s&&!Id(h,String(s),t))return null;for(let p of e)if(!Id(h,String(p),t))return!1;return!0}let a,l,c,u,g=s&&!t.includePrerelease&&s.semver.prerelease.length?s.semver:!1,f=n&&!t.includePrerelease&&n.semver.prerelease.length?n.semver:!1;g&&g.prerelease.length===1&&s.operator==="<"&&g.prerelease[0]===0&&(g=!1);for(let h of e){if(u=u||h.operator===">"||h.operator===">=",c=c||h.operator==="<"||h.operator==="<=",n){if(f&&h.semver.prerelease&&h.semver.prerelease.length&&h.semver.major===f.major&&h.semver.minor===f.minor&&h.semver.patch===f.patch&&(f=!1),h.operator===">"||h.operator===">="){if(a=DY(n,h,t),a===h&&a!==n)return!1}else if(n.operator===">="&&!Id(n.semver,String(h),t))return!1}if(s){if(g&&h.semver.prerelease&&h.semver.prerelease.length&&h.semver.major===g.major&&h.semver.minor===g.minor&&h.semver.patch===g.patch&&(g=!1),h.operator==="<"||h.operator==="<="){if(l=kY(s,h,t),l===h&&l!==s)return!1}else if(s.operator==="<="&&!Id(s.semver,String(h),t))return!1}if(!h.operator&&(s||n)&&o!==0)return!1}return!(n&&c&&!s&&o!==0||s&&u&&!n&&o!==0||f||g)},DY=(r,e,t)=>{if(!r)return e;let i=xv(r.semver,e.semver,t);return i>0?r:i<0||e.operator===">"&&r.operator===">="?e:r},kY=(r,e,t)=>{if(!r)return e;let i=xv(r.semver,e.semver,t);return i<0?r:i>0||e.operator==="<"&&r.operator==="<="?e:r};RY.exports=gEe});var Xr=w((z$e,NY)=>{var Pv=ac();NY.exports={re:Pv.re,src:Pv.src,tokens:Pv.t,SEMVER_SPEC_VERSION:cd().SEMVER_SPEC_VERSION,SemVer:Ti(),compareIdentifiers:FI().compareIdentifiers,rcompareIdentifiers:FI().rcompareIdentifiers,parse:Ac(),valid:nG(),clean:oG(),inc:AG(),diff:hG(),major:dG(),minor:mG(),patch:IG(),prerelease:wG(),compare:As(),rcompare:QG(),compareLoose:SG(),compareBuild:OI(),sort:DG(),rsort:RG(),gt:hd(),lt:MI(),eq:TI(),neq:Cv(),gte:KI(),lte:UI(),cmp:mv(),coerce:UG(),Comparator:Cd(),Range:ls(),satisfies:Ed(),toComparators:oY(),maxSatisfying:AY(),minSatisfying:cY(),minVersion:fY(),validRange:pY(),outside:qI(),gtr:yY(),ltr:BY(),intersects:SY(),simplifyRange:xY(),subset:FY()}});var Dv=w(WI=>{"use strict";Object.defineProperty(WI,"__esModule",{value:!0});WI.VERSION=void 0;WI.VERSION="9.1.0"});var Gt=w((exports,module)=>{"use strict";var __spreadArray=exports&&exports.__spreadArray||function(r,e,t){if(t||arguments.length===2)for(var i=0,n=e.length,s;i<n;i++)(s||!(i in e))&&(s||(s=Array.prototype.slice.call(e,0,i)),s[i]=e[i]);return r.concat(s||Array.prototype.slice.call(e))};Object.defineProperty(exports,"__esModule",{value:!0});exports.toFastProperties=exports.timer=exports.peek=exports.isES2015MapSupported=exports.PRINT_WARNING=exports.PRINT_ERROR=exports.packArray=exports.IDENTITY=exports.NOOP=exports.merge=exports.groupBy=exports.defaults=exports.assignNoOverwrite=exports.assign=exports.zipObject=exports.sortBy=exports.indexOf=exports.some=exports.difference=exports.every=exports.isObject=exports.isRegExp=exports.isArray=exports.partial=exports.uniq=exports.compact=exports.reduce=exports.findAll=exports.find=exports.cloneObj=exports.cloneArr=exports.contains=exports.has=exports.pick=exports.reject=exports.filter=exports.dropRight=exports.drop=exports.isFunction=exports.isUndefined=exports.isString=exports.forEach=exports.last=exports.first=exports.flatten=exports.map=exports.mapValues=exports.values=exports.keys=exports.isEmpty=void 0;exports.upperFirst=void 0;function isEmpty(r){return r&&r.length===0}exports.isEmpty=isEmpty;function keys(r){return r==null?[]:Object.keys(r)}exports.keys=keys;function values(r){for(var e=[],t=Object.keys(r),i=0;i<t.length;i++)e.push(r[t[i]]);return e}exports.values=values;function mapValues(r,e){for(var t=[],i=keys(r),n=0;n<i.length;n++){var s=i[n];t.push(e.call(null,r[s],s))}return t}exports.mapValues=mapValues;function map(r,e){for(var t=[],i=0;i<r.length;i++)t.push(e.call(null,r[i],i));return t}exports.map=map;function flatten(r){for(var e=[],t=0;t<r.length;t++){var i=r[t];Array.isArray(i)?e=e.concat(flatten(i)):e.push(i)}return e}exports.flatten=flatten;function first(r){return isEmpty(r)?void 0:r[0]}exports.first=first;function last(r){var e=r&&r.length;return e?r[e-1]:void 0}exports.last=last;function forEach(r,e){if(Array.isArray(r))for(var t=0;t<r.length;t++)e.call(null,r[t],t);else if(isObject(r))for(var i=keys(r),t=0;t<i.length;t++){var n=i[t],s=r[n];e.call(null,s,n)}else throw Error("non exhaustive match")}exports.forEach=forEach;function isString(r){return typeof r=="string"}exports.isString=isString;function isUndefined(r){return r===void 0}exports.isUndefined=isUndefined;function isFunction(r){return r instanceof Function}exports.isFunction=isFunction;function drop(r,e){return e===void 0&&(e=1),r.slice(e,r.length)}exports.drop=drop;function dropRight(r,e){return e===void 0&&(e=1),r.slice(0,r.length-e)}exports.dropRight=dropRight;function filter(r,e){var t=[];if(Array.isArray(r))for(var i=0;i<r.length;i++){var n=r[i];e.call(null,n)&&t.push(n)}return t}exports.filter=filter;function reject(r,e){return filter(r,function(t){return!e(t)})}exports.reject=reject;function pick(r,e){for(var t=Object.keys(r),i={},n=0;n<t.length;n++){var s=t[n],o=r[s];e(o)&&(i[s]=o)}return i}exports.pick=pick;function has(r,e){return isObject(r)?r.hasOwnProperty(e):!1}exports.has=has;function contains(r,e){return find(r,function(t){return t===e})!==void 0}exports.contains=contains;function cloneArr(r){for(var e=[],t=0;t<r.length;t++)e.push(r[t]);return e}exports.cloneArr=cloneArr;function cloneObj(r){var e={};for(var t in r)Object.prototype.hasOwnProperty.call(r,t)&&(e[t]=r[t]);return e}exports.cloneObj=cloneObj;function find(r,e){for(var t=0;t<r.length;t++){var i=r[t];if(e.call(null,i))return i}}exports.find=find;function findAll(r,e){for(var t=[],i=0;i<r.length;i++){var n=r[i];e.call(null,n)&&t.push(n)}return t}exports.findAll=findAll;function reduce(r,e,t){for(var i=Array.isArray(r),n=i?r:values(r),s=i?[]:keys(r),o=t,a=0;a<n.length;a++)o=e.call(null,o,n[a],i?a:s[a]);return o}exports.reduce=reduce;function compact(r){return reject(r,function(e){return e==null})}exports.compact=compact;function uniq(r,e){e===void 0&&(e=function(i){return i});var t=[];return reduce(r,function(i,n){var s=e(n);return contains(t,s)?i:(t.push(s),i.concat(n))},[])}exports.uniq=uniq;function partial(r){for(var e=[],t=1;t<arguments.length;t++)e[t-1]=arguments[t];var i=[null],n=i.concat(e);return Function.bind.apply(r,n)}exports.partial=partial;function isArray(r){return Array.isArray(r)}exports.isArray=isArray;function isRegExp(r){return r instanceof RegExp}exports.isRegExp=isRegExp;function isObject(r){return r instanceof Object}exports.isObject=isObject;function every(r,e){for(var t=0;t<r.length;t++)if(!e(r[t],t))return!1;return!0}exports.every=every;function difference(r,e){return reject(r,function(t){return contains(e,t)})}exports.difference=difference;function some(r,e){for(var t=0;t<r.length;t++)if(e(r[t]))return!0;return!1}exports.some=some;function indexOf(r,e){for(var t=0;t<r.length;t++)if(r[t]===e)return t;return-1}exports.indexOf=indexOf;function sortBy(r,e){var t=cloneArr(r);return t.sort(function(i,n){return e(i)-e(n)}),t}exports.sortBy=sortBy;function zipObject(r,e){if(r.length!==e.length)throw Error("can't zipObject with different number of keys and values!");for(var t={},i=0;i<r.length;i++)t[r[i]]=e[i];return t}exports.zipObject=zipObject;function assign(r){for(var e=[],t=1;t<arguments.length;t++)e[t-1]=arguments[t];for(var i=0;i<e.length;i++)for(var n=e[i],s=keys(n),o=0;o<s.length;o++){var a=s[o];r[a]=n[a]}return r}exports.assign=assign;function assignNoOverwrite(r){for(var e=[],t=1;t<arguments.length;t++)e[t-1]=arguments[t];for(var i=0;i<e.length;i++)for(var n=e[i],s=keys(n),o=0;o<s.length;o++){var a=s[o];has(r,a)||(r[a]=n[a])}return r}exports.assignNoOverwrite=assignNoOverwrite;function defaults(){for(var r=[],e=0;e<arguments.length;e++)r[e]=arguments[e];return assignNoOverwrite.apply(void 0,__spreadArray([{}],r,!1))}exports.defaults=defaults;function groupBy(r,e){var t={};return forEach(r,function(i){var n=e(i),s=t[n];s?s.push(i):t[n]=[i]}),t}exports.groupBy=groupBy;function merge(r,e){for(var t=cloneObj(r),i=keys(e),n=0;n<i.length;n++){var s=i[n],o=e[s];t[s]=o}return t}exports.merge=merge;function NOOP(){}exports.NOOP=NOOP;function IDENTITY(r){return r}exports.IDENTITY=IDENTITY;function packArray(r){for(var e=[],t=0;t<r.length;t++){var i=r[t];e.push(i!==void 0?i:void 0)}return e}exports.packArray=packArray;function PRINT_ERROR(r){console&&console.error&&console.error("Error: "+r)}exports.PRINT_ERROR=PRINT_ERROR;function PRINT_WARNING(r){console&&console.warn&&console.warn("Warning: "+r)}exports.PRINT_WARNING=PRINT_WARNING;function isES2015MapSupported(){return typeof Map=="function"}exports.isES2015MapSupported=isES2015MapSupported;function peek(r){return r[r.length-1]}exports.peek=peek;function timer(r){var e=new Date().getTime(),t=r(),i=new Date().getTime(),n=i-e;return{time:n,value:t}}exports.timer=timer;function toFastProperties(toBecomeFast){function FakeConstructor(){}FakeConstructor.prototype=toBecomeFast;var fakeInstance=new FakeConstructor;function fakeAccess(){return typeof fakeInstance.bar}return fakeAccess(),fakeAccess(),toBecomeFast;eval(toBecomeFast)}exports.toFastProperties=toFastProperties;function upperFirst(r){if(!r)return r;var e=getCharacterFromCodePointAt(r,0);return e.toUpperCase()+r.substring(e.length)}exports.upperFirst=upperFirst;var surrogatePairPattern=/[\uD800-\uDBFF][\uDC00-\uDFFF]/;function getCharacterFromCodePointAt(r,e){var t=r.substring(e,e+1);return surrogatePairPattern.test(t)?t:r[e]}});var VI=w((LY,zI)=>{(function(r,e){typeof define=="function"&&define.amd?define([],e):typeof zI=="object"&&zI.exports?zI.exports=e():r.regexpToAst=e()})(typeof self<"u"?self:LY,function(){function r(){}r.prototype.saveState=function(){return{idx:this.idx,input:this.input,groupIdx:this.groupIdx}},r.prototype.restoreState=function(p){this.idx=p.idx,this.input=p.input,this.groupIdx=p.groupIdx},r.prototype.pattern=function(p){this.idx=0,this.input=p,this.groupIdx=0,this.consumeChar("/");var C=this.disjunction();this.consumeChar("/");for(var y={type:"Flags",loc:{begin:this.idx,end:p.length},global:!1,ignoreCase:!1,multiLine:!1,unicode:!1,sticky:!1};this.isRegExpFlag();)switch(this.popChar()){case"g":o(y,"global");break;case"i":o(y,"ignoreCase");break;case"m":o(y,"multiLine");break;case"u":o(y,"unicode");break;case"y":o(y,"sticky");break}if(this.idx!==this.input.length)throw Error("Redundant input: "+this.input.substring(this.idx));return{type:"Pattern",flags:y,value:C,loc:this.loc(0)}},r.prototype.disjunction=function(){var p=[],C=this.idx;for(p.push(this.alternative());this.peekChar()==="|";)this.consumeChar("|"),p.push(this.alternative());return{type:"Disjunction",value:p,loc:this.loc(C)}},r.prototype.alternative=function(){for(var p=[],C=this.idx;this.isTerm();)p.push(this.term());return{type:"Alternative",value:p,loc:this.loc(C)}},r.prototype.term=function(){return this.isAssertion()?this.assertion():this.atom()},r.prototype.assertion=function(){var p=this.idx;switch(this.popChar()){case"^":return{type:"StartAnchor",loc:this.loc(p)};case"$":return{type:"EndAnchor",loc:this.loc(p)};case"\\":switch(this.popChar()){case"b":return{type:"WordBoundary",loc:this.loc(p)};case"B":return{type:"NonWordBoundary",loc:this.loc(p)}}throw Error("Invalid Assertion Escape");case"(":this.consumeChar("?");var C;switch(this.popChar()){case"=":C="Lookahead";break;case"!":C="NegativeLookahead";break}a(C);var y=this.disjunction();return this.consumeChar(")"),{type:C,value:y,loc:this.loc(p)}}l()},r.prototype.quantifier=function(p){var C,y=this.idx;switch(this.popChar()){case"*":C={atLeast:0,atMost:1/0};break;case"+":C={atLeast:1,atMost:1/0};break;case"?":C={atLeast:0,atMost:1};break;case"{":var B=this.integerIncludingZero();switch(this.popChar()){case"}":C={atLeast:B,atMost:B};break;case",":var v;this.isDigit()?(v=this.integerIncludingZero(),C={atLeast:B,atMost:v}):C={atLeast:B,atMost:1/0},this.consumeChar("}");break}if(p===!0&&C===void 0)return;a(C);break}if(!(p===!0&&C===void 0))return a(C),this.peekChar(0)==="?"?(this.consumeChar("?"),C.greedy=!1):C.greedy=!0,C.type="Quantifier",C.loc=this.loc(y),C},r.prototype.atom=function(){var p,C=this.idx;switch(this.peekChar()){case".":p=this.dotAll();break;case"\\":p=this.atomEscape();break;case"[":p=this.characterClass();break;case"(":p=this.group();break}return p===void 0&&this.isPatternCharacter()&&(p=this.patternCharacter()),a(p),p.loc=this.loc(C),this.isQuantifier()&&(p.quantifier=this.quantifier()),p},r.prototype.dotAll=function(){return this.consumeChar("."),{type:"Set",complement:!0,value:[n(`
-`),n("\r"),n("\u2028"),n("\u2029")]}},r.prototype.atomEscape=function(){switch(this.consumeChar("\\"),this.peekChar()){case"1":case"2":case"3":case"4":case"5":case"6":case"7":case"8":case"9":return this.decimalEscapeAtom();case"d":case"D":case"s":case"S":case"w":case"W":return this.characterClassEscape();case"f":case"n":case"r":case"t":case"v":return this.controlEscapeAtom();case"c":return this.controlLetterEscapeAtom();case"0":return this.nulCharacterAtom();case"x":return this.hexEscapeSequenceAtom();case"u":return this.regExpUnicodeEscapeSequenceAtom();default:return this.identityEscapeAtom()}},r.prototype.decimalEscapeAtom=function(){var p=this.positiveInteger();return{type:"GroupBackReference",value:p}},r.prototype.characterClassEscape=function(){var p,C=!1;switch(this.popChar()){case"d":p=u;break;case"D":p=u,C=!0;break;case"s":p=f;break;case"S":p=f,C=!0;break;case"w":p=g;break;case"W":p=g,C=!0;break}return a(p),{type:"Set",value:p,complement:C}},r.prototype.controlEscapeAtom=function(){var p;switch(this.popChar()){case"f":p=n("\f");break;case"n":p=n(`
-`);break;case"r":p=n("\r");break;case"t":p=n("	");break;case"v":p=n("\v");break}return a(p),{type:"Character",value:p}},r.prototype.controlLetterEscapeAtom=function(){this.consumeChar("c");var p=this.popChar();if(/[a-zA-Z]/.test(p)===!1)throw Error("Invalid ");var C=p.toUpperCase().charCodeAt(0)-64;return{type:"Character",value:C}},r.prototype.nulCharacterAtom=function(){return this.consumeChar("0"),{type:"Character",value:n("\0")}},r.prototype.hexEscapeSequenceAtom=function(){return this.consumeChar("x"),this.parseHexDigits(2)},r.prototype.regExpUnicodeEscapeSequenceAtom=function(){return this.consumeChar("u"),this.parseHexDigits(4)},r.prototype.identityEscapeAtom=function(){var p=this.popChar();return{type:"Character",value:n(p)}},r.prototype.classPatternCharacterAtom=function(){switch(this.peekChar()){case`
-`:case"\r":case"\u2028":case"\u2029":case"\\":case"]":throw Error("TBD");default:var p=this.popChar();return{type:"Character",value:n(p)}}},r.prototype.characterClass=function(){var p=[],C=!1;for(this.consumeChar("["),this.peekChar(0)==="^"&&(this.consumeChar("^"),C=!0);this.isClassAtom();){var y=this.classAtom(),B=y.type==="Character";if(B&&this.isRangeDash()){this.consumeChar("-");var v=this.classAtom(),D=v.type==="Character";if(D){if(v.value<y.value)throw Error("Range out of order in character class");p.push({from:y.value,to:v.value})}else s(y.value,p),p.push(n("-")),s(v.value,p)}else s(y.value,p)}return this.consumeChar("]"),{type:"Set",complement:C,value:p}},r.prototype.classAtom=function(){switch(this.peekChar()){case"]":case`
-`:case"\r":case"\u2028":case"\u2029":throw Error("TBD");case"\\":return this.classEscape();default:return this.classPatternCharacterAtom()}},r.prototype.classEscape=function(){switch(this.consumeChar("\\"),this.peekChar()){case"b":return this.consumeChar("b"),{type:"Character",value:n("\b")};case"d":case"D":case"s":case"S":case"w":case"W":return this.characterClassEscape();case"f":case"n":case"r":case"t":case"v":return this.controlEscapeAtom();case"c":return this.controlLetterEscapeAtom();case"0":return this.nulCharacterAtom();case"x":return this.hexEscapeSequenceAtom();case"u":return this.regExpUnicodeEscapeSequenceAtom();default:return this.identityEscapeAtom()}},r.prototype.group=function(){var p=!0;switch(this.consumeChar("("),this.peekChar(0)){case"?":this.consumeChar("?"),this.consumeChar(":"),p=!1;break;default:this.groupIdx++;break}var C=this.disjunction();this.consumeChar(")");var y={type:"Group",capturing:p,value:C};return p&&(y.idx=this.groupIdx),y},r.prototype.positiveInteger=function(){var p=this.popChar();if(i.test(p)===!1)throw Error("Expecting a positive integer");for(;t.test(this.peekChar(0));)p+=this.popChar();return parseInt(p,10)},r.prototype.integerIncludingZero=function(){var p=this.popChar();if(t.test(p)===!1)throw Error("Expecting an integer");for(;t.test(this.peekChar(0));)p+=this.popChar();return parseInt(p,10)},r.prototype.patternCharacter=function(){var p=this.popChar();switch(p){case`
-`:case"\r":case"\u2028":case"\u2029":case"^":case"$":case"\\":case".":case"*":case"+":case"?":case"(":case")":case"[":case"|":throw Error("TBD");default:return{type:"Character",value:n(p)}}},r.prototype.isRegExpFlag=function(){switch(this.peekChar(0)){case"g":case"i":case"m":case"u":case"y":return!0;default:return!1}},r.prototype.isRangeDash=function(){return this.peekChar()==="-"&&this.isClassAtom(1)},r.prototype.isDigit=function(){return t.test(this.peekChar(0))},r.prototype.isClassAtom=function(p){switch(p===void 0&&(p=0),this.peekChar(p)){case"]":case`
-`:case"\r":case"\u2028":case"\u2029":return!1;default:return!0}},r.prototype.isTerm=function(){return this.isAtom()||this.isAssertion()},r.prototype.isAtom=function(){if(this.isPatternCharacter())return!0;switch(this.peekChar(0)){case".":case"\\":case"[":case"(":return!0;default:return!1}},r.prototype.isAssertion=function(){switch(this.peekChar(0)){case"^":case"$":return!0;case"\\":switch(this.peekChar(1)){case"b":case"B":return!0;default:return!1}case"(":return this.peekChar(1)==="?"&&(this.peekChar(2)==="="||this.peekChar(2)==="!");default:return!1}},r.prototype.isQuantifier=function(){var p=this.saveState();try{return this.quantifier(!0)!==void 0}catch{return!1}finally{this.restoreState(p)}},r.prototype.isPatternCharacter=function(){switch(this.peekChar()){case"^":case"$":case"\\":case".":case"*":case"+":case"?":case"(":case")":case"[":case"|":case"/":case`
-`:case"\r":case"\u2028":case"\u2029":return!1;default:return!0}},r.prototype.parseHexDigits=function(p){for(var C="",y=0;y<p;y++){var B=this.popChar();if(e.test(B)===!1)throw Error("Expecting a HexDecimal digits");C+=B}var v=parseInt(C,16);return{type:"Character",value:v}},r.prototype.peekChar=function(p){return p===void 0&&(p=0),this.input[this.idx+p]},r.prototype.popChar=function(){var p=this.peekChar(0);return this.consumeChar(),p},r.prototype.consumeChar=function(p){if(p!==void 0&&this.input[this.idx]!==p)throw Error("Expected: '"+p+"' but found: '"+this.input[this.idx]+"' at offset: "+this.idx);if(this.idx>=this.input.length)throw Error("Unexpected end of input");this.idx++},r.prototype.loc=function(p){return{begin:p,end:this.idx}};var e=/[0-9a-fA-F]/,t=/[0-9]/,i=/[1-9]/;function n(p){return p.charCodeAt(0)}function s(p,C){p.length!==void 0?p.forEach(function(y){C.push(y)}):C.push(p)}function o(p,C){if(p[C]===!0)throw"duplicate flag "+C;p[C]=!0}function a(p){if(p===void 0)throw Error("Internal Error - Should never get here!")}function l(){throw Error("Internal Error - Should never get here!")}var c,u=[];for(c=n("0");c<=n("9");c++)u.push(c);var g=[n("_")].concat(u);for(c=n("a");c<=n("z");c++)g.push(c);for(c=n("A");c<=n("Z");c++)g.push(c);var f=[n(" "),n("\f"),n(`
-`),n("\r"),n("	"),n("\v"),n("	"),n("\xA0"),n("\u1680"),n("\u2000"),n("\u2001"),n("\u2002"),n("\u2003"),n("\u2004"),n("\u2005"),n("\u2006"),n("\u2007"),n("\u2008"),n("\u2009"),n("\u200A"),n("\u2028"),n("\u2029"),n("\u202F"),n("\u205F"),n("\u3000"),n("\uFEFF")];function h(){}return h.prototype.visitChildren=function(p){for(var C in p){var y=p[C];p.hasOwnProperty(C)&&(y.type!==void 0?this.visit(y):Array.isArray(y)&&y.forEach(function(B){this.visit(B)},this))}},h.prototype.visit=function(p){switch(p.type){case"Pattern":this.visitPattern(p);break;case"Flags":this.visitFlags(p);break;case"Disjunction":this.visitDisjunction(p);break;case"Alternative":this.visitAlternative(p);break;case"StartAnchor":this.visitStartAnchor(p);break;case"EndAnchor":this.visitEndAnchor(p);break;case"WordBoundary":this.visitWordBoundary(p);break;case"NonWordBoundary":this.visitNonWordBoundary(p);break;case"Lookahead":this.visitLookahead(p);break;case"NegativeLookahead":this.visitNegativeLookahead(p);break;case"Character":this.visitCharacter(p);break;case"Set":this.visitSet(p);break;case"Group":this.visitGroup(p);break;case"GroupBackReference":this.visitGroupBackReference(p);break;case"Quantifier":this.visitQuantifier(p);break}this.visitChildren(p)},h.prototype.visitPattern=function(p){},h.prototype.visitFlags=function(p){},h.prototype.visitDisjunction=function(p){},h.prototype.visitAlternative=function(p){},h.prototype.visitStartAnchor=function(p){},h.prototype.visitEndAnchor=function(p){},h.prototype.visitWordBoundary=function(p){},h.prototype.visitNonWordBoundary=function(p){},h.prototype.visitLookahead=function(p){},h.prototype.visitNegativeLookahead=function(p){},h.prototype.visitCharacter=function(p){},h.prototype.visitSet=function(p){},h.prototype.visitGroup=function(p){},h.prototype.visitGroupBackReference=function(p){},h.prototype.visitQuantifier=function(p){},{RegExpParser:r,BaseRegExpVisitor:h,VERSION:"0.5.0"}})});var ZI=w(Wg=>{"use strict";Object.defineProperty(Wg,"__esModule",{value:!0});Wg.clearRegExpParserCache=Wg.getRegExpAst=void 0;var hEe=VI(),XI={},pEe=new hEe.RegExpParser;function dEe(r){var e=r.toString();if(XI.hasOwnProperty(e))return XI[e];var t=pEe.pattern(e);return XI[e]=t,t}Wg.getRegExpAst=dEe;function CEe(){XI={}}Wg.clearRegExpParserCache=CEe});var UY=w(pn=>{"use strict";var mEe=pn&&pn.__extends||function(){var r=function(e,t){return r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(i,n){i.__proto__=n}||function(i,n){for(var s in n)Object.prototype.hasOwnProperty.call(n,s)&&(i[s]=n[s])},r(e,t)};return function(e,t){if(typeof t!="function"&&t!==null)throw new TypeError("Class extends value "+String(t)+" is not a constructor or null");r(e,t);function i(){this.constructor=e}e.prototype=t===null?Object.create(t):(i.prototype=t.prototype,new i)}}();Object.defineProperty(pn,"__esModule",{value:!0});pn.canMatchCharCode=pn.firstCharOptimizedIndices=pn.getOptimizedStartCodesIndices=pn.failedOptimizationPrefixMsg=void 0;var OY=VI(),cs=Gt(),MY=ZI(),Sa=Rv(),KY="Complement Sets are not supported for first char optimization";pn.failedOptimizationPrefixMsg=`Unable to use "first char" lexer optimizations:
-`;function EEe(r,e){e===void 0&&(e=!1);try{var t=(0,MY.getRegExpAst)(r),i=$I(t.value,{},t.flags.ignoreCase);return i}catch(s){if(s.message===KY)e&&(0,cs.PRINT_WARNING)(""+pn.failedOptimizationPrefixMsg+("	Unable to optimize: < "+r.toString()+` >
-`)+`	Complement Sets cannot be automatically optimized.
-	This will disable the lexer's first char optimizations.
-	See: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#COMPLEMENT for details.`);else{var n="";e&&(n=`
-	This will disable the lexer's first char optimizations.
-	See: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#REGEXP_PARSING for details.`),(0,cs.PRINT_ERROR)(pn.failedOptimizationPrefixMsg+`
-`+("	Failed parsing: < "+r.toString()+` >
-`)+("	Using the regexp-to-ast library version: "+OY.VERSION+`
-`)+"	Please open an issue at: https://github.com/bd82/regexp-to-ast/issues"+n)}}return[]}pn.getOptimizedStartCodesIndices=EEe;function $I(r,e,t){switch(r.type){case"Disjunction":for(var i=0;i<r.value.length;i++)$I(r.value[i],e,t);break;case"Alternative":for(var n=r.value,i=0;i<n.length;i++){var s=n[i];switch(s.type){case"EndAnchor":case"GroupBackReference":case"Lookahead":case"NegativeLookahead":case"StartAnchor":case"WordBoundary":case"NonWordBoundary":continue}var o=s;switch(o.type){case"Character":_I(o.value,e,t);break;case"Set":if(o.complement===!0)throw Error(KY);(0,cs.forEach)(o.value,function(c){if(typeof c=="number")_I(c,e,t);else{var u=c;if(t===!0)for(var g=u.from;g<=u.to;g++)_I(g,e,t);else{for(var g=u.from;g<=u.to&&g<Sa.minOptimizationVal;g++)_I(g,e,t);if(u.to>=Sa.minOptimizationVal)for(var f=u.from>=Sa.minOptimizationVal?u.from:Sa.minOptimizationVal,h=u.to,p=(0,Sa.charCodeToOptimizedIndex)(f),C=(0,Sa.charCodeToOptimizedIndex)(h),y=p;y<=C;y++)e[y]=y}}});break;case"Group":$I(o.value,e,t);break;default:throw Error("Non Exhaustive Match")}var a=o.quantifier!==void 0&&o.quantifier.atLeast===0;if(o.type==="Group"&&kv(o)===!1||o.type!=="Group"&&a===!1)break}break;default:throw Error("non exhaustive match!")}return(0,cs.values)(e)}pn.firstCharOptimizedIndices=$I;function _I(r,e,t){var i=(0,Sa.charCodeToOptimizedIndex)(r);e[i]=i,t===!0&&IEe(r,e)}function IEe(r,e){var t=String.fromCharCode(r),i=t.toUpperCase();if(i!==t){var n=(0,Sa.charCodeToOptimizedIndex)(i.charCodeAt(0));e[n]=n}else{var s=t.toLowerCase();if(s!==t){var n=(0,Sa.charCodeToOptimizedIndex)(s.charCodeAt(0));e[n]=n}}}function TY(r,e){return(0,cs.find)(r.value,function(t){if(typeof t=="number")return(0,cs.contains)(e,t);var i=t;return(0,cs.find)(e,function(n){return i.from<=n&&n<=i.to})!==void 0})}function kv(r){return r.quantifier&&r.quantifier.atLeast===0?!0:r.value?(0,cs.isArray)(r.value)?(0,cs.every)(r.value,kv):kv(r.value):!1}var yEe=function(r){mEe(e,r);function e(t){var i=r.call(this)||this;return i.targetCharCodes=t,i.found=!1,i}return e.prototype.visitChildren=function(t){if(this.found!==!0){switch(t.type){case"Lookahead":this.visitLookahead(t);return;case"NegativeLookahead":this.visitNegativeLookahead(t);return}r.prototype.visitChildren.call(this,t)}},e.prototype.visitCharacter=function(t){(0,cs.contains)(this.targetCharCodes,t.value)&&(this.found=!0)},e.prototype.visitSet=function(t){t.complement?TY(t,this.targetCharCodes)===void 0&&(this.found=!0):TY(t,this.targetCharCodes)!==void 0&&(this.found=!0)},e}(OY.BaseRegExpVisitor);function wEe(r,e){if(e instanceof RegExp){var t=(0,MY.getRegExpAst)(e),i=new yEe(r);return i.visit(t),i.found}else return(0,cs.find)(e,function(n){return(0,cs.contains)(r,n.charCodeAt(0))})!==void 0}pn.canMatchCharCode=wEe});var Rv=w(Ve=>{"use strict";var HY=Ve&&Ve.__extends||function(){var r=function(e,t){return r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(i,n){i.__proto__=n}||function(i,n){for(var s in n)Object.prototype.hasOwnProperty.call(n,s)&&(i[s]=n[s])},r(e,t)};return function(e,t){if(typeof t!="function"&&t!==null)throw new TypeError("Class extends value "+String(t)+" is not a constructor or null");r(e,t);function i(){this.constructor=e}e.prototype=t===null?Object.create(t):(i.prototype=t.prototype,new i)}}();Object.defineProperty(Ve,"__esModule",{value:!0});Ve.charCodeToOptimizedIndex=Ve.minOptimizationVal=Ve.buildLineBreakIssueMessage=Ve.LineTerminatorOptimizedTester=Ve.isShortPattern=Ve.isCustomPattern=Ve.cloneEmptyGroups=Ve.performWarningRuntimeChecks=Ve.performRuntimeChecks=Ve.addStickyFlag=Ve.addStartOfInput=Ve.findUnreachablePatterns=Ve.findModesThatDoNotExist=Ve.findInvalidGroupType=Ve.findDuplicatePatterns=Ve.findUnsupportedFlags=Ve.findStartOfInputAnchor=Ve.findEmptyMatchRegExps=Ve.findEndOfInputAnchor=Ve.findInvalidPatterns=Ve.findMissingPatterns=Ve.validatePatterns=Ve.analyzeTokenTypes=Ve.enableSticky=Ve.disableSticky=Ve.SUPPORT_STICKY=Ve.MODES=Ve.DEFAULT_MODE=void 0;var GY=VI(),ir=yd(),xe=Gt(),zg=UY(),YY=ZI(),Do="PATTERN";Ve.DEFAULT_MODE="defaultMode";Ve.MODES="modes";Ve.SUPPORT_STICKY=typeof new RegExp("(?:)").sticky=="boolean";function BEe(){Ve.SUPPORT_STICKY=!1}Ve.disableSticky=BEe;function QEe(){Ve.SUPPORT_STICKY=!0}Ve.enableSticky=QEe;function bEe(r,e){e=(0,xe.defaults)(e,{useSticky:Ve.SUPPORT_STICKY,debug:!1,safeMode:!1,positionTracking:"full",lineTerminatorCharacters:["\r",`
-`],tracer:function(v,D){return D()}});var t=e.tracer;t("initCharCodeToOptimizedIndexMap",function(){LEe()});var i;t("Reject Lexer.NA",function(){i=(0,xe.reject)(r,function(v){return v[Do]===ir.Lexer.NA})});var n=!1,s;t("Transform Patterns",function(){n=!1,s=(0,xe.map)(i,function(v){var D=v[Do];if((0,xe.isRegExp)(D)){var L=D.source;return L.length===1&&L!=="^"&&L!=="$"&&L!=="."&&!D.ignoreCase?L:L.length===2&&L[0]==="\\"&&!(0,xe.contains)(["d","D","s","S","t","r","n","t","0","c","b","B","f","v","w","W"],L[1])?L[1]:e.useSticky?Lv(D):Nv(D)}else{if((0,xe.isFunction)(D))return n=!0,{exec:D};if((0,xe.has)(D,"exec"))return n=!0,D;if(typeof D=="string"){if(D.length===1)return D;var H=D.replace(/[\\^$.*+?()[\]{}|]/g,"\\$&"),j=new RegExp(H);return e.useSticky?Lv(j):Nv(j)}else throw Error("non exhaustive match")}})});var o,a,l,c,u;t("misc mapping",function(){o=(0,xe.map)(i,function(v){return v.tokenTypeIdx}),a=(0,xe.map)(i,function(v){var D=v.GROUP;if(D!==ir.Lexer.SKIPPED){if((0,xe.isString)(D))return D;if((0,xe.isUndefined)(D))return!1;throw Error("non exhaustive match")}}),l=(0,xe.map)(i,function(v){var D=v.LONGER_ALT;if(D){var L=(0,xe.isArray)(D)?(0,xe.map)(D,function(H){return(0,xe.indexOf)(i,H)}):[(0,xe.indexOf)(i,D)];return L}}),c=(0,xe.map)(i,function(v){return v.PUSH_MODE}),u=(0,xe.map)(i,function(v){return(0,xe.has)(v,"POP_MODE")})});var g;t("Line Terminator Handling",function(){var v=ij(e.lineTerminatorCharacters);g=(0,xe.map)(i,function(D){return!1}),e.positionTracking!=="onlyOffset"&&(g=(0,xe.map)(i,function(D){if((0,xe.has)(D,"LINE_BREAKS"))return D.LINE_BREAKS;if(tj(D,v)===!1)return(0,zg.canMatchCharCode)(v,D.PATTERN)}))});var f,h,p,C;t("Misc Mapping #2",function(){f=(0,xe.map)(i,Ov),h=(0,xe.map)(s,ej),p=(0,xe.reduce)(i,function(v,D){var L=D.GROUP;return(0,xe.isString)(L)&&L!==ir.Lexer.SKIPPED&&(v[L]=[]),v},{}),C=(0,xe.map)(s,function(v,D){return{pattern:s[D],longerAlt:l[D],canLineTerminator:g[D],isCustom:f[D],short:h[D],group:a[D],push:c[D],pop:u[D],tokenTypeIdx:o[D],tokenType:i[D]}})});var y=!0,B=[];return e.safeMode||t("First Char Optimization",function(){B=(0,xe.reduce)(i,function(v,D,L){if(typeof D.PATTERN=="string"){var H=D.PATTERN.charCodeAt(0),j=Tv(H);Fv(v,j,C[L])}else if((0,xe.isArray)(D.START_CHARS_HINT)){var $;(0,xe.forEach)(D.START_CHARS_HINT,function(W){var _=typeof W=="string"?W.charCodeAt(0):W,A=Tv(_);$!==A&&($=A,Fv(v,A,C[L]))})}else if((0,xe.isRegExp)(D.PATTERN))if(D.PATTERN.unicode)y=!1,e.ensureOptimizations&&(0,xe.PRINT_ERROR)(""+zg.failedOptimizationPrefixMsg+("	Unable to analyze < "+D.PATTERN.toString()+` > pattern.
-`)+`	The regexp unicode flag is not currently supported by the regexp-to-ast library.
-	This will disable the lexer's first char optimizations.
-	For details See: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#UNICODE_OPTIMIZE`);else{var V=(0,zg.getOptimizedStartCodesIndices)(D.PATTERN,e.ensureOptimizations);(0,xe.isEmpty)(V)&&(y=!1),(0,xe.forEach)(V,function(W){Fv(v,W,C[L])})}else e.ensureOptimizations&&(0,xe.PRINT_ERROR)(""+zg.failedOptimizationPrefixMsg+("	TokenType: <"+D.name+`> is using a custom token pattern without providing <start_chars_hint> parameter.
-`)+`	This will disable the lexer's first char optimizations.
-	For details See: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#CUSTOM_OPTIMIZE`),y=!1;return v},[])}),t("ArrayPacking",function(){B=(0,xe.packArray)(B)}),{emptyGroups:p,patternIdxToConfig:C,charCodeToPatternIdxToConfig:B,hasCustom:n,canBeOptimized:y}}Ve.analyzeTokenTypes=bEe;function SEe(r,e){var t=[],i=jY(r);t=t.concat(i.errors);var n=qY(i.valid),s=n.valid;return t=t.concat(n.errors),t=t.concat(vEe(s)),t=t.concat(ZY(s)),t=t.concat(_Y(s,e)),t=t.concat($Y(s)),t}Ve.validatePatterns=SEe;function vEe(r){var e=[],t=(0,xe.filter)(r,function(i){return(0,xe.isRegExp)(i[Do])});return e=e.concat(JY(t)),e=e.concat(zY(t)),e=e.concat(VY(t)),e=e.concat(XY(t)),e=e.concat(WY(t)),e}function jY(r){var e=(0,xe.filter)(r,function(n){return!(0,xe.has)(n,Do)}),t=(0,xe.map)(e,function(n){return{message:"Token Type: ->"+n.name+"<- missing static 'PATTERN' property",type:ir.LexerDefinitionErrorType.MISSING_PATTERN,tokenTypes:[n]}}),i=(0,xe.difference)(r,e);return{errors:t,valid:i}}Ve.findMissingPatterns=jY;function qY(r){var e=(0,xe.filter)(r,function(n){var s=n[Do];return!(0,xe.isRegExp)(s)&&!(0,xe.isFunction)(s)&&!(0,xe.has)(s,"exec")&&!(0,xe.isString)(s)}),t=(0,xe.map)(e,function(n){return{message:"Token Type: ->"+n.name+"<- static 'PATTERN' can only be a RegExp, a Function matching the {CustomPatternMatcherFunc} type or an Object matching the {ICustomPattern} interface.",type:ir.LexerDefinitionErrorType.INVALID_PATTERN,tokenTypes:[n]}}),i=(0,xe.difference)(r,e);return{errors:t,valid:i}}Ve.findInvalidPatterns=qY;var xEe=/[^\\][\$]/;function JY(r){var e=function(n){HY(s,n);function s(){var o=n!==null&&n.apply(this,arguments)||this;return o.found=!1,o}return s.prototype.visitEndAnchor=function(o){this.found=!0},s}(GY.BaseRegExpVisitor),t=(0,xe.filter)(r,function(n){var s=n[Do];try{var o=(0,YY.getRegExpAst)(s),a=new e;return a.visit(o),a.found}catch{return xEe.test(s.source)}}),i=(0,xe.map)(t,function(n){return{message:`Unexpected RegExp Anchor Error:
-	Token Type: ->`+n.name+`<- static 'PATTERN' cannot contain end of input anchor '$'
-	See chevrotain.io/docs/guide/resolving_lexer_errors.html#ANCHORS	for details.`,type:ir.LexerDefinitionErrorType.EOI_ANCHOR_FOUND,tokenTypes:[n]}});return i}Ve.findEndOfInputAnchor=JY;function WY(r){var e=(0,xe.filter)(r,function(i){var n=i[Do];return n.test("")}),t=(0,xe.map)(e,function(i){return{message:"Token Type: ->"+i.name+"<- static 'PATTERN' must not match an empty string",type:ir.LexerDefinitionErrorType.EMPTY_MATCH_PATTERN,tokenTypes:[i]}});return t}Ve.findEmptyMatchRegExps=WY;var PEe=/[^\\[][\^]|^\^/;function zY(r){var e=function(n){HY(s,n);function s(){var o=n!==null&&n.apply(this,arguments)||this;return o.found=!1,o}return s.prototype.visitStartAnchor=function(o){this.found=!0},s}(GY.BaseRegExpVisitor),t=(0,xe.filter)(r,function(n){var s=n[Do];try{var o=(0,YY.getRegExpAst)(s),a=new e;return a.visit(o),a.found}catch{return PEe.test(s.source)}}),i=(0,xe.map)(t,function(n){return{message:`Unexpected RegExp Anchor Error:
-	Token Type: ->`+n.name+`<- static 'PATTERN' cannot contain start of input anchor '^'
-	See https://chevrotain.io/docs/guide/resolving_lexer_errors.html#ANCHORS	for details.`,type:ir.LexerDefinitionErrorType.SOI_ANCHOR_FOUND,tokenTypes:[n]}});return i}Ve.findStartOfInputAnchor=zY;function VY(r){var e=(0,xe.filter)(r,function(i){var n=i[Do];return n instanceof RegExp&&(n.multiline||n.global)}),t=(0,xe.map)(e,function(i){return{message:"Token Type: ->"+i.name+"<- static 'PATTERN' may NOT contain global('g') or multiline('m')",type:ir.LexerDefinitionErrorType.UNSUPPORTED_FLAGS_FOUND,tokenTypes:[i]}});return t}Ve.findUnsupportedFlags=VY;function XY(r){var e=[],t=(0,xe.map)(r,function(s){return(0,xe.reduce)(r,function(o,a){return s.PATTERN.source===a.PATTERN.source&&!(0,xe.contains)(e,a)&&a.PATTERN!==ir.Lexer.NA&&(e.push(a),o.push(a)),o},[])});t=(0,xe.compact)(t);var i=(0,xe.filter)(t,function(s){return s.length>1}),n=(0,xe.map)(i,function(s){var o=(0,xe.map)(s,function(l){return l.name}),a=(0,xe.first)(s).PATTERN;return{message:"The same RegExp pattern ->"+a+"<-"+("has been used in all of the following Token Types: "+o.join(", ")+" <-"),type:ir.LexerDefinitionErrorType.DUPLICATE_PATTERNS_FOUND,tokenTypes:s}});return n}Ve.findDuplicatePatterns=XY;function ZY(r){var e=(0,xe.filter)(r,function(i){if(!(0,xe.has)(i,"GROUP"))return!1;var n=i.GROUP;return n!==ir.Lexer.SKIPPED&&n!==ir.Lexer.NA&&!(0,xe.isString)(n)}),t=(0,xe.map)(e,function(i){return{message:"Token Type: ->"+i.name+"<- static 'GROUP' can only be Lexer.SKIPPED/Lexer.NA/A String",type:ir.LexerDefinitionErrorType.INVALID_GROUP_TYPE_FOUND,tokenTypes:[i]}});return t}Ve.findInvalidGroupType=ZY;function _Y(r,e){var t=(0,xe.filter)(r,function(n){return n.PUSH_MODE!==void 0&&!(0,xe.contains)(e,n.PUSH_MODE)}),i=(0,xe.map)(t,function(n){var s="Token Type: ->"+n.name+"<- static 'PUSH_MODE' value cannot refer to a Lexer Mode ->"+n.PUSH_MODE+"<-which does not exist";return{message:s,type:ir.LexerDefinitionErrorType.PUSH_MODE_DOES_NOT_EXIST,tokenTypes:[n]}});return i}Ve.findModesThatDoNotExist=_Y;function $Y(r){var e=[],t=(0,xe.reduce)(r,function(i,n,s){var o=n.PATTERN;return o===ir.Lexer.NA||((0,xe.isString)(o)?i.push({str:o,idx:s,tokenType:n}):(0,xe.isRegExp)(o)&&kEe(o)&&i.push({str:o.source,idx:s,tokenType:n})),i},[]);return(0,xe.forEach)(r,function(i,n){(0,xe.forEach)(t,function(s){var o=s.str,a=s.idx,l=s.tokenType;if(n<a&&DEe(o,i.PATTERN)){var c="Token: ->"+l.name+`<- can never be matched.
-`+("Because it appears AFTER the Token Type ->"+i.name+"<-")+`in the lexer's definition.
-See https://chevrotain.io/docs/guide/resolving_lexer_errors.html#UNREACHABLE`;e.push({message:c,type:ir.LexerDefinitionErrorType.UNREACHABLE_PATTERN,tokenTypes:[i,l]})}})}),e}Ve.findUnreachablePatterns=$Y;function DEe(r,e){if((0,xe.isRegExp)(e)){var t=e.exec(r);return t!==null&&t.index===0}else{if((0,xe.isFunction)(e))return e(r,0,[],{});if((0,xe.has)(e,"exec"))return e.exec(r,0,[],{});if(typeof e=="string")return e===r;throw Error("non exhaustive match")}}function kEe(r){var e=[".","\\","[","]","|","^","$","(",")","?","*","+","{"];return(0,xe.find)(e,function(t){return r.source.indexOf(t)!==-1})===void 0}function Nv(r){var e=r.ignoreCase?"i":"";return new RegExp("^(?:"+r.source+")",e)}Ve.addStartOfInput=Nv;function Lv(r){var e=r.ignoreCase?"iy":"y";return new RegExp(""+r.source,e)}Ve.addStickyFlag=Lv;function REe(r,e,t){var i=[];return(0,xe.has)(r,Ve.DEFAULT_MODE)||i.push({message:"A MultiMode Lexer cannot be initialized without a <"+Ve.DEFAULT_MODE+`> property in its definition
-`,type:ir.LexerDefinitionErrorType.MULTI_MODE_LEXER_WITHOUT_DEFAULT_MODE}),(0,xe.has)(r,Ve.MODES)||i.push({message:"A MultiMode Lexer cannot be initialized without a <"+Ve.MODES+`> property in its definition
-`,type:ir.LexerDefinitionErrorType.MULTI_MODE_LEXER_WITHOUT_MODES_PROPERTY}),(0,xe.has)(r,Ve.MODES)&&(0,xe.has)(r,Ve.DEFAULT_MODE)&&!(0,xe.has)(r.modes,r.defaultMode)&&i.push({message:"A MultiMode Lexer cannot be initialized with a "+Ve.DEFAULT_MODE+": <"+r.defaultMode+`>which does not exist
-`,type:ir.LexerDefinitionErrorType.MULTI_MODE_LEXER_DEFAULT_MODE_VALUE_DOES_NOT_EXIST}),(0,xe.has)(r,Ve.MODES)&&(0,xe.forEach)(r.modes,function(n,s){(0,xe.forEach)(n,function(o,a){(0,xe.isUndefined)(o)&&i.push({message:"A Lexer cannot be initialized using an undefined Token Type. Mode:"+("<"+s+"> at index: <"+a+`>
-`),type:ir.LexerDefinitionErrorType.LEXER_DEFINITION_CANNOT_CONTAIN_UNDEFINED})})}),i}Ve.performRuntimeChecks=REe;function FEe(r,e,t){var i=[],n=!1,s=(0,xe.compact)((0,xe.flatten)((0,xe.mapValues)(r.modes,function(l){return l}))),o=(0,xe.reject)(s,function(l){return l[Do]===ir.Lexer.NA}),a=ij(t);return e&&(0,xe.forEach)(o,function(l){var c=tj(l,a);if(c!==!1){var u=rj(l,c),g={message:u,type:c.issue,tokenType:l};i.push(g)}else(0,xe.has)(l,"LINE_BREAKS")?l.LINE_BREAKS===!0&&(n=!0):(0,zg.canMatchCharCode)(a,l.PATTERN)&&(n=!0)}),e&&!n&&i.push({message:`Warning: No LINE_BREAKS Found.
-	This Lexer has been defined to track line and column information,
-	But none of the Token Types can be identified as matching a line terminator.
-	See https://chevrotain.io/docs/guide/resolving_lexer_errors.html#LINE_BREAKS 
-	for details.`,type:ir.LexerDefinitionErrorType.NO_LINE_BREAKS_FLAGS}),i}Ve.performWarningRuntimeChecks=FEe;function NEe(r){var e={},t=(0,xe.keys)(r);return(0,xe.forEach)(t,function(i){var n=r[i];if((0,xe.isArray)(n))e[i]=[];else throw Error("non exhaustive match")}),e}Ve.cloneEmptyGroups=NEe;function Ov(r){var e=r.PATTERN;if((0,xe.isRegExp)(e))return!1;if((0,xe.isFunction)(e))return!0;if((0,xe.has)(e,"exec"))return!0;if((0,xe.isString)(e))return!1;throw Error("non exhaustive match")}Ve.isCustomPattern=Ov;function ej(r){return(0,xe.isString)(r)&&r.length===1?r.charCodeAt(0):!1}Ve.isShortPattern=ej;Ve.LineTerminatorOptimizedTester={test:function(r){for(var e=r.length,t=this.lastIndex;t<e;t++){var i=r.charCodeAt(t);if(i===10)return this.lastIndex=t+1,!0;if(i===13)return r.charCodeAt(t+1)===10?this.lastIndex=t+2:this.lastIndex=t+1,!0}return!1},lastIndex:0};function tj(r,e){if((0,xe.has)(r,"LINE_BREAKS"))return!1;if((0,xe.isRegExp)(r.PATTERN)){try{(0,zg.canMatchCharCode)(e,r.PATTERN)}catch(t){return{issue:ir.LexerDefinitionErrorType.IDENTIFY_TERMINATOR,errMsg:t.message}}return!1}else{if((0,xe.isString)(r.PATTERN))return!1;if(Ov(r))return{issue:ir.LexerDefinitionErrorType.CUSTOM_LINE_BREAK};throw Error("non exhaustive match")}}function rj(r,e){if(e.issue===ir.LexerDefinitionErrorType.IDENTIFY_TERMINATOR)return`Warning: unable to identify line terminator usage in pattern.
-`+("	The problem is in the <"+r.name+`> Token Type
-`)+("	 Root cause: "+e.errMsg+`.
-`)+"	For details See: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#IDENTIFY_TERMINATOR";if(e.issue===ir.LexerDefinitionErrorType.CUSTOM_LINE_BREAK)return`Warning: A Custom Token Pattern should specify the <line_breaks> option.
-`+("	The problem is in the <"+r.name+`> Token Type
-`)+"	For details See: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#CUSTOM_LINE_BREAK";throw Error("non exhaustive match")}Ve.buildLineBreakIssueMessage=rj;function ij(r){var e=(0,xe.map)(r,function(t){return(0,xe.isString)(t)&&t.length>0?t.charCodeAt(0):t});return e}function Fv(r,e,t){r[e]===void 0?r[e]=[t]:r[e].push(t)}Ve.minOptimizationVal=256;var ey=[];function Tv(r){return r<Ve.minOptimizationVal?r:ey[r]}Ve.charCodeToOptimizedIndex=Tv;function LEe(){if((0,xe.isEmpty)(ey)){ey=new Array(65536);for(var r=0;r<65536;r++)ey[r]=r>255?255+~~(r/255):r}}});var Vg=w(Nt=>{"use strict";Object.defineProperty(Nt,"__esModule",{value:!0});Nt.isTokenType=Nt.hasExtendingTokensTypesMapProperty=Nt.hasExtendingTokensTypesProperty=Nt.hasCategoriesProperty=Nt.hasShortKeyProperty=Nt.singleAssignCategoriesToksMap=Nt.assignCategoriesMapProp=Nt.assignCategoriesTokensProp=Nt.assignTokenDefaultProps=Nt.expandCategories=Nt.augmentTokenTypes=Nt.tokenIdxToClass=Nt.tokenShortNameIdx=Nt.tokenStructuredMatcherNoCategories=Nt.tokenStructuredMatcher=void 0;var Zr=Gt();function TEe(r,e){var t=r.tokenTypeIdx;return t===e.tokenTypeIdx?!0:e.isParent===!0&&e.categoryMatchesMap[t]===!0}Nt.tokenStructuredMatcher=TEe;function OEe(r,e){return r.tokenTypeIdx===e.tokenTypeIdx}Nt.tokenStructuredMatcherNoCategories=OEe;Nt.tokenShortNameIdx=1;Nt.tokenIdxToClass={};function MEe(r){var e=nj(r);sj(e),aj(e),oj(e),(0,Zr.forEach)(e,function(t){t.isParent=t.categoryMatches.length>0})}Nt.augmentTokenTypes=MEe;function nj(r){for(var e=(0,Zr.cloneArr)(r),t=r,i=!0;i;){t=(0,Zr.compact)((0,Zr.flatten)((0,Zr.map)(t,function(s){return s.CATEGORIES})));var n=(0,Zr.difference)(t,e);e=e.concat(n),(0,Zr.isEmpty)(n)?i=!1:t=n}return e}Nt.expandCategories=nj;function sj(r){(0,Zr.forEach)(r,function(e){Aj(e)||(Nt.tokenIdxToClass[Nt.tokenShortNameIdx]=e,e.tokenTypeIdx=Nt.tokenShortNameIdx++),Mv(e)&&!(0,Zr.isArray)(e.CATEGORIES)&&(e.CATEGORIES=[e.CATEGORIES]),Mv(e)||(e.CATEGORIES=[]),lj(e)||(e.categoryMatches=[]),cj(e)||(e.categoryMatchesMap={})})}Nt.assignTokenDefaultProps=sj;function oj(r){(0,Zr.forEach)(r,function(e){e.categoryMatches=[],(0,Zr.forEach)(e.categoryMatchesMap,function(t,i){e.categoryMatches.push(Nt.tokenIdxToClass[i].tokenTypeIdx)})})}Nt.assignCategoriesTokensProp=oj;function aj(r){(0,Zr.forEach)(r,function(e){Kv([],e)})}Nt.assignCategoriesMapProp=aj;function Kv(r,e){(0,Zr.forEach)(r,function(t){e.categoryMatchesMap[t.tokenTypeIdx]=!0}),(0,Zr.forEach)(e.CATEGORIES,function(t){var i=r.concat(e);(0,Zr.contains)(i,t)||Kv(i,t)})}Nt.singleAssignCategoriesToksMap=Kv;function Aj(r){return(0,Zr.has)(r,"tokenTypeIdx")}Nt.hasShortKeyProperty=Aj;function Mv(r){return(0,Zr.has)(r,"CATEGORIES")}Nt.hasCategoriesProperty=Mv;function lj(r){return(0,Zr.has)(r,"categoryMatches")}Nt.hasExtendingTokensTypesProperty=lj;function cj(r){return(0,Zr.has)(r,"categoryMatchesMap")}Nt.hasExtendingTokensTypesMapProperty=cj;function KEe(r){return(0,Zr.has)(r,"tokenTypeIdx")}Nt.isTokenType=KEe});var Uv=w(ty=>{"use strict";Object.defineProperty(ty,"__esModule",{value:!0});ty.defaultLexerErrorProvider=void 0;ty.defaultLexerErrorProvider={buildUnableToPopLexerModeMessage:function(r){return"Unable to pop Lexer Mode after encountering Token ->"+r.image+"<- The Mode Stack is empty"},buildUnexpectedCharactersMessage:function(r,e,t,i,n){return"unexpected character: ->"+r.charAt(e)+"<- at offset: "+e+","+(" skipped "+t+" characters.")}}});var yd=w(fc=>{"use strict";Object.defineProperty(fc,"__esModule",{value:!0});fc.Lexer=fc.LexerDefinitionErrorType=void 0;var Xs=Rv(),nr=Gt(),UEe=Vg(),HEe=Uv(),GEe=ZI(),YEe;(function(r){r[r.MISSING_PATTERN=0]="MISSING_PATTERN",r[r.INVALID_PATTERN=1]="INVALID_PATTERN",r[r.EOI_ANCHOR_FOUND=2]="EOI_ANCHOR_FOUND",r[r.UNSUPPORTED_FLAGS_FOUND=3]="UNSUPPORTED_FLAGS_FOUND",r[r.DUPLICATE_PATTERNS_FOUND=4]="DUPLICATE_PATTERNS_FOUND",r[r.INVALID_GROUP_TYPE_FOUND=5]="INVALID_GROUP_TYPE_FOUND",r[r.PUSH_MODE_DOES_NOT_EXIST=6]="PUSH_MODE_DOES_NOT_EXIST",r[r.MULTI_MODE_LEXER_WITHOUT_DEFAULT_MODE=7]="MULTI_MODE_LEXER_WITHOUT_DEFAULT_MODE",r[r.MULTI_MODE_LEXER_WITHOUT_MODES_PROPERTY=8]="MULTI_MODE_LEXER_WITHOUT_MODES_PROPERTY",r[r.MULTI_MODE_LEXER_DEFAULT_MODE_VALUE_DOES_NOT_EXIST=9]="MULTI_MODE_LEXER_DEFAULT_MODE_VALUE_DOES_NOT_EXIST",r[r.LEXER_DEFINITION_CANNOT_CONTAIN_UNDEFINED=10]="LEXER_DEFINITION_CANNOT_CONTAIN_UNDEFINED",r[r.SOI_ANCHOR_FOUND=11]="SOI_ANCHOR_FOUND",r[r.EMPTY_MATCH_PATTERN=12]="EMPTY_MATCH_PATTERN",r[r.NO_LINE_BREAKS_FLAGS=13]="NO_LINE_BREAKS_FLAGS",r[r.UNREACHABLE_PATTERN=14]="UNREACHABLE_PATTERN",r[r.IDENTIFY_TERMINATOR=15]="IDENTIFY_TERMINATOR",r[r.CUSTOM_LINE_BREAK=16]="CUSTOM_LINE_BREAK"})(YEe=fc.LexerDefinitionErrorType||(fc.LexerDefinitionErrorType={}));var wd={deferDefinitionErrorsHandling:!1,positionTracking:"full",lineTerminatorsPattern:/\n|\r\n?/g,lineTerminatorCharacters:[`
-`,"\r"],ensureOptimizations:!1,safeMode:!1,errorMessageProvider:HEe.defaultLexerErrorProvider,traceInitPerf:!1,skipValidations:!1};Object.freeze(wd);var jEe=function(){function r(e,t){var i=this;if(t===void 0&&(t=wd),this.lexerDefinition=e,this.lexerDefinitionErrors=[],this.lexerDefinitionWarning=[],this.patternIdxToConfig={},this.charCodeToPatternIdxToConfig={},this.modes=[],this.emptyGroups={},this.config=void 0,this.trackStartLines=!0,this.trackEndLines=!0,this.hasCustom=!1,this.canModeBeOptimized={},typeof t=="boolean")throw Error(`The second argument to the Lexer constructor is now an ILexerConfig Object.
-a boolean 2nd argument is no longer supported`);this.config=(0,nr.merge)(wd,t);var n=this.config.traceInitPerf;n===!0?(this.traceInitMaxIdent=1/0,this.traceInitPerf=!0):typeof n=="number"&&(this.traceInitMaxIdent=n,this.traceInitPerf=!0),this.traceInitIndent=-1,this.TRACE_INIT("Lexer Constructor",function(){var s,o=!0;i.TRACE_INIT("Lexer Config handling",function(){if(i.config.lineTerminatorsPattern===wd.lineTerminatorsPattern)i.config.lineTerminatorsPattern=Xs.LineTerminatorOptimizedTester;else if(i.config.lineTerminatorCharacters===wd.lineTerminatorCharacters)throw Error(`Error: Missing <lineTerminatorCharacters> property on the Lexer config.
-	For details See: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#MISSING_LINE_TERM_CHARS`);if(t.safeMode&&t.ensureOptimizations)throw Error('"safeMode" and "ensureOptimizations" flags are mutually exclusive.');i.trackStartLines=/full|onlyStart/i.test(i.config.positionTracking),i.trackEndLines=/full/i.test(i.config.positionTracking),(0,nr.isArray)(e)?(s={modes:{}},s.modes[Xs.DEFAULT_MODE]=(0,nr.cloneArr)(e),s[Xs.DEFAULT_MODE]=Xs.DEFAULT_MODE):(o=!1,s=(0,nr.cloneObj)(e))}),i.config.skipValidations===!1&&(i.TRACE_INIT("performRuntimeChecks",function(){i.lexerDefinitionErrors=i.lexerDefinitionErrors.concat((0,Xs.performRuntimeChecks)(s,i.trackStartLines,i.config.lineTerminatorCharacters))}),i.TRACE_INIT("performWarningRuntimeChecks",function(){i.lexerDefinitionWarning=i.lexerDefinitionWarning.concat((0,Xs.performWarningRuntimeChecks)(s,i.trackStartLines,i.config.lineTerminatorCharacters))})),s.modes=s.modes?s.modes:{},(0,nr.forEach)(s.modes,function(u,g){s.modes[g]=(0,nr.reject)(u,function(f){return(0,nr.isUndefined)(f)})});var a=(0,nr.keys)(s.modes);if((0,nr.forEach)(s.modes,function(u,g){i.TRACE_INIT("Mode: <"+g+"> processing",function(){if(i.modes.push(g),i.config.skipValidations===!1&&i.TRACE_INIT("validatePatterns",function(){i.lexerDefinitionErrors=i.lexerDefinitionErrors.concat((0,Xs.validatePatterns)(u,a))}),(0,nr.isEmpty)(i.lexerDefinitionErrors)){(0,UEe.augmentTokenTypes)(u);var f;i.TRACE_INIT("analyzeTokenTypes",function(){f=(0,Xs.analyzeTokenTypes)(u,{lineTerminatorCharacters:i.config.lineTerminatorCharacters,positionTracking:t.positionTracking,ensureOptimizations:t.ensureOptimizations,safeMode:t.safeMode,tracer:i.TRACE_INIT.bind(i)})}),i.patternIdxToConfig[g]=f.patternIdxToConfig,i.charCodeToPatternIdxToConfig[g]=f.charCodeToPatternIdxToConfig,i.emptyGroups=(0,nr.merge)(i.emptyGroups,f.emptyGroups),i.hasCustom=f.hasCustom||i.hasCustom,i.canModeBeOptimized[g]=f.canBeOptimized}})}),i.defaultMode=s.defaultMode,!(0,nr.isEmpty)(i.lexerDefinitionErrors)&&!i.config.deferDefinitionErrorsHandling){var l=(0,nr.map)(i.lexerDefinitionErrors,function(u){return u.message}),c=l.join(`-----------------------
-`);throw new Error(`Errors detected in definition of Lexer:
-`+c)}(0,nr.forEach)(i.lexerDefinitionWarning,function(u){(0,nr.PRINT_WARNING)(u.message)}),i.TRACE_INIT("Choosing sub-methods implementations",function(){if(Xs.SUPPORT_STICKY?(i.chopInput=nr.IDENTITY,i.match=i.matchWithTest):(i.updateLastIndex=nr.NOOP,i.match=i.matchWithExec),o&&(i.handleModes=nr.NOOP),i.trackStartLines===!1&&(i.computeNewColumn=nr.IDENTITY),i.trackEndLines===!1&&(i.updateTokenEndLineColumnLocation=nr.NOOP),/full/i.test(i.config.positionTracking))i.createTokenInstance=i.createFullToken;else if(/onlyStart/i.test(i.config.positionTracking))i.createTokenInstance=i.createStartOnlyToken;else if(/onlyOffset/i.test(i.config.positionTracking))i.createTokenInstance=i.createOffsetOnlyToken;else throw Error('Invalid <positionTracking> config option: "'+i.config.positionTracking+'"');i.hasCustom?(i.addToken=i.addTokenUsingPush,i.handlePayload=i.handlePayloadWithCustom):(i.addToken=i.addTokenUsingMemberAccess,i.handlePayload=i.handlePayloadNoCustom)}),i.TRACE_INIT("Failed Optimization Warnings",function(){var u=(0,nr.reduce)(i.canModeBeOptimized,function(g,f,h){return f===!1&&g.push(h),g},[]);if(t.ensureOptimizations&&!(0,nr.isEmpty)(u))throw Error("Lexer Modes: < "+u.join(", ")+` > cannot be optimized.
-	 Disable the "ensureOptimizations" lexer config flag to silently ignore this and run the lexer in an un-optimized mode.
-	 Or inspect the console log for details on how to resolve these issues.`)}),i.TRACE_INIT("clearRegExpParserCache",function(){(0,GEe.clearRegExpParserCache)()}),i.TRACE_INIT("toFastProperties",function(){(0,nr.toFastProperties)(i)})})}return r.prototype.tokenize=function(e,t){if(t===void 0&&(t=this.defaultMode),!(0,nr.isEmpty)(this.lexerDefinitionErrors)){var i=(0,nr.map)(this.lexerDefinitionErrors,function(o){return o.message}),n=i.join(`-----------------------
-`);throw new Error(`Unable to Tokenize because Errors detected in definition of Lexer:
-`+n)}var s=this.tokenizeInternal(e,t);return s},r.prototype.tokenizeInternal=function(e,t){var i=this,n,s,o,a,l,c,u,g,f,h,p,C,y,B,v,D,L=e,H=L.length,j=0,$=0,V=this.hasCustom?0:Math.floor(e.length/10),W=new Array(V),_=[],A=this.trackStartLines?1:void 0,ae=this.trackStartLines?1:void 0,ge=(0,Xs.cloneEmptyGroups)(this.emptyGroups),re=this.trackStartLines,O=this.config.lineTerminatorsPattern,F=0,ue=[],he=[],ke=[],Fe=[];Object.freeze(Fe);var Ne=void 0;function oe(){return ue}function le(pr){var Ii=(0,Xs.charCodeToOptimizedIndex)(pr),es=he[Ii];return es===void 0?Fe:es}var we=function(pr){if(ke.length===1&&pr.tokenType.PUSH_MODE===void 0){var Ii=i.config.errorMessageProvider.buildUnableToPopLexerModeMessage(pr);_.push({offset:pr.startOffset,line:pr.startLine!==void 0?pr.startLine:void 0,column:pr.startColumn!==void 0?pr.startColumn:void 0,length:pr.image.length,message:Ii})}else{ke.pop();var es=(0,nr.last)(ke);ue=i.patternIdxToConfig[es],he=i.charCodeToPatternIdxToConfig[es],F=ue.length;var ua=i.canModeBeOptimized[es]&&i.config.safeMode===!1;he&&ua?Ne=le:Ne=oe}};function fe(pr){ke.push(pr),he=this.charCodeToPatternIdxToConfig[pr],ue=this.patternIdxToConfig[pr],F=ue.length,F=ue.length;var Ii=this.canModeBeOptimized[pr]&&this.config.safeMode===!1;he&&Ii?Ne=le:Ne=oe}fe.call(this,t);for(var Ae;j<H;){c=null;var qe=L.charCodeAt(j),ne=Ne(qe),Y=ne.length;for(n=0;n<Y;n++){Ae=ne[n];var pe=Ae.pattern;u=null;var ie=Ae.short;if(ie!==!1?qe===ie&&(c=pe):Ae.isCustom===!0?(D=pe.exec(L,j,W,ge),D!==null?(c=D[0],D.payload!==void 0&&(u=D.payload)):c=null):(this.updateLastIndex(pe,j),c=this.match(pe,e,j)),c!==null){if(l=Ae.longerAlt,l!==void 0){var de=l.length;for(o=0;o<de;o++){var _e=ue[l[o]],Pt=_e.pattern;if(g=null,_e.isCustom===!0?(D=Pt.exec(L,j,W,ge),D!==null?(a=D[0],D.payload!==void 0&&(g=D.payload)):a=null):(this.updateLastIndex(Pt,j),a=this.match(Pt,e,j)),a&&a.length>c.length){c=a,u=g,Ae=_e;break}}}break}}if(c!==null){if(f=c.length,h=Ae.group,h!==void 0&&(p=Ae.tokenTypeIdx,C=this.createTokenInstance(c,j,p,Ae.tokenType,A,ae,f),this.handlePayload(C,u),h===!1?$=this.addToken(W,$,C):ge[h].push(C)),e=this.chopInput(e,f),j=j+f,ae=this.computeNewColumn(ae,f),re===!0&&Ae.canLineTerminator===!0){var It=0,Or=void 0,ii=void 0;O.lastIndex=0;do Or=O.test(c),Or===!0&&(ii=O.lastIndex-1,It++);while(Or===!0);It!==0&&(A=A+It,ae=f-ii,this.updateTokenEndLineColumnLocation(C,h,ii,It,A,ae,f))}this.handleModes(Ae,we,fe,C)}else{for(var gi=j,hr=A,fi=ae,ni=!1;!ni&&j<H;)for(B=L.charCodeAt(j),e=this.chopInput(e,1),j++,s=0;s<F;s++){var Os=ue[s],pe=Os.pattern,ie=Os.short;if(ie!==!1?L.charCodeAt(j)===ie&&(ni=!0):Os.isCustom===!0?ni=pe.exec(L,j,W,ge)!==null:(this.updateLastIndex(pe,j),ni=pe.exec(e)!==null),ni===!0)break}y=j-gi,v=this.config.errorMessageProvider.buildUnexpectedCharactersMessage(L,gi,y,hr,fi),_.push({offset:gi,line:hr,column:fi,length:y,message:v})}}return this.hasCustom||(W.length=$),{tokens:W,groups:ge,errors:_}},r.prototype.handleModes=function(e,t,i,n){if(e.pop===!0){var s=e.push;t(n),s!==void 0&&i.call(this,s)}else e.push!==void 0&&i.call(this,e.push)},r.prototype.chopInput=function(e,t){return e.substring(t)},r.prototype.updateLastIndex=function(e,t){e.lastIndex=t},r.prototype.updateTokenEndLineColumnLocation=function(e,t,i,n,s,o,a){var l,c;t!==void 0&&(l=i===a-1,c=l?-1:0,n===1&&l===!0||(e.endLine=s+c,e.endColumn=o-1+-c))},r.prototype.computeNewColumn=function(e,t){return e+t},r.prototype.createTokenInstance=function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];return null},r.prototype.createOffsetOnlyToken=function(e,t,i,n){return{image:e,startOffset:t,tokenTypeIdx:i,tokenType:n}},r.prototype.createStartOnlyToken=function(e,t,i,n,s,o){return{image:e,startOffset:t,startLine:s,startColumn:o,tokenTypeIdx:i,tokenType:n}},r.prototype.createFullToken=function(e,t,i,n,s,o,a){return{image:e,startOffset:t,endOffset:t+a-1,startLine:s,endLine:s,startColumn:o,endColumn:o+a-1,tokenTypeIdx:i,tokenType:n}},r.prototype.addToken=function(e,t,i){return 666},r.prototype.addTokenUsingPush=function(e,t,i){return e.push(i),t},r.prototype.addTokenUsingMemberAccess=function(e,t,i){return e[t]=i,t++,t},r.prototype.handlePayload=function(e,t){},r.prototype.handlePayloadNoCustom=function(e,t){},r.prototype.handlePayloadWithCustom=function(e,t){t!==null&&(e.payload=t)},r.prototype.match=function(e,t,i){return null},r.prototype.matchWithTest=function(e,t,i){var n=e.test(t);return n===!0?t.substring(i,e.lastIndex):null},r.prototype.matchWithExec=function(e,t){var i=e.exec(t);return i!==null?i[0]:i},r.prototype.TRACE_INIT=function(e,t){if(this.traceInitPerf===!0){this.traceInitIndent++;var i=new Array(this.traceInitIndent+1).join("	");this.traceInitIndent<this.traceInitMaxIdent&&console.log(i+"--> <"+e+">");var n=(0,nr.timer)(t),s=n.time,o=n.value,a=s>10?console.warn:console.log;return this.traceInitIndent<this.traceInitMaxIdent&&a(i+"<-- <"+e+"> time: "+s+"ms"),this.traceInitIndent--,o}else return t()},r.SKIPPED="This marks a skipped Token pattern, this means each token identified by it willbe consumed and then thrown into oblivion, this can be used to for example to completely ignore whitespace.",r.NA=/NOT_APPLICABLE/,r}();fc.Lexer=jEe});var NA=w(bi=>{"use strict";Object.defineProperty(bi,"__esModule",{value:!0});bi.tokenMatcher=bi.createTokenInstance=bi.EOF=bi.createToken=bi.hasTokenLabel=bi.tokenName=bi.tokenLabel=void 0;var Zs=Gt(),qEe=yd(),Hv=Vg();function JEe(r){return Ej(r)?r.LABEL:r.name}bi.tokenLabel=JEe;function WEe(r){return r.name}bi.tokenName=WEe;function Ej(r){return(0,Zs.isString)(r.LABEL)&&r.LABEL!==""}bi.hasTokenLabel=Ej;var zEe="parent",uj="categories",gj="label",fj="group",hj="push_mode",pj="pop_mode",dj="longer_alt",Cj="line_breaks",mj="start_chars_hint";function Ij(r){return VEe(r)}bi.createToken=Ij;function VEe(r){var e=r.pattern,t={};if(t.name=r.name,(0,Zs.isUndefined)(e)||(t.PATTERN=e),(0,Zs.has)(r,zEe))throw`The parent property is no longer supported.
-See: https://github.com/chevrotain/chevrotain/issues/564#issuecomment-349062346 for details.`;return(0,Zs.has)(r,uj)&&(t.CATEGORIES=r[uj]),(0,Hv.augmentTokenTypes)([t]),(0,Zs.has)(r,gj)&&(t.LABEL=r[gj]),(0,Zs.has)(r,fj)&&(t.GROUP=r[fj]),(0,Zs.has)(r,pj)&&(t.POP_MODE=r[pj]),(0,Zs.has)(r,hj)&&(t.PUSH_MODE=r[hj]),(0,Zs.has)(r,dj)&&(t.LONGER_ALT=r[dj]),(0,Zs.has)(r,Cj)&&(t.LINE_BREAKS=r[Cj]),(0,Zs.has)(r,mj)&&(t.START_CHARS_HINT=r[mj]),t}bi.EOF=Ij({name:"EOF",pattern:qEe.Lexer.NA});(0,Hv.augmentTokenTypes)([bi.EOF]);function XEe(r,e,t,i,n,s,o,a){return{image:e,startOffset:t,endOffset:i,startLine:n,endLine:s,startColumn:o,endColumn:a,tokenTypeIdx:r.tokenTypeIdx,tokenType:r}}bi.createTokenInstance=XEe;function ZEe(r,e){return(0,Hv.tokenStructuredMatcher)(r,e)}bi.tokenMatcher=ZEe});var dn=w(zt=>{"use strict";var va=zt&&zt.__extends||function(){var r=function(e,t){return r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(i,n){i.__proto__=n}||function(i,n){for(var s in n)Object.prototype.hasOwnProperty.call(n,s)&&(i[s]=n[s])},r(e,t)};return function(e,t){if(typeof t!="function"&&t!==null)throw new TypeError("Class extends value "+String(t)+" is not a constructor or null");r(e,t);function i(){this.constructor=e}e.prototype=t===null?Object.create(t):(i.prototype=t.prototype,new i)}}();Object.defineProperty(zt,"__esModule",{value:!0});zt.serializeProduction=zt.serializeGrammar=zt.Terminal=zt.Alternation=zt.RepetitionWithSeparator=zt.Repetition=zt.RepetitionMandatoryWithSeparator=zt.RepetitionMandatory=zt.Option=zt.Alternative=zt.Rule=zt.NonTerminal=zt.AbstractProduction=void 0;var Ar=Gt(),_Ee=NA(),ko=function(){function r(e){this._definition=e}return Object.defineProperty(r.prototype,"definition",{get:function(){return this._definition},set:function(e){this._definition=e},enumerable:!1,configurable:!0}),r.prototype.accept=function(e){e.visit(this),(0,Ar.forEach)(this.definition,function(t){t.accept(e)})},r}();zt.AbstractProduction=ko;var yj=function(r){va(e,r);function e(t){var i=r.call(this,[])||this;return i.idx=1,(0,Ar.assign)(i,(0,Ar.pick)(t,function(n){return n!==void 0})),i}return Object.defineProperty(e.prototype,"definition",{get:function(){return this.referencedRule!==void 0?this.referencedRule.definition:[]},set:function(t){},enumerable:!1,configurable:!0}),e.prototype.accept=function(t){t.visit(this)},e}(ko);zt.NonTerminal=yj;var wj=function(r){va(e,r);function e(t){var i=r.call(this,t.definition)||this;return i.orgText="",(0,Ar.assign)(i,(0,Ar.pick)(t,function(n){return n!==void 0})),i}return e}(ko);zt.Rule=wj;var Bj=function(r){va(e,r);function e(t){var i=r.call(this,t.definition)||this;return i.ignoreAmbiguities=!1,(0,Ar.assign)(i,(0,Ar.pick)(t,function(n){return n!==void 0})),i}return e}(ko);zt.Alternative=Bj;var Qj=function(r){va(e,r);function e(t){var i=r.call(this,t.definition)||this;return i.idx=1,(0,Ar.assign)(i,(0,Ar.pick)(t,function(n){return n!==void 0})),i}return e}(ko);zt.Option=Qj;var bj=function(r){va(e,r);function e(t){var i=r.call(this,t.definition)||this;return i.idx=1,(0,Ar.assign)(i,(0,Ar.pick)(t,function(n){return n!==void 0})),i}return e}(ko);zt.RepetitionMandatory=bj;var Sj=function(r){va(e,r);function e(t){var i=r.call(this,t.definition)||this;return i.idx=1,(0,Ar.assign)(i,(0,Ar.pick)(t,function(n){return n!==void 0})),i}return e}(ko);zt.RepetitionMandatoryWithSeparator=Sj;var vj=function(r){va(e,r);function e(t){var i=r.call(this,t.definition)||this;return i.idx=1,(0,Ar.assign)(i,(0,Ar.pick)(t,function(n){return n!==void 0})),i}return e}(ko);zt.Repetition=vj;var xj=function(r){va(e,r);function e(t){var i=r.call(this,t.definition)||this;return i.idx=1,(0,Ar.assign)(i,(0,Ar.pick)(t,function(n){return n!==void 0})),i}return e}(ko);zt.RepetitionWithSeparator=xj;var Pj=function(r){va(e,r);function e(t){var i=r.call(this,t.definition)||this;return i.idx=1,i.ignoreAmbiguities=!1,i.hasPredicates=!1,(0,Ar.assign)(i,(0,Ar.pick)(t,function(n){return n!==void 0})),i}return Object.defineProperty(e.prototype,"definition",{get:function(){return this._definition},set:function(t){this._definition=t},enumerable:!1,configurable:!0}),e}(ko);zt.Alternation=Pj;var ry=function(){function r(e){this.idx=1,(0,Ar.assign)(this,(0,Ar.pick)(e,function(t){return t!==void 0}))}return r.prototype.accept=function(e){e.visit(this)},r}();zt.Terminal=ry;function $Ee(r){return(0,Ar.map)(r,Bd)}zt.serializeGrammar=$Ee;function Bd(r){function e(s){return(0,Ar.map)(s,Bd)}if(r instanceof yj){var t={type:"NonTerminal",name:r.nonTerminalName,idx:r.idx};return(0,Ar.isString)(r.label)&&(t.label=r.label),t}else{if(r instanceof Bj)return{type:"Alternative",definition:e(r.definition)};if(r instanceof Qj)return{type:"Option",idx:r.idx,definition:e(r.definition)};if(r instanceof bj)return{type:"RepetitionMandatory",idx:r.idx,definition:e(r.definition)};if(r instanceof Sj)return{type:"RepetitionMandatoryWithSeparator",idx:r.idx,separator:Bd(new ry({terminalType:r.separator})),definition:e(r.definition)};if(r instanceof xj)return{type:"RepetitionWithSeparator",idx:r.idx,separator:Bd(new ry({terminalType:r.separator})),definition:e(r.definition)};if(r instanceof vj)return{type:"Repetition",idx:r.idx,definition:e(r.definition)};if(r instanceof Pj)return{type:"Alternation",idx:r.idx,definition:e(r.definition)};if(r instanceof ry){var i={type:"Terminal",name:r.terminalType.name,label:(0,_Ee.tokenLabel)(r.terminalType),idx:r.idx};(0,Ar.isString)(r.label)&&(i.terminalLabel=r.label);var n=r.terminalType.PATTERN;return r.terminalType.PATTERN&&(i.pattern=(0,Ar.isRegExp)(n)?n.source:n),i}else{if(r instanceof wj)return{type:"Rule",name:r.name,orgText:r.orgText,definition:e(r.definition)};throw Error("non exhaustive match")}}}zt.serializeProduction=Bd});var ny=w(iy=>{"use strict";Object.defineProperty(iy,"__esModule",{value:!0});iy.RestWalker=void 0;var Gv=Gt(),Cn=dn(),eIe=function(){function r(){}return r.prototype.walk=function(e,t){var i=this;t===void 0&&(t=[]),(0,Gv.forEach)(e.definition,function(n,s){var o=(0,Gv.drop)(e.definition,s+1);if(n instanceof Cn.NonTerminal)i.walkProdRef(n,o,t);else if(n instanceof Cn.Terminal)i.walkTerminal(n,o,t);else if(n instanceof Cn.Alternative)i.walkFlat(n,o,t);else if(n instanceof Cn.Option)i.walkOption(n,o,t);else if(n instanceof Cn.RepetitionMandatory)i.walkAtLeastOne(n,o,t);else if(n instanceof Cn.RepetitionMandatoryWithSeparator)i.walkAtLeastOneSep(n,o,t);else if(n instanceof Cn.RepetitionWithSeparator)i.walkManySep(n,o,t);else if(n instanceof Cn.Repetition)i.walkMany(n,o,t);else if(n instanceof Cn.Alternation)i.walkOr(n,o,t);else throw Error("non exhaustive match")})},r.prototype.walkTerminal=function(e,t,i){},r.prototype.walkProdRef=function(e,t,i){},r.prototype.walkFlat=function(e,t,i){var n=t.concat(i);this.walk(e,n)},r.prototype.walkOption=function(e,t,i){var n=t.concat(i);this.walk(e,n)},r.prototype.walkAtLeastOne=function(e,t,i){var n=[new Cn.Option({definition:e.definition})].concat(t,i);this.walk(e,n)},r.prototype.walkAtLeastOneSep=function(e,t,i){var n=Dj(e,t,i);this.walk(e,n)},r.prototype.walkMany=function(e,t,i){var n=[new Cn.Option({definition:e.definition})].concat(t,i);this.walk(e,n)},r.prototype.walkManySep=function(e,t,i){var n=Dj(e,t,i);this.walk(e,n)},r.prototype.walkOr=function(e,t,i){var n=this,s=t.concat(i);(0,Gv.forEach)(e.definition,function(o){var a=new Cn.Alternative({definition:[o]});n.walk(a,s)})},r}();iy.RestWalker=eIe;function Dj(r,e,t){var i=[new Cn.Option({definition:[new Cn.Terminal({terminalType:r.separator})].concat(r.definition)})],n=i.concat(e,t);return n}});var Xg=w(sy=>{"use strict";Object.defineProperty(sy,"__esModule",{value:!0});sy.GAstVisitor=void 0;var Ro=dn(),tIe=function(){function r(){}return r.prototype.visit=function(e){var t=e;switch(t.constructor){case Ro.NonTerminal:return this.visitNonTerminal(t);case Ro.Alternative:return this.visitAlternative(t);case Ro.Option:return this.visitOption(t);case Ro.RepetitionMandatory:return this.visitRepetitionMandatory(t);case Ro.RepetitionMandatoryWithSeparator:return this.visitRepetitionMandatoryWithSeparator(t);case Ro.RepetitionWithSeparator:return this.visitRepetitionWithSeparator(t);case Ro.Repetition:return this.visitRepetition(t);case Ro.Alternation:return this.visitAlternation(t);case Ro.Terminal:return this.visitTerminal(t);case Ro.Rule:return this.visitRule(t);default:throw Error("non exhaustive match")}},r.prototype.visitNonTerminal=function(e){},r.prototype.visitAlternative=function(e){},r.prototype.visitOption=function(e){},r.prototype.visitRepetition=function(e){},r.prototype.visitRepetitionMandatory=function(e){},r.prototype.visitRepetitionMandatoryWithSeparator=function(e){},r.prototype.visitRepetitionWithSeparator=function(e){},r.prototype.visitAlternation=function(e){},r.prototype.visitTerminal=function(e){},r.prototype.visitRule=function(e){},r}();sy.GAstVisitor=tIe});var bd=w(Mi=>{"use strict";var rIe=Mi&&Mi.__extends||function(){var r=function(e,t){return r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(i,n){i.__proto__=n}||function(i,n){for(var s in n)Object.prototype.hasOwnProperty.call(n,s)&&(i[s]=n[s])},r(e,t)};return function(e,t){if(typeof t!="function"&&t!==null)throw new TypeError("Class extends value "+String(t)+" is not a constructor or null");r(e,t);function i(){this.constructor=e}e.prototype=t===null?Object.create(t):(i.prototype=t.prototype,new i)}}();Object.defineProperty(Mi,"__esModule",{value:!0});Mi.collectMethods=Mi.DslMethodsCollectorVisitor=Mi.getProductionDslName=Mi.isBranchingProd=Mi.isOptionalProd=Mi.isSequenceProd=void 0;var Qd=Gt(),Qr=dn(),iIe=Xg();function nIe(r){return r instanceof Qr.Alternative||r instanceof Qr.Option||r instanceof Qr.Repetition||r instanceof Qr.RepetitionMandatory||r instanceof Qr.RepetitionMandatoryWithSeparator||r instanceof Qr.RepetitionWithSeparator||r instanceof Qr.Terminal||r instanceof Qr.Rule}Mi.isSequenceProd=nIe;function Yv(r,e){e===void 0&&(e=[]);var t=r instanceof Qr.Option||r instanceof Qr.Repetition||r instanceof Qr.RepetitionWithSeparator;return t?!0:r instanceof Qr.Alternation?(0,Qd.some)(r.definition,function(i){return Yv(i,e)}):r instanceof Qr.NonTerminal&&(0,Qd.contains)(e,r)?!1:r instanceof Qr.AbstractProduction?(r instanceof Qr.NonTerminal&&e.push(r),(0,Qd.every)(r.definition,function(i){return Yv(i,e)})):!1}Mi.isOptionalProd=Yv;function sIe(r){return r instanceof Qr.Alternation}Mi.isBranchingProd=sIe;function oIe(r){if(r instanceof Qr.NonTerminal)return"SUBRULE";if(r instanceof Qr.Option)return"OPTION";if(r instanceof Qr.Alternation)return"OR";if(r instanceof Qr.RepetitionMandatory)return"AT_LEAST_ONE";if(r instanceof Qr.RepetitionMandatoryWithSeparator)return"AT_LEAST_ONE_SEP";if(r instanceof Qr.RepetitionWithSeparator)return"MANY_SEP";if(r instanceof Qr.Repetition)return"MANY";if(r instanceof Qr.Terminal)return"CONSUME";throw Error("non exhaustive match")}Mi.getProductionDslName=oIe;var kj=function(r){rIe(e,r);function e(){var t=r!==null&&r.apply(this,arguments)||this;return t.separator="-",t.dslMethods={option:[],alternation:[],repetition:[],repetitionWithSeparator:[],repetitionMandatory:[],repetitionMandatoryWithSeparator:[]},t}return e.prototype.reset=function(){this.dslMethods={option:[],alternation:[],repetition:[],repetitionWithSeparator:[],repetitionMandatory:[],repetitionMandatoryWithSeparator:[]}},e.prototype.visitTerminal=function(t){var i=t.terminalType.name+this.separator+"Terminal";(0,Qd.has)(this.dslMethods,i)||(this.dslMethods[i]=[]),this.dslMethods[i].push(t)},e.prototype.visitNonTerminal=function(t){var i=t.nonTerminalName+this.separator+"Terminal";(0,Qd.has)(this.dslMethods,i)||(this.dslMethods[i]=[]),this.dslMethods[i].push(t)},e.prototype.visitOption=function(t){this.dslMethods.option.push(t)},e.prototype.visitRepetitionWithSeparator=function(t){this.dslMethods.repetitionWithSeparator.push(t)},e.prototype.visitRepetitionMandatory=function(t){this.dslMethods.repetitionMandatory.push(t)},e.prototype.visitRepetitionMandatoryWithSeparator=function(t){this.dslMethods.repetitionMandatoryWithSeparator.push(t)},e.prototype.visitRepetition=function(t){this.dslMethods.repetition.push(t)},e.prototype.visitAlternation=function(t){this.dslMethods.alternation.push(t)},e}(iIe.GAstVisitor);Mi.DslMethodsCollectorVisitor=kj;var oy=new kj;function aIe(r){oy.reset(),r.accept(oy);var e=oy.dslMethods;return oy.reset(),e}Mi.collectMethods=aIe});var qv=w(Fo=>{"use strict";Object.defineProperty(Fo,"__esModule",{value:!0});Fo.firstForTerminal=Fo.firstForBranching=Fo.firstForSequence=Fo.first=void 0;var ay=Gt(),Rj=dn(),jv=bd();function Ay(r){if(r instanceof Rj.NonTerminal)return Ay(r.referencedRule);if(r instanceof Rj.Terminal)return Lj(r);if((0,jv.isSequenceProd)(r))return Fj(r);if((0,jv.isBranchingProd)(r))return Nj(r);throw Error("non exhaustive match")}Fo.first=Ay;function Fj(r){for(var e=[],t=r.definition,i=0,n=t.length>i,s,o=!0;n&&o;)s=t[i],o=(0,jv.isOptionalProd)(s),e=e.concat(Ay(s)),i=i+1,n=t.length>i;return(0,ay.uniq)(e)}Fo.firstForSequence=Fj;function Nj(r){var e=(0,ay.map)(r.definition,function(t){return Ay(t)});return(0,ay.uniq)((0,ay.flatten)(e))}Fo.firstForBranching=Nj;function Lj(r){return[r.terminalType]}Fo.firstForTerminal=Lj});var Jv=w(ly=>{"use strict";Object.defineProperty(ly,"__esModule",{value:!0});ly.IN=void 0;ly.IN="_~IN~_"});var Uj=w(us=>{"use strict";var AIe=us&&us.__extends||function(){var r=function(e,t){return r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(i,n){i.__proto__=n}||function(i,n){for(var s in n)Object.prototype.hasOwnProperty.call(n,s)&&(i[s]=n[s])},r(e,t)};return function(e,t){if(typeof t!="function"&&t!==null)throw new TypeError("Class extends value "+String(t)+" is not a constructor or null");r(e,t);function i(){this.constructor=e}e.prototype=t===null?Object.create(t):(i.prototype=t.prototype,new i)}}();Object.defineProperty(us,"__esModule",{value:!0});us.buildInProdFollowPrefix=us.buildBetweenProdsFollowPrefix=us.computeAllProdsFollows=us.ResyncFollowsWalker=void 0;var lIe=ny(),cIe=qv(),Tj=Gt(),Oj=Jv(),uIe=dn(),Mj=function(r){AIe(e,r);function e(t){var i=r.call(this)||this;return i.topProd=t,i.follows={},i}return e.prototype.startWalking=function(){return this.walk(this.topProd),this.follows},e.prototype.walkTerminal=function(t,i,n){},e.prototype.walkProdRef=function(t,i,n){var s=Kj(t.referencedRule,t.idx)+this.topProd.name,o=i.concat(n),a=new uIe.Alternative({definition:o}),l=(0,cIe.first)(a);this.follows[s]=l},e}(lIe.RestWalker);us.ResyncFollowsWalker=Mj;function gIe(r){var e={};return(0,Tj.forEach)(r,function(t){var i=new Mj(t).startWalking();(0,Tj.assign)(e,i)}),e}us.computeAllProdsFollows=gIe;function Kj(r,e){return r.name+e+Oj.IN}us.buildBetweenProdsFollowPrefix=Kj;function fIe(r){var e=r.terminalType.name;return e+r.idx+Oj.IN}us.buildInProdFollowPrefix=fIe});var Sd=w(xa=>{"use strict";Object.defineProperty(xa,"__esModule",{value:!0});xa.defaultGrammarValidatorErrorProvider=xa.defaultGrammarResolverErrorProvider=xa.defaultParserErrorProvider=void 0;var Zg=NA(),hIe=Gt(),_s=Gt(),Wv=dn(),Hj=bd();xa.defaultParserErrorProvider={buildMismatchTokenMessage:function(r){var e=r.expected,t=r.actual,i=r.previous,n=r.ruleName,s=(0,Zg.hasTokenLabel)(e),o=s?"--> "+(0,Zg.tokenLabel)(e)+" <--":"token of type --> "+e.name+" <--",a="Expecting "+o+" but found --> '"+t.image+"' <--";return a},buildNotAllInputParsedMessage:function(r){var e=r.firstRedundant,t=r.ruleName;return"Redundant input, expecting EOF but found: "+e.image},buildNoViableAltMessage:function(r){var e=r.expectedPathsPerAlt,t=r.actual,i=r.previous,n=r.customUserDescription,s=r.ruleName,o="Expecting: ",a=(0,_s.first)(t).image,l=`
-but found: '`+a+"'";if(n)return o+n+l;var c=(0,_s.reduce)(e,function(h,p){return h.concat(p)},[]),u=(0,_s.map)(c,function(h){return"["+(0,_s.map)(h,function(p){return(0,Zg.tokenLabel)(p)}).join(", ")+"]"}),g=(0,_s.map)(u,function(h,p){return"  "+(p+1)+". "+h}),f=`one of these possible Token sequences:
-`+g.join(`
-`);return o+f+l},buildEarlyExitMessage:function(r){var e=r.expectedIterationPaths,t=r.actual,i=r.customUserDescription,n=r.ruleName,s="Expecting: ",o=(0,_s.first)(t).image,a=`
-but found: '`+o+"'";if(i)return s+i+a;var l=(0,_s.map)(e,function(u){return"["+(0,_s.map)(u,function(g){return(0,Zg.tokenLabel)(g)}).join(",")+"]"}),c=`expecting at least one iteration which starts with one of these possible Token sequences::
-  `+("<"+l.join(" ,")+">");return s+c+a}};Object.freeze(xa.defaultParserErrorProvider);xa.defaultGrammarResolverErrorProvider={buildRuleNotFoundError:function(r,e){var t="Invalid grammar, reference to a rule which is not defined: ->"+e.nonTerminalName+`<-
-inside top level rule: ->`+r.name+"<-";return t}};xa.defaultGrammarValidatorErrorProvider={buildDuplicateFoundError:function(r,e){function t(u){return u instanceof Wv.Terminal?u.terminalType.name:u instanceof Wv.NonTerminal?u.nonTerminalName:""}var i=r.name,n=(0,_s.first)(e),s=n.idx,o=(0,Hj.getProductionDslName)(n),a=t(n),l=s>0,c="->"+o+(l?s:"")+"<- "+(a?"with argument: ->"+a+"<-":"")+`
-                  appears more than once (`+e.length+" times) in the top level rule: ->"+i+`<-.                  
-                  For further details see: https://chevrotain.io/docs/FAQ.html#NUMERICAL_SUFFIXES 
-                  `;return c=c.replace(/[ \t]+/g," "),c=c.replace(/\s\s+/g,`
-`),c},buildNamespaceConflictError:function(r){var e=`Namespace conflict found in grammar.
-`+("The grammar has both a Terminal(Token) and a Non-Terminal(Rule) named: <"+r.name+`>.
-`)+`To resolve this make sure each Terminal and Non-Terminal names are unique
-This is easy to accomplish by using the convention that Terminal names start with an uppercase letter
-and Non-Terminal names start with a lower case letter.`;return e},buildAlternationPrefixAmbiguityError:function(r){var e=(0,_s.map)(r.prefixPath,function(n){return(0,Zg.tokenLabel)(n)}).join(", "),t=r.alternation.idx===0?"":r.alternation.idx,i="Ambiguous alternatives: <"+r.ambiguityIndices.join(" ,")+`> due to common lookahead prefix
-`+("in <OR"+t+"> inside <"+r.topLevelRule.name+`> Rule,
-`)+("<"+e+`> may appears as a prefix path in all these alternatives.
-`)+`See: https://chevrotain.io/docs/guide/resolving_grammar_errors.html#COMMON_PREFIX
-For Further details.`;return i},buildAlternationAmbiguityError:function(r){var e=(0,_s.map)(r.prefixPath,function(n){return(0,Zg.tokenLabel)(n)}).join(", "),t=r.alternation.idx===0?"":r.alternation.idx,i="Ambiguous Alternatives Detected: <"+r.ambiguityIndices.join(" ,")+"> in <OR"+t+">"+(" inside <"+r.topLevelRule.name+`> Rule,
-`)+("<"+e+`> may appears as a prefix path in all these alternatives.
-`);return i=i+`See: https://chevrotain.io/docs/guide/resolving_grammar_errors.html#AMBIGUOUS_ALTERNATIVES
-For Further details.`,i},buildEmptyRepetitionError:function(r){var e=(0,Hj.getProductionDslName)(r.repetition);r.repetition.idx!==0&&(e+=r.repetition.idx);var t="The repetition <"+e+"> within Rule <"+r.topLevelRule.name+`> can never consume any tokens.
-This could lead to an infinite loop.`;return t},buildTokenNameError:function(r){return"deprecated"},buildEmptyAlternationError:function(r){var e="Ambiguous empty alternative: <"+(r.emptyChoiceIdx+1)+">"+(" in <OR"+r.alternation.idx+"> inside <"+r.topLevelRule.name+`> Rule.
-`)+"Only the last alternative may be an empty alternative.";return e},buildTooManyAlternativesError:function(r){var e=`An Alternation cannot have more than 256 alternatives:
-`+("<OR"+r.alternation.idx+"> inside <"+r.topLevelRule.name+`> Rule.
- has `+(r.alternation.definition.length+1)+" alternatives.");return e},buildLeftRecursionError:function(r){var e=r.topLevelRule.name,t=hIe.map(r.leftRecursionPath,function(s){return s.name}),i=e+" --> "+t.concat([e]).join(" --> "),n=`Left Recursion found in grammar.
-`+("rule: <"+e+`> can be invoked from itself (directly or indirectly)
-`)+(`without consuming any Tokens. The grammar path that causes this is: 
- `+i+`
-`)+` To fix this refactor your grammar to remove the left recursion.
-see: https://en.wikipedia.org/wiki/LL_parser#Left_Factoring.`;return n},buildInvalidRuleNameError:function(r){return"deprecated"},buildDuplicateRuleNameError:function(r){var e;r.topLevelRule instanceof Wv.Rule?e=r.topLevelRule.name:e=r.topLevelRule;var t="Duplicate definition, rule: ->"+e+"<- is already defined in the grammar: ->"+r.grammarName+"<-";return t}}});var jj=w(LA=>{"use strict";var pIe=LA&&LA.__extends||function(){var r=function(e,t){return r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(i,n){i.__proto__=n}||function(i,n){for(var s in n)Object.prototype.hasOwnProperty.call(n,s)&&(i[s]=n[s])},r(e,t)};return function(e,t){if(typeof t!="function"&&t!==null)throw new TypeError("Class extends value "+String(t)+" is not a constructor or null");r(e,t);function i(){this.constructor=e}e.prototype=t===null?Object.create(t):(i.prototype=t.prototype,new i)}}();Object.defineProperty(LA,"__esModule",{value:!0});LA.GastRefResolverVisitor=LA.resolveGrammar=void 0;var dIe=Gn(),Gj=Gt(),CIe=Xg();function mIe(r,e){var t=new Yj(r,e);return t.resolveRefs(),t.errors}LA.resolveGrammar=mIe;var Yj=function(r){pIe(e,r);function e(t,i){var n=r.call(this)||this;return n.nameToTopRule=t,n.errMsgProvider=i,n.errors=[],n}return e.prototype.resolveRefs=function(){var t=this;(0,Gj.forEach)((0,Gj.values)(this.nameToTopRule),function(i){t.currTopLevel=i,i.accept(t)})},e.prototype.visitNonTerminal=function(t){var i=this.nameToTopRule[t.nonTerminalName];if(i)t.referencedRule=i;else{var n=this.errMsgProvider.buildRuleNotFoundError(this.currTopLevel,t);this.errors.push({message:n,type:dIe.ParserDefinitionErrorType.UNRESOLVED_SUBRULE_REF,ruleName:this.currTopLevel.name,unresolvedRefName:t.nonTerminalName})}},e}(CIe.GAstVisitor);LA.GastRefResolverVisitor=Yj});var xd=w(Nr=>{"use strict";var hc=Nr&&Nr.__extends||function(){var r=function(e,t){return r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(i,n){i.__proto__=n}||function(i,n){for(var s in n)Object.prototype.hasOwnProperty.call(n,s)&&(i[s]=n[s])},r(e,t)};return function(e,t){if(typeof t!="function"&&t!==null)throw new TypeError("Class extends value "+String(t)+" is not a constructor or null");r(e,t);function i(){this.constructor=e}e.prototype=t===null?Object.create(t):(i.prototype=t.prototype,new i)}}();Object.defineProperty(Nr,"__esModule",{value:!0});Nr.nextPossibleTokensAfter=Nr.possiblePathsFrom=Nr.NextTerminalAfterAtLeastOneSepWalker=Nr.NextTerminalAfterAtLeastOneWalker=Nr.NextTerminalAfterManySepWalker=Nr.NextTerminalAfterManyWalker=Nr.AbstractNextTerminalAfterProductionWalker=Nr.NextAfterTokenWalker=Nr.AbstractNextPossibleTokensWalker=void 0;var qj=ny(),Kt=Gt(),EIe=qv(),kt=dn(),Jj=function(r){hc(e,r);function e(t,i){var n=r.call(this)||this;return n.topProd=t,n.path=i,n.possibleTokTypes=[],n.nextProductionName="",n.nextProductionOccurrence=0,n.found=!1,n.isAtEndOfPath=!1,n}return e.prototype.startWalking=function(){if(this.found=!1,this.path.ruleStack[0]!==this.topProd.name)throw Error("The path does not start with the walker's top Rule!");return this.ruleStack=(0,Kt.cloneArr)(this.path.ruleStack).reverse(),this.occurrenceStack=(0,Kt.cloneArr)(this.path.occurrenceStack).reverse(),this.ruleStack.pop(),this.occurrenceStack.pop(),this.updateExpectedNext(),this.walk(this.topProd),this.possibleTokTypes},e.prototype.walk=function(t,i){i===void 0&&(i=[]),this.found||r.prototype.walk.call(this,t,i)},e.prototype.walkProdRef=function(t,i,n){if(t.referencedRule.name===this.nextProductionName&&t.idx===this.nextProductionOccurrence){var s=i.concat(n);this.updateExpectedNext(),this.walk(t.referencedRule,s)}},e.prototype.updateExpectedNext=function(){(0,Kt.isEmpty)(this.ruleStack)?(this.nextProductionName="",this.nextProductionOccurrence=0,this.isAtEndOfPath=!0):(this.nextProductionName=this.ruleStack.pop(),this.nextProductionOccurrence=this.occurrenceStack.pop())},e}(qj.RestWalker);Nr.AbstractNextPossibleTokensWalker=Jj;var IIe=function(r){hc(e,r);function e(t,i){var n=r.call(this,t,i)||this;return n.path=i,n.nextTerminalName="",n.nextTerminalOccurrence=0,n.nextTerminalName=n.path.lastTok.name,n.nextTerminalOccurrence=n.path.lastTokOccurrence,n}return e.prototype.walkTerminal=function(t,i,n){if(this.isAtEndOfPath&&t.terminalType.name===this.nextTerminalName&&t.idx===this.nextTerminalOccurrence&&!this.found){var s=i.concat(n),o=new kt.Alternative({definition:s});this.possibleTokTypes=(0,EIe.first)(o),this.found=!0}},e}(Jj);Nr.NextAfterTokenWalker=IIe;var vd=function(r){hc(e,r);function e(t,i){var n=r.call(this)||this;return n.topRule=t,n.occurrence=i,n.result={token:void 0,occurrence:void 0,isEndOfRule:void 0},n}return e.prototype.startWalking=function(){return this.walk(this.topRule),this.result},e}(qj.RestWalker);Nr.AbstractNextTerminalAfterProductionWalker=vd;var yIe=function(r){hc(e,r);function e(){return r!==null&&r.apply(this,arguments)||this}return e.prototype.walkMany=function(t,i,n){if(t.idx===this.occurrence){var s=(0,Kt.first)(i.concat(n));this.result.isEndOfRule=s===void 0,s instanceof kt.Terminal&&(this.result.token=s.terminalType,this.result.occurrence=s.idx)}else r.prototype.walkMany.call(this,t,i,n)},e}(vd);Nr.NextTerminalAfterManyWalker=yIe;var wIe=function(r){hc(e,r);function e(){return r!==null&&r.apply(this,arguments)||this}return e.prototype.walkManySep=function(t,i,n){if(t.idx===this.occurrence){var s=(0,Kt.first)(i.concat(n));this.result.isEndOfRule=s===void 0,s instanceof kt.Terminal&&(this.result.token=s.terminalType,this.result.occurrence=s.idx)}else r.prototype.walkManySep.call(this,t,i,n)},e}(vd);Nr.NextTerminalAfterManySepWalker=wIe;var BIe=function(r){hc(e,r);function e(){return r!==null&&r.apply(this,arguments)||this}return e.prototype.walkAtLeastOne=function(t,i,n){if(t.idx===this.occurrence){var s=(0,Kt.first)(i.concat(n));this.result.isEndOfRule=s===void 0,s instanceof kt.Terminal&&(this.result.token=s.terminalType,this.result.occurrence=s.idx)}else r.prototype.walkAtLeastOne.call(this,t,i,n)},e}(vd);Nr.NextTerminalAfterAtLeastOneWalker=BIe;var QIe=function(r){hc(e,r);function e(){return r!==null&&r.apply(this,arguments)||this}return e.prototype.walkAtLeastOneSep=function(t,i,n){if(t.idx===this.occurrence){var s=(0,Kt.first)(i.concat(n));this.result.isEndOfRule=s===void 0,s instanceof kt.Terminal&&(this.result.token=s.terminalType,this.result.occurrence=s.idx)}else r.prototype.walkAtLeastOneSep.call(this,t,i,n)},e}(vd);Nr.NextTerminalAfterAtLeastOneSepWalker=QIe;function Wj(r,e,t){t===void 0&&(t=[]),t=(0,Kt.cloneArr)(t);var i=[],n=0;function s(c){return c.concat((0,Kt.drop)(r,n+1))}function o(c){var u=Wj(s(c),e,t);return i.concat(u)}for(;t.length<e&&n<r.length;){var a=r[n];if(a instanceof kt.Alternative)return o(a.definition);if(a instanceof kt.NonTerminal)return o(a.definition);if(a instanceof kt.Option)i=o(a.definition);else if(a instanceof kt.RepetitionMandatory){var l=a.definition.concat([new kt.Repetition({definition:a.definition})]);return o(l)}else if(a instanceof kt.RepetitionMandatoryWithSeparator){var l=[new kt.Alternative({definition:a.definition}),new kt.Repetition({definition:[new kt.Terminal({terminalType:a.separator})].concat(a.definition)})];return o(l)}else if(a instanceof kt.RepetitionWithSeparator){var l=a.definition.concat([new kt.Repetition({definition:[new kt.Terminal({terminalType:a.separator})].concat(a.definition)})]);i=o(l)}else if(a instanceof kt.Repetition){var l=a.definition.concat([new kt.Repetition({definition:a.definition})]);i=o(l)}else{if(a instanceof kt.Alternation)return(0,Kt.forEach)(a.definition,function(c){(0,Kt.isEmpty)(c.definition)===!1&&(i=o(c.definition))}),i;if(a instanceof kt.Terminal)t.push(a.terminalType);else throw Error("non exhaustive match")}n++}return i.push({partialPath:t,suffixDef:(0,Kt.drop)(r,n)}),i}Nr.possiblePathsFrom=Wj;function bIe(r,e,t,i){var n="EXIT_NONE_TERMINAL",s=[n],o="EXIT_ALTERNATIVE",a=!1,l=e.length,c=l-i-1,u=[],g=[];for(g.push({idx:-1,def:r,ruleStack:[],occurrenceStack:[]});!(0,Kt.isEmpty)(g);){var f=g.pop();if(f===o){a&&(0,Kt.last)(g).idx<=c&&g.pop();continue}var h=f.def,p=f.idx,C=f.ruleStack,y=f.occurrenceStack;if(!(0,Kt.isEmpty)(h)){var B=h[0];if(B===n){var v={idx:p,def:(0,Kt.drop)(h),ruleStack:(0,Kt.dropRight)(C),occurrenceStack:(0,Kt.dropRight)(y)};g.push(v)}else if(B instanceof kt.Terminal)if(p<l-1){var D=p+1,L=e[D];if(t(L,B.terminalType)){var v={idx:D,def:(0,Kt.drop)(h),ruleStack:C,occurrenceStack:y};g.push(v)}}else if(p===l-1)u.push({nextTokenType:B.terminalType,nextTokenOccurrence:B.idx,ruleStack:C,occurrenceStack:y}),a=!0;else throw Error("non exhaustive match");else if(B instanceof kt.NonTerminal){var H=(0,Kt.cloneArr)(C);H.push(B.nonTerminalName);var j=(0,Kt.cloneArr)(y);j.push(B.idx);var v={idx:p,def:B.definition.concat(s,(0,Kt.drop)(h)),ruleStack:H,occurrenceStack:j};g.push(v)}else if(B instanceof kt.Option){var $={idx:p,def:(0,Kt.drop)(h),ruleStack:C,occurrenceStack:y};g.push($),g.push(o);var V={idx:p,def:B.definition.concat((0,Kt.drop)(h)),ruleStack:C,occurrenceStack:y};g.push(V)}else if(B instanceof kt.RepetitionMandatory){var W=new kt.Repetition({definition:B.definition,idx:B.idx}),_=B.definition.concat([W],(0,Kt.drop)(h)),v={idx:p,def:_,ruleStack:C,occurrenceStack:y};g.push(v)}else if(B instanceof kt.RepetitionMandatoryWithSeparator){var A=new kt.Terminal({terminalType:B.separator}),W=new kt.Repetition({definition:[A].concat(B.definition),idx:B.idx}),_=B.definition.concat([W],(0,Kt.drop)(h)),v={idx:p,def:_,ruleStack:C,occurrenceStack:y};g.push(v)}else if(B instanceof kt.RepetitionWithSeparator){var $={idx:p,def:(0,Kt.drop)(h),ruleStack:C,occurrenceStack:y};g.push($),g.push(o);var A=new kt.Terminal({terminalType:B.separator}),ae=new kt.Repetition({definition:[A].concat(B.definition),idx:B.idx}),_=B.definition.concat([ae],(0,Kt.drop)(h)),V={idx:p,def:_,ruleStack:C,occurrenceStack:y};g.push(V)}else if(B instanceof kt.Repetition){var $={idx:p,def:(0,Kt.drop)(h),ruleStack:C,occurrenceStack:y};g.push($),g.push(o);var ae=new kt.Repetition({definition:B.definition,idx:B.idx}),_=B.definition.concat([ae],(0,Kt.drop)(h)),V={idx:p,def:_,ruleStack:C,occurrenceStack:y};g.push(V)}else if(B instanceof kt.Alternation)for(var ge=B.definition.length-1;ge>=0;ge--){var re=B.definition[ge],O={idx:p,def:re.definition.concat((0,Kt.drop)(h)),ruleStack:C,occurrenceStack:y};g.push(O),g.push(o)}else if(B instanceof kt.Alternative)g.push({idx:p,def:B.definition.concat((0,Kt.drop)(h)),ruleStack:C,occurrenceStack:y});else if(B instanceof kt.Rule)g.push(SIe(B,p,C,y));else throw Error("non exhaustive match")}}return u}Nr.nextPossibleTokensAfter=bIe;function SIe(r,e,t,i){var n=(0,Kt.cloneArr)(t);n.push(r.name);var s=(0,Kt.cloneArr)(i);return s.push(1),{idx:e,def:r.definition,ruleStack:n,occurrenceStack:s}}});var Pd=w(Zt=>{"use strict";var Xj=Zt&&Zt.__extends||function(){var r=function(e,t){return r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(i,n){i.__proto__=n}||function(i,n){for(var s in n)Object.prototype.hasOwnProperty.call(n,s)&&(i[s]=n[s])},r(e,t)};return function(e,t){if(typeof t!="function"&&t!==null)throw new TypeError("Class extends value "+String(t)+" is not a constructor or null");r(e,t);function i(){this.constructor=e}e.prototype=t===null?Object.create(t):(i.prototype=t.prototype,new i)}}();Object.defineProperty(Zt,"__esModule",{value:!0});Zt.areTokenCategoriesNotUsed=Zt.isStrictPrefixOfPath=Zt.containsPath=Zt.getLookaheadPathsForOptionalProd=Zt.getLookaheadPathsForOr=Zt.lookAheadSequenceFromAlternatives=Zt.buildSingleAlternativeLookaheadFunction=Zt.buildAlternativesLookAheadFunc=Zt.buildLookaheadFuncForOptionalProd=Zt.buildLookaheadFuncForOr=Zt.getProdType=Zt.PROD_TYPE=void 0;var sr=Gt(),zj=xd(),vIe=ny(),cy=Vg(),TA=dn(),xIe=Xg(),oi;(function(r){r[r.OPTION=0]="OPTION",r[r.REPETITION=1]="REPETITION",r[r.REPETITION_MANDATORY=2]="REPETITION_MANDATORY",r[r.REPETITION_MANDATORY_WITH_SEPARATOR=3]="REPETITION_MANDATORY_WITH_SEPARATOR",r[r.REPETITION_WITH_SEPARATOR=4]="REPETITION_WITH_SEPARATOR",r[r.ALTERNATION=5]="ALTERNATION"})(oi=Zt.PROD_TYPE||(Zt.PROD_TYPE={}));function PIe(r){if(r instanceof TA.Option)return oi.OPTION;if(r instanceof TA.Repetition)return oi.REPETITION;if(r instanceof TA.RepetitionMandatory)return oi.REPETITION_MANDATORY;if(r instanceof TA.RepetitionMandatoryWithSeparator)return oi.REPETITION_MANDATORY_WITH_SEPARATOR;if(r instanceof TA.RepetitionWithSeparator)return oi.REPETITION_WITH_SEPARATOR;if(r instanceof TA.Alternation)return oi.ALTERNATION;throw Error("non exhaustive match")}Zt.getProdType=PIe;function DIe(r,e,t,i,n,s){var o=_j(r,e,t),a=Xv(o)?cy.tokenStructuredMatcherNoCategories:cy.tokenStructuredMatcher;return s(o,i,a,n)}Zt.buildLookaheadFuncForOr=DIe;function kIe(r,e,t,i,n,s){var o=$j(r,e,n,t),a=Xv(o)?cy.tokenStructuredMatcherNoCategories:cy.tokenStructuredMatcher;return s(o[0],a,i)}Zt.buildLookaheadFuncForOptionalProd=kIe;function RIe(r,e,t,i){var n=r.length,s=(0,sr.every)(r,function(l){return(0,sr.every)(l,function(c){return c.length===1})});if(e)return function(l){for(var c=(0,sr.map)(l,function(D){return D.GATE}),u=0;u<n;u++){var g=r[u],f=g.length,h=c[u];if(h!==void 0&&h.call(this)===!1)continue;e:for(var p=0;p<f;p++){for(var C=g[p],y=C.length,B=0;B<y;B++){var v=this.LA(B+1);if(t(v,C[B])===!1)continue e}return u}}};if(s&&!i){var o=(0,sr.map)(r,function(l){return(0,sr.flatten)(l)}),a=(0,sr.reduce)(o,function(l,c,u){return(0,sr.forEach)(c,function(g){(0,sr.has)(l,g.tokenTypeIdx)||(l[g.tokenTypeIdx]=u),(0,sr.forEach)(g.categoryMatches,function(f){(0,sr.has)(l,f)||(l[f]=u)})}),l},[]);return function(){var l=this.LA(1);return a[l.tokenTypeIdx]}}else return function(){for(var l=0;l<n;l++){var c=r[l],u=c.length;e:for(var g=0;g<u;g++){for(var f=c[g],h=f.length,p=0;p<h;p++){var C=this.LA(p+1);if(t(C,f[p])===!1)continue e}return l}}}}Zt.buildAlternativesLookAheadFunc=RIe;function FIe(r,e,t){var i=(0,sr.every)(r,function(c){return c.length===1}),n=r.length;if(i&&!t){var s=(0,sr.flatten)(r);if(s.length===1&&(0,sr.isEmpty)(s[0].categoryMatches)){var o=s[0],a=o.tokenTypeIdx;return function(){return this.LA(1).tokenTypeIdx===a}}else{var l=(0,sr.reduce)(s,function(c,u,g){return c[u.tokenTypeIdx]=!0,(0,sr.forEach)(u.categoryMatches,function(f){c[f]=!0}),c},[]);return function(){var c=this.LA(1);return l[c.tokenTypeIdx]===!0}}}else return function(){e:for(var c=0;c<n;c++){for(var u=r[c],g=u.length,f=0;f<g;f++){var h=this.LA(f+1);if(e(h,u[f])===!1)continue e}return!0}return!1}}Zt.buildSingleAlternativeLookaheadFunction=FIe;var NIe=function(r){Xj(e,r);function e(t,i,n){var s=r.call(this)||this;return s.topProd=t,s.targetOccurrence=i,s.targetProdType=n,s}return e.prototype.startWalking=function(){return this.walk(this.topProd),this.restDef},e.prototype.checkIsTarget=function(t,i,n,s){return t.idx===this.targetOccurrence&&this.targetProdType===i?(this.restDef=n.concat(s),!0):!1},e.prototype.walkOption=function(t,i,n){this.checkIsTarget(t,oi.OPTION,i,n)||r.prototype.walkOption.call(this,t,i,n)},e.prototype.walkAtLeastOne=function(t,i,n){this.checkIsTarget(t,oi.REPETITION_MANDATORY,i,n)||r.prototype.walkOption.call(this,t,i,n)},e.prototype.walkAtLeastOneSep=function(t,i,n){this.checkIsTarget(t,oi.REPETITION_MANDATORY_WITH_SEPARATOR,i,n)||r.prototype.walkOption.call(this,t,i,n)},e.prototype.walkMany=function(t,i,n){this.checkIsTarget(t,oi.REPETITION,i,n)||r.prototype.walkOption.call(this,t,i,n)},e.prototype.walkManySep=function(t,i,n){this.checkIsTarget(t,oi.REPETITION_WITH_SEPARATOR,i,n)||r.prototype.walkOption.call(this,t,i,n)},e}(vIe.RestWalker),Zj=function(r){Xj(e,r);function e(t,i,n){var s=r.call(this)||this;return s.targetOccurrence=t,s.targetProdType=i,s.targetRef=n,s.result=[],s}return e.prototype.checkIsTarget=function(t,i){t.idx===this.targetOccurrence&&this.targetProdType===i&&(this.targetRef===void 0||t===this.targetRef)&&(this.result=t.definition)},e.prototype.visitOption=function(t){this.checkIsTarget(t,oi.OPTION)},e.prototype.visitRepetition=function(t){this.checkIsTarget(t,oi.REPETITION)},e.prototype.visitRepetitionMandatory=function(t){this.checkIsTarget(t,oi.REPETITION_MANDATORY)},e.prototype.visitRepetitionMandatoryWithSeparator=function(t){this.checkIsTarget(t,oi.REPETITION_MANDATORY_WITH_SEPARATOR)},e.prototype.visitRepetitionWithSeparator=function(t){this.checkIsTarget(t,oi.REPETITION_WITH_SEPARATOR)},e.prototype.visitAlternation=function(t){this.checkIsTarget(t,oi.ALTERNATION)},e}(xIe.GAstVisitor);function Vj(r){for(var e=new Array(r),t=0;t<r;t++)e[t]=[];return e}function zv(r){for(var e=[""],t=0;t<r.length;t++){for(var i=r[t],n=[],s=0;s<e.length;s++){var o=e[s];n.push(o+"_"+i.tokenTypeIdx);for(var a=0;a<i.categoryMatches.length;a++){var l="_"+i.categoryMatches[a];n.push(o+l)}}e=n}return e}function LIe(r,e,t){for(var i=0;i<r.length;i++)if(i!==t)for(var n=r[i],s=0;s<e.length;s++){var o=e[s];if(n[o]===!0)return!1}return!0}function Vv(r,e){for(var t=(0,sr.map)(r,function(u){return(0,zj.possiblePathsFrom)([u],1)}),i=Vj(t.length),n=(0,sr.map)(t,function(u){var g={};return(0,sr.forEach)(u,function(f){var h=zv(f.partialPath);(0,sr.forEach)(h,function(p){g[p]=!0})}),g}),s=t,o=1;o<=e;o++){var a=s;s=Vj(a.length);for(var l=function(u){for(var g=a[u],f=0;f<g.length;f++){var h=g[f].partialPath,p=g[f].suffixDef,C=zv(h),y=LIe(n,C,u);if(y||(0,sr.isEmpty)(p)||h.length===e){var B=i[u];if(eq(B,h)===!1){B.push(h);for(var v=0;v<C.length;v++){var D=C[v];n[u][D]=!0}}}else{var L=(0,zj.possiblePathsFrom)(p,o+1,h);s[u]=s[u].concat(L),(0,sr.forEach)(L,function(H){var j=zv(H.partialPath);(0,sr.forEach)(j,function($){n[u][$]=!0})})}}},c=0;c<a.length;c++)l(c)}return i}Zt.lookAheadSequenceFromAlternatives=Vv;function _j(r,e,t,i){var n=new Zj(r,oi.ALTERNATION,i);return e.accept(n),Vv(n.result,t)}Zt.getLookaheadPathsForOr=_j;function $j(r,e,t,i){var n=new Zj(r,t);e.accept(n);var s=n.result,o=new NIe(e,r,t),a=o.startWalking(),l=new TA.Alternative({definition:s}),c=new TA.Alternative({definition:a});return Vv([l,c],i)}Zt.getLookaheadPathsForOptionalProd=$j;function eq(r,e){e:for(var t=0;t<r.length;t++){var i=r[t];if(i.length===e.length){for(var n=0;n<i.length;n++){var s=e[n],o=i[n],a=s===o||o.categoryMatchesMap[s.tokenTypeIdx]!==void 0;if(a===!1)continue e}return!0}}return!1}Zt.containsPath=eq;function TIe(r,e){return r.length<e.length&&(0,sr.every)(r,function(t,i){var n=e[i];return t===n||n.categoryMatchesMap[t.tokenTypeIdx]})}Zt.isStrictPrefixOfPath=TIe;function Xv(r){return(0,sr.every)(r,function(e){return(0,sr.every)(e,function(t){return(0,sr.every)(t,function(i){return(0,sr.isEmpty)(i.categoryMatches)})})})}Zt.areTokenCategoriesNotUsed=Xv});var rx=w(Vt=>{"use strict";var Zv=Vt&&Vt.__extends||function(){var r=function(e,t){return r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(i,n){i.__proto__=n}||function(i,n){for(var s in n)Object.prototype.hasOwnProperty.call(n,s)&&(i[s]=n[s])},r(e,t)};return function(e,t){if(typeof t!="function"&&t!==null)throw new TypeError("Class extends value "+String(t)+" is not a constructor or null");r(e,t);function i(){this.constructor=e}e.prototype=t===null?Object.create(t):(i.prototype=t.prototype,new i)}}();Object.defineProperty(Vt,"__esModule",{value:!0});Vt.checkPrefixAlternativesAmbiguities=Vt.validateSomeNonEmptyLookaheadPath=Vt.validateTooManyAlts=Vt.RepetionCollector=Vt.validateAmbiguousAlternationAlternatives=Vt.validateEmptyOrAlternative=Vt.getFirstNoneTerminal=Vt.validateNoLeftRecursion=Vt.validateRuleIsOverridden=Vt.validateRuleDoesNotAlreadyExist=Vt.OccurrenceValidationCollector=Vt.identifyProductionForDuplicates=Vt.validateGrammar=void 0;var er=Gt(),br=Gt(),No=Gn(),_v=bd(),_g=Pd(),OIe=xd(),$s=dn(),$v=Xg();function MIe(r,e,t,i,n){var s=er.map(r,function(h){return KIe(h,i)}),o=er.map(r,function(h){return ex(h,h,i)}),a=[],l=[],c=[];(0,br.every)(o,br.isEmpty)&&(a=(0,br.map)(r,function(h){return sq(h,i)}),l=(0,br.map)(r,function(h){return oq(h,e,i)}),c=lq(r,e,i));var u=GIe(r,t,i),g=(0,br.map)(r,function(h){return Aq(h,i)}),f=(0,br.map)(r,function(h){return nq(h,r,n,i)});return er.flatten(s.concat(c,o,a,l,u,g,f))}Vt.validateGrammar=MIe;function KIe(r,e){var t=new iq;r.accept(t);var i=t.allProductions,n=er.groupBy(i,tq),s=er.pick(n,function(a){return a.length>1}),o=er.map(er.values(s),function(a){var l=er.first(a),c=e.buildDuplicateFoundError(r,a),u=(0,_v.getProductionDslName)(l),g={message:c,type:No.ParserDefinitionErrorType.DUPLICATE_PRODUCTIONS,ruleName:r.name,dslName:u,occurrence:l.idx},f=rq(l);return f&&(g.parameter=f),g});return o}function tq(r){return(0,_v.getProductionDslName)(r)+"_#_"+r.idx+"_#_"+rq(r)}Vt.identifyProductionForDuplicates=tq;function rq(r){return r instanceof $s.Terminal?r.terminalType.name:r instanceof $s.NonTerminal?r.nonTerminalName:""}var iq=function(r){Zv(e,r);function e(){var t=r!==null&&r.apply(this,arguments)||this;return t.allProductions=[],t}return e.prototype.visitNonTerminal=function(t){this.allProductions.push(t)},e.prototype.visitOption=function(t){this.allProductions.push(t)},e.prototype.visitRepetitionWithSeparator=function(t){this.allProductions.push(t)},e.prototype.visitRepetitionMandatory=function(t){this.allProductions.push(t)},e.prototype.visitRepetitionMandatoryWithSeparator=function(t){this.allProductions.push(t)},e.prototype.visitRepetition=function(t){this.allProductions.push(t)},e.prototype.visitAlternation=function(t){this.allProductions.push(t)},e.prototype.visitTerminal=function(t){this.allProductions.push(t)},e}($v.GAstVisitor);Vt.OccurrenceValidationCollector=iq;function nq(r,e,t,i){var n=[],s=(0,br.reduce)(e,function(a,l){return l.name===r.name?a+1:a},0);if(s>1){var o=i.buildDuplicateRuleNameError({topLevelRule:r,grammarName:t});n.push({message:o,type:No.ParserDefinitionErrorType.DUPLICATE_RULE_NAME,ruleName:r.name})}return n}Vt.validateRuleDoesNotAlreadyExist=nq;function UIe(r,e,t){var i=[],n;return er.contains(e,r)||(n="Invalid rule override, rule: ->"+r+"<- cannot be overridden in the grammar: ->"+t+"<-as it is not defined in any of the super grammars ",i.push({message:n,type:No.ParserDefinitionErrorType.INVALID_RULE_OVERRIDE,ruleName:r})),i}Vt.validateRuleIsOverridden=UIe;function ex(r,e,t,i){i===void 0&&(i=[]);var n=[],s=Dd(e.definition);if(er.isEmpty(s))return[];var o=r.name,a=er.contains(s,r);a&&n.push({message:t.buildLeftRecursionError({topLevelRule:r,leftRecursionPath:i}),type:No.ParserDefinitionErrorType.LEFT_RECURSION,ruleName:o});var l=er.difference(s,i.concat([r])),c=er.map(l,function(u){var g=er.cloneArr(i);return g.push(u),ex(r,u,t,g)});return n.concat(er.flatten(c))}Vt.validateNoLeftRecursion=ex;function Dd(r){var e=[];if(er.isEmpty(r))return e;var t=er.first(r);if(t instanceof $s.NonTerminal)e.push(t.referencedRule);else if(t instanceof $s.Alternative||t instanceof $s.Option||t instanceof $s.RepetitionMandatory||t instanceof $s.RepetitionMandatoryWithSeparator||t instanceof $s.RepetitionWithSeparator||t instanceof $s.Repetition)e=e.concat(Dd(t.definition));else if(t instanceof $s.Alternation)e=er.flatten(er.map(t.definition,function(o){return Dd(o.definition)}));else if(!(t instanceof $s.Terminal))throw Error("non exhaustive match");var i=(0,_v.isOptionalProd)(t),n=r.length>1;if(i&&n){var s=er.drop(r);return e.concat(Dd(s))}else return e}Vt.getFirstNoneTerminal=Dd;var tx=function(r){Zv(e,r);function e(){var t=r!==null&&r.apply(this,arguments)||this;return t.alternations=[],t}return e.prototype.visitAlternation=function(t){this.alternations.push(t)},e}($v.GAstVisitor);function sq(r,e){var t=new tx;r.accept(t);var i=t.alternations,n=er.reduce(i,function(s,o){var a=er.dropRight(o.definition),l=er.map(a,function(c,u){var g=(0,OIe.nextPossibleTokensAfter)([c],[],null,1);return er.isEmpty(g)?{message:e.buildEmptyAlternationError({topLevelRule:r,alternation:o,emptyChoiceIdx:u}),type:No.ParserDefinitionErrorType.NONE_LAST_EMPTY_ALT,ruleName:r.name,occurrence:o.idx,alternative:u+1}:null});return s.concat(er.compact(l))},[]);return n}Vt.validateEmptyOrAlternative=sq;function oq(r,e,t){var i=new tx;r.accept(i);var n=i.alternations;n=(0,br.reject)(n,function(o){return o.ignoreAmbiguities===!0});var s=er.reduce(n,function(o,a){var l=a.idx,c=a.maxLookahead||e,u=(0,_g.getLookaheadPathsForOr)(l,r,c,a),g=HIe(u,a,r,t),f=cq(u,a,r,t);return o.concat(g,f)},[]);return s}Vt.validateAmbiguousAlternationAlternatives=oq;var aq=function(r){Zv(e,r);function e(){var t=r!==null&&r.apply(this,arguments)||this;return t.allProductions=[],t}return e.prototype.visitRepetitionWithSeparator=function(t){this.allProductions.push(t)},e.prototype.visitRepetitionMandatory=function(t){this.allProductions.push(t)},e.prototype.visitRepetitionMandatoryWithSeparator=function(t){this.allProductions.push(t)},e.prototype.visitRepetition=function(t){this.allProductions.push(t)},e}($v.GAstVisitor);Vt.RepetionCollector=aq;function Aq(r,e){var t=new tx;r.accept(t);var i=t.alternations,n=er.reduce(i,function(s,o){return o.definition.length>255&&s.push({message:e.buildTooManyAlternativesError({topLevelRule:r,alternation:o}),type:No.ParserDefinitionErrorType.TOO_MANY_ALTS,ruleName:r.name,occurrence:o.idx}),s},[]);return n}Vt.validateTooManyAlts=Aq;function lq(r,e,t){var i=[];return(0,br.forEach)(r,function(n){var s=new aq;n.accept(s);var o=s.allProductions;(0,br.forEach)(o,function(a){var l=(0,_g.getProdType)(a),c=a.maxLookahead||e,u=a.idx,g=(0,_g.getLookaheadPathsForOptionalProd)(u,n,l,c),f=g[0];if((0,br.isEmpty)((0,br.flatten)(f))){var h=t.buildEmptyRepetitionError({topLevelRule:n,repetition:a});i.push({message:h,type:No.ParserDefinitionErrorType.NO_NON_EMPTY_LOOKAHEAD,ruleName:n.name})}})}),i}Vt.validateSomeNonEmptyLookaheadPath=lq;function HIe(r,e,t,i){var n=[],s=(0,br.reduce)(r,function(a,l,c){return e.definition[c].ignoreAmbiguities===!0||(0,br.forEach)(l,function(u){var g=[c];(0,br.forEach)(r,function(f,h){c!==h&&(0,_g.containsPath)(f,u)&&e.definition[h].ignoreAmbiguities!==!0&&g.push(h)}),g.length>1&&!(0,_g.containsPath)(n,u)&&(n.push(u),a.push({alts:g,path:u}))}),a},[]),o=er.map(s,function(a){var l=(0,br.map)(a.alts,function(u){return u+1}),c=i.buildAlternationAmbiguityError({topLevelRule:t,alternation:e,ambiguityIndices:l,prefixPath:a.path});return{message:c,type:No.ParserDefinitionErrorType.AMBIGUOUS_ALTS,ruleName:t.name,occurrence:e.idx,alternatives:[a.alts]}});return o}function cq(r,e,t,i){var n=[],s=(0,br.reduce)(r,function(o,a,l){var c=(0,br.map)(a,function(u){return{idx:l,path:u}});return o.concat(c)},[]);return(0,br.forEach)(s,function(o){var a=e.definition[o.idx];if(a.ignoreAmbiguities!==!0){var l=o.idx,c=o.path,u=(0,br.findAll)(s,function(f){return e.definition[f.idx].ignoreAmbiguities!==!0&&f.idx<l&&(0,_g.isStrictPrefixOfPath)(f.path,c)}),g=(0,br.map)(u,function(f){var h=[f.idx+1,l+1],p=e.idx===0?"":e.idx,C=i.buildAlternationPrefixAmbiguityError({topLevelRule:t,alternation:e,ambiguityIndices:h,prefixPath:f.path});return{message:C,type:No.ParserDefinitionErrorType.AMBIGUOUS_PREFIX_ALTS,ruleName:t.name,occurrence:p,alternatives:h}});n=n.concat(g)}}),n}Vt.checkPrefixAlternativesAmbiguities=cq;function GIe(r,e,t){var i=[],n=(0,br.map)(e,function(s){return s.name});return(0,br.forEach)(r,function(s){var o=s.name;if((0,br.contains)(n,o)){var a=t.buildNamespaceConflictError(s);i.push({message:a,type:No.ParserDefinitionErrorType.CONFLICT_TOKENS_RULES_NAMESPACE,ruleName:o})}}),i}});var gq=w($g=>{"use strict";Object.defineProperty($g,"__esModule",{value:!0});$g.validateGrammar=$g.resolveGrammar=void 0;var ix=Gt(),YIe=jj(),jIe=rx(),uq=Sd();function qIe(r){r=(0,ix.defaults)(r,{errMsgProvider:uq.defaultGrammarResolverErrorProvider});var e={};return(0,ix.forEach)(r.rules,function(t){e[t.name]=t}),(0,YIe.resolveGrammar)(e,r.errMsgProvider)}$g.resolveGrammar=qIe;function JIe(r){return r=(0,ix.defaults)(r,{errMsgProvider:uq.defaultGrammarValidatorErrorProvider}),(0,jIe.validateGrammar)(r.rules,r.maxLookahead,r.tokenTypes,r.errMsgProvider,r.grammarName)}$g.validateGrammar=JIe});var ef=w(mn=>{"use strict";var kd=mn&&mn.__extends||function(){var r=function(e,t){return r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(i,n){i.__proto__=n}||function(i,n){for(var s in n)Object.prototype.hasOwnProperty.call(n,s)&&(i[s]=n[s])},r(e,t)};return function(e,t){if(typeof t!="function"&&t!==null)throw new TypeError("Class extends value "+String(t)+" is not a constructor or null");r(e,t);function i(){this.constructor=e}e.prototype=t===null?Object.create(t):(i.prototype=t.prototype,new i)}}();Object.defineProperty(mn,"__esModule",{value:!0});mn.EarlyExitException=mn.NotAllInputParsedException=mn.NoViableAltException=mn.MismatchedTokenException=mn.isRecognitionException=void 0;var WIe=Gt(),fq="MismatchedTokenException",hq="NoViableAltException",pq="EarlyExitException",dq="NotAllInputParsedException",Cq=[fq,hq,pq,dq];Object.freeze(Cq);function zIe(r){return(0,WIe.contains)(Cq,r.name)}mn.isRecognitionException=zIe;var uy=function(r){kd(e,r);function e(t,i){var n=this.constructor,s=r.call(this,t)||this;return s.token=i,s.resyncedTokens=[],Object.setPrototypeOf(s,n.prototype),Error.captureStackTrace&&Error.captureStackTrace(s,s.constructor),s}return e}(Error),VIe=function(r){kd(e,r);function e(t,i,n){var s=r.call(this,t,i)||this;return s.previousToken=n,s.name=fq,s}return e}(uy);mn.MismatchedTokenException=VIe;var XIe=function(r){kd(e,r);function e(t,i,n){var s=r.call(this,t,i)||this;return s.previousToken=n,s.name=hq,s}return e}(uy);mn.NoViableAltException=XIe;var ZIe=function(r){kd(e,r);function e(t,i){var n=r.call(this,t,i)||this;return n.name=dq,n}return e}(uy);mn.NotAllInputParsedException=ZIe;var _Ie=function(r){kd(e,r);function e(t,i,n){var s=r.call(this,t,i)||this;return s.previousToken=n,s.name=pq,s}return e}(uy);mn.EarlyExitException=_Ie});var sx=w(Ki=>{"use strict";Object.defineProperty(Ki,"__esModule",{value:!0});Ki.attemptInRepetitionRecovery=Ki.Recoverable=Ki.InRuleRecoveryException=Ki.IN_RULE_RECOVERY_EXCEPTION=Ki.EOF_FOLLOW_KEY=void 0;var gy=NA(),gs=Gt(),$Ie=ef(),eye=Jv(),tye=Gn();Ki.EOF_FOLLOW_KEY={};Ki.IN_RULE_RECOVERY_EXCEPTION="InRuleRecoveryException";function nx(r){this.name=Ki.IN_RULE_RECOVERY_EXCEPTION,this.message=r}Ki.InRuleRecoveryException=nx;nx.prototype=Error.prototype;var rye=function(){function r(){}return r.prototype.initRecoverable=function(e){this.firstAfterRepMap={},this.resyncFollows={},this.recoveryEnabled=(0,gs.has)(e,"recoveryEnabled")?e.recoveryEnabled:tye.DEFAULT_PARSER_CONFIG.recoveryEnabled,this.recoveryEnabled&&(this.attemptInRepetitionRecovery=mq)},r.prototype.getTokenToInsert=function(e){var t=(0,gy.createTokenInstance)(e,"",NaN,NaN,NaN,NaN,NaN,NaN);return t.isInsertedInRecovery=!0,t},r.prototype.canTokenTypeBeInsertedInRecovery=function(e){return!0},r.prototype.tryInRepetitionRecovery=function(e,t,i,n){for(var s=this,o=this.findReSyncTokenType(),a=this.exportLexerState(),l=[],c=!1,u=this.LA(1),g=this.LA(1),f=function(){var h=s.LA(0),p=s.errorMessageProvider.buildMismatchTokenMessage({expected:n,actual:u,previous:h,ruleName:s.getCurrRuleFullName()}),C=new $Ie.MismatchedTokenException(p,u,s.LA(0));C.resyncedTokens=(0,gs.dropRight)(l),s.SAVE_ERROR(C)};!c;)if(this.tokenMatcher(g,n)){f();return}else if(i.call(this)){f(),e.apply(this,t);return}else this.tokenMatcher(g,o)?c=!0:(g=this.SKIP_TOKEN(),this.addToResyncTokens(g,l));this.importLexerState(a)},r.prototype.shouldInRepetitionRecoveryBeTried=function(e,t,i){return!(i===!1||e===void 0||t===void 0||this.tokenMatcher(this.LA(1),e)||this.isBackTracking()||this.canPerformInRuleRecovery(e,this.getFollowsForInRuleRecovery(e,t)))},r.prototype.getFollowsForInRuleRecovery=function(e,t){var i=this.getCurrentGrammarPath(e,t),n=this.getNextPossibleTokenTypes(i);return n},r.prototype.tryInRuleRecovery=function(e,t){if(this.canRecoverWithSingleTokenInsertion(e,t)){var i=this.getTokenToInsert(e);return i}if(this.canRecoverWithSingleTokenDeletion(e)){var n=this.SKIP_TOKEN();return this.consumeToken(),n}throw new nx("sad sad panda")},r.prototype.canPerformInRuleRecovery=function(e,t){return this.canRecoverWithSingleTokenInsertion(e,t)||this.canRecoverWithSingleTokenDeletion(e)},r.prototype.canRecoverWithSingleTokenInsertion=function(e,t){var i=this;if(!this.canTokenTypeBeInsertedInRecovery(e)||(0,gs.isEmpty)(t))return!1;var n=this.LA(1),s=(0,gs.find)(t,function(o){return i.tokenMatcher(n,o)})!==void 0;return s},r.prototype.canRecoverWithSingleTokenDeletion=function(e){var t=this.tokenMatcher(this.LA(2),e);return t},r.prototype.isInCurrentRuleReSyncSet=function(e){var t=this.getCurrFollowKey(),i=this.getFollowSetFromFollowKey(t);return(0,gs.contains)(i,e)},r.prototype.findReSyncTokenType=function(){for(var e=this.flattenFollowSet(),t=this.LA(1),i=2;;){var n=t.tokenType;if((0,gs.contains)(e,n))return n;t=this.LA(i),i++}},r.prototype.getCurrFollowKey=function(){if(this.RULE_STACK.length===1)return Ki.EOF_FOLLOW_KEY;var e=this.getLastExplicitRuleShortName(),t=this.getLastExplicitRuleOccurrenceIndex(),i=this.getPreviousExplicitRuleShortName();return{ruleName:this.shortRuleNameToFullName(e),idxInCallingRule:t,inRule:this.shortRuleNameToFullName(i)}},r.prototype.buildFullFollowKeyStack=function(){var e=this,t=this.RULE_STACK,i=this.RULE_OCCURRENCE_STACK;return(0,gs.map)(t,function(n,s){return s===0?Ki.EOF_FOLLOW_KEY:{ruleName:e.shortRuleNameToFullName(n),idxInCallingRule:i[s],inRule:e.shortRuleNameToFullName(t[s-1])}})},r.prototype.flattenFollowSet=function(){var e=this,t=(0,gs.map)(this.buildFullFollowKeyStack(),function(i){return e.getFollowSetFromFollowKey(i)});return(0,gs.flatten)(t)},r.prototype.getFollowSetFromFollowKey=function(e){if(e===Ki.EOF_FOLLOW_KEY)return[gy.EOF];var t=e.ruleName+e.idxInCallingRule+eye.IN+e.inRule;return this.resyncFollows[t]},r.prototype.addToResyncTokens=function(e,t){return this.tokenMatcher(e,gy.EOF)||t.push(e),t},r.prototype.reSyncTo=function(e){for(var t=[],i=this.LA(1);this.tokenMatcher(i,e)===!1;)i=this.SKIP_TOKEN(),this.addToResyncTokens(i,t);return(0,gs.dropRight)(t)},r.prototype.attemptInRepetitionRecovery=function(e,t,i,n,s,o,a){},r.prototype.getCurrentGrammarPath=function(e,t){var i=this.getHumanReadableRuleStack(),n=(0,gs.cloneArr)(this.RULE_OCCURRENCE_STACK),s={ruleStack:i,occurrenceStack:n,lastTok:e,lastTokOccurrence:t};return s},r.prototype.getHumanReadableRuleStack=function(){var e=this;return(0,gs.map)(this.RULE_STACK,function(t){return e.shortRuleNameToFullName(t)})},r}();Ki.Recoverable=rye;function mq(r,e,t,i,n,s,o){var a=this.getKeyForAutomaticLookahead(i,n),l=this.firstAfterRepMap[a];if(l===void 0){var c=this.getCurrRuleFullName(),u=this.getGAstProductions()[c],g=new s(u,n);l=g.startWalking(),this.firstAfterRepMap[a]=l}var f=l.token,h=l.occurrence,p=l.isEndOfRule;this.RULE_STACK.length===1&&p&&f===void 0&&(f=gy.EOF,h=1),this.shouldInRepetitionRecoveryBeTried(f,h,o)&&this.tryInRepetitionRecovery(r,e,t,f)}Ki.attemptInRepetitionRecovery=mq});var fy=w(Jt=>{"use strict";Object.defineProperty(Jt,"__esModule",{value:!0});Jt.getKeyForAutomaticLookahead=Jt.AT_LEAST_ONE_SEP_IDX=Jt.MANY_SEP_IDX=Jt.AT_LEAST_ONE_IDX=Jt.MANY_IDX=Jt.OPTION_IDX=Jt.OR_IDX=Jt.BITS_FOR_ALT_IDX=Jt.BITS_FOR_RULE_IDX=Jt.BITS_FOR_OCCURRENCE_IDX=Jt.BITS_FOR_METHOD_TYPE=void 0;Jt.BITS_FOR_METHOD_TYPE=4;Jt.BITS_FOR_OCCURRENCE_IDX=8;Jt.BITS_FOR_RULE_IDX=12;Jt.BITS_FOR_ALT_IDX=8;Jt.OR_IDX=1<<Jt.BITS_FOR_OCCURRENCE_IDX;Jt.OPTION_IDX=2<<Jt.BITS_FOR_OCCURRENCE_IDX;Jt.MANY_IDX=3<<Jt.BITS_FOR_OCCURRENCE_IDX;Jt.AT_LEAST_ONE_IDX=4<<Jt.BITS_FOR_OCCURRENCE_IDX;Jt.MANY_SEP_IDX=5<<Jt.BITS_FOR_OCCURRENCE_IDX;Jt.AT_LEAST_ONE_SEP_IDX=6<<Jt.BITS_FOR_OCCURRENCE_IDX;function iye(r,e,t){return t|e|r}Jt.getKeyForAutomaticLookahead=iye;var Eet=32-Jt.BITS_FOR_ALT_IDX});var Iq=w(hy=>{"use strict";Object.defineProperty(hy,"__esModule",{value:!0});hy.LooksAhead=void 0;var Pa=Pd(),eo=Gt(),Eq=Gn(),Da=fy(),pc=bd(),nye=function(){function r(){}return r.prototype.initLooksAhead=function(e){this.dynamicTokensEnabled=(0,eo.has)(e,"dynamicTokensEnabled")?e.dynamicTokensEnabled:Eq.DEFAULT_PARSER_CONFIG.dynamicTokensEnabled,this.maxLookahead=(0,eo.has)(e,"maxLookahead")?e.maxLookahead:Eq.DEFAULT_PARSER_CONFIG.maxLookahead,this.lookAheadFuncsCache=(0,eo.isES2015MapSupported)()?new Map:[],(0,eo.isES2015MapSupported)()?(this.getLaFuncFromCache=this.getLaFuncFromMap,this.setLaFuncCache=this.setLaFuncCacheUsingMap):(this.getLaFuncFromCache=this.getLaFuncFromObj,this.setLaFuncCache=this.setLaFuncUsingObj)},r.prototype.preComputeLookaheadFunctions=function(e){var t=this;(0,eo.forEach)(e,function(i){t.TRACE_INIT(i.name+" Rule Lookahead",function(){var n=(0,pc.collectMethods)(i),s=n.alternation,o=n.repetition,a=n.option,l=n.repetitionMandatory,c=n.repetitionMandatoryWithSeparator,u=n.repetitionWithSeparator;(0,eo.forEach)(s,function(g){var f=g.idx===0?"":g.idx;t.TRACE_INIT(""+(0,pc.getProductionDslName)(g)+f,function(){var h=(0,Pa.buildLookaheadFuncForOr)(g.idx,i,g.maxLookahead||t.maxLookahead,g.hasPredicates,t.dynamicTokensEnabled,t.lookAheadBuilderForAlternatives),p=(0,Da.getKeyForAutomaticLookahead)(t.fullRuleNameToShort[i.name],Da.OR_IDX,g.idx);t.setLaFuncCache(p,h)})}),(0,eo.forEach)(o,function(g){t.computeLookaheadFunc(i,g.idx,Da.MANY_IDX,Pa.PROD_TYPE.REPETITION,g.maxLookahead,(0,pc.getProductionDslName)(g))}),(0,eo.forEach)(a,function(g){t.computeLookaheadFunc(i,g.idx,Da.OPTION_IDX,Pa.PROD_TYPE.OPTION,g.maxLookahead,(0,pc.getProductionDslName)(g))}),(0,eo.forEach)(l,function(g){t.computeLookaheadFunc(i,g.idx,Da.AT_LEAST_ONE_IDX,Pa.PROD_TYPE.REPETITION_MANDATORY,g.maxLookahead,(0,pc.getProductionDslName)(g))}),(0,eo.forEach)(c,function(g){t.computeLookaheadFunc(i,g.idx,Da.AT_LEAST_ONE_SEP_IDX,Pa.PROD_TYPE.REPETITION_MANDATORY_WITH_SEPARATOR,g.maxLookahead,(0,pc.getProductionDslName)(g))}),(0,eo.forEach)(u,function(g){t.computeLookaheadFunc(i,g.idx,Da.MANY_SEP_IDX,Pa.PROD_TYPE.REPETITION_WITH_SEPARATOR,g.maxLookahead,(0,pc.getProductionDslName)(g))})})})},r.prototype.computeLookaheadFunc=function(e,t,i,n,s,o){var a=this;this.TRACE_INIT(""+o+(t===0?"":t),function(){var l=(0,Pa.buildLookaheadFuncForOptionalProd)(t,e,s||a.maxLookahead,a.dynamicTokensEnabled,n,a.lookAheadBuilderForOptional),c=(0,Da.getKeyForAutomaticLookahead)(a.fullRuleNameToShort[e.name],i,t);a.setLaFuncCache(c,l)})},r.prototype.lookAheadBuilderForOptional=function(e,t,i){return(0,Pa.buildSingleAlternativeLookaheadFunction)(e,t,i)},r.prototype.lookAheadBuilderForAlternatives=function(e,t,i,n){return(0,Pa.buildAlternativesLookAheadFunc)(e,t,i,n)},r.prototype.getKeyForAutomaticLookahead=function(e,t){var i=this.getLastExplicitRuleShortName();return(0,Da.getKeyForAutomaticLookahead)(i,e,t)},r.prototype.getLaFuncFromCache=function(e){},r.prototype.getLaFuncFromMap=function(e){return this.lookAheadFuncsCache.get(e)},r.prototype.getLaFuncFromObj=function(e){return this.lookAheadFuncsCache[e]},r.prototype.setLaFuncCache=function(e,t){},r.prototype.setLaFuncCacheUsingMap=function(e,t){this.lookAheadFuncsCache.set(e,t)},r.prototype.setLaFuncUsingObj=function(e,t){this.lookAheadFuncsCache[e]=t},r}();hy.LooksAhead=nye});var yq=w(Lo=>{"use strict";Object.defineProperty(Lo,"__esModule",{value:!0});Lo.addNoneTerminalToCst=Lo.addTerminalToCst=Lo.setNodeLocationFull=Lo.setNodeLocationOnlyOffset=void 0;function sye(r,e){isNaN(r.startOffset)===!0?(r.startOffset=e.startOffset,r.endOffset=e.endOffset):r.endOffset<e.endOffset&&(r.endOffset=e.endOffset)}Lo.setNodeLocationOnlyOffset=sye;function oye(r,e){isNaN(r.startOffset)===!0?(r.startOffset=e.startOffset,r.startColumn=e.startColumn,r.startLine=e.startLine,r.endOffset=e.endOffset,r.endColumn=e.endColumn,r.endLine=e.endLine):r.endOffset<e.endOffset&&(r.endOffset=e.endOffset,r.endColumn=e.endColumn,r.endLine=e.endLine)}Lo.setNodeLocationFull=oye;function aye(r,e,t){r.children[t]===void 0?r.children[t]=[e]:r.children[t].push(e)}Lo.addTerminalToCst=aye;function Aye(r,e,t){r.children[e]===void 0?r.children[e]=[t]:r.children[e].push(t)}Lo.addNoneTerminalToCst=Aye});var ox=w(OA=>{"use strict";Object.defineProperty(OA,"__esModule",{value:!0});OA.defineNameProp=OA.functionName=OA.classNameFromInstance=void 0;var lye=Gt();function cye(r){return Bq(r.constructor)}OA.classNameFromInstance=cye;var wq="name";function Bq(r){var e=r.name;return e||"anonymous"}OA.functionName=Bq;function uye(r,e){var t=Object.getOwnPropertyDescriptor(r,wq);return(0,lye.isUndefined)(t)||t.configurable?(Object.defineProperty(r,wq,{enumerable:!1,configurable:!0,writable:!1,value:e}),!0):!1}OA.defineNameProp=uye});var xq=w(Si=>{"use strict";Object.defineProperty(Si,"__esModule",{value:!0});Si.validateRedundantMethods=Si.validateMissingCstMethods=Si.validateVisitor=Si.CstVisitorDefinitionError=Si.createBaseVisitorConstructorWithDefaults=Si.createBaseSemanticVisitorConstructor=Si.defaultVisit=void 0;var fs=Gt(),Rd=ox();function Qq(r,e){for(var t=(0,fs.keys)(r),i=t.length,n=0;n<i;n++)for(var s=t[n],o=r[s],a=o.length,l=0;l<a;l++){var c=o[l];c.tokenTypeIdx===void 0&&this[c.name](c.children,e)}}Si.defaultVisit=Qq;function gye(r,e){var t=function(){};(0,Rd.defineNameProp)(t,r+"BaseSemantics");var i={visit:function(n,s){if((0,fs.isArray)(n)&&(n=n[0]),!(0,fs.isUndefined)(n))return this[n.name](n.children,s)},validateVisitor:function(){var n=bq(this,e);if(!(0,fs.isEmpty)(n)){var s=(0,fs.map)(n,function(o){return o.msg});throw Error("Errors Detected in CST Visitor <"+(0,Rd.functionName)(this.constructor)+`>:
-	`+(""+s.join(`
-
-`).replace(/\n/g,`
-	`)))}}};return t.prototype=i,t.prototype.constructor=t,t._RULE_NAMES=e,t}Si.createBaseSemanticVisitorConstructor=gye;function fye(r,e,t){var i=function(){};(0,Rd.defineNameProp)(i,r+"BaseSemanticsWithDefaults");var n=Object.create(t.prototype);return(0,fs.forEach)(e,function(s){n[s]=Qq}),i.prototype=n,i.prototype.constructor=i,i}Si.createBaseVisitorConstructorWithDefaults=fye;var ax;(function(r){r[r.REDUNDANT_METHOD=0]="REDUNDANT_METHOD",r[r.MISSING_METHOD=1]="MISSING_METHOD"})(ax=Si.CstVisitorDefinitionError||(Si.CstVisitorDefinitionError={}));function bq(r,e){var t=Sq(r,e),i=vq(r,e);return t.concat(i)}Si.validateVisitor=bq;function Sq(r,e){var t=(0,fs.map)(e,function(i){if(!(0,fs.isFunction)(r[i]))return{msg:"Missing visitor method: <"+i+"> on "+(0,Rd.functionName)(r.constructor)+" CST Visitor.",type:ax.MISSING_METHOD,methodName:i}});return(0,fs.compact)(t)}Si.validateMissingCstMethods=Sq;var hye=["constructor","visit","validateVisitor"];function vq(r,e){var t=[];for(var i in r)(0,fs.isFunction)(r[i])&&!(0,fs.contains)(hye,i)&&!(0,fs.contains)(e,i)&&t.push({msg:"Redundant visitor method: <"+i+"> on "+(0,Rd.functionName)(r.constructor)+` CST Visitor
-There is no Grammar Rule corresponding to this method's name.
-`,type:ax.REDUNDANT_METHOD,methodName:i});return t}Si.validateRedundantMethods=vq});var Dq=w(py=>{"use strict";Object.defineProperty(py,"__esModule",{value:!0});py.TreeBuilder=void 0;var tf=yq(),_r=Gt(),Pq=xq(),pye=Gn(),dye=function(){function r(){}return r.prototype.initTreeBuilder=function(e){if(this.CST_STACK=[],this.outputCst=e.outputCst,this.nodeLocationTracking=(0,_r.has)(e,"nodeLocationTracking")?e.nodeLocationTracking:pye.DEFAULT_PARSER_CONFIG.nodeLocationTracking,!this.outputCst)this.cstInvocationStateUpdate=_r.NOOP,this.cstFinallyStateUpdate=_r.NOOP,this.cstPostTerminal=_r.NOOP,this.cstPostNonTerminal=_r.NOOP,this.cstPostRule=_r.NOOP;else if(/full/i.test(this.nodeLocationTracking))this.recoveryEnabled?(this.setNodeLocationFromToken=tf.setNodeLocationFull,this.setNodeLocationFromNode=tf.setNodeLocationFull,this.cstPostRule=_r.NOOP,this.setInitialNodeLocation=this.setInitialNodeLocationFullRecovery):(this.setNodeLocationFromToken=_r.NOOP,this.setNodeLocationFromNode=_r.NOOP,this.cstPostRule=this.cstPostRuleFull,this.setInitialNodeLocation=this.setInitialNodeLocationFullRegular);else if(/onlyOffset/i.test(this.nodeLocationTracking))this.recoveryEnabled?(this.setNodeLocationFromToken=tf.setNodeLocationOnlyOffset,this.setNodeLocationFromNode=tf.setNodeLocationOnlyOffset,this.cstPostRule=_r.NOOP,this.setInitialNodeLocation=this.setInitialNodeLocationOnlyOffsetRecovery):(this.setNodeLocationFromToken=_r.NOOP,this.setNodeLocationFromNode=_r.NOOP,this.cstPostRule=this.cstPostRuleOnlyOffset,this.setInitialNodeLocation=this.setInitialNodeLocationOnlyOffsetRegular);else if(/none/i.test(this.nodeLocationTracking))this.setNodeLocationFromToken=_r.NOOP,this.setNodeLocationFromNode=_r.NOOP,this.cstPostRule=_r.NOOP,this.setInitialNodeLocation=_r.NOOP;else throw Error('Invalid <nodeLocationTracking> config option: "'+e.nodeLocationTracking+'"')},r.prototype.setInitialNodeLocationOnlyOffsetRecovery=function(e){e.location={startOffset:NaN,endOffset:NaN}},r.prototype.setInitialNodeLocationOnlyOffsetRegular=function(e){e.location={startOffset:this.LA(1).startOffset,endOffset:NaN}},r.prototype.setInitialNodeLocationFullRecovery=function(e){e.location={startOffset:NaN,startLine:NaN,startColumn:NaN,endOffset:NaN,endLine:NaN,endColumn:NaN}},r.prototype.setInitialNodeLocationFullRegular=function(e){var t=this.LA(1);e.location={startOffset:t.startOffset,startLine:t.startLine,startColumn:t.startColumn,endOffset:NaN,endLine:NaN,endColumn:NaN}},r.prototype.cstInvocationStateUpdate=function(e,t){var i={name:e,children:{}};this.setInitialNodeLocation(i),this.CST_STACK.push(i)},r.prototype.cstFinallyStateUpdate=function(){this.CST_STACK.pop()},r.prototype.cstPostRuleFull=function(e){var t=this.LA(0),i=e.location;i.startOffset<=t.startOffset?(i.endOffset=t.endOffset,i.endLine=t.endLine,i.endColumn=t.endColumn):(i.startOffset=NaN,i.startLine=NaN,i.startColumn=NaN)},r.prototype.cstPostRuleOnlyOffset=function(e){var t=this.LA(0),i=e.location;i.startOffset<=t.startOffset?i.endOffset=t.endOffset:i.startOffset=NaN},r.prototype.cstPostTerminal=function(e,t){var i=this.CST_STACK[this.CST_STACK.length-1];(0,tf.addTerminalToCst)(i,t,e),this.setNodeLocationFromToken(i.location,t)},r.prototype.cstPostNonTerminal=function(e,t){var i=this.CST_STACK[this.CST_STACK.length-1];(0,tf.addNoneTerminalToCst)(i,t,e),this.setNodeLocationFromNode(i.location,e.location)},r.prototype.getBaseCstVisitorConstructor=function(){if((0,_r.isUndefined)(this.baseCstVisitorConstructor)){var e=(0,Pq.createBaseSemanticVisitorConstructor)(this.className,(0,_r.keys)(this.gastProductionsCache));return this.baseCstVisitorConstructor=e,e}return this.baseCstVisitorConstructor},r.prototype.getBaseCstVisitorConstructorWithDefaults=function(){if((0,_r.isUndefined)(this.baseCstVisitorWithDefaultsConstructor)){var e=(0,Pq.createBaseVisitorConstructorWithDefaults)(this.className,(0,_r.keys)(this.gastProductionsCache),this.getBaseCstVisitorConstructor());return this.baseCstVisitorWithDefaultsConstructor=e,e}return this.baseCstVisitorWithDefaultsConstructor},r.prototype.getLastExplicitRuleShortName=function(){var e=this.RULE_STACK;return e[e.length-1]},r.prototype.getPreviousExplicitRuleShortName=function(){var e=this.RULE_STACK;return e[e.length-2]},r.prototype.getLastExplicitRuleOccurrenceIndex=function(){var e=this.RULE_OCCURRENCE_STACK;return e[e.length-1]},r}();py.TreeBuilder=dye});var Rq=w(dy=>{"use strict";Object.defineProperty(dy,"__esModule",{value:!0});dy.LexerAdapter=void 0;var kq=Gn(),Cye=function(){function r(){}return r.prototype.initLexerAdapter=function(){this.tokVector=[],this.tokVectorLength=0,this.currIdx=-1},Object.defineProperty(r.prototype,"input",{get:function(){return this.tokVector},set:function(e){if(this.selfAnalysisDone!==!0)throw Error("Missing <performSelfAnalysis> invocation at the end of the Parser's constructor.");this.reset(),this.tokVector=e,this.tokVectorLength=e.length},enumerable:!1,configurable:!0}),r.prototype.SKIP_TOKEN=function(){return this.currIdx<=this.tokVector.length-2?(this.consumeToken(),this.LA(1)):kq.END_OF_FILE},r.prototype.LA=function(e){var t=this.currIdx+e;return t<0||this.tokVectorLength<=t?kq.END_OF_FILE:this.tokVector[t]},r.prototype.consumeToken=function(){this.currIdx++},r.prototype.exportLexerState=function(){return this.currIdx},r.prototype.importLexerState=function(e){this.currIdx=e},r.prototype.resetLexerState=function(){this.currIdx=-1},r.prototype.moveToTerminatedState=function(){this.currIdx=this.tokVector.length-1},r.prototype.getLexerPosition=function(){return this.exportLexerState()},r}();dy.LexerAdapter=Cye});var Nq=w(Cy=>{"use strict";Object.defineProperty(Cy,"__esModule",{value:!0});Cy.RecognizerApi=void 0;var Fq=Gt(),mye=ef(),Ax=Gn(),Eye=Sd(),Iye=rx(),yye=dn(),wye=function(){function r(){}return r.prototype.ACTION=function(e){return e.call(this)},r.prototype.consume=function(e,t,i){return this.consumeInternal(t,e,i)},r.prototype.subrule=function(e,t,i){return this.subruleInternal(t,e,i)},r.prototype.option=function(e,t){return this.optionInternal(t,e)},r.prototype.or=function(e,t){return this.orInternal(t,e)},r.prototype.many=function(e,t){return this.manyInternal(e,t)},r.prototype.atLeastOne=function(e,t){return this.atLeastOneInternal(e,t)},r.prototype.CONSUME=function(e,t){return this.consumeInternal(e,0,t)},r.prototype.CONSUME1=function(e,t){return this.consumeInternal(e,1,t)},r.prototype.CONSUME2=function(e,t){return this.consumeInternal(e,2,t)},r.prototype.CONSUME3=function(e,t){return this.consumeInternal(e,3,t)},r.prototype.CONSUME4=function(e,t){return this.consumeInternal(e,4,t)},r.prototype.CONSUME5=function(e,t){return this.consumeInternal(e,5,t)},r.prototype.CONSUME6=function(e,t){return this.consumeInternal(e,6,t)},r.prototype.CONSUME7=function(e,t){return this.consumeInternal(e,7,t)},r.prototype.CONSUME8=function(e,t){return this.consumeInternal(e,8,t)},r.prototype.CONSUME9=function(e,t){return this.consumeInternal(e,9,t)},r.prototype.SUBRULE=function(e,t){return this.subruleInternal(e,0,t)},r.prototype.SUBRULE1=function(e,t){return this.subruleInternal(e,1,t)},r.prototype.SUBRULE2=function(e,t){return this.subruleInternal(e,2,t)},r.prototype.SUBRULE3=function(e,t){return this.subruleInternal(e,3,t)},r.prototype.SUBRULE4=function(e,t){return this.subruleInternal(e,4,t)},r.prototype.SUBRULE5=function(e,t){return this.subruleInternal(e,5,t)},r.prototype.SUBRULE6=function(e,t){return this.subruleInternal(e,6,t)},r.prototype.SUBRULE7=function(e,t){return this.subruleInternal(e,7,t)},r.prototype.SUBRULE8=function(e,t){return this.subruleInternal(e,8,t)},r.prototype.SUBRULE9=function(e,t){return this.subruleInternal(e,9,t)},r.prototype.OPTION=function(e){return this.optionInternal(e,0)},r.prototype.OPTION1=function(e){return this.optionInternal(e,1)},r.prototype.OPTION2=function(e){return this.optionInternal(e,2)},r.prototype.OPTION3=function(e){return this.optionInternal(e,3)},r.prototype.OPTION4=function(e){return this.optionInternal(e,4)},r.prototype.OPTION5=function(e){return this.optionInternal(e,5)},r.prototype.OPTION6=function(e){return this.optionInternal(e,6)},r.prototype.OPTION7=function(e){return this.optionInternal(e,7)},r.prototype.OPTION8=function(e){return this.optionInternal(e,8)},r.prototype.OPTION9=function(e){return this.optionInternal(e,9)},r.prototype.OR=function(e){return this.orInternal(e,0)},r.prototype.OR1=function(e){return this.orInternal(e,1)},r.prototype.OR2=function(e){return this.orInternal(e,2)},r.prototype.OR3=function(e){return this.orInternal(e,3)},r.prototype.OR4=function(e){return this.orInternal(e,4)},r.prototype.OR5=function(e){return this.orInternal(e,5)},r.prototype.OR6=function(e){return this.orInternal(e,6)},r.prototype.OR7=function(e){return this.orInternal(e,7)},r.prototype.OR8=function(e){return this.orInternal(e,8)},r.prototype.OR9=function(e){return this.orInternal(e,9)},r.prototype.MANY=function(e){this.manyInternal(0,e)},r.prototype.MANY1=function(e){this.manyInternal(1,e)},r.prototype.MANY2=function(e){this.manyInternal(2,e)},r.prototype.MANY3=function(e){this.manyInternal(3,e)},r.prototype.MANY4=function(e){this.manyInternal(4,e)},r.prototype.MANY5=function(e){this.manyInternal(5,e)},r.prototype.MANY6=function(e){this.manyInternal(6,e)},r.prototype.MANY7=function(e){this.manyInternal(7,e)},r.prototype.MANY8=function(e){this.manyInternal(8,e)},r.prototype.MANY9=function(e){this.manyInternal(9,e)},r.prototype.MANY_SEP=function(e){this.manySepFirstInternal(0,e)},r.prototype.MANY_SEP1=function(e){this.manySepFirstInternal(1,e)},r.prototype.MANY_SEP2=function(e){this.manySepFirstInternal(2,e)},r.prototype.MANY_SEP3=function(e){this.manySepFirstInternal(3,e)},r.prototype.MANY_SEP4=function(e){this.manySepFirstInternal(4,e)},r.prototype.MANY_SEP5=function(e){this.manySepFirstInternal(5,e)},r.prototype.MANY_SEP6=function(e){this.manySepFirstInternal(6,e)},r.prototype.MANY_SEP7=function(e){this.manySepFirstInternal(7,e)},r.prototype.MANY_SEP8=function(e){this.manySepFirstInternal(8,e)},r.prototype.MANY_SEP9=function(e){this.manySepFirstInternal(9,e)},r.prototype.AT_LEAST_ONE=function(e){this.atLeastOneInternal(0,e)},r.prototype.AT_LEAST_ONE1=function(e){return this.atLeastOneInternal(1,e)},r.prototype.AT_LEAST_ONE2=function(e){this.atLeastOneInternal(2,e)},r.prototype.AT_LEAST_ONE3=function(e){this.atLeastOneInternal(3,e)},r.prototype.AT_LEAST_ONE4=function(e){this.atLeastOneInternal(4,e)},r.prototype.AT_LEAST_ONE5=function(e){this.atLeastOneInternal(5,e)},r.prototype.AT_LEAST_ONE6=function(e){this.atLeastOneInternal(6,e)},r.prototype.AT_LEAST_ONE7=function(e){this.atLeastOneInternal(7,e)},r.prototype.AT_LEAST_ONE8=function(e){this.atLeastOneInternal(8,e)},r.prototype.AT_LEAST_ONE9=function(e){this.atLeastOneInternal(9,e)},r.prototype.AT_LEAST_ONE_SEP=function(e){this.atLeastOneSepFirstInternal(0,e)},r.prototype.AT_LEAST_ONE_SEP1=function(e){this.atLeastOneSepFirstInternal(1,e)},r.prototype.AT_LEAST_ONE_SEP2=function(e){this.atLeastOneSepFirstInternal(2,e)},r.prototype.AT_LEAST_ONE_SEP3=function(e){this.atLeastOneSepFirstInternal(3,e)},r.prototype.AT_LEAST_ONE_SEP4=function(e){this.atLeastOneSepFirstInternal(4,e)},r.prototype.AT_LEAST_ONE_SEP5=function(e){this.atLeastOneSepFirstInternal(5,e)},r.prototype.AT_LEAST_ONE_SEP6=function(e){this.atLeastOneSepFirstInternal(6,e)},r.prototype.AT_LEAST_ONE_SEP7=function(e){this.atLeastOneSepFirstInternal(7,e)},r.prototype.AT_LEAST_ONE_SEP8=function(e){this.atLeastOneSepFirstInternal(8,e)},r.prototype.AT_LEAST_ONE_SEP9=function(e){this.atLeastOneSepFirstInternal(9,e)},r.prototype.RULE=function(e,t,i){if(i===void 0&&(i=Ax.DEFAULT_RULE_CONFIG),(0,Fq.contains)(this.definedRulesNames,e)){var n=Eye.defaultGrammarValidatorErrorProvider.buildDuplicateRuleNameError({topLevelRule:e,grammarName:this.className}),s={message:n,type:Ax.ParserDefinitionErrorType.DUPLICATE_RULE_NAME,ruleName:e};this.definitionErrors.push(s)}this.definedRulesNames.push(e);var o=this.defineRule(e,t,i);return this[e]=o,o},r.prototype.OVERRIDE_RULE=function(e,t,i){i===void 0&&(i=Ax.DEFAULT_RULE_CONFIG);var n=[];n=n.concat((0,Iye.validateRuleIsOverridden)(e,this.definedRulesNames,this.className)),this.definitionErrors=this.definitionErrors.concat(n);var s=this.defineRule(e,t,i);return this[e]=s,s},r.prototype.BACKTRACK=function(e,t){return function(){this.isBackTrackingStack.push(1);var i=this.saveRecogState();try{return e.apply(this,t),!0}catch(n){if((0,mye.isRecognitionException)(n))return!1;throw n}finally{this.reloadRecogState(i),this.isBackTrackingStack.pop()}}},r.prototype.getGAstProductions=function(){return this.gastProductionsCache},r.prototype.getSerializedGastProductions=function(){return(0,yye.serializeGrammar)((0,Fq.values)(this.gastProductionsCache))},r}();Cy.RecognizerApi=wye});var Mq=w(Ey=>{"use strict";Object.defineProperty(Ey,"__esModule",{value:!0});Ey.RecognizerEngine=void 0;var Pr=Gt(),Yn=fy(),my=ef(),Lq=Pd(),rf=xd(),Tq=Gn(),Bye=sx(),Oq=NA(),Fd=Vg(),Qye=ox(),bye=function(){function r(){}return r.prototype.initRecognizerEngine=function(e,t){if(this.className=(0,Qye.classNameFromInstance)(this),this.shortRuleNameToFull={},this.fullRuleNameToShort={},this.ruleShortNameIdx=256,this.tokenMatcher=Fd.tokenStructuredMatcherNoCategories,this.definedRulesNames=[],this.tokensMap={},this.isBackTrackingStack=[],this.RULE_STACK=[],this.RULE_OCCURRENCE_STACK=[],this.gastProductionsCache={},(0,Pr.has)(t,"serializedGrammar"))throw Error(`The Parser's configuration can no longer contain a <serializedGrammar> property.
-	See: https://chevrotain.io/docs/changes/BREAKING_CHANGES.html#_6-0-0
-	For Further details.`);if((0,Pr.isArray)(e)){if((0,Pr.isEmpty)(e))throw Error(`A Token Vocabulary cannot be empty.
-	Note that the first argument for the parser constructor
-	is no longer a Token vector (since v4.0).`);if(typeof e[0].startOffset=="number")throw Error(`The Parser constructor no longer accepts a token vector as the first argument.
-	See: https://chevrotain.io/docs/changes/BREAKING_CHANGES.html#_4-0-0
-	For Further details.`)}if((0,Pr.isArray)(e))this.tokensMap=(0,Pr.reduce)(e,function(o,a){return o[a.name]=a,o},{});else if((0,Pr.has)(e,"modes")&&(0,Pr.every)((0,Pr.flatten)((0,Pr.values)(e.modes)),Fd.isTokenType)){var i=(0,Pr.flatten)((0,Pr.values)(e.modes)),n=(0,Pr.uniq)(i);this.tokensMap=(0,Pr.reduce)(n,function(o,a){return o[a.name]=a,o},{})}else if((0,Pr.isObject)(e))this.tokensMap=(0,Pr.cloneObj)(e);else throw new Error("<tokensDictionary> argument must be An Array of Token constructors, A dictionary of Token constructors or an IMultiModeLexerDefinition");this.tokensMap.EOF=Oq.EOF;var s=(0,Pr.every)((0,Pr.values)(e),function(o){return(0,Pr.isEmpty)(o.categoryMatches)});this.tokenMatcher=s?Fd.tokenStructuredMatcherNoCategories:Fd.tokenStructuredMatcher,(0,Fd.augmentTokenTypes)((0,Pr.values)(this.tokensMap))},r.prototype.defineRule=function(e,t,i){if(this.selfAnalysisDone)throw Error("Grammar rule <"+e+`> may not be defined after the 'performSelfAnalysis' method has been called'
-Make sure that all grammar rule definitions are done before 'performSelfAnalysis' is called.`);var n=(0,Pr.has)(i,"resyncEnabled")?i.resyncEnabled:Tq.DEFAULT_RULE_CONFIG.resyncEnabled,s=(0,Pr.has)(i,"recoveryValueFunc")?i.recoveryValueFunc:Tq.DEFAULT_RULE_CONFIG.recoveryValueFunc,o=this.ruleShortNameIdx<<Yn.BITS_FOR_METHOD_TYPE+Yn.BITS_FOR_OCCURRENCE_IDX;this.ruleShortNameIdx++,this.shortRuleNameToFull[o]=e,this.fullRuleNameToShort[e]=o;function a(u){try{if(this.outputCst===!0){t.apply(this,u);var g=this.CST_STACK[this.CST_STACK.length-1];return this.cstPostRule(g),g}else return t.apply(this,u)}catch(f){return this.invokeRuleCatch(f,n,s)}finally{this.ruleFinallyStateUpdate()}}var l=function(u,g){return u===void 0&&(u=0),this.ruleInvocationStateUpdate(o,e,u),a.call(this,g)},c="ruleName";return l[c]=e,l.originalGrammarAction=t,l},r.prototype.invokeRuleCatch=function(e,t,i){var n=this.RULE_STACK.length===1,s=t&&!this.isBackTracking()&&this.recoveryEnabled;if((0,my.isRecognitionException)(e)){var o=e;if(s){var a=this.findReSyncTokenType();if(this.isInCurrentRuleReSyncSet(a))if(o.resyncedTokens=this.reSyncTo(a),this.outputCst){var l=this.CST_STACK[this.CST_STACK.length-1];return l.recoveredNode=!0,l}else return i();else{if(this.outputCst){var l=this.CST_STACK[this.CST_STACK.length-1];l.recoveredNode=!0,o.partialCstResult=l}throw o}}else{if(n)return this.moveToTerminatedState(),i();throw o}}else throw e},r.prototype.optionInternal=function(e,t){var i=this.getKeyForAutomaticLookahead(Yn.OPTION_IDX,t);return this.optionInternalLogic(e,t,i)},r.prototype.optionInternalLogic=function(e,t,i){var n=this,s=this.getLaFuncFromCache(i),o,a;if(e.DEF!==void 0){if(o=e.DEF,a=e.GATE,a!==void 0){var l=s;s=function(){return a.call(n)&&l.call(n)}}}else o=e;if(s.call(this)===!0)return o.call(this)},r.prototype.atLeastOneInternal=function(e,t){var i=this.getKeyForAutomaticLookahead(Yn.AT_LEAST_ONE_IDX,e);return this.atLeastOneInternalLogic(e,t,i)},r.prototype.atLeastOneInternalLogic=function(e,t,i){var n=this,s=this.getLaFuncFromCache(i),o,a;if(t.DEF!==void 0){if(o=t.DEF,a=t.GATE,a!==void 0){var l=s;s=function(){return a.call(n)&&l.call(n)}}}else o=t;if(s.call(this)===!0)for(var c=this.doSingleRepetition(o);s.call(this)===!0&&c===!0;)c=this.doSingleRepetition(o);else throw this.raiseEarlyExitException(e,Lq.PROD_TYPE.REPETITION_MANDATORY,t.ERR_MSG);this.attemptInRepetitionRecovery(this.atLeastOneInternal,[e,t],s,Yn.AT_LEAST_ONE_IDX,e,rf.NextTerminalAfterAtLeastOneWalker)},r.prototype.atLeastOneSepFirstInternal=function(e,t){var i=this.getKeyForAutomaticLookahead(Yn.AT_LEAST_ONE_SEP_IDX,e);this.atLeastOneSepFirstInternalLogic(e,t,i)},r.prototype.atLeastOneSepFirstInternalLogic=function(e,t,i){var n=this,s=t.DEF,o=t.SEP,a=this.getLaFuncFromCache(i);if(a.call(this)===!0){s.call(this);for(var l=function(){return n.tokenMatcher(n.LA(1),o)};this.tokenMatcher(this.LA(1),o)===!0;)this.CONSUME(o),s.call(this);this.attemptInRepetitionRecovery(this.repetitionSepSecondInternal,[e,o,l,s,rf.NextTerminalAfterAtLeastOneSepWalker],l,Yn.AT_LEAST_ONE_SEP_IDX,e,rf.NextTerminalAfterAtLeastOneSepWalker)}else throw this.raiseEarlyExitException(e,Lq.PROD_TYPE.REPETITION_MANDATORY_WITH_SEPARATOR,t.ERR_MSG)},r.prototype.manyInternal=function(e,t){var i=this.getKeyForAutomaticLookahead(Yn.MANY_IDX,e);return this.manyInternalLogic(e,t,i)},r.prototype.manyInternalLogic=function(e,t,i){var n=this,s=this.getLaFuncFromCache(i),o,a;if(t.DEF!==void 0){if(o=t.DEF,a=t.GATE,a!==void 0){var l=s;s=function(){return a.call(n)&&l.call(n)}}}else o=t;for(var c=!0;s.call(this)===!0&&c===!0;)c=this.doSingleRepetition(o);this.attemptInRepetitionRecovery(this.manyInternal,[e,t],s,Yn.MANY_IDX,e,rf.NextTerminalAfterManyWalker,c)},r.prototype.manySepFirstInternal=function(e,t){var i=this.getKeyForAutomaticLookahead(Yn.MANY_SEP_IDX,e);this.manySepFirstInternalLogic(e,t,i)},r.prototype.manySepFirstInternalLogic=function(e,t,i){var n=this,s=t.DEF,o=t.SEP,a=this.getLaFuncFromCache(i);if(a.call(this)===!0){s.call(this);for(var l=function(){return n.tokenMatcher(n.LA(1),o)};this.tokenMatcher(this.LA(1),o)===!0;)this.CONSUME(o),s.call(this);this.attemptInRepetitionRecovery(this.repetitionSepSecondInternal,[e,o,l,s,rf.NextTerminalAfterManySepWalker],l,Yn.MANY_SEP_IDX,e,rf.NextTerminalAfterManySepWalker)}},r.prototype.repetitionSepSecondInternal=function(e,t,i,n,s){for(;i();)this.CONSUME(t),n.call(this);this.attemptInRepetitionRecovery(this.repetitionSepSecondInternal,[e,t,i,n,s],i,Yn.AT_LEAST_ONE_SEP_IDX,e,s)},r.prototype.doSingleRepetition=function(e){var t=this.getLexerPosition();e.call(this);var i=this.getLexerPosition();return i>t},r.prototype.orInternal=function(e,t){var i=this.getKeyForAutomaticLookahead(Yn.OR_IDX,t),n=(0,Pr.isArray)(e)?e:e.DEF,s=this.getLaFuncFromCache(i),o=s.call(this,n);if(o!==void 0){var a=n[o];return a.ALT.call(this)}this.raiseNoAltException(t,e.ERR_MSG)},r.prototype.ruleFinallyStateUpdate=function(){if(this.RULE_STACK.pop(),this.RULE_OCCURRENCE_STACK.pop(),this.cstFinallyStateUpdate(),this.RULE_STACK.length===0&&this.isAtEndOfInput()===!1){var e=this.LA(1),t=this.errorMessageProvider.buildNotAllInputParsedMessage({firstRedundant:e,ruleName:this.getCurrRuleFullName()});this.SAVE_ERROR(new my.NotAllInputParsedException(t,e))}},r.prototype.subruleInternal=function(e,t,i){var n;try{var s=i!==void 0?i.ARGS:void 0;return n=e.call(this,t,s),this.cstPostNonTerminal(n,i!==void 0&&i.LABEL!==void 0?i.LABEL:e.ruleName),n}catch(o){this.subruleInternalError(o,i,e.ruleName)}},r.prototype.subruleInternalError=function(e,t,i){throw(0,my.isRecognitionException)(e)&&e.partialCstResult!==void 0&&(this.cstPostNonTerminal(e.partialCstResult,t!==void 0&&t.LABEL!==void 0?t.LABEL:i),delete e.partialCstResult),e},r.prototype.consumeInternal=function(e,t,i){var n;try{var s=this.LA(1);this.tokenMatcher(s,e)===!0?(this.consumeToken(),n=s):this.consumeInternalError(e,s,i)}catch(o){n=this.consumeInternalRecovery(e,t,o)}return this.cstPostTerminal(i!==void 0&&i.LABEL!==void 0?i.LABEL:e.name,n),n},r.prototype.consumeInternalError=function(e,t,i){var n,s=this.LA(0);throw i!==void 0&&i.ERR_MSG?n=i.ERR_MSG:n=this.errorMessageProvider.buildMismatchTokenMessage({expected:e,actual:t,previous:s,ruleName:this.getCurrRuleFullName()}),this.SAVE_ERROR(new my.MismatchedTokenException(n,t,s))},r.prototype.consumeInternalRecovery=function(e,t,i){if(this.recoveryEnabled&&i.name==="MismatchedTokenException"&&!this.isBackTracking()){var n=this.getFollowsForInRuleRecovery(e,t);try{return this.tryInRuleRecovery(e,n)}catch(s){throw s.name===Bye.IN_RULE_RECOVERY_EXCEPTION?i:s}}else throw i},r.prototype.saveRecogState=function(){var e=this.errors,t=(0,Pr.cloneArr)(this.RULE_STACK);return{errors:e,lexerState:this.exportLexerState(),RULE_STACK:t,CST_STACK:this.CST_STACK}},r.prototype.reloadRecogState=function(e){this.errors=e.errors,this.importLexerState(e.lexerState),this.RULE_STACK=e.RULE_STACK},r.prototype.ruleInvocationStateUpdate=function(e,t,i){this.RULE_OCCURRENCE_STACK.push(i),this.RULE_STACK.push(e),this.cstInvocationStateUpdate(t,e)},r.prototype.isBackTracking=function(){return this.isBackTrackingStack.length!==0},r.prototype.getCurrRuleFullName=function(){var e=this.getLastExplicitRuleShortName();return this.shortRuleNameToFull[e]},r.prototype.shortRuleNameToFullName=function(e){return this.shortRuleNameToFull[e]},r.prototype.isAtEndOfInput=function(){return this.tokenMatcher(this.LA(1),Oq.EOF)},r.prototype.reset=function(){this.resetLexerState(),this.isBackTrackingStack=[],this.errors=[],this.RULE_STACK=[],this.CST_STACK=[],this.RULE_OCCURRENCE_STACK=[]},r}();Ey.RecognizerEngine=bye});var Uq=w(Iy=>{"use strict";Object.defineProperty(Iy,"__esModule",{value:!0});Iy.ErrorHandler=void 0;var lx=ef(),cx=Gt(),Kq=Pd(),Sye=Gn(),vye=function(){function r(){}return r.prototype.initErrorHandler=function(e){this._errors=[],this.errorMessageProvider=(0,cx.has)(e,"errorMessageProvider")?e.errorMessageProvider:Sye.DEFAULT_PARSER_CONFIG.errorMessageProvider},r.prototype.SAVE_ERROR=function(e){if((0,lx.isRecognitionException)(e))return e.context={ruleStack:this.getHumanReadableRuleStack(),ruleOccurrenceStack:(0,cx.cloneArr)(this.RULE_OCCURRENCE_STACK)},this._errors.push(e),e;throw Error("Trying to save an Error which is not a RecognitionException")},Object.defineProperty(r.prototype,"errors",{get:function(){return(0,cx.cloneArr)(this._errors)},set:function(e){this._errors=e},enumerable:!1,configurable:!0}),r.prototype.raiseEarlyExitException=function(e,t,i){for(var n=this.getCurrRuleFullName(),s=this.getGAstProductions()[n],o=(0,Kq.getLookaheadPathsForOptionalProd)(e,s,t,this.maxLookahead),a=o[0],l=[],c=1;c<=this.maxLookahead;c++)l.push(this.LA(c));var u=this.errorMessageProvider.buildEarlyExitMessage({expectedIterationPaths:a,actual:l,previous:this.LA(0),customUserDescription:i,ruleName:n});throw this.SAVE_ERROR(new lx.EarlyExitException(u,this.LA(1),this.LA(0)))},r.prototype.raiseNoAltException=function(e,t){for(var i=this.getCurrRuleFullName(),n=this.getGAstProductions()[i],s=(0,Kq.getLookaheadPathsForOr)(e,n,this.maxLookahead),o=[],a=1;a<=this.maxLookahead;a++)o.push(this.LA(a));var l=this.LA(0),c=this.errorMessageProvider.buildNoViableAltMessage({expectedPathsPerAlt:s,actual:o,previous:l,customUserDescription:t,ruleName:this.getCurrRuleFullName()});throw this.SAVE_ERROR(new lx.NoViableAltException(c,this.LA(1),l))},r}();Iy.ErrorHandler=vye});var Yq=w(yy=>{"use strict";Object.defineProperty(yy,"__esModule",{value:!0});yy.ContentAssist=void 0;var Hq=xd(),Gq=Gt(),xye=function(){function r(){}return r.prototype.initContentAssist=function(){},r.prototype.computeContentAssist=function(e,t){var i=this.gastProductionsCache[e];if((0,Gq.isUndefined)(i))throw Error("Rule ->"+e+"<- does not exist in this grammar.");return(0,Hq.nextPossibleTokensAfter)([i],t,this.tokenMatcher,this.maxLookahead)},r.prototype.getNextPossibleTokenTypes=function(e){var t=(0,Gq.first)(e.ruleStack),i=this.getGAstProductions(),n=i[t],s=new Hq.NextAfterTokenWalker(n,e).startWalking();return s},r}();yy.ContentAssist=xye});var Zq=w(Qy=>{"use strict";Object.defineProperty(Qy,"__esModule",{value:!0});Qy.GastRecorder=void 0;var En=Gt(),To=dn(),Pye=yd(),Wq=Vg(),zq=NA(),Dye=Gn(),kye=fy(),By={description:"This Object indicates the Parser is during Recording Phase"};Object.freeze(By);var jq=!0,qq=Math.pow(2,kye.BITS_FOR_OCCURRENCE_IDX)-1,Vq=(0,zq.createToken)({name:"RECORDING_PHASE_TOKEN",pattern:Pye.Lexer.NA});(0,Wq.augmentTokenTypes)([Vq]);var Xq=(0,zq.createTokenInstance)(Vq,`This IToken indicates the Parser is in Recording Phase
-	See: https://chevrotain.io/docs/guide/internals.html#grammar-recording for details`,-1,-1,-1,-1,-1,-1);Object.freeze(Xq);var Rye={name:`This CSTNode indicates the Parser is in Recording Phase
-	See: https://chevrotain.io/docs/guide/internals.html#grammar-recording for details`,children:{}},Fye=function(){function r(){}return r.prototype.initGastRecorder=function(e){this.recordingProdStack=[],this.RECORDING_PHASE=!1},r.prototype.enableRecording=function(){var e=this;this.RECORDING_PHASE=!0,this.TRACE_INIT("Enable Recording",function(){for(var t=function(n){var s=n>0?n:"";e["CONSUME"+s]=function(o,a){return this.consumeInternalRecord(o,n,a)},e["SUBRULE"+s]=function(o,a){return this.subruleInternalRecord(o,n,a)},e["OPTION"+s]=function(o){return this.optionInternalRecord(o,n)},e["OR"+s]=function(o){return this.orInternalRecord(o,n)},e["MANY"+s]=function(o){this.manyInternalRecord(n,o)},e["MANY_SEP"+s]=function(o){this.manySepFirstInternalRecord(n,o)},e["AT_LEAST_ONE"+s]=function(o){this.atLeastOneInternalRecord(n,o)},e["AT_LEAST_ONE_SEP"+s]=function(o){this.atLeastOneSepFirstInternalRecord(n,o)}},i=0;i<10;i++)t(i);e.consume=function(n,s,o){return this.consumeInternalRecord(s,n,o)},e.subrule=function(n,s,o){return this.subruleInternalRecord(s,n,o)},e.option=function(n,s){return this.optionInternalRecord(s,n)},e.or=function(n,s){return this.orInternalRecord(s,n)},e.many=function(n,s){this.manyInternalRecord(n,s)},e.atLeastOne=function(n,s){this.atLeastOneInternalRecord(n,s)},e.ACTION=e.ACTION_RECORD,e.BACKTRACK=e.BACKTRACK_RECORD,e.LA=e.LA_RECORD})},r.prototype.disableRecording=function(){var e=this;this.RECORDING_PHASE=!1,this.TRACE_INIT("Deleting Recording methods",function(){for(var t=0;t<10;t++){var i=t>0?t:"";delete e["CONSUME"+i],delete e["SUBRULE"+i],delete e["OPTION"+i],delete e["OR"+i],delete e["MANY"+i],delete e["MANY_SEP"+i],delete e["AT_LEAST_ONE"+i],delete e["AT_LEAST_ONE_SEP"+i]}delete e.consume,delete e.subrule,delete e.option,delete e.or,delete e.many,delete e.atLeastOne,delete e.ACTION,delete e.BACKTRACK,delete e.LA})},r.prototype.ACTION_RECORD=function(e){},r.prototype.BACKTRACK_RECORD=function(e,t){return function(){return!0}},r.prototype.LA_RECORD=function(e){return Dye.END_OF_FILE},r.prototype.topLevelRuleRecord=function(e,t){try{var i=new To.Rule({definition:[],name:e});return i.name=e,this.recordingProdStack.push(i),t.call(this),this.recordingProdStack.pop(),i}catch(n){if(n.KNOWN_RECORDER_ERROR!==!0)try{n.message=n.message+`
-	 This error was thrown during the "grammar recording phase" For more info see:
-	https://chevrotain.io/docs/guide/internals.html#grammar-recording`}catch{throw n}throw n}},r.prototype.optionInternalRecord=function(e,t){return Nd.call(this,To.Option,e,t)},r.prototype.atLeastOneInternalRecord=function(e,t){Nd.call(this,To.RepetitionMandatory,t,e)},r.prototype.atLeastOneSepFirstInternalRecord=function(e,t){Nd.call(this,To.RepetitionMandatoryWithSeparator,t,e,jq)},r.prototype.manyInternalRecord=function(e,t){Nd.call(this,To.Repetition,t,e)},r.prototype.manySepFirstInternalRecord=function(e,t){Nd.call(this,To.RepetitionWithSeparator,t,e,jq)},r.prototype.orInternalRecord=function(e,t){return Nye.call(this,e,t)},r.prototype.subruleInternalRecord=function(e,t,i){if(wy(t),!e||(0,En.has)(e,"ruleName")===!1){var n=new Error("<SUBRULE"+Jq(t)+"> argument is invalid"+(" expecting a Parser method reference but got: <"+JSON.stringify(e)+">")+(`
- inside top level rule: <`+this.recordingProdStack[0].name+">"));throw n.KNOWN_RECORDER_ERROR=!0,n}var s=(0,En.peek)(this.recordingProdStack),o=e.ruleName,a=new To.NonTerminal({idx:t,nonTerminalName:o,label:i==null?void 0:i.LABEL,referencedRule:void 0});return s.definition.push(a),this.outputCst?Rye:By},r.prototype.consumeInternalRecord=function(e,t,i){if(wy(t),!(0,Wq.hasShortKeyProperty)(e)){var n=new Error("<CONSUME"+Jq(t)+"> argument is invalid"+(" expecting a TokenType reference but got: <"+JSON.stringify(e)+">")+(`
- inside top level rule: <`+this.recordingProdStack[0].name+">"));throw n.KNOWN_RECORDER_ERROR=!0,n}var s=(0,En.peek)(this.recordingProdStack),o=new To.Terminal({idx:t,terminalType:e,label:i==null?void 0:i.LABEL});return s.definition.push(o),Xq},r}();Qy.GastRecorder=Fye;function Nd(r,e,t,i){i===void 0&&(i=!1),wy(t);var n=(0,En.peek)(this.recordingProdStack),s=(0,En.isFunction)(e)?e:e.DEF,o=new r({definition:[],idx:t});return i&&(o.separator=e.SEP),(0,En.has)(e,"MAX_LOOKAHEAD")&&(o.maxLookahead=e.MAX_LOOKAHEAD),this.recordingProdStack.push(o),s.call(this),n.definition.push(o),this.recordingProdStack.pop(),By}function Nye(r,e){var t=this;wy(e);var i=(0,En.peek)(this.recordingProdStack),n=(0,En.isArray)(r)===!1,s=n===!1?r:r.DEF,o=new To.Alternation({definition:[],idx:e,ignoreAmbiguities:n&&r.IGNORE_AMBIGUITIES===!0});(0,En.has)(r,"MAX_LOOKAHEAD")&&(o.maxLookahead=r.MAX_LOOKAHEAD);var a=(0,En.some)(s,function(l){return(0,En.isFunction)(l.GATE)});return o.hasPredicates=a,i.definition.push(o),(0,En.forEach)(s,function(l){var c=new To.Alternative({definition:[]});o.definition.push(c),(0,En.has)(l,"IGNORE_AMBIGUITIES")?c.ignoreAmbiguities=l.IGNORE_AMBIGUITIES:(0,En.has)(l,"GATE")&&(c.ignoreAmbiguities=!0),t.recordingProdStack.push(c),l.ALT.call(t),t.recordingProdStack.pop()}),By}function Jq(r){return r===0?"":""+r}function wy(r){if(r<0||r>qq){var e=new Error("Invalid DSL Method idx value: <"+r+`>
-	`+("Idx value must be a none negative value smaller than "+(qq+1)));throw e.KNOWN_RECORDER_ERROR=!0,e}}});var $q=w(by=>{"use strict";Object.defineProperty(by,"__esModule",{value:!0});by.PerformanceTracer=void 0;var _q=Gt(),Lye=Gn(),Tye=function(){function r(){}return r.prototype.initPerformanceTracer=function(e){if((0,_q.has)(e,"traceInitPerf")){var t=e.traceInitPerf,i=typeof t=="number";this.traceInitMaxIdent=i?t:1/0,this.traceInitPerf=i?t>0:t}else this.traceInitMaxIdent=0,this.traceInitPerf=Lye.DEFAULT_PARSER_CONFIG.traceInitPerf;this.traceInitIndent=-1},r.prototype.TRACE_INIT=function(e,t){if(this.traceInitPerf===!0){this.traceInitIndent++;var i=new Array(this.traceInitIndent+1).join("	");this.traceInitIndent<this.traceInitMaxIdent&&console.log(i+"--> <"+e+">");var n=(0,_q.timer)(t),s=n.time,o=n.value,a=s>10?console.warn:console.log;return this.traceInitIndent<this.traceInitMaxIdent&&a(i+"<-- <"+e+"> time: "+s+"ms"),this.traceInitIndent--,o}else return t()},r}();by.PerformanceTracer=Tye});var eJ=w(Sy=>{"use strict";Object.defineProperty(Sy,"__esModule",{value:!0});Sy.applyMixins=void 0;function Oye(r,e){e.forEach(function(t){var i=t.prototype;Object.getOwnPropertyNames(i).forEach(function(n){if(n!=="constructor"){var s=Object.getOwnPropertyDescriptor(i,n);s&&(s.get||s.set)?Object.defineProperty(r.prototype,n,s):r.prototype[n]=t.prototype[n]}})})}Sy.applyMixins=Oye});var Gn=w(dr=>{"use strict";var iJ=dr&&dr.__extends||function(){var r=function(e,t){return r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(i,n){i.__proto__=n}||function(i,n){for(var s in n)Object.prototype.hasOwnProperty.call(n,s)&&(i[s]=n[s])},r(e,t)};return function(e,t){if(typeof t!="function"&&t!==null)throw new TypeError("Class extends value "+String(t)+" is not a constructor or null");r(e,t);function i(){this.constructor=e}e.prototype=t===null?Object.create(t):(i.prototype=t.prototype,new i)}}();Object.defineProperty(dr,"__esModule",{value:!0});dr.EmbeddedActionsParser=dr.CstParser=dr.Parser=dr.EMPTY_ALT=dr.ParserDefinitionErrorType=dr.DEFAULT_RULE_CONFIG=dr.DEFAULT_PARSER_CONFIG=dr.END_OF_FILE=void 0;var _i=Gt(),Mye=Uj(),tJ=NA(),nJ=Sd(),rJ=gq(),Kye=sx(),Uye=Iq(),Hye=Dq(),Gye=Rq(),Yye=Nq(),jye=Mq(),qye=Uq(),Jye=Yq(),Wye=Zq(),zye=$q(),Vye=eJ();dr.END_OF_FILE=(0,tJ.createTokenInstance)(tJ.EOF,"",NaN,NaN,NaN,NaN,NaN,NaN);Object.freeze(dr.END_OF_FILE);dr.DEFAULT_PARSER_CONFIG=Object.freeze({recoveryEnabled:!1,maxLookahead:3,dynamicTokensEnabled:!1,outputCst:!0,errorMessageProvider:nJ.defaultParserErrorProvider,nodeLocationTracking:"none",traceInitPerf:!1,skipValidations:!1});dr.DEFAULT_RULE_CONFIG=Object.freeze({recoveryValueFunc:function(){},resyncEnabled:!0});var Xye;(function(r){r[r.INVALID_RULE_NAME=0]="INVALID_RULE_NAME",r[r.DUPLICATE_RULE_NAME=1]="DUPLICATE_RULE_NAME",r[r.INVALID_RULE_OVERRIDE=2]="INVALID_RULE_OVERRIDE",r[r.DUPLICATE_PRODUCTIONS=3]="DUPLICATE_PRODUCTIONS",r[r.UNRESOLVED_SUBRULE_REF=4]="UNRESOLVED_SUBRULE_REF",r[r.LEFT_RECURSION=5]="LEFT_RECURSION",r[r.NONE_LAST_EMPTY_ALT=6]="NONE_LAST_EMPTY_ALT",r[r.AMBIGUOUS_ALTS=7]="AMBIGUOUS_ALTS",r[r.CONFLICT_TOKENS_RULES_NAMESPACE=8]="CONFLICT_TOKENS_RULES_NAMESPACE",r[r.INVALID_TOKEN_NAME=9]="INVALID_TOKEN_NAME",r[r.NO_NON_EMPTY_LOOKAHEAD=10]="NO_NON_EMPTY_LOOKAHEAD",r[r.AMBIGUOUS_PREFIX_ALTS=11]="AMBIGUOUS_PREFIX_ALTS",r[r.TOO_MANY_ALTS=12]="TOO_MANY_ALTS"})(Xye=dr.ParserDefinitionErrorType||(dr.ParserDefinitionErrorType={}));function Zye(r){return r===void 0&&(r=void 0),function(){return r}}dr.EMPTY_ALT=Zye;var vy=function(){function r(e,t){this.definitionErrors=[],this.selfAnalysisDone=!1;var i=this;if(i.initErrorHandler(t),i.initLexerAdapter(),i.initLooksAhead(t),i.initRecognizerEngine(e,t),i.initRecoverable(t),i.initTreeBuilder(t),i.initContentAssist(),i.initGastRecorder(t),i.initPerformanceTracer(t),(0,_i.has)(t,"ignoredIssues"))throw new Error(`The <ignoredIssues> IParserConfig property has been deprecated.
-	Please use the <IGNORE_AMBIGUITIES> flag on the relevant DSL method instead.
-	See: https://chevrotain.io/docs/guide/resolving_grammar_errors.html#IGNORING_AMBIGUITIES
-	For further details.`);this.skipValidations=(0,_i.has)(t,"skipValidations")?t.skipValidations:dr.DEFAULT_PARSER_CONFIG.skipValidations}return r.performSelfAnalysis=function(e){throw Error("The **static** `performSelfAnalysis` method has been deprecated.	\nUse the **instance** method with the same name instead.")},r.prototype.performSelfAnalysis=function(){var e=this;this.TRACE_INIT("performSelfAnalysis",function(){var t;e.selfAnalysisDone=!0;var i=e.className;e.TRACE_INIT("toFastProps",function(){(0,_i.toFastProperties)(e)}),e.TRACE_INIT("Grammar Recording",function(){try{e.enableRecording(),(0,_i.forEach)(e.definedRulesNames,function(s){var o=e[s],a=o.originalGrammarAction,l=void 0;e.TRACE_INIT(s+" Rule",function(){l=e.topLevelRuleRecord(s,a)}),e.gastProductionsCache[s]=l})}finally{e.disableRecording()}});var n=[];if(e.TRACE_INIT("Grammar Resolving",function(){n=(0,rJ.resolveGrammar)({rules:(0,_i.values)(e.gastProductionsCache)}),e.definitionErrors=e.definitionErrors.concat(n)}),e.TRACE_INIT("Grammar Validations",function(){if((0,_i.isEmpty)(n)&&e.skipValidations===!1){var s=(0,rJ.validateGrammar)({rules:(0,_i.values)(e.gastProductionsCache),maxLookahead:e.maxLookahead,tokenTypes:(0,_i.values)(e.tokensMap),errMsgProvider:nJ.defaultGrammarValidatorErrorProvider,grammarName:i});e.definitionErrors=e.definitionErrors.concat(s)}}),(0,_i.isEmpty)(e.definitionErrors)&&(e.recoveryEnabled&&e.TRACE_INIT("computeAllProdsFollows",function(){var s=(0,Mye.computeAllProdsFollows)((0,_i.values)(e.gastProductionsCache));e.resyncFollows=s}),e.TRACE_INIT("ComputeLookaheadFunctions",function(){e.preComputeLookaheadFunctions((0,_i.values)(e.gastProductionsCache))})),!r.DEFER_DEFINITION_ERRORS_HANDLING&&!(0,_i.isEmpty)(e.definitionErrors))throw t=(0,_i.map)(e.definitionErrors,function(s){return s.message}),new Error(`Parser Definition Errors detected:
- `+t.join(`
--------------------------------
-`))})},r.DEFER_DEFINITION_ERRORS_HANDLING=!1,r}();dr.Parser=vy;(0,Vye.applyMixins)(vy,[Kye.Recoverable,Uye.LooksAhead,Hye.TreeBuilder,Gye.LexerAdapter,jye.RecognizerEngine,Yye.RecognizerApi,qye.ErrorHandler,Jye.ContentAssist,Wye.GastRecorder,zye.PerformanceTracer]);var _ye=function(r){iJ(e,r);function e(t,i){i===void 0&&(i=dr.DEFAULT_PARSER_CONFIG);var n=this,s=(0,_i.cloneObj)(i);return s.outputCst=!0,n=r.call(this,t,s)||this,n}return e}(vy);dr.CstParser=_ye;var $ye=function(r){iJ(e,r);function e(t,i){i===void 0&&(i=dr.DEFAULT_PARSER_CONFIG);var n=this,s=(0,_i.cloneObj)(i);return s.outputCst=!1,n=r.call(this,t,s)||this,n}return e}(vy);dr.EmbeddedActionsParser=$ye});var oJ=w(xy=>{"use strict";Object.defineProperty(xy,"__esModule",{value:!0});xy.createSyntaxDiagramsCode=void 0;var sJ=Dv();function ewe(r,e){var t=e===void 0?{}:e,i=t.resourceBase,n=i===void 0?"https://unpkg.com/chevrotain@"+sJ.VERSION+"/diagrams/":i,s=t.css,o=s===void 0?"https://unpkg.com/chevrotain@"+sJ.VERSION+"/diagrams/diagrams.css":s,a=`
-<!-- This is a generated file -->
-<!DOCTYPE html>
-<meta charset="utf-8">
-<style>
-  body {
-    background-color: hsl(30, 20%, 95%)
-  }
-</style>
-
-`,l=`
-<link rel='stylesheet' href='`+o+`'>
-`,c=`
-<script src='`+n+`vendor/railroad-diagrams.js'><\/script>
-<script src='`+n+`src/diagrams_builder.js'><\/script>
-<script src='`+n+`src/diagrams_behavior.js'><\/script>
-<script src='`+n+`src/main.js'><\/script>
-`,u=`
-<div id="diagrams" align="center"></div>    
-`,g=`
-<script>
-    window.serializedGrammar = `+JSON.stringify(r,null,"  ")+`;
-<\/script>
-`,f=`
-<script>
-    var diagramsDiv = document.getElementById("diagrams");
-    main.drawDiagramsFromSerializedGrammar(serializedGrammar, diagramsDiv);
-<\/script>
-`;return a+l+c+u+g+f}xy.createSyntaxDiagramsCode=ewe});var lJ=w(We=>{"use strict";Object.defineProperty(We,"__esModule",{value:!0});We.Parser=We.createSyntaxDiagramsCode=We.clearCache=We.GAstVisitor=We.serializeProduction=We.serializeGrammar=We.Terminal=We.Rule=We.RepetitionWithSeparator=We.RepetitionMandatoryWithSeparator=We.RepetitionMandatory=We.Repetition=We.Option=We.NonTerminal=We.Alternative=We.Alternation=We.defaultLexerErrorProvider=We.NoViableAltException=We.NotAllInputParsedException=We.MismatchedTokenException=We.isRecognitionException=We.EarlyExitException=We.defaultParserErrorProvider=We.tokenName=We.tokenMatcher=We.tokenLabel=We.EOF=We.createTokenInstance=We.createToken=We.LexerDefinitionErrorType=We.Lexer=We.EMPTY_ALT=We.ParserDefinitionErrorType=We.EmbeddedActionsParser=We.CstParser=We.VERSION=void 0;var twe=Dv();Object.defineProperty(We,"VERSION",{enumerable:!0,get:function(){return twe.VERSION}});var Py=Gn();Object.defineProperty(We,"CstParser",{enumerable:!0,get:function(){return Py.CstParser}});Object.defineProperty(We,"EmbeddedActionsParser",{enumerable:!0,get:function(){return Py.EmbeddedActionsParser}});Object.defineProperty(We,"ParserDefinitionErrorType",{enumerable:!0,get:function(){return Py.ParserDefinitionErrorType}});Object.defineProperty(We,"EMPTY_ALT",{enumerable:!0,get:function(){return Py.EMPTY_ALT}});var aJ=yd();Object.defineProperty(We,"Lexer",{enumerable:!0,get:function(){return aJ.Lexer}});Object.defineProperty(We,"LexerDefinitionErrorType",{enumerable:!0,get:function(){return aJ.LexerDefinitionErrorType}});var nf=NA();Object.defineProperty(We,"createToken",{enumerable:!0,get:function(){return nf.createToken}});Object.defineProperty(We,"createTokenInstance",{enumerable:!0,get:function(){return nf.createTokenInstance}});Object.defineProperty(We,"EOF",{enumerable:!0,get:function(){return nf.EOF}});Object.defineProperty(We,"tokenLabel",{enumerable:!0,get:function(){return nf.tokenLabel}});Object.defineProperty(We,"tokenMatcher",{enumerable:!0,get:function(){return nf.tokenMatcher}});Object.defineProperty(We,"tokenName",{enumerable:!0,get:function(){return nf.tokenName}});var rwe=Sd();Object.defineProperty(We,"defaultParserErrorProvider",{enumerable:!0,get:function(){return rwe.defaultParserErrorProvider}});var Ld=ef();Object.defineProperty(We,"EarlyExitException",{enumerable:!0,get:function(){return Ld.EarlyExitException}});Object.defineProperty(We,"isRecognitionException",{enumerable:!0,get:function(){return Ld.isRecognitionException}});Object.defineProperty(We,"MismatchedTokenException",{enumerable:!0,get:function(){return Ld.MismatchedTokenException}});Object.defineProperty(We,"NotAllInputParsedException",{enumerable:!0,get:function(){return Ld.NotAllInputParsedException}});Object.defineProperty(We,"NoViableAltException",{enumerable:!0,get:function(){return Ld.NoViableAltException}});var iwe=Uv();Object.defineProperty(We,"defaultLexerErrorProvider",{enumerable:!0,get:function(){return iwe.defaultLexerErrorProvider}});var Oo=dn();Object.defineProperty(We,"Alternation",{enumerable:!0,get:function(){return Oo.Alternation}});Object.defineProperty(We,"Alternative",{enumerable:!0,get:function(){return Oo.Alternative}});Object.defineProperty(We,"NonTerminal",{enumerable:!0,get:function(){return Oo.NonTerminal}});Object.defineProperty(We,"Option",{enumerable:!0,get:function(){return Oo.Option}});Object.defineProperty(We,"Repetition",{enumerable:!0,get:function(){return Oo.Repetition}});Object.defineProperty(We,"RepetitionMandatory",{enumerable:!0,get:function(){return Oo.RepetitionMandatory}});Object.defineProperty(We,"RepetitionMandatoryWithSeparator",{enumerable:!0,get:function(){return Oo.RepetitionMandatoryWithSeparator}});Object.defineProperty(We,"RepetitionWithSeparator",{enumerable:!0,get:function(){return Oo.RepetitionWithSeparator}});Object.defineProperty(We,"Rule",{enumerable:!0,get:function(){return Oo.Rule}});Object.defineProperty(We,"Terminal",{enumerable:!0,get:function(){return Oo.Terminal}});var AJ=dn();Object.defineProperty(We,"serializeGrammar",{enumerable:!0,get:function(){return AJ.serializeGrammar}});Object.defineProperty(We,"serializeProduction",{enumerable:!0,get:function(){return AJ.serializeProduction}});var nwe=Xg();Object.defineProperty(We,"GAstVisitor",{enumerable:!0,get:function(){return nwe.GAstVisitor}});function swe(){console.warn(`The clearCache function was 'soft' removed from the Chevrotain API.
-	 It performs no action other than printing this message.
-	 Please avoid using it as it will be completely removed in the future`)}We.clearCache=swe;var owe=oJ();Object.defineProperty(We,"createSyntaxDiagramsCode",{enumerable:!0,get:function(){return owe.createSyntaxDiagramsCode}});var awe=function(){function r(){throw new Error(`The Parser class has been deprecated, use CstParser or EmbeddedActionsParser instead.	
-See: https://chevrotain.io/docs/changes/BREAKING_CHANGES.html#_7-0-0`)}return r}();We.Parser=awe});var gJ=w((Met,uJ)=>{var Dy=lJ(),ka=Dy.createToken,cJ=Dy.tokenMatcher,ux=Dy.Lexer,Awe=Dy.EmbeddedActionsParser;uJ.exports=r=>{let e=ka({name:"LogicalOperator",pattern:ux.NA}),t=ka({name:"Or",pattern:/\|/,categories:e}),i=ka({name:"Xor",pattern:/\^/,categories:e}),n=ka({name:"And",pattern:/&/,categories:e}),s=ka({name:"Not",pattern:/!/}),o=ka({name:"LParen",pattern:/\(/}),a=ka({name:"RParen",pattern:/\)/}),l=ka({name:"Query",pattern:r}),u=[ka({name:"WhiteSpace",pattern:/\s+/,group:ux.SKIPPED}),t,i,n,o,a,s,e,l],g=new ux(u);class f extends Awe{constructor(p){super(u),this.RULE("expression",()=>this.SUBRULE(this.logicalExpression)),this.RULE("logicalExpression",()=>{let y=this.SUBRULE(this.atomicExpression);return this.MANY(()=>{let B=y,v=this.CONSUME(e),D=this.SUBRULE2(this.atomicExpression);cJ(v,t)?y=L=>B(L)||D(L):cJ(v,i)?y=L=>!!(B(L)^D(L)):y=L=>B(L)&&D(L)}),y}),this.RULE("atomicExpression",()=>this.OR([{ALT:()=>this.SUBRULE(this.parenthesisExpression)},{ALT:()=>{let{image:C}=this.CONSUME(l);return y=>y(C)}},{ALT:()=>{this.CONSUME(s);let C=this.SUBRULE(this.atomicExpression);return y=>!C(y)}}])),this.RULE("parenthesisExpression",()=>{let C;return this.CONSUME(o),C=this.SUBRULE(this.expression),this.CONSUME(a),C}),this.performSelfAnalysis()}}return{TinylogicLexer:g,TinylogicParser:f}}});var fJ=w(ky=>{var lwe=gJ();ky.makeParser=(r=/[a-z]+/)=>{let{TinylogicLexer:e,TinylogicParser:t}=lwe(r),i=new t;return(n,s)=>{let o=e.tokenize(n);return i.input=o.tokens,i.expression()(s)}};ky.parse=ky.makeParser()});var pJ=w((Uet,hJ)=>{"use strict";hJ.exports={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]}});var gx=w((Het,CJ)=>{var Td=pJ(),dJ={};for(let r of Object.keys(Td))dJ[Td[r]]=r;var st={rgb:{channels:3,labels:"rgb"},hsl:{channels:3,labels:"hsl"},hsv:{channels:3,labels:"hsv"},hwb:{channels:3,labels:"hwb"},cmyk:{channels:4,labels:"cmyk"},xyz:{channels:3,labels:"xyz"},lab:{channels:3,labels:"lab"},lch:{channels:3,labels:"lch"},hex:{channels:1,labels:["hex"]},keyword:{channels:1,labels:["keyword"]},ansi16:{channels:1,labels:["ansi16"]},ansi256:{channels:1,labels:["ansi256"]},hcg:{channels:3,labels:["h","c","g"]},apple:{channels:3,labels:["r16","g16","b16"]},gray:{channels:1,labels:["gray"]}};CJ.exports=st;for(let r of Object.keys(st)){if(!("channels"in st[r]))throw new Error("missing channels property: "+r);if(!("labels"in st[r]))throw new Error("missing channel labels property: "+r);if(st[r].labels.length!==st[r].channels)throw new Error("channel and label counts mismatch: "+r);let{channels:e,labels:t}=st[r];delete st[r].channels,delete st[r].labels,Object.defineProperty(st[r],"channels",{value:e}),Object.defineProperty(st[r],"labels",{value:t})}st.rgb.hsl=function(r){let e=r[0]/255,t=r[1]/255,i=r[2]/255,n=Math.min(e,t,i),s=Math.max(e,t,i),o=s-n,a,l;s===n?a=0:e===s?a=(t-i)/o:t===s?a=2+(i-e)/o:i===s&&(a=4+(e-t)/o),a=Math.min(a*60,360),a<0&&(a+=360);let c=(n+s)/2;return s===n?l=0:c<=.5?l=o/(s+n):l=o/(2-s-n),[a,l*100,c*100]};st.rgb.hsv=function(r){let e,t,i,n,s,o=r[0]/255,a=r[1]/255,l=r[2]/255,c=Math.max(o,a,l),u=c-Math.min(o,a,l),g=function(f){return(c-f)/6/u+1/2};return u===0?(n=0,s=0):(s=u/c,e=g(o),t=g(a),i=g(l),o===c?n=i-t:a===c?n=1/3+e-i:l===c&&(n=2/3+t-e),n<0?n+=1:n>1&&(n-=1)),[n*360,s*100,c*100]};st.rgb.hwb=function(r){let e=r[0],t=r[1],i=r[2],n=st.rgb.hsl(r)[0],s=1/255*Math.min(e,Math.min(t,i));return i=1-1/255*Math.max(e,Math.max(t,i)),[n,s*100,i*100]};st.rgb.cmyk=function(r){let e=r[0]/255,t=r[1]/255,i=r[2]/255,n=Math.min(1-e,1-t,1-i),s=(1-e-n)/(1-n)||0,o=(1-t-n)/(1-n)||0,a=(1-i-n)/(1-n)||0;return[s*100,o*100,a*100,n*100]};function cwe(r,e){return(r[0]-e[0])**2+(r[1]-e[1])**2+(r[2]-e[2])**2}st.rgb.keyword=function(r){let e=dJ[r];if(e)return e;let t=1/0,i;for(let n of Object.keys(Td)){let s=Td[n],o=cwe(r,s);o<t&&(t=o,i=n)}return i};st.keyword.rgb=function(r){return Td[r]};st.rgb.xyz=function(r){let e=r[0]/255,t=r[1]/255,i=r[2]/255;e=e>.04045?((e+.055)/1.055)**2.4:e/12.92,t=t>.04045?((t+.055)/1.055)**2.4:t/12.92,i=i>.04045?((i+.055)/1.055)**2.4:i/12.92;let n=e*.4124+t*.3576+i*.1805,s=e*.2126+t*.7152+i*.0722,o=e*.0193+t*.1192+i*.9505;return[n*100,s*100,o*100]};st.rgb.lab=function(r){let e=st.rgb.xyz(r),t=e[0],i=e[1],n=e[2];t/=95.047,i/=100,n/=108.883,t=t>.008856?t**(1/3):7.787*t+16/116,i=i>.008856?i**(1/3):7.787*i+16/116,n=n>.008856?n**(1/3):7.787*n+16/116;let s=116*i-16,o=500*(t-i),a=200*(i-n);return[s,o,a]};st.hsl.rgb=function(r){let e=r[0]/360,t=r[1]/100,i=r[2]/100,n,s,o;if(t===0)return o=i*255,[o,o,o];i<.5?n=i*(1+t):n=i+t-i*t;let a=2*i-n,l=[0,0,0];for(let c=0;c<3;c++)s=e+1/3*-(c-1),s<0&&s++,s>1&&s--,6*s<1?o=a+(n-a)*6*s:2*s<1?o=n:3*s<2?o=a+(n-a)*(2/3-s)*6:o=a,l[c]=o*255;return l};st.hsl.hsv=function(r){let e=r[0],t=r[1]/100,i=r[2]/100,n=t,s=Math.max(i,.01);i*=2,t*=i<=1?i:2-i,n*=s<=1?s:2-s;let o=(i+t)/2,a=i===0?2*n/(s+n):2*t/(i+t);return[e,a*100,o*100]};st.hsv.rgb=function(r){let e=r[0]/60,t=r[1]/100,i=r[2]/100,n=Math.floor(e)%6,s=e-Math.floor(e),o=255*i*(1-t),a=255*i*(1-t*s),l=255*i*(1-t*(1-s));switch(i*=255,n){case 0:return[i,l,o];case 1:return[a,i,o];case 2:return[o,i,l];case 3:return[o,a,i];case 4:return[l,o,i];case 5:return[i,o,a]}};st.hsv.hsl=function(r){let e=r[0],t=r[1]/100,i=r[2]/100,n=Math.max(i,.01),s,o;o=(2-t)*i;let a=(2-t)*n;return s=t*n,s/=a<=1?a:2-a,s=s||0,o/=2,[e,s*100,o*100]};st.hwb.rgb=function(r){let e=r[0]/360,t=r[1]/100,i=r[2]/100,n=t+i,s;n>1&&(t/=n,i/=n);let o=Math.floor(6*e),a=1-i;s=6*e-o,(o&1)!==0&&(s=1-s);let l=t+s*(a-t),c,u,g;switch(o){default:case 6:case 0:c=a,u=l,g=t;break;case 1:c=l,u=a,g=t;break;case 2:c=t,u=a,g=l;break;case 3:c=t,u=l,g=a;break;case 4:c=l,u=t,g=a;break;case 5:c=a,u=t,g=l;break}return[c*255,u*255,g*255]};st.cmyk.rgb=function(r){let e=r[0]/100,t=r[1]/100,i=r[2]/100,n=r[3]/100,s=1-Math.min(1,e*(1-n)+n),o=1-Math.min(1,t*(1-n)+n),a=1-Math.min(1,i*(1-n)+n);return[s*255,o*255,a*255]};st.xyz.rgb=function(r){let e=r[0]/100,t=r[1]/100,i=r[2]/100,n,s,o;return n=e*3.2406+t*-1.5372+i*-.4986,s=e*-.9689+t*1.8758+i*.0415,o=e*.0557+t*-.204+i*1.057,n=n>.0031308?1.055*n**(1/2.4)-.055:n*12.92,s=s>.0031308?1.055*s**(1/2.4)-.055:s*12.92,o=o>.0031308?1.055*o**(1/2.4)-.055:o*12.92,n=Math.min(Math.max(0,n),1),s=Math.min(Math.max(0,s),1),o=Math.min(Math.max(0,o),1),[n*255,s*255,o*255]};st.xyz.lab=function(r){let e=r[0],t=r[1],i=r[2];e/=95.047,t/=100,i/=108.883,e=e>.008856?e**(1/3):7.787*e+16/116,t=t>.008856?t**(1/3):7.787*t+16/116,i=i>.008856?i**(1/3):7.787*i+16/116;let n=116*t-16,s=500*(e-t),o=200*(t-i);return[n,s,o]};st.lab.xyz=function(r){let e=r[0],t=r[1],i=r[2],n,s,o;s=(e+16)/116,n=t/500+s,o=s-i/200;let a=s**3,l=n**3,c=o**3;return s=a>.008856?a:(s-16/116)/7.787,n=l>.008856?l:(n-16/116)/7.787,o=c>.008856?c:(o-16/116)/7.787,n*=95.047,s*=100,o*=108.883,[n,s,o]};st.lab.lch=function(r){let e=r[0],t=r[1],i=r[2],n;n=Math.atan2(i,t)*360/2/Math.PI,n<0&&(n+=360);let o=Math.sqrt(t*t+i*i);return[e,o,n]};st.lch.lab=function(r){let e=r[0],t=r[1],n=r[2]/360*2*Math.PI,s=t*Math.cos(n),o=t*Math.sin(n);return[e,s,o]};st.rgb.ansi16=function(r,e=null){let[t,i,n]=r,s=e===null?st.rgb.hsv(r)[2]:e;if(s=Math.round(s/50),s===0)return 30;let o=30+(Math.round(n/255)<<2|Math.round(i/255)<<1|Math.round(t/255));return s===2&&(o+=60),o};st.hsv.ansi16=function(r){return st.rgb.ansi16(st.hsv.rgb(r),r[2])};st.rgb.ansi256=function(r){let e=r[0],t=r[1],i=r[2];return e===t&&t===i?e<8?16:e>248?231:Math.round((e-8)/247*24)+232:16+36*Math.round(e/255*5)+6*Math.round(t/255*5)+Math.round(i/255*5)};st.ansi16.rgb=function(r){let e=r%10;if(e===0||e===7)return r>50&&(e+=3.5),e=e/10.5*255,[e,e,e];let t=(~~(r>50)+1)*.5,i=(e&1)*t*255,n=(e>>1&1)*t*255,s=(e>>2&1)*t*255;return[i,n,s]};st.ansi256.rgb=function(r){if(r>=232){let s=(r-232)*10+8;return[s,s,s]}r-=16;let e,t=Math.floor(r/36)/5*255,i=Math.floor((e=r%36)/6)/5*255,n=e%6/5*255;return[t,i,n]};st.rgb.hex=function(r){let t=(((Math.round(r[0])&255)<<16)+((Math.round(r[1])&255)<<8)+(Math.round(r[2])&255)).toString(16).toUpperCase();return"000000".substring(t.length)+t};st.hex.rgb=function(r){let e=r.toString(16).match(/[a-f0-9]{6}|[a-f0-9]{3}/i);if(!e)return[0,0,0];let t=e[0];e[0].length===3&&(t=t.split("").map(a=>a+a).join(""));let i=parseInt(t,16),n=i>>16&255,s=i>>8&255,o=i&255;return[n,s,o]};st.rgb.hcg=function(r){let e=r[0]/255,t=r[1]/255,i=r[2]/255,n=Math.max(Math.max(e,t),i),s=Math.min(Math.min(e,t),i),o=n-s,a,l;return o<1?a=s/(1-o):a=0,o<=0?l=0:n===e?l=(t-i)/o%6:n===t?l=2+(i-e)/o:l=4+(e-t)/o,l/=6,l%=1,[l*360,o*100,a*100]};st.hsl.hcg=function(r){let e=r[1]/100,t=r[2]/100,i=t<.5?2*e*t:2*e*(1-t),n=0;return i<1&&(n=(t-.5*i)/(1-i)),[r[0],i*100,n*100]};st.hsv.hcg=function(r){let e=r[1]/100,t=r[2]/100,i=e*t,n=0;return i<1&&(n=(t-i)/(1-i)),[r[0],i*100,n*100]};st.hcg.rgb=function(r){let e=r[0]/360,t=r[1]/100,i=r[2]/100;if(t===0)return[i*255,i*255,i*255];let n=[0,0,0],s=e%1*6,o=s%1,a=1-o,l=0;switch(Math.floor(s)){case 0:n[0]=1,n[1]=o,n[2]=0;break;case 1:n[0]=a,n[1]=1,n[2]=0;break;case 2:n[0]=0,n[1]=1,n[2]=o;break;case 3:n[0]=0,n[1]=a,n[2]=1;break;case 4:n[0]=o,n[1]=0,n[2]=1;break;default:n[0]=1,n[1]=0,n[2]=a}return l=(1-t)*i,[(t*n[0]+l)*255,(t*n[1]+l)*255,(t*n[2]+l)*255]};st.hcg.hsv=function(r){let e=r[1]/100,t=r[2]/100,i=e+t*(1-e),n=0;return i>0&&(n=e/i),[r[0],n*100,i*100]};st.hcg.hsl=function(r){let e=r[1]/100,i=r[2]/100*(1-e)+.5*e,n=0;return i>0&&i<.5?n=e/(2*i):i>=.5&&i<1&&(n=e/(2*(1-i))),[r[0],n*100,i*100]};st.hcg.hwb=function(r){let e=r[1]/100,t=r[2]/100,i=e+t*(1-e);return[r[0],(i-e)*100,(1-i)*100]};st.hwb.hcg=function(r){let e=r[1]/100,t=r[2]/100,i=1-t,n=i-e,s=0;return n<1&&(s=(i-n)/(1-n)),[r[0],n*100,s*100]};st.apple.rgb=function(r){return[r[0]/65535*255,r[1]/65535*255,r[2]/65535*255]};st.rgb.apple=function(r){return[r[0]/255*65535,r[1]/255*65535,r[2]/255*65535]};st.gray.rgb=function(r){return[r[0]/100*255,r[0]/100*255,r[0]/100*255]};st.gray.hsl=function(r){return[0,0,r[0]]};st.gray.hsv=st.gray.hsl;st.gray.hwb=function(r){return[0,100,r[0]]};st.gray.cmyk=function(r){return[0,0,0,r[0]]};st.gray.lab=function(r){return[r[0],0,0]};st.gray.hex=function(r){let e=Math.round(r[0]/100*255)&255,i=((e<<16)+(e<<8)+e).toString(16).toUpperCase();return"000000".substring(i.length)+i};st.rgb.gray=function(r){return[(r[0]+r[1]+r[2])/3/255*100]}});var EJ=w((Get,mJ)=>{var Ry=gx();function uwe(){let r={},e=Object.keys(Ry);for(let t=e.length,i=0;i<t;i++)r[e[i]]={distance:-1,parent:null};return r}function gwe(r){let e=uwe(),t=[r];for(e[r].distance=0;t.length;){let i=t.pop(),n=Object.keys(Ry[i]);for(let s=n.length,o=0;o<s;o++){let a=n[o],l=e[a];l.distance===-1&&(l.distance=e[i].distance+1,l.parent=i,t.unshift(a))}}return e}function fwe(r,e){return function(t){return e(r(t))}}function hwe(r,e){let t=[e[r].parent,r],i=Ry[e[r].parent][r],n=e[r].parent;for(;e[n].parent;)t.unshift(e[n].parent),i=fwe(Ry[e[n].parent][n],i),n=e[n].parent;return i.conversion=t,i}mJ.exports=function(r){let e=gwe(r),t={},i=Object.keys(e);for(let n=i.length,s=0;s<n;s++){let o=i[s];e[o].parent!==null&&(t[o]=hwe(o,e))}return t}});var yJ=w((Yet,IJ)=>{var fx=gx(),pwe=EJ(),sf={},dwe=Object.keys(fx);function Cwe(r){let e=function(...t){let i=t[0];return i==null?i:(i.length>1&&(t=i),r(t))};return"conversion"in r&&(e.conversion=r.conversion),e}function mwe(r){let e=function(...t){let i=t[0];if(i==null)return i;i.length>1&&(t=i);let n=r(t);if(typeof n=="object")for(let s=n.length,o=0;o<s;o++)n[o]=Math.round(n[o]);return n};return"conversion"in r&&(e.conversion=r.conversion),e}dwe.forEach(r=>{sf[r]={},Object.defineProperty(sf[r],"channels",{value:fx[r].channels}),Object.defineProperty(sf[r],"labels",{value:fx[r].labels});let e=pwe(r);Object.keys(e).forEach(i=>{let n=e[i];sf[r][i]=mwe(n),sf[r][i].raw=Cwe(n)})});IJ.exports=sf});var vJ=w((jet,SJ)=>{"use strict";var wJ=(r,e)=>(...t)=>`\x1B[${r(...t)+e}m`,BJ=(r,e)=>(...t)=>{let i=r(...t);return`\x1B[${38+e};5;${i}m`},QJ=(r,e)=>(...t)=>{let i=r(...t);return`\x1B[${38+e};2;${i[0]};${i[1]};${i[2]}m`},Fy=r=>r,bJ=(r,e,t)=>[r,e,t],of=(r,e,t)=>{Object.defineProperty(r,e,{get:()=>{let i=t();return Object.defineProperty(r,e,{value:i,enumerable:!0,configurable:!0}),i},enumerable:!0,configurable:!0})},hx,af=(r,e,t,i)=>{hx===void 0&&(hx=yJ());let n=i?10:0,s={};for(let[o,a]of Object.entries(hx)){let l=o==="ansi16"?"ansi":o;o===e?s[l]=r(t,n):typeof a=="object"&&(s[l]=r(a[e],n))}return s};function Ewe(){let r=new Map,e={modifier:{reset:[0,0],bold:[1,22],dim:[2,22],italic:[3,23],underline:[4,24],inverse:[7,27],hidden:[8,28],strikethrough:[9,29]},color:{black:[30,39],red:[31,39],green:[32,39],yellow:[33,39],blue:[34,39],magenta:[35,39],cyan:[36,39],white:[37,39],blackBright:[90,39],redBright:[91,39],greenBright:[92,39],yellowBright:[93,39],blueBright:[94,39],magentaBright:[95,39],cyanBright:[96,39],whiteBright:[97,39]},bgColor:{bgBlack:[40,49],bgRed:[41,49],bgGreen:[42,49],bgYellow:[43,49],bgBlue:[44,49],bgMagenta:[45,49],bgCyan:[46,49],bgWhite:[47,49],bgBlackBright:[100,49],bgRedBright:[101,49],bgGreenBright:[102,49],bgYellowBright:[103,49],bgBlueBright:[104,49],bgMagentaBright:[105,49],bgCyanBright:[106,49],bgWhiteBright:[107,49]}};e.color.gray=e.color.blackBright,e.bgColor.bgGray=e.bgColor.bgBlackBright,e.color.grey=e.color.blackBright,e.bgColor.bgGrey=e.bgColor.bgBlackBright;for(let[t,i]of Object.entries(e)){for(let[n,s]of Object.entries(i))e[n]={open:`\x1B[${s[0]}m`,close:`\x1B[${s[1]}m`},i[n]=e[n],r.set(s[0],s[1]);Object.defineProperty(e,t,{value:i,enumerable:!1})}return Object.defineProperty(e,"codes",{value:r,enumerable:!1}),e.color.close="\x1B[39m",e.bgColor.close="\x1B[49m",of(e.color,"ansi",()=>af(wJ,"ansi16",Fy,!1)),of(e.color,"ansi256",()=>af(BJ,"ansi256",Fy,!1)),of(e.color,"ansi16m",()=>af(QJ,"rgb",bJ,!1)),of(e.bgColor,"ansi",()=>af(wJ,"ansi16",Fy,!0)),of(e.bgColor,"ansi256",()=>af(BJ,"ansi256",Fy,!0)),of(e.bgColor,"ansi16m",()=>af(QJ,"rgb",bJ,!0)),e}Object.defineProperty(SJ,"exports",{enumerable:!0,get:Ewe})});var PJ=w((qet,xJ)=>{"use strict";xJ.exports=(r,e=process.argv)=>{let t=r.startsWith("-")?"":r.length===1?"-":"--",i=e.indexOf(t+r),n=e.indexOf("--");return i!==-1&&(n===-1||i<n)}});var RJ=w((Jet,kJ)=>{"use strict";var Iwe=J("os"),DJ=J("tty"),hs=PJ(),{env:ai}=process,MA;hs("no-color")||hs("no-colors")||hs("color=false")||hs("color=never")?MA=0:(hs("color")||hs("colors")||hs("color=true")||hs("color=always"))&&(MA=1);"FORCE_COLOR"in ai&&(ai.FORCE_COLOR==="true"?MA=1:ai.FORCE_COLOR==="false"?MA=0:MA=ai.FORCE_COLOR.length===0?1:Math.min(parseInt(ai.FORCE_COLOR,10),3));function px(r){return r===0?!1:{level:r,hasBasic:!0,has256:r>=2,has16m:r>=3}}function dx(r,e){if(MA===0)return 0;if(hs("color=16m")||hs("color=full")||hs("color=truecolor"))return 3;if(hs("color=256"))return 2;if(r&&!e&&MA===void 0)return 0;let t=MA||0;if(ai.TERM==="dumb")return t;if(process.platform==="win32"){let i=Iwe.release().split(".");return Number(i[0])>=10&&Number(i[2])>=10586?Number(i[2])>=14931?3:2:1}if("CI"in ai)return["TRAVIS","CIRCLECI","APPVEYOR","GITLAB_CI"].some(i=>i in ai)||ai.CI_NAME==="codeship"?1:t;if("TEAMCITY_VERSION"in ai)return/^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(ai.TEAMCITY_VERSION)?1:0;if("GITHUB_ACTIONS"in ai)return 1;if(ai.COLORTERM==="truecolor")return 3;if("TERM_PROGRAM"in ai){let i=parseInt((ai.TERM_PROGRAM_VERSION||"").split(".")[0],10);switch(ai.TERM_PROGRAM){case"iTerm.app":return i>=3?3:2;case"Apple_Terminal":return 2}}return/-256(color)?$/i.test(ai.TERM)?2:/^screen|^xterm|^vt100|^vt220|^rxvt|color|ansi|cygwin|linux/i.test(ai.TERM)||"COLORTERM"in ai?1:t}function ywe(r){let e=dx(r,r&&r.isTTY);return px(e)}kJ.exports={supportsColor:ywe,stdout:px(dx(!0,DJ.isatty(1))),stderr:px(dx(!0,DJ.isatty(2)))}});var NJ=w((Wet,FJ)=>{"use strict";var wwe=(r,e,t)=>{let i=r.indexOf(e);if(i===-1)return r;let n=e.length,s=0,o="";do o+=r.substr(s,i-s)+e+t,s=i+n,i=r.indexOf(e,s);while(i!==-1);return o+=r.substr(s),o},Bwe=(r,e,t,i)=>{let n=0,s="";do{let o=r[i-1]==="\r";s+=r.substr(n,(o?i-1:i)-n)+e+(o?`\r
-`:`
-`)+t,n=i+1,i=r.indexOf(`
-`,n)}while(i!==-1);return s+=r.substr(n),s};FJ.exports={stringReplaceAll:wwe,stringEncaseCRLFWithFirstIndex:Bwe}});var KJ=w((zet,MJ)=>{"use strict";var Qwe=/(?:\\(u(?:[a-f\d]{4}|\{[a-f\d]{1,6}\})|x[a-f\d]{2}|.))|(?:\{(~)?(\w+(?:\([^)]*\))?(?:\.\w+(?:\([^)]*\))?)*)(?:[ \t]|(?=\r?\n)))|(\})|((?:.|[\r\n\f])+?)/gi,LJ=/(?:^|\.)(\w+)(?:\(([^)]*)\))?/g,bwe=/^(['"])((?:\\.|(?!\1)[^\\])*)\1$/,Swe=/\\(u(?:[a-f\d]{4}|\{[a-f\d]{1,6}\})|x[a-f\d]{2}|.)|([^\\])/gi,vwe=new Map([["n",`
-`],["r","\r"],["t","	"],["b","\b"],["f","\f"],["v","\v"],["0","\0"],["\\","\\"],["e","\x1B"],["a","\x07"]]);function OJ(r){let e=r[0]==="u",t=r[1]==="{";return e&&!t&&r.length===5||r[0]==="x"&&r.length===3?String.fromCharCode(parseInt(r.slice(1),16)):e&&t?String.fromCodePoint(parseInt(r.slice(2,-1),16)):vwe.get(r)||r}function xwe(r,e){let t=[],i=e.trim().split(/\s*,\s*/g),n;for(let s of i){let o=Number(s);if(!Number.isNaN(o))t.push(o);else if(n=s.match(bwe))t.push(n[2].replace(Swe,(a,l,c)=>l?OJ(l):c));else throw new Error(`Invalid Chalk template style argument: ${s} (in style '${r}')`)}return t}function Pwe(r){LJ.lastIndex=0;let e=[],t;for(;(t=LJ.exec(r))!==null;){let i=t[1];if(t[2]){let n=xwe(i,t[2]);e.push([i].concat(n))}else e.push([i])}return e}function TJ(r,e){let t={};for(let n of e)for(let s of n.styles)t[s[0]]=n.inverse?null:s.slice(1);let i=r;for(let[n,s]of Object.entries(t))if(!!Array.isArray(s)){if(!(n in i))throw new Error(`Unknown Chalk style: ${n}`);i=s.length>0?i[n](...s):i[n]}return i}MJ.exports=(r,e)=>{let t=[],i=[],n=[];if(e.replace(Qwe,(s,o,a,l,c,u)=>{if(o)n.push(OJ(o));else if(l){let g=n.join("");n=[],i.push(t.length===0?g:TJ(r,t)(g)),t.push({inverse:a,styles:Pwe(l)})}else if(c){if(t.length===0)throw new Error("Found extraneous } in Chalk template literal");i.push(TJ(r,t)(n.join(""))),n=[],t.pop()}else n.push(u)}),i.push(n.join("")),t.length>0){let s=`Chalk template literal is missing ${t.length} closing bracket${t.length===1?"":"s"} (\`}\`)`;throw new Error(s)}return i.join("")}});var wx=w((Vet,YJ)=>{"use strict";var Od=vJ(),{stdout:mx,stderr:Ex}=RJ(),{stringReplaceAll:Dwe,stringEncaseCRLFWithFirstIndex:kwe}=NJ(),UJ=["ansi","ansi","ansi256","ansi16m"],Af=Object.create(null),Rwe=(r,e={})=>{if(e.level>3||e.level<0)throw new Error("The `level` option should be an integer from 0 to 3");let t=mx?mx.level:0;r.level=e.level===void 0?t:e.level},Ix=class{constructor(e){return HJ(e)}},HJ=r=>{let e={};return Rwe(e,r),e.template=(...t)=>Lwe(e.template,...t),Object.setPrototypeOf(e,Ny.prototype),Object.setPrototypeOf(e.template,e),e.template.constructor=()=>{throw new Error("`chalk.constructor()` is deprecated. Use `new chalk.Instance()` instead.")},e.template.Instance=Ix,e.template};function Ny(r){return HJ(r)}for(let[r,e]of Object.entries(Od))Af[r]={get(){let t=Ly(this,yx(e.open,e.close,this._styler),this._isEmpty);return Object.defineProperty(this,r,{value:t}),t}};Af.visible={get(){let r=Ly(this,this._styler,!0);return Object.defineProperty(this,"visible",{value:r}),r}};var GJ=["rgb","hex","keyword","hsl","hsv","hwb","ansi","ansi256"];for(let r of GJ)Af[r]={get(){let{level:e}=this;return function(...t){let i=yx(Od.color[UJ[e]][r](...t),Od.color.close,this._styler);return Ly(this,i,this._isEmpty)}}};for(let r of GJ){let e="bg"+r[0].toUpperCase()+r.slice(1);Af[e]={get(){let{level:t}=this;return function(...i){let n=yx(Od.bgColor[UJ[t]][r](...i),Od.bgColor.close,this._styler);return Ly(this,n,this._isEmpty)}}}}var Fwe=Object.defineProperties(()=>{},{...Af,level:{enumerable:!0,get(){return this._generator.level},set(r){this._generator.level=r}}}),yx=(r,e,t)=>{let i,n;return t===void 0?(i=r,n=e):(i=t.openAll+r,n=e+t.closeAll),{open:r,close:e,openAll:i,closeAll:n,parent:t}},Ly=(r,e,t)=>{let i=(...n)=>Nwe(i,n.length===1?""+n[0]:n.join(" "));return i.__proto__=Fwe,i._generator=r,i._styler=e,i._isEmpty=t,i},Nwe=(r,e)=>{if(r.level<=0||!e)return r._isEmpty?"":e;let t=r._styler;if(t===void 0)return e;let{openAll:i,closeAll:n}=t;if(e.indexOf("\x1B")!==-1)for(;t!==void 0;)e=Dwe(e,t.close,t.open),t=t.parent;let s=e.indexOf(`
-`);return s!==-1&&(e=kwe(e,n,i,s)),i+e+n},Cx,Lwe=(r,...e)=>{let[t]=e;if(!Array.isArray(t))return e.join(" ");let i=e.slice(1),n=[t.raw[0]];for(let s=1;s<t.length;s++)n.push(String(i[s-1]).replace(/[{}\\]/g,"\\$&"),String(t.raw[s]));return Cx===void 0&&(Cx=KJ()),Cx(r,n.join(""))};Object.defineProperties(Ny.prototype,Af);var Md=Ny();Md.supportsColor=mx;Md.stderr=Ny({level:Ex?Ex.level:0});Md.stderr.supportsColor=Ex;Md.Level={None:0,Basic:1,Ansi256:2,TrueColor:3,0:"None",1:"Basic",2:"Ansi256",3:"TrueColor"};YJ.exports=Md});var Ty=w(ps=>{"use strict";ps.isInteger=r=>typeof r=="number"?Number.isInteger(r):typeof r=="string"&&r.trim()!==""?Number.isInteger(Number(r)):!1;ps.find=(r,e)=>r.nodes.find(t=>t.type===e);ps.exceedsLimit=(r,e,t=1,i)=>i===!1||!ps.isInteger(r)||!ps.isInteger(e)?!1:(Number(e)-Number(r))/Number(t)>=i;ps.escapeNode=(r,e=0,t)=>{let i=r.nodes[e];!i||(t&&i.type===t||i.type==="open"||i.type==="close")&&i.escaped!==!0&&(i.value="\\"+i.value,i.escaped=!0)};ps.encloseBrace=r=>r.type!=="brace"?!1:r.commas>>0+r.ranges>>0===0?(r.invalid=!0,!0):!1;ps.isInvalidBrace=r=>r.type!=="brace"?!1:r.invalid===!0||r.dollar?!0:r.commas>>0+r.ranges>>0===0||r.open!==!0||r.close!==!0?(r.invalid=!0,!0):!1;ps.isOpenOrClose=r=>r.type==="open"||r.type==="close"?!0:r.open===!0||r.close===!0;ps.reduce=r=>r.reduce((e,t)=>(t.type==="text"&&e.push(t.value),t.type==="range"&&(t.type="text"),e),[]);ps.flatten=(...r)=>{let e=[],t=i=>{for(let n=0;n<i.length;n++){let s=i[n];Array.isArray(s)?t(s,e):s!==void 0&&e.push(s)}return e};return t(r),e}});var Oy=w((Zet,qJ)=>{"use strict";var jJ=Ty();qJ.exports=(r,e={})=>{let t=(i,n={})=>{let s=e.escapeInvalid&&jJ.isInvalidBrace(n),o=i.invalid===!0&&e.escapeInvalid===!0,a="";if(i.value)return(s||o)&&jJ.isOpenOrClose(i)?"\\"+i.value:i.value;if(i.value)return i.value;if(i.nodes)for(let l of i.nodes)a+=t(l);return a};return t(r)}});var WJ=w((_et,JJ)=>{"use strict";JJ.exports=function(r){return typeof r=="number"?r-r===0:typeof r=="string"&&r.trim()!==""?Number.isFinite?Number.isFinite(+r):isFinite(+r):!1}});var rW=w(($et,tW)=>{"use strict";var zJ=WJ(),dc=(r,e,t)=>{if(zJ(r)===!1)throw new TypeError("toRegexRange: expected the first argument to be a number");if(e===void 0||r===e)return String(r);if(zJ(e)===!1)throw new TypeError("toRegexRange: expected the second argument to be a number.");let i={relaxZeros:!0,...t};typeof i.strictZeros=="boolean"&&(i.relaxZeros=i.strictZeros===!1);let n=String(i.relaxZeros),s=String(i.shorthand),o=String(i.capture),a=String(i.wrap),l=r+":"+e+"="+n+s+o+a;if(dc.cache.hasOwnProperty(l))return dc.cache[l].result;let c=Math.min(r,e),u=Math.max(r,e);if(Math.abs(c-u)===1){let C=r+"|"+e;return i.capture?`(${C})`:i.wrap===!1?C:`(?:${C})`}let g=eW(r)||eW(e),f={min:r,max:e,a:c,b:u},h=[],p=[];if(g&&(f.isPadded=g,f.maxLen=String(f.max).length),c<0){let C=u<0?Math.abs(u):1;p=VJ(C,Math.abs(c),f,i),c=f.a=0}return u>=0&&(h=VJ(c,u,f,i)),f.negatives=p,f.positives=h,f.result=Twe(p,h,i),i.capture===!0?f.result=`(${f.result})`:i.wrap!==!1&&h.length+p.length>1&&(f.result=`(?:${f.result})`),dc.cache[l]=f,f.result};function Twe(r,e,t){let i=Bx(r,e,"-",!1,t)||[],n=Bx(e,r,"",!1,t)||[],s=Bx(r,e,"-?",!0,t)||[];return i.concat(s).concat(n).join("|")}function Owe(r,e){let t=1,i=1,n=ZJ(r,t),s=new Set([e]);for(;r<=n&&n<=e;)s.add(n),t+=1,n=ZJ(r,t);for(n=_J(e+1,i)-1;r<n&&n<=e;)s.add(n),i+=1,n=_J(e+1,i)-1;return s=[...s],s.sort(Uwe),s}function Mwe(r,e,t){if(r===e)return{pattern:r,count:[],digits:0};let i=Kwe(r,e),n=i.length,s="",o=0;for(let a=0;a<n;a++){let[l,c]=i[a];l===c?s+=l:l!=="0"||c!=="9"?s+=Hwe(l,c,t):o++}return o&&(s+=t.shorthand===!0?"\\d":"[0-9]"),{pattern:s,count:[o],digits:n}}function VJ(r,e,t,i){let n=Owe(r,e),s=[],o=r,a;for(let l=0;l<n.length;l++){let c=n[l],u=Mwe(String(o),String(c),i),g="";if(!t.isPadded&&a&&a.pattern===u.pattern){a.count.length>1&&a.count.pop(),a.count.push(u.count[0]),a.string=a.pattern+$J(a.count),o=c+1;continue}t.isPadded&&(g=Gwe(c,t,i)),u.string=g+u.pattern+$J(u.count),s.push(u),o=c+1,a=u}return s}function Bx(r,e,t,i,n){let s=[];for(let o of r){let{string:a}=o;!i&&!XJ(e,"string",a)&&s.push(t+a),i&&XJ(e,"string",a)&&s.push(t+a)}return s}function Kwe(r,e){let t=[];for(let i=0;i<r.length;i++)t.push([r[i],e[i]]);return t}function Uwe(r,e){return r>e?1:e>r?-1:0}function XJ(r,e,t){return r.some(i=>i[e]===t)}function ZJ(r,e){return Number(String(r).slice(0,-e)+"9".repeat(e))}function _J(r,e){return r-r%Math.pow(10,e)}function $J(r){let[e=0,t=""]=r;return t||e>1?`{${e+(t?","+t:"")}}`:""}function Hwe(r,e,t){return`[${r}${e-r===1?"":"-"}${e}]`}function eW(r){return/^-?(0+)\d/.test(r)}function Gwe(r,e,t){if(!e.isPadded)return r;let i=Math.abs(e.maxLen-String(r).length),n=t.relaxZeros!==!1;switch(i){case 0:return"";case 1:return n?"0?":"0";case 2:return n?"0{0,2}":"00";default:return n?`0{0,${i}}`:`0{${i}}`}}dc.cache={};dc.clearCache=()=>dc.cache={};tW.exports=dc});var Sx=w((ett,cW)=>{"use strict";var Ywe=J("util"),sW=rW(),iW=r=>r!==null&&typeof r=="object"&&!Array.isArray(r),jwe=r=>e=>r===!0?Number(e):String(e),Qx=r=>typeof r=="number"||typeof r=="string"&&r!=="",Kd=r=>Number.isInteger(+r),bx=r=>{let e=`${r}`,t=-1;if(e[0]==="-"&&(e=e.slice(1)),e==="0")return!1;for(;e[++t]==="0";);return t>0},qwe=(r,e,t)=>typeof r=="string"||typeof e=="string"?!0:t.stringify===!0,Jwe=(r,e,t)=>{if(e>0){let i=r[0]==="-"?"-":"";i&&(r=r.slice(1)),r=i+r.padStart(i?e-1:e,"0")}return t===!1?String(r):r},nW=(r,e)=>{let t=r[0]==="-"?"-":"";for(t&&(r=r.slice(1),e--);r.length<e;)r="0"+r;return t?"-"+r:r},Wwe=(r,e)=>{r.negatives.sort((o,a)=>o<a?-1:o>a?1:0),r.positives.sort((o,a)=>o<a?-1:o>a?1:0);let t=e.capture?"":"?:",i="",n="",s;return r.positives.length&&(i=r.positives.join("|")),r.negatives.length&&(n=`-(${t}${r.negatives.join("|")})`),i&&n?s=`${i}|${n}`:s=i||n,e.wrap?`(${t}${s})`:s},oW=(r,e,t,i)=>{if(t)return sW(r,e,{wrap:!1,...i});let n=String.fromCharCode(r);if(r===e)return n;let s=String.fromCharCode(e);return`[${n}-${s}]`},aW=(r,e,t)=>{if(Array.isArray(r)){let i=t.wrap===!0,n=t.capture?"":"?:";return i?`(${n}${r.join("|")})`:r.join("|")}return sW(r,e,t)},AW=(...r)=>new RangeError("Invalid range arguments: "+Ywe.inspect(...r)),lW=(r,e,t)=>{if(t.strictRanges===!0)throw AW([r,e]);return[]},zwe=(r,e)=>{if(e.strictRanges===!0)throw new TypeError(`Expected step "${r}" to be a number`);return[]},Vwe=(r,e,t=1,i={})=>{let n=Number(r),s=Number(e);if(!Number.isInteger(n)||!Number.isInteger(s)){if(i.strictRanges===!0)throw AW([r,e]);return[]}n===0&&(n=0),s===0&&(s=0);let o=n>s,a=String(r),l=String(e),c=String(t);t=Math.max(Math.abs(t),1);let u=bx(a)||bx(l)||bx(c),g=u?Math.max(a.length,l.length,c.length):0,f=u===!1&&qwe(r,e,i)===!1,h=i.transform||jwe(f);if(i.toRegex&&t===1)return oW(nW(r,g),nW(e,g),!0,i);let p={negatives:[],positives:[]},C=v=>p[v<0?"negatives":"positives"].push(Math.abs(v)),y=[],B=0;for(;o?n>=s:n<=s;)i.toRegex===!0&&t>1?C(n):y.push(Jwe(h(n,B),g,f)),n=o?n-t:n+t,B++;return i.toRegex===!0?t>1?Wwe(p,i):aW(y,null,{wrap:!1,...i}):y},Xwe=(r,e,t=1,i={})=>{if(!Kd(r)&&r.length>1||!Kd(e)&&e.length>1)return lW(r,e,i);let n=i.transform||(f=>String.fromCharCode(f)),s=`${r}`.charCodeAt(0),o=`${e}`.charCodeAt(0),a=s>o,l=Math.min(s,o),c=Math.max(s,o);if(i.toRegex&&t===1)return oW(l,c,!1,i);let u=[],g=0;for(;a?s>=o:s<=o;)u.push(n(s,g)),s=a?s-t:s+t,g++;return i.toRegex===!0?aW(u,null,{wrap:!1,options:i}):u},My=(r,e,t,i={})=>{if(e==null&&Qx(r))return[r];if(!Qx(r)||!Qx(e))return lW(r,e,i);if(typeof t=="function")return My(r,e,1,{transform:t});if(iW(t))return My(r,e,0,t);let n={...i};return n.capture===!0&&(n.wrap=!0),t=t||n.step||1,Kd(t)?Kd(r)&&Kd(e)?Vwe(r,e,t,n):Xwe(r,e,Math.max(Math.abs(t),1),n):t!=null&&!iW(t)?zwe(t,n):My(r,e,1,t)};cW.exports=My});var fW=w((ttt,gW)=>{"use strict";var Zwe=Sx(),uW=Ty(),_we=(r,e={})=>{let t=(i,n={})=>{let s=uW.isInvalidBrace(n),o=i.invalid===!0&&e.escapeInvalid===!0,a=s===!0||o===!0,l=e.escapeInvalid===!0?"\\":"",c="";if(i.isOpen===!0||i.isClose===!0)return l+i.value;if(i.type==="open")return a?l+i.value:"(";if(i.type==="close")return a?l+i.value:")";if(i.type==="comma")return i.prev.type==="comma"?"":a?i.value:"|";if(i.value)return i.value;if(i.nodes&&i.ranges>0){let u=uW.reduce(i.nodes),g=Zwe(...u,{...e,wrap:!1,toRegex:!0});if(g.length!==0)return u.length>1&&g.length>1?`(${g})`:g}if(i.nodes)for(let u of i.nodes)c+=t(u,i);return c};return t(r)};gW.exports=_we});var dW=w((rtt,pW)=>{"use strict";var $we=Sx(),hW=Oy(),lf=Ty(),Cc=(r="",e="",t=!1)=>{let i=[];if(r=[].concat(r),e=[].concat(e),!e.length)return r;if(!r.length)return t?lf.flatten(e).map(n=>`{${n}}`):e;for(let n of r)if(Array.isArray(n))for(let s of n)i.push(Cc(s,e,t));else for(let s of e)t===!0&&typeof s=="string"&&(s=`{${s}}`),i.push(Array.isArray(s)?Cc(n,s,t):n+s);return lf.flatten(i)},eBe=(r,e={})=>{let t=e.rangeLimit===void 0?1e3:e.rangeLimit,i=(n,s={})=>{n.queue=[];let o=s,a=s.queue;for(;o.type!=="brace"&&o.type!=="root"&&o.parent;)o=o.parent,a=o.queue;if(n.invalid||n.dollar){a.push(Cc(a.pop(),hW(n,e)));return}if(n.type==="brace"&&n.invalid!==!0&&n.nodes.length===2){a.push(Cc(a.pop(),["{}"]));return}if(n.nodes&&n.ranges>0){let g=lf.reduce(n.nodes);if(lf.exceedsLimit(...g,e.step,t))throw new RangeError("expanded array length exceeds range limit. Use options.rangeLimit to increase or disable the limit.");let f=$we(...g,e);f.length===0&&(f=hW(n,e)),a.push(Cc(a.pop(),f)),n.nodes=[];return}let l=lf.encloseBrace(n),c=n.queue,u=n;for(;u.type!=="brace"&&u.type!=="root"&&u.parent;)u=u.parent,c=u.queue;for(let g=0;g<n.nodes.length;g++){let f=n.nodes[g];if(f.type==="comma"&&n.type==="brace"){g===1&&c.push(""),c.push("");continue}if(f.type==="close"){a.push(Cc(a.pop(),c,l));continue}if(f.value&&f.type!=="open"){c.push(Cc(c.pop(),f.value));continue}f.nodes&&i(f,n)}return c};return lf.flatten(i(r))};pW.exports=eBe});var mW=w((itt,CW)=>{"use strict";CW.exports={MAX_LENGTH:1024*64,CHAR_0:"0",CHAR_9:"9",CHAR_UPPERCASE_A:"A",CHAR_LOWERCASE_A:"a",CHAR_UPPERCASE_Z:"Z",CHAR_LOWERCASE_Z:"z",CHAR_LEFT_PARENTHESES:"(",CHAR_RIGHT_PARENTHESES:")",CHAR_ASTERISK:"*",CHAR_AMPERSAND:"&",CHAR_AT:"@",CHAR_BACKSLASH:"\\",CHAR_BACKTICK:"`",CHAR_CARRIAGE_RETURN:"\r",CHAR_CIRCUMFLEX_ACCENT:"^",CHAR_COLON:":",CHAR_COMMA:",",CHAR_DOLLAR:"$",CHAR_DOT:".",CHAR_DOUBLE_QUOTE:'"',CHAR_EQUAL:"=",CHAR_EXCLAMATION_MARK:"!",CHAR_FORM_FEED:"\f",CHAR_FORWARD_SLASH:"/",CHAR_HASH:"#",CHAR_HYPHEN_MINUS:"-",CHAR_LEFT_ANGLE_BRACKET:"<",CHAR_LEFT_CURLY_BRACE:"{",CHAR_LEFT_SQUARE_BRACKET:"[",CHAR_LINE_FEED:`
-`,CHAR_NO_BREAK_SPACE:"\xA0",CHAR_PERCENT:"%",CHAR_PLUS:"+",CHAR_QUESTION_MARK:"?",CHAR_RIGHT_ANGLE_BRACKET:">",CHAR_RIGHT_CURLY_BRACE:"}",CHAR_RIGHT_SQUARE_BRACKET:"]",CHAR_SEMICOLON:";",CHAR_SINGLE_QUOTE:"'",CHAR_SPACE:" ",CHAR_TAB:"	",CHAR_UNDERSCORE:"_",CHAR_VERTICAL_LINE:"|",CHAR_ZERO_WIDTH_NOBREAK_SPACE:"\uFEFF"}});var BW=w((ntt,wW)=>{"use strict";var tBe=Oy(),{MAX_LENGTH:EW,CHAR_BACKSLASH:vx,CHAR_BACKTICK:rBe,CHAR_COMMA:iBe,CHAR_DOT:nBe,CHAR_LEFT_PARENTHESES:sBe,CHAR_RIGHT_PARENTHESES:oBe,CHAR_LEFT_CURLY_BRACE:aBe,CHAR_RIGHT_CURLY_BRACE:ABe,CHAR_LEFT_SQUARE_BRACKET:IW,CHAR_RIGHT_SQUARE_BRACKET:yW,CHAR_DOUBLE_QUOTE:lBe,CHAR_SINGLE_QUOTE:cBe,CHAR_NO_BREAK_SPACE:uBe,CHAR_ZERO_WIDTH_NOBREAK_SPACE:gBe}=mW(),fBe=(r,e={})=>{if(typeof r!="string")throw new TypeError("Expected a string");let t=e||{},i=typeof t.maxLength=="number"?Math.min(EW,t.maxLength):EW;if(r.length>i)throw new SyntaxError(`Input length (${r.length}), exceeds max characters (${i})`);let n={type:"root",input:r,nodes:[]},s=[n],o=n,a=n,l=0,c=r.length,u=0,g=0,f,h={},p=()=>r[u++],C=y=>{if(y.type==="text"&&a.type==="dot"&&(a.type="text"),a&&a.type==="text"&&y.type==="text"){a.value+=y.value;return}return o.nodes.push(y),y.parent=o,y.prev=a,a=y,y};for(C({type:"bos"});u<c;)if(o=s[s.length-1],f=p(),!(f===gBe||f===uBe)){if(f===vx){C({type:"text",value:(e.keepEscaping?f:"")+p()});continue}if(f===yW){C({type:"text",value:"\\"+f});continue}if(f===IW){l++;let y=!0,B;for(;u<c&&(B=p());){if(f+=B,B===IW){l++;continue}if(B===vx){f+=p();continue}if(B===yW&&(l--,l===0))break}C({type:"text",value:f});continue}if(f===sBe){o=C({type:"paren",nodes:[]}),s.push(o),C({type:"text",value:f});continue}if(f===oBe){if(o.type!=="paren"){C({type:"text",value:f});continue}o=s.pop(),C({type:"text",value:f}),o=s[s.length-1];continue}if(f===lBe||f===cBe||f===rBe){let y=f,B;for(e.keepQuotes!==!0&&(f="");u<c&&(B=p());){if(B===vx){f+=B+p();continue}if(B===y){e.keepQuotes===!0&&(f+=B);break}f+=B}C({type:"text",value:f});continue}if(f===aBe){g++;let y=a.value&&a.value.slice(-1)==="$"||o.dollar===!0;o=C({type:"brace",open:!0,close:!1,dollar:y,depth:g,commas:0,ranges:0,nodes:[]}),s.push(o),C({type:"open",value:f});continue}if(f===ABe){if(o.type!=="brace"){C({type:"text",value:f});continue}let y="close";o=s.pop(),o.close=!0,C({type:y,value:f}),g--,o=s[s.length-1];continue}if(f===iBe&&g>0){if(o.ranges>0){o.ranges=0;let y=o.nodes.shift();o.nodes=[y,{type:"text",value:tBe(o)}]}C({type:"comma",value:f}),o.commas++;continue}if(f===nBe&&g>0&&o.commas===0){let y=o.nodes;if(g===0||y.length===0){C({type:"text",value:f});continue}if(a.type==="dot"){if(o.range=[],a.value+=f,a.type="range",o.nodes.length!==3&&o.nodes.length!==5){o.invalid=!0,o.ranges=0,a.type="text";continue}o.ranges++,o.args=[];continue}if(a.type==="range"){y.pop();let B=y[y.length-1];B.value+=a.value+f,a=B,o.ranges--;continue}C({type:"dot",value:f});continue}C({type:"text",value:f})}do if(o=s.pop(),o.type!=="root"){o.nodes.forEach(v=>{v.nodes||(v.type==="open"&&(v.isOpen=!0),v.type==="close"&&(v.isClose=!0),v.nodes||(v.type="text"),v.invalid=!0)});let y=s[s.length-1],B=y.nodes.indexOf(o);y.nodes.splice(B,1,...o.nodes)}while(s.length>0);return C({type:"eos"}),n};wW.exports=fBe});var SW=w((stt,bW)=>{"use strict";var QW=Oy(),hBe=fW(),pBe=dW(),dBe=BW(),jn=(r,e={})=>{let t=[];if(Array.isArray(r))for(let i of r){let n=jn.create(i,e);Array.isArray(n)?t.push(...n):t.push(n)}else t=[].concat(jn.create(r,e));return e&&e.expand===!0&&e.nodupes===!0&&(t=[...new Set(t)]),t};jn.parse=(r,e={})=>dBe(r,e);jn.stringify=(r,e={})=>QW(typeof r=="string"?jn.parse(r,e):r,e);jn.compile=(r,e={})=>(typeof r=="string"&&(r=jn.parse(r,e)),hBe(r,e));jn.expand=(r,e={})=>{typeof r=="string"&&(r=jn.parse(r,e));let t=pBe(r,e);return e.noempty===!0&&(t=t.filter(Boolean)),e.nodupes===!0&&(t=[...new Set(t)]),t};jn.create=(r,e={})=>r===""||r.length<3?[r]:e.expand!==!0?jn.compile(r,e):jn.expand(r,e);bW.exports=jn});var Ud=w((ott,kW)=>{"use strict";var CBe=J("path"),Mo="\\\\/",vW=`[^${Mo}]`,Ra="\\.",mBe="\\+",EBe="\\?",Ky="\\/",IBe="(?=.)",xW="[^/]",xx=`(?:${Ky}|$)`,PW=`(?:^|${Ky})`,Px=`${Ra}{1,2}${xx}`,yBe=`(?!${Ra})`,wBe=`(?!${PW}${Px})`,BBe=`(?!${Ra}{0,1}${xx})`,QBe=`(?!${Px})`,bBe=`[^.${Ky}]`,SBe=`${xW}*?`,DW={DOT_LITERAL:Ra,PLUS_LITERAL:mBe,QMARK_LITERAL:EBe,SLASH_LITERAL:Ky,ONE_CHAR:IBe,QMARK:xW,END_ANCHOR:xx,DOTS_SLASH:Px,NO_DOT:yBe,NO_DOTS:wBe,NO_DOT_SLASH:BBe,NO_DOTS_SLASH:QBe,QMARK_NO_DOT:bBe,STAR:SBe,START_ANCHOR:PW},vBe={...DW,SLASH_LITERAL:`[${Mo}]`,QMARK:vW,STAR:`${vW}*?`,DOTS_SLASH:`${Ra}{1,2}(?:[${Mo}]|$)`,NO_DOT:`(?!${Ra})`,NO_DOTS:`(?!(?:^|[${Mo}])${Ra}{1,2}(?:[${Mo}]|$))`,NO_DOT_SLASH:`(?!${Ra}{0,1}(?:[${Mo}]|$))`,NO_DOTS_SLASH:`(?!${Ra}{1,2}(?:[${Mo}]|$))`,QMARK_NO_DOT:`[^.${Mo}]`,START_ANCHOR:`(?:^|[${Mo}])`,END_ANCHOR:`(?:[${Mo}]|$)`},xBe={alnum:"a-zA-Z0-9",alpha:"a-zA-Z",ascii:"\\x00-\\x7F",blank:" \\t",cntrl:"\\x00-\\x1F\\x7F",digit:"0-9",graph:"\\x21-\\x7E",lower:"a-z",print:"\\x20-\\x7E ",punct:"\\-!\"#$%&'()\\*+,./:;<=>?@[\\]^_`{|}~",space:" \\t\\r\\n\\v\\f",upper:"A-Z",word:"A-Za-z0-9_",xdigit:"A-Fa-f0-9"};kW.exports={MAX_LENGTH:1024*64,POSIX_REGEX_SOURCE:xBe,REGEX_BACKSLASH:/\\(?![*+?^${}(|)[\]])/g,REGEX_NON_SPECIAL_CHARS:/^[^@![\].,$*+?^{}()|\\/]+/,REGEX_SPECIAL_CHARS:/[-*+?.^${}(|)[\]]/,REGEX_SPECIAL_CHARS_BACKREF:/(\\?)((\W)(\3*))/g,REGEX_SPECIAL_CHARS_GLOBAL:/([-*+?.^${}(|)[\]])/g,REGEX_REMOVE_BACKSLASH:/(?:\[.*?[^\\]\]|\\(?=.))/g,REPLACEMENTS:{"***":"*","**/**":"**","**/**/**":"**"},CHAR_0:48,CHAR_9:57,CHAR_UPPERCASE_A:65,CHAR_LOWERCASE_A:97,CHAR_UPPERCASE_Z:90,CHAR_LOWERCASE_Z:122,CHAR_LEFT_PARENTHESES:40,CHAR_RIGHT_PARENTHESES:41,CHAR_ASTERISK:42,CHAR_AMPERSAND:38,CHAR_AT:64,CHAR_BACKWARD_SLASH:92,CHAR_CARRIAGE_RETURN:13,CHAR_CIRCUMFLEX_ACCENT:94,CHAR_COLON:58,CHAR_COMMA:44,CHAR_DOT:46,CHAR_DOUBLE_QUOTE:34,CHAR_EQUAL:61,CHAR_EXCLAMATION_MARK:33,CHAR_FORM_FEED:12,CHAR_FORWARD_SLASH:47,CHAR_GRAVE_ACCENT:96,CHAR_HASH:35,CHAR_HYPHEN_MINUS:45,CHAR_LEFT_ANGLE_BRACKET:60,CHAR_LEFT_CURLY_BRACE:123,CHAR_LEFT_SQUARE_BRACKET:91,CHAR_LINE_FEED:10,CHAR_NO_BREAK_SPACE:160,CHAR_PERCENT:37,CHAR_PLUS:43,CHAR_QUESTION_MARK:63,CHAR_RIGHT_ANGLE_BRACKET:62,CHAR_RIGHT_CURLY_BRACE:125,CHAR_RIGHT_SQUARE_BRACKET:93,CHAR_SEMICOLON:59,CHAR_SINGLE_QUOTE:39,CHAR_SPACE:32,CHAR_TAB:9,CHAR_UNDERSCORE:95,CHAR_VERTICAL_LINE:124,CHAR_ZERO_WIDTH_NOBREAK_SPACE:65279,SEP:CBe.sep,extglobChars(r){return{"!":{type:"negate",open:"(?:(?!(?:",close:`))${r.STAR})`},"?":{type:"qmark",open:"(?:",close:")?"},"+":{type:"plus",open:"(?:",close:")+"},"*":{type:"star",open:"(?:",close:")*"},"@":{type:"at",open:"(?:",close:")"}}},globChars(r){return r===!0?vBe:DW}}});var Hd=w(In=>{"use strict";var PBe=J("path"),DBe=process.platform==="win32",{REGEX_BACKSLASH:kBe,REGEX_REMOVE_BACKSLASH:RBe,REGEX_SPECIAL_CHARS:FBe,REGEX_SPECIAL_CHARS_GLOBAL:NBe}=Ud();In.isObject=r=>r!==null&&typeof r=="object"&&!Array.isArray(r);In.hasRegexChars=r=>FBe.test(r);In.isRegexChar=r=>r.length===1&&In.hasRegexChars(r);In.escapeRegex=r=>r.replace(NBe,"\\$1");In.toPosixSlashes=r=>r.replace(kBe,"/");In.removeBackslashes=r=>r.replace(RBe,e=>e==="\\"?"":e);In.supportsLookbehinds=()=>{let r=process.version.slice(1).split(".").map(Number);return r.length===3&&r[0]>=9||r[0]===8&&r[1]>=10};In.isWindows=r=>r&&typeof r.windows=="boolean"?r.windows:DBe===!0||PBe.sep==="\\";In.escapeLast=(r,e,t)=>{let i=r.lastIndexOf(e,t);return i===-1?r:r[i-1]==="\\"?In.escapeLast(r,e,i-1):`${r.slice(0,i)}\\${r.slice(i)}`};In.removePrefix=(r,e={})=>{let t=r;return t.startsWith("./")&&(t=t.slice(2),e.prefix="./"),t};In.wrapOutput=(r,e={},t={})=>{let i=t.contains?"":"^",n=t.contains?"":"$",s=`${i}(?:${r})${n}`;return e.negated===!0&&(s=`(?:^(?!${s}).*$)`),s}});var KW=w((Att,MW)=>{"use strict";var RW=Hd(),{CHAR_ASTERISK:Dx,CHAR_AT:LBe,CHAR_BACKWARD_SLASH:Gd,CHAR_COMMA:TBe,CHAR_DOT:kx,CHAR_EXCLAMATION_MARK:Rx,CHAR_FORWARD_SLASH:OW,CHAR_LEFT_CURLY_BRACE:Fx,CHAR_LEFT_PARENTHESES:Nx,CHAR_LEFT_SQUARE_BRACKET:OBe,CHAR_PLUS:MBe,CHAR_QUESTION_MARK:FW,CHAR_RIGHT_CURLY_BRACE:KBe,CHAR_RIGHT_PARENTHESES:NW,CHAR_RIGHT_SQUARE_BRACKET:UBe}=Ud(),LW=r=>r===OW||r===Gd,TW=r=>{r.isPrefix!==!0&&(r.depth=r.isGlobstar?1/0:1)},HBe=(r,e)=>{let t=e||{},i=r.length-1,n=t.parts===!0||t.scanToEnd===!0,s=[],o=[],a=[],l=r,c=-1,u=0,g=0,f=!1,h=!1,p=!1,C=!1,y=!1,B=!1,v=!1,D=!1,L=!1,H=!1,j=0,$,V,W={value:"",depth:0,isGlob:!1},_=()=>c>=i,A=()=>l.charCodeAt(c+1),ae=()=>($=V,l.charCodeAt(++c));for(;c<i;){V=ae();let ue;if(V===Gd){v=W.backslashes=!0,V=ae(),V===Fx&&(B=!0);continue}if(B===!0||V===Fx){for(j++;_()!==!0&&(V=ae());){if(V===Gd){v=W.backslashes=!0,ae();continue}if(V===Fx){j++;continue}if(B!==!0&&V===kx&&(V=ae())===kx){if(f=W.isBrace=!0,p=W.isGlob=!0,H=!0,n===!0)continue;break}if(B!==!0&&V===TBe){if(f=W.isBrace=!0,p=W.isGlob=!0,H=!0,n===!0)continue;break}if(V===KBe&&(j--,j===0)){B=!1,f=W.isBrace=!0,H=!0;break}}if(n===!0)continue;break}if(V===OW){if(s.push(c),o.push(W),W={value:"",depth:0,isGlob:!1},H===!0)continue;if($===kx&&c===u+1){u+=2;continue}g=c+1;continue}if(t.noext!==!0&&(V===MBe||V===LBe||V===Dx||V===FW||V===Rx)===!0&&A()===Nx){if(p=W.isGlob=!0,C=W.isExtglob=!0,H=!0,V===Rx&&c===u&&(L=!0),n===!0){for(;_()!==!0&&(V=ae());){if(V===Gd){v=W.backslashes=!0,V=ae();continue}if(V===NW){p=W.isGlob=!0,H=!0;break}}continue}break}if(V===Dx){if($===Dx&&(y=W.isGlobstar=!0),p=W.isGlob=!0,H=!0,n===!0)continue;break}if(V===FW){if(p=W.isGlob=!0,H=!0,n===!0)continue;break}if(V===OBe){for(;_()!==!0&&(ue=ae());){if(ue===Gd){v=W.backslashes=!0,ae();continue}if(ue===UBe){h=W.isBracket=!0,p=W.isGlob=!0,H=!0;break}}if(n===!0)continue;break}if(t.nonegate!==!0&&V===Rx&&c===u){D=W.negated=!0,u++;continue}if(t.noparen!==!0&&V===Nx){if(p=W.isGlob=!0,n===!0){for(;_()!==!0&&(V=ae());){if(V===Nx){v=W.backslashes=!0,V=ae();continue}if(V===NW){H=!0;break}}continue}break}if(p===!0){if(H=!0,n===!0)continue;break}}t.noext===!0&&(C=!1,p=!1);let ge=l,re="",O="";u>0&&(re=l.slice(0,u),l=l.slice(u),g-=u),ge&&p===!0&&g>0?(ge=l.slice(0,g),O=l.slice(g)):p===!0?(ge="",O=l):ge=l,ge&&ge!==""&&ge!=="/"&&ge!==l&&LW(ge.charCodeAt(ge.length-1))&&(ge=ge.slice(0,-1)),t.unescape===!0&&(O&&(O=RW.removeBackslashes(O)),ge&&v===!0&&(ge=RW.removeBackslashes(ge)));let F={prefix:re,input:r,start:u,base:ge,glob:O,isBrace:f,isBracket:h,isGlob:p,isExtglob:C,isGlobstar:y,negated:D,negatedExtglob:L};if(t.tokens===!0&&(F.maxDepth=0,LW(V)||o.push(W),F.tokens=o),t.parts===!0||t.tokens===!0){let ue;for(let he=0;he<s.length;he++){let ke=ue?ue+1:u,Fe=s[he],Ne=r.slice(ke,Fe);t.tokens&&(he===0&&u!==0?(o[he].isPrefix=!0,o[he].value=re):o[he].value=Ne,TW(o[he]),F.maxDepth+=o[he].depth),(he!==0||Ne!=="")&&a.push(Ne),ue=Fe}if(ue&&ue+1<r.length){let he=r.slice(ue+1);a.push(he),t.tokens&&(o[o.length-1].value=he,TW(o[o.length-1]),F.maxDepth+=o[o.length-1].depth)}F.slashes=s,F.parts=a}return F};MW.exports=HBe});var GW=w((ltt,HW)=>{"use strict";var Uy=Ud(),qn=Hd(),{MAX_LENGTH:Hy,POSIX_REGEX_SOURCE:GBe,REGEX_NON_SPECIAL_CHARS:YBe,REGEX_SPECIAL_CHARS_BACKREF:jBe,REPLACEMENTS:UW}=Uy,qBe=(r,e)=>{if(typeof e.expandRange=="function")return e.expandRange(...r,e);r.sort();let t=`[${r.join("-")}]`;try{new RegExp(t)}catch{return r.map(n=>qn.escapeRegex(n)).join("..")}return t},cf=(r,e)=>`Missing ${r}: "${e}" - use "\\\\${e}" to match literal characters`,Lx=(r,e)=>{if(typeof r!="string")throw new TypeError("Expected a string");r=UW[r]||r;let t={...e},i=typeof t.maxLength=="number"?Math.min(Hy,t.maxLength):Hy,n=r.length;if(n>i)throw new SyntaxError(`Input length: ${n}, exceeds maximum allowed length: ${i}`);let s={type:"bos",value:"",output:t.prepend||""},o=[s],a=t.capture?"":"?:",l=qn.isWindows(e),c=Uy.globChars(l),u=Uy.extglobChars(c),{DOT_LITERAL:g,PLUS_LITERAL:f,SLASH_LITERAL:h,ONE_CHAR:p,DOTS_SLASH:C,NO_DOT:y,NO_DOT_SLASH:B,NO_DOTS_SLASH:v,QMARK:D,QMARK_NO_DOT:L,STAR:H,START_ANCHOR:j}=c,$=Y=>`(${a}(?:(?!${j}${Y.dot?C:g}).)*?)`,V=t.dot?"":y,W=t.dot?D:L,_=t.bash===!0?$(t):H;t.capture&&(_=`(${_})`),typeof t.noext=="boolean"&&(t.noextglob=t.noext);let A={input:r,index:-1,start:0,dot:t.dot===!0,consumed:"",output:"",prefix:"",backtrack:!1,negated:!1,brackets:0,braces:0,parens:0,quotes:0,globstar:!1,tokens:o};r=qn.removePrefix(r,A),n=r.length;let ae=[],ge=[],re=[],O=s,F,ue=()=>A.index===n-1,he=A.peek=(Y=1)=>r[A.index+Y],ke=A.advance=()=>r[++A.index]||"",Fe=()=>r.slice(A.index+1),Ne=(Y="",pe=0)=>{A.consumed+=Y,A.index+=pe},oe=Y=>{A.output+=Y.output!=null?Y.output:Y.value,Ne(Y.value)},le=()=>{let Y=1;for(;he()==="!"&&(he(2)!=="("||he(3)==="?");)ke(),A.start++,Y++;return Y%2===0?!1:(A.negated=!0,A.start++,!0)},we=Y=>{A[Y]++,re.push(Y)},fe=Y=>{A[Y]--,re.pop()},Ae=Y=>{if(O.type==="globstar"){let pe=A.braces>0&&(Y.type==="comma"||Y.type==="brace"),ie=Y.extglob===!0||ae.length&&(Y.type==="pipe"||Y.type==="paren");Y.type!=="slash"&&Y.type!=="paren"&&!pe&&!ie&&(A.output=A.output.slice(0,-O.output.length),O.type="star",O.value="*",O.output=_,A.output+=O.output)}if(ae.length&&Y.type!=="paren"&&(ae[ae.length-1].inner+=Y.value),(Y.value||Y.output)&&oe(Y),O&&O.type==="text"&&Y.type==="text"){O.value+=Y.value,O.output=(O.output||"")+Y.value;return}Y.prev=O,o.push(Y),O=Y},qe=(Y,pe)=>{let ie={...u[pe],conditions:1,inner:""};ie.prev=O,ie.parens=A.parens,ie.output=A.output;let de=(t.capture?"(":"")+ie.open;we("parens"),Ae({type:Y,value:pe,output:A.output?"":p}),Ae({type:"paren",extglob:!0,value:ke(),output:de}),ae.push(ie)},ne=Y=>{let pe=Y.close+(t.capture?")":""),ie;if(Y.type==="negate"){let de=_;if(Y.inner&&Y.inner.length>1&&Y.inner.includes("/")&&(de=$(t)),(de!==_||ue()||/^\)+$/.test(Fe()))&&(pe=Y.close=`)$))${de}`),Y.inner.includes("*")&&(ie=Fe())&&/^\.[^\\/.]+$/.test(ie)){let _e=Lx(ie,{...e,fastpaths:!1}).output;pe=Y.close=`)${_e})${de})`}Y.prev.type==="bos"&&(A.negatedExtglob=!0)}Ae({type:"paren",extglob:!0,value:F,output:pe}),fe("parens")};if(t.fastpaths!==!1&&!/(^[*!]|[/()[\]{}"])/.test(r)){let Y=!1,pe=r.replace(jBe,(ie,de,_e,Pt,It,Or)=>Pt==="\\"?(Y=!0,ie):Pt==="?"?de?de+Pt+(It?D.repeat(It.length):""):Or===0?W+(It?D.repeat(It.length):""):D.repeat(_e.length):Pt==="."?g.repeat(_e.length):Pt==="*"?de?de+Pt+(It?_:""):_:de?ie:`\\${ie}`);return Y===!0&&(t.unescape===!0?pe=pe.replace(/\\/g,""):pe=pe.replace(/\\+/g,ie=>ie.length%2===0?"\\\\":ie?"\\":"")),pe===r&&t.contains===!0?(A.output=r,A):(A.output=qn.wrapOutput(pe,A,e),A)}for(;!ue();){if(F=ke(),F==="\0")continue;if(F==="\\"){let ie=he();if(ie==="/"&&t.bash!==!0||ie==="."||ie===";")continue;if(!ie){F+="\\",Ae({type:"text",value:F});continue}let de=/^\\+/.exec(Fe()),_e=0;if(de&&de[0].length>2&&(_e=de[0].length,A.index+=_e,_e%2!==0&&(F+="\\")),t.unescape===!0?F=ke():F+=ke(),A.brackets===0){Ae({type:"text",value:F});continue}}if(A.brackets>0&&(F!=="]"||O.value==="["||O.value==="[^")){if(t.posix!==!1&&F===":"){let ie=O.value.slice(1);if(ie.includes("[")&&(O.posix=!0,ie.includes(":"))){let de=O.value.lastIndexOf("["),_e=O.value.slice(0,de),Pt=O.value.slice(de+2),It=GBe[Pt];if(It){O.value=_e+It,A.backtrack=!0,ke(),!s.output&&o.indexOf(O)===1&&(s.output=p);continue}}}(F==="["&&he()!==":"||F==="-"&&he()==="]")&&(F=`\\${F}`),F==="]"&&(O.value==="["||O.value==="[^")&&(F=`\\${F}`),t.posix===!0&&F==="!"&&O.value==="["&&(F="^"),O.value+=F,oe({value:F});continue}if(A.quotes===1&&F!=='"'){F=qn.escapeRegex(F),O.value+=F,oe({value:F});continue}if(F==='"'){A.quotes=A.quotes===1?0:1,t.keepQuotes===!0&&Ae({type:"text",value:F});continue}if(F==="("){we("parens"),Ae({type:"paren",value:F});continue}if(F===")"){if(A.parens===0&&t.strictBrackets===!0)throw new SyntaxError(cf("opening","("));let ie=ae[ae.length-1];if(ie&&A.parens===ie.parens+1){ne(ae.pop());continue}Ae({type:"paren",value:F,output:A.parens?")":"\\)"}),fe("parens");continue}if(F==="["){if(t.nobracket===!0||!Fe().includes("]")){if(t.nobracket!==!0&&t.strictBrackets===!0)throw new SyntaxError(cf("closing","]"));F=`\\${F}`}else we("brackets");Ae({type:"bracket",value:F});continue}if(F==="]"){if(t.nobracket===!0||O&&O.type==="bracket"&&O.value.length===1){Ae({type:"text",value:F,output:`\\${F}`});continue}if(A.brackets===0){if(t.strictBrackets===!0)throw new SyntaxError(cf("opening","["));Ae({type:"text",value:F,output:`\\${F}`});continue}fe("brackets");let ie=O.value.slice(1);if(O.posix!==!0&&ie[0]==="^"&&!ie.includes("/")&&(F=`/${F}`),O.value+=F,oe({value:F}),t.literalBrackets===!1||qn.hasRegexChars(ie))continue;let de=qn.escapeRegex(O.value);if(A.output=A.output.slice(0,-O.value.length),t.literalBrackets===!0){A.output+=de,O.value=de;continue}O.value=`(${a}${de}|${O.value})`,A.output+=O.value;continue}if(F==="{"&&t.nobrace!==!0){we("braces");let ie={type:"brace",value:F,output:"(",outputIndex:A.output.length,tokensIndex:A.tokens.length};ge.push(ie),Ae(ie);continue}if(F==="}"){let ie=ge[ge.length-1];if(t.nobrace===!0||!ie){Ae({type:"text",value:F,output:F});continue}let de=")";if(ie.dots===!0){let _e=o.slice(),Pt=[];for(let It=_e.length-1;It>=0&&(o.pop(),_e[It].type!=="brace");It--)_e[It].type!=="dots"&&Pt.unshift(_e[It].value);de=qBe(Pt,t),A.backtrack=!0}if(ie.comma!==!0&&ie.dots!==!0){let _e=A.output.slice(0,ie.outputIndex),Pt=A.tokens.slice(ie.tokensIndex);ie.value=ie.output="\\{",F=de="\\}",A.output=_e;for(let It of Pt)A.output+=It.output||It.value}Ae({type:"brace",value:F,output:de}),fe("braces"),ge.pop();continue}if(F==="|"){ae.length>0&&ae[ae.length-1].conditions++,Ae({type:"text",value:F});continue}if(F===","){let ie=F,de=ge[ge.length-1];de&&re[re.length-1]==="braces"&&(de.comma=!0,ie="|"),Ae({type:"comma",value:F,output:ie});continue}if(F==="/"){if(O.type==="dot"&&A.index===A.start+1){A.start=A.index+1,A.consumed="",A.output="",o.pop(),O=s;continue}Ae({type:"slash",value:F,output:h});continue}if(F==="."){if(A.braces>0&&O.type==="dot"){O.value==="."&&(O.output=g);let ie=ge[ge.length-1];O.type="dots",O.output+=F,O.value+=F,ie.dots=!0;continue}if(A.braces+A.parens===0&&O.type!=="bos"&&O.type!=="slash"){Ae({type:"text",value:F,output:g});continue}Ae({type:"dot",value:F,output:g});continue}if(F==="?"){if(!(O&&O.value==="(")&&t.noextglob!==!0&&he()==="("&&he(2)!=="?"){qe("qmark",F);continue}if(O&&O.type==="paren"){let de=he(),_e=F;if(de==="<"&&!qn.supportsLookbehinds())throw new Error("Node.js v10 or higher is required for regex lookbehinds");(O.value==="("&&!/[!=<:]/.test(de)||de==="<"&&!/<([!=]|\w+>)/.test(Fe()))&&(_e=`\\${F}`),Ae({type:"text",value:F,output:_e});continue}if(t.dot!==!0&&(O.type==="slash"||O.type==="bos")){Ae({type:"qmark",value:F,output:L});continue}Ae({type:"qmark",value:F,output:D});continue}if(F==="!"){if(t.noextglob!==!0&&he()==="("&&(he(2)!=="?"||!/[!=<:]/.test(he(3)))){qe("negate",F);continue}if(t.nonegate!==!0&&A.index===0){le();continue}}if(F==="+"){if(t.noextglob!==!0&&he()==="("&&he(2)!=="?"){qe("plus",F);continue}if(O&&O.value==="("||t.regex===!1){Ae({type:"plus",value:F,output:f});continue}if(O&&(O.type==="bracket"||O.type==="paren"||O.type==="brace")||A.parens>0){Ae({type:"plus",value:F});continue}Ae({type:"plus",value:f});continue}if(F==="@"){if(t.noextglob!==!0&&he()==="("&&he(2)!=="?"){Ae({type:"at",extglob:!0,value:F,output:""});continue}Ae({type:"text",value:F});continue}if(F!=="*"){(F==="$"||F==="^")&&(F=`\\${F}`);let ie=YBe.exec(Fe());ie&&(F+=ie[0],A.index+=ie[0].length),Ae({type:"text",value:F});continue}if(O&&(O.type==="globstar"||O.star===!0)){O.type="star",O.star=!0,O.value+=F,O.output=_,A.backtrack=!0,A.globstar=!0,Ne(F);continue}let Y=Fe();if(t.noextglob!==!0&&/^\([^?]/.test(Y)){qe("star",F);continue}if(O.type==="star"){if(t.noglobstar===!0){Ne(F);continue}let ie=O.prev,de=ie.prev,_e=ie.type==="slash"||ie.type==="bos",Pt=de&&(de.type==="star"||de.type==="globstar");if(t.bash===!0&&(!_e||Y[0]&&Y[0]!=="/")){Ae({type:"star",value:F,output:""});continue}let It=A.braces>0&&(ie.type==="comma"||ie.type==="brace"),Or=ae.length&&(ie.type==="pipe"||ie.type==="paren");if(!_e&&ie.type!=="paren"&&!It&&!Or){Ae({type:"star",value:F,output:""});continue}for(;Y.slice(0,3)==="/**";){let ii=r[A.index+4];if(ii&&ii!=="/")break;Y=Y.slice(3),Ne("/**",3)}if(ie.type==="bos"&&ue()){O.type="globstar",O.value+=F,O.output=$(t),A.output=O.output,A.globstar=!0,Ne(F);continue}if(ie.type==="slash"&&ie.prev.type!=="bos"&&!Pt&&ue()){A.output=A.output.slice(0,-(ie.output+O.output).length),ie.output=`(?:${ie.output}`,O.type="globstar",O.output=$(t)+(t.strictSlashes?")":"|$)"),O.value+=F,A.globstar=!0,A.output+=ie.output+O.output,Ne(F);continue}if(ie.type==="slash"&&ie.prev.type!=="bos"&&Y[0]==="/"){let ii=Y[1]!==void 0?"|$":"";A.output=A.output.slice(0,-(ie.output+O.output).length),ie.output=`(?:${ie.output}`,O.type="globstar",O.output=`${$(t)}${h}|${h}${ii})`,O.value+=F,A.output+=ie.output+O.output,A.globstar=!0,Ne(F+ke()),Ae({type:"slash",value:"/",output:""});continue}if(ie.type==="bos"&&Y[0]==="/"){O.type="globstar",O.value+=F,O.output=`(?:^|${h}|${$(t)}${h})`,A.output=O.output,A.globstar=!0,Ne(F+ke()),Ae({type:"slash",value:"/",output:""});continue}A.output=A.output.slice(0,-O.output.length),O.type="globstar",O.output=$(t),O.value+=F,A.output+=O.output,A.globstar=!0,Ne(F);continue}let pe={type:"star",value:F,output:_};if(t.bash===!0){pe.output=".*?",(O.type==="bos"||O.type==="slash")&&(pe.output=V+pe.output),Ae(pe);continue}if(O&&(O.type==="bracket"||O.type==="paren")&&t.regex===!0){pe.output=F,Ae(pe);continue}(A.index===A.start||O.type==="slash"||O.type==="dot")&&(O.type==="dot"?(A.output+=B,O.output+=B):t.dot===!0?(A.output+=v,O.output+=v):(A.output+=V,O.output+=V),he()!=="*"&&(A.output+=p,O.output+=p)),Ae(pe)}for(;A.brackets>0;){if(t.strictBrackets===!0)throw new SyntaxError(cf("closing","]"));A.output=qn.escapeLast(A.output,"["),fe("brackets")}for(;A.parens>0;){if(t.strictBrackets===!0)throw new SyntaxError(cf("closing",")"));A.output=qn.escapeLast(A.output,"("),fe("parens")}for(;A.braces>0;){if(t.strictBrackets===!0)throw new SyntaxError(cf("closing","}"));A.output=qn.escapeLast(A.output,"{"),fe("braces")}if(t.strictSlashes!==!0&&(O.type==="star"||O.type==="bracket")&&Ae({type:"maybe_slash",value:"",output:`${h}?`}),A.backtrack===!0){A.output="";for(let Y of A.tokens)A.output+=Y.output!=null?Y.output:Y.value,Y.suffix&&(A.output+=Y.suffix)}return A};Lx.fastpaths=(r,e)=>{let t={...e},i=typeof t.maxLength=="number"?Math.min(Hy,t.maxLength):Hy,n=r.length;if(n>i)throw new SyntaxError(`Input length: ${n}, exceeds maximum allowed length: ${i}`);r=UW[r]||r;let s=qn.isWindows(e),{DOT_LITERAL:o,SLASH_LITERAL:a,ONE_CHAR:l,DOTS_SLASH:c,NO_DOT:u,NO_DOTS:g,NO_DOTS_SLASH:f,STAR:h,START_ANCHOR:p}=Uy.globChars(s),C=t.dot?g:u,y=t.dot?f:u,B=t.capture?"":"?:",v={negated:!1,prefix:""},D=t.bash===!0?".*?":h;t.capture&&(D=`(${D})`);let L=V=>V.noglobstar===!0?D:`(${B}(?:(?!${p}${V.dot?c:o}).)*?)`,H=V=>{switch(V){case"*":return`${C}${l}${D}`;case".*":return`${o}${l}${D}`;case"*.*":return`${C}${D}${o}${l}${D}`;case"*/*":return`${C}${D}${a}${l}${y}${D}`;case"**":return C+L(t);case"**/*":return`(?:${C}${L(t)}${a})?${y}${l}${D}`;case"**/*.*":return`(?:${C}${L(t)}${a})?${y}${D}${o}${l}${D}`;case"**/.*":return`(?:${C}${L(t)}${a})?${o}${l}${D}`;default:{let W=/^(.*?)\.(\w+)$/.exec(V);if(!W)return;let _=H(W[1]);return _?_+o+W[2]:void 0}}},j=qn.removePrefix(r,v),$=H(j);return $&&t.strictSlashes!==!0&&($+=`${a}?`),$};HW.exports=Lx});var jW=w((ctt,YW)=>{"use strict";var JBe=J("path"),WBe=KW(),Tx=GW(),Ox=Hd(),zBe=Ud(),VBe=r=>r&&typeof r=="object"&&!Array.isArray(r),Yr=(r,e,t=!1)=>{if(Array.isArray(r)){let u=r.map(f=>Yr(f,e,t));return f=>{for(let h of u){let p=h(f);if(p)return p}return!1}}let i=VBe(r)&&r.tokens&&r.input;if(r===""||typeof r!="string"&&!i)throw new TypeError("Expected pattern to be a non-empty string");let n=e||{},s=Ox.isWindows(e),o=i?Yr.compileRe(r,e):Yr.makeRe(r,e,!1,!0),a=o.state;delete o.state;let l=()=>!1;if(n.ignore){let u={...e,ignore:null,onMatch:null,onResult:null};l=Yr(n.ignore,u,t)}let c=(u,g=!1)=>{let{isMatch:f,match:h,output:p}=Yr.test(u,o,e,{glob:r,posix:s}),C={glob:r,state:a,regex:o,posix:s,input:u,output:p,match:h,isMatch:f};return typeof n.onResult=="function"&&n.onResult(C),f===!1?(C.isMatch=!1,g?C:!1):l(u)?(typeof n.onIgnore=="function"&&n.onIgnore(C),C.isMatch=!1,g?C:!1):(typeof n.onMatch=="function"&&n.onMatch(C),g?C:!0)};return t&&(c.state=a),c};Yr.test=(r,e,t,{glob:i,posix:n}={})=>{if(typeof r!="string")throw new TypeError("Expected input to be a string");if(r==="")return{isMatch:!1,output:""};let s=t||{},o=s.format||(n?Ox.toPosixSlashes:null),a=r===i,l=a&&o?o(r):r;return a===!1&&(l=o?o(r):r,a=l===i),(a===!1||s.capture===!0)&&(s.matchBase===!0||s.basename===!0?a=Yr.matchBase(r,e,t,n):a=e.exec(l)),{isMatch:Boolean(a),match:a,output:l}};Yr.matchBase=(r,e,t,i=Ox.isWindows(t))=>(e instanceof RegExp?e:Yr.makeRe(e,t)).test(JBe.basename(r));Yr.isMatch=(r,e,t)=>Yr(e,t)(r);Yr.parse=(r,e)=>Array.isArray(r)?r.map(t=>Yr.parse(t,e)):Tx(r,{...e,fastpaths:!1});Yr.scan=(r,e)=>WBe(r,e);Yr.compileRe=(r,e,t=!1,i=!1)=>{if(t===!0)return r.output;let n=e||{},s=n.contains?"":"^",o=n.contains?"":"$",a=`${s}(?:${r.output})${o}`;r&&r.negated===!0&&(a=`^(?!${a}).*$`);let l=Yr.toRegex(a,e);return i===!0&&(l.state=r),l};Yr.makeRe=(r,e={},t=!1,i=!1)=>{if(!r||typeof r!="string")throw new TypeError("Expected a non-empty string");let n={negated:!1,fastpaths:!0};return e.fastpaths!==!1&&(r[0]==="."||r[0]==="*")&&(n.output=Tx.fastpaths(r,e)),n.output||(n=Tx(r,e)),Yr.compileRe(n,e,t,i)};Yr.toRegex=(r,e)=>{try{let t=e||{};return new RegExp(r,t.flags||(t.nocase?"i":""))}catch(t){if(e&&e.debug===!0)throw t;return/$^/}};Yr.constants=zBe;YW.exports=Yr});var Mx=w((utt,qW)=>{"use strict";qW.exports=jW()});var yn=w((gtt,VW)=>{"use strict";var WW=J("util"),zW=SW(),Ko=Mx(),Kx=Hd(),JW=r=>r===""||r==="./",Sr=(r,e,t)=>{e=[].concat(e),r=[].concat(r);let i=new Set,n=new Set,s=new Set,o=0,a=u=>{s.add(u.output),t&&t.onResult&&t.onResult(u)};for(let u=0;u<e.length;u++){let g=Ko(String(e[u]),{...t,onResult:a},!0),f=g.state.negated||g.state.negatedExtglob;f&&o++;for(let h of r){let p=g(h,!0);!(f?!p.isMatch:p.isMatch)||(f?i.add(p.output):(i.delete(p.output),n.add(p.output)))}}let c=(o===e.length?[...s]:[...n]).filter(u=>!i.has(u));if(t&&c.length===0){if(t.failglob===!0)throw new Error(`No matches found for "${e.join(", ")}"`);if(t.nonull===!0||t.nullglob===!0)return t.unescape?e.map(u=>u.replace(/\\/g,"")):e}return c};Sr.match=Sr;Sr.matcher=(r,e)=>Ko(r,e);Sr.isMatch=(r,e,t)=>Ko(e,t)(r);Sr.any=Sr.isMatch;Sr.not=(r,e,t={})=>{e=[].concat(e).map(String);let i=new Set,n=[],o=Sr(r,e,{...t,onResult:a=>{t.onResult&&t.onResult(a),n.push(a.output)}});for(let a of n)o.includes(a)||i.add(a);return[...i]};Sr.contains=(r,e,t)=>{if(typeof r!="string")throw new TypeError(`Expected a string: "${WW.inspect(r)}"`);if(Array.isArray(e))return e.some(i=>Sr.contains(r,i,t));if(typeof e=="string"){if(JW(r)||JW(e))return!1;if(r.includes(e)||r.startsWith("./")&&r.slice(2).includes(e))return!0}return Sr.isMatch(r,e,{...t,contains:!0})};Sr.matchKeys=(r,e,t)=>{if(!Kx.isObject(r))throw new TypeError("Expected the first argument to be an object");let i=Sr(Object.keys(r),e,t),n={};for(let s of i)n[s]=r[s];return n};Sr.some=(r,e,t)=>{let i=[].concat(r);for(let n of[].concat(e)){let s=Ko(String(n),t);if(i.some(o=>s(o)))return!0}return!1};Sr.every=(r,e,t)=>{let i=[].concat(r);for(let n of[].concat(e)){let s=Ko(String(n),t);if(!i.every(o=>s(o)))return!1}return!0};Sr.all=(r,e,t)=>{if(typeof r!="string")throw new TypeError(`Expected a string: "${WW.inspect(r)}"`);return[].concat(e).every(i=>Ko(i,t)(r))};Sr.capture=(r,e,t)=>{let i=Kx.isWindows(t),s=Ko.makeRe(String(r),{...t,capture:!0}).exec(i?Kx.toPosixSlashes(e):e);if(s)return s.slice(1).map(o=>o===void 0?"":o)};Sr.makeRe=(...r)=>Ko.makeRe(...r);Sr.scan=(...r)=>Ko.scan(...r);Sr.parse=(r,e)=>{let t=[];for(let i of[].concat(r||[]))for(let n of zW(String(i),e))t.push(Ko.parse(n,e));return t};Sr.braces=(r,e)=>{if(typeof r!="string")throw new TypeError("Expected a string");return e&&e.nobrace===!0||!/\{.*\}/.test(r)?[r]:zW(r,e)};Sr.braceExpand=(r,e)=>{if(typeof r!="string")throw new TypeError("Expected a string");return Sr.braces(r,{...e,expand:!0})};VW.exports=Sr});var ZW=w((ftt,XW)=>{"use strict";XW.exports=({onlyFirst:r=!1}={})=>{let e=["[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)","(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))"].join("|");return new RegExp(e,r?void 0:"g")}});var $W=w((htt,_W)=>{"use strict";var XBe=ZW();_W.exports=r=>typeof r=="string"?r.replace(XBe(),""):r});var f4=w((btt,g4)=>{"use strict";g4.exports=(...r)=>[...new Set([].concat(...r))]});var sP=w((Stt,d4)=>{"use strict";var l0e=J("stream"),h4=l0e.PassThrough,c0e=Array.prototype.slice;d4.exports=u0e;function u0e(){let r=[],e=!1,t=c0e.call(arguments),i=t[t.length-1];i&&!Array.isArray(i)&&i.pipe==null?t.pop():i={};let n=i.end!==!1;i.objectMode==null&&(i.objectMode=!0),i.highWaterMark==null&&(i.highWaterMark=64*1024);let s=h4(i);function o(){for(let c=0,u=arguments.length;c<u;c++)r.push(p4(arguments[c],i));return a(),this}function a(){if(e)return;e=!0;let c=r.shift();if(!c){process.nextTick(l);return}Array.isArray(c)||(c=[c]);let u=c.length+1;function g(){--u>0||(e=!1,a())}function f(h){function p(){h.removeListener("merge2UnpipeEnd",p),h.removeListener("end",p),g()}if(h._readableState.endEmitted)return g();h.on("merge2UnpipeEnd",p),h.on("end",p),h.pipe(s,{end:!1}),h.resume()}for(let h=0;h<c.length;h++)f(c[h]);g()}function l(){return e=!1,s.emit("queueDrain"),n&&s.end()}return s.setMaxListeners(0),s.add=o,s.on("unpipe",function(c){c.emit("merge2UnpipeEnd")}),t.length&&o.apply(null,t),s}function p4(r,e){if(Array.isArray(r))for(let t=0,i=r.length;t<i;t++)r[t]=p4(r[t],e);else{if(!r._readableState&&r.pipe&&(r=r.pipe(h4(e))),!r._readableState||!r.pause||!r.pipe)throw new Error("Only readable stream can be merged.");r.pause()}return r}});var C4=w(Wy=>{"use strict";Object.defineProperty(Wy,"__esModule",{value:!0});function g0e(r){return r.reduce((e,t)=>[].concat(e,t),[])}Wy.flatten=g0e;function f0e(r,e){let t=[[]],i=0;for(let n of r)e(n)?(i++,t[i]=[]):t[i].push(n);return t}Wy.splitWhen=f0e});var m4=w(oP=>{"use strict";Object.defineProperty(oP,"__esModule",{value:!0});function h0e(r){return r.code==="ENOENT"}oP.isEnoentCodeError=h0e});var E4=w(AP=>{"use strict";Object.defineProperty(AP,"__esModule",{value:!0});var aP=class{constructor(e,t){this.name=e,this.isBlockDevice=t.isBlockDevice.bind(t),this.isCharacterDevice=t.isCharacterDevice.bind(t),this.isDirectory=t.isDirectory.bind(t),this.isFIFO=t.isFIFO.bind(t),this.isFile=t.isFile.bind(t),this.isSocket=t.isSocket.bind(t),this.isSymbolicLink=t.isSymbolicLink.bind(t)}};function p0e(r,e){return new aP(r,e)}AP.createDirentFromStats=p0e});var I4=w(mf=>{"use strict";Object.defineProperty(mf,"__esModule",{value:!0});var d0e=J("path"),C0e=2,m0e=/(\\?)([()*?[\]{|}]|^!|[!+@](?=\())/g;function E0e(r){return r.replace(/\\/g,"/")}mf.unixify=E0e;function I0e(r,e){return d0e.resolve(r,e)}mf.makeAbsolute=I0e;function y0e(r){return r.replace(m0e,"\\$2")}mf.escape=y0e;function w0e(r){if(r.charAt(0)==="."){let e=r.charAt(1);if(e==="/"||e==="\\")return r.slice(C0e)}return r}mf.removeLeadingDotSegment=w0e});var w4=w((ktt,y4)=>{y4.exports=function(e){if(typeof e!="string"||e==="")return!1;for(var t;t=/(\\).|([@?!+*]\(.*\))/g.exec(e);){if(t[2])return!0;e=e.slice(t.index+t[0].length)}return!1}});var b4=w((Rtt,Q4)=>{var B0e=w4(),B4={"{":"}","(":")","[":"]"},Q0e=function(r){if(r[0]==="!")return!0;for(var e=0,t=-2,i=-2,n=-2,s=-2,o=-2;e<r.length;){if(r[e]==="*"||r[e+1]==="?"&&/[\].+)]/.test(r[e])||i!==-1&&r[e]==="["&&r[e+1]!=="]"&&(i<e&&(i=r.indexOf("]",e)),i>e&&(o===-1||o>i||(o=r.indexOf("\\",e),o===-1||o>i)))||n!==-1&&r[e]==="{"&&r[e+1]!=="}"&&(n=r.indexOf("}",e),n>e&&(o=r.indexOf("\\",e),o===-1||o>n))||s!==-1&&r[e]==="("&&r[e+1]==="?"&&/[:!=]/.test(r[e+2])&&r[e+3]!==")"&&(s=r.indexOf(")",e),s>e&&(o=r.indexOf("\\",e),o===-1||o>s))||t!==-1&&r[e]==="("&&r[e+1]!=="|"&&(t<e&&(t=r.indexOf("|",e)),t!==-1&&r[t+1]!==")"&&(s=r.indexOf(")",t),s>t&&(o=r.indexOf("\\",t),o===-1||o>s))))return!0;if(r[e]==="\\"){var a=r[e+1];e+=2;var l=B4[a];if(l){var c=r.indexOf(l,e);c!==-1&&(e=c+1)}if(r[e]==="!")return!0}else e++}return!1},b0e=function(r){if(r[0]==="!")return!0;for(var e=0;e<r.length;){if(/[*?{}()[\]]/.test(r[e]))return!0;if(r[e]==="\\"){var t=r[e+1];e+=2;var i=B4[t];if(i){var n=r.indexOf(i,e);n!==-1&&(e=n+1)}if(r[e]==="!")return!0}else e++}return!1};Q4.exports=function(e,t){if(typeof e!="string"||e==="")return!1;if(B0e(e))return!0;var i=Q0e;return t&&t.strict===!1&&(i=b0e),i(e)}});var v4=w((Ftt,S4)=>{"use strict";var S0e=b4(),v0e=J("path").posix.dirname,x0e=J("os").platform()==="win32",lP="/",P0e=/\\/g,D0e=/[\{\[].*[\}\]]$/,k0e=/(^|[^\\])([\{\[]|\([^\)]+$)/,R0e=/\\([\!\*\?\|\[\]\(\)\{\}])/g;S4.exports=function(e,t){var i=Object.assign({flipBackslashes:!0},t);i.flipBackslashes&&x0e&&e.indexOf(lP)<0&&(e=e.replace(P0e,lP)),D0e.test(e)&&(e+=lP),e+="a";do e=v0e(e);while(S0e(e)||k0e.test(e));return e.replace(R0e,"$1")}});var T4=w($r=>{"use strict";Object.defineProperty($r,"__esModule",{value:!0});var F0e=J("path"),N0e=v4(),x4=yn(),L0e=Mx(),P4="**",T0e="\\",O0e=/[*?]|^!/,M0e=/\[.*]/,K0e=/(?:^|[^!*+?@])\(.*\|.*\)/,U0e=/[!*+?@]\(.*\)/,H0e=/{.*(?:,|\.\.).*}/;function D4(r,e={}){return!k4(r,e)}$r.isStaticPattern=D4;function k4(r,e={}){return!!(e.caseSensitiveMatch===!1||r.includes(T0e)||O0e.test(r)||M0e.test(r)||K0e.test(r)||e.extglob!==!1&&U0e.test(r)||e.braceExpansion!==!1&&H0e.test(r))}$r.isDynamicPattern=k4;function G0e(r){return zy(r)?r.slice(1):r}$r.convertToPositivePattern=G0e;function Y0e(r){return"!"+r}$r.convertToNegativePattern=Y0e;function zy(r){return r.startsWith("!")&&r[1]!=="("}$r.isNegativePattern=zy;function R4(r){return!zy(r)}$r.isPositivePattern=R4;function j0e(r){return r.filter(zy)}$r.getNegativePatterns=j0e;function q0e(r){return r.filter(R4)}$r.getPositivePatterns=q0e;function J0e(r){return N0e(r,{flipBackslashes:!1})}$r.getBaseDirectory=J0e;function W0e(r){return r.includes(P4)}$r.hasGlobStar=W0e;function F4(r){return r.endsWith("/"+P4)}$r.endsWithSlashGlobStar=F4;function z0e(r){let e=F0e.basename(r);return F4(r)||D4(e)}$r.isAffectDepthOfReadingPattern=z0e;function V0e(r){return r.reduce((e,t)=>e.concat(N4(t)),[])}$r.expandPatternsWithBraceExpansion=V0e;function N4(r){return x4.braces(r,{expand:!0,nodupes:!0})}$r.expandBraceExpansion=N4;function X0e(r,e){let t=L0e.scan(r,Object.assign(Object.assign({},e),{parts:!0}));return t.parts.length===0?[r]:t.parts}$r.getPatternParts=X0e;function L4(r,e){return x4.makeRe(r,e)}$r.makeRe=L4;function Z0e(r,e){return r.map(t=>L4(t,e))}$r.convertPatternsToRe=Z0e;function _0e(r,e){return e.some(t=>t.test(r))}$r.matchAny=_0e});var M4=w(cP=>{"use strict";Object.defineProperty(cP,"__esModule",{value:!0});var $0e=sP();function eQe(r){let e=$0e(r);return r.forEach(t=>{t.once("error",i=>e.emit("error",i))}),e.once("close",()=>O4(r)),e.once("end",()=>O4(r)),e}cP.merge=eQe;function O4(r){r.forEach(e=>e.emit("close"))}});var K4=w(Vy=>{"use strict";Object.defineProperty(Vy,"__esModule",{value:!0});function tQe(r){return typeof r=="string"}Vy.isString=tQe;function rQe(r){return r===""}Vy.isEmpty=rQe});var La=w(Na=>{"use strict";Object.defineProperty(Na,"__esModule",{value:!0});var iQe=C4();Na.array=iQe;var nQe=m4();Na.errno=nQe;var sQe=E4();Na.fs=sQe;var oQe=I4();Na.path=oQe;var aQe=T4();Na.pattern=aQe;var AQe=M4();Na.stream=AQe;var lQe=K4();Na.string=lQe});var j4=w(Ta=>{"use strict";Object.defineProperty(Ta,"__esModule",{value:!0});var Ic=La();function cQe(r,e){let t=U4(r),i=H4(r,e.ignore),n=t.filter(l=>Ic.pattern.isStaticPattern(l,e)),s=t.filter(l=>Ic.pattern.isDynamicPattern(l,e)),o=uP(n,i,!1),a=uP(s,i,!0);return o.concat(a)}Ta.generate=cQe;function uP(r,e,t){let i=G4(r);return"."in i?[gP(".",r,e,t)]:Y4(i,e,t)}Ta.convertPatternsToTasks=uP;function U4(r){return Ic.pattern.getPositivePatterns(r)}Ta.getPositivePatterns=U4;function H4(r,e){return Ic.pattern.getNegativePatterns(r).concat(e).map(Ic.pattern.convertToPositivePattern)}Ta.getNegativePatternsAsPositive=H4;function G4(r){let e={};return r.reduce((t,i)=>{let n=Ic.pattern.getBaseDirectory(i);return n in t?t[n].push(i):t[n]=[i],t},e)}Ta.groupPatternsByBaseDirectory=G4;function Y4(r,e,t){return Object.keys(r).map(i=>gP(i,r[i],e,t))}Ta.convertPatternGroupsToTasks=Y4;function gP(r,e,t,i){return{dynamic:i,positive:e,negative:t,base:r,patterns:[].concat(e,t.map(Ic.pattern.convertToNegativePattern))}}Ta.convertPatternGroupToTask=gP});var J4=w(Xy=>{"use strict";Object.defineProperty(Xy,"__esModule",{value:!0});Xy.read=void 0;function uQe(r,e,t){e.fs.lstat(r,(i,n)=>{if(i!==null){q4(t,i);return}if(!n.isSymbolicLink()||!e.followSymbolicLink){fP(t,n);return}e.fs.stat(r,(s,o)=>{if(s!==null){if(e.throwErrorOnBrokenSymbolicLink){q4(t,s);return}fP(t,n);return}e.markSymbolicLink&&(o.isSymbolicLink=()=>!0),fP(t,o)})})}Xy.read=uQe;function q4(r,e){r(e)}function fP(r,e){r(null,e)}});var W4=w(Zy=>{"use strict";Object.defineProperty(Zy,"__esModule",{value:!0});Zy.read=void 0;function gQe(r,e){let t=e.fs.lstatSync(r);if(!t.isSymbolicLink()||!e.followSymbolicLink)return t;try{let i=e.fs.statSync(r);return e.markSymbolicLink&&(i.isSymbolicLink=()=>!0),i}catch(i){if(!e.throwErrorOnBrokenSymbolicLink)return t;throw i}}Zy.read=gQe});var z4=w(KA=>{"use strict";Object.defineProperty(KA,"__esModule",{value:!0});KA.createFileSystemAdapter=KA.FILE_SYSTEM_ADAPTER=void 0;var _y=J("fs");KA.FILE_SYSTEM_ADAPTER={lstat:_y.lstat,stat:_y.stat,lstatSync:_y.lstatSync,statSync:_y.statSync};function fQe(r){return r===void 0?KA.FILE_SYSTEM_ADAPTER:Object.assign(Object.assign({},KA.FILE_SYSTEM_ADAPTER),r)}KA.createFileSystemAdapter=fQe});var V4=w(pP=>{"use strict";Object.defineProperty(pP,"__esModule",{value:!0});var hQe=z4(),hP=class{constructor(e={}){this._options=e,this.followSymbolicLink=this._getValue(this._options.followSymbolicLink,!0),this.fs=hQe.createFileSystemAdapter(this._options.fs),this.markSymbolicLink=this._getValue(this._options.markSymbolicLink,!1),this.throwErrorOnBrokenSymbolicLink=this._getValue(this._options.throwErrorOnBrokenSymbolicLink,!0)}_getValue(e,t){return e!=null?e:t}};pP.default=hP});var yc=w(UA=>{"use strict";Object.defineProperty(UA,"__esModule",{value:!0});UA.statSync=UA.stat=UA.Settings=void 0;var X4=J4(),pQe=W4(),dP=V4();UA.Settings=dP.default;function dQe(r,e,t){if(typeof e=="function"){X4.read(r,CP(),e);return}X4.read(r,CP(e),t)}UA.stat=dQe;function CQe(r,e){let t=CP(e);return pQe.read(r,t)}UA.statSync=CQe;function CP(r={}){return r instanceof dP.default?r:new dP.default(r)}});var _4=w((jtt,Z4)=>{Z4.exports=mQe;function mQe(r,e){var t,i,n,s=!0;Array.isArray(r)?(t=[],i=r.length):(n=Object.keys(r),t={},i=n.length);function o(l){function c(){e&&e(l,t),e=null}s?process.nextTick(c):c()}function a(l,c,u){t[l]=u,(--i===0||c)&&o(c)}i?n?n.forEach(function(l){r[l](function(c,u){a(l,c,u)})}):r.forEach(function(l,c){l(function(u,g){a(c,u,g)})}):o(null),s=!1}});var mP=w(ew=>{"use strict";Object.defineProperty(ew,"__esModule",{value:!0});ew.IS_SUPPORT_READDIR_WITH_FILE_TYPES=void 0;var $y=process.versions.node.split(".");if($y[0]===void 0||$y[1]===void 0)throw new Error(`Unexpected behavior. The 'process.versions.node' variable has invalid value: ${process.versions.node}`);var $4=Number.parseInt($y[0],10),EQe=Number.parseInt($y[1],10),e3=10,IQe=10,yQe=$4>e3,wQe=$4===e3&&EQe>=IQe;ew.IS_SUPPORT_READDIR_WITH_FILE_TYPES=yQe||wQe});var t3=w(tw=>{"use strict";Object.defineProperty(tw,"__esModule",{value:!0});tw.createDirentFromStats=void 0;var EP=class{constructor(e,t){this.name=e,this.isBlockDevice=t.isBlockDevice.bind(t),this.isCharacterDevice=t.isCharacterDevice.bind(t),this.isDirectory=t.isDirectory.bind(t),this.isFIFO=t.isFIFO.bind(t),this.isFile=t.isFile.bind(t),this.isSocket=t.isSocket.bind(t),this.isSymbolicLink=t.isSymbolicLink.bind(t)}};function BQe(r,e){return new EP(r,e)}tw.createDirentFromStats=BQe});var IP=w(rw=>{"use strict";Object.defineProperty(rw,"__esModule",{value:!0});rw.fs=void 0;var QQe=t3();rw.fs=QQe});var yP=w(iw=>{"use strict";Object.defineProperty(iw,"__esModule",{value:!0});iw.joinPathSegments=void 0;function bQe(r,e,t){return r.endsWith(t)?r+e:r+t+e}iw.joinPathSegments=bQe});var a3=w(HA=>{"use strict";Object.defineProperty(HA,"__esModule",{value:!0});HA.readdir=HA.readdirWithFileTypes=HA.read=void 0;var SQe=yc(),r3=_4(),vQe=mP(),i3=IP(),n3=yP();function xQe(r,e,t){if(!e.stats&&vQe.IS_SUPPORT_READDIR_WITH_FILE_TYPES){s3(r,e,t);return}o3(r,e,t)}HA.read=xQe;function s3(r,e,t){e.fs.readdir(r,{withFileTypes:!0},(i,n)=>{if(i!==null){nw(t,i);return}let s=n.map(a=>({dirent:a,name:a.name,path:n3.joinPathSegments(r,a.name,e.pathSegmentSeparator)}));if(!e.followSymbolicLinks){wP(t,s);return}let o=s.map(a=>PQe(a,e));r3(o,(a,l)=>{if(a!==null){nw(t,a);return}wP(t,l)})})}HA.readdirWithFileTypes=s3;function PQe(r,e){return t=>{if(!r.dirent.isSymbolicLink()){t(null,r);return}e.fs.stat(r.path,(i,n)=>{if(i!==null){if(e.throwErrorOnBrokenSymbolicLink){t(i);return}t(null,r);return}r.dirent=i3.fs.createDirentFromStats(r.name,n),t(null,r)})}}function o3(r,e,t){e.fs.readdir(r,(i,n)=>{if(i!==null){nw(t,i);return}let s=n.map(o=>{let a=n3.joinPathSegments(r,o,e.pathSegmentSeparator);return l=>{SQe.stat(a,e.fsStatSettings,(c,u)=>{if(c!==null){l(c);return}let g={name:o,path:a,dirent:i3.fs.createDirentFromStats(o,u)};e.stats&&(g.stats=u),l(null,g)})}});r3(s,(o,a)=>{if(o!==null){nw(t,o);return}wP(t,a)})})}HA.readdir=o3;function nw(r,e){r(e)}function wP(r,e){r(null,e)}});var g3=w(GA=>{"use strict";Object.defineProperty(GA,"__esModule",{value:!0});GA.readdir=GA.readdirWithFileTypes=GA.read=void 0;var DQe=yc(),kQe=mP(),A3=IP(),l3=yP();function RQe(r,e){return!e.stats&&kQe.IS_SUPPORT_READDIR_WITH_FILE_TYPES?c3(r,e):u3(r,e)}GA.read=RQe;function c3(r,e){return e.fs.readdirSync(r,{withFileTypes:!0}).map(i=>{let n={dirent:i,name:i.name,path:l3.joinPathSegments(r,i.name,e.pathSegmentSeparator)};if(n.dirent.isSymbolicLink()&&e.followSymbolicLinks)try{let s=e.fs.statSync(n.path);n.dirent=A3.fs.createDirentFromStats(n.name,s)}catch(s){if(e.throwErrorOnBrokenSymbolicLink)throw s}return n})}GA.readdirWithFileTypes=c3;function u3(r,e){return e.fs.readdirSync(r).map(i=>{let n=l3.joinPathSegments(r,i,e.pathSegmentSeparator),s=DQe.statSync(n,e.fsStatSettings),o={name:i,path:n,dirent:A3.fs.createDirentFromStats(i,s)};return e.stats&&(o.stats=s),o})}GA.readdir=u3});var f3=w(YA=>{"use strict";Object.defineProperty(YA,"__esModule",{value:!0});YA.createFileSystemAdapter=YA.FILE_SYSTEM_ADAPTER=void 0;var Ef=J("fs");YA.FILE_SYSTEM_ADAPTER={lstat:Ef.lstat,stat:Ef.stat,lstatSync:Ef.lstatSync,statSync:Ef.statSync,readdir:Ef.readdir,readdirSync:Ef.readdirSync};function FQe(r){return r===void 0?YA.FILE_SYSTEM_ADAPTER:Object.assign(Object.assign({},YA.FILE_SYSTEM_ADAPTER),r)}YA.createFileSystemAdapter=FQe});var h3=w(QP=>{"use strict";Object.defineProperty(QP,"__esModule",{value:!0});var NQe=J("path"),LQe=yc(),TQe=f3(),BP=class{constructor(e={}){this._options=e,this.followSymbolicLinks=this._getValue(this._options.followSymbolicLinks,!1),this.fs=TQe.createFileSystemAdapter(this._options.fs),this.pathSegmentSeparator=this._getValue(this._options.pathSegmentSeparator,NQe.sep),this.stats=this._getValue(this._options.stats,!1),this.throwErrorOnBrokenSymbolicLink=this._getValue(this._options.throwErrorOnBrokenSymbolicLink,!0),this.fsStatSettings=new LQe.Settings({followSymbolicLink:this.followSymbolicLinks,fs:this.fs,throwErrorOnBrokenSymbolicLink:this.throwErrorOnBrokenSymbolicLink})}_getValue(e,t){return e!=null?e:t}};QP.default=BP});var sw=w(jA=>{"use strict";Object.defineProperty(jA,"__esModule",{value:!0});jA.Settings=jA.scandirSync=jA.scandir=void 0;var p3=a3(),OQe=g3(),bP=h3();jA.Settings=bP.default;function MQe(r,e,t){if(typeof e=="function"){p3.read(r,SP(),e);return}p3.read(r,SP(e),t)}jA.scandir=MQe;function KQe(r,e){let t=SP(e);return OQe.read(r,t)}jA.scandirSync=KQe;function SP(r={}){return r instanceof bP.default?r:new bP.default(r)}});var C3=w((ert,d3)=>{"use strict";function UQe(r){var e=new r,t=e;function i(){var s=e;return s.next?e=s.next:(e=new r,t=e),s.next=null,s}function n(s){t.next=s,t=s}return{get:i,release:n}}d3.exports=UQe});var E3=w((trt,vP)=>{"use strict";var HQe=C3();function m3(r,e,t){if(typeof r=="function"&&(t=e,e=r,r=null),t<1)throw new Error("fastqueue concurrency must be greater than 1");var i=HQe(GQe),n=null,s=null,o=0,a=null,l={push:C,drain:ms,saturated:ms,pause:u,paused:!1,concurrency:t,running:c,resume:h,idle:p,length:g,getQueue:f,unshift:y,empty:ms,kill:v,killAndDrain:D,error:L};return l;function c(){return o}function u(){l.paused=!0}function g(){for(var H=n,j=0;H;)H=H.next,j++;return j}function f(){for(var H=n,j=[];H;)j.push(H.value),H=H.next;return j}function h(){if(!!l.paused){l.paused=!1;for(var H=0;H<l.concurrency;H++)o++,B()}}function p(){return o===0&&l.length()===0}function C(H,j){var $=i.get();$.context=r,$.release=B,$.value=H,$.callback=j||ms,$.errorHandler=a,o===l.concurrency||l.paused?s?(s.next=$,s=$):(n=$,s=$,l.saturated()):(o++,e.call(r,$.value,$.worked))}function y(H,j){var $=i.get();$.context=r,$.release=B,$.value=H,$.callback=j||ms,o===l.concurrency||l.paused?n?($.next=n,n=$):(n=$,s=$,l.saturated()):(o++,e.call(r,$.value,$.worked))}function B(H){H&&i.release(H);var j=n;j?l.paused?o--:(s===n&&(s=null),n=j.next,j.next=null,e.call(r,j.value,j.worked),s===null&&l.empty()):--o===0&&l.drain()}function v(){n=null,s=null,l.drain=ms}function D(){n=null,s=null,l.drain(),l.drain=ms}function L(H){a=H}}function ms(){}function GQe(){this.value=null,this.callback=ms,this.next=null,this.release=ms,this.context=null,this.errorHandler=null;var r=this;this.worked=function(t,i){var n=r.callback,s=r.errorHandler,o=r.value;r.value=null,r.callback=ms,r.errorHandler&&s(t,o),n.call(r.context,t,i),r.release(r)}}function YQe(r,e,t){typeof r=="function"&&(t=e,e=r,r=null);function i(u,g){e.call(this,u).then(function(f){g(null,f)},g)}var n=m3(r,i,t),s=n.push,o=n.unshift;return n.push=a,n.unshift=l,n.drained=c,n;function a(u){var g=new Promise(function(f,h){s(u,function(p,C){if(p){h(p);return}f(C)})});return g.catch(ms),g}function l(u){var g=new Promise(function(f,h){o(u,function(p,C){if(p){h(p);return}f(C)})});return g.catch(ms),g}function c(){var u=n.drain,g=new Promise(function(f){n.drain=function(){u(),f()}});return g}}vP.exports=m3;vP.exports.promise=YQe});var ow=w(Go=>{"use strict";Object.defineProperty(Go,"__esModule",{value:!0});Go.joinPathSegments=Go.replacePathSegmentSeparator=Go.isAppliedFilter=Go.isFatalError=void 0;function jQe(r,e){return r.errorFilter===null?!0:!r.errorFilter(e)}Go.isFatalError=jQe;function qQe(r,e){return r===null||r(e)}Go.isAppliedFilter=qQe;function JQe(r,e){return r.split(/[/\\]/).join(e)}Go.replacePathSegmentSeparator=JQe;function WQe(r,e,t){return r===""?e:r.endsWith(t)?r+e:r+t+e}Go.joinPathSegments=WQe});var DP=w(PP=>{"use strict";Object.defineProperty(PP,"__esModule",{value:!0});var zQe=ow(),xP=class{constructor(e,t){this._root=e,this._settings=t,this._root=zQe.replacePathSegmentSeparator(e,t.pathSegmentSeparator)}};PP.default=xP});var FP=w(RP=>{"use strict";Object.defineProperty(RP,"__esModule",{value:!0});var VQe=J("events"),XQe=sw(),ZQe=E3(),aw=ow(),_Qe=DP(),kP=class extends _Qe.default{constructor(e,t){super(e,t),this._settings=t,this._scandir=XQe.scandir,this._emitter=new VQe.EventEmitter,this._queue=ZQe(this._worker.bind(this),this._settings.concurrency),this._isFatalError=!1,this._isDestroyed=!1,this._queue.drain=()=>{this._isFatalError||this._emitter.emit("end")}}read(){return this._isFatalError=!1,this._isDestroyed=!1,setImmediate(()=>{this._pushToQueue(this._root,this._settings.basePath)}),this._emitter}get isDestroyed(){return this._isDestroyed}destroy(){if(this._isDestroyed)throw new Error("The reader is already destroyed");this._isDestroyed=!0,this._queue.killAndDrain()}onEntry(e){this._emitter.on("entry",e)}onError(e){this._emitter.once("error",e)}onEnd(e){this._emitter.once("end",e)}_pushToQueue(e,t){let i={directory:e,base:t};this._queue.push(i,n=>{n!==null&&this._handleError(n)})}_worker(e,t){this._scandir(e.directory,this._settings.fsScandirSettings,(i,n)=>{if(i!==null){t(i,void 0);return}for(let s of n)this._handleEntry(s,e.base);t(null,void 0)})}_handleError(e){this._isDestroyed||!aw.isFatalError(this._settings,e)||(this._isFatalError=!0,this._isDestroyed=!0,this._emitter.emit("error",e))}_handleEntry(e,t){if(this._isDestroyed||this._isFatalError)return;let i=e.path;t!==void 0&&(e.path=aw.joinPathSegments(t,e.name,this._settings.pathSegmentSeparator)),aw.isAppliedFilter(this._settings.entryFilter,e)&&this._emitEntry(e),e.dirent.isDirectory()&&aw.isAppliedFilter(this._settings.deepFilter,e)&&this._pushToQueue(i,e.path)}_emitEntry(e){this._emitter.emit("entry",e)}};RP.default=kP});var I3=w(LP=>{"use strict";Object.defineProperty(LP,"__esModule",{value:!0});var $Qe=FP(),NP=class{constructor(e,t){this._root=e,this._settings=t,this._reader=new $Qe.default(this._root,this._settings),this._storage=new Set}read(e){this._reader.onError(t=>{ebe(e,t)}),this._reader.onEntry(t=>{this._storage.add(t)}),this._reader.onEnd(()=>{tbe(e,[...this._storage])}),this._reader.read()}};LP.default=NP;function ebe(r,e){r(e)}function tbe(r,e){r(null,e)}});var y3=w(OP=>{"use strict";Object.defineProperty(OP,"__esModule",{value:!0});var rbe=J("stream"),ibe=FP(),TP=class{constructor(e,t){this._root=e,this._settings=t,this._reader=new ibe.default(this._root,this._settings),this._stream=new rbe.Readable({objectMode:!0,read:()=>{},destroy:()=>{this._reader.isDestroyed||this._reader.destroy()}})}read(){return this._reader.onError(e=>{this._stream.emit("error",e)}),this._reader.onEntry(e=>{this._stream.push(e)}),this._reader.onEnd(()=>{this._stream.push(null)}),this._reader.read(),this._stream}};OP.default=TP});var w3=w(KP=>{"use strict";Object.defineProperty(KP,"__esModule",{value:!0});var nbe=sw(),Aw=ow(),sbe=DP(),MP=class extends sbe.default{constructor(){super(...arguments),this._scandir=nbe.scandirSync,this._storage=new Set,this._queue=new Set}read(){return this._pushToQueue(this._root,this._settings.basePath),this._handleQueue(),[...this._storage]}_pushToQueue(e,t){this._queue.add({directory:e,base:t})}_handleQueue(){for(let e of this._queue.values())this._handleDirectory(e.directory,e.base)}_handleDirectory(e,t){try{let i=this._scandir(e,this._settings.fsScandirSettings);for(let n of i)this._handleEntry(n,t)}catch(i){this._handleError(i)}}_handleError(e){if(!!Aw.isFatalError(this._settings,e))throw e}_handleEntry(e,t){let i=e.path;t!==void 0&&(e.path=Aw.joinPathSegments(t,e.name,this._settings.pathSegmentSeparator)),Aw.isAppliedFilter(this._settings.entryFilter,e)&&this._pushToStorage(e),e.dirent.isDirectory()&&Aw.isAppliedFilter(this._settings.deepFilter,e)&&this._pushToQueue(i,e.path)}_pushToStorage(e){this._storage.add(e)}};KP.default=MP});var B3=w(HP=>{"use strict";Object.defineProperty(HP,"__esModule",{value:!0});var obe=w3(),UP=class{constructor(e,t){this._root=e,this._settings=t,this._reader=new obe.default(this._root,this._settings)}read(){return this._reader.read()}};HP.default=UP});var Q3=w(YP=>{"use strict";Object.defineProperty(YP,"__esModule",{value:!0});var abe=J("path"),Abe=sw(),GP=class{constructor(e={}){this._options=e,this.basePath=this._getValue(this._options.basePath,void 0),this.concurrency=this._getValue(this._options.concurrency,Number.POSITIVE_INFINITY),this.deepFilter=this._getValue(this._options.deepFilter,null),this.entryFilter=this._getValue(this._options.entryFilter,null),this.errorFilter=this._getValue(this._options.errorFilter,null),this.pathSegmentSeparator=this._getValue(this._options.pathSegmentSeparator,abe.sep),this.fsScandirSettings=new Abe.Settings({followSymbolicLinks:this._options.followSymbolicLinks,fs:this._options.fs,pathSegmentSeparator:this._options.pathSegmentSeparator,stats:this._options.stats,throwErrorOnBrokenSymbolicLink:this._options.throwErrorOnBrokenSymbolicLink})}_getValue(e,t){return e!=null?e:t}};YP.default=GP});var qP=w(Yo=>{"use strict";Object.defineProperty(Yo,"__esModule",{value:!0});Yo.Settings=Yo.walkStream=Yo.walkSync=Yo.walk=void 0;var b3=I3(),lbe=y3(),cbe=B3(),jP=Q3();Yo.Settings=jP.default;function ube(r,e,t){if(typeof e=="function"){new b3.default(r,lw()).read(e);return}new b3.default(r,lw(e)).read(t)}Yo.walk=ube;function gbe(r,e){let t=lw(e);return new cbe.default(r,t).read()}Yo.walkSync=gbe;function fbe(r,e){let t=lw(e);return new lbe.default(r,t).read()}Yo.walkStream=fbe;function lw(r={}){return r instanceof jP.default?r:new jP.default(r)}});var zP=w(WP=>{"use strict";Object.defineProperty(WP,"__esModule",{value:!0});var hbe=J("path"),pbe=yc(),S3=La(),JP=class{constructor(e){this._settings=e,this._fsStatSettings=new pbe.Settings({followSymbolicLink:this._settings.followSymbolicLinks,fs:this._settings.fs,throwErrorOnBrokenSymbolicLink:this._settings.followSymbolicLinks})}_getFullEntryPath(e){return hbe.resolve(this._settings.cwd,e)}_makeEntry(e,t){let i={name:t,path:t,dirent:S3.fs.createDirentFromStats(t,e)};return this._settings.stats&&(i.stats=e),i}_isFatalError(e){return!S3.errno.isEnoentCodeError(e)&&!this._settings.suppressErrors}};WP.default=JP});var ZP=w(XP=>{"use strict";Object.defineProperty(XP,"__esModule",{value:!0});var dbe=J("stream"),Cbe=yc(),mbe=qP(),Ebe=zP(),VP=class extends Ebe.default{constructor(){super(...arguments),this._walkStream=mbe.walkStream,this._stat=Cbe.stat}dynamic(e,t){return this._walkStream(e,t)}static(e,t){let i=e.map(this._getFullEntryPath,this),n=new dbe.PassThrough({objectMode:!0});n._write=(s,o,a)=>this._getEntry(i[s],e[s],t).then(l=>{l!==null&&t.entryFilter(l)&&n.push(l),s===i.length-1&&n.end(),a()}).catch(a);for(let s=0;s<i.length;s++)n.write(s);return n}_getEntry(e,t,i){return this._getStat(e).then(n=>this._makeEntry(n,t)).catch(n=>{if(i.errorFilter(n))return null;throw n})}_getStat(e){return new Promise((t,i)=>{this._stat(e,this._fsStatSettings,(n,s)=>n===null?t(s):i(n))})}};XP.default=VP});var v3=w($P=>{"use strict";Object.defineProperty($P,"__esModule",{value:!0});var If=La(),_P=class{constructor(e,t,i){this._patterns=e,this._settings=t,this._micromatchOptions=i,this._storage=[],this._fillStorage()}_fillStorage(){let e=If.pattern.expandPatternsWithBraceExpansion(this._patterns);for(let t of e){let i=this._getPatternSegments(t),n=this._splitSegmentsIntoSections(i);this._storage.push({complete:n.length<=1,pattern:t,segments:i,sections:n})}}_getPatternSegments(e){return If.pattern.getPatternParts(e,this._micromatchOptions).map(i=>If.pattern.isDynamicPattern(i,this._settings)?{dynamic:!0,pattern:i,patternRe:If.pattern.makeRe(i,this._micromatchOptions)}:{dynamic:!1,pattern:i})}_splitSegmentsIntoSections(e){return If.array.splitWhen(e,t=>t.dynamic&&If.pattern.hasGlobStar(t.pattern))}};$P.default=_P});var x3=w(tD=>{"use strict";Object.defineProperty(tD,"__esModule",{value:!0});var Ibe=v3(),eD=class extends Ibe.default{match(e){let t=e.split("/"),i=t.length,n=this._storage.filter(s=>!s.complete||s.segments.length>i);for(let s of n){let o=s.sections[0];if(!s.complete&&i>o.length||t.every((l,c)=>{let u=s.segments[c];return!!(u.dynamic&&u.patternRe.test(l)||!u.dynamic&&u.pattern===l)}))return!0}return!1}};tD.default=eD});var P3=w(iD=>{"use strict";Object.defineProperty(iD,"__esModule",{value:!0});var cw=La(),ybe=x3(),rD=class{constructor(e,t){this._settings=e,this._micromatchOptions=t}getFilter(e,t,i){let n=this._getMatcher(t),s=this._getNegativePatternsRe(i);return o=>this._filter(e,o,n,s)}_getMatcher(e){return new ybe.default(e,this._settings,this._micromatchOptions)}_getNegativePatternsRe(e){let t=e.filter(cw.pattern.isAffectDepthOfReadingPattern);return cw.pattern.convertPatternsToRe(t,this._micromatchOptions)}_filter(e,t,i,n){let s=this._getEntryLevel(e,t.path);if(this._isSkippedByDeep(s)||this._isSkippedSymbolicLink(t))return!1;let o=cw.path.removeLeadingDotSegment(t.path);return this._isSkippedByPositivePatterns(o,i)?!1:this._isSkippedByNegativePatterns(o,n)}_isSkippedByDeep(e){return e>=this._settings.deep}_isSkippedSymbolicLink(e){return!this._settings.followSymbolicLinks&&e.dirent.isSymbolicLink()}_getEntryLevel(e,t){let i=e.split("/").length;return t.split("/").length-(e===""?0:i)}_isSkippedByPositivePatterns(e,t){return!this._settings.baseNameMatch&&!t.match(e)}_isSkippedByNegativePatterns(e,t){return!cw.pattern.matchAny(e,t)}};iD.default=rD});var D3=w(sD=>{"use strict";Object.defineProperty(sD,"__esModule",{value:!0});var Vd=La(),nD=class{constructor(e,t){this._settings=e,this._micromatchOptions=t,this.index=new Map}getFilter(e,t){let i=Vd.pattern.convertPatternsToRe(e,this._micromatchOptions),n=Vd.pattern.convertPatternsToRe(t,this._micromatchOptions);return s=>this._filter(s,i,n)}_filter(e,t,i){if(this._settings.unique){if(this._isDuplicateEntry(e))return!1;this._createIndexRecord(e)}if(this._onlyFileFilter(e)||this._onlyDirectoryFilter(e)||this._isSkippedByAbsoluteNegativePatterns(e,i))return!1;let n=this._settings.baseNameMatch?e.name:e.path;return this._isMatchToPatterns(n,t)&&!this._isMatchToPatterns(e.path,i)}_isDuplicateEntry(e){return this.index.has(e.path)}_createIndexRecord(e){this.index.set(e.path,void 0)}_onlyFileFilter(e){return this._settings.onlyFiles&&!e.dirent.isFile()}_onlyDirectoryFilter(e){return this._settings.onlyDirectories&&!e.dirent.isDirectory()}_isSkippedByAbsoluteNegativePatterns(e,t){if(!this._settings.absolute)return!1;let i=Vd.path.makeAbsolute(this._settings.cwd,e.path);return this._isMatchToPatterns(i,t)}_isMatchToPatterns(e,t){let i=Vd.path.removeLeadingDotSegment(e);return Vd.pattern.matchAny(i,t)}};sD.default=nD});var k3=w(aD=>{"use strict";Object.defineProperty(aD,"__esModule",{value:!0});var wbe=La(),oD=class{constructor(e){this._settings=e}getFilter(){return e=>this._isNonFatalError(e)}_isNonFatalError(e){return wbe.errno.isEnoentCodeError(e)||this._settings.suppressErrors}};aD.default=oD});var F3=w(lD=>{"use strict";Object.defineProperty(lD,"__esModule",{value:!0});var R3=La(),AD=class{constructor(e){this._settings=e}getTransformer(){return e=>this._transform(e)}_transform(e){let t=e.path;return this._settings.absolute&&(t=R3.path.makeAbsolute(this._settings.cwd,t),t=R3.path.unixify(t)),this._settings.markDirectories&&e.dirent.isDirectory()&&(t+="/"),this._settings.objectMode?Object.assign(Object.assign({},e),{path:t}):t}};lD.default=AD});var uw=w(uD=>{"use strict";Object.defineProperty(uD,"__esModule",{value:!0});var Bbe=J("path"),Qbe=P3(),bbe=D3(),Sbe=k3(),vbe=F3(),cD=class{constructor(e){this._settings=e,this.errorFilter=new Sbe.default(this._settings),this.entryFilter=new bbe.default(this._settings,this._getMicromatchOptions()),this.deepFilter=new Qbe.default(this._settings,this._getMicromatchOptions()),this.entryTransformer=new vbe.default(this._settings)}_getRootDirectory(e){return Bbe.resolve(this._settings.cwd,e.base)}_getReaderOptions(e){let t=e.base==="."?"":e.base;return{basePath:t,pathSegmentSeparator:"/",concurrency:this._settings.concurrency,deepFilter:this.deepFilter.getFilter(t,e.positive,e.negative),entryFilter:this.entryFilter.getFilter(e.positive,e.negative),errorFilter:this.errorFilter.getFilter(),followSymbolicLinks:this._settings.followSymbolicLinks,fs:this._settings.fs,stats:this._settings.stats,throwErrorOnBrokenSymbolicLink:this._settings.throwErrorOnBrokenSymbolicLink,transform:this.entryTransformer.getTransformer()}}_getMicromatchOptions(){return{dot:this._settings.dot,matchBase:this._settings.baseNameMatch,nobrace:!this._settings.braceExpansion,nocase:!this._settings.caseSensitiveMatch,noext:!this._settings.extglob,noglobstar:!this._settings.globstar,posix:!0,strictSlashes:!1}}};uD.default=cD});var N3=w(fD=>{"use strict";Object.defineProperty(fD,"__esModule",{value:!0});var xbe=ZP(),Pbe=uw(),gD=class extends Pbe.default{constructor(){super(...arguments),this._reader=new xbe.default(this._settings)}read(e){let t=this._getRootDirectory(e),i=this._getReaderOptions(e),n=[];return new Promise((s,o)=>{let a=this.api(t,e,i);a.once("error",o),a.on("data",l=>n.push(i.transform(l))),a.once("end",()=>s(n))})}api(e,t,i){return t.dynamic?this._reader.dynamic(e,i):this._reader.static(t.patterns,i)}};fD.default=gD});var L3=w(pD=>{"use strict";Object.defineProperty(pD,"__esModule",{value:!0});var Dbe=J("stream"),kbe=ZP(),Rbe=uw(),hD=class extends Rbe.default{constructor(){super(...arguments),this._reader=new kbe.default(this._settings)}read(e){let t=this._getRootDirectory(e),i=this._getReaderOptions(e),n=this.api(t,e,i),s=new Dbe.Readable({objectMode:!0,read:()=>{}});return n.once("error",o=>s.emit("error",o)).on("data",o=>s.emit("data",i.transform(o))).once("end",()=>s.emit("end")),s.once("close",()=>n.destroy()),s}api(e,t,i){return t.dynamic?this._reader.dynamic(e,i):this._reader.static(t.patterns,i)}};pD.default=hD});var T3=w(CD=>{"use strict";Object.defineProperty(CD,"__esModule",{value:!0});var Fbe=yc(),Nbe=qP(),Lbe=zP(),dD=class extends Lbe.default{constructor(){super(...arguments),this._walkSync=Nbe.walkSync,this._statSync=Fbe.statSync}dynamic(e,t){return this._walkSync(e,t)}static(e,t){let i=[];for(let n of e){let s=this._getFullEntryPath(n),o=this._getEntry(s,n,t);o===null||!t.entryFilter(o)||i.push(o)}return i}_getEntry(e,t,i){try{let n=this._getStat(e);return this._makeEntry(n,t)}catch(n){if(i.errorFilter(n))return null;throw n}}_getStat(e){return this._statSync(e,this._fsStatSettings)}};CD.default=dD});var O3=w(ED=>{"use strict";Object.defineProperty(ED,"__esModule",{value:!0});var Tbe=T3(),Obe=uw(),mD=class extends Obe.default{constructor(){super(...arguments),this._reader=new Tbe.default(this._settings)}read(e){let t=this._getRootDirectory(e),i=this._getReaderOptions(e);return this.api(t,e,i).map(i.transform)}api(e,t,i){return t.dynamic?this._reader.dynamic(e,i):this._reader.static(t.patterns,i)}};ED.default=mD});var M3=w(Xd=>{"use strict";Object.defineProperty(Xd,"__esModule",{value:!0});var yf=J("fs"),Mbe=J("os"),Kbe=Mbe.cpus().length;Xd.DEFAULT_FILE_SYSTEM_ADAPTER={lstat:yf.lstat,lstatSync:yf.lstatSync,stat:yf.stat,statSync:yf.statSync,readdir:yf.readdir,readdirSync:yf.readdirSync};var ID=class{constructor(e={}){this._options=e,this.absolute=this._getValue(this._options.absolute,!1),this.baseNameMatch=this._getValue(this._options.baseNameMatch,!1),this.braceExpansion=this._getValue(this._options.braceExpansion,!0),this.caseSensitiveMatch=this._getValue(this._options.caseSensitiveMatch,!0),this.concurrency=this._getValue(this._options.concurrency,Kbe),this.cwd=this._getValue(this._options.cwd,process.cwd()),this.deep=this._getValue(this._options.deep,1/0),this.dot=this._getValue(this._options.dot,!1),this.extglob=this._getValue(this._options.extglob,!0),this.followSymbolicLinks=this._getValue(this._options.followSymbolicLinks,!0),this.fs=this._getFileSystemMethods(this._options.fs),this.globstar=this._getValue(this._options.globstar,!0),this.ignore=this._getValue(this._options.ignore,[]),this.markDirectories=this._getValue(this._options.markDirectories,!1),this.objectMode=this._getValue(this._options.objectMode,!1),this.onlyDirectories=this._getValue(this._options.onlyDirectories,!1),this.onlyFiles=this._getValue(this._options.onlyFiles,!0),this.stats=this._getValue(this._options.stats,!1),this.suppressErrors=this._getValue(this._options.suppressErrors,!1),this.throwErrorOnBrokenSymbolicLink=this._getValue(this._options.throwErrorOnBrokenSymbolicLink,!1),this.unique=this._getValue(this._options.unique,!0),this.onlyDirectories&&(this.onlyFiles=!1),this.stats&&(this.objectMode=!0)}_getValue(e,t){return e===void 0?t:e}_getFileSystemMethods(e={}){return Object.assign(Object.assign({},Xd.DEFAULT_FILE_SYSTEM_ADAPTER),e)}};Xd.default=ID});var gw=w((brt,U3)=>{"use strict";var K3=j4(),Ube=N3(),Hbe=L3(),Gbe=O3(),yD=M3(),wc=La();async function wD(r,e){wf(r);let t=BD(r,Ube.default,e),i=await Promise.all(t);return wc.array.flatten(i)}(function(r){function e(o,a){wf(o);let l=BD(o,Gbe.default,a);return wc.array.flatten(l)}r.sync=e;function t(o,a){wf(o);let l=BD(o,Hbe.default,a);return wc.stream.merge(l)}r.stream=t;function i(o,a){wf(o);let l=[].concat(o),c=new yD.default(a);return K3.generate(l,c)}r.generateTasks=i;function n(o,a){wf(o);let l=new yD.default(a);return wc.pattern.isDynamicPattern(o,l)}r.isDynamicPattern=n;function s(o){return wf(o),wc.path.escape(o)}r.escapePath=s})(wD||(wD={}));function BD(r,e,t){let i=[].concat(r),n=new yD.default(t),s=K3.generate(i,n),o=new e(n);return s.map(o.read,o)}function wf(r){if(![].concat(r).every(i=>wc.string.isString(i)&&!wc.string.isEmpty(i)))throw new TypeError("Patterns must be a string (non empty) or an array of strings")}U3.exports=wD});var G3=w(Bc=>{"use strict";var{promisify:Ybe}=J("util"),H3=J("fs");async function QD(r,e,t){if(typeof t!="string")throw new TypeError(`Expected a string, got ${typeof t}`);try{return(await Ybe(H3[r])(t))[e]()}catch(i){if(i.code==="ENOENT")return!1;throw i}}function bD(r,e,t){if(typeof t!="string")throw new TypeError(`Expected a string, got ${typeof t}`);try{return H3[r](t)[e]()}catch(i){if(i.code==="ENOENT")return!1;throw i}}Bc.isFile=QD.bind(null,"stat","isFile");Bc.isDirectory=QD.bind(null,"stat","isDirectory");Bc.isSymlink=QD.bind(null,"lstat","isSymbolicLink");Bc.isFileSync=bD.bind(null,"statSync","isFile");Bc.isDirectorySync=bD.bind(null,"statSync","isDirectory");Bc.isSymlinkSync=bD.bind(null,"lstatSync","isSymbolicLink")});var W3=w((vrt,SD)=>{"use strict";var Qc=J("path"),Y3=G3(),j3=r=>r.length>1?`{${r.join(",")}}`:r[0],q3=(r,e)=>{let t=r[0]==="!"?r.slice(1):r;return Qc.isAbsolute(t)?t:Qc.join(e,t)},jbe=(r,e)=>Qc.extname(r)?`**/${r}`:`**/${r}.${j3(e)}`,J3=(r,e)=>{if(e.files&&!Array.isArray(e.files))throw new TypeError(`Expected \`files\` to be of type \`Array\` but received type \`${typeof e.files}\``);if(e.extensions&&!Array.isArray(e.extensions))throw new TypeError(`Expected \`extensions\` to be of type \`Array\` but received type \`${typeof e.extensions}\``);return e.files&&e.extensions?e.files.map(t=>Qc.posix.join(r,jbe(t,e.extensions))):e.files?e.files.map(t=>Qc.posix.join(r,`**/${t}`)):e.extensions?[Qc.posix.join(r,`**/*.${j3(e.extensions)}`)]:[Qc.posix.join(r,"**")]};SD.exports=async(r,e)=>{if(e={cwd:process.cwd(),...e},typeof e.cwd!="string")throw new TypeError(`Expected \`cwd\` to be of type \`string\` but received type \`${typeof e.cwd}\``);let t=await Promise.all([].concat(r).map(async i=>await Y3.isDirectory(q3(i,e.cwd))?J3(i,e):i));return[].concat.apply([],t)};SD.exports.sync=(r,e)=>{if(e={cwd:process.cwd(),...e},typeof e.cwd!="string")throw new TypeError(`Expected \`cwd\` to be of type \`string\` but received type \`${typeof e.cwd}\``);let t=[].concat(r).map(i=>Y3.isDirectorySync(q3(i,e.cwd))?J3(i,e):i);return[].concat.apply([],t)}});var t8=w((xrt,e8)=>{function z3(r){return Array.isArray(r)?r:[r]}var _3="",V3=" ",vD="\\",qbe=/^\s+$/,Jbe=/^\\!/,Wbe=/^\\#/,zbe=/\r?\n/g,Vbe=/^\.*\/|^\.+$/,xD="/",X3=typeof Symbol<"u"?Symbol.for("node-ignore"):"node-ignore",Xbe=(r,e,t)=>Object.defineProperty(r,e,{value:t}),Zbe=/([0-z])-([0-z])/g,_be=r=>r.replace(Zbe,(e,t,i)=>t.charCodeAt(0)<=i.charCodeAt(0)?e:_3),$be=r=>{let{length:e}=r;return r.slice(0,e-e%2)},eSe=[[/\\?\s+$/,r=>r.indexOf("\\")===0?V3:_3],[/\\\s/g,()=>V3],[/[\\$.|*+(){^]/g,r=>`\\${r}`],[/(?!\\)\?/g,()=>"[^/]"],[/^\//,()=>"^"],[/\//g,()=>"\\/"],[/^\^*\\\*\\\*\\\//,()=>"^(?:.*\\/)?"],[/^(?=[^^])/,function(){return/\/(?!$)/.test(this)?"^":"(?:^|\\/)"}],[/\\\/\\\*\\\*(?=\\\/|$)/g,(r,e,t)=>e+6<t.length?"(?:\\/[^\\/]+)*":"\\/.+"],[/(^|[^\\]+)\\\*(?=.+)/g,(r,e)=>`${e}[^\\/]*`],[/\\\\\\(?=[$.|*+(){^])/g,()=>vD],[/\\\\/g,()=>vD],[/(\\)?\[([^\]/]*?)(\\*)($|\])/g,(r,e,t,i,n)=>e===vD?`\\[${t}${$be(i)}${n}`:n==="]"&&i.length%2===0?`[${_be(t)}${i}]`:"[]"],[/(?:[^*])$/,r=>/\/$/.test(r)?`${r}$`:`${r}(?=$|\\/$)`],[/(\^|\\\/)?\\\*$/,(r,e)=>`${e?`${e}[^/]+`:"[^/]*"}(?=$|\\/$)`]],Z3=Object.create(null),tSe=(r,e)=>{let t=Z3[r];return t||(t=eSe.reduce((i,n)=>i.replace(n[0],n[1].bind(r)),r),Z3[r]=t),e?new RegExp(t,"i"):new RegExp(t)},kD=r=>typeof r=="string",rSe=r=>r&&kD(r)&&!qbe.test(r)&&r.indexOf("#")!==0,iSe=r=>r.split(zbe),PD=class{constructor(e,t,i,n){this.origin=e,this.pattern=t,this.negative=i,this.regex=n}},nSe=(r,e)=>{let t=r,i=!1;r.indexOf("!")===0&&(i=!0,r=r.substr(1)),r=r.replace(Jbe,"!").replace(Wbe,"#");let n=tSe(r,e);return new PD(t,r,i,n)},sSe=(r,e)=>{throw new e(r)},Oa=(r,e,t)=>kD(r)?r?Oa.isNotRelative(r)?t(`path should be a \`path.relative()\`d string, but got "${e}"`,RangeError):!0:t("path must not be empty",TypeError):t(`path must be a string, but got \`${e}\``,TypeError),$3=r=>Vbe.test(r);Oa.isNotRelative=$3;Oa.convert=r=>r;var DD=class{constructor({ignorecase:e=!0}={}){Xbe(this,X3,!0),this._rules=[],this._ignorecase=e,this._initCache()}_initCache(){this._ignoreCache=Object.create(null),this._testCache=Object.create(null)}_addPattern(e){if(e&&e[X3]){this._rules=this._rules.concat(e._rules),this._added=!0;return}if(rSe(e)){let t=nSe(e,this._ignorecase);this._added=!0,this._rules.push(t)}}add(e){return this._added=!1,z3(kD(e)?iSe(e):e).forEach(this._addPattern,this),this._added&&this._initCache(),this}addPattern(e){return this.add(e)}_testOne(e,t){let i=!1,n=!1;return this._rules.forEach(s=>{let{negative:o}=s;if(n===o&&i!==n||o&&!i&&!n&&!t)return;s.regex.test(e)&&(i=!o,n=o)}),{ignored:i,unignored:n}}_test(e,t,i,n){let s=e&&Oa.convert(e);return Oa(s,e,sSe),this._t(s,t,i,n)}_t(e,t,i,n){if(e in t)return t[e];if(n||(n=e.split(xD)),n.pop(),!n.length)return t[e]=this._testOne(e,i);let s=this._t(n.join(xD)+xD,t,i,n);return t[e]=s.ignored?s:this._testOne(e,i)}ignores(e){return this._test(e,this._ignoreCache,!1).ignored}createFilter(){return e=>!this.ignores(e)}filter(e){return z3(e).filter(this.createFilter())}test(e){return this._test(e,this._testCache,!0)}},fw=r=>new DD(r),oSe=()=>!1,aSe=r=>Oa(r&&Oa.convert(r),r,oSe);fw.isPathValid=aSe;fw.default=fw;e8.exports=fw;if(typeof process<"u"&&(process.env&&process.env.IGNORE_TEST_WIN32||process.platform==="win32")){let r=t=>/^\\\\\?\\/.test(t)||/["<>|\u0000-\u001F]+/u.test(t)?t:t.replace(/\\/g,"/");Oa.convert=r;let e=/^[a-z]:\//i;Oa.isNotRelative=t=>e.test(t)||$3(t)}});var i8=w((Prt,r8)=>{"use strict";r8.exports=r=>{let e=/^\\\\\?\\/.test(r),t=/[^\u0000-\u0080]+/.test(r);return e||t?r:r.replace(/\\/g,"/")}});var c8=w((Drt,RD)=>{"use strict";var{promisify:ASe}=J("util"),n8=J("fs"),Ma=J("path"),s8=gw(),lSe=t8(),Zd=i8(),o8=["**/node_modules/**","**/flow-typed/**","**/coverage/**","**/.git"],cSe=ASe(n8.readFile),uSe=r=>e=>e.startsWith("!")?"!"+Ma.posix.join(r,e.slice(1)):Ma.posix.join(r,e),gSe=(r,e)=>{let t=Zd(Ma.relative(e.cwd,Ma.dirname(e.fileName)));return r.split(/\r?\n/).filter(Boolean).filter(i=>!i.startsWith("#")).map(uSe(t))},a8=r=>{let e=lSe();for(let t of r)e.add(gSe(t.content,{cwd:t.cwd,fileName:t.filePath}));return e},fSe=(r,e)=>{if(r=Zd(r),Ma.isAbsolute(e)){if(Zd(e).startsWith(r))return e;throw new Error(`Path ${e} is not in cwd ${r}`)}return Ma.join(r,e)},A8=(r,e)=>t=>r.ignores(Zd(Ma.relative(e,fSe(e,t.path||t)))),hSe=async(r,e)=>{let t=Ma.join(e,r),i=await cSe(t,"utf8");return{cwd:e,filePath:t,content:i}},pSe=(r,e)=>{let t=Ma.join(e,r),i=n8.readFileSync(t,"utf8");return{cwd:e,filePath:t,content:i}},l8=({ignore:r=[],cwd:e=Zd(process.cwd())}={})=>({ignore:r,cwd:e});RD.exports=async r=>{r=l8(r);let e=await s8("**/.gitignore",{ignore:o8.concat(r.ignore),cwd:r.cwd}),t=await Promise.all(e.map(n=>hSe(n,r.cwd))),i=a8(t);return A8(i,r.cwd)};RD.exports.sync=r=>{r=l8(r);let t=s8.sync("**/.gitignore",{ignore:o8.concat(r.ignore),cwd:r.cwd}).map(n=>pSe(n,r.cwd)),i=a8(t);return A8(i,r.cwd)}});var g8=w((krt,u8)=>{"use strict";var{Transform:dSe}=J("stream"),hw=class extends dSe{constructor(){super({objectMode:!0})}},FD=class extends hw{constructor(e){super(),this._filter=e}_transform(e,t,i){this._filter(e)&&this.push(e),i()}},ND=class extends hw{constructor(){super(),this._pushed=new Set}_transform(e,t,i){this._pushed.has(e)||(this.push(e),this._pushed.add(e)),i()}};u8.exports={FilterStream:FD,UniqueStream:ND}});var MD=w((Rrt,bc)=>{"use strict";var h8=J("fs"),pw=f4(),CSe=sP(),dw=gw(),Cw=W3(),LD=c8(),{FilterStream:mSe,UniqueStream:ESe}=g8(),p8=()=>!1,f8=r=>r[0]==="!",ISe=r=>{if(!r.every(e=>typeof e=="string"))throw new TypeError("Patterns must be a string or an array of strings")},ySe=(r={})=>{if(!r.cwd)return;let e;try{e=h8.statSync(r.cwd)}catch{return}if(!e.isDirectory())throw new Error("The `cwd` option must be a path to a directory")},wSe=r=>r.stats instanceof h8.Stats?r.path:r,mw=(r,e)=>{r=pw([].concat(r)),ISe(r),ySe(e);let t=[];e={ignore:[],expandDirectories:!0,...e};for(let[i,n]of r.entries()){if(f8(n))continue;let s=r.slice(i).filter(a=>f8(a)).map(a=>a.slice(1)),o={...e,ignore:e.ignore.concat(s)};t.push({pattern:n,options:o})}return t},BSe=(r,e)=>{let t={};return r.options.cwd&&(t.cwd=r.options.cwd),Array.isArray(r.options.expandDirectories)?t={...t,files:r.options.expandDirectories}:typeof r.options.expandDirectories=="object"&&(t={...t,...r.options.expandDirectories}),e(r.pattern,t)},TD=(r,e)=>r.options.expandDirectories?BSe(r,e):[r.pattern],d8=r=>r&&r.gitignore?LD.sync({cwd:r.cwd,ignore:r.ignore}):p8,OD=r=>e=>{let{options:t}=r;return t.ignore&&Array.isArray(t.ignore)&&t.expandDirectories&&(t.ignore=Cw.sync(t.ignore)),{pattern:e,options:t}};bc.exports=async(r,e)=>{let t=mw(r,e),i=async()=>e&&e.gitignore?LD({cwd:e.cwd,ignore:e.ignore}):p8,n=async()=>{let l=await Promise.all(t.map(async c=>{let u=await TD(c,Cw);return Promise.all(u.map(OD(c)))}));return pw(...l)},[s,o]=await Promise.all([i(),n()]),a=await Promise.all(o.map(l=>dw(l.pattern,l.options)));return pw(...a).filter(l=>!s(wSe(l)))};bc.exports.sync=(r,e)=>{let t=mw(r,e),i=[];for(let o of t){let a=TD(o,Cw.sync).map(OD(o));i.push(...a)}let n=d8(e),s=[];for(let o of i)s=pw(s,dw.sync(o.pattern,o.options));return s.filter(o=>!n(o))};bc.exports.stream=(r,e)=>{let t=mw(r,e),i=[];for(let a of t){let l=TD(a,Cw.sync).map(OD(a));i.push(...l)}let n=d8(e),s=new mSe(a=>!n(a)),o=new ESe;return CSe(i.map(a=>dw.stream(a.pattern,a.options))).pipe(s).pipe(o)};bc.exports.generateGlobTasks=mw;bc.exports.hasMagic=(r,e)=>[].concat(r).some(t=>dw.isDynamicPattern(t,e));bc.exports.gitignore=LD});var bn=w((Vrt,k8)=>{function TSe(r){var e=typeof r;return r!=null&&(e=="object"||e=="function")}k8.exports=TSe});var WD=w((Xrt,R8)=>{var OSe=typeof global=="object"&&global&&global.Object===Object&&global;R8.exports=OSe});var Es=w((Zrt,F8)=>{var MSe=WD(),KSe=typeof self=="object"&&self&&self.Object===Object&&self,USe=MSe||KSe||Function("return this")();F8.exports=USe});var L8=w((_rt,N8)=>{var HSe=Es(),GSe=function(){return HSe.Date.now()};N8.exports=GSe});var O8=w(($rt,T8)=>{var YSe=/\s/;function jSe(r){for(var e=r.length;e--&&YSe.test(r.charAt(e)););return e}T8.exports=jSe});var K8=w((eit,M8)=>{var qSe=O8(),JSe=/^\s+/;function WSe(r){return r&&r.slice(0,qSe(r)+1).replace(JSe,"")}M8.exports=WSe});var xc=w((tit,U8)=>{var zSe=Es(),VSe=zSe.Symbol;U8.exports=VSe});var j8=w((rit,Y8)=>{var H8=xc(),G8=Object.prototype,XSe=G8.hasOwnProperty,ZSe=G8.toString,lC=H8?H8.toStringTag:void 0;function _Se(r){var e=XSe.call(r,lC),t=r[lC];try{r[lC]=void 0;var i=!0}catch{}var n=ZSe.call(r);return i&&(e?r[lC]=t:delete r[lC]),n}Y8.exports=_Se});var J8=w((iit,q8)=>{var $Se=Object.prototype,eve=$Se.toString;function tve(r){return eve.call(r)}q8.exports=tve});var Pc=w((nit,V8)=>{var W8=xc(),rve=j8(),ive=J8(),nve="[object Null]",sve="[object Undefined]",z8=W8?W8.toStringTag:void 0;function ove(r){return r==null?r===void 0?sve:nve:z8&&z8 in Object(r)?rve(r):ive(r)}V8.exports=ove});var Jo=w((sit,X8)=>{function ave(r){return r!=null&&typeof r=="object"}X8.exports=ave});var cC=w((oit,Z8)=>{var Ave=Pc(),lve=Jo(),cve="[object Symbol]";function uve(r){return typeof r=="symbol"||lve(r)&&Ave(r)==cve}Z8.exports=uve});var tz=w((ait,ez)=>{var gve=K8(),_8=bn(),fve=cC(),$8=0/0,hve=/^[-+]0x[0-9a-f]+$/i,pve=/^0b[01]+$/i,dve=/^0o[0-7]+$/i,Cve=parseInt;function mve(r){if(typeof r=="number")return r;if(fve(r))return $8;if(_8(r)){var e=typeof r.valueOf=="function"?r.valueOf():r;r=_8(e)?e+"":e}if(typeof r!="string")return r===0?r:+r;r=gve(r);var t=pve.test(r);return t||dve.test(r)?Cve(r.slice(2),t?2:8):hve.test(r)?$8:+r}ez.exports=mve});var nz=w((Ait,iz)=>{var Eve=bn(),zD=L8(),rz=tz(),Ive="Expected a function",yve=Math.max,wve=Math.min;function Bve(r,e,t){var i,n,s,o,a,l,c=0,u=!1,g=!1,f=!0;if(typeof r!="function")throw new TypeError(Ive);e=rz(e)||0,Eve(t)&&(u=!!t.leading,g="maxWait"in t,s=g?yve(rz(t.maxWait)||0,e):s,f="trailing"in t?!!t.trailing:f);function h(j){var $=i,V=n;return i=n=void 0,c=j,o=r.apply(V,$),o}function p(j){return c=j,a=setTimeout(B,e),u?h(j):o}function C(j){var $=j-l,V=j-c,W=e-$;return g?wve(W,s-V):W}function y(j){var $=j-l,V=j-c;return l===void 0||$>=e||$<0||g&&V>=s}function B(){var j=zD();if(y(j))return v(j);a=setTimeout(B,C(j))}function v(j){return a=void 0,f&&i?h(j):(i=n=void 0,o)}function D(){a!==void 0&&clearTimeout(a),c=0,i=l=n=a=void 0}function L(){return a===void 0?o:v(zD())}function H(){var j=zD(),$=y(j);if(i=arguments,n=this,l=j,$){if(a===void 0)return p(l);if(g)return clearTimeout(a),a=setTimeout(B,e),h(l)}return a===void 0&&(a=setTimeout(B,e)),o}return H.cancel=D,H.flush=L,H}iz.exports=Bve});var oz=w((lit,sz)=>{var Qve=nz(),bve=bn(),Sve="Expected a function";function vve(r,e,t){var i=!0,n=!0;if(typeof r!="function")throw new TypeError(Sve);return bve(t)&&(i="leading"in t?!!t.leading:i,n="trailing"in t?!!t.trailing:n),Qve(r,e,{leading:i,maxWait:e,trailing:n})}sz.exports=vve});var Ha=w((Ua,Uw)=>{"use strict";Object.defineProperty(Ua,"__esModule",{value:!0});var pz=["Int8Array","Uint8Array","Uint8ClampedArray","Int16Array","Uint16Array","Int32Array","Uint32Array","Float32Array","Float64Array","BigInt64Array","BigUint64Array"];function Uve(r){return pz.includes(r)}var Hve=["Function","Generator","AsyncGenerator","GeneratorFunction","AsyncGeneratorFunction","AsyncFunction","Observable","Array","Buffer","Object","RegExp","Date","Error","Map","Set","WeakMap","WeakSet","ArrayBuffer","SharedArrayBuffer","DataView","Promise","URL","FormData","URLSearchParams","HTMLElement",...pz];function Gve(r){return Hve.includes(r)}var Yve=["null","undefined","string","number","bigint","boolean","symbol"];function jve(r){return Yve.includes(r)}function Ff(r){return e=>typeof e===r}var{toString:dz}=Object.prototype,pC=r=>{let e=dz.call(r).slice(8,-1);if(/HTML\w+Element/.test(e)&&X.domElement(r))return"HTMLElement";if(Gve(e))return e},lr=r=>e=>pC(e)===r;function X(r){if(r===null)return"null";switch(typeof r){case"undefined":return"undefined";case"string":return"string";case"number":return"number";case"boolean":return"boolean";case"function":return"Function";case"bigint":return"bigint";case"symbol":return"symbol";default:}if(X.observable(r))return"Observable";if(X.array(r))return"Array";if(X.buffer(r))return"Buffer";let e=pC(r);if(e)return e;if(r instanceof String||r instanceof Boolean||r instanceof Number)throw new TypeError("Please don't use object wrappers for primitive types");return"Object"}X.undefined=Ff("undefined");X.string=Ff("string");var qve=Ff("number");X.number=r=>qve(r)&&!X.nan(r);X.bigint=Ff("bigint");X.function_=Ff("function");X.null_=r=>r===null;X.class_=r=>X.function_(r)&&r.toString().startsWith("class ");X.boolean=r=>r===!0||r===!1;X.symbol=Ff("symbol");X.numericString=r=>X.string(r)&&!X.emptyStringOrWhitespace(r)&&!Number.isNaN(Number(r));X.array=(r,e)=>Array.isArray(r)?X.function_(e)?r.every(e):!0:!1;X.buffer=r=>{var e,t,i,n;return(n=(i=(t=(e=r)===null||e===void 0?void 0:e.constructor)===null||t===void 0?void 0:t.isBuffer)===null||i===void 0?void 0:i.call(t,r))!==null&&n!==void 0?n:!1};X.nullOrUndefined=r=>X.null_(r)||X.undefined(r);X.object=r=>!X.null_(r)&&(typeof r=="object"||X.function_(r));X.iterable=r=>{var e;return X.function_((e=r)===null||e===void 0?void 0:e[Symbol.iterator])};X.asyncIterable=r=>{var e;return X.function_((e=r)===null||e===void 0?void 0:e[Symbol.asyncIterator])};X.generator=r=>X.iterable(r)&&X.function_(r.next)&&X.function_(r.throw);X.asyncGenerator=r=>X.asyncIterable(r)&&X.function_(r.next)&&X.function_(r.throw);X.nativePromise=r=>lr("Promise")(r);var Jve=r=>{var e,t;return X.function_((e=r)===null||e===void 0?void 0:e.then)&&X.function_((t=r)===null||t===void 0?void 0:t.catch)};X.promise=r=>X.nativePromise(r)||Jve(r);X.generatorFunction=lr("GeneratorFunction");X.asyncGeneratorFunction=r=>pC(r)==="AsyncGeneratorFunction";X.asyncFunction=r=>pC(r)==="AsyncFunction";X.boundFunction=r=>X.function_(r)&&!r.hasOwnProperty("prototype");X.regExp=lr("RegExp");X.date=lr("Date");X.error=lr("Error");X.map=r=>lr("Map")(r);X.set=r=>lr("Set")(r);X.weakMap=r=>lr("WeakMap")(r);X.weakSet=r=>lr("WeakSet")(r);X.int8Array=lr("Int8Array");X.uint8Array=lr("Uint8Array");X.uint8ClampedArray=lr("Uint8ClampedArray");X.int16Array=lr("Int16Array");X.uint16Array=lr("Uint16Array");X.int32Array=lr("Int32Array");X.uint32Array=lr("Uint32Array");X.float32Array=lr("Float32Array");X.float64Array=lr("Float64Array");X.bigInt64Array=lr("BigInt64Array");X.bigUint64Array=lr("BigUint64Array");X.arrayBuffer=lr("ArrayBuffer");X.sharedArrayBuffer=lr("SharedArrayBuffer");X.dataView=lr("DataView");X.directInstanceOf=(r,e)=>Object.getPrototypeOf(r)===e.prototype;X.urlInstance=r=>lr("URL")(r);X.urlString=r=>{if(!X.string(r))return!1;try{return new URL(r),!0}catch{return!1}};X.truthy=r=>Boolean(r);X.falsy=r=>!r;X.nan=r=>Number.isNaN(r);X.primitive=r=>X.null_(r)||jve(typeof r);X.integer=r=>Number.isInteger(r);X.safeInteger=r=>Number.isSafeInteger(r);X.plainObject=r=>{if(dz.call(r)!=="[object Object]")return!1;let e=Object.getPrototypeOf(r);return e===null||e===Object.getPrototypeOf({})};X.typedArray=r=>Uve(pC(r));var Wve=r=>X.safeInteger(r)&&r>=0;X.arrayLike=r=>!X.nullOrUndefined(r)&&!X.function_(r)&&Wve(r.length);X.inRange=(r,e)=>{if(X.number(e))return r>=Math.min(0,e)&&r<=Math.max(e,0);if(X.array(e)&&e.length===2)return r>=Math.min(...e)&&r<=Math.max(...e);throw new TypeError(`Invalid range: ${JSON.stringify(e)}`)};var zve=1,Vve=["innerHTML","ownerDocument","style","attributes","nodeValue"];X.domElement=r=>X.object(r)&&r.nodeType===zve&&X.string(r.nodeName)&&!X.plainObject(r)&&Vve.every(e=>e in r);X.observable=r=>{var e,t,i,n;return r?r===((t=(e=r)[Symbol.observable])===null||t===void 0?void 0:t.call(e))||r===((n=(i=r)["@@observable"])===null||n===void 0?void 0:n.call(i)):!1};X.nodeStream=r=>X.object(r)&&X.function_(r.pipe)&&!X.observable(r);X.infinite=r=>r===1/0||r===-1/0;var Cz=r=>e=>X.integer(e)&&Math.abs(e%2)===r;X.evenInteger=Cz(0);X.oddInteger=Cz(1);X.emptyArray=r=>X.array(r)&&r.length===0;X.nonEmptyArray=r=>X.array(r)&&r.length>0;X.emptyString=r=>X.string(r)&&r.length===0;X.nonEmptyString=r=>X.string(r)&&r.length>0;var Xve=r=>X.string(r)&&!/\S/.test(r);X.emptyStringOrWhitespace=r=>X.emptyString(r)||Xve(r);X.emptyObject=r=>X.object(r)&&!X.map(r)&&!X.set(r)&&Object.keys(r).length===0;X.nonEmptyObject=r=>X.object(r)&&!X.map(r)&&!X.set(r)&&Object.keys(r).length>0;X.emptySet=r=>X.set(r)&&r.size===0;X.nonEmptySet=r=>X.set(r)&&r.size>0;X.emptyMap=r=>X.map(r)&&r.size===0;X.nonEmptyMap=r=>X.map(r)&&r.size>0;X.propertyKey=r=>X.any([X.string,X.number,X.symbol],r);X.formData=r=>lr("FormData")(r);X.urlSearchParams=r=>lr("URLSearchParams")(r);var mz=(r,e,t)=>{if(!X.function_(e))throw new TypeError(`Invalid predicate: ${JSON.stringify(e)}`);if(t.length===0)throw new TypeError("Invalid number of values");return r.call(t,e)};X.any=(r,...e)=>(X.array(r)?r:[r]).some(i=>mz(Array.prototype.some,i,e));X.all=(r,...e)=>mz(Array.prototype.every,r,e);var Ye=(r,e,t,i={})=>{if(!r){let{multipleValues:n}=i,s=n?`received values of types ${[...new Set(t.map(o=>`\`${X(o)}\``))].join(", ")}`:`received value of type \`${X(t)}\``;throw new TypeError(`Expected value which is \`${e}\`, ${s}.`)}};Ua.assert={undefined:r=>Ye(X.undefined(r),"undefined",r),string:r=>Ye(X.string(r),"string",r),number:r=>Ye(X.number(r),"number",r),bigint:r=>Ye(X.bigint(r),"bigint",r),function_:r=>Ye(X.function_(r),"Function",r),null_:r=>Ye(X.null_(r),"null",r),class_:r=>Ye(X.class_(r),"Class",r),boolean:r=>Ye(X.boolean(r),"boolean",r),symbol:r=>Ye(X.symbol(r),"symbol",r),numericString:r=>Ye(X.numericString(r),"string with a number",r),array:(r,e)=>{Ye(X.array(r),"Array",r),e&&r.forEach(e)},buffer:r=>Ye(X.buffer(r),"Buffer",r),nullOrUndefined:r=>Ye(X.nullOrUndefined(r),"null or undefined",r),object:r=>Ye(X.object(r),"Object",r),iterable:r=>Ye(X.iterable(r),"Iterable",r),asyncIterable:r=>Ye(X.asyncIterable(r),"AsyncIterable",r),generator:r=>Ye(X.generator(r),"Generator",r),asyncGenerator:r=>Ye(X.asyncGenerator(r),"AsyncGenerator",r),nativePromise:r=>Ye(X.nativePromise(r),"native Promise",r),promise:r=>Ye(X.promise(r),"Promise",r),generatorFunction:r=>Ye(X.generatorFunction(r),"GeneratorFunction",r),asyncGeneratorFunction:r=>Ye(X.asyncGeneratorFunction(r),"AsyncGeneratorFunction",r),asyncFunction:r=>Ye(X.asyncFunction(r),"AsyncFunction",r),boundFunction:r=>Ye(X.boundFunction(r),"Function",r),regExp:r=>Ye(X.regExp(r),"RegExp",r),date:r=>Ye(X.date(r),"Date",r),error:r=>Ye(X.error(r),"Error",r),map:r=>Ye(X.map(r),"Map",r),set:r=>Ye(X.set(r),"Set",r),weakMap:r=>Ye(X.weakMap(r),"WeakMap",r),weakSet:r=>Ye(X.weakSet(r),"WeakSet",r),int8Array:r=>Ye(X.int8Array(r),"Int8Array",r),uint8Array:r=>Ye(X.uint8Array(r),"Uint8Array",r),uint8ClampedArray:r=>Ye(X.uint8ClampedArray(r),"Uint8ClampedArray",r),int16Array:r=>Ye(X.int16Array(r),"Int16Array",r),uint16Array:r=>Ye(X.uint16Array(r),"Uint16Array",r),int32Array:r=>Ye(X.int32Array(r),"Int32Array",r),uint32Array:r=>Ye(X.uint32Array(r),"Uint32Array",r),float32Array:r=>Ye(X.float32Array(r),"Float32Array",r),float64Array:r=>Ye(X.float64Array(r),"Float64Array",r),bigInt64Array:r=>Ye(X.bigInt64Array(r),"BigInt64Array",r),bigUint64Array:r=>Ye(X.bigUint64Array(r),"BigUint64Array",r),arrayBuffer:r=>Ye(X.arrayBuffer(r),"ArrayBuffer",r),sharedArrayBuffer:r=>Ye(X.sharedArrayBuffer(r),"SharedArrayBuffer",r),dataView:r=>Ye(X.dataView(r),"DataView",r),urlInstance:r=>Ye(X.urlInstance(r),"URL",r),urlString:r=>Ye(X.urlString(r),"string with a URL",r),truthy:r=>Ye(X.truthy(r),"truthy",r),falsy:r=>Ye(X.falsy(r),"falsy",r),nan:r=>Ye(X.nan(r),"NaN",r),primitive:r=>Ye(X.primitive(r),"primitive",r),integer:r=>Ye(X.integer(r),"integer",r),safeInteger:r=>Ye(X.safeInteger(r),"integer",r),plainObject:r=>Ye(X.plainObject(r),"plain object",r),typedArray:r=>Ye(X.typedArray(r),"TypedArray",r),arrayLike:r=>Ye(X.arrayLike(r),"array-like",r),domElement:r=>Ye(X.domElement(r),"HTMLElement",r),observable:r=>Ye(X.observable(r),"Observable",r),nodeStream:r=>Ye(X.nodeStream(r),"Node.js Stream",r),infinite:r=>Ye(X.infinite(r),"infinite number",r),emptyArray:r=>Ye(X.emptyArray(r),"empty array",r),nonEmptyArray:r=>Ye(X.nonEmptyArray(r),"non-empty array",r),emptyString:r=>Ye(X.emptyString(r),"empty string",r),nonEmptyString:r=>Ye(X.nonEmptyString(r),"non-empty string",r),emptyStringOrWhitespace:r=>Ye(X.emptyStringOrWhitespace(r),"empty string or whitespace",r),emptyObject:r=>Ye(X.emptyObject(r),"empty object",r),nonEmptyObject:r=>Ye(X.nonEmptyObject(r),"non-empty object",r),emptySet:r=>Ye(X.emptySet(r),"empty set",r),nonEmptySet:r=>Ye(X.nonEmptySet(r),"non-empty set",r),emptyMap:r=>Ye(X.emptyMap(r),"empty map",r),nonEmptyMap:r=>Ye(X.nonEmptyMap(r),"non-empty map",r),propertyKey:r=>Ye(X.propertyKey(r),"PropertyKey",r),formData:r=>Ye(X.formData(r),"FormData",r),urlSearchParams:r=>Ye(X.urlSearchParams(r),"URLSearchParams",r),evenInteger:r=>Ye(X.evenInteger(r),"even integer",r),oddInteger:r=>Ye(X.oddInteger(r),"odd integer",r),directInstanceOf:(r,e)=>Ye(X.directInstanceOf(r,e),"T",r),inRange:(r,e)=>Ye(X.inRange(r,e),"in range",r),any:(r,...e)=>Ye(X.any(r,...e),"predicate returns truthy for any value",e,{multipleValues:!0}),all:(r,...e)=>Ye(X.all(r,...e),"predicate returns truthy for all values",e,{multipleValues:!0})};Object.defineProperties(X,{class:{value:X.class_},function:{value:X.function_},null:{value:X.null_}});Object.defineProperties(Ua.assert,{class:{value:Ua.assert.class_},function:{value:Ua.assert.function_},null:{value:Ua.assert.null_}});Ua.default=X;Uw.exports=X;Uw.exports.default=X;Uw.exports.assert=Ua.assert});var Ez=w((zit,dk)=>{"use strict";var Hw=class extends Error{constructor(e){super(e||"Promise was canceled"),this.name="CancelError"}get isCanceled(){return!0}},Nf=class{static fn(e){return(...t)=>new Nf((i,n,s)=>{t.push(s),e(...t).then(i,n)})}constructor(e){this._cancelHandlers=[],this._isPending=!0,this._isCanceled=!1,this._rejectOnCancel=!0,this._promise=new Promise((t,i)=>{this._reject=i;let n=a=>{this._isPending=!1,t(a)},s=a=>{this._isPending=!1,i(a)},o=a=>{if(!this._isPending)throw new Error("The `onCancel` handler was attached after the promise settled.");this._cancelHandlers.push(a)};return Object.defineProperties(o,{shouldReject:{get:()=>this._rejectOnCancel,set:a=>{this._rejectOnCancel=a}}}),e(n,s,o)})}then(e,t){return this._promise.then(e,t)}catch(e){return this._promise.catch(e)}finally(e){return this._promise.finally(e)}cancel(e){if(!(!this._isPending||this._isCanceled)){if(this._cancelHandlers.length>0)try{for(let t of this._cancelHandlers)t()}catch(t){this._reject(t)}this._isCanceled=!0,this._rejectOnCancel&&this._reject(new Hw(e))}}get isCanceled(){return this._isCanceled}};Object.setPrototypeOf(Nf.prototype,Promise.prototype);dk.exports=Nf;dk.exports.CancelError=Hw});var Iz=w((mk,Ek)=>{"use strict";Object.defineProperty(mk,"__esModule",{value:!0});var Zve=J("tls"),Ck=(r,e)=>{let t;typeof e=="function"?t={connect:e}:t=e;let i=typeof t.connect=="function",n=typeof t.secureConnect=="function",s=typeof t.close=="function",o=()=>{i&&t.connect(),r instanceof Zve.TLSSocket&&n&&(r.authorized?t.secureConnect():r.authorizationError||r.once("secureConnect",t.secureConnect)),s&&r.once("close",t.close)};r.writable&&!r.connecting?o():r.connecting?r.once("connect",o):r.destroyed&&s&&t.close(r._hadError)};mk.default=Ck;Ek.exports=Ck;Ek.exports.default=Ck});var yz=w((yk,wk)=>{"use strict";Object.defineProperty(yk,"__esModule",{value:!0});var _ve=Iz(),$ve=Number(process.versions.node.split(".")[0]),Ik=r=>{let e={start:Date.now(),socket:void 0,lookup:void 0,connect:void 0,secureConnect:void 0,upload:void 0,response:void 0,end:void 0,error:void 0,abort:void 0,phases:{wait:void 0,dns:void 0,tcp:void 0,tls:void 0,request:void 0,firstByte:void 0,download:void 0,total:void 0}};r.timings=e;let t=o=>{let a=o.emit.bind(o);o.emit=(l,...c)=>(l==="error"&&(e.error=Date.now(),e.phases.total=e.error-e.start,o.emit=a),a(l,...c))};t(r),r.prependOnceListener("abort",()=>{e.abort=Date.now(),(!e.response||$ve>=13)&&(e.phases.total=Date.now()-e.start)});let i=o=>{e.socket=Date.now(),e.phases.wait=e.socket-e.start;let a=()=>{e.lookup=Date.now(),e.phases.dns=e.lookup-e.socket};o.prependOnceListener("lookup",a),_ve.default(o,{connect:()=>{e.connect=Date.now(),e.lookup===void 0&&(o.removeListener("lookup",a),e.lookup=e.connect,e.phases.dns=e.lookup-e.socket),e.phases.tcp=e.connect-e.lookup},secureConnect:()=>{e.secureConnect=Date.now(),e.phases.tls=e.secureConnect-e.connect}})};r.socket?i(r.socket):r.prependOnceListener("socket",i);let n=()=>{var o;e.upload=Date.now(),e.phases.request=e.upload-(o=e.secureConnect,o!=null?o:e.connect)};return(()=>typeof r.writableFinished=="boolean"?r.writableFinished:r.finished&&r.outputSize===0&&(!r.socket||r.socket.writableLength===0))()?n():r.prependOnceListener("finish",n),r.prependOnceListener("response",o=>{e.response=Date.now(),e.phases.firstByte=e.response-e.upload,o.timings=e,t(o),o.prependOnceListener("end",()=>{e.end=Date.now(),e.phases.download=e.end-e.response,e.phases.total=e.end-e.start})}),e};yk.default=Ik;wk.exports=Ik;wk.exports.default=Ik});var xz=w((Vit,bk)=>{"use strict";var{V4MAPPED:exe,ADDRCONFIG:txe,ALL:vz,promises:{Resolver:wz},lookup:rxe}=J("dns"),{promisify:Bk}=J("util"),ixe=J("os"),Lf=Symbol("cacheableLookupCreateConnection"),Qk=Symbol("cacheableLookupInstance"),Bz=Symbol("expires"),nxe=typeof vz=="number",Qz=r=>{if(!(r&&typeof r.createConnection=="function"))throw new Error("Expected an Agent instance as the first argument")},sxe=r=>{for(let e of r)e.family!==6&&(e.address=`::ffff:${e.address}`,e.family=6)},bz=()=>{let r=!1,e=!1;for(let t of Object.values(ixe.networkInterfaces()))for(let i of t)if(!i.internal&&(i.family==="IPv6"?e=!0:r=!0,r&&e))return{has4:r,has6:e};return{has4:r,has6:e}},oxe=r=>Symbol.iterator in r,Sz={ttl:!0},axe={all:!0},Gw=class{constructor({cache:e=new Map,maxTtl:t=1/0,fallbackDuration:i=3600,errorTtl:n=.15,resolver:s=new wz,lookup:o=rxe}={}){if(this.maxTtl=t,this.errorTtl=n,this._cache=e,this._resolver=s,this._dnsLookup=Bk(o),this._resolver instanceof wz?(this._resolve4=this._resolver.resolve4.bind(this._resolver),this._resolve6=this._resolver.resolve6.bind(this._resolver)):(this._resolve4=Bk(this._resolver.resolve4.bind(this._resolver)),this._resolve6=Bk(this._resolver.resolve6.bind(this._resolver))),this._iface=bz(),this._pending={},this._nextRemovalTime=!1,this._hostnamesToFallback=new Set,i<1)this._fallback=!1;else{this._fallback=!0;let a=setInterval(()=>{this._hostnamesToFallback.clear()},i*1e3);a.unref&&a.unref()}this.lookup=this.lookup.bind(this),this.lookupAsync=this.lookupAsync.bind(this)}set servers(e){this.clear(),this._resolver.setServers(e)}get servers(){return this._resolver.getServers()}lookup(e,t,i){if(typeof t=="function"?(i=t,t={}):typeof t=="number"&&(t={family:t}),!i)throw new Error("Callback must be a function.");this.lookupAsync(e,t).then(n=>{t.all?i(null,n):i(null,n.address,n.family,n.expires,n.ttl)},i)}async lookupAsync(e,t={}){typeof t=="number"&&(t={family:t});let i=await this.query(e);if(t.family===6){let n=i.filter(s=>s.family===6);t.hints&exe&&(nxe&&t.hints&vz||n.length===0)?sxe(i):i=n}else t.family===4&&(i=i.filter(n=>n.family===4));if(t.hints&txe){let{_iface:n}=this;i=i.filter(s=>s.family===6?n.has6:n.has4)}if(i.length===0){let n=new Error(`cacheableLookup ENOTFOUND ${e}`);throw n.code="ENOTFOUND",n.hostname=e,n}return t.all?i:i[0]}async query(e){let t=await this._cache.get(e);if(!t){let i=this._pending[e];if(i)t=await i;else{let n=this.queryAndCache(e);this._pending[e]=n,t=await n}}return t=t.map(i=>({...i})),t}async _resolve(e){let t=async c=>{try{return await c}catch(u){if(u.code==="ENODATA"||u.code==="ENOTFOUND")return[];throw u}},[i,n]=await Promise.all([this._resolve4(e,Sz),this._resolve6(e,Sz)].map(c=>t(c))),s=0,o=0,a=0,l=Date.now();for(let c of i)c.family=4,c.expires=l+c.ttl*1e3,s=Math.max(s,c.ttl);for(let c of n)c.family=6,c.expires=l+c.ttl*1e3,o=Math.max(o,c.ttl);return i.length>0?n.length>0?a=Math.min(s,o):a=s:a=o,{entries:[...i,...n],cacheTtl:a}}async _lookup(e){try{return{entries:await this._dnsLookup(e,{all:!0}),cacheTtl:0}}catch{return{entries:[],cacheTtl:0}}}async _set(e,t,i){if(this.maxTtl>0&&i>0){i=Math.min(i,this.maxTtl)*1e3,t[Bz]=Date.now()+i;try{await this._cache.set(e,t,i)}catch(n){this.lookupAsync=async()=>{let s=new Error("Cache Error. Please recreate the CacheableLookup instance.");throw s.cause=n,s}}oxe(this._cache)&&this._tick(i)}}async queryAndCache(e){if(this._hostnamesToFallback.has(e))return this._dnsLookup(e,axe);try{let t=await this._resolve(e);t.entries.length===0&&this._fallback&&(t=await this._lookup(e),t.entries.length!==0&&this._hostnamesToFallback.add(e));let i=t.entries.length===0?this.errorTtl:t.cacheTtl;return await this._set(e,t.entries,i),delete this._pending[e],t.entries}catch(t){throw delete this._pending[e],t}}_tick(e){let t=this._nextRemovalTime;(!t||e<t)&&(clearTimeout(this._removalTimeout),this._nextRemovalTime=e,this._removalTimeout=setTimeout(()=>{this._nextRemovalTime=!1;let i=1/0,n=Date.now();for(let[s,o]of this._cache){let a=o[Bz];n>=a?this._cache.delete(s):a<i&&(i=a)}i!==1/0&&this._tick(i-n)},e),this._removalTimeout.unref&&this._removalTimeout.unref())}install(e){if(Qz(e),Lf in e)throw new Error("CacheableLookup has been already installed");e[Lf]=e.createConnection,e[Qk]=this,e.createConnection=(t,i)=>("lookup"in t||(t.lookup=this.lookup),e[Lf](t,i))}uninstall(e){if(Qz(e),e[Lf]){if(e[Qk]!==this)throw new Error("The agent is not owned by this CacheableLookup instance");e.createConnection=e[Lf],delete e[Lf],delete e[Qk]}}updateInterfaceInfo(){let{_iface:e}=this;this._iface=bz(),(e.has4&&!this._iface.has4||e.has6&&!this._iface.has6)&&this._cache.clear()}clear(e){if(e){this._cache.delete(e);return}this._cache.clear()}};bk.exports=Gw;bk.exports.default=Gw});var kz=w((Xit,Sk)=>{"use strict";var Axe=typeof URL>"u"?J("url").URL:URL,lxe="text/plain",cxe="us-ascii",Pz=(r,e)=>e.some(t=>t instanceof RegExp?t.test(r):t===r),uxe=(r,{stripHash:e})=>{let t=r.match(/^data:([^,]*?),([^#]*?)(?:#(.*))?$/);if(!t)throw new Error(`Invalid URL: ${r}`);let i=t[1].split(";"),n=t[2],s=e?"":t[3],o=!1;i[i.length-1]==="base64"&&(i.pop(),o=!0);let a=(i.shift()||"").toLowerCase(),c=[...i.map(u=>{let[g,f=""]=u.split("=").map(h=>h.trim());return g==="charset"&&(f=f.toLowerCase(),f===cxe)?"":`${g}${f?`=${f}`:""}`}).filter(Boolean)];return o&&c.push("base64"),(c.length!==0||a&&a!==lxe)&&c.unshift(a),`data:${c.join(";")},${o?n.trim():n}${s?`#${s}`:""}`},Dz=(r,e)=>{if(e={defaultProtocol:"http:",normalizeProtocol:!0,forceHttp:!1,forceHttps:!1,stripAuthentication:!0,stripHash:!1,stripWWW:!0,removeQueryParameters:[/^utm_\w+/i],removeTrailingSlash:!0,removeDirectoryIndex:!1,sortQueryParameters:!0,...e},Reflect.has(e,"normalizeHttps"))throw new Error("options.normalizeHttps is renamed to options.forceHttp");if(Reflect.has(e,"normalizeHttp"))throw new Error("options.normalizeHttp is renamed to options.forceHttps");if(Reflect.has(e,"stripFragment"))throw new Error("options.stripFragment is renamed to options.stripHash");if(r=r.trim(),/^data:/i.test(r))return uxe(r,e);let t=r.startsWith("//");!t&&/^\.*\//.test(r)||(r=r.replace(/^(?!(?:\w+:)?\/\/)|^\/\//,e.defaultProtocol));let n=new Axe(r);if(e.forceHttp&&e.forceHttps)throw new Error("The `forceHttp` and `forceHttps` options cannot be used together");if(e.forceHttp&&n.protocol==="https:"&&(n.protocol="http:"),e.forceHttps&&n.protocol==="http:"&&(n.protocol="https:"),e.stripAuthentication&&(n.username="",n.password=""),e.stripHash&&(n.hash=""),n.pathname&&(n.pathname=n.pathname.replace(/((?!:).|^)\/{2,}/g,(s,o)=>/^(?!\/)/g.test(o)?`${o}/`:"/")),n.pathname&&(n.pathname=decodeURI(n.pathname)),e.removeDirectoryIndex===!0&&(e.removeDirectoryIndex=[/^index\.[a-z]+$/]),Array.isArray(e.removeDirectoryIndex)&&e.removeDirectoryIndex.length>0){let s=n.pathname.split("/"),o=s[s.length-1];Pz(o,e.removeDirectoryIndex)&&(s=s.slice(0,s.length-1),n.pathname=s.slice(1).join("/")+"/")}if(n.hostname&&(n.hostname=n.hostname.replace(/\.$/,""),e.stripWWW&&/^www\.([a-z\-\d]{2,63})\.([a-z.]{2,5})$/.test(n.hostname)&&(n.hostname=n.hostname.replace(/^www\./,""))),Array.isArray(e.removeQueryParameters))for(let s of[...n.searchParams.keys()])Pz(s,e.removeQueryParameters)&&n.searchParams.delete(s);return e.sortQueryParameters&&n.searchParams.sort(),e.removeTrailingSlash&&(n.pathname=n.pathname.replace(/\/$/,"")),r=n.toString(),(e.removeTrailingSlash||n.pathname==="/")&&n.hash===""&&(r=r.replace(/\/$/,"")),t&&!e.normalizeProtocol&&(r=r.replace(/^http:\/\//,"//")),e.stripProtocol&&(r=r.replace(/^(?:https?:)?\/\//,"")),r};Sk.exports=Dz;Sk.exports.default=Dz});var Nz=w((Zit,Fz)=>{Fz.exports=Rz;function Rz(r,e){if(r&&e)return Rz(r)(e);if(typeof r!="function")throw new TypeError("need wrapper function");return Object.keys(r).forEach(function(i){t[i]=r[i]}),t;function t(){for(var i=new Array(arguments.length),n=0;n<i.length;n++)i[n]=arguments[n];var s=r.apply(this,i),o=i[i.length-1];return typeof s=="function"&&s!==o&&Object.keys(o).forEach(function(a){s[a]=o[a]}),s}}});var xk=w((_it,vk)=>{var Lz=Nz();vk.exports=Lz(Yw);vk.exports.strict=Lz(Tz);Yw.proto=Yw(function(){Object.defineProperty(Function.prototype,"once",{value:function(){return Yw(this)},configurable:!0}),Object.defineProperty(Function.prototype,"onceStrict",{value:function(){return Tz(this)},configurable:!0})});function Yw(r){var e=function(){return e.called?e.value:(e.called=!0,e.value=r.apply(this,arguments))};return e.called=!1,e}function Tz(r){var e=function(){if(e.called)throw new Error(e.onceError);return e.called=!0,e.value=r.apply(this,arguments)},t=r.name||"Function wrapped with `once`";return e.onceError=t+" shouldn't be called more than once",e.called=!1,e}});var Pk=w(($it,Mz)=>{var gxe=xk(),fxe=function(){},hxe=function(r){return r.setHeader&&typeof r.abort=="function"},pxe=function(r){return r.stdio&&Array.isArray(r.stdio)&&r.stdio.length===3},Oz=function(r,e,t){if(typeof e=="function")return Oz(r,null,e);e||(e={}),t=gxe(t||fxe);var i=r._writableState,n=r._readableState,s=e.readable||e.readable!==!1&&r.readable,o=e.writable||e.writable!==!1&&r.writable,a=function(){r.writable||l()},l=function(){o=!1,s||t.call(r)},c=function(){s=!1,o||t.call(r)},u=function(p){t.call(r,p?new Error("exited with error code: "+p):null)},g=function(p){t.call(r,p)},f=function(){if(s&&!(n&&n.ended))return t.call(r,new Error("premature close"));if(o&&!(i&&i.ended))return t.call(r,new Error("premature close"))},h=function(){r.req.on("finish",l)};return hxe(r)?(r.on("complete",l),r.on("abort",f),r.req?h():r.on("request",h)):o&&!i&&(r.on("end",a),r.on("close",a)),pxe(r)&&r.on("exit",u),r.on("end",c),r.on("finish",l),e.error!==!1&&r.on("error",g),r.on("close",f),function(){r.removeListener("complete",l),r.removeListener("abort",f),r.removeListener("request",h),r.req&&r.req.removeListener("finish",l),r.removeListener("end",a),r.removeListener("close",a),r.removeListener("finish",l),r.removeListener("exit",u),r.removeListener("end",c),r.removeListener("error",g),r.removeListener("close",f)}};Mz.exports=Oz});var Hz=w((ent,Uz)=>{var dxe=xk(),Cxe=Pk(),Dk=J("fs"),dC=function(){},mxe=/^v?\.0/.test(process.version),jw=function(r){return typeof r=="function"},Exe=function(r){return!mxe||!Dk?!1:(r instanceof(Dk.ReadStream||dC)||r instanceof(Dk.WriteStream||dC))&&jw(r.close)},Ixe=function(r){return r.setHeader&&jw(r.abort)},yxe=function(r,e,t,i){i=dxe(i);var n=!1;r.on("close",function(){n=!0}),Cxe(r,{readable:e,writable:t},function(o){if(o)return i(o);n=!0,i()});var s=!1;return function(o){if(!n&&!s){if(s=!0,Exe(r))return r.close(dC);if(Ixe(r))return r.abort();if(jw(r.destroy))return r.destroy();i(o||new Error("stream was destroyed"))}}},Kz=function(r){r()},wxe=function(r,e){return r.pipe(e)},Bxe=function(){var r=Array.prototype.slice.call(arguments),e=jw(r[r.length-1]||dC)&&r.pop()||dC;if(Array.isArray(r[0])&&(r=r[0]),r.length<2)throw new Error("pump requires two streams per minimum");var t,i=r.map(function(n,s){var o=s<r.length-1,a=s>0;return yxe(n,o,a,function(l){t||(t=l),l&&i.forEach(Kz),!o&&(i.forEach(Kz),e(t))})});return r.reduce(wxe)};Uz.exports=Bxe});var Yz=w((tnt,Gz)=>{"use strict";var{PassThrough:Qxe}=J("stream");Gz.exports=r=>{r={...r};let{array:e}=r,{encoding:t}=r,i=t==="buffer",n=!1;e?n=!(t||i):t=t||"utf8",i&&(t=null);let s=new Qxe({objectMode:n});t&&s.setEncoding(t);let o=0,a=[];return s.on("data",l=>{a.push(l),n?o=a.length:o+=l.length}),s.getBufferedValue=()=>e?a:i?Buffer.concat(a,o):a.join(""),s.getBufferedLength=()=>o,s}});var jz=w((rnt,Tf)=>{"use strict";var bxe=Hz(),Sxe=Yz(),qw=class extends Error{constructor(){super("maxBuffer exceeded"),this.name="MaxBufferError"}};async function Jw(r,e){if(!r)return Promise.reject(new Error("Expected a stream"));e={maxBuffer:1/0,...e};let{maxBuffer:t}=e,i;return await new Promise((n,s)=>{let o=a=>{a&&(a.bufferedData=i.getBufferedValue()),s(a)};i=bxe(r,Sxe(e),a=>{if(a){o(a);return}n()}),i.on("data",()=>{i.getBufferedLength()>t&&o(new qw)})}),i.getBufferedValue()}Tf.exports=Jw;Tf.exports.default=Jw;Tf.exports.buffer=(r,e)=>Jw(r,{...e,encoding:"buffer"});Tf.exports.array=(r,e)=>Jw(r,{...e,array:!0});Tf.exports.MaxBufferError=qw});var Jz=w((nnt,qz)=>{"use strict";var vxe=new Set([200,203,204,206,300,301,404,405,410,414,501]),xxe=new Set([200,203,204,300,301,302,303,307,308,404,405,410,414,501]),Pxe=new Set([500,502,503,504]),Dxe={date:!0,connection:!0,"keep-alive":!0,"proxy-authenticate":!0,"proxy-authorization":!0,te:!0,trailer:!0,"transfer-encoding":!0,upgrade:!0},kxe={"content-length":!0,"content-encoding":!0,"transfer-encoding":!0,"content-range":!0};function Rc(r){let e=parseInt(r,10);return isFinite(e)?e:0}function Rxe(r){return r?Pxe.has(r.status):!0}function kk(r){let e={};if(!r)return e;let t=r.trim().split(/\s*,\s*/);for(let i of t){let[n,s]=i.split(/\s*=\s*/,2);e[n]=s===void 0?!0:s.replace(/^"|"$/g,"")}return e}function Fxe(r){let e=[];for(let t in r){let i=r[t];e.push(i===!0?t:t+"="+i)}if(!!e.length)return e.join(", ")}qz.exports=class{constructor(e,t,{shared:i,cacheHeuristic:n,immutableMinTimeToLive:s,ignoreCargoCult:o,_fromObject:a}={}){if(a){this._fromObject(a);return}if(!t||!t.headers)throw Error("Response headers missing");this._assertRequestHasHeaders(e),this._responseTime=this.now(),this._isShared=i!==!1,this._cacheHeuristic=n!==void 0?n:.1,this._immutableMinTtl=s!==void 0?s:24*3600*1e3,this._status="status"in t?t.status:200,this._resHeaders=t.headers,this._rescc=kk(t.headers["cache-control"]),this._method="method"in e?e.method:"GET",this._url=e.url,this._host=e.headers.host,this._noAuthorization=!e.headers.authorization,this._reqHeaders=t.headers.vary?e.headers:null,this._reqcc=kk(e.headers["cache-control"]),o&&"pre-check"in this._rescc&&"post-check"in this._rescc&&(delete this._rescc["pre-check"],delete this._rescc["post-check"],delete this._rescc["no-cache"],delete this._rescc["no-store"],delete this._rescc["must-revalidate"],this._resHeaders=Object.assign({},this._resHeaders,{"cache-control":Fxe(this._rescc)}),delete this._resHeaders.expires,delete this._resHeaders.pragma),t.headers["cache-control"]==null&&/no-cache/.test(t.headers.pragma)&&(this._rescc["no-cache"]=!0)}now(){return Date.now()}storable(){return!!(!this._reqcc["no-store"]&&(this._method==="GET"||this._method==="HEAD"||this._method==="POST"&&this._hasExplicitExpiration())&&xxe.has(this._status)&&!this._rescc["no-store"]&&(!this._isShared||!this._rescc.private)&&(!this._isShared||this._noAuthorization||this._allowsStoringAuthenticated())&&(this._resHeaders.expires||this._rescc["max-age"]||this._isShared&&this._rescc["s-maxage"]||this._rescc.public||vxe.has(this._status)))}_hasExplicitExpiration(){return this._isShared&&this._rescc["s-maxage"]||this._rescc["max-age"]||this._resHeaders.expires}_assertRequestHasHeaders(e){if(!e||!e.headers)throw Error("Request headers missing")}satisfiesWithoutRevalidation(e){this._assertRequestHasHeaders(e);let t=kk(e.headers["cache-control"]);return t["no-cache"]||/no-cache/.test(e.headers.pragma)||t["max-age"]&&this.age()>t["max-age"]||t["min-fresh"]&&this.timeToLive()<1e3*t["min-fresh"]||this.stale()&&!(t["max-stale"]&&!this._rescc["must-revalidate"]&&(t["max-stale"]===!0||t["max-stale"]>this.age()-this.maxAge()))?!1:this._requestMatches(e,!1)}_requestMatches(e,t){return(!this._url||this._url===e.url)&&this._host===e.headers.host&&(!e.method||this._method===e.method||t&&e.method==="HEAD")&&this._varyMatches(e)}_allowsStoringAuthenticated(){return this._rescc["must-revalidate"]||this._rescc.public||this._rescc["s-maxage"]}_varyMatches(e){if(!this._resHeaders.vary)return!0;if(this._resHeaders.vary==="*")return!1;let t=this._resHeaders.vary.trim().toLowerCase().split(/\s*,\s*/);for(let i of t)if(e.headers[i]!==this._reqHeaders[i])return!1;return!0}_copyWithoutHopByHopHeaders(e){let t={};for(let i in e)Dxe[i]||(t[i]=e[i]);if(e.connection){let i=e.connection.trim().split(/\s*,\s*/);for(let n of i)delete t[n]}if(t.warning){let i=t.warning.split(/,/).filter(n=>!/^\s*1[0-9][0-9]/.test(n));i.length?t.warning=i.join(",").trim():delete t.warning}return t}responseHeaders(){let e=this._copyWithoutHopByHopHeaders(this._resHeaders),t=this.age();return t>3600*24&&!this._hasExplicitExpiration()&&this.maxAge()>3600*24&&(e.warning=(e.warning?`${e.warning}, `:"")+'113 - "rfc7234 5.5.4"'),e.age=`${Math.round(t)}`,e.date=new Date(this.now()).toUTCString(),e}date(){let e=Date.parse(this._resHeaders.date);return isFinite(e)?e:this._responseTime}age(){let e=this._ageValue(),t=(this.now()-this._responseTime)/1e3;return e+t}_ageValue(){return Rc(this._resHeaders.age)}maxAge(){if(!this.storable()||this._rescc["no-cache"]||this._isShared&&this._resHeaders["set-cookie"]&&!this._rescc.public&&!this._rescc.immutable||this._resHeaders.vary==="*")return 0;if(this._isShared){if(this._rescc["proxy-revalidate"])return 0;if(this._rescc["s-maxage"])return Rc(this._rescc["s-maxage"])}if(this._rescc["max-age"])return Rc(this._rescc["max-age"]);let e=this._rescc.immutable?this._immutableMinTtl:0,t=this.date();if(this._resHeaders.expires){let i=Date.parse(this._resHeaders.expires);return Number.isNaN(i)||i<t?0:Math.max(e,(i-t)/1e3)}if(this._resHeaders["last-modified"]){let i=Date.parse(this._resHeaders["last-modified"]);if(isFinite(i)&&t>i)return Math.max(e,(t-i)/1e3*this._cacheHeuristic)}return e}timeToLive(){let e=this.maxAge()-this.age(),t=e+Rc(this._rescc["stale-if-error"]),i=e+Rc(this._rescc["stale-while-revalidate"]);return Math.max(0,e,t,i)*1e3}stale(){return this.maxAge()<=this.age()}_useStaleIfError(){return this.maxAge()+Rc(this._rescc["stale-if-error"])>this.age()}useStaleWhileRevalidate(){return this.maxAge()+Rc(this._rescc["stale-while-revalidate"])>this.age()}static fromObject(e){return new this(void 0,void 0,{_fromObject:e})}_fromObject(e){if(this._responseTime)throw Error("Reinitialized");if(!e||e.v!==1)throw Error("Invalid serialization");this._responseTime=e.t,this._isShared=e.sh,this._cacheHeuristic=e.ch,this._immutableMinTtl=e.imm!==void 0?e.imm:24*3600*1e3,this._status=e.st,this._resHeaders=e.resh,this._rescc=e.rescc,this._method=e.m,this._url=e.u,this._host=e.h,this._noAuthorization=e.a,this._reqHeaders=e.reqh,this._reqcc=e.reqcc}toObject(){return{v:1,t:this._responseTime,sh:this._isShared,ch:this._cacheHeuristic,imm:this._immutableMinTtl,st:this._status,resh:this._resHeaders,rescc:this._rescc,m:this._method,u:this._url,h:this._host,a:this._noAuthorization,reqh:this._reqHeaders,reqcc:this._reqcc}}revalidationHeaders(e){this._assertRequestHasHeaders(e);let t=this._copyWithoutHopByHopHeaders(e.headers);if(delete t["if-range"],!this._requestMatches(e,!0)||!this.storable())return delete t["if-none-match"],delete t["if-modified-since"],t;if(this._resHeaders.etag&&(t["if-none-match"]=t["if-none-match"]?`${t["if-none-match"]}, ${this._resHeaders.etag}`:this._resHeaders.etag),t["accept-ranges"]||t["if-match"]||t["if-unmodified-since"]||this._method&&this._method!="GET"){if(delete t["if-modified-since"],t["if-none-match"]){let n=t["if-none-match"].split(/,/).filter(s=>!/^\s*W\//.test(s));n.length?t["if-none-match"]=n.join(",").trim():delete t["if-none-match"]}}else this._resHeaders["last-modified"]&&!t["if-modified-since"]&&(t["if-modified-since"]=this._resHeaders["last-modified"]);return t}revalidatedPolicy(e,t){if(this._assertRequestHasHeaders(e),this._useStaleIfError()&&Rxe(t))return{modified:!1,matches:!1,policy:this};if(!t||!t.headers)throw Error("Response headers missing");let i=!1;if(t.status!==void 0&&t.status!=304?i=!1:t.headers.etag&&!/^\s*W\//.test(t.headers.etag)?i=this._resHeaders.etag&&this._resHeaders.etag.replace(/^\s*W\//,"")===t.headers.etag:this._resHeaders.etag&&t.headers.etag?i=this._resHeaders.etag.replace(/^\s*W\//,"")===t.headers.etag.replace(/^\s*W\//,""):this._resHeaders["last-modified"]?i=this._resHeaders["last-modified"]===t.headers["last-modified"]:!this._resHeaders.etag&&!this._resHeaders["last-modified"]&&!t.headers.etag&&!t.headers["last-modified"]&&(i=!0),!i)return{policy:new this.constructor(e,t),modified:t.status!=304,matches:!1};let n={};for(let o in this._resHeaders)n[o]=o in t.headers&&!kxe[o]?t.headers[o]:this._resHeaders[o];let s=Object.assign({},t,{status:this._status,method:this._method,headers:n});return{policy:new this.constructor(e,s,{shared:this._isShared,cacheHeuristic:this._cacheHeuristic,immutableMinTimeToLive:this._immutableMinTtl}),modified:!1,matches:!0}}}});var Ww=w((snt,Wz)=>{"use strict";Wz.exports=r=>{let e={};for(let[t,i]of Object.entries(r))e[t.toLowerCase()]=i;return e}});var Vz=w((ont,zz)=>{"use strict";var Nxe=J("stream").Readable,Lxe=Ww(),Rk=class extends Nxe{constructor(e,t,i,n){if(typeof e!="number")throw new TypeError("Argument `statusCode` should be a number");if(typeof t!="object")throw new TypeError("Argument `headers` should be an object");if(!(i instanceof Buffer))throw new TypeError("Argument `body` should be a buffer");if(typeof n!="string")throw new TypeError("Argument `url` should be a string");super(),this.statusCode=e,this.headers=Lxe(t),this.body=i,this.url=n}_read(){this.push(this.body),this.push(null)}};zz.exports=Rk});var Zz=w((ant,Xz)=>{"use strict";var Txe=["destroy","setTimeout","socket","headers","trailers","rawHeaders","statusCode","httpVersion","httpVersionMinor","httpVersionMajor","rawTrailers","statusMessage"];Xz.exports=(r,e)=>{let t=new Set(Object.keys(r).concat(Txe));for(let i of t)i in e||(e[i]=typeof r[i]=="function"?r[i].bind(r):r[i])}});var $z=w((Ant,_z)=>{"use strict";var Oxe=J("stream").PassThrough,Mxe=Zz(),Kxe=r=>{if(!(r&&r.pipe))throw new TypeError("Parameter `response` must be a response stream.");let e=new Oxe;return Mxe(r,e),r.pipe(e)};_z.exports=Kxe});var e5=w(Fk=>{Fk.stringify=function r(e){if(typeof e>"u")return e;if(e&&Buffer.isBuffer(e))return JSON.stringify(":base64:"+e.toString("base64"));if(e&&e.toJSON&&(e=e.toJSON()),e&&typeof e=="object"){var t="",i=Array.isArray(e);t=i?"[":"{";var n=!0;for(var s in e){var o=typeof e[s]=="function"||!i&&typeof e[s]>"u";Object.hasOwnProperty.call(e,s)&&!o&&(n||(t+=","),n=!1,i?e[s]==null?t+="null":t+=r(e[s]):e[s]!==void 0&&(t+=r(s)+":"+r(e[s])))}return t+=i?"]":"}",t}else return typeof e=="string"?JSON.stringify(/^:/.test(e)?":"+e:e):typeof e>"u"?"null":JSON.stringify(e)};Fk.parse=function(r){return JSON.parse(r,function(e,t){return typeof t=="string"?/^:base64:/.test(t)?Buffer.from(t.substring(8),"base64"):/^:/.test(t)?t.substring(1):t:t})}});var i5=w((cnt,r5)=>{"use strict";var Uxe=J("events"),t5=e5(),Hxe=r=>{let e={redis:"@keyv/redis",mongodb:"@keyv/mongo",mongo:"@keyv/mongo",sqlite:"@keyv/sqlite",postgresql:"@keyv/postgres",postgres:"@keyv/postgres",mysql:"@keyv/mysql"};if(r.adapter||r.uri){let t=r.adapter||/^[^:]*/.exec(r.uri)[0];return new(J(e[t]))(r)}return new Map},Nk=class extends Uxe{constructor(e,t){if(super(),this.opts=Object.assign({namespace:"keyv",serialize:t5.stringify,deserialize:t5.parse},typeof e=="string"?{uri:e}:e,t),!this.opts.store){let i=Object.assign({},this.opts);this.opts.store=Hxe(i)}typeof this.opts.store.on=="function"&&this.opts.store.on("error",i=>this.emit("error",i)),this.opts.store.namespace=this.opts.namespace}_getKeyPrefix(e){return`${this.opts.namespace}:${e}`}get(e,t){e=this._getKeyPrefix(e);let{store:i}=this.opts;return Promise.resolve().then(()=>i.get(e)).then(n=>typeof n=="string"?this.opts.deserialize(n):n).then(n=>{if(n!==void 0){if(typeof n.expires=="number"&&Date.now()>n.expires){this.delete(e);return}return t&&t.raw?n:n.value}})}set(e,t,i){e=this._getKeyPrefix(e),typeof i>"u"&&(i=this.opts.ttl),i===0&&(i=void 0);let{store:n}=this.opts;return Promise.resolve().then(()=>{let s=typeof i=="number"?Date.now()+i:null;return t={value:t,expires:s},this.opts.serialize(t)}).then(s=>n.set(e,s,i)).then(()=>!0)}delete(e){e=this._getKeyPrefix(e);let{store:t}=this.opts;return Promise.resolve().then(()=>t.delete(e))}clear(){let{store:e}=this.opts;return Promise.resolve().then(()=>e.clear())}};r5.exports=Nk});var o5=w((unt,s5)=>{"use strict";var Gxe=J("events"),zw=J("url"),Yxe=kz(),jxe=jz(),Lk=Jz(),n5=Vz(),qxe=Ww(),Jxe=$z(),Wxe=i5(),no=class{constructor(e,t){if(typeof e!="function")throw new TypeError("Parameter `request` must be a function");return this.cache=new Wxe({uri:typeof t=="string"&&t,store:typeof t!="string"&&t,namespace:"cacheable-request"}),this.createCacheableRequest(e)}createCacheableRequest(e){return(t,i)=>{let n;if(typeof t=="string")n=Tk(zw.parse(t)),t={};else if(t instanceof zw.URL)n=Tk(zw.parse(t.toString())),t={};else{let[g,...f]=(t.path||"").split("?"),h=f.length>0?`?${f.join("?")}`:"";n=Tk({...t,pathname:g,search:h})}t={headers:{},method:"GET",cache:!0,strictTtl:!1,automaticFailover:!1,...t,...zxe(n)},t.headers=qxe(t.headers);let s=new Gxe,o=Yxe(zw.format(n),{stripWWW:!1,removeTrailingSlash:!1,stripAuthentication:!1}),a=`${t.method}:${o}`,l=!1,c=!1,u=g=>{c=!0;let f=!1,h,p=new Promise(y=>{h=()=>{f||(f=!0,y())}}),C=y=>{if(l&&!g.forceRefresh){y.status=y.statusCode;let v=Lk.fromObject(l.cachePolicy).revalidatedPolicy(g,y);if(!v.modified){let D=v.policy.responseHeaders();y=new n5(l.statusCode,D,l.body,l.url),y.cachePolicy=v.policy,y.fromCache=!0}}y.fromCache||(y.cachePolicy=new Lk(g,y,g),y.fromCache=!1);let B;g.cache&&y.cachePolicy.storable()?(B=Jxe(y),(async()=>{try{let v=jxe.buffer(y);if(await Promise.race([p,new Promise(j=>y.once("end",j))]),f)return;let D=await v,L={cachePolicy:y.cachePolicy.toObject(),url:y.url,statusCode:y.fromCache?l.statusCode:y.statusCode,body:D},H=g.strictTtl?y.cachePolicy.timeToLive():void 0;g.maxTtl&&(H=H?Math.min(H,g.maxTtl):g.maxTtl),await this.cache.set(a,L,H)}catch(v){s.emit("error",new no.CacheError(v))}})()):g.cache&&l&&(async()=>{try{await this.cache.delete(a)}catch(v){s.emit("error",new no.CacheError(v))}})(),s.emit("response",B||y),typeof i=="function"&&i(B||y)};try{let y=e(g,C);y.once("error",h),y.once("abort",h),s.emit("request",y)}catch(y){s.emit("error",new no.RequestError(y))}};return(async()=>{let g=async h=>{await Promise.resolve();let p=h.cache?await this.cache.get(a):void 0;if(typeof p>"u")return u(h);let C=Lk.fromObject(p.cachePolicy);if(C.satisfiesWithoutRevalidation(h)&&!h.forceRefresh){let y=C.responseHeaders(),B=new n5(p.statusCode,y,p.body,p.url);B.cachePolicy=C,B.fromCache=!0,s.emit("response",B),typeof i=="function"&&i(B)}else l=p,h.headers=C.revalidationHeaders(h),u(h)},f=h=>s.emit("error",new no.CacheError(h));this.cache.once("error",f),s.on("response",()=>this.cache.removeListener("error",f));try{await g(t)}catch(h){t.automaticFailover&&!c&&u(t),s.emit("error",new no.CacheError(h))}})(),s}}};function zxe(r){let e={...r};return e.path=`${r.pathname||"/"}${r.search||""}`,delete e.pathname,delete e.search,e}function Tk(r){return{protocol:r.protocol,auth:r.auth,hostname:r.hostname||r.host||"localhost",port:r.port,pathname:r.pathname,search:r.search}}no.RequestError=class extends Error{constructor(r){super(r.message),this.name="RequestError",Object.assign(this,r)}};no.CacheError=class extends Error{constructor(r){super(r.message),this.name="CacheError",Object.assign(this,r)}};s5.exports=no});var A5=w((hnt,a5)=>{"use strict";var Vxe=["aborted","complete","headers","httpVersion","httpVersionMinor","httpVersionMajor","method","rawHeaders","rawTrailers","setTimeout","socket","statusCode","statusMessage","trailers","url"];a5.exports=(r,e)=>{if(e._readableState.autoDestroy)throw new Error("The second stream must have the `autoDestroy` option set to `false`");let t=new Set(Object.keys(r).concat(Vxe)),i={};for(let n of t)n in e||(i[n]={get(){let s=r[n];return typeof s=="function"?s.bind(r):s},set(s){r[n]=s},enumerable:!0,configurable:!1});return Object.defineProperties(e,i),r.once("aborted",()=>{e.destroy(),e.emit("aborted")}),r.once("close",()=>{r.complete&&e.readable?e.once("end",()=>{e.emit("close")}):e.emit("close")}),e}});var c5=w((pnt,l5)=>{"use strict";var{Transform:Xxe,PassThrough:Zxe}=J("stream"),Ok=J("zlib"),_xe=A5();l5.exports=r=>{let e=(r.headers["content-encoding"]||"").toLowerCase();if(!["gzip","deflate","br"].includes(e))return r;let t=e==="br";if(t&&typeof Ok.createBrotliDecompress!="function")return r.destroy(new Error("Brotli is not supported on Node.js < 12")),r;let i=!0,n=new Xxe({transform(a,l,c){i=!1,c(null,a)},flush(a){a()}}),s=new Zxe({autoDestroy:!1,destroy(a,l){r.destroy(),l(a)}}),o=t?Ok.createBrotliDecompress():Ok.createUnzip();return o.once("error",a=>{if(i&&!r.readable){s.end();return}s.destroy(a)}),_xe(r,s),r.pipe(n).pipe(o).pipe(s),s}});var Kk=w((dnt,u5)=>{"use strict";var Mk=class{constructor(e={}){if(!(e.maxSize&&e.maxSize>0))throw new TypeError("`maxSize` must be a number greater than 0");this.maxSize=e.maxSize,this.onEviction=e.onEviction,this.cache=new Map,this.oldCache=new Map,this._size=0}_set(e,t){if(this.cache.set(e,t),this._size++,this._size>=this.maxSize){if(this._size=0,typeof this.onEviction=="function")for(let[i,n]of this.oldCache.entries())this.onEviction(i,n);this.oldCache=this.cache,this.cache=new Map}}get(e){if(this.cache.has(e))return this.cache.get(e);if(this.oldCache.has(e)){let t=this.oldCache.get(e);return this.oldCache.delete(e),this._set(e,t),t}}set(e,t){return this.cache.has(e)?this.cache.set(e,t):this._set(e,t),this}has(e){return this.cache.has(e)||this.oldCache.has(e)}peek(e){if(this.cache.has(e))return this.cache.get(e);if(this.oldCache.has(e))return this.oldCache.get(e)}delete(e){let t=this.cache.delete(e);return t&&this._size--,this.oldCache.delete(e)||t}clear(){this.cache.clear(),this.oldCache.clear(),this._size=0}*keys(){for(let[e]of this)yield e}*values(){for(let[,e]of this)yield e}*[Symbol.iterator](){for(let e of this.cache)yield e;for(let e of this.oldCache){let[t]=e;this.cache.has(t)||(yield e)}}get size(){let e=0;for(let t of this.oldCache.keys())this.cache.has(t)||e++;return Math.min(this._size+e,this.maxSize)}};u5.exports=Mk});var Hk=w((Cnt,p5)=>{"use strict";var $xe=J("events"),ePe=J("tls"),tPe=J("http2"),rPe=Kk(),nn=Symbol("currentStreamsCount"),g5=Symbol("request"),ys=Symbol("cachedOriginSet"),Of=Symbol("gracefullyClosing"),iPe=["maxDeflateDynamicTableSize","maxSessionMemory","maxHeaderListPairs","maxOutstandingPings","maxReservedRemoteStreams","maxSendHeaderBlockLength","paddingStrategy","localAddress","path","rejectUnauthorized","minDHSize","ca","cert","clientCertEngine","ciphers","key","pfx","servername","minVersion","maxVersion","secureProtocol","crl","honorCipherOrder","ecdhCurve","dhparam","secureOptions","sessionIdContext"],nPe=(r,e,t)=>{let i=0,n=r.length;for(;i<n;){let s=i+n>>>1;t(r[s],e)?i=s+1:n=s}return i},sPe=(r,e)=>r.remoteSettings.maxConcurrentStreams>e.remoteSettings.maxConcurrentStreams,Uk=(r,e)=>{for(let t of r)t[ys].length<e[ys].length&&t[ys].every(i=>e[ys].includes(i))&&t[nn]+e[nn]<=e.remoteSettings.maxConcurrentStreams&&h5(t)},oPe=(r,e)=>{for(let t of r)e[ys].length<t[ys].length&&e[ys].every(i=>t[ys].includes(i))&&e[nn]+t[nn]<=t.remoteSettings.maxConcurrentStreams&&h5(e)},f5=({agent:r,isFree:e})=>{let t={};for(let i in r.sessions){let s=r.sessions[i].filter(o=>{let a=o[zo.kCurrentStreamsCount]<o.remoteSettings.maxConcurrentStreams;return e?a:!a});s.length!==0&&(t[i]=s)}return t},h5=r=>{r[Of]=!0,r[nn]===0&&r.close()},zo=class extends $xe{constructor({timeout:e=6e4,maxSessions:t=1/0,maxFreeSessions:i=10,maxCachedTlsSessions:n=100}={}){super(),this.sessions={},this.queue={},this.timeout=e,this.maxSessions=t,this.maxFreeSessions=i,this._freeSessionsCount=0,this._sessionsCount=0,this.settings={enablePush:!1},this.tlsSessionCache=new rPe({maxSize:n})}static normalizeOrigin(e,t){return typeof e=="string"&&(e=new URL(e)),t&&e.hostname!==t&&(e.hostname=t),e.origin}normalizeOptions(e){let t="";if(e)for(let i of iPe)e[i]&&(t+=`:${e[i]}`);return t}_tryToCreateNewSession(e,t){if(!(e in this.queue)||!(t in this.queue[e]))return;let i=this.queue[e][t];this._sessionsCount<this.maxSessions&&!i.completed&&(i.completed=!0,i())}getSession(e,t,i){return new Promise((n,s)=>{Array.isArray(i)?(i=[...i],n()):i=[{resolve:n,reject:s}];let o=this.normalizeOptions(t),a=zo.normalizeOrigin(e,t&&t.servername);if(a===void 0){for(let{reject:u}of i)u(new TypeError("The `origin` argument needs to be a string or an URL object"));return}if(o in this.sessions){let u=this.sessions[o],g=-1,f=-1,h;for(let p of u){let C=p.remoteSettings.maxConcurrentStreams;if(C<g)break;if(p[ys].includes(a)){let y=p[nn];if(y>=C||p[Of]||p.destroyed)continue;h||(g=C),y>f&&(h=p,f=y)}}if(h){if(i.length!==1){for(let{reject:p}of i){let C=new Error(`Expected the length of listeners to be 1, got ${i.length}.
-Please report this to https://github.com/szmarczak/http2-wrapper/`);p(C)}return}i[0].resolve(h);return}}if(o in this.queue){if(a in this.queue[o]){this.queue[o][a].listeners.push(...i),this._tryToCreateNewSession(o,a);return}}else this.queue[o]={};let l=()=>{o in this.queue&&this.queue[o][a]===c&&(delete this.queue[o][a],Object.keys(this.queue[o]).length===0&&delete this.queue[o])},c=()=>{let u=`${a}:${o}`,g=!1;try{let f=tPe.connect(e,{createConnection:this.createConnection,settings:this.settings,session:this.tlsSessionCache.get(u),...t});f[nn]=0,f[Of]=!1;let h=()=>f[nn]<f.remoteSettings.maxConcurrentStreams,p=!0;f.socket.once("session",y=>{this.tlsSessionCache.set(u,y)}),f.once("error",y=>{for(let{reject:B}of i)B(y);this.tlsSessionCache.delete(u)}),f.setTimeout(this.timeout,()=>{f.destroy()}),f.once("close",()=>{if(g){p&&this._freeSessionsCount--,this._sessionsCount--;let y=this.sessions[o];y.splice(y.indexOf(f),1),y.length===0&&delete this.sessions[o]}else{let y=new Error("Session closed without receiving a SETTINGS frame");y.code="HTTP2WRAPPER_NOSETTINGS";for(let{reject:B}of i)B(y);l()}this._tryToCreateNewSession(o,a)});let C=()=>{if(!(!(o in this.queue)||!h())){for(let y of f[ys])if(y in this.queue[o]){let{listeners:B}=this.queue[o][y];for(;B.length!==0&&h();)B.shift().resolve(f);let v=this.queue[o];if(v[y].listeners.length===0&&(delete v[y],Object.keys(v).length===0)){delete this.queue[o];break}if(!h())break}}};f.on("origin",()=>{f[ys]=f.originSet,h()&&(C(),Uk(this.sessions[o],f))}),f.once("remoteSettings",()=>{if(f.ref(),f.unref(),this._sessionsCount++,c.destroyed){let y=new Error("Agent has been destroyed");for(let B of i)B.reject(y);f.destroy();return}f[ys]=f.originSet;{let y=this.sessions;if(o in y){let B=y[o];B.splice(nPe(B,f,sPe),0,f)}else y[o]=[f]}this._freeSessionsCount+=1,g=!0,this.emit("session",f),C(),l(),f[nn]===0&&this._freeSessionsCount>this.maxFreeSessions&&f.close(),i.length!==0&&(this.getSession(a,t,i),i.length=0),f.on("remoteSettings",()=>{C(),Uk(this.sessions[o],f)})}),f[g5]=f.request,f.request=(y,B)=>{if(f[Of])throw new Error("The session is gracefully closing. No new streams are allowed.");let v=f[g5](y,B);return f.ref(),++f[nn],f[nn]===f.remoteSettings.maxConcurrentStreams&&this._freeSessionsCount--,v.once("close",()=>{if(p=h(),--f[nn],!f.destroyed&&!f.closed&&(oPe(this.sessions[o],f),h()&&!f.closed)){p||(this._freeSessionsCount++,p=!0);let D=f[nn]===0;D&&f.unref(),D&&(this._freeSessionsCount>this.maxFreeSessions||f[Of])?f.close():(Uk(this.sessions[o],f),C())}}),v}}catch(f){for(let h of i)h.reject(f);l()}};c.listeners=i,c.completed=!1,c.destroyed=!1,this.queue[o][a]=c,this._tryToCreateNewSession(o,a)})}request(e,t,i,n){return new Promise((s,o)=>{this.getSession(e,t,[{reject:o,resolve:a=>{try{s(a.request(i,n))}catch(l){o(l)}}}])})}createConnection(e,t){return zo.connect(e,t)}static connect(e,t){t.ALPNProtocols=["h2"];let i=e.port||443,n=e.hostname||e.host;return typeof t.servername>"u"&&(t.servername=n),ePe.connect(i,n,t)}closeFreeSessions(){for(let e of Object.values(this.sessions))for(let t of e)t[nn]===0&&t.close()}destroy(e){for(let t of Object.values(this.sessions))for(let i of t)i.destroy(e);for(let t of Object.values(this.queue))for(let i of Object.values(t))i.destroyed=!0;this.queue={}}get freeSessions(){return f5({agent:this,isFree:!0})}get busySessions(){return f5({agent:this,isFree:!1})}};zo.kCurrentStreamsCount=nn;zo.kGracefullyClosing=Of;p5.exports={Agent:zo,globalAgent:new zo}});var Yk=w((mnt,d5)=>{"use strict";var{Readable:aPe}=J("stream"),Gk=class extends aPe{constructor(e,t){super({highWaterMark:t,autoDestroy:!1}),this.statusCode=null,this.statusMessage="",this.httpVersion="2.0",this.httpVersionMajor=2,this.httpVersionMinor=0,this.headers={},this.trailers={},this.req=null,this.aborted=!1,this.complete=!1,this.upgrade=null,this.rawHeaders=[],this.rawTrailers=[],this.socket=e,this.connection=e,this._dumped=!1}_destroy(e){this.req._request.destroy(e)}setTimeout(e,t){return this.req.setTimeout(e,t),this}_dump(){this._dumped||(this._dumped=!0,this.removeAllListeners("data"),this.resume())}_read(){this.req&&this.req._request.resume()}};d5.exports=Gk});var jk=w((Ent,C5)=>{"use strict";C5.exports=r=>{let e={protocol:r.protocol,hostname:typeof r.hostname=="string"&&r.hostname.startsWith("[")?r.hostname.slice(1,-1):r.hostname,host:r.host,hash:r.hash,search:r.search,pathname:r.pathname,href:r.href,path:`${r.pathname||""}${r.search||""}`};return typeof r.port=="string"&&r.port.length!==0&&(e.port=Number(r.port)),(r.username||r.password)&&(e.auth=`${r.username||""}:${r.password||""}`),e}});var E5=w((Int,m5)=>{"use strict";m5.exports=(r,e,t)=>{for(let i of t)r.on(i,(...n)=>e.emit(i,...n))}});var y5=w((ynt,I5)=>{"use strict";I5.exports=r=>{switch(r){case":method":case":scheme":case":authority":case":path":return!0;default:return!1}}});var B5=w((Bnt,w5)=>{"use strict";var Mf=(r,e,t)=>{w5.exports[e]=class extends r{constructor(...n){super(typeof t=="string"?t:t(n)),this.name=`${super.name} [${e}]`,this.code=e}}};Mf(TypeError,"ERR_INVALID_ARG_TYPE",r=>{let e=r[0].includes(".")?"property":"argument",t=r[1],i=Array.isArray(t);return i&&(t=`${t.slice(0,-1).join(", ")} or ${t.slice(-1)}`),`The "${r[0]}" ${e} must be ${i?"one of":"of"} type ${t}. Received ${typeof r[2]}`});Mf(TypeError,"ERR_INVALID_PROTOCOL",r=>`Protocol "${r[0]}" not supported. Expected "${r[1]}"`);Mf(Error,"ERR_HTTP_HEADERS_SENT",r=>`Cannot ${r[0]} headers after they are sent to the client`);Mf(TypeError,"ERR_INVALID_HTTP_TOKEN",r=>`${r[0]} must be a valid HTTP token [${r[1]}]`);Mf(TypeError,"ERR_HTTP_INVALID_HEADER_VALUE",r=>`Invalid value "${r[0]} for header "${r[1]}"`);Mf(TypeError,"ERR_INVALID_CHAR",r=>`Invalid character in ${r[0]} [${r[1]}]`)});var Vk=w((Qnt,D5)=>{"use strict";var APe=J("http2"),{Writable:lPe}=J("stream"),{Agent:Q5,globalAgent:cPe}=Hk(),uPe=Yk(),gPe=jk(),fPe=E5(),hPe=y5(),{ERR_INVALID_ARG_TYPE:qk,ERR_INVALID_PROTOCOL:pPe,ERR_HTTP_HEADERS_SENT:b5,ERR_INVALID_HTTP_TOKEN:dPe,ERR_HTTP_INVALID_HEADER_VALUE:CPe,ERR_INVALID_CHAR:mPe}=B5(),{HTTP2_HEADER_STATUS:S5,HTTP2_HEADER_METHOD:v5,HTTP2_HEADER_PATH:x5,HTTP2_METHOD_CONNECT:EPe}=APe.constants,Ui=Symbol("headers"),Jk=Symbol("origin"),Wk=Symbol("session"),P5=Symbol("options"),Vw=Symbol("flushedHeaders"),CC=Symbol("jobs"),IPe=/^[\^`\-\w!#$%&*+.|~]+$/,yPe=/[^\t\u0020-\u007E\u0080-\u00FF]/,zk=class extends lPe{constructor(e,t,i){super({autoDestroy:!1});let n=typeof e=="string"||e instanceof URL;if(n&&(e=gPe(e instanceof URL?e:new URL(e))),typeof t=="function"||t===void 0?(i=t,t=n?e:{...e}):t={...e,...t},t.h2session)this[Wk]=t.h2session;else if(t.agent===!1)this.agent=new Q5({maxFreeSessions:0});else if(typeof t.agent>"u"||t.agent===null)typeof t.createConnection=="function"?(this.agent=new Q5({maxFreeSessions:0}),this.agent.createConnection=t.createConnection):this.agent=cPe;else if(typeof t.agent.request=="function")this.agent=t.agent;else throw new qk("options.agent",["Agent-like Object","undefined","false"],t.agent);if(t.protocol&&t.protocol!=="https:")throw new pPe(t.protocol,"https:");let s=t.port||t.defaultPort||this.agent&&this.agent.defaultPort||443,o=t.hostname||t.host||"localhost";delete t.hostname,delete t.host,delete t.port;let{timeout:a}=t;if(t.timeout=void 0,this[Ui]=Object.create(null),this[CC]=[],this.socket=null,this.connection=null,this.method=t.method||"GET",this.path=t.path,this.res=null,this.aborted=!1,this.reusedSocket=!1,t.headers)for(let[l,c]of Object.entries(t.headers))this.setHeader(l,c);t.auth&&!("authorization"in this[Ui])&&(this[Ui].authorization="Basic "+Buffer.from(t.auth).toString("base64")),t.session=t.tlsSession,t.path=t.socketPath,this[P5]=t,s===443?(this[Jk]=`https://${o}`,":authority"in this[Ui]||(this[Ui][":authority"]=o)):(this[Jk]=`https://${o}:${s}`,":authority"in this[Ui]||(this[Ui][":authority"]=`${o}:${s}`)),a&&this.setTimeout(a),i&&this.once("response",i),this[Vw]=!1}get method(){return this[Ui][v5]}set method(e){e&&(this[Ui][v5]=e.toUpperCase())}get path(){return this[Ui][x5]}set path(e){e&&(this[Ui][x5]=e)}get _mustNotHaveABody(){return this.method==="GET"||this.method==="HEAD"||this.method==="DELETE"}_write(e,t,i){if(this._mustNotHaveABody){i(new Error("The GET, HEAD and DELETE methods must NOT have a body"));return}this.flushHeaders();let n=()=>this._request.write(e,t,i);this._request?n():this[CC].push(n)}_final(e){if(this.destroyed)return;this.flushHeaders();let t=()=>{if(this._mustNotHaveABody){e();return}this._request.end(e)};this._request?t():this[CC].push(t)}abort(){this.res&&this.res.complete||(this.aborted||process.nextTick(()=>this.emit("abort")),this.aborted=!0,this.destroy())}_destroy(e,t){this.res&&this.res._dump(),this._request&&this._request.destroy(),t(e)}async flushHeaders(){if(this[Vw]||this.destroyed)return;this[Vw]=!0;let e=this.method===EPe,t=i=>{if(this._request=i,this.destroyed){i.destroy();return}e||fPe(i,this,["timeout","continue","close","error"]);let n=o=>(...a)=>{!this.writable&&!this.destroyed?o(...a):this.once("finish",()=>{o(...a)})};i.once("response",n((o,a,l)=>{let c=new uPe(this.socket,i.readableHighWaterMark);this.res=c,c.req=this,c.statusCode=o[S5],c.headers=o,c.rawHeaders=l,c.once("end",()=>{this.aborted?(c.aborted=!0,c.emit("aborted")):(c.complete=!0,c.socket=null,c.connection=null)}),e?(c.upgrade=!0,this.emit("connect",c,i,Buffer.alloc(0))?this.emit("close"):i.destroy()):(i.on("data",u=>{!c._dumped&&!c.push(u)&&i.pause()}),i.once("end",()=>{c.push(null)}),this.emit("response",c)||c._dump())})),i.once("headers",n(o=>this.emit("information",{statusCode:o[S5]}))),i.once("trailers",n((o,a,l)=>{let{res:c}=this;c.trailers=o,c.rawTrailers=l}));let{socket:s}=i.session;this.socket=s,this.connection=s;for(let o of this[CC])o();this.emit("socket",this.socket)};if(this[Wk])try{t(this[Wk].request(this[Ui]))}catch(i){this.emit("error",i)}else{this.reusedSocket=!0;try{t(await this.agent.request(this[Jk],this[P5],this[Ui]))}catch(i){this.emit("error",i)}}}getHeader(e){if(typeof e!="string")throw new qk("name","string",e);return this[Ui][e.toLowerCase()]}get headersSent(){return this[Vw]}removeHeader(e){if(typeof e!="string")throw new qk("name","string",e);if(this.headersSent)throw new b5("remove");delete this[Ui][e.toLowerCase()]}setHeader(e,t){if(this.headersSent)throw new b5("set");if(typeof e!="string"||!IPe.test(e)&&!hPe(e))throw new dPe("Header name",e);if(typeof t>"u")throw new CPe(t,e);if(yPe.test(t))throw new mPe("header content",e);this[Ui][e.toLowerCase()]=t}setNoDelay(){}setSocketKeepAlive(){}setTimeout(e,t){let i=()=>this._request.setTimeout(e,t);return this._request?i():this[CC].push(i),this}get maxHeadersCount(){if(!this.destroyed&&this._request)return this._request.session.localSettings.maxHeaderListSize}set maxHeadersCount(e){}};D5.exports=zk});var R5=w((bnt,k5)=>{"use strict";var wPe=J("tls");k5.exports=(r={})=>new Promise((e,t)=>{let i=wPe.connect(r,()=>{r.resolveSocket?(i.off("error",t),e({alpnProtocol:i.alpnProtocol,socket:i})):(i.destroy(),e({alpnProtocol:i.alpnProtocol}))});i.on("error",t)})});var N5=w((Snt,F5)=>{"use strict";var BPe=J("net");F5.exports=r=>{let e=r.host,t=r.headers&&r.headers.host;return t&&(t.startsWith("[")?t.indexOf("]")===-1?e=t:e=t.slice(1,-1):e=t.split(":",1)[0]),BPe.isIP(e)?"":e}});var O5=w((vnt,Zk)=>{"use strict";var L5=J("http"),Xk=J("https"),QPe=R5(),bPe=Kk(),SPe=Vk(),vPe=N5(),xPe=jk(),Xw=new bPe({maxSize:100}),mC=new Map,T5=(r,e,t)=>{e._httpMessage={shouldKeepAlive:!0};let i=()=>{r.emit("free",e,t)};e.on("free",i);let n=()=>{r.removeSocket(e,t)};e.on("close",n);let s=()=>{r.removeSocket(e,t),e.off("close",n),e.off("free",i),e.off("agentRemove",s)};e.on("agentRemove",s),r.emit("free",e,t)},PPe=async r=>{let e=`${r.host}:${r.port}:${r.ALPNProtocols.sort()}`;if(!Xw.has(e)){if(mC.has(e))return(await mC.get(e)).alpnProtocol;let{path:t,agent:i}=r;r.path=r.socketPath;let n=QPe(r);mC.set(e,n);try{let{socket:s,alpnProtocol:o}=await n;if(Xw.set(e,o),r.path=t,o==="h2")s.destroy();else{let{globalAgent:a}=Xk,l=Xk.Agent.prototype.createConnection;i?i.createConnection===l?T5(i,s,r):s.destroy():a.createConnection===l?T5(a,s,r):s.destroy()}return mC.delete(e),o}catch(s){throw mC.delete(e),s}}return Xw.get(e)};Zk.exports=async(r,e,t)=>{if((typeof r=="string"||r instanceof URL)&&(r=xPe(new URL(r))),typeof e=="function"&&(t=e,e=void 0),e={ALPNProtocols:["h2","http/1.1"],...r,...e,resolveSocket:!0},!Array.isArray(e.ALPNProtocols)||e.ALPNProtocols.length===0)throw new Error("The `ALPNProtocols` option must be an Array with at least one entry");e.protocol=e.protocol||"https:";let i=e.protocol==="https:";e.host=e.hostname||e.host||"localhost",e.session=e.tlsSession,e.servername=e.servername||vPe(e),e.port=e.port||(i?443:80),e._defaultAgent=i?Xk.globalAgent:L5.globalAgent;let n=e.agent;if(n){if(n.addRequest)throw new Error("The `options.agent` object can contain only `http`, `https` or `http2` properties");e.agent=n[i?"https":"http"]}return i&&await PPe(e)==="h2"?(n&&(e.agent=n.http2),new SPe(e,t)):L5.request(e,t)};Zk.exports.protocolCache=Xw});var K5=w((xnt,M5)=>{"use strict";var DPe=J("http2"),kPe=Hk(),_k=Vk(),RPe=Yk(),FPe=O5(),NPe=(r,e,t)=>new _k(r,e,t),LPe=(r,e,t)=>{let i=new _k(r,e,t);return i.end(),i};M5.exports={...DPe,ClientRequest:_k,IncomingMessage:RPe,...kPe,request:NPe,get:LPe,auto:FPe}});var eR=w($k=>{"use strict";Object.defineProperty($k,"__esModule",{value:!0});var U5=Ha();$k.default=r=>U5.default.nodeStream(r)&&U5.default.function_(r.getBoundary)});var j5=w(tR=>{"use strict";Object.defineProperty(tR,"__esModule",{value:!0});var G5=J("fs"),Y5=J("util"),H5=Ha(),TPe=eR(),OPe=Y5.promisify(G5.stat);tR.default=async(r,e)=>{if(e&&"content-length"in e)return Number(e["content-length"]);if(!r)return 0;if(H5.default.string(r))return Buffer.byteLength(r);if(H5.default.buffer(r))return r.length;if(TPe.default(r))return Y5.promisify(r.getLength.bind(r))();if(r instanceof G5.ReadStream){let{size:t}=await OPe(r.path);return t===0?void 0:t}}});var iR=w(rR=>{"use strict";Object.defineProperty(rR,"__esModule",{value:!0});function MPe(r,e,t){let i={};for(let n of t)i[n]=(...s)=>{e.emit(n,...s)},r.on(n,i[n]);return()=>{for(let n of t)r.off(n,i[n])}}rR.default=MPe});var q5=w(nR=>{"use strict";Object.defineProperty(nR,"__esModule",{value:!0});nR.default=()=>{let r=[];return{once(e,t,i){e.once(t,i),r.push({origin:e,event:t,fn:i})},unhandleAll(){for(let e of r){let{origin:t,event:i,fn:n}=e;t.removeListener(i,n)}r.length=0}}}});var W5=w(EC=>{"use strict";Object.defineProperty(EC,"__esModule",{value:!0});EC.TimeoutError=void 0;var KPe=J("net"),UPe=q5(),J5=Symbol("reentry"),HPe=()=>{},Zw=class extends Error{constructor(e,t){super(`Timeout awaiting '${t}' for ${e}ms`),this.event=t,this.name="TimeoutError",this.code="ETIMEDOUT"}};EC.TimeoutError=Zw;EC.default=(r,e,t)=>{if(J5 in r)return HPe;r[J5]=!0;let i=[],{once:n,unhandleAll:s}=UPe.default(),o=(g,f,h)=>{var p;let C=setTimeout(f,g,g,h);(p=C.unref)===null||p===void 0||p.call(C);let y=()=>{clearTimeout(C)};return i.push(y),y},{host:a,hostname:l}=t,c=(g,f)=>{r.destroy(new Zw(g,f))},u=()=>{for(let g of i)g();s()};if(r.once("error",g=>{if(u(),r.listenerCount("error")===0)throw g}),r.once("close",u),n(r,"response",g=>{n(g,"end",u)}),typeof e.request<"u"&&o(e.request,c,"request"),typeof e.socket<"u"){let g=()=>{c(e.socket,"socket")};r.setTimeout(e.socket,g),i.push(()=>{r.removeListener("timeout",g)})}return n(r,"socket",g=>{var f;let{socketPath:h}=r;if(g.connecting){let p=Boolean(h!=null?h:KPe.isIP((f=l!=null?l:a)!==null&&f!==void 0?f:"")!==0);if(typeof e.lookup<"u"&&!p&&typeof g.address().address>"u"){let C=o(e.lookup,c,"lookup");n(g,"lookup",C)}if(typeof e.connect<"u"){let C=()=>o(e.connect,c,"connect");p?n(g,"connect",C()):n(g,"lookup",y=>{y===null&&n(g,"connect",C())})}typeof e.secureConnect<"u"&&t.protocol==="https:"&&n(g,"connect",()=>{let C=o(e.secureConnect,c,"secureConnect");n(g,"secureConnect",C)})}if(typeof e.send<"u"){let p=()=>o(e.send,c,"send");g.connecting?n(g,"connect",()=>{n(r,"upload-complete",p())}):n(r,"upload-complete",p())}}),typeof e.response<"u"&&n(r,"upload-complete",()=>{let g=o(e.response,c,"response");n(r,"response",g)}),u}});var V5=w(sR=>{"use strict";Object.defineProperty(sR,"__esModule",{value:!0});var z5=Ha();sR.default=r=>{r=r;let e={protocol:r.protocol,hostname:z5.default.string(r.hostname)&&r.hostname.startsWith("[")?r.hostname.slice(1,-1):r.hostname,host:r.host,hash:r.hash,search:r.search,pathname:r.pathname,href:r.href,path:`${r.pathname||""}${r.search||""}`};return z5.default.string(r.port)&&r.port.length>0&&(e.port=Number(r.port)),(r.username||r.password)&&(e.auth=`${r.username||""}:${r.password||""}`),e}});var X5=w(oR=>{"use strict";Object.defineProperty(oR,"__esModule",{value:!0});var GPe=J("url"),YPe=["protocol","host","hostname","port","pathname","search"];oR.default=(r,e)=>{var t,i;if(e.path){if(e.pathname)throw new TypeError("Parameters `path` and `pathname` are mutually exclusive.");if(e.search)throw new TypeError("Parameters `path` and `search` are mutually exclusive.");if(e.searchParams)throw new TypeError("Parameters `path` and `searchParams` are mutually exclusive.")}if(e.search&&e.searchParams)throw new TypeError("Parameters `search` and `searchParams` are mutually exclusive.");if(!r){if(!e.protocol)throw new TypeError("No URL protocol specified");r=`${e.protocol}//${(i=(t=e.hostname)!==null&&t!==void 0?t:e.host)!==null&&i!==void 0?i:""}`}let n=new GPe.URL(r);if(e.path){let s=e.path.indexOf("?");s===-1?e.pathname=e.path:(e.pathname=e.path.slice(0,s),e.search=e.path.slice(s+1)),delete e.path}for(let s of YPe)e[s]&&(n[s]=e[s].toString());return n}});var Z5=w(AR=>{"use strict";Object.defineProperty(AR,"__esModule",{value:!0});var aR=class{constructor(){this.weakMap=new WeakMap,this.map=new Map}set(e,t){typeof e=="object"?this.weakMap.set(e,t):this.map.set(e,t)}get(e){return typeof e=="object"?this.weakMap.get(e):this.map.get(e)}has(e){return typeof e=="object"?this.weakMap.has(e):this.map.has(e)}};AR.default=aR});var cR=w(lR=>{"use strict";Object.defineProperty(lR,"__esModule",{value:!0});var jPe=async r=>{let e=[],t=0;for await(let i of r)e.push(i),t+=Buffer.byteLength(i);return Buffer.isBuffer(e[0])?Buffer.concat(e,t):Buffer.from(e.join(""))};lR.default=jPe});var $5=w(Fc=>{"use strict";Object.defineProperty(Fc,"__esModule",{value:!0});Fc.dnsLookupIpVersionToFamily=Fc.isDnsLookupIpVersion=void 0;var _5={auto:0,ipv4:4,ipv6:6};Fc.isDnsLookupIpVersion=r=>r in _5;Fc.dnsLookupIpVersionToFamily=r=>{if(Fc.isDnsLookupIpVersion(r))return _5[r];throw new Error("Invalid DNS lookup IP version")}});var uR=w(_w=>{"use strict";Object.defineProperty(_w,"__esModule",{value:!0});_w.isResponseOk=void 0;_w.isResponseOk=r=>{let{statusCode:e}=r,t=r.request.options.followRedirect?299:399;return e>=200&&e<=t||e===304}});var t6=w(gR=>{"use strict";Object.defineProperty(gR,"__esModule",{value:!0});var e6=new Set;gR.default=r=>{e6.has(r)||(e6.add(r),process.emitWarning(`Got: ${r}`,{type:"DeprecationWarning"}))}});var r6=w(fR=>{"use strict";Object.defineProperty(fR,"__esModule",{value:!0});var mr=Ha(),qPe=(r,e)=>{if(mr.default.null_(r.encoding))throw new TypeError("To get a Buffer, set `options.responseType` to `buffer` instead");mr.assert.any([mr.default.string,mr.default.undefined],r.encoding),mr.assert.any([mr.default.boolean,mr.default.undefined],r.resolveBodyOnly),mr.assert.any([mr.default.boolean,mr.default.undefined],r.methodRewriting),mr.assert.any([mr.default.boolean,mr.default.undefined],r.isStream),mr.assert.any([mr.default.string,mr.default.undefined],r.responseType),r.responseType===void 0&&(r.responseType="text");let{retry:t}=r;if(e?r.retry={...e.retry}:r.retry={calculateDelay:i=>i.computedValue,limit:0,methods:[],statusCodes:[],errorCodes:[],maxRetryAfter:void 0},mr.default.object(t)?(r.retry={...r.retry,...t},r.retry.methods=[...new Set(r.retry.methods.map(i=>i.toUpperCase()))],r.retry.statusCodes=[...new Set(r.retry.statusCodes)],r.retry.errorCodes=[...new Set(r.retry.errorCodes)]):mr.default.number(t)&&(r.retry.limit=t),mr.default.undefined(r.retry.maxRetryAfter)&&(r.retry.maxRetryAfter=Math.min(...[r.timeout.request,r.timeout.connect].filter(mr.default.number))),mr.default.object(r.pagination)){e&&(r.pagination={...e.pagination,...r.pagination});let{pagination:i}=r;if(!mr.default.function_(i.transform))throw new Error("`options.pagination.transform` must be implemented");if(!mr.default.function_(i.shouldContinue))throw new Error("`options.pagination.shouldContinue` must be implemented");if(!mr.default.function_(i.filter))throw new TypeError("`options.pagination.filter` must be implemented");if(!mr.default.function_(i.paginate))throw new Error("`options.pagination.paginate` must be implemented")}return r.responseType==="json"&&r.headers.accept===void 0&&(r.headers.accept="application/json"),r};fR.default=qPe});var i6=w(IC=>{"use strict";Object.defineProperty(IC,"__esModule",{value:!0});IC.retryAfterStatusCodes=void 0;IC.retryAfterStatusCodes=new Set([413,429,503]);var JPe=({attemptCount:r,retryOptions:e,error:t,retryAfter:i})=>{if(r>e.limit)return 0;let n=e.methods.includes(t.options.method),s=e.errorCodes.includes(t.code),o=t.response&&e.statusCodes.includes(t.response.statusCode);if(!n||!s&&!o)return 0;if(t.response){if(i)return e.maxRetryAfter===void 0||i>e.maxRetryAfter?0:i;if(t.response.statusCode===413)return 0}let a=Math.random()*100;return 2**(r-1)*1e3+a};IC.default=JPe});var BC=w(Yt=>{"use strict";Object.defineProperty(Yt,"__esModule",{value:!0});Yt.UnsupportedProtocolError=Yt.ReadError=Yt.TimeoutError=Yt.UploadError=Yt.CacheError=Yt.HTTPError=Yt.MaxRedirectsError=Yt.RequestError=Yt.setNonEnumerableProperties=Yt.knownHookEvents=Yt.withoutBody=Yt.kIsNormalizedAlready=void 0;var n6=J("util"),s6=J("stream"),WPe=J("fs"),zA=J("url"),o6=J("http"),hR=J("http"),zPe=J("https"),VPe=yz(),XPe=xz(),a6=o5(),ZPe=c5(),_Pe=K5(),$Pe=Ww(),Ee=Ha(),eDe=j5(),A6=eR(),tDe=iR(),l6=W5(),rDe=V5(),c6=X5(),iDe=Z5(),nDe=cR(),u6=$5(),sDe=uR(),VA=t6(),oDe=r6(),aDe=i6(),pR,Pi=Symbol("request"),tB=Symbol("response"),Kf=Symbol("responseSize"),Uf=Symbol("downloadedSize"),Hf=Symbol("bodySize"),Gf=Symbol("uploadedSize"),$w=Symbol("serverResponsesPiped"),g6=Symbol("unproxyEvents"),f6=Symbol("isFromCache"),dR=Symbol("cancelTimeouts"),h6=Symbol("startedReading"),Yf=Symbol("stopReading"),eB=Symbol("triggerRead"),XA=Symbol("body"),yC=Symbol("jobs"),p6=Symbol("originalResponse"),d6=Symbol("retryTimeout");Yt.kIsNormalizedAlready=Symbol("isNormalizedAlready");var ADe=Ee.default.string(process.versions.brotli);Yt.withoutBody=new Set(["GET","HEAD"]);Yt.knownHookEvents=["init","beforeRequest","beforeRedirect","beforeError","beforeRetry","afterResponse"];function lDe(r){for(let e in r){let t=r[e];if(!Ee.default.string(t)&&!Ee.default.number(t)&&!Ee.default.boolean(t)&&!Ee.default.null_(t)&&!Ee.default.undefined(t))throw new TypeError(`The \`searchParams\` value '${String(t)}' must be a string, number, boolean or null`)}}function cDe(r){return Ee.default.object(r)&&!("statusCode"in r)}var CR=new iDe.default,uDe=async r=>new Promise((e,t)=>{let i=n=>{t(n)};r.pending||e(),r.once("error",i),r.once("ready",()=>{r.off("error",i),e()})}),gDe=new Set([300,301,302,303,304,307,308]),fDe=["context","body","json","form"];Yt.setNonEnumerableProperties=(r,e)=>{let t={};for(let i of r)if(!!i)for(let n of fDe)n in i&&(t[n]={writable:!0,configurable:!0,enumerable:!1,value:i[n]});Object.defineProperties(e,t)};var ei=class extends Error{constructor(e,t,i){var n;if(super(e),Error.captureStackTrace(this,this.constructor),this.name="RequestError",this.code=t.code,i instanceof AB?(Object.defineProperty(this,"request",{enumerable:!1,value:i}),Object.defineProperty(this,"response",{enumerable:!1,value:i[tB]}),Object.defineProperty(this,"options",{enumerable:!1,value:i.options})):Object.defineProperty(this,"options",{enumerable:!1,value:i}),this.timings=(n=this.request)===null||n===void 0?void 0:n.timings,Ee.default.string(t.stack)&&Ee.default.string(this.stack)){let s=this.stack.indexOf(this.message)+this.message.length,o=this.stack.slice(s).split(`
-`).reverse(),a=t.stack.slice(t.stack.indexOf(t.message)+t.message.length).split(`
-`).reverse();for(;a.length!==0&&a[0]===o[0];)o.shift();this.stack=`${this.stack.slice(0,s)}${o.reverse().join(`
-`)}${a.reverse().join(`
-`)}`}}};Yt.RequestError=ei;var rB=class extends ei{constructor(e){super(`Redirected ${e.options.maxRedirects} times. Aborting.`,{},e),this.name="MaxRedirectsError"}};Yt.MaxRedirectsError=rB;var iB=class extends ei{constructor(e){super(`Response code ${e.statusCode} (${e.statusMessage})`,{},e.request),this.name="HTTPError"}};Yt.HTTPError=iB;var nB=class extends ei{constructor(e,t){super(e.message,e,t),this.name="CacheError"}};Yt.CacheError=nB;var sB=class extends ei{constructor(e,t){super(e.message,e,t),this.name="UploadError"}};Yt.UploadError=sB;var oB=class extends ei{constructor(e,t,i){super(e.message,e,i),this.name="TimeoutError",this.event=e.event,this.timings=t}};Yt.TimeoutError=oB;var wC=class extends ei{constructor(e,t){super(e.message,e,t),this.name="ReadError"}};Yt.ReadError=wC;var aB=class extends ei{constructor(e){super(`Unsupported protocol "${e.url.protocol}"`,{},e),this.name="UnsupportedProtocolError"}};Yt.UnsupportedProtocolError=aB;var hDe=["socket","connect","continue","information","upgrade","timeout"],AB=class extends s6.Duplex{constructor(e,t={},i){super({autoDestroy:!1,highWaterMark:0}),this[Uf]=0,this[Gf]=0,this.requestInitialized=!1,this[$w]=new Set,this.redirects=[],this[Yf]=!1,this[eB]=!1,this[yC]=[],this.retryCount=0,this._progressCallbacks=[];let n=()=>this._unlockWrite(),s=()=>this._lockWrite();this.on("pipe",c=>{c.prependListener("data",n),c.on("data",s),c.prependListener("end",n),c.on("end",s)}),this.on("unpipe",c=>{c.off("data",n),c.off("data",s),c.off("end",n),c.off("end",s)}),this.on("pipe",c=>{c instanceof hR.IncomingMessage&&(this.options.headers={...c.headers,...this.options.headers})});let{json:o,body:a,form:l}=t;if((o||a||l)&&this._lockWrite(),Yt.kIsNormalizedAlready in t)this.options=t;else try{this.options=this.constructor.normalizeArguments(e,t,i)}catch(c){Ee.default.nodeStream(t.body)&&t.body.destroy(),this.destroy(c);return}(async()=>{var c;try{this.options.body instanceof WPe.ReadStream&&await uDe(this.options.body);let{url:u}=this.options;if(!u)throw new TypeError("Missing `url` property");if(this.requestUrl=u.toString(),decodeURI(this.requestUrl),await this._finalizeBody(),await this._makeRequest(),this.destroyed){(c=this[Pi])===null||c===void 0||c.destroy();return}for(let g of this[yC])g();this[yC].length=0,this.requestInitialized=!0}catch(u){if(u instanceof ei){this._beforeError(u);return}this.destroyed||this.destroy(u)}})()}static normalizeArguments(e,t,i){var n,s,o,a,l;let c=t;if(Ee.default.object(e)&&!Ee.default.urlInstance(e))t={...i,...e,...t};else{if(e&&t&&t.url!==void 0)throw new TypeError("The `url` option is mutually exclusive with the `input` argument");t={...i,...t},e!==void 0&&(t.url=e),Ee.default.urlInstance(t.url)&&(t.url=new zA.URL(t.url.toString()))}if(t.cache===!1&&(t.cache=void 0),t.dnsCache===!1&&(t.dnsCache=void 0),Ee.assert.any([Ee.default.string,Ee.default.undefined],t.method),Ee.assert.any([Ee.default.object,Ee.default.undefined],t.headers),Ee.assert.any([Ee.default.string,Ee.default.urlInstance,Ee.default.undefined],t.prefixUrl),Ee.assert.any([Ee.default.object,Ee.default.undefined],t.cookieJar),Ee.assert.any([Ee.default.object,Ee.default.string,Ee.default.undefined],t.searchParams),Ee.assert.any([Ee.default.object,Ee.default.string,Ee.default.undefined],t.cache),Ee.assert.any([Ee.default.object,Ee.default.number,Ee.default.undefined],t.timeout),Ee.assert.any([Ee.default.object,Ee.default.undefined],t.context),Ee.assert.any([Ee.default.object,Ee.default.undefined],t.hooks),Ee.assert.any([Ee.default.boolean,Ee.default.undefined],t.decompress),Ee.assert.any([Ee.default.boolean,Ee.default.undefined],t.ignoreInvalidCookies),Ee.assert.any([Ee.default.boolean,Ee.default.undefined],t.followRedirect),Ee.assert.any([Ee.default.number,Ee.default.undefined],t.maxRedirects),Ee.assert.any([Ee.default.boolean,Ee.default.undefined],t.throwHttpErrors),Ee.assert.any([Ee.default.boolean,Ee.default.undefined],t.http2),Ee.assert.any([Ee.default.boolean,Ee.default.undefined],t.allowGetBody),Ee.assert.any([Ee.default.string,Ee.default.undefined],t.localAddress),Ee.assert.any([u6.isDnsLookupIpVersion,Ee.default.undefined],t.dnsLookupIpVersion),Ee.assert.any([Ee.default.object,Ee.default.undefined],t.https),Ee.assert.any([Ee.default.boolean,Ee.default.undefined],t.rejectUnauthorized),t.https&&(Ee.assert.any([Ee.default.boolean,Ee.default.undefined],t.https.rejectUnauthorized),Ee.assert.any([Ee.default.function_,Ee.default.undefined],t.https.checkServerIdentity),Ee.assert.any([Ee.default.string,Ee.default.object,Ee.default.array,Ee.default.undefined],t.https.certificateAuthority),Ee.assert.any([Ee.default.string,Ee.default.object,Ee.default.array,Ee.default.undefined],t.https.key),Ee.assert.any([Ee.default.string,Ee.default.object,Ee.default.array,Ee.default.undefined],t.https.certificate),Ee.assert.any([Ee.default.string,Ee.default.undefined],t.https.passphrase),Ee.assert.any([Ee.default.string,Ee.default.buffer,Ee.default.array,Ee.default.undefined],t.https.pfx)),Ee.assert.any([Ee.default.object,Ee.default.undefined],t.cacheOptions),Ee.default.string(t.method)?t.method=t.method.toUpperCase():t.method="GET",t.headers===(i==null?void 0:i.headers)?t.headers={...t.headers}:t.headers=$Pe({...i==null?void 0:i.headers,...t.headers}),"slashes"in t)throw new TypeError("The legacy `url.Url` has been deprecated. Use `URL` instead.");if("auth"in t)throw new TypeError("Parameter `auth` is deprecated. Use `username` / `password` instead.");if("searchParams"in t&&t.searchParams&&t.searchParams!==(i==null?void 0:i.searchParams)){let h;if(Ee.default.string(t.searchParams)||t.searchParams instanceof zA.URLSearchParams)h=new zA.URLSearchParams(t.searchParams);else{lDe(t.searchParams),h=new zA.URLSearchParams;for(let p in t.searchParams){let C=t.searchParams[p];C===null?h.append(p,""):C!==void 0&&h.append(p,C)}}(n=i==null?void 0:i.searchParams)===null||n===void 0||n.forEach((p,C)=>{h.has(C)||h.append(C,p)}),t.searchParams=h}if(t.username=(s=t.username)!==null&&s!==void 0?s:"",t.password=(o=t.password)!==null&&o!==void 0?o:"",Ee.default.undefined(t.prefixUrl)?t.prefixUrl=(a=i==null?void 0:i.prefixUrl)!==null&&a!==void 0?a:"":(t.prefixUrl=t.prefixUrl.toString(),t.prefixUrl!==""&&!t.prefixUrl.endsWith("/")&&(t.prefixUrl+="/")),Ee.default.string(t.url)){if(t.url.startsWith("/"))throw new Error("`input` must not start with a slash when using `prefixUrl`");t.url=c6.default(t.prefixUrl+t.url,t)}else(Ee.default.undefined(t.url)&&t.prefixUrl!==""||t.protocol)&&(t.url=c6.default(t.prefixUrl,t));if(t.url){"port"in t&&delete t.port;let{prefixUrl:h}=t;Object.defineProperty(t,"prefixUrl",{set:C=>{let y=t.url;if(!y.href.startsWith(C))throw new Error(`Cannot change \`prefixUrl\` from ${h} to ${C}: ${y.href}`);t.url=new zA.URL(C+y.href.slice(h.length)),h=C},get:()=>h});let{protocol:p}=t.url;if(p==="unix:"&&(p="http:",t.url=new zA.URL(`http://unix${t.url.pathname}${t.url.search}`)),t.searchParams&&(t.url.search=t.searchParams.toString()),p!=="http:"&&p!=="https:")throw new aB(t);t.username===""?t.username=t.url.username:t.url.username=t.username,t.password===""?t.password=t.url.password:t.url.password=t.password}let{cookieJar:u}=t;if(u){let{setCookie:h,getCookieString:p}=u;Ee.assert.function_(h),Ee.assert.function_(p),h.length===4&&p.length===0&&(h=n6.promisify(h.bind(t.cookieJar)),p=n6.promisify(p.bind(t.cookieJar)),t.cookieJar={setCookie:h,getCookieString:p})}let{cache:g}=t;if(g&&(CR.has(g)||CR.set(g,new a6((h,p)=>{let C=h[Pi](h,p);return Ee.default.promise(C)&&(C.once=(y,B)=>{if(y==="error")C.catch(B);else if(y==="abort")(async()=>{try{(await C).once("abort",B)}catch{}})();else throw new Error(`Unknown HTTP2 promise event: ${y}`);return C}),C},g))),t.cacheOptions={...t.cacheOptions},t.dnsCache===!0)pR||(pR=new XPe.default),t.dnsCache=pR;else if(!Ee.default.undefined(t.dnsCache)&&!t.dnsCache.lookup)throw new TypeError(`Parameter \`dnsCache\` must be a CacheableLookup instance or a boolean, got ${Ee.default(t.dnsCache)}`);Ee.default.number(t.timeout)?t.timeout={request:t.timeout}:i&&t.timeout!==i.timeout?t.timeout={...i.timeout,...t.timeout}:t.timeout={...t.timeout},t.context||(t.context={});let f=t.hooks===(i==null?void 0:i.hooks);t.hooks={...t.hooks};for(let h of Yt.knownHookEvents)if(h in t.hooks)if(Ee.default.array(t.hooks[h]))t.hooks[h]=[...t.hooks[h]];else throw new TypeError(`Parameter \`${h}\` must be an Array, got ${Ee.default(t.hooks[h])}`);else t.hooks[h]=[];if(i&&!f)for(let h of Yt.knownHookEvents)i.hooks[h].length>0&&(t.hooks[h]=[...i.hooks[h],...t.hooks[h]]);if("family"in t&&VA.default('"options.family" was never documented, please use "options.dnsLookupIpVersion"'),i!=null&&i.https&&(t.https={...i.https,...t.https}),"rejectUnauthorized"in t&&VA.default('"options.rejectUnauthorized" is now deprecated, please use "options.https.rejectUnauthorized"'),"checkServerIdentity"in t&&VA.default('"options.checkServerIdentity" was never documented, please use "options.https.checkServerIdentity"'),"ca"in t&&VA.default('"options.ca" was never documented, please use "options.https.certificateAuthority"'),"key"in t&&VA.default('"options.key" was never documented, please use "options.https.key"'),"cert"in t&&VA.default('"options.cert" was never documented, please use "options.https.certificate"'),"passphrase"in t&&VA.default('"options.passphrase" was never documented, please use "options.https.passphrase"'),"pfx"in t&&VA.default('"options.pfx" was never documented, please use "options.https.pfx"'),"followRedirects"in t)throw new TypeError("The `followRedirects` option does not exist. Use `followRedirect` instead.");if(t.agent){for(let h in t.agent)if(h!=="http"&&h!=="https"&&h!=="http2")throw new TypeError(`Expected the \`options.agent\` properties to be \`http\`, \`https\` or \`http2\`, got \`${h}\``)}return t.maxRedirects=(l=t.maxRedirects)!==null&&l!==void 0?l:0,Yt.setNonEnumerableProperties([i,c],t),oDe.default(t,i)}_lockWrite(){let e=()=>{throw new TypeError("The payload has been already provided")};this.write=e,this.end=e}_unlockWrite(){this.write=super.write,this.end=super.end}async _finalizeBody(){let{options:e}=this,{headers:t}=e,i=!Ee.default.undefined(e.form),n=!Ee.default.undefined(e.json),s=!Ee.default.undefined(e.body),o=i||n||s,a=Yt.withoutBody.has(e.method)&&!(e.method==="GET"&&e.allowGetBody);if(this._cannotHaveBody=a,o){if(a)throw new TypeError(`The \`${e.method}\` method cannot be used with a body`);if([s,i,n].filter(l=>l).length>1)throw new TypeError("The `body`, `json` and `form` options are mutually exclusive");if(s&&!(e.body instanceof s6.Readable)&&!Ee.default.string(e.body)&&!Ee.default.buffer(e.body)&&!A6.default(e.body))throw new TypeError("The `body` option must be a stream.Readable, string or Buffer");if(i&&!Ee.default.object(e.form))throw new TypeError("The `form` option must be an Object");{let l=!Ee.default.string(t["content-type"]);s?(A6.default(e.body)&&l&&(t["content-type"]=`multipart/form-data; boundary=${e.body.getBoundary()}`),this[XA]=e.body):i?(l&&(t["content-type"]="application/x-www-form-urlencoded"),this[XA]=new zA.URLSearchParams(e.form).toString()):(l&&(t["content-type"]="application/json"),this[XA]=e.stringifyJson(e.json));let c=await eDe.default(this[XA],e.headers);Ee.default.undefined(t["content-length"])&&Ee.default.undefined(t["transfer-encoding"])&&!a&&!Ee.default.undefined(c)&&(t["content-length"]=String(c))}}else a?this._lockWrite():this._unlockWrite();this[Hf]=Number(t["content-length"])||void 0}async _onResponseBase(e){let{options:t}=this,{url:i}=t;this[p6]=e,t.decompress&&(e=ZPe(e));let n=e.statusCode,s=e;s.statusMessage=s.statusMessage?s.statusMessage:o6.STATUS_CODES[n],s.url=t.url.toString(),s.requestUrl=this.requestUrl,s.redirectUrls=this.redirects,s.request=this,s.isFromCache=e.fromCache||!1,s.ip=this.ip,s.retryCount=this.retryCount,this[f6]=s.isFromCache,this[Kf]=Number(e.headers["content-length"])||void 0,this[tB]=e,e.once("end",()=>{this[Kf]=this[Uf],this.emit("downloadProgress",this.downloadProgress)}),e.once("error",a=>{e.destroy(),this._beforeError(new wC(a,this))}),e.once("aborted",()=>{this._beforeError(new wC({name:"Error",message:"The server aborted pending request",code:"ECONNRESET"},this))}),this.emit("downloadProgress",this.downloadProgress);let o=e.headers["set-cookie"];if(Ee.default.object(t.cookieJar)&&o){let a=o.map(async l=>t.cookieJar.setCookie(l,i.toString()));t.ignoreInvalidCookies&&(a=a.map(async l=>l.catch(()=>{})));try{await Promise.all(a)}catch(l){this._beforeError(l);return}}if(t.followRedirect&&e.headers.location&&gDe.has(n)){if(e.resume(),this[Pi]&&(this[dR](),delete this[Pi],this[g6]()),(n===303&&t.method!=="GET"&&t.method!=="HEAD"||!t.methodRewriting)&&(t.method="GET","body"in t&&delete t.body,"json"in t&&delete t.json,"form"in t&&delete t.form,this[XA]=void 0,delete t.headers["content-length"]),this.redirects.length>=t.maxRedirects){this._beforeError(new rB(this));return}try{let l=Buffer.from(e.headers.location,"binary").toString(),c=new zA.URL(l,i),u=c.toString();decodeURI(u),c.hostname!==i.hostname||c.port!==i.port?("host"in t.headers&&delete t.headers.host,"cookie"in t.headers&&delete t.headers.cookie,"authorization"in t.headers&&delete t.headers.authorization,(t.username||t.password)&&(t.username="",t.password="")):(c.username=t.username,c.password=t.password),this.redirects.push(u),t.url=c;for(let g of t.hooks.beforeRedirect)await g(t,s);this.emit("redirect",s,t),await this._makeRequest()}catch(l){this._beforeError(l);return}return}if(t.isStream&&t.throwHttpErrors&&!sDe.isResponseOk(s)){this._beforeError(new iB(s));return}e.on("readable",()=>{this[eB]&&this._read()}),this.on("resume",()=>{e.resume()}),this.on("pause",()=>{e.pause()}),e.once("end",()=>{this.push(null)}),this.emit("response",e);for(let a of this[$w])if(!a.headersSent){for(let l in e.headers){let c=t.decompress?l!=="content-encoding":!0,u=e.headers[l];c&&a.setHeader(l,u)}a.statusCode=n}}async _onResponse(e){try{await this._onResponseBase(e)}catch(t){this._beforeError(t)}}_onRequest(e){let{options:t}=this,{timeout:i,url:n}=t;VPe.default(e),this[dR]=l6.default(e,i,n);let s=t.cache?"cacheableResponse":"response";e.once(s,l=>{this._onResponse(l)}),e.once("error",l=>{var c;e.destroy(),(c=e.res)===null||c===void 0||c.removeAllListeners("end"),l=l instanceof l6.TimeoutError?new oB(l,this.timings,this):new ei(l.message,l,this),this._beforeError(l)}),this[g6]=tDe.default(e,this,hDe),this[Pi]=e,this.emit("uploadProgress",this.uploadProgress);let o=this[XA],a=this.redirects.length===0?this:e;Ee.default.nodeStream(o)?(o.pipe(a),o.once("error",l=>{this._beforeError(new sB(l,this))})):(this._unlockWrite(),Ee.default.undefined(o)?(this._cannotHaveBody||this._noPipe)&&(a.end(),this._lockWrite()):(this._writeRequest(o,void 0,()=>{}),a.end(),this._lockWrite())),this.emit("request",e)}async _createCacheableRequest(e,t){return new Promise((i,n)=>{Object.assign(t,rDe.default(e)),delete t.url;let s,o=CR.get(t.cache)(t,async a=>{a._readableState.autoDestroy=!1,s&&(await s).emit("cacheableResponse",a),i(a)});t.url=e,o.once("error",n),o.once("request",async a=>{s=a,i(s)})})}async _makeRequest(){var e,t,i,n,s;let{options:o}=this,{headers:a}=o;for(let B in a)if(Ee.default.undefined(a[B]))delete a[B];else if(Ee.default.null_(a[B]))throw new TypeError(`Use \`undefined\` instead of \`null\` to delete the \`${B}\` header`);if(o.decompress&&Ee.default.undefined(a["accept-encoding"])&&(a["accept-encoding"]=ADe?"gzip, deflate, br":"gzip, deflate"),o.cookieJar){let B=await o.cookieJar.getCookieString(o.url.toString());Ee.default.nonEmptyString(B)&&(o.headers.cookie=B)}for(let B of o.hooks.beforeRequest){let v=await B(o);if(!Ee.default.undefined(v)){o.request=()=>v;break}}o.body&&this[XA]!==o.body&&(this[XA]=o.body);let{agent:l,request:c,timeout:u,url:g}=o;if(o.dnsCache&&!("lookup"in o)&&(o.lookup=o.dnsCache.lookup),g.hostname==="unix"){let B=/(?<socketPath>.+?):(?<path>.+)/.exec(`${g.pathname}${g.search}`);if(B!=null&&B.groups){let{socketPath:v,path:D}=B.groups;Object.assign(o,{socketPath:v,path:D,host:""})}}let f=g.protocol==="https:",h;o.http2?h=_Pe.auto:h=f?zPe.request:o6.request;let p=(e=o.request)!==null&&e!==void 0?e:h,C=o.cache?this._createCacheableRequest:p;l&&!o.http2&&(o.agent=l[f?"https":"http"]),o[Pi]=p,delete o.request,delete o.timeout;let y=o;if(y.shared=(t=o.cacheOptions)===null||t===void 0?void 0:t.shared,y.cacheHeuristic=(i=o.cacheOptions)===null||i===void 0?void 0:i.cacheHeuristic,y.immutableMinTimeToLive=(n=o.cacheOptions)===null||n===void 0?void 0:n.immutableMinTimeToLive,y.ignoreCargoCult=(s=o.cacheOptions)===null||s===void 0?void 0:s.ignoreCargoCult,o.dnsLookupIpVersion!==void 0)try{y.family=u6.dnsLookupIpVersionToFamily(o.dnsLookupIpVersion)}catch{throw new Error("Invalid `dnsLookupIpVersion` option value")}o.https&&("rejectUnauthorized"in o.https&&(y.rejectUnauthorized=o.https.rejectUnauthorized),o.https.checkServerIdentity&&(y.checkServerIdentity=o.https.checkServerIdentity),o.https.certificateAuthority&&(y.ca=o.https.certificateAuthority),o.https.certificate&&(y.cert=o.https.certificate),o.https.key&&(y.key=o.https.key),o.https.passphrase&&(y.passphrase=o.https.passphrase),o.https.pfx&&(y.pfx=o.https.pfx));try{let B=await C(g,y);Ee.default.undefined(B)&&(B=h(g,y)),o.request=c,o.timeout=u,o.agent=l,o.https&&("rejectUnauthorized"in o.https&&delete y.rejectUnauthorized,o.https.checkServerIdentity&&delete y.checkServerIdentity,o.https.certificateAuthority&&delete y.ca,o.https.certificate&&delete y.cert,o.https.key&&delete y.key,o.https.passphrase&&delete y.passphrase,o.https.pfx&&delete y.pfx),cDe(B)?this._onRequest(B):this.writable?(this.once("finish",()=>{this._onResponse(B)}),this._unlockWrite(),this.end(),this._lockWrite()):this._onResponse(B)}catch(B){throw B instanceof a6.CacheError?new nB(B,this):new ei(B.message,B,this)}}async _error(e){try{for(let t of this.options.hooks.beforeError)e=await t(e)}catch(t){e=new ei(t.message,t,this)}this.destroy(e)}_beforeError(e){if(this[Yf])return;let{options:t}=this,i=this.retryCount+1;this[Yf]=!0,e instanceof ei||(e=new ei(e.message,e,this));let n=e,{response:s}=n;(async()=>{if(s&&!s.body){s.setEncoding(this._readableState.encoding);try{s.rawBody=await nDe.default(s),s.body=s.rawBody.toString()}catch{}}if(this.listenerCount("retry")!==0){let o;try{let a;s&&"retry-after"in s.headers&&(a=Number(s.headers["retry-after"]),Number.isNaN(a)?(a=Date.parse(s.headers["retry-after"])-Date.now(),a<=0&&(a=1)):a*=1e3),o=await t.retry.calculateDelay({attemptCount:i,retryOptions:t.retry,error:n,retryAfter:a,computedValue:aDe.default({attemptCount:i,retryOptions:t.retry,error:n,retryAfter:a,computedValue:0})})}catch(a){this._error(new ei(a.message,a,this));return}if(o){let a=async()=>{try{for(let l of this.options.hooks.beforeRetry)await l(this.options,n,i)}catch(l){this._error(new ei(l.message,e,this));return}this.destroyed||(this.destroy(),this.emit("retry",i,e))};this[d6]=setTimeout(a,o);return}}this._error(n)})()}_read(){this[eB]=!0;let e=this[tB];if(e&&!this[Yf]){e.readableLength&&(this[eB]=!1);let t;for(;(t=e.read())!==null;){this[Uf]+=t.length,this[h6]=!0;let i=this.downloadProgress;i.percent<1&&this.emit("downloadProgress",i),this.push(t)}}}_write(e,t,i){let n=()=>{this._writeRequest(e,t,i)};this.requestInitialized?n():this[yC].push(n)}_writeRequest(e,t,i){this[Pi].destroyed||(this._progressCallbacks.push(()=>{this[Gf]+=Buffer.byteLength(e,t);let n=this.uploadProgress;n.percent<1&&this.emit("uploadProgress",n)}),this[Pi].write(e,t,n=>{!n&&this._progressCallbacks.length>0&&this._progressCallbacks.shift()(),i(n)}))}_final(e){let t=()=>{for(;this._progressCallbacks.length!==0;)this._progressCallbacks.shift()();if(!(Pi in this)){e();return}if(this[Pi].destroyed){e();return}this[Pi].end(i=>{i||(this[Hf]=this[Gf],this.emit("uploadProgress",this.uploadProgress),this[Pi].emit("upload-complete")),e(i)})};this.requestInitialized?t():this[yC].push(t)}_destroy(e,t){var i;this[Yf]=!0,clearTimeout(this[d6]),Pi in this&&(this[dR](),!((i=this[tB])===null||i===void 0)&&i.complete||this[Pi].destroy()),e!==null&&!Ee.default.undefined(e)&&!(e instanceof ei)&&(e=new ei(e.message,e,this)),t(e)}get _isAboutToError(){return this[Yf]}get ip(){var e;return(e=this.socket)===null||e===void 0?void 0:e.remoteAddress}get aborted(){var e,t,i;return((t=(e=this[Pi])===null||e===void 0?void 0:e.destroyed)!==null&&t!==void 0?t:this.destroyed)&&!(!((i=this[p6])===null||i===void 0)&&i.complete)}get socket(){var e,t;return(t=(e=this[Pi])===null||e===void 0?void 0:e.socket)!==null&&t!==void 0?t:void 0}get downloadProgress(){let e;return this[Kf]?e=this[Uf]/this[Kf]:this[Kf]===this[Uf]?e=1:e=0,{percent:e,transferred:this[Uf],total:this[Kf]}}get uploadProgress(){let e;return this[Hf]?e=this[Gf]/this[Hf]:this[Hf]===this[Gf]?e=1:e=0,{percent:e,transferred:this[Gf],total:this[Hf]}}get timings(){var e;return(e=this[Pi])===null||e===void 0?void 0:e.timings}get isFromCache(){return this[f6]}pipe(e,t){if(this[h6])throw new Error("Failed to pipe. The response has been emitted already.");return e instanceof hR.ServerResponse&&this[$w].add(e),super.pipe(e,t)}unpipe(e){return e instanceof hR.ServerResponse&&this[$w].delete(e),super.unpipe(e),this}};Yt.default=AB});var QC=w(so=>{"use strict";var pDe=so&&so.__createBinding||(Object.create?function(r,e,t,i){i===void 0&&(i=t),Object.defineProperty(r,i,{enumerable:!0,get:function(){return e[t]}})}:function(r,e,t,i){i===void 0&&(i=t),r[i]=e[t]}),dDe=so&&so.__exportStar||function(r,e){for(var t in r)t!=="default"&&!Object.prototype.hasOwnProperty.call(e,t)&&pDe(e,r,t)};Object.defineProperty(so,"__esModule",{value:!0});so.CancelError=so.ParseError=void 0;var C6=BC(),mR=class extends C6.RequestError{constructor(e,t){let{options:i}=t.request;super(`${e.message} in "${i.url.toString()}"`,e,t.request),this.name="ParseError"}};so.ParseError=mR;var ER=class extends C6.RequestError{constructor(e){super("Promise was canceled",{},e),this.name="CancelError"}get isCanceled(){return!0}};so.CancelError=ER;dDe(BC(),so)});var E6=w(IR=>{"use strict";Object.defineProperty(IR,"__esModule",{value:!0});var m6=QC(),CDe=(r,e,t,i)=>{let{rawBody:n}=r;try{if(e==="text")return n.toString(i);if(e==="json")return n.length===0?"":t(n.toString());if(e==="buffer")return n;throw new m6.ParseError({message:`Unknown body type '${e}'`,name:"Error"},r)}catch(s){throw new m6.ParseError(s,r)}};IR.default=CDe});var yR=w(ZA=>{"use strict";var mDe=ZA&&ZA.__createBinding||(Object.create?function(r,e,t,i){i===void 0&&(i=t),Object.defineProperty(r,i,{enumerable:!0,get:function(){return e[t]}})}:function(r,e,t,i){i===void 0&&(i=t),r[i]=e[t]}),EDe=ZA&&ZA.__exportStar||function(r,e){for(var t in r)t!=="default"&&!Object.prototype.hasOwnProperty.call(e,t)&&mDe(e,r,t)};Object.defineProperty(ZA,"__esModule",{value:!0});var IDe=J("events"),yDe=Ha(),wDe=Ez(),lB=QC(),I6=E6(),y6=BC(),BDe=iR(),QDe=cR(),w6=uR(),bDe=["request","response","redirect","uploadProgress","downloadProgress"];function B6(r){let e,t,i=new IDe.EventEmitter,n=new wDe((o,a,l)=>{let c=u=>{let g=new y6.default(void 0,r);g.retryCount=u,g._noPipe=!0,l(()=>g.destroy()),l.shouldReject=!1,l(()=>a(new lB.CancelError(g))),e=g,g.once("response",async p=>{var C;if(p.retryCount=u,p.request.aborted)return;let y;try{y=await QDe.default(g),p.rawBody=y}catch{return}if(g._isAboutToError)return;let B=((C=p.headers["content-encoding"])!==null&&C!==void 0?C:"").toLowerCase(),v=["gzip","deflate","br"].includes(B),{options:D}=g;if(v&&!D.decompress)p.body=y;else try{p.body=I6.default(p,D.responseType,D.parseJson,D.encoding)}catch(L){if(p.body=y.toString(),w6.isResponseOk(p)){g._beforeError(L);return}}try{for(let[L,H]of D.hooks.afterResponse.entries())p=await H(p,async j=>{let $=y6.default.normalizeArguments(void 0,{...j,retry:{calculateDelay:()=>0},throwHttpErrors:!1,resolveBodyOnly:!1},D);$.hooks.afterResponse=$.hooks.afterResponse.slice(0,L);for(let W of $.hooks.beforeRetry)await W($);let V=B6($);return l(()=>{V.catch(()=>{}),V.cancel()}),V})}catch(L){g._beforeError(new lB.RequestError(L.message,L,g));return}if(!w6.isResponseOk(p)){g._beforeError(new lB.HTTPError(p));return}t=p,o(g.options.resolveBodyOnly?p.body:p)});let f=p=>{if(n.isCanceled)return;let{options:C}=g;if(p instanceof lB.HTTPError&&!C.throwHttpErrors){let{response:y}=p;o(g.options.resolveBodyOnly?y.body:y);return}a(p)};g.once("error",f);let h=g.options.body;g.once("retry",(p,C)=>{var y,B;if(h===((y=C.request)===null||y===void 0?void 0:y.options.body)&&yDe.default.nodeStream((B=C.request)===null||B===void 0?void 0:B.options.body)){f(C);return}c(p)}),BDe.default(g,i,bDe)};c(0)});n.on=(o,a)=>(i.on(o,a),n);let s=o=>{let a=(async()=>{await n;let{options:l}=t.request;return I6.default(t,o,l.parseJson,l.encoding)})();return Object.defineProperties(a,Object.getOwnPropertyDescriptors(n)),a};return n.json=()=>{let{headers:o}=e.options;return!e.writableFinished&&o.accept===void 0&&(o.accept="application/json"),s("json")},n.buffer=()=>s("buffer"),n.text=()=>s("text"),n}ZA.default=B6;EDe(QC(),ZA)});var Q6=w(wR=>{"use strict";Object.defineProperty(wR,"__esModule",{value:!0});var SDe=QC();function vDe(r,...e){let t=(async()=>{if(r instanceof SDe.RequestError)try{for(let n of e)if(n)for(let s of n)r=await s(r)}catch(n){r=n}throw r})(),i=()=>t;return t.json=i,t.text=i,t.buffer=i,t.on=i,t}wR.default=vDe});var v6=w(BR=>{"use strict";Object.defineProperty(BR,"__esModule",{value:!0});var b6=Ha();function S6(r){for(let e of Object.values(r))(b6.default.plainObject(e)||b6.default.array(e))&&S6(e);return Object.freeze(r)}BR.default=S6});var P6=w(x6=>{"use strict";Object.defineProperty(x6,"__esModule",{value:!0})});var QR=w(Bs=>{"use strict";var xDe=Bs&&Bs.__createBinding||(Object.create?function(r,e,t,i){i===void 0&&(i=t),Object.defineProperty(r,i,{enumerable:!0,get:function(){return e[t]}})}:function(r,e,t,i){i===void 0&&(i=t),r[i]=e[t]}),PDe=Bs&&Bs.__exportStar||function(r,e){for(var t in r)t!=="default"&&!Object.prototype.hasOwnProperty.call(e,t)&&xDe(e,r,t)};Object.defineProperty(Bs,"__esModule",{value:!0});Bs.defaultHandler=void 0;var D6=Ha(),ws=yR(),DDe=Q6(),uB=BC(),kDe=v6(),RDe={RequestError:ws.RequestError,CacheError:ws.CacheError,ReadError:ws.ReadError,HTTPError:ws.HTTPError,MaxRedirectsError:ws.MaxRedirectsError,TimeoutError:ws.TimeoutError,ParseError:ws.ParseError,CancelError:ws.CancelError,UnsupportedProtocolError:ws.UnsupportedProtocolError,UploadError:ws.UploadError},FDe=async r=>new Promise(e=>{setTimeout(e,r)}),{normalizeArguments:cB}=uB.default,k6=(...r)=>{let e;for(let t of r)e=cB(void 0,t,e);return e},NDe=r=>r.isStream?new uB.default(void 0,r):ws.default(r),LDe=r=>"defaults"in r&&"options"in r.defaults,TDe=["get","post","put","patch","head","delete"];Bs.defaultHandler=(r,e)=>e(r);var R6=(r,e)=>{if(r)for(let t of r)t(e)},F6=r=>{r._rawHandlers=r.handlers,r.handlers=r.handlers.map(i=>(n,s)=>{let o,a=i(n,l=>(o=s(l),o));if(a!==o&&!n.isStream&&o){let l=a,{then:c,catch:u,finally:g}=l;Object.setPrototypeOf(l,Object.getPrototypeOf(o)),Object.defineProperties(l,Object.getOwnPropertyDescriptors(o)),l.then=c,l.catch=u,l.finally=g}return a});let e=(i,n={},s)=>{var o,a;let l=0,c=u=>r.handlers[l++](u,l===r.handlers.length?NDe:c);if(D6.default.plainObject(i)){let u={...i,...n};uB.setNonEnumerableProperties([i,n],u),n=u,i=void 0}try{let u;try{R6(r.options.hooks.init,n),R6((o=n.hooks)===null||o===void 0?void 0:o.init,n)}catch(f){u=f}let g=cB(i,n,s!=null?s:r.options);if(g[uB.kIsNormalizedAlready]=!0,u)throw new ws.RequestError(u.message,u,g);return c(g)}catch(u){if(n.isStream)throw u;return DDe.default(u,r.options.hooks.beforeError,(a=n.hooks)===null||a===void 0?void 0:a.beforeError)}};e.extend=(...i)=>{let n=[r.options],s=[...r._rawHandlers],o;for(let a of i)LDe(a)?(n.push(a.defaults.options),s.push(...a.defaults._rawHandlers),o=a.defaults.mutableDefaults):(n.push(a),"handlers"in a&&s.push(...a.handlers),o=a.mutableDefaults);return s=s.filter(a=>a!==Bs.defaultHandler),s.length===0&&s.push(Bs.defaultHandler),F6({options:k6(...n),handlers:s,mutableDefaults:Boolean(o)})};let t=async function*(i,n){let s=cB(i,n,r.options);s.resolveBodyOnly=!1;let o=s.pagination;if(!D6.default.object(o))throw new TypeError("`options.pagination` must be implemented");let a=[],{countLimit:l}=o,c=0;for(;c<o.requestLimit;){c!==0&&await FDe(o.backoff);let u=await e(void 0,void 0,s),g=await o.transform(u),f=[];for(let p of g)if(o.filter(p,a,f)&&(!o.shouldContinue(p,a,f)||(yield p,o.stackAllItems&&a.push(p),f.push(p),--l<=0)))return;let h=o.paginate(u,a,f);if(h===!1)return;h===u.request.options?s=u.request.options:h!==void 0&&(s=cB(void 0,h,s)),c++}};e.paginate=t,e.paginate.all=async(i,n)=>{let s=[];for await(let o of t(i,n))s.push(o);return s},e.paginate.each=t,e.stream=(i,n)=>e(i,{...n,isStream:!0});for(let i of TDe)e[i]=(n,s)=>e(n,{...s,method:i}),e.stream[i]=(n,s)=>e(n,{...s,method:i,isStream:!0});return Object.assign(e,RDe),Object.defineProperty(e,"defaults",{value:r.mutableDefaults?r:kDe.default(r),writable:r.mutableDefaults,configurable:r.mutableDefaults,enumerable:!0}),e.mergeOptions=k6,e};Bs.default=F6;PDe(P6(),Bs)});var fB=w((Ga,gB)=>{"use strict";var ODe=Ga&&Ga.__createBinding||(Object.create?function(r,e,t,i){i===void 0&&(i=t),Object.defineProperty(r,i,{enumerable:!0,get:function(){return e[t]}})}:function(r,e,t,i){i===void 0&&(i=t),r[i]=e[t]}),N6=Ga&&Ga.__exportStar||function(r,e){for(var t in r)t!=="default"&&!Object.prototype.hasOwnProperty.call(e,t)&&ODe(e,r,t)};Object.defineProperty(Ga,"__esModule",{value:!0});var MDe=J("url"),L6=QR(),KDe={options:{method:"GET",retry:{limit:2,methods:["GET","PUT","HEAD","DELETE","OPTIONS","TRACE"],statusCodes:[408,413,429,500,502,503,504,521,522,524],errorCodes:["ETIMEDOUT","ECONNRESET","EADDRINUSE","ECONNREFUSED","EPIPE","ENOTFOUND","ENETUNREACH","EAI_AGAIN"],maxRetryAfter:void 0,calculateDelay:({computedValue:r})=>r},timeout:{},headers:{"user-agent":"got (https://github.com/sindresorhus/got)"},hooks:{init:[],beforeRequest:[],beforeRedirect:[],beforeRetry:[],beforeError:[],afterResponse:[]},cache:void 0,dnsCache:void 0,decompress:!0,throwHttpErrors:!0,followRedirect:!0,isStream:!1,responseType:"text",resolveBodyOnly:!1,maxRedirects:10,prefixUrl:"",methodRewriting:!0,ignoreInvalidCookies:!1,context:{},http2:!1,allowGetBody:!1,https:void 0,pagination:{transform:r=>r.request.options.responseType==="json"?r.body:JSON.parse(r.body),paginate:r=>{if(!Reflect.has(r.headers,"link"))return!1;let e=r.headers.link.split(","),t;for(let i of e){let n=i.split(";");if(n[1].includes("next")){t=n[0].trimStart().trim(),t=t.slice(1,-1);break}}return t?{url:new MDe.URL(t)}:!1},filter:()=>!0,shouldContinue:()=>!0,countLimit:1/0,backoff:0,requestLimit:1e4,stackAllItems:!0},parseJson:r=>JSON.parse(r),stringifyJson:r=>JSON.stringify(r),cacheOptions:{}},handlers:[L6.defaultHandler],mutableDefaults:!1},bR=L6.default(KDe);Ga.default=bR;gB.exports=bR;gB.exports.default=bR;gB.exports.__esModule=!0;N6(QR(),Ga);N6(yR(),Ga)});var K6=w(jf=>{"use strict";var Znt=J("net"),UDe=J("tls"),SR=J("http"),T6=J("https"),HDe=J("events"),_nt=J("assert"),GDe=J("util");jf.httpOverHttp=YDe;jf.httpsOverHttp=jDe;jf.httpOverHttps=qDe;jf.httpsOverHttps=JDe;function YDe(r){var e=new Ya(r);return e.request=SR.request,e}function jDe(r){var e=new Ya(r);return e.request=SR.request,e.createSocket=O6,e.defaultPort=443,e}function qDe(r){var e=new Ya(r);return e.request=T6.request,e}function JDe(r){var e=new Ya(r);return e.request=T6.request,e.createSocket=O6,e.defaultPort=443,e}function Ya(r){var e=this;e.options=r||{},e.proxyOptions=e.options.proxy||{},e.maxSockets=e.options.maxSockets||SR.Agent.defaultMaxSockets,e.requests=[],e.sockets=[],e.on("free",function(i,n,s,o){for(var a=M6(n,s,o),l=0,c=e.requests.length;l<c;++l){var u=e.requests[l];if(u.host===a.host&&u.port===a.port){e.requests.splice(l,1),u.request.onSocket(i);return}}i.destroy(),e.removeSocket(i)})}GDe.inherits(Ya,HDe.EventEmitter);Ya.prototype.addRequest=function(e,t,i,n){var s=this,o=vR({request:e},s.options,M6(t,i,n));if(s.sockets.length>=this.maxSockets){s.requests.push(o);return}s.createSocket(o,function(a){a.on("free",l),a.on("close",c),a.on("agentRemove",c),e.onSocket(a);function l(){s.emit("free",a,o)}function c(u){s.removeSocket(a),a.removeListener("free",l),a.removeListener("close",c),a.removeListener("agentRemove",c)}})};Ya.prototype.createSocket=function(e,t){var i=this,n={};i.sockets.push(n);var s=vR({},i.proxyOptions,{method:"CONNECT",path:e.host+":"+e.port,agent:!1,headers:{host:e.host+":"+e.port}});e.localAddress&&(s.localAddress=e.localAddress),s.proxyAuth&&(s.headers=s.headers||{},s.headers["Proxy-Authorization"]="Basic "+new Buffer(s.proxyAuth).toString("base64")),_A("making CONNECT request");var o=i.request(s);o.useChunkedEncodingByDefault=!1,o.once("response",a),o.once("upgrade",l),o.once("connect",c),o.once("error",u),o.end();function a(g){g.upgrade=!0}function l(g,f,h){process.nextTick(function(){c(g,f,h)})}function c(g,f,h){if(o.removeAllListeners(),f.removeAllListeners(),g.statusCode!==200){_A("tunneling socket could not be established, statusCode=%d",g.statusCode),f.destroy();var p=new Error("tunneling socket could not be established, statusCode="+g.statusCode);p.code="ECONNRESET",e.request.emit("error",p),i.removeSocket(n);return}if(h.length>0){_A("got illegal response body from proxy"),f.destroy();var p=new Error("got illegal response body from proxy");p.code="ECONNRESET",e.request.emit("error",p),i.removeSocket(n);return}return _A("tunneling connection has established"),i.sockets[i.sockets.indexOf(n)]=f,t(f)}function u(g){o.removeAllListeners(),_A(`tunneling socket could not be established, cause=%s
-`,g.message,g.stack);var f=new Error("tunneling socket could not be established, cause="+g.message);f.code="ECONNRESET",e.request.emit("error",f),i.removeSocket(n)}};Ya.prototype.removeSocket=function(e){var t=this.sockets.indexOf(e);if(t!==-1){this.sockets.splice(t,1);var i=this.requests.shift();i&&this.createSocket(i,function(n){i.request.onSocket(n)})}};function O6(r,e){var t=this;Ya.prototype.createSocket.call(t,r,function(i){var n=r.request.getHeader("host"),s=vR({},t.options,{socket:i,servername:n?n.replace(/:.*$/,""):r.host}),o=UDe.connect(0,s);t.sockets[t.sockets.indexOf(i)]=o,e(o)})}function M6(r,e,t){return typeof r=="string"?{host:r,port:e,localAddress:t}:r}function vR(r){for(var e=1,t=arguments.length;e<t;++e){var i=arguments[e];if(typeof i=="object")for(var n=Object.keys(i),s=0,o=n.length;s<o;++s){var a=n[s];i[a]!==void 0&&(r[a]=i[a])}}return r}var _A;process.env.NODE_DEBUG&&/\btunnel\b/.test(process.env.NODE_DEBUG)?_A=function(){var r=Array.prototype.slice.call(arguments);typeof r[0]=="string"?r[0]="TUNNEL: "+r[0]:r.unshift("TUNNEL:"),console.error.apply(console,r)}:_A=function(){};jf.debug=_A});var H6=w((est,U6)=>{U6.exports=K6()});var _6=w((dB,FR)=>{var Z6=Object.assign({},J("fs")),RR=function(){var r=typeof document<"u"&&document.currentScript?document.currentScript.src:void 0;return typeof __filename<"u"&&(r=r||__filename),function(e){e=e||{};var t=typeof e<"u"?e:{},i,n;t.ready=new Promise(function(d,E){i=d,n=E});var s={},o;for(o in t)t.hasOwnProperty(o)&&(s[o]=t[o]);var a=[],l="./this.program",c=function(d,E){throw E},u=!1,g=!0,f="";function h(d){return t.locateFile?t.locateFile(d,f):f+d}var p,C,y,B;g&&(u?f=J("path").dirname(f)+"/":f=__dirname+"/",p=function(E,I){var k=pa(E);return k?I?k:k.toString():(y||(y=Z6),B||(B=J("path")),E=B.normalize(E),y.readFileSync(E,I?null:"utf8"))},C=function(E){var I=p(E,!0);return I.buffer||(I=new Uint8Array(I)),re(I.buffer),I},process.argv.length>1&&(l=process.argv[1].replace(/\\/g,"/")),a=process.argv.slice(2),c=function(d){process.exit(d)},t.inspect=function(){return"[Emscripten Module object]"});var v=t.print||console.log.bind(console),D=t.printErr||console.warn.bind(console);for(o in s)s.hasOwnProperty(o)&&(t[o]=s[o]);s=null,t.arguments&&(a=t.arguments),t.thisProgram&&(l=t.thisProgram),t.quit&&(c=t.quit);var L=16;function H(d,E){return E||(E=L),Math.ceil(d/E)*E}var j=0,$=function(d){j=d},V;t.wasmBinary&&(V=t.wasmBinary);var W=t.noExitRuntime||!0;typeof WebAssembly!="object"&&wr("no native wasm support detected");function _(d,E,I){switch(E=E||"i8",E.charAt(E.length-1)==="*"&&(E="i32"),E){case"i1":return ne[d>>0];case"i8":return ne[d>>0];case"i16":return pe[d>>1];case"i32":return de[d>>2];case"i64":return de[d>>2];case"float":return Pt[d>>2];case"double":return It[d>>3];default:wr("invalid type for getValue: "+E)}return null}var A,ae=!1,ge;function re(d,E){d||wr("Assertion failed: "+E)}function O(d){var E=t["_"+d];return re(E,"Cannot call unknown function "+d+", make sure it is exported"),E}function F(d,E,I,k,T){var Z={string:function(it){var Et=0;if(it!=null&&it!==0){var Qe=(it.length<<2)+1;Et=Q(Qe),oe(it,Et,Qe)}return Et},array:function(it){var Et=Q(it.length);return fe(it,Et),Et}};function te(it){return E==="string"?Fe(it):E==="boolean"?Boolean(it):it}var Be=O(d),me=[],Je=0;if(k)for(var nt=0;nt<k.length;nt++){var wt=Z[I[nt]];wt?(Je===0&&(Je=KE()),me[nt]=wt(k[nt])):me[nt]=k[nt]}var lt=Be.apply(null,me);return lt=te(lt),Je!==0&&UE(Je),lt}function ue(d,E,I,k){I=I||[];var T=I.every(function(te){return te==="number"}),Z=E!=="string";return Z&&T&&!k?O(d):function(){return F(d,E,I,arguments,k)}}var he=typeof TextDecoder<"u"?new TextDecoder("utf8"):void 0;function ke(d,E,I){for(var k=E+I,T=E;d[T]&&!(T>=k);)++T;if(T-E>16&&d.subarray&&he)return he.decode(d.subarray(E,T));for(var Z="";E<T;){var te=d[E++];if(!(te&128)){Z+=String.fromCharCode(te);continue}var Be=d[E++]&63;if((te&224)==192){Z+=String.fromCharCode((te&31)<<6|Be);continue}var me=d[E++]&63;if((te&240)==224?te=(te&15)<<12|Be<<6|me:te=(te&7)<<18|Be<<12|me<<6|d[E++]&63,te<65536)Z+=String.fromCharCode(te);else{var Je=te-65536;Z+=String.fromCharCode(55296|Je>>10,56320|Je&1023)}}return Z}function Fe(d,E){return d?ke(Y,d,E):""}function Ne(d,E,I,k){if(!(k>0))return 0;for(var T=I,Z=I+k-1,te=0;te<d.length;++te){var Be=d.charCodeAt(te);if(Be>=55296&&Be<=57343){var me=d.charCodeAt(++te);Be=65536+((Be&1023)<<10)|me&1023}if(Be<=127){if(I>=Z)break;E[I++]=Be}else if(Be<=2047){if(I+1>=Z)break;E[I++]=192|Be>>6,E[I++]=128|Be&63}else if(Be<=65535){if(I+2>=Z)break;E[I++]=224|Be>>12,E[I++]=128|Be>>6&63,E[I++]=128|Be&63}else{if(I+3>=Z)break;E[I++]=240|Be>>18,E[I++]=128|Be>>12&63,E[I++]=128|Be>>6&63,E[I++]=128|Be&63}}return E[I]=0,I-T}function oe(d,E,I){return Ne(d,Y,E,I)}function le(d){for(var E=0,I=0;I<d.length;++I){var k=d.charCodeAt(I);k>=55296&&k<=57343&&(k=65536+((k&1023)<<10)|d.charCodeAt(++I)&1023),k<=127?++E:k<=2047?E+=2:k<=65535?E+=3:E+=4}return E}function we(d){var E=le(d)+1,I=dt(E);return I&&Ne(d,ne,I,E),I}function fe(d,E){ne.set(d,E)}function Ae(d,E){return d%E>0&&(d+=E-d%E),d}var qe,ne,Y,pe,ie,de,_e,Pt,It;function Or(d){qe=d,t.HEAP8=ne=new Int8Array(d),t.HEAP16=pe=new Int16Array(d),t.HEAP32=de=new Int32Array(d),t.HEAPU8=Y=new Uint8Array(d),t.HEAPU16=ie=new Uint16Array(d),t.HEAPU32=_e=new Uint32Array(d),t.HEAPF32=Pt=new Float32Array(d),t.HEAPF64=It=new Float64Array(d)}var ii=t.INITIAL_MEMORY||16777216,gi,hr=[],fi=[],ni=[],Os=!1;function pr(){if(t.preRun)for(typeof t.preRun=="function"&&(t.preRun=[t.preRun]);t.preRun.length;)ua(t.preRun.shift());yo(hr)}function Ii(){Os=!0,!t.noFSInit&&!S.init.initialized&&S.init(),rs.init(),yo(fi)}function es(){if(t.postRun)for(typeof t.postRun=="function"&&(t.postRun=[t.postRun]);t.postRun.length;)ag(t.postRun.shift());yo(ni)}function ua(d){hr.unshift(d)}function pA(d){fi.unshift(d)}function ag(d){ni.unshift(d)}var ts=0,dA=null,ga=null;function yp(d){return d}function CA(d){ts++,t.monitorRunDependencies&&t.monitorRunDependencies(ts)}function mA(d){if(ts--,t.monitorRunDependencies&&t.monitorRunDependencies(ts),ts==0&&(dA!==null&&(clearInterval(dA),dA=null),ga)){var E=ga;ga=null,E()}}t.preloadedImages={},t.preloadedAudios={};function wr(d){t.onAbort&&t.onAbort(d),d+="",D(d),ae=!0,ge=1,d="abort("+d+"). Build with -s ASSERTIONS=1 for more info.";var E=new WebAssembly.RuntimeError(d);throw n(E),E}var kl="data:application/octet-stream;base64,";function Ag(d){return d.startsWith(kl)}var Io="data:application/octet-stream;base64,AGFzbQEAAAABlAInYAF/AX9gA39/fwF/YAF/AGACf38Bf2ACf38AYAV/f39/fwF/YAR/f39/AX9gA39/fwBgBH9+f38Bf2AAAX9gBX9/f35/AX5gA39+fwF/YAF/AX5gAn9+AX9gBH9/fn8BfmADf35/AX5gA39/fgF/YAR/f35/AX9gBn9/f39/fwF/YAR/f39/AGADf39+AX5gAn5/AX9gA398fwBgBH9/f38BfmADf39/AX5gBn98f39/fwF/YAV/f35/fwF/YAV/fn9/fwF/YAV/f39/fwBgAn9+AGACf38BfmACf3wAYAh/fn5/f39+fwF/YAV/f39+fwBgAABgBX5+f35/AX5gBX9/f39/AX5gAnx/AXxgAn9+AX4CeRQBYQFhAAIBYQFiAAABYQFjAAMBYQFkAAYBYQFlAAEBYQFmAAABYQFnAAYBYQFoAAABYQFpAAMBYQFqAAMBYQFrAAMBYQFsAAEBYQFtAAABYQFuAAUBYQFvAAEBYQFwAAMBYQFxAAEBYQFyAAABYQFzAAMBYQF0AAADggKAAgcCAgQAAQECAgANBA4EBwICAhwLEw0AFA0dAAAMDAIHHgwQAgIDAwICAQAIAAcIFBUEBgAADAAECAgDAQYAAgIBBgAfFwEBAwITAiAPBgIFEQMFAxgBCAIBAAAHBQEYABoSAQIABwQDIREIAyIGAAEBAwMAIwUbASQHAQsVAQMABQMEAA0bFw0BBAALCwMDDAwAAwAHJQMBAAgaAQECBQMBAgMDAAcHBwICAgImEQsICAsECQoJAgAAAAAAAAkFAAUFBQEGAwYGBgUSBgYBARIBAAIJBgABDgABAQ8ACQEEGQkJCQAAAAMECgoBAQIQAAAAAgEDAwAEAQoFAA4ACQAEBQFwAR8fBQcBAYACgIACBgkBfwFB0KDBAgsHvgI8AXUCAAF2AIABAXcAkwIBeADjAQF5APEBAXoA0QEBQQDQAQFCAM8BAUMAzgEBRADMAQFFAMsBAUYAyQEBRwCSAgFIAJECAUkAjwIBSgCKAgFLAOkBAUwA4gEBTQDhAQFOADwBTwD8AQFQAPkBAVEA+AEBUgDwAQFTAPoBAVQA4AEBVQAVAVYAGAFXAMcBAVgAzQEBWQDfAQFaAN4BAV8A3QEBJADkAQJhYQDcAQJiYQDbAQJjYQDaAQJkYQDZAQJlYQDYAQJmYQDXAQJnYQDqAQJoYQCcAQJpYQDWAQJqYQDVAQJrYQDUAQJsYQAvAm1hABsCbmEAygECb2EASAJwYQEAAnFhAGcCcmEA0wECc2EA6AECdGEA0gECdWEA9wECdmEA9gECd2EA9QECeGEA5wECeWEA5gECemEA5QEJQQEAQQELHsgBkAKNAo4CjAKLArcBiQKIAocChgKFAoQCgwKCAoECgAL/Af4B/QH7AVv0AfMB8gHvAe4B7QHsAesBCu+QCYACQAEBfyMAQRBrIgMgADYCDCADIAE2AgggAyACNgIEIAMoAgwEQCADKAIMIAMoAgg2AgAgAygCDCADKAIENgIECwvMDAEHfwJAIABFDQAgAEEIayIDIABBBGsoAgAiAUF4cSIAaiEFAkAgAUEBcQ0AIAFBA3FFDQEgAyADKAIAIgFrIgNB9JsBKAIASQ0BIAAgAWohACADQfibASgCAEcEQCABQf8BTQRAIAMoAggiAiABQQN2IgRBA3RBjJwBakYaIAIgAygCDCIBRgRAQeSbAUHkmwEoAgBBfiAEd3E2AgAMAwsgAiABNgIMIAEgAjYCCAwCCyADKAIYIQYCQCADIAMoAgwiAUcEQCADKAIIIgIgATYCDCABIAI2AggMAQsCQCADQRRqIgIoAgAiBA0AIANBEGoiAigCACIEDQBBACEBDAELA0AgAiEHIAQiAUEUaiICKAIAIgQNACABQRBqIQIgASgCECIEDQALIAdBADYCAAsgBkUNAQJAIAMgAygCHCICQQJ0QZSeAWoiBCgCAEYEQCAEIAE2AgAgAQ0BQeibAUHomwEoAgBBfiACd3E2AgAMAwsgBkEQQRQgBigCECADRhtqIAE2AgAgAUUNAgsgASAGNgIYIAMoAhAiAgRAIAEgAjYCECACIAE2AhgLIAMoAhQiAkUNASABIAI2AhQgAiABNgIYDAELIAUoAgQiAUEDcUEDRw0AQeybASAANgIAIAUgAUF+cTYCBCADIABBAXI2AgQgACADaiAANgIADwsgAyAFTw0AIAUoAgQiAUEBcUUNAAJAIAFBAnFFBEAgBUH8mwEoAgBGBEBB/JsBIAM2AgBB8JsBQfCbASgCACAAaiIANgIAIAMgAEEBcjYCBCADQfibASgCAEcNA0HsmwFBADYCAEH4mwFBADYCAA8LIAVB+JsBKAIARgRAQfibASADNgIAQeybAUHsmwEoAgAgAGoiADYCACADIABBAXI2AgQgACADaiAANgIADwsgAUF4cSAAaiEAAkAgAUH/AU0EQCAFKAIIIgIgAUEDdiIEQQN0QYycAWpGGiACIAUoAgwiAUYEQEHkmwFB5JsBKAIAQX4gBHdxNgIADAILIAIgATYCDCABIAI2AggMAQsgBSgCGCEGAkAgBSAFKAIMIgFHBEAgBSgCCCICQfSbASgCAEkaIAIgATYCDCABIAI2AggMAQsCQCAFQRRqIgIoAgAiBA0AIAVBEGoiAigCACIEDQBBACEBDAELA0AgAiEHIAQiAUEUaiICKAIAIgQNACABQRBqIQIgASgCECIEDQALIAdBADYCAAsgBkUNAAJAIAUgBSgCHCICQQJ0QZSeAWoiBCgCAEYEQCAEIAE2AgAgAQ0BQeibAUHomwEoAgBBfiACd3E2AgAMAgsgBkEQQRQgBigCECAFRhtqIAE2AgAgAUUNAQsgASAGNgIYIAUoAhAiAgRAIAEgAjYCECACIAE2AhgLIAUoAhQiAkUNACABIAI2AhQgAiABNgIYCyADIABBAXI2AgQgACADaiAANgIAIANB+JsBKAIARw0BQeybASAANgIADwsgBSABQX5xNgIEIAMgAEEBcjYCBCAAIANqIAA2AgALIABB/wFNBEAgAEEDdiIBQQN0QYycAWohAAJ/QeSbASgCACICQQEgAXQiAXFFBEBB5JsBIAEgAnI2AgAgAAwBCyAAKAIICyECIAAgAzYCCCACIAM2AgwgAyAANgIMIAMgAjYCCA8LQR8hAiADQgA3AhAgAEH///8HTQRAIABBCHYiASABQYD+P2pBEHZBCHEiAXQiAiACQYDgH2pBEHZBBHEiAnQiBCAEQYCAD2pBEHZBAnEiBHRBD3YgASACciAEcmsiAUEBdCAAIAFBFWp2QQFxckEcaiECCyADIAI2AhwgAkECdEGUngFqIQECQAJAAkBB6JsBKAIAIgRBASACdCIHcUUEQEHomwEgBCAHcjYCACABIAM2AgAgAyABNgIYDAELIABBAEEZIAJBAXZrIAJBH0YbdCECIAEoAgAhAQNAIAEiBCgCBEF4cSAARg0CIAJBHXYhASACQQF0IQIgBCABQQRxaiIHQRBqKAIAIgENAAsgByADNgIQIAMgBDYCGAsgAyADNgIMIAMgAzYCCAwBCyAEKAIIIgAgAzYCDCAEIAM2AgggA0EANgIYIAMgBDYCDCADIAA2AggLQYScAUGEnAEoAgBBAWsiAEF/IAAbNgIACwtCAQF/IwBBEGsiASQAIAEgADYCDCABKAIMBEAgASgCDC0AAUEBcQRAIAEoAgwoAgQQFQsgASgCDBAVCyABQRBqJAALQwEBfyMAQRBrIgIkACACIAA2AgwgAiABNgIIIAIoAgwCfyMAQRBrIgAgAigCCDYCDCAAKAIMQQxqCxBFIAJBEGokAAuiLgEMfyMAQRBrIgwkAAJAAkACQAJAAkACQAJAAkACQAJAAkACQCAAQfQBTQRAQeSbASgCACIFQRAgAEELakF4cSAAQQtJGyIIQQN2IgJ2IgFBA3EEQCABQX9zQQFxIAJqIgNBA3QiAUGUnAFqKAIAIgRBCGohAAJAIAQoAggiAiABQYycAWoiAUYEQEHkmwEgBUF+IAN3cTYCAAwBCyACIAE2AgwgASACNgIICyAEIANBA3QiAUEDcjYCBCABIARqIgEgASgCBEEBcjYCBAwNCyAIQeybASgCACIKTQ0BIAEEQAJAQQIgAnQiAEEAIABrciABIAJ0cSIAQQAgAGtxQQFrIgAgAEEMdkEQcSICdiIBQQV2QQhxIgAgAnIgASAAdiIBQQJ2QQRxIgByIAEgAHYiAUEBdkECcSIAciABIAB2IgFBAXZBAXEiAHIgASAAdmoiA0EDdCIAQZScAWooAgAiBCgCCCIBIABBjJwBaiIARgRAQeSbASAFQX4gA3dxIgU2AgAMAQsgASAANgIMIAAgATYCCAsgBEEIaiEAIAQgCEEDcjYCBCAEIAhqIgIgA0EDdCIBIAhrIgNBAXI2AgQgASAEaiADNgIAIAoEQCAKQQN2IgFBA3RBjJwBaiEHQfibASgCACEEAn8gBUEBIAF0IgFxRQRAQeSbASABIAVyNgIAIAcMAQsgBygCCAshASAHIAQ2AgggASAENgIMIAQgBzYCDCAEIAE2AggLQfibASACNgIAQeybASADNgIADA0LQeibASgCACIGRQ0BIAZBACAGa3FBAWsiACAAQQx2QRBxIgJ2IgFBBXZBCHEiACACciABIAB2IgFBAnZBBHEiAHIgASAAdiIBQQF2QQJxIgByIAEgAHYiAUEBdkEBcSIAciABIAB2akECdEGUngFqKAIAIgEoAgRBeHEgCGshAyABIQIDQAJAIAIoAhAiAEUEQCACKAIUIgBFDQELIAAoAgRBeHEgCGsiAiADIAIgA0kiAhshAyAAIAEgAhshASAAIQIMAQsLIAEgCGoiCSABTQ0CIAEoAhghCyABIAEoAgwiBEcEQCABKAIIIgBB9JsBKAIASRogACAENgIMIAQgADYCCAwMCyABQRRqIgIoAgAiAEUEQCABKAIQIgBFDQQgAUEQaiECCwNAIAIhByAAIgRBFGoiAigCACIADQAgBEEQaiECIAQoAhAiAA0ACyAHQQA2AgAMCwtBfyEIIABBv39LDQAgAEELaiIAQXhxIQhB6JsBKAIAIglFDQBBACAIayEDAkACQAJAAn9BACAIQYACSQ0AGkEfIAhB////B0sNABogAEEIdiIAIABBgP4/akEQdkEIcSICdCIAIABBgOAfakEQdkEEcSIBdCIAIABBgIAPakEQdkECcSIAdEEPdiABIAJyIAByayIAQQF0IAggAEEVanZBAXFyQRxqCyIFQQJ0QZSeAWooAgAiAkUEQEEAIQAMAQtBACEAIAhBAEEZIAVBAXZrIAVBH0YbdCEBA0ACQCACKAIEQXhxIAhrIgcgA08NACACIQQgByIDDQBBACEDIAIhAAwDCyAAIAIoAhQiByAHIAIgAUEddkEEcWooAhAiAkYbIAAgBxshACABQQF0IQEgAg0ACwsgACAEckUEQEECIAV0IgBBACAAa3IgCXEiAEUNAyAAQQAgAGtxQQFrIgAgAEEMdkEQcSICdiIBQQV2QQhxIgAgAnIgASAAdiIBQQJ2QQRxIgByIAEgAHYiAUEBdkECcSIAciABIAB2IgFBAXZBAXEiAHIgASAAdmpBAnRBlJ4BaigCACEACyAARQ0BCwNAIAAoAgRBeHEgCGsiASADSSECIAEgAyACGyEDIAAgBCACGyEEIAAoAhAiAQR/IAEFIAAoAhQLIgANAAsLIARFDQAgA0HsmwEoAgAgCGtPDQAgBCAIaiIGIARNDQEgBCgCGCEFIAQgBCgCDCIBRwRAIAQoAggiAEH0mwEoAgBJGiAAIAE2AgwgASAANgIIDAoLIARBFGoiAigCACIARQRAIAQoAhAiAEUNBCAEQRBqIQILA0AgAiEHIAAiAUEUaiICKAIAIgANACABQRBqIQIgASgCECIADQALIAdBADYCAAwJCyAIQeybASgCACICTQRAQfibASgCACEDAkAgAiAIayIBQRBPBEBB7JsBIAE2AgBB+JsBIAMgCGoiADYCACAAIAFBAXI2AgQgAiADaiABNgIAIAMgCEEDcjYCBAwBC0H4mwFBADYCAEHsmwFBADYCACADIAJBA3I2AgQgAiADaiIAIAAoAgRBAXI2AgQLIANBCGohAAwLCyAIQfCbASgCACIGSQRAQfCbASAGIAhrIgE2AgBB/JsBQfybASgCACICIAhqIgA2AgAgACABQQFyNgIEIAIgCEEDcjYCBCACQQhqIQAMCwtBACEAIAhBL2oiCQJ/QbyfASgCAARAQcSfASgCAAwBC0HInwFCfzcCAEHAnwFCgKCAgICABDcCAEG8nwEgDEEMakFwcUHYqtWqBXM2AgBB0J8BQQA2AgBBoJ8BQQA2AgBBgCALIgFqIgVBACABayIHcSICIAhNDQpBnJ8BKAIAIgQEQEGUnwEoAgAiAyACaiIBIANNDQsgASAESw0LC0GgnwEtAABBBHENBQJAAkBB/JsBKAIAIgMEQEGknwEhAANAIAMgACgCACIBTwRAIAEgACgCBGogA0sNAwsgACgCCCIADQALC0EAED4iAUF/Rg0GIAIhBUHAnwEoAgAiA0EBayIAIAFxBEAgAiABayAAIAFqQQAgA2txaiEFCyAFIAhNDQYgBUH+////B0sNBkGcnwEoAgAiBARAQZSfASgCACIDIAVqIgAgA00NByAAIARLDQcLIAUQPiIAIAFHDQEMCAsgBSAGayAHcSIFQf7///8HSw0FIAUQPiIBIAAoAgAgACgCBGpGDQQgASEACwJAIABBf0YNACAIQTBqIAVNDQBBxJ8BKAIAIgEgCSAFa2pBACABa3EiAUH+////B0sEQCAAIQEMCAsgARA+QX9HBEAgASAFaiEFIAAhAQwIC0EAIAVrED4aDAULIAAiAUF/Rw0GDAQLAAtBACEEDAcLQQAhAQwFCyABQX9HDQILQaCfAUGgnwEoAgBBBHI2AgALIAJB/v///wdLDQEgAhA+IQFBABA+IQAgAUF/Rg0BIABBf0YNASAAIAFNDQEgACABayIFIAhBKGpNDQELQZSfAUGUnwEoAgAgBWoiADYCAEGYnwEoAgAgAEkEQEGYnwEgADYCAAsCQAJAAkBB/JsBKAIAIgcEQEGknwEhAANAIAEgACgCACIDIAAoAgQiAmpGDQIgACgCCCIADQALDAILQfSbASgCACIAQQAgACABTRtFBEBB9JsBIAE2AgALQQAhAEGonwEgBTYCAEGknwEgATYCAEGEnAFBfzYCAEGInAFBvJ8BKAIANgIAQbCfAUEANgIAA0AgAEEDdCIDQZScAWogA0GMnAFqIgI2AgAgA0GYnAFqIAI2AgAgAEEBaiIAQSBHDQALQfCbASAFQShrIgNBeCABa0EHcUEAIAFBCGpBB3EbIgBrIgI2AgBB/JsBIAAgAWoiADYCACAAIAJBAXI2AgQgASADakEoNgIEQYCcAUHMnwEoAgA2AgAMAgsgAC0ADEEIcQ0AIAMgB0sNACABIAdNDQAgACACIAVqNgIEQfybASAHQXggB2tBB3FBACAHQQhqQQdxGyIAaiICNgIAQfCbAUHwmwEoAgAgBWoiASAAayIANgIAIAIgAEEBcjYCBCABIAdqQSg2AgRBgJwBQcyfASgCADYCAAwBC0H0mwEoAgAgAUsEQEH0mwEgATYCAAsgASAFaiECQaSfASEAAkACQAJAAkACQAJAA0AgAiAAKAIARwRAIAAoAggiAA0BDAILCyAALQAMQQhxRQ0BC0GknwEhAANAIAcgACgCACICTwRAIAIgACgCBGoiBCAHSw0DCyAAKAIIIQAMAAsACyAAIAE2AgAgACAAKAIEIAVqNgIEIAFBeCABa0EHcUEAIAFBCGpBB3EbaiIJIAhBA3I2AgQgAkF4IAJrQQdxQQAgAkEIakEHcRtqIgUgCCAJaiIGayECIAUgB0YEQEH8mwEgBjYCAEHwmwFB8JsBKAIAIAJqIgA2AgAgBiAAQQFyNgIEDAMLIAVB+JsBKAIARgRAQfibASAGNgIAQeybAUHsmwEoAgAgAmoiADYCACAGIABBAXI2AgQgACAGaiAANgIADAMLIAUoAgQiAEEDcUEBRgRAIABBeHEhBwJAIABB/wFNBEAgBSgCCCIDIABBA3YiAEEDdEGMnAFqRhogAyAFKAIMIgFGBEBB5JsBQeSbASgCAEF+IAB3cTYCAAwCCyADIAE2AgwgASADNgIIDAELIAUoAhghCAJAIAUgBSgCDCIBRwRAIAUoAggiACABNgIMIAEgADYCCAwBCwJAIAVBFGoiACgCACIDDQAgBUEQaiIAKAIAIgMNAEEAIQEMAQsDQCAAIQQgAyIBQRRqIgAoAgAiAw0AIAFBEGohACABKAIQIgMNAAsgBEEANgIACyAIRQ0AAkAgBSAFKAIcIgNBAnRBlJ4BaiIAKAIARgRAIAAgATYCACABDQFB6JsBQeibASgCAEF+IAN3cTYCAAwCCyAIQRBBFCAIKAIQIAVGG2ogATYCACABRQ0BCyABIAg2AhggBSgCECIABEAgASAANgIQIAAgATYCGAsgBSgCFCIARQ0AIAEgADYCFCAAIAE2AhgLIAUgB2ohBSACIAdqIQILIAUgBSgCBEF+cTYCBCAGIAJBAXI2AgQgAiAGaiACNgIAIAJB/wFNBEAgAkEDdiIAQQN0QYycAWohAgJ/QeSbASgCACIBQQEgAHQiAHFFBEBB5JsBIAAgAXI2AgAgAgwBCyACKAIICyEAIAIgBjYCCCAAIAY2AgwgBiACNgIMIAYgADYCCAwDC0EfIQAgAkH///8HTQRAIAJBCHYiACAAQYD+P2pBEHZBCHEiA3QiACAAQYDgH2pBEHZBBHEiAXQiACAAQYCAD2pBEHZBAnEiAHRBD3YgASADciAAcmsiAEEBdCACIABBFWp2QQFxckEcaiEACyAGIAA2AhwgBkIANwIQIABBAnRBlJ4BaiEEAkBB6JsBKAIAIgNBASAAdCIBcUUEQEHomwEgASADcjYCACAEIAY2AgAgBiAENgIYDAELIAJBAEEZIABBAXZrIABBH0YbdCEAIAQoAgAhAQNAIAEiAygCBEF4cSACRg0DIABBHXYhASAAQQF0IQAgAyABQQRxaiIEKAIQIgENAAsgBCAGNgIQIAYgAzYCGAsgBiAGNgIMIAYgBjYCCAwCC0HwmwEgBUEoayIDQXggAWtBB3FBACABQQhqQQdxGyIAayICNgIAQfybASAAIAFqIgA2AgAgACACQQFyNgIEIAEgA2pBKDYCBEGAnAFBzJ8BKAIANgIAIAcgBEEnIARrQQdxQQAgBEEna0EHcRtqQS9rIgAgACAHQRBqSRsiAkEbNgIEIAJBrJ8BKQIANwIQIAJBpJ8BKQIANwIIQayfASACQQhqNgIAQaifASAFNgIAQaSfASABNgIAQbCfAUEANgIAIAJBGGohAANAIABBBzYCBCAAQQhqIQEgAEEEaiEAIAEgBEkNAAsgAiAHRg0DIAIgAigCBEF+cTYCBCAHIAIgB2siBEEBcjYCBCACIAQ2AgAgBEH/AU0EQCAEQQN2IgBBA3RBjJwBaiECAn9B5JsBKAIAIgFBASAAdCIAcUUEQEHkmwEgACABcjYCACACDAELIAIoAggLIQAgAiAHNgIIIAAgBzYCDCAHIAI2AgwgByAANgIIDAQLQR8hACAHQgA3AhAgBEH///8HTQRAIARBCHYiACAAQYD+P2pBEHZBCHEiAnQiACAAQYDgH2pBEHZBBHEiAXQiACAAQYCAD2pBEHZBAnEiAHRBD3YgASACciAAcmsiAEEBdCAEIABBFWp2QQFxckEcaiEACyAHIAA2AhwgAEECdEGUngFqIQMCQEHomwEoAgAiAkEBIAB0IgFxRQRAQeibASABIAJyNgIAIAMgBzYCACAHIAM2AhgMAQsgBEEAQRkgAEEBdmsgAEEfRht0IQAgAygCACEBA0AgASICKAIEQXhxIARGDQQgAEEddiEBIABBAXQhACACIAFBBHFqIgMoAhAiAQ0ACyADIAc2AhAgByACNgIYCyAHIAc2AgwgByAHNgIIDAMLIAMoAggiACAGNgIMIAMgBjYCCCAGQQA2AhggBiADNgIMIAYgADYCCAsgCUEIaiEADAULIAIoAggiACAHNgIMIAIgBzYCCCAHQQA2AhggByACNgIMIAcgADYCCAtB8JsBKAIAIgAgCE0NAEHwmwEgACAIayIBNgIAQfybAUH8mwEoAgAiAiAIaiIANgIAIAAgAUEBcjYCBCACIAhBA3I2AgQgAkEIaiEADAMLQbSbAUEwNgIAQQAhAAwCCwJAIAVFDQACQCAEKAIcIgJBAnRBlJ4BaiIAKAIAIARGBEAgACABNgIAIAENAUHomwEgCUF+IAJ3cSIJNgIADAILIAVBEEEUIAUoAhAgBEYbaiABNgIAIAFFDQELIAEgBTYCGCAEKAIQIgAEQCABIAA2AhAgACABNgIYCyAEKAIUIgBFDQAgASAANgIUIAAgATYCGAsCQCADQQ9NBEAgBCADIAhqIgBBA3I2AgQgACAEaiIAIAAoAgRBAXI2AgQMAQsgBCAIQQNyNgIEIAYgA0EBcjYCBCADIAZqIAM2AgAgA0H/AU0EQCADQQN2IgBBA3RBjJwBaiECAn9B5JsBKAIAIgFBASAAdCIAcUUEQEHkmwEgACABcjYCACACDAELIAIoAggLIQAgAiAGNgIIIAAgBjYCDCAGIAI2AgwgBiAANgIIDAELQR8hACADQf///wdNBEAgA0EIdiIAIABBgP4/akEQdkEIcSICdCIAIABBgOAfakEQdkEEcSIBdCIAIABBgIAPakEQdkECcSIAdEEPdiABIAJyIAByayIAQQF0IAMgAEEVanZBAXFyQRxqIQALIAYgADYCHCAGQgA3AhAgAEECdEGUngFqIQICQAJAIAlBASAAdCIBcUUEQEHomwEgASAJcjYCACACIAY2AgAgBiACNgIYDAELIANBAEEZIABBAXZrIABBH0YbdCEAIAIoAgAhCANAIAgiASgCBEF4cSADRg0CIABBHXYhAiAAQQF0IQAgASACQQRxaiICKAIQIggNAAsgAiAGNgIQIAYgATYCGAsgBiAGNgIMIAYgBjYCCAwBCyABKAIIIgAgBjYCDCABIAY2AgggBkEANgIYIAYgATYCDCAGIAA2AggLIARBCGohAAwBCwJAIAtFDQACQCABKAIcIgJBAnRBlJ4BaiIAKAIAIAFGBEAgACAENgIAIAQNAUHomwEgBkF+IAJ3cTYCAAwCCyALQRBBFCALKAIQIAFGG2ogBDYCACAERQ0BCyAEIAs2AhggASgCECIABEAgBCAANgIQIAAgBDYCGAsgASgCFCIARQ0AIAQgADYCFCAAIAQ2AhgLAkAgA0EPTQRAIAEgAyAIaiIAQQNyNgIEIAAgAWoiACAAKAIEQQFyNgIEDAELIAEgCEEDcjYCBCAJIANBAXI2AgQgAyAJaiADNgIAIAoEQCAKQQN2IgBBA3RBjJwBaiEEQfibASgCACECAn9BASAAdCIAIAVxRQRAQeSbASAAIAVyNgIAIAQMAQsgBCgCCAshACAEIAI2AgggACACNgIMIAIgBDYCDCACIAA2AggLQfibASAJNgIAQeybASADNgIACyABQQhqIQALIAxBEGokACAAC4MEAQN/IAJBgARPBEAgACABIAIQCxogAA8LIAAgAmohAwJAIAAgAXNBA3FFBEACQCAAQQNxRQRAIAAhAgwBCyACQQFIBEAgACECDAELIAAhAgNAIAIgAS0AADoAACABQQFqIQEgAkEBaiICQQNxRQ0BIAIgA0kNAAsLAkAgA0F8cSIEQcAASQ0AIAIgBEFAaiIFSw0AA0AgAiABKAIANgIAIAIgASgCBDYCBCACIAEoAgg2AgggAiABKAIMNgIMIAIgASgCEDYCECACIAEoAhQ2AhQgAiABKAIYNgIYIAIgASgCHDYCHCACIAEoAiA2AiAgAiABKAIkNgIkIAIgASgCKDYCKCACIAEoAiw2AiwgAiABKAIwNgIwIAIgASgCNDYCNCACIAEoAjg2AjggAiABKAI8NgI8IAFBQGshASACQUBrIgIgBU0NAAsLIAIgBE8NAQNAIAIgASgCADYCACABQQRqIQEgAkEEaiICIARJDQALDAELIANBBEkEQCAAIQIMAQsgACADQQRrIgRLBEAgACECDAELIAAhAgNAIAIgAS0AADoAACACIAEtAAE6AAEgAiABLQACOgACIAIgAS0AAzoAAyABQQRqIQEgAkEEaiICIARNDQALCyACIANJBEADQCACIAEtAAA6AAAgAUEBaiEBIAJBAWoiAiADRw0ACwsgAAvBGAECfyMAQRBrIgQkACAEIAA2AgwgBCABNgIIIAQgAjYCBCAEKAIMIQAgBCgCCCECIAQoAgQhAyMAQSBrIgEkACABIAA2AhggASACNgIUIAEgAzYCEAJAIAEoAhRFBEAgAUEANgIcDAELIAFBATYCDCABLQAMBEAgASgCFCECIAEoAhAhAyMAQSBrIgAgASgCGDYCHCAAIAI2AhggACADNgIUIAAgACgCHDYCECAAIAAoAhBBf3M2AhADQCAAKAIUBH8gACgCGEEDcUEARwVBAAtBAXEEQCAAKAIQIQIgACAAKAIYIgNBAWo2AhggACADLQAAIAJzQf8BcUECdEGgGWooAgAgACgCEEEIdnM2AhAgACAAKAIUQQFrNgIUDAELCyAAIAAoAhg2AgwDQCAAKAIUQSBPBEAgACAAKAIMIgJBBGo2AgwgACACKAIAIAAoAhBzNgIQIAAgACgCEEEYdkECdEGgGWooAgAgACgCEEEQdkH/AXFBAnRBoCFqKAIAIAAoAhBB/wFxQQJ0QaAxaigCACAAKAIQQQh2Qf8BcUECdEGgKWooAgBzc3M2AhAgACAAKAIMIgJBBGo2AgwgACACKAIAIAAoAhBzNgIQIAAgACgCEEEYdkECdEGgGWooAgAgACgCEEEQdkH/AXFBAnRBoCFqKAIAIAAoAhBB/wFxQQJ0QaAxaigCACAAKAIQQQh2Qf8BcUECdEGgKWooAgBzc3M2AhAgACAAKAIMIgJBBGo2AgwgACACKAIAIAAoAhBzNgIQIAAgACgCEEEYdkECdEGgGWooAgAgACgCEEEQdkH/AXFBAnRBoCFqKAIAIAAoAhBB/wFxQQJ0QaAxaigCACAAKAIQQQh2Qf8BcUECdEGgKWooAgBzc3M2AhAgACAAKAIMIgJBBGo2AgwgACACKAIAIAAoAhBzNgIQIAAgACgCEEEYdkECdEGgGWooAgAgACgCEEEQdkH/AXFBAnRBoCFqKAIAIAAoAhBB/wFxQQJ0QaAxaigCACAAKAIQQQh2Qf8BcUECdEGgKWooAgBzc3M2AhAgACAAKAIMIgJBBGo2AgwgACACKAIAIAAoAhBzNgIQIAAgACgCEEEYdkECdEGgGWooAgAgACgCEEEQdkH/AXFBAnRBoCFqKAIAIAAoAhBB/wFxQQJ0QaAxaigCACAAKAIQQQh2Qf8BcUECdEGgKWooAgBzc3M2AhAgACAAKAIMIgJBBGo2AgwgACACKAIAIAAoAhBzNgIQIAAgACgCEEEYdkECdEGgGWooAgAgACgCEEEQdkH/AXFBAnRBoCFqKAIAIAAoAhBB/wFxQQJ0QaAxaigCACAAKAIQQQh2Qf8BcUECdEGgKWooAgBzc3M2AhAgACAAKAIMIgJBBGo2AgwgACACKAIAIAAoAhBzNgIQIAAgACgCEEEYdkECdEGgGWooAgAgACgCEEEQdkH/AXFBAnRBoCFqKAIAIAAoAhBB/wFxQQJ0QaAxaigCACAAKAIQQQh2Qf8BcUECdEGgKWooAgBzc3M2AhAgACAAKAIMIgJBBGo2AgwgACACKAIAIAAoAhBzNgIQIAAgACgCEEEYdkECdEGgGWooAgAgACgCEEEQdkH/AXFBAnRBoCFqKAIAIAAoAhBB/wFxQQJ0QaAxaigCACAAKAIQQQh2Qf8BcUECdEGgKWooAgBzc3M2AhAgACAAKAIUQSBrNgIUDAELCwNAIAAoAhRBBE8EQCAAIAAoAgwiAkEEajYCDCAAIAIoAgAgACgCEHM2AhAgACAAKAIQQRh2QQJ0QaAZaigCACAAKAIQQRB2Qf8BcUECdEGgIWooAgAgACgCEEH/AXFBAnRBoDFqKAIAIAAoAhBBCHZB/wFxQQJ0QaApaigCAHNzczYCECAAIAAoAhRBBGs2AhQMAQsLIAAgACgCDDYCGCAAKAIUBEADQCAAKAIQIQIgACAAKAIYIgNBAWo2AhggACADLQAAIAJzQf8BcUECdEGgGWooAgAgACgCEEEIdnM2AhAgACAAKAIUQQFrIgI2AhQgAg0ACwsgACAAKAIQQX9zNgIQIAEgACgCEDYCHAwBCyABKAIUIQIgASgCECEDIwBBIGsiACABKAIYNgIcIAAgAjYCGCAAIAM2AhQgACAAKAIcQQh2QYD+A3EgACgCHEEYdmogACgCHEGA/gNxQQh0aiAAKAIcQf8BcUEYdGo2AhAgACAAKAIQQX9zNgIQA0AgACgCFAR/IAAoAhhBA3FBAEcFQQALQQFxBEAgACgCEEEYdiECIAAgACgCGCIDQQFqNgIYIAAgAy0AACACc0ECdEGgOWooAgAgACgCEEEIdHM2AhAgACAAKAIUQQFrNgIUDAELCyAAIAAoAhg2AgwDQCAAKAIUQSBPBEAgACAAKAIMIgJBBGo2AgwgACACKAIAIAAoAhBzNgIQIAAgACgCEEEYdkECdEGg0QBqKAIAIAAoAhBBEHZB/wFxQQJ0QaDJAGooAgAgACgCEEH/AXFBAnRBoDlqKAIAIAAoAhBBCHZB/wFxQQJ0QaDBAGooAgBzc3M2AhAgACAAKAIMIgJBBGo2AgwgACACKAIAIAAoAhBzNgIQIAAgACgCEEEYdkECdEGg0QBqKAIAIAAoAhBBEHZB/wFxQQJ0QaDJAGooAgAgACgCEEH/AXFBAnRBoDlqKAIAIAAoAhBBCHZB/wFxQQJ0QaDBAGooAgBzc3M2AhAgACAAKAIMIgJBBGo2AgwgACACKAIAIAAoAhBzNgIQIAAgACgCEEEYdkECdEGg0QBqKAIAIAAoAhBBEHZB/wFxQQJ0QaDJAGooAgAgACgCEEH/AXFBAnRBoDlqKAIAIAAoAhBBCHZB/wFxQQJ0QaDBAGooAgBzc3M2AhAgACAAKAIMIgJBBGo2AgwgACACKAIAIAAoAhBzNgIQIAAgACgCEEEYdkECdEGg0QBqKAIAIAAoAhBBEHZB/wFxQQJ0QaDJAGooAgAgACgCEEH/AXFBAnRBoDlqKAIAIAAoAhBBCHZB/wFxQQJ0QaDBAGooAgBzc3M2AhAgACAAKAIMIgJBBGo2AgwgACACKAIAIAAoAhBzNgIQIAAgACgCEEEYdkECdEGg0QBqKAIAIAAoAhBBEHZB/wFxQQJ0QaDJAGooAgAgACgCEEH/AXFBAnRBoDlqKAIAIAAoAhBBCHZB/wFxQQJ0QaDBAGooAgBzc3M2AhAgACAAKAIMIgJBBGo2AgwgACACKAIAIAAoAhBzNgIQIAAgACgCEEEYdkECdEGg0QBqKAIAIAAoAhBBEHZB/wFxQQJ0QaDJAGooAgAgACgCEEH/AXFBAnRBoDlqKAIAIAAoAhBBCHZB/wFxQQJ0QaDBAGooAgBzc3M2AhAgACAAKAIMIgJBBGo2AgwgACACKAIAIAAoAhBzNgIQIAAgACgCEEEYdkECdEGg0QBqKAIAIAAoAhBBEHZB/wFxQQJ0QaDJAGooAgAgACgCEEH/AXFBAnRBoDlqKAIAIAAoAhBBCHZB/wFxQQJ0QaDBAGooAgBzc3M2AhAgACAAKAIMIgJBBGo2AgwgACACKAIAIAAoAhBzNgIQIAAgACgCEEEYdkECdEGg0QBqKAIAIAAoAhBBEHZB/wFxQQJ0QaDJAGooAgAgACgCEEH/AXFBAnRBoDlqKAIAIAAoAhBBCHZB/wFxQQJ0QaDBAGooAgBzc3M2AhAgACAAKAIUQSBrNgIUDAELCwNAIAAoAhRBBE8EQCAAIAAoAgwiAkEEajYCDCAAIAIoAgAgACgCEHM2AhAgACAAKAIQQRh2QQJ0QaDRAGooAgAgACgCEEEQdkH/AXFBAnRBoMkAaigCACAAKAIQQf8BcUECdEGgOWooAgAgACgCEEEIdkH/AXFBAnRBoMEAaigCAHNzczYCECAAIAAoAhRBBGs2AhQMAQsLIAAgACgCDDYCGCAAKAIUBEADQCAAKAIQQRh2IQIgACAAKAIYIgNBAWo2AhggACADLQAAIAJzQQJ0QaA5aigCACAAKAIQQQh0czYCECAAIAAoAhRBAWsiAjYCFCACDQALCyAAIAAoAhBBf3M2AhAgASAAKAIQQQh2QYD+A3EgACgCEEEYdmogACgCEEGA/gNxQQh0aiAAKAIQQf8BcUEYdGo2AhwLIAEoAhwhACABQSBqJAAgBEEQaiQAIAAL7AIBAn8jAEEQayIBJAAgASAANgIMAkAgASgCDEUNACABKAIMKAIwBEAgASgCDCIAIAAoAjBBAWs2AjALIAEoAgwoAjANACABKAIMKAIgBEAgASgCDEEBNgIgIAEoAgwQLxoLIAEoAgwoAiRBAUYEQCABKAIMEGILAkAgASgCDCgCLEUNACABKAIMLQAoQQFxDQAgASgCDCECIwBBEGsiACABKAIMKAIsNgIMIAAgAjYCCCAAQQA2AgQDQCAAKAIEIAAoAgwoAkRJBEAgACgCDCgCTCAAKAIEQQJ0aigCACAAKAIIRgRAIAAoAgwoAkwgACgCBEECdGogACgCDCgCTCAAKAIMKAJEQQFrQQJ0aigCADYCACAAKAIMIgAgACgCREEBazYCRAUgACAAKAIEQQFqNgIEDAILCwsLIAEoAgxBAEIAQQUQIBogASgCDCgCAARAIAEoAgwoAgAQGwsgASgCDBAVCyABQRBqJAALnwIBAn8jAEEQayIBJAAgASAANgIMIAEgASgCDCgCHDYCBCABKAIEIQIjAEEQayIAJAAgACACNgIMIAAoAgwQvAEgAEEQaiQAIAEgASgCBCgCFDYCCCABKAIIIAEoAgwoAhBLBEAgASABKAIMKAIQNgIICwJAIAEoAghFDQAgASgCDCgCDCABKAIEKAIQIAEoAggQGRogASgCDCIAIAEoAgggACgCDGo2AgwgASgCBCIAIAEoAgggACgCEGo2AhAgASgCDCIAIAEoAgggACgCFGo2AhQgASgCDCIAIAAoAhAgASgCCGs2AhAgASgCBCIAIAAoAhQgASgCCGs2AhQgASgCBCgCFA0AIAEoAgQgASgCBCgCCDYCEAsgAUEQaiQAC2ABAX8jAEEQayIBJAAgASAANgIIIAEgASgCCEICEB42AgQCQCABKAIERQRAIAFBADsBDgwBCyABIAEoAgQtAAAgASgCBC0AAUEIdGo7AQ4LIAEvAQ4hACABQRBqJAAgAAvpAQEBfyMAQSBrIgIkACACIAA2AhwgAiABNwMQIAIpAxAhASMAQSBrIgAgAigCHDYCGCAAIAE3AxACQAJAAkAgACgCGC0AAEEBcUUNACAAKQMQIAAoAhgpAxAgACkDEHxWDQAgACgCGCkDCCAAKAIYKQMQIAApAxB8Wg0BCyAAKAIYQQA6AAAgAEEANgIcDAELIAAgACgCGCgCBCAAKAIYKQMQp2o2AgwgACAAKAIMNgIcCyACIAAoAhw2AgwgAigCDARAIAIoAhwiACACKQMQIAApAxB8NwMQCyACKAIMIQAgAkEgaiQAIAALbwEBfyMAQRBrIgIkACACIAA2AgggAiABOwEGIAIgAigCCEICEB42AgACQCACKAIARQRAIAJBfzYCDAwBCyACKAIAIAIvAQY6AAAgAigCACACLwEGQQh2OgABIAJBADYCDAsgAigCDBogAkEQaiQAC7YCAQF/IwBBMGsiBCQAIAQgADYCJCAEIAE2AiAgBCACNwMYIAQgAzYCFAJAIAQoAiQpAxhCASAEKAIUrYaDUARAIAQoAiRBDGpBHEEAEBQgBEJ/NwMoDAELAkAgBCgCJCgCAEUEQCAEIAQoAiQoAgggBCgCICAEKQMYIAQoAhQgBCgCJCgCBBEOADcDCAwBCyAEIAQoAiQoAgAgBCgCJCgCCCAEKAIgIAQpAxggBCgCFCAEKAIkKAIEEQoANwMICyAEKQMIQgBTBEACQCAEKAIUQQRGDQAgBCgCFEEORg0AAkAgBCgCJCAEQghBBBAgQgBTBEAgBCgCJEEMakEUQQAQFAwBCyAEKAIkQQxqIAQoAgAgBCgCBBAUCwsLIAQgBCkDCDcDKAsgBCkDKCECIARBMGokACACC48BAQF/IwBBEGsiAiQAIAIgADYCCCACIAE2AgQgAiACKAIIQgQQHjYCAAJAIAIoAgBFBEAgAkF/NgIMDAELIAIoAgAgAigCBDoAACACKAIAIAIoAgRBCHY6AAEgAigCACACKAIEQRB2OgACIAIoAgAgAigCBEEYdjoAAyACQQA2AgwLIAIoAgwaIAJBEGokAAsXACAALQAAQSBxRQRAIAEgAiAAEHEaCwtQAQF/IwBBEGsiASQAIAEgADYCDANAIAEoAgwEQCABIAEoAgwoAgA2AgggASgCDCgCDBAVIAEoAgwQFSABIAEoAgg2AgwMAQsLIAFBEGokAAs+AQF/IwBBEGsiASQAIAEgADYCDCABKAIMBEAgASgCDCgCABAVIAEoAgwoAgwQFSABKAIMEBULIAFBEGokAAt9AQF/IwBBEGsiASQAIAEgADYCDCABKAIMBEAgAUIANwMAA0AgASkDACABKAIMKQMIWkUEQCABKAIMKAIAIAEpAwCnQQR0ahB3IAEgASkDAEIBfDcDAAwBCwsgASgCDCgCABAVIAEoAgwoAigQJCABKAIMEBULIAFBEGokAAtuAQF/IwBBgAJrIgUkAAJAIARBgMAEcQ0AIAIgA0wNACAFIAFB/wFxIAIgA2siAkGAAiACQYACSSIBGxAzIAFFBEADQCAAIAVBgAIQIiACQYACayICQf8BSw0ACwsgACAFIAIQIgsgBUGAAmokAAvRAQEBfyMAQTBrIgMkACADIAA2AiggAyABNwMgIAMgAjYCHAJAIAMoAigtAChBAXEEQCADQX82AiwMAQsCQCADKAIoKAIgBEAgAygCHEUNASADKAIcQQFGDQEgAygCHEECRg0BCyADKAIoQQxqQRJBABAUIANBfzYCLAwBCyADIAMpAyA3AwggAyADKAIcNgIQIAMoAiggA0EIakIQQQYQIEIAUwRAIANBfzYCLAwBCyADKAIoQQA6ADQgA0EANgIsCyADKAIsIQAgA0EwaiQAIAALmBcBAn8jAEEwayIEJAAgBCAANgIsIAQgATYCKCAEIAI2AiQgBCADNgIgIARBADYCFAJAIAQoAiwoAoQBQQBKBEAgBCgCLCgCACgCLEECRgRAIwBBEGsiACAEKAIsNgIIIABB/4D/n382AgQgAEEANgIAAkADQCAAKAIAQR9MBEACQCAAKAIEQQFxRQ0AIAAoAghBlAFqIAAoAgBBAnRqLwEARQ0AIABBADYCDAwDCyAAIAAoAgBBAWo2AgAgACAAKAIEQQF2NgIEDAELCwJAAkAgACgCCC8BuAENACAAKAIILwG8AQ0AIAAoAggvAcgBRQ0BCyAAQQE2AgwMAQsgAEEgNgIAA0AgACgCAEGAAkgEQCAAKAIIQZQBaiAAKAIAQQJ0ai8BAARAIABBATYCDAwDBSAAIAAoAgBBAWo2AgAMAgsACwsgAEEANgIMCyAAKAIMIQAgBCgCLCgCACAANgIsCyAEKAIsIAQoAixBmBZqEHogBCgCLCAEKAIsQaQWahB6IAQoAiwhASMAQRBrIgAkACAAIAE2AgwgACgCDCAAKAIMQZQBaiAAKAIMKAKcFhC6ASAAKAIMIAAoAgxBiBNqIAAoAgwoAqgWELoBIAAoAgwgACgCDEGwFmoQeiAAQRI2AggDQAJAIAAoAghBA0gNACAAKAIMQfwUaiAAKAIILQDgbEECdGovAQINACAAIAAoAghBAWs2AggMAQsLIAAoAgwiASABKAKoLSAAKAIIQQNsQRFqajYCqC0gACgCCCEBIABBEGokACAEIAE2AhQgBCAEKAIsKAKoLUEKakEDdjYCHCAEIAQoAiwoAqwtQQpqQQN2NgIYIAQoAhggBCgCHE0EQCAEIAQoAhg2AhwLDAELIAQgBCgCJEEFaiIANgIYIAQgADYCHAsCQAJAIAQoAhwgBCgCJEEEakkNACAEKAIoRQ0AIAQoAiwgBCgCKCAEKAIkIAQoAiAQXQwBCwJAAkAgBCgCLCgCiAFBBEcEQCAEKAIYIAQoAhxHDQELIARBAzYCEAJAIAQoAiwoArwtQRAgBCgCEGtKBEAgBCAEKAIgQQJqNgIMIAQoAiwiACAALwG4LSAEKAIMQf//A3EgBCgCLCgCvC10cjsBuC0gBCgCLC8BuC1B/wFxIQEgBCgCLCgCCCECIAQoAiwiAygCFCEAIAMgAEEBajYCFCAAIAJqIAE6AAAgBCgCLC8BuC1BCHYhASAEKAIsKAIIIQIgBCgCLCIDKAIUIQAgAyAAQQFqNgIUIAAgAmogAToAACAEKAIsIAQoAgxB//8DcUEQIAQoAiwoArwta3U7AbgtIAQoAiwiACAAKAK8LSAEKAIQQRBrajYCvC0MAQsgBCgCLCIAIAAvAbgtIAQoAiBBAmpB//8DcSAEKAIsKAK8LXRyOwG4LSAEKAIsIgAgBCgCECAAKAK8LWo2ArwtCyAEKAIsQZDgAEGQ6QAQuwEMAQsgBEEDNgIIAkAgBCgCLCgCvC1BECAEKAIIa0oEQCAEIAQoAiBBBGo2AgQgBCgCLCIAIAAvAbgtIAQoAgRB//8DcSAEKAIsKAK8LXRyOwG4LSAEKAIsLwG4LUH/AXEhASAEKAIsKAIIIQIgBCgCLCIDKAIUIQAgAyAAQQFqNgIUIAAgAmogAToAACAEKAIsLwG4LUEIdiEBIAQoAiwoAgghAiAEKAIsIgMoAhQhACADIABBAWo2AhQgACACaiABOgAAIAQoAiwgBCgCBEH//wNxQRAgBCgCLCgCvC1rdTsBuC0gBCgCLCIAIAAoArwtIAQoAghBEGtqNgK8LQwBCyAEKAIsIgAgAC8BuC0gBCgCIEEEakH//wNxIAQoAiwoArwtdHI7AbgtIAQoAiwiACAEKAIIIAAoArwtajYCvC0LIAQoAiwhASAEKAIsKAKcFkEBaiECIAQoAiwoAqgWQQFqIQMgBCgCFEEBaiEFIwBBQGoiACQAIAAgATYCPCAAIAI2AjggACADNgI0IAAgBTYCMCAAQQU2AigCQCAAKAI8KAK8LUEQIAAoAihrSgRAIAAgACgCOEGBAms2AiQgACgCPCIBIAEvAbgtIAAoAiRB//8DcSAAKAI8KAK8LXRyOwG4LSAAKAI8LwG4LUH/AXEhAiAAKAI8KAIIIQMgACgCPCIFKAIUIQEgBSABQQFqNgIUIAEgA2ogAjoAACAAKAI8LwG4LUEIdiECIAAoAjwoAgghAyAAKAI8IgUoAhQhASAFIAFBAWo2AhQgASADaiACOgAAIAAoAjwgACgCJEH//wNxQRAgACgCPCgCvC1rdTsBuC0gACgCPCIBIAEoArwtIAAoAihBEGtqNgK8LQwBCyAAKAI8IgEgAS8BuC0gACgCOEGBAmtB//8DcSAAKAI8KAK8LXRyOwG4LSAAKAI8IgEgACgCKCABKAK8LWo2ArwtCyAAQQU2AiACQCAAKAI8KAK8LUEQIAAoAiBrSgRAIAAgACgCNEEBazYCHCAAKAI8IgEgAS8BuC0gACgCHEH//wNxIAAoAjwoArwtdHI7AbgtIAAoAjwvAbgtQf8BcSECIAAoAjwoAgghAyAAKAI8IgUoAhQhASAFIAFBAWo2AhQgASADaiACOgAAIAAoAjwvAbgtQQh2IQIgACgCPCgCCCEDIAAoAjwiBSgCFCEBIAUgAUEBajYCFCABIANqIAI6AAAgACgCPCAAKAIcQf//A3FBECAAKAI8KAK8LWt1OwG4LSAAKAI8IgEgASgCvC0gACgCIEEQa2o2ArwtDAELIAAoAjwiASABLwG4LSAAKAI0QQFrQf//A3EgACgCPCgCvC10cjsBuC0gACgCPCIBIAAoAiAgASgCvC1qNgK8LQsgAEEENgIYAkAgACgCPCgCvC1BECAAKAIYa0oEQCAAIAAoAjBBBGs2AhQgACgCPCIBIAEvAbgtIAAoAhRB//8DcSAAKAI8KAK8LXRyOwG4LSAAKAI8LwG4LUH/AXEhAiAAKAI8KAIIIQMgACgCPCIFKAIUIQEgBSABQQFqNgIUIAEgA2ogAjoAACAAKAI8LwG4LUEIdiECIAAoAjwoAgghAyAAKAI8IgUoAhQhASAFIAFBAWo2AhQgASADaiACOgAAIAAoAjwgACgCFEH//wNxQRAgACgCPCgCvC1rdTsBuC0gACgCPCIBIAEoArwtIAAoAhhBEGtqNgK8LQwBCyAAKAI8IgEgAS8BuC0gACgCMEEEa0H//wNxIAAoAjwoArwtdHI7AbgtIAAoAjwiASAAKAIYIAEoArwtajYCvC0LIABBADYCLANAIAAoAiwgACgCMEgEQCAAQQM2AhACQCAAKAI8KAK8LUEQIAAoAhBrSgRAIAAgACgCPEH8FGogACgCLC0A4GxBAnRqLwECNgIMIAAoAjwiASABLwG4LSAAKAIMQf//A3EgACgCPCgCvC10cjsBuC0gACgCPC8BuC1B/wFxIQIgACgCPCgCCCEDIAAoAjwiBSgCFCEBIAUgAUEBajYCFCABIANqIAI6AAAgACgCPC8BuC1BCHYhAiAAKAI8KAIIIQMgACgCPCIFKAIUIQEgBSABQQFqNgIUIAEgA2ogAjoAACAAKAI8IAAoAgxB//8DcUEQIAAoAjwoArwta3U7AbgtIAAoAjwiASABKAK8LSAAKAIQQRBrajYCvC0MAQsgACgCPCIBIAEvAbgtIAAoAjxB/BRqIAAoAiwtAOBsQQJ0ai8BAiAAKAI8KAK8LXRyOwG4LSAAKAI8IgEgACgCECABKAK8LWo2ArwtCyAAIAAoAixBAWo2AiwMAQsLIAAoAjwgACgCPEGUAWogACgCOEEBaxC5ASAAKAI8IAAoAjxBiBNqIAAoAjRBAWsQuQEgAEFAayQAIAQoAiwgBCgCLEGUAWogBCgCLEGIE2oQuwELCyAEKAIsEL4BIAQoAiAEQCAEKAIsEL0BCyAEQTBqJAAL1AEBAX8jAEEgayICJAAgAiAANgIYIAIgATcDECACIAIoAhhFOgAPAkAgAigCGEUEQCACIAIpAxCnEBgiADYCGCAARQRAIAJBADYCHAwCCwsgAkEYEBgiADYCCCAARQRAIAItAA9BAXEEQCACKAIYEBULIAJBADYCHAwBCyACKAIIQQE6AAAgAigCCCACKAIYNgIEIAIoAgggAikDEDcDCCACKAIIQgA3AxAgAigCCCACLQAPQQFxOgABIAIgAigCCDYCHAsgAigCHCEAIAJBIGokACAAC3gBAX8jAEEQayIBJAAgASAANgIIIAEgASgCCEIEEB42AgQCQCABKAIERQRAIAFBADYCDAwBCyABIAEoAgQtAAAgASgCBC0AASABKAIELQACIAEoAgQtAANBCHRqQQh0akEIdGo2AgwLIAEoAgwhACABQRBqJAAgAAuHAwEBfyMAQTBrIgMkACADIAA2AiQgAyABNgIgIAMgAjcDGAJAIAMoAiQtAChBAXEEQCADQn83AygMAQsCQAJAIAMoAiQoAiBFDQAgAykDGEL///////////8AVg0AIAMpAxhQDQEgAygCIA0BCyADKAIkQQxqQRJBABAUIANCfzcDKAwBCyADKAIkLQA1QQFxBEAgA0J/NwMoDAELAn8jAEEQayIAIAMoAiQ2AgwgACgCDC0ANEEBcQsEQCADQgA3AygMAQsgAykDGFAEQCADQgA3AygMAQsgA0IANwMQA0AgAykDECADKQMYVARAIAMgAygCJCADKAIgIAMpAxCnaiADKQMYIAMpAxB9QQEQICICNwMIIAJCAFMEQCADKAIkQQE6ADUgAykDEFAEQCADQn83AygMBAsgAyADKQMQNwMoDAMLIAMpAwhQBEAgAygCJEEBOgA0BSADIAMpAwggAykDEHw3AxAMAgsLCyADIAMpAxA3AygLIAMpAyghAiADQTBqJAAgAgthAQF/IwBBEGsiAiAANgIIIAIgATcDAAJAIAIpAwAgAigCCCkDCFYEQCACKAIIQQA6AAAgAkF/NgIMDAELIAIoAghBAToAACACKAIIIAIpAwA3AxAgAkEANgIMCyACKAIMC+8BAQF/IwBBIGsiAiQAIAIgADYCGCACIAE3AxAgAiACKAIYQggQHjYCDAJAIAIoAgxFBEAgAkF/NgIcDAELIAIoAgwgAikDEEL/AYM8AAAgAigCDCACKQMQQgiIQv8BgzwAASACKAIMIAIpAxBCEIhC/wGDPAACIAIoAgwgAikDEEIYiEL/AYM8AAMgAigCDCACKQMQQiCIQv8BgzwABCACKAIMIAIpAxBCKIhC/wGDPAAFIAIoAgwgAikDEEIwiEL/AYM8AAYgAigCDCACKQMQQjiIQv8BgzwAByACQQA2AhwLIAIoAhwaIAJBIGokAAt/AQN/IAAhAQJAIABBA3EEQANAIAEtAABFDQIgAUEBaiIBQQNxDQALCwNAIAEiAkEEaiEBIAIoAgAiA0F/cyADQYGChAhrcUGAgYKEeHFFDQALIANB/wFxRQRAIAIgAGsPCwNAIAItAAEhAyACQQFqIgEhAiADDQALCyABIABrC6YBAQF/IwBBEGsiASQAIAEgADYCCAJAIAEoAggoAiBFBEAgASgCCEEMakESQQAQFCABQX82AgwMAQsgASgCCCIAIAAoAiBBAWs2AiAgASgCCCgCIEUEQCABKAIIQQBCAEECECAaIAEoAggoAgAEQCABKAIIKAIAEC9BAEgEQCABKAIIQQxqQRRBABAUCwsLIAFBADYCDAsgASgCDCEAIAFBEGokACAACzYBAX8jAEEQayIBIAA2AgwCfiABKAIMLQAAQQFxBEAgASgCDCkDCCABKAIMKQMQfQwBC0IACwuyAQIBfwF+IwBBEGsiASQAIAEgADYCBCABIAEoAgRCCBAeNgIAAkAgASgCAEUEQCABQgA3AwgMAQsgASABKAIALQAArSABKAIALQAHrUI4hiABKAIALQAGrUIwhnwgASgCAC0ABa1CKIZ8IAEoAgAtAAStQiCGfCABKAIALQADrUIYhnwgASgCAC0AAq1CEIZ8IAEoAgAtAAGtQgiGfHw3AwgLIAEpAwghAiABQRBqJAAgAgvcAQEBfyMAQRBrIgEkACABIAA2AgwgASgCDARAIAEoAgwoAigEQCABKAIMKAIoQQA2AiggASgCDCgCKEIANwMgIAEoAgwCfiABKAIMKQMYIAEoAgwpAyBWBEAgASgCDCkDGAwBCyABKAIMKQMgCzcDGAsgASABKAIMKQMYNwMAA0AgASkDACABKAIMKQMIWkUEQCABKAIMKAIAIAEpAwCnQQR0aigCABAVIAEgASkDAEIBfDcDAAwBCwsgASgCDCgCABAVIAEoAgwoAgQQFSABKAIMEBULIAFBEGokAAvwAgICfwF+AkAgAkUNACAAIAJqIgNBAWsgAToAACAAIAE6AAAgAkEDSQ0AIANBAmsgAToAACAAIAE6AAEgA0EDayABOgAAIAAgAToAAiACQQdJDQAgA0EEayABOgAAIAAgAToAAyACQQlJDQAgAEEAIABrQQNxIgRqIgMgAUH/AXFBgYKECGwiADYCACADIAIgBGtBfHEiAmoiAUEEayAANgIAIAJBCUkNACADIAA2AgggAyAANgIEIAFBCGsgADYCACABQQxrIAA2AgAgAkEZSQ0AIAMgADYCGCADIAA2AhQgAyAANgIQIAMgADYCDCABQRBrIAA2AgAgAUEUayAANgIAIAFBGGsgADYCACABQRxrIAA2AgAgAiADQQRxQRhyIgFrIgJBIEkNACAArUKBgICAEH4hBSABIANqIQEDQCABIAU3AxggASAFNwMQIAEgBTcDCCABIAU3AwAgAUEgaiEBIAJBIGsiAkEfSw0ACwsLawEBfyMAQSBrIgIgADYCHCACQgEgAigCHK2GNwMQIAJBDGogATYCAANAIAIgAigCDCIAQQRqNgIMIAIgACgCADYCCCACKAIIQQBIRQRAIAIgAikDEEIBIAIoAgithoQ3AxAMAQsLIAIpAxALYAIBfwF+IwBBEGsiASQAIAEgADYCBAJAIAEoAgQoAiRBAUcEQCABKAIEQQxqQRJBABAUIAFCfzcDCAwBCyABIAEoAgRBAEIAQQ0QIDcDCAsgASkDCCECIAFBEGokACACC6UCAQJ/IwBBIGsiAyQAIAMgADYCGCADIAE2AhQgAyACNwMIIAMoAhgoAgAhASADKAIUIQQgAykDCCECIwBBIGsiACQAIAAgATYCFCAAIAQ2AhAgACACNwMIAkACQCAAKAIUKAIkQQFGBEAgACkDCEL///////////8AWA0BCyAAKAIUQQxqQRJBABAUIABCfzcDGAwBCyAAIAAoAhQgACgCECAAKQMIQQsQIDcDGAsgACkDGCECIABBIGokACADIAI3AwACQCACQgBTBEAgAygCGEEIaiADKAIYKAIAEBcgA0F/NgIcDAELIAMpAwAgAykDCFIEQCADKAIYQQhqQQZBGxAUIANBfzYCHAwBCyADQQA2AhwLIAMoAhwhACADQSBqJAAgAAsxAQF/IwBBEGsiASQAIAEgADYCDCABKAIMBEAgASgCDBBSIAEoAgwQFQsgAUEQaiQACy8BAX8jAEEQayIBJAAgASAANgIMIAEoAgwoAggQFSABKAIMQQA2AgggAUEQaiQAC80BAQF/IwBBEGsiAiQAIAIgADYCCCACIAE2AgQCQCACKAIILQAoQQFxBEAgAkF/NgIMDAELIAIoAgRFBEAgAigCCEEMakESQQAQFCACQX82AgwMAQsgAigCBBA7IAIoAggoAgAEQCACKAIIKAIAIAIoAgQQOUEASARAIAIoAghBDGogAigCCCgCABAXIAJBfzYCDAwCCwsgAigCCCACKAIEQjhBAxAgQgBTBEAgAkF/NgIMDAELIAJBADYCDAsgAigCDCEAIAJBEGokACAAC98EAQF/IwBBIGsiAiAANgIYIAIgATYCFAJAIAIoAhhFBEAgAkEBNgIcDAELIAIgAigCGCgCADYCDAJAIAIoAhgoAggEQCACIAIoAhgoAgg2AhAMAQsgAkEBNgIQIAJBADYCCANAAkAgAigCCCACKAIYLwEETw0AAkAgAigCDCACKAIIai0AAEEfSwRAIAIoAgwgAigCCGotAABBgAFJDQELIAIoAgwgAigCCGotAABBDUYNACACKAIMIAIoAghqLQAAQQpGDQAgAigCDCACKAIIai0AAEEJRgRADAELIAJBAzYCEAJAIAIoAgwgAigCCGotAABB4AFxQcABRgRAIAJBATYCAAwBCwJAIAIoAgwgAigCCGotAABB8AFxQeABRgRAIAJBAjYCAAwBCwJAIAIoAgwgAigCCGotAABB+AFxQfABRgRAIAJBAzYCAAwBCyACQQQ2AhAMBAsLCyACKAIYLwEEIAIoAgggAigCAGpNBEAgAkEENgIQDAILIAJBATYCBANAIAIoAgQgAigCAE0EQCACKAIMIAIoAgggAigCBGpqLQAAQcABcUGAAUcEQCACQQQ2AhAMBgUgAiACKAIEQQFqNgIEDAILAAsLIAIgAigCACACKAIIajYCCAsgAiACKAIIQQFqNgIIDAELCwsgAigCGCACKAIQNgIIIAIoAhQEQAJAIAIoAhRBAkcNACACKAIQQQNHDQAgAkECNgIQIAIoAhhBAjYCCAsCQCACKAIUIAIoAhBGDQAgAigCEEEBRg0AIAJBBTYCHAwCCwsgAiACKAIQNgIcCyACKAIcC2oBAX8jAEEQayIBIAA2AgwgASgCDEIANwMAIAEoAgxBADYCCCABKAIMQn83AxAgASgCDEEANgIsIAEoAgxBfzYCKCABKAIMQgA3AxggASgCDEIANwMgIAEoAgxBADsBMCABKAIMQQA7ATILjQUBA38jAEEQayIBJAAgASAANgIMIAEoAgwEQCABKAIMKAIABEAgASgCDCgCABAvGiABKAIMKAIAEBsLIAEoAgwoAhwQFSABKAIMKAIgECQgASgCDCgCJBAkIAEoAgwoAlAhAiMAQRBrIgAkACAAIAI2AgwgACgCDARAIAAoAgwoAhAEQCAAQQA2AggDQCAAKAIIIAAoAgwoAgBJBEAgACgCDCgCECAAKAIIQQJ0aigCAARAIAAoAgwoAhAgACgCCEECdGooAgAhAyMAQRBrIgIkACACIAM2AgwDQCACKAIMBEAgAiACKAIMKAIYNgIIIAIoAgwQFSACIAIoAgg2AgwMAQsLIAJBEGokAAsgACAAKAIIQQFqNgIIDAELCyAAKAIMKAIQEBULIAAoAgwQFQsgAEEQaiQAIAEoAgwoAkAEQCABQgA3AwADQCABKQMAIAEoAgwpAzBUBEAgASgCDCgCQCABKQMAp0EEdGoQdyABIAEpAwBCAXw3AwAMAQsLIAEoAgwoAkAQFQsgAUIANwMAA0AgASkDACABKAIMKAJErVQEQCABKAIMKAJMIAEpAwCnQQJ0aigCACECIwBBEGsiACQAIAAgAjYCDCAAKAIMQQE6ACgCfyMAQRBrIgIgACgCDEEMajYCDCACKAIMKAIARQsEQCAAKAIMQQxqQQhBABAUCyAAQRBqJAAgASABKQMAQgF8NwMADAELCyABKAIMKAJMEBUgASgCDCgCVCECIwBBEGsiACQAIAAgAjYCDCAAKAIMBEAgACgCDCgCCARAIAAoAgwoAgwgACgCDCgCCBECAAsgACgCDBAVCyAAQRBqJAAgASgCDEEIahA4IAEoAgwQFQsgAUEQaiQAC48OAQF/IwBBEGsiAyQAIAMgADYCDCADIAE2AgggAyACNgIEIAMoAgghASADKAIEIQIjAEEgayIAIAMoAgw2AhggACABNgIUIAAgAjYCECAAIAAoAhhBEHY2AgwgACAAKAIYQf//A3E2AhgCQCAAKAIQQQFGBEAgACAAKAIULQAAIAAoAhhqNgIYIAAoAhhB8f8DTwRAIAAgACgCGEHx/wNrNgIYCyAAIAAoAhggACgCDGo2AgwgACgCDEHx/wNPBEAgACAAKAIMQfH/A2s2AgwLIAAgACgCGCAAKAIMQRB0cjYCHAwBCyAAKAIURQRAIABBATYCHAwBCyAAKAIQQRBJBEADQCAAIAAoAhAiAUEBazYCECABBEAgACAAKAIUIgFBAWo2AhQgACABLQAAIAAoAhhqNgIYIAAgACgCGCAAKAIMajYCDAwBCwsgACgCGEHx/wNPBEAgACAAKAIYQfH/A2s2AhgLIAAgACgCDEHx/wNwNgIMIAAgACgCGCAAKAIMQRB0cjYCHAwBCwNAIAAoAhBBsCtPBEAgACAAKAIQQbArazYCECAAQdsCNgIIA0AgACAAKAIULQAAIAAoAhhqNgIYIAAgACgCGCAAKAIMajYCDCAAIAAoAhQtAAEgACgCGGo2AhggACAAKAIYIAAoAgxqNgIMIAAgACgCFC0AAiAAKAIYajYCGCAAIAAoAhggACgCDGo2AgwgACAAKAIULQADIAAoAhhqNgIYIAAgACgCGCAAKAIMajYCDCAAIAAoAhQtAAQgACgCGGo2AhggACAAKAIYIAAoAgxqNgIMIAAgACgCFC0ABSAAKAIYajYCGCAAIAAoAhggACgCDGo2AgwgACAAKAIULQAGIAAoAhhqNgIYIAAgACgCGCAAKAIMajYCDCAAIAAoAhQtAAcgACgCGGo2AhggACAAKAIYIAAoAgxqNgIMIAAgACgCFC0ACCAAKAIYajYCGCAAIAAoAhggACgCDGo2AgwgACAAKAIULQAJIAAoAhhqNgIYIAAgACgCGCAAKAIMajYCDCAAIAAoAhQtAAogACgCGGo2AhggACAAKAIYIAAoAgxqNgIMIAAgACgCFC0ACyAAKAIYajYCGCAAIAAoAhggACgCDGo2AgwgACAAKAIULQAMIAAoAhhqNgIYIAAgACgCGCAAKAIMajYCDCAAIAAoAhQtAA0gACgCGGo2AhggACAAKAIYIAAoAgxqNgIMIAAgACgCFC0ADiAAKAIYajYCGCAAIAAoAhggACgCDGo2AgwgACAAKAIULQAPIAAoAhhqNgIYIAAgACgCGCAAKAIMajYCDCAAIAAoAhRBEGo2AhQgACAAKAIIQQFrIgE2AgggAQ0ACyAAIAAoAhhB8f8DcDYCGCAAIAAoAgxB8f8DcDYCDAwBCwsgACgCEARAA0AgACgCEEEQTwRAIAAgACgCEEEQazYCECAAIAAoAhQtAAAgACgCGGo2AhggACAAKAIYIAAoAgxqNgIMIAAgACgCFC0AASAAKAIYajYCGCAAIAAoAhggACgCDGo2AgwgACAAKAIULQACIAAoAhhqNgIYIAAgACgCGCAAKAIMajYCDCAAIAAoAhQtAAMgACgCGGo2AhggACAAKAIYIAAoAgxqNgIMIAAgACgCFC0ABCAAKAIYajYCGCAAIAAoAhggACgCDGo2AgwgACAAKAIULQAFIAAoAhhqNgIYIAAgACgCGCAAKAIMajYCDCAAIAAoAhQtAAYgACgCGGo2AhggACAAKAIYIAAoAgxqNgIMIAAgACgCFC0AByAAKAIYajYCGCAAIAAoAhggACgCDGo2AgwgACAAKAIULQAIIAAoAhhqNgIYIAAgACgCGCAAKAIMajYCDCAAIAAoAhQtAAkgACgCGGo2AhggACAAKAIYIAAoAgxqNgIMIAAgACgCFC0ACiAAKAIYajYCGCAAIAAoAhggACgCDGo2AgwgACAAKAIULQALIAAoAhhqNgIYIAAgACgCGCAAKAIMajYCDCAAIAAoAhQtAAwgACgCGGo2AhggACAAKAIYIAAoAgxqNgIMIAAgACgCFC0ADSAAKAIYajYCGCAAIAAoAhggACgCDGo2AgwgACAAKAIULQAOIAAoAhhqNgIYIAAgACgCGCAAKAIMajYCDCAAIAAoAhQtAA8gACgCGGo2AhggACAAKAIYIAAoAgxqNgIMIAAgACgCFEEQajYCFAwBCwsDQCAAIAAoAhAiAUEBazYCECABBEAgACAAKAIUIgFBAWo2AhQgACABLQAAIAAoAhhqNgIYIAAgACgCGCAAKAIMajYCDAwBCwsgACAAKAIYQfH/A3A2AhggACAAKAIMQfH/A3A2AgwLIAAgACgCGCAAKAIMQRB0cjYCHAsgACgCHCEAIANBEGokACAAC1IBAn9BkJcBKAIAIgEgAEEDakF8cSICaiEAAkAgAkEAIAAgAU0bDQAgAD8AQRB0SwRAIAAQDEUNAQtBkJcBIAA2AgAgAQ8LQbSbAUEwNgIAQX8LvAIBAX8jAEEgayIEJAAgBCAANgIYIAQgATcDECAEIAI2AgwgBCADNgIIIAQoAghFBEAgBCAEKAIYQQhqNgIICwJAIAQpAxAgBCgCGCkDMFoEQCAEKAIIQRJBABAUIARBADYCHAwBCwJAIAQoAgxBCHFFBEAgBCgCGCgCQCAEKQMQp0EEdGooAgQNAQsgBCgCGCgCQCAEKQMQp0EEdGooAgBFBEAgBCgCCEESQQAQFCAEQQA2AhwMAgsCQCAEKAIYKAJAIAQpAxCnQQR0ai0ADEEBcUUNACAEKAIMQQhxDQAgBCgCCEEXQQAQFCAEQQA2AhwMAgsgBCAEKAIYKAJAIAQpAxCnQQR0aigCADYCHAwBCyAEIAQoAhgoAkAgBCkDEKdBBHRqKAIENgIcCyAEKAIcIQAgBEEgaiQAIAALhAEBAX8jAEEQayIBJAAgASAANgIIIAFB2AAQGCIANgIEAkAgAEUEQCABQQA2AgwMAQsCQCABKAIIBEAgASgCBCABKAIIQdgAEBkaDAELIAEoAgQQUwsgASgCBEEANgIAIAEoAgRBAToABSABIAEoAgQ2AgwLIAEoAgwhACABQRBqJAAgAAtvAQF/IwBBIGsiAyQAIAMgADYCGCADIAE2AhQgAyACNgIQIAMgAygCGCADKAIQrRAeNgIMAkAgAygCDEUEQCADQX82AhwMAQsgAygCDCADKAIUIAMoAhAQGRogA0EANgIcCyADKAIcGiADQSBqJAALogEBAX8jAEEgayIEJAAgBCAANgIYIAQgATcDECAEIAI2AgwgBCADNgIIIAQgBCgCDCAEKQMQECkiADYCBAJAIABFBEAgBCgCCEEOQQAQFCAEQQA2AhwMAQsgBCgCGCAEKAIEKAIEIAQpAxAgBCgCCBBkQQBIBEAgBCgCBBAWIARBADYCHAwBCyAEIAQoAgQ2AhwLIAQoAhwhACAEQSBqJAAgAAugAQEBfyMAQSBrIgMkACADIAA2AhQgAyABNgIQIAMgAjcDCCADIAMoAhA2AgQCQCADKQMIQghUBEAgA0J/NwMYDAELIwBBEGsiACADKAIUNgIMIAAoAgwoAgAhACADKAIEIAA2AgAjAEEQayIAIAMoAhQ2AgwgACgCDCgCBCEAIAMoAgQgADYCBCADQgg3AxgLIAMpAxghAiADQSBqJAAgAguDAQIDfwF+AkAgAEKAgICAEFQEQCAAIQUMAQsDQCABQQFrIgEgACAAQgqAIgVCCn59p0EwcjoAACAAQv////+fAVYhAiAFIQAgAg0ACwsgBaciAgRAA0AgAUEBayIBIAIgAkEKbiIDQQpsa0EwcjoAACACQQlLIQQgAyECIAQNAAsLIAELPwEBfyMAQRBrIgIgADYCDCACIAE2AgggAigCDARAIAIoAgwgAigCCCgCADYCACACKAIMIAIoAggoAgQ2AgQLC9IIAQJ/IwBBIGsiBCQAIAQgADYCGCAEIAE2AhQgBCACNgIQIAQgAzYCDAJAIAQoAhhFBEAgBCgCFARAIAQoAhRBADYCAAsgBEGVFTYCHAwBCyAEKAIQQcAAcUUEQCAEKAIYKAIIRQRAIAQoAhhBABA6GgsCQAJAAkAgBCgCEEGAAXFFDQAgBCgCGCgCCEEBRg0AIAQoAhgoAghBAkcNAQsgBCgCGCgCCEEERw0BCyAEKAIYKAIMRQRAIAQoAhgoAgAhASAEKAIYLwEEIQIgBCgCGEEQaiEDIAQoAgwhBSMAQTBrIgAkACAAIAE2AiggACACNgIkIAAgAzYCICAAIAU2AhwgACAAKAIoNgIYAkAgACgCJEUEQCAAKAIgBEAgACgCIEEANgIACyAAQQA2AiwMAQsgAEEBNgIQIABBADYCDANAIAAoAgwgACgCJEkEQCMAQRBrIgEgACgCGCAAKAIMai0AAEEBdEGgFWovAQA2AggCQCABKAIIQYABSQRAIAFBATYCDAwBCyABKAIIQYAQSQRAIAFBAjYCDAwBCyABKAIIQYCABEkEQCABQQM2AgwMAQsgAUEENgIMCyAAIAEoAgwgACgCEGo2AhAgACAAKAIMQQFqNgIMDAELCyAAIAAoAhAQGCIBNgIUIAFFBEAgACgCHEEOQQAQFCAAQQA2AiwMAQsgAEEANgIIIABBADYCDANAIAAoAgwgACgCJEkEQCAAKAIUIAAoAghqIQIjAEEQayIBIAAoAhggACgCDGotAABBAXRBoBVqLwEANgIIIAEgAjYCBAJAIAEoAghBgAFJBEAgASgCBCABKAIIOgAAIAFBATYCDAwBCyABKAIIQYAQSQRAIAEoAgQgASgCCEEGdkEfcUHAAXI6AAAgASgCBCABKAIIQT9xQYABcjoAASABQQI2AgwMAQsgASgCCEGAgARJBEAgASgCBCABKAIIQQx2QQ9xQeABcjoAACABKAIEIAEoAghBBnZBP3FBgAFyOgABIAEoAgQgASgCCEE/cUGAAXI6AAIgAUEDNgIMDAELIAEoAgQgASgCCEESdkEHcUHwAXI6AAAgASgCBCABKAIIQQx2QT9xQYABcjoAASABKAIEIAEoAghBBnZBP3FBgAFyOgACIAEoAgQgASgCCEE/cUGAAXI6AAMgAUEENgIMCyAAIAEoAgwgACgCCGo2AgggACAAKAIMQQFqNgIMDAELCyAAKAIUIAAoAhBBAWtqQQA6AAAgACgCIARAIAAoAiAgACgCEEEBazYCAAsgACAAKAIUNgIsCyAAKAIsIQEgAEEwaiQAIAQoAhggATYCDCABRQRAIARBADYCHAwECwsgBCgCFARAIAQoAhQgBCgCGCgCEDYCAAsgBCAEKAIYKAIMNgIcDAILCyAEKAIUBEAgBCgCFCAEKAIYLwEENgIACyAEIAQoAhgoAgA2AhwLIAQoAhwhACAEQSBqJAAgAAs5AQF/IwBBEGsiASAANgIMQQAhACABKAIMLQAAQQFxBH8gASgCDCkDECABKAIMKQMIUQVBAAtBAXEL7wIBAX8jAEEQayIBJAAgASAANgIIAkAgASgCCC0AKEEBcQRAIAFBfzYCDAwBCyABKAIIKAIkQQNGBEAgASgCCEEMakEXQQAQFCABQX82AgwMAQsCQCABKAIIKAIgBEACfyMAQRBrIgAgASgCCDYCDCAAKAIMKQMYQsAAg1ALBEAgASgCCEEMakEdQQAQFCABQX82AgwMAwsMAQsgASgCCCgCAARAIAEoAggoAgAQSEEASARAIAEoAghBDGogASgCCCgCABAXIAFBfzYCDAwDCwsgASgCCEEAQgBBABAgQgBTBEAgASgCCCgCAARAIAEoAggoAgAQLxoLIAFBfzYCDAwCCwsgASgCCEEAOgA0IAEoAghBADoANSMAQRBrIgAgASgCCEEMajYCDCAAKAIMBEAgACgCDEEANgIAIAAoAgxBADYCBAsgASgCCCIAIAAoAiBBAWo2AiAgAUEANgIMCyABKAIMIQAgAUEQaiQAIAALdQIBfwF+IwBBEGsiASQAIAEgADYCBAJAIAEoAgQtAChBAXEEQCABQn83AwgMAQsgASgCBCgCIEUEQCABKAIEQQxqQRJBABAUIAFCfzcDCAwBCyABIAEoAgRBAEIAQQcQIDcDCAsgASkDCCECIAFBEGokACACC50BAQF/IwBBEGsiASAANgIIAkACQAJAIAEoAghFDQAgASgCCCgCIEUNACABKAIIKAIkDQELIAFBATYCDAwBCyABIAEoAggoAhw2AgQCQAJAIAEoAgRFDQAgASgCBCgCACABKAIIRw0AIAEoAgQoAgRBtP4ASQ0AIAEoAgQoAgRB0/4ATQ0BCyABQQE2AgwMAQsgAUEANgIMCyABKAIMC4ABAQN/IwBBEGsiAiAANgIMIAIgATYCCCACKAIIQQh2IQEgAigCDCgCCCEDIAIoAgwiBCgCFCEAIAQgAEEBajYCFCAAIANqIAE6AAAgAigCCEH/AXEhASACKAIMKAIIIQMgAigCDCICKAIUIQAgAiAAQQFqNgIUIAAgA2ogAToAAAuZBQEBfyMAQUBqIgQkACAEIAA2AjggBCABNwMwIAQgAjYCLCAEIAM2AiggBEHIABAYIgA2AiQCQCAARQRAIARBADYCPAwBCyAEKAIkQgA3AzggBCgCJEIANwMYIAQoAiRCADcDMCAEKAIkQQA2AgAgBCgCJEEANgIEIAQoAiRCADcDCCAEKAIkQgA3AxAgBCgCJEEANgIoIAQoAiRCADcDIAJAIAQpAzBQBEBBCBAYIQAgBCgCJCAANgIEIABFBEAgBCgCJBAVIAQoAihBDkEAEBQgBEEANgI8DAMLIAQoAiQoAgRCADcDAAwBCyAEKAIkIAQpAzBBABDCAUEBcUUEQCAEKAIoQQ5BABAUIAQoAiQQMiAEQQA2AjwMAgsgBEIANwMIIARCADcDGCAEQgA3AxADQCAEKQMYIAQpAzBUBEAgBCgCOCAEKQMYp0EEdGopAwhQRQRAIAQoAjggBCkDGKdBBHRqKAIARQRAIAQoAihBEkEAEBQgBCgCJBAyIARBADYCPAwFCyAEKAIkKAIAIAQpAxCnQQR0aiAEKAI4IAQpAxinQQR0aigCADYCACAEKAIkKAIAIAQpAxCnQQR0aiAEKAI4IAQpAxinQQR0aikDCDcDCCAEKAIkKAIEIAQpAxinQQN0aiAEKQMINwMAIAQgBCgCOCAEKQMYp0EEdGopAwggBCkDCHw3AwggBCAEKQMQQgF8NwMQCyAEIAQpAxhCAXw3AxgMAQsLIAQoAiQgBCkDEDcDCCAEKAIkIAQoAiwEfkIABSAEKAIkKQMICzcDGCAEKAIkKAIEIAQoAiQpAwinQQN0aiAEKQMINwMAIAQoAiQgBCkDCDcDMAsgBCAEKAIkNgI8CyAEKAI8IQAgBEFAayQAIAALngEBAX8jAEEgayIEJAAgBCAANgIYIAQgATcDECAEIAI2AgwgBCADNgIIIAQgBCgCGCAEKQMQIAQoAgwgBCgCCBA/IgA2AgQCQCAARQRAIARBADYCHAwBCyAEIAQoAgQoAjBBACAEKAIMIAQoAggQRiIANgIAIABFBEAgBEEANgIcDAELIAQgBCgCADYCHAsgBCgCHCEAIARBIGokACAAC5wIAQt/IABFBEAgARAYDwsgAUFATwRAQbSbAUEwNgIAQQAPCwJ/QRAgAUELakF4cSABQQtJGyEGIABBCGsiBSgCBCIJQXhxIQQCQCAJQQNxRQRAQQAgBkGAAkkNAhogBkEEaiAETQRAIAUhAiAEIAZrQcSfASgCAEEBdE0NAgtBAAwCCyAEIAVqIQcCQCAEIAZPBEAgBCAGayIDQRBJDQEgBSAJQQFxIAZyQQJyNgIEIAUgBmoiAiADQQNyNgIEIAcgBygCBEEBcjYCBCACIAMQxgEMAQsgB0H8mwEoAgBGBEBB8JsBKAIAIARqIgQgBk0NAiAFIAlBAXEgBnJBAnI2AgQgBSAGaiIDIAQgBmsiAkEBcjYCBEHwmwEgAjYCAEH8mwEgAzYCAAwBCyAHQfibASgCAEYEQEHsmwEoAgAgBGoiAyAGSQ0CAkAgAyAGayICQRBPBEAgBSAJQQFxIAZyQQJyNgIEIAUgBmoiBCACQQFyNgIEIAMgBWoiAyACNgIAIAMgAygCBEF+cTYCBAwBCyAFIAlBAXEgA3JBAnI2AgQgAyAFaiICIAIoAgRBAXI2AgRBACECQQAhBAtB+JsBIAQ2AgBB7JsBIAI2AgAMAQsgBygCBCIDQQJxDQEgA0F4cSAEaiIKIAZJDQEgCiAGayEMAkAgA0H/AU0EQCAHKAIIIgQgA0EDdiICQQN0QYycAWpGGiAEIAcoAgwiA0YEQEHkmwFB5JsBKAIAQX4gAndxNgIADAILIAQgAzYCDCADIAQ2AggMAQsgBygCGCELAkAgByAHKAIMIghHBEAgBygCCCICQfSbASgCAEkaIAIgCDYCDCAIIAI2AggMAQsCQCAHQRRqIgQoAgAiAg0AIAdBEGoiBCgCACICDQBBACEIDAELA0AgBCEDIAIiCEEUaiIEKAIAIgINACAIQRBqIQQgCCgCECICDQALIANBADYCAAsgC0UNAAJAIAcgBygCHCIDQQJ0QZSeAWoiAigCAEYEQCACIAg2AgAgCA0BQeibAUHomwEoAgBBfiADd3E2AgAMAgsgC0EQQRQgCygCECAHRhtqIAg2AgAgCEUNAQsgCCALNgIYIAcoAhAiAgRAIAggAjYCECACIAg2AhgLIAcoAhQiAkUNACAIIAI2AhQgAiAINgIYCyAMQQ9NBEAgBSAJQQFxIApyQQJyNgIEIAUgCmoiAiACKAIEQQFyNgIEDAELIAUgCUEBcSAGckECcjYCBCAFIAZqIgMgDEEDcjYCBCAFIApqIgIgAigCBEEBcjYCBCADIAwQxgELIAUhAgsgAgsiAgRAIAJBCGoPCyABEBgiBUUEQEEADwsgBSAAQXxBeCAAQQRrKAIAIgJBA3EbIAJBeHFqIgIgASABIAJLGxAZGiAAEBUgBQtDAQN/AkAgAkUNAANAIAAtAAAiBCABLQAAIgVGBEAgAUEBaiEBIABBAWohACACQQFrIgINAQwCCwsgBCAFayEDCyADC4wDAQF/IwBBIGsiBCQAIAQgADYCGCAEIAE7ARYgBCACNgIQIAQgAzYCDAJAIAQvARZFBEAgBEEANgIcDAELAkACQAJAAkAgBCgCEEGAMHEiAARAIABBgBBGDQEgAEGAIEYNAgwDCyAEQQA2AgQMAwsgBEECNgIEDAILIARBBDYCBAwBCyAEKAIMQRJBABAUIARBADYCHAwBCyAEQRQQGCIANgIIIABFBEAgBCgCDEEOQQAQFCAEQQA2AhwMAQsgBC8BFkEBahAYIQAgBCgCCCAANgIAIABFBEAgBCgCCBAVIARBADYCHAwBCyAEKAIIKAIAIAQoAhggBC8BFhAZGiAEKAIIKAIAIAQvARZqQQA6AAAgBCgCCCAELwEWOwEEIAQoAghBADYCCCAEKAIIQQA2AgwgBCgCCEEANgIQIAQoAgQEQCAEKAIIIAQoAgQQOkEFRgRAIAQoAggQJCAEKAIMQRJBABAUIARBADYCHAwCCwsgBCAEKAIINgIcCyAEKAIcIQAgBEEgaiQAIAALNwEBfyMAQRBrIgEgADYCCAJAIAEoAghFBEAgAUEAOwEODAELIAEgASgCCC8BBDsBDgsgAS8BDguJAgEBfyMAQRBrIgEkACABIAA2AgwCQCABKAIMLQAFQQFxBEAgASgCDCgCAEECcUUNAQsgASgCDCgCMBAkIAEoAgxBADYCMAsCQCABKAIMLQAFQQFxBEAgASgCDCgCAEEIcUUNAQsgASgCDCgCNBAjIAEoAgxBADYCNAsCQCABKAIMLQAFQQFxBEAgASgCDCgCAEEEcUUNAQsgASgCDCgCOBAkIAEoAgxBADYCOAsCQCABKAIMLQAFQQFxBEAgASgCDCgCAEGAAXFFDQELIAEoAgwoAlQEQCABKAIMKAJUQQAgASgCDCgCVBAuEDMLIAEoAgwoAlQQFSABKAIMQQA2AlQLIAFBEGokAAvxAQEBfyMAQRBrIgEgADYCDCABKAIMQQA2AgAgASgCDEEAOgAEIAEoAgxBADoABSABKAIMQQE6AAYgASgCDEG/BjsBCCABKAIMQQo7AQogASgCDEEAOwEMIAEoAgxBfzYCECABKAIMQQA2AhQgASgCDEEANgIYIAEoAgxCADcDICABKAIMQgA3AyggASgCDEEANgIwIAEoAgxBADYCNCABKAIMQQA2AjggASgCDEEANgI8IAEoAgxBADsBQCABKAIMQYCA2I14NgJEIAEoAgxCADcDSCABKAIMQQA7AVAgASgCDEEAOwFSIAEoAgxBADYCVAvSEwEBfyMAQbABayIDJAAgAyAANgKoASADIAE2AqQBIAMgAjYCoAEgA0EANgKQASADIAMoAqQBKAIwQQAQOjYClAEgAyADKAKkASgCOEEAEDo2ApgBAkACQAJAAkAgAygClAFBAkYEQCADKAKYAUEBRg0BCyADKAKUAUEBRgRAIAMoApgBQQJGDQELIAMoApQBQQJHDQEgAygCmAFBAkcNAQsgAygCpAEiACAALwEMQYAQcjsBDAwBCyADKAKkASIAIAAvAQxB/+8DcTsBDCADKAKUAUECRgRAIANB9eABIAMoAqQBKAIwIAMoAqgBQQhqEI4BNgKQASADKAKQAUUEQCADQX82AqwBDAMLCwJAIAMoAqABQYACcQ0AIAMoApgBQQJHDQAgA0H1xgEgAygCpAEoAjggAygCqAFBCGoQjgE2AkggAygCSEUEQCADKAKQARAjIANBfzYCrAEMAwsgAygCSCADKAKQATYCACADIAMoAkg2ApABCwsCQCADKAKkAS8BUkUEQCADKAKkASIAIAAvAQxB/v8DcTsBDAwBCyADKAKkASIAIAAvAQxBAXI7AQwLIAMgAygCpAEgAygCoAEQZUEBcToAhgEgAyADKAKgAUGACnFBgApHBH8gAy0AhgEFQQELQQFxOgCHASADAn9BASADKAKkAS8BUkGBAkYNABpBASADKAKkAS8BUkGCAkYNABogAygCpAEvAVJBgwJGC0EBcToAhQEgAy0AhwFBAXEEQCADIANBIGpCHBApNgIcIAMoAhxFBEAgAygCqAFBCGpBDkEAEBQgAygCkAEQIyADQX82AqwBDAILAkAgAygCoAFBgAJxBEACQCADKAKgAUGACHENACADKAKkASkDIEL/////D1YNACADKAKkASkDKEL/////D1gNAgsgAygCHCADKAKkASkDKBAtIAMoAhwgAygCpAEpAyAQLQwBCwJAAkAgAygCoAFBgAhxDQAgAygCpAEpAyBC/////w9WDQAgAygCpAEpAyhC/////w9WDQAgAygCpAEpA0hC/////w9YDQELIAMoAqQBKQMoQv////8PWgRAIAMoAhwgAygCpAEpAygQLQsgAygCpAEpAyBC/////w9aBEAgAygCHCADKAKkASkDIBAtCyADKAKkASkDSEL/////D1oEQCADKAIcIAMoAqQBKQNIEC0LCwsCfyMAQRBrIgAgAygCHDYCDCAAKAIMLQAAQQFxRQsEQCADKAKoAUEIakEUQQAQFCADKAIcEBYgAygCkAEQIyADQX82AqwBDAILIANBAQJ/IwBBEGsiACADKAIcNgIMAn4gACgCDC0AAEEBcQRAIAAoAgwpAxAMAQtCAAunQf//A3ELIANBIGpBgAYQVTYCjAEgAygCHBAWIAMoAowBIAMoApABNgIAIAMgAygCjAE2ApABCyADLQCFAUEBcQRAIAMgA0EVakIHECk2AhAgAygCEEUEQCADKAKoAUEIakEOQQAQFCADKAKQARAjIANBfzYCrAEMAgsgAygCEEECEB8gAygCEEG9EkECEEEgAygCECADKAKkAS8BUkH/AXEQlgEgAygCECADKAKkASgCEEH//wNxEB8CfyMAQRBrIgAgAygCEDYCDCAAKAIMLQAAQQFxRQsEQCADKAKoAUEIakEUQQAQFCADKAIQEBYgAygCkAEQIyADQX82AqwBDAILIANBgbICQQcgA0EVakGABhBVNgIMIAMoAhAQFiADKAIMIAMoApABNgIAIAMgAygCDDYCkAELIAMgA0HQAGpCLhApIgA2AkwgAEUEQCADKAKoAUEIakEOQQAQFCADKAKQARAjIANBfzYCrAEMAQsgAygCTEHxEkH2EiADKAKgAUGAAnEbQQQQQSADKAKgAUGAAnFFBEAgAygCTCADLQCGAUEBcQR/QS0FIAMoAqQBLwEIC0H//wNxEB8LIAMoAkwgAy0AhgFBAXEEf0EtBSADKAKkAS8BCgtB//8DcRAfIAMoAkwgAygCpAEvAQwQHwJAIAMtAIUBQQFxBEAgAygCTEHjABAfDAELIAMoAkwgAygCpAEoAhBB//8DcRAfCyADKAKkASgCFCADQZ4BaiADQZwBahCNASADKAJMIAMvAZ4BEB8gAygCTCADLwGcARAfAkACQCADLQCFAUEBcUUNACADKAKkASkDKEIUWg0AIAMoAkxBABAhDAELIAMoAkwgAygCpAEoAhgQIQsCQAJAIAMoAqABQYACcUGAAkcNACADKAKkASkDIEL/////D1QEQCADKAKkASkDKEL/////D1QNAQsgAygCTEF/ECEgAygCTEF/ECEMAQsCQCADKAKkASkDIEL/////D1QEQCADKAJMIAMoAqQBKQMgpxAhDAELIAMoAkxBfxAhCwJAIAMoAqQBKQMoQv////8PVARAIAMoAkwgAygCpAEpAyinECEMAQsgAygCTEF/ECELCyADKAJMIAMoAqQBKAIwEFFB//8DcRAfIAMgAygCpAEoAjQgAygCoAEQkgFB//8DcSADKAKQAUGABhCSAUH//wNxajYCiAEgAygCTCADKAKIAUH//wNxEB8gAygCoAFBgAJxRQRAIAMoAkwgAygCpAEoAjgQUUH//wNxEB8gAygCTCADKAKkASgCPEH//wNxEB8gAygCTCADKAKkAS8BQBAfIAMoAkwgAygCpAEoAkQQIQJAIAMoAqQBKQNIQv////8PVARAIAMoAkwgAygCpAEpA0inECEMAQsgAygCTEF/ECELCwJ/IwBBEGsiACADKAJMNgIMIAAoAgwtAABBAXFFCwRAIAMoAqgBQQhqQRRBABAUIAMoAkwQFiADKAKQARAjIANBfzYCrAEMAQsgAygCqAEgA0HQAGoCfiMAQRBrIgAgAygCTDYCDAJ+IAAoAgwtAABBAXEEQCAAKAIMKQMQDAELQgALCxA2QQBIBEAgAygCTBAWIAMoApABECMgA0F/NgKsAQwBCyADKAJMEBYgAygCpAEoAjAEQCADKAKoASADKAKkASgCMBCFAUEASARAIAMoApABECMgA0F/NgKsAQwCCwsgAygCkAEEQCADKAKoASADKAKQAUGABhCRAUEASARAIAMoApABECMgA0F/NgKsAQwCCwsgAygCkAEQIyADKAKkASgCNARAIAMoAqgBIAMoAqQBKAI0IAMoAqABEJEBQQBIBEAgA0F/NgKsAQwCCwsgAygCoAFBgAJxRQRAIAMoAqQBKAI4BEAgAygCqAEgAygCpAEoAjgQhQFBAEgEQCADQX82AqwBDAMLCwsgAyADLQCHAUEBcTYCrAELIAMoAqwBIQAgA0GwAWokACAAC+ACAQF/IwBBIGsiBCQAIAQgADsBGiAEIAE7ARggBCACNgIUIAQgAzYCECAEQRAQGCIANgIMAkAgAEUEQCAEQQA2AhwMAQsgBCgCDEEANgIAIAQoAgwgBCgCEDYCBCAEKAIMIAQvARo7AQggBCgCDCAELwEYOwEKAkAgBC8BGARAIAQoAhQhASAELwEYIQIjAEEgayIAJAAgACABNgIYIAAgAjYCFCAAQQA2AhACQCAAKAIURQRAIABBADYCHAwBCyAAIAAoAhQQGDYCDCAAKAIMRQRAIAAoAhBBDkEAEBQgAEEANgIcDAELIAAoAgwgACgCGCAAKAIUEBkaIAAgACgCDDYCHAsgACgCHCEBIABBIGokACABIQAgBCgCDCAANgIMIABFBEAgBCgCDBAVIARBADYCHAwDCwwBCyAEKAIMQQA2AgwLIAQgBCgCDDYCHAsgBCgCHCEAIARBIGokACAAC5EBAQV/IAAoAkxBAE4hAyAAKAIAQQFxIgRFBEAgACgCNCIBBEAgASAAKAI4NgI4CyAAKAI4IgIEQCACIAE2AjQLIABBrKABKAIARgRAQaygASACNgIACwsgABClASEBIAAgACgCDBEAACECIAAoAmAiBQRAIAUQFQsCQCAERQRAIAAQFQwBCyADRQ0ACyABIAJyC/kBAQF/IwBBIGsiAiQAIAIgADYCHCACIAE5AxACQCACKAIcRQ0AIAICfAJ8IAIrAxBEAAAAAAAAAABkBEAgAisDEAwBC0QAAAAAAAAAAAtEAAAAAAAA8D9jBEACfCACKwMQRAAAAAAAAAAAZARAIAIrAxAMAQtEAAAAAAAAAAALDAELRAAAAAAAAPA/CyACKAIcKwMoIAIoAhwrAyChoiACKAIcKwMgoDkDCCACKAIcKwMQIAIrAwggAigCHCsDGKFjRQ0AIAIoAhwoAgAgAisDCCACKAIcKAIMIAIoAhwoAgQRFgAgAigCHCACKwMIOQMYCyACQSBqJAAL4QUCAn8BfiMAQTBrIgQkACAEIAA2AiQgBCABNgIgIAQgAjYCHCAEIAM2AhgCQCAEKAIkRQRAIARCfzcDKAwBCyAEKAIgRQRAIAQoAhhBEkEAEBQgBEJ/NwMoDAELIAQoAhxBgyBxBEAgBEEVQRYgBCgCHEEBcRs2AhQgBEIANwMAA0AgBCkDACAEKAIkKQMwVARAIAQgBCgCJCAEKQMAIAQoAhwgBCgCGBBNNgIQIAQoAhAEQCAEKAIcQQJxBEAgBAJ/IAQoAhAiARAuQQFqIQADQEEAIABFDQEaIAEgAEEBayIAaiICLQAAQS9HDQALIAILNgIMIAQoAgwEQCAEIAQoAgxBAWo2AhALCyAEKAIgIAQoAhAgBCgCFBEDAEUEQCMAQRBrIgAgBCgCGDYCDCAAKAIMBEAgACgCDEEANgIAIAAoAgxBADYCBAsgBCAEKQMANwMoDAULCyAEIAQpAwBCAXw3AwAMAQsLIAQoAhhBCUEAEBQgBEJ/NwMoDAELIAQoAiQoAlAhASAEKAIgIQIgBCgCHCEDIAQoAhghBSMAQTBrIgAkACAAIAE2AiQgACACNgIgIAAgAzYCHCAAIAU2AhgCQAJAIAAoAiQEQCAAKAIgDQELIAAoAhhBEkEAEBQgAEJ/NwMoDAELIAAoAiQpAwhCAFIEQCAAIAAoAiAQczYCFCAAIAAoAhQgACgCJCgCAHA2AhAgACAAKAIkKAIQIAAoAhBBAnRqKAIANgIMA0ACQCAAKAIMRQ0AIAAoAiAgACgCDCgCABBbBEAgACAAKAIMKAIYNgIMDAIFIAAoAhxBCHEEQCAAKAIMKQMIQn9SBEAgACAAKAIMKQMINwMoDAYLDAILIAAoAgwpAxBCf1IEQCAAIAAoAgwpAxA3AygMBQsLCwsLIAAoAhhBCUEAEBQgAEJ/NwMoCyAAKQMoIQYgAEEwaiQAIAQgBjcDKAsgBCkDKCEGIARBMGokACAGC9QDAQF/IwBBIGsiAyQAIAMgADYCGCADIAE2AhQgAyACNgIQAkACQCADKAIYBEAgAygCFA0BCyADKAIQQRJBABAUIANBADoAHwwBCyADKAIYKQMIQgBSBEAgAyADKAIUEHM2AgwgAyADKAIMIAMoAhgoAgBwNgIIIANBADYCACADIAMoAhgoAhAgAygCCEECdGooAgA2AgQDQCADKAIEBEACQCADKAIEKAIcIAMoAgxHDQAgAygCFCADKAIEKAIAEFsNAAJAIAMoAgQpAwhCf1EEQAJAIAMoAgAEQCADKAIAIAMoAgQoAhg2AhgMAQsgAygCGCgCECADKAIIQQJ0aiADKAIEKAIYNgIACyADKAIEEBUgAygCGCIAIAApAwhCAX03AwgCQCADKAIYIgApAwi6IAAoAgC4RHsUrkfheoQ/omNFDQAgAygCGCgCAEGAAk0NACADKAIYIAMoAhgoAgBBAXYgAygCEBBaQQFxRQRAIANBADoAHwwICwsMAQsgAygCBEJ/NwMQCyADQQE6AB8MBAsgAyADKAIENgIAIAMgAygCBCgCGDYCBAwBCwsLIAMoAhBBCUEAEBQgA0EAOgAfCyADLQAfQQFxIQAgA0EgaiQAIAAL3wIBAX8jAEEwayIDJAAgAyAANgIoIAMgATYCJCADIAI2AiACQCADKAIkIAMoAigoAgBGBEAgA0EBOgAvDAELIAMgAygCJEEEEH8iADYCHCAARQRAIAMoAiBBDkEAEBQgA0EAOgAvDAELIAMoAigpAwhCAFIEQCADQQA2AhgDQCADKAIYIAMoAigoAgBPRQRAIAMgAygCKCgCECADKAIYQQJ0aigCADYCFANAIAMoAhQEQCADIAMoAhQoAhg2AhAgAyADKAIUKAIcIAMoAiRwNgIMIAMoAhQgAygCHCADKAIMQQJ0aigCADYCGCADKAIcIAMoAgxBAnRqIAMoAhQ2AgAgAyADKAIQNgIUDAELCyADIAMoAhhBAWo2AhgMAQsLCyADKAIoKAIQEBUgAygCKCADKAIcNgIQIAMoAiggAygCJDYCACADQQE6AC8LIAMtAC9BAXEhACADQTBqJAAgAAtNAQJ/IAEtAAAhAgJAIAAtAAAiA0UNACACIANHDQADQCABLQABIQIgAC0AASIDRQ0BIAFBAWohASAAQQFqIQAgAiADRg0ACwsgAyACawvRCQECfyMAQSBrIgEkACABIAA2AhwgASABKAIcKAIsNgIQA0AgASABKAIcKAI8IAEoAhwoAnRrIAEoAhwoAmxrNgIUIAEoAhwoAmwgASgCECABKAIcKAIsQYYCa2pPBEAgASgCHCgCOCABKAIcKAI4IAEoAhBqIAEoAhAgASgCFGsQGRogASgCHCIAIAAoAnAgASgCEGs2AnAgASgCHCIAIAAoAmwgASgCEGs2AmwgASgCHCIAIAAoAlwgASgCEGs2AlwjAEEgayIAIAEoAhw2AhwgACAAKAIcKAIsNgIMIAAgACgCHCgCTDYCGCAAIAAoAhwoAkQgACgCGEEBdGo2AhADQCAAIAAoAhBBAmsiAjYCECAAIAIvAQA2AhQgACgCEAJ/IAAoAhQgACgCDE8EQCAAKAIUIAAoAgxrDAELQQALOwEAIAAgACgCGEEBayICNgIYIAINAAsgACAAKAIMNgIYIAAgACgCHCgCQCAAKAIYQQF0ajYCEANAIAAgACgCEEECayICNgIQIAAgAi8BADYCFCAAKAIQAn8gACgCFCAAKAIMTwRAIAAoAhQgACgCDGsMAQtBAAs7AQAgACAAKAIYQQFrIgI2AhggAg0ACyABIAEoAhAgASgCFGo2AhQLIAEoAhwoAgAoAgQEQCABIAEoAhwoAgAgASgCHCgCdCABKAIcKAI4IAEoAhwoAmxqaiABKAIUEHY2AhggASgCHCIAIAEoAhggACgCdGo2AnQgASgCHCgCdCABKAIcKAK0LWpBA08EQCABIAEoAhwoAmwgASgCHCgCtC1rNgIMIAEoAhwgASgCHCgCOCABKAIMai0AADYCSCABKAIcIAEoAhwoAlQgASgCHCgCOCABKAIMQQFqai0AACABKAIcKAJIIAEoAhwoAlh0c3E2AkgDQCABKAIcKAK0LQRAIAEoAhwgASgCHCgCVCABKAIcKAI4IAEoAgxBAmpqLQAAIAEoAhwoAkggASgCHCgCWHRzcTYCSCABKAIcKAJAIAEoAgwgASgCHCgCNHFBAXRqIAEoAhwoAkQgASgCHCgCSEEBdGovAQA7AQAgASgCHCgCRCABKAIcKAJIQQF0aiABKAIMOwEAIAEgASgCDEEBajYCDCABKAIcIgAgACgCtC1BAWs2ArQtIAEoAhwoAnQgASgCHCgCtC1qQQNPDQELCwsgASgCHCgCdEGGAkkEfyABKAIcKAIAKAIEQQBHBUEAC0EBcQ0BCwsgASgCHCgCwC0gASgCHCgCPEkEQCABIAEoAhwoAmwgASgCHCgCdGo2AggCQCABKAIcKALALSABKAIISQRAIAEgASgCHCgCPCABKAIIazYCBCABKAIEQYICSwRAIAFBggI2AgQLIAEoAhwoAjggASgCCGpBACABKAIEEDMgASgCHCABKAIIIAEoAgRqNgLALQwBCyABKAIcKALALSABKAIIQYICakkEQCABIAEoAghBggJqIAEoAhwoAsAtazYCBCABKAIEIAEoAhwoAjwgASgCHCgCwC1rSwRAIAEgASgCHCgCPCABKAIcKALALWs2AgQLIAEoAhwoAjggASgCHCgCwC1qQQAgASgCBBAzIAEoAhwiACABKAIEIAAoAsAtajYCwC0LCwsgAUEgaiQAC4YFAQF/IwBBIGsiBCQAIAQgADYCHCAEIAE2AhggBCACNgIUIAQgAzYCECAEQQM2AgwCQCAEKAIcKAK8LUEQIAQoAgxrSgRAIAQgBCgCEDYCCCAEKAIcIgAgAC8BuC0gBCgCCEH//wNxIAQoAhwoArwtdHI7AbgtIAQoAhwvAbgtQf8BcSEBIAQoAhwoAgghAiAEKAIcIgMoAhQhACADIABBAWo2AhQgACACaiABOgAAIAQoAhwvAbgtQQh2IQEgBCgCHCgCCCECIAQoAhwiAygCFCEAIAMgAEEBajYCFCAAIAJqIAE6AAAgBCgCHCAEKAIIQf//A3FBECAEKAIcKAK8LWt1OwG4LSAEKAIcIgAgACgCvC0gBCgCDEEQa2o2ArwtDAELIAQoAhwiACAALwG4LSAEKAIQQf//A3EgBCgCHCgCvC10cjsBuC0gBCgCHCIAIAQoAgwgACgCvC1qNgK8LQsgBCgCHBC9ASAEKAIUQf8BcSEBIAQoAhwoAgghAiAEKAIcIgMoAhQhACADIABBAWo2AhQgACACaiABOgAAIAQoAhRB//8DcUEIdiEBIAQoAhwoAgghAiAEKAIcIgMoAhQhACADIABBAWo2AhQgACACaiABOgAAIAQoAhRBf3NB/wFxIQEgBCgCHCgCCCECIAQoAhwiAygCFCEAIAMgAEEBajYCFCAAIAJqIAE6AAAgBCgCFEF/c0H//wNxQQh2IQEgBCgCHCgCCCECIAQoAhwiAygCFCEAIAMgAEEBajYCFCAAIAJqIAE6AAAgBCgCHCgCCCAEKAIcKAIUaiAEKAIYIAQoAhQQGRogBCgCHCIAIAQoAhQgACgCFGo2AhQgBEEgaiQAC6sBAQF/IwBBEGsiASQAIAEgADYCDCABKAIMKAIIBEAgASgCDCgCCBAbIAEoAgxBADYCCAsCQCABKAIMKAIERQ0AIAEoAgwoAgQoAgBBAXFFDQAgASgCDCgCBCgCEEF+Rw0AIAEoAgwoAgQiACAAKAIAQX5xNgIAIAEoAgwoAgQoAgBFBEAgASgCDCgCBBA3IAEoAgxBADYCBAsLIAEoAgxBADoADCABQRBqJAAL8QMBAX8jAEHQAGsiCCQAIAggADYCSCAIIAE3A0AgCCACNwM4IAggAzYCNCAIIAQ6ADMgCCAFNgIsIAggBjcDICAIIAc2AhwCQAJAAkAgCCgCSEUNACAIKQNAIAgpA0AgCCkDOHxWDQAgCCgCLA0BIAgpAyBQDQELIAgoAhxBEkEAEBQgCEEANgJMDAELIAhBgAEQGCIANgIYIABFBEAgCCgCHEEOQQAQFCAIQQA2AkwMAQsgCCgCGCAIKQNANwMAIAgoAhggCCkDQCAIKQM4fDcDCCAIKAIYQShqEDsgCCgCGCAILQAzOgBgIAgoAhggCCgCLDYCECAIKAIYIAgpAyA3AxgjAEEQayIAIAgoAhhB5ABqNgIMIAAoAgxBADYCACAAKAIMQQA2AgQgACgCDEEANgIIIwBBEGsiACAIKAJINgIMIAAoAgwpAxhC/4EBgyEBIAhBfzYCCCAIQQc2AgQgCEEONgIAQRAgCBA0IAGEIQEgCCgCGCABNwNwIAgoAhggCCgCGCkDcELAAINCAFI6AHggCCgCNARAIAgoAhhBKGogCCgCNCAIKAIcEIQBQQBIBEAgCCgCGBAVIAhBADYCTAwCCwsgCCAIKAJIQQEgCCgCGCAIKAIcEIEBNgJMCyAIKAJMIQAgCEHQAGokACAAC9MEAQJ/IwBBMGsiAyQAIAMgADYCJCADIAE3AxggAyACNgIUAkAgAygCJCgCQCADKQMYp0EEdGooAgBFBEAgAygCFEEUQQAQFCADQgA3AygMAQsgAyADKAIkKAJAIAMpAxinQQR0aigCACkDSDcDCCADKAIkKAIAIAMpAwhBABAnQQBIBEAgAygCFCADKAIkKAIAEBcgA0IANwMoDAELIAMoAiQoAgAhAiADKAIUIQQjAEEwayIAJAAgACACNgIoIABBgAI7ASYgACAENgIgIAAgAC8BJkGAAnFBAEc6ABsgAEEeQS4gAC0AG0EBcRs2AhwCQCAAKAIoQRpBHCAALQAbQQFxG6xBARAnQQBIBEAgACgCICAAKAIoEBcgAEF/NgIsDAELIAAgACgCKEEEQQYgAC0AG0EBcRusIABBDmogACgCIBBCIgI2AgggAkUEQCAAQX82AiwMAQsgAEEANgIUA0AgACgCFEECQQMgAC0AG0EBcRtIBEAgACAAKAIIEB1B//8DcSAAKAIcajYCHCAAIAAoAhRBAWo2AhQMAQsLIAAoAggQR0EBcUUEQCAAKAIgQRRBABAUIAAoAggQFiAAQX82AiwMAQsgACgCCBAWIAAgACgCHDYCLAsgACgCLCECIABBMGokACADIAIiADYCBCAAQQBIBEAgA0IANwMoDAELIAMpAwggAygCBK18Qv///////////wBWBEAgAygCFEEEQRYQFCADQgA3AygMAQsgAyADKQMIIAMoAgStfDcDKAsgAykDKCEBIANBMGokACABC20BAX8jAEEgayIEJAAgBCAANgIYIAQgATYCFCAEIAI2AhAgBCADNgIMAkAgBCgCGEUEQCAEQQA2AhwMAQsgBCAEKAIUIAQoAhAgBCgCDCAEKAIYQQhqEIEBNgIcCyAEKAIcIQAgBEEgaiQAIAALVQEBfyMAQRBrIgEkACABIAA2AgwCQAJAIAEoAgwoAiRBAUYNACABKAIMKAIkQQJGDQAMAQsgASgCDEEAQgBBChAgGiABKAIMQQA2AiQLIAFBEGokAAv/AgEBfyMAQTBrIgUkACAFIAA2AiggBSABNgIkIAUgAjYCICAFIAM6AB8gBSAENgIYAkACQCAFKAIgDQAgBS0AH0EBcQ0AIAVBADYCLAwBCyAFIAUoAiAgBS0AH0EBcWoQGDYCFCAFKAIURQRAIAUoAhhBDkEAEBQgBUEANgIsDAELAkAgBSgCKARAIAUgBSgCKCAFKAIgrRAeNgIQIAUoAhBFBEAgBSgCGEEOQQAQFCAFKAIUEBUgBUEANgIsDAMLIAUoAhQgBSgCECAFKAIgEBkaDAELIAUoAiQgBSgCFCAFKAIgrSAFKAIYEGRBAEgEQCAFKAIUEBUgBUEANgIsDAILCyAFLQAfQQFxBEAgBSgCFCAFKAIgakEAOgAAIAUgBSgCFDYCDANAIAUoAgwgBSgCFCAFKAIgakkEQCAFKAIMLQAARQRAIAUoAgxBIDoAAAsgBSAFKAIMQQFqNgIMDAELCwsgBSAFKAIUNgIsCyAFKAIsIQAgBUEwaiQAIAALwgEBAX8jAEEwayIEJAAgBCAANgIoIAQgATYCJCAEIAI3AxggBCADNgIUAkAgBCkDGEL///////////8AVgRAIAQoAhRBFEEAEBQgBEF/NgIsDAELIAQgBCgCKCAEKAIkIAQpAxgQKyICNwMIIAJCAFMEQCAEKAIUIAQoAigQFyAEQX82AiwMAQsgBCkDCCAEKQMYUwRAIAQoAhRBEUEAEBQgBEF/NgIsDAELIARBADYCLAsgBCgCLCEAIARBMGokACAAC3cBAX8jAEEQayICIAA2AgggAiABNgIEAkACQAJAIAIoAggpAyhC/////w9aDQAgAigCCCkDIEL/////D1oNACACKAIEQYAEcUUNASACKAIIKQNIQv////8PVA0BCyACQQE6AA8MAQsgAkEAOgAPCyACLQAPQQFxC/4BAQF/IwBBIGsiBSQAIAUgADYCGCAFIAE2AhQgBSACOwESIAVBADsBECAFIAM2AgwgBSAENgIIIAVBADYCBAJAA0AgBSgCGARAAkAgBSgCGC8BCCAFLwESRw0AIAUoAhgoAgQgBSgCDHFBgAZxRQ0AIAUoAgQgBS8BEEgEQCAFIAUoAgRBAWo2AgQMAQsgBSgCFARAIAUoAhQgBSgCGC8BCjsBAAsgBSgCGC8BCgRAIAUgBSgCGCgCDDYCHAwECyAFQZAVNgIcDAMLIAUgBSgCGCgCADYCGAwBCwsgBSgCCEEJQQAQFCAFQQA2AhwLIAUoAhwhACAFQSBqJAAgAAumAQEBfyMAQRBrIgIkACACIAA2AgggAiABNgIEAkAgAigCCC0AKEEBcQRAIAJBfzYCDAwBCyACKAIIKAIABEAgAigCCCgCACACKAIEEGdBAEgEQCACKAIIQQxqIAIoAggoAgAQFyACQX82AgwMAgsLIAIoAgggAkEEakIEQRMQIEIAUwRAIAJBfzYCDAwBCyACQQA2AgwLIAIoAgwhACACQRBqJAAgAAuNCAIBfwF+IwBBkAFrIgMkACADIAA2AoQBIAMgATYCgAEgAyACNgJ8IAMQUwJAIAMoAoABKQMIQgBSBEAgAyADKAKAASgCACgCACkDSDcDYCADIAMoAoABKAIAKAIAKQNINwNoDAELIANCADcDYCADQgA3A2gLIANCADcDcAJAA0AgAykDcCADKAKAASkDCFQEQCADKAKAASgCACADKQNwp0EEdGooAgApA0ggAykDaFQEQCADIAMoAoABKAIAIAMpA3CnQQR0aigCACkDSDcDaAsgAykDaCADKAKAASkDIFYEQCADKAJ8QRNBABAUIANCfzcDiAEMAwsgAyADKAKAASgCACADKQNwp0EEdGooAgApA0ggAygCgAEoAgAgAykDcKdBBHRqKAIAKQMgfCADKAKAASgCACADKQNwp0EEdGooAgAoAjAQUUH//wNxrXxCHnw3A1ggAykDWCADKQNgVgRAIAMgAykDWDcDYAsgAykDYCADKAKAASkDIFYEQCADKAJ8QRNBABAUIANCfzcDiAEMAwsgAygChAEoAgAgAygCgAEoAgAgAykDcKdBBHRqKAIAKQNIQQAQJ0EASARAIAMoAnwgAygChAEoAgAQFyADQn83A4gBDAMLIAMgAygChAEoAgBBAEEBIAMoAnwQjAFCf1EEQCADEFIgA0J/NwOIAQwDCwJ/IAMoAoABKAIAIAMpA3CnQQR0aigCACEBIwBBEGsiACQAIAAgATYCCCAAIAM2AgQCQAJAAkAgACgCCC8BCiAAKAIELwEKSA0AIAAoAggoAhAgACgCBCgCEEcNACAAKAIIKAIUIAAoAgQoAhRHDQAgACgCCCgCMCAAKAIEKAIwEIYBDQELIABBfzYCDAwBCwJAAkAgACgCCCgCGCAAKAIEKAIYRw0AIAAoAggpAyAgACgCBCkDIFINACAAKAIIKQMoIAAoAgQpAyhRDQELAkACQCAAKAIELwEMQQhxRQ0AIAAoAgQoAhgNACAAKAIEKQMgQgBSDQAgACgCBCkDKFANAQsgAEF/NgIMDAILCyAAQQA2AgwLIAAoAgwhASAAQRBqJAAgAQsEQCADKAJ8QRVBABAUIAMQUiADQn83A4gBDAMFIAMoAoABKAIAIAMpA3CnQQR0aigCACgCNCADKAI0EJUBIQAgAygCgAEoAgAgAykDcKdBBHRqKAIAIAA2AjQgAygCgAEoAgAgAykDcKdBBHRqKAIAQQE6AAQgA0EANgI0IAMQUiADIAMpA3BCAXw3A3AMAgsACwsgAwJ+IAMpA2AgAykDaH1C////////////AFQEQCADKQNgIAMpA2h9DAELQv///////////wALNwOIAQsgAykDiAEhBCADQZABaiQAIAQL1AQBAX8jAEEgayIDJAAgAyAANgIYIAMgATYCFCADIAI2AhAgAygCECEBIwBBEGsiACQAIAAgATYCCCAAQdgAEBg2AgQCQCAAKAIERQRAIAAoAghBDkEAEBQgAEEANgIMDAELIAAoAgghAiMAQRBrIgEkACABIAI2AgggAUEYEBgiAjYCBAJAIAJFBEAgASgCCEEOQQAQFCABQQA2AgwMAQsgASgCBEEANgIAIAEoAgRCADcDCCABKAIEQQA2AhAgASABKAIENgIMCyABKAIMIQIgAUEQaiQAIAAoAgQgAjYCUCACRQRAIAAoAgQQFSAAQQA2AgwMAQsgACgCBEEANgIAIAAoAgRBADYCBCMAQRBrIgEgACgCBEEIajYCDCABKAIMQQA2AgAgASgCDEEANgIEIAEoAgxBADYCCCAAKAIEQQA2AhggACgCBEEANgIUIAAoAgRBADYCHCAAKAIEQQA2AiQgACgCBEEANgIgIAAoAgRBADoAKCAAKAIEQgA3AzggACgCBEIANwMwIAAoAgRBADYCQCAAKAIEQQA2AkggACgCBEEANgJEIAAoAgRBADYCTCAAKAIEQQA2AlQgACAAKAIENgIMCyAAKAIMIQEgAEEQaiQAIAMgASIANgIMAkAgAEUEQCADQQA2AhwMAQsgAygCDCADKAIYNgIAIAMoAgwgAygCFDYCBCADKAIUQRBxBEAgAygCDCIAIAAoAhRBAnI2AhQgAygCDCIAIAAoAhhBAnI2AhgLIAMgAygCDDYCHAsgAygCHCEAIANBIGokACAAC9UBAQF/IwBBIGsiBCQAIAQgADYCGCAEIAE3AxAgBCACNgIMIAQgAzYCCAJAAkAgBCkDEEL///////////8AVwRAIAQpAxBCgICAgICAgICAf1kNAQsgBCgCCEEEQT0QFCAEQX82AhwMAQsCfyAEKQMQIQEgBCgCDCEAIAQoAhgiAigCTEF/TARAIAIgASAAEKABDAELIAIgASAAEKABC0EASARAIAQoAghBBEG0mwEoAgAQFCAEQX82AhwMAQsgBEEANgIcCyAEKAIcIQAgBEEgaiQAIAALJABBACAAEAUiACAAQRtGGyIABH9BtJsBIAA2AgBBAAVBAAsaC3ABAX8jAEEQayIDJAAgAwJ/IAFBwABxRQRAQQAgAUGAgIQCcUGAgIQCRw0BGgsgAyACQQRqNgIMIAIoAgALNgIAIAAgAUGAgAJyIAMQECIAQYFgTwRAQbSbAUEAIABrNgIAQX8hAAsgA0EQaiQAIAALMwEBfwJ/IAAQByIBQWFGBEAgABARIQELIAFBgWBPCwR/QbSbAUEAIAFrNgIAQX8FIAELC2kBAn8CQCAAKAIUIAAoAhxNDQAgAEEAQQAgACgCJBEBABogACgCFA0AQX8PCyAAKAIEIgEgACgCCCICSQRAIAAgASACa6xBASAAKAIoEQ8AGgsgAEEANgIcIABCADcDECAAQgA3AgRBAAvaAwEGfyMAQRBrIgUkACAFIAI2AgwjAEGgAWsiBCQAIARBCGpBkIcBQZABEBkaIAQgADYCNCAEIAA2AhwgBEF+IABrIgNB/////wcgA0H/////B0kbIgY2AjggBCAAIAZqIgA2AiQgBCAANgIYIARBCGohACMAQdABayIDJAAgAyACNgLMASADQaABakEAQSgQMyADIAMoAswBNgLIAQJAQQAgASADQcgBaiADQdAAaiADQaABahBwQQBIDQAgACgCTEEATiEHIAAoAgAhAiAALABKQQBMBEAgACACQV9xNgIACyACQSBxIQgCfyAAKAIwBEAgACABIANByAFqIANB0ABqIANBoAFqEHAMAQsgAEHQADYCMCAAIANB0ABqNgIQIAAgAzYCHCAAIAM2AhQgACgCLCECIAAgAzYCLCAAIAEgA0HIAWogA0HQAGogA0GgAWoQcCACRQ0AGiAAQQBBACAAKAIkEQEAGiAAQQA2AjAgACACNgIsIABBADYCHCAAQQA2AhAgACgCFBogAEEANgIUQQALGiAAIAAoAgAgCHI2AgAgB0UNAAsgA0HQAWokACAGBEAgBCgCHCIAIAAgBCgCGEZrQQA6AAALIARBoAFqJAAgBUEQaiQAC4wSAg9/AX4jAEHQAGsiBSQAIAUgATYCTCAFQTdqIRMgBUE4aiEQQQAhAQNAAkAgDUEASA0AQf////8HIA1rIAFIBEBBtJsBQT02AgBBfyENDAELIAEgDWohDQsgBSgCTCIHIQECQAJAAkACQAJAAkACQAJAIAUCfwJAIActAAAiBgRAA0ACQAJAIAZB/wFxIgZFBEAgASEGDAELIAZBJUcNASABIQYDQCABLQABQSVHDQEgBSABQQJqIgg2AkwgBkEBaiEGIAEtAAIhDiAIIQEgDkElRg0ACwsgBiAHayEBIAAEQCAAIAcgARAiCyABDQ0gBSgCTCEBIAUoAkwsAAFBMGtBCk8NAyABLQACQSRHDQMgASwAAUEwayEPQQEhESABQQNqDAQLIAUgAUEBaiIINgJMIAEtAAEhBiAIIQEMAAsACyANIQsgAA0IIBFFDQJBASEBA0AgBCABQQJ0aigCACIABEAgAyABQQN0aiAAIAIQqAFBASELIAFBAWoiAUEKRw0BDAoLC0EBIQsgAUEKTw0IA0AgBCABQQJ0aigCAA0IIAFBAWoiAUEKRw0ACwwIC0F/IQ8gAUEBagsiATYCTEEAIQgCQCABLAAAIgxBIGsiBkEfSw0AQQEgBnQiBkGJ0QRxRQ0AA0ACQCAFIAFBAWoiCDYCTCABLAABIgxBIGsiAUEgTw0AQQEgAXQiAUGJ0QRxRQ0AIAEgBnIhBiAIIQEMAQsLIAghASAGIQgLAkAgDEEqRgRAIAUCfwJAIAEsAAFBMGtBCk8NACAFKAJMIgEtAAJBJEcNACABLAABQQJ0IARqQcABa0EKNgIAIAEsAAFBA3QgA2pBgANrKAIAIQpBASERIAFBA2oMAQsgEQ0IQQAhEUEAIQogAARAIAIgAigCACIBQQRqNgIAIAEoAgAhCgsgBSgCTEEBagsiATYCTCAKQX9KDQFBACAKayEKIAhBgMAAciEIDAELIAVBzABqEKcBIgpBAEgNBiAFKAJMIQELQX8hCQJAIAEtAABBLkcNACABLQABQSpGBEACQCABLAACQTBrQQpPDQAgBSgCTCIBLQADQSRHDQAgASwAAkECdCAEakHAAWtBCjYCACABLAACQQN0IANqQYADaygCACEJIAUgAUEEaiIBNgJMDAILIBENByAABH8gAiACKAIAIgFBBGo2AgAgASgCAAVBAAshCSAFIAUoAkxBAmoiATYCTAwBCyAFIAFBAWo2AkwgBUHMAGoQpwEhCSAFKAJMIQELQQAhBgNAIAYhEkF/IQsgASwAAEHBAGtBOUsNByAFIAFBAWoiDDYCTCABLAAAIQYgDCEBIAYgEkE6bGpB74IBai0AACIGQQFrQQhJDQALIAZBE0YNAiAGRQ0GIA9BAE4EQCAEIA9BAnRqIAY2AgAgBSADIA9BA3RqKQMANwNADAQLIAANAQtBACELDAULIAVBQGsgBiACEKgBIAUoAkwhDAwCCyAPQX9KDQMLQQAhASAARQ0ECyAIQf//e3EiDiAIIAhBgMAAcRshBkEAIQtBpAghDyAQIQgCQAJAAkACfwJAAkACQAJAAn8CQAJAAkACQAJAAkACQCAMQQFrLAAAIgFBX3EgASABQQ9xQQNGGyABIBIbIgFB2ABrDiEEEhISEhISEhIOEg8GDg4OEgYSEhISAgUDEhIJEgESEgQACwJAIAFBwQBrDgcOEgsSDg4OAAsgAUHTAEYNCQwRCyAFKQNAIRRBpAgMBQtBACEBAkACQAJAAkACQAJAAkAgEkH/AXEOCAABAgMEFwUGFwsgBSgCQCANNgIADBYLIAUoAkAgDTYCAAwVCyAFKAJAIA2sNwMADBQLIAUoAkAgDTsBAAwTCyAFKAJAIA06AAAMEgsgBSgCQCANNgIADBELIAUoAkAgDaw3AwAMEAsgCUEIIAlBCEsbIQkgBkEIciEGQfgAIQELIBAhByABQSBxIQ4gBSkDQCIUUEUEQANAIAdBAWsiByAUp0EPcUGAhwFqLQAAIA5yOgAAIBRCD1YhDCAUQgSIIRQgDA0ACwsgBSkDQFANAyAGQQhxRQ0DIAFBBHZBpAhqIQ9BAiELDAMLIBAhASAFKQNAIhRQRQRAA0AgAUEBayIBIBSnQQdxQTByOgAAIBRCB1YhByAUQgOIIRQgBw0ACwsgASEHIAZBCHFFDQIgCSAQIAdrIgFBAWogASAJSBshCQwCCyAFKQNAIhRCf1cEQCAFQgAgFH0iFDcDQEEBIQtBpAgMAQsgBkGAEHEEQEEBIQtBpQgMAQtBpghBpAggBkEBcSILGwshDyAUIBAQRCEHCyAGQf//e3EgBiAJQX9KGyEGAkAgBSkDQCIUQgBSDQAgCQ0AQQAhCSAQIQcMCgsgCSAUUCAQIAdraiIBIAEgCUgbIQkMCQsgBSgCQCIBQdgSIAEbIgdBACAJEKsBIgEgByAJaiABGyEIIA4hBiABIAdrIAkgARshCQwICyAJBEAgBSgCQAwCC0EAIQEgAEEgIApBACAGECYMAgsgBUEANgIMIAUgBSkDQD4CCCAFIAVBCGo2AkBBfyEJIAVBCGoLIQhBACEBAkADQCAIKAIAIgdFDQECQCAFQQRqIAcQqgEiB0EASCIODQAgByAJIAFrSw0AIAhBBGohCCAJIAEgB2oiAUsNAQwCCwtBfyELIA4NBQsgAEEgIAogASAGECYgAUUEQEEAIQEMAQtBACEIIAUoAkAhDANAIAwoAgAiB0UNASAFQQRqIAcQqgEiByAIaiIIIAFKDQEgACAFQQRqIAcQIiAMQQRqIQwgASAISw0ACwsgAEEgIAogASAGQYDAAHMQJiAKIAEgASAKSBshAQwFCyAAIAUrA0AgCiAJIAYgAUEXERkAIQEMBAsgBSAFKQNAPAA3QQEhCSATIQcgDiEGDAILQX8hCwsgBUHQAGokACALDwsgAEEgIAsgCCAHayIOIAkgCSAOSBsiDGoiCCAKIAggCkobIgEgCCAGECYgACAPIAsQIiAAQTAgASAIIAZBgIAEcxAmIABBMCAMIA5BABAmIAAgByAOECIgAEEgIAEgCCAGQYDAAHMQJgwACwALkAIBA38CQCABIAIoAhAiBAR/IAQFQQAhBAJ/IAIgAi0ASiIDQQFrIANyOgBKIAIoAgAiA0EIcQRAIAIgA0EgcjYCAEF/DAELIAJCADcCBCACIAIoAiwiAzYCHCACIAM2AhQgAiADIAIoAjBqNgIQQQALDQEgAigCEAsgAigCFCIFa0sEQCACIAAgASACKAIkEQEADwsCfyACLABLQX9KBEAgASEEA0AgASAEIgNFDQIaIAAgA0EBayIEai0AAEEKRw0ACyACIAAgAyACKAIkEQEAIgQgA0kNAiAAIANqIQAgAigCFCEFIAEgA2sMAQsgAQshBCAFIAAgBBAZGiACIAIoAhQgBGo2AhQgASEECyAEC0gCAX8BfiMAQRBrIgMkACADIAA2AgwgAyABNgIIIAMgAjYCBCADKAIMIAMoAgggAygCBCADKAIMQQhqEFghBCADQRBqJAAgBAt3AQF/IwBBEGsiASAANgIIIAFChSo3AwACQCABKAIIRQRAIAFBADYCDAwBCwNAIAEoAggtAAAEQCABIAEoAggtAACtIAEpAwBCIX58Qv////8PgzcDACABIAEoAghBAWo2AggMAQsLIAEgASkDAD4CDAsgASgCDAuHBQEBfyMAQTBrIgUkACAFIAA2AiggBSABNgIkIAUgAjcDGCAFIAM2AhQgBSAENgIQAkACQAJAIAUoAihFDQAgBSgCJEUNACAFKQMYQv///////////wBYDQELIAUoAhBBEkEAEBQgBUEAOgAvDAELIAUoAigoAgBFBEAgBSgCKEGAAiAFKAIQEFpBAXFFBEAgBUEAOgAvDAILCyAFIAUoAiQQczYCDCAFIAUoAgwgBSgCKCgCAHA2AgggBSAFKAIoKAIQIAUoAghBAnRqKAIANgIEA0ACQCAFKAIERQ0AAkAgBSgCBCgCHCAFKAIMRw0AIAUoAiQgBSgCBCgCABBbDQACQAJAIAUoAhRBCHEEQCAFKAIEKQMIQn9SDQELIAUoAgQpAxBCf1ENAQsgBSgCEEEKQQAQFCAFQQA6AC8MBAsMAQsgBSAFKAIEKAIYNgIEDAELCyAFKAIERQRAIAVBIBAYIgA2AgQgAEUEQCAFKAIQQQ5BABAUIAVBADoALwwCCyAFKAIEIAUoAiQ2AgAgBSgCBCAFKAIoKAIQIAUoAghBAnRqKAIANgIYIAUoAigoAhAgBSgCCEECdGogBSgCBDYCACAFKAIEIAUoAgw2AhwgBSgCBEJ/NwMIIAUoAigiACAAKQMIQgF8NwMIAkAgBSgCKCIAKQMIuiAAKAIAuEQAAAAAAADoP6JkRQ0AIAUoAigoAgBBgICAgHhPDQAgBSgCKCAFKAIoKAIAQQF0IAUoAhAQWkEBcUUEQCAFQQA6AC8MAwsLCyAFKAIUQQhxBEAgBSgCBCAFKQMYNwMICyAFKAIEIAUpAxg3AxAgBUEBOgAvCyAFLQAvQQFxIQAgBUEwaiQAIAAL1BEBAX8jAEGwAWsiBiQAIAYgADYCqAEgBiABNgKkASAGIAI2AqABIAYgAzYCnAEgBiAENgKYASAGIAU2ApQBIAZBADYCkAEDQCAGKAKQAUEPS0UEQCAGQSBqIAYoApABQQF0akEAOwEAIAYgBigCkAFBAWo2ApABDAELCyAGQQA2AowBA0AgBigCjAEgBigCoAFPRQRAIAZBIGogBigCpAEgBigCjAFBAXRqLwEAQQF0aiIAIAAvAQBBAWo7AQAgBiAGKAKMAUEBajYCjAEMAQsLIAYgBigCmAEoAgA2AoABIAZBDzYChAEDQAJAIAYoAoQBQQFJDQAgBkEgaiAGKAKEAUEBdGovAQANACAGIAYoAoQBQQFrNgKEAQwBCwsgBigCgAEgBigChAFLBEAgBiAGKAKEATYCgAELAkAgBigChAFFBEAgBkHAADoAWCAGQQE6AFkgBkEAOwFaIAYoApwBIgEoAgAhACABIABBBGo2AgAgACAGQdgAaigBADYBACAGKAKcASIBKAIAIQAgASAAQQRqNgIAIAAgBkHYAGooAQA2AQAgBigCmAFBATYCACAGQQA2AqwBDAELIAZBATYCiAEDQAJAIAYoAogBIAYoAoQBTw0AIAZBIGogBigCiAFBAXRqLwEADQAgBiAGKAKIAUEBajYCiAEMAQsLIAYoAoABIAYoAogBSQRAIAYgBigCiAE2AoABCyAGQQE2AnQgBkEBNgKQAQNAIAYoApABQQ9NBEAgBiAGKAJ0QQF0NgJ0IAYgBigCdCAGQSBqIAYoApABQQF0ai8BAGs2AnQgBigCdEEASARAIAZBfzYCrAEMAwUgBiAGKAKQAUEBajYCkAEMAgsACwsCQCAGKAJ0QQBMDQAgBigCqAEEQCAGKAKEAUEBRg0BCyAGQX82AqwBDAELIAZBADsBAiAGQQE2ApABA0AgBigCkAFBD09FBEAgBigCkAFBAWpBAXQgBmogBigCkAFBAXQgBmovAQAgBkEgaiAGKAKQAUEBdGovAQBqOwEAIAYgBigCkAFBAWo2ApABDAELCyAGQQA2AowBA0AgBigCjAEgBigCoAFJBEAgBigCpAEgBigCjAFBAXRqLwEABEAgBigClAEhASAGKAKkASAGKAKMASICQQF0ai8BAEEBdCAGaiIDLwEAIQAgAyAAQQFqOwEAIABB//8DcUEBdCABaiACOwEACyAGIAYoAowBQQFqNgKMAQwBCwsCQAJAAkACQCAGKAKoAQ4CAAECCyAGIAYoApQBIgA2AkwgBiAANgJQIAZBFDYCSAwCCyAGQYDwADYCUCAGQcDwADYCTCAGQYECNgJIDAELIAZBgPEANgJQIAZBwPEANgJMIAZBADYCSAsgBkEANgJsIAZBADYCjAEgBiAGKAKIATYCkAEgBiAGKAKcASgCADYCVCAGIAYoAoABNgJ8IAZBADYCeCAGQX82AmAgBkEBIAYoAoABdDYCcCAGIAYoAnBBAWs2AlwCQAJAIAYoAqgBQQFGBEAgBigCcEHUBksNAQsgBigCqAFBAkcNASAGKAJwQdAETQ0BCyAGQQE2AqwBDAELA0AgBiAGKAKQASAGKAJ4azoAWQJAIAYoAkggBigClAEgBigCjAFBAXRqLwEAQQFqSwRAIAZBADoAWCAGIAYoApQBIAYoAowBQQF0ai8BADsBWgwBCwJAIAYoApQBIAYoAowBQQF0ai8BACAGKAJITwRAIAYgBigCTCAGKAKUASAGKAKMAUEBdGovAQAgBigCSGtBAXRqLwEAOgBYIAYgBigCUCAGKAKUASAGKAKMAUEBdGovAQAgBigCSGtBAXRqLwEAOwFaDAELIAZB4AA6AFggBkEAOwFaCwsgBkEBIAYoApABIAYoAnhrdDYCaCAGQQEgBigCfHQ2AmQgBiAGKAJkNgKIAQNAIAYgBigCZCAGKAJoazYCZCAGKAJUIAYoAmQgBigCbCAGKAJ4dmpBAnRqIAZB2ABqKAEANgEAIAYoAmQNAAsgBkEBIAYoApABQQFrdDYCaANAIAYoAmwgBigCaHEEQCAGIAYoAmhBAXY2AmgMAQsLAkAgBigCaARAIAYgBigCbCAGKAJoQQFrcTYCbCAGIAYoAmggBigCbGo2AmwMAQsgBkEANgJsCyAGIAYoAowBQQFqNgKMASAGQSBqIAYoApABQQF0aiIBLwEAQQFrIQAgASAAOwEAAkAgAEH//wNxRQRAIAYoApABIAYoAoQBRg0BIAYgBigCpAEgBigClAEgBigCjAFBAXRqLwEAQQF0ai8BADYCkAELAkAgBigCkAEgBigCgAFNDQAgBigCYCAGKAJsIAYoAlxxRg0AIAYoAnhFBEAgBiAGKAKAATYCeAsgBiAGKAJUIAYoAogBQQJ0ajYCVCAGIAYoApABIAYoAnhrNgJ8IAZBASAGKAJ8dDYCdANAAkAgBigChAEgBigCfCAGKAJ4ak0NACAGIAYoAnQgBkEgaiAGKAJ8IAYoAnhqQQF0ai8BAGs2AnQgBigCdEEATA0AIAYgBigCfEEBajYCfCAGIAYoAnRBAXQ2AnQMAQsLIAYgBigCcEEBIAYoAnx0ajYCcAJAAkAgBigCqAFBAUYEQCAGKAJwQdQGSw0BCyAGKAKoAUECRw0BIAYoAnBB0ARNDQELIAZBATYCrAEMBAsgBiAGKAJsIAYoAlxxNgJgIAYoApwBKAIAIAYoAmBBAnRqIAYoAnw6AAAgBigCnAEoAgAgBigCYEECdGogBigCgAE6AAEgBigCnAEoAgAgBigCYEECdGogBigCVCAGKAKcASgCAGtBAnU7AQILDAELCyAGKAJsBEAgBkHAADoAWCAGIAYoApABIAYoAnhrOgBZIAZBADsBWiAGKAJUIAYoAmxBAnRqIAZB2ABqKAEANgEACyAGKAKcASIAIAAoAgAgBigCcEECdGo2AgAgBigCmAEgBigCgAE2AgAgBkEANgKsAQsgBigCrAEhACAGQbABaiQAIAALsQIBAX8jAEEgayIDJAAgAyAANgIYIAMgATYCFCADIAI2AhAgAyADKAIYKAIENgIMIAMoAgwgAygCEEsEQCADIAMoAhA2AgwLAkAgAygCDEUEQCADQQA2AhwMAQsgAygCGCIAIAAoAgQgAygCDGs2AgQgAygCFCADKAIYKAIAIAMoAgwQGRoCQCADKAIYKAIcKAIYQQFGBEAgAygCGCgCMCADKAIUIAMoAgwQPSEAIAMoAhggADYCMAwBCyADKAIYKAIcKAIYQQJGBEAgAygCGCgCMCADKAIUIAMoAgwQGiEAIAMoAhggADYCMAsLIAMoAhgiACADKAIMIAAoAgBqNgIAIAMoAhgiACADKAIMIAAoAghqNgIIIAMgAygCDDYCHAsgAygCHCEAIANBIGokACAACzYBAX8jAEEQayIBJAAgASAANgIMIAEoAgwQXiABKAIMKAIAEDcgASgCDCgCBBA3IAFBEGokAAvtAQEBfyMAQRBrIgEgADYCCAJAAkACQCABKAIIRQ0AIAEoAggoAiBFDQAgASgCCCgCJA0BCyABQQE2AgwMAQsgASABKAIIKAIcNgIEAkACQCABKAIERQ0AIAEoAgQoAgAgASgCCEcNACABKAIEKAIEQSpGDQEgASgCBCgCBEE5Rg0BIAEoAgQoAgRBxQBGDQEgASgCBCgCBEHJAEYNASABKAIEKAIEQdsARg0BIAEoAgQoAgRB5wBGDQEgASgCBCgCBEHxAEYNASABKAIEKAIEQZoFRg0BCyABQQE2AgwMAQsgAUEANgIMCyABKAIMC9IEAQF/IwBBIGsiAyAANgIcIAMgATYCGCADIAI2AhQgAyADKAIcQdwWaiADKAIUQQJ0aigCADYCECADIAMoAhRBAXQ2AgwDQAJAIAMoAgwgAygCHCgC0ChKDQACQCADKAIMIAMoAhwoAtAoTg0AIAMoAhggAygCHCADKAIMQQJ0akHgFmooAgBBAnRqLwEAIAMoAhggAygCHEHcFmogAygCDEECdGooAgBBAnRqLwEATgRAIAMoAhggAygCHCADKAIMQQJ0akHgFmooAgBBAnRqLwEAIAMoAhggAygCHEHcFmogAygCDEECdGooAgBBAnRqLwEARw0BIAMoAhwgAygCDEECdGpB4BZqKAIAIAMoAhxB2Chqai0AACADKAIcQdwWaiADKAIMQQJ0aigCACADKAIcQdgoamotAABKDQELIAMgAygCDEEBajYCDAsgAygCGCADKAIQQQJ0ai8BACADKAIYIAMoAhxB3BZqIAMoAgxBAnRqKAIAQQJ0ai8BAEgNAAJAIAMoAhggAygCEEECdGovAQAgAygCGCADKAIcQdwWaiADKAIMQQJ0aigCAEECdGovAQBHDQAgAygCECADKAIcQdgoamotAAAgAygCHEHcFmogAygCDEECdGooAgAgAygCHEHYKGpqLQAASg0ADAELIAMoAhxB3BZqIAMoAhRBAnRqIAMoAhxB3BZqIAMoAgxBAnRqKAIANgIAIAMgAygCDDYCFCADIAMoAgxBAXQ2AgwMAQsLIAMoAhxB3BZqIAMoAhRBAnRqIAMoAhA2AgAL1xMBA38jAEEwayICJAAgAiAANgIsIAIgATYCKCACIAIoAigoAgA2AiQgAiACKAIoKAIIKAIANgIgIAIgAigCKCgCCCgCDDYCHCACQX82AhAgAigCLEEANgLQKCACKAIsQb0ENgLUKCACQQA2AhgDQCACKAIYIAIoAhxIBEACQCACKAIkIAIoAhhBAnRqLwEABEAgAiACKAIYIgE2AhAgAigCLEHcFmohAyACKAIsIgQoAtAoQQFqIQAgBCAANgLQKCAAQQJ0IANqIAE2AgAgAigCGCACKAIsQdgoampBADoAAAwBCyACKAIkIAIoAhhBAnRqQQA7AQILIAIgAigCGEEBajYCGAwBCwsDQCACKAIsKALQKEECSARAAkAgAigCEEECSARAIAIgAigCEEEBaiIANgIQDAELQQAhAAsgAigCLEHcFmohAyACKAIsIgQoAtAoQQFqIQEgBCABNgLQKCABQQJ0IANqIAA2AgAgAiAANgIMIAIoAiQgAigCDEECdGpBATsBACACKAIMIAIoAixB2ChqakEAOgAAIAIoAiwiACAAKAKoLUEBazYCqC0gAigCIARAIAIoAiwiACAAKAKsLSACKAIgIAIoAgxBAnRqLwECazYCrC0LDAELCyACKAIoIAIoAhA2AgQgAiACKAIsKALQKEECbTYCGANAIAIoAhhBAU4EQCACKAIsIAIoAiQgAigCGBB5IAIgAigCGEEBazYCGAwBCwsgAiACKAIcNgIMA0AgAiACKAIsKALgFjYCGCACKAIsQdwWaiEBIAIoAiwiAygC0CghACADIABBAWs2AtAoIAIoAiwgAEECdCABaigCADYC4BYgAigCLCACKAIkQQEQeSACIAIoAiwoAuAWNgIUIAIoAhghASACKAIsQdwWaiEDIAIoAiwiBCgC1ChBAWshACAEIAA2AtQoIABBAnQgA2ogATYCACACKAIUIQEgAigCLEHcFmohAyACKAIsIgQoAtQoQQFrIQAgBCAANgLUKCAAQQJ0IANqIAE2AgAgAigCJCACKAIMQQJ0aiACKAIkIAIoAhhBAnRqLwEAIAIoAiQgAigCFEECdGovAQBqOwEAIAIoAgwgAigCLEHYKGpqAn8gAigCGCACKAIsQdgoamotAAAgAigCFCACKAIsQdgoamotAABOBEAgAigCGCACKAIsQdgoamotAAAMAQsgAigCFCACKAIsQdgoamotAAALQQFqOgAAIAIoAiQgAigCFEECdGogAigCDCIAOwECIAIoAiQgAigCGEECdGogADsBAiACIAIoAgwiAEEBajYCDCACKAIsIAA2AuAWIAIoAiwgAigCJEEBEHkgAigCLCgC0ChBAk4NAAsgAigCLCgC4BYhASACKAIsQdwWaiEDIAIoAiwiBCgC1ChBAWshACAEIAA2AtQoIABBAnQgA2ogATYCACACKAIoIQEjAEFAaiIAIAIoAiw2AjwgACABNgI4IAAgACgCOCgCADYCNCAAIAAoAjgoAgQ2AjAgACAAKAI4KAIIKAIANgIsIAAgACgCOCgCCCgCBDYCKCAAIAAoAjgoAggoAgg2AiQgACAAKAI4KAIIKAIQNgIgIABBADYCBCAAQQA2AhADQCAAKAIQQQ9MBEAgACgCPEG8FmogACgCEEEBdGpBADsBACAAIAAoAhBBAWo2AhAMAQsLIAAoAjQgACgCPEHcFmogACgCPCgC1ChBAnRqKAIAQQJ0akEAOwECIAAgACgCPCgC1ChBAWo2AhwDQCAAKAIcQb0ESARAIAAgACgCPEHcFmogACgCHEECdGooAgA2AhggACAAKAI0IAAoAjQgACgCGEECdGovAQJBAnRqLwECQQFqNgIQIAAoAhAgACgCIEoEQCAAIAAoAiA2AhAgACAAKAIEQQFqNgIECyAAKAI0IAAoAhhBAnRqIAAoAhA7AQIgACgCGCAAKAIwTARAIAAoAjwgACgCEEEBdGpBvBZqIgEgAS8BAEEBajsBACAAQQA2AgwgACgCGCAAKAIkTgRAIAAgACgCKCAAKAIYIAAoAiRrQQJ0aigCADYCDAsgACAAKAI0IAAoAhhBAnRqLwEAOwEKIAAoAjwiASABKAKoLSAALwEKIAAoAhAgACgCDGpsajYCqC0gACgCLARAIAAoAjwiASABKAKsLSAALwEKIAAoAiwgACgCGEECdGovAQIgACgCDGpsajYCrC0LCyAAIAAoAhxBAWo2AhwMAQsLAkAgACgCBEUNAANAIAAgACgCIEEBazYCEANAIAAoAjxBvBZqIAAoAhBBAXRqLwEARQRAIAAgACgCEEEBazYCEAwBCwsgACgCPCAAKAIQQQF0akG8FmoiASABLwEAQQFrOwEAIAAoAjwgACgCEEEBdGpBvhZqIgEgAS8BAEECajsBACAAKAI8IAAoAiBBAXRqQbwWaiIBIAEvAQBBAWs7AQAgACAAKAIEQQJrNgIEIAAoAgRBAEoNAAsgACAAKAIgNgIQA0AgACgCEEUNASAAIAAoAjxBvBZqIAAoAhBBAXRqLwEANgIYA0AgACgCGARAIAAoAjxB3BZqIQEgACAAKAIcQQFrIgM2AhwgACADQQJ0IAFqKAIANgIUIAAoAhQgACgCMEoNASAAKAI0IAAoAhRBAnRqLwECIAAoAhBHBEAgACgCPCIBIAEoAqgtIAAoAjQgACgCFEECdGovAQAgACgCECAAKAI0IAAoAhRBAnRqLwECa2xqNgKoLSAAKAI0IAAoAhRBAnRqIAAoAhA7AQILIAAgACgCGEEBazYCGAwBCwsgACAAKAIQQQFrNgIQDAALAAsgAigCJCEBIAIoAhAhAyACKAIsQbwWaiEEIwBBQGoiACQAIAAgATYCPCAAIAM2AjggACAENgI0IABBADYCDCAAQQE2AggDQCAAKAIIQQ9MBEAgACAAKAIMIAAoAjQgACgCCEEBa0EBdGovAQBqQQF0NgIMIABBEGogACgCCEEBdGogACgCDDsBACAAIAAoAghBAWo2AggMAQsLIABBADYCBANAIAAoAgQgACgCOEwEQCAAIAAoAjwgACgCBEECdGovAQI2AgAgACgCAARAIABBEGogACgCAEEBdGoiAS8BACEDIAEgA0EBajsBACAAKAIAIQQjAEEQayIBIAM2AgwgASAENgIIIAFBADYCBANAIAEgASgCBCABKAIMQQFxcjYCBCABIAEoAgxBAXY2AgwgASABKAIEQQF0NgIEIAEgASgCCEEBayIDNgIIIANBAEoNAAsgASgCBEEBdiEBIAAoAjwgACgCBEECdGogATsBAAsgACAAKAIEQQFqNgIEDAELCyAAQUBrJAAgAkEwaiQAC04BAX8jAEEQayICIAA7AQogAiABNgIEAkAgAi8BCkEBRgRAIAIoAgRBAUYEQCACQQA2AgwMAgsgAkEENgIMDAELIAJBADYCDAsgAigCDAvOAgEBfyMAQTBrIgUkACAFIAA2AiwgBSABNgIoIAUgAjYCJCAFIAM3AxggBSAENgIUIAVCADcDCANAIAUpAwggBSkDGFQEQCAFIAUoAiQgBSkDCKdqLQAAOgAHIAUoAhRFBEAgBSAFKAIsKAIUQQJyOwESIAUgBS8BEiAFLwESQQFzbEEIdjsBEiAFIAUtAAcgBS8BEkH/AXFzOgAHCyAFKAIoBEAgBSgCKCAFKQMIp2ogBS0ABzoAAAsgBSgCLCgCDEF/cyAFQQdqQQEQGkF/cyEAIAUoAiwgADYCDCAFKAIsIAUoAiwoAhAgBSgCLCgCDEH/AXFqQYWIosAAbEEBajYCECAFIAUoAiwoAhBBGHY6AAcgBSgCLCgCFEF/cyAFQQdqQQEQGkF/cyEAIAUoAiwgADYCFCAFIAUpAwhCAXw3AwgMAQsLIAVBMGokAAttAQF/IwBBIGsiBCQAIAQgADYCGCAEIAE2AhQgBCACNwMIIAQgAzYCBAJAIAQoAhhFBEAgBEEANgIcDAELIAQgBCgCFCAEKQMIIAQoAgQgBCgCGEEIahDEATYCHAsgBCgCHCEAIARBIGokACAAC6cDAQF/IwBBIGsiBCQAIAQgADYCGCAEIAE3AxAgBCACNgIMIAQgAzYCCCAEIAQoAhggBCkDECAEKAIMQQAQPyIANgIAAkAgAEUEQCAEQX82AhwMAQsgBCAEKAIYIAQpAxAgBCgCDBDFASIANgIEIABFBEAgBEF/NgIcDAELAkACQCAEKAIMQQhxDQAgBCgCGCgCQCAEKQMQp0EEdGooAghFDQAgBCgCGCgCQCAEKQMQp0EEdGooAgggBCgCCBA5QQBIBEAgBCgCGEEIakEPQQAQFCAEQX82AhwMAwsMAQsgBCgCCBA7IAQoAgggBCgCACgCGDYCLCAEKAIIIAQoAgApAyg3AxggBCgCCCAEKAIAKAIUNgIoIAQoAgggBCgCACkDIDcDICAEKAIIIAQoAgAoAhA7ATAgBCgCCCAEKAIALwFSOwEyIAQoAghBIEEAIAQoAgAtAAZBAXEbQdwBcq03AwALIAQoAgggBCkDEDcDECAEKAIIIAQoAgQ2AgggBCgCCCIAIAApAwBCA4Q3AwAgBEEANgIcCyAEKAIcIQAgBEEgaiQAIAALWQIBfwF+AkACf0EAIABFDQAaIACtIAGtfiIDpyICIAAgAXJBgIAESQ0AGkF/IAIgA0IgiKcbCyICEBgiAEUNACAAQQRrLQAAQQNxRQ0AIABBACACEDMLIAALAwABC+oBAgF/AX4jAEEgayIEJAAgBCAANgIYIAQgATYCFCAEIAI2AhAgBCADNgIMIAQgBCgCDBCCASIANgIIAkAgAEUEQCAEQQA2AhwMAQsjAEEQayIAIAQoAhg2AgwgACgCDCIAIAAoAjBBAWo2AjAgBCgCCCAEKAIYNgIAIAQoAgggBCgCFDYCBCAEKAIIIAQoAhA2AgggBCgCGCAEKAIQQQBCAEEOIAQoAhQRCgAhBSAEKAIIIAU3AxggBCgCCCkDGEIAUwRAIAQoAghCPzcDGAsgBCAEKAIINgIcCyAEKAIcIQAgBEEgaiQAIAAL6gEBAX8jAEEQayIBJAAgASAANgIIIAFBOBAYIgA2AgQCQCAARQRAIAEoAghBDkEAEBQgAUEANgIMDAELIAEoAgRBADYCACABKAIEQQA2AgQgASgCBEEANgIIIAEoAgRBADYCICABKAIEQQA2AiQgASgCBEEAOgAoIAEoAgRBADYCLCABKAIEQQE2AjAjAEEQayIAIAEoAgRBDGo2AgwgACgCDEEANgIAIAAoAgxBADYCBCAAKAIMQQA2AgggASgCBEEAOgA0IAEoAgRBADoANSABIAEoAgQ2AgwLIAEoAgwhACABQRBqJAAgAAuwAQIBfwF+IwBBIGsiAyQAIAMgADYCGCADIAE2AhQgAyACNgIQIAMgAygCEBCCASIANgIMAkAgAEUEQCADQQA2AhwMAQsgAygCDCADKAIYNgIEIAMoAgwgAygCFDYCCCADKAIUQQBCAEEOIAMoAhgRDgAhBCADKAIMIAQ3AxggAygCDCkDGEIAUwRAIAMoAgxCPzcDGAsgAyADKAIMNgIcCyADKAIcIQAgA0EgaiQAIAALwwIBAX8jAEEQayIDIAA2AgwgAyABNgIIIAMgAjYCBCADKAIIKQMAQgKDQgBSBEAgAygCDCADKAIIKQMQNwMQCyADKAIIKQMAQgSDQgBSBEAgAygCDCADKAIIKQMYNwMYCyADKAIIKQMAQgiDQgBSBEAgAygCDCADKAIIKQMgNwMgCyADKAIIKQMAQhCDQgBSBEAgAygCDCADKAIIKAIoNgIoCyADKAIIKQMAQiCDQgBSBEAgAygCDCADKAIIKAIsNgIsCyADKAIIKQMAQsAAg0IAUgRAIAMoAgwgAygCCC8BMDsBMAsgAygCCCkDAEKAAYNCAFIEQCADKAIMIAMoAggvATI7ATILIAMoAggpAwBCgAKDQgBSBEAgAygCDCADKAIIKAI0NgI0CyADKAIMIgAgAygCCCkDACAAKQMAhDcDAEEAC10BAX8jAEEQayICJAAgAiAANgIIIAIgATYCBAJAIAIoAgRFBEAgAkEANgIMDAELIAIgAigCCCACKAIEKAIAIAIoAgQvAQStEDY2AgwLIAIoAgwhACACQRBqJAAgAAuPAQEBfyMAQRBrIgIkACACIAA2AgggAiABNgIEAkACQCACKAIIBEAgAigCBA0BCyACIAIoAgggAigCBEY2AgwMAQsgAigCCC8BBCACKAIELwEERwRAIAJBADYCDAwBCyACIAIoAggoAgAgAigCBCgCACACKAIILwEEEE9FNgIMCyACKAIMIQAgAkEQaiQAIAALVQEBfyMAQRBrIgEkACABIAA2AgwgAUEAQQBBABAaNgIIIAEoAgwEQCABIAEoAgggASgCDCgCACABKAIMLwEEEBo2AggLIAEoAgghACABQRBqJAAgAAufAgEBfyMAQUBqIgUkACAFIAA3AzAgBSABNwMoIAUgAjYCJCAFIAM3AxggBSAENgIUIAUCfyAFKQMYQhBUBEAgBSgCFEESQQAQFEEADAELIAUoAiQLNgIEAkAgBSgCBEUEQCAFQn83AzgMAQsCQAJAAkACQAJAIAUoAgQoAggOAwIAAQMLIAUgBSkDMCAFKAIEKQMAfDcDCAwDCyAFIAUpAyggBSgCBCkDAHw3AwgMAgsgBSAFKAIEKQMANwMIDAELIAUoAhRBEkEAEBQgBUJ/NwM4DAELAkAgBSkDCEIAWQRAIAUpAwggBSkDKFgNAQsgBSgCFEESQQAQFCAFQn83AzgMAQsgBSAFKQMINwM4CyAFKQM4IQAgBUFAayQAIAALoAEBAX8jAEEgayIFJAAgBSAANgIYIAUgATYCFCAFIAI7ARIgBSADOgARIAUgBDYCDCAFIAUoAhggBSgCFCAFLwESIAUtABFBAXEgBSgCDBBjIgA2AggCQCAARQRAIAVBADYCHAwBCyAFIAUoAgggBS8BEkEAIAUoAgwQUDYCBCAFKAIIEBUgBSAFKAIENgIcCyAFKAIcIQAgBUEgaiQAIAALpgEBAX8jAEEgayIFJAAgBSAANgIYIAUgATcDECAFIAI2AgwgBSADNgIIIAUgBDYCBCAFIAUoAhggBSkDECAFKAIMQQAQPyIANgIAAkAgAEUEQCAFQX82AhwMAQsgBSgCCARAIAUoAgggBSgCAC8BCEEIdjoAAAsgBSgCBARAIAUoAgQgBSgCACgCRDYCAAsgBUEANgIcCyAFKAIcIQAgBUEgaiQAIAALjQIBAX8jAEEwayIDJAAgAyAANgIoIAMgATsBJiADIAI2AiAgAyADKAIoKAI0IANBHmogAy8BJkGABkEAEGY2AhACQCADKAIQRQ0AIAMvAR5BBUkNAAJAIAMoAhAtAABBAUYNAAwBCyADIAMoAhAgAy8BHq0QKSIANgIUIABFBEAMAQsgAygCFBCXARogAyADKAIUECo2AhggAygCIBCHASADKAIYRgRAIAMgAygCFBAwPQEOIAMgAygCFCADLwEOrRAeIAMvAQ5BgBBBABBQNgIIIAMoAggEQCADKAIgECQgAyADKAIINgIgCwsgAygCFBAWCyADIAMoAiA2AiwgAygCLCEAIANBMGokACAAC9oXAgF/AX4jAEGAAWsiBSQAIAUgADYCdCAFIAE2AnAgBSACNgJsIAUgAzoAayAFIAQ2AmQgBSAFKAJsQQBHOgAdIAVBHkEuIAUtAGtBAXEbNgIoAkACQCAFKAJsBEAgBSgCbBAwIAUoAiitVARAIAUoAmRBE0EAEBQgBUJ/NwN4DAMLDAELIAUgBSgCcCAFKAIorSAFQTBqIAUoAmQQQiIANgJsIABFBEAgBUJ/NwN4DAILCyAFKAJsQgQQHiEAQfESQfYSIAUtAGtBAXEbKAAAIAAoAABHBEAgBSgCZEETQQAQFCAFLQAdQQFxRQRAIAUoAmwQFgsgBUJ/NwN4DAELIAUoAnQQUwJAIAUtAGtBAXFFBEAgBSgCbBAdIQAgBSgCdCAAOwEIDAELIAUoAnRBADsBCAsgBSgCbBAdIQAgBSgCdCAAOwEKIAUoAmwQHSEAIAUoAnQgADsBDCAFKAJsEB1B//8DcSEAIAUoAnQgADYCECAFIAUoAmwQHTsBLiAFIAUoAmwQHTsBLCAFLwEuIQEgBS8BLCECIwBBMGsiACQAIAAgATsBLiAAIAI7ASwgAEIANwIAIABBADYCKCAAQgA3AiAgAEIANwIYIABCADcCECAAQgA3AgggAEEANgIgIAAgAC8BLEEJdkHQAGo2AhQgACAALwEsQQV2QQ9xQQFrNgIQIAAgAC8BLEEfcTYCDCAAIAAvAS5BC3Y2AgggACAALwEuQQV2QT9xNgIEIAAgAC8BLkEBdEE+cTYCACAAEBMhASAAQTBqJAAgASEAIAUoAnQgADYCFCAFKAJsECohACAFKAJ0IAA2AhggBSgCbBAqrSEGIAUoAnQgBjcDICAFKAJsECqtIQYgBSgCdCAGNwMoIAUgBSgCbBAdOwEiIAUgBSgCbBAdOwEeAkAgBS0Aa0EBcQRAIAVBADsBICAFKAJ0QQA2AjwgBSgCdEEAOwFAIAUoAnRBADYCRCAFKAJ0QgA3A0gMAQsgBSAFKAJsEB07ASAgBSgCbBAdQf//A3EhACAFKAJ0IAA2AjwgBSgCbBAdIQAgBSgCdCAAOwFAIAUoAmwQKiEAIAUoAnQgADYCRCAFKAJsECqtIQYgBSgCdCAGNwNICwJ/IwBBEGsiACAFKAJsNgIMIAAoAgwtAABBAXFFCwRAIAUoAmRBFEEAEBQgBS0AHUEBcUUEQCAFKAJsEBYLIAVCfzcDeAwBCwJAIAUoAnQvAQxBAXEEQCAFKAJ0LwEMQcAAcQRAIAUoAnRB//8DOwFSDAILIAUoAnRBATsBUgwBCyAFKAJ0QQA7AVILIAUoAnRBADYCMCAFKAJ0QQA2AjQgBSgCdEEANgI4IAUgBS8BICAFLwEiIAUvAR5qajYCJAJAIAUtAB1BAXEEQCAFKAJsEDAgBSgCJK1UBEAgBSgCZEEVQQAQFCAFQn83A3gMAwsMAQsgBSgCbBAWIAUgBSgCcCAFKAIkrUEAIAUoAmQQQiIANgJsIABFBEAgBUJ/NwN4DAILCyAFLwEiBEAgBSgCbCAFKAJwIAUvASJBASAFKAJkEIkBIQAgBSgCdCAANgIwIAUoAnQoAjBFBEACfyMAQRBrIgAgBSgCZDYCDCAAKAIMKAIAQRFGCwRAIAUoAmRBFUEAEBQLIAUtAB1BAXFFBEAgBSgCbBAWCyAFQn83A3gMAgsgBSgCdC8BDEGAEHEEQCAFKAJ0KAIwQQIQOkEFRgRAIAUoAmRBFUEAEBQgBS0AHUEBcUUEQCAFKAJsEBYLIAVCfzcDeAwDCwsLIAUvAR4EQCAFIAUoAmwgBSgCcCAFLwEeQQAgBSgCZBBjNgIYIAUoAhhFBEAgBS0AHUEBcUUEQCAFKAJsEBYLIAVCfzcDeAwCCyAFKAIYIAUvAR5BgAJBgAQgBS0Aa0EBcRsgBSgCdEE0aiAFKAJkEJQBQQFxRQRAIAUoAhgQFSAFLQAdQQFxRQRAIAUoAmwQFgsgBUJ/NwN4DAILIAUoAhgQFSAFLQBrQQFxBEAgBSgCdEEBOgAECwsgBS8BIARAIAUoAmwgBSgCcCAFLwEgQQAgBSgCZBCJASEAIAUoAnQgADYCOCAFKAJ0KAI4RQRAIAUtAB1BAXFFBEAgBSgCbBAWCyAFQn83A3gMAgsgBSgCdC8BDEGAEHEEQCAFKAJ0KAI4QQIQOkEFRgRAIAUoAmRBFUEAEBQgBS0AHUEBcUUEQCAFKAJsEBYLIAVCfzcDeAwDCwsLIAUoAnRB9eABIAUoAnQoAjAQiwEhACAFKAJ0IAA2AjAgBSgCdEH1xgEgBSgCdCgCOBCLASEAIAUoAnQgADYCOAJAAkAgBSgCdCkDKEL/////D1ENACAFKAJ0KQMgQv////8PUQ0AIAUoAnQpA0hC/////w9SDQELIAUgBSgCdCgCNCAFQRZqQQFBgAJBgAQgBS0Aa0EBcRsgBSgCZBBmNgIMIAUoAgxFBEAgBS0AHUEBcUUEQCAFKAJsEBYLIAVCfzcDeAwCCyAFIAUoAgwgBS8BFq0QKSIANgIQIABFBEAgBSgCZEEOQQAQFCAFLQAdQQFxRQRAIAUoAmwQFgsgBUJ/NwN4DAILAkAgBSgCdCkDKEL/////D1EEQCAFKAIQEDEhBiAFKAJ0IAY3AygMAQsgBS0Aa0EBcQRAIAUoAhAhASMAQSBrIgAkACAAIAE2AhggAEIINwMQIAAgACgCGCkDECAAKQMQfDcDCAJAIAApAwggACgCGCkDEFQEQCAAKAIYQQA6AAAgAEF/NgIcDAELIAAgACgCGCAAKQMIECw2AhwLIAAoAhwaIABBIGokAAsLIAUoAnQpAyBC/////w9RBEAgBSgCEBAxIQYgBSgCdCAGNwMgCyAFLQBrQQFxRQRAIAUoAnQpA0hC/////w9RBEAgBSgCEBAxIQYgBSgCdCAGNwNICyAFKAJ0KAI8Qf//A0YEQCAFKAIQECohACAFKAJ0IAA2AjwLCyAFKAIQEEdBAXFFBEAgBSgCZEEVQQAQFCAFKAIQEBYgBS0AHUEBcUUEQCAFKAJsEBYLIAVCfzcDeAwCCyAFKAIQEBYLAn8jAEEQayIAIAUoAmw2AgwgACgCDC0AAEEBcUULBEAgBSgCZEEUQQAQFCAFLQAdQQFxRQRAIAUoAmwQFgsgBUJ/NwN4DAELIAUtAB1BAXFFBEAgBSgCbBAWCyAFKAJ0KQNIQv///////////wBWBEAgBSgCZEEEQRYQFCAFQn83A3gMAQsCfyAFKAJ0IQEgBSgCZCECIwBBIGsiACQAIAAgATYCGCAAIAI2AhQCQCAAKAIYKAIQQeMARwRAIABBAToAHwwBCyAAIAAoAhgoAjQgAEESakGBsgJBgAZBABBmNgIIAkAgACgCCARAIAAvARJBB08NAQsgACgCFEEVQQAQFCAAQQA6AB8MAQsgACAAKAIIIAAvARKtECkiATYCDCABRQRAIAAoAhRBFEEAEBQgAEEAOgAfDAELIABBAToABwJAAkACQCAAKAIMEB1BAWsOAgIAAQsgACgCGCkDKEIUVARAIABBADoABwsMAQsgACgCFEEYQQAQFCAAKAIMEBYgAEEAOgAfDAELIAAoAgxCAhAeLwAAQcGKAUcEQCAAKAIUQRhBABAUIAAoAgwQFiAAQQA6AB8MAQsCQAJAAkACQAJAIAAoAgwQlwFBAWsOAwABAgMLIABBgQI7AQQMAwsgAEGCAjsBBAwCCyAAQYMCOwEEDAELIAAoAhRBGEEAEBQgACgCDBAWIABBADoAHwwBCyAALwESQQdHBEAgACgCFEEVQQAQFCAAKAIMEBYgAEEAOgAfDAELIAAoAhggAC0AB0EBcToABiAAKAIYIAAvAQQ7AVIgACgCDBAdQf//A3EhASAAKAIYIAE2AhAgACgCDBAWIABBAToAHwsgAC0AH0EBcSEBIABBIGokACABQQFxRQsEQCAFQn83A3gMAQsgBSgCdCgCNBCTASEAIAUoAnQgADYCNCAFIAUoAiggBSgCJGqtNwN4CyAFKQN4IQYgBUGAAWokACAGC80BAQF/IwBBEGsiAyQAIAMgADYCDCADIAE2AgggAyACNgIEIAMgA0EMakG4mwEQEjYCAAJAIAMoAgBFBEAgAygCBEEhOwEAIAMoAghBADsBAAwBCyADKAIAKAIUQdAASARAIAMoAgBB0AA2AhQLIAMoAgQgAygCACgCDCADKAIAKAIUQQl0IAMoAgAoAhBBBXRqQeC/AmtqOwEAIAMoAgggAygCACgCCEELdCADKAIAKAIEQQV0aiADKAIAKAIAQQF1ajsBAAsgA0EQaiQAC4MDAQF/IwBBIGsiAyQAIAMgADsBGiADIAE2AhQgAyACNgIQIAMgAygCFCADQQhqQcAAQQAQRiIANgIMAkAgAEUEQCADQQA2AhwMAQsgAygCCEEFakH//wNLBEAgAygCEEESQQAQFCADQQA2AhwMAQsgA0EAIAMoAghBBWqtECkiADYCBCAARQRAIAMoAhBBDkEAEBQgA0EANgIcDAELIAMoAgRBARCWASADKAIEIAMoAhQQhwEQISADKAIEIAMoAgwgAygCCBBBAn8jAEEQayIAIAMoAgQ2AgwgACgCDC0AAEEBcUULBEAgAygCEEEUQQAQFCADKAIEEBYgA0EANgIcDAELIAMgAy8BGgJ/IwBBEGsiACADKAIENgIMAn4gACgCDC0AAEEBcQRAIAAoAgwpAxAMAQtCAAunQf//A3ELAn8jAEEQayIAIAMoAgQ2AgwgACgCDCgCBAtBgAYQVTYCACADKAIEEBYgAyADKAIANgIcCyADKAIcIQAgA0EgaiQAIAALtAIBAX8jAEEwayIDJAAgAyAANgIoIAMgATcDICADIAI2AhwCQCADKQMgUARAIANBAToALwwBCyADIAMoAigpAxAgAykDIHw3AwgCQCADKQMIIAMpAyBaBEAgAykDCEL/////AFgNAQsgAygCHEEOQQAQFCADQQA6AC8MAQsgAyADKAIoKAIAIAMpAwinQQR0EE4iADYCBCAARQRAIAMoAhxBDkEAEBQgA0EAOgAvDAELIAMoAiggAygCBDYCACADIAMoAigpAwg3AxADQCADKQMQIAMpAwhaRQRAIAMoAigoAgAgAykDEKdBBHRqELUBIAMgAykDEEIBfDcDEAwBCwsgAygCKCADKQMIIgE3AxAgAygCKCABNwMIIANBAToALwsgAy0AL0EBcSEAIANBMGokACAAC8wBAQF/IwBBIGsiAiQAIAIgADcDECACIAE2AgwgAkEwEBgiATYCCAJAIAFFBEAgAigCDEEOQQAQFCACQQA2AhwMAQsgAigCCEEANgIAIAIoAghCADcDECACKAIIQgA3AwggAigCCEIANwMgIAIoAghCADcDGCACKAIIQQA2AiggAigCCEEAOgAsIAIoAgggAikDECACKAIMEI8BQQFxRQRAIAIoAggQJSACQQA2AhwMAQsgAiACKAIINgIcCyACKAIcIQEgAkEgaiQAIAEL1gIBAX8jAEEgayIDJAAgAyAANgIYIAMgATYCFCADIAI2AhAgAyADQQxqQgQQKTYCCAJAIAMoAghFBEAgA0F/NgIcDAELA0AgAygCFARAIAMoAhQoAgQgAygCEHFBgAZxBEAgAygCCEIAECwaIAMoAgggAygCFC8BCBAfIAMoAgggAygCFC8BChAfAn8jAEEQayIAIAMoAgg2AgwgACgCDC0AAEEBcUULBEAgAygCGEEIakEUQQAQFCADKAIIEBYgA0F/NgIcDAQLIAMoAhggA0EMakIEEDZBAEgEQCADKAIIEBYgA0F/NgIcDAQLIAMoAhQvAQoEQCADKAIYIAMoAhQoAgwgAygCFC8BCq0QNkEASARAIAMoAggQFiADQX82AhwMBQsLCyADIAMoAhQoAgA2AhQMAQsLIAMoAggQFiADQQA2AhwLIAMoAhwhACADQSBqJAAgAAtoAQF/IwBBEGsiAiAANgIMIAIgATYCCCACQQA7AQYDQCACKAIMBEAgAigCDCgCBCACKAIIcUGABnEEQCACIAIoAgwvAQogAi8BBkEEamo7AQYLIAIgAigCDCgCADYCDAwBCwsgAi8BBgvwAQEBfyMAQRBrIgEkACABIAA2AgwgASABKAIMNgIIIAFBADYCBANAIAEoAgwEQAJAAkAgASgCDC8BCEH1xgFGDQAgASgCDC8BCEH14AFGDQAgASgCDC8BCEGBsgJGDQAgASgCDC8BCEEBRw0BCyABIAEoAgwoAgA2AgAgASgCCCABKAIMRgRAIAEgASgCADYCCAsgASgCDEEANgIAIAEoAgwQIyABKAIEBEAgASgCBCABKAIANgIACyABIAEoAgA2AgwMAgsgASABKAIMNgIEIAEgASgCDCgCADYCDAwBCwsgASgCCCEAIAFBEGokACAAC7IEAQF/IwBBQGoiBSQAIAUgADYCOCAFIAE7ATYgBSACNgIwIAUgAzYCLCAFIAQ2AiggBSAFKAI4IAUvATatECkiADYCJAJAIABFBEAgBSgCKEEOQQAQFCAFQQA6AD8MAQsgBUEANgIgIAVBADYCGANAAn8jAEEQayIAIAUoAiQ2AgwgACgCDC0AAEEBcQsEfyAFKAIkEDBCBFoFQQALQQFxBEAgBSAFKAIkEB07ARYgBSAFKAIkEB07ARQgBSAFKAIkIAUvARStEB42AhAgBSgCEEUEQCAFKAIoQRVBABAUIAUoAiQQFiAFKAIYECMgBUEAOgA/DAMLIAUgBS8BFiAFLwEUIAUoAhAgBSgCMBBVIgA2AhwgAEUEQCAFKAIoQQ5BABAUIAUoAiQQFiAFKAIYECMgBUEAOgA/DAMLAkAgBSgCGARAIAUoAiAgBSgCHDYCACAFIAUoAhw2AiAMAQsgBSAFKAIcIgA2AiAgBSAANgIYCwwBCwsgBSgCJBBHQQFxRQRAIAUgBSgCJBAwPgIMIAUgBSgCJCAFKAIMrRAeNgIIAkACQCAFKAIMQQRPDQAgBSgCCEUNACAFKAIIQZEVIAUoAgwQT0UNAQsgBSgCKEEVQQAQFCAFKAIkEBYgBSgCGBAjIAVBADoAPwwCCwsgBSgCJBAWAkAgBSgCLARAIAUoAiwgBSgCGDYCAAwBCyAFKAIYECMLIAVBAToAPwsgBS0AP0EBcSEAIAVBQGskACAAC+8CAQF/IwBBIGsiAiQAIAIgADYCGCACIAE2AhQCQCACKAIYRQRAIAIgAigCFDYCHAwBCyACIAIoAhg2AggDQCACKAIIKAIABEAgAiACKAIIKAIANgIIDAELCwNAIAIoAhQEQCACIAIoAhQoAgA2AhAgAkEANgIEIAIgAigCGDYCDANAAkAgAigCDEUNAAJAIAIoAgwvAQggAigCFC8BCEcNACACKAIMLwEKIAIoAhQvAQpHDQAgAigCDC8BCgRAIAIoAgwoAgwgAigCFCgCDCACKAIMLwEKEE8NAQsgAigCDCIAIAAoAgQgAigCFCgCBEGABnFyNgIEIAJBATYCBAwBCyACIAIoAgwoAgA2AgwMAQsLIAIoAhRBADYCAAJAIAIoAgQEQCACKAIUECMMAQsgAigCCCACKAIUIgA2AgAgAiAANgIICyACIAIoAhA2AhQMAQsLIAIgAigCGDYCHAsgAigCHCEAIAJBIGokACAAC18BAX8jAEEQayICJAAgAiAANgIIIAIgAToAByACIAIoAghCARAeNgIAAkAgAigCAEUEQCACQX82AgwMAQsgAigCACACLQAHOgAAIAJBADYCDAsgAigCDBogAkEQaiQAC1QBAX8jAEEQayIBJAAgASAANgIIIAEgASgCCEIBEB42AgQCQCABKAIERQRAIAFBADoADwwBCyABIAEoAgQtAAA6AA8LIAEtAA8hACABQRBqJAAgAAucBgECfyMAQSBrIgIkACACIAA2AhggAiABNwMQAkAgAikDECACKAIYKQMwWgRAIAIoAhhBCGpBEkEAEBQgAkF/NgIcDAELIAIoAhgoAhhBAnEEQCACKAIYQQhqQRlBABAUIAJBfzYCHAwBCyACIAIoAhggAikDEEEAIAIoAhhBCGoQTSIANgIMIABFBEAgAkF/NgIcDAELIAIoAhgoAlAgAigCDCACKAIYQQhqEFlBAXFFBEAgAkF/NgIcDAELAn8gAigCGCEDIAIpAxAhASMAQTBrIgAkACAAIAM2AiggACABNwMgIABBATYCHAJAIAApAyAgACgCKCkDMFoEQCAAKAIoQQhqQRJBABAUIABBfzYCLAwBCwJAIAAoAhwNACAAKAIoKAJAIAApAyCnQQR0aigCBEUNACAAKAIoKAJAIAApAyCnQQR0aigCBCgCAEECcUUNAAJAIAAoAigoAkAgACkDIKdBBHRqKAIABEAgACAAKAIoIAApAyBBCCAAKAIoQQhqEE0iAzYCDCADRQRAIABBfzYCLAwECyAAIAAoAiggACgCDEEAQQAQWDcDEAJAIAApAxBCAFMNACAAKQMQIAApAyBRDQAgACgCKEEIakEKQQAQFCAAQX82AiwMBAsMAQsgAEEANgIMCyAAIAAoAiggACkDIEEAIAAoAihBCGoQTSIDNgIIIANFBEAgAEF/NgIsDAILIAAoAgwEQCAAKAIoKAJQIAAoAgwgACkDIEEAIAAoAihBCGoQdEEBcUUEQCAAQX82AiwMAwsLIAAoAigoAlAgACgCCCAAKAIoQQhqEFlBAXFFBEAgACgCKCgCUCAAKAIMQQAQWRogAEF/NgIsDAILCyAAKAIoKAJAIAApAyCnQQR0aigCBBA3IAAoAigoAkAgACkDIKdBBHRqQQA2AgQgACgCKCgCQCAAKQMgp0EEdGoQXiAAQQA2AiwLIAAoAiwhAyAAQTBqJAAgAwsEQCACQX82AhwMAQsgAigCGCgCQCACKQMQp0EEdGpBAToADCACQQA2AhwLIAIoAhwhACACQSBqJAAgAAulBAEBfyMAQTBrIgUkACAFIAA2AiggBSABNwMgIAUgAjYCHCAFIAM6ABsgBSAENgIUAkAgBSgCKCAFKQMgQQBBABA/RQRAIAVBfzYCLAwBCyAFKAIoKAIYQQJxBEAgBSgCKEEIakEZQQAQFCAFQX82AiwMAQsgBSAFKAIoKAJAIAUpAyCnQQR0ajYCECAFAn8gBSgCECgCAARAIAUoAhAoAgAvAQhBCHYMAQtBAws6AAsgBQJ/IAUoAhAoAgAEQCAFKAIQKAIAKAJEDAELQYCA2I14CzYCBEEBIQAgBSAFLQAbIAUtAAtGBH8gBSgCFCAFKAIERwVBAQtBAXE2AgwCQCAFKAIMBEAgBSgCECgCBEUEQCAFKAIQKAIAEEAhACAFKAIQIAA2AgQgAEUEQCAFKAIoQQhqQQ5BABAUIAVBfzYCLAwECwsgBSgCECgCBCAFKAIQKAIELwEIQf8BcSAFLQAbQQh0cjsBCCAFKAIQKAIEIAUoAhQ2AkQgBSgCECgCBCIAIAAoAgBBEHI2AgAMAQsgBSgCECgCBARAIAUoAhAoAgQiACAAKAIAQW9xNgIAAkAgBSgCECgCBCgCAEUEQCAFKAIQKAIEEDcgBSgCEEEANgIEDAELIAUoAhAoAgQgBSgCECgCBC8BCEH/AXEgBS0AC0EIdHI7AQggBSgCECgCBCAFKAIENgJECwsLIAVBADYCLAsgBSgCLCEAIAVBMGokACAAC90PAgF/AX4jAEFAaiIEJAAgBCAANgI0IARCfzcDKCAEIAE2AiQgBCACNgIgIAQgAzYCHAJAIAQoAjQoAhhBAnEEQCAEKAI0QQhqQRlBABAUIARCfzcDOAwBCyAEIAQoAjQpAzA3AxAgBCkDKEJ/UQRAIARCfzcDCCAEKAIcQYDAAHEEQCAEIAQoAjQgBCgCJCAEKAIcQQAQWDcDCAsgBCkDCEJ/UQRAIAQoAjQhASMAQUBqIgAkACAAIAE2AjQCQCAAKAI0KQM4IAAoAjQpAzBCAXxYBEAgACAAKAI0KQM4NwMYIAAgACkDGEIBhjcDEAJAIAApAxBCEFQEQCAAQhA3AxAMAQsgACkDEEKACFYEQCAAQoAINwMQCwsgACAAKQMQIAApAxh8NwMYIAAgACkDGKdBBHStNwMIIAApAwggACgCNCkDOKdBBHStVARAIAAoAjRBCGpBDkEAEBQgAEJ/NwM4DAILIAAgACgCNCgCQCAAKQMYp0EEdBBONgIkIAAoAiRFBEAgACgCNEEIakEOQQAQFCAAQn83AzgMAgsgACgCNCAAKAIkNgJAIAAoAjQgACkDGDcDOAsgACgCNCIBKQMwIQUgASAFQgF8NwMwIAAgBTcDKCAAKAI0KAJAIAApAyinQQR0ahC1ASAAIAApAyg3AzgLIAApAzghBSAAQUBrJAAgBCAFNwMIIAVCAFMEQCAEQn83AzgMAwsLIAQgBCkDCDcDKAsCQCAEKAIkRQ0AIAQoAjQhASAEKQMoIQUgBCgCJCECIAQoAhwhAyMAQUBqIgAkACAAIAE2AjggACAFNwMwIAAgAjYCLCAAIAM2AigCQCAAKQMwIAAoAjgpAzBaBEAgACgCOEEIakESQQAQFCAAQX82AjwMAQsgACgCOCgCGEECcQRAIAAoAjhBCGpBGUEAEBQgAEF/NgI8DAELAkACQCAAKAIsRQ0AIAAoAiwsAABFDQAgACAAKAIsIAAoAiwQLkH//wNxIAAoAiggACgCOEEIahBQIgE2AiAgAUUEQCAAQX82AjwMAwsCQCAAKAIoQYAwcQ0AIAAoAiBBABA6QQNHDQAgACgCIEECNgIICwwBCyAAQQA2AiALIAAgACgCOCAAKAIsQQBBABBYIgU3AxACQCAFQgBTDQAgACkDECAAKQMwUQ0AIAAoAiAQJCAAKAI4QQhqQQpBABAUIABBfzYCPAwBCwJAIAApAxBCAFMNACAAKQMQIAApAzBSDQAgACgCIBAkIABBADYCPAwBCyAAIAAoAjgoAkAgACkDMKdBBHRqNgIkAkAgACgCJCgCAARAIAAgACgCJCgCACgCMCAAKAIgEIYBQQBHOgAfDAELIABBADoAHwsCQCAALQAfQQFxDQAgACgCJCgCBA0AIAAoAiQoAgAQQCEBIAAoAiQgATYCBCABRQRAIAAoAjhBCGpBDkEAEBQgACgCIBAkIABBfzYCPAwCCwsgAAJ/IAAtAB9BAXEEQCAAKAIkKAIAKAIwDAELIAAoAiALQQBBACAAKAI4QQhqEEYiATYCCCABRQRAIAAoAiAQJCAAQX82AjwMAQsCQCAAKAIkKAIEBEAgACAAKAIkKAIEKAIwNgIEDAELAkAgACgCJCgCAARAIAAgACgCJCgCACgCMDYCBAwBCyAAQQA2AgQLCwJAIAAoAgQEQCAAIAAoAgRBAEEAIAAoAjhBCGoQRiIBNgIMIAFFBEAgACgCIBAkIABBfzYCPAwDCwwBCyAAQQA2AgwLIAAoAjgoAlAgACgCCCAAKQMwQQAgACgCOEEIahB0QQFxRQRAIAAoAiAQJCAAQX82AjwMAQsgACgCDARAIAAoAjgoAlAgACgCDEEAEFkaCwJAIAAtAB9BAXEEQCAAKAIkKAIEBEAgACgCJCgCBCgCAEECcQRAIAAoAiQoAgQoAjAQJCAAKAIkKAIEIgEgASgCAEF9cTYCAAJAIAAoAiQoAgQoAgBFBEAgACgCJCgCBBA3IAAoAiRBADYCBAwBCyAAKAIkKAIEIAAoAiQoAgAoAjA2AjALCwsgACgCIBAkDAELIAAoAiQoAgQoAgBBAnEEQCAAKAIkKAIEKAIwECQLIAAoAiQoAgQiASABKAIAQQJyNgIAIAAoAiQoAgQgACgCIDYCMAsgAEEANgI8CyAAKAI8IQEgAEFAayQAIAFFDQAgBCgCNCkDMCAEKQMQUgRAIAQoAjQoAkAgBCkDKKdBBHRqEHcgBCgCNCAEKQMQNwMwCyAEQn83AzgMAQsgBCgCNCgCQCAEKQMop0EEdGoQXgJAIAQoAjQoAkAgBCkDKKdBBHRqKAIARQ0AIAQoAjQoAkAgBCkDKKdBBHRqKAIEBEAgBCgCNCgCQCAEKQMop0EEdGooAgQoAgBBAXENAQsgBCgCNCgCQCAEKQMop0EEdGooAgRFBEAgBCgCNCgCQCAEKQMop0EEdGooAgAQQCEAIAQoAjQoAkAgBCkDKKdBBHRqIAA2AgQgAEUEQCAEKAI0QQhqQQ5BABAUIARCfzcDOAwDCwsgBCgCNCgCQCAEKQMop0EEdGooAgRBfjYCECAEKAI0KAJAIAQpAyinQQR0aigCBCIAIAAoAgBBAXI2AgALIAQoAjQoAkAgBCkDKKdBBHRqIAQoAiA2AgggBCAEKQMoNwM4CyAEKQM4IQUgBEFAayQAIAULqgEBAX8jAEEwayICJAAgAiAANgIoIAIgATcDICACQQA2AhwCQAJAIAIoAigoAiRBAUYEQCACKAIcRQ0BIAIoAhxBAUYNASACKAIcQQJGDQELIAIoAihBDGpBEkEAEBQgAkF/NgIsDAELIAIgAikDIDcDCCACIAIoAhw2AhAgAkF/QQAgAigCKCACQQhqQhBBDBAgQgBTGzYCLAsgAigCLCEAIAJBMGokACAAC6UyAwZ/AX4BfCMAQeAAayIEJAAgBCAANgJYIAQgATYCVCAEIAI2AlACQAJAIAQoAlRBAE4EQCAEKAJYDQELIAQoAlBBEkEAEBQgBEEANgJcDAELIAQgBCgCVDYCTCMAQRBrIgAgBCgCWDYCDCAEIAAoAgwpAxg3A0BB4JoBKQMAQn9RBEAgBEF/NgIUIARBAzYCECAEQQc2AgwgBEEGNgIIIARBAjYCBCAEQQE2AgBB4JoBQQAgBBA0NwMAIARBfzYCNCAEQQ82AjAgBEENNgIsIARBDDYCKCAEQQo2AiQgBEEJNgIgQeiaAUEIIARBIGoQNDcDAAtB4JoBKQMAIAQpA0BB4JoBKQMAg1IEQCAEKAJQQRxBABAUIARBADYCXAwBC0HomgEpAwAgBCkDQEHomgEpAwCDUgRAIAQgBCgCTEEQcjYCTAsgBCgCTEEYcUEYRgRAIAQoAlBBGUEAEBQgBEEANgJcDAELIAQoAlghASAEKAJQIQIjAEHQAGsiACQAIAAgATYCSCAAIAI2AkQgAEEIahA7AkAgACgCSCAAQQhqEDkEQCMAQRBrIgEgACgCSDYCDCAAIAEoAgxBDGo2AgQjAEEQayIBIAAoAgQ2AgwCQCABKAIMKAIAQQVHDQAjAEEQayIBIAAoAgQ2AgwgASgCDCgCBEEsRw0AIABBADYCTAwCCyAAKAJEIAAoAgQQRSAAQX82AkwMAQsgAEEBNgJMCyAAKAJMIQEgAEHQAGokACAEIAE2AjwCQAJAAkAgBCgCPEEBag4CAAECCyAEQQA2AlwMAgsgBCgCTEEBcUUEQCAEKAJQQQlBABAUIARBADYCXAwCCyAEIAQoAlggBCgCTCAEKAJQEGk2AlwMAQsgBCgCTEECcQRAIAQoAlBBCkEAEBQgBEEANgJcDAELIAQoAlgQSEEASARAIAQoAlAgBCgCWBAXIARBADYCXAwBCwJAIAQoAkxBCHEEQCAEIAQoAlggBCgCTCAEKAJQEGk2AjgMAQsgBCgCWCEAIAQoAkwhASAEKAJQIQIjAEHwAGsiAyQAIAMgADYCaCADIAE2AmQgAyACNgJgIANBIGoQOwJAIAMoAmggA0EgahA5QQBIBEAgAygCYCADKAJoEBcgA0EANgJsDAELIAMpAyBCBINQBEAgAygCYEEEQYoBEBQgA0EANgJsDAELIAMgAykDODcDGCADIAMoAmggAygCZCADKAJgEGkiADYCXCAARQRAIANBADYCbAwBCwJAIAMpAxhQRQ0AIAMoAmgQngFBAXFFDQAgAyADKAJcNgJsDAELIAMoAlwhACADKQMYIQkjAEHgAGsiAiQAIAIgADYCWCACIAk3A1ACQCACKQNQQhZUBEAgAigCWEEIakETQQAQFCACQQA2AlwMAQsgAgJ+IAIpA1BCqoAEVARAIAIpA1AMAQtCqoAECzcDMCACKAJYKAIAQgAgAikDMH1BAhAnQQBIBEAjAEEQayIAIAIoAlgoAgA2AgwgAiAAKAIMQQxqNgIIAkACfyMAQRBrIgAgAigCCDYCDCAAKAIMKAIAQQRGCwRAIwBBEGsiACACKAIINgIMIAAoAgwoAgRBFkYNAQsgAigCWEEIaiACKAIIEEUgAkEANgJcDAILCyACIAIoAlgoAgAQSSIJNwM4IAlCAFMEQCACKAJYQQhqIAIoAlgoAgAQFyACQQA2AlwMAQsgAiACKAJYKAIAIAIpAzBBACACKAJYQQhqEEIiADYCDCAARQRAIAJBADYCXAwBCyACQn83AyAgAkEANgJMIAIpAzBCqoAEWgRAIAIoAgxCFBAsGgsgAkEQakETQQAQFCACIAIoAgxCABAeNgJEA0ACQCACKAJEIQEgAigCDBAwQhJ9pyEFIwBBIGsiACQAIAAgATYCGCAAIAU2AhQgAEHsEjYCECAAQQQ2AgwCQAJAIAAoAhQgACgCDE8EQCAAKAIMDQELIABBADYCHAwBCyAAIAAoAhhBAWs2AggDQAJAIAAgACgCCEEBaiAAKAIQLQAAIAAoAhggACgCCGsgACgCFCAAKAIMa2oQqwEiATYCCCABRQ0AIAAoAghBAWogACgCEEEBaiAAKAIMQQFrEE8NASAAIAAoAgg2AhwMAgsLIABBADYCHAsgACgCHCEBIABBIGokACACIAE2AkQgAUUNACACKAIMIAIoAkQCfyMAQRBrIgAgAigCDDYCDCAAKAIMKAIEC2usECwaIAIoAlghASACKAIMIQUgAikDOCEJIwBB8ABrIgAkACAAIAE2AmggACAFNgJkIAAgCTcDWCAAIAJBEGo2AlQjAEEQayIBIAAoAmQ2AgwgAAJ+IAEoAgwtAABBAXEEQCABKAIMKQMQDAELQgALNwMwAkAgACgCZBAwQhZUBEAgACgCVEETQQAQFCAAQQA2AmwMAQsgACgCZEIEEB4oAABB0JaVMEcEQCAAKAJUQRNBABAUIABBADYCbAwBCwJAAkAgACkDMEIUVA0AIwBBEGsiASAAKAJkNgIMIAEoAgwoAgQgACkDMKdqQRRrKAAAQdCWmThHDQAgACgCZCAAKQMwQhR9ECwaIAAoAmgoAgAhBSAAKAJkIQYgACkDWCEJIAAoAmgoAhQhByAAKAJUIQgjAEGwAWsiASQAIAEgBTYCqAEgASAGNgKkASABIAk3A5gBIAEgBzYClAEgASAINgKQASMAQRBrIgUgASgCpAE2AgwgAQJ+IAUoAgwtAABBAXEEQCAFKAIMKQMQDAELQgALNwMYIAEoAqQBQgQQHhogASABKAKkARAdQf//A3E2AhAgASABKAKkARAdQf//A3E2AgggASABKAKkARAxNwM4AkAgASkDOEL///////////8AVgRAIAEoApABQQRBFhAUIAFBADYCrAEMAQsgASkDOEI4fCABKQMYIAEpA5gBfFYEQCABKAKQAUEVQQAQFCABQQA2AqwBDAELAkACQCABKQM4IAEpA5gBVA0AIAEpAzhCOHwgASkDmAECfiMAQRBrIgUgASgCpAE2AgwgBSgCDCkDCAt8Vg0AIAEoAqQBIAEpAzggASkDmAF9ECwaIAFBADoAFwwBCyABKAKoASABKQM4QQAQJ0EASARAIAEoApABIAEoAqgBEBcgAUEANgKsAQwCCyABIAEoAqgBQjggAUFAayABKAKQARBCIgU2AqQBIAVFBEAgAUEANgKsAQwCCyABQQE6ABcLIAEoAqQBQgQQHigAAEHQlpkwRwRAIAEoApABQRVBABAUIAEtABdBAXEEQCABKAKkARAWCyABQQA2AqwBDAELIAEgASgCpAEQMTcDMAJAIAEoApQBQQRxRQ0AIAEpAzAgASkDOHxCDHwgASkDmAEgASkDGHxRDQAgASgCkAFBFUEAEBQgAS0AF0EBcQRAIAEoAqQBEBYLIAFBADYCrAEMAQsgASgCpAFCBBAeGiABIAEoAqQBECo2AgwgASABKAKkARAqNgIEIAEoAhBB//8DRgRAIAEgASgCDDYCEAsgASgCCEH//wNGBEAgASABKAIENgIICwJAIAEoApQBQQRxRQ0AIAEoAgggASgCBEYEQCABKAIQIAEoAgxGDQELIAEoApABQRVBABAUIAEtABdBAXEEQCABKAKkARAWCyABQQA2AqwBDAELAkAgASgCEEUEQCABKAIIRQ0BCyABKAKQAUEBQQAQFCABLQAXQQFxBEAgASgCpAEQFgsgAUEANgKsAQwBCyABIAEoAqQBEDE3AyggASABKAKkARAxNwMgIAEpAyggASkDIFIEQCABKAKQAUEBQQAQFCABLQAXQQFxBEAgASgCpAEQFgsgAUEANgKsAQwBCyABIAEoAqQBEDE3AzAgASABKAKkARAxNwOAAQJ/IwBBEGsiBSABKAKkATYCDCAFKAIMLQAAQQFxRQsEQCABKAKQAUEUQQAQFCABLQAXQQFxBEAgASgCpAEQFgsgAUEANgKsAQwBCyABLQAXQQFxBEAgASgCpAEQFgsCQCABKQOAAUL///////////8AWARAIAEpA4ABIAEpA4ABIAEpAzB8WA0BCyABKAKQAUEEQRYQFCABQQA2AqwBDAELIAEpA4ABIAEpAzB8IAEpA5gBIAEpAzh8VgRAIAEoApABQRVBABAUIAFBADYCrAEMAQsCQCABKAKUAUEEcUUNACABKQOAASABKQMwfCABKQOYASABKQM4fFENACABKAKQAUEVQQAQFCABQQA2AqwBDAELIAEpAyggASkDMEIugFYEQCABKAKQAUEVQQAQFCABQQA2AqwBDAELIAEgASkDKCABKAKQARCQASIFNgKMASAFRQRAIAFBADYCrAEMAQsgASgCjAFBAToALCABKAKMASABKQMwNwMYIAEoAowBIAEpA4ABNwMgIAEgASgCjAE2AqwBCyABKAKsASEFIAFBsAFqJAAgACAFNgJQDAELIAAoAmQgACkDMBAsGiAAKAJkIQUgACkDWCEJIAAoAmgoAhQhBiAAKAJUIQcjAEHQAGsiASQAIAEgBTYCSCABIAk3A0AgASAGNgI8IAEgBzYCOAJAIAEoAkgQMEIWVARAIAEoAjhBFUEAEBQgAUEANgJMDAELIwBBEGsiBSABKAJINgIMIAECfiAFKAIMLQAAQQFxBEAgBSgCDCkDEAwBC0IACzcDCCABKAJIQgQQHhogASgCSBAqBEAgASgCOEEBQQAQFCABQQA2AkwMAQsgASABKAJIEB1B//8Dca03AyggASABKAJIEB1B//8Dca03AyAgASkDICABKQMoUgRAIAEoAjhBE0EAEBQgAUEANgJMDAELIAEgASgCSBAqrTcDGCABIAEoAkgQKq03AxAgASkDECABKQMQIAEpAxh8VgRAIAEoAjhBBEEWEBQgAUEANgJMDAELIAEpAxAgASkDGHwgASkDQCABKQMIfFYEQCABKAI4QRVBABAUIAFBADYCTAwBCwJAIAEoAjxBBHFFDQAgASkDECABKQMYfCABKQNAIAEpAwh8UQ0AIAEoAjhBFUEAEBQgAUEANgJMDAELIAEgASkDICABKAI4EJABIgU2AjQgBUUEQCABQQA2AkwMAQsgASgCNEEAOgAsIAEoAjQgASkDGDcDGCABKAI0IAEpAxA3AyAgASABKAI0NgJMCyABKAJMIQUgAUHQAGokACAAIAU2AlALIAAoAlBFBEAgAEEANgJsDAELIAAoAmQgACkDMEIUfBAsGiAAIAAoAmQQHTsBTiAAKAJQKQMgIAAoAlApAxh8IAApA1ggACkDMHxWBEAgACgCVEEVQQAQFCAAKAJQECUgAEEANgJsDAELAkAgAC8BTkUEQCAAKAJoKAIEQQRxRQ0BCyAAKAJkIAApAzBCFnwQLBogACAAKAJkEDA3AyACQCAAKQMgIAAvAU6tWgRAIAAoAmgoAgRBBHFFDQEgACkDICAALwFOrVENAQsgACgCVEEVQQAQFCAAKAJQECUgAEEANgJsDAILIAAvAU4EQCAAKAJkIAAvAU6tEB4gAC8BTkEAIAAoAlQQUCEBIAAoAlAgATYCKCABRQRAIAAoAlAQJSAAQQA2AmwMAwsLCwJAIAAoAlApAyAgACkDWFoEQCAAKAJkIAAoAlApAyAgACkDWH0QLBogACAAKAJkIAAoAlApAxgQHiIBNgIcIAFFBEAgACgCVEEVQQAQFCAAKAJQECUgAEEANgJsDAMLIAAgACgCHCAAKAJQKQMYECkiATYCLCABRQRAIAAoAlRBDkEAEBQgACgCUBAlIABBADYCbAwDCwwBCyAAQQA2AiwgACgCaCgCACAAKAJQKQMgQQAQJ0EASARAIAAoAlQgACgCaCgCABAXIAAoAlAQJSAAQQA2AmwMAgsgACgCaCgCABBJIAAoAlApAyBSBEAgACgCVEETQQAQFCAAKAJQECUgAEEANgJsDAILCyAAIAAoAlApAxg3AzggAEIANwNAA0ACQCAAKQM4UA0AIABBADoAGyAAKQNAIAAoAlApAwhRBEAgACgCUC0ALEEBcQ0BIAApAzhCLlQNASAAKAJQQoCABCAAKAJUEI8BQQFxRQRAIAAoAlAQJSAAKAIsEBYgAEEANgJsDAQLIABBAToAGwsjAEEQayIBJAAgAUHYABAYIgU2AggCQCAFRQRAIAFBADYCDAwBCyABKAIIEFMgASABKAIINgIMCyABKAIMIQUgAUEQaiQAIAUhASAAKAJQKAIAIAApA0CnQQR0aiABNgIAAkAgAQRAIAAgACgCUCgCACAAKQNAp0EEdGooAgAgACgCaCgCACAAKAIsQQAgACgCVBCMASIJNwMQIAlCAFkNAQsCQCAALQAbQQFxRQ0AIwBBEGsiASAAKAJUNgIMIAEoAgwoAgBBE0cNACAAKAJUQRVBABAUCyAAKAJQECUgACgCLBAWIABBADYCbAwDCyAAIAApA0BCAXw3A0AgACAAKQM4IAApAxB9NwM4DAELCwJAIAApA0AgACgCUCkDCFEEQCAAKQM4UA0BCyAAKAJUQRVBABAUIAAoAiwQFiAAKAJQECUgAEEANgJsDAELIAAoAmgoAgRBBHEEQAJAIAAoAiwEQCAAIAAoAiwQR0EBcToADwwBCyAAIAAoAmgoAgAQSTcDACAAKQMAQgBTBEAgACgCVCAAKAJoKAIAEBcgACgCUBAlIABBADYCbAwDCyAAIAApAwAgACgCUCkDICAAKAJQKQMYfFE6AA8LIAAtAA9BAXFFBEAgACgCVEEVQQAQFCAAKAIsEBYgACgCUBAlIABBADYCbAwCCwsgACgCLBAWIAAgACgCUDYCbAsgACgCbCEBIABB8ABqJAAgAiABNgJIIAEEQAJAIAIoAkwEQCACKQMgQgBXBEAgAiACKAJYIAIoAkwgAkEQahBoNwMgCyACIAIoAlggAigCSCACQRBqEGg3AygCQCACKQMgIAIpAyhTBEAgAigCTBAlIAIgAigCSDYCTCACIAIpAyg3AyAMAQsgAigCSBAlCwwBCyACIAIoAkg2AkwCQCACKAJYKAIEQQRxBEAgAiACKAJYIAIoAkwgAkEQahBoNwMgDAELIAJCADcDIAsLIAJBADYCSAsgAiACKAJEQQFqNgJEIAIoAgwgAigCRAJ/IwBBEGsiACACKAIMNgIMIAAoAgwoAgQLa6wQLBoMAQsLIAIoAgwQFiACKQMgQgBTBEAgAigCWEEIaiACQRBqEEUgAigCTBAlIAJBADYCXAwBCyACIAIoAkw2AlwLIAIoAlwhACACQeAAaiQAIAMgADYCWCAARQRAIAMoAmAgAygCXEEIahBFIwBBEGsiACADKAJoNgIMIAAoAgwiACAAKAIwQQFqNgIwIAMoAlwQPCADQQA2AmwMAQsgAygCXCADKAJYKAIANgJAIAMoAlwgAygCWCkDCDcDMCADKAJcIAMoAlgpAxA3AzggAygCXCADKAJYKAIoNgIgIAMoAlgQFSADKAJcKAJQIQAgAygCXCkDMCEJIAMoAlxBCGohAiMAQSBrIgEkACABIAA2AhggASAJNwMQIAEgAjYCDAJAIAEpAxBQBEAgAUEBOgAfDAELIwBBIGsiACABKQMQNwMQIAAgACkDELpEAAAAAAAA6D+jOQMIAkAgACsDCEQAAOD////vQWQEQCAAQX82AgQMAQsgAAJ/IAArAwgiCkQAAAAAAADwQWMgCkQAAAAAAAAAAGZxBEAgCqsMAQtBAAs2AgQLAkAgACgCBEGAgICAeEsEQCAAQYCAgIB4NgIcDAELIAAgACgCBEEBazYCBCAAIAAoAgQgACgCBEEBdnI2AgQgACAAKAIEIAAoAgRBAnZyNgIEIAAgACgCBCAAKAIEQQR2cjYCBCAAIAAoAgQgACgCBEEIdnI2AgQgACAAKAIEIAAoAgRBEHZyNgIEIAAgACgCBEEBajYCBCAAIAAoAgQ2AhwLIAEgACgCHDYCCCABKAIIIAEoAhgoAgBNBEAgAUEBOgAfDAELIAEoAhggASgCCCABKAIMEFpBAXFFBEAgAUEAOgAfDAELIAFBAToAHwsgAS0AHxogAUEgaiQAIANCADcDEANAIAMpAxAgAygCXCkDMFQEQCADIAMoAlwoAkAgAykDEKdBBHRqKAIAKAIwQQBBACADKAJgEEY2AgwgAygCDEUEQCMAQRBrIgAgAygCaDYCDCAAKAIMIgAgACgCMEEBajYCMCADKAJcEDwgA0EANgJsDAMLIAMoAlwoAlAgAygCDCADKQMQQQggAygCXEEIahB0QQFxRQRAAkAgAygCXCgCCEEKRgRAIAMoAmRBBHFFDQELIAMoAmAgAygCXEEIahBFIwBBEGsiACADKAJoNgIMIAAoAgwiACAAKAIwQQFqNgIwIAMoAlwQPCADQQA2AmwMBAsLIAMgAykDEEIBfDcDEAwBCwsgAygCXCADKAJcKAIUNgIYIAMgAygCXDYCbAsgAygCbCEAIANB8ABqJAAgBCAANgI4CyAEKAI4RQRAIAQoAlgQLxogBEEANgJcDAELIAQgBCgCODYCXAsgBCgCXCEAIARB4ABqJAAgAAuOAQEBfyMAQRBrIgIkACACIAA2AgwgAiABNgIIIAJBADYCBCACKAIIBEAjAEEQayIAIAIoAgg2AgwgAiAAKAIMKAIANgIEIAIoAggQrAFBAUYEQCMAQRBrIgAgAigCCDYCDEG0mwEgACgCDCgCBDYCAAsLIAIoAgwEQCACKAIMIAIoAgQ2AgALIAJBEGokAAuVAQEBfyMAQRBrIgEkACABIAA2AggCQAJ/IwBBEGsiACABKAIINgIMIAAoAgwpAxhCgIAQg1ALBEAgASgCCCgCAARAIAEgASgCCCgCABCeAUEBcToADwwCCyABQQE6AA8MAQsgASABKAIIQQBCAEESECA+AgQgASABKAIEQQBHOgAPCyABLQAPQQFxIQAgAUEQaiQAIAALfwEBfyMAQSBrIgMkACADIAA2AhggAyABNwMQIANBADYCDCADIAI2AggCQCADKQMQQv///////////wBWBEAgAygCCEEEQT0QFCADQX82AhwMAQsgAyADKAIYIAMpAxAgAygCDCADKAIIEGo2AhwLIAMoAhwhACADQSBqJAAgAAt9ACACQQFGBEAgASAAKAIIIAAoAgRrrH0hAQsCQCAAKAIUIAAoAhxLBEAgAEEAQQAgACgCJBEBABogACgCFEUNAQsgAEEANgIcIABCADcDECAAIAEgAiAAKAIoEQ8AQgBTDQAgAEIANwIEIAAgACgCAEFvcTYCAEEADwtBfwvhAgECfyMAQSBrIgMkAAJ/AkACQEGnEiABLAAAEKIBRQRAQbSbAUEcNgIADAELQZgJEBgiAg0BC0EADAELIAJBAEGQARAzIAFBKxCiAUUEQCACQQhBBCABLQAAQfIARhs2AgALAkAgAS0AAEHhAEcEQCACKAIAIQEMAQsgAEEDQQAQBCIBQYAIcUUEQCADIAFBgAhyNgIQIABBBCADQRBqEAQaCyACIAIoAgBBgAFyIgE2AgALIAJB/wE6AEsgAkGACDYCMCACIAA2AjwgAiACQZgBajYCLAJAIAFBCHENACADIANBGGo2AgAgAEGTqAEgAxAODQAgAkEKOgBLCyACQRo2AiggAkEbNgIkIAJBHDYCICACQR02AgxB6J8BKAIARQRAIAJBfzYCTAsgAkGsoAEoAgA2AjhBrKABKAIAIgAEQCAAIAI2AjQLQaygASACNgIAIAILIQAgA0EgaiQAIAAL8AEBAn8CfwJAIAFB/wFxIgMEQCAAQQNxBEADQCAALQAAIgJFDQMgAiABQf8BcUYNAyAAQQFqIgBBA3ENAAsLAkAgACgCACICQX9zIAJBgYKECGtxQYCBgoR4cQ0AIANBgYKECGwhAwNAIAIgA3MiAkF/cyACQYGChAhrcUGAgYKEeHENASAAKAIEIQIgAEEEaiEAIAJBgYKECGsgAkF/c3FBgIGChHhxRQ0ACwsDQCAAIgItAAAiAwRAIAJBAWohACADIAFB/wFxRw0BCwsgAgwCCyAAEC4gAGoMAQsgAAsiAEEAIAAtAAAgAUH/AXFGGwsYACAAKAJMQX9MBEAgABCkAQ8LIAAQpAELYAIBfgJ/IAAoAighAkEBIQMgAEIAIAAtAABBgAFxBH9BAkEBIAAoAhQgACgCHEsbBUEBCyACEQ8AIgFCAFkEfiAAKAIUIAAoAhxrrCABIAAoAgggACgCBGusfXwFIAELC2sBAX8gAARAIAAoAkxBf0wEQCAAEG4PCyAAEG4PC0GwoAEoAgAEQEGwoAEoAgAQpQEhAQtBrKABKAIAIgAEQANAIAAoAkwaIAAoAhQgACgCHEsEQCAAEG4gAXIhAQsgACgCOCIADQALCyABCyIAIAAgARACIgBBgWBPBH9BtJsBQQAgAGs2AgBBfwUgAAsLUwEDfwJAIAAoAgAsAABBMGtBCk8NAANAIAAoAgAiAiwAACEDIAAgAkEBajYCACABIANqQTBrIQEgAiwAAUEwa0EKTw0BIAFBCmwhAQwACwALIAELuwIAAkAgAUEUSw0AAkACQAJAAkACQAJAAkACQAJAAkAgAUEJaw4KAAECAwQFBgcICQoLIAIgAigCACIBQQRqNgIAIAAgASgCADYCAA8LIAIgAigCACIBQQRqNgIAIAAgATQCADcDAA8LIAIgAigCACIBQQRqNgIAIAAgATUCADcDAA8LIAIgAigCAEEHakF4cSIBQQhqNgIAIAAgASkDADcDAA8LIAIgAigCACIBQQRqNgIAIAAgATIBADcDAA8LIAIgAigCACIBQQRqNgIAIAAgATMBADcDAA8LIAIgAigCACIBQQRqNgIAIAAgATAAADcDAA8LIAIgAigCACIBQQRqNgIAIAAgATEAADcDAA8LIAIgAigCAEEHakF4cSIBQQhqNgIAIAAgASsDADkDAA8LIAAgAkEYEQQACwt/AgF/AX4gAL0iA0I0iKdB/w9xIgJB/w9HBHwgAkUEQCABIABEAAAAAAAAAABhBH9BAAUgAEQAAAAAAADwQ6IgARCpASEAIAEoAgBBQGoLNgIAIAAPCyABIAJB/gdrNgIAIANC/////////4eAf4NCgICAgICAgPA/hL8FIAALC5sCACAARQRAQQAPCwJ/AkAgAAR/IAFB/wBNDQECQEGQmQEoAgAoAgBFBEAgAUGAf3FBgL8DRg0DDAELIAFB/w9NBEAgACABQT9xQYABcjoAASAAIAFBBnZBwAFyOgAAQQIMBAsgAUGAsANPQQAgAUGAQHFBgMADRxtFBEAgACABQT9xQYABcjoAAiAAIAFBDHZB4AFyOgAAIAAgAUEGdkE/cUGAAXI6AAFBAwwECyABQYCABGtB//8/TQRAIAAgAUE/cUGAAXI6AAMgACABQRJ2QfABcjoAACAAIAFBBnZBP3FBgAFyOgACIAAgAUEMdkE/cUGAAXI6AAFBBAwECwtBtJsBQRk2AgBBfwVBAQsMAQsgACABOgAAQQELC+MBAQJ/IAJBAEchAwJAAkACQCAAQQNxRQ0AIAJFDQAgAUH/AXEhBANAIAAtAAAgBEYNAiACQQFrIgJBAEchAyAAQQFqIgBBA3FFDQEgAg0ACwsgA0UNAQsCQCAALQAAIAFB/wFxRg0AIAJBBEkNACABQf8BcUGBgoQIbCEDA0AgACgCACADcyIEQX9zIARBgYKECGtxQYCBgoR4cQ0BIABBBGohACACQQRrIgJBA0sNAAsLIAJFDQAgAUH/AXEhAQNAIAEgAC0AAEYEQCAADwsgAEEBaiEAIAJBAWsiAg0ACwtBAAtaAQF/IwBBEGsiASAANgIIAkACQCABKAIIKAIAQQBOBEAgASgCCCgCAEGAFCgCAEgNAQsgAUEANgIMDAELIAEgASgCCCgCAEECdEGQFGooAgA2AgwLIAEoAgwL+QIBAX8jAEEgayIEJAAgBCAANgIYIAQgATcDECAEIAI2AgwgBCADNgIIIAQgBCgCGCAEKAIYIAQpAxAgBCgCDCAEKAIIEK4BIgA2AgACQCAARQRAIARBADYCHAwBCyAEKAIAEEhBAEgEQCAEKAIYQQhqIAQoAgAQFyAEKAIAEBsgBEEANgIcDAELIAQoAhghAiMAQRBrIgAkACAAIAI2AgggAEEYEBgiAjYCBAJAIAJFBEAgACgCCEEIakEOQQAQFCAAQQA2AgwMAQsgACgCBCAAKAIINgIAIwBBEGsiAiAAKAIEQQRqNgIMIAIoAgxBADYCACACKAIMQQA2AgQgAigCDEEANgIIIAAoAgRBADoAECAAKAIEQQA2AhQgACAAKAIENgIMCyAAKAIMIQIgAEEQaiQAIAQgAjYCBCACRQRAIAQoAgAQGyAEQQA2AhwMAQsgBCgCBCAEKAIANgIUIAQgBCgCBDYCHAsgBCgCHCEAIARBIGokACAAC7cOAgN/AX4jAEHAAWsiBSQAIAUgADYCuAEgBSABNgK0ASAFIAI3A6gBIAUgAzYCpAEgBUIANwOYASAFQgA3A5ABIAUgBDYCjAECQCAFKAK4AUUEQCAFQQA2ArwBDAELAkAgBSgCtAEEQCAFKQOoASAFKAK0ASkDMFQNAQsgBSgCuAFBCGpBEkEAEBQgBUEANgK8AQwBCwJAIAUoAqQBQQhxDQAgBSgCtAEoAkAgBSkDqAGnQQR0aigCCEUEQCAFKAK0ASgCQCAFKQOoAadBBHRqLQAMQQFxRQ0BCyAFKAK4AUEIakEPQQAQFCAFQQA2ArwBDAELIAUoArQBIAUpA6gBIAUoAqQBQQhyIAVByABqEH5BAEgEQCAFKAK4AUEIakEUQQAQFCAFQQA2ArwBDAELIAUoAqQBQSBxBEAgBSAFKAKkAUEEcjYCpAELAkAgBSkDmAFQBEAgBSkDkAFQDQELIAUoAqQBQQRxRQ0AIAUoArgBQQhqQRJBABAUIAVBADYCvAEMAQsCQCAFKQOYAVAEQCAFKQOQAVANAQsgBSkDmAEgBSkDmAEgBSkDkAF8WARAIAUpA2AgBSkDmAEgBSkDkAF8Wg0BCyAFKAK4AUEIakESQQAQFCAFQQA2ArwBDAELIAUpA5ABUARAIAUgBSkDYCAFKQOYAX03A5ABCyAFIAUpA5ABIAUpA2BUOgBHIAUgBSgCpAFBIHEEf0EABSAFLwF6QQBHC0EBcToARSAFIAUoAqQBQQRxBH9BAAUgBS8BeEEARwtBAXE6AEQgBQJ/IAUoAqQBQQRxBEBBACAFLwF4DQEaCyAFLQBHQX9zC0EBcToARiAFLQBFQQFxBEAgBSgCjAFFBEAgBSAFKAK4ASgCHDYCjAELIAUoAowBRQRAIAUoArgBQQhqQRpBABAUIAVBADYCvAEMAgsLIAUpA2hQBEAgBSAFKAK4AUEAQgBBABB9NgK8AQwBCwJAAkAgBS0AR0EBcUUNACAFLQBFQQFxDQAgBS0AREEBcQ0AIAUgBSkDkAE3AyAgBSAFKQOQATcDKCAFQQA7ATggBSAFKAJwNgIwIAVC3AA3AwggBSAFKAK0ASgCACAFKQOYASAFKQOQASAFQQhqQQAgBSgCtAEgBSkDqAEgBSgCuAFBCGoQXyIANgKIAQwBCyAFIAUoArQBIAUpA6gBIAUoAqQBIAUoArgBQQhqED8iADYCBCAARQRAIAVBADYCvAEMAgsgBSAFKAK0ASgCAEIAIAUpA2ggBUHIAGogBSgCBC8BDEEBdkEDcSAFKAK0ASAFKQOoASAFKAK4AUEIahBfIgA2AogBCyAARQRAIAVBADYCvAEMAQsCfyAFKAKIASEAIAUoArQBIQMjAEEQayIBJAAgASAANgIMIAEgAzYCCCABKAIMIAEoAgg2AiwgASgCCCEDIAEoAgwhBCMAQSBrIgAkACAAIAM2AhggACAENgIUAkAgACgCGCgCSCAAKAIYKAJEQQFqTQRAIAAgACgCGCgCSEEKajYCDCAAIAAoAhgoAkwgACgCDEECdBBONgIQIAAoAhBFBEAgACgCGEEIakEOQQAQFCAAQX82AhwMAgsgACgCGCAAKAIMNgJIIAAoAhggACgCEDYCTAsgACgCFCEEIAAoAhgoAkwhBiAAKAIYIgcoAkQhAyAHIANBAWo2AkQgA0ECdCAGaiAENgIAIABBADYCHAsgACgCHCEDIABBIGokACABQRBqJAAgA0EASAsEQCAFKAKIARAbIAVBADYCvAEMAQsgBS0ARUEBcQRAIAUgBS8BekEAEHsiADYCACAARQRAIAUoArgBQQhqQRhBABAUIAVBADYCvAEMAgsgBSAFKAK4ASAFKAKIASAFLwF6QQAgBSgCjAEgBSgCABEFADYChAEgBSgCiAEQGyAFKAKEAUUEQCAFQQA2ArwBDAILIAUgBSgChAE2AogBCyAFLQBEQQFxBEAgBSAFKAK4ASAFKAKIASAFLwF4ELABNgKEASAFKAKIARAbIAUoAoQBRQRAIAVBADYCvAEMAgsgBSAFKAKEATYCiAELIAUtAEZBAXEEQCAFIAUoArgBIAUoAogBQQEQrwE2AoQBIAUoAogBEBsgBSgChAFFBEAgBUEANgK8AQwCCyAFIAUoAoQBNgKIAQsCQCAFLQBHQQFxRQ0AIAUtAEVBAXFFBEAgBS0AREEBcUUNAQsgBSgCuAEhASAFKAKIASEDIAUpA5gBIQIgBSkDkAEhCCMAQSBrIgAkACAAIAE2AhwgACADNgIYIAAgAjcDECAAIAg3AwggACgCGCAAKQMQIAApAwhBAEEAQQBCACAAKAIcQQhqEF8hASAAQSBqJAAgBSABNgKEASAFKAKIARAbIAUoAoQBRQRAIAVBADYCvAEMAgsgBSAFKAKEATYCiAELIAUgBSgCiAE2ArwBCyAFKAK8ASEAIAVBwAFqJAAgAAuEAgEBfyMAQSBrIgMkACADIAA2AhggAyABNgIUIAMgAjYCEAJAIAMoAhRFBEAgAygCGEEIakESQQAQFCADQQA2AhwMAQsgA0E4EBgiADYCDCAARQRAIAMoAhhBCGpBDkEAEBQgA0EANgIcDAELIwBBEGsiACADKAIMQQhqNgIMIAAoAgxBADYCACAAKAIMQQA2AgQgACgCDEEANgIIIAMoAgwgAygCEDYCACADKAIMQQA2AgQgAygCDEIANwMoQQBBAEEAEBohACADKAIMIAA2AjAgAygCDEIANwMYIAMgAygCGCADKAIUQRQgAygCDBBhNgIcCyADKAIcIQAgA0EgaiQAIAALQwEBfyMAQRBrIgMkACADIAA2AgwgAyABNgIIIAMgAjYCBCADKAIMIAMoAgggAygCBEEAQQAQsgEhACADQRBqJAAgAAtJAQF/IwBBEGsiASQAIAEgADYCDCABKAIMBEAgASgCDCgCrEAgASgCDCgCqEAoAgQRAgAgASgCDBA4IAEoAgwQFQsgAUEQaiQAC5QFAQF/IwBBMGsiBSQAIAUgADYCKCAFIAE2AiQgBSACNgIgIAUgAzoAHyAFIAQ2AhggBUEANgIMAkAgBSgCJEUEQCAFKAIoQQhqQRJBABAUIAVBADYCLAwBCyAFIAUoAiAgBS0AH0EBcRCzASIANgIMIABFBEAgBSgCKEEIakEQQQAQFCAFQQA2AiwMAQsgBSgCICEBIAUtAB9BAXEhAiAFKAIYIQMgBSgCDCEEIwBBIGsiACQAIAAgATYCGCAAIAI6ABcgACADNgIQIAAgBDYCDCAAQbDAABAYIgE2AggCQCABRQRAIABBADYCHAwBCyMAQRBrIgEgACgCCDYCDCABKAIMQQA2AgAgASgCDEEANgIEIAEoAgxBADYCCCAAKAIIAn8gAC0AF0EBcQRAIAAoAhhBf0cEfyAAKAIYQX5GBUEBC0EBcQwBC0EAC0EARzoADiAAKAIIIAAoAgw2AqhAIAAoAgggACgCGDYCFCAAKAIIIAAtABdBAXE6ABAgACgCCEEAOgAMIAAoAghBADoADSAAKAIIQQA6AA8gACgCCCgCqEAoAgAhAQJ/AkAgACgCGEF/RwRAIAAoAhhBfkcNAQtBCAwBCyAAKAIYC0H//wNxIAAoAhAgACgCCCABEQEAIQEgACgCCCABNgKsQCABRQRAIAAoAggQOCAAKAIIEBUgAEEANgIcDAELIAAgACgCCDYCHAsgACgCHCEBIABBIGokACAFIAE2AhQgAUUEQCAFKAIoQQhqQQ5BABAUIAVBADYCLAwBCyAFIAUoAiggBSgCJEETIAUoAhQQYSIANgIQIABFBEAgBSgCFBCxASAFQQA2AiwMAQsgBSAFKAIQNgIsCyAFKAIsIQAgBUEwaiQAIAALzAEBAX8jAEEgayICIAA2AhggAiABOgAXIAICfwJAIAIoAhhBf0cEQCACKAIYQX5HDQELQQgMAQsgAigCGAs7AQ4gAkEANgIQAkADQCACKAIQQdSXASgCAEkEQCACKAIQQQxsQdiXAWovAQAgAi8BDkYEQCACLQAXQQFxBEAgAiACKAIQQQxsQdiXAWooAgQ2AhwMBAsgAiACKAIQQQxsQdiXAWooAgg2AhwMAwUgAiACKAIQQQFqNgIQDAILAAsLIAJBADYCHAsgAigCHAvkAQEBfyMAQSBrIgMkACADIAA6ABsgAyABNgIUIAMgAjYCECADQcgAEBgiADYCDAJAIABFBEAgAygCEEEBQbSbASgCABAUIANBADYCHAwBCyADKAIMIAMoAhA2AgAgAygCDCADLQAbQQFxOgAEIAMoAgwgAygCFDYCCAJAIAMoAgwoAghBAU4EQCADKAIMKAIIQQlMDQELIAMoAgxBCTYCCAsgAygCDEEAOgAMIAMoAgxBADYCMCADKAIMQQA2AjQgAygCDEEANgI4IAMgAygCDDYCHAsgAygCHCEAIANBIGokACAACzgBAX8jAEEQayIBIAA2AgwgASgCDEEANgIAIAEoAgxBADYCBCABKAIMQQA2AgggASgCDEEAOgAMC+MIAQF/IwBBQGoiAiAANgI4IAIgATYCNCACIAIoAjgoAnw2AjAgAiACKAI4KAI4IAIoAjgoAmxqNgIsIAIgAigCOCgCeDYCICACIAIoAjgoApABNgIcIAICfyACKAI4KAJsIAIoAjgoAixBhgJrSwRAIAIoAjgoAmwgAigCOCgCLEGGAmtrDAELQQALNgIYIAIgAigCOCgCQDYCFCACIAIoAjgoAjQ2AhAgAiACKAI4KAI4IAIoAjgoAmxqQYICajYCDCACIAIoAiwgAigCIEEBa2otAAA6AAsgAiACKAIsIAIoAiBqLQAAOgAKIAIoAjgoAnggAigCOCgCjAFPBEAgAiACKAIwQQJ2NgIwCyACKAIcIAIoAjgoAnRLBEAgAiACKAI4KAJ0NgIcCwNAAkAgAiACKAI4KAI4IAIoAjRqNgIoAkAgAigCKCACKAIgai0AACACLQAKRw0AIAIoAiggAigCIEEBa2otAAAgAi0AC0cNACACKAIoLQAAIAIoAiwtAABHDQAgAiACKAIoIgBBAWo2AiggAC0AASACKAIsLQABRwRADAELIAIgAigCLEECajYCLCACIAIoAihBAWo2AigDQCACIAIoAiwiAEEBajYCLCAALQABIQEgAiACKAIoIgBBAWo2AigCf0EAIAAtAAEgAUcNABogAiACKAIsIgBBAWo2AiwgAC0AASEBIAIgAigCKCIAQQFqNgIoQQAgAC0AASABRw0AGiACIAIoAiwiAEEBajYCLCAALQABIQEgAiACKAIoIgBBAWo2AihBACAALQABIAFHDQAaIAIgAigCLCIAQQFqNgIsIAAtAAEhASACIAIoAigiAEEBajYCKEEAIAAtAAEgAUcNABogAiACKAIsIgBBAWo2AiwgAC0AASEBIAIgAigCKCIAQQFqNgIoQQAgAC0AASABRw0AGiACIAIoAiwiAEEBajYCLCAALQABIQEgAiACKAIoIgBBAWo2AihBACAALQABIAFHDQAaIAIgAigCLCIAQQFqNgIsIAAtAAEhASACIAIoAigiAEEBajYCKEEAIAAtAAEgAUcNABogAiACKAIsIgBBAWo2AiwgAC0AASEBIAIgAigCKCIAQQFqNgIoQQAgAC0AASABRw0AGiACKAIsIAIoAgxJC0EBcQ0ACyACQYICIAIoAgwgAigCLGtrNgIkIAIgAigCDEGCAms2AiwgAigCJCACKAIgSgRAIAIoAjggAigCNDYCcCACIAIoAiQ2AiAgAigCJCACKAIcTg0CIAIgAigCLCACKAIgQQFrai0AADoACyACIAIoAiwgAigCIGotAAA6AAoLCyACIAIoAhQgAigCNCACKAIQcUEBdGovAQAiATYCNEEAIQAgASACKAIYSwR/IAIgAigCMEEBayIANgIwIABBAEcFQQALQQFxDQELCwJAIAIoAiAgAigCOCgCdE0EQCACIAIoAiA2AjwMAQsgAiACKAI4KAJ0NgI8CyACKAI8C5IQAQF/IwBBMGsiAiQAIAIgADYCKCACIAE2AiQgAgJ/IAIoAigoAiwgAigCKCgCDEEFa0kEQCACKAIoKAIsDAELIAIoAigoAgxBBWsLNgIgIAJBADYCECACIAIoAigoAgAoAgQ2AgwDQAJAIAJB//8DNgIcIAIgAigCKCgCvC1BKmpBA3U2AhQgAigCKCgCACgCECACKAIUSQ0AIAIgAigCKCgCACgCECACKAIUazYCFCACIAIoAigoAmwgAigCKCgCXGs2AhggAigCHCACKAIYIAIoAigoAgAoAgRqSwRAIAIgAigCGCACKAIoKAIAKAIEajYCHAsgAigCHCACKAIUSwRAIAIgAigCFDYCHAsCQCACKAIcIAIoAiBPDQACQCACKAIcRQRAIAIoAiRBBEcNAQsgAigCJEUNACACKAIcIAIoAhggAigCKCgCACgCBGpGDQELDAELQQAhACACIAIoAiRBBEYEfyACKAIcIAIoAhggAigCKCgCACgCBGpGBUEAC0EBcTYCECACKAIoQQBBACACKAIQEF0gAigCKCgCCCACKAIoKAIUQQRraiACKAIcOgAAIAIoAigoAgggAigCKCgCFEEDa2ogAigCHEEIdjoAACACKAIoKAIIIAIoAigoAhRBAmtqIAIoAhxBf3M6AAAgAigCKCgCCCACKAIoKAIUQQFraiACKAIcQX9zQQh2OgAAIAIoAigoAgAQHCACKAIYBEAgAigCGCACKAIcSwRAIAIgAigCHDYCGAsgAigCKCgCACgCDCACKAIoKAI4IAIoAigoAlxqIAIoAhgQGRogAigCKCgCACIAIAIoAhggACgCDGo2AgwgAigCKCgCACIAIAAoAhAgAigCGGs2AhAgAigCKCgCACIAIAIoAhggACgCFGo2AhQgAigCKCIAIAIoAhggACgCXGo2AlwgAiACKAIcIAIoAhhrNgIcCyACKAIcBEAgAigCKCgCACACKAIoKAIAKAIMIAIoAhwQdhogAigCKCgCACIAIAIoAhwgACgCDGo2AgwgAigCKCgCACIAIAAoAhAgAigCHGs2AhAgAigCKCgCACIAIAIoAhwgACgCFGo2AhQLIAIoAhBFDQELCyACIAIoAgwgAigCKCgCACgCBGs2AgwgAigCDARAAkAgAigCDCACKAIoKAIsTwRAIAIoAihBAjYCsC0gAigCKCgCOCACKAIoKAIAKAIAIAIoAigoAixrIAIoAigoAiwQGRogAigCKCACKAIoKAIsNgJsDAELIAIoAgwgAigCKCgCPCACKAIoKAJsa08EQCACKAIoIgAgACgCbCACKAIoKAIsazYCbCACKAIoKAI4IAIoAigoAjggAigCKCgCLGogAigCKCgCbBAZGiACKAIoKAKwLUECSQRAIAIoAigiACAAKAKwLUEBajYCsC0LCyACKAIoKAI4IAIoAigoAmxqIAIoAigoAgAoAgAgAigCDGsgAigCDBAZGiACKAIoIgAgAigCDCAAKAJsajYCbAsgAigCKCACKAIoKAJsNgJcIAIoAigiAQJ/IAIoAgwgAigCKCgCLCACKAIoKAK0LWtLBEAgAigCKCgCLCACKAIoKAK0LWsMAQsgAigCDAsgASgCtC1qNgK0LQsgAigCKCgCwC0gAigCKCgCbEkEQCACKAIoIAIoAigoAmw2AsAtCwJAIAIoAhAEQCACQQM2AiwMAQsCQCACKAIkRQ0AIAIoAiRBBEYNACACKAIoKAIAKAIEDQAgAigCKCgCbCACKAIoKAJcRw0AIAJBATYCLAwBCyACIAIoAigoAjwgAigCKCgCbGtBAWs2AhQCQCACKAIoKAIAKAIEIAIoAhRNDQAgAigCKCgCXCACKAIoKAIsSA0AIAIoAigiACAAKAJcIAIoAigoAixrNgJcIAIoAigiACAAKAJsIAIoAigoAixrNgJsIAIoAigoAjggAigCKCgCOCACKAIoKAIsaiACKAIoKAJsEBkaIAIoAigoArAtQQJJBEAgAigCKCIAIAAoArAtQQFqNgKwLQsgAiACKAIoKAIsIAIoAhRqNgIUCyACKAIUIAIoAigoAgAoAgRLBEAgAiACKAIoKAIAKAIENgIUCyACKAIUBEAgAigCKCgCACACKAIoKAI4IAIoAigoAmxqIAIoAhQQdhogAigCKCIAIAIoAhQgACgCbGo2AmwLIAIoAigoAsAtIAIoAigoAmxJBEAgAigCKCACKAIoKAJsNgLALQsgAiACKAIoKAK8LUEqakEDdTYCFCACIAIoAigoAgwgAigCFGtB//8DSwR/Qf//AwUgAigCKCgCDCACKAIUaws2AhQgAgJ/IAIoAhQgAigCKCgCLEsEQCACKAIoKAIsDAELIAIoAhQLNgIgIAIgAigCKCgCbCACKAIoKAJcazYCGAJAIAIoAhggAigCIEkEQCACKAIYRQRAIAIoAiRBBEcNAgsgAigCJEUNASACKAIoKAIAKAIEDQEgAigCGCACKAIUSw0BCyACAn8gAigCGCACKAIUSwRAIAIoAhQMAQsgAigCGAs2AhwgAgJ/QQAgAigCJEEERw0AGkEAIAIoAigoAgAoAgQNABogAigCHCACKAIYRgtBAXE2AhAgAigCKCACKAIoKAI4IAIoAigoAlxqIAIoAhwgAigCEBBdIAIoAigiACACKAIcIAAoAlxqNgJcIAIoAigoAgAQHAsgAkECQQAgAigCEBs2AiwLIAIoAiwhACACQTBqJAAgAAuyAgEBfyMAQRBrIgEkACABIAA2AggCQCABKAIIEHgEQCABQX42AgwMAQsgASABKAIIKAIcKAIENgIEIAEoAggoAhwoAggEQCABKAIIKAIoIAEoAggoAhwoAgggASgCCCgCJBEEAAsgASgCCCgCHCgCRARAIAEoAggoAiggASgCCCgCHCgCRCABKAIIKAIkEQQACyABKAIIKAIcKAJABEAgASgCCCgCKCABKAIIKAIcKAJAIAEoAggoAiQRBAALIAEoAggoAhwoAjgEQCABKAIIKAIoIAEoAggoAhwoAjggASgCCCgCJBEEAAsgASgCCCgCKCABKAIIKAIcIAEoAggoAiQRBAAgASgCCEEANgIcIAFBfUEAIAEoAgRB8QBGGzYCDAsgASgCDCEAIAFBEGokACAAC+sXAQJ/IwBB8ABrIgMgADYCbCADIAE2AmggAyACNgJkIANBfzYCXCADIAMoAmgvAQI2AlQgA0EANgJQIANBBzYCTCADQQQ2AkggAygCVEUEQCADQYoBNgJMIANBAzYCSAsgA0EANgJgA0AgAygCYCADKAJkSkUEQCADIAMoAlQ2AlggAyADKAJoIAMoAmBBAWpBAnRqLwECNgJUIAMgAygCUEEBaiIANgJQAkACQCADKAJMIABMDQAgAygCWCADKAJURw0ADAELAkAgAygCUCADKAJISARAA0AgAyADKAJsQfwUaiADKAJYQQJ0ai8BAjYCRAJAIAMoAmwoArwtQRAgAygCRGtKBEAgAyADKAJsQfwUaiADKAJYQQJ0ai8BADYCQCADKAJsIgAgAC8BuC0gAygCQEH//wNxIAMoAmwoArwtdHI7AbgtIAMoAmwvAbgtQf8BcSEBIAMoAmwoAgghAiADKAJsIgQoAhQhACAEIABBAWo2AhQgACACaiABOgAAIAMoAmwvAbgtQQh2IQEgAygCbCgCCCECIAMoAmwiBCgCFCEAIAQgAEEBajYCFCAAIAJqIAE6AAAgAygCbCADKAJAQf//A3FBECADKAJsKAK8LWt1OwG4LSADKAJsIgAgACgCvC0gAygCREEQa2o2ArwtDAELIAMoAmwiACAALwG4LSADKAJsQfwUaiADKAJYQQJ0ai8BACADKAJsKAK8LXRyOwG4LSADKAJsIgAgAygCRCAAKAK8LWo2ArwtCyADIAMoAlBBAWsiADYCUCAADQALDAELAkAgAygCWARAIAMoAlggAygCXEcEQCADIAMoAmxB/BRqIAMoAlhBAnRqLwECNgI8AkAgAygCbCgCvC1BECADKAI8a0oEQCADIAMoAmxB/BRqIAMoAlhBAnRqLwEANgI4IAMoAmwiACAALwG4LSADKAI4Qf//A3EgAygCbCgCvC10cjsBuC0gAygCbC8BuC1B/wFxIQEgAygCbCgCCCECIAMoAmwiBCgCFCEAIAQgAEEBajYCFCAAIAJqIAE6AAAgAygCbC8BuC1BCHYhASADKAJsKAIIIQIgAygCbCIEKAIUIQAgBCAAQQFqNgIUIAAgAmogAToAACADKAJsIAMoAjhB//8DcUEQIAMoAmwoArwta3U7AbgtIAMoAmwiACAAKAK8LSADKAI8QRBrajYCvC0MAQsgAygCbCIAIAAvAbgtIAMoAmxB/BRqIAMoAlhBAnRqLwEAIAMoAmwoArwtdHI7AbgtIAMoAmwiACADKAI8IAAoArwtajYCvC0LIAMgAygCUEEBazYCUAsgAyADKAJsLwG+FTYCNAJAIAMoAmwoArwtQRAgAygCNGtKBEAgAyADKAJsLwG8FTYCMCADKAJsIgAgAC8BuC0gAygCMEH//wNxIAMoAmwoArwtdHI7AbgtIAMoAmwvAbgtQf8BcSEBIAMoAmwoAgghAiADKAJsIgQoAhQhACAEIABBAWo2AhQgACACaiABOgAAIAMoAmwvAbgtQQh2IQEgAygCbCgCCCECIAMoAmwiBCgCFCEAIAQgAEEBajYCFCAAIAJqIAE6AAAgAygCbCADKAIwQf//A3FBECADKAJsKAK8LWt1OwG4LSADKAJsIgAgACgCvC0gAygCNEEQa2o2ArwtDAELIAMoAmwiACAALwG4LSADKAJsLwG8FSADKAJsKAK8LXRyOwG4LSADKAJsIgAgAygCNCAAKAK8LWo2ArwtCyADQQI2AiwCQCADKAJsKAK8LUEQIAMoAixrSgRAIAMgAygCUEEDazYCKCADKAJsIgAgAC8BuC0gAygCKEH//wNxIAMoAmwoArwtdHI7AbgtIAMoAmwvAbgtQf8BcSEBIAMoAmwoAgghAiADKAJsIgQoAhQhACAEIABBAWo2AhQgACACaiABOgAAIAMoAmwvAbgtQQh2IQEgAygCbCgCCCECIAMoAmwiBCgCFCEAIAQgAEEBajYCFCAAIAJqIAE6AAAgAygCbCADKAIoQf//A3FBECADKAJsKAK8LWt1OwG4LSADKAJsIgAgACgCvC0gAygCLEEQa2o2ArwtDAELIAMoAmwiACAALwG4LSADKAJQQQNrQf//A3EgAygCbCgCvC10cjsBuC0gAygCbCIAIAMoAiwgACgCvC1qNgK8LQsMAQsCQCADKAJQQQpMBEAgAyADKAJsLwHCFTYCJAJAIAMoAmwoArwtQRAgAygCJGtKBEAgAyADKAJsLwHAFTYCICADKAJsIgAgAC8BuC0gAygCIEH//wNxIAMoAmwoArwtdHI7AbgtIAMoAmwvAbgtQf8BcSEBIAMoAmwoAgghAiADKAJsIgQoAhQhACAEIABBAWo2AhQgACACaiABOgAAIAMoAmwvAbgtQQh2IQEgAygCbCgCCCECIAMoAmwiBCgCFCEAIAQgAEEBajYCFCAAIAJqIAE6AAAgAygCbCADKAIgQf//A3FBECADKAJsKAK8LWt1OwG4LSADKAJsIgAgACgCvC0gAygCJEEQa2o2ArwtDAELIAMoAmwiACAALwG4LSADKAJsLwHAFSADKAJsKAK8LXRyOwG4LSADKAJsIgAgAygCJCAAKAK8LWo2ArwtCyADQQM2AhwCQCADKAJsKAK8LUEQIAMoAhxrSgRAIAMgAygCUEEDazYCGCADKAJsIgAgAC8BuC0gAygCGEH//wNxIAMoAmwoArwtdHI7AbgtIAMoAmwvAbgtQf8BcSEBIAMoAmwoAgghAiADKAJsIgQoAhQhACAEIABBAWo2AhQgACACaiABOgAAIAMoAmwvAbgtQQh2IQEgAygCbCgCCCECIAMoAmwiBCgCFCEAIAQgAEEBajYCFCAAIAJqIAE6AAAgAygCbCADKAIYQf//A3FBECADKAJsKAK8LWt1OwG4LSADKAJsIgAgACgCvC0gAygCHEEQa2o2ArwtDAELIAMoAmwiACAALwG4LSADKAJQQQNrQf//A3EgAygCbCgCvC10cjsBuC0gAygCbCIAIAMoAhwgACgCvC1qNgK8LQsMAQsgAyADKAJsLwHGFTYCFAJAIAMoAmwoArwtQRAgAygCFGtKBEAgAyADKAJsLwHEFTYCECADKAJsIgAgAC8BuC0gAygCEEH//wNxIAMoAmwoArwtdHI7AbgtIAMoAmwvAbgtQf8BcSEBIAMoAmwoAgghAiADKAJsIgQoAhQhACAEIABBAWo2AhQgACACaiABOgAAIAMoAmwvAbgtQQh2IQEgAygCbCgCCCECIAMoAmwiBCgCFCEAIAQgAEEBajYCFCAAIAJqIAE6AAAgAygCbCADKAIQQf//A3FBECADKAJsKAK8LWt1OwG4LSADKAJsIgAgACgCvC0gAygCFEEQa2o2ArwtDAELIAMoAmwiACAALwG4LSADKAJsLwHEFSADKAJsKAK8LXRyOwG4LSADKAJsIgAgAygCFCAAKAK8LWo2ArwtCyADQQc2AgwCQCADKAJsKAK8LUEQIAMoAgxrSgRAIAMgAygCUEELazYCCCADKAJsIgAgAC8BuC0gAygCCEH//wNxIAMoAmwoArwtdHI7AbgtIAMoAmwvAbgtQf8BcSEBIAMoAmwoAgghAiADKAJsIgQoAhQhACAEIABBAWo2AhQgACACaiABOgAAIAMoAmwvAbgtQQh2IQEgAygCbCgCCCECIAMoAmwiBCgCFCEAIAQgAEEBajYCFCAAIAJqIAE6AAAgAygCbCADKAIIQf//A3FBECADKAJsKAK8LWt1OwG4LSADKAJsIgAgACgCvC0gAygCDEEQa2o2ArwtDAELIAMoAmwiACAALwG4LSADKAJQQQtrQf//A3EgAygCbCgCvC10cjsBuC0gAygCbCIAIAMoAgwgACgCvC1qNgK8LQsLCwsgA0EANgJQIAMgAygCWDYCXAJAIAMoAlRFBEAgA0GKATYCTCADQQM2AkgMAQsCQCADKAJYIAMoAlRGBEAgA0EGNgJMIANBAzYCSAwBCyADQQc2AkwgA0EENgJICwsLIAMgAygCYEEBajYCYAwBCwsLkQQBAX8jAEEwayIDIAA2AiwgAyABNgIoIAMgAjYCJCADQX82AhwgAyADKAIoLwECNgIUIANBADYCECADQQc2AgwgA0EENgIIIAMoAhRFBEAgA0GKATYCDCADQQM2AggLIAMoAiggAygCJEEBakECdGpB//8DOwECIANBADYCIANAIAMoAiAgAygCJEpFBEAgAyADKAIUNgIYIAMgAygCKCADKAIgQQFqQQJ0ai8BAjYCFCADIAMoAhBBAWoiADYCEAJAAkAgAygCDCAATA0AIAMoAhggAygCFEcNAAwBCwJAIAMoAhAgAygCCEgEQCADKAIsQfwUaiADKAIYQQJ0aiIAIAMoAhAgAC8BAGo7AQAMAQsCQCADKAIYBEAgAygCGCADKAIcRwRAIAMoAiwgAygCGEECdGpB/BRqIgAgAC8BAEEBajsBAAsgAygCLCIAIABBvBVqLwEAQQFqOwG8FQwBCwJAIAMoAhBBCkwEQCADKAIsIgAgAEHAFWovAQBBAWo7AcAVDAELIAMoAiwiACAAQcQVai8BAEEBajsBxBULCwsgA0EANgIQIAMgAygCGDYCHAJAIAMoAhRFBEAgA0GKATYCDCADQQM2AggMAQsCQCADKAIYIAMoAhRGBEAgA0EGNgIMIANBAzYCCAwBCyADQQc2AgwgA0EENgIICwsLIAMgAygCIEEBajYCIAwBCwsLpxIBAn8jAEHQAGsiAyAANgJMIAMgATYCSCADIAI2AkQgA0EANgI4IAMoAkwoAqAtBEADQCADIAMoAkwoAqQtIAMoAjhBAXRqLwEANgJAIAMoAkwoApgtIQAgAyADKAI4IgFBAWo2AjggAyAAIAFqLQAANgI8AkAgAygCQEUEQCADIAMoAkggAygCPEECdGovAQI2AiwCQCADKAJMKAK8LUEQIAMoAixrSgRAIAMgAygCSCADKAI8QQJ0ai8BADYCKCADKAJMIgAgAC8BuC0gAygCKEH//wNxIAMoAkwoArwtdHI7AbgtIAMoAkwvAbgtQf8BcSEBIAMoAkwoAgghAiADKAJMIgQoAhQhACAEIABBAWo2AhQgACACaiABOgAAIAMoAkwvAbgtQQh2IQEgAygCTCgCCCECIAMoAkwiBCgCFCEAIAQgAEEBajYCFCAAIAJqIAE6AAAgAygCTCADKAIoQf//A3FBECADKAJMKAK8LWt1OwG4LSADKAJMIgAgACgCvC0gAygCLEEQa2o2ArwtDAELIAMoAkwiACAALwG4LSADKAJIIAMoAjxBAnRqLwEAIAMoAkwoArwtdHI7AbgtIAMoAkwiACADKAIsIAAoArwtajYCvC0LDAELIAMgAygCPC0A0F02AjQgAyADKAJIIAMoAjRBgQJqQQJ0ai8BAjYCJAJAIAMoAkwoArwtQRAgAygCJGtKBEAgAyADKAJIIAMoAjRBgQJqQQJ0ai8BADYCICADKAJMIgAgAC8BuC0gAygCIEH//wNxIAMoAkwoArwtdHI7AbgtIAMoAkwvAbgtQf8BcSEBIAMoAkwoAgghAiADKAJMIgQoAhQhACAEIABBAWo2AhQgACACaiABOgAAIAMoAkwvAbgtQQh2IQEgAygCTCgCCCECIAMoAkwiBCgCFCEAIAQgAEEBajYCFCAAIAJqIAE6AAAgAygCTCADKAIgQf//A3FBECADKAJMKAK8LWt1OwG4LSADKAJMIgAgACgCvC0gAygCJEEQa2o2ArwtDAELIAMoAkwiACAALwG4LSADKAJIIAMoAjRBgQJqQQJ0ai8BACADKAJMKAK8LXRyOwG4LSADKAJMIgAgAygCJCAAKAK8LWo2ArwtCyADIAMoAjRBAnRBkOoAaigCADYCMCADKAIwBEAgAyADKAI8IAMoAjRBAnRBgO0AaigCAGs2AjwgAyADKAIwNgIcAkAgAygCTCgCvC1BECADKAIca0oEQCADIAMoAjw2AhggAygCTCIAIAAvAbgtIAMoAhhB//8DcSADKAJMKAK8LXRyOwG4LSADKAJMLwG4LUH/AXEhASADKAJMKAIIIQIgAygCTCIEKAIUIQAgBCAAQQFqNgIUIAAgAmogAToAACADKAJMLwG4LUEIdiEBIAMoAkwoAgghAiADKAJMIgQoAhQhACAEIABBAWo2AhQgACACaiABOgAAIAMoAkwgAygCGEH//wNxQRAgAygCTCgCvC1rdTsBuC0gAygCTCIAIAAoArwtIAMoAhxBEGtqNgK8LQwBCyADKAJMIgAgAC8BuC0gAygCPEH//wNxIAMoAkwoArwtdHI7AbgtIAMoAkwiACADKAIcIAAoArwtajYCvC0LCyADIAMoAkBBAWs2AkAgAwJ/IAMoAkBBgAJJBEAgAygCQC0A0FkMAQsgAygCQEEHdkGAAmotANBZCzYCNCADIAMoAkQgAygCNEECdGovAQI2AhQCQCADKAJMKAK8LUEQIAMoAhRrSgRAIAMgAygCRCADKAI0QQJ0ai8BADYCECADKAJMIgAgAC8BuC0gAygCEEH//wNxIAMoAkwoArwtdHI7AbgtIAMoAkwvAbgtQf8BcSEBIAMoAkwoAgghAiADKAJMIgQoAhQhACAEIABBAWo2AhQgACACaiABOgAAIAMoAkwvAbgtQQh2IQEgAygCTCgCCCECIAMoAkwiBCgCFCEAIAQgAEEBajYCFCAAIAJqIAE6AAAgAygCTCADKAIQQf//A3FBECADKAJMKAK8LWt1OwG4LSADKAJMIgAgACgCvC0gAygCFEEQa2o2ArwtDAELIAMoAkwiACAALwG4LSADKAJEIAMoAjRBAnRqLwEAIAMoAkwoArwtdHI7AbgtIAMoAkwiACADKAIUIAAoArwtajYCvC0LIAMgAygCNEECdEGQ6wBqKAIANgIwIAMoAjAEQCADIAMoAkAgAygCNEECdEGA7gBqKAIAazYCQCADIAMoAjA2AgwCQCADKAJMKAK8LUEQIAMoAgxrSgRAIAMgAygCQDYCCCADKAJMIgAgAC8BuC0gAygCCEH//wNxIAMoAkwoArwtdHI7AbgtIAMoAkwvAbgtQf8BcSEBIAMoAkwoAgghAiADKAJMIgQoAhQhACAEIABBAWo2AhQgACACaiABOgAAIAMoAkwvAbgtQQh2IQEgAygCTCgCCCECIAMoAkwiBCgCFCEAIAQgAEEBajYCFCAAIAJqIAE6AAAgAygCTCADKAIIQf//A3FBECADKAJMKAK8LWt1OwG4LSADKAJMIgAgACgCvC0gAygCDEEQa2o2ArwtDAELIAMoAkwiACAALwG4LSADKAJAQf//A3EgAygCTCgCvC10cjsBuC0gAygCTCIAIAMoAgwgACgCvC1qNgK8LQsLCyADKAI4IAMoAkwoAqAtSQ0ACwsgAyADKAJILwGCCDYCBAJAIAMoAkwoArwtQRAgAygCBGtKBEAgAyADKAJILwGACDYCACADKAJMIgAgAC8BuC0gAygCAEH//wNxIAMoAkwoArwtdHI7AbgtIAMoAkwvAbgtQf8BcSEBIAMoAkwoAgghAiADKAJMIgQoAhQhACAEIABBAWo2AhQgACACaiABOgAAIAMoAkwvAbgtQQh2IQEgAygCTCgCCCECIAMoAkwiBCgCFCEAIAQgAEEBajYCFCAAIAJqIAE6AAAgAygCTCADKAIAQf//A3FBECADKAJMKAK8LWt1OwG4LSADKAJMIgAgACgCvC0gAygCBEEQa2o2ArwtDAELIAMoAkwiACAALwG4LSADKAJILwGACCADKAJMKAK8LXRyOwG4LSADKAJMIgAgAygCBCAAKAK8LWo2ArwtCwuXAgEEfyMAQRBrIgEgADYCDAJAIAEoAgwoArwtQRBGBEAgASgCDC8BuC1B/wFxIQIgASgCDCgCCCEDIAEoAgwiBCgCFCEAIAQgAEEBajYCFCAAIANqIAI6AAAgASgCDC8BuC1BCHYhAiABKAIMKAIIIQMgASgCDCIEKAIUIQAgBCAAQQFqNgIUIAAgA2ogAjoAACABKAIMQQA7AbgtIAEoAgxBADYCvC0MAQsgASgCDCgCvC1BCE4EQCABKAIMLwG4LSECIAEoAgwoAgghAyABKAIMIgQoAhQhACAEIABBAWo2AhQgACADaiACOgAAIAEoAgwiACAALwG4LUEIdjsBuC0gASgCDCIAIAAoArwtQQhrNgK8LQsLC+8BAQR/IwBBEGsiASAANgIMAkAgASgCDCgCvC1BCEoEQCABKAIMLwG4LUH/AXEhAiABKAIMKAIIIQMgASgCDCIEKAIUIQAgBCAAQQFqNgIUIAAgA2ogAjoAACABKAIMLwG4LUEIdiECIAEoAgwoAgghAyABKAIMIgQoAhQhACAEIABBAWo2AhQgACADaiACOgAADAELIAEoAgwoArwtQQBKBEAgASgCDC8BuC0hAiABKAIMKAIIIQMgASgCDCIEKAIUIQAgBCAAQQFqNgIUIAAgA2ogAjoAAAsLIAEoAgxBADsBuC0gASgCDEEANgK8LQv8AQEBfyMAQRBrIgEgADYCDCABQQA2AggDQCABKAIIQZ4CTkUEQCABKAIMQZQBaiABKAIIQQJ0akEAOwEAIAEgASgCCEEBajYCCAwBCwsgAUEANgIIA0AgASgCCEEeTkUEQCABKAIMQYgTaiABKAIIQQJ0akEAOwEAIAEgASgCCEEBajYCCAwBCwsgAUEANgIIA0AgASgCCEETTkUEQCABKAIMQfwUaiABKAIIQQJ0akEAOwEAIAEgASgCCEEBajYCCAwBCwsgASgCDEEBOwGUCSABKAIMQQA2AqwtIAEoAgxBADYCqC0gASgCDEEANgKwLSABKAIMQQA2AqAtCyIBAX8jAEEQayIBJAAgASAANgIMIAEoAgwQFSABQRBqJAAL6QEBAX8jAEEwayICIAA2AiQgAiABNwMYIAJCADcDECACIAIoAiQpAwhCAX03AwgCQANAIAIpAxAgAikDCFQEQCACIAIpAxAgAikDCCACKQMQfUIBiHw3AwACQCACKAIkKAIEIAIpAwCnQQN0aikDACACKQMYVgRAIAIgAikDAEIBfTcDCAwBCwJAIAIpAwAgAigCJCkDCFIEQCACKAIkKAIEIAIpAwBCAXynQQN0aikDACACKQMYWA0BCyACIAIpAwA3AygMBAsgAiACKQMAQgF8NwMQCwwBCwsgAiACKQMQNwMoCyACKQMoC6cBAQF/IwBBMGsiBCQAIAQgADYCKCAEIAE2AiQgBCACNwMYIAQgAzYCFCAEIAQoAigpAzggBCgCKCkDMCAEKAIkIAQpAxggBCgCFBCIATcDCAJAIAQpAwhCAFMEQCAEQX82AiwMAQsgBCgCKCAEKQMINwM4IAQoAiggBCgCKCkDOBDAASECIAQoAiggAjcDQCAEQQA2AiwLIAQoAiwhACAEQTBqJAAgAAvrAQEBfyMAQSBrIgMkACADIAA2AhggAyABNwMQIAMgAjYCDAJAIAMpAxAgAygCGCkDEFQEQCADQQE6AB8MAQsgAyADKAIYKAIAIAMpAxBCBIanEE4iADYCCCAARQRAIAMoAgxBDkEAEBQgA0EAOgAfDAELIAMoAhggAygCCDYCACADIAMoAhgoAgQgAykDEEIBfEIDhqcQTiIANgIEIABFBEAgAygCDEEOQQAQFCADQQA6AB8MAQsgAygCGCADKAIENgIEIAMoAhggAykDEDcDECADQQE6AB8LIAMtAB9BAXEhACADQSBqJAAgAAvOAgEBfyMAQTBrIgQkACAEIAA2AiggBCABNwMgIAQgAjYCHCAEIAM2AhgCQAJAIAQoAigNACAEKQMgUA0AIAQoAhhBEkEAEBQgBEEANgIsDAELIAQgBCgCKCAEKQMgIAQoAhwgBCgCGBBMIgA2AgwgAEUEQCAEQQA2AiwMAQsgBEEYEBgiADYCFCAARQRAIAQoAhhBDkEAEBQgBCgCDBAyIARBADYCLAwBCyAEKAIUIAQoAgw2AhAgBCgCFEEANgIUQQAQASEAIAQoAhQgADYCDCMAQRBrIgAgBCgCFDYCDCAAKAIMQQA2AgAgACgCDEEANgIEIAAoAgxBADYCCCAEQQIgBCgCFCAEKAIYEIMBIgA2AhAgAEUEQCAEKAIUKAIQEDIgBCgCFBAVIARBADYCLAwBCyAEIAQoAhA2AiwLIAQoAiwhACAEQTBqJAAgAAupAQEBfyMAQTBrIgQkACAEIAA2AiggBCABNwMgIAQgAjYCHCAEIAM2AhgCQCAEKAIoRQRAIAQpAyBCAFIEQCAEKAIYQRJBABAUIARBADYCLAwCCyAEQQBCACAEKAIcIAQoAhgQwwE2AiwMAQsgBCAEKAIoNgIIIAQgBCkDIDcDECAEIARBCGpCASAEKAIcIAQoAhgQwwE2AiwLIAQoAiwhACAEQTBqJAAgAAtGAQF/IwBBIGsiAyQAIAMgADYCHCADIAE3AxAgAyACNgIMIAMoAhwgAykDECADKAIMIAMoAhxBCGoQTSEAIANBIGokACAAC4sMAQZ/IAAgAWohBQJAAkAgACgCBCICQQFxDQAgAkEDcUUNASAAKAIAIgIgAWohAQJAIAAgAmsiAEH4mwEoAgBHBEAgAkH/AU0EQCAAKAIIIgQgAkEDdiICQQN0QYycAWpGGiAAKAIMIgMgBEcNAkHkmwFB5JsBKAIAQX4gAndxNgIADAMLIAAoAhghBgJAIAAgACgCDCIDRwRAIAAoAggiAkH0mwEoAgBJGiACIAM2AgwgAyACNgIIDAELAkAgAEEUaiICKAIAIgQNACAAQRBqIgIoAgAiBA0AQQAhAwwBCwNAIAIhByAEIgNBFGoiAigCACIEDQAgA0EQaiECIAMoAhAiBA0ACyAHQQA2AgALIAZFDQICQCAAIAAoAhwiBEECdEGUngFqIgIoAgBGBEAgAiADNgIAIAMNAUHomwFB6JsBKAIAQX4gBHdxNgIADAQLIAZBEEEUIAYoAhAgAEYbaiADNgIAIANFDQMLIAMgBjYCGCAAKAIQIgIEQCADIAI2AhAgAiADNgIYCyAAKAIUIgJFDQIgAyACNgIUIAIgAzYCGAwCCyAFKAIEIgJBA3FBA0cNAUHsmwEgATYCACAFIAJBfnE2AgQgACABQQFyNgIEIAUgATYCAA8LIAQgAzYCDCADIAQ2AggLAkAgBSgCBCICQQJxRQRAIAVB/JsBKAIARgRAQfybASAANgIAQfCbAUHwmwEoAgAgAWoiATYCACAAIAFBAXI2AgQgAEH4mwEoAgBHDQNB7JsBQQA2AgBB+JsBQQA2AgAPCyAFQfibASgCAEYEQEH4mwEgADYCAEHsmwFB7JsBKAIAIAFqIgE2AgAgACABQQFyNgIEIAAgAWogATYCAA8LIAJBeHEgAWohAQJAIAJB/wFNBEAgBSgCCCIEIAJBA3YiAkEDdEGMnAFqRhogBCAFKAIMIgNGBEBB5JsBQeSbASgCAEF+IAJ3cTYCAAwCCyAEIAM2AgwgAyAENgIIDAELIAUoAhghBgJAIAUgBSgCDCIDRwRAIAUoAggiAkH0mwEoAgBJGiACIAM2AgwgAyACNgIIDAELAkAgBUEUaiIEKAIAIgINACAFQRBqIgQoAgAiAg0AQQAhAwwBCwNAIAQhByACIgNBFGoiBCgCACICDQAgA0EQaiEEIAMoAhAiAg0ACyAHQQA2AgALIAZFDQACQCAFIAUoAhwiBEECdEGUngFqIgIoAgBGBEAgAiADNgIAIAMNAUHomwFB6JsBKAIAQX4gBHdxNgIADAILIAZBEEEUIAYoAhAgBUYbaiADNgIAIANFDQELIAMgBjYCGCAFKAIQIgIEQCADIAI2AhAgAiADNgIYCyAFKAIUIgJFDQAgAyACNgIUIAIgAzYCGAsgACABQQFyNgIEIAAgAWogATYCACAAQfibASgCAEcNAUHsmwEgATYCAA8LIAUgAkF+cTYCBCAAIAFBAXI2AgQgACABaiABNgIACyABQf8BTQRAIAFBA3YiAkEDdEGMnAFqIQECf0HkmwEoAgAiA0EBIAJ0IgJxRQRAQeSbASACIANyNgIAIAEMAQsgASgCCAshAiABIAA2AgggAiAANgIMIAAgATYCDCAAIAI2AggPC0EfIQIgAEIANwIQIAFB////B00EQCABQQh2IgIgAkGA/j9qQRB2QQhxIgR0IgIgAkGA4B9qQRB2QQRxIgN0IgIgAkGAgA9qQRB2QQJxIgJ0QQ92IAMgBHIgAnJrIgJBAXQgASACQRVqdkEBcXJBHGohAgsgACACNgIcIAJBAnRBlJ4BaiEHAkACQEHomwEoAgAiBEEBIAJ0IgNxRQRAQeibASADIARyNgIAIAcgADYCACAAIAc2AhgMAQsgAUEAQRkgAkEBdmsgAkEfRht0IQIgBygCACEDA0AgAyIEKAIEQXhxIAFGDQIgAkEddiEDIAJBAXQhAiAEIANBBHFqIgdBEGooAgAiAw0ACyAHIAA2AhAgACAENgIYCyAAIAA2AgwgACAANgIIDwsgBCgCCCIBIAA2AgwgBCAANgIIIABBADYCGCAAIAQ2AgwgACABNgIICwsGAEG0mwELtQkBAX8jAEHgwABrIgUkACAFIAA2AtRAIAUgATYC0EAgBSACNgLMQCAFIAM3A8BAIAUgBDYCvEAgBSAFKALQQDYCuEACQAJAAkACQAJAAkACQAJAAkACQAJAAkAgBSgCvEAOEQMEAAYBAgUJCgoKCgoKCAoHCgsgBUIANwPYQAwKCyAFIAUoArhAQeQAaiAFKALMQCAFKQPAQBBDNwPYQAwJCyAFKAK4QBAVIAVCADcD2EAMCAsgBSgCuEAoAhAEQCAFIAUoArhAKAIQIAUoArhAKQMYIAUoArhAQeQAahBgIgM3A5hAIANQBEAgBUJ/NwPYQAwJCyAFKAK4QCkDCCAFKAK4QCkDCCAFKQOYQHxWBEAgBSgCuEBB5ABqQRVBABAUIAVCfzcD2EAMCQsgBSgCuEAiACAFKQOYQCAAKQMAfDcDACAFKAK4QCIAIAUpA5hAIAApAwh8NwMIIAUoArhAQQA2AhALIAUoArhALQB4QQFxRQRAIAVCADcDqEADQCAFKQOoQCAFKAK4QCkDAFQEQCAFIAUoArhAKQMAIAUpA6hAfUKAwABWBH5CgMAABSAFKAK4QCkDACAFKQOoQH0LNwOgQCAFIAUoAtRAIAVBEGogBSkDoEAQKyIDNwOwQCADQgBTBEAgBSgCuEBB5ABqIAUoAtRAEBcgBUJ/NwPYQAwLCyAFKQOwQFAEQCAFKAK4QEHkAGpBEUEAEBQgBUJ/NwPYQAwLBSAFIAUpA7BAIAUpA6hAfDcDqEAMAgsACwsLIAUoArhAIAUoArhAKQMANwMgIAVCADcD2EAMBwsgBSkDwEAgBSgCuEApAwggBSgCuEApAyB9VgRAIAUgBSgCuEApAwggBSgCuEApAyB9NwPAQAsgBSkDwEBQBEAgBUIANwPYQAwHCyAFKAK4QC0AeEEBcQRAIAUoAtRAIAUoArhAKQMgQQAQJ0EASARAIAUoArhAQeQAaiAFKALUQBAXIAVCfzcD2EAMCAsLIAUgBSgC1EAgBSgCzEAgBSkDwEAQKyIDNwOwQCADQgBTBEAgBSgCuEBB5ABqQRFBABAUIAVCfzcD2EAMBwsgBSgCuEAiACAFKQOwQCAAKQMgfDcDICAFKQOwQFAEQCAFKAK4QCkDICAFKAK4QCkDCFQEQCAFKAK4QEHkAGpBEUEAEBQgBUJ/NwPYQAwICwsgBSAFKQOwQDcD2EAMBgsgBSAFKAK4QCkDICAFKAK4QCkDAH0gBSgCuEApAwggBSgCuEApAwB9IAUoAsxAIAUpA8BAIAUoArhAQeQAahCIATcDCCAFKQMIQgBTBEAgBUJ/NwPYQAwGCyAFKAK4QCAFKQMIIAUoArhAKQMAfDcDICAFQgA3A9hADAULIAUgBSgCzEA2AgQgBSgCBCAFKAK4QEEoaiAFKAK4QEHkAGoQhAFBAEgEQCAFQn83A9hADAULIAVCADcD2EAMBAsgBSAFKAK4QCwAYKw3A9hADAMLIAUgBSgCuEApA3A3A9hADAILIAUgBSgCuEApAyAgBSgCuEApAwB9NwPYQAwBCyAFKAK4QEHkAGpBHEEAEBQgBUJ/NwPYQAsgBSkD2EAhAyAFQeDAAGokACADCwgAQQFBDBB/CyIBAX8jAEEQayIBIAA2AgwgASgCDCIAIAAoAjBBAWo2AjALBwAgACgCLAsHACAAKAIoCxgBAX8jAEEQayIBIAA2AgwgASgCDEEMagsHACAAKAIYCwcAIAAoAhALBwAgACgCCAtFAEGgmwFCADcDAEGYmwFCADcDAEGQmwFCADcDAEGImwFCADcDAEGAmwFCADcDAEH4mgFCADcDAEHwmgFCADcDAEHwmgELFAAgACABrSACrUIghoQgAyAEEH4LEwEBfiAAEEkiAUIgiKcQACABpwsVACAAIAGtIAKtQiCGhCADIAQQxAELFAAgACABIAKtIAOtQiCGhCAEEH0LrQQBAX8jAEEgayIFJAAgBSAANgIYIAUgAa0gAq1CIIaENwMQIAUgAzYCDCAFIAQ2AggCQAJAIAUpAxAgBSgCGCkDMFQEQCAFKAIIQQlNDQELIAUoAhhBCGpBEkEAEBQgBUF/NgIcDAELIAUoAhgoAhhBAnEEQCAFKAIYQQhqQRlBABAUIAVBfzYCHAwBCwJ/IAUoAgwhASMAQRBrIgAkACAAIAE2AgggAEEBOgAHAkAgACgCCEUEQCAAQQE6AA8MAQsgACAAKAIIIAAtAAdBAXEQswFBAEc6AA8LIAAtAA9BAXEhASAAQRBqJAAgAUULBEAgBSgCGEEIakEQQQAQFCAFQX82AhwMAQsgBSAFKAIYKAJAIAUpAxCnQQR0ajYCBCAFIAUoAgQoAgAEfyAFKAIEKAIAKAIQBUF/CzYCAAJAIAUoAgwgBSgCAEYEQCAFKAIEKAIEBEAgBSgCBCgCBCIAIAAoAgBBfnE2AgAgBSgCBCgCBEEAOwFQIAUoAgQoAgQoAgBFBEAgBSgCBCgCBBA3IAUoAgRBADYCBAsLDAELIAUoAgQoAgRFBEAgBSgCBCgCABBAIQAgBSgCBCAANgIEIABFBEAgBSgCGEEIakEOQQAQFCAFQX82AhwMAwsLIAUoAgQoAgQgBSgCDDYCECAFKAIEKAIEIAUoAgg7AVAgBSgCBCgCBCIAIAAoAgBBAXI2AgALIAVBADYCHAsgBSgCHCEAIAVBIGokACAACxcBAX4gACABIAIQciIDQiCIpxAAIAOnCx8BAX4gACABIAKtIAOtQiCGhBArIgRCIIinEAAgBKcLrgECAX8BfgJ/IwBBIGsiAiAANgIUIAIgATYCEAJAIAIoAhRFBEAgAkJ/NwMYDAELIAIoAhBBCHEEQCACIAIoAhQpAzA3AwgDQCACKQMIQgBSBH8gAigCFCgCQCACKQMIQgF9p0EEdGooAgAFQQELRQRAIAIgAikDCEIBfTcDCAwBCwsgAiACKQMINwMYDAELIAIgAigCFCkDMDcDGAsgAikDGCIDQiCIpwsQACADpwsTACAAIAGtIAKtQiCGhCADEMUBC4gCAgF/AX4CfyMAQSBrIgQkACAEIAA2AhQgBCABNgIQIAQgAq0gA61CIIaENwMIAkAgBCgCFEUEQCAEQn83AxgMAQsgBCgCFCgCBARAIARCfzcDGAwBCyAEKQMIQv///////////wBWBEAgBCgCFEEEakESQQAQFCAEQn83AxgMAQsCQCAEKAIULQAQQQFxRQRAIAQpAwhQRQ0BCyAEQgA3AxgMAQsgBCAEKAIUKAIUIAQoAhAgBCkDCBArIgU3AwAgBUIAUwRAIAQoAhRBBGogBCgCFCgCFBAXIARCfzcDGAwBCyAEIAQpAwA3AxgLIAQpAxghBSAEQSBqJAAgBUIgiKcLEAAgBacLTwEBfyMAQSBrIgQkACAEIAA2AhwgBCABrSACrUIghoQ3AxAgBCADNgIMIAQoAhwgBCkDECAEKAIMIAQoAhwoAhwQrQEhACAEQSBqJAAgAAvZAwEBfyMAQSBrIgUkACAFIAA2AhggBSABrSACrUIghoQ3AxAgBSADNgIMIAUgBDYCCAJAIAUoAhggBSkDEEEAQQAQP0UEQCAFQX82AhwMAQsgBSgCGCgCGEECcQRAIAUoAhhBCGpBGUEAEBQgBUF/NgIcDAELIAUoAhgoAkAgBSkDEKdBBHRqKAIIBEAgBSgCGCgCQCAFKQMQp0EEdGooAgggBSgCDBBnQQBIBEAgBSgCGEEIakEPQQAQFCAFQX82AhwMAgsgBUEANgIcDAELIAUgBSgCGCgCQCAFKQMQp0EEdGo2AgQgBSAFKAIEKAIABH8gBSgCDCAFKAIEKAIAKAIURwVBAQtBAXE2AgACQCAFKAIABEAgBSgCBCgCBEUEQCAFKAIEKAIAEEAhACAFKAIEIAA2AgQgAEUEQCAFKAIYQQhqQQ5BABAUIAVBfzYCHAwECwsgBSgCBCgCBCAFKAIMNgIUIAUoAgQoAgQiACAAKAIAQSByNgIADAELIAUoAgQoAgQEQCAFKAIEKAIEIgAgACgCAEFfcTYCACAFKAIEKAIEKAIARQRAIAUoAgQoAgQQNyAFKAIEQQA2AgQLCwsgBUEANgIcCyAFKAIcIQAgBUEgaiQAIAALFwAgACABrSACrUIghoQgAyAEIAUQmQELEgAgACABrSACrUIghoQgAxAnC48BAgF/AX4CfyMAQSBrIgQkACAEIAA2AhQgBCABNgIQIAQgAjYCDCAEIAM2AggCQAJAIAQoAhAEQCAEKAIMDQELIAQoAhRBCGpBEkEAEBQgBEJ/NwMYDAELIAQgBCgCFCAEKAIQIAQoAgwgBCgCCBCaATcDGAsgBCkDGCEFIARBIGokACAFQiCIpwsQACAFpwuFBQIBfwF+An8jAEEwayIDJAAgAyAANgIkIAMgATYCICADIAI2AhwCQCADKAIkKAIYQQJxBEAgAygCJEEIakEZQQAQFCADQn83AygMAQsgAygCIEUEQCADKAIkQQhqQRJBABAUIANCfzcDKAwBCyADQQA2AgwgAyADKAIgEC42AhggAygCICADKAIYQQFraiwAAEEvRwRAIAMgAygCGEECahAYIgA2AgwgAEUEQCADKAIkQQhqQQ5BABAUIANCfzcDKAwCCwJAAkAgAygCDCIBIAMoAiAiAHNBA3ENACAAQQNxBEADQCABIAAtAAAiAjoAACACRQ0DIAFBAWohASAAQQFqIgBBA3ENAAsLIAAoAgAiAkF/cyACQYGChAhrcUGAgYKEeHENAANAIAEgAjYCACAAKAIEIQIgAUEEaiEBIABBBGohACACQYGChAhrIAJBf3NxQYCBgoR4cUUNAAsLIAEgAC0AACICOgAAIAJFDQADQCABIAAtAAEiAjoAASABQQFqIQEgAEEBaiEAIAINAAsLIAMoAgwgAygCGGpBLzoAACADKAIMIAMoAhhBAWpqQQA6AAALIAMgAygCJEEAQgBBABB9IgA2AgggAEUEQCADKAIMEBUgA0J/NwMoDAELIAMgAygCJAJ/IAMoAgwEQCADKAIMDAELIAMoAiALIAMoAgggAygCHBCaATcDECADKAIMEBUCQCADKQMQQgBTBEAgAygCCBAbDAELIAMoAiQgAykDEEEAQQNBgID8jwQQmQFBAEgEQCADKAIkIAMpAxAQmAEaIANCfzcDKAwCCwsgAyADKQMQNwMoCyADKQMoIQQgA0EwaiQAIARCIIinCxAAIASnCxEAIAAgAa0gAq1CIIaEEJgBCxcAIAAgAa0gAq1CIIaEIAMgBCAFEIoBC38CAX8BfiMAQSBrIgMkACADIAA2AhggAyABNgIUIAMgAjYCECADIAMoAhggAygCFCADKAIQEHIiBDcDCAJAIARCAFMEQCADQQA2AhwMAQsgAyADKAIYIAMpAwggAygCECADKAIYKAIcEK0BNgIcCyADKAIcIQAgA0EgaiQAIAALEAAjACAAa0FwcSIAJAAgAAsGACAAJAALBAAjAAuCAQIBfwF+IwBBIGsiBCQAIAQgADYCGCAEIAE2AhQgBCACNgIQIAQgAzYCDCAEIAQoAhggBCgCFCAEKAIQEHIiBTcDAAJAIAVCAFMEQCAEQX82AhwMAQsgBCAEKAIYIAQpAwAgBCgCECAEKAIMEH42AhwLIAQoAhwhACAEQSBqJAAgAAvQRQMGfwF+AnwjAEHgAGsiASQAIAEgADYCWAJAIAEoAlhFBEAgAUF/NgJcDAELIwBBIGsiACABKAJYNgIcIAAgAUFAazYCGCAAQQA2AhQgAEIANwMAAkAgACgCHC0AKEEBcUUEQCAAKAIcKAIYIAAoAhwoAhRGDQELIABBATYCFAsgAEIANwMIA0AgACkDCCAAKAIcKQMwVARAAkACQCAAKAIcKAJAIAApAwinQQR0aigCCA0AIAAoAhwoAkAgACkDCKdBBHRqLQAMQQFxDQAgACgCHCgCQCAAKQMIp0EEdGooAgRFDQEgACgCHCgCQCAAKQMIp0EEdGooAgQoAgBFDQELIABBATYCFAsgACgCHCgCQCAAKQMIp0EEdGotAAxBAXFFBEAgACAAKQMAQgF8NwMACyAAIAApAwhCAXw3AwgMAQsLIAAoAhgEQCAAKAIYIAApAwA3AwALIAEgACgCFDYCJCABKQNAUARAAkAgASgCWCgCBEEIcUUEQCABKAIkRQ0BCwJ/IAEoAlgoAgAhAiMAQRBrIgAkACAAIAI2AggCQCAAKAIIKAIkQQNGBEAgAEEANgIMDAELIAAoAggoAiAEQCAAKAIIEC9BAEgEQCAAQX82AgwMAgsLIAAoAggoAiQEQCAAKAIIEGILIAAoAghBAEIAQQ8QIEIAUwRAIABBfzYCDAwBCyAAKAIIQQM2AiQgAEEANgIMCyAAKAIMIQIgAEEQaiQAIAJBAEgLBEACQAJ/IwBBEGsiACABKAJYKAIANgIMIwBBEGsiAiAAKAIMQQxqNgIMIAIoAgwoAgBBFkYLBEAjAEEQayIAIAEoAlgoAgA2AgwjAEEQayICIAAoAgxBDGo2AgwgAigCDCgCBEEsRg0BCyABKAJYQQhqIAEoAlgoAgAQFyABQX82AlwMBAsLCyABKAJYEDwgAUEANgJcDAELIAEoAiRFBEAgASgCWBA8IAFBADYCXAwBCyABKQNAIAEoAlgpAzBWBEAgASgCWEEIakEUQQAQFCABQX82AlwMAQsgASABKQNAp0EDdBAYIgA2AiggAEUEQCABQX82AlwMAQsgAUJ/NwM4IAFCADcDSCABQgA3A1ADQCABKQNQIAEoAlgpAzBUBEACQCABKAJYKAJAIAEpA1CnQQR0aigCAEUNAAJAIAEoAlgoAkAgASkDUKdBBHRqKAIIDQAgASgCWCgCQCABKQNQp0EEdGotAAxBAXENACABKAJYKAJAIAEpA1CnQQR0aigCBEUNASABKAJYKAJAIAEpA1CnQQR0aigCBCgCAEUNAQsgAQJ+IAEpAzggASgCWCgCQCABKQNQp0EEdGooAgApA0hUBEAgASkDOAwBCyABKAJYKAJAIAEpA1CnQQR0aigCACkDSAs3AzgLIAEoAlgoAkAgASkDUKdBBHRqLQAMQQFxRQRAIAEpA0ggASkDQFoEQCABKAIoEBUgASgCWEEIakEUQQAQFCABQX82AlwMBAsgASgCKCABKQNIp0EDdGogASkDUDcDACABIAEpA0hCAXw3A0gLIAEgASkDUEIBfDcDUAwBCwsgASkDSCABKQNAVARAIAEoAigQFSABKAJYQQhqQRRBABAUIAFBfzYCXAwBCwJAAn8jAEEQayIAIAEoAlgoAgA2AgwgACgCDCkDGEKAgAiDUAsEQCABQgA3AzgMAQsgASkDOEJ/UQRAIAFCfzcDGCABQgA3AzggAUIANwNQA0AgASkDUCABKAJYKQMwVARAIAEoAlgoAkAgASkDUKdBBHRqKAIABEAgASgCWCgCQCABKQNQp0EEdGooAgApA0ggASkDOFoEQCABIAEoAlgoAkAgASkDUKdBBHRqKAIAKQNINwM4IAEgASkDUDcDGAsLIAEgASkDUEIBfDcDUAwBCwsgASkDGEJ/UgRAIAEoAlghAiABKQMYIQcgASgCWEEIaiEDIwBBMGsiACQAIAAgAjYCJCAAIAc3AxggACADNgIUIAAgACgCJCAAKQMYIAAoAhQQYCIHNwMIAkAgB1AEQCAAQgA3AygMAQsgACAAKAIkKAJAIAApAxinQQR0aigCADYCBAJAIAApAwggACkDCCAAKAIEKQMgfFgEQCAAKQMIIAAoAgQpAyB8Qv///////////wBYDQELIAAoAhRBBEEWEBQgAEIANwMoDAELIAAgACgCBCkDICAAKQMIfDcDCCAAKAIELwEMQQhxBEAgACgCJCgCACAAKQMIQQAQJ0EASARAIAAoAhQgACgCJCgCABAXIABCADcDKAwCCyAAKAIkKAIAIABCBBArQgRSBEAgACgCFCAAKAIkKAIAEBcgAEIANwMoDAILIAAoAABB0JadwABGBEAgACAAKQMIQgR8NwMICyAAIAApAwhCDHw3AwggACgCBEEAEGVBAXEEQCAAIAApAwhCCHw3AwgLIAApAwhC////////////AFYEQCAAKAIUQQRBFhAUIABCADcDKAwCCwsgACAAKQMINwMoCyAAKQMoIQcgAEEwaiQAIAEgBzcDOCAHUARAIAEoAigQFSABQX82AlwMBAsLCyABKQM4QgBSBEACfyABKAJYKAIAIQIgASkDOCEHIwBBEGsiACQAIAAgAjYCCCAAIAc3AwACQCAAKAIIKAIkQQFGBEAgACgCCEEMakESQQAQFCAAQX82AgwMAQsgACgCCEEAIAApAwBBERAgQgBTBEAgAEF/NgIMDAELIAAoAghBATYCJCAAQQA2AgwLIAAoAgwhAiAAQRBqJAAgAkEASAsEQCABQgA3AzgLCwsgASkDOFAEQAJ/IAEoAlgoAgAhAiMAQRBrIgAkACAAIAI2AggCQCAAKAIIKAIkQQFGBEAgACgCCEEMakESQQAQFCAAQX82AgwMAQsgACgCCEEAQgBBCBAgQgBTBEAgAEF/NgIMDAELIAAoAghBATYCJCAAQQA2AgwLIAAoAgwhAiAAQRBqJAAgAkEASAsEQCABKAJYQQhqIAEoAlgoAgAQFyABKAIoEBUgAUF/NgJcDAILCyABKAJYKAJUIQIjAEEQayIAJAAgACACNgIMIAAoAgwEQCAAKAIMRAAAAAAAAAAAOQMYIAAoAgwoAgBEAAAAAAAAAAAgACgCDCgCDCAAKAIMKAIEERYACyAAQRBqJAAgAUEANgIsIAFCADcDSANAAkAgASkDSCABKQNAWg0AIAEoAlgoAlQhAiABKQNIIge6IAEpA0C6IgijIQkjAEEgayIAJAAgACACNgIcIAAgCTkDECAAIAdCAXy6IAijOQMIIAAoAhwEQCAAKAIcIAArAxA5AyAgACgCHCAAKwMIOQMoIAAoAhxEAAAAAAAAAAAQVwsgAEEgaiQAIAEgASgCKCABKQNIp0EDdGopAwA3A1AgASABKAJYKAJAIAEpA1CnQQR0ajYCEAJAAkAgASgCECgCAEUNACABKAIQKAIAKQNIIAEpAzhaDQAMAQsgAQJ/QQEgASgCECgCCA0AGiABKAIQKAIEBEBBASABKAIQKAIEKAIAQQFxDQEaCyABKAIQKAIEBH8gASgCECgCBCgCAEHAAHFBAEcFQQALC0EBcTYCFCABKAIQKAIERQRAIAEoAhAoAgAQQCEAIAEoAhAgADYCBCAARQRAIAEoAlhBCGpBDkEAEBQgAUEBNgIsDAMLCyABIAEoAhAoAgQ2AgwCfyABKAJYIQIgASkDUCEHIwBBMGsiACQAIAAgAjYCKCAAIAc3AyACQCAAKQMgIAAoAigpAzBaBEAgACgCKEEIakESQQAQFCAAQX82AiwMAQsgACAAKAIoKAJAIAApAyCnQQR0ajYCHAJAIAAoAhwoAgAEQCAAKAIcKAIALQAEQQFxRQ0BCyAAQQA2AiwMAQsgACgCHCgCACkDSEIafEL///////////8AVgRAIAAoAihBCGpBBEEWEBQgAEF/NgIsDAELIAAoAigoAgAgACgCHCgCACkDSEIafEEAECdBAEgEQCAAKAIoQQhqIAAoAigoAgAQFyAAQX82AiwMAQsgACAAKAIoKAIAQgQgAEEYaiAAKAIoQQhqEEIiAjYCFCACRQRAIABBfzYCLAwBCyAAIAAoAhQQHTsBEiAAIAAoAhQQHTsBECAAKAIUEEdBAXFFBEAgACgCFBAWIAAoAihBCGpBFEEAEBQgAEF/NgIsDAELIAAoAhQQFiAALwEQBEAgACgCKCgCACAALwESrUEBECdBAEgEQCAAKAIoQQhqQQRBtJsBKAIAEBQgAEF/NgIsDAILIABBACAAKAIoKAIAIAAvARBBACAAKAIoQQhqEGM2AgggACgCCEUEQCAAQX82AiwMAgsgACgCCCAALwEQQYACIABBDGogACgCKEEIahCUAUEBcUUEQCAAKAIIEBUgAEF/NgIsDAILIAAoAggQFSAAKAIMBEAgACAAKAIMEJMBNgIMIAAoAhwoAgAoAjQgACgCDBCVASECIAAoAhwoAgAgAjYCNAsLIAAoAhwoAgBBAToABAJAIAAoAhwoAgRFDQAgACgCHCgCBC0ABEEBcQ0AIAAoAhwoAgQgACgCHCgCACgCNDYCNCAAKAIcKAIEQQE6AAQLIABBADYCLAsgACgCLCECIABBMGokACACQQBICwRAIAFBATYCLAwCCyABIAEoAlgoAgAQNSIHNwMwIAdCAFMEQCABQQE2AiwMAgsgASgCDCABKQMwNwNIAkAgASgCFARAIAFBADYCCCABKAIQKAIIRQRAIAEgASgCWCABKAJYIAEpA1BBCEEAEK4BIgA2AgggAEUEQCABQQE2AiwMBQsLAn8gASgCWCECAn8gASgCCARAIAEoAggMAQsgASgCECgCCAshAyABKAIMIQQjAEGgAWsiACQAIAAgAjYCmAEgACADNgKUASAAIAQ2ApABAkAgACgClAEgAEE4ahA5QQBIBEAgACgCmAFBCGogACgClAEQFyAAQX82ApwBDAELIAApAzhCwACDUARAIAAgACkDOELAAIQ3AzggAEEAOwFoCwJAAkAgACgCkAEoAhBBf0cEQCAAKAKQASgCEEF+Rw0BCyAALwFoRQ0AIAAoApABIAAvAWg2AhAMAQsCQAJAIAAoApABKAIQDQAgACkDOEIEg1ANACAAIAApAzhCCIQ3AzggACAAKQNQNwNYDAELIAAgACkDOEL3////D4M3AzgLCyAAKQM4QoABg1AEQCAAIAApAzhCgAGENwM4IABBADsBagsgAEGAAjYCJAJAIAApAzhCBINQBEAgACAAKAIkQYAIcjYCJCAAQn83A3AMAQsgACgCkAEgACkDUDcDKCAAIAApA1A3A3ACQCAAKQM4QgiDUARAAkACQAJAAkACQAJ/AkAgACgCkAEoAhBBf0cEQCAAKAKQASgCEEF+Rw0BC0EIDAELIAAoApABKAIQC0H//wNxDg0CAwMDAwMDAwEDAwMAAwsgAEKUwuTzDzcDEAwDCyAAQoODsP8PNwMQDAILIABC/////w83AxAMAQsgAEIANwMQCyAAKQNQIAApAxBWBEAgACAAKAIkQYAIcjYCJAsMAQsgACgCkAEgACkDWDcDIAsLIAAgACgCmAEoAgAQNSIHNwOIASAHQgBTBEAgACgCmAFBCGogACgCmAEoAgAQFyAAQX82ApwBDAELIAAoApABIgIgAi8BDEH3/wNxOwEMIAAgACgCmAEgACgCkAEgACgCJBBUIgI2AiggAkEASARAIABBfzYCnAEMAQsgACAALwFoAn8CQCAAKAKQASgCEEF/RwRAIAAoApABKAIQQX5HDQELQQgMAQsgACgCkAEoAhALQf//A3FHOgAiIAAgAC0AIkEBcQR/IAAvAWhBAEcFQQALQQFxOgAhIAAgAC8BaAR/IAAtACEFQQELQQFxOgAgIAAgAC0AIkEBcQR/IAAoApABKAIQQQBHBUEAC0EBcToAHyAAAn9BASAALQAiQQFxDQAaQQEgACgCkAEoAgBBgAFxDQAaIAAoApABLwFSIAAvAWpHC0EBcToAHiAAIAAtAB5BAXEEfyAALwFqQQBHBUEAC0EBcToAHSAAIAAtAB5BAXEEfyAAKAKQAS8BUkEARwVBAAtBAXE6ABwgACAAKAKUATYCNCMAQRBrIgIgACgCNDYCDCACKAIMIgIgAigCMEEBajYCMCAALQAdQQFxBEAgACAALwFqQQAQeyICNgIMIAJFBEAgACgCmAFBCGpBGEEAEBQgACgCNBAbIABBfzYCnAEMAgsgACAAKAKYASAAKAI0IAAvAWpBACAAKAKYASgCHCAAKAIMEQUAIgI2AjAgAkUEQCAAKAI0EBsgAEF/NgKcAQwCCyAAKAI0EBsgACAAKAIwNgI0CyAALQAhQQFxBEAgACAAKAKYASAAKAI0IAAvAWgQsAEiAjYCMCACRQRAIAAoAjQQGyAAQX82ApwBDAILIAAoAjQQGyAAIAAoAjA2AjQLIAAtACBBAXEEQCAAIAAoApgBIAAoAjRBABCvASICNgIwIAJFBEAgACgCNBAbIABBfzYCnAEMAgsgACgCNBAbIAAgACgCMDYCNAsgAC0AH0EBcQRAIAAoApgBIQMgACgCNCEEIAAoApABKAIQIQUgACgCkAEvAVAhBiMAQRBrIgIkACACIAM2AgwgAiAENgIIIAIgBTYCBCACIAY2AgAgAigCDCACKAIIIAIoAgRBASACKAIAELIBIQMgAkEQaiQAIAAgAyICNgIwIAJFBEAgACgCNBAbIABBfzYCnAEMAgsgACgCNBAbIAAgACgCMDYCNAsgAC0AHEEBcQRAIABBADYCBAJAIAAoApABKAJUBEAgACAAKAKQASgCVDYCBAwBCyAAKAKYASgCHARAIAAgACgCmAEoAhw2AgQLCyAAIAAoApABLwFSQQEQeyICNgIIIAJFBEAgACgCmAFBCGpBGEEAEBQgACgCNBAbIABBfzYCnAEMAgsgACAAKAKYASAAKAI0IAAoApABLwFSQQEgACgCBCAAKAIIEQUAIgI2AjAgAkUEQCAAKAI0EBsgAEF/NgKcAQwCCyAAKAI0EBsgACAAKAIwNgI0CyAAIAAoApgBKAIAEDUiBzcDgAEgB0IAUwRAIAAoApgBQQhqIAAoApgBKAIAEBcgAEF/NgKcAQwBCyAAKAKYASEDIAAoAjQhBCAAKQNwIQcjAEHAwABrIgIkACACIAM2ArhAIAIgBDYCtEAgAiAHNwOoQAJAIAIoArRAEEhBAEgEQCACKAK4QEEIaiACKAK0QBAXIAJBfzYCvEAMAQsgAkEANgIMIAJCADcDEANAAkAgAiACKAK0QCACQSBqQoDAABArIgc3AxggB0IAVw0AIAIoArhAIAJBIGogAikDGBA2QQBIBEAgAkF/NgIMBSACKQMYQoDAAFINAiACKAK4QCgCVEUNAiACKQOoQEIAVw0CIAIgAikDGCACKQMQfDcDECACKAK4QCgCVCACKQMQuSACKQOoQLmjEFcMAgsLCyACKQMYQgBTBEAgAigCuEBBCGogAigCtEAQFyACQX82AgwLIAIoArRAEC8aIAIgAigCDDYCvEALIAIoArxAIQMgAkHAwABqJAAgACADNgIsIAAoAjQgAEE4ahA5QQBIBEAgACgCmAFBCGogACgCNBAXIABBfzYCLAsgACgCNCEDIwBBEGsiAiQAIAIgAzYCCAJAA0AgAigCCARAIAIoAggpAxhCgIAEg0IAUgRAIAIgAigCCEEAQgBBEBAgNwMAIAIpAwBCAFMEQCACQf8BOgAPDAQLIAIpAwBCA1UEQCACKAIIQQxqQRRBABAUIAJB/wE6AA8MBAsgAiACKQMAPAAPDAMFIAIgAigCCCgCADYCCAwCCwALCyACQQA6AA8LIAIsAA8hAyACQRBqJAAgACADIgI6ACMgAkEYdEEYdUEASARAIAAoApgBQQhqIAAoAjQQFyAAQX82AiwLIAAoAjQQGyAAKAIsQQBIBEAgAEF/NgKcAQwBCyAAIAAoApgBKAIAEDUiBzcDeCAHQgBTBEAgACgCmAFBCGogACgCmAEoAgAQFyAAQX82ApwBDAELIAAoApgBKAIAIAApA4gBEJsBQQBIBEAgACgCmAFBCGogACgCmAEoAgAQFyAAQX82ApwBDAELIAApAzhC5ACDQuQAUgRAIAAoApgBQQhqQRRBABAUIABBfzYCnAEMAQsgACgCkAEoAgBBIHFFBEACQCAAKQM4QhCDQgBSBEAgACgCkAEgACgCYDYCFAwBCyAAKAKQAUEUahABGgsLIAAoApABIAAvAWg2AhAgACgCkAEgACgCZDYCGCAAKAKQASAAKQNQNwMoIAAoApABIAApA3ggACkDgAF9NwMgIAAoApABIAAoApABLwEMQfn/A3EgAC0AI0EBdHI7AQwgACgCkAEhAyAAKAIkQYAIcUEARyEEIwBBEGsiAiQAIAIgAzYCDCACIAQ6AAsCQCACKAIMKAIQQQ5GBEAgAigCDEE/OwEKDAELIAIoAgwoAhBBDEYEQCACKAIMQS47AQoMAQsCQCACLQALQQFxRQRAIAIoAgxBABBlQQFxRQ0BCyACKAIMQS07AQoMAQsCQCACKAIMKAIQQQhHBEAgAigCDC8BUkEBRw0BCyACKAIMQRQ7AQoMAQsgAiACKAIMKAIwEFEiAzsBCCADQf//A3EEQCACKAIMKAIwKAIAIAIvAQhBAWtqLQAAQS9GBEAgAigCDEEUOwEKDAILCyACKAIMQQo7AQoLIAJBEGokACAAIAAoApgBIAAoApABIAAoAiQQVCICNgIsIAJBAEgEQCAAQX82ApwBDAELIAAoAiggACgCLEcEQCAAKAKYAUEIakEUQQAQFCAAQX82ApwBDAELIAAoApgBKAIAIAApA3gQmwFBAEgEQCAAKAKYAUEIaiAAKAKYASgCABAXIABBfzYCnAEMAQsgAEEANgKcAQsgACgCnAEhAiAAQaABaiQAIAJBAEgLBEAgAUEBNgIsIAEoAggEQCABKAIIEBsLDAQLIAEoAggEQCABKAIIEBsLDAELIAEoAgwiACAALwEMQff/A3E7AQwgASgCWCABKAIMQYACEFRBAEgEQCABQQE2AiwMAwsgASABKAJYIAEpA1AgASgCWEEIahBgIgc3AwAgB1AEQCABQQE2AiwMAwsgASgCWCgCACABKQMAQQAQJ0EASARAIAEoAlhBCGogASgCWCgCABAXIAFBATYCLAwDCwJ/IAEoAlghAiABKAIMKQMgIQcjAEGgwABrIgAkACAAIAI2AphAIAAgBzcDkEAgACAAKQOQQLo5AwACQANAIAApA5BAUEUEQCAAIAApA5BAQoDAAFYEfkKAwAAFIAApA5BACz4CDCAAKAKYQCgCACAAQRBqIAAoAgytIAAoAphAQQhqEGRBAEgEQCAAQX82ApxADAMLIAAoAphAIABBEGogACgCDK0QNkEASARAIABBfzYCnEAMAwUgACAAKQOQQCAANQIMfTcDkEAgACgCmEAoAlQgACsDACAAKQOQQLqhIAArAwCjEFcMAgsACwsgAEEANgKcQAsgACgCnEAhAiAAQaDAAGokACACQQBICwRAIAFBATYCLAwDCwsLIAEgASkDSEIBfDcDSAwBCwsgASgCLEUEQAJ/IAEoAlghACABKAIoIQMgASkDQCEHIwBBMGsiAiQAIAIgADYCKCACIAM2AiQgAiAHNwMYIAIgAigCKCgCABA1Igc3AxACQCAHQgBTBEAgAkF/NgIsDAELIAIoAighAyACKAIkIQQgAikDGCEHIwBBwAFrIgAkACAAIAM2ArQBIAAgBDYCsAEgACAHNwOoASAAIAAoArQBKAIAEDUiBzcDIAJAIAdCAFMEQCAAKAK0AUEIaiAAKAK0ASgCABAXIABCfzcDuAEMAQsgACAAKQMgNwOgASAAQQA6ABcgAEIANwMYA0AgACkDGCAAKQOoAVQEQCAAIAAoArQBKAJAIAAoArABIAApAxinQQN0aikDAKdBBHRqNgIMIAAgACgCtAECfyAAKAIMKAIEBEAgACgCDCgCBAwBCyAAKAIMKAIAC0GABBBUIgM2AhAgA0EASARAIABCfzcDuAEMAwsgACgCEARAIABBAToAFwsgACAAKQMYQgF8NwMYDAELCyAAIAAoArQBKAIAEDUiBzcDICAHQgBTBEAgACgCtAFBCGogACgCtAEoAgAQFyAAQn83A7gBDAELIAAgACkDICAAKQOgAX03A5gBAkAgACkDoAFC/////w9YBEAgACkDqAFC//8DWA0BCyAAQQE6ABcLIAAgAEEwakLiABApIgM2AiwgA0UEQCAAKAK0AUEIakEOQQAQFCAAQn83A7gBDAELIAAtABdBAXEEQCAAKAIsQecSQQQQQSAAKAIsQiwQLSAAKAIsQS0QHyAAKAIsQS0QHyAAKAIsQQAQISAAKAIsQQAQISAAKAIsIAApA6gBEC0gACgCLCAAKQOoARAtIAAoAiwgACkDmAEQLSAAKAIsIAApA6ABEC0gACgCLEHiEkEEEEEgACgCLEEAECEgACgCLCAAKQOgASAAKQOYAXwQLSAAKAIsQQEQIQsgACgCLEHsEkEEEEEgACgCLEEAECEgACgCLCAAKQOoAUL//wNaBH5C//8DBSAAKQOoAQunQf//A3EQHyAAKAIsIAApA6gBQv//A1oEfkL//wMFIAApA6gBC6dB//8DcRAfIAAoAiwgACkDmAFC/////w9aBH9BfwUgACkDmAGnCxAhIAAoAiwgACkDoAFC/////w9aBH9BfwUgACkDoAGnCxAhIAACfyAAKAK0AS0AKEEBcQRAIAAoArQBKAIkDAELIAAoArQBKAIgCzYClAEgACgCLAJ/IAAoApQBBEAgACgClAEvAQQMAQtBAAtB//8DcRAfAn8jAEEQayIDIAAoAiw2AgwgAygCDC0AAEEBcUULBEAgACgCtAFBCGpBFEEAEBQgACgCLBAWIABCfzcDuAEMAQsgACgCtAECfyMAQRBrIgMgACgCLDYCDCADKAIMKAIECwJ+IwBBEGsiAyAAKAIsNgIMAn4gAygCDC0AAEEBcQRAIAMoAgwpAxAMAQtCAAsLEDZBAEgEQCAAKAIsEBYgAEJ/NwO4AQwBCyAAKAIsEBYgACgClAEEQCAAKAK0ASAAKAKUASgCACAAKAKUAS8BBK0QNkEASARAIABCfzcDuAEMAgsLIAAgACkDmAE3A7gBCyAAKQO4ASEHIABBwAFqJAAgAiAHNwMAIAdCAFMEQCACQX82AiwMAQsgAiACKAIoKAIAEDUiBzcDCCAHQgBTBEAgAkF/NgIsDAELIAJBADYCLAsgAigCLCEAIAJBMGokACAAQQBICwRAIAFBATYCLAsLIAEoAigQFSABKAIsRQRAAn8gASgCWCgCACECIwBBEGsiACQAIAAgAjYCCAJAIAAoAggoAiRBAUcEQCAAKAIIQQxqQRJBABAUIABBfzYCDAwBCyAAKAIIKAIgQQFLBEAgACgCCEEMakEdQQAQFCAAQX82AgwMAQsgACgCCCgCIARAIAAoAggQL0EASARAIABBfzYCDAwCCwsgACgCCEEAQgBBCRAgQgBTBEAgACgCCEECNgIkIABBfzYCDAwBCyAAKAIIQQA2AiQgAEEANgIMCyAAKAIMIQIgAEEQaiQAIAILBEAgASgCWEEIaiABKAJYKAIAEBcgAUEBNgIsCwsgASgCWCgCVCECIwBBEGsiACQAIAAgAjYCDCAAKAIMRAAAAAAAAPA/EFcgAEEQaiQAIAEoAiwEQCABKAJYKAIAEGIgAUF/NgJcDAELIAEoAlgQPCABQQA2AlwLIAEoAlwhACABQeAAaiQAIAAL0g4CB38CfiMAQTBrIgMkACADIAA2AiggAyABNgIkIAMgAjYCICMAQRBrIgAgA0EIajYCDCAAKAIMQQA2AgAgACgCDEEANgIEIAAoAgxBADYCCCADKAIoIQAjAEEgayIEJAAgBCAANgIYIARCADcDECAEQn83AwggBCADQQhqNgIEAkACQCAEKAIYBEAgBCkDCEJ/WQ0BCyAEKAIEQRJBABAUIARBADYCHAwBCyAEKAIYIQAgBCkDECEKIAQpAwghCyAEKAIEIQEjAEGgAWsiAiQAIAIgADYCmAEgAkEANgKUASACIAo3A4gBIAIgCzcDgAEgAkEANgJ8IAIgATYCeAJAAkAgAigClAENACACKAKYAQ0AIAIoAnhBEkEAEBQgAkEANgKcAQwBCyACKQOAAUIAUwRAIAJCADcDgAELAkAgAikDiAFC////////////AFgEQCACKQOIASACKQOIASACKQOAAXxYDQELIAIoAnhBEkEAEBQgAkEANgKcAQwBCyACQYgBEBgiADYCdCAARQRAIAIoAnhBDkEAEBQgAkEANgKcAQwBCyACKAJ0QQA2AhggAigCmAEEQCACKAKYASIAEC5BAWoiARAYIgUEfyAFIAAgARAZBUEACyEAIAIoAnQgADYCGCAARQRAIAIoAnhBDkEAEBQgAigCdBAVIAJBADYCnAEMAgsLIAIoAnQgAigClAE2AhwgAigCdCACKQOIATcDaCACKAJ0IAIpA4ABNwNwAkAgAigCfARAIAIoAnQiACACKAJ8IgEpAwA3AyAgACABKQMwNwNQIAAgASkDKDcDSCAAIAEpAyA3A0AgACABKQMYNwM4IAAgASkDEDcDMCAAIAEpAwg3AyggAigCdEEANgIoIAIoAnQiACAAKQMgQv7///8PgzcDIAwBCyACKAJ0QSBqEDsLIAIoAnQpA3BCAFIEQCACKAJ0IAIoAnQpA3A3AzggAigCdCIAIAApAyBCBIQ3AyALIwBBEGsiACACKAJ0QdgAajYCDCAAKAIMQQA2AgAgACgCDEEANgIEIAAoAgxBADYCCCACKAJ0QQA2AoABIAIoAnRBADYChAEjAEEQayIAIAIoAnQ2AgwgACgCDEEANgIAIAAoAgxBADYCBCAAKAIMQQA2AgggAkF/NgIEIAJBBzYCAEEOIAIQNEI/hCEKIAIoAnQgCjcDEAJAIAIoAnQoAhgEQCACIAIoAnQoAhggAkEYahCmAUEATjoAFyACLQAXQQFxRQRAAkAgAigCdCkDaFBFDQAgAigCdCkDcFBFDQAgAigCdEL//wM3AxALCwwBCwJAIAIoAnQoAhwiACgCTEEASA0ACyAAKAI8IQBBACEFIwBBIGsiBiQAAn8CQCAAIAJBGGoiCRAKIgFBeEYEQCMAQSBrIgckACAAIAdBCGoQCSIIBH9BtJsBIAg2AgBBAAVBAQshCCAHQSBqJAAgCA0BCyABQYFgTwR/QbSbAUEAIAFrNgIAQX8FIAELDAELA0AgBSAGaiIBIAVBxxJqLQAAOgAAIAVBDkchByAFQQFqIQUgBw0ACwJAIAAEQEEPIQUgACEBA0AgAUEKTwRAIAVBAWohBSABQQpuIQEMAQsLIAUgBmpBADoAAANAIAYgBUEBayIFaiAAIABBCm4iAUEKbGtBMHI6AAAgAEEJSyEHIAEhACAHDQALDAELIAFBMDoAACAGQQA6AA8LIAYgCRACIgBBgWBPBH9BtJsBQQAgAGs2AgBBfwUgAAsLIQAgBkEgaiQAIAIgAEEATjoAFwsCQCACLQAXQQFxRQRAIAIoAnRB2ABqQQVBtJsBKAIAEBQMAQsgAigCdCkDIEIQg1AEQCACKAJ0IAIoAlg2AkggAigCdCIAIAApAyBCEIQ3AyALIAIoAiRBgOADcUGAgAJGBEAgAigCdEL/gQE3AxAgAikDQCACKAJ0KQNoIAIoAnQpA3B8VARAIAIoAnhBEkEAEBQgAigCdCgCGBAVIAIoAnQQFSACQQA2ApwBDAMLIAIoAnQpA3BQBEAgAigCdCACKQNAIAIoAnQpA2h9NwM4IAIoAnQiACAAKQMgQgSENwMgAkAgAigCdCgCGEUNACACKQOIAVBFDQAgAigCdEL//wM3AxALCwsLIAIoAnQiACAAKQMQQoCAEIQ3AxAgAkEeIAIoAnQgAigCeBCDASIANgJwIABFBEAgAigCdCgCGBAVIAIoAnQQFSACQQA2ApwBDAELIAIgAigCcDYCnAELIAIoApwBIQAgAkGgAWokACAEIAA2AhwLIAQoAhwhACAEQSBqJAAgAyAANgIYAkAgAEUEQCADKAIgIANBCGoQnQEgA0EIahA4IANBADYCLAwBCyADIAMoAhggAygCJCADQQhqEJwBIgA2AhwgAEUEQCADKAIYEBsgAygCICADQQhqEJ0BIANBCGoQOCADQQA2AiwMAQsgA0EIahA4IAMgAygCHDYCLAsgAygCLCEAIANBMGokACAAC5IfAQZ/IwBB4ABrIgQkACAEIAA2AlQgBCABNgJQIAQgAjcDSCAEIAM2AkQgBCAEKAJUNgJAIAQgBCgCUDYCPAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAIAQoAkQOEwYHAgwEBQoOAQMJEAsPDQgREQARCyAEQgA3A1gMEQsgBCgCQCgCGEUEQCAEKAJAQRxBABAUIARCfzcDWAwRCyAEKAJAIQAjAEGAAWsiASQAIAEgADYCeCABIAEoAngoAhgQLkEIahAYIgA2AnQCQCAARQRAIAEoAnhBDkEAEBQgAUF/NgJ8DAELAkAgASgCeCgCGCABQRBqEKYBRQRAIAEgASgCHDYCbAwBCyABQX82AmwLIAEoAnQhACABIAEoAngoAhg2AgAgAEGrEiABEG8gASgCdCEDIAEoAmwhByMAQTBrIgAkACAAIAM2AiggACAHNgIkIABBADYCECAAIAAoAiggACgCKBAuajYCGCAAIAAoAhhBAWs2AhwDQCAAKAIcIAAoAihPBH8gACgCHCwAAEHYAEYFQQALQQFxBEAgACAAKAIQQQFqNgIQIAAgACgCHEEBazYCHAwBCwsCQCAAKAIQRQRAQbSbAUEcNgIAIABBfzYCLAwBCyAAIAAoAhxBAWo2AhwDQCMAQRBrIgckAAJAAn8jAEEQayIDJAAgAyAHQQhqNgIIIANBBDsBBiADQegLQQBBABBsIgU2AgACQCAFQQBIBEAgA0EAOgAPDAELAn8gAygCACEGIAMoAgghCCADLwEGIQkjAEEQayIFJAAgBSAJNgIMIAUgCDYCCCAGIAVBCGpBASAFQQRqEAYiBgR/QbSbASAGNgIAQX8FQQALIQYgBSgCBCEIIAVBEGokACADLwEGQX8gCCAGG0cLBEAgAygCABBrIANBADoADwwBCyADKAIAEGsgA0EBOgAPCyADLQAPQQFxIQUgA0EQaiQAIAULBEAgByAHKAIINgIMDAELQcCgAS0AAEEBcUUEQEEAEAEhBgJAQciZASgCACIDRQRAQcyZASgCACAGNgIADAELQdCZAUEDQQNBASADQQdGGyADQR9GGzYCAEG8oAFBADYCAEHMmQEoAgAhBSADQQFOBEAgBq0hAkEAIQYDQCAFIAZBAnRqIAJCrf7V5NSF/ajYAH5CAXwiAkIgiD4CACAGQQFqIgYgA0cNAAsLIAUgBSgCAEEBcjYCAAsLQcyZASgCACEDAkBByJkBKAIAIgVFBEAgAyADKAIAQe2cmY4EbEG54ABqQf////8HcSIDNgIADAELIANB0JkBKAIAIgZBAnRqIgggCCgCACADQbygASgCACIIQQJ0aigCAGoiAzYCAEG8oAFBACAIQQFqIgggBSAIRhs2AgBB0JkBQQAgBkEBaiIGIAUgBkYbNgIAIANBAXYhAwsgByADNgIMCyAHKAIMIQMgB0EQaiQAIAAgAzYCDCAAIAAoAhw2AhQDQCAAKAIUIAAoAhhJBEAgACAAKAIMQSRwOgALAn8gACwAC0EKSARAIAAsAAtBMGoMAQsgACwAC0HXAGoLIQMgACAAKAIUIgdBAWo2AhQgByADOgAAIAAgACgCDEEkbjYCDAwBCwsgACgCKCEDIAAgACgCJEF/RgR/QbYDBSAAKAIkCzYCACAAIANBwoEgIAAQbCIDNgIgIANBAE4EQCAAKAIkQX9HBEAgACgCKCAAKAIkEA8iA0GBYE8Ef0G0mwFBACADazYCAEEABSADCxoLIAAgACgCIDYCLAwCC0G0mwEoAgBBFEYNAAsgAEF/NgIsCyAAKAIsIQMgAEEwaiQAIAEgAyIANgJwIABBf0YEQCABKAJ4QQxBtJsBKAIAEBQgASgCdBAVIAFBfzYCfAwBCyABIAEoAnBBoxIQoQEiADYCaCAARQRAIAEoAnhBDEG0mwEoAgAQFCABKAJwEGsgASgCdBBtGiABKAJ0EBUgAUF/NgJ8DAELIAEoAnggASgCaDYChAEgASgCeCABKAJ0NgKAASABQQA2AnwLIAEoAnwhACABQYABaiQAIAQgAKw3A1gMEAsgBCgCQCgCGARAIAQoAkAoAhwQVhogBCgCQEEANgIcCyAEQgA3A1gMDwsgBCgCQCgChAEQVkEASARAIAQoAkBBADYChAEgBCgCQEEGQbSbASgCABAUCyAEKAJAQQA2AoQBIAQoAkAoAoABIAQoAkAoAhgQCCIAQYFgTwR/QbSbAUEAIABrNgIAQX8FIAALQQBIBEAgBCgCQEECQbSbASgCABAUIARCfzcDWAwPCyAEKAJAKAKAARAVIAQoAkBBADYCgAEgBEIANwNYDA4LIAQgBCgCQCAEKAJQIAQpA0gQQzcDWAwNCyAEKAJAKAIYEBUgBCgCQCgCgAEQFSAEKAJAKAIcBEAgBCgCQCgCHBBWGgsgBCgCQBAVIARCADcDWAwMCyAEKAJAKAIYBEAgBCgCQCgCGCEBIwBBIGsiACQAIAAgATYCGCAAQQA6ABcgAEGAgCA2AgwCQCAALQAXQQFxBEAgACAAKAIMQQJyNgIMDAELIAAgACgCDDYCDAsgACgCGCEBIAAoAgwhAyAAQbYDNgIAIAAgASADIAAQbCIBNgIQAkAgAUEASARAIABBADYCHAwBCyAAIAAoAhBBoxJBoBIgAC0AF0EBcRsQoQEiATYCCCABRQRAIABBADYCHAwBCyAAIAAoAgg2AhwLIAAoAhwhASAAQSBqJAAgBCgCQCABNgIcIAFFBEAgBCgCQEELQbSbASgCABAUIARCfzcDWAwNCwsgBCgCQCkDaEIAUgRAIAQoAkAoAhwgBCgCQCkDaCAEKAJAEJ8BQQBIBEAgBEJ/NwNYDA0LCyAEKAJAQgA3A3ggBEIANwNYDAsLAkAgBCgCQCkDcEIAUgRAIAQgBCgCQCkDcCAEKAJAKQN4fTcDMCAEKQMwIAQpA0hWBEAgBCAEKQNINwMwCwwBCyAEIAQpA0g3AzALIAQpAzBC/////w9WBEAgBEL/////DzcDMAsgBAJ/IAQoAjwhByAEKQMwpyEAIAQoAkAoAhwiAygCTBogAyADLQBKIgFBAWsgAXI6AEogAygCCCADKAIEIgVrIgFBAUgEfyAABSAHIAUgASAAIAAgAUsbIgEQGRogAyADKAIEIAFqNgIEIAEgB2ohByAAIAFrCyIBBEADQAJAAn8gAyADLQBKIgVBAWsgBXI6AEogAygCFCADKAIcSwRAIANBAEEAIAMoAiQRAQAaCyADQQA2AhwgA0IANwMQIAMoAgAiBUEEcQRAIAMgBUEgcjYCAEF/DAELIAMgAygCLCADKAIwaiIGNgIIIAMgBjYCBCAFQRt0QR91C0UEQCADIAcgASADKAIgEQEAIgVBAWpBAUsNAQsgACABawwDCyAFIAdqIQcgASAFayIBDQALCyAACyIANgIsIABFBEACfyAEKAJAKAIcIgAoAkxBf0wEQCAAKAIADAELIAAoAgALQQV2QQFxBEAgBCgCQEEFQbSbASgCABAUIARCfzcDWAwMCwsgBCgCQCIAIAApA3ggBCgCLK18NwN4IAQgBCgCLK03A1gMCgsgBCgCQCgCGBBtQQBIBEAgBCgCQEEWQbSbASgCABAUIARCfzcDWAwKCyAEQgA3A1gMCQsgBCgCQCgChAEEQCAEKAJAKAKEARBWGiAEKAJAQQA2AoQBCyAEKAJAKAKAARBtGiAEKAJAKAKAARAVIAQoAkBBADYCgAEgBEIANwNYDAgLIAQCfyAEKQNIQhBUBEAgBCgCQEESQQAQFEEADAELIAQoAlALNgIYIAQoAhhFBEAgBEJ/NwNYDAgLIARBATYCHAJAAkACQAJAAkAgBCgCGCgCCA4DAAIBAwsgBCAEKAIYKQMANwMgDAMLAkAgBCgCQCkDcFAEQCAEKAJAKAIcIAQoAhgpAwBBAiAEKAJAEGpBAEgEQCAEQn83A1gMDQsgBCAEKAJAKAIcEKMBIgI3AyAgAkIAUwRAIAQoAkBBBEG0mwEoAgAQFCAEQn83A1gMDQsgBCAEKQMgIAQoAkApA2h9NwMgIARBADYCHAwBCyAEIAQoAkApA3AgBCgCGCkDAHw3AyALDAILIAQgBCgCQCkDeCAEKAIYKQMAfDcDIAwBCyAEKAJAQRJBABAUIARCfzcDWAwICwJAAkAgBCkDIEIAUw0AIAQoAkApA3BCAFIEQCAEKQMgIAQoAkApA3BWDQELIAQoAkApA2ggBCkDICAEKAJAKQNofFgNAQsgBCgCQEESQQAQFCAEQn83A1gMCAsgBCgCQCAEKQMgNwN4IAQoAhwEQCAEKAJAKAIcIAQoAkApA3ggBCgCQCkDaHwgBCgCQBCfAUEASARAIARCfzcDWAwJCwsgBEIANwNYDAcLIAQCfyAEKQNIQhBUBEAgBCgCQEESQQAQFEEADAELIAQoAlALNgIUIAQoAhRFBEAgBEJ/NwNYDAcLIAQoAkAoAoQBIAQoAhQpAwAgBCgCFCgCCCAEKAJAEGpBAEgEQCAEQn83A1gMBwsgBEIANwNYDAYLIAQpA0hCOFQEQCAEQn83A1gMBgsCfyMAQRBrIgAgBCgCQEHYAGo2AgwgACgCDCgCAAsEQCAEKAJAAn8jAEEQayIAIAQoAkBB2ABqNgIMIAAoAgwoAgALAn8jAEEQayIAIAQoAkBB2ABqNgIMIAAoAgwoAgQLEBQgBEJ/NwNYDAYLIAQoAlAiACAEKAJAIgEpACA3AAAgACABKQBQNwAwIAAgASkASDcAKCAAIAEpAEA3ACAgACABKQA4NwAYIAAgASkAMDcAECAAIAEpACg3AAggBEI4NwNYDAULIAQgBCgCQCkDEDcDWAwECyAEIAQoAkApA3g3A1gMAwsgBCAEKAJAKAKEARCjATcDCCAEKQMIQgBTBEAgBCgCQEEeQbSbASgCABAUIARCfzcDWAwDCyAEIAQpAwg3A1gMAgsgBCgCQCgChAEiACgCTEEAThogACAAKAIAQU9xNgIAIAQCfyAEKAJQIQEgBCkDSKciACAAAn8gBCgCQCgChAEiAygCTEF/TARAIAEgACADEHEMAQsgASAAIAMQcQsiAUYNABogAQs2AgQCQCAEKQNIIAQoAgStUQRAAn8gBCgCQCgChAEiACgCTEF/TARAIAAoAgAMAQsgACgCAAtBBXZBAXFFDQELIAQoAkBBBkG0mwEoAgAQFCAEQn83A1gMAgsgBCAEKAIErTcDWAwBCyAEKAJAQRxBABAUIARCfzcDWAsgBCkDWCECIARB4ABqJAAgAgsJACAAKAI8EAUL5AEBBH8jAEEgayIDJAAgAyABNgIQIAMgAiAAKAIwIgRBAEdrNgIUIAAoAiwhBSADIAQ2AhwgAyAFNgIYQX8hBAJAAkAgACgCPCADQRBqQQIgA0EMahAGIgUEf0G0mwEgBTYCAEF/BUEAC0UEQCADKAIMIgRBAEoNAQsgACAAKAIAIARBMHFBEHNyNgIADAELIAQgAygCFCIGTQ0AIAAgACgCLCIFNgIEIAAgBSAEIAZrajYCCCAAKAIwBEAgACAFQQFqNgIEIAEgAmpBAWsgBS0AADoAAAsgAiEECyADQSBqJAAgBAv0AgEHfyMAQSBrIgMkACADIAAoAhwiBTYCECAAKAIUIQQgAyACNgIcIAMgATYCGCADIAQgBWsiATYCFCABIAJqIQVBAiEHIANBEGohAQJ/AkACQCAAKAI8IANBEGpBAiADQQxqEAMiBAR/QbSbASAENgIAQX8FQQALRQRAA0AgBSADKAIMIgRGDQIgBEF/TA0DIAEgBCABKAIEIghLIgZBA3RqIgkgBCAIQQAgBhtrIgggCSgCAGo2AgAgAUEMQQQgBhtqIgkgCSgCACAIazYCACAFIARrIQUgACgCPCABQQhqIAEgBhsiASAHIAZrIgcgA0EMahADIgQEf0G0mwEgBDYCAEF/BUEAC0UNAAsLIAVBf0cNAQsgACAAKAIsIgE2AhwgACABNgIUIAAgASAAKAIwajYCECACDAELIABBADYCHCAAQgA3AxAgACAAKAIAQSByNgIAQQAgB0ECRg0AGiACIAEoAgRrCyEAIANBIGokACAAC1IBAX8jAEEQayIDJAAgACgCPCABpyABQiCIpyACQf8BcSADQQhqEA0iAAR/QbSbASAANgIAQX8FQQALIQAgAykDCCEBIANBEGokAEJ/IAEgABsL1QQBBX8jAEGwAWsiASQAIAEgADYCqAEgASgCqAEQOAJAAkAgASgCqAEoAgBBAE4EQCABKAKoASgCAEGAFCgCAEgNAQsgASABKAKoASgCADYCECABQSBqQY8SIAFBEGoQbyABQQA2AqQBIAEgAUEgajYCoAEMAQsgASABKAKoASgCAEECdEGAE2ooAgA2AqQBAkACQAJAAkAgASgCqAEoAgBBAnRBkBRqKAIAQQFrDgIAAQILIAEoAqgBKAIEIQJBkJkBKAIAIQRBACEAAkACQANAIAIgAEGgiAFqLQAARwRAQdcAIQMgAEEBaiIAQdcARw0BDAILCyAAIgMNAEGAiQEhAgwBC0GAiQEhAANAIAAtAAAhBSAAQQFqIgIhACAFDQAgAiEAIANBAWsiAw0ACwsgBCgCFBogASACNgKgAQwCCyMAQRBrIgAgASgCqAEoAgQ2AgwgAUEAIAAoAgxrQQJ0QajZAGooAgA2AqABDAELIAFBADYCoAELCwJAIAEoAqABRQRAIAEgASgCpAE2AqwBDAELIAEgASgCoAEQLgJ/IAEoAqQBBEAgASgCpAEQLkECagwBC0EAC2pBAWoQGCIANgIcIABFBEAgAUG4EygCADYCrAEMAQsgASgCHCEAAn8gASgCpAEEQCABKAKkAQwBC0H6EgshA0HfEkH6EiABKAKkARshAiABIAEoAqABNgIIIAEgAjYCBCABIAM2AgAgAEG+CiABEG8gASgCqAEgASgCHDYCCCABIAEoAhw2AqwBCyABKAKsASEAIAFBsAFqJAAgAAsIAEEBQTgQfwszAQF/IAAoAhQiAyABIAIgACgCECADayIBIAEgAksbIgEQGRogACAAKAIUIAFqNgIUIAILjwUCBn4BfyABIAEoAgBBD2pBcHEiAUEQajYCACAAAnwgASkDACEDIAEpAwghBiMAQSBrIggkAAJAIAZC////////////AIMiBEKAgICAgIDAgDx9IARCgICAgICAwP/DAH1UBEAgBkIEhiADQjyIhCEEIANC//////////8PgyIDQoGAgICAgICACFoEQCAEQoGAgICAgICAwAB8IQIMAgsgBEKAgICAgICAgEB9IQIgA0KAgICAgICAgAiFQgBSDQEgAiAEQgGDfCECDAELIANQIARCgICAgICAwP//AFQgBEKAgICAgIDA//8AURtFBEAgBkIEhiADQjyIhEL/////////A4NCgICAgICAgPz/AIQhAgwBC0KAgICAgICA+P8AIQIgBEL///////+//8MAVg0AQgAhAiAEQjCIpyIAQZH3AEkNACADIQIgBkL///////8/g0KAgICAgIDAAIQiBSEHAkAgAEGB9wBrIgFBwABxBEAgAiABQUBqrYYhB0IAIQIMAQsgAUUNACAHIAGtIgSGIAJBwAAgAWutiIQhByACIASGIQILIAggAjcDECAIIAc3AxgCQEGB+AAgAGsiAEHAAHEEQCAFIABBQGqtiCEDQgAhBQwBCyAARQ0AIAVBwAAgAGuthiADIACtIgKIhCEDIAUgAoghBQsgCCADNwMAIAggBTcDCCAIKQMIQgSGIAgpAwAiA0I8iIQhAiAIKQMQIAgpAxiEQgBSrSADQv//////////D4OEIgNCgYCAgICAgIAIWgRAIAJCAXwhAgwBCyADQoCAgICAgICACIVCAFINACACQgGDIAJ8IQILIAhBIGokACACIAZCgICAgICAgICAf4OEvws5AwALrRcDEn8CfgF8IwBBsARrIgkkACAJQQA2AiwCQCABvSIYQn9XBEBBASESQa4IIRMgAZoiAb0hGAwBCyAEQYAQcQRAQQEhEkGxCCETDAELQbQIQa8IIARBAXEiEhshEyASRSEXCwJAIBhCgICAgICAgPj/AINCgICAgICAgPj/AFEEQCAAQSAgAiASQQNqIg0gBEH//3txECYgACATIBIQIiAAQeQLQbUSIAVBIHEiAxtBjw1BuRIgAxsgASABYhtBAxAiDAELIAlBEGohEAJAAn8CQCABIAlBLGoQqQEiASABoCIBRAAAAAAAAAAAYgRAIAkgCSgCLCIGQQFrNgIsIAVBIHIiFEHhAEcNAQwDCyAFQSByIhRB4QBGDQIgCSgCLCELQQYgAyADQQBIGwwBCyAJIAZBHWsiCzYCLCABRAAAAAAAALBBoiEBQQYgAyADQQBIGwshCiAJQTBqIAlB0AJqIAtBAEgbIg4hBwNAIAcCfyABRAAAAAAAAPBBYyABRAAAAAAAAAAAZnEEQCABqwwBC0EACyIDNgIAIAdBBGohByABIAO4oUQAAAAAZc3NQaIiAUQAAAAAAAAAAGINAAsCQCALQQFIBEAgCyEDIAchBiAOIQgMAQsgDiEIIAshAwNAIANBHSADQR1IGyEMAkAgB0EEayIGIAhJDQAgDK0hGUIAIRgDQCAGIAY1AgAgGYYgGHwiGCAYQoCU69wDgCIYQoCU69wDfn0+AgAgCCAGQQRrIgZNBEAgGEL/////D4MhGAwBCwsgGKciA0UNACAIQQRrIgggAzYCAAsDQCAIIAciBkkEQCAGQQRrIgcoAgBFDQELCyAJIAkoAiwgDGsiAzYCLCAGIQcgA0EASg0ACwsgCkEZakEJbSEHIANBf0wEQCAHQQFqIQ0gFEHmAEYhFQNAQQlBACADayADQXdIGyEWAkAgBiAISwRAQYCU69wDIBZ2IQ9BfyAWdEF/cyERQQAhAyAIIQcDQCAHIAMgBygCACIMIBZ2ajYCACAMIBFxIA9sIQMgB0EEaiIHIAZJDQALIAggCEEEaiAIKAIAGyEIIANFDQEgBiADNgIAIAZBBGohBgwBCyAIIAhBBGogCCgCABshCAsgCSAJKAIsIBZqIgM2AiwgDiAIIBUbIgcgDUECdGogBiAGIAdrQQJ1IA1KGyEGIANBAEgNAAsLQQAhBwJAIAYgCE0NACAOIAhrQQJ1QQlsIQcgCCgCACIMQQpJDQBB5AAhAwNAIAdBAWohByADIAxLDQEgA0EKbCEDDAALAAsgCkEAIAcgFEHmAEYbayAUQecARiAKQQBHcWsiAyAGIA5rQQJ1QQlsQQlrSARAIANBgMgAaiIRQQltIgxBAnQgCUEwakEEciAJQdQCaiALQQBIG2pBgCBrIQ1BCiEDAkAgESAMQQlsayIMQQdKDQBB5AAhAwNAIAxBAWoiDEEIRg0BIANBCmwhAwwACwALAkAgDSgCACIRIBEgA24iDCADbGsiD0EBIA1BBGoiCyAGRhtFDQBEAAAAAAAA4D9EAAAAAAAA8D9EAAAAAAAA+D8gBiALRhtEAAAAAAAA+D8gDyADQQF2IgtGGyALIA9LGyEaRAEAAAAAAEBDRAAAAAAAAEBDIAxBAXEbIQECQCAXDQAgEy0AAEEtRw0AIBqaIRogAZohAQsgDSARIA9rIgs2AgAgASAaoCABYQ0AIA0gAyALaiIDNgIAIANBgJTr3ANPBEADQCANQQA2AgAgCCANQQRrIg1LBEAgCEEEayIIQQA2AgALIA0gDSgCAEEBaiIDNgIAIANB/5Pr3ANLDQALCyAOIAhrQQJ1QQlsIQcgCCgCACILQQpJDQBB5AAhAwNAIAdBAWohByADIAtLDQEgA0EKbCEDDAALAAsgDUEEaiIDIAYgAyAGSRshBgsDQCAGIgsgCE0iDEUEQCALQQRrIgYoAgBFDQELCwJAIBRB5wBHBEAgBEEIcSEPDAELIAdBf3NBfyAKQQEgChsiBiAHSiAHQXtKcSIDGyAGaiEKQX9BfiADGyAFaiEFIARBCHEiDw0AQXchBgJAIAwNACALQQRrKAIAIgNFDQBBACEGIANBCnANAEEAIQxB5AAhBgNAIAMgBnBFBEAgDEEBaiEMIAZBCmwhBgwBCwsgDEF/cyEGCyALIA5rQQJ1QQlsIQMgBUFfcUHGAEYEQEEAIQ8gCiADIAZqQQlrIgNBACADQQBKGyIDIAMgCkobIQoMAQtBACEPIAogAyAHaiAGakEJayIDQQAgA0EAShsiAyADIApKGyEKCyAKIA9yQQBHIREgAEEgIAIgBUFfcSIMQcYARgR/IAdBACAHQQBKGwUgECAHIAdBH3UiA2ogA3OtIBAQRCIGa0EBTARAA0AgBkEBayIGQTA6AAAgECAGa0ECSA0ACwsgBkECayIVIAU6AAAgBkEBa0EtQSsgB0EASBs6AAAgECAVawsgCiASaiARampBAWoiDSAEECYgACATIBIQIiAAQTAgAiANIARBgIAEcxAmAkACQAJAIAxBxgBGBEAgCUEQakEIciEDIAlBEGpBCXIhByAOIAggCCAOSxsiBSEIA0AgCDUCACAHEEQhBgJAIAUgCEcEQCAGIAlBEGpNDQEDQCAGQQFrIgZBMDoAACAGIAlBEGpLDQALDAELIAYgB0cNACAJQTA6ABggAyEGCyAAIAYgByAGaxAiIAhBBGoiCCAOTQ0AC0EAIQYgEUUNAiAAQdYSQQEQIiAIIAtPDQEgCkEBSA0BA0AgCDUCACAHEEQiBiAJQRBqSwRAA0AgBkEBayIGQTA6AAAgBiAJQRBqSw0ACwsgACAGIApBCSAKQQlIGxAiIApBCWshBiAIQQRqIgggC08NAyAKQQlKIQMgBiEKIAMNAAsMAgsCQCAKQQBIDQAgCyAIQQRqIAggC0kbIQUgCUEQakEJciELIAlBEGpBCHIhAyAIIQcDQCALIAc1AgAgCxBEIgZGBEAgCUEwOgAYIAMhBgsCQCAHIAhHBEAgBiAJQRBqTQ0BA0AgBkEBayIGQTA6AAAgBiAJQRBqSw0ACwwBCyAAIAZBARAiIAZBAWohBkEAIApBAEwgDxsNACAAQdYSQQEQIgsgACAGIAsgBmsiBiAKIAYgCkgbECIgCiAGayEKIAdBBGoiByAFTw0BIApBf0oNAAsLIABBMCAKQRJqQRJBABAmIAAgFSAQIBVrECIMAgsgCiEGCyAAQTAgBkEJakEJQQAQJgsMAQsgE0EJaiATIAVBIHEiCxshCgJAIANBC0sNAEEMIANrIgZFDQBEAAAAAAAAIEAhGgNAIBpEAAAAAAAAMECiIRogBkEBayIGDQALIAotAABBLUYEQCAaIAGaIBqhoJohAQwBCyABIBqgIBqhIQELIBAgCSgCLCIGIAZBH3UiBmogBnOtIBAQRCIGRgRAIAlBMDoADyAJQQ9qIQYLIBJBAnIhDiAJKAIsIQcgBkECayIMIAVBD2o6AAAgBkEBa0EtQSsgB0EASBs6AAAgBEEIcSEHIAlBEGohCANAIAgiBQJ/IAGZRAAAAAAAAOBBYwRAIAGqDAELQYCAgIB4CyIGQYCHAWotAAAgC3I6AAAgASAGt6FEAAAAAAAAMECiIQECQCAFQQFqIgggCUEQamtBAUcNAAJAIAFEAAAAAAAAAABiDQAgA0EASg0AIAdFDQELIAVBLjoAASAFQQJqIQgLIAFEAAAAAAAAAABiDQALIABBICACIA4CfwJAIANFDQAgCCAJa0ESayADTg0AIAMgEGogDGtBAmoMAQsgECAJQRBqIAxqayAIagsiA2oiDSAEECYgACAKIA4QIiAAQTAgAiANIARBgIAEcxAmIAAgCUEQaiAIIAlBEGprIgUQIiAAQTAgAyAFIBAgDGsiA2prQQBBABAmIAAgDCADECILIABBICACIA0gBEGAwABzECYgCUGwBGokACACIA0gAiANShsLBgBB4J8BCwYAQdyfAQsGAEHUnwELGAEBfyMAQRBrIgEgADYCDCABKAIMQQRqCxgBAX8jAEEQayIBIAA2AgwgASgCDEEIagtpAQF/IwBBEGsiASQAIAEgADYCDCABKAIMKAIUBEAgASgCDCgCFBAbCyABQQA2AgggASgCDCgCBARAIAEgASgCDCgCBDYCCAsgASgCDEEEahA4IAEoAgwQFSABKAIIIQAgAUEQaiQAIAALqQEBA38CQCAALQAAIgJFDQADQCABLQAAIgRFBEAgAiEDDAILAkAgAiAERg0AIAJBIHIgAiACQcEAa0EaSRsgAS0AACICQSByIAIgAkHBAGtBGkkbRg0AIAAtAAAhAwwCCyABQQFqIQEgAC0AASECIABBAWohACACDQALCyADQf8BcSIAQSByIAAgAEHBAGtBGkkbIAEtAAAiAEEgciAAIABBwQBrQRpJG2sLiAEBAX8jAEEQayICJAAgAiAANgIMIAIgATYCCCMAQRBrIgAgAigCDDYCDCAAKAIMQQA2AgAgACgCDEEANgIEIAAoAgxBADYCCCACKAIMIAIoAgg2AgACQCACKAIMEKwBQQFGBEAgAigCDEG0mwEoAgA2AgQMAQsgAigCDEEANgIECyACQRBqJAAL2AkBAX8jAEGwAWsiBSQAIAUgADYCpAEgBSABNgKgASAFIAI2ApwBIAUgAzcDkAEgBSAENgKMASAFIAUoAqABNgKIAQJAAkACQAJAAkACQAJAAkACQAJAAkAgBSgCjAEODwABAgMEBQcICQkJCQkJBgkLIAUoAogBQgA3AyAgBUIANwOoAQwJCyAFIAUoAqQBIAUoApwBIAUpA5ABECsiAzcDgAEgA0IAUwRAIAUoAogBQQhqIAUoAqQBEBcgBUJ/NwOoAQwJCwJAIAUpA4ABUARAIAUoAogBKQMoIAUoAogBKQMgUQRAIAUoAogBQQE2AgQgBSgCiAEgBSgCiAEpAyA3AxggBSgCiAEoAgAEQCAFKAKkASAFQcgAahA5QQBIBEAgBSgCiAFBCGogBSgCpAEQFyAFQn83A6gBDA0LAkAgBSkDSEIgg1ANACAFKAJ0IAUoAogBKAIwRg0AIAUoAogBQQhqQQdBABAUIAVCfzcDqAEMDQsCQCAFKQNIQgSDUA0AIAUpA2AgBSgCiAEpAxhRDQAgBSgCiAFBCGpBFUEAEBQgBUJ/NwOoAQwNCwsLDAELAkAgBSgCiAEoAgQNACAFKAKIASkDICAFKAKIASkDKFYNACAFIAUoAogBKQMoIAUoAogBKQMgfTcDQANAIAUpA0AgBSkDgAFUBEAgBSAFKQOAASAFKQNAfUL/////D1YEfkL/////DwUgBSkDgAEgBSkDQH0LNwM4IAUoAogBKAIwIAUoApwBIAUpA0CnaiAFKQM4pxAaIQAgBSgCiAEgADYCMCAFKAKIASIAIAUpAzggACkDKHw3AyggBSAFKQM4IAUpA0B8NwNADAELCwsLIAUoAogBIgAgBSkDgAEgACkDIHw3AyAgBSAFKQOAATcDqAEMCAsgBUIANwOoAQwHCyAFIAUoApwBNgI0IAUoAogBKAIEBEAgBSgCNCAFKAKIASkDGDcDGCAFKAI0IAUoAogBKAIwNgIsIAUoAjQgBSgCiAEpAxg3AyAgBSgCNEEAOwEwIAUoAjRBADsBMiAFKAI0IgAgACkDAELsAYQ3AwALIAVCADcDqAEMBgsgBSAFKAKIAUEIaiAFKAKcASAFKQOQARBDNwOoAQwFCyAFKAKIARAVIAVCADcDqAEMBAsjAEEQayIAIAUoAqQBNgIMIAUgACgCDCkDGDcDKCAFKQMoQgBTBEAgBSgCiAFBCGogBSgCpAEQFyAFQn83A6gBDAQLIAUpAyghAyAFQX82AhggBUEQNgIUIAVBDzYCECAFQQ02AgwgBUEMNgIIIAVBCjYCBCAFQQk2AgAgBUEIIAUQNEJ/hSADgzcDqAEMAwsgBQJ/IAUpA5ABQhBUBEAgBSgCiAFBCGpBEkEAEBRBAAwBCyAFKAKcAQs2AhwgBSgCHEUEQCAFQn83A6gBDAMLAkAgBSgCpAEgBSgCHCkDACAFKAIcKAIIECdBAE4EQCAFIAUoAqQBEEkiAzcDICADQgBZDQELIAUoAogBQQhqIAUoAqQBEBcgBUJ/NwOoAQwDCyAFKAKIASAFKQMgNwMgIAVCADcDqAEMAgsgBSAFKAKIASkDIDcDqAEMAQsgBSgCiAFBCGpBHEEAEBQgBUJ/NwOoAQsgBSkDqAEhAyAFQbABaiQAIAMLnAwBAX8jAEEwayIFJAAgBSAANgIkIAUgATYCICAFIAI2AhwgBSADNwMQIAUgBDYCDCAFIAUoAiA2AggCQAJAAkACQAJAAkACQAJAAkACQCAFKAIMDhEAAQIDBQYICAgICAgICAcIBAgLIAUoAghCADcDGCAFKAIIQQA6AAwgBSgCCEEAOgANIAUoAghBADoADyAFKAIIQn83AyAgBSgCCCgCrEAgBSgCCCgCqEAoAgwRAABBAXFFBEAgBUJ/NwMoDAkLIAVCADcDKAwICyAFKAIkIQEgBSgCCCECIAUoAhwhBCAFKQMQIQMjAEFAaiIAJAAgACABNgI0IAAgAjYCMCAAIAQ2AiwgACADNwMgAkACfyMAQRBrIgEgACgCMDYCDCABKAIMKAIACwRAIABCfzcDOAwBCwJAIAApAyBQRQRAIAAoAjAtAA1BAXFFDQELIABCADcDOAwBCyAAQgA3AwggAEEAOgAbA0AgAC0AG0EBcQR/QQAFIAApAwggACkDIFQLQQFxBEAgACAAKQMgIAApAwh9NwMAIAAgACgCMCgCrEAgACgCLCAAKQMIp2ogACAAKAIwKAKoQCgCHBEBADYCHCAAKAIcQQJHBEAgACAAKQMAIAApAwh8NwMICwJAAkACQAJAIAAoAhxBAWsOAwACAQMLIAAoAjBBAToADQJAIAAoAjAtAAxBAXENAAsgACgCMCkDIEIAUwRAIAAoAjBBFEEAEBQgAEEBOgAbDAMLAkAgACgCMC0ADkEBcUUNACAAKAIwKQMgIAApAwhWDQAgACgCMEEBOgAPIAAoAjAgACgCMCkDIDcDGCAAKAIsIAAoAjBBKGogACgCMCkDGKcQGRogACAAKAIwKQMYNwM4DAYLIABBAToAGwwCCyAAKAIwLQAMQQFxBEAgAEEBOgAbDAILIAAgACgCNCAAKAIwQShqQoDAABArIgM3AxAgA0IAUwRAIAAoAjAgACgCNBAXIABBAToAGwwCCwJAIAApAxBQBEAgACgCMEEBOgAMIAAoAjAoAqxAIAAoAjAoAqhAKAIYEQIAIAAoAjApAyBCAFMEQCAAKAIwQgA3AyALDAELAkAgACgCMCkDIEIAWQRAIAAoAjBBADoADgwBCyAAKAIwIAApAxA3AyALIAAoAjAoAqxAIAAoAjBBKGogACkDECAAKAIwKAKoQCgCFBEQABoLDAELAn8jAEEQayIBIAAoAjA2AgwgASgCDCgCAEULBEAgACgCMEEUQQAQFAsgAEEBOgAbCwwBCwsgACkDCEIAUgRAIAAoAjBBADoADiAAKAIwIgEgACkDCCABKQMYfDcDGCAAIAApAwg3AzgMAQsgAEF/QQACfyMAQRBrIgEgACgCMDYCDCABKAIMKAIACxusNwM4CyAAKQM4IQMgAEFAayQAIAUgAzcDKAwHCyAFKAIIKAKsQCAFKAIIKAKoQCgCEBEAAEEBcUUEQCAFQn83AygMBwsgBUIANwMoDAYLIAUgBSgCHDYCBAJAIAUoAggtABBBAXEEQCAFKAIILQANQQFxBEAgBSgCBCAFKAIILQAPQQFxBH9BAAUCfwJAIAUoAggoAhRBf0cEQCAFKAIIKAIUQX5HDQELQQgMAQsgBSgCCCgCFAtB//8DcQs7ATAgBSgCBCAFKAIIKQMYNwMgIAUoAgQiACAAKQMAQsgAhDcDAAwCCyAFKAIEIgAgACkDAEK3////D4M3AwAMAQsgBSgCBEEAOwEwIAUoAgQiACAAKQMAQsAAhDcDAAJAIAUoAggtAA1BAXEEQCAFKAIEIAUoAggpAxg3AxggBSgCBCIAIAApAwBCBIQ3AwAMAQsgBSgCBCIAIAApAwBC+////w+DNwMACwsgBUIANwMoDAULIAUgBSgCCC0AD0EBcQR/QQAFIAUoAggoAqxAIAUoAggoAqhAKAIIEQAAC6w3AygMBAsgBSAFKAIIIAUoAhwgBSkDEBBDNwMoDAMLIAUoAggQsQEgBUIANwMoDAILIAVBfzYCACAFQRAgBRA0Qj+ENwMoDAELIAUoAghBFEEAEBQgBUJ/NwMoCyAFKQMoIQMgBUEwaiQAIAMLPAEBfyMAQRBrIgMkACADIAA7AQ4gAyABNgIIIAMgAjYCBEEAIAMoAgggAygCBBC0ASEAIANBEGokACAAC46nAQEEfyMAQSBrIgUkACAFIAA2AhggBSABNgIUIAUgAjYCECAFIAUoAhg2AgwgBSgCDCAFKAIQKQMAQv////8PVgR+Qv////8PBSAFKAIQKQMACz4CICAFKAIMIAUoAhQ2AhwCQCAFKAIMLQAEQQFxBEAgBSgCDEEQaiEBQQRBACAFKAIMLQAMQQFxGyECIwBBQGoiACQAIAAgATYCOCAAIAI2AjQCQAJAAkAgACgCOBB4DQAgACgCNEEFSg0AIAAoAjRBAE4NAQsgAEF+NgI8DAELIAAgACgCOCgCHDYCLAJAAkAgACgCOCgCDEUNACAAKAI4KAIEBEAgACgCOCgCAEUNAQsgACgCLCgCBEGaBUcNASAAKAI0QQRGDQELIAAoAjhBsNkAKAIANgIYIABBfjYCPAwBCyAAKAI4KAIQRQRAIAAoAjhBvNkAKAIANgIYIABBezYCPAwBCyAAIAAoAiwoAig2AjAgACgCLCAAKAI0NgIoAkAgACgCLCgCFARAIAAoAjgQHCAAKAI4KAIQRQRAIAAoAixBfzYCKCAAQQA2AjwMAwsMAQsCQCAAKAI4KAIEDQAgACgCNEEBdEEJQQAgACgCNEEEShtrIAAoAjBBAXRBCUEAIAAoAjBBBEoba0oNACAAKAI0QQRGDQAgACgCOEG82QAoAgA2AhggAEF7NgI8DAILCwJAIAAoAiwoAgRBmgVHDQAgACgCOCgCBEUNACAAKAI4QbzZACgCADYCGCAAQXs2AjwMAQsgACgCLCgCBEEqRgRAIAAgACgCLCgCMEEEdEH4AGtBCHQ2AigCQAJAIAAoAiwoAogBQQJIBEAgACgCLCgChAFBAk4NAQsgAEEANgIkDAELAkAgACgCLCgChAFBBkgEQCAAQQE2AiQMAQsCQCAAKAIsKAKEAUEGRgRAIABBAjYCJAwBCyAAQQM2AiQLCwsgACAAKAIoIAAoAiRBBnRyNgIoIAAoAiwoAmwEQCAAIAAoAihBIHI2AigLIAAgACgCKEEfIAAoAihBH3BrajYCKCAAKAIsIAAoAigQSyAAKAIsKAJsBEAgACgCLCAAKAI4KAIwQRB2EEsgACgCLCAAKAI4KAIwQf//A3EQSwtBAEEAQQAQPSEBIAAoAjggATYCMCAAKAIsQfEANgIEIAAoAjgQHCAAKAIsKAIUBEAgACgCLEF/NgIoIABBADYCPAwCCwsgACgCLCgCBEE5RgRAQQBBAEEAEBohASAAKAI4IAE2AjAgACgCLCgCCCECIAAoAiwiAygCFCEBIAMgAUEBajYCFCABIAJqQR86AAAgACgCLCgCCCECIAAoAiwiAygCFCEBIAMgAUEBajYCFCABIAJqQYsBOgAAIAAoAiwoAgghAiAAKAIsIgMoAhQhASADIAFBAWo2AhQgASACakEIOgAAAkAgACgCLCgCHEUEQCAAKAIsKAIIIQIgACgCLCIDKAIUIQEgAyABQQFqNgIUIAEgAmpBADoAACAAKAIsKAIIIQIgACgCLCIDKAIUIQEgAyABQQFqNgIUIAEgAmpBADoAACAAKAIsKAIIIQIgACgCLCIDKAIUIQEgAyABQQFqNgIUIAEgAmpBADoAACAAKAIsKAIIIQIgACgCLCIDKAIUIQEgAyABQQFqNgIUIAEgAmpBADoAACAAKAIsKAIIIQIgACgCLCIDKAIUIQEgAyABQQFqNgIUIAEgAmpBADoAACAAKAIsKAKEAUEJRgR/QQIFQQRBACAAKAIsKAKIAUECSAR/IAAoAiwoAoQBQQJIBUEBC0EBcRsLIQIgACgCLCgCCCEDIAAoAiwiBCgCFCEBIAQgAUEBajYCFCABIANqIAI6AAAgACgCLCgCCCECIAAoAiwiAygCFCEBIAMgAUEBajYCFCABIAJqQQM6AAAgACgCLEHxADYCBCAAKAI4EBwgACgCLCgCFARAIAAoAixBfzYCKCAAQQA2AjwMBAsMAQsgACgCLCgCHCgCAEVFQQJBACAAKAIsKAIcKAIsG2pBBEEAIAAoAiwoAhwoAhAbakEIQQAgACgCLCgCHCgCHBtqQRBBACAAKAIsKAIcKAIkG2ohAiAAKAIsKAIIIQMgACgCLCIEKAIUIQEgBCABQQFqNgIUIAEgA2ogAjoAACAAKAIsKAIcKAIEQf8BcSECIAAoAiwoAgghAyAAKAIsIgQoAhQhASAEIAFBAWo2AhQgASADaiACOgAAIAAoAiwoAhwoAgRBCHZB/wFxIQIgACgCLCgCCCEDIAAoAiwiBCgCFCEBIAQgAUEBajYCFCABIANqIAI6AAAgACgCLCgCHCgCBEEQdkH/AXEhAiAAKAIsKAIIIQMgACgCLCIEKAIUIQEgBCABQQFqNgIUIAEgA2ogAjoAACAAKAIsKAIcKAIEQRh2IQIgACgCLCgCCCEDIAAoAiwiBCgCFCEBIAQgAUEBajYCFCABIANqIAI6AAAgACgCLCgChAFBCUYEf0ECBUEEQQAgACgCLCgCiAFBAkgEfyAAKAIsKAKEAUECSAVBAQtBAXEbCyECIAAoAiwoAgghAyAAKAIsIgQoAhQhASAEIAFBAWo2AhQgASADaiACOgAAIAAoAiwoAhwoAgxB/wFxIQIgACgCLCgCCCEDIAAoAiwiBCgCFCEBIAQgAUEBajYCFCABIANqIAI6AAAgACgCLCgCHCgCEARAIAAoAiwoAhwoAhRB/wFxIQIgACgCLCgCCCEDIAAoAiwiBCgCFCEBIAQgAUEBajYCFCABIANqIAI6AAAgACgCLCgCHCgCFEEIdkH/AXEhAiAAKAIsKAIIIQMgACgCLCIEKAIUIQEgBCABQQFqNgIUIAEgA2ogAjoAAAsgACgCLCgCHCgCLARAIAAoAjgoAjAgACgCLCgCCCAAKAIsKAIUEBohASAAKAI4IAE2AjALIAAoAixBADYCICAAKAIsQcUANgIECwsgACgCLCgCBEHFAEYEQCAAKAIsKAIcKAIQBEAgACAAKAIsKAIUNgIgIAAgACgCLCgCHCgCFEH//wNxIAAoAiwoAiBrNgIcA0AgACgCLCgCDCAAKAIsKAIUIAAoAhxqSQRAIAAgACgCLCgCDCAAKAIsKAIUazYCGCAAKAIsKAIIIAAoAiwoAhRqIAAoAiwoAhwoAhAgACgCLCgCIGogACgCGBAZGiAAKAIsIAAoAiwoAgw2AhQCQCAAKAIsKAIcKAIsRQ0AIAAoAiwoAhQgACgCIE0NACAAKAI4KAIwIAAoAiwoAgggACgCIGogACgCLCgCFCAAKAIgaxAaIQEgACgCOCABNgIwCyAAKAIsIgEgACgCGCABKAIgajYCICAAKAI4EBwgACgCLCgCFARAIAAoAixBfzYCKCAAQQA2AjwMBQUgAEEANgIgIAAgACgCHCAAKAIYazYCHAwCCwALCyAAKAIsKAIIIAAoAiwoAhRqIAAoAiwoAhwoAhAgACgCLCgCIGogACgCHBAZGiAAKAIsIgEgACgCHCABKAIUajYCFAJAIAAoAiwoAhwoAixFDQAgACgCLCgCFCAAKAIgTQ0AIAAoAjgoAjAgACgCLCgCCCAAKAIgaiAAKAIsKAIUIAAoAiBrEBohASAAKAI4IAE2AjALIAAoAixBADYCIAsgACgCLEHJADYCBAsgACgCLCgCBEHJAEYEQCAAKAIsKAIcKAIcBEAgACAAKAIsKAIUNgIUA0AgACgCLCgCFCAAKAIsKAIMRgRAAkAgACgCLCgCHCgCLEUNACAAKAIsKAIUIAAoAhRNDQAgACgCOCgCMCAAKAIsKAIIIAAoAhRqIAAoAiwoAhQgACgCFGsQGiEBIAAoAjggATYCMAsgACgCOBAcIAAoAiwoAhQEQCAAKAIsQX82AiggAEEANgI8DAULIABBADYCFAsgACgCLCgCHCgCHCECIAAoAiwiAygCICEBIAMgAUEBajYCICAAIAEgAmotAAA2AhAgACgCECECIAAoAiwoAgghAyAAKAIsIgQoAhQhASAEIAFBAWo2AhQgASADaiACOgAAIAAoAhANAAsCQCAAKAIsKAIcKAIsRQ0AIAAoAiwoAhQgACgCFE0NACAAKAI4KAIwIAAoAiwoAgggACgCFGogACgCLCgCFCAAKAIUaxAaIQEgACgCOCABNgIwCyAAKAIsQQA2AiALIAAoAixB2wA2AgQLIAAoAiwoAgRB2wBGBEAgACgCLCgCHCgCJARAIAAgACgCLCgCFDYCDANAIAAoAiwoAhQgACgCLCgCDEYEQAJAIAAoAiwoAhwoAixFDQAgACgCLCgCFCAAKAIMTQ0AIAAoAjgoAjAgACgCLCgCCCAAKAIMaiAAKAIsKAIUIAAoAgxrEBohASAAKAI4IAE2AjALIAAoAjgQHCAAKAIsKAIUBEAgACgCLEF/NgIoIABBADYCPAwFCyAAQQA2AgwLIAAoAiwoAhwoAiQhAiAAKAIsIgMoAiAhASADIAFBAWo2AiAgACABIAJqLQAANgIIIAAoAgghAiAAKAIsKAIIIQMgACgCLCIEKAIUIQEgBCABQQFqNgIUIAEgA2ogAjoAACAAKAIIDQALAkAgACgCLCgCHCgCLEUNACAAKAIsKAIUIAAoAgxNDQAgACgCOCgCMCAAKAIsKAIIIAAoAgxqIAAoAiwoAhQgACgCDGsQGiEBIAAoAjggATYCMAsLIAAoAixB5wA2AgQLIAAoAiwoAgRB5wBGBEAgACgCLCgCHCgCLARAIAAoAiwoAgwgACgCLCgCFEECakkEQCAAKAI4EBwgACgCLCgCFARAIAAoAixBfzYCKCAAQQA2AjwMBAsLIAAoAjgoAjBB/wFxIQIgACgCLCgCCCEDIAAoAiwiBCgCFCEBIAQgAUEBajYCFCABIANqIAI6AAAgACgCOCgCMEEIdkH/AXEhAiAAKAIsKAIIIQMgACgCLCIEKAIUIQEgBCABQQFqNgIUIAEgA2ogAjoAAEEAQQBBABAaIQEgACgCOCABNgIwCyAAKAIsQfEANgIEIAAoAjgQHCAAKAIsKAIUBEAgACgCLEF/NgIoIABBADYCPAwCCwsCQAJAIAAoAjgoAgQNACAAKAIsKAJ0DQAgACgCNEUNASAAKAIsKAIEQZoFRg0BCyAAAn8gACgCLCgChAFFBEAgACgCLCAAKAI0ELcBDAELAn8gACgCLCgCiAFBAkYEQCAAKAIsIQIgACgCNCEDIwBBIGsiASQAIAEgAjYCGCABIAM2AhQCQANAAkAgASgCGCgCdEUEQCABKAIYEFwgASgCGCgCdEUEQCABKAIURQRAIAFBADYCHAwFCwwCCwsgASgCGEEANgJgIAEgASgCGCICKAI4IAIoAmxqLQAAOgAPIAEoAhgiAigCpC0gAigCoC1BAXRqQQA7AQAgAS0ADyEDIAEoAhgiAigCmC0hBCACIAIoAqAtIgJBAWo2AqAtIAIgBGogAzoAACABKAIYIAEtAA9BAnRqIgIgAi8BlAFBAWo7AZQBIAEgASgCGCgCoC0gASgCGCgCnC1BAWtGNgIQIAEoAhgiAiACKAJ0QQFrNgJ0IAEoAhgiAiACKAJsQQFqNgJsIAEoAhAEQCABKAIYAn8gASgCGCgCXEEATgRAIAEoAhgoAjggASgCGCgCXGoMAQtBAAsgASgCGCgCbCABKAIYKAJca0EAECggASgCGCABKAIYKAJsNgJcIAEoAhgoAgAQHCABKAIYKAIAKAIQRQRAIAFBADYCHAwECwsMAQsLIAEoAhhBADYCtC0gASgCFEEERgRAIAEoAhgCfyABKAIYKAJcQQBOBEAgASgCGCgCOCABKAIYKAJcagwBC0EACyABKAIYKAJsIAEoAhgoAlxrQQEQKCABKAIYIAEoAhgoAmw2AlwgASgCGCgCABAcIAEoAhgoAgAoAhBFBEAgAUECNgIcDAILIAFBAzYCHAwBCyABKAIYKAKgLQRAIAEoAhgCfyABKAIYKAJcQQBOBEAgASgCGCgCOCABKAIYKAJcagwBC0EACyABKAIYKAJsIAEoAhgoAlxrQQAQKCABKAIYIAEoAhgoAmw2AlwgASgCGCgCABAcIAEoAhgoAgAoAhBFBEAgAUEANgIcDAILCyABQQE2AhwLIAEoAhwhAiABQSBqJAAgAgwBCwJ/IAAoAiwoAogBQQNGBEAgACgCLCECIAAoAjQhAyMAQTBrIgEkACABIAI2AiggASADNgIkAkADQAJAIAEoAigoAnRBggJNBEAgASgCKBBcAkAgASgCKCgCdEGCAksNACABKAIkDQAgAUEANgIsDAQLIAEoAigoAnRFDQELIAEoAihBADYCYAJAIAEoAigoAnRBA0kNACABKAIoKAJsRQ0AIAEgASgCKCgCOCABKAIoKAJsakEBazYCGCABIAEoAhgtAAA2AhwgASgCHCECIAEgASgCGCIDQQFqNgIYAkAgAy0AASACRw0AIAEoAhwhAiABIAEoAhgiA0EBajYCGCADLQABIAJHDQAgASgCHCECIAEgASgCGCIDQQFqNgIYIAMtAAEgAkcNACABIAEoAigoAjggASgCKCgCbGpBggJqNgIUA0AgASgCHCECIAEgASgCGCIDQQFqNgIYAn9BACADLQABIAJHDQAaIAEoAhwhAiABIAEoAhgiA0EBajYCGEEAIAMtAAEgAkcNABogASgCHCECIAEgASgCGCIDQQFqNgIYQQAgAy0AASACRw0AGiABKAIcIQIgASABKAIYIgNBAWo2AhhBACADLQABIAJHDQAaIAEoAhwhAiABIAEoAhgiA0EBajYCGEEAIAMtAAEgAkcNABogASgCHCECIAEgASgCGCIDQQFqNgIYQQAgAy0AASACRw0AGiABKAIcIQIgASABKAIYIgNBAWo2AhhBACADLQABIAJHDQAaIAEoAhwhAiABIAEoAhgiA0EBajYCGEEAIAMtAAEgAkcNABogASgCGCABKAIUSQtBAXENAAsgASgCKEGCAiABKAIUIAEoAhhrazYCYCABKAIoKAJgIAEoAigoAnRLBEAgASgCKCABKAIoKAJ0NgJgCwsLAkAgASgCKCgCYEEDTwRAIAEgASgCKCgCYEEDazoAEyABQQE7ARAgASgCKCICKAKkLSACKAKgLUEBdGogAS8BEDsBACABLQATIQMgASgCKCICKAKYLSEEIAIgAigCoC0iAkEBajYCoC0gAiAEaiADOgAAIAEgAS8BEEEBazsBECABKAIoIAEtABNB0N0Aai0AAEECdGpBmAlqIgIgAi8BAEEBajsBACABKAIoQYgTagJ/IAEvARBBgAJJBEAgAS8BEC0A0FkMAQsgAS8BEEEHdkGAAmotANBZC0ECdGoiAiACLwEAQQFqOwEAIAEgASgCKCgCoC0gASgCKCgCnC1BAWtGNgIgIAEoAigiAiACKAJ0IAEoAigoAmBrNgJ0IAEoAigiAiABKAIoKAJgIAIoAmxqNgJsIAEoAihBADYCYAwBCyABIAEoAigiAigCOCACKAJsai0AADoADyABKAIoIgIoAqQtIAIoAqAtQQF0akEAOwEAIAEtAA8hAyABKAIoIgIoApgtIQQgAiACKAKgLSICQQFqNgKgLSACIARqIAM6AAAgASgCKCABLQAPQQJ0aiICIAIvAZQBQQFqOwGUASABIAEoAigoAqAtIAEoAigoApwtQQFrRjYCICABKAIoIgIgAigCdEEBazYCdCABKAIoIgIgAigCbEEBajYCbAsgASgCIARAIAEoAigCfyABKAIoKAJcQQBOBEAgASgCKCgCOCABKAIoKAJcagwBC0EACyABKAIoKAJsIAEoAigoAlxrQQAQKCABKAIoIAEoAigoAmw2AlwgASgCKCgCABAcIAEoAigoAgAoAhBFBEAgAUEANgIsDAQLCwwBCwsgASgCKEEANgK0LSABKAIkQQRGBEAgASgCKAJ/IAEoAigoAlxBAE4EQCABKAIoKAI4IAEoAigoAlxqDAELQQALIAEoAigoAmwgASgCKCgCXGtBARAoIAEoAiggASgCKCgCbDYCXCABKAIoKAIAEBwgASgCKCgCACgCEEUEQCABQQI2AiwMAgsgAUEDNgIsDAELIAEoAigoAqAtBEAgASgCKAJ/IAEoAigoAlxBAE4EQCABKAIoKAI4IAEoAigoAlxqDAELQQALIAEoAigoAmwgASgCKCgCXGtBABAoIAEoAiggASgCKCgCbDYCXCABKAIoKAIAEBwgASgCKCgCACgCEEUEQCABQQA2AiwMAgsLIAFBATYCLAsgASgCLCECIAFBMGokACACDAELIAAoAiwgACgCNCAAKAIsKAKEAUEMbEGA7wBqKAIIEQMACwsLNgIEAkAgACgCBEECRwRAIAAoAgRBA0cNAQsgACgCLEGaBTYCBAsCQCAAKAIEBEAgACgCBEECRw0BCyAAKAI4KAIQRQRAIAAoAixBfzYCKAsgAEEANgI8DAILIAAoAgRBAUYEQAJAIAAoAjRBAUYEQCAAKAIsIQIjAEEgayIBJAAgASACNgIcIAFBAzYCGAJAIAEoAhwoArwtQRAgASgCGGtKBEAgAUECNgIUIAEoAhwiAiACLwG4LSABKAIUQf//A3EgASgCHCgCvC10cjsBuC0gASgCHC8BuC1B/wFxIQMgASgCHCgCCCEEIAEoAhwiBigCFCECIAYgAkEBajYCFCACIARqIAM6AAAgASgCHC8BuC1BCHYhAyABKAIcKAIIIQQgASgCHCIGKAIUIQIgBiACQQFqNgIUIAIgBGogAzoAACABKAIcIAEoAhRB//8DcUEQIAEoAhwoArwta3U7AbgtIAEoAhwiAiACKAK8LSABKAIYQRBrajYCvC0MAQsgASgCHCICIAIvAbgtQQIgASgCHCgCvC10cjsBuC0gASgCHCICIAEoAhggAigCvC1qNgK8LQsgAUGS6AAvAQA2AhACQCABKAIcKAK8LUEQIAEoAhBrSgRAIAFBkOgALwEANgIMIAEoAhwiAiACLwG4LSABKAIMQf//A3EgASgCHCgCvC10cjsBuC0gASgCHC8BuC1B/wFxIQMgASgCHCgCCCEEIAEoAhwiBigCFCECIAYgAkEBajYCFCACIARqIAM6AAAgASgCHC8BuC1BCHYhAyABKAIcKAIIIQQgASgCHCIGKAIUIQIgBiACQQFqNgIUIAIgBGogAzoAACABKAIcIAEoAgxB//8DcUEQIAEoAhwoArwta3U7AbgtIAEoAhwiAiACKAK8LSABKAIQQRBrajYCvC0MAQsgASgCHCICIAIvAbgtQZDoAC8BACABKAIcKAK8LXRyOwG4LSABKAIcIgIgASgCECACKAK8LWo2ArwtCyABKAIcELwBIAFBIGokAAwBCyAAKAI0QQVHBEAgACgCLEEAQQBBABBdIAAoAjRBA0YEQCAAKAIsKAJEIAAoAiwoAkxBAWtBAXRqQQA7AQAgACgCLCgCREEAIAAoAiwoAkxBAWtBAXQQMyAAKAIsKAJ0RQRAIAAoAixBADYCbCAAKAIsQQA2AlwgACgCLEEANgK0LQsLCwsgACgCOBAcIAAoAjgoAhBFBEAgACgCLEF/NgIoIABBADYCPAwDCwsLIAAoAjRBBEcEQCAAQQA2AjwMAQsgACgCLCgCGEEATARAIABBATYCPAwBCwJAIAAoAiwoAhhBAkYEQCAAKAI4KAIwQf8BcSECIAAoAiwoAgghAyAAKAIsIgQoAhQhASAEIAFBAWo2AhQgASADaiACOgAAIAAoAjgoAjBBCHZB/wFxIQIgACgCLCgCCCEDIAAoAiwiBCgCFCEBIAQgAUEBajYCFCABIANqIAI6AAAgACgCOCgCMEEQdkH/AXEhAiAAKAIsKAIIIQMgACgCLCIEKAIUIQEgBCABQQFqNgIUIAEgA2ogAjoAACAAKAI4KAIwQRh2IQIgACgCLCgCCCEDIAAoAiwiBCgCFCEBIAQgAUEBajYCFCABIANqIAI6AAAgACgCOCgCCEH/AXEhAiAAKAIsKAIIIQMgACgCLCIEKAIUIQEgBCABQQFqNgIUIAEgA2ogAjoAACAAKAI4KAIIQQh2Qf8BcSECIAAoAiwoAgghAyAAKAIsIgQoAhQhASAEIAFBAWo2AhQgASADaiACOgAAIAAoAjgoAghBEHZB/wFxIQIgACgCLCgCCCEDIAAoAiwiBCgCFCEBIAQgAUEBajYCFCABIANqIAI6AAAgACgCOCgCCEEYdiECIAAoAiwoAgghAyAAKAIsIgQoAhQhASAEIAFBAWo2AhQgASADaiACOgAADAELIAAoAiwgACgCOCgCMEEQdhBLIAAoAiwgACgCOCgCMEH//wNxEEsLIAAoAjgQHCAAKAIsKAIYQQBKBEAgACgCLEEAIAAoAiwoAhhrNgIYCyAAIAAoAiwoAhRFNgI8CyAAKAI8IQEgAEFAayQAIAUgATYCCAwBCyAFKAIMQRBqIQEjAEHgAGsiACQAIAAgATYCWCAAQQI2AlQCQAJAAkAgACgCWBBKDQAgACgCWCgCDEUNACAAKAJYKAIADQEgACgCWCgCBEUNAQsgAEF+NgJcDAELIAAgACgCWCgCHDYCUCAAKAJQKAIEQb/+AEYEQCAAKAJQQcD+ADYCBAsgACAAKAJYKAIMNgJIIAAgACgCWCgCEDYCQCAAIAAoAlgoAgA2AkwgACAAKAJYKAIENgJEIAAgACgCUCgCPDYCPCAAIAAoAlAoAkA2AjggACAAKAJENgI0IAAgACgCQDYCMCAAQQA2AhADQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQCAAKAJQKAIEQbT+AGsOHwABAgMEBQYHCAkKCwwNDg8QERITFBUWFxgZGhscHR4fCyAAKAJQKAIMRQRAIAAoAlBBwP4ANgIEDCELA0AgACgCOEEQSQRAIAAoAkRFDSEgACAAKAJEQQFrNgJEIAAgACgCTCIBQQFqNgJMIAAgACgCPCABLQAAIAAoAjh0ajYCPCAAIAAoAjhBCGo2AjgMAQsLAkAgACgCUCgCDEECcUUNACAAKAI8QZ+WAkcNACAAKAJQKAIoRQRAIAAoAlBBDzYCKAtBAEEAQQAQGiEBIAAoAlAgATYCHCAAIAAoAjw6AAwgACAAKAI8QQh2OgANIAAoAlAoAhwgAEEMakECEBohASAAKAJQIAE2AhwgAEEANgI8IABBADYCOCAAKAJQQbX+ADYCBAwhCyAAKAJQQQA2AhQgACgCUCgCJARAIAAoAlAoAiRBfzYCMAsCQCAAKAJQKAIMQQFxBEAgACgCPEH/AXFBCHQgACgCPEEIdmpBH3BFDQELIAAoAlhBmgw2AhggACgCUEHR/gA2AgQMIQsgACgCPEEPcUEIRwRAIAAoAlhBmw82AhggACgCUEHR/gA2AgQMIQsgACAAKAI8QQR2NgI8IAAgACgCOEEEazYCOCAAIAAoAjxBD3FBCGo2AhQgACgCUCgCKEUEQCAAKAJQIAAoAhQ2AigLAkAgACgCFEEPTQRAIAAoAhQgACgCUCgCKE0NAQsgACgCWEGTDTYCGCAAKAJQQdH+ADYCBAwhCyAAKAJQQQEgACgCFHQ2AhhBAEEAQQAQPSEBIAAoAlAgATYCHCAAKAJYIAE2AjAgACgCUEG9/gBBv/4AIAAoAjxBgARxGzYCBCAAQQA2AjwgAEEANgI4DCALA0AgACgCOEEQSQRAIAAoAkRFDSAgACAAKAJEQQFrNgJEIAAgACgCTCIBQQFqNgJMIAAgACgCPCABLQAAIAAoAjh0ajYCPCAAIAAoAjhBCGo2AjgMAQsLIAAoAlAgACgCPDYCFCAAKAJQKAIUQf8BcUEIRwRAIAAoAlhBmw82AhggACgCUEHR/gA2AgQMIAsgACgCUCgCFEGAwANxBEAgACgCWEGgCTYCGCAAKAJQQdH+ADYCBAwgCyAAKAJQKAIkBEAgACgCUCgCJCAAKAI8QQh2QQFxNgIACwJAIAAoAlAoAhRBgARxRQ0AIAAoAlAoAgxBBHFFDQAgACAAKAI8OgAMIAAgACgCPEEIdjoADSAAKAJQKAIcIABBDGpBAhAaIQEgACgCUCABNgIcCyAAQQA2AjwgAEEANgI4IAAoAlBBtv4ANgIECwNAIAAoAjhBIEkEQCAAKAJERQ0fIAAgACgCREEBazYCRCAAIAAoAkwiAUEBajYCTCAAIAAoAjwgAS0AACAAKAI4dGo2AjwgACAAKAI4QQhqNgI4DAELCyAAKAJQKAIkBEAgACgCUCgCJCAAKAI8NgIECwJAIAAoAlAoAhRBgARxRQ0AIAAoAlAoAgxBBHFFDQAgACAAKAI8OgAMIAAgACgCPEEIdjoADSAAIAAoAjxBEHY6AA4gACAAKAI8QRh2OgAPIAAoAlAoAhwgAEEMakEEEBohASAAKAJQIAE2AhwLIABBADYCPCAAQQA2AjggACgCUEG3/gA2AgQLA0AgACgCOEEQSQRAIAAoAkRFDR4gACAAKAJEQQFrNgJEIAAgACgCTCIBQQFqNgJMIAAgACgCPCABLQAAIAAoAjh0ajYCPCAAIAAoAjhBCGo2AjgMAQsLIAAoAlAoAiQEQCAAKAJQKAIkIAAoAjxB/wFxNgIIIAAoAlAoAiQgACgCPEEIdjYCDAsCQCAAKAJQKAIUQYAEcUUNACAAKAJQKAIMQQRxRQ0AIAAgACgCPDoADCAAIAAoAjxBCHY6AA0gACgCUCgCHCAAQQxqQQIQGiEBIAAoAlAgATYCHAsgAEEANgI8IABBADYCOCAAKAJQQbj+ADYCBAsCQCAAKAJQKAIUQYAIcQRAA0AgACgCOEEQSQRAIAAoAkRFDR8gACAAKAJEQQFrNgJEIAAgACgCTCIBQQFqNgJMIAAgACgCPCABLQAAIAAoAjh0ajYCPCAAIAAoAjhBCGo2AjgMAQsLIAAoAlAgACgCPDYCRCAAKAJQKAIkBEAgACgCUCgCJCAAKAI8NgIUCwJAIAAoAlAoAhRBgARxRQ0AIAAoAlAoAgxBBHFFDQAgACAAKAI8OgAMIAAgACgCPEEIdjoADSAAKAJQKAIcIABBDGpBAhAaIQEgACgCUCABNgIcCyAAQQA2AjwgAEEANgI4DAELIAAoAlAoAiQEQCAAKAJQKAIkQQA2AhALCyAAKAJQQbn+ADYCBAsgACgCUCgCFEGACHEEQCAAIAAoAlAoAkQ2AiwgACgCLCAAKAJESwRAIAAgACgCRDYCLAsgACgCLARAAkAgACgCUCgCJEUNACAAKAJQKAIkKAIQRQ0AIAAgACgCUCgCJCgCFCAAKAJQKAJEazYCFCAAKAJQKAIkKAIQIAAoAhRqIAAoAkwCfyAAKAJQKAIkKAIYIAAoAhQgACgCLGpJBEAgACgCUCgCJCgCGCAAKAIUawwBCyAAKAIsCxAZGgsCQCAAKAJQKAIUQYAEcUUNACAAKAJQKAIMQQRxRQ0AIAAoAlAoAhwgACgCTCAAKAIsEBohASAAKAJQIAE2AhwLIAAgACgCRCAAKAIsazYCRCAAIAAoAiwgACgCTGo2AkwgACgCUCIBIAEoAkQgACgCLGs2AkQLIAAoAlAoAkQNGwsgACgCUEEANgJEIAAoAlBBuv4ANgIECwJAIAAoAlAoAhRBgBBxBEAgACgCREUNGyAAQQA2AiwDQCAAKAJMIQEgACAAKAIsIgJBAWo2AiwgACABIAJqLQAANgIUAkAgACgCUCgCJEUNACAAKAJQKAIkKAIcRQ0AIAAoAlAoAkQgACgCUCgCJCgCIE8NACAAKAIUIQIgACgCUCgCJCgCHCEDIAAoAlAiBCgCRCEBIAQgAUEBajYCRCABIANqIAI6AAALIAAoAhQEfyAAKAIsIAAoAkRJBUEAC0EBcQ0ACwJAIAAoAlAoAhRBgARxRQ0AIAAoAlAoAgxBBHFFDQAgACgCUCgCHCAAKAJMIAAoAiwQGiEBIAAoAlAgATYCHAsgACAAKAJEIAAoAixrNgJEIAAgACgCLCAAKAJMajYCTCAAKAIUDRsMAQsgACgCUCgCJARAIAAoAlAoAiRBADYCHAsLIAAoAlBBADYCRCAAKAJQQbv+ADYCBAsCQCAAKAJQKAIUQYAgcQRAIAAoAkRFDRogAEEANgIsA0AgACgCTCEBIAAgACgCLCICQQFqNgIsIAAgASACai0AADYCFAJAIAAoAlAoAiRFDQAgACgCUCgCJCgCJEUNACAAKAJQKAJEIAAoAlAoAiQoAihPDQAgACgCFCECIAAoAlAoAiQoAiQhAyAAKAJQIgQoAkQhASAEIAFBAWo2AkQgASADaiACOgAACyAAKAIUBH8gACgCLCAAKAJESQVBAAtBAXENAAsCQCAAKAJQKAIUQYAEcUUNACAAKAJQKAIMQQRxRQ0AIAAoAlAoAhwgACgCTCAAKAIsEBohASAAKAJQIAE2AhwLIAAgACgCRCAAKAIsazYCRCAAIAAoAiwgACgCTGo2AkwgACgCFA0aDAELIAAoAlAoAiQEQCAAKAJQKAIkQQA2AiQLCyAAKAJQQbz+ADYCBAsgACgCUCgCFEGABHEEQANAIAAoAjhBEEkEQCAAKAJERQ0aIAAgACgCREEBazYCRCAAIAAoAkwiAUEBajYCTCAAIAAoAjwgAS0AACAAKAI4dGo2AjwgACAAKAI4QQhqNgI4DAELCwJAIAAoAlAoAgxBBHFFDQAgACgCPCAAKAJQKAIcQf//A3FGDQAgACgCWEH7DDYCGCAAKAJQQdH+ADYCBAwaCyAAQQA2AjwgAEEANgI4CyAAKAJQKAIkBEAgACgCUCgCJCAAKAJQKAIUQQl1QQFxNgIsIAAoAlAoAiRBATYCMAtBAEEAQQAQGiEBIAAoAlAgATYCHCAAKAJYIAE2AjAgACgCUEG//gA2AgQMGAsDQCAAKAI4QSBJBEAgACgCREUNGCAAIAAoAkRBAWs2AkQgACAAKAJMIgFBAWo2AkwgACAAKAI8IAEtAAAgACgCOHRqNgI8IAAgACgCOEEIajYCOAwBCwsgACgCUCAAKAI8QQh2QYD+A3EgACgCPEEYdmogACgCPEGA/gNxQQh0aiAAKAI8Qf8BcUEYdGoiATYCHCAAKAJYIAE2AjAgAEEANgI8IABBADYCOCAAKAJQQb7+ADYCBAsgACgCUCgCEEUEQCAAKAJYIAAoAkg2AgwgACgCWCAAKAJANgIQIAAoAlggACgCTDYCACAAKAJYIAAoAkQ2AgQgACgCUCAAKAI8NgI8IAAoAlAgACgCODYCQCAAQQI2AlwMGAtBAEEAQQAQPSEBIAAoAlAgATYCHCAAKAJYIAE2AjAgACgCUEG//gA2AgQLIAAoAlRBBUYNFCAAKAJUQQZGDRQLIAAoAlAoAggEQCAAIAAoAjwgACgCOEEHcXY2AjwgACAAKAI4IAAoAjhBB3FrNgI4IAAoAlBBzv4ANgIEDBULA0AgACgCOEEDSQRAIAAoAkRFDRUgACAAKAJEQQFrNgJEIAAgACgCTCIBQQFqNgJMIAAgACgCPCABLQAAIAAoAjh0ajYCPCAAIAAoAjhBCGo2AjgMAQsLIAAoAlAgACgCPEEBcTYCCCAAIAAoAjxBAXY2AjwgACAAKAI4QQFrNgI4AkACQAJAAkACQCAAKAI8QQNxDgQAAQIDBAsgACgCUEHB/gA2AgQMAwsjAEEQayIBIAAoAlA2AgwgASgCDEGw8gA2AlAgASgCDEEJNgJYIAEoAgxBsIIBNgJUIAEoAgxBBTYCXCAAKAJQQcf+ADYCBCAAKAJUQQZGBEAgACAAKAI8QQJ2NgI8IAAgACgCOEECazYCOAwXCwwCCyAAKAJQQcT+ADYCBAwBCyAAKAJYQfANNgIYIAAoAlBB0f4ANgIECyAAIAAoAjxBAnY2AjwgACAAKAI4QQJrNgI4DBQLIAAgACgCPCAAKAI4QQdxdjYCPCAAIAAoAjggACgCOEEHcWs2AjgDQCAAKAI4QSBJBEAgACgCREUNFCAAIAAoAkRBAWs2AkQgACAAKAJMIgFBAWo2AkwgACAAKAI8IAEtAAAgACgCOHRqNgI8IAAgACgCOEEIajYCOAwBCwsgACgCPEH//wNxIAAoAjxBEHZB//8Dc0cEQCAAKAJYQaEKNgIYIAAoAlBB0f4ANgIEDBQLIAAoAlAgACgCPEH//wNxNgJEIABBADYCPCAAQQA2AjggACgCUEHC/gA2AgQgACgCVEEGRg0SCyAAKAJQQcP+ADYCBAsgACAAKAJQKAJENgIsIAAoAiwEQCAAKAIsIAAoAkRLBEAgACAAKAJENgIsCyAAKAIsIAAoAkBLBEAgACAAKAJANgIsCyAAKAIsRQ0RIAAoAkggACgCTCAAKAIsEBkaIAAgACgCRCAAKAIsazYCRCAAIAAoAiwgACgCTGo2AkwgACAAKAJAIAAoAixrNgJAIAAgACgCLCAAKAJIajYCSCAAKAJQIgEgASgCRCAAKAIsazYCRAwSCyAAKAJQQb/+ADYCBAwRCwNAIAAoAjhBDkkEQCAAKAJERQ0RIAAgACgCREEBazYCRCAAIAAoAkwiAUEBajYCTCAAIAAoAjwgAS0AACAAKAI4dGo2AjwgACAAKAI4QQhqNgI4DAELCyAAKAJQIAAoAjxBH3FBgQJqNgJkIAAgACgCPEEFdjYCPCAAIAAoAjhBBWs2AjggACgCUCAAKAI8QR9xQQFqNgJoIAAgACgCPEEFdjYCPCAAIAAoAjhBBWs2AjggACgCUCAAKAI8QQ9xQQRqNgJgIAAgACgCPEEEdjYCPCAAIAAoAjhBBGs2AjgCQCAAKAJQKAJkQZ4CTQRAIAAoAlAoAmhBHk0NAQsgACgCWEH9CTYCGCAAKAJQQdH+ADYCBAwRCyAAKAJQQQA2AmwgACgCUEHF/gA2AgQLA0AgACgCUCgCbCAAKAJQKAJgSQRAA0AgACgCOEEDSQRAIAAoAkRFDRIgACAAKAJEQQFrNgJEIAAgACgCTCIBQQFqNgJMIAAgACgCPCABLQAAIAAoAjh0ajYCPCAAIAAoAjhBCGo2AjgMAQsLIAAoAjxBB3EhAiAAKAJQQfQAaiEDIAAoAlAiBCgCbCEBIAQgAUEBajYCbCABQQF0QYDyAGovAQBBAXQgA2ogAjsBACAAIAAoAjxBA3Y2AjwgACAAKAI4QQNrNgI4DAELCwNAIAAoAlAoAmxBE0kEQCAAKAJQQfQAaiECIAAoAlAiAygCbCEBIAMgAUEBajYCbCABQQF0QYDyAGovAQBBAXQgAmpBADsBAAwBCwsgACgCUCAAKAJQQbQKajYCcCAAKAJQIAAoAlAoAnA2AlAgACgCUEEHNgJYIABBACAAKAJQQfQAakETIAAoAlBB8ABqIAAoAlBB2ABqIAAoAlBB9AVqEHU2AhAgACgCEARAIAAoAlhBhwk2AhggACgCUEHR/gA2AgQMEAsgACgCUEEANgJsIAAoAlBBxv4ANgIECwNAAkAgACgCUCgCbCAAKAJQKAJkIAAoAlAoAmhqTw0AA0ACQCAAIAAoAlAoAlAgACgCPEEBIAAoAlAoAlh0QQFrcUECdGooAQA2ASAgAC0AISAAKAI4TQ0AIAAoAkRFDREgACAAKAJEQQFrNgJEIAAgACgCTCIBQQFqNgJMIAAgACgCPCABLQAAIAAoAjh0ajYCPCAAIAAoAjhBCGo2AjgMAQsLAkAgAC8BIkEQSQRAIAAgACgCPCAALQAhdjYCPCAAIAAoAjggAC0AIWs2AjggAC8BIiECIAAoAlBB9ABqIQMgACgCUCIEKAJsIQEgBCABQQFqNgJsIAFBAXQgA2ogAjsBAAwBCwJAIAAvASJBEEYEQANAIAAoAjggAC0AIUECakkEQCAAKAJERQ0UIAAgACgCREEBazYCRCAAIAAoAkwiAUEBajYCTCAAIAAoAjwgAS0AACAAKAI4dGo2AjwgACAAKAI4QQhqNgI4DAELCyAAIAAoAjwgAC0AIXY2AjwgACAAKAI4IAAtACFrNgI4IAAoAlAoAmxFBEAgACgCWEHPCTYCGCAAKAJQQdH+ADYCBAwECyAAIAAoAlAgACgCUCgCbEEBdGovAXI2AhQgACAAKAI8QQNxQQNqNgIsIAAgACgCPEECdjYCPCAAIAAoAjhBAms2AjgMAQsCQCAALwEiQRFGBEADQCAAKAI4IAAtACFBA2pJBEAgACgCREUNFSAAIAAoAkRBAWs2AkQgACAAKAJMIgFBAWo2AkwgACAAKAI8IAEtAAAgACgCOHRqNgI8IAAgACgCOEEIajYCOAwBCwsgACAAKAI8IAAtACF2NgI8IAAgACgCOCAALQAhazYCOCAAQQA2AhQgACAAKAI8QQdxQQNqNgIsIAAgACgCPEEDdjYCPCAAIAAoAjhBA2s2AjgMAQsDQCAAKAI4IAAtACFBB2pJBEAgACgCREUNFCAAIAAoAkRBAWs2AkQgACAAKAJMIgFBAWo2AkwgACAAKAI8IAEtAAAgACgCOHRqNgI8IAAgACgCOEEIajYCOAwBCwsgACAAKAI8IAAtACF2NgI8IAAgACgCOCAALQAhazYCOCAAQQA2AhQgACAAKAI8Qf8AcUELajYCLCAAIAAoAjxBB3Y2AjwgACAAKAI4QQdrNgI4CwsgACgCUCgCbCAAKAIsaiAAKAJQKAJkIAAoAlAoAmhqSwRAIAAoAlhBzwk2AhggACgCUEHR/gA2AgQMAgsDQCAAIAAoAiwiAUEBazYCLCABBEAgACgCFCECIAAoAlBB9ABqIQMgACgCUCIEKAJsIQEgBCABQQFqNgJsIAFBAXQgA2ogAjsBAAwBCwsLDAELCyAAKAJQKAIEQdH+AEYNDiAAKAJQLwH0BEUEQCAAKAJYQfULNgIYIAAoAlBB0f4ANgIEDA8LIAAoAlAgACgCUEG0Cmo2AnAgACgCUCAAKAJQKAJwNgJQIAAoAlBBCTYCWCAAQQEgACgCUEH0AGogACgCUCgCZCAAKAJQQfAAaiAAKAJQQdgAaiAAKAJQQfQFahB1NgIQIAAoAhAEQCAAKAJYQesINgIYIAAoAlBB0f4ANgIEDA8LIAAoAlAgACgCUCgCcDYCVCAAKAJQQQY2AlwgAEECIAAoAlBB9ABqIAAoAlAoAmRBAXRqIAAoAlAoAmggACgCUEHwAGogACgCUEHcAGogACgCUEH0BWoQdTYCECAAKAIQBEAgACgCWEG5CTYCGCAAKAJQQdH+ADYCBAwPCyAAKAJQQcf+ADYCBCAAKAJUQQZGDQ0LIAAoAlBByP4ANgIECwJAIAAoAkRBBkkNACAAKAJAQYICSQ0AIAAoAlggACgCSDYCDCAAKAJYIAAoAkA2AhAgACgCWCAAKAJMNgIAIAAoAlggACgCRDYCBCAAKAJQIAAoAjw2AjwgACgCUCAAKAI4NgJAIAAoAjAhAiMAQeAAayIBIAAoAlg2AlwgASACNgJYIAEgASgCXCgCHDYCVCABIAEoAlwoAgA2AlAgASABKAJQIAEoAlwoAgRBBWtqNgJMIAEgASgCXCgCDDYCSCABIAEoAkggASgCWCABKAJcKAIQa2s2AkQgASABKAJIIAEoAlwoAhBBgQJrajYCQCABIAEoAlQoAiw2AjwgASABKAJUKAIwNgI4IAEgASgCVCgCNDYCNCABIAEoAlQoAjg2AjAgASABKAJUKAI8NgIsIAEgASgCVCgCQDYCKCABIAEoAlQoAlA2AiQgASABKAJUKAJUNgIgIAFBASABKAJUKAJYdEEBazYCHCABQQEgASgCVCgCXHRBAWs2AhgDQCABKAIoQQ9JBEAgASABKAJQIgJBAWo2AlAgASABKAIsIAItAAAgASgCKHRqNgIsIAEgASgCKEEIajYCKCABIAEoAlAiAkEBajYCUCABIAEoAiwgAi0AACABKAIodGo2AiwgASABKAIoQQhqNgIoCyABIAEoAiQgASgCLCABKAIccUECdGooAQA2ARACQAJAA0AgASABLQARNgIMIAEgASgCLCABKAIMdjYCLCABIAEoAiggASgCDGs2AiggASABLQAQNgIMIAEoAgxFBEAgAS8BEiECIAEgASgCSCIDQQFqNgJIIAMgAjoAAAwCCyABKAIMQRBxBEAgASABLwESNgIIIAEgASgCDEEPcTYCDCABKAIMBEAgASgCKCABKAIMSQRAIAEgASgCUCICQQFqNgJQIAEgASgCLCACLQAAIAEoAih0ajYCLCABIAEoAihBCGo2AigLIAEgASgCCCABKAIsQQEgASgCDHRBAWtxajYCCCABIAEoAiwgASgCDHY2AiwgASABKAIoIAEoAgxrNgIoCyABKAIoQQ9JBEAgASABKAJQIgJBAWo2AlAgASABKAIsIAItAAAgASgCKHRqNgIsIAEgASgCKEEIajYCKCABIAEoAlAiAkEBajYCUCABIAEoAiwgAi0AACABKAIodGo2AiwgASABKAIoQQhqNgIoCyABIAEoAiAgASgCLCABKAIYcUECdGooAQA2ARACQANAIAEgAS0AETYCDCABIAEoAiwgASgCDHY2AiwgASABKAIoIAEoAgxrNgIoIAEgAS0AEDYCDCABKAIMQRBxBEAgASABLwESNgIEIAEgASgCDEEPcTYCDCABKAIoIAEoAgxJBEAgASABKAJQIgJBAWo2AlAgASABKAIsIAItAAAgASgCKHRqNgIsIAEgASgCKEEIajYCKCABKAIoIAEoAgxJBEAgASABKAJQIgJBAWo2AlAgASABKAIsIAItAAAgASgCKHRqNgIsIAEgASgCKEEIajYCKAsLIAEgASgCBCABKAIsQQEgASgCDHRBAWtxajYCBCABIAEoAiwgASgCDHY2AiwgASABKAIoIAEoAgxrNgIoIAEgASgCSCABKAJEazYCDAJAIAEoAgQgASgCDEsEQCABIAEoAgQgASgCDGs2AgwgASgCDCABKAI4SwRAIAEoAlQoAsQ3BEAgASgCXEHdDDYCGCABKAJUQdH+ADYCBAwKCwsgASABKAIwNgIAAkAgASgCNEUEQCABIAEoAgAgASgCPCABKAIMa2o2AgAgASgCDCABKAIISQRAIAEgASgCCCABKAIMazYCCANAIAEgASgCACICQQFqNgIAIAItAAAhAiABIAEoAkgiA0EBajYCSCADIAI6AAAgASABKAIMQQFrIgI2AgwgAg0ACyABIAEoAkggASgCBGs2AgALDAELAkAgASgCNCABKAIMSQRAIAEgASgCACABKAI8IAEoAjRqIAEoAgxrajYCACABIAEoAgwgASgCNGs2AgwgASgCDCABKAIISQRAIAEgASgCCCABKAIMazYCCANAIAEgASgCACICQQFqNgIAIAItAAAhAiABIAEoAkgiA0EBajYCSCADIAI6AAAgASABKAIMQQFrIgI2AgwgAg0ACyABIAEoAjA2AgAgASgCNCABKAIISQRAIAEgASgCNDYCDCABIAEoAgggASgCDGs2AggDQCABIAEoAgAiAkEBajYCACACLQAAIQIgASABKAJIIgNBAWo2AkggAyACOgAAIAEgASgCDEEBayICNgIMIAINAAsgASABKAJIIAEoAgRrNgIACwsMAQsgASABKAIAIAEoAjQgASgCDGtqNgIAIAEoAgwgASgCCEkEQCABIAEoAgggASgCDGs2AggDQCABIAEoAgAiAkEBajYCACACLQAAIQIgASABKAJIIgNBAWo2AkggAyACOgAAIAEgASgCDEEBayICNgIMIAINAAsgASABKAJIIAEoAgRrNgIACwsLA0AgASgCCEECSwRAIAEgASgCACICQQFqNgIAIAItAAAhAiABIAEoAkgiA0EBajYCSCADIAI6AAAgASABKAIAIgJBAWo2AgAgAi0AACECIAEgASgCSCIDQQFqNgJIIAMgAjoAACABIAEoAgAiAkEBajYCACACLQAAIQIgASABKAJIIgNBAWo2AkggAyACOgAAIAEgASgCCEEDazYCCAwBCwsMAQsgASABKAJIIAEoAgRrNgIAA0AgASABKAIAIgJBAWo2AgAgAi0AACECIAEgASgCSCIDQQFqNgJIIAMgAjoAACABIAEoAgAiAkEBajYCACACLQAAIQIgASABKAJIIgNBAWo2AkggAyACOgAAIAEgASgCACICQQFqNgIAIAItAAAhAiABIAEoAkgiA0EBajYCSCADIAI6AAAgASABKAIIQQNrNgIIIAEoAghBAksNAAsLIAEoAggEQCABIAEoAgAiAkEBajYCACACLQAAIQIgASABKAJIIgNBAWo2AkggAyACOgAAIAEoAghBAUsEQCABIAEoAgAiAkEBajYCACACLQAAIQIgASABKAJIIgNBAWo2AkggAyACOgAACwsMAgsgASgCDEHAAHFFBEAgASABKAIgIAEvARIgASgCLEEBIAEoAgx0QQFrcWpBAnRqKAEANgEQDAELCyABKAJcQYUPNgIYIAEoAlRB0f4ANgIEDAQLDAILIAEoAgxBwABxRQRAIAEgASgCJCABLwESIAEoAixBASABKAIMdEEBa3FqQQJ0aigBADYBEAwBCwsgASgCDEEgcQRAIAEoAlRBv/4ANgIEDAILIAEoAlxB6Q42AhggASgCVEHR/gA2AgQMAQsgASgCUCABKAJMSQR/IAEoAkggASgCQEkFQQALQQFxDQELCyABIAEoAihBA3Y2AgggASABKAJQIAEoAghrNgJQIAEgASgCKCABKAIIQQN0azYCKCABIAEoAixBASABKAIodEEBa3E2AiwgASgCXCABKAJQNgIAIAEoAlwgASgCSDYCDCABKAJcAn8gASgCUCABKAJMSQRAIAEoAkwgASgCUGtBBWoMAQtBBSABKAJQIAEoAkxraws2AgQgASgCXAJ/IAEoAkggASgCQEkEQCABKAJAIAEoAkhrQYECagwBC0GBAiABKAJIIAEoAkBraws2AhAgASgCVCABKAIsNgI8IAEoAlQgASgCKDYCQCAAIAAoAlgoAgw2AkggACAAKAJYKAIQNgJAIAAgACgCWCgCADYCTCAAIAAoAlgoAgQ2AkQgACAAKAJQKAI8NgI8IAAgACgCUCgCQDYCOCAAKAJQKAIEQb/+AEYEQCAAKAJQQX82Asg3CwwNCyAAKAJQQQA2Asg3A0ACQCAAIAAoAlAoAlAgACgCPEEBIAAoAlAoAlh0QQFrcUECdGooAQA2ASAgAC0AISAAKAI4TQ0AIAAoAkRFDQ0gACAAKAJEQQFrNgJEIAAgACgCTCIBQQFqNgJMIAAgACgCPCABLQAAIAAoAjh0ajYCPCAAIAAoAjhBCGo2AjgMAQsLAkAgAC0AIEUNACAALQAgQfABcQ0AIAAgACgBIDYBGANAAkAgACAAKAJQKAJQIAAvARogACgCPEEBIAAtABkgAC0AGGp0QQFrcSAALQAZdmpBAnRqKAEANgEgIAAoAjggAC0AGSAALQAhak8NACAAKAJERQ0OIAAgACgCREEBazYCRCAAIAAoAkwiAUEBajYCTCAAIAAoAjwgAS0AACAAKAI4dGo2AjwgACAAKAI4QQhqNgI4DAELCyAAIAAoAjwgAC0AGXY2AjwgACAAKAI4IAAtABlrNgI4IAAoAlAiASAALQAZIAEoAsg3ajYCyDcLIAAgACgCPCAALQAhdjYCPCAAIAAoAjggAC0AIWs2AjggACgCUCIBIAAtACEgASgCyDdqNgLINyAAKAJQIAAvASI2AkQgAC0AIEUEQCAAKAJQQc3+ADYCBAwNCyAALQAgQSBxBEAgACgCUEF/NgLINyAAKAJQQb/+ADYCBAwNCyAALQAgQcAAcQRAIAAoAlhB6Q42AhggACgCUEHR/gA2AgQMDQsgACgCUCAALQAgQQ9xNgJMIAAoAlBByf4ANgIECyAAKAJQKAJMBEADQCAAKAI4IAAoAlAoAkxJBEAgACgCREUNDSAAIAAoAkRBAWs2AkQgACAAKAJMIgFBAWo2AkwgACAAKAI8IAEtAAAgACgCOHRqNgI8IAAgACgCOEEIajYCOAwBCwsgACgCUCIBIAEoAkQgACgCPEEBIAAoAlAoAkx0QQFrcWo2AkQgACAAKAI8IAAoAlAoAkx2NgI8IAAgACgCOCAAKAJQKAJMazYCOCAAKAJQIgEgACgCUCgCTCABKALIN2o2Asg3CyAAKAJQIAAoAlAoAkQ2Asw3IAAoAlBByv4ANgIECwNAAkAgACAAKAJQKAJUIAAoAjxBASAAKAJQKAJcdEEBa3FBAnRqKAEANgEgIAAtACEgACgCOE0NACAAKAJERQ0LIAAgACgCREEBazYCRCAAIAAoAkwiAUEBajYCTCAAIAAoAjwgAS0AACAAKAI4dGo2AjwgACAAKAI4QQhqNgI4DAELCyAALQAgQfABcUUEQCAAIAAoASA2ARgDQAJAIAAgACgCUCgCVCAALwEaIAAoAjxBASAALQAZIAAtABhqdEEBa3EgAC0AGXZqQQJ0aigBADYBICAAKAI4IAAtABkgAC0AIWpPDQAgACgCREUNDCAAIAAoAkRBAWs2AkQgACAAKAJMIgFBAWo2AkwgACAAKAI8IAEtAAAgACgCOHRqNgI8IAAgACgCOEEIajYCOAwBCwsgACAAKAI8IAAtABl2NgI8IAAgACgCOCAALQAZazYCOCAAKAJQIgEgAC0AGSABKALIN2o2Asg3CyAAIAAoAjwgAC0AIXY2AjwgACAAKAI4IAAtACFrNgI4IAAoAlAiASAALQAhIAEoAsg3ajYCyDcgAC0AIEHAAHEEQCAAKAJYQYUPNgIYIAAoAlBB0f4ANgIEDAsLIAAoAlAgAC8BIjYCSCAAKAJQIAAtACBBD3E2AkwgACgCUEHL/gA2AgQLIAAoAlAoAkwEQANAIAAoAjggACgCUCgCTEkEQCAAKAJERQ0LIAAgACgCREEBazYCRCAAIAAoAkwiAUEBajYCTCAAIAAoAjwgAS0AACAAKAI4dGo2AjwgACAAKAI4QQhqNgI4DAELCyAAKAJQIgEgASgCSCAAKAI8QQEgACgCUCgCTHRBAWtxajYCSCAAIAAoAjwgACgCUCgCTHY2AjwgACAAKAI4IAAoAlAoAkxrNgI4IAAoAlAiASAAKAJQKAJMIAEoAsg3ajYCyDcLIAAoAlBBzP4ANgIECyAAKAJARQ0HIAAgACgCMCAAKAJAazYCLAJAIAAoAlAoAkggACgCLEsEQCAAIAAoAlAoAkggACgCLGs2AiwgACgCLCAAKAJQKAIwSwRAIAAoAlAoAsQ3BEAgACgCWEHdDDYCGCAAKAJQQdH+ADYCBAwMCwsCQCAAKAIsIAAoAlAoAjRLBEAgACAAKAIsIAAoAlAoAjRrNgIsIAAgACgCUCgCOCAAKAJQKAIsIAAoAixrajYCKAwBCyAAIAAoAlAoAjggACgCUCgCNCAAKAIsa2o2AigLIAAoAiwgACgCUCgCREsEQCAAIAAoAlAoAkQ2AiwLDAELIAAgACgCSCAAKAJQKAJIazYCKCAAIAAoAlAoAkQ2AiwLIAAoAiwgACgCQEsEQCAAIAAoAkA2AiwLIAAgACgCQCAAKAIsazYCQCAAKAJQIgEgASgCRCAAKAIsazYCRANAIAAgACgCKCIBQQFqNgIoIAEtAAAhASAAIAAoAkgiAkEBajYCSCACIAE6AAAgACAAKAIsQQFrIgE2AiwgAQ0ACyAAKAJQKAJERQRAIAAoAlBByP4ANgIECwwICyAAKAJARQ0GIAAoAlAoAkQhASAAIAAoAkgiAkEBajYCSCACIAE6AAAgACAAKAJAQQFrNgJAIAAoAlBByP4ANgIEDAcLIAAoAlAoAgwEQANAIAAoAjhBIEkEQCAAKAJERQ0IIAAgACgCREEBazYCRCAAIAAoAkwiAUEBajYCTCAAIAAoAjwgAS0AACAAKAI4dGo2AjwgACAAKAI4QQhqNgI4DAELCyAAIAAoAjAgACgCQGs2AjAgACgCWCIBIAAoAjAgASgCFGo2AhQgACgCUCIBIAAoAjAgASgCIGo2AiACQCAAKAJQKAIMQQRxRQ0AIAAoAjBFDQACfyAAKAJQKAIUBEAgACgCUCgCHCAAKAJIIAAoAjBrIAAoAjAQGgwBCyAAKAJQKAIcIAAoAkggACgCMGsgACgCMBA9CyEBIAAoAlAgATYCHCAAKAJYIAE2AjALIAAgACgCQDYCMAJAIAAoAlAoAgxBBHFFDQACfyAAKAJQKAIUBEAgACgCPAwBCyAAKAI8QQh2QYD+A3EgACgCPEEYdmogACgCPEGA/gNxQQh0aiAAKAI8Qf8BcUEYdGoLIAAoAlAoAhxGDQAgACgCWEHIDDYCGCAAKAJQQdH+ADYCBAwICyAAQQA2AjwgAEEANgI4CyAAKAJQQc/+ADYCBAsCQCAAKAJQKAIMRQ0AIAAoAlAoAhRFDQADQCAAKAI4QSBJBEAgACgCREUNByAAIAAoAkRBAWs2AkQgACAAKAJMIgFBAWo2AkwgACAAKAI8IAEtAAAgACgCOHRqNgI8IAAgACgCOEEIajYCOAwBCwsgACgCPCAAKAJQKAIgRwRAIAAoAlhBsQw2AhggACgCUEHR/gA2AgQMBwsgAEEANgI8IABBADYCOAsgACgCUEHQ/gA2AgQLIABBATYCEAwDCyAAQX02AhAMAgsgAEF8NgJcDAMLIABBfjYCXAwCCwsgACgCWCAAKAJINgIMIAAoAlggACgCQDYCECAAKAJYIAAoAkw2AgAgACgCWCAAKAJENgIEIAAoAlAgACgCPDYCPCAAKAJQIAAoAjg2AkACQAJAIAAoAlAoAiwNACAAKAIwIAAoAlgoAhBGDQEgACgCUCgCBEHR/gBPDQEgACgCUCgCBEHO/gBJDQAgACgCVEEERg0BCwJ/IAAoAlghAiAAKAJYKAIMIQMgACgCMCAAKAJYKAIQayEEIwBBIGsiASQAIAEgAjYCGCABIAM2AhQgASAENgIQIAEgASgCGCgCHDYCDAJAIAEoAgwoAjhFBEAgASgCGCgCKEEBIAEoAgwoAih0QQEgASgCGCgCIBEBACECIAEoAgwgAjYCOCABKAIMKAI4RQRAIAFBATYCHAwCCwsgASgCDCgCLEUEQCABKAIMQQEgASgCDCgCKHQ2AiwgASgCDEEANgI0IAEoAgxBADYCMAsCQCABKAIQIAEoAgwoAixPBEAgASgCDCgCOCABKAIUIAEoAgwoAixrIAEoAgwoAiwQGRogASgCDEEANgI0IAEoAgwgASgCDCgCLDYCMAwBCyABIAEoAgwoAiwgASgCDCgCNGs2AgggASgCCCABKAIQSwRAIAEgASgCEDYCCAsgASgCDCgCOCABKAIMKAI0aiABKAIUIAEoAhBrIAEoAggQGRogASABKAIQIAEoAghrNgIQAkAgASgCEARAIAEoAgwoAjggASgCFCABKAIQayABKAIQEBkaIAEoAgwgASgCEDYCNCABKAIMIAEoAgwoAiw2AjAMAQsgASgCDCICIAEoAgggAigCNGo2AjQgASgCDCgCNCABKAIMKAIsRgRAIAEoAgxBADYCNAsgASgCDCgCMCABKAIMKAIsSQRAIAEoAgwiAiABKAIIIAIoAjBqNgIwCwsLIAFBADYCHAsgASgCHCECIAFBIGokACACCwRAIAAoAlBB0v4ANgIEIABBfDYCXAwCCwsgACAAKAI0IAAoAlgoAgRrNgI0IAAgACgCMCAAKAJYKAIQazYCMCAAKAJYIgEgACgCNCABKAIIajYCCCAAKAJYIgEgACgCMCABKAIUajYCFCAAKAJQIgEgACgCMCABKAIgajYCIAJAIAAoAlAoAgxBBHFFDQAgACgCMEUNAAJ/IAAoAlAoAhQEQCAAKAJQKAIcIAAoAlgoAgwgACgCMGsgACgCMBAaDAELIAAoAlAoAhwgACgCWCgCDCAAKAIwayAAKAIwED0LIQEgACgCUCABNgIcIAAoAlggATYCMAsgACgCWCAAKAJQKAJAQcAAQQAgACgCUCgCCBtqQYABQQAgACgCUCgCBEG//gBGG2pBgAJBACAAKAJQKAIEQcf+AEcEfyAAKAJQKAIEQcL+AEYFQQELQQFxG2o2AiwCQAJAIAAoAjRFBEAgACgCMEUNAQsgACgCVEEERw0BCyAAKAIQDQAgAEF7NgIQCyAAIAAoAhA2AlwLIAAoAlwhASAAQeAAaiQAIAUgATYCCAsgBSgCECIAIAApAwAgBSgCDDUCIH03AwACQAJAAkACQAJAIAUoAghBBWoOBwIDAwMDAAEDCyAFQQA2AhwMAwsgBUEBNgIcDAILIAUoAgwoAhRFBEAgBUEDNgIcDAILCyAFKAIMKAIAQQ0gBSgCCBAUIAVBAjYCHAsgBSgCHCEAIAVBIGokACAACyQBAX8jAEEQayIBIAA2AgwgASABKAIMNgIIIAEoAghBAToADAuXAQEBfyMAQSBrIgMkACADIAA2AhggAyABNgIUIAMgAjcDCCADIAMoAhg2AgQCQAJAIAMpAwhC/////w9YBEAgAygCBCgCFEUNAQsgAygCBCgCAEESQQAQFCADQQA6AB8MAQsgAygCBCADKQMIPgIUIAMoAgQgAygCFDYCECADQQE6AB8LIAMtAB9BAXEhACADQSBqJAAgAAukAgECfyMAQRBrIgEkACABIAA2AgggASABKAIINgIEAkAgASgCBC0ABEEBcQRAIAEgASgCBEEQahC4ATYCAAwBCyABKAIEQRBqIQIjAEEQayIAJAAgACACNgIIAkAgACgCCBBKBEAgAEF+NgIMDAELIAAgACgCCCgCHDYCBCAAKAIEKAI4BEAgACgCCCgCKCAAKAIEKAI4IAAoAggoAiQRBAALIAAoAggoAiggACgCCCgCHCAAKAIIKAIkEQQAIAAoAghBADYCHCAAQQA2AgwLIAAoAgwhAiAAQRBqJAAgASACNgIACwJAIAEoAgAEQCABKAIEKAIAQQ0gASgCABAUIAFBADoADwwBCyABQQE6AA8LIAEtAA9BAXEhACABQRBqJAAgAAuyGAEFfyMAQRBrIgQkACAEIAA2AgggBCAEKAIINgIEIAQoAgRBADYCFCAEKAIEQQA2AhAgBCgCBEEANgIgIAQoAgRBADYCHAJAIAQoAgQtAARBAXEEQCAEKAIEQRBqIQEgBCgCBCgCCCECIwBBMGsiACQAIAAgATYCKCAAIAI2AiQgAEEINgIgIABBcTYCHCAAQQk2AhggAEEANgIUIABBwBI2AhAgAEE4NgIMIABBATYCBAJAAkACQCAAKAIQRQ0AIAAoAhAsAABB+O4ALAAARw0AIAAoAgxBOEYNAQsgAEF6NgIsDAELIAAoAihFBEAgAEF+NgIsDAELIAAoAihBADYCGCAAKAIoKAIgRQRAIAAoAihBBTYCICAAKAIoQQA2AigLIAAoAigoAiRFBEAgACgCKEEGNgIkCyAAKAIkQX9GBEAgAEEGNgIkCwJAIAAoAhxBAEgEQCAAQQA2AgQgAEEAIAAoAhxrNgIcDAELIAAoAhxBD0oEQCAAQQI2AgQgACAAKAIcQRBrNgIcCwsCQAJAIAAoAhhBAUgNACAAKAIYQQlKDQAgACgCIEEIRw0AIAAoAhxBCEgNACAAKAIcQQ9KDQAgACgCJEEASA0AIAAoAiRBCUoNACAAKAIUQQBIDQAgACgCFEEESg0AIAAoAhxBCEcNASAAKAIEQQFGDQELIABBfjYCLAwBCyAAKAIcQQhGBEAgAEEJNgIcCyAAIAAoAigoAihBAUHELSAAKAIoKAIgEQEANgIIIAAoAghFBEAgAEF8NgIsDAELIAAoAiggACgCCDYCHCAAKAIIIAAoAig2AgAgACgCCEEqNgIEIAAoAgggACgCBDYCGCAAKAIIQQA2AhwgACgCCCAAKAIcNgIwIAAoAghBASAAKAIIKAIwdDYCLCAAKAIIIAAoAggoAixBAWs2AjQgACgCCCAAKAIYQQdqNgJQIAAoAghBASAAKAIIKAJQdDYCTCAAKAIIIAAoAggoAkxBAWs2AlQgACgCCCAAKAIIKAJQQQJqQQNuNgJYIAAoAigoAiggACgCCCgCLEECIAAoAigoAiARAQAhASAAKAIIIAE2AjggACgCKCgCKCAAKAIIKAIsQQIgACgCKCgCIBEBACEBIAAoAgggATYCQCAAKAIoKAIoIAAoAggoAkxBAiAAKAIoKAIgEQEAIQEgACgCCCABNgJEIAAoAghBADYCwC0gACgCCEEBIAAoAhhBBmp0NgKcLSAAIAAoAigoAiggACgCCCgCnC1BBCAAKAIoKAIgEQEANgIAIAAoAgggACgCADYCCCAAKAIIIAAoAggoApwtQQJ0NgIMAkACQCAAKAIIKAI4RQ0AIAAoAggoAkBFDQAgACgCCCgCREUNACAAKAIIKAIIDQELIAAoAghBmgU2AgQgACgCKEG42QAoAgA2AhggACgCKBC4ARogAEF8NgIsDAELIAAoAgggACgCACAAKAIIKAKcLUEBdkEBdGo2AqQtIAAoAgggACgCCCgCCCAAKAIIKAKcLUEDbGo2ApgtIAAoAgggACgCJDYChAEgACgCCCAAKAIUNgKIASAAKAIIIAAoAiA6ACQgACgCKCEBIwBBEGsiAyQAIAMgATYCDCADKAIMIQIjAEEQayIBJAAgASACNgIIAkAgASgCCBB4BEAgAUF+NgIMDAELIAEoAghBADYCFCABKAIIQQA2AgggASgCCEEANgIYIAEoAghBAjYCLCABIAEoAggoAhw2AgQgASgCBEEANgIUIAEoAgQgASgCBCgCCDYCECABKAIEKAIYQQBIBEAgASgCBEEAIAEoAgQoAhhrNgIYCyABKAIEIAEoAgQoAhhBAkYEf0E5BUEqQfEAIAEoAgQoAhgbCzYCBAJ/IAEoAgQoAhhBAkYEQEEAQQBBABAaDAELQQBBAEEAED0LIQIgASgCCCACNgIwIAEoAgRBADYCKCABKAIEIQUjAEEQayICJAAgAiAFNgIMIAIoAgwgAigCDEGUAWo2ApgWIAIoAgxB0N8ANgKgFiACKAIMIAIoAgxBiBNqNgKkFiACKAIMQeTfADYCrBYgAigCDCACKAIMQfwUajYCsBYgAigCDEH43wA2ArgWIAIoAgxBADsBuC0gAigCDEEANgK8LSACKAIMEL4BIAJBEGokACABQQA2AgwLIAEoAgwhAiABQRBqJAAgAyACNgIIIAMoAghFBEAgAygCDCgCHCECIwBBEGsiASQAIAEgAjYCDCABKAIMIAEoAgwoAixBAXQ2AjwgASgCDCgCRCABKAIMKAJMQQFrQQF0akEAOwEAIAEoAgwoAkRBACABKAIMKAJMQQFrQQF0EDMgASgCDCABKAIMKAKEAUEMbEGA7wBqLwECNgKAASABKAIMIAEoAgwoAoQBQQxsQYDvAGovAQA2AowBIAEoAgwgASgCDCgChAFBDGxBgO8Aai8BBDYCkAEgASgCDCABKAIMKAKEAUEMbEGA7wBqLwEGNgJ8IAEoAgxBADYCbCABKAIMQQA2AlwgASgCDEEANgJ0IAEoAgxBADYCtC0gASgCDEECNgJ4IAEoAgxBAjYCYCABKAIMQQA2AmggASgCDEEANgJIIAFBEGokAAsgAygCCCEBIANBEGokACAAIAE2AiwLIAAoAiwhASAAQTBqJAAgBCABNgIADAELIAQoAgRBEGohASMAQSBrIgAkACAAIAE2AhggAEFxNgIUIABBwBI2AhAgAEE4NgIMAkACQAJAIAAoAhBFDQAgACgCECwAAEHAEiwAAEcNACAAKAIMQThGDQELIABBejYCHAwBCyAAKAIYRQRAIABBfjYCHAwBCyAAKAIYQQA2AhggACgCGCgCIEUEQCAAKAIYQQU2AiAgACgCGEEANgIoCyAAKAIYKAIkRQRAIAAoAhhBBjYCJAsgACAAKAIYKAIoQQFB0DcgACgCGCgCIBEBADYCBCAAKAIERQRAIABBfDYCHAwBCyAAKAIYIAAoAgQ2AhwgACgCBCAAKAIYNgIAIAAoAgRBADYCOCAAKAIEQbT+ADYCBCAAKAIYIQIgACgCFCEDIwBBIGsiASQAIAEgAjYCGCABIAM2AhQCQCABKAIYEEoEQCABQX42AhwMAQsgASABKAIYKAIcNgIMAkAgASgCFEEASARAIAFBADYCECABQQAgASgCFGs2AhQMAQsgASABKAIUQQR1QQVqNgIQIAEoAhRBMEgEQCABIAEoAhRBD3E2AhQLCwJAIAEoAhRFDQAgASgCFEEITgRAIAEoAhRBD0wNAQsgAUF+NgIcDAELAkAgASgCDCgCOEUNACABKAIMKAIoIAEoAhRGDQAgASgCGCgCKCABKAIMKAI4IAEoAhgoAiQRBAAgASgCDEEANgI4CyABKAIMIAEoAhA2AgwgASgCDCABKAIUNgIoIAEoAhghAiMAQRBrIgMkACADIAI2AggCQCADKAIIEEoEQCADQX42AgwMAQsgAyADKAIIKAIcNgIEIAMoAgRBADYCLCADKAIEQQA2AjAgAygCBEEANgI0IAMoAgghBSMAQRBrIgIkACACIAU2AggCQCACKAIIEEoEQCACQX42AgwMAQsgAiACKAIIKAIcNgIEIAIoAgRBADYCICACKAIIQQA2AhQgAigCCEEANgIIIAIoAghBADYCGCACKAIEKAIMBEAgAigCCCACKAIEKAIMQQFxNgIwCyACKAIEQbT+ADYCBCACKAIEQQA2AgggAigCBEEANgIQIAIoAgRBgIACNgIYIAIoAgRBADYCJCACKAIEQQA2AjwgAigCBEEANgJAIAIoAgQgAigCBEG0CmoiBTYCcCACKAIEIAU2AlQgAigCBCAFNgJQIAIoAgRBATYCxDcgAigCBEF/NgLINyACQQA2AgwLIAIoAgwhBSACQRBqJAAgAyAFNgIMCyADKAIMIQIgA0EQaiQAIAEgAjYCHAsgASgCHCECIAFBIGokACAAIAI2AgggACgCCARAIAAoAhgoAiggACgCBCAAKAIYKAIkEQQAIAAoAhhBADYCHAsgACAAKAIINgIcCyAAKAIcIQEgAEEgaiQAIAQgATYCAAsCQCAEKAIABEAgBCgCBCgCAEENIAQoAgAQFCAEQQA6AA8MAQsgBEEBOgAPCyAELQAPQQFxIQAgBEEQaiQAIAALbwEBfyMAQRBrIgEgADYCCCABIAEoAgg2AgQCQCABKAIELQAEQQFxRQRAIAFBADYCDAwBCyABKAIEKAIIQQNIBEAgAUECNgIMDAELIAEoAgQoAghBB0oEQCABQQE2AgwMAQsgAUEANgIMCyABKAIMCywBAX8jAEEQayIBJAAgASAANgIMIAEgASgCDDYCCCABKAIIEBUgAUEQaiQACzwBAX8jAEEQayIDJAAgAyAAOwEOIAMgATYCCCADIAI2AgRBASADKAIIIAMoAgQQtAEhACADQRBqJAAgAAvBEAECfyMAQSBrIgIkACACIAA2AhggAiABNgIUAkADQAJAIAIoAhgoAnRBhgJJBEAgAigCGBBcAkAgAigCGCgCdEGGAk8NACACKAIUDQAgAkEANgIcDAQLIAIoAhgoAnRFDQELIAJBADYCECACKAIYKAJ0QQNPBEAgAigCGCACKAIYKAJUIAIoAhgoAjggAigCGCgCbEECamotAAAgAigCGCgCSCACKAIYKAJYdHNxNgJIIAIoAhgoAkAgAigCGCgCbCACKAIYKAI0cUEBdGogAigCGCgCRCACKAIYKAJIQQF0ai8BACIAOwEAIAIgAEH//wNxNgIQIAIoAhgoAkQgAigCGCgCSEEBdGogAigCGCgCbDsBAAsgAigCGCACKAIYKAJgNgJ4IAIoAhggAigCGCgCcDYCZCACKAIYQQI2AmACQCACKAIQRQ0AIAIoAhgoAnggAigCGCgCgAFPDQAgAigCGCgCLEGGAmsgAigCGCgCbCACKAIQa0kNACACKAIYIAIoAhAQtgEhACACKAIYIAA2AmACQCACKAIYKAJgQQVLDQAgAigCGCgCiAFBAUcEQCACKAIYKAJgQQNHDQEgAigCGCgCbCACKAIYKAJwa0GAIE0NAQsgAigCGEECNgJgCwsCQAJAIAIoAhgoAnhBA0kNACACKAIYKAJgIAIoAhgoAnhLDQAgAiACKAIYIgAoAmwgACgCdGpBA2s2AgggAiACKAIYKAJ4QQNrOgAHIAIgAigCGCIAKAJsIAAoAmRBf3NqOwEEIAIoAhgiACgCpC0gACgCoC1BAXRqIAIvAQQ7AQAgAi0AByEBIAIoAhgiACgCmC0hAyAAIAAoAqAtIgBBAWo2AqAtIAAgA2ogAToAACACIAIvAQRBAWs7AQQgAigCGCACLQAHQdDdAGotAABBAnRqQZgJaiIAIAAvAQBBAWo7AQAgAigCGEGIE2oCfyACLwEEQYACSQRAIAIvAQQtANBZDAELIAIvAQRBB3ZBgAJqLQDQWQtBAnRqIgAgAC8BAEEBajsBACACIAIoAhgoAqAtIAIoAhgoApwtQQFrRjYCDCACKAIYIgAgACgCdCACKAIYKAJ4QQFrazYCdCACKAIYIgAgACgCeEECazYCeANAIAIoAhgiASgCbEEBaiEAIAEgADYCbCAAIAIoAghNBEAgAigCGCACKAIYKAJUIAIoAhgoAjggAigCGCgCbEECamotAAAgAigCGCgCSCACKAIYKAJYdHNxNgJIIAIoAhgoAkAgAigCGCgCbCACKAIYKAI0cUEBdGogAigCGCgCRCACKAIYKAJIQQF0ai8BACIAOwEAIAIgAEH//wNxNgIQIAIoAhgoAkQgAigCGCgCSEEBdGogAigCGCgCbDsBAAsgAigCGCIBKAJ4QQFrIQAgASAANgJ4IAANAAsgAigCGEEANgJoIAIoAhhBAjYCYCACKAIYIgAgACgCbEEBajYCbCACKAIMBEAgAigCGAJ/IAIoAhgoAlxBAE4EQCACKAIYKAI4IAIoAhgoAlxqDAELQQALIAIoAhgoAmwgAigCGCgCXGtBABAoIAIoAhggAigCGCgCbDYCXCACKAIYKAIAEBwgAigCGCgCACgCEEUEQCACQQA2AhwMBgsLDAELAkAgAigCGCgCaARAIAIgAigCGCIAKAI4IAAoAmxqQQFrLQAAOgADIAIoAhgiACgCpC0gACgCoC1BAXRqQQA7AQAgAi0AAyEBIAIoAhgiACgCmC0hAyAAIAAoAqAtIgBBAWo2AqAtIAAgA2ogAToAACACKAIYIAItAANBAnRqIgAgAC8BlAFBAWo7AZQBIAIgAigCGCgCoC0gAigCGCgCnC1BAWtGNgIMIAIoAgwEQCACKAIYAn8gAigCGCgCXEEATgRAIAIoAhgoAjggAigCGCgCXGoMAQtBAAsgAigCGCgCbCACKAIYKAJca0EAECggAigCGCACKAIYKAJsNgJcIAIoAhgoAgAQHAsgAigCGCIAIAAoAmxBAWo2AmwgAigCGCIAIAAoAnRBAWs2AnQgAigCGCgCACgCEEUEQCACQQA2AhwMBgsMAQsgAigCGEEBNgJoIAIoAhgiACAAKAJsQQFqNgJsIAIoAhgiACAAKAJ0QQFrNgJ0CwsMAQsLIAIoAhgoAmgEQCACIAIoAhgiACgCOCAAKAJsakEBay0AADoAAiACKAIYIgAoAqQtIAAoAqAtQQF0akEAOwEAIAItAAIhASACKAIYIgAoApgtIQMgACAAKAKgLSIAQQFqNgKgLSAAIANqIAE6AAAgAigCGCACLQACQQJ0aiIAIAAvAZQBQQFqOwGUASACIAIoAhgoAqAtIAIoAhgoApwtQQFrRjYCDCACKAIYQQA2AmgLIAIoAhgCfyACKAIYKAJsQQJJBEAgAigCGCgCbAwBC0ECCzYCtC0gAigCFEEERgRAIAIoAhgCfyACKAIYKAJcQQBOBEAgAigCGCgCOCACKAIYKAJcagwBC0EACyACKAIYKAJsIAIoAhgoAlxrQQEQKCACKAIYIAIoAhgoAmw2AlwgAigCGCgCABAcIAIoAhgoAgAoAhBFBEAgAkECNgIcDAILIAJBAzYCHAwBCyACKAIYKAKgLQRAIAIoAhgCfyACKAIYKAJcQQBOBEAgAigCGCgCOCACKAIYKAJcagwBC0EACyACKAIYKAJsIAIoAhgoAlxrQQAQKCACKAIYIAIoAhgoAmw2AlwgAigCGCgCABAcIAIoAhgoAgAoAhBFBEAgAkEANgIcDAILCyACQQE2AhwLIAIoAhwhACACQSBqJAAgAAuVDQECfyMAQSBrIgIkACACIAA2AhggAiABNgIUAkADQAJAIAIoAhgoAnRBhgJJBEAgAigCGBBcAkAgAigCGCgCdEGGAk8NACACKAIUDQAgAkEANgIcDAQLIAIoAhgoAnRFDQELIAJBADYCECACKAIYKAJ0QQNPBEAgAigCGCACKAIYKAJUIAIoAhgoAjggAigCGCgCbEECamotAAAgAigCGCgCSCACKAIYKAJYdHNxNgJIIAIoAhgoAkAgAigCGCgCbCACKAIYKAI0cUEBdGogAigCGCgCRCACKAIYKAJIQQF0ai8BACIAOwEAIAIgAEH//wNxNgIQIAIoAhgoAkQgAigCGCgCSEEBdGogAigCGCgCbDsBAAsCQCACKAIQRQ0AIAIoAhgoAixBhgJrIAIoAhgoAmwgAigCEGtJDQAgAigCGCACKAIQELYBIQAgAigCGCAANgJgCwJAIAIoAhgoAmBBA08EQCACIAIoAhgoAmBBA2s6AAsgAiACKAIYIgAoAmwgACgCcGs7AQggAigCGCIAKAKkLSAAKAKgLUEBdGogAi8BCDsBACACLQALIQEgAigCGCIAKAKYLSEDIAAgACgCoC0iAEEBajYCoC0gACADaiABOgAAIAIgAi8BCEEBazsBCCACKAIYIAItAAtB0N0Aai0AAEECdGpBmAlqIgAgAC8BAEEBajsBACACKAIYQYgTagJ/IAIvAQhBgAJJBEAgAi8BCC0A0FkMAQsgAi8BCEEHdkGAAmotANBZC0ECdGoiACAALwEAQQFqOwEAIAIgAigCGCgCoC0gAigCGCgCnC1BAWtGNgIMIAIoAhgiACAAKAJ0IAIoAhgoAmBrNgJ0AkACQCACKAIYKAJgIAIoAhgoAoABSw0AIAIoAhgoAnRBA0kNACACKAIYIgAgACgCYEEBazYCYANAIAIoAhgiACAAKAJsQQFqNgJsIAIoAhggAigCGCgCVCACKAIYKAI4IAIoAhgoAmxBAmpqLQAAIAIoAhgoAkggAigCGCgCWHRzcTYCSCACKAIYKAJAIAIoAhgoAmwgAigCGCgCNHFBAXRqIAIoAhgoAkQgAigCGCgCSEEBdGovAQAiADsBACACIABB//8DcTYCECACKAIYKAJEIAIoAhgoAkhBAXRqIAIoAhgoAmw7AQAgAigCGCIBKAJgQQFrIQAgASAANgJgIAANAAsgAigCGCIAIAAoAmxBAWo2AmwMAQsgAigCGCIAIAIoAhgoAmAgACgCbGo2AmwgAigCGEEANgJgIAIoAhggAigCGCgCOCACKAIYKAJsai0AADYCSCACKAIYIAIoAhgoAlQgAigCGCgCOCACKAIYKAJsQQFqai0AACACKAIYKAJIIAIoAhgoAlh0c3E2AkgLDAELIAIgAigCGCIAKAI4IAAoAmxqLQAAOgAHIAIoAhgiACgCpC0gACgCoC1BAXRqQQA7AQAgAi0AByEBIAIoAhgiACgCmC0hAyAAIAAoAqAtIgBBAWo2AqAtIAAgA2ogAToAACACKAIYIAItAAdBAnRqIgAgAC8BlAFBAWo7AZQBIAIgAigCGCgCoC0gAigCGCgCnC1BAWtGNgIMIAIoAhgiACAAKAJ0QQFrNgJ0IAIoAhgiACAAKAJsQQFqNgJsCyACKAIMBEAgAigCGAJ/IAIoAhgoAlxBAE4EQCACKAIYKAI4IAIoAhgoAlxqDAELQQALIAIoAhgoAmwgAigCGCgCXGtBABAoIAIoAhggAigCGCgCbDYCXCACKAIYKAIAEBwgAigCGCgCACgCEEUEQCACQQA2AhwMBAsLDAELCyACKAIYAn8gAigCGCgCbEECSQRAIAIoAhgoAmwMAQtBAgs2ArQtIAIoAhRBBEYEQCACKAIYAn8gAigCGCgCXEEATgRAIAIoAhgoAjggAigCGCgCXGoMAQtBAAsgAigCGCgCbCACKAIYKAJca0EBECggAigCGCACKAIYKAJsNgJcIAIoAhgoAgAQHCACKAIYKAIAKAIQRQRAIAJBAjYCHAwCCyACQQM2AhwMAQsgAigCGCgCoC0EQCACKAIYAn8gAigCGCgCXEEATgRAIAIoAhgoAjggAigCGCgCXGoMAQtBAAsgAigCGCgCbCACKAIYKAJca0EAECggAigCGCACKAIYKAJsNgJcIAIoAhgoAgAQHCACKAIYKAIAKAIQRQRAIAJBADYCHAwCCwsgAkEBNgIcCyACKAIcIQAgAkEgaiQAIAALBwAgAC8BMAspAQF/IwBBEGsiAiQAIAIgADYCDCACIAE2AgggAigCCBAVIAJBEGokAAs6AQF/IwBBEGsiAyQAIAMgADYCDCADIAE2AgggAyACNgIEIAMoAgggAygCBGwQGCEAIANBEGokACAAC84FAQF/IwBB0ABrIgUkACAFIAA2AkQgBSABNgJAIAUgAjYCPCAFIAM3AzAgBSAENgIsIAUgBSgCQDYCKAJAAkACQAJAAkACQAJAAkACQCAFKAIsDg8AAQIDBQYHBwcHBwcHBwQHCwJ/IAUoAkQhASAFKAIoIQIjAEHgAGsiACQAIAAgATYCWCAAIAI2AlQgACAAKAJYIABByABqQgwQKyIDNwMIAkAgA0IAUwRAIAAoAlQgACgCWBAXIABBfzYCXAwBCyAAKQMIQgxSBEAgACgCVEERQQAQFCAAQX82AlwMAQsgACgCVCAAQcgAaiAAQcgAakIMQQAQfCAAKAJYIABBEGoQOUEASARAIABBADYCXAwBCyAAKAI4IABBBmogAEEEahCNAQJAIAAtAFMgACgCPEEYdkYNACAALQBTIAAvAQZBCHZGDQAgACgCVEEbQQAQFCAAQX82AlwMAQsgAEEANgJcCyAAKAJcIQEgAEHgAGokACABQQBICwRAIAVCfzcDSAwICyAFQgA3A0gMBwsgBSAFKAJEIAUoAjwgBSkDMBArIgM3AyAgA0IAUwRAIAUoAiggBSgCRBAXIAVCfzcDSAwHCyAFKAJAIAUoAjwgBSgCPCAFKQMgQQAQfCAFIAUpAyA3A0gMBgsgBUIANwNIDAULIAUgBSgCPDYCHCAFKAIcQQA7ATIgBSgCHCIAIAApAwBCgAGENwMAIAUoAhwpAwBCCINCAFIEQCAFKAIcIgAgACkDIEIMfTcDIAsgBUIANwNIDAQLIAVBfzYCFCAFQQU2AhAgBUEENgIMIAVBAzYCCCAFQQI2AgQgBUEBNgIAIAVBACAFEDQ3A0gMAwsgBSAFKAIoIAUoAjwgBSkDMBBDNwNIDAILIAUoAigQvwEgBUIANwNIDAELIAUoAihBEkEAEBQgBUJ/NwNICyAFKQNIIQMgBUHQAGokACADC+4CAQF/IwBBIGsiBSQAIAUgADYCGCAFIAE2AhQgBSACOwESIAUgAzYCDCAFIAQ2AggCQAJAAkAgBSgCCEUNACAFKAIURQ0AIAUvARJBAUYNAQsgBSgCGEEIakESQQAQFCAFQQA2AhwMAQsgBSgCDEEBcQRAIAUoAhhBCGpBGEEAEBQgBUEANgIcDAELIAVBGBAYIgA2AgQgAEUEQCAFKAIYQQhqQQ5BABAUIAVBADYCHAwBCyMAQRBrIgAgBSgCBDYCDCAAKAIMQQA2AgAgACgCDEEANgIEIAAoAgxBADYCCCAFKAIEQfis0ZEBNgIMIAUoAgRBic+VmgI2AhAgBSgCBEGQ8dmiAzYCFCAFKAIEQQAgBSgCCCAFKAIIEC6tQQEQfCAFIAUoAhggBSgCFEEDIAUoAgQQYSIANgIAIABFBEAgBSgCBBC/ASAFQQA2AhwMAQsgBSAFKAIANgIcCyAFKAIcIQAgBUEgaiQAIAALBwAgACgCIAu9GAECfyMAQfAAayIEJAAgBCAANgJkIAQgATYCYCAEIAI3A1ggBCADNgJUIAQgBCgCZDYCUAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkAgBCgCVA4UBgcCDAQFCg8AAwkRCxAOCBIBEg0SC0EAQgBBACAEKAJQEEwhACAEKAJQIAA2AhQgAEUEQCAEQn83A2gMEwsgBCgCUCgCFEIANwM4IAQoAlAoAhRCADcDQCAEQgA3A2gMEgsgBCgCUCgCECEBIAQpA1ghAiAEKAJQIQMjAEFAaiIAJAAgACABNgI4IAAgAjcDMCAAIAM2AiwCQCAAKQMwUARAIABBAEIAQQEgACgCLBBMNgI8DAELIAApAzAgACgCOCkDMFYEQCAAKAIsQRJBABAUIABBADYCPAwBCyAAKAI4KAIoBEAgACgCLEEdQQAQFCAAQQA2AjwMAQsgACAAKAI4IAApAzAQwAE3AyAgACAAKQMwIAAoAjgoAgQgACkDIKdBA3RqKQMAfTcDGCAAKQMYUARAIAAgACkDIEIBfTcDICAAIAAoAjgoAgAgACkDIKdBBHRqKQMINwMYCyAAIAAoAjgoAgAgACkDIKdBBHRqKQMIIAApAxh9NwMQIAApAxAgACkDMFYEQCAAKAIsQRxBABAUIABBADYCPAwBCyAAIAAoAjgoAgAgACkDIEIBfEEAIAAoAiwQTCIBNgIMIAFFBEAgAEEANgI8DAELIAAoAgwoAgAgACgCDCkDCEIBfadBBHRqIAApAxg3AwggACgCDCgCBCAAKAIMKQMIp0EDdGogACkDMDcDACAAKAIMIAApAzA3AzAgACgCDAJ+IAAoAjgpAxggACgCDCkDCEIBfVQEQCAAKAI4KQMYDAELIAAoAgwpAwhCAX0LNwMYIAAoAjggACgCDDYCKCAAKAIMIAAoAjg2AiggACgCOCAAKAIMKQMINwMgIAAoAgwgACkDIEIBfDcDICAAIAAoAgw2AjwLIAAoAjwhASAAQUBrJAAgASEAIAQoAlAgADYCFCAARQRAIARCfzcDaAwSCyAEKAJQKAIUIAQpA1g3AzggBCgCUCgCFCAEKAJQKAIUKQMINwNAIARCADcDaAwRCyAEQgA3A2gMEAsgBCgCUCgCEBAyIAQoAlAgBCgCUCgCFDYCECAEKAJQQQA2AhQgBEIANwNoDA8LIAQgBCgCUCAEKAJgIAQpA1gQQzcDaAwOCyAEKAJQKAIQEDIgBCgCUCgCFBAyIAQoAlAQFSAEQgA3A2gMDQsgBCgCUCgCEEIANwM4IAQoAlAoAhBCADcDQCAEQgA3A2gMDAsgBCkDWEL///////////8AVgRAIAQoAlBBEkEAEBQgBEJ/NwNoDAwLIAQoAlAoAhAhASAEKAJgIQMgBCkDWCECIwBBQGoiACQAIAAgATYCNCAAIAM2AjAgACACNwMoIAACfiAAKQMoIAAoAjQpAzAgACgCNCkDOH1UBEAgACkDKAwBCyAAKAI0KQMwIAAoAjQpAzh9CzcDKAJAIAApAyhQBEAgAEIANwM4DAELIAApAyhC////////////AFYEQCAAQn83AzgMAQsgACAAKAI0KQNANwMYIAAgACgCNCkDOCAAKAI0KAIEIAApAxinQQN0aikDAH03AxAgAEIANwMgA0AgACkDICAAKQMoVARAIAACfiAAKQMoIAApAyB9IAAoAjQoAgAgACkDGKdBBHRqKQMIIAApAxB9VARAIAApAyggACkDIH0MAQsgACgCNCgCACAAKQMYp0EEdGopAwggACkDEH0LNwMIIAAoAjAgACkDIKdqIAAoAjQoAgAgACkDGKdBBHRqKAIAIAApAxCnaiAAKQMIpxAZGiAAKQMIIAAoAjQoAgAgACkDGKdBBHRqKQMIIAApAxB9UQRAIAAgACkDGEIBfDcDGAsgACAAKQMIIAApAyB8NwMgIABCADcDEAwBCwsgACgCNCIBIAApAyAgASkDOHw3AzggACgCNCAAKQMYNwNAIAAgACkDIDcDOAsgACkDOCECIABBQGskACAEIAI3A2gMCwsgBEEAQgBBACAEKAJQEEw2AkwgBCgCTEUEQCAEQn83A2gMCwsgBCgCUCgCEBAyIAQoAlAgBCgCTDYCECAEQgA3A2gMCgsgBCgCUCgCFBAyIAQoAlBBADYCFCAEQgA3A2gMCQsgBCAEKAJQKAIQIAQoAmAgBCkDWCAEKAJQEMEBrDcDaAwICyAEIAQoAlAoAhQgBCgCYCAEKQNYIAQoAlAQwQGsNwNoDAcLIAQpA1hCOFQEQCAEKAJQQRJBABAUIARCfzcDaAwHCyAEIAQoAmA2AkggBCgCSBA7IAQoAkggBCgCUCgCDDYCKCAEKAJIIAQoAlAoAhApAzA3AxggBCgCSCAEKAJIKQMYNwMgIAQoAkhBADsBMCAEKAJIQQA7ATIgBCgCSELcATcDACAEQjg3A2gMBgsgBCgCUCAEKAJgKAIANgIMIARCADcDaAwFCyAEQX82AkAgBEETNgI8IARBCzYCOCAEQQ02AjQgBEEMNgIwIARBCjYCLCAEQQ82AiggBEEJNgIkIARBETYCICAEQQg2AhwgBEEHNgIYIARBBjYCFCAEQQU2AhAgBEEENgIMIARBAzYCCCAEQQI2AgQgBEEBNgIAIARBACAEEDQ3A2gMBAsgBCgCUCgCECkDOEL///////////8AVgRAIAQoAlBBHkE9EBQgBEJ/NwNoDAQLIAQgBCgCUCgCECkDODcDaAwDCyAEKAJQKAIUKQM4Qv///////////wBWBEAgBCgCUEEeQT0QFCAEQn83A2gMAwsgBCAEKAJQKAIUKQM4NwNoDAILIAQpA1hC////////////AFYEQCAEKAJQQRJBABAUIARCfzcDaAwCCyAEKAJQKAIUIQEgBCgCYCEDIAQpA1ghAiAEKAJQIQUjAEHgAGsiACQAIAAgATYCVCAAIAM2AlAgACACNwNIIAAgBTYCRAJAIAApA0ggACgCVCkDOCAAKQNIfEL//wN8VgRAIAAoAkRBEkEAEBQgAEJ/NwNYDAELIAAgACgCVCgCBCAAKAJUKQMIp0EDdGopAwA3AyAgACkDICAAKAJUKQM4IAApA0h8VARAIAAgACgCVCkDCCAAKQNIIAApAyAgACgCVCkDOH19Qv//A3xCEIh8NwMYIAApAxggACgCVCkDEFYEQCAAIAAoAlQpAxA3AxAgACkDEFAEQCAAQhA3AxALA0AgACkDECAAKQMYVARAIAAgACkDEEIBhjcDEAwBCwsgACgCVCAAKQMQIAAoAkQQwgFBAXFFBEAgACgCREEOQQAQFCAAQn83A1gMAwsLA0AgACgCVCkDCCAAKQMYVARAQYCABBAYIQEgACgCVCgCACAAKAJUKQMIp0EEdGogATYCACABBEAgACgCVCgCACAAKAJUKQMIp0EEdGpCgIAENwMIIAAoAlQiASABKQMIQgF8NwMIIAAgACkDIEKAgAR8NwMgIAAoAlQoAgQgACgCVCkDCKdBA3RqIAApAyA3AwAMAgUgACgCREEOQQAQFCAAQn83A1gMBAsACwsLIAAgACgCVCkDQDcDMCAAIAAoAlQpAzggACgCVCgCBCAAKQMwp0EDdGopAwB9NwMoIABCADcDOANAIAApAzggACkDSFQEQCAAAn4gACkDSCAAKQM4fSAAKAJUKAIAIAApAzCnQQR0aikDCCAAKQMofVQEQCAAKQNIIAApAzh9DAELIAAoAlQoAgAgACkDMKdBBHRqKQMIIAApAyh9CzcDCCAAKAJUKAIAIAApAzCnQQR0aigCACAAKQMop2ogACgCUCAAKQM4p2ogACkDCKcQGRogACkDCCAAKAJUKAIAIAApAzCnQQR0aikDCCAAKQMofVEEQCAAIAApAzBCAXw3AzALIAAgACkDCCAAKQM4fDcDOCAAQgA3AygMAQsLIAAoAlQiASAAKQM4IAEpAzh8NwM4IAAoAlQgACkDMDcDQCAAKAJUKQM4IAAoAlQpAzBWBEAgACgCVCAAKAJUKQM4NwMwCyAAIAApAzg3A1gLIAApA1ghAiAAQeAAaiQAIAQgAjcDaAwBCyAEKAJQQRxBABAUIARCfzcDaAsgBCkDaCECIARB8ABqJAAgAgsHACAAKAIACxgAQaibAUIANwIAQbCbAUEANgIAQaibAQuGAQIEfwF+IwBBEGsiASQAAkAgACkDMFAEQAwBCwNAAkAgACAFQQAgAUEPaiABQQhqEIoBIgRBf0YNACABLQAPQQNHDQAgAiABKAIIQYCAgIB/cUGAgICAekZqIQILQX8hAyAEQX9GDQEgAiEDIAVCAXwiBSAAKQMwVA0ACwsgAUEQaiQAIAMLC4GNASMAQYAIC4EMaW5zdWZmaWNpZW50IG1lbW9yeQBuZWVkIGRpY3Rpb25hcnkALSsgICAwWDB4AC0wWCswWCAwWC0weCsweCAweABaaXAgYXJjaGl2ZSBpbmNvbnNpc3RlbnQASW52YWxpZCBhcmd1bWVudABpbnZhbGlkIGxpdGVyYWwvbGVuZ3RocyBzZXQAaW52YWxpZCBjb2RlIGxlbmd0aHMgc2V0AHVua25vd24gaGVhZGVyIGZsYWdzIHNldABpbnZhbGlkIGRpc3RhbmNlcyBzZXQAaW52YWxpZCBiaXQgbGVuZ3RoIHJlcGVhdABGaWxlIGFscmVhZHkgZXhpc3RzAHRvbyBtYW55IGxlbmd0aCBvciBkaXN0YW5jZSBzeW1ib2xzAGludmFsaWQgc3RvcmVkIGJsb2NrIGxlbmd0aHMAJXMlcyVzAGJ1ZmZlciBlcnJvcgBObyBlcnJvcgBzdHJlYW0gZXJyb3IAVGVsbCBlcnJvcgBJbnRlcm5hbCBlcnJvcgBTZWVrIGVycm9yAFdyaXRlIGVycm9yAGZpbGUgZXJyb3IAUmVhZCBlcnJvcgBabGliIGVycm9yAGRhdGEgZXJyb3IAQ1JDIGVycm9yAGluY29tcGF0aWJsZSB2ZXJzaW9uAG5hbgAvZGV2L3VyYW5kb20AaW52YWxpZCBjb2RlIC0tIG1pc3NpbmcgZW5kLW9mLWJsb2NrAGluY29ycmVjdCBoZWFkZXIgY2hlY2sAaW5jb3JyZWN0IGxlbmd0aCBjaGVjawBpbmNvcnJlY3QgZGF0YSBjaGVjawBpbnZhbGlkIGRpc3RhbmNlIHRvbyBmYXIgYmFjawBoZWFkZXIgY3JjIG1pc21hdGNoAGluZgBpbnZhbGlkIHdpbmRvdyBzaXplAFJlYWQtb25seSBhcmNoaXZlAE5vdCBhIHppcCBhcmNoaXZlAFJlc291cmNlIHN0aWxsIGluIHVzZQBNYWxsb2MgZmFpbHVyZQBpbnZhbGlkIGJsb2NrIHR5cGUARmFpbHVyZSB0byBjcmVhdGUgdGVtcG9yYXJ5IGZpbGUAQ2FuJ3Qgb3BlbiBmaWxlAE5vIHN1Y2ggZmlsZQBQcmVtYXR1cmUgZW5kIG9mIGZpbGUAQ2FuJ3QgcmVtb3ZlIGZpbGUAaW52YWxpZCBsaXRlcmFsL2xlbmd0aCBjb2RlAGludmFsaWQgZGlzdGFuY2UgY29kZQB1bmtub3duIGNvbXByZXNzaW9uIG1ldGhvZABzdHJlYW0gZW5kAENvbXByZXNzZWQgZGF0YSBpbnZhbGlkAE11bHRpLWRpc2sgemlwIGFyY2hpdmVzIG5vdCBzdXBwb3J0ZWQAT3BlcmF0aW9uIG5vdCBzdXBwb3J0ZWQARW5jcnlwdGlvbiBtZXRob2Qgbm90IHN1cHBvcnRlZABDb21wcmVzc2lvbiBtZXRob2Qgbm90IHN1cHBvcnRlZABFbnRyeSBoYXMgYmVlbiBkZWxldGVkAENvbnRhaW5pbmcgemlwIGFyY2hpdmUgd2FzIGNsb3NlZABDbG9zaW5nIHppcCBhcmNoaXZlIGZhaWxlZABSZW5hbWluZyB0ZW1wb3JhcnkgZmlsZSBmYWlsZWQARW50cnkgaGFzIGJlZW4gY2hhbmdlZABObyBwYXNzd29yZCBwcm92aWRlZABXcm9uZyBwYXNzd29yZCBwcm92aWRlZABVbmtub3duIGVycm9yICVkAHJiAHIrYgByd2EAJXMuWFhYWFhYAE5BTgBJTkYAQUUAMS4yLjExAC9wcm9jL3NlbGYvZmQvAC4AKG51bGwpADogAFBLBgcAUEsGBgBQSwUGAFBLAwQAUEsBAgAAAAAAAFIFAADZBwAArAgAAJEIAACCBQAApAUAAI0FAADFBQAAbwgAADQHAADpBAAAJAcAAAMHAACvBQAA4QYAAMsIAAA3CAAAQQcAAFoEAAC5BgAAcwUAAEEEAABXBwAAWAgAABcIAACnBgAA4ggAAPcIAAD/BwAAywYAAGgFAADBBwAAIABBmBQLEQEAAAABAAAAAQAAAAEAAAABAEG8FAsJAQAAAAEAAAACAEHoFAsBAQBBiBULAQEAQaIVC6REOiY7JmUmZiZjJmAmIiDYJcsl2SVCJkAmaiZrJjwmuiXEJZUhPCC2AKcArCWoIZEhkyGSIZAhHyKUIbIlvCUgACEAIgAjACQAJQAmACcAKAApACoAKwAsAC0ALgAvADAAMQAyADMANAA1ADYANwA4ADkAOgA7ADwAPQA+AD8AQABBAEIAQwBEAEUARgBHAEgASQBKAEsATABNAE4ATwBQAFEAUgBTAFQAVQBWAFcAWABZAFoAWwBcAF0AXgBfAGAAYQBiAGMAZABlAGYAZwBoAGkAagBrAGwAbQBuAG8AcABxAHIAcwB0AHUAdgB3AHgAeQB6AHsAfAB9AH4AAiPHAPwA6QDiAOQA4ADlAOcA6gDrAOgA7wDuAOwAxADFAMkA5gDGAPQA9gDyAPsA+QD/ANYA3ACiAKMApQCnIJIB4QDtAPMA+gDxANEAqgC6AL8AECOsAL0AvAChAKsAuwCRJZIlkyUCJSQlYSViJVYlVSVjJVElVyVdJVwlWyUQJRQlNCUsJRwlACU8JV4lXyVaJVQlaSVmJWAlUCVsJWclaCVkJWUlWSVYJVIlUyVrJWolGCUMJYglhCWMJZAlgCWxA98AkwPAA6MDwwO1AMQDpgOYA6kDtAMeIsYDtQMpImEisQBlImQiICMhI/cASCKwABkitwAaIn8gsgCgJaAAAAAAAJYwB3csYQ7uulEJmRnEbQeP9GpwNaVj6aOVZJ4yiNsOpLjceR7p1eCI2dKXK0y2Cb18sX4HLbjnkR2/kGQQtx3yILBqSHG5895BvoR91Noa6+TdbVG11PTHhdODVphsE8Coa2R6+WL97Mllik9cARTZbAZjYz0P+vUNCI3IIG47XhBpTORBYNVycWei0eQDPEfUBEv9hQ3Sa7UKpfqotTVsmLJC1sm720D5vKzjbNgydVzfRc8N1txZPdGrrDDZJjoA3lGAUdfIFmHQv7X0tCEjxLNWmZW6zw+lvbieuAIoCIgFX7LZDMYk6Quxh3xvLxFMaFirHWHBPS1mtpBB3HYGcdsBvCDSmCoQ1e+JhbFxH7W2BqXkv58z1LjooskHeDT5AA+OqAmWGJgO4bsNan8tPW0Il2xkkQFcY+b0UWtrYmFsHNgwZYVOAGLy7ZUGbHulARvB9AiCV8QP9cbZsGVQ6bcS6ri+i3yIufzfHd1iSS3aFfN804xlTNT7WGGyTc5RtTp0ALyj4jC71EGl30rXldg9bcTRpPv01tNq6WlD/NluNEaIZ63QuGDacy0EROUdAzNfTAqqyXwN3TxxBVCqQQInEBALvoYgDMkltWhXs4VvIAnUZrmf5GHODvneXpjJ2SkimNCwtKjXxxc9s1mBDbQuO1y9t61susAgg7jttrO/mgzitgOa0rF0OUfV6q930p0VJtsEgxbccxILY+OEO2SUPmptDahaanoLzw7knf8JkyeuAAqxngd9RJMP8NKjCIdo8gEe/sIGaV1XYvfLZ2WAcTZsGecGa252G9T+4CvTiVp62hDMSt1nb9+5+fnvvo5DvrcX1Y6wYOij1tZ+k9GhxMLYOFLy30/xZ7vRZ1e8pt0GtT9LNrJI2isN2EwbCq/2SgM2YHoEQcPvYN9V32eo745uMXm+aUaMs2HLGoNmvKDSbyU24mhSlXcMzANHC7u5FgIiLyYFVb47usUoC72yklq0KwRqs1yn/9fCMc/QtYue2Swdrt5bsMJkmybyY+yco2p1CpNtAqkGCZw/Ng7rhWcHchNXAAWCSr+VFHq44q4rsXs4G7YMm47Skg2+1eW379x8Id/bC9TS04ZC4tTx+LPdaG6D2h/NFr6BWya59uF3sG93R7cY5loIiHBqD//KOwZmXAsBEf+eZY9prmL40/9rYUXPbBZ44gqg7tIN11SDBE7CswM5YSZnp/cWYNBNR2lJ23duPkpq0a7cWtbZZgvfQPA72DdTrrypxZ673n/Pskfp/7UwHPK9vYrCusowk7NTpqO0JAU20LqTBtfNKVfeVL9n2SMuemazuEphxAIbaF2UK28qN74LtKGODMMb3wVaje8CLQAAAABBMRsZgmI2MsNTLSsExWxkRfR3fYanWlbHlkFPCIrZyEm7wtGK6O/6y9n04wxPtaxNfq61ji2Dns8cmIdREsJKECPZU9Nw9HiSQe9hVdeuLhTmtTfXtZgcloSDBVmYG4IYqQCb2/otsJrLNqldXXfmHGxs/98/QdSeDlrNoiSEleMVn4wgRrKnYXepvqbh6PHn0PPoJIPew2Wyxdqqrl1d659GRCjMa29p/XB2rmsxOe9aKiAsCQcLbTgcEvM2Rt+yB13GcVRw7TBla/T38yq7tsIxonWRHIk0oAeQ+7yfF7qNhA553qklOO+yPP9583O+SOhqfRvFQTwq3lgFT3nwRH5i6YctT8LGHFTbAYoVlEC7Do2D6COmwtk4vw3FoDhM9Lshj6eWCs6WjRMJAMxcSDHXRYti+m7KU+F3VF27uhVsoKPWP42Ilw6WkVCY194RqczH0vrh7JPL+vVc12JyHeZ5a961VECfhE9ZWBIOFhkjFQ/acDgkm0EjPadr/WXmWuZ8JQnLV2Q40E6jrpEB4p+KGCHMpzNg/bwqr+Ekre7QP7QtgxKfbLIJhqskSMnqFVPQKUZ++2h3ZeL2eT8vt0gkNnQbCR01KhIE8rxTS7ONSFJw3mV5Me9+YP7z5ue/wv3+fJHQ1T2gy8z6NoqDuweRmnhUvLE5ZaeoS5iDOwqpmCLJ+rUJiMuuEE9d718ObPRGzT/ZbYwOwnRDElrzAiNB6sFwbMGAQXfYR9c2lwbmLY7FtQClhIQbvBqKQXFbu1pomOh3Q9nZbFoeTy0VX342DJwtGyfdHAA+EgCYuVMxg6CQYq6L0VO1khbF9N1X9O/ElKfC79WW2fbpvAeuqI0ct2veMZwq7yqF7XlryqxIcNNvG134LipG4eE23magB8V/Y1ToVCJl803l87ICpMKpG2eRhDAmoJ8puK7F5Pmf3v06zPPWe/3oz7xrqYD9WrKZPgmfsn84hKuwJBws8RUHNTJGKh5zdzEHtOFwSPXQa1E2g0Z6d7JdY07X+ssP5uHSzLXM+Y2E1+BKEpavCyONtshwoJ2JQbuERl0jAwdsOBrEPxUxhQ4OKEKYT2cDqVR+wPp5VYHLYkwfxTiBXvQjmJ2nDrPclhWqGwBU5VoxT/yZYmLX2FN5zhdP4UlWfvpQlS3Xe9QczGITio0tUruWNJHoux/Q2aAG7PN+Xq3CZUdukUhsL6BTdeg2EjqpBwkjalQkCCtlPxHkeaeWpUi8j2YbkaQnKoq94LzL8qGN0Oti3v3AI+/m2b3hvBT80KcNP4OKJn6ykT+5JNBw+BXLaTtG5kJ6d/1btWtl3PRafsU3CVPudjhI97GuCbjwnxKhM8w/inL9JJMAAAAAN2rCAW7UhANZvkYC3KgJB+vCywayfI0EhRZPBbhREw6PO9EP1oWXDeHvVQxk+RoJU5PYCAotngo9R1wLcKMmHEfJ5B0ed6IfKR1gHqwLLxubYe0awt+rGPW1aRnI8jUS/5j3E6YmsRGRTHMQFFo8FSMw/hR6jrgWTeR6F+BGTTjXLI85jpLJO7n4Czo87kQ/C4SGPlI6wDxlUAI9WBdeNm99nDc2w9o1AakYNIS/VzGz1ZUw6mvTMt0BETOQ5Wskp4+pJf4x7yfJWy0mTE1iI3snoCIimeYgFfMkISi0eCof3rorRmD8KXEKPij0HHEtw3azLJrI9S6tojcvwI2acPfnWHGuWR5zmTPcchwlk3crT1F2cvEXdEWb1XV43Il+T7ZLfxYIDX0hYs98pHSAeZMeQnjKoAR6/crGe7AuvGyHRH5t3vo4b+mQ+m5shrVrW+x3agJSMWg1OPNpCH+vYj8VbWNmqythUcHpYNTXpmXjvWRkugMiZo1p4Gcgy9dIF6EVSU4fU0t5dZFK/GPeT8sJHE6St1pMpd2YTZiaxEav8AZH9k5ARcEkgkREMs1Bc1gPQCrmSUIdjItDUGjxVGcCM1U+vHVXCda3VozA+FO7qjpS4hR8UNV+vlHoOeJa31MgW4btZlmxh6RYNJHrXQP7KVxaRW9ebS+tX4AbNeG3cffg7s+x4tmlc+Ncszzma9n+5zJnuOUFDXrkOEom7w8g5O5WnqLsYfRg7eTiL+jTiO3pijar671caerwuBP9x9LR/J5sl/6pBlX/LBAa+ht62PtCxJ75da5c+EjpAPN/g8LyJj2E8BFXRvGUQQn0oyvL9fqVjffN/0/2YF142Vc3utgOifzaOeM+27z1cd6Ln7Pf0iH13eVLN9zYDGvX72ap1rbY79SBsi3VBKRi0DPOoNFqcObTXRok0hD+XsUnlJzEfiraxklAGMfMVlfC+zyVw6KC08GV6BHAqK9Ny5/Fj8rGe8nI8RELyXQHRMxDbYbNGtPAzy25As5Alq+Rd/xtkC5CK5IZKOmTnD6mlqtUZJfy6iKVxYDglPjHvJ/PrX6elhM4nKF5+p0kb7WYEwV3mUq7MZt90fOaMDWJjQdfS4xe4Q2OaYvPj+ydgIrb90KLgkkEibUjxoiIZJqDvw5YguawHoDR2tyBVMyThGOmUYU6GBeHDXLVhqDQ4qmXuiCozgRmqvlupKt8eOuuSxIprxKsb60lxq2sGIHxpy/rM6Z2VXWkQT+3pcQp+KDzQzqhqv18o52XvqLQc8S15xkGtL6nQLaJzYK3DNvNsjuxD7NiD0mxVWWLsGgi17tfSBW6BvZTuDGckbm0it68g+AcvdpeWr/tNJi+AAAAAGVnvLiLyAmq7q+1EleXYo8y8N433F9rJbk4153vKLTFik8IfWTgvW8BhwHXuL/WSt3YavIzd9/gVhBjWJ9XGVD6MKXoFJ8Q+nH4rELIwHvfrafHZ0MIcnUmb87NcH+tlRUYES37t6Q/ntAYhyfozxpCj3OirCDGsMlHegg+rzKgW8iOGLVnOwrQAIeyaThQLwxf7Jfi8FmFh5flPdGHhmW04DrdWk+Pzz8oM3eGEOTq43dYUg3Y7UBov1H4ofgr8MSfl0gqMCJaT1ee4vZvSX+TCPXHfadA1RjA/G1O0J81K7cjjcUYlp+gfyonGUf9unwgQQKSj/QQ9+hIqD1YFJtYP6gjtpAdMdP3oYlqz3YUD6jKrOEHf76EYMMG0nCgXrcXHOZZuKn0PN8VTIXnwtHggH5pDi/Le2tId8OiDw3Lx2ixcynHBGFMoLjZ9ZhvRJD/0/x+UGbuGzfaVk0nuQ4oQAW2xu+wpKOIDBwasNuBf9dnOZF40iv0H26TA/cmO2aQmoOIPy+R7ViTKVRgRLQxB/gM36hNHrrP8abs35L+ibguRmcXm1QCcCfsu0jwcd4vTMkwgPnbVedFY5ygP2v5x4PTF2g2wXIPinnLN13krlDhXED/VE4lmOj2c4iLrhbvNxb4QIIEnSc+vCQf6SFBeFWZr9fgi8qwXDM7tlntXtHlVbB+UEfVGez/bCE7YglGh9rn6TLIgo6OcNSe7Six+VGQX1bkgjoxWDqDCY+n5m4zHwjBhg1tpjq1pOFAvcGG/AUvKUkXSk71r/N2IjKWEZ6KeL4rmB3ZlyBLyfR4Lq5IwMAB/dKlZkFqHF6W93k5Kk+Xlp9d8vEj5QUZa01gftf1jtFi5+u23l9SjgnCN+m1etlGAGi8IbzQ6jHfiI9WYzBh+dYiBJ5qmr2mvQfYwQG/Nm60rVMJCBWaTnId/ynOpRGGe7d04ccPzdkQkqi+rCpGERk4I3algHVmxtgQAXpg/q7PcpvJc8oi8aRXR5YY76k5rf3MXhFFBu5NdmOJ8c6NJkTc6EH4ZFF5L/k0HpNB2rEmU7/WmuvpxvmzjKFFC2IO8BkHaUyhvlGbPNs2J4Q1mZKWUP4uLpm5VCb83uieEnFdjHcW4TTOLjapq0mKEUXmPwMggYO7dpHg4xP2XFv9WelJmD5V8SEGgmxEYT7Uqs6Lxs+pN344QX/WXSbDbrOJdnzW7srEb9YdWQqxoeHkHhTzgXmoS9dpyxOyDnerXKHCuTnGfgGA/qmc5ZkVJAs2oDZuURyOpxZmhsJx2j4s3m8sSbnTlPCBBAmV5rixe0kNox4usRtIPtJDLVlu+8P22+mmkWdRH6mwzHrODHSUYblm8QYF3gAAAAB3BzCW7g5hLJkJUboHbcQZcGr0j+ljpTWeZJWjDtuIMnncuKTg1ekel9LZiAm2TCt+sXy957gtB5C/HZEdtxBkarAg8vO5cUiEvkHeGtrUfW3d5Ov01LVRg9OFxxNsmFZka6jA/WL5eoplyewUAVxPYwZs2foPPWONCA31O24gyExpEF7VYEHkomdxcjwD5NFLBNRH0g2F/aUKtWs1taj6QrKYbNu7ydasvPlAMths40XfXHXc1g3Pq9E9WSbZMKxR3gA6yNdRgL/QYRYhtPS1VrPEI8+6lZm4vaUPKAK4nl8FiAjGDNmysQvpJC9vfIdYaEwRwWEdq7ZmLT123EGQAdtxBpjSILzv1RAqcbGFiQa2tR+fv+Sl6LjUM3gHyaIPAPk0lgmojuEOmBh/ag27CG09LZFkbJfmY1wBa2tR9BxsYWKFZTDY8mIATmwGle0bAaV7ggj0wfUPxFdlsNnGErfpUIu+uOr8uYh8Yt0d3xXaLUmM03zz+9RMZU2yYVg6tVHOo7wAdNS7MOJK36VBPdiV16TRxG3T1vT7Q2npajRu2fytZ4hG2mC40EQELXMzAx3lqgpMX90NfMlQBXE8JwJBqr4LEBDJDCCGV2i1JSBvhbO5ZtQJzmHkn17e+Q4p2cmYsNCYIsfXqLRZsz0XLrQNgbe9XDvAumyt7biDIJq/s7YDtuIMdLHSmurVRzmd0nevBNsmFXPcFoPjYwsSlGQ7hA1taj56alqo5A7PC5MJ/50KAK4nfQeesfAPk0SHCKPSHgHyaGkGwv73YlddgGVnyxlsNnFuawbn/tQbdonTK+AQ2npaZ91KzPm532+Ovu/5F7e+Q2CwjtXW1qPoodGTfjjYwsRP3/JS0btn8aa8V2c/tQbdSLI2S9gNK9qvChtMNgNK9kEEemDfYO/DqGffVTFuju9Gab55y2GzjLxmgxolb9KgUmjiNswMd5W7C0cDIgIWuVUFJi/Fuju+sr0LKCu0WpJcs2oEwtf/p7XQzzEs2Z6LW96uHZtkwrDsY/ImdWqjnAJtkwqcCQap6w42P3IHZ4UFAFcTlb9KguK4ehR7sSuuDLYbOJLSjpvl1b4NfNzvtwvb3yGG09LU8dTiQmjds/gf2oNugb4Wzfa5JltvsHfhGLdHd4gIWub/D2pwZgY7yhEBC1yPZZ7/+GKuaWFr/9MWbM9FoArieNcN0u5OBINUOQOzwqdnJmHQYBb3SWlHTT5ud9uu0WpK2dZa3EDfC2Y32DvwqbyuU967nsVHss9/MLX/6b298hzKusKKU7OTMCS0o6a60DYFzdcGk1TeVykj2We/s2Z6LsRhSrhdaBsCKm8rlLQLvjfDDI6hWgXfGy0C740AAAAAGRsxQTI2YoIrLVPDZGzFBH139EVWWqeGT0GWx8jZigjRwrtJ+u/oiuP02custU8Mta5+TZ6DLY6HmBzPSsISUVPZIxB49HDTYe9Bki6u11U3teYUHJi11wWDhJaCG5hZmwCpGLAt+tupNsua5nddXf9sbBzUQT/fzVoOnpWEJKKMnxXjp7JGIL6pd2Hx6OGm6PPQ58PegyTaxbJlXV2uqkRGn+tva8wodnD9aTkxa64gKlrvCwcJLBIcOG3fRjbzxl0Hsu1wVHH0a2Uwuyrz96IxwraJHJF1kAegNBefvPsOhI26JaneeTyy7zhz83n/auhIvkHFG31Y3io88HlPBelifkTCTy2H21QcxpQVigGNDrtApiPog7842cI4oMUNIbv0TAqWp48TjZbOXMwACUXXMUhu+mKLd+FTyrq7XVSjoGwViI0/1pGWDpfe15hQx8ypEezh+tL1+suTcmLXXGt55h1AVLXeWU+EnxYOElgPFSMZJDhw2j0jQZtl/WunfOZa5lfLCSVO0DhkAZGuoxiKn+Izp8whKrz9YK0k4a+0P9DunxKDLYYJsmzJSCSr0FMV6vt+RiniZXdoLz959jYkSLcdCRt0BBIqNUtTvPJSSI2zeWXecGB+7zHn5vP+/v3Cv9XQkXzMy6A9g4o2+pqRB7uxvFR4qKdlOTuDmEsimKkKCbX6yRCuy4hf711PRvRsDm3ZP810wg6M81oSQ+pBIwLBbHDB2HdBgJc210eOLeYGpQC1xbwbhIRxQYoaaFq7W0N36JhabNnZFS1PHgw2fl8nGy2cPgAc3bmYABKggzFTi65ikJK1U9Hd9MUWxO/0V+/Cp5T22ZbVrge86bccjaicMd5rhSrvKspree3TcEis+F0bb+FGKi5m3jbhf8UHoFToVGNN82UiArLz5RupwqQwhJFnKZ+gJuTFrrj93p/51vPMOs/o/XuAqWu8mbJa/bKfCT6rhDh/LBwksDUHFfEeKkYyBzF3c0hw4bRRa9D1ekaDNmNdsnfL+tdO0uHmD/nMtczg14SNr5YSSraNIwudoHDIhLtBiQMjXUYaOGwHMRU/xCgODoVnT5hCflSpA1V5+sBMYsuBgTjFH5gj9F6zDqedqhWW3OVUABv8TzFa12Jimc55U9hJ4U8XUPp+VnvXLZVizBzULY2KEzSWu1Ifu+iRBqDZ0F5+8+xHZcKtbEiRbnVToC86EjboIwkHqQgkVGoRP2Urlqd55I+8SKWkkRtmvYoqJ/LLvODr0I2hwP3eYtnm7yMUvOG9DafQ/CaKgz8/kbJ+cNAkuWnLFfhC5kY7W/13etxla7XFflr07lMJN/dIOHa4Ca6xoRKf8Io/zDOTJP1yAAAAAAHCajcDhNRuAka+WQcJqNwGy8LrBI18sgVPFoUOE1G4D9E7jw2XhdYMVe/hCRr5ZAjYk1MKni0KC1xHPRwmo3Ad5MlHH6J3Hh5gHSkbLwusGu1hmxir38IZabX1EjXyyBP3mP8RsSamEHNMkRU8WhQU/jAjFriOehd65E04TUbgOY8s1zvJko46C/i5P0TuPD6GhAs8wDpSPQJQZTZeF1g3nH1vNdrDNjQYqQExV7+EMJXVszLTa+ozEQHdJGvlkCWpj6cn7zH+Ji1bySNiTUwioCd7IOaZIiEk8xUqeLQoK7reHyn8YEYoPgpxLXEc9CyzdsMu9ciaLzeirXCajcBxWOf3cx5ZrnLcM5l3kyUcdlFPK3QX8XJ11ZtFfonceH9Ltk99DQgWfM9iIXmAdKR4Qh6TegSgynvGyv1svC6wbX5Eh284+t5u+pDpa7WGbGp37FtoMVICafM4NWKvfwhjbRU/YSurZmDpwVFlptfUZGS942YiA7pn4GmNSNfLIEkVoRdLUx9OSpF1eU/eY/xOHAnLTFq3kk2Y3aVGxJqYRwbwr0VATvZEgiTBQc0yREAPWHNCSeYqQ4uMHVTxaFBVMwJnV3W8Pla31glT+MCMUjqqu1B8FOJRvn7VWuI56FsgU99ZZu2GWKSHsV3rkTRcKfsDXm9FWl+tL23hNRuA4Pdxt+Kxz+7jc6XZ5jyzXOf+2WvluGcy5HoNBe8mSjju5CAP7KKeVu1g9GHoL+Lk6e2I0+urNorqaVy9/RO48PzR0sf+l2ye/1UGqfoaECz72Hob+Z7EQvhcrnXzAOlI8sKDf/CEPSbxRlcR9AlBlPXLK6P3jZX69k//zdl4XWDYujdX2vyJDts+4znecfW837Ofi931IdLcN0vl12sM2NapZu/U79i21S2ygdBipATRoM4z0+ZwatIkGl3FXv4QxJyUJ8baKn7HGEBJwldWzMOVPPvB04KiwBHolctNr6jKj8WfyMl7xskLEfHMRAd0zYZtQ8/A0xrOArktka+WQJBt/HeSK0Iuk+koGZamPpyXZFSrlSLq8pTggMWfvMf4nn6tz5w4E5ad+nmhmLVvJJl3BRObMbtKmvPRfY2JNTCMS18Hjg3hXo/Pi2mKgJ3si0L324kESYKIxiO1g5pkiIJYDr+AHrDmgdza0YSTzFSFUaZjhxcYOobVcg2p4tCgqCC6l6pmBM6rpG75rut4fK8pEkutb6wSrK3GJafxgRimM+svpHVVdqW3P0Gg+CnEoTpD86N8/aqivpedtcRz0LQGGee2QKe+t4LNibLN2wyzD7E7sUkPYrCLZVW71yJouhVIX7hT9ga5kZwxvN6KtL0c4IO/Wl7avpg07QAAAAC4vGdlqgnIixK1r+6PYpdXN97wMiVrX9yd1zi5xbQo730IT4pvveBk1wGHAUrWv7jyatjd4N93M1hjEFZQGVef6KUw+voQnxRCrPhx33vAyGfHp611cghDzc5vJpWtf3AtERgVP6S3+4cY0J4az+gnonOPQrDGIKwIekfJoDKvPhiOyFsKO2e1socA0C9QOGmX7F8MhVnw4j3ll4dlhofR3TrgtM+PT1p3Myg/6uQQhlJYd+NA7dgN+FG/aPAr+KFIl5/EWiIwKuKeV09/SW/2x/UIk9VAp31t/MAYNZ/QTo0jtyuflhjFJyp/oLr9RxkCQSB8EPSPkqhI6PebFFg9I6g/WDEdkLaJoffTFHbPaqzKqA++fwfhBsNghF6gcNLmHBe39Km4WUwV3zzRwueFaX6A4HvLLw7Dd0hryw0PonOxaMdhBMcp2bigTERvmPX80/+Q7mZQflbaNxsOuSdNtgVAKKSw78YcDIijgduwGjln138r0niRk24f9Dsm9wODmpBmkS8/iCmTWO20RGBUDPgHMR5NqN+m8c+6/pLf7EYuuIlUmxdn7CdwAnHwSLvJTC/e2/mAMGNF51VrP6Cc04PH+cE2aBd5ig9y5F03y1zhUK5OVP9A9uiYJa6LiHMWN+8WBIJA+Lw+J50h6R8kmVV4QYvg168zXLDK7Vm2O1Xl0V5HUH6w/+wZ1WI7IWzah0YJyDLp53COjoIo7Z7UkFH5sYLkVl86WDE6p48Jgx8zbuYNhsEItTqmbb1A4aQF/IbBF0kpL6/1TkoyInbzip4Rlpgrvnggl9kdePTJS8BIri7S/QHAakFmpfeWXhxPKjl5XZ+Wl+Uj8fJNaxkF9dd+YOdi0Y5f3rbrwgmOUnq16TdoAEbZ0LwhvIjfMeowY1aPItb5YZpqngQHvaa9vwHB2K20bjYVCAlTHXJOmqXOKf+3e4YRD8fhdJIQ2c0qrL6oOBkRRoCldiPYxmZ1YHoBEHLPrv7Kc8mbV6TxIu8Ylkf9rTmpRRFezHZN7gbO8Ylj3EQmjWT4Qej5L3lRQZMeNFMmsdrrmta/s/nG6QtFoYwZ8A5ioUxpBzybUb6EJzbblpKZNS4u/lAmVLmZnuje/IxdcRI04RZ3qTYuzhGKSasDP+ZFu4OBIOPgkXZbXPYTSelZ/fFVPphsggYh1D5hRMaLzqp+N6nP1n9BOG7DJl18domzxMru1lkd1m/hobEK8xQe5EuoeYETy2nXq3cOsrnCoVwBfsY5nKn+gCQVmeU2oDYLjhxRboZmFqc+2nHCLG/eLJTTuUkJBIHwsbjmlaMNSXsbsS4eQ9I+SPtuWS3p2/bDUWeRpsywqR90DM56ZrlhlN4FBvEUBAAAtgcAAHoJAACZBQAAWwUAALoFAAAABAAARQUAAM8FAAB6CQBB0dkAC7YQAQIDBAQFBQYGBgYHBwcHCAgICAgICAgJCQkJCQkJCQoKCgoKCgoKCgoKCgoKCgoLCwsLCwsLCwsLCwsLCwsLDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwNDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PAAAQERISExMUFBQUFRUVFRYWFhYWFhYWFxcXFxcXFxcYGBgYGBgYGBgYGBgYGBgYGRkZGRkZGRkZGRkZGRkZGRoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxscHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHQABAgMEBQYHCAgJCQoKCwsMDAwMDQ0NDQ4ODg4PDw8PEBAQEBAQEBARERERERERERISEhISEhISExMTExMTExMUFBQUFBQUFBQUFBQUFBQUFRUVFRUVFRUVFRUVFRUVFRYWFhYWFhYWFhYWFhYWFhYXFxcXFxcXFxcXFxcXFxcXGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxwQMAAAEDUAAAEBAAAeAQAADwAAAJA0AACQNQAAAAAAAB4AAAAPAAAAAAAAABA2AAAAAAAAEwAAAAcAAAAAAAAADAAIAIwACABMAAgAzAAIACwACACsAAgAbAAIAOwACAAcAAgAnAAIAFwACADcAAgAPAAIALwACAB8AAgA/AAIAAIACACCAAgAQgAIAMIACAAiAAgAogAIAGIACADiAAgAEgAIAJIACABSAAgA0gAIADIACACyAAgAcgAIAPIACAAKAAgAigAIAEoACADKAAgAKgAIAKoACABqAAgA6gAIABoACACaAAgAWgAIANoACAA6AAgAugAIAHoACAD6AAgABgAIAIYACABGAAgAxgAIACYACACmAAgAZgAIAOYACAAWAAgAlgAIAFYACADWAAgANgAIALYACAB2AAgA9gAIAA4ACACOAAgATgAIAM4ACAAuAAgArgAIAG4ACADuAAgAHgAIAJ4ACABeAAgA3gAIAD4ACAC+AAgAfgAIAP4ACAABAAgAgQAIAEEACADBAAgAIQAIAKEACABhAAgA4QAIABEACACRAAgAUQAIANEACAAxAAgAsQAIAHEACADxAAgACQAIAIkACABJAAgAyQAIACkACACpAAgAaQAIAOkACAAZAAgAmQAIAFkACADZAAgAOQAIALkACAB5AAgA+QAIAAUACACFAAgARQAIAMUACAAlAAgApQAIAGUACADlAAgAFQAIAJUACABVAAgA1QAIADUACAC1AAgAdQAIAPUACAANAAgAjQAIAE0ACADNAAgALQAIAK0ACABtAAgA7QAIAB0ACACdAAgAXQAIAN0ACAA9AAgAvQAIAH0ACAD9AAgAEwAJABMBCQCTAAkAkwEJAFMACQBTAQkA0wAJANMBCQAzAAkAMwEJALMACQCzAQkAcwAJAHMBCQDzAAkA8wEJAAsACQALAQkAiwAJAIsBCQBLAAkASwEJAMsACQDLAQkAKwAJACsBCQCrAAkAqwEJAGsACQBrAQkA6wAJAOsBCQAbAAkAGwEJAJsACQCbAQkAWwAJAFsBCQDbAAkA2wEJADsACQA7AQkAuwAJALsBCQB7AAkAewEJAPsACQD7AQkABwAJAAcBCQCHAAkAhwEJAEcACQBHAQkAxwAJAMcBCQAnAAkAJwEJAKcACQCnAQkAZwAJAGcBCQDnAAkA5wEJABcACQAXAQkAlwAJAJcBCQBXAAkAVwEJANcACQDXAQkANwAJADcBCQC3AAkAtwEJAHcACQB3AQkA9wAJAPcBCQAPAAkADwEJAI8ACQCPAQkATwAJAE8BCQDPAAkAzwEJAC8ACQAvAQkArwAJAK8BCQBvAAkAbwEJAO8ACQDvAQkAHwAJAB8BCQCfAAkAnwEJAF8ACQBfAQkA3wAJAN8BCQA/AAkAPwEJAL8ACQC/AQkAfwAJAH8BCQD/AAkA/wEJAAAABwBAAAcAIAAHAGAABwAQAAcAUAAHADAABwBwAAcACAAHAEgABwAoAAcAaAAHABgABwBYAAcAOAAHAHgABwAEAAcARAAHACQABwBkAAcAFAAHAFQABwA0AAcAdAAHAAMACACDAAgAQwAIAMMACAAjAAgAowAIAGMACADjAAgAAAAFABAABQAIAAUAGAAFAAQABQAUAAUADAAFABwABQACAAUAEgAFAAoABQAaAAUABgAFABYABQAOAAUAHgAFAAEABQARAAUACQAFABkABQAFAAUAFQAFAA0ABQAdAAUAAwAFABMABQALAAUAGwAFAAcABQAXAAUAQbDqAAtNAQAAAAEAAAABAAAAAQAAAAIAAAACAAAAAgAAAAIAAAADAAAAAwAAAAMAAAADAAAABAAAAAQAAAAEAAAABAAAAAUAAAAFAAAABQAAAAUAQaDrAAtlAQAAAAEAAAACAAAAAgAAAAMAAAADAAAABAAAAAQAAAAFAAAABQAAAAYAAAAGAAAABwAAAAcAAAAIAAAACAAAAAkAAAAJAAAACgAAAAoAAAALAAAACwAAAAwAAAAMAAAADQAAAA0AQdDsAAsjAgAAAAMAAAAHAAAAAAAAABAREgAIBwkGCgULBAwDDQIOAQ8AQYTtAAtpAQAAAAIAAAADAAAABAAAAAUAAAAGAAAABwAAAAgAAAAKAAAADAAAAA4AAAAQAAAAFAAAABgAAAAcAAAAIAAAACgAAAAwAAAAOAAAAEAAAABQAAAAYAAAAHAAAACAAAAAoAAAAMAAAADgAEGE7gALegEAAAACAAAAAwAAAAQAAAAGAAAACAAAAAwAAAAQAAAAGAAAACAAAAAwAAAAQAAAAGAAAACAAAAAwAAAAAABAACAAQAAAAIAAAADAAAABAAAAAYAAAAIAAAADAAAABAAAAAYAAAAIAAAADAAAABAAAAAYAAAMS4yLjExAEGI7wALbQcAAAAEAAQACAAEAAgAAAAEAAUAEAAIAAgAAAAEAAYAIAAgAAgAAAAEAAQAEAAQAAkAAAAIABAAIAAgAAkAAAAIABAAgACAAAkAAAAIACAAgAAAAQkAAAAgAIAAAgEABAkAAAAgAAIBAgEAEAkAQYDwAAulAgMABAAFAAYABwAIAAkACgALAA0ADwARABMAFwAbAB8AIwArADMAOwBDAFMAYwBzAIMAowDDAOMAAgEAAAAAAAAQABAAEAAQABAAEAAQABAAEQARABEAEQASABIAEgASABMAEwATABMAFAAUABQAFAAVABUAFQAVABAATQDKAAAAAQACAAMABAAFAAcACQANABEAGQAhADEAQQBhAIEAwQABAYEBAQIBAwEEAQYBCAEMARABGAEgATABQAFgAAAAABAAEAAQABAAEQARABIAEgATABMAFAAUABUAFQAWABYAFwAXABgAGAAZABkAGgAaABsAGwAcABwAHQAdAEAAQAAQABEAEgAAAAgABwAJAAYACgAFAAsABAAMAAMADQACAA4AAQAPAEGw8gALwRFgBwAAAAhQAAAIEAAUCHMAEgcfAAAIcAAACDAAAAnAABAHCgAACGAAAAggAAAJoAAACAAAAAiAAAAIQAAACeAAEAcGAAAIWAAACBgAAAmQABMHOwAACHgAAAg4AAAJ0AARBxEAAAhoAAAIKAAACbAAAAgIAAAIiAAACEgAAAnwABAHBAAACFQAAAgUABUI4wATBysAAAh0AAAINAAACcgAEQcNAAAIZAAACCQAAAmoAAAIBAAACIQAAAhEAAAJ6AAQBwgAAAhcAAAIHAAACZgAFAdTAAAIfAAACDwAAAnYABIHFwAACGwAAAgsAAAJuAAACAwAAAiMAAAITAAACfgAEAcDAAAIUgAACBIAFQijABMHIwAACHIAAAgyAAAJxAARBwsAAAhiAAAIIgAACaQAAAgCAAAIggAACEIAAAnkABAHBwAACFoAAAgaAAAJlAAUB0MAAAh6AAAIOgAACdQAEgcTAAAIagAACCoAAAm0AAAICgAACIoAAAhKAAAJ9AAQBwUAAAhWAAAIFgBACAAAEwczAAAIdgAACDYAAAnMABEHDwAACGYAAAgmAAAJrAAACAYAAAiGAAAIRgAACewAEAcJAAAIXgAACB4AAAmcABQHYwAACH4AAAg+AAAJ3AASBxsAAAhuAAAILgAACbwAAAgOAAAIjgAACE4AAAn8AGAHAAAACFEAAAgRABUIgwASBx8AAAhxAAAIMQAACcIAEAcKAAAIYQAACCEAAAmiAAAIAQAACIEAAAhBAAAJ4gAQBwYAAAhZAAAIGQAACZIAEwc7AAAIeQAACDkAAAnSABEHEQAACGkAAAgpAAAJsgAACAkAAAiJAAAISQAACfIAEAcEAAAIVQAACBUAEAgCARMHKwAACHUAAAg1AAAJygARBw0AAAhlAAAIJQAACaoAAAgFAAAIhQAACEUAAAnqABAHCAAACF0AAAgdAAAJmgAUB1MAAAh9AAAIPQAACdoAEgcXAAAIbQAACC0AAAm6AAAIDQAACI0AAAhNAAAJ+gAQBwMAAAhTAAAIEwAVCMMAEwcjAAAIcwAACDMAAAnGABEHCwAACGMAAAgjAAAJpgAACAMAAAiDAAAIQwAACeYAEAcHAAAIWwAACBsAAAmWABQHQwAACHsAAAg7AAAJ1gASBxMAAAhrAAAIKwAACbYAAAgLAAAIiwAACEsAAAn2ABAHBQAACFcAAAgXAEAIAAATBzMAAAh3AAAINwAACc4AEQcPAAAIZwAACCcAAAmuAAAIBwAACIcAAAhHAAAJ7gAQBwkAAAhfAAAIHwAACZ4AFAdjAAAIfwAACD8AAAneABIHGwAACG8AAAgvAAAJvgAACA8AAAiPAAAITwAACf4AYAcAAAAIUAAACBAAFAhzABIHHwAACHAAAAgwAAAJwQAQBwoAAAhgAAAIIAAACaEAAAgAAAAIgAAACEAAAAnhABAHBgAACFgAAAgYAAAJkQATBzsAAAh4AAAIOAAACdEAEQcRAAAIaAAACCgAAAmxAAAICAAACIgAAAhIAAAJ8QAQBwQAAAhUAAAIFAAVCOMAEwcrAAAIdAAACDQAAAnJABEHDQAACGQAAAgkAAAJqQAACAQAAAiEAAAIRAAACekAEAcIAAAIXAAACBwAAAmZABQHUwAACHwAAAg8AAAJ2QASBxcAAAhsAAAILAAACbkAAAgMAAAIjAAACEwAAAn5ABAHAwAACFIAAAgSABUIowATByMAAAhyAAAIMgAACcUAEQcLAAAIYgAACCIAAAmlAAAIAgAACIIAAAhCAAAJ5QAQBwcAAAhaAAAIGgAACZUAFAdDAAAIegAACDoAAAnVABIHEwAACGoAAAgqAAAJtQAACAoAAAiKAAAISgAACfUAEAcFAAAIVgAACBYAQAgAABMHMwAACHYAAAg2AAAJzQARBw8AAAhmAAAIJgAACa0AAAgGAAAIhgAACEYAAAntABAHCQAACF4AAAgeAAAJnQAUB2MAAAh+AAAIPgAACd0AEgcbAAAIbgAACC4AAAm9AAAIDgAACI4AAAhOAAAJ/QBgBwAAAAhRAAAIEQAVCIMAEgcfAAAIcQAACDEAAAnDABAHCgAACGEAAAghAAAJowAACAEAAAiBAAAIQQAACeMAEAcGAAAIWQAACBkAAAmTABMHOwAACHkAAAg5AAAJ0wARBxEAAAhpAAAIKQAACbMAAAgJAAAIiQAACEkAAAnzABAHBAAACFUAAAgVABAIAgETBysAAAh1AAAINQAACcsAEQcNAAAIZQAACCUAAAmrAAAIBQAACIUAAAhFAAAJ6wAQBwgAAAhdAAAIHQAACZsAFAdTAAAIfQAACD0AAAnbABIHFwAACG0AAAgtAAAJuwAACA0AAAiNAAAITQAACfsAEAcDAAAIUwAACBMAFQjDABMHIwAACHMAAAgzAAAJxwARBwsAAAhjAAAIIwAACacAAAgDAAAIgwAACEMAAAnnABAHBwAACFsAAAgbAAAJlwAUB0MAAAh7AAAIOwAACdcAEgcTAAAIawAACCsAAAm3AAAICwAACIsAAAhLAAAJ9wAQBwUAAAhXAAAIFwBACAAAEwczAAAIdwAACDcAAAnPABEHDwAACGcAAAgnAAAJrwAACAcAAAiHAAAIRwAACe8AEAcJAAAIXwAACB8AAAmfABQHYwAACH8AAAg/AAAJ3wASBxsAAAhvAAAILwAACb8AAAgPAAAIjwAACE8AAAn/ABAFAQAXBQEBEwURABsFARARBQUAGQUBBBUFQQAdBQFAEAUDABgFAQIUBSEAHAUBIBIFCQAaBQEIFgWBAEAFAAAQBQIAFwWBARMFGQAbBQEYEQUHABkFAQYVBWEAHQUBYBAFBAAYBQEDFAUxABwFATASBQ0AGgUBDBYFwQBABQAAEQAKABEREQAAAAAFAAAAAAAACQAAAAALAAAAAAAAAAARAA8KERERAwoHAAEACQsLAAAJBgsAAAsABhEAAAAREREAQYGEAQshCwAAAAAAAAAAEQAKChEREQAKAAACAAkLAAAACQALAAALAEG7hAELAQwAQceEAQsVDAAAAAAMAAAAAAkMAAAAAAAMAAAMAEH1hAELAQ4AQYGFAQsVDQAAAAQNAAAAAAkOAAAAAAAOAAAOAEGvhQELARAAQbuFAQseDwAAAAAPAAAAAAkQAAAAAAAQAAAQAAASAAAAEhISAEHyhQELDhIAAAASEhIAAAAAAAAJAEGjhgELAQsAQa+GAQsVCgAAAAAKAAAAAAkLAAAAAAALAAALAEHdhgELAQwAQemGAQsnDAAAAAAMAAAAAAkMAAAAAAAMAAAMAAAwMTIzNDU2Nzg5QUJDREVGAEG0hwELARkAQduHAQsF//////8AQaCIAQtXGRJEOwI/LEcUPTMwChsGRktFNw9JDo4XA0AdPGkrNh9KLRwBICUpIQgMFRYiLhA4Pgs0MRhkdHV2L0EJfzkRI0MyQomKiwUEJignDSoeNYwHGkiTE5SVAEGAiQELig5JbGxlZ2FsIGJ5dGUgc2VxdWVuY2UARG9tYWluIGVycm9yAFJlc3VsdCBub3QgcmVwcmVzZW50YWJsZQBOb3QgYSB0dHkAUGVybWlzc2lvbiBkZW5pZWQAT3BlcmF0aW9uIG5vdCBwZXJtaXR0ZWQATm8gc3VjaCBmaWxlIG9yIGRpcmVjdG9yeQBObyBzdWNoIHByb2Nlc3MARmlsZSBleGlzdHMAVmFsdWUgdG9vIGxhcmdlIGZvciBkYXRhIHR5cGUATm8gc3BhY2UgbGVmdCBvbiBkZXZpY2UAT3V0IG9mIG1lbW9yeQBSZXNvdXJjZSBidXN5AEludGVycnVwdGVkIHN5c3RlbSBjYWxsAFJlc291cmNlIHRlbXBvcmFyaWx5IHVuYXZhaWxhYmxlAEludmFsaWQgc2VlawBDcm9zcy1kZXZpY2UgbGluawBSZWFkLW9ubHkgZmlsZSBzeXN0ZW0ARGlyZWN0b3J5IG5vdCBlbXB0eQBDb25uZWN0aW9uIHJlc2V0IGJ5IHBlZXIAT3BlcmF0aW9uIHRpbWVkIG91dABDb25uZWN0aW9uIHJlZnVzZWQASG9zdCBpcyBkb3duAEhvc3QgaXMgdW5yZWFjaGFibGUAQWRkcmVzcyBpbiB1c2UAQnJva2VuIHBpcGUASS9PIGVycm9yAE5vIHN1Y2ggZGV2aWNlIG9yIGFkZHJlc3MAQmxvY2sgZGV2aWNlIHJlcXVpcmVkAE5vIHN1Y2ggZGV2aWNlAE5vdCBhIGRpcmVjdG9yeQBJcyBhIGRpcmVjdG9yeQBUZXh0IGZpbGUgYnVzeQBFeGVjIGZvcm1hdCBlcnJvcgBJbnZhbGlkIGFyZ3VtZW50AEFyZ3VtZW50IGxpc3QgdG9vIGxvbmcAU3ltYm9saWMgbGluayBsb29wAEZpbGVuYW1lIHRvbyBsb25nAFRvbyBtYW55IG9wZW4gZmlsZXMgaW4gc3lzdGVtAE5vIGZpbGUgZGVzY3JpcHRvcnMgYXZhaWxhYmxlAEJhZCBmaWxlIGRlc2NyaXB0b3IATm8gY2hpbGQgcHJvY2VzcwBCYWQgYWRkcmVzcwBGaWxlIHRvbyBsYXJnZQBUb28gbWFueSBsaW5rcwBObyBsb2NrcyBhdmFpbGFibGUAUmVzb3VyY2UgZGVhZGxvY2sgd291bGQgb2NjdXIAU3RhdGUgbm90IHJlY292ZXJhYmxlAFByZXZpb3VzIG93bmVyIGRpZWQAT3BlcmF0aW9uIGNhbmNlbGVkAEZ1bmN0aW9uIG5vdCBpbXBsZW1lbnRlZABObyBtZXNzYWdlIG9mIGRlc2lyZWQgdHlwZQBJZGVudGlmaWVyIHJlbW92ZWQARGV2aWNlIG5vdCBhIHN0cmVhbQBObyBkYXRhIGF2YWlsYWJsZQBEZXZpY2UgdGltZW91dABPdXQgb2Ygc3RyZWFtcyByZXNvdXJjZXMATGluayBoYXMgYmVlbiBzZXZlcmVkAFByb3RvY29sIGVycm9yAEJhZCBtZXNzYWdlAEZpbGUgZGVzY3JpcHRvciBpbiBiYWQgc3RhdGUATm90IGEgc29ja2V0AERlc3RpbmF0aW9uIGFkZHJlc3MgcmVxdWlyZWQATWVzc2FnZSB0b28gbGFyZ2UAUHJvdG9jb2wgd3JvbmcgdHlwZSBmb3Igc29ja2V0AFByb3RvY29sIG5vdCBhdmFpbGFibGUAUHJvdG9jb2wgbm90IHN1cHBvcnRlZABTb2NrZXQgdHlwZSBub3Qgc3VwcG9ydGVkAE5vdCBzdXBwb3J0ZWQAUHJvdG9jb2wgZmFtaWx5IG5vdCBzdXBwb3J0ZWQAQWRkcmVzcyBmYW1pbHkgbm90IHN1cHBvcnRlZCBieSBwcm90b2NvbABBZGRyZXNzIG5vdCBhdmFpbGFibGUATmV0d29yayBpcyBkb3duAE5ldHdvcmsgdW5yZWFjaGFibGUAQ29ubmVjdGlvbiByZXNldCBieSBuZXR3b3JrAENvbm5lY3Rpb24gYWJvcnRlZABObyBidWZmZXIgc3BhY2UgYXZhaWxhYmxlAFNvY2tldCBpcyBjb25uZWN0ZWQAU29ja2V0IG5vdCBjb25uZWN0ZWQAQ2Fubm90IHNlbmQgYWZ0ZXIgc29ja2V0IHNodXRkb3duAE9wZXJhdGlvbiBhbHJlYWR5IGluIHByb2dyZXNzAE9wZXJhdGlvbiBpbiBwcm9ncmVzcwBTdGFsZSBmaWxlIGhhbmRsZQBSZW1vdGUgSS9PIGVycm9yAFF1b3RhIGV4Y2VlZGVkAE5vIG1lZGl1bSBmb3VuZABXcm9uZyBtZWRpdW0gdHlwZQBObyBlcnJvciBpbmZvcm1hdGlvbgBBkJcBC1JQUFAACgAAAAsAAAAMAAAADQAAAA4AAAAPAAAAEAAAABEAAAASAAAACwAAAAwAAAANAAAADgAAAA8AAAAQAAAAEQAAAAEAAAAIAAAAlEsAALRLAEGQmQELAgxQAEHImQELCR8AAADkTAAAAwBB5JkBC4wBLfRRWM+MscBG9rXLKTEDxwRbcDC0Xf0geH+LmthZKVBoSImrp1YDbP+3zYg/1He0K6WjcPG65Kj8QYP92W/hinovLXSWBx8NCV4Ddixw90ClLKdvV0GoqnTfoFhkA0rHxDxTrq9fGAQVseNtKIarDKS/Q/DpUIE5VxZSN/////////////////////8=";Ag(Io)||(Io=h(Io));function lg(d){try{if(d==Io&&V)return new Uint8Array(V);var E=pa(d);if(E)return E;if(C)return C(d);throw"sync fetching of the wasm failed: you can preload it to Module['wasmBinary'] manually, or emcc.py will do that for you when generating HTML (but not JS)"}catch(I){wr(I)}}function wp(d,E){var I,k,T;try{T=lg(d),k=new WebAssembly.Module(T),I=new WebAssembly.Instance(k,E)}catch(te){var Z=te.toString();throw D("failed to compile wasm module: "+Z),(Z.includes("imported Memory")||Z.includes("memory import"))&&D("Memory size incompatibility issues may be due to changing INITIAL_MEMORY at runtime to something too large. Use ALLOW_MEMORY_GROWTH to allow any size memory (and also make sure not to set INITIAL_MEMORY at runtime to something smaller than it was at compile time)."),te}return[I,k]}function Bp(){var d={a:da};function E(T,Z){var te=T.exports;t.asm=te,A=t.asm.u,Or(A.buffer),gi=t.asm.pa,pA(t.asm.v),mA("wasm-instantiate")}if(CA("wasm-instantiate"),t.instantiateWasm)try{var I=t.instantiateWasm(d,E);return I}catch(T){return D("Module.instantiateWasm callback failed with error: "+T),!1}var k=wp(Io,d);return E(k[0]),t.asm}var vr,se;function yo(d){for(;d.length>0;){var E=d.shift();if(typeof E=="function"){E(t);continue}var I=E.func;typeof I=="number"?E.arg===void 0?gi.get(I)():gi.get(I)(E.arg):I(E.arg===void 0?null:E.arg)}}function kn(d,E){var I=new Date(de[d>>2]*1e3);de[E>>2]=I.getUTCSeconds(),de[E+4>>2]=I.getUTCMinutes(),de[E+8>>2]=I.getUTCHours(),de[E+12>>2]=I.getUTCDate(),de[E+16>>2]=I.getUTCMonth(),de[E+20>>2]=I.getUTCFullYear()-1900,de[E+24>>2]=I.getUTCDay(),de[E+36>>2]=0,de[E+32>>2]=0;var k=Date.UTC(I.getUTCFullYear(),0,1,0,0,0,0),T=(I.getTime()-k)/(1e3*60*60*24)|0;return de[E+28>>2]=T,kn.GMTString||(kn.GMTString=we("GMT")),de[E+40>>2]=kn.GMTString,E}function cg(d,E){return kn(d,E)}var Qt={splitPath:function(d){var E=/^(\/?|)([\s\S]*?)((?:\.{1,2}|[^\/]+?|)(\.[^.\/]*|))(?:[\/]*)$/;return E.exec(d).slice(1)},normalizeArray:function(d,E){for(var I=0,k=d.length-1;k>=0;k--){var T=d[k];T==="."?d.splice(k,1):T===".."?(d.splice(k,1),I++):I&&(d.splice(k,1),I--)}if(E)for(;I;I--)d.unshift("..");return d},normalize:function(d){var E=d.charAt(0)==="/",I=d.substr(-1)==="/";return d=Qt.normalizeArray(d.split("/").filter(function(k){return!!k}),!E).join("/"),!d&&!E&&(d="."),d&&I&&(d+="/"),(E?"/":"")+d},dirname:function(d){var E=Qt.splitPath(d),I=E[0],k=E[1];return!I&&!k?".":(k&&(k=k.substr(0,k.length-1)),I+k)},basename:function(d){if(d==="/")return"/";d=Qt.normalize(d),d=d.replace(/\/$/,"");var E=d.lastIndexOf("/");return E===-1?d:d.substr(E+1)},extname:function(d){return Qt.splitPath(d)[3]},join:function(){var d=Array.prototype.slice.call(arguments,0);return Qt.normalize(d.join("/"))},join2:function(d,E){return Qt.normalize(d+"/"+E)}};function Rl(){if(typeof crypto=="object"&&typeof crypto.getRandomValues=="function"){var d=new Uint8Array(1);return function(){return crypto.getRandomValues(d),d[0]}}else if(g)try{var E=J("crypto");return function(){return E.randomBytes(1)[0]}}catch{}return function(){wr("randomDevice")}}var Rn={resolve:function(){for(var d="",E=!1,I=arguments.length-1;I>=-1&&!E;I--){var k=I>=0?arguments[I]:S.cwd();if(typeof k!="string")throw new TypeError("Arguments to path.resolve must be strings");if(!k)return"";d=k+"/"+d,E=k.charAt(0)==="/"}return d=Qt.normalizeArray(d.split("/").filter(function(T){return!!T}),!E).join("/"),(E?"/":"")+d||"."},relative:function(d,E){d=Rn.resolve(d).substr(1),E=Rn.resolve(E).substr(1);function I(Je){for(var nt=0;nt<Je.length&&Je[nt]==="";nt++);for(var wt=Je.length-1;wt>=0&&Je[wt]==="";wt--);return nt>wt?[]:Je.slice(nt,wt-nt+1)}for(var k=I(d.split("/")),T=I(E.split("/")),Z=Math.min(k.length,T.length),te=Z,Be=0;Be<Z;Be++)if(k[Be]!==T[Be]){te=Be;break}for(var me=[],Be=te;Be<k.length;Be++)me.push("..");return me=me.concat(T.slice(te)),me.join("/")}},rs={ttys:[],init:function(){},shutdown:function(){},register:function(d,E){rs.ttys[d]={input:[],output:[],ops:E},S.registerDevice(d,rs.stream_ops)},stream_ops:{open:function(d){var E=rs.ttys[d.node.rdev];if(!E)throw new S.ErrnoError(43);d.tty=E,d.seekable=!1},close:function(d){d.tty.ops.flush(d.tty)},flush:function(d){d.tty.ops.flush(d.tty)},read:function(d,E,I,k,T){if(!d.tty||!d.tty.ops.get_char)throw new S.ErrnoError(60);for(var Z=0,te=0;te<k;te++){var Be;try{Be=d.tty.ops.get_char(d.tty)}catch{throw new S.ErrnoError(29)}if(Be===void 0&&Z===0)throw new S.ErrnoError(6);if(Be==null)break;Z++,E[I+te]=Be}return Z&&(d.node.timestamp=Date.now()),Z},write:function(d,E,I,k,T){if(!d.tty||!d.tty.ops.put_char)throw new S.ErrnoError(60);try{for(var Z=0;Z<k;Z++)d.tty.ops.put_char(d.tty,E[I+Z])}catch{throw new S.ErrnoError(29)}return k&&(d.node.timestamp=Date.now()),Z}},default_tty_ops:{get_char:function(d){if(!d.input.length){var E=null;if(g){var I=256,k=Buffer.alloc?Buffer.alloc(I):new Buffer(I),T=0;try{T=y.readSync(process.stdin.fd,k,0,I,null)}catch(Z){if(Z.toString().includes("EOF"))T=0;else throw Z}T>0?E=k.slice(0,T).toString("utf-8"):E=null}else typeof window<"u"&&typeof window.prompt=="function"?(E=window.prompt("Input: "),E!==null&&(E+=`
-`)):typeof readline=="function"&&(E=readline(),E!==null&&(E+=`
-`));if(!E)return null;d.input=IA(E,!0)}return d.input.shift()},put_char:function(d,E){E===null||E===10?(v(ke(d.output,0)),d.output=[]):E!=0&&d.output.push(E)},flush:function(d){d.output&&d.output.length>0&&(v(ke(d.output,0)),d.output=[])}},default_tty1_ops:{put_char:function(d,E){E===null||E===10?(D(ke(d.output,0)),d.output=[]):E!=0&&d.output.push(E)},flush:function(d){d.output&&d.output.length>0&&(D(ke(d.output,0)),d.output=[])}}};function is(d){for(var E=H(d,65536),I=dt(E);d<E;)ne[I+d++]=0;return I}var gt={ops_table:null,mount:function(d){return gt.createNode(null,"/",16895,0)},createNode:function(d,E,I,k){if(S.isBlkdev(I)||S.isFIFO(I))throw new S.ErrnoError(63);gt.ops_table||(gt.ops_table={dir:{node:{getattr:gt.node_ops.getattr,setattr:gt.node_ops.setattr,lookup:gt.node_ops.lookup,mknod:gt.node_ops.mknod,rename:gt.node_ops.rename,unlink:gt.node_ops.unlink,rmdir:gt.node_ops.rmdir,readdir:gt.node_ops.readdir,symlink:gt.node_ops.symlink},stream:{llseek:gt.stream_ops.llseek}},file:{node:{getattr:gt.node_ops.getattr,setattr:gt.node_ops.setattr},stream:{llseek:gt.stream_ops.llseek,read:gt.stream_ops.read,write:gt.stream_ops.write,allocate:gt.stream_ops.allocate,mmap:gt.stream_ops.mmap,msync:gt.stream_ops.msync}},link:{node:{getattr:gt.node_ops.getattr,setattr:gt.node_ops.setattr,readlink:gt.node_ops.readlink},stream:{}},chrdev:{node:{getattr:gt.node_ops.getattr,setattr:gt.node_ops.setattr},stream:S.chrdev_stream_ops}});var T=S.createNode(d,E,I,k);return S.isDir(T.mode)?(T.node_ops=gt.ops_table.dir.node,T.stream_ops=gt.ops_table.dir.stream,T.contents={}):S.isFile(T.mode)?(T.node_ops=gt.ops_table.file.node,T.stream_ops=gt.ops_table.file.stream,T.usedBytes=0,T.contents=null):S.isLink(T.mode)?(T.node_ops=gt.ops_table.link.node,T.stream_ops=gt.ops_table.link.stream):S.isChrdev(T.mode)&&(T.node_ops=gt.ops_table.chrdev.node,T.stream_ops=gt.ops_table.chrdev.stream),T.timestamp=Date.now(),d&&(d.contents[E]=T,d.timestamp=T.timestamp),T},getFileDataAsTypedArray:function(d){return d.contents?d.contents.subarray?d.contents.subarray(0,d.usedBytes):new Uint8Array(d.contents):new Uint8Array(0)},expandFileStorage:function(d,E){var I=d.contents?d.contents.length:0;if(!(I>=E)){var k=1024*1024;E=Math.max(E,I*(I<k?2:1.125)>>>0),I!=0&&(E=Math.max(E,256));var T=d.contents;d.contents=new Uint8Array(E),d.usedBytes>0&&d.contents.set(T.subarray(0,d.usedBytes),0)}},resizeFileStorage:function(d,E){if(d.usedBytes!=E)if(E==0)d.contents=null,d.usedBytes=0;else{var I=d.contents;d.contents=new Uint8Array(E),I&&d.contents.set(I.subarray(0,Math.min(E,d.usedBytes))),d.usedBytes=E}},node_ops:{getattr:function(d){var E={};return E.dev=S.isChrdev(d.mode)?d.id:1,E.ino=d.id,E.mode=d.mode,E.nlink=1,E.uid=0,E.gid=0,E.rdev=d.rdev,S.isDir(d.mode)?E.size=4096:S.isFile(d.mode)?E.size=d.usedBytes:S.isLink(d.mode)?E.size=d.link.length:E.size=0,E.atime=new Date(d.timestamp),E.mtime=new Date(d.timestamp),E.ctime=new Date(d.timestamp),E.blksize=4096,E.blocks=Math.ceil(E.size/E.blksize),E},setattr:function(d,E){E.mode!==void 0&&(d.mode=E.mode),E.timestamp!==void 0&&(d.timestamp=E.timestamp),E.size!==void 0&&gt.resizeFileStorage(d,E.size)},lookup:function(d,E){throw S.genericErrors[44]},mknod:function(d,E,I,k){return gt.createNode(d,E,I,k)},rename:function(d,E,I){if(S.isDir(d.mode)){var k;try{k=S.lookupNode(E,I)}catch{}if(k)for(var T in k.contents)throw new S.ErrnoError(55)}delete d.parent.contents[d.name],d.parent.timestamp=Date.now(),d.name=I,E.contents[I]=d,E.timestamp=d.parent.timestamp,d.parent=E},unlink:function(d,E){delete d.contents[E],d.timestamp=Date.now()},rmdir:function(d,E){var I=S.lookupNode(d,E);for(var k in I.contents)throw new S.ErrnoError(55);delete d.contents[E],d.timestamp=Date.now()},readdir:function(d){var E=[".",".."];for(var I in d.contents)!d.contents.hasOwnProperty(I)||E.push(I);return E},symlink:function(d,E,I){var k=gt.createNode(d,E,41471,0);return k.link=I,k},readlink:function(d){if(!S.isLink(d.mode))throw new S.ErrnoError(28);return d.link}},stream_ops:{read:function(d,E,I,k,T){var Z=d.node.contents;if(T>=d.node.usedBytes)return 0;var te=Math.min(d.node.usedBytes-T,k);if(te>8&&Z.subarray)E.set(Z.subarray(T,T+te),I);else for(var Be=0;Be<te;Be++)E[I+Be]=Z[T+Be];return te},write:function(d,E,I,k,T,Z){if(E.buffer===ne.buffer&&(Z=!1),!k)return 0;var te=d.node;if(te.timestamp=Date.now(),E.subarray&&(!te.contents||te.contents.subarray)){if(Z)return te.contents=E.subarray(I,I+k),te.usedBytes=k,k;if(te.usedBytes===0&&T===0)return te.contents=E.slice(I,I+k),te.usedBytes=k,k;if(T+k<=te.usedBytes)return te.contents.set(E.subarray(I,I+k),T),k}if(gt.expandFileStorage(te,T+k),te.contents.subarray&&E.subarray)te.contents.set(E.subarray(I,I+k),T);else for(var Be=0;Be<k;Be++)te.contents[T+Be]=E[I+Be];return te.usedBytes=Math.max(te.usedBytes,T+k),k},llseek:function(d,E,I){var k=E;if(I===1?k+=d.position:I===2&&S.isFile(d.node.mode)&&(k+=d.node.usedBytes),k<0)throw new S.ErrnoError(28);return k},allocate:function(d,E,I){gt.expandFileStorage(d.node,E+I),d.node.usedBytes=Math.max(d.node.usedBytes,E+I)},mmap:function(d,E,I,k,T,Z){if(E!==0)throw new S.ErrnoError(28);if(!S.isFile(d.node.mode))throw new S.ErrnoError(43);var te,Be,me=d.node.contents;if(!(Z&2)&&me.buffer===qe)Be=!1,te=me.byteOffset;else{if((k>0||k+I<me.length)&&(me.subarray?me=me.subarray(k,k+I):me=Array.prototype.slice.call(me,k,k+I)),Be=!0,te=is(I),!te)throw new S.ErrnoError(48);ne.set(me,te)}return{ptr:te,allocated:Be}},msync:function(d,E,I,k,T){if(!S.isFile(d.node.mode))throw new S.ErrnoError(43);if(T&2)return 0;var Z=gt.stream_ops.write(d,E,0,k,I,!1);return 0}}},wo={EPERM:63,ENOENT:44,ESRCH:71,EINTR:27,EIO:29,ENXIO:60,E2BIG:1,ENOEXEC:45,EBADF:8,ECHILD:12,EAGAIN:6,EWOULDBLOCK:6,ENOMEM:48,EACCES:2,EFAULT:21,ENOTBLK:105,EBUSY:10,EEXIST:20,EXDEV:75,ENODEV:43,ENOTDIR:54,EISDIR:31,EINVAL:28,ENFILE:41,EMFILE:33,ENOTTY:59,ETXTBSY:74,EFBIG:22,ENOSPC:51,ESPIPE:70,EROFS:69,EMLINK:34,EPIPE:64,EDOM:18,ERANGE:68,ENOMSG:49,EIDRM:24,ECHRNG:106,EL2NSYNC:156,EL3HLT:107,EL3RST:108,ELNRNG:109,EUNATCH:110,ENOCSI:111,EL2HLT:112,EDEADLK:16,ENOLCK:46,EBADE:113,EBADR:114,EXFULL:115,ENOANO:104,EBADRQC:103,EBADSLT:102,EDEADLOCK:16,EBFONT:101,ENOSTR:100,ENODATA:116,ETIME:117,ENOSR:118,ENONET:119,ENOPKG:120,EREMOTE:121,ENOLINK:47,EADV:122,ESRMNT:123,ECOMM:124,EPROTO:65,EMULTIHOP:36,EDOTDOT:125,EBADMSG:9,ENOTUNIQ:126,EBADFD:127,EREMCHG:128,ELIBACC:129,ELIBBAD:130,ELIBSCN:131,ELIBMAX:132,ELIBEXEC:133,ENOSYS:52,ENOTEMPTY:55,ENAMETOOLONG:37,ELOOP:32,EOPNOTSUPP:138,EPFNOSUPPORT:139,ECONNRESET:15,ENOBUFS:42,EAFNOSUPPORT:5,EPROTOTYPE:67,ENOTSOCK:57,ENOPROTOOPT:50,ESHUTDOWN:140,ECONNREFUSED:14,EADDRINUSE:3,ECONNABORTED:13,ENETUNREACH:40,ENETDOWN:38,ETIMEDOUT:73,EHOSTDOWN:142,EHOSTUNREACH:23,EINPROGRESS:26,EALREADY:7,EDESTADDRREQ:17,EMSGSIZE:35,EPROTONOSUPPORT:66,ESOCKTNOSUPPORT:137,EADDRNOTAVAIL:4,ENETRESET:39,EISCONN:30,ENOTCONN:53,ETOOMANYREFS:141,EUSERS:136,EDQUOT:19,ESTALE:72,ENOTSUP:138,ENOMEDIUM:148,EILSEQ:25,EOVERFLOW:61,ECANCELED:11,ENOTRECOVERABLE:56,EOWNERDEAD:62,ESTRPIPE:135},At={isWindows:!1,staticInit:function(){At.isWindows=!!process.platform.match(/^win/);var d={fs:Te.constants};d.fs&&(d=d.fs),At.flagsForNodeMap={1024:d.O_APPEND,64:d.O_CREAT,128:d.O_EXCL,256:d.O_NOCTTY,0:d.O_RDONLY,2:d.O_RDWR,4096:d.O_SYNC,512:d.O_TRUNC,1:d.O_WRONLY}},bufferFrom:function(d){return Buffer.alloc?Buffer.from(d):new Buffer(d)},convertNodeCode:function(d){var E=d.code;return wo[E]},mount:function(d){return At.createNode(null,"/",At.getMode(d.opts.root),0)},createNode:function(d,E,I,k){if(!S.isDir(I)&&!S.isFile(I)&&!S.isLink(I))throw new S.ErrnoError(28);var T=S.createNode(d,E,I);return T.node_ops=At.node_ops,T.stream_ops=At.stream_ops,T},getMode:function(d){var E;try{E=Te.lstatSync(d),At.isWindows&&(E.mode=E.mode|(E.mode&292)>>2)}catch(I){throw I.code?new S.ErrnoError(At.convertNodeCode(I)):I}return E.mode},realPath:function(d){for(var E=[];d.parent!==d;)E.push(d.name),d=d.parent;return E.push(d.mount.opts.root),E.reverse(),Qt.join.apply(null,E)},flagsForNode:function(d){d&=-2097153,d&=-2049,d&=-32769,d&=-524289;var E=0;for(var I in At.flagsForNodeMap)d&I&&(E|=At.flagsForNodeMap[I],d^=I);if(d)throw new S.ErrnoError(28);return E},node_ops:{getattr:function(d){var E=At.realPath(d),I;try{I=Te.lstatSync(E)}catch(k){throw k.code?new S.ErrnoError(At.convertNodeCode(k)):k}return At.isWindows&&!I.blksize&&(I.blksize=4096),At.isWindows&&!I.blocks&&(I.blocks=(I.size+I.blksize-1)/I.blksize|0),{dev:I.dev,ino:I.ino,mode:I.mode,nlink:I.nlink,uid:I.uid,gid:I.gid,rdev:I.rdev,size:I.size,atime:I.atime,mtime:I.mtime,ctime:I.ctime,blksize:I.blksize,blocks:I.blocks}},setattr:function(d,E){var I=At.realPath(d);try{if(E.mode!==void 0&&(Te.chmodSync(I,E.mode),d.mode=E.mode),E.timestamp!==void 0){var k=new Date(E.timestamp);Te.utimesSync(I,k,k)}E.size!==void 0&&Te.truncateSync(I,E.size)}catch(T){throw T.code?new S.ErrnoError(At.convertNodeCode(T)):T}},lookup:function(d,E){var I=Qt.join2(At.realPath(d),E),k=At.getMode(I);return At.createNode(d,E,k)},mknod:function(d,E,I,k){var T=At.createNode(d,E,I,k),Z=At.realPath(T);try{S.isDir(T.mode)?Te.mkdirSync(Z,T.mode):Te.writeFileSync(Z,"",{mode:T.mode})}catch(te){throw te.code?new S.ErrnoError(At.convertNodeCode(te)):te}return T},rename:function(d,E,I){var k=At.realPath(d),T=Qt.join2(At.realPath(E),I);try{Te.renameSync(k,T)}catch(Z){throw Z.code?new S.ErrnoError(At.convertNodeCode(Z)):Z}d.name=I},unlink:function(d,E){var I=Qt.join2(At.realPath(d),E);try{Te.unlinkSync(I)}catch(k){throw k.code?new S.ErrnoError(At.convertNodeCode(k)):k}},rmdir:function(d,E){var I=Qt.join2(At.realPath(d),E);try{Te.rmdirSync(I)}catch(k){throw k.code?new S.ErrnoError(At.convertNodeCode(k)):k}},readdir:function(d){var E=At.realPath(d);try{return Te.readdirSync(E)}catch(I){throw I.code?new S.ErrnoError(At.convertNodeCode(I)):I}},symlink:function(d,E,I){var k=Qt.join2(At.realPath(d),E);try{Te.symlinkSync(I,k)}catch(T){throw T.code?new S.ErrnoError(At.convertNodeCode(T)):T}},readlink:function(d){var E=At.realPath(d);try{return E=Te.readlinkSync(E),E=fg.relative(fg.resolve(d.mount.opts.root),E),E}catch(I){throw I.code?new S.ErrnoError(At.convertNodeCode(I)):I}}},stream_ops:{open:function(d){var E=At.realPath(d.node);try{S.isFile(d.node.mode)&&(d.nfd=Te.openSync(E,At.flagsForNode(d.flags)))}catch(I){throw I.code?new S.ErrnoError(At.convertNodeCode(I)):I}},close:function(d){try{S.isFile(d.node.mode)&&d.nfd&&Te.closeSync(d.nfd)}catch(E){throw E.code?new S.ErrnoError(At.convertNodeCode(E)):E}},read:function(d,E,I,k,T){if(k===0)return 0;try{return Te.readSync(d.nfd,At.bufferFrom(E.buffer),I,k,T)}catch(Z){throw new S.ErrnoError(At.convertNodeCode(Z))}},write:function(d,E,I,k,T){try{return Te.writeSync(d.nfd,At.bufferFrom(E.buffer),I,k,T)}catch(Z){throw new S.ErrnoError(At.convertNodeCode(Z))}},llseek:function(d,E,I){var k=E;if(I===1)k+=d.position;else if(I===2&&S.isFile(d.node.mode))try{var T=Te.fstatSync(d.nfd);k+=T.size}catch(Z){throw new S.ErrnoError(At.convertNodeCode(Z))}if(k<0)throw new S.ErrnoError(28);return k},mmap:function(d,E,I,k,T,Z){if(E!==0)throw new S.ErrnoError(28);if(!S.isFile(d.node.mode))throw new S.ErrnoError(43);var te=is(I);return At.stream_ops.read(d,ne,te,I,k),{ptr:te,allocated:!0}},msync:function(d,E,I,k,T){if(!S.isFile(d.node.mode))throw new S.ErrnoError(43);if(T&2)return 0;var Z=At.stream_ops.write(d,E,0,k,I,!1);return 0}}},an={lookupPath:function(d){return{path:d,node:{mode:At.getMode(d)}}},createStandardStreams:function(){S.streams[0]={fd:0,nfd:0,position:0,path:"",flags:0,tty:!0,seekable:!1};for(var d=1;d<3;d++)S.streams[d]={fd:d,nfd:d,position:0,path:"",flags:577,tty:!0,seekable:!1}},cwd:function(){return process.cwd()},chdir:function(){process.chdir.apply(void 0,arguments)},mknod:function(d,E){S.isDir(d)?Te.mkdirSync(d,E):Te.writeFileSync(d,"",{mode:E})},mkdir:function(){Te.mkdirSync.apply(void 0,arguments)},symlink:function(){Te.symlinkSync.apply(void 0,arguments)},rename:function(){Te.renameSync.apply(void 0,arguments)},rmdir:function(){Te.rmdirSync.apply(void 0,arguments)},readdir:function(){Te.readdirSync.apply(void 0,arguments)},unlink:function(){Te.unlinkSync.apply(void 0,arguments)},readlink:function(){return Te.readlinkSync.apply(void 0,arguments)},stat:function(){return Te.statSync.apply(void 0,arguments)},lstat:function(){return Te.lstatSync.apply(void 0,arguments)},chmod:function(){Te.chmodSync.apply(void 0,arguments)},fchmod:function(){Te.fchmodSync.apply(void 0,arguments)},chown:function(){Te.chownSync.apply(void 0,arguments)},fchown:function(){Te.fchownSync.apply(void 0,arguments)},truncate:function(){Te.truncateSync.apply(void 0,arguments)},ftruncate:function(d,E){if(E<0)throw new S.ErrnoError(28);Te.ftruncateSync.apply(void 0,arguments)},utime:function(){Te.utimesSync.apply(void 0,arguments)},open:function(d,E,I,k){typeof E=="string"&&(E=Ks.modeStringToFlags(E));var T=Te.openSync(d,At.flagsForNode(E),I),Z=k!=null?k:S.nextfd(T),te={fd:Z,nfd:T,position:0,path:d,flags:E,seekable:!0};return S.streams[Z]=te,te},close:function(d){d.stream_ops||Te.closeSync(d.nfd),S.closeStream(d.fd)},llseek:function(d,E,I){if(d.stream_ops)return Ks.llseek(d,E,I);var k=E;if(I===1)k+=d.position;else if(I===2)k+=Te.fstatSync(d.nfd).size;else if(I!==0)throw new S.ErrnoError(wo.EINVAL);if(k<0)throw new S.ErrnoError(wo.EINVAL);return d.position=k,k},read:function(d,E,I,k,T){if(d.stream_ops)return Ks.read(d,E,I,k,T);var Z=typeof T<"u";!Z&&d.seekable&&(T=d.position);var te=Te.readSync(d.nfd,At.bufferFrom(E.buffer),I,k,T);return Z||(d.position+=te),te},write:function(d,E,I,k,T){if(d.stream_ops)return Ks.write(d,E,I,k,T);d.flags&+"1024"&&S.llseek(d,0,+"2");var Z=typeof T<"u";!Z&&d.seekable&&(T=d.position);var te=Te.writeSync(d.nfd,At.bufferFrom(E.buffer),I,k,T);return Z||(d.position+=te),te},allocate:function(){throw new S.ErrnoError(wo.EOPNOTSUPP)},mmap:function(d,E,I,k,T,Z){if(d.stream_ops)return Ks.mmap(d,E,I,k,T,Z);if(E!==0)throw new S.ErrnoError(28);var te=is(I);return S.read(d,ne,te,I,k),{ptr:te,allocated:!0}},msync:function(d,E,I,k,T){return d.stream_ops?Ks.msync(d,E,I,k,T):(T&2||S.write(d,E,0,k,I),0)},munmap:function(){return 0},ioctl:function(){throw new S.ErrnoError(wo.ENOTTY)}},S={root:null,mounts:[],devices:{},streams:[],nextInode:1,nameTable:null,currentPath:"/",initialized:!1,ignorePermissions:!0,trackingDelegate:{},tracking:{openFlags:{READ:1,WRITE:2}},ErrnoError:null,genericErrors:{},filesystems:null,syncFSRequests:0,lookupPath:function(d,E){if(d=Rn.resolve(S.cwd(),d),E=E||{},!d)return{path:"",node:null};var I={follow_mount:!0,recurse_count:0};for(var k in I)E[k]===void 0&&(E[k]=I[k]);if(E.recurse_count>8)throw new S.ErrnoError(32);for(var T=Qt.normalizeArray(d.split("/").filter(function(lt){return!!lt}),!1),Z=S.root,te="/",Be=0;Be<T.length;Be++){var me=Be===T.length-1;if(me&&E.parent)break;if(Z=S.lookupNode(Z,T[Be]),te=Qt.join2(te,T[Be]),S.isMountpoint(Z)&&(!me||me&&E.follow_mount)&&(Z=Z.mounted.root),!me||E.follow)for(var Je=0;S.isLink(Z.mode);){var nt=S.readlink(te);te=Rn.resolve(Qt.dirname(te),nt);var wt=S.lookupPath(te,{recurse_count:E.recurse_count});if(Z=wt.node,Je++>40)throw new S.ErrnoError(32)}}return{path:te,node:Z}},getPath:function(d){for(var E;;){if(S.isRoot(d)){var I=d.mount.mountpoint;return E?I[I.length-1]!=="/"?I+"/"+E:I+E:I}E=E?d.name+"/"+E:d.name,d=d.parent}},hashName:function(d,E){for(var I=0,k=0;k<E.length;k++)I=(I<<5)-I+E.charCodeAt(k)|0;return(d+I>>>0)%S.nameTable.length},hashAddNode:function(d){var E=S.hashName(d.parent.id,d.name);d.name_next=S.nameTable[E],S.nameTable[E]=d},hashRemoveNode:function(d){var E=S.hashName(d.parent.id,d.name);if(S.nameTable[E]===d)S.nameTable[E]=d.name_next;else for(var I=S.nameTable[E];I;){if(I.name_next===d){I.name_next=d.name_next;break}I=I.name_next}},lookupNode:function(d,E){var I=S.mayLookup(d);if(I)throw new S.ErrnoError(I,d);for(var k=S.hashName(d.id,E),T=S.nameTable[k];T;T=T.name_next){var Z=T.name;if(T.parent.id===d.id&&Z===E)return T}return S.lookup(d,E)},createNode:function(d,E,I,k){var T=new S.FSNode(d,E,I,k);return S.hashAddNode(T),T},destroyNode:function(d){S.hashRemoveNode(d)},isRoot:function(d){return d===d.parent},isMountpoint:function(d){return!!d.mounted},isFile:function(d){return(d&61440)===32768},isDir:function(d){return(d&61440)===16384},isLink:function(d){return(d&61440)===40960},isChrdev:function(d){return(d&61440)===8192},isBlkdev:function(d){return(d&61440)===24576},isFIFO:function(d){return(d&61440)===4096},isSocket:function(d){return(d&49152)===49152},flagModes:{r:0,"r+":2,w:577,"w+":578,a:1089,"a+":1090},modeStringToFlags:function(d){var E=S.flagModes[d];if(typeof E>"u")throw new Error("Unknown file open mode: "+d);return E},flagsToPermissionString:function(d){var E=["r","w","rw"][d&3];return d&512&&(E+="w"),E},nodePermissions:function(d,E){return S.ignorePermissions?0:E.includes("r")&&!(d.mode&292)||E.includes("w")&&!(d.mode&146)||E.includes("x")&&!(d.mode&73)?2:0},mayLookup:function(d){var E=S.nodePermissions(d,"x");return E||(d.node_ops.lookup?0:2)},mayCreate:function(d,E){try{var I=S.lookupNode(d,E);return 20}catch{}return S.nodePermissions(d,"wx")},mayDelete:function(d,E,I){var k;try{k=S.lookupNode(d,E)}catch(Z){return Z.errno}var T=S.nodePermissions(d,"wx");if(T)return T;if(I){if(!S.isDir(k.mode))return 54;if(S.isRoot(k)||S.getPath(k)===S.cwd())return 10}else if(S.isDir(k.mode))return 31;return 0},mayOpen:function(d,E){return d?S.isLink(d.mode)?32:S.isDir(d.mode)&&(S.flagsToPermissionString(E)!=="r"||E&512)?31:S.nodePermissions(d,S.flagsToPermissionString(E)):44},MAX_OPEN_FDS:4096,nextfd:function(d,E){d=d||0,E=E||S.MAX_OPEN_FDS;for(var I=d;I<=E;I++)if(!S.streams[I])return I;throw new S.ErrnoError(33)},getStream:function(d){return S.streams[d]},createStream:function(d,E,I){S.FSStream||(S.FSStream=function(){},S.FSStream.prototype={object:{get:function(){return this.node},set:function(te){this.node=te}},isRead:{get:function(){return(this.flags&2097155)!==1}},isWrite:{get:function(){return(this.flags&2097155)!==0}},isAppend:{get:function(){return this.flags&1024}}});var k=new S.FSStream;for(var T in d)k[T]=d[T];d=k;var Z=S.nextfd(E,I);return d.fd=Z,S.streams[Z]=d,d},closeStream:function(d){S.streams[d]=null},chrdev_stream_ops:{open:function(d){var E=S.getDevice(d.node.rdev);d.stream_ops=E.stream_ops,d.stream_ops.open&&d.stream_ops.open(d)},llseek:function(){throw new S.ErrnoError(70)}},major:function(d){return d>>8},minor:function(d){return d&255},makedev:function(d,E){return d<<8|E},registerDevice:function(d,E){S.devices[d]={stream_ops:E}},getDevice:function(d){return S.devices[d]},getMounts:function(d){for(var E=[],I=[d];I.length;){var k=I.pop();E.push(k),I.push.apply(I,k.mounts)}return E},syncfs:function(d,E){typeof d=="function"&&(E=d,d=!1),S.syncFSRequests++,S.syncFSRequests>1&&D("warning: "+S.syncFSRequests+" FS.syncfs operations in flight at once, probably just doing extra work");var I=S.getMounts(S.root.mount),k=0;function T(te){return S.syncFSRequests--,E(te)}function Z(te){if(te)return Z.errored?void 0:(Z.errored=!0,T(te));++k>=I.length&&T(null)}I.forEach(function(te){if(!te.type.syncfs)return Z(null);te.type.syncfs(te,d,Z)})},mount:function(d,E,I){var k=I==="/",T=!I,Z;if(k&&S.root)throw new S.ErrnoError(10);if(!k&&!T){var te=S.lookupPath(I,{follow_mount:!1});if(I=te.path,Z=te.node,S.isMountpoint(Z))throw new S.ErrnoError(10);if(!S.isDir(Z.mode))throw new S.ErrnoError(54)}var Be={type:d,opts:E,mountpoint:I,mounts:[]},me=d.mount(Be);return me.mount=Be,Be.root=me,k?S.root=me:Z&&(Z.mounted=Be,Z.mount&&Z.mount.mounts.push(Be)),me},unmount:function(d){var E=S.lookupPath(d,{follow_mount:!1});if(!S.isMountpoint(E.node))throw new S.ErrnoError(28);var I=E.node,k=I.mounted,T=S.getMounts(k);Object.keys(S.nameTable).forEach(function(te){for(var Be=S.nameTable[te];Be;){var me=Be.name_next;T.includes(Be.mount)&&S.destroyNode(Be),Be=me}}),I.mounted=null;var Z=I.mount.mounts.indexOf(k);I.mount.mounts.splice(Z,1)},lookup:function(d,E){return d.node_ops.lookup(d,E)},mknod:function(d,E,I){var k=S.lookupPath(d,{parent:!0}),T=k.node,Z=Qt.basename(d);if(!Z||Z==="."||Z==="..")throw new S.ErrnoError(28);var te=S.mayCreate(T,Z);if(te)throw new S.ErrnoError(te);if(!T.node_ops.mknod)throw new S.ErrnoError(63);return T.node_ops.mknod(T,Z,E,I)},create:function(d,E){return E=E!==void 0?E:438,E&=4095,E|=32768,S.mknod(d,E,0)},mkdir:function(d,E){return E=E!==void 0?E:511,E&=1023,E|=16384,S.mknod(d,E,0)},mkdirTree:function(d,E){for(var I=d.split("/"),k="",T=0;T<I.length;++T)if(!!I[T]){k+="/"+I[T];try{S.mkdir(k,E)}catch(Z){if(Z.errno!=20)throw Z}}},mkdev:function(d,E,I){return typeof I>"u"&&(I=E,E=438),E|=8192,S.mknod(d,E,I)},symlink:function(d,E){if(!Rn.resolve(d))throw new S.ErrnoError(44);var I=S.lookupPath(E,{parent:!0}),k=I.node;if(!k)throw new S.ErrnoError(44);var T=Qt.basename(E),Z=S.mayCreate(k,T);if(Z)throw new S.ErrnoError(Z);if(!k.node_ops.symlink)throw new S.ErrnoError(63);return k.node_ops.symlink(k,T,d)},rename:function(d,E){var I=Qt.dirname(d),k=Qt.dirname(E),T=Qt.basename(d),Z=Qt.basename(E),te,Be,me;if(te=S.lookupPath(d,{parent:!0}),Be=te.node,te=S.lookupPath(E,{parent:!0}),me=te.node,!Be||!me)throw new S.ErrnoError(44);if(Be.mount!==me.mount)throw new S.ErrnoError(75);var Je=S.lookupNode(Be,T),nt=Rn.relative(d,k);if(nt.charAt(0)!==".")throw new S.ErrnoError(28);if(nt=Rn.relative(E,I),nt.charAt(0)!==".")throw new S.ErrnoError(55);var wt;try{wt=S.lookupNode(me,Z)}catch{}if(Je!==wt){var lt=S.isDir(Je.mode),it=S.mayDelete(Be,T,lt);if(it)throw new S.ErrnoError(it);if(it=wt?S.mayDelete(me,Z,lt):S.mayCreate(me,Z),it)throw new S.ErrnoError(it);if(!Be.node_ops.rename)throw new S.ErrnoError(63);if(S.isMountpoint(Je)||wt&&S.isMountpoint(wt))throw new S.ErrnoError(10);if(me!==Be&&(it=S.nodePermissions(Be,"w"),it))throw new S.ErrnoError(it);try{S.trackingDelegate.willMovePath&&S.trackingDelegate.willMovePath(d,E)}catch(Et){D("FS.trackingDelegate['willMovePath']('"+d+"', '"+E+"') threw an exception: "+Et.message)}S.hashRemoveNode(Je);try{Be.node_ops.rename(Je,me,Z)}catch(Et){throw Et}finally{S.hashAddNode(Je)}try{S.trackingDelegate.onMovePath&&S.trackingDelegate.onMovePath(d,E)}catch(Et){D("FS.trackingDelegate['onMovePath']('"+d+"', '"+E+"') threw an exception: "+Et.message)}}},rmdir:function(d){var E=S.lookupPath(d,{parent:!0}),I=E.node,k=Qt.basename(d),T=S.lookupNode(I,k),Z=S.mayDelete(I,k,!0);if(Z)throw new S.ErrnoError(Z);if(!I.node_ops.rmdir)throw new S.ErrnoError(63);if(S.isMountpoint(T))throw new S.ErrnoError(10);try{S.trackingDelegate.willDeletePath&&S.trackingDelegate.willDeletePath(d)}catch(te){D("FS.trackingDelegate['willDeletePath']('"+d+"') threw an exception: "+te.message)}I.node_ops.rmdir(I,k),S.destroyNode(T);try{S.trackingDelegate.onDeletePath&&S.trackingDelegate.onDeletePath(d)}catch(te){D("FS.trackingDelegate['onDeletePath']('"+d+"') threw an exception: "+te.message)}},readdir:function(d){var E=S.lookupPath(d,{follow:!0}),I=E.node;if(!I.node_ops.readdir)throw new S.ErrnoError(54);return I.node_ops.readdir(I)},unlink:function(d){var E=S.lookupPath(d,{parent:!0}),I=E.node,k=Qt.basename(d),T=S.lookupNode(I,k),Z=S.mayDelete(I,k,!1);if(Z)throw new S.ErrnoError(Z);if(!I.node_ops.unlink)throw new S.ErrnoError(63);if(S.isMountpoint(T))throw new S.ErrnoError(10);try{S.trackingDelegate.willDeletePath&&S.trackingDelegate.willDeletePath(d)}catch(te){D("FS.trackingDelegate['willDeletePath']('"+d+"') threw an exception: "+te.message)}I.node_ops.unlink(I,k),S.destroyNode(T);try{S.trackingDelegate.onDeletePath&&S.trackingDelegate.onDeletePath(d)}catch(te){D("FS.trackingDelegate['onDeletePath']('"+d+"') threw an exception: "+te.message)}},readlink:function(d){var E=S.lookupPath(d),I=E.node;if(!I)throw new S.ErrnoError(44);if(!I.node_ops.readlink)throw new S.ErrnoError(28);return Rn.resolve(S.getPath(I.parent),I.node_ops.readlink(I))},stat:function(d,E){var I=S.lookupPath(d,{follow:!E}),k=I.node;if(!k)throw new S.ErrnoError(44);if(!k.node_ops.getattr)throw new S.ErrnoError(63);return k.node_ops.getattr(k)},lstat:function(d){return S.stat(d,!0)},chmod:function(d,E,I){var k;if(typeof d=="string"){var T=S.lookupPath(d,{follow:!I});k=T.node}else k=d;if(!k.node_ops.setattr)throw new S.ErrnoError(63);k.node_ops.setattr(k,{mode:E&4095|k.mode&-4096,timestamp:Date.now()})},lchmod:function(d,E){S.chmod(d,E,!0)},fchmod:function(d,E){var I=S.getStream(d);if(!I)throw new S.ErrnoError(8);S.chmod(I.node,E)},chown:function(d,E,I,k){var T;if(typeof d=="string"){var Z=S.lookupPath(d,{follow:!k});T=Z.node}else T=d;if(!T.node_ops.setattr)throw new S.ErrnoError(63);T.node_ops.setattr(T,{timestamp:Date.now()})},lchown:function(d,E,I){S.chown(d,E,I,!0)},fchown:function(d,E,I){var k=S.getStream(d);if(!k)throw new S.ErrnoError(8);S.chown(k.node,E,I)},truncate:function(d,E){if(E<0)throw new S.ErrnoError(28);var I;if(typeof d=="string"){var k=S.lookupPath(d,{follow:!0});I=k.node}else I=d;if(!I.node_ops.setattr)throw new S.ErrnoError(63);if(S.isDir(I.mode))throw new S.ErrnoError(31);if(!S.isFile(I.mode))throw new S.ErrnoError(28);var T=S.nodePermissions(I,"w");if(T)throw new S.ErrnoError(T);I.node_ops.setattr(I,{size:E,timestamp:Date.now()})},ftruncate:function(d,E){var I=S.getStream(d);if(!I)throw new S.ErrnoError(8);if((I.flags&2097155)===0)throw new S.ErrnoError(28);S.truncate(I.node,E)},utime:function(d,E,I){var k=S.lookupPath(d,{follow:!0}),T=k.node;T.node_ops.setattr(T,{timestamp:Math.max(E,I)})},open:function(d,E,I,k,T){if(d==="")throw new S.ErrnoError(44);E=typeof E=="string"?S.modeStringToFlags(E):E,I=typeof I>"u"?438:I,E&64?I=I&4095|32768:I=0;var Z;if(typeof d=="object")Z=d;else{d=Qt.normalize(d);try{var te=S.lookupPath(d,{follow:!(E&131072)});Z=te.node}catch{}}var Be=!1;if(E&64)if(Z){if(E&128)throw new S.ErrnoError(20)}else Z=S.mknod(d,I,0),Be=!0;if(!Z)throw new S.ErrnoError(44);if(S.isChrdev(Z.mode)&&(E&=-513),E&65536&&!S.isDir(Z.mode))throw new S.ErrnoError(54);if(!Be){var me=S.mayOpen(Z,E);if(me)throw new S.ErrnoError(me)}E&512&&S.truncate(Z,0),E&=-131713;var Je=S.createStream({node:Z,path:S.getPath(Z),flags:E,seekable:!0,position:0,stream_ops:Z.stream_ops,ungotten:[],error:!1},k,T);Je.stream_ops.open&&Je.stream_ops.open(Je),t.logReadFiles&&!(E&1)&&(S.readFiles||(S.readFiles={}),d in S.readFiles||(S.readFiles[d]=1,D("FS.trackingDelegate error on read file: "+d)));try{if(S.trackingDelegate.onOpenFile){var nt=0;(E&2097155)!==1&&(nt|=S.tracking.openFlags.READ),(E&2097155)!==0&&(nt|=S.tracking.openFlags.WRITE),S.trackingDelegate.onOpenFile(d,nt)}}catch(wt){D("FS.trackingDelegate['onOpenFile']('"+d+"', flags) threw an exception: "+wt.message)}return Je},close:function(d){if(S.isClosed(d))throw new S.ErrnoError(8);d.getdents&&(d.getdents=null);try{d.stream_ops.close&&d.stream_ops.close(d)}catch(E){throw E}finally{S.closeStream(d.fd)}d.fd=null},isClosed:function(d){return d.fd===null},llseek:function(d,E,I){if(S.isClosed(d))throw new S.ErrnoError(8);if(!d.seekable||!d.stream_ops.llseek)throw new S.ErrnoError(70);if(I!=0&&I!=1&&I!=2)throw new S.ErrnoError(28);return d.position=d.stream_ops.llseek(d,E,I),d.ungotten=[],d.position},read:function(d,E,I,k,T){if(k<0||T<0)throw new S.ErrnoError(28);if(S.isClosed(d))throw new S.ErrnoError(8);if((d.flags&2097155)===1)throw new S.ErrnoError(8);if(S.isDir(d.node.mode))throw new S.ErrnoError(31);if(!d.stream_ops.read)throw new S.ErrnoError(28);var Z=typeof T<"u";if(!Z)T=d.position;else if(!d.seekable)throw new S.ErrnoError(70);var te=d.stream_ops.read(d,E,I,k,T);return Z||(d.position+=te),te},write:function(d,E,I,k,T,Z){if(k<0||T<0)throw new S.ErrnoError(28);if(S.isClosed(d))throw new S.ErrnoError(8);if((d.flags&2097155)===0)throw new S.ErrnoError(8);if(S.isDir(d.node.mode))throw new S.ErrnoError(31);if(!d.stream_ops.write)throw new S.ErrnoError(28);d.seekable&&d.flags&1024&&S.llseek(d,0,2);var te=typeof T<"u";if(!te)T=d.position;else if(!d.seekable)throw new S.ErrnoError(70);var Be=d.stream_ops.write(d,E,I,k,T,Z);te||(d.position+=Be);try{d.path&&S.trackingDelegate.onWriteToFile&&S.trackingDelegate.onWriteToFile(d.path)}catch(me){D("FS.trackingDelegate['onWriteToFile']('"+d.path+"') threw an exception: "+me.message)}return Be},allocate:function(d,E,I){if(S.isClosed(d))throw new S.ErrnoError(8);if(E<0||I<=0)throw new S.ErrnoError(28);if((d.flags&2097155)===0)throw new S.ErrnoError(8);if(!S.isFile(d.node.mode)&&!S.isDir(d.node.mode))throw new S.ErrnoError(43);if(!d.stream_ops.allocate)throw new S.ErrnoError(138);d.stream_ops.allocate(d,E,I)},mmap:function(d,E,I,k,T,Z){if((T&2)!==0&&(Z&2)===0&&(d.flags&2097155)!==2)throw new S.ErrnoError(2);if((d.flags&2097155)===1)throw new S.ErrnoError(2);if(!d.stream_ops.mmap)throw new S.ErrnoError(43);return d.stream_ops.mmap(d,E,I,k,T,Z)},msync:function(d,E,I,k,T){return!d||!d.stream_ops.msync?0:d.stream_ops.msync(d,E,I,k,T)},munmap:function(d){return 0},ioctl:function(d,E,I){if(!d.stream_ops.ioctl)throw new S.ErrnoError(59);return d.stream_ops.ioctl(d,E,I)},readFile:function(d,E){if(E=E||{},E.flags=E.flags||0,E.encoding=E.encoding||"binary",E.encoding!=="utf8"&&E.encoding!=="binary")throw new Error('Invalid encoding type "'+E.encoding+'"');var I,k=S.open(d,E.flags),T=S.stat(d),Z=T.size,te=new Uint8Array(Z);return S.read(k,te,0,Z,0),E.encoding==="utf8"?I=ke(te,0):E.encoding==="binary"&&(I=te),S.close(k),I},writeFile:function(d,E,I){I=I||{},I.flags=I.flags||577;var k=S.open(d,I.flags,I.mode);if(typeof E=="string"){var T=new Uint8Array(le(E)+1),Z=Ne(E,T,0,T.length);S.write(k,T,0,Z,void 0,I.canOwn)}else if(ArrayBuffer.isView(E))S.write(k,E,0,E.byteLength,void 0,I.canOwn);else throw new Error("Unsupported data type");S.close(k)},cwd:function(){return S.currentPath},chdir:function(d){var E=S.lookupPath(d,{follow:!0});if(E.node===null)throw new S.ErrnoError(44);if(!S.isDir(E.node.mode))throw new S.ErrnoError(54);var I=S.nodePermissions(E.node,"x");if(I)throw new S.ErrnoError(I);S.currentPath=E.path},createDefaultDirectories:function(){S.mkdir("/tmp"),S.mkdir("/home"),S.mkdir("/home/web_user")},createDefaultDevices:function(){S.mkdir("/dev"),S.registerDevice(S.makedev(1,3),{read:function(){return 0},write:function(E,I,k,T,Z){return T}}),S.mkdev("/dev/null",S.makedev(1,3)),rs.register(S.makedev(5,0),rs.default_tty_ops),rs.register(S.makedev(6,0),rs.default_tty1_ops),S.mkdev("/dev/tty",S.makedev(5,0)),S.mkdev("/dev/tty1",S.makedev(6,0));var d=Rl();S.createDevice("/dev","random",d),S.createDevice("/dev","urandom",d),S.mkdir("/dev/shm"),S.mkdir("/dev/shm/tmp")},createSpecialDirectories:function(){S.mkdir("/proc");var d=S.mkdir("/proc/self");S.mkdir("/proc/self/fd"),S.mount({mount:function(){var E=S.createNode(d,"fd",16895,73);return E.node_ops={lookup:function(I,k){var T=+k,Z=S.getStream(T);if(!Z)throw new S.ErrnoError(8);var te={parent:null,mount:{mountpoint:"fake"},node_ops:{readlink:function(){return Z.path}}};return te.parent=te,te}},E}},{},"/proc/self/fd")},createStandardStreams:function(){t.stdin?S.createDevice("/dev","stdin",t.stdin):S.symlink("/dev/tty","/dev/stdin"),t.stdout?S.createDevice("/dev","stdout",null,t.stdout):S.symlink("/dev/tty","/dev/stdout"),t.stderr?S.createDevice("/dev","stderr",null,t.stderr):S.symlink("/dev/tty1","/dev/stderr");var d=S.open("/dev/stdin",0),E=S.open("/dev/stdout",1),I=S.open("/dev/stderr",1)},ensureErrnoError:function(){S.ErrnoError||(S.ErrnoError=function(E,I){this.node=I,this.setErrno=function(k){this.errno=k},this.setErrno(E),this.message="FS error"},S.ErrnoError.prototype=new Error,S.ErrnoError.prototype.constructor=S.ErrnoError,[44].forEach(function(d){S.genericErrors[d]=new S.ErrnoError(d),S.genericErrors[d].stack="<generic error, no stack>"}))},staticInit:function(){S.ensureErrnoError(),S.nameTable=new Array(4096),S.mount(gt,{},"/"),S.createDefaultDirectories(),S.createDefaultDevices(),S.createSpecialDirectories(),S.filesystems={MEMFS:gt,NODEFS:At}},init:function(d,E,I){S.init.initialized=!0,S.ensureErrnoError(),t.stdin=d||t.stdin,t.stdout=E||t.stdout,t.stderr=I||t.stderr,S.createStandardStreams()},quit:function(){S.init.initialized=!1;var d=t._fflush;d&&d(0);for(var E=0;E<S.streams.length;E++){var I=S.streams[E];!I||S.close(I)}},getMode:function(d,E){var I=0;return d&&(I|=365),E&&(I|=146),I},findObject:function(d,E){var I=S.analyzePath(d,E);return I.exists?I.object:null},analyzePath:function(d,E){try{var I=S.lookupPath(d,{follow:!E});d=I.path}catch{}var k={isRoot:!1,exists:!1,error:0,name:null,path:null,object:null,parentExists:!1,parentPath:null,parentObject:null};try{var I=S.lookupPath(d,{parent:!0});k.parentExists=!0,k.parentPath=I.path,k.parentObject=I.node,k.name=Qt.basename(d),I=S.lookupPath(d,{follow:!E}),k.exists=!0,k.path=I.path,k.object=I.node,k.name=I.node.name,k.isRoot=I.path==="/"}catch(T){k.error=T.errno}return k},createPath:function(d,E,I,k){d=typeof d=="string"?d:S.getPath(d);for(var T=E.split("/").reverse();T.length;){var Z=T.pop();if(!!Z){var te=Qt.join2(d,Z);try{S.mkdir(te)}catch{}d=te}}return te},createFile:function(d,E,I,k,T){var Z=Qt.join2(typeof d=="string"?d:S.getPath(d),E),te=S.getMode(k,T);return S.create(Z,te)},createDataFile:function(d,E,I,k,T,Z){var te=E?Qt.join2(typeof d=="string"?d:S.getPath(d),E):d,Be=S.getMode(k,T),me=S.create(te,Be);if(I){if(typeof I=="string"){for(var Je=new Array(I.length),nt=0,wt=I.length;nt<wt;++nt)Je[nt]=I.charCodeAt(nt);I=Je}S.chmod(me,Be|146);var lt=S.open(me,577);S.write(lt,I,0,I.length,0,Z),S.close(lt),S.chmod(me,Be)}return me},createDevice:function(d,E,I,k){var T=Qt.join2(typeof d=="string"?d:S.getPath(d),E),Z=S.getMode(!!I,!!k);S.createDevice.major||(S.createDevice.major=64);var te=S.makedev(S.createDevice.major++,0);return S.registerDevice(te,{open:function(Be){Be.seekable=!1},close:function(Be){k&&k.buffer&&k.buffer.length&&k(10)},read:function(Be,me,Je,nt,wt){for(var lt=0,it=0;it<nt;it++){var Et;try{Et=I()}catch{throw new S.ErrnoError(29)}if(Et===void 0&&lt===0)throw new S.ErrnoError(6);if(Et==null)break;lt++,me[Je+it]=Et}return lt&&(Be.node.timestamp=Date.now()),lt},write:function(Be,me,Je,nt,wt){for(var lt=0;lt<nt;lt++)try{k(me[Je+lt])}catch{throw new S.ErrnoError(29)}return nt&&(Be.node.timestamp=Date.now()),lt}}),S.mkdev(T,Z,te)},forceLoadFile:function(d){if(d.isDevice||d.isFolder||d.link||d.contents)return!0;if(typeof XMLHttpRequest<"u")throw new Error("Lazy loading should have been performed (contents set) in createLazyFile, but it was not. Lazy loading only works in web workers. Use --embed-file or --preload-file in emcc on the main thread.");if(p)try{d.contents=IA(p(d.url),!0),d.usedBytes=d.contents.length}catch{throw new S.ErrnoError(29)}else throw new Error("Cannot load without read() or XMLHttpRequest.")},createLazyFile:function(d,E,I,k,T){function Z(){this.lengthKnown=!1,this.chunks=[]}if(Z.prototype.get=function(lt){if(!(lt>this.length-1||lt<0)){var it=lt%this.chunkSize,Et=lt/this.chunkSize|0;return this.getter(Et)[it]}},Z.prototype.setDataGetter=function(lt){this.getter=lt},Z.prototype.cacheLength=function(){var lt=new XMLHttpRequest;if(lt.open("HEAD",I,!1),lt.send(null),!(lt.status>=200&&lt.status<300||lt.status===304))throw new Error("Couldn't load "+I+". Status: "+lt.status);var it=Number(lt.getResponseHeader("Content-length")),Et,Qe=(Et=lt.getResponseHeader("Accept-Ranges"))&&Et==="bytes",Ln=(Et=lt.getResponseHeader("Content-Encoding"))&&Et==="gzip",Ri=1024*1024;Qe||(Ri=it);var bA=function(ns,Ca){if(ns>Ca)throw new Error("invalid range ("+ns+", "+Ca+") or no bytes requested!");if(Ca>it-1)throw new Error("only "+it+" bytes available! programmer error!");var Kr=new XMLHttpRequest;if(Kr.open("GET",I,!1),it!==Ri&&Kr.setRequestHeader("Range","bytes="+ns+"-"+Ca),typeof Uint8Array<"u"&&(Kr.responseType="arraybuffer"),Kr.overrideMimeType&&Kr.overrideMimeType("text/plain; charset=x-user-defined"),Kr.send(null),!(Kr.status>=200&&Kr.status<300||Kr.status===304))throw new Error("Couldn't load "+I+". Status: "+Kr.status);return Kr.response!==void 0?new Uint8Array(Kr.response||[]):IA(Kr.responseText||"",!0)},Mr=this;Mr.setDataGetter(function(ns){var Ca=ns*Ri,Kr=(ns+1)*Ri-1;if(Kr=Math.min(Kr,it-1),typeof Mr.chunks[ns]>"u"&&(Mr.chunks[ns]=bA(Ca,Kr)),typeof Mr.chunks[ns]>"u")throw new Error("doXHR failed!");return Mr.chunks[ns]}),(Ln||!it)&&(Ri=it=1,it=this.getter(0).length,Ri=it,v("LazyFiles on gzip forces download of the whole file when length is accessed")),this._length=it,this._chunkSize=Ri,this.lengthKnown=!0},typeof XMLHttpRequest<"u"){if(!u)throw"Cannot do synchronous binary XHRs outside webworkers in modern browsers. Use --embed-file or --preload-file in emcc";var te=new Z;Object.defineProperties(te,{length:{get:function(){return this.lengthKnown||this.cacheLength(),this._length}},chunkSize:{get:function(){return this.lengthKnown||this.cacheLength(),this._chunkSize}}});var Be={isDevice:!1,contents:te}}else var Be={isDevice:!1,url:I};var me=S.createFile(d,E,Be,k,T);Be.contents?me.contents=Be.contents:Be.url&&(me.contents=null,me.url=Be.url),Object.defineProperties(me,{usedBytes:{get:function(){return this.contents.length}}});var Je={},nt=Object.keys(me.stream_ops);return nt.forEach(function(wt){var lt=me.stream_ops[wt];Je[wt]=function(){return S.forceLoadFile(me),lt.apply(null,arguments)}}),Je.read=function(lt,it,Et,Qe,Ln){S.forceLoadFile(me);var Ri=lt.node.contents;if(Ln>=Ri.length)return 0;var bA=Math.min(Ri.length-Ln,Qe);if(Ri.slice)for(var Mr=0;Mr<bA;Mr++)it[Et+Mr]=Ri[Ln+Mr];else for(var Mr=0;Mr<bA;Mr++)it[Et+Mr]=Ri.get(Ln+Mr);return bA},me.stream_ops=Je,me},createPreloadedFile:function(d,E,I,k,T,Z,te,Be,me,Je){Browser.init();var nt=E?Rn.resolve(Qt.join2(d,E)):d,wt="cp "+nt;function lt(it){function Et(Ln){Je&&Je(),Be||S.createDataFile(d,E,Ln,k,T,me),Z&&Z(),mA(wt)}var Qe=!1;t.preloadPlugins.forEach(function(Ln){Qe||Ln.canHandle(nt)&&(Ln.handle(it,nt,Et,function(){te&&te(),mA(wt)}),Qe=!0)}),Qe||Et(it)}CA(wt),typeof I=="string"?Browser.asyncLoad(I,function(it){lt(it)},te):lt(I)},indexedDB:function(){return window.indexedDB||window.mozIndexedDB||window.webkitIndexedDB||window.msIndexedDB},DB_NAME:function(){return"EM_FS_"+window.location.pathname},DB_VERSION:20,DB_STORE_NAME:"FILE_DATA",saveFilesToDB:function(d,E,I){E=E||function(){},I=I||function(){};var k=S.indexedDB();try{var T=k.open(S.DB_NAME(),S.DB_VERSION)}catch(Z){return I(Z)}T.onupgradeneeded=function(){v("creating db");var te=T.result;te.createObjectStore(S.DB_STORE_NAME)},T.onsuccess=function(){var te=T.result,Be=te.transaction([S.DB_STORE_NAME],"readwrite"),me=Be.objectStore(S.DB_STORE_NAME),Je=0,nt=0,wt=d.length;function lt(){nt==0?E():I()}d.forEach(function(it){var Et=me.put(S.analyzePath(it).object.contents,it);Et.onsuccess=function(){Je++,Je+nt==wt&&lt()},Et.onerror=function(){nt++,Je+nt==wt&&lt()}}),Be.onerror=I},T.onerror=I},loadFilesFromDB:function(d,E,I){E=E||function(){},I=I||function(){};var k=S.indexedDB();try{var T=k.open(S.DB_NAME(),S.DB_VERSION)}catch(Z){return I(Z)}T.onupgradeneeded=I,T.onsuccess=function(){var te=T.result;try{var Be=te.transaction([S.DB_STORE_NAME],"readonly")}catch(it){I(it);return}var me=Be.objectStore(S.DB_STORE_NAME),Je=0,nt=0,wt=d.length;function lt(){nt==0?E():I()}d.forEach(function(it){var Et=me.get(it);Et.onsuccess=function(){S.analyzePath(it).exists&&S.unlink(it),S.createDataFile(Qt.dirname(it),Qt.basename(it),Et.result,!0,!0,!0),Je++,Je+nt==wt&&lt()},Et.onerror=function(){nt++,Je+nt==wt&&lt()}}),Be.onerror=I},T.onerror=I}},Tt={mappings:{},DEFAULT_POLLMASK:5,umask:511,calculateAt:function(d,E,I){if(E[0]==="/")return E;var k;if(d===-100)k=S.cwd();else{var T=S.getStream(d);if(!T)throw new S.ErrnoError(8);k=T.path}if(E.length==0){if(!I)throw new S.ErrnoError(44);return k}return Qt.join2(k,E)},doStat:function(d,E,I){try{var k=d(E)}catch(T){if(T&&T.node&&Qt.normalize(E)!==Qt.normalize(S.getPath(T.node)))return-54;throw T}return de[I>>2]=k.dev,de[I+4>>2]=0,de[I+8>>2]=k.ino,de[I+12>>2]=k.mode,de[I+16>>2]=k.nlink,de[I+20>>2]=k.uid,de[I+24>>2]=k.gid,de[I+28>>2]=k.rdev,de[I+32>>2]=0,se=[k.size>>>0,(vr=k.size,+Math.abs(vr)>=1?vr>0?(Math.min(+Math.floor(vr/4294967296),4294967295)|0)>>>0:~~+Math.ceil((vr-+(~~vr>>>0))/4294967296)>>>0:0)],de[I+40>>2]=se[0],de[I+44>>2]=se[1],de[I+48>>2]=4096,de[I+52>>2]=k.blocks,de[I+56>>2]=k.atime.getTime()/1e3|0,de[I+60>>2]=0,de[I+64>>2]=k.mtime.getTime()/1e3|0,de[I+68>>2]=0,de[I+72>>2]=k.ctime.getTime()/1e3|0,de[I+76>>2]=0,se=[k.ino>>>0,(vr=k.ino,+Math.abs(vr)>=1?vr>0?(Math.min(+Math.floor(vr/4294967296),4294967295)|0)>>>0:~~+Math.ceil((vr-+(~~vr>>>0))/4294967296)>>>0:0)],de[I+80>>2]=se[0],de[I+84>>2]=se[1],0},doMsync:function(d,E,I,k,T){var Z=Y.slice(d,d+I);S.msync(E,Z,T,I,k)},doMkdir:function(d,E){return d=Qt.normalize(d),d[d.length-1]==="/"&&(d=d.substr(0,d.length-1)),S.mkdir(d,E,0),0},doMknod:function(d,E,I){switch(E&61440){case 32768:case 8192:case 24576:case 4096:case 49152:break;default:return-28}return S.mknod(d,E,I),0},doReadlink:function(d,E,I){if(I<=0)return-28;var k=S.readlink(d),T=Math.min(I,le(k)),Z=ne[E+T];return oe(k,E,I+1),ne[E+T]=Z,T},doAccess:function(d,E){if(E&-8)return-28;var I,k=S.lookupPath(d,{follow:!0});if(I=k.node,!I)return-44;var T="";return E&4&&(T+="r"),E&2&&(T+="w"),E&1&&(T+="x"),T&&S.nodePermissions(I,T)?-2:0},doDup:function(d,E,I){var k=S.getStream(I);return k&&S.close(k),S.open(d,E,0,I,I).fd},doReadv:function(d,E,I,k){for(var T=0,Z=0;Z<I;Z++){var te=de[E+Z*8>>2],Be=de[E+(Z*8+4)>>2],me=S.read(d,ne,te,Be,k);if(me<0)return-1;if(T+=me,me<Be)break}return T},doWritev:function(d,E,I,k){for(var T=0,Z=0;Z<I;Z++){var te=de[E+Z*8>>2],Be=de[E+(Z*8+4)>>2],me=S.write(d,ne,te,Be,k);if(me<0)return-1;T+=me}return T},varargs:void 0,get:function(){Tt.varargs+=4;var d=de[Tt.varargs-4>>2];return d},getStr:function(d){var E=Fe(d);return E},getStreamFromFD:function(d){var E=S.getStream(d);if(!E)throw new S.ErrnoError(8);return E},get64:function(d,E){return d}};function ug(d,E){try{return d=Tt.getStr(d),S.chmod(d,E),0}catch(I){return(typeof S>"u"||!(I instanceof S.ErrnoError))&&wr(I),-I.errno}}function Fl(d){return de[Ft()>>2]=d,d}function Qp(d,E,I){Tt.varargs=I;try{var k=Tt.getStreamFromFD(d);switch(E){case 0:{var T=Tt.get();if(T<0)return-28;var Z;return Z=S.open(k.path,k.flags,0,T),Z.fd}case 1:case 2:return 0;case 3:return k.flags;case 4:{var T=Tt.get();return k.flags|=T,0}case 12:{var T=Tt.get(),te=0;return pe[T+te>>1]=2,0}case 13:case 14:return 0;case 16:case 8:return-28;case 9:return Fl(28),-1;default:return-28}}catch(Be){return(typeof S>"u"||!(Be instanceof S.ErrnoError))&&wr(Be),-Be.errno}}function bp(d,E){try{var I=Tt.getStreamFromFD(d);return Tt.doStat(S.stat,I.path,E)}catch(k){return(typeof S>"u"||!(k instanceof S.ErrnoError))&&wr(k),-k.errno}}function Sp(d,E,I){Tt.varargs=I;try{var k=Tt.getStreamFromFD(d);switch(E){case 21509:case 21505:return k.tty?0:-59;case 21510:case 21511:case 21512:case 21506:case 21507:case 21508:return k.tty?0:-59;case 21519:{if(!k.tty)return-59;var T=Tt.get();return de[T>>2]=0,0}case 21520:return k.tty?-28:-59;case 21531:{var T=Tt.get();return S.ioctl(k,E,T)}case 21523:return k.tty?0:-59;case 21524:return k.tty?0:-59;default:wr("bad ioctl syscall "+E)}}catch(Z){return(typeof S>"u"||!(Z instanceof S.ErrnoError))&&wr(Z),-Z.errno}}function vp(d,E,I){Tt.varargs=I;try{var k=Tt.getStr(d),T=I?Tt.get():0,Z=S.open(k,E,T);return Z.fd}catch(te){return(typeof S>"u"||!(te instanceof S.ErrnoError))&&wr(te),-te.errno}}function xp(d,E){try{return d=Tt.getStr(d),E=Tt.getStr(E),S.rename(d,E),0}catch(I){return(typeof S>"u"||!(I instanceof S.ErrnoError))&&wr(I),-I.errno}}function G(d){try{return d=Tt.getStr(d),S.rmdir(d),0}catch(E){return(typeof S>"u"||!(E instanceof S.ErrnoError))&&wr(E),-E.errno}}function yt(d,E){try{return d=Tt.getStr(d),Tt.doStat(S.stat,d,E)}catch(I){return(typeof S>"u"||!(I instanceof S.ErrnoError))&&wr(I),-I.errno}}function EA(d){try{return d=Tt.getStr(d),S.unlink(d),0}catch(E){return(typeof S>"u"||!(E instanceof S.ErrnoError))&&wr(E),-E.errno}}function Ji(d,E,I){Y.copyWithin(d,E,E+I)}function Nl(d){try{return A.grow(d-qe.byteLength+65535>>>16),Or(A.buffer),1}catch{}}function Xe(d){var E=Y.length;d=d>>>0;var I=2147483648;if(d>I)return!1;for(var k=1;k<=4;k*=2){var T=E*(1+.2/k);T=Math.min(T,d+100663296);var Z=Math.min(I,Ae(Math.max(d,T),65536)),te=Nl(Z);if(te)return!0}return!1}function fa(d){try{var E=Tt.getStreamFromFD(d);return S.close(E),0}catch(I){return(typeof S>"u"||!(I instanceof S.ErrnoError))&&wr(I),I.errno}}function gg(d,E){try{var I=Tt.getStreamFromFD(d),k=I.tty?2:S.isDir(I.mode)?3:S.isLink(I.mode)?7:4;return ne[E>>0]=k,0}catch(T){return(typeof S>"u"||!(T instanceof S.ErrnoError))&&wr(T),T.errno}}function FE(d,E,I,k){try{var T=Tt.getStreamFromFD(d),Z=Tt.doReadv(T,E,I);return de[k>>2]=Z,0}catch(te){return(typeof S>"u"||!(te instanceof S.ErrnoError))&&wr(te),te.errno}}function Pp(d,E,I,k,T){try{var Z=Tt.getStreamFromFD(d),te=4294967296,Be=I*te+(E>>>0),me=9007199254740992;return Be<=-me||Be>=me?-61:(S.llseek(Z,Be,k),se=[Z.position>>>0,(vr=Z.position,+Math.abs(vr)>=1?vr>0?(Math.min(+Math.floor(vr/4294967296),4294967295)|0)>>>0:~~+Math.ceil((vr-+(~~vr>>>0))/4294967296)>>>0:0)],de[T>>2]=se[0],de[T+4>>2]=se[1],Z.getdents&&Be===0&&k===0&&(Z.getdents=null),0)}catch(Je){return(typeof S>"u"||!(Je instanceof S.ErrnoError))&&wr(Je),Je.errno}}function NE(d,E,I,k){try{var T=Tt.getStreamFromFD(d),Z=Tt.doWritev(T,E,I);return de[k>>2]=Z,0}catch(te){return(typeof S>"u"||!(te instanceof S.ErrnoError))&&wr(te),te.errno}}function ar(d){$(d)}function Fn(d){var E=Date.now()/1e3|0;return d&&(de[d>>2]=E),E}function Ll(){if(Ll.called)return;Ll.called=!0;var d=new Date().getFullYear(),E=new Date(d,0,1),I=new Date(d,6,1),k=E.getTimezoneOffset(),T=I.getTimezoneOffset(),Z=Math.max(k,T);de[rS()>>2]=Z*60,de[tS()>>2]=Number(k!=T);function te(wt){var lt=wt.toTimeString().match(/\(([A-Za-z ]+)\)$/);return lt?lt[1]:"GMT"}var Be=te(E),me=te(I),Je=we(Be),nt=we(me);T<k?(de[Eg()>>2]=Je,de[Eg()+4>>2]=nt):(de[Eg()>>2]=nt,de[Eg()+4>>2]=Je)}function Dp(d){Ll();var E=Date.UTC(de[d+20>>2]+1900,de[d+16>>2],de[d+12>>2],de[d+8>>2],de[d+4>>2],de[d>>2],0),I=new Date(E);de[d+24>>2]=I.getUTCDay();var k=Date.UTC(I.getUTCFullYear(),0,1,0,0,0,0),T=(I.getTime()-k)/(1e3*60*60*24)|0;return de[d+28>>2]=T,I.getTime()/1e3|0}var Ms=function(d,E,I,k){d||(d=this),this.parent=d,this.mount=d.mount,this.mounted=null,this.id=S.nextInode++,this.name=E,this.mode=I,this.node_ops={},this.stream_ops={},this.rdev=k},ha=365,An=146;if(Object.defineProperties(Ms.prototype,{read:{get:function(){return(this.mode&ha)===ha},set:function(d){d?this.mode|=ha:this.mode&=~ha}},write:{get:function(){return(this.mode&An)===An},set:function(d){d?this.mode|=An:this.mode&=~An}},isFolder:{get:function(){return S.isDir(this.mode)}},isDevice:{get:function(){return S.isChrdev(this.mode)}}}),S.FSNode=Ms,S.staticInit(),g){var Te=Z6,fg=J("path");At.staticInit()}if(g){var Tl=function(d){return function(){try{return d.apply(this,arguments)}catch(E){throw E.code?new S.ErrnoError(wo[E.code]):E}}},Ks=Object.assign({},S);for(var Ol in an)S[Ol]=Tl(an[Ol])}else throw new Error("NODERAWFS is currently only supported on Node.js environment.");function IA(d,E,I){var k=I>0?I:le(d)+1,T=new Array(k),Z=Ne(d,T,0,T.length);return E&&(T.length=Z),T}var hg=typeof atob=="function"?atob:function(d){var E="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",I="",k,T,Z,te,Be,me,Je,nt=0;d=d.replace(/[^A-Za-z0-9\+\/\=]/g,"");do te=E.indexOf(d.charAt(nt++)),Be=E.indexOf(d.charAt(nt++)),me=E.indexOf(d.charAt(nt++)),Je=E.indexOf(d.charAt(nt++)),k=te<<2|Be>>4,T=(Be&15)<<4|me>>2,Z=(me&3)<<6|Je,I=I+String.fromCharCode(k),me!==64&&(I=I+String.fromCharCode(T)),Je!==64&&(I=I+String.fromCharCode(Z));while(nt<d.length);return I};function pg(d){if(typeof g=="boolean"&&g){var E;try{E=Buffer.from(d,"base64")}catch{E=new Buffer(d,"base64")}return new Uint8Array(E.buffer,E.byteOffset,E.byteLength)}try{for(var I=hg(d),k=new Uint8Array(I.length),T=0;T<I.length;++T)k[T]=I.charCodeAt(T);return k}catch{throw new Error("Converting base64 string to bytes failed.")}}function pa(d){if(!!Ag(d))return pg(d.slice(kl.length))}var da={s:cg,p:ug,e:Qp,k:bp,o:Sp,q:vp,i:xp,r:G,c:yt,h:EA,l:Ji,m:Xe,f:fa,j:gg,g:FE,n:Pp,d:NE,a:ar,b:Fn,t:Dp},rt=Bp(),Bo=t.___wasm_call_ctors=rt.v,yA=t._zip_ext_count_symlinks=rt.w,Ml=t._zip_file_get_external_attributes=rt.x,Us=t._zipstruct_stat=rt.y,Kl=t._zipstruct_statS=rt.z,LE=t._zipstruct_stat_name=rt.A,kp=t._zipstruct_stat_index=rt.B,dg=t._zipstruct_stat_size=rt.C,Rp=t._zipstruct_stat_mtime=rt.D,TE=t._zipstruct_stat_crc=rt.E,Ul=t._zipstruct_error=rt.F,OE=t._zipstruct_errorS=rt.G,Cg=t._zipstruct_error_code_zip=rt.H,wA=t._zipstruct_stat_comp_size=rt.I,Rr=t._zipstruct_stat_comp_method=rt.J,ME=t._zip_close=rt.K,Hs=t._zip_delete=rt.L,Gs=t._zip_dir_add=rt.M,mg=t._zip_discard=rt.N,BA=t._zip_error_init_with_code=rt.O,R=t._zip_get_error=rt.P,q=t._zip_file_get_error=rt.Q,Ce=t._zip_error_strerror=rt.R,Ke=t._zip_fclose=rt.S,Re=t._zip_file_add=rt.T,ze=t._free=rt.U,dt=t._malloc=rt.V,Ft=t.___errno_location=rt.W,Nn=t._zip_source_error=rt.X,qb=t._zip_source_seek=rt.Y,S1=t._zip_file_set_external_attributes=rt.Z,v1=t._zip_file_set_mtime=rt._,Jb=t._zip_fopen=rt.$,x1=t._zip_fopen_index=rt.aa,P1=t._zip_fread=rt.ba,Wb=t._zip_get_name=rt.ca,D1=t._zip_get_num_entries=rt.da,k1=t._zip_source_read=rt.ea,zb=t._zip_name_locate=rt.fa,R1=t._zip_open=rt.ga,F1=t._zip_open_from_source=rt.ha,Vb=t._zip_set_file_compression=rt.ia,N1=t._zip_source_buffer=rt.ja,L1=t._zip_source_buffer_create=rt.ka,T1=t._zip_source_close=rt.la,O1=t._zip_source_free=rt.ma,Xb=t._zip_source_keep=rt.na,Zb=t._zip_source_open=rt.oa,_b=t._zip_source_set_mtime=rt.qa,$b=t._zip_source_tell=rt.ra,eS=t._zip_stat=rt.sa,M1=t._zip_stat_index=rt.ta,Eg=t.__get_tzname=rt.ua,tS=t.__get_daylight=rt.va,rS=t.__get_timezone=rt.wa,KE=t.stackSave=rt.xa,UE=t.stackRestore=rt.ya,Q=t.stackAlloc=rt.za;t.cwrap=ue,t.getValue=_;var Me;ga=function d(){Me||QA(),Me||(ga=d)};function QA(d){if(d=d||a,ts>0||(pr(),ts>0))return;function E(){Me||(Me=!0,t.calledRun=!0,!ae&&(Ii(),i(t),t.onRuntimeInitialized&&t.onRuntimeInitialized(),es()))}t.setStatus?(t.setStatus("Running..."),setTimeout(function(){setTimeout(function(){t.setStatus("")},1),E()},1)):E()}if(t.run=QA,t.preInit)for(typeof t.preInit=="function"&&(t.preInit=[t.preInit]);t.preInit.length>0;)t.preInit.pop()();return QA(),e}}();typeof dB=="object"&&typeof FR=="object"?FR.exports=RR:typeof define=="function"&&define.amd?define([],function(){return RR}):typeof dB=="object"&&(dB.createModule=RR)});var wV=w((Lst,yV)=>{function cke(r,e){for(var t=-1,i=r==null?0:r.length,n=Array(i);++t<i;)n[t]=e(r[t],t,r);return n}yV.exports=cke});var bs=w((Tst,BV)=>{var uke=Array.isArray;BV.exports=uke});var PV=w((Ost,xV)=>{var QV=xc(),gke=wV(),fke=bs(),hke=cC(),pke=1/0,bV=QV?QV.prototype:void 0,SV=bV?bV.toString:void 0;function vV(r){if(typeof r=="string")return r;if(fke(r))return gke(r,vV)+"";if(hke(r))return SV?SV.call(r):"";var e=r+"";return e=="0"&&1/r==-pke?"-0":e}xV.exports=vV});var Jf=w((Mst,DV)=>{var dke=PV();function Cke(r){return r==null?"":dke(r)}DV.exports=Cke});var HR=w((Kst,kV)=>{function mke(r,e,t){var i=-1,n=r.length;e<0&&(e=-e>n?0:n+e),t=t>n?n:t,t<0&&(t+=n),n=e>t?0:t-e>>>0,e>>>=0;for(var s=Array(n);++i<n;)s[i]=r[i+e];return s}kV.exports=mke});var FV=w((Ust,RV)=>{var Eke=HR();function Ike(r,e,t){var i=r.length;return t=t===void 0?i:t,!e&&t>=i?r:Eke(r,e,t)}RV.exports=Ike});var GR=w((Hst,NV)=>{var yke="\\ud800-\\udfff",wke="\\u0300-\\u036f",Bke="\\ufe20-\\ufe2f",Qke="\\u20d0-\\u20ff",bke=wke+Bke+Qke,Ske="\\ufe0e\\ufe0f",vke="\\u200d",xke=RegExp("["+vke+yke+bke+Ske+"]");function Pke(r){return xke.test(r)}NV.exports=Pke});var TV=w((Gst,LV)=>{function Dke(r){return r.split("")}LV.exports=Dke});var jV=w((Yst,YV)=>{var OV="\\ud800-\\udfff",kke="\\u0300-\\u036f",Rke="\\ufe20-\\ufe2f",Fke="\\u20d0-\\u20ff",Nke=kke+Rke+Fke,Lke="\\ufe0e\\ufe0f",Tke="["+OV+"]",YR="["+Nke+"]",jR="\\ud83c[\\udffb-\\udfff]",Oke="(?:"+YR+"|"+jR+")",MV="[^"+OV+"]",KV="(?:\\ud83c[\\udde6-\\uddff]){2}",UV="[\\ud800-\\udbff][\\udc00-\\udfff]",Mke="\\u200d",HV=Oke+"?",GV="["+Lke+"]?",Kke="(?:"+Mke+"(?:"+[MV,KV,UV].join("|")+")"+GV+HV+")*",Uke=GV+HV+Kke,Hke="(?:"+[MV+YR+"?",YR,KV,UV,Tke].join("|")+")",Gke=RegExp(jR+"(?="+jR+")|"+Hke+Uke,"g");function Yke(r){return r.match(Gke)||[]}YV.exports=Yke});var JV=w((jst,qV)=>{var jke=TV(),qke=GR(),Jke=jV();function Wke(r){return qke(r)?Jke(r):jke(r)}qV.exports=Wke});var zV=w((qst,WV)=>{var zke=FV(),Vke=GR(),Xke=JV(),Zke=Jf();function _ke(r){return function(e){e=Zke(e);var t=Vke(e)?Xke(e):void 0,i=t?t[0]:e.charAt(0),n=t?zke(t,1).join(""):e.slice(1);return i[r]()+n}}WV.exports=_ke});var XV=w((Jst,VV)=>{var $ke=zV(),eRe=$ke("toUpperCase");VV.exports=eRe});var bB=w((Wst,ZV)=>{var tRe=Jf(),rRe=XV();function iRe(r){return rRe(tRe(r).toLowerCase())}ZV.exports=iRe});var _V=w((zst,SB)=>{function nRe(){var r=0,e=1,t=2,i=3,n=4,s=5,o=6,a=7,l=8,c=9,u=10,g=11,f=12,h=13,p=14,C=15,y=16,B=17,v=0,D=1,L=2,H=3,j=4;function $(A,ae){return 55296<=A.charCodeAt(ae)&&A.charCodeAt(ae)<=56319&&56320<=A.charCodeAt(ae+1)&&A.charCodeAt(ae+1)<=57343}function V(A,ae){ae===void 0&&(ae=0);var ge=A.charCodeAt(ae);if(55296<=ge&&ge<=56319&&ae<A.length-1){var re=ge,O=A.charCodeAt(ae+1);return 56320<=O&&O<=57343?(re-55296)*1024+(O-56320)+65536:re}if(56320<=ge&&ge<=57343&&ae>=1){var re=A.charCodeAt(ae-1),O=ge;return 55296<=re&&re<=56319?(re-55296)*1024+(O-56320)+65536:O}return ge}function W(A,ae,ge){var re=[A].concat(ae).concat([ge]),O=re[re.length-2],F=ge,ue=re.lastIndexOf(p);if(ue>1&&re.slice(1,ue).every(function(Fe){return Fe==i})&&[i,h,B].indexOf(A)==-1)return L;var he=re.lastIndexOf(n);if(he>0&&re.slice(1,he).every(function(Fe){return Fe==n})&&[f,n].indexOf(O)==-1)return re.filter(function(Fe){return Fe==n}).length%2==1?H:j;if(O==r&&F==e)return v;if(O==t||O==r||O==e)return F==p&&ae.every(function(Fe){return Fe==i})?L:D;if(F==t||F==r||F==e)return D;if(O==o&&(F==o||F==a||F==c||F==u))return v;if((O==c||O==a)&&(F==a||F==l))return v;if((O==u||O==l)&&F==l)return v;if(F==i||F==C)return v;if(F==s)return v;if(O==f)return v;var ke=re.indexOf(i)!=-1?re.lastIndexOf(i)-1:re.length-2;return[h,B].indexOf(re[ke])!=-1&&re.slice(ke+1,-1).every(function(Fe){return Fe==i})&&F==p||O==C&&[y,B].indexOf(F)!=-1?v:ae.indexOf(n)!=-1?L:O==n&&F==n?v:D}this.nextBreak=function(A,ae){if(ae===void 0&&(ae=0),ae<0)return 0;if(ae>=A.length-1)return A.length;for(var ge=_(V(A,ae)),re=[],O=ae+1;O<A.length;O++)if(!$(A,O-1)){var F=_(V(A,O));if(W(ge,re,F))return O;re.push(F)}return A.length},this.splitGraphemes=function(A){for(var ae=[],ge=0,re;(re=this.nextBreak(A,ge))<A.length;)ae.push(A.slice(ge,re)),ge=re;return ge<A.length&&ae.push(A.slice(ge)),ae},this.iterateGraphemes=function(A){var ae=0,ge={next:function(){var re,O;return(O=this.nextBreak(A,ae))<A.length?(re=A.slice(ae,O),ae=O,{value:re,done:!1}):ae<A.length?(re=A.slice(ae),ae=A.length,{value:re,done:!1}):{value:void 0,done:!0}}.bind(this)};return typeof Symbol<"u"&&Symbol.iterator&&(ge[Symbol.iterator]=function(){return ge}),ge},this.countGraphemes=function(A){for(var ae=0,ge=0,re;(re=this.nextBreak(A,ge))<A.length;)ge=re,ae++;return ge<A.length&&ae++,ae};function _(A){return 1536<=A&&A<=1541||A==1757||A==1807||A==2274||A==3406||A==69821||70082<=A&&A<=70083||A==72250||72326<=A&&A<=72329||A==73030?f:A==13?r:A==10?e:0<=A&&A<=9||11<=A&&A<=12||14<=A&&A<=31||127<=A&&A<=159||A==173||A==1564||A==6158||A==8203||8206<=A&&A<=8207||A==8232||A==8233||8234<=A&&A<=8238||8288<=A&&A<=8292||A==8293||8294<=A&&A<=8303||55296<=A&&A<=57343||A==65279||65520<=A&&A<=65528||65529<=A&&A<=65531||113824<=A&&A<=113827||119155<=A&&A<=119162||A==917504||A==917505||917506<=A&&A<=917535||917632<=A&&A<=917759||918e3<=A&&A<=921599?t:768<=A&&A<=879||1155<=A&&A<=1159||1160<=A&&A<=1161||1425<=A&&A<=1469||A==1471||1473<=A&&A<=1474||1476<=A&&A<=1477||A==1479||1552<=A&&A<=1562||1611<=A&&A<=1631||A==1648||1750<=A&&A<=1756||1759<=A&&A<=1764||1767<=A&&A<=1768||1770<=A&&A<=1773||A==1809||1840<=A&&A<=1866||1958<=A&&A<=1968||2027<=A&&A<=2035||2070<=A&&A<=2073||2075<=A&&A<=2083||2085<=A&&A<=2087||2089<=A&&A<=2093||2137<=A&&A<=2139||2260<=A&&A<=2273||2275<=A&&A<=2306||A==2362||A==2364||2369<=A&&A<=2376||A==2381||2385<=A&&A<=2391||2402<=A&&A<=2403||A==2433||A==2492||A==2494||2497<=A&&A<=2500||A==2509||A==2519||2530<=A&&A<=2531||2561<=A&&A<=2562||A==2620||2625<=A&&A<=2626||2631<=A&&A<=2632||2635<=A&&A<=2637||A==2641||2672<=A&&A<=2673||A==2677||2689<=A&&A<=2690||A==2748||2753<=A&&A<=2757||2759<=A&&A<=2760||A==2765||2786<=A&&A<=2787||2810<=A&&A<=2815||A==2817||A==2876||A==2878||A==2879||2881<=A&&A<=2884||A==2893||A==2902||A==2903||2914<=A&&A<=2915||A==2946||A==3006||A==3008||A==3021||A==3031||A==3072||3134<=A&&A<=3136||3142<=A&&A<=3144||3146<=A&&A<=3149||3157<=A&&A<=3158||3170<=A&&A<=3171||A==3201||A==3260||A==3263||A==3266||A==3270||3276<=A&&A<=3277||3285<=A&&A<=3286||3298<=A&&A<=3299||3328<=A&&A<=3329||3387<=A&&A<=3388||A==3390||3393<=A&&A<=3396||A==3405||A==3415||3426<=A&&A<=3427||A==3530||A==3535||3538<=A&&A<=3540||A==3542||A==3551||A==3633||3636<=A&&A<=3642||3655<=A&&A<=3662||A==3761||3764<=A&&A<=3769||3771<=A&&A<=3772||3784<=A&&A<=3789||3864<=A&&A<=3865||A==3893||A==3895||A==3897||3953<=A&&A<=3966||3968<=A&&A<=3972||3974<=A&&A<=3975||3981<=A&&A<=3991||3993<=A&&A<=4028||A==4038||4141<=A&&A<=4144||4146<=A&&A<=4151||4153<=A&&A<=4154||4157<=A&&A<=4158||4184<=A&&A<=4185||4190<=A&&A<=4192||4209<=A&&A<=4212||A==4226||4229<=A&&A<=4230||A==4237||A==4253||4957<=A&&A<=4959||5906<=A&&A<=5908||5938<=A&&A<=5940||5970<=A&&A<=5971||6002<=A&&A<=6003||6068<=A&&A<=6069||6071<=A&&A<=6077||A==6086||6089<=A&&A<=6099||A==6109||6155<=A&&A<=6157||6277<=A&&A<=6278||A==6313||6432<=A&&A<=6434||6439<=A&&A<=6440||A==6450||6457<=A&&A<=6459||6679<=A&&A<=6680||A==6683||A==6742||6744<=A&&A<=6750||A==6752||A==6754||6757<=A&&A<=6764||6771<=A&&A<=6780||A==6783||6832<=A&&A<=6845||A==6846||6912<=A&&A<=6915||A==6964||6966<=A&&A<=6970||A==6972||A==6978||7019<=A&&A<=7027||7040<=A&&A<=7041||7074<=A&&A<=7077||7080<=A&&A<=7081||7083<=A&&A<=7085||A==7142||7144<=A&&A<=7145||A==7149||7151<=A&&A<=7153||7212<=A&&A<=7219||7222<=A&&A<=7223||7376<=A&&A<=7378||7380<=A&&A<=7392||7394<=A&&A<=7400||A==7405||A==7412||7416<=A&&A<=7417||7616<=A&&A<=7673||7675<=A&&A<=7679||A==8204||8400<=A&&A<=8412||8413<=A&&A<=8416||A==8417||8418<=A&&A<=8420||8421<=A&&A<=8432||11503<=A&&A<=11505||A==11647||11744<=A&&A<=11775||12330<=A&&A<=12333||12334<=A&&A<=12335||12441<=A&&A<=12442||A==42607||42608<=A&&A<=42610||42612<=A&&A<=42621||42654<=A&&A<=42655||42736<=A&&A<=42737||A==43010||A==43014||A==43019||43045<=A&&A<=43046||43204<=A&&A<=43205||43232<=A&&A<=43249||43302<=A&&A<=43309||43335<=A&&A<=43345||43392<=A&&A<=43394||A==43443||43446<=A&&A<=43449||A==43452||A==43493||43561<=A&&A<=43566||43569<=A&&A<=43570||43573<=A&&A<=43574||A==43587||A==43596||A==43644||A==43696||43698<=A&&A<=43700||43703<=A&&A<=43704||43710<=A&&A<=43711||A==43713||43756<=A&&A<=43757||A==43766||A==44005||A==44008||A==44013||A==64286||65024<=A&&A<=65039||65056<=A&&A<=65071||65438<=A&&A<=65439||A==66045||A==66272||66422<=A&&A<=66426||68097<=A&&A<=68099||68101<=A&&A<=68102||68108<=A&&A<=68111||68152<=A&&A<=68154||A==68159||68325<=A&&A<=68326||A==69633||69688<=A&&A<=69702||69759<=A&&A<=69761||69811<=A&&A<=69814||69817<=A&&A<=69818||69888<=A&&A<=69890||69927<=A&&A<=69931||69933<=A&&A<=69940||A==70003||70016<=A&&A<=70017||70070<=A&&A<=70078||70090<=A&&A<=70092||70191<=A&&A<=70193||A==70196||70198<=A&&A<=70199||A==70206||A==70367||70371<=A&&A<=70378||70400<=A&&A<=70401||A==70460||A==70462||A==70464||A==70487||70502<=A&&A<=70508||70512<=A&&A<=70516||70712<=A&&A<=70719||70722<=A&&A<=70724||A==70726||A==70832||70835<=A&&A<=70840||A==70842||A==70845||70847<=A&&A<=70848||70850<=A&&A<=70851||A==71087||71090<=A&&A<=71093||71100<=A&&A<=71101||71103<=A&&A<=71104||71132<=A&&A<=71133||71219<=A&&A<=71226||A==71229||71231<=A&&A<=71232||A==71339||A==71341||71344<=A&&A<=71349||A==71351||71453<=A&&A<=71455||71458<=A&&A<=71461||71463<=A&&A<=71467||72193<=A&&A<=72198||72201<=A&&A<=72202||72243<=A&&A<=72248||72251<=A&&A<=72254||A==72263||72273<=A&&A<=72278||72281<=A&&A<=72283||72330<=A&&A<=72342||72344<=A&&A<=72345||72752<=A&&A<=72758||72760<=A&&A<=72765||A==72767||72850<=A&&A<=72871||72874<=A&&A<=72880||72882<=A&&A<=72883||72885<=A&&A<=72886||73009<=A&&A<=73014||A==73018||73020<=A&&A<=73021||73023<=A&&A<=73029||A==73031||92912<=A&&A<=92916||92976<=A&&A<=92982||94095<=A&&A<=94098||113821<=A&&A<=113822||A==119141||119143<=A&&A<=119145||119150<=A&&A<=119154||119163<=A&&A<=119170||119173<=A&&A<=119179||119210<=A&&A<=119213||119362<=A&&A<=119364||121344<=A&&A<=121398||121403<=A&&A<=121452||A==121461||A==121476||121499<=A&&A<=121503||121505<=A&&A<=121519||122880<=A&&A<=122886||122888<=A&&A<=122904||122907<=A&&A<=122913||122915<=A&&A<=122916||122918<=A&&A<=122922||125136<=A&&A<=125142||125252<=A&&A<=125258||917536<=A&&A<=917631||917760<=A&&A<=917999?i:127462<=A&&A<=127487?n:A==2307||A==2363||2366<=A&&A<=2368||2377<=A&&A<=2380||2382<=A&&A<=2383||2434<=A&&A<=2435||2495<=A&&A<=2496||2503<=A&&A<=2504||2507<=A&&A<=2508||A==2563||2622<=A&&A<=2624||A==2691||2750<=A&&A<=2752||A==2761||2763<=A&&A<=2764||2818<=A&&A<=2819||A==2880||2887<=A&&A<=2888||2891<=A&&A<=2892||A==3007||3009<=A&&A<=3010||3014<=A&&A<=3016||3018<=A&&A<=3020||3073<=A&&A<=3075||3137<=A&&A<=3140||3202<=A&&A<=3203||A==3262||3264<=A&&A<=3265||3267<=A&&A<=3268||3271<=A&&A<=3272||3274<=A&&A<=3275||3330<=A&&A<=3331||3391<=A&&A<=3392||3398<=A&&A<=3400||3402<=A&&A<=3404||3458<=A&&A<=3459||3536<=A&&A<=3537||3544<=A&&A<=3550||3570<=A&&A<=3571||A==3635||A==3763||3902<=A&&A<=3903||A==3967||A==4145||4155<=A&&A<=4156||4182<=A&&A<=4183||A==4228||A==6070||6078<=A&&A<=6085||6087<=A&&A<=6088||6435<=A&&A<=6438||6441<=A&&A<=6443||6448<=A&&A<=6449||6451<=A&&A<=6456||6681<=A&&A<=6682||A==6741||A==6743||6765<=A&&A<=6770||A==6916||A==6965||A==6971||6973<=A&&A<=6977||6979<=A&&A<=6980||A==7042||A==7073||7078<=A&&A<=7079||A==7082||A==7143||7146<=A&&A<=7148||A==7150||7154<=A&&A<=7155||7204<=A&&A<=7211||7220<=A&&A<=7221||A==7393||7410<=A&&A<=7411||A==7415||43043<=A&&A<=43044||A==43047||43136<=A&&A<=43137||43188<=A&&A<=43203||43346<=A&&A<=43347||A==43395||43444<=A&&A<=43445||43450<=A&&A<=43451||43453<=A&&A<=43456||43567<=A&&A<=43568||43571<=A&&A<=43572||A==43597||A==43755||43758<=A&&A<=43759||A==43765||44003<=A&&A<=44004||44006<=A&&A<=44007||44009<=A&&A<=44010||A==44012||A==69632||A==69634||A==69762||69808<=A&&A<=69810||69815<=A&&A<=69816||A==69932||A==70018||70067<=A&&A<=70069||70079<=A&&A<=70080||70188<=A&&A<=70190||70194<=A&&A<=70195||A==70197||70368<=A&&A<=70370||70402<=A&&A<=70403||A==70463||70465<=A&&A<=70468||70471<=A&&A<=70472||70475<=A&&A<=70477||70498<=A&&A<=70499||70709<=A&&A<=70711||70720<=A&&A<=70721||A==70725||70833<=A&&A<=70834||A==70841||70843<=A&&A<=70844||A==70846||A==70849||71088<=A&&A<=71089||71096<=A&&A<=71099||A==71102||71216<=A&&A<=71218||71227<=A&&A<=71228||A==71230||A==71340||71342<=A&&A<=71343||A==71350||71456<=A&&A<=71457||A==71462||72199<=A&&A<=72200||A==72249||72279<=A&&A<=72280||A==72343||A==72751||A==72766||A==72873||A==72881||A==72884||94033<=A&&A<=94078||A==119142||A==119149?s:4352<=A&&A<=4447||43360<=A&&A<=43388?o:4448<=A&&A<=4519||55216<=A&&A<=55238?a:4520<=A&&A<=4607||55243<=A&&A<=55291?l:A==44032||A==44060||A==44088||A==44116||A==44144||A==44172||A==44200||A==44228||A==44256||A==44284||A==44312||A==44340||A==44368||A==44396||A==44424||A==44452||A==44480||A==44508||A==44536||A==44564||A==44592||A==44620||A==44648||A==44676||A==44704||A==44732||A==44760||A==44788||A==44816||A==44844||A==44872||A==44900||A==44928||A==44956||A==44984||A==45012||A==45040||A==45068||A==45096||A==45124||A==45152||A==45180||A==45208||A==45236||A==45264||A==45292||A==45320||A==45348||A==45376||A==45404||A==45432||A==45460||A==45488||A==45516||A==45544||A==45572||A==45600||A==45628||A==45656||A==45684||A==45712||A==45740||A==45768||A==45796||A==45824||A==45852||A==45880||A==45908||A==45936||A==45964||A==45992||A==46020||A==46048||A==46076||A==46104||A==46132||A==46160||A==46188||A==46216||A==46244||A==46272||A==46300||A==46328||A==46356||A==46384||A==46412||A==46440||A==46468||A==46496||A==46524||A==46552||A==46580||A==46608||A==46636||A==46664||A==46692||A==46720||A==46748||A==46776||A==46804||A==46832||A==46860||A==46888||A==46916||A==46944||A==46972||A==47e3||A==47028||A==47056||A==47084||A==47112||A==47140||A==47168||A==47196||A==47224||A==47252||A==47280||A==47308||A==47336||A==47364||A==47392||A==47420||A==47448||A==47476||A==47504||A==47532||A==47560||A==47588||A==47616||A==47644||A==47672||A==47700||A==47728||A==47756||A==47784||A==47812||A==47840||A==47868||A==47896||A==47924||A==47952||A==47980||A==48008||A==48036||A==48064||A==48092||A==48120||A==48148||A==48176||A==48204||A==48232||A==48260||A==48288||A==48316||A==48344||A==48372||A==48400||A==48428||A==48456||A==48484||A==48512||A==48540||A==48568||A==48596||A==48624||A==48652||A==48680||A==48708||A==48736||A==48764||A==48792||A==48820||A==48848||A==48876||A==48904||A==48932||A==48960||A==48988||A==49016||A==49044||A==49072||A==49100||A==49128||A==49156||A==49184||A==49212||A==49240||A==49268||A==49296||A==49324||A==49352||A==49380||A==49408||A==49436||A==49464||A==49492||A==49520||A==49548||A==49576||A==49604||A==49632||A==49660||A==49688||A==49716||A==49744||A==49772||A==49800||A==49828||A==49856||A==49884||A==49912||A==49940||A==49968||A==49996||A==50024||A==50052||A==50080||A==50108||A==50136||A==50164||A==50192||A==50220||A==50248||A==50276||A==50304||A==50332||A==50360||A==50388||A==50416||A==50444||A==50472||A==50500||A==50528||A==50556||A==50584||A==50612||A==50640||A==50668||A==50696||A==50724||A==50752||A==50780||A==50808||A==50836||A==50864||A==50892||A==50920||A==50948||A==50976||A==51004||A==51032||A==51060||A==51088||A==51116||A==51144||A==51172||A==51200||A==51228||A==51256||A==51284||A==51312||A==51340||A==51368||A==51396||A==51424||A==51452||A==51480||A==51508||A==51536||A==51564||A==51592||A==51620||A==51648||A==51676||A==51704||A==51732||A==51760||A==51788||A==51816||A==51844||A==51872||A==51900||A==51928||A==51956||A==51984||A==52012||A==52040||A==52068||A==52096||A==52124||A==52152||A==52180||A==52208||A==52236||A==52264||A==52292||A==52320||A==52348||A==52376||A==52404||A==52432||A==52460||A==52488||A==52516||A==52544||A==52572||A==52600||A==52628||A==52656||A==52684||A==52712||A==52740||A==52768||A==52796||A==52824||A==52852||A==52880||A==52908||A==52936||A==52964||A==52992||A==53020||A==53048||A==53076||A==53104||A==53132||A==53160||A==53188||A==53216||A==53244||A==53272||A==53300||A==53328||A==53356||A==53384||A==53412||A==53440||A==53468||A==53496||A==53524||A==53552||A==53580||A==53608||A==53636||A==53664||A==53692||A==53720||A==53748||A==53776||A==53804||A==53832||A==53860||A==53888||A==53916||A==53944||A==53972||A==54e3||A==54028||A==54056||A==54084||A==54112||A==54140||A==54168||A==54196||A==54224||A==54252||A==54280||A==54308||A==54336||A==54364||A==54392||A==54420||A==54448||A==54476||A==54504||A==54532||A==54560||A==54588||A==54616||A==54644||A==54672||A==54700||A==54728||A==54756||A==54784||A==54812||A==54840||A==54868||A==54896||A==54924||A==54952||A==54980||A==55008||A==55036||A==55064||A==55092||A==55120||A==55148||A==55176?c:44033<=A&&A<=44059||44061<=A&&A<=44087||44089<=A&&A<=44115||44117<=A&&A<=44143||44145<=A&&A<=44171||44173<=A&&A<=44199||44201<=A&&A<=44227||44229<=A&&A<=44255||44257<=A&&A<=44283||44285<=A&&A<=44311||44313<=A&&A<=44339||44341<=A&&A<=44367||44369<=A&&A<=44395||44397<=A&&A<=44423||44425<=A&&A<=44451||44453<=A&&A<=44479||44481<=A&&A<=44507||44509<=A&&A<=44535||44537<=A&&A<=44563||44565<=A&&A<=44591||44593<=A&&A<=44619||44621<=A&&A<=44647||44649<=A&&A<=44675||44677<=A&&A<=44703||44705<=A&&A<=44731||44733<=A&&A<=44759||44761<=A&&A<=44787||44789<=A&&A<=44815||44817<=A&&A<=44843||44845<=A&&A<=44871||44873<=A&&A<=44899||44901<=A&&A<=44927||44929<=A&&A<=44955||44957<=A&&A<=44983||44985<=A&&A<=45011||45013<=A&&A<=45039||45041<=A&&A<=45067||45069<=A&&A<=45095||45097<=A&&A<=45123||45125<=A&&A<=45151||45153<=A&&A<=45179||45181<=A&&A<=45207||45209<=A&&A<=45235||45237<=A&&A<=45263||45265<=A&&A<=45291||45293<=A&&A<=45319||45321<=A&&A<=45347||45349<=A&&A<=45375||45377<=A&&A<=45403||45405<=A&&A<=45431||45433<=A&&A<=45459||45461<=A&&A<=45487||45489<=A&&A<=45515||45517<=A&&A<=45543||45545<=A&&A<=45571||45573<=A&&A<=45599||45601<=A&&A<=45627||45629<=A&&A<=45655||45657<=A&&A<=45683||45685<=A&&A<=45711||45713<=A&&A<=45739||45741<=A&&A<=45767||45769<=A&&A<=45795||45797<=A&&A<=45823||45825<=A&&A<=45851||45853<=A&&A<=45879||45881<=A&&A<=45907||45909<=A&&A<=45935||45937<=A&&A<=45963||45965<=A&&A<=45991||45993<=A&&A<=46019||46021<=A&&A<=46047||46049<=A&&A<=46075||46077<=A&&A<=46103||46105<=A&&A<=46131||46133<=A&&A<=46159||46161<=A&&A<=46187||46189<=A&&A<=46215||46217<=A&&A<=46243||46245<=A&&A<=46271||46273<=A&&A<=46299||46301<=A&&A<=46327||46329<=A&&A<=46355||46357<=A&&A<=46383||46385<=A&&A<=46411||46413<=A&&A<=46439||46441<=A&&A<=46467||46469<=A&&A<=46495||46497<=A&&A<=46523||46525<=A&&A<=46551||46553<=A&&A<=46579||46581<=A&&A<=46607||46609<=A&&A<=46635||46637<=A&&A<=46663||46665<=A&&A<=46691||46693<=A&&A<=46719||46721<=A&&A<=46747||46749<=A&&A<=46775||46777<=A&&A<=46803||46805<=A&&A<=46831||46833<=A&&A<=46859||46861<=A&&A<=46887||46889<=A&&A<=46915||46917<=A&&A<=46943||46945<=A&&A<=46971||46973<=A&&A<=46999||47001<=A&&A<=47027||47029<=A&&A<=47055||47057<=A&&A<=47083||47085<=A&&A<=47111||47113<=A&&A<=47139||47141<=A&&A<=47167||47169<=A&&A<=47195||47197<=A&&A<=47223||47225<=A&&A<=47251||47253<=A&&A<=47279||47281<=A&&A<=47307||47309<=A&&A<=47335||47337<=A&&A<=47363||47365<=A&&A<=47391||47393<=A&&A<=47419||47421<=A&&A<=47447||47449<=A&&A<=47475||47477<=A&&A<=47503||47505<=A&&A<=47531||47533<=A&&A<=47559||47561<=A&&A<=47587||47589<=A&&A<=47615||47617<=A&&A<=47643||47645<=A&&A<=47671||47673<=A&&A<=47699||47701<=A&&A<=47727||47729<=A&&A<=47755||47757<=A&&A<=47783||47785<=A&&A<=47811||47813<=A&&A<=47839||47841<=A&&A<=47867||47869<=A&&A<=47895||47897<=A&&A<=47923||47925<=A&&A<=47951||47953<=A&&A<=47979||47981<=A&&A<=48007||48009<=A&&A<=48035||48037<=A&&A<=48063||48065<=A&&A<=48091||48093<=A&&A<=48119||48121<=A&&A<=48147||48149<=A&&A<=48175||48177<=A&&A<=48203||48205<=A&&A<=48231||48233<=A&&A<=48259||48261<=A&&A<=48287||48289<=A&&A<=48315||48317<=A&&A<=48343||48345<=A&&A<=48371||48373<=A&&A<=48399||48401<=A&&A<=48427||48429<=A&&A<=48455||48457<=A&&A<=48483||48485<=A&&A<=48511||48513<=A&&A<=48539||48541<=A&&A<=48567||48569<=A&&A<=48595||48597<=A&&A<=48623||48625<=A&&A<=48651||48653<=A&&A<=48679||48681<=A&&A<=48707||48709<=A&&A<=48735||48737<=A&&A<=48763||48765<=A&&A<=48791||48793<=A&&A<=48819||48821<=A&&A<=48847||48849<=A&&A<=48875||48877<=A&&A<=48903||48905<=A&&A<=48931||48933<=A&&A<=48959||48961<=A&&A<=48987||48989<=A&&A<=49015||49017<=A&&A<=49043||49045<=A&&A<=49071||49073<=A&&A<=49099||49101<=A&&A<=49127||49129<=A&&A<=49155||49157<=A&&A<=49183||49185<=A&&A<=49211||49213<=A&&A<=49239||49241<=A&&A<=49267||49269<=A&&A<=49295||49297<=A&&A<=49323||49325<=A&&A<=49351||49353<=A&&A<=49379||49381<=A&&A<=49407||49409<=A&&A<=49435||49437<=A&&A<=49463||49465<=A&&A<=49491||49493<=A&&A<=49519||49521<=A&&A<=49547||49549<=A&&A<=49575||49577<=A&&A<=49603||49605<=A&&A<=49631||49633<=A&&A<=49659||49661<=A&&A<=49687||49689<=A&&A<=49715||49717<=A&&A<=49743||49745<=A&&A<=49771||49773<=A&&A<=49799||49801<=A&&A<=49827||49829<=A&&A<=49855||49857<=A&&A<=49883||49885<=A&&A<=49911||49913<=A&&A<=49939||49941<=A&&A<=49967||49969<=A&&A<=49995||49997<=A&&A<=50023||50025<=A&&A<=50051||50053<=A&&A<=50079||50081<=A&&A<=50107||50109<=A&&A<=50135||50137<=A&&A<=50163||50165<=A&&A<=50191||50193<=A&&A<=50219||50221<=A&&A<=50247||50249<=A&&A<=50275||50277<=A&&A<=50303||50305<=A&&A<=50331||50333<=A&&A<=50359||50361<=A&&A<=50387||50389<=A&&A<=50415||50417<=A&&A<=50443||50445<=A&&A<=50471||50473<=A&&A<=50499||50501<=A&&A<=50527||50529<=A&&A<=50555||50557<=A&&A<=50583||50585<=A&&A<=50611||50613<=A&&A<=50639||50641<=A&&A<=50667||50669<=A&&A<=50695||50697<=A&&A<=50723||50725<=A&&A<=50751||50753<=A&&A<=50779||50781<=A&&A<=50807||50809<=A&&A<=50835||50837<=A&&A<=50863||50865<=A&&A<=50891||50893<=A&&A<=50919||50921<=A&&A<=50947||50949<=A&&A<=50975||50977<=A&&A<=51003||51005<=A&&A<=51031||51033<=A&&A<=51059||51061<=A&&A<=51087||51089<=A&&A<=51115||51117<=A&&A<=51143||51145<=A&&A<=51171||51173<=A&&A<=51199||51201<=A&&A<=51227||51229<=A&&A<=51255||51257<=A&&A<=51283||51285<=A&&A<=51311||51313<=A&&A<=51339||51341<=A&&A<=51367||51369<=A&&A<=51395||51397<=A&&A<=51423||51425<=A&&A<=51451||51453<=A&&A<=51479||51481<=A&&A<=51507||51509<=A&&A<=51535||51537<=A&&A<=51563||51565<=A&&A<=51591||51593<=A&&A<=51619||51621<=A&&A<=51647||51649<=A&&A<=51675||51677<=A&&A<=51703||51705<=A&&A<=51731||51733<=A&&A<=51759||51761<=A&&A<=51787||51789<=A&&A<=51815||51817<=A&&A<=51843||51845<=A&&A<=51871||51873<=A&&A<=51899||51901<=A&&A<=51927||51929<=A&&A<=51955||51957<=A&&A<=51983||51985<=A&&A<=52011||52013<=A&&A<=52039||52041<=A&&A<=52067||52069<=A&&A<=52095||52097<=A&&A<=52123||52125<=A&&A<=52151||52153<=A&&A<=52179||52181<=A&&A<=52207||52209<=A&&A<=52235||52237<=A&&A<=52263||52265<=A&&A<=52291||52293<=A&&A<=52319||52321<=A&&A<=52347||52349<=A&&A<=52375||52377<=A&&A<=52403||52405<=A&&A<=52431||52433<=A&&A<=52459||52461<=A&&A<=52487||52489<=A&&A<=52515||52517<=A&&A<=52543||52545<=A&&A<=52571||52573<=A&&A<=52599||52601<=A&&A<=52627||52629<=A&&A<=52655||52657<=A&&A<=52683||52685<=A&&A<=52711||52713<=A&&A<=52739||52741<=A&&A<=52767||52769<=A&&A<=52795||52797<=A&&A<=52823||52825<=A&&A<=52851||52853<=A&&A<=52879||52881<=A&&A<=52907||52909<=A&&A<=52935||52937<=A&&A<=52963||52965<=A&&A<=52991||52993<=A&&A<=53019||53021<=A&&A<=53047||53049<=A&&A<=53075||53077<=A&&A<=53103||53105<=A&&A<=53131||53133<=A&&A<=53159||53161<=A&&A<=53187||53189<=A&&A<=53215||53217<=A&&A<=53243||53245<=A&&A<=53271||53273<=A&&A<=53299||53301<=A&&A<=53327||53329<=A&&A<=53355||53357<=A&&A<=53383||53385<=A&&A<=53411||53413<=A&&A<=53439||53441<=A&&A<=53467||53469<=A&&A<=53495||53497<=A&&A<=53523||53525<=A&&A<=53551||53553<=A&&A<=53579||53581<=A&&A<=53607||53609<=A&&A<=53635||53637<=A&&A<=53663||53665<=A&&A<=53691||53693<=A&&A<=53719||53721<=A&&A<=53747||53749<=A&&A<=53775||53777<=A&&A<=53803||53805<=A&&A<=53831||53833<=A&&A<=53859||53861<=A&&A<=53887||53889<=A&&A<=53915||53917<=A&&A<=53943||53945<=A&&A<=53971||53973<=A&&A<=53999||54001<=A&&A<=54027||54029<=A&&A<=54055||54057<=A&&A<=54083||54085<=A&&A<=54111||54113<=A&&A<=54139||54141<=A&&A<=54167||54169<=A&&A<=54195||54197<=A&&A<=54223||54225<=A&&A<=54251||54253<=A&&A<=54279||54281<=A&&A<=54307||54309<=A&&A<=54335||54337<=A&&A<=54363||54365<=A&&A<=54391||54393<=A&&A<=54419||54421<=A&&A<=54447||54449<=A&&A<=54475||54477<=A&&A<=54503||54505<=A&&A<=54531||54533<=A&&A<=54559||54561<=A&&A<=54587||54589<=A&&A<=54615||54617<=A&&A<=54643||54645<=A&&A<=54671||54673<=A&&A<=54699||54701<=A&&A<=54727||54729<=A&&A<=54755||54757<=A&&A<=54783||54785<=A&&A<=54811||54813<=A&&A<=54839||54841<=A&&A<=54867||54869<=A&&A<=54895||54897<=A&&A<=54923||54925<=A&&A<=54951||54953<=A&&A<=54979||54981<=A&&A<=55007||55009<=A&&A<=55035||55037<=A&&A<=55063||55065<=A&&A<=55091||55093<=A&&A<=55119||55121<=A&&A<=55147||55149<=A&&A<=55175||55177<=A&&A<=55203?u:A==9757||A==9977||9994<=A&&A<=9997||A==127877||127938<=A&&A<=127940||A==127943||127946<=A&&A<=127948||128066<=A&&A<=128067||128070<=A&&A<=128080||A==128110||128112<=A&&A<=128120||A==128124||128129<=A&&A<=128131||128133<=A&&A<=128135||A==128170||128372<=A&&A<=128373||A==128378||A==128400||128405<=A&&A<=128406||128581<=A&&A<=128583||128587<=A&&A<=128591||A==128675||128692<=A&&A<=128694||A==128704||A==128716||129304<=A&&A<=129308||129310<=A&&A<=129311||A==129318||129328<=A&&A<=129337||129341<=A&&A<=129342||129489<=A&&A<=129501?h:127995<=A&&A<=127999?p:A==8205?C:A==9792||A==9794||9877<=A&&A<=9878||A==9992||A==10084||A==127752||A==127806||A==127859||A==127891||A==127908||A==127912||A==127979||A==127981||A==128139||128187<=A&&A<=128188||A==128295||A==128300||A==128488||A==128640||A==128658?y:128102<=A&&A<=128105?B:g}return this}typeof SB<"u"&&SB.exports&&(SB.exports=nRe)});var e7=w((Vst,$V)=>{var sRe=/^(.*?)(\x1b\[[^m]+m|\x1b\]8;;.*?(\x1b\\|\u0007))/,vB;function oRe(){if(vB)return vB;if(typeof Intl.Segmenter<"u"){let r=new Intl.Segmenter("en",{granularity:"grapheme"});return vB=e=>Array.from(r.segment(e),({segment:t})=>t)}else{let r=_V(),e=new r;return vB=t=>e.splitGraphemes(t)}}$V.exports=(r,e=0,t=r.length)=>{if(e<0||t<0)throw new RangeError("Negative indices aren't supported by this implementation");let i=t-e,n="",s=0,o=0;for(;r.length>0;){let a=r.match(sRe)||[r,r,void 0],l=oRe()(a[1]),c=Math.min(e-s,l.length);l=l.slice(c);let u=Math.min(i-o,l.length);n+=l.slice(0,u).join(""),s+=c,o+=u,typeof a[2]<"u"&&(n+=a[2]),r=r.slice(a[0].length)}return n}});var Wf=w((pot,d7)=>{"use strict";var p7=new Map([["C","cwd"],["f","file"],["z","gzip"],["P","preservePaths"],["U","unlink"],["strip-components","strip"],["stripComponents","strip"],["keep-newer","newer"],["keepNewer","newer"],["keep-newer-files","newer"],["keepNewerFiles","newer"],["k","keep"],["keep-existing","keep"],["keepExisting","keep"],["m","noMtime"],["no-mtime","noMtime"],["p","preserveOwner"],["L","follow"],["h","follow"]]);d7.exports=r=>r?Object.keys(r).map(e=>[p7.has(e)?p7.get(e):e,r[e]]).reduce((e,t)=>(e[t[0]]=t[1],e),Object.create(null)):{}});var Vf=w((dot,b7)=>{"use strict";var C7=typeof process=="object"&&process?process:{stdout:null,stderr:null},ERe=J("events"),m7=J("stream"),E7=J("string_decoder").StringDecoder,Ja=Symbol("EOF"),Wa=Symbol("maybeEmitEnd"),el=Symbol("emittedEnd"),FB=Symbol("emittingEnd"),RC=Symbol("emittedError"),NB=Symbol("closed"),I7=Symbol("read"),LB=Symbol("flush"),y7=Symbol("flushChunk"),Sn=Symbol("encoding"),za=Symbol("decoder"),TB=Symbol("flowing"),FC=Symbol("paused"),zf=Symbol("resume"),Ci=Symbol("bufferLength"),zR=Symbol("bufferPush"),VR=Symbol("bufferShift"),Hi=Symbol("objectMode"),Gi=Symbol("destroyed"),XR=Symbol("emitData"),w7=Symbol("emitEnd"),ZR=Symbol("emitEnd2"),Va=Symbol("async"),NC=r=>Promise.resolve().then(r),B7=global._MP_NO_ITERATOR_SYMBOLS_!=="1",IRe=B7&&Symbol.asyncIterator||Symbol("asyncIterator not implemented"),yRe=B7&&Symbol.iterator||Symbol("iterator not implemented"),wRe=r=>r==="end"||r==="finish"||r==="prefinish",BRe=r=>r instanceof ArrayBuffer||typeof r=="object"&&r.constructor&&r.constructor.name==="ArrayBuffer"&&r.byteLength>=0,QRe=r=>!Buffer.isBuffer(r)&&ArrayBuffer.isView(r),OB=class{constructor(e,t,i){this.src=e,this.dest=t,this.opts=i,this.ondrain=()=>e[zf](),t.on("drain",this.ondrain)}unpipe(){this.dest.removeListener("drain",this.ondrain)}proxyErrors(){}end(){this.unpipe(),this.opts.end&&this.dest.end()}},_R=class extends OB{unpipe(){this.src.removeListener("error",this.proxyErrors),super.unpipe()}constructor(e,t,i){super(e,t,i),this.proxyErrors=n=>t.emit("error",n),e.on("error",this.proxyErrors)}};b7.exports=class Q7 extends m7{constructor(e){super(),this[TB]=!1,this[FC]=!1,this.pipes=[],this.buffer=[],this[Hi]=e&&e.objectMode||!1,this[Hi]?this[Sn]=null:this[Sn]=e&&e.encoding||null,this[Sn]==="buffer"&&(this[Sn]=null),this[Va]=e&&!!e.async||!1,this[za]=this[Sn]?new E7(this[Sn]):null,this[Ja]=!1,this[el]=!1,this[FB]=!1,this[NB]=!1,this[RC]=null,this.writable=!0,this.readable=!0,this[Ci]=0,this[Gi]=!1}get bufferLength(){return this[Ci]}get encoding(){return this[Sn]}set encoding(e){if(this[Hi])throw new Error("cannot set encoding in objectMode");if(this[Sn]&&e!==this[Sn]&&(this[za]&&this[za].lastNeed||this[Ci]))throw new Error("cannot change encoding");this[Sn]!==e&&(this[za]=e?new E7(e):null,this.buffer.length&&(this.buffer=this.buffer.map(t=>this[za].write(t)))),this[Sn]=e}setEncoding(e){this.encoding=e}get objectMode(){return this[Hi]}set objectMode(e){this[Hi]=this[Hi]||!!e}get async(){return this[Va]}set async(e){this[Va]=this[Va]||!!e}write(e,t,i){if(this[Ja])throw new Error("write after end");if(this[Gi])return this.emit("error",Object.assign(new Error("Cannot call write after a stream was destroyed"),{code:"ERR_STREAM_DESTROYED"})),!0;typeof t=="function"&&(i=t,t="utf8"),t||(t="utf8");let n=this[Va]?NC:s=>s();return!this[Hi]&&!Buffer.isBuffer(e)&&(QRe(e)?e=Buffer.from(e.buffer,e.byteOffset,e.byteLength):BRe(e)?e=Buffer.from(e):typeof e!="string"&&(this.objectMode=!0)),this[Hi]?(this.flowing&&this[Ci]!==0&&this[LB](!0),this.flowing?this.emit("data",e):this[zR](e),this[Ci]!==0&&this.emit("readable"),i&&n(i),this.flowing):e.length?(typeof e=="string"&&!(t===this[Sn]&&!this[za].lastNeed)&&(e=Buffer.from(e,t)),Buffer.isBuffer(e)&&this[Sn]&&(e=this[za].write(e)),this.flowing&&this[Ci]!==0&&this[LB](!0),this.flowing?this.emit("data",e):this[zR](e),this[Ci]!==0&&this.emit("readable"),i&&n(i),this.flowing):(this[Ci]!==0&&this.emit("readable"),i&&n(i),this.flowing)}read(e){if(this[Gi])return null;if(this[Ci]===0||e===0||e>this[Ci])return this[Wa](),null;this[Hi]&&(e=null),this.buffer.length>1&&!this[Hi]&&(this.encoding?this.buffer=[this.buffer.join("")]:this.buffer=[Buffer.concat(this.buffer,this[Ci])]);let t=this[I7](e||null,this.buffer[0]);return this[Wa](),t}[I7](e,t){return e===t.length||e===null?this[VR]():(this.buffer[0]=t.slice(e),t=t.slice(0,e),this[Ci]-=e),this.emit("data",t),!this.buffer.length&&!this[Ja]&&this.emit("drain"),t}end(e,t,i){return typeof e=="function"&&(i=e,e=null),typeof t=="function"&&(i=t,t="utf8"),e&&this.write(e,t),i&&this.once("end",i),this[Ja]=!0,this.writable=!1,(this.flowing||!this[FC])&&this[Wa](),this}[zf](){this[Gi]||(this[FC]=!1,this[TB]=!0,this.emit("resume"),this.buffer.length?this[LB]():this[Ja]?this[Wa]():this.emit("drain"))}resume(){return this[zf]()}pause(){this[TB]=!1,this[FC]=!0}get destroyed(){return this[Gi]}get flowing(){return this[TB]}get paused(){return this[FC]}[zR](e){this[Hi]?this[Ci]+=1:this[Ci]+=e.length,this.buffer.push(e)}[VR](){return this.buffer.length&&(this[Hi]?this[Ci]-=1:this[Ci]-=this.buffer[0].length),this.buffer.shift()}[LB](e){do;while(this[y7](this[VR]()));!e&&!this.buffer.length&&!this[Ja]&&this.emit("drain")}[y7](e){return e?(this.emit("data",e),this.flowing):!1}pipe(e,t){if(this[Gi])return;let i=this[el];return t=t||{},e===C7.stdout||e===C7.stderr?t.end=!1:t.end=t.end!==!1,t.proxyErrors=!!t.proxyErrors,i?t.end&&e.end():(this.pipes.push(t.proxyErrors?new _R(this,e,t):new OB(this,e,t)),this[Va]?NC(()=>this[zf]()):this[zf]()),e}unpipe(e){let t=this.pipes.find(i=>i.dest===e);t&&(this.pipes.splice(this.pipes.indexOf(t),1),t.unpipe())}addListener(e,t){return this.on(e,t)}on(e,t){let i=super.on(e,t);return e==="data"&&!this.pipes.length&&!this.flowing?this[zf]():e==="readable"&&this[Ci]!==0?super.emit("readable"):wRe(e)&&this[el]?(super.emit(e),this.removeAllListeners(e)):e==="error"&&this[RC]&&(this[Va]?NC(()=>t.call(this,this[RC])):t.call(this,this[RC])),i}get emittedEnd(){return this[el]}[Wa](){!this[FB]&&!this[el]&&!this[Gi]&&this.buffer.length===0&&this[Ja]&&(this[FB]=!0,this.emit("end"),this.emit("prefinish"),this.emit("finish"),this[NB]&&this.emit("close"),this[FB]=!1)}emit(e,t,...i){if(e!=="error"&&e!=="close"&&e!==Gi&&this[Gi])return;if(e==="data")return t?this[Va]?NC(()=>this[XR](t)):this[XR](t):!1;if(e==="end")return this[w7]();if(e==="close"){if(this[NB]=!0,!this[el]&&!this[Gi])return;let s=super.emit("close");return this.removeAllListeners("close"),s}else if(e==="error"){this[RC]=t;let s=super.emit("error",t);return this[Wa](),s}else if(e==="resume"){let s=super.emit("resume");return this[Wa](),s}else if(e==="finish"||e==="prefinish"){let s=super.emit(e);return this.removeAllListeners(e),s}let n=super.emit(e,t,...i);return this[Wa](),n}[XR](e){for(let i of this.pipes)i.dest.write(e)===!1&&this.pause();let t=super.emit("data",e);return this[Wa](),t}[w7](){this[el]||(this[el]=!0,this.readable=!1,this[Va]?NC(()=>this[ZR]()):this[ZR]())}[ZR](){if(this[za]){let t=this[za].end();if(t){for(let i of this.pipes)i.dest.write(t);super.emit("data",t)}}for(let t of this.pipes)t.end();let e=super.emit("end");return this.removeAllListeners("end"),e}collect(){let e=[];this[Hi]||(e.dataLength=0);let t=this.promise();return this.on("data",i=>{e.push(i),this[Hi]||(e.dataLength+=i.length)}),t.then(()=>e)}concat(){return this[Hi]?Promise.reject(new Error("cannot concat in objectMode")):this.collect().then(e=>this[Hi]?Promise.reject(new Error("cannot concat in objectMode")):this[Sn]?e.join(""):Buffer.concat(e,e.dataLength))}promise(){return new Promise((e,t)=>{this.on(Gi,()=>t(new Error("stream destroyed"))),this.on("error",i=>t(i)),this.on("end",()=>e())})}[IRe](){return{next:()=>{let t=this.read();if(t!==null)return Promise.resolve({done:!1,value:t});if(this[Ja])return Promise.resolve({done:!0});let i=null,n=null,s=c=>{this.removeListener("data",o),this.removeListener("end",a),n(c)},o=c=>{this.removeListener("error",s),this.removeListener("end",a),this.pause(),i({value:c,done:!!this[Ja]})},a=()=>{this.removeListener("error",s),this.removeListener("data",o),i({done:!0})},l=()=>s(new Error("stream destroyed"));return new Promise((c,u)=>{n=u,i=c,this.once(Gi,l),this.once("error",s),this.once("end",a),this.once("data",o)})}}}[yRe](){return{next:()=>{let t=this.read();return{value:t,done:t===null}}}}destroy(e){return this[Gi]?(e?this.emit("error",e):this.emit(Gi),this):(this[Gi]=!0,this.buffer.length=0,this[Ci]=0,typeof this.close=="function"&&!this[NB]&&this.close(),e?this.emit("error",e):this.emit(Gi),this)}static isStream(e){return!!e&&(e instanceof Q7||e instanceof m7||e instanceof ERe&&(typeof e.pipe=="function"||typeof e.write=="function"&&typeof e.end=="function"))}}});var v7=w((Cot,S7)=>{var bRe=J("zlib").constants||{ZLIB_VERNUM:4736};S7.exports=Object.freeze(Object.assign(Object.create(null),{Z_NO_FLUSH:0,Z_PARTIAL_FLUSH:1,Z_SYNC_FLUSH:2,Z_FULL_FLUSH:3,Z_FINISH:4,Z_BLOCK:5,Z_OK:0,Z_STREAM_END:1,Z_NEED_DICT:2,Z_ERRNO:-1,Z_STREAM_ERROR:-2,Z_DATA_ERROR:-3,Z_MEM_ERROR:-4,Z_BUF_ERROR:-5,Z_VERSION_ERROR:-6,Z_NO_COMPRESSION:0,Z_BEST_SPEED:1,Z_BEST_COMPRESSION:9,Z_DEFAULT_COMPRESSION:-1,Z_FILTERED:1,Z_HUFFMAN_ONLY:2,Z_RLE:3,Z_FIXED:4,Z_DEFAULT_STRATEGY:0,DEFLATE:1,INFLATE:2,GZIP:3,GUNZIP:4,DEFLATERAW:5,INFLATERAW:6,UNZIP:7,BROTLI_DECODE:8,BROTLI_ENCODE:9,Z_MIN_WINDOWBITS:8,Z_MAX_WINDOWBITS:15,Z_DEFAULT_WINDOWBITS:15,Z_MIN_CHUNK:64,Z_MAX_CHUNK:1/0,Z_DEFAULT_CHUNK:16384,Z_MIN_MEMLEVEL:1,Z_MAX_MEMLEVEL:9,Z_DEFAULT_MEMLEVEL:8,Z_MIN_LEVEL:-1,Z_MAX_LEVEL:9,Z_DEFAULT_LEVEL:-1,BROTLI_OPERATION_PROCESS:0,BROTLI_OPERATION_FLUSH:1,BROTLI_OPERATION_FINISH:2,BROTLI_OPERATION_EMIT_METADATA:3,BROTLI_MODE_GENERIC:0,BROTLI_MODE_TEXT:1,BROTLI_MODE_FONT:2,BROTLI_DEFAULT_MODE:0,BROTLI_MIN_QUALITY:0,BROTLI_MAX_QUALITY:11,BROTLI_DEFAULT_QUALITY:11,BROTLI_MIN_WINDOW_BITS:10,BROTLI_MAX_WINDOW_BITS:24,BROTLI_LARGE_MAX_WINDOW_BITS:30,BROTLI_DEFAULT_WINDOW:22,BROTLI_MIN_INPUT_BLOCK_BITS:16,BROTLI_MAX_INPUT_BLOCK_BITS:24,BROTLI_PARAM_MODE:0,BROTLI_PARAM_QUALITY:1,BROTLI_PARAM_LGWIN:2,BROTLI_PARAM_LGBLOCK:3,BROTLI_PARAM_DISABLE_LITERAL_CONTEXT_MODELING:4,BROTLI_PARAM_SIZE_HINT:5,BROTLI_PARAM_LARGE_WINDOW:6,BROTLI_PARAM_NPOSTFIX:7,BROTLI_PARAM_NDIRECT:8,BROTLI_DECODER_RESULT_ERROR:0,BROTLI_DECODER_RESULT_SUCCESS:1,BROTLI_DECODER_RESULT_NEEDS_MORE_INPUT:2,BROTLI_DECODER_RESULT_NEEDS_MORE_OUTPUT:3,BROTLI_DECODER_PARAM_DISABLE_RING_BUFFER_REALLOCATION:0,BROTLI_DECODER_PARAM_LARGE_WINDOW:1,BROTLI_DECODER_NO_ERROR:0,BROTLI_DECODER_SUCCESS:1,BROTLI_DECODER_NEEDS_MORE_INPUT:2,BROTLI_DECODER_NEEDS_MORE_OUTPUT:3,BROTLI_DECODER_ERROR_FORMAT_EXUBERANT_NIBBLE:-1,BROTLI_DECODER_ERROR_FORMAT_RESERVED:-2,BROTLI_DECODER_ERROR_FORMAT_EXUBERANT_META_NIBBLE:-3,BROTLI_DECODER_ERROR_FORMAT_SIMPLE_HUFFMAN_ALPHABET:-4,BROTLI_DECODER_ERROR_FORMAT_SIMPLE_HUFFMAN_SAME:-5,BROTLI_DECODER_ERROR_FORMAT_CL_SPACE:-6,BROTLI_DECODER_ERROR_FORMAT_HUFFMAN_SPACE:-7,BROTLI_DECODER_ERROR_FORMAT_CONTEXT_MAP_REPEAT:-8,BROTLI_DECODER_ERROR_FORMAT_BLOCK_LENGTH_1:-9,BROTLI_DECODER_ERROR_FORMAT_BLOCK_LENGTH_2:-10,BROTLI_DECODER_ERROR_FORMAT_TRANSFORM:-11,BROTLI_DECODER_ERROR_FORMAT_DICTIONARY:-12,BROTLI_DECODER_ERROR_FORMAT_WINDOW_BITS:-13,BROTLI_DECODER_ERROR_FORMAT_PADDING_1:-14,BROTLI_DECODER_ERROR_FORMAT_PADDING_2:-15,BROTLI_DECODER_ERROR_FORMAT_DISTANCE:-16,BROTLI_DECODER_ERROR_DICTIONARY_NOT_SET:-19,BROTLI_DECODER_ERROR_INVALID_ARGUMENTS:-20,BROTLI_DECODER_ERROR_ALLOC_CONTEXT_MODES:-21,BROTLI_DECODER_ERROR_ALLOC_TREE_GROUPS:-22,BROTLI_DECODER_ERROR_ALLOC_CONTEXT_MAP:-25,BROTLI_DECODER_ERROR_ALLOC_RING_BUFFER_1:-26,BROTLI_DECODER_ERROR_ALLOC_RING_BUFFER_2:-27,BROTLI_DECODER_ERROR_ALLOC_BLOCK_TYPE_TREES:-30,BROTLI_DECODER_ERROR_UNREACHABLE:-31},bRe))});var hF=w(zn=>{"use strict";var iF=J("assert"),tl=J("buffer").Buffer,D7=J("zlib"),Tc=zn.constants=v7(),SRe=Vf(),x7=tl.concat,Oc=Symbol("_superWrite"),Zf=class extends Error{constructor(e){super("zlib: "+e.message),this.code=e.code,this.errno=e.errno,this.code||(this.code="ZLIB_ERROR"),this.message="zlib: "+e.message,Error.captureStackTrace(this,this.constructor)}get name(){return"ZlibError"}},vRe=Symbol("opts"),LC=Symbol("flushFlag"),P7=Symbol("finishFlushFlag"),fF=Symbol("fullFlushFlag"),cr=Symbol("handle"),MB=Symbol("onError"),Xf=Symbol("sawError"),$R=Symbol("level"),eF=Symbol("strategy"),tF=Symbol("ended"),mot=Symbol("_defaultFullFlush"),KB=class extends SRe{constructor(e,t){if(!e||typeof e!="object")throw new TypeError("invalid options for ZlibBase constructor");super(e),this[Xf]=!1,this[tF]=!1,this[vRe]=e,this[LC]=e.flush,this[P7]=e.finishFlush;try{this[cr]=new D7[t](e)}catch(i){throw new Zf(i)}this[MB]=i=>{this[Xf]||(this[Xf]=!0,this.close(),this.emit("error",i))},this[cr].on("error",i=>this[MB](new Zf(i))),this.once("end",()=>this.close)}close(){this[cr]&&(this[cr].close(),this[cr]=null,this.emit("close"))}reset(){if(!this[Xf])return iF(this[cr],"zlib binding closed"),this[cr].reset()}flush(e){this.ended||(typeof e!="number"&&(e=this[fF]),this.write(Object.assign(tl.alloc(0),{[LC]:e})))}end(e,t,i){return e&&this.write(e,t),this.flush(this[P7]),this[tF]=!0,super.end(null,null,i)}get ended(){return this[tF]}write(e,t,i){if(typeof t=="function"&&(i=t,t="utf8"),typeof e=="string"&&(e=tl.from(e,t)),this[Xf])return;iF(this[cr],"zlib binding closed");let n=this[cr]._handle,s=n.close;n.close=()=>{};let o=this[cr].close;this[cr].close=()=>{},tl.concat=c=>c;let a;try{let c=typeof e[LC]=="number"?e[LC]:this[LC];a=this[cr]._processChunk(e,c),tl.concat=x7}catch(c){tl.concat=x7,this[MB](new Zf(c))}finally{this[cr]&&(this[cr]._handle=n,n.close=s,this[cr].close=o,this[cr].removeAllListeners("error"))}this[cr]&&this[cr].on("error",c=>this[MB](new Zf(c)));let l;if(a)if(Array.isArray(a)&&a.length>0){l=this[Oc](tl.from(a[0]));for(let c=1;c<a.length;c++)l=this[Oc](a[c])}else l=this[Oc](tl.from(a));return i&&i(),l}[Oc](e){return super.write(e)}},Xa=class extends KB{constructor(e,t){e=e||{},e.flush=e.flush||Tc.Z_NO_FLUSH,e.finishFlush=e.finishFlush||Tc.Z_FINISH,super(e,t),this[fF]=Tc.Z_FULL_FLUSH,this[$R]=e.level,this[eF]=e.strategy}params(e,t){if(!this[Xf]){if(!this[cr])throw new Error("cannot switch params when binding is closed");if(!this[cr].params)throw new Error("not supported in this implementation");if(this[$R]!==e||this[eF]!==t){this.flush(Tc.Z_SYNC_FLUSH),iF(this[cr],"zlib binding closed");let i=this[cr].flush;this[cr].flush=(n,s)=>{this.flush(n),s()};try{this[cr].params(e,t)}finally{this[cr].flush=i}this[cr]&&(this[$R]=e,this[eF]=t)}}}},nF=class extends Xa{constructor(e){super(e,"Deflate")}},sF=class extends Xa{constructor(e){super(e,"Inflate")}},rF=Symbol("_portable"),oF=class extends Xa{constructor(e){super(e,"Gzip"),this[rF]=e&&!!e.portable}[Oc](e){return this[rF]?(this[rF]=!1,e[9]=255,super[Oc](e)):super[Oc](e)}},aF=class extends Xa{constructor(e){super(e,"Gunzip")}},AF=class extends Xa{constructor(e){super(e,"DeflateRaw")}},lF=class extends Xa{constructor(e){super(e,"InflateRaw")}},cF=class extends Xa{constructor(e){super(e,"Unzip")}},UB=class extends KB{constructor(e,t){e=e||{},e.flush=e.flush||Tc.BROTLI_OPERATION_PROCESS,e.finishFlush=e.finishFlush||Tc.BROTLI_OPERATION_FINISH,super(e,t),this[fF]=Tc.BROTLI_OPERATION_FLUSH}},uF=class extends UB{constructor(e){super(e,"BrotliCompress")}},gF=class extends UB{constructor(e){super(e,"BrotliDecompress")}};zn.Deflate=nF;zn.Inflate=sF;zn.Gzip=oF;zn.Gunzip=aF;zn.DeflateRaw=AF;zn.InflateRaw=lF;zn.Unzip=cF;typeof D7.BrotliCompress=="function"?(zn.BrotliCompress=uF,zn.BrotliDecompress=gF):zn.BrotliCompress=zn.BrotliDecompress=class{constructor(){throw new Error("Brotli is not supported in this version of Node.js")}}});var _f=w((yot,k7)=>{var xRe=process.env.TESTING_TAR_FAKE_PLATFORM||process.platform;k7.exports=xRe!=="win32"?r=>r:r=>r&&r.replace(/\\/g,"/")});var HB=w((Bot,R7)=>{"use strict";var PRe=Vf(),pF=_f(),dF=Symbol("slurp");R7.exports=class extends PRe{constructor(e,t,i){switch(super(),this.pause(),this.extended=t,this.globalExtended=i,this.header=e,this.startBlockSize=512*Math.ceil(e.size/512),this.blockRemain=this.startBlockSize,this.remain=e.size,this.type=e.type,this.meta=!1,this.ignore=!1,this.type){case"File":case"OldFile":case"Link":case"SymbolicLink":case"CharacterDevice":case"BlockDevice":case"Directory":case"FIFO":case"ContiguousFile":case"GNUDumpDir":break;case"NextFileHasLongLinkpath":case"NextFileHasLongPath":case"OldGnuLongPath":case"GlobalExtendedHeader":case"ExtendedHeader":case"OldExtendedHeader":this.meta=!0;break;default:this.ignore=!0}this.path=pF(e.path),this.mode=e.mode,this.mode&&(this.mode=this.mode&4095),this.uid=e.uid,this.gid=e.gid,this.uname=e.uname,this.gname=e.gname,this.size=e.size,this.mtime=e.mtime,this.atime=e.atime,this.ctime=e.ctime,this.linkpath=pF(e.linkpath),this.uname=e.uname,this.gname=e.gname,t&&this[dF](t),i&&this[dF](i,!0)}write(e){let t=e.length;if(t>this.blockRemain)throw new Error("writing more to entry than is appropriate");let i=this.remain,n=this.blockRemain;return this.remain=Math.max(0,i-t),this.blockRemain=Math.max(0,n-t),this.ignore?!0:i>=t?super.write(e):super.write(e.slice(0,i))}[dF](e,t){for(let i in e)e[i]!==null&&e[i]!==void 0&&!(t&&i==="path")&&(this[i]=i==="path"||i==="linkpath"?pF(e[i]):e[i])}}});var CF=w(GB=>{"use strict";GB.name=new Map([["0","File"],["","OldFile"],["1","Link"],["2","SymbolicLink"],["3","CharacterDevice"],["4","BlockDevice"],["5","Directory"],["6","FIFO"],["7","ContiguousFile"],["g","GlobalExtendedHeader"],["x","ExtendedHeader"],["A","SolarisACL"],["D","GNUDumpDir"],["I","Inode"],["K","NextFileHasLongLinkpath"],["L","NextFileHasLongPath"],["M","ContinuationFile"],["N","OldGnuLongPath"],["S","SparseFile"],["V","TapeVolumeHeader"],["X","OldExtendedHeader"]]);GB.code=new Map(Array.from(GB.name).map(r=>[r[1],r[0]]))});var T7=w((bot,L7)=>{"use strict";var DRe=(r,e)=>{if(Number.isSafeInteger(r))r<0?RRe(r,e):kRe(r,e);else throw Error("cannot encode number outside of javascript safe integer range");return e},kRe=(r,e)=>{e[0]=128;for(var t=e.length;t>1;t--)e[t-1]=r&255,r=Math.floor(r/256)},RRe=(r,e)=>{e[0]=255;var t=!1;r=r*-1;for(var i=e.length;i>1;i--){var n=r&255;r=Math.floor(r/256),t?e[i-1]=F7(n):n===0?e[i-1]=0:(t=!0,e[i-1]=N7(n))}},FRe=r=>{let e=r[0],t=e===128?LRe(r.slice(1,r.length)):e===255?NRe(r):null;if(t===null)throw Error("invalid base256 encoding");if(!Number.isSafeInteger(t))throw Error("parsed number outside of javascript safe integer range");return t},NRe=r=>{for(var e=r.length,t=0,i=!1,n=e-1;n>-1;n--){var s=r[n],o;i?o=F7(s):s===0?o=s:(i=!0,o=N7(s)),o!==0&&(t-=o*Math.pow(256,e-n-1))}return t},LRe=r=>{for(var e=r.length,t=0,i=e-1;i>-1;i--){var n=r[i];n!==0&&(t+=n*Math.pow(256,e-i-1))}return t},F7=r=>(255^r)&255,N7=r=>(255^r)+1&255;L7.exports={encode:DRe,parse:FRe}});var eh=w((Sot,M7)=>{"use strict";var mF=CF(),$f=J("path").posix,O7=T7(),EF=Symbol("slurp"),Vn=Symbol("type"),wF=class{constructor(e,t,i,n){this.cksumValid=!1,this.needPax=!1,this.nullBlock=!1,this.block=null,this.path=null,this.mode=null,this.uid=null,this.gid=null,this.size=null,this.mtime=null,this.cksum=null,this[Vn]="0",this.linkpath=null,this.uname=null,this.gname=null,this.devmaj=0,this.devmin=0,this.atime=null,this.ctime=null,Buffer.isBuffer(e)?this.decode(e,t||0,i,n):e&&this.set(e)}decode(e,t,i,n){if(t||(t=0),!e||!(e.length>=t+512))throw new Error("need 512 bytes for header");if(this.path=Mc(e,t,100),this.mode=rl(e,t+100,8),this.uid=rl(e,t+108,8),this.gid=rl(e,t+116,8),this.size=rl(e,t+124,12),this.mtime=IF(e,t+136,12),this.cksum=rl(e,t+148,12),this[EF](i),this[EF](n,!0),this[Vn]=Mc(e,t+156,1),this[Vn]===""&&(this[Vn]="0"),this[Vn]==="0"&&this.path.substr(-1)==="/"&&(this[Vn]="5"),this[Vn]==="5"&&(this.size=0),this.linkpath=Mc(e,t+157,100),e.slice(t+257,t+265).toString()==="ustar\x0000")if(this.uname=Mc(e,t+265,32),this.gname=Mc(e,t+297,32),this.devmaj=rl(e,t+329,8),this.devmin=rl(e,t+337,8),e[t+475]!==0){let o=Mc(e,t+345,155);this.path=o+"/"+this.path}else{let o=Mc(e,t+345,130);o&&(this.path=o+"/"+this.path),this.atime=IF(e,t+476,12),this.ctime=IF(e,t+488,12)}let s=8*32;for(let o=t;o<t+148;o++)s+=e[o];for(let o=t+156;o<t+512;o++)s+=e[o];this.cksumValid=s===this.cksum,this.cksum===null&&s===8*32&&(this.nullBlock=!0)}[EF](e,t){for(let i in e)e[i]!==null&&e[i]!==void 0&&!(t&&i==="path")&&(this[i]=e[i])}encode(e,t){if(e||(e=this.block=Buffer.alloc(512),t=0),t||(t=0),!(e.length>=t+512))throw new Error("need 512 bytes for header");let i=this.ctime||this.atime?130:155,n=TRe(this.path||"",i),s=n[0],o=n[1];this.needPax=n[2],this.needPax=Kc(e,t,100,s)||this.needPax,this.needPax=il(e,t+100,8,this.mode)||this.needPax,this.needPax=il(e,t+108,8,this.uid)||this.needPax,this.needPax=il(e,t+116,8,this.gid)||this.needPax,this.needPax=il(e,t+124,12,this.size)||this.needPax,this.needPax=yF(e,t+136,12,this.mtime)||this.needPax,e[t+156]=this[Vn].charCodeAt(0),this.needPax=Kc(e,t+157,100,this.linkpath)||this.needPax,e.write("ustar\x0000",t+257,8),this.needPax=Kc(e,t+265,32,this.uname)||this.needPax,this.needPax=Kc(e,t+297,32,this.gname)||this.needPax,this.needPax=il(e,t+329,8,this.devmaj)||this.needPax,this.needPax=il(e,t+337,8,this.devmin)||this.needPax,this.needPax=Kc(e,t+345,i,o)||this.needPax,e[t+475]!==0?this.needPax=Kc(e,t+345,155,o)||this.needPax:(this.needPax=Kc(e,t+345,130,o)||this.needPax,this.needPax=yF(e,t+476,12,this.atime)||this.needPax,this.needPax=yF(e,t+488,12,this.ctime)||this.needPax);let a=8*32;for(let l=t;l<t+148;l++)a+=e[l];for(let l=t+156;l<t+512;l++)a+=e[l];return this.cksum=a,il(e,t+148,8,this.cksum),this.cksumValid=!0,this.needPax}set(e){for(let t in e)e[t]!==null&&e[t]!==void 0&&(this[t]=e[t])}get type(){return mF.name.get(this[Vn])||this[Vn]}get typeKey(){return this[Vn]}set type(e){mF.code.has(e)?this[Vn]=mF.code.get(e):this[Vn]=e}},TRe=(r,e)=>{let i=r,n="",s,o=$f.parse(r).root||".";if(Buffer.byteLength(i)<100)s=[i,n,!1];else{n=$f.dirname(i),i=$f.basename(i);do Buffer.byteLength(i)<=100&&Buffer.byteLength(n)<=e?s=[i,n,!1]:Buffer.byteLength(i)>100&&Buffer.byteLength(n)<=e?s=[i.substr(0,100-1),n,!0]:(i=$f.join($f.basename(n),i),n=$f.dirname(n));while(n!==o&&!s);s||(s=[r.substr(0,100-1),"",!0])}return s},Mc=(r,e,t)=>r.slice(e,e+t).toString("utf8").replace(/\0.*/,""),IF=(r,e,t)=>ORe(rl(r,e,t)),ORe=r=>r===null?null:new Date(r*1e3),rl=(r,e,t)=>r[e]&128?O7.parse(r.slice(e,e+t)):KRe(r,e,t),MRe=r=>isNaN(r)?null:r,KRe=(r,e,t)=>MRe(parseInt(r.slice(e,e+t).toString("utf8").replace(/\0.*$/,"").trim(),8)),URe={12:8589934591,8:2097151},il=(r,e,t,i)=>i===null?!1:i>URe[t]||i<0?(O7.encode(i,r.slice(e,e+t)),!0):(HRe(r,e,t,i),!1),HRe=(r,e,t,i)=>r.write(GRe(i,t),e,t,"ascii"),GRe=(r,e)=>YRe(Math.floor(r).toString(8),e),YRe=(r,e)=>(r.length===e-1?r:new Array(e-r.length-1).join("0")+r+" ")+"\0",yF=(r,e,t,i)=>i===null?!1:il(r,e,t,i.getTime()/1e3),jRe=new Array(156).join("\0"),Kc=(r,e,t,i)=>i===null?!1:(r.write(i+jRe,e,t,"utf8"),i.length!==Buffer.byteLength(i)||i.length>t);M7.exports=wF});var YB=w((vot,K7)=>{"use strict";var qRe=eh(),JRe=J("path"),TC=class{constructor(e,t){this.atime=e.atime||null,this.charset=e.charset||null,this.comment=e.comment||null,this.ctime=e.ctime||null,this.gid=e.gid||null,this.gname=e.gname||null,this.linkpath=e.linkpath||null,this.mtime=e.mtime||null,this.path=e.path||null,this.size=e.size||null,this.uid=e.uid||null,this.uname=e.uname||null,this.dev=e.dev||null,this.ino=e.ino||null,this.nlink=e.nlink||null,this.global=t||!1}encode(){let e=this.encodeBody();if(e==="")return null;let t=Buffer.byteLength(e),i=512*Math.ceil(1+t/512),n=Buffer.allocUnsafe(i);for(let s=0;s<512;s++)n[s]=0;new qRe({path:("PaxHeader/"+JRe.basename(this.path)).slice(0,99),mode:this.mode||420,uid:this.uid||null,gid:this.gid||null,size:t,mtime:this.mtime||null,type:this.global?"GlobalExtendedHeader":"ExtendedHeader",linkpath:"",uname:this.uname||"",gname:this.gname||"",devmaj:0,devmin:0,atime:this.atime||null,ctime:this.ctime||null}).encode(n),n.write(e,512,t,"utf8");for(let s=t+512;s<n.length;s++)n[s]=0;return n}encodeBody(){return this.encodeField("path")+this.encodeField("ctime")+this.encodeField("atime")+this.encodeField("dev")+this.encodeField("ino")+this.encodeField("nlink")+this.encodeField("charset")+this.encodeField("comment")+this.encodeField("gid")+this.encodeField("gname")+this.encodeField("linkpath")+this.encodeField("mtime")+this.encodeField("size")+this.encodeField("uid")+this.encodeField("uname")}encodeField(e){if(this[e]===null||this[e]===void 0)return"";let t=this[e]instanceof Date?this[e].getTime()/1e3:this[e],i=" "+(e==="dev"||e==="ino"||e==="nlink"?"SCHILY.":"")+e+"="+t+`
-`,n=Buffer.byteLength(i),s=Math.floor(Math.log(n)/Math.log(10))+1;return n+s>=Math.pow(10,s)&&(s+=1),s+n+i}};TC.parse=(r,e,t)=>new TC(WRe(zRe(r),e),t);var WRe=(r,e)=>e?Object.keys(r).reduce((t,i)=>(t[i]=r[i],t),e):r,zRe=r=>r.replace(/\n$/,"").split(`
-`).reduce(VRe,Object.create(null)),VRe=(r,e)=>{let t=parseInt(e,10);if(t!==Buffer.byteLength(e)+1)return r;e=e.substr((t+" ").length);let i=e.split("="),n=i.shift().replace(/^SCHILY\.(dev|ino|nlink)/,"$1");if(!n)return r;let s=i.join("=");return r[n]=/^([A-Z]+\.)?([mac]|birth|creation)time$/.test(n)?new Date(s*1e3):/^[0-9]+$/.test(s)?+s:s,r};K7.exports=TC});var th=w((xot,U7)=>{U7.exports=r=>{let e=r.length-1,t=-1;for(;e>-1&&r.charAt(e)==="/";)t=e,e--;return t===-1?r:r.slice(0,t)}});var jB=w((Pot,H7)=>{"use strict";H7.exports=r=>class extends r{warn(e,t,i={}){this.file&&(i.file=this.file),this.cwd&&(i.cwd=this.cwd),i.code=t instanceof Error&&t.code||e,i.tarCode=e,!this.strict&&i.recoverable!==!1?(t instanceof Error&&(i=Object.assign(t,i),t=t.message),this.emit("warn",i.tarCode,t,i)):t instanceof Error?this.emit("error",Object.assign(t,i)):this.emit("error",Object.assign(new Error(`${e}: ${t}`),i))}}});var QF=w((kot,G7)=>{"use strict";var qB=["|","<",">","?",":"],BF=qB.map(r=>String.fromCharCode(61440+r.charCodeAt(0))),XRe=new Map(qB.map((r,e)=>[r,BF[e]])),ZRe=new Map(BF.map((r,e)=>[r,qB[e]]));G7.exports={encode:r=>qB.reduce((e,t)=>e.split(t).join(XRe.get(t)),r),decode:r=>BF.reduce((e,t)=>e.split(t).join(ZRe.get(t)),r)}});var bF=w((Rot,j7)=>{var{isAbsolute:_Re,parse:Y7}=J("path").win32;j7.exports=r=>{let e="",t=Y7(r);for(;_Re(r)||t.root;){let i=r.charAt(0)==="/"&&r.slice(0,4)!=="//?/"?"/":t.root;r=r.substr(i.length),e+=i,t=Y7(r)}return[e,r]}});var J7=w((Fot,q7)=>{"use strict";q7.exports=(r,e,t)=>(r&=4095,t&&(r=(r|384)&-19),e&&(r&256&&(r|=64),r&32&&(r|=8),r&4&&(r|=1)),r)});var LF=w((Tot,o9)=>{"use strict";var $7=Vf(),e9=YB(),t9=eh(),Zo=J("fs"),W7=J("path"),Xo=_f(),$Re=th(),r9=(r,e)=>e?(r=Xo(r).replace(/^\.(\/|$)/,""),$Re(e)+"/"+r):Xo(r),eFe=16*1024*1024,z7=Symbol("process"),V7=Symbol("file"),X7=Symbol("directory"),vF=Symbol("symlink"),Z7=Symbol("hardlink"),OC=Symbol("header"),JB=Symbol("read"),xF=Symbol("lstat"),WB=Symbol("onlstat"),PF=Symbol("onread"),DF=Symbol("onreadlink"),kF=Symbol("openfile"),RF=Symbol("onopenfile"),nl=Symbol("close"),zB=Symbol("mode"),FF=Symbol("awaitDrain"),SF=Symbol("ondrain"),_o=Symbol("prefix"),_7=Symbol("hadError"),i9=jB(),tFe=QF(),n9=bF(),s9=J7(),VB=i9(class extends $7{constructor(e,t){if(t=t||{},super(t),typeof e!="string")throw new TypeError("path is required");this.path=Xo(e),this.portable=!!t.portable,this.myuid=process.getuid&&process.getuid()||0,this.myuser=process.env.USER||"",this.maxReadSize=t.maxReadSize||eFe,this.linkCache=t.linkCache||new Map,this.statCache=t.statCache||new Map,this.preservePaths=!!t.preservePaths,this.cwd=Xo(t.cwd||process.cwd()),this.strict=!!t.strict,this.noPax=!!t.noPax,this.noMtime=!!t.noMtime,this.mtime=t.mtime||null,this.prefix=t.prefix?Xo(t.prefix):null,this.fd=null,this.blockLen=null,this.blockRemain=null,this.buf=null,this.offset=null,this.length=null,this.pos=null,this.remain=null,typeof t.onwarn=="function"&&this.on("warn",t.onwarn);let i=!1;if(!this.preservePaths){let[n,s]=n9(this.path);n&&(this.path=s,i=n)}this.win32=!!t.win32||process.platform==="win32",this.win32&&(this.path=tFe.decode(this.path.replace(/\\/g,"/")),e=e.replace(/\\/g,"/")),this.absolute=Xo(t.absolute||W7.resolve(this.cwd,e)),this.path===""&&(this.path="./"),i&&this.warn("TAR_ENTRY_INFO",`stripping ${i} from absolute path`,{entry:this,path:i+this.path}),this.statCache.has(this.absolute)?this[WB](this.statCache.get(this.absolute)):this[xF]()}emit(e,...t){return e==="error"&&(this[_7]=!0),super.emit(e,...t)}[xF](){Zo.lstat(this.absolute,(e,t)=>{if(e)return this.emit("error",e);this[WB](t)})}[WB](e){this.statCache.set(this.absolute,e),this.stat=e,e.isFile()||(e.size=0),this.type=iFe(e),this.emit("stat",e),this[z7]()}[z7](){switch(this.type){case"File":return this[V7]();case"Directory":return this[X7]();case"SymbolicLink":return this[vF]();default:return this.end()}}[zB](e){return s9(e,this.type==="Directory",this.portable)}[_o](e){return r9(e,this.prefix)}[OC](){this.type==="Directory"&&this.portable&&(this.noMtime=!0),this.header=new t9({path:this[_o](this.path),linkpath:this.type==="Link"?this[_o](this.linkpath):this.linkpath,mode:this[zB](this.stat.mode),uid:this.portable?null:this.stat.uid,gid:this.portable?null:this.stat.gid,size:this.stat.size,mtime:this.noMtime?null:this.mtime||this.stat.mtime,type:this.type,uname:this.portable?null:this.stat.uid===this.myuid?this.myuser:"",atime:this.portable?null:this.stat.atime,ctime:this.portable?null:this.stat.ctime}),this.header.encode()&&!this.noPax&&super.write(new e9({atime:this.portable?null:this.header.atime,ctime:this.portable?null:this.header.ctime,gid:this.portable?null:this.header.gid,mtime:this.noMtime?null:this.mtime||this.header.mtime,path:this[_o](this.path),linkpath:this.type==="Link"?this[_o](this.linkpath):this.linkpath,size:this.header.size,uid:this.portable?null:this.header.uid,uname:this.portable?null:this.header.uname,dev:this.portable?null:this.stat.dev,ino:this.portable?null:this.stat.ino,nlink:this.portable?null:this.stat.nlink}).encode()),super.write(this.header.block)}[X7](){this.path.substr(-1)!=="/"&&(this.path+="/"),this.stat.size=0,this[OC](),this.end()}[vF](){Zo.readlink(this.absolute,(e,t)=>{if(e)return this.emit("error",e);this[DF](t)})}[DF](e){this.linkpath=Xo(e),this[OC](),this.end()}[Z7](e){this.type="Link",this.linkpath=Xo(W7.relative(this.cwd,e)),this.stat.size=0,this[OC](),this.end()}[V7](){if(this.stat.nlink>1){let e=this.stat.dev+":"+this.stat.ino;if(this.linkCache.has(e)){let t=this.linkCache.get(e);if(t.indexOf(this.cwd)===0)return this[Z7](t)}this.linkCache.set(e,this.absolute)}if(this[OC](),this.stat.size===0)return this.end();this[kF]()}[kF](){Zo.open(this.absolute,"r",(e,t)=>{if(e)return this.emit("error",e);this[RF](t)})}[RF](e){if(this.fd=e,this[_7])return this[nl]();this.blockLen=512*Math.ceil(this.stat.size/512),this.blockRemain=this.blockLen;let t=Math.min(this.blockLen,this.maxReadSize);this.buf=Buffer.allocUnsafe(t),this.offset=0,this.pos=0,this.remain=this.stat.size,this.length=this.buf.length,this[JB]()}[JB](){let{fd:e,buf:t,offset:i,length:n,pos:s}=this;Zo.read(e,t,i,n,s,(o,a)=>{if(o)return this[nl](()=>this.emit("error",o));this[PF](a)})}[nl](e){Zo.close(this.fd,e)}[PF](e){if(e<=0&&this.remain>0){let n=new Error("encountered unexpected EOF");return n.path=this.absolute,n.syscall="read",n.code="EOF",this[nl](()=>this.emit("error",n))}if(e>this.remain){let n=new Error("did not encounter expected EOF");return n.path=this.absolute,n.syscall="read",n.code="EOF",this[nl](()=>this.emit("error",n))}if(e===this.remain)for(let n=e;n<this.length&&e<this.blockRemain;n++)this.buf[n+this.offset]=0,e++,this.remain++;let t=this.offset===0&&e===this.buf.length?this.buf:this.buf.slice(this.offset,this.offset+e);this.write(t)?this[SF]():this[FF](()=>this[SF]())}[FF](e){this.once("drain",e)}write(e){if(this.blockRemain<e.length){let t=new Error("writing more data than expected");return t.path=this.absolute,this.emit("error",t)}return this.remain-=e.length,this.blockRemain-=e.length,this.pos+=e.length,this.offset+=e.length,super.write(e)}[SF](){if(!this.remain)return this.blockRemain&&super.write(Buffer.alloc(this.blockRemain)),this[nl](e=>e?this.emit("error",e):this.end());this.offset>=this.length&&(this.buf=Buffer.allocUnsafe(Math.min(this.blockRemain,this.buf.length)),this.offset=0),this.length=this.buf.length-this.offset,this[JB]()}}),NF=class extends VB{[xF](){this[WB](Zo.lstatSync(this.absolute))}[vF](){this[DF](Zo.readlinkSync(this.absolute))}[kF](){this[RF](Zo.openSync(this.absolute,"r"))}[JB](){let e=!0;try{let{fd:t,buf:i,offset:n,length:s,pos:o}=this,a=Zo.readSync(t,i,n,s,o);this[PF](a),e=!1}finally{if(e)try{this[nl](()=>{})}catch{}}}[FF](e){e()}[nl](e){Zo.closeSync(this.fd),e()}},rFe=i9(class extends $7{constructor(e,t){t=t||{},super(t),this.preservePaths=!!t.preservePaths,this.portable=!!t.portable,this.strict=!!t.strict,this.noPax=!!t.noPax,this.noMtime=!!t.noMtime,this.readEntry=e,this.type=e.type,this.type==="Directory"&&this.portable&&(this.noMtime=!0),this.prefix=t.prefix||null,this.path=Xo(e.path),this.mode=this[zB](e.mode),this.uid=this.portable?null:e.uid,this.gid=this.portable?null:e.gid,this.uname=this.portable?null:e.uname,this.gname=this.portable?null:e.gname,this.size=e.size,this.mtime=this.noMtime?null:t.mtime||e.mtime,this.atime=this.portable?null:e.atime,this.ctime=this.portable?null:e.ctime,this.linkpath=Xo(e.linkpath),typeof t.onwarn=="function"&&this.on("warn",t.onwarn);let i=!1;if(!this.preservePaths){let[n,s]=n9(this.path);n&&(this.path=s,i=n)}this.remain=e.size,this.blockRemain=e.startBlockSize,this.header=new t9({path:this[_o](this.path),linkpath:this.type==="Link"?this[_o](this.linkpath):this.linkpath,mode:this.mode,uid:this.portable?null:this.uid,gid:this.portable?null:this.gid,size:this.size,mtime:this.noMtime?null:this.mtime,type:this.type,uname:this.portable?null:this.uname,atime:this.portable?null:this.atime,ctime:this.portable?null:this.ctime}),i&&this.warn("TAR_ENTRY_INFO",`stripping ${i} from absolute path`,{entry:this,path:i+this.path}),this.header.encode()&&!this.noPax&&super.write(new e9({atime:this.portable?null:this.atime,ctime:this.portable?null:this.ctime,gid:this.portable?null:this.gid,mtime:this.noMtime?null:this.mtime,path:this[_o](this.path),linkpath:this.type==="Link"?this[_o](this.linkpath):this.linkpath,size:this.size,uid:this.portable?null:this.uid,uname:this.portable?null:this.uname,dev:this.portable?null:this.readEntry.dev,ino:this.portable?null:this.readEntry.ino,nlink:this.portable?null:this.readEntry.nlink}).encode()),super.write(this.header.block),e.pipe(this)}[_o](e){return r9(e,this.prefix)}[zB](e){return s9(e,this.type==="Directory",this.portable)}write(e){let t=e.length;if(t>this.blockRemain)throw new Error("writing more to entry than is appropriate");return this.blockRemain-=t,super.write(e)}end(){return this.blockRemain&&super.write(Buffer.alloc(this.blockRemain)),super.end()}});VB.Sync=NF;VB.Tar=rFe;var iFe=r=>r.isFile()?"File":r.isDirectory()?"Directory":r.isSymbolicLink()?"SymbolicLink":"Unsupported";o9.exports=VB});var n0=w((Mot,f9)=>{"use strict";var r0=class{constructor(e,t){this.path=e||"./",this.absolute=t,this.entry=null,this.stat=null,this.readdir=null,this.pending=!1,this.ignore=!1,this.piped=!1}},nFe=Vf(),sFe=hF(),oFe=HB(),jF=LF(),aFe=jF.Sync,AFe=jF.Tar,lFe=YI(),a9=Buffer.alloc(1024),_B=Symbol("onStat"),XB=Symbol("ended"),$o=Symbol("queue"),rh=Symbol("current"),Uc=Symbol("process"),ZB=Symbol("processing"),A9=Symbol("processJob"),ea=Symbol("jobs"),TF=Symbol("jobDone"),$B=Symbol("addFSEntry"),l9=Symbol("addTarEntry"),UF=Symbol("stat"),HF=Symbol("readdir"),e0=Symbol("onreaddir"),t0=Symbol("pipe"),c9=Symbol("entry"),OF=Symbol("entryOpt"),GF=Symbol("writeEntryClass"),g9=Symbol("write"),MF=Symbol("ondrain"),i0=J("fs"),u9=J("path"),cFe=jB(),KF=_f(),qF=cFe(class extends nFe{constructor(e){super(e),e=e||Object.create(null),this.opt=e,this.file=e.file||"",this.cwd=e.cwd||process.cwd(),this.maxReadSize=e.maxReadSize,this.preservePaths=!!e.preservePaths,this.strict=!!e.strict,this.noPax=!!e.noPax,this.prefix=KF(e.prefix||""),this.linkCache=e.linkCache||new Map,this.statCache=e.statCache||new Map,this.readdirCache=e.readdirCache||new Map,this[GF]=jF,typeof e.onwarn=="function"&&this.on("warn",e.onwarn),this.portable=!!e.portable,this.zip=null,e.gzip?(typeof e.gzip!="object"&&(e.gzip={}),this.portable&&(e.gzip.portable=!0),this.zip=new sFe.Gzip(e.gzip),this.zip.on("data",t=>super.write(t)),this.zip.on("end",t=>super.end()),this.zip.on("drain",t=>this[MF]()),this.on("resume",t=>this.zip.resume())):this.on("drain",this[MF]),this.noDirRecurse=!!e.noDirRecurse,this.follow=!!e.follow,this.noMtime=!!e.noMtime,this.mtime=e.mtime||null,this.filter=typeof e.filter=="function"?e.filter:t=>!0,this[$o]=new lFe,this[ea]=0,this.jobs=+e.jobs||4,this[ZB]=!1,this[XB]=!1}[g9](e){return super.write(e)}add(e){return this.write(e),this}end(e){return e&&this.write(e),this[XB]=!0,this[Uc](),this}write(e){if(this[XB])throw new Error("write after end");return e instanceof oFe?this[l9](e):this[$B](e),this.flowing}[l9](e){let t=KF(u9.resolve(this.cwd,e.path));if(!this.filter(e.path,e))e.resume();else{let i=new r0(e.path,t,!1);i.entry=new AFe(e,this[OF](i)),i.entry.on("end",n=>this[TF](i)),this[ea]+=1,this[$o].push(i)}this[Uc]()}[$B](e){let t=KF(u9.resolve(this.cwd,e));this[$o].push(new r0(e,t)),this[Uc]()}[UF](e){e.pending=!0,this[ea]+=1;let t=this.follow?"stat":"lstat";i0[t](e.absolute,(i,n)=>{e.pending=!1,this[ea]-=1,i?this.emit("error",i):this[_B](e,n)})}[_B](e,t){this.statCache.set(e.absolute,t),e.stat=t,this.filter(e.path,t)||(e.ignore=!0),this[Uc]()}[HF](e){e.pending=!0,this[ea]+=1,i0.readdir(e.absolute,(t,i)=>{if(e.pending=!1,this[ea]-=1,t)return this.emit("error",t);this[e0](e,i)})}[e0](e,t){this.readdirCache.set(e.absolute,t),e.readdir=t,this[Uc]()}[Uc](){if(!this[ZB]){this[ZB]=!0;for(let e=this[$o].head;e!==null&&this[ea]<this.jobs;e=e.next)if(this[A9](e.value),e.value.ignore){let t=e.next;this[$o].removeNode(e),e.next=t}this[ZB]=!1,this[XB]&&!this[$o].length&&this[ea]===0&&(this.zip?this.zip.end(a9):(super.write(a9),super.end()))}}get[rh](){return this[$o]&&this[$o].head&&this[$o].head.value}[TF](e){this[$o].shift(),this[ea]-=1,this[Uc]()}[A9](e){if(!e.pending){if(e.entry){e===this[rh]&&!e.piped&&this[t0](e);return}if(e.stat||(this.statCache.has(e.absolute)?this[_B](e,this.statCache.get(e.absolute)):this[UF](e)),!!e.stat&&!e.ignore&&!(!this.noDirRecurse&&e.stat.isDirectory()&&!e.readdir&&(this.readdirCache.has(e.absolute)?this[e0](e,this.readdirCache.get(e.absolute)):this[HF](e),!e.readdir))){if(e.entry=this[c9](e),!e.entry){e.ignore=!0;return}e===this[rh]&&!e.piped&&this[t0](e)}}}[OF](e){return{onwarn:(t,i,n)=>this.warn(t,i,n),noPax:this.noPax,cwd:this.cwd,absolute:e.absolute,preservePaths:this.preservePaths,maxReadSize:this.maxReadSize,strict:this.strict,portable:this.portable,linkCache:this.linkCache,statCache:this.statCache,noMtime:this.noMtime,mtime:this.mtime,prefix:this.prefix}}[c9](e){this[ea]+=1;try{return new this[GF](e.path,this[OF](e)).on("end",()=>this[TF](e)).on("error",t=>this.emit("error",t))}catch(t){this.emit("error",t)}}[MF](){this[rh]&&this[rh].entry&&this[rh].entry.resume()}[t0](e){e.piped=!0,e.readdir&&e.readdir.forEach(n=>{let s=e.path,o=s==="./"?"":s.replace(/\/*$/,"/");this[$B](o+n)});let t=e.entry,i=this.zip;i?t.on("data",n=>{i.write(n)||t.pause()}):t.on("data",n=>{super.write(n)||t.pause()})}pause(){return this.zip&&this.zip.pause(),super.pause()}}),YF=class extends qF{constructor(e){super(e),this[GF]=aFe}pause(){}resume(){}[UF](e){let t=this.follow?"statSync":"lstatSync";this[_B](e,i0[t](e.absolute))}[HF](e,t){this[e0](e,i0.readdirSync(e.absolute))}[t0](e){let t=e.entry,i=this.zip;e.readdir&&e.readdir.forEach(n=>{let s=e.path,o=s==="./"?"":s.replace(/\/*$/,"/");this[$B](o+n)}),i?t.on("data",n=>{i.write(n)}):t.on("data",n=>{super[g9](n)})}};qF.Sync=YF;f9.exports=qF});var ch=w(KC=>{"use strict";var uFe=Vf(),gFe=J("events").EventEmitter,vn=J("fs"),zF=vn.writev;if(!zF){let r=process.binding("fs"),e=r.FSReqWrap||r.FSReqCallback;zF=(t,i,n,s)=>{let o=(l,c)=>s(l,c,i),a=new e;a.oncomplete=o,r.writeBuffers(t,i,n,a)}}var Ah=Symbol("_autoClose"),oo=Symbol("_close"),MC=Symbol("_ended"),rr=Symbol("_fd"),h9=Symbol("_finished"),ol=Symbol("_flags"),JF=Symbol("_flush"),VF=Symbol("_handleChunk"),XF=Symbol("_makeBuf"),l0=Symbol("_mode"),s0=Symbol("_needDrain"),oh=Symbol("_onerror"),lh=Symbol("_onopen"),WF=Symbol("_onread"),nh=Symbol("_onwrite"),al=Symbol("_open"),Za=Symbol("_path"),Hc=Symbol("_pos"),ta=Symbol("_queue"),sh=Symbol("_read"),p9=Symbol("_readSize"),sl=Symbol("_reading"),o0=Symbol("_remain"),d9=Symbol("_size"),a0=Symbol("_write"),ih=Symbol("_writing"),A0=Symbol("_defaultFlag"),ah=Symbol("_errored"),c0=class extends uFe{constructor(e,t){if(t=t||{},super(t),this.readable=!0,this.writable=!1,typeof e!="string")throw new TypeError("path must be a string");this[ah]=!1,this[rr]=typeof t.fd=="number"?t.fd:null,this[Za]=e,this[p9]=t.readSize||16*1024*1024,this[sl]=!1,this[d9]=typeof t.size=="number"?t.size:1/0,this[o0]=this[d9],this[Ah]=typeof t.autoClose=="boolean"?t.autoClose:!0,typeof this[rr]=="number"?this[sh]():this[al]()}get fd(){return this[rr]}get path(){return this[Za]}write(){throw new TypeError("this is a readable stream")}end(){throw new TypeError("this is a readable stream")}[al](){vn.open(this[Za],"r",(e,t)=>this[lh](e,t))}[lh](e,t){e?this[oh](e):(this[rr]=t,this.emit("open",t),this[sh]())}[XF](){return Buffer.allocUnsafe(Math.min(this[p9],this[o0]))}[sh](){if(!this[sl]){this[sl]=!0;let e=this[XF]();if(e.length===0)return process.nextTick(()=>this[WF](null,0,e));vn.read(this[rr],e,0,e.length,null,(t,i,n)=>this[WF](t,i,n))}}[WF](e,t,i){this[sl]=!1,e?this[oh](e):this[VF](t,i)&&this[sh]()}[oo](){if(this[Ah]&&typeof this[rr]=="number"){let e=this[rr];this[rr]=null,vn.close(e,t=>t?this.emit("error",t):this.emit("close"))}}[oh](e){this[sl]=!0,this[oo](),this.emit("error",e)}[VF](e,t){let i=!1;return this[o0]-=e,e>0&&(i=super.write(e<t.length?t.slice(0,e):t)),(e===0||this[o0]<=0)&&(i=!1,this[oo](),super.end()),i}emit(e,t){switch(e){case"prefinish":case"finish":break;case"drain":typeof this[rr]=="number"&&this[sh]();break;case"error":return this[ah]?void 0:(this[ah]=!0,super.emit(e,t));default:return super.emit(e,t)}}},ZF=class extends c0{[al](){let e=!0;try{this[lh](null,vn.openSync(this[Za],"r")),e=!1}finally{e&&this[oo]()}}[sh](){let e=!0;try{if(!this[sl]){this[sl]=!0;do{let t=this[XF](),i=t.length===0?0:vn.readSync(this[rr],t,0,t.length,null);if(!this[VF](i,t))break}while(!0);this[sl]=!1}e=!1}finally{e&&this[oo]()}}[oo](){if(this[Ah]&&typeof this[rr]=="number"){let e=this[rr];this[rr]=null,vn.closeSync(e),this.emit("close")}}},u0=class extends gFe{constructor(e,t){t=t||{},super(t),this.readable=!1,this.writable=!0,this[ah]=!1,this[ih]=!1,this[MC]=!1,this[s0]=!1,this[ta]=[],this[Za]=e,this[rr]=typeof t.fd=="number"?t.fd:null,this[l0]=t.mode===void 0?438:t.mode,this[Hc]=typeof t.start=="number"?t.start:null,this[Ah]=typeof t.autoClose=="boolean"?t.autoClose:!0;let i=this[Hc]!==null?"r+":"w";this[A0]=t.flags===void 0,this[ol]=this[A0]?i:t.flags,this[rr]===null&&this[al]()}emit(e,t){if(e==="error"){if(this[ah])return;this[ah]=!0}return super.emit(e,t)}get fd(){return this[rr]}get path(){return this[Za]}[oh](e){this[oo](),this[ih]=!0,this.emit("error",e)}[al](){vn.open(this[Za],this[ol],this[l0],(e,t)=>this[lh](e,t))}[lh](e,t){this[A0]&&this[ol]==="r+"&&e&&e.code==="ENOENT"?(this[ol]="w",this[al]()):e?this[oh](e):(this[rr]=t,this.emit("open",t),this[JF]())}end(e,t){return e&&this.write(e,t),this[MC]=!0,!this[ih]&&!this[ta].length&&typeof this[rr]=="number"&&this[nh](null,0),this}write(e,t){return typeof e=="string"&&(e=Buffer.from(e,t)),this[MC]?(this.emit("error",new Error("write() after end()")),!1):this[rr]===null||this[ih]||this[ta].length?(this[ta].push(e),this[s0]=!0,!1):(this[ih]=!0,this[a0](e),!0)}[a0](e){vn.write(this[rr],e,0,e.length,this[Hc],(t,i)=>this[nh](t,i))}[nh](e,t){e?this[oh](e):(this[Hc]!==null&&(this[Hc]+=t),this[ta].length?this[JF]():(this[ih]=!1,this[MC]&&!this[h9]?(this[h9]=!0,this[oo](),this.emit("finish")):this[s0]&&(this[s0]=!1,this.emit("drain"))))}[JF](){if(this[ta].length===0)this[MC]&&this[nh](null,0);else if(this[ta].length===1)this[a0](this[ta].pop());else{let e=this[ta];this[ta]=[],zF(this[rr],e,this[Hc],(t,i)=>this[nh](t,i))}}[oo](){if(this[Ah]&&typeof this[rr]=="number"){let e=this[rr];this[rr]=null,vn.close(e,t=>t?this.emit("error",t):this.emit("close"))}}},_F=class extends u0{[al](){let e;if(this[A0]&&this[ol]==="r+")try{e=vn.openSync(this[Za],this[ol],this[l0])}catch(t){if(t.code==="ENOENT")return this[ol]="w",this[al]();throw t}else e=vn.openSync(this[Za],this[ol],this[l0]);this[lh](null,e)}[oo](){if(this[Ah]&&typeof this[rr]=="number"){let e=this[rr];this[rr]=null,vn.closeSync(e),this.emit("close")}}[a0](e){let t=!0;try{this[nh](null,vn.writeSync(this[rr],e,0,e.length,this[Hc])),t=!1}finally{if(t)try{this[oo]()}catch{}}}};KC.ReadStream=c0;KC.ReadStreamSync=ZF;KC.WriteStream=u0;KC.WriteStreamSync=_F});var m0=w((Hot,B9)=>{"use strict";var fFe=jB(),hFe=eh(),pFe=J("events"),dFe=YI(),CFe=1024*1024,mFe=HB(),C9=YB(),EFe=hF(),$F=Buffer.from([31,139]),Ss=Symbol("state"),Gc=Symbol("writeEntry"),_a=Symbol("readEntry"),eN=Symbol("nextEntry"),m9=Symbol("processEntry"),vs=Symbol("extendedHeader"),UC=Symbol("globalExtendedHeader"),Al=Symbol("meta"),E9=Symbol("emitMeta"),Er=Symbol("buffer"),$a=Symbol("queue"),Yc=Symbol("ended"),I9=Symbol("emittedEnd"),jc=Symbol("emit"),xn=Symbol("unzip"),g0=Symbol("consumeChunk"),f0=Symbol("consumeChunkSub"),tN=Symbol("consumeBody"),y9=Symbol("consumeMeta"),w9=Symbol("consumeHeader"),h0=Symbol("consuming"),rN=Symbol("bufferConcat"),iN=Symbol("maybeEnd"),HC=Symbol("writing"),ll=Symbol("aborted"),p0=Symbol("onDone"),qc=Symbol("sawValidEntry"),d0=Symbol("sawNullBlock"),C0=Symbol("sawEOF"),IFe=r=>!0;B9.exports=fFe(class extends pFe{constructor(e){e=e||{},super(e),this.file=e.file||"",this[qc]=null,this.on(p0,t=>{(this[Ss]==="begin"||this[qc]===!1)&&this.warn("TAR_BAD_ARCHIVE","Unrecognized archive format")}),e.ondone?this.on(p0,e.ondone):this.on(p0,t=>{this.emit("prefinish"),this.emit("finish"),this.emit("end"),this.emit("close")}),this.strict=!!e.strict,this.maxMetaEntrySize=e.maxMetaEntrySize||CFe,this.filter=typeof e.filter=="function"?e.filter:IFe,this.writable=!0,this.readable=!1,this[$a]=new dFe,this[Er]=null,this[_a]=null,this[Gc]=null,this[Ss]="begin",this[Al]="",this[vs]=null,this[UC]=null,this[Yc]=!1,this[xn]=null,this[ll]=!1,this[d0]=!1,this[C0]=!1,typeof e.onwarn=="function"&&this.on("warn",e.onwarn),typeof e.onentry=="function"&&this.on("entry",e.onentry)}[w9](e,t){this[qc]===null&&(this[qc]=!1);let i;try{i=new hFe(e,t,this[vs],this[UC])}catch(n){return this.warn("TAR_ENTRY_INVALID",n)}if(i.nullBlock)this[d0]?(this[C0]=!0,this[Ss]==="begin"&&(this[Ss]="header"),this[jc]("eof")):(this[d0]=!0,this[jc]("nullBlock"));else if(this[d0]=!1,!i.cksumValid)this.warn("TAR_ENTRY_INVALID","checksum failure",{header:i});else if(!i.path)this.warn("TAR_ENTRY_INVALID","path is required",{header:i});else{let n=i.type;if(/^(Symbolic)?Link$/.test(n)&&!i.linkpath)this.warn("TAR_ENTRY_INVALID","linkpath required",{header:i});else if(!/^(Symbolic)?Link$/.test(n)&&i.linkpath)this.warn("TAR_ENTRY_INVALID","linkpath forbidden",{header:i});else{let s=this[Gc]=new mFe(i,this[vs],this[UC]);if(!this[qc])if(s.remain){let o=()=>{s.invalid||(this[qc]=!0)};s.on("end",o)}else this[qc]=!0;s.meta?s.size>this.maxMetaEntrySize?(s.ignore=!0,this[jc]("ignoredEntry",s),this[Ss]="ignore",s.resume()):s.size>0&&(this[Al]="",s.on("data",o=>this[Al]+=o),this[Ss]="meta"):(this[vs]=null,s.ignore=s.ignore||!this.filter(s.path,s),s.ignore?(this[jc]("ignoredEntry",s),this[Ss]=s.remain?"ignore":"header",s.resume()):(s.remain?this[Ss]="body":(this[Ss]="header",s.end()),this[_a]?this[$a].push(s):(this[$a].push(s),this[eN]())))}}}[m9](e){let t=!0;return e?Array.isArray(e)?this.emit.apply(this,e):(this[_a]=e,this.emit("entry",e),e.emittedEnd||(e.on("end",i=>this[eN]()),t=!1)):(this[_a]=null,t=!1),t}[eN](){do;while(this[m9](this[$a].shift()));if(!this[$a].length){let e=this[_a];!e||e.flowing||e.size===e.remain?this[HC]||this.emit("drain"):e.once("drain",i=>this.emit("drain"))}}[tN](e,t){let i=this[Gc],n=i.blockRemain,s=n>=e.length&&t===0?e:e.slice(t,t+n);return i.write(s),i.blockRemain||(this[Ss]="header",this[Gc]=null,i.end()),s.length}[y9](e,t){let i=this[Gc],n=this[tN](e,t);return this[Gc]||this[E9](i),n}[jc](e,t,i){!this[$a].length&&!this[_a]?this.emit(e,t,i):this[$a].push([e,t,i])}[E9](e){switch(this[jc]("meta",this[Al]),e.type){case"ExtendedHeader":case"OldExtendedHeader":this[vs]=C9.parse(this[Al],this[vs],!1);break;case"GlobalExtendedHeader":this[UC]=C9.parse(this[Al],this[UC],!0);break;case"NextFileHasLongPath":case"OldGnuLongPath":this[vs]=this[vs]||Object.create(null),this[vs].path=this[Al].replace(/\0.*/,"");break;case"NextFileHasLongLinkpath":this[vs]=this[vs]||Object.create(null),this[vs].linkpath=this[Al].replace(/\0.*/,"");break;default:throw new Error("unknown meta: "+e.type)}}abort(e){this[ll]=!0,this.emit("abort",e),this.warn("TAR_ABORT",e,{recoverable:!1})}write(e){if(this[ll])return;if(this[xn]===null&&e){if(this[Er]&&(e=Buffer.concat([this[Er],e]),this[Er]=null),e.length<$F.length)return this[Er]=e,!0;for(let i=0;this[xn]===null&&i<$F.length;i++)e[i]!==$F[i]&&(this[xn]=!1);if(this[xn]===null){let i=this[Yc];this[Yc]=!1,this[xn]=new EFe.Unzip,this[xn].on("data",s=>this[g0](s)),this[xn].on("error",s=>this.abort(s)),this[xn].on("end",s=>{this[Yc]=!0,this[g0]()}),this[HC]=!0;let n=this[xn][i?"end":"write"](e);return this[HC]=!1,n}}this[HC]=!0,this[xn]?this[xn].write(e):this[g0](e),this[HC]=!1;let t=this[$a].length?!1:this[_a]?this[_a].flowing:!0;return!t&&!this[$a].length&&this[_a].once("drain",i=>this.emit("drain")),t}[rN](e){e&&!this[ll]&&(this[Er]=this[Er]?Buffer.concat([this[Er],e]):e)}[iN](){if(this[Yc]&&!this[I9]&&!this[ll]&&!this[h0]){this[I9]=!0;let e=this[Gc];if(e&&e.blockRemain){let t=this[Er]?this[Er].length:0;this.warn("TAR_BAD_ARCHIVE",`Truncated input (needed ${e.blockRemain} more bytes, only ${t} available)`,{entry:e}),this[Er]&&e.write(this[Er]),e.end()}this[jc](p0)}}[g0](e){if(this[h0])this[rN](e);else if(!e&&!this[Er])this[iN]();else{if(this[h0]=!0,this[Er]){this[rN](e);let t=this[Er];this[Er]=null,this[f0](t)}else this[f0](e);for(;this[Er]&&this[Er].length>=512&&!this[ll]&&!this[C0];){let t=this[Er];this[Er]=null,this[f0](t)}this[h0]=!1}(!this[Er]||this[Yc])&&this[iN]()}[f0](e){let t=0,i=e.length;for(;t+512<=i&&!this[ll]&&!this[C0];)switch(this[Ss]){case"begin":case"header":this[w9](e,t),t+=512;break;case"ignore":case"body":t+=this[tN](e,t);break;case"meta":t+=this[y9](e,t);break;default:throw new Error("invalid state: "+this[Ss])}t<i&&(this[Er]?this[Er]=Buffer.concat([e.slice(t),this[Er]]):this[Er]=e.slice(t))}end(e){this[ll]||(this[xn]?this[xn].end(e):(this[Yc]=!0,this.write(e)))}})});var E0=w((Got,v9)=>{"use strict";var yFe=Wf(),b9=m0(),uh=J("fs"),wFe=ch(),Q9=J("path"),nN=th();v9.exports=(r,e,t)=>{typeof r=="function"?(t=r,e=null,r={}):Array.isArray(r)&&(e=r,r={}),typeof e=="function"&&(t=e,e=null),e?e=Array.from(e):e=[];let i=yFe(r);if(i.sync&&typeof t=="function")throw new TypeError("callback not supported for sync tar functions");if(!i.file&&typeof t=="function")throw new TypeError("callback only supported with file option");return e.length&&QFe(i,e),i.noResume||BFe(i),i.file&&i.sync?bFe(i):i.file?SFe(i,t):S9(i)};var BFe=r=>{let e=r.onentry;r.onentry=e?t=>{e(t),t.resume()}:t=>t.resume()},QFe=(r,e)=>{let t=new Map(e.map(s=>[nN(s),!0])),i=r.filter,n=(s,o)=>{let a=o||Q9.parse(s).root||".",l=s===a?!1:t.has(s)?t.get(s):n(Q9.dirname(s),a);return t.set(s,l),l};r.filter=i?(s,o)=>i(s,o)&&n(nN(s)):s=>n(nN(s))},bFe=r=>{let e=S9(r),t=r.file,i=!0,n;try{let s=uh.statSync(t),o=r.maxReadSize||16*1024*1024;if(s.size<o)e.end(uh.readFileSync(t));else{let a=0,l=Buffer.allocUnsafe(o);for(n=uh.openSync(t,"r");a<s.size;){let c=uh.readSync(n,l,0,o,a);a+=c,e.write(l.slice(0,c))}e.end()}i=!1}finally{if(i&&n)try{uh.closeSync(n)}catch{}}},SFe=(r,e)=>{let t=new b9(r),i=r.maxReadSize||16*1024*1024,n=r.file,s=new Promise((o,a)=>{t.on("error",a),t.on("end",o),uh.stat(n,(l,c)=>{if(l)a(l);else{let u=new wFe.ReadStream(n,{readSize:i,size:c.size});u.on("error",a),u.pipe(t)}})});return e?s.then(e,e):s},S9=r=>new b9(r)});var F9=w((Yot,R9)=>{"use strict";var vFe=Wf(),I0=n0(),x9=ch(),P9=E0(),D9=J("path");R9.exports=(r,e,t)=>{if(typeof e=="function"&&(t=e),Array.isArray(r)&&(e=r,r={}),!e||!Array.isArray(e)||!e.length)throw new TypeError("no files or directories specified");e=Array.from(e);let i=vFe(r);if(i.sync&&typeof t=="function")throw new TypeError("callback not supported for sync tar functions");if(!i.file&&typeof t=="function")throw new TypeError("callback only supported with file option");return i.file&&i.sync?xFe(i,e):i.file?PFe(i,e,t):i.sync?DFe(i,e):kFe(i,e)};var xFe=(r,e)=>{let t=new I0.Sync(r),i=new x9.WriteStreamSync(r.file,{mode:r.mode||438});t.pipe(i),k9(t,e)},PFe=(r,e,t)=>{let i=new I0(r),n=new x9.WriteStream(r.file,{mode:r.mode||438});i.pipe(n);let s=new Promise((o,a)=>{n.on("error",a),n.on("close",o),i.on("error",a)});return sN(i,e),t?s.then(t,t):s},k9=(r,e)=>{e.forEach(t=>{t.charAt(0)==="@"?P9({file:D9.resolve(r.cwd,t.substr(1)),sync:!0,noResume:!0,onentry:i=>r.add(i)}):r.add(t)}),r.end()},sN=(r,e)=>{for(;e.length;){let t=e.shift();if(t.charAt(0)==="@")return P9({file:D9.resolve(r.cwd,t.substr(1)),noResume:!0,onentry:i=>r.add(i)}).then(i=>sN(r,e));r.add(t)}r.end()},DFe=(r,e)=>{let t=new I0.Sync(r);return k9(t,e),t},kFe=(r,e)=>{let t=new I0(r);return sN(t,e),t}});var oN=w((jot,U9)=>{"use strict";var RFe=Wf(),N9=n0(),Xn=J("fs"),L9=ch(),T9=E0(),O9=J("path"),M9=eh();U9.exports=(r,e,t)=>{let i=RFe(r);if(!i.file)throw new TypeError("file is required");if(i.gzip)throw new TypeError("cannot append to compressed archives");if(!e||!Array.isArray(e)||!e.length)throw new TypeError("no files or directories specified");return e=Array.from(e),i.sync?FFe(i,e):LFe(i,e,t)};var FFe=(r,e)=>{let t=new N9.Sync(r),i=!0,n,s;try{try{n=Xn.openSync(r.file,"r+")}catch(l){if(l.code==="ENOENT")n=Xn.openSync(r.file,"w+");else throw l}let o=Xn.fstatSync(n),a=Buffer.alloc(512);e:for(s=0;s<o.size;s+=512){for(let u=0,g=0;u<512;u+=g){if(g=Xn.readSync(n,a,u,a.length-u,s+u),s===0&&a[0]===31&&a[1]===139)throw new Error("cannot append to compressed archives");if(!g)break e}let l=new M9(a);if(!l.cksumValid)break;let c=512*Math.ceil(l.size/512);if(s+c+512>o.size)break;s+=c,r.mtimeCache&&r.mtimeCache.set(l.path,l.mtime)}i=!1,NFe(r,t,s,n,e)}finally{if(i)try{Xn.closeSync(n)}catch{}}},NFe=(r,e,t,i,n)=>{let s=new L9.WriteStreamSync(r.file,{fd:i,start:t});e.pipe(s),TFe(e,n)},LFe=(r,e,t)=>{e=Array.from(e);let i=new N9(r),n=(o,a,l)=>{let c=(p,C)=>{p?Xn.close(o,y=>l(p)):l(null,C)},u=0;if(a===0)return c(null,0);let g=0,f=Buffer.alloc(512),h=(p,C)=>{if(p)return c(p);if(g+=C,g<512&&C)return Xn.read(o,f,g,f.length-g,u+g,h);if(u===0&&f[0]===31&&f[1]===139)return c(new Error("cannot append to compressed archives"));if(g<512)return c(null,u);let y=new M9(f);if(!y.cksumValid)return c(null,u);let B=512*Math.ceil(y.size/512);if(u+B+512>a||(u+=B+512,u>=a))return c(null,u);r.mtimeCache&&r.mtimeCache.set(y.path,y.mtime),g=0,Xn.read(o,f,0,512,u,h)};Xn.read(o,f,0,512,u,h)},s=new Promise((o,a)=>{i.on("error",a);let l="r+",c=(u,g)=>{if(u&&u.code==="ENOENT"&&l==="r+")return l="w+",Xn.open(r.file,l,c);if(u)return a(u);Xn.fstat(g,(f,h)=>{if(f)return Xn.close(g,()=>a(f));n(g,h.size,(p,C)=>{if(p)return a(p);let y=new L9.WriteStream(r.file,{fd:g,start:C});i.pipe(y),y.on("error",a),y.on("close",o),K9(i,e)})})};Xn.open(r.file,l,c)});return t?s.then(t,t):s},TFe=(r,e)=>{e.forEach(t=>{t.charAt(0)==="@"?T9({file:O9.resolve(r.cwd,t.substr(1)),sync:!0,noResume:!0,onentry:i=>r.add(i)}):r.add(t)}),r.end()},K9=(r,e)=>{for(;e.length;){let t=e.shift();if(t.charAt(0)==="@")return T9({file:O9.resolve(r.cwd,t.substr(1)),noResume:!0,onentry:i=>r.add(i)}).then(i=>K9(r,e));r.add(t)}r.end()}});var G9=w((qot,H9)=>{"use strict";var OFe=Wf(),MFe=oN();H9.exports=(r,e,t)=>{let i=OFe(r);if(!i.file)throw new TypeError("file is required");if(i.gzip)throw new TypeError("cannot append to compressed archives");if(!e||!Array.isArray(e)||!e.length)throw new TypeError("no files or directories specified");return e=Array.from(e),KFe(i),MFe(i,e,t)};var KFe=r=>{let e=r.filter;r.mtimeCache||(r.mtimeCache=new Map),r.filter=e?(t,i)=>e(t,i)&&!(r.mtimeCache.get(t)>i.mtime):(t,i)=>!(r.mtimeCache.get(t)>i.mtime)}});var q9=w((Jot,j9)=>{var{promisify:Y9}=J("util"),cl=J("fs"),UFe=r=>{if(!r)r={mode:511,fs:cl};else if(typeof r=="object")r={mode:511,fs:cl,...r};else if(typeof r=="number")r={mode:r,fs:cl};else if(typeof r=="string")r={mode:parseInt(r,8),fs:cl};else throw new TypeError("invalid options argument");return r.mkdir=r.mkdir||r.fs.mkdir||cl.mkdir,r.mkdirAsync=Y9(r.mkdir),r.stat=r.stat||r.fs.stat||cl.stat,r.statAsync=Y9(r.stat),r.statSync=r.statSync||r.fs.statSync||cl.statSync,r.mkdirSync=r.mkdirSync||r.fs.mkdirSync||cl.mkdirSync,r};j9.exports=UFe});var W9=w((Wot,J9)=>{var HFe=process.env.__TESTING_MKDIRP_PLATFORM__||process.platform,{resolve:GFe,parse:YFe}=J("path"),jFe=r=>{if(/\0/.test(r))throw Object.assign(new TypeError("path must be a string without null bytes"),{path:r,code:"ERR_INVALID_ARG_VALUE"});if(r=GFe(r),HFe==="win32"){let e=/[*|"<>?:]/,{root:t}=YFe(r);if(e.test(r.substr(t.length)))throw Object.assign(new Error("Illegal characters in path."),{path:r,code:"EINVAL"})}return r};J9.exports=jFe});var _9=w((zot,Z9)=>{var{dirname:z9}=J("path"),V9=(r,e,t=void 0)=>t===e?Promise.resolve():r.statAsync(e).then(i=>i.isDirectory()?t:void 0,i=>i.code==="ENOENT"?V9(r,z9(e),e):void 0),X9=(r,e,t=void 0)=>{if(t!==e)try{return r.statSync(e).isDirectory()?t:void 0}catch(i){return i.code==="ENOENT"?X9(r,z9(e),e):void 0}};Z9.exports={findMade:V9,findMadeSync:X9}});var lN=w((Vot,eX)=>{var{dirname:$9}=J("path"),aN=(r,e,t)=>{e.recursive=!1;let i=$9(r);return i===r?e.mkdirAsync(r,e).catch(n=>{if(n.code!=="EISDIR")throw n}):e.mkdirAsync(r,e).then(()=>t||r,n=>{if(n.code==="ENOENT")return aN(i,e).then(s=>aN(r,e,s));if(n.code!=="EEXIST"&&n.code!=="EROFS")throw n;return e.statAsync(r).then(s=>{if(s.isDirectory())return t;throw n},()=>{throw n})})},AN=(r,e,t)=>{let i=$9(r);if(e.recursive=!1,i===r)try{return e.mkdirSync(r,e)}catch(n){if(n.code!=="EISDIR")throw n;return}try{return e.mkdirSync(r,e),t||r}catch(n){if(n.code==="ENOENT")return AN(r,e,AN(i,e,t));if(n.code!=="EEXIST"&&n.code!=="EROFS")throw n;try{if(!e.statSync(r).isDirectory())throw n}catch{throw n}}};eX.exports={mkdirpManual:aN,mkdirpManualSync:AN}});var iX=w((Xot,rX)=>{var{dirname:tX}=J("path"),{findMade:qFe,findMadeSync:JFe}=_9(),{mkdirpManual:WFe,mkdirpManualSync:zFe}=lN(),VFe=(r,e)=>(e.recursive=!0,tX(r)===r?e.mkdirAsync(r,e):qFe(e,r).then(i=>e.mkdirAsync(r,e).then(()=>i).catch(n=>{if(n.code==="ENOENT")return WFe(r,e);throw n}))),XFe=(r,e)=>{if(e.recursive=!0,tX(r)===r)return e.mkdirSync(r,e);let i=JFe(e,r);try{return e.mkdirSync(r,e),i}catch(n){if(n.code==="ENOENT")return zFe(r,e);throw n}};rX.exports={mkdirpNative:VFe,mkdirpNativeSync:XFe}});var aX=w((Zot,oX)=>{var nX=J("fs"),ZFe=process.env.__TESTING_MKDIRP_NODE_VERSION__||process.version,cN=ZFe.replace(/^v/,"").split("."),sX=+cN[0]>10||+cN[0]==10&&+cN[1]>=12,_Fe=sX?r=>r.mkdir===nX.mkdir:()=>!1,$Fe=sX?r=>r.mkdirSync===nX.mkdirSync:()=>!1;oX.exports={useNative:_Fe,useNativeSync:$Fe}});var fX=w((_ot,gX)=>{var gh=q9(),fh=W9(),{mkdirpNative:AX,mkdirpNativeSync:lX}=iX(),{mkdirpManual:cX,mkdirpManualSync:uX}=lN(),{useNative:eNe,useNativeSync:tNe}=aX(),hh=(r,e)=>(r=fh(r),e=gh(e),eNe(e)?AX(r,e):cX(r,e)),rNe=(r,e)=>(r=fh(r),e=gh(e),tNe(e)?lX(r,e):uX(r,e));hh.sync=rNe;hh.native=(r,e)=>AX(fh(r),gh(e));hh.manual=(r,e)=>cX(fh(r),gh(e));hh.nativeSync=(r,e)=>lX(fh(r),gh(e));hh.manualSync=(r,e)=>uX(fh(r),gh(e));gX.exports=hh});var IX=w(($ot,EX)=>{"use strict";var xs=J("fs"),Jc=J("path"),iNe=xs.lchown?"lchown":"chown",nNe=xs.lchownSync?"lchownSync":"chownSync",pX=xs.lchown&&!process.version.match(/v1[1-9]+\./)&&!process.version.match(/v10\.[6-9]/),hX=(r,e,t)=>{try{return xs[nNe](r,e,t)}catch(i){if(i.code!=="ENOENT")throw i}},sNe=(r,e,t)=>{try{return xs.chownSync(r,e,t)}catch(i){if(i.code!=="ENOENT")throw i}},oNe=pX?(r,e,t,i)=>n=>{!n||n.code!=="EISDIR"?i(n):xs.chown(r,e,t,i)}:(r,e,t,i)=>i,uN=pX?(r,e,t)=>{try{return hX(r,e,t)}catch(i){if(i.code!=="EISDIR")throw i;sNe(r,e,t)}}:(r,e,t)=>hX(r,e,t),aNe=process.version,dX=(r,e,t)=>xs.readdir(r,e,t),ANe=(r,e)=>xs.readdirSync(r,e);/^v4\./.test(aNe)&&(dX=(r,e,t)=>xs.readdir(r,t));var y0=(r,e,t,i)=>{xs[iNe](r,e,t,oNe(r,e,t,n=>{i(n&&n.code!=="ENOENT"?n:null)}))},CX=(r,e,t,i,n)=>{if(typeof e=="string")return xs.lstat(Jc.resolve(r,e),(s,o)=>{if(s)return n(s.code!=="ENOENT"?s:null);o.name=e,CX(r,o,t,i,n)});if(e.isDirectory())gN(Jc.resolve(r,e.name),t,i,s=>{if(s)return n(s);let o=Jc.resolve(r,e.name);y0(o,t,i,n)});else{let s=Jc.resolve(r,e.name);y0(s,t,i,n)}},gN=(r,e,t,i)=>{dX(r,{withFileTypes:!0},(n,s)=>{if(n){if(n.code==="ENOENT")return i();if(n.code!=="ENOTDIR"&&n.code!=="ENOTSUP")return i(n)}if(n||!s.length)return y0(r,e,t,i);let o=s.length,a=null,l=c=>{if(!a){if(c)return i(a=c);if(--o===0)return y0(r,e,t,i)}};s.forEach(c=>CX(r,c,e,t,l))})},lNe=(r,e,t,i)=>{if(typeof e=="string")try{let n=xs.lstatSync(Jc.resolve(r,e));n.name=e,e=n}catch(n){if(n.code==="ENOENT")return;throw n}e.isDirectory()&&mX(Jc.resolve(r,e.name),t,i),uN(Jc.resolve(r,e.name),t,i)},mX=(r,e,t)=>{let i;try{i=ANe(r,{withFileTypes:!0})}catch(n){if(n.code==="ENOENT")return;if(n.code==="ENOTDIR"||n.code==="ENOTSUP")return uN(r,e,t);throw n}return i&&i.length&&i.forEach(n=>lNe(r,n,e,t)),uN(r,e,t)};EX.exports=gN;gN.sync=mX});var QX=w((eat,fN)=>{"use strict";var yX=fX(),Ps=J("fs"),w0=J("path"),wX=IX(),ao=_f(),B0=class extends Error{constructor(e,t){super("Cannot extract through symbolic link"),this.path=t,this.symlink=e}get name(){return"SylinkError"}},Q0=class extends Error{constructor(e,t){super(t+": Cannot cd into '"+e+"'"),this.path=e,this.code=t}get name(){return"CwdError"}},b0=(r,e)=>r.get(ao(e)),GC=(r,e,t)=>r.set(ao(e),t),cNe=(r,e)=>{Ps.stat(r,(t,i)=>{(t||!i.isDirectory())&&(t=new Q0(r,t&&t.code||"ENOTDIR")),e(t)})};fN.exports=(r,e,t)=>{r=ao(r);let i=e.umask,n=e.mode|448,s=(n&i)!==0,o=e.uid,a=e.gid,l=typeof o=="number"&&typeof a=="number"&&(o!==e.processUid||a!==e.processGid),c=e.preserve,u=e.unlink,g=e.cache,f=ao(e.cwd),h=(y,B)=>{y?t(y):(GC(g,r,!0),B&&l?wX(B,o,a,v=>h(v)):s?Ps.chmod(r,n,t):t())};if(g&&b0(g,r)===!0)return h();if(r===f)return cNe(r,h);if(c)return yX(r,{mode:n}).then(y=>h(null,y),h);let C=ao(w0.relative(f,r)).split("/");S0(f,C,n,g,u,f,null,h)};var S0=(r,e,t,i,n,s,o,a)=>{if(!e.length)return a(null,o);let l=e.shift(),c=ao(w0.resolve(r+"/"+l));if(b0(i,c))return S0(c,e,t,i,n,s,o,a);Ps.mkdir(c,t,BX(c,e,t,i,n,s,o,a))},BX=(r,e,t,i,n,s,o,a)=>l=>{l?Ps.lstat(r,(c,u)=>{if(c)c.path=c.path&&ao(c.path),a(c);else if(u.isDirectory())S0(r,e,t,i,n,s,o,a);else if(n)Ps.unlink(r,g=>{if(g)return a(g);Ps.mkdir(r,t,BX(r,e,t,i,n,s,o,a))});else{if(u.isSymbolicLink())return a(new B0(r,r+"/"+e.join("/")));a(l)}}):(o=o||r,S0(r,e,t,i,n,s,o,a))},uNe=r=>{let e=!1,t="ENOTDIR";try{e=Ps.statSync(r).isDirectory()}catch(i){t=i.code}finally{if(!e)throw new Q0(r,t)}};fN.exports.sync=(r,e)=>{r=ao(r);let t=e.umask,i=e.mode|448,n=(i&t)!==0,s=e.uid,o=e.gid,a=typeof s=="number"&&typeof o=="number"&&(s!==e.processUid||o!==e.processGid),l=e.preserve,c=e.unlink,u=e.cache,g=ao(e.cwd),f=y=>{GC(u,r,!0),y&&a&&wX.sync(y,s,o),n&&Ps.chmodSync(r,i)};if(u&&b0(u,r)===!0)return f();if(r===g)return uNe(g),f();if(l)return f(yX.sync(r,i));let p=ao(w0.relative(g,r)).split("/"),C=null;for(let y=p.shift(),B=g;y&&(B+="/"+y);y=p.shift())if(B=ao(w0.resolve(B)),!b0(u,B))try{Ps.mkdirSync(B,i),C=C||B,GC(u,B,!0)}catch{let D=Ps.lstatSync(B);if(D.isDirectory()){GC(u,B,!0);continue}else if(c){Ps.unlinkSync(B),Ps.mkdirSync(B,i),C=C||B,GC(u,B,!0);continue}else if(D.isSymbolicLink())return new B0(B,B+"/"+p.join("/"))}return f(C)}});var pN=w((tat,bX)=>{var hN=Object.create(null),{hasOwnProperty:gNe}=Object.prototype;bX.exports=r=>(gNe.call(hN,r)||(hN[r]=r.normalize("NFKD")),hN[r])});var PX=w((rat,xX)=>{var SX=J("assert"),fNe=pN(),hNe=th(),{join:vX}=J("path"),pNe=process.env.TESTING_TAR_FAKE_PLATFORM||process.platform,dNe=pNe==="win32";xX.exports=()=>{let r=new Map,e=new Map,t=c=>c.split("/").slice(0,-1).reduce((g,f)=>(g.length&&(f=vX(g[g.length-1],f)),g.push(f||"/"),g),[]),i=new Set,n=c=>{let u=e.get(c);if(!u)throw new Error("function does not have any path reservations");return{paths:u.paths.map(g=>r.get(g)),dirs:[...u.dirs].map(g=>r.get(g))}},s=c=>{let{paths:u,dirs:g}=n(c);return u.every(f=>f[0]===c)&&g.every(f=>f[0]instanceof Set&&f[0].has(c))},o=c=>i.has(c)||!s(c)?!1:(i.add(c),c(()=>a(c)),!0),a=c=>{if(!i.has(c))return!1;let{paths:u,dirs:g}=e.get(c),f=new Set;return u.forEach(h=>{let p=r.get(h);SX.equal(p[0],c),p.length===1?r.delete(h):(p.shift(),typeof p[0]=="function"?f.add(p[0]):p[0].forEach(C=>f.add(C)))}),g.forEach(h=>{let p=r.get(h);SX(p[0]instanceof Set),p[0].size===1&&p.length===1?r.delete(h):p[0].size===1?(p.shift(),f.add(p[0])):p[0].delete(c)}),i.delete(c),f.forEach(h=>o(h)),!0};return{check:s,reserve:(c,u)=>{c=dNe?["win32 parallelization disabled"]:c.map(f=>fNe(hNe(vX(f))).toLowerCase());let g=new Set(c.map(f=>t(f)).reduce((f,h)=>f.concat(h)));return e.set(u,{dirs:g,paths:c}),c.forEach(f=>{let h=r.get(f);h?h.push(u):r.set(f,[u])}),g.forEach(f=>{let h=r.get(f);h?h[h.length-1]instanceof Set?h[h.length-1].add(u):h.push(new Set([u])):r.set(f,[new Set([u])])}),o(u)}}}});var RX=w((iat,kX)=>{var CNe=process.env.__FAKE_PLATFORM__||process.platform,mNe=CNe==="win32",ENe=global.__FAKE_TESTING_FS__||J("fs"),{O_CREAT:INe,O_TRUNC:yNe,O_WRONLY:wNe,UV_FS_O_FILEMAP:DX=0}=ENe.constants,BNe=mNe&&!!DX,QNe=512*1024,bNe=DX|yNe|INe|wNe;kX.exports=BNe?r=>r<QNe?bNe:"w":()=>"w"});var QN=w((nat,JX)=>{"use strict";var SNe=J("assert"),vNe=m0(),jt=J("fs"),xNe=ch(),eA=J("path"),YX=QX(),FX=QF(),PNe=PX(),DNe=bF(),Zn=_f(),kNe=th(),RNe=pN(),NX=Symbol("onEntry"),mN=Symbol("checkFs"),LX=Symbol("checkFs2"),P0=Symbol("pruneCache"),EN=Symbol("isReusable"),Ds=Symbol("makeFs"),IN=Symbol("file"),yN=Symbol("directory"),D0=Symbol("link"),TX=Symbol("symlink"),OX=Symbol("hardlink"),MX=Symbol("unsupported"),KX=Symbol("checkPath"),ul=Symbol("mkdir"),Yi=Symbol("onError"),v0=Symbol("pending"),UX=Symbol("pend"),ph=Symbol("unpend"),dN=Symbol("ended"),CN=Symbol("maybeClose"),wN=Symbol("skip"),YC=Symbol("doChown"),jC=Symbol("uid"),qC=Symbol("gid"),JC=Symbol("checkedCwd"),jX=J("crypto"),qX=RX(),FNe=process.env.TESTING_TAR_FAKE_PLATFORM||process.platform,WC=FNe==="win32",NNe=(r,e)=>{if(!WC)return jt.unlink(r,e);let t=r+".DELETE."+jX.randomBytes(16).toString("hex");jt.rename(r,t,i=>{if(i)return e(i);jt.unlink(t,e)})},LNe=r=>{if(!WC)return jt.unlinkSync(r);let e=r+".DELETE."+jX.randomBytes(16).toString("hex");jt.renameSync(r,e),jt.unlinkSync(e)},HX=(r,e,t)=>r===r>>>0?r:e===e>>>0?e:t,GX=r=>RNe(kNe(Zn(r))).toLowerCase(),TNe=(r,e)=>{e=GX(e);for(let t of r.keys()){let i=GX(t);(i===e||i.indexOf(e+"/")===0)&&r.delete(t)}},ONe=r=>{for(let e of r.keys())r.delete(e)},zC=class extends vNe{constructor(e){if(e||(e={}),e.ondone=t=>{this[dN]=!0,this[CN]()},super(e),this[JC]=!1,this.reservations=PNe(),this.transform=typeof e.transform=="function"?e.transform:null,this.writable=!0,this.readable=!1,this[v0]=0,this[dN]=!1,this.dirCache=e.dirCache||new Map,typeof e.uid=="number"||typeof e.gid=="number"){if(typeof e.uid!="number"||typeof e.gid!="number")throw new TypeError("cannot set owner without number uid and gid");if(e.preserveOwner)throw new TypeError("cannot preserve owner in archive and also set owner explicitly");this.uid=e.uid,this.gid=e.gid,this.setOwner=!0}else this.uid=null,this.gid=null,this.setOwner=!1;e.preserveOwner===void 0&&typeof e.uid!="number"?this.preserveOwner=process.getuid&&process.getuid()===0:this.preserveOwner=!!e.preserveOwner,this.processUid=(this.preserveOwner||this.setOwner)&&process.getuid?process.getuid():null,this.processGid=(this.preserveOwner||this.setOwner)&&process.getgid?process.getgid():null,this.forceChown=e.forceChown===!0,this.win32=!!e.win32||WC,this.newer=!!e.newer,this.keep=!!e.keep,this.noMtime=!!e.noMtime,this.preservePaths=!!e.preservePaths,this.unlink=!!e.unlink,this.cwd=Zn(eA.resolve(e.cwd||process.cwd())),this.strip=+e.strip||0,this.processUmask=e.noChmod?0:process.umask(),this.umask=typeof e.umask=="number"?e.umask:this.processUmask,this.dmode=e.dmode||511&~this.umask,this.fmode=e.fmode||438&~this.umask,this.on("entry",t=>this[NX](t))}warn(e,t,i={}){return(e==="TAR_BAD_ARCHIVE"||e==="TAR_ABORT")&&(i.recoverable=!1),super.warn(e,t,i)}[CN](){this[dN]&&this[v0]===0&&(this.emit("prefinish"),this.emit("finish"),this.emit("end"),this.emit("close"))}[KX](e){if(this.strip){let t=Zn(e.path).split("/");if(t.length<this.strip)return!1;if(e.path=t.slice(this.strip).join("/"),e.type==="Link"){let i=Zn(e.linkpath).split("/");if(i.length>=this.strip)e.linkpath=i.slice(this.strip).join("/");else return!1}}if(!this.preservePaths){let t=Zn(e.path),i=t.split("/");if(i.includes("..")||WC&&/^[a-z]:\.\.$/i.test(i[0]))return this.warn("TAR_ENTRY_ERROR","path contains '..'",{entry:e,path:t}),!1;let[n,s]=DNe(t);n&&(e.path=s,this.warn("TAR_ENTRY_INFO",`stripping ${n} from absolute path`,{entry:e,path:t}))}if(eA.isAbsolute(e.path)?e.absolute=Zn(eA.resolve(e.path)):e.absolute=Zn(eA.resolve(this.cwd,e.path)),!this.preservePaths&&e.absolute.indexOf(this.cwd+"/")!==0&&e.absolute!==this.cwd)return this.warn("TAR_ENTRY_ERROR","path escaped extraction target",{entry:e,path:Zn(e.path),resolvedPath:e.absolute,cwd:this.cwd}),!1;if(e.absolute===this.cwd&&e.type!=="Directory"&&e.type!=="GNUDumpDir")return!1;if(this.win32){let{root:t}=eA.win32.parse(e.absolute);e.absolute=t+FX.encode(e.absolute.substr(t.length));let{root:i}=eA.win32.parse(e.path);e.path=i+FX.encode(e.path.substr(i.length))}return!0}[NX](e){if(!this[KX](e))return e.resume();switch(SNe.equal(typeof e.absolute,"string"),e.type){case"Directory":case"GNUDumpDir":e.mode&&(e.mode=e.mode|448);case"File":case"OldFile":case"ContiguousFile":case"Link":case"SymbolicLink":return this[mN](e);case"CharacterDevice":case"BlockDevice":case"FIFO":default:return this[MX](e)}}[Yi](e,t){e.name==="CwdError"?this.emit("error",e):(this.warn("TAR_ENTRY_ERROR",e,{entry:t}),this[ph](),t.resume())}[ul](e,t,i){YX(Zn(e),{uid:this.uid,gid:this.gid,processUid:this.processUid,processGid:this.processGid,umask:this.processUmask,preserve:this.preservePaths,unlink:this.unlink,cache:this.dirCache,cwd:this.cwd,mode:t,noChmod:this.noChmod},i)}[YC](e){return this.forceChown||this.preserveOwner&&(typeof e.uid=="number"&&e.uid!==this.processUid||typeof e.gid=="number"&&e.gid!==this.processGid)||typeof this.uid=="number"&&this.uid!==this.processUid||typeof this.gid=="number"&&this.gid!==this.processGid}[jC](e){return HX(this.uid,e.uid,this.processUid)}[qC](e){return HX(this.gid,e.gid,this.processGid)}[IN](e,t){let i=e.mode&4095||this.fmode,n=new xNe.WriteStream(e.absolute,{flags:qX(e.size),mode:i,autoClose:!1});n.on("error",l=>{n.fd&&jt.close(n.fd,()=>{}),n.write=()=>!0,this[Yi](l,e),t()});let s=1,o=l=>{if(l){n.fd&&jt.close(n.fd,()=>{}),this[Yi](l,e),t();return}--s===0&&jt.close(n.fd,c=>{c?this[Yi](c,e):this[ph](),t()})};n.on("finish",l=>{let c=e.absolute,u=n.fd;if(e.mtime&&!this.noMtime){s++;let g=e.atime||new Date,f=e.mtime;jt.futimes(u,g,f,h=>h?jt.utimes(c,g,f,p=>o(p&&h)):o())}if(this[YC](e)){s++;let g=this[jC](e),f=this[qC](e);jt.fchown(u,g,f,h=>h?jt.chown(c,g,f,p=>o(p&&h)):o())}o()});let a=this.transform&&this.transform(e)||e;a!==e&&(a.on("error",l=>{this[Yi](l,e),t()}),e.pipe(a)),a.pipe(n)}[yN](e,t){let i=e.mode&4095||this.dmode;this[ul](e.absolute,i,n=>{if(n){this[Yi](n,e),t();return}let s=1,o=a=>{--s===0&&(t(),this[ph](),e.resume())};e.mtime&&!this.noMtime&&(s++,jt.utimes(e.absolute,e.atime||new Date,e.mtime,o)),this[YC](e)&&(s++,jt.chown(e.absolute,this[jC](e),this[qC](e),o)),o()})}[MX](e){e.unsupported=!0,this.warn("TAR_ENTRY_UNSUPPORTED",`unsupported entry type: ${e.type}`,{entry:e}),e.resume()}[TX](e,t){this[D0](e,e.linkpath,"symlink",t)}[OX](e,t){let i=Zn(eA.resolve(this.cwd,e.linkpath));this[D0](e,i,"link",t)}[UX](){this[v0]++}[ph](){this[v0]--,this[CN]()}[wN](e){this[ph](),e.resume()}[EN](e,t){return e.type==="File"&&!this.unlink&&t.isFile()&&t.nlink<=1&&!WC}[mN](e){this[UX]();let t=[e.path];e.linkpath&&t.push(e.linkpath),this.reservations.reserve(t,i=>this[LX](e,i))}[P0](e){e.type==="SymbolicLink"?ONe(this.dirCache):e.type!=="Directory"&&TNe(this.dirCache,e.absolute)}[LX](e,t){this[P0](e);let i=a=>{this[P0](e),t(a)},n=()=>{this[ul](this.cwd,this.dmode,a=>{if(a){this[Yi](a,e),i();return}this[JC]=!0,s()})},s=()=>{if(e.absolute!==this.cwd){let a=Zn(eA.dirname(e.absolute));if(a!==this.cwd)return this[ul](a,this.dmode,l=>{if(l){this[Yi](l,e),i();return}o()})}o()},o=()=>{jt.lstat(e.absolute,(a,l)=>{if(l&&(this.keep||this.newer&&l.mtime>e.mtime)){this[wN](e),i();return}if(a||this[EN](e,l))return this[Ds](null,e,i);if(l.isDirectory()){if(e.type==="Directory"){let c=!this.noChmod&&e.mode&&(l.mode&4095)!==e.mode,u=g=>this[Ds](g,e,i);return c?jt.chmod(e.absolute,e.mode,u):u()}if(e.absolute!==this.cwd)return jt.rmdir(e.absolute,c=>this[Ds](c,e,i))}if(e.absolute===this.cwd)return this[Ds](null,e,i);NNe(e.absolute,c=>this[Ds](c,e,i))})};this[JC]?s():n()}[Ds](e,t,i){if(e){this[Yi](e,t),i();return}switch(t.type){case"File":case"OldFile":case"ContiguousFile":return this[IN](t,i);case"Link":return this[OX](t,i);case"SymbolicLink":return this[TX](t,i);case"Directory":case"GNUDumpDir":return this[yN](t,i)}}[D0](e,t,i,n){jt[i](t,e.absolute,s=>{s?this[Yi](s,e):(this[ph](),e.resume()),n()})}},x0=r=>{try{return[null,r()]}catch(e){return[e,null]}},BN=class extends zC{[Ds](e,t){return super[Ds](e,t,()=>{})}[mN](e){if(this[P0](e),!this[JC]){let s=this[ul](this.cwd,this.dmode);if(s)return this[Yi](s,e);this[JC]=!0}if(e.absolute!==this.cwd){let s=Zn(eA.dirname(e.absolute));if(s!==this.cwd){let o=this[ul](s,this.dmode);if(o)return this[Yi](o,e)}}let[t,i]=x0(()=>jt.lstatSync(e.absolute));if(i&&(this.keep||this.newer&&i.mtime>e.mtime))return this[wN](e);if(t||this[EN](e,i))return this[Ds](null,e);if(i.isDirectory()){if(e.type==="Directory"){let o=!this.noChmod&&e.mode&&(i.mode&4095)!==e.mode,[a]=o?x0(()=>{jt.chmodSync(e.absolute,e.mode)}):[];return this[Ds](a,e)}let[s]=x0(()=>jt.rmdirSync(e.absolute));this[Ds](s,e)}let[n]=e.absolute===this.cwd?[]:x0(()=>LNe(e.absolute));this[Ds](n,e)}[IN](e,t){let i=e.mode&4095||this.fmode,n=a=>{let l;try{jt.closeSync(s)}catch(c){l=c}(a||l)&&this[Yi](a||l,e),t()},s;try{s=jt.openSync(e.absolute,qX(e.size),i)}catch(a){return n(a)}let o=this.transform&&this.transform(e)||e;o!==e&&(o.on("error",a=>this[Yi](a,e)),e.pipe(o)),o.on("data",a=>{try{jt.writeSync(s,a,0,a.length)}catch(l){n(l)}}),o.on("end",a=>{let l=null;if(e.mtime&&!this.noMtime){let c=e.atime||new Date,u=e.mtime;try{jt.futimesSync(s,c,u)}catch(g){try{jt.utimesSync(e.absolute,c,u)}catch{l=g}}}if(this[YC](e)){let c=this[jC](e),u=this[qC](e);try{jt.fchownSync(s,c,u)}catch(g){try{jt.chownSync(e.absolute,c,u)}catch{l=l||g}}}n(l)})}[yN](e,t){let i=e.mode&4095||this.dmode,n=this[ul](e.absolute,i);if(n){this[Yi](n,e),t();return}if(e.mtime&&!this.noMtime)try{jt.utimesSync(e.absolute,e.atime||new Date,e.mtime)}catch{}if(this[YC](e))try{jt.chownSync(e.absolute,this[jC](e),this[qC](e))}catch{}t(),e.resume()}[ul](e,t){try{return YX.sync(Zn(e),{uid:this.uid,gid:this.gid,processUid:this.processUid,processGid:this.processGid,umask:this.processUmask,preserve:this.preservePaths,unlink:this.unlink,cache:this.dirCache,cwd:this.cwd,mode:t})}catch(i){return i}}[D0](e,t,i,n){try{jt[i+"Sync"](t,e.absolute),n(),e.resume()}catch(s){return this[Yi](s,e)}}};zC.Sync=BN;JX.exports=zC});var ZX=w((sat,XX)=>{"use strict";var MNe=Wf(),k0=QN(),zX=J("fs"),VX=ch(),WX=J("path"),bN=th();XX.exports=(r,e,t)=>{typeof r=="function"?(t=r,e=null,r={}):Array.isArray(r)&&(e=r,r={}),typeof e=="function"&&(t=e,e=null),e?e=Array.from(e):e=[];let i=MNe(r);if(i.sync&&typeof t=="function")throw new TypeError("callback not supported for sync tar functions");if(!i.file&&typeof t=="function")throw new TypeError("callback only supported with file option");return e.length&&KNe(i,e),i.file&&i.sync?UNe(i):i.file?HNe(i,t):i.sync?GNe(i):YNe(i)};var KNe=(r,e)=>{let t=new Map(e.map(s=>[bN(s),!0])),i=r.filter,n=(s,o)=>{let a=o||WX.parse(s).root||".",l=s===a?!1:t.has(s)?t.get(s):n(WX.dirname(s),a);return t.set(s,l),l};r.filter=i?(s,o)=>i(s,o)&&n(bN(s)):s=>n(bN(s))},UNe=r=>{let e=new k0.Sync(r),t=r.file,i=zX.statSync(t),n=r.maxReadSize||16*1024*1024;new VX.ReadStreamSync(t,{readSize:n,size:i.size}).pipe(e)},HNe=(r,e)=>{let t=new k0(r),i=r.maxReadSize||16*1024*1024,n=r.file,s=new Promise((o,a)=>{t.on("error",a),t.on("close",o),zX.stat(n,(l,c)=>{if(l)a(l);else{let u=new VX.ReadStream(n,{readSize:i,size:c.size});u.on("error",a),u.pipe(t)}})});return e?s.then(e,e):s},GNe=r=>new k0.Sync(r),YNe=r=>new k0(r)});var _X=w(ci=>{"use strict";ci.c=ci.create=F9();ci.r=ci.replace=oN();ci.t=ci.list=E0();ci.u=ci.update=G9();ci.x=ci.extract=ZX();ci.Pack=n0();ci.Unpack=QN();ci.Parse=m0();ci.ReadEntry=HB();ci.WriteEntry=LF();ci.Header=eh();ci.Pax=YB();ci.types=CF()});var rZ=w((Aat,tZ)=>{var SN;tZ.exports.getContent=()=>(typeof SN>"u"&&(SN=J("zlib").brotliDecompressSync(Buffer.from("W80md0A2YYfUVroNAQCzZi6n8ONOtg37z+G2gFInPPwJ5Nw/Ckq3IRD1T9PE2k53VFXNTCpDXAKzLS1jAOxT/c0RVbMCR1AlD6onK1sjpYsrejvNwiBFoSN3LsnZENigYYlCkvQMuXjnFXgXqrRZZUFTAtmKaYmCVosqJhaVuC2v0BLqr9S8BgpHPCSDuqCSU+kKTag0ydtT8GCNhgcLcQvcSRONhE7y06c2s7q6hlJkf9+H7J8sE7x+HfKnpILLNFeOl6DqbzgcHyeN7E/I0Vewf2DG73801dzyJR8DCoxbLwSGZFqOoVMu2TLv7ZFXPvn1v95S3//8fBmdRZiwZDWGi+QFrjo4ulaud3jZJipzHnl12BVyWgZaVmwUt1K11ze7w+GAIWkBVLGu0DcwZnOH1OrSVsg6iuSj1r5iJv5rpnm6ZoKpwF8+s8su6Ylg19Oy3QQB5UR0TcTmTyU5q7i/b9nXbzflXhOGCSc6KzkRJ1AqokAtTc3XN0cEGxpymyUl2wfsg2YkQCmlK5tWlD7I5U/tv359GibRhg2+UhVkUrudKx0QOEWsedLa4uUA/mml5enqdlDxhyfGZ5oPhXflzZpxiBQbbs6hgWptsX7If+zOCNYPWbogwn9VLT1dNRNWq754MGDvmUoqOvDGydsRoX3cxutW/P29Wn39bqktU5tnrzSeDLKiDUicANuJqVZZlO4MDKG5U25TJPUf3XAQO1zL/+BCp/dI58ysai0ckfF+yPNCFg+DDy1J4S6Ppqm+W/zsbdnXr2lZTlVcOHuc5Xm0mOuAHLcXOV7cw/TCxIg2kVjcpg1hTpOU0Bsdz9jPmvEoLMLxMu3f0z21/B4yPmCEbLIS0gO0600j7RyLnFpZplAeDnA2HyLe6XZmTymDLMHj2+v65eI3T0JdXvkpxORRFJi6A/5BVjw9nHGcSPGjbIs/Hv4CKjp4fFVd3emsVDph8QYoTYzIOhMRnih/2v9y8T7BnztDlqeqS6KFEC5hOUN2hDyXFF4G23LScga2m6MhTMAPsC8lzqfjYXf3u5C29Pik0diaeAxy4hBzC6bIxpTQmmKoHzW2Px46SEV9PL5ZBhgVbEAquhHmaFSo+FtpMVP7Px7+xixd/hEAIYm25ASi2cS5tZ4GhChbaZ15Mv3/2mu/XLwfaJjzWIKtjrRhRqxA3MU4heg18cQvbqvc82sTr30SOs1S710lKb+y6B30Rvz/7820vocBII2kcmrjzZojkWCWb2smc8QxdwvvvYgQIwKACJNZIjKpr0xKbCVJsVvFqj7n3vsCL14AyYChGgBZajKl6iXpO5bURm2s1FXf29G8nZn2cJDSd/y+etaD4R/+4R/M5///90ut8ubc9/+PCIAgIVJFKVMnlaredzsiAFJLqpd1tZv/3fvuUfz3/u8EYqkkIgKdRACYFkHytAgQp1Nk5ns/guT/QUgZgKiqAMSsAihlNaVcDqVWzVHl7JWkZNQ2y7abY2d21+yLY7ZhanaVZl8NcxxnHG9MZ1xv/s9U0+UMSEFLKjzyonQp6hxi0fDOuU6paSLx5w+WmJkFDrsLkthFkHYBngVAp2cAJBVwdwB4AaTTpRBsVzYJKsRLgXIIofdzFWLpPqaiclO6dNe5al00LorePM+3+qbtuU/8U0+xKBByjOqDQur+rFWsPQ5IdhfhcMkuhI4wMUrm/+n+PfAukPjTKOb51a1z5w5jB5hb/5+K6l9d/jGvYWe6GZoiDnCiOEAcIC5ciSgiTrT2jTeH3MRi1DVaIIQY5nGiSNWHvXP//c4rjjUJdfTBwsI9bzAYTHFQ6iJ7OQIKDjyI1AMBAQEGBgYBCwwsNQBWfADp6vr+3zt7AHnst2DAgIAAgwCDSLWqAIMAq3IrAwMDA4NInX5u2tf/ezUbJO+/PDbooHkII7AMCgRWoECGCsRDYAUyKKhAQQVlqKCCChQc+7948k9v7wnc3X0YDAqFQiFQCAQCgUAhUCgMBoPCoFAoFObnFv1Dvz1XyN3dJ0a06GQRCASCbBCIFojODwKBQJCfFghECUSJEkeUGIjSpt5TGMp3548hMsusmSgAUKZjLpEm0K3+L65kXRD55W6bICAltNBrQk0ApYp06VWaypaZGV0heWX+f1v/v5xpGbyV5hkTc0SsxCjUIYy9QQVM1Pvyq35VwhcD72b//Q0tDIOU3X3vnOm0ECyIBbcgBZJgFqC4tv7kNzLThrnJdRbDy6Kz+E79yjvLVK9GWC4DBafr0bUQqpqiGsGOvxODtSxLxCMHyxJHY3lwAZQU3a5fpai0ODTLWl1axdpxYdkvrvWj57f9c/aFF2TmPC3DYDRsUi5C2/Qnlcth23eBbI2P2iIc8R8Ltze6llHgIlGXAf5sPonfMlrDY60cmiv6tp74cbmVvJmtKlamqYIc5hj57Jd/EjTKkWAdJ3caV+1PBgpAHXuC10WKwl8XjbDIS7bQhAxQRatzvPH9GRkcnHVbP1LDTuxoLqHE8yBj0Gwt9qfac4BKq1hQ/oLnkEDc9Xk75i30/IePrvOpDqHdV/tdfTYPTsvYG72ugg7ASZiV4XlPiTNxI5v+pJNXLvAs5nOQ4Tk5Hde8qnnc+THp61PUId4cPEUuf32dtYBD8PgpevnbW4MKeaqWB3IUxa//j5YBIHNb3DKi9NTKF9sJffp34wN+pNQeW8POK9+/iG1orcHf3PjYxOn9DZveNufp/M+BlTOk8+bq2fNX8dqVP5x9FGOPie9CUf7lDfWZCXiU6OCo7kf5abQbVfmLWjbI+LKMmC9R8EJ/Xt8ogMF/60VZIa3guYLCTYOir5/WdTMTqrTFzTxQpy1vh7S6320u3ReqVKd0XIlFIdXqGMOVprnnWu/hgGFf1tMv8rt0F+oDxeg2Rr4mrUDIgMWAAlOtpf49WeN42s095vLQFyQ0+rcmjJ/Y8ONLeKd+7fhEdAUOfVmb10ClmWw8TTUPTZluqGadwwdQHIL803QTtBQzB03BwtNWFFhFuqn3NJf2YxWXq7hc5eWKl08+beO+oHF7E4kbzF2Wn5KgOugNt9oNOYoAbD+BRUHvodTYUfBWC8bRJFgfphaURynB+qjfH/M6MA9FPLRwfSlCQFkkiQp2bJxx/Vrsn4OGsHRdWj/BYtznl9HzSPQGX54DEkHqVSSGpky8ueEDh/R3/i5X7qnIc0/916CD2VGDlsmc4yNeafMBNZXg1mZXiFcNhFObmuP3eoDoalQZQZTtNEpi3FJe54LfjC9485ERfuq+6OwWwDIfqITpi5ldffSi4fmO0JE4uHm67m/qPfvBtYRDE/M7x8XFKausEI0ILx+COHfTgtt/mCO4zg5/1aGy6EjIazGXujyMyGkpESl+EFNoekszvRUqfSRDd2O9P4myoWqs+pO4dFSNVWOFTGQjnTG1eImDKkR56siAGIXWuIrkO5FGU0Lpp3B0qMaqKHMqi7a4oi99UHFdsVFcEEmR70XFdjlvmuQxiBTkfkymb4s9wwQgolJa6rShaRmhojEzXMGtrqmEObU7jn75bfcEnPJUnsp90RvJFWzpmMUPm4/shtltNMVqiO0F8e6nscfb/3YS6bzpHmtke+DU8xFrQaeaJKHF+hlk3jrrF3sy3+k4/bpf+KcWDWLtuiGzHiHF3WN/ahSmyX4AtcfxE3T/IfOzq94s9b472Qaxtcnrh6ss0Al6tI5ngCxHjyg8iLcSGfas2SBI99za9i8AgRX9roi3WFL6tj9V8Md73urw4e4TUL12yEQT5Shbvjq1fB1B1i5HcE9M4mBf0uV9DfUUMyMOqUjPSUEdap5OolcrcRhJjincgCOE9MM90C2YlWSnkFuabnm2r79V4unbVS8Gg58QouK3xv7PC+0ThqXN62eHCw1syXj362oZ+Jrq1aOyehJ0HJ74Im49CTnPyc4ZldDPrR4wetOBFSWlfnooXWzRG+1tCtk5dGCarqynd9foEGQte5o+62VP4nJf0jNvdPGTFJd8uNPhC2fxEMCp8e3Dz5z1/sea8uKKKMDHfRgAmtlHNLYsRpkO3U9Q7zdcSjaonP+TedDQohBcwGf2b1HveSCKlEtkhOlheebsTYmLy1oeiJB0RSJU94oSsT8OPyXl9PjzKaRuCI8SwS1Un96HxzF7t9sUv0wScYPePGUe0++bWB8Znq9fpSojmQN6NhAb7WHpgVdGzjGCEwImabB7rht+YLaBkVw1ZloSLys8vKb+S26VkK8WPJgq5lXhCu4QTCOzU485Wm+47gxxfODo0kV9POHgQmjYnRMhpfvWuy3YEOgQhvouBNna3j3d45jDgnmaDWQmJmLUdyTbKTrhSKfMrsL7aLpJKJDucOwYeT/cTZM3VFAx0dLWztg+ZF7DbTbLG7Cpy9fXDrcaBaPxlh6TIuGMBrhhv6AhUF5dii31neHxsLtP5bTVMdAv4mhIlb6bdMUSC1cys7gAKesle2gnzkXsCH0BS/eUTLYyZUuScGrPW8npJVzklHvtY/f9C3sd0uijnWKqW54vjoxleTm4VB9ROZ9EJiZzkEiVSLTF4Ck9DL5Zz3Ocd/RoujbxfNmIQl+EvpRSGdrK/JpJ71y/+2lInAbCqU99vzf3Ex96e9CLRtg+HXcOOjyPsa/833BuD/d3c5/Fuj6Y7VdHKV6Hcif4Nk43DKSbLDfCCsuylRuL8iMgkzj173wIgRUnkTiyQwJ+t7Y+J5+/jDFcF6hHNV5bOhI2Ds2Hj8mfnJCt5gP2gbrtmNVtRpUSlLrztBQNHMJn1g2JYsEApS3h2xpRJzMXH1OOLpeaSKPZaSe53PLhSrMYtg7Hw55GcO8h3HxPibgMKwKkEI8aA0Y54umZRUksul87QOFIS3Qr54YmFovtSUurmp0k/KhIy4MXpiGwwLbmKqDPh7EsMZMcjFJ8KMyAOnvyJRRh5cJCmCSF53IrHz9LO5b6R29hDqRNw/afFY3xFdMbturtuF+clTW9hKePO/AXGWiCYXcWS7FSq0SH+ZkZPSddnDRG35u0J8H7woyZtq0njHqg4ATxpzeX3a8s61lUcroxWGMGV+G0KMfbHyCX3W/EhKCZwlXbithQB3JBtxQ+FeSXi5SY9DqbXuVxjEbAJYGfZE/JCtz6AjkWHLWCNJDxz8ILdYl0NImjbBEUAYT1UFaf9hSOqASObaMzGwOYaEQF+YFhKJ5E6J8LPkTk4YmNJSMPd82iJHCL5TYdFpqr7RddSz/3pTZck5vPjb6vIArS2VsHf4MoprOT9fPbzg6CPHlkOHRgEWeNep48F/5ifu7Y4xPBCQMnEtT7/eyFroPGmV3urwSUZ1b6tGENh7NMjUoJd+bN5hSHcQL/vikIqTMBj9pBYCK5s2MBzuuxG0jOicdl8YdA+EZ0eAJ+JZ2ET1raZeGJKqsqgQqeXYPIclwfF+IBAFGqRNmzJhGwXKNKpUlhh0dNEsL+qOIeKz74FGqeFdvL/c5jtUNfWKfdffmzzuDuUSbL8x+BLqSUgO/eGZhIiddXcBD+NYjesfknd7v1EYuyZRjlRIhWSJ/DjqUesWW32+ihzjkIiidA5aLzJljjTO52+6GoarbA3FJTSU+ffA5RxEC1wmdvvt4AVGcUPxqLH+noebzAWT5i4YsyALnbRRxRlUuXEWupk8/BRnWALbsDQSmeKpMSXFWoTJONX6Yr4wR2uiM+BDSPwkuhHI9ZYx1mnsFBt8fbb0ZLJRnhl1gWsfxzfk1D9/bufMRHArOoInqjPOV5AHoP6V90Ev2GMxydocvXbJ+95nT+aBg9DO7KGEZBIK4qE7u5TXl8U0sJQOQ9Tz5nlB8DvT2ecVd0BQSkKEiBv0s9dJ0UXcfgpYRhHx3tesDOTb19tSSWam2pkBAlnTDt8cuHv/6gfG14w6lwt3OL1ryhRkGJnoLeJ9x6o4eATt6QiSTYf4vc/Zcr2yZYSo/KdE1AqH7BTmxfJeCU70rqSN2sc9tBK5XEPZEEG9beaW5ZwTU+M9RYfESJuUs7B6oBt8BUELaDReJYYQnA/MhnB+rOpD0l3YJIx2d5c1BsUdO0ZwOtLUrZJvK/pAi61frWoe8HR8baIaFxi8Haku/YLSH0ll5vadFaqkBLqeRItaKh8bDgEttTbH+yL1l43vkSPo8rd9hla6VnQNoAMtxDnui9gUwxyvFzYGuhDVU0TXkC/e+7B8xMOGCfSH/YGCCa/LpEbNbzTfHLIDWbQSjjLtriLIH20s6kI+VYuuRQU6YzbVF9b1dWB34E8WGIKiMMCs9YCMVHhahQxwGJwtbVtv3KHb2AeIjd3lPe47W6jC8qqkPf8+3Z3PHg2+SoVAcGdApAaJl3U7O8q6Gv2Fu1klLEK+pI3bmoxuJJi5qYSOJIsUxh/ZuLeagfucs2VahdQKYux9od5kOuQhQVbjSqUKvFpRPft6tnSLyhDCDIpY1tFbYfBgPzq2MqiWqDVbahWZsKEnbJadHUNem5xDk6KcXVhC9uzgjVekC968kcGGcnUj9TAAiEGDYW9I7SeehGB8Dt/z0VJOclY4PwDYwTfvKQIgOJnvdNiAwYsaKTfyLOeICRu383o6OuXwDvBwa+6cO5s5q7FHre/3g3AyrCCajCMviOiGoSc5VUppYufK/ZIZqk7LqDKgMSFm2nT46dEGwdoJWyq3rFRAWwCdmcp46E5ObgPkeeDCVJFxYYrXXn2EpOUnTaYdMrHTOzgehG3rTbbuOotMHE+x88FyZLqMWTcmEygqB3FzZt1EpW8iPdxWHmRRRpflorK4gOBxbbRJndw/KJ8w1EIjBUXvNZXmEh1Iwe13+xOSnNSK1TQKjGddF7f9mnbcD7Wy/9qT+NnXb/5yaEHOV6UXC8zfkgWXuhHoxYNlEepC1YuM00/a1dIPVsfEqCyWKrIuWBdfqAepNb+dWiEEIXtd5i9hJcfeAlEp2X552q0ajRlicI9lUnl3Kmh5BOKXl7Xr4y6hlxVNVE+rroi0hfCuaEW+t/Ffxz51+48FENX/SCNofRvJqah66QXt7VN/YIM1pa7QEQ6ZOau4tIUmyLS8KjnZBD87DU0tS2VaRvAytTZbqY7bFDqxL0X04qVLsFr/8jZRpBCfdy20M5SeGI9FL7Y2CRiUiHhZoUVXvGiJf7eXxJmURXZIykqXhsnCkc/bUEeLsjqQCRiZLYAPO80A222Y87M5xe3cGIwGh4VPaDSQR/9fEjkZbb41/3cIRyZIttLAPp/pZtBGwHikbvrrp42FcjbFfbgiNKSpcHQgmAkXFh7cy0+wkmvSecIKif4Elm4dM5EfC81KUKJNcUD+YBJ2w6DEhPZNJIY7BdwqQagOdsqekqn/3S4aFtcwOnKKC5GvG2gKGiVDONOBOYHjCyuOjhRC58hST+J0rW0DCmEcUuqpAQsHR7uFl38Oy3pfvNut8TDSTMcV2gX6YP+gW0c4tCcekBswj/vNuiNIMP8I0/77zWcsm8lQCCnNholRXnyzxYACiYJNFwr1oHl0e34yQk9TEDb386Ung2Q+pcXim0kdlBz2uT3qayXmkzM8vg+ZC+0dXzTUXLG0nc+/7ij5sPvkOrtjeO+mlJe0mvfy7znf8orE1rt6ov5vPd34raxo4xRDt8RVvRkenGL/j6QIfxetvZLOqo0bEad2R2HZY2ntAJB/jIF8kYtKQLmTVGRa7Ts25V4bHlaPH7P0LO6kgSo6fXw3cvtusHj1xPueGT9KJRdTC0GOEij5kd/L01Djht3Jkbnsov02igKpaSpVotf6LsyU83/y6Mnk3uIsFU66JUrN1bwmMxP8llcqVqd3BnqUF2HZc+NrPnHC02ws9BjLSOfyrgVZ4c5HnnryOUOkfJUIJ8uIj0MknIakaIHLfaqxOJBHvMP4Lq5O1Y3PhT6WzG4Eyq51nPRf7ajR7545T4gsK8BpcvMcr2+z07GvyjzSde11fW3JeM7yvqWuzexRkQlT7MIHOtD9zm14Cb6ZtSR4G63eOwXN8d1+bw6ZzeBrMkv+Azdl9yxAhkG8ITOuLPfaMhfpIx5+Pq7LCiQYhJlMvvkNvL8hUPRqyFZgGa3ZGi61nanGSd4tlpRZDNp9l/WLdSc+GaRc2Qvqb1g6gdBQs/SaQojgZRSgRHfrKFkUqGGhftGzhLlVkkV0GChIsLgjKbZiJQDUFwJeTUVxmWDWJUpFBQGIYWBue/8wb28r1yUdKuRjXlH/8k4kjmY/InCjHf93gIGe2nUYEqfcyxRM91wQMIWfoqRN/JiO3tiRwHhlNj3gqqIvSy2DyFYpRgizVIUSsdEOkJOUU/XUbkbiEtPxLpFHgmw1+fe/Ap0cOlDUbhhM7K8hT9JTnaRusV04vGLwg1Y2AWLtIUnbLrRIj4JIG6gdaFZoxifSQJGbVCjWc0RoLEgwcbiCxPPQkmGdGuh5d3nQpERjypkAo+M0kYQhlLSu3/TkSGnEgKsj0VBeKe0TATFTla4kx2RBQ5V3mBs6HR/GYAdPeJw+4w+MfLuT1ZoEfcoS08hUVoY1mRTILc4TyXU5xte0wLMLwO5DA+M6kbDP5IwgDLtLMYfvCYjyNmeUjXdH2CtIkY4j73XJiHaN4KR2m2Yezlw9Rgi2mSFWDinpOu9DhKrjM/fQ5ruUA4RqtjQueRkoagHFDtXR9SNkHIdTx1E1jWA+JBmkAMvrZvwHIAjw5iwUU2WY76LegdpXyJ9Ku/tvchfe1jRnmNInjUH8FHHMFHFUH0nR8E4xAoOMwJrdjMZ3gxe4rjgR7J0UGUajUDjqPs+9j4/pPYhWaXIHldhPaVOKzzOW5VcT3gIzk6mOZh7RCYo/rtQwwdHAg1CZTcs5yvDy8mILDzs5mxN/EAIF0x+cI3kSabuIpo4sGpk+4KHyaHYSoYB0MWQxfuDabFSVP3GAox8QZPDd58muzd4HBm2QrFIcNpNllh236GEuiBYw/kS36EsOUbvF+nhEcQ6n7ynmp/gvUn65ODj0/Z1vAJD3AOoGUnCDLPs5vX4jm3VQBrdQF0qh5Q1SRIDuhMLtxZwocJVUuJbuJYpkn2OlOHvRnXrv2UOinqTloW3em0SZa+TPQG1wiGyZOHVx94hA+b5PtJgVa5kr4NyKN8ckDwBHCS7nqhhf0nI8QTjYxX2j0o3oFRHIgAyhf5AGzVBiAvfjAtJoZzgABgTR5g9/lk+a1lF3DGA0hgAE+KSEho889h7aDOMS30oEpTRZN15hcd+vOnLiZNElA/VP/qNAqczScCMxQfjF+YmAnyr5Os/N1x8P11yGAY6jDxsHuiAUiR16Pv0JFmwlxFHzb3NQ9KoWcGJD/YEIlpLnXUlN1r62FQn1AtVgTok/zMvdPFQShxhE+xpUmGE2gmF1ZEaEKwXNodnFioUHI/H2hPv3ozUQAe8wGc/vnWlj0tG+4aCEgOpKwPF/kmZ7V+Z9NBhw5o6nXv1Y9EwmbpDUJymbo4yBfVBBLnjlxocFQL4vG/ykkacIf5qeFI5mAGgv9ts7mhAsHlsTuyLohsgdbo3KX++YRMYk91FZALNrhk7JzhVH3dOJ544Y5ewA9MmS/2E7QtDIyoccs78PNtfhkXDXPvVLmrTRP0lnIiqx9NI7/KlbwD5SbK1WJM745zQRfPna9jdtZ3SpE82CkW+0N8cqNyzKTxKxIcwiTx3Rj9AtBQ5SEVaNnATvpBYw0QDkKcHGo1VImV4/Yx2uHr/9MjuWyIr0qMDPqE+6mIWllQmdJcjxx+QA2xEsaavQQvnik9UX8sbmI3SLW5c06bCGVHCmGIfdYPNhA0kkUDT3Nqube0Gbd2GE55uaORoV1OS0pO0wJkjiwJtS1QqKWW1jjC2S+ebq3PtFrFp1UH+4id14OhOE7Wzr4STjdNfQq0eQlikrSXc27TPG7eEYpBJKHJPqVnH8+tCvpt4LFUf3TrrVwrO1fTzpswTZ8VSfZZMuFtmNuvrG+zlZdl7iWx9IQp1RmU5Z8c6yj4pAlrA6W9XiSruNmRf/a7Qwhj+X0ZnAJ+l0xt/Ot7AsW0RiYh0huEVxXi3Mg+3t9F7w0ycwK6bHyxM9nuFKuPDY+Yos+jOTl1dXoO76ShqVv/WdU/GivT3A2na9nLjLnVYjX1GFc70TmSqLMnNVfoiDL1sWjqkF/FfMlcUMgpm31ZuNmWee9y7CR8uDlxub2L86aWPkPi1ErMI5mp452adKhZvVfLLp1Cu7OwQpkh3RNf8tIILKxhmkVthMjsV1G9+csiLCIWl50uFGzhtqfrq2jECS/S+LIvOx5ikjcJFdQu+x5aFLtOGA8/DLbJ5aszRhSTf1WKcCek7lu5smoTz8GsgyAa4p2pjd+A0zXcAnVuTlPAIvsq3BFy9rkYcFgfxb4DoJJ/lSV4D+/NXdcy7dEKO59S0DbQscKazsocnvEk7x7SYJgXbLEOhXVTPr/J01FLGcNn5ok+V/I1q+XBHT1fd1iGx3ObU3jX0EXKbluH8HktkZHubVoYjBZG0t/679h0PPr493/04QXjecLj9/AKuT/rrJ+p33NW+D4J1UfH8XW1RStO6XKHsXqoLpMZuUWTaQVF9HZjvgrtO4PLdbBYHGRWJtdEMySullGL0gb0PyN3T4nFtnhlRKOgW/Fqz/73cJoNtV72ZeAgwGlzsqC/kG+C6nOpqMlY+41ZU9jk7vxX8eMVJkXjKogMF3RAoSr1PNBSWfKXHm6WJZJ0vuAZXdaVhX6kZ7pCrm33ejrhupg6ZtEmNtxBtDLtYQa0Tc5xkSZ8Ll2oauVZ8ijsGixio8djR3T3ryeVvzHT1s3ix7r18T5bM1AimsqAMrzx8G0aRTPfbEx9ttrNO0i1RvlfDPjiCVfEZPhiDbs72i2k5J6xBGHy7kfGgan9Ul7Ecm9D6Szp6KCUxRF9iwCFFoCniX1ULYV7QouS91uYBj+P9OPfPdgldLGkR72mTRno28maQg4mbslvk/YrOunhC7mrC8wusEZ0ihl4FoUE+4LLpZKI1PEJHqW0QeZS1YMQC8zerKXf8fMQ9fOSScPHQp4KzR7tQkKKLoCwA3JZGV+PY0uyOAdYl59skgqDzg8A0YZ/cq6C7Qq7MgYtHSAzhmFdfy3Nh1TSujkGeHlfH4kdfO4fl7t6Z8uQ4x7zlKjCI1C2kE64GIHkFqBqlJTRn4gbRgapPeURVW1/51ykpmhVbJB9/h85kN4K58fJxNV+qDQlW1+R9TaYOez1H/M3/JroWCq5F4DKdPlFiDA7qxZkSwnplui7emRjGFZuczUmIkRCAxOqWq1nod8itqgNpSgDpULWx6OMG4PrSGjcIi41dGy7p01BJATA26gTfiSJi1e1koU9gFVCN5qIJcNZZwXTCui0xDs5pu1VyXc7tHG82dQX8QX45HN5amVnSmGuPLuooW5grRbH6VhjFl5qgINUMsDi2mRYJGIBGyMheNsh+7WjDV7tCBPM1RFcz5Dph2bwJhRCOFY1DRSqA8qRHC3cIxIcqc48UNc3D0cKoj+rcd8/SEnVE/O1zvb/B3QXXLm/OnwSNRwAWhM95gHB/98EEONfmpuX8ZdZ4s9y5znE7P4gwojBNPIxVeQUrCqOD1cEsYieE0CedwXj+g1YEAGzSx56DhOxfbNK2y1Ue0kh9h0PLqbuf3/wPX7fxC8IsoVtubbcGV0iTUewkogecr4vHTLqdGm7aFsd32aRyrRhSw5Uy3QvbUdDXoiXnzXlJGXvAXs7ZC+VD/YXqwzOD3RtkRwujC138D5G1cAOLV3P7kxNkVMN+Hp9k3udckpulA4IeOYwAto9uhbs9LjscejbjtnMrFJyahIEJq68CFOqtlGdMR1g5awntUZBL9d7RiDQGPsfCXAPfDyoMx7tw4zkRDDUFT5Fs3t6enc+311ztjf0r/jJADCLj9ZDJ8fxxw0vMx7mVstlzrZz+e2Mt4k1xHu+ybBLSmZ5KhYDbIxOYEiGqTmdG0F2oy+iM5udRl2vO5GCwQJl79pVGBbtNTWDo2EVLWnFFdc8UwulLelsiKP0pSs8S79FxftVCgd627POflDw8CHzuzlvHtLnPEn1SYUh8/w9Q4KKzuW+GlZ001o7LXPqdFyNOT17GeaYbk0rtO6+9O4FX2TiNUZuI6VTHc1Bk8aqjxrn3dppzpzLQ42Pav6gjp9dJnulQNHyMtecHsrwRxGJtCZY1+KIcHvly6WvS7GjjC/hhjJq7orFHp+eXh+jgxt70qTOSeX725RbFeoUbm7UV4n26s60+Vf0K0DLmHDt4jAWv2mSxiup+bufnhIpoWqdvWD4NKZOTzhAcIShuOQM6/72pk8H0oWqlPC6oCihVyJSbBZBzenEZhVuJwxPnxe6/t5RFdtwKxcmWniANKrpsxjRjd7tl6AjgIcg8ZMC9gNEjO1TqDuIVsPQ8qHnv9uh2ztTiApPjO6/KJXwbCpjUBmIY+tThejmz7lUSBEaXvShX3woLn3x2p0QJMHVNO/99PTslPIiiqSXrNogrM6cTjxVaeXDGZ62C+HWRSw1fUrjQGXiec6yL9/PJiT6+Zegt4/GOlFS0/Cz6NO3sUuFIiIaI3NQnZozBqeTPkcR6KAPvSyPgVPnoXBaKD07VYFyHbqerMhOJe+xcD7czk0ZQRduL7Xey9FCM4AmslfJj6roA4+MSpinqtY7X4VWlIeJmDmKVPoTemj9TPb8JsWK18a1p/HZudsRBKpXj0OIEvGjAnv0Ey9tV6rFmpUA/ijoOqJNs1Lz92kQ3EiLRwP41JyjgF1G5kSIzpEwxa2R2HWhflh7r64+4/cE3pPwKYoQjTQ7GHMWazBe+N1xwyjEHA0IFRUEeIk/EK4vWSW0xTS+4ATjhN1DMlxGUPewjMfoTKXyDAExOzEqOkEOnhX1ZJsuE4x/8UAiYBy6jk3wCeQDxoMFozTWVvYtAz+EMWZKgydPlyiIU57IFIkHHh2fvQADoLANk939DcR8Pt+8AgEn1JLD49uFXX8oJBJw0Q/j+WIVsWIAop4r4X9PfPjqYrU+vQpBM1R6Jlx0Dh/BqQi+S34E29bgv9AdXbxb1uCR1+CsNQgbmMsZXQ8u/KqA5Il0eH+4y8k3+4GUmu/yrrXNoGfpHdSvGTqP0HxHxNnYlcxsk3ZV0NYM53Cj72+D9vcrtii8jILm6/fp04Mlu30rLFx5fCsRyspD5QYMN5v91ILpJdbMae3y2rzpL1+DqewO1rIbWF7ynjW86fsswUKTtvCldjvLMa+whZJ96j3v9yzzfb/npv1CGC99v2t/DyGFRA2VpcLvMPNtct4LX5Jq/sw0eN7oB8GfR+r+qbK9y0YD+sw1vJfghmFoRlsV7CijpxXHTbUTGOKwpI64uTB3a2nrG0e9i/JptknXOhM3/39oxYNe5tje/JKbZalfiurRiIUrLtR/VyNnflD8kA/7Epyzeip1VRPOfSdp55m258wOBfMln5RbM9YZl8xMIWCZ6RqUshVq2am2UN3yRdNFBafQF5hxk4I+ApW8GIVWPhemwlo6VVqpVK3+8aTdwc1L3dTmrNzeV/gEjKMylWOt3489yVFnYWFQBrFbxsJbpZUPx+Vbb5n6n+pn8++qX+UzU+OSvP/Yl744LKWHb+/cZ+ebjU16ztX7fu78ziq/kHdv4XIYcHxNiHSvXd5jQ9Qu396Md7kuAfptdd26KBJpidlldEgGXr5iyX+wQEeEyuOAPPERPD8yoOBSdpEUP7hAeCVF9a6hseyeMJGAocPtkEmwOCaqtb3Qpn0KJYEXMEBE9TiJGQ7jFXsH3hyBbqP96RUy4bCjZFmE9RNcG/zueFXZbTRtEpFJ8w/qLy5eMxWwNouJUg8iefZ1f09IEoHVQ3U9gNqjssDzQf4jbleT7SZNZAl2eZJEwvLG/P9ovGtKxFLoeJMczKgHlwncjZi1aiIlUSLefJhj2bmMTjkia0ObMvGqBI1PcMhHDXh66ptlpoQBwZLleKiMvfRE2mC0sn8j8O+zXVjfgew4wnsrnUZTfE7Ir4p9l7wJOSiV4vUDNQzThd7pUW5FKcJQfS/WA3vLQORCUhVEEq5UkneKWIMwk0r3GwsilpW2x6C1tnQEh/R8EjPCJjC4yeOifedoHaURO7R1UGNI7DKmL/rpW+n/+jTGIjX+QmQALorgvXB76iFmOx01x1Nq+4zRcrig9+yRsLjPDRz78hQn82mETAwT1+CgTko2se4MkHQUS/rHR5HkyNJ26/EEj4UxTabDMQKrcrVnuPwQDAOOV+sHJmhd9PVHkfA9Q6l1jeatpWgKQM8LTdhHYor9m5SLEXJKik7tqJeSYIJgY65oV8d78fCcr36O7UOUupFmB6jYp5NqpGbRqRGGosHWZIJENFg79QV/yNJZcPuV5y8+moGBjYaaCp79gW89D74gYHRA4US1FK/fgJ98JFB+vxK+5CWXeYMR2HvAN7amCGH5JDVDDAl0iv7E2ySpXdC5ck0lkiyp3DtHT0/cNYm8HU38pIpan2LGVb7WLvFawre752DEeaj3bu86h25W5QVyye5Mq4qngj2tQOoPToQvxZ0wWWoLHSd/jXjggrWC85hQGoMyFXzSkd0/5D94WzEPfCa8hPzn76nX+9UXkp95+yRUcalR+jaPIKyrU6s69SuW/YPHtLYZ7NHR79QKb3bhle4WJqqYl+p5bzV4v3wyEJ0oxPvKRg2DrDBq3Ye7+ge1Ss7xYUE5k3rkYf2hOeOnY7X0MKdWNta+oY33uqWlKkH4YRghTcuwTCHBXUEkmNU9MsNY/katUSDsxJwN1XQKHmEMm8ATANTdXIu0jROYa09xGb09Pfmy7LTZ7B3WGMnb6zdyA7f7rE/nUbqsYTjlm5RXq1SfQlnyzIrrzysV/adD5tp19VILYjhIZ0BBQMDrAjVPw0oWIs2EtbVRx5FWcBsPRG3Zt/w5otObPUbM6vmUvwhzaLXw3mmFyewo59r2OZYVmTVHFObGF77+1GqNJVa0CvEYpgTmeBGiz8R5B/EgwDsZNojvMgoypbb3JhqK3uYnK0LJ0BwU3jG/YKrFtboXC49i2n7Qzv5XioOJxOt4T9mPmvvCic5patdw3rg5fyhrPBp7G0EoHoEKQBjM4ZzeuTlCCzDCQVfwKxH2zRIPCmICZ0+lwTXOOrqJNVvcHimC7+m/fJRbElipZc/CqvtTyQeENfgMHs/UNsO/Dlv6xienLBnXL3KfrXr7mPtfPOW3K+SNvYMBsprnuALJesLUq25t0/b3PscXS6ws3UoN4xi2/0YZKldz2DKp0u5GTCtL9zMSH5WDXXxdzpQFD4zQsV1Wh3Yt6KgJELbKhyGryFJb2g4vef3JGGf/C1TZ2bDpjk8ZcNyhxpL+N/y8fzspv913WAvlWQ93KFdW0yIdUltn7Vas9Hs01ME78AZkmqn/FEM3bx0D8kOGMRB9U6JHyn9DI3syvr8+YzYi8gtJozGBun9SS83lAAt90hDVQlm7tKg5oSd2mjleSfc3FPVl8z7l+Z6so51S33j8aLXJ3FEDMpKg0eyku3IAI0hQnKW0Hqkv1bI5gjX6Jw0PcddqlcziOErymwsuan1eQVk+HY4yXuDqvi6SQMUoXJ/uD1ngygGJdXnZefR6LQKKhyiwGocLADYoPAau4WE42j04I4KP9EfwNVmDaJDnmIyZMIkEnZwKKZNfw/bypd1+htkRxlmhrLMy8sfiZDfRdQwdGuULjM7jVaj/8+Ba4fmbDCja6fuZjvaGqsMWkqAMsLUaLMTKCT9NKV3a2JSyxkVuBmGXEziHkzh78Cl8xZEdwldeFI97n6YKag/Gyqkj+roH2D2Pi13ciG9V5wrViClGAAByRxBxE3s9yK/VABVnjwh10iRGPdcoCdvB8C049omcaiCumkCUx5gL8A+JXJ3ul6YB/kh/Y90Hmsb0rpC8W2IE0wz4Ju0Ozl1aAijdWgbRJR8k2NaAsOLaQaIh6lZyyPZPD40pdrUWVaubzPb+zZl2DqC+cJbtf5qptLD0qIv/TBeN3wzBAlU/Tl3dubRjy/7aBfaBdu225xDvm85tWMoizdN+XJT392yoDWyNvfRUU4yoSDcLUazOydeGytslwbUrDihQ6eDU8hn2cwdoJ9iimVhT5eAXHDCnBzdtwyOrn09js/QnPhjjxTGkV1LiW3/ZEWQDX6vHrtab1fbj5a5ZFAIoDwgAkizgUeSqI4O4F7HIePuIas5SqkyZi32bYStsHX1OUsRKIqjMfXdJ79auyZWHo06lVcjJBPr1QSbkb9pHjzrmvqYKcwiMbwwd4ERmoJ187r7luirU5Qg4mJZ6fjHPUwo9EvFAUh6Sy7dg+GkiJXD9B8get3S31COOfreWtjeg80JW5acBCJL41dkHUWT1mK9jIiQjP4mwZmwNqP5GNuw+ai1eOQOJjpOosWSNs5GLTgero5vYsBQx7K04CDBiYLHRcF/mGyJd1Cvm5WXYcK7Yjoab/WLvalhXJVnwME5891jLIj/Vo6YIvdJ3IqWWpHjVo3iR7fk2VbKQRNZT4B2NZW24gzuyAFGtmQe1Vt3B4YSg8ixSGr6RF4cZ/xd+L/pNDA82sZIt6fGFG/bLLLWtT0hU2f8cUtEpqqQteoLKwv7rrm6PiO+8B5Te9qtnRunV7zKJfQgV11Wz5q9hMCv17fb7LX3MBD5r2d6KI/BDsnM8eH0OwEOOC2mTUoSyHcoevkeKQi/9sveYMT+ZH8tlI9Lxh0VAuwwWoXy+wbxtB6lo+yY6MeQJDIbUpIKfYKNNFW9xywa0PouZaZtS9yb/cToBoIh3Q39aIfnO82XnAd6Z3n3NrPIfjn7ZCYuRN+vzdvbZe6U/D88GeHfQuuwqqNIWI9W4oC8uUxmfY5Y976JtIor+FJiTxIkBxHtt3htbJGHoY+DRc7CsfhgGeWEXxOKNqmHuwdy71okbnf1bw3H5fsIMtli0anfYj7tWHTt6R4/ys4GMbodkefGKE46M1/65MfAViu9GnW/TW6/eBu6snrtw5lC/nYgIaOjid236ZDGWrGdDNfiIoN2TSgp9KaauwB9NoBDvHvbPpyyNmyf92MqrRIbvL3rQMb9tsh2f0Pq8tu39kvp3uNP9judfhkT6dIqESF9S0H9I0aqcp4g5EBkUjVURtPv7y8DBlyHJoJ33sa2h0HhPMd8XY/rj6bGQT6juCmlvQUla0lZfmhAQuoVhDG9egR4hC2+JSxgNYeie7eGtT3q5mBgrnP0Ufw/VJqDeWN52MGhDBHYQRVHThgfPkBUnn+4pv6qP+J/3F66hqevikfxwPRMyGeFuwpD0PMLZh2LVFTYiqMyXMccT3wE7Bm7Q9WxKkYXPLr1vTci2jU+zz2wjxzKdc25xiZcCVL4JayFEir6i5uBLv9ARcMyqk+KElfYd+bJsFys4JieuHn2YEBpg7YcwKVKhC+tyuqmOV+C2P5Fvvpuv+8RouXrzo/8SP/AOb3GLB3zD33hTZYFBZ+r8eZLYylT1ZgaVOrxXpI72ot+X02ECeW5Zll5QhxHNiJkghnLlblXHKWTmwcezDwkrAPef0VU3tvvGBT/PILEwLOikDd9DNO6cUx9drAt7hBDnamEfx/BLJDUEi+un6ULD12s1ufXQiSUQPIZtEoIDEU91GZc1oBSCpGxYVvpULda2hf2rpDKLwFZHMyCuJiXN9If10p8NocNTV4izMBlBlyhSkBXOTl6U8ajnSVpew1B3jHlW4UUsGoZdcJ4cty5MI5ZXf7GSWG8JU0HqiurkR3WjMs5ehx+4Dlve163Gni2thM8SkNX6/nouMUwmETfJ+z4oUc+EYByhlH0+6mmU5uQDldphM4PHTYOjvzyUqd+XFDV1IZFg7gOAFCKlg80UK41oAH1clF2SgmNGqiccDtsokexxJaMKQ9F0xwaeeSTbJ6YmKw31fZiZUhO8AQrDzUhnx9hBlgLgZo3uBJRIXzksFDZCm2E6ZVxeET6fXYVJJbl8IpQ7EHKOyZp/WsfGZI5ur1uO4JuVx2sG54BxSMIGUkVBEj0t0yo6WxXi6+VXXVtr1jXxlq+uazKsXtM+i6SFeeZT1RKG4m6RIL4NY6VChZkwzNGbuWFGENfeu7NPzMTJCvXfvt5YorxTg2W58iX7DbjTzx342Dfxq6f6VQ/uf/utOOYCrS/5kBHzwfQ36QM841H03c6rPdpoDv46P82fT/+RYdHvXo7mX+scKWTU/qwAa4//5V2svTDi7bgVJph3euxFrOlF1p592+QcR+453wRkuIWtgb4epReU5v0VPjrNd8C5RfYXgt6/CMVvE77+dg/uLjFjsFgotmVm0GRYmBbqerj8CxBqmq+GY+8FcKkWP8BY5l8zvseCzesqhUdP/JG26w1PO7YRSu6aXp5Y2UpukRB57nrxzij4wPC6HVzt2hIa2gMRVrk5uvGl5i6P+x/cYk/XTz3zwrqjJkan5NQTra37c9c7Hj9TWq2ckD3+PmN1sOy/ijw5fgKQ+TsRE74aBa6RIxviv9Ucyd+7CgDQF/xLgzjjmgeePn96nuzI7PkHeHdPye7uvz+GHoeZSveXqH2s0QaKlMz/a1BDN0nLT77Gm/dg/msaP+BbNpE8I6vzDfOOkzGt+PgEfaevf/RA2On/avGDTbAOm5r26HCmjIoO8/xkpUMnackRvG/xwDghz9Ro4P/XM+DE8gFdKEBAf/L7CnN1/75D/Wjzn+wAKDWa7AH9hoMH+PQy9F4PX57Atwfz08HgwRwH5tQKZxg9gYsH+O915rcZ38z1AyYP5q9B8P8SRrDYAn5WuAPGDGdH2Bj5TBhLK+uKiOI7gBxDq8yKw7PHmgkGBYbcUC1kQACE4QnWAJ6RjPdqMMSa95h4JssNW57gI4ShBKAi5R40PMAE5N1Iy4rP3AJCWHfQdfhF1Aw2PsFykOYMFN+qYSUE1M7vTIwVWOkWmhPgJ4SZNCf4zgDDhnwmeD6ZjJmwGOlwDQcAAJgroIukXGI9OrIhkh0JrRCgiQyMDYRFsLKU2jesAJCZ7SowMQCAm8cKw4YVsIEVQpp4xuhZtBP0YMvAZBfZlYqCbUzwefMv8neONQPxDgXh2FFKxg/8J5I8cMOE44BzJtVYYYlDjgRdxr8wLBFyWJIgj4Kux6cLlV4DvPJIzOhmppKxMs3gVY7rWdCtPIbhRuM9kqwRvDQ+TbFEcdMLDoz/gVLtaUCSDW4GwUGxQehZccChQYn4itwJDsbNhV403iFJyy4UHCIunWmB0COL/VHjDlkcPmv8jiw+jxq3yKI/avwGW3wdNW5gi++jxq+wxc9R4xOyGD6r65DF8ajxC2xxOmr8DFucjxrXsMV4VLxzuhnBUTc/DT7D6P3WsEPyR2XgpdrTdrr9aVAUo+7W8A3hbS0owmj7RfCjGG1/GvwIo+2t4Yczf1wJvhajj4+Cr2H08c3gq3NSZZhynY0hPdsC5xP9ZLvCn7N0lgnOL7qPrcXZ2MqWcVYy+hle72Wm2T8OvysedxTF5h+/T+SfZyO/98L//1LXgBVCu48drKRz1l3ENy52CAK5wCOoUGGZFXlAi4lDWELzda+4xVFqqLlq8v7/KOx/7wyk2pUGCkpihcOip5G9gIjS8YpipBieDx6n0AYzShLqfIwiEi6rJFZ2Kn4JhXp1ydrRvBklg2KngQjgvAwVQtDd9Ew0hQwmDqS7tWy0hOnfrgkDVYu77D3hsqfPZpB1O64LqMM/lkKl9bCPhw2p6n8WW1Ch3QQ/3NkFzoB1DgwsLA8CcaYjO6zKlpf3Yo1Th7AKpZmGYBerelb2cYE8XdrBxsHFWpanrDnK/+8VFCga4nIIzBUsEpQIzBRDahQ4pp3ADiTpTlFoCYW6l2CQlnTKIk40FRYJilrwIAiNA5aQftjBFlBko4YmTlh1Efhb9cHLEMKmkJ7NQRRygaNIIPoRz6RqCFNBf6OkN9FSTTpXYYRy//468f2lroHPQURZWD4Emsh0tUfIJWbwoD1G+wIe2ppdsObo8ScO8akGndA/nyYJ3cCh9CvsY3wjAo1lUHROijdds3LkEAREOMoF7hFCaANoLEPwc1BpNn7FLNBaaoCkEV6uIIZLW0UB/iRHTDTDD+SR73ChqBlFd6pwAwOnKCaQfzwLdT8cqZd1KDbjz1LtsyhV+FyBq1ZwoBvtoUwcPotQWHYN9wjG0yhawvtqbkzOQwDvUc3wvjBziEr/uiYJ26mwaRF4M515OdbuAMUR5UzPxol0KnowfJ69hiHJdln60tBaoP37CwmmznGJGZWwCvlslRCj38hOWHeHQK9tPhXIZob4AT58eYg60+t/VffqscJOpCvrZuCbdJOOMUWjreNXkhLLea4EkL4+bDyMRYfjv7anDLjA6QVEM29LYjgsqQyvGCqQZvpxy4ifwc6rHnhNLCJR0q/D7XO+5wKr8ARsocqTkQDO7cjOgdOrKkEFijwvz+Gq1TIaMbwaD4woXM1msyg5hIOIXNbQuLUmvnm6exGp3shlPNkkDYpFtgkQOS8RhuzpEDS8fNolKSm+PxoR3E3w8HOeSEJbBRSRkpfjrWtyPV/seAol2d4KsAwpj7gYba2tX6I6Z2FWJGAWelyCqWrmHXirvuqGJMYsFVQYFX0CQkZWcIMYP+1EELkTJMLx7ZwhURYc37+rsEDOKBkpoJBJ2JRYCn5rK23P9bXZE8GqSZBNXBikWl5PUTot6YRn2W4b8i4kIfQ1MZHUO6EDroUrBthV55OLHQSfxG7OwCHcPgJo12pTdaSSX9jQZwu34wTHmYD7LmZg/66wZCZdiMtxIioUYjFA0s/E2HbOuADDIDUD1pYr6pro2CgRDm6SwR00QK3ejNxc4K4DfFdeUCioRZvVKObKCAGUq15f9Uf+eQyC+kAN+BtztKHnlgvrXyxIf69wgO3caOo3tCRqiRJL3bYVa0wvjZtyMB2vecxuUsqMyHmd/+HRy5BOnw3i0g+ksn6hOTFnuXSnx0Fh1sT3Wy/+bZhKG2+E5v78uHI/QKdTdovgkBMODyUkCIMQaS016lESSSXWjieCeHDet/d2o4EIRAwJpuKcvYMFCjqfJ1CQgvPBwxROe1lck3NWFJa8vZh0B8/bqaDq853rfsmKcs5KBB50QUtL7txYXbPf0KakMKKI4gmPb4QjT3SALfy8Bs7CVj3srSKEKpKsMeiiYWajgFU6EVGVGg+prIMGUPBcYASBfUgbF9FTKCjMVOgRoSPJOO6TYLRiXeq9EdLpq84qDlseWirrzYZ2FvLYmAUv65BWSBCD7NVPr8gRgppgalA4ubdjLCMRlcA2nIqQCVkz2beSD1rLPNYNZmxA0epHrL2gLGvvCIyyXVZb3xABptdbL+nKc4JeRX1BAi9kvFyTuoVp8kIXR8PWk4i53H5vFrSnj7W4unGkgmISFAkKPZMxuBNz4CW0UxcbK9cCdN0Jk32l4y4TGYRygi+NpglV0d4PUjdELtJGA/0ZnWPUOyiqxCRegxJtEQ+6Xjk4tICFFy7dtaAh6ciUOi2pxj/TUq/v4I9yRwItiUURCPBIjRLO33Uo4IlOFRc4g/PvsvuwoCD6vfvcxiolEWZ4/f2SZa81+/8rMxsHPQ3zkrNePt83bw240oCyt/cMo4zucgrmDjRAu/Rhqwoie5h8anuT7cXC1g197LmHR8rzac8MN5Sq8GB8s5UI5edPGWg6jQzK+1cbHrAc2u9fCcdk8vr6qvfc2B4SFeWvBwvUkGEXATMUo3oLh+KhRn9rxEwkVOR2/3qcA7fuwGAxNblnb633DQIdgTXxBHfP807udAJDjx4mhjhe/n6Omwxw+ZlHCDRlwvieuoL9HBBkQP65WHAIssv/dwROy+y65AnuGnwi0r8NL4KXnr6aibThCmbwBLQaCJtpu4K4VFXMQ1+/QulkXgAX/gpGKkelnNUl3j7Dc3F2wN50GyMyzp+W1F0eWD/K0E+WtkGxxC7sK1EUm+FAAJ712OEqMPuJNM2CAj18NOA8p2yq3iqAJDLRkBH/sD2lGmakCnZaG4UCj5YQ/V/HgBnFCKeRUUt6Iib6Z9zSYcXNHR7Z1CcBZdE3D8Mmq+lOrMKBvxrxWnZSSLlLSFKWJXjG8rmgsQ9rbacs3umCsqJqo9wOItPZ6XQ3GfWoMGLcgpqcZZJqtIdVYbsv4/yM+d01si5m+v7xDKxCC+sOX5yoycs+vPtzFrimsS3DM4Hiu1ZGD8s0ieS2VcN56JrT+5ezLONAT9BEluLTdyiYohYH2AV9IjCoHbnrDp4FY2f0KN/NVJyOi2kKud2GUaE2CgqaIraIhys7v2pdUNu/xT4BIsq4IfWK+TOxA9E+l4EmTkgiaNGGbym3AqWDI15rnS+DmduqCwwSwokUZ6WtanVk2wpoprMZlaCIV5EfgowleRIMuYfYl3MTzUzRRJXojehHqK+3HyErkDe+MAmBQ4XiVh1BP3XtKtau9ejs6VBAEbNYOTssIQFlO+i6g4+6+9v/8pVfVW2FDBrMtY61EnORwcHyMdJudSzAUNvQKcOhiJXoukatqQbEdvGy2uWWNjFjlIkDFKWGEf+jr/ONh5iI8+ciwIj4TIFBcTibD08TuloAssRXxLAVwGilBAytag/ICQTOEKvU2uYdafHdFtQQDyfpwf2OZjP/3hplJ/NfYgmBfk/A14vJVLlbiEmPcwjreJKlx7usV4gl/tIqC0FkpGx+SvBscjM0mlyoKvg7pnNQVFjE847TGpOFu+NiaB2FDDb+CgJtyks0iM0lpiDlcDmgdEmDg7byfUZ+oaHdn4AYv6syQxXvRKX8JFAEjLT6YPgFx9W5L1lZSbvJ8OY3BVhgIevZWFEWK2ppPRi1+tvY0UcGtcmqbmAoIrn0KHRv91nlAkVaGLUdCZclEY81W65ka1xHqvIVOCpdBgUEFg3p57LJeA5C7YfO0KvxnkIICvRvOyp9tZDHd6H7isCoVPevrtulvmc4RTH4uZ3GLM8zC+cjcBqhs0xx8NOvHkxX9GTNINrJtRkaqcYBbI20mCgV12pi2cxp0lYCw9mNUZnSszXUHOBfOygkhtZuAmpFVt0vvQbiAv6Kg2bxFfVMCEMWcQpP0vLOY4EmzQMRPWMheWuKuPDdTlE2glGDzy3VJCOdCf8T6wqnWDg167r+9pp1UGWkNkrbDiNB5zI+snEV/Sym8nlkSOV/loqibbWQ1PeYdMAtBeSIPHNZOlUrS+UIcnj3uUbgsPMOH2sZZWgQATnqYnicvzz26lvb0qZ+f3VqBI5dAOTAUZPIUCSh5d4LlALQmTjQOrYWdFnKNr7XInt9MDSfomCCx1oxDZ+FXQnTF1wfk9zPqVGzYwXoNVvV2GLYtfQukh0TwTsDT4RWA+I3DNnOgJsFllIx4PlgUKwJPZIpj4rm+cFKosRBhzfhkKZ3V0DIP/rkRr9ljBCD7BLDVmMZXEixNIQNcRWx/YkDQvPXdXm8VglgwYO9KvIt4uQCZVk6ZrQehQ+OxH6phEr1SXQVHaDw6muBAD6mLp8Av39UOijuGbgocWCPeYNOHA7Sr5gA8fArJgBegaooQwQffAauSgKg9fGNSp+h8VkExMgOyoHY6wTKCQfxAvH7X0c6uJAKVCRApT1AFQypSAG+FU7VzH5gbUbJF/SFW9TdvSGWfNoONj4qPkfOTyN7HT3ASyUVB3yguTjWX8Y/lzj3L5LFp7mE7sv+pAIuFZGXDK2I5a1+Steah/lbhsrofdmhHieK/YKfTnSGaV0pvJUdTwdrVYeuIXHn2vjR8es9DCXjCCGdNB30NEcU0oA0fGUdOywSBM+Ki8yEexjdKgfVsf1BdTd1eZwnUTKwNh4SyX5a4mCF1CjGJA+cFasC/P4hAmnm6vl6RqP1BjSM4xpBEJFwi/Hdj7VlmocJVaVssf08PudqPBspdtvgC3LcGUWgOw0FFE0LUUhRJuADshkz6MUisLIPjLmf8+/Lj/3+fU/tUASjX9eJoltP+WlZHr5Pio/gqPv7sSASZckpa1ZvS4AuYZgboS5IH6bFwxJeh0qPsyaDMs4C/WipikNjlHmM1Ie1RX+JFRJUoP5vqTp+hwpD5s1iLndUpeggMngEgia4d07vd8EwQl4HlNIQNi2F+HXySt8PG5KswI2KEVjVAC5PYgWrgyi5ehPSXyaGW4QA02TdedUUAmns4FP+3nAgFumS7R0q0r+HExNjMTqKTofBIgItsodjtFqGIzMruyxRQVLXuXG1GSGEZITEKxEkuiCPGxhqWkgT+sTRhNC6OyXGxEnjgxh+lVr/s1QWu6IsBN05LlrEB96F4ep5JQvqTSxnDqXI0qQBIs10S8+6LqRyLqPZNr4eUoCXogglLbeHIjggP56IzbjnlBsgLwUkegjdXwiRV7FseORFNu/4bXuzpGIMpGRT0jsWXOiD2o9TYgoC7C/lPEH4sJhKys23eczs6Rtd9cSpUuI9kccrV7S8TEhOguR4EiS8X4XKpkLKGTj5vLldisNVhsAK/DMQRKHHCQzqG+AKVE3tIdn6jP0O1EfafjQEcLhjWDETEhnjkzhrBGruevWyiflmqbI2MHlZ1H4J4tRtaTFjRIHR7nOqicAkywOfqvvHY3QMQBiIvmhMPcXQLgRLBJLigHe+3sxVdD54sQ7YaQDakEjEKUpT+VVcqDdGDO9AqIMMqR+j0aQ5OFAJspZ98ei0Dx5oEsw0Y/EEnYOFZvOXtAc7XYMrLYOFNsXip6BX5HspkqZj4XFwTeesVluQQQqrrzpYMZkCyQbLAOcE7SLOoaTGEc8mLmtagSq08nzO+nw5RH6BN0C+ATnJSsFrh5r037v/RAkUS90EkUUWQYEE3BBka00kwS5XGb70eex24V0cpOAY4z0EKT0WC6fNyPAsWNiGPaUcszcRB0igChglLhsbrG0i5JZjJLBh9vbiHqCOhOxI8mQU9HolbR3z1MoQPpXjiEDp4B6EQKCIM8IEBIUstLuz0RRe5eR3lEVN5YJOEa1/ovhMjrwl7V8p+PV68Y6kPraVlQKK9Oe7tXSD/o6zejEE9goR0Yd/RxcpkBkBE2YPuglPBHUdLWMVCUTiU+UNUToEIMyp4VnqV+BaFB585X57QXmebS+bET4lutk3ZHuCyGgV/aTedss1R+L8A6r723n+dkF+zyT/4xEQQyFa0jziu5+qJ+Irw9uClkmPaOeAjCLqCsjDUBJS5duTS8pnidoCrTLtctnb5X+8rir+zn8U9GN7onQ0Xj8huGbMWynpf7KMoB7IIQIXMjy98TpXSSChWi3vyXT1xRyH4tSThKwOjgA9TcHgEzs8GlZea+IbLK9aoqnGz+v3niX+s/LHdb86RYdmHei39XECY34LCnoW7YxsGD7uWRFkqFRRqyZ4ViJMivYZ5ySYMpoo4PK6AgzuVhSr7n8UbvS9e+XEWCW/pilFyeZsvw5MhHJj//EPmO8/vdMP1IN60K6bHv07Oq26d7sg11HxjHrVmierGPbFnIatxrEcj6ZYpzkMOO5LlIKYquVymUGqWL20Tg7lGIG6pwa19IThbxzqfyjhZf0DFmtHxgVQ+zcwn1KWuWtwVNm3hK5nFeJobpJZcNuiP61sm+iV/FMsJKPNfZ5fr58F29KBg7qrXEqNsd+Z5ihnVoqzQTSTNprMBxt7OFlOC5iLfDTd1zXCLVzrfWoDOGaaRriqvajR8oF6UenMER+n88c+IswlNhGGjIXG2QaOfcM1C7XHI5foPMQGp3NaOz8Teu9FIArT2oQGKtuAo9BvApL6m/wpSx8XCIUYTQRXRE06AjjCEoFN/g92eEKIIGEDlyheO0vOAa8jbDmwbyaMjNWap0AYYRMbPzHclUNDcEfqaG3yWY08eemRbmSvcgdQe5HT8ZPQp9wzPrmBAsx3ea7qMJYDw19sA99BOC5QDM9lVmYKGRXsEUbmyyIhjGLM9GmscwMQ8TT2A+pDfTzHwlYg70i4+6DcALy/IGexalVhPOZ3+lO/ciUTyypIyBtW5ZKPyo1svRcAOSNLjjuaq3GHsHdTqE9SXb8Y7XT6xDKl9ql6XqZfbHWk7PSqYTTH4VEBfllTah1vrV2gljs9vUMYppzhfjpXgxZvlssEgcfD+WFPhdMViqkkt/Z+svOjt16tLRycFT0EB4hS1Tkf4yLFr+k70kxFyTzLK2+t9M/sHewdQtDLhDka0DxZ5H/HU6HIDwn7Fi/OTXo6HSwVfrd6wi1OjnOXm524jopdvt3457ieWrSfv/ZbitOjJCwQUhNJs8LvjhNEyBPCIqXDjhGg3JaQizxDtjoa7oY7lxPxNUKXmILdtaCa4/Vpz4CIQM9+/9B5CxWxgZ3feZ5G1sRMmiyDU9ablmms6N6N5bq1Fdj3gJiNQgS/6CGL+LtZMoUlR9DafIocyYDYI0In5NNmwvHRuEvR8o2y+N1uKc9MwNvXcvr0zFdwdEQEB5tY4rPNXLPPI+PAVVcJ78dKNfIGtikwQ1mCWJLZfM5lPJVE6mSupCtP/dAioh+5AkhmBIKPlNMB9N7LP2CgVsAqyl3y8yMMkIpPeXj3UyuW0+oVR5YU9eg9Htppip5dt1VTejqZWRxxXuh/HWgZXAaCY2ucqYb+4r99nkvKnEbt0ukTniF/i7f9YCu4xA8sr6z67VoGpypPGdJbL0q7tE1peQsz6u/c3FNX/HWZsTlnHQon61qyHaSg/nHquAIxijYv7+vv54lS4yz+Q4CrSii9cssQE8O9UnEgI5i0wnottEhT5SeE/o1QE59D2hL4dW3Ae68Tb+Pt/DAxuV/jeHaPMuRanrnyDu2zzcVBX6NbprWNviBJzrYItZYYX7R7/EKDa5LGygvCpS6wF271Iq8XBPo7k6INVl/PC/KRygMrmoQtdzELkiwz/jmfWhbVRkUU3doDwiPn8Y2gR3BzeUSLLh52tna/ZWtaYvV4ShgukVUHsAQBnZvsKQLogZYQBP0u/cpipEpLUT2TPwJRTmC0h/EasV0IlxPNQjP7eVoLhsreFmanAdTnO2mycYYJmsx23ShfNKevLDvXzu1g0NCkJDr9UQt9aNJhoL4zWCGWKVzBLpL/cNPcpLWvpwyfj98cowReAVMWQTjDdwqKV0JKYA4T0LK9KTmQhm2vXQjQIgf7J1OljgjIOVKqDcOcTpl4jMU9xnWuPMhB3k7WDU18XuFrW7RVXhZEi/LL8QKd71pkx3sb/155iW1X7fWF3Q2RNy3SSXnyjo1/4ovUg3zw+vpc+upwtY8ArCwmVpMiLXoeRXQYfGhXhnVaa2zf/GXpDyIt7jVvx1cmSev2UqTL22EO5J+rxeh1cvL9zknHK8vyD+WlTGRidKIkAWda2bZVdSgHNohw3meWd9fjq2vBEH38qCdcg9Jd+i1qMTaNm1jcxQcTMtnBB3txaZ6TU7t0u+mdtxo0AjOZbeB9A/KqXjhmLpY7Gjo7gyjU+rKp5potJXSeJv7qGtCW8rJp7D/rrosTf9SOJu2u9/WkrSCLXfg0w9LG7/dPH1bnH7P8zeP70Uj+o/Qz0lxlxwyNap7nNz+ihQRPGbJoyAO25rJmD4JeziVGrppIz+86FXBVk2qZuzv7AeCtgJ4ezaJknzMa38tpOXznPt5nf3yLbVSz3YSYC786FgCN3wEF3rtrQvj1MkC4ErLvtZz2BDtLVvJq5NT3hxhq0z+Uv8UGl/rosP/d6ld53NiFGfJ14Xn79ZSu5mskLm7BUV+e9phy8Vodrj6PTJ5hddECl6ivaYxYAz8N379hopDl+TOMg7h2NiGL59f78sdrGt23748c8my5Ll5fdxQpL69d3E5b1SivsQhF3cjvEQccRn4F3zeeyKsR4sO0DaYmBSqrKuZfChOLK5N7gWzUGn0e03RI9MgSPxUqpSfPPSMp8qOmdXNydUZXa0q+BS6pb4fYw1MvrqQk/Jo1H942zpyQQNgAlEyg2pVA5ZW2O15xDtXx0vz+iC8Qce9PAuVXQIDCpGujnX24jkbEsngsIgQEgElQngqqzJzZdAGqGY/3TImXRW/r74S4i9IeRvumtWZDpZgywt1E5pCaCXMKqDLRXS4r4+vn8UCYYUajM9FdZsehUZ+kttL0Po6FDiQaT7FLaRc1sqsiprH3y+WGJkTzb/Y6L2LtgiiqFsfvIIJW3agInKQpQcXMZQHQMEb0Awdod0J2HzCzpHBNL1sOzRTuB9jVh3j+ddLtSci14ueFJZbNZJ/Q5+Wj7L+3QoM1TQejic+bposBNlcln5txFVXB/NLcBWzqq2twYO7H2wvLrDk2dH33w9f1ZUV+3A+gyuTMpmtG9Gd/Ylo6VJ6WufDOE40u9AIngc4kCNMHbtHTlQRoxUfLGre1SqArB30GTFjsLtGUvb5p/2vicMRpuGWYHEbfMyIXVxuLe3PoWR9KZwU2d8davm6bxHH0FvGPwn3yTR9eNB7tkggOd3O2qpxn6YAZ9yoJ4/d6/Ta0ieDN8VajtInUGbvFDq2SO69vwI+4UeMdYcjhPh9AF005+hpu0xsQzBNXWksSusSu89sYD3ycWSluvB0jsdYHOg/G+nnH2LEU7y/7PvLDLOU3tXEx9K6zr1Zw46KGXFae8uRCs5AkC17QoHybgL9rrEEpsCOWP3JOror9DD/rOz7DanWO2DHpbvWSHNez356NcLBVM4zhsQemlkdcqjaDO3pOGTdWW8WXkinjQrmd2xQK+T+++TvUsL6iTxuI+RIJHpELkb5CBamFyL74jPZNrk4jmvZJPf0+RQtvnymvrmzCkgTAf1ZyiDmbm7rG3wg1fHsE0TkCmoRpnTifV9DuOnqsu2fKQmvHSYXw1AGbqzy/Fwb43Aa56DoNIVH1E+O3/DpH38cwSzsuBgrk3VfWTSz1iZNsTPsS6BvO66O4EjYRQttKSgDyaMTdxPtqEqTYxQt6P0pxxVJ21GXfl0o9w+c8koAxOeoHUJuK/K7F/hRg9wul9M+DMOuoI+/ME8CwRe0PwCr5gUN+CnRly2qxbK3SP+FzUvmgMAbZl/rbp4NNHeMbZ00vHttocHr4CZTEKvh+dfmaFFWJloJEOqzRlz1/66tZd8drk7o9+e08tPBjxj/XNokVtaDRPol4zWnHB9h6fQNk5JyzdMpqvFF1Afg20VlfjpQCmg55OgqJqMygORn5ccGBQrbv2Gg4UagQMVJXmjVng/dWU3IQYWachlpK4722UAjPBeJ3FBKUnKOUoFVawNcefHba/neUP51GFnU3lRQejohgnhXk5X9D7nwQDjLY/xqI0K5U/6H1KDnQup4d4Wd0RqjBbCm0YCVtCIzgz3dzdR7CZpxuouyt478FdC8OoPadLuUuGntPPoHdxbvsdtoToaKfwO9KhnIiTqGcaquIQPz1YdRy4vfZSb+eBYTwnKkvtpnnoOi8j8yUu+YzFriJHV5AChrvr3uhymIJ47RLzTXT33M6/ln9a5+nTOSna5aobkY9pT3nvaCZ2JCL42vnBC9cm7djoIoRG3sU84e2U6XqLxBwzXbEKI3rsglS3TYmuQyXy/sMvugFayiWe2Ttz1l3kVSGheIY59S/Iv9+1cVdZLeRidM1SHB+ebDq6rmzkUMeAjS/zxkZ43xWv7615MTgzWRtEGB69FieOjYhq99N0iGEIxVpWSm1eeq35/X+4/8dWGpIBPdi/Bm2ZPnfa++MEvymLRxy7D26Sz4iiIjFx6Xi0nSJn9GKYfyMhgrsFXs/XLvbda9I1LEYWJt9tpd3NXg5UZy+eIkgY9LJJoFpeToiAgkIR1KMReSkJFLB2vQ2Xs0mwKhUudW+gZRY4MbrsuIwRMzOjz6zyKi4gqAWntGyl/3smAX7DuweB4YtbEFUd/mikHmFAVbHC5NGRNgVinAG2WHST8AmR/BqYfZt3RmcOiKfUprlRrdGi+2Uy6fAWZWTCuYXaS6mIwHPAfnuGJHQhkJuzpM6cFUxQQUXqYEuQHuVXaAucEZEBhm2Q4MTghe+Utn3Ruk15xYyyzjiXDUWw3cPsCyVwCJRVR5ktdJ6WtM6M4iwFBJpxAPwsqNV9XGc1amKcYDSg46Xw804Khnso0T4nlODKDI+rnRdd4Id2pse9xnCUfTJsVBCz3X8dLPY5yj4qGZc3PRKifyzyLvna7Np18spedOF8FFDa0ZHR0mwYeOGophq38KNIBWExIL3FhwaYHbuzStvvPerR2Ceq6dIQISnaOnSvVc6vAFERrNIfX2e5+K6L2DaRFq/Glb4MrD/0NFUGpPkdNgH/hkh8epbsCPb6q35FvzHi8o/TuDJuynfFf5JtUZKd57gcUwQQX50UR7fZdWY/koMrVE7hGbU9y6k4DSXIUBI7HQHWj4J20Jo2uBdbiU7ASheYhCW7yDipVNQCE2pGQ9cYm/yV7OLcXa+J8znRS821SKLdaJH2IIRh9SudfdIZPGLRYRKW1EdpU1ESmzcHD8HB328Csi1TTTIAHphm8QmXb3xQRMLFbrkruPlNWnkAlgWHx6l+JGv+M5e6k9vCZdCdC0zrcIae6+755jQWHrrXGXRZ9WNtAtpMjffcCZjFUWZZlFjr2bYCu9ilPTJKoGU1IVhU3MdgbpOL0DjfCZLWC/avhT0giDnav44dVsxvXFAAKedCYBpM+4MlBUwkxotONY8fpVFzeEWu27SrqMa93xdmTzUR3v/AB3hWWEcPYQweQCHB6rhfp9I/OdJp1POhMluKjg3/R8Ud+VvsGlpi2uF+pNNprsBrY4mXWk0U7oPqbHD6TjzjFk1xSaqjHgKTOSFzPEcdnLMyoiWR5uY1+T6PgDe5pfWU+XRPHaH6705ePWq/p8zEwbJpb7n+IzLOUVTlsBJgjkbbauaatr0eSXsKrNMzCrJNFu1AvCYSbDe9HmdXpT62JJPcVxdP/ny0jJm6Wt9+UrTnzB/Vd1tRljMgxYYnh8vKTj/MELB2mq19NIH0kl4tTHAy/Uqpd4OT9G0C+pVCTGDpnoUYVJ8WR6JKdf7bxkDk6tBoLnzcK76AqFRb+CPmb7zd8Y+bDv/PyZzKObUxweV5/0GSIPPEIOYoNlq6hX3JdYFYGoQaDFNrwucWxhunf3Wo+oWlrdu+K3H7hamW3i+ddMtzLeu+K0XDrfoZqcnxrjmlR7nVZaVkHCS6nVZT3Fxd3t+B0ELFEdEiE1vsj9H5Nbhtx52j5DXuXX5tx65RxhxbmF/66ZbqLdu/q3Hh1tY37r1t16obuH1LbraZrGrSvbyZKvVq/R9SyKW8L1ZUj6EEJXDH26IJ27zppfP0jdbL7Aq4SJYQttkawlrJxvFxJ3fR/EtKRwfEY9oYB7Gxc7bJYqx7A4SSTzf5DVqfwlkgsfTwkUTomRehSC5SKaFCY8xNykZKYCYum6RDHRERhFf0tIHFJLDF7GkmsK4CYQU9C/RH6iXsNGTSESLGU0ZQXRLO/gcQvyn8qrzoZsIvCD6pPy+lTRypuPTC2m6lmSubCKHV36QPsl2K5SVpy1U9rbHOsuUmfO71T1MSXxmpDtgqZPHBcaMnlpNxa6L9aRTe8vQ4362DZj60wTZVR3X+mhR4nV0P3VP2A8geQelJr4Kb7+RBD13LQslELgLdu7xk/P2q8Xl+KOjTDadDhc5XORgCsfFoe5Q7Hd/PbgBzwojgm0fcz9hfBe4qtcMK0Ii/4iOQkeJ+iZJzD4i3PaDwcHKvRHMz4tiFaXykCPVqtJYlGV2CLUp7KsDszg6DrSIt+LtR3XbnDXiB3wZGZoUsqQir5mS409T/ZjdGNTijg/ionAtVhO/ppaEA+8+vIVngkSVJXr1RFJDC+uvp0KA2SvBn9j9/Ofzy8rWM/E2Z7+nw9LNDj/IudVGDBKjDbJ+mdCF1U5CmOuHU6fY9n0qXvU4n+Lkoafbc0QS3SSA3EPqJyaXtvI0mHlfB3USRh4C9Eg9u6vnbp71yHGZ2mJ6ePSHLUsQM8LWIjyiZ6bX8+6T8jnZqT7XO+TDPG5Gzy9tePHHEr7VlgGDcpFICRzJBx5ow5iRx6+uI77cZqOvJ61fpWNaWeZDKhG8WzcJo1rP92e0jMI1Vdskk6A1LvpbEAB0ybhQcmfSV6eDk4D5AzJ+DJHgFmAGTFAsFGoxBsU4MfNR7y4CQu01koVAVf8DIuSxPm8NqCLdint+l6zq0zkH4nkGinkIdiw8GQ13ioiAshHuCwZeU+HMELbBmRYkyeilVyMw+0BrDF+j46vUIY9rko6Ai3EsaZA598eEYG46U6PxBEmduVu+dmp0BQnhv8j/PG0v9n4eOuAo38BkXryZL74CDcHRHWiIEDZvmUs4Yw6p4nxGd+EDX7Fkfy79fKWn+6qAnuhJN9fyf13bZkLFuGoozTu326pw2kPn/f1yuAUGd7OkrWWYPH56Htz4+iyE28srFYef2CPMxHatRzaKNh3z6AGpHWCNbSxYd44DwlN6OyM/D2DiAxTLEGbY4dFX09we84Bm3BDRIGR5qAad6e3Lf1AqnRVvSRUjRDw9kERlsiidiWVfW/2v5FWo6KYr2QVsWagbiqfY/cFzXhQuPTbTK48SjWKKsrk8Ev3zNekI+A11fPV/Rta5P640xo9mxedwmVTEYhRJpd0FZkKQKQyUQJIfjqnQlWvHJV9AGNhxs3apvjiel3OCQ+wlCQSeN4R9KiBBycfDSexlb50kcYljn/yVxS/f2V46yuQEuiEPZIEN4Z6kEOgwaTjRgD+jScXNbg4TkpSsx5V6QSpqrPUrogb0LVweJuz0ORF8gr1McDju1AbeqgshWEH6BoNFBCELBQxWMqBCfQaAlTiATdknzFcKDrLJY1vCrpoV7lfw9wut/901nQTch5/iYb8b4pU6HqafUqQSEL4Z557JWB0wnLkn4ci6yAP/glXGg9ashCwbGaFLhfOi1pgcyC9nmQVzZP7DVSyx39P3v4kSEzlCLxY45JDj/dVLCYeI5Sqml8NgdPSdCmehCyZkUY6S3plAsUMntHx7Z9OHnmBER/PDvhNPwrEO8Bi97BykXMOrbIYSeEZM9SJsIWl1XrzzU+CBMoetULlAVOnsZ1vFKgyloAj50ptnYeLdca1CKJbJsMuIRxSymBYaYCtWFgtqJlzrIZ4VVatERxSrx8N36iOoARnOSg58Xdbt/ZKBqmf4kUSqnZXFQjde83K84EyxBmozQFRtdAUgc0Lflah/kELB0YYhJDCP/zpZ4f0dyu0IVeGzE16rfbgfjqSKkg2YnIiLhfu0Yx9KBrt8isgzojffEDgcmqmANnbjfDPSEk6yKOgkaRrEkkvHSURlKunMWbFo0lRs3RQufQ3Mlw7j1YWwt2E1yAa6EYMVd2edMG6mUa6Dv4u6RLLatiidqvMbT2hSljq0XEmLmIWj6QTXDHeT60IzsrRzOZzP8OoROWj6m6i/8lmvweBPHhuM1GskaTs3j9KvOkw0gmfBkV2+G8JLvsddq+tG8U3IA72KKeYqbRPqKcOErFJOlm3AHdKzsXJyUtz6SltpoLhMlhaENQzq8qJ701lHikiuCKxEwyxc6gk8PEKlAcqqHun+PYGZVTEK3tTYkSla/X+x2htg3VKo/BmLa1J2HERSuQTb6K69Oe2KHbQBs0pJVyod7TYHe02FjEuAg2EW7kmcwfwbhDLz7359/E4XjLO4T6mppkHl+yHUf5gSLnBRtSyKhSmLC9jLgX5MTTngUjOtYxj8e0V4AAP2/RMrKvxhHU/pPah8P6zyqDLq8qHcC14xlGshJIOai2GufI1DVcMm0ASRDuZ89AFldzHqM4nyjrq/XBIJT/p6xaxY95cGwcrixFg+jc5lHl0ilw73PIFMNknbibGYnhC0ucpHBkzLc2tlDeHS7oOpj7VNQ9XdY1ulV97SAyBUu+glwYoZr9CFZizeAExyUt3AnxyxliVAdqXT8gyIsi0D5X6c22HeTXgXlgRLMOIb9Z22ufJfxrdJuXDMIMCRnPEkOEqZkBhrdi6h0hfwknhaUJp7YLWFW6M60hLFg6M3w2nrexjJmGapp0cuLMGtGQw/H4mAI1OXZMAVIDg1jbYKYwYZF+2b4zfVREiDE66U2tvLejU+zYiOxCAdNOjHLxBhiR9m9PgFdT1bU1qP1xSeuoqofYoY+FjKF7g6lS1LRr3Oo9erPRnZcQuRkPQzmln+ty22X9dwJmlEFXF40aUxeyLcmdrw14GCMNOkX1COJaaqQlnxdIJFVYGqYj6hNSPwEa5JUZc+HKtNA282J/xVn/tTCP5tz84zvcKCNDYau4DxeMQXAftLgtHn+BvovZvLGX3OwjG/zXCODbtWG2jdHKdtG53qLRxwvznO+2Rvfm3Ficw/fcq+PzyKfjONw0X+ct9ZI4m5QAePHlBgWxU+55/xfhDoT7+DC1GiM68ub4/Ec7L720kQqAfuK/QEOpmHMFGsn7R1gy8S+M1t+3RRfS8ShgWvISM5Qb3oi4YwT28YWGvQCQkD5SOo0boqjFhSXaRAyS/PRSbj4MBnSvjpnGBJ13Ns0AYmoCCkQvlIAPXecpXRTWS6x6sYlxzwmzQ0/z+wKP5EoazrWdhIHTIIap+zF/0uYpDFehgC3qQBdz4uZDKDjJXbJSx7dAYAanTm1y4b7DPsnvmpA7rCxG6LJ/5m4QzPiPSRB7Xd1NTzS9zyCjrfXaphOZJ6jkytxfsdsLaLcJTvGOdD2bEAHOfsbW1ceDySA4avb6QS/FOR8bHBunN15VlrVLmWJMxpUiUqCJ2MtRqS25ag4yvgeMhwv3d+LMhK41zwG7hMapVKPhBW9hlSHjUhvE6C/JjMgnPt8RGdSPcmPWzy2WxTa4jFcdnYXEWNVtnVjBtU2+mT5712x7fHVymD0N5gLvG0CW8541J00ysVWQnvnCxIaFjeeeF/wh7+9ctrFmPJwbHFNfhtzYfDuBvNXjrpZhJxwzH59icRlBJ+RO+PJNQQXxmzzJD+nEKEgxZcF7VDLUv4MOj2OgJ9YSCJCoMp+tYMm1ZDOOhcdo5+b1jEy70UwgcT5vqFd9xwUeDvd0Lb1KDdUyIHfd407hPOvUC4LddeugzBKLg1Qy92deOEX6lLLJPQc29nh7bljrm/ZaxhT5GucPGp/0gEvlFEmCn6ebac22xPfLgDIbHsnvYV746piJD2NozaOclyQrbRvmVS7ap4Tg3ay9wp6mU+OUTdMFd72sRNtK6r/DobRXnUfM8HYvpunUvgAvsGGq6uVjaPNuG+/28CL/bLVVWre1JJZr5x6xbS8zOtgor5TStvgQOyuMN6KSIL4s7Hlb2JDBvO3rB1ezx2WIo98Z5o6MKF0JGpIf7nfIJ4TJAh/mllgWZV6SGR5+hbKG38Dr5R9f1vLZH/5C+JbNHUjb7eMuLxCGtxvdOQRLis3a3p8e0oi4Awoo2H+9cxrNaQ8s3MZ+n+yp0NnJd8XZxx5i/FisGANJsl2bGXBZtmTOwWNoA0kR55RkVpTN+HHZS9ajeNvQl0tSZZ3baHxFXc6KPFhhLupqcBHWNhimkcmI1TFwUdf67iRntF5rG9wttOthGEN+v/fMuRKOER+LriKkbs6RcyGzfUS3w05bUWFRR3TRLnexgdv+ygIRLKgPvvnGGZ3GbIu0mAXrMH0s3oGIul4ZrycoUavbtyX75hX14osQ5zfsi+ZHtFvPAwztQskUFembjAhYJcgkNxXyA6Mkk3DcLMvFj1NWoii5EShG1+42K7K5yYpqcD0/ljQGZja3nm8a3v3RLELRyBUj5+Fj0uSYZTLyJ5kYMv154X9H8LN8iI6LFR3KFoxRSxgRETqKWhDwXJx7hzeIxI0AIjRgl3qLYAIhRx0FvMNBZJSnC090SPw5mNJOj/FV/GdBJLAG0+qxCYdAK3pzz04isjC9k9VZhqYkVTSNRa6iaX+M6SoCAmFBWYiqGKGUvssRihIz50Zm8mjMSzxsw0ZSOBjIBUFc8PtFw6IRWOwPpNZ/lRpx/IhItB5p9cujh23sKM5Vg7wmMJ32Z0X0SmKi4mBpj568edMNF2Z8nkGKm6YUnndcnJAH55adJRL70KMvjKWhMYRPDDKe/YRBn6h6sIfneGehG3sE9iUTPi+CRv3keu0vzHHO9i9/udln9z6Q4tonEF2/Go9GZ/9wb/MdTL22F3lFFtfqPq/hqvzfE69YndI9L4xhrCvIvG5JbJZymMaF/RAhwag+b3mteJEcb8z/pry5ssioR+Xug142UtAz5so+2enqyoIiMDC0XPm/mYdKRzghM/q0vZ1bTge8Mi8UN+kHLvoGUD7xoLdb1EdUSE6T0kzOeu9tNIJzieqD6CvOqICpw6nekNrovUDtLsvWaM+CthPoegLLada3wqIOQGGfygbqQ+3xwtLa3F6CNahNtGpZTdkb4STCJ6rE0cxpGnEzO/SDFFZKQwVtrs6sM8nZGmFp4O13Uzjt3ErHWRj3FE7dPJUbSiljITKxXQMqNo2e7NhqISg3O+PSqEKxQzhyjqSknXI4qfVgVqlU5+bT5UQzS2mKSkGH3IcRDNVPo+EL2zQczITwyxjpEhl+KumHNiP58PIX5imai3bbJ28rLw7qYQP1GcCEQKtTyaKiCH9000H4o0lONuk0+1T3n5VSvd3GP2Qm2UsLRaGBkrmMyaXPJnJ4SBzkd9FYdN8NntpDKK5F1KZGRdhqMmaazG+E273hIasAbPCy3inIlgkpoqDSiz9e5B4nh6Sh8CdXR3Y/xswHH0pZQNSSxc7QQMZYETdE984qMjVAfCOA14Nx2DO9aodU78NT+dff6GqE76bBz+Xp7H//tho2HobInEqUO6qw5hq7424bh8LxGi1lQmyK2sZvJzAep6TbNK3D9CkSRzN1QOfhqf0CGMIpdJ5I4E/Y5m5vCYTlqZoh+9L7l09PwUFRY/wyII3KaZNTdEUsjYc7R2/rMnlbjznEgVTVOfYBVnbY2B4yDGOkNCYqZmpFbsZD2LxLRM1nyu1yJ2EzQ8S0sMXAWOBT/DOWbbAdFoR2AYXcrUSRtoOVoWN8PRWVNFU7oZZwbJKKUBIhkHlUnXCWGl1D8UWkjUsnCBxMDR+Eo2DBd0sEALiNURbY7oNm4w7osgnakHPaY1Sa3XBWAnwRhDx08nAhMbuTlEwf6cV6jtv3tW5p35g1cMLZxk0XbzE08iuXoWz/3lZ/60qGCthynacSvus3zVuHbx8nDeiSRTefTmU5fzN/oWbTpqHv0EoM9vkPj2h90Dp6Icu7L5FHi/UG4s/xECmHfFvJmGF8eSzeIGEoaU55NeeRL1L60rMKn9EojqDwjSbF73MnzFZswvb7sddGy9mkgD15EhYVa2ofRFzh0yU+RzetUkOGVpoYkCKXAkz7pd6KYwtGR4WX/Rw2Tu3cpcT0eDxDux/I1JLlhVH8TYBDbKis0kB6WpHO9ZejIgle8M29rrKcD5000afyXCsMD7KdzI476WbdC+HAXFOvmBUzl90wegC4MLLHNEy6FxVSzH7Dy7P+yiDHCGkSRuaVyd7063bUkz7qkl0ofO6ziqi6AgiyNbJQJnFln5hyAyVbKPjMbOlRnqHSlPESXXAewQXGyZXtm6iISLpE4IaiJaX6T0qaKeolSLAtyxP34bkpxXH+qe2k+xSrm4vc+1NsV8sfePGkgtdhFlVAuOuF0+ltDioOOfW5nx3DaBMuahDbRr1INnlFWyotA3pqejFrdnjTAHfjqSwZ91wOlgD48+g0BHQv7lKHFDAWajhbIhPUuYUm9bCeauRqJpbteFz1xWhmyp5FUe3g5DIU57qZcxP4fjV4pimQj/fK2JRI0csNP+RCNp6Ntk4PCYUFBJxlIOgLmIpWPTJUsjAXZEl8SwVuCGDmqhUWat0Ew5n5Uthp6OKunkDLn80bzxHAXXSco6KZTVLyFVBqc0OiHVDKenKMUqbKZkJHH4EHB0LejpkptrY697haxtYW3VdYyr7+5k4Ne1jXOW46w7zK5ruxzkRg9odwp9XOTLx2kAC/KMMlX2RfHjLKJTW0JAcrLtuBcH2pQVqh5ygW0wbiL5ZcUgfXgw3pTer+yRDMybU6NyNgtQxSVQriWoRrxTlh+NPPeOF1eKcpzykPgOldCf5pIC16N+N/E9Kt4/zh4JuY4yxMh3feQ/tWH9MTEU6fwhHXvZVgso/CW606dKWy10KUch73YVxS3CSwvShfWmcOdHiTCyjw/YeYjyvL76s3xrl0NiOUyIIkukr3YePnMZQu/Wa7V/NR/8hWrFv71KxNzLceM4gPmlANIWCAg/P8ozJHvhdtTSJJLUQWbZcIIJLRfJlXy9UShkH4aC8dyKXFnoIq8Krn/oDFbClVBklKzGRS5Q4buhBMlNfoCt9YA2DlG+Ub0WS7QF2lk6PLHsymDBDiCMkajfH82G3jSaP7Z0Ds8JNTnvJs9HczFICJXQVuz8xbAcAQWLsGblRCI9R2wSiFwjUmEsZJhaSFeC4J7HRTck80U97lOAgnyBvtk6Cggv519sHcuYRzLwoMhk1ZeYlFohBx+OE/iziYzwnV1jvQWKEzy/6ImEv6EEGf6CxoDlp4UwoIAyQM9x2Sv/ap+tPkrigFpx75pc65dF0GYHMt4vc0csHg4u6Ll7xiKmTcrc331OE1syLHkit1OEI5UWinlSOfo4Sb/A7mfVPHL0llHkARW61YzVhsHPZ3YPucEsApmhJGDeBDJ+CAMmNdJy4Wjnbu2Y6iu8TC7gLsslvhHE1Tntso5lXSgtb9fHN/1u3NMCwN8EsbIxKi5f1sPtWXs+RQUqNl8MubsVr/Vw45LpkUcHzPQ/NXFtOJg/a4RI2NkBCeybfVZqei8k2Ec41hJ6JkMTML7GcM8Tbj9ad2RtfqKIH/oE9za1IdWP6ycPCSBRBnT+BLGWMWL4FmIO2FjEo570EgkBVXA7AA4hEMwM7e/OmK/35Whu38fxhJWfbOY2/Ta5KP0hzGfw4g+lkyRISwQdpxBiN2OUMi5Ux8bZ8l36jcSxAElmxnfBzr8dvld6LsujPT2aRAFxg0l3iyBm/tQwJZdIrBDD69L8+pJCFBnXdJku4sMA2NkOj3KF2L9YkhA0j8GlHUPtucVqa7x0IVjIuSAXpL6aKnX4PdZTws4Y5k1fTPYEe3k26Z6cPt3d3O0ED49MN8yTjtRr6ifkrtMShikQALSsHas4u8YMJNGiDgrNBT0qTqx3yniKM7m1Gqg3YAmi3SOvRA+eK5oofH3VX4Rj7NlN+rSDOgppq3rB7yANIjiE3nq12L2FUeQtP6qzOnxQFNBA0ZNzaIH5514uEucQV97igjbd8YBfcyYjUsQbvvHViYT7gE+aF98R6Bj9znjSXT5nAZZHZD50TDLMrQZvT99woCwg2z4BSNvCPmqFWVLnLQ1DsSuLE3+/DWxLwe2jc+UZFalAXRD7LauFrpTboYhZi2QrEEKwfRLe8bl9o5HbppbZylz37yanGzHIgh9hLUdvWTmyR08jAuuejQ6ZjsEr8JPNlE2tib2JhfRjr76FrshadWLFAURgNYDeaXw37e3GwYuT3bqI58qWDVRxsKWEULXhKyeGP2Na+EX6x/iYfui1n3Pwutz5QRdoe80lZKc95GPz+hR5WSj0ko4ruOo8C6FxpqmQze1/BVvN7dmtLkzQhPd4++dHk59yx5eSehHQNrA6P8NaqdDJXXVD93kHz/6OhZjCFgEB1zyXCIKYFHydTYhyz/Z8SgigYM8/aU7YDQ6Bo8jlLtoHmE/U4uAt7swkP4c9uNDPYhDH4oAEqb+A1N62FQqjRzPjgmQwPbCODjkp3STWuEdNCyfp03boaV8b6iXzCBwoc4t96dMffqGGbWXEPaT5EM5MrU/AhcUllH1xhpxxRAiRfyePxJpwNEvQtHGTmGGdZGA8AnwkAqMyAlR4Ppi1npreetIW7lwRvicKSzWJgYaCkq27D6eSzSZilwvTiXjJXtoyLKzNf976Pu7O9fpBZ7+LMTJtLcw7N34erJTtUUcPKHbtbAePQoALvLNBYatbbE+4p3fxUEiYWxgUZpRwagOa2mXy8Cl1LBuyoaHwLCAIk1SwLEjLJE0gr2RHEtpX+snSFkG0f/iEHSLSoqJQdqTHoI65DKna8kitIA+adiMXU75b0dOOecQI22G1Vu5cJFWkXOZ90mRl+vDAlkQ4goByQ2SFPnGObY18KjaTzz4K1BoAcJFvn41I2YrQV4qq+0pFxvGObK3yq91ZSd9hICOI4NBLTnsVxjiGnonTaWpZ84XMB2LNH7vkg+IgnNoZVcX3kqhasUz44+LjzUUkif9edB2w39OvUUd3H5KVhvFGj5nlbk8YQd/YQOu2PgKyBXXMesRuDonj7hKX5t1OItvpDrz7//YuQAQGBN0EAVZeajdloGwul+aKAN5dCDgQsJzyE2NTMjmdFyJ5UKIyQTrnWVz3HQo166mRFrbWLsytezgoJE1dH8nKPNYkJnlBVSHJou82AkvgpGRHc28yyxUwmjLqi5JjGdGK0Osd7As9Od+PIovxm68EUru7i+BlrcRBNy+dKtHYtG1MiQk0GNvVigjz0JNYBqLHTvgkFTgNbpGd2SG6BYmog9pZyEDDBhKh02EvN+P9xGrtRmA8AvrZXn7ApfECdNQyk5f1+Sj6BiK+EXJRsIU0GnhLe3Wcl2grMEHT+fOXb1mPki4NMQUTuALJwfr19ZTDtswy0KG2eHdtwbYZWGVeUEKfuhQpPQ9b1Bh6610wTOe2wCmCl1YZXEkWxFrDgv2FAoVcr4AatFQlMvWnAevzfCGieN01i+muDbP6JHordm+iOX3vHkCRwdLWAW2aldZF8ih8OgGiE6U0xxwtht+BFXIoI4LbgUcBnoGaZtsNc6kB5QEwJSJE0yb8hOWhY2N60adAnzhG68YGBOuZog7zamxVU3xLRbKilhzIUrAe1J1lYXyYuDuLIfxa0NbB0Iuu2fHKAX5HLBaeSvruJ3u6KdfN9jWPeYhsbBWjfdTHzZBawQ4FthvMgxLBl7diFGIald11E4zsPmwncliVFkNNe/2uN04qMb7PklN0fENKDSISlCTzN9q5pbN+XRc2lwmlO1rUw/WkIWsosdVaPWexlQBoWGWwiErMOFRLnO1Ax9QR1NhTbzMxVpSOrj1uDBC1sw/BiCnfwViDIuD5GndnSpmBSHl6Ee7XHT7BlYK1KrNYcyN6oJP1NOxZlUeLINXilGAr+wInSjhbMNceMkrYZP4XsxMbAyiyUpLEuiDsmFDgwiC1FMcEsiYwEzaqVScawm4k8RqMKdvBXi/GeebAKD7kZDN1jr0wFDl4EOxL1qqZivK7Pk/gVLJAzbSBKgDqyyxzberWTNnl2zvp6zTwcmtwYjoaU1ReKxARpMNJ4o8ary9DMhWx0VwZPxuYEipVipn/HiWJ/O6jDtcU0pjLiAdXjdsnkGix2VK0QhU7y2hPvgXbZNvCcoSLS7cWT0V24h3TjlV3tNbFdXwei0mQTTFaEqgNDrQK2P3BQlG4+pPQ2JNWrnauDlt9nW9jTQiMbTtsKxgl7oBh0tCDR3SgP/Bk2068vwjEOzoUc4zrWc2oLrTjaVr1JamOqY41MZoTjOvHuh4fjKKz4FUB6E48ktloq5BT2wC3F+HPI9dGmBakya0QWkNuI4FOJYCMXN8RcUMTQFkUGGQjnaV0WNt8maRHDfhPK4v961oNR/8cHuz3DG2VoxzsVCykV3AUxSix8/q9FXjVWGQaqQjlRapuyaOD2Gf6joJaY4mZBL1Zsa/f6pP8uc/URgIspWpydt03RlEL7oiLY4GJttSgFvwQyMbMQRQ/yFtuDu0GhCe5RM7C7jAKCTQ3Vfw6RteupekojRBvbXTsMQnp1DMcMi85ExFoNTCeoGf8j9imgQsD8xj76yi9gdpFTuiY7oiYjfDpd2WUz/JlfW1I5MLY8WJFr/e20Zhsele0SNMJFJL7rBXdQefUKcuY4x+nfRJf17Hd78WPj+eO8MHzmDfEEu6XLrYQyTudUzzv2edDYO7AEqRqA+kLp77niWapBbQt6YjuqLJ3R3eMbDXGfjvXDBB8J9EPbYJ0fXVopGwaNazaFJqUovIpRUNycTGr805P6usapc/jh1j8BZDZo/uwWjMzBtuYT6d4FublW5Z+lrrC4OkuALZLKHUHV8/sYUjokzrpOunsAawHWYjbuZNeV3bTDS3GUlGRc/r6sVdAqXTx7XGfGJ3ZwWurljBxLHJ0ggaftNhHJTP1rb/RkfyaZS6YtI+R8ySIld/Y2Gup6gKXqh8r+6GGkil1y71jv1AGj8hVT6QzFphFXANM8PCmyGGG3RUVjaMq3OHUR867m7OJQ1RDqySYVqZLykIg4x4a39eQiuVFHb7NGH12yJUgr079DP7sSQlWOq7cRNsXzUVsOgVCySxmqg+jr/VUA0wxZm9v3Y5tDg3oOi6CN08K4tp6s5kdKxBzEdJtHDzkPut3ASPxdhTvpmKRPTOmkwXFZpQOrKUIczDWQXN0c/SdQLEqB4bN7noGyjJXMjeSWC4YTgm6An4cqptZ60DCdDmvM2PzGJm97fvDCBsc4orvlVHm2oWO1tYHP4eZjA07J9dBkR12Fsz7I1WMQulQlZEE4vJ4DdIihxPviaRftelIx9z7np2YMdI9nyAb2huVj0u6WtgCnmqXCU2+VwVFXF4i0T2+nxh+pND9hqrbGzO01SYGqlwXB7aEqIktgARabQkU3R8crh0bQd5D5chtH6VzdH0tcANcus5O271YF6nTNoZOrxha0cmZoTrO4S2hvDS1/LTLc2jA9Y7GaXJDZMZW4KH99TmrqXJdX0HCjWBxPwG2gROhijuyDDIsnDIQ5Q5Z8FVA+JUBLneehCWVSn3xma1Anr4nEC73cZRuM0mxla2yRBUjx/hzUscSu0Pxqsk5QzPtVTI7iYzpoKx3nbkpe1riTOv8gg6hU3LgtPVpf81n1/BvNW20VaqoY+G1IVrtknUS29suUd7f4c0lg8CmDFqBVj3mO8EQlsMT9W50kJfG6zOKtRh82RpTbJ+aUncTcWOSaScEWWyOhjOch0rJOModfbiQrE9RlVmPYtc4KwtPMAehODKxU5UKncVeaGBOl5CnC4fyCOKnJD/qjWFjQuyvKni7k6S/lyK6/eG4ZEWwn262ctx38ALJa340+aLHXZHjw/povmB/zgleYoYCZ7OGkRCaWXxV8HdNSoYcPycnaySXlc3YPmPCdyE6JRgh7pQ3hA8Kl5DgsHjhXMt0eZ2l9YJwNuMSWNLr1Dge5fpcgqCiMTAcGUMKcS7SFnHmmh7UhD476J6kY4FFFMLHOVHRIibZtczedwXRe9JamrlnSUUsCtfQUGdGm9ac6PtFZHtuh9xWe0cAHLMzm2iYE8s050H3QCJ3r7mLu/TYpOZIB1wy0PuiYSrSfcSLDl5RcmhJ5wCxnBhGWtOKntAyORZmFY2PaExYHZAIPPH0z7yTl/lrUdf8q8z+ujDcvzT97mRQIsLDrc1+LyVZAbwigG2sIi89+cb1drHONa52pnuSRxAZbWR9VSHJsnDHB3weEQXkvaeSN1O3EqJE30On7g/Mn1g6oVgPerpu0P0NXv/QPx7BwQq6yVdv3xEkT2tBHUqByZLcVEGxM6VWtG/kJywvSaTJ1aCHzvRbLfQgQHRZ4qJzFxT4os90KSYhZrJ2h/vls3OCfcjvLLWDQVIc0jygydshjJMZ49xsqfEJHqA8jQM3fObPFJuI/7z9aSSUeJDFokWzvd70FAnMfNCdDRilf+O5i1uB0SLQmZgZ9osr4lyGqYiVGjMeP/lr1W+AMPDiUKryN2IfUmO9Wle7VMR79gczlKG9HIbuuQ1+hgtCQ2io1xHlQEU0mwFykInRyjZ3g+ACQzWoxmiA24HfhNmkpx7yB0xNFwS7N35FK9tRygQiRSkcMKAJBq4ELfGDThJCVoDnXhwJNkKOWQHeRuYd4rkUcLHSWTMOuuE7n0txIbil1O7ixy/Zu7bHeAAvKvTqBNxVdZEdymOEy2dY5Mhy22bctuUwznNhFEzJ6q8IQJK04+AzEyxNmD0X1ORw3dNuhz8wWqbfUXSS77UtiCGdOsLXwkiMNv0/kDeFEeNoE2yhD712bzuCM3TzIp1Ax6B1+EUmTO+T1dgWYnG5J8yfOyChAsK+zodT4xwN0ZhrFPlaEjeuqkxC+13w+HNxu9Tuz9t8qmEesae0aA8SoP3PKyKEhYVT7gtXQkis1/a88C7uxhkkz9r4JLiL08ZH5mT+F5wr1zPbjDufOffoWXwuKiH8WVFNUioXb62rqZ9zHZnE1lYkdEXy/g7vlcsHlBdRwDu5N4an45UXjWqUoN5fw+3TYZCHFMY0FEnmYi2MsrBrlsFcKNaY7L0OdEM8qVlj1jH5YkgvQCvXLivvyWlRtYr+5hB8I5qCx/Iwk4EPJDI3vhESbV0VzaW7jd7xy3X0i/Zd3HpYAf2WbmV4Oh7/ojpM+nquG8VPQ+tqZ5j73kGnLQSNGbi7JQDEWsNfg50rKr/6eq0k3D9vFBybO37ZOWdQcw1qBqgNgRPnx+Tdr8MRZo75dX4mAfoLe8OddhsFmYnPmdS4Xp8M060i5r6NeX4xjRIgK6k/i8yZlI8Tmt4NMS5UrVdJozHm2LwsBqrZKq89dD+4EDV1VuGJJNkJ7XLBYqNItYiM2Cqgwr6xU9GwiYMkN6509FPoll5za34PcAyku7tkF1brsyL0uPbT2RrDRksK3WmVlUHdo2l71F3lqblTnvuVknQwvo8NAc4jmZAx4pUuNtFiOhmUU2zPwbBe+QtA4HhQIkWGT0Z1qs1eRudOuaHc61+Gb5jUuYdQrm31I7iyV3nLaVjYkt54kbLFk22tQgGwYBsvdsmBxYj3KFBze9V17ZKpQE19hxDRX78nUY/ukchRdI9D5YyLLFIRJPTStcdPVjSdK6XdGwIIbrNUXk9JIb85kvVVG75polg+owtP3IV6s4qRC7nGOBdiuzGzXzylOyjBzGJMIBQBIwu479sbX3ggj17W39GQZ5svrU92Ch3/yZzMLbwjaoRtmFFNLjDwchV3L5VCM6djkMQsWY4rE3DWC8YD8wPyY1WsOlom2z1i+TrEluJur6uT7x2rBaQvsIvaczsTfOqHUv169G1YXa0+b4d5turxKxz9nKT9KPqGwd/LlzXf50hyEv7QcNa97B3uEfLLy2Pdb+/w2OIpKJs+WR7jCsR0Gc+btk2sDlebXNf/Ka66gvDheLhf/9PcWx8vRx2L2L5NJ5nI26njG/Iij7qXeqTXWcr8Xorr0zed7tgyVtESSzK2Y1Gxs6khDYhKPfAkbydxkWu32xSXcHHZRExuaTAGzsv+hCRfw6XAVlEjvxvN0trna97ZigCpv6ZyP3CxVKF2nEA5pQt14Wri8d5x93bZWevkVxPE45Yv6qaOUFLKJpOJtTkPiECkgUnzrinzM8rAaX7kHeUE01KrSxfxJxbfrMy81hZjBVzTAucyMvgZzPEIJTEvFBhxS8ImoKJbyOr9U+KnrjCySFBIg3n8AjcuIzYcvewWDbOTnmXBFQuCDZwIXuKCVKH3XLaodcnCFVqTJiMPFRZCZr5GJEdf7AgspTwuUBkVoKYHVDZodfgg9qOo3o31mDnBnJrn1ofZYAIthsH29Gh9C2MbIn3PqLFmGIQzrS3pE2cCksHiumrvA72IBpV3u41V6pQ56IgeGigdVawZ5ItOyqpVn8e2sf8txTK1OuRZE2nA2H5j8dCVtK6C5qEdStMURv7CsyvbxwP40iv/8lKY9dLBGInJRT8hfPpB94l06+kZUHg4xmMeuQJIOtatMiCeZ8/Qz6r1Uh6+ATrn1L7fsjBKcg0CTD52e3Fed4oHE2PSX18WrYkRwonvH5xHjY1eUsnJNm0HrlcjT8ERbjNUojkxQQzbHC4axLDfIe0RV31hnP0lwXy/vekZQvG+aFqc609cmjIQE2pflVw6ebTpJS4xKUxgydwgeWLzs5vhTi5BcoLyy7D8Iw5/SoSwWInVErE994OmqkxWofS+cejk+IjAQoCClNGYPDxddWZWnTv1jWbt5uCjyLhkqg2Tg4M7HNFJMtmuQUmuyJI46JPFqBH3rKWEsjPInqWxspb0ywotnhK4Z/gjJ8UReB9YH9Haz3KFtX/zTvayCC1WSkyLEzM2P8biucxeZdS2txtodQ2nfITAdrKtfas36PrFFRww6XE23U7yAhysHHeyXnFeouBsmx/ES7OMqZBrYUUhtkBT0GE06XqpDGFjLLS9VWsdn3A+HDNgbYeVhDgswagKx69fO5Vjkdn6VVuOZd+UL1QQHVRidIA5tDgzr7NNznLDnN/H0WIBP3jhU6N4SFwztBRHhS/uSGZXyR91mI04rtBckh7Wily5HTTF3lCG2yTEsPI99Ce4XyVLZbbAkXPtwrYGwXM8aR1i6Un6IrAa1eel1UQ92t3UMd3CH2zoJpUtqIvZFxpEPwae9igpPnK5AuAxatM5gydVIw+G6Ozj+xzOeKZRFTzKbDnh+4OVrC6wGeodrgG2ErCSA0QBc5s5MA/W4OCBmCjuUNx/iWzMpLY9SyAz14uxRraM1zDbR3XEHNYs+xQeQtz0Qr4FoRwtvWTka3dnLGNMi/ReYDWdG8ApR/meHNyLGVBJyA4FoU3Xa/JAE71mkjBbKPzWirEJ4C3ifS9CKfbiEiweu+cjQnoC+UgUeaDaHELkOFMmUORzgZfbLbp87XQ0CBEt0pkFfehJ5qA7wYKepAxfTzX5+2asDz/m53pB9wYMPrwUU/uLJjIhPlMLQbYkr7dXAUuT/uQhuJbmDZurfl+N6vbVlS3tH3WD7KZL2zAjPU8pS4RMv8/JVy9y3gP3Kw44EwMLQun1h2QIvlCbLBKslTTwxXXhQDmmE28vQmLE8rDf+SrUX4+urWREqVeVacrbq6eaBHvVxnf+4zmxj5Y5PvKPbB7UgT1dA2bmM4U35C/HKOetGIoT7MSQYLfEmbbXtRsa2LboZYyVJw5tbu6rxc68Y51Y8My52faCQvp7zX4YyMjzK/XtGh/U6J4lKfSAHaUIklMIn/eOJmr7Hu4XqH0V1qvVDaN4EQQWPoGL5fe/9/ci29fVHSt9EtsH5CWl5Y9VsAweZHLjLwwm1LzYXUjaP14pKATuxZcM5eV5Kv44hpc7rwuyDHLxXVcE6A/gsk+b7Te9Z2KyO+oe18uzhg4KdZGhzWDl7L1RYwXdzcDhFXt2LcVYHYEBd8S5rQT9jy31E2ZiLafe9PEGboo5Zq6fneWmM3wFlMx19bXns7x2RpYQynYwdfrkRCsEQkNnFrNXrU9+GY9h5fQqa0JvcjBEmP6KlAgfDigRuM3m54K3QsqmX+/aWUor4NYTjSgf23oNpB5xhYu5SCpzX/jAzg6q87cD/TU1hPruFHKOg6/KRcegiPxg9IYPhMgcxlkOXbw4Vl2QK/on4H45X/JVUcVazRAbWyPhoRz81qp3cPyzOoimympWk7DK+DT2ehp6dq6b3UEslZdvZAR8ldF5j3ZQ3nI2j0cpqsWOboRsgb7QObjU9dJv9mKCSQ85urdkbLOIouBWszgpRJ6expj+FXmngG9XjbmYvhgOEhJMWHOly3k1VLVNV/8S/odUF/ONxOnFuJdUsamrQniG5GKutego9zauWLOhbOdqb9xKpqYROMK6ZGPJrWoaOiPyoyqbdknohYrUUA7eZaZEIJwqTb1iY1kpK9mhTI1ob9GgVI1dr6gBC6/5Ry/5xy+O3y13vPug1Bf30gr8lEHaOAsEgTpvAX2GyGopyon+LdVUhpqO1s+KPawZYEKzsT4VNHgdj/eDINH6rddICCE11QpOnPxWGij7wne2p+glXV2bOMVN3Z1ZcavlXgllQb65Zd0ymEiKo/pEa9Ih3WyZkDx5wG+KQXRq1T+r32nl/ePC2hlHxRD6UzmMFdLJvROhAla+eoboc1aLwdLJiqyhsZFoWzyixVtBKEpN6ippvIvNE6R9WccodrxLoqR7fiBXSXLdzzZWRhOMPrnQxabgSNwetPZcQr6Cd01ro6VbbgUFX9an63u+dZT0oCZPn1HQQkPZ+Ypy3UupN5Cy0SyKACaCd86/jA9C9XwMJ17iEyCpKadL+ItFlrLTypdTb6Qdo8/77Vlyr2gH7ZTGAz+aqzy5DLv55xp9HhqH9UH5+sE0vT329Ef+zEjENBmmhaQ0ByIWLGD5jI1pLKsOeYZwm18ZPhikCif7NOebXz8t7SspgVupY3C74AWg+Nj7kNuVn4NTjMhQb310pWzt/JPhQFlv/3alu72I+/ZwItAfHrPcRrAOWCbenqC5waknLkaDdom8GhUWNLYMBYhQc7qh06fCVQ8FsmJDegQyOPzrB4mu2UHBdhZ1dwy/JbZAYxmgLOfIG8t+hEZWigfdlSeLmHqhuLU5iYevfnaBIcePJknp9kMWN/+udGMmBKP+ELklxuKPt8m9pGKEDnk0pl4WLrsexCAcfqPNKPnhgQO39G8RHiqzsnytyDEIEAqtwUvZVJK1pfFSXtOceJuD2KZM45CYsAj7nVcsaXvZKAw1P1p7u+hnQzFCtXZg8fH8aOe4/p34IO7+sjKF/X9hc2qW+I/3hlt4/yPQFsqlc4VNWm1xUmuPhspPHFzApYb+2O+3VShRms/u/Ok9S9OeKSefm73dfjV7tH9TxMTeiaekM4pPJ8sjjEWbCANwpDOlV1adFHNJYFwI/maHRFJbOMU4vg940xWekB04tX/h7Z1XQJN3EMf9n0oYBc1svkQpksGPDhJJ8yE7pDxkwxCzPwpEhQsdUCXWJLsRGliMxdDOwT5qr8JhUNIc4mBXm88bKDmerohHJ4Wx1XBe5M2jaOHCxeDdWkWMZxHHl7fD0OQPawcuGU9hK8NuB/CrML8NjPHDfDxCmCXyeXtxQYDkdb2FWZpfbiyvFYdIZKi1LBNS8fbmUFiZpI36dbyqwh1DnCurcMPn9OWpxMzqU/1ot5ER6xQ34eqBgVSf24bGQrNBxFqxwc5v02Idos9VxXj2KlOYWzQ9CO8gxoYM6XazvwLUKU5R/e6N0rRM5HjB1eQEyoFDdO6KIOUyWjvMfob0ldCidJnu6BYjmFk3YDZZrmuTj/uGOopmIAzpbZFDHzVVB9p94OctR63IrcriTiKfYygApgp0NTeuuVtbEOFYWwSHpEs7WzpENbG5cQIEASe+/eGXlC4OSzwWSbJUA+GBKVxfPViDVMHM7iUceJSu6qRXIHAxhpnvEaZoeyfGaLOq/b51ddCTtua6P03C15nw4JmVdnvwqeMMo5ZF2Au4DW5XFEhBlHNTjriv7HZC+JjwbtR7z7g+bv8qIyY6zz2IriZ4JB0r3ZGHOVbs7wFjeeicOxdkbHEtYOGAe7mEIHCdh/Eh1akvVreEBx586tKOheg1OI0djwqJM6miurF3kAsAfiq06QyLRPHnP27QegNqpQ9mS1w84v/GsOzaVtMYDRlvBKLvI8Ey2n7eO+OCKFjjiimocIgA5hxFjlUoGHoLy4tRPxkh5qEqqMOKW3SYNUbhEk3tPJMq8PwePEOGunP2Fo0DCkIwuCAoo99zTL5JI7x+f8XI73kArKszo3gNQWt2r2ERhYv2QUzka3+VKutFKwjfFVpn7r9jpk2Xw6XD0ywE5+VgTe7Wq3EmrCZIlSm4uS3H7eEhfX67IUbR2R/Y4rITQIYyLTzQUGfeEV2AmOgs5Tj6iDJ2Mnn7aI71qiEHqwK2LkkB2pqIPclt5iguFsqU+Zk0Pb33C5GXKETTLCF55DsF18iK/LThDBg315OfxYTvNJZltE5bHvervfRI7Fn8DcIxskXMvkGFAqAyTTIXhMNih9r6tfIgnSToHfwjj/Dt/TUxifAdzFJvI0DiZxW2MkeIbmkUWwp7Kxzu9OO/kVHcwcEx0kTjL80tYAorDwfPMrPEe2ZxXl8sCDM1kHGVrtLL6d3e1lFKV8n2FQg8t7qtezFax8DdXffFRJ58ZOwiosGnZvo7zs9O6cWHNlkkGts5NVObky5XkfGCKeHN4iaHXATiwIfXy7qAFT/eJc/NsajHOjaA1hz20GcErdFVU6jao3AV0nLTx4hxj3UvwwBtb6dq7aIwoj4zzrTUZKgveyWTDSBbXpTjMolkJ1bu5hoWiCJoTWmNp9iWufS+IJ+2vibgk66vFAVqnBWfc4tXX8eo8Fxf+NVeUY9jCoq8maiYVBzvkiAIC8VWmkDv2Tc2fs2bYVmR+WDi81hoc9Rovgp1eA2+eGB5Cw7PbHLo8pf7UfjZn1mvthwoKKRpuUahIz+gx9gp381S3wbTKe05V6PrsqI4G5O5V0KaKKwKFEiJj7QRtQ7Ci7UcEPanMf6arYvEER6fsO/T463HyIBLtQ/ylTPHxmjSXK1llvCmsxk8cN7/IYMv0xfNlMwXTisveqWIUsv5HkZDKnsrnEFVx4Grulky+XYd3NoT+aFhzTUGGj0C8F2GoQX9GJv71EpBSR4CneHTt2vM6kqg4QxM3dH7BdjvctEHz81UWpMPUdrHgpqpUG7q21Qu1udT3iPXdJprCNkVp91d9eCrFiOlKZlJxeroFWLgaKf85zAx3JU+K4VJTKes4YTU2ihL2j2kzD+WdLemw2ESrD/+nX1zOK8fP/LKHZlcosPld/bt/CMudDZ7eSZnwgt8oMV6Mt4+RYM99wnM2n61DfW962yeHCXDrXjKFs2oeKe2eZRUZp8Yqy6Gt/RlRkRe8VnXQlk6mhx0dU3OhWjwf828QqdTyQEDFLmhIHoWNy5w4n/x9YFVYgp5TRkmkX9h2uvKLRPiMj3I7oEgjDiv9dqfEmW7l56bsD7EPDzoTA1PPDaO5YM1KQVghgV0eMe0yYdDeLEJhvN7SLbzxYyluoQnSZr3zBmbuC1eyv0uHK52rixaxXh7xDbmZp5JJIzuC7mJ+NqX2tke0/Qhe8UHON+OIRI+VVdmPazLKYr5y/jo8Qgz3ZLwF+kL+Z6MYdNIHkthNPwJ31TRmT8xOhmt4+Z2DKvgYr2uQRHh2wrXWRAAhliCwP454uEmo02+90K1cHwWZjejFtxcAGvAYzmTLxt6bldnPDOhcmeyuKoBb8+9nNs1ZbQ4gNn3j4r2tlbJ0u/2aFyw+/KrtQMXnV/2rd+umyX9hge8199+nYw3lDfgitKZeJEt0MXrUixiZuWRZcqq/xJ7JrXL6ZFy6XNhrZGDn7Ju7qHhlP9FOr3UrmDiqEhKe7AG6xaH/mlmBth2k9bsfExCFpu5ncONbdeuRmTh6qLwY0TYJ9CIZTKjfgF9LllY+JSsDjvAci4d/MkmzlJ3fQHEncexdESH+0UUoILnkaE4jBoXcllXjIvJshRh4szPGFQ8k6hnTWEvO4iybboKI+ZXvimlU8daD67cYMvqYpZm8p1eN+1onzw9GAARIASNz9mL3c2ISW1GXf+41ruhYs4Uw/zGGEhAXJXrVOtjpi2Fe9BeyiHXzbqpwVsiXLZGhDGneNrV3O7XtJYHq3PKvL+P1BN/ZJ2HqDgyL1BkZN+PDXhrxRe1jL+Yv18FItrjfhcXj5wpiosjJJeBMUYc6v+AKxx4os1ZZkPLjCEqvBUjrxeuutQp9iXsOqqFV02BU+bf3QXlP8heOGty2EWwzn+BJUQXMx8fFIjaooRnlfVkTRmWOstpjIelvueBXvdWUxZphCP5BTp8CyeClxEfJshwuonnRDDy2EkgjSUwHXEsd3fEz7EUQYSpDhYOmPeUpM1Dln1Y/k5/ZPaYRO4wH+dKspbiVOtYHky9zMcxE8dzyaltCd2nKwIezY60w41I7KzlagOO1NRiR7PCa9JYI0dp5qAeLobsgQSbXj0QX+4wF4kzqpIObZtKEpjimLZNPnlCKguK05UzHOqcuJlXyxNjPM1qkytlAYEycozGINtWoYeGucFQM1MU+XHefpmaTiDJ00EUFRRpA8i0Jozj1UDJ9qBhdhsOgb8H7X9MgTonu7bnepv0L4tscbtxCTZwejKLyrfqYXQS5CDWqwtKs05QUZrqnTzxu0N6W8qYaVuLg82UY+o3HaH1BYHxM2ZclmfrwgTkLThG1QELadOka89ci5tVvjmhpXRFltqJiALlY0OGqIEJa+V5CKYNVR/Y4VmL5Kj9ueMWowQ+M4Qcq0kOqm7O2udyvG0Ilg2AqENspkwNEltqwNgXlqMRxLEImYsH4Hq1r6UWEMXrWoMqH1cAPNVhzlTse7PzRv1xytVqWuG7q2PNLN1sfqxunwH5oytdWp4LIwtkPNBCFSXmiMlpA/5Tom1udYX17CWrS3+T++KVPcKwYfumevZAPwqEtXeGGnHmCbtxT00aJ379t/zg10YWdr0p+sLRJ3gCGbSFPXyT8GaeMGcghnRK2moghSLsBUs3cG3aJ2uHd80t9DR9tV+2EEyXoNrfH0nq0CRElJ32nKhjOuGSg1/DnAV+bI7DKRCnHzITLb6BQq0Ceq7tQ7pSqlF/CzvZtnE/qrM3p29lomTJPLTZpzBFVdfVpcc8xYzLYPJbqr6bAekgK0nUhiPOQx7/+yQCyXGnljhsarVHNfc5PENt3NSgCbBAme3IvWBZYn+K0fcOY0KcAvcX9lPs5NKXbUowuQeJcxCdIcmyW8U6c6se3xJSZke2A7WJMAFafk6Rc2J5qCp3b73LSI2mG1MNGKidkOguSYvcdZLvwsWu3C4JelDFmWLV26q9wllQppB1rOssDcgKTQx5Xopw9WHZc4+4CWucmW9+a4GBbjqQu80Ec7PchOCl1kAGKofBgjiN2G1bT6kPt57Yf+q06wsZqeUyGxINeArHLfXB5MXYCpb8aKkTMNRFebSrT9GPQBcsY13yPc3iYBg1B7BgzkIj1LjwdbzAzmIW1srj32e0KVzk+GK8TDAI8W9FGDuqINzNg9Ne3gvFQg/19K9lT2Nl6ad5HD5Zv34tstMC9gEsm0tN8bnxTFyw1txvxC1skXZK8GIdtOnskgOiObU8he0vWGTkHX953FEIhc0gADf+87lf6CPHNTMned2pnJTSD/Dkk2B0mlP9ax0Fm03UlnNUmMJBrREhGu8yEcf+Ug/94kGRdIV/xBNJlGgwb6UgQfIWVB528K7f5IQOqpZXBm39ChO2fvgW9sGa2abyaVxNzcp0pmExGUl3g+XT67uB1zuU+idIa7ya4BecTMrbqc48rVgtzR6pnwbfalNeZS3fwAu66HA7FhrEhfQQl1PZrs63jcX8JZ+zWGHkz12IZekHsALYCJWdnywdLatKLMwJs98E8Muwo6U15wuPeTTbrGQaP22N41uO0gbKpFs+pX5JK33QRuY2l71byca487s9Pdez0Af+0aMsEo7ejhBUXPgLBw3ywFN0Fo6tQ0s+hHenWsX2yC9vNJEo3LSKiaJ+innLrsoXZh1/pRP7zVFn8BuapFxgkkbNPyWLWDNIpaqph67mDyZ4yo9+8zhr1vZTKjxHQYZC/Z4Sy0F3aw0C7/PvqBiZouqU7Xw3DsxlhOSb56yvR5j7cvJffsJ8xxcu1UJ1/7V9metFz8rvpyCF55paGIBefCfudIW7szzhFCl8hvccoACeTE0bZsP/piK7FYycPfarFdTMRNRDXliwkN5/AwIi8nMeLFPnYRoED1GhpbM9Jf2xTXBUHcaOSPcOixsxmCwFW5OqksT7pJ+7MkUMR8Yx7pRMiSWWBCa1/yYE+4Kx5qAU+8l7bU+QCHVMOF24YPr8PrlMF7WEpSYj5eR+ygCo/URZFrRfK7HcyI9Ewur75vXlw5oZsNeFw1QfreXsh6ny7PTnzNO5YvuyuDL0gkkOFrkLM5AxaTMdV5NOcNXnrournYv1rlxA8LIodJypO5Kz8RXVrakh+cUhB+F57bFAqmaH1ImW7lw8n1XMmvDdr/38x2i1kcO81Y9xpmJO1e8UMe03v4aSB63pf7w2XVroJKA37Lm2/NPpAHo6VDh9q1K49FVlrr4R1hIAgnl+L37k/0IzCpu/2xUgCpr2Q8HzZpEKRZ7KjMcBOa3OFI96NAKHU1+Q2IeE0GD4Pc9bALbVxffjfiyJ3/pne9+/pgvQJ5koI64LWRqn1YXjZJjI7t+hTmyz6xDxUXFpPk5EGVFZLnwN+cBv8CUUVN0fBojxaWZXkxaqdjNFvSL4zTstajv7q1Md7+gZ8SBHuQUuT/KofYyUTBvijSueHyMbIWdKSvZNicgcyGTdoJtnBQlC117L693oqmn3iCcVMe1W8aCG1mIYti2/F91GrSrv8TYcYN5NycUign0p3tZPtiIddDHhoJu707u60CDrMQawOVc4NrrNh1Q7JOYzzkzXY/oZ4a6iuOtbcuLDfYg3PiTEsCOL5/auveU3dnBAKv16uZR++LNmPefkDdxmg2+obx2dLbBYErrC8k2XCiQ3cNxlp4Tp7vuqq5qk5b8Vl1372dhiT7MQE0zGoOX1Hx5uLijAezSOCD+vOtAcM34LRyDsO4u325meCeMzs/LtdsTMIa8c2EfMnMlEKosNtQZPnfQ6JPwtmMmKHDlCcHDeiwQrc5x58V12JTZnwhNO6I0DX/L5oFG82VQN7ek37wO/p/rHtj3wvxu50mrmBpFlnYOcxG4wI5WpEk5xSKejqVscfeXR/ed1N5l+AQG+YXLJpfqUckg3r7h+Mulcto0mhprGQRAsaaTun3eF/nskfK6kgQYdul9hwfrX1clPW+PMubF1ip3Ex046mmEfKeETr8LRG+fgnCutpeMl9sgbcTxhfnYkcowwY3cJso5Eq0xzyuTQMuMuX2dRF7ukK+284YaZ2ijI2Wb+nq3xWm+fVcIL1ttnfY9Mo7Yyqe+ewzb3wZP5ksL3ogiypSEYFS9Poui1svcS00D4zfGBSoSIcWGnSG6IaJyS6H0Pmg2zcWx4r6k+kRQtCMj822N5jAlLLWss1B+BgURK2FyZp+DfGLHcxq9+4zKC8joj+b6jbmTRG4OjcFjkI3kXQjeimGLo+5c9rgcLyDHzxh/s6HpLIPHhJQBGizTiHdPyLIBg7VNCv0aIKSYScbxTVAkQ6lICQFd/hnEzJ4AMO7zL/jJr98g/PeSrD93wXtMSBUERa8hsVr+L/nh2/WLVwQG7i8z1KOvox1Ikmx5b54YNVFRoJBCZPsvdi5Of4jkNDj3mzRNQCVXY2XfSt3dXZEM2/YrAQODXo/ZV9ecpsl8lal1rcLzBjPuhjmE4oW5ApOtaZ7mpmYrlnTOyqByjsc4Ji2jWK5JpJcNY+nN7FlCwlmiHJ5mrcLzaeV4mB+R14+ZoWrGC2cmJ0GafvcfNZ+ol+x3rHBXgnFkqEbOar0w4Uhr1uTVCCyKjEmbOZs9FmU0qzDxkdMnMagcUAK2GAwoGdq6dnpki2F3HPnFdywE1m7EinBtGzb+83HcbVIcM2ogu28MF8dgeN2yyJsbt7tH6mWZtp6q5NgbDpIc7k+4Nuq7EfBBACzlQNlpqdmNeRDWAxF3lSpDOteX2cdvmuBY4mqx2+KynVnrkcmCkQFf7DnZu6/ta0rdxlXqzEBfnDnvbf27x1LRMO5gTbmFsTJQiq6pmATEThE15FcoxCRC7oqG9GTBDwUPEGRQhcRP2MGwp4zPCYhHudxVhao7Y+P5YwQtItelkjqtm0sBuDeUqhLo+9q8gs5bK+o53dpXQzQa/pEXfwWBI+6UQPcD1U5J848tskFIjgoaUYK00XlEJqF8Mm3+tLomBEMmDiK9d5ShRIKdnKt8E2eRpa22RxBonsWG9jrWBRU1+rSHU8Wr2hUFLDbMcCM9DpimDNLqJFX+qebqqrLaRwmryWITtUKkgyeO3NaK+2V6DiRU8JCPdJc/bsxlk6h+Zeq7Rbxj3YkXScRUpyJUKhAgXIxGpR3w0ZuJgyL0wpPp0BuglATHMXnUoHxTRqNfCjbxi+0mf2agNIzsOoeqwTwZ++Y4Xd9bQp7uPjhW047+IgHMj61fbbRXCA4XyS1qgzsmnFzOlrdkvNodDRhctgzgcEqNfMZE8jJRpsWKQSKXl+mjwu43f0s1nJbkc4jPHxGzAdfg3xn2/ulCqasI9MVJn8x/WmHJvDXCH90Vujx6AksNs6dkkOoyxVSeXl/BM+KmXlLfaOHjGUIJiSH2REFWTeD+wl3grS2bBTuHRePm6WCEX/nv18u78w21WeoQrJ1DKn0K3wgaTBiFFvOlDyxvR1V0LOuwNHmzOREKDiK3rlb9YMQB2BM3rys6Ww/T3BnO5UpbRal6Fkyp6jyHd1t5LTZHR8NZpoFWmSEU9xbh5/5aDrAJkZ4LwOc1V9WHSJkwNzDHwNdHdlvbw3KI/cHUBvEbC0i7F+bFFJzpxwIuqHL8CCg3PkHE+wgQqfNu+cn69zh5EZV7f92a5idAKmfN/wXdgAMBxoowL7vP6267x9lNsFnRt+WUjud8LEFnNLLIBklFVFaRBDxif2zAy8BY/rHj3CNX6EZTOm7svZjAJTldA0zpdIPdBajZC88iImY8gG2K38j9wvwgxGUNmEVMFMm9qV+SA/cDSHWmIYCKUSQtbUDZXl7utPPDuMT+6TeO+ZSmHFbf5LLKmhl8BoyX3NV7eNuMRGZnRflVbYpKS68t/RmhQzIlGM1nqO1ymIRno//5zFUHw77Irv0fUKNW/8ZBmaJBy+WMGrgDIVqhUprZoYBAC/LPSN2uEbEJX4gIDKucPWipa/MsQaXnVjrT06+peBOCeY7sM7X6mAt4lBkCqPTxkGtltMPb9gyqMnJA20MlHPYg4U/whrqt4VfYZWLuYfCcho5myGorrPb18RZag1GBaIz60/7RE+mYFa1bo00oIKoTLpNvbPxYuN6dlrjyhJSxt1y4v9baWwwoOoTi9Ek7VnPAbgjO+yMsnDS5rfoNQzet1fd56GuVELqjDhuezzXNRkdsqtCaYHI2QxsuaTYvAorq6E1hFJe6PMnb3aGysuWEgblnjUDA1ECBlbGCKjKUa/gJ1nQwJe+Mel8VXjuy6nUy/TXNZ8yNr93+w9LA7sJPzEhAySSxbYPtETZA72WN+DPuPfarIst7wRLIk+Y/1/AkQCV5BcKvojX5gWY+0mH4BEA6DdogAgVOJASjEjnNp6udjB+3k+rrBdRZdj3Sonh1hGA0T7Pk/iPlIMRTLDVZHmb/a1YpPXu35wMUJL9+klTb+z5EtQr1ixN7ep1Lovb0prFMaGyn9v3/+Z2DPg7lzjGI2jeJCetU3T0sZjin+6wS1z9UiG3+/Bjm6jMglZw00bjuVU2DlfEfwKuMSoSnAPolc3T0fzggWF3Y+xQSIqMB6ZHg7XQYF6kK7mt9Nue/gAhA/mQryAyuGdYA5COCU9mMAihMydjjxIB62KDGnRfK4a99lRFiEwsqW//cMuOBHu50fCNqZTP/mkNp+vwWEsbolO2fSYeYsS0CcuEXg6jO511+MLs1Qt0UqKU3hs3vfl9knx5cpdLzQ3PSLCQR89eHF6Pd02ysPbAr275/WZX+Ngj6YcLmYNu8y8q9L1uZ7ZUOZZ43eTQIpmmj/bHeic7gvrX/JzuiOxDSQSGkceg6DrUNWQ9ve386ZhrnzLuEH7/cds+OzD/hvn5sfAnoPs6Ijs0ToJFob2ln5/LOjMlZm5VK/Xc4oM/wzqcTjoG1sp6m0VeoeYcG4YxBMk1yOwNIFP9qLLT8PTCUTFreVhd0TQ+Ofc8sSsh1CeX2vjmCaiLMgVICiu8rtRZB5KRLWVfPFqI0DpbJay6ONlhbHrLPXTywXd77zOV3ImexDs98koe7fC6NR9mWx8kQwKmEdFP0s1+4mFz7DxrE4jBAPnb2ocNpUqV/gUdAU/SUifYFJNpJc3Nqj94ESvdjmhiGTa5XhMRAGhSr0XVuyq/l7lYCiNtchdB+Zq3PGlthrlASlLoPNF3P9psY5hGiR1cC5gAEDVkz1GRI/GOFtehfg7SQ47GDIHDSlddNfkhLxH9HIUvae2EjYoXVNBmJnO+lPb/sfFcHY9I04PJ9T2YZCtBhMNBaXwfFIgRJCk0Zjc0Yy7Ujjnh7ubvcH0oDYCvOpCnJXkf14UfEAbWW4C3HfprBuMi98JZcbM5n+cgM8q7FcGDRTc3qYCqTp4lOaPrRpoe08sLTTJf/Oe/COCTJ9M+Ki/7BLYEYSYxEfueRb+J13lCAac/uD56dX44GvaGGjoVX42DaEg2nsgj+zFyGNG7O0tq7P5PIwUQ42TM/Z/ZeGzKFl+uFNmRrf/uO0N8jO8XmbZvFMu36pM4dBr5apv/45BCFGcJDEUwR3b9CNIv3hb8jrY0Ic5r4fGQ40gSfrHjLuOs6Y2GG0IpLT/LafiEQ/ksf0cIbWVuKv6FuxOvB0CQNuD6F40Irc/M5QKIWVHgfcY8lwwA3QK+F/5Kej+Qx0L3HPdbilN5tYe4VG127SIV6FmTsGQEknZUTPi6S+dkksOAtbIKnk7QQ+O6589eJKmazi/rFCTAUbP9GqfrgPZbT+XXDkb4jREtg8IRSx67lJUj4Ro2vZVLBHdDjnkplH8xNKMqVAtKr488aNpb9xnfvMcGz73MbePrpj3MmHb6P5I6jNCdHSnIjDKZb26ZZNd7OIJwsgeHtcdOuIYGLM1yTA0isO7h5csl7oiQI0eriE3zKW9Yz0iFl+6GcHW065y8KrW/d/JiepvcxH9Ew3sZRgDdGcQqy0lYAbTJLsJX42eGXhErKyu1BlV2FvfHbhyZMo1vIAaTEi3JTlnCi0yYoHg881p06og6AFGkBwRQXZG5lCwhh8xUBvLNUC2bAHyxY/Igm8QWGIHuDLA1mqORrg+AicyMY7M8ql2Xz2W8fim4x05vv7+UrxPZVOAIo4MXvPGW8xkz3uN4svBpcAJWcM8VKybyRocX8vfACvhlqVALRFqUbI5z6POePefm7y5PKhEqC8nwFxDJr9aa2DLc3NDbgaGek4DGD2sHQyXDD9vRcmVte1EE4Ay6Zg/SNoZvwiwnuL72biKgV0Ces4w3YuuRI7zwlFMc+YU82JPjQs8smxarBAaWqAvuKADlxQo0Oq/xEe49Y51AFE06TAdh71WYR4JRMk7dQgW/MvzjATBtrrKAPvKDkQzt6rNdGuUFB9x0pIWmVB3p2qshFB6+t6mvfGF6Lgo3rXctr3THj7bIfeElkHo1bHG8SrUpxkClp/WjW/I5hF8NqJc7hsQmiuDF5FeYcFU7rJitBQjbQB4hz8ekocezQ53RrRniLNcPTXi8eQ6GGNMcSmSuWL1mD9ZS9fOEu5OgBB/XxibLoPnvhA7jb3eLn1dmSy6azFrjUGM6Zq4sdT7tKIb1cn3HCw5z9odi7lqiTTCvl5xDOTIiw0Ruifk2IykZtl2YMIeQf14J4YyXLP3hOmWUW7AYkYpqxxga8p97dWaSheL/Ci7PxudbZ3xMWF14d6SJam2vBdwx/ftP274g9AN6+75ffImIwSE2xSS4LN3yA4RK6m5xPjIwO+YgQsfWXkbM2RsQw3hxr/iuF2cCn5O3YRJk3EvTApmgyOnwtiY6jxKaTwOWmM0fJKGOTGNWLjFnnp5kdvTMvl09UH41luyJ769VLabOe8RUvuSsyk9NmySU088Idwlyy5ce28CvSlk2gWPi4OLHH0xlSNYCdlsuKQfmqExVTwOdPtYSl7ntj52/Q6B0yIOCEp0AtxfzS4y4fhZlHTDBwk+xv8+AjWQXGQWMBAmdTEhN0K3i8gHJKWl15RETNiJ9QOE5J5o6BN+i65zkJ4/LAOd1MenRFquvgKe2WLG2uRPsybI93wUfTXOpR4izTD7qM7P1gmS2I7lVV44u24q2bI2koAB7GTe/jk7qJzsAPuJhd6NVE2gkcFDOxp78q5VCfet7b5I12lYBjzIWmjV5mPlyibjn2A4tjl3YfLA2lcZwfZRyNcxc5Jcdycc5ni17vkGbYyy1NoRVKbgB0w8IqvhHluHIYb4Tvt4kqK5bzrxRQLI0Vmm0wSIfZ/0jw9EKyfXNwxWan+bKv3uZGTiIKm8SWHDphDy8FQL1dwfOjImarweSWLKoYc6lE2O5bggHK8fJ4VZrnqpA9em0XBH4yL0mECZ1oFjb2zH76Qs6RYWsXV3kp6tth5YKUhYXdD9uzqbvWqFXJ+6ECDsWwxPdgIE19UQ1A2K4spgteolm/X8hCkUwUGhIZv4uRVlptL0O5I9Cj5f4tdchR+qLYuTbNBjtqwly4z0mJ6ecNRBusZLh0IYK7zKS36IZZGO7A/vwOdMNs2YbkwPMaVpkEu4VGEknLREMYthbgshNZ5vk5lN2W9ZjpGxGgqzwYLPydW+Erl+5GvLlhVBMCaJ8xbFHlTRKOEcjHv4E90YQqZUyJE0/LogD5ka/iHsKIWOWLi4ClH1lnnWoxtag/t8wZEJDY/Rxehl3GIY632IcwFtmtBediitCY7xdKRoPo2LL9fBJdkBroQ741g08E997+GNGsu8c6cYkRL6D4lqIq3SAnY6M+V4/BFxedNqdHTrq2oMEM90Z7hovzhmMmMz7z9ssG2RDxQO5g517KO5IjIWPktrpm/xgjs9EX0/PhhZ8m75uMqLezElNlFjoHNsIHwP9vnU7jv2yuQmOWz3rKEdnFNRm29Wy6J2k7nnvRdisD19uzudo8A3qUEFUbssL8N0ETumMaDlRsOk8BeO4lkjFeycWzMSzBCUWWLFt9UIB7XIEAhZM62hoOwnO20q7ecfC7OPbeNb1tAoyLubkZZpvYV/X2McOJldklF0fkZFTjYewVp2cuPUKi8v2CXyKOPQw+EvxoZNYtDqogZFNPo4a2krJvZzrzSSQuWzEwX0nhK60JTc+vsxiUckxu+5yUz5X8kTw+9YXYmy8atb1vh6uGZFxgvdWrjyvRSPLCRphQTJVdPx3+2V1yuCw6IZXZzaTcRLyXbIHvKYpZMIUe5R3NppH2v8dg5mcVZ34T2xJht2eGWIxurDruYN92y8Kkd1zAbzeWAoRmm8nLZ7VSgmMeCws+KrbsWjLsaxRXfsVTam/pG7bnd6KzutLmRK31Ky0d0OcC98bbUZZWTtwzVxhtes5WrspiJW64a9qdj818+XReLe+Ez4wUZSvVwF8uNIkmQEcrfkC5v3EfcJBxL3xLqn+GR7GXERSKcGVCtBjF+4dOBY6XkeFuLSCSzGP2G7xz2WP2BajtjqpnFJekyI31oNao1RP3+3H6c5rF3zkvrIRO1nRtr/pAna1tCJWf8Iwzvm0C5D91lPMcVBx1yk/BGh91GKJw9CoXl/NJRhc+8SPveqzdoaNTqrYbUKI3Iz7UwcH1i6qtCtM09t5oIRvUQXONyBt00CtcRGrcbAv0IgW8R/g6wh2Isq1SmPuTGIcsmZTrLWCvETsGmYeerxcm5gViA5URCnw7Oyw7mV8v1zWYTBU9BtiXMr7Zn7s/+e1OrCahDbXUKXH3q75PmgSZeHFyItBuYt+dtjZzS9A/Fr3szLqksIxFKcYrvxV/Nphd0z7wSBJEtLHmmDdbUJ0hsFlUVVaEw/7Q2g1SvEOhWWOy7I454uL8/9MNS68f6I88hr3oIoIWPmcEkm007viUtb2O2EU8Ok5uUs176i7lU94qmSGjHS0N2AFbkq0cwVFwxMoPmY09HLuMTcCk6KaZmcA0IZM65L6BSEr1+T9ZnyOuCMKQbO7MU1mMmqIUNhRj0PsOwUESZegKhIqaAXhu0LR3IFadBC4fTifoVvZYTRvSZv5QYC/Hg+V/UB4Ki5qK3QAunus/LDHzq0+yU6MiOTDbz94DMZs5NEcTVVW0CtvCIoKWbCTB/gzV0A7V8c32JOhshxc2Io+5lA2yJZzlFr4xvTeOPYNzNSU2bCFWvKJ5nRh0Y56ASNSaopM5qyjqhe9vFGovMz7ZD/Z+kIhpE/lLJHm+6lVz2D+/i80tc1xMtGd8LrOSeqTytKmbCmrWG1D6WB4xJe2ErS0of4tnnpJ9PQv4Vqmpx1pKaADN9UK0qjhS2w3Enz6ENb2UhW/X00AazkQ9x/znpfnLSX+wNZk4hn804izyb9EPcfU56/4FLPjNnRxbPbSWRawbryWz4Q1w+J91Okj1hmdlCNxuvrl49G/chzp+TrifHnKRLdcXHO1yGkUi0EEiuUMQcmmWed/US+67s5U4NmsYcuB2s7M2tVXIxNxePEOOl+rFHU5Kmke3f3buyMij+zGlqITNdgbkVqM/wFKfB7B84TzqH5HjFeLdHK4Yf5tONURnZjZpG7j1BA3OB5mtVQKmEkTirxHFNTp2cuamJOzeK0DaKy1swDtiD1XvZ8tChMNLFJ8NMAnbvLKgqWXywCOjcCW7Jby6/egF6bkHyYjiJLpWnR2Xe2wYWxi8hF4h+ZS5cUNuv4pwGPi/k+hIWP3fhCvFlEONYHPiR/8DuYp3P2/Ad/5E2x6UsnMiu4tbOEWhFLuUKV/TKXPAFOXpasveyWCl4z6eboliJOes69MZSrvzhk6aQCeeG3zqpzVDbamCY+IhE8pdsEOcmnoI02UCbA1sV/VHl2orqr2TWw9UtI7POTSilTlUULKvmFdlMZaZSWU5OPkOpaE5S2UJTTGbKTzyvXrQQhiV4GRATVwFVF4pAmhtcQFEFV39OzOt7Mk9VxIVl5nIVARC2IsQ/xP3npPtJS1NxclS6dRXzmVIV9nPgpad+vzDqev2ZXbMpd+U+bnsXntLhiVy1taJvUnC4lWDl0JpKz7yhTcVlcn22xUMqd9ph2juV3UlqMvn3+rLExY6/jII3JzVtIldd+otxYjOWvOrAxE3pg27m4ZO0bxgnW6iRaiDpa8gfWFmq7aUGfl3f2NGbe4pGgdrrKScHnsboT859UFcUs+EPcfmcdDsJNuCT1lftFBVTNih0H4v0pdZrRJbsz+E+ju8RljKh5HEK3axzrfcm/cl/iPPnpOtJMDkUuZmaWTeobdcg9aHNirN7ofb1/cpWKOtLxB4PWwHND3F8TjpOlBjf1WZ5VXrrw69PcOMpm/hUr6i1KL3HS53PGWLJvDCZXI03DuNNYCGTY9A85i/ffyAPfBvC5zAMI6tYdLx5sIUY68w+nmVa4KC8OFsiTaFsAyQRJeC8XnHdvwmE0xEPLZtsxJAGW35mc7muuJzt+qSHkK85+RUoLT9PY8sO6oIf2Im2WZDiTf2uAaZs2FOPlu0t1J2GDEGq09Vi6M8DY7lSBJN4WtBKQIEh/9Px12Zjj5X7X2O7MlAym2m91i1Xz/DrX/C7DDmluH1ozV8Zn3rP0i4jtoJX2OHRN4wZ4RkZUuIVRTwjK4UUmJMOGjCYnCJLh+f5TOwaZ3dDoANzlkeG972N4qFCcWoE6DbPNpcmtGB49DkFhdlPQdJd31gYx8mZ9o4S+mt9xlrQRkTVytDDF6OILB69pvxyFpD/0nIGO+4g4Cu3CGFQcWXu8XKJJSfYswQqzBeRuyL35ML4bsHEcv+simJgx3xZYjqnP2YRCewjBPmK4f0NodzGmUjuUqiF84XRVFySLXOC/axXYZLT9wpXXUvvQS5jlqxnivP3biHsX8/eHPjNqWGlcYwViYfMSGzsR6ziHImwT8qxWKXy0HseCAPiDYCBw5Dwbe9w11ezAQoAnJ0FIABkSYO7qedCQXNZwjk/GcHNDhL28w26Zw2MHawKEnWfRS23IDeW4O+yYcduxos9Zc87sHks0SuoAgfFVMAIe6yZWJsKYChkfCTznoRDcPwbOP8Tf39ejxsyNL0okc9xDFFob0waKLZCDZM4PKHPPh+K3YqcmUZHfO5CSJ55b8XOYdCYN/VWw9YkGWxEARYAwkdwpYDMwniTtv69NJx3sLeZDsURUbH3VXLCbBGdYh53QGAJ6tkiwLGmPk8aCpdtQSUckgIWV8LMhWj187s4Zd7y/BFZA2lHR39ias8HlVu5oljNVf4nKAmTuuGsdFDA1UMo11LjaxHdccAVnSfTOD9XkXfqBXdJrMJALWNlEuVD5Evtn1X+mKwu6JUrelRmKMzcaUPy+4DAi0bkkP3PAF6GEOhDhg9ANCDHKwTq3Wxhxro36lDminNOGGMTSYkiodr8q1PBVaqmO9NL4gqejgl8mL/m4kqvyc9UdHkfN4RaMI8b7BW0Ofk8HWvxa9yxSrX45os0+XyDjofWnOpp0//CkEKqopWRDMJRET8uKw8zNGnuAglSlTItPJuuImU560P5mJbo/J28bkragL0cRN+fEvWsSFPC5VzkT4h6gPi4dwDV9SmlreATiWXNTNjiko8xBvJmPxFnZ7lzCkRfaqa7BNrg2saTssrhMUvPycK8W42qpdrtzQQpyN4oPwIuNL4cIR41MEDOlAPKA+CpftDiFcuOAIiJGvZkDfwYUt3finxljf8+X1+9Ji14zX58mdoIHUl3TDticVEzdp3f3mldIs65Id/+HTiqEcFaPp++Xwy7f1LK0qGis/Q4HHNJixd0edRcNUXSyXUHhEL7sSHwgNJwhFQoxXJcXPzwy9TMIoL4BXyQjhpcaCSUH95Orw9iq54qSATnQ14EVkLws5hDTNeCEHWIqEWxWT0CrtfYD1npL95jn+xlBS6p7luPMm8Gxu/dbQvljO9eCairyS8h7nStKnHdqupKtPh4w+D3fy2WM9ATfNg4u27+cwPOa7aZ9HqXh5Vi3ZIa143Ih4F7GANdsdQnGFFsjhsK6IoTDjIjGx4N2YHu1lBYE7KrrE3+7ta88fuhqsSsuye+jgQ0ysac7omQFynfnq573cIk/wjhT3hDDtlqMWBJmxP2rgM46hO4I2FSBkKKnBRL5dCRZijuT6u9Urg9SInAOQ4U2qyFTiB5wmmgH3z9Ad+HLVbwhbIHtR3wIatym0uCXxkhUZfmZ6/fUpLz/pSjgi2n7JtYTdgqc8HhUd5dQh1qv31GsWIhtp3hqqel1+9cTwgo4Ue+SQpMr4Z1MiYnMZYKix1DI6aTARS7NPFfu8prTbK1znFJ5x9gCDLI0RFF2aYb8LPrKCNkOPdxZj8hXl8b4chVF0sLZh4SwC+BDEqDWa2ePDX5wuoZeIcUc5LzcrzsRCnOZ4qjQEXEswGCbwFVQAFWiax+WXjY47tAcqp5aFwM47BgkpoSuRxuMDk1Um/6MeLRoYff+KKDV0KpD8j5KRB89mB7GoJ4x1sOcnnMIf05z2HpnZAdBuMHkECZxzxY6FcQpvFUCRO/9380jFQa/ZgAhR8MlX+xOB+IJhQTzdyUaVP9pUgaPW1T/vgcywavXc/5h1i1mFs3L/fOn/uW5fb1GG8VpLSfpUru1ClvyrVcipB9Iomjiv/zkvUJ4BDofACfh+Dj1SIVlipseTXcTYDIPJHUp83WwaBjmZ/AgKK8ZNhevMturwgC0yuu4buT4doQfr6CoD27yhrc62cK/tyo6EnHwLjrXoWohB3kMHhYQlCYSCULuuEdk+CTpK3azRDLDsbTrbekajYgkDFcd8ME09Lz2AtzqIQ+dGws6DHuhukQBsAgVtQHJOSFga5yLPVlV0GW7EQMA6cStqlZRSGJsRtI8Cm4w8DmWIIMIR446tL2Fbnsfc0pqxOZ+ICuqHqZj7Et31suARHUTlkMsW461Z9G19m161F4Fuxo+LcSf3Pw6M97xBxxhayQFGXD9Sw4ho/wU6l1U/Hv6V8XQHH9oj9rg/sofx0Ff7L2LDp9N4BL1rWXMPHtHaNBMC+mEhd6C4cXL7Fw2mg+EWecXmllDErSyiJeS+syWr3uI0sYQQfYPc+vFH5vZCUAuoZdVRDsnlEqp8vs7tR7w8diuYJzTS4M3c7hTTd3RD08+rdYlgt/VsHXIul6zGNy0vGxEVooXphbL9uCtuMLpD+XN7CwTAdOcWWdMCu1whorvVxi13Q2ZkYIsqRA1Sz0iTPRGx5YW5aD6rJI6RD+N2gJR/Q0wP369pgEiJZSj9qswfo1NN4wXVHcmlCSTF7g9wCLMfE5/OOCX/ydUS7bv8LPG4IIMVMIgupqBx0SpD2IJnwTT4GkR9YxxTnV8DRdjf3O3ThdVWI4hknpok0QvtUQ/VQPpcjS+ew9kDu1LqusFU9iYFi4KYUrsUgRVaiazCQz9uVZGelcSlyyFvvhgxVNKcWe91ppqW85+jv7au0Jsv24FpPFzXaVMiU3kfjG8+dI0dm3S81uWLhy1nFzTQqI3jhBzK3FgW5jrh56Zrel5KS8c/aiSkNI7bmWfaEeEh7luFGTjeUKsftrRRJTN/7Ofh2Up27cLujMYDlBrUxddQ7SoH2GRBDzYAoc8H48993nRqEoCjrono62oQMi70sQXoFIKE7jLqm+T6kPu5T9oqUhtJrpGV2xBZmyIZkQqBhR3gj8gNHEUnckeddv4D3IFhq1tQBrG9JPzlYWO8g3xchdt6nVGJIn7WQ1WKZHcty1wweS3WmD4x0toy4W9fdzXHqU/O8KMZ4xy+IjmqcDf8Y7KniHijiYmWqlEWzdE2mmWdha2BgC+WGSnGfElTdvHSz+fUy4d1Ev+x9UYFqQZR/9KK7f3kspJzQveAP5hk9Hiq4Inb/7hyKq6gZbWqSNTuxeb6BAh/njnEyi+lmOwe/BiKxn4fs1asDV7xRY0wRHJniTcSWTCCKYdtZBD9Z383dqjaxIB79m2wZC/P/7j4EnCDilyp8PHglwYKnBQAJqAp6AvxlFc20hnF3JNhmvJND48A+DH8Gq2sitchWCD69791rztBgzhbXLi4Go2aOZ+cG95DcpisQKSZoMltoJ9soUll4882lAkGfYJT3EMGhPrd6xV8G+m2BxedCj6PaJrQSut4oZcmNZCItdb5VR4GGKy5DldlczaUDmuMwJp98fLbNi7nhpwQey7H8DPlgdtgHg8vQuSBfMo7c6S0+gySAB1xFnCmIWTCtxR2OEaBYb/ZS6IeIe9ftYGMAG2sWjdF2U477gM3BtwmZbwUQeqED8KbNGKRczwg5nI2igckILEgS1hRhsB+8vTiKIt8TYRGc2hZ3ysNUHuXhldo3bJP0x33/PCfeZusQ0tXEInMxWR4LKFntZhUSYkn7e0FdGyQGQS/v2GeE0jSKfHFyVRT3dH90lf2iyMOMRJPZkchrxgHTCVtrF9OQpZhK4qmeMaiYA6k/zpVloADparKkTb0P2DmeHOK05EWLAyrYdZCRolpVPyjPdKjc4PNrqzmBckLqN/FvMbNXPl5GF6uOQbtyzzPb3YPChBhaW1X5R3Q1BXTrMuzC0NJk9v/azYn1PBbmss8BCREAvfEFpcqdyiYpAaCBeg6CVZxPKhHmGls3dJukATRJSMzPyUdvu+yzdgMTl3mkLx6YWC8L/yL9g+WJ2Wx07vmUiUP/pTk17f6qEgfP0mkGM23LyhWpgt7BmfIZEjlt3WFKtuWKJh+yMGK/YiHX33TPUSzfR4v6tQzHc8aECUF7DKPxscm2cVCOQfihmFyhrjAAgryrgpQq+YezaFXLenqtotWYhEd2ETBElBDI921GOkbVsfCJyDCsbxshEDuOogTGdQSfIpbRHDqHd2gykgHchR4Q/HvvgfNA6APmryEJj8MLd+X8B09oG8foKP2UyxvXpSvm8j8amgE17SoMgShrZEmZdc+K0/BwgBeOwvAOB39dXjKp+3n5V09E8FNNr8a7EQOsmj/CKzJXmgdjlcaeVhhAkw0nBRAXIQKnsF+IWxJqBkBJpBoR/1QcLqdxuUwx2hfJQy/4rjxBD47l+kf5vxkzIUZwBWwPXArfzUa2r6IXUKsqYddABpDTXJULtx/kwr4bDCHhQ2gbaDgieixsCMdk7lbJ6ayviNGYvwXWFqP/fWUV9pj5mn3ZZ+gLVXB+ZAr+lT/JuD4rj9FfGtNsXUpzjSfPd/nDlC598TARPqYdPbonZsGdwEXqkvpWKzfvWvuCtArf1uIELyQAWO7b6IOaz5IQlVhOBb8K2TzKQHI67CTERdicFpUk7s3yRLw2XNXtfBVQK+dROACRso+ahmL9BYj5ldTuVbpe299dNQohhFmYg70FwsahSKbTV8uIy+GQ+rSHG0jxjFkyDMcOzUq0YgIJOB70DtUI2nF0wdMoONblXZz298gkCtCXDdZcCr6aIyP0cVxnCOFvM2442/gwS9RtSmHmEpW/DvmisuuTSmOZLojMPmBD3RBXkCCdpXi6526hgq4OcvpfkANTehBUel4FHLZ5vSJHDyTOXWajjjMcoUWySL+IzfqJ2eHbf0JwauLxgiLOiDRi8TaQqV2NVW2Rt3qLrx1n/sXBbuRLHPU45FSznjKWO38GQe8aO+Yq531dgac8kegSgg8aHEs6TC6A9ZjZlPVdKFSbn2whWFaY4IIrb3ViVhD3qO6w8dapnvqia5cqQ4WGU2keqnDJEMMRz1+x8CTYsnCFkXPEUlFo5FgWW6V2EHAt4ALiTsucC6SgwgPYm8zfDtG58Fi7UzLLqbJrCKbkl1PmG2/XytsVugtl9BQesH/MFO/kNeyuQPuxTK5P1sOZ1t5z4wi4MUFwzUUvWyR6g1m1wOpA74m2ZnkmRtgE10C0YlY/kl1rVkSF04QN8juRF7YjFOao/km/G6v8uKn5DAwYCGg5DjGDLWvjuLcOBo3sJsHq4a1jYQNeFPoDWNdhtKdJyR5LZe2SUtXe4BPGGjcwlS01cMsFQ50FRJh9KpO1Q34ozv7k7fMx/tuA2pZw2XX1xZql2AtPYnJratbwsxZVi3Zn/FDaxQ1jsftt6/fX4m37PSdi97mvDnR8fpg+F32mJkSBYeJoLeNzUmmRcqJW78SKRnbEkkSzYtFQWs/yom/YBO1Rt1M0qm9Pzylmqe96MPM3VfXlEV2YvO4gUI1mp1TMnzRjsUDudHzg45pVhpTh53hXlxNP3L/l2DXp6wFq2dixQL0BnvF3Mf36/sXWqBnkpkhbTrjcIu/ilUCcO4wI6Ro+buDGoOV2uFdOAvHgyTYU4dfCi3MJ7xxiwddx84IBbrd5DXR4fevjZd2hlxAQRBZjVftLeq/DSoOtdRwv9nyqCBUbwzi6DVAyxM8ohBToH+xi5Q+yQkkzlj4JeUObv7w9OgeJGDp2SyMila5pU6YLVyNPkE1zHUBTGxna7F25d0KRXmVoZozT29z9rfoVbUimXlb1d04cQyhcyRTD7YJaYkZUy3ArR93SW3C8xtcI6YEJ8acIZ2UcLyISNeO1Rt9yyy7FktStWZ/CtvvMDo3SMU8Uc8KPq0hA0kqvbhSXGo90p/PsB/S2p2u9qp0YMmGXV3crSaWi1CyM7Z1vn/IyjRTkpnHlZUc4DdlU5y497SHN3WUCu94fvLm9wOtQT2tkQYZfxi4QM3BmUeZQ6HyetBodM1/dS88Yzb+6Flbx0/4yog9WXFVc4K8nCfbftb89hYngaLVTQaOCKbFq/pplGQDIQEfggG0l3nPXjBEzBcPAMC3cOfuUdj9IyOKtLCOyXNdvUqaIUSKdOlMYDQrkxgqezuj6bOAtFN0VZIFoD2+jS+P9g3ZB//7CmU/SEfly1P4O5/lUE234zXLukTa/F0UanNkscutYXHk3eBYeVBwmB7jd4C6X8Fo7c+KEcHjTriBsrl1bt2VPFChaLFDOF5aFLcHhaMiUCO4FUofc5a+c5hq2uU1+GVB1LzG+1HVf0iLkbREzmxFXRELkRNCL1uqrYzccEuhyrECcGsvAVLqxPHbb2MJxw2tNsm7xju4V/CmZJ2X2ogZ7z2/0jNy52wka7+TFE0ijeV//hnjGpzx39b3fjuJx6WjNzW4sWzRncph3Zaqfx1VaiAy5hZK/9i3WqYGpz20Vcu3hL0kJXXWN0d7S2X3l4PXw60syzFLlwz9mgu3/VhkXB/4OiBEns/cZHaoP+MxsY7WT8ALQJPWaPbHuajBGUreXSav9dr7U3B1HOrss92zZrFf6NDdt2t1kpahG0uy4Coq+hiazlgRPggf0mck0P0P5Ml/qRwO6/WsMTt1nYIZDNsuKcWTUqRnvVCQTI68QNupbWfod0sDjk0hoP3+esmT67ihUXqof0rLKERivnHjakYZy5mieZewgWhD3YIY6q41dQSt6R+BNvsw/fOLzv1YLTAR425cfeD5sTovXB+l88YRIWZtV7xnxCTBa0pDUwxzKGM6R4qzOGWG98XDPCOV5fe66V35s+tud4lfF4Gw9GSokHn2yahVjEqrbm1hKmSnNeJrVXF+HllPTvsSvXpqvhlBWyEaD3RdANOHzCen6Xhh8vW6xAvJzjv3uN77qqzpT6MAmof7znoT4y+g0rczaxAJlMDl7CG5pl4EU/nTAYWYfgz3VAo5Lp/rgv39gYV0fGFLF+GjkeY20CY5DP2BHHEYNXnIChjZO3XseFUAphV6DL4j4+TZwLMfHeJFfbz3GmUXmdu63cJnxpWWOQ1leqEAPysCn0kLpoWyLfRU+TC2yOP95JgKMjHNAxIgTyXpurHgmDIt4+GzxzeQDu4XP6S2+CkFltEkU0+YUbryZj2t3tzc78UDYXwqRvE3yDM+XKEkHh0QNuChQul4U+wFAn4etF4KAGjSKkJpSf0I5h6ZNhGdFM8+I1zSwsXqE09E8vrXGU30o3GtJ2fQ8Z87RPRjs3UTNkHtc90oiswhHP/rkZGS1SFju4xuv54tZ2IF4jT049O9zTXSelhrF5t6lxtT9eDmDfdFrpuuff31kIPJt+JwqTnbztytcQAchQeRgb8QaOIVmUttvKVsZzuDposd/R6U6BMDtiBpFByQ57ibKJjS4nMkZn1uyf2pdrSR60Y6j6JCJIyZFVtJC6+Knx7qrvl7ZZ2M8YP34H6Xaj8n2XTpLM2e3wUmvJ3lw2z+ZYdjQ8REHAKJFOVlkohU51Vw55jN5AGtpWnYgH9uV3RJlHk7cY9qzI+JA0o+8nlciPwG8qZpxNLxF+bOZ6QTMxR6pnH2PfaK6gO7DgZtVaLY8urbCigL/I1UNj/9gp+EJJWA8U7f5BvWIK/o5HQpXmRsMWrrId9g092rreoJolxIxDteAUcJ5fjQ8ZxKWzNa6K15gIQYCkT/XtsLTTsrvo0muJt86ACpRiV97bNDR1CVRo3wkpbYEMW007ZvePowBkn4bnZe7q2XBnIKVSXUj1Sd9J64lCa2CeiWFD5LGH2mqsLfBqFS05GNjjvOr8jDAO2z7bS5mBUxOZ9FlHFdy5RSmjH7Gog7hXul/rblKf+bDlkhXC3R9xONPTTodmtBXwyT3aOgRS0SGPcE0yYAF9QqcksvRLZxO8BVE/gLbDYj1h3k7zGzFeQTL8duSWRsdDxQA4OsNGhh6tgx8dzWa6foUPGs5kWUw0ENxssKWenCmHZOfhQhPXPA2INMQ9GuH6jVrqaGZpwqR1t2L3bxk4Xqd+V+G7oo0JIbG4JdtsDMuW07728QMsO96aQPhhtycamarlspt4JaO790ljMh9eYvT1lu4r74JDgZmfEmU7phwyFWhWaaztu7TOQTsZyivf7IbbNHf4tb3D2Iuy24RIfFqv8lj5H0WGcjBa4GmTwgjN9G4ipFhMrFH/jHCsrIO9NWS1/b8ja9x2whcqOpmP2z3xQFqkaHzB+S0mYPy85p2FSeyeTzifyPk7cRs8rn3z9hn0xgfr7uH6V4leOxQKqqklVqTNacSVeBe1gvW/Pcv21kZFzuikFhdZPuSY+GPbqgcu2X9eaSaWHmbvpZTCXwN0HyWxniq2kTW2cHvpnpDreDfLhJ64b4cCWaZ9RGDRkQnp6J2qNMPfL3KNrXhFH8qe61Xm3M+iB8rkPq5EUR/LfMHGsd5pKWRUZoDwHQfDciShWKURA/D8ga5Lw05Tg8dlcX8e5U6zyItq5DuM/RyIsdw8SY87ARNGvTXkDkGARo6/0AYXOxeMHwKzQmA83UAWPofIfd9PUaH5QbfIRIvsN5aqyTqBjBAqzd2nI+VxY4xyVP7O6E25RxMP60WlbjgfiR8CS0fK9pvdQSfX58lTWI7z8la8qNkNj/gl5rhlfsIiE2/Amu0hdICSYylx5o6ZCpa8ct6/1WJ4/rHoCQVZIQTCS+a6JkK7NNCJzC6J+qKgTYLr/P3Ia55eTp+KB4l9kYLfCncNinZLh8fZaW7dJLN7V9QUBeZ+l3jvQzjmzppuhquK59Ac9LYe0Nd8QMU/VOr4mkSB1R2L++7CzGJUiv0Id8m3i+N0d+Ua0q67fjRpW7mdbbzIsYqw1DONxpKHgHziah3pT+xJK1UG0+0PxbDwkB9JtG/UhUKW4MXnQvPwOYV41lj6yVQXD0YY0+Onec61+ifT/TtbvJL1mMCLoQ53YPmCsTwYtV4MLWkCvvjSNVUoXQxzEFZeBblgofumNpHgQcBdRX7sI4PmztHIBc97C2vsYS+YIqWzas65qbRH7SMTsegdsG1DU7g4kY9RyzDzq11Pnt0NodiFn3c2A7mM/uL3/Ykv71RGuct8xlUnyUEjed38M0b4q0+KpXdcRB+0NOuDZvI/G4nzgFQNpFdVjZ+sAfngoRRyGoCdkTGNTXmQ+Srj70Sp6gplDhZIvPY3XcP/OxUUDVE8Ch3w+uGtKhGIxqwDPcICAUYAWxYlhQqIS5VkE8ofXXlrvT5rdCeRvEFru1kqBYdBQqEEbjDoDxJrtRNRVqpMTgnjL5Njpe81Gn6nWi0iF9PgLND8ZiA6Z2jkV7XvbfLJDXFYl3moiw5HE1JIEutaYZN2GonDyvPEWCAQSu2PtW76Ag+gf9QKHxhFOvxt2uobOgmqBWGHoLqt3YTXcl6nvzRhMroSudfkPLXzWczzyTrUxvNqpBhAXS5HwR3uzt8HyZ2f/3566Kpk1nZHVA+Ko58oWadpomCUlIIfd4y4M5NG1C9GCJ9W8Cs5YBaamp6bOPe0JfpDwz4W55/Hid1b+3APnTAzV7qDD5HDBpLAgYIua4Sywvb0/SP8bH1uB8ohSKPN0OCSCKOVpzoSZ60tA3C+tH+d/rgh4m4kHJs964/NwAEh6B7LTcYx3p0AA6G1Hdwwa0+NjWrQ66vS75WeW+6oh75lW2HDArxJwdyM14XNK4AQs7nKrOJ3GQ7bIPeAneZvStBWMsfBUEupQPkg+jiEnofO+kt2/boN+atqBti73kFWKcqxoZl+ZgM60/n7NbiacDU1fGWPqzp4IfYYoe0Fnw2qENz1OoeIPVlemrWtgc9xXwATHlf5UHm+Kk5tGl3arSRFIO2g15m7if2TVpTeLp5K/vlCwyHLYNKdS20gDvYpeix7a0fXJbrU3flgYFTXEFWINOp1x6JaQsuGzrbAbtgpvBTOxxvQmhlbX7PlaKCtaZmzns/31ytxhzj1/ATj1/awPY+Z5BBL/1NHrmR9U3WNnRFM+Y4tYIA/g3B2gg5TTk3UhU9eZew2hOLD97LFFmhxCOpZWxST6WRDsfHVS+uOuHB1K3akvJOTELGVVNdvHUSwISF6SS013GQAJx0rdo7tNTjHxETovMxWS7juzMXoLG4ZdHUx1YOjkKAQC8dLNqhhdy026AbCswrSwmNN9+4v2BWCf0dDg3hewtf1Vz+aMNcg9oZGCw/wcAToJrZYCd99NnWr45yu9GmtUyjOuHWlZrkqKZJMtSXNMtEs2hvJ/I9cRl6Qw5ydMlsf60zuZ7ZahMc0iTFqnysz0tkakEXy+KADDW3CxeF/JDfgBv+LAn3Qf2p5WD9AbVqO6LPr5cMi60mJgxkULtRpuXU8Pwbzc01ecYywZ0X96WL42965vX8AVKESdE4EFHDS8i2rSVo6SpsGxBHBUIZZ5OBwud4zEiNow7MD+E/lIixzYslqiEUn6J01DCctiqwIVBo2KiatyBtnT5MWJlLnfoQetXWOFfNlIO8WtbysvJzfaLDvvDwEkfTUFkbgS46CbukYqJttx3VZenjNYjkX25GRw1wArSoVvoZVEDtk5UQPP9batE6PJzKaXPM+m1i245mNPJ3Jl7frXx2hk2FHFBT4E9hu54guRTqb29y2Bp7MuijmShb4NvSSHoo+pYRlzV2LUvYc01vUQjBlgKsr2KGZ+IByxA/NbqaVoHZ6qq2X652wSYASVlKPolPvkZCffrRCdN6ekctog4g12Q8j4iRH+OIZ27rRtjmJZ+k6m5w4UcRpC/1cePOoWRhqhsYXBxvih6gEQKM/f3KFU1rmIzbTldGF+nfVxVgmj6yL9BdYkSeP0hyUL9HL+4GD63CwCrM5vELSAJepEMxgAOVOWQ/HLuUu7JuJ0jfrChgjt6s0jgVNds7gSR+CVK2HgRtPYJlMgarZzxZddvIUDHqskttoFdWYN80nFLZbNSDcBDQPfEDc/s35C3Fnmp6zF6E33uk5k0YP+gD5GcOTvVQoBaGRLmLViIvZUg5yHBsFD3QIskYmUdOdG5/Id/nW0ro8s7MhU+OH5xJruE8yeZnw7bfysyQziWZKznkvSn4RrO73VydO6lo0mrN2EZKK8VNcHJbdBKE+XadshQam9WOTq42R+wKKrJ1fJ5Lel4aM4u2YZaQzfonDbZDSvYyokvitvgC8/fgR1pKjimoW/RH4Waj8eUzJk/5jHtEhYZFn8Y+Ozk1af7avDF39gBBlwAoCfYnMfPGatScIS74SBpJDRVdg/BO1Zi7u1NdoFPRnM2O8bbsKXMKGSis+9M+eqTTtApdeFkUwFtyvkiES912zhLgqqKLGGs8FKTca9Ote7iS2KIAOmprkTmbeYfiORdW21eb00qTUzz2QM459yjxt8oGI1dBuz5D3spD3JAM9ny8BAeudNhO0Gu8V8kLaKM+ESTvleIo5lrX44qV3FEzADZsM8kEwnlWIAmdtSUhT7rhEksWJIrXEAfgXfGzHGu+ydnn9wGoKl/37W9YIDaZlh3z7p1X1Da/BpcfQ0ygB8Xx7zlLfntYFF4vLfp5ovufvzlnPWQBf5pWGBqvagVF1crC4ZGVUFuQnHe9Koueas2HBAbMG3TQqrYx6fmxcGmsmSFv7y9s824AAVGThOebS8QMkrrY/oK3psCGx/2WKiQp0xaBt1NDNjzZY5vB5OLYPrkSeKXKL0/iafceGtEKnlTMqAxDJFPZj3c/EK43eEa2NOqvowDrWso1k31EnQUkc1O0zLLsQI//HWsiFtMns9gmHbAixQLVdmZxTzAAT8UIdmVyxBfUj4oSVbWY4mua12CltYskImdll254ZnoCicmqN/od00A/XOFpi2jiiRTj4WtIErVGIrudyhvBqwxzIGyCEK+1AymONC9vG5Rq3Aztu4qBKStMCKr5f2X1FmRRBNtMAbAZ5K0wjzztk7xMslCiOvZU1I8s2J3G/DaveqHVu4jwQd6MWHUDxg8cPkVSG9hkqpZdNHM/PTn9CvlBI5HY3j+bziNvsrGxebLoa4wYXD9+o/63HgaL5TfOyN671/O5pcdoNmsrtHR2PApYMIqQb812Z/yCJIod0R9UazHVR4PbG5cUpPZuXMz9I2pDWn2Ug+rmX3ehI9Cjx3YtsNyrpK8TmgOJ1I2AO6mdjQnAlgejGTaZD+ZIPokZvY549PP18zmjFK0atD6MYFX6O12ceB/72Pz9yVhFhC5yujP3IXocr2A1WN9hwrl7BKJu0Bd2bkGbIarj+L4WtoG5nZ8dgs9rsVAr0zBoNas7wD9THAfHLlXftpQpfT4eZDMmM0u8nFHvE+iAn/Z+nCDVxsX6KbmazqMDBVpiRMdg+1b9+ZLC37B6ZOzCCLdhno5G5fnQeUDtI4AozCpc0L3LJWpEHeY83ilrT6e242ss4/+wHLogqqz2C7evBCRJ5wHn5/zaVrcAIghVX1PnIDaXS1ahySTeAJjvIlag9idsn0vT0PmUJamRRz0YfCNCHtFBjuYAvWbcQkLCdzll8FB1DGQH4P6xeVmmjhqywl8swXL5yFnaVenGukzZ9hfMBgVDXNg73ot6xHRlHHvTWJnGrjn5Ead2nG3LuXDm4NSlhACYnSFEaraNs6xR3ENifxfu9vJf5P6z0536b5GWtu6imeRUaGc9ZLxcISRXMLx89/R58rz+f/yEmwo532p5kbXPjbQh+rca9g99la2Cd1zDl0Ur9o8z7GFLru3trL7KiJRx50jyPVollxUfnGyjts0k/p2hOXJrNsiovNVG1OGVd/eKN9P1twcXdby8k5R+W6/sQ2xTyaX99l89yI/+33rnWZk2zfxd8YA8mn5texiBNmAQ9SV6ws8sUuMKQPZHJZH8fbF5GDmkMWAx9UzKtRINSHWxMg6VTmXNPoVMDRKvGtdFAiaRIyqGUbKrvKHsZp4y0Ued9Z2qiIRRtS+ZROwRncp5lvGA1ePv+xb9lvR9l6KAYdPfhRG4mNacSgLufikmcSl0hYhybaRGCvhEsXW+u78Xywbq7TttiJEEwW5rVInu3B2R2vZsXDKN0PCk9Y3TqNCgWcR+noawP+fI2l+rCpKjh/drlVjA2RuEpC8a6VWhrSR1KQX+Lo/WqsTrx0xWj1yG33z6XFNV/vd2/q//y5pRRyo6M/VoSw+uhORPu9vh2mTrrlH0oNRuhliy1JC2VcZP0FxO32JmyjHeT81JBpLHB2+VKsW5pwwVP2mhvb22zzfuhX/CRVFUztG0HUUn1Dff7SguYfr0DoWnzdVtPx0ttR9j5HtbELPf0dpdtPpnWyxYMTrNx+xipBLUuqUMlyLuSpuQAr9EVWShh4sf8miWilc64w2D2PFSeiCqcLycLe6dDLvun6i4fWE5GgBQm/ihNQeOoWEID0hK6ZHw7rXEY6vKJqb7Peo7UAngWaAUP68y/zfiCWIxjuXCoEMG5e2jw93ZUMK4Vo8Vz/ZrrtpVjzqR6bIwSPYCcAcQLcEt86qM186bjt+8qAVlvrPYGiuEOH9P7aZDs44XxwFaVsu7LdaLSCr76Vrl+vR0w6v/DYbvIzyij6td71kXw4lFbWU/NeJjY6Na5DXpVkvLuRaLSOcutuIN6zKhFZNWv+TTyoLrdRgh8lGISUZBM1YgHda4QodI7/2vSCrFzfz9NjPBeX6dpbCT4IpQOke+05f69MkoMAACwSfNv3yv0P+V/4iikox/uOUrF89crucv+XruJXvCjTSf7ucX/ukkoLoGvFiLyP9nuszCrwzFWuNUVEHnrhxVKp1MZB+dtqMgYKaAV/HjLOt/iKBGnHxnUaICiCCp9G+V0n4asac53NE97EVFTXfj0QTN502Kex0YOe8G6SG2XCDk+OHuYmdW7Y6CcnUA985tOiNQLXlDgl7VVOY4S51Kb8xlsM2GG6jp8ciwZrEoJ0GkSkLufoMNBbqIHZRY/dvfBVv8B0v08SUdXHej09bLdHnxIJ9o2dKuvc9lN+HT6IS73b8llPE3DCnvtdp87a4cQ9PtL6CfV4FO2RY/7oUIEatcEuiXmssl3p1Fp34IM8i6rtsSSVamgrNZlR38kLCCzjf8tEVW6ow3xuSi0+xkg0DU3a1eI7VRpmU7ZCzIw8qAM8Mrkhr3uCl0btEPLtMYZunaU+wcmXryOy462bmIr+PHhSpm0GM1Kg5QffNbuCOKD3dZlVN7lflAjVM9dTO6Hifur87B/ywgrnZRtMtqgBYp5DBm2bjCQHCN4UlyhDohECEt/CDpuWSfZm4cxJPMgjdb4oWU77YhtMLbfXsrgAgHSfHRU5ecwdoK2bqqY+pCf/WsYJmok2OrbT+VR+FVGyfzH5qGM6911niSwosDV1AxGxWK74EqX8kbpEOmkQj3SxPg6YdYNLe28OdWbsKDLlE6OLMiFhCuAmj5gdULiDxCu9xrAgUGtMUtdgwmw7TGosslEULw9GGXX3rBCIaGhD3fHRks6HYb71BnwwOBbeRWusFX9yu0VOxVfxlG6hhA4Veh43eHTJLc5djvdbooPYtHnGd2ioSf0bg3A8ZdvWepb0M38nmT19U1qObSdsfojov71hm3WvXIQ5L14uZWAzqDHuWaPGkhcbJwB8NFi+gcjxurwu34VyBrpZ+7AiUc9IX8JORSN3NbymD6+GYmCOmPbHGmoRpar+Cq71bXOOfTzyFbLxTKO/GoLrwJM6Pls1Jtt7bLRYxtAp3ubbVK2MPJc3Jxngn3TXy//zKPGBiXVHcxeFjRANtbexlQw1rGD0vE8PjMfyjgkhi1IncHBEXNg46cCZVvwNF6vj1Ua2aFTPDl8tt4JXMFdSWhyeBn5RvFB+fwgj9BPbFTnr1maldCC8JJz6hrToHR/clgsyPubvbsWBVeCqfoM/9QRlMFplW+1vHRN1Lxim+UJzeOoZwwhWWtchltm+6Y+seC8AcrLX1VSjGsNSV0jyxu+vQu6YT/BspwH6DCVMKq8oxdL+0CrXSSIYvFS1lplXkCWWLARU8AWqvFzYY4m2zXwcKn3NGsHT+4i+HXNiKa8fzrDx2t983DyeeK+PH/TtoJNI0NZdoLwoKEqz7KsqzRCaP2b7l/eXCnPd0+MwCwRws3605RYwb8L2pZeenpU+J+t9nNLWAX/ph2J80fY9uMZGWtIVb8U61NobXs55WnrFvTlvr9oJ6nohA1Bd+UNeKsxI6cUCJ28aPIlFuJU2cL2yQXu2pXEY1U6Lag+55Z6rWZdg4W4TkslX3/fkXYGp2Snh3oMYgBYWCuaMqhTNoTyIq6/fLPi0KwRSORNLmLIz7EmPGqB2r8T6h6ugDIm9TsbJlj8vPb559s7nb0+Nu5ubjsYMKYPuE+q9Pw1XaqxClGcjdN5kbceWFhgTzQt+c+MOWeYWHWgvmNGeHblTJKjVNWRbfz4Ba+lfU69QUhQmG6M/iK3Hrblv/YJXwecqc8U0i6T9s0fV8gurbQN7kfEyFu1F2Q735EtwlAo3XSeeZxYrzKtDrpgUVbeiVeuxm/4XniEatikgLT93WWDOCa80d3t4H9K3Yk6MWQKISTfGbULKGpopCMWEXAFGrbpW4hBIVHVC6xOz8UPh2tD1+xbcXe7bnfYL5zhHAtUfW4hZgdToxCj4gg/03XsjYKIBn7tpAZdPDMI23GPewmQ8T7570KWNNeB0g0pw1jxKKccmyJNTSz8FAP5vPU4qHTr8OPl2/CDLeJ/yBWwbTdJyc1M5LS7i2Zz+LLws0gUBNrlI5JQSCg+RTk/ChtGO7rVhFYzUM/BGQbPoSagyNvtSHp/m10OS879DYXdVVq+NW9CJ2VAFrv2ohP51PYvo5Pf2EQIksRur7aaEICuURyc5p3Q94PUIwe9Z2VXHo8W2WGEnCOapBOr6rQUR4KKBYTyB5csMBzpOWnFQlMfjCeyEBieslzd0zRshQaI2/PN10gkR5jcVxVxxA0nCir0VIrshQn36ZPoPX4QVXRWcJrtA4I9VAMrWgwVkIMlmO9E0EwJl0UptWSE39bJGMDheaqH0dBEvAzhF26dia234TKU+/FI5xFBvzWwqyu/JN0HM50xlgWKybemp1YXMI6avv//6H5Bjp9hRiP+SXn1wzps3acXRR4gQSRIwIf9ToNYYW8MVDUMPfONxnsDmATS5v8rWRsywlOy0KUK8fQ3kMyH2RlBHh3wE2Ez4EGCREJKDGUUhDKudjqT+ZnWMqyZHOMZl0yw0vYhBJUtxDmSjAeAT0TYiHN2D38yYd26E+0EggoFU6MynuSSq2BTxqooofgCn8CX6VQYOIJwioxZhWm1f+HI1ofL4IAq4rbTHj7qUq+tuRnkDBSgERZTZWIRAX4ysTakInClkGN9ETCMLjJ3l3mjxT4nvOojKLKjBMPISMZa9LpIgHff6ljC8WxUpZQTSDNB5tczk6UXEHphLI5gRe98MWpEu3n2tvwwowLx4rm4TAfDLrfsXu7xSm8YT+jFwJn8G6/7b4siCOyizZDTuIc9GVfsMrQrDsn0V/biLMF1O3G8wnDHwp+Frx6XKU2TMzE4QU5hqBFy83Bu8cCt4pN2rUhcDIL2dH9Ocq8+SbbAvpGBhvmXABh0cSE79kG6OioRJVtY0iUmMelleHHhBubpnzaTksWn29MDWZt1XynHmeqDd66/9ggmATycG9Tmk4wnZE6VAqHijDUJEF5lcl2Zz1mv1x7eHZMOOyohtoWD8Q6CPrxOa0UjoZehi7hR4nuLvCsuIZGM+wkcbiftiP1cvrGleL2BX/9m70OPoaMzr/jDfwSiVzo8S9yCMtsNitaKX44alOsW4KTwJPhi5IKNbOojsgQmuovE/NxrdLOoif4zT8jzHUpdjQfHLmDyxOzTl54OdA3gx3JXAR3SohrCff42UewDGR32+9XFH5R265EB6R5wqVH453+xAYRqNGvbAm3KBc1juUn76nn1BPGx38h3LBzCcGvniFwA21aJJ/7696ZZmAhoW3/EwVtlpFGbBSCyWyuVMV3r//NtUWWQVFEjLQSdjO+9M7hBpaDC37ugakkweflV67sRAq2/Fpqi/2SlIgprBcqFWNmBTb8hGwnkyXhDC02yssYe200OE1xdZtNF+OpBUQdREny1lXZAuW24biwTqM2+a9cDJr9CtPuBo8MeOYPIGfbPMv1xZBn6pSvm1HukoRC40ZglBmtahL5aeOLiElthPcGqrcna/5zT22jvQlvjpLsLstu/v6n90mNJrhZszxKfn08VeY7R8BtCrES3jgmAQzrBv0hPg5z0rPb0HdOq8K+cNvn7n6/gVcV6sNcxiUOIF4dIsIfinvJgXUh5Ec50WqAE0WpW8DEh9sn+MfHM06TAKztgdhl6AQxsDc4ZUrNM0Q4l3VfCU2FBT5ez+XS68XlqnDP0098JM2DuNI7/2Sq+khTO+kTx47Ge3Hf1zy8nC1pxDxPUSBqTMvmvefWa7kyWg2rKPF/5d0FHinbF9ItCVJFjT2eu+BwWxZJ0sXjrnV2mA9qt7Al6X93heToCjWeICKpM5PBeFj6VkkfHvI6utbezGuXO3nlhikrwYlkU8cFmweKFy3AOb1VRicdlCKJamf6Dj5eFEWltpCoxL/go5ChXsMT1jcfdtftrG82ki2FauNK4N+g1Z2REc+84V9e2tP0bI6/nATU8RbBYkblz4ZCoLtKrddDCy5susTBJD/7n+MXcblOE/IEmdHn1mmDWV46ZVDEvyk0LvxIEh+Xl1SgqDZaiz1o4SUv7F2C5nhQZQ0IvvPIB4dTfleX+FpDz45tydc+PK2OqRQhGXf7gnTfxHzB3M/mfxL3e0X9wFux7CVpGPzh9xJ9ey6JUh0C4bD5Bkpsxdob1y6K4l3oCIZYcnNoOk4zk2kaV9B9yPGl9YGKkeSWaWLvpwgZLGTc1h3M2TYhWP9XriKYMV+gVAXwgdlJ/1gsCer6SqdyQJjeHlHatPME5oZ9SCg/FL3gpbLu5cjwOovCtrHPkpzNGxVYo9eDWqszLYcGxmxtvJ6nhk7SeTxTP06q+UQtPciaP7Uriga8ki93bEySEfMl2qIwCxZt+1IDVi34KFpiXeuwO0KheLZ6F5Y/7nWkx05BLTBYtzY3nmhC/0Esqt9v60vyHFYwyauaJlrobdrBRSrC/IgweToFt3LETX/2e0N34DUvUMCwxgWoeBNAWZypvfszzHSms5+/xzA5YhDoRO4OddYe3ExYn9cfSjccpafW7conn4NqWQjnO8lUMzEf55OcacH8iuXr+xLpcy1IyvJq7ikGHWAl4CmNiggxxvFWMz/68hoV85RoUtUy/GLo8tS6zMMzCTM8zPXg5u2wFN1jWpLu2hpxpGfj8ik0wlutuErHM3NtXqOtbiqmm4KnJbdKtFFQ1IQPFnTvfPd5fWsY5LCn+FwqrO2ljdO3T0j7h5md3nkCku8zDnKIBcD8BbG3JvE9p86o9R3/IdXONQDZWsV9mWzica8mIvyU8oqt5WhqR4TmRlYfMaURb+5gfZgDnJfneJCBM5t1wSMZVRC76w2fWRmL5dwbURZ/YZUgQ9F15Y0kYeuarv8S/45w7JdAQIBn/1b5h6reXt2HiXwNaTCI4uwcxilNwTUD5Ebysm0ueJt8TKS4fm+kwcwbvzSZEji07lwzCHj7g6DkOXFEkO1K/tzRiYLLA6tYXjQdzSX+HZZEWcEx3HwDOiHrhchVc7HdcFhhD1eYb6A7b8suH6DTVBweOg5DEHlTdTcKLj8uv/y8jcf+X21qr0I8biuBZ/p23yimzBtozz603HyhSZSdmesOkig2oP4lwoVDw66RNmMN5xaIpMaxkRJ3wfna+dZjnbg6Lc1J4uIzaKshaTlgbN8OaqDaKy4+GzNH8PxyXrY7Lp2ZYagwhJCOLyy26Yb/70kFHMMNO3vPYSFlI7bIEUh2GgHpp8GDZwXkZxFl6B5OxoDSgr3bCac72PHigfI6dArD1E+xuFkDcPA0R21RRcE8KPXSM2AH0bjz/aWKEYQXu63Z6uYTABVLA4ZEUV3tjLdPwlzVuk1wMyxFaBBl2BR3mVpT0iuVVFSbLvtQer7Dgme+0HlP4wpK0kvVktFOl7xcj4Q9CK8VeLP+RJsZTLuaPeTzNAoHZdLzBp2iQVRLG2qPTswg8y7tqLCjoApZ6wbEsvQdmkvsa97G+6tgkkX1nHO6AEQqlteEudasFP1x42hrakjNMnKtVMl/LjKmMnCRffWNyZBGcs6wiygPLp4YlNtM4bhU8YqqpOYCTQTjLm/A8ipabRq2AGqPZDsLsh39LYMF4suVHgB9O/UGDZ4DW6TtvSnhW6xY7UAnAf3MfBWb+3JdU/pGZiP9YlsO2F7FhEUqIiWed4Rqsei7LZjqXztXNP1exiqy6cZXQ5ARtuBFpxszxMLfKNOA40iyARbRhGcOSKCliOxiH2rhML4IWoe0Sl2Bf7DgOoSirbCqMFb6chs8uCNukvt/7L/TjRkVk240xaTa5GvhCjnEETO8L7nA9l9+vWPhlQcWmHQrWmhHhLZ5t3TNW89bffNnu6luDyC4htmLfGezlPYpl7BGaASQ8dyw60WFrpvWxG8GChwkkJYWwdARWCR3UMk0yUak16klOk06O4jcQTRM6OxIMfh4kvojsd8DQl0p6ieSSw6/B4CskQQnycAf160DUTrO9QN5vQM5kJzYdgqr25D/BIo9bcJVE2JiIFKb7c1veIZXVI3hH++0Q0jYJciTLhkj9XhH828pwow/v/B+/xHU5Mbv0LR6gSPxSRDAogNY7HhQGfyjaeuu9eES6izWLuVC4PmcdhUeVFm2fs6xgPLe6dSVR224vXZ+HjFepWWBcVc0np1xQFiReaY2g5nmgoophwSxnXJ6c4mbFDjkixW2UbyEe9jbFdAVcC/vtWmkHcUbSeBxmeOy9zi9YHtac9+t1H9ceX3OiXu+3q6j+q8Ec6qiavj9u8FtdRxH++9Mk/XYKllrpfNeXGuVCGpRfkpeR/c5elZbP7WSaf+aFdb653mIG0noi40AvdVbjHjNzoTsfFC+TplWeYVFc5hbzP9rmXAzKV494TvikZltY6Nou9A6x9083L7NNSbVL/3mrsQ9DPbCTEDXxYr43b2abkKKIVsxKT4Ao00+R8IKCxN6zuUYISuSDRf/cNOBx9Wrcd0vIf1CazGHesi+dsbVzK/uE6tvkGl/dfj5v6vBZ7w6ZjAK1JuQfJoCX4FoogBGbVpk2ld7GFcenUZUTW26c0KAKhUXcbK70CVfG1WmXKMMohs5V4WBaqAl76bB25W83L0MPh684R3ELteZzR9LD1AxkdERlmcPOKG9tdmaUXMBt3QzxqJy4ppK2xmK5Kn/iNYdH3v9priNiZCHxVM0UwHiB2Nr9WWKdieBG+OiFqDou092c6Go2o8n9e+8tzaMcLgN0RC1LVc5ud0GUd+2mG1jtn3xPs6wZT728S8s8LMjpmJpXd5g393d0blKdlRtCp3G13Jqc8HnLcrOh53qTopDAYnITxyniT7TdaA6sZ1pT8eVkGn0SnM6UlHqinF8g+v0UpjkTGa9PnhKyByb+Wh+TgxQfTHw4CenIJEh4kdNrQhagUEe2YUB2Z1W4n4YpBEfum0XAsy1QyC2u1JxpGIdcN2YZ4X1W5wyjgLG9g4YGmrd8FauHvlv7joLx/Be0cOxDSimhc/l9fyGUdGhp5DJgIvFE8Jz2lk+KQreUKf8zG3XI8xZtvc33+hhtz1EpWfmCIDU2BHt/4GKGI1mGIbMROCr1NtPzTJy0Rs0CKJaOlPcDSvBf6TL8qP6djFclnx95BrPBaWPa48ixZpNuUUpXvUyAZBsf8KqLGG9S0BQJvqPIDSRvbhZLVgQ/+kDJZbkGRPyjI9IMlFfF8I/6JPutJQgfaoxA003oi/+6KsSu3Y7hgZuplBJyfMhDunC6qFFfVUaUZ64y82T3tiuM5i1KmTos8bmXWFHpouc4gl47xO702FCyV9MeOfWOBn8R0x/eUhOBtUGcYVBfdTAecrk6NRYQMteYC6iRid1UimfGHPWcQqdMPSle+hDVLv73V2hLKNPuqLlr0j5840ndzI/cSm+aS6Kq/YUkqsHAsC7+tpcrD9VJzjFOiubUTLW6Sql66fGFMukgm67ie+1yl/VFSIjQAApDV8D5g3JMHoAZiWlbobyw72+71MGdKKMWS+WsfoM7GowH+bsXnP5GmMBawnMxUKWM5yR1/clALpLhKenRxGqRz2LJQ3WjczRW+qeSVitV5hGeXhzN1Uyi2/8CNICoX5xFcdLsEyeb+Y9HGZhYFflgnj435xsRklkSfpmibhqrEf/Gq38pvuEpiwY2PqbY0a8bU85fxIB9Pi+uV19e4pnZQ9pMmn53RQsNMkrTDz4EV/LHzqhVhvGcSgaCPWKc8ndMTzv78alpvalvy1U+m2FWfnWjSDmoPQ3/m7GMlE2/yZTZrvXiEIZpwQpBaz/n4ROe91SUns1IVInWXeNl56j9knuqSKifsSeq+yK5e236lsZlDu6ssXQKVAer7p8V80qqA3RfnQtQ4W9XoNraq4QfBbVVau7uCS7GdxiS1F0TuFUXMxZ2GNTewNLEUm6LtAfWuVmhfD7DpV87k+eZUyBNN6tPX3MgK7bhGTR5rRaDZ5uSFIzBhi4qEp97WP/hpgwKCh75HLMuNbpjd8WExA4Hz6M8Yar64i9WE+mKCh93b5fvRDLBzeSX69ZCFR/k5MOjNbmo6rfzGbYxIJJfaavbViAp3DDkdaDCeqRyalK6O8rSVgcihYdtS+Q+6xl7pDjWleTkyZlXK8uJowK9XoPeNSwy+turP2Uyh9tGVg2emOqnJph1f2NYD3ld+LRt7WuSJ5v+A91/FBfPTe4rMk+VU+pvxxK3mtHEc0oGdcr5oqsX9+j31CvLY3XxU9vM5lM/SjCrpvu60yhJX2P+KlRzLfY0QZtiN5tULZxzmU1szRQ+oNI/oPIhUhvo3kYM/g12jlOUmiqbcAujNwbexBPtUOPGUc99u2ZBLlS9hIJtrqyDU1MKVhmkSNPUE8zmtOKQazZKkjnP/KbbMYA5ZwoQtEG1iwhAx5vtcYI+9Vd+d7c5h5N19U1TBlXur3xfLj5zMS5eS9dX74CZn2zP6uLr47BMJaN1MtvaR+P1fOM8rEskxOx6Z9L9z/ijBhy+r09EK5HIXI9xiMCwMQMREqVH79ikhL9Jp7O03z4pjYh3SOTVuhaQyzMssvTFhiNv0wm3Gv3ADh/2Ad1A7bD7Bpkhy5Opqv+nUz15Rj6LJ7UauHldm4s1KgpRPDFfqvIUfnF7x2W1N7M6SZ8yuNC3IVy8WMoHs/qwj+JTrI74UqevvUyRfsZt9VC6SE9blT5U3IeLm6BWB2ZX6q5O/hYjLRXRZBz9lZQ9nLG28qu/Ufgrwjxg3V9xRXO9Jd9pbk85kcixrH0RJ7jbym/Gwp3B/sp3Q38EV1wEPxro93X7C3mDs1M1Gw1I3HVFzChWA8oBafKWN0AcAmfi7+47t22Vh2WfLNhf/Y991twfpvnsbAUa8TyMMTPJqL8Ss3ZMMfLw+Ffe3SWQl8HeH7Bm7Sw5mwd4GLCgLcYa1Iyt6aEuZqG61F+qtAjrnnONlompet16ANg2UimIvAJEHZBRJZMQ/IWNuoKlDudjH0BhhfCe62CbQHs3y+uX5LnTPRQus3Ogr3VY64leLvlqBwhTrLaV6Kws2xHq7UIxFFiSi7KQeXqtmChA4qtd0WbqluD4MVbMRZkrfJNTVCCuKi5CK5YTM0+cbDLVoKOR9nFzaS+yEdXAzjIru794IehuZ9N5Q4yPzwCMNIRq6dttAOqUQU22WVvCzYeu9zRNTSeBWJnhYtJxR1tmuX/Qdu2NnvxgWtn2rSSjaEqmvah1fPW8VTIFCqcV45qTewtG61zQvUhmug8qBdM04tWvNBliDC2ci4HHvEURVK3yCjfd4+RPJts5S7snbU0/2mgSzRb4iJwxNxFto5PPvIa0FPHI0J67LN6SM/2YbwgQhoF6bxS+UbFxAzfpxw1+ewGCfyLJ4V0MeYRXwQh7ArA9caFbWHhZLd0qCoELIVU83ToDm42jwu777r6VjnUkIdQb2yHVdS/+JMzykqvt6UFQeb2yZT+D5dZ3i/JKjvUxM6pydDTtA5NTGWN2yj61SXPI4JRmALl161csPEcAXdljGK/EP+3FzZ+IkGADL6fopwqNLbryd6f+TCOMTpDYL6bE/O/9pK0J7NVLzMdiPKrByWgkkqyQGHrk28zpJBKrqVfOLCu/EUBxYC89S6eXYnBfcwrhFbfmgsXCrPls9+958Gw7utmwTGAHSnQA3XRcVF0nHw86dYerwOXmKkSS33/xUIAeONqe1nia6N4omGfkQw/ZAwJE6J+8bgli/LXC4MjiQgX0CeYU2m9tjXRaNRKll2qM5nmhpQyNFEeBa52v6puiJaS819Y9BIPU6siMvJ66HJYOMKUdabtmOQUEraA5hAdk48UERU7/fqI4mBsvPtoKYm5errWF0CiVUMe5mbr3UJ6nX8pMhmawXo5bSnbp+GZ5kCkmTDBByTBKGJwTmwiuvnSBrCNv5pIm6LYd5zV4AL+sa8uL0EtLR44AF8ryNq8OuIzbESmx6r9EgSvjm6+e9C/VhOkYiJawqREzt46wXkFw34dnNwiiVISwIsRCIL/xCS96Vs/VXNqFbnV9MyHbue6+xJ360p0i5P79Vwv/V1WDD0XTBc9SrfDZD63Lu0vFh4ZSVONcuWgd45AbEi69gX1gu0yPKaND6O677U/Rc1r7NsqqOpNLC3P1+6Ni/5mxfBJ+NYwkIZMh6TD+u29K27ZG5+u9Ht4gsd/znt5fu9j6ZgKw1qNwimTsW53CnWQPaWXC5d6BVuIsTLKb5qFVfLgu/JW/eJjE12jkbet84YzqIT65MxP5vIrmC7/8sn1w4497HdlHvMNlkTHlzo7USpfTYa3L52GMw5M00Fotzd1VC4TEvYhdXModuvRTE8ck9Skv2e1Nl1uuPMQQYcgV0nxg2w/rYWRI1zUXIi5oJ9FmNHp+okh+piKB5LeD+9e8IgHzb7mcFxFNLxGujcws/Xui5v+E+DX0jglSmcvDNT4xsWqqjRhA/Rq4imZDSt3Kl/FI5LIBY9eI4ntDhOIHK+eKOF/Oc8y84e19zpx7iZGEk5Etn11H5KoYdqQiZ9FTsfOWqni+PkRY/mHw7kCrwUaThE95powhIUnZjntLn9doOtLyvDgy65mTAXEAlS0EylXsWMTJ4eNTn6e/cpfDLduOHXu14QK6L8iZHBhMGS1RyfbJuVvRvmLNCx+QaxnVTBhAI8s2NeBGJxobeorg26Z1tq4kT7NBKMkWFMmEeoCRmcJ9VirAgVAc/z/0dGTqXIau9aQeKaMlA5Sti16L1EbCAkyPHwsY+lvU/uzWBzwvK2pEUj9qjbeE3hBzlntMc55/TROkxHY0mYE6bMfeHTGhb8RvLvFNSZVUzMxYfYQCv798wg+diNR8zyzfEJR0/3ysTLme1K/V9La8UNezkVnnV9TuEz8wJNPxkvgfjID8rzJNv1nZcs5r/sqvPrwUeYbMIl8Lyrf9+LpL/TW4TxM5Tx9EkEmRk7xqQPjMFFIxCA3Yb0TZ5oQED2VuLP90gEIcnCHlLpKuraNE6mvzc7qsSowohZ1odhZrSBkHuSutSQB6UJM00/BDUq3x+SuxdhhTVZXqwZzQRYcmiBa7prEiU65mLHT92ayuXHnC0zKY2SA9M+tdtWRD+PT3Qp2fr3hETLkKE2W7Oi6g3lbcr57JWLBth4etbgqR7Qzx25fBytI9MiWcpS/Vjs8GGuP9CDhnI21ONsC3OUtle3GiABoJZiKUE01SLRIR1RpFeyf0L9h6O/7JyS2aVBB+PdhRwoG0sDGIiHQYjcr6SDx8WWkWAivfAwo2lhfTB40LKS+rSqBz6y9fK2SQeBzIGDtfz4eD3/LJK5ItetKYY0yWpz4P0joeD+wDHE+W2TB3DQqvC5Jq6vlNChY4uhAozMxK2l0XZYeRLLXiUlZJI7lQRqhg6qfx7zbmg3ZJys4uxT6zaHEG2oy4gGqseNm1Ap0jWnPMk2M0OcCGMLZNds+Eoshn0Sa9uE9UN87RrmS0RUucjIPCnRXy2orFil2vjHBHKo7xAB+JANNccAOwJAah5q+5ZqmCO1ZF7aT3aG24Q5+lkQCrbqKRFEWBW49Y5VZTC/dd+C6GMGih8UeBf8ywiVt9EnPOT1pdBtG9k8hvj/se9fj7CYZImf5ro4JQiBWZ9QfLsEomCz6YT68JIjtECo8+qrncZNIfEvuvwWfyb9sKgZI5wNqai9CR7OLCRXyS1aoTfsWw/Gih+vQRrXN1UWmiCtHOX8UQMAM7049a4Ws2u+yRASwyPiVuCRLGKGPpPAgnlPEvSVF1zSTvWHInEEjVLSNv4QGkBB8hLX+bUUOi50V5TBiyqDAxbp1cwn8exrEIKKdG1k/yU6jfgLZw5Dtptsuk+mptU70zVh57oTX9NLvH9GhSiQEg/QkiL949xCYe2uQQWl8l1qR/oMwFILpZn1ADIDljsXcr6QlOQx7F4UZqlSH30hK0/ZaefzkKXSdoU5BxU/TzvOse0ZnKh8Wid35av1aX7LDRvCpukiWZlLomb1LPZH7IBNdA1C70fE2HvRtAWldjP35Sr/q1XfUimhTkFrMRhtIc0oeww4Rtp+szdNMkYHfJzhx5IxPES7jtZ1Z9TQwqGZGyR10zeI/fpqu4rraZYM7yHSsift4H4oYu3BlWmeV3X5jSyNDtjdYJmimZcAXx82MooZ9cv8/CyiqQ6NDZWEEn38FsJ2apToeSVt0USumZLZEi+8wX/6eZGNEtrn05C18uYYRh9MTOjWaRJZnzhC5GLtwXgASwnWT0OfLnoNnpVukwmdsaKc6u1/EtYsrrafp+MeWd2LbDEYmIzzuTy0MO7iiQdykqGrKEPcwOBaK170DAMRJpgYY7eAbmRMlWnmYGnTbjXIb7pnj+MyAX0g75DNRy7my79pcdywFo12+/GSP+T9c8F94/T36NOOUOtizPdADvPMAyX+HQezsmpV3BHvsqV7CP5dGPfliRErlxkrzVM+hdWPLJwchzSkaYS1UgeeP0my2pQokuKIRtZLE/aLYvC4J5d0983fXbd7Z2fFN1nENnlqxtvYRleZ9UNvlYeqXmkkikRs0y7J5qNUNJoWF0PW1+H2DYbvxFbujKcRfR2DZWMkLq8kgn5anYn9GPx11i5yyrP/rM70ofisfjnbgK7wr3/PFhAJly05XDfq5DERTKUNspSgmhYjkXM4l8UFdM5XYRU3rXDRlsT7mnluoozdscyjpbJ0rfz0i/XoS90ojUBAV3cAvsgtC26Lrr7Kv4d5WHurZTR4fvc09DcXqVuP/Or0Qk6AvqYV9otzXTXp57B+bMPg8pT7amc9HxdVK4NIGnXOPypF+R9T+YUt7F5YU8RkCK+p9SVELqFkvrnPbBQfXD3VS8trkUPgWrcLWwrq+DTB1QyeRhUTf79iA+yrKkl7BMuzi/gCFxP6FKXaE+PEFiD8qqfroMVxIKAjYCO7a+OxIKUue+n5jQNzhUlWSjnDtCa5m+wpKeKMH0TMs57ok9L9TuMPHm0oicQf8qR6+nm6itnlHshCIFN1VfCt7IDiRSe8et6/Np06jTUy7dRCd8hTZHZ5GksZs9j+re2FwPSlPHSvGOo5jHwZSf/2nO1nEX6+hpGYINdzt04oEeDzQNZaJrupdVGmoy7FKxxDtQTdkPBdf1SscBVmQ9n0EQoA7Pg6bIt41RgmRe3PmWcyX/CgwqqRErr+ZY39jhHLj3CM6JLq+Yz0QAZYhRN6d44roHCyiWID3LwPVvBcstrE98KocbaD/jMk3ysJrOJlMxzwZSlMDusG9f0/bK050+P+riiRKaFdWZgQfxHD/ZQKOnQS4cjXWUv7w/uzsgFDIXDKsrK0GRI2tnRF9KBGIg4FWINEjP4OTgE6Alwqtfxik/b/SG7z+DyWpmrhYqlnodANjfyJRSSzt8CmHt4x322KtQS33TU8ECwoeloEoqlVFu839230NduV7tqekm7pkf7Qk7GsP21AuQuF/MuwiUVo1ZTntZoEGGvZ+CFR1Y4CD11oL9zi/BEbQsO0CgtDF2IXAtnjysS1LbW1N4Lm+MWekxnzPBttBsN/SSxNufUGBjQwukUb6W6pEkGtGNNLRFdcgoI1ncS75DYMdoQz0YusSKrPGgA35oBWreTHIUafyiKGkg4hQt24ZI8xRrPEZxHTrH3WBtunT4oNNdkEtYPsfw5JAHXJ9X7p2ORqTIMU0U2Y043fXJn1INrbxtw7yiMj2QGqJ8xeODNA62jwRBoB1nafLAVaIbF7Oq2S8bLXCxXKNgRma3xPvZT+/uupMMx3Qm6NFiGbUz6Mp7Mv5NEjQZeuBAb11t8GyxJO6bc7UZHGbKxYaJF1q865xu0ztvQiZXon6lN2tWyEcfvnEjvqZA2xu/THWjBKx8PIWKwsizdP+VrHHxbKwveolIn4atw+BkmIT+nKdLECv8iD6juEMXPWByN/PR0rT6wQ7oICabqQ2a4k8qKLv/U0wnf0MIGS/WjhpYRQMIIpA7vkHfsAYtP7ZKWwKu6TBdpvtoSXDQg1bNoIUMVu5cPfGGG29gVZzPMAoi8+XvbdaMkPKwbuaWVzT0AHXLXsyuK36/tAB+hRYaoCqBllt1yw2T7PND06pWpjNZyaqzb1W4TC3GDHBiaqLKB3O+uoGXqyGX3SlbUOaIeQfgmat74Oev/ESVGYsihj10ScjPLvV4RGdrnraZIBQ0iW7aIH+IgHIAROOJo1/DG0A1XCMtUkWh0oZ6ZlpqmlEmLBf6mDCm+iNnT2WLWp1KNhOXUVUNuIpW2AxaUSpSGb3voB8vuJuggdca+99WPhi14L42yzMPp+bRqpSXxj7JewfXDclewyZHGvhjeUmdPP/0xWplfS1ybltbWcEagueklQALnGCoE/bQBgFQoHI+RggBgoIVXJ6zaCtvG1BJgst60CfIHqzCgc3K/QoIuPrMc7VPO/7RWaqPyV9YwMqTd54iu4bjreD4xTRokD0MeMO56WRPr73DnAbhbgx7QxgRv/dOf9Z5a0wwol6RIAwv4xI3yhjIcWQ0bInVzI8DZv34Dnbk4BwzuzqGGcQbhKb5KayFxlL0jd3Dr9lDG25CK0La4ED2R+Z3UrrHnx7Xh/72MxC3/02md2MP8BJuMlnYUNHkH9pr7G/oIxRnCH6/mfCJEx+dx/6Q/CetViByJQwTft8ZPPRJxyC/onMIaoAsh0LxeZsiybG8/JLHUoyh9jPh8FMSX8y/lHAyu9cfEKXenetG95XjTgHHkdmnG/hPcVZebISFseMSaFVXwQz42JLiejkjf/7PlicwPZPFpfm1nYvIvt6UIhOJ5VcSTeDJY0E0ut3OY2aqm5q9sGDkingCgMgt6lqKrQumQStIyZtp4p9uuvSyuzCv53KwSoqH/ahM14jo+6rS4VzVEqaabKTJlyONy3G9XafNwFR7U2Vm09n/je9DYnXQoF9Incp4pbO4JTFsmsBKqBTjPkBeM8MksqrFBate2aeD7h3VB7vCRrqUoWM606VHiZGCZPJmZKhtnWdu07M5lYhm+JWNNI1ldjclp2/A1ibPDSdKn8muuOPqXoRwt3l4JsbZ5iVaCbRGfp9d+BbwHcghd0E+XMSIHDRKggSfQs91iv1AMbn9/q9YCCOXYVWxcr3zLG+HC2F9OF+14G5C/sEzA2EU7YxZY6PpcN6lFtUuuv6TCspeimQAM5yQcor8BEH3QClQyFWA3fRDO8fALyLxvor4TmK7ab/6yqRm9nN7Orz81/N3ZP2RlxOXGn3/OZEJtGq9ktOfRRV+fHdl22llbrMEZ8YnrwCg0qxyHBz+xqdLTT3+XtZvoeE77WTFPmjCyyXhWwTWQiDePg/11qZ0+Adujs1AdlYDS5ytwXrp+coTkxD76uACg5kQFHp1ZR2//FsAHcgguJiUlTdSGgq0OVo0oByVtBw2ylwLYXvhyN3ySfBAbJfB4+Fz8jKrvouHwm6JUkb350Q5z13nlduqTaItWfvQjqTqzgjsdZnzFi3LqabtMaOZfHri4bJN0ZDHWqrA8w8SCQdNO6NuYnDZ+eSq30/Rc0j4HLC6ChMp7ROftX7xk5LCjFfXmYNZm7x7eeM00PFufkFa5frcxoEd6VM4DMOg98hUbP+YKYYzAfIKok9HQh0/EOWX4pqbIjAlrvWkz69DzDaYmn6v1mKkHw/qipdxdAPIa+3RgfCbGGbhySZqkbaL6jZkvIys5sdz0k3NHEgc8DJXsPYPdLdKksjxnyxbxjkQKOoCphC8nqUrR4fwGU97vuXIyaNXGicER+8K3egyBlR3hS3f7zMOEmzFjUlS/Z5oNF0b1SU2Y3IGei+e7bPMGITgsHJozOJnYDoP24LrkOgXIvPLckbHkcViivRPLWVorUCIAzqwE6/9pJ4UQJ658fOQWGsWjfnRfYSAVbWFOkeJs6ZdE4qoF2DYhlHHvaEyqDq8kUo+YuM4ztr3byEfPqBFWpzei1KwCoY7xczJqx89OkJbVWDfprxgTn31O4GWbsLax7DCtvYaexwK2VlYgJDGW/p31bAjg+nWc/wmnhhCyfVU8kVyWFBGJaoLudRqWjVPB4+UFIWkRLzI4akesufBjPc3kXI+yX64ZLC818YV3VKyF3gwqU0jdNsMd5mVLHXYcpyeWjLLrXFCGILqZaazZrxsSRb5plejlEyzrYl3NwoJg1QHjZyiwNQhWrBONsE/3Yl75ojDIvRBEa0w/hISg1BGmA8vOrjrKIbE49toghxJgp4e1x1rES2JfQaaCTJHgTxdjqVcr8JV5tahIrK/eW+35NppFsR0htLwKLK/wqe/gujQ5CJ5ZYL3voAdGouovMMEfYpEFZ5pkWJbkqJ4rRBM5eRCyOageoWsyv97lhKAKCC52bSlcMYqaM3PdWiYax8pARhplJ90PQ7MUl5ztGHM6EtwsM4b17WF/yyyyoO5zh+FNEssneRHPNfvWS3k0UaEL06f7KENZ1SAshH0s/08MdU8Uhg1zQ4dRjfGtXYZoMBKTwx2urr9TGITlouKrhvJxiTmWnCq2uVUavJCbjmsKRn32RFI0NCe15i0lKnnTq04Xu/qo5q1ZHvNw9TViC+K4nQc917WOBChF2OEVSCEX3T9Vonh3HTSmEFySM9LGjrvJmKZ+doWzpgN6CazJ0iyeyKAnWVvzoeUTcKEblZSo6OSmcQOt+BkTHPPSE3MPnPsoCxzh/t566DaHvByv8OATvh8wNCAetRUPoxaD/bMTEmDse7VrYytWuhqOjfFLuYhVzR+3j5PwJ0fhii5vzEBXR2sJ+SglaLm/vGlEEoeYkqZYSfTUkcXTQITUi5MuITkVEImhFrDr+WgFRQVkZB4GEfqcW7bwaJJWUVJHVNWWBfWZVFhczn4Gkgbz9P8bMhg77q5ksXDW5X/VzCRVzFsYi6EgHGs0oZXj9rHavmmDd57bu0s3vu3pueuQXExZb9Ao+MKOrOuXUZprX09Z3mtlYic1POmFPlsq90POjgcPeK3/dNQjPrO/P8vyCsX1gV2OayBcmg5/fPakSOkHlzkCENQ7jBQaCg3fIHRfUaNFquRQLzqq7vLaRyGDd0bPzFGW5dMR0nY0CVoK3463ns2FLevriyaFZ0zXNclH2mXK+vlKFTAesOCIdHF7JuUcC8rq6bTS7g9siZPhnlg3xTWwcw2ZNYLYvVUpwO2YGv/H4aOoCCzL7KVg2tzdgKNWKIXB7IGnJyz9sh0yNSTmfYclBAlFNRNedolRBx/dy0cwHBWtGVZ+3A7W2tfBNJJxrKf/ThZH7TMkVQrV89mCAH7XX3mq56pd5XoYkiHkh9F8J2wnx3QF9tMLoUTqlUW+4yYCPKV7GNlqT2DejwSAtcDQM8EqttVj/Rrc/p7rEeMAswgBysCMcc80xO94wOLZjWB7MjvH9tXbfQro4NsCKntaa8KduOoR3IVKNrEddv1rmSYuo9UPvj9corF2/GXD/S7iM7iFF07MaHkUW3F4UKXBPF8dB8yHX3GOpghPQGR3uygOYNHoRxpy2OqVa2hQ2uQ8ZgHHWSxC8+fMGkPm0eL/GIXTYEfuCOKACMRnerOWXfeON2J6hYsLhyyFF3K48TMqEzbHCzGHN6cdbFuLDrYcsA+WD7hTp9c0JZtN9mmNTodruPCldw6xUwgU5mlOPbyGaTeeJ7X8Nxnx83iP8xTFFB8A3kgEl27fR+APqgPFFxebM0MZ4fhbaTToMfrjJ1IRW51hdpVXnLUnKjjetvBVQzWs5gGs4LkLGwZGqXLe1w4Igc+0yACQD6VrMSXyI3TsPhOBS9uyzibVfi2vCOlZZqGgCtPrOHQQFxMHI6SbaY2IsU5aBDmU4UMzoXTxaIqWkR7FBw3y5/fjG0fkCuVB1jJGahtONgjxiRhYKdLcQ7BkNdxfQSXB9w0amwNHhpM43t7a4E0WOQ3xeKRIbTFI5RvRIFqU7Am5vAKRU/gGKjx51in+tYKw5CfaYZVT0LhaAPKE4lvDV9VJwCjt+Yab7J4CNxbTJvVFMrMn2bPzob/hLp6pArrpBV18i5EniZJ2t89AemRkRNRRidrevQpHuwxWsJTfzCJUVkb4inQp1Ch2uCEkBPIweiSD2Zgn1igg7nnmIIAmJOU3iRbCQKFbXozK48AGpDwTTZECqiIPRBxshwxTZyr5sHk0X1S3JP5xVwVAt71WVi61NtU0PlkmDzzL1eJr96YVi2K8hTa7vVPQ7U/+V0bSyBfVgy/1jQnlmUEN/W2eaUOMzgsrcg6tLKkZKSVr513N6yaIzja/h8ZJQLhjTzwBxFIrAA7UuAVLaBFBYSEFLj3EQiaAeFIABIGADkD+JcU2HgD5FEAXCoA0w6IgwD8IAYMvgVEBKBX8sAtHKBOAP6hCGzCgJtOgDCTFfj0K6C0BAhEHlAQfZOu2BgACABgACAAQJAyqrAsINxVDYT+yzNEB2prGMNanbvHnq+n/k/zXR/eurvPxQEH6cJq0Y1fj96zW/Q4tN3bZfHpD3+7paS3enxid8e2w8UtBn3jsb+7IHcYs/uy1Xv5+uXWwQx1fIIVSfEL3CEDXsEDMo8rOKA2/IMBsuITJkcDfCE0aDwmhB6V4w/BY6b4H0qEgQiiME8C6dAaJRBHUFpCFjSgArJh70kRGZ1Tg6g4KL0gdliA3hAHLDxtYQOORjs4oFc6wOW4A33BNbjzdITrsXa6wHlslP7DRQygKxLB4GlMVePB6InK8GH0SDViB5pThWC6SXDj8eLxAZVhQ/hCNeAl4gsqx58S/0W14gcmQe7xHLHDjeJHxHfMRvzHwwxtcAkfkOV4Vf6RVCj0+IJZjv+JnR+UjN/GL9QRwusFecA7eI9sxN+V/49RuWqqjMMXcKrnjIkXdmqYjKEX9moojOEXlmr4jNEXOKrrjCYXHKr7jAwXUGqIjfEXZmrojJkXTmrEjAEXHmpUjBkXDmoUjJEXJmqojMEX7mq0jBIXGGrSjC0XGWrKjA0XvQxNMcNjMwxh8M9jwYzh8GtjJQwx8CdjVMqR8KdjrMokdIfDjsrkdApntApYMB6nPQw7dOfDZMpMNUfDNWrGMAzDMIyaPCxaHIlDXtcoqJM7C7lT2bS0PmYW9kRmhamKfZ15WKveF5VLrnDFKUipxRr0IVwOU0eMyXrez4OLgIPkOOeLforObp4s4RSNs/fi0rC5ZATgl3kowbDty21p8eHaHgLFLRniEkCk06Qxjt1AF4zrpzmT9skP2cAdmJyCKoqEkXHLrr7lsokZfkVUdVDl8LZQB6xw062DehkZaGu9LacfHpOucvAxkQjE47f297nZfGX4125BmfD5pnYp7TvPp2q/MOgoMUFZK+IkOzcZQycn9K9uRlMaEf8DjHfeVRejLJzSiDGpp7yRDIRzvS363vorGpnY7XIks7YHT+fKsqicSEV5sDfHexO3OHAFqG0uvjIZIewWDzdO/bDeL8sxyBXv4wwDWBszRZLaWFh+mNlMnXYEKSPyDoMjFgmQQ0F07skkHrLZPGkSWoykf2QaSLl8jYx7szTTcSHl2HSRp4cUOkReeMTeAR36KVf913IJd56HZmJtUhD2jr7pk5EkfX6Bu6e/Qoz+9VjPkbAgjSi0x2PZ0Hnhu6t9Q/BpbkQ08qA5XqaQKSmBOpfEZ8UHCa4VlMxv1j6zbV/8mKj/vmzIbY6jzALL6PeSNLwxjGfUxgcW3gozB+k+1bgkW/w9V/Haq4g3dJPJPafWx+9b0Ac8sXzuXBb80ScBH9fBNA3Zn+dugVPzd2djZdAuQlZQh8RGo9AKhep5CM2bF8Wr6AlgCRbiBfa0nnzWZtm86P9DDnNNqcNXXQyzvXNT0q5q2JSp9ZxSLlQjVOChSFkIx8ld6ykSMYWfHlJVSBmCIxLtAxh3+124EkjLG94JzzkN4EA93/eC8/dexHBCPInV9fCZAgMtta+hJ5aofygEvil5uylcUesJSadP6+auKkh3mIjw5NwGIl5jIIm8CE5h34lJhyhSLSSGX0Y8AVmQGQci69JiTrfGe/kXINjUemNcGD9jyhx54WKjdPqXiGGOkdcRLByJfMO4Qdrjbgf8zSBdc0YBOmdyVYj3lPuJ54ehDtOXfwnwFQuywtxqnsw2SFz6gGZD7m1UyEVrxgwTcd4OhKK8YdiG7Ud8YBKZGBNGekODAHAVoST9UkoJ5hztexCWctjpv4Bul5lE8EgLmuJOsNGX4fQloodEoy5ZJPi4KJ3MbjwIataTTjFzsEINVGlCr/ukYxBI70kQ2zmbYlizNeSpmDDs8axAcsdj4ImXzitYRInJmi4yqghaXvawblBGFtGZp2lz147NkAhf+vv+rW9KkOgM2sdQryAZPLKt0Xeyc9exPANp+utmQSoTIJC++exZm1pYV6FOz4hnXNWU/Zewti+j5JmIBBpCbSaJ6acmWbxh5OgTZn1FcbrDMAzDsoZ7pM2kIMZh+rp3CG/0Dm7tonWSzdGYy+Mg2pyyp58wkc8paYQFEh89Q9jz2mf2mvVGwH2H8PNBFZNSusKhagJnpwFtPrTceU5Ft2FZXXrrT6dfx2faFOPi8Ww4JRKmJJvD5Qi4nIe66+Y2lnFcT7L0HiBNgU7pVfy4m0vnCWNlhDP2NO6uzUlcrfeWt4Qtz5BtL6piVw8SfW+5bfsIlwROSy7XGxlCr2DMIvt0vFZFZ1rHHJxT6LnfFMJtIO4JfCyMSkXoPqTPjhnoo9S3keehvMscubIyQAtTOQD51SK5mS2D4+g2jJYFfLZN4xRqAZ7VbrV7i47/bOjYiD46P66Md0RSnD6lS7Lo50yyhKPAkfyC8ARnTc85YPeDigvfGrR+tD1RRdxBRL1rqIzxFh4vx25ydsBEagEgoqGIkFcbHotmRzaGKONDREPIJTCNuVvxy9C9t6Rq68AdFjCifnKV4hlNwKHA1a1ApxGrWGI79KIDZgXfDBMk9HZW7mAUT9GVUqoz6yHiYJBA9PsqsNgKaBInG+tvNmD+bDsgDHtFOjbpnM2r1bmuqO12DJ4xb2JoO1qQAgDSommlI5VP3SfUDObs5JwLwVqrCNT++h5pmZ6oPugU4kZFA4lN/vhVgc+NArUqO7CPNB/1E+ay8ddTudPcBrcu4GlWLR7e8dazrROnq8AeqJ1xXYJAlyRMWbntSr8PpnnyWM/s8sK4/0xnssQhPrkhMU5cJy5dIOOTT3pCiqfDja3i5De7aU4s5he8LpPVog49p7m4VP4HhTGKIbz6nNJXlzLDAELDJVdovA3BOclG6FBowUObi7QJx7QFCqNWcyQdRUidrzdTXZsCFSdyV0b6bOS3iWQ87sv/BpRXKUzzlmAU07tVwioBQaesYakQTGB/CTl1pCB0pEiFWw1tlZDKbXlmWlRqvTRSxO2pRm+I+G07qkB0+cl33xKejnYttZupPmYKa7XrUdnnoNxANn1V0lr8L39BPi3x8ezYyWABaaCUKEm1TCAyBo7Dxi/Z+/XYABJEgAFWE9bs5j7LPI/2WVREdfJLcEeoZ57ysNhdsN/gbR3M0gQt8ZGC30IXeOwVDxNZT4anfv2OjW+nn1Rk5ne7GNtokx42wMPl9cEvTSY9RkQT/9vSxoIxqu/VGT00rmin+CXF7xboDPYrMlV5uV7QQTJGIm0TiDeUS4PyGoL20AnWL6sGEfptZZ+hz0Zn4LhztF95qLIqWoOO6pEkHzJn1paNxvRfpzbJhKyzQ2+UUQBwQnK0vVmfgrTCtDFLU2fiG3wAV032AdhYz/xTwgeVKEE4P6NzRG03q48A5UL7KvtWoUnp4vL+mV+tNagH7GadVlWDYRiGMZGdYyIyaBkzvYeEQ7VGZYGb+57sqxVIaN3UZvPWFR7CtmjBhpco5iv5Dp13ANxFDXA74ZjlnJuFduFHLzRjkoVaxVmoKgml1ly4kbdH198rTyooe05gl+wIztxZofrAA/EeFYhkOlzJ9WXDEcWFEj3jAVuX6Pcm8iuXEAFW8v0+1hUK71ddtcgZ4/6FIgcH5DBPskeFePh3DBiFjtiyMieanvkCeegFZrIhMRUPDH/ph9PgIabbN06IFXzLwaNjWDFgVWvsJb9ajT5o8gW4U9BjXjilm6qkEWtjULwOqrilRvdldyee0mJBs7sekmXhfNDs19VdoT3iXPrifhQkK+x6jmTpilz8n3y7KNpnHNBi92ERKW4hLoUoh+MQQ5UR8MlUr99E4WOoTQ6aWmWPqVKjcuZeWxiXAItdqkjmuqVPdmX8RO8Fy4HJASb8aPdwj4AXzRrVM6IGtmxz5WTgTnoqzCNz2r6zDQp5TUw/Xqe4vyN3uBqjSxd4xaSi+ehSEQkh9AKsDqATL1NRAyW78qlDlQXCO+HVWEsk8dMue4XspphUpgeccQthaAZXMA6YLeDGdrh98gKl7JWTD6T+DaWCM+AAuOUw5soMDZefAUSL3PrVw1qXCswQuEd5sSo1Q2GjibD8TMfpbQk3MVV5jx2b1MI3cyO6yj3gjDEmNysJLeq6IQ/gxc5pLACzOP5/yugZwH91vqxA5ON9sIRlIh+qwS08mjf9SGq3ISu/04He7yx07fpsJ0i4yKr9uVibfmndBVX8GEFiZccY1FkmA9qTQOyTe1USLzO8AIR+ZWwTbCj9U3tEoFgxdm8pcJwZWr5bp+st7OvaBCEQSUQYQ8ICvc7G6uo/syoDQMgfLkpCn0m7hjoZRqtQN+k/4aU7JpFshfc8IWmPPTo0ZDW3g3jbWkxxK6zcj91lgFoeiI9gHtVfqLs9e4eRkYzaCMeaA/4vfAiNgygpJFiZ2TTa/HBQ7KldqqhZoVxB/2JHdo2Xz5PclE6b+T8EZw6cGTfALcH3HDic03Al1azJn3liGrczSNX6IzotfBO+Ge1evlXQ3mOiGlsDmzURB1ZoyMkoEZ4QnYKNNNKThmorM/hI7Z2y9rC3whzEypLb7oGvbJQ9pyFNb4ZB6PKgf5dOSdWNvx88aa7skRfeRc6PDY3PbyVrCpKAkNhK5mM9bDfewbYpvjpu+Rt32u7xWrWTqqzr8l5l3V/tyAlofDfkkBT5XT9wN4gUCeNocHwAXQtnBTT+d/6t3W6YWnAkvjfdKSgPxt9BOnVidvRM/RMN5c3bPPrr5Umz46HpDaNIP6Smg8mz9tiIYO/Uv3ipGPIJ6k6CagCmuMu1inbwNNUOYBiGYaRwvvVO/5hpIzcAFsYqThbqo0wMRUV6V/MBg3H01nRf7AZKqSO/uSOKbR85vnQw8k40yW7lL2mwCVu2j1Q6lkKeMLR4EVXKAWYZ2wVdeeS73rNaTiFDKeZgyinSLGTgHN0gETyUPAkHnE8mab96+d+V61Gr2zleOoxRrpoG2H+tiajOkvRwtp7dYZTqy/zW0Z+3JtW6o8RJbPF6tEtJbqcIwvi9jAbA/n9qMdBKEix/w9AyCRo0IQN2uWEZW+pmpwyvHqFmMzg18+Gqwu709mLA5+xYrrOSgd2eASXYglQK1sii74sgGVegqb9lloKavuancRzN60HHoYFW2Xg4EdUzsYmmP1emNEobXZJx+9Ek4Ile2y1BrklCSAxDgmauifcilq00vbQZsk0q9JV4fk65aWR85TtQr5BTKSmr4x9Uf5HuLb5ZZiXRWPQ+pdP2dlUehMAXCKT8kv46CwdovhxscZgIeS/gWTVL4dknO8yLrelytlIRg7obkhHCZ8BispDMmRZLsT/AJcPO10K3cXXnZcHGQInWlPfdprL8QHEd6PLmcqcinmCHK7j6uKD+KUrs9o3haew5D6tSTPCvsZEbfzHbF5EGeWLF7uZZN2F02Ee+jQUeDAVsnKweKbBO39v8Nt8ccxRFmL0CuDmnJjyRrcQo3em66ajtiXmDPMf5jE95DHMWCIQ6lKofzDmBTJpRaul9JnxdaRbCKkyvIr3uBULJieF8aPrljfiN5xJgxifsl5+ebRv4XPsNXi2RuQtJApng1oIh9gYS3kETUXotElJCq3Rsn1g0HT9W/2oX0zdceQyGBUttTAdxk0UiotEB1wYgHle6pG6hx50gzSC4qc8a7k+xw4ELQUfa65uZM4EJrs5RYqSOUvLfIXq57hQ6Sn62BcqkY1V8m3Zkup06eRwJNCcC2kND5dgo82elBL/ZWl1JqsgSworC/svBGbYO2LlVEtwBU9BsbORwes/GYeK1ATfSLtZbLailozI3dvEkIYkB32vUiFtRZC/cLCdLpQrCVAe/IAQZS0UR18EBkleTRXZhCkgwmq57fe/p7zVR5BDFothBzoKvvUcpt80DUTEHnlItCmzs0tcJD7mcQq+uEmax7OUiwnzf0vts3aBJE4J4sh+jaRKLLFe5wV4bicWbjqpRnXg8pDxBaqZXSHwy2A5Cfw9gNVEMc2Iwir2cz3dLLec/Io9dyOmkjJztXSp5kFv/b+Jp8ehy/V7r4+dqjzWZu/xZqhuJAbepwNMhVJkDWfj0CtzPWt90ag/1RXrsQCfq8PLZH22OZZkpxPfuraDBXF7sOtxTsU+V18PxAigbQYBpGqLSlYnp+eXd4mUvSPJxopxERBuGYRgWZX8uIhu81dVBDfJFzgsnLaQd6oGxX/2oStWo589LMea5uDS/gauhGmk97ZgJ8bkTOOKPxsnmZHEOlFOhPF92yHamoW4LL4JOuAe5ks49qCO0xK0bgvXQbWhLfF/zmMR0yIieASMdr5Z1/KonYMLXTp70QOrFtiPL5BgUthCs+YR3FUQyTAR5WKbyLfqHx01RZ01XhhpEBLNAO6MDPrOecHYtyc2L/MrsuO2RMc72wKC4juW4gBvU3miBjrw8NbTXRRuG+MzSbXTQSdykPW0PDndbUCiAGNMJu7PA1hgNm0dK7Jhe4s3pO5x7VTn6rpUyyYTHfSKh3Mh00n0YQQXJYcrzZdfeU/T/hl1mK3JJ7JwMOV2gvgFvJPQ+MNBG/jLFZuwBGptp6S/BmtgWzBqE5CSI1lNxyNV6SuCHzZDTpdn3SCJNTH0+oSaF8adHGisoZ7KQbJoeeurAfsVyPMxZEvZ6DZQLuKydupKWSk6oRN8404PJgND/B2jXSAPkS8KGOEPZWsiHKU2PNCxVQ4mQtcsuhAnffSXUh2+fdJB5zXr3QurvTLFWQiYOgwRH0GPjZ1503JrViGnIrI3RYWOBUh+V3XZMF1he5TlOCpEOVj32bnMLT09H/Sd5mGGyAhxsRYopOUwuUY463nQ3PX4o1nfHbPKKjvmbuabvJPOOV9QNPMiEPy/FKHXZm649dP+phObqZs1jEmO7EBe7T57DGyWHbBn4zHqcyMZtwRnS5nBDBXFIYzRsrp2qOmrGHiBP5jTbkxv5y6RBem4STcaybKRw/t7xMGfxyp58Bk8nL5fZ1wDGQeY1S2lY++0JRxHAui8QF8kKcBDu6c84gjd7WUrJr/s+eQ7XRkHVg/JzprKMCpECPJ289HQF8ejG1Ojt5trTMBtTowdBqCa+TiyQ36S6Dn3x6i9aynIc/xDp7/V3at5lzGmtCaa+M4/HKPGI5KCCVxolusJAVDtQvPoLOHZI17gLila1OJBFeM4aXMnY+X/hQFJCj2jiktNzeHb+SEBlKqOtnxn1HJ6t4JxsJR4MsVFFTrFAZMTCH3Naay4Nq1qXPLzr4vUkt1Td69d7hHPMrM3/Pp87Rz9Jgmg9oEq/c6a+PMCmRhbzanIs+usMV8fzPuS6lfRSLrFGia4c5JH1SZuE/FqB5eDPTlMSBCTtyiJxB2kjyg1aXJi9q8zChC7cYhUzsBzrf7ZyVifZSdgc9aJR9n38KunrgqJVQ8o0QwW+5pAERfj72fLvCmiCnI9QPg4aNPQYJHKEptpfuw5NC0jLNzgPWoiMgPhE/MtCGmC/Cr+hR6IKPJCU0A+39fa2zNiD0yZqH3VHv/ua5xWijZq4lj6IIzGIYRiGkdzjdXwFSRZl10ObT6VfZGUYpYUwirZK8iEpeqk+7ZreffZTBS5w6S4bQorrOAPKODMc8FOC1xNCntjf9g7FC0I7VV4Wo2XeTyqaHTriguEAPaskkNUOhp+Ib9WMk/A2nR5ulXTmBM5rNY8rw+eyjGv6yNk/cHyw/sPFmtdIUDXNmN+4X0lVUnRiLRH5JSxpImzbwSm7aj4/e3N1jEPk2gZXmoHzzqhnKWeezvzhzQis0cb95p5C1VmlsCS0dvv8f0dIPi74CWUZypDgub79pwnlffZMlVURHpiqMdmqvu3DahWEULO5qvzvI//2p9AZzK5WuQdZlFA4QbuFouTRZquxqwef8z9ERmCneFcn7BrJ5PeTWTt7aUgKQwoFW4zAVPIb8pktWjHK79Pcio2H4YI4NoL2AiZNLwHR//aNjEOvX6Qn7BQIhFcp4te6gvHWealvFaq/BU4dBo7LLyY9jqUTx1uYCfW4igJAmN/EEsbGFj0jVfn2QXqod9JzBKNrrq00w8da57zQgvh2YFLpWt5OmwHlX6mn1fafTjRowDIAsmn+ml+N15NEPaZf9Thvh0QjJO4TcLu5S+Ny0X8ap/tk8PSi5NwTYlllM4PTv23V8xTkr6K4KiQWIH95xm8bAG+Uu+nYGeLf+AiGbrAFAdbNZcnrvUUX27RytPyLn4Sjm7RB4/KY+Fzu+rC2JmHYdm/34Cc0tSkYehrCoODFc4CVVR6dzWWeReSSbdQCgaHK0qtEWh0OfvMnbxX3dZIly8SNjCATJdQ2y805FT3YlpsHqUdqlj6ksBumQPMpYVitaX7R7wi8G1QNDmi5pI0gei0QCgGQW3EfQdI83JuKIvKi6LOuMEp8b7391o51ryrUL4TuAEQozwFR0jp8Qvu8ralAXkR/CSXTpJCgY3b9x91rfTbnaVVx1lKgUS9f3PeeRlcQh2/bsA5wAeOL2aKLmnI1A3Ot5nxib/kW1NlnOPhAFmuh0obkY38RLaD2wXLXzWgeroaMNyezPOZaB87Sgi554sHZOIu/gTHP3PHE8/bMVJ6rXGReafWT7Ryjj4Mks6RHNtwAfLnG4pdw9vGWq0dvZeAQBw7WSI6LbfxelPGmp0Xi57eq3NooQq0wYNib8n8xgxG1mwocD+hWxQIqDuwVCOc71tOw+9k/0BNEE34vumClvoDOZTc+hUQcoIBXTgvtzIXOzefQXziKEPp8UZ5B3pxmCKXFtZFgH7cSxxWA8rRoGNxzupNlU0Fdvy1+hxSkfWy0Ss55Ij8juC2J5rPaAblMa34KHHIVKExmuKJZF+uWw4eEjEAYrc53zMhYrMcdIkdDNcFSseQM4zLiXVytppQF/HnLV234YxiGYRiZy/qCb033YoYMiJxC3cxH+ih9ZxWYOprQFpfAEmAJ42mB7B8kbsvECCuw5dwdT5k+GWBDmztI4+BXtt1nWlCmxI1RlgkVlVu8kb0h15/rkC64nd5uRyklzfIYFvr4+1gbnWzKPbxsEmTTGNyAilonAHumF/fOqtqSwAUI84O8sRLqgP9bHRaM4MAOtyH/snlCapmDevjVsx3VSf20EuEGnWX4NsudN3sn2RzhDUlAMNQ4PH7dz4DlFxy5VKV7HLho7YliJn8ZUDs4/zyz84OnW7iSVKwsVTphoN5gq3Rn0ci9kr+ZSoRksZv11WOhoLnvLw/joosu0/+q22Mu6wv2jawaLV483We9MPARHb6gKEfR1lAnpmIVhtNTrJe5qGRaPwea5p0mqg26U+KJKTUXc1rCrxqv+eZb+m74uDniyWNcaBEKA078AlZ+zchIyqUVJcVzMUKFy2oDMyPtrp+2z90ATLxrTyd+fUJxXM86SCWPxpCkY8h1xqTJ9MxaV4QhXNxSD17a8lYRrgKwSsDXkplZ98UNHQYkQbNQetUtcZ/82aGQ8e9UaDqfdQrocwXGjmST86pkc7DLkEP/zUQ2NB51DtGIsscMhZvRBwzOCPptu2CWEi3VvWcyjC4FJ8SjCWg6TS9EijRPPkJ0H3y30OqDjydajEbg1BG0Nd2LwezyPQHt/QGyL4g4xfvvj60aQKJ7vKTiw+XFZCtq8vr+wjnGJjWtCi+4oSV50QF9ICpEgYBrN5d9y8KPBl0Lo+zfhY4aGJGvAuFA2uolE7ifROQlB1JScO622Of4Z6xRoQ6Nr0FOsL38dcfCpZmRHe1Y1wgb7dOYoAcQ/MsRiyM+ufoyRu5P5c8DwP65KuqIQkmr7mgUVkq9MKF7hJHDQMxsTS8wIOkOgT3ka0q2WxnfXQzsh4D0yU5lkEZUjG/MedUvUKk802ZSlgRWfcYy+g0rtO2bhTCte1h5GYvT3Ile66mo/oyRfI9BF2rZcJkS+pP0dCiQgd7dYvbhHDIgclT2BOXK0yDlGoBhkdJsstcvTkVvHz19o1a/aYyovo0am2fi/PEHE/CsBOapnfTwVtURZV0rN/JTm27brRNENX3O8GBK7hu0jRfQ7pBJa1T06CAdRbBB8BJNeTsLbvB16BQ14XeAkXd+aso/gxLP/0VPDLK0b98isZY8LBpkxU6u2TiOGIl1Yg1iXyUS368TqzVqFYbrzInH2zVUUrP6bdxuMoDjXuUwLLcItSGpAbhZWPyVpwiTArOtu9eqPAv3h3RHkqoKcbQKODHd7HLdRJ7v50mBPILBTnZOT8OIhD91udpQicnWp5sMH9LnvU1CO3WowBQLjEYyu9cGIh2GYRgOu6Vy3JpZ6V4N3gHCTtYyNmnyMbpwj+mvhP8Of3NnIVFI8bH1vit2gB9JZoI9usn+y86+xEwaNeC2F8TUkcKqJrTgAe7FmV+X2+32RdGb+aRaXgkYLpqW/wv8VtforFHmFNwmtAkPBbAigVQs+4FmXmbLdnZeUrRHqYZaXXjtttvO+sRDs5AKPpaCgTjasaQpJkXKaMP5wXp0HLFybJfaRf29OQ3A9uEVNb4GJC7HaUc1KQGTIcvGBEQJzGxmBzRRGXFQiDrl0S6tCiEa9CIQecFAGeiQWVH4BA0mMVPQ8ReoP7+rHtteVL8VXPSddt+BczyWEmzPHrZWIewqF8WGVogGjHihHPRMXeraF+XczrZf2xgAqJ+6ZQ+zaUWiKUx9ktkKpbUJi4InRP/ffa5KzGKCweRb1x+SL6F2/x7IXmbrzYyyZY1iRfKu8QX3nuyYgkDAIafUqcc8M9/DurzSPJuQ0TTvIamk4JWub8rrkfpxhlFqh+bOHRCspvljoh+Ln1Z2GjwK7LjJjywEciU24O1GNlzc3ExgogqAAFe9JoXkupQxmN5yJrnyYWb58fRb9TmwQsCJMSRTxOFwtwmugDBbBgoBydgS7xr6w0UI/eC/DTTcCm2aoa8uUTNC72QjMgEqYhWVAfQHUHGoJVxqmMIQc5K7gQnqj3VeI8MJseB4hEJcDmTiAYEnhSOFVKI/a6FE/Xh9xVHO6hdlIVMyGEQZPxJ9CEeKiHiBWDFKbV7qz6/EbA9BOf1tynOYwTJHBJWcFaFh1QkQ9oflU+b871bMHddmv+emGemhrGxf9ShW2TvSAx2ZyQZxWusqitvX1voRj1MgGoGgp2rVzN5BpMsSSKyygxK8Rvd8f5rJCuYNJvxyYYQ8hfSnvZW+NqrlSeDMVs4cT9J1mxtHvrOMvh+ZRTQEyvsk5JjRl2PVmrbY0moArbDE5am6LVXFQQpo23VisdjBdRduLDs7eacUTuSFFWTd3m9SK6gpDwn/VS4qGYea3v1pdV2x+uXUJJvcopKxRwVn6iMfc6oe19HRdVKjMkVjOsp9n84MPMBZIpxTXJInpRi8W4J3Zf8vD3JCUP88H1ctNT3sAkdmCvUpna++ApW3LFwFwtwU3fzk+ltJ87KDt4FUvDCLVSy7GeI0j+3E96oxBWsxtNf2aJqkhXm8dY1M/7cVMInZhmeatSSSV0eYKpfpf439gsehhCewXXJBo16nwoVrqRLB/5A53tDCOvaZW8KHrY8En7UZaDgnnKoAWfhE79vXzZd0ErcCQGaZ0yWw0lXfv4JBZRX5OfJ+GjPD9OIjPzyscmgF8Ozzijx0RcCcD6LKXY/v2Vwa4g2cSPexHU1MZG9zMbcE4M22QDUkgN9IgVtfA/UQAYAAtFoDOaoAelQlCr734H9HhUkgWELapGRNQr5LGC4MF4YvWPu61z9s2eCc+5uDB3495bw5CqPBv1e4Dxb497JjHwUKAIxfcWrLfORtJO0p6wNsYcDZ89otWck35xWU/dubYzi5/avjZ9zwHcz9M/GvVQffA5P0POWVj5CmH0eizrzO0TwTrHOo5Rr9IUsDZ1SjuEN16I41ojvYnLCTjeicQnSHm/PPPwJ8erwWACTUAIQA/IQCwQNIKABroWjppZDFN9ifcEGvrFg8YMsBUOgKBuWA49dThLg82rguBt9igpm6FBkNaNkNNbmYHJUJRCpVxkJ5snVTbHVDzgky29LJCyq3Fprim7+qBDS0L6V+cPnbm+vi1peYoFSX7rwObMprjVz8dVEmSKTShyehfGPnpqARdYgk8LalvQkql1pN8eGqSsCnzmLRu+oduzazux5Uf0WlLj34z4kOSWtVe+5J1VdYqfTsQSjfendTND6HFAly29LFH1TeWmqKH/6pEv69rEhBOTl1G2BG7yVFzMFKG1iPcQhN8U+hrvuzVSU2HViKWjd0Ka0EObEM152dlaWzF9fFPSfVvVuIiT0KxXd/1aV/PtwkRgNDXWY/ZChlfuTiRWpb9+NNmdgzKo6+pNKruSaxUqi7d1OV7r26KW6YoVd1T5ohV4n94uLdxbb0a+M6sQTV7da3iOzyJPJfZiKz7ERXjI7p7p2nGe3mP1UoPYVqhdKAh3hxtEallUpViPpkVXq2UY293yFfSc51BszL82SVH+rI7ogo6dYdFKYTSh4P8eLshEqNa9WAHNx0Rwi92KgKD8UqV7f0Bsef7T0+P1Sdh/zmto10sefiCdZLfun766jedBYECyneb8Nl//Uyhd/X/LXG7En5ckH7q7SapbI5q4+4E/u0S/UNFtg2vgLLp4FstWD/d79lhyffO7Y6J6yxUbmGRVizuQBvR6vyoeiuUc8z2xIctsnhMMtRYmn2rodJOWSqfGfO+fpGDVLy90D+4dYma3KfjzKICgbcv7gvXi+8HfF9pJTvBfm7bvO5YOBe455aV5dRdA8TWRe53laQj6O+1cHwOFnIJUN6GuPODZfdoESFPfRj6+HvM2IOGkikhwn7H0rMYEMOFASPGpQjemxAEbriApPjeiWDmKP39AufcV6NwXUGnAEAAAwESK8wTcGQHZGAk7x3RYOjeAeRA0zoIEVgr/GIhRUYNswWEKLRJKU7whwTumwPL1gTFP1aAZH4ynpZQw6SM0BS4Yooq6ymBrkx3RA3Qm5FYwVZPkWDA+5APZxhDRrhPLYgj0TxECWrJ8wSMXwB6fbgGRtZ2BBNMiuS2PRh3+D8s0u5L61NUN3zGHXqoPLfcpZDvNsB0AEAxwDwAhAqZwCnAOAGIA1Dtum+GuZHMc8hbb25XTwxfvyl+KtsvQKcmYZwC35s6coGDHPLek9hCqaTXfGD0EQPu77STUFD0ygCze3OINYV7k6nck3hKuQcWbbHx0bedKr5VnrnwwaPjf3WPJIq8U39HNX6b4FVtu/OxO38liDq4SlCTK71o8NQb2tc3Wh63jBbtq/HHQU7j67PrTqoOU8uBkHZnC0zV3u5F42uG11n90sfTLPlD7mKNb5z1itHa/1YLXKcoYFjNnmXNSJ0s90/3NHVf3XfvXWebO5FTFkAz3IEON1riFzPrEwxYHn2CnYojKCGofHWUqdY4E9/ml5VNr1jRzNLcyfZYYdJM97v3aG9Zal228kEvprUWdJRdU51ENiOb8uteW/UYLnulcBjgkKRG7nNbVkxd3nus4OXS5dD7rNHk4Wa18t6641eokb/ehty5269xqrTall3EwDVfX6FzHU+7+mPdT8D4IV54nX5zxtk/Rf67HhhPnmRj6Qiv/01V7nh74VMH8CGTxj/NFYG8KdXA4ZlAAkAsmdMc/ZqgXGFwGRWCbBcgZNGTlP/AhzcegRYF4BmQam+J2URMEeA95aaF/XOdRlBnxys84FiJbNinRcAV1mTsFmzVjCSL065PrguLZs14v50g+ewwakXdV5bmDoJu9fA7gGUXOOufyrKN1MkZfpcqNDH+NHc5YYJsmHCzJmN9asZfbECkPK14X8KFO9inL2VhOguU/1uo8/DpeRI5Vkw8+5PvT0fjr5jckt3I1XnTHVJLiVbuhupYPcuyMWqSEN3o/Umf+ozlufv4vNpNSTm5d2PMe8Xn3/WXWc15p63ZHUpeX2S53W7J11+eEMqfnfFi3Y7UWaXkl9elCfe1f/2DDsiDEdSJl7rGjQmaNGS1ii1JqI6quKBNIGgCyBLYNJRxajQkZBEpziRskZ7IQgiACMVRP9CaPMkVdyTcs9WV6A+gTXP9MKotKaGEAnoSTkk6D5APsEeO9KA0mqKqUm8EkgBMWxB3LJhvVQUUKPYE6h5/coWuNqGZ2yxDgkgYB3d8clGrMCz5VW2uaEIa1K+r4jRoR+Y2gK3p1vCi+ZVR70FKf+NkBrmod1Ho/1sROV6Y+4NoJQh1W0EEaYoEwK6yIp5a3Kt4Xpp+btXrUX3+3/7wxg0bpinhnXSnUBW87fEg1TTWMa/pDh2zn9m/9vL+dxHEzLu1v6P62ZjrkEsBvavtvvY+/HLveg/Tw5Y80b+Faa+6P7s2alTXPIhhZTB6J1I37v9n0QTpJy0lq//jJdXVy74epVRK0M92+Te7UdX9xdb+rkaD5sYBQ9Prj+X+7m2Kj15rl9FLbdlc6j3mDzYODbKff+ezO/awNLur699sZv0+Cvr1lbSwb9NGH6WK5+5/tDI18MzpMRkUh/8a3RHoqn3RYrSKSNIW1dRoPcQvVhUoc7obAYoGWN9Nain8HwhvmPUDeCmuDBEp+C/urWt5Kht+nRmhgL0LdLX92TEci+wwYrZVbVthkcn1J17PoBKiwZYCBAxdERZelgnOkLkM8sDQYLwzGrYZkKBek9hPLP58DaFVDGYrpl9slh5C9TEMm9WeRzIF03uAV81WQ/huXHS1qOHYGuE/3QqOlCyINdQQTCnuYdKwuSrL6GSNW5vsc9KQkKdmXfEsAk6DMXWla+yTXDZ7/JEL2YhnTPZDYhQ54CwyYzgjd5uy+FQX1mhqQf9vvE6kfLI7MIR1h10FJWIICsDEplvbgQJDcsO+vML8plk6dkOQjvwDNU7kXCAzXfyVSOJ6lVQ3KaxiYeCL0HBQkaP8HxUp57Y9i77YcHCuZ5dCAkwaeec3skV1KgeAvZ2GpP4du3P/XhfHfSShW1GQkl/62vkjP3KR9dOyiimPX4KAct1+PorfSboTNVy3l0/oVPKZro0cWv6uap6s/4SPK6M9vh/oJj+qXUn6gq28sFJdVBZlgbEek7kdEweoLAQhsvc5pBtcecJDrvhaXI577tup4lAt5TVkl7MYNTJuiuQRypoNenGCJmAFfbs/JhCKmnp2R3N4freHBaLUaNaVS+cumzqkdzMCgQyuHLU3OSJAFh8dJkLp1GsFulDjZKLKZxtKRuT1S2fglnxQMGrzfX/jpIuZeaTC3mp5ctwJ4QWQTu5ikJ7+H8Qp4rIFuAtbuoVoHg9tNbrQnO0Twp7Io8sCLCIElZ0ccpDJiaRWhZo3CxjPSYqj5T8VJJKxt/waSjSBkcqn2AwsE7csWuGY6a91BAJEnuQhYsRjqngos70EgzLvehg1kUBHKmL5eJ6laifWDKskUMaoUle0uh76iQGDmTpOb/bzwjiAnYhp9WzOoUS+fbMGjkNOBMQsFVDAsuWB6JaB+mUFd9ddzsrFynyOVFx31spfDeaJe49yuwcFSelhhwaGVfP0nGyQ2GhHNYYAGqlD9AKMiCRBxFVaBOxBtOOsI0LiiQw6riSD8R8qcGDx6wX1Dg1IRYVX+rSsMU8PzGCwGGRizYnp42zfhre5mJP7V4bilYYzOCxyM0tigm/lxl/LoOaa7nS53WmaOuETl4z/Ecs9Azeq/qWPEOM7bDYtx/RhdVihwvTNsTq+gusipsb8QKqKTsChl08OTPCjisXd6IN+Dd8iI2VGK5ckZgXlTe6I8BQfCfu0tAzlMtjOECrhlWjFRxBl3+GKkfzdcuZe1ie5NZUhALj2cu2Nb6iUghrPGrkfbV1eoa8aEBaI9NnwWGaeK1H47kUmuLmJsPVppfr0yXSAA10+A+QwVUjcV4vyPUHzTBqDEH5G15NNqWdgtiNHmmHv6n4T0qwKCpbhtR2fdhl6q0sCf/TFh6OLZWLrjEt1pMTlOu8/+v1vZurT7YP6p38oa8bJkl+OUyU1B3T/5WX9sTn/1ftq+S0VZ/fv5U5/zUcooy+Pj8/vt7NfpwarRNkvy9dGf/qp8NT+tD8+Sc/7D5Wl7fm518Pv7kLyH8uP36YTtfZD/LRPRaX3zQy/+Wo73/ntjR8f5SJPr210/82oATaj3aIKHtu6+33euPnbr2a/WX/+9oO3zVTPZXL+SNf79Yf5X8C+vXfJc96Ryn/+5/5LbZH69H0Nv0PgPrGBKUheDTuKWCh/zLA45+N7ASXqxurwAXu5JcdQbLUcq0OKmLgKgNbwFFiXvBRoEsLVvSA9zxlwRRFDxxhNG+jKcb25n48gafe+MUkDZ/tzUEYX+LhuCyXRX4h35TtWx1R+hWNywBiDtyHSNR+0jMMovKWL/6Wt+BBXf/u/V77ZBwHceLKF5chUBxYTfgjjmRKRY5eA8jq09n4SHJnEkuiWK4jveKE8OOf+cDHaL5vaLgUvtSXny+XC7qOfYTTVET2VUaayq8m9WfWR/kJnj1NhFZcDGFUKXFdBZ5ViQBr7sFd3JIFB3Jcj7B7z0gXlOW48+53pGpoHVUxmVrTCKZwlI1jcUbd7fVUnDUXOlju0aqwnk9HYiccb6wYTtgj5RBbGvRS2ACAlZavqIhP74v+LzixO/YJ6CRCNvgAlzwCw69t4TBtU04iSQchBgOxL3OwrOwfIBHeabt4wL1v52BQVtD8cV2RkXdBJmBB1/z1NEfIduOPfTXijLW+PZXbog0t1vY+zOwP/dfTFeZxa2eVkJZUfGNl6srR2vEoAuvW2o2ZKTJHa99ZmAguhwht+CXVmhpzvzbT3Fs3rmiFTVeEC5Cye0K3MONlckbSa4XXBfmBBrff+2vVLcIHN4hCmbixVF8aMZt+XUjj1J7vK7Z8WP97CbAhlEQJzUp9Iqpd4p9UnD7KrWpIoCIrgC6cypq+tgTP5fD81Sw8ogy7DRdWemBWaJihtP1XHidUL5Uw6In+ICuEKINyuePuthqSZxi7s2vi2rnO5P220rYM4cyPRcZz297asysJAqrsloFxIJd5a3YOYSlvgXNutCW+enitPPy8utqJrzl8ZkpAj2N4an3g7PihgcJQYToKf7EwNlXwJFXCoS3YKWL7E+7Nd+fUysGkCQ2Oz20IKZD+CUoUBah55ZSCR/rstNzNd5ue0phfhODfU0zUuZLRtw2+P0gszM7ohOngojICgOAh27qOqbQDp1I0Okmww2jiB/TygZ47nocVL5A7mPRj6/e0G4aEK4UI+uEZt1iYhxdzp7bocNXre2h3Mny9CprtYlyL2zAAfFqv00BqUR/Hu4I+2V/Sw/HpXkwJM/TasNwSS1GqiwI+yju+5KQPZVPv8njuXVG/Ir7fP51Pk1jTXxI0gtfJkNaI7GpBNb6BweAgbxjvi10sMdH2S/onB67Hix8Ym9j87I0U7nHZHJgfE04CxY5AO2NOT4c/6CkFcdZxHz3t1rbyNeAlFWdYp10QB5Xwa5uDD+T6j7LCi7G/Mw49ZVp8ICp/ySlT4ym4HsOir8EO7BFuMvtnmetTqd25T9iR4R0aGB4ysiR4CuwQc600QBFy004mfhfvDE2sQDHIDOay1wIh3yGtQkiTH6Dh0B6+DuTIfYHnlD0/+2emSAib+a0Doe5lEvO6tj4xz4gQb9RWI+iir/qGxD2Ggul/bxTmUfrWFdtUlyP5KNNNP8ZYJg1zoTgKskjs98E2rNUWLGhk9eoX8ryzWfQ5qqwIC+1F4OdMWhva7f9E6Hpr2yHo4TWleE77hx5ZT3umpUjfE7gsMrKS2+jLZA8qzNq4boW03q5Xvv/qh6CqWF80gP9H7gJ0xl1dr73n2DQNdWPHyEQGhU7iRjYmv5EZC6jiPt2Xdvy9O0H7F0qpug8BGN1+eVNsnO4IA4zeEEs/XOhDKIZzfLljh82Z+vLEC5JoRKAsXXaS5wa6MZ6lxPWhzAvh2BWDj7CXES1423eDfWFZ3vydUqg1eIU3MllWRvv2BI0XrtulkTuHbLYB0tAGCbs7zTbYD+z0gwLxQXqGlNUCFbZYInd4XrQK30hMKGnfy3zlWUHiunihLbTYVIgVO//pmKf50gCfom8YeC3ereftkN5hiWzYIVw+QnrEQ9pTrI8LQQY5ZZseon3KFJ5KD3fcw51pGGKwgNoavETyNy5b66kYZiEZlQJWED7mHm937bvTFw7uvBC00HfdmVEeXil63V6VNik6jikIuofFWGBD4QMFauqVQb8j3gcpsJmHisK7tg2zYNHiE9icYX8n8cuSl8aj+T4g5aCPSybR9CIcXisye1KEdimes3XAg5JRsWxNUsNQZN2rn4XJ+PHuv6s8hTvLbi0nKDxGp59X0XPjdxCHTGA3+Wvg1uWx1QaQiQj8E/6HoajbfTMYS2yOK7/s5We7VzHorT6EmvEWePcz574kX1VuMKBKnXhymZX/Q9LY45BrS8hkZBIFhs9URnAnP8aqdSuirmNglZMzUjmmo3fYF1sv9IS2h/V2m51umYGP+0sa7nfKXEHboVd0niar+GohQno5vm8b0v6MPNyD7+bqSJbXAb4m7RXCyNT3Sq0UKIP6bm7lJ7For3Y+XtaX5ym1Gp7BX6zb/Tm4Skla+bJc3YmGqSkOME71zXEkphcX9HEn0s2dJWbV9kYiPCuXL4YPl6Y1k+1QHkDRmCPb70RTYAeYYU6PK3igEeT+o7k5sUVPRAHvWl+CbdTmcbRQ40LQOiCaV+jQPdPpKGMKbQ9yp0NEN4VWs54AO29gFGHak365KaHb4l6B7VFhRh6lXlxU+3IReANCtzncj3S6rs4jx039jaJ/hPcsa6qoXBO8qUkjL88KP6BnmspHraZ8FG4Degi4liHgapDZYSUhWhOebcCPMVFRh0zSZEPDHT92bTV8J1BsE3bD/go1e0zav4UyUBIncSxfwF/ClUYAMcQxlEDV/VXAzfFc04h+LkeaZxdfCVhLoqFz9f2fU+BNZBnYair50j6cLyVdQujtfDNwyAcgxkyaT9MBm11WJpBR6aKnJ24oKwTFs2aKnv3Ghg9mshLAz4B24N2RSdDOe4lkTnenfQ4ZSJCPhpG00/sbiDfL0wrluGT8OVVzBJDfUm8St7bHN/9MAi7uOF3Bepf3Zx1AeSuFbhqJeisttYWiupdKlP/SXa8SjTcCLgykzF2FMK4KMw+MyU9RGRuYzSRxSXIi7ETtIg9ixOnSxInsBlafVu/v9Od1ANQmnOZiXtSJLYOxdPdqUJ9K/AazZBPBgVFZ4XvaMQ9IwQuWRYvr9SPI/Fq8I/E0J+vcZxNMJjbKE6azug3r+p6Wn14WqgubZq7inGKa5oSbnumvGCYYTFdDFBjUqVk3IERyhMcFjVPhL3slifzWquhAefTp5mW66s3zI2g9REPJh0iEbv3COT0AiNu3aCL/78hZQBiJcBDyHlQ5zljuI2l2cMFTBJfKnGmaWvucY0cDzFFePXU+skwQGOJEb1McdBMLwW+DXwlZ5DKYX6OqnrlANVgnTV7jb9DZ0Volw0eCFD//IlqJoHjplOMFEF+sYxxuiPc8eQW2ta+hL6El8uryIC8BX+QOOUFfbcTgZPt7jUWWAxvGP42+vzGerqjqK6x+GCQPJCNehpZl7dWBsL2gzlx+qCIBXpeMYJ+17hdUG8OCcc0USA3RnnFeOe9hHH/49e9WJtDYEdFpZjSzTHRGuxsIeSET6EJhzQ38zWSVE9FvURl3DYQ1Ii4OzWEF9x54OM/E1kWAvpkRooI5mZa3hR3LYyIoLpcEYc+G4BTucvaFQ3tWGuEtlX5qMsiLmlGlK37RbRCMVlUX0ABsZsHAWQvjSZ1Lx58ZbZWlZ2iu7BVsYzTcXHjF3v7YSdiDBQGTz35iTeSHjZfcQbd8zWDjhCXzXONf83VsxW/JHIg6M0bl6XBeU+HhOh939EXxgsgG86VlfVYKav/ysn2Yd26b5v7Ixi+TQ9dE85MXNdZS+at8LTobdfphfuVTkpzw2VUsRdoV3n5sRWGH6MCsICn8SZU/1NdMhRnVDlhMdM1VnaFRk3Dx0hx3fLvt1F5LRks1zDBxd3vq56Zec25qH6ad/BBGGiM0myS7PYy8bbzrLep4nWwdWoHk1E8t2HHd6IRBXNEw4MSVATxx9ZIBnXFfvZYDMGr4YiKk1tuxVNi4vA3ZA+D6eKAodFyGi2Q0CmlCV4c7dyBbg0TswIBpvAUctzz2dgOkkFz+3FWAI9YHZrDThgNTilDvtgAzquVQjitelbJ/+I6NkH1XrdIYrMpeVxp2bDyBnGnjit2fMI5bwzJJYaVPgsJLfMp0JwNasnHoTnRiiIyDgIm19pbK6ICNa6gHQ1tdMrof5JRLsQ50YnpMjy1kx22vvvlTCVBNy19/aEG7c7p/OV2lKuRMsxSDTgBSc5JcsMBYbCTMtFcYy6yx2e1pdJO9JBGOSN2nRiwu7ooMETaD1agDkFaIv9CJysKnDqY96Ky316EitkxJDwPm0YqCgYS0E9L1ypGCKpuLuHKxG6dn3g5KpCr1p+GKsznVPEksd1UwBUW3plEraPS+Q8KX24hBSDF6kiw7xwT1/DtRxgDchDDzTOfKWCovDJMh6o6UY7yXzgNmeaXsSHR2nJ4dywJlr5N2oLfj1UG23RU2UY8/nTAMR9t+jpaDnTlRsjD0AC2rGK4S6tioDX0H2WNnZZwo1EO8OJFaqrQyqWCBlt1XdTBbUT5k6nwk6UKPdeGLJOshE8fHTG4r4/q5ooyHApwmOJ+2h3iY7RXFRAcbJHEI7sMCovM5ltK5pAPOGo4HnsM6b7CMFTCKew43I9miD4XlGxTlTEkBC8FZWp2CV9jDDs/4BbaM2f3bBmQYFGFd0JEuQ5CTYsbURDCDjsA7SgN7iQmE+TTFz7qgjBN76JRibR5aR30aVwcYcZezOSCVzJfVME+45zeGWVxYNGjAQ6R39X5GXSbN+QXSTie4yWkacQmVuMUSCxmnIfcC7o3hsDNunoS95UBTn7QsMhtUxuRNBL2V9VcGAdky5MrYlzdf5WcjJLIXis4RHEyYHTWGT/7JgI+vHwDe3qx6CrgyXh4TSYbX58L3fCYCtoOXCZdqMy1cQMZGGaMzIp2/KvcVs1NXLcjqAb4apFYBvMYAlQDC2O+e78qdHeOsclh/Bxh7k3tsiocCCHR/rrqMrngbCFhqeDPvfoyVmuZzDxo1QMhJ2DE+d4qzkO0t9yBzzsEpZW+0p2HtlmpYATBctCrlkJ6jWkV0rWcp8cNLCX1xwtd69ei8ZNXvYAUeQ5qBX20wqzs0p3S5AD6erKB5K8Jv4C+ro7VSMHjWQ+5BPdtPOAVdxOHqKAGmTkD0kj7um4TfHg/7/dviaa8XPbJSTJUQKds7EhIzSww8Vm63azMh8qTVNwHieNnIRuy7sbvwS54DYA8hD4Fy43Al3dP/pUk7O35fkeNU7lREuaZzeby+Jk72tONWYlL8NrL2QjeejiCfPBeT2sY6Ks+XSLTdHZ5PQupTdvvy+1Wc4KWRUT8yZh9Hl3B2CEYZcr1rJevHu44lHqlxA8fHpHzwgs8TCc8qCCWz/toDHHo9/sgm6A6932+JbS6OBdAPpJROgc1yForFVCFQpuYH8i4bfR6JflkguvtmFYWtQmA9A+YqCN7AB6uldPVmyWuS+ipxuETmITWHiDxcKbPkE5VKgr87fwrXErhD5fPWhX3DjBmwtPtyM083oowGXzjoGgeDOxuoq6x4Fecnpy5BoJwsKmnPJ/xyFFk3cR43xbcUNk59z+gCoYVizw7zcVpZXYn48uuxTTBEJj24dCJ6Jf33kIS6DYu3d9/QJLOgcyWJWFHOjlzuqGKaOyd7VqV/HDnlH/jiALcnRgbAU7CfNAoHyHziCePAT5o5FzhPdi1BLqwl6DmTJ4mofHC9ZnFpGKE/etKKzCWwPsKDZ0wnmXwe4jGoD/HWMaxmTnIkT1Baakvx+gwJdynZyuKLks3w2KaXgpW0RiciPWnz44eVquQa4Wxi+YEHJcIUC9s/SZY8sYvy+c1cRKqNmYRRXpopFEQbFYdokz1JPLPleiNJYq9PODIZwP5GwVAn5AP3hTLVHTdPQd3tUfbMihxIwlkMPAnw/+sYkr9gBe4mvuaOz7lrZSxLXLj947rDx1sQF5pweTkb9XpH9fQX+TrhkuyYnimgMGnhRq9SPafmhDJ9w+mrhirP2t7MmnH6QUkPZ+F/nMSYsKuM2nZt/8P2hQWFCd6nwsNAOR9Y3DJRXMESVok3uizlmdLTfOpnAGx4zbZDEofymYdHeCFHnd0K3T7AVqg0s9sQrrUFLCu7STCryzBSDTdGjIsk0wzawPtWp3wUbKw3i0Md84wLsd87u4Ct8iZ1yjeBefUmcagZbyxwbESpGQl1jRkRkHMN7EPePx4xPvLYNJZ2tq9hnvkGUxxqxfk77cJ3MtcxJTGPOjyGqW8MDS51YlaPqZWBR9HIQwROICqewvs7TOvz38A9RibDumkyqjLLgfQN3BBN3zn9Xvd6tw5J4E6XfawKnEmSlqn5azUyb2O2vkjq+seWQjBK6rfqYfCQVQ+a4BpEmyJDe0XD6EpniHqpgdyjXmkTs2ev3bELOWwNV6ALNTCDuzch8RXg3omxP4cViyPulctYHXe9L3OtY5mcTe17Tb4hjCRQ8ljg7OxTIONe8mCrkZ+0E123VyaUJK22tnkSOJ1JMtFIRdF2jSPEF3IzsdJogllhLIfQ8ksvkDUzqSjrPzUZ+6xqdAePJCVTzrwbJIAF0GxZk+y8Ip/e+1GTC07TtB07UCZWQ3PEFjaZ5Mt6HUVPs54YOpPabagojl/pGRH/VZE3Rct+k8OynuH90q66kQWy+6x4Q7D+D1vR3yb07ETdYnnD/A4HMDmN2Q4t1XtJzDjTIpe5NZQKI57UG07P3JBbReA2g9ZMun+O0c3rx9b2aC/wAXflQ92WgndggIrFD2FPODIkqJfmpbCMAbSpgjvK7Y3LTo8qEUudZPQx+tFuvC+4f6SDHeJh4/4XAEkTglESjxzdOCb0Vm03flJZFyqlWFTsunL/o1uclPeq1YacFrM9+hzUusvTRSoKmaZdBGebfNiI75wLhf/axl7+ggbGkXW46BkxF3Xb+lTsQFdVBi7KWkKzI/9nlCPVnonGzEW5b2tSvKOGHe8dAg+uZ9Y8ISgeUs2GUkkuRvF+t90Zsc1ndtxrbLqFWeEt8hxe/LUZNgulFIgAqHB1hhtG16o6ADetHgx+P4v3HevNxWPI6TFkbFUdq7pxlMTdn+HFNgfvcjUes8mssodRq/OsmaLKue6TdeekX883IV5wAP8GqUBDH8fKH+jTvTVYgruzy6EYw5bfPb8WygvB1UV+Z0SfRBzdPkzrMyNf2czH8/CiGrTgf0cH9yyfXtJaoqvd75brNJ99Qqz7aj7yMH3pfjQoifuzT02YiZ6pnAJ+fYkz7feQ0MaQPxV/qNsUPkAy4TG7cSFKMdhvB/EqVeTDfuw4QvaWsIgsaysTOk6WfYP+ONTm+L2z6KkS8wd7wfIWUpaSvN9P8f/7Vz0kLpPeO0+wLt8Xiuy1uUSIjHT886ILxotKkKstxdmIPKVUdpcLmeTLyL8RFUXL5HTUWVchvaWm5Ex7n+xktKRG04LNqFoTId4Q1IchFV5dIq0yvS1uzmNbmqLXm629c+jpxhFYLBkpa0GlHR97TalUhiSQYCVpZv2p5D0LdUwirE+VvClsrUqib38RmzzoXuu06Qv3lkq+l63YWYT4h6Cxi9I+tltM9/wTm4heJoEdbV/4am1GcjaoPd4Lwj6cgg3bdsVRtvIDTenkZL6cN1PMjB4AMVxSYV6a/+SVodZrrTzMVhfIUVR0YGCTZStkhjn3XjkoISS9JWXBrYfXD3ZPZp7OQ5kR0RWOLwpzMbKmPxRUZsPSZrHmbxp/nIV720DorvZ5xw2vo8zOoCzaeC+L4XeLLC92m/v68IqOfb+hOBlFHUvBNoGwmqmQIL55niIu6fHSM0Pow4smEvuMzrPn/VnwmCRkPRCOiZjb+BQvdxsYvQeTnTgU2L9WQ3eV+VGmkqCG0ktH5MYqL+Dg7eKlDYah8gMQlM3oSns1jowvsG4PvMf8WWFvnseSKHNetM4FOSZ9M9r2xztT6cGDZIjMyg2nnPbAOjmByPzLdunT2HMqP4T/NIoL23zdT3z1HjMPDztsgxQgKJYBvhjSDxCics35dcdTvXRnGdXxeKdmBwbNcZ5v/TxasKPvQQL6JLs3D/eHgQ4BIvWORzf58vxAsJqGgifraHY+jPX2PyjH/KZeNqLNNbjAWZrIJxauOxprFCToJiesu8PNegm3UQqYsqDLJla99SxktbmcXtz3LITBExOoE4NQTKoEOTJd7sT846DjiKnwvpewgywGNnSylATWXYIGKPCnAqTK2Fcsw5JBqcNR68V16cCqYMuekHWBE9KbU3pwzgyVnpyJ7RaB51gbaiifb0Fn4x2VZnueqfsPI9+DTPf3KYUSxujJMQxp6vGllE9fLK+cKJYQKQk/Q+bEbBHSZnLkVjIZPjB7Z87scEFOtEKX8fQ5xsGWzZenrC3tUi503wV/UfB7lzhd1wxnSJoFFq2Pg3LSsBix8HsHYPsh1R8PdpySN/ajye44YTWWUsRtJAL+7DB69Pe5x5AYLjn5H1KI/iowwdizkSGTYh3yxZrWiowb3pZyCoF87BGoIBmXg6pw2FAzKiGetPF4pU8e4Gex8QpVDaRGXWDTmfMBPuitaaeWaPmCV5zVWounC6rRjXrGh9SQviazsEilYXRorsg1XxCfYE7nOz8GCaCJpZXhSQZggziM8UWksZPRe6OR3MmbWY0HnqvvxntunNRmfIgOI/ynEW2sMX2rEO2L23qGOMRydlfcKXoi09fdSyPvuiy24tlW4PbWPSc8zG4aFDjeNhWk2KLSf1bVeh8FpWBejorwff+tbE9GDbOhrlfv1wx90JYlLe9+EVHFoHyfpJw+L1eD1i7nShVnzdX2Y9L9c+hmsk+QaBt919JSop0v3Ay5CfUz3Qf5MXUHpUwatwETDNvdUwvkmmcnsyJDVvLGLkJieSjSkW6aeWz0nSKlIOash/8utLT0LNp6nFVnN5ASSLahRIXJFJoE8SpkIwDU6O0D7TjjncqM+Wd5zK88DO+YNtDqUg4ys6VW7aFND+jKP01MCyOKRTFyxgOLl5GPU9JpMp/i7YVWqJFnv5egXSNKja2HK3MLkJioHeFPuozxZw0syqBBjulNvjcUADoAeogfpvtOwTyi5zmeHkahVi8aMWn4ocpF/LuwPpA/ciL5qsV7e77ZWMncOEeM18lu1YDi1zCfr4b3pwjihVbKIvEuYNaAaflRHSDsIbK5UkkDGw19/b2JmISOJqFNeS0PsBoaKtR4PfO+irtlotmsjSb8UqynAoUo/k+paBBI76DZbDpqsaZ7nJJNHcxqdv4jek6zYUA4q1NEYpQe7e7IRv8lz9d7nifVhEqxsf2QLBjM+Wep3B6WJJ9JCbDGrJA5v0uCr6k+SLmY2nXDGV+mdbZtlcDLnHLwDG2d71RCtiZ+9q8sQ1ZbAByUxhETjodbP16tXi6y+sA/0SnNqLuSoBoRebKVxpZrZn/RoXu0iBgp6nK0ygSNfes2Zq68mAWe/VZpUEoWXfwkPYNJN44akSwnLd9d7AbW+eJ3Jh1+4u/YjyeP+y9me3KBrJ9Zxw+2BXsIHuTTzv1ZHtBiZDQh6Iue4zgFDGdXSzbi5XCJXNCQJCfMbUEUg9Hf1CIujnktT2kvk3yDr4N4S+2wkKejqj9qY6+WPPXpGNGu2J5Owq3fgy8zxnWi7SGf8a9RayXBQDO9KRruVi8Ewl1uWS2zaG5I/sZo3EN6uk7X8uTdTfINvib6hrWeExqvmHoXrRsaXu5sDQN7wu8WSX7066gN3FqShP4POwT58Q0emQDpOdKvw9L5BhNiqb3BwrD5VkSC1S2zCHmPJCufk/RwZkt+NDYWEHfxY30nR8PD7zGitHV6saFqdBgTVlWnx+dyWGra+MPkZfqqnFfQ2KJumto9wAb5jgCa/XZCsRLjVAGyGqAeHraH+1HGkaUIfMwuZCVpn/nGo4M4w+rco6j6PvACEIOUxzxKejy9RkGK9tbFt4veJDqRV4BJ/BU1xptG0ZRnQW/uq1bEIg1BZ+oHJNfO1Sm5fev47YJuLvUK8zBOOo+btIDWytbhfMzCoWYWc8dnsD50KEoF8poV9gYcfJPRUwuxzNerL/lZb9g2CHQysxsh3QDrVXCa4riO4U6G5q/S2xh05bL8RUX1oJ7KhB5Wbxj8TbLWTugrW/6JI29Cvt8OsR+S3jeO6gELvkHPMHZed/WJoeA59ueDKeeQmVcPwaCRyzy8FpgVKqg4QPRuw9NXliLy39C4Luu5ctk9VpY3bwbldkk+ek+aRa2B0p3+fMVo4YwUpuxGpT9O8ZbgjSxxPEXjj1ep8SxWlXbYJ0PvHK6G8FAVvxclVkeqhaWMcFuD/Vii1oDGoqRHO4wc61/Z5hPLjZxm2oji9xRa8eeUzQHvvyur7ubd2Dm8ZrGM5jyYVE/JRTS88rC/CJ0qxPfenhP5l/iBFFzWYGD23oYV9w+BSDHvXVm2PcMA7rIcGVNdCkBrqFR2aqBjSjKY2GCYP4LU77E81h4UTh7n58OwB4U0elE8fGYkGUO0AsQRwOfPqgSzzE3Dn4MyuOTr0tVKz81cVKamICGTkPy6EbNzZE52+62jfkMwiPFjIgl9P36ArTxlTaTPKtFmlJ7yRP/omIjg3mRtVbfUIR05C6Qm6W2Zsh8eLN6KKr7TSB6/85yMkcMASvpnocstvZKznlLWKus2SOl4AcZQ7iwpWXz1Q1mMNaKJBlVzyKtXX6DPjvZakElUg+JTzGsBfg6U9OC1jJjNjUQthNwiKb1OTnV/7TT368cpWgz9ry//h72bz3ez0erOZmuz2Pz2tsUSc3dk8VibxWS/4LvDZoIJj1wbzhRv11VXSSPrdqx4vcIXw2hjqV0aNMrUvIPNJQsh7ZuVMrInjYj561LYGtuE1oWIJ1ENhkzRaFB2Sp+GV921N7b7fXAz+38nzFIMTCgoHvE+h5219y45tfaaGXGt3lu1pzpGinwBZliw1X9K5CmOs8H2CTXuT1abx/+2y5bQiSjVKmiqCyEsDKwUA2PoF48GBr0maOBuf6AvzjjQM2TYaH7rVXxLJl4hsUig/4T6uARVwuiWzqX1WOsH83OSdmEIkV1GbfZwprC0E09mbZ+IbZee9ljw+sBpyMxcQv1wgz9qq78Pvk0Kv3gBj6xotIXrPPFR8z+EsIvQt/U0ede4My/Fd46jED3pBElTnBZtd2gNz1LnbLma3rj9dZAPzb68g5x9W7psv1H6j6/E5CPNgzCdYmIjQZ8siCaddWliloejVEw/+zZyMy2sW5BnJCVxi21AZi3NQurMIlwiKE62D8kxpxHh1+uABhp+yupfToJJtUupKbKIo8YUszUa8fAIygN1nFSgWy6B6iJc8JUPMYwk+oppnC9bI8SJPDfG2ffHv1JRU/jGFtmiQ4izbOj2AsR2PSZAhjd/STTgnNhBxWC+7BUCsPRTz24mmGxv8SoaTzJYdU7AMc4VO5fIyrFtavMM3OSq+pkdc0lXDzxYloSc/pm9eKVrUcPvMjtHZKIk/gyoKxGIFZhAOm9bMaKBMQc23TaVMLj7XUi6JLpon+yyIZxEvchp9PZQzzSCJkvd1JLtE8eHXn0/WUkOJ0wgmzKztJqpmTZd6pvAiyl99NX3ZB89Sd7uq9ezS2QIbts2RhbXsY1Hb6d63mf1tOfah3xWbKulXnZmIPg/VQo+18fM7lDY5japuEjUsWZKrEWcu4RR5Zhjzl71Wqz4p4hAVKNqtkeCrO4yX1VssXwomzJYxYZB7R0OW3HKpSG5E82V2G+uW7LRokbIkw101DBf9Sn/d8+5nagBIKAMoP8zWw1tipLbeepkspL6oWXgwyyeSCykbc0kjliGMLLSnWik/L7FbnrSpkAeFViL1aicEhVOwGKBOi7o11twfPhJ2+RFs7DeTqdCzSBLVTMh6zLTEBZyQF3GSPD4bnaXY1Ym6vpvBpUNP1aukVJZplKtOxsdsUeTW0qKlLPFQMeikXKMdjPnxddS85LltYFtxuxpTFJIVvEtMFMFL+TTmFJV2LVA/mbYvr4k34Fd7QXT3cuYlwZvRfovSckwPlaeQpL2ckjLNCtQ75AGqckQ7pF2qKIbWAQ3naPQxnrH/ry6LsdpPcL6++Hcag/womyCPSZkytM09I0PEshGAs2VDQSvKcDdFSDrF9jUP43PB7lRReX+Vx12nhOh+53BsohoH5tMb8gaEAwMVbPx/6Q+TFRQanVy19akxkgXsDWQmsf7ucO9D7OolPub6oBu2qLz9Hc7gs38m1FNmTe8kYKHDMtv665KCo/+hUGVYmdaDc25V7gdqd6MBuqHdeYTMoqkloGXXISwpod+cVnnIToJKz+AKgIe1nl7ZqkVKkFXBJaAxEUzIsFdcUpWH/OaQ1xrqYpojY2DmIk++akyADaFlW/cUSzMlgsnZMzO+6mNQe3CIo1NaGSctp970DTOxx9n2/LCNUPLNr0XIuDn+wcrx/92ZnNEZeANpgEXaj/vv5zjhgE8+OmTd8djA5Qfd6i8YfI5gYXmCXMtMyZoLvlBcglPwXHJ7IzJUv9cyrlM+1n9Sr+P8ywuCbN5VtJLHTuzvmKwvN5WDJO1feDOistSWtfHVlDZcepw2iVgtc1MStcoVKcaNNConGsZoxXtrXdO6Jy2LiS9e8XqSx+lLq6sE9xuNPVXP5o3W4L2a4begDnEV3c0jhU/ie53yb95KmVNx0z263kiJGRk6JrzOlL25lE0PeHbm+GsGkE9cStU3456fFusJ2SzMdeTeDoPL3BlaB3OxHENj5ZxQiFTp63xPw7gA6ZDcCefKxGTOdRdI0gw7Hkv1EiMACrH0y/sWitO0WEWy5M4NtDmAz7aVSDJcEIruC55sF0YPLQyEhljwz8NvA+yGKS2bJgOd/mO78E+gbALafeHcw6bAy7ubyFBJfVL3i0b5UK5BpWz1qU2l21/+Ot9A3JDbZ4hJp4Q2zW9MKUxmk+TpL9p21c+M8L/2cssRIMGmxU0y2Hnfg6p7eROA2jdG2hZt4ZaEOl2Rp/AaNxJU7sX2fVbeQppWdqSZyImUvAOnbsF40gkfm/dRtklOEBhd+Cq7deJpd8W6sdqX7q66++Vz53P2FwrqY5PddWNzkkOmrkQ+wgKrPoSaCRBOgEapgj2QcxM6bYcMVJ88f9bJ8ovN4eKCK1O0sAc+fevhhGJ7zef5FXYUdcjiZQJrBO+bxHMvxDG/xMWZxenBgRoO4F+G2DTyFKecohxpL941WralaFaSrwzmVjRJ5p7pZFk2TMSUOHtcKejn/bzJkXtMjRghH56UPK4SMQpa1/o4IEoErCEeVx8FmfOtzKNMl1FqNvYKPn4pM83P7+cKRVrzzdaBuv1/uTlBzRxOWHhX5y5vODhEw4xHZfj2i9VjNmwfgdGtmHPEkyiQ8TMMlFsDfoGhOyzxhUOOuffq8/QMuUBKL9hyyU0JfG4xPi+fMHAWnapvLzUTaiPpL5s3JhYg6hgyNNg9Uv37WrXGEeO5xyauH00iUzajW4/dCgJdZtTrmAmZqyFaj1CgPIuMl+p4JwzWbwDeI5EL55IB5MqokoSTA00t0Xza7bFPaoiW6jHSDLZ7J/Di9mN7GPxbnbBsPOMQekCLicy1WV7cgOwGa2Kdwh59sFZHeLbmkwxtPxJpTSUXKa6YJuGRTcDF1UMSIj17nPXwi/X+w0NmR4BkQD2d1p9hCCmqplwCtUcxTVSYTtKSywLZaHebLky34JaWpGSmRLiqUjr49wlo4t6SnBiqN7Pqo609nsKwl3p8H9eTJzVyX6m1T6He5XkFipUKrCq9jJTgt6oqh2twQvGKkc00PmrJtNXuMS7S+PXqwkYWt7YvkN8w5nF+ERk5hiCmF+y/5SYx04PjsuTmfNozI7x5auOlMSYSKEn38DJi2rOwMFjOL0NxfaCfznmVqcV/Gg6fVqxv1WJ/YP4MD03/PoLJDcXsu/FbeNSDGBF4jvjZEyjC0ehK4Vb6laEXUEviVeioLdU/slcOj0NnsyZEcmrmRMg87+l492WDeeqXaNgdt8s3pgKe/eaX2jzBdN6ll0oeokR1qL/cPgQqKj2RVdxsL0AVzmvWdNdu79JMZlJs5aLdCnjfjuRjH5L//mzPrLGvwJFW4NYFPLzJO2ieRdpBoz4a+96RKmrdpVEQERsZvXmgaW7KLLw6lz2ZYzQlJ+KYV4tbFKxEHKHTAaW1/6+vYfzwNx+DmmOWvBI7Ouat9Jy+bLAh+ZQF6OLFPP3bi+ksM9wHAqgE4mosVZEYSmT8tY2EfSSuPScYzQUutUxLlu3nPHIVtc9UaenV6oRpiihq5QqT5ZmLfsdbTLCPNn4VK4ohekVbVba0mmjhKb1TalpPLJOiboo0HSKJHblYXqAhUIeixbloEWkiPvCN6O5/yv4Zrh9LidaPaXITDSJRmSfdUa0v9wp1ryAOX+QdhkMC61qzrwBiuuYOHvTC+fszoKdmYHpXM2gk1gI12mh+4DS9FSoF6la2/Xg+yHvtzw7rSHY3/aWDLTnUpfuXxAah66xMutHR6Jptx4jTii2KKHNlk/uOHzNP0YkifWD7FjDiX6eULk3QafI3JNBH8sVzmnxMauo/RnNQvLhGOOhpE+g47g8ns0nrnXQD/grusatgo5+yugI2Ssh0fgOuV3gdpQqx9gkrJmZ5F743GBNTaoZn3K5M0YqXYlYtakdpbhn+cNWuXKX6Vqs/hA8+roCnMf54lCwMqcrDkxyT14gfgqnLTemhoVVMLqzSNllPAS6qL/B4476Cq9imuwA2stVNnUhHKb6Kceg5OLVbbeKnr3njs4sUdLF99JKjXaGDG5Pe3A7/h0kovxRdcWvM5Rr38ifuNdzvll0cn/CHCSUpcNfUPlbsIXljymS0XuLX7j2MK4Q09rNhUVCxQrLXJWAm5r3dh9W9UQ48hrohtY/HvQHnB+8efr35rWtnlZvTWK98Jd1LOMMmTLL7Y3moAevNg6S0QwdNqCTTEpI6Dp3FX4BjKXXhDfkGTmxB8d83FCls6YYmF2PShiJUz2Kg2gFoRxj6L4vpj5ou4019NkeahAq5+Y+SUGHrfnuyjQFsCs71a+b0VeG3UJTud77BiBBu5lv5Xx4ZD1blr4/pXWF9SeSldAFnhT502tBfwk6pfM4E8BiQy+6Y7HC/Laeu1gYV4FOwD/Tp6CdY6DOFKeVYbBzl0J7AHt8U4Foy+6zwOT3J931flVd/dr7cEZg3hVNG5gt7xf8/bu0AJ/06334VXdBtt8N4ceF9/60O3ShvF6mnRBuSEnlE3hXgnqVCv8gQ0ORG5HtN14Grzb/nwIUZZ1YwB8ZYUyiOw/oVuhQMKeo9arSJ+3FvknzomOf+Mm/99gNVd3+X14TYsXn8mXQ2yrtvV+XTTzk2w3Nb8OlcJsj9H7K6ub2Okr9bgprmgYyn3jZok6GWhUvTew/7dM/zcwnQUE9D457gItQIFORq1XnUG7eyD3T98LAj0I7PUEWr7arvcKl4xMqHRZOCEFVr7KE0aNKtvy7Qcresj6QIFXzIKVGidxw1h1rLG9JyHuDR5ixQcK2Ov4ZcDNGyx/rbroD1uJFd/+X6x+U2VVcjTd51/8jMlraUcMNqDeqfEsgXB3PiQ9T8ZI2jR7hLR0aQoku9vsj6Xxwtv/Z1MXErd+V0hMil8WSPIFzWSnVJ4hmjP8edTtY7u28DaPnWsemUpEwTagmLVVxR40fI+SRDZUsEd8RvpTGhNcIfUaL0FYU4emXIZBoNql8Jtm9hJohUmOL90k8nty/scXZlOaDJEaU8QNex9L1+8SlL07KKbMmAovD9q7vr5yzfJCDNVC3rm/27mHBo7kMlgQ+ePcwJngUXwMDXeJPEj8xz6y8Jd8bQv9LWVovvpTD2C96t9yvLpFdtGJVs1XabvEVudZ9IVXK94bTib6X9Mn9bOSPvatrv0pvgB573YflQu2JuL5KgCMx56ydc3e2QSpeiIAz572aCdJDEp+/cly3W8D8PZSzfURhIjJSdCKreBAf1sgr0BVy0OnDXD/C60KLNtdmbGl3Ebkic216yTpI397vMz8Uby5W3dm+W1Qww4gr8MZqYpGVlGg0pKjTlhJL+m7Jrlx5M0f8sZo8F9zJ+/yrRLALD/6XSPyFucTWJFkxbk0SyD9Wam3aV6hO/v0idpjeTWMjhqp260GeYR0I10by67jzeipy56O9HuQNMHQSmvzb0ZMgr4/xLwdIMfeaXCUu7fZ74vnLz6mXedZFm1uEXi9NczK5nnt8ZNuuKrYyXS80fgd2YXAyoP1TvXgK8R4/wpK76zJYXl+bMWcau70KHuqymo2jjD9p5xVfBqgPQfMlb/ND1+ek/oLt2H7Zz+kaoaUdPfzJE/y7lOFgfYbzU+hPFLtTNOlQ7P0Nvpcj8u7OiC8u5V1xLM/+5Uh/LHaQFPAJvc/ZfUk3uZSOQ2TsaLV7Z9Lp66N6AplFlO9RBPc0y/o+Daizz6fI/GP+BPSouMTpZRzm/eENy85NXOHgFW4+yCeWrx2/G5+YL91wdjjX7Th7buYSq7k20ZyRjzvC6hgyYcORrEKCvjrLLJ3ClYNI4SbromPfZMOk0o+Ub7bg4RbEv9kW9ZXS1c226TEiX91sZ9ub56ywyyFLNzfbYy/M2ucXjuBDMgQ188DCO5qyaw91yBLKWUg/rh6VrgJBkteO5YyGxL9+8oDNQdB+7VSpSBEJr56pe2mIXeFSETudoK6dzxMGQ/tFEoBiy6Wpd0o1YHClE66f7oxTxy5e7wyGqsqf2KNsc3aEzsuQ3IPfvsmLr6mXc9C+m0BGyhu//2yukD0a47rFP6wsFajEm/7TIYcsCN3+FzSS0sApUl2MJG+8YxLrFoAstQ0T+Ho/R5jiW7xoryVHikOIdVIADwXzriOZJYHDMK8PwZnTJFm4Tjs1kVRcW5JnxduWjB3Sj1Z2h+SSJDzEL8V7zhu6qHWlCqmiLcojObQm3s9aIeaVBN5sVcDHW+v/KogBJtHVNQPOmi6SJkJHFZLofuBJ+smxtVk3sdhpjVJpJ8B6NygSdsbmXZcMBLGwMy3ueDHhTgejTGe+XiuFYaWfnfV12188IHMbKOXefsoX/dTo2xoxwDKKxRZP2ue1fdUEtO51qmIM97ru8tPEGLiADjIvoR2/hC9I6AxPblIyqdE40XyGTJS6dVs6y161z6jv/TwCOXVoF6DmMtGyhcPdnYWSjXlLc7Ol9VjUW/yrqO5h/vc//f2X8C9x20n+om4XwXVnXdy1aBAe3QlPeMKTK8dTMHg3fbX4qoJDZARFqS7VlBXbpXTLf6Z4xq2lE1XOKzkK3qx9AVY/ZhVudxQMFQ6Gnif/5IfC1B5ZiWTny2vRiuTk4ejmySDmRtCLojCsWaj2Dm3T9WVp+2WgQaLqpcV+2PwWwXxtDqMnkwzThq2yFA3Rexsc+tHQJBXeEU4YtU0fcjxy99vP7vm28y1avIvoJdQgyy6+vbJjs1T/1tfGXry9+rbQEl38mHpQFDqYCPbiN513bKdkID13RO93QygopQhx9HTvDj8661/F+rNtkX340RhO/GK7Er7uCjEpm2YhO6CEL/fEV57w5cq+SAakZfqgacdl5xCTTkLV+y2I2qjfCCgrIBcbUgNuaDVBayXJ67k/zA8Jrc9tOdOUTN/+wejhzxoGmJvTK68+03lWkpgXQPARCD+UdEU8tYiYjFdf2pkENzbeQNLeKHOxG2/iQdzzXuTMt83XkIpZto9lKw5YXsCbZ462BiAec8s9o204AvKC7sKOO1e2hYSMV88nmRxvRy3EvTr5iuxsbghpgJ1K3gl2vOEK4l7VbvT5c5FeOuKFDzXZ8ZIg7m70VUrWxkU7MISW8j2t9YvlpSP8zdFPXbG1IeS9UiRMPjhqsziQ8jd8go+1fnGtZCzku9vGBj6uPBAY+vjcxh+Qian+PhrqdBEO7AXytd35CYt0gAfk74XnA4UsyktHguK2kgXd+2inFAf0pINr8cVy4FjYEK0i/+CjJK83ZLyQKS55+Lk4caVYCoWTFxdyKQEf+XGtWzxWMpKgn+fWNkUPxJ0qS4JyeJ7LWmYRaeXu5e6XIjTHq4FpzkmzXcGQPQujPxqCUT6giyBuxR8W3/yPcvtiry8i384ssarfkGKnMeTdL6FlgIdYCzCcy8yfnJDpHDgo1dQIIPZKvqgBg0/yi6uRS6fhjDIJnhJ2mYtT6ByxQakly+eX4ZBS97HLgfZCSFhj997dAZbBssyDxD9870kpZ/rfAQaapAeUkWvt+VeP+2a7I1H38rf6CcMb/5rfqh7xpQo/SFOJXXaYlAnOaZydMpdGP3Pny3H07lzObxppmKaJE8Av31YxeofH1LscTS6vT+08cHl/LYFauAPG19/2JnOssrXrUpdMLXnwqKnw0CWtPNmE0i3aiRTvNOFV434B8EDmSdQBnzRl4CctDIu/LV4NvtQhQ1D4K8EyUxNJhMvOa9Rym5QaxFZZosmhpqoUz6CccYKgS1TeuHjT2hmN30mAW8MR8xgcMQZ6tF0nIlQZ3YDI6Ql0wSXCByEnxyIl/VMeQJdFX8xQrOU9T4GonHlxQodzSdI0afOKwBHpWrqpGR8RkGRakB/7IJc8MSNBJEjDvf0hc7U1LZrxBikZXN+NMCblNlaaDB8wmVAVMY3BE0Boz0ol7SO8Zn+h0+04s9GpmR8m46ljzSRggNg44ThH1ombWS8NpUmkT9qsdBvkhJHJp9RJOODd9/0/SitnUnaiTW7yWSVCdX+8DWmi5aQtkufzOa4bubCy1qX7SKICmMbJZ2qjE1ceXroTHig8GQjauZ40SZVtovYOkvWZqq2N2JnhCcf1HhLAZFZ3TNL0IG9DukN48kmAbKtnSdr0urne7Mpckk0VqUSIThugqxQAHB8Foqg+u1wArdk4lHo50iySnVgpQO3jaePoKscBKDqiQO08BDdI5FF+NsZFzpPWni/0SVsexa2heLlBZONVB60VHOqd5hnv2KhVJUXp6lV+GSQ+OJoTSEpBlDwQHzzNNMzoN9sM5tUzChQdKFeIwc9cYTy+4/29+S5ZmzPdcPKy1J1GTggSvKDlcO/Y0ZTh6D6W15ruXc7JdypTrJyNBz2PgGP6c4P7jtRW2gqme7GdCej03QhTsiOWqdvgZQ9q2DAdZKwPopi9MsH6ueiwMaCXTzouq+emZZJc/xZ0OKS9t0nlU2sm50JNJTrzF56Lud8JWLgOtJyO5kSWQW7hTkY8Eoiz0Fw7JjW7FWADcYiza0Lj++NPKeQO/AsKM2bX0FKOl9LM0DfjUnF0ixpjVCB5llHZWRfXRWNeqQ8BC/dIN5HeKzTbsNq7CmL7wrlMIWVW8x7UO0+X2cnzJ7p7uj1va1fSsbktm7QF0Y2Z6hSNgewvqcRPpMTbIRz9+d5Z2lAV474kl3LbDWPtgvL8GmfUnTUL8k65pUgqtLZwO/Zh0xM0gtG59OyvkW7LieqakyLSNTE/u10elOTTXdNKxoSlIZelxmIUqOuvAkf+yi6UFrO89ImM+smPpm0y+lxIJVT5/X5yl+hAAwTTVMS/yW6a1l2JW4guBpef6zicrxh+Xi56sCnFRMxhquoe/8GoawyxHyoCORgs6HGw7udS/JXUtvyU4SVVA/+L0Ln0pvjR7WUvq0RgzO/ghG0QusN7CzfYhYZEWurfkZKFO9bJ0IWJy90/LUP7+b46K1VI7rKX7KtWtj+ZI6iQcqPMKoKmwfQhBOcuWuEwrX6PsfnrvTHmi3dEFPEKgKTc7VMNTgFtfgcX5PpSI4zbgF1c0QomquxjWpMK5FtfsddfESYh8OAy+u5O9//DAS19R8m5oNJhs3XEntHDSobiZW9thHHG/Ps/49OZOlKCDWNY/gkiVWllUKjUSsM5NRO6OnhsoLtwxS/C6Mlk0KGA2c6mHfLBqE8p6wUF75/8/extVdpe4nU0QmcyVYKwpRV1s3b/CtLtR3Ya5e6QpIeXU7xJ9flMvDa2w6nhWaqkz0xzu2RS2Rm0ewY5ZcYN5UrqlhNbbYwhCl1JdMI6wWQJBWASm3kFlBiT1JXwVVraXfNAYHCXksUKmg8t5IWKlKeNaiLhMvTnxED2qPFxRj6WNvj8r0vXHfodaHOl2/elNSeYaly4XgTmMrGEtczZ/m5cG6n0IUzDI5iHYIg7UKp0Alh3jRgKGRyMmeWgZVUqFr+iOBwuLovCHh4SfEYt9sq86Vc/ZPJt4wP8OIC3JN+KxHGExoX1qpz0LlVH4oI/wSsKL931OLwWCFoL/EbFH1ElbSMY9zTFQ5ZdPGB8OZ7RtEqrWWYPILnw+6DIHhEda3QWwFX/MdZhY3edYzxjnKYlSxtdMbWEOemHH02W5y4TgEttE2Y2P47JdPMRvhSnRsqXwOJ8Q99qZClZSxPEnPhUVWhtUMloPiK2FLsfz5VipvadMIW1hHCPQSMg5v0HpE4DjkZyYqXTK6UzTPOYDbLIfjXRmD2Nt9h2kddV/DU/Z+NwhhPSEn48lNwmzGPUlDta0mo6rXzU+s1CQmkCOaJL+k5BurH3oBCP3tyw4keh/2olU1DoNy+uiYts0o10FhusLhJ9DInQQJMwnpWj4t2+ctbwQ2QtQDYTs/lG4SINmns1Tv2KDXVstkpEFGth2gBKxTOSi03tTbkogkGzyIuiJ4szzpbqyLRIPUOADSRIkZklonzZmAbshkqQOsVZY5jUQCejkf2/SLRFkABjz7HhVPYq2II25uFRiWhJk6imeKWga7V1qtUUFs/fgBswHbBScE5WPHNleEhsEUAbls4QX9RqZV1IA03igdWHmxsOQ2pr7jmdDRvZSr2wzkNhVFmv3iSEBTAj4FZq6dAa3C20bY8DGfoUGz3+RgetRDqUQ03TEJZKJ3WSNbY45jsLjC3+t5Qgfa17o0AiEzPRQWAcZadmt3L3OmKt/jSu+YXLdJHGOFVt2fQYYks0oeoBTG9Irs0sp8uj8Wlbu7Ji+rSZbxdwDnUR6j9kFWeJr/pndHNF0njfmw1lLAvj6SpnaoTClqoxMco4idUfQXq5OhAXoXn8RajtorcUL0nEM8aboheGKQ9trHsFn2ynFfxwii1eREy0ahODfEMtA3+upZwToi1S47l+bt9DqkaBxwla6zU7Syfrm6EhgGplK1YBLyF0mdxW09VfqVgihUask02NjMIGZ0Bl3zcHGhjKIJQkgSmLXuZ34Z9DdNfNiKgYyZZEyy7wQmECDqmo02QpsZqCvNvB9EHAajVMvQAWiIBtjsCClVPOIZNlqRk98X7WVT90uVDIuBDWF984Qc48cE+6ylnXHYvrlFwkXSpcH+l4hUy6UY/v3+q/x6/EBPNMW99p1DL+n9NS4mBGnbLp/hKf6vFIARYtMrhB/maBhGBWPfF6XcCH4Ui7Y5i+WeqBVGsquLr/Gx3eSrtK9futHkx7sRW19o93Tmos1C3N37LNKVEHlwThDXALJNaVwbqE0tsEFQZ8sihrClPfiaS5y6QQ3wTtNp6++cB9dDAVd/iXC7FFGDxgkbkiIM1J1iCJU6+VWmQyEOFkXqYgbSkqDlYW6Z5/gXr1SOeLymnECVKUW3FvrPcJD2UhU/EgT2RVpqpuU7Sm0g8iIipwPhXNd9Abod+E53ZspFhr9yBF40Uckuom0JBNxWVjYVZ1s0Q7RW8ddfH4H8HcEI8WXI4Y9egM4/sZgxgiQQ/tAEcKKI2AOK6Ydux2sCGaf3G90YmjGzei4Lhoq/G1UiX7YxndO2Ny9A7RkAmp22pcLm0CQ8XWeYGHxaJUrkRwOAlzlgq53qLlZuTQT7A2DsT20mw2hQx4Lj4l5kiTOFuEwJwgYF2O6GJSy7p5+LWHTOrDNKDYrIcCYb+FFa7qsGQX2kzZpzpfB6rZij0o8wg/ARNQ9XnZ/Qiw4QYdDeFSoOoqupc7kmAtx835ShZJOouG3LJkhmIlqB2NTn0wtFo2K72BoriOW64oji2AGdoBSBFED09FW+gBgzACbloCSR0NbZMEvIIU0ZRW8gMwFnYzM5jmbDNWglYF0om6a9bLPqKSBPp1UoSf6FWMEkSl7kBuk7agE5Cbjfr1k/U2O+YRtqA+nqT3KNhgGEgY72tTqndR4u7eLLlhm9eW2eiPJ4tH7yXadsWUaEezNkAQKIau1D0x1vgehQHX41ui2X4MBAotrEUozx60TuonAYWwB66tVAXAuVK7MU0XJjqV3WDSsIfeJhS1bipxwYt9KZv4gVvTCimOf88MCTolJ9uYgfr32JImOqC8v90q7SCm9HqwXDptKV9HVOGEJrzaM/+LbtUeAizah6dI+0YhqNBg2GnC4SZnImAhKI/ifIcx7yBDmwjFF65S89eEZRr7naXw2UBhRKYu2VGOSeQwmewWy59AF4igDcMi4JxJwbsSAgQHBHAvp7DPrH3iKqQPz0B0Wl930CKyrG6Az9IBrc9gCh0U0CLO13qZ72ebhUSRw2CALvGpDCyJLDvWs5xFEipPiDNR54J21W2UdRV2aUWhEjmt0QrHD0qJvpgMjY/q5pPtX1xkndpTUfLAU9eETwUcIUBB/zUxVipM/GMSQrYefp/Fvjw9Ww7jpepJA810pLm9tG/Sq3R18Ki3X4KqSwo9o7Knkd6h1DCzn+NQMJKFtT/AdDUjv9BbXJICMCO/oYTn/ONAQElROajxBQwj1VnjZh5/jOSylhtTef6mIxQ8qM1aOhbLcY1Ywe0XKaHiFhZQDXVWw6wbXJVHKnyIVBhMGvxVT/XhmJOef2eP9MnMQQ2a6JmIYsShK/HPN4vrX+dctXbUnLXJ/JO2xgGirumZunHhPySBDGTMAPQRH/V3qL7i/a8ywXm/9DZqTUXDB9RPLmZ3qKqdeG0jmmRFbRBWqpuV+SPdRadWwhdYwIQFvxxep0c5s1GJw2CdUClo6+eg8+HRD3q5NDviKWqFeGLkNc4GbASJyjyYve2Co7cf5Kz/kJI4Az81L45EgV4ei1onQ16HF46fq49tJ03i7s92DkTATRA/Sin1ktBvQTXhIpIsAE3kgheyCCXc62EN0tnkelRsWY5vw+tEQJY4t3XpKj3PwfMfvpXm42UgDtGX+Ji3uACkkkyQBiSUq6rL2wmJqt2Zx7A7Athhtgjj6XbMsElwSATTIvpOEX8PhJYtit1oSVi3WM0v1kQP0AstBvGDeeq/Y0CpFan5W5p3Df1FDY8qFwyPkC4uExQ1DVUlsd5SrHSYFKCkfKs7pekcYb7Esw9jG4at5PLfHisoKylmZYXl7PDNmxTZxEaYCOL6TTpOXM9n0WHcPFPWNF9dS4nSVRJPrn/85GvtbKiRKvveGGukpQRCSkAxTm2FJXyAEquXHPxciCn4gCv40M5RvWX+PsfOtdXXB6m1z0yk5KobiqqI1Q9C0S7OPNS61kqrXg35khD8YP5YuEWn8+rsSArIZEE3vHqYI76gS1ZNhwe7/eqlpPSLjPf64fOFV6uvcAQYdOHmbY30bOqIvie66Zse7TLljpQ8OgzWuu8BkwO8DytJxKrxIIw5jyED+rBaOu/TRastD13OidZ/HG9JL7xa7WgKoycZJdeTH78HSn2l0Aqz9eWgiE3ZHJSrSZi/Xs78ietZCCBzKYQzqFovkLAwo/x/XW6n6k0I0yBoouK/ia+Hx/YebvvC1F/FtvKsTaYPB2obzUj+ILjxSr8YI2+l+2IINTm0HhPcDJwiuZU3YcVRsiz12yzx7xRelkT4RpN0iqqBMjV7OMpaxSVK4pZVyFNq/lpMVwfce2/QKxcsgatLfvTDm/RjZAS82zdMPK/4Y6w1gojEiCq88swOurgd5CFJaqQDvP0SEkpW/Rtd7YajchDIHtrQICCSHW2Lm8FXKeJfsouBLeLCZ6bshRuWoJtAQWHBCuIkYhIJaxfDsJRPKER58MALCdOLcBzqBs8auL6l32kG1n/TbyMFrLQW9EwXdJ/G1SAUzESK4BEjydG8NvVwjcjsymUSC7KIQKixYNBvu14VX3K2lpDN/9UrTQ0nO0CyIw3qqKo4HIQ56xl9QLzvlhDElCTnoowDo0TSiOWtzXEnSN1d6EI1V3sgO8KHROjPhRRc6uUwNNz3R+rImV3HlGpi3tf2U+DniGUluYQyjF1M64o4SW0oHd123HHZjmfUmaU2kZqxipHM21xQbKZo+0vAvaB2lcfYUhp1Cp8iTdKalQyxYq64NyNhtiup93DaBtnBQS0dyYIBWS34LYnh+CTm+uPCktQcD5NCj6X4kRGnt64EMTwSt3p7F4Oe6HpbPG4vBiHutEYE5Q73xxulUwaMFkpTmSVKeACPPBMkMsrF+3SXaA3sc2Kaj3R6J88m5CCMOyNZ7Jtcp7aOIwkqwKUbazzkentbO+F+aiA0W5pcso9P8ZRsyBqz+kBztcKOFyrP7q2TwYdk59zHJp67NEpM2LLRCb8aMhc2ntRRkbyFIcDh1+xL8bvFDuSCgXVtmRIFQPoRJewo1YDtBWA59MnO2cVzKJpReCYAkLEmQTOhBJwfWB1tnO3G0yofdEVi3JB2vQk6kiScxKNtpRXdzaJDyi6U//KtyKDaQqJwX0VSVsvWJQsPyACJ8mb1CB3mFVPlrfLoH5EcMFHc2GqjK2E2cUGFqklvhLHrirHO6xjmZW9I5rxk5A0uEF33/addkrOuQLFnVik9jYHbUJoyKUNKlI+amwgCWkkafToXrkFSiCMB7VMWUv3oZWJYYV6U0WjZA0nLQDw0ny7/yYRvO/lJ6w6B6dqiugxJVJn/NLx65dYGUo2aSzALc/6CeB5WiBk8oQOLy8Ovwvho1j6ldBo17VSFAsLrM/PqKv4hzSSMRdVn4hamnzDgRBM0BywLPKKffNFyd/3/EtOivPEoNqunoz6+TZsyceybMaAS8XZYhwzeF4W8kIvojIbhZ3YfvZkwCCE6SjSp9PSvAcp+8+FPChiA0lqB/23Aklor/GsUTDJs4M5ZAzVgWaD8aS7/k5plgRZjSxFiYxuNicu2AGTsioZQK8TPxAE30xyONh8tKQofJjqpdEznd5ZCFNPf1VX5K/a00Akvm76VZvraeg/Lj+K7lfaj8K3eeOgr8l8jxIkbn1Sd+8VxbgN9Nms+Apel3K2wqrhq7lVm5rdJCt2qLqPOjIXruTR1spE9ZPYbptltfEf54fm+VYLJL/DnvduyG2mYB1NQLJ3Prhxrlwvq2Ob+kgncpBsVCxQrP6xiIJRXqn8hd4VC73PnAfpSyPQ5lhkk81svo7y+lxX5hBddzVEtWmHo3bMAQyAr0yBGCJiS+Ejj30DI2+SmE0ZfGgsgUqkHEtDSQSo8f/dDkKAt+vTGUMwqgGOkQ1ZF7FIvCSoFLhx6jbAA5yv/LL2f7xdLb/UnPrru3f+0rfbMsRsYIAq+LDQc7365V1k5hmm05cysghDE+OqyK2ky048irryOMFWMXcGoqAjBnGCYVDbM6cZSpkAkab1crEa7e9MdEJfqmELwRbEh2AKol22BfwS0RNeobAfFVPilqhR8nTgJ+YQk29iU+KXgq7AMrvplnpbFinsVco+CHRYWpunDTePNT4TScoJ1bYRhCDTmQPExaFuH7JQxK5wq5UQFuoUJl9G3JsMygl1fZkcavFTc9oRWpFXpKD7e5Tx7NvdQiz7fOSQa9fzQJS2+7jkdIMx1LNjNhZCSalGcAdWGEW7FmEkvOwoCREdh5QerK/bZEXqBs0SVj1WVarYoJ3NGin+2bdDMjk/BrJx09zv91YNi4PLKNG6Fts5LQU3EHwvkq7DzSoQEdF5DCJnOm6iQRZ23EAbphXcQsqDzXoQk1vkQE7JCZ57GIgyx0KVYCztfZfpzbJz3070I7uxblMfAwgmfK4ElOmdZuA+rrMWFqty/cP2I9g1eCDuXNmeEgYVpOWVAnVC98JlI/LMwZnDrn+ornKhXN86KVuldAmBpHqCLdl3jbQEllmmjzdoGeiSoFO8dDV9q/YPcFBLdelbKQo7LEPtOhQBDaDq1YTLKhrID762x/j4hMC0Zn1fSr0IxJ3xdsnhBnEj/3GstXrbFjIjg9B2NmeFG2WdRwxM37rDuPorSg2XkGc3Dzw8FePfUIW4/UYtaALc4gPVWw3hi3KsfubGnZN8y77j9iFQC3GynKYTD0V1E1LiXqqzPUkjkEv2Q3cm9ZwxwCrrdnjqN9OBzIroQHZwM5FHkDmFI8Bv1ufNFPd66MwAnK9iPfUpQBDesiWLPQTvNuMZjKzrnwYXXKa+9kpdaViI7+TUyiLLNCo+9rEFvSyKlS3x0dMUhdcmSYvjfISp2G+y51c55m4P8iq2bum+5994nE84dkyUU6LHA7tlaVXI7a/jARF8JOkwHkOzAo7y9ZpctevQTY5FVi/E7jRYrjcEDZBslrvX43v5aFDpQ2tg9OL0JaeXdhklU7QZsyVySUE8hUqi3cJGBvINQoG7bVI+y1pZi0ZS2TVoNUU7BeAbIkG1oSxIUdzzNDQbsVCYVovv3Yd98TJCoYdNlqu68hlmKUjHnQSqp1QAMyjnGZYiangV1B8u7TqjFyRUE4KsTDVBUvh1S5bW+5uYslHzZCGNSXyGk1XNz+I9Azrd6agUngJVapqRo1yDvVbSuTYkh28t9c0p24BpLFT68g6yBQ/Q+VE7rpL0K2zbbmEqU+ShS1hO7eNmgRga4pa4mOMPEwu5VKpfXZBvPE3NZnSAkJRGwYOewLJPH+dfrTeh9MSMSo/wdMTQKEa0ERfsci+B9mm0kR834NqtSKVyjLQIqtCLtkgW8L6aU6agx/GIMgEQ7MRCpG2p9yZbjHSFU7VsAi8FYfLfiuwYEjDoSiBoXVSWahn5ZV37wzz+fbtlJoYRZiy1I93MsJ2bbRY+mTGJ3RovmTUzDdyZBva8Vlx1iUbCr0iIYGSQK9T4thGoL/tBlWyVNFWwTKx+oJdDrQiGZyuvAQop7urJNeI9yT8I2bYq6th1S2neyklBTVsH++jFxxWKQe+peJLBOSkrkp24c3dtmhtXAiYw0Ubr1QBSvVjGFqDQPrnvBL8xClzKazTbH7WO96InhSDNHii0MgIWL5QC7+w9CxR08jLNs7nWA3BDpJn7m+hWTXy2Lyp1SgvoIpvIt17c0ZHDsxev+FFpFW89LidBH6dUVf0ednBQLftxBFIuhLmogjjGRo9bW7QXAtfW1QxCAW0TAwQZD19EfRc8Gd8d1j3gk/ubEeu50pcqz5qd4kZwxbo22D3hWBTY85NIGYD9TFqjn8zhq1PCuaziOMx1OnRjrO2n53niKosjLhKzLY+bZDYbHznHh61LQ+j7l2skKObHF0nV14wbAzXxFMDwWJx99P8VPoAkdYKiYNLitEeXHyAtA7cxUoitRx2qgnXuXyRs9qmkqGYTo2pOQJxLjJdUlMBSLJYQQwSvJm8wogaRi0H7uDNc/rYarf5AjBS4VC7xWfQe2smMhSvJTM4A+BrVtbo26fkD1OwNzhL3ICQJmtyWKc+ZGkZIR0xH0Wo78hIVUxtXCyKzO+B9AIU+oow+Bho4M7DabaY7C2TVDydFzu8+et/oPPj1bR0J2oc3JWzwzDB9lf21OA7f9USOzOjjVO1JmyicdXbYP3RP1qCr2tQZV+e7kGHQZ3L8IPwjuA2wdJsFGE7jjKHdxvD0NMlRB+YwqkTcv1gXbE7aD56N3O9ejamXMefDztXmvDzOqj6r8bYKa11gmj26n9VP13SnCCGM6veQNpY+it4yRaryrhwqv0U6H3vqPcoo0+026+S0u6wzOHkDzQJu3UoUDoujGkwugsmDTn5HTf8cdL0h83U95n/Q2SH+RamtqqUW86E/kUEaCmXfHEP9hyBXb2CscruY9ryVfMSy0RneSI6Km0meJPkqYPI17fj6RiNsdSuOP1bu+sZ7ddyior5zydekfhOCG9P/sr9HM5aaom84GWfniJMNBZdCJauUQY/fOuavkc1rN63CEPsko1IKjp5dZHy0f8z/xTh6SEXwI3HAdOR3HkPh7BJnr2tq9IWXLyAIJKXg0FT0hwEYeTWN1mjDwpvW68TiO4KclDlC9yacU0H7Y0IGjKFNB4+RqmKB05vQ5MSmscP/YOKfKVo7vJXOrYcYZDXYfvx2E0kfkDhTwgMJd0eNRH2Sig2iQdS3nAe6gJtrj52TVkDfgHxlC4HsjvYy6a8Um7+uqC/ZKPvoV/QMWSP1whV+QRc/7EFqHPbTEYtTJT+SIrmvrRlR+uSq7wccspajHQbCvfnd4OHfa63fDD9RFfKIkmXOkytECPnwcmDxli5D8quM14p/v0/WbWXr3VYhTos2z0DyvhJK0COInKjPnadvnTPhTtTDYRENfwHXS18Ti2BZlF/X8bLA2fA9jB8nbknhJ0tJn76fYVpM06rvaMl0nqeiPNN++11Pj6Lbl0LhRWOa3olA2oQdBHR8Fl1GocmykjGQ5+Ex7LnpQkgNpYtU9tY5pA3cg78kzVrLsxDR/dfkbm7Ti/K4fSsdZIc1SDJMWKi8NvPE8GyWOrrQwxHladLjGt5QA0/zDLJ1xZTllmSbI8KGudo62GyNpPrUgFgrsjnwc5LKGGgWy3mm4kvBrtjB9sAvxvNxSqWhc11U12q5jQvlkL1OIFIK9zqM8tbOZRfTSF61/s0U7370y6pyoO/anDExa0eDLEWMA5t7A8LcStTVQ8n1RrNGr8ykp05kyGOEelm0efws8UhbbOPvtEuR9tiUxRKhFtC47cWFvLTF3s6kbrFvRs6mr2TxPw5bjqg1HzwBPAQMTVRdRVdX03lxNoOJ1ItQmN4SnAe0wHeQnrojGK5d+botQth/1rAChJzJ8I7G4cyxsVmv8VZ0gyvZtjYUY5VuciF7Gd02KaPCxNdq71+g1oYbuQaQeQKZGwsT9qqujPepweIjl4kofAvsDFWde5HG0IT3NF0N6Of9HmyWenXzJ7w9zpa7TXlLntgGr1+y/jR0SQYnd55hmf7/a0+pdBP/kHhHK6lemjLgJPkre/kTDB1SMvOFHSsXlbkHSscPq4zMuEZNRut2nvo/u+wPPnmyKjMQb4n+IKC3G3Rmy7Xnk24EGh7aC4VMLQb/6EN9lOOTArTQkBNS1vmdTXtfZW1UimxmX9+zOl30NgpyvfzZQNGR7RmbakeyBENwwmxEq69OkXTY8s/fD5UDbJcubY+6vtZcCtWG8K81FjPz8Gy0x4JB6jyl9LUwWsj9OpV+8z4QARmSkqMOYXJz1+KO0V8qsxY/oF5bRHoCl6XZ4ghW0Q59o/um3MHX1KND9DgU4+XZDZCcPJZKigEaSkj2x7f5684Mb3nUjO0z2CCS7pSGsMMjmOgC71QEajo0j85n0vdVn3+/H0Twulj3FD2GAw0OnmpoOi1RoqKm7B8QytvL2HJVQREAwpsLEp7ekB3Y0+eMtMpg0ObqgNwqpJthj1fac8yMysuZuCB/08/0CRjzkxef4zmksXTYav9RyKVMQv1ZLLcC02mI9d8T9LuXAisVxXP7bTEXiuSUx45QUyNFxwMtk+PKNxfduYic16L40334YqzX9SVdbpYG36mbGGa9COd4IZZKqJBathEo+kxZTiJ472MazECXI9zvag6PJWFSFo7dh53Dpm7vIykYICcodgRlC/AMpl1IkZsxcsCOg9Qu28Y5iDVUayxIe7U74XqBYRZAX+338+Xa0rEj3Hu8OjzvRCpso93O4OsZ4sKJEkm7vGOX8kuaBAYbP9hiGKs2p/BCTwBOh8shdMWUF6EwWFBZGxU5GEZLhBGsgP3S7Sn9Ncn7PxSptt/hj4AMliqEomxnnWrmz7DxZxxDzrfoDeL2WJ19XQHAlJXF44yBN8HCIJqF6fhCQx/YFVzaQa84AtjkNjoFC1h4gi5dYfMTD57u1YOVhjkn0M3X5AR1Br8vdY8ZyvU0I6IG1DLd7ygx6Rx4KUdI5VrIKvoqJ4jC9dEtouiBs3pVOyIRNTD1zgHoueufmRND7xaLmqkLZh3BKEvM9r023i1D44IHuu8kok/HssSZcRQG/+7D400miVuRCpxBwwkBah+wqPWSW3oXLyVLPEcnxb+HpFr8ilHvXbnQzyaOLnm6nrLtU2h1wps8PaEdDXXKPAsYEab+9jJUQJh9tfyrx0zpsXv1V02Cml5Mcakny2F8lVKqCrDTeenx2yhldPGnB/GVVQFOlQ9u2czwxJoPKwro+hVQZKPjl98biopqOowtxGqLNw1RcgNFVkE8yx+PPDgyBdMeoNzyiQW7cs5DFhrohVe4JNH4I9ntnPp2SDnvZcHOgSNOP+AuwUvAfQOCI61CkS6wzHaNV8jSp1hej651vy+2bkUMceRWYJsfGtCi7ycCc95oO0mkedBI1A78zSqwDd8oLa/YTB6ujqqjpLf+Qq9N6ET1iO/0Dm1qMio2S9VVvO2gArP/AAsmNSKbTX0oqYI3UZdDw6YplHhF65wAY9jKvwI3RWZh5RIQQ6Qt19RLOx3H4EmosFHZOAlOvMqYnuUevVGizvracX+RVoqYD9bFpTF6kFR8RaMXQQYVtX4tTFcBN/dVi8xwBx1DMwyeRgoo8zvm+M8fUHo8RctNuRmpVFEI5NhxfE7YiHPA33bjFaLYT+qqSGjjM5FC2W5dDzFk8IzMUdBznAJnOag0+JCoZAYSOa3hDHidCLd6/Vr5ggQgpLZhA6OpGsDjdWoRBn4jbtnD6jQ7tGq6UINJqR9NWKYgoDsJ2JhxW9zrxBpqB6SFiAyFcSXycFuhrnJsjFDoB3yyOzUmAC2FN9SJELGVCs7B2pFhDKnzSU6omIFgvwiO+81qnIZXkQzMk9XfkRzI+TVj+VdenHyosXy2rM30lnZ1LFdaBUt06iY06q/EZWnIm8UJB37Qt7HYMd9qgsSa41OBcFHih7naQIrQIIbJgiMiyRL0i29Gm+SsmoeCThHc4YGvtCG8HwPInGGoo+ig0YvF8wmTX+4nk9IV5UClOOZjojoaJjlYy8yi9mjBZKRyAOdB+WyDAupixgcXREDNvsUTKllh1yPqdLIuETzvkyRrp2oynGgXEgFjUoI8h1Wc4uVsWjAdgwNorFRo1J4EKH+zAuvxUy/CtntijZni/1tRwGIOeLly+1auJN2GDG0691gPZxyWtq0ZuSU1nbsStvgkWbFCpgRwUSnGlt4p08kakuuldFazdVaJ3qD6FaUejmjkocYW5GG06Nn1oYwW9+Gp9HmsgelVvD4mIO35CBG8JcEqI+SHKB861QTM32WZGO4nb0qlswyC8z9udHwySplGsIt5Lp4Ou0H22AZbtJP2PAO9yJptHdWqaE6iGNtz7v77ErZL9ITQ0aHgBFtEemwmXjMFP0RYQ8Hwlm5LXF+QCYpOI1wSkH0E70DLOxCU+IfetVF9vtXvdancPTy/PRbTE7am+CYIg9jk1XYgIoohGurECRkCsFYkzLvQxJx5oyYcP3t6vR4D0QnjaVoUXwSMR1EkAyRid4YXwjfH8Q+9ErwiMM5WDEbRWFFuKzQYbNrKE7cAPsZtITdmhxHggnsBKyR8A5GypgoJKUA3cf3xSKfjQgIqBzaMuaZOk2cYY+9CEjptj9RHU3PdiR9P9S+ep2UrxNgF9HTDc+B+wiMANhn9BIcTgkyjzF+faPDuYDsYP9PERGkM/sP3w39QAJLJBVfePcYbhaEnXeM2X4kq7I+Znji6gbe2zMjL9O6BAARsPVBRn3HJxPMqo9cbb/BkQBiivKe6eYxAUpNkK+1PwHoyXH3mpD0vXg+YPng9tTvaZgZNvDo5fEoeyHcgdo/FTSlwsv6MVR7WkLP7wlrS7qEKXJBo/TiWN1j72JTE57+slfiBMOqqUkpi02/xTY25I37B49V4JU4JLb8PBTV/v/DiQa7Zwox7w5gVuNfltE4fX2E0N/ll9qIrv3tXDUsNBwnIHn9Ja5ZZfSV9vcFs9PltN4VpdYA3DBeC1mu7BY6uJTlbINgR/zp04T3BB4GDnIL6eDsxSXBP0fpvod/379xw8nY5j2IWpdWxrcVpaweBOw9Pjrt8YOCedJuoCF0u4YjGs15eoYjoye6qvY9FU4v2U3daLo9wjSVem4hv0MQU9fg38He3G+x6/fZlL07zLcBXTeWevwM7rqhYCEu/8PLDy8Ll78cG+HunY54ZLDEk5G4Mw4jHLDsMLLhtoFgpb0vqkYb7FpjvwyM5kRfntlyze3lTldDv4bZf+E5SXt7J+bFf5qGiWLcdVaXVNWMSsdP9mOXYErfDGDkGtdc9L56EqbGJrd1xw/+y8uBVpQkDwa2/Jm8YNR8aQhLYqAuXHAqtobRdCvs2BiooQJ7sBda7PwlApBhB55YxOBB4BYgjhTp8IHL/2mewPLYKxMOQJq8qQpnfDjMRzzitafF0nxj7aNvta4L7PW0ESTGz4u2yRdAgX8SUBZSJgEJG7OPVS6L8b+PmFtB4XHDdWEc/Wo6vlM4z4q1uSFn1EksgtWTvx108zk7J3MK93Tzb1ORDJuL65PH+FRLdDw6vuCWoq+b1kmWYM5I0kR4lAftM1ce9EHMcCyBWZJR4JnQPnVg2CcE4Q8KpR8cHsGlya8tL85ubGMQ8jx5n8sqG8KREQ0FGV1ywenDgvBEgHuEJrUJI17gGJVJ32BWOVrBsYWR+ADgdosAIgDwmgWhQIaR73E2PNxgdSf4MM4dNfiKIOIJfODREtg7U+P/onDajuAxM9JmuLM5Xb6BJXQFwwToAPBQPFcWTiZGB/I2PYfl036QxZKCd6EEjWrTAuABCPAbAUvwVLANSwssi0A3X/xNyqxXfsxay5C4iMscsYwlZ+W0w6h7fk50OTp9yibjHxTIU5Ps2oFLyVb79+0xTqugLe7CJ304SLvhfnFYVZBjBPKdLiVE4PIQD7HpzEevRBBJ9y9UtGgQXIUDyqa/Ks9wGRdgQCIAmo5w4CoGkZdWPAVx9PgYfKpu+UGBqxcMWFsye8JoXVFPPchECZvMt8YNUHJAzzAZ1GkqT9fz5IkjXdYjd/ypBdbmjJGBdd3lpGq1IyyU2nr13Lxklp4jt5g0RtjikcwmrE2+eJMwFTBvLcQWCQNCKS6gcHROlAQVzUBqDlCQGA410airPSuOT9vkcygOonlVHVjRDSRaRdK8FafyYmp+EMzpRKXNMx8GpwyOqBWJqwexCD+QACJROQQdNYQpFBBmd378nT8Xj3yP4eFUKsgFmJA+RdSHRwx/qM/cYdYPBGbM0BDlnqr+1Sum+QEXFSBPnqK5H37d4z4oL0eQ2LutYE/FNFuB0WEAjhhaj7xhlqTuG4BBIhgDqVimkCCHkQgNCwOF9rJgq0PSQ2nKqmDf5oQfrfIPzsWJ/+vKQI0tNv74qfaksGMU6o/vSRwnWNik6Q+UtoQlB2M9PvGn4KQksP4QbLB/5Rp9SZQiCRCvjnBzi85p2T22fjEDhoTsSl+qzBGgFNaHdMwBnyr6KzSoDL4asc3K7Wkux8hQ+QsJn4i1nyjieD5g83uBrWc/lX9etb7X9g/ZPhwXkKsUUQ6hAmfroNeH/61jDe15AVVplSreccxkFtw0JVrts8F3IZaMsYlaK7Lfn+UWh/4dkOzQ28v/JysbbQomBbToRLXaJAhl119qvfdNLUyPKW9J5AaK5bbAZf1V3z936o+x2xPW1LvsREdmoc02b2LtU/602w8adN0J/zmOKYr/1QFOIcC/38nf4y9p94pH1XN7CJrLCLNH2jiNzP7R0VZz7AUqoPIEH0DIQgU8CJhssDjX37Goztg6sqnF/fGEsR01Qkcx2hDB6E9AGKIUspqatG7GeEDXKXjBk/h+fZCXwUfoY6Tw3D2SSkYjv9BNURDWaqY4JDi3SfMqzaa/e66PE7pMDc3e9BqpTNu27QnTX8YQVYOpPNpWdqeQocD1QxkaxXUIIrCwaVdRqwGC8xo/AGZIy1uCljMsXNeRljbIMJt40D0uTsVpi7+FSxOiiCqlqAEqK2Kuk1CQUlH/+vCtcQH4ayEtPBYErYXKfzZBv3yBZZKgfw7WXYHk2GorVrDskG8qbk2HzgmWoxUDFKmRrpE5uWRsaYysPgVvyGM5sI3eRB4mBbaVw2StUqDJEhaG1Ht2Z68/pCsP19trdv0VGC2ImLOjnlMUHoXXREz3XOX4VMP4fkTKQEVe7bW1rbIRxpVPOX6Vm5rVSZcvs+DWcmYAdn/OviwNkiNX8yPC3GSLzayTZ3S9jLXs7t3pBQZhNlF+qsHahbZe00uizMDYiO94Su+iffDLa7HhxUKKRH35ZiA9qsVPM/lfano2uLutDT7LCO4PrEbFEdTqUr8SP6K1IayAwFbbBoGS6oKfV+qnqsldGNL9dsEEJVC0BaCn9D6IlkMtaoJT/zmko4l6z6IYXpZ2LXbYYHyExtGWk9h93kg+eNpLTYBwUO+fb2YrZnA7XPFvQRxkDbjFvZKkkvr8xQ7AU476xvp+boUlDO9OXUWZ8GjY7tSNGKum8DzqmA+ExNT3X2f0BTBe5pQmKpNEMV26+lwkarU3VEXHEJ+VcyACjrZYsyF5ZcF1yD4IC0E6lTMkUKpSLvZdxjVLRHc2JNBO81ceU8n/x8nbcD4+3BE4y6UaIfs8+4yVS/CZG0uau3Gll4KNRwLNH7fjb0BR6tomwdgwXjUO/XEf/qgfBolMoE4ZaL2ne0Oy+jR/EsOU1JXHiD6F7VbGkhPizX0PJhmZBGOy3QECVTrxJP9eQRLhn1CHef1DmNlJjTh0ebcP/oOo5PwrF3qWnB6L/q0133OjWfvh1cZOcUvxVcoKqQsbl6hb3v4pWO9/YkjZFRN2sz0oLqDKBc5/rs5rjZbjb6bPoTmoCuJZApbRRyomHuMBglMpN/2Y/eKxXegS7HhCGOKllS/V9SvuOPFIOiJfisqbCJr2eIeg926xCJGiteYT1ElOS+J2Xk2Bi+PtYvVAmgClMLZMHqYYXRT16ML2WqmzCJpNz3Yvgx12N47TrCcJV0a0TzlmgFogN/wrVo1WEBibMSpBc8gTCVnkaDWS3E8ann+FSCJJmlZVA2GRjJeiPldTuTjNco7sworqbWXNTwKH3tDl7t721BKP6/01I8ZNNhvvHq4sjjDDtUOTRb3BYa5z6uZPOG0dYgd+862ja8BKs9VANLp3T0fOdr5NzEC79VS8jdVYRpMVzToo4yEA+kayGLcFCvZUvmwWnmxKq20pZXNSP9Uj3T+7Yd7yYqbJSLJGoVPgf0tR2CHYMB5MmNw68fZDo0CSY3maD5JueFk7iUiaEhonXDzN1yDf4dvFlPfnPS9rhJHTh04v+nAM/AhinYj3DoFuNZDOyr4Qo6qvOeFzQIDwv5sCmQnjFBKZM9xRV/qMeXfTJoB4oFkkDcK83v9/OXEEulNaM+rs6S0nVRrMDa+/OzeIcDZqQjuBeMatjpDL7C0pW7vaieDTBfqGb6UllAuPwMOMIipcaK2z3NEXCsFpVUEb0SMkQCwqlywBKWOf4Nn/0DKpwMadr+Hp88DQ1BnJXn1PiIJJhHB5jwSnBQNGA5Wc6NTgTClyXpIFApkad0BkCvBOCoAT+IM9+bGDiUHSFgCZZraPiRGAm4gx6AgAiIuCdwekPNAHxIqgpCVvCCuPCmmkAjKb2Z3pnZ25kX8zY4Olk9Iq/2aDbzlwGCjPI4MlwSU3FsDWkoRW28W7n2qnj+/JnJyxpPcNM8/WKiqU7FoMHl9jg+6ysufnaW+3LDbP+3PZ88pwgcAwPR2EXkeN38DktSCqRGp7GRIystJNkq+5fOPid6NM7XRmuEyiMXWZvB4B4bG0yome8p1o6WIyAa3dlYjM3poyvI2Y7twgToZHkKHCdEgGnX3Bqko0v/QNVC5Osp0SszE2LSesXZsu7Ft6WH4CYvUG+W5QdLUxHvbzYGgkbRkTQCTcqZ0mJv0osTUyMwCa6iR1svrjHP2SexCDKwmQof3RhIaSqAFAvcZijWPVjKBLPh/Ru0lsnj9FdsOd/3QSb284NR5eUjOLhJwQTOEECo2aVome7raDBN5agcEhXMGJkoGSNybfOoctEtdWwqY4KuuWDVkItmojNOZfowlQuAG5kM2IMUCqBt1nXmw/vzJsHz8FP8RtEBfJCxxoAPBkVgzPzUyPXI9GDdAzx183G60YDP3ztlTwxeBGG111/u3BtH722Bb4Dl4FzXPbQFT/OLNe4qrG1nL29bZinl2iMv6CDMIXNUxeK8kYY1qPo55lEKKNIjhByEPccSXB7dDC+m5lLbxaGtLzmFxhFT+en3EbSExIVF/FFs1qZZ9YEQiWhoOMfw1qXRB3V1JlAIVtdOiC4gXt+x244NrJPTGEF2Bkhn3g3obTDEMcARt4ef/Gwe/u8BSDzQSAaWIuPihhpGiepQDe6KdCZETUbLddGjh1kOytxWmv8CXPDSGajlTLR2RF+2lmb9P4pF4vw28OQu2HCqelNlfnjP/oLZB1LRaduizNjG/rK/T9+NFDoLXEXXe4EbSeoKvj9lUdpud8mqsQuLR0nI6Bb7RS/bnIea4hhp9sY8B1M7SxY9yELxVDUTWfVqXD4YXWKZXFksEfzDqYxLDXS1ozuvsxNlRufHsxiV9PaBfez8SVLU8qTezHy9SFk+x6fNNgzlY9cxXeJs3vHLoMFxqi3UbUOtzPWKO2flH5MsxoFLT+kQ9dH+9Dm5+7FLu9vPMh1OjWudXNfHYiNkdKpsCoWVaM+MHlHBlyMj8clIjJQmVOZlFVDAF4lUygbBh2R2cyGWC9FVA8SK1aLEZFj4BGY9m0bzeLynnT6IOyNepyopanHKZhPacHG89Ig/bUCXwdl4z/cp/7Ww89Op2EyNPvxglGp1UPLiswkKcg5Wa5Z8QvxzSWJCqeAbVcPCV0biFVIoJfk68aQ23q30TqN8RbV+PjABKqJ+hAR/43OycJKZvEtmZa37X3SoMukxl6z7p7X3ZKYBbhO49fDb4yS0GdcyIQD8UlwN9wA0itZMA3ezBYp7FSIgB21TYhP3KXUwMialFT4Z3mqHxeqGQn3skPM67DIogcnd10CDvPsPWJveKu7C1f8vhfrYEQTjzWlnHuLw2HTDodGO4hZf2L7qcB4xaJvjn6cZmT2NY5BTo491iDTUQBh4fxDlK6gzRwAMAQeSGsPRA2OLL2Aah7jsus2Dgtk+RYTR1GVB20q4lK7AAxpZMZb4FVvcV6gXHwFRjX7lH3VK8/mrNvPc41vTXAaHzhStYDm1l6zOqyoLpH5DP3qoN/a1fzrXtf4THe0EMSqPr2kEwY4soAwFMLSQp4vDg46a/xAkVLHpbuoCYTg2pmMYHpEtsTi2DQnEVMVxIee61ybg3oT+DbfpWw1sqJzedXzk/GEjqLhTYBr2XmgCSWMfywRbndD+2ZwmlEoNMawQWe3bzv+q023R3UWRwbx6xotdNfgYeLpdSrExg7bM6u1tlYkE06OuMdmCFL2W6RBWCUlCDvzdnpeykZbtpOvYUdcHj93W/7rB0KzgPLmM0LfOrRzsUPxgeB2UZnA+lRkGXKdA6HOCj/SQfhwIMMQQ2dXz4zi2HVdP7Hk64frQ5BXqLf/KVWiN1JZWbglA1okHFSZ2HMDfoBnP7hUaCDsF+G6nLMfsSyktr2iK90z8n8MuJ0gDoQEiwcfwqJ9h5sk3K8gSqxVvQGM2oun1i+wTJnOF1NqyLx0QkAmJ8ZApdLNvXReCBeSGvRobTWz0QU4neKwOF27IuqUHbDOT7fakDmAHxZPbHNCnwSdIosSteuMhaqnSOhN2iN4DpxEaemuabqSynL/JCUWUbDKKG7v3Vzx5JF3cfnYCXXINuX8Mo6gW6MKvIT3Z1bDCfoI0g5eN2Sx9Trm0ffhOwwmfEg4s/z0qXeInMHE0qDIKaYru1IMXKKyO+0Ky0TZ0Jb4r9lXCdUZOZxrogz8PyYkKdGHfBbPEdCmlpsZZ2aKidDg6ldX49mgjXHp7vQiEnVRA1zHNYKrQiMuJIlirDTWKjIDHrHoIviYBFbURtkGnpobrbNfaAYI1uNU2UXCVvjVbP/s7b8FBDxmJpClVNjuH2A1QpBWNBho9CkHelcrjOVQ04umUf4g/7Pg6iB4fD9Cf14azU54cNtCDJsQDqCmt2nN3ntgN88jcVeegAgm3djOwvL1JTiPeALfbQkqmS69uvhFK3Mo040pOmLwNC58LqIqMP06Rt6h1KtQp7yvQgzveX3xMB0VOLrnPDYDoO1fROWEcvZkmotOLMToe6MMeDuAFSqGTTVdM03J94pHb23Gzy/R3DHot1P7HHglijhdmW+lDRcKLIcA6fWAAyYkH9RlqeqE2jMHhRi1ArkbNDUPGqG4hPKLGgEtzQd2ChPOq2Gx/XR5kaM4cN5WzaSWnMXybqizhoI377QkM7Da5ORYCj+5992aepYhR1MRcWx0VgWdO7hBRXK6M5SvKdZzg1BKh4/A1p/2wCtCxFKCP1KRQjpLzX5y42khm5Ktf643m30/vflFy7UJdiAeP7Lth8houoR4tU2O+uJFZLM5Suvo825DsvNnfsUaPUNwvdAgJa9w1bE2lONzVoCwo8sqLBcTjwVQmyPa52Tgp5IpVJvIiCzzKn3uD1id1OMNkRPc65276kY/OawfS5Y4gbWmTMvP3U4fPuyvyXDN9Unc9mfpxhUHS7MGJSzeBUORICsctsG3ocxGjKuJOGzcYU+9rig6xc5KXv5c7KiDtxnFpaD52KZcVdQZt9kszC8eUDtsBmpaWqWiW1l4/ho/j4XO40bqd1K+L1+vfYDn1YAvKtNWoFrMhlKn3g+92TEfpwamIEoaQ1wa69eigpMnTnEEGaDrHRvNFJ42BrExPL9f0y0XtCCoREzkm88ThsgumNq7f7hhuaQ4UiaonjRLH/6MoW8a+s2UmX3TAoNAUEHDQaAygq/kTsPAQ6V9Qz3H1lURvOArmwi2kmozXhN07R2QgigJIs17AQRWTcBBQAJUhb9K2D5M5TbGC5i1qGcWkAEyVIGJnjgXTLOvSFHL5bA1bAWzyhu0gbk8NMoMLCTFdT7tQofZvJcywkrhrQRiIxK44Ck985Yf410iTIy6HhK6k1iSLRxM9zW9SU8nCrW1kHdkmXXBPSkya3jyLbCLXSpVEJIRHk9C1kiiYHCSXMVEKxRmv9Bsm/3AQ8KOpA9wvREKlJo4hFkK1gkw0FaRpiWS0IhJOj/4WaLsH2bSD049wd+6i7AuofiDfvbFQAqh5/1ROeoR9Q6NujGYBbEofpTueVe/cjBVm65QY+OED5SY36+lCpNdL/5kWCT3lkvCzA4ymu2U39YVP/moZNa72VlF+wqEvSOLweuonbHM6pGXpa4Sf7tH+EGxrEY6cWJC3IZKPVhzeT+h47ptcfjJxlSSaABG90n1pYNlMkgCpCRJC4xOUfcFwx2l6PDuit7lAGz2zpwOZbL3twoBiI4V1OfMHXj5WCME1nrlUESxdT2gSF4PtZ/6JLPFB+a37F5GgSg2k0UJ1PTR7ZRrzRCcAg0mENDSHVOc1pTIUTzpk0102cpKEXIXXQhWkT02c7B42Yl5SfU7prC/TNxuHkerWeq7pc4gPw51+XGg1tfFT4a08fqGN7o/pvJBdJLiOGefxtkx00kGPJXWYJJrWnxBg2IgRmufLnJrHep7yjXl0twa76n5qWiInliHyGhbXnHipQ4NoaGaMZte3jghZrujrI3qMomRjq1AEdILUrX99xkD649GIsmrcvHc3vCSG2u4repDvZgbLzFShRWp7wJrT3i2Er+zWWQ7XR3HpG2PjgsumeG/0FglMA92BcKaKRja93vpL3MwP3sjht6160q2Wm6PJKwqZz8R23z4ooT6Gotmj/Gb6Na/+dXmUtVJdtojdkI+L2gTh09YUA438GhyV65jlhnS3ve/8tiC3mVV3HI1IDoan5z8ew9mF20fRTRYrIuhpiRwwaAZGHpGGu1Oe5AWsewnHss7blWKM48/+90X6KxZtiEsZ+hb6aK6Ht0W6k2alCBtdIlaJyJ0OleLlBuefJz38RmuqQdWjoKlvbuowda6h1vX8FP/wwMVxxnGFp9CDMdJRA4MEr4jz5U7aWEVka+GK98PX5EQcK8VScHjG9GmHcEE6WGo89ZQF34Sh/CcRxkwPK29RG/5x2l5TXkw156Ge33fHZsRKBWt0YVXirKGntDoU2qA1sA5xErpU+lB186eu08jwjfhuMrhtGAeGlDsdDcb2JjKlJ8srul9G5NnVMMZy1tS+PgJghzEta+3ZKoV3CJPBP9RFc3hq1KcyNdBzFUrJc3zqKYzZb6IBfL3p7o6iRXH/je2qW63BqCDHAlow7WkujF1S4L+MSI64fVmi4mUqXE2Jwwyi9Q/Tl8bqCdOzNzWPNNx9Im8scK9YFNMjHFXrMTRhVnyLsFS58i8CGOKPm2gf6f8p7vZt6S7gNKocjbVxjr7vvJek5j+TOnkWg/Y6IcKwl0HyigWOT6B1O5H9vTylhMoSjtth7XpzzL5uHpqBXWV6rKSKjVt+pAC8datfVQhbRO5uu5y+R5I/NOZ57JA2il9S+KS9ijTz20hg7Kaq8WxQgbIVV/wfYXJ0JnoNTQ5ANpSvqHk91UdrUfFFJJa1V03uSOnYmrDIMzrUfvOEZxf85yve39w6eStFyYu5eHW/na1yZ2Fhpof+DdqO2PJwGmU//2ZWp4ncOvEVtbTo+sMkBFWfbi9y4mZAfdy0/TvofDH8LbWKkDFsRHtMufPDfUGNT1+aYC0V03DgaR+LnTDAIBAsJ++9+o8VP5nyp/lqPtyhiteBvXuujMbaWVC3ISt5IGXf27EByS4EnEcT21Gpu89udzs8LFFHzdjIbyJjVbYfrVNY0IKJGqmQ+XIqe2fRd8Ph6EuBfFG0BVZyYPsDHwTJdyChwILjO/U021Pf8cVZIRIqTZbBFNZWzMj9hiyz5hC6/FWW1LYpuC6fVdJOs8cgu3VoMjyIvlnjejvaUJ/qBOMr85VZtlHTIBXseJSh+BC1EPFQyfu81SpwSYYvJLQDKqQDsQvAV+uCXfFOmS4BTNgQp+3Qp05G5Az+lAxILrV7nn5K2q4QEwNvaP9X0f71JIBRMzxxQBYo8cgVsLUwLsfJOjlcN3LO/vcV/uKQK3mdFPdpW+JxVojL+UOh5lSJF473DDPwijAfkA3ZkdwuiuVLF087cfrErMf7I/suRO9JKYEdXT3IPAN5LSaPp/hDsQ1/BNV8k/3svj7Ee4jl7etJu0wGLSTsk6eOUjjyyLrv1K7Zj2ffdQ8vY3++hcrP5HRisMo40awtIbIPUMTY9dSd7ELKwhE1tKlUwUyF9g4vSDUpKkzpvbFnX8FW3cMXroPXXy9JsAA9OZewBU7Qo2voRFk+Cyz5LlQCFCoqj3AFKmNX813g4YrABBB0piJx6UxiJYItzGNRnb9TwxtEV7NyY9p0px9fcfmZC60Ca3ripC97DO0n9rf6jjO1zjdSDSpU6VYUiU4BsWbnXdi9W0oFSIWB20bscxrWD8EtSLBkosUsy97dgsP9eTF3MNiUqfvwNZ99+e/Rp5/1X1/fNS+dao+rzK/4uCcLhZgDOwWcaUw1opK0F3Og+vBcghIW4rOGONI61OmJrwDyDUD/+CSv9cvZI3Uv3vLktz1AcPMXLA+1QeNb09EM7z9PWtpxdKjvvrwFfAtukjY9sMRGpmkXYFDC/JsSyQPpzmbBIcu75Mqj/GYxWvJVkKMnrIeiikxrD+rmarHanhDEdPv+dtlQlvPGaFH5D7Od7ClA3hLCQrCIjqWathu4t2Jwl+K+DnLbfK7Sp3Tac3yIhEu1saKq97c4SBoSxDHicilksCuL/kGHgyz6kAv2PB0NuiOmodjdpqoifNAzWEuSGYFe3FkqSWkAq+p2EPELi7pXALPG0De610F7UUXCFsDGcW/vHOyqzklSLsCGjzhVCedwvrihyD22JnHZzqJmPWyUrcBpFOZi1GXAeHyaula5y0zyFN1ONczfroQAbRwgMKv/czoiP+jYWhSB4rqfoeaJ+ckawRCB3QfxuVgY4bAw0FMERQLemEGaHL1Gig/jfh/NM8yD9wz/Dnz0VinA7+X77YEiiHb671WyxLn6qQ4pre1NJMbOMRV5r8iHwwjJkSfoPIUtePgMGnq2IlfPqNmAmAAUAFuLcsW4PXgIf5OgPIujtIl/XdFUjVQebSU3FqtsU3oqA8t0b+oMbHZWntN3U9WlZMruXfT63dBnEl9U5bnf8XOhduxbU8n0gcH3yhoE71bnkyEX1XwJyfjhOJpamHhx2hs3JBL2kxZN14MMYFZZ2INEJr0AU0NpK6YRuCPOoknuPoFajEOs9EUAjwDLUTGGPYljjTieiIcJxgTXUfiDAcxh/NhmgzYpCQwLUPwGErvcVDecYA1HZ9aelKCTidFJilMH7HG1QN9UWoTLeBpQfiCc07L4G28Bqy8DNiS5TCo6AMbNB6Cys4eo2Sahg7g8cIQ8wGKd2zVcQYM3jpyHFlx9fvirB7tyzFrG6tw3j7ENX36KyUmhaJV/DpIMHqC1Z35zWVAJXJIzSiaXnOTLMnERU9jc1GfvPnsb5nL8OR/t+UrgR/nLOly15+4qdGFTZ/aWQBo33syhrcLSHRKlksKv16gxOKEmei6dYYp1tWtHa9ppwlNim+Jdws+cNDJtQMw7h4cQB4zmUTXFpAkV0xY8zL3lWj3JeoOf7LvEYKAujSvK2yM//TmGg9NzCUwY5AnysMmVK8ikV+BZTqhPSrzs2cndl1/WuRVWfao0VUu1AUfyYKOghI9A693Uq3ln1qucNpn30H3h9a1XCEsHJ6JYmcft7jiUI2bsLYD1kTp7TgkDPMl8yCrbsLq50q7Mm2nr+goddeGqja27nlj8XoSflkIXDLMEOc7YtxKWM5klC3I1SBe+euCRmtRrbdPo1LsjnDv5VrvHe1n/dZVjOqvnZRX6ZHf9fRMO04uESJkSILeOjzWv84E8lEsGvsekrNnARmXGfKtL9vu8H0PhUqbe/rQNDSYKPOayFRF13Lk6ZwSlDM17T1/KnUk3lXFDLAJaClVvK4l6n0GRh09EzDeOp5Li1EvTp4Qna0qAI0RuDp4gStiIJ+2jEJ5GTXeDe68EPps9AbADiBpHdaj21PSXBN/QzTLPcH2VQ7MCziLkl8yRiL1dwwNXb3zVuJ2xNkFWTd4oWNajDh45JWtWn0StPnRkhkq+OXRAC12DsMkQ4QpsfI0SWyElwzG9tYeTXjIP5/ifpX1V1DsNWBz08JN/r4PO+vtM8Sno7WOyQX0ADG/mw9BFn8+I19IUSIVF6kJUlguJ8W7/gjVmld1RNbbL8d7xzd/88AggUTpF1dwtxZ2zKWQJkNNLze8FKC4ZduItY6PcVVBvS7VHRu8GexIkEEyoWWdlhpTs5UO53nlqQ+o8rLsGasiM5HaF+pMleGF1dWb9NZlv1kczCvMTkR0XgjNq79azrL/IomzGOVcP0wRO8aGrmKnE2rl6C7NwRnHP4WztiXsxldPLOHFO+5WmAP/cib3eFv1FbfZT9O6xTRPNsHmrkast3qcS1h2jJEOqnyvDDJt3Bqy/7W6A65P4XufOdJL37ff45hc5zfyG5Ba3Dre/sgfX7UJ5EtCy5K7gfdl8LOobSD90wnlbnNxi6mhJCfRmEqHFCm13016cer12vsoRgYmZFfIOTkXJIqjdSMSH3ijb7HZbFX31TU+NWvvgNBb9IZrgyYtX21QR29tPdxbVa9tiiDLdgPl0YZ/UchmH3JSvJy2y/ktbVdccxND0kxbM4hri9+XzfCZGkavPMCWI8uG2OVGnRlgJkDIK0VxQlmhVVb5RHXW6mnc5VgTidqqbyAyyrFsdSyHiJnjiCU37sQ8MlZpTS4+ZYZI/0XaQKWL8JMW0GpvrT6sAOEZ34ZdNk5e7bbeXXxMqqEMY275lj9FOlvHWoKgek8kIWWKF+3HUT7XQCjZDmakJq96qh4patpTmmaa5lXWQJLYqzKA4xduSYiOt/7iJMBhXcaoELyrm8rlsrTb54Sby7E0CqlGlSXhFWhBNglUf+hQurTgR+lTHZLmpmTs4YZJ74rQ/+T6Z7XwzBRRKV2XiGr7Z9joTd0Q+0oQspvIYdS8/8rjT4MCLgtd0yfHl6Q0lSbotrCL26H7gsKU5gr7Kc1R0FId3OAb0OPiTBS3fDOyBgyPmR2pP6gOl16Yi8vTLT4xFllAiq3xV4h4ma36YPLBQIqoWOBhnjP3iD8wDqeR+uvxwdYmWuNDYlgA8FUCB7hw1sG2z/N07P5TNPmsUi6EGxWuii6YdyP4Vv1GqXjdjoNUeyreRibzgObpHdzvXESbQMNA3vAfGqferIJhrWGwH9fJ9nkbtsZ4tX/0rnzleuR0tyDwZj9k5loMB55OFgtptQd0yfcHWnQ3mhTSIYfit0Vyk7zMWUBRTuTXdDuu+uY7bzsizhjK1nI3xuHXnoAm8Ent4HzaHrRfp3zTlpRp9XBWaG/fKhA3GoBRQ+6jhseM36Ckkkdp0AoLi7PlK65jYLDdfiL6Zx3OGQ1Wz9xPV+UC2ZaJw8ayLwcJhkIRGeceM70VPnJluFk9yjHoyHX0fKv4xuuigdzG75Gl8OjA9nnzQsUWrxKP7fpxnaA/ZzExhdasUFVm6Fge8QsKdSfr3TtbfaMgx3J46Bzs/XnX+TYe+8fWQ0nw5aAoDQZwJBOHqzgy2LLf4ZerAJiXhYNKGJycxJ+zUno+wvpFxutXitDdNNGc+7SltYpubcI+o7TbInEurwm65DHfKyRmKqcOs+ErpNyp/NfdyIcHPiAlvUXhG7nGDTx9yeUYNZNllqwYpvSoVcdzFwWenTTWl2/3OjHm1CC8hDamjSgaHpgursbsm+mBvlXgM5hvR4iLyNSmfflNwbk6rbmaayh5uGsPhE3qNHJ/+9rK2w0vWDi9Ye1v99LksaxLNfPbhZKrOuzQ1O9fwMXnzK+Rj0KoJA9OCxmMysHAm3EQlnlZ1WZl5fNSY4N5mkN5msP5mIJn73ChxcwAWb/XAZdiDolTfqkADU3H5dXf1t/x8UPs6mXLgU8XKWL3K/WbsnuSCvL9bZEU0ym4Fc3IhFmkwpHjrrUBkFYDERBLoBMsq7XV+U6XDed5Fza3q3ByGzu0VoPUVpbweUuGjS5kwZs/HTZJv3eGBuPFaBw9A3OdyhQ3DEvDWjjdWmgbYYyr5srwli6RBOgOoZzrH4NwljCTBraXEihEM+z7kDrbymIlxUsiNuj1XQTHm6q9m7qPL+MB5oFaTaJGDpjN0UG5/xjoUKrSndO4sKDYwhA5qgAWMGHoYfZtIUyNAOqi2aOACeRAOmx7q9p0oad6Us4LPmgfrIonjfAlckh7l47MYtid+8mJgTJA7hQxJKGOlEZkdLkHC+4DBFKgvUQ0N/EOBGKQFGuEZFO64ulh3EUPyX16y8a3YqJEXHDOVH29ueJ9epA3LiF2r1jJRN4Vx7vLDqdtjOyhrYBTS1AIir3rr11R0U7EsqsmexGvpafPBqaSKdm35w1fJOpe07y3JG/nIGa5nYZdLbk3JCA/56Kk4VwPsA1c8WVQiQpQ3FtmGd37+LBfbYeWbR8uveHZMfp7vwffgOiZw9amc7N8uXasb9hij5o2CtI76+Vj8ZW6jD4bEcFE6lhg6tz2OddGi+800oMEEdN7C/BRsiDXjmx3aYrKKxIOQ2qXHojBCmvYS41vWHpJCsaNM0wdmg1btvJISc0qKZ+PpI8mleDrkXxfch9kk3bjlNzDbWRMf2kNowyGK7Cbv8lv3niJLfYXs+50yzIcdBKv8W6WMfILfdohR3hDIrterXCJ6t8y62EC3h6A1lxoMcQ0iUwExC52eic3qTCW98PgCbUjO6CJtZoXUkzqntOjRFNSegl7s8YGWaOXV4LRb1WF8FPhOGv4KqxVW8uQ1+IY7QmejlnVaFgRzjQPWxwxYq2Av8k04aAsXicpfa8zBqf58szSyJ0C/J1afI/m113UmFqNjKXdbnPHXSwaiK1KBPucXPr23HPbstnNKbr+ESco0AyFcOHv2S7vCV4wij10vH8r+9e/e+y83oK4Og6HnngSA8V/8JKwwsMBlkh91TG7V8b5kdYOv0BM2MVO4j+WJKb7ELJMB+wQZ67vbgvgtj2HpwcaTM/LRHfmUQkZvs3DpxJyXdMAL/9CA8v5DH9tGuvtjQFex2NY1K9AUhg+YoHSJs7QWQI9pY9B9nJ8UxVAguQ7trPbMw9P28Tho6ajJ/XgdJkyxz0B+ODkhNTCvnuJ/93TPTFJ9PslKyx7yh9MlOrpGIBU/LzxJeEH0PixTwd5XFfmdNFPy35UTlLK67SfxmE9LYJrdq3SvDa4SppjFLoRM7a3Rp6qSEw5B+OtVUOJT0pqFK0qc0MCMPxIHxxHnplJQtxJ4J+M+ehBWaQUbSmkpGUuM2VTcJ6mJCsNhTe5nAETuq4EKNmN0Op/JHKbJyDqDerdSfVzz/tTcshTZpWFpR2Lfwhv624Tm85AGeU72192Uus210AL1upqpzGqoc3gPjzwN2fV6ol3rwLuv7vA45g8QwXVqfjf5L+1KWfKyNEcfURPcI1QSjA2NAatPrYXCNH6wEVJFZ6m8Dsh1XEjvsALo2Qsj0qygN6YGarPKOiEqz1iIEVmHOUEtKsHJdA+ZMaTvofsQ0QPSM1ZSjft17b9g+3QTpEIYDHvCgLt/lLd4fHyG85wgRspR2cGG6ytdLVxlxTFChJGcRZMkn4RbLuV+eFplcLyf1SfUXyE1pDzKVMbYX3Nw3KzkYslLjafGUuqHgLumzUxIUY23XFZmSkStTJ2rWUwJriC9tNdXDhKvU1rNL4inn544m5BsicHh9DYzZM4/wNVVvlqilWjpinItI0P6yC49hI4eTSLSdlF5Awye6yLZLzwtCNPHrKoABbbIaMzy4lN9P1X8cHff0zDXFOmhzydi7ssCI7BM0kKfhJwChNgNspEkff1pww+GsixSwr3Kwesol4TPmcV9mV3WwG6PMMQUp7BdTEegD4Ys7QBIpbZRqgR7HZpVsMe6jfR9j8zQeRixChSs3jYcvtcbbqlSCNYbjm+JjxmCj1DOnHp6hR09/6dRI3UM58xubV1cYI1ozgIUhXUYqICaqrnW/Y9S5VomtfzT2tCyIJKTo34KbFxEvse7rVVkuyFaFuqgU+F1O67YlK8oqV5QWQycdQFsbjzyUtKjYiaqCRpf96Vg9Ovo5SBzK1mOQyS68IpL55vGxZ0BE+ij4BjDX3jXh2JwQ0v1yOBAPtFZbUVvv+cHUokFctiiN1Ur9rzgWpzO5Z8X6UADlzDQHAYkcY6EVZy4+UoENpNOGkj5yzxaRFMEGeqmxiHrRVaqd44kNdQ9p8e97nBV21b6+qnrtqC0OD0cYWvNQROCMg+4/KYlSiIM957qgzSqX+vMMZdDl8zxzMk4BHFfN4jxLmhDQeCK6pBybS7uRfFrxbDWlcjWVabQEaBL4jW+zvDBlO6xPiLJQ5hukOV2T8u4yxkgMg4opI9JaWI6oM06UjvwdJS8ABt5CK35fg93X5yTzoQF77ey0A4fErWJVyod5yKqpnKU1tAVrULXtUAN0PR5TOidMYPWYo7MO/GqUySGXD4s570IKTrtuWs8mb/43AB4b+iBLSeyxHx1i4uXYtswXQRqTpNzSLFYH5AqgFGfBzkrneldl0vYbmWS4eHoYmkswVfRud78SLizKeFD7awpVspCAl9UttZHp/iYodM2KbhM17Ev89CutloSx4kX1TzfNewikeXQL+jjYJAwVSK0i3DUXBD0aF9ifFJh5gcAGeGe0GBy6dT4av9I6z3S4mlVxCwQWHulfxCRf+ftJbvkjLTplegI7f84+A7fKCDm3CcNxW8Xdcg+LqLugMZH42ib0E+jdXJVIdqlYXce7Hu7Arxrji9n9PPYQ8nj1P+eHJnWquNGCt+E18juTQAn06GXiQjqoPHrgEThNOK+G3eYj5RKgg4d58dN1ROLajDVfjmn1Dc14X181n0COxPbP1XJjeBXTQZvLfOx+EqVKgZeUvIO0hi43dOA3ylU0IBOScMX7th6GgeB71NAjAFYHU/T6UdrE1HD4PlawKJPMOdgmu1qTcaZac1o1fB37MZqPKiaSq/IHCG9Jml8VmwU/Gi7ZoedR/MhmtQIrbU7CLkE9dOWV9uNraNEMDcZyoXW2mZzCNugbA0F/NRPnN1w9qTAwmCjHclUDBaZnUdQO39A9YQTpVOizXRIBr72FLYOEWg69SaiutCgdoGBaIaTGgaCsGzqNg9+qo5tSyebsVdtpuiamsyIQKc8bZ/rUinHrZ9Gt23Q01aecKT66XUn99QSvftCanEH2z5Sm339D4Vc6xk17GhH0gno+OwbYwBbTCLqEsAdEeNO5CUSbttO4Mj8LoUF9PIdrQ8oM6hiBBSIEmJoCJSaYLya8aPAWIp5oD4A/MbD+B9AYAD9wFfqMoYGULmVBjDwBDF6xQ6kaNWd4ICHEwW/PfBuwV9JUEA4YILBdiF+k4O2G/iwwHFm/BCHqwstjrHD54k0O4TelbjqkhppkR4TLgXgiRsqkBN+Sp/kyZMMwmaCs6U8SgVFBHBq5X50hec/OoZVGPqvAHtp3GGAF/2ivItVlthDfyvXUtNxBuQz8yzNQS/6RaVhlCtm8WG/QFCIQYsTYk0tvoB54gswAN2PbsWsOoUmvvRrXMMRv7SWifWov8Pbf2bhFJaNLFYKJOKHaGvuUrAlPyS2guQKCqP//DOUAYMGkk/13PWKEqFmuvvtTNbOyuWQBC+H6qjn3z2YvOre60ew6+WrWihb8GWh2987D3qW0GxQXaRFuQaNIrKyGX5MuP6ylGkCEu46vtGVhfNpPbWWjq23oWgn5SuZ31LQJtZe5J8rQQfi2BN8KBds1zHZjR/IeiJHuw0bMWmq9vbAMRzUS3uHRQOPGGewjlE09gzOjv5ahLlVeEICQiF0qLTTonbshR87+eGndMDGN+/R8tFl+rd4fb44X9z5up+2B3D4oNs/wsxMPoT032sAew/wLfSJcp+0cV9ZGlEGEApTVeISPeTdkyRvnTKYNdAUMOJ6aweD5upArYMPga2zp2lnv9HGxDOVRaeyfIyc/uhPMjm6WF3zw7l/XlS7yxC+KTshKQp/NuYVhiwx/UggQP/s0MmBRJd7NVy3sXfxuVaoyrMoVYKytrwHt4IUsO6IQCzaGK/RcZr/ItU4HC7L7wu2Xm32u9dLsyY7A+t/g2Kb3zxUSLCBWRVtrFMJ8Zn8oBDkOconfa6F+W1P9/+JnHVyy/R5n7AFGxzmEXxwiB24XTu9/HJVVy2Q4zuKZS8jKljnBD05tWQZKQwn0p9goo03utctrs2q/d4nE/KO+7ssyGjKabA03vup0WvDMq3ZnPoBi2k/MfXB9YMLe18b/sb+mwvkxtlksL+qvcnZzZ8aIUJ7+vIk9eikvT5kI3IDu743rcrC5WRpcmv3WXuxwIrQVeOCM8Y/W6hGQbev/M2qOn0DJMkWMtDrLsbUYT0p4YzSd/j2bI0mpPb4XAS7CU+kFsB5ajJ2VzCa7gpyEoeJSYMocLhB3190OJ+qnkRrkmUTVvWRtH4Wm4vcFrn4n+XNiEMAiDJM6oxk6ime/2p/m8kfW7LOub/ky/p3u6nNWjKnSKvHZ0VXFFPjYkXCwSkk1rONhHVi/RHXIxu/piFZKLTzJJynvENdg1ukIBR4mhpuWhBoYqWJ/PVFs2DAuP+iYLMnQ0w/7amP6mok/GyXwa0IE+Z1V89E8rFv5HGK328jCgwhV2iuOer7H8o4QnSxXPd682aG3sxBR/Aq6YzMUREF88WPczfqcnR/qw1uW9ZUM4vm30Xv55s7NwK2OI10mSINaKjrD4Vi/RJrGo61vpfgoBTw89DXYHIlXkqaAIBGDogEUv750EpXae4ta95INgOnYY8nU1M06cjxSW+6wdtX18CsWiF9qmD7KRU8aeFs3jdfzbf6V7w91x1mBaEACaWicMnpiv7vLAGlNY2XlfWaCZuFpORPC4MGz/4YpiGeRhXEfU/VQizyXvzMGg5n03+K2/dDDMMIeqOvDT/1+4/Dhndchfs7JKybMGrCng7QcGfvWhpDIgf6gGR18eV5t23MHGVMD9+qcZrXPj+xEJlR+yeWusstQn7NXZNOk84ytNv5a82oQ5DygTWN4TS8pIbrQY3Ax8zUOV9iM0Gqxov8PXMnBqn3ta9cmIyFSg1Dn52As/rXKroQNJqXnTHi2eMpPpDfdu7Ny4dX1H17WBo6iq7QTmEmDBHApA65DIDN3SyiZmzCZyqMpIqRu8iB3lsdYrtnXRk+fUZZcH9naklRRmvb+7zLK0W8xnRyK1I1pcVmmTX05fvlp/QRLZ2moX6CqAn1WOdWAQMY+piTjIRDPa7AWC6peD/mw8EvzuOIxFIfPdpLY+MJjan4Ldeq/dT39XhBEG1KYZJzhQxYqoP5pJCgsmP/USQ393h1e98W6enjI9kMtUbB47GLLWq3xupQAIUjcZI+MR1K6Dr36FAPqliReZn1Nyph+xYFG90udLp2j1bsT6qJbsTQE7LuZ2dxRop6lPmbM13dF1lnBCyeB0kzJllEhs/pJ9lg1xLzDTuVV5kTaJ4H/3ub6bvOBKMkAfCpBTBfCzzPcTH7R+PcxGGHE0LZDQWs2Hat+JL98RkvxraoLNLWXq/oJMQMlHiZFJrbzbX/1AfbguNy9r+tnvohTKZP2aHw1TchUksWuB+Cu27GDcu3ZVL7uyy+aLRkOi9zcD+Qk7KlOOHafnYhufCiQsIg9kmSNmAvRoxaJS3md3uFgGkhr/fLI8FWXKXDwrwjEoRiLwfXPAtNLnsBnOMGmg3Y/YLomEJju3VW1fv+BTDVoXEc5bWRpy0M9pO2CPcdkq23WYryG+TyY8GXN8fXEfJ9mQTIAYAuY8EJjDK49sCDsEAe+p3imMvvx9+hOvGZp1eSyakLHxIm7bR1q6momGzP/NA0t4B1Kn234R6MfLhuR5L7FR3gcuB6ILkS124cpulA89z4p1yWVNb5Bt45knVtrspvRHaiH8RZ2qEQsak9gekbow29qUtZzgmfA9lal4Fax4A34ibG0mCSl8yK1Ac7REPMlgpq/Vb2VB8+i8wGoAALJnodRcFYG8n+s/zdZGUX+xZFYUrtLAN2IM39MzRVrAxHh0xpa/Q3aGcQ9YxJagxXmZh6LLCuXTId8ufBHC1uiQGZtHaWZR7npJGSYjF1se225V+82cyqIbDHlgPuzcRzfK1YN+y2o72lR2CNCZOS38+GtBY5RjgzprK5VVE+52lKEsz3ZRtwKq7Vmq7YtbNAbBVpsHgMG68pdqQafKptQCI+Hr+RJ7kgpZU9YFnNaNgMTzp9uqQrqSoy/k1FI+nVFUUqS/TTvXrq3nNV0vidaUzfJUbWZT+dDowKm3LpqQW9rsqmABLkVpbYUpGgVzZfxhHzZHNdJL+FHEPv84Rlw1xACedPFaooZOTZC29acWr7uzZhOJ1a4XmNrisfLF45YEf13tOOh/rgS383xTFR6+mCFe8i/qLnalf9Xz6mLY2TFT+j1g7PqYWXqn8Ysv6FX/dEKfWsH/SU7RrddHfofiKGu/ZTY+256EeJt1X2yk/lOy25F0yynEQIeThgKj2wbTWHuoD4/0jahEchULhE5g/Go/Sie6ddEpWLILq7Pzg9XYAjbr7ivXPM40vJsgNTx98wUqKdGcrxvGRGHwvse4HhA6CI3ZE4Kfk5pdz79khw69Vdd6ILMPEFATwV3u1RZtKquwTG7Ww/ecVecF4yebenzxHatR+splqPc9qFHx1jISwff+v2wupp19t3n+lq+9ZM35yJAQ9cq2zmFHClshAG+FsX8blHhuvR2H9GMFeEsAWxKY+esuw2iBsa6QRMMS++rCIr1XhzCNSmjlJvCeKuelTm5UVPz52rmhSQ+pMwEIWtYFLcXYk4ybXi0i3pQe6tMy0UrmDq2T2RZgHGGEbxQz5DFObL4TiCVqELpfsPgFJJb8VO3YBkxMIlAQsSEU0c3aDiK2J0J/qcUisKPoqB8n4SAPaGE/4S89Tl+bPYliqi9DLrqG7phcEjwTHq8tRZ30SupitlcU1ADFhu5SZSNeHzstsNVm4oLCYGc1otONMZrK+0flG6mSWP0W+UtIx9oSmwtF6+HsWjqIIsR7oWh78nbpsuSX21ShKt6tF3DnknXbaDhEae7SKF26GlbHJvSpqQ+38yI2hBfppYpFyokkzGu2mDf33Txr59fxn0wH48IjZu0Ae42zaUQQXITiMnRixbs6dfL5117IMBlq9x95Cdzx+OmDeiLJhGlc9cXrbALhk5mc6peY1NkBFYkpXkhUut3DIMzsqya+RUfOZxfKDZuj8clkjo27Z6/pnP7w3bZgKcct/YNUn76290cFa66NNvsI7u3J53cozSY1+ZjzSC3WQzb/78j1WHU2lQy/7uICV+PKyZ5yU1xi90rgE5r1H3vNYdoYTRa+cPao4lrJiUVtqegkq2qkEaevTOjiOsYvPlpWkeo395Z7qa119g8S3ixsTgr0rTecFjhQjn16XAq2d52qym2IuOEbOB5+EkbLRa/YWYsN72S8flTvHld63HP9woCOUftd5eV33ogC+4Eg/WfLygUQKO+ezv3hMJUjnb05F8tnPo+l4Dald05+P9c/mD1bDvYCubuKCHorUTLtcjwx30/EAH8h8EBdIVKb78kIYHTy8ILdX3/gcedyOMa8L3dqW1z55sF8GMANkkLGG/LGHukMd1Bt5VbXdu19uBN+IcDfz8hieZirbYKu0MZJ47KY2JqJkqiGbMeycqxjn6sO01C8HBmhQL6oijwalUv/G9ppe+o8Kp9RGy48Djxj4HljGS6ye7mtbrGZYVmmN4U6oPIyVFcOiVuKp8EXOr75LzOIMERdDLPCOWmI8RERHvAgC75dz9hCM/N4IY/qmB/Knnkl2XXbZEQYCsT0VvUR/nEME6M8GTtJhwNTznE0B6eF6MwBWrzzNvDU+tfw5n9lSo7xiQoFqMYi3SaxSdEVAtSkvSIyc0dDM53L99AfSHHzBVZDyv/giFORph4aUlDkQwzfIPVoGYRt331pMyu7OntHpWbBpa+O2XzTUNYqIMWFD11fvdoskl/0vKICI1tkj58GAdKw1XOYn85dljqImaEn5GfVkzas2VBrAS+ExABoTIsQJdrX2Dag6I841kt5ygaJZkN/ja47XjUwknzobSgVwv6GUtm24HorYinPQNg0ELPUy//IiY1//XtN9cm62ZYdSdm7TiGbFrykbavf+/Vjsbf7UftzHayPl8yGMYT63kjNWhht0CRpLmb+be2ieOGGzPSPKS+jz+mKXb1CNl7ATUskQU5nOLjPDzgdinWOvHOg/x09sGNg/A7m2y9uck/aSNxHN0fYEmhETXq8F7r8NAVKk2ZbzNJs3LDGnGvAenOdWmJp+TtCKurThMAEG+ohNy1aLBaDxKoBuYDyQz4a0IeOFNkM040kkdTBY1/LxkZU7QIsCYt8W6R3j/oY2oUxFMzChMvGfQJ3XMmQHA3Z6SfODRlXXZnHRikVDFmn8uv6bqScACzWm7AYPpiBmPVTCIaLcFRRZS6Ng1SZ1sb7nrH3XPXlxyCaY2AQX4O/6L9ON1l/UH6xhv9B2FC44gaPT97/nti63gaWxdvR8H71aTF4WUPii430MJc2EB4E5NR8MaF2V6/Oo6qazIKdhFTz2noPJY5TZJXOqpBEeCPTsqb1TjNCe91MvoPSYlX1IJ1a6lipPN+ieePgPIrT9pD9NcXCTvDUZnyEIIs60bWJJ+yzH+jCJzkxoP1/YFyqgct7NavzeUQm+ZSqmM0n4KrZ9DgBVBU7TTRFH0jUJjRyWmNEM/SWWIjYffbMs6ki8OtVLU3ZrAMQ0+KxmNVQS3AH001sfmCbyFjColkpzH+OUzb0l6hEsQwjOMCi/elmTTuKgPgwO2XaJgbPmuDApFwSfbRJDPRZQ+pvtEW5zdC5lKsMPIKT2nxvBwkEdE1/0nue1ENC+JDy3M2L1f9mNFhbS2mp4Jhd/rjp5XkF4ZKkOIOQ+0hrTuzKTCHhoU6VcSuL3aAzbV2EyT5qYGr9pBCIu+GA4HzBqezEJyP1G1lxuoF2gDI9sWz1pfPDMejUtjkyhloezQbHEUQZ8gxcPM7hb1O/jhanZBqGZFitW6Os8xmfy6Wel1qqRiBYMHBpPUJq3EiEaWLTHeiswaNa5PuEgPT7Q9rY/oC/tQfj1eCpoZ+/djaZ3SWtXpoYSsHPGortFbmL1AtyaToJVvOyO4h17d6kdKA3nSNXLBx7nvHQ1UbEc03bgWdF79x/1aI3oUDfp4gAkcLjluOEyfjQHTh9EGFFHvTbd3qv2xgBNxtkA6leL6McotcXt14O5l++ToLZs3aKrhw1hURuxApOpEbKUDFyc71I+08DqdaJtlFTYQRWLD1DghSzFStez/L6UxmhmeSDQhPAUkQRvwEYDGeQZAwD9nN5Wvwh0EnMLpE9Q4923C8AkrBB/LXsiEi/G6o1Zzry/Iomaj1l5xGRAJJXxSkeGAvsuK320SYykYhQkrufA6ocRGmr/GLEr1rritxAalxUgIb0zyngJ9WRKcGvETUF0WrtPZlSk9sJ0EfJe4ATHQpwONvj/YIqs56ExTQtZi+cdFFWq9lN654Mp+fddnw+0wI0Nb5hCxeXqqisB1emiCdUhbdPyPX71/9HmxcZJIppKFrYgl9GUiAAsMlx2cdEgWCP9TuZqXWKjBcc1Mgm/j6ymv1KbIlEqMXGbBvGZlHxS5k17IbYMQqtAck9/s9z8ArtgnmFxdQDyWHiT0dYpnE28m/0nXypdig2eG52sWSd1E6+055G14GBPCHbR8C/ahJYjhgeESDgHsFY9c4jgk9qARyM/PUayXtsGk8uaA+hwjsgDH5REFCW99LFj0RoRHNQjDnVS+iEI97rbMxIA+v9wd7D7rJvd9YLjt6IjhqaCd6RaGa4OyPjq2KvbsReS2ET1xdMMWLGaOGQVK5ojQyq+IEqWVHRJFgMdOKziw8OxCvS/K+tmx+XkSVJ21+6F4u9bSxjRaDcbXZEBmmAxJBHo87mWNV3FC5U4XoyFm9xyI7MyN8Dzpd+5KkaVvkBHHJRcDNFvLpz6genAS6nLRt68PqhcAQtgPvvT782cSsdG3/M73hqBR8JhBTN3MojI41zyyOBt4dvR2MZp7Rejv90ddn9aqYqcsQkQSMoZMeuwAP8CEjT3tfOmE3BaS0gAEAIh7fUoTpT0bcRIHgIOahyQzXDthE+sn5qGDTCtYgZUL9AZonFxLnbghkd2nUaJsIquXK2A3TtUJSBPatdhyKjANv8UQCI7MQMeMuvJlKtSnD0VDqGVWhiEWMsCkiHzD4iJu4LlFnA5JtVofhDXlUwFdnxo3XDQsRsDolGUF2DYR1kcgAtbPDDKAjtOEAgjQkMHKDSntf6R5wJWFG2OzRDJRyNW/phCEBKaEgCeXsbDuvCRtj9kLsfTkWc2UcdqTY3lY81smlz+5gbYSq69OE5H+QZ9+NVr8gAlzNryS027xN9+n8lyouSTRNFl3UgkXH4O+IIIYnELBvaDvYUw5RUp1h2ciFYenqguNExrnZxbq0BKk8CrhEZXExqv305pSX1Sx+BoezIvOohwuj3R0nkGgwAHDoLdHSjgHaB1eJaL19DkE4Fy9UOJ+j/rS6JD4PqSbkjKDTz416cakkXa70YdL1dTddcukc5pCPBzGDg+z4iT1WVWnnqNjg40ZvOp9IFRviIABgQjVMfqGe4AvPMQHfzyYBekHi6oLM7nxsoF5rkzl4qLXXj19ug69kVLMfxdTJPnBtZoLcKcbZ4cYjkV9oIbWGHJm5G7Clhmg6MMfxAr4xTNRkUfonMOng2arMessKeCooQ7Qg1WTO4V5hunCyMY0xzuei+v5SSASBjk22RbZgD+d97zvgt1x1LfdTJQuV785E9MJkG+p52wN1reC63m3WrRAsavh0e+tGTb0//3R2VZiKJMvxrCOuPOao6BXIasrDt+5hpazsMPb/KGJ9liBrqGFRZuQjcbROOXFHo4ib/uBz0IF1GYuGc3SrPZ65qnyBPVQhuW0imjs1B8tt8hzzRF1I4+u3jCMA4HhzWGPuR8i62z0N92E5LblBPPNxrFxTEYVLpvdJlwBwjAfAjxD3bQZ4sTak1mtsHpXkKE2bFCHAzh5fkKjtPveXuTvCBoTyRV5qlm+UmVkFQFrczqKyFUzG8oHlaycKMs3MWP0WSKTHrIx26HnpcucAQfqAKwnkxBC7Q+c4lxzPYt5Ogfh6I6Chw2k3Z3gNNxZOIMc9qQHGzVJwmEHiZ/2F953zYifbgwU3oYzr7MhrujN05umN0lXTE8LYg+2eOTq2aQZSzWqSYtri1KLhKIOJSn1F7TAhY2s8iytQZyDRSylUzhbTJ3KNykrT26eriK9yWSlifshi77/YKSXsLx7MOUwGgxpY2k0J3G3rngHVY9dErYWAzuXLdogyG0gWoh4LStSl54/pSxX99Warfe4yqdpBqoyIoCKoQRiLgbSeYyHImLIfL6GKyNmVXl7O23MNbWNqdBsT4UK1RerJargxcvZbPGGNpxyGpHBPFuk9UZLsr6r3d5D7I4YUb8R1e3jUAG5I43tm5vNJpe6dHvawGhB9dNGW74ojUwpx1UO2sAt4DHgRpO52+nwwQ7HuId43V+s4WwRy6+g19rfhpm+XdvapzfT75wJJwlgBVzJ1KTrCrrX2tmXySaAOdGiXBLvRmeUluP0tM5PRScTgbOCXGlRnAFOUbXJTqQ8ZApna9C0ZL2Wg7ij42vaHRtJRa+VaBSBoSdtmNcf7bXkMfcTTV/73ufFab+qj4gRquAwUOl6aEOGtl5Ud4lcgR9FhCuqRDob6RXohVKnLwhL4ILEAqHbNpiJW3ZRtYjn4k5R/go/jw5xM1+4zXyXBr0GTbrIMHnsdzVxkjmS5xRrl69SBA+ySC4OyG6QzzI3IL9H8wDa288UHkbd33A9Q3z1AnZBqb9o1dtGV8QlN3jsNnwKkEBpCamgPAEAUixaaQnZD0A1i5JSw87dlDpKVxtEQ1KnEPWfcWjNthTe8suaO+XRhoQv3i9pSUvp9TS7XWDxhFQb6hH1/uxdtp3tU+nyh1Kals6yM7ldH9bWWhmb2k10LnKv3yJ/fE1+8kJd4dK8JVOzvdalwYLPgOwhiG06V6XkjEZKVIjYme8zk6fPgwj5mzLTv4KrvzKyXb8+URi9MxmRbmO+X/vCcSw72aZrnsj5vjtMSk0fiqZBFrcMNJnmEy/8AxVuHpDnIEFDvB61vgMSKiOwgZu9rJ2iMfgxK3mrDapl8dKuZQfPgje7F/B6unS/dI9I4lsimIyakU3dVPlLfb5pXV1UE0WqmO01TigRBKZwYXyrTbqZ/gGAMcJiQwxxcp11+KiD1PhUAWZJYBu7X5faMsfgqRobMBCE0gJwdkDECiWWcEvZUbKy1h8p0CbR4icX2PcQdBXzYOyXLcQy25bIP0vWau6sCEvw/RTt5M1GmwHgPfPF35Uf5yB2tFkFs5BjlJY5Ls7zbOLD+bThC/lDcnat4wd57cwr4Ntmaf8Z6Q+8th/gfp3kDZ764Ns+t6q+S0GDE6I3ARf5m8g+iRQGHOBwgh1gFj5aJZet0eR8WPSNgwzq5BJoLjiN7AsWgxMycbK2VIoLKRhGy5GbammOYjR1KtsI1Yq3IJJmpMfBWgp3NIAHs2WcxWsTUkVCHwlvyAF1XSuac6RZzM1veYjHBdRk4lnOIYDAI1hzGDCltDHUmUVVIl15lNUTfVlClIywjaGMc5uyE/zVXTuRHAuOr673bp9KkOJiV0xHM0mb4Afu4UqrfLU1ampHJEdad91Z0R07W8mWuZcR5KHpV0LdS61uJeuL8A+FJzMim+Z6m2IZ2iJSl64NSvjC3+0RCOk8XHBU/UM06JWbUW3Rn5ZA8mzRESquD/LYnYkdsUBLeBmZVXZWOQPd1oMtFqsiq4qrjlfjuJzmQjlzKlrRHBybLzVA4eiFjhMuJ3d0u5HCUE4WCaLeBNexIwtdOc5/xbQIG/8sayNsxiQHTAReFMdcXXGOBzKLqwNQNoPOD4ewGv2omE+qSbpQuIAxpc+/IiE6fAl6HVdY18P7TvgpRbYbwb6ZbOrbfVrdtLrp+rQ01fFYAI0a6Qj1Sl3YrtxQ6JgBPLV2vONykrs7o3Rr2W7RGWETUqOX+XFXHYQ31l+1U5FjfccXh+XcwdkjUd+JHZM+m4FHktewTOiwiWenxz/uIUT6MLwCy/C8t1hY6ROhjaWyWFdOb5pK6pZv/lSAyV9V00BoC4+/xdzYRsnTedZElgtlWVLcfmidinOoPjvmwIyiy1svZIZRZAjm3c3bl4JyQna/dpYNXl/SBxX7J3rBGLUrrEaoe3mky136bH7Nbz15KiUKs+46Ez1Oh6nVRhPiLz275uISbHIbhn4pPi9dZcIomlItYeRhXvrlTQEge+FmZxxZPZRj5hnMii6Iqbc+uyfRHeW+a1+hoswCq3+5BybHmAs1Vb9UcMZD91IaQg27y4Nr99E9haPL8wiyoFGwLByl5yo1TFu/Qh/Oe72YaYD8ePX2pLOyyLexa5UzhrfFNzf3lQp2M/+ljZ/st4+SO0SXOz5mPtLpKcm6jrYjsiNhz4Y96kDXUID72hYCfEjZYJlKbyyKJqsBE5vkcKCt9Xl6e+62+ZKBYK0rAqxvgw5dpWU+BsO1sHzt89At9xOnrgd6smyY0GtoAFgmMzlBFXwttWTM+ZV99OBM3LZByvyQBikPRea2lojsCt0NYATTJ0ASGUH8wyFd3lNBcKHCEKr2V7KGB0yyt4wbbgG+QcGfwFCsdHZ+GiT9U395MuQz92j6zleusZEH1o1cPr2QQzIF6pNnzO5lGc8pjiRtM7hDAdxd7XRf8C2ZtlI6wnAc0PH/fl+uyHZnmgaUqSPRX1NDSD6Ce3V1/K8ljkqPfujledGshrIjX4lO4ImpfixJ6/1uqjVqzVHOHxrwmmzUG87csVE3RjBbRiL6xNvrFKeDckKrWoYqbCrFq/473nZ3rBpepIet9iuQ5EatbOYqWg0Zl6G/yrSS3dfSw8m+j3WtE++EEbeLOBvcS/haz7FWrGYIJvG2EDGfNwsbeFo5Zt/tp7vq+zwzmyOiv0sgB18qSkwBMjNtzc+n4GDbMYaaCd7jEpRBBUY9MfihAU0WgX1kRIFHQUrFkGg1kC95ulPqqw00U3MKYKEiwW4R4h+q7EUgKGWPVfOWQu79nGfwv1Q7TlKWLC0blUaWtYAjFZ6zhpolvnx4EPrENSL9x380CI6N+GPTHP6Ap8DKPjvLL3FnEMgPOHPCTObw8YrLqNZdwCI9S3Uy5SyAkIkgROc2cqftfkblp7MfKcybW7KApGo7x34YT6aDPA2qMS3mUtsNuJPDvKx01t8OHLcD++3A+c1dB45ieJnMBAcjvEpjl/b3xT+Lwl0aFNiJp+tTwdMxnKRHxmI/comJbFMpptw/Y1c0SHpV9giC7SSZ0rBS0BjJb/B3c8lx0VQwMZDBhucn09NR0GFnxIbAoaq/xmLlqU2lxEMfbWUVJqYxfQ039HQASVshRP0jUe9ZaZgJpOC/FDtC0FwDncH3sr/BxDAoohfYyjiRXtRYbcCaOqXqydD4OzsUsHdWwTniduU/6hT9k9mclkrPZfnDY++3/X56XMPI6ngtoXMidLHv3cZj6gN54K9wUgfSICk5rpH/Vu8YfbKzg8UwYjnehLsTHnow0SJPg8ms9TnaUQtoKX5A+wOzKyDv4zxyMI60AqGZdE2B/0HxSAPEs0kxWr02vhKJWKM0z/D7Hc1ALUupdwTzsvBj0H0p1vP6Y2SPPAHix8gieRoaLKWLGvY9mmKRtyEdsBlCy/q0E2NkrTfBQs/qw/DO2uTKi1PQQhW2P4Y9ILz+cnBZ+feNejTO3ZBuHNB5/VBa1p7wwvZbRcX/FnnoYhcdpEXZwB0JESk7Xsn5nvVFoQF4CdByQsMmmsG4OuzwKtetJNA6GjTTcwt5m9Jai9qcxhXNO3dxTuOwSlGGuxlycCMYUjIfuAMnOxbKGfEsT8BhhAlJOVgJ6KXTQC7LZR4w5RdIHfbSpotz4jdPmDTiw+8bUivx3K82XXG2BBcU/qxt6YVXv6o5mTqgs514Cesw/ilGt0baY3XnulKpPtyoxIxp+L2VMvHFf0RpFqeQ9OEE3fuvx0TmGtOni6vrG9SOLw0sPr6+fXq+gWtw0cK4cl8z3RJATUj8tM5DR1A220SnH1GXwHP5YroWrCWBzG9BZxsXmxSOPjiDAL87Z5cMmUd610ODK05KA8uX9dounYER9EPMA+KHgPRxnmT275OouaQ9iVe0irmjJjcxbJGYAziSqARB7GHBshBGG8smWxEhwum7LpdfPMDlLDdo4TF2sojX1Pwa22xdYWIqShCdxjMlIFixF13+VqXz1vhfVDfBRNkNyiQNhi4+EmidCtP2K1mWaa+ZH58MGvP2dB2NqrYmk+JGqt2O9uP6u6Ir8SthDsWQl45c9rFYrC+Qhy0nh3LIUF2FmbNy+ljwKosekz/hZadvrXoFvUWVHNQ2y1Oc6mq1GEJY7zlVqmDcvhCuphKZktvV8nL0sX+uYat+7vXB8uPb2I5ttqXvg/mwxJshyvQ0myLhMTEyCNRZlKDHEDmQCUfxIEgS4UB9u0cWCvFpb1kcSTnziGilpWCgklViNmHy/QnRJ34cU6ojwV8+bPv0FzFCfK5iT4re/Y/is1Em5TdYjsW9ohW7Gv3SGINhN0wzdG6OihIqtQ3B1WLL/IKcs9JbmN+6ZQgO5Ynn2RHHP3RLnjdtqKOyLNhjPL0FvHSSHPICGVsFqqzF7oujf4vkumhxAVIPVPg0+JSmOxcp2o5JnyMV8DJX5KVZFDadie2C7nwpUrldfLeECQ/Z8XL8Qbr6ImI1OjOcjAJh4Tf9PKI2a5L/HYiZ5N171acDQ3I6rDYiuhwt/JClY6Obap42ijbazysd/Ir7+mhx6cREVxeGtw28+S206mEPicMLBbRxmgQN7Ldd7TC7W41WKH4Ge/1XOYfSY2HE0/rdRBMfBzwX3luYwzF+cI2Oxiddo6CCGLNWXB8Kcc0wd+nWix8eYvdxRmudaJeEwaE8mUXkNfHXgQtwQKqEXagO2+VPStDLupej1Tacz0MNhu4mkSCOiETfT7/9kE95OZZ4O9HgRVE62ycnY6VUQLIuOZvmR/OljS2qFxWet/shJmDPUgr+jxGiI2uS+tN6oRtjdJUZyYNIBROPMRL1gp9tyOFSCU4JyTOxILokWAZ4HA79qft9avvvfyXtssXq76x8Fdh+wgM896eRxpxf9msJGyEnB74WrYZBf+57Gx0ST5ZKY4PEU8kfcy/b26somyDU50uVnuJ+ad/AKmWOp7B2Cqz/h5ZEDqgOia38kqy+f9iVSEaXJYMV/wY=","base64")).toString()),SN)});var AZ=w((vN,aZ)=>{(function(r,e){typeof vN=="object"?aZ.exports=e():typeof define=="function"&&define.amd?define(e):r.treeify=e()})(vN,function(){function r(n,s){var o=s?"\u2514":"\u251C";return n?o+="\u2500 ":o+="\u2500\u2500\u2510",o}function e(n,s){var o=[];for(var a in n)!n.hasOwnProperty(a)||s&&typeof n[a]=="function"||o.push(a);return o}function t(n,s,o,a,l,c,u){var g="",f=0,h,p,C=a.slice(0);if(C.push([s,o])&&a.length>0&&(a.forEach(function(B,v){v>0&&(g+=(B[1]?" ":"\u2502")+"  "),!p&&B[0]===s&&(p=!0)}),g+=r(n,o)+n,l&&(typeof s!="object"||s instanceof Date)&&(g+=": "+s),p&&(g+=" (circular ref.)"),u(g)),!p&&typeof s=="object"){var y=e(s,c);y.forEach(function(B){h=++f===y.length,t(B,s[B],h,C,l,c,u)})}}var i={};return i.asLines=function(n,s,o,a){var l=typeof o!="function"?o:!1;t(".",n,!1,[],s,l,a||o)},i.asTree=function(n,s,o){var a="";return t(".",n,!1,[],s,o,function(l){a+=l+`
-`}),a},i})});var L0=w((kat,mZ)=>{var aLe=bs(),ALe=cC(),lLe=/\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/,cLe=/^\w*$/;function uLe(r,e){if(aLe(r))return!1;var t=typeof r;return t=="number"||t=="symbol"||t=="boolean"||r==null||ALe(r)?!0:cLe.test(r)||!lLe.test(r)||e!=null&&r in Object(e)}mZ.exports=uLe});var T0=w((Rat,EZ)=>{var gLe=Pc(),fLe=bn(),hLe="[object AsyncFunction]",pLe="[object Function]",dLe="[object GeneratorFunction]",CLe="[object Proxy]";function mLe(r){if(!fLe(r))return!1;var e=gLe(r);return e==pLe||e==dLe||e==hLe||e==CLe}EZ.exports=mLe});var yZ=w((Fat,IZ)=>{var ELe=Es(),ILe=ELe["__core-js_shared__"];IZ.exports=ILe});var QZ=w((Nat,BZ)=>{var LN=yZ(),wZ=function(){var r=/[^.]+$/.exec(LN&&LN.keys&&LN.keys.IE_PROTO||"");return r?"Symbol(src)_1."+r:""}();function yLe(r){return!!wZ&&wZ in r}BZ.exports=yLe});var TN=w((Lat,bZ)=>{var wLe=Function.prototype,BLe=wLe.toString;function QLe(r){if(r!=null){try{return BLe.call(r)}catch{}try{return r+""}catch{}}return""}bZ.exports=QLe});var vZ=w((Tat,SZ)=>{var bLe=T0(),SLe=QZ(),vLe=bn(),xLe=TN(),PLe=/[\\^$.*+?()[\]{}|]/g,DLe=/^\[object .+?Constructor\]$/,kLe=Function.prototype,RLe=Object.prototype,FLe=kLe.toString,NLe=RLe.hasOwnProperty,LLe=RegExp("^"+FLe.call(NLe).replace(PLe,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$");function TLe(r){if(!vLe(r)||SLe(r))return!1;var e=bLe(r)?LLe:DLe;return e.test(xLe(r))}SZ.exports=TLe});var PZ=w((Oat,xZ)=>{function OLe(r,e){return r==null?void 0:r[e]}xZ.exports=OLe});var fl=w((Mat,DZ)=>{var MLe=vZ(),KLe=PZ();function ULe(r,e){var t=KLe(r,e);return MLe(t)?t:void 0}DZ.exports=ULe});var XC=w((Kat,kZ)=>{var HLe=fl(),GLe=HLe(Object,"create");kZ.exports=GLe});var NZ=w((Uat,FZ)=>{var RZ=XC();function YLe(){this.__data__=RZ?RZ(null):{},this.size=0}FZ.exports=YLe});var TZ=w((Hat,LZ)=>{function jLe(r){var e=this.has(r)&&delete this.__data__[r];return this.size-=e?1:0,e}LZ.exports=jLe});var MZ=w((Gat,OZ)=>{var qLe=XC(),JLe="__lodash_hash_undefined__",WLe=Object.prototype,zLe=WLe.hasOwnProperty;function VLe(r){var e=this.__data__;if(qLe){var t=e[r];return t===JLe?void 0:t}return zLe.call(e,r)?e[r]:void 0}OZ.exports=VLe});var UZ=w((Yat,KZ)=>{var XLe=XC(),ZLe=Object.prototype,_Le=ZLe.hasOwnProperty;function $Le(r){var e=this.__data__;return XLe?e[r]!==void 0:_Le.call(e,r)}KZ.exports=$Le});var GZ=w((jat,HZ)=>{var eTe=XC(),tTe="__lodash_hash_undefined__";function rTe(r,e){var t=this.__data__;return this.size+=this.has(r)?0:1,t[r]=eTe&&e===void 0?tTe:e,this}HZ.exports=rTe});var jZ=w((qat,YZ)=>{var iTe=NZ(),nTe=TZ(),sTe=MZ(),oTe=UZ(),aTe=GZ();function dh(r){var e=-1,t=r==null?0:r.length;for(this.clear();++e<t;){var i=r[e];this.set(i[0],i[1])}}dh.prototype.clear=iTe;dh.prototype.delete=nTe;dh.prototype.get=sTe;dh.prototype.has=oTe;dh.prototype.set=aTe;YZ.exports=dh});var JZ=w((Jat,qZ)=>{function ATe(){this.__data__=[],this.size=0}qZ.exports=ATe});var Ch=w((Wat,WZ)=>{function lTe(r,e){return r===e||r!==r&&e!==e}WZ.exports=lTe});var ZC=w((zat,zZ)=>{var cTe=Ch();function uTe(r,e){for(var t=r.length;t--;)if(cTe(r[t][0],e))return t;return-1}zZ.exports=uTe});var XZ=w((Vat,VZ)=>{var gTe=ZC(),fTe=Array.prototype,hTe=fTe.splice;function pTe(r){var e=this.__data__,t=gTe(e,r);if(t<0)return!1;var i=e.length-1;return t==i?e.pop():hTe.call(e,t,1),--this.size,!0}VZ.exports=pTe});var _Z=w((Xat,ZZ)=>{var dTe=ZC();function CTe(r){var e=this.__data__,t=dTe(e,r);return t<0?void 0:e[t][1]}ZZ.exports=CTe});var e_=w((Zat,$Z)=>{var mTe=ZC();function ETe(r){return mTe(this.__data__,r)>-1}$Z.exports=ETe});var r_=w((_at,t_)=>{var ITe=ZC();function yTe(r,e){var t=this.__data__,i=ITe(t,r);return i<0?(++this.size,t.push([r,e])):t[i][1]=e,this}t_.exports=yTe});var _C=w(($at,i_)=>{var wTe=JZ(),BTe=XZ(),QTe=_Z(),bTe=e_(),STe=r_();function mh(r){var e=-1,t=r==null?0:r.length;for(this.clear();++e<t;){var i=r[e];this.set(i[0],i[1])}}mh.prototype.clear=wTe;mh.prototype.delete=BTe;mh.prototype.get=QTe;mh.prototype.has=bTe;mh.prototype.set=STe;i_.exports=mh});var O0=w((eAt,n_)=>{var vTe=fl(),xTe=Es(),PTe=vTe(xTe,"Map");n_.exports=PTe});var a_=w((tAt,o_)=>{var s_=jZ(),DTe=_C(),kTe=O0();function RTe(){this.size=0,this.__data__={hash:new s_,map:new(kTe||DTe),string:new s_}}o_.exports=RTe});var l_=w((rAt,A_)=>{function FTe(r){var e=typeof r;return e=="string"||e=="number"||e=="symbol"||e=="boolean"?r!=="__proto__":r===null}A_.exports=FTe});var $C=w((iAt,c_)=>{var NTe=l_();function LTe(r,e){var t=r.__data__;return NTe(e)?t[typeof e=="string"?"string":"hash"]:t.map}c_.exports=LTe});var g_=w((nAt,u_)=>{var TTe=$C();function OTe(r){var e=TTe(this,r).delete(r);return this.size-=e?1:0,e}u_.exports=OTe});var h_=w((sAt,f_)=>{var MTe=$C();function KTe(r){return MTe(this,r).get(r)}f_.exports=KTe});var d_=w((oAt,p_)=>{var UTe=$C();function HTe(r){return UTe(this,r).has(r)}p_.exports=HTe});var m_=w((aAt,C_)=>{var GTe=$C();function YTe(r,e){var t=GTe(this,r),i=t.size;return t.set(r,e),this.size+=t.size==i?0:1,this}C_.exports=YTe});var M0=w((AAt,E_)=>{var jTe=a_(),qTe=g_(),JTe=h_(),WTe=d_(),zTe=m_();function Eh(r){var e=-1,t=r==null?0:r.length;for(this.clear();++e<t;){var i=r[e];this.set(i[0],i[1])}}Eh.prototype.clear=jTe;Eh.prototype.delete=qTe;Eh.prototype.get=JTe;Eh.prototype.has=WTe;Eh.prototype.set=zTe;E_.exports=Eh});var w_=w((lAt,y_)=>{var I_=M0(),VTe="Expected a function";function ON(r,e){if(typeof r!="function"||e!=null&&typeof e!="function")throw new TypeError(VTe);var t=function(){var i=arguments,n=e?e.apply(this,i):i[0],s=t.cache;if(s.has(n))return s.get(n);var o=r.apply(this,i);return t.cache=s.set(n,o)||s,o};return t.cache=new(ON.Cache||I_),t}ON.Cache=I_;y_.exports=ON});var Q_=w((cAt,B_)=>{var XTe=w_(),ZTe=500;function _Te(r){var e=XTe(r,function(i){return t.size===ZTe&&t.clear(),i}),t=e.cache;return e}B_.exports=_Te});var S_=w((uAt,b_)=>{var $Te=Q_(),eOe=/[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|$))/g,tOe=/\\(\\)?/g,rOe=$Te(function(r){var e=[];return r.charCodeAt(0)===46&&e.push(""),r.replace(eOe,function(t,i,n,s){e.push(n?s.replace(tOe,"$1"):i||t)}),e});b_.exports=rOe});var Ih=w((gAt,v_)=>{var iOe=bs(),nOe=L0(),sOe=S_(),oOe=Jf();function aOe(r,e){return iOe(r)?r:nOe(r,e)?[r]:sOe(oOe(r))}v_.exports=aOe});var Wc=w((fAt,x_)=>{var AOe=cC(),lOe=1/0;function cOe(r){if(typeof r=="string"||AOe(r))return r;var e=r+"";return e=="0"&&1/r==-lOe?"-0":e}x_.exports=cOe});var em=w((hAt,P_)=>{var uOe=Ih(),gOe=Wc();function fOe(r,e){e=uOe(e,r);for(var t=0,i=e.length;r!=null&&t<i;)r=r[gOe(e[t++])];return t&&t==i?r:void 0}P_.exports=fOe});var MN=w((pAt,D_)=>{var hOe=fl(),pOe=function(){try{var r=hOe(Object,"defineProperty");return r({},"",{}),r}catch{}}();D_.exports=pOe});var yh=w((dAt,R_)=>{var k_=MN();function dOe(r,e,t){e=="__proto__"&&k_?k_(r,e,{configurable:!0,enumerable:!0,value:t,writable:!0}):r[e]=t}R_.exports=dOe});var K0=w((CAt,F_)=>{var COe=yh(),mOe=Ch(),EOe=Object.prototype,IOe=EOe.hasOwnProperty;function yOe(r,e,t){var i=r[e];(!(IOe.call(r,e)&&mOe(i,t))||t===void 0&&!(e in r))&&COe(r,e,t)}F_.exports=yOe});var tm=w((mAt,N_)=>{var wOe=9007199254740991,BOe=/^(?:0|[1-9]\d*)$/;function QOe(r,e){var t=typeof r;return e=e==null?wOe:e,!!e&&(t=="number"||t!="symbol"&&BOe.test(r))&&r>-1&&r%1==0&&r<e}N_.exports=QOe});var KN=w((EAt,T_)=>{var bOe=K0(),SOe=Ih(),vOe=tm(),L_=bn(),xOe=Wc();function POe(r,e,t,i){if(!L_(r))return r;e=SOe(e,r);for(var n=-1,s=e.length,o=s-1,a=r;a!=null&&++n<s;){var l=xOe(e[n]),c=t;if(l==="__proto__"||l==="constructor"||l==="prototype")return r;if(n!=o){var u=a[l];c=i?i(u,l,a):void 0,c===void 0&&(c=L_(u)?u:vOe(e[n+1])?[]:{})}bOe(a,l,c),a=a[l]}return r}T_.exports=POe});var M_=w((IAt,O_)=>{var DOe=em(),kOe=KN(),ROe=Ih();function FOe(r,e,t){for(var i=-1,n=e.length,s={};++i<n;){var o=e[i],a=DOe(r,o);t(a,o)&&kOe(s,ROe(o,r),a)}return s}O_.exports=FOe});var U_=w((yAt,K_)=>{function NOe(r,e){return r!=null&&e in Object(r)}K_.exports=NOe});var G_=w((wAt,H_)=>{var LOe=Pc(),TOe=Jo(),OOe="[object Arguments]";function MOe(r){return TOe(r)&&LOe(r)==OOe}H_.exports=MOe});var rm=w((BAt,q_)=>{var Y_=G_(),KOe=Jo(),j_=Object.prototype,UOe=j_.hasOwnProperty,HOe=j_.propertyIsEnumerable,GOe=Y_(function(){return arguments}())?Y_:function(r){return KOe(r)&&UOe.call(r,"callee")&&!HOe.call(r,"callee")};q_.exports=GOe});var U0=w((QAt,J_)=>{var YOe=9007199254740991;function jOe(r){return typeof r=="number"&&r>-1&&r%1==0&&r<=YOe}J_.exports=jOe});var UN=w((bAt,W_)=>{var qOe=Ih(),JOe=rm(),WOe=bs(),zOe=tm(),VOe=U0(),XOe=Wc();function ZOe(r,e,t){e=qOe(e,r);for(var i=-1,n=e.length,s=!1;++i<n;){var o=XOe(e[i]);if(!(s=r!=null&&t(r,o)))break;r=r[o]}return s||++i!=n?s:(n=r==null?0:r.length,!!n&&VOe(n)&&zOe(o,n)&&(WOe(r)||JOe(r)))}W_.exports=ZOe});var HN=w((SAt,z_)=>{var _Oe=U_(),$Oe=UN();function eMe(r,e){return r!=null&&$Oe(r,e,_Oe)}z_.exports=eMe});var X_=w((vAt,V_)=>{var tMe=M_(),rMe=HN();function iMe(r,e){return tMe(r,e,function(t,i){return rMe(r,i)})}V_.exports=iMe});var H0=w((xAt,Z_)=>{function nMe(r,e){for(var t=-1,i=e.length,n=r.length;++t<i;)r[n+t]=e[t];return r}Z_.exports=nMe});var t$=w((PAt,e$)=>{var __=xc(),sMe=rm(),oMe=bs(),$_=__?__.isConcatSpreadable:void 0;function aMe(r){return oMe(r)||sMe(r)||!!($_&&r&&r[$_])}e$.exports=aMe});var n$=w((DAt,i$)=>{var AMe=H0(),lMe=t$();function r$(r,e,t,i,n){var s=-1,o=r.length;for(t||(t=lMe),n||(n=[]);++s<o;){var a=r[s];e>0&&t(a)?e>1?r$(a,e-1,t,i,n):AMe(n,a):i||(n[n.length]=a)}return n}i$.exports=r$});var o$=w((kAt,s$)=>{var cMe=n$();function uMe(r){var e=r==null?0:r.length;return e?cMe(r,1):[]}s$.exports=uMe});var A$=w((RAt,a$)=>{function gMe(r,e,t){switch(t.length){case 0:return r.call(e);case 1:return r.call(e,t[0]);case 2:return r.call(e,t[0],t[1]);case 3:return r.call(e,t[0],t[1],t[2])}return r.apply(e,t)}a$.exports=gMe});var GN=w((FAt,c$)=>{var fMe=A$(),l$=Math.max;function hMe(r,e,t){return e=l$(e===void 0?r.length-1:e,0),function(){for(var i=arguments,n=-1,s=l$(i.length-e,0),o=Array(s);++n<s;)o[n]=i[e+n];n=-1;for(var a=Array(e+1);++n<e;)a[n]=i[n];return a[e]=t(o),fMe(r,this,a)}}c$.exports=hMe});var g$=w((NAt,u$)=>{function pMe(r){return function(){return r}}u$.exports=pMe});var G0=w((LAt,f$)=>{function dMe(r){return r}f$.exports=dMe});var d$=w((TAt,p$)=>{var CMe=g$(),h$=MN(),mMe=G0(),EMe=h$?function(r,e){return h$(r,"toString",{configurable:!0,enumerable:!1,value:CMe(e),writable:!0})}:mMe;p$.exports=EMe});var m$=w((OAt,C$)=>{var IMe=800,yMe=16,wMe=Date.now;function BMe(r){var e=0,t=0;return function(){var i=wMe(),n=yMe-(i-t);if(t=i,n>0){if(++e>=IMe)return arguments[0]}else e=0;return r.apply(void 0,arguments)}}C$.exports=BMe});var YN=w((MAt,E$)=>{var QMe=d$(),bMe=m$(),SMe=bMe(QMe);E$.exports=SMe});var y$=w((KAt,I$)=>{var vMe=o$(),xMe=GN(),PMe=YN();function DMe(r){return PMe(xMe(r,void 0,vMe),r+"")}I$.exports=DMe});var B$=w((UAt,w$)=>{var kMe=X_(),RMe=y$(),FMe=RMe(function(r,e){return r==null?{}:kMe(r,e)});w$.exports=FMe});var L$=w((lct,N$)=>{"use strict";var XN;try{XN=Map}catch{}var ZN;try{ZN=Set}catch{}function R$(r,e,t){if(!r||typeof r!="object"||typeof r=="function")return r;if(r.nodeType&&"cloneNode"in r)return r.cloneNode(!0);if(r instanceof Date)return new Date(r.getTime());if(r instanceof RegExp)return new RegExp(r);if(Array.isArray(r))return r.map(F$);if(XN&&r instanceof XN)return new Map(Array.from(r.entries()));if(ZN&&r instanceof ZN)return new Set(Array.from(r.values()));if(r instanceof Object){e.push(r);var i=Object.create(r);t.push(i);for(var n in r){var s=e.findIndex(function(o){return o===r[n]});i[n]=s>-1?t[s]:R$(r[n],e,t)}return i}return r}function F$(r){return R$(r,[],[])}N$.exports=F$});var nm=w(_N=>{"use strict";Object.defineProperty(_N,"__esModule",{value:!0});_N.default=zMe;var GMe=Object.prototype.toString,YMe=Error.prototype.toString,jMe=RegExp.prototype.toString,qMe=typeof Symbol<"u"?Symbol.prototype.toString:()=>"",JMe=/^Symbol\((.*)\)(.*)$/;function WMe(r){return r!=+r?"NaN":r===0&&1/r<0?"-0":""+r}function T$(r,e=!1){if(r==null||r===!0||r===!1)return""+r;let t=typeof r;if(t==="number")return WMe(r);if(t==="string")return e?`"${r}"`:r;if(t==="function")return"[Function "+(r.name||"anonymous")+"]";if(t==="symbol")return qMe.call(r).replace(JMe,"Symbol($1)");let i=GMe.call(r).slice(8,-1);return i==="Date"?isNaN(r.getTime())?""+r:r.toISOString(r):i==="Error"||r instanceof Error?"["+YMe.call(r)+"]":i==="RegExp"?jMe.call(r):null}function zMe(r,e){let t=T$(r,e);return t!==null?t:JSON.stringify(r,function(i,n){let s=T$(this[i],e);return s!==null?s:n},2)}});var rA=w(Ei=>{"use strict";Object.defineProperty(Ei,"__esModule",{value:!0});Ei.default=Ei.array=Ei.object=Ei.boolean=Ei.date=Ei.number=Ei.string=Ei.mixed=void 0;var O$=VMe(nm());function VMe(r){return r&&r.__esModule?r:{default:r}}var M$={default:"${path} is invalid",required:"${path} is a required field",oneOf:"${path} must be one of the following values: ${values}",notOneOf:"${path} must not be one of the following values: ${values}",notType:({path:r,type:e,value:t,originalValue:i})=>{let n=i!=null&&i!==t,s=`${r} must be a \`${e}\` type, but the final value was: \`${(0,O$.default)(t,!0)}\``+(n?` (cast from the value \`${(0,O$.default)(i,!0)}\`).`:".");return t===null&&(s+='\n If "null" is intended as an empty value be sure to mark the schema as `.nullable()`'),s},defined:"${path} must be defined"};Ei.mixed=M$;var K$={length:"${path} must be exactly ${length} characters",min:"${path} must be at least ${min} characters",max:"${path} must be at most ${max} characters",matches:'${path} must match the following: "${regex}"',email:"${path} must be a valid email",url:"${path} must be a valid URL",uuid:"${path} must be a valid UUID",trim:"${path} must be a trimmed string",lowercase:"${path} must be a lowercase string",uppercase:"${path} must be a upper case string"};Ei.string=K$;var U$={min:"${path} must be greater than or equal to ${min}",max:"${path} must be less than or equal to ${max}",lessThan:"${path} must be less than ${less}",moreThan:"${path} must be greater than ${more}",positive:"${path} must be a positive number",negative:"${path} must be a negative number",integer:"${path} must be an integer"};Ei.number=U$;var H$={min:"${path} field must be later than ${min}",max:"${path} field must be at earlier than ${max}"};Ei.date=H$;var G$={isValue:"${path} field must be ${value}"};Ei.boolean=G$;var Y$={noUnknown:"${path} field has unspecified keys: ${unknown}"};Ei.object=Y$;var j$={min:"${path} field must have at least ${min} items",max:"${path} field must have less than or equal to ${max} items",length:"${path} must be have ${length} items"};Ei.array=j$;var XMe=Object.assign(Object.create(null),{mixed:M$,string:K$,number:U$,date:H$,object:Y$,array:j$,boolean:G$});Ei.default=XMe});var J$=w((gct,q$)=>{var ZMe=Object.prototype,_Me=ZMe.hasOwnProperty;function $Me(r,e){return r!=null&&_Me.call(r,e)}q$.exports=$Me});var sm=w((fct,W$)=>{var e1e=J$(),t1e=UN();function r1e(r,e){return r!=null&&t1e(r,e,e1e)}W$.exports=r1e});var bh=w(V0=>{"use strict";Object.defineProperty(V0,"__esModule",{value:!0});V0.default=void 0;var i1e=r=>r&&r.__isYupSchema__;V0.default=i1e});var V$=w(X0=>{"use strict";Object.defineProperty(X0,"__esModule",{value:!0});X0.default=void 0;var n1e=z$(sm()),s1e=z$(bh());function z$(r){return r&&r.__esModule?r:{default:r}}var $N=class{constructor(e,t){if(this.refs=e,this.refs=e,typeof t=="function"){this.fn=t;return}if(!(0,n1e.default)(t,"is"))throw new TypeError("`is:` is required for `when()` conditions");if(!t.then&&!t.otherwise)throw new TypeError("either `then:` or `otherwise:` is required for `when()` conditions");let{is:i,then:n,otherwise:s}=t,o=typeof i=="function"?i:(...a)=>a.every(l=>l===i);this.fn=function(...a){let l=a.pop(),c=a.pop(),u=o(...a)?n:s;if(!!u)return typeof u=="function"?u(c):c.concat(u.resolve(l))}}resolve(e,t){let i=this.refs.map(s=>s.getValue(t==null?void 0:t.value,t==null?void 0:t.parent,t==null?void 0:t.context)),n=this.fn.apply(e,i.concat(e,t));if(n===void 0||n===e)return e;if(!(0,s1e.default)(n))throw new TypeError("conditions must return a schema object");return n.resolve(t)}},o1e=$N;X0.default=o1e});var tL=w(eL=>{"use strict";Object.defineProperty(eL,"__esModule",{value:!0});eL.default=a1e;function a1e(r){return r==null?[]:[].concat(r)}});var zc=w(Z0=>{"use strict";Object.defineProperty(Z0,"__esModule",{value:!0});Z0.default=void 0;var A1e=X$(nm()),l1e=X$(tL());function X$(r){return r&&r.__esModule?r:{default:r}}function rL(){return rL=Object.assign||function(r){for(var e=1;e<arguments.length;e++){var t=arguments[e];for(var i in t)Object.prototype.hasOwnProperty.call(t,i)&&(r[i]=t[i])}return r},rL.apply(this,arguments)}var c1e=/\$\{\s*(\w+)\s*\}/g,Sh=class extends Error{static formatError(e,t){let i=t.label||t.path||"this";return i!==t.path&&(t=rL({},t,{path:i})),typeof e=="string"?e.replace(c1e,(n,s)=>(0,A1e.default)(t[s])):typeof e=="function"?e(t):e}static isError(e){return e&&e.name==="ValidationError"}constructor(e,t,i,n){super(),this.name="ValidationError",this.value=t,this.path=i,this.type=n,this.errors=[],this.inner=[],(0,l1e.default)(e).forEach(s=>{Sh.isError(s)?(this.errors.push(...s.errors),this.inner=this.inner.concat(s.inner.length?s.inner:s)):this.errors.push(s)}),this.message=this.errors.length>1?`${this.errors.length} errors occurred`:this.errors[0],Error.captureStackTrace&&Error.captureStackTrace(this,Sh)}};Z0.default=Sh});var _0=w(nL=>{"use strict";Object.defineProperty(nL,"__esModule",{value:!0});nL.default=f1e;var iL=u1e(zc());function u1e(r){return r&&r.__esModule?r:{default:r}}var g1e=r=>{let e=!1;return(...t)=>{e||(e=!0,r(...t))}};function f1e(r,e){let{endEarly:t,tests:i,args:n,value:s,errors:o,sort:a,path:l}=r,c=g1e(e),u=i.length,g=[];if(o=o||[],!u)return o.length?c(new iL.default(o,s,l)):c(null,s);for(let f=0;f<i.length;f++){let h=i[f];h(n,function(C){if(C){if(!iL.default.isError(C))return c(C,s);if(t)return C.value=s,c(C,s);g.push(C)}if(--u<=0){if(g.length&&(a&&g.sort(a),o.length&&g.push(...o),o=g),o.length){c(new iL.default(o,s,l),s);return}c(null,s)}})}}});var _$=w((Ect,Z$)=>{function h1e(r){return function(e,t,i){for(var n=-1,s=Object(e),o=i(e),a=o.length;a--;){var l=o[r?a:++n];if(t(s[l],l,s)===!1)break}return e}}Z$.exports=h1e});var sL=w((Ict,$$)=>{var p1e=_$(),d1e=p1e();$$.exports=d1e});var tee=w((yct,eee)=>{function C1e(r,e){for(var t=-1,i=Array(r);++t<r;)i[t]=e(t);return i}eee.exports=C1e});var iee=w((wct,ree)=>{function m1e(){return!1}ree.exports=m1e});var am=w((om,vh)=>{var E1e=Es(),I1e=iee(),oee=typeof om=="object"&&om&&!om.nodeType&&om,nee=oee&&typeof vh=="object"&&vh&&!vh.nodeType&&vh,y1e=nee&&nee.exports===oee,see=y1e?E1e.Buffer:void 0,w1e=see?see.isBuffer:void 0,B1e=w1e||I1e;vh.exports=B1e});var Aee=w((Bct,aee)=>{var Q1e=Pc(),b1e=U0(),S1e=Jo(),v1e="[object Arguments]",x1e="[object Array]",P1e="[object Boolean]",D1e="[object Date]",k1e="[object Error]",R1e="[object Function]",F1e="[object Map]",N1e="[object Number]",L1e="[object Object]",T1e="[object RegExp]",O1e="[object Set]",M1e="[object String]",K1e="[object WeakMap]",U1e="[object ArrayBuffer]",H1e="[object DataView]",G1e="[object Float32Array]",Y1e="[object Float64Array]",j1e="[object Int8Array]",q1e="[object Int16Array]",J1e="[object Int32Array]",W1e="[object Uint8Array]",z1e="[object Uint8ClampedArray]",V1e="[object Uint16Array]",X1e="[object Uint32Array]",Ir={};Ir[G1e]=Ir[Y1e]=Ir[j1e]=Ir[q1e]=Ir[J1e]=Ir[W1e]=Ir[z1e]=Ir[V1e]=Ir[X1e]=!0;Ir[v1e]=Ir[x1e]=Ir[U1e]=Ir[P1e]=Ir[H1e]=Ir[D1e]=Ir[k1e]=Ir[R1e]=Ir[F1e]=Ir[N1e]=Ir[L1e]=Ir[T1e]=Ir[O1e]=Ir[M1e]=Ir[K1e]=!1;function Z1e(r){return S1e(r)&&b1e(r.length)&&!!Ir[Q1e(r)]}aee.exports=Z1e});var $0=w((Qct,lee)=>{function _1e(r){return function(e){return r(e)}}lee.exports=_1e});var eQ=w((Am,xh)=>{var $1e=WD(),cee=typeof Am=="object"&&Am&&!Am.nodeType&&Am,lm=cee&&typeof xh=="object"&&xh&&!xh.nodeType&&xh,eKe=lm&&lm.exports===cee,oL=eKe&&$1e.process,tKe=function(){try{var r=lm&&lm.require&&lm.require("util").types;return r||oL&&oL.binding&&oL.binding("util")}catch{}}();xh.exports=tKe});var tQ=w((bct,fee)=>{var rKe=Aee(),iKe=$0(),uee=eQ(),gee=uee&&uee.isTypedArray,nKe=gee?iKe(gee):rKe;fee.exports=nKe});var aL=w((Sct,hee)=>{var sKe=tee(),oKe=rm(),aKe=bs(),AKe=am(),lKe=tm(),cKe=tQ(),uKe=Object.prototype,gKe=uKe.hasOwnProperty;function fKe(r,e){var t=aKe(r),i=!t&&oKe(r),n=!t&&!i&&AKe(r),s=!t&&!i&&!n&&cKe(r),o=t||i||n||s,a=o?sKe(r.length,String):[],l=a.length;for(var c in r)(e||gKe.call(r,c))&&!(o&&(c=="length"||n&&(c=="offset"||c=="parent")||s&&(c=="buffer"||c=="byteLength"||c=="byteOffset")||lKe(c,l)))&&a.push(c);return a}hee.exports=fKe});var rQ=w((vct,pee)=>{var hKe=Object.prototype;function pKe(r){var e=r&&r.constructor,t=typeof e=="function"&&e.prototype||hKe;return r===t}pee.exports=pKe});var AL=w((xct,dee)=>{function dKe(r,e){return function(t){return r(e(t))}}dee.exports=dKe});var mee=w((Pct,Cee)=>{var CKe=AL(),mKe=CKe(Object.keys,Object);Cee.exports=mKe});var Iee=w((Dct,Eee)=>{var EKe=rQ(),IKe=mee(),yKe=Object.prototype,wKe=yKe.hasOwnProperty;function BKe(r){if(!EKe(r))return IKe(r);var e=[];for(var t in Object(r))wKe.call(r,t)&&t!="constructor"&&e.push(t);return e}Eee.exports=BKe});var cm=w((kct,yee)=>{var QKe=T0(),bKe=U0();function SKe(r){return r!=null&&bKe(r.length)&&!QKe(r)}yee.exports=SKe});var Ph=w((Rct,wee)=>{var vKe=aL(),xKe=Iee(),PKe=cm();function DKe(r){return PKe(r)?vKe(r):xKe(r)}wee.exports=DKe});var lL=w((Fct,Bee)=>{var kKe=sL(),RKe=Ph();function FKe(r,e){return r&&kKe(r,e,RKe)}Bee.exports=FKe});var bee=w((Nct,Qee)=>{var NKe=_C();function LKe(){this.__data__=new NKe,this.size=0}Qee.exports=LKe});var vee=w((Lct,See)=>{function TKe(r){var e=this.__data__,t=e.delete(r);return this.size=e.size,t}See.exports=TKe});var Pee=w((Tct,xee)=>{function OKe(r){return this.__data__.get(r)}xee.exports=OKe});var kee=w((Oct,Dee)=>{function MKe(r){return this.__data__.has(r)}Dee.exports=MKe});var Fee=w((Mct,Ree)=>{var KKe=_C(),UKe=O0(),HKe=M0(),GKe=200;function YKe(r,e){var t=this.__data__;if(t instanceof KKe){var i=t.__data__;if(!UKe||i.length<GKe-1)return i.push([r,e]),this.size=++t.size,this;t=this.__data__=new HKe(i)}return t.set(r,e),this.size=t.size,this}Ree.exports=YKe});var um=w((Kct,Nee)=>{var jKe=_C(),qKe=bee(),JKe=vee(),WKe=Pee(),zKe=kee(),VKe=Fee();function Dh(r){var e=this.__data__=new jKe(r);this.size=e.size}Dh.prototype.clear=qKe;Dh.prototype.delete=JKe;Dh.prototype.get=WKe;Dh.prototype.has=zKe;Dh.prototype.set=VKe;Nee.exports=Dh});var Tee=w((Uct,Lee)=>{var XKe="__lodash_hash_undefined__";function ZKe(r){return this.__data__.set(r,XKe),this}Lee.exports=ZKe});var Mee=w((Hct,Oee)=>{function _Ke(r){return this.__data__.has(r)}Oee.exports=_Ke});var Uee=w((Gct,Kee)=>{var $Ke=M0(),eUe=Tee(),tUe=Mee();function iQ(r){var e=-1,t=r==null?0:r.length;for(this.__data__=new $Ke;++e<t;)this.add(r[e])}iQ.prototype.add=iQ.prototype.push=eUe;iQ.prototype.has=tUe;Kee.exports=iQ});var Gee=w((Yct,Hee)=>{function rUe(r,e){for(var t=-1,i=r==null?0:r.length;++t<i;)if(e(r[t],t,r))return!0;return!1}Hee.exports=rUe});var jee=w((jct,Yee)=>{function iUe(r,e){return r.has(e)}Yee.exports=iUe});var cL=w((qct,qee)=>{var nUe=Uee(),sUe=Gee(),oUe=jee(),aUe=1,AUe=2;function lUe(r,e,t,i,n,s){var o=t&aUe,a=r.length,l=e.length;if(a!=l&&!(o&&l>a))return!1;var c=s.get(r),u=s.get(e);if(c&&u)return c==e&&u==r;var g=-1,f=!0,h=t&AUe?new nUe:void 0;for(s.set(r,e),s.set(e,r);++g<a;){var p=r[g],C=e[g];if(i)var y=o?i(C,p,g,e,r,s):i(p,C,g,r,e,s);if(y!==void 0){if(y)continue;f=!1;break}if(h){if(!sUe(e,function(B,v){if(!oUe(h,v)&&(p===B||n(p,B,t,i,s)))return h.push(v)})){f=!1;break}}else if(!(p===C||n(p,C,t,i,s))){f=!1;break}}return s.delete(r),s.delete(e),f}qee.exports=lUe});var uL=w((Jct,Jee)=>{var cUe=Es(),uUe=cUe.Uint8Array;Jee.exports=uUe});var zee=w((Wct,Wee)=>{function gUe(r){var e=-1,t=Array(r.size);return r.forEach(function(i,n){t[++e]=[n,i]}),t}Wee.exports=gUe});var Xee=w((zct,Vee)=>{function fUe(r){var e=-1,t=Array(r.size);return r.forEach(function(i){t[++e]=i}),t}Vee.exports=fUe});var tte=w((Vct,ete)=>{var Zee=xc(),_ee=uL(),hUe=Ch(),pUe=cL(),dUe=zee(),CUe=Xee(),mUe=1,EUe=2,IUe="[object Boolean]",yUe="[object Date]",wUe="[object Error]",BUe="[object Map]",QUe="[object Number]",bUe="[object RegExp]",SUe="[object Set]",vUe="[object String]",xUe="[object Symbol]",PUe="[object ArrayBuffer]",DUe="[object DataView]",$ee=Zee?Zee.prototype:void 0,gL=$ee?$ee.valueOf:void 0;function kUe(r,e,t,i,n,s,o){switch(t){case DUe:if(r.byteLength!=e.byteLength||r.byteOffset!=e.byteOffset)return!1;r=r.buffer,e=e.buffer;case PUe:return!(r.byteLength!=e.byteLength||!s(new _ee(r),new _ee(e)));case IUe:case yUe:case QUe:return hUe(+r,+e);case wUe:return r.name==e.name&&r.message==e.message;case bUe:case vUe:return r==e+"";case BUe:var a=dUe;case SUe:var l=i&mUe;if(a||(a=CUe),r.size!=e.size&&!l)return!1;var c=o.get(r);if(c)return c==e;i|=EUe,o.set(r,e);var u=pUe(a(r),a(e),i,n,s,o);return o.delete(r),u;case xUe:if(gL)return gL.call(r)==gL.call(e)}return!1}ete.exports=kUe});var fL=w((Xct,rte)=>{var RUe=H0(),FUe=bs();function NUe(r,e,t){var i=e(r);return FUe(r)?i:RUe(i,t(r))}rte.exports=NUe});var nte=w((Zct,ite)=>{function LUe(r,e){for(var t=-1,i=r==null?0:r.length,n=0,s=[];++t<i;){var o=r[t];e(o,t,r)&&(s[n++]=o)}return s}ite.exports=LUe});var hL=w((_ct,ste)=>{function TUe(){return[]}ste.exports=TUe});var nQ=w(($ct,ate)=>{var OUe=nte(),MUe=hL(),KUe=Object.prototype,UUe=KUe.propertyIsEnumerable,ote=Object.getOwnPropertySymbols,HUe=ote?function(r){return r==null?[]:(r=Object(r),OUe(ote(r),function(e){return UUe.call(r,e)}))}:MUe;ate.exports=HUe});var pL=w((eut,Ate)=>{var GUe=fL(),YUe=nQ(),jUe=Ph();function qUe(r){return GUe(r,jUe,YUe)}Ate.exports=qUe});var ute=w((tut,cte)=>{var lte=pL(),JUe=1,WUe=Object.prototype,zUe=WUe.hasOwnProperty;function VUe(r,e,t,i,n,s){var o=t&JUe,a=lte(r),l=a.length,c=lte(e),u=c.length;if(l!=u&&!o)return!1;for(var g=l;g--;){var f=a[g];if(!(o?f in e:zUe.call(e,f)))return!1}var h=s.get(r),p=s.get(e);if(h&&p)return h==e&&p==r;var C=!0;s.set(r,e),s.set(e,r);for(var y=o;++g<l;){f=a[g];var B=r[f],v=e[f];if(i)var D=o?i(v,B,f,e,r,s):i(B,v,f,r,e,s);if(!(D===void 0?B===v||n(B,v,t,i,s):D)){C=!1;break}y||(y=f=="constructor")}if(C&&!y){var L=r.constructor,H=e.constructor;L!=H&&"constructor"in r&&"constructor"in e&&!(typeof L=="function"&&L instanceof L&&typeof H=="function"&&H instanceof H)&&(C=!1)}return s.delete(r),s.delete(e),C}cte.exports=VUe});var fte=w((rut,gte)=>{var XUe=fl(),ZUe=Es(),_Ue=XUe(ZUe,"DataView");gte.exports=_Ue});var pte=w((iut,hte)=>{var $Ue=fl(),e2e=Es(),t2e=$Ue(e2e,"Promise");hte.exports=t2e});var Cte=w((nut,dte)=>{var r2e=fl(),i2e=Es(),n2e=r2e(i2e,"Set");dte.exports=n2e});var Ete=w((sut,mte)=>{var s2e=fl(),o2e=Es(),a2e=s2e(o2e,"WeakMap");mte.exports=a2e});var gm=w((out,Ste)=>{var dL=fte(),CL=O0(),mL=pte(),EL=Cte(),IL=Ete(),bte=Pc(),kh=TN(),Ite="[object Map]",A2e="[object Object]",yte="[object Promise]",wte="[object Set]",Bte="[object WeakMap]",Qte="[object DataView]",l2e=kh(dL),c2e=kh(CL),u2e=kh(mL),g2e=kh(EL),f2e=kh(IL),Vc=bte;(dL&&Vc(new dL(new ArrayBuffer(1)))!=Qte||CL&&Vc(new CL)!=Ite||mL&&Vc(mL.resolve())!=yte||EL&&Vc(new EL)!=wte||IL&&Vc(new IL)!=Bte)&&(Vc=function(r){var e=bte(r),t=e==A2e?r.constructor:void 0,i=t?kh(t):"";if(i)switch(i){case l2e:return Qte;case c2e:return Ite;case u2e:return yte;case g2e:return wte;case f2e:return Bte}return e});Ste.exports=Vc});var Nte=w((aut,Fte)=>{var yL=um(),h2e=cL(),p2e=tte(),d2e=ute(),vte=gm(),xte=bs(),Pte=am(),C2e=tQ(),m2e=1,Dte="[object Arguments]",kte="[object Array]",sQ="[object Object]",E2e=Object.prototype,Rte=E2e.hasOwnProperty;function I2e(r,e,t,i,n,s){var o=xte(r),a=xte(e),l=o?kte:vte(r),c=a?kte:vte(e);l=l==Dte?sQ:l,c=c==Dte?sQ:c;var u=l==sQ,g=c==sQ,f=l==c;if(f&&Pte(r)){if(!Pte(e))return!1;o=!0,u=!1}if(f&&!u)return s||(s=new yL),o||C2e(r)?h2e(r,e,t,i,n,s):p2e(r,e,l,t,i,n,s);if(!(t&m2e)){var h=u&&Rte.call(r,"__wrapped__"),p=g&&Rte.call(e,"__wrapped__");if(h||p){var C=h?r.value():r,y=p?e.value():e;return s||(s=new yL),n(C,y,t,i,s)}}return f?(s||(s=new yL),d2e(r,e,t,i,n,s)):!1}Fte.exports=I2e});var wL=w((Aut,Ote)=>{var y2e=Nte(),Lte=Jo();function Tte(r,e,t,i,n){return r===e?!0:r==null||e==null||!Lte(r)&&!Lte(e)?r!==r&&e!==e:y2e(r,e,t,i,Tte,n)}Ote.exports=Tte});var Kte=w((lut,Mte)=>{var w2e=um(),B2e=wL(),Q2e=1,b2e=2;function S2e(r,e,t,i){var n=t.length,s=n,o=!i;if(r==null)return!s;for(r=Object(r);n--;){var a=t[n];if(o&&a[2]?a[1]!==r[a[0]]:!(a[0]in r))return!1}for(;++n<s;){a=t[n];var l=a[0],c=r[l],u=a[1];if(o&&a[2]){if(c===void 0&&!(l in r))return!1}else{var g=new w2e;if(i)var f=i(c,u,l,r,e,g);if(!(f===void 0?B2e(u,c,Q2e|b2e,i,g):f))return!1}}return!0}Mte.exports=S2e});var BL=w((cut,Ute)=>{var v2e=bn();function x2e(r){return r===r&&!v2e(r)}Ute.exports=x2e});var Gte=w((uut,Hte)=>{var P2e=BL(),D2e=Ph();function k2e(r){for(var e=D2e(r),t=e.length;t--;){var i=e[t],n=r[i];e[t]=[i,n,P2e(n)]}return e}Hte.exports=k2e});var QL=w((gut,Yte)=>{function R2e(r,e){return function(t){return t==null?!1:t[r]===e&&(e!==void 0||r in Object(t))}}Yte.exports=R2e});var qte=w((fut,jte)=>{var F2e=Kte(),N2e=Gte(),L2e=QL();function T2e(r){var e=N2e(r);return e.length==1&&e[0][2]?L2e(e[0][0],e[0][1]):function(t){return t===r||F2e(t,r,e)}}jte.exports=T2e});var oQ=w((hut,Jte)=>{var O2e=em();function M2e(r,e,t){var i=r==null?void 0:O2e(r,e);return i===void 0?t:i}Jte.exports=M2e});var zte=w((put,Wte)=>{var K2e=wL(),U2e=oQ(),H2e=HN(),G2e=L0(),Y2e=BL(),j2e=QL(),q2e=Wc(),J2e=1,W2e=2;function z2e(r,e){return G2e(r)&&Y2e(e)?j2e(q2e(r),e):function(t){var i=U2e(t,r);return i===void 0&&i===e?H2e(t,r):K2e(e,i,J2e|W2e)}}Wte.exports=z2e});var Xte=w((dut,Vte)=>{function V2e(r){return function(e){return e==null?void 0:e[r]}}Vte.exports=V2e});var _te=w((Cut,Zte)=>{var X2e=em();function Z2e(r){return function(e){return X2e(e,r)}}Zte.exports=Z2e});var ere=w((mut,$te)=>{var _2e=Xte(),$2e=_te(),eHe=L0(),tHe=Wc();function rHe(r){return eHe(r)?_2e(tHe(r)):$2e(r)}$te.exports=rHe});var bL=w((Eut,tre)=>{var iHe=qte(),nHe=zte(),sHe=G0(),oHe=bs(),aHe=ere();function AHe(r){return typeof r=="function"?r:r==null?sHe:typeof r=="object"?oHe(r)?nHe(r[0],r[1]):iHe(r):aHe(r)}tre.exports=AHe});var SL=w((Iut,rre)=>{var lHe=yh(),cHe=lL(),uHe=bL();function gHe(r,e){var t={};return e=uHe(e,3),cHe(r,function(i,n,s){lHe(t,n,e(i,n,s))}),t}rre.exports=gHe});var fm=w((yut,are)=>{"use strict";function Xc(r){this._maxSize=r,this.clear()}Xc.prototype.clear=function(){this._size=0,this._values=Object.create(null)};Xc.prototype.get=function(r){return this._values[r]};Xc.prototype.set=function(r,e){return this._size>=this._maxSize&&this.clear(),r in this._values||this._size++,this._values[r]=e};var fHe=/[^.^\]^[]+|(?=\[\]|\.\.)/g,ore=/^\d+$/,hHe=/^\d/,pHe=/[~`!#$%\^&*+=\-\[\]\\';,/{}|\\":<>\?]/g,dHe=/^\s*(['"]?)(.*?)(\1)\s*$/,PL=512,ire=new Xc(PL),nre=new Xc(PL),sre=new Xc(PL);are.exports={Cache:Xc,split:xL,normalizePath:vL,setter:function(r){var e=vL(r);return nre.get(r)||nre.set(r,function(i,n){for(var s=0,o=e.length,a=i;s<o-1;){var l=e[s];if(l==="__proto__"||l==="constructor"||l==="prototype")return i;a=a[e[s++]]}a[e[s]]=n})},getter:function(r,e){var t=vL(r);return sre.get(r)||sre.set(r,function(n){for(var s=0,o=t.length;s<o;)if(n!=null||!e)n=n[t[s++]];else return;return n})},join:function(r){return r.reduce(function(e,t){return e+(DL(t)||ore.test(t)?"["+t+"]":(e?".":"")+t)},"")},forEach:function(r,e,t){CHe(Array.isArray(r)?r:xL(r),e,t)}};function vL(r){return ire.get(r)||ire.set(r,xL(r).map(function(e){return e.replace(dHe,"$2")}))}function xL(r){return r.match(fHe)}function CHe(r,e,t){var i=r.length,n,s,o,a;for(s=0;s<i;s++)n=r[s],n&&(IHe(n)&&(n='"'+n+'"'),a=DL(n),o=!a&&/^\d+$/.test(n),e.call(t,n,a,o,s,r))}function DL(r){return typeof r=="string"&&r&&["'",'"'].indexOf(r.charAt(0))!==-1}function mHe(r){return r.match(hHe)&&!r.match(ore)}function EHe(r){return pHe.test(r)}function IHe(r){return!DL(r)&&(mHe(r)||EHe(r))}});var Zc=w(pm=>{"use strict";Object.defineProperty(pm,"__esModule",{value:!0});pm.create=wHe;pm.default=void 0;var yHe=fm(),aQ={context:"$",value:"."};function wHe(r,e){return new hm(r,e)}var hm=class{constructor(e,t={}){if(typeof e!="string")throw new TypeError("ref must be a string, got: "+e);if(this.key=e.trim(),e==="")throw new TypeError("ref must be a non-empty string");this.isContext=this.key[0]===aQ.context,this.isValue=this.key[0]===aQ.value,this.isSibling=!this.isContext&&!this.isValue;let i=this.isContext?aQ.context:this.isValue?aQ.value:"";this.path=this.key.slice(i.length),this.getter=this.path&&(0,yHe.getter)(this.path,!0),this.map=t.map}getValue(e,t,i){let n=this.isContext?i:this.isValue?e:t;return this.getter&&(n=this.getter(n||{})),this.map&&(n=this.map(n)),n}cast(e,t){return this.getValue(e,t==null?void 0:t.parent,t==null?void 0:t.context)}resolve(){return this}describe(){return{type:"ref",key:this.key}}toString(){return`Ref(${this.key})`}static isRef(e){return e&&e.__isYupRef}};pm.default=hm;hm.prototype.__isYupRef=!0});var Are=w(RL=>{"use strict";Object.defineProperty(RL,"__esModule",{value:!0});RL.default=SHe;var BHe=kL(SL()),AQ=kL(zc()),QHe=kL(Zc());function kL(r){return r&&r.__esModule?r:{default:r}}function lQ(){return lQ=Object.assign||function(r){for(var e=1;e<arguments.length;e++){var t=arguments[e];for(var i in t)Object.prototype.hasOwnProperty.call(t,i)&&(r[i]=t[i])}return r},lQ.apply(this,arguments)}function bHe(r,e){if(r==null)return{};var t={},i=Object.keys(r),n,s;for(s=0;s<i.length;s++)n=i[s],!(e.indexOf(n)>=0)&&(t[n]=r[n]);return t}function SHe(r){function e(t,i){let{value:n,path:s="",label:o,options:a,originalValue:l,sync:c}=t,u=bHe(t,["value","path","label","options","originalValue","sync"]),{name:g,test:f,params:h,message:p}=r,{parent:C,context:y}=a;function B(j){return QHe.default.isRef(j)?j.getValue(n,C,y):j}function v(j={}){let $=(0,BHe.default)(lQ({value:n,originalValue:l,label:o,path:j.path||s},h,j.params),B),V=new AQ.default(AQ.default.formatError(j.message||p,$),n,$.path,j.type||g);return V.params=$,V}let D=lQ({path:s,parent:C,type:g,createError:v,resolve:B,options:a,originalValue:l},u);if(!c){try{Promise.resolve(f.call(D,n,D)).then(j=>{AQ.default.isError(j)?i(j):j?i(null,j):i(v())})}catch(j){i(j)}return}let L;try{var H;if(L=f.call(D,n,D),typeof((H=L)==null?void 0:H.then)=="function")throw new Error(`Validation test of type: "${D.type}" returned a Promise during a synchronous validate. This test will finish after the validate call has returned`)}catch(j){i(j);return}AQ.default.isError(L)?i(L):L?i(null,L):i(v())}return e.OPTIONS=r,e}});var FL=w(dm=>{"use strict";Object.defineProperty(dm,"__esModule",{value:!0});dm.getIn=lre;dm.default=void 0;var vHe=fm(),xHe=r=>r.substr(0,r.length-1).substr(1);function lre(r,e,t,i=t){let n,s,o;return e?((0,vHe.forEach)(e,(a,l,c)=>{let u=l?xHe(a):a;if(r=r.resolve({context:i,parent:n,value:t}),r.innerType){let g=c?parseInt(u,10):0;if(t&&g>=t.length)throw new Error(`Yup.reach cannot resolve an array item at index: ${a}, in the path: ${e}. because there is no value at that index. `);n=t,t=t&&t[g],r=r.innerType}if(!c){if(!r.fields||!r.fields[u])throw new Error(`The schema does not contain the path: ${e}. (failed at: ${o} which is a type: "${r._type}")`);n=t,t=t&&t[u],r=r.fields[u]}s=u,o=l?"["+a+"]":"."+a}),{schema:r,parent:n,parentPath:s}):{parent:n,parentPath:e,schema:r}}var PHe=(r,e,t,i)=>lre(r,e,t,i).schema,DHe=PHe;dm.default=DHe});var ure=w(cQ=>{"use strict";Object.defineProperty(cQ,"__esModule",{value:!0});cQ.default=void 0;var cre=kHe(Zc());function kHe(r){return r&&r.__esModule?r:{default:r}}var Cm=class{constructor(){this.list=new Set,this.refs=new Map}get size(){return this.list.size+this.refs.size}describe(){let e=[];for(let t of this.list)e.push(t);for(let[,t]of this.refs)e.push(t.describe());return e}toArray(){return Array.from(this.list).concat(Array.from(this.refs.values()))}add(e){cre.default.isRef(e)?this.refs.set(e.key,e):this.list.add(e)}delete(e){cre.default.isRef(e)?this.refs.delete(e.key):this.list.delete(e)}has(e,t){if(this.list.has(e))return!0;let i,n=this.refs.values();for(;i=n.next(),!i.done;)if(t(i.value)===e)return!0;return!1}clone(){let e=new Cm;return e.list=new Set(this.list),e.refs=new Map(this.refs),e}merge(e,t){let i=this.clone();return e.list.forEach(n=>i.add(n)),e.refs.forEach(n=>i.add(n)),t.list.forEach(n=>i.delete(n)),t.refs.forEach(n=>i.delete(n)),i}};cQ.default=Cm});var nA=w(gQ=>{"use strict";Object.defineProperty(gQ,"__esModule",{value:!0});gQ.default=void 0;var gre=iA(L$()),Rh=rA(),RHe=iA(V$()),fre=iA(_0()),uQ=iA(Are()),hre=iA(nm()),FHe=iA(Zc()),NHe=FL(),LHe=iA(tL()),pre=iA(zc()),dre=iA(ure());function iA(r){return r&&r.__esModule?r:{default:r}}function ks(){return ks=Object.assign||function(r){for(var e=1;e<arguments.length;e++){var t=arguments[e];for(var i in t)Object.prototype.hasOwnProperty.call(t,i)&&(r[i]=t[i])}return r},ks.apply(this,arguments)}var Ao=class{constructor(e){this.deps=[],this.conditions=[],this._whitelist=new dre.default,this._blacklist=new dre.default,this.exclusiveTests=Object.create(null),this.tests=[],this.transforms=[],this.withMutation(()=>{this.typeError(Rh.mixed.notType)}),this.type=(e==null?void 0:e.type)||"mixed",this.spec=ks({strip:!1,strict:!1,abortEarly:!0,recursive:!0,nullable:!1,presence:"optional"},e==null?void 0:e.spec)}get _type(){return this.type}_typeCheck(e){return!0}clone(e){if(this._mutate)return e&&Object.assign(this.spec,e),this;let t=Object.create(Object.getPrototypeOf(this));return t.type=this.type,t._typeError=this._typeError,t._whitelistError=this._whitelistError,t._blacklistError=this._blacklistError,t._whitelist=this._whitelist.clone(),t._blacklist=this._blacklist.clone(),t.exclusiveTests=ks({},this.exclusiveTests),t.deps=[...this.deps],t.conditions=[...this.conditions],t.tests=[...this.tests],t.transforms=[...this.transforms],t.spec=(0,gre.default)(ks({},this.spec,e)),t}label(e){var t=this.clone();return t.spec.label=e,t}meta(...e){if(e.length===0)return this.spec.meta;let t=this.clone();return t.spec.meta=Object.assign(t.spec.meta||{},e[0]),t}withMutation(e){let t=this._mutate;this._mutate=!0;let i=e(this);return this._mutate=t,i}concat(e){if(!e||e===this)return this;if(e.type!==this.type&&this.type!=="mixed")throw new TypeError(`You cannot \`concat()\` schema's of different types: ${this.type} and ${e.type}`);let t=this,i=e.clone(),n=ks({},t.spec,i.spec);return i.spec=n,i._typeError||(i._typeError=t._typeError),i._whitelistError||(i._whitelistError=t._whitelistError),i._blacklistError||(i._blacklistError=t._blacklistError),i._whitelist=t._whitelist.merge(e._whitelist,e._blacklist),i._blacklist=t._blacklist.merge(e._blacklist,e._whitelist),i.tests=t.tests,i.exclusiveTests=t.exclusiveTests,i.withMutation(s=>{e.tests.forEach(o=>{s.test(o.OPTIONS)})}),i}isType(e){return this.spec.nullable&&e===null?!0:this._typeCheck(e)}resolve(e){let t=this;if(t.conditions.length){let i=t.conditions;t=t.clone(),t.conditions=[],t=i.reduce((n,s)=>s.resolve(n,e),t),t=t.resolve(e)}return t}cast(e,t={}){let i=this.resolve(ks({value:e},t)),n=i._cast(e,t);if(e!==void 0&&t.assert!==!1&&i.isType(n)!==!0){let s=(0,hre.default)(e),o=(0,hre.default)(n);throw new TypeError(`The value of ${t.path||"field"} could not be cast to a value that satisfies the schema type: "${i._type}". 
-
-attempted value: ${s} 
-`+(o!==s?`result of cast: ${o}`:""))}return n}_cast(e,t){let i=e===void 0?e:this.transforms.reduce((n,s)=>s.call(this,n,e,this),e);return i===void 0&&(i=this.getDefault()),i}_validate(e,t={},i){let{sync:n,path:s,from:o=[],originalValue:a=e,strict:l=this.spec.strict,abortEarly:c=this.spec.abortEarly}=t,u=e;l||(u=this._cast(u,ks({assert:!1},t)));let g={value:u,path:s,options:t,originalValue:a,schema:this,label:this.spec.label,sync:n,from:o},f=[];this._typeError&&f.push(this._typeError),this._whitelistError&&f.push(this._whitelistError),this._blacklistError&&f.push(this._blacklistError),(0,fre.default)({args:g,value:u,path:s,sync:n,tests:f,endEarly:c},h=>{if(h)return void i(h,u);(0,fre.default)({tests:this.tests,args:g,path:s,sync:n,value:u,endEarly:c},i)})}validate(e,t,i){let n=this.resolve(ks({},t,{value:e}));return typeof i=="function"?n._validate(e,t,i):new Promise((s,o)=>n._validate(e,t,(a,l)=>{a?o(a):s(l)}))}validateSync(e,t){let i=this.resolve(ks({},t,{value:e})),n;return i._validate(e,ks({},t,{sync:!0}),(s,o)=>{if(s)throw s;n=o}),n}isValid(e,t){return this.validate(e,t).then(()=>!0,i=>{if(pre.default.isError(i))return!1;throw i})}isValidSync(e,t){try{return this.validateSync(e,t),!0}catch(i){if(pre.default.isError(i))return!1;throw i}}_getDefault(){let e=this.spec.default;return e==null?e:typeof e=="function"?e.call(this):(0,gre.default)(e)}getDefault(e){return this.resolve(e||{})._getDefault()}default(e){return arguments.length===0?this._getDefault():this.clone({default:e})}strict(e=!0){var t=this.clone();return t.spec.strict=e,t}_isPresent(e){return e!=null}defined(e=Rh.mixed.defined){return this.test({message:e,name:"defined",exclusive:!0,test(t){return t!==void 0}})}required(e=Rh.mixed.required){return this.clone({presence:"required"}).withMutation(t=>t.test({message:e,name:"required",exclusive:!0,test(i){return this.schema._isPresent(i)}}))}notRequired(){var e=this.clone({presence:"optional"});return e.tests=e.tests.filter(t=>t.OPTIONS.name!=="required"),e}nullable(e=!0){var t=this.clone({nullable:e!==!1});return t}transform(e){var t=this.clone();return t.transforms.push(e),t}test(...e){let t;if(e.length===1?typeof e[0]=="function"?t={test:e[0]}:t=e[0]:e.length===2?t={name:e[0],test:e[1]}:t={name:e[0],message:e[1],test:e[2]},t.message===void 0&&(t.message=Rh.mixed.default),typeof t.test!="function")throw new TypeError("`test` is a required parameters");let i=this.clone(),n=(0,uQ.default)(t),s=t.exclusive||t.name&&i.exclusiveTests[t.name]===!0;if(t.exclusive&&!t.name)throw new TypeError("Exclusive tests must provide a unique `name` identifying the test");return t.name&&(i.exclusiveTests[t.name]=!!t.exclusive),i.tests=i.tests.filter(o=>!(o.OPTIONS.name===t.name&&(s||o.OPTIONS.test===n.OPTIONS.test))),i.tests.push(n),i}when(e,t){!Array.isArray(e)&&typeof e!="string"&&(t=e,e=".");let i=this.clone(),n=(0,LHe.default)(e).map(s=>new FHe.default(s));return n.forEach(s=>{s.isSibling&&i.deps.push(s.key)}),i.conditions.push(new RHe.default(n,t)),i}typeError(e){var t=this.clone();return t._typeError=(0,uQ.default)({message:e,name:"typeError",test(i){return i!==void 0&&!this.schema.isType(i)?this.createError({params:{type:this.schema._type}}):!0}}),t}oneOf(e,t=Rh.mixed.oneOf){var i=this.clone();return e.forEach(n=>{i._whitelist.add(n),i._blacklist.delete(n)}),i._whitelistError=(0,uQ.default)({message:t,name:"oneOf",test(n){if(n===void 0)return!0;let s=this.schema._whitelist;return s.has(n,this.resolve)?!0:this.createError({params:{values:s.toArray().join(", ")}})}}),i}notOneOf(e,t=Rh.mixed.notOneOf){var i=this.clone();return e.forEach(n=>{i._blacklist.add(n),i._whitelist.delete(n)}),i._blacklistError=(0,uQ.default)({message:t,name:"notOneOf",test(n){let s=this.schema._blacklist;return s.has(n,this.resolve)?this.createError({params:{values:s.toArray().join(", ")}}):!0}}),i}strip(e=!0){let t=this.clone();return t.spec.strip=e,t}describe(){let e=this.clone(),{label:t,meta:i}=e.spec;return{meta:i,label:t,type:e.type,oneOf:e._whitelist.describe(),notOneOf:e._blacklist.describe(),tests:e.tests.map(s=>({name:s.OPTIONS.name,params:s.OPTIONS.params})).filter((s,o,a)=>a.findIndex(l=>l.name===s.name)===o)}}};gQ.default=Ao;Ao.prototype.__isYupSchema__=!0;for(let r of["validate","validateSync"])Ao.prototype[`${r}At`]=function(e,t,i={}){let{parent:n,parentPath:s,schema:o}=(0,NHe.getIn)(this,e,t,i.context);return o[r](n&&n[s],ks({},i,{parent:n,path:e}))};for(let r of["equals","is"])Ao.prototype[r]=Ao.prototype.oneOf;for(let r of["not","nope"])Ao.prototype[r]=Ao.prototype.notOneOf;Ao.prototype.optional=Ao.prototype.notRequired});var mre=w(mm=>{"use strict";Object.defineProperty(mm,"__esModule",{value:!0});mm.create=Cre;mm.default=void 0;var THe=OHe(nA());function OHe(r){return r&&r.__esModule?r:{default:r}}var NL=THe.default,MHe=NL;mm.default=MHe;function Cre(){return new NL}Cre.prototype=NL.prototype});var Fh=w(fQ=>{"use strict";Object.defineProperty(fQ,"__esModule",{value:!0});fQ.default=void 0;var KHe=r=>r==null;fQ.default=KHe});var Bre=w(Im=>{"use strict";Object.defineProperty(Im,"__esModule",{value:!0});Im.create=wre;Im.default=void 0;var UHe=yre(nA()),Ere=rA(),Ire=yre(Fh());function yre(r){return r&&r.__esModule?r:{default:r}}function wre(){return new Em}var Em=class extends UHe.default{constructor(){super({type:"boolean"}),this.withMutation(()=>{this.transform(function(e){if(!this.isType(e)){if(/^(true|1)$/i.test(String(e)))return!0;if(/^(false|0)$/i.test(String(e)))return!1}return e})})}_typeCheck(e){return e instanceof Boolean&&(e=e.valueOf()),typeof e=="boolean"}isTrue(e=Ere.boolean.isValue){return this.test({message:e,name:"is-value",exclusive:!0,params:{value:"true"},test(t){return(0,Ire.default)(t)||t===!0}})}isFalse(e=Ere.boolean.isValue){return this.test({message:e,name:"is-value",exclusive:!0,params:{value:"false"},test(t){return(0,Ire.default)(t)||t===!1}})}};Im.default=Em;wre.prototype=Em.prototype});var Sre=w(wm=>{"use strict";Object.defineProperty(wm,"__esModule",{value:!0});wm.create=bre;wm.default=void 0;var ia=rA(),sA=Qre(Fh()),HHe=Qre(nA());function Qre(r){return r&&r.__esModule?r:{default:r}}var GHe=/^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))$/i,YHe=/^((https?|ftp):)?\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i,jHe=/^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$/i,qHe=r=>(0,sA.default)(r)||r===r.trim(),JHe={}.toString();function bre(){return new ym}var ym=class extends HHe.default{constructor(){super({type:"string"}),this.withMutation(()=>{this.transform(function(e){if(this.isType(e)||Array.isArray(e))return e;let t=e!=null&&e.toString?e.toString():e;return t===JHe?e:t})})}_typeCheck(e){return e instanceof String&&(e=e.valueOf()),typeof e=="string"}_isPresent(e){return super._isPresent(e)&&!!e.length}length(e,t=ia.string.length){return this.test({message:t,name:"length",exclusive:!0,params:{length:e},test(i){return(0,sA.default)(i)||i.length===this.resolve(e)}})}min(e,t=ia.string.min){return this.test({message:t,name:"min",exclusive:!0,params:{min:e},test(i){return(0,sA.default)(i)||i.length>=this.resolve(e)}})}max(e,t=ia.string.max){return this.test({name:"max",exclusive:!0,message:t,params:{max:e},test(i){return(0,sA.default)(i)||i.length<=this.resolve(e)}})}matches(e,t){let i=!1,n,s;return t&&(typeof t=="object"?{excludeEmptyString:i=!1,message:n,name:s}=t:n=t),this.test({name:s||"matches",message:n||ia.string.matches,params:{regex:e},test:o=>(0,sA.default)(o)||o===""&&i||o.search(e)!==-1})}email(e=ia.string.email){return this.matches(GHe,{name:"email",message:e,excludeEmptyString:!0})}url(e=ia.string.url){return this.matches(YHe,{name:"url",message:e,excludeEmptyString:!0})}uuid(e=ia.string.uuid){return this.matches(jHe,{name:"uuid",message:e,excludeEmptyString:!1})}ensure(){return this.default("").transform(e=>e===null?"":e)}trim(e=ia.string.trim){return this.transform(t=>t!=null?t.trim():t).test({message:e,name:"trim",test:qHe})}lowercase(e=ia.string.lowercase){return this.transform(t=>(0,sA.default)(t)?t:t.toLowerCase()).test({message:e,name:"string_case",exclusive:!0,test:t=>(0,sA.default)(t)||t===t.toLowerCase()})}uppercase(e=ia.string.uppercase){return this.transform(t=>(0,sA.default)(t)?t:t.toUpperCase()).test({message:e,name:"string_case",exclusive:!0,test:t=>(0,sA.default)(t)||t===t.toUpperCase()})}};wm.default=ym;bre.prototype=ym.prototype});var Pre=w(Qm=>{"use strict";Object.defineProperty(Qm,"__esModule",{value:!0});Qm.create=xre;Qm.default=void 0;var _c=rA(),$c=vre(Fh()),WHe=vre(nA());function vre(r){return r&&r.__esModule?r:{default:r}}var zHe=r=>r!=+r;function xre(){return new Bm}var Bm=class extends WHe.default{constructor(){super({type:"number"}),this.withMutation(()=>{this.transform(function(e){let t=e;if(typeof t=="string"){if(t=t.replace(/\s/g,""),t==="")return NaN;t=+t}return this.isType(t)?t:parseFloat(t)})})}_typeCheck(e){return e instanceof Number&&(e=e.valueOf()),typeof e=="number"&&!zHe(e)}min(e,t=_c.number.min){return this.test({message:t,name:"min",exclusive:!0,params:{min:e},test(i){return(0,$c.default)(i)||i>=this.resolve(e)}})}max(e,t=_c.number.max){return this.test({message:t,name:"max",exclusive:!0,params:{max:e},test(i){return(0,$c.default)(i)||i<=this.resolve(e)}})}lessThan(e,t=_c.number.lessThan){return this.test({message:t,name:"max",exclusive:!0,params:{less:e},test(i){return(0,$c.default)(i)||i<this.resolve(e)}})}moreThan(e,t=_c.number.moreThan){return this.test({message:t,name:"min",exclusive:!0,params:{more:e},test(i){return(0,$c.default)(i)||i>this.resolve(e)}})}positive(e=_c.number.positive){return this.moreThan(0,e)}negative(e=_c.number.negative){return this.lessThan(0,e)}integer(e=_c.number.integer){return this.test({name:"integer",message:e,test:t=>(0,$c.default)(t)||Number.isInteger(t)})}truncate(){return this.transform(e=>(0,$c.default)(e)?e:e|0)}round(e){var t,i=["ceil","floor","round","trunc"];if(e=((t=e)==null?void 0:t.toLowerCase())||"round",e==="trunc")return this.truncate();if(i.indexOf(e.toLowerCase())===-1)throw new TypeError("Only valid options for round() are: "+i.join(", "));return this.transform(n=>(0,$c.default)(n)?n:Math[e](n))}};Qm.default=Bm;xre.prototype=Bm.prototype});var Dre=w(LL=>{"use strict";Object.defineProperty(LL,"__esModule",{value:!0});LL.default=XHe;var VHe=/^(\d{4}|[+\-]\d{6})(?:-?(\d{2})(?:-?(\d{2}))?)?(?:[ T]?(\d{2}):?(\d{2})(?::?(\d{2})(?:[,\.](\d{1,}))?)?(?:(Z)|([+\-])(\d{2})(?::?(\d{2}))?)?)?$/;function XHe(r){var e=[1,4,5,6,7,10,11],t=0,i,n;if(n=VHe.exec(r)){for(var s=0,o;o=e[s];++s)n[o]=+n[o]||0;n[2]=(+n[2]||1)-1,n[3]=+n[3]||1,n[7]=n[7]?String(n[7]).substr(0,3):0,(n[8]===void 0||n[8]==="")&&(n[9]===void 0||n[9]==="")?i=+new Date(n[1],n[2],n[3],n[4],n[5],n[6],n[7]):(n[8]!=="Z"&&n[9]!==void 0&&(t=n[10]*60+n[11],n[9]==="+"&&(t=0-t)),i=Date.UTC(n[1],n[2],n[3],n[4],n[5]+t,n[6],n[7]))}else i=Date.parse?Date.parse(r):NaN;return i}});var Fre=w(bm=>{"use strict";Object.defineProperty(bm,"__esModule",{value:!0});bm.create=OL;bm.default=void 0;var ZHe=hQ(Dre()),kre=rA(),Rre=hQ(Fh()),_He=hQ(Zc()),$He=hQ(nA());function hQ(r){return r&&r.__esModule?r:{default:r}}var TL=new Date(""),eGe=r=>Object.prototype.toString.call(r)==="[object Date]";function OL(){return new Nh}var Nh=class extends $He.default{constructor(){super({type:"date"}),this.withMutation(()=>{this.transform(function(e){return this.isType(e)?e:(e=(0,ZHe.default)(e),isNaN(e)?TL:new Date(e))})})}_typeCheck(e){return eGe(e)&&!isNaN(e.getTime())}prepareParam(e,t){let i;if(_He.default.isRef(e))i=e;else{let n=this.cast(e);if(!this._typeCheck(n))throw new TypeError(`\`${t}\` must be a Date or a value that can be \`cast()\` to a Date`);i=n}return i}min(e,t=kre.date.min){let i=this.prepareParam(e,"min");return this.test({message:t,name:"min",exclusive:!0,params:{min:e},test(n){return(0,Rre.default)(n)||n>=this.resolve(i)}})}max(e,t=kre.date.max){var i=this.prepareParam(e,"max");return this.test({message:t,name:"max",exclusive:!0,params:{max:e},test(n){return(0,Rre.default)(n)||n<=this.resolve(i)}})}};bm.default=Nh;Nh.INVALID_DATE=TL;OL.prototype=Nh.prototype;OL.INVALID_DATE=TL});var Lre=w((Nut,Nre)=>{function tGe(r,e,t,i){var n=-1,s=r==null?0:r.length;for(i&&s&&(t=r[++n]);++n<s;)t=e(t,r[n],n,r);return t}Nre.exports=tGe});var Ore=w((Lut,Tre)=>{function rGe(r){return function(e){return r==null?void 0:r[e]}}Tre.exports=rGe});var Kre=w((Tut,Mre)=>{var iGe=Ore(),nGe={\u00C0:"A",\u00C1:"A",\u00C2:"A",\u00C3:"A",\u00C4:"A",\u00C5:"A",\u00E0:"a",\u00E1:"a",\u00E2:"a",\u00E3:"a",\u00E4:"a",\u00E5:"a",\u00C7:"C",\u00E7:"c",\u00D0:"D",\u00F0:"d",\u00C8:"E",\u00C9:"E",\u00CA:"E",\u00CB:"E",\u00E8:"e",\u00E9:"e",\u00EA:"e",\u00EB:"e",\u00CC:"I",\u00CD:"I",\u00CE:"I",\u00CF:"I",\u00EC:"i",\u00ED:"i",\u00EE:"i",\u00EF:"i",\u00D1:"N",\u00F1:"n",\u00D2:"O",\u00D3:"O",\u00D4:"O",\u00D5:"O",\u00D6:"O",\u00D8:"O",\u00F2:"o",\u00F3:"o",\u00F4:"o",\u00F5:"o",\u00F6:"o",\u00F8:"o",\u00D9:"U",\u00DA:"U",\u00DB:"U",\u00DC:"U",\u00F9:"u",\u00FA:"u",\u00FB:"u",\u00FC:"u",\u00DD:"Y",\u00FD:"y",\u00FF:"y",\u00C6:"Ae",\u00E6:"ae",\u00DE:"Th",\u00FE:"th",\u00DF:"ss",\u0100:"A",\u0102:"A",\u0104:"A",\u0101:"a",\u0103:"a",\u0105:"a",\u0106:"C",\u0108:"C",\u010A:"C",\u010C:"C",\u0107:"c",\u0109:"c",\u010B:"c",\u010D:"c",\u010E:"D",\u0110:"D",\u010F:"d",\u0111:"d",\u0112:"E",\u0114:"E",\u0116:"E",\u0118:"E",\u011A:"E",\u0113:"e",\u0115:"e",\u0117:"e",\u0119:"e",\u011B:"e",\u011C:"G",\u011E:"G",\u0120:"G",\u0122:"G",\u011D:"g",\u011F:"g",\u0121:"g",\u0123:"g",\u0124:"H",\u0126:"H",\u0125:"h",\u0127:"h",\u0128:"I",\u012A:"I",\u012C:"I",\u012E:"I",\u0130:"I",\u0129:"i",\u012B:"i",\u012D:"i",\u012F:"i",\u0131:"i",\u0134:"J",\u0135:"j",\u0136:"K",\u0137:"k",\u0138:"k",\u0139:"L",\u013B:"L",\u013D:"L",\u013F:"L",\u0141:"L",\u013A:"l",\u013C:"l",\u013E:"l",\u0140:"l",\u0142:"l",\u0143:"N",\u0145:"N",\u0147:"N",\u014A:"N",\u0144:"n",\u0146:"n",\u0148:"n",\u014B:"n",\u014C:"O",\u014E:"O",\u0150:"O",\u014D:"o",\u014F:"o",\u0151:"o",\u0154:"R",\u0156:"R",\u0158:"R",\u0155:"r",\u0157:"r",\u0159:"r",\u015A:"S",\u015C:"S",\u015E:"S",\u0160:"S",\u015B:"s",\u015D:"s",\u015F:"s",\u0161:"s",\u0162:"T",\u0164:"T",\u0166:"T",\u0163:"t",\u0165:"t",\u0167:"t",\u0168:"U",\u016A:"U",\u016C:"U",\u016E:"U",\u0170:"U",\u0172:"U",\u0169:"u",\u016B:"u",\u016D:"u",\u016F:"u",\u0171:"u",\u0173:"u",\u0174:"W",\u0175:"w",\u0176:"Y",\u0177:"y",\u0178:"Y",\u0179:"Z",\u017B:"Z",\u017D:"Z",\u017A:"z",\u017C:"z",\u017E:"z",\u0132:"IJ",\u0133:"ij",\u0152:"Oe",\u0153:"oe",\u0149:"'n",\u017F:"s"},sGe=iGe(nGe);Mre.exports=sGe});var Hre=w((Out,Ure)=>{var oGe=Kre(),aGe=Jf(),AGe=/[\xc0-\xd6\xd8-\xf6\xf8-\xff\u0100-\u017f]/g,lGe="\\u0300-\\u036f",cGe="\\ufe20-\\ufe2f",uGe="\\u20d0-\\u20ff",gGe=lGe+cGe+uGe,fGe="["+gGe+"]",hGe=RegExp(fGe,"g");function pGe(r){return r=aGe(r),r&&r.replace(AGe,oGe).replace(hGe,"")}Ure.exports=pGe});var Yre=w((Mut,Gre)=>{var dGe=/[^\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f]+/g;function CGe(r){return r.match(dGe)||[]}Gre.exports=CGe});var qre=w((Kut,jre)=>{var mGe=/[a-z][A-Z]|[A-Z]{2}[a-z]|[0-9][a-zA-Z]|[a-zA-Z][0-9]|[^a-zA-Z0-9 ]/;function EGe(r){return mGe.test(r)}jre.exports=EGe});var cie=w((Uut,lie)=>{var Xre="\\ud800-\\udfff",IGe="\\u0300-\\u036f",yGe="\\ufe20-\\ufe2f",wGe="\\u20d0-\\u20ff",BGe=IGe+yGe+wGe,Zre="\\u2700-\\u27bf",_re="a-z\\xdf-\\xf6\\xf8-\\xff",QGe="\\xac\\xb1\\xd7\\xf7",bGe="\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf",SGe="\\u2000-\\u206f",vGe=" \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000",$re="A-Z\\xc0-\\xd6\\xd8-\\xde",xGe="\\ufe0e\\ufe0f",eie=QGe+bGe+SGe+vGe,tie="['\u2019]",Jre="["+eie+"]",PGe="["+BGe+"]",rie="\\d+",DGe="["+Zre+"]",iie="["+_re+"]",nie="[^"+Xre+eie+rie+Zre+_re+$re+"]",kGe="\\ud83c[\\udffb-\\udfff]",RGe="(?:"+PGe+"|"+kGe+")",FGe="[^"+Xre+"]",sie="(?:\\ud83c[\\udde6-\\uddff]){2}",oie="[\\ud800-\\udbff][\\udc00-\\udfff]",Lh="["+$re+"]",NGe="\\u200d",Wre="(?:"+iie+"|"+nie+")",LGe="(?:"+Lh+"|"+nie+")",zre="(?:"+tie+"(?:d|ll|m|re|s|t|ve))?",Vre="(?:"+tie+"(?:D|LL|M|RE|S|T|VE))?",aie=RGe+"?",Aie="["+xGe+"]?",TGe="(?:"+NGe+"(?:"+[FGe,sie,oie].join("|")+")"+Aie+aie+")*",OGe="\\d*(?:1st|2nd|3rd|(?![123])\\dth)(?=\\b|[A-Z_])",MGe="\\d*(?:1ST|2ND|3RD|(?![123])\\dTH)(?=\\b|[a-z_])",KGe=Aie+aie+TGe,UGe="(?:"+[DGe,sie,oie].join("|")+")"+KGe,HGe=RegExp([Lh+"?"+iie+"+"+zre+"(?="+[Jre,Lh,"$"].join("|")+")",LGe+"+"+Vre+"(?="+[Jre,Lh+Wre,"$"].join("|")+")",Lh+"?"+Wre+"+"+zre,Lh+"+"+Vre,MGe,OGe,rie,UGe].join("|"),"g");function GGe(r){return r.match(HGe)||[]}lie.exports=GGe});var gie=w((Hut,uie)=>{var YGe=Yre(),jGe=qre(),qGe=Jf(),JGe=cie();function WGe(r,e,t){return r=qGe(r),e=t?void 0:e,e===void 0?jGe(r)?JGe(r):YGe(r):r.match(e)||[]}uie.exports=WGe});var ML=w((Gut,fie)=>{var zGe=Lre(),VGe=Hre(),XGe=gie(),ZGe="['\u2019]",_Ge=RegExp(ZGe,"g");function $Ge(r){return function(e){return zGe(XGe(VGe(e).replace(_Ge,"")),r,"")}}fie.exports=$Ge});var pie=w((Yut,hie)=>{var eYe=ML(),tYe=eYe(function(r,e,t){return r+(t?"_":"")+e.toLowerCase()});hie.exports=tYe});var Cie=w((jut,die)=>{var rYe=bB(),iYe=ML(),nYe=iYe(function(r,e,t){return e=e.toLowerCase(),r+(t?rYe(e):e)});die.exports=nYe});var Eie=w((qut,mie)=>{var sYe=yh(),oYe=lL(),aYe=bL();function AYe(r,e){var t={};return e=aYe(e,3),oYe(r,function(i,n,s){sYe(t,e(i,n,s),i)}),t}mie.exports=AYe});var yie=w((Jut,KL)=>{KL.exports=function(r){return Iie(lYe(r),r)};KL.exports.array=Iie;function Iie(r,e){var t=r.length,i=new Array(t),n={},s=t,o=cYe(e),a=uYe(r);for(e.forEach(function(c){if(!a.has(c[0])||!a.has(c[1]))throw new Error("Unknown node. There is an unknown node in the supplied edges.")});s--;)n[s]||l(r[s],s,new Set);return i;function l(c,u,g){if(g.has(c)){var f;try{f=", node was:"+JSON.stringify(c)}catch{f=""}throw new Error("Cyclic dependency"+f)}if(!a.has(c))throw new Error("Found unknown node. Make sure to provided all involved nodes. Unknown node: "+JSON.stringify(c));if(!n[u]){n[u]=!0;var h=o.get(c)||new Set;if(h=Array.from(h),u=h.length){g.add(c);do{var p=h[--u];l(p,a.get(p),g)}while(u);g.delete(c)}i[--t]=c}}}function lYe(r){for(var e=new Set,t=0,i=r.length;t<i;t++){var n=r[t];e.add(n[0]),e.add(n[1])}return Array.from(e)}function cYe(r){for(var e=new Map,t=0,i=r.length;t<i;t++){var n=r[t];e.has(n[0])||e.set(n[0],new Set),e.has(n[1])||e.set(n[1],new Set),e.get(n[0]).add(n[1])}return e}function uYe(r){for(var e=new Map,t=0,i=r.length;t<i;t++)e.set(r[t],t);return e}});var wie=w(UL=>{"use strict";Object.defineProperty(UL,"__esModule",{value:!0});UL.default=CYe;var gYe=pQ(sm()),fYe=pQ(yie()),hYe=fm(),pYe=pQ(Zc()),dYe=pQ(bh());function pQ(r){return r&&r.__esModule?r:{default:r}}function CYe(r,e=[]){let t=[],i=[];function n(s,o){var a=(0,hYe.split)(s)[0];~i.indexOf(a)||i.push(a),~e.indexOf(`${o}-${a}`)||t.push([o,a])}for(let s in r)if((0,gYe.default)(r,s)){let o=r[s];~i.indexOf(s)||i.push(s),pYe.default.isRef(o)&&o.isSibling?n(o.path,s):(0,dYe.default)(o)&&"deps"in o&&o.deps.forEach(a=>n(a,s))}return fYe.default.array(i,t).reverse()}});var Qie=w(HL=>{"use strict";Object.defineProperty(HL,"__esModule",{value:!0});HL.default=mYe;function Bie(r,e){let t=1/0;return r.some((i,n)=>{var s;if(((s=e.path)==null?void 0:s.indexOf(i))!==-1)return t=n,!0}),t}function mYe(r){return(e,t)=>Bie(r,e)-Bie(r,t)}});var kie=w(vm=>{"use strict";Object.defineProperty(vm,"__esModule",{value:!0});vm.create=Die;vm.default=void 0;var bie=na(sm()),Sie=na(pie()),EYe=na(Cie()),IYe=na(Eie()),yYe=na(SL()),wYe=fm(),vie=rA(),BYe=na(wie()),Pie=na(Qie()),QYe=na(_0()),bYe=na(zc()),GL=na(nA());function na(r){return r&&r.__esModule?r:{default:r}}function Th(){return Th=Object.assign||function(r){for(var e=1;e<arguments.length;e++){var t=arguments[e];for(var i in t)Object.prototype.hasOwnProperty.call(t,i)&&(r[i]=t[i])}return r},Th.apply(this,arguments)}var xie=r=>Object.prototype.toString.call(r)==="[object Object]";function SYe(r,e){let t=Object.keys(r.fields);return Object.keys(e).filter(i=>t.indexOf(i)===-1)}var vYe=(0,Pie.default)([]),Sm=class extends GL.default{constructor(e){super({type:"object"}),this.fields=Object.create(null),this._sortErrors=vYe,this._nodes=[],this._excludedEdges=[],this.withMutation(()=>{this.transform(function(i){if(typeof i=="string")try{i=JSON.parse(i)}catch{i=null}return this.isType(i)?i:null}),e&&this.shape(e)})}_typeCheck(e){return xie(e)||typeof e=="function"}_cast(e,t={}){var i;let n=super._cast(e,t);if(n===void 0)return this.getDefault();if(!this._typeCheck(n))return n;let s=this.fields,o=(i=t.stripUnknown)!=null?i:this.spec.noUnknown,a=this._nodes.concat(Object.keys(n).filter(g=>this._nodes.indexOf(g)===-1)),l={},c=Th({},t,{parent:l,__validating:t.__validating||!1}),u=!1;for(let g of a){let f=s[g],h=(0,bie.default)(n,g);if(f){let p,C=n[g];c.path=(t.path?`${t.path}.`:"")+g,f=f.resolve({value:C,context:t.context,parent:l});let y="spec"in f?f.spec:void 0,B=y==null?void 0:y.strict;if(y!=null&&y.strip){u=u||g in n;continue}p=!t.__validating||!B?f.cast(n[g],c):n[g],p!==void 0&&(l[g]=p)}else h&&!o&&(l[g]=n[g]);l[g]!==n[g]&&(u=!0)}return u?l:n}_validate(e,t={},i){let n=[],{sync:s,from:o=[],originalValue:a=e,abortEarly:l=this.spec.abortEarly,recursive:c=this.spec.recursive}=t;o=[{schema:this,value:a},...o],t.__validating=!0,t.originalValue=a,t.from=o,super._validate(e,t,(u,g)=>{if(u){if(!bYe.default.isError(u)||l)return void i(u,g);n.push(u)}if(!c||!xie(g)){i(n[0]||null,g);return}a=a||g;let f=this._nodes.map(h=>(p,C)=>{let y=h.indexOf(".")===-1?(t.path?`${t.path}.`:"")+h:`${t.path||""}["${h}"]`,B=this.fields[h];if(B&&"validate"in B){B.validate(g[h],Th({},t,{path:y,from:o,strict:!0,parent:g,originalValue:a[h]}),C);return}C(null)});(0,QYe.default)({sync:s,tests:f,value:g,errors:n,endEarly:l,sort:this._sortErrors,path:t.path},i)})}clone(e){let t=super.clone(e);return t.fields=Th({},this.fields),t._nodes=this._nodes,t._excludedEdges=this._excludedEdges,t._sortErrors=this._sortErrors,t}concat(e){let t=super.concat(e),i=t.fields;for(let[n,s]of Object.entries(this.fields)){let o=i[n];o===void 0?i[n]=s:o instanceof GL.default&&s instanceof GL.default&&(i[n]=s.concat(o))}return t.withMutation(()=>t.shape(i))}getDefaultFromShape(){let e={};return this._nodes.forEach(t=>{let i=this.fields[t];e[t]="default"in i?i.getDefault():void 0}),e}_getDefault(){if("default"in this.spec)return super._getDefault();if(!!this._nodes.length)return this.getDefaultFromShape()}shape(e,t=[]){let i=this.clone(),n=Object.assign(i.fields,e);if(i.fields=n,i._sortErrors=(0,Pie.default)(Object.keys(n)),t.length){Array.isArray(t[0])||(t=[t]);let s=t.map(([o,a])=>`${o}-${a}`);i._excludedEdges=i._excludedEdges.concat(s)}return i._nodes=(0,BYe.default)(n,i._excludedEdges),i}pick(e){let t={};for(let i of e)this.fields[i]&&(t[i]=this.fields[i]);return this.clone().withMutation(i=>(i.fields={},i.shape(t)))}omit(e){let t=this.clone(),i=t.fields;t.fields={};for(let n of e)delete i[n];return t.withMutation(()=>t.shape(i))}from(e,t,i){let n=(0,wYe.getter)(e,!0);return this.transform(s=>{if(s==null)return s;let o=s;return(0,bie.default)(s,e)&&(o=Th({},s),i||delete o[e],o[t]=n(s)),o})}noUnknown(e=!0,t=vie.object.noUnknown){typeof e=="string"&&(t=e,e=!0);let i=this.test({name:"noUnknown",exclusive:!0,message:t,test(n){if(n==null)return!0;let s=SYe(this.schema,n);return!e||s.length===0||this.createError({params:{unknown:s.join(", ")}})}});return i.spec.noUnknown=e,i}unknown(e=!0,t=vie.object.noUnknown){return this.noUnknown(!e,t)}transformKeys(e){return this.transform(t=>t&&(0,IYe.default)(t,(i,n)=>e(n)))}camelCase(){return this.transformKeys(EYe.default)}snakeCase(){return this.transformKeys(Sie.default)}constantCase(){return this.transformKeys(e=>(0,Sie.default)(e).toUpperCase())}describe(){let e=super.describe();return e.fields=(0,yYe.default)(this.fields,t=>t.describe()),e}};vm.default=Sm;function Die(r){return new Sm(r)}Die.prototype=Sm.prototype});var Fie=w(Pm=>{"use strict";Object.defineProperty(Pm,"__esModule",{value:!0});Pm.create=Rie;Pm.default=void 0;var YL=Oh(Fh()),xYe=Oh(bh()),PYe=Oh(nm()),jL=rA(),DYe=Oh(_0()),kYe=Oh(zc()),RYe=Oh(nA());function Oh(r){return r&&r.__esModule?r:{default:r}}function dQ(){return dQ=Object.assign||function(r){for(var e=1;e<arguments.length;e++){var t=arguments[e];for(var i in t)Object.prototype.hasOwnProperty.call(t,i)&&(r[i]=t[i])}return r},dQ.apply(this,arguments)}function Rie(r){return new xm(r)}var xm=class extends RYe.default{constructor(e){super({type:"array"}),this.innerType=e,this.withMutation(()=>{this.transform(function(t){if(typeof t=="string")try{t=JSON.parse(t)}catch{t=null}return this.isType(t)?t:null})})}_typeCheck(e){return Array.isArray(e)}get _subType(){return this.innerType}_cast(e,t){let i=super._cast(e,t);if(!this._typeCheck(i)||!this.innerType)return i;let n=!1,s=i.map((o,a)=>{let l=this.innerType.cast(o,dQ({},t,{path:`${t.path||""}[${a}]`}));return l!==o&&(n=!0),l});return n?s:i}_validate(e,t={},i){var n,s;let o=[],a=t.sync,l=t.path,c=this.innerType,u=(n=t.abortEarly)!=null?n:this.spec.abortEarly,g=(s=t.recursive)!=null?s:this.spec.recursive,f=t.originalValue!=null?t.originalValue:e;super._validate(e,t,(h,p)=>{if(h){if(!kYe.default.isError(h)||u)return void i(h,p);o.push(h)}if(!g||!c||!this._typeCheck(p)){i(o[0]||null,p);return}f=f||p;let C=new Array(p.length);for(let y=0;y<p.length;y++){let B=p[y],v=`${t.path||""}[${y}]`,D=dQ({},t,{path:v,strict:!0,parent:p,index:y,originalValue:f[y]});C[y]=(L,H)=>c.validate(B,D,H)}(0,DYe.default)({sync:a,path:l,value:p,errors:o,endEarly:u,tests:C},i)})}clone(e){let t=super.clone(e);return t.innerType=this.innerType,t}concat(e){let t=super.concat(e);return t.innerType=this.innerType,e.innerType&&(t.innerType=t.innerType?t.innerType.concat(e.innerType):e.innerType),t}of(e){let t=this.clone();if(!(0,xYe.default)(e))throw new TypeError("`array.of()` sub-schema must be a valid yup schema not: "+(0,PYe.default)(e));return t.innerType=e,t}length(e,t=jL.array.length){return this.test({message:t,name:"length",exclusive:!0,params:{length:e},test(i){return(0,YL.default)(i)||i.length===this.resolve(e)}})}min(e,t){return t=t||jL.array.min,this.test({message:t,name:"min",exclusive:!0,params:{min:e},test(i){return(0,YL.default)(i)||i.length>=this.resolve(e)}})}max(e,t){return t=t||jL.array.max,this.test({message:t,name:"max",exclusive:!0,params:{max:e},test(i){return(0,YL.default)(i)||i.length<=this.resolve(e)}})}ensure(){return this.default(()=>[]).transform((e,t)=>this._typeCheck(e)?e:t==null?[]:[].concat(t))}compact(e){let t=e?(i,n,s)=>!e(i,n,s):i=>!!i;return this.transform(i=>i!=null?i.filter(t):i)}describe(){let e=super.describe();return this.innerType&&(e.innerType=this.innerType.describe()),e}nullable(e=!0){return super.nullable(e)}defined(){return super.defined()}required(e){return super.required(e)}};Pm.default=xm;Rie.prototype=xm.prototype});var Nie=w(Dm=>{"use strict";Object.defineProperty(Dm,"__esModule",{value:!0});Dm.create=LYe;Dm.default=void 0;var FYe=NYe(bh());function NYe(r){return r&&r.__esModule?r:{default:r}}function LYe(r){return new CQ(r)}var CQ=class{constructor(e){this.type="lazy",this.__isYupSchema__=!0,this._resolve=(t,i={})=>{let n=this.builder(t,i);if(!(0,FYe.default)(n))throw new TypeError("lazy() functions must return a valid schema");return n.resolve(i)},this.builder=e}resolve(e){return this._resolve(e.value,e)}cast(e,t){return this._resolve(e,t).cast(e,t)}validate(e,t,i){return this._resolve(e,t).validate(e,t,i)}validateSync(e,t){return this._resolve(e,t).validateSync(e,t)}validateAt(e,t,i){return this._resolve(t,i).validateAt(e,t,i)}validateSyncAt(e,t,i){return this._resolve(t,i).validateSyncAt(e,t,i)}describe(){return null}isValid(e,t){return this._resolve(e,t).isValid(e,t)}isValidSync(e,t){return this._resolve(e,t).isValidSync(e,t)}},TYe=CQ;Dm.default=TYe});var Lie=w(qL=>{"use strict";Object.defineProperty(qL,"__esModule",{value:!0});qL.default=KYe;var OYe=MYe(rA());function MYe(r){return r&&r.__esModule?r:{default:r}}function KYe(r){Object.keys(r).forEach(e=>{Object.keys(r[e]).forEach(t=>{OYe.default[e][t]=r[e][t]})})}});var WL=w(yr=>{"use strict";Object.defineProperty(yr,"__esModule",{value:!0});yr.addMethod=JYe;Object.defineProperty(yr,"MixedSchema",{enumerable:!0,get:function(){return Tie.default}});Object.defineProperty(yr,"mixed",{enumerable:!0,get:function(){return Tie.create}});Object.defineProperty(yr,"BooleanSchema",{enumerable:!0,get:function(){return JL.default}});Object.defineProperty(yr,"bool",{enumerable:!0,get:function(){return JL.create}});Object.defineProperty(yr,"boolean",{enumerable:!0,get:function(){return JL.create}});Object.defineProperty(yr,"StringSchema",{enumerable:!0,get:function(){return Oie.default}});Object.defineProperty(yr,"string",{enumerable:!0,get:function(){return Oie.create}});Object.defineProperty(yr,"NumberSchema",{enumerable:!0,get:function(){return Mie.default}});Object.defineProperty(yr,"number",{enumerable:!0,get:function(){return Mie.create}});Object.defineProperty(yr,"DateSchema",{enumerable:!0,get:function(){return Kie.default}});Object.defineProperty(yr,"date",{enumerable:!0,get:function(){return Kie.create}});Object.defineProperty(yr,"ObjectSchema",{enumerable:!0,get:function(){return Uie.default}});Object.defineProperty(yr,"object",{enumerable:!0,get:function(){return Uie.create}});Object.defineProperty(yr,"ArraySchema",{enumerable:!0,get:function(){return Hie.default}});Object.defineProperty(yr,"array",{enumerable:!0,get:function(){return Hie.create}});Object.defineProperty(yr,"ref",{enumerable:!0,get:function(){return UYe.create}});Object.defineProperty(yr,"lazy",{enumerable:!0,get:function(){return HYe.create}});Object.defineProperty(yr,"ValidationError",{enumerable:!0,get:function(){return GYe.default}});Object.defineProperty(yr,"reach",{enumerable:!0,get:function(){return YYe.default}});Object.defineProperty(yr,"isSchema",{enumerable:!0,get:function(){return Gie.default}});Object.defineProperty(yr,"setLocale",{enumerable:!0,get:function(){return jYe.default}});Object.defineProperty(yr,"BaseSchema",{enumerable:!0,get:function(){return qYe.default}});var Tie=eu(mre()),JL=eu(Bre()),Oie=eu(Sre()),Mie=eu(Pre()),Kie=eu(Fre()),Uie=eu(kie()),Hie=eu(Fie()),UYe=Zc(),HYe=Nie(),GYe=km(zc()),YYe=km(FL()),Gie=km(bh()),jYe=km(Lie()),qYe=km(nA());function km(r){return r&&r.__esModule?r:{default:r}}function Yie(){if(typeof WeakMap!="function")return null;var r=new WeakMap;return Yie=function(){return r},r}function eu(r){if(r&&r.__esModule)return r;if(r===null||typeof r!="object"&&typeof r!="function")return{default:r};var e=Yie();if(e&&e.has(r))return e.get(r);var t={},i=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(var n in r)if(Object.prototype.hasOwnProperty.call(r,n)){var s=i?Object.getOwnPropertyDescriptor(r,n):null;s&&(s.get||s.set)?Object.defineProperty(t,n,s):t[n]=r[n]}return t.default=r,e&&e.set(r,t),t}function JYe(r,e,t){if(!r||!(0,Gie.default)(r.prototype))throw new TypeError("You must provide a yup schema constructor function");if(typeof e!="string")throw new TypeError("A Method name must be provided");if(typeof t!="function")throw new TypeError("Method function must be provided");r.prototype[e]=t}});var zie=w((ggt,Fm)=>{"use strict";var VYe=process.env.TERM_PROGRAM==="Hyper",XYe=process.platform==="win32",qie=process.platform==="linux",zL={ballotDisabled:"\u2612",ballotOff:"\u2610",ballotOn:"\u2611",bullet:"\u2022",bulletWhite:"\u25E6",fullBlock:"\u2588",heart:"\u2764",identicalTo:"\u2261",line:"\u2500",mark:"\u203B",middot:"\xB7",minus:"\uFF0D",multiplication:"\xD7",obelus:"\xF7",pencilDownRight:"\u270E",pencilRight:"\u270F",pencilUpRight:"\u2710",percent:"%",pilcrow2:"\u2761",pilcrow:"\xB6",plusMinus:"\xB1",section:"\xA7",starsOff:"\u2606",starsOn:"\u2605",upDownArrow:"\u2195"},Jie=Object.assign({},zL,{check:"\u221A",cross:"\xD7",ellipsisLarge:"...",ellipsis:"...",info:"i",question:"?",questionSmall:"?",pointer:">",pointerSmall:"\xBB",radioOff:"( )",radioOn:"(*)",warning:"\u203C"}),Wie=Object.assign({},zL,{ballotCross:"\u2718",check:"\u2714",cross:"\u2716",ellipsisLarge:"\u22EF",ellipsis:"\u2026",info:"\u2139",question:"?",questionFull:"\uFF1F",questionSmall:"\uFE56",pointer:qie?"\u25B8":"\u276F",pointerSmall:qie?"\u2023":"\u203A",radioOff:"\u25EF",radioOn:"\u25C9",warning:"\u26A0"});Fm.exports=XYe&&!VYe?Jie:Wie;Reflect.defineProperty(Fm.exports,"common",{enumerable:!1,value:zL});Reflect.defineProperty(Fm.exports,"windows",{enumerable:!1,value:Jie});Reflect.defineProperty(Fm.exports,"other",{enumerable:!1,value:Wie})});var lo=w((fgt,VL)=>{"use strict";var ZYe=r=>r!==null&&typeof r=="object"&&!Array.isArray(r),_Ye=/[\u001b\u009b][[\]#;?()]*(?:(?:(?:[^\W_]*;?[^\W_]*)\u0007)|(?:(?:[0-9]{1,4}(;[0-9]{0,4})*)?[~0-9=<>cf-nqrtyA-PRZ]))/g,Vie=()=>{let r={enabled:!0,visible:!0,styles:{},keys:{}};"FORCE_COLOR"in process.env&&(r.enabled=process.env.FORCE_COLOR!=="0");let e=s=>{let o=s.open=`\x1B[${s.codes[0]}m`,a=s.close=`\x1B[${s.codes[1]}m`,l=s.regex=new RegExp(`\\u001b\\[${s.codes[1]}m`,"g");return s.wrap=(c,u)=>{c.includes(a)&&(c=c.replace(l,a+o));let g=o+c+a;return u?g.replace(/\r*\n/g,`${a}$&${o}`):g},s},t=(s,o,a)=>typeof s=="function"?s(o):s.wrap(o,a),i=(s,o)=>{if(s===""||s==null)return"";if(r.enabled===!1)return s;if(r.visible===!1)return"";let a=""+s,l=a.includes(`
-`),c=o.length;for(c>0&&o.includes("unstyle")&&(o=[...new Set(["unstyle",...o])].reverse());c-- >0;)a=t(r.styles[o[c]],a,l);return a},n=(s,o,a)=>{r.styles[s]=e({name:s,codes:o}),(r.keys[a]||(r.keys[a]=[])).push(s),Reflect.defineProperty(r,s,{configurable:!0,enumerable:!0,set(c){r.alias(s,c)},get(){let c=u=>i(u,c.stack);return Reflect.setPrototypeOf(c,r),c.stack=this.stack?this.stack.concat(s):[s],c}})};return n("reset",[0,0],"modifier"),n("bold",[1,22],"modifier"),n("dim",[2,22],"modifier"),n("italic",[3,23],"modifier"),n("underline",[4,24],"modifier"),n("inverse",[7,27],"modifier"),n("hidden",[8,28],"modifier"),n("strikethrough",[9,29],"modifier"),n("black",[30,39],"color"),n("red",[31,39],"color"),n("green",[32,39],"color"),n("yellow",[33,39],"color"),n("blue",[34,39],"color"),n("magenta",[35,39],"color"),n("cyan",[36,39],"color"),n("white",[37,39],"color"),n("gray",[90,39],"color"),n("grey",[90,39],"color"),n("bgBlack",[40,49],"bg"),n("bgRed",[41,49],"bg"),n("bgGreen",[42,49],"bg"),n("bgYellow",[43,49],"bg"),n("bgBlue",[44,49],"bg"),n("bgMagenta",[45,49],"bg"),n("bgCyan",[46,49],"bg"),n("bgWhite",[47,49],"bg"),n("blackBright",[90,39],"bright"),n("redBright",[91,39],"bright"),n("greenBright",[92,39],"bright"),n("yellowBright",[93,39],"bright"),n("blueBright",[94,39],"bright"),n("magentaBright",[95,39],"bright"),n("cyanBright",[96,39],"bright"),n("whiteBright",[97,39],"bright"),n("bgBlackBright",[100,49],"bgBright"),n("bgRedBright",[101,49],"bgBright"),n("bgGreenBright",[102,49],"bgBright"),n("bgYellowBright",[103,49],"bgBright"),n("bgBlueBright",[104,49],"bgBright"),n("bgMagentaBright",[105,49],"bgBright"),n("bgCyanBright",[106,49],"bgBright"),n("bgWhiteBright",[107,49],"bgBright"),r.ansiRegex=_Ye,r.hasColor=r.hasAnsi=s=>(r.ansiRegex.lastIndex=0,typeof s=="string"&&s!==""&&r.ansiRegex.test(s)),r.alias=(s,o)=>{let a=typeof o=="string"?r[o]:o;if(typeof a!="function")throw new TypeError("Expected alias to be the name of an existing color (string) or a function");a.stack||(Reflect.defineProperty(a,"name",{value:s}),r.styles[s]=a,a.stack=[s]),Reflect.defineProperty(r,s,{configurable:!0,enumerable:!0,set(l){r.alias(s,l)},get(){let l=c=>i(c,l.stack);return Reflect.setPrototypeOf(l,r),l.stack=this.stack?this.stack.concat(a.stack):a.stack,l}})},r.theme=s=>{if(!ZYe(s))throw new TypeError("Expected theme to be an object");for(let o of Object.keys(s))r.alias(o,s[o]);return r},r.alias("unstyle",s=>typeof s=="string"&&s!==""?(r.ansiRegex.lastIndex=0,s.replace(r.ansiRegex,"")):""),r.alias("noop",s=>s),r.none=r.clear=r.noop,r.stripColor=r.unstyle,r.symbols=zie(),r.define=n,r};VL.exports=Vie();VL.exports.create=Vie});var ji=w(Lt=>{"use strict";var $Ye=Object.prototype.toString,Rs=lo(),Xie=!1,XL=[],Zie={yellow:"blue",cyan:"red",green:"magenta",black:"white",blue:"yellow",red:"cyan",magenta:"green",white:"black"};Lt.longest=(r,e)=>r.reduce((t,i)=>Math.max(t,e?i[e].length:i.length),0);Lt.hasColor=r=>!!r&&Rs.hasColor(r);var EQ=Lt.isObject=r=>r!==null&&typeof r=="object"&&!Array.isArray(r);Lt.nativeType=r=>$Ye.call(r).slice(8,-1).toLowerCase().replace(/\s/g,"");Lt.isAsyncFn=r=>Lt.nativeType(r)==="asyncfunction";Lt.isPrimitive=r=>r!=null&&typeof r!="object"&&typeof r!="function";Lt.resolve=(r,e,...t)=>typeof e=="function"?e.call(r,...t):e;Lt.scrollDown=(r=[])=>[...r.slice(1),r[0]];Lt.scrollUp=(r=[])=>[r.pop(),...r];Lt.reorder=(r=[])=>{let e=r.slice();return e.sort((t,i)=>t.index>i.index?1:t.index<i.index?-1:0),e};Lt.swap=(r,e,t)=>{let i=r.length,n=t===i?0:t<0?i-1:t,s=r[e];r[e]=r[n],r[n]=s};Lt.width=(r,e=80)=>{let t=r&&r.columns?r.columns:e;return r&&typeof r.getWindowSize=="function"&&(t=r.getWindowSize()[0]),process.platform==="win32"?t-1:t};Lt.height=(r,e=20)=>{let t=r&&r.rows?r.rows:e;return r&&typeof r.getWindowSize=="function"&&(t=r.getWindowSize()[1]),t};Lt.wordWrap=(r,e={})=>{if(!r)return r;typeof e=="number"&&(e={width:e});let{indent:t="",newline:i=`
-`+t,width:n=80}=e;n-=((i+t).match(/[^\S\n]/g)||[]).length;let o=`.{1,${n}}([\\s\\u200B]+|$)|[^\\s\\u200B]+?([\\s\\u200B]+|$)`,a=r.trim(),l=new RegExp(o,"g"),c=a.match(l)||[];return c=c.map(u=>u.replace(/\n$/,"")),e.padEnd&&(c=c.map(u=>u.padEnd(n," "))),e.padStart&&(c=c.map(u=>u.padStart(n," "))),t+c.join(i)};Lt.unmute=r=>{let e=r.stack.find(i=>Rs.keys.color.includes(i));return e?Rs[e]:r.stack.find(i=>i.slice(2)==="bg")?Rs[e.slice(2)]:i=>i};Lt.pascal=r=>r?r[0].toUpperCase()+r.slice(1):"";Lt.inverse=r=>{if(!r||!r.stack)return r;let e=r.stack.find(i=>Rs.keys.color.includes(i));if(e){let i=Rs["bg"+Lt.pascal(e)];return i?i.black:r}let t=r.stack.find(i=>i.slice(0,2)==="bg");return t?Rs[t.slice(2).toLowerCase()]||r:Rs.none};Lt.complement=r=>{if(!r||!r.stack)return r;let e=r.stack.find(i=>Rs.keys.color.includes(i)),t=r.stack.find(i=>i.slice(0,2)==="bg");if(e&&!t)return Rs[Zie[e]||e];if(t){let i=t.slice(2).toLowerCase(),n=Zie[i];return n&&Rs["bg"+Lt.pascal(n)]||r}return Rs.none};Lt.meridiem=r=>{let e=r.getHours(),t=r.getMinutes(),i=e>=12?"pm":"am";e=e%12;let n=e===0?12:e,s=t<10?"0"+t:t;return n+":"+s+" "+i};Lt.set=(r={},e="",t)=>e.split(".").reduce((i,n,s,o)=>{let a=o.length-1>s?i[n]||{}:t;return!Lt.isObject(a)&&s<o.length-1&&(a={}),i[n]=a},r);Lt.get=(r={},e="",t)=>{let i=r[e]==null?e.split(".").reduce((n,s)=>n&&n[s],r):r[e];return i==null?t:i};Lt.mixin=(r,e)=>{if(!EQ(r))return e;if(!EQ(e))return r;for(let t of Object.keys(e)){let i=Object.getOwnPropertyDescriptor(e,t);if(i.hasOwnProperty("value"))if(r.hasOwnProperty(t)&&EQ(i.value)){let n=Object.getOwnPropertyDescriptor(r,t);EQ(n.value)?r[t]=Lt.merge({},r[t],e[t]):Reflect.defineProperty(r,t,i)}else Reflect.defineProperty(r,t,i);else Reflect.defineProperty(r,t,i)}return r};Lt.merge=(...r)=>{let e={};for(let t of r)Lt.mixin(e,t);return e};Lt.mixinEmitter=(r,e)=>{let t=e.constructor.prototype;for(let i of Object.keys(t)){let n=t[i];typeof n=="function"?Lt.define(r,i,n.bind(e)):Lt.define(r,i,n)}};Lt.onExit=r=>{let e=(t,i)=>{Xie||(Xie=!0,XL.forEach(n=>n()),t===!0&&process.exit(128+i))};XL.length===0&&(process.once("SIGTERM",e.bind(null,!0,15)),process.once("SIGINT",e.bind(null,!0,2)),process.once("exit",e)),XL.push(r)};Lt.define=(r,e,t)=>{Reflect.defineProperty(r,e,{value:t})};Lt.defineExport=(r,e,t)=>{let i;Reflect.defineProperty(r,e,{enumerable:!0,configurable:!0,set(n){i=n},get(){return i?i():t()}})}});var _ie=w(Kh=>{"use strict";Kh.ctrl={a:"first",b:"backward",c:"cancel",d:"deleteForward",e:"last",f:"forward",g:"reset",i:"tab",k:"cutForward",l:"reset",n:"newItem",m:"cancel",j:"submit",p:"search",r:"remove",s:"save",u:"undo",w:"cutLeft",x:"toggleCursor",v:"paste"};Kh.shift={up:"shiftUp",down:"shiftDown",left:"shiftLeft",right:"shiftRight",tab:"prev"};Kh.fn={up:"pageUp",down:"pageDown",left:"pageLeft",right:"pageRight",delete:"deleteForward"};Kh.option={b:"backward",f:"forward",d:"cutRight",left:"cutLeft",up:"altUp",down:"altDown"};Kh.keys={pageup:"pageUp",pagedown:"pageDown",home:"home",end:"end",cancel:"cancel",delete:"deleteForward",backspace:"delete",down:"down",enter:"submit",escape:"cancel",left:"left",space:"space",number:"number",return:"submit",right:"right",tab:"next",up:"up"}});var tne=w((dgt,ene)=>{"use strict";var $ie=J("readline"),eje=_ie(),tje=/^(?:\x1b)([a-zA-Z0-9])$/,rje=/^(?:\x1b+)(O|N|\[|\[\[)(?:(\d+)(?:;(\d+))?([~^$])|(?:1;)?(\d+)?([a-zA-Z]))/,ije={OP:"f1",OQ:"f2",OR:"f3",OS:"f4","[11~":"f1","[12~":"f2","[13~":"f3","[14~":"f4","[[A":"f1","[[B":"f2","[[C":"f3","[[D":"f4","[[E":"f5","[15~":"f5","[17~":"f6","[18~":"f7","[19~":"f8","[20~":"f9","[21~":"f10","[23~":"f11","[24~":"f12","[A":"up","[B":"down","[C":"right","[D":"left","[E":"clear","[F":"end","[H":"home",OA:"up",OB:"down",OC:"right",OD:"left",OE:"clear",OF:"end",OH:"home","[1~":"home","[2~":"insert","[3~":"delete","[4~":"end","[5~":"pageup","[6~":"pagedown","[[5~":"pageup","[[6~":"pagedown","[7~":"home","[8~":"end","[a":"up","[b":"down","[c":"right","[d":"left","[e":"clear","[2$":"insert","[3$":"delete","[5$":"pageup","[6$":"pagedown","[7$":"home","[8$":"end",Oa:"up",Ob:"down",Oc:"right",Od:"left",Oe:"clear","[2^":"insert","[3^":"delete","[5^":"pageup","[6^":"pagedown","[7^":"home","[8^":"end","[Z":"tab"};function nje(r){return["[a","[b","[c","[d","[e","[2$","[3$","[5$","[6$","[7$","[8$","[Z"].includes(r)}function sje(r){return["Oa","Ob","Oc","Od","Oe","[2^","[3^","[5^","[6^","[7^","[8^"].includes(r)}var IQ=(r="",e={})=>{let t,i={name:e.name,ctrl:!1,meta:!1,shift:!1,option:!1,sequence:r,raw:r,...e};if(Buffer.isBuffer(r)?r[0]>127&&r[1]===void 0?(r[0]-=128,r="\x1B"+String(r)):r=String(r):r!==void 0&&typeof r!="string"?r=String(r):r||(r=i.sequence||""),i.sequence=i.sequence||r||i.name,r==="\r")i.raw=void 0,i.name="return";else if(r===`
-`)i.name="enter";else if(r==="	")i.name="tab";else if(r==="\b"||r==="\x7F"||r==="\x1B\x7F"||r==="\x1B\b")i.name="backspace",i.meta=r.charAt(0)==="\x1B";else if(r==="\x1B"||r==="\x1B\x1B")i.name="escape",i.meta=r.length===2;else if(r===" "||r==="\x1B ")i.name="space",i.meta=r.length===2;else if(r<="")i.name=String.fromCharCode(r.charCodeAt(0)+"a".charCodeAt(0)-1),i.ctrl=!0;else if(r.length===1&&r>="0"&&r<="9")i.name="number";else if(r.length===1&&r>="a"&&r<="z")i.name=r;else if(r.length===1&&r>="A"&&r<="Z")i.name=r.toLowerCase(),i.shift=!0;else if(t=tje.exec(r))i.meta=!0,i.shift=/^[A-Z]$/.test(t[1]);else if(t=rje.exec(r)){let n=[...r];n[0]==="\x1B"&&n[1]==="\x1B"&&(i.option=!0);let s=[t[1],t[2],t[4],t[6]].filter(Boolean).join(""),o=(t[3]||t[5]||1)-1;i.ctrl=!!(o&4),i.meta=!!(o&10),i.shift=!!(o&1),i.code=s,i.name=ije[s],i.shift=nje(s)||i.shift,i.ctrl=sje(s)||i.ctrl}return i};IQ.listen=(r={},e)=>{let{stdin:t}=r;if(!t||t!==process.stdin&&!t.isTTY)throw new Error("Invalid stream passed");let i=$ie.createInterface({terminal:!0,input:t});$ie.emitKeypressEvents(t,i);let n=(a,l)=>e(a,IQ(a,l),i),s=t.isRaw;return t.isTTY&&t.setRawMode(!0),t.on("keypress",n),i.resume(),()=>{t.isTTY&&t.setRawMode(s),t.removeListener("keypress",n),i.pause(),i.close()}};IQ.action=(r,e,t)=>{let i={...eje,...t};return e.ctrl?(e.action=i.ctrl[e.name],e):e.option&&i.option?(e.action=i.option[e.name],e):e.shift?(e.action=i.shift[e.name],e):(e.action=i.keys[e.name],e)};ene.exports=IQ});var ine=w((Cgt,rne)=>{"use strict";rne.exports=r=>{r.timers=r.timers||{};let e=r.options.timers;if(!!e)for(let t of Object.keys(e)){let i=e[t];typeof i=="number"&&(i={interval:i}),oje(r,t,i)}};function oje(r,e,t={}){let i=r.timers[e]={name:e,start:Date.now(),ms:0,tick:0},n=t.interval||120;i.frames=t.frames||[],i.loading=!0;let s=setInterval(()=>{i.ms=Date.now()-i.start,i.tick++,r.render()},n);return i.stop=()=>{i.loading=!1,clearInterval(s)},Reflect.defineProperty(i,"interval",{value:s}),r.once("close",()=>i.stop()),i.stop}});var sne=w((mgt,nne)=>{"use strict";var{define:aje,width:Aje}=ji(),ZL=class{constructor(e){let t=e.options;aje(this,"_prompt",e),this.type=e.type,this.name=e.name,this.message="",this.header="",this.footer="",this.error="",this.hint="",this.input="",this.cursor=0,this.index=0,this.lines=0,this.tick=0,this.prompt="",this.buffer="",this.width=Aje(t.stdout||process.stdout),Object.assign(this,t),this.name=this.name||this.message,this.message=this.message||this.name,this.symbols=e.symbols,this.styles=e.styles,this.required=new Set,this.cancelled=!1,this.submitted=!1}clone(){let e={...this};return e.status=this.status,e.buffer=Buffer.from(e.buffer),delete e.clone,e}set color(e){this._color=e}get color(){let e=this.prompt.styles;if(this.cancelled)return e.cancelled;if(this.submitted)return e.submitted;let t=this._color||e[this.status];return typeof t=="function"?t:e.pending}set loading(e){this._loading=e}get loading(){return typeof this._loading=="boolean"?this._loading:this.loadingChoices?"choices":!1}get status(){return this.cancelled?"cancelled":this.submitted?"submitted":"pending"}};nne.exports=ZL});var ane=w((Egt,one)=>{"use strict";var _L=ji(),Di=lo(),$L={default:Di.noop,noop:Di.noop,set inverse(r){this._inverse=r},get inverse(){return this._inverse||_L.inverse(this.primary)},set complement(r){this._complement=r},get complement(){return this._complement||_L.complement(this.primary)},primary:Di.cyan,success:Di.green,danger:Di.magenta,strong:Di.bold,warning:Di.yellow,muted:Di.dim,disabled:Di.gray,dark:Di.dim.gray,underline:Di.underline,set info(r){this._info=r},get info(){return this._info||this.primary},set em(r){this._em=r},get em(){return this._em||this.primary.underline},set heading(r){this._heading=r},get heading(){return this._heading||this.muted.underline},set pending(r){this._pending=r},get pending(){return this._pending||this.primary},set submitted(r){this._submitted=r},get submitted(){return this._submitted||this.success},set cancelled(r){this._cancelled=r},get cancelled(){return this._cancelled||this.danger},set typing(r){this._typing=r},get typing(){return this._typing||this.dim},set placeholder(r){this._placeholder=r},get placeholder(){return this._placeholder||this.primary.dim},set highlight(r){this._highlight=r},get highlight(){return this._highlight||this.inverse}};$L.merge=(r={})=>{r.styles&&typeof r.styles.enabled=="boolean"&&(Di.enabled=r.styles.enabled),r.styles&&typeof r.styles.visible=="boolean"&&(Di.visible=r.styles.visible);let e=_L.merge({},$L,r.styles);delete e.merge;for(let t of Object.keys(Di))e.hasOwnProperty(t)||Reflect.defineProperty(e,t,{get:()=>Di[t]});for(let t of Object.keys(Di.styles))e.hasOwnProperty(t)||Reflect.defineProperty(e,t,{get:()=>Di[t]});return e};one.exports=$L});var lne=w((Igt,Ane)=>{"use strict";var eT=process.platform==="win32",oA=lo(),lje=ji(),tT={...oA.symbols,upDownDoubleArrow:"\u21D5",upDownDoubleArrow2:"\u2B0D",upDownArrow:"\u2195",asterisk:"*",asterism:"\u2042",bulletWhite:"\u25E6",electricArrow:"\u2301",ellipsisLarge:"\u22EF",ellipsisSmall:"\u2026",fullBlock:"\u2588",identicalTo:"\u2261",indicator:oA.symbols.check,leftAngle:"\u2039",mark:"\u203B",minus:"\u2212",multiplication:"\xD7",obelus:"\xF7",percent:"%",pilcrow:"\xB6",pilcrow2:"\u2761",pencilUpRight:"\u2710",pencilDownRight:"\u270E",pencilRight:"\u270F",plus:"+",plusMinus:"\xB1",pointRight:"\u261E",rightAngle:"\u203A",section:"\xA7",hexagon:{off:"\u2B21",on:"\u2B22",disabled:"\u2B22"},ballot:{on:"\u2611",off:"\u2610",disabled:"\u2612"},stars:{on:"\u2605",off:"\u2606",disabled:"\u2606"},folder:{on:"\u25BC",off:"\u25B6",disabled:"\u25B6"},prefix:{pending:oA.symbols.question,submitted:oA.symbols.check,cancelled:oA.symbols.cross},separator:{pending:oA.symbols.pointerSmall,submitted:oA.symbols.middot,cancelled:oA.symbols.middot},radio:{off:eT?"( )":"\u25EF",on:eT?"(*)":"\u25C9",disabled:eT?"(|)":"\u24BE"},numbers:["\u24EA","\u2460","\u2461","\u2462","\u2463","\u2464","\u2465","\u2466","\u2467","\u2468","\u2469","\u246A","\u246B","\u246C","\u246D","\u246E","\u246F","\u2470","\u2471","\u2472","\u2473","\u3251","\u3252","\u3253","\u3254","\u3255","\u3256","\u3257","\u3258","\u3259","\u325A","\u325B","\u325C","\u325D","\u325E","\u325F","\u32B1","\u32B2","\u32B3","\u32B4","\u32B5","\u32B6","\u32B7","\u32B8","\u32B9","\u32BA","\u32BB","\u32BC","\u32BD","\u32BE","\u32BF"]};tT.merge=r=>{let e=lje.merge({},oA.symbols,tT,r.symbols);return delete e.merge,e};Ane.exports=tT});var une=w((ygt,cne)=>{"use strict";var cje=ane(),uje=lne(),gje=ji();cne.exports=r=>{r.options=gje.merge({},r.options.theme,r.options),r.symbols=uje.merge(r.options),r.styles=cje.merge(r.options)}});var dne=w((hne,pne)=>{"use strict";var gne=process.env.TERM_PROGRAM==="Apple_Terminal",fje=lo(),rT=ji(),co=pne.exports=hne,Dr="\x1B[",fne="\x07",iT=!1,hl=co.code={bell:fne,beep:fne,beginning:`${Dr}G`,down:`${Dr}J`,esc:Dr,getPosition:`${Dr}6n`,hide:`${Dr}?25l`,line:`${Dr}2K`,lineEnd:`${Dr}K`,lineStart:`${Dr}1K`,restorePosition:Dr+(gne?"8":"u"),savePosition:Dr+(gne?"7":"s"),screen:`${Dr}2J`,show:`${Dr}?25h`,up:`${Dr}1J`},tu=co.cursor={get hidden(){return iT},hide(){return iT=!0,hl.hide},show(){return iT=!1,hl.show},forward:(r=1)=>`${Dr}${r}C`,backward:(r=1)=>`${Dr}${r}D`,nextLine:(r=1)=>`${Dr}E`.repeat(r),prevLine:(r=1)=>`${Dr}F`.repeat(r),up:(r=1)=>r?`${Dr}${r}A`:"",down:(r=1)=>r?`${Dr}${r}B`:"",right:(r=1)=>r?`${Dr}${r}C`:"",left:(r=1)=>r?`${Dr}${r}D`:"",to(r,e){return e?`${Dr}${e+1};${r+1}H`:`${Dr}${r+1}G`},move(r=0,e=0){let t="";return t+=r<0?tu.left(-r):r>0?tu.right(r):"",t+=e<0?tu.up(-e):e>0?tu.down(e):"",t},restore(r={}){let{after:e,cursor:t,initial:i,input:n,prompt:s,size:o,value:a}=r;if(i=rT.isPrimitive(i)?String(i):"",n=rT.isPrimitive(n)?String(n):"",a=rT.isPrimitive(a)?String(a):"",o){let l=co.cursor.up(o)+co.cursor.to(s.length),c=n.length-t;return c>0&&(l+=co.cursor.left(c)),l}if(a||e){let l=!n&&!!i?-i.length:-n.length+t;return e&&(l-=e.length),n===""&&i&&!s.includes(i)&&(l+=i.length),co.cursor.move(l)}}},nT=co.erase={screen:hl.screen,up:hl.up,down:hl.down,line:hl.line,lineEnd:hl.lineEnd,lineStart:hl.lineStart,lines(r){let e="";for(let t=0;t<r;t++)e+=co.erase.line+(t<r-1?co.cursor.up(1):"");return r&&(e+=co.code.beginning),e}};co.clear=(r="",e=process.stdout.columns)=>{if(!e)return nT.line+tu.to(0);let t=s=>[...fje.unstyle(s)].length,i=r.split(/\r?\n/),n=0;for(let s of i)n+=1+Math.floor(Math.max(t(s)-1,0)/e);return(nT.line+tu.prevLine()).repeat(n-1)+nT.line+tu.to(0)}});var Uh=w((wgt,mne)=>{"use strict";var hje=J("events"),Cne=lo(),sT=tne(),pje=ine(),dje=sne(),Cje=une(),Pn=ji(),ru=dne(),Nm=class extends hje{constructor(e={}){super(),this.name=e.name,this.type=e.type,this.options=e,Cje(this),pje(this),this.state=new dje(this),this.initial=[e.initial,e.default].find(t=>t!=null),this.stdout=e.stdout||process.stdout,this.stdin=e.stdin||process.stdin,this.scale=e.scale||1,this.term=this.options.term||process.env.TERM_PROGRAM,this.margin=Eje(this.options.margin),this.setMaxListeners(0),mje(this)}async keypress(e,t={}){this.keypressed=!0;let i=sT.action(e,sT(e,t),this.options.actions);this.state.keypress=i,this.emit("keypress",e,i),this.emit("state",this.state.clone());let n=this.options[i.action]||this[i.action]||this.dispatch;if(typeof n=="function")return await n.call(this,e,i);this.alert()}alert(){delete this.state.alert,this.options.show===!1?this.emit("alert"):this.stdout.write(ru.code.beep)}cursorHide(){this.stdout.write(ru.cursor.hide()),Pn.onExit(()=>this.cursorShow())}cursorShow(){this.stdout.write(ru.cursor.show())}write(e){!e||(this.stdout&&this.state.show!==!1&&this.stdout.write(e),this.state.buffer+=e)}clear(e=0){let t=this.state.buffer;this.state.buffer="",!(!t&&!e||this.options.show===!1)&&this.stdout.write(ru.cursor.down(e)+ru.clear(t,this.width))}restore(){if(this.state.closed||this.options.show===!1)return;let{prompt:e,after:t,rest:i}=this.sections(),{cursor:n,initial:s="",input:o="",value:a=""}=this,l=this.state.size=i.length,c={after:t,cursor:n,initial:s,input:o,prompt:e,size:l,value:a},u=ru.cursor.restore(c);u&&this.stdout.write(u)}sections(){let{buffer:e,input:t,prompt:i}=this.state;i=Cne.unstyle(i);let n=Cne.unstyle(e),s=n.indexOf(i),o=n.slice(0,s),l=n.slice(s).split(`
-`),c=l[0],u=l[l.length-1],f=(i+(t?" "+t:"")).length,h=f<c.length?c.slice(f+1):"";return{header:o,prompt:c,after:h,rest:l.slice(1),last:u}}async submit(){this.state.submitted=!0,this.state.validating=!0,this.options.onSubmit&&await this.options.onSubmit.call(this,this.name,this.value,this);let e=this.state.error||await this.validate(this.value,this.state);if(e!==!0){let t=`
-`+this.symbols.pointer+" ";typeof e=="string"?t+=e.trim():t+="Invalid input",this.state.error=`
-`+this.styles.danger(t),this.state.submitted=!1,await this.render(),await this.alert(),this.state.validating=!1,this.state.error=void 0;return}this.state.validating=!1,await this.render(),await this.close(),this.value=await this.result(this.value),this.emit("submit",this.value)}async cancel(e){this.state.cancelled=this.state.submitted=!0,await this.render(),await this.close(),typeof this.options.onCancel=="function"&&await this.options.onCancel.call(this,this.name,this.value,this),this.emit("cancel",await this.error(e))}async close(){this.state.closed=!0;try{let e=this.sections(),t=Math.ceil(e.prompt.length/this.width);e.rest&&this.write(ru.cursor.down(e.rest.length)),this.write(`
-`.repeat(t))}catch{}this.emit("close")}start(){!this.stop&&this.options.show!==!1&&(this.stop=sT.listen(this,this.keypress.bind(this)),this.once("close",this.stop))}async skip(){return this.skipped=this.options.skip===!0,typeof this.options.skip=="function"&&(this.skipped=await this.options.skip.call(this,this.name,this.value)),this.skipped}async initialize(){let{format:e,options:t,result:i}=this;if(this.format=()=>e.call(this,this.value),this.result=()=>i.call(this,this.value),typeof t.initial=="function"&&(this.initial=await t.initial.call(this,this)),typeof t.onRun=="function"&&await t.onRun.call(this,this),typeof t.onSubmit=="function"){let n=t.onSubmit.bind(this),s=this.submit.bind(this);delete this.options.onSubmit,this.submit=async()=>(await n(this.name,this.value,this),s())}await this.start(),await this.render()}render(){throw new Error("expected prompt to have a custom render method")}run(){return new Promise(async(e,t)=>{if(this.once("submit",e),this.once("cancel",t),await this.skip())return this.render=()=>{},this.submit();await this.initialize(),this.emit("run")})}async element(e,t,i){let{options:n,state:s,symbols:o,timers:a}=this,l=a&&a[e];s.timer=l;let c=n[e]||s[e]||o[e],u=t&&t[e]!=null?t[e]:await c;if(u==="")return u;let g=await this.resolve(u,s,t,i);return!g&&t&&t[e]?this.resolve(c,s,t,i):g}async prefix(){let e=await this.element("prefix")||this.symbols,t=this.timers&&this.timers.prefix,i=this.state;return i.timer=t,Pn.isObject(e)&&(e=e[i.status]||e.pending),Pn.hasColor(e)?e:(this.styles[i.status]||this.styles.pending)(e)}async message(){let e=await this.element("message");return Pn.hasColor(e)?e:this.styles.strong(e)}async separator(){let e=await this.element("separator")||this.symbols,t=this.timers&&this.timers.separator,i=this.state;i.timer=t;let n=e[i.status]||e.pending||i.separator,s=await this.resolve(n,i);return Pn.isObject(s)&&(s=s[i.status]||s.pending),Pn.hasColor(s)?s:this.styles.muted(s)}async pointer(e,t){let i=await this.element("pointer",e,t);if(typeof i=="string"&&Pn.hasColor(i))return i;if(i){let n=this.styles,s=this.index===t,o=s?n.primary:c=>c,a=await this.resolve(i[s?"on":"off"]||i,this.state),l=Pn.hasColor(a)?a:o(a);return s?l:" ".repeat(a.length)}}async indicator(e,t){let i=await this.element("indicator",e,t);if(typeof i=="string"&&Pn.hasColor(i))return i;if(i){let n=this.styles,s=e.enabled===!0,o=s?n.success:n.dark,a=i[s?"on":"off"]||i;return Pn.hasColor(a)?a:o(a)}return""}body(){return null}footer(){if(this.state.status==="pending")return this.element("footer")}header(){if(this.state.status==="pending")return this.element("header")}async hint(){if(this.state.status==="pending"&&!this.isValue(this.state.input)){let e=await this.element("hint");return Pn.hasColor(e)?e:this.styles.muted(e)}}error(e){return this.state.submitted?"":e||this.state.error}format(e){return e}result(e){return e}validate(e){return this.options.required===!0?this.isValue(e):!0}isValue(e){return e!=null&&e!==""}resolve(e,...t){return Pn.resolve(this,e,...t)}get base(){return Nm.prototype}get style(){return this.styles[this.state.status]}get height(){return this.options.rows||Pn.height(this.stdout,25)}get width(){return this.options.columns||Pn.width(this.stdout,80)}get size(){return{width:this.width,height:this.height}}set cursor(e){this.state.cursor=e}get cursor(){return this.state.cursor}set input(e){this.state.input=e}get input(){return this.state.input}set value(e){this.state.value=e}get value(){let{input:e,value:t}=this.state,i=[t,e].find(this.isValue.bind(this));return this.isValue(i)?i:this.initial}static get prompt(){return e=>new this(e).run()}};function mje(r){let e=n=>r[n]===void 0||typeof r[n]=="function",t=["actions","choices","initial","margin","roles","styles","symbols","theme","timers","value"],i=["body","footer","error","header","hint","indicator","message","prefix","separator","skip"];for(let n of Object.keys(r.options)){if(t.includes(n)||/^on[A-Z]/.test(n))continue;let s=r.options[n];typeof s=="function"&&e(n)?i.includes(n)||(r[n]=s.bind(r)):typeof r[n]!="function"&&(r[n]=s)}}function Eje(r){typeof r=="number"&&(r=[r,r,r,r]);let e=[].concat(r||[]),t=n=>n%2===0?`
-`:" ",i=[];for(let n=0;n<4;n++){let s=t(n);e[n]?i.push(s.repeat(e[n])):i.push("")}return i}mne.exports=Nm});var yne=w((Bgt,Ine)=>{"use strict";var Ije=ji(),Ene={default(r,e){return e},checkbox(r,e){throw new Error("checkbox role is not implemented yet")},editable(r,e){throw new Error("editable role is not implemented yet")},expandable(r,e){throw new Error("expandable role is not implemented yet")},heading(r,e){return e.disabled="",e.indicator=[e.indicator," "].find(t=>t!=null),e.message=e.message||"",e},input(r,e){throw new Error("input role is not implemented yet")},option(r,e){return Ene.default(r,e)},radio(r,e){throw new Error("radio role is not implemented yet")},separator(r,e){return e.disabled="",e.indicator=[e.indicator," "].find(t=>t!=null),e.message=e.message||r.symbols.line.repeat(5),e},spacer(r,e){return e}};Ine.exports=(r,e={})=>{let t=Ije.merge({},Ene,e.roles);return t[r]||t.default}});var Lm=w((Qgt,Qne)=>{"use strict";var yje=lo(),wje=Uh(),Bje=yne(),yQ=ji(),{reorder:oT,scrollUp:Qje,scrollDown:bje,isObject:wne,swap:Sje}=yQ,aT=class extends wje{constructor(e){super(e),this.cursorHide(),this.maxSelected=e.maxSelected||1/0,this.multiple=e.multiple||!1,this.initial=e.initial||0,this.delay=e.delay||0,this.longest=0,this.num=""}async initialize(){typeof this.options.initial=="function"&&(this.initial=await this.options.initial.call(this)),await this.reset(!0),await super.initialize()}async reset(){let{choices:e,initial:t,autofocus:i,suggest:n}=this.options;if(this.state._choices=[],this.state.choices=[],this.choices=await Promise.all(await this.toChoices(e)),this.choices.forEach(s=>s.enabled=!1),typeof n!="function"&&this.selectable.length===0)throw new Error("At least one choice must be selectable");wne(t)&&(t=Object.keys(t)),Array.isArray(t)?(i!=null&&(this.index=this.findIndex(i)),t.forEach(s=>this.enable(this.find(s))),await this.render()):(i!=null&&(t=i),typeof t=="string"&&(t=this.findIndex(t)),typeof t=="number"&&t>-1&&(this.index=Math.max(0,Math.min(t,this.choices.length)),this.enable(this.find(this.index)))),this.isDisabled(this.focused)&&await this.down()}async toChoices(e,t){this.state.loadingChoices=!0;let i=[],n=0,s=async(o,a)=>{typeof o=="function"&&(o=await o.call(this)),o instanceof Promise&&(o=await o);for(let l=0;l<o.length;l++){let c=o[l]=await this.toChoice(o[l],n++,a);i.push(c),c.choices&&await s(c.choices,c)}return i};return s(e,t).then(o=>(this.state.loadingChoices=!1,o))}async toChoice(e,t,i){if(typeof e=="function"&&(e=await e.call(this,this)),e instanceof Promise&&(e=await e),typeof e=="string"&&(e={name:e}),e.normalized)return e;e.normalized=!0;let n=e.value;if(e=Bje(e.role,this.options)(this,e),typeof e.disabled=="string"&&!e.hint&&(e.hint=e.disabled,e.disabled=!0),e.disabled===!0&&e.hint==null&&(e.hint="(disabled)"),e.index!=null)return e;e.name=e.name||e.key||e.title||e.value||e.message,e.message=e.message||e.name||"",e.value=[e.value,e.name].find(this.isValue.bind(this)),e.input="",e.index=t,e.cursor=0,yQ.define(e,"parent",i),e.level=i?i.level+1:1,e.indent==null&&(e.indent=i?i.indent+"  ":e.indent||""),e.path=i?i.path+"."+e.name:e.name,e.enabled=!!(this.multiple&&!this.isDisabled(e)&&(e.enabled||this.isSelected(e))),this.isDisabled(e)||(this.longest=Math.max(this.longest,yje.unstyle(e.message).length));let o={...e};return e.reset=(a=o.input,l=o.value)=>{for(let c of Object.keys(o))e[c]=o[c];e.input=a,e.value=l},n==null&&typeof e.initial=="function"&&(e.input=await e.initial.call(this,this.state,e,t)),e}async onChoice(e,t){this.emit("choice",e,t,this),typeof e.onChoice=="function"&&await e.onChoice.call(this,this.state,e,t)}async addChoice(e,t,i){let n=await this.toChoice(e,t,i);return this.choices.push(n),this.index=this.choices.length-1,this.limit=this.choices.length,n}async newItem(e,t,i){let n={name:"New choice name?",editable:!0,newChoice:!0,...e},s=await this.addChoice(n,t,i);return s.updateChoice=()=>{delete s.newChoice,s.name=s.message=s.input,s.input="",s.cursor=0},this.render()}indent(e){return e.indent==null?e.level>1?"  ".repeat(e.level-1):"":e.indent}dispatch(e,t){if(this.multiple&&this[t.name])return this[t.name]();this.alert()}focus(e,t){return typeof t!="boolean"&&(t=e.enabled),t&&!e.enabled&&this.selected.length>=this.maxSelected?this.alert():(this.index=e.index,e.enabled=t&&!this.isDisabled(e),e)}space(){return this.multiple?(this.toggle(this.focused),this.render()):this.alert()}a(){if(this.maxSelected<this.choices.length)return this.alert();let e=this.selectable.every(t=>t.enabled);return this.choices.forEach(t=>t.enabled=!e),this.render()}i(){return this.choices.length-this.selected.length>this.maxSelected?this.alert():(this.choices.forEach(e=>e.enabled=!e.enabled),this.render())}g(e=this.focused){return this.choices.some(t=>!!t.parent)?(this.toggle(e.parent&&!e.choices?e.parent:e),this.render()):this.a()}toggle(e,t){if(!e.enabled&&this.selected.length>=this.maxSelected)return this.alert();typeof t!="boolean"&&(t=!e.enabled),e.enabled=t,e.choices&&e.choices.forEach(n=>this.toggle(n,t));let i=e.parent;for(;i;){let n=i.choices.filter(s=>this.isDisabled(s));i.enabled=n.every(s=>s.enabled===!0),i=i.parent}return Bne(this,this.choices),this.emit("toggle",e,this),e}enable(e){return this.selected.length>=this.maxSelected?this.alert():(e.enabled=!this.isDisabled(e),e.choices&&e.choices.forEach(this.enable.bind(this)),e)}disable(e){return e.enabled=!1,e.choices&&e.choices.forEach(this.disable.bind(this)),e}number(e){this.num+=e;let t=i=>{let n=Number(i);if(n>this.choices.length-1)return this.alert();let s=this.focused,o=this.choices.find(a=>n===a.index);if(!o.enabled&&this.selected.length>=this.maxSelected)return this.alert();if(this.visible.indexOf(o)===-1){let a=oT(this.choices),l=a.indexOf(o);if(s.index>l){let c=a.slice(l,l+this.limit),u=a.filter(g=>!c.includes(g));this.choices=c.concat(u)}else{let c=l-this.limit+1;this.choices=a.slice(c).concat(a.slice(0,c))}}return this.index=this.choices.indexOf(o),this.toggle(this.focused),this.render()};return clearTimeout(this.numberTimeout),new Promise(i=>{let n=this.choices.length,s=this.num,o=(a=!1,l)=>{clearTimeout(this.numberTimeout),a&&(l=t(s)),this.num="",i(l)};if(s==="0"||s.length===1&&Number(s+"0")>n)return o(!0);if(Number(s)>n)return o(!1,this.alert());this.numberTimeout=setTimeout(()=>o(!0),this.delay)})}home(){return this.choices=oT(this.choices),this.index=0,this.render()}end(){let e=this.choices.length-this.limit,t=oT(this.choices);return this.choices=t.slice(e).concat(t.slice(0,e)),this.index=this.limit-1,this.render()}first(){return this.index=0,this.render()}last(){return this.index=this.visible.length-1,this.render()}prev(){return this.visible.length<=1?this.alert():this.up()}next(){return this.visible.length<=1?this.alert():this.down()}right(){return this.cursor>=this.input.length?this.alert():(this.cursor++,this.render())}left(){return this.cursor<=0?this.alert():(this.cursor--,this.render())}up(){let e=this.choices.length,t=this.visible.length,i=this.index;return this.options.scroll===!1&&i===0?this.alert():e>t&&i===0?this.scrollUp():(this.index=(i-1%e+e)%e,this.isDisabled()?this.up():this.render())}down(){let e=this.choices.length,t=this.visible.length,i=this.index;return this.options.scroll===!1&&i===t-1?this.alert():e>t&&i===t-1?this.scrollDown():(this.index=(i+1)%e,this.isDisabled()?this.down():this.render())}scrollUp(e=0){return this.choices=Qje(this.choices),this.index=e,this.isDisabled()?this.up():this.render()}scrollDown(e=this.visible.length-1){return this.choices=bje(this.choices),this.index=e,this.isDisabled()?this.down():this.render()}async shiftUp(){if(this.options.sort===!0){this.sorting=!0,this.swap(this.index-1),await this.up(),this.sorting=!1;return}return this.scrollUp(this.index)}async shiftDown(){if(this.options.sort===!0){this.sorting=!0,this.swap(this.index+1),await this.down(),this.sorting=!1;return}return this.scrollDown(this.index)}pageUp(){return this.visible.length<=1?this.alert():(this.limit=Math.max(this.limit-1,0),this.index=Math.min(this.limit-1,this.index),this._limit=this.limit,this.isDisabled()?this.up():this.render())}pageDown(){return this.visible.length>=this.choices.length?this.alert():(this.index=Math.max(0,this.index),this.limit=Math.min(this.limit+1,this.choices.length),this._limit=this.limit,this.isDisabled()?this.down():this.render())}swap(e){Sje(this.choices,this.index,e)}isDisabled(e=this.focused){return e&&["disabled","collapsed","hidden","completing","readonly"].some(i=>e[i]===!0)?!0:e&&e.role==="heading"}isEnabled(e=this.focused){if(Array.isArray(e))return e.every(t=>this.isEnabled(t));if(e.choices){let t=e.choices.filter(i=>!this.isDisabled(i));return e.enabled&&t.every(i=>this.isEnabled(i))}return e.enabled&&!this.isDisabled(e)}isChoice(e,t){return e.name===t||e.index===Number(t)}isSelected(e){return Array.isArray(this.initial)?this.initial.some(t=>this.isChoice(e,t)):this.isChoice(e,this.initial)}map(e=[],t="value"){return[].concat(e||[]).reduce((i,n)=>(i[n]=this.find(n,t),i),{})}filter(e,t){let n=typeof e=="function"?e:(a,l)=>[a.name,l].includes(e),o=(this.options.multiple?this.state._choices:this.choices).filter(n);return t?o.map(a=>a[t]):o}find(e,t){if(wne(e))return t?e[t]:e;let n=typeof e=="function"?e:(o,a)=>[o.name,a].includes(e),s=this.choices.find(n);if(s)return t?s[t]:s}findIndex(e){return this.choices.indexOf(this.find(e))}async submit(){let e=this.focused;if(!e)return this.alert();if(e.newChoice)return e.input?(e.updateChoice(),this.render()):this.alert();if(this.choices.some(o=>o.newChoice))return this.alert();let{reorder:t,sort:i}=this.options,n=this.multiple===!0,s=this.selected;return s===void 0?this.alert():(Array.isArray(s)&&t!==!1&&i!==!0&&(s=yQ.reorder(s)),this.value=n?s.map(o=>o.name):s.name,super.submit())}set choices(e=[]){this.state._choices=this.state._choices||[],this.state.choices=e;for(let t of e)this.state._choices.some(i=>i.name===t.name)||this.state._choices.push(t);if(!this._initial&&this.options.initial){this._initial=!0;let t=this.initial;if(typeof t=="string"||typeof t=="number"){let i=this.find(t);i&&(this.initial=i.index,this.focus(i,!0))}}}get choices(){return Bne(this,this.state.choices||[])}set visible(e){this.state.visible=e}get visible(){return(this.state.visible||this.choices).slice(0,this.limit)}set limit(e){this.state.limit=e}get limit(){let{state:e,options:t,choices:i}=this,n=e.limit||this._limit||t.limit||i.length;return Math.min(n,this.height)}set value(e){super.value=e}get value(){return typeof super.value!="string"&&super.value===this.initial?this.input:super.value}set index(e){this.state.index=e}get index(){return Math.max(0,this.state?this.state.index:0)}get enabled(){return this.filter(this.isEnabled.bind(this))}get focused(){let e=this.choices[this.index];return e&&this.state.submitted&&this.multiple!==!0&&(e.enabled=!0),e}get selectable(){return this.choices.filter(e=>!this.isDisabled(e))}get selected(){return this.multiple?this.enabled:this.focused}};function Bne(r,e){if(e instanceof Promise)return e;if(typeof e=="function"){if(yQ.isAsyncFn(e))return e;e=e.call(r,r)}for(let t of e){if(Array.isArray(t.choices)){let i=t.choices.filter(n=>!r.isDisabled(n));t.enabled=i.every(n=>n.enabled===!0)}r.isDisabled(t)===!0&&delete t.enabled}return e}Qne.exports=aT});var pl=w((bgt,bne)=>{"use strict";var vje=Lm(),AT=ji(),lT=class extends vje{constructor(e){super(e),this.emptyError=this.options.emptyError||"No items were selected"}async dispatch(e,t){if(this.multiple)return this[t.name]?await this[t.name](e,t):await super.dispatch(e,t);this.alert()}separator(){if(this.options.separator)return super.separator();let e=this.styles.muted(this.symbols.ellipsis);return this.state.submitted?super.separator():e}pointer(e,t){return!this.multiple||this.options.pointer?super.pointer(e,t):""}indicator(e,t){return this.multiple?super.indicator(e,t):""}choiceMessage(e,t){let i=this.resolve(e.message,this.state,e,t);return e.role==="heading"&&!AT.hasColor(i)&&(i=this.styles.strong(i)),this.resolve(i,this.state,e,t)}choiceSeparator(){return":"}async renderChoice(e,t){await this.onChoice(e,t);let i=this.index===t,n=await this.pointer(e,t),s=await this.indicator(e,t)+(e.pad||""),o=await this.resolve(e.hint,this.state,e,t);o&&!AT.hasColor(o)&&(o=this.styles.muted(o));let a=this.indent(e),l=await this.choiceMessage(e,t),c=()=>[this.margin[3],a+n+s,l,this.margin[1],o].filter(Boolean).join(" ");return e.role==="heading"?c():e.disabled?(AT.hasColor(l)||(l=this.styles.disabled(l)),c()):(i&&(l=this.styles.em(l)),c())}async renderChoices(){if(this.state.loading==="choices")return this.styles.warning("Loading choices");if(this.state.submitted)return"";let e=this.visible.map(async(s,o)=>await this.renderChoice(s,o)),t=await Promise.all(e);t.length||t.push(this.styles.danger("No matching choices"));let i=this.margin[0]+t.join(`
-`),n;return this.options.choicesHeader&&(n=await this.resolve(this.options.choicesHeader,this.state)),[n,i].filter(Boolean).join(`
-`)}format(){return!this.state.submitted||this.state.cancelled?"":Array.isArray(this.selected)?this.selected.map(e=>this.styles.primary(e.name)).join(", "):this.styles.primary(this.selected.name)}async render(){let{submitted:e,size:t}=this.state,i="",n=await this.header(),s=await this.prefix(),o=await this.separator(),a=await this.message();this.options.promptLine!==!1&&(i=[s,a,o,""].join(" "),this.state.prompt=i);let l=await this.format(),c=await this.error()||await this.hint(),u=await this.renderChoices(),g=await this.footer();l&&(i+=l),c&&!i.includes(c)&&(i+=" "+c),e&&!l&&!u.trim()&&this.multiple&&this.emptyError!=null&&(i+=this.styles.danger(this.emptyError)),this.clear(t),this.write([n,i,u,g].filter(Boolean).join(`
-`)),this.write(this.margin[2]),this.restore()}};bne.exports=lT});var vne=w((Sgt,Sne)=>{"use strict";var xje=pl(),Pje=(r,e)=>{let t=r.toLowerCase();return i=>{let s=i.toLowerCase().indexOf(t),o=e(i.slice(s,s+t.length));return s>=0?i.slice(0,s)+o+i.slice(s+t.length):i}},cT=class extends xje{constructor(e){super(e),this.cursorShow()}moveCursor(e){this.state.cursor+=e}dispatch(e){return this.append(e)}space(e){return this.options.multiple?super.space(e):this.append(e)}append(e){let{cursor:t,input:i}=this.state;return this.input=i.slice(0,t)+e+i.slice(t),this.moveCursor(1),this.complete()}delete(){let{cursor:e,input:t}=this.state;return t?(this.input=t.slice(0,e-1)+t.slice(e),this.moveCursor(-1),this.complete()):this.alert()}deleteForward(){let{cursor:e,input:t}=this.state;return t[e]===void 0?this.alert():(this.input=`${t}`.slice(0,e)+`${t}`.slice(e+1),this.complete())}number(e){return this.append(e)}async complete(){this.completing=!0,this.choices=await this.suggest(this.input,this.state._choices),this.state.limit=void 0,this.index=Math.min(Math.max(this.visible.length-1,0),this.index),await this.render(),this.completing=!1}suggest(e=this.input,t=this.state._choices){if(typeof this.options.suggest=="function")return this.options.suggest.call(this,e,t);let i=e.toLowerCase();return t.filter(n=>n.message.toLowerCase().includes(i))}pointer(){return""}format(){if(!this.focused)return this.input;if(this.options.multiple&&this.state.submitted)return this.selected.map(e=>this.styles.primary(e.message)).join(", ");if(this.state.submitted){let e=this.value=this.input=this.focused.value;return this.styles.primary(e)}return this.input}async render(){if(this.state.status!=="pending")return super.render();let e=this.options.highlight?this.options.highlight.bind(this):this.styles.placeholder,t=Pje(this.input,e),i=this.choices;this.choices=i.map(n=>({...n,message:t(n.message)})),await super.render(),this.choices=i}submit(){return this.options.multiple&&(this.value=this.selected.map(e=>e.name)),super.submit()}};Sne.exports=cT});var gT=w((vgt,xne)=>{"use strict";var uT=ji();xne.exports=(r,e={})=>{r.cursorHide();let{input:t="",initial:i="",pos:n,showCursor:s=!0,color:o}=e,a=o||r.styles.placeholder,l=uT.inverse(r.styles.primary),c=C=>l(r.styles.black(C)),u=t,g=" ",f=c(g);if(r.blink&&r.blink.off===!0&&(c=C=>C,f=""),s&&n===0&&i===""&&t==="")return c(g);if(s&&n===0&&(t===i||t===""))return c(i[0])+a(i.slice(1));i=uT.isPrimitive(i)?`${i}`:"",t=uT.isPrimitive(t)?`${t}`:"";let h=i&&i.startsWith(t)&&i!==t,p=h?c(i[t.length]):f;if(n!==t.length&&s===!0&&(u=t.slice(0,n)+c(t[n])+t.slice(n+1),p=""),s===!1&&(p=""),h){let C=r.styles.unstyle(u+p);return u+p+a(i.slice(C.length))}return u+p}});var wQ=w((xgt,Pne)=>{"use strict";var Dje=lo(),kje=pl(),Rje=gT(),fT=class extends kje{constructor(e){super({...e,multiple:!0}),this.type="form",this.initial=this.options.initial,this.align=[this.options.align,"right"].find(t=>t!=null),this.emptyError="",this.values={}}async reset(e){return await super.reset(),e===!0&&(this._index=this.index),this.index=this._index,this.values={},this.choices.forEach(t=>t.reset&&t.reset()),this.render()}dispatch(e){return!!e&&this.append(e)}append(e){let t=this.focused;if(!t)return this.alert();let{cursor:i,input:n}=t;return t.value=t.input=n.slice(0,i)+e+n.slice(i),t.cursor++,this.render()}delete(){let e=this.focused;if(!e||e.cursor<=0)return this.alert();let{cursor:t,input:i}=e;return e.value=e.input=i.slice(0,t-1)+i.slice(t),e.cursor--,this.render()}deleteForward(){let e=this.focused;if(!e)return this.alert();let{cursor:t,input:i}=e;if(i[t]===void 0)return this.alert();let n=`${i}`.slice(0,t)+`${i}`.slice(t+1);return e.value=e.input=n,this.render()}right(){let e=this.focused;return e?e.cursor>=e.input.length?this.alert():(e.cursor++,this.render()):this.alert()}left(){let e=this.focused;return e?e.cursor<=0?this.alert():(e.cursor--,this.render()):this.alert()}space(e,t){return this.dispatch(e,t)}number(e,t){return this.dispatch(e,t)}next(){let e=this.focused;if(!e)return this.alert();let{initial:t,input:i}=e;return t&&t.startsWith(i)&&i!==t?(e.value=e.input=t,e.cursor=e.value.length,this.render()):super.next()}prev(){let e=this.focused;return e?e.cursor===0?super.prev():(e.value=e.input="",e.cursor=0,this.render()):this.alert()}separator(){return""}format(e){return this.state.submitted?"":super.format(e)}pointer(){return""}indicator(e){return e.input?"\u29BF":"\u2299"}async choiceSeparator(e,t){let i=await this.resolve(e.separator,this.state,e,t)||":";return i?" "+this.styles.disabled(i):""}async renderChoice(e,t){await this.onChoice(e,t);let{state:i,styles:n}=this,{cursor:s,initial:o="",name:a,hint:l,input:c=""}=e,{muted:u,submitted:g,primary:f,danger:h}=n,p=l,C=this.index===t,y=e.validate||(()=>!0),B=await this.choiceSeparator(e,t),v=e.message;this.align==="right"&&(v=v.padStart(this.longest+1," ")),this.align==="left"&&(v=v.padEnd(this.longest+1," "));let D=this.values[a]=c||o,L=c?"success":"dark";await y.call(e,D,this.state)!==!0&&(L="danger");let H=n[L],j=H(await this.indicator(e,t))+(e.pad||""),$=this.indent(e),V=()=>[$,j,v+B,c,p].filter(Boolean).join(" ");if(i.submitted)return v=Dje.unstyle(v),c=g(c),p="",V();if(e.format)c=await e.format.call(this,c,e,t);else{let W=this.styles.muted;c=Rje(this,{input:c,initial:o,pos:s,showCursor:C,color:W})}return this.isValue(c)||(c=this.styles.muted(this.symbols.ellipsis)),e.result&&(this.values[a]=await e.result.call(this,D,e,t)),C&&(v=f(v)),e.error?c+=(c?" ":"")+h(e.error.trim()):e.hint&&(c+=(c?" ":"")+u(e.hint.trim())),V()}async submit(){return this.value=this.values,super.base.submit.call(this)}};Pne.exports=fT});var hT=w((Pgt,kne)=>{"use strict";var Fje=wQ(),Nje=()=>{throw new Error("expected prompt to have a custom authenticate method")},Dne=(r=Nje)=>{class e extends Fje{constructor(i){super(i)}async submit(){this.value=await r.call(this,this.values,this.state),super.base.submit.call(this)}static create(i){return Dne(i)}}return e};kne.exports=Dne()});var Nne=w((Dgt,Fne)=>{"use strict";var Lje=hT();function Tje(r,e){return r.username===this.options.username&&r.password===this.options.password}var Rne=(r=Tje)=>{let e=[{name:"username",message:"username"},{name:"password",message:"password",format(i){return this.options.showPassword?i:(this.state.submitted?this.styles.primary:this.styles.muted)(this.symbols.asterisk.repeat(i.length))}}];class t extends Lje.create(r){constructor(n){super({...n,choices:e})}static create(n){return Rne(n)}}return t};Fne.exports=Rne()});var BQ=w((kgt,Lne)=>{"use strict";var Oje=Uh(),{isPrimitive:Mje,hasColor:Kje}=ji(),pT=class extends Oje{constructor(e){super(e),this.cursorHide()}async initialize(){let e=await this.resolve(this.initial,this.state);this.input=await this.cast(e),await super.initialize()}dispatch(e){return this.isValue(e)?(this.input=e,this.submit()):this.alert()}format(e){let{styles:t,state:i}=this;return i.submitted?t.success(e):t.primary(e)}cast(e){return this.isTrue(e)}isTrue(e){return/^[ty1]/i.test(e)}isFalse(e){return/^[fn0]/i.test(e)}isValue(e){return Mje(e)&&(this.isTrue(e)||this.isFalse(e))}async hint(){if(this.state.status==="pending"){let e=await this.element("hint");return Kje(e)?e:this.styles.muted(e)}}async render(){let{input:e,size:t}=this.state,i=await this.prefix(),n=await this.separator(),s=await this.message(),o=this.styles.muted(this.default),a=[i,s,o,n].filter(Boolean).join(" ");this.state.prompt=a;let l=await this.header(),c=this.value=this.cast(e),u=await this.format(c),g=await this.error()||await this.hint(),f=await this.footer();g&&!a.includes(g)&&(u+=" "+g),a+=" "+u,this.clear(t),this.write([l,a,f].filter(Boolean).join(`
-`)),this.restore()}set value(e){super.value=e}get value(){return this.cast(super.value)}};Lne.exports=pT});var One=w((Rgt,Tne)=>{"use strict";var Uje=BQ(),dT=class extends Uje{constructor(e){super(e),this.default=this.options.default||(this.initial?"(Y/n)":"(y/N)")}};Tne.exports=dT});var Kne=w((Fgt,Mne)=>{"use strict";var Hje=pl(),Gje=wQ(),Hh=Gje.prototype,CT=class extends Hje{constructor(e){super({...e,multiple:!0}),this.align=[this.options.align,"left"].find(t=>t!=null),this.emptyError="",this.values={}}dispatch(e,t){let i=this.focused,n=i.parent||{};return!i.editable&&!n.editable&&(e==="a"||e==="i")?super[e]():Hh.dispatch.call(this,e,t)}append(e,t){return Hh.append.call(this,e,t)}delete(e,t){return Hh.delete.call(this,e,t)}space(e){return this.focused.editable?this.append(e):super.space()}number(e){return this.focused.editable?this.append(e):super.number(e)}next(){return this.focused.editable?Hh.next.call(this):super.next()}prev(){return this.focused.editable?Hh.prev.call(this):super.prev()}async indicator(e,t){let i=e.indicator||"",n=e.editable?i:super.indicator(e,t);return await this.resolve(n,this.state,e,t)||""}indent(e){return e.role==="heading"?"":e.editable?" ":"  "}async renderChoice(e,t){return e.indent="",e.editable?Hh.renderChoice.call(this,e,t):super.renderChoice(e,t)}error(){return""}footer(){return this.state.error}async validate(){let e=!0;for(let t of this.choices){if(typeof t.validate!="function"||t.role==="heading")continue;let i=t.parent?this.value[t.parent.name]:this.value;if(t.editable?i=t.value===t.name?t.initial||"":t.value:this.isDisabled(t)||(i=t.enabled===!0),e=await t.validate(i,this.state),e!==!0)break}return e!==!0&&(this.state.error=typeof e=="string"?e:"Invalid Input"),e}submit(){if(this.focused.newChoice===!0)return super.submit();if(this.choices.some(e=>e.newChoice))return this.alert();this.value={};for(let e of this.choices){let t=e.parent?this.value[e.parent.name]:this.value;if(e.role==="heading"){this.value[e.name]={};continue}e.editable?t[e.name]=e.value===e.name?e.initial||"":e.value:this.isDisabled(e)||(t[e.name]=e.enabled===!0)}return this.base.submit.call(this)}};Mne.exports=CT});var iu=w((Ngt,Une)=>{"use strict";var Yje=Uh(),jje=gT(),{isPrimitive:qje}=ji(),mT=class extends Yje{constructor(e){super(e),this.initial=qje(this.initial)?String(this.initial):"",this.initial&&this.cursorHide(),this.state.prevCursor=0,this.state.clipboard=[]}async keypress(e,t={}){let i=this.state.prevKeypress;return this.state.prevKeypress=t,this.options.multiline===!0&&t.name==="return"&&(!i||i.name!=="return")?this.append(`
-`,t):super.keypress(e,t)}moveCursor(e){this.cursor+=e}reset(){return this.input=this.value="",this.cursor=0,this.render()}dispatch(e,t){if(!e||t.ctrl||t.code)return this.alert();this.append(e)}append(e){let{cursor:t,input:i}=this.state;this.input=`${i}`.slice(0,t)+e+`${i}`.slice(t),this.moveCursor(String(e).length),this.render()}insert(e){this.append(e)}delete(){let{cursor:e,input:t}=this.state;if(e<=0)return this.alert();this.input=`${t}`.slice(0,e-1)+`${t}`.slice(e),this.moveCursor(-1),this.render()}deleteForward(){let{cursor:e,input:t}=this.state;if(t[e]===void 0)return this.alert();this.input=`${t}`.slice(0,e)+`${t}`.slice(e+1),this.render()}cutForward(){let e=this.cursor;if(this.input.length<=e)return this.alert();this.state.clipboard.push(this.input.slice(e)),this.input=this.input.slice(0,e),this.render()}cutLeft(){let e=this.cursor;if(e===0)return this.alert();let t=this.input.slice(0,e),i=this.input.slice(e),n=t.split(" ");this.state.clipboard.push(n.pop()),this.input=n.join(" "),this.cursor=this.input.length,this.input+=i,this.render()}paste(){if(!this.state.clipboard.length)return this.alert();this.insert(this.state.clipboard.pop()),this.render()}toggleCursor(){this.state.prevCursor?(this.cursor=this.state.prevCursor,this.state.prevCursor=0):(this.state.prevCursor=this.cursor,this.cursor=0),this.render()}first(){this.cursor=0,this.render()}last(){this.cursor=this.input.length-1,this.render()}next(){let e=this.initial!=null?String(this.initial):"";if(!e||!e.startsWith(this.input))return this.alert();this.input=this.initial,this.cursor=this.initial.length,this.render()}prev(){if(!this.input)return this.alert();this.reset()}backward(){return this.left()}forward(){return this.right()}right(){return this.cursor>=this.input.length?this.alert():(this.moveCursor(1),this.render())}left(){return this.cursor<=0?this.alert():(this.moveCursor(-1),this.render())}isValue(e){return!!e}async format(e=this.value){let t=await this.resolve(this.initial,this.state);return this.state.submitted?this.styles.submitted(e||t):jje(this,{input:e,initial:t,pos:this.cursor})}async render(){let e=this.state.size,t=await this.prefix(),i=await this.separator(),n=await this.message(),s=[t,n,i].filter(Boolean).join(" ");this.state.prompt=s;let o=await this.header(),a=await this.format(),l=await this.error()||await this.hint(),c=await this.footer();l&&!a.includes(l)&&(a+=" "+l),s+=" "+a,this.clear(e),this.write([o,s,c].filter(Boolean).join(`
-`)),this.restore()}};Une.exports=mT});var Gne=w((Lgt,Hne)=>{"use strict";var Jje=r=>r.filter((e,t)=>r.lastIndexOf(e)===t),QQ=r=>Jje(r).filter(Boolean);Hne.exports=(r,e={},t="")=>{let{past:i=[],present:n=""}=e,s,o;switch(r){case"prev":case"undo":return s=i.slice(0,i.length-1),o=i[i.length-1]||"",{past:QQ([t,...s]),present:o};case"next":case"redo":return s=i.slice(1),o=i[0]||"",{past:QQ([...s,t]),present:o};case"save":return{past:QQ([...i,t]),present:""};case"remove":return o=QQ(i.filter(a=>a!==t)),n="",o.length&&(n=o.pop()),{past:o,present:n};default:throw new Error(`Invalid action: "${r}"`)}}});var IT=w((Tgt,jne)=>{"use strict";var Wje=iu(),Yne=Gne(),ET=class extends Wje{constructor(e){super(e);let t=this.options.history;if(t&&t.store){let i=t.values||this.initial;this.autosave=!!t.autosave,this.store=t.store,this.data=this.store.get("values")||{past:[],present:i},this.initial=this.data.present||this.data.past[this.data.past.length-1]}}completion(e){return this.store?(this.data=Yne(e,this.data,this.input),this.data.present?(this.input=this.data.present,this.cursor=this.input.length,this.render()):this.alert()):this.alert()}altUp(){return this.completion("prev")}altDown(){return this.completion("next")}prev(){return this.save(),super.prev()}save(){!this.store||(this.data=Yne("save",this.data,this.input),this.store.set("values",this.data))}submit(){return this.store&&this.autosave===!0&&this.save(),super.submit()}};jne.exports=ET});var Jne=w((Ogt,qne)=>{"use strict";var zje=iu(),yT=class extends zje{format(){return""}};qne.exports=yT});var zne=w((Mgt,Wne)=>{"use strict";var Vje=iu(),wT=class extends Vje{constructor(e={}){super(e),this.sep=this.options.separator||/, */,this.initial=e.initial||""}split(e=this.value){return e?String(e).split(this.sep):[]}format(){let e=this.state.submitted?this.styles.primary:t=>t;return this.list.map(e).join(", ")}async submit(e){let t=this.state.error||await this.validate(this.list,this.state);return t!==!0?(this.state.error=t,super.submit()):(this.value=this.list,super.submit())}get list(){return this.split()}};Wne.exports=wT});var Xne=w((Kgt,Vne)=>{"use strict";var Xje=pl(),BT=class extends Xje{constructor(e){super({...e,multiple:!0})}};Vne.exports=BT});var bT=w((Ugt,Zne)=>{"use strict";var Zje=iu(),QT=class extends Zje{constructor(e={}){super({style:"number",...e}),this.min=this.isValue(e.min)?this.toNumber(e.min):-1/0,this.max=this.isValue(e.max)?this.toNumber(e.max):1/0,this.delay=e.delay!=null?e.delay:1e3,this.float=e.float!==!1,this.round=e.round===!0||e.float===!1,this.major=e.major||10,this.minor=e.minor||1,this.initial=e.initial!=null?e.initial:"",this.input=String(this.initial),this.cursor=this.input.length,this.cursorShow()}append(e){return!/[-+.]/.test(e)||e==="."&&this.input.includes(".")?this.alert("invalid number"):super.append(e)}number(e){return super.append(e)}next(){return this.input&&this.input!==this.initial?this.alert():this.isValue(this.initial)?(this.input=this.initial,this.cursor=String(this.initial).length,this.render()):this.alert()}up(e){let t=e||this.minor,i=this.toNumber(this.input);return i>this.max+t?this.alert():(this.input=`${i+t}`,this.render())}down(e){let t=e||this.minor,i=this.toNumber(this.input);return i<this.min-t?this.alert():(this.input=`${i-t}`,this.render())}shiftDown(){return this.down(this.major)}shiftUp(){return this.up(this.major)}format(e=this.input){return typeof this.options.format=="function"?this.options.format.call(this,e):this.styles.info(e)}toNumber(e=""){return this.float?+e:Math.round(+e)}isValue(e){return/^[-+]?[0-9]+((\.)|(\.[0-9]+))?$/.test(e)}submit(){let e=[this.input,this.initial].find(t=>this.isValue(t));return this.value=this.toNumber(e||0),super.submit()}};Zne.exports=QT});var $ne=w((Hgt,_ne)=>{_ne.exports=bT()});var tse=w((Ggt,ese)=>{"use strict";var _je=iu(),ST=class extends _je{constructor(e){super(e),this.cursorShow()}format(e=this.input){return this.keypressed?(this.state.submitted?this.styles.primary:this.styles.muted)(this.symbols.asterisk.repeat(e.length)):""}};ese.exports=ST});var nse=w((Ygt,ise)=>{"use strict";var $je=lo(),eqe=Lm(),rse=ji(),vT=class extends eqe{constructor(e={}){super(e),this.widths=[].concat(e.messageWidth||50),this.align=[].concat(e.align||"left"),this.linebreak=e.linebreak||!1,this.edgeLength=e.edgeLength||3,this.newline=e.newline||`
-   `;let t=e.startNumber||1;typeof this.scale=="number"&&(this.scaleKey=!1,this.scale=Array(this.scale).fill(0).map((i,n)=>({name:n+t})))}async reset(){return this.tableized=!1,await super.reset(),this.render()}tableize(){if(this.tableized===!0)return;this.tableized=!0;let e=0;for(let t of this.choices){e=Math.max(e,t.message.length),t.scaleIndex=t.initial||2,t.scale=[];for(let i=0;i<this.scale.length;i++)t.scale.push({index:i})}this.widths[0]=Math.min(this.widths[0],e+3)}async dispatch(e,t){if(this.multiple)return this[t.name]?await this[t.name](e,t):await super.dispatch(e,t);this.alert()}heading(e,t,i){return this.styles.strong(e)}separator(){return this.styles.muted(this.symbols.ellipsis)}right(){let e=this.focused;return e.scaleIndex>=this.scale.length-1?this.alert():(e.scaleIndex++,this.render())}left(){let e=this.focused;return e.scaleIndex<=0?this.alert():(e.scaleIndex--,this.render())}indent(){return""}format(){return this.state.submitted?this.choices.map(t=>this.styles.info(t.index)).join(", "):""}pointer(){return""}renderScaleKey(){if(this.scaleKey===!1||this.state.submitted)return"";let e=this.scale.map(i=>`   ${i.name} - ${i.message}`);return["",...e].map(i=>this.styles.muted(i)).join(`
-`)}renderScaleHeading(e){let t=this.scale.map(l=>l.name);typeof this.options.renderScaleHeading=="function"&&(t=this.options.renderScaleHeading.call(this,e));let i=this.scaleLength-t.join("").length,n=Math.round(i/(t.length-1)),o=t.map(l=>this.styles.strong(l)).join(" ".repeat(n)),a=" ".repeat(this.widths[0]);return this.margin[3]+a+this.margin[1]+o}scaleIndicator(e,t,i){if(typeof this.options.scaleIndicator=="function")return this.options.scaleIndicator.call(this,e,t,i);let n=e.scaleIndex===t.index;return t.disabled?this.styles.hint(this.symbols.radio.disabled):n?this.styles.success(this.symbols.radio.on):this.symbols.radio.off}renderScale(e,t){let i=e.scale.map(s=>this.scaleIndicator(e,s,t)),n=this.term==="Hyper"?"":" ";return i.join(n+this.symbols.line.repeat(this.edgeLength))}async renderChoice(e,t){await this.onChoice(e,t);let i=this.index===t,n=await this.pointer(e,t),s=await e.hint;s&&!rse.hasColor(s)&&(s=this.styles.muted(s));let o=p=>this.margin[3]+p.replace(/\s+$/,"").padEnd(this.widths[0]," "),a=this.newline,l=this.indent(e),c=await this.resolve(e.message,this.state,e,t),u=await this.renderScale(e,t),g=this.margin[1]+this.margin[3];this.scaleLength=$je.unstyle(u).length,this.widths[0]=Math.min(this.widths[0],this.width-this.scaleLength-g.length);let h=rse.wordWrap(c,{width:this.widths[0],newline:a}).split(`
-`).map(p=>o(p)+this.margin[1]);return i&&(u=this.styles.info(u),h=h.map(p=>this.styles.info(p))),h[0]+=u,this.linebreak&&h.push(""),[l+n,h.join(`
-`)].filter(Boolean)}async renderChoices(){if(this.state.submitted)return"";this.tableize();let e=this.visible.map(async(n,s)=>await this.renderChoice(n,s)),t=await Promise.all(e),i=await this.renderScaleHeading();return this.margin[0]+[i,...t.map(n=>n.join(" "))].join(`
-`)}async render(){let{submitted:e,size:t}=this.state,i=await this.prefix(),n=await this.separator(),s=await this.message(),o="";this.options.promptLine!==!1&&(o=[i,s,n,""].join(" "),this.state.prompt=o);let a=await this.header(),l=await this.format(),c=await this.renderScaleKey(),u=await this.error()||await this.hint(),g=await this.renderChoices(),f=await this.footer(),h=this.emptyError;l&&(o+=l),u&&!o.includes(u)&&(o+=" "+u),e&&!l&&!g.trim()&&this.multiple&&h!=null&&(o+=this.styles.danger(h)),this.clear(t),this.write([a,o,c,g,f].filter(Boolean).join(`
-`)),this.state.submitted||this.write(this.margin[2]),this.restore()}submit(){this.value={};for(let e of this.choices)this.value[e.name]=e.scaleIndex;return this.base.submit.call(this)}};ise.exports=vT});var ase=w((jgt,ose)=>{"use strict";var sse=lo(),tqe=(r="")=>typeof r=="string"?r.replace(/^['"]|['"]$/g,""):"",PT=class{constructor(e){this.name=e.key,this.field=e.field||{},this.value=tqe(e.initial||this.field.initial||""),this.message=e.message||this.name,this.cursor=0,this.input="",this.lines=[]}},rqe=async(r={},e={},t=i=>i)=>{let i=new Set,n=r.fields||[],s=r.template,o=[],a=[],l=[],c=1;typeof s=="function"&&(s=await s());let u=-1,g=()=>s[++u],f=()=>s[u+1],h=p=>{p.line=c,o.push(p)};for(h({type:"bos",value:""});u<s.length-1;){let p=g();if(/^[^\S\n ]$/.test(p)){h({type:"text",value:p});continue}if(p===`
-`){h({type:"newline",value:p}),c++;continue}if(p==="\\"){p+=g(),h({type:"text",value:p});continue}if((p==="$"||p==="#"||p==="{")&&f()==="{"){p+=g();let B={type:"template",open:p,inner:"",close:"",value:p},v;for(;v=g();){if(v==="}"){f()==="}"&&(v+=g()),B.value+=v,B.close=v;break}v===":"?(B.initial="",B.key=B.inner):B.initial!==void 0&&(B.initial+=v),B.value+=v,B.inner+=v}B.template=B.open+(B.initial||B.inner)+B.close,B.key=B.key||B.inner,e.hasOwnProperty(B.key)&&(B.initial=e[B.key]),B=t(B),h(B),l.push(B.key),i.add(B.key);let D=a.find(L=>L.name===B.key);B.field=n.find(L=>L.name===B.key),D||(D=new PT(B),a.push(D)),D.lines.push(B.line-1);continue}let C=o[o.length-1];C.type==="text"&&C.line===c?C.value+=p:h({type:"text",value:p})}return h({type:"eos",value:""}),{input:s,tabstops:o,unique:i,keys:l,items:a}};ose.exports=async r=>{let e=r.options,t=new Set(e.required===!0?[]:e.required||[]),i={...e.values,...e.initial},{tabstops:n,items:s,keys:o}=await rqe(e,i),a=xT("result",r,e),l=xT("format",r,e),c=xT("validate",r,e,!0),u=r.isValue.bind(r);return async(g={},f=!1)=>{let h=0;g.required=t,g.items=s,g.keys=o,g.output="";let p=async(v,D,L,H)=>{let j=await c(v,D,L,H);return j===!1?"Invalid field "+L.name:j};for(let v of n){let D=v.value,L=v.key;if(v.type!=="template"){D&&(g.output+=D);continue}if(v.type==="template"){let H=s.find(_=>_.name===L);e.required===!0&&g.required.add(H.name);let j=[H.input,g.values[H.value],H.value,D].find(u),V=(H.field||{}).message||v.inner;if(f){let _=await p(g.values[L],g,H,h);if(_&&typeof _=="string"||_===!1){g.invalid.set(L,_);continue}g.invalid.delete(L);let A=await a(g.values[L],g,H,h);g.output+=sse.unstyle(A);continue}H.placeholder=!1;let W=D;D=await l(D,g,H,h),j!==D?(g.values[L]=j,D=r.styles.typing(j),g.missing.delete(V)):(g.values[L]=void 0,j=`<${V}>`,D=r.styles.primary(j),H.placeholder=!0,g.required.has(L)&&g.missing.add(V)),g.missing.has(V)&&g.validating&&(D=r.styles.warning(j)),g.invalid.has(L)&&g.validating&&(D=r.styles.danger(j)),h===g.index&&(W!==D?D=r.styles.underline(D):D=r.styles.heading(sse.unstyle(D))),h++}D&&(g.output+=D)}let C=g.output.split(`
-`).map(v=>" "+v),y=s.length,B=0;for(let v of s)g.invalid.has(v.name)&&v.lines.forEach(D=>{C[D][0]===" "&&(C[D]=g.styles.danger(g.symbols.bullet)+C[D].slice(1))}),r.isValue(g.values[v.name])&&B++;return g.completed=(B/y*100).toFixed(0),g.output=C.join(`
-`),g.output}};function xT(r,e,t,i){return(n,s,o,a)=>typeof o.field[r]=="function"?o.field[r].call(e,n,s,o,a):[i,n].find(l=>e.isValue(l))}});var lse=w((qgt,Ase)=>{"use strict";var iqe=lo(),nqe=ase(),sqe=Uh(),DT=class extends sqe{constructor(e){super(e),this.cursorHide(),this.reset(!0)}async initialize(){this.interpolate=await nqe(this),await super.initialize()}async reset(e){this.state.keys=[],this.state.invalid=new Map,this.state.missing=new Set,this.state.completed=0,this.state.values={},e!==!0&&(await this.initialize(),await this.render())}moveCursor(e){let t=this.getItem();this.cursor+=e,t.cursor+=e}dispatch(e,t){if(!t.code&&!t.ctrl&&e!=null&&this.getItem()){this.append(e,t);return}this.alert()}append(e,t){let i=this.getItem(),n=i.input.slice(0,this.cursor),s=i.input.slice(this.cursor);this.input=i.input=`${n}${e}${s}`,this.moveCursor(1),this.render()}delete(){let e=this.getItem();if(this.cursor<=0||!e.input)return this.alert();let t=e.input.slice(this.cursor),i=e.input.slice(0,this.cursor-1);this.input=e.input=`${i}${t}`,this.moveCursor(-1),this.render()}increment(e){return e>=this.state.keys.length-1?0:e+1}decrement(e){return e<=0?this.state.keys.length-1:e-1}first(){this.state.index=0,this.render()}last(){this.state.index=this.state.keys.length-1,this.render()}right(){if(this.cursor>=this.input.length)return this.alert();this.moveCursor(1),this.render()}left(){if(this.cursor<=0)return this.alert();this.moveCursor(-1),this.render()}prev(){this.state.index=this.decrement(this.state.index),this.getItem(),this.render()}next(){this.state.index=this.increment(this.state.index),this.getItem(),this.render()}up(){this.prev()}down(){this.next()}format(e){let t=this.state.completed<100?this.styles.warning:this.styles.success;return this.state.submitted===!0&&this.state.completed!==100&&(t=this.styles.danger),t(`${this.state.completed}% completed`)}async render(){let{index:e,keys:t=[],submitted:i,size:n}=this.state,s=[this.options.newline,`
-`].find(v=>v!=null),o=await this.prefix(),a=await this.separator(),l=await this.message(),c=[o,l,a].filter(Boolean).join(" ");this.state.prompt=c;let u=await this.header(),g=await this.error()||"",f=await this.hint()||"",h=i?"":await this.interpolate(this.state),p=this.state.key=t[e]||"",C=await this.format(p),y=await this.footer();C&&(c+=" "+C),f&&!C&&this.state.completed===0&&(c+=" "+f),this.clear(n);let B=[u,c,h,y,g.trim()];this.write(B.filter(Boolean).join(s)),this.restore()}getItem(e){let{items:t,keys:i,index:n}=this.state,s=t.find(o=>o.name===i[n]);return s&&s.input!=null&&(this.input=s.input,this.cursor=s.cursor),s}async submit(){typeof this.interpolate!="function"&&await this.initialize(),await this.interpolate(this.state,!0);let{invalid:e,missing:t,output:i,values:n}=this.state;if(e.size){let a="";for(let[l,c]of e)a+=`Invalid ${l}: ${c}
-`;return this.state.error=a,super.submit()}if(t.size)return this.state.error="Required: "+[...t.keys()].join(", "),super.submit();let o=iqe.unstyle(i).split(`
-`).map(a=>a.slice(1)).join(`
-`);return this.value={values:n,result:o},super.submit()}};Ase.exports=DT});var use=w((Jgt,cse)=>{"use strict";var oqe="(Use <shift>+<up/down> to sort)",aqe=pl(),kT=class extends aqe{constructor(e){super({...e,reorder:!1,sort:!0,multiple:!0}),this.state.hint=[this.options.hint,oqe].find(this.isValue.bind(this))}indicator(){return""}async renderChoice(e,t){let i=await super.renderChoice(e,t),n=this.symbols.identicalTo+" ",s=this.index===t&&this.sorting?this.styles.muted(n):"  ";return this.options.drag===!1&&(s=""),this.options.numbered===!0?s+`${t+1} - `+i:s+i}get selected(){return this.choices}submit(){return this.value=this.choices.map(e=>e.value),super.submit()}};cse.exports=kT});var fse=w((Wgt,gse)=>{"use strict";var Aqe=Lm(),RT=class extends Aqe{constructor(e={}){if(super(e),this.emptyError=e.emptyError||"No items were selected",this.term=process.env.TERM_PROGRAM,!this.options.header){let t=["","4 - Strongly Agree","3 - Agree","2 - Neutral","1 - Disagree","0 - Strongly Disagree",""];t=t.map(i=>this.styles.muted(i)),this.state.header=t.join(`
-   `)}}async toChoices(...e){if(this.createdScales)return!1;this.createdScales=!0;let t=await super.toChoices(...e);for(let i of t)i.scale=lqe(5,this.options),i.scaleIdx=2;return t}dispatch(){this.alert()}space(){let e=this.focused,t=e.scale[e.scaleIdx],i=t.selected;return e.scale.forEach(n=>n.selected=!1),t.selected=!i,this.render()}indicator(){return""}pointer(){return""}separator(){return this.styles.muted(this.symbols.ellipsis)}right(){let e=this.focused;return e.scaleIdx>=e.scale.length-1?this.alert():(e.scaleIdx++,this.render())}left(){let e=this.focused;return e.scaleIdx<=0?this.alert():(e.scaleIdx--,this.render())}indent(){return"   "}async renderChoice(e,t){await this.onChoice(e,t);let i=this.index===t,n=this.term==="Hyper",s=n?9:8,o=n?"":" ",a=this.symbols.line.repeat(s),l=" ".repeat(s+(n?0:1)),c=D=>(D?this.styles.success("\u25C9"):"\u25EF")+o,u=t+1+".",g=i?this.styles.heading:this.styles.noop,f=await this.resolve(e.message,this.state,e,t),h=this.indent(e),p=h+e.scale.map((D,L)=>c(L===e.scaleIdx)).join(a),C=D=>D===e.scaleIdx?g(D):D,y=h+e.scale.map((D,L)=>C(L)).join(l),B=()=>[u,f].filter(Boolean).join(" "),v=()=>[B(),p,y," "].filter(Boolean).join(`
-`);return i&&(p=this.styles.cyan(p),y=this.styles.cyan(y)),v()}async renderChoices(){if(this.state.submitted)return"";let e=this.visible.map(async(i,n)=>await this.renderChoice(i,n)),t=await Promise.all(e);return t.length||t.push(this.styles.danger("No matching choices")),t.join(`
-`)}format(){return this.state.submitted?this.choices.map(t=>this.styles.info(t.scaleIdx)).join(", "):""}async render(){let{submitted:e,size:t}=this.state,i=await this.prefix(),n=await this.separator(),s=await this.message(),o=[i,s,n].filter(Boolean).join(" ");this.state.prompt=o;let a=await this.header(),l=await this.format(),c=await this.error()||await this.hint(),u=await this.renderChoices(),g=await this.footer();(l||!c)&&(o+=" "+l),c&&!o.includes(c)&&(o+=" "+c),e&&!l&&!u&&this.multiple&&this.type!=="form"&&(o+=this.styles.danger(this.emptyError)),this.clear(t),this.write([o,a,u,g].filter(Boolean).join(`
-`)),this.restore()}submit(){this.value={};for(let e of this.choices)this.value[e.name]=e.scaleIdx;return this.base.submit.call(this)}};function lqe(r,e={}){if(Array.isArray(e.scale))return e.scale.map(i=>({...i}));let t=[];for(let i=1;i<r+1;i++)t.push({i,selected:!1});return t}gse.exports=RT});var pse=w((zgt,hse)=>{hse.exports=IT()});var Cse=w((Vgt,dse)=>{"use strict";var cqe=BQ(),FT=class extends cqe{async initialize(){await super.initialize(),this.value=this.initial=!!this.options.initial,this.disabled=this.options.disabled||"no",this.enabled=this.options.enabled||"yes",await this.render()}reset(){this.value=this.initial,this.render()}delete(){this.alert()}toggle(){this.value=!this.value,this.render()}enable(){if(this.value===!0)return this.alert();this.value=!0,this.render()}disable(){if(this.value===!1)return this.alert();this.value=!1,this.render()}up(){this.toggle()}down(){this.toggle()}right(){this.toggle()}left(){this.toggle()}next(){this.toggle()}prev(){this.toggle()}dispatch(e="",t){switch(e.toLowerCase()){case" ":return this.toggle();case"1":case"y":case"t":return this.enable();case"0":case"n":case"f":return this.disable();default:return this.alert()}}format(){let e=i=>this.styles.primary.underline(i);return[this.value?this.disabled:e(this.disabled),this.value?e(this.enabled):this.enabled].join(this.styles.muted(" / "))}async render(){let{size:e}=this.state,t=await this.header(),i=await this.prefix(),n=await this.separator(),s=await this.message(),o=await this.format(),a=await this.error()||await this.hint(),l=await this.footer(),c=[i,s,n,o].join(" ");this.state.prompt=c,a&&!c.includes(a)&&(c+=" "+a),this.clear(e),this.write([t,c,l].filter(Boolean).join(`
-`)),this.write(this.margin[2]),this.restore()}};dse.exports=FT});var Ese=w((Xgt,mse)=>{"use strict";var uqe=pl(),NT=class extends uqe{constructor(e){if(super(e),typeof this.options.correctChoice!="number"||this.options.correctChoice<0)throw new Error("Please specify the index of the correct answer from the list of choices")}async toChoices(e,t){let i=await super.toChoices(e,t);if(i.length<2)throw new Error("Please give at least two choices to the user");if(this.options.correctChoice>i.length)throw new Error("Please specify the index of the correct answer from the list of choices");return i}check(e){return e.index===this.options.correctChoice}async result(e){return{selectedAnswer:e,correctAnswer:this.options.choices[this.options.correctChoice].value,correct:await this.check(this.state)}}};mse.exports=NT});var yse=w(LT=>{"use strict";var Ise=ji(),ui=(r,e)=>{Ise.defineExport(LT,r,e),Ise.defineExport(LT,r.toLowerCase(),e)};ui("AutoComplete",()=>vne());ui("BasicAuth",()=>Nne());ui("Confirm",()=>One());ui("Editable",()=>Kne());ui("Form",()=>wQ());ui("Input",()=>IT());ui("Invisible",()=>Jne());ui("List",()=>zne());ui("MultiSelect",()=>Xne());ui("Numeral",()=>$ne());ui("Password",()=>tse());ui("Scale",()=>nse());ui("Select",()=>pl());ui("Snippet",()=>lse());ui("Sort",()=>use());ui("Survey",()=>fse());ui("Text",()=>pse());ui("Toggle",()=>Cse());ui("Quiz",()=>Ese())});var Bse=w((_gt,wse)=>{wse.exports={ArrayPrompt:Lm(),AuthPrompt:hT(),BooleanPrompt:BQ(),NumberPrompt:bT(),StringPrompt:iu()}});var Om=w(($gt,bse)=>{"use strict";var Qse=J("assert"),OT=J("events"),dl=ji(),uo=class extends OT{constructor(e,t){super(),this.options=dl.merge({},e),this.answers={...t}}register(e,t){if(dl.isObject(e)){for(let n of Object.keys(e))this.register(n,e[n]);return this}Qse.equal(typeof t,"function","expected a function");let i=e.toLowerCase();return t.prototype instanceof this.Prompt?this.prompts[i]=t:this.prompts[i]=t(this.Prompt,this),this}async prompt(e=[]){for(let t of[].concat(e))try{typeof t=="function"&&(t=await t.call(this)),await this.ask(dl.merge({},this.options,t))}catch(i){return Promise.reject(i)}return this.answers}async ask(e){typeof e=="function"&&(e=await e.call(this));let t=dl.merge({},this.options,e),{type:i,name:n}=e,{set:s,get:o}=dl;if(typeof i=="function"&&(i=await i.call(this,e,this.answers)),!i)return this.answers[n];Qse(this.prompts[i],`Prompt "${i}" is not registered`);let a=new this.prompts[i](t),l=o(this.answers,n);a.state.answers=this.answers,a.enquirer=this,n&&a.on("submit",u=>{this.emit("answer",n,u,a),s(this.answers,n,u)});let c=a.emit.bind(a);return a.emit=(...u)=>(this.emit.call(this,...u),c(...u)),this.emit("prompt",a,this),t.autofill&&l!=null?(a.value=a.input=l,t.autofill==="show"&&await a.submit()):l=a.value=await a.run(),l}use(e){return e.call(this,this),this}set Prompt(e){this._Prompt=e}get Prompt(){return this._Prompt||this.constructor.Prompt}get prompts(){return this.constructor.prompts}static set Prompt(e){this._Prompt=e}static get Prompt(){return this._Prompt||Uh()}static get prompts(){return yse()}static get types(){return Bse()}static get prompt(){let e=(t,...i)=>{let n=new this(...i),s=n.emit.bind(n);return n.emit=(...o)=>(e.emit(...o),s(...o)),n.prompt(t)};return dl.mixinEmitter(e,new OT),e}};dl.mixinEmitter(uo,new OT);var TT=uo.prompts;for(let r of Object.keys(TT)){let e=r.toLowerCase(),t=i=>new TT[r](i).run();uo.prompt[e]=t,uo[e]=t,uo[r]||Reflect.defineProperty(uo,r,{get:()=>TT[r]})}var Tm=r=>{dl.defineExport(uo,r,()=>uo.types[r])};Tm("ArrayPrompt");Tm("AuthPrompt");Tm("BooleanPrompt");Tm("NumberPrompt");Tm("StringPrompt");bse.exports=uo});var Lse=w((Uft,Nse)=>{function dqe(r,e){for(var t=-1,i=r==null?0:r.length;++t<i&&e(r[t],t,r)!==!1;);return r}Nse.exports=dqe});var Yh=w((Hft,Tse)=>{var Cqe=K0(),mqe=yh();function Eqe(r,e,t,i){var n=!t;t||(t={});for(var s=-1,o=e.length;++s<o;){var a=e[s],l=i?i(t[a],r[a],a,t,r):void 0;l===void 0&&(l=r[a]),n?mqe(t,a,l):Cqe(t,a,l)}return t}Tse.exports=Eqe});var Mse=w((Gft,Ose)=>{var Iqe=Yh(),yqe=Ph();function wqe(r,e){return r&&Iqe(e,yqe(e),r)}Ose.exports=wqe});var Use=w((Yft,Kse)=>{function Bqe(r){var e=[];if(r!=null)for(var t in Object(r))e.push(t);return e}Kse.exports=Bqe});var Gse=w((jft,Hse)=>{var Qqe=bn(),bqe=rQ(),Sqe=Use(),vqe=Object.prototype,xqe=vqe.hasOwnProperty;function Pqe(r){if(!Qqe(r))return Sqe(r);var e=bqe(r),t=[];for(var i in r)i=="constructor"&&(e||!xqe.call(r,i))||t.push(i);return t}Hse.exports=Pqe});var jh=w((qft,Yse)=>{var Dqe=aL(),kqe=Gse(),Rqe=cm();function Fqe(r){return Rqe(r)?Dqe(r,!0):kqe(r)}Yse.exports=Fqe});var qse=w((Jft,jse)=>{var Nqe=Yh(),Lqe=jh();function Tqe(r,e){return r&&Nqe(e,Lqe(e),r)}jse.exports=Tqe});var YT=w((Hm,qh)=>{var Oqe=Es(),Vse=typeof Hm=="object"&&Hm&&!Hm.nodeType&&Hm,Jse=Vse&&typeof qh=="object"&&qh&&!qh.nodeType&&qh,Mqe=Jse&&Jse.exports===Vse,Wse=Mqe?Oqe.Buffer:void 0,zse=Wse?Wse.allocUnsafe:void 0;function Kqe(r,e){if(e)return r.slice();var t=r.length,i=zse?zse(t):new r.constructor(t);return r.copy(i),i}qh.exports=Kqe});var jT=w((Wft,Xse)=>{function Uqe(r,e){var t=-1,i=r.length;for(e||(e=Array(i));++t<i;)e[t]=r[t];return e}Xse.exports=Uqe});var _se=w((zft,Zse)=>{var Hqe=Yh(),Gqe=nQ();function Yqe(r,e){return Hqe(r,Gqe(r),e)}Zse.exports=Yqe});var SQ=w((Vft,$se)=>{var jqe=AL(),qqe=jqe(Object.getPrototypeOf,Object);$se.exports=qqe});var qT=w((Xft,eoe)=>{var Jqe=H0(),Wqe=SQ(),zqe=nQ(),Vqe=hL(),Xqe=Object.getOwnPropertySymbols,Zqe=Xqe?function(r){for(var e=[];r;)Jqe(e,zqe(r)),r=Wqe(r);return e}:Vqe;eoe.exports=Zqe});var roe=w((Zft,toe)=>{var _qe=Yh(),$qe=qT();function eJe(r,e){return _qe(r,$qe(r),e)}toe.exports=eJe});var noe=w((_ft,ioe)=>{var tJe=fL(),rJe=qT(),iJe=jh();function nJe(r){return tJe(r,iJe,rJe)}ioe.exports=nJe});var ooe=w(($ft,soe)=>{var sJe=Object.prototype,oJe=sJe.hasOwnProperty;function aJe(r){var e=r.length,t=new r.constructor(e);return e&&typeof r[0]=="string"&&oJe.call(r,"index")&&(t.index=r.index,t.input=r.input),t}soe.exports=aJe});var vQ=w((eht,Aoe)=>{var aoe=uL();function AJe(r){var e=new r.constructor(r.byteLength);return new aoe(e).set(new aoe(r)),e}Aoe.exports=AJe});var coe=w((tht,loe)=>{var lJe=vQ();function cJe(r,e){var t=e?lJe(r.buffer):r.buffer;return new r.constructor(t,r.byteOffset,r.byteLength)}loe.exports=cJe});var goe=w((rht,uoe)=>{var uJe=/\w*$/;function gJe(r){var e=new r.constructor(r.source,uJe.exec(r));return e.lastIndex=r.lastIndex,e}uoe.exports=gJe});var Coe=w((iht,doe)=>{var foe=xc(),hoe=foe?foe.prototype:void 0,poe=hoe?hoe.valueOf:void 0;function fJe(r){return poe?Object(poe.call(r)):{}}doe.exports=fJe});var JT=w((nht,moe)=>{var hJe=vQ();function pJe(r,e){var t=e?hJe(r.buffer):r.buffer;return new r.constructor(t,r.byteOffset,r.length)}moe.exports=pJe});var Ioe=w((sht,Eoe)=>{var dJe=vQ(),CJe=coe(),mJe=goe(),EJe=Coe(),IJe=JT(),yJe="[object Boolean]",wJe="[object Date]",BJe="[object Map]",QJe="[object Number]",bJe="[object RegExp]",SJe="[object Set]",vJe="[object String]",xJe="[object Symbol]",PJe="[object ArrayBuffer]",DJe="[object DataView]",kJe="[object Float32Array]",RJe="[object Float64Array]",FJe="[object Int8Array]",NJe="[object Int16Array]",LJe="[object Int32Array]",TJe="[object Uint8Array]",OJe="[object Uint8ClampedArray]",MJe="[object Uint16Array]",KJe="[object Uint32Array]";function UJe(r,e,t){var i=r.constructor;switch(e){case PJe:return dJe(r);case yJe:case wJe:return new i(+r);case DJe:return CJe(r,t);case kJe:case RJe:case FJe:case NJe:case LJe:case TJe:case OJe:case MJe:case KJe:return IJe(r,t);case BJe:return new i;case QJe:case vJe:return new i(r);case bJe:return mJe(r);case SJe:return new i;case xJe:return EJe(r)}}Eoe.exports=UJe});var Boe=w((oht,woe)=>{var HJe=bn(),yoe=Object.create,GJe=function(){function r(){}return function(e){if(!HJe(e))return{};if(yoe)return yoe(e);r.prototype=e;var t=new r;return r.prototype=void 0,t}}();woe.exports=GJe});var WT=w((aht,Qoe)=>{var YJe=Boe(),jJe=SQ(),qJe=rQ();function JJe(r){return typeof r.constructor=="function"&&!qJe(r)?YJe(jJe(r)):{}}Qoe.exports=JJe});var Soe=w((Aht,boe)=>{var WJe=gm(),zJe=Jo(),VJe="[object Map]";function XJe(r){return zJe(r)&&WJe(r)==VJe}boe.exports=XJe});var Doe=w((lht,Poe)=>{var ZJe=Soe(),_Je=$0(),voe=eQ(),xoe=voe&&voe.isMap,$Je=xoe?_Je(xoe):ZJe;Poe.exports=$Je});var Roe=w((cht,koe)=>{var eWe=gm(),tWe=Jo(),rWe="[object Set]";function iWe(r){return tWe(r)&&eWe(r)==rWe}koe.exports=iWe});var Toe=w((uht,Loe)=>{var nWe=Roe(),sWe=$0(),Foe=eQ(),Noe=Foe&&Foe.isSet,oWe=Noe?sWe(Noe):nWe;Loe.exports=oWe});var Hoe=w((ght,Uoe)=>{var aWe=um(),AWe=Lse(),lWe=K0(),cWe=Mse(),uWe=qse(),gWe=YT(),fWe=jT(),hWe=_se(),pWe=roe(),dWe=pL(),CWe=noe(),mWe=gm(),EWe=ooe(),IWe=Ioe(),yWe=WT(),wWe=bs(),BWe=am(),QWe=Doe(),bWe=bn(),SWe=Toe(),vWe=Ph(),xWe=jh(),PWe=1,DWe=2,kWe=4,Ooe="[object Arguments]",RWe="[object Array]",FWe="[object Boolean]",NWe="[object Date]",LWe="[object Error]",Moe="[object Function]",TWe="[object GeneratorFunction]",OWe="[object Map]",MWe="[object Number]",Koe="[object Object]",KWe="[object RegExp]",UWe="[object Set]",HWe="[object String]",GWe="[object Symbol]",YWe="[object WeakMap]",jWe="[object ArrayBuffer]",qWe="[object DataView]",JWe="[object Float32Array]",WWe="[object Float64Array]",zWe="[object Int8Array]",VWe="[object Int16Array]",XWe="[object Int32Array]",ZWe="[object Uint8Array]",_We="[object Uint8ClampedArray]",$We="[object Uint16Array]",e4e="[object Uint32Array]",ur={};ur[Ooe]=ur[RWe]=ur[jWe]=ur[qWe]=ur[FWe]=ur[NWe]=ur[JWe]=ur[WWe]=ur[zWe]=ur[VWe]=ur[XWe]=ur[OWe]=ur[MWe]=ur[Koe]=ur[KWe]=ur[UWe]=ur[HWe]=ur[GWe]=ur[ZWe]=ur[_We]=ur[$We]=ur[e4e]=!0;ur[LWe]=ur[Moe]=ur[YWe]=!1;function xQ(r,e,t,i,n,s){var o,a=e&PWe,l=e&DWe,c=e&kWe;if(t&&(o=n?t(r,i,n,s):t(r)),o!==void 0)return o;if(!bWe(r))return r;var u=wWe(r);if(u){if(o=EWe(r),!a)return fWe(r,o)}else{var g=mWe(r),f=g==Moe||g==TWe;if(BWe(r))return gWe(r,a);if(g==Koe||g==Ooe||f&&!n){if(o=l||f?{}:yWe(r),!a)return l?pWe(r,uWe(o,r)):hWe(r,cWe(o,r))}else{if(!ur[g])return n?r:{};o=IWe(r,g,a)}}s||(s=new aWe);var h=s.get(r);if(h)return h;s.set(r,o),SWe(r)?r.forEach(function(y){o.add(xQ(y,e,t,y,r,s))}):QWe(r)&&r.forEach(function(y,B){o.set(B,xQ(y,e,t,B,r,s))});var p=c?l?CWe:dWe:l?xWe:vWe,C=u?void 0:p(r);return AWe(C||r,function(y,B){C&&(B=y,y=r[B]),lWe(o,B,xQ(y,e,t,B,r,s))}),o}Uoe.exports=xQ});var zT=w((fht,Goe)=>{var t4e=Hoe(),r4e=1,i4e=4;function n4e(r){return t4e(r,r4e|i4e)}Goe.exports=n4e});var joe=w((hht,Yoe)=>{var s4e=KN();function o4e(r,e,t){return r==null?r:s4e(r,e,t)}Yoe.exports=o4e});var Voe=w((Iht,zoe)=>{function a4e(r){var e=r==null?0:r.length;return e?r[e-1]:void 0}zoe.exports=a4e});var Zoe=w((yht,Xoe)=>{var A4e=em(),l4e=HR();function c4e(r,e){return e.length<2?r:A4e(r,l4e(e,0,-1))}Xoe.exports=c4e});var $oe=w((wht,_oe)=>{var u4e=Ih(),g4e=Voe(),f4e=Zoe(),h4e=Wc();function p4e(r,e){return e=u4e(e,r),r=f4e(r,e),r==null||delete r[h4e(g4e(e))]}_oe.exports=p4e});var tae=w((Bht,eae)=>{var d4e=$oe();function C4e(r,e){return r==null?!0:d4e(r,e)}eae.exports=C4e});var oae=w((Zht,I4e)=>{I4e.exports={name:"@yarnpkg/cli",version:"3.5.0",license:"BSD-2-Clause",main:"./sources/index.ts",dependencies:{"@yarnpkg/core":"workspace:^","@yarnpkg/fslib":"workspace:^","@yarnpkg/libzip":"workspace:^","@yarnpkg/parsers":"workspace:^","@yarnpkg/plugin-compat":"workspace:^","@yarnpkg/plugin-dlx":"workspace:^","@yarnpkg/plugin-essentials":"workspace:^","@yarnpkg/plugin-file":"workspace:^","@yarnpkg/plugin-git":"workspace:^","@yarnpkg/plugin-github":"workspace:^","@yarnpkg/plugin-http":"workspace:^","@yarnpkg/plugin-init":"workspace:^","@yarnpkg/plugin-link":"workspace:^","@yarnpkg/plugin-nm":"workspace:^","@yarnpkg/plugin-npm":"workspace:^","@yarnpkg/plugin-npm-cli":"workspace:^","@yarnpkg/plugin-pack":"workspace:^","@yarnpkg/plugin-patch":"workspace:^","@yarnpkg/plugin-pnp":"workspace:^","@yarnpkg/plugin-pnpm":"workspace:^","@yarnpkg/shell":"workspace:^",chalk:"^3.0.0","ci-info":"^3.2.0",clipanion:"3.2.0-rc.4",semver:"^7.1.2",tslib:"^1.13.0",typanion:"^3.3.0",yup:"^0.32.9"},devDependencies:{"@types/semver":"^7.1.0","@types/yup":"^0","@yarnpkg/builder":"workspace:^","@yarnpkg/monorepo":"workspace:^","@yarnpkg/pnpify":"workspace:^",micromatch:"^4.0.2"},peerDependencies:{"@yarnpkg/core":"workspace:^"},scripts:{postpack:"rm -rf lib",prepack:'run build:compile "$(pwd)"',"build:cli+hook":"run build:pnp:hook && builder build bundle","build:cli":"builder build bundle","run:cli":"builder run","update-local":"run build:cli --no-git-hash && rsync -a --delete bundles/ bin/"},publishConfig:{main:"./lib/index.js",types:"./lib/index.d.ts",bin:null},files:["/lib/**/*","!/lib/pluginConfiguration.*","!/lib/cli.*"],"@yarnpkg/builder":{bundles:{standard:["@yarnpkg/plugin-essentials","@yarnpkg/plugin-compat","@yarnpkg/plugin-dlx","@yarnpkg/plugin-file","@yarnpkg/plugin-git","@yarnpkg/plugin-github","@yarnpkg/plugin-http","@yarnpkg/plugin-init","@yarnpkg/plugin-link","@yarnpkg/plugin-nm","@yarnpkg/plugin-npm","@yarnpkg/plugin-npm-cli","@yarnpkg/plugin-pack","@yarnpkg/plugin-patch","@yarnpkg/plugin-pnp","@yarnpkg/plugin-pnpm"]}},repository:{type:"git",url:"ssh://git@github.com/yarnpkg/berry.git",directory:"packages/yarnpkg-cli"},engines:{node:">=12 <14 || 14.2 - 14.9 || >14.10.0"}}});var nO=w((wmt,Iae)=>{"use strict";Iae.exports=function(e,t){t===!0&&(t=0);var i="";if(typeof e=="string")try{i=new URL(e).protocol}catch{}else e&&e.constructor===URL&&(i=e.protocol);var n=i.split(/\:|\+/).filter(Boolean);return typeof t=="number"?n[t]:n}});var wae=w((Bmt,yae)=>{"use strict";var K4e=nO();function U4e(r){var e={protocols:[],protocol:null,port:null,resource:"",host:"",user:"",password:"",pathname:"",hash:"",search:"",href:r,query:{},parse_failed:!1};try{var t=new URL(r);e.protocols=K4e(t),e.protocol=e.protocols[0],e.port=t.port,e.resource=t.hostname,e.host=t.host,e.user=t.username||"",e.password=t.password||"",e.pathname=t.pathname,e.hash=t.hash.slice(1),e.search=t.search.slice(1),e.href=t.href,e.query=Object.fromEntries(t.searchParams)}catch{e.protocols=["file"],e.protocol=e.protocols[0],e.port="",e.resource="",e.user="",e.pathname="",e.hash="",e.search="",e.href=r,e.query={},e.parse_failed=!0}return e}yae.exports=U4e});var bae=w((Qmt,Qae)=>{"use strict";var H4e=wae();function G4e(r){return r&&typeof r=="object"&&"default"in r?r:{default:r}}var Y4e=G4e(H4e),j4e="text/plain",q4e="us-ascii",Bae=(r,e)=>e.some(t=>t instanceof RegExp?t.test(r):t===r),J4e=(r,{stripHash:e})=>{let t=/^data:(?<type>[^,]*?),(?<data>[^#]*?)(?:#(?<hash>.*))?$/.exec(r);if(!t)throw new Error(`Invalid URL: ${r}`);let{type:i,data:n,hash:s}=t.groups,o=i.split(";");s=e?"":s;let a=!1;o[o.length-1]==="base64"&&(o.pop(),a=!0);let l=(o.shift()||"").toLowerCase(),u=[...o.map(g=>{let[f,h=""]=g.split("=").map(p=>p.trim());return f==="charset"&&(h=h.toLowerCase(),h===q4e)?"":`${f}${h?`=${h}`:""}`}).filter(Boolean)];return a&&u.push("base64"),(u.length>0||l&&l!==j4e)&&u.unshift(l),`data:${u.join(";")},${a?n.trim():n}${s?`#${s}`:""}`};function W4e(r,e){if(e={defaultProtocol:"http:",normalizeProtocol:!0,forceHttp:!1,forceHttps:!1,stripAuthentication:!0,stripHash:!1,stripTextFragment:!0,stripWWW:!0,removeQueryParameters:[/^utm_\w+/i],removeTrailingSlash:!0,removeSingleSlash:!0,removeDirectoryIndex:!1,sortQueryParameters:!0,...e},r=r.trim(),/^data:/i.test(r))return J4e(r,e);if(/^view-source:/i.test(r))throw new Error("`view-source:` is not supported as it is a non-standard protocol");let t=r.startsWith("//");!t&&/^\.*\//.test(r)||(r=r.replace(/^(?!(?:\w+:)?\/\/)|^\/\//,e.defaultProtocol));let n=new URL(r);if(e.forceHttp&&e.forceHttps)throw new Error("The `forceHttp` and `forceHttps` options cannot be used together");if(e.forceHttp&&n.protocol==="https:"&&(n.protocol="http:"),e.forceHttps&&n.protocol==="http:"&&(n.protocol="https:"),e.stripAuthentication&&(n.username="",n.password=""),e.stripHash?n.hash="":e.stripTextFragment&&(n.hash=n.hash.replace(/#?:~:text.*?$/i,"")),n.pathname){let o=/\b[a-z][a-z\d+\-.]{1,50}:\/\//g,a=0,l="";for(;;){let u=o.exec(n.pathname);if(!u)break;let g=u[0],f=u.index;l+=n.pathname.slice(a,f).replace(/\/{2,}/g,"/"),l+=g,a=f+g.length}l+=n.pathname.slice(a,n.pathname.length).replace(/\/{2,}/g,"/"),n.pathname=l}if(n.pathname)try{n.pathname=decodeURI(n.pathname)}catch{}if(e.removeDirectoryIndex===!0&&(e.removeDirectoryIndex=[/^index\.[a-z]+$/]),Array.isArray(e.removeDirectoryIndex)&&e.removeDirectoryIndex.length>0){let o=n.pathname.split("/"),a=o[o.length-1];Bae(a,e.removeDirectoryIndex)&&(o=o.slice(0,-1),n.pathname=o.slice(1).join("/")+"/")}if(n.hostname&&(n.hostname=n.hostname.replace(/\.$/,""),e.stripWWW&&/^www\.(?!www\.)[a-z\-\d]{1,63}\.[a-z.\-\d]{2,63}$/.test(n.hostname)&&(n.hostname=n.hostname.replace(/^www\./,""))),Array.isArray(e.removeQueryParameters))for(let o of[...n.searchParams.keys()])Bae(o,e.removeQueryParameters)&&n.searchParams.delete(o);if(e.removeQueryParameters===!0&&(n.search=""),e.sortQueryParameters){n.searchParams.sort();try{n.search=decodeURIComponent(n.search)}catch{}}e.removeTrailingSlash&&(n.pathname=n.pathname.replace(/\/$/,""));let s=r;return r=n.toString(),!e.removeSingleSlash&&n.pathname==="/"&&!s.endsWith("/")&&n.hash===""&&(r=r.replace(/\/$/,"")),(e.removeTrailingSlash||n.pathname==="/")&&n.hash===""&&e.removeSingleSlash&&(r=r.replace(/\/$/,"")),t&&!e.normalizeProtocol&&(r=r.replace(/^http:\/\//,"//")),e.stripProtocol&&(r=r.replace(/^(?:https?:)?\/\//,"")),r}var sO=(r,e=!1)=>{let t=/^(?:([a-z_][a-z0-9_-]{0,31})@|https?:\/\/)([\w\.\-@]+)[\/:]([\~,\.\w,\-,\_,\/]+?(?:\.git|\/)?)$/,i=s=>{let o=new Error(s);throw o.subject_url=r,o};(typeof r!="string"||!r.trim())&&i("Invalid url."),r.length>sO.MAX_INPUT_LENGTH&&i("Input exceeds maximum length. If needed, change the value of parseUrl.MAX_INPUT_LENGTH."),e&&(typeof e!="object"&&(e={stripHash:!1}),r=W4e(r,e));let n=Y4e.default(r);if(n.parse_failed){let s=n.href.match(t);s?(n.protocols=["ssh"],n.protocol="ssh",n.resource=s[2],n.host=s[2],n.user=s[1],n.pathname=`/${s[3]}`,n.parse_failed=!1):i("URL parsing failed.")}return n};sO.MAX_INPUT_LENGTH=2048;Qae.exports=sO});var xae=w((bmt,vae)=>{"use strict";var z4e=nO();function Sae(r){if(Array.isArray(r))return r.indexOf("ssh")!==-1||r.indexOf("rsync")!==-1;if(typeof r!="string")return!1;var e=z4e(r);if(r=r.substring(r.indexOf("://")+3),Sae(e))return!0;var t=new RegExp(".([a-zA-Z\\d]+):(\\d+)/");return!r.match(t)&&r.indexOf("@")<r.indexOf(":")}vae.exports=Sae});var kae=w((Smt,Dae)=>{"use strict";var V4e=bae(),Pae=xae();function X4e(r){var e=V4e(r);return e.token="",e.password==="x-oauth-basic"?e.token=e.user:e.user==="x-token-auth"&&(e.token=e.password),Pae(e.protocols)||e.protocols.length===0&&Pae(r)?e.protocol="ssh":e.protocols.length?e.protocol=e.protocols[0]:(e.protocol="file",e.protocols=["file"]),e.href=e.href.replace(/\/$/,""),e}Dae.exports=X4e});var Fae=w((vmt,Rae)=>{"use strict";var Z4e=kae();function oO(r){if(typeof r!="string")throw new Error("The url must be a string.");var e=/^([a-z\d-]{1,39})\/([-\.\w]{1,100})$/i;e.test(r)&&(r="https://github.com/"+r);var t=Z4e(r),i=t.resource.split("."),n=null;switch(t.toString=function(y){return oO.stringify(this,y)},t.source=i.length>2?i.slice(1-i.length).join("."):t.source=t.resource,t.git_suffix=/\.git$/.test(t.pathname),t.name=decodeURIComponent((t.pathname||t.href).replace(/(^\/)|(\/$)/g,"").replace(/\.git$/,"")),t.owner=decodeURIComponent(t.user),t.source){case"git.cloudforge.com":t.owner=t.user,t.organization=i[0],t.source="cloudforge.com";break;case"visualstudio.com":if(t.resource==="vs-ssh.visualstudio.com"){n=t.name.split("/"),n.length===4&&(t.organization=n[1],t.owner=n[2],t.name=n[3],t.full_name=n[2]+"/"+n[3]);break}else{n=t.name.split("/"),n.length===2?(t.owner=n[1],t.name=n[1],t.full_name="_git/"+t.name):n.length===3?(t.name=n[2],n[0]==="DefaultCollection"?(t.owner=n[2],t.organization=n[0],t.full_name=t.organization+"/_git/"+t.name):(t.owner=n[0],t.full_name=t.owner+"/_git/"+t.name)):n.length===4&&(t.organization=n[0],t.owner=n[1],t.name=n[3],t.full_name=t.organization+"/"+t.owner+"/_git/"+t.name);break}case"dev.azure.com":case"azure.com":if(t.resource==="ssh.dev.azure.com"){n=t.name.split("/"),n.length===4&&(t.organization=n[1],t.owner=n[2],t.name=n[3]);break}else{n=t.name.split("/"),n.length===5?(t.organization=n[0],t.owner=n[1],t.name=n[4],t.full_name="_git/"+t.name):n.length===3?(t.name=n[2],n[0]==="DefaultCollection"?(t.owner=n[2],t.organization=n[0],t.full_name=t.organization+"/_git/"+t.name):(t.owner=n[0],t.full_name=t.owner+"/_git/"+t.name)):n.length===4&&(t.organization=n[0],t.owner=n[1],t.name=n[3],t.full_name=t.organization+"/"+t.owner+"/_git/"+t.name),t.query&&t.query.path&&(t.filepath=t.query.path.replace(/^\/+/g,"")),t.query&&t.query.version&&(t.ref=t.query.version.replace(/^GB/,""));break}default:n=t.name.split("/");var s=n.length-1;if(n.length>=2){var o=n.indexOf("-",2),a=n.indexOf("blob",2),l=n.indexOf("tree",2),c=n.indexOf("commit",2),u=n.indexOf("src",2),g=n.indexOf("raw",2),f=n.indexOf("edit",2);s=o>0?o-1:a>0?a-1:l>0?l-1:c>0?c-1:u>0?u-1:g>0?g-1:f>0?f-1:s,t.owner=n.slice(0,s).join("/"),t.name=n[s],c&&(t.commit=n[s+2])}t.ref="",t.filepathtype="",t.filepath="";var h=n.length>s&&n[s+1]==="-"?s+1:s;n.length>h+2&&["raw","src","blob","tree","edit"].indexOf(n[h+1])>=0&&(t.filepathtype=n[h+1],t.ref=n[h+2],n.length>h+3&&(t.filepath=n.slice(h+3).join("/"))),t.organization=t.owner;break}t.full_name||(t.full_name=t.owner,t.name&&(t.full_name&&(t.full_name+="/"),t.full_name+=t.name)),t.owner.startsWith("scm/")&&(t.source="bitbucket-server",t.owner=t.owner.replace("scm/",""),t.organization=t.owner,t.full_name=t.owner+"/"+t.name);var p=/(projects|users)\/(.*?)\/repos\/(.*?)((\/.*$)|$)/,C=p.exec(t.pathname);return C!=null&&(t.source="bitbucket-server",C[1]==="users"?t.owner="~"+C[2]:t.owner=C[2],t.organization=t.owner,t.name=C[3],n=C[4].split("/"),n.length>1&&(["raw","browse"].indexOf(n[1])>=0?(t.filepathtype=n[1],n.length>2&&(t.filepath=n.slice(2).join("/"))):n[1]==="commits"&&n.length>2&&(t.commit=n[2])),t.full_name=t.owner+"/"+t.name,t.query.at?t.ref=t.query.at:t.ref=""),t}oO.stringify=function(r,e){e=e||(r.protocols&&r.protocols.length?r.protocols.join("+"):r.protocol);var t=r.port?":"+r.port:"",i=r.user||"git",n=r.git_suffix?".git":"";switch(e){case"ssh":return t?"ssh://"+i+"@"+r.resource+t+"/"+r.full_name+n:i+"@"+r.resource+":"+r.full_name+n;case"git+ssh":case"ssh+git":case"ftp":case"ftps":return e+"://"+i+"@"+r.resource+t+"/"+r.full_name+n;case"http":case"https":var s=r.token?_4e(r):r.user&&(r.protocols.includes("http")||r.protocols.includes("https"))?r.user+"@":"";return e+"://"+s+r.resource+t+"/"+$4e(r)+n;default:return r.href}};function _4e(r){switch(r.source){case"bitbucket.org":return"x-token-auth:"+r.token+"@";default:return r.token+"@"}}function $4e(r){switch(r.source){case"bitbucket-server":return"scm/"+r.full_name;default:return""+r.full_name}}Rae.exports=oO});var xO=w((Cyt,$ae)=>{var I3e=yh(),y3e=Ch();function w3e(r,e,t){(t!==void 0&&!y3e(r[e],t)||t===void 0&&!(e in r))&&I3e(r,e,t)}$ae.exports=w3e});var tAe=w((myt,eAe)=>{var B3e=cm(),Q3e=Jo();function b3e(r){return Q3e(r)&&B3e(r)}eAe.exports=b3e});var nAe=w((Eyt,iAe)=>{var S3e=Pc(),v3e=SQ(),x3e=Jo(),P3e="[object Object]",D3e=Function.prototype,k3e=Object.prototype,rAe=D3e.toString,R3e=k3e.hasOwnProperty,F3e=rAe.call(Object);function N3e(r){if(!x3e(r)||S3e(r)!=P3e)return!1;var e=v3e(r);if(e===null)return!0;var t=R3e.call(e,"constructor")&&e.constructor;return typeof t=="function"&&t instanceof t&&rAe.call(t)==F3e}iAe.exports=N3e});var PO=w((Iyt,sAe)=>{function L3e(r,e){if(!(e==="constructor"&&typeof r[e]=="function")&&e!="__proto__")return r[e]}sAe.exports=L3e});var aAe=w((yyt,oAe)=>{var T3e=Yh(),O3e=jh();function M3e(r){return T3e(r,O3e(r))}oAe.exports=M3e});var fAe=w((wyt,gAe)=>{var AAe=xO(),K3e=YT(),U3e=JT(),H3e=jT(),G3e=WT(),lAe=rm(),cAe=bs(),Y3e=tAe(),j3e=am(),q3e=T0(),J3e=bn(),W3e=nAe(),z3e=tQ(),uAe=PO(),V3e=aAe();function X3e(r,e,t,i,n,s,o){var a=uAe(r,t),l=uAe(e,t),c=o.get(l);if(c){AAe(r,t,c);return}var u=s?s(a,l,t+"",r,e,o):void 0,g=u===void 0;if(g){var f=cAe(l),h=!f&&j3e(l),p=!f&&!h&&z3e(l);u=l,f||h||p?cAe(a)?u=a:Y3e(a)?u=H3e(a):h?(g=!1,u=K3e(l,!0)):p?(g=!1,u=U3e(l,!0)):u=[]:W3e(l)||lAe(l)?(u=a,lAe(a)?u=V3e(a):(!J3e(a)||q3e(a))&&(u=G3e(l))):g=!1}g&&(o.set(l,u),n(u,l,i,s,o),o.delete(l)),AAe(r,t,u)}gAe.exports=X3e});var dAe=w((Byt,pAe)=>{var Z3e=um(),_3e=xO(),$3e=sL(),e8e=fAe(),t8e=bn(),r8e=jh(),i8e=PO();function hAe(r,e,t,i,n){r!==e&&$3e(e,function(s,o){if(n||(n=new Z3e),t8e(s))e8e(r,e,o,t,hAe,i,n);else{var a=i?i(i8e(r,o),s,o+"",r,e,n):void 0;a===void 0&&(a=s),_3e(r,o,a)}},r8e)}pAe.exports=hAe});var mAe=w((Qyt,CAe)=>{var n8e=G0(),s8e=GN(),o8e=YN();function a8e(r,e){return o8e(s8e(r,e,n8e),r+"")}CAe.exports=a8e});var IAe=w((byt,EAe)=>{var A8e=Ch(),l8e=cm(),c8e=tm(),u8e=bn();function g8e(r,e,t){if(!u8e(t))return!1;var i=typeof e;return(i=="number"?l8e(t)&&c8e(e,t.length):i=="string"&&e in t)?A8e(t[e],r):!1}EAe.exports=g8e});var wAe=w((Syt,yAe)=>{var f8e=mAe(),h8e=IAe();function p8e(r){return f8e(function(e,t){var i=-1,n=t.length,s=n>1?t[n-1]:void 0,o=n>2?t[2]:void 0;for(s=r.length>3&&typeof s=="function"?(n--,s):void 0,o&&h8e(t[0],t[1],o)&&(s=n<3?void 0:s,n=1),e=Object(e);++i<n;){var a=t[i];a&&r(e,a,i,s)}return e})}yAe.exports=p8e});var QAe=w((vyt,BAe)=>{var d8e=dAe(),C8e=wAe(),m8e=C8e(function(r,e,t){d8e(r,e,t)});BAe.exports=m8e});var MAe=w((Swt,OAe)=>{var KO;OAe.exports=()=>(typeof KO>"u"&&(KO=J("zlib").brotliDecompressSync(Buffer.from("W0HiWKPorYfgtgFD8Ut8WjxsjWyKRcP8P4fflVIEFIcTyrbPEii3DaIiZnx4FVpQVc1MKiKXdH/adtv9AMAQHJGFQhdGDEyK7EieRmxwR3Y+bdDukLOwmYMKZR3nvSFlVYtzNcuaNLdDu3p6TctLEBzTiKxAYPJlop8cI1hQ+35d/HbHcMfDn6TEcG+OsfhLJCEhkkhq1XvxKopxoFDwD3lf39c4SD/6i6TWyyofA0y53gAoIkEanVGciCtkT84NQXz80g/b8u9cTq80XZIsZJaKp9/9xCBepSZJv2r78nFCkHdvd90Z/iz1JLAdKeXHP2FDxNyyX9JVi+DA+KIlz7BUhATWluohmkiSAu1VGCq795fm//58hdkDOXqEGXHYSy2zZ++Lpoy4UiUx6NlQp5UTeNKm/elMFPGteNvZ4jHbT7/1rQOkOM1WAlvt96r19dtUflOtfwy+iCXk4UYCLaBZ+yculiH6X7/W++/P13mr9ybXNuXL2rwNdZhVpQazUsRmpMXOUEvROBVSwTQzrdqFKi1wepDDYdI5hNQ9VvnVGS4qm6lz97QUlp1GRFd2FfVeoU8Kl2+z739+vrrYS6oIZyDvhL0cCC9sLtYwp4tSjCU7Huy2trvBdmrx/232uvdmJdeEgNssU0qbOKVf0AW9j8Qdq5wxP4EgZrO2TD0LRJzzlC+ifvT+1vf5cXcXdBgXP09VV3c6TyqdAPGPhzQxo4hwJ8bFfNf/LxfvZz7zeUtJVhK3SUExHig7pmeQFacNTDk3dcGyjbTmJrutwCBAIAwh4QyC/MMTJd4fDw6CIo5vdjfJtt22U4K4kdaWoP4PpgxsN0dDmIAfYD/+h/Pp82N399GatvbzzNy5MATQIbkx+BexDogGW1LR+vE/nPz/58e995Wqp00/15o9kCGEOES06V9MjwPNs2hIu7E89FbmjteswPWrLE9XEyfR7M6NeKBk8mzYG/yosf3x0MGtqI/HN8sAg4INSEU3wlyMChV/K0GU5fw/Hn6SQzr2aIXRYx0GnG82vzwa5AxlIf7W3jxewYROPcI2utKGFowYufnpQPSZMMFP8LI1n1/d9OKZTcuCM9KBlOzKT8W2SJYensFEVRvXfGkj3cEvXQpuwx2YSqXLjv3/+6qlne/7HwRARVIjraUNMXQgJYeUizLjvvv+O/zvvY+jjw/SQiB3EDhnSVA6SwDiWZGc+Z/aAHC0XmpmdSY4kY505jhu6BgkryhtUNygcQipDiH2IZUuXU3lUHQut2t83DRuWjeF2y5E//97P7Wq9gBIpbKsGbVzg1l7JQgp2xg77zVnnHvO3cL/8X+kgEAgBYCEDJVaKSqlailNlb/77HvfdxFQGFBJgkxHpWGr2pRxftazubOjHo4CwTaqbOdnNe3BbNp+317rpf87ZALMDXiIEM+rqtv3rF76qzgzu9ofYurqbsmSNqQIHZlRzoBxA5QJsf9fb6n9TyPuTVOAp5qkxCU2nzFmnJkAJRo9Y+24EXFO7KW8Efd+VaVZQmVmvQbKrCcWgLUIFNCGpCJuZgH3JkrsrCL0OqsIdRdISg9km0Wy9f9i6/3Ra5qBur8xbjJ+xk+/nQz/YMjv2d97P36/979sA8mWkhyBE/33qX3WpyTNJGz7W7WqaiV5uXm/ARXQEOgR2u+TDOQPkBo5R3O9b5Mroq7QFbLZ2Uz5aqv0ZvemhCRnNjnevCJKAuGItKiVHzD0vAy2yu4H9l/SZkgZApuYiA0sjmiNhmgxVfn/j4OldS78CRNJ+E0Uka2h7kNdVSBiFYNo0xuWH8efwM2iCUV2G2RPWggWI3EkCZpgCXhwryx1oN3dyr/P99v6P5j3yrre+8pEgQEBbTAAE4zaMDb11c9fDjMDGG8AN6s2baGzUOD+fwQ8JhASAoSgWgM6LV4kcfDxfYdyLIxNdKFwIqUjhrLilXjfVX376XbbZ2khQg0EqcF8DUOEHDKQQ4HF3XV5R/HkcT25s//n/3fX2vBG/jeyBkUKRigSsWCRChnUS7jWR4QiQYNkUDCDDpb4PsePr9vTP+19I8wmX4xAICoQCLKpQCAQCATiCgSigk0qKo6oGMst/h++O+f8/3/8E0eQLAKBIBuyQSAQZINAIMiGbEYgyAaB6GRblGjBALpVXVRkliK7e5ZU0oBAgpAQ6BaqNBUBQYoFEZSqFHf875QUyzw/Z/UwCrMica9kRztFUUGjiBVsiDXVkihFLFjalI+/W0Sj93aAbf7/P3dVVp69PFebMEAwMTFm5xSjmD1d3Tjx3k+QigBnm/IJzAp4t5Hz4alkH4JEDiIWdJY2x90d/iwWMEQ9ZCH59NdkoIO8UhwFhw4yhOAOA1X+0veQx87AemqDCvzFP4mrPa6F4kwoSJRMxIfjIeRLXJslYiaIkJUS71kICAFL3qI7mNE5ZKW4iBgIAm3C5D1s/Z5rgpahaSbHoAdu9FlRlOhpolqL8AiK8AGdxGseMnjKgoMgY83xgBrQ6nbZSQsOYcyB/GkyJ/UafoLxtrdu6qN72fOuUkY34w5O57OIicCxXoU+Rg0sUHJsnAI7P+FowqBWnDouCW7ZsyusDU7ItUM1pTtKKbuungUX3ki/sSHqjTtG6Afhn9Lu2x2kMZcfdGhbIOicI00Wr7oJAeYqoebDHtMdFU1wtIykd39BZsxB4Pwrmc3xi1vTCFAIU9gxc7J3vju8kz4XHEokaf/2WC/f7T6xv3aEpmTyVhpK9p0SnWFQaXxKtA2iDi0wJXbGJTL8y2E5JV+Nn1M30GRpfkoWHQkbpkRpGPyFDM/FZ0GledeKoaTsUIcyKX4sDSv2Km4fy5BRvZUviygdSMtQMO71Oi6Y7ft6ZHUNgNMNF3EIzLM4yZYDCH0yIcXLUluNlzgoXdeWS7AO0bJbTaelpnGnr77t9QDi5molVmZ6u2d8hprFiunv7am8tL+0lBIXkDmlPVGfQ/YMTor90Lcm4KDfx7MSz8w9y7CBsFbFJnHVQs/K+oWlkNbDjpZMqQ3sezjPjx50vDzznQYRl6w3wCcmCo/7Rj0tta6Z8C1KmZ/PRVYk9QbjjyX6oghRm2A9XYD/MMXtt0ii/NmKxbdsvOPyetVEpD0bOrBokyPoS86tvMV+ID0ZH3aApPccR9NiaIHWQwwJOdQ0det+q8JDsLsst/58688fzrNmeP7tgFAS9kCkhemBJuuwfQ4j3wZlPV5bCtgLBnn+7UbIGAPOw5ElrMiTncOrkcGtyjfiHO4viVuZ5RzGkt2e+3xl4fbGBUakmCMW77fQypzK06EDzI6Uh2hdfodDFKlrPOLC9VXsMv/mAqx/2950nMRMcB6w7h7m6LPeh9TttLHMqsxNWxcOE8o+t1TXTSugReYVn0Phlld9eP9VbKx02CO9KPyyxlnu5eehMk73QfoYTI61g2whIBEdCcdedPsc7sVwfuaiLqF110G89Y9kcVXGOoIoEixQrTrmNGlOPNhkLBIqquByqGtPBxOVe/f0i4W87XZMH7a/tHzYwmWngNQYkXIBnyrvQyXrqrx2yx9mjKYfYZmLp7Txl83FHVygAgFYAxJA9CNCdSjO/GI/Ai8b/dz/3X2+KXSeTGg0XcC924Vur79AzRnQDfwCw8aAbiCr2B1JCtWNUJX5QArIYcRcGwBGeBhC5pW+48HlfgyuBwDws34AxT1scDFg4/IfyNhdP0avHTgWu9Tvl1Pjh+euL7rNnbpta63inqQ1tTlu6NtBr+S31EfXzHueHYzzjeagQbx81ryOHpclCWC4iX+4fhP5MAUFFbDATScm6v5H/1990KL9Tc+7qVR7aslPYap6Iuel0wvGRxXg8PKn4mDQ/T+Y8rFYFOiwrKTO2wEu4sXAnpk4zrkXDaal2C85jjVxj6g2cFQjPY49gmrlzO1itDANubJ0+lRFLJa39q4Y09OwehcPQ6sbkxGTf53sSGXF7qj+qQqS2Y47JGGTbmXu3qwdq03f50Q4luqlB273XYXqAyXXFrd368YYiXkwPWr7by9nZkXZJsHDFCN8huSeMsdVM/f4aglZXdXBtQc1sK/dz46MF5IDzgYms6ZFb1grQ/TNz7wONS3ewqUH+3wJBDFZF+jw2hIzF11tJnemdzgraHZxLwvP/opqPuXerQIKpae5y8fRrCGG4r3ULzfn4tEyTbXOXsHYfbPZ4Zk2AbxCBk3taP3vZy18VMPdXvtpc6P5TBPIfDyKLucpErovKmyUBNJ0xTQsmUpI3VS/53UywwVb2xhaivgoKbO6nBNcm1DIBmOobu48VcRp78/imWX24xT7rY/8z1rIrB4/fTD+8Hk7tDqS/x/Vr+cUGH5pJibJZv1W9Sht9bF01Ldesr1oHt7ikfRbOsn3KtecKF4QQN+FVqgjraVC+A3zveEH3Mhoka33ioKIurwmhndd8BhD1ZSY+7dMEvMLZBhDwWdnfykmu+HxGtpSxIUiBzF2kvwY8+qUcIg58G9DmblmfvNUKHD17O871OpiMo1AODXD5p9jonHgYrPq8UCOWGGceTCJ/As8I6MnZkxpSIwxBSM3wrs4p1ygIvqjpIAMAoboEKXEiDwfIWo5YT43AG9ybulkMbdJOJwjUmXPRokjn4xwEFcQfmVCc8EdWxlcKexdT9ghWZNwLopkIV23eldUetv23bjN4Nl3TkCnm44ydawN270wvOOS7cyK25FoL9dQHqx4fhdjCj05qNjW3QqNsyCyU1WErY+SRFP8PuX1ALo0WnfdInwUs50+OmNVNDy9vbg3PXiH2UHaO9NvZ2nXTZ0zOoqol+LtYBYDgYI9OLYHBTMvD6GYoWupCp/Ci6A4gkSE38vXwlGLpUu8ew2rNXPkvi4ey/PznlGF9c17PEacz6AJWYperoTsPtAGR973VWXqnRuUvu2YyNiHpfIEw5gRkVVS8Bdvm7aixF6XOF6X4IVMI4WzzGpFTxNo749afdF2zn/Umbv2WdnWyKdTuFSpd5KmwIJlV1fOE3ysUzCrKKyTsgne91GOQAIB6uDQMhnuu2YBIXL8NAJcSYFg08y+z0Nt1I2SETLrWavZK5HqPYhAyoTE2aPX3rzJUpLrnRFosObUenMfCovLmv1bzmolG9Pp7LLPXJ8ZOYp6t01zb9AkPUovbOt0+AZ68G5RPY+m8a3SksadSviWbVeCrGd5zsr/nUE40X81QQgL7FVm5d6xSXjd+8F6sK6SsEaqFiGKpzWcd7pFOXnhx/zvj4ni1rFiy0zeZN468qUL8K0Xlm1ha5XQ70ryEFTWgMaYdcHOTBbIbDkpOjxAs+3UPl+v60iZOQ/Vqh+zwDaugpZvheYW402bm5jI/W3s+2Rd75RplGBDJTprK8vrWc68462NbBFEN5VIyFzXAdxHmSr3oS5Tj/3hyMr0j0l45edZuDSlbh5R3oVrUcFR6fGwAeeEaC7V6SpA6rnRfSVlxNxxFJPAMbNTdHAIdp5fVexsSwX4QGF9cesBIIobGjo1CnY3tWUueD3bpzbTgC4SKQs+BVuZarTvIPdB2Ny5pDqaUaBwCVu3lhnJDB68fnNwgaRklt6auTJavdEenz2VfUylpVR3RJ3Fo6S4sT3seqN+/u6p+TCoTAXzXrbgd0systuZu1ADipUcoupks8YRUlV3sun4dvUIXaeTqe9pIXVpj8tShzLPNUHb2pht6KomWpcNByNo9tDHSN5hWWmroa8JawsXWA6cux2cgwUW9wQUEDDCIhOSEzvthuU4nv+Kyq+AuIs2RsAVe6QHZ40yxBUqyCgovMBxWVDCsQPquyuu/12CH1ZEhTYfz0WTg9/X8yo2aDfOLbvplqnTR3hj+iiw1KbsKr4PNggtNp4FZXVJvMrq86Yg0I4iwaqUdUdf7nLKNBzi16jYPTwnmZ1JtyIlakWtziC/sBO2M34XP/57zyBCRZH/N7N4ShnE1WTVhnUdL1s9f6zExWUQpopfVwwZ46WOVygbtzQrSCA0zY7FV/iO6ButjBCJ0UbqjdKlLLTgQbC6TOuOV098+YcuVDEKpSqM8byVezaI9wT/A5xLRpmwYnuBL2Gxw37USXOXn3UbXUrjTHklAhBiuwyZ6+BKCJp3wjKZh8pqBKVhhACUYlzqxO/Wv1Yv0UpQ16Kf18Y+d1udZF6bvmJ1ZRRqiTrf1+guYUpU4UHQqN0rpD1s54bQi285GJG+94aQ7wGAnvyaDBOr7acpCPsSZh2joTe8z0dISxIkkCjJKr2Qistcr+w+mgLB0GQemYvRl/UcOt5npOHBJqpuku4zVqqNhiZ7dHEtO4GTAVFF3GlZSWpmsUw7Cnffpuc/v4qF2BYNibWh4QFeV6lzcSgcku3L5gTH6FJDWG3bkHa1wO/p6nbYcUvNM1Wzv5UfHR6n6SYBbMzP3RUiN/jKrjDDD8jD8JxoLMMPaM1XqLeBmD8BRke4QUdYFl9K6vZuIRej+pLzSYPu2r5bSJylxEi6PGQHzZ+Aw0lX/DWCs0BXOi633KZnUpPBGXj5AqV0+mszTsiM2L6JjxG9OGnrp1kMMH8CqMiwU5Jto1Bqub1EigHqS6wSyGC28YkQxeYf5TGij4C8mIU+xcY3WaBbSJRSHL90Hf8wO0i/AvL3HOCQQ7HoXqORSeO/UuXS796rUGaXqO20uf8ZfLNLC9RWP77qox3+cwEvdqG1i6l1kFQvosZY+ujtMunWL3ezea0NUzMSq8aztZcUd+iIBoO2A8pJ1saQqH7rJhF+WyxGa1w/1S/SFDhMRnQMEs+xAGnsw9BrIDGUSRDdsqAfLabxbfH10LpyOkZCu/lPx68vN1FlGk+yj49XgeGtpKD9DWUkfVvauo1Xu2A1/Ofl0BAU+8uUQ0lbYRiHugV+ePFjvi5w+5Yfti71fWmxpJLhUqrntyN355FGsvZYstdHTL63YdSONLsOBl/lqDI1bWFlJIASrlH2czYsYciqceGVJ5WwPoCULPWE2UTBUMfS+VbyWs5jihsfNj9RoTysNlBoLShmhEd5nKO/koFAW1V20brWOYVd8k6dyYY1ry4c0YBjPdhyM7oyM7OsXJr19UVcXYPT5QNGfWSQjOhjv+VRwLptvkZnodBe+1qkbs7JTlzjEwxIdZO5Rpz7GSRHMqw7xa0CpQosUXmqvWEaXNO1+awpSaeXT0K5mdkbAu3zipG4z/mOTmwayEMbHOMxYBHU4fGQ1W/YVmc3z58nnAkeLCREoaRu46nzyaWI0ho3GBe3fgRgbcjXMNbDnNRDfoxhLDAfVkgC4UEi2GBppEL4xejNcRcmNzj/3ioqjKTJazGgRpMMqnmk865tfax91zW84ieswozS4CAWBaqcStqOMycv9eHJ5271RNn27wt79I+U9maWfLz4sujcGpRrBWow1rlv9qCxANjWAGeRhxrjdvZaIhBrwSukAqXQY83VggharRyOjHKpAa60DOPESxUvihc4YMSwE6QBpbf4nPeruff2p6tPCb9HnOnnIkBCu4ENx0lmnrfTGfs6BVwvooFsA7Y5JKr+hFYrgFioftpVQQc+4rVkxRrChRB1Sah2F7d4cYDZPFv56URyO+JCJFuS6rxfIpiByMKeHEoxpjPulBm1zaFO4Yq1w6xG3NkaPANBLVsbEU+TvtoMADGKoFPiwp8ojHmmtANlyHEhs6CzOF6eYxHMtrWmeRtHxSCmWbd9L9edUZ2QbGa7siXq6xi8kWoe6g4ZOCU13rgQCUaQ0DByEEouRAW7bH6bnXpbfxju22EFFfmlJVybuFl0ZUpfH2OxuKx49v6KIvkI4OSszpJpMsA1vQY7HrNhltyqSmioKbQZnGDOY6UZJRFudzg3S+IiqSqVFFkxH4MlWGAyYF8UOat3edIG9q5ocX85geLOll/i0tPTGvZE8raq9/akTkLGjqyDFAHTOONgoE68ZAifEdk3DkvNF5HR3ItrDlP2//rE3qgMYHg/am/zCohucjtlOiC+JPkDtIJRGrT3cnn5NQF0B176pkdtF37OsPO9N2NYES27vC8AHqyOCyAZT3Yz6iZirjKz6qwwzc4m0Q4HsUisZSwtc4dZIV3OVyAS3fPh+rFjam00q7RaXJ04OS5YeCxyuG7rKKHmJYBu12qPa1WDc9R3U5uuI+eIK32wQNjl4vB8yKCtfw4kEomiyBNYtJIgRlwxhhsD+68SwCZopYPmgHFjZ/VfSx6WuBUHR7qxJkCQwtwHIauBfYh/Xp/znEWC/yQJG9GW0YCP7LsPsmeytBBSYrReNpEnXMfjV0apy3nuXTSn/WP4L1Kt9SCtv2wzxwXcURR+z3zDi5t53Y+bIZnY+HHLcf2Hm6nCS2Mes0BRgPseb2iiy8KlEDnuVexxEjofsyT9XwvyjRSSdBA1Abr/LrLcaB1BbfelMGTmYI/S5QsOVI9FXC/vHgRR9ge0yK/Wx/oZ/Oa9b4jwsX7GbZZ6vPN4QQlB8M0gt2Az2gkFPVwIPMK0CKiC5CP+yv8s81e37O4orCbOnwlXAvwHG/CtnH6+ESRZ6X65yj9JCF4DgRv3PGH7J32WF/xlcQlF6e5ti5aYeHM0EZwkviyqoNaXzrigKLNnkcJOaVk1q3qZM8orZ1BeIefTZj5SeW5EXVmXK7m4Hv7syGPEYarkk26UY9td5OVhFxE6XcLnbaPxRrC0d2z/6p7xavRUfWvnc9psuWREGYdxyO696xy3f0CXy0vICQe+1XbeUiACYbqnLiKQSlhbNsCrQL0dkrfA68/xcMPO4UvPss2BJBQPxzFsn0dtu3qzsxk7zbx3HCMX9+Vn+r2VbG/y+YeX6qhH/N7MO5jCIw7rIRoxP9bBrx3NBQtobgfsjqzk/svvSoM1vH7eY6H02vJyGlEQv1ghE0Eq2cNOfHaSmt/HmRPIBk+ynYQzz1Oz+Od5BiZgmtakmDQ/JDCbnMLCKsCPle9fGYmN99ahTeZMeJRzK1VyPTLSx1Hb3yuoQrS+MEGycMpC0Zck7uWyw9Jqh0ORthgU+YBu6ZU7FfpMPf3vjhTTHgh2Ta9/WnY8WZhDf3rZV2GiNVcZGF8OdczGomuWKNjveLkPCj+57C+4YqAq3VhW3sF6EneboQDzfEXNyQMmPUWvpS0QjsvcUK7QeXGaFy2cf+oxma6VoaXk4i0HXxokRiovz7zxc6m3rVzgELI+P3YXBwt6EfMIK4JZSixt1zW2KyVoiLUirwzOhr1kiD7b3paSlZyZnBvOcj+R36bmvKzqmzMAkWq7qhtORxTBpWO9Lr3DrSObkTo+6wje/ZZ7sFzUjrMOA0ZP8/QReffRIHImeJxwp9Zf4Qf8rR/HENaPwwdpn+HxX5k40CmNXXGAqBR2PZlEi/3SRbiRb+wp5MojmSlNZkxuQPQq2F4F0Wd7Ymp+z/RPno7vm7uK24/8CnPKFRa7ooUHzdNgjjuxWKLiYhfKXyvmq/d4ejquA4fXWgPjXdrew2oidYnlJ9tcnWTg8I9W8aGYoo5wOEZd6gt8dWepqR/AxWZ3fReHBJoJtB7grIbdF7y22eXLW15FoVu39XahaHB+dmS3EhMCbN1hV9Eqos0hklMCGzxv902f5aJWJLiKZrv+aRmfUos6kyRAU7KBxv+VZqnWGzJDnrt0jsGWiBLKNtE4TpDWGIW7qXaoFZNq7In/Hd0Y3qQHfu2h0KzGktl5B3Z7QuyKA9OgMrtfLRnQWaWCFoNrR7sebPSuJlh7a8L3jBdvo8YdJ4hRXNAO0uIqxUzHvkFUlh5HFTEnW/MYBM2oWRxoyvPkGQSKBiaZBN0MT+toVEnPy/OGPKG8TNTGWtaxYW8SM4oFCQ2NpI1EzNrzipclPRxJIVp9bVTz/kAwWzPTkVZOC3Ff16U/clh7U9RSV2ucL4asUDF2nEYxRp0t03fG2YUoI24o1XnAT7jA5EG6vCLLG0HU+Js3/dP+eIePgE9yWJzq7dr/PEGUFizGluKmctJwsZBGxl7xU3tveasbMUYgyIJ0lpLRZI78fBqoYARIJraQlIf1WfVgZQu0PryR1bXk6/jWyO8sYKshWfPHFXQ03BvnzK4p4OoB54XTX+D5ZmNjkqiLNGdO0+DbAQKkNBi8PRX22hh5Wf6wEdjA7loEFheCszgweAYSm5Q2cr69BEei4hgo90ncbsORXP7+eRRLk2hcxBzs5IyViNPtjh+PYwIdeRClyss1VehSy5QURipd+v60/Cg7qKcM/BSktzox75HiQQy+ry2PNQwq0OWDexvFb7Ogmq25SLcA0taJMhSJ3VWymWv6OrxnbbyubohwvlTTxsglbapGjQmaJhkSJRVBRRJCB+AybReHNhTaoGH9Jkrdriq7BynSRCARwmMOFrKrNI2fk4UC+Dz88gzkhFpeJ7YSQLK+470UXStf1mHI3Ed7frxF67x4x72+1kP3dYTwU0X4+Sn8tBB+Lgjjt8l2+v/JHvy8oJk0COqfvgxwoxIyewUYczRneRU8KReyUK5dVFo5CZ3nQgiVFIM49I6Parr65eX0yf+RG3NNZhK9sH7tGOhGJ2UnihAOkUZ86Mm5kIWybaXT0knofBdCqKAg11xwCvC7U13Eb4GeSBwwkRl6U+CFJZN+U6xfoyef9JFK0sBJYZXiYa/kf6L01U34In6HMNgxhkMX4f6kIecymrKejdaLztafEpMmc3UkQBwngNTHKxKTO3vw9NwSYRLtxs7YQdQGfSdvBm7Gvrnqs5V6W+0khjcUHYilpqOmIK5zGjpIBBXVUnxndm4HmfyadQE1iO/Go5YeDbkYUVzcAfwrOkDo6A4ff7EDsLsdGFm51DNdQ5W+627JDE1tkA3hmoBwYpmX8bUInwxvFvBMCASGUSyULUIiQneQGXGSTLLhdKCkzcg/Coz0IaOBEJqNqMMo0rl89AtpmBa2jWea+20Zy8vuoF/+MA714jLeVZHEE7GtL3kaq/+2QszXZCvzHVcx7+GT8R+uFVPA4RQJM5xh9ZTW6Tyegxs26XM2nsJYeyURDUJVuY8rEhTWrzvGc8mNggMAcK8IbIQ6kgwROwHXHO/m8q31xJ9tmkHGeo/9aJXzrHrGAUPJfCT0SDmDHU3HZ93Q3Vsk4Y1ozmNMOOMCvjwXhJ8UjD3cGdn9KeLWsshzIYoVoCwXs0hUZHHNrgf6g/IAFX21z564wUp/+rnZOUQoS8WQ5wRHU4ZVJs4lmx26tvcINE6iaNA9jF1M1k9GaX7axU1A3kdQ6hssMNTrekVM9tx4NKmYPoqNmBEnLhWXudQAaze//T2uFu8OPc6kKz7pGq6065AjlYxJAQBoeSBqZYd4fwWPudTk23TCRQS/E0sCGwn95e8kBIBEJaIMoSvUhS8Bd1jOsw7fgHHHJXgB6FnmZHsqeGRA3/QEHYkMHa0STos0o5m8mkEus49eyW889q3WqVKAiFoq1NKzD7w9dgvQdR8JhhDY+lOTUZep8AuZXZi1qlAFKqbI99VpqIccQ9ry1IV7sIVhk67WF5uw1B0uODW0+sq1gn3rGfSLT2q4DM/893l2C1IQfKDB2XBD/eJLx4u4kfgJov4swskneT0tBsx583OpnE3+/W/cVeOkt+RMZYMsvIFiUt6EfvfNo7OA7N7mg32o4bAUkh9G+p1Y8qqLXW0xo1vSEgZYvwO+S0wMtn90okD+EGLqV63PxwAbAYdYQs2LWxPvE4uZg3LgfW2fNG4Zi0gyhdATgcA5PxJVOBQY1Hq4YIiluE2xnXLTkbRh2Kzf+hdwyXRqvxsR5N0xkfI6v35Ho0kh1u3cNv5uuXFCIGGF7Pn7z/bMtjh90y/TcuDNkiT7G2wCXzW/+ngbOgL/Rfs/fRGAc0NwTGiFIpOBBQhnol/wiD/x0+5Ap8cH0oUbuXYCpV+2KS+XKZu6BB47b67ABaluSWATkMcR4/zOR6G3ITGfuoCvMtc2U3X/VBgY1BsPtVYTk/QjrFfaunLhSNWSYbYh41KBSUzDI2JbBOpFTLUOusYDWOAeLWrdlAR/vWqrl1DGVZn7bczNXpNEPnCffR/VY2eLqrhuvWRz1Zrco/uPuDZ2ll6NrgjXFbMK7ZhcZxUl4MDqYUSmadtRI6Qzzb7y1lQeLZmajQ9VsZEDoHW4+AKaa+juRHMznvG34tC7hHW1ArOLTG2oIM2jUZve02K9h6F0yIr927dgxpBpJSOuL6opzmoy6a4iTuB3F+B/OmaUWuQD2JkpEuxlIsFxCBc6xXnX5pFf7hsmTGV0Au4XuPeDJxs3sQOdM/8UZQZ81GjEHbIOG7njuX1DDd1pLUYS+sYknV4skm3pycyiWKco2npsB+kVJO6NT9zoPrOYf6ZIfdHoW3hXLtzMTOZuzfitNNB/hLPDxUA6ShnkqZ1ZqJBBk9caxQe5IUH6HyGKLYtBdlNIt+zYe9dlRAOHEZ37eOdQPVhxT4ip+wA5ztQuA7qxBnHdS0qzupvToR4jaJkWvv9ndjAMgLLh8koGei8gvnqxaoKZTNCxrHoC1bLB6jYJR6elD474wxCBkI1V2BiVP7jkmQz1s1yLCGn/IKyrvxdse+6SnVu08uhO8ET9LzMtxTk1xro93+x5nNK1LTFaDJQ/Y/b0nbM9KOK7XccYFIqmOemVVNFsFyvU70sI5rt8Qi1rCbh7jhhWuxZg/u1nRXnCa+jEUsXv2PvmjwsMoDcKncUrQ/a/jgjq0DFKzH5lS1+dJo4dG5cE/J39XcV5/qvSpaRsAzHOV4G1aMeK1fZTS86rD4dbae4ON/4f4+bF9Z+Lq7/2YD2S3f2D+N/C5lLCkDE5xPYQt0kkMQAWlu5PMpwGhZfjoU1Gg5MyDYST+pBQ3rw1sma8PKOiHhkCudEvyrMPVeYuIzw+df9N9RIHVRBKxIvJ/njZTBHdr1hBR0U4pqt1HLeLvFXeFF6W7qMd5I/80Q0R82U1EHdSn2Np4KudvbxYD5Diwff8gOAfeUDuRw1KRPXC4Ty6CpcYhGJ9i7JpxB7AwDRBBCUT8YqHsARWkM79WY5iJXLCoFXTancSQ3QTAU8xp8yRXrlCMQltnBK4eAV7Q38nrm2ztkgeKlcvcPPUO+ZYhHPiPUW7BAm7w9+SaHrtRD3+Qce3J6/f6To4yXSmACobJFU3vjuaz/fcEcraitfUni7nArrXbkRK9+Z0jgGLp1xUXV+DIUXRwISriPLr5WI/4eGoPbAoGRDzIAu2V9KAW4l30a2aPrjHSyWT49EoW0AAJcA9vJo00hGxdfkVqVAdZpYQXt/Pld/1JE9zMK9CrMdnxq/aYVFjNTAO9VAp3/OVJ55Zj2E6dlYCiBkGJ1vDIYJrI7ojEH7nIKfUdnc9/NE1X+Zxt3QCfs4PittIeXzZz8xWWH9t25qrNgvEgHXrpbbrFrwppr3pzdvt0KF9MxqLbzH/DQnILcZ9dEDXGdYrvENlfrKOpeSYgaY6Ew/2/uLCyKMPRkpjYa0ZS4r4piDjv3icna4GZ3VfMiUe5r4/m8n9JEKTGtQpEWDnXTrvZJkrsySBN8fpNu4NsuloKXRUBVm+tCLVkTfh/63fLeQTHDYEhTrPs9W7QrK2JjPaYER3BbVD0Nz3KYXre57DW+G1gFKao1dQ459a5VizsrX5q1eX9sjlfwKy5mghHMMLMM1rbbTWlBk0PCjchjlGsFTs7X/Wu/zgtD1N2HZj6XGEH+9JPuP5PRRg71EFqIipwDgp9VIwmy0MW1/KbeoCTq3xAoWme5VbDJZkQDnEsD+tSlZ7N8n1YR+w3SdWf7K800m5gu1Mxg5dZTBs26P+nasvdMW7TJTA2t7Nl0EfhlhYlZHo3RF7zbmxqDegHy31AAtxaD7vwoHkD5wDC3HS37BQowsGf0kyPi6LKOQveLuepNbdLe3qMth3ScvR5QxHEHwjP9RiXBuu9lZQAIa9M8jAKsgBBq/i2DlG1T8L6Y8PDfx3FNx++oA/TwM5U4zqwzOQTOZ/vh3rykFdWRz9f7qh/+UViH6oKwJLlPR7aNDXrQomnix8v4a+nSMvC9Iiiq7b7iltSwchAZqNPZlhvzW4SMTLdut9/RX3fkVTt9kfzc4fjTW4MsgfZm2Hy2aYEKQLOxPmr3eO0Me7H72kfOduwcVwnwNr08OwTgQRxKOEuHW8k92HQAyobrkQ9z/p6dB6YJEHvpN6j+tpQGJnmH+14K3A+WUklv8Y4slfr5gb3QLbshQ1wMppyoHXg8GpkXoXOyErh8uPnc9FA7rHjfUa+jsBPNQxYSOdq+W1GO1vPIh214g/SxgMVdWdm2zpHm5okUcW8XK0OUB6thwBTXdT3RGY4wkBqHdDdFWo2x78iPgNN3VDMFiFKPQv7w8uYcUw5lAglI+muqi6nZJlvJtK0Q1wJMB+7OOqKPQT/UqUUzhjPVogxrVEIPd888zTG5Vzvp2/kPERFDMvldkJnJTV7qsD9z6nfDAqynYtb3d+4kM5cK9YQueFamp5EwWZUmHQrd5AqfqPlDrPxYaU1G0a3FOMtC7QrymIyhdlhN83AsW8MyKVnn2lQZIy2gf8c+L+oVP2f4LyH6YUYjqFxIxAp7V+Z/Pq710rZQyKizNLGDIkqDRLzxJUoZMUmwOVWlrFK4hyNgwWwsqEFm8wb9nYMfYreFiFZoKVyCUAlDHZEu59phQuLB6ha1kTbEkTSvJPVyq+DvSg/UtYuJl2C+4xppupgyHQFw2L1b/sJ15auu5OXqHchwtDqLxrpjXuObQoiRHUfuTpTARMbfLpPdhE5thBk0VcnMj3cPSE2xfQXwGqqjKUgaHl+bBwKu+ZS6esJY9zPHytQKPF6lUraHUIwDT0ruoq1SlMCO55KSJaP4V2r4EeakghBHNOK2Egb88Pu8DjE8GGFEMc+MXv/J5X5BUuDsPcHKlntrn6Bdv9e7e36cDKM78uhD3Cx9SCjUN0tiNmbcZCaTyy/eQVhepx2Vip32XpL17BQbUrt26YDo8/18bSfhKuzroQ3kHICWsZPEEpPSdBjxhIkXDxK+onxIhuUx5ZNxC+7MftOst10TlpwGoscKmfj5gqDZBFleiIQllebiFnk8p6Ax8VughpL8mK+lEnVjTjci7yl6S+owwEXG1JvSD5e2nvMSsbrSPnPuiL4Pe14YLPflcJtYL5dO7/yudB5FvBFcmCXDlWvgTmR9UkTSCAXgvjnfBXieO3ca7mlGwijRz4lJswzGMDOx9Wq5dJ57kCQjUyj76L/v2chpqKlkMA8Z0KiUv2115jiQ1JiHL5xbIj5AYsDQIcQOOiN7ptpyCjSsZS2Cy/Ow1lOEplRV1hkKVWoF0no3an9cl3W8L/GHcee8ApwGqT7+NN8PF8ct5Uw7WnSMFGYYQDhgpZqpx7mvABN6KdTJeL06BnDrg8ZUqYrOAT3VeR1cwT3VwMg6ler2lat6bMyAVnQcvGUcPy7ImkLqTSTbM2JYPO1DslFT9tMn9P9TT+g05DLoXVsBzBGeJP9esPdFuU30P5lj3tunBUZ1mG0xfBDChYWx9bSWyBn8VFyKlKAVK31FIqPFONlCLx0liL+tmtxmSBmEt6WUHb4hwQhJjqpci8LZGN/FRqxuhgynhlDnLLM2LYTPjy4ufaP1zfzOdoPd3+ZFSRz5+BEsIsW2xLyUYiAhE8h27TPgV8TLFSUmPT2oMAoMH36sd8wPGAYqDvO8jY69deJG2PnIHubbA9sXUZeJ+wPQu214lst57aDN+j6Op1c3p1P6e2ezi1AYRdsDJ5AUdqMSSLiuI12bHczU0KucZLx6Rd84nJ810vy0uockwzzZRuJyVGVxWUl/kNOqj1rca2kxH2iCTETefXdGhSG3PI9hZVWHyI3cMKFISo2ZnsMzOFX9+Rqr8leU1Y1dPglsdgMtaarcoeR9A224Qg5/40QCZB+kENDIl/7OOvM8wJ2qv80LFBwTEYNYeFtzz81vZqdxvuppuX3sfh2vOSb4+3y3K3vjGSJTVgo2TuGu7nVL5g971MMFaT8Ck2TkG7F+BfZRKkbcNtPZlZakH4vZflelsIbbCdng3BttQ6tLHwkFeV5Dxa5aP9eF7dKe93zJZxshYRMs3KqZhFRl6YnI7N85HKbzVahQQhKQjhHy/bj17ch0pcYxENL27bRtwS2xvP48luUhFf25SKvkybDJlVUHVesspm6lrkGFjKGf9AkR8P/WTakC+5uYKrDBRLFN8bSRa5/96JJUq/JikHz7fhuealLpV1vv/+v4WXvq6OR5kPb1Vlvcyh5qKL2q6IY1HTun9T+gr77+q3t4cf8JtZ0V5ZuR17qHjkBw+Idws13d/BR7/d9DhArcO1Dl66KPZLpNth8ZONJd15EjZ1XIcog6B8wWPQdkSRsmLuGydnlaHQO/KKO7BZ5CxOmW+HQ5aIZnhTcn3QuLXc1yEyIlunzoOW0ZVwJmNogbpzvqXfJOzf4PoAkh8i2kBpYntFUnM5BP68JATfe1wjyKOV5VTmEHzBajgn65KUc82wWy43z0FAjmSb2UIy8J2INq7Hn9LYK8ibbPAJ2UcvEQICBSQR6evienz1DNVzZkk/sxMSmRPgBDeP7ardkafVuKyWHeuqXYhbNpBCT+Dh104jCuek4q1lOmwT/lb29RjtZ0G8Yhr/ukv37UR/B9ydRgCx0fjlvl5JtB4hq3l3upyBPiiGl1xgna/9bhQGTmZdoED2FXqW4j7qICoeLZLGYNGIT1ov9mUQTg+ulFoBNTqZ6lwzZk0KIIvJ+tDljiQvqUUt24xES7PRSz1SDhjzvkLcRhjuIvtO2PXDd4RPzbF9JM+HBuPMKGAg7zlG688DotQKvaF+Rn2rbl2oTarmdAFF0m+Yguos5RFjTzs0VeRMuCGLIl7ZqrfpYeeVL5F2XgNwTW3k7EczCNsyG9SFOeHn0ty0wRF7JS7J6G2dnrTN88e2+R2CnzJfi8Kr4oUi2z0GA7MwE31GufXo03k07PFlOuEGilbH55LWyO2Y+IDF80pXZQdVn1kwC/feX/arwv7nlzMf1axIvAsZji6aC4bSDiUuQAQH7yAbULs0+NPIyaRX2aH0mnRjGYRn+kBLRdaTO/Rkfr3Y8lTTxCLACuLlMfiQNlZasTvUqCC6154BnPG1bUSpcNSpW/D9eUlEh9XWbF1X0woP821X32Xt5+3mrTx8ezdwoVboqmruo6xkPgyH6hjlaj1BwL6OaffyVjpbiHFUeOpG+zQbDiqPrk3KVnmDeDc9Hyb58lJDrqjfYyA3X0B7SdeRwAaGWO00b/L8jAOvAyBcCs8fEreHqcWfJ2Sn8/vZjKWurjY0qHaN7QWzNTyGKEoBcXLX5QZx1o9tq05QPW5VPv2WZqKhngsmSlQN3Du6bnjlsjHrIXXvxm/6pzrqcXo0jP7/ur7z/aJOytXv6eU3eOnMrWRwFBjXDIbuC7S4CHRsmxEAPsHllTXz0pqNZsHXE6Vt0MCNOHGRuaaOTQw75fD6d92Th3fk04wpmNKO7Azgcj+z7x8HUGpOjAUgJO1Rffl5tfWD9QhwTbgWjGw5Lf3TCsPmmXQlsGwwsWnuWcxOJ4Sya6X87199ZusiWjasVihKNpuJh1D2fIUWNkMJ8gv+no1mvkEWtj/HFzZeMKY3nOEEF5me28q9dXZkQ5otRtWMBcp15sNYsaxsBH6COK7IEv+Co0xJtv+HC35/zSbojGj1DoPQdDg+/0kbBDjo6ucpKCNXvxzFpFuFTykwAE0mcgzE8ci6de4Z4moZA4ksMBrbDK3OOXmENi6TLJHkc6eModEr/ei3Guub1D5PYiLynb2eqgqcfYZ8zyiIU+rPhFCduHyy8goMakqxIlifZUsTLsgs8BJngWr7R8XojCmmxwJ8BkzwBg/4pntbN74W6KOfg0Xox/DVnCtoc3lutodqMHTewfU/XqmLTbdDTxxrjzlmK77OdlAB8Vcq8bShOhLXTxaMxfgwyKNAezvpy0dM/X+g+giKV4ATmkXlJCB4Z9H9uU1XA+rkFk0hZCdOL8Kr0XVKY6eggyZHjS6CXoFBUZmV7RS034KnFZA5bopTOlRZ6qx43uQf2wLr5u3IbI0Ig5dYKstx9xCU/ZmYua+/+gBN8nERCxQ6+9SS/kSOy2KgqC2YDi3e6EIA8KiNs1McFSJK5WRmQT2faTKSHFcez4e4Ac+ETbUl5fWTecLxqQPRwecFVbKAaJ+wYo5j/x50fTJAj+kv7SFFZu0+YptdWprxL5LK2cVGgOpEeLL19SQ0keQG57pAxCjjdncyPIToaTCy/g5HHCy0kyPHDG3IVEN3/UKODMbokKslN5gSmXOOIWzfjPsbn5Jkha05LaaWwmMXiesW6k8G4CtJR8pVVvhhDlQXSPR8vAKTxFa3xglbjNwldRiYtOT6vMb1K+MY1BBQsRxWn7tZtsOtwOjGMVNQJqK2XNgHCMiltLr5PKx3GOZnvY9PEwhZu7kzHNNpeNeWqVYx7M8yndfbdR4EW2uRONzR+b5BH8cVm/pPqp8ZejoQT0zfj0FblCeim7P8gpGW8OQxORiJh4qRM42fndUNg3Tnj+vvM+cdcf06NQUr8pyg6sZ2t2F364U0K+QIfkEOv6AuPsG0ICCQ2N2dt6s4+fLuM7nd5ttsgD3S3FsTkN8HnAPvdsBOLU177OS6lMQ9CrNV9LyuIk25VDf4vsJ0KlL9vgL8AMaAiJUQJQ1m70rDiQ9N73jbIZA9Yjc+G5JkdkvY+TFv3hNLgzqkI1S8d4JUYYLLqSSPyITDkYs+ciOB7crqfD/5G/VfzJrRYfawBxz0fl3Pt24SHt/uI9fPrivjGSSBCx65i9DWmUr8MbJ+D8kpMcJuzgeA2WqozNjbrpPG4lV1ymtMdUMqATw4AC5ac9WGCblqrF6dY+fC9iRkezKnNrxoaU04GoGxV9xYpLxOiTnA7FeKvTgEH3aRF+e35+KXRjO4n0FRnC9bfhNjqz/Q1y+x1nTj6gvRg7xsqVvHZ7jvtMog8D7nvqa2F4HXt525cj14+C5WPRV8u5dXeu9UXYVpgyy4AyJWr6jW46NDW4zpen6o9yrjhTS9xgBiz69cMgwigKI01JPyfV0lvh9hvv2qOzvNOvWcAHoAHEZLRZIbITzoVhIgxcGA4TpUVwak5B3kXeWk9Fv6p2dG/ZJkNPm8Oi3+BF/49LzSOEY++xvU0GDJnh4yuvlRWI5o2FP6GNaNNQSn3PbxL7kLCxB4Tj+QmKNshCGlnxsuWLBqsLEamjCHyxyITm+dkgOvf0wpYavXX7x+6uPK+X64xaB2Sb12soshLQOXYtOoV9N5uiSnvajtfD7/WHH7Hsn4RV9Nw28wNEGGNnB3JZ9dqQBXrrNQ1lAw31s6x415QHF2jAwsrC/vsyh8UqMXjywMzgsxux5+dYaB+vmfbAhvfdVga69w6rHKamMI91hPosiEZMjdsFjOatfJEpKf6vmzgL3rP/9PmXKFcyB+OADkCACgb9PRMnq6nmh9LvK7rh/J5B383Ajo0qkXpsONXf77iyLALTkkT9EiS17C8PLrIoERlst2djS5YpJuudxKBdR0ShWdOeYoAwR2Z2Hbo0EGANctdGDiQSvT8chKWDhgzQ7x8FWg2ljxpf3swSRPjDWUdhHWH2LwtLSP0u2YnAvu3er2/rrp0fkslNMICBawY++BgMKND32MiCyXWiulSX6EE4I3G2UKNAibnIUA+MMz4PYaVeoi5THaIoSasaXUQricEXD8Fv7wFj24Q4aB5wLoNR3h7uD1fLzVb7jFLcEAvd3yqK65Oj6BGHSmNs26t2l5fheWZR8H2ifW1U1enJC/pzgmBxHFlkQNLCeJ20umB4LRpF6sYKN/iTuQD1yxsmJDnTeQVU8TcDHXhjo6l5G/39fc9M677SmmjTYBfi/fnYcPZagP9gjCrWs+jP8Z/zCNDs2OZA/2mb3sBjdvNEkdm0eiUtQOFA5MyMJ9dxrcOVpACNy6A/3x+yA056DFgeUsG5rR9phaAAs70MvTE5ACRJ1uvSpwwptWFPrd0YEkJbC+YmmeiBVKvJZpHXS91mk9VxAF2U7lAHZVgKN3IUsKq4FEsL04zgyB4fb0FlUNZsR5667hOBVAIHCW5X3y5opXPB5mTM4ZVA9abxgdJIqxU1YniPiQxMlUeFbhZ8iub8XNYwDAAM0W3DjKeV311Le0FlshV2mgmZLDOp6EkGRK8QCQyEXteBx2XsvePSph7w22+5LtTNgEG3bAGYEQrNEB8OLDbBHdT3JCrm7SkUfFrqQHzfJoCRjNhgpAoz8UFkcFGFzw1aUV6iiZCMQHtvIuDyPEPXc2FfnaMDQfpgokACi75Yen4kyFCB0dwMGY84eHkh5sCvR5QOEWzCTmLgJuqlq9vsmWgjm0NToAqewWzL3M9f4VPPB9wb1kCOJfn0ED1AhZ6TDaXQ2AgwHCmSLA6ZEQj2ABSRo3i5348DeeKMKXe0HbXQcARw5oH5+NO4QvxwPTtuuoSleqSajAmiwIAFtrhZD9m+gAjB63aP8wOJT4F0P7FZ67jqeEwpQ/Z1GjEYKHxTEiz2MFsksxNWm+3Tc7Ba/sbgj99GhEchdug5GgDHWAMj5HEYzi5v5BcLKHqAbsGB1V/jkaicDi0cbHTntQ9sh1I+Hy7v7xuH4Sqp2QQP55KPCkuzX7ne8fXcuZm3KrjzUICNxqh2AspCPe1cpa+BaXc9RdmJamGlIFzDJgYZsBQCKAZJswDl8EgngMZG5iTR0di4tuCy8eLYMhmCQCFLLttgCqB4gg1NtsAWYAHLt+ey0APEBQu221+OqlNOmeVIdnxbLNUzKDRyMTxuXW4g4jFZgB3BbdwPLti9GY86SR0kaCK8hsbELCYGILCZh+SkL5MEHU0HRC/LdeTSce++vJFhfv1+18ZOOPlk1hfn+SSb7YnQXlN/txdffi/G2f2MSJ767/f/G7H1e80nv1avvyRD1m9XgguK/8lg/X1MvSI37M6Mc6SfriB5Vy/PlO3EbgEQVP0f3f5Iy7enTP1geFObkTNQ7YYguUgraSGhbswHyL+KdnZfhM22oJ7Zv00Vn6TraEcjByF7PTtYyfEqxcOv76CMtmOCY2Iw1RWPARLmTp86RnGkGg8ZQ/Q8T3VMSCfX6s+/bNkZzQyFtilXUQZhE4Iarn07vnHW6cMVQ9wVm/LWfXDwXmoVnSfZ1b4YR+75cz9zyNENOs7xuTeg7LZ5uBPF9J/SChEFBddqAT59jYRc23ElYTxJ8Q8uzmI9wDbll1jkngrnuKK8vaMRUqPOnE+G2bo6VNyhDKah7SzMUswIM0Wfz0L942W6zZdSZAqjusa8RoHVfr2Zo6HX5yWSYfry+N4NrRzzg/EDLaEr43CshRbhQ/I0QEM5XKfoSAIj2HVP1D70ES+GSqXmjBPYttXGIwSEJZuPVJEiLb4B66MmL4Ugihkygff9cxPY5PhuNTCpQ5MPtEH2B1kMq5dIf2gu8a1ZBJxagBgbR/QXL4lUjoGO+hT7za2BCZEIvYVuaoQxVbkPdDuYpVsS8Jx9xVLqh8Uej48UHuCBTHPT5G93dIEp5x2oiHcD+qh10MfojYiCWkkPeEow+3xe7qeGd8vgsN7OLqf5rI0hYp2b0f2ijh7LUwaJIAcpZVRGHV6oMNiL++TRH8UDQxhTt25nLP/bvXgOZbEkNQ7A/Dgi2rDbj5lOcCqpk1+rlVyOkWuhEwr6U74eCu18EBEfEULKPR06g5z+OynsLwHocnj51DmDigC6AYLsz/YggqVseHNxsSi5qngBlHMUehrM4X0fkWgUpcXjkWlzCWUXOqfXCJYgbqdIeXWHjzwI8hDwT+DVhjScMj9JamWsQHX+DJBPpXB7GqhUsfndDPqwvb0wzFEcbdCcvPH2anG5Rr1vDvQH1cbFHs39KX3yDsUuJDk38rjP+yYJLDD1IpCV6PIuFJeGrLD6SAxO3bF5mnWHxTT9jthPsrmYqPT9gXZYTvhfuo++mNdgFQLfWwwEjKY0rszkVBPTKQf9T6zHISfd6GUhkr8cOhkbP8o9ZnnsvYS/bYqt45uHDYFpfvv+U75B3kw7JAeujMaR7PNgLZ50GILcro5PxiRyKtd9AzI+QipHCnigAdVmXEZHtJEs5V0ZHWejt3m/kMYaaloiJh3eiXNzsCssT6fEFeEAHDwvxGPp4eh6HTWpbK/AA4LFOeTS++klgHvSv2dJt+rLtx7UOV9b5mvjiWoz/d6hd8+du47ZFlxqdwbnNl9ZKrmm9gPRYVvs2s8LTO1R2HCh+WsUXCFn4OPcT0MhBVDlAEewf+Quh2ZZyOLuO401E+ZhICNF+/7JRdrgr4M8NzrvD5WylByPiwOYGxEP364rBVpYITV0gEUp+ggsfjA8j5Q0i8uu2PmWsNFU9KRS8ZjEirVEAAgCxy6xfMQU3O0Na3P0ZanzqqtTfOC71bx5euQLW5nF7MqHq3rWu+1mc68/Fs6uNoCPTvDOrFkp9dePz0mPQ1p8kWBuwhJfTvS+pFIjgzFtnsSn+74i3aUUtLykZyk7vOd1qgIRju5As4VYj1s1fXl1DZXFd/K7g9dm4EtYvmSJMgoO7OinmY+neH9d2AENXazYw7fIPDBMu3RR0Azx6cfP60vPUG8vWFCOzLCPKUjy7T1t4dzxscXp9Tjp64rItfJ+R7+dO6Kmu/J9r90TcYs8EiBOkDwAVQsL0yPrGJT3KmTNpDZGzK8owlXWivTTZAXtDp0ckexzhyfl9Wenm86P03wc2fuutSam/cBoZrYdgfBr6S2CqdU8RsuxgEYW7bGCRsMdqcmluh+z3wpmAmzwUhcJqXIli3SbD8UvyoS1jUUCKLp6wjLikBDuSaB1ZikrF8ODMKsgjiQ91sdY7Vq5kItfh5HjB4R/7kePT5wKEQtAgOZsRGffOQNUXG8YtTDkQ8EGDLLsmiT0WCRyBKB5pHrbo6y5riZOjFdx5LoecyQq7VFw40Qjfgcnd5cxr5kxhHtfh92UaH5Bmpj4OFLy/BIxccsBzHLetPBkg46Qzw41QSTxC2e4Lt6cn2FGC7R9j4xkl6J8e0uNOY0DgRCzirm0npncBzLO7pKgxAhFOwYdYqAMUuBjweAB5dchMv/VWMRQEAaTZW5U3D5MUgiW3xwmCMSAqCjwk8Teuj6QUJXEdzy6oRQASgWAduteokRYG+SgEuAARlcX06ddXCMCmqFyDOx7C8Jl5dxEBQ9lBEAzMF8pkkxwKej1EcKEjJ41N/5d0pY76y/HCYr85+XLvxy5zHD5d2cqTqn59BcOPHo4NNZNbrO9ul/uhil7xyHq7OLmPzvW7ffTtrupkoWxVrsCzHHSQ2/Ot/Xlnctst0e/pdmRhTvRs1F+eEVEdYWotw18AQAMVNJXkROnT+qRebOn8OWUoeGQXElww0M01u4bqkWPg+d5J0cnmh4fnmf25zQvj5qCC+OnFfaV5TPWnojRne5K9+lHDdONnGpz793A1YK9y8A/cx8w4tSvx2Y5Ly05rMM+8kc3728sk43iW0GXzn/KJ40Zk5nRdNsVDxjP6Novy2uupcMFVanxzDE8VvdxtiACg67jz66RqrBj6+FKaz3VEDdxQeo6bZWc/3qc7Fe12/YZ0lB9WFW8D8RUHHJALwpV7be03ekKzJTcRn0gMGbgxCnsJUchL10Lskb1l3MkqE3Nnluj2RHBACAUhPscnxK0w3NzSP3xYm3O7WA960kHoFcXwo3b4lQbTKbl+NuYSoP4kAa91ZzK+urOtuGdSNQqU1UCeQpupfsdxfq7o3uD71dZV8faP+lV965hnRvwLlaCesDG6BJgHFM8scQdHLUoKlHn8/N+qA2QO0LOkAwWYHkCzq8Dj1DqDpdHAFD4vmggi1OtWBIT/u0EKtAgCFAgBMCgg0Wywlujwd4pQEMQ8ksFZlb+hTOYlPInKgKEc5r/Bj0aSn2KXiBp76iKQt7FoAsCgBIK0D/2N2SZTAvgoAPHVgC7sWACxK4EPQprriF9mbxnyqZpmQJm8S20SmuMCy+mskntYpYoIUB/wqq3VNN4uW3AIT6qTnKAlQVQKjL9FZYgLRMwwEUJy1WVuaw8KEEDZcplnkYrGnpaS+M2JvNYIew3N2kwGskQeEGy/6LJ/59OLIq2LJp4MU9P1b+j2eSmL7PHCYNgmIL+XyqPQbQRmGxQAQEQKAvBpwhMd9h1vvAoGiyyKt4wIOkQtguauuRmjR9EsQF4sQqCLA40vLN9KnJiOiSFMPmcetrk5Jv7pXitDiU6ZBicDBWDEYRbVRek56VEdz60abAyw8ae1Y+uLkFWndYNvf17LPLvIbQV4LCU5XHXNWY5eeH8DSzBMQypoTszM+oSSv9LGLsVDq84bHqJOAoqo/1SzFpr378g+kvs23YbKf7EGqKdsoltaSLU+g9WWB0yPUFyYlZYoiytrB909N6X9gWFwITIOM5XpE6BGm4KLou4yjALmIcrxfnZSiKlvzO8qV5avwKy5a84Jb8pLmfu3iqfm2xhJJTJJ2ycX6vKfoZRGlTkUSX+GydFO6jSRZjTbLWqGN810XMXxZtC/tlbW8ijr2Z69aSMN3HDCy+7vX5RyDLqpnP4xV0YrTfHPLFTl9L5OVcAjBQPLe4tSm+3xm/ySLJFNMsosofGDw8uDbzXqF+mdlOep7u6ZpNbeGCe7KeguV8EH+yMhh/YmLBBv2PM3XsesNbqr/MwIFpVej+cKMUQOIdd7eXjaRBgowUhggXZ6JPo87A9sd88yBQf2YGO4mhv5h0RUgrl1IdB7JBlw6wRkG+Ac6utcdUlLvD/g1ldLe0k6drGrzof4SuiRjyTqRiVqRH0F79G6l6EOvB5dU7zu671kAmn7iFxYzC/OYhdywqjng9A0X62UF7dF0PBk49RMi1Y2JnR1GdKh9agks3wZD1jXfL7BOoqkALchGsaXIe8m3eeV5ioSNs6L+mWVnnbIjkHuptEBswOXFoWzFMSpJFMZ2g9C1OjVk5+mNmB032Nlgf3TH7drOJpJ1a89pvqU+xB1eejLdfp0BLPQHilbkCv3g8fiNy/npDpucOcN5VvLMDkvego/6TS8Vm3Q4l65NyCPBIxhOVIufRy2FzWvxTT1RM/y6CpgA/OMAoLZnt5btA4jln293aO2l/S7KE2gvORK3OGbHK2NspsGxvVZqmhsYQMwdV/AtyGdBUmGeiJHuWw2dfUbeW2pVRHeic7o3lJ9lBUdhfquGPmsNag6qU9U01bF8jQ8yi+daoEwjW19FgS3jUkJFcApwoKLKjZaom1IkNREglzbtzqC15wcxglmSpP9CdTQJ1w+7v2UTZELPBCxunRmfENkZZEFX51oZT/OQNEmZ85xVNXrts+eygtEFvN+ep/w1dXq0HfarP18jm3eXzumK2HT563IVK/75Akqb/7mWvW83vTL29R5I9DMjgAeYEnrf5xSD9hszUKW2WhGYr/JQv8dWg4ERVf3tnrjmZrF0d8jxFId8BVQ+3pnb9KG8nnBP47X3kpQ+9f1PnE1ciNX8458MBr9z80d9sP9FW8bP0n5nCP/8CviG6cv302439jO+t79gsXJVT/mKfvefXzaanC+H78/9T/EIqtvnct6QumGO8DeN5+tN3CwdPnLocrDhKW2pbieL1Rwn3WnDPwy2i8B3n+yZuvkpxPYO19tlp4b2aPVhrnSTUu8R+zBoEebMp97/6U+93/WP1vKnYBQoDT9Phh8zANcKsHfZEgf8tY63/MiCrfJl4j+7aa/f+gK7K/PiLq8OmkfONP+XN18oA1DcP5/W9R4dC/i40cB0aPi7hfalu0guC+hkEOCvvU4PXkXj3jVVzoiIXe8zxV75FlPHlbdqs32qRdORm3D3s9YIoLOjL8BUG9/ezcFUW2rFnB05LPwt3CfKqmH4hXHWyXccuD7V11p1wziBu3SmsiR3HjWmW/OxtIBgl+xQJ+o57BjZA6JfMDdt4DSU6AXCSZlNLEXGLMK5imhg3b6ya5XhKJTQ40AJmQOF6MTkK+0YJOmgLSMrB2M5LL4XWEdWlEku9dvtbk0P4yQQlCmdJbtaCh2PDs/mu3ss9WG7lbY1ZVsdPBodFYcpvLejHtyQ7CVUNNZYzU620RrHUPOLECcjfOhtOKdMct9hFrCpUfK77c5H+XViJZBR5aWh99WXotJi03XLtyTf9ks4TxV092rPzA4wdAi90PSSjQdm4HojjtQId0jDguYl2xqCXdfb8nHfWyOHK5An7XPwBISqlwMnqHoNOyJWLwv3UXo2euGLd76pXyjwme+EdMN7jVvHfZ4+VSNZGZasnt+Nq6PScYAdlMMO+yqaA5xY8Eo6Dg7ySr0DG/kdCE0uYMNS/uFNOhqPEvh6FXUH/svaCXTld7ERjUVfExhSUX40kPKPkHKgDQXoW9HfZaiPNvgWfNxhQXNHwTodoCd7WvEeJr9GHo9CdefRMPSTO+Lstmn+4srqY8xAX3VvHkivGodMLURhqBu/qsxmOMu3kP2oppLHw1zlPo5yYHb0UOyfbt3A08+h3Y5mHKoD7N7P4G0LQPFl/ByTxOtvcHTdi4uW6WpuEQJkNy74oSentNXl6FQKnwa5J4GE82SvKJv0v1wJ1oV6EtZ8Xw9tFFeYPRfnDu6aZ3AaSd08t6eZR/rSGIExP2yhngJURQktnlGCOGk8VluSb5amoTliiwu+yaWNp51kl1BEhDZUQEIQoMci64t9vMzDacSwSn5P5LkxVZb0sSRVZCup16iUuqLibntxlG/o0KLnLen/jRgZFfdVpvvAUT4cG7LVj/DZfUIA7qhBoU4ECj1wSf+d8QQoQQ+QhabKbwW7GNElZjxo5Fy6iuNy68U01SM5AyE6eQsQOHbP/RWsfm4XwPAKedYU4a2T+27JnSjlx2H2g0dYLIpiPR3mRF73Ei+2YMKAFzuwPxeU93i9s3PHplyRH/PhN1NHOa/s7oY/PNNh219nduGXBCXIB9w9LXuLc1MOkSF9anqYs7Rz/zaPHKgP5/jyZ6/+tBSvyVqlhF1SINh4/z9f58dvnOKzQzuu7UnmdgVr6Q3V7prYGZ3QjYe0OQcbdxgGiJt1+OVtgwnb78M9G4qQGgO2SYMtFtvFOeaLBvrkcn2SNdj8Sh848/uvoHN2j7V9DAH2AIwhwQ0hAVgqbs83E8aEr7osHkBtC7ZiEG6w+xDsWPPhYCqq4h6XyCdvPQU3Efj9YA1ifYXO5DGyRepgd5602E1mhHyxQRgoI7LcwRUcSWDmSPwICL7qUZsKYaiO/Dz1lqyQThQr94rgjKCjxbaUPOEGDj7Pwo1UCoAcSSQKKMgr21VEpg1rnRxxqrDzKMd3C/3zjnVzf+lga93Ji6R2NgWdYK0rdfmKL2ZRQwTbUJjA1s3n3ZL/+p2fDeTKfdLNUngvHgjCwBZnvupw34Cik8I8raXD7PNaOK+4YngXuY/HZhFR70b5xqAD5d/BeIEAQ3KUAPu8Ve0DE5s9gx6L/KfSf9gCvNpZOERSuiTsR/HcLdi7UvaqbICTCdwV2Ob1QU7nLzvh5vrbePk93Nh/O1EJnCcjdfvceKXl7i7DcACL1bMT5yV52n/6hxInN4DAP3U8eHo3a/YNjeyT3/xaOGCOuy9CaduosvngH0hAcnsYktKoYMwixBmwP4Kw3wii8N2L+1sofcrGGAGSI2DXlVvWEar79PdUS78N51Lzpk98pAaevZ3DzuGmk6VBpeEswBKNAeAlypGUVbREJF9VCMLGB+M3Weacft8xkX0xEjUkAHiVgqivbKAPqbsnKY5mcT480eVm1nWsMHBZVBAsQNUcW34ILY4uX/WqIU9Zpmi37te9jxyAaokme7YmHL74fsrUjj15wE5JMb7olmOg7UjTlzE6i7fUMx0ks32xnjjO4kFwT8L0UBDIOT+xAy633BJgSTjMSCshpMZLE22+lwJe8bP49n9Eomfh0ZrrNV3DmjFD3/D88im5JmZy23jBn9xWLJGNVWWp3FYRIxnDhpLQPvuo01Kw9+ASj1RpRVECn72li08SkvskymvqfuNDq5LzBQCw25vyny2rikoY8eLVAvPsVIMT7ji6+Pk+EF2hdq9lKGPFO+Dfv4gQlp+CoV3fv51HqIkfz8u1Gg8freDMhaGDBH3iMUZ4y09RoxBZ8nQXFZtb6pY+C7cAoREZeKxDJomBpw0E36WRAf3nnh/saFvCYAW+3HqHkzneSKxAPe5IToRtugTQm6302pCBH+l5VBFQJfE8Efz8UxypRZhJG1ctyVbr3JvhMxa9zYHx6WxAoNZOMGykBo6CJi6sznF9JhYaV6FkOzxe2WmNShvGh88P4GOqn0XOwB7OSbC/I0RzCHdJ0Ii1ghjULTmwTkQJ9PV88XY/Fv4/aOGP82NtS360V/61ZYaPa1ywvTbLzft9N2Y3HbI3KiX/uLW5sfjwxvyJAr+zK/i9xv0PrH7zenPJaGyONdP9uvxli68HH4QXRoyy/bfpbQ2mdj+foIvoxVsDZFfnDZyhCzo/4DVYZ++p4zyUnjcdblPsxWDCwGHiCiOoQcsiPXL+dBwXQU7Hc/FNBZ5bFT2t1c1NaFyJyqmX3K2cshO/b77jUAv0T3oj+AowLO4h+5I3DAHNpsoCx8ew4cjKxay9AdogL3iLq4cAsMgS/qpzTA3yEjy31KhovF00Wm0eafM7f00Z6tngJD2LLzwiEoGT0b6Vm1/PrWFGQxzMx3tITZyXG4wIAoKiBHWvLve4/BsFEhAD7c5Jm86/LxyDr2t78Cve2z9v2ITIEA5/Mbf58BlP/doxLyHZp4TwZDWkvbq+iZQHdhdK/LPir2LhIYKAFQQuKKqnOMT9Ca2X7RRQJZniiKsD6U+SAhjbN/MMJEcpbLllSSUXAnh2Wj3X18HDFsGBEYgPdzwowNLI7Wd9Dm2KoRhsoA6moI47j/6Wi7LJVSY0iw8vk/LoE6eKtGdEjOHNEKwp3Hkk2d+z8PIXE/HbSSGj8jxae8Hl0+3JfD0rS9e7E2GKT5lUoon94OJWfcgDYq3my0GUfhym16B693sGXHr1EV95fZP20szvG5lU0uVz6iv9E/FxSj+KKtuQ4aItrH3WCON6xh3R93gn1IWJ8/FUEyfqMnM9pNVf+CbUeUqoy5DC5c/zX8OMT8gPs8GEN5sUEp9KTbetfGFj7DmE/If6qYF0Cai08UfPkpQt5ZNj8v/XRvnx1/gHOpM9+3q4gpTc+QxoclmtMD2GPAS0uLyQKtJrJ3CT9UVwG48Ic8BHHiK9JlWTXxF111eSNBx/9lRmGiMfnn31t9fDl4Pl+pK/b8yNgP4IOLQkClDQvWF01LXdn4SOUjddEDxTFODkf151ld6AyntGbVFouQIVdThj+1Wwv2VA2Ow1/z+iWJyaDu8X5iFcVkUJ+WfB3gAtPT1jvs3+1wI7OTP/QT4X6O+OrhIclBByAZB8xH97qkmYXmYr+BL09+sGP+slXkL9g/4L/dO67LIcu5j8o7HpM/2sN7yWdF6fAEmw/lSqfUqbVbH+mhm4kD26GwqjNPe5KmjUxxfeoqjvzTm1eyWI99/NPnebzApo98ThSR9y30NRkBIgs9DHFp+eHyvrXkdU8FC8tdpgZgkUfxBwhCLsTqYZsT289/5Yja1nJD7iIzAC9KZv+sEP20cNVP5ETm+SWtZPtgvmdp3OF2YteQ/dwnh/tNtDv479K8aHYm0SR8BbZy02iPH/7qKbsn2PgIPqTGvTTnoknnnnT3YhnKPVS7ZNDMQt/rinBS1GLH7OFmpN7mSECFpO/1DwZfxUpLBR0L5kp0+78o7E3KChlU6kMBTxxas+GdfyqoLayPr7Y4jpNX/BIzNSOkZmMYnDnTKSWZ1reO1kM60hpp9zxjxB46WFYUo332ySjqt9j8DQ/EyLiXT5p9UBZjtR/6Y2amufoWn/nVuglUGGOcumaUZet/E72g+oPLhWQHmCRNLlEbF8vYf5bt47oHbUbI84/6qP9Rrp/gqUXtXij6z3amr3LIEBwDLWcO0c00AWfgi3/s+jLRYB4KwIwRjYW0DxUBkPQ/25jC5wDG8ri2QfDYDoTPYR5dPtB3b31iOfDrBEbhIUV/F5GboPx8Hy01E42pjyAMCqEZ7ug75kNackeZWvTGdRJT3Alf9glConqU6EKfZIL/5FV1Pvck5xnkRkm83WgzRLhgbe8lti2HZ4Bt/MmcxWosLvbdyNF0FonBxLN/eKlsFX5lO7GO0N3IYr0b9obWzysVDdAcn6SoSkEIw8N9SZHdDZ64Z1/V3Bz247mg93mtxD5eSbe3R7xM/8bpmbf8GmUvLr3BfS+6nn+T5+FtL7vZ2l1u5yfNjPXVN0h/95RJcd3pWhNSI4NScDW6GKmCPou5H/56ZCOVeiccL6t9qh/HWduhPBezycf+AUeefHlo89RTJ7rfOv+vzyY4Eo/LpKEOp3dC+vyNjjsjzI5sNFyI64fe+Hqa7ODNZuMvm6eIXcuHPjQwW+kpUfLGow6bj2k8fo/608HwnLhO2P0PSnUZx9BjwRQtJzp/EuwQROTzItMRjn/tr4YgH9N027ud9yhMWMe29+/N0tUoDmHsL85jYYL/uHBJ/Ibv5U5mje7rah2fgJ2WThLgTCJPoDEtix6PZvhMb5VC2cvBUvVBMjvuYugrJg81dodfEG536RcXN2oCcDv1eXS15pHXBb1o6yUCdAZODEvR/Ag5yGwzWzQxIN6xSzfJXceh7MAS6jJoGuv1kY2zeK/k0WaewuaD+LKeHfNRZl/3xuU9MmE5bv+p+U/tksjfOlKF8R6I2DVlHM7qnxzrAZN+TJM9ShTJN76OrDLww9JqQZkC6xtljpvz6A51LDURyWVfJp0qD+zpTQZI2yldBRtKoJwTLaCXKvPx0FjaJod0kf18FvFVVUawXeEMGEMIL7FfDax9u3VvKzKR+J2psBXmIpQIPmWMyc7l4T0jmItMqYqvN8bm+ebf6ptRuo9RWQnud2YtXnXigVuEpbUOdujz8XsXCbTG0ptQctpvOvMHsVd/1+Kb/Me5LlEFZON7lP5n6F4CaJ8HItlRW1WTWA1+2nY9JfuZqOcfRZcXt5V30Y9hjvhbk3Nc7ftbZwVPXDzWHdy2QX6+yZporrJOPOZ9kHAsoHe77wKaiH4RMqS6oKrz64l5CuI7RKPHsVP3B9JgJsT7Rte2hAOrMQFLKr9/f7P3/GSxwU09k3bCTWT1/DPxAn/JYB5R2Os6s9uCO9ols6DFoYKtZyIYZ/l18YC+IUh7NdQL/UgC/bAfCnv4SfNcA/gBv89PHOARqiHjE40/A/xOz+MAF+iM31ErqDYvoxfvqnzTD99DcMJwJ+9i8keQa2+O/1dT/+U4D1IbzvQZGZGNbEsEZ59+Ya4x+xLt96V9TBEV2O5NaoaKu9w1EpkmbZ6W+G7JOGau6Nu6Z5NzzCmPqbodckCHEnbO7TGEs9bM/b96mPKJuy21y97twLbgwCgX/mBz3H44fFJDGYWtfJnGEl+A6NdN/iGGwmybVgoPbjqzPV9kedMA/e2xMkzUcqvebAcI1e1g42Ees91p/jxJ3R69D9IODGQTgAwlU3CD/9oAOMYbUJjIyhQZat++1o47T48GpBmsxLJ1JTArYiLsetEEfqQJC0AzrApxouuST/8x7zyp+ALFyvd98erVr9/lZhZkfK2HqC2frswFwaqF+ZJFXA+FSrtiSwiUwOAdsk4YFBVj9+mGlC4ZulPFcAaMhjbg/T7KqjMO8doDV/GgU1lvoVQq4I7f+d+Fnb+2804O8Z/GJNTtUw/8r45KoWsRpD7T+KU8ikYHvQYuwjAXLXjjBNBHN1CLJDGRvzsN86ewATa4BlD2ISwCFIiGvy7sp8kpN3TjZ95cuv3dtoqEtV3vYbGl/l29noXu+T1yNops4iKsR8iyGmU0wS3q4OWDFVDfvddE//WEEtOOZiY/ZBX30P5eJlvK962wH/mb9wm6e71U4bFQ3Z6pK+eh6m55h6lpTNthwpL5zdWfVNfsG56u9JFUDeUD46VMe2Vxn06vi6s5+20x3u+YyS59ODD6Tj9tjh1XoTErRQyPrqqO3Cdcv3gze4WOfmqIe2MPOFrQewKL2Db5LcKzttPCm/51ZxnQClKPfO1VhJPfEbi0ZhCqVuu+SmHTmyI2XHifXOHtgl8bdYRNs+GmAm+f1cWJGPGH1wPsQcPKw+cdu1S6fVDiYehBcLeLUSDFYHb1aAdwvzwcHewny2zb+l678ZJV1f8G215mc1RuawhV/LfZm/BYp/IWyX84bqk1JGCIq98K43i4lp27IV9rx6gYMnlyZbVTGzxcQgOcW5tL1l7NCD8kaHiiGZ6+onBFvsOHOUHOdhpIr/ciSywSIajrT9tRE10xxvQ/o/LtAbW5Jbe06rDWO8NRJNU+DV1+qnCMEHZyl7Nmwsp5oE9aiGEE1CpYxTExYTFZ9CHWPir5B0P1UAvlU87EXDDVu3kNy2krvgNjbkKpnwmWCUQkO/0WGaFBxC5H0YcQAVMhvF2Fe8E4p/GQMgpLHHGL5QO6IDOwMmd+Ypl2Q2EcHn9d+wnzjWDMQ7KAjHDiUbfuA/IfEDbplwHHHOpBopLLaoQyLV+BeKJUIOi2PUE5E6fLpQ6SXAS4+SGWnClA0rJxm8zHEzEWnFfShuNeoh8QbBs/FpCYsVtwNxYPwPAtWeRki8xe0oOCg2EHpWHHBokCO+ou6Ig8PVhV402kPill1AHEJcOVOGMECy/qBRB8kOjxq9Q7LPg0Ytkg0Hjd5g2ddBowaWfR80eoVlPweNTpBsfFTbQbLjQaMXWHY6aPQMy84HjWpYNh0U7zh+HoCT7F8VPkPp/UaxQ+kPysC5PKPt5PCqkGWl7kbxHcK7SpCF0u5J8DMr7V4VfobS7kbx05k/zgXfstLHveBbKH28K3xzLlUZplylU3DAtsB8KJ/YrvHnxF4zwbyUc2wsZmWXN4w5kUO/wPMdF5r+w+G3wNOWwlj/xZ9D/vN0wp81+f9fahuwQmj/sYWVdDbdRvjGRhZBIF/hEaigwhkr6hHNKhZhBa1pvbiBQ1FDDLnS/CeF/d+tgRT7XENBcaRwsOipmxcQUTJNKIwUg9Pe4+SpwQRFEup8DkUkXJVxpOyo8Cso1Msv05aW9cQMip0aCuB4HgsIQffjC6ITSK9iQbpfcasltO/WiIGqxZ15R7jq6LMeuauHXQa1+f4UKl0H+1jskYrhNeuCkvYj/HirX+EYsM4BAwtng0Ac04EtVmHlmZ1YY9UiKEAeTL2/RlU3xZNrIEsrW9jUbtSyPJmao3/3CjIoGuJ8dMwELBKUCMwUQSpkcFjqBHYgSTp5phUU6l6CQVrSyUQc0YmwSFBUgkciNBZYgkO/g2VQ1A41JLHCqpnxt+qD59GFnUA6NgtRyFc4FGKoH/6CVIye+tBVcVDRUh17E2GEsr++yzZLqYHPgYi8cLb3lcwY1g5eK8zgdnGIhgdHdbPzNzh4iOQ+Sgskpt9/SULXcyh9Afvoz4hA4wwUyZHiTdd0liyCgAhH+Qr3CEJovfVTDn4OVDRbX6ADqJ4aoEwTzrOI4WyL0MclO2KiRTbRo76Dk8J6ou4lyRYGTp61oH4IC3W/ItnOaJGtp9dchhqRItjMwnUjONBN+pgpSQ4i/AGtMUxsaoCiHX19QRaqz0IMxooF2ix8JiZ7qUnCbsxsWhhv5hOej5U7QK5YLndsXEuppAfdafYaBJPd0vulQytB+psFgxNnOccEZVCAerxMiMG2shXW/d7X5286ZijoQCD+hw+7GhYn7faT2tUxYWnSNAnga7RzKrcomvS2+oJVUUbugJMZQPr6EHs+zhtF5ZMBDDbrBUQLb0tiODirOPLRfiwoF/qx4E6PYceLHnipTVFe3DQ42XotsJJnwBaqPCsJ4Lge2FpwhU05UAHj3FVfw3WjZTjA8OpwhwEKLhaL4zKZhwcS2bRhcbMmunm6e6MUb2RTHtUOGUTb3doiOO0VhuyxCEmcv18kKSm6PzhEcDfC/es8koR2AigixS/HG9f4ejrr4eiJ7AwfCfJlF6WdtvU5yqsJs6IEJtJjFD5ba+/AO/FF1ycxzmpMyShCUHBTz3FkJL/diSByLygJx7ezQUmpObz/FGGBzCgypIBCRmEnxANRaV0hzWt9bXpEsGpszMTJINXyevTcaUkn1azuKlHTOLkSIkkzkEAMbKBwFNTigjqWamQhJhC7nEIIBX1URCys12hTdUg5nzGm7yzcTSMcFwIe2mjA/iqweCFG4nwaiQqFCA22WqmJMfKqsQayATWHz8wT6hrrlK4TDnZmw13UQKVekgpWQKANMbByUCi0TXLNUJgJ41iYrHp9l2/+szLy6mVVwF8fow6AQj6DhM8USL8bLGB7l5vwmPZGLVFnqdra6QzTS+1mC9JTrh/NpUqrHOVfl//ILBuUp/u0uPIDKa/PaE70ZW0y2BugMIESQw7PwCqqbOON0NxPLQ0Wm4rJrghGAgYVpTkJ/ACCNqvagUdcacTa8ozAIar643u7VUOBiKGEqThO3sMCBZ1PIygozWnvYQpHe1lc47MpFCz17qzS7T3vxoyqz3eu/WIKxckUEUixjJVZTgRlu2bI6YqRRqGmRmcf3whHHulgZ3mdHKdhJx72VrVFs6R40hBCsql9yqlDH3E2k7grmvaTQLwXPANYT+k9s4iePIHCnEiTIGwAI5QKCQZBlozvjZCYb5qTWGzJaCsFeMRTJyRXxyw4r4KtkCAa8/K7U/wBip7Bup9zmNZiLAMiCoGNGRGozog5Dl3LhwSmi6XMHB2QNfrh3W/Ny5n3BEbeHpSjPx0BptcbL+lKdo5euX1HAvdlzldH1zeL95v1wfYjlwXr/tIsaEcfU3Fx04AKFJOgKKHQmQyDk5gFr6BJnTZSrgSAFEaM/Y0Odx7JUGIVPlj0TRp2m8QDxY0ex2mrRj7lHINgELdyoywcYmobF9GycjRQH1l4/rJtG8qSxGcUs0Pq8IVPVK9vURk4gQltsVABXJDJjBE1sQZk4BmdKoi+DOuvPH1oUBD93n5rImWU65K4vF9M+okL/n8paVOgp66eednzt8SrtgZcqUE+6LvBwNnbmyxmbkGjgUUfxwwKIne/+NQWld1Zw+iNpPbs4IlxgvYY3DJqwqPy7Y4p02cDmo/dYP6OhQdYDu3H+H+K8ez19V0ma8SP2mXlMlighhp2IZihGGa46xA/uPR3UNCjpCE+4oZTwK3amWk1dZzMCyxSNGsArIlnEFj2XqYBcllXj3URzcqbHPYGcH7PAwhUK2m8rhZgPwcI0uM/CQsOxpz/dgROB+ay5RFODT7B1Wt4I84dfdULtm4CZvAMaNWQ0rkGBrFSVcyla1dQMqsXwMkPxtRQj5SLQOLzGM/FsQOGp1s10eaWVEXc5Z76HoYmc7t5W0TKTnbiLEeBPbguAC+nssSFkfxkmrTDHFrYGzCPc4wr1yqMmJJsyMgSCS+W/rBf9INbWus5BV5YgvuXGDBBYYRTN9SSnoiJ/sk3X7PsZplH7WRZAlKibRZiTs7Ucqxks2SNLFy5TqHsuAJmcs+iqJYLGhHJrk2tHXvZmldMAuQjIny2WKD7+jSVGnJMo9DzeunQSe1hVRzxu7B+zfxu8qjZQt8/XuBNaGHd/kF1k3K+N+//nVxcq7gNw41AUSKZh5ekmkTqtpbjqe+a0/Xpyq0q6DF1mFXcqeOYE1SyBtbWRwKD2m5dt682qzV65Ee95GjexSaLCD6HUUGtZxQ0RSQUlyo7XzTWVO531i8AEaXckC6MxMLdQtlQzYBGVShqM0tb0pU8xygZDRzOrvNlmL5NrVFICEZSXJSuqGZkpC2A6Tut1AiKeKV8ADlV6sQbuEX1V7Uzmspuo1i8G+6P0lAdblc6gTfRNwTr0KBwRUsFa7brSLvGI9nTAeGi00i5tliCAXnb0XV7H3X/dQnWKl+UWY00GlTPHqt5rEYG68sy7YvDAHvVtjeBQxEp0bWbmaoSENv9tw4XHehIpRYVCyjWDIz4H31drheJj9jEtQgwQLyRUSgOZ/XBcUCqBGgZfEMEWwO0NkpA36gCsEUX4WtEKpW28YTU/64FNbLIobw7v7PFsR0bo+zI+C/RmED4H1F4lxnWVru+OAMFkdhVmVlyTKiqk0wisaTc8GJY8uZTB08qT6MK5U5FQWJ/p7jo0E/Ze47ddAqBqJekIjIs/w0E2pYXhRBbYhPUWp7zEaubDZUHisdj8hkN7f9ZYn475rLqvrer5JNDpjNK4oPsTza4Kv/BcHnr+LSbLiiwkADlK0prCIbtilpdY0sfEdQGLbqeoYhkkyPpXh9M+VVAzZHijjA5pWSxt+oym62xHVKRdyIV0wyQQWBRrT5RO85nPVR8bE2TLg8LgcTTa0ehry74eCXdlwRGodq/u+6WajI4eZZ5rLckFf6VisMROHXtmaJUfr53D+4G3pGrR2rH2sHQMNYz4DrSojKv1N0glvHkSVsmzM8rmeaTL26NmY7htw8yRtDKzoBKUav2S6eG1pAY7zVzMK5lFwY7vKShuPDlseApVZ2ipCetfuYUse+Vjp43gmESJ5dyYSjPbXOyf9CKhlPVruvu76a9CqNsPbdtVxIk5/zAxkX4mlX5dmBI4V9zSeHIhlDO4P3ZA5+pgFop7z9PHPvLE/kC1BreZpdKMF//mMpAnkolKBQvacjs1QEQ7HRUU7rzZKhK2HM6UOoOV5RDnJikeisIK0DrSeraiLjFUjsZHNtrsl8fZM0mFaSwtxXTcBe2JaSfcTAl1k+oQ7W1FYNeDZbLQiNWFwfRsudNvkyeEVo1UOHQt7cyPJihN0cNIHg80pgeW0r1Ps30YCVRbKEYU3BIkrsJhkOgZdnqNxgiKJPDxBBXT8oLCZY0s4jutLc4toB2XtP5OBUGsOBRZJ0ehojtC+QpZa/RWoQpqYzt0hf6qk2s69MBul5s7SKA+6jzDWB392UPeR0NDYmNPtkYI6o4Vr7fBLC795sAeAH6RQos2GAzcL/EAFobP1UOBo03ERAtt5BYF1stQypROV0gdvch2MNdZRfFCdDXdlIZQ4pTDA+Ao2oeQUyLjJy0+3UOV9UnrMGjSVVmYnCE7myLcZp24rkvxTt8kMREFkAKP4k4bt+YRXnOMf0pf3wOplLkbNByGZ/BMVx1D8uLFXAFPmNfTyNFfxflSzqDtXaGz5RjPlg7e7Q6OLrf+kfHh7WYl+QDgaUkGaeqSkR/poWWSxM7WEQPjotTprarMLqOlqjDhkjaYBkf51HmGVgbGRkxgFpUYR+6pGYyD8TFyy7Ywx4CaSZsus5oNN6ASapcQw8SHo3Sm5ayNmNzL0LRlyfY3u88p/74QCTenQS+IKfBCSW0XFFACrXLu0pVt2EDajMY0UYRWDkEkv86f9eeuvN1WMUQ6KMP6Yii28Xy6CyPP8eE+3DUfjILIlE6CmHYi2IwndBjy+Rz6H1Nr+/F6mjevXoyY7lX83RvrootQ6R4UtbbpKUl4ykwVoDaP4li9wTq6tsuQjPToSJZC2HDPhA0g8OXFn4FGEYw7YBEmoely8Et12t9dzyyssJbFQNgFRmYGUcKVguZ5/5r7KJGDBcKBqYxvFkVKwLl7fa+NOEtB2KRZG+XKaV71ygmqmNaKzrBAFPQtUShKKYO21g5y/lOTeSTBLqUryIjaBG8pMzdnCgYIrOFoaYFQ6HLuGYhDN2fbGPGMeTvY/gp0dpviTzex6UQdL92SSj+3jtN3H89aoJqHLXUIufaXAwB4ZJ6Qi/T3VWmcgodaGPrFgF4IrKQkFTbE8ExsuNdwvb7JK1uDGVvQKq7tnMgIF7xPOdhGqWEe5cRHiDFY0wStpVDRIi7+lhlx600XQJsL6nYSQ4Z7eiVarZlMVGob6erKo7KKDksseid1RhaaEw6RE/evhTYvA9AxaYPU5iGKEhDvkU+KYhZjEkUtV67CQxqG+A+6LcMeJY0GoT+sNxXQgAHW4YVC6Ekh/GJozMEavY6mefEl2e9YK0h9apw/3LE1jurRaVRBQbRr6rGAlbMEkrq9hdJazRAGFHAJE+qqBlN4JyhlUPyRZdrl+Fp78U6wE4N9HSUiJPnpvKFagjLI2l4bMsmIy6kFzlWxwcmcU5m3zE46+J7lsTTpLFjhE3xwrLEirV4Y2t8ZWW8SE6x4znYNfysR9Jk8j0eVNPZNNtmLVEjR65bWFGfgVqOlxZXBW2m6ohZU4gnFWs4s4HZSJbnU+vyHgn/KS4A+Q7ITdYK3jgox/7d/CeWVeyzMwiyEQSFA4QsqFagoMSBThi+9KZsRXing/gcR/kAgngfO8glczDyXF8EhmEVLfOCAkegVVnKSLAnAE84CFyrjBKU+J29xCLQh7aCSCzljUiXpWQtk9WOUkpqRxRAa/luQgBoIg4YABjLpP2tmBbhlVWVRGmY007vjKP1j6Si4Sgyyn7NQo9yJ962Kos3WSugKP/8tGLXT+ENrtqMur1BRPTxN8J2BRpHRMYGBu2M6kYHEnPYKuKJwt3kNVEy6iAyq05F/cNzWf4Zd7sz1jTbndcz3MfTs2iM9gTkCkt9W99iy8VMUhNLVPubqvamwJ9Tq387Ai7yMcTQ7b59lI6Ir5WeBc3jVJKoA9oUVxdwiQGlwOv7+q5L6jSmhnnaz3AHm75d9scXK4q/0785elBHlEzGXSgqcY2Ei9o06ffQGQJDHOnLyBZyr8tZiQnObGgBtSUXw+fgn1qSIcGDA0BPtUj/eF6k+s7rTXSDs8tNJiv3Oj02zPGfK79d++Loeaq4pNtVlzoS+TpkqFq0i5ZRg6xbEqQvVVGp2ng5jzA6zZedlSDNJKWAmbUAGNwVjfa7+we4nvI7Fk609eXP15Aip7S/P1EIUGRsf/sD8j116j+/Q418Ed3hYoAIRKa1310UAvIinHuJ/QJPPlW7Jb5J1HwFCnnkalJ3mjVBdAVTY7E450Snyn6kHwtys84h9xJo+FTDnU4qrg7VPyjhvPoFFmu7YQa4/zlMGxV0ccVuZdEKum5XBFH+xIpwM4R+w3LSBEDCD7HQGs0t8vw63QWb055DQG7gXCqkxdZJjlVeK2aZGEyaHmLe24QwMsuGgcyRjUH3ro0QDFPQpWJAxaZJY8fhfo16EAKgct4n3lF3XkCE45csJQSU2kowiop/yjULtbsDl0iuZWOnCa2sn9s680KIwrQ2obGhk4Dd0EcAkviX8if3vlsgQstoanNU1CTPQCpZ0cZe/wuWZBGQEbMxm1HUYmZOhOyKWS2wr+ssGMpu0xFImKP0kXBXjhSKBHVAAseT/ZEltz4AouyV6gCRHeFkujN0p3qb188hK3EStLUqMZY9wyut4DsQjn3Ew2RmZaaAVsYWkXKeEQlhonHSL4pLdwAubcjOqY/V5QQWNAJ5hwQMsEtUig95gzDNV23HuoZev9VHfcMFGTGlgkQsiBvkCh/OmxD3qgFkm8yJLmmu8o3g0yloSFJcn4zmS0Nitops2ipcPjkbwlM5VU3awRrSgb1PJ5Q73tAghob5qkwgJJO3cY9hYtDirnIeITAKNoEAR6OOoqgy88TeN3d2VDertr5DpFMLjGNQpeOZjXCJua/rO6SpTcwZ47XXdgLKOwcCtiDopQ5ywBS6hv4dNoYs3yJsm5dtnfS4QagUftsl4erFO7qZpp+4DIKdyW39c9gNLdr74ucUJUcmLBBSRykXhd9eBgifk2SWiv2OETgfGWODZ8hWEXBAMj+DiG8QumTsIpBQgWaVnXcDXIJbdnPotIGK2MjObz3PhXUxx8bQUK1m0zKJFJCVWG5aV6DCBhBzA4ngF6W4H9+oyRQWo1I5biQXGOBWiZD4nDdHonuiLqnloTIVXmwpN07AJ6+4AbWMqbMTZgKuzRF7jjnXNB72XIFSw/eWcmYNUqzADBkKQRU36L5NyUoInxa/pKuTQCgU6pe5AOJGQRQtyMc96PrLdzBQKWAVmS9+/xwDpOBTHK++cSWP2olytNNciW0e3jRZIjnstsrxxS4kzYtoL+7/7GllSQpEEWVuz1QXvOcv3/yk9Gm4L6UhIYkkjtwNvbhQL+eWN6zy4VqaY+EvgwCaRWmfDskyn8CM/fGbeWrjf2Y4bM6mfSGmqSW3hfjUD1aHyxBVFHueaL6dR0qF7fh5wFUllFxxNYix7HLXdMIhmGTQZUOhNJWJooKrUBOfg20OvE4V8N5Ni7W1tnZIjmZXL27fVYrv1pVHr6De4DQGfQ1vMHZvJEaSmcURajbhyAamnqZ3jZNIuSBcTgcBcLQNXmcE+vvHuRtbr+UF9REVd1gxOZirHcLjnsYv+VRNVBsVUaS1A1AW8nlKBrWdOafUMh33croOf/MgXWy1eCsZzsocBG9luf1RkyyALmkJgdenaROLkiqtuDWWWyf45m0s7CC/RsQXwkyiRWAWP79WvBGe7xCmdQMIlluGSvlEGy0kt2ngHzSnB/c869dmVEgbmiexAaQMLaNuh4TrO5llEpKGWWxD/oeb3BStfLUExuH4i0N4waNgylzASrYLvTgbkgNTqEBr9qa0hjTEu35KoMWP7d81Vc4ugYinxtwBQ1pU2b6H/i2mrmZv+c6Xk3ZjjpKzfKebtvCpTxIqu7x9AW3xhsjt8J0qxJQZ2648yxN2T8KfsrCX8rRAWj/jSapRbrrW5tyX75O+OmClPyF2wdTvYWTRonzPPvdNWmnknpdM5RciGQkYvJuiJplm5XOu1rbjGHqYrMXkdXxa/qWTzDvnHiCxzJGS5OCiMQ4rt7JtHWtkhZQJrHpsvroe310LmsRtR5CwGyoSfOnSRHo26ROx9QwQ8p/E3ocAXs5NyKme2wFV57madMxMJh6UaEFe1ZNoSUitp6HtM4iDHSxrh26wJZsua7K/uoYVJb+Mm0Bj7pqdSBRZNU5ws68WTQXp78inBWeKstFfeShOv2b+G+eJnpD/aQKM5KQDIApUNfUy+MNaiGmjwf2GToCzNnWpRX8TqmqSdoWBdipVwGo1yZ1Z2fA0Ajwa0PxsUdr7Dmvm5RwP+h94iGsD99tiG7o2IEQu/MqcBwJlGRR4h9SF8PpWJtA5cNFrOe/aLC2mPTiF6X8BIjnjfnX+Ejlwro8O+9/UheU7DiJA9hCQqy7WU5gk2IhqPAHHPjXtkHn/bq2xXoLcgwQHoj6u6KCuMcDSdOf8HGQSWsvyAc5S3DjGwf3nL27lt9fNDF9+PhApG+Bd07XmQMkv723cLBudVNnNCCiEKD9MKovQ8n79XHvqwSkUpJgmLRvkPOWOlTME4if5VyZfCDztNlPaq8mY0V2L9+SrJJ6Z406sylUS1HtGE3XdLSed4ahy2ccOi7WxkpzwOk8+PltXVkgglAASJsHyEonope2iy8sLdLw0h5DkBcJu7UmCxQUE6Jp0TRfN+0tHoZRXb0SwSEA4Snt6M/SzijQgLkB/Jj9VVcQr1OSJX9uSEGL4fDR00d2B0FdMqeReitTimaS6bDFCLCV4z1zFvgT3bUuwUQUtmq6x5ZAORnGvNIXkJN+BWGMpQYTlpUm5Q0nczJ2/XD43C9H8baDJi1i73y7NLqEsI4LWEJXpTjFZDInVnFQAckahfiCCRI/Jkj0mwBx007FXamfS+LBFBlbh+Sd0i5AXFZ9ygeqlo4hGXbfcjSWwZ40G3S5tJVbKV5tajALjU+SjKy7CUp+fm1uDTXVdHaSb88grV1MnxKi9Q6KrvdRkt7wjKCbRgLtA5I9g+LRspfLU0/ErHmhaRSVHnkKCmMB6SzAtdocJotP75jXu3Iqnta38RgnlwitGTQbsp+3/qjg44tRdOEwOFo+yyNdJzLxeIqraB8yPwmYT5M4HtrUdw7cQ3c7cJjDpNRefuuQ+M20YysrxyCAw46JJpMKb5UPRjehvqXI1vBsl63G46D6TsIf1AvipOlweFGkdCZJ70BFTVsCGsyIIQqZittUkoUts8x/D4Q4f5bXidsGTMtaaovVD6j5ruYIn/vsp34eJOED5iDY2gt7lF1UKTjc0ZNPyZCpVNRVCO1oy1/X5+jvFqpdiut3ZO5yS60cf62d1i8+QGaRI7JRWqufkuFr8ibESB1fkUI03zVLXTX0P1dRqEvb0KWVIbzSKL15TwWlz37wZLFYBFPw72rC91TjpQMgvESOVOC0Zq6hC2kG5D5/RBnPVpRGt11uVj6Nn6Pld+ezKJix2QPhnSouYl1LtTf6OUBftjmh3kYCpwVbrLtXrgtE6uLp715SFNg7HCiFpA7xYeJKvDPC50XPJpSYBk7pUnB/16x16HTQtDboWWJeP3rCO4+KQODbIPDSJsRq9M3A1UY6APLKs6KCIZuyNym8llYQgdIkujnrUtDQcbB769VIt0OUhEyLz42uu6sYsvyu6fxmwQyNG/T0gsw4y8848AQxe0e4Ab1GfOsSnQNuwahUb1hbdEz5HYxKqQyXH0rl82tt0MASdLcUeB2iwgfiZFEcqFGJduyaFY2LFJ9Fr1mm8559/uegmeG0S2yNfTn0LP2T8a2rjSFEJGgFgLm862ukefLVeADIAXW1REyWPHQyBXyc6y9OBrEDPwlQnwRRjHCzbozguW5DWjp3SXStzKkVODNGSDYPwwWpKFiLMjFNpX5H+oC0UwktCPEF8EqUxU+C1sQwU+cD2afffYQp4Q7Iip9GriHCCQqZWUlT/23LvI9kY2P/pEKF9Lv9p7lGyoGs6toRfCpoKHBrQfKusPCESM/jzuLE492EzjE+Zr67D7wx9Nzagdk9Wch8WfyC+ALuL99HtBSBDU7eA380s8oU4Kla1Vy4JiVZ/on6W/j1BojJS0yY1F7gYu8zMUDIPpTCar6WMee5iHn1oXlPidW+o3PTi3ARz7ryTnynkJhl0802VcxN102zVnahbtWe9Z6gRJbp/ijxniLn27iZdpZCY1R31+7Zz3PJViHC9tqspi+s5I6S6q419mS5X9Fn54hir4sx5026DPohInpjiyDwnPkr+TdXpLjytZeQ4OakI8YMNW0+tmBz1kGA5pDMzxRatc71kdN3Kq6snhGEnB08laSMp8kCjJAlHFTYlDaWe0HMfVr3uPw4ILtYkgn41/vRbcvafbh8ODEtnIBzM7LukK3xEICL6H9eLs+kSJ5MVyfk2jeZwtej7/trf7JpTYnbGgq2K6GB1V5WslRQlsZcEbOZpuUFgWp52iYIkpGVGpsJ1nieehc1xM0wqFsLYW7nbvgGjwHPnrlmtnyKSF8eYwTX2r4Rph2SyDIc0O3j7Dmwfe4Zl4iBrSEFNWMKUjrURM+lGaF6pVAQoNGWw8W3j0h8TX1YwkjneJSue5wlvcie3lM25Yqo4z3ky+vwqzcV0aiNygmL3AJHwmBRBCi1lx2IBNXGhYDqf0LN2hbqAkyOWSZVVMieFLoqqHHqj5Gp2q6knH2ntONbC1wawLM7AClHlIRTV2fqM5lVh4GI9NN6MB+zLDgsH5EFWa5zGCbwP3mFON/loZmGrRPgBgEzUmFLPd90kwQ7t0w5DVUXE/ezoK9HiDZbqjWKfA/Hh0ITo+c4SL9Ea71+uVKzDhc72my8qmlUUaFrrxAzINo0pidr+U42FGiJgKqhvw6IBpvV949or732Rqphn68kDIPwzzdkMebdk3ACIHJrM+o1JXorqroB0c+v2XbZUPHB86emydGgVFnFM0XcJEK9+AOZ11gTOd+DvKGx8fRzP0U3jqfpPz2yiTS8RFh3aJGgcI+THcFabu6DgCGEPCQ1C7AnMLloDUBC1d74DCj/x28fpuX6Bhc7sUcBqkWlbhyHSJR8rxzoM7RWXWTB/I7sYcZc7wnTq92pTLdJI60ZEGTFQqRm4TamM/V8tIlS6ouFZ2iqlzFDc4b63l8eJR6F4kkxWYBfKmXN6tXc/kCNfhS898HR1HXEoBbwhPjyx+Btf8QN7qT69JVzxMRTOPCdr7r3qk4eEpsYNJkeL7w1XUohIsyn3hjMyzKlo0CLc7I0MNt+7FnV9srIidQ3BlLPsStB05/ugsu7lRDWxmx6s9ypBV7d8B65brSSPJpfY4QwAW5PvAuarwmhttmBtLcF3tKI5Vsa+K9uuTPpd3wqVx+qixw/gWvgCGUcPZGSUEcZEbtwfFyX/edSTZY62WXSauDSdUSzy9w5875a6U1NIOdP0FrQ6qUC03BzTXjWINWdj5QvmymUFbhi454J2vpQ1akBRiamZ0ZwaEHO3cPErgJH+wHoquJeQ/cFqJxFR3dbhmQuZhLcfOSXTvFWxZCionmQYpF1F41C7zrQoiJHMzASTpbNfKYx2mgxeXb6sUqw0xndxXFw/+fIr40lm6O7Tg3LhJvPn1/16htM5a+Amebkkc/olh4TYb9X74hQsioluZIiv22R9BZeo5j710os48j5UW2JZOu1ytqmcWsO6MUNQ/SUjT4tWpa3VE6RJ7iVHTd/xt9Iu2G6m45aArFrzVaihI34HSDrbRiyPOs5gdb2jn2GtAca0gUZJbtcCDTHgWf2oQszx+vqxRSwRZ7wZscbL6hcOSLebO2Kkob5Ed/SOnUukFcGspZ3hc+iUEMN+jaAFsl2i4xw97RBFO3ioH3YDyF3h1fUjO4ARDbHDmxEVb6ofHxArvLV+oUK8QbrexGLXkng4v+2ZlbM68gweYZibMzBPAY0Zf7ghXri1G87fONSH04SrwBLaGl7L+ICyWzTi+ZfJnpPC4UMUkSZYgm1kl+wChaLdQ8Kg51u8hs0vgqcQ8UlyzaSYsFc16I0k3GFWZWZDSXspAd7XjYp4dCUKqvuy1kVggOZgwsFqBtE6kFLVi5+oHzxOmM4I6zNrKie67uIWPgNIBRp0YyJGAWE7SBkdwu8nhZ/p+JkFeyaVsTFbyBGVn2BIst2R0vK0gcryjthaWBmbv4UeEzoT3zXSHWCJlWfCtLDhovWJTYukVJeXo+fzbBdgGo6RRa3nXG1dTISdrp+3I+xHkHOTOhQ/DJe/kFhDj5yJM1BxV+zc4dfmO67eRicegvNkl45xaZNLm5jqYaWvei37ta9GU/pxZsTkHWIeRqUf0tf6BuTqrvVXMJYXMNHgSgJU/5Y2HApRRO1Hg7A4r4hVzsqDBnkqq+pDTdbYIjRoFLAN+8XZoXdHog4rkJv3N9ekIijlhDs5nklTVgRa/vTULe3WoC5u8eFfVC+1auHP0Jdg896Dt3AjSNRwYlQvJHUkW5rLP7G5dwR/ZPvzn29vha4n/23Rfg3EBx8941fTw2jEEDTawt1yRGVrkISU1z+cOopu38fsVY/zEaztnm1Mifa7OQZ5gFRP+1yzmquM7W+oPVkpT4GG5MHd4LldmlqdvH1tLTk++MPOpBJBZ9M+3LWJQnfUe0jy53ixxtzpECIG66yaMIJfTxC+V+6whoquEsmBowcBXjtWjmBhRweVucumzKq0vkCh4mod2KlMVG/HBEQne7G/oHngxqnVNhtjrWk5whUiIFI2yEpp9n5typ8M+z9BzrORfG4J7MEkpeKk1iKhBJYTrH0oB6zd2xQOEWXnF7oQ7L5sDajy3mp7JOvW8vmSBfE0CbVcUZ7Ktow5nhMlYExWf5UBYqUmhxUOTbZEljAwvyWJsw8sZpSaHd4DD2UUS7YCV+NY0ijrDSB8wdJkVpPBiORO3l3fOBoNYwnqH+r32J31/dR3wNHBDebz6u1y8Q7EhdM70BTxbd4253CMSPqU87NaVV8plUqNZ9PPD3q6L+vY2aUMEdf+69oWD2zPxht9+XKrdrtTnC1957N5SLJO8UuTwmqyajxnHtT/ovyLb83l3ZGzH1anXmdmtnAj8rW0S/vHCPjkQaypsgPH58QTzGqizA95mDmPUuFigS+yfql6v1niacFyiflQZG5NOtm7l/9oVTYX51WRy/GfTiVhg6xIssjsa6v+ZRNE4zo9n63BloU6bjzF/h+ZelmELtmZXsAoZmTOeXNTJBfoG9IJ4J9RFbX+Z2adhxQGZOLoVWyKG6Qp1qJMpvhNYI6EsMJkZRT8AbBJlENqMK4gjOw2tH7FsWoeEp3Bjr0kwceLRjWsKjIMfjycxL7snXsloX8cU7wSE+D73VTn5HF0Ux48A5/IA0kR04F3uNAA92zSiHOI5CKYUnRwvZNkoP3WR290lbdxuV9gp4kF80nsdVmw6c7t4+3aAAQrvN/K4PlBtIsSLKxuhEqNWUBYnSvwnfuMt5aSK7XLC/rCVyur3q7j7xMtgf01nWLcx5/jYb8d0/WJvBh/bkohIPzVOG4xKqsFOFp6io9cE3GHf7FbJlvrujjLVkboUmFzdHDMl5DfwBlXmexveDUtqV/W732lEhNZQieWP2pR4iW2mhIOsLVCM4RiqCT56Ygj7kJlRVTl0ncmUGSRhCR4dVZ9GAzBhpoflp58lk7NCE8lSs65atdreIbLMCmuSrHC0O465HdpClXQ4KgjrloTaqD42V2tVIAcLaFTdpOojlggNwtAkZkCXwVJy0LXtOIG7MSqU13LvmsnmF5XdWX0iAvsYH+PfQT3oUFFQaLUc5q+nw2oSqhb+6khNkeGbr+io0hyoRCD9kQTt5xc04jN0Pcnqh+9UHW8ZlgPLOG/cTb5+ItCd6ytKDEMr09+MJQwWEUYDvuck+SG9vqHbGCXT7A1jOje4GjDPuSdAn3QrfX1TEs40ksFFUr0EHHTJtMo0TJbHpvrmml5WPHNTeEcKmA6txgmo2/fgU9C3icNMFhxfz4WpvW0xbXwK09MEj65fUY6UZt1T5oyyY/RVkvKol2cLD975bXZNTscWU3O93MD74Qk6Q/7c07A1mq9xh6/PH9nxD+UlO2/MI8cihYjjeCFOLLzoyac7RbuB7vLnn0vybvLSoXmwImOKlVZUZ0n7/WA+6Rj4/PJI3TXVrSVGlFnugFJ1MikV1mO32x9TEp6rgY4RyMsVHwC7mZgHyoaoHY9Stq4IzCzKgbicpI9anfw82ymGbxHoCiuPC27JmWHIwqPKmCr7rv0pa+5VAdMp0q6ONXR/trBnY2Z3i8BjvUH4N4VTmD2FUKK2ZNd7Z7QxYYDmLaK6U9jhe1bUPtxq3AXx1VTLgpjlAumwpFV9JPqhCtcb07KXPTx1BROYYJjf3pBkz8u82MyVYrYj4s8KoyqsW/0qjf1jVoN2XDSBbKb36QsYGMOg0QyAae9dY+8OysNG6K6d/AXJZGQYG9LTWEc2BcEKwe7QxMl6FztykqyyXjNM5DJjdImMZa3TwDrXPkaAdPy3OGkmnClD5Dix9QW0+nd1a2TK16TAyBUO/WSYMViu0AK5agLAKMYqy/mj474oMWioGDc6kyLtlWDVX8tt129neFtkBMsVoofoR9om8/9F+PbvNw5JujA0TrlMXZUdKRI1sacQ6Ur4DnxLFNJd2sNhDtkOtoSRfyhmTuuPeLAwVINSEeQwhMzSj4bMsbRVqQyxn2AsRW5xbxajHIgcNL3iCQ3xnoDZc+XyuvzZlU2aOxKEoRtDWXp42TqYc/4+SvrZtKmdB10nG2itpgEgk1smcqFus7dmWXD0c6jN6s+OFl0yyEpAJrMu/6vW+T+/IHvk2ZEdUcUQzdzVYS7t23wuacgTG7pV5RjAbZUUTY9P86ipUyrsB7XBjp8hitvNHQR52rT/FutCX+Tz7M5Pv+uF982vcwC6W82snnnRaQyKhwvGZZc4u9Al7sxX9DnTAb+fuMJbNy36uDulrj41OCa/XTRkuMcb4aDq7x2FMDLz3fDz4cn6l9NY/HVvty1rpbyUnCFZw+os6sM9+VnvO9lAGaq99N+5TWaVWubC9FUDv92igXqcQOG6Zh21yOWs/WgbQS+RMzP3w4orHo5EsZ9vAWZmURt+IOGMM0w5usNklA8kD9jNb1ghbCyapbQRR/LWcrB8C7NCt6lT3Cwa5IO2sBiFEKvCFQRgzqzXDm7KU33cKOxGDG+i4aW/wVr00PFeV1Vw4bNcAho2NQ2/M40qCN7BADcRQPufF7PpO9kjN4uoTX4CsaHum7ZZoz6FnqLKZENXKjcUPmoxfMW5/wZPCmU4TQfeFNv373EDd6A1o+YG1kNWU/w/Iai3wkbvApH+QHb/HANqiMui/YmHlceLuQg48d2SDn4pySHj7XiXaxFerNR5SqYsChJq3RGGOC2K2JesQQdUxVOR5z3esevjFyunTU/Cdel/VyGCFR730XyoySEt3nQt8u7cHSQHjWKvt5iAJt89tzTimh5WXXYXKONfvWNlBu0PByS337t97eHVD0TYb3PUpIeEi67KlP7hjdUyDp+F2CRr+Hllsh/tQPs+Sl1FkPdiUOfqxEMNB/t8ahcvYwzxJNx2wnjlY8iqCj9jEzPLDSSTnuzQo/yrEKETUNxqN1FrSaBPSAHXRddGUmi8WAuuTvFpmNFCpnm0PpH/QrOd4GIGPDN7dv2cctFgL8fvrarqHtXRuz1edvYT3CFZcJd1cHSyIVZ4OpUORrt1hl+rTZ+OYnS7+700FbrmIcbDI0cKJLq1x7GM6PiW0WEmcLHF/KlTpqgZ8gLrWgPtK9IKghFiw5WDLv6FMvjsq3u2Ui1a+VZFajn+jIOTDc+vBY3ruXzJmpKbNXqj7FW5EfJe3zopq/plANXxf4KGi6uWtaPOrLgrwJn/e2qqlUiK5mz1Niuq8nlhVampP+GtdfApmUaZKdkrlXi/qdCL2Rj17og26jDUx6MXBXvySRdviAkkjau8kWfQDwlSCk+/cyCosy7audZ+haw9W/hu0VCwO2yh8/9Apkyqr3VVweMeNrFeoTv1Scurmm6c1P59SgLQRgw58N9RAYzqxq/k+nE4N+0swlHr6+LC3b8IHUxKZwaADNH7m2pQJUWTgtkII+rJ57RVLrjB0aAdVBl5+K3gK7axAT4IpH5LHeHyEBW1IBWJSDRpqxM90ADVHtFkEgM545UbF43YprW5osNL6LV+OTbDqmEJ/jriqtYe595IWfjip7p3JvvbrFP8aZxbH0HuUO8g0uJL5OyYHgFs+UVxngaeRg1B6C8QZhjMUvcVnKepw69veLWgyOQvohpQ+Z8n33d5gbxJIPZyb0UwLJC7ONyQTbGvng8nNYyMzgPCHperPqaNWHHTIm2fZLTbMRrXDK1kAsfRyJghY24lZnMt392SxAXcoJrFsVp8tAry04nMxS+Vnk8W4C7uIHTRY9NdIeaq6WE3zGCj1ofxjiRsOSB/ZiRcBBMSkUtUuvypFPk3m6V01zIxOcYnBHTweZspsQrAGZrxq4SgoDhVqsa4D0J92edcuSvQJZDwwLHCWdNyq/1TpxC/7tIsYKUtFTFNA0tzHxir8hII8HunL1ZUJLPFpPTk00QMoFeNdt+QWulFTrFkbh20zq7l/khjNWxkKVnDzDOnTd4k+WBtkfEmsQb0X4hMrVyNTHAzJ+ffoSJDpLF8+Ok9a7F40/KzQy9FXB3MhsCWJVUfMPBieil+YdT3mMTGvQPLhT8iQs0UK7ldZKXamYcd3bJPXKdlr8WeV9w2G+1/IOL92hRQkLsF9G5N7KjW/y3p17bjNtLmOrGC6qcJ0+dj9PgWeCZaFF3jXjeVVNyq/izIsH4OCNbA2hIJrnpdewAoipf8DeWN1jGi/5ugdeM84o8n7Y98D45ak1lyu9YGJfeTZYyCNBJztxc13N42ELJLQvjB7/18upBy4bkTRbquqDqDGXfe5QM02v9TLIRJ6Mao5I3HFGhVk9mrPauGcIQ5SK5aYz4G2QeIGioR+k8eSKPg9/5oeORznJtXfpaRdJpd27lwYHK0YC+HSpll2xAHFiJGSX8FylyihzrU7vdVNnhcXtp6uQz4fqK6YXZs11zE/mQX/ubQ46a1rSeuhDWNsrg1PKrbyEhzXAw9YNBEF9h4CJyVlePRx5x9tMv4LCy8beWoZOI7gbzlGUTIOrUlMBRPwSi950Q9vILQ2QjXG1UQqG5JPbzbQ9Agqol3etN3mJeI+8/10OCIoqC+EytjN6q0Bx+C83HLI3zuN/x7eSnMf9hy+3Sox2GWSuqASMbBRubLFpoUivlfuevpGvluCMlRkmK9yKxUNmT7HC0Nlnz4hiStPD9uAEO8aLQJ0bORJm09dyA8b3kRUicDChliK7Tp8+KRBcM5o85b8hCdq2LMTQEKmNKHLSxJkJ1XoEtSL7haG6xRsOL4qnOeEzCPwVZdOnU/z2/DP/91Nl4bG2lzJ2IDIsWIL/JAeEowdcJUasaFkRHG0Z+rsOjbyu2Vv9dCoOZVCO0/cwidRGZsm5g4qyCfdc0i3hC4YOZmrt7L5WvyB9D/eSSoRZZJaBbNx3esFehCy7RxvGfZWkinpdEinCc/QyCnJmYKUgNXBBwhSNNvUgd+Rh2BafiQkZBqTtIHMVoti0azg+myBsCSJ2z+ahrrOswKqnXPE6fbs0wb0ODkqKdRjOKGyaHPClzCMRhDq6WfyxE7fIQKW6htcvyBRQJnh9A0dPTcGlFRi9BbAzQ2koPcP37fQkCNJ2gltpS4PoaA+wkvI9h4z2MwNwm/kZE1f11r6C2/e1YmfdvQETZkexky4E3EmSMtACtnLqvx9JxOYX1ni4fkHvgF3jX2Hb/7d7kyaRQpe3m7vD6TZkVm0yHj3EiYE9JIb+TG5xx6pjNA1fDfC5YMlwBOxU0ge0roRea7ThV7hV/R8LR+bm/iV0l4fXgVTCf/GWI1t8jKBdTe5Dh653G0nJZ8ELnNqtGNUiUHMWzio2zL+vSHp/gamQiVlh9NNBvFRFOJLFspxwhAS4azquPs0W0gffxO8n0TuL9WL7Cghc4ra/E/hnYL+31s5yansLCFykBWpqPIG/z/ejgFNqmGJ9M9iy6o5c6O/gb2Zrm5UhkK4xTx3z+Lg90V4eQXrMpUu25qgDAvWfPqlHqPHBmSrkuDsXp1sDtSop7oJZAmbpu5rQupFgW4P0S+QubtPzTEYUKI0ZBCxbLVPvOlCdY3W2gXFFMnXOqWNfSpHHgiajN5OCXnH1ua1WhaJliuCt//I5QPVFaHT8NniINdKHLL9Y2wXTW949G+GTsKkqpFli5fT4nYGWU+eOuVjx1T9TMeUgfgwoV/5zuljwoZeb0tDvIXbVGeBO+GsnFm4goZduurJ9DfiAhh4fnuCqG2W1w3pCPpQo7ba2EDdZM1D3uO+ML0cMp5nZe5eGyH+uhWPWUX4WueOQ9wJDwL9MfKbdAEivrjRoHRL9OCg4OsROVpbvKSZQX7erw9hIOJWgF8pWZ4nI2l3syNMt8MHSmXM7nLY4+wWnSp6Yv5dvy2gvOuD5F2SV+ET5oJbiCBuiSbGWAknMu1mStEkp4KlEgOG6h9Ijs8kD2lreJAxccWN1CcGd/Gwa/pd1cshwXnT27pV0Dgn7v0XTyI7nEJSjog+piUuGYfVX8ODN6GgQJKFS2Gw8RQd+5otOHknk9WK8j+nhAchHvjTelz5pXkhzecM6FliyWoKYrQaXGp5rx9rwc01Lo+QJCK1KYxsgV26Fi+mhXyODS47cL21WRfLA9IuQ6hhGVL3zlb7cXQekPKZlCcmXzWy0K9VtJaUjVgTWTSo6MyWKlqhfmiYVcw6AursMDI1jfe3sFPY9se221J57UDokrOipTgaU0VcyDl40G05U6rfp39ZCnqRT/dspIFfCQXOSpCo9BOh9ReHjgb1D4RXblSKfwSiP6rD0YMaapwjcma80CIfehKBhMl7LVoVPeGty8egMr4ULIDDmrca0jVPh2rCRCJ+c4aA9oYxHlO4rUSIm2TjFLxgRVH+01mA0iINf+9mC2LqeRKp6hSJAv1GvWzmm+G1RCpBO3ZVs7my/XQbEMG3culsRRBymM8G5HjoUzxbDDMPc5CC17krt56q1RlYcUCBGZmN7VOhCEswn07CXDzAsMqtCqKQiQsUC1ox9s2E3gGxM5hB/YNS9wgdIcZ7PBT7hSgvRfQFOA5ZeGIEAGudHQXl4uv9Wz1kcmFqgUD67xtXpaiLYGkPFZXkFxhDh2pvTKGYuYNoUz/10bEEXfE6xAZBcLc3LUMNIjpLmb+pWELHp0mFVz+OzdtOQ9KnR7ONbpjyrff/WhNL4ZQfuhzOzfJFK3w5xWVw4iMbx09ypTZ42Uy2PcDblWOZLQYtA1jlmuCaHV7cqC85+YN9rQ+LshVjZOI+Zrur+/HKAfQxVUa74asnfFduvhxsYnBzw6YMJ4w0niESj/ookj0Xgn9LF39nzoQJOQ94rETIHbTp5oH7W/zBvoBdvPVr1nWx6d4oc+IUfbdo8Qx2tHCwZQNEOkeBKxXStFlZTi9gpZxtOe9DoGg8L8BgTEQdGB/dDhNGOZ1aeLuqWfRiOr72LecMZtej73p/8iBp2jB6NwMMgKjC2qCKmbNC6cF6oL0vrld511AjYxJMKnZNUuXfbfqx3npXUfW0LRgLRRpowG4NKxKktUymwcI0p5WXcuJKcMjT1HF/owAq/aTo+hhdSnEEyoNI/B2c6h8hvGVmu6jKKS6engq5LGHlYZ+/dYRzEHbCzbkTG/UnCQZ/PxUzCsNzdzO4M5pFEcb0tn6hXhaTkNWwKnKhQQLQ7Imk7h+wwc1OIxSi2FSyqPOHoqeKfThLlXxRrsCmjfXVa/h0yLJSffXg+ZSFHbIhyp3SuzgFZrFOIkkkoULsLqZtU4wuWJktS3Ga8NN0UDusgGcwktMD3ezYa0FnHtNcq0SxaCPosm9VPkKyUpNQzJw6AET03sRHeKoRe89E0+ZwLLM3EZuuA1LK5K8qq+4eBciNrPSIjEkn5tkdJy/N4hQy01xIW/7xO/TgES6ApDGk1llUYgznovLowk33Ej5YMk/wxBUR6T9KHPTZLec7uhGluZH/+HGPnvMei6H2ctZy/5fOSAAU0UbDQr2ZmhAwuh8iVGtdb+3sJCvuXrbHFc5Ame7JAnHdYG9cPGtzM/aCxyNN/9r5FYP2CD0zhx4DJ1uhErytVjTgsvp8/gAy4gdpcFEkRz7zuR0cGOM8AvfsjH5vVl6GVxppf1G4Ntoy2HxMnmev6GX7mSX8LLvbEwwS18l8v3b0l+8i2+VLabvHW8tXVCNcz1PrXdKOSMPnmNdyzEFJYZH65/yjAims/4hpvg+Z6f/jwJYciqv6ExslssAkcJzV21CzCfHMbJO92bKYQunoRVWURCgpcOOJb6K0nldVshc2qdoQ6y/u0Dz3roeRklkYIfdVJY7aIOQkdL29FAsU1AvsGtdKVHefgNVXVXkOshzUc1Oe2ujGQLlcwrxgUgpwGTon8+z0RadjqL0bNpnbhBVArAkgo+HoFZmWiqPt9baz32vvO4O1q8Mvz9kWlZkxh1FCvZuWdoNvHmROoQCYX9l+LV6wzLa/1P0t6C799NH2TxJ1KYM9DC5RaHb/zKWSEd9LTS6J7p4YE+uAA5GYfXt7BlERrw2r4aY8MwKdkU5LSObu4aHuJT6lAbSEvmrglely6dwiKWlpX6C9HKMBg6NgCKgIskXkIwslMkYFQTrkEumahTrsanbWUgNFEEkpfM1jQZfaIyfv9IMP+ilr0KpShtSqU096RRG/ThkS1HcSQqVBrhTfrEKXbVcjdtj7z4LNBwBQTXWJmbfOdWhrGBVNu1K2tieWIb1p9BstLFo3xBdMHRs+WlqkMa3Id/ehK1oVlY9tvYnT92hQ/UBmnN4mgpAml77leNOiMQEP8Zefp81krS/5GuzQ08pI0tyelDuZIzftc9vnUXR0ymz21heGuOgGxBfQt9e3YaxaV7mDhHeM+ZLu/yz9cGcHczEIEBQRohwMpL5WYDSpe81Lc94PQk4EDAcoy/MDwJ4zN6JJIHKlWSSBNuYrt/Ma4ZJE66CBvusILumyIIHO26r1bm2zWxU76QtVCoo1caAEvAKcp6cq881ywYzYb6YueoIVrRe70M90RP1nczejz+9EuBVPbuTJxXIh8M56W1JhqbudaUmEAj3s7NYOa+M56MRZWt8GHKkAe3+s7s9rqChGAjqioY0MiBKPQbBzoV70dWbd8FuZWA3tjzL3Du8Nxu1d4ny4MdOBMkf1PjWSFB0oTx5pB1mhp10JkQev7w+dn0oOzS0FRIGZchswfAIhs7d/dloC1NcXptwbYqWOW8EIYOnTO56mEZU8wFXdyZJnaAk1OOLhxdSdZEvWHB3qfA2V9nQQVaqZKk+mhgfV4uQi5uupo4OVVj1gjf4cozmtP3dQY0MN6Sdtg5q4UiICaciJRBpFzK6ozvjE7QWtMlZVRwN15TcNvAXFYP83Mag/wAmBLJoiUVDqCEyA2ZneUsyLnj4m5m3GPLpqhAglNVJRHlGVeu6CUT3Sp4J0LHmbMl5u7Pmgi+VWAzfIeRxp1y3sN/Y2KZ4GCSGwA8se1k3e7ebcwBsAmS4PbJJKfSdaWSwfbj+cBE8OUyHoWYBuY63ZrR/YfutA4TaTOW9Lp/9RsrhRi7tFQViZ2kdK8lIWWyCBLUrWT6Y2kEnKfV7ymrew+lIWuEsSNaPacRUAAPWVXcEjWRHNBegVwAOqSeoMaeBp3lsXH2dO2JYyDXbtwHRoxxAkZqSmH6hzjNlDwDIuXJhTysWnwC1wrWqkwjzR2iByRZj10fVXnQCFItTgm2hhjkPQfzQhl3y0AHNf9HsxObApCZUhxHmhF2TMjgZJBlSmwGqqZxFBvT/AlNng8mecL4suX3tAjzyEYpKQ2wndcSeIY5KA8E+2zJcqHDIgWbxxblWTBWXkcTAPVlooVBdTNTdn54L0OVGi/fDiFPezFRx+WCsDg9jCT+kMTLuyD5igLP+InjgduhirkYAvhRksjvLsqmzSP1FRjx7Jrh+gUoKXvfirQGl9dkaE9+ALZBt4UzWgFXDhgfj9idN//z7vFXdpv9Og3R1agYM8WgSaA2GqC1wd4PLOSB909OYmfamfO1Wmz1dbmJNCYwtm3XrWBg3AL9mEInLutAf8CTbjt6fyPEWzqUzBtXEzssmhnIA1rfOkVvDh8rYtTosro/2vV4bxT9xZwO7Y7hcialnUBOdQ3cXcifB2YIzApoqh1Ci+U2ZeuZWMgldp/4H+UK1AXDBsGkRygZl7dYKaVBwhaYLEvwOnESJ4BoEnV9jbbIkY/6mZUgeTyKYmBsy12vhWQ9lVpFCkJ+YZUWNNnKlOEnFNQal5hJ0Dkt+v25+uT/74xaDwBLrhqfXfvaKCrBPXF2KDDSlmoqwU9CNmoWovgp4QpEdCEgBOCKLhdBi4HIoXFWqVQRUtVZTQZqlHjrBigYkp5OPzZF5YXXQgRaNcozRJrK9k7HsXPac5XdbeCgoHbhJ3RIE0TMDfLCfR7oWz2vPIfcuj71fbyk13t917h6+notkiRlIXlIbngHOqc+sQwW/1nzQXxVRe5uJ34IXA/v/czasGtkd7+Ls0TyTucUTzv2eZ+/dmAJpGIL6QqrvuMZzUoLaFvSEbolfjdHbkaB6t3+PDcMEHwr0fdtvO9W1KJRtCWp4ZyL0GQXVY+JfIayX2eL3kLSSPfElIdXMPsCoGZPSWG9u88Yhpmvpngh8/JsMkxUd+jLug/Q2y1UnIALaOMgGIakVlKSBAnIPnItnmdCeiv0tutbDLkUJK/p28dOAUqljW4PfWIkc3uvrbqEueP01hgNPtFuQDoh1Td/oyPyu8mSGFMfoc6WQ+T/JQ2dlmoxKFD1A7QfaigHoy2c7N02jmVELgajLF5gA3EJMMHjxZbDsd0NFU2DaNOdDJfP+88nFYuoDlomZpyYLikLtZpeo6lDBSlYQszx248hEwS9gspV4ucRbJyUYKXlws5ou5N0uptxYVxyBBNqcHawaaIGphhKrG/dlt0cEpASlyLnkzFxab3n4S1rO65FSHex95AH058Eo+TtRO+qBGWvjcmsQbEZ2IOMxmEKjGyYeZvTb5ZiFTaK973gBsJlNWdulLFCN1wUpDKVKBA7udkD6dPVtNTM5nt09NZ3ics2NMoNP0ujzBW4yrDNe7+GmswVOys3QVECFxdO/eUqBlIyFmGUAnE+Tk5aVHHutRz6iU1LOhXg1eM17JBcfeJstEM6n5hszcLW8Hy7fIT6ngiKuPIjkeGKHxm+lIj+Ri3u0TzrahMBRa7Zga0s6mNLI4CVZwNF+gMHl56NAP0hcuR24Hc50ZOGW+DKdYLW3Yt1kfrURtAZdseOpEQzVEWZvkOXEEbRdntQTCEBNzuaxsGNHhlbgYcM04upqjC7TQi3gsX9CNgWJXFc3xHOQPoFRwOi3KIWfCMIrwZwTngQlgxMwhzWdhnk0Q8IhKtX2SOHJiVw2SaLVTFcGn+L1GEBu0P2qvHZoJl3ygwqMaza2+sLTh3NXpK4MDw/pUXohCy4ZG18xUir87Lhg3Z61y6poor0104M25vWSmwdXlJ+xc37lQSdzbNAa9B60PwyOLl1XBD1lkF0nSYPGseGDFq5bk5oqAN1R4m7Ua3dFeTqcMTO8DVqINOgerwIJ6n7qPRG9kho43uy8AxmE4LjPXZaadM56VkG/ZTJ55BOIRPQEkincRsy7+2vSlxulenPVkTb7y+TBN1+PnLlQd8iCkjY9N3jiyl3XY4Pq9P5ivt3SojxfajiQDbMhABp8cOCv1NSSeTBU3KaKT9FeR8HM6Z/l7SpzCjiXnkj+5B+iWQO7zpcau9dUWIxjeg/T8Y5MF4LNY5HetBloBgxg0iJ3klFVIriRZo9PQ+Bws6PSE/SocoySsGJzoK0jFn9dE2DdDOdTcqol7tbqYw1AZOu+n20p82hflhEtke32nANtoS2UwncFB1fxgrNkTA6kKje236lKUtqinMSBa4b6X0WEpc6V5jSk/PK9pXZHOdbJ5FI3EQKmYCpEr4tOk/rjgAPWAueeRFoyUrI/QXV9f6m+/41Ybx+qocXFK1JaCvur8+vU5aVIS8BqmYD8jJIcGA9wjoz3UimvdQjiXEbRc9NeS3Lt/hoYkQsBEXvuRLOsVsqrRh70RsXApTZE1YPRvZgEB4Hw7+BHiD6J8w41kHqfvPiPUH5VA9qketMKnJbmZLlXCtaOvwPm+BSUveq0EFvhrcN06JN5C/RMDciQ0S9ZeGaEnGfdO/VPw+UPsERuvJUmlEh1XOFHlD33YhgntfkyCUsoXES2dT7cCGKomQy+rP6PEpU2sWiKqu5Oqge6cDyKrS8ASOPtp7buBGYOAK9ifnhrNZVCyIJEiSfibAd47LeNIw8W+Sq/B1xCDINyh3naqb33YDGt41eZwRM2gXe3DoLCHVVO0Q5Uz0espuEtz/o9KSD524RfIWBE1kyuuCqxG/e3HSofGDWM/JQuiaorthXVgj11KR6IFoPpK8HLfERva6LWiN48eztkB5yzgo0b2bZ8l4sDSHrravn1Nsem6p2gPpWaT0CC0zxXv2Y9iVqKgZzBo9EbfqQ8ojn2hUsXSmyejNt1TlgeylMxFiy+4Y+UGcGkfnWDnRIzdAVdXyfAvy9xy/a2qDfW3TqIr0ek3TQBMWf5QExhxv+FXlPmDc5nJCSXkECwB1ldXR/0TFBD0AbdVM7XINldTdFz/DqM/MvHpFAAGHC6MNJP0deGou1tq/spK32EyXCyx7+OB7k2n1F2883zJ76ylbcvdCs/0RFArJanzpQuxFPbn2yb475TjtXg+x5QD4HVrVl9yM2ZukVjTeRz+4w7QjuBOpZecnSSfFJpnqq6OqDdjUN88RTO0nhSnU9r/R+BO+1oaeUV5Ch+RzdGhx3E8+a2i3RgPGDPDjtxy6ZMUM1XCsashkmbpzYMlmEejYnez8Mtqk/q1uH1hOHlZBc8q3fODvKp6al0TVNuDEAviO6MVaMR03ig+pZHC59ybajyun601rv8OrD9KsPbdx4WAH7UrQ9bhj5K6nJmrBqspcq2LuufUV7zzvQaQNB4xSioxLIh4GjT5ddJMmfzm46ThRQ500Xmzu8LnXMUW8Hd+Rpj/CF00P2TrIRVvPjXo9o7sP4/t52N8DdjO1Jz/Okxq+wHG6LtAB85kuLDirnxTiNbyUap7uIsm6IipgWo2270smU+MC8LA4VF8vpjrD8wfkb1XUWO0uyVb/DhqDn1Kt22JPcmXzVc/ckvSMtB3fe+bgTiRN29D5hS3uUIDpf8LI9ud3NhsqHS2h4UM6eLIVsN7AYD0ZI8/Oou8qzxlMf/2acrHHx47VAM1ogfuC93sY6LpphBm0sqXSIvJq/AJnIJZRr47XP6+qcnL3Mru34qqFfe+5/wKSaQMoYLq9xdT6yU77QcAUteOnj0tE+z8sLBy5z58t1igVqSukA9am3uQ13+2teBfX0XQT7o4lqck9yjhF9AkFnXmRRjJCsl29AfrKi52xB6zFFI3/1rU12SFVbzpmooXb/zXMFFY0twmkirK4qRka6ONr85Mkjnn32lO5gdDMrMbKnSDiu4bHBaPjSg4T0Zf0dsDy7fAtA2St0V1BcZu7iCrEk7MK025QMxiu03b1UCuOcjRTWtBSZ3CDCnVL5ADUGaWUIZ4yitleJ5dsoe7a7g65OkYtFBvHV86gH7mZQnvoht76efhsn2zXp7bE0YE9cxSGus6QrNd/S+zE/7a5+gTIn4z8e0Y7n1wedoivz2lz6jRuPr6ES+YYvLDexaGW+muct6zqW7xMsN4x+nouOqYk0JOHnf5971yXpgadSfuSGTy74dur7lrzwUXrFRz7beo3gxZie3826c6tItUtQZuzGYmUH2pDHxGS45xffThqjELrbE1dyoXgmqFsej4mzI5qR8mu6lNkpmCLYbVaAn2945woESPU5lruJS+bqtdO4ocd04V5sJ4lcj0e3yxawM21FIVbOxllHKttlsxFl7eYxkbB6BNC2mfKVxmCclgYEk1xmWmy0QGuQPr8v9Eatr8mqcFvrXDJkcKAypUND+f7C8RnXVKpFFHqWTb2LRgM1IiOXbg0bMR/8CncuL9WdvL0wZEIbk2vZFWsCGCduMl+ETLkPXDaodMXCFVpUk5NvQ4qE7HlOlEckPW6vYMRVaqAqzAwJ1XV6fb4X+4nWd2edxmWwpAjdzjhiJgg0LOxAjzayPDWBHntB8ZoKIs68vHREztxOtAzs2u+8XkED/qO0Ub5BsXsd0UMd9Z1JcL2KMUhcdGVvTKch6Ccs1q5cLzqthpiGFyxhcsQaCWgqBgGb2oj+q06ubB8L8PUT//JcOACTlpGCHDW/IHz+QfrybFCiLl/8kunQ2SO8ANnMulNuS+TFcwfOqo1SjOAE/QsqOGxZeFcKMQEuH76DcFr1C+NJxPzQD4o2xCDQ3I+nLKHakF5SkRmwtntuVqVwzdH25qhQb2SO0LxFfO2TSHET6SpxMZSnBfACYrprgSWgCPlQ1C7nzjP8pkz/1AGsUU3H91q1Re3MChQsIw6y55t+cTPi2ZnCj6TyiqT/oRnIoUlLVV6tEyDd32KqBkT6YFh+S9FDJAP0AFU2oDM5iZpOX8wxnP1u1arLiBA9zfna/fzQ+E5HSpbMd4gpKWW5MteBLBs4vkBbKUQp815mhaxmlO+v0Oc5DZ2jLz0vgc77nvUBLYQWPNt/p54hs9Rg4sv3loA4Nz1EDqUMsrLb5g4O+yIsLMIxUBH0PIhrNNoqBB73mOQ4o7ezvAwozdNe1niXhSrOPgIhXWrGZkUXF9gKqRKehSGjyWIXftQ8bES7WwXsxERTEiCBrZ1XutGqEnYrGsJxVTUPNQYA1lqmNd/nJ0GIzyo5Be05mp1x3dkls+qw5C45VkDwk5c/57V95mri1Tgr7Luj77tGBWnDhKRxkZaSArFdIJZ2Dap1jvK8QkIMoO/CZ/hdq1sutgOmL7b7r9dQC4NwXp+gQMlfB1699ry6eqgGfJRaFl3wR3XdYWIQda2OhccxjgSf9KgrfZdqHoLnqA1HDR1WXRuw6IjApSMY0jzBAgMN8ETs31LJGrS3QB2kZcBAgSBHBYk3e8Ac7g/e+NCZmOn2YRQAdRRjPvPmQwlZuPrGOnlrogY3P2aTMsmy+lN6EdKmI/BRJ1VafuHElu/eWIaZ1+m7gdV0rgFHOc0PZHOnaSA7IR7ShfbsYMwTmqmnScY3Q+l3V5RRgHeJ950WpdZqSyV77B4foVwKukqS1uORN6yh3qWVChlFB5Z5tXtL124cnRjCcot+3LKD2FntYJNuwY6Khm+iGv89K+vjr5kypqxeAH2E/GLafzdLCuksMFSyi/J2M+lYevSnEqHltGQYsfqXa1R3765syfDsKJRwTeFGeTlwboug6SzvcfLuReY14GHRCS7E+DIp8YDIesqXanPImBizEb62Lh8o3+zk5UWIcSwP+61vQeNN6dYqR4yF1aBTvr56Kkmwt2583z+e0g3SQ+TTFRIIoSHsyRMY98+c6yE+AS7nrQxFMXaCJSBVSmDwDaFDE8OLvoyhDKdh0C19A+0sOTaLVR5RAPALJtgfzONwUJOX1xbcTXygRg89ZWEE6ivTWFUhfdk/PFe793h+pcqXYbNq3TLQiyC+/AXwLX/vBz9mHt6LW6zoUwERKEti3x+5QA0veGTjXxruoe4FeqHF/7SwUUi8G18M8svLmP1xGJ/reMnIGYjvuy1l0B/HmY+zw7NMRkzOTT3iTnk20onC+DIMGGyffXdUWIH2ZkR4eUO7mZoslaT2nbB2J8EEBMUftx7LOcfZJxpRGy7NqIKf4DmZAS9QRuzam/ALvLYOmYFQTM0aDclpV6gVHVmBZrdvUv4yHgPo9CobQoc6mCL3/qaUyVVcoE7C/Zt+KcSapGH8HW4cS30tuP+MekwkQPCNt5CE+sVSpDa4r3xkB4Ua/m3owE3FQn0thay9xLfkmkVrZP2x6AzOhMQeInsPPenywHrBT80/Ae438Nm2JRhbRSJ2N0bJw5kQtGp6CKJntZdNi+6sRuma42fQy3nofIXP2R3k0nz+K5kAXhiSd6iKVC7P5NHEgjP1dStkC3SF2SEUsC/+xZOgMPlbD/BdOWxzyazqNmpxJLKEeh5D+qfl/QK+LeoLN/tKoFURolhLpddlxar66NV/kP9Cqov6Run0Ylwrq4B2NXueI9VYCBid5Q7mSswd5bxUeeVWOXUSATTPz8ZTXbUVcEHkZ1k9z0/oSxXFoR6/55gSgXDim+tl4wGVjfpQZ0jo9eJxaRnZ67L/9Ws6PXqFf/g18du1xPsPYX2lZ6vzM5i0eRboAm1eCUUcSdZam5P8W625d2o+XV8QO1gNYHqzuSEVYngHTy5CIvES7tRIU8S6YhFnLoEbI5Tv813shHotWrcXl7lQvTmz4k7L10WFg2IXFg+LUTrbjjoLYWYD0dlDkTx5JG5qQSaz8L+gP9BK8qeHjWOcpZH1j+VwVk+nX58EbbA6tGqIPie2FlBQNqVdjXeJ34xHNHsribSpWc2Vh7zWPIHtl3WMkg92SYyCLw78NJNe+mcbm6MLuE+Uu9oJOKR9Db3XLqNI1UdOatzSXbeCsl/Wp5t8fsrE9GDmz8670HJD6RFLqt3raVCQvDEuyiBMmneufzE+kOrpJN7EF4AUpyyacEjTN9NT4avZd+mlwdS/mSX7inY0UC3wyKfzNZ5sit0SYKM+E27Aeq98862Nvaf14U/yK6+QRUdOHSeVdRQugGApnRbiSGXM1sddEWtbQg9VP9nQzC2nh9X9Cjlwp3is7Y6doYVWlfzp14m3zkIj3am/+eRK6cbxj8GB0kH/7c3R9tJ+6JLmgqJm2Fb3xDpmI988Nuh1x444GxDZduv1wGiKO9wpLvzsEc+C6O8qVz1kyE11gcZ3HPr83UTX9JDA9hp1fwj/6W6wk42A0szrLyz7QVpfKx7NV5ThSnbr5lSMYOfkOkMkzcYxg8GjybN0FNGxEChJd47cFWOJptscq0nFIBz16Axr6JfDMG0iIL3RdmJ++Kaxu/hvFh4ttwa/NuVEEaDi1sJr9VRmBtN0pbLpjQTdXnPTIGkoTaDFfuc1S7k7rxVYzU9UXs/2GSvGu60fX3k6PUAdr31HfKC991dmUvyv2J5r6vznBsVdov+RGAjlCrrqNo9hGjNepbHgKzU+uFzX3/f7UlRzUujjuXy6mjRVunz+UfMr7Va178EfiqY4OmFWhhN9FgYfUQLBIhxapB9XxjT3LJtObskV8xU7pLPlIiiJpDEtPFniCdkBGcaX3916GzTHJnooDfpe0jUDwcSJ+o6fHJSS7lV9yNkYxpByNDHawuUOwJWY6Z6odyzmImj/xD5pveGIQngLhAn+EdZRdzpgaSs9IkwVq6nRzkdJ9ih5iG69Us7fEudXt/3olA/LR1xhq6KKpt2N4Q/DdOkZQ0hZMUiUK/HZV2NGaMz9g4aJLSAoB/FWemSaBZdRieB5ayisjJN64zpdcwmHkabLK9/1OcvakhHf9rkKgm44Aajkpm2/PSJ15qauuUBtHIkx1Tn8o1pySPS5sLDVbjMRF0bXteId6LAhB+l5r7u1aZgdvYb9G6WZWcjxJVfzIzSMH6Wz4W2PzhGEjnskhJRxDBp0T5sNYmFTh9vkuqW1fvo31FdCgqCxrwg5tIEzbAj6QX9vO0pFdl2cXiaOBFgBoabMSHN3cR7VZmgB4KKyz1LyM6VFVJTN7eN2cPvkdzz82tIluBXPhYxXa0UwNtWb7bdsEi64717HgQf23LPOhoCSaDZcCXMMvgtDDFgVwu95D0Yy0FxfUVdu2YUI07GV50D41HFB1DUR9jpuBweLKplGlRzNkXb8XkkIH3M+jDJ1DizRhO3SFlqPTiTXczxTHPjuyeM0mxvwqrE89m/cdDDe4mY0B/HQv4QbET4CClysMrxYaRVPPv7Uq70LMW0gGQ8GhjSaRFKXjk3iAxAnUjO3Pupd/vLHBVqPoTYmYYBx6ZT/piy7tlY0RU0Or4Se8qng4ba/2zvGjMistotjoOohQUsXKbxgRSHC0uqCNg1xiGVYCzpg2y09lDtF/RLP7hKTNfDyDtwgT8dZyEX3gLIiOFwTnDfuQCw3yby1v7dgwJ9xBFhXZbh4C11rsTeyyIzS4/Ymigz+5DL3VSsQvi13jXP/A4Zuei44t3ieSU19LliT282qnI841RLCCIg7SV6VdE4nu/cNtWynNIleQwPCyvTxIEZdeIeoDFJ6sJrTGCHhOMwX7ZM5ISqm7IEFAJjktNubiwPJbqcpLdbKMbMLaXK6Do32L1nIppdD+Qi3gpsEJD/v4N5hvLFavGYVdmtsqAmgtjbsVg3ZQd7zrjjUlJkdNO1blGQAq2lWX4RoZHzCQL+KMIlKkt7BX+MM79f39CxI9zFLtaMJSZ+t2AaRkNyKKb4i9uU52JrICRMx5gm2GY3SSA6N/wqtPJw9a8wSXc3SnGUqe2ZuvOD4btDL6Qq5DezSLbLvBUFH16i1L7h1im917bOKBMJTYz8RjT/VNP5BETzGND61yaV3sr0Th7b5lMs28l5xQriAbkrIyK2c+Pz6si7YGL+1S557Q7aQDV0PhnOxF32BOxt7m4pq/S5uCFacfRzxPZ5rhmPn3o1quEvCoMYcbJtsKSOT2cupbNqy48U+rlNJfeIX6K0BQpTBamJ/OCb0zRT4Vfl27WsKBdiDpSaiphmHRdci83mACg+W6jMoUA1lzi55J2FGVTzYJaFWLBddxQL7dIMD/rVs2LIa42zCkSy1N0gKvKGOr8G+B0Gs6ujY5oee8tlFiv4O16zXb51QoSLNy0gJ3N4KCa6Vr7FUt3Hv1JDOjei64pXWeLLQK4SsJ8aME9UYbCeWHWoyMbpH2B+HuW31/8GEp4Dox3R65zE4wuVChGJF/tTumjxdm8YS3sw2k8eVHkrHSKErXcj5r5wKLwa7iLHMxV4Mjqz2HimDtS6MT+5ccuQyTQ74pCvRtMaTgQeQ26gijtfRj7LZTzvX1RKioAt8ep+AfPoSqQC0O8W+Avc3+/rQ0ZkrbuIc5VdZom3a1O+1+g2H5gSe8g56Wec9XSFocZ77agR4W8yUzs7MVtbAtJDCpfaY/5wm2F0d8RIhZQbFHaflMqRcua5IhX+30v2ajOdJZfOtP7BvjtlKunB6Toymd8S1dzy1S4C2w+B9b8z0ZEQBZ5rVrZiuUvmv3dOYDvym79SPrpN6shSPjvGcM5l2473a5ruuusTCWI0wuBExC6L1SmdzC+caanww1/U416OJ/+vV6x31WHygONPPF0S/JicJPUj6NdcHWMXM/nXMcIkKjJJfl28wojFL+gyF8Vydsd7wdTglSl9gDtyA9T7a8M3HqjJ6wMfibM1KHZhjHR25mfb4cA6vNKY/wqdkL7+cqOCI8KxMix6Rt4c7DvU8btLRgge/ZE2M9rThuNupZq0wPV/JTcieX/xy00OsaJAye4bDQYal+Fxzmfft+aeY+1/BBxCDDNEl4w+bDOEq4xgdieGUjmegz72DDF1RnM5H/7j+Yysc09QXPyrpkTosewARoERAdJGY44zbhOsLM0JSEffdgoK4UYaY0MlcyFcOfq0pvHsWAv9gvsBtQge6L+d2JRytjGCJw4Ogddiq2jj3HgsfO2WKdw6+zl/2rTvYnSX9zke8t99/KuMN5QK4FnYWltwB+V7XYwUTFh+DUzb8U+zuqSNOjsLLGJ+1bo4rlee8R9ip+IvMevm9ofRZkcTBqM3GWxvGJ7u5zf5zRJu9jzHBu2nu5uC0HUJrZC3N+Ao/RoR9BqNYIcP1S9i5cDWLKVufdwJrObeIZjOyZ/H6CohTOAA70kOvjCyCqh6Dw2SizpNs7nXlbASXUrOQ/7MakwQp9YIp7AAvlZw3XMiIudc3Jw7rSFnR4q1sYTGGQhNuvWHy6SF5/kYbzPWFnpiLZ+jNjApDp894sj2u8hzTs0HgOGuVIHALH9OAOSetkHuvvZRjxju1c513RbiqkGVjJFrlnDoXm/72ADzn/IfbgHroz6zzKNUGXAdqTDf4B0a8t+hr2sBfzd83Qkv7oN/GlQOntuLaJFJ4h3FOPrT/ta96wFy7WW3DKw2Nqr7WIpYMuNeTucGo0ZNleMMJcND8B7ug+A+kJ6dNDrsQ6/wFWIKaLSI4K2h3S8qt1gAo27Jn6bAcyHRe2odr0OsuFaWhUTiR3+iITc0FVhLOE7pzhumXRDDge0+BQpZaGmhk0eMZPycwjWVTG0AOlP3cathDkSPE4n5/xOTETNyYH+RCipYYcA7AB8delvOYQMZ0IsNAQvdHw6CZ+3Sf1A0JtdYLTnCiaIs9zZXflMbVcpoWDhbiWigepLATxT1fzcP7ReZwVfoheFOdFTOXpl2Tz5+U5ozJtnocE4afuCKs9aHxSLmolaMGBEFqckohCuBVFOaR7jIszUzlKE3dr1fTSUj2fBYlmVDaBfJtknG8YpT8MGGzB3DI+AdQ/2sWzFE5sh4ebjq6JrKFg6P669MHKG6pcKwXQ5Cmx7FTXXY17xCVpauC2eOVd0oHp3Qs3tJUMAXDGjdD0sZHYH7G8GVlBhhmkHCFE7UDgKRdncV6/nbUs4ksCknT80xqR0TUKT8wGiRNs4gxpqIybinygB0C7cBImq/7rjEwXDUV8cQpO1i7kXuMf7yPBSuadnQgsClXtwpgDTGMbc7pCKSxFCPGKwBr5xUKiqh0x7hSleMiSJ7HnMJ8g+91Xm88nHA1zaz4GZpZCwska9Rm/M4fBznU99wfWaJg+ZYLVZ8jx2AZxM8eQGGjw3pK1TNmv7t+4XJPv8RGS5ynOoKSOR9N4AVqxPdP9CavqmNDhQTQ933yEMnUEzT61WNM4klw0kX28JXhrTxhMiBMOnP31ki1UAOBgwMm1P/2jLybrqEjCdY/b0VwHU9j4p9JSusRyur39pKoZfqmWwdOYrQCPUcxMGGwH+GJVi5Av1YJO034UV2ZcdLX4nMeKHcbO3KgiqC1qSRgd/O/VaGZse2xBKwYP83g8lrN6+sZWM2KjSdl5SLEETCGj0hBUic3tGDhUuv2uaIb7Xlvk/KAT1lI5xdhVeJwLJRbCfiBCV4ZJBtEOWUwBOObvAqJy9/RmVLG9yttChb2/JzAHHSQVB3lmwj0/cyUGhOmmVkPa9+npDHXb6sOGOogMyWRdtG8PdlP/+LQdZd9PXjuXHHx7dc+5/CVqWZD7bp4F3JJk2OZbyOYQRp+vBR34OoUQOd3aMJU70RJPg7mTrnJhNvWZGEaisly5a1jKbUsXF66I5N/OrR/HQoy0Q02xdfwMRx31OfUIWeXWE7m206FRV2TR1N1inE6OrnwUYuXzQMxzJr9hgXAhY4KOZV6sMDOwwtbhfmP2XCqZ73FOO8WLIQhXAliQ1Xo7pbA7NfOpMjvoZP8Le6TsIby53vsP7H++Ea4lwL2Adyc63XtufuC4sL6c2eLW96iNJZQyH/I7hxqBJK1wjwH+VfZFOSYf27cIiMF9egDN//zrbvrE+ga+KSoO4dHJI+DeI5JMlEXVf9cBxnSJmmHOikiiq9twGQTnReiKF7Z8dX4mEj5PH/1Z5Ko3uAFWkZdAi65qbF+iZF/Nl7qv/szxGjb118Ku3Z8D/3A2t6e8ve8mBrNdKFhsTDJaIvlb7Xrer7ycAVPk9QUdAEZPFIqLKqBqFarLk4eMUVd/JhQHdQTfRvv62JDjfAbpLu0r1+hOQ2h2zTS6uz0tojhs0osiz0mIwAOjXa35PhQy2oeq1PGCJwK/HrssLKgyxlmnqzslVDzs3WcDjpmL6iQan1K/dIU/iMCRwecD+SqYXKpws/MDvD7oG/uzQrhmCPwg0oLxHDSXKeeY7ixTJmamyJ9KG3V2hOv3q2jXrinFY6icwzRZV/BN7xO3HXKEa6jC0c3llOuMEmj0Z+bRawZpVmN9GErEcKFdP1nX9KecdoOIyOIKYQptO/M4AqtJ5Voh/wjSixTUqnFLsOWkTkPgP+cFxuaki48n+KXnznd4guu10K1/9Ge53bzcpWfpJDqS1tfMhB67Q3taYLfaPUkKUkl1G/UQRSCj5TNAOZOgBuK9JYYwD3+6SrUzXrUo57hW8hH4IS/iYiu2vI64clUkgMskp7r5Xg4LAuUth4biqRjLK09YYqUc1OqSkr4k3t5m6msYk4Q2yue+WXGhbgdvpJAWlbWRtSjrOyNQiIv6hRZbUGkKnCkPEcXsYSl0iSVpEoTFmj/0lrer/v1S3Yd+RuRsPq5fn770EYIjpLiVGfSxXMYpgrbGQ/Os/XcjkW54tcXXKJ5Gi9qwwG2Vge1/ZxMcLw3b/cnvWZ9wUpG5+Up6dCu++Kz8rXirafh/IXMk8BeV1kgs7NHSt6lexdvaguzKXz3Zy0COZ05pi1Z3ZMLFXPZw14hJH/3upt8zNXDz5CmSxtb+uhNe5mw+Hg+AIOdKmDflqSk38znxgthHQRBYl3eeyDFrxQlf/P3mwAiU7d3BYvOsqwWZRo2bAVashYZzHmaMmXwnk19V1DvDH/geQPAdrL5fjhvJ+nLKzo4d8+sBezRLcoxYdmkoW5sLJfhhezxJOrU2bsAG+uweb4VEbmgnzbd4ls8IE779ZEq1DRB9CKmn8JdWzppmc4Ubafzew8nda5pP5nicWXAKFDTih4bepJH+4NZmr2It69gP05sIRdKivveZAQImSlbdPMiIF/o9lsT9rTBWjIgQa5IyWCFfY0otUBXrx5XXQepCp/2dXgH837kmNILe4DLypedWBHRBc01DaDjutoQ+pjyhOAVZkDkpeDMiwSocWEOPqCfoRYWF7+2JSve32Z640NMDBKhPHd3Ta1/ZQcDSKFfb+fcjR9P8LkkF+CuJajT3tEDK1gqvJ5n+bZLBUqycDa0EytuwKHiKoa7/nfdpddOIFsZ0NzFJNJ4N+Ii9Bc2hPN8QGOJ8Ou8B6Mp/4QLytDP3/nw7kBCkyZmoPmK7pderGyh48sWZk2RaWVXbc3Te3oreBspryiu5PQrHGh+jcTaHYUvVLQvdnM7IoLXGwe+wmdfk1jfsRrWq3A+BMlP9Q+7dgCBdxLkC81tImoduT6FabIYj8O5mZo8oW3b4v33oH9fd+XyCXXgzhTWmEsw48PD87KrR9fBsOVOysuagE+cnQel41++q91q8FJKZNJBDKr+IRasf21EYXBNs9jW1ip2Ei1PNq7EMR0VbySIEyXNS2Bi+ktjzS1kSsJZmPkXJkSOZW5CTPACyXTXdMd5VsKZ9lN7FnWtz7oXHg89NK/dDJPbs58zm26G7gUlvGC9ex7ymWkYsEKC7wUtBwxPT01O01comJmuwDGezlFN8Wb4OieB8LvR91QiVB/ed06HLqJzDL0fH7J4aCbnxlst+HSS9SG5li4Pr2RKjNpZvNB+0CuSaN3u0n5O+V0Ry136RnJuLni6CzL1e+qmO2675ihJLNoqH2ayTW9c4f3+gx5WvZka0X7nM1yrJUi81wPQhpHHf+ikvA5QivVS9GoroMvKMn8K8MZSQVHXk4BInRe03c1ngON3PrcHa6zpqQsc0toP2zS/rV4KUemI1gda5yZI8+n1aWFXDkRZYa4zYJp+GoXcDhS5NM6gMouOe5EbDrp34/gne06jgUJL6nmYM1W6Z96Rvl/fRqxl11UqWJDw16LyZfXncXPfZu6OVinpJnM6pA4VgzIdBT4j1/qgOzajaXX/DMmqd6O7zmcWs+1UDE4/HpPzg7tTw8SrZRCeHF61wzaLRjW/g6g6bW6nTWsxB8eiaLOXFyj3SGM9u91p0NCgcLESPy/28oQjs1mfIzOU8ZllKHw2e8hlPjdlfFg5s9ECWZs2gh7ZHXaxnROFgjJahy79mpYNKkayUlO3DJJ/efnqbVEdI+hdDG8+KEsn97xikzuzC+8BrZ/F1kEqGs8x0R/xCCczdKJbkZibunJwS411Lw3ZabcRyJw3V4aiLhVgBlztvBY4ncLa6bjnilbJ5tiUKroxtLCj2z4wyn+TW9Tn8GdmpxZshrvPc+06+d6ccNfM7oyCDKzqZZBnKkGPz3o5SAGpK61eOROMhmCUkMfIEndgDyOXM0QzLKDwuBmaqy/FznfJo1yBVNtO7aiMEZrvjeYGhLpujudRWAsWfd+H+1JEZ4dftRg7Hmjs2EQSCVAFp+oghdx+X+qGECN1y9Zrr+AjNC6OEWAbW2LsiRymvW9YeFEq0GNnQd8F9eR5bZ2cpELWG2KnDgyFJU0RqwQy81qOKIhniVkLhJdRs5RH425S2ULNVG0rt49T2Egei75dVIbCKvldtVhw7q1RLvbd3wi0vuh5ezyJuADQvR5M4wbbL/HSD7jk7K9cRulcotO+nvDpWPCzofRyJ7XHY8BuZYhp1tuhcTRyo13Ld23d8I/4yt/diK5gxF0NyyGqg+nGbY0itvvT11oa9xyamI+bat2NJtCZwkW0ONDhMmIXpNLO7PfmaNTY17ISKa44/aQk9WBf5vVKFJaW1qqjwn9t/Z5uPivJVRHfdUrMBtyEf3k89KMbFawW3DOTdm78gzXGOAAC7vO+yd33KoD8ktmXKypaAX3ryXNzuBF+pXPi220s3DBQojiyYGQk2GQeSnfuZN4vT9HTPf+4rzARn1cv706/yGelJ7gI8uV8zA9c0ZrJ/RUpgqdPL+uiYHgdDBAOERAtRF2DjP3rBDE2GMChoDmx/JYFuL9kdnwPb9JGtCK5io8yUt365tQcN41ol/e7Va5gZDoyr94fdKI2eYqzTviS5qranzyZqYupEJ0Uo23p+o9F/ZGrxoCguuNv40HPZSeT3FPIzE9cBaoNhGQSSaCjogP35fPrJEDIyr0e+W5rR+gHEPu/0iuw3wCmscUdN/8E3K1xABqkBQf7/mVLHncGEtrM0xyQJtXMQt6vDzgXb/DjwDu8u/QeEKJTJCkfnrsaDcyJM99H0/u+QvaDtHKklBGLWY6/syF36/+D7CEpLsVk1jDXJ/OO9tkVOA4a4JmGdCZWC5s+jEe6hgC3xgADMvc+VHPfteTjpdt981rjHTj4NYFvtPu6rOcDZMKj/eY2xOQoNxaCRrUUDIzGwiy/PhhWx6MnaP/+ckUQ/JWn/HeAKjG+eigXGEDK+Y8auAYgW6FScW2qxwgBfkn65mohN6IFrVH8MOd5c0WLfwaRVlfpSbe/Ye3pAzfJ9gZtP1kxnCYaQIoe3LebEDfEYOOgCiMrpA1U/nBD2ahD/vDYdeAqixSsvU/elOTQzKbak/UXXr5DlkCpwOpG6rf9XCF9c2Nr1j9A7fhBIWkmsXA/CJxvTzVc8PCDCZXtxnmuF7UcL3H0a5xWwdnyhbWSYMq+8OmeCzEru4XDwdu0RB96HlhFjqiDDdLnJM+5RT5XhVZ7Jj0hJHdeUWoJvKhh3QqyosPxT2x269Q20tzBQOiy3L6gaxCYlG2KpyiY//DHqMMaBL+xzmXxzpKb5osZuGlUdT9gbf/nVO62Bw5zbgUETuLJKdgiURPwTmmXncLoQb9KcqbXZJGSmfxBbl8AsQvvoHA7XZJDrhtR60pH6qlAOAi0YwmWUSBGoPOjHRNJ4ufDO1rK9dXGNY52gLxTVTuCf0nDBEL/PGYDiqJY7sBK5010ry/yYTIiEjQmvDyzlWWOA/5pqpeMOOj7OBDVy0VA2arRSsn/9cv3EaEHc+kYhkBNHkO6eD3zkgdspX9LpvING2Hjr1dAji4D5NK4HBryLeVjfidlWeBFhlvCoODnT5SdvulwjGBxIvocHCD9MLCeMG9nzL0ClqZd1e+l7mU4AwhS5uRqVhjWYBMDsCJ/QNpvTns7kj0EjE0FfJpij+vfeYCghLC92v9m8NPgPWnnn79fd6bI7w1l2+42gDBWt+RORjqO4LIM9BOfSeD6r/tJ3xNd2k9dFCkcNZlv7zOc4pDopyj0vLh55D0JAL9wirDJHkTNs/dsCvbXT1ezCwr0ZsRZNs6OnPnnxbT+Hl1T6tHRdySBI43qu7ccycGv0wZP5hjtEZEPV67m0GM2WiB8JorueAm0NfjOFSavvN+1eMexe/zX528gAqoPs+Bdlk6h3RiK0C6G6JdGZaTMyrl+u8wohPxyyvHEN7cxybkivSFY12sxgnM5LyuguuBHe8/laWAqNWEhjy7YPWEaf9YtjcltEcrrtXxiYzJKY4FANXKH6LAvcyUS1otzI2pjQYm7Vm221TIeieo69WFldud7m4/j50ykeevkbkLgr+ORK4fhGH0kmKIwAHEY58re5P5niiitj5V+gP4wMEepmTMDf4UHohn96yhdgdE9konhBPKRYLwvdrl+18TE4hcy6JdQeE7ftyU3qX8QCcgm9BqE7sN4Rs/YMsLGOFHaMudSNk9xbrGjECvuGiQOOGCwUppS5f9Qma/TlcDl6Dsc/IzMvaa0Wf0XJUf8l9RkeeYnxPjnQzsa78WBRekvYvOPim/sWFscBS6pbAPqLSbzjqWbcDoooYDcZnNaT+LInjSZ9cjAPf63NETshKGqksKL5Dg4Kj1ChZmKGICbg94EHL6ZGw04099ghM9qqAt+NxPYVWIkknwPqkNkIVZXa4GJHZ6u+3fagbc4yHx7xFX/YWfAI8m5jI9c4XvEKTr+fK2i8bskqtiWviFsiaThi/jcNgCIae4r/ggwkt07BLWBbmaNuSrX+w1UOvv/pdF0WEog0RIK+cGnk3kQKelsqVm5or3CdJizUWrfSRb7tgvRzwRX4nQuE5oHw1I6i/irtvvEC9ne88PgQDPwpN1D20P6GRNosxVpnZa2gyyS/KqBWJKQNlDiLzn0I6VBYqK8u4NKD76Uu18hhZmsdzigmouGA+qg1Iz/5WQbijQivcQtgtMdy7OJ7TeCbE3WtLTLtnQ07VJQE6P0q1jfOJM4CWLLJIXLncQL49qXT66Uuit+doSAES0SUlf9w30kRuuvxJG/Q0ydgOiCUMIJlxZJ+aSPbqezgbTkECjFwkfvDcpkZsLqqvSz7u7SDt2gqjMcBz43DHYPTk+Ti/guWvbC2Cdky2IRshpU+8mWXaovYXlBkFpA924bvV4QE+ccuBKz9AUHew9cYVVRplJEyIbqW3v0ssm5LHK+vzDqdrZRS29iH5+tILSD1IdbmmF4OS67ookVsd4WAoIwvWuvIbSFN/qwkCjFy4WnOnvj2cizPW9a60dIn+HnjiwnRuFzVnqAP9cb215dGs4N9yRvrlfqjDZJAMNXC/zSQiM06gNYthASWUAOSsNbArGcymzpaIzDU3Gydt4GQJdu+zlsLYuDbNhq/gn8NFH8jIpO0JBd6jVLh3ewyRGPm8jXQrgHpScN6VK4byRo8RAd5QEckFwIoq5IMaE+j8npGXs/62yPIuJC4ORfAHGEuP53s4ctSdBtuCYBdqzylEIqoAKXzXgXywutqlsKwqDiqep4P45pv2jvvc/3k3ETCBmqZi6wnTNipopFISjIxoKaziTfYtGZp9qhMuXZATmQBzJDWc32qQnM8OC9w6EaRPRMymzvQbKTyeG9x2xnxtkZvz0jwN4AMUQ8IILUnufTbpIND4Yq1fcuQ+gmFToBXJvdENt9I4/m1fGVJPCBfeQsHX1mfIK2R2f3WSfbsE43oFf1KKs30cZvV+M1ASrBm8fREVIKkbY5RJVYHpZVKZ51obHo+AwkePCGyhyFNJveHVG/KQ1E+ltFZshbYt0pOKfq5YtWw/0Vv37EVbPWCZBiJ4Tn8vCDxyIPW3y6On07MepJ01rXH4Ie07TyB1NOeftv2+NvuLfjP2zbhZtXdTmp0J9HPDOZvYXugC3QI2I6nDtlOYZQ2weT90gcU71q7wkzrZrehrgMc5a5gm8qAbhVhigsGbAuu3wqTvoOurj8+lCNylrTHr/b+HrL9m/CH7BuXneD3wOGZWKagMasCm78DoKDdqw5i3J4ZMRXAMGy1zqkbBFZ0aBF3M9xUXofmvl37kLenUg7flLSOJh/MYiNoca/yslH6OSp7xU/yO1r0MYd8uotjtEwyVbY+IQ6S3VX9htgL6XNic7btGSviOnUljs2xolTf5Ae7kxu3TheBPreyTQV3yoWrKH05lTdnp1my0qDLdRLgglef8l0t9+yn2eqeI5eZz+ODwCd0JvQy9FwUIcriOmmNzMNGifHq+P49bH2RETiYQMVylYm7W7wfsbh0Nt5+XWVMC12hgrCXjLOCgak78zr4MNDfgMCpzLERpgZ48vsFKfcVJH8MeQ5ZEy5cV9LUSIvsoy8T1bIW6Fmxg7qq/qME7lt02TtJLCDYBo+MYUH6XB5j73JZcuaNzcq9wYbONLViVOuUYq6vflipeYNAymStS0r9/oeheaBD6A8jHj/YXiqnK6xLc9R81fBJsvmN+acJ3i9Mp9RQ/PspTbF7YneCd2veydMdhPQ3Eg/bPen3Vgk3y6aVGgpCtuQsnB0+A3NU57E+rnsbrJ14x8GnS7XIZTEtA437hfne9DjoV2UwijfidNVUZY1lSo5nmq+bnRYAJvN47V5VGj1wpM/pOxlxX9wxk1HYVxoFMT+4Eh8OWcJtL5Oi1E/qcKj6BFrCya727L9SE7F21bK5b4FjbqGxTWXM0ykUV1B8awtqlArfE1bfjNdDQvxJXT4Hk62Dbk7ux4NiHZ1+5+wK/aFfA10qVsOEdWqgYb0SKPkcoFSpnF8M7d4nR14pEorvo8FolW2JGE0hEfisYT+Sv8QCwmGDZU1Ima5ZHQWFkSal0N/HpXHsruyagsdLWIyFmmXhaST6ny98t3MgS2oVSSItUywt8T1ZvaNMorGHfGfWIVNsrBQaFsronvkwaztH8VqWuMEc4dI4d9m/WsltqFJDOYZ9pGgfZYupJeJy6nW/BQmBNu3oGRsSbksOzf1A6P1bVl9vxFXOw2sYvIbyS4hPo9XKre1FLsoHD0lW/Q+w6tKseS47XbX+glIo9L5XGr2tGouxtlUv28PxKi4f8BkBQVOYLbYnIj7DQ/Q58KEXMMvw+X3uaL/miOw6VfR8dOHEZjveg9dcNSPOb0rHI2BYzVDgA7OR7eiN7IJz7O81rKEdn8KyZy+e4aZGpzPHR15mT2ur8/pdvsIwEU9JpkRe/Q3bnqQSPPIsEr94xLk6yCcgrHNNubdeXHJQKrQW3GQi8UTqiXYkU7czmAmLVKep4y2R15yEO2u4XIKNEuxCtMKttqX9ePg5/Hns0uass0VJMPBPy7IS2F5QkPFEYNfKI8+jB0IAWtmklROqfz6G2+z20thefH5Nljs5LnMVpor5XQMq3Iz0+vi3lCx5bbvySlMWZjJk8ft6Z1Jv3Xrm1a4yj/IgUnVoda7DjLHjtppTklxiJ1k+te3TbNy2QIe3Wo6HYYTlenBlVrwuSFVc2J9tJd2Ol6ZTv0TVM72zrcn5zAojrHO7LVG/JK+4QYLvqTvOkxISzlmaIE3elF8exUo6bmgsPYCsF0jpoON2hqR1vNgX903fOi0JLQip7u60rK+/YQuewRxK4wgtWEMpG413faWslKVyoLHuqE4HJ8b/+LLNcuio2yTimhK7RiRZ8z+NM4IJ3FaqkROQk4ogX5sIY1P80z2YkKpSAcNqtcm5s/4MoPHnETvbuCP2BaT3wie0x5aQEWtnTS1jXzprZkZ6xuOaRBJSwKaUNBCDs55aUCs4eZze00ikWWZpJtOhlxM71pBo0/dpb3EdScSEZTgrCNoJuTUH4hU1TgPVWG5JNLEDxoU2ho1fL8tdUq3z4+KmLxKKYINIdplAA0ngc7kA5WuJ9E9JadDoenEoaIfJ/Bdwt+O91CLNZXCSRC5fUC1yekuMtwKU1RAM21WesScW4gFWH6Z7zOAetnDTOlZvNWkouDZ1a4SU6zdmf3637fUmoDK4U4n962n8ZZ5dqTB+uBKpH3P5D1f19ApSf6A/JZvpm3NYP+L1oXZ+35hLdKB173wuidIlGHZy/ZgWzOS5HZFVYEVqutv12YUiwqJUYXFaH+E2z88POyHfrX10/wRL6GVdnRjScoMPMle3Q5xWUveWKw5lBVGj3Lqy3izWNYD41kSGZGqKzsMK3ZgJzxUWjSCRvOx5wOX6RG7lD6ufiY3E4GdBkCg+pMpyye22AViJiQiEHekTmcnEIPoM1xMxE/8k8NgYYlWybCwbQ4R4xM5zCNSCWhSt0Hvb+y1nKlvTIZFCFNOm2qKpgCi1tP5ICE0eVI5s9Qr9Em1R4BKUheHdPbsp1lhD7spg7ze1iNhB/dhdHQTNGLLwcD8HWrI/pbGGzwcLj1O1B0vj8COGOiUTLST/jR82Vn4BAHwI0Pr6wXdCcBRu4PVmYKt2+XApigWX94+rrFk+3PNWP0T66KeIvhgCf2N5c0OybNf3cVf3XVNW1KQJausQ2WGZ7R+bIXLuGqn1CNGsddCyCqyCs/+0GeE/AVVtTgXVAMD089X2+iRzvgKx22WRq45JMueOh25ho5UuP9Dd5x0rteA0yjXGTSyTlLh7g+9+88lf3AW2am5kDhrgK2JDle4/KEbkk0tsI06HVdrrdKxFc5/6IpjkC5qLRM64UE3pniSzY6F2c/hieZlV62w781RHlSia7QVt4fmHbq/MiGLU05LcZ6xnzo1h+oa9v79gys1gyHRPIlarbG1AIIF7jaY5XSZnVQc884p2Wst2u/RcOIr1KTSKjPFUVfJSn1baKv03soyyt0bSbN6nNf41M9BUM0Euol78IBcFOYB2IPau23Vnnd64KMRgE7A76BVNYVLeUsA0J0hVry84hoF0aERUe1xKGrBcG5BfstTIpeLkFj55Zq/oL0T5JK6v0yyQ3ZOnzfhAvFl5ORY6fErCxV7E+t83bqD+W+2ia6bdFE6eezBU9GmXLcmW/Nmq/qqnP5cLDqvFAry85N1UavkVHR9emvJE5/42lYoBEXP7/3Uo6nt11AvfEQmScw2oHMLz8HCbERTQu+fVR6weAjLVkSu2Mpuop0vDR1VjEaDV8o8kUEFKsmCkwMl0SCVgKanQHn6XF2WSNzRMvhcMDAaBZSLs7PRnmUNstJMAIXlkx05T0uJ+gtcmjCLQojEX+H+D90x0vxgnW1eAxuaQ2nDeCqcOxp2C5eaTEE715rqutZOdjtnrHr07DRmR7ftgBKMHAeT/eIJsNHpfGPX0jykBe49SuRhpxDjHVLTkX/amypXf/RxzuQjAjCXe3ouT35Ohq2ay7yyp/iXFjL0pRMHpVPsc9hk1b5YC2H5MEj+XFmK3bkCXqcNdvRmD9Kc+RIfqkQlzMHgM+ducJ3IdLjC5Q/dEOxgRuuC0jC8tNxT2PaYSU69ZLXrRAvognYyfoRZaCzzXeh32vl6jbqdOv8DTwG6Ipgu9Dqo0W5sgcs2uWS/bUU1vrny1ZIlhGp/GJG+hhBEW+H4Q0daoiCbrXUlvf345wGujNrkwQJvexPhDCXLvBDSmRXBQnvioPBlk/CRWK1ZPWk144MlCCUDKxG8xuC4/beYzkX1Q4EaqWicHLNBPuEjQ0RswvFwM+BMkQNUtyIrveSJEImnlrs2cshzXp+DFnMrgwueWxMEpdNPzG9EafU9NHcd4h/44Q5YEOgd/a4wpnzk04jW7C2Qw4YCoaqz0qPpLwNtuZEFk/ntoPWADOryL/Pflo17aN7/VtvnnkN6C9qsVct4Vbt/52xMOQW6e2y0PzR8yWQMLzO2QljY49HPjAHyTDQpabcp7s3npyjSCbFO0EZpZgziZVYwxcaN+z7QYTpi4npH304hUUVxzisYNc9uOs2AweIh5hwg5jgVkm/xxmQcZxs+Psro2/+M5aAPimqVpgcqp6AsEb2m+HQizn99dQZ90EKEEQQd0ajksN0zdMy6FeypAg3sS5QHXPdsCIi3ysKzekFFEbBjVl3EdEpfUIlU7OME+SHD+wWyeZvW++ThJrV0sQBQJdy1BTHYL34hk5w+mmxrrb9XcgODuR6bzj+6htC/n7w5kJxz28ojGosJoyZmebBmanH4Y/iTRqxW+WT0kVcEmHgTwOAAFX5gLSJ+NddDhoGztwAHgPV5iDfdXA5fA6pwJKkg0NmVGNaxIauiQbIT6yqT9FnRfINz4/H+HjLsGLpC3XnH3hVbxiq9iRqhapQFj3CVtSbqpirIIdE+svZAwsEHfSfOwtG/Xzc/TqDTR6U+Mp5DlO037A7UWimOdzki4c8hH7PGxjbYpmNSdynM0nywYGc2qec7ulTINVmKHFEFeIAoFyEjkFtob/KWwNcH8xb2thCjOEPlfN8gK0wZMSzqoQccYN60XkIbaUlK3SKAdLMJFRDw4uo4c+Ht+qVtnDXvcPrQxwJsx0YnTNdeDlK3SkW2Wij/z9LD87rpLHcwQiCKUC+ndOVAfJzgpjaSk3Bx3ULeqRfcx5EKY7XM5VHkD7ED7gKQ+uNqiUEvX9KjPENp7l4gUtxVEPsjaGQu6vitgshEkEr2/FRA1k7CU5fQ6OrzM3a8logyzE6tGC7DlZLEvWr3W6xCKFfNJs1L4hqhDnt8lEQDw7T/QAspXdHHbSEZLMJtnmS0BUk9H2nxw9xBqlp287OIx6ohQB6ZlFRUm/3njGVS1bRGnC34Jgi5ouRnaim8S0ilbFFOks+mbSqLnPoyP/jiqYeb9ezNFufOxif2p0Qjq9Ex4Uau8dOiAiAru+VPa31Ktk38eGJDcybscEnKHAPJCzPFKdpIjiLpKky3KjBnXLt4llc5PabqWSbM+4KxnnS3txKUxryWfyS42sRyAvG0gRWUTT6gugQitfeCvFI5FBDiopA9XQk/lVT7G2nPr/Df5/O71yQIr9fNVcc25Cdrn5MOmamXiZeWN5Fdk4jjVO/gdo4qrGm5fD5J+3uf7ymlyVigMwO5OJRKQV6iK0PSVU8kqFL7iFBtP9kHvEC9P4FULbXyoDjj8OtVYxmFxEX4SpnY/6L8aDQ/itGuefGlT1UlAcVRzxJXQvBzyCVkZZW8QcQbRqmZRCS4U+FIZL2/+AB/cpDLIJQaXToUe2JKjTjdUyWOH10TG6zZ717c5yvVK/5PKC7RI+VVkG9+I5Yz0BG831g3zf7ZgnnKbt59fZP7TrFudhuvGSAfCgJicve8lT7BiCJtWm+CrjvhwDay9qio6bgVLi8LYaErFD/7NW+s/6EKo+n2F74NCGiUkjnfnlAvcn5WddPpKSY7SRABBWdyRFlLbuvaGzEaWYCoPoMV7U0qPN6U05yp8KB4Kwf+3eiVghNCDkdc07BJW1QPGZhPEAxZi+8/7nu/xQp8ofRB3Bb4sIkxXkzMD46QqWHvqxNxqXf0vtMlga1m8yJXF07LwqCMyT6hLvS4+axmxUI8XOBiQLA3TqFe4WovMz/oiYIwnJ0ILPBPHcNLkSOm6Wx0TVRN+BlUPg8mO0vq61p/D4Opw0Qh7YX1MzL4RT2KMOE0PNEcl4/X10Y4JmyEpXHpHvyIH3Y1aTRIbev4qclX18gJPyY2tZrwg7FqW5EuGVmzuYknchPY3AUKE4lYdXid85KMA34SmefBh1ljOJjAWVZFxpogQRwC7VN/4ucAjxjET/qVxiujAO6R+dnDWBv1DPwwBT31swqTWUIQlzz2K68TdZDG9M5VRZHMMgLib8QgmqdKmJP83o+KARWNfgwAjMr7Wh8QjSkiWoygY7anxjOSdHs6qfwZOZY1XrvO8Xu/aqVuTbvWWX/qXp7xj8W4lJDcveYyxHOnsWnURmnATymC12jhV7WP0Q/+Q+S8B5/74MOkERUsRdDwqrgfAZFpJKmPs4ODQcc8P4IBRX4x2F68j64XBIHpFRYqOTS4Uav7h2Casyu7wbu9hcDnZxE9pWEwTT2sGg2/gx4JjzNUChc3yirt9EQn+CS2LdMZYsPB+a3rHamkDRFEG551pMwMFhsehwUbhTEMbcoAMuGZ6RTGwGBq1FMMZaGhax7qXcNFksc+kYKG0/DbtK2tnv0jbQKbM4NEQpuKqylEBse92lcSoX2sJaV2Yg0ekWpqlykZDMqdfguIoPYbgoOGQbV+4MpkV71IsgXfJ3024isO9mPJj0AUV02rSU0+dz2pC3Lx86h1Y/Yf6N8WgOLmLN8rdZibf4LEH9OORccPBTizrvkK5eDeM2oQ81qqc7XzoHhJlZLYxvIvE8fZdbsMuCT9NCS39FSz5fNRskYSDLDdy/xWwaujKG7IQo3WoLBHxgGdz7Nf5563fSiZ53Fdkw1CTnRw7hYOqscGB5Dklc8i8L1UIGVjxXIiZWPAUFKBYK/Y4rbTO2Q8obdgabEVnGMBsTCHKoW1V2egpCwhYcbBEetDtBolGjodq/0d1sYVALusUDJ6+Z1awpHsHRB/Y3uMAWJZ8EmTOrF7DY1XDDrKQWUYZqYo4FUATiYo1Neyf/lro1F2/4B11FeiiDOFauDedq9FCYYP3ha+gyfD7FF0dHFBTXyGrqauF56dbigxzFVpLncT85BkP0/rUI9g0IeLiay4gXnFbcgSKwb8TTmEiTXU0IJayZnkjF1j2kC2Ligu3IAC8WMVzTklX/aK6aufOsZ7X4ljQc/oQS1mj6Btm2wldxD79vPXSZHs26ViVy9fcBJzc9PKqDyJYPWFoiT4gLCHsx02lpIUecneVXkgqau25alcj5JnOZ7VFGPRijj6MyGmqdt/UGBXylM3dh90orFcQG1OQ4kOPL0uJkkMO+tlOFCUmP4ecqWAGwXoYwvxeUsDiLyvQrAIUT8aJ16TuQ6eUh/2Cft1S1doQbNqdMUpZM6ZZEa4Yrz5xvgHDCg25lASB38TH0P20UiuFfBOIuMUnGbBTL8sZm7bc61un+z5MKvLMkNSqjfwUpHiTiAcDrWcGnobwF/kkiPzv4n9eMCWpUdAzwABDYcqFEk9WPhAKDcCJgeiXAgX9tY2DndxuCTxBbHA+W0Ax3+ICQ+GauCmIt6vIGc+/JVdv0H+ODE8NXgD+QafnhxxETb+HB6zqLQbamyJtDu5U+2W0Wf+HJeO1Pqkh+EPYETWWfh+BRyw/cMCb6YQsAXfYFzIKLwIrp14cN7Gnv8eW6MoDMKvWbeG+///5jHwDAJOofSnvUcJOGCpwEAJVAQ8A/5GlM7NRXEOmdu017qIJkZ02MZTWU0zuVsuAvzha9691jwpyUKm7opiRcwE0s0k4VGK6xxZYrVSZRxW2xmOywycXjqRaghTZuQl23tyaFL9zlFYif0oxmI49MikDbAJ4+vRSG0UYIfwKPbmGRlOGhtOWZ149ZK6BdFlSYj9vo3PitH38nxMpD+8AXxQO+wC8OX5dZDPm8cvdjBQkOazYIty5FmIy+hWVhJaam+3OevnCBzt73HXT4UGbKKDPA46BDoeiz8jph6s9WVMlAEMhE+DdnNRuQF5uBiiAzUS6WlP0KmjiQ7x2iXOqzTEOEcHpULPBlUexVlhoHR+G6R4OORH8CUhQDOqlGY3wR4nKOuYV9mjMGuSBAOzL2f6RqeJAErp6L4gxKZJJJUT1w3RzklgqytvuHKjDYnbYY8dNSYD6YcdwDBqLkfLPFcrhohdqjte+gVTv1eoG376rBEweUPxBmqHia0RDtNgFds+MhM01cYyJ1t3yw2eiHa6UzvrqmMTCRforcY5ALgQ43T34kA1O94O+ENdLFSr43yHZ4K2NFtyoe5rPIF+7XPCOlqDumwz91JkIFt6R1my4qJJMnekZnKDSqsVLhQLyIbWzNyGGmBNMlgzaPm4eY/NzihAHHNfvIXDhhYLyD/TW1LAoLi1se97Gsb1P9mqa5PA9TBxsl4ziBEzYqhWExurxikbmTx377AE3HY1s+xYv/KJfq/QRX2QJ8/gxOt7db1yf4sPKYBaqaD0ucG1sVIMQvahpEOsLJUHllcLYLVCLxm/gqVcdi9l1IrzwIjugEtQCYlCR3lUYnAtH6KIzRluLAQnCmhHHXT5NDqVXE/Vv7rhpuvRkAq8D1ki/PHYBZt7rQXAv2osNQU53P3/Z2BS4UKirskfMymgfUaSPx+lQVNh1/zmoRBlDXsJqNcCb30/u8mBOWzshIif11eMos7yuNoZah5w6vV5X2hCOya5eFnmQvhAapO514q2UImnk4yJJrCaAlJlxRbHGlhImbQEhsAaA4fUaJrrICyXhxr2P/QIMbSfW+WP0bs+MuRtwgaBikBTn9Wqlr6UWkoZqAcDTEp3UyjchIIPyDUCWsB7pW0g8IARutAWmM4+qJe5O1cUdnf2QrymEPX/HtfVd5VH83FlMtRp5fZAF/gtQ5L3exQc5y+GcbUrpyx7Vdk3+4MLvuGTlIkRKu34KS2eu/aML8K5Gluv1MLv7gu8YRRXmyKGwNtDxk6tSpj+LDvCian/Z719ZYNfgpEhPyRyMlvY/Ro0TT6chUq/N0Lq7EMFUMjkM4cBIoYBmDD7GQSy/FvUE1WOMe/4b5SEQMM82EAcQ6BkTMFU21Z5ZZVLhXXAjFE1nzGrjJPRw0OuVgpMwaCP3odKIWfOIR46p4hb3auynl5JBUHZXjxWX4iwBs6SMeYbDGGoLZC3swF/JvI9UJi8rH1d63TzmYqTy3vqtJkMTEr4y3UU8CdZvF9Kd76FbQ02/VHiA1B5FWp4Wgme1ni+LflX8+cuE9HAhp5ZogCYxQgK+iTtCB2+pBGgcK0iR8+INmD8NpEgYXNFWnBtnNKNI65X06qfkOl4yGVOqYzEgfH4oiH7vCSCkjJwqMDSKJj7yEstDxF1XCZrQMfM0BQ9YUYaJpLuBK6KAp0QyO3NWJWEPfC7WEcS1NBqUUlBwp0+DlTrpMqB82zEkN31Wl+IMxbEWwVbQlXlhk6lQcW6SJpXkAFgdIW9ZjUZ4rwy6jH/FHi7m7KDci0sC8+eKaJSWEjDb3DTVj8KBc8xR2/AMav9J72fZUPhKsi+H1UbjZdf93ZgzqRhV0ZQVNNRa+rJVUCt59CMoHSB3HIDnSKfBFoAXACYj1mYeuWFJlSh66xkz5JHPOJR+xFDL1In16v4ZzRoqvJKzrhxLhTq2hcN3Cf3TGBLwbZtcRu9JvARdL0DxqsRLfclReEjE3c25Bz7N9CBUJZbuaaD4f5D3EwRTDjnhrpXmlkv3iADErRld2PgeTPWF2cRsDVshkGA5uDyOSkWgnVr/pG6sIWq+V7bev1z85N+Tkkovt7Txis/3S/vC7/VQmNeMGXQI5juYTXUtJAsd/tNOHtjCSXbUGqZVBY5tzfsAnYommmYWmjHJZdT1XE7jzzPxX0TBLAMW9+V5iRJajy8aOSexhU0/AH7oOQCWQox4GAU4ecfYSLGLvotgc104zB3qwY6Qe5SFsr92dY5q+SLIVs0+y4g+OKXgprCWYjpmDyc46Yg6XStUoxj8spJNSAm1iGVMVa/0WNy2z+uP+JAp63RQ0ee8j396mB6peMw1Q8EDMmffPwqvVbb+uDREwDAdQGeEYo8pJFSFaNHTiS7uwT76NYn9ijjdJWPvF6iLD8kQTi7SxtWdA6lQNXISVKry1YjWUeegWoWWXXqbg7H4Z6KNG5lq1WV6sN4J884v4EbUz3X9b1bk3xIhYo1Ceh9KFWgZeU094Min54h+4sYYNM6PiyoenBa9tkCbGEzXtt1LNfvsyypHYnVaXy77/iFgT3tVK2u8CfV2UBWbCDeBUzjye5X/awgJx5j7fe3o/qtMNjVw/qy5ejql0dxTbmOJO1Di0JkqHldV0EeR6qc6k97yLMKqUBu9QcJ0HGcD/WoebZEsHP+LmG16Q/QzlJnGQRnBF8N/MzKd55+8yCsSM7ozwCJsPay6FITky0EeLv+dkQmjmfSUiXNGpdl0/9V4TQS5AACM3rYgBk8lvxyzi3+0Pip6g8PvnCRDgwzNLHLCO8Xwm06VG0WaNNhlMZOBPpshH7V/iERGylkbDYXeLsBBqzq/l+YbMm/f2nTyXpiaxDc0Rzf2ROx3XeFtsuaIFc4PJ5e0iqHlZ0FuVMd8cjyMULgKCdvpJzk6hHtX5TTg3AdeYV8adOkIzXUYKkwMrNzjF6SlcHEZgSTRqvt2+rG8biEZeWxL32umCWQXO3G9ZbE4i1gR+o4lNKQ2EE0QQR8Xq4Kk4Xz5oEKQnhClr+Dy+vz+50+gCicl6Fdk/ftsPzPxS2B5+ZrfFb/gr/G9gVTardb74NSTnSx7U/YOeTvof7XCOEdEYxpaV6DsSI8A806YK8O2l/SYbRSKIbC9i/pVICJm5teEhrJlywpd9M7ZrcXk8Eb7t4Q3x7RLLEeUb6XdND9b8lhifnfU2IiSb21osNr0z+yntHOynngc+g5e8TJp6thgooVa1r7v9+ErX8+SKx2I+7Y4Eatgq+w8eTuFdaKigvtTReC6Gt0YpO6yXFzql8ntvUJ9D8nS/14wN5j1YZHrjNZrDALw4faE6qY9NITGJM38F5Jfa2sj+roEcnltR9E9YypPtu6lWeuinHpZyaNfs6dbEpDO7OdzCzexS4EdjBLvfbwFspJPu3/pIcciA8a4Q9qwRkBRk51B0diq0JTU3RjVZFgF4tSG71QUkXMNttJm2COpadgVInWYBjxXvq0bBSndH3zhSZ4dcbYneNthiE3HXUcGMYfRvDDqxJCpagxHM1d+D5pv10J3k/Z8Cp7/sZ0PR5hxc6RwOo3Io05+KWqfp+Gn84brICousR/dxJFrKYYGxBHAJ2PazI6AwbAaWXiFhaImjUBZMIbmpXxoqsuKMysvY8XWqBRqfcP/tadvCvt6syU/HZOA9FjKq1gDuTTdsJxQuFlB2B0QwzeG7ka6kGNRqQiooppYc5Mx3uHXJxARzW3ud3b7mR5QPjSuOZAWmW5fAxExmYARDqizYkdHODR0MeM/jiRViRTBVCLBMn67r9eoWseJcZFzvYTt6bRCPvwKf3LLwO1X+0hcmninZt287HIrepmRryP78iVPz3gSxybVx4XCgYQcTe4cKWa7yMyXI2svApsKtBAwpJCOZOhJ0+kDNhEC8271zUTsbQDahgfZF77aLzX7zyq7fsRHPasD8k6QVEvOJUbXWi4VsWBFPG1VxpBUh5FuMUb+ura9CDe/B8Z25Q+WiyV8p355Nvcvgavyz3eN/+q38yM+flDBePp/IdQmOx0zOvfg4KRYZIxN+KCj6GplGBJBg14FheHVPRP8O/9AmE2pzQSjZLv/DplE5sMH8+UzNTZV1m5k+Qh+C5V30x4KeHf+FQOxs/LyZTez02vsJ85fvyJ0x36RtQXj5IsKe5I1W4931LWns2l4aLGwZkFUGSQWuZLwe+SC5E8h2Cwd4cfTmlWybV3iNKPZhdP/sTIecc8qR/HmIhc4GUF2tn8QkHOQfhCWqaPBBX/jK+FV3Ak4N1sWVvVM0vDrxjQA2t8RnffL6DiULw82d2wxwRN/DMfkuot9EmN3KRcDY/sBrrZAJtlRI/DFRGUcZnfjg8ZhAK6LdcGYCsm5CEZU4O7lmaqQmxDMyVePBPKUMosb2wphHVJNOnYOSmfgkxbzzzO7p9ABsghDc+LPRS1EU5C6qVRsfSTsfPWxwur7jEZo7aI4YebayqNcLuylgIY7HmuOmsntMO+5e5cJuHcSo74aqgKAt2aNNDfsKhM3Andr2Q/StB82Fkpyt7dn3VwqqeVDS1pJyCVe7S1CCylQz9KLIFZwB91Gaas/osKYdmBSCCgpyNmsCrM25l+NwalkAK/INHY+HmoKAhOZuRIlbYy/vHTq5dLWPHBI5ouDj5PH20bnKpnp81DNsKIYYlwnsdEHuUejeDqjWrqaSZqkVOQ/Yrdv2vA8Tr724aDdW0c9xJrOzY4GwP2cj7afugdrNbepkD44cAnGemq9cqbySWT+1dKd1ZLrDLGu1BF60fiUGbpT6GyEQeu9hWkNcFs7ru0i67PDZPL99oxpt4J1gPv0a2G5jonkp/e2zxVEkiZ2bC0J4TaLNOJ5uR2ISUuFFyGDaeQ1wEXFuza8dfEtW8/7CsVndR7H33ibncRPlml/Dq2pKU486W0rZpP/MQ234e7QI79+Acz6ILyNurBTcCEe9OAKLiyaNNtSH8HaIn3UStY/+tZtrE74TrjX7O+KPKjh8Wf1hZ5x3X7z4lmpuoBhS8Hpn4YUGbz4t+mQ6LtTa0w2+/lBi56eQRQPLRDBnamQ0Rg7pEF6fm1aoTDv5fHGlvxkj4ShW5UuVNXSx43Jw9xJQr82ODLNg1Vz6shJ2wDDPE4GZwj88UaoRgCLx/outQUNW14PicaTgMnNOs8V4Pf6Ur/ghjLbYJFuTM2YdKZqA2ioKCZ4x/AwZXkhPlhPCvCxrMNauGziOz33QhVbyCMilQEyf6VldWsnUAGEArh3ecj5eA5Rj4wf190TghIM4/sxQXvOCmZHwXrR075W92BTq7P8ydVFclRvzwOcJ+Ryx9gjhtMmawxkwdsuh2EDlNyLiFO3wNOhQrf2BzeaDEWwVz4iLJsEsbhZW1HY75dHutkDcNMHRCvTQbl0u1Abp5fVJ+Pe6FDEQXWNJ+k0t3RIUd7zY2xpndX7bCswNKfQl99FY4ItE7W47a8BtsO9lAV5MB9oMU/VKp4d6IQLgOOX7BEQ0Bh0mQ0+ZDNYcR3lZrd3XAJ6dLm8kq68WRlleFixzTp6l4YtkyrpWQ8wp4Xq8DTHY/GsPxgT7u0b2SkAKvw2ku1fviUQjoJLf1cWXMER9r08tPG3Pb/Zaaif5leyXpI4FlRxyuwPGMs90ZdJ4Z2d0J8iWXkRNF0ydm9sPLKyyU2tmttCyUiRAgWku5jHXKE0405PB80LLOnnWFF6ifToktLho/2Kx5T6d2j24ZmcWnCImNWYu61aR89eeDIUAx/t7MayHn4TY9HFD+4Yx44sX2mRT/h46CQefNQRvgrUgoMPCGoD+l75V44+V+LxHqAFA2kk1ZNn6Jh+dBjZHI64J2xLo9SOZyyjoPgSVLtVcsSrJGw/E87IVCK8PekaCId8PphDZ+enLAl4eEAE4YtuElFFUhzqWRDoQVuwrSz9XbbemKlNWhpOpVccBgnHKDAFoXuILFihyPyesUWHX58/FkvtvhyFdZpcQM+kpgTT3MVROcCkTT62nc4nnlDRNYpHuq4owFFyCTxdLlQ0k5onsU8toEFAtmsfZB14xMsgH7q7fogX9xslZ28IElQLRqAsN6ucjO8lssquWxCdziJHV+Tk9VmM7XZeOOw9VoMKApol7UouIfe+XYo7fnl6+NDW8WLdjqgeBAc/UgxHYeFgJFvFjzkEOFOzu6Ic2kETIR8zOaAiTTXA0Fxx+Op6KuHfeyfXg8LfdD24Q50gs0c7fY++OdwnNJMuK5phFDDVvX9I6zDIt0wVi39gmAGDPWh92GsklUntLHaOAQu5fY7Gg77q29swbHpsd43g8aESvdY7jhP8frMIHv4gMENvfbuoRaMdk1V+p0iC+o/ZF01uq3++5oFcGFB38zK5fUrsBCLudSs+k+FSs0QnWCv6VkO2npmOajbqSOo89I9GHllpyf5ifHeDfkpqQHsXbwUXNewspGWb9pANqz4pgrXI66ihq/1qajMO3GVEdqO0AaJK/Y6TStTvzOvtfQu3xJzVwBznlD+UGO+IY7aOtZpXxyGlVcIXK+Tdxe7KC8qo306F/53J41bk1GlR9fbigTwp2S35rWdLC7SpeoV9xqlupK4TrTO7voWVxTpt7RuA+xGnuq5enqwAW2aw9ZXbiO6aCtbJ27V1/2kZAKRoKpPGa+QOvY8bLJZyi5onlJO/Waqm/qjVHYws/DzI8nhbAV9ppF6qMqfbeuc0xZq9xp+bV+Lg+vIDUQxn5YbZ171xyq33CBcjWsty+9EKDL240r5U3oKtiREL4kLkM4ZhNXmTdvA4DU4y0RHGLzPNnK4HM6VQYmHbt3L5qoIZBJUI+mwahNVjdijhO4iZFcSsRVjmjOWt0uN4L6aRvHkhJ3ulouAWXKs0S4N9IWQyJLjCTlLOAFnU/VbTuzykHb/b/lh2j0lt8wNKUOmayDlIh29rIlLZ2HmKpJDROYwLRwsPQVbqR9/QFlq5mS0PmG94Ul8GK+T50cZt9EWXBz/h+yK3RA/GdwH+yeZByIC2pNEkuW+tw/1b0c5Dm6UudCh1enxd5kCL/IdkkpjkH1G1B+/1EvJ58vvQxUKQXJEUunN5dlUSZ9cNbBAOWIkSoWlx4fnyWRIjADP6buJHxsZWSbGoppIRSzo/TUMJ0GKkAWq1dcrTFoR2Rt7sUWK5N5kc7v2Os2G/rLC94taXgovl5/FHD2rnTfvPg2E4f66I5GWloa61zZol4uP7yb6S7HthkTmEdAsxUBseGWxhykxurq95aliXe/5Ltuc/LOJDVtMbvTvhXx1u/oBEoYGexJT5k9g90qO6FKqZ3NX2lTCk1lVJVO4gl+BXpJD6ecUspq8m1LQkVOQK1oIrIzg1irs6Ix0D3SEfMPYtUzUQWf1RXO9EzYJUMK622O2qg9IqAtgtkQIOKHRK2kHvwPJj+9EfmOoJiPjm2zVbU7ixmDHYz+HEyLhjjPE+VGvYLSZGt8dUKd3vhmDxn7euiIoMPcaALaWyZC7eMtszsiD69IWjCjYHgM1XEOVvLwi4MOGmVeevfEVlQax54TRZSjZilOv2JcTERwUogLctA7myO7rDR5FXZzT+CnvK6newRjtp6KFvAnVtp8d2hSVyWXU6Y2QA6qourITfsLONQpjCLSwBHyFhF0cSVTqM0/U2YvQ6/qebwWycw6qa9jr94qkGhZIT2BdQDyJreQafw4bq+3lUOMFcgkqu7Ipp6RbaWCR+inRASL/KLSu/dwpbxCkYCe/CrOQtk3ZpuyliXfBxr6fbH/yY/XPhVPHzJEJZ+TqsOpGCFUamhYrOjAvIXtcnI3o8Wirdn4bSaJfujJxuFOqaavxB9jfeymtGojrCS/2ZeBy/xEjKAeldeYhEBu3LH8eAos4ftjjrUixKTMHyFDnOri/1teKVD1AiFJsBYmxJKa9ejXtCEKVb/iB9GgxEhgJRbuZDvVjjhYJAO1WtLcDV0FMWC5o35bULwfKpmnQ6svbFEwF+qtuBMb9pmlMXBQbowba74rkWzVdezW3EhuVgA3CmvRhZtnC+M5F1eY1wPGtVZkbH+hJx6HEPJ/zCcpiandsiOMsIj8pQNTnS4Cw9S6a4waulmXyinKrPBPG1MnHM/SxEORLqtUjMWI33KBQHwRDWpMYfNY+Q7D60CVhKhey1BfH4D/vQ6NujuLKne/zcBWc5+tlyBGBio9I98+ralJl6bnM0NPuXOtyezapU0BLA1V88TyPtODL92fTUyqEb/Bmw+NV+7BXDRKxspjSKkuKk40RM/e55ZR4iMAQopu3Uat9X54rl446U8gbafcl0xndnrcGfgzPF48fwP3VwQfodFr1JftfLxtpwkgMAkcdxX+6gnUivxtOzYMrkX0O6+JJ+Lb7dga2wr801PAYxGyF46j3C1HJA3hCy6NhF+6px/q6Z+477STEjEPifabUhqDl/xjkKxnoFI9xSpQIKdHaluNz+j+znHAY2kjnumU0DIoLVg6YYc78HWucu5EqQ+1n12x3wgglKMm//dHfpYPvrnE6x0jXa3Dmx2Mo6A/cd71kGYS3GyVCx0EornwIqZ9NLtwmrtjQFHzvmeMqGWELJPt+ffUDeWiM2sxjsBtZrigY0/XBkpjPlygv62tXz3gCA46/LetBqTWC4vYd49IRF792+AaR8kA/Qxj1lhPLlcbGHothW+A/4fpRfR7g1nst6ycdlW4842IvoQi44NIvhzm/sS+b4vX1U7ACDnJZ95qh/z/Fvb+Qbp2f8vwPEstyGPZUwcEsjkKtSe2qWDo3FzU/Ir2fVp+5J/q5436AFPrzRHdvPKxtEllILcJlkZk9DhJoM+65iiCA45wZkXjXYn0QSXpncvPw9P3N0HJYtKz3swgFhE55MB54v/Lnh2UR4begGcvRH+Z1PIeRYYmDEUXzCgzNpDlIF0BJRV7J4W8BNkG7JarWKWyuMvtbO9xSo679BX9x2BtGYD731F5KL+GtmE6YM+o/nxAtl2FX5f95CoGaocn40fFxWcgWrphD/rifzJ1lYG/pPUSyLALiw6Jy5ubfZqgdJPA5RwPntMwcZUY88MYlZ9KaTpdD13NuN38QvKiqOCY4v+6doCQPcDz/34z5NHAAxEvMc1Jyoxt100Q5pxuwLUsbRA4h+vmJNDldxyhBHTLVU9JbhiyhxUY5NJivGyIgNCfHYgMlXpmA/e9ImNXarhEbl/MkGM6uryxMqVSVv4yp9yXnPcJe3bo+2Il6y+7AeGqgd24eFxx9bChCC8aYwIIc7LIUGOmpCsowmPaBvXWeexTs78S7nbzn+T9Y0Z+7Q5LzSvZRLm0lTRjPpuczCKUq6F9m0u/ed/rz7fv+0xXwTttD0zZ3eB2d38VwfPAX2RpY5zVMedBSfQvzPoJU+u7e2lNTtIQjjynPg1bEsuKj9TWU+pSyt3maX8HQlrUqOTOianEyLS69UTq7L9C4990LSeOH5vrex2MQvNe/XPmWP/P/3DsuFTqj6a/EByxv6qX1ae2PPABMQD6mV5cxv2SMnnbKVBcVtTCToxqjIiMHRRkn3EHFFjasofQ0Wu4ocGqDZJLkyjRoIkWSfDSFTfM9pS/TGME2Qi6+KhXR6AkN9s6D9ITP9Ef6wjnKk8GFEH82vRs4tlD0cvowhduO5rcO4P6nbnKnXF0EGscnW0A4PMD6zWa6Ff3L625bbbOReMFy0iwY0bxbsrFM6gX9wJ4H3dJoTX0KioXjJ99QOoxaeWu5xDBFSbwVawVIyRt7ysxQtQptXcIB/SbdwqFV17gq8eM5o9Mxtt+/5RTF/5RPv4v/ydHVOJB0/0eJ6FWj83Cw7SHuhqusk/ehVWtCMllxSVowwSj4+MI4c9pcpgjVtFpwE3soxmou1q1uBO/JOjLoa1t1877vGmIw1cUk7dwmSim+wV1fagHTr9cg9u6/7pqyn/M9QSsH1nie7Ontzmw5n9nnHR5cUsfzY0BFUOuSWhSC+mDSlzovKjV9WuKrwc/5TQuSzJ25h2Eue4gkCFi4ls8ajk8RSSQldk9FZQKqML2cr4SmQbCEBJQr6GL4dlrmcODlG1P9YHqK1GJ4ft/QCh4vrtmt4csmmbUVNATxFlgaVQwcayg6J5K1YNwoBn3Z9WtuPhD2vJbqsTZK9AAkDoneijvwxY/GTJ0mtu8iAVwPuxoFRR/JN+n92JHsY4nxwFaV0u7pNlLRCr45SD+Klz0G/r92uG3Em+dR9etquhBnj9LKeqzK/chGd86t06uS5HdvjEJnk1vaQ/KYoBpRq37Nx26D6m7jx/qo+yCiOJm64RCKrQjT6bX/XdUKseP2bhwY4b26jcNcSfCFlIweJ7Rlfy2N7iregE1a/qRe5/8nCjsa6D2qUKmEGuM782vlJn+zfjbJrG9z/I+mCEUl8MO9/OQ78oMJs1ocI4VrLQCRSzcWUDod8zgaXscCmSIFtIKfF9P5Bg5FxOkzgho1UGSBir71otqgIVc351s0T8cRqqkxKoBY0/25oWTfrls4Di5lkeYYEfNdi4eVWb8+nq/EvSOq/V90AqUueEGZz2irchoY54LzfabcjLChuvKSORQO1SbH6DQJzt1Dtd/LrXqUZ/Gg/Qe26svZzX3j6KoDnb5eNoe9D8mMtvW01dcl9yNPaOi4ZD2b8jiMBey1O4DGv0HhSFzBRNyqhjJasj+4LYq6hrGFsVo7fvQbnY4uYFD3qQ0YC1enssq2NkUyV1RGfhv/vyLq5FAbi6phSH8TkLTQDXEUV2B2lSywdI2NPCgjwjLc8jfeWNc6LXe54Dijy0fV5xm8+8YaNECn2wp+frhSKi1Ms1ZXk/e+1u4A/4PHXGAULiq+Vy3Xu/3I5L4fuZ0Md7uLIay0krdBaYsWyKYy0CfrFt8BQDBd5ArVAByg7PslSEL/nKAXD4j4gzSZHDy0u570xNYZ2/e3YrhDgLQgCaz8BMZO0IZmi8UPfh9hI6eYQQiSb0KNR/KrDEz/N81DGDe76zxKYEUGF1MzGAWLHYRrWc2b3GygXR2qksXmx5xZqtuaqXOxc6RCV2VQVXKBhChQIrWlLaxawP8Kws1eDdgo1BqnKTUYAdsdgiqbjATF5d4ouwyKFTJ6wGGozc1OTmCMKqSmh3yU38jVuPJf1uLhc/xlGti3BevUIPNVi0+N2iS60KftufggFpGe3hYQPSeTiQWHz88mdSxsk+ghDVc5VKpvPkfLN0X9R5zoRTXtBXVP20Ih2GqQ3vBHs30BvTuzhYZ7QovxX2Qar8af8hsha6TvuQWH73lYlSX4XjpqW9FHDfGsJDLqzLZFMtcNO9f4G0/FVO0C/Xl0q2W2koPXdeFlgAk9n5U6dCB9SrK29eVumuN7Atrt0B1UB8POU+ufFr/nQWKNwtpiZnzhDOmMVuCZVDBUsYXSUTG1Zj7kcQyPGpGe8cEJduDMpwx5m/E0TH8uhSE5T6dICARt2Q+wWWRGUt7fBT+Ig1C95OUy/YyN6vLdpFkLZYSz5dS3p0HpvmpYL7y0d1NpyHowRbeRtx0hNpyh/K2iKzdEzVt2MD8BevS4IRKD/65V39HbD8ovKpwvAfnlSxmagLYWU0FKtf9+3UCKI4WQ/jBAh6GQSeqdeLcUD7Q+SILIsltzjQlPDhH9mw2nAk6Txo1heoLucvCIqes6bUdL7kK8TmnRlPzrDT7e7a7DyeaR2yL9iG0Fm5xBcZackFc8zQvpmyoaIXSAKbdvF1dKNsrY7ZnFD67XR8uxAv+OSJt7dnaVOfkTcNXPDTlSUIe0/gDbfbxApgpS1OesfQLBbadSnk5vQU/1+iagpE9iFqn3vh+yHOC0sSC/OSg6ZRHmy1TEueyFw5ML4jWY8XCipX8h0rmfvGCzkcF8XOelkM+/caSdwinoaVFPgWgAFtaKZgN1lDUhv9AN52cTGp0teBJxzsU0+SUWhseN0PrXQsfDQqCBWQLPlhEWPy1//l57p7PXx9rdzU0PY8aMwfeZkIF++6s1cDpGgQ2fT/DW81ScYIKhbqx9YFPg/aqN6g4TyHMuY1XDsRrVVoWfwSkNaimVwqVh+qvceNip/+Yb+CZATX1XIe2MdKi/1smdG4YbOpJIwXI1WJAT/ZC9SCEyg9Nl5mlkyYrtOpGqC5vgMJ4tmNNKLytnahiQnAT87HO9mGd81j3q4X+NxBPzC9QUBkm+P2oX2FQjHT8pucANbtgN34MGGVPVxcDqW7r8gdMBdM2B532/6+6Q/coVXEc8Ve1CaW6YGhknFfz8QpehMwqzbxDXQYCiTWcaYd/7g17CCb80fpazuFFOFLRyDlOFpDzmsBzRlBYfu6cAP+8/9VLdhvx0/un63iDhf4kwYNd2EViYnsQJeJfNjcHbgrcsvghrF08iDmmv+NzoKZLqm4zIuE13zUFCB9IsPBwqUOx9f3Yf0z6LJfHR2jjfVzqLHefQWekWnNdRDPyfq+Lz7ORxu3DEzNiDVVcNYdB1i4PpksPDe0GqCXu9x4qDeXr65B4nOzqyyTrOqmFLkT9RgkeofDAsAsaRs8qLFp79kFeGjHHjrGW7GeraGhCQTuh7ryFXjjR9tCqjzzHjgpqjnmUdhQX7GZMcIvwEqkhWcLnoA4LLVxcrYAyXUQAnWO650FyJmMWB9WVC4LbJMAAvmO2RT9IwOYP60OmZ3EUbFKM+kqetHhnsSxvbXhFmKSpKd8FRLbBnjh0ZNyph8J1PAvDobkEevIIBSPyz6/UP1mnrUX1U1CWkEhkV8GG/1WrE8BvjayfAMPorjXoFmATS5v822ewN4YF5AFPVeP47gIHH7XSCSvDpYXgGepiXSLLOIs+CgMbNYaec0sPZjgH1TidosohZ4IckyVtwOZhMKHis5tKc4iMeXVi67kV7nqB6wRtSBb/rUqqQU+Yqda/4Cr4AX2ZUKn8C4dwAtoqCG/yG27k+npt7VBFPnvb7qKs9RSGp9SQ0w34vBYz9Isb8xH6tciRosVBikRGin81Sq5B+o88+MVj4MRrZaYKRf9rJWvGahYEDuA4Wp5iQmsBKRDWT5H5nm/WrBmHgx4IfL4Thk1EdGblHF541pVUiXexXVsmo3udW3fs9Xbcc5hM6TnDsANv1CI4jgfsAcIZ08x76nVy5LaJpwTG2YGHLqWLm5cBrdbhv4XPBjx1WKj0TBdM4iZydcTtECwliOXWnlNmRy/ROrsgo3wlCPWhIkjJh38hA43gZAIeGIWrHIUiqfPO+ZB9L0KAT01sv6mdbnnvMAK1qDDs+p4Dz5J3XJQxEss28D69/1iAmFXgodzDNPsvIQhZVnRBD+2BCEYKFJqrLfU58o/b49pIl+KiMKBcOxRWI+8Bi1eMGx+lQRbfMwbfC+2xI8oj6xelRizZvvx9FnNpNrzfw21fsLTknNtpg0a/+cgRgGZAtoREVtmcU/RXWjtrUGOMKgkCeBF+cqBhQ3Ya5jyd6lATWoTK5Wdck/0wVyhxJPbWZP34Zsz3lgH84g0I3AX7MEXtyZZxWEh31D4giS1GT2WG/uTgRygf2RIP0AXDWyPzzf/iIjyu1aJsDn8tFDb0MzPPq9foJHGS/ix+wYAojrl0isgaUW3Ve+PL7jlnoCPhkf9YBucpgowEVQNt6h9SYkev++elTpdYbo04aCZk6P34HvkGzkMxfDU9RgCaqX7WalEBo443UHBEo6xVRUDGitHGk48OAnmwEmcgbXmuyCYT2+MZ6pECNuU0vgTKC2SAkZvDFVrQhbsjAZ8uMa3Po1g7Ak18n2v+C0oFdyVBypv3VP+Fjx1Pp502Y3eAZjsgFsy3BZc/C4tXCE2udmZD1DIJbs5UEHUH4Ib8J7ZRL/b0iu/56KfnrjyXZWvB8gXh+OeryEoeES0KshzcODGDVVeVfom9C+H5GO/oOZBV8G+myv//7AUk0qtax1ymMC/IhvKD+aRYs8qhdgPxCTvUOo4nChQEGnxNiA00is2u644sulqqGxtEdMGhDuKThugWlXeS8tBTP1YwPmNXCDlCliHXj/E839Q23pSMrf7toRFUpEFGUPik7yT21f3mFF7RuHmaHM+XkGyn4S1i9pjuVRcW7mZcrfyVoKYYVU/J0bmVOxM4Y+4JUyiVLDmj1XVwQgfYL+zijbyGHno3uBgZ5wqtZNCGmeoroAa/Dm23S66arBwR3pmiGKDZEGT9WNQTJ4W5cwsUqmhFxA0rhjab/5GOC/Mhyc6YqsTqglHKaK3g5jhWsd4Pu1rhA7LVwUrjZQBB609Myo7nJPBfX7bRX3Cj5oh5fyMcIXmp0BV05xKpZEEYUmvJwRsSSTj77X8Rv+vabwvBPNqHLu9ckJjslGrHV8prcMflWEDAuy+0omk0sNT9rga++dndgucWR8tEf7rzyEeEAvj/L/sYtquSvytYdPxXKVIvEmfRVRItvzkKFQWnyv4sHmWL46CwRHCRo0/rR6ez+4loWjXgK8lfKMZKCuvHrbFwtuT7jTI/NlXjs0OdUXLeISYiCZPGQ4FkC8jP0z5S6aIZ6e2PuAKcrGkMegdy7LJfxGkMYgSAR317dtWhg5vw4Yx1XUwAjxdSVezj7DVGlcC6+z0vWvItrorsBW5Qo6S77cYs37sW4WrFV0k8q6bRW79/ezELeS2tIURyp2W5fC4c5Nz/AShK6ryRROhyjhKFCxmFpEIp7eCZJ7X4/eip0craX4gz76jY7Dgs/Z8rO1JdSOmuW4fHCVoQ7veQmeFdX9oBpRVoROpLF0u6mHZop+zlcEXo9PNE2t1okxwVZWvtNi0tiWtIKWvlUkAEIzRsnPd+bwkXdy5ilby9fj8eewZ51YnQsJKbzmCl5gs7WucuzvCC4XSnKBxKsQvcoJkXYTcjA46lb10+vy83sKNNL+Cq4nqKd4CmMhRFui/ONgkX7ezQayQ9dg6LK1q+BLk+ty1kYpOJMv8/0EOXQ+GXcYxFLd1PbcqFJw/csmwUCuuWtIhXw3rH5urUdmQcLoJP7sfdLM9ooGuq7APKelphe+5wWjwBXMq06bjOGTdSrAA4ex3eRiMgLzeOcUBsAqQBtuBSOqDav2nH0qlKCGxHpXMle0rZ0BLfkxKgvzNTVOy77yOIxE+FD7pOpbXCJDyDgkMr3FgZhVq8V79kgSOSaT3yZ1plWjwugTpauXSfAE02nWCoMH/varxK47wT3Sq4VTjb/aX+gde4uF2LCtwvJk4jOeSo5yVPlliHUj+O86m0ZKT8SnWMoe8kIngGF2xtq9rJLQSGsZxUY6Nic+QEjMqRvefEJ1X3WNgbJoHKXIO6zLNK6nZPTh5uAqV66YuUU62NPn00OnzcvF1e21QNVckT7gPk8CL58vupREpY/rj/xvwKt/3+3dY16+LShBgD9BxfLabAelDgvGDpPFYlpKm66ZFLTVmg8uoB3lnlRaQtm4rTuoi4DWc+IuvzHmfp/mCtm8r0yJfXCoCsw9SQKW0vQtMZ2gOz8Za45hgCCdbFSdo8VpRwr8JW4QjIjtzo2Cu4ddAKT2KltTxAu8mldrYjEBi7QqJzcRtM4qxRL3yGfyCvz9CWfYgXRpCc110fZOW52fnK+nwWO7pxGu12qoYCYwva0EXuArsfzXyUGZyjDQ2mnl1kEyUgRlpRcdu0LdYUmiUWX4CzPiadumzlTHl2Qm7WOJdyJLFRstrsJzvvoB1r9orBvKZqEi8q1aOmPxpD8o9BasRfLv6LJGHVx7RLnIxAE1ZS1G7QxcTwZ6y3p4UzxoqtvKxZkWgNpL5qdZeUdcxXiYQNNrk67EivvGDkeyM576Df3aZsPyZ72uFtKGhgqtkUWa4Mhou6RVQs1YuRGgcpFKXE1eAaKPVTRhnVVeAqso8a1wm0ikHACKEVPy4wrQp1FOwjCOVCPi2ABS9naI4Avo38Q/4yga/Qdr0pBbVQtdq61G/wsfmS0pXPXWfHl/X8qzmk7ldyDi1LEzFPPoBJbzg3Zmeb63NriuYU1Za0NtcLzEzKgs0g3p48XU79M3M6jXLjBvo3HZlgXw0jsu4TDrdvkQrTw4Be6xvuC+RyEDPQoANqKWEbwWe59dA6i/PB5+LRRDcXmbExrXS4Jvpp7h7Rxm1K+dxbr99+URZyXVWzmYZCtAQrvkW0rERAnnP4t5e3BvjeO7BNiE+o+k72/fTA5noQBFd7rW/zLjy+cNsZRBPMeZmCWlAIGCaoVfrhxuqThgutWi8RmiZViehThyIqAiSHOK0ksMse9YNHVyphCKSVPXCt9rCKp5EI+3kNj+pDsA2mO1n5zePKCAPiR1LJjJ+oP9ecuXCUc6DJhxAxv3PIOKa8egXcIwJ1CAieFnMjcEmnYKXj/djLE9V/e9d+vdV0en13/Eo1QSOscLgx201OTMVrmD/vcqr2nR0QDxkTmSub6nPYVDCx92mW1IQOkW8eanKhdd5fej1HjVWoW6DZU89m0ZIqDOSy9QdS9jFVcN+DNCobm3hR1NdGoI1Pa+PoW4l6V5c5YhOtjf2IbogzyaJcOIw2G31v8jsXIFrxib/nQ9um1wPetfsHK6r8fzA5Pq+mHI47f5zpQ8MWloW6+y9x6R8QvNVDFQpRfkpfB3XYcH8h6kO7gphesuLPOwgbykqJgcS9tLck9ZfrCcEooX46YtngRm9qqtJkC8knnt2GdI8K08En1obqxtZHUZ8TeP928z1ixoV3658UGS6A9wFSKmXuB9C2aYCClJrKVq/qTgCwnnyPjNQVzvpdyoRBYlnyY/g2DEQ8b9bTrVpH/FjSpxbRhn1vjVs6t7GOq7+Jr/HD9fFrXwQtkUyjmWMwDf7/AvBS2jwwbsWeV5obS2ajiIHhgRXjDxkq+e3WhsKuuZWaZ6r0p9QmQFFW7oRQH16JN+KuHzWt/u3kZfeClaU6iRoopnfdyOTYjSx0keaUDG2K5djstMS/QyW6B3l1HSyUlNV5TRekmkSfev/fWIWwmi4THXgr3NEfs7/9JWUc89HCQfCeqoU319x1FH1/fmNxffW91Hvh+Bw6yXZOiXKx4pbDJ5m3Xs3YBNvgM8wpBdco770jGspx2AUDAw5K5X9SFvm3WdThEiwlzf7S4L1uW222UoUmW9ROxObKN0iTsp9utLZt3Uh2sMKPMSwLnnV+WHMBCvrxC9Psp8HYhYrwePmXUJBD/a71PFhn5aOIPvriYXBwO5JzelJglOPTE7g1oilYT/GfgRATs7aTnZPt5UgSTsOZCnXaRew5AI6woKmwYm/Gyx0v7lV8TvnJge/KtQ0dieAVWWnEYE5sph+Hl791cKGtDZuZlgYWSF8xL3kWfTCSjkscmUNiWiH518bO6+VldXPAvn7YR7tV2AiSXH47gkOZEJDEUNnlOyqI70+OZOGvaNfJgUnUiv58wE/+9LoM/Q+KJoElLMzuaA0DnB3bAgaPCzZJcyrCEEQdnb37El17CQWdZtDKha4rcRqrnTrHURuXXGIdaMteEYf/kCAtHlNtK80/6lP27S5CkqJsFQnMMtd9hKTJ1t9/2hHMLd3n4dM7DxRFQqTG5KsIqc8IKE969r1EYeJKyXqfFBuEsKylUeoE66jD72Z8c68h8gdozp0Zr8A8w+cZr4nKBAuHEkenYEkFQrAmL1ZmZoq87ZddOsN2Mp89OOOt5JMMy8bFB+iGVfPR/bJn2SfV2X82pScj45pNa8Eds1Lt6VtSyfSkp4koP52EUAy/Xeh6WAmWa9M5jM1rVLUpDqIe5MhdDMRXke/MqGEXG4XBcY8sMxcMjTlg+LjejuiTv/VDO7cc3X6Zx58ipIOvlWf0VHhQiZAKOznBFOMPksi8Mx8DjMr2WzBQU7sJwpqexz5ZcMvo4lvU8PAZKpwPAsVJblRbTHjzfHQ2Fk+nzfwINkNuvziI7Fu4TRz3zv4gKaGUt5KN5/LszX+ciW/nCfYpGSaTt+Hdd/EvRbY+1NHH7Q6RD/frcmsvnnIh9Oe+x2+8y6aLli6SXNIj9FWWFiFBdx38o3BRB6mn1ujG9VrmNEFFM0AUf0NPKP0F1rUnuhbkaV2dYNV7fzj1P2qSmf01bQbpn3BQK4LXdqBTYSsAiWPxzGQbSy+6Rg0BLklWmw9d83roIf+09VZyvX7gjqrsifvPa9C2JykrcW0N6iqjuLbrvXfpNxu6h+/Lch6p/+wLVDb5F+ElQN0zLFJ/CpvhMg6+Oq59w9ELa1DuD1vdYeli6bo0OwDrvLDTOFzj3q1z2Ap4iypN1t3QzcYNp+6uMaPY6MlZe/Mh03uByajaWxLyK9TvvZrBp5QGvmavKRvfYTZo4vuPmRaURWMtznJGwPw4ayv275Wc8hUjQkafbzqI0PsrxHxg20Vvt2yuNthkonN9km7b9QBkJjSm5E/XXE4U1uHT35aUr9vFk96USNAAuaiZKCRtYlqeAdWVpaCWqm7DWqelKKq+u/0INx3qGld/OWiESV30Nxmz4ncO6r+7qp11rN5g82Qwf6e7PJOTZyX1JzlP+1IdXYom7wrGU7Jw6GpbLpbhe3ItRpFHZGFtLnPgtbakcGAWL2npfdxyYDIPmb0axlFrHGG0mxcV4dEHlFfYO2o7nE5b7R1T+OLYu3b/5VJU32DtO3nFa7NWlMLYab6IZLbdx96ivv6MzUX4tr0SBZtfQimNPstTCVY1OUh9n7Y5Ch8KWYzKz6BnIdb9wY0/1wn3VFs8+Irh7sOoTYfSZn8a7N1vicNKuXjcVMOr+ps/5HDN6cu1Wv/JSYEySikNqV94fRkmV7CCnvj1FMkzpu6deNJEUtyPQ5CXQ/IOaRH6o30XrIWUaymAoMW2oQ3JMBUAmlBiOokenF3XcPqmcKOgpMbnedEBLaFhh6XoO7F8hCbeF+hHt/2BATsY0xdEF1BKRpUL5BvhMiqdI2cBLlhEI7l7Ec6FQZSGLJ9q5JR/DK7Y8nld5Na3j5KAh8PAKhK9vjeWjWf3BgJ3kNDxOmnmDHWSKIM64ax3qX/O9t6T/UrF/6HESrsJ9QYm3pnhH9l4pMR7H+HIq7l9aO/kpwln4LWFOWYvXGGtudeb3mpu3TiJZWQtdEfl5s7Vfz8mpzf6m931/CtfcCz9h5HvafUb1EEBVr1azzE4tUg5lwyAfw81eqkfA1PORXaCS7rdt4YPkJ8/5b/nH2iyTxPSebXMRjXyZxoEj1qSbjHm/iNR5L+rR2L2J4cuoxzPWor0oz+ZB3E/Y11YiNYNjf74fjpGvEQ3nUS2B6HMMaoVA6w2HAoFdA8YFmTeBrCNCu3U5H/gUNvjUTHM+9wH0VxHRSwfcLKjJu+0UJnumuxcZ3XYRdHuqZzqil0vVBmbS1KpdJeiV9VZCp90vGzavy2KmnOvpYqZuMhd4xY+rN4PTewfpmuo5MDgyRRPkddNZatNqYcYTRz1S1kJnIynSZnYv0xlV8+42LdJsYIpdnVWXpctB4iWAcBViXy8rASpWuHbZ4z0Z1h+2VlCP8+TAJ3Ody9HGX34KyxLC6vSb559h6yq2F5NMYmty7bw2MOjUu3Jmc2ksNK43mknVWNQFL0cK41KoHly9j9eZ2DUkS5adS+YPeI0ymIHlZW67B/wnl/0G0t2zdrCfrdWX5Ub4SZkx3x8/s6OBr1F0Jv7ERL94WSB165qy3MTBgbhLJP9xlZImWneQEjUwkChuTggwicJkcZ8Fw/hDEOCHzqKPJTlnS58qMuZR4Deux9vsPDSi4A8V/WQaJjlMu2k+XHqjs//Kz9qWi90bQlJjvb5hP7ssrteLOiolHMRwq4g1gzQrKqak2UxZp8lqs0ZVwFvNQfje6q9WABPAk3syhjD+U56DKkooHNrjhadxpWHxKNHVwEgmGoWRwX+cXRn4f/R99ydE0Lpkomn48Yt73iPFijJJUZRYaZ4ohRFSePKM7OJSALUBJnyczvdiCG86RV5Mgt0lIC9wyy+8/8j7KDYMzo6zdUvjzVA8wqm0t1OVtzoAwTYktLcynrGf/+Ehc33LQ3Y66LG/tYGYQPlAJHuL3MLiey8tpqoLEOETg0IxBvO1vrp1QrfqxNYuIxlDvbA0Qyc9UuJm511927ukNHaJUYiwqRGQjPA7qa1krRZmCkg3X3eAAsFCNKcwTzbNJ9j++O8nWIt55cmDiw2U1l3bmiEzqig2lxYlfoDyhMBUmNuag8icsKPs0+HS+ERm0uEMRsk08luZNSEu9xkyRzFFMzqbDvxAnFY+KojzNW1+Ib1sdpTI7XJZLtA6wrX1nij9GxImNl8fLt4d9l+sCKOyIpbGxwa4dQNRqoV8xD49WyPI3BTSapAbifLWQHrNi/q6RoeXuuPNekKFut58iVvxuX1LaMWHbyD+76uaP3bBc56LlcIBEL0Z3vX0oaEEIznGF6tsDqXR78ULcDAf5MnRc7K32H+/e819SQfgbl6NaFq6MEbgnxS7vzPmT8KvruFL0al6VyhfuzkdmkEdU75VXEA5f/6Uju9tbHyTKhrKE0ksx+Svdqq3ikKOrhBmfPe0EhfGiuJcPQvywXD4m37yIIumaWwy0OWSOB6K8H5HOsr5KI25X3l5PrrRXziVHJPD42XRlo0Ode64C6808OJVjOJImuLarKS5mwqCwwnnsStLvg0x/+0Ey6x+62U7hesqLMwSp4kDKWUZ+og2fygKPqRgwysRX9HiaCMku35XpG8ekSd1D7F/ry7OY/mtosuSSzdkisQjI1X/kRj8nxa/pt6ng0stTMZNfjehdFoNZMakDRil0ZZyn8ZlX0iZOTDLwHJ0r2FxCVTWwaS4nF91SL/j50OevnCWkYX3kZ9Ff5goVZZQ54aP3OdGgGdM2fM8rHxffvehVbM+TCKFfq0Es9m0kI9HyxjVbDJN59E+Cutrp4CxQ1C8GT/wF7dUhdli9ODU5fkqJmpAfpFs6KwNB8wyCHdBMlxp0znuj41k4sXxsjUvS4FSs1YthDK00nLH6AObTC1UugZS+tOdneusp9BIEUSb6ttyNYmjEdTV6kVwRdgYd3o6NTb2xpw9uW+V2WxpKla+t+uATLgN5lvNBfRZruvYFddH3FoWx6MnQKaZ48ApuD6EVrZqI/+aRkjn28lECRqsPA5OxHN9J1r3ZdWT5JwK6xkvm6Kgf3/whJ8yz1PL/Xr5tphMj3eK85RbOQH2Yt+Vlwn22chZ28tq92lJMKWeyuv5/2RzyP8+0/znuSz5cvM3ffPxpcivybwZbFXB8AeOl86rYalJfFlfCUXNZznZ6yEIXptSmgapFY4bWXY5DCRP5QVZ+ekdKoJnvYikb+3Aju35Rl1ePSYUyF60UsiNSGMk6+1LwwQYwczTXEMSyRUHxQ/F2q68sWqkD5Zka3RqAmqRTHRtUKs3wqFs20L2jH4VT0xgZm1f2BysZZu9z3gvJbjB4gkxYyFNkh3shJh6O3EXnymYy13b+9NudlRManf5AV7ZGLtCduqJTPWDgJqH+TgqXLLB1skZOOuDgHZnx03APfh1C8XAZ3e40BmShboQGTmp2k7b/1X+LWuMK7whfF+Klz48Bu8jVTQpqyRzLw2lW/ZYEY0ooGssTu41zbt5RZUDXVovv1ZNRRJxRebY+qo+bv7qzDcln/ukN8ewrJ5j8tLfHR7uinhl8Is1VFaKKFXiVhr5DqRqSEc8hYVFYYdLo2I/mOXWXc5CaSbnzREum86x//sK6k2zKoVNuGlf2DQ6B4FGKKM2n73s60CKhJYdS+RoTe7BhjC8HeleGEgRCtlkHcdPUrXPYtuhpjN7hNS3qfiww8Y8THzwVRACSUM0XsHHI4BtFzoDrAsfx33jUc1SmFusstpZ9NHmeIXeGJIEVBwGzKLEcxsRpG71NBPgqWQtKAgA+Vkye8rIiTt95nQuz4Jdxovf4XKg49UfIv4+wEApx1w4qhI9lPd68LgC+CkQgjB+XxNEdqAUEX1Cc7mNU18d7fAmPEf+1p0QLlmArW25FAPmLpQvQZRsFFngIsP6w3ffHcNdF4qjsrQxxId/TUOFge3M91qBspipDjAAjgy/mekrCWDKwKAnwuNKcZkUU93Y9U4lgRIR8sTL6FgiCKlDIF3mB9ErSLzmaBSpfFYUxsltY5X6WwOURYVKqoOIkp9L/Q5o60eOzLKRam284DbTQVMls5fa1rvXPQTJ80pcN+DPE3l6iCA30aDAU2iJlVmrthnI9x1uNhNUAK5ZcHlhJd2e05RHjriZUqYpVPWJ5t/X+fIorFygbVXmVdHVyyZ+xGZSH1aKTCS1cWVUxfGsGTfmMwzNqSizC+Mzax8yZqqIOYhequnxDwRY8Grqz8/uVL82G15EQxO5z6wTfX0p0oeww4LNT9azSCdJhN0nO2eOs0whUYzmX1h3N9mbkGRZPIiboWh+v1RwVe1SgZ1FpE0hsnwqaliF/nCIWX5TSZBeUjXhaiEth6SECEVADqV+bv3ZVNdemSTb/gYZnYjE7eZmuaZHS225rZb6C/SJgvt0iv8zTQ4QJUbIjJ7qOkYYBnvq36SVWZbZLOjiRIXuIEiCmkpBs1KeXRfG2MYgZe6qpURHXuaxpJTc8/T99jbvwqGZDn+8/7w32WSUIFKJsg3UbCNr5MPiUCZWu48w8JSxETru4wVoM925irTQi7WZ5zw4OiXFj4BsgHZMakU9m+G2ay53rMeg4W+/6+BqCmsXw/v95LdIUwJhT//ZFOGDPKzxHewhuCtCVKMavBZ+HcfYGOMYB00pk7iz+MVuGgLA5LK9DtNKgMzlypC8fbq2Jdcpbw1GwgaQLOx9SOurlonpgE9+2/fbTwaDeBaJnFMX+qKdvqjqOCrVrd6KX2ospVXMZHV1oFpNU1JtkvmJ7GJe4y7q9Il16PnzNkTjNrFkEzKqR3opT7Xhgn7cnMqHZ3Zf/iztczdKp+eduAhuM27xxxIYMo1mKzO6PyB4hQrUfGpSx7gWgywr5vrg3phL8BJNub1X7bEjRWet10k5dQs212GyULpxOr7ACGzz9qkZDe7eDbBzxSejV11n76LfhR6L284dIP7d6oyGouTKuPuJk5+SosYOYAei3VUvO3rpHZuz9DKqNNeji8yVkusL8VxqDJ/0GkV/Z0odUUgO+QABORKA6tHwqXtUrYvaQSYVEXdH8drsckgVvPK1Qr1+HjJ+F/rLQPa3fZOQHw1p1jFZ5qmCSzAU3C2qWCnq4yPM+WBMzO1lUE/EC9gNGFEDXI7JvBD9Yc3vHnDYIvlA5wHf2tTuFg3J5uEtTc8m7fZ7vlR7yITzpRmZcf+ah6jjeMxpzyx2fJGSe6rvhWiCGXPV3nfr+nw6Nxp2lDM48S+9RXuDU0ny8A3707p30C6Z3Nq5XqLDLKahMOcGoG42mXeRDqCeurJBzyNTjPX0kGYq5rouva/ygJPFNhdOfAjVwONQdVuV/DCMKUR9VoIE93mMm0REvycDc16aHDRyM/9GDKqrExNe0AUix6pB6ypJScR5FVmhdBFQRoPEsgbVL6xCqbjqOLvsbeCylJk88TlD1hQpaKWmyVhdZ0DyBljNshJgJfaDazooMeMZc6+LJzL0KqRnVryQyCFzEw2gDgkJhNZxEsuW/XBMqGaUDSSW1aHGzrBMgIPAt7zF8JM1YM/C6vGngj6FXL+Bc244etv3mzB5LS0URAXG1wmw/Z3MKq00xacQ5ns9UKfdhmTqO54zHBDll10bxlQA3Zb/jAAV8NjNqg9Vy2yG6uIW84quF6DifjXvFMitmnOWjrMe1ZksegA9pu4RVnEiiVaS4xSX6MCmeAIsUD4bu2Jciyc7T5XVRv0p7Nf2yiz3GIpCMFhudustk8wbPaEAuq5mYKNQ1ut+KdLESQ6yBIgm53Jgq7rvEdg82W8gTF08Wtd+FIw/vAh1bxo9kHRfUZo8FiFQGKj/L+XRE/8ykOvU2XvH2jMyX570m0AuoVmRwh6O73F9XlsNehquolCzUKS346CvL/0xVNDtYRaqzGdSUyRp6XCWBhtfyY7Y9dCx7HqQoOju17m0YaT3LUherlOXTgAuFUhfW0UdMzm2PPcTny420LkXCd/TTt4igGZFvXjni1c7HC/WGV6ea8BgY1fKG+bksPyuTd2lIy5DRsKoX+7F1ULyyYAu3Ug3FRh45ftUd0s41ydUVFZk/wzd/yC3v/hMpC96sctHYguu36eq8E9wwCQiEwXFUJDgVYbPmMLHvW42bXywQ4giZnt0g574YQXX+H+FaYugKxQe5LVTIfTRaKg9lC6X6JvWhIyTqzwpcD0HxMzwdEly1EEZPkLjDA94wqLihx9+WBk+MYtBErdg6F5hx4iMHtfN4vLeEp+h7tjndOSK768rgD5Sq41ASxLaaK2tNODs49y0pTXomaxurTm2FtygXtocgqUAOGKo3GmCI87bibG4LW9JhUvgewDHrqEKR7A4VEXakrCEnmeFOL60/ZTOL3x+zgSpQrOo5UfkDxHQgDE3FuMidvwR0Ao3qSB5rDDeFasRnUEaRdxa1seCMg8hJTuYrWlrqtuZuIFaaoVbaJOdQZtKU9lAHzoPny6ET0STihv7v1fujDbisc0W4MO51bQh+aVuomxyH1cNicKiWfqtcuFIxn0Nv/arwLKxjXLxUAla1XUFR6XNEFaxkkWVsZ4fEQSq1MgPEEIFrRrzU+Zauu3lGdPe2AAf5vbEI6zJCjsr+xshYPv1F1YA/+LLL6oxrf7KAlY+BcFBcth2ok7svpoGDWoIbm+7bj3F4813kNhKhA+c3xbtCFffGZ96PN2RtJhbEqiiBq5ztwzmsOZ2g8bYysVxwtrn2FkJmxLAXf22iYjGFDYOYr2QvLK+vetx0x4o0MKDj26GEzVBboGfku7TT5/Wx/FNaKIE/4+ZTO29AnYdtlqx594JN9RkU7+kj1QCCf6wteLHT1AGJ/+ijJ+tNIQo5/wg7g+dh08Dxl+kcwoKgWyEAfL5EYXMsbxd5nH8pe8cs+3xS+3F/CKHExRff1KUeHd2FN6V5nsZPCcmP1kjfkpr+cW0FUyUZLRdtQ16wMeWFFdrKfnTP31PkHqOFNfa1zZnkaO9Y4pC3C9PCNx+4DGDGjGcREhXd2z26gbgFemMAVFaJLbU2hBPgxeRmjzT+b+2itMr7J2ptndrxcgDay7WTSL6nqQ6dItcfv4+XNDkK5Lu+bDk7tB2bGq/nWYWkwXA7R8cs0wNXoa4TuhV1WXEcck0my5QExrZuKfIW6aZJGq1tKDWa/gMAL6T+oGFWGvDBgydrMTpcXgsI5ldABxqV+vp2+xqWiWj6y/ayDNZULwZVn0Hyjat6FmR+wwpjCzRj/hwd3nYZ0bcFsUdreeKfEU7lZSIrZCj7pJiOEfLHNRXhjCfQucORdZCKcTD/jerIyeqcpGtrJJE9Xa8EIjE+WEL9ibgO89MBFO0NyahjS5BvWtBqkOk7pOPy16PrBZmOoHl1PgJgsGBEqyQbeHdjAM8J/cvIpG/yvhOYvtxXfxgkjT7xR0dlv/z/B0mQvK7E+ca/nwdSQebWFWy6V9DFX68urLtBTMPWIINIMqbQFB90TxMjoAT0w1OPP6e3eJ5+l5AWW1Im6vd1L5ktSAC+fI9UJ9uarN/69bY9OROYmCxdStgPXd8xQOTEHuxt0ZhjgSZXiNZhx9cBzBADRJfj8iKs5SuAnCO1w3ESqX1xx0a3Mre9vIRNysoyRNRXlbuj59SVEP6XdqXd190c/RwTpST3Y3ecF2Qqx9wyTuKDphV90agsCvOp7TlRwEJtWfSsuWqeHDx5gjJg6Aq4XEnEcU363S28YTiiymUwJ8j6pAhOqJuYg3L7ZPfrP7QJyeQM15DG7j0znkP8sYKocOBflVcNmJBUwpmj07JmcG9h3BP3GcKiCaCooKVHHp6F++aQXnjWsFzrPuPeoStGvddGgS+dtMof8HX5VbWrMpuxO3xw1G4aOwFZVOErFLE2MZwPg8Q6AdYumMzFGHBfa7ELtqbBStnRrOAInsFqyZ3SWt2DCHqkMFGDAmfTliBVUdJTl+ZVUhcomvSksY5dx1X5/Udw9XBxrOek7hy90Sj+QXSmqlhyxkHgDFGxFunXPgQKyzMra1kaXPjHViaxLiQdYIPM7IPeT+Cj0BSYQFCCImng+h4/cN6LgPWLw7fflOxHpAG39GUw0Bp7aDClARi7SDF8GEtAGdGeTBU+KrVXir7cJBGVuvYv418vEML74TwxZ5QCtNd2XT4bKTyNiz6hWnirpwz597+TsIKpbD1liiznb07eBAKTS8sQUr3NfnZtvOjvbGaczzjAHzCIdhl5imdvFUGwYakMQK12r4rUrJvyif7g5zDc6oojOCmJU6iiSduqfw6VtttFuqWU8MVHp9x2+QbeVpgNyajTLMV6CL1sq2f7hH5YYerNdO5cCLzMpf4YztGJdc8m+LdTfkUvS4RZp5i81wuLbHL1ja/wBG3mCINcugrRbbSxCtRwhXXhfswITWoR8nQDqTHrOS+QvpVrjqII7oo9hkhLZALyhCIOV75RiUJmmujV7tfvz/Skv1T4ERBSlVS1vEqPuO1CI+OJsuoLPA+FuGODlkW0X6BPmWM/lOTWluXmkStFPIYVISidNKiFWmL/48sx4xCESmsqR0FoFWidb9E0SDhMXLMyN5pksYU5aSpKkuldo3T+hIcGujt6wEjfpa1qYbF1icleyWkJ8WRrov4GS3kSZnCV5aP7twGdVWBaSZkhCb0xLIGszAVNtQ2cNEdVgUMN1U2RQWX54vbb73cwNkioqIj0Z7k2kqwZoA5h8ywpJ8SxEqmfY1UpNKwgsVMBuVZWt/seK24eiF13o5FyKlumL7YFl5hrQWa3EDoxDjMFpCCu66z7SS65BNbAZVkZ6mGwfVEvJb+zBaOsSZYyy2fHXPT5ziIXvbOvPfcI2C6eb6dMiYjlplrJIY7hpeWJT63FdAo6woCqbcNpbsKnO9+yWwYvOwD6UL1Bs0HobuxSSNdSma85bpXty0LW1vPHbG1fMgE3a+bIwX6jQPVKkiO2d32nEfCahYWtfgPNxtyCKqxHJCdQpMA0jAOjOq8ukAnKWkmERcVHH08NQtRNPGo/lUxl1CwcheWTOVVYy5bWXVX3TWE1fVzwdeAtP6C9LPFwN5lP5kl1duV/+cwkdsY9jD1Q4F5rNzG60Qls1q7bZ2rz23O4r27OD1TB0FGJe9BMGvBcNG1kpQ264+ryc1WElSmXe6m6OOt5MCQaiWKrn/kxiAuRM///wX12gZVgV0Oa6AcaE1X2/HxSO7m4MqDCSpyDOQsthpXsJ4M5d0oTyBO02jXMlyWofv4ys70C+2jCwd2dB8d2ps7HQ7O7s2ONsRaFz4GxbemZJ5aXTlVvzIKONW2rEnS1J+HzjEn7ZfdGNa0w3PqvknxtuTz0FOIzvt+R2GFUS8lnCGStgGL/moYCQqMT99pv2h3ayvQiH7rNYBsCWcbFBxIR8ME5+FUKqDXVYpfmqNWse/wI6S2Oq+jyUEUXNqRt+O9l2RBmknFdNmJkz7SUVQbj5ydCdH8i7rETQOOIRVqajLCs6Px8kH4nCww95qfgmsrozZpGA0eCOJt+U2l/H4FpTAXODYzogaMmlZXfeF7d9xc7ZzFCpyRhfBIU1Cd60DHv+xVd9dE6aNjru7D1Ppt6CjNYunhuJUGtlMwntTK3co+RMu2pHjdfIRySW+LJOa/2D9+YN5Auohy1I6rAM8Sc+dHcLYWiOOX/UA6+XPS0ZlMBBT9VQYtBvYywlP3X501feN0/sb+ROcFR2k4psMXOJsghXVwfQNB/rJHGh7BAoVqHoPCGLdkX4OmVXQjLShDTckePx9t4X31Tl83rZBCwfBRfTJgl1S9VBd2X9KzOzzstLlmwjnkt9uO+E2WC4GE5tFJq5+QDkqRLR060z/sHcfb44IU91rfJQK14/25BOZSfaBmoqk/zzu4Wujml0WIqFVCud1IRfptS1VjsmeoO+Ix8XMntTYpLKIsunBSZHF2KpNsrUZaGgYcUKtA5TfFFLhJ7GWn/dTVTPZTOLso3E9ttKQxpxAbNRoDXCR+PoRkW8tP3yCaSCJSz7cVCE495atDZR3SCTXD3XS+7Mwwl4iNghEikntkA0PSd8YWwzUXlGoNgTOQ7r4NbGHc7Rr/jZUXhMuDxltJFh3cQ69hNmKd9UjBnYYjU0t6OzETvdA4Dv9GqZqMmuKtp7jfDXiGqBdBWmqGvP4+1+9w09REWPare4t3aZgFzbNm3V2TmseXy9W6DrG6RxR7CtYNU/Md/FjSHFbrt1dCdhgi0AiNQ9vs0PmeGWI41yVwIZ1lpamJI8e5S4uFqbEtTgYl0erZ7AzP9i7i/C11jnEAnwstX+20l+KYfcM3F3EkpBGO7dIsWasZuB/se774jI4vRudCLHoq8kexePvXIiVchnRsHXPnB94YeyHsZher2+RWVhW9luf47bj+laQ93/rjNyOAtNmgv68lZ/o7J7jb3h7uUeR9Npe55F7f/6ojS722dsHsYtOM/HMquvfx/xl3D2L4kxusIQknit/pyVd77CpRfLUbdtpg9ylYOcGhQfxIxbvR4TBGvA0Y2mO/D8R5yzhZT++ddi+GJwqtj8SH3OBdZT73kd0xDf/biZtcsRMxpCbvUudhBGjAAB0a/abc89eUILqXPci/DlYiL9J/YASjda0dXz/U5e/Dn/n8f2LAsWqZdq82vH+OUOovPpUZQ/dfjwe9DPLGTeV+ua+E/u7Lu+SXnRd3m8gXhrpd+toWnT37kxHuM1wgZno4Zaq8w/Vo8Am3RzMOuIJ55oaHpPzCJxZwgu9YGBh+wMqQeMNWjpgSRYQQURMltKyzrAkZT2VGGPGRBWHCjYlTBdosD1TKrcodVU+EPFDtiUxOiAX3WV6QoFN5QUo8IG9IHQ8mE9JAlumCZOTKb6SSHvaAHOmNCpqWTaZbmkylvKAZqWGvaCbwslqzMgj1L1jKBP+G1UNkf8HKkOb/YBkvfEUawLOvWClX2X9gjwA1HCs7znAvaIlPlY+oRpmo/8JOHN0sF8zAv8xfmJcEtxzRC37gdmgjl3FgDTcF3KY2vJTgXj9qaGDweqzhAkMa+hr2zun/xpWEH64Ktdm7TfWT6zOcp2Fbg4TwYa5M4X90qNz3rQtT5QpGrxuuC/j/H/4rvzq56sob278dX7mh0IbMTwfoksFW4CJ5swomqf/MVcLF4K8Y23h06Uu3n3EK3ah8i5OOkUu7CF7EnpsZ7PByH5HFuWzGyDE9wgAw7Uz+a01ocSQOeV2joE7uLOROZdPS+phZ2BOZFaYq9nXmYa16X1QuucIVpyClFmvQh3A5TB0xJut5Pw8uAg6S45wv+ik6u3myhFM0zt6LS8PmkhGAX+ahBMO2L7elxYdrewgUt2SISwCRTpPGOHYDXTCun+ZM2ic/ZAN3YHIKqigSRsYtu/qWyyZm+BVR1UGVw9tCHbDCTbcO6mVkoK31tpx+eEy6ysHHRCIQj9/a3+dm85XhX7sFZcLnm9qltO88n6r9wqCjxARlrYiT7NxkDJ2c0L+6GU1pRPwPMN55V12MsnBKI8aknvJGMhDO9bboe+uvaGRit8uRzNoePJ0ry6JyIhXlwd4c703c4sAVoLa5+MpkhLBbPNw49cN6vyzHIFe8jzMMYG3MFElqY2H5YWYzddoRpIzIOwyOWCRADgXRuSeTeMhm86RJaDGS/pFpIOXyNTLuzdJMx4WUY9NFnh5S6BB54RF7B3Top1z1X8sl3Hkemom1SUHYO/qmT0aS9PkF7p7+CjH612M9R8KCNKLQHo9lQ+eF7672DcGnuRHRyIPmeJlCpqQE6lwSnxUfJLhWUDK/WfvMtn3xY6L++7IhtzmOMgsso99L0vDGMJ5RGx9YeCvMHKT7VOOSbPH3XMVrryLe0E0m95xaH79vQR/wxPK5c1nwR58EfFwH0zRkf567BU7N352NlUG7CFlBHRIbjUIrFKrnITRvXhSvoieAJViIF9jTevJZm2Xzov8POcw1pQ5fdTHM9s5NSbuqYVOm1nNKuVCNUIGHImUhHCd3radIxBR+ekhVIWUIjki0D2Dc7XfhSiAtb3gnPOc0gAP1fN8Lzt97EcMJ8SRW18NnCgy01L6Gnlii/qEQ+Kbk7aZwRa0nJJ0+rZu7qiDdYSLCk3MbiHiNgSTyIjiFfScmHaJItZAYfhnxBGRBZhyIrEuLOd0a7+VfgGBT641xYfyMKXPkhYuN0ulfIoY5Rl5HsHAk8g3jBmmPux3wN4N0zRkF6JzJVSHeU+4nnh+GOkxf/iXAVyzICnOreTLbIHHpA5oNubdRIRetGTNMxHk7EIryhmEbth/xgUlkYkwY6Q0NAsBVhJL0SyklmHO070FYymGn/wK6XWYSwSMtaIo7wUZfhtOXiB4SjbpkkeDjonQyu/EgqFlPOsXMwQo1UKUJve6TjkEgvSdBbOdsimHN1pCnYsKwx7MCyR2PgSdeOq9gESUma7rIqCJoednDukEZWURnnqbNXTs2QyJ86e/7t74pQaIzaB9DvYJk8Mi2Rt/Jzl3H8gyk6a+bBalMgED65rNnbWphXYU6PSOecVVT9l/C2r6MkmciEmgItZkkpp+aZPGGkaNPmPUVxekOwzAMyxrukTaTghiH6eveIbzRO7i1i9ZJNkdjLo+DaHPKnn7CRD6npBEWSHz0DGHPa5/Za9YbAfcdws8HVUxK6QqHqgmcnQa0+dBy5zkV3YZldemtP51+HZ9pU4yLx7PhlEiYkmwOlyPgch7qrpvbWMZxPcnSe4A0BTqlV/Hjbi6dJ4yVEc7Y07i7Nidxtd5b3hK2PEO2vaiKXT1I9L3ltu0jXBI4Lblcb2QIvYIxi+zT8VoVnWkdc3BOoed+Uwi3gbgn8LEwKhWh+5A+O2agj1LfRp6H8i5z5MrKAC1M5QDkV4vkZrYMjqPbMFoW8Nk2jVOoBXhWu9XuLTr+s6FjI/ro/Lgy3hFJcfqULsminzPJEo4CR/ILwhOcNT3ngN0PKi58a9D60fZEFXEHEfWuoTLGW3i8HLvJ2QETqQWAiIYiQl5teCyaHdkYoowPEQ0hl8A05m7FL0P33pKqrQN3WMCI+slVimc0AYcCV7cCnUasYont0IsOmBV8M0yQ0NtZuYNRPEVXSqnOrIeIg0EC0e+rwGIroEmcbKy/2YD5s+2AMOwV6dikczavVue6orbbMXjGvImh7WhBCgBIi6aVjlQ+dZ9QM5izk3MuBGutIlD763ukZXqi+qBTiBsVDSQ2+eNXBT43CtSq7MA+0nzUT5jLxl9P5U5zG9y6gKdZtXh4x1vPtk6crgJ7oHbGdQkCXZIwZeW2K/0+mObJYz2zywvj/jOdyRKH+OSGxDhxnbh0gYxPPukJKZ4ON7aKk9/spjmxmF/wukxWizr0nObiUvkfFMYohvDqc0pfXcoMAwgNl1yh8TYE5yQboUOhBQ9tLtImHNMWKIxazZF0FCF1vt5MdW0KVJzIXRnps5HfJpLxuH/bqxSmeUswiundKmGVgKBT1rBUCCawv4ScOlIQOlKkwq2GtkpI5bY8My0qtV4aKeL2VKM3RPy2HVUguvzku28JT0e7ltrNVB8zhbXa9ajsc1BuIJu+Kmkt/pe/IJ+W+Hh27GSwgDRQSpSkWiYQGQPHYeOX7P16bAAJIsAAqwlrdnOfZZ5H+ywqojr5Jbgj1DNPeVjsLthv8LYOZmmClvhIwW+hCzz2ioeJrCfDU79+x8a3008qMvO7XYxttEkPG+Dh8vrglyaTHiOiif9taWPBGNX36oweGle0U/yS4ncLdAb7FZmqvFwv6CAZI5G2CcQbyqVBeQ1Be+gE65dVgwj9trLP0GejM3DcOdqvPFRZFa1BR/VIkg+ZM2vLRmP6r1ObZELW2aE3yigAOCE52t6sT0FaYdqYpakz8Q0+gKsm+wBsrGf+KeGDSpQgnJ/ROaK2m9VHgHKhfZV9q9CkdHF5/8yv1hrUA3azTquqwTAMw5jIzjERGbSMmd5DwqFao7LAzX1P9tUKJLRuarN56woPYVu0YMNLFPOVfIfOOwDuoga4nXDMcs7NQrvwoxeaMclCreIsVJWEUmsu3Mjbo+vvlScVlD0nsEt2BGfurFB94IF4jwpEMh2u5Pqy4YjiQome8YCtS/R7E/mVS4gAK/l+H+sKhferrlrkjHH/QpGDA3KYJ9mjQjz8OwaMQkdsWZkTTc98gTz0AjPZkJiKB4a/9MNp8BDT7RsnxAq+5eDRMawYsKo19pJfrUYfNPkC3CnoMS+c0k1V0oi1MSheB1XcUqP7srsTT2mxoNldD8mycD5o9uvqrtAecS59cT8KkhV2PUeydEUu/k++XRTtMw5osfuwiBS3EJdClMNxiKHKCPhkqtdvovAx1CYHTa2yx1SpUTlzry2MS4DFLlUkc93SJ7syfqL3guXA5AATfrR7uEfAi2aN6hlRA1u2uXIycCc9FeaROW3f2QaFvCamH69T3N+RO1yN0aULvGJS0Xx0qYiEEHoBVgfQiZepqIGSXfnUocoC4Z3waqwlkvhpl71CdlNMKtMDzriFMDSDKxgHzBZwYzvcPnmBUvbKyQdS/4ZSwRlwANxyGHNlhobLzwCiRW796mGtSwVmCNyjvFiVmqGw0URYfqbj9LaEm5iqvMeOTWrhm7kRXeUecMYYk5uVhBZ13ZAH8GLnNBaAWRz/P2X0DOC/Ol9WIPLxPljCMpEP1eAWHs2bfiS125CV3+lA73cWunZ9thMkXGTV/lysTb+07oIqfowgsbJjDOoskwHtSSD2yb0qiZcZXgBCvzK2CTaU/qk9IlCsGLu3FDjODC3frdP1FvZ1bYIQiCQijCFhgV5nY3X1n1mVASDkDxcloc+kXUOdDKNVqJv0n/DSHZNItsJ7npC0xx4dGrKa20G8bS2muBVW7sfuMkAtD8RHMI/qL9Tdnr3DyEhGbYRjzQH/Fz6ExkGUFBKszGwabX44KPbULlXUrFCuoH+xI7vGy+dJbkqnzfwfgjMHzowb4Jbgew4czmm4kmrW5M88MY3bGaRq/RGdFr4J34x2L98qaO8xUY2tgc2aiAMrNORklAhPiE7BRhrpSUO1lRl8pPZOWXvYW2EOYmXJbffAVzbKntOQpjfDIHR50L9Lp6Tqxt8PnjRX9sgL7yLnx4bG57eSNQVJQEhsJfOxHrYb72DbFF8dt/yNO233eK3aSVXWdXmvsu6vduQENL4bckiK/K4fuBtEioRxNDg+gK6FswIa/zv/1m43TC04Et+b7hSUB+PvIJ06MTt6pv6JhvLmbR799fKk2fHQ9IZRpB9S08HkWXtsRLB36l+8VAz5BHUnQTUAU9zlWkU7eJpqBzAMwzBSON96p3/MtJEbAAtjFScL9VEmhqIivav5gME4emu6L3YDpdSR39wRxbaPHF86GHknmmS38pc02IQt20cqHUshTxhavIgq5QCzjO2CrjzyXe9ZLaeQoRRzMOUUaRYycI5ukAgeSp6EA84nk7RfvfzvyvWo1e0cLx3GKFdNA+y/1kRUZ0l6OFvP7jBK9WV+6+jPW5Nq3VHiJLZ4PdqlJLdTBGH8XkYDYP8/tRhoJQmWv2FomQQNmpABu9ywjC11s1OGV49QsxmcmvlwVWF3ensx4HN2LNdZycBuz4ASbEEqBWtk0fdFkIwr0NTfMktBTV/z0ziO5vWg49BAq2w8nIjqmdhE058rUxqljS7JuP1oEvBEr+2WINckISSGIUEz18R7EctWml7aDNkmFfpKPD+n3DQyvvIdqFfIqZSU1fEPqr9I9xbfLLOSaCx6n9Jpe7sqD0LgCwRSfkl/nYUDNF8OtjhMhLwX8KyapfDskx3mxdZ0OVupiEHdDckI4TNgMVlI5kyLpdgf4JJh52uh27i687JgY6BEa8r7blNZfqC4DnR5c7lTEU+wwxVcfVxQ/xQldvvG8DT2nIdVKSb419jIjb+Y7YtIgzyxYnfzrJswOuwj38YCD4YCNk5WjxRYp+9tfptvjjmKIsxeAdycUxOeyFZilO503XTU9sS8QZ7jfManPIY5CwRCHUrVD+acQCbNKLX0PhO+rjQLYRWmV5Fe9wKh5MRwPjT98kb8xnMJMOMT9stPz7YNfK79Bq+WyNyFJIFMcGvBEHsDCe+giSi9FgkpoVU6tk8smo4fq3+1i+kbrjwGw4KlNqaDuMkiEdHogGsDEI8rXVK30ONOkGYQ3NRnDfen2OHAhaAj7fXNzJnABFfnKDFSRyn57xC9XHcKHSU/2wJl0rEqvk07Mt1OnTyOBJoTAe2hoXJslPmzUoLfbK2uJFVkCWFFYf/l4AxbB+zcKgnugCloNjZyOL1n4zDx2oAbaRfrrRbU0lGZG7t4kpDEgO81asStKLIXbpaTpVIFYaqDXxCCjKWiiOvgAMmrySK7MAUkGE3Xvb739PeaKHKIYlHsIGfB196jlNvmgaiYA0+pFgU2dunrhIdcTqFXVwmzWPZyEWG+b+l9tm7QpAlBPNmP0TSJRZar3GCvjcTiTUfVqE48HlKeIDXTKyQ+GWwHob8HsJoohjkxGMVezue7pZbzH5HHLuR0UkbO9i6VPMit/zfxtHh0uX6v9fFztceazF3+LNWNxIDbVODpEKrMgSx8egXuZ61vOrWH+iI9dqATdXj57I82x7LMFOJ791bQYC4vdh3uqdinyuvheAGUjSDANA1R6crE9PzybvGyFyT5OFFOIqINwzAMi7I/F5EN3urqoAb5IueFkxbSDvXA2K9+VKVq1PPnpRjzXFya38DVUI20nnbMhPjcCRzxR+Nkc7I4B8qpUJ4vO2Q701C3hRdBJ9yDXEnnHtQRWuLWDcF66Da0Jb6veUxiOmREz4CRjlfLOn7VEzDhaydPeiD1YtuRZXIMClsI1nzCuwoiGSaCPCxT+Rb9w+OmqLOmK0MNIoJZoJ3RAZ9ZTzi7luTmRX5ldtz2yBhne2BQXMdyXMANam+0QEdenhra66INQ3xm6TY66CRu0p62B4e7LSgUQIzphN1ZYGuMhs0jJXZML/Hm9B3OvaocfddKmWTC4z6RUG5kOuk+jKCC5DDl+bJr7yn6f8MusxW5JHZOhpwuUN+ANxJ6HxhoI3+ZYjP2AI3NtPSXYE1sC2YNQnISROupOORqPSXww2bI6dLseySRJqY+n1CTwvjTI40VlDNZSDZNDz11YL9iOR7mLAl7vQbKBVzWTl1JSyUnVKJvnOnBZEDo/wO0a6QB8iVhQ5yhbC3kw5SmRxqWqqFEyNplF8KE774S6sO3TzrIvGa9eyH1d6ZYKyETh0GCI+ix8TMvOm7NasQ0ZNbG6LCxQKmPym47pgssr/IcJ4VIB6see7e5haeno/6TPMwwWQEOtiLFlBwmlyhHHW+6mx4/FOu7YzZ5Rcf8zVzTd5J5xyvqBh5kwp+XYpS67E3XHrr/VEJzdbPmMYmxXYiL3SfP4Y2SQ7YMfGY9TmTjtuAMaXO4oYI4pDEaNtdOVR01Yw+QJ3Oa7cmN/GXSID03iSZjWTZSOH/veJizeGVPPoOnk5fL7GsA4yDzmqU0rP32hKMIYN0XiItkBTgI9/RnHMGbvSyl5Nd9nzyHa6Og6kH5OVNZRoVIAZ5OXnq6gnh0Y2r0dnPtaZiNqdGDIFQTXycWyG9SXYe+ePUXLWU5jn+I9Pf6OzXvMua01gRT35nHY5R4RHJQwSuNEl1hIKodKF79BRw7pGvcBUWrWhzIIjxnDa5k7Py/cCApoUc0ccnpOTw7fySgMpXR1s+Meg7PVnBOthIPhtioIqdYIDJi4Y85rTWXhlWtSx7edfF6kluq7vXrPcI5Ztbmf5/PnaOfJEG0HlCl3zlTXx5gUyOLeTU5Fv11hqvjeR9y3Up6KZdYo0RXDvLI+qRNQn6twHLwZ6cpCQKSdmWRuIO0EeUGLS7M3lVmYUIXbrGKGViO9T9bOauT7CRsjnrRKPs+fpX0dUHRqiFlmqECX3NIgiL8/Wz5dwU0Qc5HKB8HDRp6DBI5QlPtr12HpgWk5RucBy1ERkB8Iv5lIQ2wX4Xf0CNRBR5ISuiH23p7W2bswWkTtY+6o999zfMK0UZNXEsfxJEYxDAMw0ju8Tq+giSLsuuhzafSL7IyjNJCGEVbJfmQFL1Un3ZN7z77qQIXuHSXDSHFdZwBZZwZDvgpwesJIU/sb3uH4gWhnSovi9Ey7ycVzQ4dccFwgJ5VEshqB8NPxLdqxkl4m04Pt0o6cwLntZrHleFzWcY1feTsHzg+WP/hYs1rJKiaZsxv3K+kKik6sZaI/BKWNBG27eCUXTWfn725OsYhcm2DK83AeWfUs5QzT2f+8GYE1mjjfnNPoeqsUlgSWrt9/r8jJB8X/ISyDGVI8Fzf/tOE8j57psqqCA9M1ZhsVd/2YbUKQqjZXFX+95F/+1PoDGZXq9yDLEoonKDdQlHyaLPV2NWDz/kfIiOwU7yrE3aNZPL7yaydvTQkhSGFgi1GYCr5DfnMFq0Y5fdpbsXGw3BBHBtBewGTppeA6H/7Rsah1y/SE3YKBMKrFPFrXcF467zUtwrV3wKnDgPH5ReTHsfSieMtzIR6XEUBIMxvYgljY4uekap8+yA91DvpOYLRNddWmuFjrXNeaEF8OzCpdC1vp82A8q/U02r7TycaNGAZANk0f82vxutJoh7Tr3qct0OiERL3Cbjd3KVxueg/jdN9Mnh6UXLuCbGsspnB6d+26nkK8ldRXBUSC5C/POO3DYA3yt107Azxb3wEQzfYggDr5rLk9d6ii21aOVr+xU/C0U3aoHF5THwud31YW5MwbLu3e/ATmtoUDD0NYVDw4jnAyiqPzuYyzyJyyTZqgcBQZelVIq0OB7/5k7eK+zrJkmXiRkaQiRJqm+XmnIoebMvNg9QjNUsfUtgNU6D5lDCs1jS/6HcE3g2qBge0XNJGEL0WCIUAyK24jyBpHu5NRRF5UfRZVxglvrfefmvHulcV6hdCdwAilOeAKGkdPqF93tZUIC+iv4SSaVJI0DG7/uPutT6b87SqOGsp0KiXL+57T6MriMO3bVgHuIDxxWzRRU25moG5VnM+sbd8C+rsMxx8IIu1UGlD8rG/iBZQ+2C562Y0D1dDxpuTWR5zrQNnaUGXPPHgbJzF38CYZ+544nl7ZirPVS4yr7T6yXaO0cdBklnSIxtuAL5cY/FLOPt4y9WjtzJwiAMHayTHxTZ+L8p409Mi8fNbVW5tFKFWGDDsTfm/mMGI2k0Fjgd0q2IBFQf2CoTzHetp2P3sH+gJogm/F12wUl9A57Ibn0IiDlDAK6eFduZC5+Zz6C8cRQh9vijPIG9OM4TS4tpIsI9bieMKQHlaNAzuOd3Jsqmgrt8Wv0MK0j42WiXnPJGfEdyWRPNZ7YBcpjU/BQ65ChQmM1zRrIt1y+FDQkYgjFbnO2ZkLNbjDpGjoZpgqVhyhnEZ8S6uVlPKAv685as2/DEMwzCMzGV9wbemezFDBkROoW7mI32UvrMKTB1NaItLYAmwhPG0QPYPErdlYoQV2HLujqdMnwywoc0dpHHwK9vuMy0oU+LGKMuEisot3sjekOvPdUgX3E5vt6OUkmZ5DAt9/H2sjU425R5eNgmyaQxuQEWtE4A904t7Z1VtSeAChPlB3lgJdcD/rQ4LRnBgh9uQf9k8IbXMQT386tmO6qR+Wolwg84yfJvlzpu9k2yO8IYkIBhqHB6/7mfA8guOXKrSPQ5ctPZEMZO/DKgdnH+e2fnB0y1cSSpWliqdMFBvsFW6s2jkXsnfTCVCstjN+uqxUNDc95eHcdFFl+l/1e0xl/UF+0ZWjRYvnu6zXhj4iA5fUJSjaGuoE1OxCsPpKdbLXFQyrZ8DTfNOE9UG3SnxxJSaizkt4VeN13zzLX03fNwc8eQxLrQIhQEnfgErv2ZkJOXSipLiuRihwmW1gZmRdtdP2+duACbetacTvz6hOK5nHaSSR2NI0jHkOmPSZHpmrSvCEC5uqQcvbXmrCFcBWCXga8nMrPvihg4DkqBZKL3qlrhP/uxQyPh3KjSdzzoF9LkCY0eyyXlVsjnYZcih/2YiGxqPOodoRNljhsLN6AMGZwT9tl0wS4mW6t4zGUaXghPi0QQ0naYXIkWaJx8hug++W2j1wccTLUYjcOoI2pruxWB2+Z6A9v4A2RdEnOL998dWDSDRPV5S8eHyYrIVNXl9f+EcY5OaVoUX3NCSvOiAPhAVokDAtZvLvmXhR4OuhVH270JHDYzIV4FwIG31kgncTyLykgMpKTh3W+xz/DPWqFCHxtcgJ9he/rpj4dLMyI52rGuEjfZpTNADCP7liMURn1x9GSP3p/LnAWD/XBV1RKGkVXc0CiulXpjQPcLIYSBmtqYXGJB0h8Ae8jUl262M7y4G9kNA+mSnMkgjKsY35rzqF6hUnmkzKUsCqz5jGf2GFdr2zUKY1j2svIzFae5Er/VUVH/GSL7HoAu1bLhMCf1JejoUyEDvbjH7cA4ZEDkqe4Jy5WmQcg3AsEhpNtnrF6eit4+evlGr3zRGVN9Gjc0zcf74gwl4VgLz1E56eKvqiLKulRv5qU237dYJopo+Z3gwJfcN2sYLaHfIpDUqenSQjiLYIHiJprydBTf4OnSKmvA7wMg7PzXln0GJ5/+iJwZZ2rdvkVhLHhYNsmIn12wcR4zEOrEGsa8Sie/XidUatQrDdebE4+0aKqlZ/TZuNxnAca9yGJZbhNqQ1ADcLCz+ylOESYHZ1t1rVZ6F+0O6I0lVhThaBZyYbna5biLP9/OkQB7BYCc7p6dhRMKfulxtqMRk69NNhg/p894moZ06VGCKBUYjmd1rA5EOwzAMh91SOW7NrHSvBu8AYSdrGZs0+RhduMf0V8J/h7+5s5AopPjYet8VO8CPJDPBHt1k/2VnX2ImjRpw2wti6khhVRNa8AD34syvy+12+6LozXxSLa8EDBdNy/8FfqtrdNYocwpuE9qEhwJYkUAqlv1AMy+zZTs7Lynao1RDrS68dtttZ33ioVlIBR9LwUAc7VjSFJMiZbTh/GA9Oo5YObZL7aL+3pwGYPvwihpfAxKX47SjmpSAyZBlYwKiBGY2swOaqIw4KESd8miXVoUQDXoRiLxgoAx0yKwofIIGk5gp6PgL1J/fVY9tL6rfCi76TrvvwDkeSwm2Zw9bqxB2lYtiQytEA0a8UA56pi517Ytybmfbr20MANRP3bKH2bQi0RSmPslshdLahEXBE6L/7z5XJWYxwWDyresPyZdQu38PZC+z9WZG2bJGsSJ51/iCe092TEEg4JBT6tRjnpnvYV1eaZ5NyGia95BUUvBK1zfl9Uj9OMMotUNz5w4IVtP8MdGPxU8rOw0eBXbc5EcWArkSG/B2Ixsubm4mMFEFQICrXpNCcl3KGExvOZNc+TCz/Hj6rfocWCHgxBiSKeJwuNsEV0CYLQOFgGRsiXcN/eEihH7w3wYaboU2zdBXl6gZoXeyEZkAFbGKygD6A6g41BIuNUxhiDnJ3cAE9cc6r5HhhFhwPEIhLgcy8YDAk8KRQirRn7VQon68vuIoZ/WLspApGQyijB+JPoQjRUS8QKwYpTYv9edXYraHoJz+NuU5zGCZI4JKzorQsOoECPvD8ilz/ncr5o5rs99z04z0UFa2r3oUq+wd6YGOzGSDOK11FcXta2v9iMcpEI1A0FO1ambvINJlCSRW2UEJXqN7vj/NZAXzBhN+uTBCnkL6095KXxvV8iRwZitnjifpus2NI99ZRt+PzCIaAuV9EnLM6Muxak1bbGk1gFZY4vJU3Zaq4iAFtO06sVjs4LoLN5adnbxTCifywgqybu83qRXUlIeE/yoXlYxDTe/+tLquWP1yapJNblHJ2KOCM/WRjzlVj+vo6DqpUZmiMR3lvk9nBh7gLBHOKS7Jk1IM3i3Bu7L/lwc5Iah/no+rlpoedoEjM4X6lM5XX4HKWxauAmFuim5+cv2tpHnZwdtAKl6YxSqW3Qxxmsd24nvVmIK1GNprezRN0sI83rpGpv/bCpjEbMMzzVoSyasjTJXL9L/GfsHjUMIT2C65oFGvU+HCtVSJ4H/IHG9oYR37zC3hw9ZHgs/aDDScE05VgCx8ovft6+ZLOolbASCzzOkSWOmq71/BoLKK/Bx5P42ZYXrxkR8eVjm0Anj2eUUeuiJgzgdR5a7H92wuDfEGTqT72I4mll5U8hMCAb7yAUyznwL3IAp31jLM9xUAAdbaQiorkAunIsVmAHfZKRq9oJVoV0vu1mJ9IuTIkSNHnooOBz7s/Uzyh52LjR8VCUsfFYukxZvXZOnz7s3L9lbuxgAN/xMpj3RIfSXas25v8dMGgvYc+i0+Dceh92c9PHxU7B/d8EGxjHvxZXP3JPrH1RWbXYd/Z3md8/RtTCqWQnFrQdADQ+twSf7i0jCSflhFrBDJeMchGTNCTtQoSXoBScY+Dt3jc/j2Md0CwbdAEGCLA95gmFKA04Vyq1cm7FhxP+GU3mDs6LlAD5FocEiCzA8TcdvP4dwot4zerBrPNk9K4BJzbp0sxYtFPZ5gmlyD+Nyvwipmug378TSz5B+C5B5FFnHh0ozHbuyS2svl3qWWcWdUjWeaJ6foZZJb8qX4tqvHk02TLZTPHamtQrbRDWE8xSzZwUhuLbCIg0Mz/sbpYjDtU4PPMjV4aFLDmVjmyTngRkuqXNV6a1XtmYimyS2Yz50orWKh31CMp5slX0iS24gt4sqtGf97wVCRJE7dDQwMJipVwqncoAMQbxF/DPPcn0IzHrWMMddtHJM5TxpP43L/berkP8IynkimuSeRajyEj0uXeXKpshqPXfpco93QJ41Xig+qWe5Dqh4PJ3FvNE3uhRbjmXzuzKlJztBWscJvLHMr/oZyvJ+LH7tZ8iO3HE8muWezKnmGWsQx2zx3rNaMB/4MiAmgR4GGmsIR8EnGbcixyEhyYGlC4N6ckjOxSkHKG6kGfh0rpevrGDPptJ4e+VYkemhPFKrlE+M25Nh7JElnqYlgvU6TQaWKwmaxJJmro3f/pk/+/eVrgQMPP+coXh0d83h2TJeT3J/0o/UxXOl/ffSX49ul73P5I9l7R1NfZvfutA2muWxv/p2zfZzXfxboxs8w46vO12bm/74OGUVscJJbXTCfNC7REu1uvmC+Pr3dWzxrtWWz8c8m+32W9yczy2fhjHxpzoC9hAL8bKEOlxl9mz3L65a+JOr7iScJ7vjmn37dIj9TvIFQx0tDf1I9gIvHzM+JWqe27sOVtiR9JElq3CkSKKb24Mj6gCJhBbCHqtOdqKBBu2Rj/W+GtfOGf97cJA17HGnGim+kzBav7IyGltgb50QpN97JiU+bZPaJo8k/qwO/Wc58OqACwKChH3yUwS0tiB9N5RZB6t3o6Hy3Gzxi9bi04F797GEgHH0+F+5HOdz81TnJwVDZseo21TiGxoiNLRSjE0c/cEur6UVHU/YZ6ApNqSe04MntvMB0jZkFvtAGFpkzYmRhXBDGUnmZBHL8DoETNFVZFo5EIQd/8dQNBx4+953v4DMPol3f2nqec9e/7zX1D7LzEE2iV3+NPEF4cEVjcRlRg8pY96nc+Z2D/79v0Z1q5BOEZLiolprlhmgy1ARrwa0cAuYe+SPEE6iIPEOEgqsJFoGoFKrV2ny30cnviFkgP0L0WRn9AvkFwilc9sgGEQfMgPWCIZYxe+QC8ZCZ83KD/AXCG1w7LS6VIWqDGrF+Q7DBOSHvIZ6z4uSRD4WQaK8vryI1cUM0EfWL9YBbsRHzBZmFeFSUQ1YmQuI6CBYxRLWHesT6hodWHGBeID8VYqN69R3yp0y4PVwKZGRE/A3mDOsVQ6zFvEPuswjoW/+PfMmE7+CatLB4Q9Qd1DvW/xAc4VwjbzNia4rTFPmcETLBpRfadIZoJqgjrGfcyWHE/EZ+yIgnQy2Rv2YivMO1dMMCogqotdZmmVYOJeYBeVBEH3WnGfKoCBdweUEaiNgxBeukqGId5gPyRhEPUd/6GfJnJfwA12stLGEg6gHqE+uYCb7BeYq8U8Rz1J0C8lER0urKuU3NzBBNizrB+ps1YgXmG3JVxOMeVSGnEuEB13+CxUFUBWqD9T3r28kB5hXysyI2e6X6CflVCVfgcoHcKSK+wlxgPQpVLGHeIPvG4FKib/098mSET3CttbA4Q9QJ6hXrZyY4wNkjhyG2ne7UIJ8MISNc7jRt1BDNCHWJ9aRo5ZAw/yN/NMRTh5ojz0aEv+B6qrGIIqoe6l6XuJe/hHmG/GiIfqKPfoX8YgjXw+Ub2QwRTzAbrJdFFRswn5GLIR4m9ry8In8xwpe4bkVcakPUJeoH608m+AHnFfLeEM8TR04gHxCCPfNPxKUxRAPKsJoaYnvMjEzEY0CBLIgA151gkYyoMlSHdVD38jdiTpCfEJugj36N/AnCZbgckAERC2bEWg6GmGK2yD0e3fJA3/p35AuEV7hOtbB4RdQKNWD9pwQDzgF5C7EdFKeIfIYQg8uDpk27IRqDKrGeDu7k0GOOyA8QTwMqIX+FCBtczzUWNkQVUddam7+ZTn4T5i/ykBF9q49+jjxmhIu4vCEVIiamw3o+GGI95iPyJiMeWntePPLnTPg9XG+1uIQNUe+h/mH9UoLf4DxD3mXEc6s7VcjHjJCOQaGlJhmi6aBOsf6pW7ES8x25ZsRjgaqRMxPhCNcvweIUUU1QW6wf6qGdHmAeIT9nxKbQqz9Hfs2Em+ByhdxlRHyHucR67JLlB8w1MuYF5dZFfYAK44V2TEjoJGqYG0PnZ31SqSk1zJ/2cfshkkMndEaq7T/VVp21oTNSxTwp+mKKFnRG9kw/r17q76xXps8zaT6MPZ11yaZnxs6YsflZ99+M6Wel74Ppa9iUTDnPyo7P+mHKVkzJg3+2jxeiQrkXDRKsdZGxwpq1aEutrYi0lSob8YpA65FcQWMr14GGVqLEyimP4iFW+Y4EKkBFI5XdkXWqauVJPHRB2wYZKmh3K3eBRlvphEqgEw2+oj3AWoUbrkUL6tyyXrrKlIhCUGZIWAelhVoHcM7x+Q8isIZyFtZhje0TEHA6zgFTySMYRthdYIB1WAe0qwM67jhjI8pb3Y7NwG0f5vb8LKG+3CHMUcPpt+B1twkrLYMhoYPXeiI0J22YXNfVlaXbddG1ZEtY7qt/dppcs+Xpe9fW5O2sutToAXbt8tpJmdD8ipR/dipyHQ7ScxBjoX7dRS0Ydz0esUUyt46zA+7XbHaxd/vuDvzjjQNLD/FvkdrTxV/+7bRTvw63NaEudmYHQ+/mO/EqVPmfU310hn7dV+tpWFoEt9K39k0yN4yuG75sa1eq309iCjaravhfDlfafG1irv2MTk7lunuZD2CrPM6N9W44Jo+n8yJMn/+G2or0q9N7NlorTF/yh9nvt+XBmmp4afT8+pZQ86I6f8lPcR55t733DrJgcDJsWyvQn+SwOlRU5eniDEAZh/tmGB3S4UoEjwNviG+6DYyYr9lf7nndMzTsxrI3w+QIwA2MdiIemXuKHcKXkGad2/zZyugxHNJXKUkjXog4Yvq4rfeSjjgnVy+TRYIAmStVeJsPDdf7jijWVM+bU3Jrk7LN+FzttY8lZtOAo4tyiKDo95nD+JpJYU6H+o8ixjtUgUYIoARGL7A0d7GlrEZ49kipCL3A3Htbawq3pDCZgoCheY8jaDgHepimzQU3aZ6C7x+Kb7264HQrX230NdqCNc8BGuKGr/2UHUpLRa59MM7kerRxyjdOVxZ43QOPJhUClM0BjKx17zjxjhp59P83zueTleVBXFXROG1fhW8GkCJYReUJqn4eKR6KyMeUxPeBpGWeHunQK+FIM8y23H5vpA1Z2+THCM7GoPxBaqms1YQD9ib8vfJl/7ai8lmvAXo1mRe1tCzTfylGocYW0kk7VpmMZxMKnsOz5fx65ZSAnC8ho5sbZRKonCu1JO/nZCYqc3dn2OPa1qdhbjVm/7dhzGuJLl1CpRKrnJRFGL3UsoBeNgjEoieR6Tn3O93b/QQvG/0Sgtehj014IqR7KYWJsDpjtBO5JeRZGmutpzv4nMP1crVxfBlgMhsWD8IiCfoZccO9imbTtP5KcIQ71Le2AoGIIYi6d0UtnzpJ93AltVWx2hz0oRu6ppbWo5obLCuUr8mFP1Gzqnv705LztXkMwY9v3fDdyBdv724CniKRsWoeZiKqCtSLDhS33EOKVdLFtDGlpNVJIZ8ESY5xcEhBVrLKN4vF+DTA5Xh66qYwJMcZISUgVEVg8qDBJzJOp/UUDGAMnBrosfuMvPNAenaGtV2gtFnEQ1czbnK9JsVpyyFqJsmokVH5ivx6FSj7zVETw5QnS9BJMarepXrIwkvHFeb/DedO3AbbxbKOLEqYRqkqV3rLKIJojs8QAzU8crNIo7bBNBQmEpCWt2YrGzXU6g7htSJsobe9+cXqeccAjehFAQ55upaF5q10Xri3PL3VGGg2e2KtmAnWcgFQ0eqbb0nZSNgve8PrIMdTPJtpit6IkXAbySkiPS4y6t4SLEFkl5g0ZoqURWj0OOBppKPS6eY83vPnrci4jakz9uM8t9K4Y4/mEdBHQt1bsbHCTK4A1+PalW/zsIBDT4o0sJ8QAln0+72e9ibpSnPEWbEngFSYvkLUqXvH35hqUR8Bxh4/W2euKpJ3B1B7BFLMY3QwWltsDksffHOcBfImggmrKItornCTB+qAZA3qJAFytVdKY+une9nCKPtN8DZQBAjG6VfDEm1RsujZPIep/DFs82kU44Zga7k5oZ5PH29DEp2asc5w967IVn1uEg1IA+d/HARvuiwX6hV1nXUGK5+8GIIwZI1qRicCVU//hTjV/cJhLqvs1aT5wmtfofew2AIL/FCi7+fz3pXZptW0US/4KCDf8PSMwlHVXZ35i6iDPul1GEFWknzOBSnwg1/Ef7myLK4OLIc9rF67bmQAxlGwEr3HuuYL/Pu4ecFzUFxDTSUD+nS2qRayi6dM+wonfG4D6J80ICxXkEZEfWFLBK71lJPYNBKBbTcvtx57EftSJhdifNm9Dw1xo66VdwhJyzb79SK2AwPt8su//r7RtcQ44VGZp6ZkO695oAPya6AIePimngl+cwdqM/MpEI9JuoHNtwRSbw2GDYWjvbU420yy9iF70vM44VdpiKKyn8NKFTj9apZGokkzhYRew6ygJxcI3CuZ+5Cs6SCQ9ZhNSTxjVixYAaeZHeyazFBiiNhdw6sBmLW/npK/VVgSub80AdEjCQ+MDqTMvQGswCx0y62EjTX+2yKs/l9RD8ZE0Dd5Hl124kff7QSXyYUIUMLUC7fukbiV89Z4r/RrvwzzvjI5h1LdPHV8SUtX7Ix18Ej+bYXlW3ihrBtYLFpI+61ZIjTzuPZcm2Zg12V6I3UE5pvrIAjIwW7OVB2MhhxYyhwdLg9BiEE1N7spD66dV3Fjj5ZOQpGuB9JCjy8eMuiLSjVEVApgSucrJvICTg3cZrp2ubir9y1J5AH5ZRnjysh6sFz2S0Sbe6wNeoDHWyQ/c/MJ7tF1T4Fr5yK4SfUE2vmem1TggHA6YUqQc/9I7W3jtO+Xs79lIQHQxFVoKYXV/6JPDCqGSrXiFs04lltHphQ9F4FngqKQc/vq0YWuIwVDqwiLc/UANWUmKvb7IkcC7KpzZwC96ODLBgOLvDcEN6rvjIvWExHtneFBROcXialE3yQ81D8NN12WpKnC8UgP3AxuxjpkiWpOmG8OucHuHdmQIYbgZRV8/q29m9BHTwI5uyEQ2AAKOHoCGX+iuNMB4RaJe1m+j56hAdeI0WvtHIAzBgkdvXbym3+RLL21oeqA69M+wJnUg62mcxU0K8EdGfWkBMvjCmyLQo0j6fn5ShcOmG3WiEuisQWrkToJsn1NZ4lsWZJY1tyonetRim0KhbjLM2fDM5Kt9/ONYXOeZfvaKQc1fPyW7c9qAIj2Q1rhZYglMveQHy6HWCHxD0yZA/5pdNZGTwRrAe9HsZyyIlr5ZlGylC1yts5CiTKBEWzfDCqJVgg5s37sxO5sUnZqF4A4yIVlmMitzhrdVfYGxqNCEkf0hudBPSb9ecXm191D53pCnyRQuMfEuRbI7LTCToNggBwgshfOQc81W1PLK5926f+kiA4WbyuRsolLvuFv30tuzOPyd0YuJIStxp2Bl4xygRl2Bf4+lZhr4v/0N2ZEGLU/KmoRbseg3McbQh+SHAvz3BxAFyRQHP61X3i6rUAlF7ID/MHGZPvgP5/NpQEUZMQIr1hrbonxtkD2TkGGusmnO0MlHyyTxCi+hjm/9uSz5mvUAx1Rqc8BDU/F28Ae76SbaEvJOxvTS3D3fMitldHvZT5uzOQe7PIc2Yxgl17kEj7Ffd8HUt2j2D4onqLgUUJvB/P7Kc8rmfHxz/NncI8G80tf+XQb/3/k7b/QMr/MvPz46BW+nPm555WazbvixmCSmbQVZ6uvUz4vFVzEGZYnizgMDKNui6HgWW4NQt8034kP65xnqpX6HS3BjJXjNxpHwpbu7Z2b7fJ/lh0/5oyoEYx7cAF0Nxtzs8w+pWy7WkgWTrSpw5arb2fQ4pCynSqMZefTXPVSvspLYP/3HD/u2UeQ3cHN//onljDnr0sE5y4sTdCvAHTLOXWaDhvNufKmJ423aglcrVYklh7i7IqHMRg3pv+rVVhuY8ZvhQKl8Y9VRDQqEAgptytnOtHjeOAEU7hemL2+pfbas0356Qu7b8BNpynGN/Da3SqCCj9NbEIzBK2Gs9wTl5CDq2a9uuvgqPLkRlPxDRmTLbsuumZWFiwwutzQjuhKbR5Yce2/w2o8ugbjkBe02wzhvrbanqmYJsV5tLRnhQu1V5N7Zd0Nl/Lwou372rPmWBqCAGqn+rwmM8mCVAWMrY/QaMvoydt1zUYN3MXkuSxOPtbTQutgirCoNLraMxFGGS7yK18txrhDV6lC3S3gRRKzzTtmL40ICdq0nv22tu6tH7b3qakunKtoKZNE40fOfT50Z77FJXSokG0tW2eNBz7CXL71afjR/cBA+4vZv3fG2L3t9oNH1cx30P0sn8i8W/pJ3O7A92jzEKT1suOtX3ffh5QwjQF0hHIcEuJxeU7lfHi7C0YV5+mlj8A2tX8vgZ+MRpTCrrGXIFSzNmpKuWR7HMW+guBWeg0JBAMT4/V9MBma2Q0HFXL9E7om1kA20sqYlwroWBqFDXBO9ogZgsoq6btQ+DT4BnLwEUhiJ3iNHo/+aPeVn6eADsUjiCXazib5YyN4UZq4AX/kWguLYI8hnQVg0ySlnWCAGCmUddccYGzVIS0/hIyvL8B8+dYZVdz4cgNzPLjoqZ5rYNv3MZuyFatnDVbzlfwiucfhj8hjeFUDKXmXekqgxfWiKuYLZ0Ugi115pdLpVPFIfD7uG+DIemp7gUPVyAJoo9JIMWnz9NIR8RgW6lGH8wekP8uIp7WFKqfls2Fcfhb9XZVtj570DmCuitlOIID4VUHYZUplFfFp0fnNTKjuC2Aul1t+1vr7Gy+p7B1nKdqhka1Jzs7K/ZSzInCyYrglQkiOhPVOSs6Cnz6i8dHlI+cwjH4crEoErELTUOhuarvLYvHLrGOVMgsry2DLssr92l6IaHSmqE8qg1ePVajr2RYXPvwvHg1FhGVjkHD5W9E8YViZjNv1xEU8YeHUEii08uafm2MOf1Dr4AHF1679ltbFlSzmsHK/20s4iWs7ZIJHJ2upBx3P6FltQzMn3+xJiW6n9GxfynDaclMw6hlJZwJvfMwShshYw5k44+83Kt3MCs4tdJN1fSbXWxR89TxXPnaa6vYcquD57MKsKT40XeATdW/qWyVYlfbMIbYrhXeU2hyfQmpRxspEhYIyf84Y79vStzwZWQbKWmvJDyIFsuoy3W5S7daCCtOlo+zjjTwGpHlq9CQr9wrciC2EgpMp9qmFYlc4k7Tcz85FLmZwmmFMsVNPmLwlcLK5LwjG1kFPTbXW9SPEcIP8bNVZFB1QZST8zqKp2IWmjbfBVNJBFAF5icY2A2tO4eQwcul0cP8Y+iJI2P3WS/eaAgLSypMtgb/OZ68lMIAzWohSoyjQQXup6X/IL431fOLBg6iWl4fCTtOp2tT6R8p4RBuH1+dy3W+1aw5QQHDuu9pahwWwjhet2cT8Jaa1cpvgxFqo03IpPGpuuATy/2vftcXoA+IzlAcFtI5maLg+C+UvF4pn+FjQyIp0kNBtqYfs7IbjEegSblD8TLkzzE1/rlRXIUTSRQGrqsy081kkqiczmtbzTFDDmEmjvekzt/bk2W/CnZQTVTk6G1Uj6VQfuRL6rW0oHdOQ0581beNXcBrLiwoWB5+9PcZpSIhNGzW4jCxI+0EYNdDkXdALiGFXjt/MZc/EcO8flXNxgBNxv4UAbxxhkdNGtZltoiTe5l/UVmGP4vm2Jm+nLjNyIRCQg7US+ure9oezDmpS4zmtu+sg4zKA/a0G9ocyqx4LGF7S6rERouy1CknFsaJLrZnxSX8xCV/SbsfptPd7FDRziSn9DuOL+5SFGCasfJrJIbf6yLst6lhzbBUHgmop8A93lVqwygQPfW0SbmzBgArAyYbD675ddNVj8tWKTt8svPUbaZHPKLAl1F8ierFyHo41LVqSxXsh5x+Yr7crLbOwLa/I3b/mu4vawpsqMpuGS5vwa5zGXrtVIil7ZsfzW8q7n5rHlb99jLoT+NuIKqleW31RJAKAgdXzMQ2Wy15dqCwRkKUODfOrXFgLhuhykg7Lxo9nIuBiLJ/Zm0WUTaxUjlNY3FL5jY5qj6cQ8kwi9rG0VvJYSZfHgshF8qBnyukgbYyc8mBKBRFZ5LGSjmPY2ZDxyKYa9uK9US4CoKDP8unI3D//F+8jew/qgRL3lOhpmrV96PScGs80lU4FDTVCR3cl+RFLvuBpWzGXbIKOj/FkIjKqhI33ioVlUrntN5Ykbdkyqr/73QSfS6qjk8SwiPh0dL8a7kzhMPeK0/29T17yNdvqnYcZXW+e9kdsw/OU2Tfl7XDI/A532b9Q85tlQ23PBT07mdcXKpm3zgFQwZ545Ejj9cYJAiZVeXOJOtjvLayGNqs4IQ0+PbRd20DliAfWS7KS9GSq4//SPBoebTRNSIEPUVrW+cJsVxIPo580DlYijp8NHrqxB/BLauFZ0FnAVDvKzYWo2KwcnSflApjHBrjNO/vj2TsxHy/Z6o4VG590dboZ6NfJ9K/1bkOVMD/gfliC6px2SJPoP6R1KZRUIFWLn3Ua9jXOVpOsQWYGvN6kFPkJtlezP2etLYS+t62sExy4fwuqiNme3lnpSkv8Vr1e8ax/ssgy1kq8RYN94vxDmE9+CBYkhXwLJbJzlOYPlnnbZQWOs5XrjyRQw6HDBO5t8iDimJ028Jw+UglS3LaAs+MG3zHVbtEpN9FICDuZ9CIKJhXIrO+13S1NJ1N0KNev2/JR0q9DjhFz3dw+u2u5j3Rzqh7GrCIfnFB2ZFEZn5V4e2bSlhuPYpeBAq04rpput2yz1NWK+AQm5Eg7Ndvz1ltKuvECXL+KaXhgZy5ZR0orzg1vubLNzdylCnL575hx64R2x9zITnmF+/kPhjx9eBw0cM9z4CYKSNPiPBBI725l2c+VwjEKhAY3nAxqIy/OQAHwnHQlyLyzToeQgU3YOGWNGQuMKKaX3S40UOQS1xxAsuzYodt9UhYf0entxnjsJmRWrmCxqf1mzFN+Sm20frexuwy0uWEhdnwxAJSrHmQbEIMEhbl9pBA01YgoXismnLolQnOdxcUKOZ+booHAcWz7HDt1+kBUbmve+zRcaYgl8vU5TbnaD9t602238k7vpA+yoLBDiDubhQ7sXG0YDvefoMbaUgUXZQ1g042tMYx9zANGn+S9FUpFhYzjJ3n0y8oqFLT88OK+Rfkw+yIwehzip2U+/hKVk/xyhUAzp09dSGnN8qH7lMfoBxUMfB90Y1Mo2qKRKXLZsx9YKhZUms6S9tbnCDRvYczYsh4doFBx2rR5g45rEXJhH3wohlEhDZ15QKjQT6GbE+vlN/ihIez2jy31yE2VfRoiML8tu3vfID/6Ow7Tr/qZXzqR+GIaHvUE1fTzKHscbTbQoc8QgoVoMLze0KZ8l50lt6GB33SRJqWnAuboLl3PNiH4Y31egGNFG4KRWezF6O5GfSSN9ulaLY4fJztRqRy1auPDnzxP/2ntrGIUndM+6kVQPRoqzNRv7ArTMxlCAgLSOX6W8YCned+HqB61avlTZ3jQitnmXb/Y68raLtRVnkDz3Khp03yVbP6qdtUfdI2eejSefodI97FUjG1QylIOGJZLXPlRUobu/9fAlw77SW3WhrCC/NRApMhaIfjSp+2IpoPPyzRoULAr3CPBMLRPrGtHjpSd2mX7DKBnO1VO6Koh9c5KqshSdQ10RPUDfZjRPJkKVVJq+UCcsg/iyYNueJppqhcn+p6/+3YAAdr6mUjUa6LdqSfkWk68OqwlzFI+sa7CcgjhUREH6gkFWXRH6LcDGA55/ce39FbfgDqi7PDqjpujStrywrR5rB7sIG3c2EZPnlDhtj+3dPGAmGcZCQUH48viozvyZ9i2kkfAlEscVRECN6M2ERDE1YPIsxT7zVQ2xBeIeO7qpyZh83i2cd0Bcxe7+g5eDUfmINRIehHI6I9VembfQL2rGSc+S3X750qbht6C4u0KqjAiFeKCg5BPIvZICjrF/jgng4iVoa06L9HxH+fL6acAQkIze6ZBEfl+dPNO+kFwcsScUbNjTE9surPWxEg6F06qtMH/2V38Sy2iBbSucmHiNlRr3USkKgJQ93b08QexcBgQVUff6zD7504BHgGJp4UG6vYK2vMgw312OvPfds4nayuVLJiFhZvQKz9cTl4oDfHfHTZSzRw2VPPOPNq6SeD2R0EEybrJXofMMzZW9dClrzNAMmITZVvryugbUepRZpS1/U7zkgxXajZTpJdsFtiL1ymifVBxAqinuI/yn8ZKIqqyRJKMUuWz33bUtgi7Ewa27VOZneSzTdMZdqbuJXZ9F8gBEYn2eQd2hux98Yq2Do3w0I4JE753hVwyBfAvB1v6hwwsN4ENiBcB8UuXjd/qa8KdiOhQwwYS9yO9hZTQpJXMUmqaiERxr6/1slDFlh92QMg7ccLPZGARpoxmYTpRbjmJFlZPJm1z9mbJLB0GH7pCnRP1MrhQxQWD6HbXaaQO+jEnuuy7r87YmVQlJxYCtkPWU09Cn2OdOkJC9qoUWxAdnX2V+JIg2XcGPy1Lg51aZQXeMMJJ3CfNtkT7lIPjQrAY9CpvbZK/z11ffLODE5Xq5ZcfquO1p2PrL0spw9gTXR4MHrpvryp05pPRZrtGgyILc2MlI2SOiXBeb02XjijWLlLpMDeWJji2l1GrJsJFeWCxeyeJ+HcJIUpYGZX9yS1IgiprEQ4WKfJ5c92KsKGcwUGTiIJTi1NHouJAJF+zjKnV3pbeftnCVYVuMmNEiESL+GonMw/5ipNAwbQlZSesnKQ1fbg45lU8zkk4v+3cVj5LX1jwaMGzoI/WPJwrI/EZ88F0p41mrSriqCMTuCudtzDHjdEKKSH06d4V8rsy2WWJ++iuBnsfUF3ZqSW/1w6TgeSJe5emUjwPDeW5mytHQbuVFSXplIA8Pe3Q1kTVemG5+owRtL3zY5xZ0QpBpBD764g3dhIdgHEez76sHzVIIpEjXpA73AsP6kunF2LmZDsPz3KvPZlCpfjCKCNomMMmZSUeFntGfT8EVlEPs3oy+mBFiCZERMITRYHYJavKoSwjtCWxkbMYpZ1wJ8mEi/Yg8VfoLR1LhLgAj2+/yGrumzvNVwyqIW9+s8HJo0vnYnc4K9oiLBR4p+dyZ7Ltp8PicAWqC7JCZH+YJ3wybTrSIRlK8A43jIzHNOBDsZiAEtqlF4ahwgTldeluWBGq8oB2TZnqoILLVnihW/pYWegh56max/llH1cX6EwoXzwDnLB+C58G+LZZXoTVTn7Tc26+gJrx9J4NRL2tSaLamOodL5UnCCfudWfc8eVTHhqFXj6bqnZ0O7+QA3P2hNgieKxb3tWNYE6Y788Wy7S5Gqm6pOWTWFDZxzeBOCYOoZnEOSiF098DdwZO38eYzico1/7OR6LKSDLjVgFhJcUADfhXwVAF9I6cT+v5txg+6Gy4De0qIfbv7sU9VYtqSusDb4MluR9QQQA+HW5zgGbsvldQj6T6TpVVyQF2uaI80HUARQU790qPl8I5ErR4s1B3vfuFJlMhGbNgMXbBT3K5lMKr3T2jhdIEBm4wmRAvFMFuc7ri78zevHpzMQtUrA50u10KbLtS5XZ6L5l9RKG5VifUaA0e1HB1fbfk2abpBPej8wPXWrO+XNNcl4EsVDis1U287pIXfA7Ha+9439sqNZeCmJpoEoyDm8QnXoYJgRcgA1M1IlNGlna2+FGeOid8as5vDuAujMiktWiQZdQhx9h+9/gMYbOig9strdV/3Veg1cxQMLwaXNNqsY/RvI/kZNXvHateLx6NpKR2nMbbSk2D+1aVDsCY3E7SWFZeLJQ8Di5z/LnvXIopCm2LWSRN3KdVeIv9xj9AFD26lO2xf/S/Z9+xCCGANixBuO8cwcrlJPDrWZVOdV5hjxeyvMXVlCHgL26AKBtkJX0AS69w4LfDRkcDLLgzwj4Xd9UCoT7N2aI/Su8KByfi2t/9S0uiZKQMRX6BFjG7YvLacfWTDLD4MZhTy5L7BgVaeDE0DvULFg1paMUQoH6hWtoycxVU0VXihaL7xJGFOry0Q1E+RHchvSlj4mZ1YDP2gg1legfCOWJ76Nkx2tMz2eMvNGz3LgyECZlFzZy4djlVh9XSCa+0yt3tXRLHB5ebLms56tuzzQQRsO1L4KIlEXD5Lnu01vNLpA+dXmKKXAgkHiaIZ2zY/b8pw1Y5m2G8YutKPK4NAWhjPuWQ5u4bUCHU4ckTDE0P6TW6Mnw5hQezMcxBnApO/9fOEadxzQuESmd1DBAQEvYrqq6cXhOEuRPPKedNz4tqEFtoW9r8REHKXnLQvKgXpbEXhNVPQ0GUv8U4PhNl9SV4fIIc7Dg3dAA0gceNjuvmDALrfYAzxBZhALnqeF2/0o1PFFo+WxdL67ZnK6bJ7t7kdxCEk56IT7apQk7HUtuGCs7mfFYcBY3uvPKe0jztoKUTLOjVirn8wkqnu9Nz1XWBtSbPc8rGQs0Va++f7LP6Wh9r9EA/2FXLtH6Nn296fnEztXgM/JMBQeEVC+uZSJeVHwNTAJ3CbsNFuP/DDVPRGKCqhF0UBFvW6L6wG8oiFMrdegO1qyxTV7gaxXhuQ9FMZftK5alrgMPZFRaze9NRVMNsCMd7y67MJ8bxbTNWkd4YL2lSWD/PFzoK0Pi8elm6+tmH2jxbdEs8jje25Vsf36d1U6RIM2qZzWyDKJMqj1o+cnwqi87yS52F5V1wtXB/hhSS7wPh931TdjT/IJHtiMMHZ1lT6oRhqHh0g4TVZzMiuwo0jN6nTrQZnsgQ+Z8tDBwxrKcIgRGWpjtjUBshTsrB93czEsD2qx82531W4b44MLBuWXclMSKKDYZxl7MhWD1IjvNRUEj81K97T9x2Uj3SeMgDW25Rgnqkzzl+xtitmxvwfurJXG1XkFOFOwTDVgjiglWpG9qFWmFj6dm0cZ+0eDeSCbwisR+0DN2wGXTDDkEaAmSNf2FTSR+EAOkXyjPTtZMtOCq71EByfIswrKUQYDKckDXxUTBtkBtuxHqMpQgo9Fg8leyzhjd/MvxjBnDmFCrq4xfBWeJBEkJSh9JXtpMBMR7B9NGG+E8V3G7eO+13T6z4kObke005MH20AX7gnwPmvTnmNBz+9thMbmREa6QGWiOZ86PtnqNt++ifZPjmudF+zkzCvLfG+hNtOxy6XgAkONAN76oBSWT300k7CcmfVEG+/wTvF+3SZ2CGIOqjDkbWAgmNuoP2l06R7868+nnJJP04q49PyYMp9Z9bu396/65frXWUL7ZnqsLWyZ2ykymJ5a6h0okZTZ2736xIljudoeFldAaxGfOQbxROvQ0D5Xxijjt20beOb/HTHH1qM8TZWXfsM4PX2MNYrRWeUADq/bF+q9LTVwnnpzy4ev2Iwwy6BdoRWEFra58Nop+3gj0jMlqIGTI+PvXhoDxYB+ugx5zsw3HDMzwSDCsUwdOJF68+0Tj2zCoNu+hDAwORHSQ1ST8NQPGweT/HDQc0RZriwXn9MOH0nQCG8D7al8okMkzRVubP1NzF+ZRv8Ur6/MlQc/swM+9FODOeryZ36FICiSYFihhx4twa0AABHqhQbRToYG/f1fo/I8O76qL2mtSTn8at+L/e9IxXcYbA4O31YedXxJM4iWs46eJWLt/rohkzvV1LrR7oFpWMwUZn6ISLyeC6sEtf7/cepHt7uesgQD3Yn02Dg66weary3m4KEjApMK9hbKAzlofh0/SHNCzuiFkay1+XtbnU5c90siQPleGHvd+QObxLNm7lvWbEP9IB5/EyMuzPCjz76wHxA/Lyrmj8bn1YXH0F+5se2oPY1hpsh0xLPa4/tOb6TNrkodp6sQ69vmTtS9EFyuF1L1FeUguX2O5P/SiQOS9fB/H3LNTImdKwOnkUXjmByDZX1sUWxmBh/Gh1vnGV8BbXO+LApioDr3vqIDF17zvnxRTA2tvNIjPlJ+3BdOToF4bM4+OGOQ13wU+xhbVP6Xej0jO3hSjyKIyf5iNvJ1cLRKnnTgd2MSZmhzNLzR137X6PHCDsLoanB7p8G9FvT5yeQKT/fSfARNbnande+jNZNvwQZdFnaltCoD0v7Z68bsS9uliP6/bagt2P+RHTjMquHoEtKwQeGEY3lFf3Gz8QDh45Xc0gvIUGbnZaboARQp6a3Cp0PGoyewpRt8OXb5LdWuXLE20napZ8qlzApB41HsQluYucHZVpYHooFnJzFK8g0ADmSdm0wVLQp5zAHYv6R3fG9nJaI4VFFmlRaAdhjPoY9Vyk9cEinDuCU1AfJzku5E3SGk7UIqlqCe5EVjoV6bLmyKmC/9d71V/skIq+4dppUhkXPNAtAqVRNA6IF5y0tMLw9H7IAouTI0mWL+vhnaOWnPqBfauqfJAqI8h2tYGcCkYHOITb/TS8phaLgyq9FgOUfnBAq1J4l4Urofos9j0Xt+UKdBakuOFyUl0GyKyvE8BvzyOTTuBs5WaUADQCLAJ0W2CkOu1BcCb+3ZaXi9eyicjVvsTEhuyCtKNVIQX9hyAJhukInr08KuozJ6In2XE3dtOWugssUsIsqSykZSfmEfuUbgl4mdk8saNELGcp5ebZRHmNjNXJ8Fsf7PL9gbIiY8gLbAzccWoMbU0JkdKfahAWaFaVNTw2tMhEBCCC6rjoJw6GFCRCm0LLoHlWGZvpBfNWcrCYa+fTDYZHlGHPMjmCjndtK3y+gftER6EDv8UjCBEStZfM/+LR/zXPoA7tXuOAAuqND0BjKSJ4aJkuEDRIYrmefTrehOLJgvNyVcs6bTvYWpZGTt5ZGdVOdCx82vrQBcmwviScqsyddREiQ70lnMDujbtALSmLao2MVejx3N1NAi9PZqxd5xy9y122eG9hX7zdhVeXP0/sqQ76dLIQftCXRlbf8UYOeJd7ctg32BJAbEg7PfK1Ntqw/lNyG49fX9EzAN+Jx2qYIKxxUdhMBPw1aavD/6J1Ng2EDT157xIZSOpnw6G/dwKlTjKGaQJOuA9KGb3AA52wzCKSFsLJ/VydodMck0CnootYxMoGOYYWVUtW8IhKV1MRxx+M2yfKSrnKIJqxLI7IrWpIJ6+Z9ybeaUDPHz9b6ip/g9ir+yZ8N2h2+vPnD9fRykxz6nlIGBCezsm0FziI2uBAb/XkgdQxTzfcQGQ6/4tjUUqUeS/meM80MBYy7VGPDune/H0lFrREnCazVT2Z6fuX7P4pI8ZL9m9wbdbRHvboBJHznXdGHacsO/16MDB7d3SghCPcIjDOPs90Hyw79eOOx3O+eFZIAHomxBSc8W07gQ33TOGTkJ1oAkcnU9dONk6elct3AF/DsJyFeCLRcR+Mt06eyto7ETPBbfBJueh4Jxsi14gu8RljwGljy8ggxAszdlp1rwoOuBNDN+HFUokYVegK9e9JMmTIQCZKzN8z0Slrhs0XicMSfgD6cBU6wy5MmVfj68cjXqKWHGdK+OppJUMK0Yedrh0Oz/5R0datjL2K2yM9x6Ioyv8f+hvsIR05SrblWay6dSlIVoRd2N1W7l32Fnqs6vUU6L/wWWAUBPZG/68o3kSNehc9PfgQZvP9yy1K01141VdGVovsYf3f78H3991eMzWc6lKNzDzVWU1o7XnnDNxiJL83Q5AWhyvDl9y3LqXRb4FqqcaAzZTSXS7FVx5M/PE0C6XotXndQnPSfzQbJoFddTEC/ObwvQruho/kMze5r1UlbS5stdr78q77LhKeJMWsGCuRSwh/JHEeG+WeVcFkwf5LmIKpD9Zzn13xRi9LqBXLIa19dx3/iJIC1IepU6CO72RUIP0NNEq+HPLjov5s/EPxuVgukUJ3Z82kSWLHImzB/odWNZdKmGG0he7ExP5B0918qjURWV944BVAn7KSTxJIC6j2h/hMvGTABH21T7+WqXHPwo/22KaqDdnj7DHi1zYpvn8QDC1OuMAdfhaOvh/o1wVjb9CdPa4LfXwzUjwnmhwPVR9DlfnRs7jdi2rLdWa+44Mlwut//BSRmBdPMlN6awAer6TFzOGyfCmUbKv4EbrOi0Ntmhhk9rrcz9rFYLO3slyxdDlzaKAw0JjQU75WZof7JwS6B3fcD8FQctooUgU34hhfxBZycKr6dOfIb3C4Dzp464QXdYxWFlysioX9ggZ9uQ+YUZneX2sSF8iS943lGK0yt7p7U8Fwoav5/x07bJz/9RIsMwmvVG7Vq3L9PJnUh+vZfFUXOuMARXWhVH08sxOZIFyTT9SyI1c/A50WOaHfdEUa4ND2fDDujKCKE9NwLvrw+1+50YE1Um7Yinf5pZrIvdoYE/RrJuiPgYyl+138lJQpf7SzFVVvhUrRseR1bFf6gf7BLJIb6LJe4lRzZQY7HoNP9TtO5IqOUbXkmJ2G+0ZtYEQ5+0+m1lYx6vW084dMR16/xj7qGx/Y1TYH+hJX/Mm1LyhqnImf7ePQXt1xfVSiCZrqa6R6Aujw9k4ZnENSSQ39W42apYu8TMkIwVt7qn5iblcqSL1KbFr5ZoQlgKbs2eo/HMhLU4vD7DWz8FfzvRc1nZLsDkrQcqYkIt5PuLJUiOLC7W30Eah4Bw9n8CLib/gXHJqLYY1D7vsgwUSjoRWfHkfXcoisbIXnDTBhfPgJCVBzB6TCQQuE1Vcj5lMuBaguq94KSVZBzcH8mXq0kS/u8ouyyc+KdFK12KEbCquy/4bTijl4vT5+LxmDnPB4tR+PWK0VecHloJVMAE0TSOr0quYERlFZ8HaLxIZZdhTVIs5ox9Qp/OJnbxy5HkKpGNfjr08w5vRzFGOZaA4YzKc/XvpCZjYoYsORCkLhurtKGMtV7rr+kIgSUVp2i8/Ds0cRP3Yk+/5lXG0F5g9BGJ3jFF61slXnMUHTDC55t6rDh+qig5B610PQg8tjiwbFthDZRiWHQ9xYR9QxFAHf81dyG9vc3fKsYKPe0SMhoAcb5wldQSul/h89UzWwchDVrUgClHhWBrzzXfbpjqK717SkIptIks3WsTs5RqxGV5ubFv7gXSY+jJ1lMZ/xTloV5iDQP9erM2qveKi6+6l0fMcHXWt5440q0Zl7/EOv1NP7s3hUQxkG2S9Z4z4KXtAFDkxKxrajYEHVqt+OKA/rtfI9FPl86jdCOv6TTrIIFFN0iv4eKYdbk6BrdU4WoSuNuqHLxiliDud4wxHonyNnFINLhoBU3wGgBEfqQ5sBKA9SAWcYPq0HmRJ/BTpYkIMSQzgBZBGqbO93yOBdjtgFb03adrM7sK7qYQTG4Ain57634g2SCrr7S15QU/YWH8GflK6CQB3WeE22pNixh5spxkdu7pzpUnKoZhO4IslO/PgPmnQWHpBhyGFV3avv9veW3AhW2FHtphKZ7Um8hJa/z8xRXbQM14p2Szcon4ZiFSFFgepS9elKyqHlEtBxRLx+8R9qbqKIwXEZGwJQ1bB5o4yhsAM4jaLlEj4vMxIplx7oeWUW3Y9pTKHyBpb5AC/7RBGavNeXKYqULVUsHpsjGJAvRJE6BSenhqbMFt0RllUWKZsupXAnhVFuHj7JvJBhLX5AozjkU8DwFtbd43CSigJNofhbOyqQGFpU1dz50EDgWDHQ1oIVvm/wVibjX19ozNd8duRH4vg0GBTJpIjMlA5+sMV6bclfg7iR+PITgzj1/QXntS2CWRCBiw49lyDk9R2VJXuHjQ9Mf1v9yIf15tFjwO8eOMgL0cb+tZoYVaPRXv9a2jYiHs0TlrUuSANZpn7lOUyKJh8hgFDrFWVIYgvi2b+UAFuW4X4RS6GwwogbAWqfw6CaHx+qvuMV5c7sz+AhgVvocuWPs1rbxkmPA1sW/CMibHn8jxKwSGAxoTKI5+vpgaLrXQdWcvR/1aAYhH346eIkBDfDbaNnX4H2NECCzi3wSVegtkXE3J3Ad4WyahEV7ei1AKOgNdXlG7DGP4dAPqLAQ8o0ymvDrpjeHRLahlo8421Dro6hP+515x/SW/9iwFvRq8/7YzsQmpYisDGbIpu/tYsOw2cOggwOnRFj5+VT/95I2uCzJwQqobjpkNsdnHZLkR4z5nimLVB8tp67eGjrbLs/eOJ6y4aoeUJrCJsOZGsdTMB+LfqQGJr0EjSOrbWy6cxP4n9dUQk6eFnz8ECe5Xx8btsF6ORlhAUAjueTn5EoBkDn4DY8SLNLtGLOc9UIWABeucK/dxb7YAR/L4nq1S0Fsmopvs7p7f+PhNM9Z3+d4ceeieslYkB4jK8e9fyVceB9UQjt4Bt6ZflqaJUJJELcPrZu1XZnJv8uc9/WxA0GDuKaxPoJP26fNajN39RoXzF4ZcB8U32bcsXH6J4NuBY4WFoiOQni8TA180bWVM5aUs2FdS2GZ3LGE6HwMyiUSaWgZTxfKWwtcJoz9QtwTc/4bxzmQe3pX0KQit+LTCXBf+Otkx7a7p+UE0rD2GvseH6KmSuKwA8WoX7t4i0KskYxZUh2lxSjoVU4wqTVv7mP/UgbdYyvp1KgDl/+g8KwC7jpW/6/nxmDbYRatd6hz4fn8bnkchEgJXTriPYpaFVjfZwF1+R+SYofjVT5jufGm5ZroQEtwadqI+N8PicEEWsASmh802Te/Ua6+7rE56calm0XQrQqSHuRyag1k8kfmrfGS7Rz3EM3vmzDdCBAafCm7pWJEZJa8FkS1IimY0zdQUtCkY8owi1+IQoTqqfUGwdEqJLoLCWBs7gtGXOUo4xz+JoQG8X4jWD1U+MlUR46atFIw8HBgqDC6iIYE4cuZ8cyOKo+CMTQG66lsKR98fr1ox8Rcv0wzsC3DhalMt3OMW5GncTEL+Er/oaK/OVzVM/4K99A69WHojkcYS9dCOnjzbz5jQvF7bYp8uvnB/IiwiupLaZhtsqE45vJqKeA1bWleid8p9b42cWSFyFyAMBf9bZfRevqGeS2QIPg6QFayY7kVOv43HQqVKc+/iefvwd6Xupem6o85VGsa7CdkPbmHyvcUAlYW3sqrAv3uoer+gr7s5p+IOW5Eja06XG1yAAeyT4jRVUC1yv8zGgyrslF5qVeUrS5XNuE8NAyM+M4YH/kKLDFtjMeLcX7X1H8a0tbLdfDphQKef0SjlUtwf8mUlWI1zScSad1q5HTADOfrqZqON9znqf5kLpHGrC/7ne6x3T2OgRgXWfErnfsTmBWj9ytK2huPmzE0lWkkbCX6dieSbdj/fK3rnMP+ktllfOHLLWZxh2eH4PMliSSyTArq+d+WQQcaXn6/7lvt6OJS+0tI3qD0/JgtG6n/N5U6g6uyqQG91kcU76xQMr1tgzDFRuU4ZqKFbWFg6eZp/CNaFmRig+YQbpcQ4uoqsqaf1o1OJyTywgH7x+2yZlkArCdElruJnD+g5Q1cAkG81jVQe0R+df98qzxDR4LcXegxG4ztw23stWLGwcNdx9mIyjLQrI5i4liofGyKEsgBs2RlyotQ+l1AVqlXfx3gxAkg2+XCLmufKT5Rl8lk5VJQ7QQEShTL824dm3H7DOoAZnhVd/FKCGHeitgZLgz/afG6Q0f1HJ59RJjt3brRMucyirthzAa190DTgn3DazTXnzRrMM+VjO6FR8B9rKxKcOIH/BMjW7yYOyqBnHDoYKXxyijW/R5n1pDqaO+8tyaN9VRC2GUEUMksn8Xkx0hem4A/MTCTIkC+OWPCj96UaNzV2FHcxE+vI+7eCE8G3dI/wvZaJXku9a9kL3xESPtpH3SMpLtIA2E4RsvPESIENk2TMENhNXWpkCmHratuO7DeGPEsD3qJX5DPvwr80bxVGDxeL9QzhdYA8WeqvIDT0O7be+B6zkFFzGkyaq8Xs3nrq88WLX3eXyyF631j7K2ZwDo6aUwXH9JwRcVbZKlmFpXS4wNgg5OWP2ELeg3wNLXAnMPPvRnfsyuj5RnjsTVQSCm6gJ8Is+5ll3DAp/NNsIosZfODyYazfleIXTEUj/+lonmxZyPRZ/0lKV9XoiYERZm5uHOYd1We6Gk09y7MPFhUsdcNDr0fvt1Cfl+aJxs8nQJVbU33clrA4RLW4k0hJmVWn1btdnZtYnwJfIzrmdvJh6H3Verqeg052MjRwDwdQ0Y/Fjwj9am6RqnNFk9cV+58y56tsqOp6dsmK0na4LKOScs18qXni/NAzy8i/6eAE54277fFR0s/ybAgKMfdailB7bPwHjP3QDoc82kRq166dM4FLLUmcV4fU/k47X9JDQs1pbq52trUuzJm//tzU4+bD/xbgCJusZbmfAI1NsaifsC+zwhp7K1TB5PkaRkwQ84SdrqYvsHpz2JJsxXyWGUkF0d97EzrP8nxxOFeQZAdnLgYKIJmhJAIZECBpfTCgNiPg7pYbts59zly2UTq/VGVo79ut+kmlFpmTejDLTtOzB9Q9Cd/aVHLdbu7kK3tcjJo0SadxbEdTOcteuzyelv18hRXWRtOR9+ajU5qePqHoFQV4vtheTJVuYhm4CLpzJWQ8xGBiy6F9ja8jofUbC/UkuwyIyc2Mm8tRzrYNg92EK7iMyf54B48T/3nc6MvtYOuKAgq8SIZyRsAVWsaV2eyoxRGaeZq9qf2kY3MLouxDI7qAskbYYziZp00zsh77dP2DdGBUTPS9NzCVOUEGedE4l8kYMTC+wV3SoxLO40jdlbij3sSlcGq2hEVI85mQEZgCt9xLcG+CGGjhHZPTrVVYP1PPuyCXNIcLhvhrOeZcYraB0qc4hgETGnQ7VxZpCiN8LXj4DHSxxHhu+DDC4I4BHv+l7D8ZUOrLvUKrSDr2vzqAUurXN7J6zpXOrtFDZRgJVKq0cL7HO1QnmdszYCsE3pn02MEmE15hlffx+9yxbdoshasiD2b3t8ZAqy+WaoagR2/t5OWCc5sTKTxbIlpyvRDN7vadO5jvGVyxGubrmdUI8aI9Pf8qZsyky7L+Vj408d1oUsDGhDKNATF70E9WzQBiJYMoMLNHa8gHJfgzEr5O2+YwPw7kcdlNZfLFJ5DvjVyh+PhkIYXIAzhzAjyzUVHlykH2gE5nCba98oLgLiSOxz8Zhzn4hcyRgGk5vzyNsYaSquBk4NuC0y3WoQBSKB6SmwmmhVKYwLuz+Gd7NoBIiDfGtyheLb5dwgHtG3S56lIt7eCB1gGQn9DEfQx5yO4dmsnGYa4tjzVPjZXNwTLYjOqE7xjJUwDgPwVeZ/EOwMeGDIwEc1qB7uTCPvjnVEGHiriYb71USQNG4WZS6cs2iH8yy4V89ugUrLg77vJsg7hmSii2uNuSNQs1oLr9D6XweUfITMKliFMHW5sBYojjOSL0/TXdOG9hcaouYatLjhLPLVdSn6bvExImHvVMm3sfFxELkgIZbuMGyEKwxfZqT5UVFexei5U9si0rpegJOw+gMwO3ptG403EPlO7ly9dvgT1dNoQcVofUcMn7deZdHJvSBw/MunMIouKokPRaYhU+SSKBauz+bkJF5G1VaoaUJHV305YPckPUHEo534j09zE2vHtRBYM9EzvicG15mDdL1ubmCh9e7+svrVz2mTns6glYxuWs81k9ZqbVEr+2OzDjT5vDJBu3LtuJa1K9VqrdZOrYW2Xzu9FtphLbSr104fkXWIxXGqxHv5g6/2MnfVZdw5nq0BojsC/Cfm/LnIlcvzH9XY9lnT4ce1F4N5FBkn+Haq+EGX+3QVsKqmONA9JyU45+Up3TyJHWcGW6On0MipFoe/W6Nat4kIojTmbbak5tQu3xRBjTfjiwUBziaYs6ohTFfIac/ARKqNPam60xmjH/0j3oeCww94ofocCxdjizmk0vrNgxpmvLjJrZxonmKM8+kuBJNw1eAigAdmTEQR0A0+GzwLaRPPwoiRqbaDKvNJq7BFmFct6SJYo3HFeH9ZeFscC6PDgNStFtXGNK3Px8BNDY46IM9aCmrJG3x+A9HnpSEPhbPh8iqhrIZymiJSNTDiwnrK7FIt6lBiiQ5E5BB/aKyOorfrKDWVfM1uBSeOG9gbdsonIYw7bfXTvpCFqxXM90JGdHSqF0DB37T8iemJVwD6So26/bhL67Ay7ZbkuJvp6WaFoft1SSd8S1KU49a1g2zqpGjffA5YhjJK9RtDy0Vygatalk7se3lHS+IMdQWOddqM51fzTl1zgrIv1VNUlAFwrT959SpcibexsGK6kmHfHo9Gvk2AihMac/rNahqnZuEEoDvVGNwTsenhESTliWJc8sGHHKljLpWawxKI4dUCFF6f6iOQM7ixURx6+EkF51DYGZxRUj2OmFAKq6JsIl8oy+LLp0k1gZk7WOn1YVtHX1NzHw/CX5JCDrwnZbewRwSXPamt5pdvvxB4B+bEWJgQejyTf4Bj4vSUtVEDFqId94P+IdDCK+jSQcZ3oiJF8jk/DUVGun8yUfnKsWXtlIETI1flBHb25aPOaPGRAH/QMUls6CgHnCJOVj7U/tI1BbWNlt/tLWSUgUz86L1bfviAUKglVWDbRWIgfK2k9zXcb+qVh2MlawIHZSs/A939mNTI+oD9vgw+tii2OttlspDTLpjt2JAWxZdVSIyZPqBcJSmEPeaw6Mp+PoPDCcOXcWdfSTk3JTKzeDuf7Vr7B+w90LuMJ8qZfAYPskYj9gzoEdMhkPx8DPvpFJBV+1ayG5eje134VaoPrPw4/MeGme17Q6TT9LwP0YuuCiBuXo+Ep6DMJ11+D1M+mszdzIaQaPbGliCDLZ/djaNc8o/sRtBciLK7e34803qhp0j50hBOE3rIfdjI9KGqJ7tcBhQ4a5htNkdKiPUOaKe0IOeqyg2Lz3K6p5QCCo/aH9osJUvecCQPQfjaP1aW2ZzG+p4i8yjjxjsuUntzVjKddfJ7OJxL0BPahhSuu0/GXHDV9zrC+Ng1OY5ciDZ9dVmGTNbiWmjx4qJsyrH0wSE94Q3ISsc82nIs2kY24ZUjSN/c73YEgEiO0xSsj2tEc9oQ0MpgbF3eTc5+8FGQJ8qjp74mwQN9iSf5Wnnnf71yZglaz1/UjZR45XG5yX/eCYZNQjwcGsLW+/KU4e/9hixBdrhUtz/yAVnr2FNkUqOb/SJdwss65VxoTHulgfve4ZaI8gA0vexFAx9wEgkzdgE5GZQogniezoR/fxcC+v0MoF8/4tf/U2cJah2FRChWWXqbBqhlF5OI8j+8gV1mbuH11mR8HKZPhWgkfew5sfQ69rBwTU1jnm6LSnWRL82x8bRF01h5TqO64uIh+XAZg3MRc8Z6gcj8u6LPrd2FeTDSdxg7Q3HlBPgwDj9UzJyC4jEiPohlJht1ORLOhA+Mt+XRX+4N0evaZE3Jrw/WtqOXMs/w2nY8arscvVyXGbhNAW0pGZkJuoFnSZwZfdOQXQB5e3cZaNsIzYkdSw+mdnfUH1zdYjzAMYvA9lSfmD9gjDN91xyNZ7z4iENwZ+iGxqWejyqntZjeUL2QWUVkaVsR/Vgl9PbqhQwKai6KCsw8u2oCjZsDZ9N+Ovcpam3LDmlfpG4dr0+ls3gs12ZDVrbdigNjLNIVeI/SEBBZvOvX1HJxY65TKiFObu4XYqRodiQ6pnYv9kH5u3kle81wnv7L6b9yXOdod0SQskggzp2XT9rKyREzkb+70l9xGCQvbnjqlY+Io+Y10QrT5L3UX/A8rHEZ+BvBF0JXRF+oMx/D4yL0xuVSzIwv+A5osjFdzWINzOnGrONEoISiGR3h/enSpd3AG54Mtiv5LK+nNjztyaELc824VNejC0K/jp3WKYoqbqwvd16BH1Ttr+eBXGsDx9/wB12CqUMY7+PZeCd7yAnan2l0F8gYdozWop044YyUakNHvFBu1JeG+2rHyy4h94IeyFg1CP25iFsvoWywYanO+2Ofblq0mW96v+ixqZvRYuUh1PmXnav9Ievs8dg4P3ckrc8go1f+vItn8S3gsKR8S7vr+3MXZH3P0zSpZkww3G5WDr09u01T+s4e3SIsMd9OftobofYkR8uJQTM55KT1xZzqETTDlM9mVMZ5XDSRb+40I8Zcmk7fF1uQ4+EAnW+uvE3BqYdRAHb/PteJ3uijd3WCBxens8/5xzmYvwV1K6dboJs9OKQ/Xl91i4zB6vcEFG2NnnzvYNlCp7Xi9Q7hqQGaXuA2+IkTQ7dLP3wExDRU4/YnduA6/kHcvpMx+Jhl17me/EPbnv/8TnKUdNLsNfb2LEERtcfkq+7GWf/n2vb8qoXLcy1YxHEPY8+FxnK+L051z6nZODKaMDkhWhh/SXlOi47p99MtgFnINRI9ZC3P0J2ujD9svO+X5L73N36Ie/eeF/24v8Dun82o5BXz8yRpzozywcUTUsbFjjT9Bf9y/FcipKZhbj0Komjs4krBI1+kA0+umSGKswq/v/vq46/o0DeDSbbHX774L18ov/BT9+qM6oFVDW/2krJ0l6eN/F2PO9uBV+h3GIDsNUJCiKIQSvLUuQVyR5XEyQZf538auh23Dgc25dIZmbREBg2mWFo5aBG1j9A/Pf/e/te1Z5dGU3BwRPCHdV3TXNrPw4WDVQGvkEgmYjQQYBQ+80eYJ5T6F54Pvk3+OHrgEHESLjVOMun/OvKCWBb6EZH5YuXt2uTOUy7Gywezt5W2yUayhoVnhA1daDR80z2AZ1TA0S3UUTzuoTJ2I4sRLzpQ9gJl5DbAWcKbHXReBggd9oH3kgmznFN48qkvgEE8A9dIaD6cAA/9icIxwBKrgGVsxNK+aEQXEs1OpBv0xBXH281/vhpEzQUU591Dl8LQbb7GRAyCZyR1J+E494a4tVFof9I7YlNEc1Y0GABu2qw65oL9gO5VRgvVXQZigWbjJ02L0bto8YXI9DlOGS6awtaPVOpyNABqw8O3mt7iEJy4NvbkOiqAHfTcVeUSClYQs5eA839Vrr34vUGxeHjQUGYnw6RKgja4ZJ5DZBTZFAsjTVvtCVQiIZ+NZI9GQ62cdv70stYL+79POxCnS4cxd+mfPsABD5ewNIuWnhvC867U1EuUR60+Jq4POgwVprgtmspsWxmU7XrUUCdCwVwtVOW6y/erM6VEHyxVP3W1j1RM4RtqKLkgr7ADNiv89nF3JZ8Lg/fLdH1stWUEoHy18ylyt8hmrsajxvO0V3FmFrVYVx2WQPvK1h/0a2jlH8omNnkY7Gjl0sf8OeOY804F7jfaFNfqbVUidWU03WLan++CxNdlS63VdzO7kt231fc0b8nwHfFBOuwTUCOmQChfGTwPQa7piCGHSL6i83114HWlugJ13IN9/j3ji7fgXlDy1zXmSjk20NtkA0NdiKxhO0gFWnIQaqAEqfb3QH/PLKD/akqZLIs5W4qImFEkGsPrzSdXcXz3tslSHU7GQuy26+Frqf7aZf7eQn7709nTH7nt0P7BG5uy2F+ThgUepuOYaBNQmhKqymND40XptRLy70CCRCKsno0YxnUvYwiUrcUKl4iBOzEbOwzLSz0tzz1stdJ79rj6OOMpdsV2S44B/RQm/d4AEDn00fDq4K0MiVt9EYtuI/LKiX9HtiCsO7NPUu/ZRQYSfWO4kihQMKfzNLDHxN5mLyDHbMHuJ4gxQrFMf329NW0IsnDNfW+g2X5VBw6kHx1X8266s+Dq/amI3WPD5wYCYyuZp+vGkYo9cxVEEf6Pa/F/stAfqbh9w0Z1B9Q1RDNgFH3xkrwgfZi8ZvNzv53jiymsSP1KYIUVBgGnu+CSmLru7jmL0uUcm+krbPALUamR5sJrkZRVtH/emZTj7ffeD+zTIjrKv/gYsNd2tNVRC+fCTdWMTSvBYHNbHqjDYKNbNv8+qv4tQrLQS7SnlWiCq4cZZA20EGI32/sbPzg4DKGrOk7x5ivPWwIetYTeT+n/aNeUHZuQUD6OdE6as6b+aAxD29yqKT8AAFczle1uydNEF4sqcwpIYcejW5bUrrDYwfyrXaNL9XQxGlocyl+ucPcba9lKxTncfCgWIuESvJzRW5r+XlkY/5/vsTXNjVwwW7xEEbG/3nphCsbWYXcoS0Ek9o8B51QHT1OCSWxtGmagiQYrNvH4i0q6aa6imNm7ctHkHnoMr8AFAIsyPnFl/V+SRgSdkKDPs++6izp0BFVO1XgPMXeq2K1zZQ9F1/efv5DZq8cffhrfuuv5ilciPvWC6lGJtev+IQq/wQvCeR648XrCxK2DCn+VuL4BIGHyzE2ldwLTgGtmmkazwb+rD4e1zW14DWGr4PEjbjFrttn+J5gT4TSVD0EvQZf99gHN6QEcBgN9MegzykZ9dBwkYhQghknvpyb0ne/cZi7frc2Nrft93nSifDg4yWbrltMUcfFsD0Qgp3qsDHVy4t8K5wp+zzcsEVj0PXTpzMn7OJ737Ph4oPtffcUhYv2I1UvuLzDQBiYQvQNL6Hy/QMH4mHhzYW+siOk/OHvVI7dP6mSkZvCWDHA33puPRtVGcSo3Z5sHdLM1hnT/yXq87A/gJaMaerzYr6v9ZvfCphNVWlSbMfLLkfrPWqrMBsfxNq7Yy9PMM/oam+5MqCKG+sJC8GS9QLKhKyqmeiAbqzrU4Dn02L96PegrPSB79fXR91OaUEoHB/Q+aRFPUp/WUvT8Upu0bBw1MohnfBeQ0CUuUi5e9j43y1JAClCaDayhZX/UzGqLtx+2f66+z1lgFx05U+sM6hoHkCeZtiasSp1FmPpx3pd/LqZoahGd+pa9g9QsK1JgvP2v1taf0/ufBqq4ybOo16tRTGgQrXKTs4/QdgZLAmKp0ANFVw3K5zT4LYn7w5OdH8bOSZNi7jyDH3xp/gkDYt3ixd2R1Zp8MbV8sPx2yw133BX3GlNZwMbt8Lpk/1LAo+oagISVDbD9GWJU+sUW56dbvhxHUzkXtIOzjESYH/OSv9Et2P9CCF3cp93XAqiBZ8oSxtSN2byxAW2M0fa1WtBrJ+ixRzcyYeyJFYcpVIm1kxIJUMxErARH5XI7W5H9H0msd/01zbJdOyyKSKR0kYf0PRCNB+Z5iY7E2pqc5hj5o3PRb6pkQunNd7VkPGn35c1bcwxcxOAuEWOsrKhrDSAWGhIbQ/QSTd2Mrm45H2cgy8bwtxXIJl0OB/WQ89EG7iS+2QDCoERp/DV9oxczKj0NQnQT3OgzoJUleIcAdoMJ3kGA9UD47gB2Y1YUZ+DkGMxHoKsHZ8om6wrf3w36nYTdIRaRngm+sa5PsUW21GuR7fg9W8EnDZXsI3v50M/834JlLxMUsdQOGIGTgDsTbrNL54aM+e2wyrecaIG9HU5A5s8MM83QsdWkec/GRMPMp4qzlo2ZPtWtiURsM9XCHI18M9Xylinn27p3tvcHtJNqxT201B/6RTZDYsAYjXL3TrmTmsCv8usNq3hvmBH8jz1JGRr8YGeAm+k1Hh83snAOgJ/cguvMjOCz46HphOKwvZq8eSSjAb9ceWFghm1Ou1zs0P+ydqdSCYCTXrMHB24dJIWn3t06ZE83/kTRl3vnFLzPAg6C4Sc+++95FKS8iIxm/y9usQsLuFeUwV9xTWzOdIHfPKhUiQ6Dv9PyJxIBFtukqAxN88/eeO0asgzXJGEMq3bIDa/eWDU0R93aGjs34Gzjmh347rEX7DM7WZ/nXGkUHk8LLNEW2ZytY4sRgN+Mv9nA4yopnbThlYtdxpWMZX9gL7FpPCOif/SdzME1uu+EDW908630QRt9PhHaAvknQfj/CBjZo04bMPkyFv0ZLT/lv0wQFYmKAJEAEZxwRZ8TJarE8hoJlBmBM1WheQHaZECioxW/VJAiBEZE2dOSWSpNBMdNwLC7t8XRfICxafu735TltrSglD0JeF1TUoup7m7Y8Ou495JWsOpZIDPbD233oOGCwlZa/jdBGOfkhoubCxqt2wGwmEqYmSteR071qqJppR9jF5FYCjq/gnuEeUzNZkHaVAH86B5gDdD4pjp5MTBMr14CWqY0t9tGXsE5AScX6Ff6zeXkWqQZZNfWgytJBgw6gEn2wRLO2YhY2OEeU1m7JQP9UfAv+/hWB+T3iaTVpTEoD2H02yFrIT79Tc0ijEAPDH39FeZ715zNBYWIxeFUThcwTxM99HIbWH16ZcImwGJTbQNFfQAWbZ335UF7AqIXBPFkZYtd7Eqc1XDmDUx8MfdtakzbaJYm2QMtUYjThUO22ayEgVkF9BvhoQ6gkcIMxeFA585+OZJVV33Hq7W1jhCw3sJ6zgfT4787kA5ii4WTiz9QU2IfYaemoCe+eJDJSEU6BnZigolOHLHeqQNIk++spiq2FVkIN7luYIjcVwiobbG+BHk78mBjcoMaLjoBUYRwkwPLSdNWJQE2ue7cXvOEHB7VGNiJCeopmNbEog7hJidE31I8FCk4TAWgk9NSU7tAhkgDuMkNc976HxFyIScX3aDSuhFZADfxDv/TE8lYJ0AnNUICj5E+8lzIyfU9aVPsRCSjGAs9uc91pPyqJKAm39HzrEX6qEKk7YSx7gfiHnpsTg6YH/Ydpa0jgN0OvdUkbNt1BejkBvr25iFadWBjcoB+Pnps1kSWCzl5YO3jpL5+CgT09gCeXWIiWHeAbscHL3Uwu3dSFHmw20oA9wlvFKMcB72dWCIUSlRjELcRGbrD/DTqEGlynXAKhXUD3KR0fOX0o7saJIp1HYfhL9+1TJy/ojjoAA0TFAtmMKSGnH2UqMic38CyJ60uw+jOoNwV09lXvT7JO1NR2DsemsLQ0LcFE3OtIIzMGVtZyM7pNLSup5FzBMUT/b0coU5FnvNnT+6mMQ0ttLk9VYDmMVljVIsjtJl17FzpOZQsT0D2IP0AABtGEqoMsphzfITL0GgD7mBU6ctht12b2VUqUhU32dMMbNe1RcJV8GxwUAqboGph2UaLF6MH7MIGidjFzqwi13yI7wIf8qCGbmXqiWSTguFdzT4v0r3E0kVXo8/tq64WOL6dd0AS5VCylPS6f2MB53w6+oyScNYqfNOKsqGIXQ6cD/XKmh628ZVISl3L9omc1gD1QsTTLB5fBBKJCN5vUAs1pLEaF0qXk8G8b6GeTuin0ajjaQx1Pk0wrvXDd6c6g7RiwMZge81Qr7YAMkCKya7wAdRXR9flmLk49ZSJCxT3VEudMoFhzzy3ayKJ1YQ1oow2sRL7+gArE9UWGagkD1JR2SONAbswPe9LSVX5xCL1qLrpZiVkgZoCUBS/Z+HZw2JhGaaWWqSK7gW70hqvXpPUHXKYrHfoIA2G1GUYjGiQpkPaJpT+agtdgePUi+VOhseqj44COuQWTV67ADZMqwcju0qmbTHQiY6znEnfEXfSQYM6lBdlzr64NjvE26OcWQqrnBlggJuXKwppncc8mI2f9KZVktal1xJdwTh5iNaH+eRujvsGv/7X22yqixXFddNVsACLWf0fKdv1Tb/V2AOZ34P+sZss4diEnWRznK5IxjnryoxkeZvS6ToLIrlTgoyaBZ0MAoNOM82+neGqzqt4BQOuAB48noWlJUsBo5QjS8IeukJ2VSEQrExhhy6rx5MByu9phgafez2IWbVvL2DwnYBMKbNq4oGEUiU1THLobBNvrdS7YfBCNypkq4buBQx+wK6UPCtgujM0dsSJyXqZPg0nwEx2yKhPQ6/hFUBX9s/RVB7QOXU6J0g0x0s0nL/Wpu5cNgj35jCh1xlNrbdWezo30bRwUGdns1Hiphu2gtUz0pgRNfYGjTqiqcaRw3Z+Q/no0HPyker46QOD1DGpkySanuBJEv9thCRqXXYn//b9EvAwPym3rXCnHXUZPH9gCEkfi+WGN1k7wYMaFwnyMv/L8u/WsE0XVYXhQm0CdGsCzJcdIewUX6dBdlXzgPef9+NXqOWH1+K3w0McLBnjk9ZiP34ehpzcAE5uQ3yLDHWRB/wY4fhBGfrDRcaOnJHTQVIg9VH6mh1R6QG8m+ivrAMqFcL8sFWX+4awclu4umR5szc3d6/lz/Oh7dlJGlYRjBncrw5vQUixGIOGl2hjf2Lyr5zK14PF42vpwoPY0MLPPBTkjNiAziRhnxEWoaAQE3AgIPwdZDQiKPWHBLhiQAej8FqYMh1MWO+YEzmH+95UhNzWrjRhj2Eo6i24TvnXyp5oujNtf+P+fkj4q7x9vDGzp5ZtZDxR551AjiWZMf4hNjLgXd4Sk5Pcml3uXvUIXhVYc0RyTgnPFg7VisP5gsewL/FrxfsFkwyo45jPRbJyWcFd+XB/KNy7FGow700SOEvZFFzWaKG8yWWSo1JIvaVUg7eZByV8oeDxLeSsbQPIaTnbF6babMjZpyuBysLe1OYX7F8xVJ/bQBPdZaXbZA54ssFNBYSkhELvNnSYPY9En9JejfvDK+AOdg1aLhENuQJC1zdKpF5/vgniNeIYqhnbHlwPcovjPmOKg4bq55DSoVw1A/Nb3DHu008/jGG0+AlfckS/LoahBajCYRPsI/ORM2gB2F4R7JDaK5TDT6HepKC/snqSGtYqecrHDr3/AIM4NVb71s0BfENkVix0ff+CUPANNteyAuU+xqjDPc/zkuYMaM9UeYUDbsFqrXmK8YZLWZ/gRuMRkHAJmBS8oBj8VdKv24z2RPNUbQ6TGXN5NGHIFeltUHtBxOQMnvSjBMSgiu/zRARqWurcSDHtoI+PyaoZrIHFJPAuBGFNqiiDgNuq7br7wlm3OSoH5xMpiQH1MN74ezFaz2ysfAwLJq2DCo38d+CN/YijClaq4M1gk1o2zGvikol3s/ZGeE7qwt0dNmrISXeM0wiIjfGfd0r420SZOjfqs0+t9cW0DixXy3ax8syQ8n9UUccoD9kIlUIqVINufLUW/fBAa0vUMA+h1+xEIqmDstgbW7yQChrCgdU8bPNHOoygN1ZZml8pfXXAWdrkBB5sSpnHjCjLes/3XQWutlMCczR2FD56uTWOsIyGf5RTglqMknA5WSHB76kgE7sbdQoeyoD/aOzYfZcLLFpQfiPrUMvz/hkDOl/JBHCSQPzWuYUr6v9X7s7TiesSw6NjNaN+uC+lWGgBo86CAeW2r02z08McV+WGewxjqSg9v0cbOY/fwXKW+bWML+os5Z8tRk0G8iGhhZtAXeebx8aAUfzfPUkMf3JTT8rbp/Y4tLQMabIOJJN6Bs6oiL/YFZ8mD/jhCgl/PxxtLpHrhbWSPHcfwNZDxy0FsTCpxVgcvllasZjF9Cz7/DZ5cOoyN44nl4wallePVMwVTv38OYX+4fdqjz1RFrmZ76i3Fuvgbti8jH7wp97EWpyYEYEP7ho3N5kI3ToIm7dlzvpvXMRbGwZXR3riNQnytU/awSMxI0y1fItfMMmSLZ5Zt1HQ5LPiKxqctSbq+AJ3KazvqchcrhF7bSQMSlwsI84CZHWVtlus/4xSQtiwoR3fOqiD2lLxpHAcqV/9ojEA1xENCwpYqrwjPaZ8dMQas+19P1wgQJaqRYlXP2TZqRdq6w2FhgA5CEADiAx+CI9t8SkFCnM4do6SJ3XWnIjYyNLfuKqBdU8z9h/74iWyvB+7n7JGSuu5/4Y1w1DTWptXjx+5QYVSMCs/CZMIotj0fyBNbnoaw/Y2MmaZbfzqaVlVJxDIJV5CtvWINPujKy2vKcKyOELlERUnrp1tilkM/FoSNSNZQNI7pu9EDRJ8xKojLQKqZRyMxkLGCSkEBIZfWHvUve2VCewCQSAWD1GqsC/ULVe3w+qlXlGr8veW+8NVxGfiMcBk4uV2dQA0orRGOAmRQdgHTMPM8V38vjFKrBGyl17O4x15sojDJCw1OvBnMQ86sR6db5kl6evZMY4SSYizNlcwayn7rRTkabARG2RI/sWsiPW23bJ2Lfwd42AZo9ry8N47GBpNiI9rsJTEm2m+6ZTjakFrTRBV1lsCDSk7Iru2Yx6Qd4txso66Mfg39JINIoYHtmCOQ3Vk+POTsmW9HolNUWuAZCuLd1hhGboIfmn4dXMjhQIKY2FRTxCEbY4l/Ft7NRPBYcBvU0nUdncB9f+20T2EihBJBHVIBHxfZAAz9m4Ek25bgY/QDuKtKepZypg3F3CvHO5KHiQUmThcybUrwGVYaWbFvh+aoFpT0eMyzfbxMqhe88QDCSgP4AqTjAyhtW8QAKUr2s85HwVSNjZhRVW2mKuNQBtFqbKArHJ8fDEfymXBWQSaOK4aCGQ7W9IuOvXQKD4acRycxCOJib1H97SsLEPGVoDWELNjxTAoO4e4E09uBBuYQtYusQRySpLKtLw+U4NmE2XPgnQArVgr0eikLngAl6NALljnifLWDoVEdRrMGZASB77DmXa2L9bOJAfyqLsNe2JDHD1cKXd7dQhLjEimLgsA3pe8xLoqTSTuryxP2CWEINJa6KG0IxfZyKdsj4rIUj53a+nDgIB1xWhf3vP5/RdLyt/6DzSZKf9hZvbL9UWRRCqHXigvleUj61Tmj7s+qvDzWhrt3/e5Pi/ckmR6x7PGRnsQa/SikVaq8cFzuiRIBdwTDi47NS/GL+20SxoHBYRFo7HPfsQnZnUVXJPlFDLEEGiluZ6pXPR2ObDm4zoUoP8j63bQWc+TjdhZHk8WNRhe/o1XXyBevUjzw1v5OXPqP6n4He6tWzQ3/Vq+ghAcBwrNatw+5xjh+MYMAjnMgUuYxVIXLyYxuKmFANC2vsl6tE3tgM5S6fteg6Z/clc0lQbmI2em/xXs+pd+3WL3SlFJWI2KDSSu451iWw0uk/m4/U8WRbKMjA4iNp0oEaceTzJwjGeXj0LPN+pFEUF0btHEr15lI1N+p0hLXXRY0yl3zpAloBQyyTmkqLhCQqxUmYreDJhw66gMCVFZvCy34Ci4gC7Jkxt6GSpOTmYvBJkZRFZJ5C5yu92AxJJaY2OIHRR3W5gzXhDYaPFGzkE9bC621u7dICLj48cDmbK8ahYCUs+BTlwmwNQxpe/JOWGRZfUYgxTfiOnLW70FU+E8XjvhG+lZz0E0CHgR4ZMy5T0nNMWC+r/VBTDv8J2W61PAvhHea2BTjoO5N6UpazCvjLNyWOcgA1FuKa9pTKM6XKrE5bfvGY8H6PXr0Z6SNEinrjClRQi4OPl8c3pF2rRDa7N2GwRPg93GsOD2Lmz1bQzTOFv6N7J3wFIpjK566aqs6XxhxamBnPUWwdQXpjZbZ206rdXarNYZ2Zovb/IETgXt2Ab3iZKjXQRi8DbqHurcq5m0hnQk3y+nTL+rpAAyrIkadXqliHeMUPjrhcl79znPLV9Jue9l8dUOFz5MWvd3Xn1fDNBGp1evzzNKlkFURA1XFLgfTnxegcMbOVbhWH39ACl+dyagsW8DHvZ0RlYNec9U2uRjupfGalyU0y+VxqRUeHRqIymJlvlg7Zn7lmndyRke2UM52KCiF86r9N5cBlmRdvXF1icxSZDV1YNYRXIjGUwdtnyKGyaL3qeMs6eLqUWI0okAln39V+7O5UTuiBMa6ef++ZTNcQnhw3gUTSz2IkQeXKqA5RBDxWnrEhr9fM2a/zlxLUUdS9hIGWrDtexuKXMzUvYTctElrbDKSvjs8ZU7Ze2VE64P1VnLLVTWMpfsdkmqZT6E/lgfanBPr/fmHCG6vd7DuHc5k/tUT+S5s463VbZlm/MEYvpET+EgW6DXo8FyygLKW3jd9+a4HnZyQ9utVlLUH3svV52uyiTsXja7BPduV42Txbnb0OggiYxGzkTii5DcqAXmmMPJcsOAxo6USv0rA1uLqNCPOsD67xTnAi8yNK1CwHpzkvQk9mcqEd6bPPcALvXpX7/atukj9tw3LTyDIBxfHgRWdj2iEPVYsPF8pBAmmeAfsfCVyzqrpbvvqpBrfHTNWKS9uTlbKKuoqLK39kq9+5Mq44VDtQO0jdu2RKkorkNUJWWcZ+UMhCfk5RrAiVbMJ3l82QHEGJ0Y7PZa0UWXCcO/5yk70IXS7t6M9SBe9ctdBsWPqWYXphc/NQtWhuNo4aAM3oxe9bfIIP2fNxO7ywCeDWfHXsZ6MwFYSoSEZZCh8rCylaLxKVOu8gttywEuTc0LAAkrAY/IP42SErMfa4HljjgUqn800Lg3kfTTd9go0GIjHiNk5XM++byocOrgxfaIQFrFxBkrHXysnme0tsABBVcBCULzY1o0a+kMldFrae2mgKu4SavaxSZK2nsZfmRoUcb+Pclt2opd4i3HyU8yRqMGFYhdkBar52BZr+yUL8MB0IZ7cn/orFnCEhMu4RHuEuZoXxyRwmvoUeIb+giX/qJoINWGFZ/Z0BPlY//wYaAHTcy+k31Os3QdQxUFFITvNLBnGx4/fc9U7PNkkxbeXYgsyW1kioP4b+gYkhczB0uda9ueaECRyUOKz131x+qS7XzXB+M+DdBovUYEmxOzHn7NpHo5NxXVL1gGYksBj93/9LDP9r/Vh6VPhxUs6MR1soc7hW+fgUVkWaXUAW0mumsJ+ZC9kfzWEKVdHbSDkW/qQIEO4nAIzjm4vjMKBTKl9cmZICO2351T6wBLvJE8+M173rUb/3PUcLCPJb/Jxytgw889Kh8B7ynbJp8kVKBSC7KcUKtRrAZwk070Rrqe4rTh0diRb6YIIwUIw7rv0xbZ6p05tU5/2fW4kfG/07xp6iipqfxjn3C3nlQDhaOt07WFGtjGuozAyrttT9poMydS1tHDQXuj10g+vANm8IfnrBOicj+imAn2pjCK7CEWm8ZsF2FlvNLEW49nfM24wKQgOVSk7qKH+sWB/IYa9uWU/jkS9tiJB0dUPxAT+/ALfsrAEGzDl8jxeIOqPqeCVcRUQSTzX1tMHyjV49lH8Pc/laV+9FNCsW8knBWTce+soUcEYVwZiOH1r0HEhn8YGxwN8/Ai/WnR/P7m9F/Wyxmhmd/mlfC0Ya/o0xlFWIgglO8HfDOd3dBETjVQDDldwIIiRIzA+d8uRFzoeC78O4KkfJ99iili7e83xXGDlNe4+xo55qAsL+pK02QsmdX7AmHT+JK1sq2+TVccONb77EiPz9adRbDw9b2Sceyx6bWeEWwhRwx7/FqgSPgizw8nawk8+SlUUZ2X5pMEMpAYDNnw3sSGTb7qdbAgxgM+3N3KT4SPcYRjyqw8QZXXgQE5qlKdXCQLCajhSHD6WNAzFQ0dE8iDYs3iUTo1oMtgSgqrLnEAlnLXtlOsf/WusUlfyX17KYtxgaeEzIMkK2akVL0RgIdy2mDf9t9QoIXHQ5zSgQ8IgH0KSDM1MRjLEjtrWiTFy/b552ASN19RuLx/p1OCgD4ESMb+oFE9eiorOvA/4BcLWs8QGx7TYDhRiocy/JeuWpRIqde4FDGkS4axnnGmbAjeYizQqlLPEuYmqOrg+lEttOhAFUNNqgzfrIsf/BcmSF25lU3apXNqukCEIyJVTB4DsZIqiBwXcA9tc7Nokvb/OjUf2Jf/Aix4KOdOwk+/CVR5/15f3CcwSXy31DOzwGMcygxG5jC8SF0zN9i6PIFBU438Wgq5nW8iwQYplQrQZ3GYIywIrvEqIq/5vvkth8/y9rlBtB6ht8q3JvOFBc0rgGHq7eb3+rXUyEeDt4xMySd4ghx/sAzW7t+3sHAg482zUcrpRdPCSlU+pgBrcRYn8ORdb3NG5kQxwlwM7MmeDGgsMdo67t88BjZsYzVAXt+kFBBBuNKfKx35lVL3+JF7cB0J67G3txS4zlkwwjoxlQPt+ir44gBLzJcCxN+2Aov/sQICSzEtj9kRNEYM7IUBePVSgCuxjW7bYsLlGBiLLsMy4hdaOUHxD3usti4K0We6VzE+ZkPO8qn/plf03EWKmRKyuxtfA3Ndj+yfHKRyEYCyUIA4CnhtqoqOJm8rsVg6lJGC25nBc0gDLzpEEeYXVKrE+wSr5MY4+CTVqfhStmrih9pKW9rC97DhZkQkzw5bgIg+X6yff98rdFTGhGKxmzRgq/vc489QoCA5uZjj7mfHPSynpegt0VYSjNimx8ziRZwHXxsLOnjMByyHMppEOx6zSz2vhP8VZzSToAbPGxOrzyA8leyHYx0TFULlXzEFM7BRQ5BcesIVl3j0HP8wOSCogBUPA8XKUbbumeuMT1l3gy9LcT2DgH1TXBUb8gTMsL9dy3Ah2W7kBcRU3zo41LfPC8TXgKtrNjjKZ5BOS23OPrCKmTZkaBS6LGpCFkyk+kJH2yjqMYYrpnlCUqrw48eqkJzwjgeQznhtO8qpDV/jochweKbUjnvbQs6p6+NBgn9caoE6e9UXCN2fAssIHxKejN9itt1jDVJeSH8mRR4fGQopMKrJHapE1CAWscBYqT0piOCSzPP+lwkP0Lo75sdoJlmwtX3CQf5DEAxPrUVPK/vhwPqikAAAJqxMrwoTjZwnya9ILNIe0by28Fk+ljTCRtHNDPYf4sUTmMZClvbQ12SLHzvPkia0libX09y/UdTyau8eOfOP9kXa/rcXa8Sb6leG5YQuOKdTe4d8f9afnNDUioKhLsrnjlX2Skl5Dvym9cDqU3YS+G3+XlQS+ZlzaPWo30g2/WtVIiIEkssaPugRYaejzbPr58DAdrgQkosU6OJjGKJcn9Q2YKqYsjKuEssqWm4IIZG737QY3D1eH3m2oR8w1mOpLzFr1r/4qChnhFAZBjP4qaCoQMRVqdmzXQNHz3vOefwBbpPD4zsfM8RWuZmSBQaHZqVkPJrI5JJkUu+q/4iS+d74adftHdzLebyR5Mw8AT14/O8jJG9lyek8Th6/LmTJqGWP6kkUy3fBz8VXo6dLxedK6ahMYFpPWjwa3N5iSDb8eTakXQ+YFRUwJu8dJYiqIXFVdKBMIGEDZ3V/SAeQa0/KS/Wy3R5c8yKPbrysSOntWgBa6ltsg7ld/udK4qCdhIrHS8A3e4Ag4T+bJyXzBTD/0Qw4+scTdtgFx2DdUFEBtuQ2tnEPgocdsH5gGFd8D2HEU780muhoLltyWzxmFo1jAwM1CWSUnccAR+Of6nL73sg6oyg/0/4ndFLsqN6JSJ7cmDAtak0Y8ggY3Xt7yna2Eu23bKBF0cTOSDMTFbHVHePnqV3QE7FM4qK6Aw+qBzkmzwKgxkCVD4nj8tGR6YRbuNFKhjZj++Ze4ER6vT7VZLjkBu2znsbCYQK5z6eexunnpaI3CALliTlBs20XS3L0XK3VqVqrc3V/OkDOnSxFQF9r+G0BpIGXFVI2wu5nue11iCUY84a85DZUpTsvmiedExLifcT7PWNBsodBDiqST3kFk1Y+Pj8LFE0WGDDR7OFnOiyh0CoME6wlooMk0BAJgwNeqDAAk8s3mD5YGAkxFgPauvsBn3UTAh2UfFXplBDbkJQAFqiJRR8PhTf9wC9e3QsGtgZ7pY8fuuLfaxILWQIkFoAe9ALmgLf/PsNgMT+nCW6sK2k1wWFspoSpsWAT+J1iIt+uCMHirwHPE9SNasdnC+WeTrCXvAeRuAQXIoHK5lVJsAviW0XfxgaT5S40ZPoY5EGviv0EF2oIYn/DtRNkRK6SCKaQkgoKSFAd4TQ16YyCH1YssV3tnNhzepJgi1UVfqQC+zFJmYCP72U5CKaLj4veEDfGKYnAQIJujUR2LHUCwFf/ghVjkMZfIPSPT0JgdFUhB8bJzi+Qs1N/DXCeWJi4KPEmt9jt/cgJFWyxVDjKEsvHNwTeVnE0hV6r+iypv7zSphWnSj/ERwKIS1VcoDMBvFU0KmpjjW4YNZwhBbgKB2NgYblVnBekgLfr/oi6EDYH6apreOMTXA6iE1ctcCMJ/EUDwYeVmJGDDw5DO+TTKesVxJtVQ92g5swf+ySMVrASvnW1zLcSEQYUKcrfaW4SXbHlGk2DkRZhL5QbO2RxdlE5yzGaAk7kalGEd9Qg7uosqLe1u6NjI9ikxSEd/1G4uTJ3IuLBr5J8RfMFt57WruW7CnYt4MAGRF+e0slaoZ+C1C5Ooaj2n+79rDBfCXqs6PTOEwRIfwez3weqfh9dxhitqEJj3GejuuACImi1Ex20w2RGPYK7Y1GjQQdsOkMRpnfq7qxrzl0AITfdB6glc1O0aI0SPqxbpf1++ujLgeK4uAI+NVkIxfQSD5ng50zXmw3GngrEsvDtGn2O1FWy8Ss46X/81qOX0/8rcfr/Ck/6eq7jx+gx7mJGjPvYI4/KhU7HZ/FD0AOM6DbO2BeecvF99z3ohdeZ2Hbb5NWpj3uh5pHsQWA8hDzzdNY0vkVXJbwcAT0S4BrUWEYfdqRkS+MoRc6mIG4oNMB7fbRQ5SKA1FBo0MDweb4+NOhNOuHkKe4XVo4OPFyDWpdyTYVd3DSMzDSTGG8drs9ysdaywexIzmauySZjGYZLEGmebb3znZVgFBANPkk7DC45qhqKx5fhDRsqNjYBNRct5BE5XmEUWo9gDaQMnRibdH7nZYohaE1RY0E81VJZhac5sp8eoTxXV00KfJk8kfIiprYp24FQIfAmJr5GXTVvUobR7qwa4EaTHeHDA9TfWOxrnCm9wE5mmYfHDSKFjA2I3ghwwYD9rOeE1DNkpHrw7UCHCadoz251pSxQmC4BhFOT3gUEeyTDqR5/RKx3LbItiKOu5tzhMNbATMpPMf6sjN6ximB3AfqV5ts9JN+Wlxqqj4xwhu6OFWBGo1caCKhgF/U+n+Pr9erA04SfLla3UkDkeWwYiSAcL1h7y3vcTgy39hf5xRxVoPLy1QFoK13waCicIJjAXBmqmLUlyeIuGl1Yc7NKUDveMmVZAf3/35o/FNsAIZNB+IPsoYR9mQZAmLAfzIUF/4z+Spr5Fxdcgs6vEzNPAWIPTGv/9pvWedCVhmFnOKbBJoOOg48MNJESdyPnkOAweRZwxCg/SKdTcmczAdSdMQgZ//5IwWEOkLy3k+0aRsYZviYekbTXIUTpnKKYQWRmEzxi1VKpQb1mARtr85BUK8fV6euTSJPfoQfjfanUOtm4gV6gAnlOAUhT9ruO93h0J7KDWduE82BTiOUB9f/n8dgW011/gsGClav3tXTs1ALGR5U+TjzuPmGOvRN2wNhRXjcMIma0Yy1wf1mywRyVKyEzHM1yujMznSZ0LmMUdqSPLuItEqfmB/zdZeudz3yRygs6vHSrS9raVf38lXsOomUp2LNIXQgkZtbW7Rg7xmnfJVNJbusyT6BBcvPmdwZsH4kh4JTK3kcfC8zPDiQz8WwLQnp9eQvNhzQv0XhUAnYHtRVcXt16aPJDlt8yhFK6suNKeqIHG5DooHZnF96NyQ+aTIE92VPMwcx87+CtR4i774ORBIjTrXQLkj9VjuVpeNGgu7Cc8nU2S4uNe7XHFDKQ98DjCp02eaf2FujMRpKpTz/bMdVl+Mt1T9IN7djUrueu1k0aw5Ml4r4e4h56CT2SrYY7w6T+ejmwvlh6vx/ttXJBBg9PppMlCEFjk5gOQ81TeNcC54wOJ6wwnK4J3XVyjkuNBC/oy1noBYr+TbggrcmfONTge4s49N6rc5ZPn79pjp2uC7KxCwjCKfQzDbmXkAXwKqa5wSiUoJmkshneGneTlqfGylQ0cmY4N9r71mjIz+lqz9SfzFJndoU7ESO6OiMdm7O44U5lFFC3dmsRtSmOLAHSOr7O3xFfkyEjjyhe3I797890M9TKIysqF6AgHxdc0n+QVswp41By00RU6kObUG+0Myn9iMJd/jfBG9xg3ISGSLvt0L/C0Pjb2uj/mLpwoUwktfKJ9Aum8chMnFUOAlQ67Q6ODt3QJ9PQPMPUDxoAMA4MA3lQaY75oWkO8AiJATsWZxYexbzsxk0WRVyE49Ewp1Lr41M6D5dwRiU7uV8P5TGl3FnCJGIG3aiU047djLguRN5PdfpJdBWFuQXHkAX45KVYnDNAi+YfipWptXefo5KexR+HZRCOq4jVF+aTYiDbA6gqXdD/RJe4nkC9/19tQiixuAEaDI4/bOztpM+ldgavGJtXsDpnmGOFlWlcFmn0wvEDpN+1IAzC1LI8f6Vb68S+YCkJyuMHWi7Sk7powX+OR72ryvBogy9o7TL+QL1BG6R8hqA6UYYkinCBUGBzkbCoj7kaXe6HFgqqDH506byOFCV2B2uvNg97lX7DDB6JCx7GDcEYwTFvOJ0kctJXVHJykNB7Fk0TiO0/nK/UGRRdMDzA4guVrn36yJGGclOKDpS909GwvNQ5sStmokvfA5LdXAP1vFJ6UplXeN4NqB01WQYiFnWCYVq0hSDYceEWDRFrkiatz1q+riKCKqAldBMLRglBSdYFUg540gZD5hb5OxfcCQleDh2uwQK6s9P2QkwB3AHAnh2QQr4+2zNQLaGmPisItmnxSYbNdJ3qj8cknEt6tQu1oFrq/tuIHNYui/8h9uuS28dsafZrrpvM2Z9d5ytJkLq2a9oYzDiNGlhEswjVqi2Q7x8mgRqzAS2BwIWrI776EZRG1EeukONLe60gjn+SMNAWtR4clkpeKko7uHi2z8M87o1KAxLfbrG3Z4sc/yDQa/RW0J4oJUZl9RxJDPADV0gRFVLWEI/qal4D4kSbpdpsfvj3TKW5UUrBhkiI3SrZOMxjKi1rMwSkTOZTYrSc4STqznQk6JxBGws/aag4X7wUq7ksToSaht0WLtERrRss5BBdYeX3oI/pANH4GVOj58phPxOiNIJ8S7FnxtXWxnMwoUzCCc0l0ff8qibk6eAnSY6pFIZ626kla7pKd5sxpaF5OShaftvEwi2k0Kt+emUrPNZ1mvQsJ8LVF16I9+ip9qgUgLGsWTZr77/NuJwxrrultADU+iUDYZzeFgEhiw0Mp6uMLi0phB5PapeR9ATxQc5BiQwf+HtiK41WM6YmClVOpcjuFBazwXzKHKpsynbDDDNpgqmpx2oOV9WJQIZiDTrMYxb9UJ1xSEOCblljZqKSIfWR8rXQEIoWgKncckNkuIU3ehMuD4FjAgluFVhWTGKplPeENCvcQGg4a0K+WYbBjnjRKxi2iexqCu0fzvcispk5OTUHt0d0MbXR3wpd35Q7g3hVwWzcfjhzKQHsASLZRCLLPzT2JSrDTn2CWLVjWXrFglybGUHM03STBTx9CPlurWqEUyZepEyZLS5Xt0SjyYRJwEc6EBHnDJXaZ8HuAgbam2shIP6xYWWXMPLlEaedsaLbWe0t8hvc8KuSF9y9IdnIF5a7jnvnghQyw4mlDnu5I2KLVbMSWfOz44l9n3o9CluNfSIyHco6xr1BrSRA79ISAR02M1PmbfiX4KeBwoP4DtFhMkEtBj2kAX+lIIxQYIi8dhljJsLY6Vaui14ej8tjdZZSp0eHL6NtkUpyG7xyibo4mrrYslhkvT5u8yOqLY8DiNALarJLsfrUk3k+SlJ6g4q0GdXOCTmLiOENgDhtpfVUGZpqftIl5U5f85wk7zIpMTVDV2GRagqb5iTuKvmcJK8s7cS20fZ69IOz2icuNduk/xsdf3BtKSIxO9lO0hN1qjZOljs+pOhsDOagYTqSvFkchLuJPeZ8/JyT03bNsfs0mvjTzmN+tHDVPHV2gDmzrpp/Nwi1V/6/UqKG56ep+p9gQoCzP6H/yzFh/wxBdao39s0p6Q6bF4NTE3QTd1VRpmuO87Bw3RkzIK3yDrK4O+bgFn1gTwoe++A3vNrUOICKlw85Z5gksi6JFGnGzxVSW35WTOUL3VC2cjbuu8IXXSdf0Ti6fJURo4Bs4MvjgUQQguatbuk4S9Gtf6IMcxPkhHoZvtCbkzNlqKwLqTAOCNj0cH+45c0eRVPgG05h+zZOyYMJzdToPmA5kgTM838DHRZID9MGwUTzdckDQrGFA/72NSqm4Z2aR5QTHHduKcLEzoZleujocfBuGRx4RxdaV+NjhyM8tGWyzZECoMK4rt46+yOHiR0tVh5cPzB6bCe4f3VsBczc701J9XsWL3+8w2KdmnDH97CRJiPmcZIO98TQhM49LVXLOedEty0+ZWUrcvQElRNXfCB2xrCJvRJeCt5Gv0/foTN4dd92K7mngzR0yAkgIa+YQ7k7UHSHVjo+Ttv2OAyn4NNYwU7oQY5gE6jBEZAqjrAD78wRIDoS9jncZfpP1J5c3sWC4KTHuS9OGhOOLijEuZTSmiNFhLjIqU5F4YH3xsGpwzZf+V6VXAr7sM7S7u9w645aU+Ss5bUF9xDb1j4a64fKscu9O7X+0PzM5iuVyLCKiJxRtuTohFyk6B/nj8bf37OPnVAOp/bV2B/3oPDQc1JiJYdfbplFN1JXs+U3rY2uXxYJ+CrVcuzJD9jA+WXVGl30a5XkG0j5RFxsHRVaLkDeziVg5bmEc7ej2PLuuH5HhigGiEp61mnBoIMXvYwTInVGJByzoMeC/0jlKbye6BSnEK67t/pVbswVs7yfnRmp7Mn2d2qE+KfB5MOieeu0twCITDdfK0uv5etlEsgeFjIC8YKDLKccTBjWAEI+jHe69dHOd7wu2qv19P/NSc23b0YHYV1DoXHoq5Y5ViHWfB9YOwehMLSZjm1kQbl1vuuOR48qt811QrCorzjq3FvqTY/CKWbrr7ZXvx3iaL2gI7Lk6nn/PFJ+pprgYC17h+v9+kDr6OI/iHOplLMOQV6gpo7+FkN7NmYtrH+5IBwS8wV4/brrbevY76g5iTLe/3Q4teD33erBsXY9GH9Kfnj+6uMLNx1fD9x17cZfvxn/GjDun1ijDduvE1vidHXl1BBu4b8y1L7Oa7qfN48w305TY4ydLDvIHW5edEvXtRfSxZfx9GRM19c/rEtxw+k+XD5obxJ7LZ/LBDQSSAUs9NCTN+0ATXRpBmHeFAog7AD1OcbF2Dnwxfz4pz+gf5O15Wbui9Ol9LcsfMRaiNwhgrdpcn4XQfzdCFMuGcfz0Y//RXUrYOvHMd5lGWTgoTgMf5u9C9f5MFzbt/9LIV/s2wJSfYga05g41hz0w4A4aVwfDqrSfb+EMyDJRmEesoFGQQhQnVe/cu3XPsibR3fwGUpdJR6uNRMoFe6pTAnPHzZeIlvGlRSZRCO/bE6bNlYgSFlLc1NxS/icTau17GNSbMqtOPkFA4t1Fv5UIEMf/6k+VKSV+sqwDHURYOSMOHUODPA1dSv/OMpdcaNQqMi6is+kRqa89sOjYRJN7yPTh9IJ8cN+7xrnTMsyocDl8sBK2+NnPNoXJ1lS6lArNDKMpwCwU7jtwQzEfbVWHpklV9dj3jZfcNGdhrhBUjLBRw7L3KW2uDdrIH4afbZ1RwjxP/UQWmVsZSuuZJxSnK/iVLIopeQhJoLgekssLiDfjlEEBUiY6Iyxo3piK9oSKBtWz398BkJR7RdmTntO24T+BiuJ7duVM8BA6VkigfaKR+ZBfUyBdLeIsR/DRkgAGTlU7yuQQjo08deWdNcv3rtZfvG21azLeIM7OO8btShvss9FK/MLPJuS1Cu0oCQAc+BYtz55oMt9yePZbMOrDh+HNV6Vw9hJVtkpwXXxpPyQslN4jxx1qb+tyw1r3VR+JA7gWmPtKuO9VRRWB37NPuSC0NV+6bOM4PL8xO+SM1o0/MoQVxdtN2TqMH0WwLs/ytbYtZ3OVDcIo0ldkG8jBGeVy9eQxnFSKgIHjZ4Gyfaxyb5O/taDvTKYIsPntWc2lCOY+ZZo+Cin0V1MvEMukdYhhCezUG3vgfAyRK/M5pCTOUJWGMmcu4IYg1BKW7z8ovEJTyKAGtJ9FxsS7usLxrpkXD2jEIeHY8Pt9JKFCuRnCXdM4LC2zRR4IikM+DqFSP4A+kpR44HVd4htoJIwX2/0bf3Fnl36gMQphS2VqhwJL6qBIOGBVK0P3UcG+PlCfnhpM7gH96yOHhjZnIVdL2e36U8fGGr9kk501/kUDnrRq2nEIJ01L8psjMpTBUAU7Wgdcf4x3ITIB8ECtXME4xITQLEB32QUIcBPAAAaObsU06iwdULJi9TVKKcXwJkw1e3N32XhgEx5nMfxE4fx2fKrddTuGwQYL+KrcgxCVN5SZHqvEjkxDJvsVw/GSq4vemAzq/SUZOzapT9JECbDyQKuGNkrUT8AoHuVE750RlqcmIa+d/kTeCh+pp87uCx16ujseSW1+7xIJW1GzAHZUSLJQKgGPRtRjdvxpLh6H+wDQN1euTskf0qUNJJHD9WCT1rgL9PBZOZoNP4wPdAPaAqUuYk+vh92bZYroF0qAGZddnGFWzqyou/COTU82YH9drqD+oWJquAfZaYfF6lJG7BkoB9Xi5voriPjKtGhdoNcqg/LWUOMsR3cjV/Xkc4r3uewQqvPcrhvSV7DS/vXoz8fZ96JYeSivpizqR1+qqW6K7ghzzKuga4vcGdFPdjCNUkKZsDrt187GWXyXfH36PExVypZccvE9MI7Q91xcvzZZmfFiKkytpZnI64KLglde/z2IheM3Bd+LugVP1nQ0ScHL4fu6uBw/xNh3coHaLLZOdS92AO7OAOuGcBFXk3YZkctLLXj7g323lcPOovpPpLd8MGNyoeT9xD/rntMRTgkTxoYKScGQffTh1P//magUPgCtwyADbkTNSD2zdEiU7/IXZxk1Ikr5UCpniEku1DtJjm6OpXnJ3II0OrYgvxdWSfRptFP9C4Cp26xbgPxocVGxwMXIl1saCvk663/LuUbKxDJJeNjsQ7P9Y7tASiAypaxQgh0GaLFQQrpcpzCLNfXN9EQmKiLmCSXAEi20+brGbjt0ZCXBF/fLwfg9/GG8AzKPyK6ot6plESnRqmLVUKHrFPS2FCDTNnexrf+FkyAEIkuB83HoymkayJTVlFFkCor9eicI5Hi/vUJBVBfZA2AnIRq1hEDsN2X3slWHLs51wzkbipmZwFCoZAGeZrf6R9vR+KPWdLcamU9XA0KJjV07BnKGHfHCK3lkukVjpv0XRoksuj8YR1n9g+tQvxqQeTZl94lOg5ZlPVvYDGTvr6NXi7VyWVhWOuroyWa7osjCb/fynwnPlVrVzm4YkDVoBR8jP5IRmkiKFLTtcM5NfS0Y9mpGz/aLqVeTBXOGDHlEZ7ICpBmmNM0vWOc/YGYjhXEjhohejycXrcHjzgfN9109AITpjKB4dFLNeNuCkbJvC+nUNRnLaa2+k6ST1p1Gr/a5+HPwgR+iNTLvcr7OjL1XsdgRaeMV5CL4wSKL3CPXzTDzNJq2M2RlE/v1PmXtgIYUOWNjzjQ7jE9H1+Sp/54yuWKRwVKjKzk5hVstURRiMtCzlgMnxHyCZrds+tQKYHolptOkNaR1Cvs9Bnc26+u/YW5prflAtADA/AEycOFb3E6FwXTDbZENcY5U69G089O0Xdo14vOPg+Cfj1qOVmZarzVKStzVUTJCPDBXeYyMHAyINQ40PdeT6dS5r9QWzoETJD7zxAFTUI2UAnPHdg9H3yZcYLOaHZOzyUDh7watxbWBkm2Je43xdpGxNT5jK0HyP9rbrNVrB5x7qWzOmWpd5nAse9w3FtykPaQehrRnjFmkWbtZ0N+XcNvh46tTyD/uWt0Eu3hoeqoUGwdemxko9ouI+vijH376G2LfQUpSSR9SqLOzKnngifPgKLnXAE7J+/0ER8vaCViuE79UTDgG+3popJZXay4Rs83BYv7gZ37IQTrmnQOaLd+l56q8r0H+76K8z44mc6Etogh7UQdCt9hgAYpE7ya4wnrOt70diYXLGGGwiarxgWMBh39tLpffQWoV6qGGupQn3cjaU2hoagH5lcZiTyG8HEfRq6lFItQApz/uqCArbRPIemTnGkokJ181z9QPZOwRVK6uSM98l6n1PcTX/IYPElrWUK5tA2SbumGbYO3SXwjuzBLje7TQ2Br5+BB5RA0prf/YLbL6Z7w6rh47sbQx8YrBAp7QSQ/gX/1V7YTKssP7Spz/Nzk9XgXLduWd66B+MxKIpjHE7zYP/tnx7RA3F2ft/3MM8H5DrAmoa7U7gvS+aOgZ51yLcqrobKu6ZhVCbVqpcjhySnS+YOO0UAF9nR/Wy8bl2mEU/68HaaZ5EshP5787HxUuV4nOB3k6g7HLxwM4xyQK3BPH054mP4HWMHj0TBZcjxT61HJqRZZis0kABpjDY2es+5lNY8in720MkpJkfpogv0/vwxJ0P27uEDkEOkJhg7ZK055RTAE2L9WXCUpHJ+p0McvJMPCtEImk//Qgd+j0PHsS+ZpLiQuoXDHrmt2zPBlLbWYEK07v1sEDPFiWRVhwfuveR6qCmkFlqNlfw2F+1MWIcnfsQe9pWllmWNfnh8ldlU+irIU4VueZGqqhglQdD8w/S8AakhR0f0VuERvSF8qpmnFmJJtr4nHH4PirnWO3F5/+v9XQJsnV17aE0OxwIC+OWGkZp/b+qQL2en8YqNMCu/KPLrI8tgR1PUXn31eLVTBSqUIpE3GIRCwBoaU5ijr9RD2BJLlagH2l+36E8+kiUfUPjMNJW0AGXD1x5cvePFQX3hf9+V9vqprHSpd5tKHXUJXzWT9RAA3cYVt+iSdvgoo7ldZaatiiEwky+LhRj5ASWQAGmdx/u5H+5LzoZNm4QXaGZe2u77OVjj73v8SgnJMkbdXXDivCBt8S4x4OhJy0FnugUhlIJKb5GJPy6FHJ9J74fhJWzKcvEx5mQGdE13qaKzv329RsibL/169+Oi96vxnPLdB3Lj6i4AtKq31p6f/g2Twl85IUcrs47fvhx6u0IwL1eIV9KF0du7ibC1qUgSv7GOoE7yCzKEiBAPAd4JxFpn+1vEU73w6Bn4LR25nz+px10eyni0eAVCzw8QnDDadPjxMluG0zUJP8s+QmUL7xdEVjdWaRfx08gjwY+RUlIhZ6fFtZRR5rFEuQqr0l7dph8enw8z3ooVHFFAzah6C9k4gm6gpR/fDH7KBeG1FevD3aWkoxAmzeSTF+itPFaHuJegkTjVt4PsxBWKUkH2VqLhA81skIJWDRljcWajkZVPBNeJsyusdz3ha4WMwY07STNaZp5sayZWXlq++8dSrEJQ4SJPCCGp0H4+0gZxmjo7SsHnXj8ACQ2GyIW39Ngi4nZO10rFQkiGFpmmGuq4K0tCZrmjhqeqVNMWgLmTTMQy4m15x6+DkINcKGGa19IzaKtz1+3QORU737ffoCR1AubvATEKd/K3/RWlwKWTq09DkSxgI/iWexdTLsTRMGzxQjwcL1N3B0f96l0DTW4jx6+6TGbfGUj6knXnDCP16ZjpB3Mj8MFEoa3o4Dbb6bn4PH14NIzJhR3LUgPxPeaSZamL2R3YZEWa4dXB+eqU2jVyltk4D2dSq7Bd4IHt1Iwnw0SRmLoTUtas2xHLTvc5DdZbOO+IG2cD1Zp+f9Yw/i6SXnd5UG1XevlNkbfV/fsbE26MDn32xkIVWEGV7ql5NiWvoRfqf+QiXeMInS5WL5HgWD+FgacfkdbOxXmCcYIAqTTmVQZHrbBXLrPNU2Jj6ZgzyOJhSW+mdUQuDdSbrLZKNjf9Be9M9Vmarex9smkQZtu2Zd/7T0i221aUsrZtXCmXAQCt8JCQIO/tmunu0wSA34TjNsH9sXsNsZXih+ryw2mFbK7/P9jD2gvNtFtHEpYrZQvW3tXU3ICohiOXc5VEdxXUv5vtfXKZcr63oQ5cZ7PfO49q5XN7A5H7zOgqWjFZJI8ZSqFrLqz/6cRdRqCBetIW0VmTOfxWKyiIZzH0VH3uTCcYfp21pnydq+EnkkkgY91UlmFbdW7vOvXxl3n2U/kLVh8R7PwN3kzw6EQR6Lz7eZH1RM//moR+izeQog3ukQp6Vu5g1AfeR5scw5tGVOB7z9z+3z1ch1ZpOepWhXHVgnWBRMQ2hbQwnKMxnO5a8feviJWWzcflT8djOe2/RJjrGAc0Z65/dKI7s1nf4GVpAI4ikfXftmO2uZWh1pIBHB+RsT9l6anEwlJYG+ppVHQd63dCTbfOVdEEKcR70rIStGx969Hu+KxrYeg6zfL/QxFPE02V1xr1jAqwGQqYA8nzk3IARpJEdYHhIZI0wGSkQ0avT0rv+xDKSTKjxhQrx+Nxf4D3lY8kNCjUTmdKEZJnSSrX9NZzvDzAJGlQxOgO5vwmtGvFySa98YjHP1pjfAljqIY5R5x6h19nSE4DV2aTAii4reorupUxD6LzzDd8Y1Z9AWqFsszHOJUn7UwRyWfKo9y/gO510pbLoz98YZ0+kRJB0AfqgQT0bGVoaO6eCo81xeNI3CORBlu40AAuwAYWL4S/Ttf7ZrDrn6jwtHKzpYPfoHoUbTA5EJ73UfnreoyqafJZ/rSvE4cPdoEt2i1hw5RzHcmOBOLEQmRRMO2svBlmRPAFhveXJh+48ze3ogpk/7wIeFsMMLvaaR7eVRWuGnoFwNrN9zJhvKzFW3bZ+rly+7Fp7yhm9utvQumkOq26Wlql5wpYdMzTVI1SsPqHWM2MvBAgmkW5nOtCL/8tluPZaXZ1TgEOFhIOYpmhIm+B9LD+yWJUPaDHiuISK5muMnE+DGZEdpsUtIV2LhDSq6++pNLnNQBnXJTtHtkFHdQ6/pjdB0gxH3omJlUkYXT67Hqacq5xX447il8JRrs4sMdb+0eYbQDOrTOmlmccjWD/vK22h1+DYpGpAnanzCgArxrEbbwakVi9ZJT2E0nHuGei8aqgIuF6hEQjlhdz7odMAzjzUEjMJhMEMhBeZkVN++z0YoNTTUO1tVIRf5w4/bzekgKGut0BRGU82J1CVLg5ou6NMpTZVYgHqokodqsI7gX4mgcYgwZNs+Q+rBvdEyV0u+WqY80q5JYCLNTnqOzToesn+2s7QvHkDJzrhxmkpwa7bj2X55Y8sOstnOTMm/z4KXOC1sdGvtlbmwuDWGLSnb81K1CRpJHREK0L0hPwBCWATMRLnNyIAM1B0vm8AUu7vvEefLHZhtCWuLtLySn5Ru9XkVnUfHELbqsLABc0LxQfeemEscQYz0+6lZPZ6YNte9uWnoLa/1Vc93kFrdY+zf5lnh7eIcjb4dVIJzlZMj/l34uERCl+32M2stnMHigI8j882RNV2/WmQgki4uUhcU0X6llw3rDw2sbqnEdnzyrk1Gm3DQl1nxI+hQZmD6VLHeTlDwNE8SqoaDzwoFR+P0N1skI2dfZ0S4rmAta7hD9mSpE/d3g7zNdWSEVmD6M/Getl6FzyTrCHXnl64vsxIN+Ni5lI7d/eC8ekYi0c72x9Ped3VrtizbV5Xc33dLQkBe9PCdAb+tX4HWQo6KaPNYjb5MbDkflCC3vBARNWETcx8qVxVctPPo6UQek6PrR1hQ5716o+HUAsVOu4gRJAb90XBWH0jj7C12U1Ru6cJ/4bBGwdhXHm0ZMDVi6/DVOushl/ub6fKZXioPnQxydduGKxljzLMHx/gqWtu0qk0Kcuv59tpfPAZ48XccAgDnTzoc/oWeZrO/JVKq78u/c7fGlQGoZWgYrx6R75mRise3skS/5pVlqdwFrZYHsCNDkZxOUkaX8FvxbY8jENSXHX4WHiiJ1kIBPG5IASN1VHXXCCrTwGQRM9t/KvfPx0uKhpLc43B2mUQk1V8gfyDU+Le0pbFXVwxTBPGu8MyBL6cyv+DKjjkpQ9ZhZEf7XQ90DVDANZxUQjIC+SHYCyG/ibRSya/mB0/4Uy+ovEuOkdHzqcZc6Pxc6lfVlDXiijFXH2RlfJI7wtAAfYB5fQmzB+r4Hfl/bm454gOM6Xpu3/jo1syXNjBYC02Fx1dhjfFIjtKL5KuDrEpcOy6iV3JSNmjLu8DPamVi09+p4Qjo+6GxdUTL6CvqnqTswi7MDkJeqizcnmo82OucAnSb3dji6OsgyStVah3bHBc6hfp203o7SKSNmWVuxR6f8uR9pjOfXJUqGLdjzGFYV/fmg4mv0/c6wba5iG6uJrq5qt1VHoT1Otln0YWCmlytp8ayJZsIb7QS2a/DnghRCOxeQjHpupFtFNk22Jm32fBZWnFFu9GRdT3CTxRU3l86wMWMkfcFzV0Agh3npJwlbnaQ5d96i03Q7xNbqkFU4Oc66RiC9rPmtk8/C3kA6RxDh43BSuFzXylk0OzIgJOxlNYq8+HJ1gB4uz885VPinQklISWBcX8MwnXI8uo6LNuOHfYNo2KeXy6FPyxNAU9mvxEHNafnokFnjHQS+yEEy4CKgE8FVC5ZbxEO7PHPrS/ZsklMkWgmgueBoNx6sBAe1tGkSg5k6nhAadRWDTeg70uSQ8zYFq8pFoRg9RmrGu8gz6e0J56MyQfYVJU4CIOlCVRrkVhG6GHx4RSLX0BZOFTj4U1Z0F7P6HbGUULSEv88zea4kr6gXvp96Hij2FjfREh9YpzW0forQLod9qSE4xP25KAXOzJUIiQnwZmWYCecPgEF0xD2HF8F11NwKf7UvEPjC4kxo23qxyQHkKulqxlQuTGNjsrJKqfDfrDpsan7sanwpROqOApLcifLgIXHn+XYI/YpT/mAUMfGP9EYRO0S/6QbEC+ZlhTRa4JDbRsp1jscFu0Z2WYb8meDd06vAMyptdTuXrJ++g2y5/Ujy5HjK9Hxk32KPo0wExkyMtUwzHsF1nq7v37dww9QXzXFFfruU6LrZc8+oyt6lmfs/yv1FIW8ubXLshJ06q9mm3+kWqJljPJ8iUgZp4Vh0vBj/iw+NLl/Eq6uOGUh/V7WpZ+V9/7+Tx/RevIWjyC3MTf+dEkVxyFPUDWs5yidaTzsmDXwCk4AAyswSvmEm9/JldkRnfY41NnSW9OO4XBNZ0uDb3wNdUWnyvVA8HfKBE=","base64")).toString()),KO)});var sle=w((Zwt,nle)=>{var qO=Symbol("arg flag"),Dn=class extends Error{constructor(e,t){super(e),this.name="ArgError",this.code=t,Object.setPrototypeOf(this,Dn.prototype)}};function aE(r,{argv:e=process.argv.slice(2),permissive:t=!1,stopAtPositional:i=!1}={}){if(!r)throw new Dn("argument specification object is required","ARG_CONFIG_NO_SPEC");let n={_:[]},s={},o={};for(let a of Object.keys(r)){if(!a)throw new Dn("argument key cannot be an empty string","ARG_CONFIG_EMPTY_KEY");if(a[0]!=="-")throw new Dn(`argument key must start with '-' but found: '${a}'`,"ARG_CONFIG_NONOPT_KEY");if(a.length===1)throw new Dn(`argument key must have a name; singular '-' keys are not allowed: ${a}`,"ARG_CONFIG_NONAME_KEY");if(typeof r[a]=="string"){s[a]=r[a];continue}let l=r[a],c=!1;if(Array.isArray(l)&&l.length===1&&typeof l[0]=="function"){let[u]=l;l=(g,f,h=[])=>(h.push(u(g,f,h[h.length-1])),h),c=u===Boolean||u[qO]===!0}else if(typeof l=="function")c=l===Boolean||l[qO]===!0;else throw new Dn(`type missing or not a function or valid array type: ${a}`,"ARG_CONFIG_VAD_TYPE");if(a[1]!=="-"&&a.length>2)throw new Dn(`short argument keys (with a single hyphen) must have only one character: ${a}`,"ARG_CONFIG_SHORTOPT_TOOLONG");o[a]=[l,c]}for(let a=0,l=e.length;a<l;a++){let c=e[a];if(i&&n._.length>0){n._=n._.concat(e.slice(a));break}if(c==="--"){n._=n._.concat(e.slice(a+1));break}if(c.length>1&&c[0]==="-"){let u=c[1]==="-"||c.length===2?[c]:c.slice(1).split("").map(g=>`-${g}`);for(let g=0;g<u.length;g++){let f=u[g],[h,p]=f[1]==="-"?f.split(/=(.*)/,2):[f,void 0],C=h;for(;C in s;)C=s[C];if(!(C in o))if(t){n._.push(f);continue}else throw new Dn(`unknown or unexpected option: ${h}`,"ARG_UNKNOWN_OPTION");let[y,B]=o[C];if(!B&&g+1<u.length)throw new Dn(`option requires argument (but was followed by another short argument): ${h}`,"ARG_MISSING_REQUIRED_SHORTARG");if(B)n[C]=y(!0,C,n[C]);else if(p===void 0){if(e.length<a+2||e[a+1].length>1&&e[a+1][0]==="-"&&!(e[a+1].match(/^-?\d*(\.(?=\d))?\d*$/)&&(y===Number||typeof BigInt<"u"&&y===BigInt))){let v=h===C?"":` (alias for ${C})`;throw new Dn(`option requires argument: ${h}${v}`,"ARG_MISSING_REQUIRED_LONGARG")}n[C]=y(e[a+1],C,n[C]),++a}else n[C]=y(p,C,n[C])}}else n._.push(c)}return n}aE.flag=r=>(r[qO]=!0,r);aE.COUNT=aE.flag((r,e,t)=>(t||0)+1);aE.ArgError=Dn;nle.exports=aE});var dle=w((vBt,ple)=>{var VO;ple.exports=()=>(typeof VO>"u"&&(VO=J("zlib").brotliDecompressSync(Buffer.from("W5kPIYpg48AbxovAo6Ki9UqAdYFNhtrhW50o/DNZnL7FAgO3VV+v5JUhfDgD22bzHHmpX6bq33k5PSsNmKyZ0snf7NgpVW4nDecTIpY2IgjAYOGiTEAR3XyFRguCgBIvOAyCQP6cmvsvm0nDX8HupPU1yob1PnD77ycZplMCUeqsqi0Tpf7x6h6QQqxQZctEze1ZpiOY1HKDRNaY99+YqlLxPK9c65vu/Rm11CZ5qJRNOMpcrgG/ToQCm1upWtkM5wkczJR/s5g/QXp8/Hrf7DUjAbogYc5SrCC3+FulIFUpina6T3cT82YGAgazKGExH99h6fFpze3u+x7GcQWnIrC7wTc+o4lknMtiukiZwgy7slkqq5b/Sk1NoBEwwC4xpn/bt+MUI7uenp35SU8OISDoMqBsFRITNBTEnBaNPyU2CkeHpftj5j877Dq7vkKAwBbPJNK/DV/7Jt00bvO929ggQBJCgExtb5/vj5U9ptLDs3uZ/BCooBOEvYDEfdQI9jtteXtufCDO6eWd9OE7lEw/OI8fFuyILWN8YbjL/lEflMlAbnsD+WC/8qB/Fg9ES/5dSAf0Y4oVPNwUr5fUeHeBzy6DkZ+cIhNm9HTUiOsk/dU+5Rzy5yCJVPV74UAN28iZ/zyAGsgxlg6ItYF9/14GCentU2zV6qHsLpJ3EAi/fRm0YaSd3Zr5jDZFcXcwQ/rT2+nWAlzjftCK1m8qaOP/jIsJmFd+7FNEDWmctszZphEY5F6KQrpAM/m+hojY+LjjxKDN3FIC2dBd2m+L5Gig/uswRyut92pJfWUVtuAUmFc54HuwaP6si+K8EP0bYxfjynMOATc4EgbPud+sNjP8y5To6shFnbEFWDsFvEwLhRF11t97JuIcSER3BdAXhJP2CEj469kUrvRjXOImO+BMqkOs9yguYNiBUK8O15SgGw7BbaQ14v9wtjo/r8TLhS5eSqqMOAmY13Rho9wW9AGftve9MYIT5KAy90kY9YC/LCf/FqxOozb7/wf733/dkSiIl9f0gorefmQVlVixCq3ESTd9O/uqDarW592vMAV37TKWb2XlmBaHCnV+1YyuCt2P6iwFflx4wcuWzE5v9VxgoPHe6L6iD9NyiXJf7IVihmgxabqErx+SQGh0XoUGTzJ8F3b2Aurqg9kGfY2DA0sC/DU8Qmv8gzEoYFOn96KhWsxCpNn7omz+uIrckNmNKWxGqO/4Nl6QMhfke3VTitBQ9KbgLHpefDYPydV4P7/eAwkOoHwBXfbwoefXNiFR+G+efDhY7np0GcuTKXVrV0Okp4yoyfwFlWdmWS5ABaKVeAiUyC3LeJTrSyQ7OjivSXHRAdlMJILoWFT1G3HYuwvN5GsSyPfC+uqnZXomafdrtFcqcJsfWjlLk7b1IZF96rSECbGw8mzWdgSdBeQlbfnnw75IZ5hoVxvyqoEEByWQA5O5jeql0MOyh0cpn/s1zB1V9I+/Pg+L+4SOWyEAo3ckDrc6rKsvNx8g9hVT+7eoH3sppmDcpdFiD08B2r5ou7EuJ69VKO1xVET3dyrxNn4nvc7Q6bs64A9ZUNSFfaTBJghq4CFJPJiBR8BGjz7i0QfJosa7opAdeGt3NgQx1774eZu8ovEskXWWUnQO4eqcTT1/h3QhJO4vW76DnoPW2eFVed0J+Ul8wCXvRTMQ6trZLJqQUEiEuZpVKdPkbxu/LUVf0m5NUtyTKdUmWiJ446rlQpLPO8Na93KA6rJf8ndG6nPecgBkD000SwW4nECwwM0e/W+Ka4URhR7omhoQooMwavOcyYibmuXL+GjZKnV2WoUG8n4UdFTVpsp06fOwdbIj0uOwdzaE86cBQDwNskPzoa3gJMkbkiujdxlVof0wx21Y/84tDKv0aaNKfSfJYvdPtDvGXN5xU8NIJ4nrxVGTzRPkpZycJEP2CaW51Sf4AE8ewsm7OZpaoakx+2p037FDTVXXK1mgw6o8Kl5+O00BV/UZEBNNWXwHshtuQauwQCC0LNWuP1GftZecI++qkJRidl8skMB/Gc5v0Wx4voHRPF9QHE2CaGYpaD+naO1FFCXujrWkU6NEcJIqfHLCnQOl1OchQLpWnEVChsvr4x4V49vTVTCuUVpy+NWJ0iJOHSTlmisx7loj/C81JG4PduUk8iBcBsVCg/GQruZHiVg3aiRReIyl72VAdP+A86sGDQJfwAAOJoJLNFtxi7MunQCpU8IDDSn50c6bfSqhlyDPGYajBqUFGHDD5EhQqqr9epscgBTVX+DIMc9lAW08Z/MdAouOMbsP7ctx2p2cJxCBZxOZXKjIN1v75jHXO1R53IMZJiYv1leveQpajxiMxMoSNfVb8rIHtflTL9VcjUs57rIQ9ZnJB7WJ1CgdSw2MDhsHEryCzas1SmqIujRlaJ1OtKpQV2ul3SOe9IjTEp1vE69YZr4Mqxb/lH6exmHLqydrc+Eba1ouo14hbvkpGQDRcbngCYo9xhGqPUr+DCMkBqcxH2dwiuVuyM8vq9XCCLcvHct7HwOvns9Gu1+FVcLTZMJfzVeTmApOfEss1Pr32bAJlnaqUfHRjpjpeeeExYpCgAqROnCAb2VKxBpISrD7rc4gh/vgSjS6MFiS9lkCQYI8IgcOf2b0liExKeR/1pL/7mW6uHSmKMxqUhDmPfIY/TcBgxUkvRhQmdU6Do/jWJhPJEAoObcuXvs2grUvg4A4rRfVEvEe6WXL73akZSOH2MT5Wja2ujko9+HGyqNVkMD3S0OZocPi6718Flz8in2xM174kRRzh4r2MUFRYTfDzE3IQFsRuknXDktd3xmmSAnTZanOyH+TSFytUZ082jSUXC9+XKvvvh3q2+n14yev9gtJFcjngWo0pyOQbVtBNfX8+qzR7NxlapjnbKqIPgsJylB3KYj4dfA6lsOXUTB88rmDzKhN0uORGuYxd3PwU408STq4qpY7D85JuXPWPklWfVwbo/D6T0YebVnFzKuUA6GEPlzXYo0ynbOLg6OnRMNbWtkjUK3Q0kd32C6WW07LVOMi3einWdU2uBNc46dq79K/x9U6oGgTme6UOOgJw7njAQ1uWwbmIqRaxZU1gP9C69J9jqudmoxdN09l/OEMmNkwHsasMKg8xOaKtsQZ5WiVGTT87OSGw3k23QeNjegcAacIVdU9UKV92z2qVEUjpZ81bQCttxn4Br9R8by4tIhSzzodGACCjzOaMa2rDkt1D8nK2rdc5WiFXStQXJ/0gH3zgH9gSqrsFwIV91Wff+J/kGDkIQ49qgtOkKAV2Re5sJ0eV3Lr4fGnjKhAAciDSi/f386xtzAVcuOVQNAcIyFsq1fjzOLYwvz4aO5OGceLUoYZe740JSRXGeAlLSnt1fStONlpUTzdnkEbk9hO53gwVDKsBBfGC3kro06GlBNmvRYNHGHThk8l4HuaRfxmZoL6srO1NxgOjNfJC3/YLSAOh+pveh/33ONhspOK3jxOq2wvvsemkuI51d/rfLzM8atvqnNLtW7G+x/np5zujj/4erWgSq2DYYnj7KfJGnL0Mn1Kk2FZ9HHikHTvrsvjHv2eUT0u965DqWg3y7aSYV/D2S5MX13mzjJfAu4T9mmXrLHV3yWR6smK0wKt3WSokusNdUlqHU3NaSKDYSTjT9zWNCQDmIiso0Q5i2HZBNYDmqbMvkbTbzSSXsCZU+jzanlT4Eo7EbSxcIDCXGIkb3TCUhMr67u1aN0Dtq3ScVsWfqkM08312ngWzmG7+wlBvC5DK2MjZsXsBmsUML4F6H3QEsz3j5j/7sXWanSEjDAsUiKWuhBhi5t3MSWKKnSyeMne7BHoD5Qj5kIFt4LGG7uLTmOyJFK1wMwGsooQcBpD5UXUq97eXlIODWCeoV+ZQzlTQ9y5JrsYB923HFsN1brc/Vx0htc1ybk21iR3wRHEBYXx/zp5FlIC3v6T+iyFg6Gr86fLaQB2cwSCiQIr+ds+87jd/Oxv+oK3ec7b+IZkLSIJ3SNNUFqdS+r/Np+KtXYKGh9xMXUksVLx0UPwPpKImousvVy0XHSiaEysxgcHxxToHg11zR3TArwXWrEzKNAJEgRBeHniG65aqrNeuqySoJhFqj5lUGSLr1Nx/SNXi2NgGiGbDMM8p21PuEamvvfbaOOIAromVSOgzqwvwwrAcI8Kp5oCLuzdg7M6hT/Ht026Fr9HNFknuRl4ayiP2VNBtkqwt8x8zBKO8S/8mXNh1cnagfnungH7DAl80rab1oo7tOCkf97p2HFOamvNtC1+s971oE1+TqHbV2OPetDnZwQWxoXFp14UH6SVMsDA8g8XV86F1IYBgJfbWJvY9YqMkCukZ8FEktJSdrv9k5xbJ2+Gyge4Im4UKgKBl6qgfEW1DTQ6BUKri09p24jA1CxtptD12idIPf8guleZlNBtF+Y8bHIj4ztoW1xUcS2/XFcCv8izrLE9WFjTsmERcHm/OtkpX9Qje4vGAL77g29/em07FH5HwLD2u0bgq8xvL/aSlZxG7wVmEu1TELd0eg1sqMcywfZIvbXCUx0yIeIQZ5IJI+AIEoE4Jsmnzq0Ip/JpgKJPGfis2ZPZDOHNnCt1ORzPjBqR8Txo6nFdXtQoOvtnQU0F8j4iGKlro61Y+iZxcYkAQicLs6XCJrymN2a/8Kr1cfbD4irOs3FJvhCSipefnF3rBvEVQaa/xfFCGDEf1U9dPRBYUPpmbeLNAWd8aBanjQ69g2q3jv3iK3Pwg+bkaxD8sV/5WsHcWJ/TkbX6HGT8slEiaxPnMeFRNaaLxvjSEG9VM/hkYF8e7oEc+F6ZxJgCt1c3zvamk5sr75KhtKazmr1L04hrzeQyaBn501ik6sUKKQAoj5Kuqk9iu/oSdJaIoL1FRifxgRCNSO5tC87MdgWIPGakzGHpwTExhn6gBH7uxkenTXSohyFkENlXTdO4tune88SsbgpMkzH3/BP49O991OuYYJJh5fqT7QG1zORuWcbPq3f8U/GOwqOCo1dF9KfMtAfa5JVdvzi6cQaeY9CqcBpqe8PYFeOUa5Mmz3csidwZ42Qdu3mndEah6LuMVCPfUqbHq8sEswxVmfO7i8yvnHwUAZKzWafyIhe+ofBp0ItvJumwapHjBijlgywmYNuUWcixMjbnZtp/OsBdgOdYyXLU1vRZyriUyp+5lvakSQ0oxSzqb306aUnSTltbPaLcMmJtgsObrnAcWa1GYUOohsb8mamDnYaEFLojSMlNwuXrbLMmXntTI/OA4d1smnTX+dGtEyHuFjlrQvAF3fBwVXhGyL5vcKnWWc2ZJWh27DdYMPYY+HbC1fc+fUBdnqvQDuLlz9yAJEf1jUMyGVk8w6UnjlgPv6OzrWAAs04686iOgCMmnhjnsc7iU0PngRExrBeyhbND/WGGXI6D/Tl/c0HcFODkp35M4EAGIPqWlb7/q89PbtYAUsemdZX5mO5LsDC9/6Ju9jOAjl+PtLv85JWC3ZNXno71vRky9TD//gIHY+RQC7teBNLX6gcC67tCgWrsb/P6rI5LqTVMKlzIe2eZWy6y0aQUJ/OE1RDqnDbUvXIbLSUTImdUpXvZ5A6pc3oh8GxYczaHeBNmGfeh3B7nnzxP2Lg36RI6VHKVPiOdD2arF5MahDrZ0LqjTy4UBg71fXNO5xumEkn09ENMEudR6s+snMLRFPnTXETlhqsS7CCdY0yaTwNQtZruhGzTuau8eTqQOWN1iko2Gp0PeECeeQ0UVQDDoFSAWGrIDEJ7fSJ8rNRXFzHL8OZMONGQeGI4cyzMACt4NkMvolP7YpAdodaE/skE2l1wQk0Sg/FLeesyYsL1EYAP/bHUpGGfgFU+MbYIh6Ho5ZDshBRZTMZQZlWsmHcxLB9p37AjqutWflSATBfiEVnBMsRpCGzHyjtSMS+a/EoOVe5us+3P2GmAxyH2EKC978OAXyNYdPJksYqKQw9/E/YdVIn4N2J3heWUjQVs2U6aISESeMXtZUzqWiDCcEVwW0Nmew6nJCrH8mB5d6qqj8OYQ8AhMChBqN2QfJNpbfFVz2y5lh2Yxki+nONaYSITJKFRXsKBsp6fD0jHXNeX3GYZBFkmEBrUdsvWHBqAdrP4cADkxjzC6GyJ79i+ykB5sUDpRtq0JmpMoL8ABb8FrNTv43YIwHvytZ4knFEewPHJcpJbvVlWfpomdwD7cI77dVFNLlY0WWDKSd7QGgRueuvy8bW0OCsKHXOIh/AwUjnMnJLnmKLBNDx3Lq4a0FwBXsfK6EYQXXTxHMQ2TnU2A4jgUnUiA+3KRCIiYUQ7nl5wgW+m8xXi5GpqMXT2s5LxtS67XsCLswKhBB1bYBCelRVLIVOd9R4YpIGrvre+wRpefXQz77qIvXP2EDJ1YhY6EsfJdXRdWbMv1yvI+8vV+9Pn/eXl/Wnx3mqL9ekaORrZ5GPAMOb5GRb4NBcQklEVhZdNcbAvKxwwxGKiSheb4dRwsGFIGkOwNHFCvA33eHe4bphES8BhgHydgFebgsIKdEHl6YGHyw4HDLHYqdTNZjh1HGwYkErry7Hze/Xs7ZLQcpksH0CJTA11b0f2aNLk63FjsScCJh8bmipp3bSob1R1+9LfsXzeYGkDnUThHTa0QIzo1sS7Q/t87a9iYMkINoeDmdSHxYsb+iPtDNccKYwUXD25fyB9HF+stHk+4KC5Gjd6MWW8cLYJ1QEFbSGrKp3lY9ZNBoBUIONnNk3zq3xlwfSLKvbV8DueNko6Z0i7CNT8o0HOOBr/M33kMNePYJc9wnBytou4YB6c8/MvMB67tIZd85xrOsbNOEyiGUBFHWPn64mttnRQWCijSBHMU54wrZHQ9vXVab4IGPcIAyCj0AZzMBLt9ybcY6zJ2mawtHbj9MWxBcxuDXuZ/lODkXKkrvyWi22wDclVS+J2n/fDmraH1DZ+VWnclhm1TjBFOnQrUF1OGxseVlpDKL2wpmN1c2sVLbiQZPiqlqef69fbM+dCZEOd3PE6o2v8MyLpJshbyoJ7M+xznedHs2MDnu9U3/LiePBYXiOrlNnTtXfbXvyGZ+9DKuJNom5gxTZgUxuyjwyD1B9rRIdACJofC3SrinjAOSREOVtovPgR1Wd658LOEmdN2k5BnWeb+PlRRpVvhC6mCpWOfxIjEjwVh1NmNbLltmXbIuGAxaqt45ShDAnSxZfPErh1o8n6XMrkyF1u4yaeTSsr8vqzgzkXMMVSpVidUgwpW8N8UlsL1Tn6CXPG81uwDy9npHESZKtx4BB3Xt66+OlvwmTK8ft/cuCg744RdA00/4Db+cMp4VkaphiQyH3ir5PTNo+mOoqxz9fJgdmDW3zSNMaxdT5jQe2fNcR67LsGLPhYd7rT/OC29cCI7Vgzimr71yJ/9jq8Hbtx9BIDbXw6QjwGGazZv99BlQfdvJRbgGK7+FgmZhkPuLr5DYZeO2wJsn9059hW8xOVpX7ExoVzqfXua5rErRm1YFDyeXRrEmmzy1UPJMadtu9433l8bay+kKiuVhoC05bUyiKmROiKfVAzSq85BSBzYi2qMaWbHMGhjeGZkRACjFsJYvGmn6GD9Xu0CARO9OOrKuzWVrYgoXKZltc9MSFmdvVVILTqRtC5hFnHcbxSxPz1QEzoSgdGszoN6O4dr7phtPlOyyDIqMKEdzjAOXJqnQyNbHT503hlC51FiYTusvEFOA7VcUjLDYlaoCTWaSDevLeYlOn9KMuIoOPVHJhrd9LVVG/QIP1ldBuuLsAzKOK5sjKnH2WN3ePruI27htA0wkJ8nB0T8LpDr86deb8r73fp/bgFMk+aKNVaGAzrHTNtQ1S3jGICpDBXL6WWvAwUJEy3ugXjeqeZtyGmb4VmwqSBKL0XW8TywmQeXLcb9X6lcU22VjVQc8NruXWqlsXlQ9DGVsnE1pnVlqMQiV3qWm8pyotg0Pb47izfkyKzTDWC1NBMPbzWGBnqMn9FqEGfPWKtGbWFmgbD3oOlRMxjDqNyddZjDMO0YnN4KQuvXDgVomLrGsYykuGyT5szXB+1y7d84ZlJhlDanCE7RuFqDUIYKZj6jdFY3tOTfB40yDLXfOMMu8PbDSmxXfKDGwN022+xXsp1/l9S04URTyBGMh53trKsYh6eh4562/kgRJZNzMRaL7RmRBSYA+I2SNP//rL0LoazBumLNQUB0KMaI7GEnrRJyhkd3ZDmHHiFuvSabdlj8dh/HpdAca/Z8NxZx4syfeYronNNYbud+pCCb/paPyYa+kjMrLwVJClLH8cXtgmpu44KNuMOu+c7UGuXb4JBEB6R2MBEm0nkACj568wjGChElmrKAKalzjixE+GvNmEwNHMasd50wRw7AUYmC3xIoQOgY6OIHoaK5djmYOai82HK+tOHf7wI1KXGj4zE/nF43P/G9T8PFe32n7GS+NjfaxkPVSitGF54gob+zj7xZzJ5P1keJYoKToZ0/955WhmZ/WscBQP6ZX5fo9sd+29zus+QEPwnSLvFP1Fa+Jgh07B9hXR39t1mcZHdc7doApLK73LT3r25brInvceypSEjxw/c5f6xm8xRIA5sHUjhFv25eJ12MdaBwGy58EHTQN9ms1TppYwavWvWumn6gosB/wqIVBVjDLpvJb89RjLiqoXifLoeC4mL9oQxoYf63tBRlNzvhVjGt9j4T/jwC9sBI74z/RQnYmghYtz4IIS1whx+Sgpv0CHr2dFr/0cngJW0Xq5dhMTbQY/TnTx9eyP4lXMrdPB0L2jWZrXfYPjC3WOOMZC/NF0iBUJ7DltnUiknbdKcCec10dVr71OVqgEF5TiJoSFDsELvTz2oL7+G7KPkDIMg3cLGEBbNey4ZHDRc8sLeB03Bj/ZX8YBBLA9PB32AyyPeiujS2UkHpOzLbWEygWXQFM87hOstOCai177KxwExSa3Qlo7QrV3Px/ajjmpEWTOnmF2xv6Yui33f6P17kyqMQ3gd2CLSDn4Lt5FmScXOIhV/RPy1qNSvN0FLMRKTNmH6ifXKdBc9sXWQmHo0bXYOe5r1zH4k5rxcw1L4gyRd30WgGSYP9SobM48o090gwsxKPMa2FLYWvw41UrpkuDkF9DOMx06O6quCWy1HDcdDp+6syfeN/8c2Fg19h8tXgXAv4yVbu3KGTGIKBENbGdKtKqeLR7EvojZfnMOyyFX2cH+iMSV9mqSqpjn5GlNYcYeDGEHQ/PwckXAUDPjc84PIykHuyX98kbTm2blrFBj8cWjIdAuvoRBBy27Q2Gcbes0R2k6GhJI320GnrhlwhFB4iBvpl+rbSM37JcGmYKBWfJimj0UNyfZSjssdGX2r8mlIf2K5KJPDJsqBTtGnNJUbCnbZu3Sj/qW9UbRBGSnRzJfNrgtETGsZ/YUnLmrtglYNQUZHVroqhhpUZFwCDoGs+FMjBYFrYzmEcwRw6q459Mi/HenIfQhw425CeGCHe+2VEQiO/DVqnhB2+fnidzMR2ko1rcXQPzbGcsbJZFNi5kVjD6oLTjTRDf5QOJGzO7/RSFvu2FhvqYRZUpkewZ2BSqfLiOyIIJcpv6k3ap2JXCIzoV+xN/7/CWHkERmhSZ66EKLMfg4UFqYcIgXs0hasL6wm26rPB6wppoM+og3SddnAa7/9srqsVYAIp/Pa4wwlobOWr+CgoSX8JPsJ/udOZy5xeqYE5C9LT6dGopXad9VTeBdoIvUxPRHZgr7J02Do2cxwcpuQyKqjbd6d6ty/3yl7r/6cOsnJQK5jXWEktPqzpuXnQaunKQZz6FR/UjTNXpwDmF8/Ejz1gZRMnkDFwikQE3JeqHa2rSSocvIxSQVMJrr4MBSZZV6+4XK8HKne+Y9YP21e1J/kiVAJaRWwbkJqJbmy4/5dZYqeeleeTKMj4LUH+Pfv9Z+ffsnYx7LBf8yeGeON6XnqC5DI3nNny9GPke1z2q5gcXc4ct9GtjeOJhoF5ZsW6GOG506bVNO8RBuLmIRJA1pllo4v5yIG8RuU7UwfXU42W5L5KptLkN94n7Uiei9AXZL7i9sI0tvIDJJtHslzLya7LfdUo7bVIzcI0NzEZRbFUxqPb6ZTody5ECmLBut6exmWbv38Vs7na4pqsRkxee9+V7oe0iVpFLSOPqp02cfbd9mDVE2BWCbRKHXxocykXWXbJ82OTCuDp687tkB7S1rCA1Z6lpFiGVH89Lilrbw1uzPL0qHAHV53opbNfQTUMd9OZDu0qeWAoLSFlxiUm/UBG7S3Jt88OjGKsWqz6MyfLL+mpxR9r2UWjcXc5kmIMUtPyuBjgjuzQwsLFrYiMJr7hshoHcYBoSipQXH31gKUDuqAe0HzMKmcijaAHmE1Atf60FrrVxCyfy1pM3BBE9O0n3Mlje62QHYBvMroPQR7kgTPhxyIJNO/TvXrUHnu/nGtuYe51g5gSEFpzSbr7EDZxPZdGA2WNLcyeVFfOMQcUBv/AoebttY7Dgru76y1U9SKymqUoIHilwsHiw/h64EYm1oAkw9tDp+W1xXRRpPfJ4GFMs2w8Htfy4YR787CI5WKNosrHQIs/6YWXSX/ikC77uoA5VZ3WHyYxCAc3jdKbnzFA7qZ/woR2gfuE8MSHyCe2Usdf5Zfe8ofH2ydaJWf4g1C2Y6bFfoTDOsHGhIo0Xz65204lxzzgmUMRyy5VBBAMM5Rr34yopoaGb46rn8RzDG9KFCTNMv8lSbc5VuxqEmQYci77QohGnw4ihcoLadNVoNrS82C89wKU6tqxM6ylc9j/jxYadP7OGoGAT1CL7+qafCJwg3SaEAGFU+Uklf15JB1gQn4Ck+dDbAbf4d7TJm2DPuOv1H7S8pXnhk7dPC7Hw9P3XNTpp/lzLv55xLvZmuUyzDA9ARN+aSZ+btJwIkSDT9wUeQ0aCyZ6YmJxFGuWCjzC0iKlDHOOerU+LMMo7+C9lIwdTwFL5+/ZD7LlwKh6JLgjTKVAeVxmjPSr34b1fxB94SZzuunFZrIyblxfaWgB5iyWBn/K5rVHsElDvL1xeDldUxg1MjcoGwppuWnmbRxITNAu0xID/7wvxaopQSDQMUJW9FLX7AVLGLhQf70fYf/xRAAtsHIeSiYrw1tYKFBDJxhmVd9nufWCH/2qzusALTVBC4ukTToNiHNCD8ljJ1WtrEaEFatDTdpEVSSMoGnCSi0ZQgb7725MNqal7gETO8xEjPhJCAmdSsQ0Y2TzdMxUFqqb7kmunH9HEHheM87sgP7rVv5vE1kaeVY8HvAGm+03fmbQPP3IcDUXSt0WgF1ZVeP1YLEyHatXwOWDjXTDe86hJQduFCinVEOGfaCh8zvhkrSz8SfFgzsqS/WaD/s0TTATzEOI/VCTnzbCxXE+mDeRQi4bVF8kvJhto505WGh2B6pQmptlpbkrrvjOS4IKIxvRLe4+5HGaf0KjIkKXlEggIU9/P+953ve1QE2fPRpG3UwcGJ+zl6TTJZ8WpZUmTRkqKHXEhfYDSIjCyxcxBh6n2PaWGuc7rJR0AdQFHynjuUAR473nvMOqL+ALfnZES9AVInlCKUkJhacqjJku+HSGhQzx1pWd2W1HSJzfeHeWbqgCMFumyvX1sDVB69Jae82PUXdRn2Hgj4I70ZNW4os11WY9wRIvgiR20g4sPxQgoTvfn/mQ0CxMTE1j9lGDvYctmWYhj1nKen1QcxAetLcBRHnAbsEBqjC+OYxA7cePh9gfZR2XKGKqrv6MHTYJL+QT7rUP2KErqdSUDiRl+93mHCEdJLkKVR+1m03OZplYqS+XxaRi3yPi2i7YvOs59Axd9pn5TaeEsqxgtfaPWy2/6I2SdJk12F4pJKKoPSFdJOSgXdgSmPWgAZ9h03B64W6JXUECbtz+6jGdEO+2JC/4YCaV4fFfZpSouXumoY7XEASb+0v4Om/CapOBPstiwaG5j4NAT1pkTJ4oy0bv6bx6E+jLUQNOSG95bArR7UBE4E3IU+3hSTw2FSCnK9gGXf4hPy+RT82Vn4yutMJj1UTdEFg3ly2sg26a0SBYfOQGIeHPOLrUz7bzOIO01f+F4KMmad6EKocEodN9O1k5qd0DnfXut1XUGU7KbIEOonxTW4ll13SL5svWim/XF+QXT/IvD0rJnHmQhikhDQwhzu3EcKKfLCm6WahgndtYj0+AktaHumJvV21pvBJ7gYYUaoSOEE/DSW6zqfaEc75vSzBB7aRDhaFG6o6nRZuemJm5KFb0Ec4NEY92n321JO9tU8iP4VttJqQz3AkNN16n4iwVlLsZehfRGXcYhazmPWs5niMJytmRn5I/IaepFTBf9cxYwZ/0Pu30XrpPMQpNo1ZrjlvjxnJJYW/0gSxxHzjWDDizOvdBVwmDuQhZ82fcRHtACYmwVMeFdh22hC62gjFuyPIMKHgYs9zQ8p8Wfbm0wwlfSk+wmK/AWn0kAp9UuauI+k7hLzL20spskkGcdCAVJaf2wmThIhVLnP0e8MOFCGIlpLb4J7sgug+uefPefKSGxD2ns9uZ0uoJLNM4HaCLjadeG5W9X8NxtLAfJ2DkyvW+ZZexCYKqiRgKK+4ElTkg+PzK7EzGQ+JEEIXe8eW8WXdzOxKPqjDEFfESxswDpvNrKNH/EyaI5rWHnc+6YhVKS82+a+rg2i7M6QROdOj/shQIH3JXSMH+BrnmzKi/o/ugvHfpEtx/UJk8P8X1xqEjRWAvX9ntOh1BJHRCjRd5y9dka/OiLvoH/IHgvfXHKCW25+waIJFO+BSt79h5xG5wpd1hAzcNf5SD8mmNlpXmvNrDPLZUQ6P5fozQ2T0wM7jYc6IoQNEzzxEaMaGYthT/n4RydzbcfgrPyQH6fhlfNnvz5BGj6eMC6MdY+RwypAPau5AFdcOhBHv/YeU0brDl6hgacTXfJZFGw0QTstHtu1SyEBBHm0q0x+xiF7Kt6/6lNp1e7M6QJt2XmTBBdg0/zovaDKIIjtLMjDk11klYayrLHnhciKaLgZnx67sqvH3xHnKRqJzqB2BgD6mQ2gL1abicRvg7Zgbd6kOudVUIZ6CVCBOQZXtr9QasiG4vOd5JJpGDPH1rcVyg8VwgzP43+xENATtHWIR+oCMZ2C4tJbWtjg1Rd83q1plxVpSk63eVx9LtWPqhl6dYWon/Jxn9F/gvTQyJRjN25Zx75ZDPQEQNk6KmU7IoQboIIOskcfdqf9GYBXXRbWoUOQVlzmy/vszKyWe6seS/8y5Y/Os6/PavN6uv1x7ud6tv1p7tVZvBrB+XLcrWW9rfl3rsXnwrE/zE7DNEVp/8fwL0zF6xyWQ3LVeyp5YWhpeokluGqZUA/fMBoLblyIXq+lUCKkRheUYsShmC3YUgKhhMgsOA98FOy5Yte2/kEN+fnbL2nyiMpsgmp3ch/nctutgjaF2pA8Fx8loDYOeO/FQhocq5ngsuz0KfbtiewM1mwCQ2z5j+E837i/aaDjBCHsq4hC0rNjILUq61cU2YU7xoBEH21Go3DXVUAvvIJ0fbpqgj0E0ev+N4gtrIMlMOSCgMvkACZN2shtpm0jKFML2JsU9XJusrKNWwMn8oe5os6wGGtcXxXG1bDYAbbOai4PvYv6/pTHlRdF78fZ+Gp1Ve0ZIecA4Oi5NgTwoMz731Nh7aLoexpI6t7CD6JqrXgi0Q66X6C3Xq1do005Hed4QyvZuYYJc+3EcnjgswASakpiPsfUN7chFrK2XqPmxuvjm7CakpOOdsGxcjUikL9/CMcxTQGP9996h6qwfqULC9k6xI055WbpQIT8uVcWRUK2r4jTX7HzLryWvvpxnp05lirWpLUQ0XWLpwwmJMFdICmZZgpzSSI/OOlCElS9svULASdUOp9Tyf1THieD2NDtoJHCQdji6IPzDJrgiJviHzNDeRwSnSMaBZstL6MDZJQDPmI8cxfguo+SWeLpV0i6hVEItTzE3v2BEu2VbI+mUB0+HVwC6rUaf4VXFVmR1ArB07SZ1Lqzbobqs12w8EZLOSw++PQxmvNoEK2PWwzcu9i9lZw3fn8r4P2g0JWSLmw8heJWlRrIQmfOEao4mhR9RgLmuU1Q7swOonzDFhYP67rAXtaNOjDxXzTwyCrJD4yv7ka8H9/PITTA4QWqXPfoDRrhhWKKNTFHdlWgKSpa/sbK0R56BNYd7xlcFQE2zm3BebobcSwJ/Ioi/tjKmXnzlEqByi/IBNsyrQg6XG9O1Xas16VUmmDPtIKdR3sASNmopmqdfefefvZmOB6fMstteOtOV4StMrMfKqMVlzeU+dPxubH+rRvgbhwMQ/DeXRQeB+dc/jFw9OIWEtX54C/YX2aeyTEOL0ZYG6rXThbnrX3T4Sw/snKas4uPW1z4Gihea5G1VXAvXGxuc7P1ci1+UzeQQOcp/M2p0U9MAzcTlsTeNu4pnlqZs/atj5gq7ynooh9JDqa3GHr5D3f64Zpq42XoBa662bGLWH9Y6zwljS4pu2ppJl5kWpw2Zzh4nyrV1nb41lg+5SZrS2YMJet+joMM1rSLv2tXsx9QqLWUCH7Ks6FLHTAu+rUGgeoN1krXLpaulKMHfm9zMIk4i1V89zQ0LzyzUHFJSXZ5ZZ7ycuNXvpEqyfHcu8mKr3d4rgSXvdVjKXjQ/AlP9cimC8OhKrRREyq1Tzamd9uRMYFoXPL1PFA+HZv/ROEKXgmGlbAKMnA+qmh0Rg7NixtdpI8bSefL48B+9Vs4ggEVYovm0FuLXSgNGammuXy9io8hwPk1UCWMb2PaypAc+89XAPGngwyUkxMo8WBatSakT49oqlKnXnI727eOTuHD4XJSjSJZF/iKirF53LgVEs1SlOUNVTZNY5gP55ITkY/3kFNFqCtS4sEW51PRiMn/lk00dTe0nT518c65zCwLLN5nxgDdX3y1XzbcYpHfvcWZ33r/qrlTGRXUX4uewCzrrWL+7JYwQzANrbW8rt9E1rHCzcv0w5bemuExlPOA7YznCTEenfMnhCeDbo4emoxPZqsU1t2j4I/NSNSxRdGl3scqV/8j3uNYIKMdrQY4XgrPi4ANVsCiPEiD6LCIXdtZU6r5mRleEYbWtRZ1uhbDRNuFsnGxwNh1XoFgOD5GeN9eRh/Bgip/GWg9Gzm6cx10KBwJ5J/jsux6AbEXxmj2XNL9udLdLztpgxnKgOWHVPlmGfyIUyKvigHJ8aizhUTmqa2CeMGv68V1yQubc4WDodiePzihXAywfZuPfpUbvgl2GdJAcLO4PHII+ZvccntuU8fKSWMzpP+7VTYRtXDt1+2DAf+1oIS6fhKLibFsyEvXDV47FzvfQfmw1CDWevHadfW53Y4wk55NN/xwuNeONzFZKWuRdHw7v6TtTVsIypInsOAU8nycSlC194ALqiCmYIncckkluryxLflIhEY4RxdSaE8d21b0cN8ZDACfNToBppzy7I5STlLolduxozjVTtUHVO4Mlw+8WZaVyPUQGjnGoQA73+jgDHzQRnPdFURjR7jg9dMB97IpqrrhFGcZrwgZewO6gzmgMOSto4GrYzj06jxfheGLvO7a7SAPA89WofTTimdESymoNt3KL8v1IhOY3qoDK00H0g4tVbpU9nimlSLetxTOiY6Ze0fIbvR6irpoDV6PCNy50i3/T1yzqbnifs3oohQd7UbtYV2UhYNAyF67u9d4Brefo8nNqnC8DXZpZ8IRtNliaCl7zJ4fzZRuEzFjUO5u+Ri78FhJTUmZPvLIhF70oNMCLF2NmQfswR7i1H6dGjpDP+Rig9uhaRnpZsTecN51eHDbtPD39x3x+7ngv4lWQULUaKDjg3xmPHx05PH1DPAFzB3rCjTGhIoV/Ou6+8KF9dgr1MHluwD2lSqsXVW8RRAaVXgudUhIDUazk3nMRuKyP1PRyv+X42Bj2dNtBvVHH55/6aMpr7+cf6SwIKO/UWr6h2bydstGNf4JleHvgtbOXp7hcloP5ntd+I+739+22YUyd8kHnaGTC6ofesC5df9hzDoY6wb51Md2orjbqP+0YZhRKpXKPjUF4GTBAtpMf5sMDwWBz7U/2x048eFy1fwwuV64wOUgCn0IdpRmKSkOezNKH4iQ=","base64")).toString()),VO)});var Ble=w((tM,rM)=>{(function(r){tM&&typeof tM=="object"&&typeof rM<"u"?rM.exports=r():typeof define=="function"&&define.amd?define([],r):typeof window<"u"?window.isWindows=r():typeof global<"u"?global.isWindows=r():typeof self<"u"?self.isWindows=r():this.isWindows=r()})(function(){"use strict";return function(){return process&&(process.platform==="win32"||/^(msys|cygwin)$/.test(process.env.OSTYPE))}})});var vle=w((S0t,Sle)=>{"use strict";iM.ifExists=dze;var ip=J("util"),Fs=J("path"),Qle=Ble(),fze=/^#!\s*(?:\/usr\/bin\/env)?\s*([^ \t]+)(.*)$/,hze={createPwshFile:!0,createCmdFile:Qle(),fs:J("fs")},pze=new Map([[".js","node"],[".cjs","node"],[".mjs","node"],[".cmd","cmd"],[".bat","cmd"],[".ps1","pwsh"],[".sh","sh"]]);function ble(r){let e={...hze,...r},t=e.fs;return e.fs_={chmod:t.chmod?ip.promisify(t.chmod):async()=>{},mkdir:ip.promisify(t.mkdir),readFile:ip.promisify(t.readFile),stat:ip.promisify(t.stat),unlink:ip.promisify(t.unlink),writeFile:ip.promisify(t.writeFile)},e}async function iM(r,e,t){let i=ble(t);await i.fs_.stat(r),await mze(r,e,i)}function dze(r,e,t){return iM(r,e,t).catch(()=>{})}function Cze(r,e){return e.fs_.unlink(r).catch(()=>{})}async function mze(r,e,t){let i=await Bze(r,t);return await Eze(e,t),Ize(r,e,i,t)}function Eze(r,e){return e.fs_.mkdir(Fs.dirname(r),{recursive:!0})}function Ize(r,e,t,i){let n=ble(i),s=[{generator:Sze,extension:""}];return n.createCmdFile&&s.push({generator:bze,extension:".cmd"}),n.createPwshFile&&s.push({generator:vze,extension:".ps1"}),Promise.all(s.map(o=>Qze(r,e+o.extension,t,o.generator,n)))}function yze(r,e){return Cze(r,e)}function wze(r,e){return xze(r,e)}async function Bze(r,e){let n=(await e.fs_.readFile(r,"utf8")).trim().split(/\r*\n/)[0].match(fze);if(!n){let s=Fs.extname(r).toLowerCase();return{program:pze.get(s)||null,additionalArgs:""}}return{program:n[1],additionalArgs:n[2]}}async function Qze(r,e,t,i,n){let s=n.preserveSymlinks?"--preserve-symlinks":"",o=[t.additionalArgs,s].filter(a=>a).join(" ");return n=Object.assign({},n,{prog:t.program,args:o}),await yze(e,n),await n.fs_.writeFile(e,i(r,e,n),"utf8"),wze(e,n)}function bze(r,e,t){let n=Fs.relative(Fs.dirname(e),r).split("/").join("\\"),s=Fs.isAbsolute(n)?`"${n}"`:`"%~dp0\\${n}"`,o,a=t.prog,l=t.args||"",c=nM(t.nodePath).win32;a?(o=`"%~dp0\\${a}.exe"`,n=s):(a=s,l="",n="");let u=t.progArgs?`${t.progArgs.join(" ")} `:"",g=c?`@SET NODE_PATH=${c}\r
-`:"";return o?g+=`@IF EXIST ${o} (\r
-  ${o} ${l} ${n} ${u}%*\r
-) ELSE (\r
-  @SETLOCAL\r
-  @SET PATHEXT=%PATHEXT:;.JS;=;%\r
-  ${a} ${l} ${n} ${u}%*\r
-)\r
-`:g+=`@${a} ${l} ${n} ${u}%*\r
-`,g}function Sze(r,e,t){let i=Fs.relative(Fs.dirname(e),r),n=t.prog&&t.prog.split("\\").join("/"),s;i=i.split("\\").join("/");let o=Fs.isAbsolute(i)?`"${i}"`:`"$basedir/${i}"`,a=t.args||"",l=nM(t.nodePath).posix;n?(s=`"$basedir/${t.prog}"`,i=o):(n=o,a="",i="");let c=t.progArgs?`${t.progArgs.join(" ")} `:"",u=`#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\\\,/,g')")
-
-case \`uname\` in
-    *CYGWIN*) basedir=\`cygpath -w "$basedir"\`;;
-esac
-
-`,g=t.nodePath?`export NODE_PATH="${l}"
-`:"";return s?u+=`${g}if [ -x ${s} ]; then
-  exec ${s} ${a} ${i} ${c}"$@"
-else
-  exec ${n} ${a} ${i} ${c}"$@"
-fi
-`:u+=`${g}${n} ${a} ${i} ${c}"$@"
-exit $?
-`,u}function vze(r,e,t){let i=Fs.relative(Fs.dirname(e),r),n=t.prog&&t.prog.split("\\").join("/"),s=n&&`"${n}$exe"`,o;i=i.split("\\").join("/");let a=Fs.isAbsolute(i)?`"${i}"`:`"$basedir/${i}"`,l=t.args||"",c=nM(t.nodePath),u=c.win32,g=c.posix;s?(o=`"$basedir/${t.prog}$exe"`,i=a):(s=a,l="",i="");let f=t.progArgs?`${t.progArgs.join(" ")} `:"",h=`#!/usr/bin/env pwsh
-$basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent
-
-$exe=""
-${t.nodePath?`$env_node_path=$env:NODE_PATH
-$env:NODE_PATH="${u}"
-`:""}if ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) {
-  # Fix case when both the Windows and Linux builds of Node
-  # are installed in the same directory
-  $exe=".exe"
-}`;return t.nodePath&&(h+=` else {
-  $env:NODE_PATH="${g}"
-}`),o?h+=`
-$ret=0
-if (Test-Path ${o}) {
-  # Support pipeline input
-  if ($MyInvocation.ExpectingInput) {
-    $input | & ${o} ${l} ${i} ${f}$args
-  } else {
-    & ${o} ${l} ${i} ${f}$args
-  }
-  $ret=$LASTEXITCODE
-} else {
-  # Support pipeline input
-  if ($MyInvocation.ExpectingInput) {
-    $input | & ${s} ${l} ${i} ${f}$args
-  } else {
-    & ${s} ${l} ${i} ${f}$args
-  }
-  $ret=$LASTEXITCODE
-}
-${t.nodePath?`$env:NODE_PATH=$env_node_path
-`:""}exit $ret
-`:h+=`
-# Support pipeline input
-if ($MyInvocation.ExpectingInput) {
-  $input | & ${s} ${l} ${i} ${f}$args
-} else {
-  & ${s} ${l} ${i} ${f}$args
-}
-${t.nodePath?`$env:NODE_PATH=$env_node_path
-`:""}exit $LASTEXITCODE
-`,h}function xze(r,e){return e.fs_.chmod(r,493)}function nM(r){if(!r)return{win32:"",posix:""};let e=typeof r=="string"?r.split(Fs.delimiter):Array.from(r),t={};for(let i=0;i<e.length;i++){let n=e[i].split("/").join("\\"),s=Qle()?e[i].split("\\").join("/").replace(/^([^:\\/]*):/,(o,a)=>`/mnt/${a.toLowerCase()}`):e[i];t.win32=t.win32?`${t.win32};${n}`:n,t.posix=t.posix?`${t.posix}:${s}`:s,t[i]={win32:n,posix:s}}return t}Sle.exports=iM});var dM=w((jQt,Wle)=>{Wle.exports=J("stream")});var Zle=w((qQt,Xle)=>{"use strict";function zle(r,e){var t=Object.keys(r);if(Object.getOwnPropertySymbols){var i=Object.getOwnPropertySymbols(r);e&&(i=i.filter(function(n){return Object.getOwnPropertyDescriptor(r,n).enumerable})),t.push.apply(t,i)}return t}function zze(r){for(var e=1;e<arguments.length;e++){var t=arguments[e]!=null?arguments[e]:{};e%2?zle(Object(t),!0).forEach(function(i){Vze(r,i,t[i])}):Object.getOwnPropertyDescriptors?Object.defineProperties(r,Object.getOwnPropertyDescriptors(t)):zle(Object(t)).forEach(function(i){Object.defineProperty(r,i,Object.getOwnPropertyDescriptor(t,i))})}return r}function Vze(r,e,t){return e in r?Object.defineProperty(r,e,{value:t,enumerable:!0,configurable:!0,writable:!0}):r[e]=t,r}function Xze(r,e){if(!(r instanceof e))throw new TypeError("Cannot call a class as a function")}function Vle(r,e){for(var t=0;t<e.length;t++){var i=e[t];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(r,i.key,i)}}function Zze(r,e,t){return e&&Vle(r.prototype,e),t&&Vle(r,t),r}var _ze=J("buffer"),hb=_ze.Buffer,$ze=J("util"),CM=$ze.inspect,e5e=CM&&CM.custom||"inspect";function t5e(r,e,t){hb.prototype.copy.call(r,e,t)}Xle.exports=function(){function r(){Xze(this,r),this.head=null,this.tail=null,this.length=0}return Zze(r,[{key:"push",value:function(t){var i={data:t,next:null};this.length>0?this.tail.next=i:this.head=i,this.tail=i,++this.length}},{key:"unshift",value:function(t){var i={data:t,next:this.head};this.length===0&&(this.tail=i),this.head=i,++this.length}},{key:"shift",value:function(){if(this.length!==0){var t=this.head.data;return this.length===1?this.head=this.tail=null:this.head=this.head.next,--this.length,t}}},{key:"clear",value:function(){this.head=this.tail=null,this.length=0}},{key:"join",value:function(t){if(this.length===0)return"";for(var i=this.head,n=""+i.data;i=i.next;)n+=t+i.data;return n}},{key:"concat",value:function(t){if(this.length===0)return hb.alloc(0);for(var i=hb.allocUnsafe(t>>>0),n=this.head,s=0;n;)t5e(n.data,i,s),s+=n.data.length,n=n.next;return i}},{key:"consume",value:function(t,i){var n;return t<this.head.data.length?(n=this.head.data.slice(0,t),this.head.data=this.head.data.slice(t)):t===this.head.data.length?n=this.shift():n=i?this._getString(t):this._getBuffer(t),n}},{key:"first",value:function(){return this.head.data}},{key:"_getString",value:function(t){var i=this.head,n=1,s=i.data;for(t-=s.length;i=i.next;){var o=i.data,a=t>o.length?o.length:t;if(a===o.length?s+=o:s+=o.slice(0,t),t-=a,t===0){a===o.length?(++n,i.next?this.head=i.next:this.head=this.tail=null):(this.head=i,i.data=o.slice(a));break}++n}return this.length-=n,s}},{key:"_getBuffer",value:function(t){var i=hb.allocUnsafe(t),n=this.head,s=1;for(n.data.copy(i),t-=n.data.length;n=n.next;){var o=n.data,a=t>o.length?o.length:t;if(o.copy(i,i.length-t,0,a),t-=a,t===0){a===o.length?(++s,n.next?this.head=n.next:this.head=this.tail=null):(this.head=n,n.data=o.slice(a));break}++s}return this.length-=s,i}},{key:e5e,value:function(t,i){return CM(this,zze({},i,{depth:0,customInspect:!1}))}}]),r}()});var EM=w((JQt,$le)=>{"use strict";function r5e(r,e){var t=this,i=this._readableState&&this._readableState.destroyed,n=this._writableState&&this._writableState.destroyed;return i||n?(e?e(r):r&&(this._writableState?this._writableState.errorEmitted||(this._writableState.errorEmitted=!0,process.nextTick(mM,this,r)):process.nextTick(mM,this,r)),this):(this._readableState&&(this._readableState.destroyed=!0),this._writableState&&(this._writableState.destroyed=!0),this._destroy(r||null,function(s){!e&&s?t._writableState?t._writableState.errorEmitted?process.nextTick(pb,t):(t._writableState.errorEmitted=!0,process.nextTick(_le,t,s)):process.nextTick(_le,t,s):e?(process.nextTick(pb,t),e(s)):process.nextTick(pb,t)}),this)}function _le(r,e){mM(r,e),pb(r)}function pb(r){r._writableState&&!r._writableState.emitClose||r._readableState&&!r._readableState.emitClose||r.emit("close")}function i5e(){this._readableState&&(this._readableState.destroyed=!1,this._readableState.reading=!1,this._readableState.ended=!1,this._readableState.endEmitted=!1),this._writableState&&(this._writableState.destroyed=!1,this._writableState.ended=!1,this._writableState.ending=!1,this._writableState.finalCalled=!1,this._writableState.prefinished=!1,this._writableState.finished=!1,this._writableState.errorEmitted=!1)}function mM(r,e){r.emit("error",e)}function n5e(r,e){var t=r._readableState,i=r._writableState;t&&t.autoDestroy||i&&i.autoDestroy?r.destroy(e):r.emit("error",e)}$le.exports={destroy:r5e,undestroy:i5e,errorOrDestroy:n5e}});var wl=w((WQt,rce)=>{"use strict";var tce={};function Ls(r,e,t){t||(t=Error);function i(s,o,a){return typeof e=="string"?e:e(s,o,a)}class n extends t{constructor(o,a,l){super(i(o,a,l))}}n.prototype.name=t.name,n.prototype.code=r,tce[r]=n}function ece(r,e){if(Array.isArray(r)){let t=r.length;return r=r.map(i=>String(i)),t>2?`one of ${e} ${r.slice(0,t-1).join(", ")}, or `+r[t-1]:t===2?`one of ${e} ${r[0]} or ${r[1]}`:`of ${e} ${r[0]}`}else return`of ${e} ${String(r)}`}function s5e(r,e,t){return r.substr(!t||t<0?0:+t,e.length)===e}function o5e(r,e,t){return(t===void 0||t>r.length)&&(t=r.length),r.substring(t-e.length,t)===e}function a5e(r,e,t){return typeof t!="number"&&(t=0),t+e.length>r.length?!1:r.indexOf(e,t)!==-1}Ls("ERR_INVALID_OPT_VALUE",function(r,e){return'The value "'+e+'" is invalid for option "'+r+'"'},TypeError);Ls("ERR_INVALID_ARG_TYPE",function(r,e,t){let i;typeof e=="string"&&s5e(e,"not ")?(i="must not be",e=e.replace(/^not /,"")):i="must be";let n;if(o5e(r," argument"))n=`The ${r} ${i} ${ece(e,"type")}`;else{let s=a5e(r,".")?"property":"argument";n=`The "${r}" ${s} ${i} ${ece(e,"type")}`}return n+=`. Received type ${typeof t}`,n},TypeError);Ls("ERR_STREAM_PUSH_AFTER_EOF","stream.push() after EOF");Ls("ERR_METHOD_NOT_IMPLEMENTED",function(r){return"The "+r+" method is not implemented"});Ls("ERR_STREAM_PREMATURE_CLOSE","Premature close");Ls("ERR_STREAM_DESTROYED",function(r){return"Cannot call "+r+" after a stream was destroyed"});Ls("ERR_MULTIPLE_CALLBACK","Callback called multiple times");Ls("ERR_STREAM_CANNOT_PIPE","Cannot pipe, not readable");Ls("ERR_STREAM_WRITE_AFTER_END","write after end");Ls("ERR_STREAM_NULL_VALUES","May not write null values to stream",TypeError);Ls("ERR_UNKNOWN_ENCODING",function(r){return"Unknown encoding: "+r},TypeError);Ls("ERR_STREAM_UNSHIFT_AFTER_END_EVENT","stream.unshift() after end event");rce.exports.codes=tce});var IM=w((zQt,ice)=>{"use strict";var A5e=wl().codes.ERR_INVALID_OPT_VALUE;function l5e(r,e,t){return r.highWaterMark!=null?r.highWaterMark:e?r[t]:null}function c5e(r,e,t,i){var n=l5e(e,i,t);if(n!=null){if(!(isFinite(n)&&Math.floor(n)===n)||n<0){var s=i?t:"highWaterMark";throw new A5e(s,n)}return Math.floor(n)}return r.objectMode?16:16*1024}ice.exports={getHighWaterMark:c5e}});var nce=w((VQt,yM)=>{typeof Object.create=="function"?yM.exports=function(e,t){t&&(e.super_=t,e.prototype=Object.create(t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}))}:yM.exports=function(e,t){if(t){e.super_=t;var i=function(){};i.prototype=t.prototype,e.prototype=new i,e.prototype.constructor=e}}});var Bl=w((XQt,BM)=>{try{if(wM=J("util"),typeof wM.inherits!="function")throw"";BM.exports=wM.inherits}catch{BM.exports=nce()}var wM});var oce=w((ZQt,sce)=>{sce.exports=J("util").deprecate});var SM=w((_Qt,gce)=>{"use strict";gce.exports=Tr;function Ace(r){var e=this;this.next=null,this.entry=null,this.finish=function(){O5e(e,r)}}var op;Tr.WritableState=gE;var u5e={deprecate:oce()},lce=dM(),Cb=J("buffer").Buffer,g5e=global.Uint8Array||function(){};function f5e(r){return Cb.from(r)}function h5e(r){return Cb.isBuffer(r)||r instanceof g5e}var bM=EM(),p5e=IM(),d5e=p5e.getHighWaterMark,Ql=wl().codes,C5e=Ql.ERR_INVALID_ARG_TYPE,m5e=Ql.ERR_METHOD_NOT_IMPLEMENTED,E5e=Ql.ERR_MULTIPLE_CALLBACK,I5e=Ql.ERR_STREAM_CANNOT_PIPE,y5e=Ql.ERR_STREAM_DESTROYED,w5e=Ql.ERR_STREAM_NULL_VALUES,B5e=Ql.ERR_STREAM_WRITE_AFTER_END,Q5e=Ql.ERR_UNKNOWN_ENCODING,ap=bM.errorOrDestroy;Bl()(Tr,lce);function b5e(){}function gE(r,e,t){op=op||Gu(),r=r||{},typeof t!="boolean"&&(t=e instanceof op),this.objectMode=!!r.objectMode,t&&(this.objectMode=this.objectMode||!!r.writableObjectMode),this.highWaterMark=d5e(this,r,"writableHighWaterMark",t),this.finalCalled=!1,this.needDrain=!1,this.ending=!1,this.ended=!1,this.finished=!1,this.destroyed=!1;var i=r.decodeStrings===!1;this.decodeStrings=!i,this.defaultEncoding=r.defaultEncoding||"utf8",this.length=0,this.writing=!1,this.corked=0,this.sync=!0,this.bufferProcessing=!1,this.onwrite=function(n){R5e(e,n)},this.writecb=null,this.writelen=0,this.bufferedRequest=null,this.lastBufferedRequest=null,this.pendingcb=0,this.prefinished=!1,this.errorEmitted=!1,this.emitClose=r.emitClose!==!1,this.autoDestroy=!!r.autoDestroy,this.bufferedRequestCount=0,this.corkedRequestsFree=new Ace(this)}gE.prototype.getBuffer=function(){for(var e=this.bufferedRequest,t=[];e;)t.push(e),e=e.next;return t};(function(){try{Object.defineProperty(gE.prototype,"buffer",{get:u5e.deprecate(function(){return this.getBuffer()},"_writableState.buffer is deprecated. Use _writableState.getBuffer instead.","DEP0003")})}catch{}})();var db;typeof Symbol=="function"&&Symbol.hasInstance&&typeof Function.prototype[Symbol.hasInstance]=="function"?(db=Function.prototype[Symbol.hasInstance],Object.defineProperty(Tr,Symbol.hasInstance,{value:function(e){return db.call(this,e)?!0:this!==Tr?!1:e&&e._writableState instanceof gE}})):db=function(e){return e instanceof this};function Tr(r){op=op||Gu();var e=this instanceof op;if(!e&&!db.call(Tr,this))return new Tr(r);this._writableState=new gE(r,this,e),this.writable=!0,r&&(typeof r.write=="function"&&(this._write=r.write),typeof r.writev=="function"&&(this._writev=r.writev),typeof r.destroy=="function"&&(this._destroy=r.destroy),typeof r.final=="function"&&(this._final=r.final)),lce.call(this)}Tr.prototype.pipe=function(){ap(this,new I5e)};function S5e(r,e){var t=new B5e;ap(r,t),process.nextTick(e,t)}function v5e(r,e,t,i){var n;return t===null?n=new w5e:typeof t!="string"&&!e.objectMode&&(n=new C5e("chunk",["string","Buffer"],t)),n?(ap(r,n),process.nextTick(i,n),!1):!0}Tr.prototype.write=function(r,e,t){var i=this._writableState,n=!1,s=!i.objectMode&&h5e(r);return s&&!Cb.isBuffer(r)&&(r=f5e(r)),typeof e=="function"&&(t=e,e=null),s?e="buffer":e||(e=i.defaultEncoding),typeof t!="function"&&(t=b5e),i.ending?S5e(this,t):(s||v5e(this,i,r,t))&&(i.pendingcb++,n=P5e(this,i,s,r,e,t)),n};Tr.prototype.cork=function(){this._writableState.corked++};Tr.prototype.uncork=function(){var r=this._writableState;r.corked&&(r.corked--,!r.writing&&!r.corked&&!r.bufferProcessing&&r.bufferedRequest&&cce(this,r))};Tr.prototype.setDefaultEncoding=function(e){if(typeof e=="string"&&(e=e.toLowerCase()),!(["hex","utf8","utf-8","ascii","binary","base64","ucs2","ucs-2","utf16le","utf-16le","raw"].indexOf((e+"").toLowerCase())>-1))throw new Q5e(e);return this._writableState.defaultEncoding=e,this};Object.defineProperty(Tr.prototype,"writableBuffer",{enumerable:!1,get:function(){return this._writableState&&this._writableState.getBuffer()}});function x5e(r,e,t){return!r.objectMode&&r.decodeStrings!==!1&&typeof e=="string"&&(e=Cb.from(e,t)),e}Object.defineProperty(Tr.prototype,"writableHighWaterMark",{enumerable:!1,get:function(){return this._writableState.highWaterMark}});function P5e(r,e,t,i,n,s){if(!t){var o=x5e(e,i,n);i!==o&&(t=!0,n="buffer",i=o)}var a=e.objectMode?1:i.length;e.length+=a;var l=e.length<e.highWaterMark;if(l||(e.needDrain=!0),e.writing||e.corked){var c=e.lastBufferedRequest;e.lastBufferedRequest={chunk:i,encoding:n,isBuf:t,callback:s,next:null},c?c.next=e.lastBufferedRequest:e.bufferedRequest=e.lastBufferedRequest,e.bufferedRequestCount+=1}else QM(r,e,!1,a,i,n,s);return l}function QM(r,e,t,i,n,s,o){e.writelen=i,e.writecb=o,e.writing=!0,e.sync=!0,e.destroyed?e.onwrite(new y5e("write")):t?r._writev(n,e.onwrite):r._write(n,s,e.onwrite),e.sync=!1}function D5e(r,e,t,i,n){--e.pendingcb,t?(process.nextTick(n,i),process.nextTick(uE,r,e),r._writableState.errorEmitted=!0,ap(r,i)):(n(i),r._writableState.errorEmitted=!0,ap(r,i),uE(r,e))}function k5e(r){r.writing=!1,r.writecb=null,r.length-=r.writelen,r.writelen=0}function R5e(r,e){var t=r._writableState,i=t.sync,n=t.writecb;if(typeof n!="function")throw new E5e;if(k5e(t),e)D5e(r,t,i,e,n);else{var s=uce(t)||r.destroyed;!s&&!t.corked&&!t.bufferProcessing&&t.bufferedRequest&&cce(r,t),i?process.nextTick(ace,r,t,s,n):ace(r,t,s,n)}}function ace(r,e,t,i){t||F5e(r,e),e.pendingcb--,i(),uE(r,e)}function F5e(r,e){e.length===0&&e.needDrain&&(e.needDrain=!1,r.emit("drain"))}function cce(r,e){e.bufferProcessing=!0;var t=e.bufferedRequest;if(r._writev&&t&&t.next){var i=e.bufferedRequestCount,n=new Array(i),s=e.corkedRequestsFree;s.entry=t;for(var o=0,a=!0;t;)n[o]=t,t.isBuf||(a=!1),t=t.next,o+=1;n.allBuffers=a,QM(r,e,!0,e.length,n,"",s.finish),e.pendingcb++,e.lastBufferedRequest=null,s.next?(e.corkedRequestsFree=s.next,s.next=null):e.corkedRequestsFree=new Ace(e),e.bufferedRequestCount=0}else{for(;t;){var l=t.chunk,c=t.encoding,u=t.callback,g=e.objectMode?1:l.length;if(QM(r,e,!1,g,l,c,u),t=t.next,e.bufferedRequestCount--,e.writing)break}t===null&&(e.lastBufferedRequest=null)}e.bufferedRequest=t,e.bufferProcessing=!1}Tr.prototype._write=function(r,e,t){t(new m5e("_write()"))};Tr.prototype._writev=null;Tr.prototype.end=function(r,e,t){var i=this._writableState;return typeof r=="function"?(t=r,r=null,e=null):typeof e=="function"&&(t=e,e=null),r!=null&&this.write(r,e),i.corked&&(i.corked=1,this.uncork()),i.ending||T5e(this,i,t),this};Object.defineProperty(Tr.prototype,"writableLength",{enumerable:!1,get:function(){return this._writableState.length}});function uce(r){return r.ending&&r.length===0&&r.bufferedRequest===null&&!r.finished&&!r.writing}function N5e(r,e){r._final(function(t){e.pendingcb--,t&&ap(r,t),e.prefinished=!0,r.emit("prefinish"),uE(r,e)})}function L5e(r,e){!e.prefinished&&!e.finalCalled&&(typeof r._final=="function"&&!e.destroyed?(e.pendingcb++,e.finalCalled=!0,process.nextTick(N5e,r,e)):(e.prefinished=!0,r.emit("prefinish")))}function uE(r,e){var t=uce(e);if(t&&(L5e(r,e),e.pendingcb===0&&(e.finished=!0,r.emit("finish"),e.autoDestroy))){var i=r._readableState;(!i||i.autoDestroy&&i.endEmitted)&&r.destroy()}return t}function T5e(r,e,t){e.ending=!0,uE(r,e),t&&(e.finished?process.nextTick(t):r.once("finish",t)),e.ended=!0,r.writable=!1}function O5e(r,e,t){var i=r.entry;for(r.entry=null;i;){var n=i.callback;e.pendingcb--,n(t),i=i.next}e.corkedRequestsFree.next=r}Object.defineProperty(Tr.prototype,"destroyed",{enumerable:!1,get:function(){return this._writableState===void 0?!1:this._writableState.destroyed},set:function(e){!this._writableState||(this._writableState.destroyed=e)}});Tr.prototype.destroy=bM.destroy;Tr.prototype._undestroy=bM.undestroy;Tr.prototype._destroy=function(r,e){e(r)}});var Gu=w(($Qt,hce)=>{"use strict";var M5e=Object.keys||function(r){var e=[];for(var t in r)e.push(t);return e};hce.exports=oa;var fce=PM(),xM=SM();Bl()(oa,fce);for(vM=M5e(xM.prototype),mb=0;mb<vM.length;mb++)Eb=vM[mb],oa.prototype[Eb]||(oa.prototype[Eb]=xM.prototype[Eb]);var vM,Eb,mb;function oa(r){if(!(this instanceof oa))return new oa(r);fce.call(this,r),xM.call(this,r),this.allowHalfOpen=!0,r&&(r.readable===!1&&(this.readable=!1),r.writable===!1&&(this.writable=!1),r.allowHalfOpen===!1&&(this.allowHalfOpen=!1,this.once("end",K5e)))}Object.defineProperty(oa.prototype,"writableHighWaterMark",{enumerable:!1,get:function(){return this._writableState.highWaterMark}});Object.defineProperty(oa.prototype,"writableBuffer",{enumerable:!1,get:function(){return this._writableState&&this._writableState.getBuffer()}});Object.defineProperty(oa.prototype,"writableLength",{enumerable:!1,get:function(){return this._writableState.length}});function K5e(){this._writableState.ended||process.nextTick(U5e,this)}function U5e(r){r.end()}Object.defineProperty(oa.prototype,"destroyed",{enumerable:!1,get:function(){return this._readableState===void 0||this._writableState===void 0?!1:this._readableState.destroyed&&this._writableState.destroyed},set:function(e){this._readableState===void 0||this._writableState===void 0||(this._readableState.destroyed=e,this._writableState.destroyed=e)}})});var Cce=w((DM,dce)=>{var Ib=J("buffer"),gA=Ib.Buffer;function pce(r,e){for(var t in r)e[t]=r[t]}gA.from&&gA.alloc&&gA.allocUnsafe&&gA.allocUnsafeSlow?dce.exports=Ib:(pce(Ib,DM),DM.Buffer=Ap);function Ap(r,e,t){return gA(r,e,t)}pce(gA,Ap);Ap.from=function(r,e,t){if(typeof r=="number")throw new TypeError("Argument must not be a number");return gA(r,e,t)};Ap.alloc=function(r,e,t){if(typeof r!="number")throw new TypeError("Argument must be a number");var i=gA(r);return e!==void 0?typeof t=="string"?i.fill(e,t):i.fill(e):i.fill(0),i};Ap.allocUnsafe=function(r){if(typeof r!="number")throw new TypeError("Argument must be a number");return gA(r)};Ap.allocUnsafeSlow=function(r){if(typeof r!="number")throw new TypeError("Argument must be a number");return Ib.SlowBuffer(r)}});var FM=w(Ece=>{"use strict";var RM=Cce().Buffer,mce=RM.isEncoding||function(r){switch(r=""+r,r&&r.toLowerCase()){case"hex":case"utf8":case"utf-8":case"ascii":case"binary":case"base64":case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":case"raw":return!0;default:return!1}};function H5e(r){if(!r)return"utf8";for(var e;;)switch(r){case"utf8":case"utf-8":return"utf8";case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return"utf16le";case"latin1":case"binary":return"latin1";case"base64":case"ascii":case"hex":return r;default:if(e)return;r=(""+r).toLowerCase(),e=!0}}function G5e(r){var e=H5e(r);if(typeof e!="string"&&(RM.isEncoding===mce||!mce(r)))throw new Error("Unknown encoding: "+r);return e||r}Ece.StringDecoder=fE;function fE(r){this.encoding=G5e(r);var e;switch(this.encoding){case"utf16le":this.text=z5e,this.end=V5e,e=4;break;case"utf8":this.fillLast=q5e,e=4;break;case"base64":this.text=X5e,this.end=Z5e,e=3;break;default:this.write=_5e,this.end=$5e;return}this.lastNeed=0,this.lastTotal=0,this.lastChar=RM.allocUnsafe(e)}fE.prototype.write=function(r){if(r.length===0)return"";var e,t;if(this.lastNeed){if(e=this.fillLast(r),e===void 0)return"";t=this.lastNeed,this.lastNeed=0}else t=0;return t<r.length?e?e+this.text(r,t):this.text(r,t):e||""};fE.prototype.end=W5e;fE.prototype.text=J5e;fE.prototype.fillLast=function(r){if(this.lastNeed<=r.length)return r.copy(this.lastChar,this.lastTotal-this.lastNeed,0,this.lastNeed),this.lastChar.toString(this.encoding,0,this.lastTotal);r.copy(this.lastChar,this.lastTotal-this.lastNeed,0,r.length),this.lastNeed-=r.length};function kM(r){return r<=127?0:r>>5===6?2:r>>4===14?3:r>>3===30?4:r>>6===2?-1:-2}function Y5e(r,e,t){var i=e.length-1;if(i<t)return 0;var n=kM(e[i]);return n>=0?(n>0&&(r.lastNeed=n-1),n):--i<t||n===-2?0:(n=kM(e[i]),n>=0?(n>0&&(r.lastNeed=n-2),n):--i<t||n===-2?0:(n=kM(e[i]),n>=0?(n>0&&(n===2?n=0:r.lastNeed=n-3),n):0))}function j5e(r,e,t){if((e[0]&192)!==128)return r.lastNeed=0,"\uFFFD";if(r.lastNeed>1&&e.length>1){if((e[1]&192)!==128)return r.lastNeed=1,"\uFFFD";if(r.lastNeed>2&&e.length>2&&(e[2]&192)!==128)return r.lastNeed=2,"\uFFFD"}}function q5e(r){var e=this.lastTotal-this.lastNeed,t=j5e(this,r,e);if(t!==void 0)return t;if(this.lastNeed<=r.length)return r.copy(this.lastChar,e,0,this.lastNeed),this.lastChar.toString(this.encoding,0,this.lastTotal);r.copy(this.lastChar,e,0,r.length),this.lastNeed-=r.length}function J5e(r,e){var t=Y5e(this,r,e);if(!this.lastNeed)return r.toString("utf8",e);this.lastTotal=t;var i=r.length-(t-this.lastNeed);return r.copy(this.lastChar,0,i),r.toString("utf8",e,i)}function W5e(r){var e=r&&r.length?this.write(r):"";return this.lastNeed?e+"\uFFFD":e}function z5e(r,e){if((r.length-e)%2===0){var t=r.toString("utf16le",e);if(t){var i=t.charCodeAt(t.length-1);if(i>=55296&&i<=56319)return this.lastNeed=2,this.lastTotal=4,this.lastChar[0]=r[r.length-2],this.lastChar[1]=r[r.length-1],t.slice(0,-1)}return t}return this.lastNeed=1,this.lastTotal=2,this.lastChar[0]=r[r.length-1],r.toString("utf16le",e,r.length-1)}function V5e(r){var e=r&&r.length?this.write(r):"";if(this.lastNeed){var t=this.lastTotal-this.lastNeed;return e+this.lastChar.toString("utf16le",0,t)}return e}function X5e(r,e){var t=(r.length-e)%3;return t===0?r.toString("base64",e):(this.lastNeed=3-t,this.lastTotal=3,t===1?this.lastChar[0]=r[r.length-1]:(this.lastChar[0]=r[r.length-2],this.lastChar[1]=r[r.length-1]),r.toString("base64",e,r.length-t))}function Z5e(r){var e=r&&r.length?this.write(r):"";return this.lastNeed?e+this.lastChar.toString("base64",0,3-this.lastNeed):e}function _5e(r){return r.toString(this.encoding)}function $5e(r){return r&&r.length?this.write(r):""}});var yb=w((tbt,wce)=>{"use strict";var Ice=wl().codes.ERR_STREAM_PREMATURE_CLOSE;function e6e(r){var e=!1;return function(){if(!e){e=!0;for(var t=arguments.length,i=new Array(t),n=0;n<t;n++)i[n]=arguments[n];r.apply(this,i)}}}function t6e(){}function r6e(r){return r.setHeader&&typeof r.abort=="function"}function yce(r,e,t){if(typeof e=="function")return yce(r,null,e);e||(e={}),t=e6e(t||t6e);var i=e.readable||e.readable!==!1&&r.readable,n=e.writable||e.writable!==!1&&r.writable,s=function(){r.writable||a()},o=r._writableState&&r._writableState.finished,a=function(){n=!1,o=!0,i||t.call(r)},l=r._readableState&&r._readableState.endEmitted,c=function(){i=!1,l=!0,n||t.call(r)},u=function(p){t.call(r,p)},g=function(){var p;if(i&&!l)return(!r._readableState||!r._readableState.ended)&&(p=new Ice),t.call(r,p);if(n&&!o)return(!r._writableState||!r._writableState.ended)&&(p=new Ice),t.call(r,p)},f=function(){r.req.on("finish",a)};return r6e(r)?(r.on("complete",a),r.on("abort",g),r.req?f():r.on("request",f)):n&&!r._writableState&&(r.on("end",s),r.on("close",s)),r.on("end",c),r.on("finish",a),e.error!==!1&&r.on("error",u),r.on("close",g),function(){r.removeListener("complete",a),r.removeListener("abort",g),r.removeListener("request",f),r.req&&r.req.removeListener("finish",a),r.removeListener("end",s),r.removeListener("close",s),r.removeListener("finish",a),r.removeListener("end",c),r.removeListener("error",u),r.removeListener("close",g)}}wce.exports=yce});var Qce=w((rbt,Bce)=>{"use strict";var wb;function bl(r,e,t){return e in r?Object.defineProperty(r,e,{value:t,enumerable:!0,configurable:!0,writable:!0}):r[e]=t,r}var i6e=yb(),Sl=Symbol("lastResolve"),Yu=Symbol("lastReject"),hE=Symbol("error"),Bb=Symbol("ended"),ju=Symbol("lastPromise"),NM=Symbol("handlePromise"),qu=Symbol("stream");function vl(r,e){return{value:r,done:e}}function n6e(r){var e=r[Sl];if(e!==null){var t=r[qu].read();t!==null&&(r[ju]=null,r[Sl]=null,r[Yu]=null,e(vl(t,!1)))}}function s6e(r){process.nextTick(n6e,r)}function o6e(r,e){return function(t,i){r.then(function(){if(e[Bb]){t(vl(void 0,!0));return}e[NM](t,i)},i)}}var a6e=Object.getPrototypeOf(function(){}),A6e=Object.setPrototypeOf((wb={get stream(){return this[qu]},next:function(){var e=this,t=this[hE];if(t!==null)return Promise.reject(t);if(this[Bb])return Promise.resolve(vl(void 0,!0));if(this[qu].destroyed)return new Promise(function(o,a){process.nextTick(function(){e[hE]?a(e[hE]):o(vl(void 0,!0))})});var i=this[ju],n;if(i)n=new Promise(o6e(i,this));else{var s=this[qu].read();if(s!==null)return Promise.resolve(vl(s,!1));n=new Promise(this[NM])}return this[ju]=n,n}},bl(wb,Symbol.asyncIterator,function(){return this}),bl(wb,"return",function(){var e=this;return new Promise(function(t,i){e[qu].destroy(null,function(n){if(n){i(n);return}t(vl(void 0,!0))})})}),wb),a6e),l6e=function(e){var t,i=Object.create(A6e,(t={},bl(t,qu,{value:e,writable:!0}),bl(t,Sl,{value:null,writable:!0}),bl(t,Yu,{value:null,writable:!0}),bl(t,hE,{value:null,writable:!0}),bl(t,Bb,{value:e._readableState.endEmitted,writable:!0}),bl(t,NM,{value:function(s,o){var a=i[qu].read();a?(i[ju]=null,i[Sl]=null,i[Yu]=null,s(vl(a,!1))):(i[Sl]=s,i[Yu]=o)},writable:!0}),t));return i[ju]=null,i6e(e,function(n){if(n&&n.code!=="ERR_STREAM_PREMATURE_CLOSE"){var s=i[Yu];s!==null&&(i[ju]=null,i[Sl]=null,i[Yu]=null,s(n)),i[hE]=n;return}var o=i[Sl];o!==null&&(i[ju]=null,i[Sl]=null,i[Yu]=null,o(vl(void 0,!0))),i[Bb]=!0}),e.on("readable",s6e.bind(null,i)),i};Bce.exports=l6e});var xce=w((ibt,vce)=>{"use strict";function bce(r,e,t,i,n,s,o){try{var a=r[s](o),l=a.value}catch(c){t(c);return}a.done?e(l):Promise.resolve(l).then(i,n)}function c6e(r){return function(){var e=this,t=arguments;return new Promise(function(i,n){var s=r.apply(e,t);function o(l){bce(s,i,n,o,a,"next",l)}function a(l){bce(s,i,n,o,a,"throw",l)}o(void 0)})}}function Sce(r,e){var t=Object.keys(r);if(Object.getOwnPropertySymbols){var i=Object.getOwnPropertySymbols(r);e&&(i=i.filter(function(n){return Object.getOwnPropertyDescriptor(r,n).enumerable})),t.push.apply(t,i)}return t}function u6e(r){for(var e=1;e<arguments.length;e++){var t=arguments[e]!=null?arguments[e]:{};e%2?Sce(Object(t),!0).forEach(function(i){g6e(r,i,t[i])}):Object.getOwnPropertyDescriptors?Object.defineProperties(r,Object.getOwnPropertyDescriptors(t)):Sce(Object(t)).forEach(function(i){Object.defineProperty(r,i,Object.getOwnPropertyDescriptor(t,i))})}return r}function g6e(r,e,t){return e in r?Object.defineProperty(r,e,{value:t,enumerable:!0,configurable:!0,writable:!0}):r[e]=t,r}var f6e=wl().codes.ERR_INVALID_ARG_TYPE;function h6e(r,e,t){var i;if(e&&typeof e.next=="function")i=e;else if(e&&e[Symbol.asyncIterator])i=e[Symbol.asyncIterator]();else if(e&&e[Symbol.iterator])i=e[Symbol.iterator]();else throw new f6e("iterable",["Iterable"],e);var n=new r(u6e({objectMode:!0},t)),s=!1;n._read=function(){s||(s=!0,o())};function o(){return a.apply(this,arguments)}function a(){return a=c6e(function*(){try{var l=yield i.next(),c=l.value,u=l.done;u?n.push(null):n.push(yield c)?o():s=!1}catch(g){n.destroy(g)}}),a.apply(this,arguments)}return n}vce.exports=h6e});var PM=w((sbt,Mce)=>{"use strict";Mce.exports=Ut;var lp;Ut.ReadableState=Rce;var nbt=J("events").EventEmitter,kce=function(e,t){return e.listeners(t).length},dE=dM(),Qb=J("buffer").Buffer,p6e=global.Uint8Array||function(){};function d6e(r){return Qb.from(r)}function C6e(r){return Qb.isBuffer(r)||r instanceof p6e}var LM=J("util"),Dt;LM&&LM.debuglog?Dt=LM.debuglog("stream"):Dt=function(){};var m6e=Zle(),GM=EM(),E6e=IM(),I6e=E6e.getHighWaterMark,bb=wl().codes,y6e=bb.ERR_INVALID_ARG_TYPE,w6e=bb.ERR_STREAM_PUSH_AFTER_EOF,B6e=bb.ERR_METHOD_NOT_IMPLEMENTED,Q6e=bb.ERR_STREAM_UNSHIFT_AFTER_END_EVENT,cp,TM,OM;Bl()(Ut,dE);var pE=GM.errorOrDestroy,MM=["error","close","destroy","pause","resume"];function b6e(r,e,t){if(typeof r.prependListener=="function")return r.prependListener(e,t);!r._events||!r._events[e]?r.on(e,t):Array.isArray(r._events[e])?r._events[e].unshift(t):r._events[e]=[t,r._events[e]]}function Rce(r,e,t){lp=lp||Gu(),r=r||{},typeof t!="boolean"&&(t=e instanceof lp),this.objectMode=!!r.objectMode,t&&(this.objectMode=this.objectMode||!!r.readableObjectMode),this.highWaterMark=I6e(this,r,"readableHighWaterMark",t),this.buffer=new m6e,this.length=0,this.pipes=null,this.pipesCount=0,this.flowing=null,this.ended=!1,this.endEmitted=!1,this.reading=!1,this.sync=!0,this.needReadable=!1,this.emittedReadable=!1,this.readableListening=!1,this.resumeScheduled=!1,this.paused=!0,this.emitClose=r.emitClose!==!1,this.autoDestroy=!!r.autoDestroy,this.destroyed=!1,this.defaultEncoding=r.defaultEncoding||"utf8",this.awaitDrain=0,this.readingMore=!1,this.decoder=null,this.encoding=null,r.encoding&&(cp||(cp=FM().StringDecoder),this.decoder=new cp(r.encoding),this.encoding=r.encoding)}function Ut(r){if(lp=lp||Gu(),!(this instanceof Ut))return new Ut(r);var e=this instanceof lp;this._readableState=new Rce(r,this,e),this.readable=!0,r&&(typeof r.read=="function"&&(this._read=r.read),typeof r.destroy=="function"&&(this._destroy=r.destroy)),dE.call(this)}Object.defineProperty(Ut.prototype,"destroyed",{enumerable:!1,get:function(){return this._readableState===void 0?!1:this._readableState.destroyed},set:function(e){!this._readableState||(this._readableState.destroyed=e)}});Ut.prototype.destroy=GM.destroy;Ut.prototype._undestroy=GM.undestroy;Ut.prototype._destroy=function(r,e){e(r)};Ut.prototype.push=function(r,e){var t=this._readableState,i;return t.objectMode?i=!0:typeof r=="string"&&(e=e||t.defaultEncoding,e!==t.encoding&&(r=Qb.from(r,e),e=""),i=!0),Fce(this,r,e,!1,i)};Ut.prototype.unshift=function(r){return Fce(this,r,null,!0,!1)};function Fce(r,e,t,i,n){Dt("readableAddChunk",e);var s=r._readableState;if(e===null)s.reading=!1,x6e(r,s);else{var o;if(n||(o=S6e(s,e)),o)pE(r,o);else if(s.objectMode||e&&e.length>0)if(typeof e!="string"&&!s.objectMode&&Object.getPrototypeOf(e)!==Qb.prototype&&(e=d6e(e)),i)s.endEmitted?pE(r,new Q6e):KM(r,s,e,!0);else if(s.ended)pE(r,new w6e);else{if(s.destroyed)return!1;s.reading=!1,s.decoder&&!t?(e=s.decoder.write(e),s.objectMode||e.length!==0?KM(r,s,e,!1):HM(r,s)):KM(r,s,e,!1)}else i||(s.reading=!1,HM(r,s))}return!s.ended&&(s.length<s.highWaterMark||s.length===0)}function KM(r,e,t,i){e.flowing&&e.length===0&&!e.sync?(e.awaitDrain=0,r.emit("data",t)):(e.length+=e.objectMode?1:t.length,i?e.buffer.unshift(t):e.buffer.push(t),e.needReadable&&Sb(r)),HM(r,e)}function S6e(r,e){var t;return!C6e(e)&&typeof e!="string"&&e!==void 0&&!r.objectMode&&(t=new y6e("chunk",["string","Buffer","Uint8Array"],e)),t}Ut.prototype.isPaused=function(){return this._readableState.flowing===!1};Ut.prototype.setEncoding=function(r){cp||(cp=FM().StringDecoder);var e=new cp(r);this._readableState.decoder=e,this._readableState.encoding=this._readableState.decoder.encoding;for(var t=this._readableState.buffer.head,i="";t!==null;)i+=e.write(t.data),t=t.next;return this._readableState.buffer.clear(),i!==""&&this._readableState.buffer.push(i),this._readableState.length=i.length,this};var Pce=1073741824;function v6e(r){return r>=Pce?r=Pce:(r--,r|=r>>>1,r|=r>>>2,r|=r>>>4,r|=r>>>8,r|=r>>>16,r++),r}function Dce(r,e){return r<=0||e.length===0&&e.ended?0:e.objectMode?1:r!==r?e.flowing&&e.length?e.buffer.head.data.length:e.length:(r>e.highWaterMark&&(e.highWaterMark=v6e(r)),r<=e.length?r:e.ended?e.length:(e.needReadable=!0,0))}Ut.prototype.read=function(r){Dt("read",r),r=parseInt(r,10);var e=this._readableState,t=r;if(r!==0&&(e.emittedReadable=!1),r===0&&e.needReadable&&((e.highWaterMark!==0?e.length>=e.highWaterMark:e.length>0)||e.ended))return Dt("read: emitReadable",e.length,e.ended),e.length===0&&e.ended?UM(this):Sb(this),null;if(r=Dce(r,e),r===0&&e.ended)return e.length===0&&UM(this),null;var i=e.needReadable;Dt("need readable",i),(e.length===0||e.length-r<e.highWaterMark)&&(i=!0,Dt("length less than watermark",i)),e.ended||e.reading?(i=!1,Dt("reading or ended",i)):i&&(Dt("do read"),e.reading=!0,e.sync=!0,e.length===0&&(e.needReadable=!0),this._read(e.highWaterMark),e.sync=!1,e.reading||(r=Dce(t,e)));var n;return r>0?n=Tce(r,e):n=null,n===null?(e.needReadable=e.length<=e.highWaterMark,r=0):(e.length-=r,e.awaitDrain=0),e.length===0&&(e.ended||(e.needReadable=!0),t!==r&&e.ended&&UM(this)),n!==null&&this.emit("data",n),n};function x6e(r,e){if(Dt("onEofChunk"),!e.ended){if(e.decoder){var t=e.decoder.end();t&&t.length&&(e.buffer.push(t),e.length+=e.objectMode?1:t.length)}e.ended=!0,e.sync?Sb(r):(e.needReadable=!1,e.emittedReadable||(e.emittedReadable=!0,Nce(r)))}}function Sb(r){var e=r._readableState;Dt("emitReadable",e.needReadable,e.emittedReadable),e.needReadable=!1,e.emittedReadable||(Dt("emitReadable",e.flowing),e.emittedReadable=!0,process.nextTick(Nce,r))}function Nce(r){var e=r._readableState;Dt("emitReadable_",e.destroyed,e.length,e.ended),!e.destroyed&&(e.length||e.ended)&&(r.emit("readable"),e.emittedReadable=!1),e.needReadable=!e.flowing&&!e.ended&&e.length<=e.highWaterMark,YM(r)}function HM(r,e){e.readingMore||(e.readingMore=!0,process.nextTick(P6e,r,e))}function P6e(r,e){for(;!e.reading&&!e.ended&&(e.length<e.highWaterMark||e.flowing&&e.length===0);){var t=e.length;if(Dt("maybeReadMore read 0"),r.read(0),t===e.length)break}e.readingMore=!1}Ut.prototype._read=function(r){pE(this,new B6e("_read()"))};Ut.prototype.pipe=function(r,e){var t=this,i=this._readableState;switch(i.pipesCount){case 0:i.pipes=r;break;case 1:i.pipes=[i.pipes,r];break;default:i.pipes.push(r);break}i.pipesCount+=1,Dt("pipe count=%d opts=%j",i.pipesCount,e);var n=(!e||e.end!==!1)&&r!==process.stdout&&r!==process.stderr,s=n?a:C;i.endEmitted?process.nextTick(s):t.once("end",s),r.on("unpipe",o);function o(y,B){Dt("onunpipe"),y===t&&B&&B.hasUnpiped===!1&&(B.hasUnpiped=!0,u())}function a(){Dt("onend"),r.end()}var l=D6e(t);r.on("drain",l);var c=!1;function u(){Dt("cleanup"),r.removeListener("close",h),r.removeListener("finish",p),r.removeListener("drain",l),r.removeListener("error",f),r.removeListener("unpipe",o),t.removeListener("end",a),t.removeListener("end",C),t.removeListener("data",g),c=!0,i.awaitDrain&&(!r._writableState||r._writableState.needDrain)&&l()}t.on("data",g);function g(y){Dt("ondata");var B=r.write(y);Dt("dest.write",B),B===!1&&((i.pipesCount===1&&i.pipes===r||i.pipesCount>1&&Oce(i.pipes,r)!==-1)&&!c&&(Dt("false write response, pause",i.awaitDrain),i.awaitDrain++),t.pause())}function f(y){Dt("onerror",y),C(),r.removeListener("error",f),kce(r,"error")===0&&pE(r,y)}b6e(r,"error",f);function h(){r.removeListener("finish",p),C()}r.once("close",h);function p(){Dt("onfinish"),r.removeListener("close",h),C()}r.once("finish",p);function C(){Dt("unpipe"),t.unpipe(r)}return r.emit("pipe",t),i.flowing||(Dt("pipe resume"),t.resume()),r};function D6e(r){return function(){var t=r._readableState;Dt("pipeOnDrain",t.awaitDrain),t.awaitDrain&&t.awaitDrain--,t.awaitDrain===0&&kce(r,"data")&&(t.flowing=!0,YM(r))}}Ut.prototype.unpipe=function(r){var e=this._readableState,t={hasUnpiped:!1};if(e.pipesCount===0)return this;if(e.pipesCount===1)return r&&r!==e.pipes?this:(r||(r=e.pipes),e.pipes=null,e.pipesCount=0,e.flowing=!1,r&&r.emit("unpipe",this,t),this);if(!r){var i=e.pipes,n=e.pipesCount;e.pipes=null,e.pipesCount=0,e.flowing=!1;for(var s=0;s<n;s++)i[s].emit("unpipe",this,{hasUnpiped:!1});return this}var o=Oce(e.pipes,r);return o===-1?this:(e.pipes.splice(o,1),e.pipesCount-=1,e.pipesCount===1&&(e.pipes=e.pipes[0]),r.emit("unpipe",this,t),this)};Ut.prototype.on=function(r,e){var t=dE.prototype.on.call(this,r,e),i=this._readableState;return r==="data"?(i.readableListening=this.listenerCount("readable")>0,i.flowing!==!1&&this.resume()):r==="readable"&&!i.endEmitted&&!i.readableListening&&(i.readableListening=i.needReadable=!0,i.flowing=!1,i.emittedReadable=!1,Dt("on readable",i.length,i.reading),i.length?Sb(this):i.reading||process.nextTick(k6e,this)),t};Ut.prototype.addListener=Ut.prototype.on;Ut.prototype.removeListener=function(r,e){var t=dE.prototype.removeListener.call(this,r,e);return r==="readable"&&process.nextTick(Lce,this),t};Ut.prototype.removeAllListeners=function(r){var e=dE.prototype.removeAllListeners.apply(this,arguments);return(r==="readable"||r===void 0)&&process.nextTick(Lce,this),e};function Lce(r){var e=r._readableState;e.readableListening=r.listenerCount("readable")>0,e.resumeScheduled&&!e.paused?e.flowing=!0:r.listenerCount("data")>0&&r.resume()}function k6e(r){Dt("readable nexttick read 0"),r.read(0)}Ut.prototype.resume=function(){var r=this._readableState;return r.flowing||(Dt("resume"),r.flowing=!r.readableListening,R6e(this,r)),r.paused=!1,this};function R6e(r,e){e.resumeScheduled||(e.resumeScheduled=!0,process.nextTick(F6e,r,e))}function F6e(r,e){Dt("resume",e.reading),e.reading||r.read(0),e.resumeScheduled=!1,r.emit("resume"),YM(r),e.flowing&&!e.reading&&r.read(0)}Ut.prototype.pause=function(){return Dt("call pause flowing=%j",this._readableState.flowing),this._readableState.flowing!==!1&&(Dt("pause"),this._readableState.flowing=!1,this.emit("pause")),this._readableState.paused=!0,this};function YM(r){var e=r._readableState;for(Dt("flow",e.flowing);e.flowing&&r.read()!==null;);}Ut.prototype.wrap=function(r){var e=this,t=this._readableState,i=!1;r.on("end",function(){if(Dt("wrapped end"),t.decoder&&!t.ended){var o=t.decoder.end();o&&o.length&&e.push(o)}e.push(null)}),r.on("data",function(o){if(Dt("wrapped data"),t.decoder&&(o=t.decoder.write(o)),!(t.objectMode&&o==null)&&!(!t.objectMode&&(!o||!o.length))){var a=e.push(o);a||(i=!0,r.pause())}});for(var n in r)this[n]===void 0&&typeof r[n]=="function"&&(this[n]=function(a){return function(){return r[a].apply(r,arguments)}}(n));for(var s=0;s<MM.length;s++)r.on(MM[s],this.emit.bind(this,MM[s]));return this._read=function(o){Dt("wrapped _read",o),i&&(i=!1,r.resume())},this};typeof Symbol=="function"&&(Ut.prototype[Symbol.asyncIterator]=function(){return TM===void 0&&(TM=Qce()),TM(this)});Object.defineProperty(Ut.prototype,"readableHighWaterMark",{enumerable:!1,get:function(){return this._readableState.highWaterMark}});Object.defineProperty(Ut.prototype,"readableBuffer",{enumerable:!1,get:function(){return this._readableState&&this._readableState.buffer}});Object.defineProperty(Ut.prototype,"readableFlowing",{enumerable:!1,get:function(){return this._readableState.flowing},set:function(e){this._readableState&&(this._readableState.flowing=e)}});Ut._fromList=Tce;Object.defineProperty(Ut.prototype,"readableLength",{enumerable:!1,get:function(){return this._readableState.length}});function Tce(r,e){if(e.length===0)return null;var t;return e.objectMode?t=e.buffer.shift():!r||r>=e.length?(e.decoder?t=e.buffer.join(""):e.buffer.length===1?t=e.buffer.first():t=e.buffer.concat(e.length),e.buffer.clear()):t=e.buffer.consume(r,e.decoder),t}function UM(r){var e=r._readableState;Dt("endReadable",e.endEmitted),e.endEmitted||(e.ended=!0,process.nextTick(N6e,e,r))}function N6e(r,e){if(Dt("endReadableNT",r.endEmitted,r.length),!r.endEmitted&&r.length===0&&(r.endEmitted=!0,e.readable=!1,e.emit("end"),r.autoDestroy)){var t=e._writableState;(!t||t.autoDestroy&&t.finished)&&e.destroy()}}typeof Symbol=="function"&&(Ut.from=function(r,e){return OM===void 0&&(OM=xce()),OM(Ut,r,e)});function Oce(r,e){for(var t=0,i=r.length;t<i;t++)if(r[t]===e)return t;return-1}});var jM=w((obt,Uce)=>{"use strict";Uce.exports=fA;var vb=wl().codes,L6e=vb.ERR_METHOD_NOT_IMPLEMENTED,T6e=vb.ERR_MULTIPLE_CALLBACK,O6e=vb.ERR_TRANSFORM_ALREADY_TRANSFORMING,M6e=vb.ERR_TRANSFORM_WITH_LENGTH_0,xb=Gu();Bl()(fA,xb);function K6e(r,e){var t=this._transformState;t.transforming=!1;var i=t.writecb;if(i===null)return this.emit("error",new T6e);t.writechunk=null,t.writecb=null,e!=null&&this.push(e),i(r);var n=this._readableState;n.reading=!1,(n.needReadable||n.length<n.highWaterMark)&&this._read(n.highWaterMark)}function fA(r){if(!(this instanceof fA))return new fA(r);xb.call(this,r),this._transformState={afterTransform:K6e.bind(this),needTransform:!1,transforming:!1,writecb:null,writechunk:null,writeencoding:null},this._readableState.needReadable=!0,this._readableState.sync=!1,r&&(typeof r.transform=="function"&&(this._transform=r.transform),typeof r.flush=="function"&&(this._flush=r.flush)),this.on("prefinish",U6e)}function U6e(){var r=this;typeof this._flush=="function"&&!this._readableState.destroyed?this._flush(function(e,t){Kce(r,e,t)}):Kce(this,null,null)}fA.prototype.push=function(r,e){return this._transformState.needTransform=!1,xb.prototype.push.call(this,r,e)};fA.prototype._transform=function(r,e,t){t(new L6e("_transform()"))};fA.prototype._write=function(r,e,t){var i=this._transformState;if(i.writecb=t,i.writechunk=r,i.writeencoding=e,!i.transforming){var n=this._readableState;(i.needTransform||n.needReadable||n.length<n.highWaterMark)&&this._read(n.highWaterMark)}};fA.prototype._read=function(r){var e=this._transformState;e.writechunk!==null&&!e.transforming?(e.transforming=!0,this._transform(e.writechunk,e.writeencoding,e.afterTransform)):e.needTransform=!0};fA.prototype._destroy=function(r,e){xb.prototype._destroy.call(this,r,function(t){e(t)})};function Kce(r,e,t){if(e)return r.emit("error",e);if(t!=null&&r.push(t),r._writableState.length)throw new M6e;if(r._transformState.transforming)throw new O6e;return r.push(null)}});var Yce=w((abt,Gce)=>{"use strict";Gce.exports=CE;var Hce=jM();Bl()(CE,Hce);function CE(r){if(!(this instanceof CE))return new CE(r);Hce.call(this,r)}CE.prototype._transform=function(r,e,t){t(null,r)}});var zce=w((Abt,Wce)=>{"use strict";var qM;function H6e(r){var e=!1;return function(){e||(e=!0,r.apply(void 0,arguments))}}var Jce=wl().codes,G6e=Jce.ERR_MISSING_ARGS,Y6e=Jce.ERR_STREAM_DESTROYED;function jce(r){if(r)throw r}function j6e(r){return r.setHeader&&typeof r.abort=="function"}function q6e(r,e,t,i){i=H6e(i);var n=!1;r.on("close",function(){n=!0}),qM===void 0&&(qM=yb()),qM(r,{readable:e,writable:t},function(o){if(o)return i(o);n=!0,i()});var s=!1;return function(o){if(!n&&!s){if(s=!0,j6e(r))return r.abort();if(typeof r.destroy=="function")return r.destroy();i(o||new Y6e("pipe"))}}}function qce(r){r()}function J6e(r,e){return r.pipe(e)}function W6e(r){return!r.length||typeof r[r.length-1]!="function"?jce:r.pop()}function z6e(){for(var r=arguments.length,e=new Array(r),t=0;t<r;t++)e[t]=arguments[t];var i=W6e(e);if(Array.isArray(e[0])&&(e=e[0]),e.length<2)throw new G6e("streams");var n,s=e.map(function(o,a){var l=a<e.length-1,c=a>0;return q6e(o,l,c,function(u){n||(n=u),u&&s.forEach(qce),!l&&(s.forEach(qce),i(n))})});return e.reduce(J6e)}Wce.exports=z6e});var up=w((Ts,EE)=>{var mE=J("stream");process.env.READABLE_STREAM==="disable"&&mE?(EE.exports=mE.Readable,Object.assign(EE.exports,mE),EE.exports.Stream=mE):(Ts=EE.exports=PM(),Ts.Stream=mE||Ts,Ts.Readable=Ts,Ts.Writable=SM(),Ts.Duplex=Gu(),Ts.Transform=jM(),Ts.PassThrough=Yce(),Ts.finished=yb(),Ts.pipeline=zce())});var Zce=w((lbt,Xce)=>{"use strict";var{Buffer:Eo}=J("buffer"),Vce=Symbol.for("BufferList");function fr(r){if(!(this instanceof fr))return new fr(r);fr._init.call(this,r)}fr._init=function(e){Object.defineProperty(this,Vce,{value:!0}),this._bufs=[],this.length=0,e&&this.append(e)};fr.prototype._new=function(e){return new fr(e)};fr.prototype._offset=function(e){if(e===0)return[0,0];let t=0;for(let i=0;i<this._bufs.length;i++){let n=t+this._bufs[i].length;if(e<n||i===this._bufs.length-1)return[i,e-t];t=n}};fr.prototype._reverseOffset=function(r){let e=r[0],t=r[1];for(let i=0;i<e;i++)t+=this._bufs[i].length;return t};fr.prototype.get=function(e){if(e>this.length||e<0)return;let t=this._offset(e);return this._bufs[t[0]][t[1]]};fr.prototype.slice=function(e,t){return typeof e=="number"&&e<0&&(e+=this.length),typeof t=="number"&&t<0&&(t+=this.length),this.copy(null,0,e,t)};fr.prototype.copy=function(e,t,i,n){if((typeof i!="number"||i<0)&&(i=0),(typeof n!="number"||n>this.length)&&(n=this.length),i>=this.length||n<=0)return e||Eo.alloc(0);let s=!!e,o=this._offset(i),a=n-i,l=a,c=s&&t||0,u=o[1];if(i===0&&n===this.length){if(!s)return this._bufs.length===1?this._bufs[0]:Eo.concat(this._bufs,this.length);for(let g=0;g<this._bufs.length;g++)this._bufs[g].copy(e,c),c+=this._bufs[g].length;return e}if(l<=this._bufs[o[0]].length-u)return s?this._bufs[o[0]].copy(e,t,u,u+l):this._bufs[o[0]].slice(u,u+l);s||(e=Eo.allocUnsafe(a));for(let g=o[0];g<this._bufs.length;g++){let f=this._bufs[g].length-u;if(l>f)this._bufs[g].copy(e,c,u),c+=f;else{this._bufs[g].copy(e,c,u,u+l),c+=f;break}l-=f,u&&(u=0)}return e.length>c?e.slice(0,c):e};fr.prototype.shallowSlice=function(e,t){if(e=e||0,t=typeof t!="number"?this.length:t,e<0&&(e+=this.length),t<0&&(t+=this.length),e===t)return this._new();let i=this._offset(e),n=this._offset(t),s=this._bufs.slice(i[0],n[0]+1);return n[1]===0?s.pop():s[s.length-1]=s[s.length-1].slice(0,n[1]),i[1]!==0&&(s[0]=s[0].slice(i[1])),this._new(s)};fr.prototype.toString=function(e,t,i){return this.slice(t,i).toString(e)};fr.prototype.consume=function(e){if(e=Math.trunc(e),Number.isNaN(e)||e<=0)return this;for(;this._bufs.length;)if(e>=this._bufs[0].length)e-=this._bufs[0].length,this.length-=this._bufs[0].length,this._bufs.shift();else{this._bufs[0]=this._bufs[0].slice(e),this.length-=e;break}return this};fr.prototype.duplicate=function(){let e=this._new();for(let t=0;t<this._bufs.length;t++)e.append(this._bufs[t]);return e};fr.prototype.append=function(e){if(e==null)return this;if(e.buffer)this._appendBuffer(Eo.from(e.buffer,e.byteOffset,e.byteLength));else if(Array.isArray(e))for(let t=0;t<e.length;t++)this.append(e[t]);else if(this._isBufferList(e))for(let t=0;t<e._bufs.length;t++)this.append(e._bufs[t]);else typeof e=="number"&&(e=e.toString()),this._appendBuffer(Eo.from(e));return this};fr.prototype._appendBuffer=function(e){this._bufs.push(e),this.length+=e.length};fr.prototype.indexOf=function(r,e,t){if(t===void 0&&typeof e=="string"&&(t=e,e=void 0),typeof r=="function"||Array.isArray(r))throw new TypeError('The "value" argument must be one of type string, Buffer, BufferList, or Uint8Array.');if(typeof r=="number"?r=Eo.from([r]):typeof r=="string"?r=Eo.from(r,t):this._isBufferList(r)?r=r.slice():Array.isArray(r.buffer)?r=Eo.from(r.buffer,r.byteOffset,r.byteLength):Eo.isBuffer(r)||(r=Eo.from(r)),e=Number(e||0),isNaN(e)&&(e=0),e<0&&(e=this.length+e),e<0&&(e=0),r.length===0)return e>this.length?this.length:e;let i=this._offset(e),n=i[0],s=i[1];for(;n<this._bufs.length;n++){let o=this._bufs[n];for(;s<o.length;)if(o.length-s>=r.length){let l=o.indexOf(r,s);if(l!==-1)return this._reverseOffset([n,l]);s=o.length-r.length+1}else{let l=this._reverseOffset([n,s]);if(this._match(l,r))return l;s++}s=0}return-1};fr.prototype._match=function(r,e){if(this.length-r<e.length)return!1;for(let t=0;t<e.length;t++)if(this.get(r+t)!==e[t])return!1;return!0};(function(){let r={readDoubleBE:8,readDoubleLE:8,readFloatBE:4,readFloatLE:4,readInt32BE:4,readInt32LE:4,readUInt32BE:4,readUInt32LE:4,readInt16BE:2,readInt16LE:2,readUInt16BE:2,readUInt16LE:2,readInt8:1,readUInt8:1,readIntBE:null,readIntLE:null,readUIntBE:null,readUIntLE:null};for(let e in r)(function(t){r[t]===null?fr.prototype[t]=function(i,n){return this.slice(i,i+n)[t](0,n)}:fr.prototype[t]=function(i=0){return this.slice(i,i+r[t])[t](0)}})(e)})();fr.prototype._isBufferList=function(e){return e instanceof fr||fr.isBufferList(e)};fr.isBufferList=function(e){return e!=null&&e[Vce]};Xce.exports=fr});var _ce=w((cbt,Pb)=>{"use strict";var JM=up().Duplex,V6e=Bl(),IE=Zce();function qi(r){if(!(this instanceof qi))return new qi(r);if(typeof r=="function"){this._callback=r;let e=function(i){this._callback&&(this._callback(i),this._callback=null)}.bind(this);this.on("pipe",function(i){i.on("error",e)}),this.on("unpipe",function(i){i.removeListener("error",e)}),r=null}IE._init.call(this,r),JM.call(this)}V6e(qi,JM);Object.assign(qi.prototype,IE.prototype);qi.prototype._new=function(e){return new qi(e)};qi.prototype._write=function(e,t,i){this._appendBuffer(e),typeof i=="function"&&i()};qi.prototype._read=function(e){if(!this.length)return this.push(null);e=Math.min(e,this.length),this.push(this.slice(0,e)),this.consume(e)};qi.prototype.end=function(e){JM.prototype.end.call(this,e),this._callback&&(this._callback(null,this.slice()),this._callback=null)};qi.prototype._destroy=function(e,t){this._bufs.length=0,this.length=0,t(e)};qi.prototype._isBufferList=function(e){return e instanceof qi||e instanceof IE||qi.isBufferList(e)};qi.isBufferList=IE.isBufferList;Pb.exports=qi;Pb.exports.BufferListStream=qi;Pb.exports.BufferList=IE});var VM=w(fp=>{var X6e=Buffer.alloc,Z6e="0000000000000000000",_6e="7777777777777777777",$ce="0".charCodeAt(0),eue=Buffer.from("ustar\0","binary"),$6e=Buffer.from("00","binary"),eVe=Buffer.from("ustar ","binary"),tVe=Buffer.from(" \0","binary"),rVe=parseInt("7777",8),yE=257,zM=263,iVe=function(r,e,t){return typeof r!="number"?t:(r=~~r,r>=e?e:r>=0||(r+=e,r>=0)?r:0)},nVe=function(r){switch(r){case 0:return"file";case 1:return"link";case 2:return"symlink";case 3:return"character-device";case 4:return"block-device";case 5:return"directory";case 6:return"fifo";case 7:return"contiguous-file";case 72:return"pax-header";case 55:return"pax-global-header";case 27:return"gnu-long-link-path";case 28:case 30:return"gnu-long-path"}return null},sVe=function(r){switch(r){case"file":return 0;case"link":return 1;case"symlink":return 2;case"character-device":return 3;case"block-device":return 4;case"directory":return 5;case"fifo":return 6;case"contiguous-file":return 7;case"pax-header":return 72}return 0},tue=function(r,e,t,i){for(;t<i;t++)if(r[t]===e)return t;return i},rue=function(r){for(var e=256,t=0;t<148;t++)e+=r[t];for(var i=156;i<512;i++)e+=r[i];return e},xl=function(r,e){return r=r.toString(8),r.length>e?_6e.slice(0,e)+" ":Z6e.slice(0,e-r.length)+r+" "};function oVe(r){var e;if(r[0]===128)e=!0;else if(r[0]===255)e=!1;else return null;for(var t=[],i=r.length-1;i>0;i--){var n=r[i];e?t.push(n):t.push(255-n)}var s=0,o=t.length;for(i=0;i<o;i++)s+=t[i]*Math.pow(256,i);return e?s:-1*s}var Pl=function(r,e,t){if(r=r.slice(e,e+t),e=0,r[e]&128)return oVe(r);for(;e<r.length&&r[e]===32;)e++;for(var i=iVe(tue(r,32,e,r.length),r.length,r.length);e<i&&r[e]===0;)e++;return i===e?0:parseInt(r.slice(e,i).toString(),8)},gp=function(r,e,t,i){return r.slice(e,tue(r,0,e,e+t)).toString(i)},WM=function(r){var e=Buffer.byteLength(r),t=Math.floor(Math.log(e)/Math.log(10))+1;return e+t>=Math.pow(10,t)&&t++,e+t+r};fp.decodeLongPath=function(r,e){return gp(r,0,r.length,e)};fp.encodePax=function(r){var e="";r.name&&(e+=WM(" path="+r.name+`
-`)),r.linkname&&(e+=WM(" linkpath="+r.linkname+`
-`));var t=r.pax;if(t)for(var i in t)e+=WM(" "+i+"="+t[i]+`
-`);return Buffer.from(e)};fp.decodePax=function(r){for(var e={};r.length;){for(var t=0;t<r.length&&r[t]!==32;)t++;var i=parseInt(r.slice(0,t).toString(),10);if(!i)return e;var n=r.slice(t+1,i-1).toString(),s=n.indexOf("=");if(s===-1)return e;e[n.slice(0,s)]=n.slice(s+1),r=r.slice(i)}return e};fp.encode=function(r){var e=X6e(512),t=r.name,i="";if(r.typeflag===5&&t[t.length-1]!=="/"&&(t+="/"),Buffer.byteLength(t)!==t.length)return null;for(;Buffer.byteLength(t)>100;){var n=t.indexOf("/");if(n===-1)return null;i+=i?"/"+t.slice(0,n):t.slice(0,n),t=t.slice(n+1)}return Buffer.byteLength(t)>100||Buffer.byteLength(i)>155||r.linkname&&Buffer.byteLength(r.linkname)>100?null:(e.write(t),e.write(xl(r.mode&rVe,6),100),e.write(xl(r.uid,6),108),e.write(xl(r.gid,6),116),e.write(xl(r.size,11),124),e.write(xl(r.mtime.getTime()/1e3|0,11),136),e[156]=$ce+sVe(r.type),r.linkname&&e.write(r.linkname,157),eue.copy(e,yE),$6e.copy(e,zM),r.uname&&e.write(r.uname,265),r.gname&&e.write(r.gname,297),e.write(xl(r.devmajor||0,6),329),e.write(xl(r.devminor||0,6),337),i&&e.write(i,345),e.write(xl(rue(e),6),148),e)};fp.decode=function(r,e,t){var i=r[156]===0?0:r[156]-$ce,n=gp(r,0,100,e),s=Pl(r,100,8),o=Pl(r,108,8),a=Pl(r,116,8),l=Pl(r,124,12),c=Pl(r,136,12),u=nVe(i),g=r[157]===0?null:gp(r,157,100,e),f=gp(r,265,32),h=gp(r,297,32),p=Pl(r,329,8),C=Pl(r,337,8),y=rue(r);if(y===8*32)return null;if(y!==Pl(r,148,8))throw new Error("Invalid tar header. Maybe the tar is corrupted or it needs to be gunzipped?");if(eue.compare(r,yE,yE+6)===0)r[345]&&(n=gp(r,345,155,e)+"/"+n);else if(!(eVe.compare(r,yE,yE+6)===0&&tVe.compare(r,zM,zM+2)===0)){if(!t)throw new Error("Invalid tar header: unknown format.")}return i===0&&n&&n[n.length-1]==="/"&&(i=5),{name:n,mode:s,uid:o,gid:a,size:l,mtime:new Date(1e3*c),type:u,linkname:g,uname:f,gname:h,devmajor:p,devminor:C}}});var lue=w((gbt,Aue)=>{var nue=J("util"),aVe=_ce(),wE=VM(),sue=up().Writable,oue=up().PassThrough,aue=function(){},iue=function(r){return r&=511,r&&512-r},AVe=function(r,e){var t=new Db(r,e);return t.end(),t},lVe=function(r,e){return e.path&&(r.name=e.path),e.linkpath&&(r.linkname=e.linkpath),e.size&&(r.size=parseInt(e.size,10)),r.pax=e,r},Db=function(r,e){this._parent=r,this.offset=e,oue.call(this,{autoDestroy:!1})};nue.inherits(Db,oue);Db.prototype.destroy=function(r){this._parent.destroy(r)};var hA=function(r){if(!(this instanceof hA))return new hA(r);sue.call(this,r),r=r||{},this._offset=0,this._buffer=aVe(),this._missing=0,this._partial=!1,this._onparse=aue,this._header=null,this._stream=null,this._overflow=null,this._cb=null,this._locked=!1,this._destroyed=!1,this._pax=null,this._paxGlobal=null,this._gnuLongPath=null,this._gnuLongLinkPath=null;var e=this,t=e._buffer,i=function(){e._continue()},n=function(f){if(e._locked=!1,f)return e.destroy(f);e._stream||i()},s=function(){e._stream=null;var f=iue(e._header.size);f?e._parse(f,o):e._parse(512,g),e._locked||i()},o=function(){e._buffer.consume(iue(e._header.size)),e._parse(512,g),i()},a=function(){var f=e._header.size;e._paxGlobal=wE.decodePax(t.slice(0,f)),t.consume(f),s()},l=function(){var f=e._header.size;e._pax=wE.decodePax(t.slice(0,f)),e._paxGlobal&&(e._pax=Object.assign({},e._paxGlobal,e._pax)),t.consume(f),s()},c=function(){var f=e._header.size;this._gnuLongPath=wE.decodeLongPath(t.slice(0,f),r.filenameEncoding),t.consume(f),s()},u=function(){var f=e._header.size;this._gnuLongLinkPath=wE.decodeLongPath(t.slice(0,f),r.filenameEncoding),t.consume(f),s()},g=function(){var f=e._offset,h;try{h=e._header=wE.decode(t.slice(0,512),r.filenameEncoding,r.allowUnknownFormat)}catch(p){e.emit("error",p)}if(t.consume(512),!h){e._parse(512,g),i();return}if(h.type==="gnu-long-path"){e._parse(h.size,c),i();return}if(h.type==="gnu-long-link-path"){e._parse(h.size,u),i();return}if(h.type==="pax-global-header"){e._parse(h.size,a),i();return}if(h.type==="pax-header"){e._parse(h.size,l),i();return}if(e._gnuLongPath&&(h.name=e._gnuLongPath,e._gnuLongPath=null),e._gnuLongLinkPath&&(h.linkname=e._gnuLongLinkPath,e._gnuLongLinkPath=null),e._pax&&(e._header=h=lVe(h,e._pax),e._pax=null),e._locked=!0,!h.size||h.type==="directory"){e._parse(512,g),e.emit("entry",h,AVe(e,f),n);return}e._stream=new Db(e,f),e.emit("entry",h,e._stream,n),e._parse(h.size,s),i()};this._onheader=g,this._parse(512,g)};nue.inherits(hA,sue);hA.prototype.destroy=function(r){this._destroyed||(this._destroyed=!0,r&&this.emit("error",r),this.emit("close"),this._stream&&this._stream.emit("close"))};hA.prototype._parse=function(r,e){this._destroyed||(this._offset+=r,this._missing=r,e===this._onheader&&(this._partial=!1),this._onparse=e)};hA.prototype._continue=function(){if(!this._destroyed){var r=this._cb;this._cb=aue,this._overflow?this._write(this._overflow,void 0,r):r()}};hA.prototype._write=function(r,e,t){if(!this._destroyed){var i=this._stream,n=this._buffer,s=this._missing;if(r.length&&(this._partial=!0),r.length<s)return this._missing-=r.length,this._overflow=null,i?i.write(r,t):(n.append(r),t());this._cb=t,this._missing=0;var o=null;r.length>s&&(o=r.slice(s),r=r.slice(0,s)),i?i.end(r):n.append(r),this._overflow=o,this._onparse()}};hA.prototype._final=function(r){if(this._partial)return this.destroy(new Error("Unexpected end of data"));r()};Aue.exports=hA});var uue=w((fbt,cue)=>{cue.exports=J("fs").constants||J("constants")});var due=w((hbt,pue)=>{var hp=uue(),gue=Pk(),Rb=Bl(),cVe=Buffer.alloc,fue=up().Readable,pp=up().Writable,uVe=J("string_decoder").StringDecoder,kb=VM(),gVe=parseInt("755",8),fVe=parseInt("644",8),hue=cVe(1024),ZM=function(){},XM=function(r,e){e&=511,e&&r.push(hue.slice(0,512-e))};function hVe(r){switch(r&hp.S_IFMT){case hp.S_IFBLK:return"block-device";case hp.S_IFCHR:return"character-device";case hp.S_IFDIR:return"directory";case hp.S_IFIFO:return"fifo";case hp.S_IFLNK:return"symlink"}return"file"}var Fb=function(r){pp.call(this),this.written=0,this._to=r,this._destroyed=!1};Rb(Fb,pp);Fb.prototype._write=function(r,e,t){if(this.written+=r.length,this._to.push(r))return t();this._to._drain=t};Fb.prototype.destroy=function(){this._destroyed||(this._destroyed=!0,this.emit("close"))};var Nb=function(){pp.call(this),this.linkname="",this._decoder=new uVe("utf-8"),this._destroyed=!1};Rb(Nb,pp);Nb.prototype._write=function(r,e,t){this.linkname+=this._decoder.write(r),t()};Nb.prototype.destroy=function(){this._destroyed||(this._destroyed=!0,this.emit("close"))};var BE=function(){pp.call(this),this._destroyed=!1};Rb(BE,pp);BE.prototype._write=function(r,e,t){t(new Error("No body allowed for this entry"))};BE.prototype.destroy=function(){this._destroyed||(this._destroyed=!0,this.emit("close"))};var aa=function(r){if(!(this instanceof aa))return new aa(r);fue.call(this,r),this._drain=ZM,this._finalized=!1,this._finalizing=!1,this._destroyed=!1,this._stream=null};Rb(aa,fue);aa.prototype.entry=function(r,e,t){if(this._stream)throw new Error("already piping an entry");if(!(this._finalized||this._destroyed)){typeof e=="function"&&(t=e,e=null),t||(t=ZM);var i=this;if((!r.size||r.type==="symlink")&&(r.size=0),r.type||(r.type=hVe(r.mode)),r.mode||(r.mode=r.type==="directory"?gVe:fVe),r.uid||(r.uid=0),r.gid||(r.gid=0),r.mtime||(r.mtime=new Date),typeof e=="string"&&(e=Buffer.from(e)),Buffer.isBuffer(e)){r.size=e.length,this._encode(r);var n=this.push(e);return XM(i,r.size),n?process.nextTick(t):this._drain=t,new BE}if(r.type==="symlink"&&!r.linkname){var s=new Nb;return gue(s,function(a){if(a)return i.destroy(),t(a);r.linkname=s.linkname,i._encode(r),t()}),s}if(this._encode(r),r.type!=="file"&&r.type!=="contiguous-file")return process.nextTick(t),new BE;var o=new Fb(this);return this._stream=o,gue(o,function(a){if(i._stream=null,a)return i.destroy(),t(a);if(o.written!==r.size)return i.destroy(),t(new Error("size mismatch"));XM(i,r.size),i._finalizing&&i.finalize(),t()}),o}};aa.prototype.finalize=function(){if(this._stream){this._finalizing=!0;return}this._finalized||(this._finalized=!0,this.push(hue),this.push(null))};aa.prototype.destroy=function(r){this._destroyed||(this._destroyed=!0,r&&this.emit("error",r),this.emit("close"),this._stream&&this._stream.destroy&&this._stream.destroy())};aa.prototype._encode=function(r){if(!r.pax){var e=kb.encode(r);if(e){this.push(e);return}}this._encodePax(r)};aa.prototype._encodePax=function(r){var e=kb.encodePax({name:r.name,linkname:r.linkname,pax:r.pax}),t={name:"PaxHeader",mode:r.mode,uid:r.uid,gid:r.gid,size:e.length,mtime:r.mtime,type:"pax-header",linkname:r.linkname&&"PaxHeader",uname:r.uname,gname:r.gname,devmajor:r.devmajor,devminor:r.devminor};this.push(kb.encode(t)),this.push(e),XM(this,e.length),t.size=r.size,t.type=r.type,this.push(kb.encode(t))};aa.prototype._read=function(r){var e=this._drain;this._drain=ZM,e()};pue.exports=aa});var Cue=w(_M=>{_M.extract=lue();_M.pack=due()});var Pue=w((Tbt,xue)=>{"use strict";var Wu=class{constructor(e,t,i){this.__specs=e||{},Object.keys(this.__specs).forEach(n=>{if(typeof this.__specs[n]=="string"){let s=this.__specs[n],o=this.__specs[s];if(o){let a=o.aliases||[];a.push(n,s),o.aliases=[...new Set(a)],this.__specs[n]=o}else throw new Error(`Alias refers to invalid key: ${s} -> ${n}`)}}),this.__opts=t||{},this.__providers=Sue(i.filter(n=>n!=null&&typeof n=="object")),this.__isFiggyPudding=!0}get(e){return n1(this,e,!0)}get[Symbol.toStringTag](){return"FiggyPudding"}forEach(e,t=this){for(let[i,n]of this.entries())e.call(t,n,i,this)}toJSON(){let e={};return this.forEach((t,i)=>{e[i]=t}),e}*entries(e){for(let i of Object.keys(this.__specs))yield[i,this.get(i)];let t=e||this.__opts.other;if(t){let i=new Set;for(let n of this.__providers){let s=n.entries?n.entries(t):PVe(n);for(let[o,a]of s)t(o)&&!i.has(o)&&(i.add(o),yield[o,a])}}}*[Symbol.iterator](){for(let[e,t]of this.entries())yield[e,t]}*keys(){for(let[e]of this.entries())yield e}*values(){for(let[,e]of this.entries())yield e}concat(...e){return new Proxy(new Wu(this.__specs,this.__opts,Sue(this.__providers).concat(e)),vue)}};try{let r=J("util");Wu.prototype[r.inspect.custom]=function(e,t){return this[Symbol.toStringTag]+" "+r.inspect(this.toJSON(),t)}}catch{}function vVe(r){throw Object.assign(new Error(`invalid config key requested: ${r}`),{code:"EBADKEY"})}function n1(r,e,t){let i=r.__specs[e];if(t&&!i&&(!r.__opts.other||!r.__opts.other(e)))vVe(e);else{i||(i={});let n;for(let s of r.__providers){if(n=bue(e,s),n===void 0&&i.aliases&&i.aliases.length){for(let o of i.aliases)if(o!==e&&(n=bue(o,s),n!==void 0))break}if(n!==void 0)break}return n===void 0&&i.default!==void 0?typeof i.default=="function"?i.default(r):i.default:n}}function bue(r,e){let t;return e.__isFiggyPudding?t=n1(e,r,!1):typeof e.get=="function"?t=e.get(r):t=e[r],t}var vue={has(r,e){return e in r.__specs&&n1(r,e,!1)!==void 0},ownKeys(r){return Object.keys(r.__specs)},get(r,e){return typeof e=="symbol"||e.slice(0,2)==="__"||e in Wu.prototype?r[e]:r.get(e)},set(r,e,t){if(typeof e=="symbol"||e.slice(0,2)==="__")return r[e]=t,!0;throw new Error("figgyPudding options cannot be modified. Use .concat() instead.")},deleteProperty(){throw new Error("figgyPudding options cannot be deleted. Use .concat() and shadow them instead.")}};xue.exports=xVe;function xVe(r,e){function t(...i){return new Proxy(new Wu(r,e,i),vue)}return t}function Sue(r){let e=[];return r.forEach(t=>e.unshift(t)),e}function PVe(r){return Object.keys(r).map(e=>[e,r[e]])}});var Rue=w((Obt,ca)=>{"use strict";var bE=J("crypto"),DVe=Pue(),kVe=J("stream").Transform,Due=["sha256","sha384","sha512"],RVe=/^[a-z0-9+/]+(?:=?=?)$/i,FVe=/^([^-]+)-([^?]+)([?\S*]*)$/,NVe=/^([^-]+)-([A-Za-z0-9+/=]{44,88})(\?[\x21-\x7E]*)*$/,LVe=/^[\x21-\x7E]+$/,on=DVe({algorithms:{default:["sha512"]},error:{default:!1},integrity:{},options:{default:[]},pickAlgorithm:{default:()=>YVe},Promise:{default:()=>Promise},sep:{default:" "},single:{default:!1},size:{},strict:{default:!1}}),Dl=class{get isHash(){return!0}constructor(e,t){t=on(t);let i=!!t.strict;this.source=e.trim();let n=this.source.match(i?NVe:FVe);if(!n||i&&!Due.some(o=>o===n[1]))return;this.algorithm=n[1],this.digest=n[2];let s=n[3];this.options=s?s.slice(1).split("?"):[]}hexDigest(){return this.digest&&Buffer.from(this.digest,"base64").toString("hex")}toJSON(){return this.toString()}toString(e){if(e=on(e),e.strict&&!(Due.some(i=>i===this.algorithm)&&this.digest.match(RVe)&&(this.options||[]).every(i=>i.match(LVe))))return"";let t=this.options&&this.options.length?`?${this.options.join("?")}`:"";return`${this.algorithm}-${this.digest}${t}`}},zu=class{get isIntegrity(){return!0}toJSON(){return this.toString()}toString(e){e=on(e);let t=e.sep||" ";return e.strict&&(t=t.replace(/\S+/g," ")),Object.keys(this).map(i=>this[i].map(n=>Dl.prototype.toString.call(n,e)).filter(n=>n.length).join(t)).filter(i=>i.length).join(t)}concat(e,t){t=on(t);let i=typeof e=="string"?e:QE(e,t);return la(`${this.toString(t)} ${i}`,t)}hexDigest(){return la(this,{single:!0}).hexDigest()}match(e,t){t=on(t);let i=la(e,t),n=i.pickAlgorithm(t);return this[n]&&i[n]&&this[n].find(s=>i[n].find(o=>s.digest===o.digest))||!1}pickAlgorithm(e){e=on(e);let t=e.pickAlgorithm,i=Object.keys(this);if(!i.length)throw new Error(`No algorithms available for ${JSON.stringify(this.toString())}`);return i.reduce((n,s)=>t(n,s)||n)}};ca.exports.parse=la;function la(r,e){if(e=on(e),typeof r=="string")return s1(r,e);if(r.algorithm&&r.digest){let t=new zu;return t[r.algorithm]=[r],s1(QE(t,e),e)}else return s1(QE(r,e),e)}function s1(r,e){return e.single?new Dl(r,e):r.trim().split(/\s+/).reduce((t,i)=>{let n=new Dl(i,e);if(n.algorithm&&n.digest){let s=n.algorithm;t[s]||(t[s]=[]),t[s].push(n)}return t},new zu)}ca.exports.stringify=QE;function QE(r,e){return e=on(e),r.algorithm&&r.digest?Dl.prototype.toString.call(r,e):typeof r=="string"?QE(la(r,e),e):zu.prototype.toString.call(r,e)}ca.exports.fromHex=TVe;function TVe(r,e,t){t=on(t);let i=t.options&&t.options.length?`?${t.options.join("?")}`:"";return la(`${e}-${Buffer.from(r,"hex").toString("base64")}${i}`,t)}ca.exports.fromData=OVe;function OVe(r,e){e=on(e);let t=e.algorithms,i=e.options&&e.options.length?`?${e.options.join("?")}`:"";return t.reduce((n,s)=>{let o=bE.createHash(s).update(r).digest("base64"),a=new Dl(`${s}-${o}${i}`,e);if(a.algorithm&&a.digest){let l=a.algorithm;n[l]||(n[l]=[]),n[l].push(a)}return n},new zu)}ca.exports.fromStream=MVe;function MVe(r,e){e=on(e);let t=e.Promise||Promise,i=o1(e);return new t((n,s)=>{r.pipe(i),r.on("error",s),i.on("error",s);let o;i.on("integrity",a=>{o=a}),i.on("end",()=>n(o)),i.on("data",()=>{})})}ca.exports.checkData=KVe;function KVe(r,e,t){if(t=on(t),e=la(e,t),!Object.keys(e).length){if(t.error)throw Object.assign(new Error("No valid integrity hashes to check against"),{code:"EINTEGRITY"});return!1}let i=e.pickAlgorithm(t),n=bE.createHash(i).update(r).digest("base64"),s=la({algorithm:i,digest:n}),o=s.match(e,t);if(o||!t.error)return o;if(typeof t.size=="number"&&r.length!==t.size){let a=new Error(`data size mismatch when checking ${e}.
-  Wanted: ${t.size}
-  Found: ${r.length}`);throw a.code="EBADSIZE",a.found=r.length,a.expected=t.size,a.sri=e,a}else{let a=new Error(`Integrity checksum failed when using ${i}: Wanted ${e}, but got ${s}. (${r.length} bytes)`);throw a.code="EINTEGRITY",a.found=s,a.expected=e,a.algorithm=i,a.sri=e,a}}ca.exports.checkStream=UVe;function UVe(r,e,t){t=on(t);let i=t.Promise||Promise,n=o1(t.concat({integrity:e}));return new i((s,o)=>{r.pipe(n),r.on("error",o),n.on("error",o);let a;n.on("verified",l=>{a=l}),n.on("end",()=>s(a)),n.on("data",()=>{})})}ca.exports.integrityStream=o1;function o1(r){r=on(r);let e=r.integrity&&la(r.integrity,r),t=e&&Object.keys(e).length,i=t&&e.pickAlgorithm(r),n=t&&e[i],s=Array.from(new Set(r.algorithms.concat(i?[i]:[]))),o=s.map(bE.createHash),a=0,l=new kVe({transform(c,u,g){a+=c.length,o.forEach(f=>f.update(c,u)),g(null,c,u)}}).on("end",()=>{let c=r.options&&r.options.length?`?${r.options.join("?")}`:"",u=la(o.map((f,h)=>`${s[h]}-${f.digest("base64")}${c}`).join(" "),r),g=t&&u.match(e,r);if(typeof r.size=="number"&&a!==r.size){let f=new Error(`stream size mismatch when checking ${e}.
-  Wanted: ${r.size}
-  Found: ${a}`);f.code="EBADSIZE",f.found=a,f.expected=r.size,f.sri=e,l.emit("error",f)}else if(r.integrity&&!g){let f=new Error(`${e} integrity checksum failed when using ${i}: wanted ${n} but got ${u}. (${a} bytes)`);f.code="EINTEGRITY",f.found=u,f.expected=n,f.algorithm=i,f.sri=e,l.emit("error",f)}else l.emit("size",a),l.emit("integrity",u),g&&l.emit("verified",g)});return l}ca.exports.create=HVe;function HVe(r){r=on(r);let e=r.algorithms,t=r.options.length?`?${r.options.join("?")}`:"",i=e.map(bE.createHash);return{update:function(n,s){return i.forEach(o=>o.update(n,s)),this},digest:function(n){return e.reduce((o,a)=>{let l=i.shift().digest("base64"),c=new Dl(`${a}-${l}${t}`,r);if(c.algorithm&&c.digest){let u=c.algorithm;o[u]||(o[u]=[]),o[u].push(c)}return o},new zu)}}}var GVe=new Set(bE.getHashes()),kue=["md5","whirlpool","sha1","sha224","sha256","sha384","sha512","sha3","sha3-256","sha3-384","sha3-512","sha3_256","sha3_384","sha3_512"].filter(r=>GVe.has(r));function YVe(r,e){return kue.indexOf(r.toLowerCase())>=kue.indexOf(e.toLowerCase())?r:e}});var im={};ut(im,{BuildType:()=>F0,Cache:()=>Rt,Configuration:()=>ye,DEFAULT_LOCK_FILENAME:()=>ok,DEFAULT_RC_FILENAME:()=>sk,FormatType:()=>xi,InstallMode:()=>$n,LightReport:()=>ra,LinkType:()=>df,Manifest:()=>ot,MessageName:()=>Ct,MultiFetcher:()=>vf,PackageExtensionStatus:()=>Xx,PackageExtensionType:()=>Vx,Project:()=>je,ProjectLookup:()=>ck,Report:()=>vi,ReportError:()=>at,SettingsType:()=>ak,StreamReport:()=>Ge,TAG_REGEXP:()=>Pf,TelemetryManager:()=>Bh,ThrowReport:()=>ti,VirtualFetcher:()=>Df,Workspace:()=>wh,WorkspaceFetcher:()=>Rf,WorkspaceResolver:()=>jr,YarnVersion:()=>Lr,execUtils:()=>Cr,folderUtils:()=>kw,formatUtils:()=>ee,hashUtils:()=>li,httpUtils:()=>Xt,miscUtils:()=>Ie,nodeUtils:()=>Is,parseMessageName:()=>RI,scriptUtils:()=>Wt,semverUtils:()=>vt,stringifyMessageName:()=>RA,structUtils:()=>P,tgzUtils:()=>mi,treeUtils:()=>_n});var Cr={};ut(Cr,{EndStrategy:()=>hk,ExecError:()=>Kw,PipeError:()=>hC,execvp:()=>tk,pipevp:()=>Wo});var qp={};ut(qp,{AliasFS:()=>bo,CwdFS:()=>qt,DEFAULT_COMPRESSION_LEVEL:()=>Jl,FakeFS:()=>Ea,Filename:()=>xt,JailFS:()=>So,LazyFS:()=>Bg,LinkStrategy:()=>dS,NoFS:()=>Gp,NodeFS:()=>$t,PortablePath:()=>Oe,PosixFS:()=>Qg,ProxiedFS:()=>pi,VirtualFS:()=>Br,ZipFS:()=>Wr,ZipOpenFS:()=>On,constants:()=>xr,extendFs:()=>nI,normalizeLineEndings:()=>ql,npath:()=>K,opendir:()=>ZE,patchFs:()=>QS,ppath:()=>x,statUtils:()=>Tp,toFilename:()=>Ur,xfs:()=>M});var xr={};ut(xr,{SAFE_TIME:()=>eK,S_IFDIR:()=>Gl,S_IFLNK:()=>jl,S_IFMT:()=>Ys,S_IFREG:()=>Yl});var Ys=61440,Gl=16384,Yl=32768,jl=40960,eK=456789e3;var Tp={};ut(Tp,{BigIntStatsEntry:()=>Ig,DEFAULT_MODE:()=>Np,DirEntry:()=>lS,StatEntry:()=>ma,areStatsEqual:()=>uS,clearStats:()=>YE,convertToBigIntStats:()=>jE,makeDefaultStats:()=>Lp,makeEmptyStats:()=>kge});var cS=Pe(J("util"));var Np=33188,lS=class{constructor(){this.name="";this.mode=0}isBlockDevice(){return!1}isCharacterDevice(){return!1}isDirectory(){return(this.mode&61440)===16384}isFIFO(){return!1}isFile(){return(this.mode&61440)===32768}isSocket(){return!1}isSymbolicLink(){return(this.mode&61440)===40960}},ma=class{constructor(){this.uid=0;this.gid=0;this.size=0;this.blksize=0;this.atimeMs=0;this.mtimeMs=0;this.ctimeMs=0;this.birthtimeMs=0;this.atime=new Date(0);this.mtime=new Date(0);this.ctime=new Date(0);this.birthtime=new Date(0);this.dev=0;this.ino=0;this.mode=Np;this.nlink=1;this.rdev=0;this.blocks=1}isBlockDevice(){return!1}isCharacterDevice(){return!1}isDirectory(){return(this.mode&61440)===16384}isFIFO(){return!1}isFile(){return(this.mode&61440)===32768}isSocket(){return!1}isSymbolicLink(){return(this.mode&61440)===40960}},Ig=class{constructor(){this.uid=BigInt(0);this.gid=BigInt(0);this.size=BigInt(0);this.blksize=BigInt(0);this.atimeMs=BigInt(0);this.mtimeMs=BigInt(0);this.ctimeMs=BigInt(0);this.birthtimeMs=BigInt(0);this.atimeNs=BigInt(0);this.mtimeNs=BigInt(0);this.ctimeNs=BigInt(0);this.birthtimeNs=BigInt(0);this.atime=new Date(0);this.mtime=new Date(0);this.ctime=new Date(0);this.birthtime=new Date(0);this.dev=BigInt(0);this.ino=BigInt(0);this.mode=BigInt(Np);this.nlink=BigInt(1);this.rdev=BigInt(0);this.blocks=BigInt(1)}isBlockDevice(){return!1}isCharacterDevice(){return!1}isDirectory(){return(this.mode&BigInt(61440))===BigInt(16384)}isFIFO(){return!1}isFile(){return(this.mode&BigInt(61440))===BigInt(32768)}isSocket(){return!1}isSymbolicLink(){return(this.mode&BigInt(61440))===BigInt(40960)}};function Lp(){return new ma}function kge(){return YE(Lp())}function YE(r){for(let e in r)if(Object.prototype.hasOwnProperty.call(r,e)){let t=r[e];typeof t=="number"?r[e]=0:typeof t=="bigint"?r[e]=BigInt(0):cS.types.isDate(t)&&(r[e]=new Date(0))}return r}function jE(r){let e=new Ig;for(let t in r)if(Object.prototype.hasOwnProperty.call(r,t)){let i=r[t];typeof i=="number"?e[t]=BigInt(i):cS.types.isDate(i)&&(e[t]=new Date(i))}return e.atimeNs=e.atimeMs*BigInt(1e6),e.mtimeNs=e.mtimeMs*BigInt(1e6),e.ctimeNs=e.ctimeMs*BigInt(1e6),e.birthtimeNs=e.birthtimeMs*BigInt(1e6),e}function uS(r,e){if(r.atimeMs!==e.atimeMs||r.birthtimeMs!==e.birthtimeMs||r.blksize!==e.blksize||r.blocks!==e.blocks||r.ctimeMs!==e.ctimeMs||r.dev!==e.dev||r.gid!==e.gid||r.ino!==e.ino||r.isBlockDevice()!==e.isBlockDevice()||r.isCharacterDevice()!==e.isCharacterDevice()||r.isDirectory()!==e.isDirectory()||r.isFIFO()!==e.isFIFO()||r.isFile()!==e.isFile()||r.isSocket()!==e.isSocket()||r.isSymbolicLink()!==e.isSymbolicLink()||r.mode!==e.mode||r.mtimeMs!==e.mtimeMs||r.nlink!==e.nlink||r.rdev!==e.rdev||r.size!==e.size||r.uid!==e.uid)return!1;let t=r,i=e;return!(t.atimeNs!==i.atimeNs||t.mtimeNs!==i.mtimeNs||t.ctimeNs!==i.ctimeNs||t.birthtimeNs!==i.birthtimeNs)}var JE=Pe(J("fs"));var Op=Pe(J("path"));var Oe={root:"/",dot:".",parent:".."},xt={nodeModules:"node_modules",manifest:"package.json",lockfile:"yarn.lock",virtual:"__virtual__",pnpJs:".pnp.js",pnpCjs:".pnp.cjs",rc:".yarnrc.yml"},K=Object.create(Op.default),x=Object.create(Op.default.posix);K.cwd=()=>process.cwd();x.cwd=()=>gS(process.cwd());x.resolve=(...r)=>r.length>0&&x.isAbsolute(r[0])?Op.default.posix.resolve(...r):Op.default.posix.resolve(x.cwd(),...r);var tK=function(r,e,t){return e=r.normalize(e),t=r.normalize(t),e===t?".":(e.endsWith(r.sep)||(e=e+r.sep),t.startsWith(e)?t.slice(e.length):null)};K.fromPortablePath=rK;K.toPortablePath=gS;K.contains=(r,e)=>tK(K,r,e);x.contains=(r,e)=>tK(x,r,e);var Rge=/^([a-zA-Z]:.*)$/,Fge=/^\/\/(\.\/)?(.*)$/,Nge=/^\/([a-zA-Z]:.*)$/,Lge=/^\/unc\/(\.dot\/)?(.*)$/;function rK(r){if(process.platform!=="win32")return r;let e,t;if(e=r.match(Nge))r=e[1];else if(t=r.match(Lge))r=`\\\\${t[1]?".\\":""}${t[2]}`;else return r;return r.replace(/\//g,"\\")}function gS(r){if(process.platform!=="win32")return r;r=r.replace(/\\/g,"/");let e,t;return(e=r.match(Rge))?r=`/${e[1]}`:(t=r.match(Fge))&&(r=`/unc/${t[1]?".dot/":""}${t[2]}`),r}function qE(r,e){return r===K?rK(e):gS(e)}function Ur(r){if(K.parse(r).dir!==""||x.parse(r).dir!=="")throw new Error(`Invalid filename: "${r}"`);return r}var WE=new Date(456789e3*1e3),dS=(t=>(t.Allow="allow",t.ReadOnly="readOnly",t))(dS||{});async function iK(r,e,t,i,n){let s=r.pathUtils.normalize(e),o=t.pathUtils.normalize(i),a=[],l=[],{atime:c,mtime:u}=n.stableTime?{atime:WE,mtime:WE}:await t.lstatPromise(o);await r.mkdirpPromise(r.pathUtils.dirname(e),{utimes:[c,u]});let g=typeof r.lutimesPromise=="function"?r.lutimesPromise.bind(r):r.utimesPromise.bind(r);await hS(a,l,g,r,s,t,o,{...n,didParentExist:!0});for(let f of a)await f();await Promise.all(l.map(f=>f()))}async function hS(r,e,t,i,n,s,o,a){var h,p;let l=a.didParentExist?await Tge(i,n):null,c=await s.lstatPromise(o),{atime:u,mtime:g}=a.stableTime?{atime:WE,mtime:WE}:c,f;switch(!0){case c.isDirectory():f=await Oge(r,e,t,i,n,l,s,o,c,a);break;case c.isFile():f=await Kge(r,e,t,i,n,l,s,o,c,a);break;case c.isSymbolicLink():f=await Uge(r,e,t,i,n,l,s,o,c,a);break;default:throw new Error(`Unsupported file type (${c.mode})`)}return(f||((h=l==null?void 0:l.mtime)==null?void 0:h.getTime())!==g.getTime()||((p=l==null?void 0:l.atime)==null?void 0:p.getTime())!==u.getTime())&&(e.push(()=>t(n,u,g)),f=!0),(l===null||(l.mode&511)!==(c.mode&511))&&(e.push(()=>i.chmodPromise(n,c.mode&511)),f=!0),f}async function Tge(r,e){try{return await r.lstatPromise(e)}catch{return null}}async function Oge(r,e,t,i,n,s,o,a,l,c){if(s!==null&&!s.isDirectory())if(c.overwrite)r.push(async()=>i.removePromise(n)),s=null;else return!1;let u=!1;s===null&&(r.push(async()=>{try{await i.mkdirPromise(n,{mode:l.mode})}catch(h){if(h.code!=="EEXIST")throw h}}),u=!0);let g=await o.readdirPromise(a),f=c.didParentExist&&!s?{...c,didParentExist:!1}:c;if(c.stableSort)for(let h of g.sort())await hS(r,e,t,i,i.pathUtils.join(n,h),o,o.pathUtils.join(a,h),f)&&(u=!0);else(await Promise.all(g.map(async p=>{await hS(r,e,t,i,i.pathUtils.join(n,p),o,o.pathUtils.join(a,p),f)}))).some(p=>p)&&(u=!0);return u}var fS=new WeakMap;function pS(r,e,t,i,n){return async()=>{await r.linkPromise(t,e),n==="readOnly"&&(i.mode&=-147,await r.chmodPromise(e,i.mode))}}function Mge(r,e,t,i,n){let s=fS.get(r);return typeof s>"u"?async()=>{try{await r.copyFilePromise(t,e,JE.default.constants.COPYFILE_FICLONE_FORCE),fS.set(r,!0)}catch(o){if(o.code==="ENOSYS"||o.code==="ENOTSUP")fS.set(r,!1),await pS(r,e,t,i,n)();else throw o}}:s?async()=>r.copyFilePromise(t,e,JE.default.constants.COPYFILE_FICLONE_FORCE):pS(r,e,t,i,n)}async function Kge(r,e,t,i,n,s,o,a,l,c){var f;if(s!==null)if(c.overwrite)r.push(async()=>i.removePromise(n)),s=null;else return!1;let u=(f=c.linkStrategy)!=null?f:null,g=i===o?u!==null?Mge(i,n,a,l,u):async()=>i.copyFilePromise(a,n,JE.default.constants.COPYFILE_FICLONE):u!==null?pS(i,n,a,l,u):async()=>i.writeFilePromise(n,await o.readFilePromise(a));return r.push(async()=>g()),!0}async function Uge(r,e,t,i,n,s,o,a,l,c){if(s!==null)if(c.overwrite)r.push(async()=>i.removePromise(n)),s=null;else return!1;return r.push(async()=>{await i.symlinkPromise(qE(i.pathUtils,await o.readlinkPromise(a)),n)}),!0}function os(r,e){return Object.assign(new Error(`${r}: ${e}`),{code:r})}function VE(r){return os("EBUSY",r)}function Mp(r,e){return os("ENOSYS",`${r}, ${e}`)}function SA(r){return os("EINVAL",`invalid argument, ${r}`)}function Hr(r){return os("EBADF",`bad file descriptor, ${r}`)}function js(r){return os("ENOENT",`no such file or directory, ${r}`)}function Qo(r){return os("ENOTDIR",`not a directory, ${r}`)}function Kp(r){return os("EISDIR",`illegal operation on a directory, ${r}`)}function XE(r){return os("EEXIST",`file already exists, ${r}`)}function ln(r){return os("EROFS",`read-only filesystem, ${r}`)}function nK(r){return os("ENOTEMPTY",`directory not empty, ${r}`)}function sK(r){return os("EOPNOTSUPP",`operation not supported, ${r}`)}function oK(){return os("ERR_DIR_CLOSED","Directory handle was closed")}var zE=class extends Error{constructor(t,i){super(t);this.name="Libzip Error",this.code=i}};var mS=class{constructor(e,t,i={}){this.path=e;this.nextDirent=t;this.opts=i;this.closed=!1}throwIfClosed(){if(this.closed)throw oK()}async*[Symbol.asyncIterator](){try{let e;for(;(e=await this.read())!==null;)yield e}finally{await this.close()}}read(e){let t=this.readSync();return typeof e<"u"?e(null,t):Promise.resolve(t)}readSync(){return this.throwIfClosed(),this.nextDirent()}close(e){return this.closeSync(),typeof e<"u"?e(null):Promise.resolve()}closeSync(){var e,t;this.throwIfClosed(),(t=(e=this.opts).onClose)==null||t.call(e),this.closed=!0}};function ZE(r,e,t,i){let n=()=>{let s=t.shift();return typeof s>"u"?null:Object.assign(r.statSync(r.pathUtils.join(e,s)),{name:s})};return new mS(e,n,i)}var aK=J("os");var Ea=class{constructor(e){this.pathUtils=e}async*genTraversePromise(e,{stableSort:t=!1}={}){let i=[e];for(;i.length>0;){let n=i.shift();if((await this.lstatPromise(n)).isDirectory()){let o=await this.readdirPromise(n);if(t)for(let a of o.sort())i.push(this.pathUtils.join(n,a));else throw new Error("Not supported")}else yield n}}async removePromise(e,{recursive:t=!0,maxRetries:i=5}={}){let n;try{n=await this.lstatPromise(e)}catch(s){if(s.code==="ENOENT")return;throw s}if(n.isDirectory()){if(t){let s=await this.readdirPromise(e);await Promise.all(s.map(o=>this.removePromise(this.pathUtils.resolve(e,o))))}for(let s=0;s<=i;s++)try{await this.rmdirPromise(e);break}catch(o){if(o.code!=="EBUSY"&&o.code!=="ENOTEMPTY")throw o;s<i&&await new Promise(a=>setTimeout(a,s*100))}}else await this.unlinkPromise(e)}removeSync(e,{recursive:t=!0}={}){let i;try{i=this.lstatSync(e)}catch(n){if(n.code==="ENOENT")return;throw n}if(i.isDirectory()){if(t)for(let n of this.readdirSync(e))this.removeSync(this.pathUtils.resolve(e,n));this.rmdirSync(e)}else this.unlinkSync(e)}async mkdirpPromise(e,{chmod:t,utimes:i}={}){if(e=this.resolve(e),e===this.pathUtils.dirname(e))return;let n=e.split(this.pathUtils.sep),s;for(let o=2;o<=n.length;++o){let a=n.slice(0,o).join(this.pathUtils.sep);if(!this.existsSync(a)){try{await this.mkdirPromise(a)}catch(l){if(l.code==="EEXIST")continue;throw l}if(s!=null||(s=a),t!=null&&await this.chmodPromise(a,t),i!=null)await this.utimesPromise(a,i[0],i[1]);else{let l=await this.statPromise(this.pathUtils.dirname(a));await this.utimesPromise(a,l.atime,l.mtime)}}}return s}mkdirpSync(e,{chmod:t,utimes:i}={}){if(e=this.resolve(e),e===this.pathUtils.dirname(e))return;let n=e.split(this.pathUtils.sep),s;for(let o=2;o<=n.length;++o){let a=n.slice(0,o).join(this.pathUtils.sep);if(!this.existsSync(a)){try{this.mkdirSync(a)}catch(l){if(l.code==="EEXIST")continue;throw l}if(s!=null||(s=a),t!=null&&this.chmodSync(a,t),i!=null)this.utimesSync(a,i[0],i[1]);else{let l=this.statSync(this.pathUtils.dirname(a));this.utimesSync(a,l.atime,l.mtime)}}}return s}async copyPromise(e,t,{baseFs:i=this,overwrite:n=!0,stableSort:s=!1,stableTime:o=!1,linkStrategy:a=null}={}){return await iK(this,e,i,t,{overwrite:n,stableSort:s,stableTime:o,linkStrategy:a})}copySync(e,t,{baseFs:i=this,overwrite:n=!0}={}){let s=i.lstatSync(t),o=this.existsSync(e);if(s.isDirectory()){this.mkdirpSync(e);let l=i.readdirSync(t);for(let c of l)this.copySync(this.pathUtils.join(e,c),i.pathUtils.join(t,c),{baseFs:i,overwrite:n})}else if(s.isFile()){if(!o||n){o&&this.removeSync(e);let l=i.readFileSync(t);this.writeFileSync(e,l)}}else if(s.isSymbolicLink()){if(!o||n){o&&this.removeSync(e);let l=i.readlinkSync(t);this.symlinkSync(qE(this.pathUtils,l),e)}}else throw new Error(`Unsupported file type (file: ${t}, mode: 0o${s.mode.toString(8).padStart(6,"0")})`);let a=s.mode&511;this.chmodSync(e,a)}async changeFilePromise(e,t,i={}){return Buffer.isBuffer(t)?this.changeFileBufferPromise(e,t,i):this.changeFileTextPromise(e,t,i)}async changeFileBufferPromise(e,t,{mode:i}={}){let n=Buffer.alloc(0);try{n=await this.readFilePromise(e)}catch{}Buffer.compare(n,t)!==0&&await this.writeFilePromise(e,t,{mode:i})}async changeFileTextPromise(e,t,{automaticNewlines:i,mode:n}={}){let s="";try{s=await this.readFilePromise(e,"utf8")}catch{}let o=i?ql(s,t):t;s!==o&&await this.writeFilePromise(e,o,{mode:n})}changeFileSync(e,t,i={}){return Buffer.isBuffer(t)?this.changeFileBufferSync(e,t,i):this.changeFileTextSync(e,t,i)}changeFileBufferSync(e,t,{mode:i}={}){let n=Buffer.alloc(0);try{n=this.readFileSync(e)}catch{}Buffer.compare(n,t)!==0&&this.writeFileSync(e,t,{mode:i})}changeFileTextSync(e,t,{automaticNewlines:i=!1,mode:n}={}){let s="";try{s=this.readFileSync(e,"utf8")}catch{}let o=i?ql(s,t):t;s!==o&&this.writeFileSync(e,o,{mode:n})}async movePromise(e,t){try{await this.renamePromise(e,t)}catch(i){if(i.code==="EXDEV")await this.copyPromise(t,e),await this.removePromise(e);else throw i}}moveSync(e,t){try{this.renameSync(e,t)}catch(i){if(i.code==="EXDEV")this.copySync(t,e),this.removeSync(e);else throw i}}async lockPromise(e,t){let i=`${e}.flock`,n=1e3/60,s=Date.now(),o=null,a=async()=>{let l;try{[l]=await this.readJsonPromise(i)}catch{return Date.now()-s<500}try{return process.kill(l,0),!0}catch{return!1}};for(;o===null;)try{o=await this.openPromise(i,"wx")}catch(l){if(l.code==="EEXIST"){if(!await a())try{await this.unlinkPromise(i);continue}catch{}if(Date.now()-s<60*1e3)await new Promise(c=>setTimeout(c,n));else throw new Error(`Couldn't acquire a lock in a reasonable time (via ${i})`)}else throw l}await this.writePromise(o,JSON.stringify([process.pid]));try{return await t()}finally{try{await this.closePromise(o),await this.unlinkPromise(i)}catch{}}}async readJsonPromise(e){let t=await this.readFilePromise(e,"utf8");try{return JSON.parse(t)}catch(i){throw i.message+=` (in ${e})`,i}}readJsonSync(e){let t=this.readFileSync(e,"utf8");try{return JSON.parse(t)}catch(i){throw i.message+=` (in ${e})`,i}}async writeJsonPromise(e,t){return await this.writeFilePromise(e,`${JSON.stringify(t,null,2)}
-`)}writeJsonSync(e,t){return this.writeFileSync(e,`${JSON.stringify(t,null,2)}
-`)}async preserveTimePromise(e,t){let i=await this.lstatPromise(e),n=await t();typeof n<"u"&&(e=n),this.lutimesPromise?await this.lutimesPromise(e,i.atime,i.mtime):i.isSymbolicLink()||await this.utimesPromise(e,i.atime,i.mtime)}async preserveTimeSync(e,t){let i=this.lstatSync(e),n=t();typeof n<"u"&&(e=n),this.lutimesSync?this.lutimesSync(e,i.atime,i.mtime):i.isSymbolicLink()||this.utimesSync(e,i.atime,i.mtime)}},vA=class extends Ea{constructor(){super(x)}};function Hge(r){let e=r.match(/\r?\n/g);if(e===null)return aK.EOL;let t=e.filter(n=>n===`\r
-`).length,i=e.length-t;return t>i?`\r
-`:`
-`}function ql(r,e){return e.replace(/\r?\n/g,Hge(r))}var wg=J("fs"),IS=J("stream"),uK=J("util"),yS=Pe(J("zlib"));var AK=Pe(J("fs"));var $t=class extends vA{constructor(t=AK.default){super();this.realFs=t,typeof this.realFs.lutimes<"u"&&(this.lutimesPromise=this.lutimesPromiseImpl,this.lutimesSync=this.lutimesSyncImpl)}getExtractHint(){return!1}getRealPath(){return Oe.root}resolve(t){return x.resolve(t)}async openPromise(t,i,n){return await new Promise((s,o)=>{this.realFs.open(K.fromPortablePath(t),i,n,this.makeCallback(s,o))})}openSync(t,i,n){return this.realFs.openSync(K.fromPortablePath(t),i,n)}async opendirPromise(t,i){return await new Promise((n,s)=>{typeof i<"u"?this.realFs.opendir(K.fromPortablePath(t),i,this.makeCallback(n,s)):this.realFs.opendir(K.fromPortablePath(t),this.makeCallback(n,s))}).then(n=>Object.defineProperty(n,"path",{value:t,configurable:!0,writable:!0}))}opendirSync(t,i){let n=typeof i<"u"?this.realFs.opendirSync(K.fromPortablePath(t),i):this.realFs.opendirSync(K.fromPortablePath(t));return Object.defineProperty(n,"path",{value:t,configurable:!0,writable:!0})}async readPromise(t,i,n=0,s=0,o=-1){return await new Promise((a,l)=>{this.realFs.read(t,i,n,s,o,(c,u)=>{c?l(c):a(u)})})}readSync(t,i,n,s,o){return this.realFs.readSync(t,i,n,s,o)}async writePromise(t,i,n,s,o){return await new Promise((a,l)=>typeof i=="string"?this.realFs.write(t,i,n,this.makeCallback(a,l)):this.realFs.write(t,i,n,s,o,this.makeCallback(a,l)))}writeSync(t,i,n,s,o){return typeof i=="string"?this.realFs.writeSync(t,i,n):this.realFs.writeSync(t,i,n,s,o)}async closePromise(t){await new Promise((i,n)=>{this.realFs.close(t,this.makeCallback(i,n))})}closeSync(t){this.realFs.closeSync(t)}createReadStream(t,i){let n=t!==null?K.fromPortablePath(t):t;return this.realFs.createReadStream(n,i)}createWriteStream(t,i){let n=t!==null?K.fromPortablePath(t):t;return this.realFs.createWriteStream(n,i)}async realpathPromise(t){return await new Promise((i,n)=>{this.realFs.realpath(K.fromPortablePath(t),{},this.makeCallback(i,n))}).then(i=>K.toPortablePath(i))}realpathSync(t){return K.toPortablePath(this.realFs.realpathSync(K.fromPortablePath(t),{}))}async existsPromise(t){return await new Promise(i=>{this.realFs.exists(K.fromPortablePath(t),i)})}accessSync(t,i){return this.realFs.accessSync(K.fromPortablePath(t),i)}async accessPromise(t,i){return await new Promise((n,s)=>{this.realFs.access(K.fromPortablePath(t),i,this.makeCallback(n,s))})}existsSync(t){return this.realFs.existsSync(K.fromPortablePath(t))}async statPromise(t,i){return await new Promise((n,s)=>{i?this.realFs.stat(K.fromPortablePath(t),i,this.makeCallback(n,s)):this.realFs.stat(K.fromPortablePath(t),this.makeCallback(n,s))})}statSync(t,i){return i?this.realFs.statSync(K.fromPortablePath(t),i):this.realFs.statSync(K.fromPortablePath(t))}async fstatPromise(t,i){return await new Promise((n,s)=>{i?this.realFs.fstat(t,i,this.makeCallback(n,s)):this.realFs.fstat(t,this.makeCallback(n,s))})}fstatSync(t,i){return i?this.realFs.fstatSync(t,i):this.realFs.fstatSync(t)}async lstatPromise(t,i){return await new Promise((n,s)=>{i?this.realFs.lstat(K.fromPortablePath(t),i,this.makeCallback(n,s)):this.realFs.lstat(K.fromPortablePath(t),this.makeCallback(n,s))})}lstatSync(t,i){return i?this.realFs.lstatSync(K.fromPortablePath(t),i):this.realFs.lstatSync(K.fromPortablePath(t))}async fchmodPromise(t,i){return await new Promise((n,s)=>{this.realFs.fchmod(t,i,this.makeCallback(n,s))})}fchmodSync(t,i){return this.realFs.fchmodSync(t,i)}async chmodPromise(t,i){return await new Promise((n,s)=>{this.realFs.chmod(K.fromPortablePath(t),i,this.makeCallback(n,s))})}chmodSync(t,i){return this.realFs.chmodSync(K.fromPortablePath(t),i)}async fchownPromise(t,i,n){return await new Promise((s,o)=>{this.realFs.fchown(t,i,n,this.makeCallback(s,o))})}fchownSync(t,i,n){return this.realFs.fchownSync(t,i,n)}async chownPromise(t,i,n){return await new Promise((s,o)=>{this.realFs.chown(K.fromPortablePath(t),i,n,this.makeCallback(s,o))})}chownSync(t,i,n){return this.realFs.chownSync(K.fromPortablePath(t),i,n)}async renamePromise(t,i){return await new Promise((n,s)=>{this.realFs.rename(K.fromPortablePath(t),K.fromPortablePath(i),this.makeCallback(n,s))})}renameSync(t,i){return this.realFs.renameSync(K.fromPortablePath(t),K.fromPortablePath(i))}async copyFilePromise(t,i,n=0){return await new Promise((s,o)=>{this.realFs.copyFile(K.fromPortablePath(t),K.fromPortablePath(i),n,this.makeCallback(s,o))})}copyFileSync(t,i,n=0){return this.realFs.copyFileSync(K.fromPortablePath(t),K.fromPortablePath(i),n)}async appendFilePromise(t,i,n){return await new Promise((s,o)=>{let a=typeof t=="string"?K.fromPortablePath(t):t;n?this.realFs.appendFile(a,i,n,this.makeCallback(s,o)):this.realFs.appendFile(a,i,this.makeCallback(s,o))})}appendFileSync(t,i,n){let s=typeof t=="string"?K.fromPortablePath(t):t;n?this.realFs.appendFileSync(s,i,n):this.realFs.appendFileSync(s,i)}async writeFilePromise(t,i,n){return await new Promise((s,o)=>{let a=typeof t=="string"?K.fromPortablePath(t):t;n?this.realFs.writeFile(a,i,n,this.makeCallback(s,o)):this.realFs.writeFile(a,i,this.makeCallback(s,o))})}writeFileSync(t,i,n){let s=typeof t=="string"?K.fromPortablePath(t):t;n?this.realFs.writeFileSync(s,i,n):this.realFs.writeFileSync(s,i)}async unlinkPromise(t){return await new Promise((i,n)=>{this.realFs.unlink(K.fromPortablePath(t),this.makeCallback(i,n))})}unlinkSync(t){return this.realFs.unlinkSync(K.fromPortablePath(t))}async utimesPromise(t,i,n){return await new Promise((s,o)=>{this.realFs.utimes(K.fromPortablePath(t),i,n,this.makeCallback(s,o))})}utimesSync(t,i,n){this.realFs.utimesSync(K.fromPortablePath(t),i,n)}async lutimesPromiseImpl(t,i,n){let s=this.realFs.lutimes;if(typeof s>"u")throw Mp("unavailable Node binding",`lutimes '${t}'`);return await new Promise((o,a)=>{s.call(this.realFs,K.fromPortablePath(t),i,n,this.makeCallback(o,a))})}lutimesSyncImpl(t,i,n){let s=this.realFs.lutimesSync;if(typeof s>"u")throw Mp("unavailable Node binding",`lutimes '${t}'`);s.call(this.realFs,K.fromPortablePath(t),i,n)}async mkdirPromise(t,i){return await new Promise((n,s)=>{this.realFs.mkdir(K.fromPortablePath(t),i,this.makeCallback(n,s))})}mkdirSync(t,i){return this.realFs.mkdirSync(K.fromPortablePath(t),i)}async rmdirPromise(t,i){return await new Promise((n,s)=>{i?this.realFs.rmdir(K.fromPortablePath(t),i,this.makeCallback(n,s)):this.realFs.rmdir(K.fromPortablePath(t),this.makeCallback(n,s))})}rmdirSync(t,i){return this.realFs.rmdirSync(K.fromPortablePath(t),i)}async linkPromise(t,i){return await new Promise((n,s)=>{this.realFs.link(K.fromPortablePath(t),K.fromPortablePath(i),this.makeCallback(n,s))})}linkSync(t,i){return this.realFs.linkSync(K.fromPortablePath(t),K.fromPortablePath(i))}async symlinkPromise(t,i,n){return await new Promise((s,o)=>{this.realFs.symlink(K.fromPortablePath(t.replace(/\/+$/,"")),K.fromPortablePath(i),n,this.makeCallback(s,o))})}symlinkSync(t,i,n){return this.realFs.symlinkSync(K.fromPortablePath(t.replace(/\/+$/,"")),K.fromPortablePath(i),n)}async readFilePromise(t,i){return await new Promise((n,s)=>{let o=typeof t=="string"?K.fromPortablePath(t):t;this.realFs.readFile(o,i,this.makeCallback(n,s))})}readFileSync(t,i){let n=typeof t=="string"?K.fromPortablePath(t):t;return this.realFs.readFileSync(n,i)}async readdirPromise(t,i){return await new Promise((n,s)=>{i!=null&&i.withFileTypes?this.realFs.readdir(K.fromPortablePath(t),{withFileTypes:!0},this.makeCallback(n,s)):this.realFs.readdir(K.fromPortablePath(t),this.makeCallback(o=>n(o),s))})}readdirSync(t,i){return i!=null&&i.withFileTypes?this.realFs.readdirSync(K.fromPortablePath(t),{withFileTypes:!0}):this.realFs.readdirSync(K.fromPortablePath(t))}async readlinkPromise(t){return await new Promise((i,n)=>{this.realFs.readlink(K.fromPortablePath(t),this.makeCallback(i,n))}).then(i=>K.toPortablePath(i))}readlinkSync(t){return K.toPortablePath(this.realFs.readlinkSync(K.fromPortablePath(t)))}async truncatePromise(t,i){return await new Promise((n,s)=>{this.realFs.truncate(K.fromPortablePath(t),i,this.makeCallback(n,s))})}truncateSync(t,i){return this.realFs.truncateSync(K.fromPortablePath(t),i)}async ftruncatePromise(t,i){return await new Promise((n,s)=>{this.realFs.ftruncate(t,i,this.makeCallback(n,s))})}ftruncateSync(t,i){return this.realFs.ftruncateSync(t,i)}watch(t,i,n){return this.realFs.watch(K.fromPortablePath(t),i,n)}watchFile(t,i,n){return this.realFs.watchFile(K.fromPortablePath(t),i,n)}unwatchFile(t,i){return this.realFs.unwatchFile(K.fromPortablePath(t),i)}makeCallback(t,i){return(n,s)=>{n?i(n):t(s)}}};var cK=J("events");function lK(r,e){if(r!==e)throw new Error(`Invalid StatWatcher status: expected '${e}', got '${r}'`)}var yg=class extends cK.EventEmitter{constructor(t,i,{bigint:n=!1}={}){super();this.status="ready";this.changeListeners=new Map;this.startTimeout=null;this.fakeFs=t,this.path=i,this.bigint=n,this.lastStats=this.stat()}static create(t,i,n){let s=new yg(t,i,n);return s.start(),s}start(){lK(this.status,"ready"),this.status="running",this.startTimeout=setTimeout(()=>{this.startTimeout=null,this.fakeFs.existsSync(this.path)||this.emit("change",this.lastStats,this.lastStats)},3)}stop(){lK(this.status,"running"),this.status="stopped",this.startTimeout!==null&&(clearTimeout(this.startTimeout),this.startTimeout=null),this.emit("stop")}stat(){try{return this.fakeFs.statSync(this.path,{bigint:this.bigint})}catch{let i=this.bigint?new Ig:new ma;return YE(i)}}makeInterval(t){let i=setInterval(()=>{let n=this.stat(),s=this.lastStats;uS(n,s)||(this.lastStats=n,this.emit("change",n,s))},t.interval);return t.persistent?i:i.unref()}registerChangeListener(t,i){this.addListener("change",t),this.changeListeners.set(t,this.makeInterval(i))}unregisterChangeListener(t){this.removeListener("change",t);let i=this.changeListeners.get(t);typeof i<"u"&&clearInterval(i),this.changeListeners.delete(t)}unregisterAllChangeListeners(){for(let t of this.changeListeners.keys())this.unregisterChangeListener(t)}hasChangeListeners(){return this.changeListeners.size>0}ref(){for(let t of this.changeListeners.values())t.ref();return this}unref(){for(let t of this.changeListeners.values())t.unref();return this}};var _E=new WeakMap;function $E(r,e,t,i){let n,s,o,a;switch(typeof t){case"function":n=!1,s=!0,o=5007,a=t;break;default:({bigint:n=!1,persistent:s=!0,interval:o=5007}=t),a=i;break}let l=_E.get(r);typeof l>"u"&&_E.set(r,l=new Map);let c=l.get(e);return typeof c>"u"&&(c=yg.create(r,e,{bigint:n}),l.set(e,c)),c.registerChangeListener(a,{persistent:s,interval:o}),c}function Up(r,e,t){let i=_E.get(r);if(typeof i>"u")return;let n=i.get(e);typeof n>"u"||(typeof t>"u"?n.unregisterAllChangeListeners():n.unregisterChangeListener(t),n.hasChangeListeners()||(n.stop(),i.delete(e)))}function Hp(r){let e=_E.get(r);if(!(typeof e>"u"))for(let t of e.keys())Up(r,t)}var Jl="mixed";function Gge(r){if(typeof r=="string"&&String(+r)===r)return+r;if(typeof r=="number"&&Number.isFinite(r))return r<0?Date.now()/1e3:r;if(uK.types.isDate(r))return r.getTime()/1e3;throw new Error("Invalid time")}function ES(){return Buffer.from([80,75,5,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0])}var Wr=class extends vA{constructor(t,i){super();this.lzSource=null;this.listings=new Map;this.entries=new Map;this.fileSources=new Map;this.fds=new Map;this.nextFd=0;this.ready=!1;this.readOnly=!1;this.libzip=i.libzip;let n=i;if(this.level=typeof n.level<"u"?n.level:Jl,t!=null||(t=ES()),typeof t=="string"){let{baseFs:a=new $t}=n;this.baseFs=a,this.path=t}else this.path=null,this.baseFs=null;if(i.stats)this.stats=i.stats;else if(typeof t=="string")try{this.stats=this.baseFs.statSync(t)}catch(a){if(a.code==="ENOENT"&&n.create)this.stats=Lp();else throw a}else this.stats=Lp();let s=this.libzip.malloc(4);try{let a=0;if(typeof t=="string"&&n.create&&(a|=this.libzip.ZIP_CREATE|this.libzip.ZIP_TRUNCATE),i.readOnly&&(a|=this.libzip.ZIP_RDONLY,this.readOnly=!0),typeof t=="string")this.zip=this.libzip.open(K.fromPortablePath(t),a,s);else{let l=this.allocateUnattachedSource(t);try{this.zip=this.libzip.openFromSource(l,a,s),this.lzSource=l}catch(c){throw this.libzip.source.free(l),c}}if(this.zip===0){let l=this.libzip.struct.errorS();throw this.libzip.error.initWithCode(l,this.libzip.getValue(s,"i32")),this.makeLibzipError(l)}}finally{this.libzip.free(s)}this.listings.set(Oe.root,new Set);let o=this.libzip.getNumEntries(this.zip,0);for(let a=0;a<o;++a){let l=this.libzip.getName(this.zip,a,0);if(x.isAbsolute(l))continue;let c=x.resolve(Oe.root,l);this.registerEntry(c,a),l.endsWith("/")&&this.registerListing(c)}if(this.symlinkCount=this.libzip.ext.countSymlinks(this.zip),this.symlinkCount===-1)throw this.makeLibzipError(this.libzip.getError(this.zip));this.ready=!0}makeLibzipError(t){let i=this.libzip.struct.errorCodeZip(t),n=this.libzip.error.strerror(t),s=new zE(n,this.libzip.errors[i]);if(i===this.libzip.errors.ZIP_ER_CHANGED)throw new Error(`Assertion failed: Unexpected libzip error: ${s.message}`);return s}getExtractHint(t){for(let i of this.entries.keys()){let n=this.pathUtils.extname(i);if(t.relevantExtensions.has(n))return!0}return!1}getAllFiles(){return Array.from(this.entries.keys())}getRealPath(){if(!this.path)throw new Error("ZipFS don't have real paths when loaded from a buffer");return this.path}getBufferAndClose(){if(this.prepareClose(),!this.lzSource)throw new Error("ZipFS was not created from a Buffer");if(this.entries.size===0)return this.discardAndClose(),ES();try{if(this.libzip.source.keep(this.lzSource),this.libzip.close(this.zip)===-1)throw this.makeLibzipError(this.libzip.getError(this.zip));if(this.libzip.source.open(this.lzSource)===-1)throw this.makeLibzipError(this.libzip.source.error(this.lzSource));if(this.libzip.source.seek(this.lzSource,0,0,this.libzip.SEEK_END)===-1)throw this.makeLibzipError(this.libzip.source.error(this.lzSource));let t=this.libzip.source.tell(this.lzSource);if(t===-1)throw this.makeLibzipError(this.libzip.source.error(this.lzSource));if(this.libzip.source.seek(this.lzSource,0,0,this.libzip.SEEK_SET)===-1)throw this.makeLibzipError(this.libzip.source.error(this.lzSource));let i=this.libzip.malloc(t);if(!i)throw new Error("Couldn't allocate enough memory");try{let n=this.libzip.source.read(this.lzSource,i,t);if(n===-1)throw this.makeLibzipError(this.libzip.source.error(this.lzSource));if(n<t)throw new Error("Incomplete read");if(n>t)throw new Error("Overread");let s=this.libzip.HEAPU8.subarray(i,i+t);return Buffer.from(s)}finally{this.libzip.free(i)}}finally{this.libzip.source.close(this.lzSource),this.libzip.source.free(this.lzSource),this.ready=!1}}prepareClose(){if(!this.ready)throw VE("archive closed, close");Hp(this)}saveAndClose(){if(!this.path||!this.baseFs)throw new Error("ZipFS cannot be saved and must be discarded when loaded from a buffer");if(this.prepareClose(),this.readOnly){this.discardAndClose();return}let t=this.baseFs.existsSync(this.path)||this.stats.mode===Np?void 0:this.stats.mode;if(this.entries.size===0)this.discardAndClose(),this.baseFs.writeFileSync(this.path,ES(),{mode:t});else{if(this.libzip.close(this.zip)===-1)throw this.makeLibzipError(this.libzip.getError(this.zip));typeof t<"u"&&this.baseFs.chmodSync(this.path,t)}this.ready=!1}discardAndClose(){this.prepareClose(),this.libzip.discard(this.zip),this.ready=!1}resolve(t){return x.resolve(Oe.root,t)}async openPromise(t,i,n){return this.openSync(t,i,n)}openSync(t,i,n){let s=this.nextFd++;return this.fds.set(s,{cursor:0,p:t}),s}hasOpenFileHandles(){return!!this.fds.size}async opendirPromise(t,i){return this.opendirSync(t,i)}opendirSync(t,i={}){let n=this.resolveFilename(`opendir '${t}'`,t);if(!this.entries.has(n)&&!this.listings.has(n))throw js(`opendir '${t}'`);let s=this.listings.get(n);if(!s)throw Qo(`opendir '${t}'`);let o=[...s],a=this.openSync(n,"r");return ZE(this,n,o,{onClose:()=>{this.closeSync(a)}})}async readPromise(t,i,n,s,o){return this.readSync(t,i,n,s,o)}readSync(t,i,n=0,s=i.byteLength,o=-1){let a=this.fds.get(t);if(typeof a>"u")throw Hr("read");let l=o===-1||o===null?a.cursor:o,c=this.readFileSync(a.p);c.copy(i,n,l,l+s);let u=Math.max(0,Math.min(c.length-l,s));return(o===-1||o===null)&&(a.cursor+=u),u}async writePromise(t,i,n,s,o){return typeof i=="string"?this.writeSync(t,i,o):this.writeSync(t,i,n,s,o)}writeSync(t,i,n,s,o){throw typeof this.fds.get(t)>"u"?Hr("read"):new Error("Unimplemented")}async closePromise(t){return this.closeSync(t)}closeSync(t){if(typeof this.fds.get(t)>"u")throw Hr("read");this.fds.delete(t)}createReadStream(t,{encoding:i}={}){if(t===null)throw new Error("Unimplemented");let n=this.openSync(t,"r"),s=Object.assign(new IS.PassThrough({emitClose:!0,autoDestroy:!0,destroy:(a,l)=>{clearImmediate(o),this.closeSync(n),l(a)}}),{close(){s.destroy()},bytesRead:0,path:t}),o=setImmediate(async()=>{try{let a=await this.readFilePromise(t,i);s.bytesRead=a.length,s.end(a)}catch(a){s.destroy(a)}});return s}createWriteStream(t,{encoding:i}={}){if(this.readOnly)throw ln(`open '${t}'`);if(t===null)throw new Error("Unimplemented");let n=[],s=this.openSync(t,"w"),o=Object.assign(new IS.PassThrough({autoDestroy:!0,emitClose:!0,destroy:(a,l)=>{try{a?l(a):(this.writeFileSync(t,Buffer.concat(n),i),l(null))}catch(c){l(c)}finally{this.closeSync(s)}}}),{bytesWritten:0,path:t,close(){o.destroy()}});return o.on("data",a=>{let l=Buffer.from(a);o.bytesWritten+=l.length,n.push(l)}),o}async realpathPromise(t){return this.realpathSync(t)}realpathSync(t){let i=this.resolveFilename(`lstat '${t}'`,t);if(!this.entries.has(i)&&!this.listings.has(i))throw js(`lstat '${t}'`);return i}async existsPromise(t){return this.existsSync(t)}existsSync(t){if(!this.ready)throw VE(`archive closed, existsSync '${t}'`);if(this.symlinkCount===0){let n=x.resolve(Oe.root,t);return this.entries.has(n)||this.listings.has(n)}let i;try{i=this.resolveFilename(`stat '${t}'`,t,void 0,!1)}catch{return!1}return i===void 0?!1:this.entries.has(i)||this.listings.has(i)}async accessPromise(t,i){return this.accessSync(t,i)}accessSync(t,i=wg.constants.F_OK){let n=this.resolveFilename(`access '${t}'`,t);if(!this.entries.has(n)&&!this.listings.has(n))throw js(`access '${t}'`);if(this.readOnly&&i&wg.constants.W_OK)throw ln(`access '${t}'`)}async statPromise(t,i={bigint:!1}){return i.bigint?this.statSync(t,{bigint:!0}):this.statSync(t)}statSync(t,i={bigint:!1,throwIfNoEntry:!0}){let n=this.resolveFilename(`stat '${t}'`,t,void 0,i.throwIfNoEntry);if(n!==void 0){if(!this.entries.has(n)&&!this.listings.has(n)){if(i.throwIfNoEntry===!1)return;throw js(`stat '${t}'`)}if(t[t.length-1]==="/"&&!this.listings.has(n))throw Qo(`stat '${t}'`);return this.statImpl(`stat '${t}'`,n,i)}}async fstatPromise(t,i){return this.fstatSync(t,i)}fstatSync(t,i){let n=this.fds.get(t);if(typeof n>"u")throw Hr("fstatSync");let{p:s}=n,o=this.resolveFilename(`stat '${s}'`,s);if(!this.entries.has(o)&&!this.listings.has(o))throw js(`stat '${s}'`);if(s[s.length-1]==="/"&&!this.listings.has(o))throw Qo(`stat '${s}'`);return this.statImpl(`fstat '${s}'`,o,i)}async lstatPromise(t,i={bigint:!1}){return i.bigint?this.lstatSync(t,{bigint:!0}):this.lstatSync(t)}lstatSync(t,i={bigint:!1,throwIfNoEntry:!0}){let n=this.resolveFilename(`lstat '${t}'`,t,!1,i.throwIfNoEntry);if(n!==void 0){if(!this.entries.has(n)&&!this.listings.has(n)){if(i.throwIfNoEntry===!1)return;throw js(`lstat '${t}'`)}if(t[t.length-1]==="/"&&!this.listings.has(n))throw Qo(`lstat '${t}'`);return this.statImpl(`lstat '${t}'`,n,i)}}statImpl(t,i,n={}){let s=this.entries.get(i);if(typeof s<"u"){let o=this.libzip.struct.statS();if(this.libzip.statIndex(this.zip,s,0,0,o)===-1)throw this.makeLibzipError(this.libzip.getError(this.zip));let l=this.stats.uid,c=this.stats.gid,u=this.libzip.struct.statSize(o)>>>0,g=512,f=Math.ceil(u/g),h=(this.libzip.struct.statMtime(o)>>>0)*1e3,p=h,C=h,y=h,B=new Date(p),v=new Date(C),D=new Date(y),L=new Date(h),H=this.listings.has(i)?16384:this.isSymbolicLink(s)?40960:32768,j=H===16384?493:420,$=H|this.getUnixMode(s,j)&511,V=this.libzip.struct.statCrc(o),W=Object.assign(new ma,{uid:l,gid:c,size:u,blksize:g,blocks:f,atime:B,birthtime:v,ctime:D,mtime:L,atimeMs:p,birthtimeMs:C,ctimeMs:y,mtimeMs:h,mode:$,crc:V});return n.bigint===!0?jE(W):W}if(this.listings.has(i)){let o=this.stats.uid,a=this.stats.gid,l=0,c=512,u=0,g=this.stats.mtimeMs,f=this.stats.mtimeMs,h=this.stats.mtimeMs,p=this.stats.mtimeMs,C=new Date(g),y=new Date(f),B=new Date(h),v=new Date(p),D=16877,L=0,H=Object.assign(new ma,{uid:o,gid:a,size:l,blksize:c,blocks:u,atime:C,birthtime:y,ctime:B,mtime:v,atimeMs:g,birthtimeMs:f,ctimeMs:h,mtimeMs:p,mode:D,crc:L});return n.bigint===!0?jE(H):H}throw new Error("Unreachable")}getUnixMode(t,i){if(this.libzip.file.getExternalAttributes(this.zip,t,0,0,this.libzip.uint08S,this.libzip.uint32S)===-1)throw this.makeLibzipError(this.libzip.getError(this.zip));return this.libzip.getValue(this.libzip.uint08S,"i8")>>>0!==this.libzip.ZIP_OPSYS_UNIX?i:this.libzip.getValue(this.libzip.uint32S,"i32")>>>16}registerListing(t){let i=this.listings.get(t);if(i)return i;this.registerListing(x.dirname(t)).add(x.basename(t));let s=new Set;return this.listings.set(t,s),s}registerEntry(t,i){this.registerListing(x.dirname(t)).add(x.basename(t)),this.entries.set(t,i)}unregisterListing(t){this.listings.delete(t);let i=this.listings.get(x.dirname(t));i==null||i.delete(x.basename(t))}unregisterEntry(t){this.unregisterListing(t);let i=this.entries.get(t);this.entries.delete(t),!(typeof i>"u")&&(this.fileSources.delete(i),this.isSymbolicLink(i)&&this.symlinkCount--)}deleteEntry(t,i){if(this.unregisterEntry(t),this.libzip.delete(this.zip,i)===-1)throw this.makeLibzipError(this.libzip.getError(this.zip))}resolveFilename(t,i,n=!0,s=!0){if(!this.ready)throw VE(`archive closed, ${t}`);let o=x.resolve(Oe.root,i);if(o==="/")return Oe.root;let a=this.entries.get(o);if(n&&a!==void 0)if(this.symlinkCount!==0&&this.isSymbolicLink(a)){let l=this.getFileSource(a).toString();return this.resolveFilename(t,x.resolve(x.dirname(o),l),!0,s)}else return o;for(;;){let l=this.resolveFilename(t,x.dirname(o),!0,s);if(l===void 0)return l;let c=this.listings.has(l),u=this.entries.has(l);if(!c&&!u){if(s===!1)return;throw js(t)}if(!c)throw Qo(t);if(o=x.resolve(l,x.basename(o)),!n||this.symlinkCount===0)break;let g=this.libzip.name.locate(this.zip,o.slice(1),0);if(g===-1)break;if(this.isSymbolicLink(g)){let f=this.getFileSource(g).toString();o=x.resolve(x.dirname(o),f)}else break}return o}allocateBuffer(t){Buffer.isBuffer(t)||(t=Buffer.from(t));let i=this.libzip.malloc(t.byteLength);if(!i)throw new Error("Couldn't allocate enough memory");return new Uint8Array(this.libzip.HEAPU8.buffer,i,t.byteLength).set(t),{buffer:i,byteLength:t.byteLength}}allocateUnattachedSource(t){let i=this.libzip.struct.errorS(),{buffer:n,byteLength:s}=this.allocateBuffer(t),o=this.libzip.source.fromUnattachedBuffer(n,s,0,1,i);if(o===0)throw this.libzip.free(i),this.makeLibzipError(i);return o}allocateSource(t){let{buffer:i,byteLength:n}=this.allocateBuffer(t),s=this.libzip.source.fromBuffer(this.zip,i,n,0,1);if(s===0)throw this.libzip.free(i),this.makeLibzipError(this.libzip.getError(this.zip));return s}setFileSource(t,i){let n=Buffer.isBuffer(i)?i:Buffer.from(i),s=x.relative(Oe.root,t),o=this.allocateSource(i);try{let a=this.libzip.file.add(this.zip,s,o,this.libzip.ZIP_FL_OVERWRITE);if(a===-1)throw this.makeLibzipError(this.libzip.getError(this.zip));if(this.level!=="mixed"){let l=this.level===0?this.libzip.ZIP_CM_STORE:this.libzip.ZIP_CM_DEFLATE;if(this.libzip.file.setCompression(this.zip,a,0,l,this.level)===-1)throw this.makeLibzipError(this.libzip.getError(this.zip))}return this.fileSources.set(a,n),a}catch(a){throw this.libzip.source.free(o),a}}isSymbolicLink(t){if(this.symlinkCount===0)return!1;if(this.libzip.file.getExternalAttributes(this.zip,t,0,0,this.libzip.uint08S,this.libzip.uint32S)===-1)throw this.makeLibzipError(this.libzip.getError(this.zip));return this.libzip.getValue(this.libzip.uint08S,"i8")>>>0!==this.libzip.ZIP_OPSYS_UNIX?!1:(this.libzip.getValue(this.libzip.uint32S,"i32")>>>16&61440)===40960}getFileSource(t,i={asyncDecompress:!1}){let n=this.fileSources.get(t);if(typeof n<"u")return n;let s=this.libzip.struct.statS();if(this.libzip.statIndex(this.zip,t,0,0,s)===-1)throw this.makeLibzipError(this.libzip.getError(this.zip));let a=this.libzip.struct.statCompSize(s),l=this.libzip.struct.statCompMethod(s),c=this.libzip.malloc(a);try{let u=this.libzip.fopenIndex(this.zip,t,0,this.libzip.ZIP_FL_COMPRESSED);if(u===0)throw this.makeLibzipError(this.libzip.getError(this.zip));try{let g=this.libzip.fread(u,c,a,0);if(g===-1)throw this.makeLibzipError(this.libzip.file.getError(u));if(g<a)throw new Error("Incomplete read");if(g>a)throw new Error("Overread");let f=this.libzip.HEAPU8.subarray(c,c+a),h=Buffer.from(f);if(l===0)return this.fileSources.set(t,h),h;if(i.asyncDecompress)return new Promise((p,C)=>{yS.default.inflateRaw(h,(y,B)=>{y?C(y):(this.fileSources.set(t,B),p(B))})});{let p=yS.default.inflateRawSync(h);return this.fileSources.set(t,p),p}}finally{this.libzip.fclose(u)}}finally{this.libzip.free(c)}}async fchmodPromise(t,i){return this.chmodPromise(this.fdToPath(t,"fchmod"),i)}fchmodSync(t,i){return this.chmodSync(this.fdToPath(t,"fchmodSync"),i)}async chmodPromise(t,i){return this.chmodSync(t,i)}chmodSync(t,i){if(this.readOnly)throw ln(`chmod '${t}'`);i&=493;let n=this.resolveFilename(`chmod '${t}'`,t,!1),s=this.entries.get(n);if(typeof s>"u")throw new Error(`Assertion failed: The entry should have been registered (${n})`);let a=this.getUnixMode(s,32768)&-512|i;if(this.libzip.file.setExternalAttributes(this.zip,s,0,0,this.libzip.ZIP_OPSYS_UNIX,a<<16)===-1)throw this.makeLibzipError(this.libzip.getError(this.zip))}async fchownPromise(t,i,n){return this.chownPromise(this.fdToPath(t,"fchown"),i,n)}fchownSync(t,i,n){return this.chownSync(this.fdToPath(t,"fchownSync"),i,n)}async chownPromise(t,i,n){return this.chownSync(t,i,n)}chownSync(t,i,n){throw new Error("Unimplemented")}async renamePromise(t,i){return this.renameSync(t,i)}renameSync(t,i){throw new Error("Unimplemented")}async copyFilePromise(t,i,n){let{indexSource:s,indexDest:o,resolvedDestP:a}=this.prepareCopyFile(t,i,n),l=await this.getFileSource(s,{asyncDecompress:!0}),c=this.setFileSource(a,l);c!==o&&this.registerEntry(a,c)}copyFileSync(t,i,n=0){let{indexSource:s,indexDest:o,resolvedDestP:a}=this.prepareCopyFile(t,i,n),l=this.getFileSource(s),c=this.setFileSource(a,l);c!==o&&this.registerEntry(a,c)}prepareCopyFile(t,i,n=0){if(this.readOnly)throw ln(`copyfile '${t} -> '${i}'`);if((n&wg.constants.COPYFILE_FICLONE_FORCE)!==0)throw Mp("unsupported clone operation",`copyfile '${t}' -> ${i}'`);let s=this.resolveFilename(`copyfile '${t} -> ${i}'`,t),o=this.entries.get(s);if(typeof o>"u")throw SA(`copyfile '${t}' -> '${i}'`);let a=this.resolveFilename(`copyfile '${t}' -> ${i}'`,i),l=this.entries.get(a);if((n&(wg.constants.COPYFILE_EXCL|wg.constants.COPYFILE_FICLONE_FORCE))!==0&&typeof l<"u")throw XE(`copyfile '${t}' -> '${i}'`);return{indexSource:o,resolvedDestP:a,indexDest:l}}async appendFilePromise(t,i,n){if(this.readOnly)throw ln(`open '${t}'`);return typeof n>"u"?n={flag:"a"}:typeof n=="string"?n={flag:"a",encoding:n}:typeof n.flag>"u"&&(n={flag:"a",...n}),this.writeFilePromise(t,i,n)}appendFileSync(t,i,n={}){if(this.readOnly)throw ln(`open '${t}'`);return typeof n>"u"?n={flag:"a"}:typeof n=="string"?n={flag:"a",encoding:n}:typeof n.flag>"u"&&(n={flag:"a",...n}),this.writeFileSync(t,i,n)}fdToPath(t,i){var s;let n=(s=this.fds.get(t))==null?void 0:s.p;if(typeof n>"u")throw Hr(i);return n}async writeFilePromise(t,i,n){let{encoding:s,mode:o,index:a,resolvedP:l}=this.prepareWriteFile(t,n);a!==void 0&&typeof n=="object"&&n.flag&&n.flag.includes("a")&&(i=Buffer.concat([await this.getFileSource(a,{asyncDecompress:!0}),Buffer.from(i)])),s!==null&&(i=i.toString(s));let c=this.setFileSource(l,i);c!==a&&this.registerEntry(l,c),o!==null&&await this.chmodPromise(l,o)}writeFileSync(t,i,n){let{encoding:s,mode:o,index:a,resolvedP:l}=this.prepareWriteFile(t,n);a!==void 0&&typeof n=="object"&&n.flag&&n.flag.includes("a")&&(i=Buffer.concat([this.getFileSource(a),Buffer.from(i)])),s!==null&&(i=i.toString(s));let c=this.setFileSource(l,i);c!==a&&this.registerEntry(l,c),o!==null&&this.chmodSync(l,o)}prepareWriteFile(t,i){if(typeof t=="number"&&(t=this.fdToPath(t,"read")),this.readOnly)throw ln(`open '${t}'`);let n=this.resolveFilename(`open '${t}'`,t);if(this.listings.has(n))throw Kp(`open '${t}'`);let s=null,o=null;typeof i=="string"?s=i:typeof i=="object"&&({encoding:s=null,mode:o=null}=i);let a=this.entries.get(n);return{encoding:s,mode:o,resolvedP:n,index:a}}async unlinkPromise(t){return this.unlinkSync(t)}unlinkSync(t){if(this.readOnly)throw ln(`unlink '${t}'`);let i=this.resolveFilename(`unlink '${t}'`,t);if(this.listings.has(i))throw Kp(`unlink '${t}'`);let n=this.entries.get(i);if(typeof n>"u")throw SA(`unlink '${t}'`);this.deleteEntry(i,n)}async utimesPromise(t,i,n){return this.utimesSync(t,i,n)}utimesSync(t,i,n){if(this.readOnly)throw ln(`utimes '${t}'`);let s=this.resolveFilename(`utimes '${t}'`,t);this.utimesImpl(s,n)}async lutimesPromise(t,i,n){return this.lutimesSync(t,i,n)}lutimesSync(t,i,n){if(this.readOnly)throw ln(`lutimes '${t}'`);let s=this.resolveFilename(`utimes '${t}'`,t,!1);this.utimesImpl(s,n)}utimesImpl(t,i){this.listings.has(t)&&(this.entries.has(t)||this.hydrateDirectory(t));let n=this.entries.get(t);if(n===void 0)throw new Error("Unreachable");if(this.libzip.file.setMtime(this.zip,n,0,Gge(i),0)===-1)throw this.makeLibzipError(this.libzip.getError(this.zip))}async mkdirPromise(t,i){return this.mkdirSync(t,i)}mkdirSync(t,{mode:i=493,recursive:n=!1}={}){if(n)return this.mkdirpSync(t,{chmod:i});if(this.readOnly)throw ln(`mkdir '${t}'`);let s=this.resolveFilename(`mkdir '${t}'`,t);if(this.entries.has(s)||this.listings.has(s))throw XE(`mkdir '${t}'`);this.hydrateDirectory(s),this.chmodSync(s,i)}async rmdirPromise(t,i){return this.rmdirSync(t,i)}rmdirSync(t,{recursive:i=!1}={}){if(this.readOnly)throw ln(`rmdir '${t}'`);if(i){this.removeSync(t);return}let n=this.resolveFilename(`rmdir '${t}'`,t),s=this.listings.get(n);if(!s)throw Qo(`rmdir '${t}'`);if(s.size>0)throw nK(`rmdir '${t}'`);let o=this.entries.get(n);if(typeof o>"u")throw SA(`rmdir '${t}'`);this.deleteEntry(t,o)}hydrateDirectory(t){let i=this.libzip.dir.add(this.zip,x.relative(Oe.root,t));if(i===-1)throw this.makeLibzipError(this.libzip.getError(this.zip));return this.registerListing(t),this.registerEntry(t,i),i}async linkPromise(t,i){return this.linkSync(t,i)}linkSync(t,i){throw sK(`link '${t}' -> '${i}'`)}async symlinkPromise(t,i){return this.symlinkSync(t,i)}symlinkSync(t,i){if(this.readOnly)throw ln(`symlink '${t}' -> '${i}'`);let n=this.resolveFilename(`symlink '${t}' -> '${i}'`,i);if(this.listings.has(n))throw Kp(`symlink '${t}' -> '${i}'`);if(this.entries.has(n))throw XE(`symlink '${t}' -> '${i}'`);let s=this.setFileSource(n,t);if(this.registerEntry(n,s),this.libzip.file.setExternalAttributes(this.zip,s,0,0,this.libzip.ZIP_OPSYS_UNIX,41471<<16)===-1)throw this.makeLibzipError(this.libzip.getError(this.zip));this.symlinkCount+=1}async readFilePromise(t,i){typeof i=="object"&&(i=i?i.encoding:void 0);let n=await this.readFileBuffer(t,{asyncDecompress:!0});return i?n.toString(i):n}readFileSync(t,i){typeof i=="object"&&(i=i?i.encoding:void 0);let n=this.readFileBuffer(t);return i?n.toString(i):n}readFileBuffer(t,i={asyncDecompress:!1}){typeof t=="number"&&(t=this.fdToPath(t,"read"));let n=this.resolveFilename(`open '${t}'`,t);if(!this.entries.has(n)&&!this.listings.has(n))throw js(`open '${t}'`);if(t[t.length-1]==="/"&&!this.listings.has(n))throw Qo(`open '${t}'`);if(this.listings.has(n))throw Kp("read");let s=this.entries.get(n);if(s===void 0)throw new Error("Unreachable");return this.getFileSource(s,i)}async readdirPromise(t,i){return this.readdirSync(t,i)}readdirSync(t,i){let n=this.resolveFilename(`scandir '${t}'`,t);if(!this.entries.has(n)&&!this.listings.has(n))throw js(`scandir '${t}'`);let s=this.listings.get(n);if(!s)throw Qo(`scandir '${t}'`);let o=[...s];return i!=null&&i.withFileTypes?o.map(a=>Object.assign(this.statImpl("lstat",x.join(t,a)),{name:a})):o}async readlinkPromise(t){let i=this.prepareReadlink(t);return(await this.getFileSource(i,{asyncDecompress:!0})).toString()}readlinkSync(t){let i=this.prepareReadlink(t);return this.getFileSource(i).toString()}prepareReadlink(t){let i=this.resolveFilename(`readlink '${t}'`,t,!1);if(!this.entries.has(i)&&!this.listings.has(i))throw js(`readlink '${t}'`);if(t[t.length-1]==="/"&&!this.listings.has(i))throw Qo(`open '${t}'`);if(this.listings.has(i))throw SA(`readlink '${t}'`);let n=this.entries.get(i);if(n===void 0)throw new Error("Unreachable");if(!this.isSymbolicLink(n))throw SA(`readlink '${t}'`);return n}async truncatePromise(t,i=0){let n=this.resolveFilename(`open '${t}'`,t),s=this.entries.get(n);if(typeof s>"u")throw SA(`open '${t}'`);let o=await this.getFileSource(s,{asyncDecompress:!0}),a=Buffer.alloc(i,0);return o.copy(a),await this.writeFilePromise(t,a)}truncateSync(t,i=0){let n=this.resolveFilename(`open '${t}'`,t),s=this.entries.get(n);if(typeof s>"u")throw SA(`open '${t}'`);let o=this.getFileSource(s),a=Buffer.alloc(i,0);return o.copy(a),this.writeFileSync(t,a)}async ftruncatePromise(t,i){return this.truncatePromise(this.fdToPath(t,"ftruncate"),i)}ftruncateSync(t,i){return this.truncateSync(this.fdToPath(t,"ftruncateSync"),i)}watch(t,i,n){let s;switch(typeof i){case"function":case"string":case"undefined":s=!0;break;default:({persistent:s=!0}=i);break}if(!s)return{on:()=>{},close:()=>{}};let o=setInterval(()=>{},24*60*60*1e3);return{on:()=>{},close:()=>{clearInterval(o)}}}watchFile(t,i,n){let s=x.resolve(Oe.root,t);return $E(this,s,i,n)}unwatchFile(t,i){let n=x.resolve(Oe.root,t);return Up(this,n,i)}};var pi=class extends Ea{getExtractHint(e){return this.baseFs.getExtractHint(e)}resolve(e){return this.mapFromBase(this.baseFs.resolve(this.mapToBase(e)))}getRealPath(){return this.mapFromBase(this.baseFs.getRealPath())}async openPromise(e,t,i){return this.baseFs.openPromise(this.mapToBase(e),t,i)}openSync(e,t,i){return this.baseFs.openSync(this.mapToBase(e),t,i)}async opendirPromise(e,t){return Object.assign(await this.baseFs.opendirPromise(this.mapToBase(e),t),{path:e})}opendirSync(e,t){return Object.assign(this.baseFs.opendirSync(this.mapToBase(e),t),{path:e})}async readPromise(e,t,i,n,s){return await this.baseFs.readPromise(e,t,i,n,s)}readSync(e,t,i,n,s){return this.baseFs.readSync(e,t,i,n,s)}async writePromise(e,t,i,n,s){return typeof t=="string"?await this.baseFs.writePromise(e,t,i):await this.baseFs.writePromise(e,t,i,n,s)}writeSync(e,t,i,n,s){return typeof t=="string"?this.baseFs.writeSync(e,t,i):this.baseFs.writeSync(e,t,i,n,s)}async closePromise(e){return this.baseFs.closePromise(e)}closeSync(e){this.baseFs.closeSync(e)}createReadStream(e,t){return this.baseFs.createReadStream(e!==null?this.mapToBase(e):e,t)}createWriteStream(e,t){return this.baseFs.createWriteStream(e!==null?this.mapToBase(e):e,t)}async realpathPromise(e){return this.mapFromBase(await this.baseFs.realpathPromise(this.mapToBase(e)))}realpathSync(e){return this.mapFromBase(this.baseFs.realpathSync(this.mapToBase(e)))}async existsPromise(e){return this.baseFs.existsPromise(this.mapToBase(e))}existsSync(e){return this.baseFs.existsSync(this.mapToBase(e))}accessSync(e,t){return this.baseFs.accessSync(this.mapToBase(e),t)}async accessPromise(e,t){return this.baseFs.accessPromise(this.mapToBase(e),t)}async statPromise(e,t){return this.baseFs.statPromise(this.mapToBase(e),t)}statSync(e,t){return this.baseFs.statSync(this.mapToBase(e),t)}async fstatPromise(e,t){return this.baseFs.fstatPromise(e,t)}fstatSync(e,t){return this.baseFs.fstatSync(e,t)}lstatPromise(e,t){return this.baseFs.lstatPromise(this.mapToBase(e),t)}lstatSync(e,t){return this.baseFs.lstatSync(this.mapToBase(e),t)}async fchmodPromise(e,t){return this.baseFs.fchmodPromise(e,t)}fchmodSync(e,t){return this.baseFs.fchmodSync(e,t)}async chmodPromise(e,t){return this.baseFs.chmodPromise(this.mapToBase(e),t)}chmodSync(e,t){return this.baseFs.chmodSync(this.mapToBase(e),t)}async fchownPromise(e,t,i){return this.baseFs.fchownPromise(e,t,i)}fchownSync(e,t,i){return this.baseFs.fchownSync(e,t,i)}async chownPromise(e,t,i){return this.baseFs.chownPromise(this.mapToBase(e),t,i)}chownSync(e,t,i){return this.baseFs.chownSync(this.mapToBase(e),t,i)}async renamePromise(e,t){return this.baseFs.renamePromise(this.mapToBase(e),this.mapToBase(t))}renameSync(e,t){return this.baseFs.renameSync(this.mapToBase(e),this.mapToBase(t))}async copyFilePromise(e,t,i=0){return this.baseFs.copyFilePromise(this.mapToBase(e),this.mapToBase(t),i)}copyFileSync(e,t,i=0){return this.baseFs.copyFileSync(this.mapToBase(e),this.mapToBase(t),i)}async appendFilePromise(e,t,i){return this.baseFs.appendFilePromise(this.fsMapToBase(e),t,i)}appendFileSync(e,t,i){return this.baseFs.appendFileSync(this.fsMapToBase(e),t,i)}async writeFilePromise(e,t,i){return this.baseFs.writeFilePromise(this.fsMapToBase(e),t,i)}writeFileSync(e,t,i){return this.baseFs.writeFileSync(this.fsMapToBase(e),t,i)}async unlinkPromise(e){return this.baseFs.unlinkPromise(this.mapToBase(e))}unlinkSync(e){return this.baseFs.unlinkSync(this.mapToBase(e))}async utimesPromise(e,t,i){return this.baseFs.utimesPromise(this.mapToBase(e),t,i)}utimesSync(e,t,i){return this.baseFs.utimesSync(this.mapToBase(e),t,i)}async mkdirPromise(e,t){return this.baseFs.mkdirPromise(this.mapToBase(e),t)}mkdirSync(e,t){return this.baseFs.mkdirSync(this.mapToBase(e),t)}async rmdirPromise(e,t){return this.baseFs.rmdirPromise(this.mapToBase(e),t)}rmdirSync(e,t){return this.baseFs.rmdirSync(this.mapToBase(e),t)}async linkPromise(e,t){return this.baseFs.linkPromise(this.mapToBase(e),this.mapToBase(t))}linkSync(e,t){return this.baseFs.linkSync(this.mapToBase(e),this.mapToBase(t))}async symlinkPromise(e,t,i){let n=this.mapToBase(t);if(this.pathUtils.isAbsolute(e))return this.baseFs.symlinkPromise(this.mapToBase(e),n,i);let s=this.mapToBase(this.pathUtils.join(this.pathUtils.dirname(t),e)),o=this.baseFs.pathUtils.relative(this.baseFs.pathUtils.dirname(n),s);return this.baseFs.symlinkPromise(o,n,i)}symlinkSync(e,t,i){let n=this.mapToBase(t);if(this.pathUtils.isAbsolute(e))return this.baseFs.symlinkSync(this.mapToBase(e),n,i);let s=this.mapToBase(this.pathUtils.join(this.pathUtils.dirname(t),e)),o=this.baseFs.pathUtils.relative(this.baseFs.pathUtils.dirname(n),s);return this.baseFs.symlinkSync(o,n,i)}async readFilePromise(e,t){return t==="utf8"?this.baseFs.readFilePromise(this.fsMapToBase(e),t):this.baseFs.readFilePromise(this.fsMapToBase(e),t)}readFileSync(e,t){return t==="utf8"?this.baseFs.readFileSync(this.fsMapToBase(e),t):this.baseFs.readFileSync(this.fsMapToBase(e),t)}async readdirPromise(e,t){return this.baseFs.readdirPromise(this.mapToBase(e),t)}readdirSync(e,t){return this.baseFs.readdirSync(this.mapToBase(e),t)}async readlinkPromise(e){return this.mapFromBase(await this.baseFs.readlinkPromise(this.mapToBase(e)))}readlinkSync(e){return this.mapFromBase(this.baseFs.readlinkSync(this.mapToBase(e)))}async truncatePromise(e,t){return this.baseFs.truncatePromise(this.mapToBase(e),t)}truncateSync(e,t){return this.baseFs.truncateSync(this.mapToBase(e),t)}async ftruncatePromise(e,t){return this.baseFs.ftruncatePromise(e,t)}ftruncateSync(e,t){return this.baseFs.ftruncateSync(e,t)}watch(e,t,i){return this.baseFs.watch(this.mapToBase(e),t,i)}watchFile(e,t,i){return this.baseFs.watchFile(this.mapToBase(e),t,i)}unwatchFile(e,t){return this.baseFs.unwatchFile(this.mapToBase(e),t)}fsMapToBase(e){return typeof e=="number"?e:this.mapToBase(e)}};var bo=class extends pi{constructor(t,{baseFs:i,pathUtils:n}){super(n);this.target=t,this.baseFs=i}getRealPath(){return this.target}getBaseFs(){return this.baseFs}mapFromBase(t){return t}mapToBase(t){return t}};var qt=class extends pi{constructor(t,{baseFs:i=new $t}={}){super(x);this.target=this.pathUtils.normalize(t),this.baseFs=i}getRealPath(){return this.pathUtils.resolve(this.baseFs.getRealPath(),this.target)}resolve(t){return this.pathUtils.isAbsolute(t)?x.normalize(t):this.baseFs.resolve(x.join(this.target,t))}mapFromBase(t){return t}mapToBase(t){return this.pathUtils.isAbsolute(t)?t:this.pathUtils.join(this.target,t)}};var gK=Oe.root,So=class extends pi{constructor(t,{baseFs:i=new $t}={}){super(x);this.target=this.pathUtils.resolve(Oe.root,t),this.baseFs=i}getRealPath(){return this.pathUtils.resolve(this.baseFs.getRealPath(),this.pathUtils.relative(Oe.root,this.target))}getTarget(){return this.target}getBaseFs(){return this.baseFs}mapToBase(t){let i=this.pathUtils.normalize(t);if(this.pathUtils.isAbsolute(t))return this.pathUtils.resolve(this.target,this.pathUtils.relative(gK,t));if(i.match(/^\.\.\/?/))throw new Error(`Resolving this path (${t}) would escape the jail`);return this.pathUtils.resolve(this.target,t)}mapFromBase(t){return this.pathUtils.resolve(gK,this.pathUtils.relative(this.target,t))}};var Bg=class extends pi{constructor(t,i){super(i);this.instance=null;this.factory=t}get baseFs(){return this.instance||(this.instance=this.factory()),this.instance}set baseFs(t){this.instance=t}mapFromBase(t){return t}mapToBase(t){return t}};var Ze=()=>Object.assign(new Error("ENOSYS: unsupported filesystem access"),{code:"ENOSYS"}),wS=class extends Ea{constructor(){super(x)}getExtractHint(){throw Ze()}getRealPath(){throw Ze()}resolve(){throw Ze()}async openPromise(){throw Ze()}openSync(){throw Ze()}async opendirPromise(){throw Ze()}opendirSync(){throw Ze()}async readPromise(){throw Ze()}readSync(){throw Ze()}async writePromise(){throw Ze()}writeSync(){throw Ze()}async closePromise(){throw Ze()}closeSync(){throw Ze()}createWriteStream(){throw Ze()}createReadStream(){throw Ze()}async realpathPromise(){throw Ze()}realpathSync(){throw Ze()}async readdirPromise(){throw Ze()}readdirSync(){throw Ze()}async existsPromise(e){throw Ze()}existsSync(e){throw Ze()}async accessPromise(){throw Ze()}accessSync(){throw Ze()}async statPromise(){throw Ze()}statSync(){throw Ze()}async fstatPromise(e){throw Ze()}fstatSync(e){throw Ze()}async lstatPromise(e){throw Ze()}lstatSync(e){throw Ze()}async fchmodPromise(){throw Ze()}fchmodSync(){throw Ze()}async chmodPromise(){throw Ze()}chmodSync(){throw Ze()}async fchownPromise(){throw Ze()}fchownSync(){throw Ze()}async chownPromise(){throw Ze()}chownSync(){throw Ze()}async mkdirPromise(){throw Ze()}mkdirSync(){throw Ze()}async rmdirPromise(){throw Ze()}rmdirSync(){throw Ze()}async linkPromise(){throw Ze()}linkSync(){throw Ze()}async symlinkPromise(){throw Ze()}symlinkSync(){throw Ze()}async renamePromise(){throw Ze()}renameSync(){throw Ze()}async copyFilePromise(){throw Ze()}copyFileSync(){throw Ze()}async appendFilePromise(){throw Ze()}appendFileSync(){throw Ze()}async writeFilePromise(){throw Ze()}writeFileSync(){throw Ze()}async unlinkPromise(){throw Ze()}unlinkSync(){throw Ze()}async utimesPromise(){throw Ze()}utimesSync(){throw Ze()}async readFilePromise(){throw Ze()}readFileSync(){throw Ze()}async readlinkPromise(){throw Ze()}readlinkSync(){throw Ze()}async truncatePromise(){throw Ze()}truncateSync(){throw Ze()}async ftruncatePromise(e,t){throw Ze()}ftruncateSync(e,t){throw Ze()}watch(){throw Ze()}watchFile(){throw Ze()}unwatchFile(){throw Ze()}},Gp=wS;Gp.instance=new wS;var Qg=class extends pi{constructor(t){super(K);this.baseFs=t}mapFromBase(t){return K.fromPortablePath(t)}mapToBase(t){return K.toPortablePath(t)}};var Yge=/^[0-9]+$/,BS=/^(\/(?:[^/]+\/)*?(?:\$\$virtual|__virtual__))((?:\/((?:[^/]+-)?[a-f0-9]+)(?:\/([^/]+))?)?((?:\/.*)?))$/,jge=/^([^/]+-)?[a-f0-9]+$/,Br=class extends pi{constructor({baseFs:t=new $t}={}){super(x);this.baseFs=t}static makeVirtualPath(t,i,n){if(x.basename(t)!=="__virtual__")throw new Error('Assertion failed: Virtual folders must be named "__virtual__"');if(!x.basename(i).match(jge))throw new Error("Assertion failed: Virtual components must be ended by an hexadecimal hash");let o=x.relative(x.dirname(t),n).split("/"),a=0;for(;a<o.length&&o[a]==="..";)a+=1;let l=o.slice(a);return x.join(t,i,String(a),...l)}static resolveVirtual(t){let i=t.match(BS);if(!i||!i[3]&&i[5])return t;let n=x.dirname(i[1]);if(!i[3]||!i[4])return n;if(!Yge.test(i[4]))return t;let o=Number(i[4]),a="../".repeat(o),l=i[5]||".";return Br.resolveVirtual(x.join(n,a,l))}getExtractHint(t){return this.baseFs.getExtractHint(t)}getRealPath(){return this.baseFs.getRealPath()}realpathSync(t){let i=t.match(BS);if(!i)return this.baseFs.realpathSync(t);if(!i[5])return t;let n=this.baseFs.realpathSync(this.mapToBase(t));return Br.makeVirtualPath(i[1],i[3],n)}async realpathPromise(t){let i=t.match(BS);if(!i)return await this.baseFs.realpathPromise(t);if(!i[5])return t;let n=await this.baseFs.realpathPromise(this.mapToBase(t));return Br.makeVirtualPath(i[1],i[3],n)}mapToBase(t){if(t==="")return t;if(this.pathUtils.isAbsolute(t))return Br.resolveVirtual(t);let i=Br.resolveVirtual(this.baseFs.resolve(Oe.dot)),n=Br.resolveVirtual(this.baseFs.resolve(t));return x.relative(i,n)||Oe.dot}mapFromBase(t){return t}};var Yp=J("fs");var cn=4278190080,Wi=704643072,fK=(r,e)=>{let t=r.indexOf(e);if(t<=0)return null;let i=t;for(;t>=0&&(i=t+e.length,r[i]!==x.sep);){if(r[t-1]===x.sep)return null;t=r.indexOf(e,i)}return r.length>i&&r[i]!==x.sep?null:r.slice(0,i)},On=class extends vA{constructor({libzip:t,baseFs:i=new $t,filter:n=null,maxOpenFiles:s=1/0,readOnlyArchives:o=!1,useCache:a=!0,maxAge:l=5e3,fileExtensions:c=null}){super();this.fdMap=new Map;this.nextFd=3;this.isZip=new Set;this.notZip=new Set;this.realPaths=new Map;this.limitOpenFilesTimeout=null;this.libzipFactory=typeof t!="function"?()=>t:t,this.baseFs=i,this.zipInstances=a?new Map:null,this.filter=n,this.maxOpenFiles=s,this.readOnlyArchives=o,this.maxAge=l,this.fileExtensions=c}static async openPromise(t,i){let n=new On(i);try{return await t(n)}finally{n.saveAndClose()}}get libzip(){return typeof this.libzipInstance>"u"&&(this.libzipInstance=this.libzipFactory()),this.libzipInstance}getExtractHint(t){return this.baseFs.getExtractHint(t)}getRealPath(){return this.baseFs.getRealPath()}saveAndClose(){if(Hp(this),this.zipInstances)for(let[t,{zipFs:i}]of this.zipInstances.entries())i.saveAndClose(),this.zipInstances.delete(t)}discardAndClose(){if(Hp(this),this.zipInstances)for(let[t,{zipFs:i}]of this.zipInstances.entries())i.discardAndClose(),this.zipInstances.delete(t)}resolve(t){return this.baseFs.resolve(t)}remapFd(t,i){let n=this.nextFd++|Wi;return this.fdMap.set(n,[t,i]),n}async openPromise(t,i,n){return await this.makeCallPromise(t,async()=>await this.baseFs.openPromise(t,i,n),async(s,{subPath:o})=>this.remapFd(s,await s.openPromise(o,i,n)))}openSync(t,i,n){return this.makeCallSync(t,()=>this.baseFs.openSync(t,i,n),(s,{subPath:o})=>this.remapFd(s,s.openSync(o,i,n)))}async opendirPromise(t,i){return await this.makeCallPromise(t,async()=>await this.baseFs.opendirPromise(t,i),async(n,{subPath:s})=>await n.opendirPromise(s,i),{requireSubpath:!1})}opendirSync(t,i){return this.makeCallSync(t,()=>this.baseFs.opendirSync(t,i),(n,{subPath:s})=>n.opendirSync(s,i),{requireSubpath:!1})}async readPromise(t,i,n,s,o){if((t&cn)!==Wi)return await this.baseFs.readPromise(t,i,n,s,o);let a=this.fdMap.get(t);if(typeof a>"u")throw Hr("read");let[l,c]=a;return await l.readPromise(c,i,n,s,o)}readSync(t,i,n,s,o){if((t&cn)!==Wi)return this.baseFs.readSync(t,i,n,s,o);let a=this.fdMap.get(t);if(typeof a>"u")throw Hr("readSync");let[l,c]=a;return l.readSync(c,i,n,s,o)}async writePromise(t,i,n,s,o){if((t&cn)!==Wi)return typeof i=="string"?await this.baseFs.writePromise(t,i,n):await this.baseFs.writePromise(t,i,n,s,o);let a=this.fdMap.get(t);if(typeof a>"u")throw Hr("write");let[l,c]=a;return typeof i=="string"?await l.writePromise(c,i,n):await l.writePromise(c,i,n,s,o)}writeSync(t,i,n,s,o){if((t&cn)!==Wi)return typeof i=="string"?this.baseFs.writeSync(t,i,n):this.baseFs.writeSync(t,i,n,s,o);let a=this.fdMap.get(t);if(typeof a>"u")throw Hr("writeSync");let[l,c]=a;return typeof i=="string"?l.writeSync(c,i,n):l.writeSync(c,i,n,s,o)}async closePromise(t){if((t&cn)!==Wi)return await this.baseFs.closePromise(t);let i=this.fdMap.get(t);if(typeof i>"u")throw Hr("close");this.fdMap.delete(t);let[n,s]=i;return await n.closePromise(s)}closeSync(t){if((t&cn)!==Wi)return this.baseFs.closeSync(t);let i=this.fdMap.get(t);if(typeof i>"u")throw Hr("closeSync");this.fdMap.delete(t);let[n,s]=i;return n.closeSync(s)}createReadStream(t,i){return t===null?this.baseFs.createReadStream(t,i):this.makeCallSync(t,()=>this.baseFs.createReadStream(t,i),(n,{archivePath:s,subPath:o})=>{let a=n.createReadStream(o,i);return a.path=K.fromPortablePath(this.pathUtils.join(s,o)),a})}createWriteStream(t,i){return t===null?this.baseFs.createWriteStream(t,i):this.makeCallSync(t,()=>this.baseFs.createWriteStream(t,i),(n,{subPath:s})=>n.createWriteStream(s,i))}async realpathPromise(t){return await this.makeCallPromise(t,async()=>await this.baseFs.realpathPromise(t),async(i,{archivePath:n,subPath:s})=>{let o=this.realPaths.get(n);return typeof o>"u"&&(o=await this.baseFs.realpathPromise(n),this.realPaths.set(n,o)),this.pathUtils.join(o,this.pathUtils.relative(Oe.root,await i.realpathPromise(s)))})}realpathSync(t){return this.makeCallSync(t,()=>this.baseFs.realpathSync(t),(i,{archivePath:n,subPath:s})=>{let o=this.realPaths.get(n);return typeof o>"u"&&(o=this.baseFs.realpathSync(n),this.realPaths.set(n,o)),this.pathUtils.join(o,this.pathUtils.relative(Oe.root,i.realpathSync(s)))})}async existsPromise(t){return await this.makeCallPromise(t,async()=>await this.baseFs.existsPromise(t),async(i,{subPath:n})=>await i.existsPromise(n))}existsSync(t){return this.makeCallSync(t,()=>this.baseFs.existsSync(t),(i,{subPath:n})=>i.existsSync(n))}async accessPromise(t,i){return await this.makeCallPromise(t,async()=>await this.baseFs.accessPromise(t,i),async(n,{subPath:s})=>await n.accessPromise(s,i))}accessSync(t,i){return this.makeCallSync(t,()=>this.baseFs.accessSync(t,i),(n,{subPath:s})=>n.accessSync(s,i))}async statPromise(t,i){return await this.makeCallPromise(t,async()=>await this.baseFs.statPromise(t,i),async(n,{subPath:s})=>await n.statPromise(s,i))}statSync(t,i){return this.makeCallSync(t,()=>this.baseFs.statSync(t,i),(n,{subPath:s})=>n.statSync(s,i))}async fstatPromise(t,i){if((t&cn)!==Wi)return this.baseFs.fstatPromise(t,i);let n=this.fdMap.get(t);if(typeof n>"u")throw Hr("fstat");let[s,o]=n;return s.fstatPromise(o,i)}fstatSync(t,i){if((t&cn)!==Wi)return this.baseFs.fstatSync(t,i);let n=this.fdMap.get(t);if(typeof n>"u")throw Hr("fstatSync");let[s,o]=n;return s.fstatSync(o,i)}async lstatPromise(t,i){return await this.makeCallPromise(t,async()=>await this.baseFs.lstatPromise(t,i),async(n,{subPath:s})=>await n.lstatPromise(s,i))}lstatSync(t,i){return this.makeCallSync(t,()=>this.baseFs.lstatSync(t,i),(n,{subPath:s})=>n.lstatSync(s,i))}async fchmodPromise(t,i){if((t&cn)!==Wi)return this.baseFs.fchmodPromise(t,i);let n=this.fdMap.get(t);if(typeof n>"u")throw Hr("fchmod");let[s,o]=n;return s.fchmodPromise(o,i)}fchmodSync(t,i){if((t&cn)!==Wi)return this.baseFs.fchmodSync(t,i);let n=this.fdMap.get(t);if(typeof n>"u")throw Hr("fchmodSync");let[s,o]=n;return s.fchmodSync(o,i)}async chmodPromise(t,i){return await this.makeCallPromise(t,async()=>await this.baseFs.chmodPromise(t,i),async(n,{subPath:s})=>await n.chmodPromise(s,i))}chmodSync(t,i){return this.makeCallSync(t,()=>this.baseFs.chmodSync(t,i),(n,{subPath:s})=>n.chmodSync(s,i))}async fchownPromise(t,i,n){if((t&cn)!==Wi)return this.baseFs.fchownPromise(t,i,n);let s=this.fdMap.get(t);if(typeof s>"u")throw Hr("fchown");let[o,a]=s;return o.fchownPromise(a,i,n)}fchownSync(t,i,n){if((t&cn)!==Wi)return this.baseFs.fchownSync(t,i,n);let s=this.fdMap.get(t);if(typeof s>"u")throw Hr("fchownSync");let[o,a]=s;return o.fchownSync(a,i,n)}async chownPromise(t,i,n){return await this.makeCallPromise(t,async()=>await this.baseFs.chownPromise(t,i,n),async(s,{subPath:o})=>await s.chownPromise(o,i,n))}chownSync(t,i,n){return this.makeCallSync(t,()=>this.baseFs.chownSync(t,i,n),(s,{subPath:o})=>s.chownSync(o,i,n))}async renamePromise(t,i){return await this.makeCallPromise(t,async()=>await this.makeCallPromise(i,async()=>await this.baseFs.renamePromise(t,i),async()=>{throw Object.assign(new Error("EEXDEV: cross-device link not permitted"),{code:"EEXDEV"})}),async(n,{subPath:s})=>await this.makeCallPromise(i,async()=>{throw Object.assign(new Error("EEXDEV: cross-device link not permitted"),{code:"EEXDEV"})},async(o,{subPath:a})=>{if(n!==o)throw Object.assign(new Error("EEXDEV: cross-device link not permitted"),{code:"EEXDEV"});return await n.renamePromise(s,a)}))}renameSync(t,i){return this.makeCallSync(t,()=>this.makeCallSync(i,()=>this.baseFs.renameSync(t,i),()=>{throw Object.assign(new Error("EEXDEV: cross-device link not permitted"),{code:"EEXDEV"})}),(n,{subPath:s})=>this.makeCallSync(i,()=>{throw Object.assign(new Error("EEXDEV: cross-device link not permitted"),{code:"EEXDEV"})},(o,{subPath:a})=>{if(n!==o)throw Object.assign(new Error("EEXDEV: cross-device link not permitted"),{code:"EEXDEV"});return n.renameSync(s,a)}))}async copyFilePromise(t,i,n=0){let s=async(o,a,l,c)=>{if((n&Yp.constants.COPYFILE_FICLONE_FORCE)!==0)throw Object.assign(new Error(`EXDEV: cross-device clone not permitted, copyfile '${a}' -> ${c}'`),{code:"EXDEV"});if(n&Yp.constants.COPYFILE_EXCL&&await this.existsPromise(a))throw Object.assign(new Error(`EEXIST: file already exists, copyfile '${a}' -> '${c}'`),{code:"EEXIST"});let u;try{u=await o.readFilePromise(a)}catch{throw Object.assign(new Error(`EINVAL: invalid argument, copyfile '${a}' -> '${c}'`),{code:"EINVAL"})}await l.writeFilePromise(c,u)};return await this.makeCallPromise(t,async()=>await this.makeCallPromise(i,async()=>await this.baseFs.copyFilePromise(t,i,n),async(o,{subPath:a})=>await s(this.baseFs,t,o,a)),async(o,{subPath:a})=>await this.makeCallPromise(i,async()=>await s(o,a,this.baseFs,i),async(l,{subPath:c})=>o!==l?await s(o,a,l,c):await o.copyFilePromise(a,c,n)))}copyFileSync(t,i,n=0){let s=(o,a,l,c)=>{if((n&Yp.constants.COPYFILE_FICLONE_FORCE)!==0)throw Object.assign(new Error(`EXDEV: cross-device clone not permitted, copyfile '${a}' -> ${c}'`),{code:"EXDEV"});if(n&Yp.constants.COPYFILE_EXCL&&this.existsSync(a))throw Object.assign(new Error(`EEXIST: file already exists, copyfile '${a}' -> '${c}'`),{code:"EEXIST"});let u;try{u=o.readFileSync(a)}catch{throw Object.assign(new Error(`EINVAL: invalid argument, copyfile '${a}' -> '${c}'`),{code:"EINVAL"})}l.writeFileSync(c,u)};return this.makeCallSync(t,()=>this.makeCallSync(i,()=>this.baseFs.copyFileSync(t,i,n),(o,{subPath:a})=>s(this.baseFs,t,o,a)),(o,{subPath:a})=>this.makeCallSync(i,()=>s(o,a,this.baseFs,i),(l,{subPath:c})=>o!==l?s(o,a,l,c):o.copyFileSync(a,c,n)))}async appendFilePromise(t,i,n){return await this.makeCallPromise(t,async()=>await this.baseFs.appendFilePromise(t,i,n),async(s,{subPath:o})=>await s.appendFilePromise(o,i,n))}appendFileSync(t,i,n){return this.makeCallSync(t,()=>this.baseFs.appendFileSync(t,i,n),(s,{subPath:o})=>s.appendFileSync(o,i,n))}async writeFilePromise(t,i,n){return await this.makeCallPromise(t,async()=>await this.baseFs.writeFilePromise(t,i,n),async(s,{subPath:o})=>await s.writeFilePromise(o,i,n))}writeFileSync(t,i,n){return this.makeCallSync(t,()=>this.baseFs.writeFileSync(t,i,n),(s,{subPath:o})=>s.writeFileSync(o,i,n))}async unlinkPromise(t){return await this.makeCallPromise(t,async()=>await this.baseFs.unlinkPromise(t),async(i,{subPath:n})=>await i.unlinkPromise(n))}unlinkSync(t){return this.makeCallSync(t,()=>this.baseFs.unlinkSync(t),(i,{subPath:n})=>i.unlinkSync(n))}async utimesPromise(t,i,n){return await this.makeCallPromise(t,async()=>await this.baseFs.utimesPromise(t,i,n),async(s,{subPath:o})=>await s.utimesPromise(o,i,n))}utimesSync(t,i,n){return this.makeCallSync(t,()=>this.baseFs.utimesSync(t,i,n),(s,{subPath:o})=>s.utimesSync(o,i,n))}async mkdirPromise(t,i){return await this.makeCallPromise(t,async()=>await this.baseFs.mkdirPromise(t,i),async(n,{subPath:s})=>await n.mkdirPromise(s,i))}mkdirSync(t,i){return this.makeCallSync(t,()=>this.baseFs.mkdirSync(t,i),(n,{subPath:s})=>n.mkdirSync(s,i))}async rmdirPromise(t,i){return await this.makeCallPromise(t,async()=>await this.baseFs.rmdirPromise(t,i),async(n,{subPath:s})=>await n.rmdirPromise(s,i))}rmdirSync(t,i){return this.makeCallSync(t,()=>this.baseFs.rmdirSync(t,i),(n,{subPath:s})=>n.rmdirSync(s,i))}async linkPromise(t,i){return await this.makeCallPromise(i,async()=>await this.baseFs.linkPromise(t,i),async(n,{subPath:s})=>await n.linkPromise(t,s))}linkSync(t,i){return this.makeCallSync(i,()=>this.baseFs.linkSync(t,i),(n,{subPath:s})=>n.linkSync(t,s))}async symlinkPromise(t,i,n){return await this.makeCallPromise(i,async()=>await this.baseFs.symlinkPromise(t,i,n),async(s,{subPath:o})=>await s.symlinkPromise(t,o))}symlinkSync(t,i,n){return this.makeCallSync(i,()=>this.baseFs.symlinkSync(t,i,n),(s,{subPath:o})=>s.symlinkSync(t,o))}async readFilePromise(t,i){return this.makeCallPromise(t,async()=>{switch(i){case"utf8":return await this.baseFs.readFilePromise(t,i);default:return await this.baseFs.readFilePromise(t,i)}},async(n,{subPath:s})=>await n.readFilePromise(s,i))}readFileSync(t,i){return this.makeCallSync(t,()=>{switch(i){case"utf8":return this.baseFs.readFileSync(t,i);default:return this.baseFs.readFileSync(t,i)}},(n,{subPath:s})=>n.readFileSync(s,i))}async readdirPromise(t,i){return await this.makeCallPromise(t,async()=>await this.baseFs.readdirPromise(t,i),async(n,{subPath:s})=>await n.readdirPromise(s,i),{requireSubpath:!1})}readdirSync(t,i){return this.makeCallSync(t,()=>this.baseFs.readdirSync(t,i),(n,{subPath:s})=>n.readdirSync(s,i),{requireSubpath:!1})}async readlinkPromise(t){return await this.makeCallPromise(t,async()=>await this.baseFs.readlinkPromise(t),async(i,{subPath:n})=>await i.readlinkPromise(n))}readlinkSync(t){return this.makeCallSync(t,()=>this.baseFs.readlinkSync(t),(i,{subPath:n})=>i.readlinkSync(n))}async truncatePromise(t,i){return await this.makeCallPromise(t,async()=>await this.baseFs.truncatePromise(t,i),async(n,{subPath:s})=>await n.truncatePromise(s,i))}truncateSync(t,i){return this.makeCallSync(t,()=>this.baseFs.truncateSync(t,i),(n,{subPath:s})=>n.truncateSync(s,i))}async ftruncatePromise(t,i){if((t&cn)!==Wi)return this.baseFs.ftruncatePromise(t,i);let n=this.fdMap.get(t);if(typeof n>"u")throw Hr("ftruncate");let[s,o]=n;return s.ftruncatePromise(o,i)}ftruncateSync(t,i){if((t&cn)!==Wi)return this.baseFs.ftruncateSync(t,i);let n=this.fdMap.get(t);if(typeof n>"u")throw Hr("ftruncateSync");let[s,o]=n;return s.ftruncateSync(o,i)}watch(t,i,n){return this.makeCallSync(t,()=>this.baseFs.watch(t,i,n),(s,{subPath:o})=>s.watch(o,i,n))}watchFile(t,i,n){return this.makeCallSync(t,()=>this.baseFs.watchFile(t,i,n),()=>$E(this,t,i,n))}unwatchFile(t,i){return this.makeCallSync(t,()=>this.baseFs.unwatchFile(t,i),()=>Up(this,t,i))}async makeCallPromise(t,i,n,{requireSubpath:s=!0}={}){if(typeof t!="string")return await i();let o=this.resolve(t),a=this.findZip(o);return a?s&&a.subPath==="/"?await i():await this.getZipPromise(a.archivePath,async l=>await n(l,a)):await i()}makeCallSync(t,i,n,{requireSubpath:s=!0}={}){if(typeof t!="string")return i();let o=this.resolve(t),a=this.findZip(o);return!a||s&&a.subPath==="/"?i():this.getZipSync(a.archivePath,l=>n(l,a))}findZip(t){if(this.filter&&!this.filter.test(t))return null;let i="";for(;;){let n=t.substring(i.length),s;if(!this.fileExtensions)s=fK(n,".zip");else for(let o of this.fileExtensions)if(s=fK(n,o),s)break;if(!s)return null;if(i=this.pathUtils.join(i,s),this.isZip.has(i)===!1){if(this.notZip.has(i))continue;try{if(!this.baseFs.lstatSync(i).isFile()){this.notZip.add(i);continue}}catch{return null}this.isZip.add(i)}return{archivePath:i,subPath:this.pathUtils.join(Oe.root,t.substring(i.length))}}}limitOpenFiles(t){if(this.zipInstances===null)return;let i=Date.now(),n=i+this.maxAge,s=t===null?0:this.zipInstances.size-t;for(let[o,{zipFs:a,expiresAt:l,refCount:c}]of this.zipInstances.entries())if(!(c!==0||a.hasOpenFileHandles())){if(i>=l){a.saveAndClose(),this.zipInstances.delete(o),s-=1;continue}else if(t===null||s<=0){n=l;break}a.saveAndClose(),this.zipInstances.delete(o),s-=1}this.limitOpenFilesTimeout===null&&(t===null&&this.zipInstances.size>0||t!==null)&&(this.limitOpenFilesTimeout=setTimeout(()=>{this.limitOpenFilesTimeout=null,this.limitOpenFiles(null)},n-i).unref())}async getZipPromise(t,i){let n=async()=>({baseFs:this.baseFs,libzip:this.libzip,readOnly:this.readOnlyArchives,stats:await this.baseFs.statPromise(t)});if(this.zipInstances){let s=this.zipInstances.get(t);if(!s){let o=await n();s=this.zipInstances.get(t),s||(s={zipFs:new Wr(t,o),expiresAt:0,refCount:0})}this.zipInstances.delete(t),this.limitOpenFiles(this.maxOpenFiles-1),this.zipInstances.set(t,s),s.expiresAt=Date.now()+this.maxAge,s.refCount+=1;try{return await i(s.zipFs)}finally{s.refCount-=1}}else{let s=new Wr(t,await n());try{return await i(s)}finally{s.saveAndClose()}}}getZipSync(t,i){let n=()=>({baseFs:this.baseFs,libzip:this.libzip,readOnly:this.readOnlyArchives,stats:this.baseFs.statSync(t)});if(this.zipInstances){let s=this.zipInstances.get(t);return s||(s={zipFs:new Wr(t,n()),expiresAt:0,refCount:0}),this.zipInstances.delete(t),this.limitOpenFiles(this.maxOpenFiles-1),this.zipInstances.set(t,s),s.expiresAt=Date.now()+this.maxAge,i(s.zipFs)}else{let s=new Wr(t,n());try{return i(s)}finally{s.saveAndClose()}}}};var Sg=J("util");var tI=J("url"),hK=J("util");var eI=class extends pi{constructor(t){super(K);this.baseFs=t}mapFromBase(t){return t}mapToBase(t){if(typeof t=="string")return t;if(t instanceof tI.URL)return(0,tI.fileURLToPath)(t);if(Buffer.isBuffer(t)){let i=t.toString();if(Buffer.byteLength(i)!==t.byteLength)throw new Error("Non-utf8 buffers are not supported at the moment. Please upvote the following issue if you encounter this error: https://github.com/yarnpkg/berry/issues/4942");return i}throw new Error(`Unsupported path type: ${(0,hK.inspect)(t)}`)}};var pK=J("readline"),Fi=Symbol("kBaseFs"),Ia=Symbol("kFd"),xA=Symbol("kClosePromise"),rI=Symbol("kCloseResolve"),iI=Symbol("kCloseReject"),bg=Symbol("kRefs"),qs=Symbol("kRef"),Js=Symbol("kUnref"),qge,Jge,Wge,zge,jp=class{constructor(e,t){this[qge]=1;this[Jge]=void 0;this[Wge]=void 0;this[zge]=void 0;this[Fi]=t,this[Ia]=e}get fd(){return this[Ia]}async appendFile(e,t){var i;try{this[qs](this.appendFile);let n=(i=typeof t=="string"?t:t==null?void 0:t.encoding)!=null?i:void 0;return await this[Fi].appendFilePromise(this.fd,e,n?{encoding:n}:void 0)}finally{this[Js]()}}async chown(e,t){try{return this[qs](this.chown),await this[Fi].fchownPromise(this.fd,e,t)}finally{this[Js]()}}async chmod(e){try{return this[qs](this.chmod),await this[Fi].fchmodPromise(this.fd,e)}finally{this[Js]()}}createReadStream(e){return this[Fi].createReadStream(null,{...e,fd:this.fd})}createWriteStream(e){return this[Fi].createWriteStream(null,{...e,fd:this.fd})}datasync(){throw new Error("Method not implemented.")}sync(){throw new Error("Method not implemented.")}async read(e,t,i,n){var s,o,a;try{this[qs](this.read);let l;return Buffer.isBuffer(e)?l=e:(e!=null||(e={}),l=(s=e.buffer)!=null?s:Buffer.alloc(16384),t=e.offset||0,i=(o=e.length)!=null?o:l.byteLength,n=(a=e.position)!=null?a:null),t!=null||(t=0),i!=null||(i=0),i===0?{bytesRead:i,buffer:l}:{bytesRead:await this[Fi].readPromise(this.fd,l,t,i,n),buffer:l}}finally{this[Js]()}}async readFile(e){var t;try{this[qs](this.readFile);let i=(t=typeof e=="string"?e:e==null?void 0:e.encoding)!=null?t:void 0;return await this[Fi].readFilePromise(this.fd,i)}finally{this[Js]()}}readLines(e){return(0,pK.createInterface)({input:this.createReadStream(e),crlfDelay:1/0})}async stat(e){try{return this[qs](this.stat),await this[Fi].fstatPromise(this.fd,e)}finally{this[Js]()}}async truncate(e){try{return this[qs](this.truncate),await this[Fi].ftruncatePromise(this.fd,e)}finally{this[Js]()}}utimes(e,t){throw new Error("Method not implemented.")}async writeFile(e,t){var i;try{this[qs](this.writeFile);let n=(i=typeof t=="string"?t:t==null?void 0:t.encoding)!=null?i:void 0;await this[Fi].writeFilePromise(this.fd,e,n)}finally{this[Js]()}}async write(...e){try{if(this[qs](this.write),ArrayBuffer.isView(e[0])){let[t,i,n,s]=e;return{bytesWritten:await this[Fi].writePromise(this.fd,t,i!=null?i:void 0,n!=null?n:void 0,s!=null?s:void 0),buffer:t}}else{let[t,i,n]=e;return{bytesWritten:await this[Fi].writePromise(this.fd,t,i,n),buffer:t}}}finally{this[Js]()}}async writev(e,t){try{this[qs](this.writev);let i=0;if(typeof t<"u")for(let n of e){let s=await this.write(n,void 0,void 0,t);i+=s.bytesWritten,t+=s.bytesWritten}else for(let n of e)i+=(await this.write(n)).bytesWritten;return{buffers:e,bytesWritten:i}}finally{this[Js]()}}readv(e,t){throw new Error("Method not implemented.")}close(){if(this[Ia]===-1)return Promise.resolve();if(this[xA])return this[xA];if(this[bg]--,this[bg]===0){let e=this[Ia];this[Ia]=-1,this[xA]=this[Fi].closePromise(e).finally(()=>{this[xA]=void 0})}else this[xA]=new Promise((e,t)=>{this[rI]=e,this[iI]=t}).finally(()=>{this[xA]=void 0,this[iI]=void 0,this[rI]=void 0});return this[xA]}[(Fi,Ia,qge=bg,Jge=xA,Wge=rI,zge=iI,qs)](e){if(this[Ia]===-1){let t=new Error("file closed");throw t.code="EBADF",t.syscall=e.name,t}this[bg]++}[Js](){if(this[bg]--,this[bg]===0){let e=this[Ia];this[Ia]=-1,this[Fi].closePromise(e).then(this[rI],this[iI])}}};var Vge=new Set(["accessSync","appendFileSync","createReadStream","createWriteStream","chmodSync","fchmodSync","chownSync","fchownSync","closeSync","copyFileSync","linkSync","lstatSync","fstatSync","lutimesSync","mkdirSync","openSync","opendirSync","readlinkSync","readFileSync","readdirSync","readlinkSync","realpathSync","renameSync","rmdirSync","statSync","symlinkSync","truncateSync","ftruncateSync","unlinkSync","unwatchFile","utimesSync","watch","watchFile","writeFileSync","writeSync"]),dK=new Set(["accessPromise","appendFilePromise","fchmodPromise","chmodPromise","fchownPromise","chownPromise","closePromise","copyFilePromise","linkPromise","fstatPromise","lstatPromise","lutimesPromise","mkdirPromise","openPromise","opendirPromise","readdirPromise","realpathPromise","readFilePromise","readdirPromise","readlinkPromise","renamePromise","rmdirPromise","statPromise","symlinkPromise","truncatePromise","ftruncatePromise","unlinkPromise","utimesPromise","writeFilePromise","writeSync"]);function QS(r,e){e=new eI(e);let t=(i,n,s)=>{let o=i[n];i[n]=s,typeof(o==null?void 0:o[Sg.promisify.custom])<"u"&&(s[Sg.promisify.custom]=o[Sg.promisify.custom])};{t(r,"exists",(i,...n)=>{let o=typeof n[n.length-1]=="function"?n.pop():()=>{};process.nextTick(()=>{e.existsPromise(i).then(a=>{o(a)},()=>{o(!1)})})}),t(r,"read",(...i)=>{let[n,s,o,a,l,c]=i;if(i.length<=3){let u={};i.length<3?c=i[1]:(u=i[1],c=i[2]),{buffer:s=Buffer.alloc(16384),offset:o=0,length:a=s.byteLength,position:l}=u}if(o==null&&(o=0),a|=0,a===0){process.nextTick(()=>{c(null,0,s)});return}l==null&&(l=-1),process.nextTick(()=>{e.readPromise(n,s,o,a,l).then(u=>{c(null,u,s)},u=>{c(u,0,s)})})});for(let i of dK){let n=i.replace(/Promise$/,"");if(typeof r[n]>"u")continue;let s=e[i];if(typeof s>"u")continue;t(r,n,(...a)=>{let c=typeof a[a.length-1]=="function"?a.pop():()=>{};process.nextTick(()=>{s.apply(e,a).then(u=>{c(null,u)},u=>{c(u)})})})}r.realpath.native=r.realpath}{t(r,"existsSync",i=>{try{return e.existsSync(i)}catch{return!1}}),t(r,"readSync",(...i)=>{let[n,s,o,a,l]=i;return i.length<=3&&({offset:o=0,length:a=s.byteLength,position:l}=i[2]||{}),o==null&&(o=0),a|=0,a===0?0:(l==null&&(l=-1),e.readSync(n,s,o,a,l))});for(let i of Vge){let n=i;if(typeof r[n]>"u")continue;let s=e[i];typeof s>"u"||t(r,n,s.bind(e))}r.realpathSync.native=r.realpathSync}{let i=process.emitWarning;process.emitWarning=()=>{};let n;try{n=r.promises}finally{process.emitWarning=i}if(typeof n<"u"){for(let s of dK){let o=s.replace(/Promise$/,"");if(typeof n[o]>"u")continue;let a=e[s];typeof a>"u"||s!=="open"&&t(n,o,(l,...c)=>l instanceof jp?l[o].apply(l,c):a.call(e,l,...c))}t(n,"open",async(...s)=>{let o=await e.openPromise(...s);return new jp(o,e)})}}r.read[Sg.promisify.custom]=async(i,n,...s)=>({bytesRead:await e.readPromise(i,n,...s),buffer:n}),r.write[Sg.promisify.custom]=async(i,n,...s)=>({bytesWritten:await e.writePromise(i,n,...s),buffer:n})}function nI(r,e){let t=Object.create(r);return QS(t,e),t}var EK=Pe(J("os"));function CK(r){let e=Math.ceil(Math.random()*4294967296).toString(16).padStart(8,"0");return`${r}${e}`}var Ws=new Set,bS=null;function mK(){if(bS)return bS;let r=K.toPortablePath(EK.default.tmpdir()),e=M.realpathSync(r);return process.once("exit",()=>{M.rmtempSync()}),bS={tmpdir:r,realTmpdir:e}}var M=Object.assign(new $t,{detachTemp(r){Ws.delete(r)},mktempSync(r){let{tmpdir:e,realTmpdir:t}=mK();for(;;){let i=CK("xfs-");try{this.mkdirSync(x.join(e,i))}catch(s){if(s.code==="EEXIST")continue;throw s}let n=x.join(t,i);if(Ws.add(n),typeof r>"u")return n;try{return r(n)}finally{if(Ws.has(n)){Ws.delete(n);try{this.removeSync(n)}catch{}}}}},async mktempPromise(r){let{tmpdir:e,realTmpdir:t}=mK();for(;;){let i=CK("xfs-");try{await this.mkdirPromise(x.join(e,i))}catch(s){if(s.code==="EEXIST")continue;throw s}let n=x.join(t,i);if(Ws.add(n),typeof r>"u")return n;try{return await r(n)}finally{if(Ws.has(n)){Ws.delete(n);try{await this.removePromise(n)}catch{}}}}},async rmtempPromise(){await Promise.all(Array.from(Ws.values()).map(async r=>{try{await M.removePromise(r,{maxRetries:0}),Ws.delete(r)}catch{}}))},rmtempSync(){for(let r of Ws)try{M.removeSync(r),Ws.delete(r)}catch{}}});var fk=Pe(LS());var $p={};ut($p,{parseResolution:()=>cI,parseShell:()=>aI,parseSyml:()=>yi,stringifyArgument:()=>KS,stringifyArgumentSegment:()=>US,stringifyArithmeticExpression:()=>lI,stringifyCommand:()=>MS,stringifyCommandChain:()=>Dg,stringifyCommandChainThen:()=>OS,stringifyCommandLine:()=>AI,stringifyCommandLineThen:()=>TS,stringifyEnvSegment:()=>oI,stringifyRedirectArgument:()=>Jp,stringifyResolution:()=>uI,stringifyShell:()=>Pg,stringifyShellLine:()=>Pg,stringifySyml:()=>wa,stringifyValueArgument:()=>zl});var lU=Pe(AU());function aI(r,e={isGlobPattern:()=>!1}){try{return(0,lU.parse)(r,e)}catch(t){throw t.location&&(t.message=t.message.replace(/(\.)?$/,` (line ${t.location.start.line}, column ${t.location.start.column})$1`)),t}}function Pg(r,{endSemicolon:e=!1}={}){return r.map(({command:t,type:i},n)=>`${AI(t)}${i===";"?n!==r.length-1||e?";":"":" &"}`).join(" ")}function AI(r){return`${Dg(r.chain)}${r.then?` ${TS(r.then)}`:""}`}function TS(r){return`${r.type} ${AI(r.line)}`}function Dg(r){return`${MS(r)}${r.then?` ${OS(r.then)}`:""}`}function OS(r){return`${r.type} ${Dg(r.chain)}`}function MS(r){switch(r.type){case"command":return`${r.envs.length>0?`${r.envs.map(e=>oI(e)).join(" ")} `:""}${r.args.map(e=>KS(e)).join(" ")}`;case"subshell":return`(${Pg(r.subshell)})${r.args.length>0?` ${r.args.map(e=>Jp(e)).join(" ")}`:""}`;case"group":return`{ ${Pg(r.group,{endSemicolon:!0})} }${r.args.length>0?` ${r.args.map(e=>Jp(e)).join(" ")}`:""}`;case"envs":return r.envs.map(e=>oI(e)).join(" ");default:throw new Error(`Unsupported command type:  "${r.type}"`)}}function oI(r){return`${r.name}=${r.args[0]?zl(r.args[0]):""}`}function KS(r){switch(r.type){case"redirection":return Jp(r);case"argument":return zl(r);default:throw new Error(`Unsupported argument type: "${r.type}"`)}}function Jp(r){return`${r.subtype} ${r.args.map(e=>zl(e)).join(" ")}`}function zl(r){return r.segments.map(e=>US(e)).join("")}function US(r){let e=(i,n)=>n?`"${i}"`:i,t=i=>i===""?'""':i.match(/[(){}<>$|&; \t"']/)?`$'${i.replace(/\\/g,"\\\\").replace(/'/g,"\\'").replace(/\f/g,"\\f").replace(/\n/g,"\\n").replace(/\r/g,"\\r").replace(/\t/g,"\\t").replace(/\v/g,"\\v").replace(/\0/g,"\\0")}'`:i;switch(r.type){case"text":return t(r.text);case"glob":return r.pattern;case"shell":return e(`\${${Pg(r.shell)}}`,r.quoted);case"variable":return e(typeof r.defaultValue>"u"?typeof r.alternativeValue>"u"?`\${${r.name}}`:r.alternativeValue.length===0?`\${${r.name}:+}`:`\${${r.name}:+${r.alternativeValue.map(i=>zl(i)).join(" ")}}`:r.defaultValue.length===0?`\${${r.name}:-}`:`\${${r.name}:-${r.defaultValue.map(i=>zl(i)).join(" ")}}`,r.quoted);case"arithmetic":return`$(( ${lI(r.arithmetic)} ))`;default:throw new Error(`Unsupported argument segment type: "${r.type}"`)}}function lI(r){let e=n=>{switch(n){case"addition":return"+";case"subtraction":return"-";case"multiplication":return"*";case"division":return"/";default:throw new Error(`Can't extract operator from arithmetic expression of type "${n}"`)}},t=(n,s)=>s?`( ${n} )`:n,i=n=>t(lI(n),!["number","variable"].includes(n.type));switch(r.type){case"number":return String(r.value);case"variable":return r.name;default:return`${i(r.left)} ${e(r.type)} ${i(r.right)}`}}var gU=Pe(uU());function cI(r){let e=r.match(/^\*{1,2}\/(.*)/);if(e)throw new Error(`The override for '${r}' includes a glob pattern. Glob patterns have been removed since their behaviours don't match what you'd expect. Set the override to '${e[1]}' instead.`);try{return(0,gU.parse)(r)}catch(t){throw t.location&&(t.message=t.message.replace(/(\.)?$/,` (line ${t.location.start.line}, column ${t.location.start.column})$1`)),t}}function uI(r){let e="";return r.from&&(e+=r.from.fullName,r.from.description&&(e+=`@${r.from.description}`),e+="/"),e+=r.descriptor.fullName,r.descriptor.description&&(e+=`@${r.descriptor.description}`),e}var BI=Pe(rH()),aH=Pe(nH()),nde=/^(?![-?:,\][{}#&*!|>'"%@` \t\r\n]).([ \t]*(?![,\][{}:# \t\r\n]).)*$/,sH=["__metadata","version","resolution","dependencies","peerDependencies","dependenciesMeta","peerDependenciesMeta","binaries"],wI=class{constructor(e){this.data=e}};function oH(r){return r.match(nde)?r:JSON.stringify(r)}function AH(r){return typeof r>"u"?!0:typeof r=="object"&&r!==null?Object.keys(r).every(e=>AH(r[e])):!1}function $S(r,e,t){if(r===null)return`null
-`;if(typeof r=="number"||typeof r=="boolean")return`${r.toString()}
-`;if(typeof r=="string")return`${oH(r)}
-`;if(Array.isArray(r)){if(r.length===0)return`[]
-`;let i="  ".repeat(e);return`
-${r.map(s=>`${i}- ${$S(s,e+1,!1)}`).join("")}`}if(typeof r=="object"&&r){let i,n;r instanceof wI?(i=r.data,n=!1):(i=r,n=!0);let s="  ".repeat(e),o=Object.keys(i);n&&o.sort((l,c)=>{let u=sH.indexOf(l),g=sH.indexOf(c);return u===-1&&g===-1?l<c?-1:l>c?1:0:u!==-1&&g===-1?-1:u===-1&&g!==-1?1:u-g});let a=o.filter(l=>!AH(i[l])).map((l,c)=>{let u=i[l],g=oH(l),f=$S(u,e+1,!0),h=c>0||t?s:"",p=g.length>1024?`? ${g}
-${h}:`:`${g}:`,C=f.startsWith(`
-`)?f:` ${f}`;return`${h}${p}${C}`}).join(e===0?`
-`:"")||`
-`;return t?`
-${a}`:`${a}`}throw new Error(`Unsupported value type (${r})`)}function wa(r){try{let e=$S(r,0,!1);return e!==`
-`?e:""}catch(e){throw e.location&&(e.message=e.message.replace(/(\.)?$/,` (line ${e.location.start.line}, column ${e.location.start.column})$1`)),e}}wa.PreserveOrdering=wI;function sde(r){return r.endsWith(`
-`)||(r+=`
-`),(0,aH.parse)(r)}var ode=/^(#.*(\r?\n))*?#\s+yarn\s+lockfile\s+v1\r?\n/i;function ade(r){if(ode.test(r))return sde(r);let e=(0,BI.safeLoad)(r,{schema:BI.FAILSAFE_SCHEMA,json:!0});if(e==null)return{};if(typeof e!="object")throw new Error(`Expected an indexed object, got a ${typeof e} instead. Does your file follow Yaml's rules?`);if(Array.isArray(e))throw new Error("Expected an indexed object, got an array instead. Does your file follow Yaml's rules?");return e}function yi(r){return ade(r)}var fz=Pe(cH()),Lw=Pe(nc());var ld={};ut(ld,{Builtins:()=>hv,Cli:()=>Un,Command:()=>ve,Option:()=>z,UsageError:()=>be,formatMarkdownish:()=>Li});var tv="
",wi="\0";var rv=/^(-h|--help)(?:=([0-9]+))?$/,QI=/^(--[a-z]+(?:-[a-z]+)*|-[a-zA-Z]+)$/,hH=/^-[a-zA-Z]{2,}$/,iv=/^([^=]+)=([\s\S]*)$/,nv=process.env.DEBUG_CLI==="1";var be=class extends Error{constructor(e){super(e),this.clipanion={type:"usage"},this.name="UsageError"}},Mg=class extends Error{constructor(e,t){if(super(),this.input=e,this.candidates=t,this.clipanion={type:"none"},this.name="UnknownSyntaxError",this.candidates.length===0)this.message="Command not found, but we're not sure what's the alternative.";else if(this.candidates.every(i=>i.reason!==null&&i.reason===t[0].reason)){let[{reason:i}]=this.candidates;this.message=`${i}
-
-${this.candidates.map(({usage:n})=>`$ ${n}`).join(`
-`)}`}else if(this.candidates.length===1){let[{usage:i}]=this.candidates;this.message=`Command not found; did you mean:
-
-$ ${i}
-${sv(e)}`}else this.message=`Command not found; did you mean one of:
-
-${this.candidates.map(({usage:i},n)=>`${`${n}.`.padStart(4)} ${i}`).join(`
-`)}
-
-${sv(e)}`}},bI=class extends Error{constructor(e,t){super(),this.input=e,this.usages=t,this.clipanion={type:"none"},this.name="AmbiguousSyntaxError",this.message=`Cannot find which to pick amongst the following alternatives:
-
-${this.usages.map((i,n)=>`${`${n}.`.padStart(4)} ${i}`).join(`
-`)}
-
-${sv(e)}`}},sv=r=>`While running ${r.filter(e=>e!==wi).map(e=>{let t=JSON.stringify(e);return e.match(/\s/)||e.length===0||t!==`"${e}"`?t:e}).join(" ")}`;var ed=Symbol("clipanion/isOption");function zi(r){return{...r,[ed]:!0}}function Po(r,e){return typeof r>"u"?[r,e]:typeof r=="object"&&r!==null&&!Array.isArray(r)?[void 0,r]:[r,e]}function SI(r,e=!1){let t=r.replace(/^\.: /,"");return e&&(t=t[0].toLowerCase()+t.slice(1)),t}function td(r,e){return e.length===1?new be(`${r}: ${SI(e[0],!0)}`):new be(`${r}:
-${e.map(t=>`
-- ${SI(t)}`).join("")}`)}function rd(r,e,t){if(typeof t>"u")return e;let i=[],n=[],s=a=>{let l=e;return e=a,s.bind(null,l)};if(!t(e,{errors:i,coercions:n,coercion:s}))throw td(`Invalid value for ${r}`,i);for(let[,a]of n)a();return e}var ve=class{constructor(){this.help=!1}static Usage(e){return e}async catch(e){throw e}async validateAndExecute(){let t=this.constructor.schema;if(Array.isArray(t)){let{isDict:n,isUnknown:s,applyCascade:o}=await Promise.resolve().then(()=>(as(),gn)),a=o(n(s()),t),l=[],c=[];if(!a(this,{errors:l,coercions:c}))throw td("Invalid option schema",l);for(let[,g]of c)g()}else if(t!=null)throw new Error("Invalid command schema");let i=await this.execute();return typeof i<"u"?i:0}};ve.isOption=ed;ve.Default=[];var Av=Array(80).fill("\u2501");for(let r=0;r<=24;++r)Av[Av.length-r]=`\x1B[38;5;${232+r}m\u2501`;var lv={header:r=>`\x1B[1m\u2501\u2501\u2501 ${r}${r.length<80-5?` ${Av.slice(r.length+5).join("")}`:":"}\x1B[0m`,bold:r=>`\x1B[1m${r}\x1B[22m`,error:r=>`\x1B[31m\x1B[1m${r}\x1B[22m\x1B[39m`,code:r=>`\x1B[36m${r}\x1B[39m`},QH={header:r=>r,bold:r=>r,error:r=>r,code:r=>r};function jde(r){let e=r.split(`
-`),t=e.filter(n=>n.match(/\S/)),i=t.length>0?t.reduce((n,s)=>Math.min(n,s.length-s.trimStart().length),Number.MAX_VALUE):0;return e.map(n=>n.slice(i).trimRight()).join(`
-`)}function Li(r,{format:e,paragraphs:t}){return r=r.replace(/\r\n?/g,`
-`),r=jde(r),r=r.replace(/^\n+|\n+$/g,""),r=r.replace(/^(\s*)-([^\n]*?)\n+/gm,`$1-$2
-
-`),r=r.replace(/\n(\n)?\n*/g,"$1"),t&&(r=r.split(/\n/).map(i=>{let n=i.match(/^\s*[*-][\t ]+(.*)/);if(!n)return i.match(/(.{1,80})(?: |$)/g).join(`
-`);let s=i.length-i.trimStart().length;return n[1].match(new RegExp(`(.{1,${78-s}})(?: |$)`,"g")).map((o,a)=>" ".repeat(s)+(a===0?"- ":"  ")+o).join(`
-`)}).join(`
-
-`)),r=r.replace(/(`+)((?:.|[\n])*?)\1/g,(i,n,s)=>e.code(n+s+n)),r=r.replace(/(\*\*)((?:.|[\n])*?)\1/g,(i,n,s)=>e.bold(n+s+n)),r?`${r}
-`:""}var fv=Pe(J("tty"),1);function fn(r){nv&&console.log(r)}var bH={candidateUsage:null,requiredOptions:[],errorMessage:null,ignoreOptions:!1,path:[],positionals:[],options:[],remainder:null,selectedIndex:-1};function SH(){return{nodes:[Xi(),Xi(),Xi()]}}function qde(r){let e=SH(),t=[],i=e.nodes.length;for(let n of r){t.push(i);for(let s=0;s<n.nodes.length;++s)PH(s)||e.nodes.push(eCe(n.nodes[s],i));i+=n.nodes.length-2}for(let n of t)Kg(e,0,n);return e}function zs(r,e){return r.nodes.push(e),r.nodes.length-1}function Jde(r){let e=new Set,t=i=>{if(e.has(i))return;e.add(i);let n=r.nodes[i];for(let o of Object.values(n.statics))for(let{to:a}of o)t(a);for(let[,{to:o}]of n.dynamics)t(o);for(let{to:o}of n.shortcuts)t(o);let s=new Set(n.shortcuts.map(({to:o})=>o));for(;n.shortcuts.length>0;){let{to:o}=n.shortcuts.shift(),a=r.nodes[o];for(let[l,c]of Object.entries(a.statics)){let u=Object.prototype.hasOwnProperty.call(n.statics,l)?n.statics[l]:n.statics[l]=[];for(let g of c)u.some(({to:f})=>g.to===f)||u.push(g)}for(let[l,c]of a.dynamics)n.dynamics.some(([u,{to:g}])=>l===u&&c.to===g)||n.dynamics.push([l,c]);for(let l of a.shortcuts)s.has(l.to)||(n.shortcuts.push(l),s.add(l.to))}};t(0)}function Wde(r,{prefix:e=""}={}){if(nv){fn(`${e}Nodes are:`);for(let t=0;t<r.nodes.length;++t)fn(`${e}  ${t}: ${JSON.stringify(r.nodes[t])}`)}}function vH(r,e,t=!1){fn(`Running a vm on ${JSON.stringify(e)}`);let i=[{node:0,state:{candidateUsage:null,requiredOptions:[],errorMessage:null,ignoreOptions:!1,options:[],path:[],positionals:[],remainder:null,selectedIndex:null}}];Wde(r,{prefix:"  "});let n=[tv,...e];for(let s=0;s<n.length;++s){let o=n[s];fn(`  Processing ${JSON.stringify(o)}`);let a=[];for(let{node:l,state:c}of i){fn(`    Current node is ${l}`);let u=r.nodes[l];if(l===2){a.push({node:l,state:c});continue}console.assert(u.shortcuts.length===0,"Shortcuts should have been eliminated by now");let g=Object.prototype.hasOwnProperty.call(u.statics,o);if(!t||s<n.length-1||g)if(g){let f=u.statics[o];for(let{to:h,reducer:p}of f)a.push({node:h,state:typeof p<"u"?xI(uv,p,c,o):c}),fn(`      Static transition to ${h} found`)}else fn("      No static transition found");else{let f=!1;for(let h of Object.keys(u.statics))if(!!h.startsWith(o)){if(o===h)for(let{to:p,reducer:C}of u.statics[h])a.push({node:p,state:typeof C<"u"?xI(uv,C,c,o):c}),fn(`      Static transition to ${p} found`);else for(let{to:p}of u.statics[h])a.push({node:p,state:{...c,remainder:h.slice(o.length)}}),fn(`      Static transition to ${p} found (partial match)`);f=!0}f||fn("      No partial static transition found")}if(o!==wi)for(let[f,{to:h,reducer:p}]of u.dynamics)xI(DI,f,c,o)&&(a.push({node:h,state:typeof p<"u"?xI(uv,p,c,o):c}),fn(`      Dynamic transition to ${h} found (via ${f})`))}if(a.length===0&&o===wi&&e.length===1)return[{node:0,state:bH}];if(a.length===0)throw new Mg(e,i.filter(({node:l})=>l!==2).map(({state:l})=>({usage:l.candidateUsage,reason:null})));if(a.every(({node:l})=>l===2))throw new Mg(e,a.map(({state:l})=>({usage:l.candidateUsage,reason:l.errorMessage})));i=Zde(a)}if(i.length>0){fn("  Results:");for(let s of i)fn(`    - ${s.node} -> ${JSON.stringify(s.state)}`)}else fn("  No results");return i}function zde(r,e){if(e.selectedIndex!==null)return!0;if(Object.prototype.hasOwnProperty.call(r.statics,wi)){for(let{to:t}of r.statics[wi])if(t===1)return!0}return!1}function Vde(r,e,t){let i=t&&e.length>0?[""]:[],n=vH(r,e,t),s=[],o=new Set,a=(l,c,u=!0)=>{let g=[c];for(;g.length>0;){let h=g;g=[];for(let p of h){let C=r.nodes[p],y=Object.keys(C.statics);for(let B of Object.keys(C.statics)){let v=y[0];for(let{to:D,reducer:L}of C.statics[v])L==="pushPath"&&(u||l.push(v),g.push(D))}}u=!1}let f=JSON.stringify(l);o.has(f)||(s.push(l),o.add(f))};for(let{node:l,state:c}of n){if(c.remainder!==null){a([c.remainder],l);continue}let u=r.nodes[l],g=zde(u,c);for(let[f,h]of Object.entries(u.statics))(g&&f!==wi||!f.startsWith("-")&&h.some(({reducer:p})=>p==="pushPath"))&&a([...i,f],l);if(!!g)for(let[f,{to:h}]of u.dynamics){if(h===2)continue;let p=tCe(f,c);if(p!==null)for(let C of p)a([...i,C],l)}}return[...s].sort()}function Xde(r,e){let t=vH(r,[...e,wi]);return _de(e,t.map(({state:i})=>i))}function Zde(r){let e=0;for(let{state:t}of r)t.path.length>e&&(e=t.path.length);return r.filter(({state:t})=>t.path.length===e)}function _de(r,e){let t=e.filter(g=>g.selectedIndex!==null);if(t.length===0)throw new Error;let i=t.filter(g=>g.requiredOptions.every(f=>f.some(h=>g.options.find(p=>p.name===h))));if(i.length===0)throw new Mg(r,t.map(g=>({usage:g.candidateUsage,reason:null})));let n=0;for(let g of i)g.path.length>n&&(n=g.path.length);let s=i.filter(g=>g.path.length===n),o=g=>g.positionals.filter(({extra:f})=>!f).length+g.options.length,a=s.map(g=>({state:g,positionalCount:o(g)})),l=0;for(let{positionalCount:g}of a)g>l&&(l=g);let c=a.filter(({positionalCount:g})=>g===l).map(({state:g})=>g),u=$de(c);if(u.length>1)throw new bI(r,u.map(g=>g.candidateUsage));return u[0]}function $de(r){let e=[],t=[];for(let i of r)i.selectedIndex===-1?t.push(i):e.push(i);return t.length>0&&e.push({...bH,path:xH(...t.map(i=>i.path)),options:t.reduce((i,n)=>i.concat(n.options),[])}),e}function xH(r,e,...t){return e===void 0?Array.from(r):xH(r.filter((i,n)=>i===e[n]),...t)}function Xi(){return{dynamics:[],shortcuts:[],statics:{}}}function PH(r){return r===1||r===2}function cv(r,e=0){return{to:PH(r.to)?r.to:r.to>2?r.to+e-2:r.to+e,reducer:r.reducer}}function eCe(r,e=0){let t=Xi();for(let[i,n]of r.dynamics)t.dynamics.push([i,cv(n,e)]);for(let i of r.shortcuts)t.shortcuts.push(cv(i,e));for(let[i,n]of Object.entries(r.statics))t.statics[i]=n.map(s=>cv(s,e));return t}function Bi(r,e,t,i,n){r.nodes[e].dynamics.push([t,{to:i,reducer:n}])}function Kg(r,e,t,i){r.nodes[e].shortcuts.push({to:t,reducer:i})}function Ba(r,e,t,i,n){(Object.prototype.hasOwnProperty.call(r.nodes[e].statics,t)?r.nodes[e].statics[t]:r.nodes[e].statics[t]=[]).push({to:i,reducer:n})}function xI(r,e,t,i){if(Array.isArray(e)){let[n,...s]=e;return r[n](t,i,...s)}else return r[e](t,i)}function tCe(r,e){let t=Array.isArray(r)?DI[r[0]]:DI[r];if(typeof t.suggest>"u")return null;let i=Array.isArray(r)?r.slice(1):[];return t.suggest(e,...i)}var DI={always:()=>!0,isOptionLike:(r,e)=>!r.ignoreOptions&&e!=="-"&&e.startsWith("-"),isNotOptionLike:(r,e)=>r.ignoreOptions||e==="-"||!e.startsWith("-"),isOption:(r,e,t,i)=>!r.ignoreOptions&&e===t,isBatchOption:(r,e,t)=>!r.ignoreOptions&&hH.test(e)&&[...e.slice(1)].every(i=>t.includes(`-${i}`)),isBoundOption:(r,e,t,i)=>{let n=e.match(iv);return!r.ignoreOptions&&!!n&&QI.test(n[1])&&t.includes(n[1])&&i.filter(s=>s.names.includes(n[1])).every(s=>s.allowBinding)},isNegatedOption:(r,e,t)=>!r.ignoreOptions&&e===`--no-${t.slice(2)}`,isHelp:(r,e)=>!r.ignoreOptions&&rv.test(e),isUnsupportedOption:(r,e,t)=>!r.ignoreOptions&&e.startsWith("-")&&QI.test(e)&&!t.includes(e),isInvalidOption:(r,e)=>!r.ignoreOptions&&e.startsWith("-")&&!QI.test(e)};DI.isOption.suggest=(r,e,t=!0)=>t?null:[e];var uv={setCandidateState:(r,e,t)=>({...r,...t}),setSelectedIndex:(r,e,t)=>({...r,selectedIndex:t}),pushBatch:(r,e)=>({...r,options:r.options.concat([...e.slice(1)].map(t=>({name:`-${t}`,value:!0})))}),pushBound:(r,e)=>{let[,t,i]=e.match(iv);return{...r,options:r.options.concat({name:t,value:i})}},pushPath:(r,e)=>({...r,path:r.path.concat(e)}),pushPositional:(r,e)=>({...r,positionals:r.positionals.concat({value:e,extra:!1})}),pushExtra:(r,e)=>({...r,positionals:r.positionals.concat({value:e,extra:!0})}),pushExtraNoLimits:(r,e)=>({...r,positionals:r.positionals.concat({value:e,extra:Kn})}),pushTrue:(r,e,t=e)=>({...r,options:r.options.concat({name:e,value:!0})}),pushFalse:(r,e,t=e)=>({...r,options:r.options.concat({name:t,value:!1})}),pushUndefined:(r,e)=>({...r,options:r.options.concat({name:e,value:void 0})}),pushStringValue:(r,e)=>{var t;let i={...r,options:[...r.options]},n=r.options[r.options.length-1];return n.value=((t=n.value)!==null&&t!==void 0?t:[]).concat([e]),i},setStringValue:(r,e)=>{let t={...r,options:[...r.options]},i=r.options[r.options.length-1];return i.value=e,t},inhibateOptions:r=>({...r,ignoreOptions:!0}),useHelp:(r,e,t)=>{let[,,i]=e.match(rv);return typeof i<"u"?{...r,options:[{name:"-c",value:String(t)},{name:"-i",value:i}]}:{...r,options:[{name:"-c",value:String(t)}]}},setError:(r,e,t)=>e===wi?{...r,errorMessage:`${t}.`}:{...r,errorMessage:`${t} ("${e}").`},setOptionArityError:(r,e)=>{let t=r.options[r.options.length-1];return{...r,errorMessage:`Not enough arguments to option ${t.name}.`}}},Kn=Symbol(),gv=class{constructor(e,t){this.allOptionNames=[],this.arity={leading:[],trailing:[],extra:[],proxy:!1},this.options=[],this.paths=[],this.cliIndex=e,this.cliOpts=t}addPath(e){this.paths.push(e)}setArity({leading:e=this.arity.leading,trailing:t=this.arity.trailing,extra:i=this.arity.extra,proxy:n=this.arity.proxy}){Object.assign(this.arity,{leading:e,trailing:t,extra:i,proxy:n})}addPositional({name:e="arg",required:t=!0}={}){if(!t&&this.arity.extra===Kn)throw new Error("Optional parameters cannot be declared when using .rest() or .proxy()");if(!t&&this.arity.trailing.length>0)throw new Error("Optional parameters cannot be declared after the required trailing positional arguments");!t&&this.arity.extra!==Kn?this.arity.extra.push(e):this.arity.extra!==Kn&&this.arity.extra.length===0?this.arity.leading.push(e):this.arity.trailing.push(e)}addRest({name:e="arg",required:t=0}={}){if(this.arity.extra===Kn)throw new Error("Infinite lists cannot be declared multiple times in the same command");if(this.arity.trailing.length>0)throw new Error("Infinite lists cannot be declared after the required trailing positional arguments");for(let i=0;i<t;++i)this.addPositional({name:e});this.arity.extra=Kn}addProxy({required:e=0}={}){this.addRest({required:e}),this.arity.proxy=!0}addOption({names:e,description:t,arity:i=0,hidden:n=!1,required:s=!1,allowBinding:o=!0}){if(!o&&i>1)throw new Error("The arity cannot be higher than 1 when the option only supports the --arg=value syntax");if(!Number.isInteger(i))throw new Error(`The arity must be an integer, got ${i}`);if(i<0)throw new Error(`The arity must be positive, got ${i}`);this.allOptionNames.push(...e),this.options.push({names:e,description:t,arity:i,hidden:n,required:s,allowBinding:o})}setContext(e){this.context=e}usage({detailed:e=!0,inlineOptions:t=!0}={}){let i=[this.cliOpts.binaryName],n=[];if(this.paths.length>0&&i.push(...this.paths[0]),e){for(let{names:o,arity:a,hidden:l,description:c,required:u}of this.options){if(l)continue;let g=[];for(let h=0;h<a;++h)g.push(` #${h}`);let f=`${o.join(",")}${g.join("")}`;!t&&c?n.push({definition:f,description:c,required:u}):i.push(u?`<${f}>`:`[${f}]`)}i.push(...this.arity.leading.map(o=>`<${o}>`)),this.arity.extra===Kn?i.push("..."):i.push(...this.arity.extra.map(o=>`[${o}]`)),i.push(...this.arity.trailing.map(o=>`<${o}>`))}return{usage:i.join(" "),options:n}}compile(){if(typeof this.context>"u")throw new Error("Assertion failed: No context attached");let e=SH(),t=0,i=this.usage().usage,n=this.options.filter(a=>a.required).map(a=>a.names);t=zs(e,Xi()),Ba(e,0,tv,t,["setCandidateState",{candidateUsage:i,requiredOptions:n}]);let s=this.arity.proxy?"always":"isNotOptionLike",o=this.paths.length>0?this.paths:[[]];for(let a of o){let l=t;if(a.length>0){let f=zs(e,Xi());Kg(e,l,f),this.registerOptions(e,f),l=f}for(let f=0;f<a.length;++f){let h=zs(e,Xi());Ba(e,l,a[f],h,"pushPath"),l=h}if(this.arity.leading.length>0||!this.arity.proxy){let f=zs(e,Xi());Bi(e,l,"isHelp",f,["useHelp",this.cliIndex]),Ba(e,f,wi,1,["setSelectedIndex",-1]),this.registerOptions(e,l)}this.arity.leading.length>0&&Ba(e,l,wi,2,["setError","Not enough positional arguments"]);let c=l;for(let f=0;f<this.arity.leading.length;++f){let h=zs(e,Xi());this.arity.proxy||this.registerOptions(e,h),(this.arity.trailing.length>0||f+1!==this.arity.leading.length)&&Ba(e,h,wi,2,["setError","Not enough positional arguments"]),Bi(e,c,"isNotOptionLike",h,"pushPositional"),c=h}let u=c;if(this.arity.extra===Kn||this.arity.extra.length>0){let f=zs(e,Xi());if(Kg(e,c,f),this.arity.extra===Kn){let h=zs(e,Xi());this.arity.proxy||this.registerOptions(e,h),Bi(e,c,s,h,"pushExtraNoLimits"),Bi(e,h,s,h,"pushExtraNoLimits"),Kg(e,h,f)}else for(let h=0;h<this.arity.extra.length;++h){let p=zs(e,Xi());this.arity.proxy||this.registerOptions(e,p),Bi(e,u,s,p,"pushExtra"),Kg(e,p,f),u=p}u=f}this.arity.trailing.length>0&&Ba(e,u,wi,2,["setError","Not enough positional arguments"]);let g=u;for(let f=0;f<this.arity.trailing.length;++f){let h=zs(e,Xi());this.arity.proxy||this.registerOptions(e,h),f+1<this.arity.trailing.length&&Ba(e,h,wi,2,["setError","Not enough positional arguments"]),Bi(e,g,"isNotOptionLike",h,"pushPositional"),g=h}Bi(e,g,s,2,["setError","Extraneous positional argument"]),Ba(e,g,wi,1,["setSelectedIndex",this.cliIndex])}return{machine:e,context:this.context}}registerOptions(e,t){Bi(e,t,["isOption","--"],t,"inhibateOptions"),Bi(e,t,["isBatchOption",this.allOptionNames],t,"pushBatch"),Bi(e,t,["isBoundOption",this.allOptionNames,this.options],t,"pushBound"),Bi(e,t,["isUnsupportedOption",this.allOptionNames],2,["setError","Unsupported option name"]),Bi(e,t,["isInvalidOption"],2,["setError","Invalid option name"]);for(let i of this.options){let n=i.names.reduce((s,o)=>o.length>s.length?o:s,"");if(i.arity===0)for(let s of i.names)Bi(e,t,["isOption",s,i.hidden||s!==n],t,"pushTrue"),s.startsWith("--")&&!s.startsWith("--no-")&&Bi(e,t,["isNegatedOption",s],t,["pushFalse",s]);else{let s=zs(e,Xi());for(let o of i.names)Bi(e,t,["isOption",o,i.hidden||o!==n],s,"pushUndefined");for(let o=0;o<i.arity;++o){let a=zs(e,Xi());Ba(e,s,wi,2,"setOptionArityError"),Bi(e,s,"isOptionLike",2,"setOptionArityError");let l=i.arity===1?"setStringValue":"pushStringValue";Bi(e,s,"isNotOptionLike",a,l),s=a}Kg(e,s,t)}}}},Hg=class{constructor({binaryName:e="..."}={}){this.builders=[],this.opts={binaryName:e}}static build(e,t={}){return new Hg(t).commands(e).compile()}getBuilderByIndex(e){if(!(e>=0&&e<this.builders.length))throw new Error(`Assertion failed: Out-of-bound command index (${e})`);return this.builders[e]}commands(e){for(let t of e)t(this.command());return this}command(){let e=new gv(this.builders.length,this.opts);return this.builders.push(e),e}compile(){let e=[],t=[];for(let n of this.builders){let{machine:s,context:o}=n.compile();e.push(s),t.push(o)}let i=qde(e);return Jde(i),{machine:i,contexts:t,process:n=>Xde(i,n),suggest:(n,s)=>Vde(i,n,s)}}};var Gg=class extends ve{constructor(e){super(),this.contexts=e,this.commands=[]}static from(e,t){let i=new Gg(t);i.path=e.path;for(let n of e.options)switch(n.name){case"-c":i.commands.push(Number(n.value));break;case"-i":i.index=Number(n.value);break}return i}async execute(){let e=this.commands;if(typeof this.index<"u"&&this.index>=0&&this.index<e.length&&(e=[e[this.index]]),e.length===0)this.context.stdout.write(this.cli.usage());else if(e.length===1)this.context.stdout.write(this.cli.usage(this.contexts[e[0]].commandClass,{detailed:!0}));else if(e.length>1){this.context.stdout.write(`Multiple commands match your selection:
-`),this.context.stdout.write(`
-`);let t=0;for(let i of this.commands)this.context.stdout.write(this.cli.usage(this.contexts[i].commandClass,{prefix:`${t++}. `.padStart(5)}));this.context.stdout.write(`
-`),this.context.stdout.write(`Run again with -h=<index> to see the longer details of any of those commands.
-`)}}};var DH=Symbol("clipanion/errorCommand");function rCe(){return process.env.FORCE_COLOR==="0"?1:process.env.FORCE_COLOR==="1"||typeof process.stdout<"u"&&process.stdout.isTTY?8:1}var Un=class{constructor({binaryLabel:e,binaryName:t="...",binaryVersion:i,enableCapture:n=!1,enableColors:s}={}){this.registrations=new Map,this.builder=new Hg({binaryName:t}),this.binaryLabel=e,this.binaryName=t,this.binaryVersion=i,this.enableCapture=n,this.enableColors=s}static from(e,t={}){let i=new Un(t);for(let n of e)i.register(n);return i}register(e){var t;let i=new Map,n=new e;for(let l in n){let c=n[l];typeof c=="object"&&c!==null&&c[ve.isOption]&&i.set(l,c)}let s=this.builder.command(),o=s.cliIndex,a=(t=e.paths)!==null&&t!==void 0?t:n.paths;if(typeof a<"u")for(let l of a)s.addPath(l);this.registrations.set(e,{specs:i,builder:s,index:o});for(let[l,{definition:c}]of i.entries())c(s,l);s.setContext({commandClass:e})}process(e){let{contexts:t,process:i}=this.builder.compile(),n=i(e);switch(n.selectedIndex){case-1:return Gg.from(n,t);default:{let{commandClass:s}=t[n.selectedIndex],o=this.registrations.get(s);if(typeof o>"u")throw new Error("Assertion failed: Expected the command class to have been registered.");let a=new s;a.path=n.path;try{for(let[l,{transformer:c}]of o.specs.entries())a[l]=c(o.builder,l,n);return a}catch(l){throw l[DH]=a,l}}break}}async run(e,t){var i;let n,s={...Un.defaultContext,...t},o=(i=this.enableColors)!==null&&i!==void 0?i:s.colorDepth>1;if(!Array.isArray(e))n=e;else try{n=this.process(e)}catch(c){return s.stdout.write(this.error(c,{colored:o})),1}if(n.help)return s.stdout.write(this.usage(n,{colored:o,detailed:!0})),0;n.context=s,n.cli={binaryLabel:this.binaryLabel,binaryName:this.binaryName,binaryVersion:this.binaryVersion,enableCapture:this.enableCapture,enableColors:this.enableColors,definitions:()=>this.definitions(),error:(c,u)=>this.error(c,u),format:c=>this.format(c),process:c=>this.process(c),run:(c,u)=>this.run(c,{...s,...u}),usage:(c,u)=>this.usage(c,u)};let a=this.enableCapture?iCe(s):RH,l;try{l=await a(()=>n.validateAndExecute().catch(c=>n.catch(c).then(()=>0)))}catch(c){return s.stdout.write(this.error(c,{colored:o,command:n})),1}return l}async runExit(e,t){process.exitCode=await this.run(e,t)}suggest(e,t){let{suggest:i}=this.builder.compile();return i(e,t)}definitions({colored:e=!1}={}){let t=[];for(let[i,{index:n}]of this.registrations){if(typeof i.usage>"u")continue;let{usage:s}=this.getUsageByIndex(n,{detailed:!1}),{usage:o,options:a}=this.getUsageByIndex(n,{detailed:!0,inlineOptions:!1}),l=typeof i.usage.category<"u"?Li(i.usage.category,{format:this.format(e),paragraphs:!1}):void 0,c=typeof i.usage.description<"u"?Li(i.usage.description,{format:this.format(e),paragraphs:!1}):void 0,u=typeof i.usage.details<"u"?Li(i.usage.details,{format:this.format(e),paragraphs:!0}):void 0,g=typeof i.usage.examples<"u"?i.usage.examples.map(([f,h])=>[Li(f,{format:this.format(e),paragraphs:!1}),h.replace(/\$0/g,this.binaryName)]):void 0;t.push({path:s,usage:o,category:l,description:c,details:u,examples:g,options:a})}return t}usage(e=null,{colored:t,detailed:i=!1,prefix:n="$ "}={}){var s;if(e===null){for(let l of this.registrations.keys()){let c=l.paths,u=typeof l.usage<"u";if(!c||c.length===0||c.length===1&&c[0].length===0||((s=c==null?void 0:c.some(h=>h.length===0))!==null&&s!==void 0?s:!1))if(e){e=null;break}else e=l;else if(u){e=null;continue}}e&&(i=!0)}let o=e!==null&&e instanceof ve?e.constructor:e,a="";if(o)if(i){let{description:l="",details:c="",examples:u=[]}=o.usage||{};l!==""&&(a+=Li(l,{format:this.format(t),paragraphs:!1}).replace(/^./,h=>h.toUpperCase()),a+=`
-`),(c!==""||u.length>0)&&(a+=`${this.format(t).header("Usage")}
-`,a+=`
-`);let{usage:g,options:f}=this.getUsageByRegistration(o,{inlineOptions:!1});if(a+=`${this.format(t).bold(n)}${g}
-`,f.length>0){a+=`
-`,a+=`${lv.header("Options")}
-`;let h=f.reduce((p,C)=>Math.max(p,C.definition.length),0);a+=`
-`;for(let{definition:p,description:C}of f)a+=`  ${this.format(t).bold(p.padEnd(h))}    ${Li(C,{format:this.format(t),paragraphs:!1})}`}if(c!==""&&(a+=`
-`,a+=`${this.format(t).header("Details")}
-`,a+=`
-`,a+=Li(c,{format:this.format(t),paragraphs:!0})),u.length>0){a+=`
-`,a+=`${this.format(t).header("Examples")}
-`;for(let[h,p]of u)a+=`
-`,a+=Li(h,{format:this.format(t),paragraphs:!1}),a+=`${p.replace(/^/m,`  ${this.format(t).bold(n)}`).replace(/\$0/g,this.binaryName)}
-`}}else{let{usage:l}=this.getUsageByRegistration(o);a+=`${this.format(t).bold(n)}${l}
-`}else{let l=new Map;for(let[f,{index:h}]of this.registrations.entries()){if(typeof f.usage>"u")continue;let p=typeof f.usage.category<"u"?Li(f.usage.category,{format:this.format(t),paragraphs:!1}):null,C=l.get(p);typeof C>"u"&&l.set(p,C=[]);let{usage:y}=this.getUsageByIndex(h);C.push({commandClass:f,usage:y})}let c=Array.from(l.keys()).sort((f,h)=>f===null?-1:h===null?1:f.localeCompare(h,"en",{usage:"sort",caseFirst:"upper"})),u=typeof this.binaryLabel<"u",g=typeof this.binaryVersion<"u";u||g?(u&&g?a+=`${this.format(t).header(`${this.binaryLabel} - ${this.binaryVersion}`)}
-
-`:u?a+=`${this.format(t).header(`${this.binaryLabel}`)}
-`:a+=`${this.format(t).header(`${this.binaryVersion}`)}
-`,a+=`  ${this.format(t).bold(n)}${this.binaryName} <command>
-`):a+=`${this.format(t).bold(n)}${this.binaryName} <command>
-`;for(let f of c){let h=l.get(f).slice().sort((C,y)=>C.usage.localeCompare(y.usage,"en",{usage:"sort",caseFirst:"upper"})),p=f!==null?f.trim():"General commands";a+=`
-`,a+=`${this.format(t).header(`${p}`)}
-`;for(let{commandClass:C,usage:y}of h){let B=C.usage.description||"undocumented";a+=`
-`,a+=`  ${this.format(t).bold(y)}
-`,a+=`    ${Li(B,{format:this.format(t),paragraphs:!1})}`}}a+=`
-`,a+=Li("You can also print more details about any of these commands by calling them with the `-h,--help` flag right after the command name.",{format:this.format(t),paragraphs:!0})}return a}error(e,t){var i,{colored:n,command:s=(i=e[DH])!==null&&i!==void 0?i:null}=t===void 0?{}:t;e instanceof Error||(e=new Error(`Execution failed with a non-error rejection (rejected value: ${JSON.stringify(e)})`));let o="",a=e.name.replace(/([a-z])([A-Z])/g,"$1 $2");a==="Error"&&(a="Internal Error"),o+=`${this.format(n).error(a)}: ${e.message}
-`;let l=e.clipanion;return typeof l<"u"?l.type==="usage"&&(o+=`
-`,o+=this.usage(s)):e.stack&&(o+=`${e.stack.replace(/^.*\n/,"")}
-`),o}format(e){var t;return((t=e!=null?e:this.enableColors)!==null&&t!==void 0?t:Un.defaultContext.colorDepth>1)?lv:QH}getUsageByRegistration(e,t){let i=this.registrations.get(e);if(typeof i>"u")throw new Error("Assertion failed: Unregistered command");return this.getUsageByIndex(i.index,t)}getUsageByIndex(e,t){return this.builder.getBuilderByIndex(e).usage(t)}};Un.defaultContext={stdin:process.stdin,stdout:process.stdout,stderr:process.stderr,colorDepth:"getColorDepth"in fv.default.WriteStream.prototype?fv.default.WriteStream.prototype.getColorDepth():rCe()};var kH;function iCe(r){let e=kH;if(typeof e>"u"){if(r.stdout===process.stdout&&r.stderr===process.stderr)return RH;let{AsyncLocalStorage:t}=J("async_hooks");e=kH=new t;let i=process.stdout._write;process.stdout._write=function(s,o,a){let l=e.getStore();return typeof l>"u"?i.call(this,s,o,a):l.stdout.write(s,o,a)};let n=process.stderr._write;process.stderr._write=function(s,o,a){let l=e.getStore();return typeof l>"u"?n.call(this,s,o,a):l.stderr.write(s,o,a)}}return t=>e.run(r,t)}function RH(r){return r()}var hv={};ut(hv,{DefinitionsCommand:()=>od,HelpCommand:()=>ad,VersionCommand:()=>Ad});var od=class extends ve{async execute(){this.context.stdout.write(`${JSON.stringify(this.cli.definitions(),null,2)}
-`)}};od.paths=[["--clipanion=definitions"]];var ad=class extends ve{async execute(){this.context.stdout.write(this.cli.usage())}};ad.paths=[["-h"],["--help"]];var Ad=class extends ve{async execute(){var e;this.context.stdout.write(`${(e=this.cli.binaryVersion)!==null&&e!==void 0?e:"<unknown>"}
-`)}};Ad.paths=[["-v"],["--version"]];var z={};ut(z,{Array:()=>FH,Boolean:()=>NH,Counter:()=>LH,Proxy:()=>TH,Rest:()=>OH,String:()=>MH,applyValidator:()=>rd,cleanValidationError:()=>SI,formatError:()=>td,isOptionSymbol:()=>ed,makeCommandOption:()=>zi,rerouteArguments:()=>Po});function FH(r,e,t){let[i,n]=Po(e,t!=null?t:{}),{arity:s=1}=n,o=r.split(","),a=new Set(o);return zi({definition(l){l.addOption({names:o,arity:s,hidden:n==null?void 0:n.hidden,description:n==null?void 0:n.description,required:n.required})},transformer(l,c,u){let g=typeof i<"u"?[...i]:void 0;for(let{name:f,value:h}of u.options)!a.has(f)||(g=g!=null?g:[],g.push(h));return g}})}function NH(r,e,t){let[i,n]=Po(e,t!=null?t:{}),s=r.split(","),o=new Set(s);return zi({definition(a){a.addOption({names:s,allowBinding:!1,arity:0,hidden:n.hidden,description:n.description,required:n.required})},transformer(a,l,c){let u=i;for(let{name:g,value:f}of c.options)!o.has(g)||(u=f);return u}})}function LH(r,e,t){let[i,n]=Po(e,t!=null?t:{}),s=r.split(","),o=new Set(s);return zi({definition(a){a.addOption({names:s,allowBinding:!1,arity:0,hidden:n.hidden,description:n.description,required:n.required})},transformer(a,l,c){let u=i;for(let{name:g,value:f}of c.options)!o.has(g)||(u!=null||(u=0),f?u+=1:u=0);return u}})}function TH(r={}){return zi({definition(e,t){var i;e.addProxy({name:(i=r.name)!==null&&i!==void 0?i:t,required:r.required})},transformer(e,t,i){return i.positionals.map(({value:n})=>n)}})}function OH(r={}){return zi({definition(e,t){var i;e.addRest({name:(i=r.name)!==null&&i!==void 0?i:t,required:r.required})},transformer(e,t,i){let n=o=>{let a=i.positionals[o];return a.extra===Kn||a.extra===!1&&o<e.arity.leading.length},s=0;for(;s<i.positionals.length&&n(s);)s+=1;return i.positionals.splice(0,s).map(({value:o})=>o)}})}function nCe(r,e,t){let[i,n]=Po(e,t!=null?t:{}),{arity:s=1}=n,o=r.split(","),a=new Set(o);return zi({definition(l){l.addOption({names:o,arity:n.tolerateBoolean?0:s,hidden:n.hidden,description:n.description,required:n.required})},transformer(l,c,u){let g,f=i;for(let{name:h,value:p}of u.options)!a.has(h)||(g=h,f=p);return typeof f=="string"?rd(g!=null?g:c,f,n.validator):f}})}function sCe(r={}){let{required:e=!0}=r;return zi({definition(t,i){var n;t.addPositional({name:(n=r.name)!==null&&n!==void 0?n:i,required:r.required})},transformer(t,i,n){var s;for(let o=0;o<n.positionals.length;++o){if(n.positionals[o].extra===Kn||e&&n.positionals[o].extra===!0||!e&&n.positionals[o].extra===!1)continue;let[a]=n.positionals.splice(o,1);return rd((s=r.name)!==null&&s!==void 0?s:i,a.value,r.validator)}}})}function MH(r,...e){return typeof r=="string"?nCe(r,...e):sCe(r)}var hz=Pe(Yg()),nk=J("stream");var Ct=(se=>(se[se.UNNAMED=0]="UNNAMED",se[se.EXCEPTION=1]="EXCEPTION",se[se.MISSING_PEER_DEPENDENCY=2]="MISSING_PEER_DEPENDENCY",se[se.CYCLIC_DEPENDENCIES=3]="CYCLIC_DEPENDENCIES",se[se.DISABLED_BUILD_SCRIPTS=4]="DISABLED_BUILD_SCRIPTS",se[se.BUILD_DISABLED=5]="BUILD_DISABLED",se[se.SOFT_LINK_BUILD=6]="SOFT_LINK_BUILD",se[se.MUST_BUILD=7]="MUST_BUILD",se[se.MUST_REBUILD=8]="MUST_REBUILD",se[se.BUILD_FAILED=9]="BUILD_FAILED",se[se.RESOLVER_NOT_FOUND=10]="RESOLVER_NOT_FOUND",se[se.FETCHER_NOT_FOUND=11]="FETCHER_NOT_FOUND",se[se.LINKER_NOT_FOUND=12]="LINKER_NOT_FOUND",se[se.FETCH_NOT_CACHED=13]="FETCH_NOT_CACHED",se[se.YARN_IMPORT_FAILED=14]="YARN_IMPORT_FAILED",se[se.REMOTE_INVALID=15]="REMOTE_INVALID",se[se.REMOTE_NOT_FOUND=16]="REMOTE_NOT_FOUND",se[se.RESOLUTION_PACK=17]="RESOLUTION_PACK",se[se.CACHE_CHECKSUM_MISMATCH=18]="CACHE_CHECKSUM_MISMATCH",se[se.UNUSED_CACHE_ENTRY=19]="UNUSED_CACHE_ENTRY",se[se.MISSING_LOCKFILE_ENTRY=20]="MISSING_LOCKFILE_ENTRY",se[se.WORKSPACE_NOT_FOUND=21]="WORKSPACE_NOT_FOUND",se[se.TOO_MANY_MATCHING_WORKSPACES=22]="TOO_MANY_MATCHING_WORKSPACES",se[se.CONSTRAINTS_MISSING_DEPENDENCY=23]="CONSTRAINTS_MISSING_DEPENDENCY",se[se.CONSTRAINTS_INCOMPATIBLE_DEPENDENCY=24]="CONSTRAINTS_INCOMPATIBLE_DEPENDENCY",se[se.CONSTRAINTS_EXTRANEOUS_DEPENDENCY=25]="CONSTRAINTS_EXTRANEOUS_DEPENDENCY",se[se.CONSTRAINTS_INVALID_DEPENDENCY=26]="CONSTRAINTS_INVALID_DEPENDENCY",se[se.CANT_SUGGEST_RESOLUTIONS=27]="CANT_SUGGEST_RESOLUTIONS",se[se.FROZEN_LOCKFILE_EXCEPTION=28]="FROZEN_LOCKFILE_EXCEPTION",se[se.CROSS_DRIVE_VIRTUAL_LOCAL=29]="CROSS_DRIVE_VIRTUAL_LOCAL",se[se.FETCH_FAILED=30]="FETCH_FAILED",se[se.DANGEROUS_NODE_MODULES=31]="DANGEROUS_NODE_MODULES",se[se.NODE_GYP_INJECTED=32]="NODE_GYP_INJECTED",se[se.AUTHENTICATION_NOT_FOUND=33]="AUTHENTICATION_NOT_FOUND",se[se.INVALID_CONFIGURATION_KEY=34]="INVALID_CONFIGURATION_KEY",se[se.NETWORK_ERROR=35]="NETWORK_ERROR",se[se.LIFECYCLE_SCRIPT=36]="LIFECYCLE_SCRIPT",se[se.CONSTRAINTS_MISSING_FIELD=37]="CONSTRAINTS_MISSING_FIELD",se[se.CONSTRAINTS_INCOMPATIBLE_FIELD=38]="CONSTRAINTS_INCOMPATIBLE_FIELD",se[se.CONSTRAINTS_EXTRANEOUS_FIELD=39]="CONSTRAINTS_EXTRANEOUS_FIELD",se[se.CONSTRAINTS_INVALID_FIELD=40]="CONSTRAINTS_INVALID_FIELD",se[se.AUTHENTICATION_INVALID=41]="AUTHENTICATION_INVALID",se[se.PROLOG_UNKNOWN_ERROR=42]="PROLOG_UNKNOWN_ERROR",se[se.PROLOG_SYNTAX_ERROR=43]="PROLOG_SYNTAX_ERROR",se[se.PROLOG_EXISTENCE_ERROR=44]="PROLOG_EXISTENCE_ERROR",se[se.STACK_OVERFLOW_RESOLUTION=45]="STACK_OVERFLOW_RESOLUTION",se[se.AUTOMERGE_FAILED_TO_PARSE=46]="AUTOMERGE_FAILED_TO_PARSE",se[se.AUTOMERGE_IMMUTABLE=47]="AUTOMERGE_IMMUTABLE",se[se.AUTOMERGE_SUCCESS=48]="AUTOMERGE_SUCCESS",se[se.AUTOMERGE_REQUIRED=49]="AUTOMERGE_REQUIRED",se[se.DEPRECATED_CLI_SETTINGS=50]="DEPRECATED_CLI_SETTINGS",se[se.PLUGIN_NAME_NOT_FOUND=51]="PLUGIN_NAME_NOT_FOUND",se[se.INVALID_PLUGIN_REFERENCE=52]="INVALID_PLUGIN_REFERENCE",se[se.CONSTRAINTS_AMBIGUITY=53]="CONSTRAINTS_AMBIGUITY",se[se.CACHE_OUTSIDE_PROJECT=54]="CACHE_OUTSIDE_PROJECT",se[se.IMMUTABLE_INSTALL=55]="IMMUTABLE_INSTALL",se[se.IMMUTABLE_CACHE=56]="IMMUTABLE_CACHE",se[se.INVALID_MANIFEST=57]="INVALID_MANIFEST",se[se.PACKAGE_PREPARATION_FAILED=58]="PACKAGE_PREPARATION_FAILED",se[se.INVALID_RANGE_PEER_DEPENDENCY=59]="INVALID_RANGE_PEER_DEPENDENCY",se[se.INCOMPATIBLE_PEER_DEPENDENCY=60]="INCOMPATIBLE_PEER_DEPENDENCY",se[se.DEPRECATED_PACKAGE=61]="DEPRECATED_PACKAGE",se[se.INCOMPATIBLE_OS=62]="INCOMPATIBLE_OS",se[se.INCOMPATIBLE_CPU=63]="INCOMPATIBLE_CPU",se[se.FROZEN_ARTIFACT_EXCEPTION=64]="FROZEN_ARTIFACT_EXCEPTION",se[se.TELEMETRY_NOTICE=65]="TELEMETRY_NOTICE",se[se.PATCH_HUNK_FAILED=66]="PATCH_HUNK_FAILED",se[se.INVALID_CONFIGURATION_VALUE=67]="INVALID_CONFIGURATION_VALUE",se[se.UNUSED_PACKAGE_EXTENSION=68]="UNUSED_PACKAGE_EXTENSION",se[se.REDUNDANT_PACKAGE_EXTENSION=69]="REDUNDANT_PACKAGE_EXTENSION",se[se.AUTO_NM_SUCCESS=70]="AUTO_NM_SUCCESS",se[se.NM_CANT_INSTALL_EXTERNAL_SOFT_LINK=71]="NM_CANT_INSTALL_EXTERNAL_SOFT_LINK",se[se.NM_PRESERVE_SYMLINKS_REQUIRED=72]="NM_PRESERVE_SYMLINKS_REQUIRED",se[se.UPDATE_LOCKFILE_ONLY_SKIP_LINK=73]="UPDATE_LOCKFILE_ONLY_SKIP_LINK",se[se.NM_HARDLINKS_MODE_DOWNGRADED=74]="NM_HARDLINKS_MODE_DOWNGRADED",se[se.PROLOG_INSTANTIATION_ERROR=75]="PROLOG_INSTANTIATION_ERROR",se[se.INCOMPATIBLE_ARCHITECTURE=76]="INCOMPATIBLE_ARCHITECTURE",se[se.GHOST_ARCHITECTURE=77]="GHOST_ARCHITECTURE",se[se.PROLOG_LIMIT_EXCEEDED=79]="PROLOG_LIMIT_EXCEEDED",se))(Ct||{});function RA(r){return`YN${r.toString(10).padStart(4,"0")}`}function RI(r){let e=Number(r.slice(2));if(typeof Ct[e]>"u")throw new Error(`Unknown message name: "${r}"`);return e}var P={};ut(P,{areDescriptorsEqual:()=>y8,areIdentsEqual:()=>iC,areLocatorsEqual:()=>nC,areVirtualPackagesEquivalent:()=>DSe,bindDescriptor:()=>xSe,bindLocator:()=>PSe,convertDescriptorToLocator:()=>ww,convertLocatorToDescriptor:()=>HD,convertPackageToLocator:()=>vSe,convertToIdent:()=>SSe,convertToManifestRange:()=>FSe,copyPackage:()=>eC,devirtualizeDescriptor:()=>tC,devirtualizeLocator:()=>rC,getIdentVendorPath:()=>qD,isPackageCompatible:()=>vw,isVirtualDescriptor:()=>qA,isVirtualLocator:()=>jo,makeDescriptor:()=>_t,makeIdent:()=>qo,makeLocator:()=>tn,makeRange:()=>Qw,parseDescriptor:()=>JA,parseFileStyleRange:()=>kSe,parseIdent:()=>$i,parseLocator:()=>Sc,parseRange:()=>Qf,prettyDependent:()=>nP,prettyDescriptor:()=>tr,prettyIdent:()=>Ai,prettyLocator:()=>mt,prettyLocatorNoColors:()=>jD,prettyRange:()=>Sw,prettyReference:()=>oC,prettyResolution:()=>iP,prettyWorkspace:()=>aC,renamePackage:()=>$d,slugifyIdent:()=>UD,slugifyLocator:()=>bf,sortDescriptors:()=>Sf,stringifyDescriptor:()=>Qn,stringifyIdent:()=>Ot,stringifyLocator:()=>Cs,tryParseDescriptor:()=>sC,tryParseIdent:()=>w8,tryParseLocator:()=>Bw,virtualizeDescriptor:()=>GD,virtualizePackage:()=>YD});var Bf=Pe(J("querystring")),m8=Pe(Xr()),E8=Pe(fJ());var ee={};ut(ee,{LogLevel:()=>Jy,Style:()=>_x,Type:()=>Ue,addLogFilterSupport:()=>zd,applyColor:()=>Bn,applyHyperlink:()=>Cf,applyStyle:()=>qy,json:()=>Ec,jsonOrPretty:()=>A0e,mark:()=>rP,pretty:()=>$e,prettyField:()=>Ho,prettyList:()=>tP,supportsColor:()=>jy,supportsHyperlinks:()=>eP,tuple:()=>ro});var Wd=Pe(wx()),Jd=Pe(nc());var c4=Pe(yn()),u4=Pe($W());var Ie={};ut(Ie,{AsyncActions:()=>Gx,BufferStream:()=>Hx,CachingStrategy:()=>A4,DefaultStream:()=>Yx,allSettledSafe:()=>to,assertNever:()=>qx,bufferStream:()=>hf,buildIgnorePattern:()=>n0e,convertMapsToIndexableObjects:()=>Gy,dynamicRequire:()=>pf,escapeRegExp:()=>_Be,getArrayWithDefault:()=>uf,getFactoryWithDefault:()=>Fa,getMapWithDefault:()=>gf,getSetWithDefault:()=>mc,isIndexableObject:()=>Ux,isPathLike:()=>s0e,isTaggedYarnVersion:()=>ZBe,mapAndFilter:()=>Uo,mapAndFind:()=>jd,overrideType:()=>$Be,parseBoolean:()=>qd,parseOptionalBoolean:()=>l4,prettifyAsyncErrors:()=>ff,prettifySyncErrors:()=>Jx,releaseAfterUseAsync:()=>t0e,replaceEnvVariables:()=>Wx,sortMap:()=>wn,tryParseOptionalBoolean:()=>zx,validateEnum:()=>e0e});var t4=Pe(yn()),r4=Pe(Yg()),i4=Pe(Xr()),jx=J("stream");function ZBe(r){return!!(i4.default.valid(r)&&r.match(/^[^-]+(-rc\.[0-9]+)?$/))}function _Be(r){return r.replace(/[.*+?^${}()|[\]\\]/g,"\\$&")}function $Be(r){}function qx(r){throw new Error(`Assertion failed: Unexpected object '${r}'`)}function e0e(r,e){let t=Object.values(r);if(!t.includes(e))throw new be(`Invalid value for enumeration: ${JSON.stringify(e)} (expected one of ${t.map(i=>JSON.stringify(i)).join(", ")})`);return e}function Uo(r,e){let t=[];for(let i of r){let n=e(i);n!==n4&&t.push(n)}return t}var n4=Symbol();Uo.skip=n4;function jd(r,e){for(let t of r){let i=e(t);if(i!==s4)return i}}var s4=Symbol();jd.skip=s4;function Ux(r){return typeof r=="object"&&r!==null}async function to(r){let e=await Promise.allSettled(r),t=[];for(let i of e){if(i.status==="rejected")throw i.reason;t.push(i.value)}return t}function Gy(r){if(r instanceof Map&&(r=Object.fromEntries(r)),Ux(r))for(let e of Object.keys(r)){let t=r[e];Ux(t)&&(r[e]=Gy(t))}return r}function Fa(r,e,t){let i=r.get(e);return typeof i>"u"&&r.set(e,i=t()),i}function uf(r,e){let t=r.get(e);return typeof t>"u"&&r.set(e,t=[]),t}function mc(r,e){let t=r.get(e);return typeof t>"u"&&r.set(e,t=new Set),t}function gf(r,e){let t=r.get(e);return typeof t>"u"&&r.set(e,t=new Map),t}async function t0e(r,e){if(e==null)return await r();try{return await r()}finally{await e()}}async function ff(r,e){try{return await r()}catch(t){throw t.message=e(t.message),t}}function Jx(r,e){try{return r()}catch(t){throw t.message=e(t.message),t}}async function hf(r){return await new Promise((e,t)=>{let i=[];r.on("error",n=>{t(n)}),r.on("data",n=>{i.push(n)}),r.on("end",()=>{e(Buffer.concat(i))})})}var Hx=class extends jx.Transform{constructor(){super(...arguments);this.chunks=[]}_transform(t,i,n){if(i!=="buffer"||!Buffer.isBuffer(t))throw new Error("Assertion failed: BufferStream only accept buffers");this.chunks.push(t),n(null,null)}_flush(t){t(null,Buffer.concat(this.chunks))}};function r0e(){let r,e;return{promise:new Promise((i,n)=>{r=i,e=n}),resolve:r,reject:e}}var Gx=class{constructor(e){this.deferred=new Map;this.promises=new Map;this.limit=(0,r4.default)(e)}set(e,t){let i=this.deferred.get(e);typeof i>"u"&&this.deferred.set(e,i=r0e());let n=this.limit(()=>t());return this.promises.set(e,n),n.then(()=>{this.promises.get(e)===n&&i.resolve()},s=>{this.promises.get(e)===n&&i.reject(s)}),i.promise}reduce(e,t){var n;let i=(n=this.promises.get(e))!=null?n:Promise.resolve();this.set(e,()=>t(i))}async wait(){await Promise.all(this.promises.values())}},Yx=class extends jx.Transform{constructor(t=Buffer.alloc(0)){super();this.active=!0;this.ifEmpty=t}_transform(t,i,n){if(i!=="buffer"||!Buffer.isBuffer(t))throw new Error("Assertion failed: DefaultStream only accept buffers");this.active=!1,n(null,t)}_flush(t){this.active&&this.ifEmpty.length>0?t(null,this.ifEmpty):t(null)}},Yd=eval("require");function o4(r){return Yd(K.fromPortablePath(r))}function a4(path){let physicalPath=K.fromPortablePath(path),currentCacheEntry=Yd.cache[physicalPath];delete Yd.cache[physicalPath];let result;try{result=o4(physicalPath);let freshCacheEntry=Yd.cache[physicalPath],dynamicModule=eval("module"),freshCacheIndex=dynamicModule.children.indexOf(freshCacheEntry);freshCacheIndex!==-1&&dynamicModule.children.splice(freshCacheIndex,1)}finally{Yd.cache[physicalPath]=currentCacheEntry}return result}var e4=new Map;function i0e(r){let e=e4.get(r),t=M.statSync(r);if((e==null?void 0:e.mtime)===t.mtimeMs)return e.instance;let i=a4(r);return e4.set(r,{mtime:t.mtimeMs,instance:i}),i}var A4=(i=>(i[i.NoCache=0]="NoCache",i[i.FsTime=1]="FsTime",i[i.Node=2]="Node",i))(A4||{});function pf(r,{cachingStrategy:e=2}={}){switch(e){case 0:return a4(r);case 1:return i0e(r);case 2:return o4(r);default:throw new Error("Unsupported caching strategy")}}function wn(r,e){let t=Array.from(r);Array.isArray(e)||(e=[e]);let i=[];for(let s of e)i.push(t.map(o=>s(o)));let n=t.map((s,o)=>o);return n.sort((s,o)=>{for(let a of i){let l=a[s]<a[o]?-1:a[s]>a[o]?1:0;if(l!==0)return l}return 0}),n.map(s=>t[s])}function n0e(r){return r.length===0?null:r.map(e=>`(${t4.default.makeRe(e,{windows:!1,dot:!0}).source})`).join("|")}function Wx(r,{env:e}){let t=/\${(?<variableName>[\d\w_]+)(?<colon>:)?(?:-(?<fallback>[^}]*))?}/g;return r.replace(t,(...i)=>{let{variableName:n,colon:s,fallback:o}=i[i.length-1],a=Object.prototype.hasOwnProperty.call(e,n),l=e[n];if(l||a&&!s)return l;if(o!=null)return o;throw new be(`Environment variable not found (${n})`)})}function qd(r){switch(r){case"true":case"1":case 1:case!0:return!0;case"false":case"0":case 0:case!1:return!1;default:throw new Error(`Couldn't parse "${r}" as a boolean`)}}function l4(r){return typeof r>"u"?r:qd(r)}function zx(r){try{return l4(r)}catch{return null}}function s0e(r){return!!(K.isAbsolute(r)||r.match(/^(\.{1,2}|~)\//))}var df=(t=>(t.HARD="HARD",t.SOFT="SOFT",t))(df||{}),Vx=(i=>(i.Dependency="Dependency",i.PeerDependency="PeerDependency",i.PeerDependencyMeta="PeerDependencyMeta",i))(Vx||{}),Xx=(i=>(i.Inactive="inactive",i.Redundant="redundant",i.Active="active",i))(Xx||{});var Ue={NO_HINT:"NO_HINT",NULL:"NULL",SCOPE:"SCOPE",NAME:"NAME",RANGE:"RANGE",REFERENCE:"REFERENCE",NUMBER:"NUMBER",PATH:"PATH",URL:"URL",ADDED:"ADDED",REMOVED:"REMOVED",CODE:"CODE",DURATION:"DURATION",SIZE:"SIZE",IDENT:"IDENT",DESCRIPTOR:"DESCRIPTOR",LOCATOR:"LOCATOR",RESOLUTION:"RESOLUTION",DEPENDENT:"DEPENDENT",PACKAGE_EXTENSION:"PACKAGE_EXTENSION",SETTING:"SETTING",MARKDOWN:"MARKDOWN"},_x=(e=>(e[e.BOLD=2]="BOLD",e))(_x||{}),$x=Jd.default.GITHUB_ACTIONS?{level:2}:Wd.default.supportsColor?{level:Wd.default.supportsColor.level}:{level:0},jy=$x.level!==0,eP=jy&&!Jd.default.GITHUB_ACTIONS&&!Jd.default.CIRCLE&&!Jd.default.GITLAB,Zx=new Wd.default.Instance($x),o0e=new Map([[Ue.NO_HINT,null],[Ue.NULL,["#a853b5",129]],[Ue.SCOPE,["#d75f00",166]],[Ue.NAME,["#d7875f",173]],[Ue.RANGE,["#00afaf",37]],[Ue.REFERENCE,["#87afff",111]],[Ue.NUMBER,["#ffd700",220]],[Ue.PATH,["#d75fd7",170]],[Ue.URL,["#d75fd7",170]],[Ue.ADDED,["#5faf00",70]],[Ue.REMOVED,["#d70000",160]],[Ue.CODE,["#87afff",111]],[Ue.SIZE,["#ffd700",220]]]),ds=r=>r,Yy={[Ue.NUMBER]:ds({pretty:(r,e)=>Bn(r,`${e}`,Ue.NUMBER),json:r=>r}),[Ue.IDENT]:ds({pretty:(r,e)=>Ai(r,e),json:r=>Ot(r)}),[Ue.LOCATOR]:ds({pretty:(r,e)=>mt(r,e),json:r=>Cs(r)}),[Ue.DESCRIPTOR]:ds({pretty:(r,e)=>tr(r,e),json:r=>Qn(r)}),[Ue.RESOLUTION]:ds({pretty:(r,{descriptor:e,locator:t})=>iP(r,e,t),json:({descriptor:r,locator:e})=>({descriptor:Qn(r),locator:e!==null?Cs(e):null})}),[Ue.DEPENDENT]:ds({pretty:(r,{locator:e,descriptor:t})=>nP(r,e,t),json:({locator:r,descriptor:e})=>({locator:Cs(r),descriptor:Qn(e)})}),[Ue.PACKAGE_EXTENSION]:ds({pretty:(r,e)=>{switch(e.type){case"Dependency":return`${Ai(r,e.parentDescriptor)} \u27A4 ${Bn(r,"dependencies",Ue.CODE)} \u27A4 ${Ai(r,e.descriptor)}`;case"PeerDependency":return`${Ai(r,e.parentDescriptor)} \u27A4 ${Bn(r,"peerDependencies",Ue.CODE)} \u27A4 ${Ai(r,e.descriptor)}`;case"PeerDependencyMeta":return`${Ai(r,e.parentDescriptor)} \u27A4 ${Bn(r,"peerDependenciesMeta",Ue.CODE)} \u27A4 ${Ai(r,$i(e.selector))} \u27A4 ${Bn(r,e.key,Ue.CODE)}`;default:throw new Error(`Assertion failed: Unsupported package extension type: ${e.type}`)}},json:r=>{switch(r.type){case"Dependency":return`${Ot(r.parentDescriptor)} > ${Ot(r.descriptor)}`;case"PeerDependency":return`${Ot(r.parentDescriptor)} >> ${Ot(r.descriptor)}`;case"PeerDependencyMeta":return`${Ot(r.parentDescriptor)} >> ${r.selector} / ${r.key}`;default:throw new Error(`Assertion failed: Unsupported package extension type: ${r.type}`)}}}),[Ue.SETTING]:ds({pretty:(r,e)=>(r.get(e),Cf(r,Bn(r,e,Ue.CODE),`https://yarnpkg.com/configuration/yarnrc#${e}`)),json:r=>r}),[Ue.DURATION]:ds({pretty:(r,e)=>{if(e>1e3*60){let t=Math.floor(e/1e3/60),i=Math.ceil((e-t*60*1e3)/1e3);return i===0?`${t}m`:`${t}m ${i}s`}else{let t=Math.floor(e/1e3),i=e-t*1e3;return i===0?`${t}s`:`${t}s ${i}ms`}},json:r=>r}),[Ue.SIZE]:ds({pretty:(r,e)=>{let t=["KB","MB","GB","TB"],i=t.length;for(;i>1&&e<1024**i;)i-=1;let n=1024**i,s=Math.floor(e*100/n)/100;return Bn(r,`${s} ${t[i-1]}`,Ue.NUMBER)},json:r=>r}),[Ue.PATH]:ds({pretty:(r,e)=>Bn(r,K.fromPortablePath(e),Ue.PATH),json:r=>K.fromPortablePath(r)}),[Ue.MARKDOWN]:ds({pretty:(r,{text:e,format:t,paragraphs:i})=>Li(e,{format:t,paragraphs:i}),json:({text:r})=>r})};function ro(r,e){return[e,r]}function qy(r,e,t){return r.get("enableColors")&&t&2&&(e=Wd.default.bold(e)),e}function Bn(r,e,t){if(!r.get("enableColors"))return e;let i=o0e.get(t);if(i===null)return e;let n=typeof i>"u"?t:$x.level>=3?i[0]:i[1],s=typeof n=="number"?Zx.ansi256(n):n.startsWith("#")?Zx.hex(n):Zx[n];if(typeof s!="function")throw new Error(`Invalid format type ${n}`);return s(e)}var a0e=!!process.env.KONSOLE_VERSION;function Cf(r,e,t){return r.get("enableHyperlinks")?a0e?`\x1B]8;;${t}\x1B\\${e}\x1B]8;;\x1B\\`:`\x1B]8;;${t}\x07${e}\x1B]8;;\x07`:e}function $e(r,e,t){if(e===null)return Bn(r,"null",Ue.NULL);if(Object.prototype.hasOwnProperty.call(Yy,t))return Yy[t].pretty(r,e);if(typeof e!="string")throw new Error(`Assertion failed: Expected the value to be a string, got ${typeof e}`);return Bn(r,e,t)}function tP(r,e,t,{separator:i=", "}={}){return[...e].map(n=>$e(r,n,t)).join(i)}function Ec(r,e){if(r===null)return null;if(Object.prototype.hasOwnProperty.call(Yy,e))return Yy[e].json(r);if(typeof r!="string")throw new Error(`Assertion failed: Expected the value to be a string, got ${typeof r}`);return r}function A0e(r,e,[t,i]){return r?Ec(t,i):$e(e,t,i)}function rP(r){return{Check:Bn(r,"\u2713","green"),Cross:Bn(r,"\u2718","red"),Question:Bn(r,"?","cyan")}}function Ho(r,{label:e,value:[t,i]}){return`${$e(r,e,Ue.CODE)}: ${$e(r,t,i)}`}var Jy=(n=>(n.Error="error",n.Warning="warning",n.Info="info",n.Discard="discard",n))(Jy||{});function zd(r,{configuration:e}){let t=e.get("logFilters"),i=new Map,n=new Map,s=[];for(let g of t){let f=g.get("level");if(typeof f>"u")continue;let h=g.get("code");typeof h<"u"&&i.set(h,f);let p=g.get("text");typeof p<"u"&&n.set(p,f);let C=g.get("pattern");typeof C<"u"&&s.push([c4.default.matcher(C,{contains:!0}),f])}s.reverse();let o=(g,f,h)=>{if(g===null||g===0)return h;let p=n.size>0||s.length>0?(0,u4.default)(f):f;if(n.size>0){let C=n.get(p);if(typeof C<"u")return C!=null?C:h}if(s.length>0){for(let[C,y]of s)if(C(p))return y!=null?y:h}if(i.size>0){let C=i.get(RA(g));if(typeof C<"u")return C!=null?C:h}return h},a=r.reportInfo,l=r.reportWarning,c=r.reportError,u=function(g,f,h,p){switch(o(f,h,p)){case"info":a.call(g,f,h);break;case"warning":l.call(g,f!=null?f:0,h);break;case"error":c.call(g,f!=null?f:0,h);break}};r.reportInfo=function(...g){return u(this,...g,"info")},r.reportWarning=function(...g){return u(this,...g,"warning")},r.reportError=function(...g){return u(this,...g,"error")}}var li={};ut(li,{checksumFile:()=>Iw,checksumPattern:()=>yw,makeHash:()=>en});var Ew=J("crypto"),KD=Pe(MD());function en(...r){let e=(0,Ew.createHash)("sha512"),t="";for(let i of r)typeof i=="string"?t+=i:i&&(t&&(e.update(t),t=""),e.update(i));return t&&e.update(t),e.digest("hex")}async function Iw(r,{baseFs:e,algorithm:t}={baseFs:M,algorithm:"sha512"}){let i=await e.openPromise(r,"r");try{let s=Buffer.allocUnsafeSlow(65536),o=(0,Ew.createHash)(t),a=0;for(;(a=await e.readPromise(i,s,0,65536))!==0;)o.update(a===65536?s:s.slice(0,a));return o.digest("hex")}finally{await e.closePromise(i)}}async function yw(r,{cwd:e}){let i=(await(0,KD.default)(r,{cwd:K.fromPortablePath(e),expandDirectories:!1,onlyDirectories:!0,unique:!0})).map(a=>`${a}/**/*`),n=await(0,KD.default)([r,...i],{cwd:K.fromPortablePath(e),expandDirectories:!1,onlyFiles:!1,unique:!0});n.sort();let s=await Promise.all(n.map(async a=>{let l=[Buffer.from(a)],c=K.toPortablePath(a),u=await M.lstatPromise(c);return u.isSymbolicLink()?l.push(Buffer.from(await M.readlinkPromise(c))):u.isFile()&&l.push(await M.readFilePromise(c)),l.join("\0")})),o=(0,Ew.createHash)("sha512");for(let a of s)o.update(a);return o.digest("hex")}var _d="virtual:",QSe=5,I8=/(os|cpu|libc)=([a-z0-9_-]+)/,bSe=(0,E8.makeParser)(I8);function qo(r,e){if(r!=null&&r.startsWith("@"))throw new Error("Invalid scope: don't prefix it with '@'");return{identHash:en(r,e),scope:r,name:e}}function _t(r,e){return{identHash:r.identHash,scope:r.scope,name:r.name,descriptorHash:en(r.identHash,e),range:e}}function tn(r,e){return{identHash:r.identHash,scope:r.scope,name:r.name,locatorHash:en(r.identHash,e),reference:e}}function SSe(r){return{identHash:r.identHash,scope:r.scope,name:r.name}}function ww(r){return{identHash:r.identHash,scope:r.scope,name:r.name,locatorHash:r.descriptorHash,reference:r.range}}function HD(r){return{identHash:r.identHash,scope:r.scope,name:r.name,descriptorHash:r.locatorHash,range:r.reference}}function vSe(r){return{identHash:r.identHash,scope:r.scope,name:r.name,locatorHash:r.locatorHash,reference:r.reference}}function $d(r,e){return{identHash:e.identHash,scope:e.scope,name:e.name,locatorHash:e.locatorHash,reference:e.reference,version:r.version,languageName:r.languageName,linkType:r.linkType,conditions:r.conditions,dependencies:new Map(r.dependencies),peerDependencies:new Map(r.peerDependencies),dependenciesMeta:new Map(r.dependenciesMeta),peerDependenciesMeta:new Map(r.peerDependenciesMeta),bin:new Map(r.bin)}}function eC(r){return $d(r,r)}function GD(r,e){if(e.includes("#"))throw new Error("Invalid entropy");return _t(r,`virtual:${e}#${r.range}`)}function YD(r,e){if(e.includes("#"))throw new Error("Invalid entropy");return $d(r,tn(r,`virtual:${e}#${r.reference}`))}function qA(r){return r.range.startsWith(_d)}function jo(r){return r.reference.startsWith(_d)}function tC(r){if(!qA(r))throw new Error("Not a virtual descriptor");return _t(r,r.range.replace(/^[^#]*#/,""))}function rC(r){if(!jo(r))throw new Error("Not a virtual descriptor");return tn(r,r.reference.replace(/^[^#]*#/,""))}function xSe(r,e){return r.range.includes("::")?r:_t(r,`${r.range}::${Bf.default.stringify(e)}`)}function PSe(r,e){return r.reference.includes("::")?r:tn(r,`${r.reference}::${Bf.default.stringify(e)}`)}function iC(r,e){return r.identHash===e.identHash}function y8(r,e){return r.descriptorHash===e.descriptorHash}function nC(r,e){return r.locatorHash===e.locatorHash}function DSe(r,e){if(!jo(r))throw new Error("Invalid package type");if(!jo(e))throw new Error("Invalid package type");if(!iC(r,e)||r.dependencies.size!==e.dependencies.size)return!1;for(let t of r.dependencies.values()){let i=e.dependencies.get(t.identHash);if(!i||!y8(t,i))return!1}return!0}function $i(r){let e=w8(r);if(!e)throw new Error(`Invalid ident (${r})`);return e}function w8(r){let e=r.match(/^(?:@([^/]+?)\/)?([^/]+)$/);if(!e)return null;let[,t,i]=e;return qo(typeof t<"u"?t:null,i)}function JA(r,e=!1){let t=sC(r,e);if(!t)throw new Error(`Invalid descriptor (${r})`);return t}function sC(r,e=!1){let t=e?r.match(/^(?:@([^/]+?)\/)?([^/]+?)(?:@(.+))$/):r.match(/^(?:@([^/]+?)\/)?([^/]+?)(?:@(.+))?$/);if(!t)return null;let[,i,n,s]=t;if(s==="unknown")throw new Error(`Invalid range (${r})`);let o=typeof i<"u"?i:null,a=typeof s<"u"?s:"unknown";return _t(qo(o,n),a)}function Sc(r,e=!1){let t=Bw(r,e);if(!t)throw new Error(`Invalid locator (${r})`);return t}function Bw(r,e=!1){let t=e?r.match(/^(?:@([^/]+?)\/)?([^/]+?)(?:@(.+))$/):r.match(/^(?:@([^/]+?)\/)?([^/]+?)(?:@(.+))?$/);if(!t)return null;let[,i,n,s]=t;if(s==="unknown")throw new Error(`Invalid reference (${r})`);let o=typeof i<"u"?i:null,a=typeof s<"u"?s:"unknown";return tn(qo(o,n),a)}function Qf(r,e){let t=r.match(/^([^#:]*:)?((?:(?!::)[^#])*)(?:#((?:(?!::).)*))?(?:::(.*))?$/);if(t===null)throw new Error(`Invalid range (${r})`);let i=typeof t[1]<"u"?t[1]:null;if(typeof(e==null?void 0:e.requireProtocol)=="string"&&i!==e.requireProtocol)throw new Error(`Invalid protocol (${i})`);if((e==null?void 0:e.requireProtocol)&&i===null)throw new Error(`Missing protocol (${i})`);let n=typeof t[3]<"u"?decodeURIComponent(t[2]):null;if((e==null?void 0:e.requireSource)&&n===null)throw new Error(`Missing source (${r})`);let s=typeof t[3]<"u"?decodeURIComponent(t[3]):decodeURIComponent(t[2]),o=e!=null&&e.parseSelector?Bf.default.parse(s):s,a=typeof t[4]<"u"?Bf.default.parse(t[4]):null;return{protocol:i,source:n,selector:o,params:a}}function kSe(r,{protocol:e}){let{selector:t,params:i}=Qf(r,{requireProtocol:e,requireBindings:!0});if(typeof i.locator!="string")throw new Error(`Assertion failed: Invalid bindings for ${r}`);return{parentLocator:Sc(i.locator,!0),path:t}}function C8(r){return r=r.replace(/%/g,"%25"),r=r.replace(/:/g,"%3A"),r=r.replace(/#/g,"%23"),r}function RSe(r){return r===null?!1:Object.entries(r).length>0}function Qw({protocol:r,source:e,selector:t,params:i}){let n="";return r!==null&&(n+=`${r}`),e!==null&&(n+=`${C8(e)}#`),n+=C8(t),RSe(i)&&(n+=`::${Bf.default.stringify(i)}`),n}function FSe(r){let{params:e,protocol:t,source:i,selector:n}=Qf(r);for(let s in e)s.startsWith("__")&&delete e[s];return Qw({protocol:t,source:i,params:e,selector:n})}function Ot(r){return r.scope?`@${r.scope}/${r.name}`:`${r.name}`}function Qn(r){return r.scope?`@${r.scope}/${r.name}@${r.range}`:`${r.name}@${r.range}`}function Cs(r){return r.scope?`@${r.scope}/${r.name}@${r.reference}`:`${r.name}@${r.reference}`}function UD(r){return r.scope!==null?`@${r.scope}-${r.name}`:r.name}function bf(r){let{protocol:e,selector:t}=Qf(r.reference),i=e!==null?e.replace(/:$/,""):"exotic",n=m8.default.valid(t),s=n!==null?`${i}-${n}`:`${i}`,o=10,a=r.scope?`${UD(r)}-${s}-${r.locatorHash.slice(0,o)}`:`${UD(r)}-${s}-${r.locatorHash.slice(0,o)}`;return Ur(a)}function Ai(r,e){return e.scope?`${$e(r,`@${e.scope}/`,Ue.SCOPE)}${$e(r,e.name,Ue.NAME)}`:`${$e(r,e.name,Ue.NAME)}`}function bw(r){if(r.startsWith(_d)){let e=bw(r.substring(r.indexOf("#")+1)),t=r.substring(_d.length,_d.length+QSe);return`${e} [${t}]`}else return r.replace(/\?.*/,"?[...]")}function Sw(r,e){return`${$e(r,bw(e),Ue.RANGE)}`}function tr(r,e){return`${Ai(r,e)}${$e(r,"@",Ue.RANGE)}${Sw(r,e.range)}`}function oC(r,e){return`${$e(r,bw(e),Ue.REFERENCE)}`}function mt(r,e){return`${Ai(r,e)}${$e(r,"@",Ue.REFERENCE)}${oC(r,e.reference)}`}function jD(r){return`${Ot(r)}@${bw(r.reference)}`}function Sf(r){return wn(r,[e=>Ot(e),e=>e.range])}function aC(r,e){return Ai(r,e.locator)}function iP(r,e,t){let i=qA(e)?tC(e):e;return t===null?`${tr(r,i)} \u2192 ${rP(r).Cross}`:i.identHash===t.identHash?`${tr(r,i)} \u2192 ${oC(r,t.reference)}`:`${tr(r,i)} \u2192 ${mt(r,t)}`}function nP(r,e,t){return t===null?`${mt(r,e)}`:`${mt(r,e)} (via ${Sw(r,t.range)})`}function qD(r){return`node_modules/${Ot(r)}`}function vw(r,e){return r.conditions?bSe(r.conditions,t=>{let[,i,n]=t.match(I8),s=e[i];return s?s.includes(n):!0}):!0}var B8={hooks:{reduceDependency:(r,e,t,i,{resolver:n,resolveOptions:s})=>{for(let{pattern:o,reference:a}of e.topLevelWorkspace.manifest.resolutions){if(o.from&&o.from.fullName!==Ot(t)||o.from&&o.from.description&&o.from.description!==t.reference||o.descriptor.fullName!==Ot(r)||o.descriptor.description&&o.descriptor.description!==r.range)continue;return n.bindDescriptor(_t(r,a),e.topLevelWorkspace.anchoredLocator,s)}return r},validateProject:async(r,e)=>{for(let t of r.workspaces){let i=aC(r.configuration,t);await r.configuration.triggerHook(n=>n.validateWorkspace,t,{reportWarning:(n,s)=>e.reportWarning(n,`${i}: ${s}`),reportError:(n,s)=>e.reportError(n,`${i}: ${s}`)})}},validateWorkspace:async(r,e)=>{let{manifest:t}=r;t.resolutions.length&&r.cwd!==r.project.cwd&&t.errors.push(new Error("Resolutions field will be ignored"));for(let i of t.errors)e.reportWarning(57,i.message)}}};var D8=Pe(Xr());var AC=class{supportsDescriptor(e,t){return!!(e.range.startsWith(AC.protocol)||t.project.tryWorkspaceByDescriptor(e)!==null)}supportsLocator(e,t){return!!e.reference.startsWith(AC.protocol)}shouldPersistResolution(e,t){return!1}bindDescriptor(e,t,i){return e}getResolutionDependencies(e,t){return[]}async getCandidates(e,t,i){return[i.project.getWorkspaceByDescriptor(e).anchoredLocator]}async getSatisfying(e,t,i){return null}async resolve(e,t){let i=t.project.getWorkspaceByCwd(e.reference.slice(AC.protocol.length));return{...e,version:i.manifest.version||"0.0.0",languageName:"unknown",linkType:"SOFT",conditions:null,dependencies:new Map([...i.manifest.dependencies,...i.manifest.devDependencies]),peerDependencies:new Map([...i.manifest.peerDependencies]),dependenciesMeta:i.manifest.dependenciesMeta,peerDependenciesMeta:i.manifest.peerDependenciesMeta,bin:i.manifest.bin}}},jr=AC;jr.protocol="workspace:";var vt={};ut(vt,{SemVer:()=>S8.SemVer,clean:()=>LSe,satisfiesWithPrereleases:()=>vc,validRange:()=>io});var xw=Pe(Xr()),S8=Pe(Xr()),Q8=new Map;function vc(r,e,t=!1){if(!r)return!1;let i=`${e}${t}`,n=Q8.get(i);if(typeof n>"u")try{n=new xw.default.Range(e,{includePrerelease:!0,loose:t})}catch{return!1}finally{Q8.set(i,n||null)}else if(n===null)return!1;let s;try{s=new xw.default.SemVer(r,n)}catch{return!1}return n.test(s)?!0:(s.prerelease&&(s.prerelease=[]),n.set.some(o=>{for(let a of o)a.semver.prerelease&&(a.semver.prerelease=[]);return o.every(a=>a.test(s))}))}var b8=new Map;function io(r){if(r.indexOf(":")!==-1)return null;let e=b8.get(r);if(typeof e<"u")return e;try{e=new xw.default.Range(r)}catch{e=null}return b8.set(r,e),e}var NSe=/^(?:[\sv=]*?)((0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\s*)$/;function LSe(r){let e=NSe.exec(r);return e?e[1]:null}var WA=class{constructor(){this.indent="  ";this.name=null;this.version=null;this.os=null;this.cpu=null;this.libc=null;this.type=null;this.packageManager=null;this.private=!1;this.license=null;this.main=null;this.module=null;this.browser=null;this.languageName=null;this.bin=new Map;this.scripts=new Map;this.dependencies=new Map;this.devDependencies=new Map;this.peerDependencies=new Map;this.workspaceDefinitions=[];this.dependenciesMeta=new Map;this.peerDependenciesMeta=new Map;this.resolutions=[];this.files=null;this.publishConfig=null;this.installConfig=null;this.preferUnplugged=null;this.raw={};this.errors=[]}static async tryFind(e,{baseFs:t=new $t}={}){let i=x.join(e,"package.json");try{return await WA.fromFile(i,{baseFs:t})}catch(n){if(n.code==="ENOENT")return null;throw n}}static async find(e,{baseFs:t}={}){let i=await WA.tryFind(e,{baseFs:t});if(i===null)throw new Error("Manifest not found");return i}static async fromFile(e,{baseFs:t=new $t}={}){let i=new WA;return await i.loadFile(e,{baseFs:t}),i}static fromText(e){let t=new WA;return t.loadFromText(e),t}static isManifestFieldCompatible(e,t){if(e===null)return!0;let i=!0,n=!1;for(let s of e)if(s[0]==="!"){if(n=!0,t===s.slice(1))return!1}else if(i=!1,s===t)return!0;return n&&i}loadFromText(e){let t;try{t=JSON.parse(x8(e)||"{}")}catch(i){throw i.message+=` (when parsing ${e})`,i}this.load(t),this.indent=v8(e)}async loadFile(e,{baseFs:t=new $t}){let i=await t.readFilePromise(e,"utf8"),n;try{n=JSON.parse(x8(i)||"{}")}catch(s){throw s.message+=` (when parsing ${e})`,s}this.load(n),this.indent=v8(i)}load(e,{yamlCompatibilityMode:t=!1}={}){if(typeof e!="object"||e===null)throw new Error(`Utterly invalid manifest data (${e})`);this.raw=e;let i=[];if(this.name=null,typeof e.name=="string")try{this.name=$i(e.name)}catch{i.push(new Error("Parsing failed for the 'name' field"))}if(typeof e.version=="string"?this.version=e.version:this.version=null,Array.isArray(e.os)){let s=[];this.os=s;for(let o of e.os)typeof o!="string"?i.push(new Error("Parsing failed for the 'os' field")):s.push(o)}else this.os=null;if(Array.isArray(e.cpu)){let s=[];this.cpu=s;for(let o of e.cpu)typeof o!="string"?i.push(new Error("Parsing failed for the 'cpu' field")):s.push(o)}else this.cpu=null;if(Array.isArray(e.libc)){let s=[];this.libc=s;for(let o of e.libc)typeof o!="string"?i.push(new Error("Parsing failed for the 'libc' field")):s.push(o)}else this.libc=null;if(typeof e.type=="string"?this.type=e.type:this.type=null,typeof e.packageManager=="string"?this.packageManager=e.packageManager:this.packageManager=null,typeof e.private=="boolean"?this.private=e.private:this.private=!1,typeof e.license=="string"?this.license=e.license:this.license=null,typeof e.languageName=="string"?this.languageName=e.languageName:this.languageName=null,typeof e.main=="string"?this.main=rn(e.main):this.main=null,typeof e.module=="string"?this.module=rn(e.module):this.module=null,e.browser!=null)if(typeof e.browser=="string")this.browser=rn(e.browser);else{this.browser=new Map;for(let[s,o]of Object.entries(e.browser))this.browser.set(rn(s),typeof o=="string"?rn(o):o)}else this.browser=null;if(this.bin=new Map,typeof e.bin=="string")this.name!==null?this.bin.set(this.name.name,rn(e.bin)):i.push(new Error("String bin field, but no attached package name"));else if(typeof e.bin=="object"&&e.bin!==null)for(let[s,o]of Object.entries(e.bin)){if(typeof o!="string"){i.push(new Error(`Invalid bin definition for '${s}'`));continue}let a=$i(s);this.bin.set(a.name,rn(o))}if(this.scripts=new Map,typeof e.scripts=="object"&&e.scripts!==null)for(let[s,o]of Object.entries(e.scripts)){if(typeof o!="string"){i.push(new Error(`Invalid script definition for '${s}'`));continue}this.scripts.set(s,o)}if(this.dependencies=new Map,typeof e.dependencies=="object"&&e.dependencies!==null)for(let[s,o]of Object.entries(e.dependencies)){if(typeof o!="string"){i.push(new Error(`Invalid dependency range for '${s}'`));continue}let a;try{a=$i(s)}catch{i.push(new Error(`Parsing failed for the dependency name '${s}'`));continue}let l=_t(a,o);this.dependencies.set(l.identHash,l)}if(this.devDependencies=new Map,typeof e.devDependencies=="object"&&e.devDependencies!==null)for(let[s,o]of Object.entries(e.devDependencies)){if(typeof o!="string"){i.push(new Error(`Invalid dependency range for '${s}'`));continue}let a;try{a=$i(s)}catch{i.push(new Error(`Parsing failed for the dependency name '${s}'`));continue}let l=_t(a,o);this.devDependencies.set(l.identHash,l)}if(this.peerDependencies=new Map,typeof e.peerDependencies=="object"&&e.peerDependencies!==null)for(let[s,o]of Object.entries(e.peerDependencies)){let a;try{a=$i(s)}catch{i.push(new Error(`Parsing failed for the dependency name '${s}'`));continue}(typeof o!="string"||!o.startsWith(jr.protocol)&&!io(o))&&(i.push(new Error(`Invalid dependency range for '${s}'`)),o="*");let l=_t(a,o);this.peerDependencies.set(l.identHash,l)}typeof e.workspaces=="object"&&e.workspaces!==null&&e.workspaces.nohoist&&i.push(new Error("'nohoist' is deprecated, please use 'installConfig.hoistingLimits' instead"));let n=Array.isArray(e.workspaces)?e.workspaces:typeof e.workspaces=="object"&&e.workspaces!==null&&Array.isArray(e.workspaces.packages)?e.workspaces.packages:[];this.workspaceDefinitions=[];for(let s of n){if(typeof s!="string"){i.push(new Error(`Invalid workspace definition for '${s}'`));continue}this.workspaceDefinitions.push({pattern:s})}if(this.dependenciesMeta=new Map,typeof e.dependenciesMeta=="object"&&e.dependenciesMeta!==null)for(let[s,o]of Object.entries(e.dependenciesMeta)){if(typeof o!="object"||o===null){i.push(new Error(`Invalid meta field for '${s}`));continue}let a=JA(s),l=this.ensureDependencyMeta(a),c=Pw(o.built,{yamlCompatibilityMode:t});if(c===null){i.push(new Error(`Invalid built meta field for '${s}'`));continue}let u=Pw(o.optional,{yamlCompatibilityMode:t});if(u===null){i.push(new Error(`Invalid optional meta field for '${s}'`));continue}let g=Pw(o.unplugged,{yamlCompatibilityMode:t});if(g===null){i.push(new Error(`Invalid unplugged meta field for '${s}'`));continue}Object.assign(l,{built:c,optional:u,unplugged:g})}if(this.peerDependenciesMeta=new Map,typeof e.peerDependenciesMeta=="object"&&e.peerDependenciesMeta!==null)for(let[s,o]of Object.entries(e.peerDependenciesMeta)){if(typeof o!="object"||o===null){i.push(new Error(`Invalid meta field for '${s}'`));continue}let a=JA(s),l=this.ensurePeerDependencyMeta(a),c=Pw(o.optional,{yamlCompatibilityMode:t});if(c===null){i.push(new Error(`Invalid optional meta field for '${s}'`));continue}Object.assign(l,{optional:c})}if(this.resolutions=[],typeof e.resolutions=="object"&&e.resolutions!==null)for(let[s,o]of Object.entries(e.resolutions)){if(typeof o!="string"){i.push(new Error(`Invalid resolution entry for '${s}'`));continue}try{this.resolutions.push({pattern:cI(s),reference:o})}catch(a){i.push(a);continue}}if(Array.isArray(e.files)){this.files=new Set;for(let s of e.files){if(typeof s!="string"){i.push(new Error(`Invalid files entry for '${s}'`));continue}this.files.add(s)}}else this.files=null;if(typeof e.publishConfig=="object"&&e.publishConfig!==null){if(this.publishConfig={},typeof e.publishConfig.access=="string"&&(this.publishConfig.access=e.publishConfig.access),typeof e.publishConfig.main=="string"&&(this.publishConfig.main=rn(e.publishConfig.main)),typeof e.publishConfig.module=="string"&&(this.publishConfig.module=rn(e.publishConfig.module)),e.publishConfig.browser!=null)if(typeof e.publishConfig.browser=="string")this.publishConfig.browser=rn(e.publishConfig.browser);else{this.publishConfig.browser=new Map;for(let[s,o]of Object.entries(e.publishConfig.browser))this.publishConfig.browser.set(rn(s),typeof o=="string"?rn(o):o)}if(typeof e.publishConfig.registry=="string"&&(this.publishConfig.registry=e.publishConfig.registry),typeof e.publishConfig.bin=="string")this.name!==null?this.publishConfig.bin=new Map([[this.name.name,rn(e.publishConfig.bin)]]):i.push(new Error("String bin field, but no attached package name"));else if(typeof e.publishConfig.bin=="object"&&e.publishConfig.bin!==null){this.publishConfig.bin=new Map;for(let[s,o]of Object.entries(e.publishConfig.bin)){if(typeof o!="string"){i.push(new Error(`Invalid bin definition for '${s}'`));continue}this.publishConfig.bin.set(s,rn(o))}}if(Array.isArray(e.publishConfig.executableFiles)){this.publishConfig.executableFiles=new Set;for(let s of e.publishConfig.executableFiles){if(typeof s!="string"){i.push(new Error("Invalid executable file definition"));continue}this.publishConfig.executableFiles.add(rn(s))}}}else this.publishConfig=null;if(typeof e.installConfig=="object"&&e.installConfig!==null){this.installConfig={};for(let s of Object.keys(e.installConfig))s==="hoistingLimits"?typeof e.installConfig.hoistingLimits=="string"?this.installConfig.hoistingLimits=e.installConfig.hoistingLimits:i.push(new Error("Invalid hoisting limits definition")):s=="selfReferences"?typeof e.installConfig.selfReferences=="boolean"?this.installConfig.selfReferences=e.installConfig.selfReferences:i.push(new Error("Invalid selfReferences definition, must be a boolean value")):i.push(new Error(`Unrecognized installConfig key: ${s}`))}else this.installConfig=null;if(typeof e.optionalDependencies=="object"&&e.optionalDependencies!==null)for(let[s,o]of Object.entries(e.optionalDependencies)){if(typeof o!="string"){i.push(new Error(`Invalid dependency range for '${s}'`));continue}let a;try{a=$i(s)}catch{i.push(new Error(`Parsing failed for the dependency name '${s}'`));continue}let l=_t(a,o);this.dependencies.set(l.identHash,l);let c=_t(a,"unknown"),u=this.ensureDependencyMeta(c);Object.assign(u,{optional:!0})}typeof e.preferUnplugged=="boolean"?this.preferUnplugged=e.preferUnplugged:this.preferUnplugged=null,this.errors=i}getForScope(e){switch(e){case"dependencies":return this.dependencies;case"devDependencies":return this.devDependencies;case"peerDependencies":return this.peerDependencies;default:throw new Error(`Unsupported value ("${e}")`)}}hasConsumerDependency(e){return!!(this.dependencies.has(e.identHash)||this.peerDependencies.has(e.identHash))}hasHardDependency(e){return!!(this.dependencies.has(e.identHash)||this.devDependencies.has(e.identHash))}hasSoftDependency(e){return!!this.peerDependencies.has(e.identHash)}hasDependency(e){return!!(this.hasHardDependency(e)||this.hasSoftDependency(e))}getConditions(){let e=[];return this.os&&this.os.length>0&&e.push(JD("os",this.os)),this.cpu&&this.cpu.length>0&&e.push(JD("cpu",this.cpu)),this.libc&&this.libc.length>0&&e.push(JD("libc",this.libc)),e.length>0?e.join(" & "):null}isCompatibleWithOS(e){return WA.isManifestFieldCompatible(this.os,e)}isCompatibleWithCPU(e){return WA.isManifestFieldCompatible(this.cpu,e)}ensureDependencyMeta(e){if(e.range!=="unknown"&&!D8.default.valid(e.range))throw new Error(`Invalid meta field range for '${Qn(e)}'`);let t=Ot(e),i=e.range!=="unknown"?e.range:null,n=this.dependenciesMeta.get(t);n||this.dependenciesMeta.set(t,n=new Map);let s=n.get(i);return s||n.set(i,s={}),s}ensurePeerDependencyMeta(e){if(e.range!=="unknown")throw new Error(`Invalid meta field range for '${Qn(e)}'`);let t=Ot(e),i=this.peerDependenciesMeta.get(t);return i||this.peerDependenciesMeta.set(t,i={}),i}setRawField(e,t,{after:i=[]}={}){let n=new Set(i.filter(s=>Object.prototype.hasOwnProperty.call(this.raw,s)));if(n.size===0||Object.prototype.hasOwnProperty.call(this.raw,e))this.raw[e]=t;else{let s=this.raw,o=this.raw={},a=!1;for(let l of Object.keys(s))o[l]=s[l],a||(n.delete(l),n.size===0&&(o[e]=t,a=!0))}}exportTo(e,{compatibilityMode:t=!0}={}){var s;if(Object.assign(e,this.raw),this.name!==null?e.name=Ot(this.name):delete e.name,this.version!==null?e.version=this.version:delete e.version,this.os!==null?e.os=this.os:delete e.os,this.cpu!==null?e.cpu=this.cpu:delete e.cpu,this.type!==null?e.type=this.type:delete e.type,this.packageManager!==null?e.packageManager=this.packageManager:delete e.packageManager,this.private?e.private=!0:delete e.private,this.license!==null?e.license=this.license:delete e.license,this.languageName!==null?e.languageName=this.languageName:delete e.languageName,this.main!==null?e.main=this.main:delete e.main,this.module!==null?e.module=this.module:delete e.module,this.browser!==null){let o=this.browser;typeof o=="string"?e.browser=o:o instanceof Map&&(e.browser=Object.assign({},...Array.from(o.keys()).sort().map(a=>({[a]:o.get(a)}))))}else delete e.browser;this.bin.size===1&&this.name!==null&&this.bin.has(this.name.name)?e.bin=this.bin.get(this.name.name):this.bin.size>0?e.bin=Object.assign({},...Array.from(this.bin.keys()).sort().map(o=>({[o]:this.bin.get(o)}))):delete e.bin,this.workspaceDefinitions.length>0?this.raw.workspaces&&!Array.isArray(this.raw.workspaces)?e.workspaces={...this.raw.workspaces,packages:this.workspaceDefinitions.map(({pattern:o})=>o)}:e.workspaces=this.workspaceDefinitions.map(({pattern:o})=>o):this.raw.workspaces&&!Array.isArray(this.raw.workspaces)&&Object.keys(this.raw.workspaces).length>0?e.workspaces=this.raw.workspaces:delete e.workspaces;let i=[],n=[];for(let o of this.dependencies.values()){let a=this.dependenciesMeta.get(Ot(o)),l=!1;if(t&&a){let c=a.get(null);c&&c.optional&&(l=!0)}l?n.push(o):i.push(o)}i.length>0?e.dependencies=Object.assign({},...Sf(i).map(o=>({[Ot(o)]:o.range}))):delete e.dependencies,n.length>0?e.optionalDependencies=Object.assign({},...Sf(n).map(o=>({[Ot(o)]:o.range}))):delete e.optionalDependencies,this.devDependencies.size>0?e.devDependencies=Object.assign({},...Sf(this.devDependencies.values()).map(o=>({[Ot(o)]:o.range}))):delete e.devDependencies,this.peerDependencies.size>0?e.peerDependencies=Object.assign({},...Sf(this.peerDependencies.values()).map(o=>({[Ot(o)]:o.range}))):delete e.peerDependencies,e.dependenciesMeta={};for(let[o,a]of wn(this.dependenciesMeta.entries(),([l,c])=>l))for(let[l,c]of wn(a.entries(),([u,g])=>u!==null?`0${u}`:"1")){let u=l!==null?Qn(_t($i(o),l)):o,g={...c};t&&l===null&&delete g.optional,Object.keys(g).length!==0&&(e.dependenciesMeta[u]=g)}if(Object.keys(e.dependenciesMeta).length===0&&delete e.dependenciesMeta,this.peerDependenciesMeta.size>0?e.peerDependenciesMeta=Object.assign({},...wn(this.peerDependenciesMeta.entries(),([o,a])=>o).map(([o,a])=>({[o]:a}))):delete e.peerDependenciesMeta,this.resolutions.length>0?e.resolutions=Object.assign({},...this.resolutions.map(({pattern:o,reference:a})=>({[uI(o)]:a}))):delete e.resolutions,this.files!==null?e.files=Array.from(this.files):delete e.files,this.preferUnplugged!==null?e.preferUnplugged=this.preferUnplugged:delete e.preferUnplugged,this.scripts!==null&&this.scripts.size>0){(s=e.scripts)!=null||(e.scripts={});for(let o of Object.keys(e.scripts))this.scripts.has(o)||delete e.scripts[o];for(let[o,a]of this.scripts.entries())e.scripts[o]=a}else delete e.scripts;return e}},ot=WA;ot.fileName="package.json",ot.allDependencies=["dependencies","devDependencies","peerDependencies"],ot.hardDependencies=["dependencies","devDependencies"];function v8(r){let e=r.match(/^[ \t]+/m);return e?e[0]:"  "}function x8(r){return r.charCodeAt(0)===65279?r.slice(1):r}function rn(r){return r.replace(/\\/g,"/")}function Pw(r,{yamlCompatibilityMode:e}){return e?zx(r):typeof r>"u"||typeof r=="boolean"?r:null}function P8(r,e){let t=e.search(/[^!]/);if(t===-1)return"invalid";let i=t%2===0?"":"!",n=e.slice(t);return`${i}${r}=${n}`}function JD(r,e){return e.length===1?P8(r,e[0]):`(${e.map(t=>P8(r,t)).join(" | ")})`}var az=Pe(oz()),Az=J("stream"),lz=J("string_decoder");var xve=15,at=class extends Error{constructor(t,i,n){super(i);this.reportExtra=n;this.reportCode=t}};function Pve(r){return typeof r.reportCode<"u"}var vi=class{constructor(){this.reportedInfos=new Set;this.reportedWarnings=new Set;this.reportedErrors=new Set}static progressViaCounter(e){let t=0,i,n=new Promise(l=>{i=l}),s=l=>{let c=i;n=new Promise(u=>{i=u}),t=l,c()},o=(l=0)=>{s(t+1)},a=async function*(){for(;t<e;)await n,yield{progress:t/e}}();return{[Symbol.asyncIterator](){return a},hasProgress:!0,hasTitle:!1,set:s,tick:o}}static progressViaTitle(){let e,t,i=new Promise(o=>{t=o}),n=(0,az.default)(o=>{let a=t;i=new Promise(l=>{t=l}),e=o,a()},1e3/xve),s=async function*(){for(;;)await i,yield{title:e}}();return{[Symbol.asyncIterator](){return s},hasProgress:!1,hasTitle:!0,setTitle:n}}async startProgressPromise(e,t){let i=this.reportProgress(e);try{return await t(e)}finally{i.stop()}}startProgressSync(e,t){let i=this.reportProgress(e);try{return t(e)}finally{i.stop()}}reportInfoOnce(e,t,i){var s;let n=i&&i.key?i.key:t;this.reportedInfos.has(n)||(this.reportedInfos.add(n),this.reportInfo(e,t),(s=i==null?void 0:i.reportExtra)==null||s.call(i,this))}reportWarningOnce(e,t,i){var s;let n=i&&i.key?i.key:t;this.reportedWarnings.has(n)||(this.reportedWarnings.add(n),this.reportWarning(e,t),(s=i==null?void 0:i.reportExtra)==null||s.call(i,this))}reportErrorOnce(e,t,i){var s;let n=i&&i.key?i.key:t;this.reportedErrors.has(n)||(this.reportedErrors.add(n),this.reportError(e,t),(s=i==null?void 0:i.reportExtra)==null||s.call(i,this))}reportExceptionOnce(e){Pve(e)?this.reportErrorOnce(e.reportCode,e.message,{key:e,reportExtra:e.reportExtra}):this.reportErrorOnce(1,e.stack||e.message,{key:e})}createStreamReporter(e=null){let t=new Az.PassThrough,i=new lz.StringDecoder,n="";return t.on("data",s=>{let o=i.write(s),a;do if(a=o.indexOf(`
-`),a!==-1){let l=n+o.substring(0,a);o=o.substring(a+1),n="",e!==null?this.reportInfo(null,`${e} ${l}`):this.reportInfo(null,l)}while(a!==-1);n+=o}),t.on("end",()=>{let s=i.end();s!==""&&(e!==null?this.reportInfo(null,`${e} ${s}`):this.reportInfo(null,s))}),t}};var vf=class{constructor(e){this.fetchers=e}supports(e,t){return!!this.tryFetcher(e,t)}getLocalPath(e,t){return this.getFetcher(e,t).getLocalPath(e,t)}async fetch(e,t){return await this.getFetcher(e,t).fetch(e,t)}tryFetcher(e,t){let i=this.fetchers.find(n=>n.supports(e,t));return i||null}getFetcher(e,t){let i=this.fetchers.find(n=>n.supports(e,t));if(!i)throw new at(11,`${mt(t.project.configuration,e)} isn't supported by any available fetcher`);return i}};var xf=class{constructor(e){this.resolvers=e.filter(t=>t)}supportsDescriptor(e,t){return!!this.tryResolverByDescriptor(e,t)}supportsLocator(e,t){return!!this.tryResolverByLocator(e,t)}shouldPersistResolution(e,t){return this.getResolverByLocator(e,t).shouldPersistResolution(e,t)}bindDescriptor(e,t,i){return this.getResolverByDescriptor(e,i).bindDescriptor(e,t,i)}getResolutionDependencies(e,t){return this.getResolverByDescriptor(e,t).getResolutionDependencies(e,t)}async getCandidates(e,t,i){return await this.getResolverByDescriptor(e,i).getCandidates(e,t,i)}async getSatisfying(e,t,i){return this.getResolverByDescriptor(e,i).getSatisfying(e,t,i)}async resolve(e,t){return await this.getResolverByLocator(e,t).resolve(e,t)}tryResolverByDescriptor(e,t){let i=this.resolvers.find(n=>n.supportsDescriptor(e,t));return i||null}getResolverByDescriptor(e,t){let i=this.resolvers.find(n=>n.supportsDescriptor(e,t));if(!i)throw new Error(`${tr(t.project.configuration,e)} isn't supported by any available resolver`);return i}tryResolverByLocator(e,t){let i=this.resolvers.find(n=>n.supportsLocator(e,t));return i||null}getResolverByLocator(e,t){let i=this.resolvers.find(n=>n.supportsLocator(e,t));if(!i)throw new Error(`${mt(t.project.configuration,e)} isn't supported by any available resolver`);return i}};var cz=Pe(Xr());var Pf=/^(?!v)[a-z0-9._-]+$/i,Dw=class{supportsDescriptor(e,t){return!!(io(e.range)||Pf.test(e.range))}supportsLocator(e,t){return!!(cz.default.valid(e.reference)||Pf.test(e.reference))}shouldPersistResolution(e,t){return t.resolver.shouldPersistResolution(this.forwardLocator(e,t),t)}bindDescriptor(e,t,i){return i.resolver.bindDescriptor(this.forwardDescriptor(e,i),t,i)}getResolutionDependencies(e,t){return t.resolver.getResolutionDependencies(this.forwardDescriptor(e,t),t)}async getCandidates(e,t,i){return await i.resolver.getCandidates(this.forwardDescriptor(e,i),t,i)}async getSatisfying(e,t,i){return await i.resolver.getSatisfying(this.forwardDescriptor(e,i),t,i)}async resolve(e,t){let i=await t.resolver.resolve(this.forwardLocator(e,t),t);return $d(i,e)}forwardDescriptor(e,t){return _t(e,`${t.project.configuration.get("defaultProtocol")}${e.range}`)}forwardLocator(e,t){return tn(e,`${t.project.configuration.get("defaultProtocol")}${e.reference}`)}};var Df=class{supports(e){return!!e.reference.startsWith("virtual:")}getLocalPath(e,t){let i=e.reference.indexOf("#");if(i===-1)throw new Error("Invalid virtual package reference");let n=e.reference.slice(i+1),s=tn(e,n);return t.fetcher.getLocalPath(s,t)}async fetch(e,t){let i=e.reference.indexOf("#");if(i===-1)throw new Error("Invalid virtual package reference");let n=e.reference.slice(i+1),s=tn(e,n),o=await t.fetcher.fetch(s,t);return await this.ensureVirtualLink(e,o,t)}getLocatorFilename(e){return bf(e)}async ensureVirtualLink(e,t,i){let n=t.packageFs.getRealPath(),s=i.project.configuration.get("virtualFolder"),o=this.getLocatorFilename(e),a=Br.makeVirtualPath(s,o,n),l=new bo(a,{baseFs:t.packageFs,pathUtils:x});return{...t,packageFs:l}}};var kf=class{static isVirtualDescriptor(e){return!!e.range.startsWith(kf.protocol)}static isVirtualLocator(e){return!!e.reference.startsWith(kf.protocol)}supportsDescriptor(e,t){return kf.isVirtualDescriptor(e)}supportsLocator(e,t){return kf.isVirtualLocator(e)}shouldPersistResolution(e,t){return!1}bindDescriptor(e,t,i){throw new Error('Assertion failed: calling "bindDescriptor" on a virtual descriptor is unsupported')}getResolutionDependencies(e,t){throw new Error('Assertion failed: calling "getResolutionDependencies" on a virtual descriptor is unsupported')}async getCandidates(e,t,i){throw new Error('Assertion failed: calling "getCandidates" on a virtual descriptor is unsupported')}async getSatisfying(e,t,i){throw new Error('Assertion failed: calling "getSatisfying" on a virtual descriptor is unsupported')}async resolve(e,t){throw new Error('Assertion failed: calling "resolve" on a virtual locator is unsupported')}},uC=kf;uC.protocol="virtual:";var Rf=class{supports(e){return!!e.reference.startsWith(jr.protocol)}getLocalPath(e,t){return this.getWorkspace(e,t).cwd}async fetch(e,t){let i=this.getWorkspace(e,t).cwd;return{packageFs:new qt(i),prefixPath:Oe.dot,localPath:i}}getWorkspace(e,t){return t.project.getWorkspaceByCwd(e.reference.slice(jr.protocol.length))}};var kw={};ut(kw,{getDefaultGlobalFolder:()=>XD,getHomeFolder:()=>gC,isFolderInside:()=>ZD});var VD=J("os");function XD(){if(process.platform==="win32"){let r=K.toPortablePath(process.env.LOCALAPPDATA||K.join((0,VD.homedir)(),"AppData","Local"));return x.resolve(r,"Yarn/Berry")}if(process.env.XDG_DATA_HOME){let r=K.toPortablePath(process.env.XDG_DATA_HOME);return x.resolve(r,"yarn/berry")}return x.resolve(gC(),".yarn/berry")}function gC(){return K.toPortablePath((0,VD.homedir)()||"/usr/local/share")}function ZD(r,e){let t=x.relative(e,r);return t&&!t.startsWith("..")&&!x.isAbsolute(t)}var Is={};ut(Is,{availableParallelism:()=>ek,builtinModules:()=>_D,getArchitecture:()=>fC,getArchitectureName:()=>Rve,getArchitectureSet:()=>$D,openUrl:()=>Dve});var gz=Pe(J("module")),Nw=Pe(J("os"));var uz=new Map([["darwin","open"],["linux","xdg-open"],["win32","explorer.exe"]]).get(process.platform),Dve=typeof uz<"u"?async r=>{try{return await tk(uz,[r],{cwd:x.cwd()}),!0}catch{return!1}}:void 0;function _D(){return new Set(gz.default.builtinModules||Object.keys(process.binding("natives")))}function kve(){var i,n,s,o;if(process.platform==="win32")return null;let e=(s=((n=(i=process.report)==null?void 0:i.getReport())!=null?n:{}).sharedObjects)!=null?s:[],t=/\/(?:(ld-linux-|[^/]+-linux-gnu\/)|(libc.musl-|ld-musl-))/;return(o=jd(e,a=>{let l=a.match(t);if(!l)return jd.skip;if(l[1])return"glibc";if(l[2])return"musl";throw new Error("Assertion failed: Expected the libc variant to have been detected")}))!=null?o:null}var Rw,Fw;function fC(){return Rw=Rw!=null?Rw:{os:process.platform,cpu:process.arch,libc:kve()}}function Rve(r=fC()){return r.libc?`${r.os}-${r.cpu}-${r.libc}`:`${r.os}-${r.cpu}`}function $D(){let r=fC();return Fw=Fw!=null?Fw:{os:[r.os],cpu:[r.cpu],libc:r.libc?[r.libc]:[]}}function ek(){return"availableParallelism"in Nw.default?Nw.default.availableParallelism():Math.max(1,Nw.default.cpus().length)}var Fve=new Set(["isTestEnv","injectNpmUser","injectNpmPassword","injectNpm2FaToken","binFolder","version","flags","profile","gpg","ignoreNode","wrapOutput","home","confDir"]),Mw="yarn_",sk=".yarnrc.yml",ok="yarn.lock",Nve="********",ak=(u=>(u.ANY="ANY",u.BOOLEAN="BOOLEAN",u.ABSOLUTE_PATH="ABSOLUTE_PATH",u.LOCATOR="LOCATOR",u.LOCATOR_LOOSE="LOCATOR_LOOSE",u.NUMBER="NUMBER",u.STRING="STRING",u.SECRET="SECRET",u.SHAPE="SHAPE",u.MAP="MAP",u))(ak||{}),xi=Ue,rk={lastUpdateCheck:{description:"Last timestamp we checked whether new Yarn versions were available",type:"STRING",default:null},yarnPath:{description:"Path to the local executable that must be used over the global one",type:"ABSOLUTE_PATH",default:null},ignorePath:{description:"If true, the local executable will be ignored when using the global one",type:"BOOLEAN",default:!1},ignoreCwd:{description:"If true, the `--cwd` flag will be ignored",type:"BOOLEAN",default:!1},cacheKeyOverride:{description:"A global cache key override; used only for test purposes",type:"STRING",default:null},globalFolder:{description:"Folder where all system-global files are stored",type:"ABSOLUTE_PATH",default:XD()},cacheFolder:{description:"Folder where the cache files must be written",type:"ABSOLUTE_PATH",default:"./.yarn/cache"},compressionLevel:{description:"Zip files compression level, from 0 to 9 or mixed (a variant of 9, which stores some files uncompressed, when compression doesn't yield good results)",type:"NUMBER",values:["mixed",0,1,2,3,4,5,6,7,8,9],default:Jl},virtualFolder:{description:"Folder where the virtual packages (cf doc) will be mapped on the disk (must be named __virtual__)",type:"ABSOLUTE_PATH",default:"./.yarn/__virtual__"},lockfileFilename:{description:"Name of the files where the Yarn dependency tree entries must be stored",type:"STRING",default:ok},installStatePath:{description:"Path of the file where the install state will be persisted",type:"ABSOLUTE_PATH",default:"./.yarn/install-state.gz"},immutablePatterns:{description:"Array of glob patterns; files matching them won't be allowed to change during immutable installs",type:"STRING",default:[],isArray:!0},rcFilename:{description:"Name of the files where the configuration can be found",type:"STRING",default:Ow()},enableGlobalCache:{description:"If true, the system-wide cache folder will be used regardless of `cache-folder`",type:"BOOLEAN",default:!1},enableColors:{description:"If true, the CLI is allowed to use colors in its output",type:"BOOLEAN",default:jy,defaultText:"<dynamic>"},enableHyperlinks:{description:"If true, the CLI is allowed to use hyperlinks in its output",type:"BOOLEAN",default:eP,defaultText:"<dynamic>"},enableInlineBuilds:{description:"If true, the CLI will print the build output on the command line",type:"BOOLEAN",default:Lw.isCI,defaultText:"<dynamic>"},enableMessageNames:{description:"If true, the CLI will prefix most messages with codes suitable for search engines",type:"BOOLEAN",default:!0},enableProgressBars:{description:"If true, the CLI is allowed to show a progress bar for long-running events",type:"BOOLEAN",default:!Lw.isCI,defaultText:"<dynamic>"},enableTimers:{description:"If true, the CLI is allowed to print the time spent executing commands",type:"BOOLEAN",default:!0},preferAggregateCacheInfo:{description:"If true, the CLI will only print a one-line report of any cache changes",type:"BOOLEAN",default:Lw.isCI},preferInteractive:{description:"If true, the CLI will automatically use the interactive mode when called from a TTY",type:"BOOLEAN",default:!1},preferTruncatedLines:{description:"If true, the CLI will truncate lines that would go beyond the size of the terminal",type:"BOOLEAN",default:!1},progressBarStyle:{description:"Which style of progress bar should be used (only when progress bars are enabled)",type:"STRING",default:void 0,defaultText:"<dynamic>"},defaultLanguageName:{description:"Default language mode that should be used when a package doesn't offer any insight",type:"STRING",default:"node"},defaultProtocol:{description:"Default resolution protocol used when resolving pure semver and tag ranges",type:"STRING",default:"npm:"},enableTransparentWorkspaces:{description:"If false, Yarn won't automatically resolve workspace dependencies unless they use the `workspace:` protocol",type:"BOOLEAN",default:!0},supportedArchitectures:{description:"Architectures that Yarn will fetch and inject into the resolver",type:"SHAPE",properties:{os:{description:"Array of supported process.platform strings, or null to target them all",type:"STRING",isArray:!0,isNullable:!0,default:["current"]},cpu:{description:"Array of supported process.arch strings, or null to target them all",type:"STRING",isArray:!0,isNullable:!0,default:["current"]},libc:{description:"Array of supported libc libraries, or null to target them all",type:"STRING",isArray:!0,isNullable:!0,default:["current"]}}},enableMirror:{description:"If true, the downloaded packages will be retrieved and stored in both the local and global folders",type:"BOOLEAN",default:!0},enableNetwork:{description:"If false, the package manager will refuse to use the network if required to",type:"BOOLEAN",default:!0},httpProxy:{description:"URL of the http proxy that must be used for outgoing http requests",type:"STRING",default:null},httpsProxy:{description:"URL of the http proxy that must be used for outgoing https requests",type:"STRING",default:null},unsafeHttpWhitelist:{description:"List of the hostnames for which http queries are allowed (glob patterns are supported)",type:"STRING",default:[],isArray:!0},httpTimeout:{description:"Timeout of each http request in milliseconds",type:"NUMBER",default:6e4},httpRetry:{description:"Retry times on http failure",type:"NUMBER",default:3},networkConcurrency:{description:"Maximal number of concurrent requests",type:"NUMBER",default:50},networkSettings:{description:"Network settings per hostname (glob patterns are supported)",type:"MAP",valueDefinition:{description:"",type:"SHAPE",properties:{caFilePath:{description:"Path to file containing one or multiple Certificate Authority signing certificates",type:"ABSOLUTE_PATH",default:null},enableNetwork:{description:"If false, the package manager will refuse to use the network if required to",type:"BOOLEAN",default:null},httpProxy:{description:"URL of the http proxy that must be used for outgoing http requests",type:"STRING",default:null},httpsProxy:{description:"URL of the http proxy that must be used for outgoing https requests",type:"STRING",default:null},httpsKeyFilePath:{description:"Path to file containing private key in PEM format",type:"ABSOLUTE_PATH",default:null},httpsCertFilePath:{description:"Path to file containing certificate chain in PEM format",type:"ABSOLUTE_PATH",default:null}}}},caFilePath:{description:"A path to a file containing one or multiple Certificate Authority signing certificates",type:"ABSOLUTE_PATH",default:null},httpsKeyFilePath:{description:"Path to file containing private key in PEM format",type:"ABSOLUTE_PATH",default:null},httpsCertFilePath:{description:"Path to file containing certificate chain in PEM format",type:"ABSOLUTE_PATH",default:null},enableStrictSsl:{description:"If false, SSL certificate errors will be ignored",type:"BOOLEAN",default:!0},logFilters:{description:"Overrides for log levels",type:"SHAPE",isArray:!0,concatenateValues:!0,properties:{code:{description:"Code of the messages covered by this override",type:"STRING",default:void 0},text:{description:"Code of the texts covered by this override",type:"STRING",default:void 0},pattern:{description:"Code of the patterns covered by this override",type:"STRING",default:void 0},level:{description:"Log level override, set to null to remove override",type:"STRING",values:Object.values(Jy),isNullable:!0,default:void 0}}},enableTelemetry:{description:"If true, telemetry will be periodically sent, following the rules in https://yarnpkg.com/advanced/telemetry",type:"BOOLEAN",default:!0},telemetryInterval:{description:"Minimal amount of time between two telemetry uploads, in days",type:"NUMBER",default:7},telemetryUserId:{description:"If you desire to tell us which project you are, you can set this field. Completely optional and opt-in.",type:"STRING",default:null},enableScripts:{description:"If true, packages are allowed to have install scripts by default",type:"BOOLEAN",default:!0},enableStrictSettings:{description:"If true, unknown settings will cause Yarn to abort",type:"BOOLEAN",default:!0},enableImmutableCache:{description:"If true, the cache is reputed immutable and actions that would modify it will throw",type:"BOOLEAN",default:!1},checksumBehavior:{description:"Enumeration defining what to do when a checksum doesn't match expectations",type:"STRING",default:"throw"},packageExtensions:{description:"Map of package corrections to apply on the dependency tree",type:"MAP",valueDefinition:{description:"The extension that will be applied to any package whose version matches the specified range",type:"SHAPE",properties:{dependencies:{description:"The set of dependencies that must be made available to the current package in order for it to work properly",type:"MAP",valueDefinition:{description:"A range",type:"STRING"}},peerDependencies:{description:"Inherited dependencies - the consumer of the package will be tasked to provide them",type:"MAP",valueDefinition:{description:"A semver range",type:"STRING"}},peerDependenciesMeta:{description:"Extra information related to the dependencies listed in the peerDependencies field",type:"MAP",valueDefinition:{description:"The peerDependency meta",type:"SHAPE",properties:{optional:{description:"If true, the selected peer dependency will be marked as optional by the package manager and the consumer omitting it won't be reported as an error",type:"BOOLEAN",default:!1}}}}}}}};function Ak(r,e,t,i,n){if(i.isArray||i.type==="ANY"&&Array.isArray(t))return Array.isArray(t)?t.map((s,o)=>ik(r,`${e}[${o}]`,s,i,n)):String(t).split(/,/).map(s=>ik(r,e,s,i,n));if(Array.isArray(t))throw new Error(`Non-array configuration settings "${e}" cannot be an array`);return ik(r,e,t,i,n)}function ik(r,e,t,i,n){var a;switch(i.type){case"ANY":return t;case"SHAPE":return Lve(r,e,t,i,n);case"MAP":return Tve(r,e,t,i,n)}if(t===null&&!i.isNullable&&i.default!==null)throw new Error(`Non-nullable configuration settings "${e}" cannot be set to null`);if((a=i.values)!=null&&a.includes(t))return t;let o=(()=>{if(i.type==="BOOLEAN"&&typeof t!="string")return qd(t);if(typeof t!="string")throw new Error(`Expected value (${t}) to be a string`);let l=Wx(t,{env:process.env});switch(i.type){case"ABSOLUTE_PATH":return x.resolve(n,K.toPortablePath(l));case"LOCATOR_LOOSE":return Sc(l,!1);case"NUMBER":return parseInt(l);case"LOCATOR":return Sc(l);case"BOOLEAN":return qd(l);default:return l}})();if(i.values&&!i.values.includes(o))throw new Error(`Invalid value, expected one of ${i.values.join(", ")}`);return o}function Lve(r,e,t,i,n){if(typeof t!="object"||Array.isArray(t))throw new be(`Object configuration settings "${e}" must be an object`);let s=lk(r,i,{ignoreArrays:!0});if(t===null)return s;for(let[o,a]of Object.entries(t)){let l=`${e}.${o}`;if(!i.properties[o])throw new be(`Unrecognized configuration settings found: ${e}.${o} - run "yarn config -v" to see the list of settings supported in Yarn`);s.set(o,Ak(r,l,a,i.properties[o],n))}return s}function Tve(r,e,t,i,n){let s=new Map;if(typeof t!="object"||Array.isArray(t))throw new be(`Map configuration settings "${e}" must be an object`);if(t===null)return s;for(let[o,a]of Object.entries(t)){let l=i.normalizeKeys?i.normalizeKeys(o):o,c=`${e}['${l}']`,u=i.valueDefinition;s.set(l,Ak(r,c,a,u,n))}return s}function lk(r,e,{ignoreArrays:t=!1}={}){switch(e.type){case"SHAPE":{if(e.isArray&&!t)return[];let i=new Map;for(let[n,s]of Object.entries(e.properties))i.set(n,lk(r,s));return i}break;case"MAP":return e.isArray&&!t?[]:new Map;case"ABSOLUTE_PATH":return e.default===null?null:r.projectCwd===null?x.isAbsolute(e.default)?x.normalize(e.default):e.isNullable?null:void 0:Array.isArray(e.default)?e.default.map(i=>x.resolve(r.projectCwd,i)):x.resolve(r.projectCwd,e.default);default:return e.default}}function Tw(r,e,t){if(e.type==="SECRET"&&typeof r=="string"&&t.hideSecrets)return Nve;if(e.type==="ABSOLUTE_PATH"&&typeof r=="string"&&t.getNativePaths)return K.fromPortablePath(r);if(e.isArray&&Array.isArray(r)){let i=[];for(let n of r)i.push(Tw(n,e,t));return i}if(e.type==="MAP"&&r instanceof Map){let i=new Map;for(let[n,s]of r.entries())i.set(n,Tw(s,e.valueDefinition,t));return i}if(e.type==="SHAPE"&&r instanceof Map){let i=new Map;for(let[n,s]of r.entries()){let o=e.properties[n];i.set(n,Tw(s,o,t))}return i}return r}function Ove(){let r={};for(let[e,t]of Object.entries(process.env))e=e.toLowerCase(),e.startsWith(Mw)&&(e=(0,fz.default)(e.slice(Mw.length)),r[e]=t);return r}function Ow(){let r=`${Mw}rc_filename`;for(let[e,t]of Object.entries(process.env))if(e.toLowerCase()===r&&typeof t=="string")return t;return sk}var ck=(i=>(i[i.LOCKFILE=0]="LOCKFILE",i[i.MANIFEST=1]="MANIFEST",i[i.NONE=2]="NONE",i))(ck||{}),Ka=class{constructor(e){this.projectCwd=null;this.plugins=new Map;this.settings=new Map;this.values=new Map;this.sources=new Map;this.invalid=new Map;this.packageExtensions=new Map;this.limits=new Map;this.startingCwd=e}static create(e,t,i){let n=new Ka(e);typeof t<"u"&&!(t instanceof Map)&&(n.projectCwd=t),n.importSettings(rk);let s=typeof i<"u"?i:t instanceof Map?t:new Map;for(let[o,a]of s)n.activatePlugin(o,a);return n}static async find(e,t,{lookup:i=0,strict:n=!0,usePath:s=!1,useRc:o=!0}={}){let a=Ove();delete a.rcFilename;let l=await Ka.findRcFiles(e),c=await Ka.findHomeRcFile();if(c){let B=l.find(v=>v.path===c.path);B?B.strict=!1:l.push({...c,strict:!1})}let u=({ignoreCwd:B,yarnPath:v,ignorePath:D,lockfileFilename:L})=>({ignoreCwd:B,yarnPath:v,ignorePath:D,lockfileFilename:L}),g=({ignoreCwd:B,yarnPath:v,ignorePath:D,lockfileFilename:L,...H})=>H,f=new Ka(e);f.importSettings(u(rk)),f.useWithSource("<environment>",u(a),e,{strict:!1});for(let{path:B,cwd:v,data:D}of l)f.useWithSource(B,u(D),v,{strict:!1});if(s){let B=f.get("yarnPath"),v=f.get("ignorePath");if(B!==null&&!v)return f}let h=f.get("lockfileFilename"),p;switch(i){case 0:p=await Ka.findProjectCwd(e,h);break;case 1:p=await Ka.findProjectCwd(e,null);break;case 2:M.existsSync(x.join(e,"package.json"))?p=x.resolve(e):p=null;break}f.startingCwd=e,f.projectCwd=p,f.importSettings(g(rk));let C=new Map([["@@core",B8]]),y=B=>"default"in B?B.default:B;if(t!==null){for(let L of t.plugins.keys())C.set(L,y(t.modules.get(L)));let B=new Map;for(let L of _D())B.set(L,()=>pf(L));for(let[L,H]of t.modules)B.set(L,()=>H);let v=new Set,D=async(L,H)=>{let{factory:j,name:$}=pf(L);if(v.has($))return;let V=new Map(B),W=A=>{if(V.has(A))return V.get(A)();throw new be(`This plugin cannot access the package referenced via ${A} which is neither a builtin, nor an exposed entry`)},_=await ff(async()=>y(await j(W)),A=>`${A} (when initializing ${$}, defined in ${H})`);B.set($,()=>_),v.add($),C.set($,_)};if(a.plugins)for(let L of a.plugins.split(";")){let H=x.resolve(e,K.toPortablePath(L));await D(H,"<environment>")}for(let{path:L,cwd:H,data:j}of l)if(!!o&&!!Array.isArray(j.plugins))for(let $ of j.plugins){let V=typeof $!="string"?$.path:$,W=x.resolve(H,K.toPortablePath(V));await D(W,L)}}for(let[B,v]of C)f.activatePlugin(B,v);f.useWithSource("<environment>",g(a),e,{strict:n});for(let{path:B,cwd:v,data:D,strict:L}of l)f.useWithSource(B,g(D),v,{strict:L!=null?L:n});return f.get("enableGlobalCache")&&(f.values.set("cacheFolder",`${f.get("globalFolder")}/cache`),f.sources.set("cacheFolder","<internal>")),await f.refreshPackageExtensions(),f}static async findRcFiles(e){let t=Ow(),i=[],n=e,s=null;for(;n!==s;){s=n;let o=x.join(s,t);if(M.existsSync(o)){let a=await M.readFilePromise(o,"utf8"),l;try{l=yi(a)}catch{let u="";throw a.match(/^\s+(?!-)[^:]+\s+\S+/m)&&(u=" (in particular, make sure you list the colons after each key name)"),new be(`Parse error when loading ${o}; please check it's proper Yaml${u}`)}i.push({path:o,cwd:s,data:l})}n=x.dirname(s)}return i}static async findHomeRcFile(){let e=Ow(),t=gC(),i=x.join(t,e);if(M.existsSync(i)){let n=await M.readFilePromise(i,"utf8"),s=yi(n);return{path:i,cwd:t,data:s}}return null}static async findProjectCwd(e,t){let i=null,n=e,s=null;for(;n!==s;){if(s=n,M.existsSync(x.join(s,"package.json"))&&(i=s),t!==null){if(M.existsSync(x.join(s,t))){i=s;break}}else if(i!==null)break;n=x.dirname(s)}return i}static async updateConfiguration(e,t){let i=Ow(),n=x.join(e,i),s=M.existsSync(n)?yi(await M.readFilePromise(n,"utf8")):{},o=!1,a;if(typeof t=="function"){try{a=t(s)}catch{a=t({})}if(a===s)return}else{a=s;for(let l of Object.keys(t)){let c=s[l],u=t[l],g;if(typeof u=="function")try{g=u(c)}catch{g=u(void 0)}else g=u;c!==g&&(a[l]=g,o=!0)}if(!o)return}await M.changeFilePromise(n,wa(a),{automaticNewlines:!0})}static async updateHomeConfiguration(e){let t=gC();return await Ka.updateConfiguration(t,e)}activatePlugin(e,t){this.plugins.set(e,t),typeof t.configuration<"u"&&this.importSettings(t.configuration)}importSettings(e){for(let[t,i]of Object.entries(e))if(i!=null){if(this.settings.has(t))throw new Error(`Cannot redefine settings "${t}"`);this.settings.set(t,i),this.values.set(t,lk(this,i))}}useWithSource(e,t,i,n){try{this.use(e,t,i,n)}catch(s){throw s.message+=` (in ${$e(this,e,Ue.PATH)})`,s}}use(e,t,i,{strict:n=!0,overwrite:s=!1}={}){n=n&&this.get("enableStrictSettings");for(let o of["enableStrictSettings",...Object.keys(t)]){if(typeof t[o]>"u"||o==="plugins"||e==="<environment>"&&Fve.has(o))continue;if(o==="rcFilename")throw new be(`The rcFilename settings can only be set via ${`${Mw}RC_FILENAME`.toUpperCase()}, not via a rc file`);let l=this.settings.get(o);if(!l){if(n)throw new be(`Unrecognized or legacy configuration settings found: ${o} - run "yarn config -v" to see the list of settings supported in Yarn`);this.invalid.set(o,e);continue}if(this.sources.has(o)&&!(s||l.type==="MAP"||l.isArray&&l.concatenateValues))continue;let c;try{c=Ak(this,o,t[o],l,i)}catch(u){throw u.message+=` in ${$e(this,e,Ue.PATH)}`,u}if(o==="enableStrictSettings"&&e!=="<environment>"){n=c;continue}if(l.type==="MAP"){let u=this.values.get(o);this.values.set(o,new Map(s?[...u,...c]:[...c,...u])),this.sources.set(o,`${this.sources.get(o)}, ${e}`)}else if(l.isArray&&l.concatenateValues){let u=this.values.get(o);this.values.set(o,s?[...u,...c]:[...c,...u]),this.sources.set(o,`${this.sources.get(o)}, ${e}`)}else this.values.set(o,c),this.sources.set(o,e)}}get(e){if(!this.values.has(e))throw new Error(`Invalid configuration key "${e}"`);return this.values.get(e)}getSpecial(e,{hideSecrets:t=!1,getNativePaths:i=!1}){let n=this.get(e),s=this.settings.get(e);if(typeof s>"u")throw new be(`Couldn't find a configuration settings named "${e}"`);return Tw(n,s,{hideSecrets:t,getNativePaths:i})}getSubprocessStreams(e,{header:t,prefix:i,report:n}){let s,o,a=M.createWriteStream(e);if(this.get("enableInlineBuilds")){let l=n.createStreamReporter(`${i} ${$e(this,"STDOUT","green")}`),c=n.createStreamReporter(`${i} ${$e(this,"STDERR","red")}`);s=new nk.PassThrough,s.pipe(l),s.pipe(a),o=new nk.PassThrough,o.pipe(c),o.pipe(a)}else s=a,o=a,typeof t<"u"&&s.write(`${t}
-`);return{stdout:s,stderr:o}}makeResolver(){let e=[];for(let t of this.plugins.values())for(let i of t.resolvers||[])e.push(new i);return new xf([new uC,new jr,new Dw,...e])}makeFetcher(){let e=[];for(let t of this.plugins.values())for(let i of t.fetchers||[])e.push(new i);return new vf([new Df,new Rf,...e])}getLinkers(){let e=[];for(let t of this.plugins.values())for(let i of t.linkers||[])e.push(new i);return e}getSupportedArchitectures(){let e=fC(),t=this.get("supportedArchitectures"),i=t.get("os");i!==null&&(i=i.map(o=>o==="current"?e.os:o));let n=t.get("cpu");n!==null&&(n=n.map(o=>o==="current"?e.cpu:o));let s=t.get("libc");return s!==null&&(s=Uo(s,o=>{var a;return o==="current"?(a=e.libc)!=null?a:Uo.skip:o})),{os:i,cpu:n,libc:s}}async refreshPackageExtensions(){this.packageExtensions=new Map;let e=this.packageExtensions,t=(i,n,{userProvided:s=!1}={})=>{if(!io(i.range))throw new Error("Only semver ranges are allowed as keys for the packageExtensions setting");let o=new ot;o.load(n,{yamlCompatibilityMode:!0});let a=uf(e,i.identHash),l=[];a.push([i.range,l]);let c={status:"inactive",userProvided:s,parentDescriptor:i};for(let u of o.dependencies.values())l.push({...c,type:"Dependency",descriptor:u});for(let u of o.peerDependencies.values())l.push({...c,type:"PeerDependency",descriptor:u});for(let[u,g]of o.peerDependenciesMeta)for(let[f,h]of Object.entries(g))l.push({...c,type:"PeerDependencyMeta",selector:u,key:f,value:h})};await this.triggerHook(i=>i.registerPackageExtensions,this,t);for(let[i,n]of this.get("packageExtensions"))t(JA(i,!0),Gy(n),{userProvided:!0})}normalizePackage(e){let t=eC(e);if(this.packageExtensions==null)throw new Error("refreshPackageExtensions has to be called before normalizing packages");let i=this.packageExtensions.get(e.identHash);if(typeof i<"u"){let s=e.version;if(s!==null){for(let[o,a]of i)if(!!vc(s,o))for(let l of a)switch(l.status==="inactive"&&(l.status="redundant"),l.type){case"Dependency":typeof t.dependencies.get(l.descriptor.identHash)>"u"&&(l.status="active",t.dependencies.set(l.descriptor.identHash,l.descriptor));break;case"PeerDependency":typeof t.peerDependencies.get(l.descriptor.identHash)>"u"&&(l.status="active",t.peerDependencies.set(l.descriptor.identHash,l.descriptor));break;case"PeerDependencyMeta":{let c=t.peerDependenciesMeta.get(l.selector);(typeof c>"u"||!Object.prototype.hasOwnProperty.call(c,l.key)||c[l.key]!==l.value)&&(l.status="active",Fa(t.peerDependenciesMeta,l.selector,()=>({}))[l.key]=l.value)}break;default:qx(l);break}}}let n=s=>s.scope?`${s.scope}__${s.name}`:`${s.name}`;for(let s of t.peerDependenciesMeta.keys()){let o=$i(s);t.peerDependencies.has(o.identHash)||t.peerDependencies.set(o.identHash,_t(o,"*"))}for(let s of t.peerDependencies.values()){if(s.scope==="types")continue;let o=n(s),a=qo("types",o),l=Ot(a);t.peerDependencies.has(a.identHash)||t.peerDependenciesMeta.has(l)||(t.peerDependencies.set(a.identHash,_t(a,"*")),t.peerDependenciesMeta.set(l,{optional:!0}))}return t.dependencies=new Map(wn(t.dependencies,([,s])=>Qn(s))),t.peerDependencies=new Map(wn(t.peerDependencies,([,s])=>Qn(s))),t}getLimit(e){return Fa(this.limits,e,()=>(0,hz.default)(this.get(e)))}async triggerHook(e,...t){for(let i of this.plugins.values()){let n=i.hooks;if(!n)continue;let s=e(n);!s||await s(...t)}}async triggerMultipleHooks(e,t){for(let i of t)await this.triggerHook(e,...i)}async reduceHook(e,t,...i){let n=t;for(let s of this.plugins.values()){let o=s.hooks;if(!o)continue;let a=e(o);!a||(n=await a(n,...i))}return n}async firstHook(e,...t){for(let i of this.plugins.values()){let n=i.hooks;if(!n)continue;let s=e(n);if(!s)continue;let o=await s(...t);if(typeof o<"u")return o}return null}},ye=Ka;ye.telemetry=null;var hk=(i=>(i[i.Never=0]="Never",i[i.ErrorCode=1]="ErrorCode",i[i.Always=2]="Always",i))(hk||{}),hC=class extends at{constructor({fileName:t,code:i,signal:n}){let s=ye.create(x.cwd()),o=$e(s,t,Ue.PATH);super(1,`Child ${o} reported an error`,a=>{Kve(i,n,{configuration:s,report:a})});this.code=pk(i,n)}},Kw=class extends hC{constructor({fileName:t,code:i,signal:n,stdout:s,stderr:o}){super({fileName:t,code:i,signal:n});this.stdout=s,this.stderr=o}};function Dc(r){return r!==null&&typeof r.fd=="number"}var kc=new Set;function uk(){}function gk(){for(let r of kc)r.kill()}async function Wo(r,e,{cwd:t,env:i=process.env,strict:n=!1,stdin:s=null,stdout:o,stderr:a,end:l=2}){let c=["pipe","pipe","pipe"];s===null?c[0]="ignore":Dc(s)&&(c[0]=s),Dc(o)&&(c[1]=o),Dc(a)&&(c[2]=a);let u=(0,fk.default)(r,e,{cwd:K.fromPortablePath(t),env:{...i,PWD:K.fromPortablePath(t)},stdio:c});kc.add(u),kc.size===1&&(process.on("SIGINT",uk),process.on("SIGTERM",gk)),!Dc(s)&&s!==null&&s.pipe(u.stdin),Dc(o)||u.stdout.pipe(o,{end:!1}),Dc(a)||u.stderr.pipe(a,{end:!1});let g=()=>{for(let f of new Set([o,a]))Dc(f)||f.end()};return new Promise((f,h)=>{u.on("error",p=>{kc.delete(u),kc.size===0&&(process.off("SIGINT",uk),process.off("SIGTERM",gk)),(l===2||l===1)&&g(),h(p)}),u.on("close",(p,C)=>{kc.delete(u),kc.size===0&&(process.off("SIGINT",uk),process.off("SIGTERM",gk)),(l===2||l===1&&p>0)&&g(),p===0||!n?f({code:pk(p,C)}):h(new hC({fileName:r,code:p,signal:C}))})})}async function tk(r,e,{cwd:t,env:i=process.env,encoding:n="utf8",strict:s=!1}){let o=["ignore","pipe","pipe"],a=[],l=[],c=K.fromPortablePath(t);typeof i.PWD<"u"&&(i={...i,PWD:c});let u=(0,fk.default)(r,e,{cwd:c,env:i,stdio:o});return u.stdout.on("data",g=>{a.push(g)}),u.stderr.on("data",g=>{l.push(g)}),await new Promise((g,f)=>{u.on("error",h=>{let p=ye.create(t),C=$e(p,r,Ue.PATH);f(new at(1,`Process ${C} failed to spawn`,y=>{y.reportError(1,`  ${Ho(p,{label:"Thrown Error",value:ro(Ue.NO_HINT,h.message)})}`)}))}),u.on("close",(h,p)=>{let C=n==="buffer"?Buffer.concat(a):Buffer.concat(a).toString(n),y=n==="buffer"?Buffer.concat(l):Buffer.concat(l).toString(n);h===0||!s?g({code:pk(h,p),stdout:C,stderr:y}):f(new Kw({fileName:r,code:h,signal:p,stdout:C,stderr:y}))})})}var Mve=new Map([["SIGINT",2],["SIGQUIT",3],["SIGKILL",9],["SIGTERM",15]]);function pk(r,e){let t=Mve.get(e);return typeof t<"u"?128+t:r!=null?r:1}function Kve(r,e,{configuration:t,report:i}){i.reportError(1,`  ${Ho(t,r!==null?{label:"Exit Code",value:ro(Ue.NUMBER,r)}:{label:"Exit Signal",value:ro(Ue.CODE,e)})}`)}var Xt={};ut(Xt,{Method:()=>V6,RequestError:()=>X6.RequestError,del:()=>_De,get:()=>XDe,getNetworkSettings:()=>z6,post:()=>kR,put:()=>ZDe,request:()=>bC});var q6=Pe(fB()),J6=J("https"),W6=J("http"),DR=Pe(yn()),PR=Pe(H6()),hB=J("url");var X6=Pe(fB()),G6=new Map,Y6=new Map,WDe=new W6.Agent({keepAlive:!0}),zDe=new J6.Agent({keepAlive:!0});function j6(r){let e=new hB.URL(r),t={host:e.hostname,headers:{}};return e.port&&(t.port=Number(e.port)),{proxy:t}}async function xR(r){return Fa(Y6,r,()=>M.readFilePromise(r).then(e=>(Y6.set(r,e),e)))}function VDe({statusCode:r,statusMessage:e},t){let i=$e(t,r,Ue.NUMBER),n=`https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/${r}`;return Cf(t,`${i}${e?` (${e})`:""}`,n)}async function pB(r,{configuration:e,customErrorMessage:t}){var i,n;try{return await r}catch(s){if(s.name!=="HTTPError")throw s;let o=(n=t==null?void 0:t(s))!=null?n:(i=s.response.body)==null?void 0:i.error;o==null&&(s.message.startsWith("Response code")?o="The remote server failed to provide the requested resource":o=s.message),s instanceof q6.TimeoutError&&s.event==="socket"&&(o+=`(can be increased via ${$e(e,"httpTimeout",Ue.SETTING)})`);let a=new at(35,o,l=>{s.response&&l.reportError(35,`  ${Ho(e,{label:"Response Code",value:ro(Ue.NO_HINT,VDe(s.response,e))})}`),s.request&&(l.reportError(35,`  ${Ho(e,{label:"Request Method",value:ro(Ue.NO_HINT,s.request.options.method)})}`),l.reportError(35,`  ${Ho(e,{label:"Request URL",value:ro(Ue.URL,s.request.requestUrl)})}`)),s.request.redirects.length>0&&l.reportError(35,`  ${Ho(e,{label:"Request Redirects",value:ro(Ue.NO_HINT,tP(e,s.request.redirects,Ue.URL))})}`),s.request.retryCount===s.request.options.retry.limit&&l.reportError(35,`  ${Ho(e,{label:"Request Retry Count",value:ro(Ue.NO_HINT,`${$e(e,s.request.retryCount,Ue.NUMBER)} (can be increased via ${$e(e,"httpRetry",Ue.SETTING)})`)})}`)});throw a.originalError=s,a}}function z6(r,e){let t=[...e.configuration.get("networkSettings")].sort(([o],[a])=>a.length-o.length),i={enableNetwork:void 0,caFilePath:void 0,httpProxy:void 0,httpsProxy:void 0,httpsKeyFilePath:void 0,httpsCertFilePath:void 0},n=Object.keys(i),s=typeof r=="string"?new hB.URL(r):r;for(let[o,a]of t)if(DR.default.isMatch(s.hostname,o))for(let l of n){let c=a.get(l);c!==null&&typeof i[l]>"u"&&(i[l]=c)}for(let o of n)typeof i[o]>"u"&&(i[o]=e.configuration.get(o));return i}var V6=(n=>(n.GET="GET",n.PUT="PUT",n.POST="POST",n.DELETE="DELETE",n))(V6||{});async function bC(r,e,{configuration:t,headers:i,jsonRequest:n,jsonResponse:s,method:o="GET"}){let a=async()=>await $De(r,e,{configuration:t,headers:i,jsonRequest:n,jsonResponse:s,method:o});return await(await t.reduceHook(c=>c.wrapNetworkRequest,a,{target:r,body:e,configuration:t,headers:i,jsonRequest:n,jsonResponse:s,method:o}))()}async function XDe(r,{configuration:e,jsonResponse:t,...i}){let n=Fa(G6,r,()=>pB(bC(r,null,{configuration:e,...i}),{configuration:e}).then(s=>(G6.set(r,s.body),s.body)));return Buffer.isBuffer(n)===!1&&(n=await n),t?JSON.parse(n.toString()):n}async function ZDe(r,e,{customErrorMessage:t,...i}){return(await pB(bC(r,e,{...i,method:"PUT"}),i)).body}async function kR(r,e,{customErrorMessage:t,...i}){return(await pB(bC(r,e,{...i,method:"POST"}),i)).body}async function _De(r,{customErrorMessage:e,...t}){return(await pB(bC(r,null,{...t,method:"DELETE"}),t)).body}async function $De(r,e,{configuration:t,headers:i,jsonRequest:n,jsonResponse:s,method:o="GET"}){let a=typeof r=="string"?new hB.URL(r):r,l=z6(a,{configuration:t});if(l.enableNetwork===!1)throw new Error(`Request to '${a.href}' has been blocked because of your configuration settings`);if(a.protocol==="http:"&&!DR.default.isMatch(a.hostname,t.get("unsafeHttpWhitelist")))throw new Error(`Unsafe http requests must be explicitly whitelisted in your configuration (${a.hostname})`);let u={agent:{http:l.httpProxy?PR.default.httpOverHttp(j6(l.httpProxy)):WDe,https:l.httpsProxy?PR.default.httpsOverHttp(j6(l.httpsProxy)):zDe},headers:i,method:o};u.responseType=s?"json":"buffer",e!==null&&(Buffer.isBuffer(e)||!n&&typeof e=="string"?u.body=e:u.json=e);let g=t.get("httpTimeout"),f=t.get("httpRetry"),h=t.get("enableStrictSsl"),p=l.caFilePath,C=l.httpsCertFilePath,y=l.httpsKeyFilePath,{default:B}=await Promise.resolve().then(()=>Pe(fB())),v=p?await xR(p):void 0,D=C?await xR(C):void 0,L=y?await xR(y):void 0,H=B.extend({timeout:{socket:g},retry:f,https:{rejectUnauthorized:h,certificateAuthority:v,certificate:D,key:L},...u});return t.getLimit("networkConcurrency")(()=>H(a))}var Wt={};ut(Wt,{PackageManager:()=>A7,detectPackageManager:()=>l7,executePackageAccessibleBinary:()=>h7,executePackageScript:()=>kB,executePackageShellcode:()=>JR,executeWorkspaceAccessibleBinary:()=>mRe,executeWorkspaceLifecycleScript:()=>g7,executeWorkspaceScript:()=>u7,getPackageAccessibleBinaries:()=>RB,getWorkspaceAccessibleBinaries:()=>f7,hasPackageScript:()=>pRe,hasWorkspaceScript:()=>WR,makeScriptEnv:()=>kC,maybeExecuteWorkspaceLifecycleScript:()=>CRe,prepareExternalProject:()=>hRe});var SC={};ut(SC,{getLibzipPromise:()=>sn,getLibzipSync:()=>rV});var tV=Pe(_6());var ja=["number","number"],$6=(F=>(F[F.ZIP_ER_OK=0]="ZIP_ER_OK",F[F.ZIP_ER_MULTIDISK=1]="ZIP_ER_MULTIDISK",F[F.ZIP_ER_RENAME=2]="ZIP_ER_RENAME",F[F.ZIP_ER_CLOSE=3]="ZIP_ER_CLOSE",F[F.ZIP_ER_SEEK=4]="ZIP_ER_SEEK",F[F.ZIP_ER_READ=5]="ZIP_ER_READ",F[F.ZIP_ER_WRITE=6]="ZIP_ER_WRITE",F[F.ZIP_ER_CRC=7]="ZIP_ER_CRC",F[F.ZIP_ER_ZIPCLOSED=8]="ZIP_ER_ZIPCLOSED",F[F.ZIP_ER_NOENT=9]="ZIP_ER_NOENT",F[F.ZIP_ER_EXISTS=10]="ZIP_ER_EXISTS",F[F.ZIP_ER_OPEN=11]="ZIP_ER_OPEN",F[F.ZIP_ER_TMPOPEN=12]="ZIP_ER_TMPOPEN",F[F.ZIP_ER_ZLIB=13]="ZIP_ER_ZLIB",F[F.ZIP_ER_MEMORY=14]="ZIP_ER_MEMORY",F[F.ZIP_ER_CHANGED=15]="ZIP_ER_CHANGED",F[F.ZIP_ER_COMPNOTSUPP=16]="ZIP_ER_COMPNOTSUPP",F[F.ZIP_ER_EOF=17]="ZIP_ER_EOF",F[F.ZIP_ER_INVAL=18]="ZIP_ER_INVAL",F[F.ZIP_ER_NOZIP=19]="ZIP_ER_NOZIP",F[F.ZIP_ER_INTERNAL=20]="ZIP_ER_INTERNAL",F[F.ZIP_ER_INCONS=21]="ZIP_ER_INCONS",F[F.ZIP_ER_REMOVE=22]="ZIP_ER_REMOVE",F[F.ZIP_ER_DELETED=23]="ZIP_ER_DELETED",F[F.ZIP_ER_ENCRNOTSUPP=24]="ZIP_ER_ENCRNOTSUPP",F[F.ZIP_ER_RDONLY=25]="ZIP_ER_RDONLY",F[F.ZIP_ER_NOPASSWD=26]="ZIP_ER_NOPASSWD",F[F.ZIP_ER_WRONGPASSWD=27]="ZIP_ER_WRONGPASSWD",F[F.ZIP_ER_OPNOTSUPP=28]="ZIP_ER_OPNOTSUPP",F[F.ZIP_ER_INUSE=29]="ZIP_ER_INUSE",F[F.ZIP_ER_TELL=30]="ZIP_ER_TELL",F[F.ZIP_ER_COMPRESSED_DATA=31]="ZIP_ER_COMPRESSED_DATA",F))($6||{}),eV=r=>({get HEAP8(){return r.HEAP8},get HEAPU8(){return r.HEAPU8},errors:$6,SEEK_SET:0,SEEK_CUR:1,SEEK_END:2,ZIP_CHECKCONS:4,ZIP_CREATE:1,ZIP_EXCL:2,ZIP_TRUNCATE:8,ZIP_RDONLY:16,ZIP_FL_OVERWRITE:8192,ZIP_FL_COMPRESSED:4,ZIP_OPSYS_DOS:0,ZIP_OPSYS_AMIGA:1,ZIP_OPSYS_OPENVMS:2,ZIP_OPSYS_UNIX:3,ZIP_OPSYS_VM_CMS:4,ZIP_OPSYS_ATARI_ST:5,ZIP_OPSYS_OS_2:6,ZIP_OPSYS_MACINTOSH:7,ZIP_OPSYS_Z_SYSTEM:8,ZIP_OPSYS_CPM:9,ZIP_OPSYS_WINDOWS_NTFS:10,ZIP_OPSYS_MVS:11,ZIP_OPSYS_VSE:12,ZIP_OPSYS_ACORN_RISC:13,ZIP_OPSYS_VFAT:14,ZIP_OPSYS_ALTERNATE_MVS:15,ZIP_OPSYS_BEOS:16,ZIP_OPSYS_TANDEM:17,ZIP_OPSYS_OS_400:18,ZIP_OPSYS_OS_X:19,ZIP_CM_DEFAULT:-1,ZIP_CM_STORE:0,ZIP_CM_DEFLATE:8,uint08S:r._malloc(1),uint16S:r._malloc(2),uint32S:r._malloc(4),uint64S:r._malloc(8),malloc:r._malloc,free:r._free,getValue:r.getValue,open:r.cwrap("zip_open","number",["string","number","number"]),openFromSource:r.cwrap("zip_open_from_source","number",["number","number","number"]),close:r.cwrap("zip_close","number",["number"]),discard:r.cwrap("zip_discard",null,["number"]),getError:r.cwrap("zip_get_error","number",["number"]),getName:r.cwrap("zip_get_name","string",["number","number","number"]),getNumEntries:r.cwrap("zip_get_num_entries","number",["number","number"]),delete:r.cwrap("zip_delete","number",["number","number"]),stat:r.cwrap("zip_stat","number",["number","string","number","number"]),statIndex:r.cwrap("zip_stat_index","number",["number",...ja,"number","number"]),fopen:r.cwrap("zip_fopen","number",["number","string","number"]),fopenIndex:r.cwrap("zip_fopen_index","number",["number",...ja,"number"]),fread:r.cwrap("zip_fread","number",["number","number","number","number"]),fclose:r.cwrap("zip_fclose","number",["number"]),dir:{add:r.cwrap("zip_dir_add","number",["number","string"])},file:{add:r.cwrap("zip_file_add","number",["number","string","number","number"]),getError:r.cwrap("zip_file_get_error","number",["number"]),getExternalAttributes:r.cwrap("zip_file_get_external_attributes","number",["number",...ja,"number","number","number"]),setExternalAttributes:r.cwrap("zip_file_set_external_attributes","number",["number",...ja,"number","number","number"]),setMtime:r.cwrap("zip_file_set_mtime","number",["number",...ja,"number","number"]),setCompression:r.cwrap("zip_set_file_compression","number",["number",...ja,"number","number"])},ext:{countSymlinks:r.cwrap("zip_ext_count_symlinks","number",["number"])},error:{initWithCode:r.cwrap("zip_error_init_with_code",null,["number","number"]),strerror:r.cwrap("zip_error_strerror","string",["number"])},name:{locate:r.cwrap("zip_name_locate","number",["number","string","number"])},source:{fromUnattachedBuffer:r.cwrap("zip_source_buffer_create","number",["number",...ja,"number","number"]),fromBuffer:r.cwrap("zip_source_buffer","number",["number","number",...ja,"number"]),free:r.cwrap("zip_source_free",null,["number"]),keep:r.cwrap("zip_source_keep",null,["number"]),open:r.cwrap("zip_source_open","number",["number"]),close:r.cwrap("zip_source_close","number",["number"]),seek:r.cwrap("zip_source_seek","number",["number",...ja,"number"]),tell:r.cwrap("zip_source_tell","number",["number"]),read:r.cwrap("zip_source_read","number",["number","number","number"]),error:r.cwrap("zip_source_error","number",["number"]),setMtime:r.cwrap("zip_source_set_mtime","number",["number","number"])},struct:{stat:r.cwrap("zipstruct_stat","number",[]),statS:r.cwrap("zipstruct_statS","number",[]),statName:r.cwrap("zipstruct_stat_name","string",["number"]),statIndex:r.cwrap("zipstruct_stat_index","number",["number"]),statSize:r.cwrap("zipstruct_stat_size","number",["number"]),statCompSize:r.cwrap("zipstruct_stat_comp_size","number",["number"]),statCompMethod:r.cwrap("zipstruct_stat_comp_method","number",["number"]),statMtime:r.cwrap("zipstruct_stat_mtime","number",["number"]),statCrc:r.cwrap("zipstruct_stat_crc","number",["number"]),error:r.cwrap("zipstruct_error","number",[]),errorS:r.cwrap("zipstruct_errorS","number",[]),errorCodeZip:r.cwrap("zipstruct_error_code_zip","number",["number"])}});var NR=null;function rV(){return NR===null&&(NR=eV((0,tV.default)())),NR}async function sn(){return rV()}var DC={};ut(DC,{ShellError:()=>Jn,execute:()=>QB,globUtils:()=>EB});var dV=Pe(wx()),CV=J("os"),Wn=J("stream"),mV=J("util");var Jn=class extends Error{constructor(e){super(e),this.name="ShellError"}};var EB={};ut(EB,{fastGlobOptions:()=>sV,isBraceExpansion:()=>LR,isGlobPattern:()=>eke,match:()=>tke,micromatchOptions:()=>mB});var iV=Pe(gw()),nV=Pe(J("fs")),CB=Pe(yn()),mB={strictBrackets:!0},sV={onlyDirectories:!1,onlyFiles:!1};function eke(r){if(!CB.default.scan(r,mB).isGlob)return!1;try{CB.default.parse(r,mB)}catch{return!1}return!0}function tke(r,{cwd:e,baseFs:t}){return(0,iV.default)(r,{...sV,cwd:K.fromPortablePath(e),fs:nI(nV.default,new Qg(t))})}function LR(r){return CB.default.scan(r,mB).isBrace}var aV=Pe(LS()),Vo=J("stream"),AV=J("string_decoder");var Nc=new Set;function TR(){}function OR(){for(let r of Nc)r.kill()}function lV(r,e,t,i){return n=>{let s=n[0]instanceof Vo.Transform?"pipe":n[0],o=n[1]instanceof Vo.Transform?"pipe":n[1],a=n[2]instanceof Vo.Transform?"pipe":n[2],l=(0,aV.default)(r,e,{...i,stdio:[s,o,a]});return Nc.add(l),Nc.size===1&&(process.on("SIGINT",TR),process.on("SIGTERM",OR)),n[0]instanceof Vo.Transform&&n[0].pipe(l.stdin),n[1]instanceof Vo.Transform&&l.stdout.pipe(n[1],{end:!1}),n[2]instanceof Vo.Transform&&l.stderr.pipe(n[2],{end:!1}),{stdin:l.stdin,promise:new Promise(c=>{l.on("error",u=>{switch(Nc.delete(l),Nc.size===0&&(process.off("SIGINT",TR),process.off("SIGTERM",OR)),u.code){case"ENOENT":n[2].write(`command not found: ${r}
-`),c(127);break;case"EACCES":n[2].write(`permission denied: ${r}
-`),c(128);break;default:n[2].write(`uncaught error: ${u.message}
-`),c(1);break}}),l.on("close",u=>{Nc.delete(l),Nc.size===0&&(process.off("SIGINT",TR),process.off("SIGTERM",OR)),c(u!==null?u:129)})})}}}function cV(r){return e=>{let t=e[0]==="pipe"?new Vo.PassThrough:e[0];return{stdin:t,promise:Promise.resolve().then(()=>r({stdin:t,stdout:e[1],stderr:e[2]}))}}}var Qs=class{constructor(e){this.stream=e}close(){}get(){return this.stream}},MR=class{constructor(){this.stream=null}close(){if(this.stream===null)throw new Error("Assertion failed: No stream attached");this.stream.end()}attach(e){this.stream=e}get(){if(this.stream===null)throw new Error("Assertion failed: No stream attached");return this.stream}},qf=class{constructor(e,t){this.stdin=null;this.stdout=null;this.stderr=null;this.pipe=null;this.ancestor=e,this.implementation=t}static start(e,{stdin:t,stdout:i,stderr:n}){let s=new qf(null,e);return s.stdin=t,s.stdout=i,s.stderr=n,s}pipeTo(e,t=1){let i=new qf(this,e),n=new MR;return i.pipe=n,i.stdout=this.stdout,i.stderr=this.stderr,(t&1)===1?this.stdout=n:this.ancestor!==null&&(this.stderr=this.ancestor.stdout),(t&2)===2?this.stderr=n:this.ancestor!==null&&(this.stderr=this.ancestor.stderr),i}async exec(){let e=["ignore","ignore","ignore"];if(this.pipe)e[0]="pipe";else{if(this.stdin===null)throw new Error("Assertion failed: No input stream registered");e[0]=this.stdin.get()}let t;if(this.stdout===null)throw new Error("Assertion failed: No output stream registered");t=this.stdout,e[1]=t.get();let i;if(this.stderr===null)throw new Error("Assertion failed: No error stream registered");i=this.stderr,e[2]=i.get();let n=this.implementation(e);return this.pipe&&this.pipe.attach(n.stdin),await n.promise.then(s=>(t.close(),i.close(),s))}async run(){let e=[];for(let i=this;i;i=i.ancestor)e.push(i.exec());return(await Promise.all(e))[0]}};function IB(r,e){return qf.start(r,e)}function oV(r,e=null){let t=new Vo.PassThrough,i=new AV.StringDecoder,n="";return t.on("data",s=>{let o=i.write(s),a;do if(a=o.indexOf(`
-`),a!==-1){let l=n+o.substring(0,a);o=o.substring(a+1),n="",r(e!==null?`${e} ${l}`:l)}while(a!==-1);n+=o}),t.on("end",()=>{let s=i.end();s!==""&&r(e!==null?`${e} ${s}`:s)}),t}function uV(r,{prefix:e}){return{stdout:oV(t=>r.stdout.write(`${t}
-`),r.stdout.isTTY?e:null),stderr:oV(t=>r.stderr.write(`${t}
-`),r.stderr.isTTY?e:null)}}var rke=(0,mV.promisify)(setTimeout);function gV(r,e,t){let i=new Wn.PassThrough({autoDestroy:!0});switch(r){case 0:(e&1)===1&&t.stdin.pipe(i,{end:!1}),(e&2)===2&&t.stdin instanceof Wn.Writable&&i.pipe(t.stdin,{end:!1});break;case 1:(e&1)===1&&t.stdout.pipe(i,{end:!1}),(e&2)===2&&i.pipe(t.stdout,{end:!1});break;case 2:(e&1)===1&&t.stderr.pipe(i,{end:!1}),(e&2)===2&&i.pipe(t.stderr,{end:!1});break;default:throw new Jn(`Bad file descriptor: "${r}"`)}return i}function wB(r,e={}){let t={...r,...e};return t.environment={...r.environment,...e.environment},t.variables={...r.variables,...e.variables},t}var ike=new Map([["cd",async([r=(0,CV.homedir)(),...e],t,i)=>{let n=x.resolve(i.cwd,K.toPortablePath(r));if(!(await t.baseFs.statPromise(n).catch(o=>{throw o.code==="ENOENT"?new Jn(`cd: no such file or directory: ${r}`):o})).isDirectory())throw new Jn(`cd: not a directory: ${r}`);return i.cwd=n,0}],["pwd",async(r,e,t)=>(t.stdout.write(`${K.fromPortablePath(t.cwd)}
-`),0)],[":",async(r,e,t)=>0],["true",async(r,e,t)=>0],["false",async(r,e,t)=>1],["exit",async([r,...e],t,i)=>i.exitCode=parseInt(r!=null?r:i.variables["?"],10)],["echo",async(r,e,t)=>(t.stdout.write(`${r.join(" ")}
-`),0)],["sleep",async([r],e,t)=>{if(typeof r>"u")throw new Jn("sleep: missing operand");let i=Number(r);if(Number.isNaN(i))throw new Jn(`sleep: invalid time interval '${r}'`);return await rke(1e3*i,0)}],["__ysh_run_procedure",async(r,e,t)=>{let i=t.procedures[r[0]];return await IB(i,{stdin:new Qs(t.stdin),stdout:new Qs(t.stdout),stderr:new Qs(t.stderr)}).run()}],["__ysh_set_redirects",async(r,e,t)=>{let i=t.stdin,n=t.stdout,s=t.stderr,o=[],a=[],l=[],c=0;for(;r[c]!=="--";){let g=r[c++],{type:f,fd:h}=JSON.parse(g),p=v=>{switch(h){case null:case 0:o.push(v);break;default:throw new Error(`Unsupported file descriptor: "${h}"`)}},C=v=>{switch(h){case null:case 1:a.push(v);break;case 2:l.push(v);break;default:throw new Error(`Unsupported file descriptor: "${h}"`)}},y=Number(r[c++]),B=c+y;for(let v=c;v<B;++c,++v)switch(f){case"<":p(()=>e.baseFs.createReadStream(x.resolve(t.cwd,K.toPortablePath(r[v]))));break;case"<<<":p(()=>{let D=new Wn.PassThrough;return process.nextTick(()=>{D.write(`${r[v]}
-`),D.end()}),D});break;case"<&":p(()=>gV(Number(r[v]),1,t));break;case">":case">>":{let D=x.resolve(t.cwd,K.toPortablePath(r[v]));C(D==="/dev/null"?new Wn.Writable({autoDestroy:!0,emitClose:!0,write(L,H,j){setImmediate(j)}}):e.baseFs.createWriteStream(D,f===">>"?{flags:"a"}:void 0))}break;case">&":C(gV(Number(r[v]),2,t));break;default:throw new Error(`Assertion failed: Unsupported redirection type: "${f}"`)}}if(o.length>0){let g=new Wn.PassThrough;i=g;let f=h=>{if(h===o.length)g.end();else{let p=o[h]();p.pipe(g,{end:!1}),p.on("end",()=>{f(h+1)})}};f(0)}if(a.length>0){let g=new Wn.PassThrough;n=g;for(let f of a)g.pipe(f)}if(l.length>0){let g=new Wn.PassThrough;s=g;for(let f of l)g.pipe(f)}let u=await IB(xC(r.slice(c+1),e,t),{stdin:new Qs(i),stdout:new Qs(n),stderr:new Qs(s)}).run();return await Promise.all(a.map(g=>new Promise((f,h)=>{g.on("error",p=>{h(p)}),g.on("close",()=>{f()}),g.end()}))),await Promise.all(l.map(g=>new Promise((f,h)=>{g.on("error",p=>{h(p)}),g.on("close",()=>{f()}),g.end()}))),u}]]);async function nke(r,e,t){let i=[],n=new Wn.PassThrough;return n.on("data",s=>i.push(s)),await BB(r,e,wB(t,{stdout:n})),Buffer.concat(i).toString().replace(/[\r\n]+$/,"")}async function fV(r,e,t){let i=r.map(async s=>{let o=await Lc(s.args,e,t);return{name:s.name,value:o.join(" ")}});return(await Promise.all(i)).reduce((s,o)=>(s[o.name]=o.value,s),{})}function yB(r){return r.match(/[^ \r\n\t]+/g)||[]}async function EV(r,e,t,i,n=i){switch(r.name){case"$":i(String(process.pid));break;case"#":i(String(e.args.length));break;case"@":if(r.quoted)for(let s of e.args)n(s);else for(let s of e.args){let o=yB(s);for(let a=0;a<o.length-1;++a)n(o[a]);i(o[o.length-1])}break;case"*":{let s=e.args.join(" ");if(r.quoted)i(s);else for(let o of yB(s))n(o)}break;case"PPID":i(String(process.ppid));break;case"RANDOM":i(String(Math.floor(Math.random()*32768)));break;default:{let s=parseInt(r.name,10),o,a=Number.isFinite(s);if(a?s>=0&&s<e.args.length&&(o=e.args[s]):Object.prototype.hasOwnProperty.call(t.variables,r.name)?o=t.variables[r.name]:Object.prototype.hasOwnProperty.call(t.environment,r.name)&&(o=t.environment[r.name]),typeof o<"u"&&r.alternativeValue?o=(await Lc(r.alternativeValue,e,t)).join(" "):typeof o>"u"&&(r.defaultValue?o=(await Lc(r.defaultValue,e,t)).join(" "):r.alternativeValue&&(o="")),typeof o>"u")throw a?new Jn(`Unbound argument #${s}`):new Jn(`Unbound variable "${r.name}"`);if(r.quoted)i(o);else{let l=yB(o);for(let u=0;u<l.length-1;++u)n(l[u]);let c=l[l.length-1];typeof c<"u"&&i(c)}}break}}var ske={addition:(r,e)=>r+e,subtraction:(r,e)=>r-e,multiplication:(r,e)=>r*e,division:(r,e)=>Math.trunc(r/e)};async function vC(r,e,t){if(r.type==="number"){if(Number.isInteger(r.value))return r.value;throw new Error(`Invalid number: "${r.value}", only integers are allowed`)}else if(r.type==="variable"){let i=[];await EV({...r,quoted:!0},e,t,s=>i.push(s));let n=Number(i.join(" "));return Number.isNaN(n)?vC({type:"variable",name:i.join(" ")},e,t):vC({type:"number",value:n},e,t)}else return ske[r.type](await vC(r.left,e,t),await vC(r.right,e,t))}async function Lc(r,e,t){let i=new Map,n=[],s=[],o=u=>{s.push(u)},a=()=>{s.length>0&&n.push(s.join("")),s=[]},l=u=>{o(u),a()},c=(u,g,f)=>{let h=JSON.stringify({type:u,fd:g}),p=i.get(h);typeof p>"u"&&i.set(h,p=[]),p.push(f)};for(let u of r){let g=!1;switch(u.type){case"redirection":{let f=await Lc(u.args,e,t);for(let h of f)c(u.subtype,u.fd,h)}break;case"argument":for(let f of u.segments)switch(f.type){case"text":o(f.text);break;case"glob":o(f.pattern),g=!0;break;case"shell":{let h=await nke(f.shell,e,t);if(f.quoted)o(h);else{let p=yB(h);for(let C=0;C<p.length-1;++C)l(p[C]);o(p[p.length-1])}}break;case"variable":await EV(f,e,t,o,l);break;case"arithmetic":o(String(await vC(f.arithmetic,e,t)));break}break}if(a(),g){let f=n.pop();if(typeof f>"u")throw new Error("Assertion failed: Expected a glob pattern to have been set");let h=await e.glob.match(f,{cwd:t.cwd,baseFs:e.baseFs});if(h.length===0){let p=LR(f)?". Note: Brace expansion of arbitrary strings isn't currently supported. For more details, please read this issue: https://github.com/yarnpkg/berry/issues/22":"";throw new Jn(`No matches found: "${f}"${p}`)}for(let p of h.sort())l(p)}}if(i.size>0){let u=[];for(let[g,f]of i.entries())u.splice(u.length,0,g,String(f.length),...f);n.splice(0,0,"__ysh_set_redirects",...u,"--")}return n}function xC(r,e,t){e.builtins.has(r[0])||(r=["command",...r]);let i=K.fromPortablePath(t.cwd),n=t.environment;typeof n.PWD<"u"&&(n={...n,PWD:i});let[s,...o]=r;if(s==="command")return lV(o[0],o.slice(1),e,{cwd:i,env:n});let a=e.builtins.get(s);if(typeof a>"u")throw new Error(`Assertion failed: A builtin should exist for "${s}"`);return cV(async({stdin:l,stdout:c,stderr:u})=>{let{stdin:g,stdout:f,stderr:h}=t;t.stdin=l,t.stdout=c,t.stderr=u;try{return await a(o,e,t)}finally{t.stdin=g,t.stdout=f,t.stderr=h}})}function oke(r,e,t){return i=>{let n=new Wn.PassThrough,s=BB(r,e,wB(t,{stdin:n}));return{stdin:n,promise:s}}}function ake(r,e,t){return i=>{let n=new Wn.PassThrough,s=BB(r,e,t);return{stdin:n,promise:s}}}function hV(r,e,t,i){if(e.length===0)return r;{let n;do n=String(Math.random());while(Object.prototype.hasOwnProperty.call(i.procedures,n));return i.procedures={...i.procedures},i.procedures[n]=r,xC([...e,"__ysh_run_procedure",n],t,i)}}async function pV(r,e,t){let i=r,n=null,s=null;for(;i;){let o=i.then?{...t}:t,a;switch(i.type){case"command":{let l=await Lc(i.args,e,t),c=await fV(i.envs,e,t);a=i.envs.length?xC(l,e,wB(o,{environment:c})):xC(l,e,o)}break;case"subshell":{let l=await Lc(i.args,e,t),c=oke(i.subshell,e,o);a=hV(c,l,e,o)}break;case"group":{let l=await Lc(i.args,e,t),c=ake(i.group,e,o);a=hV(c,l,e,o)}break;case"envs":{let l=await fV(i.envs,e,t);o.environment={...o.environment,...l},a=xC(["true"],e,o)}break}if(typeof a>"u")throw new Error("Assertion failed: An action should have been generated");if(n===null)s=IB(a,{stdin:new Qs(o.stdin),stdout:new Qs(o.stdout),stderr:new Qs(o.stderr)});else{if(s===null)throw new Error("Assertion failed: The execution pipeline should have been setup");switch(n){case"|":s=s.pipeTo(a,1);break;case"|&":s=s.pipeTo(a,3);break}}i.then?(n=i.then.type,i=i.then.chain):i=null}if(s===null)throw new Error("Assertion failed: The execution pipeline should have been setup");return await s.run()}async function Ake(r,e,t,{background:i=!1}={}){function n(s){let o=["#2E86AB","#A23B72","#F18F01","#C73E1D","#CCE2A3"],a=o[s%o.length];return dV.default.hex(a)}if(i){let s=t.nextBackgroundJobIndex++,o=n(s),a=`[${s}]`,l=o(a),{stdout:c,stderr:u}=uV(t,{prefix:l});return t.backgroundJobs.push(pV(r,e,wB(t,{stdout:c,stderr:u})).catch(g=>u.write(`${g.message}
-`)).finally(()=>{t.stdout.isTTY&&t.stdout.write(`Job ${l}, '${o(Dg(r))}' has ended
-`)})),0}return await pV(r,e,t)}async function lke(r,e,t,{background:i=!1}={}){let n,s=a=>{n=a,t.variables["?"]=String(a)},o=async a=>{try{return await Ake(a.chain,e,t,{background:i&&typeof a.then>"u"})}catch(l){if(!(l instanceof Jn))throw l;return t.stderr.write(`${l.message}
-`),1}};for(s(await o(r));r.then;){if(t.exitCode!==null)return t.exitCode;switch(r.then.type){case"&&":n===0&&s(await o(r.then.line));break;case"||":n!==0&&s(await o(r.then.line));break;default:throw new Error(`Assertion failed: Unsupported command type: "${r.then.type}"`)}r=r.then.line}return n}async function BB(r,e,t){let i=t.backgroundJobs;t.backgroundJobs=[];let n=0;for(let{command:s,type:o}of r){if(n=await lke(s,e,t,{background:o==="&"}),t.exitCode!==null)return t.exitCode;t.variables["?"]=String(n)}return await Promise.all(t.backgroundJobs),t.backgroundJobs=i,n}function IV(r){switch(r.type){case"variable":return r.name==="@"||r.name==="#"||r.name==="*"||Number.isFinite(parseInt(r.name,10))||"defaultValue"in r&&!!r.defaultValue&&r.defaultValue.some(e=>PC(e))||"alternativeValue"in r&&!!r.alternativeValue&&r.alternativeValue.some(e=>PC(e));case"arithmetic":return KR(r.arithmetic);case"shell":return UR(r.shell);default:return!1}}function PC(r){switch(r.type){case"redirection":return r.args.some(e=>PC(e));case"argument":return r.segments.some(e=>IV(e));default:throw new Error(`Assertion failed: Unsupported argument type: "${r.type}"`)}}function KR(r){switch(r.type){case"variable":return IV(r);case"number":return!1;default:return KR(r.left)||KR(r.right)}}function UR(r){return r.some(({command:e})=>{for(;e;){let t=e.chain;for(;t;){let i;switch(t.type){case"subshell":i=UR(t.subshell);break;case"command":i=t.envs.some(n=>n.args.some(s=>PC(s)))||t.args.some(n=>PC(n));break}if(i)return!0;if(!t.then)break;t=t.then.chain}if(!e.then)break;e=e.then.line}return!1})}async function QB(r,e=[],{baseFs:t=new $t,builtins:i={},cwd:n=K.toPortablePath(process.cwd()),env:s=process.env,stdin:o=process.stdin,stdout:a=process.stdout,stderr:l=process.stderr,variables:c={},glob:u=EB}={}){let g={};for(let[p,C]of Object.entries(s))typeof C<"u"&&(g[p]=C);let f=new Map(ike);for(let[p,C]of Object.entries(i))f.set(p,C);o===null&&(o=new Wn.PassThrough,o.end());let h=aI(r,u);if(!UR(h)&&h.length>0&&e.length>0){let{command:p}=h[h.length-1];for(;p.then;)p=p.then.line;let C=p.chain;for(;C.then;)C=C.then.chain;C.type==="command"&&(C.args=C.args.concat(e.map(y=>({type:"argument",segments:[{type:"text",text:y}]}))))}return await BB(h,{args:e,baseFs:t,builtins:f,initialStdin:o,initialStdout:a,initialStderr:l,glob:u},{cwd:n,environment:g,exitCode:null,procedures:{},stdin:o,stdout:a,stderr:l,variables:Object.assign({},c,{["?"]:0}),nextBackgroundJobIndex:1,backgroundJobs:[]})}var o7=Pe(bB()),a7=Pe(Yg()),$A=J("stream");var n7=Pe(e7()),PB=Pe(nc());var t7=["\u280B","\u2819","\u2839","\u2838","\u283C","\u2834","\u2826","\u2827","\u2807","\u280F"],r7=80,aRe=new Set([13,19]),ARe=5,xB=PB.default.GITHUB_ACTIONS?{start:r=>`::group::${r}
-`,end:r=>`::endgroup::
-`}:PB.default.TRAVIS?{start:r=>`travis_fold:start:${r}
-`,end:r=>`travis_fold:end:${r}
-`}:PB.default.GITLAB?{start:r=>`section_start:${Math.floor(Date.now()/1e3)}:${r.toLowerCase().replace(/\W+/g,"_")}[collapsed=true]\r\x1B[0K${r}
-`,end:r=>`section_end:${Math.floor(Date.now()/1e3)}:${r.toLowerCase().replace(/\W+/g,"_")}\r\x1B[0K`}:null,i7=new Date,lRe=["iTerm.app","Apple_Terminal","WarpTerminal","vscode"].includes(process.env.TERM_PROGRAM)||!!process.env.WT_SESSION,cRe=r=>r,DB=cRe({patrick:{date:[17,3],chars:["\u{1F340}","\u{1F331}"],size:40},simba:{date:[19,7],chars:["\u{1F981}","\u{1F334}"],size:40},jack:{date:[31,10],chars:["\u{1F383}","\u{1F987}"],size:40},hogsfather:{date:[31,12],chars:["\u{1F389}","\u{1F384}"],size:40},default:{chars:["=","-"],size:80}}),uRe=lRe&&Object.keys(DB).find(r=>{let e=DB[r];return!(e.date&&(e.date[0]!==i7.getDate()||e.date[1]!==i7.getMonth()+1))})||"default";function s7(r,{configuration:e,json:t}){if(!e.get("enableMessageNames"))return"";let n=RA(r===null?0:r);return!t&&r===null?$e(e,n,"grey"):n}function qR(r,{configuration:e,json:t}){let i=s7(r,{configuration:e,json:t});if(!i||r===null||r===0)return i;let n=Ct[r],s=`https://yarnpkg.com/advanced/error-codes#${i}---${n}`.toLowerCase();return Cf(e,i,s)}var Ge=class extends vi{constructor({configuration:t,stdout:i,json:n=!1,includePrefix:s=!0,includeFooter:o=!0,includeLogs:a=!n,includeInfos:l=a,includeWarnings:c=a,forgettableBufferSize:u=ARe,forgettableNames:g=new Set}){super();this.uncommitted=new Set;this.cacheHitCount=0;this.cacheMissCount=0;this.lastCacheMiss=null;this.warningCount=0;this.errorCount=0;this.startTime=Date.now();this.indent=0;this.progress=new Map;this.progressTime=0;this.progressFrame=0;this.progressTimeout=null;this.progressStyle=null;this.progressMaxScaledSize=null;this.forgettableLines=[];if(zd(this,{configuration:t}),this.configuration=t,this.forgettableBufferSize=u,this.forgettableNames=new Set([...g,...aRe]),this.includePrefix=s,this.includeFooter=o,this.includeInfos=l,this.includeWarnings=c,this.json=n,this.stdout=i,t.get("enableProgressBars")&&!n&&i.isTTY&&i.columns>22){let f=t.get("progressBarStyle")||uRe;if(!Object.prototype.hasOwnProperty.call(DB,f))throw new Error("Assertion failed: Invalid progress bar style");this.progressStyle=DB[f];let h=12,p=Math.max(0,Math.min(i.columns-h,80));this.progressMaxScaledSize=Math.floor(this.progressStyle.size*p/80)}}static async start(t,i){let n=new this(t),s=process.emitWarning;process.emitWarning=(o,a)=>{if(typeof o!="string"){let c=o;o=c.message,a=a!=null?a:c.name}let l=typeof a<"u"?`${a}: ${o}`:o;n.reportWarning(0,l)};try{await i(n)}catch(o){n.reportExceptionOnce(o)}finally{await n.finalize(),process.emitWarning=s}return n}hasErrors(){return this.errorCount>0}exitCode(){return this.hasErrors()?1:0}reportCacheHit(t){this.cacheHitCount+=1}reportCacheMiss(t,i){this.lastCacheMiss=t,this.cacheMissCount+=1,typeof i<"u"&&!this.configuration.get("preferAggregateCacheInfo")&&this.reportInfo(13,i)}startSectionSync({reportHeader:t,reportFooter:i,skipIfEmpty:n},s){let o={committed:!1,action:()=>{t==null||t()}};n?this.uncommitted.add(o):(o.action(),o.committed=!0);let a=Date.now();try{return s()}catch(l){throw this.reportExceptionOnce(l),l}finally{let l=Date.now();this.uncommitted.delete(o),o.committed&&(i==null||i(l-a))}}async startSectionPromise({reportHeader:t,reportFooter:i,skipIfEmpty:n},s){let o={committed:!1,action:()=>{t==null||t()}};n?this.uncommitted.add(o):(o.action(),o.committed=!0);let a=Date.now();try{return await s()}catch(l){throw this.reportExceptionOnce(l),l}finally{let l=Date.now();this.uncommitted.delete(o),o.committed&&(i==null||i(l-a))}}startTimerImpl(t,i,n){return{cb:typeof i=="function"?i:n,reportHeader:()=>{this.reportInfo(null,`\u250C ${t}`),this.indent+=1,xB!==null&&!this.json&&this.includeInfos&&this.stdout.write(xB.start(t))},reportFooter:a=>{this.indent-=1,xB!==null&&!this.json&&this.includeInfos&&this.stdout.write(xB.end(t)),this.configuration.get("enableTimers")&&a>200?this.reportInfo(null,`\u2514 Completed in ${$e(this.configuration,a,Ue.DURATION)}`):this.reportInfo(null,"\u2514 Completed")},skipIfEmpty:(typeof i=="function"?{}:i).skipIfEmpty}}startTimerSync(t,i,n){let{cb:s,...o}=this.startTimerImpl(t,i,n);return this.startSectionSync(o,s)}async startTimerPromise(t,i,n){let{cb:s,...o}=this.startTimerImpl(t,i,n);return this.startSectionPromise(o,s)}async startCacheReport(t){let i=this.configuration.get("preferAggregateCacheInfo")?{cacheHitCount:this.cacheHitCount,cacheMissCount:this.cacheMissCount}:null;try{return await t()}catch(n){throw this.reportExceptionOnce(n),n}finally{i!==null&&this.reportCacheChanges(i)}}reportSeparator(){this.indent===0?this.writeLineWithForgettableReset(""):this.reportInfo(null,"")}reportInfo(t,i){if(!this.includeInfos)return;this.commit();let n=this.formatNameWithHyperlink(t),s=n?`${n}: `:"",o=`${this.formatPrefix(s,"blueBright")}${i}`;if(this.json)this.reportJson({type:"info",name:t,displayName:this.formatName(t),indent:this.formatIndent(),data:i});else if(this.forgettableNames.has(t))if(this.forgettableLines.push(o),this.forgettableLines.length>this.forgettableBufferSize){for(;this.forgettableLines.length>this.forgettableBufferSize;)this.forgettableLines.shift();this.writeLines(this.forgettableLines,{truncate:!0})}else this.writeLine(o,{truncate:!0});else this.writeLineWithForgettableReset(o)}reportWarning(t,i){if(this.warningCount+=1,!this.includeWarnings)return;this.commit();let n=this.formatNameWithHyperlink(t),s=n?`${n}: `:"";this.json?this.reportJson({type:"warning",name:t,displayName:this.formatName(t),indent:this.formatIndent(),data:i}):this.writeLineWithForgettableReset(`${this.formatPrefix(s,"yellowBright")}${i}`)}reportError(t,i){this.errorCount+=1,this.commit();let n=this.formatNameWithHyperlink(t),s=n?`${n}: `:"";this.json?this.reportJson({type:"error",name:t,displayName:this.formatName(t),indent:this.formatIndent(),data:i}):this.writeLineWithForgettableReset(`${this.formatPrefix(s,"redBright")}${i}`,{truncate:!1})}reportProgress(t){if(this.progressStyle===null)return{...Promise.resolve(),stop:()=>{}};if(t.hasProgress&&t.hasTitle)throw new Error("Unimplemented: Progress bars can't have both progress and titles.");let i=!1,n=Promise.resolve().then(async()=>{let o={progress:t.hasProgress?0:void 0,title:t.hasTitle?"":void 0};this.progress.set(t,{definition:o,lastScaledSize:t.hasProgress?-1:void 0,lastTitle:void 0}),this.refreshProgress({delta:-1});for await(let{progress:a,title:l}of t)i||o.progress===a&&o.title===l||(o.progress=a,o.title=l,this.refreshProgress());s()}),s=()=>{i||(i=!0,this.progress.delete(t),this.refreshProgress({delta:1}))};return{...n,stop:s}}reportJson(t){this.json&&this.writeLineWithForgettableReset(`${JSON.stringify(t)}`)}async finalize(){if(!this.includeFooter)return;let t="";this.errorCount>0?t="Failed with errors":this.warningCount>0?t="Done with warnings":t="Done";let i=$e(this.configuration,Date.now()-this.startTime,Ue.DURATION),n=this.configuration.get("enableTimers")?`${t} in ${i}`:t;this.errorCount>0?this.reportError(0,n):this.warningCount>0?this.reportWarning(0,n):this.reportInfo(0,n)}writeLine(t,{truncate:i}={}){this.clearProgress({clear:!0}),this.stdout.write(`${this.truncate(t,{truncate:i})}
-`),this.writeProgress()}writeLineWithForgettableReset(t,{truncate:i}={}){this.forgettableLines=[],this.writeLine(t,{truncate:i})}writeLines(t,{truncate:i}={}){this.clearProgress({delta:t.length});for(let n of t)this.stdout.write(`${this.truncate(n,{truncate:i})}
-`);this.writeProgress()}reportCacheChanges({cacheHitCount:t,cacheMissCount:i}){let n=this.cacheHitCount-t,s=this.cacheMissCount-i;if(n===0&&s===0)return;let o="";this.cacheHitCount>1?o+=`${this.cacheHitCount} packages were already cached`:this.cacheHitCount===1?o+=" - one package was already cached":o+="No packages were cached",this.cacheHitCount>0?this.cacheMissCount>1?o+=`, ${this.cacheMissCount} had to be fetched`:this.cacheMissCount===1&&(o+=`, one had to be fetched (${mt(this.configuration,this.lastCacheMiss)})`):this.cacheMissCount>1?o+=` - ${this.cacheMissCount} packages had to be fetched`:this.cacheMissCount===1&&(o+=` - one package had to be fetched (${mt(this.configuration,this.lastCacheMiss)})`),this.reportInfo(13,o)}commit(){let t=this.uncommitted;this.uncommitted=new Set;for(let i of t)i.committed=!0,i.action()}clearProgress({delta:t=0,clear:i=!1}){this.progressStyle!==null&&this.progress.size+t>0&&(this.stdout.write(`\x1B[${this.progress.size+t}A`),(t>0||i)&&this.stdout.write("\x1B[0J"))}writeProgress(){if(this.progressStyle===null||(this.progressTimeout!==null&&clearTimeout(this.progressTimeout),this.progressTimeout=null,this.progress.size===0))return;let t=Date.now();t-this.progressTime>r7&&(this.progressFrame=(this.progressFrame+1)%t7.length,this.progressTime=t);let i=t7[this.progressFrame];for(let n of this.progress.values()){let s="";if(typeof n.lastScaledSize<"u"){let c=this.progressStyle.chars[0].repeat(n.lastScaledSize),u=this.progressStyle.chars[1].repeat(this.progressMaxScaledSize-n.lastScaledSize);s=` ${c}${u}`}let o=this.formatName(null),a=o?`${o}: `:"",l=n.definition.title?` ${n.definition.title}`:"";this.stdout.write(`${$e(this.configuration,"\u27A4","blueBright")} ${a}${i}${s}${l}
-`)}this.progressTimeout=setTimeout(()=>{this.refreshProgress({force:!0})},r7)}refreshProgress({delta:t=0,force:i=!1}={}){let n=!1,s=!1;if(i||this.progress.size===0)n=!0;else for(let o of this.progress.values()){let a=typeof o.definition.progress<"u"?Math.trunc(this.progressMaxScaledSize*o.definition.progress):void 0,l=o.lastScaledSize;o.lastScaledSize=a;let c=o.lastTitle;if(o.lastTitle=o.definition.title,a!==l||(s=c!==o.definition.title)){n=!0;break}}n&&(this.clearProgress({delta:t,clear:s}),this.writeProgress())}truncate(t,{truncate:i}={}){return this.progressStyle===null&&(i=!1),typeof i>"u"&&(i=this.configuration.get("preferTruncatedLines")),i&&(t=(0,n7.default)(t,0,this.stdout.columns-1)),t}formatName(t){return s7(t,{configuration:this.configuration,json:this.json})}formatPrefix(t,i){return this.includePrefix?`${$e(this.configuration,"\u27A4",i)} ${t}${this.formatIndent()}`:""}formatNameWithHyperlink(t){return qR(t,{configuration:this.configuration,json:this.json})}formatIndent(){return"\u2502 ".repeat(this.indent)}};var Lr="3.5.0";var A7=(n=>(n.Yarn1="Yarn Classic",n.Yarn2="Yarn",n.Npm="npm",n.Pnpm="pnpm",n))(A7||{});async function qa(r,e,t,i=[]){if(process.platform==="win32"){let n=`@goto #_undefined_# 2>NUL || @title %COMSPEC% & @setlocal & @"${t}" ${i.map(s=>`"${s.replace('"','""')}"`).join(" ")} %*`;await M.writeFilePromise(x.format({dir:r,name:e,ext:".cmd"}),n)}await M.writeFilePromise(x.join(r,e),`#!/bin/sh
-exec "${t}" ${i.map(n=>`'${n.replace(/'/g,`'"'"'`)}'`).join(" ")} "$@"
-`,{mode:493})}async function l7(r){let e=await ot.tryFind(r);if(e!=null&&e.packageManager){let i=Bw(e.packageManager);if(i!=null&&i.name){let n=`found ${JSON.stringify({packageManager:e.packageManager})} in manifest`,[s]=i.reference.split(".");switch(i.name){case"yarn":{let o=Number(s)===1?"Yarn Classic":"Yarn";return{packageManagerField:!0,packageManager:o,reason:n}}break;case"npm":return{packageManagerField:!0,packageManager:"npm",reason:n};case"pnpm":return{packageManagerField:!0,packageManager:"pnpm",reason:n}}}}let t;try{t=await M.readFilePromise(x.join(r,xt.lockfile),"utf8")}catch{}return t!==void 0?t.match(/^__metadata:$/m)?{packageManager:"Yarn",reason:'"__metadata" key found in yarn.lock'}:{packageManager:"Yarn Classic",reason:'"__metadata" key not found in yarn.lock, must be a Yarn classic lockfile'}:M.existsSync(x.join(r,"package-lock.json"))?{packageManager:"npm",reason:`found npm's "package-lock.json" lockfile`}:M.existsSync(x.join(r,"pnpm-lock.yaml"))?{packageManager:"pnpm",reason:`found pnpm's "pnpm-lock.yaml" lockfile`}:null}async function kC({project:r,locator:e,binFolder:t,ignoreCorepack:i,lifecycleScript:n}){var c,u;let s={};for(let[g,f]of Object.entries(process.env))typeof f<"u"&&(s[g.toLowerCase()!=="path"?g:"PATH"]=f);let o=K.fromPortablePath(t);s.BERRY_BIN_FOLDER=K.fromPortablePath(o);let a=process.env.COREPACK_ROOT&&!i?K.join(process.env.COREPACK_ROOT,"dist/yarn.js"):process.argv[1];if(await Promise.all([qa(t,"node",process.execPath),...Lr!==null?[qa(t,"run",process.execPath,[a,"run"]),qa(t,"yarn",process.execPath,[a]),qa(t,"yarnpkg",process.execPath,[a]),qa(t,"node-gyp",process.execPath,[a,"run","--top-level","node-gyp"])]:[]]),r&&(s.INIT_CWD=K.fromPortablePath(r.configuration.startingCwd),s.PROJECT_CWD=K.fromPortablePath(r.cwd)),s.PATH=s.PATH?`${o}${K.delimiter}${s.PATH}`:`${o}`,s.npm_execpath=`${o}${K.sep}yarn`,s.npm_node_execpath=`${o}${K.sep}node`,e){if(!r)throw new Error("Assertion failed: Missing project");let g=r.tryWorkspaceByLocator(e),f=g?(c=g.manifest.version)!=null?c:"":(u=r.storedPackages.get(e.locatorHash).version)!=null?u:"";s.npm_package_name=Ot(e),s.npm_package_version=f;let h;if(g)h=g.cwd;else{let p=r.storedPackages.get(e.locatorHash);if(!p)throw new Error(`Package for ${mt(r.configuration,e)} not found in the project`);let C=r.configuration.getLinkers(),y={project:r,report:new Ge({stdout:new $A.PassThrough,configuration:r.configuration})},B=C.find(v=>v.supportsPackage(p,y));if(!B)throw new Error(`The package ${mt(r.configuration,p)} isn't supported by any of the available linkers`);h=await B.findPackageLocation(p,y)}s.npm_package_json=K.fromPortablePath(x.join(h,xt.manifest))}let l=Lr!==null?`yarn/${Lr}`:`yarn/${pf("@yarnpkg/core").version}-core`;return s.npm_config_user_agent=`${l} npm/? node/${process.version} ${process.platform} ${process.arch}`,n&&(s.npm_lifecycle_event=n),r&&await r.configuration.triggerHook(g=>g.setupScriptEnvironment,r,s,async(g,f,h)=>await qa(t,Ur(g),f,h)),s}var gRe=2,fRe=(0,a7.default)(gRe);async function hRe(r,e,{configuration:t,report:i,workspace:n=null,locator:s=null}){await fRe(async()=>{await M.mktempPromise(async o=>{let a=x.join(o,"pack.log"),l=null,{stdout:c,stderr:u}=t.getSubprocessStreams(a,{prefix:K.fromPortablePath(r),report:i}),g=s&&jo(s)?rC(s):s,f=g?Cs(g):"an external project";c.write(`Packing ${f} from sources
-`);let h=await l7(r),p;h!==null?(c.write(`Using ${h.packageManager} for bootstrap. Reason: ${h.reason}
-
-`),p=h.packageManager):(c.write(`No package manager configuration detected; defaulting to Yarn
-
-`),p="Yarn");let C=p==="Yarn"&&!(h!=null&&h.packageManagerField);await M.mktempPromise(async y=>{let B=await kC({binFolder:y,ignoreCorepack:C}),D=new Map([["Yarn Classic",async()=>{let H=n!==null?["workspace",n]:[],j=x.join(r,xt.manifest),$=await M.readFilePromise(j),V=await Wo(process.execPath,[process.argv[1],"set","version","classic","--only-if-needed"],{cwd:r,env:B,stdin:l,stdout:c,stderr:u,end:1});if(V.code!==0)return V.code;await M.writeFilePromise(j,$),await M.appendFilePromise(x.join(r,".npmignore"),`/.yarn
-`),c.write(`
-`),delete B.NODE_ENV;let W=await Wo("yarn",["install"],{cwd:r,env:B,stdin:l,stdout:c,stderr:u,end:1});if(W.code!==0)return W.code;c.write(`
-`);let _=await Wo("yarn",[...H,"pack","--filename",K.fromPortablePath(e)],{cwd:r,env:B,stdin:l,stdout:c,stderr:u});return _.code!==0?_.code:0}],["Yarn",async()=>{let H=n!==null?["workspace",n]:[];B.YARN_ENABLE_INLINE_BUILDS="1";let j=x.join(r,xt.lockfile);await M.existsPromise(j)||await M.writeFilePromise(j,"");let $=await Wo("yarn",[...H,"pack","--install-if-needed","--filename",K.fromPortablePath(e)],{cwd:r,env:B,stdin:l,stdout:c,stderr:u});return $.code!==0?$.code:0}],["npm",async()=>{if(n!==null){let ae=new $A.PassThrough,ge=hf(ae);ae.pipe(c,{end:!1});let re=await Wo("npm",["--version"],{cwd:r,env:B,stdin:l,stdout:ae,stderr:u,end:0});if(ae.end(),re.code!==0)return c.end(),u.end(),re.code;let O=(await ge).toString().trim();if(!vc(O,">=7.x")){let F=qo(null,"npm"),ue=_t(F,O),he=_t(F,">=7.x");throw new Error(`Workspaces aren't supported by ${tr(t,ue)}; please upgrade to ${tr(t,he)} (npm has been detected as the primary package manager for ${$e(t,r,Ue.PATH)})`)}}let H=n!==null?["--workspace",n]:[];delete B.npm_config_user_agent,delete B.npm_config_production,delete B.NPM_CONFIG_PRODUCTION,delete B.NODE_ENV;let j=await Wo("npm",["install"],{cwd:r,env:B,stdin:l,stdout:c,stderr:u,end:1});if(j.code!==0)return j.code;let $=new $A.PassThrough,V=hf($);$.pipe(c);let W=await Wo("npm",["pack","--silent",...H],{cwd:r,env:B,stdin:l,stdout:$,stderr:u});if(W.code!==0)return W.code;let _=(await V).toString().trim().replace(/^.*\n/s,""),A=x.resolve(r,K.toPortablePath(_));return await M.renamePromise(A,e),0}]]).get(p);if(typeof D>"u")throw new Error("Assertion failed: Unsupported workflow");let L=await D();if(!(L===0||typeof L>"u"))throw M.detachTemp(o),new at(58,`Packing the package failed (exit code ${L}, logs can be found here: ${$e(t,a,Ue.PATH)})`)})})})}async function pRe(r,e,{project:t}){let i=t.tryWorkspaceByLocator(r);if(i!==null)return WR(i,e);let n=t.storedPackages.get(r.locatorHash);if(!n)throw new Error(`Package for ${mt(t.configuration,r)} not found in the project`);return await On.openPromise(async s=>{let o=t.configuration,a=t.configuration.getLinkers(),l={project:t,report:new Ge({stdout:new $A.PassThrough,configuration:o})},c=a.find(h=>h.supportsPackage(n,l));if(!c)throw new Error(`The package ${mt(t.configuration,n)} isn't supported by any of the available linkers`);let u=await c.findPackageLocation(n,l),g=new qt(u,{baseFs:s});return(await ot.find(Oe.dot,{baseFs:g})).scripts.has(e)},{libzip:await sn()})}async function kB(r,e,t,{cwd:i,project:n,stdin:s,stdout:o,stderr:a}){return await M.mktempPromise(async l=>{let{manifest:c,env:u,cwd:g}=await c7(r,{project:n,binFolder:l,cwd:i,lifecycleScript:e}),f=c.scripts.get(e);if(typeof f>"u")return 1;let h=async()=>await QB(f,t,{cwd:g,env:u,stdin:s,stdout:o,stderr:a});return await(await n.configuration.reduceHook(C=>C.wrapScriptExecution,h,n,r,e,{script:f,args:t,cwd:g,env:u,stdin:s,stdout:o,stderr:a}))()})}async function JR(r,e,t,{cwd:i,project:n,stdin:s,stdout:o,stderr:a}){return await M.mktempPromise(async l=>{let{env:c,cwd:u}=await c7(r,{project:n,binFolder:l,cwd:i});return await QB(e,t,{cwd:u,env:c,stdin:s,stdout:o,stderr:a})})}async function dRe(r,{binFolder:e,cwd:t,lifecycleScript:i}){let n=await kC({project:r.project,locator:r.anchoredLocator,binFolder:e,lifecycleScript:i});return await Promise.all(Array.from(await f7(r),([s,[,o]])=>qa(e,Ur(s),process.execPath,[o]))),typeof t>"u"&&(t=x.dirname(await M.realpathPromise(x.join(r.cwd,"package.json")))),{manifest:r.manifest,binFolder:e,env:n,cwd:t}}async function c7(r,{project:e,binFolder:t,cwd:i,lifecycleScript:n}){let s=e.tryWorkspaceByLocator(r);if(s!==null)return dRe(s,{binFolder:t,cwd:i,lifecycleScript:n});let o=e.storedPackages.get(r.locatorHash);if(!o)throw new Error(`Package for ${mt(e.configuration,r)} not found in the project`);return await On.openPromise(async a=>{let l=e.configuration,c=e.configuration.getLinkers(),u={project:e,report:new Ge({stdout:new $A.PassThrough,configuration:l})},g=c.find(y=>y.supportsPackage(o,u));if(!g)throw new Error(`The package ${mt(e.configuration,o)} isn't supported by any of the available linkers`);let f=await kC({project:e,locator:r,binFolder:t,lifecycleScript:n});await Promise.all(Array.from(await RB(r,{project:e}),([y,[,B]])=>qa(t,Ur(y),process.execPath,[B])));let h=await g.findPackageLocation(o,u),p=new qt(h,{baseFs:a}),C=await ot.find(Oe.dot,{baseFs:p});return typeof i>"u"&&(i=h),{manifest:C,binFolder:t,env:f,cwd:i}},{libzip:await sn()})}async function u7(r,e,t,{cwd:i,stdin:n,stdout:s,stderr:o}){return await kB(r.anchoredLocator,e,t,{cwd:i,project:r.project,stdin:n,stdout:s,stderr:o})}function WR(r,e){return r.manifest.scripts.has(e)}async function g7(r,e,{cwd:t,report:i}){let{configuration:n}=r.project,s=null;await M.mktempPromise(async o=>{let a=x.join(o,`${e}.log`),l=`# This file contains the result of Yarn calling the "${e}" lifecycle script inside a workspace ("${K.fromPortablePath(r.cwd)}")
-`,{stdout:c,stderr:u}=n.getSubprocessStreams(a,{report:i,prefix:mt(n,r.anchoredLocator),header:l});i.reportInfo(36,`Calling the "${e}" lifecycle script`);let g=await u7(r,e,[],{cwd:t,stdin:s,stdout:c,stderr:u});if(c.end(),u.end(),g!==0)throw M.detachTemp(o),new at(36,`${(0,o7.default)(e)} script failed (exit code ${$e(n,g,Ue.NUMBER)}, logs can be found here: ${$e(n,a,Ue.PATH)}); run ${$e(n,`yarn ${e}`,Ue.CODE)} to investigate`)})}async function CRe(r,e,t){WR(r,e)&&await g7(r,e,t)}async function RB(r,{project:e}){let t=e.configuration,i=new Map,n=e.storedPackages.get(r.locatorHash);if(!n)throw new Error(`Package for ${mt(t,r)} not found in the project`);let s=new $A.Writable,o=t.getLinkers(),a={project:e,report:new Ge({configuration:t,stdout:s})},l=new Set([r.locatorHash]);for(let u of n.dependencies.values()){let g=e.storedResolutions.get(u.descriptorHash);if(!g)throw new Error(`Assertion failed: The resolution (${tr(t,u)}) should have been registered`);l.add(g)}let c=await Promise.all(Array.from(l,async u=>{let g=e.storedPackages.get(u);if(!g)throw new Error(`Assertion failed: The package (${u}) should have been registered`);if(g.bin.size===0)return Uo.skip;let f=o.find(p=>p.supportsPackage(g,a));if(!f)return Uo.skip;let h=null;try{h=await f.findPackageLocation(g,a)}catch(p){if(p.code==="LOCATOR_NOT_INSTALLED")return Uo.skip;throw p}return{dependency:g,packageLocation:h}}));for(let u of c){if(u===Uo.skip)continue;let{dependency:g,packageLocation:f}=u;for(let[h,p]of g.bin)i.set(h,[g,K.fromPortablePath(x.resolve(f,p))])}return i}async function f7(r){return await RB(r.anchoredLocator,{project:r.project})}async function h7(r,e,t,{cwd:i,project:n,stdin:s,stdout:o,stderr:a,nodeArgs:l=[],packageAccessibleBinaries:c}){c!=null||(c=await RB(r,{project:n}));let u=c.get(e);if(!u)throw new Error(`Binary not found (${e}) for ${mt(n.configuration,r)}`);return await M.mktempPromise(async g=>{let[,f]=u,h=await kC({project:n,locator:r,binFolder:g});await Promise.all(Array.from(c,([C,[,y]])=>qa(h.BERRY_BIN_FOLDER,Ur(C),process.execPath,[y])));let p;try{p=await Wo(process.execPath,[...l,f,...t],{cwd:i,env:h,stdin:s,stdout:o,stderr:a})}finally{await M.removePromise(h.BERRY_BIN_FOLDER)}return p.code})}async function mRe(r,e,t,{cwd:i,stdin:n,stdout:s,stderr:o,packageAccessibleBinaries:a}){return await h7(r.anchoredLocator,e,t,{project:r.project,cwd:i,stdin:n,stdout:s,stderr:o,packageAccessibleBinaries:a})}var mi={};ut(mi,{convertToZip:()=>qNe,extractArchiveTo:()=>WNe,makeArchiveFromDirectory:()=>jNe});var nZ=J("stream"),sZ=Pe(_X());var $X=Pe(Yg()),eZ=J("worker_threads");var gl=Symbol("kTaskInfo"),R0=class{constructor(e){this.source=e;this.workers=[];this.limit=(0,$X.default)(ek());this.cleanupInterval=setInterval(()=>{if(this.limit.pendingCount===0&&this.limit.activeCount===0){let t=this.workers.pop();t?t.terminate():clearInterval(this.cleanupInterval)}},5e3).unref()}createWorker(){this.cleanupInterval.refresh();let e=new eZ.Worker(this.source,{eval:!0,execArgv:[...process.execArgv,"--unhandled-rejections=strict"]});return e.on("message",t=>{if(!e[gl])throw new Error("Assertion failed: Worker sent a result without having a task assigned");e[gl].resolve(t),e[gl]=null,e.unref(),this.workers.push(e)}),e.on("error",t=>{var i;(i=e[gl])==null||i.reject(t),e[gl]=null}),e.on("exit",t=>{var i;t!==0&&((i=e[gl])==null||i.reject(new Error(`Worker exited with code ${t}`))),e[gl]=null}),e}run(e){return this.limit(()=>{var i;let t=(i=this.workers.pop())!=null?i:this.createWorker();return t.ref(),new Promise((n,s)=>{t[gl]={resolve:n,reject:s},t.postMessage(e)})})}};var oZ=Pe(rZ());async function jNe(r,{baseFs:e=new $t,prefixPath:t=Oe.root,compressionLevel:i,inMemory:n=!1}={}){let s=await sn(),o;if(n)o=new Wr(null,{libzip:s,level:i});else{let l=await M.mktempPromise(),c=x.join(l,"archive.zip");o=new Wr(c,{create:!0,libzip:s,level:i})}let a=x.resolve(Oe.root,t);return await o.copyPromise(a,r,{baseFs:e,stableTime:!0,stableSort:!0}),o}var iZ;async function qNe(r,e){let t=await M.mktempPromise(),i=x.join(t,"archive.zip");return iZ||(iZ=new R0((0,oZ.getContent)())),await iZ.run({tmpFile:i,tgz:r,opts:e}),new Wr(i,{libzip:await sn(),level:e.compressionLevel})}async function*JNe(r){let e=new sZ.default.Parse,t=new nZ.PassThrough({objectMode:!0,autoDestroy:!0,emitClose:!0});e.on("entry",i=>{t.write(i)}),e.on("error",i=>{t.destroy(i)}),e.on("close",()=>{t.destroyed||t.end()}),e.end(r);for await(let i of t){let n=i;yield n,n.resume()}}async function WNe(r,e,{stripComponents:t=0,prefixPath:i=Oe.dot}={}){var s,o;function n(a){if(a.path[0]==="/")return!0;let l=a.path.split(/\//g);return!!(l.some(c=>c==="..")||l.length<=t)}for await(let a of JNe(r)){if(n(a))continue;let l=x.normalize(K.toPortablePath(a.path)).replace(/\/$/,"").split(/\//g);if(l.length<=t)continue;let c=l.slice(t).join("/"),u=x.join(i,c),g=420;switch((a.type==="Directory"||(((s=a.mode)!=null?s:0)&73)!==0)&&(g|=73),a.type){case"Directory":e.mkdirpSync(x.dirname(u),{chmod:493,utimes:[xr.SAFE_TIME,xr.SAFE_TIME]}),e.mkdirSync(u,{mode:g}),e.utimesSync(u,xr.SAFE_TIME,xr.SAFE_TIME);break;case"OldFile":case"File":e.mkdirpSync(x.dirname(u),{chmod:493,utimes:[xr.SAFE_TIME,xr.SAFE_TIME]}),e.writeFileSync(u,await hf(a),{mode:g}),e.utimesSync(u,xr.SAFE_TIME,xr.SAFE_TIME);break;case"SymbolicLink":e.mkdirpSync(x.dirname(u),{chmod:493,utimes:[xr.SAFE_TIME,xr.SAFE_TIME]}),e.symlinkSync(a.linkpath,u),(o=e.lutimesSync)==null||o.call(e,u,xr.SAFE_TIME,xr.SAFE_TIME);break}}return e}var _n={};ut(_n,{emitList:()=>zNe,emitTree:()=>gZ,treeNodeToJson:()=>uZ,treeNodeToTreeify:()=>cZ});var lZ=Pe(AZ());function cZ(r,{configuration:e}){let t={},i=(n,s)=>{let o=Array.isArray(n)?n.entries():Object.entries(n);for(let[a,{label:l,value:c,children:u}]of o){let g=[];typeof l<"u"&&g.push(qy(e,l,2)),typeof c<"u"&&g.push($e(e,c[0],c[1])),g.length===0&&g.push(qy(e,`${a}`,2));let f=g.join(": "),h=s[f]={};typeof u<"u"&&i(u,h)}};if(typeof r.children>"u")throw new Error("The root node must only contain children");return i(r.children,t),t}function uZ(r){let e=t=>{var s;if(typeof t.children>"u"){if(typeof t.value>"u")throw new Error("Assertion failed: Expected a value to be set if the children are missing");return Ec(t.value[0],t.value[1])}let i=Array.isArray(t.children)?t.children.entries():Object.entries((s=t.children)!=null?s:{}),n=Array.isArray(t.children)?[]:{};for(let[o,a]of i)n[o]=e(a);return typeof t.value>"u"?n:{value:Ec(t.value[0],t.value[1]),children:n}};return e(r)}function zNe(r,{configuration:e,stdout:t,json:i}){let n=r.map(s=>({value:s}));gZ({children:n},{configuration:e,stdout:t,json:i})}function gZ(r,{configuration:e,stdout:t,json:i,separators:n=0}){var o;if(i){let a=Array.isArray(r.children)?r.children.values():Object.values((o=r.children)!=null?o:{});for(let l of a)t.write(`${JSON.stringify(uZ(l))}
-`);return}let s=(0,lZ.asTree)(cZ(r,{configuration:e}),!1,!1);if(n>=1&&(s=s.replace(/^([├└]─)/gm,`\u2502
-$1`).replace(/^│\n/,"")),n>=2)for(let a=0;a<2;++a)s=s.replace(/^([│ ].{2}[├│ ].{2}[^\n]+\n)(([│ ]).{2}[├└].{2}[^\n]*\n[│ ].{2}[│ ].{2}[├└]─)/gm,`$1$3  \u2502
-$2`).replace(/^│\n/,"");if(n>=3)throw new Error("Only the first two levels are accepted by treeUtils.emitTree");t.write(s)}var fZ=J("crypto"),PN=Pe(J("fs"));var VNe=8,Rt=class{constructor(e,{configuration:t,immutable:i=t.get("enableImmutableCache"),check:n=!1}){this.markedFiles=new Set;this.mutexes=new Map;this.cacheId=`-${(0,fZ.randomBytes)(8).toString("hex")}.tmp`;this.configuration=t,this.cwd=e,this.immutable=i,this.check=n;let s=t.get("cacheKeyOverride");if(s!==null)this.cacheKey=`${s}`;else{let o=t.get("compressionLevel"),a=o!==Jl?`c${o}`:"";this.cacheKey=[VNe,a].join("")}}static async find(e,{immutable:t,check:i}={}){let n=new Rt(e.get("cacheFolder"),{configuration:e,immutable:t,check:i});return await n.setup(),n}get mirrorCwd(){if(!this.configuration.get("enableMirror"))return null;let e=`${this.configuration.get("globalFolder")}/cache`;return e!==this.cwd?e:null}getVersionFilename(e){return`${bf(e)}-${this.cacheKey}.zip`}getChecksumFilename(e,t){let n=XNe(t).slice(0,10);return`${bf(e)}-${n}.zip`}getLocatorPath(e,t,i={}){var s;return this.mirrorCwd===null||((s=i.unstablePackages)==null?void 0:s.has(e.locatorHash))?x.resolve(this.cwd,this.getVersionFilename(e)):t===null||xN(t)!==this.cacheKey?null:x.resolve(this.cwd,this.getChecksumFilename(e,t))}getLocatorMirrorPath(e){let t=this.mirrorCwd;return t!==null?x.resolve(t,this.getVersionFilename(e)):null}async setup(){if(!this.configuration.get("enableGlobalCache"))if(this.immutable){if(!await M.existsPromise(this.cwd))throw new at(56,"Cache path does not exist.")}else{await M.mkdirPromise(this.cwd,{recursive:!0});let e=x.resolve(this.cwd,".gitignore");await M.changeFilePromise(e,`/.gitignore
-*.flock
-*.tmp
-`)}(this.mirrorCwd||!this.immutable)&&await M.mkdirPromise(this.mirrorCwd||this.cwd,{recursive:!0})}async fetchPackageFromCache(e,t,{onHit:i,onMiss:n,loader:s,...o}){var W;let a=this.getLocatorMirrorPath(e),l=new $t,c=()=>{let _=new Wr(null,{libzip:D}),A=x.join(Oe.root,qD(e));return _.mkdirSync(A,{recursive:!0}),_.writeJsonSync(x.join(A,xt.manifest),{name:Ot(e),mocked:!0}),_},u=async(_,A=null)=>{var ge;if(A===null&&((ge=o.unstablePackages)==null?void 0:ge.has(e.locatorHash)))return{isValid:!0,hash:null};let ae=!o.skipIntegrityCheck||!t?`${this.cacheKey}/${await Iw(_)}`:t;if(A!==null){let re=!o.skipIntegrityCheck||!t?`${this.cacheKey}/${await Iw(A)}`:t;if(ae!==re)throw new at(18,"The remote archive doesn't match the local checksum - has the local cache been corrupted?")}if(t!==null&&ae!==t){let re;switch(this.check?re="throw":xN(t)!==xN(ae)?re="update":re=this.configuration.get("checksumBehavior"),re){case"ignore":return{isValid:!0,hash:t};case"update":return{isValid:!0,hash:ae};case"reset":return{isValid:!1,hash:t};default:case"throw":throw new at(18,"The remote archive doesn't match the expected checksum")}}return{isValid:!0,hash:ae}},g=async _=>{if(!s)throw new Error(`Cache check required but no loader configured for ${mt(this.configuration,e)}`);let A=await s(),ae=A.getRealPath();A.saveAndClose(),await M.chmodPromise(ae,420);let ge=await u(_,ae);if(!ge.isValid)throw new Error("Assertion failed: Expected a valid checksum");return ge.hash},f=async()=>{if(a===null||!await M.existsPromise(a)){let _=await s(),A=_.getRealPath();return _.saveAndClose(),{source:"loader",path:A}}return{source:"mirror",path:a}},h=async()=>{if(!s)throw new Error(`Cache entry required but missing for ${mt(this.configuration,e)}`);if(this.immutable)throw new at(56,`Cache entry required but missing for ${mt(this.configuration,e)}`);let{path:_,source:A}=await f(),ae=(await u(_)).hash,ge=this.getLocatorPath(e,ae,o);if(!ge)throw new Error("Assertion failed: Expected the cache path to be available");let re=[];A!=="mirror"&&a!==null&&re.push(async()=>{let F=`${a}${this.cacheId}`;await M.copyFilePromise(_,F,PN.default.constants.COPYFILE_FICLONE),await M.chmodPromise(F,420),await M.renamePromise(F,a)}),(!o.mirrorWriteOnly||a===null)&&re.push(async()=>{let F=`${ge}${this.cacheId}`;await M.copyFilePromise(_,F,PN.default.constants.COPYFILE_FICLONE),await M.chmodPromise(F,420),await M.renamePromise(F,ge)});let O=o.mirrorWriteOnly&&a!=null?a:ge;return await Promise.all(re.map(F=>F())),[!1,O,ae]},p=async()=>{let A=(async()=>{var ue;let ae=this.getLocatorPath(e,t,o),ge=ae!==null?await l.existsPromise(ae):!1,re=!!((ue=o.mockedPackages)!=null&&ue.has(e.locatorHash))&&(!this.check||!ge),O=re||ge,F=O?i:n;if(F&&F(),O){let he=null,ke=ae;if(!re)if(this.check)he=await g(ke);else{let Fe=await u(ke);if(Fe.isValid)he=Fe.hash;else return h()}return[re,ke,he]}else return h()})();this.mutexes.set(e.locatorHash,A);try{return await A}finally{this.mutexes.delete(e.locatorHash)}};for(let _;_=this.mutexes.get(e.locatorHash);)await _;let[C,y,B]=await p();this.markedFiles.add(y);let v,D=await sn(),L=C?()=>c():()=>new Wr(y,{baseFs:l,libzip:D,readOnly:!0}),H=new Bg(()=>Jx(()=>v=L(),_=>`Failed to open the cache entry for ${mt(this.configuration,e)}: ${_}`),x),j=new bo(y,{baseFs:H,pathUtils:x}),$=()=>{v==null||v.discardAndClose()},V=(W=o.unstablePackages)!=null&&W.has(e.locatorHash)?null:B;return[j,$,V]}};function xN(r){let e=r.indexOf("/");return e!==-1?r.slice(0,e):null}function XNe(r){let e=r.indexOf("/");return e!==-1?r.slice(e+1):r}var F0=(t=>(t[t.SCRIPT=0]="SCRIPT",t[t.SHELLCODE=1]="SHELLCODE",t))(F0||{});var ra=class extends vi{constructor({configuration:t,stdout:i,suggestInstall:n=!0}){super();this.errorCount=0;zd(this,{configuration:t}),this.configuration=t,this.stdout=i,this.suggestInstall=n}static async start(t,i){let n=new this(t);try{await i(n)}catch(s){n.reportExceptionOnce(s)}finally{await n.finalize()}return n}hasErrors(){return this.errorCount>0}exitCode(){return this.hasErrors()?1:0}reportCacheHit(t){}reportCacheMiss(t){}startSectionSync(t,i){return i()}async startSectionPromise(t,i){return await i()}startTimerSync(t,i,n){return(typeof i=="function"?i:n)()}async startTimerPromise(t,i,n){return await(typeof i=="function"?i:n)()}async startCacheReport(t){return await t()}reportSeparator(){}reportInfo(t,i){}reportWarning(t,i){}reportError(t,i){this.errorCount+=1,this.stdout.write(`${$e(this.configuration,"\u27A4","redBright")} ${this.formatNameWithHyperlink(t)}: ${i}
-`)}reportProgress(t){return{...Promise.resolve().then(async()=>{for await(let{}of t);}),stop:()=>{}}}reportJson(t){}async finalize(){this.errorCount>0&&(this.stdout.write(`
-`),this.stdout.write(`${$e(this.configuration,"\u27A4","redBright")} Errors happened when preparing the environment required to run this command.
-`),this.suggestInstall&&this.stdout.write(`${$e(this.configuration,"\u27A4","redBright")} This might be caused by packages being missing from the lockfile, in which case running "yarn install" might help.
-`))}formatNameWithHyperlink(t){return qR(t,{configuration:this.configuration,json:!1})}};var J0=J("crypto");function tA(){}tA.prototype={diff:function(e,t){var i=arguments.length>2&&arguments[2]!==void 0?arguments[2]:{},n=i.callback;typeof i=="function"&&(n=i,i={}),this.options=i;var s=this;function o(C){return n?(setTimeout(function(){n(void 0,C)},0),!0):C}e=this.castInput(e),t=this.castInput(t),e=this.removeEmpty(this.tokenize(e)),t=this.removeEmpty(this.tokenize(t));var a=t.length,l=e.length,c=1,u=a+l;i.maxEditLength&&(u=Math.min(u,i.maxEditLength));var g=[{newPos:-1,components:[]}],f=this.extractCommon(g[0],t,e,0);if(g[0].newPos+1>=a&&f+1>=l)return o([{value:this.join(t),count:t.length}]);function h(){for(var C=-1*c;C<=c;C+=2){var y=void 0,B=g[C-1],v=g[C+1],D=(v?v.newPos:0)-C;B&&(g[C-1]=void 0);var L=B&&B.newPos+1<a,H=v&&0<=D&&D<l;if(!L&&!H){g[C]=void 0;continue}if(!L||H&&B.newPos<v.newPos?(y=_Ne(v),s.pushComponent(y.components,void 0,!0)):(y=B,y.newPos++,s.pushComponent(y.components,!0,void 0)),D=s.extractCommon(y,t,e,C),y.newPos+1>=a&&D+1>=l)return o(ZNe(s,y.components,t,e,s.useLongestToken));g[C]=y}c++}if(n)(function C(){setTimeout(function(){if(c>u)return n();h()||C()},0)})();else for(;c<=u;){var p=h();if(p)return p}},pushComponent:function(e,t,i){var n=e[e.length-1];n&&n.added===t&&n.removed===i?e[e.length-1]={count:n.count+1,added:t,removed:i}:e.push({count:1,added:t,removed:i})},extractCommon:function(e,t,i,n){for(var s=t.length,o=i.length,a=e.newPos,l=a-n,c=0;a+1<s&&l+1<o&&this.equals(t[a+1],i[l+1]);)a++,l++,c++;return c&&e.components.push({count:c}),e.newPos=a,l},equals:function(e,t){return this.options.comparator?this.options.comparator(e,t):e===t||this.options.ignoreCase&&e.toLowerCase()===t.toLowerCase()},removeEmpty:function(e){for(var t=[],i=0;i<e.length;i++)e[i]&&t.push(e[i]);return t},castInput:function(e){return e},tokenize:function(e){return e.split("")},join:function(e){return e.join("")}};function ZNe(r,e,t,i,n){for(var s=0,o=e.length,a=0,l=0;s<o;s++){var c=e[s];if(c.removed){if(c.value=r.join(i.slice(l,l+c.count)),l+=c.count,s&&e[s-1].added){var g=e[s-1];e[s-1]=e[s],e[s]=g}}else{if(!c.added&&n){var u=t.slice(a,a+c.count);u=u.map(function(h,p){var C=i[l+p];return C.length>h.length?C:h}),c.value=r.join(u)}else c.value=r.join(t.slice(a,a+c.count));a+=c.count,c.added||(l+=c.count)}}var f=e[o-1];return o>1&&typeof f.value=="string"&&(f.added||f.removed)&&r.equals("",f.value)&&(e[o-2].value+=f.value,e.pop()),e}function _Ne(r){return{newPos:r.newPos,components:r.components.slice(0)}}var Pat=new tA;var hZ=/^[A-Za-z\xC0-\u02C6\u02C8-\u02D7\u02DE-\u02FF\u1E00-\u1EFF]+$/,pZ=/\S/,dZ=new tA;dZ.equals=function(r,e){return this.options.ignoreCase&&(r=r.toLowerCase(),e=e.toLowerCase()),r===e||this.options.ignoreWhitespace&&!pZ.test(r)&&!pZ.test(e)};dZ.tokenize=function(r){for(var e=r.split(/([^\S\r\n]+|[()[\]{}'"\r\n]|\b)/),t=0;t<e.length-1;t++)!e[t+1]&&e[t+2]&&hZ.test(e[t])&&hZ.test(e[t+2])&&(e[t]+=e[t+2],e.splice(t+1,2),t--);return e};var NN=new tA;NN.tokenize=function(r){var e=[],t=r.split(/(\n|\r\n)/);t[t.length-1]||t.pop();for(var i=0;i<t.length;i++){var n=t[i];i%2&&!this.options.newlineIsToken?e[e.length-1]+=n:(this.options.ignoreWhitespace&&(n=n.trim()),e.push(n))}return e};function $Ne(r,e,t){return NN.diff(r,e,t)}var eLe=new tA;eLe.tokenize=function(r){return r.split(/(\S.+?[.!?])(?=\s+|$)/)};var tLe=new tA;tLe.tokenize=function(r){return r.split(/([{}:;,]|\s+)/)};function N0(r){return typeof Symbol=="function"&&typeof Symbol.iterator=="symbol"?N0=function(e){return typeof e}:N0=function(e){return e&&typeof Symbol=="function"&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},N0(r)}function DN(r){return rLe(r)||iLe(r)||nLe(r)||sLe()}function rLe(r){if(Array.isArray(r))return kN(r)}function iLe(r){if(typeof Symbol<"u"&&Symbol.iterator in Object(r))return Array.from(r)}function nLe(r,e){if(!!r){if(typeof r=="string")return kN(r,e);var t=Object.prototype.toString.call(r).slice(8,-1);if(t==="Object"&&r.constructor&&(t=r.constructor.name),t==="Map"||t==="Set")return Array.from(r);if(t==="Arguments"||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t))return kN(r,e)}}function kN(r,e){(e==null||e>r.length)&&(e=r.length);for(var t=0,i=new Array(e);t<e;t++)i[t]=r[t];return i}function sLe(){throw new TypeError(`Invalid attempt to spread non-iterable instance.
-In order to be iterable, non-array objects must have a [Symbol.iterator]() method.`)}var oLe=Object.prototype.toString,VC=new tA;VC.useLongestToken=!0;VC.tokenize=NN.tokenize;VC.castInput=function(r){var e=this.options,t=e.undefinedReplacement,i=e.stringifyReplacer,n=i===void 0?function(s,o){return typeof o>"u"?t:o}:i;return typeof r=="string"?r:JSON.stringify(RN(r,null,null,n),n,"  ")};VC.equals=function(r,e){return tA.prototype.equals.call(VC,r.replace(/,([\r\n])/g,"$1"),e.replace(/,([\r\n])/g,"$1"))};function RN(r,e,t,i,n){e=e||[],t=t||[],i&&(r=i(n,r));var s;for(s=0;s<e.length;s+=1)if(e[s]===r)return t[s];var o;if(oLe.call(r)==="[object Array]"){for(e.push(r),o=new Array(r.length),t.push(o),s=0;s<r.length;s+=1)o[s]=RN(r[s],e,t,i,n);return e.pop(),t.pop(),o}if(r&&r.toJSON&&(r=r.toJSON()),N0(r)==="object"&&r!==null){e.push(r),o={},t.push(o);var a=[],l;for(l in r)r.hasOwnProperty(l)&&a.push(l);for(a.sort(),s=0;s<a.length;s+=1)l=a[s],o[l]=RN(r[l],e,t,i,l);e.pop(),t.pop()}else o=r;return o}var FN=new tA;FN.tokenize=function(r){return r.slice()};FN.join=FN.removeEmpty=function(r){return r};function CZ(r,e,t,i,n,s,o){o||(o={}),typeof o.context>"u"&&(o.context=4);var a=$Ne(t,i,o);if(!a)return;a.push({value:"",lines:[]});function l(B){return B.map(function(v){return" "+v})}for(var c=[],u=0,g=0,f=[],h=1,p=1,C=function(v){var D=a[v],L=D.lines||D.value.replace(/\n$/,"").split(`
-`);if(D.lines=L,D.added||D.removed){var H;if(!u){var j=a[v-1];u=h,g=p,j&&(f=o.context>0?l(j.lines.slice(-o.context)):[],u-=f.length,g-=f.length)}(H=f).push.apply(H,DN(L.map(function(re){return(D.added?"+":"-")+re}))),D.added?p+=L.length:h+=L.length}else{if(u)if(L.length<=o.context*2&&v<a.length-2){var $;($=f).push.apply($,DN(l(L)))}else{var V,W=Math.min(L.length,o.context);(V=f).push.apply(V,DN(l(L.slice(0,W))));var _={oldStart:u,oldLines:h-u+W,newStart:g,newLines:p-g+W,lines:f};if(v>=a.length-2&&L.length<=o.context){var A=/\n$/.test(t),ae=/\n$/.test(i),ge=L.length==0&&f.length>_.oldLines;!A&&ge&&t.length>0&&f.splice(_.oldLines,0,"\\ No newline at end of file"),(!A&&!ge||!ae)&&f.push("\\ No newline at end of file")}c.push(_),u=0,g=0,f=[]}h+=L.length,p+=L.length}},y=0;y<a.length;y++)C(y);return{oldFileName:r,newFileName:e,oldHeader:n,newHeader:s,hunks:c}}var W0=Pe(B$()),x$=Pe(Yg()),P$=Pe(Xr()),JN=J("util"),qN=Pe(J("v8")),WN=Pe(J("zlib"));var NMe=[[/^(git(?:\+(?:https|ssh))?:\/\/.*(?:\.git)?)#(.*)$/,(r,e,t,i)=>`${t}#commit=${i}`],[/^https:\/\/((?:[^/]+?)@)?codeload\.github\.com\/([^/]+\/[^/]+)\/tar\.gz\/([0-9a-f]+)$/,(r,e,t="",i,n)=>`https://${t}github.com/${i}.git#commit=${n}`],[/^https:\/\/((?:[^/]+?)@)?github\.com\/([^/]+\/[^/]+?)(?:\.git)?#([0-9a-f]+)$/,(r,e,t="",i,n)=>`https://${t}github.com/${i}.git#commit=${n}`],[/^https?:\/\/[^/]+\/(?:[^/]+\/)*(?:@.+(?:\/|(?:%2f)))?([^/]+)\/(?:-|download)\/\1-[^/]+\.tgz(?:#|$)/,r=>`npm:${r}`],[/^https:\/\/npm\.pkg\.github\.com\/download\/(?:@[^/]+)\/(?:[^/]+)\/(?:[^/]+)\/(?:[0-9a-f]+)(?:#|$)/,r=>`npm:${r}`],[/^https:\/\/npm\.fontawesome\.com\/(?:@[^/]+)\/([^/]+)\/-\/([^/]+)\/\1-\2.tgz(?:#|$)/,r=>`npm:${r}`],[/^https?:\/\/[^/]+\/.*\/(@[^/]+)\/([^/]+)\/-\/\1\/\2-(?:[.\d\w-]+)\.tgz(?:#|$)/,(r,e)=>Qw({protocol:"npm:",source:null,selector:r,params:{__archiveUrl:e}})],[/^[^/]+\.tgz#[0-9a-f]+$/,r=>`npm:${r}`]],Y0=class{constructor(e){this.resolver=e;this.resolutions=null}async setup(e,{report:t}){let i=x.join(e.cwd,e.configuration.get("lockfileFilename"));if(!M.existsSync(i))return;let n=await M.readFilePromise(i,"utf8"),s=yi(n);if(Object.prototype.hasOwnProperty.call(s,"__metadata"))return;let o=this.resolutions=new Map;for(let a of Object.keys(s)){let l=sC(a);if(!l){t.reportWarning(14,`Failed to parse the string "${a}" into a proper descriptor`);continue}let c=io(l.range)?_t(l,`npm:${l.range}`):l,{version:u,resolved:g}=s[a];if(!g)continue;let f;for(let[p,C]of NMe){let y=g.match(p);if(y){f=C(u,...y);break}}if(!f){t.reportWarning(14,`${tr(e.configuration,c)}: Only some patterns can be imported from legacy lockfiles (not "${g}")`);continue}let h=c;try{let p=Qf(c.range),C=sC(p.selector,!0);C&&(h=C)}catch{}o.set(c.descriptorHash,tn(h,f))}}supportsDescriptor(e,t){return this.resolutions?this.resolutions.has(e.descriptorHash):!1}supportsLocator(e,t){return!1}shouldPersistResolution(e,t){throw new Error("Assertion failed: This resolver doesn't support resolving locators to packages")}bindDescriptor(e,t,i){return e}getResolutionDependencies(e,t){return[]}async getCandidates(e,t,i){if(!this.resolutions)throw new Error("Assertion failed: The resolution store should have been setup");let n=this.resolutions.get(e.descriptorHash);if(!n)throw new Error("Assertion failed: The resolution should have been registered");return await this.resolver.getCandidates(HD(n),t,i)}async getSatisfying(e,t,i){return null}async resolve(e,t){throw new Error("Assertion failed: This resolver doesn't support resolving locators to packages")}};var j0=class{constructor(e){this.resolver=e}supportsDescriptor(e,t){return!!(t.project.storedResolutions.get(e.descriptorHash)||t.project.originalPackages.has(ww(e).locatorHash))}supportsLocator(e,t){return!!(t.project.originalPackages.has(e.locatorHash)&&!t.project.lockfileNeedsRefresh)}shouldPersistResolution(e,t){throw new Error("The shouldPersistResolution method shouldn't be called on the lockfile resolver, which would always answer yes")}bindDescriptor(e,t,i){return e}getResolutionDependencies(e,t){return this.resolver.getResolutionDependencies(e,t)}async getCandidates(e,t,i){let n=i.project.originalPackages.get(ww(e).locatorHash);if(n)return[n];let s=i.project.storedResolutions.get(e.descriptorHash);if(!s)throw new Error("Expected the resolution to have been successful - resolution not found");if(n=i.project.originalPackages.get(s),!n)throw new Error("Expected the resolution to have been successful - package not found");return[n]}async getSatisfying(e,t,i){return null}async resolve(e,t){let i=t.project.originalPackages.get(e.locatorHash);if(!i)throw new Error("The lockfile resolver isn't meant to resolve packages - they should already have been stored into a cache");return i}};var q0=class{constructor(e){this.resolver=e}supportsDescriptor(e,t){return this.resolver.supportsDescriptor(e,t)}supportsLocator(e,t){return this.resolver.supportsLocator(e,t)}shouldPersistResolution(e,t){return this.resolver.shouldPersistResolution(e,t)}bindDescriptor(e,t,i){return this.resolver.bindDescriptor(e,t,i)}getResolutionDependencies(e,t){return this.resolver.getResolutionDependencies(e,t)}async getCandidates(e,t,i){throw new at(20,`This package doesn't seem to be present in your lockfile; run "yarn install" to update the lockfile`)}async getSatisfying(e,t,i){throw new at(20,`This package doesn't seem to be present in your lockfile; run "yarn install" to update the lockfile`)}async resolve(e,t){throw new at(20,`This package doesn't seem to be present in your lockfile; run "yarn install" to update the lockfile`)}};var ti=class extends vi{reportCacheHit(e){}reportCacheMiss(e){}startSectionSync(e,t){return t()}async startSectionPromise(e,t){return await t()}startTimerSync(e,t,i){return(typeof t=="function"?t:i)()}async startTimerPromise(e,t,i){return await(typeof t=="function"?t:i)()}async startCacheReport(e){return await e()}reportSeparator(){}reportInfo(e,t){}reportWarning(e,t){}reportError(e,t){}reportProgress(e){return{...Promise.resolve().then(async()=>{for await(let{}of e);}),stop:()=>{}}}reportJson(e){}async finalize(){}};var Q$=Pe(MD());var wh=class{constructor(e,{project:t}){this.workspacesCwds=new Set;this.dependencies=new Map;this.project=t,this.cwd=e}async setup(){var s;this.manifest=(s=await ot.tryFind(this.cwd))!=null?s:new ot,this.relativeCwd=x.relative(this.project.cwd,this.cwd)||Oe.dot;let e=this.manifest.name?this.manifest.name:qo(null,`${this.computeCandidateName()}-${en(this.relativeCwd).substring(0,6)}`),t=this.manifest.version?this.manifest.version:"0.0.0";this.locator=tn(e,t),this.anchoredDescriptor=_t(this.locator,`${jr.protocol}${this.relativeCwd}`),this.anchoredLocator=tn(this.locator,`${jr.protocol}${this.relativeCwd}`);let i=this.manifest.workspaceDefinitions.map(({pattern:o})=>o),n=await(0,Q$.default)(i,{cwd:K.fromPortablePath(this.cwd),expandDirectories:!1,onlyDirectories:!0,onlyFiles:!1,ignore:["**/node_modules","**/.git","**/.yarn"]});n.sort();for(let o of n){let a=x.resolve(this.cwd,K.toPortablePath(o));M.existsSync(x.join(a,"package.json"))&&this.workspacesCwds.add(a)}}accepts(e){var o;let t=e.indexOf(":"),i=t!==-1?e.slice(0,t+1):null,n=t!==-1?e.slice(t+1):e;if(i===jr.protocol&&x.normalize(n)===this.relativeCwd||i===jr.protocol&&(n==="*"||n==="^"||n==="~"))return!0;let s=io(n);return s?i===jr.protocol?s.test((o=this.manifest.version)!=null?o:"0.0.0"):this.project.configuration.get("enableTransparentWorkspaces")&&this.manifest.version!==null?s.test(this.manifest.version):!1:!1}computeCandidateName(){return this.cwd===this.project.cwd?"root-workspace":`${x.basename(this.cwd)}`||"unnamed-workspace"}getRecursiveWorkspaceDependencies({dependencies:e=ot.hardDependencies}={}){let t=new Set,i=n=>{for(let s of e)for(let o of n.manifest[s].values()){let a=this.project.tryWorkspaceByDescriptor(o);a===null||t.has(a)||(t.add(a),i(a))}};return i(this),t}getRecursiveWorkspaceDependents({dependencies:e=ot.hardDependencies}={}){let t=new Set,i=n=>{for(let s of this.project.workspaces)e.some(a=>[...s.manifest[a].values()].some(l=>{let c=this.project.tryWorkspaceByDescriptor(l);return c!==null&&nC(c.anchoredLocator,n.anchoredLocator)}))&&!t.has(s)&&(t.add(s),i(s))};return i(this),t}getRecursiveWorkspaceChildren(){let e=[];for(let t of this.workspacesCwds){let i=this.project.workspacesByCwd.get(t);i&&e.push(i,...i.getRecursiveWorkspaceChildren())}return e}async persistManifest(){let e={};this.manifest.exportTo(e);let t=x.join(this.cwd,ot.fileName),i=`${JSON.stringify(e,null,this.manifest.indent)}
-`;await M.changeFilePromise(t,i,{automaticNewlines:!0}),this.manifest.raw=e}};var b$=6,LMe=1,TMe=/ *, */g,S$=/\/$/,OMe=32,MMe=(0,JN.promisify)(WN.default.gzip),KMe=(0,JN.promisify)(WN.default.gunzip),$n=(t=>(t.UpdateLockfile="update-lockfile",t.SkipBuild="skip-build",t))($n||{}),jN={restoreInstallersCustomData:["installersCustomData"],restoreResolutions:["accessibleLocators","conditionalLocators","disabledLocators","optionalBuilds","storedDescriptors","storedResolutions","storedPackages","lockFileChecksum"],restoreBuildState:["storedBuildState"]},v$=r=>en(`${LMe}`,r),je=class{constructor(e,{configuration:t}){this.resolutionAliases=new Map;this.workspaces=[];this.workspacesByCwd=new Map;this.workspacesByIdent=new Map;this.storedResolutions=new Map;this.storedDescriptors=new Map;this.storedPackages=new Map;this.storedChecksums=new Map;this.storedBuildState=new Map;this.accessibleLocators=new Set;this.conditionalLocators=new Set;this.disabledLocators=new Set;this.originalPackages=new Map;this.optionalBuilds=new Set;this.lockfileNeedsRefresh=!1;this.peerRequirements=new Map;this.installersCustomData=new Map;this.lockFileChecksum=null;this.installStateChecksum=null;this.configuration=t,this.cwd=e}static async find(e,t){var p,C,y;if(!e.projectCwd)throw new be(`No project found in ${t}`);let i=e.projectCwd,n=t,s=null;for(;s!==e.projectCwd;){if(s=n,M.existsSync(x.join(s,xt.manifest))){i=s;break}n=x.dirname(s)}let o=new je(e.projectCwd,{configuration:e});(p=ye.telemetry)==null||p.reportProject(o.cwd),await o.setupResolutions(),await o.setupWorkspaces(),(C=ye.telemetry)==null||C.reportWorkspaceCount(o.workspaces.length),(y=ye.telemetry)==null||y.reportDependencyCount(o.workspaces.reduce((B,v)=>B+v.manifest.dependencies.size+v.manifest.devDependencies.size,0));let a=o.tryWorkspaceByCwd(i);if(a)return{project:o,workspace:a,locator:a.anchoredLocator};let l=await o.findLocatorForLocation(`${i}/`,{strict:!0});if(l)return{project:o,locator:l,workspace:null};let c=$e(e,o.cwd,Ue.PATH),u=$e(e,x.relative(o.cwd,i),Ue.PATH),g=`- If ${c} isn't intended to be a project, remove any yarn.lock and/or package.json file there.`,f=`- If ${c} is intended to be a project, it might be that you forgot to list ${u} in its workspace configuration.`,h=`- Finally, if ${c} is fine and you intend ${u} to be treated as a completely separate project (not even a workspace), create an empty yarn.lock file in it.`;throw new be(`The nearest package directory (${$e(e,i,Ue.PATH)}) doesn't seem to be part of the project declared in ${$e(e,o.cwd,Ue.PATH)}.
-
-${[g,f,h].join(`
-`)}`)}async setupResolutions(){var i;this.storedResolutions=new Map,this.storedDescriptors=new Map,this.storedPackages=new Map,this.lockFileChecksum=null;let e=x.join(this.cwd,this.configuration.get("lockfileFilename")),t=this.configuration.get("defaultLanguageName");if(M.existsSync(e)){let n=await M.readFilePromise(e,"utf8");this.lockFileChecksum=v$(n);let s=yi(n);if(s.__metadata){let o=s.__metadata.version,a=s.__metadata.cacheKey;this.lockfileNeedsRefresh=o<b$;for(let l of Object.keys(s)){if(l==="__metadata")continue;let c=s[l];if(typeof c.resolution>"u")throw new Error(`Assertion failed: Expected the lockfile entry to have a resolution field (${l})`);let u=Sc(c.resolution,!0),g=new ot;g.load(c,{yamlCompatibilityMode:!0});let f=g.version,h=g.languageName||t,p=c.linkType.toUpperCase(),C=(i=c.conditions)!=null?i:null,y=g.dependencies,B=g.peerDependencies,v=g.dependenciesMeta,D=g.peerDependenciesMeta,L=g.bin;if(c.checksum!=null){let j=typeof a<"u"&&!c.checksum.includes("/")?`${a}/${c.checksum}`:c.checksum;this.storedChecksums.set(u.locatorHash,j)}let H={...u,version:f,languageName:h,linkType:p,conditions:C,dependencies:y,peerDependencies:B,dependenciesMeta:v,peerDependenciesMeta:D,bin:L};this.originalPackages.set(H.locatorHash,H);for(let j of l.split(TMe)){let $=JA(j);this.storedDescriptors.set($.descriptorHash,$),this.storedResolutions.set($.descriptorHash,u.locatorHash)}}}}}async setupWorkspaces(){this.workspaces=[],this.workspacesByCwd=new Map,this.workspacesByIdent=new Map;let e=[this.cwd];for(;e.length>0;){let t=e;e=[];for(let i of t){if(this.workspacesByCwd.has(i))continue;let n=await this.addWorkspace(i),s=this.storedPackages.get(n.anchoredLocator.locatorHash);s&&(n.dependencies=s.dependencies);for(let o of n.workspacesCwds)e.push(o)}}}async addWorkspace(e){let t=new wh(e,{project:this});await t.setup();let i=this.workspacesByIdent.get(t.locator.identHash);if(typeof i<"u")throw new Error(`Duplicate workspace name ${Ai(this.configuration,t.locator)}: ${K.fromPortablePath(e)} conflicts with ${K.fromPortablePath(i.cwd)}`);return this.workspaces.push(t),this.workspacesByCwd.set(e,t),this.workspacesByIdent.set(t.locator.identHash,t),t}get topLevelWorkspace(){return this.getWorkspaceByCwd(this.cwd)}tryWorkspaceByCwd(e){x.isAbsolute(e)||(e=x.resolve(this.cwd,e)),e=x.normalize(e).replace(/\/+$/,"");let t=this.workspacesByCwd.get(e);return t||null}getWorkspaceByCwd(e){let t=this.tryWorkspaceByCwd(e);if(!t)throw new Error(`Workspace not found (${e})`);return t}tryWorkspaceByFilePath(e){let t=null;for(let i of this.workspaces)x.relative(i.cwd,e).startsWith("../")||t&&t.cwd.length>=i.cwd.length||(t=i);return t||null}getWorkspaceByFilePath(e){let t=this.tryWorkspaceByFilePath(e);if(!t)throw new Error(`Workspace not found (${e})`);return t}tryWorkspaceByIdent(e){let t=this.workspacesByIdent.get(e.identHash);return typeof t>"u"?null:t}getWorkspaceByIdent(e){let t=this.tryWorkspaceByIdent(e);if(!t)throw new Error(`Workspace not found (${Ai(this.configuration,e)})`);return t}tryWorkspaceByDescriptor(e){let t=this.tryWorkspaceByIdent(e);return t===null||(qA(e)&&(e=tC(e)),!t.accepts(e.range))?null:t}getWorkspaceByDescriptor(e){let t=this.tryWorkspaceByDescriptor(e);if(t===null)throw new Error(`Workspace not found (${tr(this.configuration,e)})`);return t}tryWorkspaceByLocator(e){let t=this.tryWorkspaceByIdent(e);return t===null||(jo(e)&&(e=rC(e)),t.locator.locatorHash!==e.locatorHash&&t.anchoredLocator.locatorHash!==e.locatorHash)?null:t}getWorkspaceByLocator(e){let t=this.tryWorkspaceByLocator(e);if(!t)throw new Error(`Workspace not found (${mt(this.configuration,e)})`);return t}refreshWorkspaceDependencies(){for(let e of this.workspaces){let t=this.storedPackages.get(e.anchoredLocator.locatorHash);if(!t)throw new Error(`Assertion failed: Expected workspace ${aC(this.configuration,e)} (${$e(this.configuration,x.join(e.cwd,xt.manifest),Ue.PATH)}) to have been resolved. Run "yarn install" to update the lockfile`);e.dependencies=new Map(t.dependencies)}}forgetResolution(e){let t=n=>{this.storedResolutions.delete(n),this.storedDescriptors.delete(n)},i=n=>{this.originalPackages.delete(n),this.storedPackages.delete(n),this.accessibleLocators.delete(n)};if("descriptorHash"in e){let n=this.storedResolutions.get(e.descriptorHash);t(e.descriptorHash);let s=new Set(this.storedResolutions.values());typeof n<"u"&&!s.has(n)&&i(n)}if("locatorHash"in e){i(e.locatorHash);for(let[n,s]of this.storedResolutions)s===e.locatorHash&&t(n)}}forgetTransientResolutions(){let e=this.configuration.makeResolver();for(let t of this.originalPackages.values()){let i;try{i=e.shouldPersistResolution(t,{project:this,resolver:e})}catch{i=!1}i||this.forgetResolution(t)}}forgetVirtualResolutions(){for(let e of this.storedPackages.values())for(let[t,i]of e.dependencies)qA(i)&&e.dependencies.set(t,tC(i))}getDependencyMeta(e,t){let i={},s=this.topLevelWorkspace.manifest.dependenciesMeta.get(Ot(e));if(!s)return i;let o=s.get(null);if(o&&Object.assign(i,o),t===null||!P$.default.valid(t))return i;for(let[a,l]of s)a!==null&&a===t&&Object.assign(i,l);return i}async findLocatorForLocation(e,{strict:t=!1}={}){let i=new ti,n=this.configuration.getLinkers(),s={project:this,report:i};for(let o of n){let a=await o.findPackageLocator(e,s);if(a){if(t&&(await o.findPackageLocation(a,s)).replace(S$,"")!==e.replace(S$,""))continue;return a}}return null}async resolveEverything(e){if(!this.workspacesByCwd||!this.workspacesByIdent)throw new Error("Workspaces must have been setup before calling this function");this.forgetVirtualResolutions(),e.lockfileOnly||this.forgetTransientResolutions();let t=e.resolver||this.configuration.makeResolver(),i=new Y0(t);await i.setup(this,{report:e.report});let n=e.lockfileOnly?[new q0(t)]:[i,t],s=new xf([new j0(t),...n]),o=this.configuration.makeFetcher(),a=e.lockfileOnly?{project:this,report:e.report,resolver:s}:{project:this,report:e.report,resolver:s,fetchOptions:{project:this,cache:e.cache,checksums:this.storedChecksums,report:e.report,fetcher:o,cacheOptions:{mirrorWriteOnly:!0}}},l=new Map,c=new Map,u=new Map,g=new Map,f=new Map,h=new Map,p=this.topLevelWorkspace.anchoredLocator,C=new Set,y=[],B=$D(),v=this.configuration.getSupportedArchitectures();await e.report.startProgressPromise(vi.progressViaTitle(),async W=>{let _=async O=>{let F=await ff(async()=>await s.resolve(O,a),ke=>`${mt(this.configuration,O)}: ${ke}`);if(!nC(O,F))throw new Error(`Assertion failed: The locator cannot be changed by the resolver (went from ${mt(this.configuration,O)} to ${mt(this.configuration,F)})`);g.set(F.locatorHash,F);let ue=this.configuration.normalizePackage(F);for(let[ke,Fe]of ue.dependencies){let Ne=await this.configuration.reduceHook(le=>le.reduceDependency,Fe,this,ue,Fe,{resolver:s,resolveOptions:a});if(!iC(Fe,Ne))throw new Error("Assertion failed: The descriptor ident cannot be changed through aliases");let oe=s.bindDescriptor(Ne,O,a);ue.dependencies.set(ke,oe)}let he=to([...ue.dependencies.values()].map(ke=>re(ke)));return y.push(he),he.catch(()=>{}),c.set(ue.locatorHash,ue),ue},A=async O=>{let F=f.get(O.locatorHash);if(typeof F<"u")return F;let ue=Promise.resolve().then(()=>_(O));return f.set(O.locatorHash,ue),ue},ae=async(O,F)=>{let ue=await re(F);return l.set(O.descriptorHash,O),u.set(O.descriptorHash,ue.locatorHash),ue},ge=async O=>{W.setTitle(tr(this.configuration,O));let F=this.resolutionAliases.get(O.descriptorHash);if(typeof F<"u")return ae(O,this.storedDescriptors.get(F));let ue=s.getResolutionDependencies(O,a),he=new Map(await to(ue.map(async Ne=>{let oe=s.bindDescriptor(Ne,p,a),le=await re(oe);return C.add(le.locatorHash),[Ne.descriptorHash,le]}))),Fe=(await ff(async()=>await s.getCandidates(O,he,a),Ne=>`${tr(this.configuration,O)}: ${Ne}`))[0];if(typeof Fe>"u")throw new Error(`${tr(this.configuration,O)}: No candidates found`);return l.set(O.descriptorHash,O),u.set(O.descriptorHash,Fe.locatorHash),A(Fe)},re=O=>{let F=h.get(O.descriptorHash);if(typeof F<"u")return F;l.set(O.descriptorHash,O);let ue=Promise.resolve().then(()=>ge(O));return h.set(O.descriptorHash,ue),ue};for(let O of this.workspaces){let F=O.anchoredDescriptor;y.push(re(F))}for(;y.length>0;){let O=[...y];y.length=0,await to(O)}});let D=new Set(this.resolutionAliases.values()),L=new Set(c.keys()),H=new Set,j=new Map;UMe({project:this,report:e.report,accessibleLocators:H,volatileDescriptors:D,optionalBuilds:L,peerRequirements:j,allDescriptors:l,allResolutions:u,allPackages:c});for(let W of C)L.delete(W);for(let W of D)l.delete(W),u.delete(W);let $=new Set,V=new Set;for(let W of c.values())W.conditions!=null&&(!L.has(W.locatorHash)||(vw(W,v)||(vw(W,B)&&e.report.reportWarningOnce(77,`${mt(this.configuration,W)}: Your current architecture (${process.platform}-${process.arch}) is supported by this package, but is missing from the ${$e(this.configuration,"supportedArchitectures",xi.SETTING)} setting`),V.add(W.locatorHash)),$.add(W.locatorHash)));this.storedResolutions=u,this.storedDescriptors=l,this.storedPackages=c,this.accessibleLocators=H,this.conditionalLocators=$,this.disabledLocators=V,this.originalPackages=g,this.optionalBuilds=L,this.peerRequirements=j,this.refreshWorkspaceDependencies()}async fetchEverything({cache:e,report:t,fetcher:i,mode:n}){let s={mockedPackages:this.disabledLocators,unstablePackages:this.conditionalLocators},o=i||this.configuration.makeFetcher(),a={checksums:this.storedChecksums,project:this,cache:e,fetcher:o,report:t,cacheOptions:s},l=Array.from(new Set(wn(this.storedResolutions.values(),[f=>{let h=this.storedPackages.get(f);if(!h)throw new Error("Assertion failed: The locator should have been registered");return Cs(h)}])));n==="update-lockfile"&&(l=l.filter(f=>!this.storedChecksums.has(f)));let c=!1,u=vi.progressViaCounter(l.length);await t.reportProgress(u);let g=(0,x$.default)(OMe);if(await t.startCacheReport(async()=>{await to(l.map(f=>g(async()=>{let h=this.storedPackages.get(f);if(!h)throw new Error("Assertion failed: The locator should have been registered");if(jo(h))return;let p;try{p=await o.fetch(h,a)}catch(C){C.message=`${mt(this.configuration,h)}: ${C.message}`,t.reportExceptionOnce(C),c=C;return}p.checksum!=null?this.storedChecksums.set(h.locatorHash,p.checksum):this.storedChecksums.delete(h.locatorHash),p.releaseFs&&p.releaseFs()}).finally(()=>{u.tick()})))}),c)throw c}async linkEverything({cache:e,report:t,fetcher:i,mode:n}){var ae,ge,re;let s={mockedPackages:this.disabledLocators,unstablePackages:this.conditionalLocators,skipIntegrityCheck:!0},o=i||this.configuration.makeFetcher(),a={checksums:this.storedChecksums,project:this,cache:e,fetcher:o,report:t,skipIntegrityCheck:!0,cacheOptions:s},l=this.configuration.getLinkers(),c={project:this,report:t},u=new Map(l.map(O=>{let F=O.makeInstaller(c),ue=F.getCustomDataKey(),he=this.installersCustomData.get(ue);return typeof he<"u"&&F.attachCustomData(he),[O,F]})),g=new Map,f=new Map,h=new Map,p=new Map(await to([...this.accessibleLocators].map(async O=>{let F=this.storedPackages.get(O);if(!F)throw new Error("Assertion failed: The locator should have been registered");return[O,await o.fetch(F,a)]}))),C=[];for(let O of this.accessibleLocators){let F=this.storedPackages.get(O);if(typeof F>"u")throw new Error("Assertion failed: The locator should have been registered");let ue=p.get(F.locatorHash);if(typeof ue>"u")throw new Error("Assertion failed: The fetch result should have been registered");let he=[],ke=Ne=>{he.push(Ne)},Fe=this.tryWorkspaceByLocator(F);if(Fe!==null){let Ne=[],{scripts:oe}=Fe.manifest;for(let we of["preinstall","install","postinstall"])oe.has(we)&&Ne.push([0,we]);try{for(let[we,fe]of u)if(we.supportsPackage(F,c)&&(await fe.installPackage(F,ue,{holdFetchResult:ke})).buildDirective!==null)throw new Error("Assertion failed: Linkers can't return build directives for workspaces; this responsibility befalls to the Yarn core")}finally{he.length===0?(ae=ue.releaseFs)==null||ae.call(ue):C.push(to(he).catch(()=>{}).then(()=>{var we;(we=ue.releaseFs)==null||we.call(ue)}))}let le=x.join(ue.packageFs.getRealPath(),ue.prefixPath);f.set(F.locatorHash,le),!jo(F)&&Ne.length>0&&h.set(F.locatorHash,{directives:Ne,buildLocations:[le]})}else{let Ne=l.find(we=>we.supportsPackage(F,c));if(!Ne)throw new at(12,`${mt(this.configuration,F)} isn't supported by any available linker`);let oe=u.get(Ne);if(!oe)throw new Error("Assertion failed: The installer should have been registered");let le;try{le=await oe.installPackage(F,ue,{holdFetchResult:ke})}finally{he.length===0?(ge=ue.releaseFs)==null||ge.call(ue):C.push(to(he).then(()=>{}).then(()=>{var we;(we=ue.releaseFs)==null||we.call(ue)}))}g.set(F.locatorHash,Ne),f.set(F.locatorHash,le.packageLocation),le.buildDirective&&le.buildDirective.length>0&&le.packageLocation&&h.set(F.locatorHash,{directives:le.buildDirective,buildLocations:[le.packageLocation]})}}let y=new Map;for(let O of this.accessibleLocators){let F=this.storedPackages.get(O);if(!F)throw new Error("Assertion failed: The locator should have been registered");let ue=this.tryWorkspaceByLocator(F)!==null,he=async(ke,Fe)=>{let Ne=f.get(F.locatorHash);if(typeof Ne>"u")throw new Error(`Assertion failed: The package (${mt(this.configuration,F)}) should have been registered`);let oe=[];for(let le of F.dependencies.values()){let we=this.storedResolutions.get(le.descriptorHash);if(typeof we>"u")throw new Error(`Assertion failed: The resolution (${tr(this.configuration,le)}, from ${mt(this.configuration,F)})should have been registered`);let fe=this.storedPackages.get(we);if(typeof fe>"u")throw new Error(`Assertion failed: The package (${we}, resolved from ${tr(this.configuration,le)}) should have been registered`);let Ae=this.tryWorkspaceByLocator(fe)===null?g.get(we):null;if(typeof Ae>"u")throw new Error(`Assertion failed: The package (${we}, resolved from ${tr(this.configuration,le)}) should have been registered`);Ae===ke||Ae===null?f.get(fe.locatorHash)!==null&&oe.push([le,fe]):!ue&&Ne!==null&&uf(y,we).push(Ne)}Ne!==null&&await Fe.attachInternalDependencies(F,oe)};if(ue)for(let[ke,Fe]of u)ke.supportsPackage(F,c)&&await he(ke,Fe);else{let ke=g.get(F.locatorHash);if(!ke)throw new Error("Assertion failed: The linker should have been found");let Fe=u.get(ke);if(!Fe)throw new Error("Assertion failed: The installer should have been registered");await he(ke,Fe)}}for(let[O,F]of y){let ue=this.storedPackages.get(O);if(!ue)throw new Error("Assertion failed: The package should have been registered");let he=g.get(ue.locatorHash);if(!he)throw new Error("Assertion failed: The linker should have been found");let ke=u.get(he);if(!ke)throw new Error("Assertion failed: The installer should have been registered");await ke.attachExternalDependents(ue,F)}let B=new Map;for(let O of u.values()){let F=await O.finalizeInstall();for(let ue of(re=F==null?void 0:F.records)!=null?re:[])h.set(ue.locatorHash,{directives:ue.buildDirective,buildLocations:ue.buildLocations});typeof(F==null?void 0:F.customData)<"u"&&B.set(O.getCustomDataKey(),F.customData)}if(this.installersCustomData=B,await to(C),n==="skip-build")return;let v=new Set(this.storedPackages.keys()),D=new Set(h.keys());for(let O of D)v.delete(O);let L=(0,J0.createHash)("sha512");L.update(process.versions.node),await this.configuration.triggerHook(O=>O.globalHashGeneration,this,O=>{L.update("\0"),L.update(O)});let H=L.digest("hex"),j=new Map,$=O=>{let F=j.get(O.locatorHash);if(typeof F<"u")return F;let ue=this.storedPackages.get(O.locatorHash);if(typeof ue>"u")throw new Error("Assertion failed: The package should have been registered");let he=(0,J0.createHash)("sha512");he.update(O.locatorHash),j.set(O.locatorHash,"<recursive>");for(let ke of ue.dependencies.values()){let Fe=this.storedResolutions.get(ke.descriptorHash);if(typeof Fe>"u")throw new Error(`Assertion failed: The resolution (${tr(this.configuration,ke)}) should have been registered`);let Ne=this.storedPackages.get(Fe);if(typeof Ne>"u")throw new Error("Assertion failed: The package should have been registered");he.update($(Ne))}return F=he.digest("hex"),j.set(O.locatorHash,F),F},V=(O,F)=>{let ue=(0,J0.createHash)("sha512");ue.update(H),ue.update($(O));for(let he of F)ue.update(he);return ue.digest("hex")},W=new Map,_=!1,A=O=>{let F=new Set([O.locatorHash]);for(let ue of F){let he=this.storedPackages.get(ue);if(!he)throw new Error("Assertion failed: The package should have been registered");for(let ke of he.dependencies.values()){let Fe=this.storedResolutions.get(ke.descriptorHash);if(!Fe)throw new Error(`Assertion failed: The resolution (${tr(this.configuration,ke)}) should have been registered`);if(Fe!==O.locatorHash&&D.has(Fe))return!1;let Ne=this.storedPackages.get(Fe);if(!Ne)throw new Error("Assertion failed: The package should have been registered");let oe=this.tryWorkspaceByLocator(Ne);if(oe){if(oe.anchoredLocator.locatorHash!==O.locatorHash&&D.has(oe.anchoredLocator.locatorHash))return!1;F.add(oe.anchoredLocator.locatorHash)}F.add(Fe)}}return!0};for(;D.size>0;){let O=D.size,F=[];for(let ue of D){let he=this.storedPackages.get(ue);if(!he)throw new Error("Assertion failed: The package should have been registered");if(!A(he))continue;let ke=h.get(he.locatorHash);if(!ke)throw new Error("Assertion failed: The build directive should have been registered");let Fe=V(he,ke.buildLocations);if(this.storedBuildState.get(he.locatorHash)===Fe){W.set(he.locatorHash,Fe),D.delete(ue);continue}_||(await this.persistInstallStateFile(),_=!0),this.storedBuildState.has(he.locatorHash)?t.reportInfo(8,`${mt(this.configuration,he)} must be rebuilt because its dependency tree changed`):t.reportInfo(7,`${mt(this.configuration,he)} must be built because it never has been before or the last one failed`);let Ne=ke.buildLocations.map(async oe=>{if(!x.isAbsolute(oe))throw new Error(`Assertion failed: Expected the build location to be absolute (not ${oe})`);for(let[le,we]of ke.directives){let fe=`# This file contains the result of Yarn building a package (${Cs(he)})
-`;switch(le){case 0:fe+=`# Script name: ${we}
-`;break;case 1:fe+=`# Script code: ${we}
-`;break}let Ae=null;if(!await M.mktempPromise(async ne=>{let Y=x.join(ne,"build.log"),{stdout:pe,stderr:ie}=this.configuration.getSubprocessStreams(Y,{header:fe,prefix:mt(this.configuration,he),report:t}),de;try{switch(le){case 0:de=await kB(he,we,[],{cwd:oe,project:this,stdin:Ae,stdout:pe,stderr:ie});break;case 1:de=await JR(he,we,[],{cwd:oe,project:this,stdin:Ae,stdout:pe,stderr:ie});break}}catch(Pt){ie.write(Pt.stack),de=1}if(pe.end(),ie.end(),de===0)return!0;M.detachTemp(ne);let _e=`${mt(this.configuration,he)} couldn't be built successfully (exit code ${$e(this.configuration,de,Ue.NUMBER)}, logs can be found here: ${$e(this.configuration,Y,Ue.PATH)})`;return this.optionalBuilds.has(he.locatorHash)?(t.reportInfo(9,_e),!0):(t.reportError(9,_e),!1)}))return!1}return!0});F.push(...Ne,Promise.allSettled(Ne).then(oe=>{D.delete(ue),oe.every(le=>le.status==="fulfilled"&&le.value===!0)&&W.set(he.locatorHash,Fe)}))}if(await to(F),O===D.size){let ue=Array.from(D).map(he=>{let ke=this.storedPackages.get(he);if(!ke)throw new Error("Assertion failed: The package should have been registered");return mt(this.configuration,ke)}).join(", ");t.reportError(3,`Some packages have circular dependencies that make their build order unsatisfiable - as a result they won't be built (affected packages are: ${ue})`);break}}this.storedBuildState=W}async install(e){var a,l;let t=this.configuration.get("nodeLinker");(a=ye.telemetry)==null||a.reportInstall(t),await e.report.startTimerPromise("Project validation",{skipIfEmpty:!0},async()=>{await this.configuration.triggerHook(c=>c.validateProject,this,{reportWarning:e.report.reportWarning.bind(e.report),reportError:e.report.reportError.bind(e.report)})});for(let c of this.configuration.packageExtensions.values())for(let[,u]of c)for(let g of u)g.status="inactive";let i=x.join(this.cwd,this.configuration.get("lockfileFilename")),n=null;if(e.immutable)try{n=await M.readFilePromise(i,"utf8")}catch(c){throw c.code==="ENOENT"?new at(28,"The lockfile would have been created by this install, which is explicitly forbidden."):c}await e.report.startTimerPromise("Resolution step",async()=>{await this.resolveEverything(e)}),await e.report.startTimerPromise("Post-resolution validation",{skipIfEmpty:!0},async()=>{for(let[,c]of this.configuration.packageExtensions)for(let[,u]of c)for(let g of u)if(g.userProvided){let f=$e(this.configuration,g,Ue.PACKAGE_EXTENSION);switch(g.status){case"inactive":e.report.reportWarning(68,`${f}: No matching package in the dependency tree; you may not need this rule anymore.`);break;case"redundant":e.report.reportWarning(69,`${f}: This rule seems redundant when applied on the original package; the extension may have been applied upstream.`);break}}if(n!==null){let c=ql(n,this.generateLockfile());if(c!==n){let u=CZ(i,i,n,c,void 0,void 0,{maxEditLength:100});if(u){e.report.reportSeparator();for(let g of u.hunks){e.report.reportInfo(null,`@@ -${g.oldStart},${g.oldLines} +${g.newStart},${g.newLines} @@`);for(let f of g.lines)f.startsWith("+")?e.report.reportError(28,$e(this.configuration,f,Ue.ADDED)):f.startsWith("-")?e.report.reportError(28,$e(this.configuration,f,Ue.REMOVED)):e.report.reportInfo(null,$e(this.configuration,f,"grey"))}e.report.reportSeparator()}throw new at(28,"The lockfile would have been modified by this install, which is explicitly forbidden.")}}});for(let c of this.configuration.packageExtensions.values())for(let[,u]of c)for(let g of u)g.userProvided&&g.status==="active"&&((l=ye.telemetry)==null||l.reportPackageExtension(Ec(g,Ue.PACKAGE_EXTENSION)));await e.report.startTimerPromise("Fetch step",async()=>{await this.fetchEverything(e),(typeof e.persistProject>"u"||e.persistProject)&&e.mode!=="update-lockfile"&&await this.cacheCleanup(e)});let s=e.immutable?[...new Set(this.configuration.get("immutablePatterns"))].sort():[],o=await Promise.all(s.map(async c=>yw(c,{cwd:this.cwd})));(typeof e.persistProject>"u"||e.persistProject)&&await this.persist(),await e.report.startTimerPromise("Link step",async()=>{if(e.mode==="update-lockfile"){e.report.reportWarning(73,`Skipped due to ${$e(this.configuration,"mode=update-lockfile",Ue.CODE)}`);return}await this.linkEverything(e);let c=await Promise.all(s.map(async u=>yw(u,{cwd:this.cwd})));for(let u=0;u<s.length;++u)o[u]!==c[u]&&e.report.reportError(64,`The checksum for ${s[u]} has been modified by this install, which is explicitly forbidden.`)}),await this.persistInstallStateFile(),await this.configuration.triggerHook(c=>c.afterAllInstalled,this,e)}generateLockfile(){let e=new Map;for(let[n,s]of this.storedResolutions.entries()){let o=e.get(s);o||e.set(s,o=new Set),o.add(n)}let t={};t.__metadata={version:b$,cacheKey:void 0};for(let[n,s]of e.entries()){let o=this.originalPackages.get(n);if(!o)continue;let a=[];for(let f of s){let h=this.storedDescriptors.get(f);if(!h)throw new Error("Assertion failed: The descriptor should have been registered");a.push(h)}let l=a.map(f=>Qn(f)).sort().join(", "),c=new ot;c.version=o.linkType==="HARD"?o.version:"0.0.0-use.local",c.languageName=o.languageName,c.dependencies=new Map(o.dependencies),c.peerDependencies=new Map(o.peerDependencies),c.dependenciesMeta=new Map(o.dependenciesMeta),c.peerDependenciesMeta=new Map(o.peerDependenciesMeta),c.bin=new Map(o.bin);let u,g=this.storedChecksums.get(o.locatorHash);if(typeof g<"u"){let f=g.indexOf("/");if(f===-1)throw new Error("Assertion failed: Expected the checksum to reference its cache key");let h=g.slice(0,f),p=g.slice(f+1);typeof t.__metadata.cacheKey>"u"&&(t.__metadata.cacheKey=h),h===t.__metadata.cacheKey?u=p:u=g}t[l]={...c.exportTo({},{compatibilityMode:!1}),linkType:o.linkType.toLowerCase(),resolution:Cs(o),checksum:u,conditions:o.conditions||void 0}}return`${[`# This file is generated by running "yarn install" inside your project.
-`,`# Manual changes might be lost - proceed with caution!
-`].join("")}
-`+wa(t)}async persistLockfile(){let e=x.join(this.cwd,this.configuration.get("lockfileFilename")),t="";try{t=await M.readFilePromise(e,"utf8")}catch{}let i=this.generateLockfile(),n=ql(t,i);n!==t&&(await M.writeFilePromise(e,n),this.lockFileChecksum=v$(n),this.lockfileNeedsRefresh=!1)}async persistInstallStateFile(){let e=[];for(let o of Object.values(jN))e.push(...o);let t=(0,W0.default)(this,e),i=qN.default.serialize(t),n=en(i);if(this.installStateChecksum===n)return;let s=this.configuration.get("installStatePath");await M.mkdirPromise(x.dirname(s),{recursive:!0}),await M.writeFilePromise(s,await MMe(i)),this.installStateChecksum=n}async restoreInstallState({restoreInstallersCustomData:e=!0,restoreResolutions:t=!0,restoreBuildState:i=!0}={}){let n=this.configuration.get("installStatePath"),s;try{let o=await KMe(await M.readFilePromise(n));s=qN.default.deserialize(o),this.installStateChecksum=en(o)}catch{t&&await this.applyLightResolution();return}e&&typeof s.installersCustomData<"u"&&(this.installersCustomData=s.installersCustomData),i&&Object.assign(this,(0,W0.default)(s,jN.restoreBuildState)),t&&(s.lockFileChecksum===this.lockFileChecksum?(Object.assign(this,(0,W0.default)(s,jN.restoreResolutions)),this.refreshWorkspaceDependencies()):await this.applyLightResolution())}async applyLightResolution(){await this.resolveEverything({lockfileOnly:!0,report:new ti}),await this.persistInstallStateFile()}async persist(){await this.persistLockfile();for(let e of this.workspacesByCwd.values())await e.persistManifest()}async cacheCleanup({cache:e,report:t}){if(this.configuration.get("enableGlobalCache"))return;let i=new Set([".gitignore"]);if(!ZD(e.cwd,this.cwd)||!await M.existsPromise(e.cwd))return;let n=this.configuration.get("preferAggregateCacheInfo"),s=0,o=null;for(let a of await M.readdirPromise(e.cwd)){if(i.has(a))continue;let l=x.resolve(e.cwd,a);e.markedFiles.has(l)||(o=a,e.immutable?t.reportError(56,`${$e(this.configuration,x.basename(l),"magenta")} appears to be unused and would be marked for deletion, but the cache is immutable`):(n?s+=1:t.reportInfo(19,`${$e(this.configuration,x.basename(l),"magenta")} appears to be unused - removing`),await M.removePromise(l)))}n&&s!==0&&t.reportInfo(19,s>1?`${s} packages appeared to be unused and were removed`:`${o} appeared to be unused and was removed`),e.markedFiles.clear()}};function UMe({project:r,allDescriptors:e,allResolutions:t,allPackages:i,accessibleLocators:n=new Set,optionalBuilds:s=new Set,peerRequirements:o=new Map,volatileDescriptors:a=new Set,report:l}){var V;let c=new Map,u=[],g=new Map,f=new Map,h=new Map,p=new Map,C=new Map,y=new Map(r.workspaces.map(W=>{let _=W.anchoredLocator.locatorHash,A=i.get(_);if(typeof A>"u")throw new Error("Assertion failed: The workspace should have an associated package");return[_,eC(A)]})),B=()=>{let W=M.mktempSync(),_=x.join(W,"stacktrace.log"),A=String(u.length+1).length,ae=u.map((ge,re)=>`${`${re+1}.`.padStart(A," ")} ${Cs(ge)}
-`).join("");throw M.writeFileSync(_,ae),M.detachTemp(W),new at(45,`Encountered a stack overflow when resolving peer dependencies; cf ${K.fromPortablePath(_)}`)},v=W=>{let _=t.get(W.descriptorHash);if(typeof _>"u")throw new Error("Assertion failed: The resolution should have been registered");let A=i.get(_);if(!A)throw new Error("Assertion failed: The package could not be found");return A},D=(W,_,A,{top:ae,optional:ge})=>{u.length>1e3&&B(),u.push(_);let re=L(W,_,A,{top:ae,optional:ge});return u.pop(),re},L=(W,_,A,{top:ae,optional:ge})=>{if(n.has(_.locatorHash))return;n.add(_.locatorHash),ge||s.delete(_.locatorHash);let re=i.get(_.locatorHash);if(!re)throw new Error(`Assertion failed: The package (${mt(r.configuration,_)}) should have been registered`);let O=[],F=[],ue=[],he=[],ke=[];for(let Ne of Array.from(re.dependencies.values())){if(re.peerDependencies.has(Ne.identHash)&&re.locatorHash!==ae)continue;if(qA(Ne))throw new Error("Assertion failed: Virtual packages shouldn't be encountered when virtualizing a branch");a.delete(Ne.descriptorHash);let oe=ge;if(!oe){let Y=re.dependenciesMeta.get(Ot(Ne));if(typeof Y<"u"){let pe=Y.get(null);typeof pe<"u"&&pe.optional&&(oe=!0)}}let le=t.get(Ne.descriptorHash);if(!le)throw new Error(`Assertion failed: The resolution (${tr(r.configuration,Ne)}) should have been registered`);let we=y.get(le)||i.get(le);if(!we)throw new Error(`Assertion failed: The package (${le}, resolved from ${tr(r.configuration,Ne)}) should have been registered`);if(we.peerDependencies.size===0){D(Ne,we,new Map,{top:ae,optional:oe});continue}let fe,Ae,qe=new Set,ne;F.push(()=>{fe=GD(Ne,_.locatorHash),Ae=YD(we,_.locatorHash),re.dependencies.delete(Ne.identHash),re.dependencies.set(fe.identHash,fe),t.set(fe.descriptorHash,Ae.locatorHash),e.set(fe.descriptorHash,fe),i.set(Ae.locatorHash,Ae),O.push([we,fe,Ae])}),ue.push(()=>{var Y;ne=new Map;for(let pe of Ae.peerDependencies.values()){let ie=re.dependencies.get(pe.identHash);if(!ie&&iC(_,pe)&&(W.identHash===_.identHash?ie=W:(ie=_t(_,W.range),e.set(ie.descriptorHash,ie),t.set(ie.descriptorHash,_.locatorHash),a.delete(ie.descriptorHash))),(!ie||ie.range==="missing:")&&Ae.dependencies.has(pe.identHash)){Ae.peerDependencies.delete(pe.identHash);continue}ie||(ie=_t(pe,"missing:")),Ae.dependencies.set(ie.identHash,ie),qA(ie)&&mc(h,ie.descriptorHash).add(Ae.locatorHash),g.set(ie.identHash,ie),ie.range==="missing:"&&qe.add(ie.identHash),ne.set(pe.identHash,(Y=A.get(pe.identHash))!=null?Y:Ae.locatorHash)}Ae.dependencies=new Map(wn(Ae.dependencies,([pe,ie])=>Ot(ie)))}),he.push(()=>{if(!i.has(Ae.locatorHash))return;let Y=c.get(we.locatorHash);typeof Y=="number"&&Y>=2&&B();let pe=c.get(we.locatorHash),ie=typeof pe<"u"?pe+1:1;c.set(we.locatorHash,ie),D(fe,Ae,ne,{top:ae,optional:oe}),c.set(we.locatorHash,ie-1)}),ke.push(()=>{let Y=re.dependencies.get(Ne.identHash);if(typeof Y>"u")throw new Error("Assertion failed: Expected the peer dependency to have been turned into a dependency");let pe=t.get(Y.descriptorHash);if(typeof pe>"u")throw new Error("Assertion failed: Expected the descriptor to be registered");if(mc(C,pe).add(_.locatorHash),!!i.has(Ae.locatorHash)){for(let ie of Ae.peerDependencies.values()){let de=ne.get(ie.identHash);if(typeof de>"u")throw new Error("Assertion failed: Expected the peer dependency ident to be registered");uf(gf(p,de),Ot(ie)).push(Ae.locatorHash)}for(let ie of qe)Ae.dependencies.delete(ie)}})}for(let Ne of[...F,...ue])Ne();let Fe;do{Fe=!0;for(let[Ne,oe,le]of O){let we=gf(f,Ne.locatorHash),fe=en(...[...le.dependencies.values()].map(Y=>{let pe=Y.range!=="missing:"?t.get(Y.descriptorHash):"missing:";if(typeof pe>"u")throw new Error(`Assertion failed: Expected the resolution for ${tr(r.configuration,Y)} to have been registered`);return pe===ae?`${pe} (top)`:pe}),oe.identHash),Ae=we.get(fe);if(typeof Ae>"u"){we.set(fe,oe);continue}if(Ae===oe)continue;i.delete(le.locatorHash),e.delete(oe.descriptorHash),t.delete(oe.descriptorHash),n.delete(le.locatorHash);let qe=h.get(oe.descriptorHash)||[],ne=[re.locatorHash,...qe];h.delete(oe.descriptorHash);for(let Y of ne){let pe=i.get(Y);typeof pe>"u"||(pe.dependencies.get(oe.identHash).descriptorHash!==Ae.descriptorHash&&(Fe=!1),pe.dependencies.set(oe.identHash,Ae))}}}while(!Fe);for(let Ne of[...he,...ke])Ne()};for(let W of r.workspaces){let _=W.anchoredLocator;a.delete(W.anchoredDescriptor.descriptorHash),D(W.anchoredDescriptor,_,new Map,{top:_.locatorHash,optional:!1})}let H;(A=>(A[A.NotProvided=0]="NotProvided",A[A.NotCompatible=1]="NotCompatible"))(H||(H={}));let j=[];for(let[W,_]of C){let A=i.get(W);if(typeof A>"u")throw new Error("Assertion failed: Expected the root to be registered");let ae=p.get(W);if(!(typeof ae>"u"))for(let ge of _){let re=i.get(ge);if(!(typeof re>"u"))for(let[O,F]of ae){let ue=$i(O);if(re.peerDependencies.has(ue.identHash))continue;let he=`p${en(ge,O,W).slice(0,5)}`;o.set(he,{subject:ge,requested:ue,rootRequester:W,allRequesters:F});let ke=A.dependencies.get(ue.identHash);if(typeof ke<"u"){let Fe=v(ke),Ne=(V=Fe.version)!=null?V:"0.0.0",oe=new Set;for(let we of F){let fe=i.get(we);if(typeof fe>"u")throw new Error("Assertion failed: Expected the link to be registered");let Ae=fe.peerDependencies.get(ue.identHash);if(typeof Ae>"u")throw new Error("Assertion failed: Expected the ident to be registered");oe.add(Ae.range)}[...oe].every(we=>{if(we.startsWith(jr.protocol)){if(!r.tryWorkspaceByLocator(Fe))return!1;we=we.slice(jr.protocol.length),(we==="^"||we==="~")&&(we="*")}return vc(Ne,we)})||j.push({type:1,subject:re,requested:ue,requester:A,version:Ne,hash:he,requirementCount:F.length})}else{let Fe=A.peerDependenciesMeta.get(O);Fe!=null&&Fe.optional||j.push({type:0,subject:re,requested:ue,requester:A,hash:he})}}}}let $=[W=>jD(W.subject),W=>Ot(W.requested),W=>`${W.type}`];l==null||l.startSectionSync({reportFooter:()=>{l.reportWarning(0,`Some peer dependencies are incorrectly met; run ${$e(r.configuration,"yarn explain peer-requirements <hash>",Ue.CODE)} for details, where ${$e(r.configuration,"<hash>",Ue.CODE)} is the six-letter p-prefixed code`)},skipIfEmpty:!0},()=>{for(let W of wn(j,$))switch(W.type){case 0:l.reportWarning(2,`${mt(r.configuration,W.subject)} doesn't provide ${Ai(r.configuration,W.requested)} (${$e(r.configuration,W.hash,Ue.CODE)}), requested by ${Ai(r.configuration,W.requester)}`);break;case 1:{let _=W.requirementCount>1?"and some of its descendants request":"requests";l.reportWarning(60,`${mt(r.configuration,W.subject)} provides ${Ai(r.configuration,W.requested)} (${$e(r.configuration,W.hash,Ue.CODE)}) with version ${oC(r.configuration,W.version)}, which doesn't satisfy what ${Ai(r.configuration,W.requester)} ${_}`)}break}})}var Bh=class{constructor(e,t){this.values=new Map;this.hits=new Map;this.enumerators=new Map;this.configuration=e;let i=this.getRegistryPath();this.isNew=!M.existsSync(i),this.sendReport(t),this.startBuffer()}reportVersion(e){this.reportValue("version",e.replace(/-git\..*/,"-git"))}reportCommandName(e){this.reportValue("commandName",e||"<none>")}reportPluginName(e){this.reportValue("pluginName",e)}reportProject(e){this.reportEnumerator("projectCount",e)}reportInstall(e){this.reportHit("installCount",e)}reportPackageExtension(e){this.reportValue("packageExtension",e)}reportWorkspaceCount(e){this.reportValue("workspaceCount",String(e))}reportDependencyCount(e){this.reportValue("dependencyCount",String(e))}reportValue(e,t){mc(this.values,e).add(t)}reportEnumerator(e,t){mc(this.enumerators,e).add(en(t))}reportHit(e,t="*"){let i=gf(this.hits,e),n=Fa(i,t,()=>0);i.set(t,n+1)}getRegistryPath(){let e=this.configuration.get("globalFolder");return x.join(e,"telemetry.json")}sendReport(e){var u,g,f;let t=this.getRegistryPath(),i;try{i=M.readJsonSync(t)}catch{i={}}let n=Date.now(),s=this.configuration.get("telemetryInterval")*24*60*60*1e3,a=((u=i.lastUpdate)!=null?u:n+s+Math.floor(s*Math.random()))+s;if(a>n&&i.lastUpdate!=null)return;try{M.mkdirSync(x.dirname(t),{recursive:!0}),M.writeJsonSync(t,{lastUpdate:n})}catch{return}if(a>n||!i.blocks)return;let l=`https://browser-http-intake.logs.datadoghq.eu/v1/input/${e}?ddsource=yarn`,c=h=>kR(l,h,{configuration:this.configuration}).catch(()=>{});for(let[h,p]of Object.entries((g=i.blocks)!=null?g:{})){if(Object.keys(p).length===0)continue;let C=p;C.userId=h,C.reportType="primary";for(let v of Object.keys((f=C.enumerators)!=null?f:{}))C.enumerators[v]=C.enumerators[v].length;c(C);let y=new Map,B=20;for(let[v,D]of Object.entries(C.values))D.length>0&&y.set(v,D.slice(0,B));for(;y.size>0;){let v={};v.userId=h,v.reportType="secondary",v.metrics={};for(let[D,L]of y)v.metrics[D]=L.shift(),L.length===0&&y.delete(D);c(v)}}}applyChanges(){var o,a,l,c,u,g,f,h,p;let e=this.getRegistryPath(),t;try{t=M.readJsonSync(e)}catch{t={}}let i=(o=this.configuration.get("telemetryUserId"))!=null?o:"*",n=t.blocks=(a=t.blocks)!=null?a:{},s=n[i]=(l=n[i])!=null?l:{};for(let C of this.hits.keys()){let y=s.hits=(c=s.hits)!=null?c:{},B=y[C]=(u=y[C])!=null?u:{};for(let[v,D]of this.hits.get(C))B[v]=((g=B[v])!=null?g:0)+D}for(let C of["values","enumerators"])for(let y of this[C].keys()){let B=s[C]=(f=s[C])!=null?f:{};B[y]=[...new Set([...(h=B[y])!=null?h:[],...(p=this[C].get(y))!=null?p:[]])]}M.mkdirSync(x.dirname(e),{recursive:!0}),M.writeJsonSync(e,t)}startBuffer(){process.on("exit",()=>{try{this.applyChanges()}catch{}})}};var zN=J("child_process"),D$=Pe(nc());var VN=J("fs");var Qh=new Map([["constraints",[["constraints","query"],["constraints","source"],["constraints"]]],["exec",[]],["interactive-tools",[["search"],["upgrade-interactive"]]],["stage",[["stage"]]],["typescript",[]],["version",[["version","apply"],["version","check"],["version"]]],["workspace-tools",[["workspaces","focus"],["workspaces","foreach"]]]]);function HMe(r){let e=K.fromPortablePath(r);process.on("SIGINT",()=>{}),e?(0,zN.execFileSync)(process.execPath,[e,...process.argv.slice(2)],{stdio:"inherit",env:{...process.env,YARN_IGNORE_PATH:"1",YARN_IGNORE_CWD:"1"}}):(0,zN.execFileSync)(e,process.argv.slice(2),{stdio:"inherit",env:{...process.env,YARN_IGNORE_PATH:"1",YARN_IGNORE_CWD:"1"}})}async function z0({binaryVersion:r,pluginConfiguration:e}){async function t(){let n=new Un({binaryLabel:"Yarn Package Manager",binaryName:"yarn",binaryVersion:r});try{await i(n)}catch(s){process.stdout.write(n.error(s)),process.exitCode=1}}async function i(n){var C,y,B,v,D;let s=process.versions.node,o=">=12 <14 || 14.2 - 14.9 || >14.10.0";if(!Ie.parseOptionalBoolean(process.env.YARN_IGNORE_NODE)&&!vt.satisfiesWithPrereleases(s,o))throw new be(`This tool requires a Node version compatible with ${o} (got ${s}). Upgrade Node, or set \`YARN_IGNORE_NODE=1\` in your environment.`);let l=await ye.find(K.toPortablePath(process.cwd()),e,{usePath:!0,strict:!1}),c=l.get("yarnPath"),u=l.get("ignorePath"),g=l.get("ignoreCwd"),f=K.toPortablePath(K.resolve(process.argv[1])),h=L=>M.readFilePromise(L).catch(()=>Buffer.of());if(!u&&!g&&await(async()=>c===f||Buffer.compare(...await Promise.all([h(c),h(f)]))===0)()){process.env.YARN_IGNORE_PATH="1",process.env.YARN_IGNORE_CWD="1",await i(n);return}else if(c!==null&&!u)if(!M.existsSync(c))process.stdout.write(n.error(new Error(`The "yarn-path" option has been set (in ${l.sources.get("yarnPath")}), but the specified location doesn't exist (${c}).`))),process.exitCode=1;else try{HMe(c)}catch(L){process.exitCode=L.code||1}else{u&&delete process.env.YARN_IGNORE_PATH,l.get("enableTelemetry")&&!D$.isCI&&process.stdout.isTTY&&(ye.telemetry=new Bh(l,"puba9cdc10ec5790a2cf4969dd413a47270")),(C=ye.telemetry)==null||C.reportVersion(r);for(let[$,V]of l.plugins.entries()){Qh.has((B=(y=$.match(/^@yarnpkg\/plugin-(.*)$/))==null?void 0:y[1])!=null?B:"")&&((v=ye.telemetry)==null||v.reportPluginName($));for(let W of V.commands||[])n.register(W)}let H=n.process(process.argv.slice(2));H.help||(D=ye.telemetry)==null||D.reportCommandName(H.path.join(" "));let j=H.cwd;if(typeof j<"u"&&!g){let $=(0,VN.realpathSync)(process.cwd()),V=(0,VN.realpathSync)(j);if($!==V){process.chdir(j),await t();return}}await n.runExit(H,{cwd:K.toPortablePath(process.cwd()),plugins:e,quiet:!1,stdin:process.stdin,stdout:process.stdout,stderr:process.stderr})}}return t().catch(n=>{process.stdout.write(n.stack||n.message),process.exitCode=1}).finally(()=>M.rmtempPromise())}function k$(r){r.Command.Path=(...e)=>t=>{t.paths=t.paths||[],t.paths.push(e)};for(let e of["Array","Boolean","String","Proxy","Rest","Counter"])r.Command[e]=(...t)=>(i,n)=>{let s=r.Option[e](...t);Object.defineProperty(i,`__${n}`,{configurable:!1,enumerable:!0,get(){return s},set(o){this[n]=o}})};return r}var Rm={};ut(Rm,{BaseCommand:()=>De,WorkspaceRequiredError:()=>ct,getDynamicLibs:()=>jie,getPluginConfiguration:()=>mQ,main:()=>z0,openWorkspace:()=>Mh,pluginCommands:()=>Qh});var De=class extends ve{constructor(){super(...arguments);this.cwd=z.String("--cwd",{hidden:!0})}};var ct=class extends be{constructor(e,t){let i=x.relative(e,t),n=x.join(e,ot.fileName);super(`This command can only be run from within a workspace of your project (${i} isn't a workspace of ${n}).`)}};var WYe=Pe(Xr());as();var zYe=Pe(WL()),jie=()=>new Map([["@yarnpkg/cli",Rm],["@yarnpkg/core",im],["@yarnpkg/fslib",qp],["@yarnpkg/libzip",SC],["@yarnpkg/parsers",$p],["@yarnpkg/shell",DC],["clipanion",ld],["semver",WYe],["typanion",gn],["yup",zYe]]);async function Mh(r,e){let{project:t,workspace:i}=await je.find(r,e);if(!i)throw new ct(t.cwd,e);return i}var B7e=Pe(Xr());as();var Q7e=Pe(WL());var pO={};ut(pO,{dedupeUtils:()=>PQ,default:()=>o3e,suggestUtils:()=>Gh});var Yae=Pe(nc());var Rse=Pe(Om());as();var Gh={};ut(Gh,{Modifier:()=>KT,Strategy:()=>bQ,Target:()=>Mm,WorkspaceModifier:()=>Sse,applyModifier:()=>xse,extractDescriptorFromPath:()=>UT,extractRangeModifier:()=>vse,fetchDescriptorFrom:()=>HT,findProjectDescriptors:()=>kse,getModifier:()=>Km,getSuggestedDescriptors:()=>Um,makeWorkspaceDescriptor:()=>Dse,toWorkspaceModifier:()=>Pse});var MT=Pe(Xr()),gqe="workspace:",Mm=(i=>(i.REGULAR="dependencies",i.DEVELOPMENT="devDependencies",i.PEER="peerDependencies",i))(Mm||{}),KT=(i=>(i.CARET="^",i.TILDE="~",i.EXACT="",i))(KT||{}),Sse=(i=>(i.CARET="^",i.TILDE="~",i.EXACT="*",i))(Sse||{}),bQ=(s=>(s.KEEP="keep",s.REUSE="reuse",s.PROJECT="project",s.LATEST="latest",s.CACHE="cache",s))(bQ||{});function Km(r,e){return r.exact?"":r.caret?"^":r.tilde?"~":e.configuration.get("defaultSemverRangePrefix")}var fqe=/^([\^~]?)[0-9]+(?:\.[0-9]+){0,2}(?:-\S+)?$/;function vse(r,{project:e}){let t=r.match(fqe);return t?t[1]:e.configuration.get("defaultSemverRangePrefix")}function xse(r,e){let{protocol:t,source:i,params:n,selector:s}=P.parseRange(r.range);return MT.default.valid(s)&&(s=`${e}${r.range}`),P.makeDescriptor(r,P.makeRange({protocol:t,source:i,params:n,selector:s}))}function Pse(r){switch(r){case"^":return"^";case"~":return"~";case"":return"*";default:throw new Error(`Assertion failed: Unknown modifier: "${r}"`)}}function Dse(r,e){return P.makeDescriptor(r.anchoredDescriptor,`${gqe}${Pse(e)}`)}async function kse(r,{project:e,target:t}){let i=new Map,n=s=>{let o=i.get(s.descriptorHash);return o||i.set(s.descriptorHash,o={descriptor:s,locators:[]}),o};for(let s of e.workspaces)if(t==="peerDependencies"){let o=s.manifest.peerDependencies.get(r.identHash);o!==void 0&&n(o).locators.push(s.anchoredLocator)}else{let o=s.manifest.dependencies.get(r.identHash),a=s.manifest.devDependencies.get(r.identHash);t==="devDependencies"?a!==void 0?n(a).locators.push(s.anchoredLocator):o!==void 0&&n(o).locators.push(s.anchoredLocator):o!==void 0?n(o).locators.push(s.anchoredLocator):a!==void 0&&n(a).locators.push(s.anchoredLocator)}return i}async function UT(r,{cwd:e,workspace:t}){return await hqe(async i=>{x.isAbsolute(r)||(r=x.relative(t.cwd,x.resolve(e,r)),r.match(/^\.{0,2}\//)||(r=`./${r}`));let{project:n}=t,s=await HT(P.makeIdent(null,"archive"),r,{project:t.project,cache:i,workspace:t});if(!s)throw new Error("Assertion failed: The descriptor should have been found");let o=new ti,a=n.configuration.makeResolver(),l=n.configuration.makeFetcher(),c={checksums:n.storedChecksums,project:n,cache:i,fetcher:l,report:o,resolver:a},u=a.bindDescriptor(s,t.anchoredLocator,c),g=P.convertDescriptorToLocator(u),f=await l.fetch(g,c),h=await ot.find(f.prefixPath,{baseFs:f.packageFs});if(!h.name)throw new Error("Target path doesn't have a name");return P.makeDescriptor(h.name,r)})}async function Um(r,{project:e,workspace:t,cache:i,target:n,modifier:s,strategies:o,maxResults:a=1/0}){if(!(a>=0))throw new Error(`Invalid maxResults (${a})`);if(r.range!=="unknown")return{suggestions:[{descriptor:r,name:`Use ${P.prettyDescriptor(e.configuration,r)}`,reason:"(unambiguous explicit request)"}],rejections:[]};let l=typeof t<"u"&&t!==null&&t.manifest[n].get(r.identHash)||null,c=[],u=[],g=async f=>{try{await f()}catch(h){u.push(h)}};for(let f of o){if(c.length>=a)break;switch(f){case"keep":await g(async()=>{l&&c.push({descriptor:l,name:`Keep ${P.prettyDescriptor(e.configuration,l)}`,reason:"(no changes)"})});break;case"reuse":await g(async()=>{for(let{descriptor:h,locators:p}of(await kse(r,{project:e,target:n})).values()){if(p.length===1&&p[0].locatorHash===t.anchoredLocator.locatorHash&&o.includes("keep"))continue;let C=`(originally used by ${P.prettyLocator(e.configuration,p[0])}`;C+=p.length>1?` and ${p.length-1} other${p.length>2?"s":""})`:")",c.push({descriptor:h,name:`Reuse ${P.prettyDescriptor(e.configuration,h)}`,reason:C})}});break;case"cache":await g(async()=>{for(let h of e.storedDescriptors.values())h.identHash===r.identHash&&c.push({descriptor:h,name:`Reuse ${P.prettyDescriptor(e.configuration,h)}`,reason:"(already used somewhere in the lockfile)"})});break;case"project":await g(async()=>{if(t.manifest.name!==null&&r.identHash===t.manifest.name.identHash)return;let h=e.tryWorkspaceByIdent(r);if(h===null)return;let p=Dse(h,s);c.push({descriptor:p,name:`Attach ${P.prettyDescriptor(e.configuration,p)}`,reason:`(local workspace at ${ee.pretty(e.configuration,h.relativeCwd,ee.Type.PATH)})`})});break;case"latest":await g(async()=>{if(r.range!=="unknown")c.push({descriptor:r,name:`Use ${P.prettyRange(e.configuration,r.range)}`,reason:"(explicit range requested)"});else if(n==="peerDependencies")c.push({descriptor:P.makeDescriptor(r,"*"),name:"Use *",reason:"(catch-all peer dependency pattern)"});else if(!e.configuration.get("enableNetwork"))c.push({descriptor:null,name:"Resolve from latest",reason:ee.pretty(e.configuration,"(unavailable because enableNetwork is toggled off)","grey")});else{let h=await HT(r,"latest",{project:e,cache:i,workspace:t,preserveModifier:!1});h&&(h=xse(h,s),c.push({descriptor:h,name:`Use ${P.prettyDescriptor(e.configuration,h)}`,reason:"(resolved from latest)"}))}});break}}return{suggestions:c.slice(0,a),rejections:u.slice(0,a)}}async function HT(r,e,{project:t,cache:i,workspace:n,preserveModifier:s=!0}){let o=P.makeDescriptor(r,e),a=new ti,l=t.configuration.makeFetcher(),c=t.configuration.makeResolver(),u={project:t,fetcher:l,cache:i,checksums:t.storedChecksums,report:a,cacheOptions:{skipIntegrityCheck:!0},skipIntegrityCheck:!0},g={...u,resolver:c,fetchOptions:u},f=c.bindDescriptor(o,n.anchoredLocator,g),h=await c.getCandidates(f,new Map,g);if(h.length===0)return null;let p=h[0],{protocol:C,source:y,params:B,selector:v}=P.parseRange(P.convertToManifestRange(p.reference));if(C===t.configuration.get("defaultProtocol")&&(C=null),MT.default.valid(v)&&s!==!1){let D=typeof s=="string"?s:o.range;v=vse(D,{project:t})+v}return P.makeDescriptor(p,P.makeRange({protocol:C,source:y,params:B,selector:v}))}async function hqe(r){return await M.mktempPromise(async e=>{let t=ye.create(e);return t.useWithSource(e,{enableMirror:!1,compressionLevel:0},e,{overwrite:!0}),await r(new Rt(e,{configuration:t,check:!1,immutable:!1}))})}var nu=class extends De{constructor(){super(...arguments);this.json=z.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.exact=z.Boolean("-E,--exact",!1,{description:"Don't use any semver modifier on the resolved range"});this.tilde=z.Boolean("-T,--tilde",!1,{description:"Use the `~` semver modifier on the resolved range"});this.caret=z.Boolean("-C,--caret",!1,{description:"Use the `^` semver modifier on the resolved range"});this.dev=z.Boolean("-D,--dev",!1,{description:"Add a package as a dev dependency"});this.peer=z.Boolean("-P,--peer",!1,{description:"Add a package as a peer dependency"});this.optional=z.Boolean("-O,--optional",!1,{description:"Add / upgrade a package to an optional regular / peer dependency"});this.preferDev=z.Boolean("--prefer-dev",!1,{description:"Add / upgrade a package to a dev dependency"});this.interactive=z.Boolean("-i,--interactive",{description:"Reuse the specified package from other workspaces in the project"});this.cached=z.Boolean("--cached",!1,{description:"Reuse the highest version already used somewhere within the project"});this.mode=z.String("--mode",{description:"Change what artifacts installs generate",validator:Vi($n)});this.silent=z.Boolean("--silent",{hidden:!0});this.packages=z.Rest()}async execute(){var y;let t=await ye.find(this.context.cwd,this.context.plugins),{project:i,workspace:n}=await je.find(t,this.context.cwd),s=await Rt.find(t);if(!n)throw new ct(i.cwd,this.context.cwd);await i.restoreInstallState({restoreResolutions:!1});let o=(y=this.interactive)!=null?y:t.get("preferInteractive"),a=Km(this,i),l=[...o?["reuse"]:[],"project",...this.cached?["cache"]:[],"latest"],c=o?1/0:1,u=await Promise.all(this.packages.map(async B=>{let v=B.match(/^\.{0,2}\//)?await UT(B,{cwd:this.context.cwd,workspace:n}):P.tryParseDescriptor(B),D=B.match(/^(https?:|git@github)/);if(D)throw new be(`It seems you are trying to add a package using a ${ee.pretty(t,`${D[0]}...`,xi.RANGE)} url; we now require package names to be explicitly specified.
-Try running the command again with the package name prefixed: ${ee.pretty(t,"yarn add",xi.CODE)} ${ee.pretty(t,P.makeDescriptor(P.makeIdent(null,"my-package"),`${D[0]}...`),xi.DESCRIPTOR)}`);if(!v)throw new be(`The ${ee.pretty(t,B,xi.CODE)} string didn't match the required format (package-name@range). Did you perhaps forget to explicitly reference the package name?`);let L=pqe(n,v,{dev:this.dev,peer:this.peer,preferDev:this.preferDev,optional:this.optional});return await Promise.all(L.map(async j=>{let $=await Um(v,{project:i,workspace:n,cache:s,target:j,modifier:a,strategies:l,maxResults:c});return{request:v,suggestedDescriptors:$,target:j}}))})).then(B=>B.flat()),g=await ra.start({configuration:t,stdout:this.context.stdout,suggestInstall:!1},async B=>{for(let{request:v,suggestedDescriptors:{suggestions:D,rejections:L}}of u)if(D.filter(j=>j.descriptor!==null).length===0){let[j]=L;if(typeof j>"u")throw new Error("Assertion failed: Expected an error to have been set");i.configuration.get("enableNetwork")?B.reportError(27,`${P.prettyDescriptor(t,v)} can't be resolved to a satisfying range`):B.reportError(27,`${P.prettyDescriptor(t,v)} can't be resolved to a satisfying range (note: network resolution has been disabled)`),B.reportSeparator(),B.reportExceptionOnce(j)}});if(g.hasErrors())return g.exitCode();let f=!1,h=[],p=[];for(let{suggestedDescriptors:{suggestions:B},target:v}of u){let D,L=B.filter(V=>V.descriptor!==null),H=L[0].descriptor,j=L.every(V=>P.areDescriptorsEqual(V.descriptor,H));L.length===1||j?D=H:(f=!0,{answer:D}=await(0,Rse.prompt)({type:"select",name:"answer",message:"Which range do you want to use?",choices:B.map(({descriptor:V,name:W,reason:_})=>V?{name:W,hint:_,descriptor:V}:{name:W,hint:_,disabled:!0}),onCancel:()=>process.exit(130),result(V){return this.find(V,"descriptor")},stdin:this.context.stdin,stdout:this.context.stdout}));let $=n.manifest[v].get(D.identHash);(typeof $>"u"||$.descriptorHash!==D.descriptorHash)&&(n.manifest[v].set(D.identHash,D),this.optional&&(v==="dependencies"?n.manifest.ensureDependencyMeta({...D,range:"unknown"}).optional=!0:v==="peerDependencies"&&(n.manifest.ensurePeerDependencyMeta({...D,range:"unknown"}).optional=!0)),typeof $>"u"?h.push([n,v,D,l]):p.push([n,v,$,D]))}return await t.triggerMultipleHooks(B=>B.afterWorkspaceDependencyAddition,h),await t.triggerMultipleHooks(B=>B.afterWorkspaceDependencyReplacement,p),f&&this.context.stdout.write(`
-`),(await Ge.start({configuration:t,json:this.json,stdout:this.context.stdout,includeLogs:!this.context.quiet},async B=>{await i.install({cache:s,report:B,mode:this.mode})})).exitCode()}};nu.paths=[["add"]],nu.usage=ve.Usage({description:"add dependencies to the project",details:"\n      This command adds a package to the package.json for the nearest workspace.\n\n      - If it didn't exist before, the package will by default be added to the regular `dependencies` field, but this behavior can be overriden thanks to the `-D,--dev` flag (which will cause the dependency to be added to the `devDependencies` field instead) and the `-P,--peer` flag (which will do the same but for `peerDependencies`).\n\n      - If the package was already listed in your dependencies, it will by default be upgraded whether it's part of your `dependencies` or `devDependencies` (it won't ever update `peerDependencies`, though).\n\n      - If set, the `--prefer-dev` flag will operate as a more flexible `-D,--dev` in that it will add the package to your `devDependencies` if it isn't already listed in either `dependencies` or `devDependencies`, but it will also happily upgrade your `dependencies` if that's what you already use (whereas `-D,--dev` would throw an exception).\n\n      - If set, the `-O,--optional` flag will add the package to the `optionalDependencies` field and, in combination with the `-P,--peer` flag, it will add the package as an optional peer dependency. If the package was already listed in your `dependencies`, it will be upgraded to `optionalDependencies`. If the package was already listed in your `peerDependencies`, in combination with the `-P,--peer` flag, it will be upgraded to an optional peer dependency: `\"peerDependenciesMeta\": { \"<package>\": { \"optional\": true } }`\n\n      - If the added package doesn't specify a range at all its `latest` tag will be resolved and the returned version will be used to generate a new semver range (using the `^` modifier by default unless otherwise configured via the `defaultSemverRangePrefix` configuration, or the `~` modifier if `-T,--tilde` is specified, or no modifier at all if `-E,--exact` is specified). Two exceptions to this rule: the first one is that if the package is a workspace then its local version will be used, and the second one is that if you use `-P,--peer` the default range will be `*` and won't be resolved at all.\n\n      - If the added package specifies a range (such as `^1.0.0`, `latest`, or `rc`), Yarn will add this range as-is in the resulting package.json entry (in particular, tags such as `rc` will be encoded as-is rather than being converted into a semver range).\n\n      If the `--cached` option is used, Yarn will preferably reuse the highest version already used somewhere within the project, even if through a transitive dependency.\n\n      If the `-i,--interactive` option is used (or if the `preferInteractive` settings is toggled on) the command will first try to check whether other workspaces in the project use the specified package and, if so, will offer to reuse them.\n\n      If the `--mode=<mode>` option is set, Yarn will change which artifacts are generated. The modes currently supported are:\n\n      - `skip-build` will not run the build scripts at all. Note that this is different from setting `enableScripts` to false because the latter will disable build scripts, and thus affect the content of the artifacts generated on disk, whereas the former will just disable the build step - but not the scripts themselves, which just won't run.\n\n      - `update-lockfile` will skip the link step altogether, and only fetch packages that are missing from the lockfile (or that have no associated checksums). This mode is typically used by tools like Renovate or Dependabot to keep a lockfile up-to-date without incurring the full install cost.\n\n      For a compilation of all the supported protocols, please consult the dedicated page from our website: https://yarnpkg.com/features/protocols.\n    ",examples:[["Add a regular package to the current workspace","$0 add lodash"],["Add a specific version for a package to the current workspace","$0 add lodash@1.2.3"],["Add a package from a GitHub repository (the master branch) to the current workspace using a URL","$0 add lodash@https://github.com/lodash/lodash"],["Add a package from a GitHub repository (the master branch) to the current workspace using the GitHub protocol","$0 add lodash@github:lodash/lodash"],["Add a package from a GitHub repository (the master branch) to the current workspace using the GitHub protocol (shorthand)","$0 add lodash@lodash/lodash"],["Add a package from a specific branch of a GitHub repository to the current workspace using the GitHub protocol (shorthand)","$0 add lodash-es@lodash/lodash#es"]]});function pqe(r,e,{dev:t,peer:i,preferDev:n,optional:s}){let o=r.manifest["dependencies"].has(e.identHash),a=r.manifest["devDependencies"].has(e.identHash),l=r.manifest["peerDependencies"].has(e.identHash);if((t||i)&&o)throw new be(`Package "${P.prettyIdent(r.project.configuration,e)}" is already listed as a regular dependency - remove the -D,-P flags or remove it from your dependencies first`);if(!t&&!i&&l)throw new be(`Package "${P.prettyIdent(r.project.configuration,e)}" is already listed as a peer dependency - use either of -D or -P, or remove it from your peer dependencies first`);if(s&&a)throw new be(`Package "${P.prettyIdent(r.project.configuration,e)}" is already listed as a dev dependency - remove the -O flag or remove it from your dev dependencies first`);if(s&&!i&&l)throw new be(`Package "${P.prettyIdent(r.project.configuration,e)}" is already listed as a peer dependency - remove the -O flag or add the -P flag or remove it from your peer dependencies first`);if((t||n)&&s)throw new be(`Package "${P.prettyIdent(r.project.configuration,e)}" cannot simultaneously be a dev dependency and an optional dependency`);let c=[];return i&&c.push("peerDependencies"),(t||n)&&c.push("devDependencies"),s&&c.push("dependencies"),c.length>0?c:a?["devDependencies"]:l?["peerDependencies"]:["dependencies"]}var su=class extends De{constructor(){super(...arguments);this.verbose=z.Boolean("-v,--verbose",!1,{description:"Print both the binary name and the locator of the package that provides the binary"});this.json=z.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.name=z.String({required:!1})}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i,locator:n}=await je.find(t,this.context.cwd);if(await i.restoreInstallState(),this.name){let a=(await Wt.getPackageAccessibleBinaries(n,{project:i})).get(this.name);if(!a)throw new be(`Couldn't find a binary named "${this.name}" for package "${P.prettyLocator(t,n)}"`);let[,l]=a;return this.context.stdout.write(`${l}
-`),0}return(await Ge.start({configuration:t,json:this.json,stdout:this.context.stdout},async o=>{let a=await Wt.getPackageAccessibleBinaries(n,{project:i}),c=Array.from(a.keys()).reduce((u,g)=>Math.max(u,g.length),0);for(let[u,[g,f]]of a)o.reportJson({name:u,source:P.stringifyIdent(g),path:f});if(this.verbose)for(let[u,[g]]of a)o.reportInfo(null,`${u.padEnd(c," ")}   ${P.prettyLocator(t,g)}`);else for(let u of a.keys())o.reportInfo(null,u)})).exitCode()}};su.paths=[["bin"]],su.usage=ve.Usage({description:"get the path to a binary script",details:`
-      When used without arguments, this command will print the list of all the binaries available in the current workspace. Adding the \`-v,--verbose\` flag will cause the output to contain both the binary name and the locator of the package that provides the binary.
-
-      When an argument is specified, this command will just print the path to the binary on the standard output and exit. Note that the reported path may be stored within a zip archive.
-    `,examples:[["List all the available binaries","$0 bin"],["Print the path to a specific binary","$0 bin eslint"]]});var ou=class extends De{constructor(){super(...arguments);this.mirror=z.Boolean("--mirror",!1,{description:"Remove the global cache files instead of the local cache files"});this.all=z.Boolean("--all",!1,{description:"Remove both the global cache files and the local cache files of the current project"})}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),i=await Rt.find(t);return(await Ge.start({configuration:t,stdout:this.context.stdout},async()=>{let s=(this.all||this.mirror)&&i.mirrorCwd!==null,o=!this.mirror;s&&(await M.removePromise(i.mirrorCwd),await t.triggerHook(a=>a.cleanGlobalArtifacts,t)),o&&await M.removePromise(i.cwd)})).exitCode()}};ou.paths=[["cache","clean"],["cache","clear"]],ou.usage=ve.Usage({description:"remove the shared cache files",details:`
-      This command will remove all the files from the cache.
-    `,examples:[["Remove all the local archives","$0 cache clean"],["Remove all the archives stored in the ~/.yarn directory","$0 cache clean --mirror"]]});var Fse=Pe(oQ()),GT=J("util"),au=class extends De{constructor(){super(...arguments);this.json=z.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.unsafe=z.Boolean("--no-redacted",!1,{description:"Don't redact secrets (such as tokens) from the output"});this.name=z.String()}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),i=this.name.replace(/[.[].*$/,""),n=this.name.replace(/^[^.[]*/,"");if(typeof t.settings.get(i)>"u")throw new be(`Couldn't find a configuration settings named "${i}"`);let o=t.getSpecial(i,{hideSecrets:!this.unsafe,getNativePaths:!0}),a=Ie.convertMapsToIndexableObjects(o),l=n?(0,Fse.default)(a,n):a,c=await Ge.start({configuration:t,includeFooter:!1,json:this.json,stdout:this.context.stdout},async u=>{u.reportJson(l)});if(!this.json){if(typeof l=="string")return this.context.stdout.write(`${l}
-`),c.exitCode();GT.inspect.styles.name="cyan",this.context.stdout.write(`${(0,GT.inspect)(l,{depth:1/0,colors:t.get("enableColors"),compact:!1})}
-`)}return c.exitCode()}};au.paths=[["config","get"]],au.usage=ve.Usage({description:"read a configuration settings",details:`
-      This command will print a configuration setting.
-
-      Secrets (such as tokens) will be redacted from the output by default. If this behavior isn't desired, set the \`--no-redacted\` to get the untransformed value.
-    `,examples:[["Print a simple configuration setting","yarn config get yarnPath"],["Print a complex configuration setting","yarn config get packageExtensions"],["Print a nested field from the configuration",`yarn config get 'npmScopes["my-company"].npmRegistryServer'`],["Print a token from the configuration","yarn config get npmAuthToken --no-redacted"],["Print a configuration setting as JSON","yarn config get packageExtensions --json"]]});var qoe=Pe(zT()),Joe=Pe(oQ()),Woe=Pe(joe()),VT=J("util"),Au=class extends De{constructor(){super(...arguments);this.json=z.Boolean("--json",!1,{description:"Set complex configuration settings to JSON values"});this.home=z.Boolean("-H,--home",!1,{description:"Update the home configuration instead of the project configuration"});this.name=z.String();this.value=z.String()}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),i=()=>{if(!t.projectCwd)throw new be("This command must be run from within a project folder");return t.projectCwd},n=this.name.replace(/[.[].*$/,""),s=this.name.replace(/^[^.[]*\.?/,"");if(typeof t.settings.get(n)>"u")throw new be(`Couldn't find a configuration settings named "${n}"`);if(n==="enableStrictSettings")throw new be("This setting only affects the file it's in, and thus cannot be set from the CLI");let a=this.json?JSON.parse(this.value):this.value;await(this.home?p=>ye.updateHomeConfiguration(p):p=>ye.updateConfiguration(i(),p))(p=>{if(s){let C=(0,qoe.default)(p);return(0,Woe.default)(C,this.name,a),C}else return{...p,[n]:a}});let u=(await ye.find(this.context.cwd,this.context.plugins)).getSpecial(n,{hideSecrets:!0,getNativePaths:!0}),g=Ie.convertMapsToIndexableObjects(u),f=s?(0,Joe.default)(g,s):g;return(await Ge.start({configuration:t,includeFooter:!1,stdout:this.context.stdout},async p=>{VT.inspect.styles.name="cyan",p.reportInfo(0,`Successfully set ${this.name} to ${(0,VT.inspect)(f,{depth:1/0,colors:t.get("enableColors"),compact:!1})}`)})).exitCode()}};Au.paths=[["config","set"]],Au.usage=ve.Usage({description:"change a configuration settings",details:`
-      This command will set a configuration setting.
-
-      When used without the \`--json\` flag, it can only set a simple configuration setting (a string, a number, or a boolean).
-
-      When used with the \`--json\` flag, it can set both simple and complex configuration settings, including Arrays and Objects.
-    `,examples:[["Set a simple configuration setting (a string, a number, or a boolean)","yarn config set initScope myScope"],["Set a simple configuration setting (a string, a number, or a boolean) using the `--json` flag",'yarn config set initScope --json \\"myScope\\"'],["Set a complex configuration setting (an Array) using the `--json` flag",`yarn config set unsafeHttpWhitelist --json '["*.example.com", "example.com"]'`],["Set a complex configuration setting (an Object) using the `--json` flag",`yarn config set packageExtensions --json '{ "@babel/parser@*": { "dependencies": { "@babel/types": "*" } } }'`],["Set a nested configuration setting",'yarn config set npmScopes.company.npmRegistryServer "https://npm.example.com"'],["Set a nested configuration setting using indexed access for non-simple keys",`yarn config set 'npmRegistries["//npm.example.com"].npmAuthToken' "ffffffff-ffff-ffff-ffff-ffffffffffff"`]]});var rae=Pe(zT()),iae=Pe(sm()),nae=Pe(tae()),lu=class extends De{constructor(){super(...arguments);this.home=z.Boolean("-H,--home",!1,{description:"Update the home configuration instead of the project configuration"});this.name=z.String()}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),i=()=>{if(!t.projectCwd)throw new be("This command must be run from within a project folder");return t.projectCwd},n=this.name.replace(/[.[].*$/,""),s=this.name.replace(/^[^.[]*\.?/,"");if(typeof t.settings.get(n)>"u")throw new be(`Couldn't find a configuration settings named "${n}"`);let a=this.home?c=>ye.updateHomeConfiguration(c):c=>ye.updateConfiguration(i(),c);return(await Ge.start({configuration:t,includeFooter:!1,stdout:this.context.stdout},async c=>{let u=!1;await a(g=>{if(!(0,iae.default)(g,this.name))return c.reportWarning(0,`Configuration doesn't contain setting ${this.name}; there is nothing to unset`),u=!0,g;let f=s?(0,rae.default)(g):{...g};return(0,nae.default)(f,this.name),f}),u||c.reportInfo(0,`Successfully unset ${this.name}`)})).exitCode()}};lu.paths=[["config","unset"]],lu.usage=ve.Usage({description:"unset a configuration setting",details:`
-      This command will unset a configuration setting.
-    `,examples:[["Unset a simple configuration setting","yarn config unset initScope"],["Unset a complex configuration setting","yarn config unset packageExtensions"],["Unset a nested configuration setting","yarn config unset npmScopes.company.npmRegistryServer"]]});var XT=J("util"),cu=class extends De{constructor(){super(...arguments);this.verbose=z.Boolean("-v,--verbose",!1,{description:"Print the setting description on top of the regular key/value information"});this.why=z.Boolean("--why",!1,{description:"Print the reason why a setting is set a particular way"});this.json=z.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"})}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins,{strict:!1});return(await Ge.start({configuration:t,json:this.json,stdout:this.context.stdout},async n=>{if(t.invalid.size>0&&!this.json){for(let[s,o]of t.invalid)n.reportError(34,`Invalid configuration key "${s}" in ${o}`);n.reportSeparator()}if(this.json){let s=Ie.sortMap(t.settings.keys(),o=>o);for(let o of s){let a=t.settings.get(o),l=t.getSpecial(o,{hideSecrets:!0,getNativePaths:!0}),c=t.sources.get(o);this.verbose?n.reportJson({key:o,effective:l,source:c}):n.reportJson({key:o,effective:l,source:c,...a})}}else{let s=Ie.sortMap(t.settings.keys(),l=>l),o=s.reduce((l,c)=>Math.max(l,c.length),0),a={breakLength:1/0,colors:t.get("enableColors"),maxArrayLength:2};if(this.why||this.verbose){let l=s.map(u=>{let g=t.settings.get(u);if(!g)throw new Error(`Assertion failed: This settings ("${u}") should have been registered`);let f=this.why?t.sources.get(u)||"<default>":g.description;return[u,f]}),c=l.reduce((u,[,g])=>Math.max(u,g.length),0);for(let[u,g]of l)n.reportInfo(null,`${u.padEnd(o," ")}   ${g.padEnd(c," ")}   ${(0,XT.inspect)(t.getSpecial(u,{hideSecrets:!0,getNativePaths:!0}),a)}`)}else for(let l of s)n.reportInfo(null,`${l.padEnd(o," ")}   ${(0,XT.inspect)(t.getSpecial(l,{hideSecrets:!0,getNativePaths:!0}),a)}`)}})).exitCode()}};cu.paths=[["config"]],cu.usage=ve.Usage({description:"display the current configuration",details:`
-      This command prints the current active configuration settings.
-    `,examples:[["Print the active configuration settings","$0 config"]]});as();var PQ={};ut(PQ,{Strategy:()=>Gm,acceptedStrategies:()=>m4e,dedupe:()=>ZT});var sae=Pe(yn()),Gm=(e=>(e.HIGHEST="highest",e))(Gm||{}),m4e=new Set(Object.values(Gm)),E4e={highest:async(r,e,{resolver:t,fetcher:i,resolveOptions:n,fetchOptions:s})=>{let o=new Map;for(let[a,l]of r.storedResolutions){let c=r.storedDescriptors.get(a);if(typeof c>"u")throw new Error(`Assertion failed: The descriptor (${a}) should have been registered`);Ie.getSetWithDefault(o,c.identHash).add(l)}return Array.from(r.storedDescriptors.values(),async a=>{if(e.length&&!sae.default.isMatch(P.stringifyIdent(a),e))return null;let l=r.storedResolutions.get(a.descriptorHash);if(typeof l>"u")throw new Error(`Assertion failed: The resolution (${a.descriptorHash}) should have been registered`);let c=r.originalPackages.get(l);if(typeof c>"u"||!t.shouldPersistResolution(c,n))return null;let u=o.get(a.identHash);if(typeof u>"u")throw new Error(`Assertion failed: The resolutions (${a.identHash}) should have been registered`);if(u.size===1)return null;let g=[...u].map(y=>{let B=r.originalPackages.get(y);if(typeof B>"u")throw new Error(`Assertion failed: The package (${y}) should have been registered`);return B.reference}),f=await t.getSatisfying(a,g,n),h=f==null?void 0:f[0];if(typeof h>"u")return null;let p=h.locatorHash,C=r.originalPackages.get(p);if(typeof C>"u")throw new Error(`Assertion failed: The package (${p}) should have been registered`);return p===l?null:{descriptor:a,currentPackage:c,updatedPackage:C}})}};async function ZT(r,{strategy:e,patterns:t,cache:i,report:n}){let{configuration:s}=r,o=new ti,a=s.makeResolver(),l=s.makeFetcher(),c={cache:i,checksums:r.storedChecksums,fetcher:l,project:r,report:o,skipIntegrityCheck:!0,cacheOptions:{skipIntegrityCheck:!0}},u={project:r,resolver:a,report:o,fetchOptions:c};return await n.startTimerPromise("Deduplication step",async()=>{let g=E4e[e],f=await g(r,t,{resolver:a,resolveOptions:u,fetcher:l,fetchOptions:c}),h=vi.progressViaCounter(f.length);await n.reportProgress(h);let p=0;await Promise.all(f.map(B=>B.then(v=>{if(v===null)return;p++;let{descriptor:D,currentPackage:L,updatedPackage:H}=v;n.reportInfo(0,`${P.prettyDescriptor(s,D)} can be deduped from ${P.prettyLocator(s,L)} to ${P.prettyLocator(s,H)}`),n.reportJson({descriptor:P.stringifyDescriptor(D),currentResolution:P.stringifyLocator(L),updatedResolution:P.stringifyLocator(H)}),r.storedResolutions.set(D.descriptorHash,H.locatorHash)}).finally(()=>h.tick())));let C;switch(p){case 0:C="No packages";break;case 1:C="One package";break;default:C=`${p} packages`}let y=ee.pretty(s,e,ee.Type.CODE);return n.reportInfo(0,`${C} can be deduped using the ${y} strategy`),p})}var uu=class extends De{constructor(){super(...arguments);this.strategy=z.String("-s,--strategy","highest",{description:"The strategy to use when deduping dependencies",validator:Vi(Gm)});this.check=z.Boolean("-c,--check",!1,{description:"Exit with exit code 1 when duplicates are found, without persisting the dependency tree"});this.json=z.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.mode=z.String("--mode",{description:"Change what artifacts installs generate",validator:Vi($n)});this.patterns=z.Rest()}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i}=await je.find(t,this.context.cwd),n=await Rt.find(t);await i.restoreInstallState({restoreResolutions:!1});let s=0,o=await Ge.start({configuration:t,includeFooter:!1,stdout:this.context.stdout,json:this.json},async a=>{s=await ZT(i,{strategy:this.strategy,patterns:this.patterns,cache:n,report:a})});return o.hasErrors()?o.exitCode():this.check?s?1:0:(await Ge.start({configuration:t,stdout:this.context.stdout,json:this.json},async l=>{await i.install({cache:n,report:l,mode:this.mode})})).exitCode()}};uu.paths=[["dedupe"]],uu.usage=ve.Usage({description:"deduplicate dependencies with overlapping ranges",details:"\n      Duplicates are defined as descriptors with overlapping ranges being resolved and locked to different locators. They are a natural consequence of Yarn's deterministic installs, but they can sometimes pile up and unnecessarily increase the size of your project.\n\n      This command dedupes dependencies in the current project using different strategies (only one is implemented at the moment):\n\n      - `highest`: Reuses (where possible) the locators with the highest versions. This means that dependencies can only be upgraded, never downgraded. It's also guaranteed that it never takes more than a single pass to dedupe the entire dependency tree.\n\n      **Note:** Even though it never produces a wrong dependency tree, this command should be used with caution, as it modifies the dependency tree, which can sometimes cause problems when packages don't strictly follow semver recommendations. Because of this, it is recommended to also review the changes manually.\n\n      If set, the `-c,--check` flag will only report the found duplicates, without persisting the modified dependency tree. If changes are found, the command will exit with a non-zero exit code, making it suitable for CI purposes.\n\n      If the `--mode=<mode>` option is set, Yarn will change which artifacts are generated. The modes currently supported are:\n\n      - `skip-build` will not run the build scripts at all. Note that this is different from setting `enableScripts` to false because the latter will disable build scripts, and thus affect the content of the artifacts generated on disk, whereas the former will just disable the build step - but not the scripts themselves, which just won't run.\n\n      - `update-lockfile` will skip the link step altogether, and only fetch packages that are missing from the lockfile (or that have no associated checksums). This mode is typically used by tools like Renovate or Dependabot to keep a lockfile up-to-date without incurring the full install cost.\n\n      This command accepts glob patterns as arguments (if valid Idents and supported by [micromatch](https://github.com/micromatch/micromatch)). Make sure to escape the patterns, to prevent your own shell from trying to expand them.\n\n      ### In-depth explanation:\n\n      Yarn doesn't deduplicate dependencies by default, otherwise installs wouldn't be deterministic and the lockfile would be useless. What it actually does is that it tries to not duplicate dependencies in the first place.\n\n      **Example:** If `foo@^2.3.4` (a dependency of a dependency) has already been resolved to `foo@2.3.4`, running `yarn add foo@*`will cause Yarn to reuse `foo@2.3.4`, even if the latest `foo` is actually `foo@2.10.14`, thus preventing unnecessary duplication.\n\n      Duplication happens when Yarn can't unlock dependencies that have already been locked inside the lockfile.\n\n      **Example:** If `foo@^2.3.4` (a dependency of a dependency) has already been resolved to `foo@2.3.4`, running `yarn add foo@2.10.14` will cause Yarn to install `foo@2.10.14` because the existing resolution doesn't satisfy the range `2.10.14`. This behavior can lead to (sometimes) unwanted duplication, since now the lockfile contains 2 separate resolutions for the 2 `foo` descriptors, even though they have overlapping ranges, which means that the lockfile can be simplified so that both descriptors resolve to `foo@2.10.14`.\n    ",examples:[["Dedupe all packages","$0 dedupe"],["Dedupe all packages using a specific strategy","$0 dedupe --strategy highest"],["Dedupe a specific package","$0 dedupe lodash"],["Dedupe all packages with the `@babel/*` scope","$0 dedupe '@babel/*'"],["Check for duplicates (can be used as a CI step)","$0 dedupe --check"]]});var Jh=class extends De{async execute(){let{plugins:e}=await ye.find(this.context.cwd,this.context.plugins),t=[];for(let o of e){let{commands:a}=o[1];if(a){let c=Un.from(a).definitions();t.push([o[0],c])}}let i=this.cli.definitions(),n=(o,a)=>o.split(" ").slice(1).join()===a.split(" ").slice(1).join(),s=oae()["@yarnpkg/builder"].bundles.standard;for(let o of t){let a=o[1];for(let l of a)i.find(c=>n(c.path,l.path)).plugin={name:o[0],isDefault:s.includes(o[0])}}this.context.stdout.write(`${JSON.stringify(i,null,2)}
-`)}};Jh.paths=[["--clipanion=definitions"]];var Wh=class extends De{async execute(){this.context.stdout.write(this.cli.usage(null))}};Wh.paths=[["help"],["--help"],["-h"]];var Ym=class extends De{constructor(){super(...arguments);this.leadingArgument=z.String();this.args=z.Proxy()}async execute(){if(this.leadingArgument.match(/[\\/]/)&&!P.tryParseIdent(this.leadingArgument)){let t=x.resolve(this.context.cwd,K.toPortablePath(this.leadingArgument));return await this.cli.run(this.args,{cwd:t})}else return await this.cli.run(["run",this.leadingArgument,...this.args])}};var zh=class extends De{async execute(){this.context.stdout.write(`${Lr||"<unknown>"}
-`)}};zh.paths=[["-v"],["--version"]];var gu=class extends De{constructor(){super(...arguments);this.commandName=z.String();this.args=z.Proxy()}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i,locator:n}=await je.find(t,this.context.cwd);return await i.restoreInstallState(),await Wt.executePackageShellcode(n,this.commandName,this.args,{cwd:this.context.cwd,stdin:this.context.stdin,stdout:this.context.stdout,stderr:this.context.stderr,project:i})}};gu.paths=[["exec"]],gu.usage=ve.Usage({description:"execute a shell script",details:`
-      This command simply executes a shell script within the context of the root directory of the active workspace using the portable shell.
-
-      It also makes sure to call it in a way that's compatible with the current project (for example, on PnP projects the environment will be setup in such a way that PnP will be correctly injected into the environment).
-    `,examples:[["Execute a single shell command","$0 exec echo Hello World"],["Execute a shell script",'$0 exec "tsc & babel src --out-dir lib"']]});as();var fu=class extends De{constructor(){super(...arguments);this.hash=z.String({required:!1,validator:nd(id(),[sd(/^p[0-9a-f]{5}$/)])})}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i}=await je.find(t,this.context.cwd);return await i.restoreInstallState({restoreResolutions:!1}),await i.applyLightResolution(),typeof this.hash<"u"?await y4e(this.hash,i,{stdout:this.context.stdout}):(await Ge.start({configuration:t,stdout:this.context.stdout,includeFooter:!1},async s=>{var a;let o=[([,l])=>P.stringifyLocator(i.storedPackages.get(l.subject)),([,l])=>P.stringifyIdent(l.requested)];for(let[l,c]of Ie.sortMap(i.peerRequirements,o)){let u=i.storedPackages.get(c.subject);if(typeof u>"u")throw new Error("Assertion failed: Expected the subject package to have been registered");let g=i.storedPackages.get(c.rootRequester);if(typeof g>"u")throw new Error("Assertion failed: Expected the root package to have been registered");let f=(a=u.dependencies.get(c.requested.identHash))!=null?a:null,h=ee.pretty(t,l,ee.Type.CODE),p=P.prettyLocator(t,u),C=P.prettyIdent(t,c.requested),y=P.prettyIdent(t,g),B=c.allRequesters.length-1,v=`descendant${B===1?"":"s"}`,D=B>0?` and ${B} ${v}`:"",L=f!==null?"provides":"doesn't provide";s.reportInfo(null,`${h} \u2192 ${p} ${L} ${C} to ${y}${D}`)}})).exitCode()}};fu.paths=[["explain","peer-requirements"]],fu.usage=ve.Usage({description:"explain a set of peer requirements",details:`
-      A set of peer requirements represents all peer requirements that a dependent must satisfy when providing a given peer request to a requester and its descendants.
-
-      When the hash argument is specified, this command prints a detailed explanation of all requirements of the set corresponding to the hash and whether they're satisfied or not.
-
-      When used without arguments, this command lists all sets of peer requirements and the corresponding hash that can be used to get detailed information about a given set.
-
-      **Note:** A hash is a six-letter p-prefixed code that can be obtained from peer dependency warnings or from the list of all peer requirements (\`yarn explain peer-requirements\`).
-    `,examples:[["Explain the corresponding set of peer requirements for a hash","$0 explain peer-requirements p1a4ed"],["List all sets of peer requirements","$0 explain peer-requirements"]]});async function y4e(r,e,t){let{configuration:i}=e,n=e.peerRequirements.get(r);if(typeof n>"u")throw new Error(`No peerDependency requirements found for hash: "${r}"`);return(await Ge.start({configuration:i,stdout:t.stdout,includeFooter:!1},async o=>{var B,v;let a=e.storedPackages.get(n.subject);if(typeof a>"u")throw new Error("Assertion failed: Expected the subject package to have been registered");let l=e.storedPackages.get(n.rootRequester);if(typeof l>"u")throw new Error("Assertion failed: Expected the root package to have been registered");let c=(B=a.dependencies.get(n.requested.identHash))!=null?B:null,u=c!==null?e.storedResolutions.get(c.descriptorHash):null;if(typeof u>"u")throw new Error("Assertion failed: Expected the resolution to have been registered");let g=u!==null?e.storedPackages.get(u):null;if(typeof g>"u")throw new Error("Assertion failed: Expected the provided package to have been registered");let f=[...n.allRequesters.values()].map(D=>{let L=e.storedPackages.get(D);if(typeof L>"u")throw new Error("Assertion failed: Expected the package to be registered");let H=P.devirtualizeLocator(L),j=e.storedPackages.get(H.locatorHash);if(typeof j>"u")throw new Error("Assertion failed: Expected the package to be registered");let $=j.peerDependencies.get(n.requested.identHash);if(typeof $>"u")throw new Error("Assertion failed: Expected the peer dependency to be registered");return{pkg:L,peerDependency:$}});if(g!==null){let D=f.every(({peerDependency:L})=>vt.satisfiesWithPrereleases(g.version,L.range));o.reportInfo(0,`${P.prettyLocator(i,a)} provides ${P.prettyLocator(i,g)} with version ${P.prettyReference(i,(v=g.version)!=null?v:"<missing>")}, which ${D?"satisfies":"doesn't satisfy"} the following requirements:`)}else o.reportInfo(0,`${P.prettyLocator(i,a)} doesn't provide ${P.prettyIdent(i,n.requested)}, breaking the following requirements:`);o.reportSeparator();let h=ee.mark(i),p=[];for(let{pkg:D,peerDependency:L}of Ie.sortMap(f,H=>P.stringifyLocator(H.pkg))){let j=(g!==null?vt.satisfiesWithPrereleases(g.version,L.range):!1)?h.Check:h.Cross;p.push({stringifiedLocator:P.stringifyLocator(D),prettyLocator:P.prettyLocator(i,D),prettyRange:P.prettyRange(i,L.range),mark:j})}let C=Math.max(...p.map(({stringifiedLocator:D})=>D.length)),y=Math.max(...p.map(({prettyRange:D})=>D.length));for(let{stringifiedLocator:D,prettyLocator:L,prettyRange:H,mark:j}of Ie.sortMap(p,({stringifiedLocator:$})=>$))o.reportInfo(null,`${L.padEnd(C+(L.length-D.length)," ")} \u2192 ${H.padEnd(y," ")} ${j}`);p.length>1&&(o.reportSeparator(),o.reportInfo(0,`Note: these requirements start with ${P.prettyLocator(e.configuration,l)}`))})).exitCode()}as();var aae=Pe(Xr()),hu=class extends De{constructor(){super(...arguments);this.onlyIfNeeded=z.Boolean("--only-if-needed",!1,{description:"Only lock the Yarn version if it isn't already locked"});this.version=z.String()}async execute(){var o;let t=await ye.find(this.context.cwd,this.context.plugins);if(this.onlyIfNeeded&&t.get("yarnPath")){let a=t.sources.get("yarnPath");if(!a)throw new Error("Assertion failed: Expected 'yarnPath' to have a source");let l=(o=t.projectCwd)!=null?o:t.startingCwd;if(x.contains(l,a))return 0}let i=()=>{if(typeof Lr>"u")throw new be("The --install flag can only be used without explicit version specifier from the Yarn CLI");return`file://${process.argv[1]}`},n;if(this.version==="self")n=i();else if(this.version==="latest"||this.version==="berry"||this.version==="stable")n=`https://repo.yarnpkg.com/${await jm(t,"stable")}/packages/yarnpkg-cli/bin/yarn.js`;else if(this.version==="canary")n=`https://repo.yarnpkg.com/${await jm(t,"canary")}/packages/yarnpkg-cli/bin/yarn.js`;else if(this.version==="classic")n="https://classic.yarnpkg.com/latest.js";else if(this.version.match(/^https?:/))n=this.version;else if(this.version.match(/^\.{0,2}[\\/]/)||K.isAbsolute(this.version))n=`file://${K.resolve(this.version)}`;else if(vt.satisfiesWithPrereleases(this.version,">=2.0.0"))n=`https://repo.yarnpkg.com/${this.version}/packages/yarnpkg-cli/bin/yarn.js`;else if(vt.satisfiesWithPrereleases(this.version,"^0.x || ^1.x"))n=`https://github.com/yarnpkg/yarn/releases/download/v${this.version}/yarn-${this.version}.js`;else if(vt.validRange(this.version))n=`https://repo.yarnpkg.com/${await w4e(t,this.version)}/packages/yarnpkg-cli/bin/yarn.js`;else throw new be(`Invalid version descriptor "${this.version}"`);return(await Ge.start({configuration:t,stdout:this.context.stdout,includeLogs:!this.context.quiet},async a=>{let l="file://",c;n.startsWith(l)?(a.reportInfo(0,`Downloading ${ee.pretty(t,n,xi.URL)}`),c=await M.readFilePromise(K.toPortablePath(n.slice(l.length)))):(a.reportInfo(0,`Retrieving ${ee.pretty(t,n,xi.PATH)}`),c=await Xt.get(n,{configuration:t})),await _T(t,null,c,{report:a})})).exitCode()}};hu.paths=[["set","version"]],hu.usage=ve.Usage({description:"lock the Yarn version used by the project",details:"\n      This command will download a specific release of Yarn directly from the Yarn GitHub repository, will store it inside your project, and will change the `yarnPath` settings from your project `.yarnrc.yml` file to point to the new file.\n\n      A very good use case for this command is to enforce the version of Yarn used by the any single member of your team inside a same project - by doing this you ensure that you have control on Yarn upgrades and downgrades (including on your deployment servers), and get rid of most of the headaches related to someone using a slightly different version and getting a different behavior than you.\n\n      The version specifier can be:\n\n      - a tag:\n        - `latest` / `berry` / `stable` -> the most recent stable berry (`>=2.0.0`) release\n        - `canary` -> the most recent canary (release candidate) berry (`>=2.0.0`) release\n        - `classic` -> the most recent classic (`^0.x || ^1.x`) release\n\n      - a semver range (e.g. `2.x`) -> the most recent version satisfying the range (limited to berry releases)\n\n      - a semver version (e.g. `2.4.1`, `1.22.1`)\n\n      - a local file referenced through either a relative or absolute path\n\n      - `self` -> the version used to invoke the command\n    ",examples:[["Download the latest release from the Yarn repository","$0 set version latest"],["Download the latest canary release from the Yarn repository","$0 set version canary"],["Download the latest classic release from the Yarn repository","$0 set version classic"],["Download the most recent Yarn 3 build","$0 set version 3.x"],["Download a specific Yarn 2 build","$0 set version 2.0.0-rc.30"],["Switch back to a specific Yarn 1 release","$0 set version 1.22.1"],["Use a release from the local filesystem","$0 set version ./yarn.cjs"],["Use a release from a URL","$0 set version https://repo.yarnpkg.com/3.1.0/packages/yarnpkg-cli/bin/yarn.js"],["Download the version used to invoke the command","$0 set version self"]]});async function w4e(r,e){let i=(await Xt.get("https://repo.yarnpkg.com/tags",{configuration:r,jsonResponse:!0})).tags.filter(n=>vt.satisfiesWithPrereleases(n,e));if(i.length===0)throw new be(`No matching release found for range ${ee.pretty(r,e,ee.Type.RANGE)}.`);return i[0]}async function jm(r,e){let t=await Xt.get("https://repo.yarnpkg.com/tags",{configuration:r,jsonResponse:!0});if(!t.latest[e])throw new be(`Tag ${ee.pretty(r,e,ee.Type.RANGE)} not found`);return t.latest[e]}async function _T(r,e,t,{report:i}){var h;e===null&&await M.mktempPromise(async p=>{let C=x.join(p,"yarn.cjs");await M.writeFilePromise(C,t);let{stdout:y}=await Cr.execvp(process.execPath,[K.fromPortablePath(C),"--version"],{cwd:p,env:{...process.env,YARN_IGNORE_PATH:"1"}});if(e=y.trim(),!aae.default.valid(e))throw new Error(`Invalid semver version. ${ee.pretty(r,"yarn --version",ee.Type.CODE)} returned:
-${e}`)});let n=(h=r.projectCwd)!=null?h:r.startingCwd,s=x.resolve(n,".yarn/releases"),o=x.resolve(s,`yarn-${e}.cjs`),a=x.relative(r.startingCwd,o),l=x.relative(n,o);i.reportInfo(0,`Saving the new release in ${ee.pretty(r,a,"magenta")}`),await M.removePromise(x.dirname(o)),await M.mkdirPromise(x.dirname(o),{recursive:!0}),await M.writeFilePromise(o,t,{mode:493}),await ye.updateConfiguration(n,{yarnPath:l});let c=await ot.tryFind(n)||new ot;c.packageManager=`yarn@${e&&Ie.isTaggedYarnVersion(e)?e:await jm(r,"stable")}`;let u={};c.exportTo(u);let g=x.join(n,ot.fileName),f=`${JSON.stringify(u,null,c.indent)}
-`;await M.changeFilePromise(g,f,{automaticNewlines:!0})}function Aae(r){return Ct[RI(r)]}var B4e=/## (?<code>YN[0-9]{4}) - `(?<name>[A-Z_]+)`\n\n(?<details>(?:.(?!##))+)/gs;async function Q4e(r){let t=`https://repo.yarnpkg.com/${Ie.isTaggedYarnVersion(Lr)?Lr:await jm(r,"canary")}/packages/gatsby/content/advanced/error-codes.md`,i=await Xt.get(t,{configuration:r});return new Map(Array.from(i.toString().matchAll(B4e),({groups:n})=>{if(!n)throw new Error("Assertion failed: Expected the match to have been successful");let s=Aae(n.code);if(n.name!==s)throw new Error(`Assertion failed: Invalid error code data: Expected "${n.name}" to be named "${s}"`);return[n.code,n.details]}))}var pu=class extends De{constructor(){super(...arguments);this.code=z.String({required:!1,validator:nd(id(),[sd(/^YN[0-9]{4}$/)])});this.json=z.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"})}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins);if(typeof this.code<"u"){let i=Aae(this.code),n=ee.pretty(t,i,ee.Type.CODE),s=this.cli.format().header(`${this.code} - ${n}`),a=(await Q4e(t)).get(this.code),l=typeof a<"u"?ee.jsonOrPretty(this.json,t,ee.tuple(ee.Type.MARKDOWN,{text:a,format:this.cli.format(),paragraphs:!0})):`This error code does not have a description.
-
-You can help us by editing this page on GitHub \u{1F642}:
-${ee.jsonOrPretty(this.json,t,ee.tuple(ee.Type.URL,"https://github.com/yarnpkg/berry/blob/master/packages/gatsby/content/advanced/error-codes.md"))}
-`;this.json?this.context.stdout.write(`${JSON.stringify({code:this.code,name:i,details:l})}
-`):this.context.stdout.write(`${s}
-
-${l}
-`)}else{let i={children:Ie.mapAndFilter(Object.entries(Ct),([n,s])=>Number.isNaN(Number(n))?Ie.mapAndFilter.skip:{label:RA(Number(n)),value:ee.tuple(ee.Type.CODE,s)})};_n.emitTree(i,{configuration:t,stdout:this.context.stdout,json:this.json})}}};pu.paths=[["explain"]],pu.usage=ve.Usage({description:"explain an error code",details:`
-      When the code argument is specified, this command prints its name and its details.
-
-      When used without arguments, this command lists all error codes and their names.
-    `,examples:[["Explain an error code","$0 explain YN0006"],["List all error codes","$0 explain"]]});var lae=Pe(yn()),du=class extends De{constructor(){super(...arguments);this.all=z.Boolean("-A,--all",!1,{description:"Print versions of a package from the whole project"});this.recursive=z.Boolean("-R,--recursive",!1,{description:"Print information for all packages, including transitive dependencies"});this.extra=z.Array("-X,--extra",[],{description:"An array of requests of extra data provided by plugins"});this.cache=z.Boolean("--cache",!1,{description:"Print information about the cache entry of a package (path, size, checksum)"});this.dependents=z.Boolean("--dependents",!1,{description:"Print all dependents for each matching package"});this.manifest=z.Boolean("--manifest",!1,{description:"Print data obtained by looking at the package archive (license, homepage, ...)"});this.nameOnly=z.Boolean("--name-only",!1,{description:"Only print the name for the matching packages"});this.virtuals=z.Boolean("--virtuals",!1,{description:"Print each instance of the virtual packages"});this.json=z.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.patterns=z.Rest()}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i,workspace:n}=await je.find(t,this.context.cwd),s=await Rt.find(t);if(!n&&!this.all)throw new ct(i.cwd,this.context.cwd);await i.restoreInstallState();let o=new Set(this.extra);this.cache&&o.add("cache"),this.dependents&&o.add("dependents"),this.manifest&&o.add("manifest");let a=(L,{recursive:H})=>{let j=L.anchoredLocator.locatorHash,$=new Map,V=[j];for(;V.length>0;){let W=V.shift();if($.has(W))continue;let _=i.storedPackages.get(W);if(typeof _>"u")throw new Error("Assertion failed: Expected the package to be registered");if($.set(W,_),P.isVirtualLocator(_)&&V.push(P.devirtualizeLocator(_).locatorHash),!(!H&&W!==j))for(let A of _.dependencies.values()){let ae=i.storedResolutions.get(A.descriptorHash);if(typeof ae>"u")throw new Error("Assertion failed: Expected the resolution to be registered");V.push(ae)}}return $.values()},l=({recursive:L})=>{let H=new Map;for(let j of i.workspaces)for(let $ of a(j,{recursive:L}))H.set($.locatorHash,$);return H.values()},c=({all:L,recursive:H})=>L&&H?i.storedPackages.values():L?l({recursive:H}):a(n,{recursive:H}),u=({all:L,recursive:H})=>{let j=c({all:L,recursive:H}),$=this.patterns.map(_=>{let A=P.parseLocator(_),ae=lae.default.makeRe(P.stringifyIdent(A)),ge=P.isVirtualLocator(A),re=ge?P.devirtualizeLocator(A):A;return O=>{let F=P.stringifyIdent(O);if(!ae.test(F))return!1;if(A.reference==="unknown")return!0;let ue=P.isVirtualLocator(O),he=ue?P.devirtualizeLocator(O):O;return!(ge&&ue&&A.reference!==O.reference||re.reference!==he.reference)}}),V=Ie.sortMap([...j],_=>P.stringifyLocator(_));return{selection:V.filter(_=>$.length===0||$.some(A=>A(_))),sortedLookup:V}},{selection:g,sortedLookup:f}=u({all:this.all,recursive:this.recursive});if(g.length===0)throw new be("No package matched your request");let h=new Map;if(this.dependents)for(let L of f)for(let H of L.dependencies.values()){let j=i.storedResolutions.get(H.descriptorHash);if(typeof j>"u")throw new Error("Assertion failed: Expected the resolution to be registered");Ie.getArrayWithDefault(h,j).push(L)}let p=new Map;for(let L of f){if(!P.isVirtualLocator(L))continue;let H=P.devirtualizeLocator(L);Ie.getArrayWithDefault(p,H.locatorHash).push(L)}let C={},y={children:C},B=t.makeFetcher(),v={project:i,fetcher:B,cache:s,checksums:i.storedChecksums,report:new ti,cacheOptions:{skipIntegrityCheck:!0},skipIntegrityCheck:!0},D=[async(L,H,j)=>{var W,_;if(!H.has("manifest"))return;let $=await B.fetch(L,v),V;try{V=await ot.find($.prefixPath,{baseFs:$.packageFs})}finally{(W=$.releaseFs)==null||W.call($)}j("Manifest",{License:ee.tuple(ee.Type.NO_HINT,V.license),Homepage:ee.tuple(ee.Type.URL,(_=V.raw.homepage)!=null?_:null)})},async(L,H,j)=>{var ae;if(!H.has("cache"))return;let $={mockedPackages:i.disabledLocators,unstablePackages:i.conditionalLocators},V=(ae=i.storedChecksums.get(L.locatorHash))!=null?ae:null,W=s.getLocatorPath(L,V,$),_;if(W!==null)try{_=M.statSync(W)}catch{}let A=typeof _<"u"?[_.size,ee.Type.SIZE]:void 0;j("Cache",{Checksum:ee.tuple(ee.Type.NO_HINT,V),Path:ee.tuple(ee.Type.PATH,W),Size:A})}];for(let L of g){let H=P.isVirtualLocator(L);if(!this.virtuals&&H)continue;let j={},$={value:[L,ee.Type.LOCATOR],children:j};if(C[P.stringifyLocator(L)]=$,this.nameOnly){delete $.children;continue}let V=p.get(L.locatorHash);typeof V<"u"&&(j.Instances={label:"Instances",value:ee.tuple(ee.Type.NUMBER,V.length)}),j.Version={label:"Version",value:ee.tuple(ee.Type.NO_HINT,L.version)};let W=(A,ae)=>{let ge={};if(j[A]=ge,Array.isArray(ae))ge.children=ae.map(re=>({value:re}));else{let re={};ge.children=re;for(let[O,F]of Object.entries(ae))typeof F>"u"||(re[O]={label:O,value:F})}};if(!H){for(let A of D)await A(L,o,W);await t.triggerHook(A=>A.fetchPackageInfo,L,o,W)}L.bin.size>0&&!H&&W("Exported Binaries",[...L.bin.keys()].map(A=>ee.tuple(ee.Type.PATH,A)));let _=h.get(L.locatorHash);typeof _<"u"&&_.length>0&&W("Dependents",_.map(A=>ee.tuple(ee.Type.LOCATOR,A))),L.dependencies.size>0&&!H&&W("Dependencies",[...L.dependencies.values()].map(A=>{var re;let ae=i.storedResolutions.get(A.descriptorHash),ge=typeof ae<"u"&&(re=i.storedPackages.get(ae))!=null?re:null;return ee.tuple(ee.Type.RESOLUTION,{descriptor:A,locator:ge})})),L.peerDependencies.size>0&&H&&W("Peer dependencies",[...L.peerDependencies.values()].map(A=>{var O,F;let ae=L.dependencies.get(A.identHash),ge=typeof ae<"u"&&(O=i.storedResolutions.get(ae.descriptorHash))!=null?O:null,re=ge!==null&&(F=i.storedPackages.get(ge))!=null?F:null;return ee.tuple(ee.Type.RESOLUTION,{descriptor:A,locator:re})}))}_n.emitTree(y,{configuration:t,json:this.json,stdout:this.context.stdout,separators:this.nameOnly?0:2})}};du.paths=[["info"]],du.usage=ve.Usage({description:"see information related to packages",details:"\n      This command prints various information related to the specified packages, accepting glob patterns.\n\n      By default, if the locator reference is missing, Yarn will default to print the information about all the matching direct dependencies of the package for the active workspace. To instead print all versions of the package that are direct dependencies of any of your workspaces, use the `-A,--all` flag. Adding the `-R,--recursive` flag will also report transitive dependencies.\n\n      Some fields will be hidden by default in order to keep the output readable, but can be selectively displayed by using additional options (`--dependents`, `--manifest`, `--virtuals`, ...) described in the option descriptions.\n\n      Note that this command will only print the information directly related to the selected packages - if you wish to know why the package is there in the first place, use `yarn why` which will do just that (it also provides a `-R,--recursive` flag that may be of some help).\n    ",examples:[["Show information about Lodash","$0 info lodash"]]});var DQ=Pe(nc());as();var Cu=class extends De{constructor(){super(...arguments);this.json=z.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.immutable=z.Boolean("--immutable",{description:"Abort with an error exit code if the lockfile was to be modified"});this.immutableCache=z.Boolean("--immutable-cache",{description:"Abort with an error exit code if the cache folder was to be modified"});this.checkCache=z.Boolean("--check-cache",!1,{description:"Always refetch the packages and ensure that their checksums are consistent"});this.inlineBuilds=z.Boolean("--inline-builds",{description:"Verbosely print the output of the build steps of dependencies"});this.mode=z.String("--mode",{description:"Change what artifacts installs generate",validator:Vi($n)});this.cacheFolder=z.String("--cache-folder",{hidden:!0});this.frozenLockfile=z.Boolean("--frozen-lockfile",{hidden:!0});this.ignoreEngines=z.Boolean("--ignore-engines",{hidden:!0});this.nonInteractive=z.Boolean("--non-interactive",{hidden:!0});this.preferOffline=z.Boolean("--prefer-offline",{hidden:!0});this.production=z.Boolean("--production",{hidden:!0});this.registry=z.String("--registry",{hidden:!0});this.silent=z.Boolean("--silent",{hidden:!0});this.networkTimeout=z.String("--network-timeout",{hidden:!0})}async execute(){var f;let t=await ye.find(this.context.cwd,this.context.plugins);typeof this.inlineBuilds<"u"&&t.useWithSource("<cli>",{enableInlineBuilds:this.inlineBuilds},t.startingCwd,{overwrite:!0});let i=!!process.env.FUNCTION_TARGET||!!process.env.GOOGLE_RUNTIME,n=async(h,{error:p})=>{let C=await Ge.start({configuration:t,stdout:this.context.stdout,includeFooter:!1},async y=>{p?y.reportError(50,h):y.reportWarning(50,h)});return C.hasErrors()?C.exitCode():null};if(typeof this.ignoreEngines<"u"){let h=await n("The --ignore-engines option is deprecated; engine checking isn't a core feature anymore",{error:!DQ.default.VERCEL});if(h!==null)return h}if(typeof this.registry<"u"){let h=await n("The --registry option is deprecated; prefer setting npmRegistryServer in your .yarnrc.yml file",{error:!1});if(h!==null)return h}if(typeof this.preferOffline<"u"){let h=await n("The --prefer-offline flag is deprecated; use the --cached flag with 'yarn add' instead",{error:!DQ.default.VERCEL});if(h!==null)return h}if(typeof this.production<"u"){let h=await n("The --production option is deprecated on 'install'; use 'yarn workspaces focus' instead",{error:!0});if(h!==null)return h}if(typeof this.nonInteractive<"u"){let h=await n("The --non-interactive option is deprecated",{error:!i});if(h!==null)return h}if(typeof this.frozenLockfile<"u"&&(await n("The --frozen-lockfile option is deprecated; use --immutable and/or --immutable-cache instead",{error:!1}),this.immutable=this.frozenLockfile),typeof this.cacheFolder<"u"){let h=await n("The cache-folder option has been deprecated; use rc settings instead",{error:!DQ.default.NETLIFY});if(h!==null)return h}let s=this.mode==="update-lockfile";if(s&&(this.immutable||this.immutableCache))throw new be(`${ee.pretty(t,"--immutable",ee.Type.CODE)} and ${ee.pretty(t,"--immutable-cache",ee.Type.CODE)} cannot be used with ${ee.pretty(t,"--mode=update-lockfile",ee.Type.CODE)}`);let o=((f=this.immutable)!=null?f:t.get("enableImmutableInstalls"))&&!s,a=this.immutableCache&&!s;if(t.projectCwd!==null){let h=await Ge.start({configuration:t,json:this.json,stdout:this.context.stdout,includeFooter:!1},async p=>{await x4e(t,o)&&(p.reportInfo(48,"Automatically fixed merge conflicts \u{1F44D}"),p.reportSeparator())});if(h.hasErrors())return h.exitCode()}if(t.projectCwd!==null&&typeof t.sources.get("nodeLinker")>"u"){let h=t.projectCwd,p;try{p=await M.readFilePromise(x.join(h,xt.lockfile),"utf8")}catch{}if(p!=null&&p.includes("yarn lockfile v1")){let C=await Ge.start({configuration:t,json:this.json,stdout:this.context.stdout,includeFooter:!1},async y=>{y.reportInfo(70,"Migrating from Yarn 1; automatically enabling the compatibility node-modules linker \u{1F44D}"),y.reportSeparator(),t.use("<compat>",{nodeLinker:"node-modules"},h,{overwrite:!0}),await ye.updateConfiguration(h,{nodeLinker:"node-modules"})});if(C.hasErrors())return C.exitCode()}}if(t.projectCwd!==null){let h=await Ge.start({configuration:t,json:this.json,stdout:this.context.stdout,includeFooter:!1},async p=>{var C;(C=ye.telemetry)!=null&&C.isNew&&(p.reportInfo(65,"Yarn will periodically gather anonymous telemetry: https://yarnpkg.com/advanced/telemetry"),p.reportInfo(65,`Run ${ee.pretty(t,"yarn config set --home enableTelemetry 0",ee.Type.CODE)} to disable`),p.reportSeparator())});if(h.hasErrors())return h.exitCode()}let{project:l,workspace:c}=await je.find(t,this.context.cwd),u=await Rt.find(t,{immutable:a,check:this.checkCache});if(!c)throw new ct(l.cwd,this.context.cwd);return await l.restoreInstallState({restoreResolutions:!1}),(await Ge.start({configuration:t,json:this.json,stdout:this.context.stdout,includeLogs:!0},async h=>{await l.install({cache:u,report:h,immutable:o,mode:this.mode})})).exitCode()}};Cu.paths=[["install"],ve.Default],Cu.usage=ve.Usage({description:"install the project dependencies",details:`
-      This command sets up your project if needed. The installation is split into four different steps that each have their own characteristics:
-
-      - **Resolution:** First the package manager will resolve your dependencies. The exact way a dependency version is privileged over another isn't standardized outside of the regular semver guarantees. If a package doesn't resolve to what you would expect, check that all dependencies are correctly declared (also check our website for more information: ).
-
-      - **Fetch:** Then we download all the dependencies if needed, and make sure that they're all stored within our cache (check the value of \`cacheFolder\` in \`yarn config\` to see where the cache files are stored).
-
-      - **Link:** Then we send the dependency tree information to internal plugins tasked with writing them on the disk in some form (for example by generating the .pnp.cjs file you might know).
-
-      - **Build:** Once the dependency tree has been written on the disk, the package manager will now be free to run the build scripts for all packages that might need it, in a topological order compatible with the way they depend on one another. See https://yarnpkg.com/advanced/lifecycle-scripts for detail.
-
-      Note that running this command is not part of the recommended workflow. Yarn supports zero-installs, which means that as long as you store your cache and your .pnp.cjs file inside your repository, everything will work without requiring any install right after cloning your repository or switching branches.
-
-      If the \`--immutable\` option is set (defaults to true on CI), Yarn will abort with an error exit code if the lockfile was to be modified (other paths can be added using the \`immutablePatterns\` configuration setting). For backward compatibility we offer an alias under the name of \`--frozen-lockfile\`, but it will be removed in a later release.
-
-      If the \`--immutable-cache\` option is set, Yarn will abort with an error exit code if the cache folder was to be modified (either because files would be added, or because they'd be removed).
-
-      If the \`--check-cache\` option is set, Yarn will always refetch the packages and will ensure that their checksum matches what's 1/ described in the lockfile 2/ inside the existing cache files (if present). This is recommended as part of your CI workflow if you're both following the Zero-Installs model and accepting PRs from third-parties, as they'd otherwise have the ability to alter the checked-in packages before submitting them.
-
-      If the \`--inline-builds\` option is set, Yarn will verbosely print the output of the build steps of your dependencies (instead of writing them into individual files). This is likely useful mostly for debug purposes only when using Docker-like environments.
-
-      If the \`--mode=<mode>\` option is set, Yarn will change which artifacts are generated. The modes currently supported are:
-
-      - \`skip-build\` will not run the build scripts at all. Note that this is different from setting \`enableScripts\` to false because the latter will disable build scripts, and thus affect the content of the artifacts generated on disk, whereas the former will just disable the build step - but not the scripts themselves, which just won't run.
-
-      - \`update-lockfile\` will skip the link step altogether, and only fetch packages that are missing from the lockfile (or that have no associated checksums). This mode is typically used by tools like Renovate or Dependabot to keep a lockfile up-to-date without incurring the full install cost.
-    `,examples:[["Install the project","$0 install"],["Validate a project when using Zero-Installs","$0 install --immutable --immutable-cache"],["Validate a project when using Zero-Installs (slightly safer if you accept external PRs)","$0 install --immutable --immutable-cache --check-cache"]]});var b4e="|||||||",S4e=">>>>>>>",v4e="=======",cae="<<<<<<<";async function x4e(r,e){if(!r.projectCwd)return!1;let t=x.join(r.projectCwd,r.get("lockfileFilename"));if(!await M.existsPromise(t))return!1;let i=await M.readFilePromise(t,"utf8");if(!i.includes(cae))return!1;if(e)throw new at(47,"Cannot autofix a lockfile when running an immutable install");let[n,s]=P4e(i),o,a;try{o=yi(n),a=yi(s)}catch{throw new at(46,"The individual variants of the lockfile failed to parse")}let l={...o,...a};for(let[c,u]of Object.entries(l))typeof u=="string"&&delete l[c];return await M.changeFilePromise(t,wa(l),{automaticNewlines:!0}),!0}function P4e(r){let e=[[],[]],t=r.split(/\r?\n/g),i=!1;for(;t.length>0;){let n=t.shift();if(typeof n>"u")throw new Error("Assertion failed: Some lines should remain");if(n.startsWith(cae)){for(;t.length>0;){let s=t.shift();if(typeof s>"u")throw new Error("Assertion failed: Some lines should remain");if(s===v4e){i=!1;break}else if(i||s.startsWith(b4e)){i=!0;continue}else e[0].push(s)}for(;t.length>0;){let s=t.shift();if(typeof s>"u")throw new Error("Assertion failed: Some lines should remain");if(s.startsWith(S4e))break;e[1].push(s)}}else e[0].push(n),e[1].push(n)}return[e[0].join(`
-`),e[1].join(`
-`)]}var mu=class extends De{constructor(){super(...arguments);this.all=z.Boolean("-A,--all",!1,{description:"Link all workspaces belonging to the target project to the current one"});this.private=z.Boolean("-p,--private",!1,{description:"Also link private workspaces belonging to the target project to the current one"});this.relative=z.Boolean("-r,--relative",!1,{description:"Link workspaces using relative paths instead of absolute paths"});this.destination=z.String()}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i,workspace:n}=await je.find(t,this.context.cwd),s=await Rt.find(t);if(!n)throw new ct(i.cwd,this.context.cwd);await i.restoreInstallState({restoreResolutions:!1});let o=x.resolve(this.context.cwd,K.toPortablePath(this.destination)),a=await ye.find(o,this.context.plugins,{useRc:!1,strict:!1}),{project:l,workspace:c}=await je.find(a,o);if(i.cwd===l.cwd)throw new be("Invalid destination; Can't link the project to itself");if(!c)throw new ct(l.cwd,o);let u=i.topLevelWorkspace,g=[];if(this.all){for(let h of l.workspaces)h.manifest.name&&(!h.manifest.private||this.private)&&g.push(h);if(g.length===0)throw new be("No workspace found to be linked in the target project")}else{if(!c.manifest.name)throw new be("The target workspace doesn't have a name and thus cannot be linked");if(c.manifest.private&&!this.private)throw new be("The target workspace is marked private - use the --private flag to link it anyway");g.push(c)}for(let h of g){let p=P.stringifyIdent(h.locator),C=this.relative?x.relative(i.cwd,h.cwd):h.cwd;u.manifest.resolutions.push({pattern:{descriptor:{fullName:p}},reference:`portal:${C}`})}return(await Ge.start({configuration:t,stdout:this.context.stdout},async h=>{await i.install({cache:s,report:h})})).exitCode()}};mu.paths=[["link"]],mu.usage=ve.Usage({description:"connect the local project to another one",details:"\n      This command will set a new `resolutions` field in the project-level manifest and point it to the workspace at the specified location (even if part of another project).\n    ",examples:[["Register a remote workspace for use in the current project","$0 link ~/ts-loader"],["Register all workspaces from a remote project for use in the current project","$0 link ~/jest --all"]]});var Eu=class extends De{constructor(){super(...arguments);this.args=z.Proxy()}async execute(){return this.cli.run(["exec","node",...this.args])}};Eu.paths=[["node"]],Eu.usage=ve.Usage({description:"run node with the hook already setup",details:`
-      This command simply runs Node. It also makes sure to call it in a way that's compatible with the current project (for example, on PnP projects the environment will be setup in such a way that PnP will be correctly injected into the environment).
-
-      The Node process will use the exact same version of Node as the one used to run Yarn itself, which might be a good way to ensure that your commands always use a consistent Node version.
-    `,examples:[["Run a Node script","$0 node ./my-script.js"]]});var dae=J("os");var uae=J("os");var D4e="https://raw.githubusercontent.com/yarnpkg/berry/master/plugins.yml";async function yu(r){let e=await Xt.get(D4e,{configuration:r});return yi(e.toString())}var Iu=class extends De{constructor(){super(...arguments);this.json=z.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"})}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins);return(await Ge.start({configuration:t,json:this.json,stdout:this.context.stdout},async n=>{let s=await yu(t);for(let[o,{experimental:a,...l}]of Object.entries(s)){let c=o;a&&(c+=" [experimental]"),n.reportJson({name:o,experimental:a,...l}),n.reportInfo(null,c)}})).exitCode()}};Iu.paths=[["plugin","list"]],Iu.usage=ve.Usage({category:"Plugin-related commands",description:"list the available official plugins",details:"\n      This command prints the plugins available directly from the Yarn repository. Only those plugins can be referenced by name in `yarn plugin import`.\n    ",examples:[["List the official plugins","$0 plugin list"]]});var k4e=/^[0-9]+$/;function gae(r){return k4e.test(r)?`pull/${r}/head`:r}var R4e=({repository:r,branch:e},t)=>[["git","init",K.fromPortablePath(t)],["git","remote","add","origin",r],["git","fetch","origin","--depth=1",gae(e)],["git","reset","--hard","FETCH_HEAD"]],F4e=({branch:r})=>[["git","fetch","origin","--depth=1",gae(r),"--force"],["git","reset","--hard","FETCH_HEAD"],["git","clean","-dfx"]],N4e=({plugins:r,noMinify:e},t)=>[["yarn","build:cli",...new Array().concat(...r.map(i=>["--plugin",x.resolve(t,i)])),...e?["--no-minify"]:[],"|"]],wu=class extends De{constructor(){super(...arguments);this.installPath=z.String("--path",{description:"The path where the repository should be cloned to"});this.repository=z.String("--repository","https://github.com/yarnpkg/berry.git",{description:"The repository that should be cloned"});this.branch=z.String("--branch","master",{description:"The branch of the repository that should be cloned"});this.plugins=z.Array("--plugin",[],{description:"An array of additional plugins that should be included in the bundle"});this.noMinify=z.Boolean("--no-minify",!1,{description:"Build a bundle for development (debugging) - non-minified and non-mangled"});this.force=z.Boolean("-f,--force",!1,{description:"Always clone the repository instead of trying to fetch the latest commits"});this.skipPlugins=z.Boolean("--skip-plugins",!1,{description:"Skip updating the contrib plugins"})}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i}=await je.find(t,this.context.cwd),n=typeof this.installPath<"u"?x.resolve(this.context.cwd,K.toPortablePath(this.installPath)):x.resolve(K.toPortablePath((0,uae.tmpdir)()),"yarnpkg-sources",li.makeHash(this.repository).slice(0,6));return(await Ge.start({configuration:t,stdout:this.context.stdout},async o=>{await $T(this,{configuration:t,report:o,target:n}),o.reportSeparator(),o.reportInfo(0,"Building a fresh bundle"),o.reportSeparator(),await qm(N4e(this,n),{configuration:t,context:this.context,target:n}),o.reportSeparator();let a=x.resolve(n,"packages/yarnpkg-cli/bundles/yarn.js"),l=await M.readFilePromise(a);await _T(t,"sources",l,{report:o}),this.skipPlugins||await L4e(this,{project:i,report:o,target:n})})).exitCode()}};wu.paths=[["set","version","from","sources"]],wu.usage=ve.Usage({description:"build Yarn from master",details:`
-      This command will clone the Yarn repository into a temporary folder, then build it. The resulting bundle will then be copied into the local project.
-
-      By default, it also updates all contrib plugins to the same commit the bundle is built from. This behavior can be disabled by using the \`--skip-plugins\` flag.
-    `,examples:[["Build Yarn from master","$0 set version from sources"]]});async function qm(r,{configuration:e,context:t,target:i}){for(let[n,...s]of r){let o=s[s.length-1]==="|";if(o&&s.pop(),o)await Cr.pipevp(n,s,{cwd:i,stdin:t.stdin,stdout:t.stdout,stderr:t.stderr,strict:!0});else{t.stdout.write(`${ee.pretty(e,`  $ ${[n,...s].join(" ")}`,"grey")}
-`);try{await Cr.execvp(n,s,{cwd:i,strict:!0})}catch(a){throw t.stdout.write(a.stdout||a.stack),a}}}}async function $T(r,{configuration:e,report:t,target:i}){let n=!1;if(!r.force&&M.existsSync(x.join(i,".git"))){t.reportInfo(0,"Fetching the latest commits"),t.reportSeparator();try{await qm(F4e(r),{configuration:e,context:r.context,target:i}),n=!0}catch{t.reportSeparator(),t.reportWarning(0,"Repository update failed; we'll try to regenerate it")}}n||(t.reportInfo(0,"Cloning the remote repository"),t.reportSeparator(),await M.removePromise(i),await M.mkdirPromise(i,{recursive:!0}),await qm(R4e(r,i),{configuration:e,context:r.context,target:i}))}async function L4e(r,{project:e,report:t,target:i}){let n=await yu(e.configuration),s=new Set(Object.keys(n));for(let o of e.configuration.plugins.keys())!s.has(o)||await eO(o,r,{project:e,report:t,target:i})}var fae=Pe(Xr()),hae=J("url"),pae=J("vm");var Bu=class extends De{constructor(){super(...arguments);this.name=z.String()}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins);return(await Ge.start({configuration:t,stdout:this.context.stdout},async n=>{let{project:s}=await je.find(t,this.context.cwd),o,a;if(this.name.match(/^\.{0,2}[\\/]/)||K.isAbsolute(this.name)){let l=x.resolve(this.context.cwd,K.toPortablePath(this.name));n.reportInfo(0,`Reading ${ee.pretty(t,l,ee.Type.PATH)}`),o=x.relative(s.cwd,l),a=await M.readFilePromise(l)}else{let l;if(this.name.match(/^https?:/)){try{new hae.URL(this.name)}catch{throw new at(52,`Plugin specifier "${this.name}" is neither a plugin name nor a valid url`)}o=this.name,l=this.name}else{let c=P.parseLocator(this.name.replace(/^((@yarnpkg\/)?plugin-)?/,"@yarnpkg/plugin-"));if(c.reference!=="unknown"&&!fae.default.valid(c.reference))throw new at(0,"Official plugins only accept strict version references. Use an explicit URL if you wish to download them from another location.");let u=P.stringifyIdent(c),g=await yu(t);if(!Object.prototype.hasOwnProperty.call(g,u))throw new at(51,`Couldn't find a plugin named "${u}" on the remote registry. Note that only the plugins referenced on our website (https://github.com/yarnpkg/berry/blob/master/plugins.yml) can be referenced by their name; any other plugin will have to be referenced through its public url (for example https://github.com/yarnpkg/berry/raw/master/packages/plugin-typescript/bin/%40yarnpkg/plugin-typescript.js).`);o=u,l=g[u].url,c.reference!=="unknown"?l=l.replace(/\/master\//,`/${u}/${c.reference}/`):Lr!==null&&(l=l.replace(/\/master\//,`/@yarnpkg/cli/${Lr}/`))}n.reportInfo(0,`Downloading ${ee.pretty(t,l,"green")}`),a=await Xt.get(l,{configuration:t})}await tO(o,a,{project:s,report:n})})).exitCode()}};Bu.paths=[["plugin","import"]],Bu.usage=ve.Usage({category:"Plugin-related commands",description:"download a plugin",details:`
-      This command downloads the specified plugin from its remote location and updates the configuration to reference it in further CLI invocations.
-
-      Three types of plugin references are accepted:
-
-      - If the plugin is stored within the Yarn repository, it can be referenced by name.
-      - Third-party plugins can be referenced directly through their public urls.
-      - Local plugins can be referenced by their path on the disk.
-
-      Plugins cannot be downloaded from the npm registry, and aren't allowed to have dependencies (they need to be bundled into a single file, possibly thanks to the \`@yarnpkg/builder\` package).
-    `,examples:[['Download and activate the "@yarnpkg/plugin-exec" plugin',"$0 plugin import @yarnpkg/plugin-exec"],['Download and activate the "@yarnpkg/plugin-exec" plugin (shorthand)',"$0 plugin import exec"],["Download and activate a community plugin","$0 plugin import https://example.org/path/to/plugin.js"],["Activate a local plugin","$0 plugin import ./path/to/plugin.js"]]});async function tO(r,e,{project:t,report:i}){let{configuration:n}=t,s={},o={exports:s};(0,pae.runInNewContext)(e.toString(),{module:o,exports:s});let a=o.exports.name,l=`.yarn/plugins/${a}.cjs`,c=x.resolve(t.cwd,l);i.reportInfo(0,`Saving the new plugin in ${ee.pretty(n,l,"magenta")}`),await M.mkdirPromise(x.dirname(c),{recursive:!0}),await M.writeFilePromise(c,e);let u={path:l,spec:r};await ye.updateConfiguration(t.cwd,g=>{let f=[],h=!1;for(let p of g.plugins||[]){let C=typeof p!="string"?p.path:p,y=x.resolve(t.cwd,K.toPortablePath(C)),{name:B}=Ie.dynamicRequire(y);B!==a?f.push(p):(f.push(u),h=!0)}return h||f.push(u),{...g,plugins:f}})}var T4e=({pluginName:r,noMinify:e},t)=>[["yarn",`build:${r}`,...e?["--no-minify"]:[],"|"]],Qu=class extends De{constructor(){super(...arguments);this.installPath=z.String("--path",{description:"The path where the repository should be cloned to"});this.repository=z.String("--repository","https://github.com/yarnpkg/berry.git",{description:"The repository that should be cloned"});this.branch=z.String("--branch","master",{description:"The branch of the repository that should be cloned"});this.noMinify=z.Boolean("--no-minify",!1,{description:"Build a plugin for development (debugging) - non-minified and non-mangled"});this.force=z.Boolean("-f,--force",!1,{description:"Always clone the repository instead of trying to fetch the latest commits"});this.name=z.String()}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),i=typeof this.installPath<"u"?x.resolve(this.context.cwd,K.toPortablePath(this.installPath)):x.resolve(K.toPortablePath((0,dae.tmpdir)()),"yarnpkg-sources",li.makeHash(this.repository).slice(0,6));return(await Ge.start({configuration:t,stdout:this.context.stdout},async s=>{let{project:o}=await je.find(t,this.context.cwd),a=P.parseIdent(this.name.replace(/^((@yarnpkg\/)?plugin-)?/,"@yarnpkg/plugin-")),l=P.stringifyIdent(a),c=await yu(t);if(!Object.prototype.hasOwnProperty.call(c,l))throw new at(51,`Couldn't find a plugin named "${l}" on the remote registry. Note that only the plugins referenced on our website (https://github.com/yarnpkg/berry/blob/master/plugins.yml) can be built and imported from sources.`);let u=l;await $T(this,{configuration:t,report:s,target:i}),await eO(u,this,{project:o,report:s,target:i})})).exitCode()}};Qu.paths=[["plugin","import","from","sources"]],Qu.usage=ve.Usage({category:"Plugin-related commands",description:"build a plugin from sources",details:`
-      This command clones the Yarn repository into a temporary folder, builds the specified contrib plugin and updates the configuration to reference it in further CLI invocations.
-
-      The plugins can be referenced by their short name if sourced from the official Yarn repository.
-    `,examples:[['Build and activate the "@yarnpkg/plugin-exec" plugin',"$0 plugin import from sources @yarnpkg/plugin-exec"],['Build and activate the "@yarnpkg/plugin-exec" plugin (shorthand)',"$0 plugin import from sources exec"]]});async function eO(r,{context:e,noMinify:t},{project:i,report:n,target:s}){let o=r.replace(/@yarnpkg\//,""),{configuration:a}=i;n.reportSeparator(),n.reportInfo(0,`Building a fresh ${o}`),n.reportSeparator(),await qm(T4e({pluginName:o,noMinify:t},s),{configuration:a,context:e,target:s}),n.reportSeparator();let l=x.resolve(s,`packages/${o}/bundles/${r}.js`),c=await M.readFilePromise(l);await tO(r,c,{project:i,report:n})}var bu=class extends De{constructor(){super(...arguments);this.name=z.String()}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i}=await je.find(t,this.context.cwd);return(await Ge.start({configuration:t,stdout:this.context.stdout},async s=>{let o=this.name,a=P.parseIdent(o);if(!t.plugins.has(o))throw new be(`${P.prettyIdent(t,a)} isn't referenced by the current configuration`);let l=`.yarn/plugins/${o}.cjs`,c=x.resolve(i.cwd,l);M.existsSync(c)&&(s.reportInfo(0,`Removing ${ee.pretty(t,l,ee.Type.PATH)}...`),await M.removePromise(c)),s.reportInfo(0,"Updating the configuration..."),await ye.updateConfiguration(i.cwd,u=>{if(!Array.isArray(u.plugins))return u;let g=u.plugins.filter(f=>f.path!==l);return u.plugins.length===g.length?u:{...u,plugins:g}})})).exitCode()}};bu.paths=[["plugin","remove"]],bu.usage=ve.Usage({category:"Plugin-related commands",description:"remove a plugin",details:`
-      This command deletes the specified plugin from the .yarn/plugins folder and removes it from the configuration.
-
-      **Note:** The plugins have to be referenced by their name property, which can be obtained using the \`yarn plugin runtime\` command. Shorthands are not allowed.
-   `,examples:[["Remove a plugin imported from the Yarn repository","$0 plugin remove @yarnpkg/plugin-typescript"],["Remove a plugin imported from a local file","$0 plugin remove my-local-plugin"]]});var Su=class extends De{constructor(){super(...arguments);this.json=z.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"})}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins);return(await Ge.start({configuration:t,json:this.json,stdout:this.context.stdout},async n=>{for(let s of t.plugins.keys()){let o=this.context.plugins.plugins.has(s),a=s;o&&(a+=" [builtin]"),n.reportJson({name:s,builtin:o}),n.reportInfo(null,`${a}`)}})).exitCode()}};Su.paths=[["plugin","runtime"]],Su.usage=ve.Usage({category:"Plugin-related commands",description:"list the active plugins",details:`
-      This command prints the currently active plugins. Will be displayed both builtin plugins and external plugins.
-    `,examples:[["List the currently active plugins","$0 plugin runtime"]]});var vu=class extends De{constructor(){super(...arguments);this.idents=z.Rest()}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i,workspace:n}=await je.find(t,this.context.cwd),s=await Rt.find(t);if(!n)throw new ct(i.cwd,this.context.cwd);let o=new Set;for(let l of this.idents)o.add(P.parseIdent(l).identHash);if(await i.restoreInstallState({restoreResolutions:!1}),await i.resolveEverything({cache:s,report:new ti}),o.size>0)for(let l of i.storedPackages.values())o.has(l.identHash)&&i.storedBuildState.delete(l.locatorHash);else i.storedBuildState.clear();return(await Ge.start({configuration:t,stdout:this.context.stdout,includeLogs:!this.context.quiet},async l=>{await i.install({cache:s,report:l})})).exitCode()}};vu.paths=[["rebuild"]],vu.usage=ve.Usage({description:"rebuild the project's native packages",details:`
-      This command will automatically cause Yarn to forget about previous compilations of the given packages and to run them again.
-
-      Note that while Yarn forgets the compilation, the previous artifacts aren't erased from the filesystem and may affect the next builds (in good or bad). To avoid this, you may remove the .yarn/unplugged folder, or any other relevant location where packages might have been stored (Yarn may offer a way to do that automatically in the future).
-
-      By default all packages will be rebuilt, but you can filter the list by specifying the names of the packages you want to clear from memory.
-    `,examples:[["Rebuild all packages","$0 rebuild"],["Rebuild fsevents only","$0 rebuild fsevents"]]});var rO=Pe(yn());as();var xu=class extends De{constructor(){super(...arguments);this.all=z.Boolean("-A,--all",!1,{description:"Apply the operation to all workspaces from the current project"});this.mode=z.String("--mode",{description:"Change what artifacts installs generate",validator:Vi($n)});this.patterns=z.Rest()}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i,workspace:n}=await je.find(t,this.context.cwd),s=await Rt.find(t);if(!n)throw new ct(i.cwd,this.context.cwd);await i.restoreInstallState({restoreResolutions:!1});let o=this.all?i.workspaces:[n],a=["dependencies","devDependencies","peerDependencies"],l=[],c=!1,u=[];for(let p of this.patterns){let C=!1,y=P.parseIdent(p);for(let B of o){let v=[...B.manifest.peerDependenciesMeta.keys()];for(let D of(0,rO.default)(v,p))B.manifest.peerDependenciesMeta.delete(D),c=!0,C=!0;for(let D of a){let L=B.manifest.getForScope(D),H=[...L.values()].map(j=>P.stringifyIdent(j));for(let j of(0,rO.default)(H,P.stringifyIdent(y))){let{identHash:$}=P.parseIdent(j),V=L.get($);if(typeof V>"u")throw new Error("Assertion failed: Expected the descriptor to be registered");B.manifest[D].delete($),u.push([B,D,V]),c=!0,C=!0}}}C||l.push(p)}let g=l.length>1?"Patterns":"Pattern",f=l.length>1?"don't":"doesn't",h=this.all?"any":"this";if(l.length>0)throw new be(`${g} ${ee.prettyList(t,l,xi.CODE)} ${f} match any packages referenced by ${h} workspace`);return c?(await t.triggerMultipleHooks(C=>C.afterWorkspaceDependencyRemoval,u),(await Ge.start({configuration:t,stdout:this.context.stdout},async C=>{await i.install({cache:s,report:C,mode:this.mode})})).exitCode()):0}};xu.paths=[["remove"]],xu.usage=ve.Usage({description:"remove dependencies from the project",details:`
-      This command will remove the packages matching the specified patterns from the current workspace.
-
-      If the \`--mode=<mode>\` option is set, Yarn will change which artifacts are generated. The modes currently supported are:
-
-      - \`skip-build\` will not run the build scripts at all. Note that this is different from setting \`enableScripts\` to false because the latter will disable build scripts, and thus affect the content of the artifacts generated on disk, whereas the former will just disable the build step - but not the scripts themselves, which just won't run.
-
-      - \`update-lockfile\` will skip the link step altogether, and only fetch packages that are missing from the lockfile (or that have no associated checksums). This mode is typically used by tools like Renovate or Dependabot to keep a lockfile up-to-date without incurring the full install cost.
-
-      This command accepts glob patterns as arguments (if valid Idents and supported by [micromatch](https://github.com/micromatch/micromatch)). Make sure to escape the patterns, to prevent your own shell from trying to expand them.
-    `,examples:[["Remove a dependency from the current project","$0 remove lodash"],["Remove a dependency from all workspaces at once","$0 remove lodash --all"],["Remove all dependencies starting with `eslint-`","$0 remove 'eslint-*'"],["Remove all dependencies with the `@babel` scope","$0 remove '@babel/*'"],["Remove all dependencies matching `react-dom` or `react-helmet`","$0 remove 'react-{dom,helmet}'"]]});var Cae=J("util"),Vh=class extends De{async execute(){let e=await ye.find(this.context.cwd,this.context.plugins),{project:t,workspace:i}=await je.find(e,this.context.cwd);if(!i)throw new ct(t.cwd,this.context.cwd);return(await Ge.start({configuration:e,stdout:this.context.stdout},async s=>{let o=i.manifest.scripts,a=Ie.sortMap(o.keys(),u=>u),l={breakLength:1/0,colors:e.get("enableColors"),maxArrayLength:2},c=a.reduce((u,g)=>Math.max(u,g.length),0);for(let[u,g]of o.entries())s.reportInfo(null,`${u.padEnd(c," ")}   ${(0,Cae.inspect)(g,l)}`)})).exitCode()}};Vh.paths=[["run"]];var Pu=class extends De{constructor(){super(...arguments);this.inspect=z.String("--inspect",!1,{tolerateBoolean:!0,description:"Forwarded to the underlying Node process when executing a binary"});this.inspectBrk=z.String("--inspect-brk",!1,{tolerateBoolean:!0,description:"Forwarded to the underlying Node process when executing a binary"});this.topLevel=z.Boolean("-T,--top-level",!1,{description:"Check the root workspace for scripts and/or binaries instead of the current one"});this.binariesOnly=z.Boolean("-B,--binaries-only",!1,{description:"Ignore any user defined scripts and only check for binaries"});this.silent=z.Boolean("--silent",{hidden:!0});this.scriptName=z.String();this.args=z.Proxy()}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i,workspace:n,locator:s}=await je.find(t,this.context.cwd);await i.restoreInstallState();let o=this.topLevel?i.topLevelWorkspace.anchoredLocator:s;if(!this.binariesOnly&&await Wt.hasPackageScript(o,this.scriptName,{project:i}))return await Wt.executePackageScript(o,this.scriptName,this.args,{project:i,stdin:this.context.stdin,stdout:this.context.stdout,stderr:this.context.stderr});let a=await Wt.getPackageAccessibleBinaries(o,{project:i});if(a.get(this.scriptName)){let c=[];return this.inspect&&(typeof this.inspect=="string"?c.push(`--inspect=${this.inspect}`):c.push("--inspect")),this.inspectBrk&&(typeof this.inspectBrk=="string"?c.push(`--inspect-brk=${this.inspectBrk}`):c.push("--inspect-brk")),await Wt.executePackageAccessibleBinary(o,this.scriptName,this.args,{cwd:this.context.cwd,project:i,stdin:this.context.stdin,stdout:this.context.stdout,stderr:this.context.stderr,nodeArgs:c,packageAccessibleBinaries:a})}if(!this.topLevel&&!this.binariesOnly&&n&&this.scriptName.includes(":")){let u=(await Promise.all(i.workspaces.map(async g=>g.manifest.scripts.has(this.scriptName)?g:null))).filter(g=>g!==null);if(u.length===1)return await Wt.executeWorkspaceScript(u[0],this.scriptName,this.args,{stdin:this.context.stdin,stdout:this.context.stdout,stderr:this.context.stderr})}if(this.topLevel)throw this.scriptName==="node-gyp"?new be(`Couldn't find a script name "${this.scriptName}" in the top-level (used by ${P.prettyLocator(t,s)}). This typically happens because some package depends on "node-gyp" to build itself, but didn't list it in their dependencies. To fix that, please run "yarn add node-gyp" into your top-level workspace. You also can open an issue on the repository of the specified package to suggest them to use an optional peer dependency.`):new be(`Couldn't find a script name "${this.scriptName}" in the top-level (used by ${P.prettyLocator(t,s)}).`);{if(this.scriptName==="global")throw new be("The 'yarn global' commands have been removed in 2.x - consider using 'yarn dlx' or a third-party plugin instead");let c=[this.scriptName].concat(this.args);for(let[u,g]of Qh)for(let f of g)if(c.length>=f.length&&JSON.stringify(c.slice(0,f.length))===JSON.stringify(f))throw new be(`Couldn't find a script named "${this.scriptName}", but a matching command can be found in the ${u} plugin. You can install it with "yarn plugin import ${u}".`);throw new be(`Couldn't find a script named "${this.scriptName}".`)}}};Pu.paths=[["run"]],Pu.usage=ve.Usage({description:"run a script defined in the package.json",details:`
-      This command will run a tool. The exact tool that will be executed will depend on the current state of your workspace:
-
-      - If the \`scripts\` field from your local package.json contains a matching script name, its definition will get executed.
-
-      - Otherwise, if one of the local workspace's dependencies exposes a binary with a matching name, this binary will get executed.
-
-      - Otherwise, if the specified name contains a colon character and if one of the workspaces in the project contains exactly one script with a matching name, then this script will get executed.
-
-      Whatever happens, the cwd of the spawned process will be the workspace that declares the script (which makes it possible to call commands cross-workspaces using the third syntax).
-    `,examples:[["Run the tests from the local workspace","$0 run test"],['Same thing, but without the "run" keyword',"$0 test"],["Inspect Webpack while running","$0 run --inspect-brk webpack"]]});var Du=class extends De{constructor(){super(...arguments);this.save=z.Boolean("-s,--save",!1,{description:"Persist the resolution inside the top-level manifest"});this.descriptor=z.String();this.resolution=z.String()}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i,workspace:n}=await je.find(t,this.context.cwd),s=await Rt.find(t);if(await i.restoreInstallState({restoreResolutions:!1}),!n)throw new ct(i.cwd,this.context.cwd);let o=P.parseDescriptor(this.descriptor,!0),a=P.makeDescriptor(o,this.resolution);return i.storedDescriptors.set(o.descriptorHash,o),i.storedDescriptors.set(a.descriptorHash,a),i.resolutionAliases.set(o.descriptorHash,a.descriptorHash),(await Ge.start({configuration:t,stdout:this.context.stdout},async c=>{await i.install({cache:s,report:c})})).exitCode()}};Du.paths=[["set","resolution"]],Du.usage=ve.Usage({description:"enforce a package resolution",details:'\n      This command updates the resolution table so that `descriptor` is resolved by `resolution`.\n\n      Note that by default this command only affect the current resolution table - meaning that this "manual override" will disappear if you remove the lockfile, or if the package disappear from the table. If you wish to make the enforced resolution persist whatever happens, add the `-s,--save` flag which will also edit the `resolutions` field from your top-level manifest.\n\n      Note that no attempt is made at validating that `resolution` is a valid resolution entry for `descriptor`.\n    ',examples:[["Force all instances of lodash@npm:^1.2.3 to resolve to 1.5.0","$0 set resolution lodash@npm:^1.2.3 1.5.0"]]});var mae=Pe(yn()),ku=class extends De{constructor(){super(...arguments);this.all=z.Boolean("-A,--all",!1,{description:"Unlink all workspaces belonging to the target project from the current one"});this.leadingArguments=z.Rest()}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i,workspace:n}=await je.find(t,this.context.cwd),s=await Rt.find(t);if(!n)throw new ct(i.cwd,this.context.cwd);let o=i.topLevelWorkspace,a=new Set;if(this.leadingArguments.length===0&&this.all)for(let{pattern:c,reference:u}of o.manifest.resolutions)u.startsWith("portal:")&&a.add(c.descriptor.fullName);if(this.leadingArguments.length>0)for(let c of this.leadingArguments){let u=x.resolve(this.context.cwd,K.toPortablePath(c));if(Ie.isPathLike(c)){let g=await ye.find(u,this.context.plugins,{useRc:!1,strict:!1}),{project:f,workspace:h}=await je.find(g,u);if(!h)throw new ct(f.cwd,u);if(this.all){for(let p of f.workspaces)p.manifest.name&&a.add(P.stringifyIdent(p.locator));if(a.size===0)throw new be("No workspace found to be unlinked in the target project")}else{if(!h.manifest.name)throw new be("The target workspace doesn't have a name and thus cannot be unlinked");a.add(P.stringifyIdent(h.locator))}}else{let g=[...o.manifest.resolutions.map(({pattern:f})=>f.descriptor.fullName)];for(let f of(0,mae.default)(g,c))a.add(f)}}return o.manifest.resolutions=o.manifest.resolutions.filter(({pattern:c})=>!a.has(c.descriptor.fullName)),(await Ge.start({configuration:t,stdout:this.context.stdout},async c=>{await i.install({cache:s,report:c})})).exitCode()}};ku.paths=[["unlink"]],ku.usage=ve.Usage({description:"disconnect the local project from another one",details:`
-      This command will remove any resolutions in the project-level manifest that would have been added via a yarn link with similar arguments.
-    `,examples:[["Unregister a remote workspace in the current project","$0 unlink ~/ts-loader"],["Unregister all workspaces from a remote project in the current project","$0 unlink ~/jest --all"],["Unregister all previously linked workspaces","$0 unlink --all"],["Unregister all workspaces matching a glob","$0 unlink '@babel/*' 'pkg-{a,b}'"]]});var Eae=Pe(Om()),iO=Pe(yn());as();var Cl=class extends De{constructor(){super(...arguments);this.interactive=z.Boolean("-i,--interactive",{description:"Offer various choices, depending on the detected upgrade paths"});this.exact=z.Boolean("-E,--exact",!1,{description:"Don't use any semver modifier on the resolved range"});this.tilde=z.Boolean("-T,--tilde",!1,{description:"Use the `~` semver modifier on the resolved range"});this.caret=z.Boolean("-C,--caret",!1,{description:"Use the `^` semver modifier on the resolved range"});this.recursive=z.Boolean("-R,--recursive",!1,{description:"Resolve again ALL resolutions for those packages"});this.mode=z.String("--mode",{description:"Change what artifacts installs generate",validator:Vi($n)});this.patterns=z.Rest()}async execute(){return this.recursive?await this.executeUpRecursive():await this.executeUpClassic()}async executeUpRecursive(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i,workspace:n}=await je.find(t,this.context.cwd),s=await Rt.find(t);if(!n)throw new ct(i.cwd,this.context.cwd);await i.restoreInstallState({restoreResolutions:!1});let o=[...i.storedDescriptors.values()],a=o.map(g=>P.stringifyIdent(g)),l=new Set;for(let g of this.patterns){if(P.parseDescriptor(g).range!=="unknown")throw new be("Ranges aren't allowed when using --recursive");for(let f of(0,iO.default)(a,g)){let h=P.parseIdent(f);l.add(h.identHash)}}let c=o.filter(g=>l.has(g.identHash));for(let g of c)i.storedDescriptors.delete(g.descriptorHash),i.storedResolutions.delete(g.descriptorHash);return(await Ge.start({configuration:t,stdout:this.context.stdout},async g=>{await i.install({cache:s,report:g})})).exitCode()}async executeUpClassic(){var y;let t=await ye.find(this.context.cwd,this.context.plugins),{project:i,workspace:n}=await je.find(t,this.context.cwd),s=await Rt.find(t);if(!n)throw new ct(i.cwd,this.context.cwd);await i.restoreInstallState({restoreResolutions:!1});let o=(y=this.interactive)!=null?y:t.get("preferInteractive"),a=Km(this,i),l=o?["keep","reuse","project","latest"]:["project","latest"],c=[],u=[];for(let B of this.patterns){let v=!1,D=P.parseDescriptor(B);for(let L of i.workspaces)for(let H of["dependencies","devDependencies"]){let $=[...L.manifest.getForScope(H).values()].map(V=>P.stringifyIdent(V));for(let V of(0,iO.default)($,P.stringifyIdent(D))){let W=P.parseIdent(V),_=L.manifest[H].get(W.identHash);if(typeof _>"u")throw new Error("Assertion failed: Expected the descriptor to be registered");let A=P.makeDescriptor(W,D.range);c.push(Promise.resolve().then(async()=>[L,H,_,await Um(A,{project:i,workspace:L,cache:s,target:H,modifier:a,strategies:l})])),v=!0}}v||u.push(B)}if(u.length>1)throw new be(`Patterns ${ee.prettyList(t,u,xi.CODE)} don't match any packages referenced by any workspace`);if(u.length>0)throw new be(`Pattern ${ee.prettyList(t,u,xi.CODE)} doesn't match any packages referenced by any workspace`);let g=await Promise.all(c),f=await ra.start({configuration:t,stdout:this.context.stdout,suggestInstall:!1},async B=>{for(let[,,v,{suggestions:D,rejections:L}]of g){let H=D.filter(j=>j.descriptor!==null);if(H.length===0){let[j]=L;if(typeof j>"u")throw new Error("Assertion failed: Expected an error to have been set");let $=this.cli.error(j);i.configuration.get("enableNetwork")?B.reportError(27,`${P.prettyDescriptor(t,v)} can't be resolved to a satisfying range
-
-${$}`):B.reportError(27,`${P.prettyDescriptor(t,v)} can't be resolved to a satisfying range (note: network resolution has been disabled)
-
-${$}`)}else H.length>1&&!o&&B.reportError(27,`${P.prettyDescriptor(t,v)} has multiple possible upgrade strategies; use -i to disambiguate manually`)}});if(f.hasErrors())return f.exitCode();let h=!1,p=[];for(let[B,v,,{suggestions:D}]of g){let L,H=D.filter(W=>W.descriptor!==null),j=H[0].descriptor,$=H.every(W=>P.areDescriptorsEqual(W.descriptor,j));H.length===1||$?L=j:(h=!0,{answer:L}=await(0,Eae.prompt)({type:"select",name:"answer",message:`Which range to you want to use in ${P.prettyWorkspace(t,B)} \u276F ${v}?`,choices:D.map(({descriptor:W,name:_,reason:A})=>W?{name:_,hint:A,descriptor:W}:{name:_,hint:A,disabled:!0}),onCancel:()=>process.exit(130),result(W){return this.find(W,"descriptor")},stdin:this.context.stdin,stdout:this.context.stdout}));let V=B.manifest[v].get(L.identHash);if(typeof V>"u")throw new Error("Assertion failed: This descriptor should have a matching entry");if(V.descriptorHash!==L.descriptorHash)B.manifest[v].set(L.identHash,L),p.push([B,v,V,L]);else{let W=t.makeResolver(),_={project:i,resolver:W},A=W.bindDescriptor(V,B.anchoredLocator,_);i.forgetResolution(A)}}return await t.triggerMultipleHooks(B=>B.afterWorkspaceDependencyReplacement,p),h&&this.context.stdout.write(`
-`),(await Ge.start({configuration:t,stdout:this.context.stdout},async B=>{await i.install({cache:s,report:B,mode:this.mode})})).exitCode()}};Cl.paths=[["up"]],Cl.usage=ve.Usage({description:"upgrade dependencies across the project",details:"\n      This command upgrades the packages matching the list of specified patterns to their latest available version across the whole project (regardless of whether they're part of `dependencies` or `devDependencies` - `peerDependencies` won't be affected). This is a project-wide command: all workspaces will be upgraded in the process.\n\n      If `-R,--recursive` is set the command will change behavior and no other switch will be allowed. When operating under this mode `yarn up` will force all ranges matching the selected packages to be resolved again (often to the highest available versions) before being stored in the lockfile. It however won't touch your manifests anymore, so depending on your needs you might want to run both `yarn up` and `yarn up -R` to cover all bases.\n\n      If `-i,--interactive` is set (or if the `preferInteractive` settings is toggled on) the command will offer various choices, depending on the detected upgrade paths. Some upgrades require this flag in order to resolve ambiguities.\n\n      The, `-C,--caret`, `-E,--exact` and  `-T,--tilde` options have the same meaning as in the `add` command (they change the modifier used when the range is missing or a tag, and are ignored when the range is explicitly set).\n\n      If the `--mode=<mode>` option is set, Yarn will change which artifacts are generated. The modes currently supported are:\n\n      - `skip-build` will not run the build scripts at all. Note that this is different from setting `enableScripts` to false because the latter will disable build scripts, and thus affect the content of the artifacts generated on disk, whereas the former will just disable the build step - but not the scripts themselves, which just won't run.\n\n      - `update-lockfile` will skip the link step altogether, and only fetch packages that are missing from the lockfile (or that have no associated checksums). This mode is typically used by tools like Renovate or Dependabot to keep a lockfile up-to-date without incurring the full install cost.\n\n      Generally you can see `yarn up` as a counterpart to what was `yarn upgrade --latest` in Yarn 1 (ie it ignores the ranges previously listed in your manifests), but unlike `yarn upgrade` which only upgraded dependencies in the current workspace, `yarn up` will upgrade all workspaces at the same time.\n\n      This command accepts glob patterns as arguments (if valid Descriptors and supported by [micromatch](https://github.com/micromatch/micromatch)). Make sure to escape the patterns, to prevent your own shell from trying to expand them.\n\n      **Note:** The ranges have to be static, only the package scopes and names can contain glob patterns.\n    ",examples:[["Upgrade all instances of lodash to the latest release","$0 up lodash"],["Upgrade all instances of lodash to the latest release, but ask confirmation for each","$0 up lodash -i"],["Upgrade all instances of lodash to 1.2.3","$0 up lodash@1.2.3"],["Upgrade all instances of packages with the `@babel` scope to the latest release","$0 up '@babel/*'"],["Upgrade all instances of packages containing the word `jest` to the latest release","$0 up '*jest*'"],["Upgrade all instances of packages with the `@babel` scope to 7.0.0","$0 up '@babel/*@7.0.0'"]]}),Cl.schema=[av("recursive",sc.Forbids,["interactive","exact","tilde","caret"],{ignore:[void 0,!1]})];var Ru=class extends De{constructor(){super(...arguments);this.recursive=z.Boolean("-R,--recursive",!1,{description:"List, for each workspace, what are all the paths that lead to the dependency"});this.json=z.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.peers=z.Boolean("--peers",!1,{description:"Also print the peer dependencies that match the specified name"});this.package=z.String()}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i,workspace:n}=await je.find(t,this.context.cwd);if(!n)throw new ct(i.cwd,this.context.cwd);await i.restoreInstallState();let s=P.parseIdent(this.package).identHash,o=this.recursive?M4e(i,s,{configuration:t,peers:this.peers}):O4e(i,s,{configuration:t,peers:this.peers});_n.emitTree(o,{configuration:t,stdout:this.context.stdout,json:this.json,separators:1})}};Ru.paths=[["why"]],Ru.usage=ve.Usage({description:"display the reason why a package is needed",details:`
-      This command prints the exact reasons why a package appears in the dependency tree.
-
-      If \`-R,--recursive\` is set, the listing will go in depth and will list, for each workspaces, what are all the paths that lead to the dependency. Note that the display is somewhat optimized in that it will not print the package listing twice for a single package, so if you see a leaf named "Foo" when looking for "Bar", it means that "Foo" already got printed higher in the tree.
-    `,examples:[["Explain why lodash is used in your project","$0 why lodash"]]});function O4e(r,e,{configuration:t,peers:i}){let n=Ie.sortMap(r.storedPackages.values(),a=>P.stringifyLocator(a)),s={},o={children:s};for(let a of n){let l={};for(let u of a.dependencies.values()){if(!i&&a.peerDependencies.has(u.identHash))continue;let g=r.storedResolutions.get(u.descriptorHash);if(!g)throw new Error("Assertion failed: The resolution should have been registered");let f=r.storedPackages.get(g);if(!f)throw new Error("Assertion failed: The package should have been registered");if(f.identHash!==e)continue;{let p=P.stringifyLocator(a);s[p]={value:[a,ee.Type.LOCATOR],children:l}}let h=P.stringifyLocator(f);l[h]={value:[{descriptor:u,locator:f},ee.Type.DEPENDENT]}}}return o}function M4e(r,e,{configuration:t,peers:i}){let n=Ie.sortMap(r.workspaces,f=>P.stringifyLocator(f.anchoredLocator)),s=new Set,o=new Set,a=f=>{if(s.has(f.locatorHash))return o.has(f.locatorHash);if(s.add(f.locatorHash),f.identHash===e)return o.add(f.locatorHash),!0;let h=!1;f.identHash===e&&(h=!0);for(let p of f.dependencies.values()){if(!i&&f.peerDependencies.has(p.identHash))continue;let C=r.storedResolutions.get(p.descriptorHash);if(!C)throw new Error("Assertion failed: The resolution should have been registered");let y=r.storedPackages.get(C);if(!y)throw new Error("Assertion failed: The package should have been registered");a(y)&&(h=!0)}return h&&o.add(f.locatorHash),h};for(let f of n){let h=r.storedPackages.get(f.anchoredLocator.locatorHash);if(!h)throw new Error("Assertion failed: The package should have been registered");a(h)}let l=new Set,c={},u={children:c},g=(f,h,p)=>{if(!o.has(f.locatorHash))return;let C=p!==null?ee.tuple(ee.Type.DEPENDENT,{locator:f,descriptor:p}):ee.tuple(ee.Type.LOCATOR,f),y={},B={value:C,children:y},v=P.stringifyLocator(f);if(h[v]=B,!l.has(f.locatorHash)&&(l.add(f.locatorHash),!(p!==null&&r.tryWorkspaceByLocator(f))))for(let D of f.dependencies.values()){if(!i&&f.peerDependencies.has(D.identHash))continue;let L=r.storedResolutions.get(D.descriptorHash);if(!L)throw new Error("Assertion failed: The resolution should have been registered");let H=r.storedPackages.get(L);if(!H)throw new Error("Assertion failed: The package should have been registered");g(H,y,D)}};for(let f of n){let h=r.storedPackages.get(f.anchoredLocator.locatorHash);if(!h)throw new Error("Assertion failed: The package should have been registered");g(h,c,null)}return u}var hO={};ut(hO,{default:()=>n3e,gitUtils:()=>aA});var aA={};ut(aA,{TreeishProtocols:()=>kQ,clone:()=>fO,fetchBase:()=>Hae,fetchChangedFiles:()=>Gae,fetchChangedWorkspaces:()=>r3e,fetchRoot:()=>Uae,isGitUrl:()=>Zh,lsRemote:()=>Kae,normalizeLocator:()=>uO,normalizeRepoUrl:()=>Wm,resolveUrl:()=>gO,splitRepoUrl:()=>Jm});var cO=Pe(Fae()),Oae=Pe(bB()),Xh=Pe(J("querystring")),AO=Pe(Xr());var Lae=J("url");function aO(r,e,t){let i=r.indexOf(t);return r.lastIndexOf(e,i>-1?i:1/0)}function Nae(r){try{return new Lae.URL(r)}catch{return}}function e3e(r){let e=aO(r,"@","#"),t=aO(r,":","#");return t>e&&(r=`${r.slice(0,t)}/${r.slice(t+1)}`),aO(r,":","#")===-1&&r.indexOf("//")===-1&&(r=`ssh://${r}`),r}function Tae(r){return Nae(r)||Nae(e3e(r))}function Mae(){return{...process.env,GIT_SSH_COMMAND:process.env.GIT_SSH_COMMAND||`${process.env.GIT_SSH||"ssh"} -o BatchMode=yes`}}var t3e=[/^ssh:/,/^git(?:\+[^:]+)?:/,/^(?:git\+)?https?:[^#]+\/[^#]+(?:\.git)(?:#.*)?$/,/^git@[^#]+\/[^#]+\.git(?:#.*)?$/,/^(?:github:|https:\/\/github\.com\/)?(?!\.{1,2}\/)([a-zA-Z._0-9-]+)\/(?!\.{1,2}(?:#|$))([a-zA-Z._0-9-]+?)(?:\.git)?(?:#.*)?$/,/^https:\/\/github\.com\/(?!\.{1,2}\/)([a-zA-Z0-9._-]+)\/(?!\.{1,2}(?:#|$))([a-zA-Z0-9._-]+?)\/tarball\/(.+)?$/],kQ=(n=>(n.Commit="commit",n.Head="head",n.Tag="tag",n.Semver="semver",n))(kQ||{});function Zh(r){return r?t3e.some(e=>!!r.match(e)):!1}function Jm(r){r=Wm(r);let e=r.indexOf("#");if(e===-1)return{repo:r,treeish:{protocol:"head",request:"HEAD"},extra:{}};let t=r.slice(0,e),i=r.slice(e+1);if(i.match(/^[a-z]+=/)){let n=Xh.default.parse(i);for(let[l,c]of Object.entries(n))if(typeof c!="string")throw new Error(`Assertion failed: The ${l} parameter must be a literal string`);let s=Object.values(kQ).find(l=>Object.prototype.hasOwnProperty.call(n,l)),o,a;typeof s<"u"?(o=s,a=n[s]):(o="head",a="HEAD");for(let l of Object.values(kQ))delete n[l];return{repo:t,treeish:{protocol:o,request:a},extra:n}}else{let n=i.indexOf(":"),s,o;return n===-1?(s=null,o=i):(s=i.slice(0,n),o=i.slice(n+1)),{repo:t,treeish:{protocol:s,request:o},extra:{}}}}function Wm(r,{git:e=!1}={}){if(r=r.replace(/^git\+https:/,"https:"),r=r.replace(/^(?:github:|https:\/\/github\.com\/)?(?!\.{1,2}\/)([a-zA-Z0-9._-]+)\/(?!\.{1,2}(?:#|$))([a-zA-Z0-9._-]+?)(?:\.git)?(#.*)?$/,"https://github.com/$1/$2.git$3"),r=r.replace(/^https:\/\/github\.com\/(?!\.{1,2}\/)([a-zA-Z0-9._-]+)\/(?!\.{1,2}(?:#|$))([a-zA-Z0-9._-]+?)\/tarball\/(.+)?$/,"https://github.com/$1/$2.git#$3"),e){let t=Tae(r);t&&(r=t.href),r=r.replace(/^git\+([^:]+):/,"$1:")}return r}function uO(r){return P.makeLocator(r,Wm(r.reference))}async function Kae(r,e){let t=Wm(r,{git:!0});if(!Xt.getNetworkSettings(`https://${(0,cO.default)(t).resource}`,{configuration:e}).enableNetwork)throw new Error(`Request to '${t}' has been blocked because of your configuration settings`);let n=await lO("listing refs",["ls-remote",t],{cwd:e.startingCwd,env:Mae()},{configuration:e,normalizedRepoUrl:t}),s=new Map,o=/^([a-f0-9]{40})\t([^\n]+)/gm,a;for(;(a=o.exec(n.stdout))!==null;)s.set(a[2],a[1]);return s}async function gO(r,e){let{repo:t,treeish:{protocol:i,request:n},extra:s}=Jm(r),o=await Kae(t,e),a=(c,u)=>{switch(c){case"commit":{if(!u.match(/^[a-f0-9]{40}$/))throw new Error("Invalid commit hash");return Xh.default.stringify({...s,commit:u})}case"head":{let g=o.get(u==="HEAD"?u:`refs/heads/${u}`);if(typeof g>"u")throw new Error(`Unknown head ("${u}")`);return Xh.default.stringify({...s,commit:g})}case"tag":{let g=o.get(`refs/tags/${u}`);if(typeof g>"u")throw new Error(`Unknown tag ("${u}")`);return Xh.default.stringify({...s,commit:g})}case"semver":{let g=vt.validRange(u);if(!g)throw new Error(`Invalid range ("${u}")`);let f=new Map([...o.entries()].filter(([p])=>p.startsWith("refs/tags/")).map(([p,C])=>[AO.default.parse(p.slice(10)),C]).filter(p=>p[0]!==null)),h=AO.default.maxSatisfying([...f.keys()],g);if(h===null)throw new Error(`No matching range ("${u}")`);return Xh.default.stringify({...s,commit:f.get(h)})}case null:{let g;if((g=l("commit",u))!==null||(g=l("tag",u))!==null||(g=l("head",u))!==null)return g;throw u.match(/^[a-f0-9]+$/)?new Error(`Couldn't resolve "${u}" as either a commit, a tag, or a head - if a commit, use the 40-characters commit hash`):new Error(`Couldn't resolve "${u}" as either a commit, a tag, or a head`)}default:throw new Error(`Invalid Git resolution protocol ("${c}")`)}},l=(c,u)=>{try{return a(c,u)}catch{return null}};return`${t}#${a(i,n)}`}async function fO(r,e){return await e.getLimit("cloneConcurrency")(async()=>{let{repo:t,treeish:{protocol:i,request:n}}=Jm(r);if(i!=="commit")throw new Error("Invalid treeish protocol when cloning");let s=Wm(t,{git:!0});if(Xt.getNetworkSettings(`https://${(0,cO.default)(s).resource}`,{configuration:e}).enableNetwork===!1)throw new Error(`Request to '${s}' has been blocked because of your configuration settings`);let o=await M.mktempPromise(),a={cwd:o,env:Mae()};return await lO("cloning the repository",["clone","-c core.autocrlf=false",s,K.fromPortablePath(o)],a,{configuration:e,normalizedRepoUrl:s}),await lO("switching branch",["checkout",`${n}`],a,{configuration:e,normalizedRepoUrl:s}),o})}async function Uae(r){let e=null,t,i=r;do t=i,await M.existsPromise(x.join(t,".git"))&&(e=t),i=x.dirname(t);while(e===null&&i!==t);return e}async function Hae(r,{baseRefs:e}){if(e.length===0)throw new be("Can't run this command with zero base refs specified.");let t=[];for(let a of e){let{code:l}=await Cr.execvp("git",["merge-base",a,"HEAD"],{cwd:r});l===0&&t.push(a)}if(t.length===0)throw new be(`No ancestor could be found between any of HEAD and ${e.join(", ")}`);let{stdout:i}=await Cr.execvp("git",["merge-base","HEAD",...t],{cwd:r,strict:!0}),n=i.trim(),{stdout:s}=await Cr.execvp("git",["show","--quiet","--pretty=format:%s",n],{cwd:r,strict:!0}),o=s.trim();return{hash:n,title:o}}async function Gae(r,{base:e,project:t}){let i=Ie.buildIgnorePattern(t.configuration.get("changesetIgnorePatterns")),{stdout:n}=await Cr.execvp("git",["diff","--name-only",`${e}`],{cwd:r,strict:!0}),s=n.split(/\r\n|\r|\n/).filter(c=>c.length>0).map(c=>x.resolve(r,K.toPortablePath(c))),{stdout:o}=await Cr.execvp("git",["ls-files","--others","--exclude-standard"],{cwd:r,strict:!0}),a=o.split(/\r\n|\r|\n/).filter(c=>c.length>0).map(c=>x.resolve(r,K.toPortablePath(c))),l=[...new Set([...s,...a].sort())];return i?l.filter(c=>!x.relative(t.cwd,c).match(i)):l}async function r3e({ref:r,project:e}){if(e.configuration.projectCwd===null)throw new be("This command can only be run from within a Yarn project");let t=[x.resolve(e.cwd,e.configuration.get("cacheFolder")),x.resolve(e.cwd,e.configuration.get("installStatePath")),x.resolve(e.cwd,e.configuration.get("lockfileFilename")),x.resolve(e.cwd,e.configuration.get("virtualFolder"))];await e.configuration.triggerHook(o=>o.populateYarnPaths,e,o=>{o!=null&&t.push(o)});let i=await Uae(e.configuration.projectCwd);if(i==null)throw new be("This command can only be run on Git repositories");let n=await Hae(i,{baseRefs:typeof r=="string"?[r]:e.configuration.get("changesetBaseRefs")}),s=await Gae(i,{base:n.hash,project:e});return new Set(Ie.mapAndFilter(s,o=>{let a=e.tryWorkspaceByFilePath(o);return a===null?Ie.mapAndFilter.skip:t.some(l=>o.startsWith(l))?Ie.mapAndFilter.skip:a}))}async function lO(r,e,t,{configuration:i,normalizedRepoUrl:n}){try{return await Cr.execvp("git",e,{...t,strict:!0})}catch(s){if(!(s instanceof Cr.ExecError))throw s;let o=s.reportExtra,a=s.stderr.toString();throw new at(1,`Failed ${r}`,l=>{l.reportError(1,`  ${ee.prettyField(i,{label:"Repository URL",value:ee.tuple(ee.Type.URL,n)})}`);for(let c of a.matchAll(/^(.+?): (.*)$/gm)){let[,u,g]=c;u=u.toLowerCase();let f=u==="error"?"Error":`${(0,Oae.default)(u)} Error`;l.reportError(1,`  ${ee.prettyField(i,{label:f,value:ee.tuple(ee.Type.NO_HINT,g)})}`)}o==null||o(l)})}}var RQ=class{supports(e,t){return Zh(e.reference)}getLocalPath(e,t){return null}async fetch(e,t){let i=t.checksums.get(e.locatorHash)||null,n=uO(e),s=new Map(t.checksums);s.set(n.locatorHash,i);let o={...t,checksums:s},a=await this.downloadHosted(n,o);if(a!==null)return a;let[l,c,u]=await t.cache.fetchPackageFromCache(e,i,{onHit:()=>t.report.reportCacheHit(e),onMiss:()=>t.report.reportCacheMiss(e,`${P.prettyLocator(t.project.configuration,e)} can't be found in the cache and will be fetched from the remote repository`),loader:()=>this.cloneFromRemote(n,o),skipIntegrityCheck:t.skipIntegrityCheck,...t.cacheOptions});return{packageFs:l,releaseFs:c,prefixPath:P.getIdentVendorPath(e),checksum:u}}async downloadHosted(e,t){return t.project.configuration.reduceHook(i=>i.fetchHostedRepository,null,e,t)}async cloneFromRemote(e,t){let i=await fO(e.reference,t.project.configuration),n=Jm(e.reference),s=x.join(i,"package.tgz");await Wt.prepareExternalProject(i,s,{configuration:t.project.configuration,report:t.report,workspace:n.extra.workspace,locator:e});let o=await M.readFilePromise(s);return await Ie.releaseAfterUseAsync(async()=>await mi.convertToZip(o,{compressionLevel:t.project.configuration.get("compressionLevel"),prefixPath:P.getIdentVendorPath(e),stripComponents:1}))}};var FQ=class{supportsDescriptor(e,t){return Zh(e.range)}supportsLocator(e,t){return Zh(e.reference)}shouldPersistResolution(e,t){return!0}bindDescriptor(e,t,i){return e}getResolutionDependencies(e,t){return[]}async getCandidates(e,t,i){let n=await gO(e.range,i.project.configuration);return[P.makeLocator(e,n)]}async getSatisfying(e,t,i){return null}async resolve(e,t){if(!t.fetchOptions)throw new Error("Assertion failed: This resolver cannot be used unless a fetcher is configured");let i=await t.fetchOptions.fetcher.fetch(e,t.fetchOptions),n=await Ie.releaseAfterUseAsync(async()=>await ot.find(i.prefixPath,{baseFs:i.packageFs}),i.releaseFs);return{...e,version:n.version||"0.0.0",languageName:n.languageName||t.project.configuration.get("defaultLanguageName"),linkType:"HARD",conditions:n.getConditions(),dependencies:n.dependencies,peerDependencies:n.peerDependencies,dependenciesMeta:n.dependenciesMeta,peerDependenciesMeta:n.peerDependenciesMeta,bin:n.bin}}};var i3e={configuration:{changesetBaseRefs:{description:"The base git refs that the current HEAD is compared against when detecting changes. Supports git branches, tags, and commits.",type:"STRING",isArray:!0,isNullable:!1,default:["master","origin/master","upstream/master","main","origin/main","upstream/main"]},changesetIgnorePatterns:{description:"Array of glob patterns; files matching them will be ignored when fetching the changed files",type:"STRING",default:[],isArray:!0},cloneConcurrency:{description:"Maximal number of concurrent clones",type:"NUMBER",default:2}},fetchers:[RQ],resolvers:[FQ]};var n3e=i3e;var Fu=class extends De{constructor(){super(...arguments);this.since=z.String("--since",{description:"Only include workspaces that have been changed since the specified ref.",tolerateBoolean:!0});this.recursive=z.Boolean("-R,--recursive",!1,{description:"Find packages via dependencies/devDependencies instead of using the workspaces field"});this.noPrivate=z.Boolean("--no-private",{description:"Exclude workspaces that have the private field set to true"});this.verbose=z.Boolean("-v,--verbose",!1,{description:"Also return the cross-dependencies between workspaces"});this.json=z.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"})}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i}=await je.find(t,this.context.cwd);return(await Ge.start({configuration:t,json:this.json,stdout:this.context.stdout},async s=>{let o=this.since?await aA.fetchChangedWorkspaces({ref:this.since,project:i}):i.workspaces,a=new Set(o);if(this.recursive)for(let l of[...o].map(c=>c.getRecursiveWorkspaceDependents()))for(let c of l)a.add(c);for(let l of a){let{manifest:c}=l;if(c.private&&this.noPrivate)continue;let u;if(this.verbose){let g=new Set,f=new Set;for(let h of ot.hardDependencies)for(let[p,C]of c.getForScope(h)){let y=i.tryWorkspaceByDescriptor(C);y===null?i.workspacesByIdent.has(p)&&f.add(C):g.add(y)}u={workspaceDependencies:Array.from(g).map(h=>h.relativeCwd),mismatchedWorkspaceDependencies:Array.from(f).map(h=>P.stringifyDescriptor(h))}}s.reportInfo(null,`${l.relativeCwd}`),s.reportJson({location:l.relativeCwd,name:c.name?P.stringifyIdent(c.name):null,...u})}})).exitCode()}};Fu.paths=[["workspaces","list"]],Fu.usage=ve.Usage({category:"Workspace-related commands",description:"list all available workspaces",details:"\n      This command will print the list of all workspaces in the project.\n\n      - If `--since` is set, Yarn will only list workspaces that have been modified since the specified ref. By default Yarn will use the refs specified by the `changesetBaseRefs` configuration option.\n\n      - If `-R,--recursive` is set, Yarn will find workspaces to run the command on by recursively evaluating `dependencies` and `devDependencies` fields, instead of looking at the `workspaces` fields.\n\n      - If `--no-private` is set, Yarn will not list any workspaces that have the `private` field set to `true`.\n\n      - If both the `-v,--verbose` and `--json` options are set, Yarn will also return the cross-dependencies between each workspaces (useful when you wish to automatically generate Buck / Bazel rules).\n    "});var Nu=class extends De{constructor(){super(...arguments);this.workspaceName=z.String();this.commandName=z.String();this.args=z.Proxy()}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i,workspace:n}=await je.find(t,this.context.cwd);if(!n)throw new ct(i.cwd,this.context.cwd);let s=i.workspaces,o=new Map(s.map(l=>[P.stringifyIdent(l.locator),l])),a=o.get(this.workspaceName);if(a===void 0){let l=Array.from(o.keys()).sort();throw new be(`Workspace '${this.workspaceName}' not found. Did you mean any of the following:
-  - ${l.join(`
-  - `)}?`)}return this.cli.run([this.commandName,...this.args],{cwd:a.cwd})}};Nu.paths=[["workspace"]],Nu.usage=ve.Usage({category:"Workspace-related commands",description:"run a command within the specified workspace",details:`
-      This command will run a given sub-command on a single workspace.
-    `,examples:[["Add a package to a single workspace","yarn workspace components add -D react"],["Run build script on a single workspace","yarn workspace components run build"]]});var s3e={configuration:{enableImmutableInstalls:{description:"If true (the default on CI), prevents the install command from modifying the lockfile",type:"BOOLEAN",default:Yae.isCI},defaultSemverRangePrefix:{description:"The default save prefix: '^', '~' or ''",type:"STRING",values:["^","~",""],default:"^"}},commands:[ou,au,Au,lu,Du,wu,hu,Fu,Jh,Wh,Ym,zh,nu,su,cu,uu,gu,fu,pu,du,Cu,mu,ku,Eu,Qu,Bu,bu,Iu,Su,vu,xu,Vh,Pu,Cl,Ru,Nu]},o3e=s3e;var IO={};ut(IO,{default:()=>A3e});var Le={optional:!0},dO=[["@tailwindcss/aspect-ratio@<0.2.1",{peerDependencies:{tailwindcss:"^2.0.2"}}],["@tailwindcss/line-clamp@<0.2.1",{peerDependencies:{tailwindcss:"^2.0.2"}}],["@fullhuman/postcss-purgecss@3.1.3 || 3.1.3-alpha.0",{peerDependencies:{postcss:"^8.0.0"}}],["@samverschueren/stream-to-observable@<0.3.1",{peerDependenciesMeta:{rxjs:Le,zenObservable:Le}}],["any-observable@<0.5.1",{peerDependenciesMeta:{rxjs:Le,zenObservable:Le}}],["@pm2/agent@<1.0.4",{dependencies:{debug:"*"}}],["debug@<4.2.0",{peerDependenciesMeta:{["supports-color"]:Le}}],["got@<11",{dependencies:{["@types/responselike"]:"^1.0.0",["@types/keyv"]:"^3.1.1"}}],["cacheable-lookup@<4.1.2",{dependencies:{["@types/keyv"]:"^3.1.1"}}],["http-link-dataloader@*",{peerDependencies:{graphql:"^0.13.1 || ^14.0.0"}}],["typescript-language-server@*",{dependencies:{["vscode-jsonrpc"]:"^5.0.1",["vscode-languageserver-protocol"]:"^3.15.0"}}],["postcss-syntax@*",{peerDependenciesMeta:{["postcss-html"]:Le,["postcss-jsx"]:Le,["postcss-less"]:Le,["postcss-markdown"]:Le,["postcss-scss"]:Le}}],["jss-plugin-rule-value-function@<=10.1.1",{dependencies:{["tiny-warning"]:"^1.0.2"}}],["ink-select-input@<4.1.0",{peerDependencies:{react:"^16.8.2"}}],["license-webpack-plugin@<2.3.18",{peerDependenciesMeta:{webpack:Le}}],["snowpack@>=3.3.0",{dependencies:{["node-gyp"]:"^7.1.0"}}],["promise-inflight@*",{peerDependenciesMeta:{bluebird:Le}}],["reactcss@*",{peerDependencies:{react:"*"}}],["react-color@<=2.19.0",{peerDependencies:{react:"*"}}],["gatsby-plugin-i18n@*",{dependencies:{ramda:"^0.24.1"}}],["useragent@^2.0.0",{dependencies:{request:"^2.88.0",yamlparser:"0.0.x",semver:"5.5.x"}}],["@apollographql/apollo-tools@<=0.5.2",{peerDependencies:{graphql:"^14.2.1 || ^15.0.0"}}],["material-table@^2.0.0",{dependencies:{"@babel/runtime":"^7.11.2"}}],["@babel/parser@*",{dependencies:{"@babel/types":"^7.8.3"}}],["fork-ts-checker-webpack-plugin@<=6.3.4",{peerDependencies:{eslint:">= 6",typescript:">= 2.7",webpack:">= 4","vue-template-compiler":"*"},peerDependenciesMeta:{eslint:Le,"vue-template-compiler":Le}}],["rc-animate@<=3.1.1",{peerDependencies:{react:">=16.9.0","react-dom":">=16.9.0"}}],["react-bootstrap-table2-paginator@*",{dependencies:{classnames:"^2.2.6"}}],["react-draggable@<=4.4.3",{peerDependencies:{react:">= 16.3.0","react-dom":">= 16.3.0"}}],["apollo-upload-client@<14",{peerDependencies:{graphql:"14 - 15"}}],["react-instantsearch-core@<=6.7.0",{peerDependencies:{algoliasearch:">= 3.1 < 5"}}],["react-instantsearch-dom@<=6.7.0",{dependencies:{"react-fast-compare":"^3.0.0"}}],["ws@<7.2.1",{peerDependencies:{bufferutil:"^4.0.1","utf-8-validate":"^5.0.2"},peerDependenciesMeta:{bufferutil:Le,"utf-8-validate":Le}}],["react-portal@<4.2.2",{peerDependencies:{"react-dom":"^15.0.0-0 || ^16.0.0-0 || ^17.0.0-0"}}],["react-scripts@<=4.0.1",{peerDependencies:{react:"*"}}],["testcafe@<=1.10.1",{dependencies:{"@babel/plugin-transform-for-of":"^7.12.1","@babel/runtime":"^7.12.5"}}],["testcafe-legacy-api@<=4.2.0",{dependencies:{"testcafe-hammerhead":"^17.0.1","read-file-relative":"^1.2.0"}}],["@google-cloud/firestore@<=4.9.3",{dependencies:{protobufjs:"^6.8.6"}}],["gatsby-source-apiserver@*",{dependencies:{["babel-polyfill"]:"^6.26.0"}}],["@webpack-cli/package-utils@<=1.0.1-alpha.4",{dependencies:{["cross-spawn"]:"^7.0.3"}}],["gatsby-remark-prismjs@<3.3.28",{dependencies:{lodash:"^4"}}],["gatsby-plugin-favicon@*",{peerDependencies:{webpack:"*"}}],["gatsby-plugin-sharp@<=4.6.0-next.3",{dependencies:{debug:"^4.3.1"}}],["gatsby-react-router-scroll@<=5.6.0-next.0",{dependencies:{["prop-types"]:"^15.7.2"}}],["@rebass/forms@*",{dependencies:{["@styled-system/should-forward-prop"]:"^5.0.0"},peerDependencies:{react:"^16.8.6"}}],["rebass@*",{peerDependencies:{react:"^16.8.6"}}],["@ant-design/react-slick@<=0.28.3",{peerDependencies:{react:">=16.0.0"}}],["mqtt@<4.2.7",{dependencies:{duplexify:"^4.1.1"}}],["vue-cli-plugin-vuetify@<=2.0.3",{dependencies:{semver:"^6.3.0"},peerDependenciesMeta:{"sass-loader":Le,"vuetify-loader":Le}}],["vue-cli-plugin-vuetify@<=2.0.4",{dependencies:{"null-loader":"^3.0.0"}}],["vue-cli-plugin-vuetify@>=2.4.3",{peerDependencies:{vue:"*"}}],["@vuetify/cli-plugin-utils@<=0.0.4",{dependencies:{semver:"^6.3.0"},peerDependenciesMeta:{"sass-loader":Le}}],["@vue/cli-plugin-typescript@<=5.0.0-alpha.0",{dependencies:{"babel-loader":"^8.1.0"}}],["@vue/cli-plugin-typescript@<=5.0.0-beta.0",{dependencies:{"@babel/core":"^7.12.16"},peerDependencies:{"vue-template-compiler":"^2.0.0"},peerDependenciesMeta:{"vue-template-compiler":Le}}],["cordova-ios@<=6.3.0",{dependencies:{underscore:"^1.9.2"}}],["cordova-lib@<=10.0.1",{dependencies:{underscore:"^1.9.2"}}],["git-node-fs@*",{peerDependencies:{"js-git":"^0.7.8"},peerDependenciesMeta:{"js-git":Le}}],["consolidate@<0.16.0",{peerDependencies:{mustache:"^3.0.0"},peerDependenciesMeta:{mustache:Le}}],["consolidate@<=0.16.0",{peerDependencies:{velocityjs:"^2.0.1",tinyliquid:"^0.2.34","liquid-node":"^3.0.1",jade:"^1.11.0","then-jade":"*",dust:"^0.3.0","dustjs-helpers":"^1.7.4","dustjs-linkedin":"^2.7.5",swig:"^1.4.2","swig-templates":"^2.0.3","razor-tmpl":"^1.3.1",atpl:">=0.7.6",liquor:"^0.0.5",twig:"^1.15.2",ejs:"^3.1.5",eco:"^1.1.0-rc-3",jazz:"^0.0.18",jqtpl:"~1.1.0",hamljs:"^0.6.2",hamlet:"^0.3.3",whiskers:"^0.4.0","haml-coffee":"^1.14.1","hogan.js":"^3.0.2",templayed:">=0.2.3",handlebars:"^4.7.6",underscore:"^1.11.0",lodash:"^4.17.20",pug:"^3.0.0","then-pug":"*",qejs:"^3.0.5",walrus:"^0.10.1",mustache:"^4.0.1",just:"^0.1.8",ect:"^0.5.9",mote:"^0.2.0",toffee:"^0.3.6",dot:"^1.1.3","bracket-template":"^1.1.5",ractive:"^1.3.12",nunjucks:"^3.2.2",htmling:"^0.0.8","babel-core":"^6.26.3",plates:"~0.4.11","react-dom":"^16.13.1",react:"^16.13.1","arc-templates":"^0.5.3",vash:"^0.13.0",slm:"^2.0.0",marko:"^3.14.4",teacup:"^2.0.0","coffee-script":"^1.12.7",squirrelly:"^5.1.0",twing:"^5.0.2"},peerDependenciesMeta:{velocityjs:Le,tinyliquid:Le,"liquid-node":Le,jade:Le,"then-jade":Le,dust:Le,"dustjs-helpers":Le,"dustjs-linkedin":Le,swig:Le,"swig-templates":Le,"razor-tmpl":Le,atpl:Le,liquor:Le,twig:Le,ejs:Le,eco:Le,jazz:Le,jqtpl:Le,hamljs:Le,hamlet:Le,whiskers:Le,"haml-coffee":Le,"hogan.js":Le,templayed:Le,handlebars:Le,underscore:Le,lodash:Le,pug:Le,"then-pug":Le,qejs:Le,walrus:Le,mustache:Le,just:Le,ect:Le,mote:Le,toffee:Le,dot:Le,"bracket-template":Le,ractive:Le,nunjucks:Le,htmling:Le,"babel-core":Le,plates:Le,"react-dom":Le,react:Le,"arc-templates":Le,vash:Le,slm:Le,marko:Le,teacup:Le,"coffee-script":Le,squirrelly:Le,twing:Le}}],["vue-loader@<=16.3.3",{peerDependencies:{"@vue/compiler-sfc":"^3.0.8",webpack:"^4.1.0 || ^5.0.0-0"},peerDependenciesMeta:{"@vue/compiler-sfc":Le}}],["vue-loader@^16.7.0",{peerDependencies:{"@vue/compiler-sfc":"^3.0.8",vue:"^3.2.13"},peerDependenciesMeta:{"@vue/compiler-sfc":Le,vue:Le}}],["scss-parser@<=1.0.5",{dependencies:{lodash:"^4.17.21"}}],["query-ast@<1.0.5",{dependencies:{lodash:"^4.17.21"}}],["redux-thunk@<=2.3.0",{peerDependencies:{redux:"^4.0.0"}}],["skypack@<=0.3.2",{dependencies:{tar:"^6.1.0"}}],["@npmcli/metavuln-calculator@<2.0.0",{dependencies:{"json-parse-even-better-errors":"^2.3.1"}}],["bin-links@<2.3.0",{dependencies:{"mkdirp-infer-owner":"^1.0.2"}}],["rollup-plugin-polyfill-node@<=0.8.0",{peerDependencies:{rollup:"^1.20.0 || ^2.0.0"}}],["snowpack@<3.8.6",{dependencies:{"magic-string":"^0.25.7"}}],["elm-webpack-loader@*",{dependencies:{temp:"^0.9.4"}}],["winston-transport@<=4.4.0",{dependencies:{logform:"^2.2.0"}}],["jest-vue-preprocessor@*",{dependencies:{"@babel/core":"7.8.7","@babel/template":"7.8.6"},peerDependencies:{pug:"^2.0.4"},peerDependenciesMeta:{pug:Le}}],["redux-persist@*",{peerDependencies:{react:">=16"},peerDependenciesMeta:{react:Le}}],["sodium@>=3",{dependencies:{"node-gyp":"^3.8.0"}}],["babel-plugin-graphql-tag@<=3.1.0",{peerDependencies:{graphql:"^14.0.0 || ^15.0.0"}}],["@playwright/test@<=1.14.1",{dependencies:{"jest-matcher-utils":"^26.4.2"}}],...["babel-plugin-remove-graphql-queries@<3.14.0-next.1","babel-preset-gatsby-package@<1.14.0-next.1","create-gatsby@<1.14.0-next.1","gatsby-admin@<0.24.0-next.1","gatsby-cli@<3.14.0-next.1","gatsby-core-utils@<2.14.0-next.1","gatsby-design-tokens@<3.14.0-next.1","gatsby-legacy-polyfills@<1.14.0-next.1","gatsby-plugin-benchmark-reporting@<1.14.0-next.1","gatsby-plugin-graphql-config@<0.23.0-next.1","gatsby-plugin-image@<1.14.0-next.1","gatsby-plugin-mdx@<2.14.0-next.1","gatsby-plugin-netlify-cms@<5.14.0-next.1","gatsby-plugin-no-sourcemaps@<3.14.0-next.1","gatsby-plugin-page-creator@<3.14.0-next.1","gatsby-plugin-preact@<5.14.0-next.1","gatsby-plugin-preload-fonts@<2.14.0-next.1","gatsby-plugin-schema-snapshot@<2.14.0-next.1","gatsby-plugin-styletron@<6.14.0-next.1","gatsby-plugin-subfont@<3.14.0-next.1","gatsby-plugin-utils@<1.14.0-next.1","gatsby-recipes@<0.25.0-next.1","gatsby-source-shopify@<5.6.0-next.1","gatsby-source-wikipedia@<3.14.0-next.1","gatsby-transformer-screenshot@<3.14.0-next.1","gatsby-worker@<0.5.0-next.1"].map(r=>[r,{dependencies:{"@babel/runtime":"^7.14.8"}}]),["gatsby-core-utils@<2.14.0-next.1",{dependencies:{got:"8.3.2"}}],["gatsby-plugin-gatsby-cloud@<=3.1.0-next.0",{dependencies:{"gatsby-core-utils":"^2.13.0-next.0"}}],["gatsby-plugin-gatsby-cloud@<=3.2.0-next.1",{peerDependencies:{webpack:"*"}}],["babel-plugin-remove-graphql-queries@<=3.14.0-next.1",{dependencies:{"gatsby-core-utils":"^2.8.0-next.1"}}],["gatsby-plugin-netlify@3.13.0-next.1",{dependencies:{"gatsby-core-utils":"^2.13.0-next.0"}}],["clipanion-v3-codemod@<=0.2.0",{peerDependencies:{jscodeshift:"^0.11.0"}}],["react-live@*",{peerDependencies:{"react-dom":"*",react:"*"}}],["webpack@<4.44.1",{peerDependenciesMeta:{"webpack-cli":Le,"webpack-command":Le}}],["webpack@<5.0.0-beta.23",{peerDependenciesMeta:{"webpack-cli":Le}}],["webpack-dev-server@<3.10.2",{peerDependenciesMeta:{"webpack-cli":Le}}],["@docusaurus/responsive-loader@<1.5.0",{peerDependenciesMeta:{sharp:Le,jimp:Le}}],["eslint-module-utils@*",{peerDependenciesMeta:{"eslint-import-resolver-node":Le,"eslint-import-resolver-typescript":Le,"eslint-import-resolver-webpack":Le,"@typescript-eslint/parser":Le}}],["eslint-plugin-import@*",{peerDependenciesMeta:{"@typescript-eslint/parser":Le}}],["critters-webpack-plugin@<3.0.2",{peerDependenciesMeta:{"html-webpack-plugin":Le}}],["terser@<=5.10.0",{dependencies:{acorn:"^8.5.0"}}],["babel-preset-react-app@10.0.x",{dependencies:{"@babel/plugin-proposal-private-property-in-object":"^7.16.0"}}],["eslint-config-react-app@*",{peerDependenciesMeta:{typescript:Le}}],["@vue/eslint-config-typescript@<11.0.0",{peerDependenciesMeta:{typescript:Le}}],["unplugin-vue2-script-setup@<0.9.1",{peerDependencies:{"@vue/composition-api":"^1.4.3","@vue/runtime-dom":"^3.2.26"}}],["@cypress/snapshot@*",{dependencies:{debug:"^3.2.7"}}],["auto-relay@<=0.14.0",{peerDependencies:{"reflect-metadata":"^0.1.13"}}],["vue-template-babel-compiler@<1.2.0",{peerDependencies:{["vue-template-compiler"]:"^2.6.0"}}],["@parcel/transformer-image@<2.5.0",{peerDependencies:{["@parcel/core"]:"*"}}],["@parcel/transformer-js@<2.5.0",{peerDependencies:{["@parcel/core"]:"*"}}],["parcel@*",{peerDependenciesMeta:{["@parcel/core"]:Le}}],["react-scripts@*",{peerDependencies:{eslint:"*"}}],["focus-trap-react@^8.0.0",{dependencies:{tabbable:"^5.3.2"}}],["react-rnd@<10.3.7",{peerDependencies:{react:">=16.3.0","react-dom":">=16.3.0"}}],["connect-mongo@*",{peerDependencies:{"express-session":"^1.17.1"}}],["vue-i18n@<9",{peerDependencies:{vue:"^2"}}],["vue-router@<4",{peerDependencies:{vue:"^2"}}],["unified@<10",{dependencies:{"@types/unist":"^2.0.0"}}],["react-github-btn@<=1.3.0",{peerDependencies:{react:">=16.3.0"}}],["react-dev-utils@*",{peerDependencies:{typescript:">=2.7",webpack:">=4"},peerDependenciesMeta:{typescript:Le}}],["@asyncapi/react-component@<=1.0.0-next.39",{peerDependencies:{react:">=16.8.0","react-dom":">=16.8.0"}}],["xo@*",{peerDependencies:{webpack:">=1.11.0"},peerDependenciesMeta:{webpack:Le}}],["babel-plugin-remove-graphql-queries@<=4.20.0-next.0",{dependencies:{"@babel/types":"^7.15.4"}}],["gatsby-plugin-page-creator@<=4.20.0-next.1",{dependencies:{"fs-extra":"^10.1.0"}}],["gatsby-plugin-utils@<=3.14.0-next.1",{dependencies:{fastq:"^1.13.0"},peerDependencies:{graphql:"^15.0.0"}}],["gatsby-plugin-mdx@<3.1.0-next.1",{dependencies:{mkdirp:"^1.0.4"}}],["gatsby-plugin-mdx@^2",{peerDependencies:{gatsby:"^3.0.0-next"}}],["fdir@<=5.2.0",{peerDependencies:{picomatch:"2.x"},peerDependenciesMeta:{picomatch:Le}}],["babel-plugin-transform-typescript-metadata@<=0.3.2",{peerDependencies:{"@babel/core":"^7","@babel/traverse":"^7"},peerDependenciesMeta:{"@babel/traverse":Le}}],["graphql-compose@>=9.0.10",{peerDependencies:{graphql:"^14.2.0 || ^15.0.0 || ^16.0.0"}}]];var CO;function jae(){return typeof CO>"u"&&(CO=J("zlib").brotliDecompressSync(Buffer.from("G7weAByFTVk3Vs7UfHhq4yykgEM7pbW7TI43SG2S5tvGrwHBAzdz+s/npQ6tgEvobvxisrPIadkXeUAJotBn5bDZ5kAhcRqsIHe3F75Walet5hNalwgFDtxb0BiDUjiUQkjG0yW2hto9HPgiCkm316d6bC0kST72YN7D7rfkhCE9x4J0XwB0yavalxpUu2t9xszHrmtwalOxT7VslsxWcB1qpqZwERUra4psWhTV8BgwWeizurec82Caf1ABL11YMfbf8FJ9JBceZOkgmvrQPbC9DUldX/yMbmX06UQluCEjSwUoyO+EZPIjofr+/oAZUck2enraRD+oWLlnlYnj8xB+gwSo9lmmks4fXv574qSqcWA6z21uYkzMu3EWj+K23RxeQlLqiE35/rC8GcS4CGkKHKKq+zAIQwD9iRDNfiAqueLLpicFFrNsAI4zeTD/eO9MHcnRa5m8UT+M2+V+AkFST4BlKneiAQRSdST8KEAIyFlULt6wa9EBd0Ds28VmpaxquJdVt+nwdEs5xUskI13OVtFyY0UrQIRAlCuvvWivvlSKQfTO+2Q8OyUR1W5RvetaPz4jD27hdtwHFFA1Ptx6Ee/t2cY2rg2G46M1pNDRf2pWhvpy8pqMnuI3++4OF3+7OFIWXGjh+o7Nr2jNvbiYcQdQS1h903/jVFgOpA0yJ78z+x759bFA0rq+6aY5qPB4FzS3oYoLupDUhD9nDz6F6H7hpnlMf18KNKDu4IKjTWwrAnY6MFQw1W6ymOALHlFyCZmQhldg1MQHaMVVQTVgDC60TfaBqG++Y8PEoFhN/PBTZT175KNP/BlHDYGOOBmnBdzqJKplZ/ljiVG0ZBzfqeBRrrUkn6rA54462SgiliKoYVnbeptMdXNfAuaupIEi0bApF10TlgHfmEJAPUVidRVFyDupSem5po5vErPqWKhKbUIp0LozpYsIKK57dM/HKr+nguF+7924IIWMICkQ8JUigs9D+W+c4LnNoRtPPKNRUiCYmP+Jfo2lfKCKw8qpraEeWU3uiNRO6zcyKQoXPR5htmzzLznke7b4YbXW3I1lIRzmgG02Udb58U+7TpwyN7XymCgH+wuPDthZVQvRZuEP+SnLtMicz9m5zASWOBiAcLmkuFlTKuHspSIhCBD0yUPKcxu81A+4YD78rA2vtwsUEday9WNyrShyrl60rWmA+SmbYZkQOwFJWArxRYYc5jGhA5ikxYw1rx3ei4NmeX/lKiwpZ9Ln1tV2Ae7sArvxuVLbJjqJRjW1vFXAyHpvLG+8MJ6T2Ubx5M2KDa2SN6vuIGxJ9WQM9Mk3Q7aCNiZONXllhqq24DmoLbQfW2rYWsOgHWjtOmIQMyMKdiHZDjoyIq5+U700nZ6odJAoYXPQBvFNiQ78d5jaXliBqLTJEqUCwi+LiH2mx92EmNKDsJL74Z613+3lf20pxkV1+erOrjj8pW00vsPaahKUM+05ssd5uwM7K482KWEf3TCwlg/o3e5ngto7qSMz7YteIgCsF1UOcsLk7F7MxWbvrPMY473ew0G+noVL8EPbkmEMftMSeL6HFub/zy+2JQ==","base64")).toString()),CO}var mO;function qae(){return typeof mO>"u"&&(mO=J("zlib").brotliDecompressSync(Buffer.from("G8MSIIzURnVBnObTcvb3XE6v2S9Qgc2K801Oa5otNKEtK8BINZNcaQHy+9/vf/WXBimwutXC33P2DPc64pps5rz7NGGWaOKNSPL4Y2KRE8twut2lFOIN+OXPtRmPMRhMTILib2bEQx43az2I5d3YS8Roa5UZpF/ujHb3Djd3GDvYUfvFYSUQ39vb2cmifp/rgB4J/65JK3wRBTvMBoNBmn3mbXC63/gbBkW/2IRPri0O8bcsRBsmarF328pAln04nyJFkwUAvNu934supAqLtyerZZpJ8I8suJHhf/ocMV+scKwa8NOiDKIPXw6Ex/EEZD6TEGaW8N5zvNHYF10l6Lfooj7D5W2k3dgvQSbp2Wv8TGOayS978gxlOLVjTGXs66ozewbrjwElLtyrYNnWTfzzdEutgROUFPVMhnMoy8EjJLLlWwIEoySxliim9kYW30JUHiPVyjt0iAw/ZpPmCbUCltYPnq6ZNblIKhTNhqS/oqC9iya5sGKZTOVsTEg34n92uZTf2iPpcZih8rPW8CzA+adIGmyCPcKdLMsBLShd+zuEbTrqpwuh+DLmracZcjPC5Sdf5odDAhKpFuOsQS67RT+1VgWWygSv3YwxDnylc04/PYuaMeIzhBkLrvs7e/OUzRTF56MmfY6rI63QtEjEQzq637zQqJ39nNhu3NmoRRhW/086bHGBUtx0PE0j3aEGvkdh9WJC8y8j8mqqke9/dQ5la+Q3ba4RlhvTbnfQhPDDab3tUifkjKuOsp13mXEmO00Mu88F/M67R7LXfoFDFLNtgCSWjWX+3Jn1371pJTK9xPBiMJafvDjtFyAzu8rxeQ0TKMQXNPs5xxiBOd+BRJP8KP88XPtJIbZKh/cdW8KvBUkpqKpGoiIaA32c3/JnQr4efXt85mXvidOvn/eU3Pase1typLYBalJ14mCso9h79nuMOuCa/kZAOkJHmTjP5RM2WNoPasZUAnT1TAE/NH25hUxcQv6hQWR/m1PKk4ooXMcM4SR1iYU3fUohvqk4RY2hbmTVVIXv6TvqO+0doOjgeVFAcom+RlwJQmOVH7pr1Q9LoJT6n1DeQEB+NHygsATbIwTcOKZlJsY8G4+suX1uQLjUWwLjjs0mvSvZcLTpIGAekeR7GCgl8eo3ndAqEe2XCav4huliHjdbIPBsGJuPX7lrO9HX1UbXRH5opOe1x6JsOSgHZR+EaxuXVhpLLxm6jk1LJtZfHSc6BKPun3CpYYVMJGwEUyk8MTGG0XL5MfEwaXpnc9TKnBmlGn6nHiGREc3ysn47XIBDzA+YvFdjZzVIEDcKGpS6PbUJehFRjEne8D0lVU1XuRtlgszq6pTNlQ/3MzNOEgCWPyTct22V2mEi2krizn5VDo9B19/X2DB3hCGRMM7ONbtnAcIx/OWB1u5uPbW1gsH8irXxT/IzG0PoXWYjhbMsH3KTuoOl5o17PulcgvsfTSnKFM354GWI8luqZnrswWjiXy3G+Vbyo1KMopFmmvBwNELgaS8z8dNZchx/Cl/xjddxhMcyqtzFyONb2Zdu90NkI8pAeufe7YlXrp53v8Dj/l8vWeVspRKBGXScBBPI/HinSTGmLDOGGOCIyH0JFdOZx0gWsacNlQLJMIrBhqRxXxHF/5pseWwejlAAvZ3klZSDSYY8mkToaWejXhgNomeGtx1DTLEUFMRkgF5yFB22WYdJnaWN14r1YJj81hGi45+jrADS5nYRhCiSlCJJ1nL8pYX+HDSMhdTEWyRcgHVp/IsUIZYMfT+YYncUQPgcxNGCHfZ88vDdrcUuaGIl6zhAsiaq7R5dfqrqXH/JcBhfjT8D0azayIyEz75Nxp6YkcyDxlJq3EXnJUpqDohJJOysL1t1uNiHESlvsxPb5cpbW0+ICZqJmUZus1BMW0F5IVBODLIo2zHHjA0=","base64")).toString()),mO}var EO;function Jae(){return typeof EO>"u"&&(EO=J("zlib").brotliDecompressSync(Buffer.from("mxi2LYNtw1tvVo8GXJm1KcGTDafcGOIFxFq5fe/n9kakh/eBUpueW7rSkDq6AfVW3BgDB7S3K0lOy1a7jmzz4Ah+J2z6wouRLRhysbzG2lLr0ScSVjBivhfdOFrW346S6tLY2R5N/ZKwxQi/Dw4l19x8FxFJrwF03PqLgCCESdcwE9GIXs3cHqvMIX15VvihbzX177mc9Dv2X0xw0m+9nk0Ri8ksYkdPrr3SAgJUS1v211QK0AY0/94QNDV6LN+FuPvofrn8ey+3TI3d1DSvU9GvXiFDlAjkJbOfA8XvTWd3LqePts2YQQp2qp3mdFLZUgkrO1ghfjHlIScdQvM8Qg9eTq/im5MGlcq+MN0GIGFwsrf9U2NvbzwEvQQ1Z8eWJVueIHql7Sfstg5FKWRMrmAp43Ne6H8uUtlzR6GsKlRX6JVHxVsYuA/bDOQ3Ijoxc1yiCHABb+N9eyhDv2+iBHzi//w0QshM0vr/7++1SlUqXmsa2F3SkD0cKQi93PIAYTbZsP6+59yj/iDVSF/SKslygcvVYGike8+9971PUpUMU5abmJNokpTz4Sz+pBpjo5rlRlcPcxAkc++yV+q2M+RmlJdrKWfjPKM7wIz8DJAJC2vSpnZYOuswqOuzBLHAwPuAoDD+i3RLNNoUzSptNyghKP87NentruF0/t8l3+MqIVcCSuiSfgbrnGwtAG9JQj3IkgJM44t87ojPHXZC4k4rXZvVqvtPTTVgQtInMoPU+QuFMPY+1yuQCB9OQCzGm6psjf//Nitjw3KrDHpPhn9rQbUUyknkICFMAvqqVc+MKcIIqMekmWhPPlgyheYIYx9nznqDOG2NVN2G0uJ/kuG9X4b6JRP4ffv9f9o79K4K8QmR/MIlrAiEHuHe7e59Krkf7gBgCGSyuqq6qh7/9d4ECF1cJGqF0vc5gzKJUF/Iga/+BvaEYovsJsTGf9XeiupeQEHUGptFSD0xG9aTXz16DNPaW7rvjwFFVKJonmNQpWN7jYWhe8NIq67CGwxnI4XKmPg6FWBn5Ba46iQYyDSlpGOlc/DfGeOYwxhqMZYZe831Td+osLwCwgbxwDEZutSfq2UnhVBGFf0r8ZwvXqqaj691YzEho8yLMDMIkZw1A18aXwuX73sKWLaszTHWKttK7/kTkU8EksFR2JMckzGtv5coItDEkacYRU/EoNbw4LriHeTHgYB4dnfmA8ilP3guf4vN3VEZKAtVGeuh/m6ot1ID628K8u87kvs45Ndr+FW7kf9Mh3Yzh/wE+ken6Hrwh1jaC8635oVnc/+lT+luG8PjaNhuYXkHv8LmHNoJ1tP66TL7SSE+9nMn2acVbnx7P3+tW0wLCnSHmtfj80DzAGwwS0445MQr9xWiqHQ/RXw9TYZfsjx05WiIpSUDhgQE/FuM5sjOL9C4Ub7LGaCadPGR+4whQBUsiKjG+KeUhmg1eEC7Sj8RXR2qNDdvN9AjDEvtea8ql82nUufmk4r/jpQnFpsut17UpwnuvzYpgi0B9jxRJv8fFeiu9Ty8MjlUDk4zRMvAAxdkP9VskuBxvP5DEKTKnGdYKEI95yqPqmt/au5olqzHizhZXNx6sScQ6UMnTZiURXBZnfW3PUrA7gCFHCafxx/B3oi8LalCuPrXSz9JTi5eZeZKDy6Y6wI1/lHFQiFYxPanzSGCwTQ2fohhzPJYEgbicaaxS5yZPlKFs3DQAthbCh4urvw4X0f1PCMGGIWQFvwtXRKdFE6GZQPI8AQ9u4eJyh44GOvl41OkODBnCBuuijKw97oTf2QDbrweZ4AkBJ9NE2R+xsmydzzbRCB53PK59T/KDJIBFbar+rIcdDct3LpMr53q9Lus4m5G7a43hTOwHJ2YB5y7PsNxTBoagc+ITx7A+ei8mgjiKdVjE3nQKi8x5tOdf2+w+z71IjAUkbaYT4pE1QcSnQIlMXugwksYzDC3BmiCr35qkR8js4bzXCBA9QKc9G9ifuZWLEoeVPnLeLIsH0OpWIAlZUQNkom9YcXW+XPs5OYE1J8VlT9VZZX9THqa8DAnBUwTzr44FxYqcoaFd1lboJenXy5dwrMw6oUj4uKAklmUI0qBna2MLUCkHJUIh6jJOqJPiTR+/LJCQIX0fmqNQMEC2l1nMzI9/bmNTuEyTnxHDVBFrM1rsrMwFST769ad11InJgKBrMZ+LA3D5bp4gWTmiW8egdBNGKAyj/4GKxz41pFwnDMPOX/5j8Nnjo5IluVtUr78SNXHh87/jocovXIdHX1zjM4iBrg/Cs8lBkstguVR/zR/CfaQpYLpu1CY73iqMwIe69ET5kk8BSfhej+yUOB5vzP7ZZOelFAbzany63SyowV5xhcBvCB1ebkDUssdnHFYTrKcd8atL6tsJ1PUZe312LMsPs7Pdv8UNuqsRDlt/Upy2a5zXmZ9PYqYmJnlJOUYcGKspr9Zv+ZMh6YxP+eyjzq2eWq+sBA/aVmvWziZcXPMmn9E9osVymAu5vgQHB4fhPSUm55qsw5gDLrj9oSq28Vn3vg1qSYYatTjHjQOQkmeYY+555hjxum+RldipcvCx+6ra5DYffj4ZX10s7ufBBlQghcWUwsPGf+R+wYECi6soOAn9UqSX2ymN+7nrbqwRH45kv3In84l13NCazMTwrq0mO24gH+unDr58oCErLL6IqeaBIBvW3jfle1mRBbjmEWxClFW+4LA2F63y/BxKD/5HWmgcLDY7KYzltLj+NxDjEQbljN9n05ogXHRL9mu7SNRNoxL1kd3Cq/EbfoHLpbiW0sPHng127ThrhYy927rpgWE2bzoIYGPJW61os6ipvfPQ9J8dIuJwrbLLbW1HVrlNpXonq8FIJ7dIJi16HpNNOSqNAs/RVQsON4u9Jz4MgIB+oj6SHTECvuWLmuYHNrOnG+p3GD36KrXOunQiQRVFn6VwgGV11q55OchTeXc2jpgOITq+p4AkKBrC0Wkn/KkAuEG+CmBLQEUjEwtCFj1jHIrgmq41qUpJ7nrE5giW0+Q6RwR9ogHJp0zAqEOcIi8Z8sl8ZwibCFIolkjzB5xC6fXzQC9BRhR4aCXuLJIuJ5hp5nqpqcbo32hksgpypWxgyioSwj5HZJEjuSRR8X0jDx4l4f+rov1X81L2ne56/e3PLPoHn+GXpg8+O5lkE+rWrEYeRiewe1gBMUeBL7xewmcRN9oee/NS9l8IDaJXoSh6yukPBwZHBxN74RBWBAx7zW57hQ38c5JGZufKF52EVdCohltGvVmwNN/g4ZdtHe6uWqKHMt79sfZbRD9fa1qEbIc9A0eJ8Dzwn2nKrnd602QKFCVUrcHYiym2hnFth7WvDFt26qY79dqNZh5clrpUhm27NW0a15FqkaLVrF52sSelvEdBm8Q1cuJvLr/QM6wqq6I5kIleDMaFtJlfSXqcHYjKmPQGqBzZIWyPyeCXoa22PO/SlrfCewaDB+7UlN3d+7+hf08ERXOUuKuTcLKzQs+NsWdldgDLtMmqqmvMzbPmBGqtF6nGpvGusxispOb84bc6xuzm+nLkL1zc19+kO9eIM6dz0fx99ZlTZ+b+/wyXh+19P9RVEsilO1qd4T2qDwXePQ/2MSdK6YZO8MH4PPzJV1Y6sTBCvu4p7RNpHgvIF0dfw/G63SMBpIXWDm2qiprMZD6NfCK/JwD3v5c+VJ7ze0siXX8e6rLYQHsZON8XrwIdwNU9hdT7qiXANNKQvsQQt/C8W++2/6uir/1Pp5NLwMBCJyes8J7AsjRxdNimWO94MRlRwb72+ViO+19krj86/ZeJfVbmm85Hnjsyb9JsJTbuFtLNi18QftzLb5T25FP08bJefvoqxFkzXxwaNUamG0w+PX6c5A1EOfGVL1me7Ke2YpwGdeczP0PJQmssj4pcnnkbwZG9iHy/FqYTQ+UGDmAOObwDqKahTis4QIAIfNXdCKFN6RR7RLz1jj6GgEABYiPtMw3A8Uye4+LYB4pcu/XGfarN/nG1GMozy1uWZ8TrayYJ1VcAGACAVrYDfXqdi7Uqj0CADzQpEOzkF6WedHMIwPot13Crx34he2Id8sxYnSz7PPnghUA2nn3t99fzp/Rk2swB2dFOY8090MPKn+1zs7xQhj9CLKF95BNgHdruADALovcjYWThmDVjjB/Zyd9jQBAok6za+GY33Oi3pn7J36PX8A3B1aO5uQGQEK5imQAAFJrAvnPXP3nd+XFtdaNAea6n/ASYLVddhYFkK7+9WQG3tNOvlqNHTKUF4ThUR9wKpWr6C0AINOJMjvRsjGcK72JM/45TbgikLq47OkOEN1+KBMAiKfg6UFiH+5GEAM/GzmpbHCQYl5d7GoLABQZu9iwGbtQe6vGklEnXQIAHa61ljNPQ5B6P911HloDA45BuYqwBQB08gZls8IjVu3G2usipoJVq6RGAKBiokVjHvAHtPpRI/giMRp62dyI8ioAdLPe1owH6Caau9daPgDw2aC3PkNjsmZewihbAODk2KuV2PAwtuH2pbISjG10IwCQWbVkzOPRMROffT0Jq+tXog6cqBMSYCHlKpIBAEhLuqDGpQbyn+3iElWdGWfbBVZFHexz8D3oYaqXNu7ueKT3AdGjvkFqu1xFbwEAsSzraVzqVT54ClyK1aBxpt2H91pSEjMBgIRvoolnPvX2v7rJjbhls8tpvLq2Gy4AUEspvTnhTOHFkkus/eK9liThEgC47D78kZYbrPMPN8YPxy+buK8udcMFAEp4acslJpx4MSWx9o33mpKETQBgw1vBK7f51b1LelPm8qfm7pFgBYB11pvdVF8FQ3d/tdHc05VvptfS2CsXVdG4AMAZs0edGe4wxpj7MsakRgBg0eer8WMKFZobVik7SEj9a01390sC30dVgvlRulstwwoWTb3glIy+ydrvRYLtSXjKdthJUjINDJiSjvwhPPkVu16EBU8WWnABPxIfufnQHAqdYLGGq4E9v75neCqJ6Euk6vMeqVX5otcLfZ9w1UXI+Cy+SMHF1oWRseybW3u1Db4CNZvXHJu8FcQ3pLEDzreezVMUu+tf/fOra80Wa9ubiN3rRdApmbmwRoJU0nfI2XYMpBavJuglfNwl7hzIfzfwZgwXEB5ufVR+oo7q5iTnlC+NJEz6Cy+kwqZX9ZA9UR/Vmsb4xUdZ/k5zNKMAacLAiyflFX2g2U1w+EARoEB1bfrYGOkDYahipF9mHHGM2d3J3Bl6Ytp9MofXKfOelU1Wk+oYNxe2CXubW6ww+72ZzgNAKRqCc8vOesVEUiDn2gwiWqihq+QJXe3AMvR76IsBhcMdF12dmx/fOYIZRIjKx4ErHlWB4T4KLkCsVZSoIp270ojfXTl4lyqFm4zQk+mOlX/0ODb2iOV2U0Lo8NriscPDXVu/NSXskMv3/PDTaENYbufcgwOjtFFCKde6aaZ34o8kqolBNKkMyblxEVro3hilGgu0KL4scty3XhFGAR8OUySQlhm/ZlgWUQ1W8EjXDmXaaFqRLZGhNkQJN2cOkfykPLqne9Rcr0CM3SVfQ+h4Fb65hsuPI9HzSL8u7OceT4L5/kMOSuXjuZL48W6OJ6+sjSYOHbxmUwDRAKgatJ2mTgJPGP2R0m/aItc8ubpOaeJzUSs5Lrw2SsgGPgaI9D6M9tKfU7+5AYMdgXeM6uPUBA7Ha83G9SPk25eLek+LfJcuqUV2A5PnswTC6+ZWvP8Rac3+w6i16XJRz67xBs4ZuvnL496oEL26ZN/7gIFqUWHj6gfyDzMm9LcxsQNW/xxH7fDDhUkAoMM+gPbXUvmndVHR1bj826rVweuu9tBmRZM0/65eGO1jzLV93A0LbVp/bQ+Jt35lb7EEjJDQjU+2fsu7Ov5VdxKARZO5lqpszaSOrdkRYBpvsLnG5HmvRI5OCz87Zk2nGG8apyBHk6WHVcCTiKU/EtNJsnVQOrJlNjZkNqUweMTmgKZF1+QufyaboW8ZqKc1A3M7aFOhau5iQjb12F5GBtNm9SJttdlHPLXNrb02/4in7G+huhKZc/xRRqAfE+tQ0nFGVrG43C4svvWKt/HNdignxlq/iijNbyuZQUtiMWtgYsbE9WAI+hXKoLhwrtf4Jq+KdHail+yO8U7Pq7AF7xEgibA7VKkLEq+mThYBINGyyn4fFoDYvyYThFOhfDwGZEh5YQlmiQvavogjOs2n1JqQll1SAz/McA1t0xrVK5KCS8qkx0IyykpWpz5+T0Js+Jw+LhVyt5PhmY/0Ri/fCwRY1yVWbhXFsp24gBN/64aoLkvxMdk1YQOcw+WePixMuPTzl8Zqjy1MdnnipptXYtSDYjixoBU2OShLSJoz6KOJqMk1GZXqsmQkXn/NKJXdj94bcZKEomnEjTIVp4Dn29BX83Q0KsEbhHPY7D37t22Uu1zkns5WvO51UKlJpwrGunLeI/SwXOpFEEasxG0SAQdHygIOJziw5/OoamoXLkLtLDih85Qyrf3zZokStZSOfk3n7dgIkwb/eCz5FxTxvgnXLFDmStYfO/1Dq3Lc0+VG6h4sdeSiIvbbFnPAqGrvlwDAmMoXk0ftmJfR1GZ9tMRkE4zdz4QIZjL0GI0e8E2+p2WRtL5Oo7PSxJ9xCiuHL2V8ppMZAPCLoaGRwucXFO32i/ZoAgCWnFK+gRZDAjdcI28n+nTmKplMNLmF5yAbPTgEv13xrku52W3PNjOrFNYKPKkzAwAgXwhFkjgOol2NyfdFK5oAgHym21J+BU0PCvRh1oN9K/hu6KkIYExQtzSbaxG/6ZC8tpgKwNVqhgURTlNb8ffsDMkp2hNXp5mNCusI3q0yAwB7fCnUcrGwT6jaWX7BiiYAkJKEUm5A2mEAG19ty7JL1l+R/cWDAv7BS8SF3g5+RnyrXEPYhgjKRlpXMwDgRnAtehPuWu7M9txVZrbdBHznvvnOkAvHunks/wN7xyNQiBfTDWPiJki5jBV6yU3DZgczA63Gsi1efk9ZwlWLkQNsM5NZ/vjsqIJBxfBKS+2ODzJeLUIxixZdTUaRmo8FN5kjFi0d085e0bQMoCKVQ1TG0S+xCHHKcnvslLwntEdnhERaLuDa7ugjI1YSuxirxqgWfXG3HUsUEdyMy+mTryakoPOarn6pzWPBzTARKyQct0uFYkPdcc8FtmUU0twNlNKUo9ddZQ4+CG+PLmoO8iL1t5vwKYnm5np81ho1pw66LWc+E6yl42FoyRlBL092yj5VcPA9r4aZWTrPm6Sz+MZOEoJUmsOyLC1uKxrVq0jgSweizQB7xF2zdqaL4SE8Jbvj8idCucrRpuQMCZ3pRgd1tDu9UG+QwzSPBNyObGqdsG+dtRcQRaIqh3+0w0/rsO/sYofh5WclO3OL7Hdh+eCCRW0ApfuAsE90YVacftVcGMQKJKsmhMIr1/XAyF1Hjhc3IT4HnREh/ECIUjRORIObctvguDH52xI80vVaFiZy1bCb768ENgfxIoMcmvRcfJrciwKeLU66bCmKkTYI4oGx7YD1nkYm/LKWcfIDq0/eaeTYqk5Q1tD/kpgBgJ2gKueEKzZ68dbm1mXX1PDaZBoef5QJAGg0ul3B8Io//MeN4SXswr+Z0MWKRsyQfaze7dN8CmNO6TG8tjKeC8J11uGj99kIXFYDgsEEUXAvJP5GJz1zsnB7lwPrHotb4QY33Jm+dof6pW5bhCPzfWhdqvxHlWyfG+73rz6vR+l6lTQoTXL3wmKzjxI3XNmNBYih9737+7O5172ehsMlVBBQ+H/33oCf1ix5cvAebcgc+vjo1s8pZkMV4a+4AUIBta3UNzG+6c1UdvvZ/lSJnW7bWlJdsshRO3q7gzrD6+2flZ5qg6OV6BFKZHVGWSfdKBbv1f7W6XRwYa9lrsSFm4pvhwoaUFtcmWrc+It0v3Jm/bPyXybmA93SiRqs/dbZvKBnbq2lw5o7gXrF+aduSKdvHdbOcJw0uBfzgWomtInqlLVnX17hG8J9sP78n/fsBCgpwqhR5q+msL4qN4KlOjMAIEGWEPaCUnpf01C390JGTRMA8MLR1L2KcO6fUQIAdbFa1sTk7bBczURTqpGgo3X5+ICpeeNo48Hrl7fOlBahbmSVA1BGhMam1OSXxa/jbdYfSWY/62VGmDN6ygEoQ0Jvu+HyYfvU4nf1z6+8SSSVH2HY9ccmbFfbMwKyRPofmQEAxCwZCWFERdGitW5vQouKJgDQZL3R0P0dZlw3CQC4SNbVmtV8O+V15N73Civzi12fn5kQrD82YQuir5FJaZIZALAyjXUyLEXIuK35iQk1J0uG3ZAJ3BZema+KFzS10F9k8QsfwiELf7R/h5LRqLjBCKlF2NpnarC1PlBfQVHBdvddB9iy9AtNagPTGRQAzcu5HZ7aDl+A026cBkNMwuc3NYeTS96Swcibw74AUaNfqVg3WhUzRPyHwy2e5EaQIceg7Gd0Y4E0AGTPQCRZM1bCO/CiVcPpNPNc/R/tqEFvOpiWP1HhSrW7QrLu5iPjctORe751qis1z1CaPTAY1wWFX1PRoUah75aeQK0tGpzrL0CwiU6zgb1H7sIAXV9qnhv7AR+jU4/txP7xeFGfyukQf+KF3TVDlQ6DWe5rcTZG3qGhbciR+v3nMbIm8WiHXdm5R+jcV4AoUj1C6TAr9OkCGSuRfOjC1VYgTrZhMgOblmLMhAMGNz9LbHp/2fRqqCZGuykA4Gu1MZPH4t4oNdYhjnLz1/qFh/Wza64jtVoteeUH2fBY33P+0PYH7pSOcED4sV57fG3F/7TDms94YAlDaJVB7cU8xP5MG0xiv/iwLcaRvDpK+o+RCLKhBUFCOpjk0QctNPdixxhMjOFz6gy4Vsc4LbbKMblVrU4jHVMcccnKlJWEHlyhWyss19/q6B/zUoxnbQPg6OyYpMUgNnOii5UKI4UlR1amOidJsf+ZluMyHDa2ACHsrhnmWiSKh1A2uTBw0MD9hOpFonawKrnZddtBr3xQRhqk+IUJOjQdGV9p/l69aneMLmTM3a3QBjMMRMDNOFUK2UOZCubiP+eudMcF4Mc/oWv1cnHaE7SmXLF1rlgyxQZ2yKbPwkb19iPFncAmWVPeLlSsFohOjAVfWJCjFXP7BI1TDBDD3c+jLcF3t6LrbIZGWJWyhkccw931rNUrD0iJVGlLwNsu4uZQyQSpRVrW71EGWpkzLtgf24z4lBdXmfb5xNR4z3pFwIo64eiV36lWcczbyq2mfbTwTiFB0Z3Fi3zn2Iu12LE8GBqWUIMmYEyaq35Gm+4hA0LLYFGQQc6KBY1xFl/mRDTO+N3pDHZoa+J7M5dxPlHADw+ppD9QRbMQFDdz8MYsdPNuY385prpr86eiq8kJphWjKs6oUUoVUcKGhFYnkf/0U0DNGKjQnOEMMVDYZ7x0fIMrXtwjjMkabcv2U8pR1GUziiGqgEd7P8+Ui3YdJxFxXBmOiEr7uI/s8DvfauCTF/Nric/dyIzNSgkAXSwLlviwPrScNmkl4cWinlwBQ+Z26A/N59dIqYMw7c+Y6rBLIzrvePDs9Kxm9F0zxioqT1gYzZuw2F35nHsndR4syp85/HWT4WG5hCsWHx4gorfntiMWgq1tvqdKVOxHlKDg91OYAP0corWSKDbIP6cdccRGFzKj+2Ccvc+8xNOjeavfmJi/BcWDJ4jnQ6OFPbzN8U6Ixs5FNe8PcvhEzIhJI83zj1CbrzHg+ncBbPPxq7lq1isqVS3SbYaKh1gUMwAgKDsyLMX6GheqODG9KckSa+eVquFtjdAtEwAgzlx8T5jeKsw84K9GqZ3a/o3vWWAlAK51oLV4cZYjKXr1WdxQJCTuA6IOA/EcTfUkt54nfN3Wbfx9Tzigulz0juhpugLwVh1T/ZsJYEozN+FnovHOO4FRH5DhgtVXbDAMEUosRcdggJJkFh5e3fxzcecqVM38NTm9TXsAiLdszebmEudIfNAV3DXWnheggTPQiCLNkDBWnpCs2MC2Z1WbnT1ufwtINGZQm2jctMs6DUyHbj0w8b60014dYqyZG834k4IOfYyeONb8jOD83jSE9VD/8uXeC1T/JL781c/rtmSRBPqwe32uWL6/TUMbedT2UAKSDjMj68I7H+CNm6oObH9kmblYnYafxWMOTHKbnjGQRKJfjxkMD57i/n8HJvdigvkwWI8q6qA9s6DPs9q1a5Or02JODwUD5gh8fiMOW2X2vLf2o8w7dwQOxpOxvyS0dUAQ6osEJYdy/Os7DHmJJ8rxrgb010BLnM9nWhCsu+paXzqUIbUide1aRJ+PCy1mAO/GlY11C+e2O6+C8c4M6xJS1hrVqGcaPssf0++y/o8UuNFUY2i5V9S1lORGs854J8kwGi44m0tXD8h1gQ9Ny6I/vayXdYuOsnOY2ssVzxpTPb2xCecWVV0+fVWviMf+Wo7kYR7YGjEfGTZ9bz5hNB/5K2GzKF3NAa1ThJU1b5c1mgw3GUzPhnB9Y/4Cq1AODxxwp2v1ElsFTRBzL5oHMOe5ljH1w07CCa7hwP4q5Ea+vdc6A5ZD36UwspoARIuiPM6vOc348b10rpiqB50DFdNNUDFQJ4INw4ZzYntmzQqIQrdKZhxzTdHXKLDQ3MjTaYPF2WiZEfkd93r+RN/YDAWnxsRoZcxekb485nQ4dnTYLkXdp3oOdkxU/FeepD8eWb8Q7UdnwVRR7mEmzCZkzGWZTnRGRkEdF1m4Amf5Q6Mza+IEUNW4Ujw5c2xPhFUarndhXmEtMcFQd9zPZF28+IXUrZaBt0wp7JmBN0YDy9rfc0J2ZRc9IeandH0G9o6xKXseEO+OR6gizhNb+hdybZG32cmgr1xUyJVL+JeP9kC8p6eN6Guaj5XNuMtP08cKX/Ab06oNqmSbErPPzh93jJOx2yjhU5xwkH0zAZtID6NUjxS6c7YsJfBlgE9JxecYa9O4CWJaAu/70E/YeYVXYqKe8ThmLHf0kNJiRK+uxHVB4zZvFH1N4grlWeCkCTDY4fI6sWtJLuxwxFHOkhPTpIb0cpwTZ0TkMDSwbkX+OWzQpYeIF6ts15tLSPRYJ6gl4s26raoUKkISVpgOdjxKxJM4bC0w7bqY1jA95PplWWZ5isO92vWa+DOsl0sjImlpgBCbwI2XzZ4/UjE0FZ5sDhc1dx29R+zRVUqc7da0OGYYpW+kuaKIHkOAgFmI/XdoHMfPqY/DFfuuwkXia0tCAWMr5gAXbjyyNGN0G3mE+LAnzOaPkSck/jnh9/6ry6rBf+oOoQ9/34qxwg9hJeZj4VjKd5vf8c44J4o8uxm8MfiaTFgJX4RgQLy0gRddGBhD7RXJxfCrbLHg+KXZ/AWlqokxGDs6oWN+KtXLWLMiV+NErQsapQaJMxnLe8d39m3jVNqosPcCXqbzU6UdK4DGlyHZRcstV0/JIOMsmBdyKCQ2LDfgHYh5FCThd96+wCnyOuDhrCB9dyrwibpazy4cZhohbFNvypKvXJPSBGYAIDIlfTLaE+o3hVaoWcz1gZBIdmId2/Po4p2ZAECQZ+QpfKGxyS28qYjenRhdq60fAAgEk7ZQWsDqKJ/VsEAt9hYsyvz5Bl5CEtxVZ3MKry58py6HclL9kmwsYNX0KbFt2HdqdjswjmohB2a1zdYtzFn9dgMGFSsSQJljwbfxbHq2WF6w5x5zCPN5uN7WQAIouX+O1WPiU5p9LxYfmU25+RqP342zXZAAikj0LrZUHt7v14umwHC7SmrR48Ee8tpJVdurOgwqLmlJzABAC8q2jHgwZXodChE1+2DzyPGhntMtfFzRBAAwrHzRNjfwaUjvCtNV7QcAUDBbRfngZumj4UkxtmCW/tuFccpgBQl/ezumgWupHHNZcP1B1FwO/sFbByJ4LbbaN3JsQ9YvJxSG8kw0AwAkCKCM+OfKhG1LMuxqmdiKpGN+1ov2LuZgx8XLWyrH0DXfrh4B7RJvPZbFMY1cCGLVeNJ4vXHS5jy2LIhuv256uRvvtXeZZp5Qh978OTytE+hNcDHNVUkMfGUO5YL6S+m4/Eus4FYd5mYHLkdE7omeZXPMOpyVNc0DZB1yhJ6wNF7tUFNGZsyQdTwnIkewiHc6JqavbIJL3s5nKol3wr3H5/h9ZVd1t2aUNmtWUlhfjz3EopgBgKBagp5aRkxYQqtKiLNjtV1kKnPC6zMBACHn00Dj/ro1oHru/ZjZxWAnWFf2bx3n2U+TJVy2+nU143I4bl1LXbiLCWql3dgczj6ue4ksBgCW1XHAyyi5gknmyyo2/1TWPPx9VHWLTfWa5ZTQLMXxX9rDvpA2VmMzfst5+PuogcTmCLAjKWy1KvUOLE87dySNl9dAf0l5AUq4Dkna7riprL998teynWKBkLaowHJAaOlkY10gXFV4Y88gNdOviNuF/iV0zEu098vn+6fogfb2Zwh7nOtPS9hayVvqfkq3Dyfv6jjt6UTdraFAtlUVn8vi68YMAHQLb7t6E29ZHb5whdAOY+691YYDHZ6BRmgCAJksmglIk9jA1LwfmNtROdmMVN1eEAB4modQjRFQo2QWeTylsAfo8UwFYkiPBy39YD3mRBTIekwylOscuRKZ9BB2V0TJYy7tlEo1GxBetVoEhtdnsyPCG+p3ruBtx4pSpNyxnI557d1Db38iCeYzO4E4NggSQPn9cyytY5bKaHy1NHbv0BefAnlsGiSAghLNm3UIykf1mUmFT3qSaNsIwf88/nsZXssfF1YeXN3HDADUaobroJIMph/q5aJon3yWW3Rb0wQA5mCutmHB9qCcm/XEVYMAoA3PqigRrip9GLhVjNXwWP8Z8FAZuGGkeN/ga8kd79qJvSc2HpSFL9C3l3hTNLspIzcsN7hjYzFL/KyYbY1E0nLxLS+gaQdslkj6g+2o2OfZfkkc5a917vAiQm2MeNKfVCyqAT2zsz8QdX54x3Lyj29t7/rEgedFbpMfHEgjow/B7aIrwPKLzQWYLMgpuxsz8R1XHSrDu+bgqri5uUDKX7BAvgBDAR6t4lcW7ZZkdw/mOwrMcRJvyI4Egj8CczsOjJJK1Hw+QSk80oiXnWdtMlPvZ1W3/1upueIUmRJcgDGNVmQVwDijk0sXSrq7Ov5NI0L4NtLnsL7QdWwkqIsgIqDuKH3sfOOPJ57MKNzVoaznIMWyePPiHFY/ZtQm8iytSZYagXBlYMcZqKgynQBNXz9phq9nmZLCftclw+jhTZ0KbRDBxsdv8hvY1OSQnNIUaKhAa0ieDiMk5z7lNV8AA+mO+FWYTYtxPJ5Ouw6lxo1RkCvuWPupR5dfnspqEE6/fsBO9eM6hCcG3rSoO63qj+STyvuxtEmd1QifiHOiOfWTT2KIfC/dM3kb4hPGky93QOxIjcAfbUHM1kv0C1SJM/QSfBWn2/Oo01lpBK+fhFQkkrNjs3/81V51GIBMhFkowTnqXrMpkqyffiGy3WPU6EU0d+OtGzEGVqYEccPJjiyypdg/Vfadz9YpJGJXuTBXOCjq4/8wuDYfjfjy72qPklkw3hfM+9Fnu+x7Rht9+DsET7IGvfK5zx4aimeXR9SNYNGMxVYqDfcPmIobGISKkVGE5nGzcKugOTtsP4WOEdAbm4UbLBbHp7Z0qHgc75FH2Jbs3f+0Z+cYuI7gjqSGizP57ncGLn46XIoFwZXrLGuvOdu3FLe6tOD96wAAW4ao+OOU2yKXFmOPMr3afYecGnOZWO0h2vxCk3sU8f5U0mKHjrlreKFDB4+IhwhNpfYQfTg7zKt16ct0XhnZsb4CPMclYELAO7oJqhY+x0J5oe+fcn1OwZ8hTrBWkukqCVvozS14MYRjUnfycglQ7UvsMFMYW3clrLFi3GRa8XqZlNpI69qAYcPucLJ5QprhihDqTnpXg4mNkAWvG2g4jnBzvJ04ZxJN+DAQoAbppREZUDtG3sc5gT6N/GODf2nGO2RV1Cz9wZpNGOmwb7VJG/3b9MzM5W7DJzCwCHN2KWigiaiiw99BC3lxXJsD5Abq2/VSPHH8Sh7sIAIk8nJXWAXAmyG5uLow2KKiE6O422jAQTrAdT4MDM/uRtOqCkKrm7taDpCUhDWse9/LRFKEaBigw3yI85ppD7ynTZlVg3cmRG1Wg6mvzmJpTQI0KVmTyJUppf5Kw2LOmQRSnbX2e+sTYT3YvbFF07gERuhIH2vpPbxKBW3+AYhc44k1Yz2WLuQX8rwNZHv/NWLv+U/DyAm5SYaTxDD80UKOo7eyE32sOLVvC4f3Se2gn+v2cYyq3JYxllmcYpWWcLQq1mbbfOHIEDH8SyqMPGgbdbpkN7J+6kos4VwhTzDhR+YO2bDVfe2TffBvcIhG2w5asO6TcpBhSH0gqzV8EG9+rNiQwGQ8wOTAYqGhXRQqAK0sD931+EWInFcoLmd5RBxc2ANBXEifoMpfzyf9DM8OKi5iRO9kuhpzRS7ybjatZZIAJFJVtKgUxeT1LSYiSfRSgQaU8hyi01b+f0aakEpUQJ6Wp/mlAShLRc+ltNxmfiEzbynJUbEcyuPzUqKNLCQzYdPmNCKJXSsxPBPv0Y6O0Y/DUmcNQVJ/iLyGR7PEtGxtc9Pa9x9CXZn2VVnJxB1r4Zp9gAjfrGPOu2n8UcKUSWLYaq+HFicSfkz127b7N4bBHs+egCqbBE5IC2fCr0HhCnO5AyeEgdy4QWNQyKrYuGi0nitpTsmKRfV5JOCeaJ/Czh7ZTXmvGdUbMuC4PZcf0Fjd7VREA1zXsdsI3J+pvtDc07WT9K2Nv6fqbPhV8CPt8taqFFjo6rrmdkcxjH2qfpr/mczFNQbY3W2pJTm48MU9zLXC59wsEd3nj99U0+C41XTe+I1oYDqniF7xpaC+OUQ7LScQ+2t53S+lS9FmmjKSRGh9KptG0qCo9nqLFTq85yyU8m6FayTXQ6Xg5iF0EpCOZvOlfB+ZrCdzRN6HdI/H1Q67JRPf25cn6MUQMXDFJijl/RT/J9Zu++wRF4S8+VfT/MU9vbvWIZ9HpaJAbOAKmTuCaJKg6TTFuonwS9xH1hDdQICunR6kLkbKSgAXQZjtoGqmWavZraBG6vT87moQCwHN8ECiG1lZFEJ3R+8t2r6nnWY/b29/0uvf+F1fm8H79cfY4K3qt6Xg/7QTf/P+kZns9Vz/vxm0rg3v/GeceTkD0sE7fzT6GH80ZHD+BqEMTeK2ixHrj0NjrPH4xhQSWswsY9IOSkjrVf3d36WEL6xNzFKPor3fE3lrFtUYcA7jLVzJAUU6z/qmV2wgWRNdggKal7sfwlNjqTWKL327eSrRuXjDi6UsMpoS9dwWVTznNpac2Nl+y8m14cZtUHtu4LaW/0ZuUDfd0KWbttiqnINHS3OPr+bYwGxfssn31FycKEcSF/guCZg36RpPLFhoNOjxcG8UiLGuMwU0iQXtcuCqUZZFBOlatRGjbNNFYGdpfWVM6fBTNWKuDGUGHWjxAZ9OAo5E2dieVVlECsTjmmjklGiImd4bE4G6P+PrwN2tqGBoUUC4yR6izWPTcWbjVkC4SIKmoqse2ek2FhDaJMFRBeZEjwR6RTGkGPIrL1+Tyx2d0HJ+K8sLQ2DSZa9R6/1Kcu+IJw22rXReGywl/w0iSAM6J49bBapFhryQpxr78SIIGerYs7V5wzhCkYu5WYqiWNF1QuhcHGWkcZ7fzxtVXuxKXHewbzVu1ZPcxD45vuQwjJenc4h5DfXoz+FQQNu6oCStP39argdXNDht9VA/mUC6Sxp4mHAG0Tmu6Xz5u6j8N9w0I7TBTCbLf20J2mZ8FZnOyP/JorvBHzNU+Ia4AuVaP4zsK1+UwHfVs7+pFTFaO3etrtqis/osgO40FHTaddc0XOYRArau7/bbeMW7bCy74oJdrMRPxHXAFvZ0wauTQMfJCcmnN5xt9YjUp+LS8fHScMfMxdGp9rSy+oOJBdwVDpds0YvGKeYhohxa/LNc7zZny9WGhiXZr+cBDbjiBkCX2a/lHIkX4iioWw9D0y3jFKXdiFjw1khV4TQeflF/Xiz02ffqrKR4JJD1G2LzL9uDXh0i/fEos/mv6LG8qSnLco68hnnZj1+FHmeXYk4Lk5pHOqmr0+tnwcr9Tfl2HeH8bo9++xHv2/pqBgcxgeSqgEkipyZPkAYo+xsrZd5H4D+kxx5odH6csPtIHQGeO8JLCK5SMTDdZVnDGea4jMryeYWWWFjno93GQRBwZt83QUkjA2yZ8JCaGANhMsWJO8sC7zeBQk1Ra0XqI+StoXGvsQHh4i2G3kqyAOURhY5GienrNLD3VECgqVCBfaR6pbFx4loNd7Wz5OKQZqc7MDyTC52T2MKPIxdp2IRFzpBrYS79sdGlDOSfIYWk+uMklqS8tIMfl+atE/QCN02UlpmxsUz/EIolQbWG8bmKWJ6IGTc+ubaUc60yi+44gVFZg5l2vNcAI16tsgt9dlZtiJQEvH0ECxsltjc6OnLSz4LLRsayjxYyJmjCS7J5CiDiWxPRwZRcRuE2DwNPlXvG5NhA0UD6wDDvyFUG6XtcNmCE2K5r8w6R32j/5Uvr6B6ZMANxUh/hB4UhiZpwv3G/luTW8eNHPs1+Yk2iOBRsSuXIli52ymHAjy51SUk7BPiwnJzlKJisboWXKEnFpS7Y3OpY1q9uaSOigfKNM7CvkOrBpoQSWM3hTDNMca3YV6u9WWa9iGcyHXZ5zjkbBFBWMhBxTRm/LUpiF3+/Gw0slemC0qFbGSukFa+G8MY08J/+vjp6MvzA7KfUfSKFWtxAcQuiC+jvGT+EV0B97Hh3fNXDyZZDADn9skoXEyhjxbSQrCNwFK1Jb+VIpmo28PillBLmk8uez4qd12nse9NhC+DmOzuYTy6ruY2m6FwpXXZMA4BJ3PTuhMwztOs/t3TpHnNfjp0vp9y+DC+an6grAwFCdtmMbADZ9Pt/f9VeYjwEGIXSM3p15DR8E/yETqoPYTKYB0GA/Nl8pp5lu/ascqcNnSn17ixJyH5kdjjYqB2DAN/yehGJ6X9i0fIYVwHWkg6mAMZ33jKdmY93GstbMM37DyfwbdewgR/rgfZa2SttUZqSVQLv4yGPV6mF/m71wRaVUswrX2aBeGsfrzc0mdDN9GICVQyfDevt+VP8Yr5nblRWuzgAtDAPkixsbNMmYUD/nvGbKdwotGcnPzRludAg4CTGgcyNlV5qKyXMQT+K8WIsu4SuwFxzl9SOw4Kpxc/ZTt+mcT8oUyl8VTIvD31MsIptbQVhAJ+1qbaP1o91KhyyZCwmX0LYPMWQdP0Z9uo9+QahFtmpqDHrAGmbVnGT8f8QjkymZp8eJgR4eM7LaLBVT140YQ1HRhXAlT7JtKXtmWQkOWf5qEJ6g8ypxlIA7HZAR1Rt8cEzMvI433s0/+7Pr0zng6Oa4vUgvqn7khwO/h05wS85NDdm+5mMw43KbQ+n5+HGbhjtPNzYw5qmB3LYcWRgRf+5SieZVifIiuQKeVKe3JRVSMl9c/g8wlHjiv2K+dVVms+xz3uyT88CyeYcmGHVBJ3Rvm4AoIOqvBhhEujgOJGsz6VrBLvTymFQr3DsaXgqWyv2fNDT6qA+dbP8ag0SukUE3EXIneouu0oSbMWuZbnlW0T/cgWnsPcfAJgCYYfm59DwOuqWLnjvwnDQY2+V2sgS8UedKNmkAE0AVE8igDbhGyhvNvBBdiwZ6NT/th0AYFUdwxj/6GM1jmG2y5m63Y5rnqnrvwwyIDPV0xROQaFTlW2bXJVtzQMA0AvvWONyBdPUme3AvLHZi4VVZxvWgHkbgVqSZk/njeoLvmOPN5Vk+tXK5M020//nwUwC9ovt534iWANLQdWYHJG6YlfkF/nb+tW8nakyiZ+3VdsAqsF0dbj5vsl37PFmLsxMpfjUSn1Kxgq27rv9Us5HnG9NmCuzMd9/rA3xukbW6HS+QniBeWrfNoC5Nps35i50BWnoKsM3/Td0N7taf9JKZR8QYZXAtaZK9lTdAICWrwH1sKnrIZ/m+lxyXXPn4aBmvcKxGvRUtlYsHKuhp2yTiKUui4hWj5hwqruMSBKoQu263LJ90b9dwc7t/QcA+iYwL+bHY1imum0J1kGLdw5WaP6WBW0mKZjgwFxt1z9RIHAF35Wdfyqre0RN1fFaoBjLuS2NSHDUuWRP1QUAxFmK2Jcj/67Erdcfl/LrU56ejp/ysVPTdl59S9ZzLFGZyqZwXG3OTlwkztIUTu7ZUwAAyB5cC+jw20MO/+LtZD531rBvxW4DS71fBwCwDdzOlXFZpPSShegW6j8jl9sIS382lX8vwqKsoX8c/Y84tI/dEjBW1cbvvPL3woY/d9ucEQQC2C0OoXiVk9fBImiveOyPF4/+p9coh7r82b69Um0cgI662p80JYGzttbPuzpPX+F7+0UDf3peWaLmQnw029JL9iUo2Kd6wrVXVVEm31MFYsncAMAJnoaUNsOWcmPhG3KiKUvKYR6fCjvPzrYUL1whMwojZfGKDc4rGEXJYhKxhCkhCREAsNNxqLMEx94EEy21oKO+P14NOXe07x8A4MlAGpof2fmzgFzTXWqJQuXKGQ7wL03xhuyVZSq9NtxEmXMrXi2boKNsgZJ1Rwg6l564mpUlwRZH7EbuOA03seea8iLZCFw50NdENbPh/dUwqu0YMeBr9enTbu5vljhn6aqOQTL4Oy4Eg6/Q8GIRV41FKngMQsHfh0zwuMMrqK2b3Gm00/Z8/jgEgstasCEOLCMNbEcY2IoscOuyejKSwAKCwKW89r2ZH7Yn85sRAi75BNupMhLAHgSAn2NCCDz77fS3sMBO/+LD39/r0FNdSgn5sJRmYK7V6aJqZU9dyJhzs6UkpNiUD3GOSCBQME81BQAUHuRE6vbQNg9xYvTaoVd8douam8DUrIpX0alAWtqXBwAEK1zW08FdVWe+tbjW+R8x18fm8rWLPxISW3F8bVS5JpAMJ4sb1/ZB3ZyjUzETC23iswbBujet2stRyorRxyyPBr41N/VuKN0P6XrFw3xvd6m/GP3W96/AP10CXKkt3i9iNOs3sS6EUq1Jw8UE1cUweKLwdPbfdQMAnqmpgBdhzjbDgm7T3GVcBVy3kGYcsRgfNOxtEpPwtxJYbYgAAChwqrEE59oafi33ie+y9S9Za41GTLf+AwAqAW1f8qOT5I1VM1j45hribNZlp/AhgT4XFNeVVrgQU+C+7tb7Elyi4WTKFcbRVsfnTgtvI/ZwJ3LgqLtakwOxGdOFe8GetnYAwCVyaKh8C3EvhInbLQm6hslKDwmDac0DAOTAkQPcdG5ZPdorlZnCClfk0eZM9pT06IamYWr16Kp7oFA6SI7LLStPt4eLMpqyxH4WHxTphaF6R44Us7KinkX/sQa/U6zuFxTnBmMDqMrRPNlbvcQV+Rj0I/l9PKf8QJleIeYs7OxlKyl/voAv1fjPKpK/gvLcdGwAcx4299KnFF3neqXmVRW2CKFcy3XRrKpqFtdkSvZU3QDAts4/9cA2twvyMthtj8ZL6hZSTW+vKEdH1aOCt0nUSei0IQIAGIKbrCU41rbLc7lP7GP0b9PwNvf+AwA8ClbD/FgFK62ai4E9CMXrmKmyDKXXHiut0IGyQBn0PlyCjrFBKVcPL9A4tkPnmPTsaK2T0P0hf/d7ikOei9X4EkcH3Adxi4QU0vdvAwAgfKrUb5tKBFXte5qvUm8WRNUhqXs5ZZC4pDBrA1JEO58UzuPtyzDKOM914mzM4cxpH7sJAIBtx0XVTGmYMxJUunWc3NkXXbl1B8zK57TsAAB3hQtRRimiFJVmxgNFUOJYUESKvSIAxBEcVOLA7c9Tf4FtClTHf5X6MpVS75T4qg5lZ88kyGkDE7inWY4b37l90cAv65P3CF6u8aR3XsFw8Kp6YAVWC453lyEAkG0EiRsp1Ga9UGcnh8opAxrl5NRJdLBg5+EEPv7LZlXZX8Hi4FitHgmWBbG3BREA4AwFSh2/hshDsXXZ/redpokXbe/+BwB2wGYof66irJpdhc1rsqtgfE129Qy9pl5Sat0toKZPuNHYgkNWMR++sfofm8PbIF/47i/veORf6lZxgwAc//8Cp/mTWFXmRl3XTDGqk3LfhBscQ9kZkax6fvqtw0GxMv49K3txxAKue6y0+zDPU9m1AI8i4XCnw/LVJpfd7pofA/QrIIuYzPWSaouYRAlcHIQ6C7GXMlx/zRXxEMucKr3afA47QRi8r6E5GX52wWCLLJXuytdNlhWU+pIxaouHKIEWQtucPQUAhDYVMq18OvoQZTFupxPzxalNU1geyldv5Ys0Z+UBAJ30anEYny+FU+MM9VQnI9hAjUuyhSNQm0mD2AXcur4os0yRroknfCZnpOc8WyW3hSzRH4eXoyb1wtAXAk7f+yivyZoR2lSWqzGLWaKk8LY7OHU16+C0Zh3rOhdGu0t2liEA0Nfgr0eqnUWTsc2YQMeV83eb1g2POpTCg5t3t3JIU4lJjAJhS0RwtrnCp7rL27BE1wfPYesf0gmWjBbd+g8ALAmu++TPTYBTs+uweSC7CcYHsps7D7XSE5OWBMqNqJzCdIcT92V1EZytpIscA85ebyAJAtddt+vZBu6qZMxzJHe397UDAEYV8Mx1fCaK3AP325kIOQlsrDiqqB4d3ZYHAKDUvap6TI/GbS2Mps7IBQNjs7UHQ2cbXISh2Qbl6hfuSY47MWfNR/RZzQnON18MHLkLQ6WGHFFFZRZ6svhptitOCx8ct221BlCBoXkCesrFT58R3xr8Pcbv8sKZu0LMT9coIzx2I/TV2I3Ub044b1ttDWB+u95YmnLCc9x9UDN04q0znLzyDsygalJ4Ik9tFzgA4G5/fKpb29xDyJxg5xvrl9UsBHKJWBQaqmJMokSoLRExvcX/P9VdVt1GkXtuL2ztRf+2r2dDHW1X6z8AsAOwacifq4iaZpuweU12FYyvya7uvK6VnnnYtgC38MjazzoIXME25Wk69Q2mpryRk7w/9kM/5vzQL1mvi6z5Osv+w4KdwzVg8vMOH7tcf3f7cxt/Cn65+vL0/q+ibAGYi8rjUWKGYquFVEg74QiUwCLBzBNxjcWVhVbTYdQj9bZ/83/hKo8B0eMIW2vWjVZHXw2WFKWi99TF0xmldoTHQ2IfMc5NX2ZWVK7Bk+rW+2jl6a3PXmdIaQh9T3eV7igZaxlYj6irpzOmUq3+BExu4ke3UtnTFN1m6AYX2SDsmXOWnpYekNuqhYK3nS1hLTGQhIXaZbD4OFGo+npbw7/7pLRl3fpKdK5e6LINpLtHR17ugeQu1bUvE0Gy63dT4WbpXqrb6dNp5bP6i1pw6qF0JVGFjhe2qJWNXbIfbJyRJOJsUVtl1PhPYOs6VU4YSAfXO8TuTbL1dJdCwKp803jaeJawkq2QOLVrWz8a4wUyESbHsNQLqs7SA7r+6yb0jyv8e7nKn+sr6vPp0PZxI2AH21IATs98hCbqgd/tZWFJqwVrQm3a7ttXAOsHSp1i6bW+gfirWKfu+y4WZ2lepDfWG9QhbuVGLNzkNPS0fbb82XNyaHEyp9Hha200CHX4ufxpwN62ZUa5xUeqZfqaD1Mng77A86HCfYZSuQyVmI3MSgyVvo3hKuPSiN0td8o4M9E1p6HaKrS1BFv6bPxlxzuv1k+uX3TlJVyYfYZQRy4A40VPX9UxH8I3QsqbSb/calsbqtvi6wLpIQMGG5jTe1fuJqJuUv03uNowSu8Zm1IcwiR5Oj/EnJsAkaQZWqeX99PFa47Vby446IYw8itxa2HO8NAMGVbKKt+CkHreumfZ9DqcnzV/RSVtTlgqyHrjnVUTDKWRqHG8Lu4GVfW+wpSuYyJOV102KOQnsTrbfcea7r1lMnX7hGjB+gxmvkDgD+J0Zzl3taA6DAnnAXyTURIVohfguMMGmgmx7kqwjQcxYhPdf+q2cf4l48gG5SFFPy2SuGWvAw0AJEBRxWKVGEDYMjCh3mxWeFPLmZuVWNGsyCyl2X++ZozZ/RlwbaPoq5nsfditWeWK1KMK4U+hDXVTBRWSa1Nlxe1ljSSQ2QZ9oFhYQ2iZSjq/cJjNE41LrVUxqM5HhK1jFCoy0sK/mB3pl4wjQAbQZQ8A2KnxVzAKqbRiBSleAquW3/9sAQvFi0qdv0jUG4dIMc/6rNkUxCzOSM5sgKdT00aGFHfyWapyClhmxFV9llqOAMsGXbNOl/sEuqBiyx0w41UkFrYIuyruiT3eK4B7dn7sSmzbu1l35bhDiRslTR4pinkjwarG06uqPbmqAUytqnqrYNQapb72yc0Go5XM4Lc7Ru3PiDREOVXLt44OiaWAdinV7gIml+9M3+31c3K+evpbTGO+T/Kq8bxUhEwyUIGbsOC7qWbbVU1/u5sucLvkqiymQQXqu+dWM4t/YNcsaahQ+VJaqVxUnGRnYhwoQNfh+6yNzdAZYNL3+KR+3avy/W7nHZ+RqoAbZ4FmdiHjEUET5WR7FqDJpfyFseeM/cVt1iNpgGWUB72FW+bI+oq5OZ6KWbKuaELOkas4T5V/XoNl3P8/o1gDMyIH2LLs4lcsZZ/yKHK4l56cHtYBNfAz4/vxZTwcx3bPvl/V/vpO7QBWG8iDCf64KaN+gPSHWHBuGmFqb3NCL2j+07fN7Wq7TNv9mIFEQGJEU0eSzTve4r0qh/xrpJfU4yv7y61SObWaXdLTMYs61eprU4ywUpBrW0wAAHdDO7XxsSst9TpKwp39IwqnYvrOVAFO5UkL1E2capkiqeegAUTbXIt6naotOy2JNqlhRRj1CMZFRwJ27QEAds9rv3aWoZgf5mBiVVNXMBeB2LP/VOAxj6bUGNihKDgmiNXjrQiBs7AraZfXK7s3Qrgr8iMceD1ZYsWRZ8fO4OLRtP0hALCK/LTWvj0w0jFytxnYt1YlBXL3ZPse2PPZ19/lpTQuEayszhwPdstmnw2bbSAuAxuKiN0dZYN2XR0Iwq6XUk34vt2CUTWMrr/0oRtA5YvmCKAqz9mjs9mLYvdL47jQnP2X3nQDmCOvN7OtLMifxCNWXf7HKtm4ufH6L6nOt1hUt3bDxD4ycBUxDC18gmpqJgBAGWpJD/XIYEFKOmjAEUQOn91BWm1QgRyVNIDmRNt1LRaHtaWzKNC+d9/pdjmpKUEkmLkaQADghsTxzwQwpmyuYF8i7h18EgdvVOksK15EASIF6+CipJC7xS92ZeZBweDPnu9n7oN/tMKbkjkzU5sRjtIAjpSiliy1UAYR8oxxLpQyuBzq/pqDpKwBNABNFByBhetZ75NQNgXQQOjVclgQpZYPAEBFnHiVsEhbUElXP04rgEPD+j+v6CH25cv7B3uFurVlkYO9TbkfDawaLbKuTZI7abx2KevG9n/ZwzWeM1wKO5jHzCE4sND6bQCsZ1L9svOWKThniaeY3VgLOHbaOJNIhfjAogtU8Xa0R59R5UWJHqteyjdLsO59yy1a/N26q1M8TNr0wgfG4WSiucnd+sl2iS+9U35fRyb5S6tnvSrR44v6sAp3yfbVJffqNlbvVSfAugiddLTC0DFw7TIBAFzQ9tr01ULssn/U4NSevjNNGadepQSaWUqFDW4lElsC3SIKALAaBscQQaBggX6ARWm9WKbY4l/dfIFkdfkKeBUsHKfapg0AqNeTWWphwR7wTnbtpxJd3GjVbApuUIubgRuyUq2i8pILC7bWnSt7Z1QLXKGlaLJ0c8KhKvDqsibtYju2XQv18qzYKSrXwpy+EZoLTo3yZhpOwY5lhlFKLRABQIZw2toXLKP0Ru6CA3eKWEkNFQKK22v0793VbK1sa+8nHCfd23lDkZrrf8SkhOFyapIfCYmtskhh5Ms8aG2RRseLiGnH2X15uOMUztyKwStMOeXzQkzuvUbmN+v404/wRPurDlf1r4ZT06zO4RUFL9uVwnsMNrtMAIArKN3SIxrRmqyjJBcFoLluGzlB7j0TqyQ4oZKzSkMupYRri0QIEktEKAdQF85CAABkeAwRdvgBlrjmpjxZYirHNdLeTm0AYLtluk6qzDnhIt+cz5uVVVZNM7A4gdg3xDjxWIKU2uqb8Rcg71ZwTa9MRtXKexICwfphxHtluzaG9zpGuFmOYqzKezOwGTt2ECNbLRABwKnh3dW+HBntKW6XgDzckiq+oQcr7qoifHczZpKuv5/YgwB323/je8xVkNnRYwYie6nH6hiI3YLViIitTdmYNLky+D1r8NHKjSc16Vyboetf9XIbQB2GJjm2l0f2wfzYbeWh7C89hxnZ+nPZ2t9tADO2NR9FJCT88XhFVtLf4auEmant2HizpnrPJfv36iUdUusb0KqFtZBSMwEAFBZbVurL3lNsgWQMSHb8Kmbq6bOOIFMbtKG1SkIxg1QbMt40PKwttwXRxJvVwdBgIolZ9GoDANURW5xYeSBcvItg9K3l6rJJwthifIR44zbGsJVce0eKwbN8lfyxb8TgKyKsPykUj9uc4bsq9KTTsx9NvYZ8bl/5U1ju3xTPSW57DSEJSF5CRgo4cuxji/KWX+lqofuJC/nas9c/Bvdyrj1Bb/ArMytae3asgPn9cpRS5APt9zkcNLTMDtIn/+TpX+tu1vV7CuegR/Ws5+U4f+S/uezY7O/7rjqIIvw4EtiF1WjmG08/68cho6na//wfuPKQUPhHiA77I3/4x/nfAADTf34Ly1PrYdhSB+a72rTtrLS6bZX9277Fr+nRLaIz6YbuGCqDbjhxCaVUK3kY3BWy5wMAuLrD2Zp0xcvhMqZ8+feM0+ziUq4iP9T7fKqtLADAzT1Hq2Bc2t2X6CxGtJaa2c7QDrOYdpcWT+8uiMfnpz3Thvgiz+hrNrA9zumtVPRNmpQeuvSuTk4qvhsWHMdNviZvfB4l3VR8GTYVVJvDACZfNsdjyTaDV8c5TuXXvvOKYxjxp5L3fa5X5SK1nr6K8Dp1bQKoZqCLtp4FJ1LKFCimVNjtI5BudK5bE+HmXoH9WQgAgOANDBGDUVt0wb7mv0hkZ1CDr7xP07YHAHRulG6yjhSzNdZnjmP3gDlnr9TMyTjnXFslnnj7SFNwbjaV4mSpXqDI8IresOFWKlCKFMBsq3BxPiVddwQ4B/2Dd+qMWBQqAb5Ud/ssVKI8zV+0s626zKHHAFPMpeFfF+4seLtleMncGXfxrxW77lp2N1nr1Znn/TMWf/mpKH/W3fKqdINv1XZ5LgIKWY8RCMHoCo4lMynptxWCdOnwdvzCCZzDJikRnwFSnznxONqs12fOAwSwE1U9zu+rmpH2GaiEqEkT3lTJv/FrrycFMHH3c8qt+RL0PuJUSL84Xeun6yUgG6XcLiTk+htjEYuVHM4xIGk68xXlZSifyFFzmJYGjwEDlT9TnvhhJC147nujaVXt/kkA7Of8l9FcdIQjWjaL2suVVys5uycum0XucAjGMD3HZzXc2Scq1wGa4jEgk20HS+5o5Vaa/8PTis3lN8FNjDhdv5/Uf9rtJ9BGsQUoBQgUFh8TqB3h6nra+9YOXFc9uLd7S82Rt0bxMsygBfbvd4VQ0RZ0MVRnB2PXpjw5FeQHmuI00yd4WUeugQZZBI1eXGQnBComzc4duCZZvC6LHYvxsmd2odJmBMANdlAraIHmnO8tjUxMP5vilGhVFgG8uwvpZRFbkEZ9A3JsRqNIIIzYbFo4pNPaheC1xwKxo8CrzozAzV9Vl9W1A2w7n41NjlTLfAVN7gDIf9tCEc7ztLqHDKmLBPpDizlBU6FdTMSZlgRAKVfas7ESI4rm7PCQb5OtnzHA2PvcTvxyokuJw0CQvqZ6lQrTlQOjhmLl/CJg30Q+jMgx3PIfeYfIdJdOzer59KYm9IQOUZgJBB/h+M21+2Qf7tuJ7ExZJIp1e8SNVJI26j+lLRKUqwxCo18n0OiagUMBZmhN8nmxu7qZdad4uNzu9v8kZL3LwQ/ctHn3IufqsO6WwZZzyeysylodGWE7ZqmRW6Yp7gauffUYcW2VcPXrRl6CnDwFdfEWNJjHoKbzIOcHiT6YzGxHX/1uaduKO9YgXCACfA09XWudyNVQN3dDJrqcnNzOFAvp3A8lcUH/t3nr5vNFFMMfkYVPos5oZDbfRPP5J/oQPops/BS9cZ3xVV7nYJKBeD7LNVw6mZw+39VnCHcszHuEnt2cetQpgRy5uRJSR5HWDK+sNLadOapYGtNQi/ZhOKEZBiUxXY+JsQxPl15PbJfi6isArn90DUvhaLTkuF3Hu7DTw5RcaE9Q2xKcVsT0QE8U2tJD4lBKgGzeXKORqvx2y6SpRdO1ZNX4nTVHZHNUiesZeOFLJjt17IvwVphaN7O2B2J6P6QMx5ftUbiVVDvxpXvRWKgWO32jdnFbXIWTrFz3LlXFLmH9O0IAINU7FinJvhTuZsSwW2XGO7G7FRlO/IhsxyJDyZMPOxYBGW+b2Lazl/I4FlK4czBOjXE2Ur6LjslSsj80d9z4d4jeOyUM4YXehjiGVVyK1IOUE2HSHZQwca8dBQDgDeRiYDBfp/FakIRq+QdmmGlZx8rbsn60Vn517hpj4NbUrevcMymSey3NtYgAujF3ZyEAAELVK4nU9YVLwam6f5HI6V7zKbptDwCY3nVZai0pXWx9UKjsEDzKUjPRbUFUlxITXeEGldNGNi3anCsPrnlFl7KnWnmEBoWNx57VRWRi4RVmc1cWbCMMmaubVHcbs6AZQN3yFfRBV5drefeS7Qgeneg+7j0JABpb5D01e+0GgOYQNFjK13Li3BVq8Mof1Ce3Wx+4llCepcqeD6QaLG0nBABgQ6tq5LoY9/bYpTBze8V4YLPnAsaMgZg0gImYGNKUDZppjqlGvtE+d4v+v+Sz9HQN+UYIeAcdAsSOOkkTT5jiC5EnvbrgtU6hAwjyj8z8rjoECCjImw8TF0F+vdr8c6gfEr66gwny3/TVht0E1e4W1H5ujtpp1YQnI0ri7DSeGgUA2GezkpBID6Ik1ltHSRXbv8bhdMfomTLz/jfpYgwU4pRei6TsvERJrm0TBQDcALyehIjpgL5CT2Knh7yP3bYHAHS2utlbR4px2vrMoU7gmHPWUTMn7ZxzJQPxpDcxdK1h17fJxgtQgLqib4+2VKlA8dQfU9uupcrqy+KJlTUO7Puu4b/xKt7AV71jHT6WA2SVZMjEcFUqsio4PkuWbSi37SUAQFK47Z7QsJ2gYjUHaXvk3/IIeWOdtPqoU+qI1fou7uQLlucl7XjZLKevwTGUY6TltXwAAJvFXY9Tlps2GEh9NUOafJDeywIAjGoAppgoAR2AWWsmkCn7FgOUrzBMlCEc5bRxR28U8VZ9hkwAqtVuGMfAmQ80o57AcnXyVanaNuNVT4Af225jHu6mupqAYwhes4re3MfcPJyJMI+I5YvO1Y4CAJzJbZHqKgY7AnAN2Rs98zZknzHwAvKWSfIaunCzLZXj+mnawtBaItOjUgwQvTURnl/Ac+i0Hx4AwPbBpM0PXYAiwiZd/2+AWmkxd65MnWnjAnCz6spwu7dUqeD12ADGO7il2WD0fkFE192CvA7Vok9JdeHqqUe58ukbopLjY85GisZP8h7vpINZ+VHO/2kB41HgnWvrPhQaY3Vfc6wyg0gMYyHFmEP4BShgbO09CQDm1OTjw167AWBSAnNj5UOxly9xSXOgcTuUnB9wZ6oCT4ERvJcQAJj1AbSocOBsKKPmUXUbaDRZLZGphLaGTCUhBOBO9Y2ZCsWbwP8E9zBjLj503uFYPqadlK4hn5z3ROs1/B3wWOjA1ae2xFCcsCpu7O0+p8JohFXItWFSqR0FAFAJpw7SdA0AZUoAxosUjvP51NHpUkyrXn6luzYGAaBUS6RoLmZ3W3cyYru3/nkWAgAgW7JEtsiwWxNx5NhNqzYAgHQBgnRCZVrmhxvAxYZNXskhAq6jxUwXEUjMPSvFDNVfwKTDq7p7wVapUJUDirolwbayWKjB8WW5VGWhhsqLv6kukGCHwXm6y4HAqBI2EAYYO+EBNTjMntd6EgDQNMfEe+0GAKiPHERCn50awyOQkTt4AavaqnBQ76D44UXtJgQA4ssRwFPj3ISn1NAwEyUyjdAWyTQSQgLGsQ/OFpikuP4cLDxK+wKtqiM/rT4dJYYCgqrQwjOZWzUwG7mSwhfvKVGVFACAgY7RRz2CGaSkbgmoESRIp+GzFHSrDTLQRSOFWLTpEwUAUE/KWcyRRHzyxy2DzicWWLV4AKAAM8LlpoWvby3Phcx94vYjQgXiWytvi7ZOY17L3ATXXYiQV68y2XLS6qSjnmckYOTFNMSegmMCT0pvE2artllYq3oI2KmgBAAS5rZ2NwBUgEp9yh4Jy+Ayd/YDJKNAmWnQ5mRcttPVn4h+HR/+z+BVWy/oH/8pJNERHAIEAeQ34yO2y5sf5U+OY2D9iTUJAMh/fUczx1xZxdSfDhte32iYN8NFD9iXAgAQWKneNBUDDmxhp9EAmgNYGjTsi5JKUQcLNm7btJQd1hYhiwhOPhGgq/EAgANQAenASZwGlY4LtHBrcNP3YDbJn/hK+4jt7FFJ7Hnwepc+tVe0hRw++sV34k+aSyMHS7CVTci2q3Db7Wk8hQkAEGnYgWG20kKqOUiHyL/bGgjJI2+iM9sLORUqFwtrzhJKWw7lq0oU/HN3W/6Pl87fDhX/T2JVH6BrbX6ssCdTc3VK407DpOXcm1cSnKpoTUI48H4WAAClgndHuFxyK2tB8nFDZrza1Xt0GyVmVRkIgsHdX9Sw2q4Rm7Tqv0JHh8sphrXqXIdTNZFphZYTTZZqTmbyUb8lPxLO1WeIxCTiM7U4edzwr+I79eEj41TdY4Q7UDeq6gvjH5nZ5/rNCDMLMZnGWSkAgLdBqPfCp2wA1urn5R0Ut58dI/4aXEuDM4ODRLpAW/PirRUPB2oyxws77a46BYc3kkROz7qrIHvzLxLJSccVlnP6WuIBAEKppAr12Pxo/IzCsaZUU9Aa6wUNS4uFFKu60Kh/a8SiHrDVbK4+QjCIinrL/dzA5eJSChgwq22XPDArbnNzbZ1MHP2N98J8LWT/+KC3SFmJYaDvCyqoAl7MY9PDMdkQZdtyUvCVzaiaLrcZhMfF0FPNc/5W/OX5jtFsn6Y5zolc7zXcGe+UMNafup9alkVxW/i53Ky53X0VCZGr19XcewufvYGCtIe3Qp9LMWkPWs+uhsqXgwbYMVKe0Gh3A87BKSEDMiqyIvQUffSBoLYex6TkJ32HFf8TKbdWFBnsaIp6SM/SRX2fQbFsoPhi6qVpg9uwJvK3UHQQxc2EKrJkjUABNCErGi/yg+AClLHCTMx22dXH5b4LF3jse4iybox6D48xW2T1HjlAUgWnfcd9SbXTw29ckBxGYMzMlYYV3i6304NBIKREzsYcPQt2VrLZW0ahg/exHLnTjCugbBxCDA97mY3peZMTJcgGG+uQtgs8137LZiAObHKjoFYSiMo1RIfr0xeeEN+wexXsTS1jOycDuVzZzhu0652T2ZCm2qgHKnQhPiBs/nB92vzhIDZ/sH/tUd+uT5s/xFw9BmKIv9H0ljxACkyBOdZ46cmZnvrO/w0omBNd/HZwATAKCVD27CYEwgX1SITC9WDzh67lxfLIe58sOZ5+T2HkkFV62pSpQW7wYR5+qWcyPdab6gqd/qZaqx9QuDmoTttfepvmPnxICqaBWRc6dHftjBU5jKWhmQ9wbKnnoNjL4Keg43M+60laQHQ3Sum/GQniVrhI3pMo8wTCLpAOuh7qePopPBDLqGh48kP/OBlX5SgUvuR+QPGDhABA4BQ3E35YOwVcCJbJvrejTCxkPAVQ4TrZnmlQWbgPHi64Xbd5cXxaLw/299WZmCavAmb3fidUfmZN2DhSrf6ahq5rYHL/4bg7H5t+WiTmX5or/fpO+8Jd7175sfprZ6YSINfwEqWFzEUFZNduJnueAoj+O7rpO3gtJxOa987dTnELXU4xCRV4Z7FO/DRahP4KPRSdqOGWotxW3ab16qZWAWqvLxm8o1Nf9qMAAOogVlHCnEmHD+cS7J8rr4CxN0wuerbF/FOgrTYGW4a2YJK2jsF0+y4AMAspF0u0lZEPdkQs3JbIe/wDL5I97ogHAEQhTMkfcS2YPRJrLqopHkywMZYQqTulmpRsIXhfFdReR7JPGXDjXFNNTdf01g05c03N2Js4fYCCTgjYM1CIMMwuTHJWUT8WvXMRjJQUp2+b7YZzt59MAGBHgA11p4RFziYMAbE72/0auJSSWFFvUCg9Nm/73p31d3nsECdUJ2NH7oEqgyy5m22y2SJ3ew0E2TBqvCcnOxfU7PqdkB3Iaxy/nsx5HW6IidUnusDQsK4ahlvn1YSf7mJS3/SejQIAyELLdIhXusipGuAKx+1nmMv2s621+muwJQ22GGyJpC3cTmUfLwCwYwaWmBtixURLFK7F5mDiGlPo3AMAdmlZYVLuFj96Uo2XQqyUiSf2xuFRIl4dhrXULUQW783TY2yxkvzbx+WS6PKmCNfhxnDiEp7RBA0YTMKTtq3nUplUjTBQg9sazKZWJgCc4XFJlTGgIHCjyygCd3WxZMIqbLDdyw+njfbd7u101IYU4t/u7A8gxBC/I3X+eo/+dMq+WZ3tWYYXcuQdQLymQ+uw3UKJYQHblwIALNBSXTTQgHfw3uGzdVmAvFZsoAUdJWlB9fECAAJWF92ByiYut3Q69wCAblRqmBRL/hDTlzgBTig+N7fiAFI9PGMFFHAFVPJvfA3q+Z80k3cUO/D/8ax/al/gaT/5X1U/+Kfqi7ytuzom21V1WjSVUx4Di40Tw9UoNLGDRMq/22OVOXRKjmPsZ+NEy1Iw/vHKee5kju956imkLp64Z33Py4E+37iSAwCMICZuKa2MNpPRf9egOhp3pQUAWEFZ5ZIuBQyOSt5JmTm6jrVKMRFDa5WmJmKz6qrkPQVl/AfslkKBbhM/cJR1T9X5AWMJfkfLCepDfR5WCN8QWnIes5ICAFSxaFZq6MMQxUEXtuK/XfSrQz3ZM9WX8RaNhMFqMSV7wjc6GNXjAYQRpr4LANyyvIkqCsbSEk8PJmIwo1o8AICD2/oHBQ/LJg6eLcYceE5LETBTvk1YpQRsyKHZm3S19kBz1JvYOkMAEwJoBIH2j2DD+THonYtg5EnY6duGTBjp/WQCAJQDEK47xfrIIdoQYLdVZFIDl1BnVSg2f6I95tZOQgBgq8qv97juAhy80Q3FbNMmDwozDRffD6MYV5k9fhjl4pMjgnDZw2kyVvH4mJ9nQ8l54IHKm2NnqmI+lHtJ8zKbVaCi4f5mtiPh5WfU4qAbBQDQIjBSz05OcmlAN+9vlc2eqfKvd5oIg9VpInyy5Qz6NmGLMpJm3LoLAMw12BpYom2UgZZHZK3bEtUT3P9FknZHPACgE4IoXcRuGebNXphw0NStdqMQfUosd8N2yQ9zY6SMgn3bvF7nHrRaeWua/2vGg87EFEp4TU9fqpjC3Tl9aqIUbkLAxkFRVJitmhNuFbXMJPztr8Yo5dSzzd4lZxX3kwkAnG7AVnenxDU5WzEERLbayzVwKdNmRe0lcgqw2VIIACCVppzZXIiTGLkRZtiM3JLZBCP3SQgK9mf0QJnC0Qz/+e2Cs+NS38eBkZ65ItrE0H5jTyxcOWQ6DTtSAACt2Sj+aNU+BilJJQGzokG9nqzJkeXNamQudaVKP58pp1NCCZ/bMcF/qxgTqbfCCwDsQM24qC5oWxJxDiVOqvuWwfbEAwCrxZT4uQUUyuLZpLmFSqbFSiqujayHA6WlpuG95DqNJAG/rh2Ek+6QwHlGnpZdNw1+WGZyOFEKLEkwWlBhuIRoO58KJRl1payV3bacWD1lAkBpMSehrg5WdvCktCVQ5Ak54zm8pfoCWLePDep5UUV0IaF/LNB3an0A0YZ4nrrnt6zI9LHZx+Ir6BKONCToDwt6WDHsIb51Za2+FADgbCb+aG4HBikbasA7eJNBA1DiQMAIpwW6jxcAMFBxUWXo8yY75hOLG9AbDwAYoAKaAydxGlQ6LtBiqsEN3/tOxDfFM/zrrcbz2ZJ4UYz54PQyeEPzrfvB7eqHd96hfXsIcbOq1mWrIUIP6jUBAARY3Bq60YA3eHk5r2XPmE3pmW0fWwiZXVTK3oXrE+eh7FpSXKpF+eVJgYCqlnvdyg10jPrtUfNj2x6eavlG1Sh0vs6tfUSOdS1peOfKWhJa/u6TgvsIdpAAsjGtdrgW1YfUi5u7vHLGxMaUsBN9IFB/UWklfDWZtMio+PplBqc5ux/PN6dR6QJdsNbsGdkDZCuTLjO9p7/J4mPkAADbRIZWiY381Z14bWlvv7RtfNSa24LZ50v7yp+ZBQBgNsNc5Ue60LP9cj4O0/BGJk/bNO+9SU+6Qczz8tE/nPQO5IeCW5fX9/F71ROhI0gcGwQdtq0QYpFWqrk4ocwBisuQw0uIN7iDFngu9SPnuYwe9Lzu3ac/0YLVZhgcQD4pB+0Y5W/npWF5GTW1j8PW2YZw/EPv5/yQQIngQMJAHZJgtAgTuQYZOI2hqRcJSEJ6dRRyR/pZco6Qo6DBycnrZIc51lg60iR2E5BN/FYe+STOQfNa7z+2VJqX7KHclQrCm4otk4efUciKGsd3WOdH+e26W4GsVHV2sr/tmtW7oFl3odfNYDZostpRAABSF5Jh0ge4OHauBGTXuAeQv56gjnc2VbgFjLXWaWsXKU+eVGtHW1XhxES+ItXdpzUY0NcsSYNsUptORCsLkJKehKfZckLaQcLklyVjqZIbzF9fDrOdLj8njSsNayy3tYKjbW1o6dRKZB3hmDOtVa4nXD0D8Nm468fL5f5dAMCr8e9cfuS9iKKr6bcemptYopDtjUouTLfEAwCidpav8Izkj7GBToTRfcHWmvUINgzigq2LN0gEMIQLttnOo28WtLz6Te8eQhHWjRDwUmjESrw0W4MCKhO3Jm6Rk4odsIqc3A7Cdsn+s4Kak9d20QtyMhvb9oWR2i1lAsAOYBuKegEjbwuC1IJmWP82l3li5W4c44PXaCcEAFQqdyMgojVOW2DnTmdWBouyzV4dWGAMxLrA0dtndksITSmJk4pAVCd5WplJgCa+Xu/4Toq+he0gWRf5lQtT8RMrN6gu74t9SmEuqZYkVlIAAJGNdK3TPXsludcMNaDBBzuakFlzcwYrMzgA+ngBgAMYE/VRhlqxDyXuJ14crM49AKAR3h4oRUY/Q0HfwQqaK+Cl00ww3iO6t+LId4AO3UlP34odTkRcYaTo0i50B4rdm4iehW7XEKg8hvaZd4ZNdTAvhlEVmOnotrrIgpYyAUBNWHWKKjQj1cUGhQEu26AYNdOZ0ueJC0w3IQDQ2ypqxQpx+5dcBzfINAvgW0Eie23FFhECnScbjugEJvyWLCcP53435K889xXppP9zRn2z69R6DwcolhhuAH0pAACAFeoNT0QgAObmDtzM4ADu4wUAmubGRZuAm088bujeeACAYAsggZU4CSIdH0D9zoBK4AWuFBgWYcZd6C5jzzYTrd3hxL74JtknCDSq6hwowbY6UILxtKg8tF3RMqOeMgEAWryTUEsHKzfYWqRVKJO9mfgJ2dv47rQF+0Oxt+BfsQ97ZCtHN4T7u/RAgEhX/OYOwDYGHzC/6Hh6fgn1EYlyxf9XzSbWfRxXDCKGC5i+FABgAEv1Ak4EDoDc3ILODDagPl4AoMCNiqZmfQudT1ywqvEAAAGW/CFmEjSbBr0OTijWQcj3A5he3Tp/9iw6/HfDn7318262cHSAf/zg8H4c5nzLfvid9ZzrTdNB5A12Bj5YySkroMoUaFUxAQD2WGx1atjGbHbk4AI1AhAbdglr2eqBnwu0nPSZKRbQPPK+WC38vVt+e7KvcqCBkz5/Rg9I+UWV10N1U3xy7sMZMzt0rPHYff8RjZW26RGN4Yqw6qlqRbiOyzZMS64Ku3+wC3017Cw5G4mAcXRSBaduJ5htq6Q6oGKCprr0pZyP6tpQrBGjyj+3j6bvEEvFaA7qPWKVb3J5NLk7zRrFW/IYH6g+VwUmd3H09mNPgA3Hx11HU6ro9A/OQaFhrQImlbk0wtxAjNtRAABVQcbKdG83/cYZlgQ0Zzz+zy2m4pqLy8GEwYsKsgqSilxaloOdndkJAAQ0h2ucJbphUUENiR1vMlHWgLsyulo8ALAN8+KfcytLFmvL5jbsSsa7wzB5w27V+xq+Kd9Z+KgFEuh65DVZ6GY6cXLQYkzADLQcszGEVmNGRtDu5DZjzKZSJgBUsWJYUHtZMxwc7GPVvQJFT0oZysxcKLUTAgAioYy6OHcO2qPOXGmHMoy9Gpt9tWBvzkBcF7gY/WQZxMOR9k9bTuNcpfwUoGiSPI8WattdQv3NmWPTrD1f7MBY/ddz/k0F1maazkZcaGGx9i8jsZYCAIgsDOt0b9dT4V7DHAGatT6Jf7DohMmamwPNTgsigZleXQCA4EZEJ312WrEOJW7CoaxbNh3xAMD+9t1BRC7ryN631jghc6fx0wodik/A2bZiy/cBFVzPWWD5FiucnIjAQl5dBAa2XUD2LyvAkH2JYEmopXRAoIHaq8KCTs7srJyWdy53rFx0hDro2RZO3KvpaScTANghFxQ91YV7Ba8gUHYwKTVwWRBtxMpu4ttbkd2EAMCc7u8gA1xjCr0VEWbKOR4HO87WwY0gdHAOzbkjXK9w33EwPtR2BdFNenPOoLQyD/snWgyb5mopAAADjFQ3jVQgAnRuTgAGBhEaVnUBAAUcWQQQ+USC2xcPAGy37cPCFUANOm0WRknHBEu+C+wEbhBC4NhgZsddwC2rpUsMJhOBsFHT/yYQsDFNGl0QPtMrdi7V+CRjwcfB7TW3FHrLBIACK6UWRicIrhXOH4PLY4HiHDs9KafCfu77dfTjfRxelHQt8GhWfKegQCceCBDdit/cE9juFfZSUB2nSqTbLke24j/tBGaH1HqP1wpKDAvYvhQA4ICO1JudhBYwBlyxAiyo3BzByQwegF5dAODAjop673EWTj4RoKvxAIADWgAVoMLpgJeMgVHkO8FK4AIn+S++8k1gx+G57JQLd79pC+P1pM/r+swm8KGzAQHIOAFg1FLy7TvIfM1xC6uvBQAgQFGSRdPksZ/8SHNNwGiCZh3o4wBTcesAlc80xou3zMnyARxz47En1mqv9s0EBGqtFE2cCDrOUYZNSOBAJkrjzl0CLrkCy0knb0782NYS5YRCz09uJ6brm2c7et+3qcTbgZo68BKAZBZgdlTw5u8Wp13kocQyL9W5AR3xAIAOJC45Ab/tN40FQCHzVGbTI8IG4ttLINzYJ2msAt7BPNslIIYbvqdtLTqNBbYKuhl5TQIdphMngZZjAgbQugwz7Uf386i0O2ZkDO1NbjOLuaqUCQDVrBgV1D7WjAcHO0zinhMr8AoukAvtnYQAgNSY7fYosMZ5qpqTxm6kMlc+5d99OXuNPxKb2VeF/vAeDMR1w5eNmmUEtL02ztVVJz8Uw+Z5LFdtjxZ8J3P3MX4y5vYnMbd27iUAeTLALEmkIovaaXA4cYO7fkHPj53xAIAOXFzSqEbwG4ErMmQuLYKt4FD8xokbrejY5xr4BIfXE/cWvoUO/+fiLR51g+GOvcAasF6gAUU2aFEgcEXbgicZDzOV3w43TG+ZAABgi6oL3OFBF8CIpWEV5AbVVQgA5KjrJTxqmBOTagy21D4QIqLBzZSRIyqogK5Hu/ss/ji1vGrgs0nTkZcApOAAo2URH6xQRD6RXNgn7IwHAMQVPQM6bTZGSccEK/sgcBL40hBsBJwADM52AZnOUxjDaCJYsFqGQCCstmETDKvXMAoLqwOY2haOtaYrZQIAh5XggqqwFjw46IIFhbJL0SS1QRBFnT9Oz13dIH5t9QJlafoSgOweaB8qgMBZzOeHm4jLxrhZMf06iPYGzdLwJQCJQ4DK07IIjzILTj4RXPATdsYDAKJFT4NKnAVeMgZGyT4Q7ARuEMn/8JWRBDsoi808DzxumGzhHcPqUJ/lsJ9eHTmgFy54+dvJfxQVTtsDETG2Fm8N7fYyJ76vQ0Iu4ONr68/lhSO+rysX6wU1+zguWMnI8+0CtND9wjs5/DzBgzoELCyzZaYivEcCCcROr6noEmz8ph3opb7WxiVfBaaUT/JWXXvtahwggDCNqAh0tX/pgAZ+Do0z4lQzk5k2NDTGV4iIqcDr1YO3OqgqtI7B7xzsfUN7LhlxxRj8qpEIbso+von3voXJeHT7WlYpDI7JrKyh+GkcrspM6t8UsaUQ2w1JRQq4C+yJdevAIkiqYQfmp+ra/2D5Nhb67STe1csTjTYoY1lsxYZCm7o1zDl4O2iOCrLP9nYaK4QjgLVrXp4paZbIGzTOgMSaJmiYJh1ptU0QiP1HLSG14HlnKP2Fxd6PBaT7pzTA1MPdK5JqgW93dbbbfoUmK93dEHFT3lJ4W6SiStJLhEZVlMeefukA63y6s9ZfvVgFrHInDrO/qvUkAH2K7Fqts+WqPC4AizBDai19inRAbnnLo/gRFcLriOfx3ymTi8jTKlOlh8fpArTrhRDIMPvBv9skFvh5KStQhJUjBSvMYZpCQ47W8zCje9Hk1eVPNQMaSzJ5hsEqFGdyEjCZ6XnC5BCq1ctZ9qJkON4uoGZxCMiBH2fk42q049Q5rABkUZ4b3Kq1ZnWl8FEEmElU5UsYPZv4GplUTofZ+f9m4GFlwR+AuXP/L2bgRXudP2zPsGic4JnRiYgyHbQUsxmBTMyGyqtVhaUcWe/kh6EhKs43YRod4LMNOLpYr1SuE0f5oYLyYeCPux5UtLhUvy0g3jD1ymuFVAam78RpZZ6Tko4BpLnsC548KbZ9TVnOI7M8m0wQlbqiAFBCnPpkRNBqmFdPE4bqpVOYMh/egWEkIJgbohmDVdtv6I1XusuvkB2BZsvOwUzPBZti9RlQlmFuKKNZKSNrNBbMQyudNjxXB9u7WWY7YXH1bBpk4VgMxmK2FrbEg6NAtct3QuG0aLkdJN/PoChtwGz7vbT8mECyQHkbtnzOODKqnIHZyXvhOnkssqVYwSsiNVFdZPuGPXxg39WO1aWYCUS4kR3k/AuTvKM1B4evMCJwhpYW20HaiyFxxyEsB0Um+5cLoLbU8OBMRB+WWEiBHmoNBktyK9lkqJvN0VP71f74Zkq/qotMfcgNN3sI1SH46Y/IHyvHdocNz+cLQud79IXHPPkyULJDhD1/X3Ohwinz7oLxuesbkB+C5aYFWNKu+xZwkmHqXKb3+pqftGTRhsIuhYZf6oqMy7+LtEujyR19SdbE+lrU/xRlqoSazpdpguaqk/ofesMwOoSsjf16g9xoxUZLLwcF63VbHQkWpplCoY24u64E2Y4w1Rg41niHnPrC9awx+L0VKtz2vGXzHitKap8SmUaq96wi68K9ntnd93Sj13e7tpG13qWQxOvuvNeymJAa1lcOhGBkexwIe2Sf7bW1IXRHUySIozSv5k6VnnCASmH4NDT7ZS8BTfjlXgFyPueSe712N3qZZ7KQewLnr1s6K8tLUGuN9/7zvsC1iKfVbGHvs5D7RFDyKoXWJ9NZhDYSSsXmrRaQHRdnHXmAbHX+n/UVK0Zez1JwPUi6zc6+nQ/NqePQroPxVeIwHm2DROwOSk8KgMTEi1Y7nSIE+Gq+MYAYP0Mom8sLrS8bEm/EUAHHUG6+e0HfDC8B3MqBR3zX3JteVCwDiF+9wAxoGkjhP1xsMWi2GGEFiNABbNAAINqL/0xR/znzruP5h8br94jHf19mMr7tYW+ujsWKPoXCRvnoIcD7k+xVB+Zii7xv/z6JbFRPY51auW5GNPYuu347RRODlqOZlr4vTLJdmO32Ymr7zQBPxf0e8MxxxyV4jiVPHYPMfD6L8q87fkjsCvYVjr+ggNoH/QiK5hxcuJej9yg8ZNMSeTmwO+90TBWds84JkXDjot7yAJXMI6ljVCzbV5YFnVIeOlAk1lLeGkscNyy4yxYpaop7a4pzeyTT+03hN9KcdJgv900x55fG5qw9CFrkWu4hqI0cPSfliKAi02oQWHbN0Wt3Tq/qJ0npOBlejLRfOnCXc+nKUsxSVBpDYVF23VPtEKVvHrCHwXyK59qtxqOxFyFl3YwyB2dqD6eUKBvwyFBMiThbbCz+yeXmhgeG2tSjdT8vWvWcKf+WVhnRB2vxTg5GAQOuCmtRTjYwMx7jyhVhs5Xy3z871eewlfFllqQpTWfHEEJYddKEp3a+kwb2g0QfnrjcphnK1EpKMo18ClFEvTsIk5RXjswp9ORxN0cNvc5trSG6nVMj4quwDmcdCahuWQqyuRQX0xzRBQcFF9wTDDgniKK+OGL6mgT/lruY49uQuK14I5Bd6B//Dbr4FFVujranybg9U94cAU6I9IaobqrCL2JNQOFx2FTrtTAoreGDsU7qXj3HRgN5tkVhC4qz1tuRcI+vGYF3uOHb/179lv+LCP9wkd/Tm0uOxoO/93nirm3O7C18++IrjN0mu3oh6ZKimJ7+T2aadaX1xTE8WSHvUI7uCdut058paGY/H4QbmIuca5xQZ1bZdHb2lYebMzX6W4jMqbM5U+bfR5A5bZsT4t34PDFlS0LmX4AGACRGNics3mgycQKN4RIKxTicJkz9fKpaitbei2t9eCBiW5wuQGqn4683xEZu3D/qi484PBx9cfXR7WV4srliakfiRq9/R9jnEjvQI74z8HnoYZ9FTPH/yZPnhBU/yZP/qLUxye8jm1UsYfsq+sd0mKyNS9K34luwRqcf40TVRu9oN92GV2eADCYC7X60BIO5DnNotqBl/i0LeuHLfrRuNGEdj9lcg3Zaaxttx2nm0KmNDvSp0m34GKP+JrdXoxqxUzkCetygZLYIvehEFMd7Um2VFVbYX7nr+voTjOXGaTL6r5azfwWOLLpb3rY5dMQOe88Izov8OQjA0u2Mlj3Or9bFnPuehxuIL//tgDJ8RFeplj4uApqZfISRtU7ZxI1eF+6J7yrq4p5XGYx81AzVvavdIsDSXFWyPRjW6rUVp2HoGmJ01cu/FBDYzYUnfvRN8XfwNV3RnWXJ8RC/Es449i0Cj6FNpR/eiLasN4Ky4MWI4unGVxI0ii+60kF+rK1xfGWPqzcSTalg9rodob98MXQU5I9yAM97iDovsFBMCv+mYIzFm2wYhKezwkrNRzZbNnBdIQS7/ZLGphQkePaA1jYbFno04fi6l9Ox1N9K2wye3DEmK4auEExrEX7XHo2Yt/L5GMbEW75R2g0drOOPskO4P/kysbG4WBMQiUHHlXOOsKGQovoO7fUrke/+FvVWPpb1oXpXtyHW0j5s9SBRCDgUB8+4Tke00/1xWFLex3MsF0Q42WPLAQxSXI/hL2wn8fZs+Qh+usWpEiOKONuJ5IQtJUZ10qN8oWKTfoDBnXff8IYVj3TqLyIz2YS05BM1vSiJWLBfFjQgzbaqvYCgQ6VMWD16Y+8Ybyvvx1rzLLjnEQ8zno0GXFXNrtllU7ZZl03Jab3Mz3m9THJiLzM6szG5OaIw6YuopGKyYOwQ0Gtw9S/X5vJfjrv+l3EfwLLufQHLzD4Bgo0ngdO+rgtH58ljM0iZIvd1XBGS9QoDlgiGZphEhcVkorkV3sQUO8G7eTPV7d7GlS8A6Usm1EieAM++kqttK4m/vvpO0U+KdQcEoae6Omtq6vU1SGSTtwSRqfjXHHEchLIVvmVnfxqFEWdAcmxnPhhOjbyL6fyxZ+ShtiRu+qErp5i4uzKoqxLT4tLcrAcr+UKf7YJ7q0w9DAvCuI2FjbcNLrfyk1MKflPISkjWoWLceucgvctFz3PRRGLKzA6QiJg3HRghCknQmpZA6+isa6L5OIIAw8GQ4sceFL6q+wZ075gKoNG+e+lZZjqwhHs6nck6ahNMDBw8PnqN37ra+2fr2juuQKJYpVmy4maTzlodoT9zC/BwxXJ3ztcJOWVDGDhSaJPPTddsPDA7V3JCAm567fHvDIX1XUVvSUSePHeEzyPsQTaKOdMieGRUBB4fBbbKs29nd2cM2j1kteOUbBQKp6TEIL6CU8TLIyK184jeldvP3mIUzCOOVMsjJzt03WJion+MSWAunh2424MyF4QQuGkMieL7tso/ZIUU8xh0Ecigq8ylGcVtsMqEGYkGCnmx1bulb6UoKhHzCBEujyxia1ejJ96i0xyPkB3kRmc8YiQwHtEzC8KCO/dI3+AJ+ZTblMEIHDMUwZHhXU85V8xABG0ZhuCtyL7aK4vDRoEjWjyKTWzJFgS4WTIBgTJ9a6lAMLtv0OJu1Y1rqkMDstMWzUMwtuMkFzjNhXwT8SntPs072WOVa9yjLoI6cgF+2fx7z01nl1oNQR2XTRfZc+d/IjjDbapvoEIqveUUAZqbG3ODgF/+D9jlr47V+tONFfnPz5WPCZz7hDn7WCdCYq8mr1T6EyxyzVBuTcgtAbRSTbUlHnq2yUiJ2JJXCGvMigGVW3wcWa7m59ArPSXLpw5ZvKcnU0hIqSLYwE1LsBT6kmn6ThYD8zm8qdEnDWze3V511YzfePWfqPGbmjqX5cyOEb5qZt5S+TzN0SlQ4zxdXcovPgOhCubpiSuLz4TXOxeP7SdasvXqCYvsfs7a+pyeem8DlsWXko6CIrWbgo2KAHPS/R8dulDlvTI1Pi6koiWygXEzO8Fbv0x6RRlp1drsYYeShJWtMYjjar9xURHBI29NDNO0XQ/C+V+1aIRH5loVOVHyzmqZ51nzyOrVNJ436G8D1Kw2QN5Vp9ORx71/hyGdr7rhTb+dX11OoSRXosmxW7Jk/l7s1/v6uKhKca/9XHo9aRx80veJr27baBCjsPINChqyLVyGL7Oudgg1qQec8PLcXuS6XMmiD95fy3RZ2oT0zjeV4/YVAIJw0OYg0MQuwz3GIt0EvVAoQB44ci3azZdKARF6YiCC3rTqTrx4HQoEoMPT/WNSfASKYqGDWL3whI+i/N373Vya7Sl9IVvdGdPHvt9yv2+XGl746PLiOBpBuK2uVROF15iaOqF/ki4Xg0tYywEhyiuK2/2KYrKbhgWiisEr1hD1zWgHnhjLwotHnm3mYE61fHLnrQa8Hq0hrJnooBa8GAF8mOn4ttzmJqXlYacwL8oWPpwMXRuvuBWw65c3o+kz8wIzCLoQb5bYDdneITm0dAkeRiSqFGv4fwPwZTBlBhYAfuaTPjQ2a3krug7F6sosuhJY/7cA3Qijs+M4gYGC0egT5OcwmUXXqFMPg/1H5GgC+bQydxCcu+cWwVKs4b8DwMyNSAplduI0Y1li9Wo2XAmsRLNZvYHWJFajR/W8HERKBClnP6ZHMvqjdvOdIsTmiY9el1BeHqhfpngzU4ahVy3eul0ls9vOPf3uNUL9NG6fvSN+WhRLBxDdwJynbPMiQjWwN5usP1e28TQ68OWpgc6uM/764sQAwtlp/PjpXDxvhIBKRwbClx7EfkvXxCeZxn45qXyaqZp1uhATNF2zT0egfz2aBw8b9GyWBNLF+2iS0tGvl9TNclDa2Bg1CIfzl/wlgi95wB1lyMYzsNU/EXk6RFefWp0V3RI/LpYLO9y/aGeFD2XwTtIdHG2OHclc32rNBzVuo6bvFv+XXtShKtPlOFNXGbTx1mLCYFrcBRpqdEM5t63xtNeXaAcGJlbQCztH+GIMVxHTMsT2GhPjjew64MXOCF+E5272OyDZa0wkZKpmEGfQ7pWoy3sFkFOGr6ihxkQb8OLDxIkJuLLzh6/mU8ErDQz7cbUm2nFWnbHwpCM6LpoBGoYXA6XvQjtHMPMwX9kJya9h3LJ+5tDRSsOYZvl4hrX3Sud1wO4bcn3W8AQFG38wH6bhYYXcGGMM96dgYFvOssxNmuNXtviitJ7YWNJxmGePbEHfcLk0smkynj5KXz0LrvGy3LGw//BafQJ38MQcPG6T/Ausf7AjP64cmhKghxoxpDfdCeNPF84MPE1RJM7Ezo7TTYodMYFmZBKM4tnFenEqd8jNMnSSu8s16oy/UO5s4llMX690OojEgTdd/+LZxTPjpsYKTMK5s+tb/+JAjOmbrHg6O+IpHmfnjLPrn10gzk5nR6wIF4lwingQCsDNkKP78dPbGy+xxyR5g3j98mcUxB+I4nXOH4Aq2CuVS/4WlDdsTXB2WTKynjcagrTlQeKDtfnTO+0YahbrV1Pw8dm1YyB+o8xfObuJ18weGsu2FmIz5o8uMsRUYDUU+koC2G9VTAUE8ib8YAO0ShNpUzWG04ON/t+QoP+SoAckf7Ar2+kc6vnwyaiQV6tkF3dYH9Wv5T9Pm1r00d/Ma/ZyKeuoFkdXIo4IX1fBC307rL/BCxgw2LyUjRTdmL069XuBbikYKCiAVoAAwSDiATr2BQ011I2nXXvCaDK4/hVSxdkctqJmyGT/LBL22gpfO+wju/U968OXpH8i/JazObD+cRr2eVp9cVhPgE6BHdlQ0+BSvioOslzDDHXGH/jl67gr/4HmzTqttF5xwDi461QyGz4nHhnxQ6EqNyUbcCPTEwknlAV5k7At0xvDlPpCncmF8wV5mzZjmUVuCZGERqaRPgVvQGeYii7YASf4yN6mr3wDswUIBBjQdd7KWtqAqr1gMbIWDuOtr8DpojhEqi4u3jGlq+P4KmrDjm1uMrmCRkEE+AGiAL2gzm527ZyrfE5V0PmL6LiOrtBAwY1CMwmCz3r60mM5i7guMx0OA4ld1BvPjlNyV4Nn/mRs7cDxcVvZo5DOtwbAaLVKte7xBt75rcoOK9UMPO0EM13xCABagReK7zaw7jfOXlhh8ber2aRy84vbfnyZ73hN2KeivNjilT6q7LzmuS6jxnwblMn38R+in3n+dr3zt3OSssfyrB69/9ygIuc8tD+3b5jL/+fKjfqVifWvxPpSX423boZMzmd018NOoZmNH4C1nwEAqM5Yw4sPKylWKl391coWS30y6HU0F/nO17/N/Huc1S6Q+oEQegReeYDK4smXLiRKJXQHybQersUKerniDlwXn8r625rVnSQX4ZZPNhZ6JrLR/6Hdc5eF8Rz5AZWYrsafboZ4xrjRw+0FLzzp41PKKx107kOPZdAfZfSInWgAAIO2bFs34jijtJ8YA8foVyeOEJRTkHACgbeLCSMIkq4lQkPY3eVFBMS9nVuWgRjTaWe3TCK8W3B/8c7P9+YCx2tRiaAfVAefarRMbHc1hlE6CVTDMHvJIQpzqd3YjPBP51a1FWbu/v0ZAGCVYmyN4sVKQiknJw5zOozxD4luq2c9VYOdWJcDgFNOQQg2cLxdDFkLnKRrIQkgurs8UgKqt3Oj3UBhulX6BoqLRKqMgsGgv2l4kA84+xMCgNEYhmF6OM4BZpD8gwBgw66DNSuX0npxI7kMKfI5YHETXe8BuszurzGAnnVX30JMpuY3xF9/59tvMeuLd0IiML9tmroxsLa4W+gUNUgH3a75CNaCP/3b4usJqmPP4bzY7NTmP863aGsDAKLycjTxPLwcw2zM27UCYL1eImm3oq2EecP1m8LfbddPMfn8N5luh/uL3NfmSc67jpyn5SB8DbduAUGRL2LIdr58cBWqpNPXsGEQpiMjLAylrmZcgOFt1zJGYJh0eWO1fLakdqeVz05p7e0BqvGWofeqGA8uboj4Cd51MUnPZTscB8rdn6lpLTT74k6ti3p81ER7RwDQBm6d3esr3N7fj/oCp/Btftc63yCHKRPfWDN8vP/fPW2RT/15WmHI5Nf+UXI6mrJ74YtTYHRfL6Kjn/31e/rcUl264f7+GmefsG7/XB+/oCTHD1so72a0ClG04hS6Q0IHF4SS6vIxWCg1fRVsNZPcym9Uf9/59uX4+UMK99+c4t0pDcDckbijeU5cS9X8Zt2GMMNOrmYDt4y6vyMAoMt2jff6GovufhOnFOUBnmvh/ez7zMNdU7tJmgrc29tez94CSaeAS2ZgLA5SMudZfZZ98uh+BgCwBNbjrrI+AA==","base64")).toString()),EO}var Wae=new Map([[P.makeIdent(null,"fsevents").identHash,jae],[P.makeIdent(null,"resolve").identHash,qae],[P.makeIdent(null,"typescript").identHash,Jae]]),a3e={hooks:{registerPackageExtensions:async(r,e)=>{for(let[t,i]of dO)e(P.parseDescriptor(t,!0),i)},getBuiltinPatch:async(r,e)=>{var s;let t="compat/";if(!e.startsWith(t))return;let i=P.parseIdent(e.slice(t.length)),n=(s=Wae.get(i.identHash))==null?void 0:s();return typeof n<"u"?n:null},reduceDependency:async(r,e,t,i)=>typeof Wae.get(r.identHash)>"u"?r:P.makeDescriptor(r,P.makeRange({protocol:"patch:",source:P.stringifyDescriptor(r),selector:`~builtin<compat/${P.stringifyIdent(r)}>`,params:null}))}},A3e=a3e;var yO={};ut(yO,{default:()=>c3e});var _h=class extends De{constructor(){super(...arguments);this.pkg=z.String("-p,--package",{description:"The package to run the provided command from"});this.quiet=z.Boolean("-q,--quiet",!1,{description:"Only report critical errors instead of printing the full install logs"});this.command=z.String();this.args=z.Proxy()}async execute(){let t=[];this.pkg&&t.push("--package",this.pkg),this.quiet&&t.push("--quiet");let i=P.parseDescriptor(this.command),n;i.scope?n=P.makeIdent(i.scope,`create-${i.name}`):i.name.startsWith("@")?n=P.makeIdent(i.name.substring(1),"create"):n=P.makeIdent(null,`create-${i.name}`);let s=P.stringifyIdent(n);return i.range!=="unknown"&&(s+=`@${i.range}`),this.cli.run(["dlx",...t,s,...this.args])}};_h.paths=[["create"]];var Lu=class extends De{constructor(){super(...arguments);this.packages=z.Array("-p,--package",{description:"The package(s) to install before running the command"});this.quiet=z.Boolean("-q,--quiet",!1,{description:"Only report critical errors instead of printing the full install logs"});this.command=z.String();this.args=z.Proxy()}async execute(){return ye.telemetry=null,await M.mktempPromise(async t=>{var C;let i=x.join(t,`dlx-${process.pid}`);await M.mkdirPromise(i),await M.writeFilePromise(x.join(i,"package.json"),`{}
-`),await M.writeFilePromise(x.join(i,"yarn.lock"),"");let n=x.join(i,".yarnrc.yml"),s=await ye.findProjectCwd(this.context.cwd,xt.lockfile),o=!(await ye.find(this.context.cwd,null,{strict:!1})).get("enableGlobalCache"),a=s!==null?x.join(s,".yarnrc.yml"):null;a!==null&&M.existsSync(a)?(await M.copyFilePromise(a,n),await ye.updateConfiguration(i,y=>{let B={...y,enableGlobalCache:o,enableTelemetry:!1};return Array.isArray(y.plugins)&&(B.plugins=y.plugins.map(v=>{let D=typeof v=="string"?v:v.path,L=K.isAbsolute(D)?D:K.resolve(K.fromPortablePath(s),D);return typeof v=="string"?L:{path:L,spec:v.spec}})),B})):await M.writeFilePromise(n,`enableGlobalCache: ${o}
-enableTelemetry: false
-`);let l=(C=this.packages)!=null?C:[this.command],c=P.parseDescriptor(this.command).name,u=await this.cli.run(["add","--",...l],{cwd:i,quiet:this.quiet});if(u!==0)return u;this.quiet||this.context.stdout.write(`
-`);let g=await ye.find(i,this.context.plugins),{project:f,workspace:h}=await je.find(g,i);if(h===null)throw new ct(f.cwd,i);await f.restoreInstallState();let p=await Wt.getWorkspaceAccessibleBinaries(h);return p.has(c)===!1&&p.size===1&&typeof this.packages>"u"&&(c=Array.from(p)[0][0]),await Wt.executeWorkspaceAccessibleBinary(h,c,this.args,{packageAccessibleBinaries:p,cwd:this.context.cwd,stdin:this.context.stdin,stdout:this.context.stdout,stderr:this.context.stderr})})}};Lu.paths=[["dlx"]],Lu.usage=ve.Usage({description:"run a package in a temporary environment",details:"\n      This command will install a package within a temporary environment, and run its binary script if it contains any. The binary will run within the current cwd.\n\n      By default Yarn will download the package named `command`, but this can be changed through the use of the `-p,--package` flag which will instruct Yarn to still run the same command but from a different package.\n\n      Using `yarn dlx` as a replacement of `yarn add` isn't recommended, as it makes your project non-deterministic (Yarn doesn't keep track of the packages installed through `dlx` - neither their name, nor their version).\n    ",examples:[["Use create-react-app to create a new React app","yarn dlx create-react-app ./my-app"],["Install multiple packages for a single command",`yarn dlx -p typescript -p ts-node ts-node --transpile-only -e "console.log('hello!')"`]]});var l3e={commands:[_h,Lu]},c3e=l3e;var bO={};ut(bO,{default:()=>f3e,fileUtils:()=>Vm});var $h=/^(?:[a-zA-Z]:[\\/]|\.{0,2}\/)/,zm=/^[^?]*\.(?:tar\.gz|tgz)(?:::.*)?$/,qr="file:";var Vm={};ut(Vm,{makeArchiveFromLocator:()=>NQ,makeBufferFromLocator:()=>QO,makeLocator:()=>BO,makeSpec:()=>zae,parseSpec:()=>wO});function wO(r){let{params:e,selector:t}=P.parseRange(r),i=K.toPortablePath(t);return{parentLocator:e&&typeof e.locator=="string"?P.parseLocator(e.locator):null,path:i}}function zae({parentLocator:r,path:e,folderHash:t,protocol:i}){let n=r!==null?{locator:P.stringifyLocator(r)}:{},s=typeof t<"u"?{hash:t}:{};return P.makeRange({protocol:i,source:e,selector:e,params:{...s,...n}})}function BO(r,{parentLocator:e,path:t,folderHash:i,protocol:n}){return P.makeLocator(r,zae({parentLocator:e,path:t,folderHash:i,protocol:n}))}async function NQ(r,{protocol:e,fetchOptions:t,inMemory:i=!1}){let{parentLocator:n,path:s}=P.parseFileStyleRange(r.reference,{protocol:e}),o=x.isAbsolute(s)?{packageFs:new qt(Oe.root),prefixPath:Oe.dot,localPath:Oe.root}:await t.fetcher.fetch(n,t),a=o.localPath?{packageFs:new qt(Oe.root),prefixPath:x.relative(Oe.root,o.localPath)}:o;o!==a&&o.releaseFs&&o.releaseFs();let l=a.packageFs,c=x.join(a.prefixPath,s);return await Ie.releaseAfterUseAsync(async()=>await mi.makeArchiveFromDirectory(c,{baseFs:l,prefixPath:P.getIdentVendorPath(r),compressionLevel:t.project.configuration.get("compressionLevel"),inMemory:i}),a.releaseFs)}async function QO(r,{protocol:e,fetchOptions:t}){return(await NQ(r,{protocol:e,fetchOptions:t,inMemory:!0})).getBufferAndClose()}var LQ=class{supports(e,t){return!!e.reference.startsWith(qr)}getLocalPath(e,t){let{parentLocator:i,path:n}=P.parseFileStyleRange(e.reference,{protocol:qr});if(x.isAbsolute(n))return n;let s=t.fetcher.getLocalPath(i,t);return s===null?null:x.resolve(s,n)}async fetch(e,t){let i=t.checksums.get(e.locatorHash)||null,[n,s,o]=await t.cache.fetchPackageFromCache(e,i,{onHit:()=>t.report.reportCacheHit(e),onMiss:()=>t.report.reportCacheMiss(e,`${P.prettyLocator(t.project.configuration,e)} can't be found in the cache and will be fetched from the disk`),loader:()=>this.fetchFromDisk(e,t),skipIntegrityCheck:t.skipIntegrityCheck,...t.cacheOptions});return{packageFs:n,releaseFs:s,prefixPath:P.getIdentVendorPath(e),localPath:this.getLocalPath(e,t),checksum:o}}async fetchFromDisk(e,t){return NQ(e,{protocol:qr,fetchOptions:t})}};var u3e=2,TQ=class{supportsDescriptor(e,t){return e.range.match($h)?!0:!!e.range.startsWith(qr)}supportsLocator(e,t){return!!e.reference.startsWith(qr)}shouldPersistResolution(e,t){return!1}bindDescriptor(e,t,i){return $h.test(e.range)&&(e=P.makeDescriptor(e,`${qr}${e.range}`)),P.bindDescriptor(e,{locator:P.stringifyLocator(t)})}getResolutionDependencies(e,t){return[]}async getCandidates(e,t,i){if(!i.fetchOptions)throw new Error("Assertion failed: This resolver cannot be used unless a fetcher is configured");let{path:n,parentLocator:s}=wO(e.range);if(s===null)throw new Error("Assertion failed: The descriptor should have been bound");let o=await QO(P.makeLocator(e,P.makeRange({protocol:qr,source:n,selector:n,params:{locator:P.stringifyLocator(s)}})),{protocol:qr,fetchOptions:i.fetchOptions}),a=li.makeHash(`${u3e}`,o).slice(0,6);return[BO(e,{parentLocator:s,path:n,folderHash:a,protocol:qr})]}async getSatisfying(e,t,i){return null}async resolve(e,t){if(!t.fetchOptions)throw new Error("Assertion failed: This resolver cannot be used unless a fetcher is configured");let i=await t.fetchOptions.fetcher.fetch(e,t.fetchOptions),n=await Ie.releaseAfterUseAsync(async()=>await ot.find(i.prefixPath,{baseFs:i.packageFs}),i.releaseFs);return{...e,version:n.version||"0.0.0",languageName:n.languageName||t.project.configuration.get("defaultLanguageName"),linkType:"HARD",conditions:n.getConditions(),dependencies:n.dependencies,peerDependencies:n.peerDependencies,dependenciesMeta:n.dependenciesMeta,peerDependenciesMeta:n.peerDependenciesMeta,bin:n.bin}}};var OQ=class{supports(e,t){return zm.test(e.reference)?!!e.reference.startsWith(qr):!1}getLocalPath(e,t){return null}async fetch(e,t){let i=t.checksums.get(e.locatorHash)||null,[n,s,o]=await t.cache.fetchPackageFromCache(e,i,{onHit:()=>t.report.reportCacheHit(e),onMiss:()=>t.report.reportCacheMiss(e,`${P.prettyLocator(t.project.configuration,e)} can't be found in the cache and will be fetched from the disk`),loader:()=>this.fetchFromDisk(e,t),skipIntegrityCheck:t.skipIntegrityCheck,...t.cacheOptions});return{packageFs:n,releaseFs:s,prefixPath:P.getIdentVendorPath(e),checksum:o}}async fetchFromDisk(e,t){let{parentLocator:i,path:n}=P.parseFileStyleRange(e.reference,{protocol:qr}),s=x.isAbsolute(n)?{packageFs:new qt(Oe.root),prefixPath:Oe.dot,localPath:Oe.root}:await t.fetcher.fetch(i,t),o=s.localPath?{packageFs:new qt(Oe.root),prefixPath:x.relative(Oe.root,s.localPath)}:s;s!==o&&s.releaseFs&&s.releaseFs();let a=o.packageFs,l=x.join(o.prefixPath,n),c=await a.readFilePromise(l);return await Ie.releaseAfterUseAsync(async()=>await mi.convertToZip(c,{compressionLevel:t.project.configuration.get("compressionLevel"),prefixPath:P.getIdentVendorPath(e),stripComponents:1}),o.releaseFs)}};var MQ=class{supportsDescriptor(e,t){return zm.test(e.range)?!!(e.range.startsWith(qr)||$h.test(e.range)):!1}supportsLocator(e,t){return zm.test(e.reference)?!!e.reference.startsWith(qr):!1}shouldPersistResolution(e,t){return!0}bindDescriptor(e,t,i){return $h.test(e.range)&&(e=P.makeDescriptor(e,`${qr}${e.range}`)),P.bindDescriptor(e,{locator:P.stringifyLocator(t)})}getResolutionDependencies(e,t){return[]}async getCandidates(e,t,i){let n=e.range;return n.startsWith(qr)&&(n=n.slice(qr.length)),[P.makeLocator(e,`${qr}${K.toPortablePath(n)}`)]}async getSatisfying(e,t,i){return null}async resolve(e,t){if(!t.fetchOptions)throw new Error("Assertion failed: This resolver cannot be used unless a fetcher is configured");let i=await t.fetchOptions.fetcher.fetch(e,t.fetchOptions),n=await Ie.releaseAfterUseAsync(async()=>await ot.find(i.prefixPath,{baseFs:i.packageFs}),i.releaseFs);return{...e,version:n.version||"0.0.0",languageName:n.languageName||t.project.configuration.get("defaultLanguageName"),linkType:"HARD",conditions:n.getConditions(),dependencies:n.dependencies,peerDependencies:n.peerDependencies,dependenciesMeta:n.dependenciesMeta,peerDependenciesMeta:n.peerDependenciesMeta,bin:n.bin}}};var g3e={fetchers:[OQ,LQ],resolvers:[MQ,TQ]},f3e=g3e;var SO={};ut(SO,{default:()=>C3e});var Vae=Pe(J("querystring")),Xae=[/^https?:\/\/(?:([^/]+?)@)?github.com\/([^/#]+)\/([^/#]+)\/tarball\/([^/#]+)(?:#(.*))?$/,/^https?:\/\/(?:([^/]+?)@)?github.com\/([^/#]+)\/([^/#]+?)(?:\.git)?(?:#(.*))?$/];function Zae(r){return r?Xae.some(e=>!!r.match(e)):!1}function _ae(r){let e;for(let a of Xae)if(e=r.match(a),e)break;if(!e)throw new Error(h3e(r));let[,t,i,n,s="master"]=e,{commit:o}=Vae.default.parse(s);return s=o||s.replace(/[^:]*:/,""),{auth:t,username:i,reponame:n,treeish:s}}function h3e(r){return`Input cannot be parsed as a valid GitHub URL ('${r}').`}var KQ=class{supports(e,t){return!!Zae(e.reference)}getLocalPath(e,t){return null}async fetch(e,t){let i=t.checksums.get(e.locatorHash)||null,[n,s,o]=await t.cache.fetchPackageFromCache(e,i,{onHit:()=>t.report.reportCacheHit(e),onMiss:()=>t.report.reportCacheMiss(e,`${P.prettyLocator(t.project.configuration,e)} can't be found in the cache and will be fetched from GitHub`),loader:()=>this.fetchFromNetwork(e,t),skipIntegrityCheck:t.skipIntegrityCheck,...t.cacheOptions});return{packageFs:n,releaseFs:s,prefixPath:P.getIdentVendorPath(e),checksum:o}}async fetchFromNetwork(e,t){let i=await Xt.get(this.getLocatorUrl(e,t),{configuration:t.project.configuration});return await M.mktempPromise(async n=>{let s=new qt(n);await mi.extractArchiveTo(i,s,{stripComponents:1});let o=aA.splitRepoUrl(e.reference),a=x.join(n,"package.tgz");await Wt.prepareExternalProject(n,a,{configuration:t.project.configuration,report:t.report,workspace:o.extra.workspace,locator:e});let l=await M.readFilePromise(a);return await mi.convertToZip(l,{compressionLevel:t.project.configuration.get("compressionLevel"),prefixPath:P.getIdentVendorPath(e),stripComponents:1})})}getLocatorUrl(e,t){let{auth:i,username:n,reponame:s,treeish:o}=_ae(e.reference);return`https://${i?`${i}@`:""}github.com/${n}/${s}/archive/${o}.tar.gz`}};var d3e={hooks:{async fetchHostedRepository(r,e,t){if(r!==null)return r;let i=new KQ;if(!i.supports(e,t))return null;try{return await i.fetch(e,t)}catch{return null}}}},C3e=d3e;var vO={};ut(vO,{default:()=>E3e});var Xm=/^[^?]*\.(?:tar\.gz|tgz)(?:\?.*)?$/,Zm=/^https?:/;var UQ=class{supports(e,t){return Xm.test(e.reference)?!!Zm.test(e.reference):!1}getLocalPath(e,t){return null}async fetch(e,t){let i=t.checksums.get(e.locatorHash)||null,[n,s,o]=await t.cache.fetchPackageFromCache(e,i,{onHit:()=>t.report.reportCacheHit(e),onMiss:()=>t.report.reportCacheMiss(e,`${P.prettyLocator(t.project.configuration,e)} can't be found in the cache and will be fetched from the remote server`),loader:()=>this.fetchFromNetwork(e,t),skipIntegrityCheck:t.skipIntegrityCheck,...t.cacheOptions});return{packageFs:n,releaseFs:s,prefixPath:P.getIdentVendorPath(e),checksum:o}}async fetchFromNetwork(e,t){let i=await Xt.get(e.reference,{configuration:t.project.configuration});return await mi.convertToZip(i,{compressionLevel:t.project.configuration.get("compressionLevel"),prefixPath:P.getIdentVendorPath(e),stripComponents:1})}};var HQ=class{supportsDescriptor(e,t){return Xm.test(e.range)?!!Zm.test(e.range):!1}supportsLocator(e,t){return Xm.test(e.reference)?!!Zm.test(e.reference):!1}shouldPersistResolution(e,t){return!0}bindDescriptor(e,t,i){return e}getResolutionDependencies(e,t){return[]}async getCandidates(e,t,i){return[P.convertDescriptorToLocator(e)]}async getSatisfying(e,t,i){return null}async resolve(e,t){if(!t.fetchOptions)throw new Error("Assertion failed: This resolver cannot be used unless a fetcher is configured");let i=await t.fetchOptions.fetcher.fetch(e,t.fetchOptions),n=await Ie.releaseAfterUseAsync(async()=>await ot.find(i.prefixPath,{baseFs:i.packageFs}),i.releaseFs);return{...e,version:n.version||"0.0.0",languageName:n.languageName||t.project.configuration.get("defaultLanguageName"),linkType:"HARD",conditions:n.getConditions(),dependencies:n.dependencies,peerDependencies:n.peerDependencies,dependenciesMeta:n.dependenciesMeta,peerDependenciesMeta:n.peerDependenciesMeta,bin:n.bin}}};var m3e={fetchers:[UQ],resolvers:[HQ]},E3e=m3e;var kO={};ut(kO,{default:()=>I8e});var bAe=Pe(QAe()),DO=J("util"),Tu=class extends De{constructor(){super(...arguments);this.private=z.Boolean("-p,--private",!1,{description:"Initialize a private package"});this.workspace=z.Boolean("-w,--workspace",!1,{description:"Initialize a workspace root with a `packages/` directory"});this.install=z.String("-i,--install",!1,{tolerateBoolean:!0,description:"Initialize a package with a specific bundle that will be locked in the project"});this.usev2=z.Boolean("-2",!1,{hidden:!0});this.yes=z.Boolean("-y,--yes",{hidden:!0});this.assumeFreshProject=z.Boolean("--assume-fresh-project",!1,{hidden:!0})}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),i=typeof this.install=="string"?this.install:this.usev2||this.install===!0?"latest":null;return i!==null?await this.executeProxy(t,i):await this.executeRegular(t)}async executeProxy(t,i){if(t.projectCwd!==null&&t.projectCwd!==this.context.cwd)throw new be("Cannot use the --install flag from within a project subdirectory");M.existsSync(this.context.cwd)||await M.mkdirPromise(this.context.cwd,{recursive:!0});let n=x.join(this.context.cwd,t.get("lockfileFilename"));M.existsSync(n)||await M.writeFilePromise(n,"");let s=await this.cli.run(["set","version",i],{quiet:!0});if(s!==0)return s;let o=[];return this.private&&o.push("-p"),this.workspace&&o.push("-w"),this.yes&&o.push("-y"),await M.mktempPromise(async a=>{let{code:l}=await Cr.pipevp("yarn",["init",...o],{cwd:this.context.cwd,stdin:this.context.stdin,stdout:this.context.stdout,stderr:this.context.stderr,env:await Wt.makeScriptEnv({binFolder:a})});return l})}async executeRegular(t){var c;let i=null;try{i=(await je.find(t,this.context.cwd)).project}catch{i=null}M.existsSync(this.context.cwd)||await M.mkdirPromise(this.context.cwd,{recursive:!0});let n=await ot.tryFind(this.context.cwd)||new ot,s=Object.fromEntries(t.get("initFields").entries());n.load(s),n.name=(c=n.name)!=null?c:P.makeIdent(t.get("initScope"),x.basename(this.context.cwd)),n.packageManager=Lr&&Ie.isTaggedYarnVersion(Lr)?`yarn@${Lr}`:null,typeof n.raw.private>"u"&&(this.private||this.workspace&&n.workspaceDefinitions.length===0)&&(n.private=!0),this.workspace&&n.workspaceDefinitions.length===0&&(await M.mkdirPromise(x.join(this.context.cwd,"packages"),{recursive:!0}),n.workspaceDefinitions=[{pattern:"packages/*"}]);let o={};n.exportTo(o),DO.inspect.styles.name="cyan",this.context.stdout.write(`${(0,DO.inspect)(o,{depth:1/0,colors:!0,compact:!1})}
-`);let a=x.join(this.context.cwd,ot.fileName);await M.changeFilePromise(a,`${JSON.stringify(o,null,2)}
-`,{automaticNewlines:!0});let l=x.join(this.context.cwd,"README.md");if(M.existsSync(l)||await M.writeFilePromise(l,`# ${P.stringifyIdent(n.name)}
-`),!i||i.cwd===this.context.cwd){let u=x.join(this.context.cwd,xt.lockfile);M.existsSync(u)||await M.writeFilePromise(u,"");let f=[".yarn/*","!.yarn/patches","!.yarn/plugins","!.yarn/releases","!.yarn/sdks","!.yarn/versions","","# Swap the comments on the following lines if you don't wish to use zero-installs","# Documentation here: https://yarnpkg.com/features/zero-installs","!.yarn/cache","#.pnp.*"].map(L=>`${L}
-`).join(""),h=x.join(this.context.cwd,".gitignore");M.existsSync(h)||await M.writeFilePromise(h,f);let C=["/.yarn/**            linguist-vendored","/.yarn/releases/*    binary","/.yarn/plugins/**/*  binary","/.pnp.*              binary linguist-generated"].map(L=>`${L}
-`).join(""),y=x.join(this.context.cwd,".gitattributes");M.existsSync(y)||await M.writeFilePromise(y,C);let B={["*"]:{endOfLine:"lf",insertFinalNewline:!0},["*.{js,json,yml}"]:{charset:"utf-8",indentStyle:"space",indentSize:2}};(0,bAe.default)(B,t.get("initEditorConfig"));let v=`root = true
-`;for(let[L,H]of Object.entries(B)){v+=`
-[${L}]
-`;for(let[j,$]of Object.entries(H))v+=`${j.replace(/[A-Z]/g,W=>`_${W.toLowerCase()}`)} = ${$}
-`}let D=x.join(this.context.cwd,".editorconfig");M.existsSync(D)||await M.writeFilePromise(D,v),M.existsSync(x.join(this.context.cwd,".git"))||await Cr.execvp("git",["init"],{cwd:this.context.cwd})}}};Tu.paths=[["init"]],Tu.usage=ve.Usage({description:"create a new package",details:"\n      This command will setup a new package in your local directory.\n\n      If the `-p,--private` or `-w,--workspace` options are set, the package will be private by default.\n\n      If the `-w,--workspace` option is set, the package will be configured to accept a set of workspaces in the `packages/` directory.\n\n      If the `-i,--install` option is given a value, Yarn will first download it using `yarn set version` and only then forward the init call to the newly downloaded bundle. Without arguments, the downloaded bundle will be `latest`.\n\n      The initial settings of the manifest can be changed by using the `initScope` and `initFields` configuration values. Additionally, Yarn will generate an EditorConfig file whose rules can be altered via `initEditorConfig`, and will initialize a Git repository in the current directory.\n    ",examples:[["Create a new package in the local directory","yarn init"],["Create a new private package in the local directory","yarn init -p"],["Create a new package and store the Yarn release inside","yarn init -i=latest"],["Create a new private package and defines it as a workspace root","yarn init -w"]]});var E8e={configuration:{initScope:{description:"Scope used when creating packages via the init command",type:"STRING",default:null},initFields:{description:"Additional fields to set when creating packages via the init command",type:"MAP",valueDefinition:{description:"",type:"ANY"}},initEditorConfig:{description:"Extra rules to define in the generator editorconfig",type:"MAP",valueDefinition:{description:"",type:"ANY"}}},commands:[Tu]},I8e=E8e;var RO={};ut(RO,{default:()=>w8e});var AA="portal:",lA="link:";var GQ=class{supports(e,t){return!!e.reference.startsWith(AA)}getLocalPath(e,t){let{parentLocator:i,path:n}=P.parseFileStyleRange(e.reference,{protocol:AA});if(x.isAbsolute(n))return n;let s=t.fetcher.getLocalPath(i,t);return s===null?null:x.resolve(s,n)}async fetch(e,t){var c;let{parentLocator:i,path:n}=P.parseFileStyleRange(e.reference,{protocol:AA}),s=x.isAbsolute(n)?{packageFs:new qt(Oe.root),prefixPath:Oe.dot,localPath:Oe.root}:await t.fetcher.fetch(i,t),o=s.localPath?{packageFs:new qt(Oe.root),prefixPath:x.relative(Oe.root,s.localPath),localPath:Oe.root}:s;s!==o&&s.releaseFs&&s.releaseFs();let a=o.packageFs,l=x.resolve((c=o.localPath)!=null?c:o.packageFs.getRealPath(),o.prefixPath,n);return s.localPath?{packageFs:new qt(l,{baseFs:a}),releaseFs:o.releaseFs,prefixPath:Oe.dot,localPath:l}:{packageFs:new So(l,{baseFs:a}),releaseFs:o.releaseFs,prefixPath:Oe.dot}}};var YQ=class{supportsDescriptor(e,t){return!!e.range.startsWith(AA)}supportsLocator(e,t){return!!e.reference.startsWith(AA)}shouldPersistResolution(e,t){return!1}bindDescriptor(e,t,i){return P.bindDescriptor(e,{locator:P.stringifyLocator(t)})}getResolutionDependencies(e,t){return[]}async getCandidates(e,t,i){let n=e.range.slice(AA.length);return[P.makeLocator(e,`${AA}${K.toPortablePath(n)}`)]}async getSatisfying(e,t,i){return null}async resolve(e,t){if(!t.fetchOptions)throw new Error("Assertion failed: This resolver cannot be used unless a fetcher is configured");let i=await t.fetchOptions.fetcher.fetch(e,t.fetchOptions),n=await Ie.releaseAfterUseAsync(async()=>await ot.find(i.prefixPath,{baseFs:i.packageFs}),i.releaseFs);return{...e,version:n.version||"0.0.0",languageName:n.languageName||t.project.configuration.get("defaultLanguageName"),linkType:"SOFT",conditions:n.getConditions(),dependencies:new Map([...n.dependencies]),peerDependencies:n.peerDependencies,dependenciesMeta:n.dependenciesMeta,peerDependenciesMeta:n.peerDependenciesMeta,bin:n.bin}}};var jQ=class{supports(e,t){return!!e.reference.startsWith(lA)}getLocalPath(e,t){let{parentLocator:i,path:n}=P.parseFileStyleRange(e.reference,{protocol:lA});if(x.isAbsolute(n))return n;let s=t.fetcher.getLocalPath(i,t);return s===null?null:x.resolve(s,n)}async fetch(e,t){var c;let{parentLocator:i,path:n}=P.parseFileStyleRange(e.reference,{protocol:lA}),s=x.isAbsolute(n)?{packageFs:new qt(Oe.root),prefixPath:Oe.dot,localPath:Oe.root}:await t.fetcher.fetch(i,t),o=s.localPath?{packageFs:new qt(Oe.root),prefixPath:x.relative(Oe.root,s.localPath),localPath:Oe.root}:s;s!==o&&s.releaseFs&&s.releaseFs();let a=o.packageFs,l=x.resolve((c=o.localPath)!=null?c:o.packageFs.getRealPath(),o.prefixPath,n);return s.localPath?{packageFs:new qt(l,{baseFs:a}),releaseFs:o.releaseFs,prefixPath:Oe.dot,discardFromLookup:!0,localPath:l}:{packageFs:new So(l,{baseFs:a}),releaseFs:o.releaseFs,prefixPath:Oe.dot,discardFromLookup:!0}}};var qQ=class{supportsDescriptor(e,t){return!!e.range.startsWith(lA)}supportsLocator(e,t){return!!e.reference.startsWith(lA)}shouldPersistResolution(e,t){return!1}bindDescriptor(e,t,i){return P.bindDescriptor(e,{locator:P.stringifyLocator(t)})}getResolutionDependencies(e,t){return[]}async getCandidates(e,t,i){let n=e.range.slice(lA.length);return[P.makeLocator(e,`${lA}${K.toPortablePath(n)}`)]}async getSatisfying(e,t,i){return null}async resolve(e,t){return{...e,version:"0.0.0",languageName:t.project.configuration.get("defaultLanguageName"),linkType:"SOFT",conditions:null,dependencies:new Map,peerDependencies:new Map,dependenciesMeta:new Map,peerDependenciesMeta:new Map,bin:new Map}}};var y8e={fetchers:[jQ,GQ],resolvers:[qQ,YQ]},w8e=y8e;var uM={};ut(uM,{default:()=>Kze});var NO=(r,e)=>`${r}@${e}`,SAe=(r,e)=>{let t=e.indexOf("#"),i=t>=0?e.substring(t+1):e;return NO(r,i)};var PAe=(r,e={})=>{let t=e.debugLevel||Number(process.env.NM_DEBUG_LEVEL||-1),i=e.check||t>=9,n=e.hoistingLimits||new Map,s={check:i,debugLevel:t,hoistingLimits:n,fastLookupPossible:!0},o;s.debugLevel>=0&&(o=Date.now());let a=P8e(r,s),l=!1,c=0;do l=LO(a,[a],new Set([a.locator]),new Map,s).anotherRoundNeeded,s.fastLookupPossible=!1,c++;while(l);if(s.debugLevel>=0&&console.log(`hoist time: ${Date.now()-o}ms, rounds: ${c}`),s.debugLevel>=1){let u=_m(a);if(LO(a,[a],new Set([a.locator]),new Map,s).isGraphChanged)throw new Error(`The hoisting result is not terminal, prev tree:
-${u}, next tree:
-${_m(a)}`);let f=DAe(a);if(f)throw new Error(`${f}, after hoisting finished:
-${_m(a)}`)}return s.debugLevel>=2&&console.log(_m(a)),D8e(a)},B8e=r=>{let e=r[r.length-1],t=new Map,i=new Set,n=s=>{if(!i.has(s)){i.add(s);for(let o of s.hoistedDependencies.values())t.set(o.name,o);for(let o of s.dependencies.values())s.peerNames.has(o.name)||n(o)}};return n(e),t},Q8e=r=>{let e=r[r.length-1],t=new Map,i=new Set,n=new Set,s=(o,a)=>{if(i.has(o))return;i.add(o);for(let c of o.hoistedDependencies.values())if(!a.has(c.name)){let u;for(let g of r)u=g.dependencies.get(c.name),u&&t.set(u.name,u)}let l=new Set;for(let c of o.dependencies.values())l.add(c.name);for(let c of o.dependencies.values())o.peerNames.has(c.name)||s(c,l)};return s(e,n),t},vAe=(r,e)=>{if(e.decoupled)return e;let{name:t,references:i,ident:n,locator:s,dependencies:o,originalDependencies:a,hoistedDependencies:l,peerNames:c,reasons:u,isHoistBorder:g,hoistPriority:f,dependencyKind:h,hoistedFrom:p,hoistedTo:C}=e,y={name:t,references:new Set(i),ident:n,locator:s,dependencies:new Map(o),originalDependencies:new Map(a),hoistedDependencies:new Map(l),peerNames:new Set(c),reasons:new Map(u),decoupled:!0,isHoistBorder:g,hoistPriority:f,dependencyKind:h,hoistedFrom:new Map(p),hoistedTo:new Map(C)},B=y.dependencies.get(t);return B&&B.ident==y.ident&&y.dependencies.set(t,y),r.dependencies.set(y.name,y),y},b8e=(r,e)=>{let t=new Map([[r.name,[r.ident]]]);for(let n of r.dependencies.values())r.peerNames.has(n.name)||t.set(n.name,[n.ident]);let i=Array.from(e.keys());i.sort((n,s)=>{let o=e.get(n),a=e.get(s);return a.hoistPriority!==o.hoistPriority?a.hoistPriority-o.hoistPriority:a.peerDependents.size!==o.peerDependents.size?a.peerDependents.size-o.peerDependents.size:a.dependents.size-o.dependents.size});for(let n of i){let s=n.substring(0,n.indexOf("@",1)),o=n.substring(s.length+1);if(!r.peerNames.has(s)){let a=t.get(s);a||(a=[],t.set(s,a)),a.indexOf(o)<0&&a.push(o)}}return t},FO=r=>{let e=new Set,t=(i,n=new Set)=>{if(!n.has(i)){n.add(i);for(let s of i.peerNames)if(!r.peerNames.has(s)){let o=r.dependencies.get(s);o&&!e.has(o)&&t(o,n)}e.add(i)}};for(let i of r.dependencies.values())r.peerNames.has(i.name)||t(i);return e},LO=(r,e,t,i,n,s=new Set)=>{let o=e[e.length-1];if(s.has(o))return{anotherRoundNeeded:!1,isGraphChanged:!1};s.add(o);let a=k8e(o),l=b8e(o,a),c=r==o?new Map:n.fastLookupPossible?B8e(e):Q8e(e),u,g=!1,f=!1,h=new Map(Array.from(l.entries()).map(([C,y])=>[C,y[0]])),p=new Map;do{let C=x8e(r,e,t,c,h,l,i,p,n);C.isGraphChanged&&(f=!0),C.anotherRoundNeeded&&(g=!0),u=!1;for(let[y,B]of l)B.length>1&&!o.dependencies.has(y)&&(h.delete(y),B.shift(),h.set(y,B[0]),u=!0)}while(u);for(let C of o.dependencies.values())if(!o.peerNames.has(C.name)&&!t.has(C.locator)){t.add(C.locator);let y=LO(r,[...e,C],t,p,n);y.isGraphChanged&&(f=!0),y.anotherRoundNeeded&&(g=!0),t.delete(C.locator)}return{anotherRoundNeeded:g,isGraphChanged:f}},S8e=r=>{for(let[e,t]of r.dependencies)if(!r.peerNames.has(e)&&t.ident!==r.ident)return!0;return!1},v8e=(r,e,t,i,n,s,o,a,{outputReason:l,fastLookupPossible:c})=>{let u,g=null,f=new Set;l&&(u=`${Array.from(e).map(y=>ki(y)).join("\u2192")}`);let h=t[t.length-1],C=!(i.ident===h.ident);if(l&&!C&&(g="- self-reference"),C&&(C=i.dependencyKind!==1,l&&!C&&(g="- workspace")),C&&i.dependencyKind===2&&(C=!S8e(i),l&&!C&&(g="- external soft link with unhoisted dependencies")),C&&(C=h.dependencyKind!==1||h.hoistedFrom.has(i.name)||e.size===1,l&&!C&&(g=h.reasons.get(i.name))),C&&(C=!r.peerNames.has(i.name),l&&!C&&(g=`- cannot shadow peer: ${ki(r.originalDependencies.get(i.name).locator)} at ${u}`)),C){let y=!1,B=n.get(i.name);if(y=!B||B.ident===i.ident,l&&!y&&(g=`- filled by: ${ki(B.locator)} at ${u}`),y)for(let v=t.length-1;v>=1;v--){let L=t[v].dependencies.get(i.name);if(L&&L.ident!==i.ident){y=!1;let H=a.get(h);H||(H=new Set,a.set(h,H)),H.add(i.name),l&&(g=`- filled by ${ki(L.locator)} at ${t.slice(0,v).map(j=>ki(j.locator)).join("\u2192")}`);break}}C=y}if(C&&(C=s.get(i.name)===i.ident,l&&!C&&(g=`- filled by: ${ki(o.get(i.name)[0])} at ${u}`)),C){let y=!0,B=new Set(i.peerNames);for(let v=t.length-1;v>=1;v--){let D=t[v];for(let L of B){if(D.peerNames.has(L)&&D.originalDependencies.has(L))continue;let H=D.dependencies.get(L);H&&r.dependencies.get(L)!==H&&(v===t.length-1?f.add(H):(f=null,y=!1,l&&(g=`- peer dependency ${ki(H.locator)} from parent ${ki(D.locator)} was not hoisted to ${u}`))),B.delete(L)}if(!y)break}C=y}if(C&&!c)for(let y of i.hoistedDependencies.values()){let B=n.get(y.name)||r.dependencies.get(y.name);if(!B||y.ident!==B.ident){C=!1,l&&(g=`- previously hoisted dependency mismatch, needed: ${ki(y.locator)}, available: ${ki(B==null?void 0:B.locator)}`);break}}return f!==null&&f.size>0?{isHoistable:2,dependsOn:f,reason:g}:{isHoistable:C?0:1,reason:g}},JQ=r=>`${r.name}@${r.locator}`,x8e=(r,e,t,i,n,s,o,a,l)=>{let c=e[e.length-1],u=new Set,g=!1,f=!1,h=(B,v,D,L,H)=>{if(u.has(L))return;let j=[...v,JQ(L)],$=[...D,JQ(L)],V=new Map,W=new Map;for(let re of FO(L)){let O=v8e(c,t,[c,...B,L],re,i,n,s,a,{outputReason:l.debugLevel>=2,fastLookupPossible:l.fastLookupPossible});if(W.set(re,O),O.isHoistable===2)for(let F of O.dependsOn){let ue=V.get(F.name)||new Set;ue.add(re.name),V.set(F.name,ue)}}let _=new Set,A=(re,O,F)=>{if(!_.has(re)){_.add(re),W.set(re,{isHoistable:1,reason:F});for(let ue of V.get(re.name)||[])A(L.dependencies.get(ue),O,l.debugLevel>=2?`- peer dependency ${ki(re.locator)} from parent ${ki(L.locator)} was not hoisted`:"")}};for(let[re,O]of W)O.isHoistable===1&&A(re,O,O.reason);let ae=!1;for(let re of W.keys())if(!_.has(re)){f=!0;let O=o.get(L);O&&O.has(re.name)&&(g=!0),ae=!0,L.dependencies.delete(re.name),L.hoistedDependencies.set(re.name,re),L.reasons.delete(re.name);let F=c.dependencies.get(re.name);if(l.debugLevel>=2){let ue=Array.from(v).concat([L.locator]).map(ke=>ki(ke)).join("\u2192"),he=c.hoistedFrom.get(re.name);he||(he=[],c.hoistedFrom.set(re.name,he)),he.push(ue),L.hoistedTo.set(re.name,Array.from(e).map(ke=>ki(ke.locator)).join("\u2192"))}if(!F)c.ident!==re.ident&&(c.dependencies.set(re.name,re),H.add(re));else for(let ue of re.references)F.references.add(ue)}if(L.dependencyKind===2&&ae&&(g=!0),l.check){let re=DAe(r);if(re)throw new Error(`${re}, after hoisting dependencies of ${[c,...B,L].map(O=>ki(O.locator)).join("\u2192")}:
-${_m(r)}`)}let ge=FO(L);for(let re of ge)if(_.has(re)){let O=W.get(re);if((n.get(re.name)===re.ident||!L.reasons.has(re.name))&&O.isHoistable!==0&&L.reasons.set(re.name,O.reason),!re.isHoistBorder&&$.indexOf(JQ(re))<0){u.add(L);let ue=vAe(L,re);h([...B,L],j,$,ue,C),u.delete(L)}}},p,C=new Set(FO(c)),y=Array.from(e).map(B=>JQ(B));do{p=C,C=new Set;for(let B of p){if(B.locator===c.locator||B.isHoistBorder)continue;let v=vAe(c,B);h([],Array.from(t),y,v,C)}}while(C.size>0);return{anotherRoundNeeded:g,isGraphChanged:f}},DAe=r=>{let e=[],t=new Set,i=new Set,n=(s,o,a)=>{if(t.has(s)||(t.add(s),i.has(s)))return;let l=new Map(o);for(let c of s.dependencies.values())s.peerNames.has(c.name)||l.set(c.name,c);for(let c of s.originalDependencies.values()){let u=l.get(c.name),g=()=>`${Array.from(i).concat([s]).map(f=>ki(f.locator)).join("\u2192")}`;if(s.peerNames.has(c.name)){let f=o.get(c.name);(f!==u||!f||f.ident!==c.ident)&&e.push(`${g()} - broken peer promise: expected ${c.ident} but found ${f&&f.ident}`)}else{let f=a.hoistedFrom.get(s.name),h=s.hoistedTo.get(c.name),p=`${f?` hoisted from ${f.join(", ")}`:""}`,C=`${h?` hoisted to ${h}`:""}`,y=`${g()}${p}`;u?u.ident!==c.ident&&e.push(`${y} - broken require promise for ${c.name}${C}: expected ${c.ident}, but found: ${u.ident}`):e.push(`${y} - broken require promise: no required dependency ${c.name}${C} found`)}}i.add(s);for(let c of s.dependencies.values())s.peerNames.has(c.name)||n(c,l,s);i.delete(s)};return n(r,r.dependencies,r),e.join(`
-`)},P8e=(r,e)=>{let{identName:t,name:i,reference:n,peerNames:s}=r,o={name:i,references:new Set([n]),locator:NO(t,n),ident:SAe(t,n),dependencies:new Map,originalDependencies:new Map,hoistedDependencies:new Map,peerNames:new Set(s),reasons:new Map,decoupled:!0,isHoistBorder:!0,hoistPriority:0,dependencyKind:1,hoistedFrom:new Map,hoistedTo:new Map},a=new Map([[r,o]]),l=(c,u)=>{let g=a.get(c),f=!!g;if(!g){let{name:h,identName:p,reference:C,peerNames:y,hoistPriority:B,dependencyKind:v}=c,D=e.hoistingLimits.get(u.locator);g={name:h,references:new Set([C]),locator:NO(p,C),ident:SAe(p,C),dependencies:new Map,originalDependencies:new Map,hoistedDependencies:new Map,peerNames:new Set(y),reasons:new Map,decoupled:!0,isHoistBorder:D?D.has(h):!1,hoistPriority:B||0,dependencyKind:v||0,hoistedFrom:new Map,hoistedTo:new Map},a.set(c,g)}if(u.dependencies.set(c.name,g),u.originalDependencies.set(c.name,g),f){let h=new Set,p=C=>{if(!h.has(C)){h.add(C),C.decoupled=!1;for(let y of C.dependencies.values())C.peerNames.has(y.name)||p(y)}};p(g)}else for(let h of c.dependencies)l(h,g)};for(let c of r.dependencies)l(c,o);return o},TO=r=>r.substring(0,r.indexOf("@",1)),D8e=r=>{let e={name:r.name,identName:TO(r.locator),references:new Set(r.references),dependencies:new Set},t=new Set([r]),i=(n,s,o)=>{let a=t.has(n),l;if(s===n)l=o;else{let{name:c,references:u,locator:g}=n;l={name:c,identName:TO(g),references:u,dependencies:new Set}}if(o.dependencies.add(l),!a){t.add(n);for(let c of n.dependencies.values())n.peerNames.has(c.name)||i(c,n,l);t.delete(n)}};for(let n of r.dependencies.values())i(n,r,e);return e},k8e=r=>{let e=new Map,t=new Set([r]),i=o=>`${o.name}@${o.ident}`,n=o=>{let a=i(o),l=e.get(a);return l||(l={dependents:new Set,peerDependents:new Set,hoistPriority:0},e.set(a,l)),l},s=(o,a)=>{let l=!!t.has(a);if(n(a).dependents.add(o.ident),!l){t.add(a);for(let u of a.dependencies.values()){let g=n(u);g.hoistPriority=Math.max(g.hoistPriority,u.hoistPriority),a.peerNames.has(u.name)?g.peerDependents.add(a.ident):s(a,u)}}};for(let o of r.dependencies.values())r.peerNames.has(o.name)||s(r,o);return e},ki=r=>{if(!r)return"none";let e=r.indexOf("@",1),t=r.substring(0,e);t.endsWith("$wsroot$")&&(t=`wh:${t.replace("$wsroot$","")}`);let i=r.substring(e+1);if(i==="workspace:.")return".";if(i){let n=(i.indexOf("#")>0?i.split("#")[1]:i).replace("npm:","");return i.startsWith("virtual")&&(t=`v:${t}`),n.startsWith("workspace")&&(t=`w:${t}`,n=""),`${t}${n?`@${n}`:""}`}else return`${t}`},xAe=5e4,_m=r=>{let e=0,t=(n,s,o="")=>{if(e>xAe||s.has(n))return"";e++;let a=Array.from(n.dependencies.values()).sort((c,u)=>c.name===u.name?0:c.name>u.name?1:-1),l="";s.add(n);for(let c=0;c<a.length;c++){let u=a[c];if(!n.peerNames.has(u.name)&&u!==n){let g=n.reasons.get(u.name),f=TO(u.locator);l+=`${o}${c<a.length-1?"\u251C\u2500":"\u2514\u2500"}${(s.has(u)?">":"")+(f!==u.name?`a:${u.name}:`:"")+ki(u.locator)+(g?` ${g}`:"")}
-`,l+=t(u,s,`${o}${c<a.length-1?"\u2502 ":"  "}`)}}return s.delete(n),l};return t(r,new Set)+(e>xAe?`
-Tree is too large, part of the tree has been dunped
-`:"")};var $m=(i=>(i.WORKSPACES="workspaces",i.DEPENDENCIES="dependencies",i.NONE="none",i))($m||{}),kAe="node_modules",Ou="$wsroot$";var eE=(r,e)=>{let{packageTree:t,hoistingLimits:i,errors:n,preserveSymlinksRequired:s}=F8e(r,e),o=null;if(n.length===0){let a=PAe(t,{hoistingLimits:i});o=L8e(r,a,e)}return{tree:o,errors:n,preserveSymlinksRequired:s}},sa=r=>`${r.name}@${r.reference}`,MO=r=>{let e=new Map;for(let[t,i]of r.entries())if(!i.dirList){let n=e.get(i.locator);n||(n={target:i.target,linkType:i.linkType,locations:[],aliases:i.aliases},e.set(i.locator,n)),n.locations.push(t)}for(let t of e.values())t.locations=t.locations.sort((i,n)=>{let s=i.split(x.delimiter).length,o=n.split(x.delimiter).length;return n===i?0:s!==o?o-s:n>i?1:-1});return e},RAe=(r,e)=>{let t=P.isVirtualLocator(r)?P.devirtualizeLocator(r):r,i=P.isVirtualLocator(e)?P.devirtualizeLocator(e):e;return P.areLocatorsEqual(t,i)},OO=(r,e,t,i)=>{if(r.linkType!=="SOFT")return!1;let n=K.toPortablePath(t.resolveVirtual&&e.reference&&e.reference.startsWith("virtual:")?t.resolveVirtual(r.packageLocation):r.packageLocation);return x.contains(i,n)===null},R8e=r=>{let e=r.getPackageInformation(r.topLevel);if(e===null)throw new Error("Assertion failed: Expected the top-level package to have been registered");if(r.findPackageLocator(e.packageLocation)===null)throw new Error("Assertion failed: Expected the top-level package to have a physical locator");let i=K.toPortablePath(e.packageLocation.slice(0,-1)),n=new Map,s={children:new Map},o=r.getDependencyTreeRoots(),a=new Map,l=new Set,c=(f,h)=>{let p=sa(f);if(l.has(p))return;l.add(p);let C=r.getPackageInformation(f);if(C){let y=h?sa(h):"";if(sa(f)!==y&&C.linkType==="SOFT"&&!OO(C,f,r,i)){let B=FAe(C,f,r);(!a.get(B)||f.reference.startsWith("workspace:"))&&a.set(B,f)}for(let[B,v]of C.packageDependencies)v!==null&&(C.packagePeers.has(B)||c(r.getLocator(B,v),f))}};for(let f of o)c(f,null);let u=i.split(x.sep);for(let f of a.values()){let h=r.getPackageInformation(f),C=K.toPortablePath(h.packageLocation.slice(0,-1)).split(x.sep).slice(u.length),y=s;for(let B of C){let v=y.children.get(B);v||(v={children:new Map},y.children.set(B,v)),y=v}y.workspaceLocator=f}let g=(f,h)=>{if(f.workspaceLocator){let p=sa(h),C=n.get(p);C||(C=new Set,n.set(p,C)),C.add(f.workspaceLocator)}for(let p of f.children.values())g(p,f.workspaceLocator||h)};for(let f of s.children.values())g(f,s.workspaceLocator);return n},F8e=(r,e)=>{let t=[],i=!1,n=new Map,s=R8e(r),o=r.getPackageInformation(r.topLevel);if(o===null)throw new Error("Assertion failed: Expected the top-level package to have been registered");let a=r.findPackageLocator(o.packageLocation);if(a===null)throw new Error("Assertion failed: Expected the top-level package to have a physical locator");let l=K.toPortablePath(o.packageLocation.slice(0,-1)),c={name:a.name,identName:a.name,reference:a.reference,peerNames:o.packagePeers,dependencies:new Set,dependencyKind:1},u=new Map,g=(h,p)=>`${sa(p)}:${h}`,f=(h,p,C,y,B,v,D,L)=>{var re,O;let H=g(h,C),j=u.get(H),$=!!j;!$&&C.name===a.name&&C.reference===a.reference&&(j=c,u.set(H,c));let V=OO(p,C,r,l);if(!j){let F=0;V?F=2:p.linkType==="SOFT"&&C.name.endsWith(Ou)&&(F=1),j={name:h,identName:C.name,reference:C.reference,dependencies:new Set,peerNames:F===1?new Set:p.packagePeers,dependencyKind:F},u.set(H,j)}let W;if(V?W=2:B.linkType==="SOFT"?W=1:W=0,j.hoistPriority=Math.max(j.hoistPriority||0,W),L&&!V){let F=sa({name:y.identName,reference:y.reference}),ue=n.get(F)||new Set;n.set(F,ue),ue.add(j.name)}let _=new Map(p.packageDependencies);if(e.project){let F=e.project.workspacesByCwd.get(K.toPortablePath(p.packageLocation.slice(0,-1)));if(F){let ue=new Set([...Array.from(F.manifest.peerDependencies.values(),he=>P.stringifyIdent(he)),...Array.from(F.manifest.peerDependenciesMeta.keys())]);for(let he of ue)_.has(he)||(_.set(he,v.get(he)||null),j.peerNames.add(he))}}let A=sa({name:C.name.replace(Ou,""),reference:C.reference}),ae=s.get(A);if(ae)for(let F of ae)_.set(`${F.name}${Ou}`,F.reference);(p!==B||p.linkType!=="SOFT"||!V&&(!e.selfReferencesByCwd||e.selfReferencesByCwd.get(D)))&&y.dependencies.add(j);let ge=C!==a&&p.linkType==="SOFT"&&!C.name.endsWith(Ou)&&!V;if(!$&&!ge){let F=new Map;for(let[ue,he]of _)if(he!==null){let ke=r.getLocator(ue,he),Fe=r.getLocator(ue.replace(Ou,""),he),Ne=r.getPackageInformation(Fe);if(Ne===null)throw new Error("Assertion failed: Expected the package to have been registered");let oe=OO(Ne,ke,r,l);if(e.validateExternalSoftLinks&&e.project&&oe){Ne.packageDependencies.size>0&&(i=!0);for(let[qe,ne]of Ne.packageDependencies)if(ne!==null){let Y=P.parseLocator(Array.isArray(ne)?`${ne[0]}@${ne[1]}`:`${qe}@${ne}`);if(sa(Y)!==sa(ke)){let pe=_.get(qe);if(pe){let ie=P.parseLocator(Array.isArray(pe)?`${pe[0]}@${pe[1]}`:`${qe}@${pe}`);RAe(ie,Y)||t.push({messageName:71,text:`Cannot link ${P.prettyIdent(e.project.configuration,P.parseIdent(ke.name))} into ${P.prettyLocator(e.project.configuration,P.parseLocator(`${C.name}@${C.reference}`))} dependency ${P.prettyLocator(e.project.configuration,Y)} conflicts with parent dependency ${P.prettyLocator(e.project.configuration,ie)}`})}else{let ie=F.get(qe);if(ie){let de=ie.target,_e=P.parseLocator(Array.isArray(de)?`${de[0]}@${de[1]}`:`${qe}@${de}`);RAe(_e,Y)||t.push({messageName:71,text:`Cannot link ${P.prettyIdent(e.project.configuration,P.parseIdent(ke.name))} into ${P.prettyLocator(e.project.configuration,P.parseLocator(`${C.name}@${C.reference}`))} dependency ${P.prettyLocator(e.project.configuration,Y)} conflicts with dependency ${P.prettyLocator(e.project.configuration,_e)} from sibling portal ${P.prettyIdent(e.project.configuration,P.parseIdent(ie.portal.name))}`})}else F.set(qe,{target:Y.reference,portal:ke})}}}}let le=(re=e.hoistingLimitsByCwd)==null?void 0:re.get(D),we=oe?D:x.relative(l,K.toPortablePath(Ne.packageLocation))||Oe.dot,fe=(O=e.hoistingLimitsByCwd)==null?void 0:O.get(we);f(ue,Ne,ke,j,p,_,we,le==="dependencies"||fe==="dependencies"||fe==="workspaces")}}};return f(a.name,o,a,c,o,o.packageDependencies,Oe.dot,!1),{packageTree:c,hoistingLimits:n,errors:t,preserveSymlinksRequired:i}};function FAe(r,e,t){let i=t.resolveVirtual&&e.reference&&e.reference.startsWith("virtual:")?t.resolveVirtual(r.packageLocation):r.packageLocation;return K.toPortablePath(i||r.packageLocation)}function N8e(r,e,t){let i=e.getLocator(r.name.replace(Ou,""),r.reference),n=e.getPackageInformation(i);if(n===null)throw new Error("Assertion failed: Expected the package to be registered");let s,o;return t.pnpifyFs?(o=K.toPortablePath(n.packageLocation),s="SOFT"):(o=FAe(n,r,e),s=n.linkType),{linkType:s,target:o}}var L8e=(r,e,t)=>{let i=new Map,n=(u,g,f)=>{let{linkType:h,target:p}=N8e(u,r,t);return{locator:sa(u),nodePath:g,target:p,linkType:h,aliases:f}},s=u=>{let[g,f]=u.split("/");return f?{scope:Ur(g),name:Ur(f)}:{scope:null,name:Ur(g)}},o=new Set,a=(u,g,f)=>{if(o.has(u))return;o.add(u);let h=Array.from(u.references).sort().join("#");for(let p of u.dependencies){let C=Array.from(p.references).sort().join("#");if(p.identName===u.identName&&C===h)continue;let y=Array.from(p.references).sort(),B={name:p.identName,reference:y[0]},{name:v,scope:D}=s(p.name),L=D?[D,v]:[v],H=x.join(g,kAe),j=x.join(H,...L),$=`${f}/${B.name}`,V=n(B,f,y.slice(1)),W=!1;if(V.linkType==="SOFT"&&t.project){let A=t.project.workspacesByCwd.get(V.target.slice(0,-1));W=!!(A&&!A.manifest.name)}let _=V.linkType==="SOFT"&&j.startsWith(V.target);if(!p.name.endsWith(Ou)&&!W&&!_){let A=i.get(j);if(A){if(A.dirList)throw new Error(`Assertion failed: ${j} cannot merge dir node with leaf node`);{let O=P.parseLocator(A.locator),F=P.parseLocator(V.locator);if(A.linkType!==V.linkType)throw new Error(`Assertion failed: ${j} cannot merge nodes with different link types ${A.nodePath}/${P.stringifyLocator(O)} and ${f}/${P.stringifyLocator(F)}`);if(O.identHash!==F.identHash)throw new Error(`Assertion failed: ${j} cannot merge nodes with different idents ${A.nodePath}/${P.stringifyLocator(O)} and ${f}/s${P.stringifyLocator(F)}`);V.aliases=[...V.aliases,...A.aliases,P.parseLocator(A.locator).reference]}}i.set(j,V);let ae=j.split("/"),ge=ae.indexOf(kAe),re=ae.length-1;for(;ge>=0&&re>ge;){let O=K.toPortablePath(ae.slice(0,re).join(x.sep)),F=Ur(ae[re]),ue=i.get(O);if(!ue)i.set(O,{dirList:new Set([F])});else if(ue.dirList){if(ue.dirList.has(F))break;ue.dirList.add(F)}re--}}a(p,V.linkType==="SOFT"?V.target:j,$)}},l=n({name:e.name,reference:Array.from(e.references)[0]},"",[]),c=l.target;return i.set(c,l),a(e,c,""),i};var eM={};ut(eM,{PnpInstaller:()=>Uu,PnpLinker:()=>ml,default:()=>gze,getPnpPath:()=>El,jsInstallUtils:()=>po,pnpUtils:()=>cE,quotePathIfNeeded:()=>wle});var Ile=Pe(Xr()),yle=J("url");var NAe={["DEFAULT"]:{collapsed:!1,next:{["*"]:"DEFAULT"}},["TOP_LEVEL"]:{collapsed:!1,next:{fallbackExclusionList:"FALLBACK_EXCLUSION_LIST",packageRegistryData:"PACKAGE_REGISTRY_DATA",["*"]:"DEFAULT"}},["FALLBACK_EXCLUSION_LIST"]:{collapsed:!1,next:{["*"]:"FALLBACK_EXCLUSION_ENTRIES"}},["FALLBACK_EXCLUSION_ENTRIES"]:{collapsed:!0,next:{["*"]:"FALLBACK_EXCLUSION_DATA"}},["FALLBACK_EXCLUSION_DATA"]:{collapsed:!0,next:{["*"]:"DEFAULT"}},["PACKAGE_REGISTRY_DATA"]:{collapsed:!1,next:{["*"]:"PACKAGE_REGISTRY_ENTRIES"}},["PACKAGE_REGISTRY_ENTRIES"]:{collapsed:!0,next:{["*"]:"PACKAGE_STORE_DATA"}},["PACKAGE_STORE_DATA"]:{collapsed:!1,next:{["*"]:"PACKAGE_STORE_ENTRIES"}},["PACKAGE_STORE_ENTRIES"]:{collapsed:!0,next:{["*"]:"PACKAGE_INFORMATION_DATA"}},["PACKAGE_INFORMATION_DATA"]:{collapsed:!1,next:{packageDependencies:"PACKAGE_DEPENDENCIES",["*"]:"DEFAULT"}},["PACKAGE_DEPENDENCIES"]:{collapsed:!1,next:{["*"]:"PACKAGE_DEPENDENCY"}},["PACKAGE_DEPENDENCY"]:{collapsed:!0,next:{["*"]:"DEFAULT"}}};function T8e(r,e,t){let i="";i+="[";for(let n=0,s=r.length;n<s;++n)i+=WQ(String(n),r[n],e,t).replace(/^ +/g,""),n+1<s&&(i+=", ");return i+="]",i}function O8e(r,e,t){let i=`${t}  `,n="";n+=t,n+=`[
-`;for(let s=0,o=r.length;s<o;++s)n+=i+WQ(String(s),r[s],e,i).replace(/^ +/,""),s+1<o&&(n+=","),n+=`
-`;return n+=t,n+="]",n}function M8e(r,e,t){let i=Object.keys(r),n="";n+="{";for(let s=0,o=i.length,a=0;s<o;++s){let l=i[s],c=r[l];typeof c>"u"||(a!==0&&(n+=", "),n+=JSON.stringify(l),n+=": ",n+=WQ(l,c,e,t).replace(/^ +/g,""),a+=1)}return n+="}",n}function K8e(r,e,t){let i=Object.keys(r),n=`${t}  `,s="";s+=t,s+=`{
-`;let o=0;for(let a=0,l=i.length;a<l;++a){let c=i[a],u=r[c];typeof u>"u"||(o!==0&&(s+=",",s+=`
-`),s+=n,s+=JSON.stringify(c),s+=": ",s+=WQ(c,u,e,n).replace(/^ +/g,""),o+=1)}return o!==0&&(s+=`
-`),s+=t,s+="}",s}function WQ(r,e,t,i){let{next:n}=NAe[t],s=n[r]||n["*"];return LAe(e,s,i)}function LAe(r,e,t){let{collapsed:i}=NAe[e];return Array.isArray(r)?i?T8e(r,e,t):O8e(r,e,t):typeof r=="object"&&r!==null?i?M8e(r,e,t):K8e(r,e,t):JSON.stringify(r)}function TAe(r){return LAe(r,"TOP_LEVEL","")}function tE(r,e){let t=Array.from(r);Array.isArray(e)||(e=[e]);let i=[];for(let s of e)i.push(t.map(o=>s(o)));let n=t.map((s,o)=>o);return n.sort((s,o)=>{for(let a of i){let l=a[s]<a[o]?-1:a[s]>a[o]?1:0;if(l!==0)return l}return 0}),n.map(s=>t[s])}function U8e(r){let e=new Map,t=tE(r.fallbackExclusionList||[],[({name:i,reference:n})=>i,({name:i,reference:n})=>n]);for(let{name:i,reference:n}of t){let s=e.get(i);typeof s>"u"&&e.set(i,s=new Set),s.add(n)}return Array.from(e).map(([i,n])=>[i,Array.from(n)])}function H8e(r){return tE(r.fallbackPool||[],([e])=>e)}function G8e(r){let e=[];for(let[t,i]of tE(r.packageRegistry,([n])=>n===null?"0":`1${n}`)){let n=[];e.push([t,n]);for(let[s,{packageLocation:o,packageDependencies:a,packagePeers:l,linkType:c,discardFromLookup:u}]of tE(i,([g])=>g===null?"0":`1${g}`)){let g=[];t!==null&&s!==null&&!a.has(t)&&g.push([t,s]);for(let[p,C]of tE(a.entries(),([y])=>y))g.push([p,C]);let f=l&&l.size>0?Array.from(l):void 0,h=u||void 0;n.push([s,{packageLocation:o,packageDependencies:g,packagePeers:f,linkType:c,discardFromLookup:h}])}}return e}function rE(r){return{__info:["This file is automatically generated. Do not touch it, or risk","your modifications being lost. We also recommend you not to read","it either without using the @yarnpkg/pnp package, as the data layout","is entirely unspecified and WILL change from a version to another."],dependencyTreeRoots:r.dependencyTreeRoots,enableTopLevelFallback:r.enableTopLevelFallback||!1,ignorePatternData:r.ignorePattern||null,fallbackExclusionList:U8e(r),fallbackPool:H8e(r),packageRegistryData:G8e(r)}}var KAe=Pe(MAe());function UAe(r,e){return[r?`${r}
-`:"",`/* eslint-disable */
-`,`"use strict";
-`,`
-`,`function $$SETUP_STATE(hydrateRuntimeState, basePath) {
-`,e.replace(/^/gm,"  "),`}
-`,`
-`,(0,KAe.default)()].join("")}function Y8e(r){return JSON.stringify(r,null,2)}function j8e(r){return`'${r.replace(/\\/g,"\\\\").replace(/'/g,"\\'").replace(/\n/g,`\\
-`)}'`}function q8e(r){return[`return hydrateRuntimeState(JSON.parse(${j8e(TAe(r))}), {basePath: basePath || __dirname});
-`].join("")}function J8e(r){return[`var path = require('path');
-`,`var dataLocation = path.resolve(__dirname, ${JSON.stringify(r)});
-`,`return hydrateRuntimeState(require(dataLocation), {basePath: basePath || path.dirname(dataLocation)});
-`].join("")}function HAe(r){let e=rE(r),t=q8e(e);return UAe(r.shebang,t)}function GAe(r){let e=rE(r),t=J8e(r.dataLocation),i=UAe(r.shebang,t);return{dataFile:Y8e(e),loaderFile:i}}var gle=J("fs");var fle=J("util");function UO(r,{basePath:e}){let t=K.toPortablePath(e),i=x.resolve(t),n=r.ignorePatternData!==null?new RegExp(r.ignorePatternData):null,s=new Map,o=new Map(r.packageRegistryData.map(([g,f])=>[g,new Map(f.map(([h,p])=>{var D;if(g===null!=(h===null))throw new Error("Assertion failed: The name and reference should be null, or neither should");let C=(D=p.discardFromLookup)!=null?D:!1,y={name:g,reference:h},B=s.get(p.packageLocation);B?(B.discardFromLookup=B.discardFromLookup&&C,C||(B.locator=y)):s.set(p.packageLocation,{locator:y,discardFromLookup:C});let v=null;return[h,{packageDependencies:new Map(p.packageDependencies),packagePeers:new Set(p.packagePeers),linkType:p.linkType,discardFromLookup:C,get packageLocation(){return v||(v=x.join(i,p.packageLocation))}}]}))])),a=new Map(r.fallbackExclusionList.map(([g,f])=>[g,new Set(f)])),l=new Map(r.fallbackPool),c=r.dependencyTreeRoots,u=r.enableTopLevelFallback;return{basePath:t,dependencyTreeRoots:c,enableTopLevelFallback:u,fallbackExclusionList:a,fallbackPool:l,ignorePattern:n,packageLocatorsByLocations:s,packageRegistry:o}}var AE=J("module");function ep(r,e){if(typeof r=="string")return r;if(r){let t,i;if(Array.isArray(r)){for(t=0;t<r.length;t++)if(i=ep(r[t],e))return i}else for(t in r)if(e.has(t))return ep(r[t],e)}}function Mu(r,e,t){throw new Error(t?`No known conditions for "${e}" entry in "${r}" package`:`Missing "${e}" export in "${r}" package`)}function W8e(r,e){return e===r?".":e[0]==="."?e:e.replace(new RegExp("^"+r+"/"),"./")}function YAe(r,e=".",t={}){let{name:i,exports:n}=r;if(n){let{browser:s,require:o,unsafe:a,conditions:l=[]}=t,c=W8e(i,e);if(c[0]!=="."&&(c="./"+c),typeof n=="string")return c==="."?n:Mu(i,c);let u=new Set(["default",...l]);a||u.add(o?"require":"import"),a||u.add(s?"browser":"node");let g,f,h=!1;for(g in n){h=g[0]!==".";break}if(h)return c==="."?ep(n,u)||Mu(i,c,1):Mu(i,c);if(f=n[c])return ep(f,u)||Mu(i,c,1);for(g in n){if(f=g[g.length-1],f==="/"&&c.startsWith(g))return(f=ep(n[g],u))?f+c.substring(g.length):Mu(i,c,1);if(f==="*"&&c.startsWith(g.slice(0,-1))&&c.substring(g.length-1).length>0)return(f=ep(n[g],u))?f.replace("*",c.substring(g.length-1)):Mu(i,c,1)}return Mu(i,c)}}var rp=J("url"),WO=J("util");var go=J("url");var XAe=Pe(J("assert"));var jAe=Array.isArray,iE=JSON.stringify,HO=Object.getOwnPropertyNames,tp=(r,e)=>Object.prototype.hasOwnProperty.call(r,e),GO=(r,e)=>RegExp.prototype.exec.call(r,e),YO=(r,...e)=>RegExp.prototype[Symbol.replace].apply(r,e),nE=(r,...e)=>String.prototype.endsWith.apply(r,e),qAe=(r,...e)=>String.prototype.includes.apply(r,e),JAe=(r,...e)=>String.prototype.lastIndexOf.apply(r,e),zQ=(r,...e)=>String.prototype.indexOf.apply(r,e),WAe=(r,...e)=>String.prototype.replace.apply(r,e),sE=(r,...e)=>String.prototype.slice.apply(r,e),cA=(r,...e)=>String.prototype.startsWith.apply(r,e),zAe=Map,VAe=JSON.parse;function VQ(r,e,t){return class extends t{constructor(...i){super(e(...i)),this.code=r,this.name=`${t.name} [${r}]`}}}var ZAe=VQ("ERR_PACKAGE_IMPORT_NOT_DEFINED",(r,e,t)=>`Package import specifier "${r}" is not defined${e?` in package ${e}package.json`:""} imported from ${t}`,TypeError),jO=VQ("ERR_INVALID_MODULE_SPECIFIER",(r,e,t=void 0)=>`Invalid module "${r}" ${e}${t?` imported from ${t}`:""}`,TypeError),_Ae=VQ("ERR_INVALID_PACKAGE_TARGET",(r,e,t,i=!1,n=void 0)=>{let s=typeof t=="string"&&!i&&t.length&&!cA(t,"./");return e==="."?((0,XAe.default)(i===!1),`Invalid "exports" main target ${iE(t)} defined in the package config ${r}package.json${n?` imported from ${n}`:""}${s?'; targets must start with "./"':""}`):`Invalid "${i?"imports":"exports"}" target ${iE(t)} defined for '${e}' in the package config ${r}package.json${n?` imported from ${n}`:""}${s?'; targets must start with "./"':""}`},Error),XQ=VQ("ERR_INVALID_PACKAGE_CONFIG",(r,e,t)=>`Invalid package config ${r}${e?` while importing ${e}`:""}${t?`. ${t}`:""}`,Error);var _Q=J("url");function $Ae(r,e){let t=Object.create(null);for(let i=0;i<e.length;i++){let n=e[i];tp(r,n)&&(t[n]=r[n])}return t}var ZQ=new zAe;function z8e(r,e,t,i){let n=ZQ.get(r);if(n!==void 0)return n;let s=i(r);if(s===void 0){let h={pjsonPath:r,exists:!1,main:void 0,name:void 0,type:"none",exports:void 0,imports:void 0};return ZQ.set(r,h),h}let o;try{o=VAe(s)}catch(h){throw new XQ(r,(t?`"${e}" from `:"")+(0,_Q.fileURLToPath)(t||e),h.message)}let{imports:a,main:l,name:c,type:u}=$Ae(o,["imports","main","name","type"]),g=tp(o,"exports")?o.exports:void 0;(typeof a!="object"||a===null)&&(a=void 0),typeof l!="string"&&(l=void 0),typeof c!="string"&&(c=void 0),u!=="module"&&u!=="commonjs"&&(u="none");let f={pjsonPath:r,exists:!0,main:l,name:c,type:u,exports:g,imports:a};return ZQ.set(r,f),f}function ele(r,e){let t=new URL("./package.json",r);for(;;){let s=t.pathname;if(nE(s,"node_modules/package.json"))break;let o=z8e((0,_Q.fileURLToPath)(t),r,void 0,e);if(o.exists)return o;let a=t;if(t=new URL("../package.json",t),t.pathname===a.pathname)break}let i=(0,_Q.fileURLToPath)(t),n={pjsonPath:i,exists:!1,main:void 0,name:void 0,type:"none",exports:void 0,imports:void 0};return ZQ.set(i,n),n}function V8e(r,e,t){throw new ZAe(r,e&&(0,go.fileURLToPath)(new URL(".",e)),(0,go.fileURLToPath)(t))}function X8e(r,e,t,i){let n=`request is not a valid subpath for the "${t?"imports":"exports"}" resolution of ${(0,go.fileURLToPath)(e)}`;throw new jO(r,n,i&&(0,go.fileURLToPath)(i))}function oE(r,e,t,i,n){throw typeof e=="object"&&e!==null?e=iE(e,null,""):e=`${e}`,new _Ae((0,go.fileURLToPath)(new URL(".",t)),r,e,i,n&&(0,go.fileURLToPath)(n))}var tle=/(^|\\|\/)((\.|%2e)(\.|%2e)?|(n|%6e|%4e)(o|%6f|%4f)(d|%64|%44)(e|%65|%45)(_|%5f)(m|%6d|%4d)(o|%6f|%4f)(d|%64|%44)(u|%75|%55)(l|%6c|%4c)(e|%65|%45)(s|%73|%53))(\\|\/|$)/i,rle=/\*/g;function Z8e(r,e,t,i,n,s,o,a){if(e!==""&&!s&&r[r.length-1]!=="/"&&oE(t,r,i,o,n),!cA(r,"./")){if(o&&!cA(r,"../")&&!cA(r,"/")){let g=!1;try{new URL(r),g=!0}catch{}if(!g)return s?YO(rle,r,()=>e):r+e}oE(t,r,i,o,n)}GO(tle,sE(r,2))!==null&&oE(t,r,i,o,n);let l=new URL(r,i),c=l.pathname,u=new URL(".",i).pathname;if(cA(c,u)||oE(t,r,i,o,n),e==="")return l;if(GO(tle,e)!==null){let g=s?WAe(t,"*",()=>e):t+e;X8e(g,i,o,n)}return s?new URL(YO(rle,l.href,()=>e)):new URL(e,l)}function _8e(r){let e=+r;return`${e}`!==r?!1:e>=0&&e<4294967295}function $Q(r,e,t,i,n,s,o,a){if(typeof e=="string")return Z8e(e,t,i,r,n,s,o,a);if(jAe(e)){if(e.length===0)return null;let l;for(let c=0;c<e.length;c++){let u=e[c],g;try{g=$Q(r,u,t,i,n,s,o,a)}catch(f){if(l=f,f.code==="ERR_INVALID_PACKAGE_TARGET")continue;throw f}if(g!==void 0){if(g===null){l=null;continue}return g}}if(l==null)return l;throw l}else if(typeof e=="object"&&e!==null){let l=HO(e);for(let c=0;c<l.length;c++){let u=l[c];if(_8e(u))throw new XQ((0,go.fileURLToPath)(r),n,'"exports" cannot contain numeric property keys.')}for(let c=0;c<l.length;c++){let u=l[c];if(u==="default"||a.has(u)){let g=e[u],f=$Q(r,g,t,i,n,s,o,a);if(f===void 0)continue;return f}}return}else if(e===null)return null;oE(i,e,r,o,n)}function $8e(r,e){let t=zQ(r,"*"),i=zQ(e,"*"),n=t===-1?r.length:t+1,s=i===-1?e.length:i+1;return n>s?-1:s>n||t===-1?1:i===-1||r.length>e.length?-1:e.length>r.length?1:0}function ile({name:r,base:e,conditions:t,readFileSyncFn:i}){if(r==="#"||cA(r,"#/")||nE(r,"/")){let o="is not a valid internal imports specifier name";throw new jO(r,o,(0,go.fileURLToPath)(e))}let n,s=ele(e,i);if(s.exists){n=(0,go.pathToFileURL)(s.pjsonPath);let o=s.imports;if(o)if(tp(o,r)&&!qAe(r,"*")){let a=$Q(n,o[r],"",r,e,!1,!0,t);if(a!=null)return a}else{let a="",l,c=HO(o);for(let u=0;u<c.length;u++){let g=c[u],f=zQ(g,"*");if(f!==-1&&cA(r,sE(g,0,f))){let h=sE(g,f+1);r.length>=g.length&&nE(r,h)&&$8e(a,g)===1&&JAe(g,"*")===f&&(a=g,l=sE(r,f,r.length-h.length))}}if(a){let u=o[a],g=$Q(n,u,l,a,e,!0,!0,t);if(g!=null)return g}}}V8e(r,n,e)}var eze=new Set(["BUILTIN_NODE_RESOLUTION_FAILED","MISSING_DEPENDENCY","MISSING_PEER_DEPENDENCY","QUALIFIED_PATH_RESOLUTION_FAILED","UNDECLARED_DEPENDENCY"]);function ri(r,e,t={},i){i!=null||(i=eze.has(r)?"MODULE_NOT_FOUND":r);let n={configurable:!0,writable:!0,enumerable:!1};return Object.defineProperties(new Error(e),{code:{...n,value:i},pnpCode:{...n,value:r},data:{...n,value:t}})}function fo(r){return K.normalize(K.fromPortablePath(r))}var ale=Pe(sle());function Ale(r){return tze(),JO[r]}var JO;function tze(){JO||(JO={"--conditions":[],...ole(rze()),...ole(process.execArgv)})}function ole(r){return(0,ale.default)({"--conditions":[String],"-C":"--conditions"},{argv:r,permissive:!0})}function rze(){let r=[],e=ize(process.env.NODE_OPTIONS||"",r);return r.length,e}function ize(r,e){let t=[],i=!1,n=!0;for(let s=0;s<r.length;++s){let o=r[s];if(o==="\\"&&i){if(s+1===r.length)return e.push(`invalid value for NODE_OPTIONS (invalid escape)
-`),t;o=r[++s]}else if(o===" "&&!i){n=!0;continue}else if(o==='"'){i=!i;continue}n?(t.push(o),n=!1):t[t.length-1]+=o}return i&&e.push(`invalid value for NODE_OPTIONS (unterminated string)
-`),t}var cle=J("module");var[ho,Ku]=process.versions.node.split(".").map(r=>parseInt(r,10)),$wt=ho>16||ho===16&&Ku>=12,eBt=ho>17||ho===17&&Ku>=5||ho===16&&Ku>=15,tBt=ho>17||ho===17&&Ku>=1||ho===16&&Ku>14,lle=ho>19||ho===19&&Ku>=2||ho===18&&Ku>=13;var nze=new Set(cle.Module.builtinModules||Object.keys(process.binding("natives"))),eb=r=>r.startsWith("node:")||nze.has(r);function ule(r){if(process.env.WATCH_REPORT_DEPENDENCIES&&process.send)if(r=r.map(e=>K.fromPortablePath(Br.resolveVirtual(K.toPortablePath(e)))),lle)process.send({"watch:require":r});else for(let e of r)process.send({"watch:require":e})}function zO(r,e){let t=Number(process.env.PNP_ALWAYS_WARN_ON_FALLBACK)>0,i=Number(process.env.PNP_DEBUG_LEVEL),n=/^(?![a-zA-Z]:[\\/]|\\\\|\.{0,2}(?:\/|$))((?:node:)?(?:@[^/]+\/)?[^/]+)\/*(.*|)$/,s=/^(\/|\.{1,2}(\/|$))/,o=/\/$/,a=/^\.{0,2}\//,l={name:null,reference:null},c=[],u=new Set;if(r.enableTopLevelFallback===!0&&c.push(l),e.compatibilityMode!==!1)for(let oe of["react-scripts","gatsby"]){let le=r.packageRegistry.get(oe);if(le)for(let we of le.keys()){if(we===null)throw new Error("Assertion failed: This reference shouldn't be null");c.push({name:oe,reference:we})}}let{ignorePattern:g,packageRegistry:f,packageLocatorsByLocations:h}=r;function p(oe,le){return{fn:oe,args:le,error:null,result:null}}function C(oe){var qe,ne,Y,pe,ie,de;let le=(Y=(ne=(qe=process.stderr)==null?void 0:qe.hasColors)==null?void 0:ne.call(qe))!=null?Y:process.stdout.isTTY,we=(_e,Pt)=>`\x1B[${_e}m${Pt}\x1B[0m`,fe=oe.error;console.error(fe?we("31;1",`\u2716 ${(pe=oe.error)==null?void 0:pe.message.replace(/\n.*/s,"")}`):we("33;1","\u203C Resolution")),oe.args.length>0&&console.error();for(let _e of oe.args)console.error(`  ${we("37;1","In \u2190")} ${(0,WO.inspect)(_e,{colors:le,compact:!0})}`);oe.result&&(console.error(),console.error(`  ${we("37;1","Out \u2192")} ${(0,WO.inspect)(oe.result,{colors:le,compact:!0})}`));let Ae=(de=(ie=new Error().stack.match(/(?<=^ +)at.*/gm))==null?void 0:ie.slice(2))!=null?de:[];if(Ae.length>0){console.error();for(let _e of Ae)console.error(`  ${we("38;5;244",_e)}`)}console.error()}function y(oe,le){if(e.allowDebug===!1)return le;if(Number.isFinite(i)){if(i>=2)return(...we)=>{let fe=p(oe,we);try{return fe.result=le(...we)}catch(Ae){throw fe.error=Ae}finally{C(fe)}};if(i>=1)return(...we)=>{try{return le(...we)}catch(fe){let Ae=p(oe,we);throw Ae.error=fe,C(Ae),fe}}}return le}function B(oe){let le=A(oe);if(!le)throw ri("INTERNAL","Couldn't find a matching entry in the dependency tree for the specified parent (this is probably an internal error)");return le}function v(oe){if(oe.name===null)return!0;for(let le of r.dependencyTreeRoots)if(le.name===oe.name&&le.reference===oe.reference)return!0;return!1}let D=new Set(["default","node","require",...Ale("--conditions")]);function L(oe,le=D){let we=re(x.join(oe,"internal.js"),{resolveIgnored:!0,includeDiscardFromLookup:!0});if(we===null)throw ri("INTERNAL",`The locator that owns the "${oe}" path can't be found inside the dependency tree (this is probably an internal error)`);let{packageLocation:fe}=B(we),Ae=x.join(fe,xt.manifest);if(!e.fakeFs.existsSync(Ae))return null;let qe=JSON.parse(e.fakeFs.readFileSync(Ae,"utf8")),ne=x.contains(fe,oe);if(ne===null)throw ri("INTERNAL","unqualifiedPath doesn't contain the packageLocation (this is probably an internal error)");a.test(ne)||(ne=`./${ne}`);let Y;try{Y=YAe(qe,x.normalize(ne),{conditions:le,unsafe:!0})}catch(pe){throw ri("EXPORTS_RESOLUTION_FAILED",pe.message,{unqualifiedPath:fo(oe),locator:we,pkgJson:qe,subpath:fo(ne),conditions:le},"ERR_PACKAGE_PATH_NOT_EXPORTED")}return typeof Y=="string"?x.join(fe,Y):null}function H(oe,le,{extensions:we}){let fe;try{le.push(oe),fe=e.fakeFs.statSync(oe)}catch{}if(fe&&!fe.isDirectory())return e.fakeFs.realpathSync(oe);if(fe&&fe.isDirectory()){let Ae;try{Ae=JSON.parse(e.fakeFs.readFileSync(x.join(oe,xt.manifest),"utf8"))}catch{}let qe;if(Ae&&Ae.main&&(qe=x.resolve(oe,Ae.main)),qe&&qe!==oe){let ne=H(qe,le,{extensions:we});if(ne!==null)return ne}}for(let Ae=0,qe=we.length;Ae<qe;Ae++){let ne=`${oe}${we[Ae]}`;if(le.push(ne),e.fakeFs.existsSync(ne))return ne}if(fe&&fe.isDirectory())for(let Ae=0,qe=we.length;Ae<qe;Ae++){let ne=x.format({dir:oe,name:"index",ext:we[Ae]});if(le.push(ne),e.fakeFs.existsSync(ne))return ne}return null}function j(oe){let le=new AE.Module(oe,null);return le.filename=oe,le.paths=AE.Module._nodeModulePaths(oe),le}function $(oe,le){return le.endsWith("/")&&(le=x.join(le,"internal.js")),AE.Module._resolveFilename(K.fromPortablePath(oe),j(K.fromPortablePath(le)),!1,{plugnplay:!1})}function V(oe){if(g===null)return!1;let le=x.contains(r.basePath,oe);return le===null?!1:!!g.test(le.replace(/\/$/,""))}let W={std:3,resolveVirtual:1,getAllLocators:1},_=l;function A({name:oe,reference:le}){let we=f.get(oe);if(!we)return null;let fe=we.get(le);return fe||null}function ae({name:oe,reference:le}){let we=[];for(let[fe,Ae]of f)if(fe!==null)for(let[qe,ne]of Ae)qe===null||ne.packageDependencies.get(oe)!==le||fe===oe&&qe===le||we.push({name:fe,reference:qe});return we}function ge(oe,le){let we=new Map,fe=new Set,Ae=ne=>{let Y=JSON.stringify(ne.name);if(fe.has(Y))return;fe.add(Y);let pe=ae(ne);for(let ie of pe)if(B(ie).packagePeers.has(oe))Ae(ie);else{let _e=we.get(ie.name);typeof _e>"u"&&we.set(ie.name,_e=new Set),_e.add(ie.reference)}};Ae(le);let qe=[];for(let ne of[...we.keys()].sort())for(let Y of[...we.get(ne)].sort())qe.push({name:ne,reference:Y});return qe}function re(oe,{resolveIgnored:le=!1,includeDiscardFromLookup:we=!1}={}){if(V(oe)&&!le)return null;let fe=x.relative(r.basePath,oe);fe.match(s)||(fe=`./${fe}`),fe.endsWith("/")||(fe=`${fe}/`);do{let Ae=h.get(fe);if(typeof Ae>"u"||Ae.discardFromLookup&&!we){fe=fe.substring(0,fe.lastIndexOf("/",fe.length-2)+1);continue}return Ae.locator}while(fe!=="");return null}function O(oe){try{return e.fakeFs.readFileSync(K.toPortablePath(oe),"utf8")}catch(le){if(le.code==="ENOENT")return;throw le}}function F(oe,le,{considerBuiltins:we=!0}={}){if(oe.startsWith("#"))throw new Error("resolveToUnqualified can not handle private import mappings");if(oe==="pnpapi")return K.toPortablePath(e.pnpapiResolution);if(we&&eb(oe))return null;let fe=fo(oe),Ae=le&&fo(le);if(le&&V(le)&&(!x.isAbsolute(oe)||re(oe)===null)){let Y=$(oe,le);if(Y===!1)throw ri("BUILTIN_NODE_RESOLUTION_FAILED",`The builtin node resolution algorithm was unable to resolve the requested module (it didn't go through the pnp resolver because the issuer was explicitely ignored by the regexp)
-
-Require request: "${fe}"
-Required by: ${Ae}
-`,{request:fe,issuer:Ae});return K.toPortablePath(Y)}let qe,ne=oe.match(n);if(ne){if(!le)throw ri("API_ERROR","The resolveToUnqualified function must be called with a valid issuer when the path isn't a builtin nor absolute",{request:fe,issuer:Ae});let[,Y,pe]=ne,ie=re(le);if(!ie){let hr=$(oe,le);if(hr===!1)throw ri("BUILTIN_NODE_RESOLUTION_FAILED",`The builtin node resolution algorithm was unable to resolve the requested module (it didn't go through the pnp resolver because the issuer doesn't seem to be part of the Yarn-managed dependency tree).
-
-Require path: "${fe}"
-Required by: ${Ae}
-`,{request:fe,issuer:Ae});return K.toPortablePath(hr)}let _e=B(ie).packageDependencies.get(Y),Pt=null;if(_e==null&&ie.name!==null){let hr=r.fallbackExclusionList.get(ie.name);if(!hr||!hr.has(ie.reference)){for(let ni=0,Os=c.length;ni<Os;++ni){let Ii=B(c[ni]).packageDependencies.get(Y);if(Ii!=null){t?Pt=Ii:_e=Ii;break}}if(r.enableTopLevelFallback&&_e==null&&Pt===null){let ni=r.fallbackPool.get(Y);ni!=null&&(Pt=ni)}}}let It=null;if(_e===null)if(v(ie))It=ri("MISSING_PEER_DEPENDENCY",`Your application tried to access ${Y} (a peer dependency); this isn't allowed as there is no ancestor to satisfy the requirement. Use a devDependency if needed.
-
-Required package: ${Y}${Y!==fe?` (via "${fe}")`:""}
-Required by: ${Ae}
-`,{request:fe,issuer:Ae,dependencyName:Y});else{let hr=ge(Y,ie);hr.every(fi=>v(fi))?It=ri("MISSING_PEER_DEPENDENCY",`${ie.name} tried to access ${Y} (a peer dependency) but it isn't provided by your application; this makes the require call ambiguous and unsound.
-
-Required package: ${Y}${Y!==fe?` (via "${fe}")`:""}
-Required by: ${ie.name}@${ie.reference} (via ${Ae})
-${hr.map(fi=>`Ancestor breaking the chain: ${fi.name}@${fi.reference}
-`).join("")}
-`,{request:fe,issuer:Ae,issuerLocator:Object.assign({},ie),dependencyName:Y,brokenAncestors:hr}):It=ri("MISSING_PEER_DEPENDENCY",`${ie.name} tried to access ${Y} (a peer dependency) but it isn't provided by its ancestors; this makes the require call ambiguous and unsound.
-
-Required package: ${Y}${Y!==fe?` (via "${fe}")`:""}
-Required by: ${ie.name}@${ie.reference} (via ${Ae})
-
-${hr.map(fi=>`Ancestor breaking the chain: ${fi.name}@${fi.reference}
-`).join("")}
-`,{request:fe,issuer:Ae,issuerLocator:Object.assign({},ie),dependencyName:Y,brokenAncestors:hr})}else _e===void 0&&(!we&&eb(oe)?v(ie)?It=ri("UNDECLARED_DEPENDENCY",`Your application tried to access ${Y}. While this module is usually interpreted as a Node builtin, your resolver is running inside a non-Node resolution context where such builtins are ignored. Since ${Y} isn't otherwise declared in your dependencies, this makes the require call ambiguous and unsound.
-
-Required package: ${Y}${Y!==fe?` (via "${fe}")`:""}
-Required by: ${Ae}
-`,{request:fe,issuer:Ae,dependencyName:Y}):It=ri("UNDECLARED_DEPENDENCY",`${ie.name} tried to access ${Y}. While this module is usually interpreted as a Node builtin, your resolver is running inside a non-Node resolution context where such builtins are ignored. Since ${Y} isn't otherwise declared in ${ie.name}'s dependencies, this makes the require call ambiguous and unsound.
-
-Required package: ${Y}${Y!==fe?` (via "${fe}")`:""}
-Required by: ${Ae}
-`,{request:fe,issuer:Ae,issuerLocator:Object.assign({},ie),dependencyName:Y}):v(ie)?It=ri("UNDECLARED_DEPENDENCY",`Your application tried to access ${Y}, but it isn't declared in your dependencies; this makes the require call ambiguous and unsound.
-
-Required package: ${Y}${Y!==fe?` (via "${fe}")`:""}
-Required by: ${Ae}
-`,{request:fe,issuer:Ae,dependencyName:Y}):It=ri("UNDECLARED_DEPENDENCY",`${ie.name} tried to access ${Y}, but it isn't declared in its dependencies; this makes the require call ambiguous and unsound.
-
-Required package: ${Y}${Y!==fe?` (via "${fe}")`:""}
-Required by: ${ie.name}@${ie.reference} (via ${Ae})
-`,{request:fe,issuer:Ae,issuerLocator:Object.assign({},ie),dependencyName:Y}));if(_e==null){if(Pt===null||It===null)throw It||new Error("Assertion failed: Expected an error to have been set");_e=Pt;let hr=It.message.replace(/\n.*/g,"");It.message=hr,!u.has(hr)&&i!==0&&(u.add(hr),process.emitWarning(It))}let Or=Array.isArray(_e)?{name:_e[0],reference:_e[1]}:{name:Y,reference:_e},ii=B(Or);if(!ii.packageLocation)throw ri("MISSING_DEPENDENCY",`A dependency seems valid but didn't get installed for some reason. This might be caused by a partial install, such as dev vs prod.
-
-Required package: ${Or.name}@${Or.reference}${Or.name!==fe?` (via "${fe}")`:""}
-Required by: ${ie.name}@${ie.reference} (via ${Ae})
-`,{request:fe,issuer:Ae,dependencyLocator:Object.assign({},Or)});let gi=ii.packageLocation;pe?qe=x.join(gi,pe):qe=gi}else if(x.isAbsolute(oe))qe=x.normalize(oe);else{if(!le)throw ri("API_ERROR","The resolveToUnqualified function must be called with a valid issuer when the path isn't a builtin nor absolute",{request:fe,issuer:Ae});let Y=x.resolve(le);le.match(o)?qe=x.normalize(x.join(Y,oe)):qe=x.normalize(x.join(x.dirname(Y),oe))}return x.normalize(qe)}function ue(oe,le,we=D){if(s.test(oe))return le;let fe=L(le,we);return fe?x.normalize(fe):le}function he(oe,{extensions:le=Object.keys(AE.Module._extensions)}={}){var Ae,qe;let we=[],fe=H(oe,we,{extensions:le});if(fe)return x.normalize(fe);{ule(we.map(pe=>K.fromPortablePath(pe)));let ne=fo(oe),Y=re(oe);if(Y){let{packageLocation:pe}=B(Y),ie=!0;try{e.fakeFs.accessSync(pe)}catch(de){if((de==null?void 0:de.code)==="ENOENT")ie=!1;else{let _e=((qe=(Ae=de==null?void 0:de.message)!=null?Ae:de)!=null?qe:"empty exception thrown").replace(/^[A-Z]/,Pt=>Pt.toLowerCase());throw ri("QUALIFIED_PATH_RESOLUTION_FAILED",`Required package exists but could not be accessed (${_e}).
-
-Missing package: ${Y.name}@${Y.reference}
-Expected package location: ${fo(pe)}
-`,{unqualifiedPath:ne,extensions:le})}}if(!ie){let de=pe.includes("/unplugged/")?"Required unplugged package missing from disk. This may happen when switching branches without running installs (unplugged packages must be fully materialized on disk to work).":"Required package missing from disk. If you keep your packages inside your repository then restarting the Node process may be enough. Otherwise, try to run an install first.";throw ri("QUALIFIED_PATH_RESOLUTION_FAILED",`${de}
-
-Missing package: ${Y.name}@${Y.reference}
-Expected package location: ${fo(pe)}
-`,{unqualifiedPath:ne,extensions:le})}}throw ri("QUALIFIED_PATH_RESOLUTION_FAILED",`Qualified path resolution failed: we looked for the following paths, but none could be accessed.
-
-Source path: ${ne}
-${we.map(pe=>`Not found: ${fo(pe)}
-`).join("")}`,{unqualifiedPath:ne,extensions:le})}}function ke(oe,le,we){var Ae;if(!le)throw new Error("Assertion failed: An issuer is required to resolve private import mappings");let fe=ile({name:oe,base:(0,rp.pathToFileURL)(K.fromPortablePath(le)),conditions:(Ae=we.conditions)!=null?Ae:D,readFileSyncFn:O});if(fe instanceof rp.URL)return he(K.toPortablePath((0,rp.fileURLToPath)(fe)),{extensions:we.extensions});if(fe.startsWith("#"))throw new Error("Mapping from one private import to another isn't allowed");return Fe(fe,le,we)}function Fe(oe,le,we={}){try{if(oe.startsWith("#"))return ke(oe,le,we);let{considerBuiltins:fe,extensions:Ae,conditions:qe}=we,ne=F(oe,le,{considerBuiltins:fe});if(oe==="pnpapi")return ne;if(ne===null)return null;let Y=()=>le!==null?V(le):!1,pe=(!fe||!eb(oe))&&!Y()?ue(oe,ne,qe):ne;return he(pe,{extensions:Ae})}catch(fe){throw Object.prototype.hasOwnProperty.call(fe,"pnpCode")&&Object.assign(fe.data,{request:fo(oe),issuer:le&&fo(le)}),fe}}function Ne(oe){let le=x.normalize(oe),we=Br.resolveVirtual(le);return we!==le?we:null}return{VERSIONS:W,topLevel:_,getLocator:(oe,le)=>Array.isArray(le)?{name:le[0],reference:le[1]}:{name:oe,reference:le},getDependencyTreeRoots:()=>[...r.dependencyTreeRoots],getAllLocators(){let oe=[];for(let[le,we]of f)for(let fe of we.keys())le!==null&&fe!==null&&oe.push({name:le,reference:fe});return oe},getPackageInformation:oe=>{let le=A(oe);if(le===null)return null;let we=K.fromPortablePath(le.packageLocation);return{...le,packageLocation:we}},findPackageLocator:oe=>re(K.toPortablePath(oe)),resolveToUnqualified:y("resolveToUnqualified",(oe,le,we)=>{let fe=le!==null?K.toPortablePath(le):null,Ae=F(K.toPortablePath(oe),fe,we);return Ae===null?null:K.fromPortablePath(Ae)}),resolveUnqualified:y("resolveUnqualified",(oe,le)=>K.fromPortablePath(he(K.toPortablePath(oe),le))),resolveRequest:y("resolveRequest",(oe,le,we)=>{let fe=le!==null?K.toPortablePath(le):null,Ae=Fe(K.toPortablePath(oe),fe,we);return Ae===null?null:K.fromPortablePath(Ae)}),resolveVirtual:y("resolveVirtual",oe=>{let le=Ne(K.toPortablePath(oe));return le!==null?K.fromPortablePath(le):null})}}var EBt=(0,fle.promisify)(gle.readFile);var hle=(r,e,t)=>{let i=rE(r),n=UO(i,{basePath:e}),s=K.join(e,xt.pnpCjs);return zO(n,{fakeFs:t,pnpapiResolution:s})};var XO=Pe(dle());var po={};ut(po,{checkAndReportManifestCompatibility:()=>mle,checkManifestCompatibility:()=>Cle,extractBuildScripts:()=>tb,getExtractHint:()=>ZO,hasBindingGyp:()=>_O});function Cle(r){return P.isPackageCompatible(r,Is.getArchitectureSet())}function mle(r,e,{configuration:t,report:i}){return Cle(r)?!0:(i==null||i.reportWarningOnce(76,`${P.prettyLocator(t,r)} The ${Is.getArchitectureName()} architecture is incompatible with this package, ${e} skipped.`),!1)}function tb(r,e,t,{configuration:i,report:n}){let s=[];for(let a of["preinstall","install","postinstall"])e.manifest.scripts.has(a)&&s.push([0,a]);return!e.manifest.scripts.has("install")&&e.misc.hasBindingGyp&&s.push([1,"node-gyp rebuild"]),s.length===0?[]:r.linkType!=="HARD"?(n==null||n.reportWarningOnce(6,`${P.prettyLocator(i,r)} lists build scripts, but is referenced through a soft link. Soft links don't support build scripts, so they'll be ignored.`),[]):t&&t.built===!1?(n==null||n.reportInfoOnce(5,`${P.prettyLocator(i,r)} lists build scripts, but its build has been explicitly disabled through configuration.`),[]):!i.get("enableScripts")&&!t.built?(n==null||n.reportWarningOnce(4,`${P.prettyLocator(i,r)} lists build scripts, but all build scripts have been disabled.`),[]):mle(r,"build",{configuration:i,report:n})?s:[]}var oze=new Set([".exe",".h",".hh",".hpp",".c",".cc",".cpp",".java",".jar",".node"]);function ZO(r){return r.packageFs.getExtractHint({relevantExtensions:oze})}function _O(r){let e=x.join(r.prefixPath,"binding.gyp");return r.packageFs.existsSync(e)}var cE={};ut(cE,{getUnpluggedPath:()=>lE});function lE(r,{configuration:e}){return x.resolve(e.get("pnpUnpluggedFolder"),P.slugifyLocator(r))}var aze=new Set([P.makeIdent(null,"open").identHash,P.makeIdent(null,"opn").identHash]),ml=class{constructor(){this.mode="strict";this.pnpCache=new Map}supportsPackage(e,t){return this.isEnabled(t)}async findPackageLocation(e,t){if(!this.isEnabled(t))throw new Error("Assertion failed: Expected the PnP linker to be enabled");let i=El(t.project).cjs;if(!M.existsSync(i))throw new be(`The project in ${ee.pretty(t.project.configuration,`${t.project.cwd}/package.json`,ee.Type.PATH)} doesn't seem to have been installed - running an install there might help`);let n=Ie.getFactoryWithDefault(this.pnpCache,i,()=>Ie.dynamicRequire(i,{cachingStrategy:Ie.CachingStrategy.FsTime})),s={name:P.stringifyIdent(e),reference:e.reference},o=n.getPackageInformation(s);if(!o)throw new be(`Couldn't find ${P.prettyLocator(t.project.configuration,e)} in the currently installed PnP map - running an install might help`);return K.toPortablePath(o.packageLocation)}async findPackageLocator(e,t){if(!this.isEnabled(t))return null;let i=El(t.project).cjs;if(!M.existsSync(i))return null;let s=Ie.getFactoryWithDefault(this.pnpCache,i,()=>Ie.dynamicRequire(i,{cachingStrategy:Ie.CachingStrategy.FsTime})).findPackageLocator(K.fromPortablePath(e));return s?P.makeLocator(P.parseIdent(s.name),s.reference):null}makeInstaller(e){return new Uu(e)}isEnabled(e){return!(e.project.configuration.get("nodeLinker")!=="pnp"||e.project.configuration.get("pnpMode")!==this.mode)}},Uu=class{constructor(e){this.opts=e;this.mode="strict";this.asyncActions=new Ie.AsyncActions(10);this.packageRegistry=new Map;this.virtualTemplates=new Map;this.isESMLoaderRequired=!1;this.customData={store:new Map};this.unpluggedPaths=new Set;this.opts=e}getCustomDataKey(){return JSON.stringify({name:"PnpInstaller",version:2})}attachCustomData(e){this.customData=e}async installPackage(e,t,i){let n=P.stringifyIdent(e),s=e.reference,o=!!this.opts.project.tryWorkspaceByLocator(e),a=P.isVirtualLocator(e),l=e.peerDependencies.size>0&&!a,c=!l&&!o,u=!l&&e.linkType!=="SOFT",g,f;if(c||u){let D=a?P.devirtualizeLocator(e):e;g=this.customData.store.get(D.locatorHash),typeof g>"u"&&(g=await Aze(t),e.linkType==="HARD"&&this.customData.store.set(D.locatorHash,g)),g.manifest.type==="module"&&(this.isESMLoaderRequired=!0),f=this.opts.project.getDependencyMeta(D,e.version)}let h=c?tb(e,g,f,{configuration:this.opts.project.configuration,report:this.opts.report}):[],p=u?await this.unplugPackageIfNeeded(e,g,t,f,i):t.packageFs;if(x.isAbsolute(t.prefixPath))throw new Error(`Assertion failed: Expected the prefix path (${t.prefixPath}) to be relative to the parent`);let C=x.resolve(p.getRealPath(),t.prefixPath),y=$O(this.opts.project.cwd,C),B=new Map,v=new Set;if(a){for(let D of e.peerDependencies.values())B.set(P.stringifyIdent(D),null),v.add(P.stringifyIdent(D));if(!o){let D=P.devirtualizeLocator(e);this.virtualTemplates.set(D.locatorHash,{location:$O(this.opts.project.cwd,Br.resolveVirtual(C)),locator:D})}}return Ie.getMapWithDefault(this.packageRegistry,n).set(s,{packageLocation:y,packageDependencies:B,packagePeers:v,linkType:e.linkType,discardFromLookup:t.discardFromLookup||!1}),{packageLocation:C,buildDirective:h.length>0?h:null}}async attachInternalDependencies(e,t){let i=this.getPackageInformation(e);for(let[n,s]of t){let o=P.areIdentsEqual(n,s)?s.reference:[P.stringifyIdent(s),s.reference];i.packageDependencies.set(P.stringifyIdent(n),o)}}async attachExternalDependents(e,t){for(let i of t)this.getDiskInformation(i).packageDependencies.set(P.stringifyIdent(e),e.reference)}async finalizeInstall(){if(this.opts.project.configuration.get("pnpMode")!==this.mode)return;let e=El(this.opts.project);if(M.existsSync(e.cjsLegacy)&&(this.opts.report.reportWarning(0,`Removing the old ${ee.pretty(this.opts.project.configuration,xt.pnpJs,ee.Type.PATH)} file. You might need to manually update existing references to reference the new ${ee.pretty(this.opts.project.configuration,xt.pnpCjs,ee.Type.PATH)} file. If you use Editor SDKs, you'll have to rerun ${ee.pretty(this.opts.project.configuration,"yarn sdks",ee.Type.CODE)}.`),await M.removePromise(e.cjsLegacy)),this.isEsmEnabled()||await M.removePromise(e.esmLoader),this.opts.project.configuration.get("nodeLinker")!=="pnp"){await M.removePromise(e.cjs),await M.removePromise(this.opts.project.configuration.get("pnpDataPath")),await M.removePromise(e.esmLoader),await M.removePromise(this.opts.project.configuration.get("pnpUnpluggedFolder"));return}for(let{locator:u,location:g}of this.virtualTemplates.values())Ie.getMapWithDefault(this.packageRegistry,P.stringifyIdent(u)).set(u.reference,{packageLocation:g,packageDependencies:new Map,packagePeers:new Set,linkType:"SOFT",discardFromLookup:!1});this.packageRegistry.set(null,new Map([[null,this.getPackageInformation(this.opts.project.topLevelWorkspace.anchoredLocator)]]));let t=this.opts.project.configuration.get("pnpFallbackMode"),i=this.opts.project.workspaces.map(({anchoredLocator:u})=>({name:P.stringifyIdent(u),reference:u.reference})),n=t!=="none",s=[],o=new Map,a=Ie.buildIgnorePattern([".yarn/sdks/**",...this.opts.project.configuration.get("pnpIgnorePatterns")]),l=this.packageRegistry,c=this.opts.project.configuration.get("pnpShebang");if(t==="dependencies-only")for(let u of this.opts.project.storedPackages.values())this.opts.project.tryWorkspaceByLocator(u)&&s.push({name:P.stringifyIdent(u),reference:u.reference});return await this.asyncActions.wait(),await this.finalizeInstallWithPnp({dependencyTreeRoots:i,enableTopLevelFallback:n,fallbackExclusionList:s,fallbackPool:o,ignorePattern:a,packageRegistry:l,shebang:c}),{customData:this.customData}}async transformPnpSettings(e){}isEsmEnabled(){if(this.opts.project.configuration.sources.has("pnpEnableEsmLoader"))return this.opts.project.configuration.get("pnpEnableEsmLoader");if(this.isESMLoaderRequired)return!0;for(let e of this.opts.project.workspaces)if(e.manifest.type==="module")return!0;return!1}async finalizeInstallWithPnp(e){let t=El(this.opts.project),i=this.opts.project.configuration.get("pnpDataPath"),n=await this.locateNodeModules(e.ignorePattern);if(n.length>0){this.opts.report.reportWarning(31,"One or more node_modules have been detected and will be removed. This operation may take some time.");for(let o of n)await M.removePromise(o)}if(await this.transformPnpSettings(e),this.opts.project.configuration.get("pnpEnableInlining")){let o=HAe(e);await M.changeFilePromise(t.cjs,o,{automaticNewlines:!0,mode:493}),await M.removePromise(i)}else{let o=x.relative(x.dirname(t.cjs),i),{dataFile:a,loaderFile:l}=GAe({...e,dataLocation:o});await M.changeFilePromise(t.cjs,l,{automaticNewlines:!0,mode:493}),await M.changeFilePromise(i,a,{automaticNewlines:!0,mode:420})}this.isEsmEnabled()&&(this.opts.report.reportWarning(0,"ESM support for PnP uses the experimental loader API and is therefore experimental"),await M.changeFilePromise(t.esmLoader,(0,XO.default)(),{automaticNewlines:!0,mode:420}));let s=this.opts.project.configuration.get("pnpUnpluggedFolder");if(this.unpluggedPaths.size===0)await M.removePromise(s);else for(let o of await M.readdirPromise(s)){let a=x.resolve(s,o);this.unpluggedPaths.has(a)||await M.removePromise(a)}}async locateNodeModules(e){let t=[],i=e?new RegExp(e):null;for(let n of this.opts.project.workspaces){let s=x.join(n.cwd,"node_modules");if(i&&i.test(x.relative(this.opts.project.cwd,n.cwd))||!M.existsSync(s))continue;let o=await M.readdirPromise(s,{withFileTypes:!0}),a=o.filter(l=>!l.isDirectory()||l.name===".bin"||!l.name.startsWith("."));if(a.length===o.length)t.push(s);else for(let l of a)t.push(x.join(s,l.name))}return t}async unplugPackageIfNeeded(e,t,i,n,s){return this.shouldBeUnplugged(e,t,n)?this.unplugPackage(e,i,s):i.packageFs}shouldBeUnplugged(e,t,i){return typeof i.unplugged<"u"?i.unplugged:aze.has(e.identHash)||e.conditions!=null?!0:t.manifest.preferUnplugged!==null?t.manifest.preferUnplugged:!!(tb(e,t,i,{configuration:this.opts.project.configuration}).length>0||t.misc.extractHint)}async unplugPackage(e,t,i){let n=lE(e,{configuration:this.opts.project.configuration});return this.opts.project.disabledLocators.has(e.locatorHash)?new bo(n,{baseFs:t.packageFs,pathUtils:x}):(this.unpluggedPaths.add(n),i.holdFetchResult(this.asyncActions.set(e.locatorHash,async()=>{let s=x.join(n,t.prefixPath,".ready");await M.existsPromise(s)||(this.opts.project.storedBuildState.delete(e.locatorHash),await M.mkdirPromise(n,{recursive:!0}),await M.copyPromise(n,Oe.dot,{baseFs:t.packageFs,overwrite:!1}),await M.writeFilePromise(s,""))})),new qt(n))}getPackageInformation(e){let t=P.stringifyIdent(e),i=e.reference,n=this.packageRegistry.get(t);if(!n)throw new Error(`Assertion failed: The package information store should have been available (for ${P.prettyIdent(this.opts.project.configuration,e)})`);let s=n.get(i);if(!s)throw new Error(`Assertion failed: The package information should have been available (for ${P.prettyLocator(this.opts.project.configuration,e)})`);return s}getDiskInformation(e){let t=Ie.getMapWithDefault(this.packageRegistry,"@@disk"),i=$O(this.opts.project.cwd,e);return Ie.getFactoryWithDefault(t,i,()=>({packageLocation:i,packageDependencies:new Map,packagePeers:new Set,linkType:"SOFT",discardFromLookup:!1}))}};function $O(r,e){let t=x.relative(r,e);return t.match(/^\.{0,2}\//)||(t=`./${t}`),t.replace(/\/?$/,"/")}async function Aze(r){var i;let e=(i=await ot.tryFind(r.prefixPath,{baseFs:r.packageFs}))!=null?i:new ot,t=new Set(["preinstall","install","postinstall"]);for(let n of e.scripts.keys())t.has(n)||e.scripts.delete(n);return{manifest:{scripts:e.scripts,preferUnplugged:e.preferUnplugged,type:e.type},misc:{extractHint:ZO(r),hasBindingGyp:_O(r)}}}var Ele=Pe(yn());var Hu=class extends De{constructor(){super(...arguments);this.all=z.Boolean("-A,--all",!1,{description:"Unplug direct dependencies from the entire project"});this.recursive=z.Boolean("-R,--recursive",!1,{description:"Unplug both direct and transitive dependencies"});this.json=z.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.patterns=z.Rest()}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i,workspace:n}=await je.find(t,this.context.cwd),s=await Rt.find(t);if(!n)throw new ct(i.cwd,this.context.cwd);if(t.get("nodeLinker")!=="pnp")throw new be("This command can only be used if the `nodeLinker` option is set to `pnp`");await i.restoreInstallState();let o=new Set(this.patterns),a=this.patterns.map(h=>{let p=P.parseDescriptor(h),C=p.range!=="unknown"?p:P.makeDescriptor(p,"*");if(!vt.validRange(C.range))throw new be(`The range of the descriptor patterns must be a valid semver range (${P.prettyDescriptor(t,C)})`);return y=>{let B=P.stringifyIdent(y);return!Ele.default.isMatch(B,P.stringifyIdent(C))||y.version&&!vt.satisfiesWithPrereleases(y.version,C.range)?!1:(o.delete(h),!0)}}),l=()=>{let h=[];for(let p of i.storedPackages.values())!i.tryWorkspaceByLocator(p)&&!P.isVirtualLocator(p)&&a.some(C=>C(p))&&h.push(p);return h},c=h=>{let p=new Set,C=[],y=(B,v)=>{if(!p.has(B.locatorHash)&&(p.add(B.locatorHash),!i.tryWorkspaceByLocator(B)&&a.some(D=>D(B))&&C.push(B),!(v>0&&!this.recursive)))for(let D of B.dependencies.values()){let L=i.storedResolutions.get(D.descriptorHash);if(!L)throw new Error("Assertion failed: The resolution should have been registered");let H=i.storedPackages.get(L);if(!H)throw new Error("Assertion failed: The package should have been registered");y(H,v+1)}};for(let B of h){let v=i.storedPackages.get(B.anchoredLocator.locatorHash);if(!v)throw new Error("Assertion failed: The package should have been registered");y(v,0)}return C},u,g;if(this.all&&this.recursive?(u=l(),g="the project"):this.all?(u=c(i.workspaces),g="any workspace"):(u=c([n]),g="this workspace"),o.size>1)throw new be(`Patterns ${ee.prettyList(t,o,ee.Type.CODE)} don't match any packages referenced by ${g}`);if(o.size>0)throw new be(`Pattern ${ee.prettyList(t,o,ee.Type.CODE)} doesn't match any packages referenced by ${g}`);return u=Ie.sortMap(u,h=>P.stringifyLocator(h)),(await Ge.start({configuration:t,stdout:this.context.stdout,json:this.json},async h=>{var p;for(let C of u){let y=(p=C.version)!=null?p:"unknown",B=i.topLevelWorkspace.manifest.ensureDependencyMeta(P.makeDescriptor(C,y));B.unplugged=!0,h.reportInfo(0,`Will unpack ${P.prettyLocator(t,C)} to ${ee.pretty(t,lE(C,{configuration:t}),ee.Type.PATH)}`),h.reportJson({locator:P.stringifyLocator(C),version:y})}await i.topLevelWorkspace.persistManifest(),h.reportSeparator(),await i.install({cache:s,report:h})})).exitCode()}};Hu.paths=[["unplug"]],Hu.usage=ve.Usage({description:"force the unpacking of a list of packages",details:"\n      This command will add the selectors matching the specified patterns to the list of packages that must be unplugged when installed.\n\n      A package being unplugged means that instead of being referenced directly through its archive, it will be unpacked at install time in the directory configured via `pnpUnpluggedFolder`. Note that unpacking packages this way is generally not recommended because it'll make it harder to store your packages within the repository. However, it's a good approach to quickly and safely debug some packages, and can even sometimes be required depending on the context (for example when the package contains shellscripts).\n\n      Running the command will set a persistent flag inside your top-level `package.json`, in the `dependenciesMeta` field. As such, to undo its effects, you'll need to revert the changes made to the manifest and run `yarn install` to apply the modification.\n\n      By default, only direct dependencies from the current workspace are affected. If `-A,--all` is set, direct dependencies from the entire project are affected. Using the `-R,--recursive` flag will affect transitive dependencies as well as direct ones.\n\n      This command accepts glob patterns inside the scope and name components (not the range). Make sure to escape the patterns to prevent your own shell from trying to expand them.\n    ",examples:[["Unplug the lodash dependency from the active workspace","yarn unplug lodash"],["Unplug all instances of lodash referenced by any workspace","yarn unplug lodash -A"],["Unplug all instances of lodash referenced by the active workspace and its dependencies","yarn unplug lodash -R"],["Unplug all instances of lodash, anywhere","yarn unplug lodash -AR"],["Unplug one specific version of lodash","yarn unplug lodash@1.2.3"],["Unplug all packages with the `@babel` scope","yarn unplug '@babel/*'"],["Unplug all packages (only for testing, not recommended)","yarn unplug -R '*'"]]});var El=r=>({cjs:x.join(r.cwd,xt.pnpCjs),cjsLegacy:x.join(r.cwd,xt.pnpJs),esmLoader:x.join(r.cwd,".pnp.loader.mjs")}),wle=r=>/\s/.test(r)?JSON.stringify(r):r;async function lze(r,e,t){let i=El(r),n=`--require ${wle(K.fromPortablePath(i.cjs))}`;if(M.existsSync(i.esmLoader)&&(n=`${n} --experimental-loader ${(0,yle.pathToFileURL)(K.fromPortablePath(i.esmLoader)).href}`),i.cjs.includes(" ")&&Ile.default.lt(process.versions.node,"12.0.0"))throw new Error(`Expected the build location to not include spaces when using Node < 12.0.0 (${process.versions.node})`);if(M.existsSync(i.cjs)){let s=e.NODE_OPTIONS||"",o=/\s*--require\s+\S*\.pnp\.c?js\s*/g,a=/\s*--experimental-loader\s+\S*\.pnp\.loader\.mjs\s*/;s=s.replace(o," ").replace(a," ").trim(),s=s?`${n} ${s}`:n,e.NODE_OPTIONS=s}}async function cze(r,e){let t=El(r);e(t.cjs),e(t.esmLoader),e(r.configuration.get("pnpDataPath")),e(r.configuration.get("pnpUnpluggedFolder"))}var uze={hooks:{populateYarnPaths:cze,setupScriptEnvironment:lze},configuration:{nodeLinker:{description:'The linker used for installing Node packages, one of: "pnp", "node-modules"',type:"STRING",default:"pnp"},pnpMode:{description:"If 'strict', generates standard PnP maps. If 'loose', merges them with the n_m resolution.",type:"STRING",default:"strict"},pnpShebang:{description:"String to prepend to the generated PnP script",type:"STRING",default:"#!/usr/bin/env node"},pnpIgnorePatterns:{description:"Array of glob patterns; files matching them will use the classic resolution",type:"STRING",default:[],isArray:!0},pnpEnableEsmLoader:{description:"If true, Yarn will generate an ESM loader (`.pnp.loader.mjs`). If this is not explicitly set Yarn tries to automatically detect whether ESM support is required.",type:"BOOLEAN",default:!1},pnpEnableInlining:{description:"If true, the PnP data will be inlined along with the generated loader",type:"BOOLEAN",default:!0},pnpFallbackMode:{description:"If true, the generated PnP loader will follow the top-level fallback rule",type:"STRING",default:"dependencies-only"},pnpUnpluggedFolder:{description:"Folder where the unplugged packages must be stored",type:"ABSOLUTE_PATH",default:"./.yarn/unplugged"},pnpDataPath:{description:"Path of the file where the PnP data (used by the loader) must be written",type:"ABSOLUTE_PATH",default:"./.pnp.data.json"}},linkers:[ml],commands:[Hu]},gze=uze;var Dle=Pe(vle());var aM=Pe(J("crypto")),kle=Pe(J("fs")),Rle=1,kr="node_modules",rb=".bin",Fle=".yarn-state.yml",Pze=1e3;var ib=class{constructor(){this.installStateCache=new Map}supportsPackage(e,t){return this.isEnabled(t)}async findPackageLocation(e,t){if(!this.isEnabled(t))throw new Error("Assertion failed: Expected the node-modules linker to be enabled");let i=t.project.tryWorkspaceByLocator(e);if(i)return i.cwd;let n=await Ie.getFactoryWithDefault(this.installStateCache,t.project.cwd,async()=>await oM(t.project,{unrollAliases:!0}));if(n===null)throw new be("Couldn't find the node_modules state file - running an install might help (findPackageLocation)");let s=n.locatorMap.get(P.stringifyLocator(e));if(!s){let l=new be(`Couldn't find ${P.prettyLocator(t.project.configuration,e)} in the currently installed node_modules map - running an install might help`);throw l.code="LOCATOR_NOT_INSTALLED",l}let o=s.locations.sort((l,c)=>l.split(x.sep).length-c.split(x.sep).length),a=x.join(t.project.configuration.startingCwd,kr);return o.find(l=>x.contains(a,l))||s.locations[0]}async findPackageLocator(e,t){if(!this.isEnabled(t))return null;let i=await Ie.getFactoryWithDefault(this.installStateCache,t.project.cwd,async()=>await oM(t.project,{unrollAliases:!0}));if(i===null)return null;let{locationRoot:n,segments:s}=nb(x.resolve(e),{skipPrefix:t.project.cwd}),o=i.locationTree.get(n);if(!o)return null;let a=o.locator;for(let l of s){if(o=o.children.get(l),!o)break;a=o.locator||a}return P.parseLocator(a)}makeInstaller(e){return new sM(e)}isEnabled(e){return e.project.configuration.get("nodeLinker")==="node-modules"}},sM=class{constructor(e){this.opts=e;this.localStore=new Map;this.realLocatorChecksums=new Map;this.customData={store:new Map}}getCustomDataKey(){return JSON.stringify({name:"NodeModulesInstaller",version:2})}attachCustomData(e){this.customData=e}async installPackage(e,t){var u;let i=x.resolve(t.packageFs.getRealPath(),t.prefixPath),n=this.customData.store.get(e.locatorHash);if(typeof n>"u"&&(n=await Dze(e,t),e.linkType==="HARD"&&this.customData.store.set(e.locatorHash,n)),!P.isPackageCompatible(e,this.opts.project.configuration.getSupportedArchitectures()))return{packageLocation:null,buildDirective:null};let s=new Map,o=new Set;s.has(P.stringifyIdent(e))||s.set(P.stringifyIdent(e),e.reference);let a=e;if(P.isVirtualLocator(e)){a=P.devirtualizeLocator(e);for(let g of e.peerDependencies.values())s.set(P.stringifyIdent(g),null),o.add(P.stringifyIdent(g))}let l={packageLocation:`${K.fromPortablePath(i)}/`,packageDependencies:s,packagePeers:o,linkType:e.linkType,discardFromLookup:(u=t.discardFromLookup)!=null?u:!1};this.localStore.set(e.locatorHash,{pkg:e,customPackageData:n,dependencyMeta:this.opts.project.getDependencyMeta(e,e.version),pnpNode:l});let c=t.checksum?t.checksum.substring(t.checksum.indexOf("/")+1):null;return this.realLocatorChecksums.set(a.locatorHash,c),{packageLocation:i,buildDirective:null}}async attachInternalDependencies(e,t){let i=this.localStore.get(e.locatorHash);if(typeof i>"u")throw new Error("Assertion failed: Expected information object to have been registered");for(let[n,s]of t){let o=P.areIdentsEqual(n,s)?s.reference:[P.stringifyIdent(s),s.reference];i.pnpNode.packageDependencies.set(P.stringifyIdent(n),o)}}async attachExternalDependents(e,t){throw new Error("External dependencies haven't been implemented for the node-modules linker")}async finalizeInstall(){if(this.opts.project.configuration.get("nodeLinker")!=="node-modules")return;let e=new Br({baseFs:new On({libzip:await sn(),maxOpenFiles:80,readOnlyArchives:!0})}),t=await oM(this.opts.project),i=this.opts.project.configuration.get("nmMode");(t===null||i!==t.nmMode)&&(this.opts.project.storedBuildState.clear(),t={locatorMap:new Map,binSymlinks:new Map,locationTree:new Map,nmMode:i,mtimeMs:0});let n=new Map(this.opts.project.workspaces.map(f=>{var p,C;let h=this.opts.project.configuration.get("nmHoistingLimits");try{h=Ie.validateEnum($m,(C=(p=f.manifest.installConfig)==null?void 0:p.hoistingLimits)!=null?C:h)}catch{let B=P.prettyWorkspace(this.opts.project.configuration,f);this.opts.report.reportWarning(57,`${B}: Invalid 'installConfig.hoistingLimits' value. Expected one of ${Object.values($m).join(", ")}, using default: "${h}"`)}return[f.relativeCwd,h]})),s=new Map(this.opts.project.workspaces.map(f=>{var p,C;let h=this.opts.project.configuration.get("nmSelfReferences");return h=(C=(p=f.manifest.installConfig)==null?void 0:p.selfReferences)!=null?C:h,[f.relativeCwd,h]})),o={VERSIONS:{std:1},topLevel:{name:null,reference:null},getLocator:(f,h)=>Array.isArray(h)?{name:h[0],reference:h[1]}:{name:f,reference:h},getDependencyTreeRoots:()=>this.opts.project.workspaces.map(f=>{let h=f.anchoredLocator;return{name:P.stringifyIdent(f.locator),reference:h.reference}}),getPackageInformation:f=>{let h=f.reference===null?this.opts.project.topLevelWorkspace.anchoredLocator:P.makeLocator(P.parseIdent(f.name),f.reference),p=this.localStore.get(h.locatorHash);if(typeof p>"u")throw new Error("Assertion failed: Expected the package reference to have been registered");return p.pnpNode},findPackageLocator:f=>{let h=this.opts.project.tryWorkspaceByCwd(K.toPortablePath(f));if(h!==null){let p=h.anchoredLocator;return{name:P.stringifyIdent(p),reference:p.reference}}throw new Error("Assertion failed: Unimplemented")},resolveToUnqualified:()=>{throw new Error("Assertion failed: Unimplemented")},resolveUnqualified:()=>{throw new Error("Assertion failed: Unimplemented")},resolveRequest:()=>{throw new Error("Assertion failed: Unimplemented")},resolveVirtual:f=>K.fromPortablePath(Br.resolveVirtual(K.toPortablePath(f)))},{tree:a,errors:l,preserveSymlinksRequired:c}=eE(o,{pnpifyFs:!1,validateExternalSoftLinks:!0,hoistingLimitsByCwd:n,project:this.opts.project,selfReferencesByCwd:s});if(!a){for(let{messageName:f,text:h}of l)this.opts.report.reportError(f,h);return}let u=MO(a);await Tze(t,u,{baseFs:e,project:this.opts.project,report:this.opts.report,realLocatorChecksums:this.realLocatorChecksums,loadManifest:async f=>{let h=P.parseLocator(f),p=this.localStore.get(h.locatorHash);if(typeof p>"u")throw new Error("Assertion failed: Expected the slot to exist");return p.customPackageData.manifest}});let g=[];for(let[f,h]of u.entries()){if(Ole(f))continue;let p=P.parseLocator(f),C=this.localStore.get(p.locatorHash);if(typeof C>"u")throw new Error("Assertion failed: Expected the slot to exist");if(this.opts.project.tryWorkspaceByLocator(C.pkg))continue;let y=po.extractBuildScripts(C.pkg,C.customPackageData,C.dependencyMeta,{configuration:this.opts.project.configuration,report:this.opts.report});y.length!==0&&g.push({buildLocations:h.locations,locatorHash:p.locatorHash,buildDirective:y})}return c&&this.opts.report.reportWarning(72,`The application uses portals and that's why ${ee.pretty(this.opts.project.configuration,"--preserve-symlinks",ee.Type.CODE)} Node option is required for launching it`),{customData:this.customData,records:g}}};async function Dze(r,e){var n;let t=(n=await ot.tryFind(e.prefixPath,{baseFs:e.packageFs}))!=null?n:new ot,i=new Set(["preinstall","install","postinstall"]);for(let s of t.scripts.keys())i.has(s)||t.scripts.delete(s);return{manifest:{bin:t.bin,scripts:t.scripts},misc:{extractHint:po.getExtractHint(e),hasBindingGyp:po.hasBindingGyp(e)}}}async function kze(r,e,t,i,{installChangedByUser:n}){let s="";s+=`# Warning: This file is automatically generated. Removing it is fine, but will
-`,s+=`# cause your node_modules installation to become invalidated.
-`,s+=`
-`,s+=`__metadata:
-`,s+=`  version: ${Rle}
-`,s+=`  nmMode: ${i.value}
-`;let o=Array.from(e.keys()).sort(),a=P.stringifyLocator(r.topLevelWorkspace.anchoredLocator);for(let u of o){let g=e.get(u);s+=`
-`,s+=`${JSON.stringify(u)}:
-`,s+=`  locations:
-`;for(let f of g.locations){let h=x.contains(r.cwd,f);if(h===null)throw new Error(`Assertion failed: Expected the path to be within the project (${f})`);s+=`    - ${JSON.stringify(h)}
-`}if(g.aliases.length>0){s+=`  aliases:
-`;for(let f of g.aliases)s+=`    - ${JSON.stringify(f)}
-`}if(u===a&&t.size>0){s+=`  bin:
-`;for(let[f,h]of t){let p=x.contains(r.cwd,f);if(p===null)throw new Error(`Assertion failed: Expected the path to be within the project (${f})`);s+=`    ${JSON.stringify(p)}:
-`;for(let[C,y]of h){let B=x.relative(x.join(f,kr),y);s+=`      ${JSON.stringify(C)}: ${JSON.stringify(B)}
-`}}}}let l=r.cwd,c=x.join(l,kr,Fle);n&&await M.removePromise(c),await M.changeFilePromise(c,s,{automaticNewlines:!0})}async function oM(r,{unrollAliases:e=!1}={}){let t=r.cwd,i=x.join(t,kr,Fle),n;try{n=await M.statPromise(i)}catch{}if(!n)return null;let s=yi(await M.readFilePromise(i,"utf8"));if(s.__metadata.version>Rle)return null;let o=s.__metadata.nmMode||"classic",a=new Map,l=new Map;delete s.__metadata;for(let[c,u]of Object.entries(s)){let g=u.locations.map(h=>x.join(t,h)),f=u.bin;if(f)for(let[h,p]of Object.entries(f)){let C=x.join(t,K.toPortablePath(h)),y=Ie.getMapWithDefault(l,C);for(let[B,v]of Object.entries(p))y.set(Ur(B),K.toPortablePath([C,kr,v].join(x.sep)))}if(a.set(c,{target:Oe.dot,linkType:"HARD",locations:g,aliases:u.aliases||[]}),e&&u.aliases)for(let h of u.aliases){let{scope:p,name:C}=P.parseLocator(c),y=P.makeLocator(P.makeIdent(p,C),h),B=P.stringifyLocator(y);a.set(B,{target:Oe.dot,linkType:"HARD",locations:g,aliases:[]})}}return{locatorMap:a,binSymlinks:l,locationTree:Nle(a,{skipPrefix:r.cwd}),nmMode:o,mtimeMs:n.mtimeMs}}var np=async(r,e)=>{if(r.split(x.sep).indexOf(kr)<0)throw new Error(`Assertion failed: trying to remove dir that doesn't contain node_modules: ${r}`);try{if(!e.innerLoop){let i=e.allowSymlink?await M.statPromise(r):await M.lstatPromise(r);if(e.allowSymlink&&!i.isDirectory()||!e.allowSymlink&&i.isSymbolicLink()){await M.unlinkPromise(r);return}}let t=await M.readdirPromise(r,{withFileTypes:!0});for(let i of t){let n=x.join(r,Ur(i.name));i.isDirectory()?(i.name!==kr||e&&e.innerLoop)&&await np(n,{innerLoop:!0,contentsOnly:!1}):await M.unlinkPromise(n)}e.contentsOnly||await M.rmdirPromise(r)}catch(t){if(t.code!=="ENOENT"&&t.code!=="ENOTEMPTY")throw t}},xle=4,nb=(r,{skipPrefix:e})=>{let t=x.contains(e,r);if(t===null)throw new Error(`Assertion failed: Writing attempt prevented to ${r} which is outside project root: ${e}`);let i=t.split(x.sep).filter(l=>l!==""),n=i.indexOf(kr),s=i.slice(0,n).join(x.sep),o=x.join(e,s),a=i.slice(n);return{locationRoot:o,segments:a}},Nle=(r,{skipPrefix:e})=>{let t=new Map;if(r===null)return t;let i=()=>({children:new Map,linkType:"HARD"});for(let[n,s]of r.entries()){if(s.linkType==="SOFT"&&x.contains(e,s.target)!==null){let a=Ie.getFactoryWithDefault(t,s.target,i);a.locator=n,a.linkType=s.linkType}for(let o of s.locations){let{locationRoot:a,segments:l}=nb(o,{skipPrefix:e}),c=Ie.getFactoryWithDefault(t,a,i);for(let u=0;u<l.length;++u){let g=l[u];if(g!=="."){let f=Ie.getFactoryWithDefault(c.children,g,i);c.children.set(g,f),c=f}u===l.length-1&&(c.locator=n,c.linkType=s.linkType)}}}return t},AM=async(r,e)=>{let t;try{process.platform==="win32"&&(t=await M.lstatPromise(r))}catch{}process.platform=="win32"&&(!t||t.isDirectory())?await M.symlinkPromise(r,e,"junction"):await M.symlinkPromise(x.relative(x.dirname(e),r),e)};async function Lle(r,e,t){let i=x.join(r,Ur(`${aM.default.randomBytes(16).toString("hex")}.tmp`));try{await M.writeFilePromise(i,t);try{await M.linkPromise(i,e)}catch{}}finally{await M.unlinkPromise(i)}}async function Rze({srcPath:r,dstPath:e,entry:t,globalHardlinksStore:i,baseFs:n,nmMode:s}){if(t.kind===Tle.FILE){if(s.value==="hardlinks-global"&&i&&t.digest){let a=x.join(i,t.digest.substring(0,2),`${t.digest.substring(2)}.dat`),l;try{let c=await M.statPromise(a);if(c&&(!t.mtimeMs||c.mtimeMs>t.mtimeMs||c.mtimeMs<t.mtimeMs-Pze))if(await li.checksumFile(a,{baseFs:M,algorithm:"sha1"})!==t.digest){let g=x.join(i,Ur(`${aM.default.randomBytes(16).toString("hex")}.tmp`));await M.renamePromise(a,g);let f=await n.readFilePromise(r);await M.writeFilePromise(g,f);try{await M.linkPromise(g,a),t.mtimeMs=new Date().getTime(),await M.unlinkPromise(g)}catch{}}else t.mtimeMs||(t.mtimeMs=Math.ceil(c.mtimeMs));await M.linkPromise(a,e),l=!0}catch{l=!1}if(!l){let c=await n.readFilePromise(r);await Lle(i,a,c),t.mtimeMs=new Date().getTime();try{await M.linkPromise(a,e)}catch(u){u&&u.code&&u.code=="EXDEV"&&(s.value="hardlinks-local",await n.copyFilePromise(r,e))}}}else await n.copyFilePromise(r,e);let o=t.mode&511;o!==420&&await M.chmodPromise(e,o)}}var Tle=(i=>(i.FILE="file",i.DIRECTORY="directory",i.SYMLINK="symlink",i))(Tle||{}),Fze=async(r,e,{baseFs:t,globalHardlinksStore:i,nmMode:n,packageChecksum:s})=>{await M.mkdirPromise(r,{recursive:!0});let o=async(c=Oe.dot)=>{let u=x.join(e,c),g=await t.readdirPromise(u,{withFileTypes:!0}),f=new Map;for(let h of g){let p=x.join(c,h.name),C,y=x.join(u,h.name);if(h.isFile()){if(C={kind:"file",mode:(await t.lstatPromise(y)).mode},n.value==="hardlinks-global"){let B=await li.checksumFile(y,{baseFs:t,algorithm:"sha1"});C.digest=B}}else if(h.isDirectory())C={kind:"directory"};else if(h.isSymbolicLink())C={kind:"symlink",symlinkTo:await t.readlinkPromise(y)};else throw new Error(`Unsupported file type (file: ${y}, mode: 0o${await t.statSync(y).mode.toString(8).padStart(6,"0")})`);if(f.set(p,C),h.isDirectory()&&p!==kr){let B=await o(p);for(let[v,D]of B)f.set(v,D)}}return f},a;if(n.value==="hardlinks-global"&&i&&s){let c=x.join(i,s.substring(0,2),`${s.substring(2)}.json`);try{a=new Map(Object.entries(JSON.parse(await M.readFilePromise(c,"utf8"))))}catch{a=await o()}}else a=await o();let l=!1;for(let[c,u]of a){let g=x.join(e,c),f=x.join(r,c);if(u.kind==="directory")await M.mkdirPromise(f,{recursive:!0});else if(u.kind==="file"){let h=u.mtimeMs;await Rze({srcPath:g,dstPath:f,entry:u,nmMode:n,baseFs:t,globalHardlinksStore:i}),u.mtimeMs!==h&&(l=!0)}else u.kind==="symlink"&&await AM(x.resolve(x.dirname(f),u.symlinkTo),f)}if(n.value==="hardlinks-global"&&i&&l&&s){let c=x.join(i,s.substring(0,2),`${s.substring(2)}.json`);await M.removePromise(c),await Lle(i,c,Buffer.from(JSON.stringify(Object.fromEntries(a))))}};function Nze(r,e,t,i){let n=new Map,s=new Map,o=new Map,a=!1,l=(c,u,g,f,h)=>{let p=!0,C=x.join(c,u),y=new Set;if(u===kr||u.startsWith("@")){let v;try{v=M.statSync(C)}catch{}p=!!v,v?v.mtimeMs>t?(a=!0,y=new Set(M.readdirSync(C))):y=new Set(g.children.get(u).children.keys()):a=!0;let D=e.get(c);if(D){let L=x.join(c,kr,rb),H;try{H=M.statSync(L)}catch{}if(!H)a=!0;else if(H.mtimeMs>t){a=!0;let j=new Set(M.readdirSync(L)),$=new Map;s.set(c,$);for(let[V,W]of D)j.has(V)&&$.set(V,W)}else s.set(c,D)}}else p=h.has(u);let B=g.children.get(u);if(p){let{linkType:v,locator:D}=B,L={children:new Map,linkType:v,locator:D};if(f.children.set(u,L),D){let H=Ie.getSetWithDefault(o,D);H.add(C),o.set(D,H)}for(let H of B.children.keys())l(C,H,B,L,y)}else B.locator&&i.storedBuildState.delete(P.parseLocator(B.locator).locatorHash)};for(let[c,u]of r){let{linkType:g,locator:f}=u,h={children:new Map,linkType:g,locator:f};if(n.set(c,h),f){let p=Ie.getSetWithDefault(o,u.locator);p.add(c),o.set(u.locator,p)}u.children.has(kr)&&l(c,kr,u,h,new Set)}return{locationTree:n,binSymlinks:s,locatorLocations:o,installChangedByUser:a}}function Ole(r){let e=P.parseDescriptor(r);return P.isVirtualDescriptor(e)&&(e=P.devirtualizeDescriptor(e)),e.range.startsWith("link:")}async function Lze(r,e,t,{loadManifest:i}){let n=new Map;for(let[a,{locations:l}]of r){let c=Ole(a)?null:await i(a,l[0]),u=new Map;if(c)for(let[g,f]of c.bin){let h=x.join(l[0],f);f!==""&&M.existsSync(h)&&u.set(g,f)}n.set(a,u)}let s=new Map,o=(a,l,c)=>{let u=new Map,g=x.contains(t,a);if(c.locator&&g!==null){let f=n.get(c.locator);for(let[h,p]of f){let C=x.join(a,K.toPortablePath(p));u.set(Ur(h),C)}for(let[h,p]of c.children){let C=x.join(a,h),y=o(C,C,p);y.size>0&&s.set(a,new Map([...s.get(a)||new Map,...y]))}}else for(let[f,h]of c.children){let p=o(x.join(a,f),l,h);for(let[C,y]of p)u.set(C,y)}return u};for(let[a,l]of e){let c=o(a,a,l);c.size>0&&s.set(a,new Map([...s.get(a)||new Map,...c]))}return s}var Ple=(r,e)=>{if(!r||!e)return r===e;let t=P.parseLocator(r);P.isVirtualLocator(t)&&(t=P.devirtualizeLocator(t));let i=P.parseLocator(e);return P.isVirtualLocator(i)&&(i=P.devirtualizeLocator(i)),P.areLocatorsEqual(t,i)};function lM(r){return x.join(r.get("globalFolder"),"store")}async function Tze(r,e,{baseFs:t,project:i,report:n,loadManifest:s,realLocatorChecksums:o}){let a=x.join(i.cwd,kr),{locationTree:l,binSymlinks:c,locatorLocations:u,installChangedByUser:g}=Nze(r.locationTree,r.binSymlinks,r.mtimeMs,i),f=Nle(e,{skipPrefix:i.cwd}),h=[],p=async({srcDir:V,dstDir:W,linkType:_,globalHardlinksStore:A,nmMode:ae,packageChecksum:ge})=>{let re=(async()=>{try{_==="SOFT"?(await M.mkdirPromise(x.dirname(W),{recursive:!0}),await AM(x.resolve(V),W)):await Fze(W,V,{baseFs:t,globalHardlinksStore:A,nmMode:ae,packageChecksum:ge})}catch(O){throw O.message=`While persisting ${V} -> ${W} ${O.message}`,O}finally{L.tick()}})().then(()=>h.splice(h.indexOf(re),1));h.push(re),h.length>xle&&await Promise.race(h)},C=async(V,W,_)=>{let A=(async()=>{let ae=async(ge,re,O)=>{try{O.innerLoop||await M.mkdirPromise(re,{recursive:!0});let F=await M.readdirPromise(ge,{withFileTypes:!0});for(let ue of F){if(!O.innerLoop&&ue.name===rb)continue;let he=x.join(ge,ue.name),ke=x.join(re,ue.name);ue.isDirectory()?(ue.name!==kr||O&&O.innerLoop)&&(await M.mkdirPromise(ke,{recursive:!0}),await ae(he,ke,{...O,innerLoop:!0})):$.value==="hardlinks-local"||$.value==="hardlinks-global"?await M.linkPromise(he,ke):await M.copyFilePromise(he,ke,kle.default.constants.COPYFILE_FICLONE)}}catch(F){throw O.innerLoop||(F.message=`While cloning ${ge} -> ${re} ${F.message}`),F}finally{O.innerLoop||L.tick()}};await ae(V,W,_)})().then(()=>h.splice(h.indexOf(A),1));h.push(A),h.length>xle&&await Promise.race(h)},y=async(V,W,_)=>{if(_)for(let[A,ae]of W.children){let ge=_.children.get(A);await y(x.join(V,A),ae,ge)}else{W.children.has(kr)&&await np(x.join(V,kr),{contentsOnly:!1});let A=x.basename(V)===kr&&f.has(x.join(x.dirname(V),x.sep));await np(V,{contentsOnly:V===a,allowSymlink:A})}};for(let[V,W]of l){let _=f.get(V);for(let[A,ae]of W.children){if(A===".")continue;let ge=_&&_.children.get(A),re=x.join(V,A);await y(re,ae,ge)}}let B=async(V,W,_)=>{if(_){Ple(W.locator,_.locator)||await np(V,{contentsOnly:W.linkType==="HARD"});for(let[A,ae]of W.children){let ge=_.children.get(A);await B(x.join(V,A),ae,ge)}}else{W.children.has(kr)&&await np(x.join(V,kr),{contentsOnly:!0});let A=x.basename(V)===kr&&f.has(x.join(x.dirname(V),x.sep));await np(V,{contentsOnly:W.linkType==="HARD",allowSymlink:A})}};for(let[V,W]of f){let _=l.get(V);for(let[A,ae]of W.children){if(A===".")continue;let ge=_&&_.children.get(A);await B(x.join(V,A),ae,ge)}}let v=new Map,D=[];for(let[V,W]of u)for(let _ of W){let{locationRoot:A,segments:ae}=nb(_,{skipPrefix:i.cwd}),ge=f.get(A),re=A;if(ge){for(let O of ae)if(re=x.join(re,O),ge=ge.children.get(O),!ge)break;if(ge){let O=Ple(ge.locator,V),F=e.get(ge.locator),ue=F.target,he=re,ke=F.linkType;if(O)v.has(ue)||v.set(ue,he);else if(ue!==he){let Fe=P.parseLocator(ge.locator);P.isVirtualLocator(Fe)&&(Fe=P.devirtualizeLocator(Fe)),D.push({srcDir:ue,dstDir:he,linkType:ke,realLocatorHash:Fe.locatorHash})}}}}for(let[V,{locations:W}]of e.entries())for(let _ of W){let{locationRoot:A,segments:ae}=nb(_,{skipPrefix:i.cwd}),ge=l.get(A),re=f.get(A),O=A,F=e.get(V),ue=P.parseLocator(V);P.isVirtualLocator(ue)&&(ue=P.devirtualizeLocator(ue));let he=ue.locatorHash,ke=F.target,Fe=_;if(ke===Fe)continue;let Ne=F.linkType;for(let oe of ae)re=re.children.get(oe);if(!ge)D.push({srcDir:ke,dstDir:Fe,linkType:Ne,realLocatorHash:he});else for(let oe of ae)if(O=x.join(O,oe),ge=ge.children.get(oe),!ge){D.push({srcDir:ke,dstDir:Fe,linkType:Ne,realLocatorHash:he});break}}let L=vi.progressViaCounter(D.length),H=n.reportProgress(L),j=i.configuration.get("nmMode"),$={value:j};try{let V=$.value==="hardlinks-global"?`${lM(i.configuration)}/v1`:null;if(V&&!await M.existsPromise(V)){await M.mkdirpPromise(V);for(let _=0;_<256;_++)await M.mkdirPromise(x.join(V,_.toString(16).padStart(2,"0")))}for(let _ of D)(_.linkType==="SOFT"||!v.has(_.srcDir))&&(v.set(_.srcDir,_.dstDir),await p({..._,globalHardlinksStore:V,nmMode:$,packageChecksum:o.get(_.realLocatorHash)||null}));await Promise.all(h),h.length=0;for(let _ of D){let A=v.get(_.srcDir);_.linkType!=="SOFT"&&_.dstDir!==A&&await C(A,_.dstDir,{nmMode:$})}await Promise.all(h),await M.mkdirPromise(a,{recursive:!0});let W=await Lze(e,f,i.cwd,{loadManifest:s});await Oze(c,W,i.cwd),await kze(i,e,W,$,{installChangedByUser:g}),j=="hardlinks-global"&&$.value=="hardlinks-local"&&n.reportWarningOnce(74,"'nmMode' has been downgraded to 'hardlinks-local' due to global cache and install folder being on different devices")}finally{H.stop()}}async function Oze(r,e,t){for(let i of r.keys()){if(x.contains(t,i)===null)throw new Error(`Assertion failed. Excepted bin symlink location to be inside project dir, instead it was at ${i}`);if(!e.has(i)){let n=x.join(i,kr,rb);await M.removePromise(n)}}for(let[i,n]of e){if(x.contains(t,i)===null)throw new Error(`Assertion failed. Excepted bin symlink location to be inside project dir, instead it was at ${i}`);let s=x.join(i,kr,rb),o=r.get(i)||new Map;await M.mkdirPromise(s,{recursive:!0});for(let a of o.keys())n.has(a)||(await M.removePromise(x.join(s,a)),process.platform==="win32"&&await M.removePromise(x.join(s,Ur(`${a}.cmd`))));for(let[a,l]of n){let c=o.get(a),u=x.join(s,a);c!==l&&(process.platform==="win32"?await(0,Dle.default)(K.fromPortablePath(l),K.fromPortablePath(u),{createPwshFile:!1}):(await M.removePromise(u),await AM(l,u),x.contains(t,await M.realpathPromise(l))!==null&&await M.chmodPromise(l,493)))}}}var sb=class extends ml{constructor(){super(...arguments);this.mode="loose"}makeInstaller(t){return new cM(t)}},cM=class extends Uu{constructor(){super(...arguments);this.mode="loose"}async transformPnpSettings(t){let i=new Br({baseFs:new On({libzip:await sn(),maxOpenFiles:80,readOnlyArchives:!0})}),n=hle(t,this.opts.project.cwd,i),{tree:s,errors:o}=eE(n,{pnpifyFs:!1,project:this.opts.project});if(!s){for(let{messageName:g,text:f}of o)this.opts.report.reportError(g,f);return}let a=new Map;t.fallbackPool=a;let l=(g,f)=>{let h=P.parseLocator(f.locator),p=P.stringifyIdent(h);p===g?a.set(g,h.reference):a.set(g,[p,h.reference])},c=x.join(this.opts.project.cwd,xt.nodeModules),u=s.get(c);if(!(typeof u>"u")){if("target"in u)throw new Error("Assertion failed: Expected the root junction point to be a directory");for(let g of u.dirList){let f=x.join(c,g),h=s.get(f);if(typeof h>"u")throw new Error("Assertion failed: Expected the child to have been registered");if("target"in h)l(g,h);else for(let p of h.dirList){let C=x.join(f,p),y=s.get(C);if(typeof y>"u")throw new Error("Assertion failed: Expected the subchild to have been registered");if("target"in y)l(`${g}/${p}`,y);else throw new Error("Assertion failed: Expected the leaf junction to be a package")}}}}};var Mze={hooks:{cleanGlobalArtifacts:async r=>{let e=lM(r);await M.removePromise(e)}},configuration:{nmHoistingLimits:{description:"Prevent packages to be hoisted past specific levels",type:"STRING",values:["workspaces","dependencies","none"],default:"none"},nmMode:{description:'If set to "hardlinks-local" Yarn will utilize hardlinks to reduce disk space consumption inside "node_modules" directories. With "hardlinks-global" Yarn will use global content addressable storage to reduce "node_modules" size across all the projects using this option.',type:"STRING",values:["classic","hardlinks-local","hardlinks-global"],default:"classic"},nmSelfReferences:{description:"If set to 'false' the workspace will not be allowed to require itself and corresponding self-referencing symlink will not be created",type:"BOOLEAN",default:!0}},linkers:[ib,sb]},Kze=Mze;var A1={};ut(A1,{default:()=>WVe,npmConfigUtils:()=>or,npmHttpUtils:()=>Mt,npmPublishUtils:()=>dp});var Yle=Pe(Xr());var gr="npm:";var Mt={};ut(Mt,{AuthType:()=>Gle,customPackageError:()=>Hze,del:()=>jze,get:()=>mo,getIdentUrl:()=>yl,handleInvalidAuthenticationError:()=>Il,post:()=>Gze,put:()=>Yze});var hM=Pe(Om()),Hle=J("url");var or={};ut(or,{RegistryType:()=>Mle,getAuditRegistry:()=>Uze,getAuthConfiguration:()=>fM,getDefaultRegistry:()=>ob,getPublishRegistry:()=>Kle,getRegistryConfiguration:()=>Ule,getScopeConfiguration:()=>gM,getScopeRegistry:()=>uA,normalizeRegistry:()=>Co});var Mle=(i=>(i.AUDIT_REGISTRY="npmAuditRegistry",i.FETCH_REGISTRY="npmRegistryServer",i.PUBLISH_REGISTRY="npmPublishRegistry",i))(Mle||{});function Co(r){return r.replace(/\/$/,"")}function Uze(r,{configuration:e}){let t=e.get("npmAuditRegistry");return t!==null?Co(t):Kle(r,{configuration:e})}function Kle(r,{configuration:e}){var t;return(t=r.publishConfig)!=null&&t.registry?Co(r.publishConfig.registry):r.name?uA(r.name.scope,{configuration:e,type:"npmPublishRegistry"}):ob({configuration:e,type:"npmPublishRegistry"})}function uA(r,{configuration:e,type:t="npmRegistryServer"}){let i=gM(r,{configuration:e});if(i===null)return ob({configuration:e,type:t});let n=i.get(t);return n===null?ob({configuration:e,type:t}):Co(n)}function ob({configuration:r,type:e="npmRegistryServer"}){let t=r.get(e);return Co(t!==null?t:r.get("npmRegistryServer"))}function Ule(r,{configuration:e}){let t=e.get("npmRegistries"),i=Co(r),n=t.get(i);if(typeof n<"u")return n;let s=t.get(i.replace(/^[a-z]+:/,""));return typeof s<"u"?s:null}function gM(r,{configuration:e}){if(r===null)return null;let i=e.get("npmScopes").get(r);return i||null}function fM(r,{configuration:e,ident:t}){let i=t&&gM(t.scope,{configuration:e});return(i==null?void 0:i.get("npmAuthIdent"))||(i==null?void 0:i.get("npmAuthToken"))?i:Ule(r,{configuration:e})||e}var Gle=(n=>(n[n.NO_AUTH=0]="NO_AUTH",n[n.BEST_EFFORT=1]="BEST_EFFORT",n[n.CONFIGURATION=2]="CONFIGURATION",n[n.ALWAYS_AUTH=3]="ALWAYS_AUTH",n))(Gle||{});async function Il(r,{attemptedAs:e,registry:t,headers:i,configuration:n}){var s,o;if(Ab(r))throw new at(41,"Invalid OTP token");if(((s=r.originalError)==null?void 0:s.name)==="HTTPError"&&((o=r.originalError)==null?void 0:o.response.statusCode)===401)throw new at(41,`Invalid authentication (${typeof e!="string"?`as ${await Jze(t,i,{configuration:n})}`:`attempted as ${e}`})`)}function Hze(r){var e;return((e=r.response)==null?void 0:e.statusCode)===404?"Package not found":null}function yl(r){return r.scope?`/@${r.scope}%2f${r.name}`:`/${r.name}`}async function mo(r,{configuration:e,headers:t,ident:i,authType:n,registry:s,...o}){if(i&&typeof s>"u"&&(s=uA(i.scope,{configuration:e})),i&&i.scope&&typeof n>"u"&&(n=1),typeof s!="string")throw new Error("Assertion failed: The registry should be a string");let a=await ab(s,{authType:n,configuration:e,ident:i});a&&(t={...t,authorization:a});try{return await Xt.get(r.charAt(0)==="/"?`${s}${r}`:r,{configuration:e,headers:t,...o})}catch(l){throw await Il(l,{registry:s,configuration:e,headers:t}),l}}async function Gze(r,e,{attemptedAs:t,configuration:i,headers:n,ident:s,authType:o=3,registry:a,otp:l,...c}){if(s&&typeof a>"u"&&(a=uA(s.scope,{configuration:i})),typeof a!="string")throw new Error("Assertion failed: The registry should be a string");let u=await ab(a,{authType:o,configuration:i,ident:s});u&&(n={...n,authorization:u}),l&&(n={...n,...sp(l)});try{return await Xt.post(a+r,e,{configuration:i,headers:n,...c})}catch(g){if(!Ab(g)||l)throw await Il(g,{attemptedAs:t,registry:a,configuration:i,headers:n}),g;l=await pM(g,{configuration:i});let f={...n,...sp(l)};try{return await Xt.post(`${a}${r}`,e,{configuration:i,headers:f,...c})}catch(h){throw await Il(h,{attemptedAs:t,registry:a,configuration:i,headers:n}),h}}}async function Yze(r,e,{attemptedAs:t,configuration:i,headers:n,ident:s,authType:o=3,registry:a,otp:l,...c}){if(s&&typeof a>"u"&&(a=uA(s.scope,{configuration:i})),typeof a!="string")throw new Error("Assertion failed: The registry should be a string");let u=await ab(a,{authType:o,configuration:i,ident:s});u&&(n={...n,authorization:u}),l&&(n={...n,...sp(l)});try{return await Xt.put(a+r,e,{configuration:i,headers:n,...c})}catch(g){if(!Ab(g))throw await Il(g,{attemptedAs:t,registry:a,configuration:i,headers:n}),g;l=await pM(g,{configuration:i});let f={...n,...sp(l)};try{return await Xt.put(`${a}${r}`,e,{configuration:i,headers:f,...c})}catch(h){throw await Il(h,{attemptedAs:t,registry:a,configuration:i,headers:n}),h}}}async function jze(r,{attemptedAs:e,configuration:t,headers:i,ident:n,authType:s=3,registry:o,otp:a,...l}){if(n&&typeof o>"u"&&(o=uA(n.scope,{configuration:t})),typeof o!="string")throw new Error("Assertion failed: The registry should be a string");let c=await ab(o,{authType:s,configuration:t,ident:n});c&&(i={...i,authorization:c}),a&&(i={...i,...sp(a)});try{return await Xt.del(o+r,{configuration:t,headers:i,...l})}catch(u){if(!Ab(u)||a)throw await Il(u,{attemptedAs:e,registry:o,configuration:t,headers:i}),u;a=await pM(u,{configuration:t});let g={...i,...sp(a)};try{return await Xt.del(`${o}${r}`,{configuration:t,headers:g,...l})}catch(f){throw await Il(f,{attemptedAs:e,registry:o,configuration:t,headers:i}),f}}}async function ab(r,{authType:e=2,configuration:t,ident:i}){let n=fM(r,{configuration:t,ident:i}),s=qze(n,e);if(!s)return null;let o=await t.reduceHook(a=>a.getNpmAuthenticationHeader,void 0,r,{configuration:t,ident:i});if(o)return o;if(n.get("npmAuthToken"))return`Bearer ${n.get("npmAuthToken")}`;if(n.get("npmAuthIdent")){let a=n.get("npmAuthIdent");return a.includes(":")?`Basic ${Buffer.from(a).toString("base64")}`:`Basic ${a}`}if(s&&e!==1)throw new at(33,"No authentication configured for request");return null}function qze(r,e){switch(e){case 2:return r.get("npmAlwaysAuth");case 1:case 3:return!0;case 0:return!1;default:throw new Error("Unreachable")}}async function Jze(r,e,{configuration:t}){var i;if(typeof e>"u"||typeof e.authorization>"u")return"an anonymous user";try{return(i=(await Xt.get(new Hle.URL(`${r}/-/whoami`).href,{configuration:t,headers:e,jsonResponse:!0})).username)!=null?i:"an unknown user"}catch{return"an unknown user"}}async function pM(r,{configuration:e}){var n;let t=(n=r.originalError)==null?void 0:n.response.headers["npm-notice"];if(t&&(await Ge.start({configuration:e,stdout:process.stdout,includeFooter:!1},async s=>{if(s.reportInfo(0,t.replace(/(https?:\/\/\S+)/g,ee.pretty(e,"$1",ee.Type.URL))),!process.env.YARN_IS_TEST_ENV){let o=t.match(/open (https?:\/\/\S+)/i);if(o&&Is.openUrl){let{openNow:a}=await(0,hM.prompt)({type:"confirm",name:"openNow",message:"Do you want to try to open this url now?",required:!0,initial:!0,onCancel:()=>process.exit(130)});a&&(await Is.openUrl(o[1])||(s.reportSeparator(),s.reportWarning(0,"We failed to automatically open the url; you'll have to open it yourself in your browser of choice.")))}}}),process.stdout.write(`
-`)),process.env.YARN_IS_TEST_ENV)return process.env.YARN_INJECT_NPM_2FA_TOKEN||"";let{otp:i}=await(0,hM.prompt)({type:"password",name:"otp",message:"One-time password:",required:!0,onCancel:()=>process.exit(130)});return process.stdout.write(`
-`),i}function Ab(r){var e,t;if(((e=r.originalError)==null?void 0:e.name)!=="HTTPError")return!1;try{return((t=r.originalError)==null?void 0:t.response.headers["www-authenticate"].split(/,\s*/).map(n=>n.toLowerCase())).includes("otp")}catch{return!1}}function sp(r){return{["npm-otp"]:r}}var lb=class{supports(e,t){if(!e.reference.startsWith(gr))return!1;let{selector:i,params:n}=P.parseRange(e.reference);return!(!Yle.default.valid(i)||n===null||typeof n.__archiveUrl!="string")}getLocalPath(e,t){return null}async fetch(e,t){let i=t.checksums.get(e.locatorHash)||null,[n,s,o]=await t.cache.fetchPackageFromCache(e,i,{onHit:()=>t.report.reportCacheHit(e),onMiss:()=>t.report.reportCacheMiss(e,`${P.prettyLocator(t.project.configuration,e)} can't be found in the cache and will be fetched from the remote server`),loader:()=>this.fetchFromNetwork(e,t),skipIntegrityCheck:t.skipIntegrityCheck,...t.cacheOptions});return{packageFs:n,releaseFs:s,prefixPath:P.getIdentVendorPath(e),checksum:o}}async fetchFromNetwork(e,t){let{params:i}=P.parseRange(e.reference);if(i===null||typeof i.__archiveUrl!="string")throw new Error("Assertion failed: The archiveUrl querystring parameter should have been available");let n=await mo(i.__archiveUrl,{configuration:t.project.configuration,ident:e});return await mi.convertToZip(n,{compressionLevel:t.project.configuration.get("compressionLevel"),prefixPath:P.getIdentVendorPath(e),stripComponents:1})}};var cb=class{supportsDescriptor(e,t){return!(!e.range.startsWith(gr)||!P.tryParseDescriptor(e.range.slice(gr.length),!0))}supportsLocator(e,t){return!1}shouldPersistResolution(e,t){throw new Error("Unreachable")}bindDescriptor(e,t,i){return e}getResolutionDependencies(e,t){let i=P.parseDescriptor(e.range.slice(gr.length),!0);return t.resolver.getResolutionDependencies(i,t)}async getCandidates(e,t,i){let n=P.parseDescriptor(e.range.slice(gr.length),!0);return await i.resolver.getCandidates(n,t,i)}async getSatisfying(e,t,i){let n=P.parseDescriptor(e.range.slice(gr.length),!0);return i.resolver.getSatisfying(n,t,i)}resolve(e,t){throw new Error("Unreachable")}};var jle=Pe(Xr()),qle=J("url");var Ns=class{supports(e,t){if(!e.reference.startsWith(gr))return!1;let i=new qle.URL(e.reference);return!(!jle.default.valid(i.pathname)||i.searchParams.has("__archiveUrl"))}getLocalPath(e,t){return null}async fetch(e,t){let i=t.checksums.get(e.locatorHash)||null,[n,s,o]=await t.cache.fetchPackageFromCache(e,i,{onHit:()=>t.report.reportCacheHit(e),onMiss:()=>t.report.reportCacheMiss(e,`${P.prettyLocator(t.project.configuration,e)} can't be found in the cache and will be fetched from the remote registry`),loader:()=>this.fetchFromNetwork(e,t),skipIntegrityCheck:t.skipIntegrityCheck,...t.cacheOptions});return{packageFs:n,releaseFs:s,prefixPath:P.getIdentVendorPath(e),checksum:o}}async fetchFromNetwork(e,t){let i;try{i=await mo(Ns.getLocatorUrl(e),{configuration:t.project.configuration,ident:e})}catch{i=await mo(Ns.getLocatorUrl(e).replace(/%2f/g,"/"),{configuration:t.project.configuration,ident:e})}return await mi.convertToZip(i,{compressionLevel:t.project.configuration.get("compressionLevel"),prefixPath:P.getIdentVendorPath(e),stripComponents:1})}static isConventionalTarballUrl(e,t,{configuration:i}){let n=uA(e.scope,{configuration:i}),s=Ns.getLocatorUrl(e);return t=t.replace(/^https?:(\/\/(?:[^/]+\.)?npmjs.org(?:$|\/))/,"https:$1"),n=n.replace(/^https:\/\/registry\.npmjs\.org($|\/)/,"https://registry.yarnpkg.com$1"),t=t.replace(/^https:\/\/registry\.npmjs\.org($|\/)/,"https://registry.yarnpkg.com$1"),t===n+s||t===n+s.replace(/%2f/g,"/")}static getLocatorUrl(e){let t=vt.clean(e.reference.slice(gr.length));if(t===null)throw new at(10,"The npm semver resolver got selected, but the version isn't semver");return`${yl(e)}/-/${e.name}-${t}.tgz`}};var Jle=Pe(Xr());var ub=P.makeIdent(null,"node-gyp"),Wze=/\b(node-gyp|prebuild-install)\b/,gb=class{supportsDescriptor(e,t){return e.range.startsWith(gr)?!!vt.validRange(e.range.slice(gr.length)):!1}supportsLocator(e,t){if(!e.reference.startsWith(gr))return!1;let{selector:i}=P.parseRange(e.reference);return!!Jle.default.valid(i)}shouldPersistResolution(e,t){return!0}bindDescriptor(e,t,i){return e}getResolutionDependencies(e,t){return[]}async getCandidates(e,t,i){let n=vt.validRange(e.range.slice(gr.length));if(n===null)throw new Error(`Expected a valid range, got ${e.range.slice(gr.length)}`);let s=await mo(yl(e),{configuration:i.project.configuration,ident:e,jsonResponse:!0}),o=Ie.mapAndFilter(Object.keys(s.versions),c=>{try{let u=new vt.SemVer(c);if(n.test(u))return u}catch{}return Ie.mapAndFilter.skip}),a=o.filter(c=>!s.versions[c.raw].deprecated),l=a.length>0?a:o;return l.sort((c,u)=>-c.compare(u)),l.map(c=>{let u=P.makeLocator(e,`${gr}${c.raw}`),g=s.versions[c.raw].dist.tarball;return Ns.isConventionalTarballUrl(u,g,{configuration:i.project.configuration})?u:P.bindLocator(u,{__archiveUrl:g})})}async getSatisfying(e,t,i){let n=vt.validRange(e.range.slice(gr.length));if(n===null)throw new Error(`Expected a valid range, got ${e.range.slice(gr.length)}`);return Ie.mapAndFilter(t,s=>{try{let{selector:o}=P.parseRange(s,{requireProtocol:gr}),a=new vt.SemVer(o);if(n.test(a))return{reference:s,version:a}}catch{}return Ie.mapAndFilter.skip}).sort((s,o)=>-s.version.compare(o.version)).map(({reference:s})=>P.makeLocator(e,s))}async resolve(e,t){let{selector:i}=P.parseRange(e.reference),n=vt.clean(i);if(n===null)throw new at(10,"The npm semver resolver got selected, but the version isn't semver");let s=await mo(yl(e),{configuration:t.project.configuration,ident:e,jsonResponse:!0});if(!Object.prototype.hasOwnProperty.call(s,"versions"))throw new at(15,'Registry returned invalid data for - missing "versions" field');if(!Object.prototype.hasOwnProperty.call(s.versions,n))throw new at(16,`Registry failed to return reference "${n}"`);let o=new ot;if(o.load(s.versions[n]),!o.dependencies.has(ub.identHash)&&!o.peerDependencies.has(ub.identHash)){for(let a of o.scripts.values())if(a.match(Wze)){o.dependencies.set(ub.identHash,P.makeDescriptor(ub,"latest")),t.report.reportWarningOnce(32,`${P.prettyLocator(t.project.configuration,e)}: Implicit dependencies on node-gyp are discouraged`);break}}if(typeof o.raw.deprecated=="string"&&o.raw.deprecated!==""){let a=P.prettyLocator(t.project.configuration,e),l=o.raw.deprecated.match(/\S/)?`${a} is deprecated: ${o.raw.deprecated}`:`${a} is deprecated`;t.report.reportWarningOnce(61,l)}return{...e,version:n,languageName:"node",linkType:"HARD",conditions:o.getConditions(),dependencies:o.dependencies,peerDependencies:o.peerDependencies,dependenciesMeta:o.dependenciesMeta,peerDependenciesMeta:o.peerDependenciesMeta,bin:o.bin}}};var fb=class{supportsDescriptor(e,t){return!(!e.range.startsWith(gr)||!Pf.test(e.range.slice(gr.length)))}supportsLocator(e,t){return!1}shouldPersistResolution(e,t){throw new Error("Unreachable")}bindDescriptor(e,t,i){return e}getResolutionDependencies(e,t){return[]}async getCandidates(e,t,i){let n=e.range.slice(gr.length),s=await mo(yl(e),{configuration:i.project.configuration,ident:e,jsonResponse:!0});if(!Object.prototype.hasOwnProperty.call(s,"dist-tags"))throw new at(15,'Registry returned invalid data - missing "dist-tags" field');let o=s["dist-tags"];if(!Object.prototype.hasOwnProperty.call(o,n))throw new at(16,`Registry failed to return tag "${n}"`);let a=o[n],l=P.makeLocator(e,`${gr}${a}`),c=s.versions[a].dist.tarball;return Ns.isConventionalTarballUrl(l,c,{configuration:i.project.configuration})?[l]:[P.bindLocator(l,{__archiveUrl:c})]}async getSatisfying(e,t,i){return null}async resolve(e,t){throw new Error("Unreachable")}};var dp={};ut(dp,{getGitHead:()=>qVe,makePublishBody:()=>jVe});var i1={};ut(i1,{default:()=>SVe,packUtils:()=>Aa});var Aa={};ut(Aa,{genPackList:()=>Tb,genPackStream:()=>r1,genPackageManifest:()=>Bue,hasPackScripts:()=>e1,prepareForPack:()=>t1});var $M=Pe(yn()),yue=Pe(Cue()),wue=J("zlib"),pVe=["/package.json","/readme","/readme.*","/license","/license.*","/licence","/licence.*","/changelog","/changelog.*"],dVe=["/package.tgz",".github",".git",".hg","node_modules",".npmignore",".gitignore",".#*",".DS_Store"];async function e1(r){return!!(Wt.hasWorkspaceScript(r,"prepack")||Wt.hasWorkspaceScript(r,"postpack"))}async function t1(r,{report:e},t){await Wt.maybeExecuteWorkspaceLifecycleScript(r,"prepack",{report:e});try{let i=x.join(r.cwd,ot.fileName);await M.existsPromise(i)&&await r.manifest.loadFile(i,{baseFs:M}),await t()}finally{await Wt.maybeExecuteWorkspaceLifecycleScript(r,"postpack",{report:e})}}async function r1(r,e){var s,o;typeof e>"u"&&(e=await Tb(r));let t=new Set;for(let a of(o=(s=r.manifest.publishConfig)==null?void 0:s.executableFiles)!=null?o:new Set)t.add(x.normalize(a));for(let a of r.manifest.bin.values())t.add(x.normalize(a));let i=yue.default.pack();process.nextTick(async()=>{for(let a of e){let l=x.normalize(a),c=x.resolve(r.cwd,l),u=x.join("package",l),g=await M.lstatPromise(c),f={name:u,mtime:new Date(xr.SAFE_TIME*1e3)},h=t.has(l)?493:420,p,C,y=new Promise((v,D)=>{p=v,C=D}),B=v=>{v?C(v):p()};if(g.isFile()){let v;l==="package.json"?v=Buffer.from(JSON.stringify(await Bue(r),null,2)):v=await M.readFilePromise(c),i.entry({...f,mode:h,type:"file"},v,B)}else g.isSymbolicLink()?i.entry({...f,mode:h,type:"symlink",linkname:await M.readlinkPromise(c)},B):B(new Error(`Unsupported file type ${g.mode} for ${K.fromPortablePath(l)}`));await y}i.finalize()});let n=(0,wue.createGzip)();return i.pipe(n),n}async function Bue(r){let e=JSON.parse(JSON.stringify(r.manifest.raw));return await r.project.configuration.triggerHook(t=>t.beforeWorkspacePacking,r,e),e}async function Tb(r){var g,f,h,p,C,y,B,v;let e=r.project,t=e.configuration,i={accept:[],reject:[]};for(let D of dVe)i.reject.push(D);for(let D of pVe)i.accept.push(D);i.reject.push(t.get("rcFilename"));let n=D=>{if(D===null||!D.startsWith(`${r.cwd}/`))return;let L=x.relative(r.cwd,D),H=x.resolve(Oe.root,L);i.reject.push(H)};n(x.resolve(e.cwd,t.get("lockfileFilename"))),n(t.get("cacheFolder")),n(t.get("globalFolder")),n(t.get("installStatePath")),n(t.get("virtualFolder")),n(t.get("yarnPath")),await t.triggerHook(D=>D.populateYarnPaths,e,D=>{n(D)});for(let D of e.workspaces){let L=x.relative(r.cwd,D.cwd);L!==""&&!L.match(/^(\.\.)?\//)&&i.reject.push(`/${L}`)}let s={accept:[],reject:[]},o=(f=(g=r.manifest.publishConfig)==null?void 0:g.main)!=null?f:r.manifest.main,a=(p=(h=r.manifest.publishConfig)==null?void 0:h.module)!=null?p:r.manifest.module,l=(y=(C=r.manifest.publishConfig)==null?void 0:C.browser)!=null?y:r.manifest.browser,c=(v=(B=r.manifest.publishConfig)==null?void 0:B.bin)!=null?v:r.manifest.bin;o!=null&&s.accept.push(x.resolve(Oe.root,o)),a!=null&&s.accept.push(x.resolve(Oe.root,a)),typeof l=="string"&&s.accept.push(x.resolve(Oe.root,l));for(let D of c.values())s.accept.push(x.resolve(Oe.root,D));if(l instanceof Map)for(let[D,L]of l.entries())s.accept.push(x.resolve(Oe.root,D)),typeof L=="string"&&s.accept.push(x.resolve(Oe.root,L));let u=r.manifest.files!==null;if(u){s.reject.push("/*");for(let D of r.manifest.files)Que(s.accept,D,{cwd:Oe.root})}return await CVe(r.cwd,{hasExplicitFileList:u,globalList:i,ignoreList:s})}async function CVe(r,{hasExplicitFileList:e,globalList:t,ignoreList:i}){let n=[],s=new So(r),o=[[Oe.root,[i]]];for(;o.length>0;){let[a,l]=o.pop(),c=await s.lstatPromise(a);if(!Eue(a,{globalList:t,ignoreLists:c.isDirectory()?null:l}))if(c.isDirectory()){let u=await s.readdirPromise(a),g=!1,f=!1;if(!e||a!==Oe.root)for(let C of u)g=g||C===".gitignore",f=f||C===".npmignore";let h=f?await mue(s,a,".npmignore"):g?await mue(s,a,".gitignore"):null,p=h!==null?[h].concat(l):l;Eue(a,{globalList:t,ignoreLists:l})&&(p=[...l,{accept:[],reject:["**/*"]}]);for(let C of u)o.push([x.resolve(a,C),p])}else(c.isFile()||c.isSymbolicLink())&&n.push(x.relative(Oe.root,a))}return n.sort()}async function mue(r,e,t){let i={accept:[],reject:[]},n=await r.readFilePromise(x.join(e,t),"utf8");for(let s of n.split(/\n/g))Que(i.reject,s,{cwd:e});return i}function mVe(r,{cwd:e}){let t=r[0]==="!";return t&&(r=r.slice(1)),r.match(/\.{0,1}\//)&&(r=x.resolve(e,r)),t&&(r=`!${r}`),r}function Que(r,e,{cwd:t}){let i=e.trim();i===""||i[0]==="#"||r.push(mVe(i,{cwd:t}))}function Eue(r,{globalList:e,ignoreLists:t}){let i=Lb(r,e.accept);if(i!==0)return i===2;let n=Lb(r,e.reject);if(n!==0)return n===1;if(t!==null)for(let s of t){let o=Lb(r,s.accept);if(o!==0)return o===2;let a=Lb(r,s.reject);if(a!==0)return a===1}return!1}function Lb(r,e){let t=e,i=[];for(let n=0;n<e.length;++n)e[n][0]!=="!"?t!==e&&t.push(e[n]):(t===e&&(t=e.slice(0,n)),i.push(e[n].slice(1)));return Iue(r,i)?2:Iue(r,t)?1:0}function Iue(r,e){let t=e,i=[];for(let n=0;n<e.length;++n)e[n].includes("/")?t!==e&&t.push(e[n]):(t===e&&(t=e.slice(0,n)),i.push(e[n]));return!!($M.default.isMatch(r,t,{dot:!0,nocase:!0})||$M.default.isMatch(r,i,{dot:!0,basename:!0,nocase:!0}))}var Ju=class extends De{constructor(){super(...arguments);this.installIfNeeded=z.Boolean("--install-if-needed",!1,{description:"Run a preliminary `yarn install` if the package contains build scripts"});this.dryRun=z.Boolean("-n,--dry-run",!1,{description:"Print the file paths without actually generating the package archive"});this.json=z.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.out=z.String("-o,--out",{description:"Create the archive at the specified path"});this.filename=z.String("--filename",{hidden:!0})}async execute(){var l;let t=await ye.find(this.context.cwd,this.context.plugins),{project:i,workspace:n}=await je.find(t,this.context.cwd);if(!n)throw new ct(i.cwd,this.context.cwd);await e1(n)&&(this.installIfNeeded?await i.install({cache:await Rt.find(t),report:new ti}):await i.restoreInstallState());let s=(l=this.out)!=null?l:this.filename,o=typeof s<"u"?x.resolve(this.context.cwd,EVe(s,{workspace:n})):x.resolve(n.cwd,"package.tgz");return(await Ge.start({configuration:t,stdout:this.context.stdout,json:this.json},async c=>{await t1(n,{report:c},async()=>{c.reportJson({base:K.fromPortablePath(n.cwd)});let u=await Tb(n);for(let g of u)c.reportInfo(null,K.fromPortablePath(g)),c.reportJson({location:K.fromPortablePath(g)});if(!this.dryRun){let g=await r1(n,u),f=M.createWriteStream(o);g.pipe(f),await new Promise(h=>{f.on("finish",h)})}}),this.dryRun||(c.reportInfo(0,`Package archive generated in ${ee.pretty(t,o,ee.Type.PATH)}`),c.reportJson({output:K.fromPortablePath(o)}))})).exitCode()}};Ju.paths=[["pack"]],Ju.usage=ve.Usage({description:"generate a tarball from the active workspace",details:"\n      This command will turn the active workspace into a compressed archive suitable for publishing. The archive will by default be stored at the root of the workspace (`package.tgz`).\n\n      If the `-o,---out` is set the archive will be created at the specified path. The `%s` and `%v` variables can be used within the path and will be respectively replaced by the package name and version.\n    ",examples:[["Create an archive from the active workspace","yarn pack"],["List the files that would be made part of the workspace's archive","yarn pack --dry-run"],["Name and output the archive in a dedicated folder","yarn pack --out /artifacts/%s-%v.tgz"]]});function EVe(r,{workspace:e}){let t=r.replace("%s",IVe(e)).replace("%v",yVe(e));return K.toPortablePath(t)}function IVe(r){return r.manifest.name!==null?P.slugifyIdent(r.manifest.name):"package"}function yVe(r){return r.manifest.version!==null?r.manifest.version:"unknown"}var wVe=["dependencies","devDependencies","peerDependencies"],BVe="workspace:",QVe=(r,e)=>{var i,n;e.publishConfig&&(e.publishConfig.type&&(e.type=e.publishConfig.type),e.publishConfig.main&&(e.main=e.publishConfig.main),e.publishConfig.browser&&(e.browser=e.publishConfig.browser),e.publishConfig.module&&(e.module=e.publishConfig.module),e.publishConfig.exports&&(e.exports=e.publishConfig.exports),e.publishConfig.imports&&(e.imports=e.publishConfig.imports),e.publishConfig.bin&&(e.bin=e.publishConfig.bin));let t=r.project;for(let s of wVe)for(let o of r.manifest.getForScope(s).values()){let a=t.tryWorkspaceByDescriptor(o),l=P.parseRange(o.range);if(l.protocol===BVe)if(a===null){if(t.tryWorkspaceByIdent(o)===null)throw new at(21,`${P.prettyDescriptor(t.configuration,o)}: No local workspace found for this range`)}else{let c;P.areDescriptorsEqual(o,a.anchoredDescriptor)||l.selector==="*"?c=(i=a.manifest.version)!=null?i:"0.0.0":l.selector==="~"||l.selector==="^"?c=`${l.selector}${(n=a.manifest.version)!=null?n:"0.0.0"}`:c=l.selector;let u=s==="dependencies"?P.makeDescriptor(o,"unknown"):null,g=u!==null&&r.manifest.ensureDependencyMeta(u).optional?"optionalDependencies":s;e[g][P.stringifyIdent(o)]=c}}},bVe={hooks:{beforeWorkspacePacking:QVe},commands:[Ju]},SVe=bVe;var Fue=J("crypto"),Nue=Pe(Rue()),Lue=J("url");async function jVe(r,e,{access:t,tag:i,registry:n,gitHead:s}){let o=r.project.configuration,a=r.manifest.name,l=r.manifest.version,c=P.stringifyIdent(a),u=(0,Fue.createHash)("sha1").update(e).digest("hex"),g=Nue.default.fromData(e).toString();typeof t>"u"&&(r.manifest.publishConfig&&typeof r.manifest.publishConfig.access=="string"?t=r.manifest.publishConfig.access:o.get("npmPublishAccess")!==null?t=o.get("npmPublishAccess"):a.scope?t="restricted":t="public");let f=await Aa.genPackageManifest(r),h=`${c}-${l}.tgz`,p=new Lue.URL(`${Co(n)}/${c}/-/${h}`);return{_id:c,_attachments:{[h]:{content_type:"application/octet-stream",data:e.toString("base64"),length:e.length}},name:c,access:t,["dist-tags"]:{[i]:l},versions:{[l]:{...f,_id:`${c}@${l}`,name:c,version:l,gitHead:s,dist:{shasum:u,integrity:g,tarball:p.toString()}}}}}async function qVe(r){try{let{stdout:e}=await Cr.execvp("git",["rev-parse","--revs-only","HEAD"],{cwd:r});return e.trim()===""?void 0:e.trim()}catch{return}}var a1={npmAlwaysAuth:{description:"URL of the selected npm registry (note: npm enterprise isn't supported)",type:"BOOLEAN",default:!1},npmAuthIdent:{description:"Authentication identity for the npm registry (_auth in npm and yarn v1)",type:"SECRET",default:null},npmAuthToken:{description:"Authentication token for the npm registry (_authToken in npm and yarn v1)",type:"SECRET",default:null}},Tue={npmAuditRegistry:{description:"Registry to query for audit reports",type:"STRING",default:null},npmPublishRegistry:{description:"Registry to push packages to",type:"STRING",default:null},npmRegistryServer:{description:"URL of the selected npm registry (note: npm enterprise isn't supported)",type:"STRING",default:"https://registry.yarnpkg.com"}},JVe={configuration:{...a1,...Tue,npmScopes:{description:"Settings per package scope",type:"MAP",valueDefinition:{description:"",type:"SHAPE",properties:{...a1,...Tue}}},npmRegistries:{description:"Settings per registry",type:"MAP",normalizeKeys:Co,valueDefinition:{description:"",type:"SHAPE",properties:{...a1}}}},fetchers:[lb,Ns],resolvers:[cb,gb,fb]},WVe=JVe;var g1={};ut(g1,{default:()=>i7e});var vE=Pe(yn());as();var Ob=(i=>(i.All="all",i.Production="production",i.Development="development",i))(Ob||{}),Mb=(s=>(s.Info="info",s.Low="low",s.Moderate="moderate",s.High="high",s.Critical="critical",s))(Mb||{});var SE=["info","low","moderate","high","critical"];function Mue(r,e){let t=[],i=new Set,n=o=>{i.has(o)||(i.add(o),t.push(o))};for(let o of e)n(o);let s=new Set;for(;t.length>0;){let o=t.shift(),a=r.storedResolutions.get(o);if(typeof a>"u")throw new Error("Assertion failed: Expected the resolution to have been registered");let l=r.storedPackages.get(a);if(!!l){s.add(o);for(let c of l.dependencies.values())n(c.descriptorHash)}}return s}function zVe(r,e){return new Set([...r].filter(t=>!e.has(t)))}function VVe(r,e,{all:t}){let i=t?r.workspaces:[e],n=i.map(f=>f.manifest),s=new Set(n.map(f=>[...f.dependencies].map(([h,p])=>h)).flat()),o=new Set(n.map(f=>[...f.devDependencies].map(([h,p])=>h)).flat()),a=i.map(f=>[...f.dependencies.values()]).flat(),l=a.filter(f=>s.has(f.identHash)).map(f=>f.descriptorHash),c=a.filter(f=>o.has(f.identHash)).map(f=>f.descriptorHash),u=Mue(r,l),g=Mue(r,c);return zVe(g,u)}function Kue(r){let e={};for(let t of r)e[P.stringifyIdent(t)]=P.parseRange(t.range).selector;return e}function Uue(r){if(typeof r>"u")return new Set(SE);let e=SE.indexOf(r),t=SE.slice(e);return new Set(t)}function XVe(r,e){let t=Uue(e),i={};for(let n of t)i[n]=r[n];return i}function Hue(r,e){var i;let t=XVe(r,e);for(let n of Object.keys(t))if((i=t[n])!=null?i:0>0)return!0;return!1}function Gue(r,e){var s;let t={},i={children:t},n=Object.values(r.advisories);if(e!=null){let o=Uue(e);n=n.filter(a=>o.has(a.severity))}for(let o of Ie.sortMap(n,a=>a.module_name))t[o.module_name]={label:o.module_name,value:ee.tuple(ee.Type.RANGE,o.findings.map(a=>a.version).join(", ")),children:{ID:{label:"ID",value:ee.tuple(ee.Type.NUMBER,o.id)},Issue:{label:"Issue",value:ee.tuple(ee.Type.NO_HINT,o.title)},URL:{label:"URL",value:ee.tuple(ee.Type.URL,o.url)},Severity:{label:"Severity",value:ee.tuple(ee.Type.NO_HINT,o.severity)},["Vulnerable Versions"]:{label:"Vulnerable Versions",value:ee.tuple(ee.Type.RANGE,o.vulnerable_versions)},["Patched Versions"]:{label:"Patched Versions",value:ee.tuple(ee.Type.RANGE,o.patched_versions)},Via:{label:"Via",value:ee.tuple(ee.Type.NO_HINT,Array.from(new Set(o.findings.map(a=>a.paths).flat().map(a=>a.split(">")[0]))).join(", "))},Recommendation:{label:"Recommendation",value:ee.tuple(ee.Type.NO_HINT,(s=o.recommendation)==null?void 0:s.replace(/\n/g," "))}}};return i}function Yue(r,e,{all:t,environment:i}){let n=t?r.workspaces:[e],s=["all","production"].includes(i),o=[];if(s)for(let c of n)for(let u of c.manifest.dependencies.values())o.push(u);let a=["all","development"].includes(i),l=[];if(a)for(let c of n)for(let u of c.manifest.devDependencies.values())l.push(u);return Kue([...o,...l].filter(c=>P.parseRange(c.range).protocol===null))}function jue(r,e,{all:t}){var s;let i=VVe(r,e,{all:t}),n={};for(let o of r.storedPackages.values())n[P.stringifyIdent(o)]={version:(s=o.version)!=null?s:"0.0.0",integrity:o.identHash,requires:Kue(o.dependencies.values()),dev:i.has(P.convertLocatorToDescriptor(o).descriptorHash)};return n}var Vu=class extends De{constructor(){super(...arguments);this.all=z.Boolean("-A,--all",!1,{description:"Audit dependencies from all workspaces"});this.recursive=z.Boolean("-R,--recursive",!1,{description:"Audit transitive dependencies as well"});this.environment=z.String("--environment","all",{description:"Which environments to cover",validator:Vi(Ob)});this.json=z.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.severity=z.String("--severity","info",{description:"Minimal severity requested for packages to be displayed",validator:Vi(Mb)});this.excludes=z.Array("--exclude",[],{description:"Array of glob patterns of packages to exclude from audit"});this.ignores=z.Array("--ignore",[],{description:"Array of glob patterns of advisory ID's to ignore in the audit report"})}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i,workspace:n}=await je.find(t,this.context.cwd);if(!n)throw new ct(i.cwd,this.context.cwd);await i.restoreInstallState();let s=Yue(i,n,{all:this.all,environment:this.environment}),o=jue(i,n,{all:this.all});if(!this.recursive)for(let C of Object.keys(o))Object.prototype.hasOwnProperty.call(s,C)?o[C].requires={}:delete o[C];let a=Array.from(new Set([...t.get("npmAuditExcludePackages"),...this.excludes]));if(a){for(let C of Object.keys(s))vE.default.isMatch(C,a)&&delete s[C];for(let C of Object.keys(o))vE.default.isMatch(C,a)&&delete o[C];for(let C of Object.keys(o))for(let y of Object.keys(o[C].requires))vE.default.isMatch(y,a)&&delete o[C].requires[y]}let l={requires:s,dependencies:o},c=or.getAuditRegistry(n.manifest,{configuration:t}),u,g=await ra.start({configuration:t,stdout:this.context.stdout},async()=>{u=await Mt.post("/-/npm/v1/security/audits/quick",l,{authType:Mt.AuthType.BEST_EFFORT,configuration:t,jsonResponse:!0,registry:c})});if(g.hasErrors())return g.exitCode();let f=Array.from(new Set([...t.get("npmAuditIgnoreAdvisories"),...this.ignores]));if(f){for(let C of Object.keys(u.advisories))if(vE.default.isMatch(C,f)){let y=u.advisories[C];u.metadata.vulnerabilities[y.severity]-=1,delete u.advisories[C]}}let h=Hue(u.metadata.vulnerabilities,this.severity);return!this.json&&h?(_n.emitTree(Gue(u,this.severity),{configuration:t,json:this.json,stdout:this.context.stdout,separators:2}),1):(await Ge.start({configuration:t,includeFooter:!1,json:this.json,stdout:this.context.stdout},async C=>{C.reportJson(u),h||C.reportInfo(1,"No audit suggestions")})).exitCode()}};Vu.paths=[["npm","audit"]],Vu.usage=ve.Usage({description:"perform a vulnerability audit against the installed packages",details:`
-      This command checks for known security reports on the packages you use. The reports are by default extracted from the npm registry, and may or may not be relevant to your actual program (not all vulnerabilities affect all code paths).
-
-      For consistency with our other commands the default is to only check the direct dependencies for the active workspace. To extend this search to all workspaces, use \`-A,--all\`. To extend this search to both direct and transitive dependencies, use \`-R,--recursive\`.
-
-      Applying the \`--severity\` flag will limit the audit table to vulnerabilities of the corresponding severity and above. Valid values are ${SE.map(t=>`\`${t}\``).join(", ")}.
-
-      If the \`--json\` flag is set, Yarn will print the output exactly as received from the registry. Regardless of this flag, the process will exit with a non-zero exit code if a report is found for the selected packages.
-
-      If certain packages produce false positives for a particular environment, the \`--exclude\` flag can be used to exclude any number of packages from the audit. This can also be set in the configuration file with the \`npmAuditExcludePackages\` option.
-
-      If particular advisories are needed to be ignored, the \`--ignore\` flag can be used with Advisory ID's to ignore any number of advisories in the audit report. This can also be set in the configuration file with the \`npmAuditIgnoreAdvisories\` option.
-
-      To understand the dependency tree requiring vulnerable packages, check the raw report with the \`--json\` flag or use \`yarn why <package>\` to get more information as to who depends on them.
-    `,examples:[["Checks for known security issues with the installed packages. The output is a list of known issues.","yarn npm audit"],["Audit dependencies in all workspaces","yarn npm audit --all"],["Limit auditing to `dependencies` (excludes `devDependencies`)","yarn npm audit --environment production"],["Show audit report as valid JSON","yarn npm audit --json"],["Audit all direct and transitive dependencies","yarn npm audit --recursive"],["Output moderate (or more severe) vulnerabilities","yarn npm audit --severity moderate"],["Exclude certain packages","yarn npm audit --exclude package1 --exclude package2"],["Ignore specific advisories","yarn npm audit --ignore 1234567 --ignore 7654321"]]});var l1=Pe(Xr()),c1=J("util"),Xu=class extends De{constructor(){super(...arguments);this.fields=z.String("-f,--fields",{description:"A comma-separated list of manifest fields that should be displayed"});this.json=z.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.packages=z.Rest()}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i}=await je.find(t,this.context.cwd),n=typeof this.fields<"u"?new Set(["name",...this.fields.split(/\s*,\s*/)]):null,s=[],o=!1,a=await Ge.start({configuration:t,includeFooter:!1,json:this.json,stdout:this.context.stdout},async l=>{for(let c of this.packages){let u;if(c==="."){let L=i.topLevelWorkspace;if(!L.manifest.name)throw new be(`Missing ${ee.pretty(t,"name",ee.Type.CODE)} field in ${K.fromPortablePath(x.join(L.cwd,xt.manifest))}`);u=P.makeDescriptor(L.manifest.name,"unknown")}else u=P.parseDescriptor(c);let g=Mt.getIdentUrl(u),f=u1(await Mt.get(g,{configuration:t,ident:u,jsonResponse:!0,customErrorMessage:Mt.customPackageError})),h=Object.keys(f.versions).sort(l1.default.compareLoose),C=f["dist-tags"].latest||h[h.length-1],y=vt.validRange(u.range);if(y){let L=l1.default.maxSatisfying(h,y);L!==null?C=L:(l.reportWarning(0,`Unmet range ${P.prettyRange(t,u.range)}; falling back to the latest version`),o=!0)}else Object.prototype.hasOwnProperty.call(f["dist-tags"],u.range)?C=f["dist-tags"][u.range]:u.range!=="unknown"&&(l.reportWarning(0,`Unknown tag ${P.prettyRange(t,u.range)}; falling back to the latest version`),o=!0);let B=f.versions[C],v={...f,...B,version:C,versions:h},D;if(n!==null){D={};for(let L of n){let H=v[L];if(typeof H<"u")D[L]=H;else{l.reportWarning(1,`The ${ee.pretty(t,L,ee.Type.CODE)} field doesn't exist inside ${P.prettyIdent(t,u)}'s information`),o=!0;continue}}}else this.json||(delete v.dist,delete v.readme,delete v.users),D=v;l.reportJson(D),this.json||s.push(D)}});c1.inspect.styles.name="cyan";for(let l of s)(l!==s[0]||o)&&this.context.stdout.write(`
-`),this.context.stdout.write(`${(0,c1.inspect)(l,{depth:1/0,colors:!0,compact:!1})}
-`);return a.exitCode()}};Xu.paths=[["npm","info"]],Xu.usage=ve.Usage({category:"Npm-related commands",description:"show information about a package",details:"\n      This command fetches information about a package from the npm registry and prints it in a tree format.\n\n      The package does not have to be installed locally, but needs to have been published (in particular, local changes will be ignored even for workspaces).\n\n      Append `@<range>` to the package argument to provide information specific to the latest version that satisfies the range or to the corresponding tagged version. If the range is invalid or if there is no version satisfying the range, the command will print a warning and fall back to the latest version.\n\n      If the `-f,--fields` option is set, it's a comma-separated list of fields which will be used to only display part of the package information.\n\n      By default, this command won't return the `dist`, `readme`, and `users` fields, since they are often very long. To explicitly request those fields, explicitly list them with the `--fields` flag or request the output in JSON mode.\n    ",examples:[["Show all available information about react (except the `dist`, `readme`, and `users` fields)","yarn npm info react"],["Show all available information about react as valid JSON (including the `dist`, `readme`, and `users` fields)","yarn npm info react --json"],["Show all available information about react@16.12.0","yarn npm info react@16.12.0"],["Show all available information about react@next","yarn npm info react@next"],["Show the description of react","yarn npm info react --fields description"],["Show all available versions of react","yarn npm info react --fields versions"],["Show the readme of react","yarn npm info react --fields readme"],["Show a few fields of react","yarn npm info react --fields homepage,repository"]]});function u1(r){if(Array.isArray(r)){let e=[];for(let t of r)t=u1(t),t&&e.push(t);return e}else if(typeof r=="object"&&r!==null){let e={};for(let t of Object.keys(r)){if(t.startsWith("_"))continue;let i=u1(r[t]);i&&(e[t]=i)}return e}else return r||null}var que=Pe(Om()),Zu=class extends De{constructor(){super(...arguments);this.scope=z.String("-s,--scope",{description:"Login to the registry configured for a given scope"});this.publish=z.Boolean("--publish",!1,{description:"Login to the publish registry"})}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),i=await Kb({configuration:t,cwd:this.context.cwd,publish:this.publish,scope:this.scope});return(await Ge.start({configuration:t,stdout:this.context.stdout,includeFooter:!1},async s=>{let o=await $Ve({configuration:t,registry:i,report:s,stdin:this.context.stdin,stdout:this.context.stdout}),a=`/-/user/org.couchdb.user:${encodeURIComponent(o.name)}`,l=await Mt.put(a,o,{attemptedAs:o.name,configuration:t,registry:i,jsonResponse:!0,authType:Mt.AuthType.NO_AUTH});return await _Ve(i,l.token,{configuration:t,scope:this.scope}),s.reportInfo(0,"Successfully logged in")})).exitCode()}};Zu.paths=[["npm","login"]],Zu.usage=ve.Usage({category:"Npm-related commands",description:"store new login info to access the npm registry",details:"\n      This command will ask you for your username, password, and 2FA One-Time-Password (when it applies). It will then modify your local configuration (in your home folder, never in the project itself) to reference the new tokens thus generated.\n\n      Adding the `-s,--scope` flag will cause the authentication to be done against whatever registry is configured for the associated scope (see also `npmScopes`).\n\n      Adding the `--publish` flag will cause the authentication to be done against the registry used when publishing the package (see also `publishConfig.registry` and `npmPublishRegistry`).\n    ",examples:[["Login to the default registry","yarn npm login"],["Login to the registry linked to the @my-scope registry","yarn npm login --scope my-scope"],["Login to the publish registry for the current package","yarn npm login --publish"]]});async function Kb({scope:r,publish:e,configuration:t,cwd:i}){return r&&e?or.getScopeRegistry(r,{configuration:t,type:or.RegistryType.PUBLISH_REGISTRY}):r?or.getScopeRegistry(r,{configuration:t}):e?or.getPublishRegistry((await Mh(t,i)).manifest,{configuration:t}):or.getDefaultRegistry({configuration:t})}async function _Ve(r,e,{configuration:t,scope:i}){let n=o=>a=>{let l=Ie.isIndexableObject(a)?a:{},c=l[o],u=Ie.isIndexableObject(c)?c:{};return{...l,[o]:{...u,npmAuthToken:e}}},s=i?{npmScopes:n(i)}:{npmRegistries:n(r)};return await ye.updateHomeConfiguration(s)}async function $Ve({configuration:r,registry:e,report:t,stdin:i,stdout:n}){t.reportInfo(0,`Logging in to ${ee.pretty(r,e,ee.Type.URL)}`);let s=!1;if(e.match(/^https:\/\/npm\.pkg\.github\.com(\/|$)/)&&(t.reportInfo(0,"You seem to be using the GitHub Package Registry. Tokens must be generated with the 'repo', 'write:packages', and 'read:packages' permissions."),s=!0),t.reportSeparator(),process.env.YARN_IS_TEST_ENV)return{name:process.env.YARN_INJECT_NPM_USER||"",password:process.env.YARN_INJECT_NPM_PASSWORD||""};let{username:o,password:a}=await(0,que.prompt)([{type:"input",name:"username",message:"Username:",required:!0,onCancel:()=>process.exit(130),stdin:i,stdout:n},{type:"password",name:"password",message:s?"Token:":"Password:",required:!0,onCancel:()=>process.exit(130),stdin:i,stdout:n}]);return t.reportSeparator(),{name:o,password:a}}var Cp=new Set(["npmAuthIdent","npmAuthToken"]),_u=class extends De{constructor(){super(...arguments);this.scope=z.String("-s,--scope",{description:"Logout of the registry configured for a given scope"});this.publish=z.Boolean("--publish",!1,{description:"Logout of the publish registry"});this.all=z.Boolean("-A,--all",!1,{description:"Logout of all registries"})}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),i=async()=>{var c;let s=await Kb({configuration:t,cwd:this.context.cwd,publish:this.publish,scope:this.scope}),o=await ye.find(this.context.cwd,this.context.plugins),a=P.makeIdent((c=this.scope)!=null?c:null,"pkg");return!or.getAuthConfiguration(s,{configuration:o,ident:a}).get("npmAuthToken")};return(await Ge.start({configuration:t,stdout:this.context.stdout},async s=>{if(this.all&&(await t7e(),s.reportInfo(0,"Successfully logged out from everything")),this.scope){await Jue("npmScopes",this.scope),await i()?s.reportInfo(0,`Successfully logged out from ${this.scope}`):s.reportWarning(0,"Scope authentication settings removed, but some other ones settings still apply to it");return}let o=await Kb({configuration:t,cwd:this.context.cwd,publish:this.publish});await Jue("npmRegistries",o),await i()?s.reportInfo(0,`Successfully logged out from ${o}`):s.reportWarning(0,"Registry authentication settings removed, but some other ones settings still apply to it")})).exitCode()}};_u.paths=[["npm","logout"]],_u.usage=ve.Usage({category:"Npm-related commands",description:"logout of the npm registry",details:"\n      This command will log you out by modifying your local configuration (in your home folder, never in the project itself) to delete all credentials linked to a registry.\n\n      Adding the `-s,--scope` flag will cause the deletion to be done against whatever registry is configured for the associated scope (see also `npmScopes`).\n\n      Adding the `--publish` flag will cause the deletion to be done against the registry used when publishing the package (see also `publishConfig.registry` and `npmPublishRegistry`).\n\n      Adding the `-A,--all` flag will cause the deletion to be done against all registries and scopes.\n    ",examples:[["Logout of the default registry","yarn npm logout"],["Logout of the @my-scope scope","yarn npm logout --scope my-scope"],["Logout of the publish registry for the current package","yarn npm logout --publish"],["Logout of all registries","yarn npm logout --all"]]});function e7e(r,e){let t=r[e];if(!Ie.isIndexableObject(t))return!1;let i=new Set(Object.keys(t));if([...Cp].every(s=>!i.has(s)))return!1;for(let s of Cp)i.delete(s);if(i.size===0)return r[e]=void 0,!0;let n={...t};for(let s of Cp)delete n[s];return r[e]=n,!0}async function t7e(){let r=e=>{let t=!1,i=Ie.isIndexableObject(e)?{...e}:{};i.npmAuthToken&&(delete i.npmAuthToken,t=!0);for(let n of Object.keys(i))e7e(i,n)&&(t=!0);if(Object.keys(i).length!==0)return t?i:e};return await ye.updateHomeConfiguration({npmRegistries:r,npmScopes:r})}async function Jue(r,e){return await ye.updateHomeConfiguration({[r]:t=>{let i=Ie.isIndexableObject(t)?t:{};if(!Object.prototype.hasOwnProperty.call(i,e))return t;let n=i[e],s=Ie.isIndexableObject(n)?n:{},o=new Set(Object.keys(s));if([...Cp].every(l=>!o.has(l)))return t;for(let l of Cp)o.delete(l);if(o.size===0)return Object.keys(i).length===1?void 0:{...i,[e]:void 0};let a={};for(let l of Cp)a[l]=void 0;return{...i,[e]:{...s,...a}}}})}var $u=class extends De{constructor(){super(...arguments);this.access=z.String("--access",{description:"The access for the published package (public or restricted)"});this.tag=z.String("--tag","latest",{description:"The tag on the registry that the package should be attached to"});this.tolerateRepublish=z.Boolean("--tolerate-republish",!1,{description:"Warn and exit when republishing an already existing version of a package"});this.otp=z.String("--otp",{description:"The OTP token to use with the command"})}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i,workspace:n}=await je.find(t,this.context.cwd);if(!n)throw new ct(i.cwd,this.context.cwd);if(n.manifest.private)throw new be("Private workspaces cannot be published");if(n.manifest.name===null||n.manifest.version===null)throw new be("Workspaces must have valid names and versions to be published on an external registry");await i.restoreInstallState();let s=n.manifest.name,o=n.manifest.version,a=or.getPublishRegistry(n.manifest,{configuration:t});return(await Ge.start({configuration:t,stdout:this.context.stdout},async c=>{var u,g;if(this.tolerateRepublish)try{let f=await Mt.get(Mt.getIdentUrl(s),{configuration:t,registry:a,ident:s,jsonResponse:!0});if(!Object.prototype.hasOwnProperty.call(f,"versions"))throw new at(15,'Registry returned invalid data for - missing "versions" field');if(Object.prototype.hasOwnProperty.call(f.versions,o)){c.reportWarning(0,`Registry already knows about version ${o}; skipping.`);return}}catch(f){if(((g=(u=f.originalError)==null?void 0:u.response)==null?void 0:g.statusCode)!==404)throw f}await Wt.maybeExecuteWorkspaceLifecycleScript(n,"prepublish",{report:c}),await Aa.prepareForPack(n,{report:c},async()=>{let f=await Aa.genPackList(n);for(let B of f)c.reportInfo(null,B);let h=await Aa.genPackStream(n,f),p=await Ie.bufferStream(h),C=await dp.getGitHead(n.cwd),y=await dp.makePublishBody(n,p,{access:this.access,tag:this.tag,registry:a,gitHead:C});await Mt.put(Mt.getIdentUrl(s),y,{configuration:t,registry:a,ident:s,otp:this.otp,jsonResponse:!0})}),c.reportInfo(0,"Package archive published")})).exitCode()}};$u.paths=[["npm","publish"]],$u.usage=ve.Usage({category:"Npm-related commands",description:"publish the active workspace to the npm registry",details:'\n      This command will pack the active workspace into a fresh archive and upload it to the npm registry.\n\n      The package will by default be attached to the `latest` tag on the registry, but this behavior can be overriden by using the `--tag` option.\n\n      Note that for legacy reasons scoped packages are by default published with an access set to `restricted` (aka "private packages"). This requires you to register for a paid npm plan. In case you simply wish to publish a public scoped package to the registry (for free), just add the `--access public` flag. This behavior can be enabled by default through the `npmPublishAccess` settings.\n    ',examples:[["Publish the active workspace","yarn npm publish"]]});var Wue=Pe(Xr());var eg=class extends De{constructor(){super(...arguments);this.json=z.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.package=z.String({required:!1})}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i,workspace:n}=await je.find(t,this.context.cwd),s;if(typeof this.package<"u")s=P.parseIdent(this.package);else{if(!n)throw new ct(i.cwd,this.context.cwd);if(!n.manifest.name)throw new be(`Missing 'name' field in ${K.fromPortablePath(x.join(n.cwd,xt.manifest))}`);s=n.manifest.name}let o=await xE(s,t),l={children:Ie.sortMap(Object.entries(o),([c])=>c).map(([c,u])=>({value:ee.tuple(ee.Type.RESOLUTION,{descriptor:P.makeDescriptor(s,c),locator:P.makeLocator(s,u)})}))};return _n.emitTree(l,{configuration:t,json:this.json,stdout:this.context.stdout})}};eg.paths=[["npm","tag","list"]],eg.usage=ve.Usage({category:"Npm-related commands",description:"list all dist-tags of a package",details:`
-      This command will list all tags of a package from the npm registry.
-
-      If the package is not specified, Yarn will default to the current workspace.
-    `,examples:[["List all tags of package `my-pkg`","yarn npm tag list my-pkg"]]});async function xE(r,e){let t=`/-/package${Mt.getIdentUrl(r)}/dist-tags`;return Mt.get(t,{configuration:e,ident:r,jsonResponse:!0,customErrorMessage:Mt.customPackageError})}var tg=class extends De{constructor(){super(...arguments);this.package=z.String();this.tag=z.String()}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i,workspace:n}=await je.find(t,this.context.cwd);if(!n)throw new ct(i.cwd,this.context.cwd);let s=P.parseDescriptor(this.package,!0),o=s.range;if(!Wue.default.valid(o))throw new be(`The range ${ee.pretty(t,s.range,ee.Type.RANGE)} must be a valid semver version`);let a=or.getPublishRegistry(n.manifest,{configuration:t}),l=ee.pretty(t,s,ee.Type.IDENT),c=ee.pretty(t,o,ee.Type.RANGE),u=ee.pretty(t,this.tag,ee.Type.CODE);return(await Ge.start({configuration:t,stdout:this.context.stdout},async f=>{let h=await xE(s,t);Object.prototype.hasOwnProperty.call(h,this.tag)&&h[this.tag]===o&&f.reportWarning(0,`Tag ${u} is already set to version ${c}`);let p=`/-/package${Mt.getIdentUrl(s)}/dist-tags/${encodeURIComponent(this.tag)}`;await Mt.put(p,o,{configuration:t,registry:a,ident:s,jsonRequest:!0,jsonResponse:!0}),f.reportInfo(0,`Tag ${u} added to version ${c} of package ${l}`)})).exitCode()}};tg.paths=[["npm","tag","add"]],tg.usage=ve.Usage({category:"Npm-related commands",description:"add a tag for a specific version of a package",details:`
-      This command will add a tag to the npm registry for a specific version of a package. If the tag already exists, it will be overwritten.
-    `,examples:[["Add a `beta` tag for version `2.3.4-beta.4` of package `my-pkg`","yarn npm tag add my-pkg@2.3.4-beta.4 beta"]]});var rg=class extends De{constructor(){super(...arguments);this.package=z.String();this.tag=z.String()}async execute(){if(this.tag==="latest")throw new be("The 'latest' tag cannot be removed.");let t=await ye.find(this.context.cwd,this.context.plugins),{project:i,workspace:n}=await je.find(t,this.context.cwd);if(!n)throw new ct(i.cwd,this.context.cwd);let s=P.parseIdent(this.package),o=or.getPublishRegistry(n.manifest,{configuration:t}),a=ee.pretty(t,this.tag,ee.Type.CODE),l=ee.pretty(t,s,ee.Type.IDENT),c=await xE(s,t);if(!Object.prototype.hasOwnProperty.call(c,this.tag))throw new be(`${a} is not a tag of package ${l}`);return(await Ge.start({configuration:t,stdout:this.context.stdout},async g=>{let f=`/-/package${Mt.getIdentUrl(s)}/dist-tags/${encodeURIComponent(this.tag)}`;await Mt.del(f,{configuration:t,registry:o,ident:s,jsonResponse:!0}),g.reportInfo(0,`Tag ${a} removed from package ${l}`)})).exitCode()}};rg.paths=[["npm","tag","remove"]],rg.usage=ve.Usage({category:"Npm-related commands",description:"remove a tag from a package",details:`
-      This command will remove a tag from a package from the npm registry.
-    `,examples:[["Remove the `beta` tag from package `my-pkg`","yarn npm tag remove my-pkg beta"]]});var ig=class extends De{constructor(){super(...arguments);this.scope=z.String("-s,--scope",{description:"Print username for the registry configured for a given scope"});this.publish=z.Boolean("--publish",!1,{description:"Print username for the publish registry"})}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),i;return this.scope&&this.publish?i=or.getScopeRegistry(this.scope,{configuration:t,type:or.RegistryType.PUBLISH_REGISTRY}):this.scope?i=or.getScopeRegistry(this.scope,{configuration:t}):this.publish?i=or.getPublishRegistry((await Mh(t,this.context.cwd)).manifest,{configuration:t}):i=or.getDefaultRegistry({configuration:t}),(await Ge.start({configuration:t,stdout:this.context.stdout},async s=>{var a,l;let o;try{o=await Mt.get("/-/whoami",{configuration:t,registry:i,authType:Mt.AuthType.ALWAYS_AUTH,jsonResponse:!0,ident:this.scope?P.makeIdent(this.scope,""):void 0})}catch(c){if(((a=c.response)==null?void 0:a.statusCode)===401||((l=c.response)==null?void 0:l.statusCode)===403){s.reportError(41,"Authentication failed - your credentials may have expired");return}else throw c}s.reportInfo(0,o.username)})).exitCode()}};ig.paths=[["npm","whoami"]],ig.usage=ve.Usage({category:"Npm-related commands",description:"display the name of the authenticated user",details:"\n      Print the username associated with the current authentication settings to the standard output.\n\n      When using `-s,--scope`, the username printed will be the one that matches the authentication settings of the registry associated with the given scope (those settings can be overriden using the `npmRegistries` map, and the registry associated with the scope is configured via the `npmScopes` map).\n\n      When using `--publish`, the registry we'll select will by default be the one used when publishing packages (`publishConfig.registry` or `npmPublishRegistry` if available, otherwise we'll fallback to the regular `npmRegistryServer`).\n    ",examples:[["Print username for the default registry","yarn npm whoami"],["Print username for the registry on a given scope","yarn npm whoami --scope company"]]});var r7e={configuration:{npmPublishAccess:{description:"Default access of the published packages",type:"STRING",default:null},npmAuditExcludePackages:{description:"Array of glob patterns of packages to exclude from npm audit",type:"STRING",default:[],isArray:!0},npmAuditIgnoreAdvisories:{description:"Array of glob patterns of advisory IDs to exclude from npm audit",type:"STRING",default:[],isArray:!0}},commands:[Vu,Xu,Zu,_u,$u,tg,eg,rg,ig]},i7e=r7e;var y1={};ut(y1,{default:()=>E7e,patchUtils:()=>ng});var ng={};ut(ng,{applyPatchFile:()=>Hb,diffFolders:()=>E1,ensureUnpatchedDescriptor:()=>h1,extractPackageToDisk:()=>m1,extractPatchFlags:()=>ege,isParentRequired:()=>C1,loadPatchFiles:()=>RE,makeDescriptor:()=>p1,makeLocator:()=>d1,makePatchHash:()=>I1,parseDescriptor:()=>DE,parseLocator:()=>kE,parsePatchFile:()=>PE});var n7e=/^@@ -(\d+)(,(\d+))? \+(\d+)(,(\d+))? @@.*/;function mp(r){return x.relative(Oe.root,x.resolve(Oe.root,K.toPortablePath(r)))}function s7e(r){let e=r.trim().match(n7e);if(!e)throw new Error(`Bad header line: '${r}'`);return{original:{start:Math.max(Number(e[1]),1),length:Number(e[3]||1)},patched:{start:Math.max(Number(e[4]),1),length:Number(e[6]||1)}}}var o7e=420,a7e=493;var zue=()=>({semverExclusivity:null,diffLineFromPath:null,diffLineToPath:null,oldMode:null,newMode:null,deletedFileMode:null,newFileMode:null,renameFrom:null,renameTo:null,beforeHash:null,afterHash:null,fromPath:null,toPath:null,hunks:null}),A7e=r=>({header:s7e(r),parts:[]}),l7e={["@"]:"header",["-"]:"deletion",["+"]:"insertion",[" "]:"context",["\\"]:"pragma",undefined:"context"};function c7e(r){let e=[],t=zue(),i="parsing header",n=null,s=null;function o(){n&&(s&&(n.parts.push(s),s=null),t.hunks.push(n),n=null)}function a(){o(),e.push(t),t=zue()}for(let l=0;l<r.length;l++){let c=r[l];if(i==="parsing header")if(c.startsWith("@@"))i="parsing hunks",t.hunks=[],l-=1;else if(c.startsWith("diff --git ")){t&&t.diffLineFromPath&&a();let u=c.match(/^diff --git a\/(.*?) b\/(.*?)\s*$/);if(!u)throw new Error(`Bad diff line: ${c}`);t.diffLineFromPath=u[1],t.diffLineToPath=u[2]}else if(c.startsWith("old mode "))t.oldMode=c.slice(9).trim();else if(c.startsWith("new mode "))t.newMode=c.slice(9).trim();else if(c.startsWith("deleted file mode "))t.deletedFileMode=c.slice(18).trim();else if(c.startsWith("new file mode "))t.newFileMode=c.slice(14).trim();else if(c.startsWith("rename from "))t.renameFrom=c.slice(12).trim();else if(c.startsWith("rename to "))t.renameTo=c.slice(10).trim();else if(c.startsWith("index ")){let u=c.match(/(\w+)\.\.(\w+)/);if(!u)continue;t.beforeHash=u[1],t.afterHash=u[2]}else c.startsWith("semver exclusivity ")?t.semverExclusivity=c.slice(19).trim():c.startsWith("--- ")?t.fromPath=c.slice(6).trim():c.startsWith("+++ ")&&(t.toPath=c.slice(6).trim());else{let u=l7e[c[0]]||null;switch(u){case"header":o(),n=A7e(c);break;case null:i="parsing header",a(),l-=1;break;case"pragma":{if(!c.startsWith("\\ No newline at end of file"))throw new Error(`Unrecognized pragma in patch file: ${c}`);if(!s)throw new Error("Bad parser state: No newline at EOF pragma encountered without context");s.noNewlineAtEndOfFile=!0}break;case"context":case"deletion":case"insertion":{if(!n)throw new Error("Bad parser state: Hunk lines encountered before hunk header");s&&s.type!==u&&(n.parts.push(s),s=null),s||(s={type:u,lines:[],noNewlineAtEndOfFile:!1}),s.lines.push(c.slice(1))}break;default:Ie.assertNever(u);break}}}a();for(let{hunks:l}of e)if(l)for(let c of l)g7e(c);return e}function u7e(r){let e=[];for(let t of r){let{semverExclusivity:i,diffLineFromPath:n,diffLineToPath:s,oldMode:o,newMode:a,deletedFileMode:l,newFileMode:c,renameFrom:u,renameTo:g,beforeHash:f,afterHash:h,fromPath:p,toPath:C,hunks:y}=t,B=u?"rename":l?"file deletion":c?"file creation":y&&y.length>0?"patch":"mode change",v=null;switch(B){case"rename":{if(!u||!g)throw new Error("Bad parser state: rename from & to not given");e.push({type:"rename",semverExclusivity:i,fromPath:mp(u),toPath:mp(g)}),v=g}break;case"file deletion":{let D=n||p;if(!D)throw new Error("Bad parse state: no path given for file deletion");e.push({type:"file deletion",semverExclusivity:i,hunk:y&&y[0]||null,path:mp(D),mode:Ub(l),hash:f})}break;case"file creation":{let D=s||C;if(!D)throw new Error("Bad parse state: no path given for file creation");e.push({type:"file creation",semverExclusivity:i,hunk:y&&y[0]||null,path:mp(D),mode:Ub(c),hash:h})}break;case"patch":case"mode change":v=C||s;break;default:Ie.assertNever(B);break}v&&o&&a&&o!==a&&e.push({type:"mode change",semverExclusivity:i,path:mp(v),oldMode:Ub(o),newMode:Ub(a)}),v&&y&&y.length&&e.push({type:"patch",semverExclusivity:i,path:mp(v),hunks:y,beforeHash:f,afterHash:h})}if(e.length===0)throw new Error("Unable to parse patch file: No changes found. Make sure the patch is a valid UTF8 encoded string");return e}function Ub(r){let e=parseInt(r,8)&511;if(e!==o7e&&e!==a7e)throw new Error(`Unexpected file mode string: ${r}`);return e}function PE(r){let e=r.split(/\n/g);return e[e.length-1]===""&&e.pop(),u7e(c7e(e))}function g7e(r){let e=0,t=0;for(let{type:i,lines:n}of r.parts)switch(i){case"context":t+=n.length,e+=n.length;break;case"deletion":e+=n.length;break;case"insertion":t+=n.length;break;default:Ie.assertNever(i);break}if(e!==r.header.original.length||t!==r.header.patched.length){let i=n=>n<0?n:`+${n}`;throw new Error(`hunk header integrity check failed (expected @@ ${i(r.header.original.length)} ${i(r.header.patched.length)} @@, got @@ ${i(e)} ${i(t)} @@)`)}}var Ep=class extends Error{constructor(t,i){super(`Cannot apply hunk #${t+1}`);this.hunk=i}};async function Ip(r,e,t){let i=await r.lstatPromise(e),n=await t();if(typeof n<"u"&&(e=n),r.lutimesPromise)await r.lutimesPromise(e,i.atime,i.mtime);else if(!i.isSymbolicLink())await r.utimesPromise(e,i.atime,i.mtime);else throw new Error("Cannot preserve the time values of a symlink")}async function Hb(r,{baseFs:e=new $t,dryRun:t=!1,version:i=null}={}){for(let n of r)if(!(n.semverExclusivity!==null&&i!==null&&!vt.satisfiesWithPrereleases(i,n.semverExclusivity)))switch(n.type){case"file deletion":if(t){if(!e.existsSync(n.path))throw new Error(`Trying to delete a file that doesn't exist: ${n.path}`)}else await Ip(e,x.dirname(n.path),async()=>{await e.unlinkPromise(n.path)});break;case"rename":if(t){if(!e.existsSync(n.fromPath))throw new Error(`Trying to move a file that doesn't exist: ${n.fromPath}`)}else await Ip(e,x.dirname(n.fromPath),async()=>{await Ip(e,x.dirname(n.toPath),async()=>{await Ip(e,n.fromPath,async()=>(await e.movePromise(n.fromPath,n.toPath),n.toPath))})});break;case"file creation":if(t){if(e.existsSync(n.path))throw new Error(`Trying to create a file that already exists: ${n.path}`)}else{let s=n.hunk?n.hunk.parts[0].lines.join(`
-`)+(n.hunk.parts[0].noNewlineAtEndOfFile?"":`
-`):"";await e.mkdirpPromise(x.dirname(n.path),{chmod:493,utimes:[xr.SAFE_TIME,xr.SAFE_TIME]}),await e.writeFilePromise(n.path,s,{mode:n.mode}),await e.utimesPromise(n.path,xr.SAFE_TIME,xr.SAFE_TIME)}break;case"patch":await Ip(e,n.path,async()=>{await p7e(n,{baseFs:e,dryRun:t})});break;case"mode change":{let o=(await e.statPromise(n.path)).mode;if(Vue(n.newMode)!==Vue(o))continue;await Ip(e,n.path,async()=>{await e.chmodPromise(n.path,n.newMode)})}break;default:Ie.assertNever(n);break}}function Vue(r){return(r&64)>0}function Xue(r){return r.replace(/\s+$/,"")}function h7e(r,e){return Xue(r)===Xue(e)}async function p7e({hunks:r,path:e},{baseFs:t,dryRun:i=!1}){let n=await t.statSync(e).mode,o=(await t.readFileSync(e,"utf8")).split(/\n/),a=[],l=0,c=0;for(let g of r){let f=Math.max(c,g.header.patched.start+l),h=Math.max(0,f-c),p=Math.max(0,o.length-f-g.header.original.length),C=Math.max(h,p),y=0,B=0,v=null;for(;y<=C;){if(y<=h&&(B=f-y,v=Zue(g,o,B),v!==null)){y=-y;break}if(y<=p&&(B=f+y,v=Zue(g,o,B),v!==null))break;y+=1}if(v===null)throw new Ep(r.indexOf(g),g);a.push(v),l+=y,c=B+g.header.original.length}if(i)return;let u=0;for(let g of a)for(let f of g)switch(f.type){case"splice":{let h=f.index+u;o.splice(h,f.numToDelete,...f.linesToInsert),u+=f.linesToInsert.length-f.numToDelete}break;case"pop":o.pop();break;case"push":o.push(f.line);break;default:Ie.assertNever(f);break}await t.writeFilePromise(e,o.join(`
-`),{mode:n})}function Zue(r,e,t){let i=[];for(let n of r.parts)switch(n.type){case"context":case"deletion":{for(let s of n.lines){let o=e[t];if(o==null||!h7e(o,s))return null;t+=1}n.type==="deletion"&&(i.push({type:"splice",index:t-n.lines.length,numToDelete:n.lines.length,linesToInsert:[]}),n.noNewlineAtEndOfFile&&i.push({type:"push",line:""}))}break;case"insertion":i.push({type:"splice",index:t,numToDelete:0,linesToInsert:n.lines}),n.noNewlineAtEndOfFile&&i.push({type:"pop"});break;default:Ie.assertNever(n.type);break}return i}var C7e=/^builtin<([^>]+)>$/;function f1(r,e){let{source:t,selector:i,params:n}=P.parseRange(r);if(t===null)throw new Error("Patch locators must explicitly define their source");let s=i?i.split(/&/).map(c=>K.toPortablePath(c)):[],o=n&&typeof n.locator=="string"?P.parseLocator(n.locator):null,a=n&&typeof n.version=="string"?n.version:null,l=e(t);return{parentLocator:o,sourceItem:l,patchPaths:s,sourceVersion:a}}function DE(r){let{sourceItem:e,...t}=f1(r.range,P.parseDescriptor);return{...t,sourceDescriptor:e}}function kE(r){let{sourceItem:e,...t}=f1(r.reference,P.parseLocator);return{...t,sourceLocator:e}}function h1(r){if(!r.range.startsWith("patch:"))return r;let{sourceItem:e}=f1(r.range,P.parseDescriptor);return e}function _ue({parentLocator:r,sourceItem:e,patchPaths:t,sourceVersion:i,patchHash:n},s){let o=r!==null?{locator:P.stringifyLocator(r)}:{},a=typeof i<"u"?{version:i}:{},l=typeof n<"u"?{hash:n}:{};return P.makeRange({protocol:"patch:",source:s(e),selector:t.join("&"),params:{...a,...l,...o}})}function p1(r,{parentLocator:e,sourceDescriptor:t,patchPaths:i}){return P.makeDescriptor(r,_ue({parentLocator:e,sourceItem:t,patchPaths:i},P.stringifyDescriptor))}function d1(r,{parentLocator:e,sourcePackage:t,patchPaths:i,patchHash:n}){return P.makeLocator(r,_ue({parentLocator:e,sourceItem:t,sourceVersion:t.version,patchPaths:i,patchHash:n},P.stringifyLocator))}function $ue({onAbsolute:r,onRelative:e,onBuiltin:t},i){i.startsWith("~")&&(i=i.slice(1));let s=i.match(C7e);return s!==null?t(s[1]):x.isAbsolute(i)?r(i):e(i)}function ege(r){let e=r.startsWith("~");return e&&(r=r.slice(1)),{optional:e}}function C1(r){return $ue({onAbsolute:()=>!1,onRelative:()=>!0,onBuiltin:()=>!1},r)}async function RE(r,e,t){let i=r!==null?await t.fetcher.fetch(r,t):null,n=i&&i.localPath?{packageFs:new qt(Oe.root),prefixPath:x.relative(Oe.root,i.localPath)}:i;i&&i!==n&&i.releaseFs&&i.releaseFs();let s=await Ie.releaseAfterUseAsync(async()=>await Promise.all(e.map(async o=>{let a=ege(o),l=await $ue({onAbsolute:async()=>await M.readFilePromise(o,"utf8"),onRelative:async()=>{if(n===null)throw new Error("Assertion failed: The parent locator should have been fetched");return await n.packageFs.readFilePromise(x.join(n.prefixPath,o),"utf8")},onBuiltin:async c=>await t.project.configuration.firstHook(u=>u.getBuiltinPatch,t.project,c)},o);return{...a,source:l}})));for(let o of s)typeof o.source=="string"&&(o.source=o.source.replace(/\r\n?/g,`
-`));return s}async function m1(r,{cache:e,project:t}){let i=t.storedPackages.get(r.locatorHash);if(typeof i>"u")throw new Error("Assertion failed: Expected the package to be registered");let n=t.storedChecksums,s=new ti,o=t.configuration.makeFetcher(),a=await o.fetch(r,{cache:e,project:t,fetcher:o,checksums:n,report:s}),l=await M.mktempPromise(),c=x.join(l,"source"),u=x.join(l,"user"),g=x.join(l,".yarn-patch.json");return await Promise.all([M.copyPromise(c,a.prefixPath,{baseFs:a.packageFs}),M.copyPromise(u,a.prefixPath,{baseFs:a.packageFs}),M.writeJsonPromise(g,{locator:P.stringifyLocator(r),version:i.version})]),M.detachTemp(l),u}async function E1(r,e){let t=K.fromPortablePath(r).replace(/\\/g,"/"),i=K.fromPortablePath(e).replace(/\\/g,"/"),{stdout:n,stderr:s}=await Cr.execvp("git",["-c","core.safecrlf=false","diff","--src-prefix=a/","--dst-prefix=b/","--ignore-cr-at-eol","--full-index","--no-index","--no-renames","--text",t,i],{cwd:K.toPortablePath(process.cwd()),env:{...process.env,GIT_CONFIG_NOSYSTEM:"1",HOME:"",XDG_CONFIG_HOME:"",USERPROFILE:""}});if(s.length>0)throw new Error(`Unable to diff directories. Make sure you have a recent version of 'git' available in PATH.
-The following error was reported by 'git':
-${s}`);let o=t.startsWith("/")?a=>a.slice(1):a=>a;return n.replace(new RegExp(`(a|b)(${Ie.escapeRegExp(`/${o(t)}/`)})`,"g"),"$1/").replace(new RegExp(`(a|b)${Ie.escapeRegExp(`/${o(i)}/`)}`,"g"),"$1/").replace(new RegExp(Ie.escapeRegExp(`${t}/`),"g"),"").replace(new RegExp(Ie.escapeRegExp(`${i}/`),"g"),"")}function I1(r,e){let t=[];for(let{source:i}of r){if(i===null)continue;let n=PE(i);for(let s of n){let{semverExclusivity:o,...a}=s;o!==null&&e!==null&&!vt.satisfiesWithPrereleases(e,o)||t.push(JSON.stringify(a))}}return li.makeHash(`${3}`,...t).slice(0,6)}function tge(r,{configuration:e,report:t}){for(let i of r.parts)for(let n of i.lines)switch(i.type){case"context":t.reportInfo(null,`  ${ee.pretty(e,n,"grey")}`);break;case"deletion":t.reportError(28,`- ${ee.pretty(e,n,ee.Type.REMOVED)}`);break;case"insertion":t.reportError(28,`+ ${ee.pretty(e,n,ee.Type.ADDED)}`);break;default:Ie.assertNever(i.type)}}var Gb=class{supports(e,t){return!!e.reference.startsWith("patch:")}getLocalPath(e,t){return null}async fetch(e,t){let i=t.checksums.get(e.locatorHash)||null,[n,s,o]=await t.cache.fetchPackageFromCache(e,i,{onHit:()=>t.report.reportCacheHit(e),onMiss:()=>t.report.reportCacheMiss(e,`${P.prettyLocator(t.project.configuration,e)} can't be found in the cache and will be fetched from the disk`),loader:()=>this.patchPackage(e,t),skipIntegrityCheck:t.skipIntegrityCheck,...t.cacheOptions});return{packageFs:n,releaseFs:s,prefixPath:P.getIdentVendorPath(e),localPath:this.getLocalPath(e,t),checksum:o}}async patchPackage(e,t){let{parentLocator:i,sourceLocator:n,sourceVersion:s,patchPaths:o}=kE(e),a=await RE(i,o,t),l=await M.mktempPromise(),c=x.join(l,"current.zip"),u=await t.fetcher.fetch(n,t),g=P.getIdentVendorPath(e),f=await sn(),h=new Wr(c,{libzip:f,create:!0,level:t.project.configuration.get("compressionLevel")});await Ie.releaseAfterUseAsync(async()=>{await h.copyPromise(g,u.prefixPath,{baseFs:u.packageFs,stableSort:!0})},u.releaseFs),h.saveAndClose();for(let{source:p,optional:C}of a){if(p===null)continue;let y=new Wr(c,{libzip:f,level:t.project.configuration.get("compressionLevel")}),B=new qt(x.resolve(Oe.root,g),{baseFs:y});try{await Hb(PE(p),{baseFs:B,version:s})}catch(v){if(!(v instanceof Ep))throw v;let D=t.project.configuration.get("enableInlineHunks"),L=!D&&!C?" (set enableInlineHunks for details)":"",H=`${P.prettyLocator(t.project.configuration,e)}: ${v.message}${L}`,j=$=>{!D||tge(v.hunk,{configuration:t.project.configuration,report:$})};if(y.discardAndClose(),C){t.report.reportWarningOnce(66,H,{reportExtra:j});continue}else throw new at(66,H,j)}y.saveAndClose()}return new Wr(c,{libzip:f,level:t.project.configuration.get("compressionLevel")})}};var Yb=class{supportsDescriptor(e,t){return!!e.range.startsWith("patch:")}supportsLocator(e,t){return!!e.reference.startsWith("patch:")}shouldPersistResolution(e,t){return!1}bindDescriptor(e,t,i){let{patchPaths:n}=DE(e);return n.every(s=>!C1(s))?e:P.bindDescriptor(e,{locator:P.stringifyLocator(t)})}getResolutionDependencies(e,t){let{sourceDescriptor:i}=DE(e);return[i]}async getCandidates(e,t,i){if(!i.fetchOptions)throw new Error("Assertion failed: This resolver cannot be used unless a fetcher is configured");let{parentLocator:n,sourceDescriptor:s,patchPaths:o}=DE(e),a=await RE(n,o,i.fetchOptions),l=t.get(s.descriptorHash);if(typeof l>"u")throw new Error("Assertion failed: The dependency should have been resolved");let c=I1(a,l.version);return[d1(e,{parentLocator:n,sourcePackage:l,patchPaths:o,patchHash:c})]}async getSatisfying(e,t,i){return null}async resolve(e,t){let{sourceLocator:i}=kE(e);return{...await t.resolver.resolve(i,t),...e}}};var sg=class extends De{constructor(){super(...arguments);this.save=z.Boolean("-s,--save",!1,{description:"Add the patch to your resolution entries"});this.patchFolder=z.String()}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i,workspace:n}=await je.find(t,this.context.cwd);if(!n)throw new ct(i.cwd,this.context.cwd);await i.restoreInstallState();let s=x.resolve(this.context.cwd,K.toPortablePath(this.patchFolder)),o=x.join(s,"../source"),a=x.join(s,"../.yarn-patch.json");if(!M.existsSync(o))throw new be("The argument folder didn't get created by 'yarn patch'");let l=await E1(o,s),c=await M.readJsonPromise(a),u=P.parseLocator(c.locator,!0);if(!i.storedPackages.has(u.locatorHash))throw new be("No package found in the project for the given locator");if(!this.save){this.context.stdout.write(l);return}let g=t.get("patchFolder"),f=x.join(g,`${P.slugifyLocator(u)}.patch`);await M.mkdirPromise(g,{recursive:!0}),await M.writeFilePromise(f,l);let h=new Map;for(let p of i.storedPackages.values()){if(P.isVirtualLocator(p))continue;let C=p.dependencies.get(u.identHash);if(!C)continue;let y=P.isVirtualDescriptor(C)?P.devirtualizeDescriptor(C):C,B=h1(y),v=i.storedResolutions.get(B.descriptorHash);if(!v)throw new Error("Assertion failed: Expected the resolution to have been registered");if(!i.storedPackages.get(v))throw new Error("Assertion failed: Expected the package to have been registered");let L=i.originalPackages.get(p.locatorHash);if(!L)throw new Error("Assertion failed: Expected the original package to have been registered");let H=L.dependencies.get(C.identHash);if(!H)throw new Error("Assertion failed: Expected the original dependency to have been registered");h.set(H.descriptorHash,H)}for(let p of h.values()){let C=p1(p,{parentLocator:null,sourceDescriptor:P.convertLocatorToDescriptor(u),sourceVersion:null,patchPaths:[`./${x.relative(i.cwd,f)}`]});i.topLevelWorkspace.manifest.resolutions.push({pattern:{descriptor:{fullName:P.stringifyIdent(C),description:p.range}},reference:C.range})}await i.persist()}};sg.paths=[["patch-commit"]],sg.usage=ve.Usage({description:"generate a patch out of a directory",details:"\n      By default, this will print a patchfile on stdout based on the diff between the folder passed in and the original version of the package. Such file is suitable for consumption with the `patch:` protocol.\n\n      With the `-s,--save` option set, the patchfile won't be printed on stdout anymore and will instead be stored within a local file (by default kept within `.yarn/patches`, but configurable via the `patchFolder` setting). A `resolutions` entry will also be added to your top-level manifest, referencing the patched package via the `patch:` protocol.\n\n      Note that only folders generated by `yarn patch` are accepted as valid input for `yarn patch-commit`.\n    "});var og=class extends De{constructor(){super(...arguments);this.json=z.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.package=z.String()}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i,workspace:n}=await je.find(t,this.context.cwd),s=await Rt.find(t);if(!n)throw new ct(i.cwd,this.context.cwd);await i.restoreInstallState();let o=P.parseLocator(this.package);if(o.reference==="unknown"){let a=Ie.mapAndFilter([...i.storedPackages.values()],l=>l.identHash!==o.identHash?Ie.mapAndFilter.skip:P.isVirtualLocator(l)?Ie.mapAndFilter.skip:l);if(a.length===0)throw new be("No package found in the project for the given locator");if(a.length>1)throw new be(`Multiple candidate packages found; explicitly choose one of them (use \`yarn why <package>\` to get more information as to who depends on them):
-${a.map(l=>`
-- ${P.prettyLocator(t,l)}`).join("")}`);o=a[0]}if(!i.storedPackages.has(o.locatorHash))throw new be("No package found in the project for the given locator");await Ge.start({configuration:t,json:this.json,stdout:this.context.stdout},async a=>{let l=await m1(o,{cache:s,project:i});a.reportJson({locator:P.stringifyLocator(o),path:K.fromPortablePath(l)}),a.reportInfo(0,`Package ${P.prettyLocator(t,o)} got extracted with success!`),a.reportInfo(0,`You can now edit the following folder: ${ee.pretty(t,K.fromPortablePath(l),"magenta")}`),a.reportInfo(0,`Once you are done run ${ee.pretty(t,`yarn patch-commit -s ${process.platform==="win32"?'"':""}${K.fromPortablePath(l)}${process.platform==="win32"?'"':""}`,"cyan")} and Yarn will store a patchfile based on your changes.`)})}};og.paths=[["patch"]],og.usage=ve.Usage({description:"prepare a package for patching",details:"\n      This command will cause a package to be extracted in a temporary directory intended to be editable at will.\n      \n      Once you're done with your changes, run `yarn patch-commit -s <path>` (with `<path>` being the temporary directory you received) to generate a patchfile and register it into your top-level manifest via the `patch:` protocol. Run `yarn patch-commit -h` for more details.\n    "});var m7e={configuration:{enableInlineHunks:{description:"If true, the installs will print unmatched patch hunks",type:"BOOLEAN",default:!1},patchFolder:{description:"Folder where the patch files must be written",type:"ABSOLUTE_PATH",default:"./.yarn/patches"}},commands:[sg,og],fetchers:[Gb],resolvers:[Yb]},E7e=m7e;var b1={};ut(b1,{default:()=>w7e});var jb=class{supportsPackage(e,t){return this.isEnabled(t)}async findPackageLocation(e,t){if(!this.isEnabled(t))throw new Error("Assertion failed: Expected the pnpm linker to be enabled");let i=B1(),n=t.project.installersCustomData.get(i);if(!n)throw new be(`The project in ${ee.pretty(t.project.configuration,`${t.project.cwd}/package.json`,ee.Type.PATH)} doesn't seem to have been installed - running an install there might help`);let s=n.pathByLocator.get(e.locatorHash);if(typeof s>"u")throw new be(`Couldn't find ${P.prettyLocator(t.project.configuration,e)} in the currently installed pnpm map - running an install might help`);return s}async findPackageLocator(e,t){if(!this.isEnabled(t))return null;let i=B1(),n=t.project.installersCustomData.get(i);if(!n)throw new be(`The project in ${ee.pretty(t.project.configuration,`${t.project.cwd}/package.json`,ee.Type.PATH)} doesn't seem to have been installed - running an install there might help`);let s=e.match(/(^.*\/node_modules\/(@[^/]*\/)?[^/]+)(\/.*$)/);if(s){let l=n.locatorByPath.get(s[1]);if(l)return l}let o=e,a=e;do{a=o,o=x.dirname(a);let l=n.locatorByPath.get(a);if(l)return l}while(o!==a);return null}makeInstaller(e){return new w1(e)}isEnabled(e){return e.project.configuration.get("nodeLinker")==="pnpm"}},w1=class{constructor(e){this.opts=e;this.asyncActions=new Ie.AsyncActions(10);this.customData={pathByLocator:new Map,locatorByPath:new Map}}getCustomDataKey(){return B1()}attachCustomData(e){}async installPackage(e,t,i){switch(e.linkType){case"SOFT":return this.installPackageSoft(e,t,i);case"HARD":return this.installPackageHard(e,t,i)}throw new Error("Assertion failed: Unsupported package link type")}async installPackageSoft(e,t,i){let n=x.resolve(t.packageFs.getRealPath(),t.prefixPath);return this.customData.pathByLocator.set(e.locatorHash,n),{packageLocation:n,buildDirective:null}}async installPackageHard(e,t,i){var u;let n=I7e(e,{project:this.opts.project});this.customData.locatorByPath.set(n,P.stringifyLocator(e)),this.customData.pathByLocator.set(e.locatorHash,n),i.holdFetchResult(this.asyncActions.set(e.locatorHash,async()=>{await M.mkdirPromise(n,{recursive:!0}),await M.copyPromise(n,t.prefixPath,{baseFs:t.packageFs,overwrite:!1})}));let o=P.isVirtualLocator(e)?P.devirtualizeLocator(e):e,a={manifest:(u=await ot.tryFind(t.prefixPath,{baseFs:t.packageFs}))!=null?u:new ot,misc:{hasBindingGyp:po.hasBindingGyp(t)}},l=this.opts.project.getDependencyMeta(o,e.version),c=po.extractBuildScripts(e,a,l,{configuration:this.opts.project.configuration,report:this.opts.report});return{packageLocation:n,buildDirective:c}}async attachInternalDependencies(e,t){this.opts.project.configuration.get("nodeLinker")==="pnpm"&&(!rge(e,{project:this.opts.project})||this.asyncActions.reduce(e.locatorHash,async i=>{await i;let n=this.customData.pathByLocator.get(e.locatorHash);if(typeof n>"u")throw new Error(`Assertion failed: Expected the package to have been registered (${P.stringifyLocator(e)})`);let s=x.join(n,xt.nodeModules),o=[],a=await ige(s);for(let[l,c]of t){let u=c;rge(c,{project:this.opts.project})||(this.opts.report.reportWarningOnce(0,"The pnpm linker doesn't support providing different versions to workspaces' peer dependencies"),u=P.devirtualizeLocator(c));let g=this.customData.pathByLocator.get(u.locatorHash);if(typeof g>"u")throw new Error(`Assertion failed: Expected the package to have been registered (${P.stringifyLocator(c)})`);let f=P.stringifyIdent(l),h=x.join(s,f),p=x.relative(x.dirname(h),g),C=a.get(f);a.delete(f),o.push(Promise.resolve().then(async()=>{if(C){if(C.isSymbolicLink()&&await M.readlinkPromise(h)===p)return;await M.removePromise(h)}await M.mkdirpPromise(x.dirname(h)),process.platform=="win32"?await M.symlinkPromise(g,h,"junction"):await M.symlinkPromise(p,h)}))}o.push(nge(s,a)),await Promise.all(o)}))}async attachExternalDependents(e,t){throw new Error("External dependencies haven't been implemented for the pnpm linker")}async finalizeInstall(){let e=oge(this.opts.project);if(this.opts.project.configuration.get("nodeLinker")!=="pnpm")await M.removePromise(e);else{let t=[],i=new Set;for(let s of this.customData.pathByLocator.values()){let o=x.contains(e,s);if(o!==null){let[a,,...l]=o.split(x.sep);i.add(a);let c=x.join(e,a);t.push(M.readdirPromise(c).then(u=>Promise.all(u.map(async g=>{let f=x.join(c,g);if(g===xt.nodeModules){let h=await ige(f);return h.delete(l.join(x.sep)),nge(f,h)}else return M.removePromise(f)}))).catch(u=>{if(u.code!=="ENOENT")throw u}))}}let n;try{n=await M.readdirPromise(e)}catch{n=[]}for(let s of n)i.has(s)||t.push(M.removePromise(x.join(e,s)));await Promise.all(t)}return await this.asyncActions.wait(),await Q1(e),this.opts.project.configuration.get("nodeLinker")!=="node-modules"&&await Q1(sge(this.opts.project)),{customData:this.customData}}};function B1(){return JSON.stringify({name:"PnpmInstaller",version:2})}function sge(r){return x.join(r.cwd,xt.nodeModules)}function oge(r){return x.join(sge(r),".store")}function I7e(r,{project:e}){let t=P.slugifyLocator(r),i=P.getIdentVendorPath(r);return x.join(oge(e),t,i)}function rge(r,{project:e}){return!P.isVirtualLocator(r)||!e.tryWorkspaceByLocator(r)}async function ige(r){let e=new Map,t=[];try{t=await M.readdirPromise(r,{withFileTypes:!0})}catch(i){if(i.code!=="ENOENT")throw i}try{for(let i of t)if(!i.name.startsWith("."))if(i.name.startsWith("@")){let n=await M.readdirPromise(x.join(r,i.name),{withFileTypes:!0});if(n.length===0)e.set(i.name,i);else for(let s of n)e.set(`${i.name}/${s.name}`,s)}else e.set(i.name,i)}catch(i){if(i.code!=="ENOENT")throw i}return e}async function nge(r,e){var n;let t=[],i=new Set;for(let s of e.keys()){t.push(M.removePromise(x.join(r,s)));let o=(n=P.tryParseIdent(s))==null?void 0:n.scope;o&&i.add(`@${o}`)}return Promise.all(t).then(()=>Promise.all([...i].map(s=>Q1(x.join(r,s)))))}async function Q1(r){try{await M.rmdirPromise(r)}catch(e){if(e.code!=="ENOENT"&&e.code!=="ENOTEMPTY")throw e}}var y7e={linkers:[jb]},w7e=y7e;var mQ=()=>({modules:new Map([["@yarnpkg/cli",Rm],["@yarnpkg/core",im],["@yarnpkg/fslib",qp],["@yarnpkg/libzip",SC],["@yarnpkg/parsers",$p],["@yarnpkg/shell",DC],["clipanion",k$(ld)],["semver",B7e],["typanion",gn],["yup",Q7e],["@yarnpkg/plugin-essentials",pO],["@yarnpkg/plugin-compat",IO],["@yarnpkg/plugin-dlx",yO],["@yarnpkg/plugin-file",bO],["@yarnpkg/plugin-git",hO],["@yarnpkg/plugin-github",SO],["@yarnpkg/plugin-http",vO],["@yarnpkg/plugin-init",kO],["@yarnpkg/plugin-link",RO],["@yarnpkg/plugin-nm",uM],["@yarnpkg/plugin-npm",A1],["@yarnpkg/plugin-npm-cli",g1],["@yarnpkg/plugin-pack",i1],["@yarnpkg/plugin-patch",y1],["@yarnpkg/plugin-pnp",eM],["@yarnpkg/plugin-pnpm",b1]]),plugins:new Set(["@yarnpkg/plugin-essentials","@yarnpkg/plugin-compat","@yarnpkg/plugin-dlx","@yarnpkg/plugin-file","@yarnpkg/plugin-git","@yarnpkg/plugin-github","@yarnpkg/plugin-http","@yarnpkg/plugin-init","@yarnpkg/plugin-link","@yarnpkg/plugin-nm","@yarnpkg/plugin-npm","@yarnpkg/plugin-npm-cli","@yarnpkg/plugin-pack","@yarnpkg/plugin-patch","@yarnpkg/plugin-pnp","@yarnpkg/plugin-pnpm"])});z0({binaryVersion:Lr||"<unknown>",pluginConfiguration:mQ()});})();
-/*!
- * buildToken
- * Builds OAuth token prefix (helper function)
- *
- * @name buildToken
- * @function
- * @param {GitUrl} obj The parsed Git url object.
- * @return {String} token prefix
- */
-/*!
- * fill-range <https://github.com/jonschlinkert/fill-range>
- *
- * Copyright (c) 2014-present, Jon Schlinkert.
- * Licensed under the MIT License.
- */
-/*!
- * is-extglob <https://github.com/jonschlinkert/is-extglob>
- *
- * Copyright (c) 2014-2016, Jon Schlinkert.
- * Licensed under the MIT License.
- */
-/*!
- * is-glob <https://github.com/jonschlinkert/is-glob>
- *
- * Copyright (c) 2014-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
-/*!
- * is-number <https://github.com/jonschlinkert/is-number>
- *
- * Copyright (c) 2014-present, Jon Schlinkert.
- * Released under the MIT License.
- */
-/*!
- * is-windows <https://github.com/jonschlinkert/is-windows>
- *
- * Copyright © 2015-2018, Jon Schlinkert.
- * Released under the MIT License.
- */
-/*!
- * to-regex-range <https://github.com/micromatch/to-regex-range>
- *
- * Copyright (c) 2015-present, Jon Schlinkert.
- * Released under the MIT License.
- */
-/**
-  @license
-  Copyright (c) 2015, Rebecca Turner
-
-  Permission to use, copy, modify, and/or distribute this software for any
-  purpose with or without fee is hereby granted, provided that the above
-  copyright notice and this permission notice appear in all copies.
-
-  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  PERFORMANCE OF THIS SOFTWARE.
- */
-/**
-  @license
-  Copyright Joyent, Inc. and other Node contributors.
-
-  Permission is hereby granted, free of charge, to any person obtaining a
-  copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to permit
-  persons to whom the Software is furnished to do so, subject to the
-  following conditions:
-
-  The above copyright notice and this permission notice shall be included
-  in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-  NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-  OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-  USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-/**
-  @license
-  Copyright Node.js contributors. All rights reserved.
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to
-  deal in the Software without restriction, including without limitation the
-  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-  sell copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-  IN THE SOFTWARE.
-*/
-/**
-  @license
-  The MIT License (MIT)
-
-  Copyright (c) 2014 Blake Embrey (hello@blakeembrey.com)
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-*/
diff --git a/ui/.yarnrc b/ui/.yarnrc
index 65dab0366d67e..5a6de78087474 100644
--- a/ui/.yarnrc
+++ b/ui/.yarnrc
@@ -2,5 +2,5 @@
 # yarn lockfile v1
 
 
-lastUpdateCheck 1664829239911
-yarn-path ".yarn/releases/yarn-1.22.19.js"
+lastUpdateCheck 1572032507422
+yarn-path ".yarn/releases/yarn-1.19.1.js"
diff --git a/ui/.yarnrc.yml b/ui/.yarnrc.yml
deleted file mode 100644
index 07e7cc8737ce9..0000000000000
--- a/ui/.yarnrc.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-nodeLinker: node-modules
-
-yarnPath: .yarn/releases/yarn-3.5.0.cjs
diff --git a/ui/README.md b/ui/README.md
index 542708f18a4b9..c8f224b7e6a56 100644
--- a/ui/README.md
+++ b/ui/README.md
@@ -4,19 +4,15 @@
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 
 - [Vault UI](#vault-ui)
-  - [Ember CLI Version Upgrade Matrix](#ember-cli-version-upgrade-matrix)
+  - [Ember CLI Version Matrix](#ember-cli-version-matrix)
   - [Prerequisites](#prerequisites)
   - [Running a Vault Server](#running-a-vault-server)
-  - [Running the UI locally](#running-the-ui-locally)
-    - [Mirage](#mirage)
-  - [Building Vault UI into a Vault Binary](#building-vault-ui-into-a-vault-binary)
-  - [Development](#development)
-    - [Quick commands](#quick-commands)
+  - [Running / Development](#running--development)
     - [Code Generators](#code-generators)
     - [Running Tests](#running-tests)
     - [Linting](#linting)
-    - [Contributing / Best Practices](#contributing--best-practices)
-    - [Further Reading / Useful Links](#further-reading--useful-links)
+    - [Building Vault UI into a Vault Binary](#building-vault-ui-into-a-vault-binary)
+  - [Further Reading / Useful Links](#further-reading--useful-links)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
@@ -24,11 +20,10 @@
 
 This README outlines the details of collaborating on this Ember application.
 
-## Ember CLI Version Upgrade Matrix
+## Ember CLI Version Matrix
 
 | Vault Version | Ember Version |
 | ------------- | ------------- |
-| 1.13.x        | 4.4.0         |
 | 1.10.x        | 3.28.5        |
 | 1.9.x         | 3.22.0        |
 | 1.8.x         | 3.22.0        |
@@ -38,11 +33,16 @@ This README outlines the details of collaborating on this Ember application.
 
 You will need the following things properly installed on your computer.
 
+- [Node.js](https://nodejs.org/) (with NPM)
+- [Yarn](https://yarnpkg.com/en/)
 - [Git](https://git-scm.com/)
-- [Node.js](https://nodejs.org/)
-- [Yarn](https://yarnpkg.com/)
-- [Ember CLI](https://cli.emberjs.com/release/)
-- [Google Chrome](https://google.com/chrome/)
+- [Ember CLI](https://ember-cli.com/)
+- [lint-staged\*](https://www.npmjs.com/package/lint-staged)
+
+\* lint-staged is an optional dependency - running `yarn` will install it.
+If don't want optional dependencies installed you can run `yarn --ignore-optional`. If you've ignored the optional deps
+previously and want to install them, you have to tell yarn to refetch all deps by
+running `yarn --force`.
 
 In order to enforce the same version of `yarn` across installs, the `yarn` binary is included in the repo
 in the `.yarn/releases` folder. To update to a different version of `yarn`, use the `yarn policies set-version VERSION` command. For more information on this, see the [documentation](https://yarnpkg.com/en/docs/cli/policies).
@@ -50,87 +50,57 @@ in the `.yarn/releases` folder. To update to a different version of `yarn`, use
 ## Running a Vault Server
 
 Before running Vault UI locally, a Vault server must be running. First, ensure
-Vault dev is built according the the instructions in `../README.md`.
-
-- To start a single local Vault server: `yarn vault`
-- To start a local Vault cluster: `yarn vault:cluster`
-
-These commands may also be [aliased on your local device](https://github.com/hashicorp/vault-tools/blob/master/users/noelle/vault_aliases).
-
-## Running the UI locally
-
-To spin up the UI, a Vault server must be running (see previous step).
-_All of the commands below assume you're in the `ui/` directory._
-
-> These steps will start an Ember CLI server that proxies requests to port 8200,
-> and enable live rebuilding of the application as you change the UI application code.
-> Visit your app at [http://localhost:4200](http://localhost:4200).
+Vault dev is built according the the instructions in `../README.md`. To start a
+single local Vault server:
 
-1. Install dependencies:
+- `yarn vault`
 
-`yarn`
+To start a local Vault cluster:
 
-2. Run Vault UI and proxy back to a Vault server running on the default port, 8200:
+- `yarn vault:cluster`
 
-`yarn start`
-
-> If your Vault server is running on a different port you can use the
-> long-form version of the npm script:
-
-`ember server --proxy=http://localhost:PORT`
+These commands may also be [aliased on your local device](https://github.com/hashicorp/vault-tools/blob/master/users/noelle/vault_aliases).
 
-### Mirage
+## Running / Development
 
-[Mirage](https://miragejs.com/docs/getting-started/introduction/) can be helpful for mocking backend endpoints.
-Look in [mirage/handlers](mirage/handlers/) for existing mocked backends.
+To get all of the JavaScript dependencies installed, run this in the `ui` directory:
 
-Run yarn with mirage: `yarn start:mirage handlername`
+- `yarn`
 
-Where `handlername` is one of the options exported in [mirage/handlers/index](mirage/handlers/index.js)
+If you want to run Vault UI and proxy back to a Vault server running
+on the default port, 8200, run the following in the `ui` directory:
 
-## Building Vault UI into a Vault Binary
+- `yarn start`
 
-We use the [embed](https://golang.org/pkg/embed/) package from Go >1.20 to build
-the static assets of the Ember application into a Vault binary.
+This will start an Ember CLI server that proxies requests to port 8200,
+and enable live rebuilding of the application as you change the UI application code.
+Visit your app at [http://localhost:4200](http://localhost:4200).
 
-This can be done by running these commands from the root directory:
-`make static-dist`
-`make dev-ui`
+If your Vault server is running on a different port you can use the
+long-form version of the npm script:
 
-This will result in a Vault binary that has the UI built-in - though in
-a non-dev setup it will still need to be enabled via the `ui` config or
-setting `VAULT_UI` environment variable.
+`ember server --proxy=http://localhost:PORT`
 
-## Development
+To run yarn with mirage, do:
 
-### Quick commands
+- `yarn start:mirage handlername`
 
-| Command                               | Description                                                             |
-| ------------------------------------- | ----------------------------------------------------------------------- |
-| `yarn start`                          | start the app with live reloading                                       |
-| `yarn start:mirage <handler>`         | start the app with the mocked mirage backend, with handler provided     |
-| `make static-dist && make dev-ui`     | build a Vault binary with UI assets (run from root directory not `/ui`) |
-| `ember g component foo -ir core`      | generate a component in the /addon engine                               |
-| `yarn test:quick -f='<test name>'` -s | run tests in the browser, filtering by test name                        |
-| `yarn lint:js`                        | lint javascript files                                                   |
+Where `handlername` is one of the options exported in `mirage/handlers/index`
 
 ### Code Generators
 
 Make use of the many generators for code, try `ember help generate` for more details. If you're using a component that can be widely-used, consider making it an `addon` component instead (see [this PR](https://github.com/hashicorp/vault/pull/6629) for more details)
 
-eg. a reusable component named foo that you'd like in the core engine (read more about Ember engines [here](https://ember-engines.com/docs)).
-
-- `ember g component foo -ir core`
-
-The above command creates a template-only component by default. If you'd like to add a backing class, add the `-gc` flag:
+eg. a reusable component named foo that you'd like in the core engine
 
-- `ember g component foo -gc -ir core`
+- `ember g component foo --in lib/core`
+- `echo "export { default } from 'core/components/foo';" > lib/core/app/components/foo.js`
 
 ### Running Tests
 
-Running tests will spin up a Vault dev server on port :9200 via a
+Running tests will spin up a Vault dev server on port 9200 via a
 pretest script that testem (the test runner) executes. All of the
-acceptance tests then run, which proxy requests back to that server.
+acceptance tests then run, proxing requests back to that server.
 
 - `yarn run test:oss`
 - `yarn run test:oss -s` to keep the test server running after the initial run.
@@ -139,28 +109,26 @@ acceptance tests then run, which proxy requests back to that server.
 
 ### Linting
 
-- `yarn lint:js`
-- `yarn lint:hbs`
+- `yarn lint`
 - `yarn lint:fix`
 
-### Contributing / Best Practices
+### Building Vault UI into a Vault Binary
 
-Hello and thank you for contributing to the Vault UI! Below is a list of patterns we follow on the UI team to keep in mind when contributing to the UI codebase. This is an ever-evolving process, so we welcome any comments, questions or general feedback.
+We use the [embed](https://golang.org/pkg/embed/) package from Go 1.16+ to build
+the static assets of the Ember application into a Vault binary.
 
-> **Remember** prefixing your branch name with `ui/` will run UI tests and skip the go tests. If your PR includes backend changes, _do not_ prefix your branch, instead add the `ui` label on github. This will trigger the UI test suite to run, in addition to the backend Go tests.
+This can be done by running these commands from the root directory run:
+`make static-dist`
+`make dev-ui`
 
-- [routing](docs/routing.md)
-- [serializers/adapters](docs/serializers-adapters.md)
-- [models](docs/models.md)
-- [components](docs/components.md)
-- [forms](docs/forms.md)
-- [css](docs/css.md)
-- [ember engines](docs/engines.md)
+This will result in a Vault binary that has the UI built-in - though in
+a non-dev setup it will still need to be enabled via the `ui` config or
+setting `VAULT_UI` environment variable.
 
 ## Further Reading / Useful Links
 
-- [ember.js](https://emberjs.com/)
-- [ember-cli](https://cli.emberjs.com/release/)
+- [ember.js](http://emberjs.com/)
+- [ember-cli](https://ember-cli.com/)
 - Development Browser Extensions
   - [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)
   - [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/)
diff --git a/ui/app/adapters/application.js b/ui/app/adapters/application.js
index ae92adc6baef7..4d3e4e9f474e0 100644
--- a/ui/app/adapters/application.js
+++ b/ui/app/adapters/application.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import AdapterError from '@ember-data/adapter/error';
 import RESTAdapter from '@ember-data/adapter/rest';
 import { inject as service } from '@ember/service';
@@ -37,16 +32,15 @@ export default RESTAdapter.extend({
   },
 
   addHeaders(url, options) {
-    const token = options.clientToken || this.auth.currentToken;
-    const headers = {};
+    let token = options.clientToken || this.auth.currentToken;
+    let headers = {};
     if (token && !options.unauthenticated) {
       headers['X-Vault-Token'] = token;
     }
     if (options.wrapTTL) {
       headers['X-Vault-Wrap-TTL'] = options.wrapTTL;
     }
-    const namespace =
-      typeof options.namespace === 'undefined' ? this.namespaceService.path : options.namespace;
+    let namespace = typeof options.namespace === 'undefined' ? this.namespaceService.path : options.namespace;
     if (namespace && !NAMESPACE_ROOT_URLS.some((str) => url.includes(str))) {
       headers['X-Vault-Namespace'] = namespace;
     }
@@ -67,8 +61,8 @@ export default RESTAdapter.extend({
     let url = intendedUrl;
     let type = method;
     let options = passedOptions;
-    const controlGroup = this.controlGroup;
-    const controlGroupToken = controlGroup.tokenForUrl(url);
+    let controlGroup = this.controlGroup;
+    let controlGroupToken = controlGroup.tokenForUrl(url);
     // if we have a Control Group token that matches the intendedUrl,
     // then we want to unwrap it and return the unwrapped response as
     // if it were the initial request
@@ -83,7 +77,7 @@ export default RESTAdapter.extend({
         },
       };
     }
-    const opts = this._preRequest(url, options);
+    let opts = this._preRequest(url, options);
 
     return this._super(url, type, opts).then((...args) => {
       if (controlGroupToken) {
@@ -91,7 +85,7 @@ export default RESTAdapter.extend({
       }
       const [resp] = args;
       if (resp && resp.warnings) {
-        const flash = this.flashMessages;
+        let flash = this.flashMessages;
         resp.warnings.forEach((message) => {
           flash.info(message);
         });
@@ -102,7 +96,7 @@ export default RESTAdapter.extend({
 
   // for use on endpoints that don't return JSON responses
   rawRequest(url, type, options = {}) {
-    const opts = this._preRequest(url, options);
+    let opts = this._preRequest(url, options);
     return fetch(url, {
       method: type || 'GET',
       headers: opts.headers || {},
diff --git a/ui/app/adapters/auth-config/_base.js b/ui/app/adapters/auth-config/_base.js
index e202647d7e0b9..f89dfb06be346 100644
--- a/ui/app/adapters/auth-config/_base.js
+++ b/ui/app/adapters/auth-config/_base.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationAdapter from '../application';
 
 export default ApplicationAdapter.extend({
diff --git a/ui/app/adapters/auth-config/aws/client.js b/ui/app/adapters/auth-config/aws/client.js
index cb29038c9c471..6d61a851d6666 100644
--- a/ui/app/adapters/auth-config/aws/client.js
+++ b/ui/app/adapters/auth-config/aws/client.js
@@ -1,7 +1,2 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import AuthConfig from '../_base';
 export default AuthConfig.extend();
diff --git a/ui/app/adapters/auth-config/aws/identity-accesslist.js b/ui/app/adapters/auth-config/aws/identity-accesslist.js
index cb29038c9c471..6d61a851d6666 100644
--- a/ui/app/adapters/auth-config/aws/identity-accesslist.js
+++ b/ui/app/adapters/auth-config/aws/identity-accesslist.js
@@ -1,7 +1,2 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import AuthConfig from '../_base';
 export default AuthConfig.extend();
diff --git a/ui/app/adapters/auth-config/aws/roletag-denylist.js b/ui/app/adapters/auth-config/aws/roletag-denylist.js
index cb29038c9c471..6d61a851d6666 100644
--- a/ui/app/adapters/auth-config/aws/roletag-denylist.js
+++ b/ui/app/adapters/auth-config/aws/roletag-denylist.js
@@ -1,7 +1,2 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import AuthConfig from '../_base';
 export default AuthConfig.extend();
diff --git a/ui/app/adapters/auth-config/azure.js b/ui/app/adapters/auth-config/azure.js
index 542c43fd5a680..e43cb2ea860fe 100644
--- a/ui/app/adapters/auth-config/azure.js
+++ b/ui/app/adapters/auth-config/azure.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import AuthConfig from './_base';
 
 export default AuthConfig.extend();
diff --git a/ui/app/adapters/auth-config/gcp.js b/ui/app/adapters/auth-config/gcp.js
index 542c43fd5a680..e43cb2ea860fe 100644
--- a/ui/app/adapters/auth-config/gcp.js
+++ b/ui/app/adapters/auth-config/gcp.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import AuthConfig from './_base';
 
 export default AuthConfig.extend();
diff --git a/ui/app/adapters/auth-config/github.js b/ui/app/adapters/auth-config/github.js
index 542c43fd5a680..e43cb2ea860fe 100644
--- a/ui/app/adapters/auth-config/github.js
+++ b/ui/app/adapters/auth-config/github.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import AuthConfig from './_base';
 
 export default AuthConfig.extend();
diff --git a/ui/app/adapters/auth-config/jwt.js b/ui/app/adapters/auth-config/jwt.js
index d01ba80b192d1..21f5624ac4d01 100644
--- a/ui/app/adapters/auth-config/jwt.js
+++ b/ui/app/adapters/auth-config/jwt.js
@@ -1,7 +1,2 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import AuthConfig from './_base';
 export default AuthConfig.extend();
diff --git a/ui/app/adapters/auth-config/kubernetes.js b/ui/app/adapters/auth-config/kubernetes.js
index 542c43fd5a680..e43cb2ea860fe 100644
--- a/ui/app/adapters/auth-config/kubernetes.js
+++ b/ui/app/adapters/auth-config/kubernetes.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import AuthConfig from './_base';
 
 export default AuthConfig.extend();
diff --git a/ui/app/adapters/auth-config/ldap.js b/ui/app/adapters/auth-config/ldap.js
index 542c43fd5a680..e43cb2ea860fe 100644
--- a/ui/app/adapters/auth-config/ldap.js
+++ b/ui/app/adapters/auth-config/ldap.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import AuthConfig from './_base';
 
 export default AuthConfig.extend();
diff --git a/ui/app/adapters/auth-config/oidc.js b/ui/app/adapters/auth-config/oidc.js
index d01ba80b192d1..21f5624ac4d01 100644
--- a/ui/app/adapters/auth-config/oidc.js
+++ b/ui/app/adapters/auth-config/oidc.js
@@ -1,7 +1,2 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import AuthConfig from './_base';
 export default AuthConfig.extend();
diff --git a/ui/app/adapters/auth-config/okta.js b/ui/app/adapters/auth-config/okta.js
index 542c43fd5a680..e43cb2ea860fe 100644
--- a/ui/app/adapters/auth-config/okta.js
+++ b/ui/app/adapters/auth-config/okta.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import AuthConfig from './_base';
 
 export default AuthConfig.extend();
diff --git a/ui/app/adapters/auth-config/radius.js b/ui/app/adapters/auth-config/radius.js
index 542c43fd5a680..e43cb2ea860fe 100644
--- a/ui/app/adapters/auth-config/radius.js
+++ b/ui/app/adapters/auth-config/radius.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import AuthConfig from './_base';
 
 export default AuthConfig.extend();
diff --git a/ui/app/adapters/auth-method.js b/ui/app/adapters/auth-method.js
index ff73a804048b1..1e772c99ca11a 100644
--- a/ui/app/adapters/auth-method.js
+++ b/ui/app/adapters/auth-method.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import AdapterError from '@ember-data/adapter/error';
 import { assign } from '@ember/polyfills';
 import { set } from '@ember/object';
@@ -15,15 +10,15 @@ export default ApplicationAdapter.extend({
     return path ? url + '/' + encodePath(path) : url;
   },
 
-  // used in updateRecord
+  // used in updateRecord on the model#tune action
   pathForType() {
     return 'mounts/auth';
   },
 
   findAll(store, type, sinceToken, snapshotRecordArray) {
-    const isUnauthenticated = snapshotRecordArray?.adapterOptions?.unauthenticated;
+    let isUnauthenticated = snapshotRecordArray?.adapterOptions?.unauthenticated;
     if (isUnauthenticated) {
-      const url = `/${this.urlPrefix()}/internal/ui/mounts`;
+      let url = `/${this.urlPrefix()}/internal/ui/mounts`;
       return this.ajax(url, 'GET', {
         unauthenticated: true,
       })
@@ -53,7 +48,6 @@ export default ApplicationAdapter.extend({
 
     return this.ajax(this.url(path), 'POST', { data }).then(() => {
       // ember data doesn't like 204s if it's not a DELETE
-      data.config.id = path; // config relationship needs an id so use path for now
       return {
         data: assign({}, data, { path: path + '/', id: path }),
       };
@@ -67,9 +61,4 @@ export default ApplicationAdapter.extend({
   exchangeOIDC(path, state, code) {
     return this.ajax(`/v1/auth/${encodePath(path)}/oidc/callback`, 'GET', { data: { state, code } });
   },
-
-  tune(path, data) {
-    const url = `${this.buildURL()}/${this.pathForType()}/${encodePath(path)}tune`;
-    return this.ajax(url, 'POST', { data });
-  },
 });
diff --git a/ui/app/adapters/aws-credential.js b/ui/app/adapters/aws-credential.js
index e0a2b87aacbdc..ff8309973bd4b 100644
--- a/ui/app/adapters/aws-credential.js
+++ b/ui/app/adapters/aws-credential.js
@@ -1,18 +1,13 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationAdapter from './application';
 
 export default ApplicationAdapter.extend({
   createRecord(store, type, snapshot) {
-    const ttl = snapshot.attr('ttl');
-    const roleArn = snapshot.attr('roleArn');
-    const roleType = snapshot.attr('credentialType');
+    let ttl = snapshot.attr('ttl');
+    let roleArn = snapshot.attr('roleArn');
+    let roleType = snapshot.attr('credentialType');
     let method = 'POST';
     let options;
-    const data = {};
+    let data = {};
     if (roleType === 'iam_user') {
       method = 'GET';
     } else {
@@ -24,8 +19,8 @@ export default ApplicationAdapter.extend({
       }
       options = data.ttl || data.role_arn ? { data } : {};
     }
-    const role = snapshot.attr('role');
-    const url = `/v1/${role.backend}/creds/${role.name}`;
+    let role = snapshot.attr('role');
+    let url = `/v1/${role.backend}/creds/${role.name}`;
 
     return this.ajax(url, method, options).then((response) => {
       response.id = snapshot.id;
diff --git a/ui/app/adapters/capabilities.js b/ui/app/adapters/capabilities.js
index b600554442ac9..51144d0f8ff19 100644
--- a/ui/app/adapters/capabilities.js
+++ b/ui/app/adapters/capabilities.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import AdapterError from '@ember-data/adapter/error';
 import { set } from '@ember/object';
 import ApplicationAdapter from './application';
diff --git a/ui/app/adapters/clients/activity.js b/ui/app/adapters/clients/activity.js
index 6b68f470edc94..b387b892e8167 100644
--- a/ui/app/adapters/clients/activity.js
+++ b/ui/app/adapters/clients/activity.js
@@ -1,33 +1,44 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
+import Application from '../application';
+import { formatRFC3339 } from 'date-fns';
 
-import ApplicationAdapter from '../application';
-import { getUnixTime } from 'date-fns';
+export default Application.extend({
+  // Since backend converts the timezone to UTC, sending the first (1) as start or end date can cause the month to change.
+  // To mitigate this impact of timezone conversion, hard coding the dates to avoid month change.
+  formatTimeParams(query) {
+    let { start_time, end_time } = query;
+    // check if it's an array, if it is, it's coming from an action like selecting a new startTime or new EndTime
+    if (Array.isArray(start_time)) {
+      let startYear = Number(start_time[0]);
+      let startMonth = Number(start_time[1]);
+      start_time = formatRFC3339(new Date(startYear, startMonth, 10));
+    }
+    if (end_time) {
+      if (Array.isArray(end_time)) {
+        let endYear = Number(end_time[0]);
+        let endMonth = Number(end_time[1]);
+        end_time = formatRFC3339(new Date(endYear, endMonth, 20));
+      }
 
-export default class ActivityAdapter extends ApplicationAdapter {
-  // javascript localizes new Date() objects but all activity log data is stored in UTC
-  // create date object from user's input using Date.UTC() then send to backend as unix
-  // time params from the backend are formatted as a zulu timestamp
-  formatQueryParams(queryParams) {
-    let { start_time, end_time } = queryParams;
-    start_time = start_time.timestamp || getUnixTime(Date.UTC(start_time.year, start_time.monthIdx, 1));
-    // day=0 for Date.UTC() returns the last day of the month before
-    // increase monthIdx by one to get last day of queried month
-    end_time = end_time.timestamp || getUnixTime(Date.UTC(end_time.year, end_time.monthIdx + 1, 0));
-    return { start_time, end_time };
-  }
+      return { start_time, end_time };
+    } else {
+      return { start_time };
+    }
+  },
 
+  // query comes in as either: {start_time: '2021-03-17T00:00:00Z'} or
+  // {start_time: Array(2), end_time: Array(2)}
+  // end_time: (2) ['2022', 0]
+  // start_time: (2) ['2021', 2]
   queryRecord(store, type, query) {
-    const url = `${this.buildURL()}/internal/counters/activity`;
-    const queryParams = this.formatQueryParams(query);
+    let url = `${this.buildURL()}/internal/counters/activity`;
+    // check if start and/or end times are in RFC3395 format, if not convert with timezone UTC/zulu.
+    let queryParams = this.formatTimeParams(query);
     if (queryParams) {
       return this.ajax(url, 'GET', { data: queryParams }).then((resp) => {
-        const response = resp || {};
+        let response = resp || {};
         response.id = response.request_id || 'no-data';
         return response;
       });
     }
-  }
-}
+  },
+});
diff --git a/ui/app/adapters/clients/config.js b/ui/app/adapters/clients/config.js
index 696d9f9b7d16f..d5594f56b4fd4 100644
--- a/ui/app/adapters/clients/config.js
+++ b/ui/app/adapters/clients/config.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Application from '../application';
 
 export default Application.extend({
diff --git a/ui/app/adapters/clients/monthly.js b/ui/app/adapters/clients/monthly.js
new file mode 100644
index 0000000000000..a960e91aae04e
--- /dev/null
+++ b/ui/app/adapters/clients/monthly.js
@@ -0,0 +1,13 @@
+import ApplicationAdapter from '../application';
+
+export default class MonthlyAdapter extends ApplicationAdapter {
+  queryRecord() {
+    let url = `${this.buildURL()}/internal/counters/activity/monthly`;
+    // Query has startTime defined. The API will return the endTime if none is provided.
+    return this.ajax(url, 'GET').then((resp) => {
+      let response = resp || {};
+      response.id = response.request_id || 'no-data';
+      return response;
+    });
+  }
+}
diff --git a/ui/app/adapters/clients/version-history.js b/ui/app/adapters/clients/version-history.js
index eab2f3257afca..b45927e3a910c 100644
--- a/ui/app/adapters/clients/version-history.js
+++ b/ui/app/adapters/clients/version-history.js
@@ -1,11 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
+import Application from '../application';
 
-import ApplicationAdapter from '../application';
-
-export default class VersionHistoryAdapter extends ApplicationAdapter {
+export default Application.extend({
   findAll() {
     return this.ajax(this.buildURL() + '/version-history', 'GET', {
       data: {
@@ -14,5 +9,5 @@ export default class VersionHistoryAdapter extends ApplicationAdapter {
     }).then((resp) => {
       return resp;
     });
-  }
-}
+  },
+});
diff --git a/ui/app/adapters/cluster.js b/ui/app/adapters/cluster.js
index c750b6596ba5d..95911ea8c4165 100644
--- a/ui/app/adapters/cluster.js
+++ b/ui/app/adapters/cluster.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import AdapterError from '@ember-data/adapter/error';
 import { inject as service } from '@ember/service';
 import { assign } from '@ember/polyfills';
@@ -43,7 +38,7 @@ export default ApplicationAdapter.extend({
   },
 
   findRecord(store, type, id, snapshot) {
-    const fetches = {
+    let fetches = {
       health: this.health(),
       sealStatus: this.sealStatus().catch((e) => e),
     };
@@ -115,7 +110,7 @@ export default ApplicationAdapter.extend({
     const { role, jwt, token, password, username, path, nonce } = data;
     const url = this.urlForAuth(backend, username, path);
     const verb = backend === 'token' ? 'GET' : 'POST';
-    const options = {
+    let options = {
       unauthenticated: true,
     };
     if (backend === 'token') {
diff --git a/ui/app/adapters/console.js b/ui/app/adapters/console.js
index 86b649283c27a..473f2ce424ab3 100644
--- a/ui/app/adapters/console.js
+++ b/ui/app/adapters/console.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationAdapter from './application';
 
 export default ApplicationAdapter.extend({
diff --git a/ui/app/adapters/control-group-config.js b/ui/app/adapters/control-group-config.js
index 0ea88dc7f9b4c..07150202c2940 100644
--- a/ui/app/adapters/control-group-config.js
+++ b/ui/app/adapters/control-group-config.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationAdapter from './application';
 
 export default ApplicationAdapter.extend({
diff --git a/ui/app/adapters/control-group.js b/ui/app/adapters/control-group.js
index 33d47dd9194c2..9b88ab50d7273 100644
--- a/ui/app/adapters/control-group.js
+++ b/ui/app/adapters/control-group.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationAdapter from './application';
 
 export default ApplicationAdapter.extend({
@@ -11,7 +6,7 @@ export default ApplicationAdapter.extend({
   },
 
   findRecord(store, type, id) {
-    const baseUrl = this.buildURL(type.modelName);
+    let baseUrl = this.buildURL(type.modelName);
     return this.ajax(`${baseUrl}/request`, 'POST', {
       data: {
         accessor: id,
@@ -23,7 +18,7 @@ export default ApplicationAdapter.extend({
   },
 
   urlForUpdateRecord(id, modelName) {
-    const base = this.buildURL(modelName);
+    let base = this.buildURL(modelName);
     return `${base}/authorize`;
   },
 });
diff --git a/ui/app/adapters/database/connection.js b/ui/app/adapters/database/connection.js
index 602b038dd5781..477458dc5493f 100644
--- a/ui/app/adapters/database/connection.js
+++ b/ui/app/adapters/database/connection.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationAdapter from '../application';
 
 export default ApplicationAdapter.extend({
@@ -21,7 +16,7 @@ export default ApplicationAdapter.extend({
     return url;
   },
   optionsForQuery(id) {
-    const data = {};
+    let data = {};
     if (!id) {
       data['list'] = true;
     }
diff --git a/ui/app/adapters/database/credential.js b/ui/app/adapters/database/credential.js
index 516e0d431f847..b3652c2ff76e6 100644
--- a/ui/app/adapters/database/credential.js
+++ b/ui/app/adapters/database/credential.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { allSettled } from 'rsvp';
 import ApplicationAdapter from '../application';
 import ControlGroupError from 'vault/lib/control-group-error';
diff --git a/ui/app/adapters/database/role.js b/ui/app/adapters/database/role.js
index aa868147b48ce..cb7a81cbd6864 100644
--- a/ui/app/adapters/database/role.js
+++ b/ui/app/adapters/database/role.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { assign } from '@ember/polyfills';
 import { assert } from '@ember/debug';
 import ControlGroupError from 'vault/lib/control-group-error';
@@ -58,7 +53,7 @@ export default ApplicationAdapter.extend({
   },
 
   optionsForQuery(id) {
-    const data = {};
+    let data = {};
     if (!id) {
       data['list'] = true;
     }
@@ -88,9 +83,9 @@ export default ApplicationAdapter.extend({
         }
         // Names are distinct across both types of role,
         // so only one request should ever come back with value
-        const type = staticResp.value ? 'static' : 'dynamic';
-        const successful = staticResp.value || dynamicResp.value;
-        const resp = {
+        let type = staticResp.value ? 'static' : 'dynamic';
+        let successful = staticResp.value || dynamicResp.value;
+        let resp = {
           data: {},
           backend,
           id,
@@ -110,7 +105,7 @@ export default ApplicationAdapter.extend({
     const dynamicReq = this.dynamicRoles(backend);
 
     return allSettled([staticReq, dynamicReq]).then(([staticResp, dynamicResp]) => {
-      const resp = {
+      let resp = {
         backend,
         data: { keys: [] },
       };
@@ -144,7 +139,7 @@ export default ApplicationAdapter.extend({
 
   async _updateAllowedRoles(store, { role, backend, db, type = 'add' }) {
     const connection = await store.queryRecord('database/connection', { backend, id: db });
-    const roles = [...connection.allowed_roles];
+    let roles = [...connection.allowed_roles];
     const allowedRoles = type === 'add' ? addToArray([roles, role]) : removeFromArray([roles, role]);
     connection.allowed_roles = allowedRoles;
     return connection.save();
diff --git a/ui/app/adapters/generated-item-list.js b/ui/app/adapters/generated-item-list.js
index 6cddea3555040..be9b01402ac6d 100644
--- a/ui/app/adapters/generated-item-list.js
+++ b/ui/app/adapters/generated-item-list.js
@@ -1,29 +1,21 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { assign } from '@ember/polyfills';
 import ApplicationAdapter from './application';
 import { task } from 'ember-concurrency';
-import { inject as service } from '@ember/service';
 
 export default ApplicationAdapter.extend({
-  store: service(),
   namespace: 'v1',
   urlForItem() {},
   dynamicApiPath: '',
-
   getDynamicApiPath: task(function* (id) {
     // TODO: remove yield at some point.
-    const result = yield this.store.peekRecord('auth-method', id);
+    let result = yield this.store.peekRecord('auth-method', id);
     this.dynamicApiPath = result.apiPath;
     return;
   }),
 
   fetchByQuery: task(function* (store, query, isList) {
     const { id } = query;
-    const data = {};
+    let data = {};
     if (isList) {
       data.list = true;
       yield this.getDynamicApiPath.perform(id);
diff --git a/ui/app/adapters/identity/base.js b/ui/app/adapters/identity/base.js
index 2e4a864618060..6a6ed9fd2de62 100644
--- a/ui/app/adapters/identity/base.js
+++ b/ui/app/adapters/identity/base.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationAdapater from '../application';
 
 export default ApplicationAdapater.extend({
diff --git a/ui/app/adapters/identity/entity-alias.js b/ui/app/adapters/identity/entity-alias.js
index acc9d064c4cbc..5f9b19fc13b49 100644
--- a/ui/app/adapters/identity/entity-alias.js
+++ b/ui/app/adapters/identity/entity-alias.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import IdentityAdapter from './base';
 
 export default IdentityAdapter.extend();
diff --git a/ui/app/adapters/identity/entity-merge.js b/ui/app/adapters/identity/entity-merge.js
index 8a0a43fbaee70..f087244c5f024 100644
--- a/ui/app/adapters/identity/entity-merge.js
+++ b/ui/app/adapters/identity/entity-merge.js
@@ -1,14 +1,9 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import IdentityAdapter from './base';
 
 export default IdentityAdapter.extend({
   buildURL() {
     // first arg is modelName which we're hardcoding in the call to _super.
-    const [, ...args] = arguments;
+    let [, ...args] = arguments;
     return this._super('identity/entity/merge', ...args);
   },
 
diff --git a/ui/app/adapters/identity/entity.js b/ui/app/adapters/identity/entity.js
index d8e38d7c46a92..3449b48b4e0a1 100644
--- a/ui/app/adapters/identity/entity.js
+++ b/ui/app/adapters/identity/entity.js
@@ -1,17 +1,12 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import IdentityAdapter from './base';
 
 export default IdentityAdapter.extend({
   lookup(store, data) {
-    const url = `/${this.urlPrefix()}/identity/lookup/entity`;
+    let url = `/${this.urlPrefix()}/identity/lookup/entity`;
     return this.ajax(url, 'POST', { data }).then((response) => {
       // unsuccessful lookup is a 204
       if (!response) return;
-      const modelName = 'identity/entity';
+      let modelName = 'identity/entity';
       store.push(
         store
           .serializerFor(modelName)
diff --git a/ui/app/adapters/identity/group-alias.js b/ui/app/adapters/identity/group-alias.js
index acc9d064c4cbc..5f9b19fc13b49 100644
--- a/ui/app/adapters/identity/group-alias.js
+++ b/ui/app/adapters/identity/group-alias.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import IdentityAdapter from './base';
 
 export default IdentityAdapter.extend();
diff --git a/ui/app/adapters/identity/group.js b/ui/app/adapters/identity/group.js
index 2c7c4406b1bbd..6f4ffbc826241 100644
--- a/ui/app/adapters/identity/group.js
+++ b/ui/app/adapters/identity/group.js
@@ -1,17 +1,12 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import IdentityAdapter from './base';
 
 export default IdentityAdapter.extend({
   lookup(store, data) {
-    const url = `/${this.urlPrefix()}/identity/lookup/group`;
+    let url = `/${this.urlPrefix()}/identity/lookup/group`;
     return this.ajax(url, 'POST', { data }).then((response) => {
       // unsuccessful lookup is a 204
       if (!response) return;
-      const modelName = 'identity/group';
+      let modelName = 'identity/group';
       store.push(
         store
           .serializerFor(modelName)
diff --git a/ui/app/adapters/keymgmt/key.js b/ui/app/adapters/keymgmt/key.js
index 9c5585db409d0..ddcb203619e82 100644
--- a/ui/app/adapters/keymgmt/key.js
+++ b/ui/app/adapters/keymgmt/key.js
@@ -1,12 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationAdapter from '../application';
 import { encodePath } from 'vault/utils/path-encoding-helpers';
 import ControlGroupError from '../../lib/control-group-error';
-import { inject as service } from '@ember/service';
 
 function pickKeys(obj, picklist) {
   const data = {};
@@ -17,9 +11,7 @@ function pickKeys(obj, picklist) {
   });
   return data;
 }
-
 export default class KeymgmtKeyAdapter extends ApplicationAdapter {
-  @service store;
   namespace = 'v1';
 
   pathForType() {
@@ -52,13 +44,13 @@ export default class KeymgmtKeyAdapter extends ApplicationAdapter {
 
   _updateKey(backend, name, serialized) {
     // Only these two attributes are allowed to be updated
-    const data = pickKeys(serialized, ['deletion_allowed', 'min_enabled_version']);
+    let data = pickKeys(serialized, ['deletion_allowed', 'min_enabled_version']);
     return this.ajax(this.url(backend, name), 'PUT', { data });
   }
 
   _createKey(backend, name, serialized) {
     // Only type is allowed on create
-    const data = pickKeys(serialized, ['type']);
+    let data = pickKeys(serialized, ['type']);
     return this.ajax(this.url(backend, name), 'POST', { data });
   }
 
@@ -164,7 +156,7 @@ export default class KeymgmtKeyAdapter extends ApplicationAdapter {
   }
 
   async rotateKey(backend, id) {
-    const keyModel = this.store.peekRecord('keymgmt/key', id);
+    let keyModel = this.store.peekRecord('keymgmt/key', id);
     const result = await this.ajax(this.url(backend, id, 'ROTATE'), 'PUT');
     await keyModel.reload();
     return result;
diff --git a/ui/app/adapters/keymgmt/provider.js b/ui/app/adapters/keymgmt/provider.js
index 8d64be6a39d07..3612e8a019f93 100644
--- a/ui/app/adapters/keymgmt/provider.js
+++ b/ui/app/adapters/keymgmt/provider.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationAdapter from '../application';
 import { all } from 'rsvp';
 
diff --git a/ui/app/adapters/kmip/base.js b/ui/app/adapters/kmip/base.js
index be9b0d4789337..d6dcbe202bd3f 100644
--- a/ui/app/adapters/kmip/base.js
+++ b/ui/app/adapters/kmip/base.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationAdapter from '../application';
 import { encodePath } from 'vault/utils/path-encoding-helpers';
 
@@ -13,8 +8,8 @@ export default ApplicationAdapter.extend({
   },
 
   _url(modelType, meta = {}, id) {
-    const { backend, scope, role } = meta;
-    const type = this.pathForType(modelType);
+    let { backend, scope, role } = meta;
+    let type = this.pathForType(modelType);
     let base;
     switch (type) {
       case 'scope':
@@ -38,7 +33,7 @@ export default ApplicationAdapter.extend({
   },
 
   urlForQuery(query, modelType) {
-    const base = this._url(modelType, query);
+    let base = this._url(modelType, query);
     return base + '?list=true';
   },
 
@@ -52,7 +47,7 @@ export default ApplicationAdapter.extend({
   },
 
   queryRecord(store, type, query) {
-    const id = query.id;
+    let id = query.id;
     delete query.id;
     return this.ajax(this._url(type.modelName, query, id), 'GET').then((resp) => {
       resp.id = id;
diff --git a/ui/app/adapters/kmip/ca.js b/ui/app/adapters/kmip/ca.js
index bb88a125b0bfb..bc07c11c0d1d0 100644
--- a/ui/app/adapters/kmip/ca.js
+++ b/ui/app/adapters/kmip/ca.js
@@ -1,13 +1,8 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import BaseAdapter from './base';
 
 export default BaseAdapter.extend({
   urlForFindRecord(id, modelName, snapshot) {
-    const name = this.pathForType(modelName);
+    let name = this.pathForType(modelName);
     return this.buildURL(id, name, snapshot);
   },
 });
diff --git a/ui/app/adapters/kmip/config.js b/ui/app/adapters/kmip/config.js
index 34f177db88b12..32f27803f8944 100644
--- a/ui/app/adapters/kmip/config.js
+++ b/ui/app/adapters/kmip/config.js
@@ -1,13 +1,8 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import BaseAdapter from './base';
 
 export default BaseAdapter.extend({
   _url(id, modelName, snapshot) {
-    const name = this.pathForType(modelName);
+    let name = this.pathForType(modelName);
     // id here will be the mount path,
     // modelName will be config so we want to transpose the first two call args
     return this.buildURL(id, name, snapshot);
diff --git a/ui/app/adapters/kmip/credential.js b/ui/app/adapters/kmip/credential.js
index a7f354602a56b..741aa3e902361 100644
--- a/ui/app/adapters/kmip/credential.js
+++ b/ui/app/adapters/kmip/credential.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import BaseAdapter from './base';
 
 export default BaseAdapter.extend({
diff --git a/ui/app/adapters/kmip/role.js b/ui/app/adapters/kmip/role.js
index f9c1595850836..31667bf3f2229 100644
--- a/ui/app/adapters/kmip/role.js
+++ b/ui/app/adapters/kmip/role.js
@@ -1,16 +1,11 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import BaseAdapter from './base';
 import { decamelize } from '@ember/string';
 import { getProperties } from '@ember/object';
 
 export default BaseAdapter.extend({
   createRecord(store, type, snapshot) {
-    const name = snapshot.id || snapshot.attr('name');
-    const url = this._url(
+    let name = snapshot.id || snapshot.attr('name');
+    let url = this._url(
       type.modelName,
       {
         backend: snapshot.record.backend,
@@ -29,8 +24,8 @@ export default BaseAdapter.extend({
   },
 
   deleteRecord(store, type, snapshot) {
-    const name = snapshot.id || snapshot.attr('name');
-    const url = this._url(
+    let name = snapshot.id || snapshot.attr('name');
+    let url = this._url(
       type.modelName,
       {
         backend: snapshot.record.backend,
@@ -44,10 +39,10 @@ export default BaseAdapter.extend({
   serialize(snapshot) {
     // the endpoint here won't allow sending `operation_all` and `operation_none` at the same time or with
     // other operation_ values, so we manually check for them and send an abbreviated object
-    const json = snapshot.serialize();
-    const keys = snapshot.record.nonOperationFields.map(decamelize);
-    const nonOperationFields = getProperties(json, keys);
-    for (const field in nonOperationFields) {
+    let json = snapshot.serialize();
+    let keys = snapshot.record.nonOperationFields.map(decamelize);
+    let nonOperationFields = getProperties(json, keys);
+    for (let field in nonOperationFields) {
       if (nonOperationFields[field] == null) {
         delete nonOperationFields[field];
       }
diff --git a/ui/app/adapters/kmip/scope.js b/ui/app/adapters/kmip/scope.js
index abd77c358c84b..2bd8f3c190def 100644
--- a/ui/app/adapters/kmip/scope.js
+++ b/ui/app/adapters/kmip/scope.js
@@ -1,13 +1,8 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import BaseAdapter from './base';
 
 export default BaseAdapter.extend({
   createRecord(store, type, snapshot) {
-    const name = snapshot.attr('name');
+    let name = snapshot.attr('name');
     return this.ajax(this._url(type.modelName, { backend: snapshot.record.backend }, name), 'POST').then(
       () => {
         return {
diff --git a/ui/app/adapters/kubernetes/config.js b/ui/app/adapters/kubernetes/config.js
deleted file mode 100644
index d40dbed4baa1d..0000000000000
--- a/ui/app/adapters/kubernetes/config.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import ApplicationAdapter from 'vault/adapters/application';
-import { encodePath } from 'vault/utils/path-encoding-helpers';
-
-export default class KubernetesConfigAdapter extends ApplicationAdapter {
-  namespace = 'v1';
-
-  getURL(backend, path = 'config') {
-    return `${this.buildURL()}/${encodePath(backend)}/${path}`;
-  }
-  urlForUpdateRecord(name, modelName, snapshot) {
-    return this.getURL(snapshot.attr('backend'));
-  }
-  urlForDeleteRecord(backend) {
-    return this.getURL(backend);
-  }
-
-  queryRecord(store, type, query) {
-    const { backend } = query;
-    return this.ajax(this.getURL(backend), 'GET').then((resp) => {
-      resp.backend = backend;
-      return resp;
-    });
-  }
-  createRecord() {
-    return this._saveRecord(...arguments);
-  }
-  updateRecord() {
-    return this._saveRecord(...arguments);
-  }
-  _saveRecord(store, { modelName }, snapshot) {
-    const data = store.serializerFor(modelName).serialize(snapshot);
-    const url = this.getURL(snapshot.attr('backend'));
-    return this.ajax(url, 'POST', { data }).then(() => data);
-  }
-  checkConfigVars(backend) {
-    return this.ajax(`${this.getURL(backend, 'check')}`, 'GET');
-  }
-}
diff --git a/ui/app/adapters/kubernetes/role.js b/ui/app/adapters/kubernetes/role.js
deleted file mode 100644
index 71673c39164ca..0000000000000
--- a/ui/app/adapters/kubernetes/role.js
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import NamedPathAdapter from 'vault/adapters/named-path';
-import { encodePath } from 'vault/utils/path-encoding-helpers';
-
-export default class KubernetesRoleAdapter extends NamedPathAdapter {
-  getURL(backend, name) {
-    const base = `${this.buildURL()}/${encodePath(backend)}/roles`;
-    return name ? `${base}/${name}` : base;
-  }
-  urlForQuery({ backend }) {
-    return this.getURL(backend);
-  }
-  urlForUpdateRecord(name, modelName, snapshot) {
-    return this.getURL(snapshot.attr('backend'), name);
-  }
-  urlForDeleteRecord(name, modelName, snapshot) {
-    return this.getURL(snapshot.attr('backend'), name);
-  }
-
-  query(store, type, query) {
-    const { backend } = query;
-    return this.ajax(this.getURL(backend), 'GET', { data: { list: true } }).then((resp) => {
-      return resp.data.keys.map((name) => ({ name, backend }));
-    });
-  }
-  queryRecord(store, type, query) {
-    const { backend, name } = query;
-    return this.ajax(this.getURL(backend, name), 'GET').then((resp) => {
-      resp.data.backend = backend;
-      resp.data.name = name;
-      return resp.data;
-    });
-  }
-  generateCredentials(backend, data) {
-    const generateCredentialsUrl = `${this.buildURL()}/${encodePath(backend)}/creds/${data.role}`;
-    delete data.role;
-    return this.ajax(generateCredentialsUrl, 'POST', { data }).then((response) => {
-      const { lease_id, lease_duration, data } = response;
-
-      return {
-        lease_id,
-        lease_duration,
-        ...data,
-      };
-    });
-  }
-}
diff --git a/ui/app/adapters/lease.js b/ui/app/adapters/lease.js
index a1a59037a7277..163e71a9056e7 100644
--- a/ui/app/adapters/lease.js
+++ b/ui/app/adapters/lease.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationAdapter from './application';
 import { encodePath } from 'vault/utils/path-encoding-helpers';
 
@@ -20,7 +15,7 @@ export default ApplicationAdapter.extend({
   },
 
   renew(lease_id, increment) {
-    const url = this.buildURL() + '/leases/renew';
+    let url = this.buildURL() + '/leases/renew';
     return this.ajax(url, 'PUT', {
       data: {
         lease_id,
diff --git a/ui/app/adapters/license.js b/ui/app/adapters/license.js
index 12db6b084818d..6470f969c557b 100644
--- a/ui/app/adapters/license.js
+++ b/ui/app/adapters/license.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ClusterAdapter from './cluster';
 
 export default ClusterAdapter.extend({
diff --git a/ui/app/adapters/mfa-login-enforcement.js b/ui/app/adapters/mfa-login-enforcement.js
index 8817d8d886103..5276df84c994d 100644
--- a/ui/app/adapters/mfa-login-enforcement.js
+++ b/ui/app/adapters/mfa-login-enforcement.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationAdapter from './application';
 
 export default class KeymgmtKeyAdapter extends ApplicationAdapter {
diff --git a/ui/app/adapters/mfa-method.js b/ui/app/adapters/mfa-method.js
index 03bb988ff06dd..fb5fc310de9a5 100644
--- a/ui/app/adapters/mfa-method.js
+++ b/ui/app/adapters/mfa-method.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationAdapter from './application';
 
 export default class MfaMethodAdapter extends ApplicationAdapter {
@@ -51,7 +46,7 @@ export default class MfaMethodAdapter extends ApplicationAdapter {
 
   buildURL(modelName, id, snapshot, requestType) {
     if (requestType === 'POST') {
-      const url = `${super.buildURL(modelName)}/${snapshot.attr('type')}`;
+      let url = `${super.buildURL(modelName)}/${snapshot.attr('type')}`;
       return id ? `${url}/${id}` : url;
     }
     return super.buildURL(...arguments);
diff --git a/ui/app/adapters/mfa-setup.js b/ui/app/adapters/mfa-setup.js
index b94ecfaf85375..c22561ef28005 100644
--- a/ui/app/adapters/mfa-setup.js
+++ b/ui/app/adapters/mfa-setup.js
@@ -1,18 +1,13 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationAdapter from './application';
 
 export default class MfaSetupAdapter extends ApplicationAdapter {
-  currentTokenGenerate(data) {
-    const url = `/v1/identity/mfa/method/totp/generate`;
+  adminGenerate(data) {
+    let url = `/v1/identity/mfa/method/totp/admin-generate`;
     return this.ajax(url, 'POST', { data });
   }
 
   adminDestroy(data) {
-    const url = `/v1/identity/mfa/method/totp/admin-destroy`;
+    let url = `/v1/identity/mfa/method/totp/admin-destroy`;
     return this.ajax(url, 'POST', { data });
   }
 }
diff --git a/ui/app/adapters/named-path.js b/ui/app/adapters/named-path.js
index 421f02481803e..383fa75b5bf5d 100644
--- a/ui/app/adapters/named-path.js
+++ b/ui/app/adapters/named-path.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /**
  * base adapter for resources that are saved to a path whose unique identifier is name
  * save requests are made to the same endpoint and the resource is either created if not found or updated
@@ -23,8 +18,8 @@ export default class NamedPathAdapter extends ApplicationAdapter {
 
   // create does not return response similar to PUT request
   createRecord() {
-    const [store, { modelName }, snapshot] = arguments;
-    const name = snapshot.attr('name');
+    let [store, { modelName }, snapshot] = arguments;
+    let name = snapshot.attr('name');
     // throw error if user attempts to create a record with same name, otherwise POST request silently overrides (updates) the existing model
     if (store.hasRecordForId(modelName, name)) {
       throw new Error(`A record already exists with the name: ${name}`);
@@ -56,7 +51,7 @@ export default class NamedPathAdapter extends ApplicationAdapter {
     // * 'paramKey' is a string of the param name (model attr) we're filtering for, e.g. 'client_id'
     // * 'filterFor' is an array of values to filter for (value type must match the attr type), e.g. array of ID strings
     // * 'allowed_client_id' is a valid query param to the /provider endpoint
-    const queryParams = { list: true, ...(allowed_client_id && { allowed_client_id }) };
+    let queryParams = { list: true, ...(allowed_client_id && { allowed_client_id }) };
     const response = await this.ajax(url, 'GET', { data: queryParams });
 
     // filter LIST response only if key_info exists and query includes both 'paramKey' & 'filterFor'
diff --git a/ui/app/adapters/namespace.js b/ui/app/adapters/namespace.js
index cf5ae68681351..5f7b72ff6cb88 100644
--- a/ui/app/adapters/namespace.js
+++ b/ui/app/adapters/namespace.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationAdapter from './application';
 
 export default class NamespaceAdapter extends ApplicationAdapter {
@@ -17,7 +12,7 @@ export default class NamespaceAdapter extends ApplicationAdapter {
   }
 
   urlForCreateRecord(modelName, snapshot) {
-    const id = snapshot.attr('path');
+    let id = snapshot.attr('path');
     return this.buildURL(modelName, id);
   }
 
diff --git a/ui/app/adapters/node.js b/ui/app/adapters/node.js
index 545500bd1a351..c0a6b722e2792 100644
--- a/ui/app/adapters/node.js
+++ b/ui/app/adapters/node.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationAdapter from './application';
 
 export default ApplicationAdapter.extend();
diff --git a/ui/app/adapters/oidc/assignment.js b/ui/app/adapters/oidc/assignment.js
index ccb0aef1fba14..0c78f6492471d 100644
--- a/ui/app/adapters/oidc/assignment.js
+++ b/ui/app/adapters/oidc/assignment.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import NamedPathAdapter from '../named-path';
 
 export default class OidcAssignmentAdapter extends NamedPathAdapter {
diff --git a/ui/app/adapters/oidc/client.js b/ui/app/adapters/oidc/client.js
index 6e9446af2e4f3..3331b6d7efca7 100644
--- a/ui/app/adapters/oidc/client.js
+++ b/ui/app/adapters/oidc/client.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import NamedPathAdapter from '../named-path';
 
 export default class OidcClientAdapter extends NamedPathAdapter {
diff --git a/ui/app/adapters/oidc/key.js b/ui/app/adapters/oidc/key.js
index c559ff16a0a7d..0b7561ed023d0 100644
--- a/ui/app/adapters/oidc/key.js
+++ b/ui/app/adapters/oidc/key.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import NamedPathAdapter from '../named-path';
 
 export default class OidcKeyAdapter extends NamedPathAdapter {
diff --git a/ui/app/adapters/oidc/provider.js b/ui/app/adapters/oidc/provider.js
index 1987b545a8a87..064e569685a50 100644
--- a/ui/app/adapters/oidc/provider.js
+++ b/ui/app/adapters/oidc/provider.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import NamedPathAdapter from '../named-path';
 
 export default class OidcProviderAdapter extends NamedPathAdapter {
diff --git a/ui/app/adapters/oidc/scope.js b/ui/app/adapters/oidc/scope.js
index 8232fc77ad507..af69799d87192 100644
--- a/ui/app/adapters/oidc/scope.js
+++ b/ui/app/adapters/oidc/scope.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import NamedPathAdapter from '../named-path';
 
 export default class OidcScopeAdapter extends NamedPathAdapter {
diff --git a/ui/app/adapters/path-filter-config.js b/ui/app/adapters/path-filter-config.js
index 8cd89cff1d271..8f703e40a37a9 100644
--- a/ui/app/adapters/path-filter-config.js
+++ b/ui/app/adapters/path-filter-config.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationAdapter from './application';
 
 export default ApplicationAdapter.extend({
diff --git a/ui/app/adapters/permissions.js b/ui/app/adapters/permissions.js
index 930821dbd180f..c79a207371261 100644
--- a/ui/app/adapters/permissions.js
+++ b/ui/app/adapters/permissions.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationAdapter from './application';
 
 export default ApplicationAdapter.extend({
diff --git a/ui/app/adapters/pki-ca-certificate-sign.js b/ui/app/adapters/pki-ca-certificate-sign.js
new file mode 100644
index 0000000000000..fedb0b7d61153
--- /dev/null
+++ b/ui/app/adapters/pki-ca-certificate-sign.js
@@ -0,0 +1,8 @@
+import Adapter from './pki';
+
+export default Adapter.extend({
+  url(_, snapshot) {
+    const backend = snapshot.attr('backend');
+    return `/v1/${backend}/root/sign-intermediate`;
+  },
+});
diff --git a/ui/app/adapters/pki-ca-certificate.js b/ui/app/adapters/pki-ca-certificate.js
new file mode 100644
index 0000000000000..b07fab16ecf1a
--- /dev/null
+++ b/ui/app/adapters/pki-ca-certificate.js
@@ -0,0 +1,68 @@
+import { parsePkiCert } from '../helpers/parse-pki-cert';
+import ApplicationAdapter from './application';
+
+export default ApplicationAdapter.extend({
+  namespace: 'v1',
+
+  url(snapshot, action) {
+    const { backend, caType, type } = snapshot.attributes();
+    if (action === 'sign-intermediate') {
+      return `/v1/${backend}/root/sign-intermediate`;
+    }
+    if (action === 'set-signed-intermediate') {
+      return `/v1/${backend}/intermediate/set-signed`;
+    }
+    if (action === 'upload') {
+      return `/v1/${backend}/config/ca`;
+    }
+    return `/v1/${backend}/${caType}/generate/${type}`;
+  },
+
+  createRecordOrUpdate(store, type, snapshot, requestType) {
+    const serializer = store.serializerFor('application');
+    const isUpload = snapshot.attr('uploadPemBundle');
+    const isSetSignedIntermediate = snapshot.adapterOptions.method === 'setSignedIntermediate';
+    let action = snapshot.adapterOptions.method === 'signIntermediate' ? 'sign-intermediate' : null;
+    let data;
+    if (isUpload) {
+      action = 'upload';
+      data = { pem_bundle: snapshot.attr('pemBundle') };
+    } else if (isSetSignedIntermediate) {
+      action = 'set-signed-intermediate';
+      data = { certificate: snapshot.attr('certificate') };
+    } else {
+      data = serializer.serialize(snapshot, requestType);
+
+      // The type parameter is serialized but is part of the URL. This means
+      // we'll get an unknown parameter warning back from the server if we
+      // send it. Remove it instead.
+      delete data.type;
+    }
+
+    return this.ajax(this.url(snapshot, action), 'POST', { data }).then((response) => {
+      // uploading CA, setting signed intermediate cert, and attempting to generate
+      // a new CA if one exists, all return a 204
+      if (!response) {
+        response = {};
+      }
+      response.id = snapshot.id;
+      response.modelName = type.modelName;
+      // only parse if certificate is attached to response
+      if (response.data && response.data.certificate) {
+        const caCertMetadata = parsePkiCert([response.data]);
+        const transformedResponse = { ...response, ...caCertMetadata };
+        store.pushPayload(type.modelName, transformedResponse);
+      } else {
+        store.pushPayload(type.modelName, response);
+      }
+    });
+  },
+
+  createRecord() {
+    return this.createRecordOrUpdate(...arguments);
+  },
+
+  updateRecord() {
+    return this.createRecordOrUpdate(...arguments);
+  },
+});
diff --git a/ui/app/adapters/pki-certificate-sign.js b/ui/app/adapters/pki-certificate-sign.js
new file mode 100644
index 0000000000000..1acdbfb8192bf
--- /dev/null
+++ b/ui/app/adapters/pki-certificate-sign.js
@@ -0,0 +1,14 @@
+import Adapter from './pki';
+
+export default Adapter.extend({
+  url(role, snapshot) {
+    if (snapshot.attr('signVerbatim') === true) {
+      return `/v1/${role.backend}/sign-verbatim/${role.name}`;
+    }
+    return `/v1/${role.backend}/sign/${role.name}`;
+  },
+
+  pathForType() {
+    return 'sign';
+  },
+});
diff --git a/ui/app/adapters/pki.js b/ui/app/adapters/pki.js
new file mode 100644
index 0000000000000..1c4c348e22038
--- /dev/null
+++ b/ui/app/adapters/pki.js
@@ -0,0 +1,22 @@
+import { assert } from '@ember/debug';
+import ApplicationAdapter from './application';
+
+export default ApplicationAdapter.extend({
+  namespace: 'v1',
+
+  url(/*role*/) {
+    assert('Override the `url` method to extend the PKI adapter', false);
+  },
+
+  createRecord(store, type, snapshot, requestType) {
+    const serializer = store.serializerFor(type.modelName);
+    const data = serializer.serialize(snapshot, requestType);
+    const role = snapshot.attr('role');
+
+    return this.ajax(this.url(role, snapshot), 'POST', { data }).then((response) => {
+      response.id = snapshot.id;
+      response.modelName = type.modelName;
+      store.pushPayload(type.modelName, response);
+    });
+  },
+});
diff --git a/ui/app/adapters/pki/action.js b/ui/app/adapters/pki/action.js
deleted file mode 100644
index 3cc3359eec381..0000000000000
--- a/ui/app/adapters/pki/action.js
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { assert } from '@ember/debug';
-import { encodePath } from 'vault/utils/path-encoding-helpers';
-import ApplicationAdapter from '../application';
-
-export default class PkiActionAdapter extends ApplicationAdapter {
-  namespace = 'v1';
-
-  urlForCreateRecord(modelName, snapshot) {
-    const { type } = snapshot.record;
-    const { actionType, useIssuer, issuerRef, mount } = snapshot.adapterOptions;
-    // if the backend mount is passed, we want that to override the URL's mount path
-    const backend = mount || snapshot.record.backend;
-    if (!backend || !actionType) {
-      throw new Error('URL for create record is missing required attributes');
-    }
-    const baseUrl = `${this.buildURL()}/${encodePath(backend)}`;
-    switch (actionType) {
-      case 'import':
-        return useIssuer ? `${baseUrl}/issuers/import/bundle` : `${baseUrl}/config/ca`;
-      case 'generate-root':
-        return useIssuer ? `${baseUrl}/issuers/generate/root/${type}` : `${baseUrl}/root/generate/${type}`;
-      case 'generate-csr':
-        return useIssuer
-          ? `${baseUrl}/issuers/generate/intermediate/${type}`
-          : `${baseUrl}/intermediate/generate/${type}`;
-      case 'sign-intermediate':
-        return `${baseUrl}/issuer/${encodePath(issuerRef)}/sign-intermediate`;
-      case 'rotate-root':
-        return `${baseUrl}/root/rotate/${type}`;
-      default:
-        assert('actionType must be one of import, generate-root, generate-csr or sign-intermediate');
-    }
-  }
-
-  createRecord(store, type, snapshot) {
-    const serializer = store.serializerFor(type.modelName);
-    const url = this.urlForCreateRecord(type.modelName, snapshot);
-    // Send actionType as serializer requestType so that we serialize data based on the endpoint
-    const data = serializer.serialize(snapshot, snapshot.adapterOptions.actionType);
-    return this.ajax(url, 'POST', { data }).then((result) => ({
-      // pki/action endpoints don't correspond with a single specific entity,
-      // so in ember-data we'll map it to the request ID
-      id: result.request_id,
-      ...result,
-    }));
-  }
-}
diff --git a/ui/app/adapters/pki/cert.js b/ui/app/adapters/pki/cert.js
index 7175f40562806..321c406809bda 100644
--- a/ui/app/adapters/pki/cert.js
+++ b/ui/app/adapters/pki/cert.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { assign } from '@ember/polyfills';
 import Adapter from '../pki';
 
@@ -19,7 +14,7 @@ export default Adapter.extend({
     return url;
   },
   optionsForQuery(id) {
-    const data = {};
+    let data = {};
     if (!id) {
       data['list'] = true;
     }
diff --git a/ui/app/adapters/pki/certificate/base.js b/ui/app/adapters/pki/certificate/base.js
deleted file mode 100644
index 159b2abbfa3c9..0000000000000
--- a/ui/app/adapters/pki/certificate/base.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { encodePath } from 'vault/utils/path-encoding-helpers';
-import ApplicationAdapter from '../../application';
-
-export default class PkiCertificateBaseAdapter extends ApplicationAdapter {
-  namespace = 'v1';
-
-  getURL(backend, id) {
-    const uri = `${this.buildURL()}/${encodePath(backend)}`;
-    return id ? `${uri}/cert/${id}` : `${uri}/certs`;
-  }
-
-  fetchByQuery(query) {
-    const { backend, id } = query;
-    const data = !id ? { list: true } : {};
-    return this.ajax(this.getURL(backend, id), 'GET', { data }).then((resp) => {
-      resp.data.backend = backend;
-      if (id) {
-        resp.data.id = id;
-        resp.data.serial_number = id;
-      }
-      return resp;
-    });
-  }
-
-  query(store, type, query) {
-    return this.fetchByQuery(query);
-  }
-
-  queryRecord(store, type, query) {
-    return this.fetchByQuery(query);
-  }
-
-  // the only way to update a record is by revoking it which will set the revocationTime property
-  updateRecord(store, type, snapshot) {
-    const { backend, serialNumber, certificate } = snapshot.record;
-    // Revoke certificate requires either serial_number or certificate
-    const data = serialNumber ? { serial_number: serialNumber } : { certificate };
-    return this.ajax(`${this.buildURL()}/${encodePath(backend)}/revoke`, 'POST', { data }).then(
-      (response) => {
-        return {
-          data: {
-            ...this.serialize(snapshot),
-            ...response.data,
-          },
-        };
-      }
-    );
-  }
-}
diff --git a/ui/app/adapters/pki/certificate/generate.js b/ui/app/adapters/pki/certificate/generate.js
deleted file mode 100644
index db12c04ee6fa9..0000000000000
--- a/ui/app/adapters/pki/certificate/generate.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { encodePath } from 'vault/utils/path-encoding-helpers';
-import PkiCertificateBaseAdapter from './base';
-
-export default class PkiCertificateGenerateAdapter extends PkiCertificateBaseAdapter {
-  urlForCreateRecord(modelName, snapshot) {
-    const { role, backend } = snapshot.record;
-    if (!role || !backend) {
-      throw new Error('URL for create record is missing required attributes');
-    }
-    return `${this.buildURL()}/${encodePath(backend)}/issue/${encodePath(role)}`;
-  }
-}
diff --git a/ui/app/adapters/pki/certificate/sign.js b/ui/app/adapters/pki/certificate/sign.js
deleted file mode 100644
index 595afde7745ba..0000000000000
--- a/ui/app/adapters/pki/certificate/sign.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { encodePath } from 'vault/utils/path-encoding-helpers';
-import PkiCertificateBaseAdapter from './base';
-
-export default class PkiCertificateSignAdapter extends PkiCertificateBaseAdapter {
-  urlForCreateRecord(modelName, snapshot) {
-    const { role, backend } = snapshot.record;
-    if (!role || !backend) {
-      throw new Error('URL for create record is missing required attributes');
-    }
-    return `${this.buildURL()}/${encodePath(backend)}/sign/${encodePath(role)}`;
-  }
-}
diff --git a/ui/app/adapters/pki/config/acme.js b/ui/app/adapters/pki/config/acme.js
deleted file mode 100644
index 493312ab53243..0000000000000
--- a/ui/app/adapters/pki/config/acme.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { encodePath } from 'vault/utils/path-encoding-helpers';
-import PkiConfigBaseAdapter from './base';
-
-export default class PkiConfigAcmeAdapter extends PkiConfigBaseAdapter {
-  namespace = 'v1';
-
-  _url(backend) {
-    return `${this.buildURL()}/${encodePath(backend)}/config/acme`;
-  }
-}
diff --git a/ui/app/adapters/pki/config/base.js b/ui/app/adapters/pki/config/base.js
deleted file mode 100644
index a655d09cff32d..0000000000000
--- a/ui/app/adapters/pki/config/base.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import ApplicationAdapter from '../../application';
-
-export default class PkiConfigBaseAdapter extends ApplicationAdapter {
-  namespace = 'v1';
-
-  findRecord(store, type, backend) {
-    return this.ajax(this._url(backend), 'GET').then((resp) => {
-      return resp.data;
-    });
-  }
-
-  updateRecord(store, type, snapshot) {
-    const data = snapshot.serialize();
-    return this.ajax(this._url(snapshot.record.id), 'POST', { data });
-  }
-}
diff --git a/ui/app/adapters/pki/config/cluster.js b/ui/app/adapters/pki/config/cluster.js
deleted file mode 100644
index aa164261c8a90..0000000000000
--- a/ui/app/adapters/pki/config/cluster.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { encodePath } from 'vault/utils/path-encoding-helpers';
-import PkiConfigBaseAdapter from './base';
-
-export default class PkiConfigClusterAdapter extends PkiConfigBaseAdapter {
-  namespace = 'v1';
-
-  _url(backend) {
-    return `${this.buildURL()}/${encodePath(backend)}/config/cluster`;
-  }
-}
diff --git a/ui/app/adapters/pki/config/crl.js b/ui/app/adapters/pki/config/crl.js
deleted file mode 100644
index d7e5dc839f4bc..0000000000000
--- a/ui/app/adapters/pki/config/crl.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { encodePath } from 'vault/utils/path-encoding-helpers';
-import PkiConfigBaseAdapter from './base';
-
-export default class PkiConfigCrlAdapter extends PkiConfigBaseAdapter {
-  namespace = 'v1';
-
-  _url(backend) {
-    return `${this.buildURL()}/${encodePath(backend)}/config/crl`;
-  }
-}
diff --git a/ui/app/adapters/pki/config/urls.js b/ui/app/adapters/pki/config/urls.js
deleted file mode 100644
index ae15f5959b3f6..0000000000000
--- a/ui/app/adapters/pki/config/urls.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { encodePath } from 'vault/utils/path-encoding-helpers';
-import PkiConfigBaseAdapter from './base';
-
-export default class PkiConfigUrlsAdapter extends PkiConfigBaseAdapter {
-  namespace = 'v1';
-
-  _url(backend) {
-    return `${this.buildURL()}/${encodePath(backend)}/config/urls`;
-  }
-}
diff --git a/ui/app/adapters/pki/issuer.js b/ui/app/adapters/pki/issuer.js
deleted file mode 100644
index 9f15ff11aad92..0000000000000
--- a/ui/app/adapters/pki/issuer.js
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import ApplicationAdapter from '../application';
-import { encodePath } from 'vault/utils/path-encoding-helpers';
-import { all } from 'rsvp';
-import { verifyCertificates, parseCertificate } from 'vault/utils/parse-pki-cert';
-
-export default class PkiIssuerAdapter extends ApplicationAdapter {
-  namespace = 'v1';
-
-  _getBackend(snapshot) {
-    const { record, adapterOptions } = snapshot;
-    return adapterOptions?.mount || record.backend;
-  }
-
-  optionsForQuery(id) {
-    const data = {};
-    if (!id) {
-      data['list'] = true;
-    }
-    return { data };
-  }
-
-  urlForQuery(backend, id) {
-    const baseUrl = `${this.buildURL()}/${encodePath(backend)}`;
-    if (id) {
-      return `${baseUrl}/issuer/${encodePath(id)}`;
-    } else {
-      return `${baseUrl}/issuers`;
-    }
-  }
-
-  async getIssuerMetadata(store, type, query, response, id) {
-    const keyInfo = response.data.key_info[id];
-    try {
-      const issuerRecord = await this.queryRecord(store, type, { id, backend: query.backend });
-      const { data } = issuerRecord;
-      const isRoot = await verifyCertificates(data.certificate, data.certificate);
-      const parsedCertificate = parseCertificate(data.certificate);
-      return {
-        ...keyInfo,
-        ...data,
-        isRoot,
-        parsedCertificate: { common_name: parsedCertificate.common_name },
-      };
-    } catch (e) {
-      return { ...keyInfo, issuer_id: id };
-    }
-  }
-
-  updateRecord(store, type, snapshot) {
-    const { issuerId } = snapshot.record;
-    const backend = this._getBackend(snapshot);
-    const data = this.serialize(snapshot);
-    const url = this.urlForQuery(backend, issuerId);
-    return this.ajax(url, 'POST', { data });
-  }
-
-  query(store, type, query) {
-    const { backend, isListView } = query;
-    const url = this.urlForQuery(backend);
-
-    return this.ajax(url, 'GET', this.optionsForQuery()).then(async (res) => {
-      // To show issuer meta data tags, we have a flag called isListView and only want to
-      // grab each issuer data only if there are less than 10 issuers to avoid making too many requests
-      if (isListView && res.data.keys.length <= 10) {
-        const keyInfoArray = await all(
-          res.data.keys.map((id) => this.getIssuerMetadata(store, type, query, res, id))
-        );
-        const keyInfo = {};
-
-        res.data.keys.forEach((issuerId) => {
-          keyInfo[issuerId] = keyInfoArray.find((newKey) => newKey.issuer_id === issuerId);
-        });
-
-        res.data.key_info = keyInfo;
-
-        return res;
-      }
-
-      return res;
-    });
-  }
-
-  queryRecord(store, type, query) {
-    const { backend, id } = query;
-
-    return this.ajax(this.urlForQuery(backend, id), 'GET', this.optionsForQuery(id));
-  }
-
-  deleteAllIssuers(backend) {
-    const deleteAllIssuersAndKeysUrl = `${this.buildURL()}/${encodePath(backend)}/root`;
-
-    return this.ajax(deleteAllIssuersAndKeysUrl, 'DELETE');
-  }
-}
diff --git a/ui/app/adapters/pki/key.js b/ui/app/adapters/pki/key.js
deleted file mode 100644
index 30e52a78ba591..0000000000000
--- a/ui/app/adapters/pki/key.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import ApplicationAdapter from '../application';
-import { encodePath } from 'vault/utils/path-encoding-helpers';
-export default class PkiKeyAdapter extends ApplicationAdapter {
-  namespace = 'v1';
-
-  _baseUrl(backend, id) {
-    const url = `${this.buildURL()}/${encodePath(backend)}`;
-    if (id) {
-      return url + '/key/' + encodePath(id);
-    }
-    return url + '/keys';
-  }
-
-  createRecord(store, type, snapshot) {
-    const { record, adapterOptions } = snapshot;
-    let url = this._baseUrl(record.backend);
-    if (adapterOptions.import) {
-      url = `${url}/import`;
-    } else {
-      url = `${url}/generate/${record.type}`;
-    }
-    return this.ajax(url, 'POST', { data: this.serialize(snapshot) }).then((resp) => {
-      return resp;
-    });
-  }
-
-  updateRecord(store, type, snapshot) {
-    const { record } = snapshot;
-    const { key_name } = this.serialize(snapshot);
-    const url = this._baseUrl(record.backend, record.id);
-    return this.ajax(url, 'POST', { data: { key_name } });
-  }
-
-  query(store, type, query) {
-    const { backend } = query;
-    return this.ajax(this._baseUrl(backend), 'GET', { data: { list: true } });
-  }
-
-  queryRecord(store, type, query) {
-    const { backend, id } = query;
-    return this.ajax(this._baseUrl(backend, id), 'GET');
-  }
-
-  deleteRecord(store, type, snapshot) {
-    const { id, record } = snapshot;
-    return this.ajax(this._baseUrl(record.backend, id), 'DELETE');
-  }
-}
diff --git a/ui/app/adapters/pki/pki-config.js b/ui/app/adapters/pki/pki-config.js
new file mode 100644
index 0000000000000..c94d30d1c7dab
--- /dev/null
+++ b/ui/app/adapters/pki/pki-config.js
@@ -0,0 +1,128 @@
+import AdapterError from '@ember-data/adapter/error';
+import { hash, resolve } from 'rsvp';
+import { capitalize } from '@ember/string';
+import { set } from '@ember/object';
+import ApplicationAdapter from '../application';
+
+export default ApplicationAdapter.extend({
+  namespace: 'v1',
+
+  urlFor(backend, section) {
+    const urls = {
+      tidy: `/v1/${backend}/tidy`,
+      urls: `/v1/${backend}/config/urls`,
+      crl: `/v1/${backend}/config/crl`,
+    };
+    return urls[section];
+  },
+
+  createOrUpdate(store, type, snapshot) {
+    const url = this.urlFor(snapshot.record.get('backend'), snapshot.adapterOptions.method);
+    const serializer = store.serializerFor(type.modelName);
+    if (!url) {
+      return;
+    }
+    const data = snapshot.adapterOptions.fields.reduce((data, field) => {
+      let attr = snapshot.attr(field);
+      if (attr) {
+        serializer.serializeAttribute(snapshot, data, field, attr);
+      } else {
+        data[serializer.keyForAttribute(field)] = attr;
+      }
+      return data;
+    }, {});
+    return this.ajax(url, 'POST', { data }).then((resp) => {
+      let response = resp || {};
+      response.id = `${snapshot.record.get('backend')}-${snapshot.adapterOptions.method}`;
+      return response;
+    });
+  },
+
+  createRecord() {
+    return this.createOrUpdate(...arguments);
+  },
+
+  updateRecord() {
+    return this.createOrUpdate(...arguments, 'update');
+  },
+
+  fetchSection(backendPath, section) {
+    const sections = ['cert', 'urls', 'crl', 'tidy'];
+    if (!section || !sections.includes(section)) {
+      const error = new AdapterError();
+      set(error, 'httpStatus', 404);
+      throw error;
+    }
+    return this[`fetch${capitalize(section)}`](backendPath);
+  },
+
+  id(backendPath) {
+    return backendPath + '-config-ca';
+  },
+
+  fetchCert(backendPath) {
+    // these are all un-authed so using `fetch` directly works
+    const derURL = `/v1/${backendPath}/ca`;
+    const pemURL = `${derURL}/pem`;
+    const chainURL = `${derURL}_chain`;
+
+    return hash({
+      backend: backendPath,
+      id: this.id(backendPath),
+      der: this.rawRequest(derURL, 'GET', { unauthenticated: true }).then((response) => response.blob()),
+      pem: this.rawRequest(pemURL, 'GET', { unauthenticated: true }).then((response) => response.text()),
+      ca_chain: this.rawRequest(chainURL, 'GET', { unauthenticated: true }).then((response) =>
+        response.text()
+      ),
+    });
+  },
+
+  fetchUrls(backendPath) {
+    const url = `/v1/${backendPath}/config/urls`;
+    const id = this.id(backendPath);
+    return this.ajax(url, 'GET')
+      .then((resp) => {
+        resp.id = id;
+        resp.backend = backendPath;
+        return resp;
+      })
+      .catch((e) => {
+        if (e.httpStatus === 404) {
+          return resolve({ id });
+        } else {
+          throw e;
+        }
+      });
+  },
+
+  fetchCrl(backendPath) {
+    const url = `/v1/${backendPath}/config/crl`;
+    const id = this.id(backendPath);
+    return this.ajax(url, 'GET')
+      .then((resp) => {
+        resp.id = id;
+        resp.backend = backendPath;
+        return resp;
+      })
+      .catch((e) => {
+        if (e.httpStatus === 404) {
+          return { id };
+        } else {
+          throw e;
+        }
+      });
+  },
+
+  fetchTidy(backendPath) {
+    const id = this.id(backendPath);
+    return resolve({ id, backend: backendPath });
+  },
+
+  queryRecord(store, type, query) {
+    const { backend, section } = query;
+    return this.fetchSection(backend, section).then((resp) => {
+      resp.backend = backend;
+      return resp;
+    });
+  },
+});
diff --git a/ui/app/adapters/pki/pki-role-engine.js b/ui/app/adapters/pki/pki-role-engine.js
new file mode 100644
index 0000000000000..c756445af9d05
--- /dev/null
+++ b/ui/app/adapters/pki/pki-role-engine.js
@@ -0,0 +1,3 @@
+import PkiRoleAdapter from './pki-role';
+
+export default class PkiRoleEngineAdapter extends PkiRoleAdapter {}
diff --git a/ui/app/adapters/pki/pki-role.js b/ui/app/adapters/pki/pki-role.js
new file mode 100644
index 0000000000000..44f0163c03071
--- /dev/null
+++ b/ui/app/adapters/pki/pki-role.js
@@ -0,0 +1,70 @@
+import { assign } from '@ember/polyfills';
+import ApplicationAdapter from '../application';
+import { encodePath } from 'vault/utils/path-encoding-helpers';
+
+export default ApplicationAdapter.extend({
+  namespace: 'v1',
+
+  createOrUpdate(store, type, snapshot, requestType) {
+    const serializer = store.serializerFor(type.modelName);
+    const data = serializer.serialize(snapshot, requestType);
+    const { id } = snapshot;
+    let url = this.urlForRole(snapshot.record.get('backend'), id);
+
+    return this.ajax(url, 'POST', { data });
+  },
+
+  createRecord() {
+    return this.createOrUpdate(...arguments);
+  },
+
+  updateRecord() {
+    return this.createOrUpdate(...arguments, 'update');
+  },
+
+  deleteRecord(store, type, snapshot) {
+    const { id } = snapshot;
+    return this.ajax(this.urlForRole(snapshot.record.get('backend'), id), 'DELETE');
+  },
+
+  pathForType() {
+    return 'roles';
+  },
+
+  urlForRole(backend, id) {
+    let url = `${this.buildURL()}/${encodePath(backend)}/roles`;
+    if (id) {
+      url = url + '/' + encodePath(id);
+    }
+    return url;
+  },
+
+  optionsForQuery(id) {
+    let data = {};
+    if (!id) {
+      data['list'] = true;
+    }
+    return { data };
+  },
+
+  fetchByQuery(store, query) {
+    const { id, backend } = query;
+    return this.ajax(this.urlForRole(backend, id), 'GET', this.optionsForQuery(id)).then((resp) => {
+      const data = {
+        id,
+        name: id,
+        backend,
+      };
+
+      return assign({}, resp, data);
+    });
+  },
+
+  query(store, type, query) {
+    return this.fetchByQuery(store, query);
+  },
+
+  queryRecord(store, type, query) {
+    return this.fetchByQuery(store, query);
+  },
+});
diff --git a/ui/app/adapters/pki/role.js b/ui/app/adapters/pki/role.js
deleted file mode 100644
index 37848817726db..0000000000000
--- a/ui/app/adapters/pki/role.js
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import ApplicationAdapter from '../application';
-import { assign } from '@ember/polyfills';
-import { encodePath } from 'vault/utils/path-encoding-helpers';
-
-export default class PkiRoleAdapter extends ApplicationAdapter {
-  namespace = 'v1';
-
-  _urlForRole(backend, id) {
-    let url = `${this.buildURL()}/${encodePath(backend)}/roles`;
-    if (id) {
-      url = url + '/' + encodePath(id);
-    }
-    return url;
-  }
-
-  _optionsForQuery(id) {
-    const data = {};
-    if (!id) {
-      data['list'] = true;
-    }
-    return { data };
-  }
-
-  createRecord(store, type, snapshot) {
-    const name = snapshot.attr('name');
-    const url = this._urlForRole(snapshot.record.backend, name);
-
-    return this.ajax(url, 'POST', { data: this.serialize(snapshot) }).then(() => {
-      return {
-        id: name,
-        name,
-        backend: snapshot.record.backend,
-      };
-    });
-  }
-
-  updateRecord(store, type, snapshot) {
-    const { name, backend } = snapshot.record;
-    const data = this.serialize(snapshot);
-    const url = this._urlForRole(backend, name);
-    return this.ajax(url, 'POST', { data });
-  }
-
-  fetchByQuery(store, query) {
-    const { id, backend } = query;
-
-    return this.ajax(this._urlForRole(backend, id), 'GET', this._optionsForQuery(id)).then((resp) => {
-      const data = {
-        id,
-        name: id,
-        backend,
-      };
-
-      return assign({}, resp, data);
-    });
-  }
-
-  query(store, type, query) {
-    return this.fetchByQuery(store, query);
-  }
-
-  queryRecord(store, type, query) {
-    return this.fetchByQuery(store, query);
-  }
-
-  deleteRecord(store, type, snapshot) {
-    const { id, record } = snapshot;
-    return this.ajax(this._urlForRole(record.backend, id), 'DELETE');
-  }
-}
diff --git a/ui/app/adapters/pki/sign-intermediate.js b/ui/app/adapters/pki/sign-intermediate.js
deleted file mode 100644
index 9dfdb4a5ac765..0000000000000
--- a/ui/app/adapters/pki/sign-intermediate.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { encodePath } from 'vault/utils/path-encoding-helpers';
-import ApplicationAdapter from '../application';
-
-export default class PkiSignIntermediateAdapter extends ApplicationAdapter {
-  namespace = 'v1';
-
-  createRecord(store, type, snapshot) {
-    const serializer = store.serializerFor(type.modelName);
-    const { backend, issuerRef } = snapshot.record;
-    const url = `${this.buildURL()}/${encodePath(backend)}/issuer/${encodePath(issuerRef)}/sign-intermediate`;
-    const data = serializer.serialize(snapshot, type);
-    return this.ajax(url, 'POST', { data }).then((result) => ({
-      // sign-intermediate can happen multiple times per issuer,
-      // so the ID needs to be unique from the issuer ID
-      id: result.request_id,
-      ...result,
-    }));
-  }
-}
diff --git a/ui/app/adapters/pki/tidy.js b/ui/app/adapters/pki/tidy.js
deleted file mode 100644
index 41ea1be66373b..0000000000000
--- a/ui/app/adapters/pki/tidy.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-import ApplicationAdapter from '../application';
-import { encodePath } from 'vault/utils/path-encoding-helpers';
-
-export default class PkiTidyAdapter extends ApplicationAdapter {
-  namespace = 'v1';
-
-  _baseUrl(backend) {
-    return `${this.buildURL()}/${encodePath(backend)}`;
-  }
-
-  // single tidy operations (manual) are always a new record
-  createRecord(store, type, snapshot) {
-    const { backend } = snapshot.record;
-    const { tidyType } = snapshot.adapterOptions;
-    if (tidyType === 'auto') {
-      throw new Error('Auto tidy type models are never new, please use findRecord');
-    }
-
-    const url = `${this._baseUrl(backend)}/tidy`;
-    return this.ajax(url, 'POST', { data: this.serialize(snapshot, tidyType) });
-  }
-
-  // saving auto-tidy config POST requests will always update
-  updateRecord(store, type, snapshot) {
-    const backend = snapshot.record.id;
-    const { tidyType } = snapshot.adapterOptions;
-    if (tidyType === 'manual') {
-      throw new Error('Manual tidy type models are always new, please use createRecord');
-    }
-
-    const url = `${this._baseUrl(backend)}/config/auto-tidy`;
-    return this.ajax(url, 'POST', { data: this.serialize(snapshot, tidyType) });
-  }
-
-  findRecord(store, type, backend) {
-    // only auto-tidy will ever be read, no need to pass the type here
-    return this.ajax(`${this._baseUrl(backend)}/config/auto-tidy`, 'GET').then((resp) => {
-      return resp.data;
-    });
-  }
-
-  cancelTidy(backend) {
-    const url = `${this._baseUrl(backend)}`;
-    return this.ajax(`${url}/tidy-cancel`, 'POST');
-  }
-}
diff --git a/ui/app/adapters/policy.js b/ui/app/adapters/policy.js
index ddd2358a9fdf1..99509c6edcc97 100644
--- a/ui/app/adapters/policy.js
+++ b/ui/app/adapters/policy.js
@@ -1,15 +1,10 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { assign } from '@ember/polyfills';
 import ApplicationAdapter from './application';
 
 export default ApplicationAdapter.extend({
   namespace: 'v1/sys',
   pathForType(type) {
-    const path = type.replace('policy', 'policies');
+    let path = type.replace('policy', 'policies');
     return path;
   },
 
diff --git a/ui/app/adapters/policy/acl.js b/ui/app/adapters/policy/acl.js
index 360088796c370..ea0f1a321bfca 100644
--- a/ui/app/adapters/policy/acl.js
+++ b/ui/app/adapters/policy/acl.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import PolicyAdapter from '../policy';
 
 export default PolicyAdapter.extend();
diff --git a/ui/app/adapters/policy/egp.js b/ui/app/adapters/policy/egp.js
index 360088796c370..ea0f1a321bfca 100644
--- a/ui/app/adapters/policy/egp.js
+++ b/ui/app/adapters/policy/egp.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import PolicyAdapter from '../policy';
 
 export default PolicyAdapter.extend();
diff --git a/ui/app/adapters/policy/rgp.js b/ui/app/adapters/policy/rgp.js
index 360088796c370..ea0f1a321bfca 100644
--- a/ui/app/adapters/policy/rgp.js
+++ b/ui/app/adapters/policy/rgp.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import PolicyAdapter from '../policy';
 
 export default PolicyAdapter.extend();
diff --git a/ui/app/adapters/raft-join.js b/ui/app/adapters/raft-join.js
index 3d1de1c503f25..f89deb6f22eaf 100644
--- a/ui/app/adapters/raft-join.js
+++ b/ui/app/adapters/raft-join.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationAdapter from './application';
 
 export default ApplicationAdapter.extend({
diff --git a/ui/app/adapters/replication-mode.js b/ui/app/adapters/replication-mode.js
index a568a58da143d..ed2134d5258b1 100644
--- a/ui/app/adapters/replication-mode.js
+++ b/ui/app/adapters/replication-mode.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationAdapter from './application';
 
 export default ApplicationAdapter.extend({
@@ -11,7 +6,7 @@ export default ApplicationAdapter.extend({
   },
 
   fetchStatus(mode) {
-    const url = this.getStatusUrl(mode);
+    let url = this.getStatusUrl(mode);
     return this.ajax(url, 'GET', { unauthenticated: true }).then((resp) => {
       return resp.data;
     });
diff --git a/ui/app/adapters/role-aws.js b/ui/app/adapters/role-aws.js
index a1d6a1e3a3fde..ad40d848b4d2e 100644
--- a/ui/app/adapters/role-aws.js
+++ b/ui/app/adapters/role-aws.js
@@ -1,8 +1,4 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
+import { assign } from '@ember/polyfills';
 import ApplicationAdapter from './application';
 import { encodePath } from 'vault/utils/path-encoding-helpers';
 
@@ -10,18 +6,12 @@ export default ApplicationAdapter.extend({
   namespace: 'v1',
 
   createOrUpdate(store, type, snapshot, requestType) {
-    const { name, backend } = snapshot.record;
     const serializer = store.serializerFor(type.modelName);
     const data = serializer.serialize(snapshot, requestType);
-    const url = this.urlForRole(backend, name);
+    const { id } = snapshot;
+    let url = this.urlForRole(snapshot.record.get('backend'), id);
 
-    return this.ajax(url, 'POST', { data }).then((resp) => {
-      // Ember data doesn't like 204 responses except for DELETE method
-      const response = resp || { data: {} };
-      response.data.name = name;
-      response.data.backend = name;
-      return response;
-    });
+    return this.ajax(url, 'POST', { data });
   },
 
   createRecord() {
@@ -50,7 +40,7 @@ export default ApplicationAdapter.extend({
   },
 
   optionsForQuery(id) {
-    const data = {};
+    let data = {};
     if (!id) {
       data['list'] = true;
     }
@@ -66,7 +56,7 @@ export default ApplicationAdapter.extend({
         backend,
       };
 
-      return { ...resp, ...data };
+      return assign({}, resp, data);
     });
   },
 
diff --git a/ui/app/adapters/role-jwt.js b/ui/app/adapters/role-jwt.js
index 3b6a7a7d78822..d510c525e5bec 100644
--- a/ui/app/adapters/role-jwt.js
+++ b/ui/app/adapters/role-jwt.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationAdapter from './application';
 import { inject as service } from '@ember/service';
 import { encodePath } from 'vault/utils/path-encoding-helpers';
@@ -14,8 +9,8 @@ export default ApplicationAdapter.extend({
     let [path, role] = JSON.parse(id);
     path = encodePath(path);
 
-    const namespace = snapshot?.adapterOptions.namespace;
-    const url = `/v1/auth/${path}/oidc/auth_url`;
+    let namespace = snapshot?.adapterOptions.namespace;
+    let url = `/v1/auth/${path}/oidc/auth_url`;
     let redirect_uri = `${window.location.origin}${this.router.urlFor('vault.cluster.oidc-callback', {
       auth_path: path,
     })}`;
diff --git a/ui/app/adapters/role-ssh.js b/ui/app/adapters/role-ssh.js
index 6b8cf72004a79..f3029114e6b69 100644
--- a/ui/app/adapters/role-ssh.js
+++ b/ui/app/adapters/role-ssh.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { assign } from '@ember/polyfills';
 import { resolve, allSettled } from 'rsvp';
 import ApplicationAdapter from './application';
@@ -12,17 +7,12 @@ export default ApplicationAdapter.extend({
   namespace: 'v1',
 
   createOrUpdate(store, type, snapshot, requestType) {
-    const { name, backend } = snapshot.record;
     const serializer = store.serializerFor(type.modelName);
     const data = serializer.serialize(snapshot, requestType);
-    const url = this.urlForRole(backend, name);
+    const { id } = snapshot;
+    let url = this.urlForRole(snapshot.record.get('backend'), id);
 
-    return this.ajax(url, 'POST', { data }).then((resp) => {
-      // Ember data doesn't like 204 responses except for DELETE method
-      const response = resp || { data: {} };
-      response.data.name = name;
-      return response;
-    });
+    return this.ajax(url, 'POST', { data });
   },
 
   createRecord() {
@@ -51,7 +41,7 @@ export default ApplicationAdapter.extend({
   },
 
   optionsForQuery(id) {
-    const data = {};
+    let data = {};
     if (!id) {
       data['list'] = true;
     }
@@ -71,7 +61,7 @@ export default ApplicationAdapter.extend({
       if (!results[0].value) {
         throw results[0].reason;
       }
-      const resp = {
+      let resp = {
         id,
         name: id,
         backend,
diff --git a/ui/app/adapters/secret-engine.js b/ui/app/adapters/secret-engine.js
index 70ba3e53e393d..40edfc3004f3f 100644
--- a/ui/app/adapters/secret-engine.js
+++ b/ui/app/adapters/secret-engine.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { assign } from '@ember/polyfills';
 import ApplicationAdapter from './application';
 import { encodePath } from 'vault/utils/path-encoding-helpers';
@@ -42,7 +37,7 @@ export default ApplicationAdapter.extend({
       }
     } catch (error) {
       // no path means this was an error on listing
-      if (!query.path || !mountModel) {
+      if (!query.path) {
         throw error;
       }
       // control groups will throw a 403 permission denied error. If this happens return the mountModel
@@ -56,10 +51,9 @@ export default ApplicationAdapter.extend({
     let data = serializer.serialize(snapshot);
     const path = snapshot.attr('path');
     // for kv2 we make two network requests
-    data.config.id = path; // config relationship needs an id so use path for now
     if (data.type === 'kv' && data.options.version === 2) {
       // data has both data for sys mount and the config, we need to separate them
-      const splitObjects = splitObject(data, ['max_versions', 'delete_version_after', 'cas_required']);
+      let splitObjects = splitObject(data, ['max_versions', 'delete_version_after', 'cas_required']);
       let configData;
       [configData, data] = splitObjects;
 
@@ -121,13 +115,13 @@ export default ApplicationAdapter.extend({
   },
 
   saveAWSRoot(store, type, snapshot) {
-    const { data } = snapshot.adapterOptions;
+    let { data } = snapshot.adapterOptions;
     const path = encodePath(snapshot.id);
     return this.ajax(`/v1/${path}/config/root`, 'POST', { data });
   },
 
   saveAWSLease(store, type, snapshot) {
-    const { data } = snapshot.adapterOptions;
+    let { data } = snapshot.adapterOptions;
     const path = encodePath(snapshot.id);
     return this.ajax(`/v1/${path}/config/lease`, 'POST', { data });
   },
diff --git a/ui/app/adapters/secret-v2-version.js b/ui/app/adapters/secret-v2-version.js
index 1f7b63df7b6b2..3195014001d49 100644
--- a/ui/app/adapters/secret-v2-version.js
+++ b/ui/app/adapters/secret-v2-version.js
@@ -1,21 +1,12 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /* eslint-disable */
 import AdapterError from '@ember-data/adapter/error';
-
 import { isEmpty } from '@ember/utils';
 import { get } from '@ember/object';
 import ApplicationAdapter from './application';
 import { encodePath } from 'vault/utils/path-encoding-helpers';
-import { inject as service } from '@ember/service';
 
 export default ApplicationAdapter.extend({
-  store: service(),
   namespace: 'v1',
-
   _url(backend, id, infix = 'data') {
     let url = `${this.buildURL()}/${encodePath(backend)}/${infix}/`;
     if (!isEmpty(id)) {
diff --git a/ui/app/adapters/secret-v2.js b/ui/app/adapters/secret-v2.js
index b5311a72d4c0e..517f83d77d369 100644
--- a/ui/app/adapters/secret-v2.js
+++ b/ui/app/adapters/secret-v2.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /* eslint-disable */
 import { isEmpty } from '@ember/utils';
 import ApplicationAdapter from './application';
@@ -22,7 +17,7 @@ export default ApplicationAdapter.extend({
   // concerns and we only want to send "list" to the server
   query(store, type, query) {
     let { backend, id } = query;
-    return this.ajax(this._url(backend, id), 'GET', { data: { list: true } }).then((resp) => {
+    return this.ajax(this._url(backend, id), 'GET', { data: { list: true } }).then(resp => {
       resp.id = id;
       resp.backend = backend;
       return resp;
@@ -36,7 +31,7 @@ export default ApplicationAdapter.extend({
 
   queryRecord(store, type, query) {
     let { backend, id } = query;
-    return this.ajax(this._url(backend, id), 'GET').then((resp) => {
+    return this.ajax(this._url(backend, id), 'GET').then(resp => {
       resp.id = id;
       resp.backend = backend;
       return resp;
diff --git a/ui/app/adapters/secret.js b/ui/app/adapters/secret.js
index 047da8c6d5e18..be9ac495f3021 100644
--- a/ui/app/adapters/secret.js
+++ b/ui/app/adapters/secret.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { isEmpty } from '@ember/utils';
 import ApplicationAdapter from './application';
 import { encodePath } from 'vault/utils/path-encoding-helpers';
@@ -48,7 +43,7 @@ export default ApplicationAdapter.extend({
   },
 
   optionsForQuery(id, action, wrapTTL) {
-    const data = {};
+    let data = {};
     if (action === 'query') {
       data.list = true;
     }
diff --git a/ui/app/adapters/server.js b/ui/app/adapters/server.js
index 91b01953bcbff..b7c7cda60b331 100644
--- a/ui/app/adapters/server.js
+++ b/ui/app/adapters/server.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationAdapter from './application';
 const fetchUrl = '/v1/sys/storage/raft/configuration';
 
@@ -17,8 +12,8 @@ export default ApplicationAdapter.extend({
     return '/v1/sys/storage/raft/remove-peer';
   },
   deleteRecord(store, type, snapshot) {
-    const server_id = snapshot.attr('nodeId');
-    const url = '/v1/sys/storage/raft/remove-peer';
+    let server_id = snapshot.attr('nodeId');
+    let url = '/v1/sys/storage/raft/remove-peer';
     return this.ajax(url, 'POST', { data: { server_id } });
   },
 });
diff --git a/ui/app/adapters/ssh-otp-credential.js b/ui/app/adapters/ssh-otp-credential.js
index 502828589a0a3..99b13e38ac166 100644
--- a/ui/app/adapters/ssh-otp-credential.js
+++ b/ui/app/adapters/ssh-otp-credential.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import SSHAdapter from './ssh';
 
 export default SSHAdapter.extend({
diff --git a/ui/app/adapters/ssh-sign.js b/ui/app/adapters/ssh-sign.js
index ad67ca55798ad..a5e8cbdcd7375 100644
--- a/ui/app/adapters/ssh-sign.js
+++ b/ui/app/adapters/ssh-sign.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import SSHAdapter from './ssh';
 
 export default SSHAdapter.extend({
diff --git a/ui/app/adapters/ssh.js b/ui/app/adapters/ssh.js
index 96f96f0cbc511..9267030a0b081 100644
--- a/ui/app/adapters/ssh.js
+++ b/ui/app/adapters/ssh.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { assert } from '@ember/debug';
 import ApplicationAdapter from './application';
 
diff --git a/ui/app/adapters/tools.js b/ui/app/adapters/tools.js
index 9cb5efe189e95..e0ad38ac15c7b 100644
--- a/ui/app/adapters/tools.js
+++ b/ui/app/adapters/tools.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationAdapter from './application';
 
 const WRAPPING_ENDPOINTS = ['lookup', 'wrap', 'unwrap', 'rewrap'];
diff --git a/ui/app/adapters/transform.js b/ui/app/adapters/transform.js
index 4fdd67983d5c5..351b5551c1753 100644
--- a/ui/app/adapters/transform.js
+++ b/ui/app/adapters/transform.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { assign } from '@ember/polyfills';
 import { allSettled } from 'rsvp';
 import ApplicationAdapter from './application';
@@ -12,16 +7,12 @@ export default ApplicationAdapter.extend({
   namespace: 'v1',
 
   createOrUpdate(store, type, snapshot) {
-    const { backend, name } = snapshot.record;
     const serializer = store.serializerFor(type.modelName);
     const data = serializer.serialize(snapshot);
-    const url = this.urlForTransformations(backend, name);
+    const { id } = snapshot;
+    let url = this.urlForTransformations(snapshot.record.get('backend'), id);
 
-    return this.ajax(url, 'POST', { data }).then((resp) => {
-      const response = resp || {};
-      response.id = name;
-      return response;
-    });
+    return this.ajax(url, 'POST', { data });
   },
 
   createRecord() {
@@ -50,7 +41,7 @@ export default ApplicationAdapter.extend({
   },
 
   optionsForQuery(id) {
-    const data = {};
+    let data = {};
     if (!id) {
       data['list'] = true;
     }
@@ -66,7 +57,7 @@ export default ApplicationAdapter.extend({
       if (!results[0].value) {
         throw results[0].reason;
       }
-      const resp = {
+      let resp = {
         id,
         name: id,
         backend,
diff --git a/ui/app/adapters/transform/alphabet.js b/ui/app/adapters/transform/alphabet.js
index f6fd1176d9d3a..d703adccd7a0a 100644
--- a/ui/app/adapters/transform/alphabet.js
+++ b/ui/app/adapters/transform/alphabet.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import BaseAdapter from './base';
 
 export default BaseAdapter.extend({
diff --git a/ui/app/adapters/transform/base.js b/ui/app/adapters/transform/base.js
index ee6fa4035faca..7673085a446c3 100644
--- a/ui/app/adapters/transform/base.js
+++ b/ui/app/adapters/transform/base.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationAdapter from '../application';
 import { encodePath } from 'vault/utils/path-encoding-helpers';
 
@@ -14,16 +9,12 @@ export default ApplicationAdapter.extend({
   },
 
   createOrUpdate(store, type, snapshot) {
-    const { backend, name } = snapshot.record;
     const serializer = store.serializerFor(type.modelName);
     const data = serializer.serialize(snapshot);
-    const url = this.url(backend, type.modelName, name);
-    return this.ajax(url, 'POST', { data }).then((resp) => {
-      // Ember data doesn't like 204 responses except for DELETE method
-      const response = resp || { data: {} };
-      response.data.name = name;
-      return response;
-    });
+    const { id } = snapshot;
+    let url = this.url(snapshot.record.get('backend'), type.modelName, id);
+
+    return this.ajax(url, 'POST', { data });
   },
 
   createRecord() {
@@ -40,8 +31,8 @@ export default ApplicationAdapter.extend({
   },
 
   url(backend, modelType, id) {
-    const type = this.pathForType(modelType);
-    const url = `/${this.namespace}/${encodePath(backend)}/${encodePath(type)}`;
+    let type = this.pathForType(modelType);
+    let url = `/${this.namespace}/${encodePath(backend)}/${encodePath(type)}`;
     if (id) {
       return `${url}/${encodePath(id)}`;
     }
@@ -51,12 +42,9 @@ export default ApplicationAdapter.extend({
   fetchByQuery(query) {
     const { backend, modelName, id } = query;
     return this.ajax(this.url(backend, modelName, id), 'GET').then((resp) => {
-      // The API response doesn't explicitly include the name/id, so add it here
       return {
         ...resp,
         backend,
-        id,
-        name: id,
       };
     });
   },
@@ -67,9 +55,9 @@ export default ApplicationAdapter.extend({
 
   queryRecord(store, type, query) {
     return this.ajax(this.url(query.backend, type.modelName, query.id), 'GET').then((result) => {
+      // CBS TODO: Add name to response and unmap name <> id on models
       return {
         id: query.id,
-        name: query.id,
         ...result,
       };
     });
diff --git a/ui/app/adapters/transform/role.js b/ui/app/adapters/transform/role.js
index ecb6e9385cfb4..2ccef954c99d8 100644
--- a/ui/app/adapters/transform/role.js
+++ b/ui/app/adapters/transform/role.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import BaseAdapter from './base';
 
 export default BaseAdapter.extend({
diff --git a/ui/app/adapters/transform/template.js b/ui/app/adapters/transform/template.js
index 0bc5140c5b6e3..7649f2e9ce299 100644
--- a/ui/app/adapters/transform/template.js
+++ b/ui/app/adapters/transform/template.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import BaseAdapter from './base';
 
 export default BaseAdapter.extend({
diff --git a/ui/app/adapters/transform/transformation.js b/ui/app/adapters/transform/transformation.js
index 21c6e09d11888..c0bda8af7e4e5 100644
--- a/ui/app/adapters/transform/transformation.js
+++ b/ui/app/adapters/transform/transformation.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import BaseAdapter from './base';
 
 export default BaseAdapter.extend({
diff --git a/ui/app/adapters/transit-key.js b/ui/app/adapters/transit-key.js
index 5ca4d92cf8477..c88babb0c6eee 100644
--- a/ui/app/adapters/transit-key.js
+++ b/ui/app/adapters/transit-key.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationAdapter from './application';
 import { pluralize } from 'ember-inflector';
 import { encodePath } from 'vault/utils/path-encoding-helpers';
@@ -13,14 +8,14 @@ export default ApplicationAdapter.extend({
   createOrUpdate(store, type, snapshot, requestType) {
     const serializer = store.serializerFor(type.modelName);
     const data = serializer.serialize(snapshot, requestType);
-    const name = snapshot.attr('name');
+    let name = snapshot.attr('name');
     let url = this.urlForSecret(snapshot.record.get('backend'), name);
     if (requestType === 'update') {
       url = url + '/config';
     }
 
     return this.ajax(url, 'POST', { data }).then((resp) => {
-      const response = resp || {};
+      let response = resp || {};
       response.id = name;
       return response;
     });
@@ -64,7 +59,7 @@ export default ApplicationAdapter.extend({
   },
 
   urlForAction(action, backend, id, param) {
-    const urlBase = `${this.buildURL()}/${encodePath(backend)}/${action}`;
+    let urlBase = `${this.buildURL()}/${encodePath(backend)}/${action}`;
     // these aren't key-specific
     if (action === 'hash' || action === 'random') {
       return urlBase;
@@ -74,7 +69,7 @@ export default ApplicationAdapter.extend({
       return `${urlBase}/${param}/${encodePath(id)}`;
     }
     if (action === 'export' && param) {
-      const [type, version] = param;
+      let [type, version] = param;
       const exportBase = `${urlBase}/${type}-key/${encodePath(id)}`;
       return version ? `${exportBase}/${version}` : exportBase;
     }
@@ -82,7 +77,7 @@ export default ApplicationAdapter.extend({
   },
 
   optionsForQuery(id) {
-    const data = {};
+    let data = {};
     if (!id) {
       data['list'] = true;
     }
diff --git a/ui/app/app.js b/ui/app/app.js
index c6289256f3400..62e167426d6ac 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Application from '@ember/application';
 import Resolver from 'ember-resolver';
 import loadInitializers from 'ember-load-initializers';
@@ -30,7 +25,6 @@ export default class App extends Application {
       dependencies: {
         services: [
           'auth',
-          'download',
           'flash-messages',
           'namespace',
           'path-help',
@@ -44,31 +38,20 @@ export default class App extends Application {
         },
       },
     },
-    kubernetes: {
-      dependencies: {
-        services: ['router', 'store', 'secret-mount-path', 'flash-messages'],
-        externalRoutes: {
-          secrets: 'vault.cluster.secrets.backends',
-        },
-      },
-    },
     pki: {
       dependencies: {
         services: [
           'auth',
-          'download',
           'flash-messages',
           'namespace',
           'path-help',
           'router',
-          'secret-mount-path',
           'store',
           'version',
+          'secret-mount-path',
         ],
         externalRoutes: {
           secrets: 'vault.cluster.secrets.backends',
-          externalMountIssuer: 'vault.cluster.secrets.backend.pki.issuers.issuer.details',
-          secretsListRootConfiguration: 'vault.cluster.secrets.backend.configuration',
         },
       },
     },
diff --git a/ui/app/breakpoints.js b/ui/app/breakpoints.js
index 0be612d5d570d..6e89b27b05d69 100644
--- a/ui/app/breakpoints.js
+++ b/ui/app/breakpoints.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 //https://github.com/jgthms/bulma/blob/6ad2e3df0589e5d6ff7a9c03ee1c78a546bedeaf/sass/utilities/initial-variables.sass#L48-L59
 //https://github.com/jgthms/bulma/blob/6ad2e3df0589e5d6ff7a9c03ee1c78a546bedeaf/sass/utilities/mixins.sass#L71-L130
 export default {
diff --git a/ui/app/components/alert-popup.js b/ui/app/components/alert-popup.js
new file mode 100644
index 0000000000000..14c05c7b30cea
--- /dev/null
+++ b/ui/app/components/alert-popup.js
@@ -0,0 +1,28 @@
+import Component from '@glimmer/component';
+
+/**
+ * @module AlertPopup
+ * The `AlertPopup` is an implementation of the [ember-cli-flash](https://github.com/poteto/ember-cli-flash) `flashMessage`.
+ *
+ * @example ```js
+ * // All properties are passed in from the flashMessage service.
+ *   <AlertPopup @type={{message-types flash.type}} @message={{flash.message}} @close={{close}}/>```
+ *
+ * @param {string} type=null - The alert type. This comes from the message-types helper.
+ * @param {string} [message=null] - The alert message.
+ * @param {function} close=null - The close action which will close the alert.
+ * @param {boolean} isPreformatted - if true modifies class.
+ *
+ */
+
+export default class AlertPopup extends Component {
+  get type() {
+    return this.args.type || null;
+  }
+  get message() {
+    return this.args.message || null;
+  }
+  get close() {
+    return this.args.close || null;
+  }
+}
diff --git a/ui/app/components/alphabet-edit.js b/ui/app/components/alphabet-edit.js
index 87e36f88701a0..548e2dd85c346 100644
--- a/ui/app/components/alphabet-edit.js
+++ b/ui/app/components/alphabet-edit.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import TransformBase from './transform-edit-base';
 
 export default TransformBase.extend({});
diff --git a/ui/app/components/auth-config-form/config.js b/ui/app/components/auth-config-form/config.js
index e514ff6e17afb..bb0c2bc77be4e 100644
--- a/ui/app/components/auth-config-form/config.js
+++ b/ui/app/components/auth-config-form/config.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import AdapterError from '@ember-data/adapter/error';
 import { inject as service } from '@ember/service';
 import Component from '@ember/component';
diff --git a/ui/app/components/auth-config-form/options.js b/ui/app/components/auth-config-form/options.js
index e8cac73d7f67c..d3e179d12bf4d 100644
--- a/ui/app/components/auth-config-form/options.js
+++ b/ui/app/components/auth-config-form/options.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import AdapterError from '@ember-data/adapter/error';
 import AuthConfigComponent from './config';
 import { inject as service } from '@ember/service';
@@ -23,15 +18,13 @@ import { waitFor } from '@ember/test-waiters';
  */
 
 export default AuthConfigComponent.extend({
-  flashMessages: service(),
   router: service(),
-
   saveModel: task(
     waitFor(function* () {
-      const data = this.model.config.serialize();
+      let data = this.model.config.serialize();
       data.description = this.model.description;
 
-      // token_type should not be tuneable for the token auth method.
+      // token_type should not be tuneable for the token auth method, default is 'default-service'
       if (this.model.type === 'token') {
         delete data.token_type;
       }
diff --git a/ui/app/components/auth-form-options.js b/ui/app/components/auth-form-options.js
index 34319e25f735e..55706477346c4 100644
--- a/ui/app/components/auth-form-options.js
+++ b/ui/app/components/auth-form-options.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@ember/component';
 
 export default Component.extend({});
diff --git a/ui/app/components/auth-form.js b/ui/app/components/auth-form.js
index 2fb882a4acf73..eac35bd074def 100644
--- a/ui/app/components/auth-form.js
+++ b/ui/app/components/auth-form.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Ember from 'ember';
 import { next } from '@ember/runloop';
 import { inject as service } from '@ember/service';
@@ -65,7 +60,7 @@ export default Component.extend(DEFAULTS, {
 
   didReceiveAttrs() {
     this._super(...arguments);
-    const {
+    let {
       wrappedToken: token,
       oldWrappedToken: oldToken,
       oldNamespace: oldNS,
@@ -100,13 +95,13 @@ export default Component.extend(DEFAULTS, {
   didRender() {
     this._super(...arguments);
     // on very narrow viewports the active tab may be overflowed, so we scroll it into view here
-    const activeEle = this.element.querySelector('li.is-active');
+    let activeEle = this.element.querySelector('li.is-active');
     if (activeEle) {
       activeEle.scrollIntoView();
     }
 
     next(() => {
-      const firstMethod = this.firstMethod();
+      let firstMethod = this.firstMethod();
       // set `with` to the first method
       if (
         !this.wrappedToken &&
@@ -119,7 +114,7 @@ export default Component.extend(DEFAULTS, {
   },
 
   firstMethod() {
-    const firstMethod = this.methodsToShow.firstObject;
+    let firstMethod = this.methodsToShow.firstObject;
     if (!firstMethod) return;
     // prefer backends with a path over those with a type
     return firstMethod.path || firstMethod.type;
@@ -160,7 +155,7 @@ export default Component.extend(DEFAULTS, {
     }
     let type = this.selectedAuthBackend.type || 'token';
     type = type.toLowerCase();
-    const templateName = dasherize(type);
+    let templateName = dasherize(type);
     return templateName;
   }),
 
@@ -169,8 +164,8 @@ export default Component.extend(DEFAULTS, {
   cspErrorText: `This is a standby Vault node but can't communicate with the active node via request forwarding. Sign in at the active node to use the Vault UI.`,
 
   allSupportedMethods: computed('methodsToShow', 'hasMethodsWithPath', function () {
-    const hasMethodsWithPath = this.hasMethodsWithPath;
-    const methodsToShow = this.methodsToShow;
+    let hasMethodsWithPath = this.hasMethodsWithPath;
+    let methodsToShow = this.methodsToShow;
     return hasMethodsWithPath ? methodsToShow.concat(BACKENDS) : methodsToShow;
   }),
 
@@ -178,8 +173,8 @@ export default Component.extend(DEFAULTS, {
     return this.methodsToShow.isAny('path');
   }),
   methodsToShow: computed('methods', function () {
-    const methods = this.methods || [];
-    const shownMethods = methods.filter((m) =>
+    let methods = this.methods || [];
+    let shownMethods = methods.filter((m) =>
       BACKENDS.find((b) => b.type.toLowerCase() === m.type.toLowerCase())
     );
     return shownMethods.length ? shownMethods : BACKENDS;
@@ -189,9 +184,9 @@ export default Component.extend(DEFAULTS, {
     waitFor(function* (token) {
       // will be using the Token Auth Method, so set it here
       this.set('selectedAuth', 'token');
-      const adapter = this.store.adapterFor('tools');
+      let adapter = this.store.adapterFor('tools');
       try {
-        const response = yield adapter.toolAction('unwrap', null, { clientToken: token });
+        let response = yield adapter.toolAction('unwrap', null, { clientToken: token });
         this.set('token', response.auth.client_token);
         this.send('doSubmit');
       } catch (e) {
@@ -202,9 +197,9 @@ export default Component.extend(DEFAULTS, {
 
   fetchMethods: task(
     waitFor(function* () {
-      const store = this.store;
+      let store = this.store;
       try {
-        const methods = yield store.findAll('auth-method', {
+        let methods = yield store.findAll('auth-method', {
           adapterOptions: {
             unauthenticated: true,
           },
@@ -282,6 +277,7 @@ export default Component.extend(DEFAULTS, {
 
   delayAuthMessageReminder: task(function* () {
     if (Ember.testing) {
+      this.showLoading = true;
       yield timeout(0);
     } else {
       yield timeout(5000);
diff --git a/ui/app/components/auth-info.js b/ui/app/components/auth-info.js
new file mode 100644
index 0000000000000..37430e69bebbe
--- /dev/null
+++ b/ui/app/components/auth-info.js
@@ -0,0 +1,54 @@
+import Component from '@glimmer/component';
+import { inject as service } from '@ember/service';
+import { later } from '@ember/runloop';
+import { action } from '@ember/object';
+import { tracked } from '@glimmer/tracking';
+
+/**
+ * @module AuthInfo
+ *
+ * @example
+ * ```js
+ * <AuthInfo @activeClusterName={{cluster.name}} @onLinkClick={{action "onLinkClick"}} />
+ * ```
+ *
+ * @param {string} activeClusterName - name of the current cluster, passed from the parent.
+ * @param {Function} onLinkClick - parent action which determines the behavior on link click
+ */
+export default class AuthInfoComponent extends Component {
+  @service auth;
+  @service router;
+
+  @tracked fakeRenew = false;
+
+  get hasEntityId() {
+    // root users will not have an entity_id because they are not associated with an entity.
+    // in order to use the MFA end user setup they need an entity_id
+    return !!this.auth.authData.entity_id;
+  }
+
+  get isRenewing() {
+    return this.fakeRenew || this.auth.isRenewing;
+  }
+
+  transitionToRoute() {
+    this.router.transitionTo(...arguments);
+  }
+
+  @action
+  renewToken() {
+    this.fakeRenew = true;
+    later(() => {
+      this.auth.renew().then(() => {
+        this.fakeRenew = this.auth.isRenewing;
+      });
+    }, 200);
+  }
+
+  @action
+  revokeToken() {
+    this.auth.revokeCurrentToken().then(() => {
+      this.transitionToRoute('vault.cluster.logout');
+    });
+  }
+}
diff --git a/ui/app/components/auth-jwt.js b/ui/app/components/auth-jwt.js
index ec4c7b2c53907..bdaee9fe3535f 100644
--- a/ui/app/components/auth-jwt.js
+++ b/ui/app/components/auth-jwt.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Ember from 'ember';
 import { inject as service } from '@ember/service';
 // ARG NOTE: Once you remove outer-html after glimmerizing you can remove the outer-html component
@@ -62,8 +57,8 @@ export default Component.extend({
         // debounce
         yield timeout(Ember.testing ? 0 : WAIT_TIME);
       }
-      const path = this.selectedAuthPath || this.selectedAuthType;
-      const id = JSON.stringify([path, roleName]);
+      let path = this.selectedAuthPath || this.selectedAuthType;
+      let id = JSON.stringify([path, roleName]);
       let role = null;
       try {
         role = yield this.store.findRecord('role-jwt', id, { adapterOptions: { namespace: this.namespace } });
@@ -109,7 +104,7 @@ export default Component.extend({
     // ensure that postMessage event is from expected source
     while (true) {
       const event = yield waitForEvent(thisWindow, 'message');
-      if (event.origin === thisWindow.origin && event.isTrusted && event.data.source === 'oidc-callback') {
+      if (event.data.source === 'oidc-callback' && event.isTrusted && event.origin === thisWindow.origin) {
         return this.exchangeOIDC.perform(event.data, oidcWindow);
       }
       // continue to wait for the correct message
@@ -139,11 +134,11 @@ export default Component.extend({
 
     let { namespace, path, state, code } = oidcState;
 
-    // The namespace can be either be passed as a query parameter, or be embedded
+    // The namespace can be either be passed as a query paramter, or be embedded
     // in the state param in the format `<state_id>,ns=<namespace>`. So if
     // `namespace` is empty, check for namespace in state as well.
     if (namespace === '' || this.featureFlagService.managedNamespaceRoot) {
-      const i = state.indexOf(',ns=');
+      let i = state.indexOf(',ns=');
       if (i >= 0) {
         // ",ns=" is 4 characters
         namespace = state.substring(i + 4);
@@ -154,7 +149,7 @@ export default Component.extend({
     if (!path || !state || !code) {
       return this.cancelLogin(oidcWindow, ERROR_MISSING_PARAMS);
     }
-    const adapter = this.store.adapterFor('auth-method');
+    let adapter = this.store.adapterFor('auth-method');
     this.onNamespace(namespace);
     let resp;
     // do the OIDC exchange, set the token on the parent component
@@ -176,14 +171,6 @@ export default Component.extend({
       if (e && e.preventDefault) {
         e.preventDefault();
       }
-      try {
-        await this.fetchRole.perform(this.roleName, { debounce: false });
-      } catch (error) {
-        // this task could be cancelled if the instances in didReceiveAttrs resolve after this was started
-        if (error?.name !== 'TaskCancelation') {
-          throw error;
-        }
-      }
       if (!this.isOIDC || !this.role || !this.role.authUrl) {
         let message = this.errorMessage;
         if (!this.role) {
@@ -195,13 +182,21 @@ export default Component.extend({
         this.onError(message);
         return;
       }
-      const win = this.getWindow();
+      try {
+        await this.fetchRole.perform(this.roleName, { debounce: false });
+      } catch (error) {
+        // this task could be cancelled if the instances in didReceiveAttrs resolve after this was started
+        if (error?.name !== 'TaskCancelation') {
+          throw error;
+        }
+      }
+      let win = this.getWindow();
 
       const POPUP_WIDTH = 500;
       const POPUP_HEIGHT = 600;
-      const left = win.screen.width / 2 - POPUP_WIDTH / 2;
-      const top = win.screen.height / 2 - POPUP_HEIGHT / 2;
-      const oidcWindow = win.open(
+      let left = win.screen.width / 2 - POPUP_WIDTH / 2;
+      let top = win.screen.height / 2 - POPUP_HEIGHT / 2;
+      let oidcWindow = win.open(
         this.role.authUrl,
         'vaultOIDCWindow',
         `width=${POPUP_WIDTH},height=${POPUP_HEIGHT},resizable,scrollbars=yes,top=${top},left=${left}`
diff --git a/ui/app/components/b64-toggle.js b/ui/app/components/b64-toggle.js
index eb2a011d40ded..0f631ba67131b 100644
--- a/ui/app/components/b64-toggle.js
+++ b/ui/app/components/b64-toggle.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { equal } from '@ember/object/computed';
 import { isBlank } from '@ember/utils';
 import Component from '@ember/component';
@@ -121,12 +116,12 @@ export default Component.extend({
   },
 
   click() {
-    const val = this.value;
+    let val = this.value;
     const isUTF8 = this.currentEncoding === UTF8;
     if (!val) {
       return;
     }
-    const newVal = isUTF8 ? encodeString(val) : decodeString(val);
+    let newVal = isUTF8 ? encodeString(val) : decodeString(val);
     const encoding = isUTF8 ? B64 : UTF8;
     set(this, 'value', newVal);
     set(this, '_value', newVal);
diff --git a/ui/app/components/basic-dropdown/trigger.js b/ui/app/components/basic-dropdown/trigger.js
index afacad91fa393..2d3272397fcee 100644
--- a/ui/app/components/basic-dropdown/trigger.js
+++ b/ui/app/components/basic-dropdown/trigger.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Trigger from 'ember-basic-dropdown/components/basic-dropdown/trigger';
 
 export default Trigger.extend({
diff --git a/ui/app/components/calendar-widget.js b/ui/app/components/calendar-widget.js
index fc299e8bead86..6b7004ea0739f 100644
--- a/ui/app/components/calendar-widget.js
+++ b/ui/app/components/calendar-widget.js
@@ -1,119 +1,141 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
+import layout from '../templates/components/calendar-widget';
+import { setComponentTemplate } from '@ember/component';
 import { action } from '@ember/object';
 import { tracked } from '@glimmer/tracking';
-import { ARRAY_OF_MONTHS, parseAPITimestamp } from 'core/utils/date-formatters';
-import { addYears, isSameYear, subYears } from 'date-fns';
-import timestamp from 'core/utils/timestamp';
+
 /**
  * @module CalendarWidget
- * CalendarWidget component is used in the client counts dashboard to select a month/year to query the /activity endpoint.
- * The component returns an object with selected date info, example: { dateType: 'endDate', monthIdx: 0, monthName: 'January', year: 2022 }
+ * CalendarWidget components are used in the client counts metrics. It helps users understand the ranges they can select.
  *
  * @example
  * ```js
- * <CalendarWidget @startTimestamp={{this.startTime}} @endTimestamp={{this.endTime}} @selectMonth={{this.handleSelection}} />
+ * <CalendarWidget
+ * @param {array} arrayOfMonths - An array of all the months that the calendar widget iterates through.
+ * @param {string} endTimeDisplay - The formatted display value of the endTime. Ex: January 2022.
+ * @param {array} endTimeFromResponse - The value returned on the counters/activity endpoint, which shows the true endTime not the selected one, which can be different. Ex: ['2022', 0]
+ * @param {function} handleClientActivityQuery - a function passed from parent. This component sends the month and year to the parent via this method which then calculates the new data.
+ * @param {function} handleCurrentBillingPeriod - a function passed from parent. This component makes the parent aware that the user selected Current billing period and it handles resetting the data.
+ * @param {string} startTimeDisplay - The formatted display value of the endTime. Ex: January 2022. This component is only responsible for modifying the endTime which is sends to the parent to make the network request.
+ * />
  *
- *    @param {string} startTimestamp - ISO timestamp string of the calendar widget's start time, displays in dropdown trigger
- *    @param {string} endTimestamp - ISO timestamp string for the calendar widget's end time, displays in dropdown trigger
- *    @param {function} selectMonth - callback function from parent - fires when selecting a month or clicking "Current billing period"
- *  />
  * ```
  */
-export default class CalendarWidget extends Component {
-  currentDate = timestamp.now();
-  @tracked calendarDisplayDate = this.currentDate; // init to current date, updates when user clicks on calendar chevrons
+class CalendarWidget extends Component {
+  currentDate = new Date();
+  currentYear = this.currentDate.getFullYear(); // integer
+  currentMonth = parseInt(this.currentDate.getMonth()); // integer and zero index
+
+  @tracked allMonthsNodeList = [];
+  @tracked displayYear = this.currentYear; // init to currentYear and then changes as a user clicks on the chevrons
   @tracked showCalendar = false;
   @tracked tooltipTarget = null;
   @tracked tooltipText = null;
 
-  // both date getters return a date object
-  get startDate() {
-    return parseAPITimestamp(this.args.startTimestamp);
-  }
-  get endDate() {
-    return parseAPITimestamp(this.args.endTimestamp);
-  }
-  get displayYear() {
-    return this.calendarDisplayDate.getFullYear();
+  get selectedMonthId() {
+    if (!this.args.endTimeFromResponse) return '';
+    const [year, monthIndex] = this.args.endTimeFromResponse;
+    return `${monthIndex}-${year}`;
   }
   get disableFutureYear() {
-    return isSameYear(this.calendarDisplayDate, this.currentDate);
+    return this.displayYear === this.currentYear;
   }
   get disablePastYear() {
-    // calendar widget should only go as far back as the passed in start time
-    return isSameYear(this.calendarDisplayDate, this.startDate);
+    let startYear = parseInt(this.args.startTimeDisplay.split(' ')[1]);
+    return this.displayYear === startYear; // if on startYear then don't let them click back to the year prior
   }
   get widgetMonths() {
-    const startYear = this.startDate.getFullYear();
-    const startMonthIdx = this.startDate.getMonth();
-    return ARRAY_OF_MONTHS.map((month, index) => {
+    const displayYear = this.displayYear;
+    const currentYear = this.currentYear;
+    const currentMonthIdx = this.currentMonth;
+    const [startMonth, startYear] = this.args.startTimeDisplay.split(' ');
+    const startMonthIdx = this.args.arrayOfMonths.indexOf(startMonth);
+    return this.args.arrayOfMonths.map((month, idx) => {
+      const monthId = `${idx}-${displayYear}`;
       let readonly = false;
 
-      // if widget is showing same year as @startTimestamp year, disable if month is before start month
-      if (startYear === this.displayYear && index < startMonthIdx) {
+      // if widget is showing billing start year, disable if month is before start month
+      if (parseInt(startYear) === displayYear && idx < startMonthIdx) {
         readonly = true;
       }
 
-      // if widget showing current year, disable if month is later than current month
-      if (this.displayYear === this.currentDate.getFullYear() && index > this.currentDate.getMonth()) {
+      // if widget showing current year, disable if month is current or later
+      if (displayYear === currentYear && idx >= currentMonthIdx) {
         readonly = true;
       }
       return {
-        index,
-        year: this.displayYear,
-        name: month,
+        id: monthId,
+        month,
         readonly,
+        current: monthId === `${currentMonthIdx}-${currentYear}`,
       };
     });
   }
 
+  // HELPER FUNCTIONS (alphabetically) //
+  addClass(element, classString) {
+    element.classList.add(classString);
+  }
+
+  removeClass(element, classString) {
+    element.classList.remove(classString);
+  }
+
+  resetDisplayYear() {
+    let setYear = this.currentYear;
+    if (this.args.endTimeDisplay) {
+      try {
+        const year = this.args.endTimeDisplay.split(' ')[1];
+        setYear = parseInt(year);
+      } catch (e) {
+        console.debug('Error resetting display year', e);
+      }
+    }
+    this.displayYear = setYear;
+  }
+
+  // ACTIONS (alphabetically) //
   @action
   addTooltip() {
     if (this.disablePastYear) {
-      const previousYear = this.displayYear - 1;
-      this.tooltipText = `${previousYear} is unavailable because it is before your start date. Change your start month to a date in ${previousYear} to see data for this year.`;
+      let previousYear = Number(this.displayYear) - 1;
+      this.tooltipText = `${previousYear} is unavailable because it is before your billing start month. Change your billing start month to a date in ${previousYear} to see data for this year.`; // set tooltip text
       this.tooltipTarget = '#previous-year';
     }
   }
 
   @action
-  removeTooltip() {
-    this.tooltipTarget = null;
+  addYear() {
+    this.displayYear = this.displayYear + 1;
   }
 
-  @action
-  addYear() {
-    this.calendarDisplayDate = addYears(this.calendarDisplayDate, 1);
+  @action removeTooltip() {
+    this.tooltipTarget = null;
   }
 
   @action
-  subYear() {
-    this.calendarDisplayDate = subYears(this.calendarDisplayDate, 1);
+  selectCurrentBillingPeriod(D) {
+    this.args.handleCurrentBillingPeriod(); // resets the billing startTime and endTime to what it is on init via the parent.
+    this.showCalendar = false;
+    D.actions.close(); // close the dropdown.
   }
-
   @action
-  toggleShowCalendar() {
-    this.showCalendar = !this.showCalendar;
-    this.calendarDisplayDate = this.endDate;
+  selectEndMonth(monthId, D) {
+    const [monthIdx, year] = monthId.split('-');
+    this.toggleShowCalendar();
+    this.args.handleClientActivityQuery(parseInt(monthIdx), parseInt(year), 'endTime');
+    D.actions.close(); // close the dropdown.
   }
 
   @action
-  handleDateShortcut(dropdown, { target }) {
-    this.args.selectMonth({ dateType: target.name }); // send clicked shortcut to parent callback
-    this.showCalendar = false;
-    dropdown.close();
+  subYear() {
+    this.displayYear = this.displayYear - 1;
   }
 
   @action
-  selectMonth(month, dropdown) {
-    const { index, year, name } = month;
-    this.toggleShowCalendar();
-    this.args.selectMonth({ monthIdx: index, monthName: name, year, dateType: 'endDate' });
-    dropdown.close();
+  toggleShowCalendar() {
+    this.showCalendar = !this.showCalendar;
+    this.resetDisplayYear();
   }
 }
+export default setComponentTemplate(layout, CalendarWidget);
diff --git a/ui/app/components/clients/attribution.js b/ui/app/components/clients/attribution.js
index e057fde704875..0ed4d8935db59 100644
--- a/ui/app/components/clients/attribution.js
+++ b/ui/app/components/clients/attribution.js
@@ -1,15 +1,7 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
-import { parseAPITimestamp } from 'core/utils/date-formatters';
-import { format, isSameMonth } from 'date-fns';
-
 /**
  * @module Attribution
  * Attribution components display the top 10 total client counts for namespaces or auth methods (mounts) during a billing period.
@@ -24,11 +16,10 @@ import { format, isSameMonth } from 'date-fns';
  *    @totalClientAttribution={{this.totalClientAttribution}}
  *    @newClientAttribution={{this.newClientAttribution}}
  *    @selectedNamespace={{this.selectedNamespace}}
- *    @startTimestamp={{this.startTime}}
- *    @endTimestamp={{this.endTime}}
- *    @isHistoricalMonth={{false}}
- *    @responseTimestamp={{this.responseTimestamp}}
- *    @upgradeExplanation="We added monthly breakdowns and mount level attribution starting in 1.10, so keep that in mind when looking at the data."
+ *    @startTimeDisplay={{date-format this.responseTimestamp "MMMM yyyy"}}
+ *    @isDateRange={{this.isDateRange}}
+ *    @isCurrentMonth={{false}}
+ *    @timestamp={{this.responseTimestamp}}
  *  />
  * ```
  * @param {array} chartLegend - (passed to child) array of objects with key names 'key' and 'label' so data can be stacked
@@ -37,33 +28,25 @@ import { format, isSameMonth } from 'date-fns';
  * @param {array} totalClientAttribution - array of objects containing a label and breakdown of client counts for total clients
  * @param {array} newClientAttribution - array of objects containing a label and breakdown of client counts for new clients
  * @param {string} selectedNamespace - namespace selected from filter bar
- * @param {string} startTimestamp - timestamp string from activity response to render start date for CSV modal and whether copy reads 'month' or 'date range'
- * @param {string} endTimestamp - timestamp string from activity response to render end date for CSV modal and whether copy reads 'month' or 'date range'
- * @param {string} responseTimestamp -  ISO timestamp created in serializer to timestamp the response, renders in bottom left corner below attribution chart
- * @param {boolean} isHistoricalMonth - when true data is from a single, historical month so side-by-side charts should display for attribution data
- * @param {boolean} upgradeExplanation - if data contains an upgrade, explanation is generated by the parent to be rendered in the export modal
+ * @param {string} startTimeDisplay - string that displays as start date for CSV modal
+ * @param {string} endTimeDisplay - string that displays as end date for CSV modal
+ * @param {boolean} isDateRange - getter calculated in parent to relay if dataset is a date range or single month and display text accordingly
+ * @param {boolean} isCurrentMonth - boolean to determine if rendered in current month tab or not
+ * @param {string} timestamp -  ISO timestamp created in serializer to timestamp the response
  */
 
 export default class Attribution extends Component {
   @tracked showCSVDownloadModal = false;
-  @service download;
-
-  get formattedStartDate() {
-    if (!this.args.startTimestamp) return null;
-    return parseAPITimestamp(this.args.startTimestamp, 'MMMM yyyy');
-  }
-  get formattedEndDate() {
-    if (!this.args.startTimestamp && !this.args.endTimestamp) return null;
-    // displays on CSV export modal, no need to display duplicate months and years
-    const startDateObject = parseAPITimestamp(this.args.startTimestamp);
-    const endDateObject = parseAPITimestamp(this.args.endTimestamp);
-    return isSameMonth(startDateObject, endDateObject) ? null : format(endDateObject, 'MMMM yyyy');
-  }
+  @service downloadCsv;
 
   get hasCsvData() {
     return this.args.totalClientAttribution ? this.args.totalClientAttribution.length > 0 : false;
   }
 
+  get isDateRange() {
+    return this.args.isDateRange;
+  }
+
   get isSingleNamespace() {
     if (!this.args.totalClientAttribution) {
       return 'no data';
@@ -92,7 +75,7 @@ export default class Attribution extends Component {
   }
 
   get chartText() {
-    const dateText = this.formattedEndDate ? 'date range' : 'month';
+    let dateText = this.isDateRange ? 'date range' : 'month';
     switch (this.isSingleNamespace) {
       case true:
         return {
@@ -125,17 +108,17 @@ export default class Attribution extends Component {
   destructureCountsToArray(object) {
     // destructure the namespace object  {label: 'some-namespace', entity_clients: 171, non_entity_clients: 20, clients: 191}
     // to get integers for CSV file
-    const { clients, entity_clients, non_entity_clients } = object;
+    let { clients, entity_clients, non_entity_clients } = object;
     return [clients, entity_clients, non_entity_clients];
   }
 
   constructCsvRow(namespaceColumn, mountColumn = null, totalColumns, newColumns = null) {
     // if namespaceColumn is a string, then we're at mount level attribution, otherwise it is an object
     // if constructing a namespace row, mountColumn=null so the column is blank, otherwise it is an object
-    const otherColumns = newColumns ? [...totalColumns, ...newColumns] : [...totalColumns];
+    let otherColumns = newColumns ? [...totalColumns, ...newColumns] : [...totalColumns];
     return [
       `${typeof namespaceColumn === 'string' ? namespaceColumn : namespaceColumn.label}`,
-      `${mountColumn ? mountColumn.label : '*'}`,
+      `${mountColumn ? mountColumn.label : ''}`,
       ...otherColumns,
     ];
   }
@@ -143,35 +126,30 @@ export default class Attribution extends Component {
   generateCsvData() {
     const totalAttribution = this.args.totalClientAttribution;
     const newAttribution = this.barChartNewClients ? this.args.newClientAttribution : null;
-    const csvData = [];
-    // added to clarify that the row of namespace totals without an auth method (blank) are not additional clients
-    // but indicate the total clients for that ns, including its auth methods
-    const descriptionOfBlanks = this.isSingleNamespace
-      ? ''
-      : `\n  *namespace totals, inclusive of auth method clients`;
-    const csvHeader = [
-      'Namespace path',
-      `"Authentication method ${descriptionOfBlanks}"`,
-      'Total clients',
-      'Entity clients',
-      'Non-entity clients',
-    ];
+    let csvData = [],
+      csvHeader = [
+        'Namespace path',
+        'Authentication method',
+        'Total clients',
+        'Entity clients',
+        'Non-entity clients',
+      ];
 
     if (newAttribution) {
-      csvHeader.push('Total new clients, New entity clients, New non-entity clients');
+      csvHeader = [...csvHeader, 'Total new clients, New entity clients, New non-entity clients'];
     }
 
     totalAttribution.forEach((totalClientsObject) => {
-      const namespace = this.isSingleNamespace ? this.args.selectedNamespace : totalClientsObject;
-      const mount = this.isSingleNamespace ? totalClientsObject : null;
+      let namespace = this.isSingleNamespace ? this.args.selectedNamespace : totalClientsObject;
+      let mount = this.isSingleNamespace ? totalClientsObject : null;
 
       // find new client data for namespace/mount object we're iterating over
-      const newClientsObject = newAttribution
+      let newClientsObject = newAttribution
         ? newAttribution.find((d) => d.label === totalClientsObject.label)
         : null;
 
-      const totalClients = this.destructureCountsToArray(totalClientsObject);
-      const newClients = newClientsObject ? this.destructureCountsToArray(newClientsObject) : null;
+      let totalClients = this.destructureCountsToArray(totalClientsObject);
+      let newClients = newClientsObject ? this.destructureCountsToArray(newClientsObject) : null;
 
       csvData.push(this.constructCsvRow(namespace, mount, totalClients, newClients));
       // constructCsvRow returns an array that corresponds to a row in the csv file:
@@ -180,11 +158,11 @@ export default class Attribution extends Component {
       // only iterate through mounts if NOT viewing a single namespace
       if (!this.isSingleNamespace && namespace.mounts) {
         namespace.mounts.forEach((mount) => {
-          const newMountData = newAttribution
+          let newMountData = newAttribution
             ? newClientsObject?.mounts.find((m) => m.label === mount.label)
             : null;
-          const mountTotalClients = this.destructureCountsToArray(mount);
-          const mountNewClients = newMountData ? this.destructureCountsToArray(newMountData) : null;
+          let mountTotalClients = this.destructureCountsToArray(mount);
+          let mountNewClients = newMountData ? this.destructureCountsToArray(newMountData) : null;
           csvData.push(this.constructCsvRow(namespace, mount, mountTotalClients, mountNewClients));
         });
       }
@@ -195,18 +173,19 @@ export default class Attribution extends Component {
     return csvData.map((d) => d.join()).join('\n');
   }
 
-  get formattedCsvFileName() {
-    const endRange = this.formattedEndDate ? `-${this.formattedEndDate}` : '';
-    const csvDateRange = this.formattedStartDate + endRange;
+  get getCsvFileName() {
+    let endRange = this.isDateRange ? `-${this.args.endTimeDisplay}` : '';
+    let csvDateRange = this.args.startTimeDisplay + endRange;
     return this.isSingleNamespace
       ? `clients_by_auth_method_${csvDateRange}`
       : `clients_by_namespace_${csvDateRange}`;
   }
 
+  // ACTIONS
   @action
   exportChartData(filename) {
-    const contents = this.generateCsvData();
-    this.download.csv(filename, contents);
+    let contents = this.generateCsvData();
+    this.downloadCsv.download(filename, contents);
     this.showCSVDownloadModal = false;
   }
 }
diff --git a/ui/app/components/clients/config.js b/ui/app/components/clients/config.js
index 97faef4036b15..b84494b413727 100644
--- a/ui/app/components/clients/config.js
+++ b/ui/app/components/clients/config.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /**
  * @module ClientsConfig
  * ClientsConfig components are used to show and edit the client count config information.
@@ -23,11 +18,9 @@ import { task } from 'ember-concurrency';
 
 export default class ConfigComponent extends Component {
   @service router;
-
   @tracked mode = 'show';
   @tracked modalOpen = false;
-  @tracked validations;
-  @tracked error = null;
+  error = null;
 
   get infoRows() {
     return [
@@ -45,36 +38,38 @@ export default class ConfigComponent extends Component {
   }
 
   get modalTitle() {
-    return `Turn usage tracking ${this.args.model.enabled.toLowerCase()}?`;
+    let content = 'Turn usage tracking off?';
+    if (this.args.model && this.args.model.enabled === 'On') {
+      content = 'Turn usage tracking on?';
+    }
+    return content;
   }
 
   @(task(function* () {
     try {
       yield this.args.model.save();
-      this.router.transitionTo('vault.cluster.clients.config');
     } catch (err) {
       this.error = err.message;
-      this.modalOpen = false;
+      return;
     }
+    this.router.transitionTo('vault.cluster.clients.config');
   }).drop())
   save;
 
   @action
-  toggleEnabled(event) {
-    this.args.model.enabled = event.target.checked ? 'On' : 'Off';
+  updateBooleanValue(attr, value) {
+    let valueToSet = value === true ? attr.options.trueValue : attr.options.falseValue;
+    this.args.model[attr.name] = valueToSet;
   }
 
   @action
   onSaveChanges(evt) {
     evt.preventDefault();
-    const { isValid, state } = this.args.model.validate();
     const changed = this.args.model.changedAttributes();
-    if (!isValid) {
-      this.validations = state;
-    } else if (changed.enabled) {
-      this.modalOpen = true;
-    } else {
+    if (!changed.enabled) {
       this.save.perform();
+      return;
     }
+    this.modalOpen = true;
   }
 }
diff --git a/ui/app/components/clients/current.js b/ui/app/components/clients/current.js
new file mode 100644
index 0000000000000..776b0bd74be73
--- /dev/null
+++ b/ui/app/components/clients/current.js
@@ -0,0 +1,152 @@
+import Component from '@glimmer/component';
+import { tracked } from '@glimmer/tracking';
+import { isAfter, startOfMonth } from 'date-fns';
+import { action } from '@ember/object';
+
+export default class Current extends Component {
+  chartLegend = [
+    { key: 'entity_clients', label: 'entity clients' },
+    { key: 'non_entity_clients', label: 'non-entity clients' },
+  ];
+  @tracked selectedNamespace = null;
+  @tracked namespaceArray = this.byNamespace.map((namespace) => {
+    return { name: namespace['label'], id: namespace['label'] };
+  });
+
+  @tracked selectedAuthMethod = null;
+  @tracked authMethodOptions = [];
+
+  get upgradeVersionHistory() {
+    const versionHistory = this.args.model.versionHistory;
+    if (!versionHistory || versionHistory.length === 0) {
+      return null;
+    }
+
+    // get upgrade data for initial upgrade to 1.9 and/or 1.10
+    let relevantUpgrades = [];
+    const importantUpgrades = ['1.9', '1.10'];
+    importantUpgrades.forEach((version) => {
+      let findUpgrade = versionHistory.find((versionData) => versionData.id.match(version));
+      if (findUpgrade) relevantUpgrades.push(findUpgrade);
+    });
+    // array of upgrade data objects for noteworthy upgrades
+    return relevantUpgrades;
+  }
+
+  // Response client count data by namespace for current/partial month
+  get byNamespace() {
+    return this.args.model.monthly?.byNamespace || [];
+  }
+
+  get isGatheringData() {
+    // return true if tracking IS enabled but no data collected yet
+    return this.args.model.config?.enabled === 'On' && this.byNamespace.length === 0;
+  }
+
+  get hasAttributionData() {
+    if (this.selectedAuthMethod) return false;
+    if (this.selectedNamespace) {
+      return this.authMethodOptions.length > 0;
+    }
+    return this.totalUsageCounts.clients !== 0 && !!this.totalClientAttribution;
+  }
+
+  get filteredCurrentData() {
+    const namespace = this.selectedNamespace;
+    const auth = this.selectedAuthMethod;
+    if (!namespace && !auth) {
+      return this.byNamespace;
+    }
+    if (!auth) {
+      return this.byNamespace.find((ns) => ns.label === namespace);
+    }
+    return this.byNamespace
+      .find((ns) => ns.label === namespace)
+      .mounts?.find((mount) => mount.label === auth);
+  }
+
+  get upgradeDuringCurrentMonth() {
+    if (!this.upgradeVersionHistory) {
+      return null;
+    }
+    const upgradesWithinData = this.upgradeVersionHistory.filter((upgrade) => {
+      // TODO how do timezones affect this?
+      let upgradeDate = new Date(upgrade.timestampInstalled);
+      return isAfter(upgradeDate, startOfMonth(new Date()));
+    });
+    // return all upgrades that happened within date range of queried activity
+    return upgradesWithinData.length === 0 ? null : upgradesWithinData;
+  }
+
+  get upgradeVersionAndDate() {
+    if (!this.upgradeDuringCurrentMonth) {
+      return null;
+    }
+    if (this.upgradeDuringCurrentMonth.length === 2) {
+      let versions = this.upgradeDuringCurrentMonth.map((upgrade) => upgrade.id).join(' and ');
+      return `Vault was upgraded to ${versions} during this month.`;
+    } else {
+      let version = this.upgradeDuringCurrentMonth[0];
+      return `Vault was upgraded to ${version.id} on this month.`;
+    }
+  }
+
+  get versionSpecificText() {
+    if (!this.upgradeDuringCurrentMonth) {
+      return null;
+    }
+    if (this.upgradeDuringCurrentMonth.length === 1) {
+      let version = this.upgradeDuringCurrentMonth[0].id;
+      if (version.match('1.9')) {
+        return ' How we count clients changed in 1.9, so keep that in mind when looking at the data below.';
+      }
+      if (version.match('1.10')) {
+        return ' We added mount level attribution starting in 1.10, so keep that in mind when looking at the data below.';
+      }
+    }
+    // return combined explanation if spans multiple upgrades
+    return ' How we count clients changed in 1.9 and we added mount level attribution starting in 1.10. Keep this in mind when looking at the data below.';
+  }
+
+  // top level TOTAL client counts for current/partial month
+  get totalUsageCounts() {
+    return this.selectedNamespace ? this.filteredCurrentData : this.args.model.monthly?.total;
+  }
+
+  // total client attribution data for horizontal bar chart in attribution component
+  get totalClientAttribution() {
+    if (this.selectedNamespace) {
+      return this.filteredCurrentData?.mounts || null;
+    } else {
+      return this.byNamespace;
+    }
+  }
+
+  get responseTimestamp() {
+    return this.args.model.monthly?.responseTimestamp;
+  }
+
+  // ACTIONS
+  @action
+  selectNamespace([value]) {
+    // value comes in as [namespace0]
+    this.selectedNamespace = value;
+    if (!value) {
+      this.authMethodOptions = [];
+      // on clear, also make sure auth method is cleared
+      this.selectedAuthMethod = null;
+    } else {
+      // Side effect: set auth namespaces
+      const mounts = this.filteredCurrentData.mounts?.map((mount) => ({
+        id: mount.label,
+        name: mount.label,
+      }));
+      this.authMethodOptions = mounts;
+    }
+  }
+
+  @action
+  setAuthMethod([authMount]) {
+    this.selectedAuthMethod = authMount;
+  }
+}
diff --git a/ui/app/components/clients/dashboard.js b/ui/app/components/clients/dashboard.js
deleted file mode 100644
index bca48015ba763..0000000000000
--- a/ui/app/components/clients/dashboard.js
+++ /dev/null
@@ -1,376 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
-import { action } from '@ember/object';
-import { inject as service } from '@ember/service';
-import { tracked } from '@glimmer/tracking';
-import { isAfter, isBefore, isSameMonth, format } from 'date-fns';
-import getStorage from 'vault/lib/token-storage';
-import { parseAPITimestamp } from 'core/utils/date-formatters';
-// my sincere apologies to the next dev who has to refactor/debug this (⇀‸↼‶)
-export default class Dashboard extends Component {
-  @service store;
-  @service version;
-
-  chartLegend = [
-    { key: 'entity_clients', label: 'entity clients' },
-    { key: 'non_entity_clients', label: 'non-entity clients' },
-  ];
-
-  // RESPONSE
-  @tracked startMonthTimestamp; // when user queries, updates to first month object of response
-  @tracked endMonthTimestamp; // when user queries, updates to last month object of response
-  @tracked queriedActivityResponse = null;
-  // track params sent to /activity request
-  @tracked activityQueryParams = {
-    start: {}, // updates when user edits billing start month
-    end: {}, // updates when user queries end dates via calendar widget
-  };
-
-  // SEARCH SELECT FILTERS
-  get namespaceArray() {
-    return this.getActivityResponse.byNamespace
-      ? this.getActivityResponse.byNamespace.map((namespace) => ({
-          name: namespace.label,
-          id: namespace.label,
-        }))
-      : [];
-  }
-  @tracked selectedNamespace = null;
-  @tracked selectedAuthMethod = null;
-  @tracked authMethodOptions = [];
-
-  // TEMPLATE VIEW
-  @tracked noActivityData;
-  @tracked showBillingStartModal = false;
-  @tracked isLoadingQuery = false;
-  @tracked errorObject = null;
-
-  constructor() {
-    super(...arguments);
-    this.startMonthTimestamp = this.args.model.licenseStartTimestamp;
-    this.endMonthTimestamp = this.args.model.currentDate;
-    this.activityQueryParams.start.timestamp = this.args.model.licenseStartTimestamp;
-    this.activityQueryParams.end.timestamp = this.args.model.currentDate;
-    this.noActivityData = this.args.model.activity.id === 'no-data' ? true : false;
-  }
-
-  // returns text for empty state message if noActivityData
-  get dateRangeMessage() {
-    if (!this.startMonthTimestamp && !this.endMonthTimestamp) return null;
-    const endMonth = isSameMonth(
-      parseAPITimestamp(this.startMonthTimestamp),
-      parseAPITimestamp(this.endMonthTimestamp)
-    )
-      ? ''
-      : ` to ${parseAPITimestamp(this.endMonthTimestamp, 'MMMM yyyy')}`;
-    // completes the message 'No data received from { dateRangeMessage }'
-    return `from ${parseAPITimestamp(this.startMonthTimestamp, 'MMMM yyyy')}` + endMonth;
-  }
-
-  get versionText() {
-    return this.version.isEnterprise
-      ? {
-          label: 'Billing start month',
-          description:
-            'This date comes from your license, and defines when client counting starts. Without this starting point, the data shown is not reliable.',
-          title: 'No billing start date found',
-          message:
-            'In order to get the most from this data, please enter your billing period start month. This will ensure that the resulting data is accurate.',
-        }
-      : {
-          label: 'Client counting start date',
-          description:
-            'This date is when client counting starts. Without this starting point, the data shown is not reliable.',
-          title: 'No start date found',
-          message:
-            'In order to get the most from this data, please enter a start month above. Vault will calculate new clients starting from that month.',
-        };
-  }
-
-  get isDateRange() {
-    return !isSameMonth(
-      parseAPITimestamp(this.getActivityResponse.startTime),
-      parseAPITimestamp(this.getActivityResponse.endTime)
-    );
-  }
-
-  get isCurrentMonth() {
-    return (
-      isSameMonth(
-        parseAPITimestamp(this.getActivityResponse.startTime),
-        parseAPITimestamp(this.args.model.currentDate)
-      ) &&
-      isSameMonth(
-        parseAPITimestamp(this.getActivityResponse.endTime),
-        parseAPITimestamp(this.args.model.currentDate)
-      )
-    );
-  }
-
-  get startTimeDiscrepancy() {
-    // show banner if startTime returned from activity log (response) is after the queried startTime
-    const activityStartDateObject = parseAPITimestamp(this.getActivityResponse.startTime);
-    const queryStartDateObject = parseAPITimestamp(this.startMonthTimestamp);
-    let message = 'You requested data from';
-    if (this.startMonthTimestamp === this.args.model.licenseStartTimestamp && this.version.isEnterprise) {
-      // on init, date is automatically pulled from license start date and user hasn't queried anything yet
-      message = 'Your license start date is';
-    }
-    if (
-      isAfter(activityStartDateObject, queryStartDateObject) &&
-      !isSameMonth(activityStartDateObject, queryStartDateObject)
-    ) {
-      return `${message} ${parseAPITimestamp(this.startMonthTimestamp, 'MMMM yyyy')}. 
-        We only have data from ${parseAPITimestamp(this.getActivityResponse.startTime, 'MMMM yyyy')}, 
-        and that is what is being shown here.`;
-    } else {
-      return null;
-    }
-  }
-
-  get upgradeDuringActivity() {
-    const versionHistory = this.args.model.versionHistory;
-    if (!versionHistory || versionHistory.length === 0) {
-      return null;
-    }
-
-    // filter for upgrade data of noteworthy upgrades (1.9 and/or 1.10)
-    const upgradeVersionHistory = versionHistory.filter(
-      ({ version }) => version.match('1.9') || version.match('1.10')
-    );
-    if (!upgradeVersionHistory || upgradeVersionHistory.length === 0) {
-      return null;
-    }
-
-    const activityStart = parseAPITimestamp(this.getActivityResponse.startTime);
-    const activityEnd = parseAPITimestamp(this.getActivityResponse.endTime);
-    // filter and return all upgrades that happened within date range of queried activity
-    const upgradesWithinData = upgradeVersionHistory.filter(({ timestampInstalled }) => {
-      const upgradeDate = parseAPITimestamp(timestampInstalled);
-      return isAfter(upgradeDate, activityStart) && isBefore(upgradeDate, activityEnd);
-    });
-    return upgradesWithinData.length === 0 ? null : upgradesWithinData;
-  }
-
-  get upgradeVersionAndDate() {
-    if (!this.upgradeDuringActivity) return null;
-
-    if (this.upgradeDuringActivity.length === 2) {
-      const [firstUpgrade, secondUpgrade] = this.upgradeDuringActivity;
-      const firstDate = parseAPITimestamp(firstUpgrade.timestampInstalled, 'MMM d, yyyy');
-      const secondDate = parseAPITimestamp(secondUpgrade.timestampInstalled, 'MMM d, yyyy');
-      return `Vault was upgraded to ${firstUpgrade.version} (${firstDate}) and ${secondUpgrade.version} (${secondDate}) during this time range.`;
-    } else {
-      const [upgrade] = this.upgradeDuringActivity;
-      return `Vault was upgraded to ${upgrade.version} on ${parseAPITimestamp(
-        upgrade.timestampInstalled,
-        'MMM d, yyyy'
-      )}.`;
-    }
-  }
-
-  get upgradeExplanation() {
-    if (!this.upgradeDuringActivity) return null;
-    if (this.upgradeDuringActivity.length === 1) {
-      const version = this.upgradeDuringActivity[0].version;
-      if (version.match('1.9')) {
-        return ' How we count clients changed in 1.9, so keep that in mind when looking at the data.';
-      }
-      if (version.match('1.10')) {
-        return ' We added monthly breakdowns and mount level attribution starting in 1.10, so keep that in mind when looking at the data.';
-      }
-    }
-    // return combined explanation if spans multiple upgrades
-    return ' How we count clients changed in 1.9 and we added monthly breakdowns and mount level attribution starting in 1.10. Keep this in mind when looking at the data.';
-  }
-
-  get formattedStartDate() {
-    if (!this.startMonthTimestamp) return null;
-    return parseAPITimestamp(this.startMonthTimestamp, 'MMMM yyyy');
-  }
-
-  // GETTERS FOR RESPONSE & DATA
-
-  // on init API response uses license start_date, getter updates when user queries dates
-  get getActivityResponse() {
-    return this.queriedActivityResponse || this.args.model.activity;
-  }
-
-  get byMonthActivityData() {
-    if (this.selectedNamespace) {
-      return this.filteredActivityByMonth;
-    } else {
-      return this.getActivityResponse?.byMonth;
-    }
-  }
-
-  get hasAttributionData() {
-    if (this.selectedAuthMethod) return false;
-    if (this.selectedNamespace) {
-      return this.authMethodOptions.length > 0;
-    }
-    return !!this.totalClientAttribution && this.totalUsageCounts && this.totalUsageCounts.clients !== 0;
-  }
-
-  // (object) top level TOTAL client counts for given date range
-  get totalUsageCounts() {
-    return this.selectedNamespace ? this.filteredActivityByNamespace : this.getActivityResponse.total;
-  }
-
-  // (object) single month new client data with total counts + array of namespace breakdown
-  get newClientCounts() {
-    return this.isDateRange ? null : this.byMonthActivityData[0]?.new_clients;
-  }
-
-  // total client data for horizontal bar chart in attribution component
-  get totalClientAttribution() {
-    if (this.selectedNamespace) {
-      return this.filteredActivityByNamespace?.mounts || null;
-    } else {
-      return this.getActivityResponse?.byNamespace || null;
-    }
-  }
-
-  // new client data for horizontal bar chart
-  get newClientAttribution() {
-    // new client attribution only available in a single, historical month (not a date range or current month)
-    if (this.isDateRange || this.isCurrentMonth) return null;
-
-    if (this.selectedNamespace) {
-      return this.newClientCounts?.mounts || null;
-    } else {
-      return this.newClientCounts?.namespaces || null;
-    }
-  }
-
-  get responseTimestamp() {
-    return this.getActivityResponse.responseTimestamp;
-  }
-
-  // FILTERS
-  get filteredActivityByNamespace() {
-    const namespace = this.selectedNamespace;
-    const auth = this.selectedAuthMethod;
-    if (!namespace && !auth) {
-      return this.getActivityResponse;
-    }
-    if (!auth) {
-      return this.getActivityResponse.byNamespace.find((ns) => ns.label === namespace);
-    }
-    return this.getActivityResponse.byNamespace
-      .find((ns) => ns.label === namespace)
-      .mounts?.find((mount) => mount.label === auth);
-  }
-
-  get filteredActivityByMonth() {
-    const namespace = this.selectedNamespace;
-    const auth = this.selectedAuthMethod;
-    if (!namespace && !auth) {
-      return this.getActivityResponse?.byMonth;
-    }
-    const namespaceData = this.getActivityResponse?.byMonth
-      .map((m) => m.namespaces_by_key[namespace])
-      .filter((d) => d !== undefined);
-    if (!auth) {
-      return namespaceData.length === 0 ? null : namespaceData;
-    }
-    const mountData = namespaceData
-      .map((namespace) => namespace.mounts_by_key[auth])
-      .filter((d) => d !== undefined);
-    return mountData.length === 0 ? null : mountData;
-  }
-
-  @action
-  async handleClientActivityQuery({ dateType, monthIdx, year }) {
-    this.showBillingStartModal = false;
-    switch (dateType) {
-      case 'cancel':
-        return;
-      case 'reset': // clicked 'Current billing period' in calendar widget -> reset to initial start/end dates
-        this.activityQueryParams.start.timestamp = this.args.model.licenseStartTimestamp;
-        this.activityQueryParams.end.timestamp = this.args.model.currentDate;
-        break;
-      case 'currentMonth': // clicked 'Current month' from calendar widget
-        this.activityQueryParams.start.timestamp = this.args.model.currentDate;
-        this.activityQueryParams.end.timestamp = this.args.model.currentDate;
-        break;
-      case 'startDate': // from "Edit billing start" modal
-        this.activityQueryParams.start = { monthIdx, year };
-        this.activityQueryParams.end.timestamp = this.args.model.currentDate;
-        break;
-      case 'endDate': // selected month and year from calendar widget
-        this.activityQueryParams.end = { monthIdx, year };
-        break;
-      default:
-        break;
-    }
-    try {
-      this.isLoadingQuery = true;
-      const response = await this.store.queryRecord('clients/activity', {
-        start_time: this.activityQueryParams.start,
-        end_time: this.activityQueryParams.end,
-      });
-      // preference for byMonth timestamps because those correspond to a user's query
-      const { byMonth } = response;
-      this.startMonthTimestamp = byMonth[0]?.timestamp || response.startTime;
-      this.endMonthTimestamp = byMonth[byMonth.length - 1]?.timestamp || response.endTime;
-      if (response.id === 'no-data') {
-        this.noActivityData = true;
-      } else {
-        this.noActivityData = false;
-        getStorage().setItem('vault:ui-inputted-start-date', this.startMonthTimestamp);
-      }
-      this.queriedActivityResponse = response;
-
-      // reset search-select filters
-      this.selectedNamespace = null;
-      this.selectedAuthMethod = null;
-      this.authMethodOptions = [];
-    } catch (e) {
-      this.errorObject = e;
-      return e;
-    } finally {
-      this.isLoadingQuery = false;
-    }
-  }
-
-  get hasMultipleMonthsData() {
-    return this.byMonthActivityData && this.byMonthActivityData.length > 1;
-  }
-
-  @action
-  selectNamespace([value]) {
-    this.selectedNamespace = value;
-    if (!value) {
-      this.authMethodOptions = [];
-      // on clear, also make sure auth method is cleared
-      this.selectedAuthMethod = null;
-    } else {
-      // Side effect: set auth namespaces
-      const mounts = this.filteredActivityByNamespace.mounts?.map((mount) => ({
-        id: mount.label,
-        name: mount.label,
-      }));
-      this.authMethodOptions = mounts;
-    }
-  }
-
-  @action
-  setAuthMethod([authMount]) {
-    this.selectedAuthMethod = authMount;
-  }
-
-  // validation function sent to <DateDropdown> selecting 'endDate'
-  @action
-  isEndBeforeStart(selection) {
-    let { start } = this.activityQueryParams;
-    start = start?.timestamp ? parseAPITimestamp(start.timestamp) : new Date(start.year, start.monthIdx);
-    return isBefore(selection, start) && !isSameMonth(start, selection)
-      ? `End date must be after ${format(start, 'MMMM yyyy')}`
-      : false;
-  }
-}
diff --git a/ui/app/components/clients/history.js b/ui/app/components/clients/history.js
new file mode 100644
index 0000000000000..3466a6761db83
--- /dev/null
+++ b/ui/app/components/clients/history.js
@@ -0,0 +1,393 @@
+import Component from '@glimmer/component';
+import { action } from '@ember/object';
+import { inject as service } from '@ember/service';
+import { tracked } from '@glimmer/tracking';
+import { isSameMonth, isAfter, isBefore } from 'date-fns';
+import getStorage from 'vault/lib/token-storage';
+import { ARRAY_OF_MONTHS } from 'core/utils/date-formatters';
+import { dateFormat } from 'core/helpers/date-format';
+import { parseAPITimestamp } from 'core/utils/date-formatters';
+
+const INPUTTED_START_DATE = 'vault:ui-inputted-start-date';
+
+export default class History extends Component {
+  @service store;
+  @service version;
+
+  arrayOfMonths = ARRAY_OF_MONTHS;
+
+  chartLegend = [
+    { key: 'entity_clients', label: 'entity clients' },
+    { key: 'non_entity_clients', label: 'non-entity clients' },
+  ];
+
+  // FOR START DATE EDIT & MODAL //
+  months = Array.from({ length: 12 }, (item, i) => {
+    return new Date(0, i).toLocaleString('en-US', { month: 'long' });
+  });
+  years = Array.from({ length: 5 }, (item, i) => {
+    return new Date().getFullYear() - i;
+  });
+  currentDate = new Date();
+  currentYear = this.currentDate.getFullYear(); // integer of year
+  currentMonth = this.currentDate.getMonth(); // index of month
+
+  @tracked isEditStartMonthOpen = false;
+  @tracked startMonth = null;
+  @tracked startYear = null;
+  @tracked allowedMonthMax = 12;
+  @tracked disabledYear = null;
+
+  // FOR HISTORY COMPONENT //
+
+  // RESPONSE
+  @tracked endTimeFromResponse = this.args.model.endTimeFromResponse;
+  @tracked startTimeFromResponse = this.args.model.startTimeFromLicense; // ex: ['2021', 3] is April 2021 (0 indexed)
+  @tracked startTimeRequested = null;
+  @tracked queriedActivityResponse = null;
+
+  // SEARCH SELECT
+  @tracked selectedNamespace = null;
+  @tracked namespaceArray = this.getActivityResponse.byNamespace
+    ? this.getActivityResponse.byNamespace.map((namespace) => ({
+        name: namespace.label,
+        id: namespace.label,
+      }))
+    : [];
+  @tracked selectedAuthMethod = null;
+  @tracked authMethodOptions = [];
+
+  // TEMPLATE MESSAGING
+  @tracked noActivityDate = '';
+  @tracked responseRangeDiffMessage = null;
+  @tracked isLoadingQuery = false;
+  @tracked licenseStartIsCurrentMonth = this.args.model.activity?.isLicenseDateError || false;
+  @tracked errorObject = null;
+
+  get versionText() {
+    return this.version.isEnterprise
+      ? {
+          label: 'Billing start month',
+          description:
+            'This date comes from your license, and defines when client counting starts. Without this starting point, the data shown is not reliable.',
+          title: 'No billing start date found',
+          message:
+            'In order to get the most from this data, please enter your billing period start month. This will ensure that the resulting data is accurate.',
+        }
+      : {
+          label: 'Client counting start date',
+          description:
+            'This date is when client counting starts. Without this starting point, the data shown is not reliable.',
+          title: 'No start date found',
+          message:
+            'In order to get the most from this data, please enter a start month above. Vault will calculate new clients starting from that month.',
+        };
+  }
+
+  get isDateRange() {
+    return !isSameMonth(
+      parseAPITimestamp(this.getActivityResponse.startTime),
+      parseAPITimestamp(this.getActivityResponse.endTime)
+    );
+  }
+
+  get upgradeVersionHistory() {
+    const versionHistory = this.args.model.versionHistory;
+    if (!versionHistory || versionHistory.length === 0) {
+      return null;
+    }
+
+    // get upgrade data for initial upgrade to 1.9 and/or 1.10
+    let relevantUpgrades = [];
+    const importantUpgrades = ['1.9', '1.10'];
+    importantUpgrades.forEach((version) => {
+      let findUpgrade = versionHistory.find((versionData) => versionData.id.match(version));
+      if (findUpgrade) relevantUpgrades.push(findUpgrade);
+    });
+
+    // array of upgrade data objects for noteworthy upgrades
+    return relevantUpgrades;
+  }
+
+  get upgradeDuringActivity() {
+    if (!this.upgradeVersionHistory) {
+      return null;
+    }
+    const activityStart = new Date(this.getActivityResponse.startTime);
+    const activityEnd = new Date(this.getActivityResponse.endTime);
+    const upgradesWithinData = this.upgradeVersionHistory.filter((upgrade) => {
+      // TODO how do timezones affect this?
+      let upgradeDate = new Date(upgrade.timestampInstalled);
+      return isAfter(upgradeDate, activityStart) && isBefore(upgradeDate, activityEnd);
+    });
+    // return all upgrades that happened within date range of queried activity
+    return upgradesWithinData.length === 0 ? null : upgradesWithinData;
+  }
+
+  get upgradeVersionAndDate() {
+    if (!this.upgradeDuringActivity) {
+      return null;
+    }
+    if (this.upgradeDuringActivity.length === 2) {
+      let firstUpgrade = this.upgradeDuringActivity[0];
+      let secondUpgrade = this.upgradeDuringActivity[1];
+      let firstDate = dateFormat([firstUpgrade.timestampInstalled, 'MMM d, yyyy'], { isFormatted: true });
+      let secondDate = dateFormat([secondUpgrade.timestampInstalled, 'MMM d, yyyy'], { isFormatted: true });
+      return `Vault was upgraded to ${firstUpgrade.id} (${firstDate}) and ${secondUpgrade.id} (${secondDate}) during this time range.`;
+    } else {
+      let upgrade = this.upgradeDuringActivity[0];
+      return `Vault was upgraded to ${upgrade.id} on ${dateFormat(
+        [upgrade.timestampInstalled, 'MMM d, yyyy'],
+        { isFormatted: true }
+      )}.`;
+    }
+  }
+
+  get versionSpecificText() {
+    if (!this.upgradeDuringActivity) {
+      return null;
+    }
+    if (this.upgradeDuringActivity.length === 1) {
+      let version = this.upgradeDuringActivity[0].id;
+      if (version.match('1.9')) {
+        return ' How we count clients changed in 1.9, so keep that in mind when looking at the data below.';
+      }
+      if (version.match('1.10')) {
+        return ' We added monthly breakdowns and mount level attribution starting in 1.10, so keep that in mind when looking at the data below.';
+      }
+    }
+    // return combined explanation if spans multiple upgrades
+    return ' How we count clients changed in 1.9 and we added monthly breakdowns and mount level attribution starting in 1.10. Keep this in mind when looking at the data below.';
+  }
+
+  get startTimeDisplay() {
+    if (!this.startTimeFromResponse) {
+      return null;
+    }
+    let month = this.startTimeFromResponse[1];
+    let year = this.startTimeFromResponse[0];
+    return `${this.arrayOfMonths[month]} ${year}`;
+  }
+
+  get endTimeDisplay() {
+    if (!this.endTimeFromResponse) {
+      return null;
+    }
+    let month = this.endTimeFromResponse[1];
+    let year = this.endTimeFromResponse[0];
+    return `${this.arrayOfMonths[month]} ${year}`;
+  }
+
+  // GETTERS FOR RESPONSE & DATA
+
+  // on init API response uses license start_date, getter updates when user queries dates
+  get getActivityResponse() {
+    return this.queriedActivityResponse || this.args.model.activity;
+  }
+
+  get byMonthActivityData() {
+    if (this.selectedNamespace) {
+      return this.filteredActivityByMonth;
+    } else {
+      return this.getActivityResponse?.byMonth;
+    }
+  }
+
+  get byMonthNewClients() {
+    if (this.byMonthActivityData) {
+      return this.byMonthActivityData?.map((m) => m.new_clients);
+    }
+    return null;
+  }
+
+  get hasAttributionData() {
+    if (this.selectedAuthMethod) return false;
+    if (this.selectedNamespace) {
+      return this.authMethodOptions.length > 0;
+    }
+    return !!this.totalClientAttribution && this.totalUsageCounts && this.totalUsageCounts.clients !== 0;
+  }
+
+  // (object) top level TOTAL client counts for given date range
+  get totalUsageCounts() {
+    return this.selectedNamespace ? this.filteredActivityByNamespace : this.getActivityResponse.total;
+  }
+
+  // (object) single month new client data with total counts + array of namespace breakdown
+  get newClientCounts() {
+    return this.isDateRange ? null : this.byMonthActivityData[0]?.new_clients;
+  }
+
+  // total client data for horizontal bar chart in attribution component
+  get totalClientAttribution() {
+    if (this.selectedNamespace) {
+      return this.filteredActivityByNamespace?.mounts || null;
+    } else {
+      return this.getActivityResponse?.byNamespace || null;
+    }
+  }
+
+  // new client data for horizontal bar chart
+  get newClientAttribution() {
+    // new client attribution only available in a single, historical month (not a date range)
+    if (this.isDateRange) return null;
+
+    if (this.selectedNamespace) {
+      return this.newClientCounts?.mounts || null;
+    } else {
+      return this.newClientCounts?.namespaces || null;
+    }
+  }
+
+  get responseTimestamp() {
+    return this.getActivityResponse.responseTimestamp;
+  }
+
+  // FILTERS
+  get filteredActivityByNamespace() {
+    const namespace = this.selectedNamespace;
+    const auth = this.selectedAuthMethod;
+    if (!namespace && !auth) {
+      return this.getActivityResponse;
+    }
+    if (!auth) {
+      return this.getActivityResponse.byNamespace.find((ns) => ns.label === namespace);
+    }
+    return this.getActivityResponse.byNamespace
+      .find((ns) => ns.label === namespace)
+      .mounts?.find((mount) => mount.label === auth);
+  }
+
+  get filteredActivityByMonth() {
+    const namespace = this.selectedNamespace;
+    const auth = this.selectedAuthMethod;
+    if (!namespace && !auth) {
+      return this.getActivityResponse?.byMonth;
+    }
+    const namespaceData = this.getActivityResponse?.byMonth
+      .map((m) => m.namespaces_by_key[namespace])
+      .filter((d) => d !== undefined);
+    if (!auth) {
+      return namespaceData.length === 0 ? null : namespaceData;
+    }
+    const mountData = namespaceData
+      .map((namespace) => namespace.mounts_by_key[auth])
+      .filter((d) => d !== undefined);
+    return mountData.length === 0 ? null : mountData;
+  }
+
+  @action
+  async handleClientActivityQuery(month, year, dateType) {
+    this.isEditStartMonthOpen = false;
+    if (dateType === 'cancel') {
+      return;
+    }
+    // clicked "Current Billing period" in the calendar widget
+    if (dateType === 'reset') {
+      this.startTimeRequested = this.args.model.startTimeFromLicense;
+      this.endTimeRequested = null;
+    }
+    // clicked "Edit" Billing start month in History which opens a modal.
+    if (dateType === 'startTime') {
+      let monthIndex = this.arrayOfMonths.indexOf(month);
+      this.startTimeRequested = [year.toString(), monthIndex]; // ['2021', 0] (e.g. January 2021)
+      this.endTimeRequested = null;
+    }
+    // clicked "Custom End Month" from the calendar-widget
+    if (dateType === 'endTime') {
+      // use the currently selected startTime for your startTimeRequested.
+      this.startTimeRequested = this.startTimeFromResponse;
+      this.endTimeRequested = [year.toString(), month]; // endTime comes in as a number/index whereas startTime comes in as a month name. Hence the difference between monthIndex and month.
+    }
+
+    try {
+      this.isLoadingQuery = true;
+      let response = await this.store.queryRecord('clients/activity', {
+        start_time: this.startTimeRequested,
+        end_time: this.endTimeRequested,
+      });
+      if (response.id === 'no-data') {
+        // empty response (204) is the only time we want to update the displayed date with the requested time
+        this.startTimeFromResponse = this.startTimeRequested;
+        this.noActivityDate = this.startTimeDisplay;
+      } else {
+        // note: this.startTimeDisplay (getter) is updated by the @tracked startTimeFromResponse
+        this.startTimeFromResponse = response.formattedStartTime;
+        this.endTimeFromResponse = response.formattedEndTime;
+        this.storage().setItem(INPUTTED_START_DATE, this.startTimeFromResponse);
+      }
+      this.queriedActivityResponse = response;
+      this.licenseStartIsCurrentMonth = response.isLicenseDateError;
+      // compare if the response startTime comes after the requested startTime. If true throw a warning.
+      // only display if they selected a startTime
+      if (
+        dateType === 'startTime' &&
+        isAfter(
+          new Date(this.getActivityResponse.startTime),
+          new Date(this.startTimeRequested[0], this.startTimeRequested[1])
+        )
+      ) {
+        this.responseRangeDiffMessage = `You requested data from ${month} ${year}. We only have data from ${this.startTimeDisplay}, and that is what is being shown here.`;
+      } else {
+        this.responseRangeDiffMessage = null;
+      }
+    } catch (e) {
+      this.errorObject = e;
+      return e;
+    } finally {
+      this.isLoadingQuery = false;
+    }
+  }
+
+  get hasMultipleMonthsData() {
+    return this.byMonthActivityData && this.byMonthActivityData.length > 1;
+  }
+
+  @action
+  handleCurrentBillingPeriod() {
+    this.handleClientActivityQuery(0, 0, 'reset');
+  }
+
+  @action
+  selectNamespace([value]) {
+    // value comes in as [namespace0]
+    this.selectedNamespace = value;
+    if (!value) {
+      this.authMethodOptions = [];
+      // on clear, also make sure auth method is cleared
+      this.selectedAuthMethod = null;
+    } else {
+      // Side effect: set auth namespaces
+      const mounts = this.filteredActivityByNamespace.mounts?.map((mount) => ({
+        id: mount.label,
+        name: mount.label,
+      }));
+      this.authMethodOptions = mounts;
+    }
+  }
+
+  @action
+  setAuthMethod([authMount]) {
+    this.selectedAuthMethod = authMount;
+  }
+
+  // FOR START DATE MODAL
+  @action
+  selectStartMonth(month, event) {
+    this.startMonth = month;
+    // disables months if in the future
+    this.disabledYear = this.months.indexOf(month) >= this.currentMonth ? this.currentYear : null;
+    event.close();
+  }
+
+  @action
+  selectStartYear(year, event) {
+    this.startYear = year;
+    this.allowedMonthMax = year === this.currentYear ? this.currentMonth : 12;
+    event.close();
+  }
+
+  storage() {
+    return getStorage();
+  }
+}
diff --git a/ui/app/components/clients/horizontal-bar-chart.js b/ui/app/components/clients/horizontal-bar-chart.js
index 84aa917492a58..f64ea332d6a38 100644
--- a/ui/app/components/clients/horizontal-bar-chart.js
+++ b/ui/app/components/clients/horizontal-bar-chart.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 import { stack } from 'd3-shape';
@@ -71,24 +66,24 @@ export default class HorizontalBarChart extends Component {
     // chart legend tells stackFunction how to stack/organize data
     // creates an array of data for each key name
     // each array contains coordinates for each data bar
-    const stackFunction = stack().keys(this.chartLegend.map((l) => l.key));
-    const dataset = chartData;
-    const stackedData = stackFunction(dataset);
-    const labelKey = this.labelKey;
-    const xKey = this.xKey;
-    const xScale = scaleLinear()
+    let stackFunction = stack().keys(this.chartLegend.map((l) => l.key));
+    let dataset = chartData;
+    let stackedData = stackFunction(dataset);
+    let labelKey = this.labelKey;
+    let xKey = this.xKey;
+    let xScale = scaleLinear()
       .domain([0, max(dataset.map((d) => d[xKey]))])
       .range([0, 75]); // 25% reserved for margins
 
-    const yScale = scaleBand()
+    let yScale = scaleBand()
       .domain(dataset.map((d) => d[labelKey]))
       .range([0, dataset.length * LINE_HEIGHT])
       .paddingInner(0.765); // percent of the total width to reserve for padding between bars
 
-    const chartSvg = select(element);
+    let chartSvg = select(element);
     chartSvg.attr('width', '100%').attr('viewBox', `0 0 564 ${(dataset.length + 1) * LINE_HEIGHT}`);
 
-    const dataBarGroup = chartSvg
+    let dataBarGroup = chartSvg
       .selectAll('g')
       .remove()
       .exit()
@@ -100,9 +95,9 @@ export default class HorizontalBarChart extends Component {
       .attr('transform', `translate(${CHART_MARGIN.left}, ${CHART_MARGIN.top})`)
       .style('fill', (d, i) => LIGHT_AND_DARK_BLUE[i]);
 
-    const yAxis = axisLeft(yScale).tickSize(0);
+    let yAxis = axisLeft(yScale).tickSize(0);
 
-    const yLabelsGroup = chartSvg
+    let yLabelsGroup = chartSvg
       .append('g')
       .attr('data-test-group', 'y-labels')
       .attr('transform', `translate(${CHART_MARGIN.left}, ${CHART_MARGIN.top})`);
@@ -110,7 +105,7 @@ export default class HorizontalBarChart extends Component {
 
     chartSvg.select('.domain').remove();
 
-    const truncate = (selection) =>
+    let truncate = (selection) =>
       selection.text((string) =>
         string.length < CHAR_LIMIT ? string : string.slice(0, CHAR_LIMIT - 3) + '...'
       );
@@ -134,9 +129,9 @@ export default class HorizontalBarChart extends Component {
       .attr('rx', 3)
       .attr('ry', 3);
 
-    const actionBarGroup = chartSvg.append('g').attr('data-test-group', 'action-bars');
+    let actionBarGroup = chartSvg.append('g').attr('data-test-group', 'action-bars');
 
-    const actionBars = actionBarGroup
+    let actionBars = actionBarGroup
       .selectAll('.action-bar')
       .remove()
       .exit()
@@ -153,9 +148,9 @@ export default class HorizontalBarChart extends Component {
       .style('opacity', '0')
       .style('mix-blend-mode', 'multiply');
 
-    const labelActionBarGroup = chartSvg.append('g').attr('data-test-group', 'label-action-bars');
+    let labelActionBarGroup = chartSvg.append('g').attr('data-test-group', 'label-action-bars');
 
-    const labelActionBar = labelActionBarGroup
+    let labelActionBar = labelActionBarGroup
       .selectAll('.label-action-bar')
       .remove()
       .exit()
@@ -171,16 +166,16 @@ export default class HorizontalBarChart extends Component {
       .style('opacity', '0')
       .style('mix-blend-mode', 'multiply');
 
-    const dataBars = chartSvg.selectAll('rect.data-bar');
-    const actionBarSelection = chartSvg.selectAll('rect.action-bar');
+    let dataBars = chartSvg.selectAll('rect.data-bar');
+    let actionBarSelection = chartSvg.selectAll('rect.action-bar');
 
-    const compareAttributes = (elementA, elementB, attr) =>
+    let compareAttributes = (elementA, elementB, attr) =>
       select(elementA).attr(`${attr}`) === select(elementB).attr(`${attr}`);
 
     // MOUSE EVENTS FOR DATA BARS
     actionBars
       .on('mouseover', (data) => {
-        const hoveredElement = actionBars.filter((bar) => bar[labelKey] === data[labelKey]).node();
+        let hoveredElement = actionBars.filter((bar) => bar[labelKey] === data[labelKey]).node();
         this.tooltipTarget = hoveredElement;
         this.isLabel = false;
         this.tooltipText = this.total
@@ -211,7 +206,7 @@ export default class HorizontalBarChart extends Component {
     labelActionBar
       .on('mouseover', (data) => {
         if (data[labelKey].length >= CHAR_LIMIT) {
-          const hoveredElement = labelActionBar.filter((bar) => bar[labelKey] === data[labelKey]).node();
+          let hoveredElement = labelActionBar.filter((bar) => bar[labelKey] === data[labelKey]).node();
           this.tooltipTarget = hoveredElement;
           this.isLabel = true;
           this.tooltipText = data[labelKey];
@@ -244,7 +239,7 @@ export default class HorizontalBarChart extends Component {
       });
 
     // client count total values to the right
-    const totalValueGroup = chartSvg
+    let totalValueGroup = chartSvg
       .append('g')
       .attr('data-test-group', 'total-values')
       .attr('transform', `translate(${TRANSLATE.left}, ${TRANSLATE.down})`);
diff --git a/ui/app/components/clients/line-chart.js b/ui/app/components/clients/line-chart.js
index 07ff8046004dc..399e7f09eccb3 100644
--- a/ui/app/components/clients/line-chart.js
+++ b/ui/app/components/clients/line-chart.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 import { tracked } from '@glimmer/tracking';
@@ -54,12 +49,11 @@ export default class LineChart extends Component {
     const upgradeData = this.args.upgradeData;
     if (!upgradeData) return null;
     if (!Array.isArray(upgradeData)) {
-      console.debug('upgradeData must be an array of objects containing upgrade history'); // eslint-disable-line
+      console.debug('upgradeData must be an array of objects containing upgrade history');
       return null;
     } else if (!Object.keys(upgradeData[0]).includes('timestampInstalled')) {
-      // eslint-disable-next-line
       console.debug(
-        `upgrade must be an object with the following key names: ['version', 'previousVersion', 'timestampInstalled']`
+        `upgrade must be an object with the following key names: ['id', 'previousVersion', 'timestampInstalled']`
       );
       return null;
     } else {
@@ -187,14 +181,14 @@ export default class LineChart extends Component {
       this.tooltipTotal = formatNumber([data[this.yKey]]) + ' total clients';
       this.tooltipNew = (formatNumber([data?.new_clients[this.yKey]]) || '0') + ' new clients';
       this.tooltipUpgradeText = '';
-      const upgradeInfo = findUpgradeData(data);
+      let upgradeInfo = findUpgradeData(data);
       if (upgradeInfo) {
-        const { version, previousVersion } = upgradeInfo;
+        let { id, previousVersion } = upgradeInfo;
         this.tooltipUpgradeText = `Vault was upgraded 
-        ${previousVersion ? 'from ' + previousVersion : ''} to ${version}`;
+        ${previousVersion ? 'from ' + previousVersion : ''} to ${id}`;
       }
 
-      const node = hoverCircles.filter((plot) => plot[this.xKey] === data[this.xKey]).node();
+      let node = hoverCircles.filter((plot) => plot[this.xKey] === data[this.xKey]).node();
       this.tooltipTarget = node;
     });
   }
diff --git a/ui/app/components/clients/monthly-usage.js b/ui/app/components/clients/monthly-usage.js
index bebccaf869751..ea803875ce234 100644
--- a/ui/app/components/clients/monthly-usage.js
+++ b/ui/app/components/clients/monthly-usage.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { calculateAverage } from 'vault/utils/chart-helpers';
 
@@ -14,7 +9,7 @@ import { calculateAverage } from 'vault/utils/chart-helpers';
  * ```js
   <Clients::MonthlyUsage 
     @chartLegend={{this.chartLegend}} 
-    @responseTimestamp={{this.responseTimestamp}}
+    @timestamp={{this.responseTimestamp}}
     @verticalBarChartData={{this.byMonthActivityData}} 
   />
  * ```
diff --git a/ui/app/components/clients/running-total.js b/ui/app/components/clients/running-total.js
index 5413111fe38a8..6c3b09951b988 100644
--- a/ui/app/components/clients/running-total.js
+++ b/ui/app/components/clients/running-total.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { calculateAverage } from 'vault/utils/chart-helpers';
 
@@ -17,7 +12,8 @@ import { calculateAverage } from 'vault/utils/chart-helpers';
       <Clients::RunningTotal
         @chartLegend={{this.chartLegend}}
         @selectedNamespace={{this.selectedNamespace}}
-        @byMonthActivityData={{this.byMonth}}
+        @barChartData={{this.byMonthNewClients}}
+        @lineChartData={{this.byMonth}}
         @runningTotals={{this.runningTotals}}
         @upgradeData={{if this.countsIncludeOlderData this.latestUpgradeData}}
       />
@@ -25,44 +21,38 @@ import { calculateAverage } from 'vault/utils/chart-helpers';
 
  * @param {array} chartLegend - array of objects with key names 'key' and 'label' so data can be stacked
  * @param {string} selectedAuthMethod - string of auth method label for empty state message in bar chart
- * @param {array} byMonthActivityData - array of objects from /activity response, from the 'months' key, includes total and new clients per month
-    object structure: {
+ * @param {array} barChartData - array of objects from /activity response, from the 'months' key
+    object example: {
       month: '1/22',
       entity_clients: 23,
       non_entity_clients: 45,
-      clients: 68,
+      total: 68,
       namespaces: [],
       new_clients: {
         entity_clients: 11,
         non_entity_clients: 36,
-        clients: 47,
+        total: 47,
         namespaces: [],
       },
     };
+ * @param {array} lineChartData - array of objects from /activity response, from the 'months' key
  * @param {object} runningTotals - top level totals from /activity response { clients: 3517, entity_clients: 1593, non_entity_clients: 1924 }
- * @param {object} upgradeData -  object containing version upgrade data e.g.: {version: '1.9.0', previousVersion: null, timestampInstalled: '2021-11-03T10:23:16Z'}
+ * @param {object} upgradeData -  object containing version upgrade data e.g.: {id: '1.9.0', previousVersion: null, timestampInstalled: '2021-11-03T10:23:16Z'}
  * @param {string} timestamp -  ISO timestamp created in serializer to timestamp the response
  *
  */
 export default class RunningTotal extends Component {
-  get byMonthNewClients() {
-    if (this.args.byMonthActivityData) {
-      return this.args.byMonthActivityData?.map((m) => m.new_clients);
-    }
-    return null;
-  }
-
   get entityClientData() {
     return {
       runningTotal: this.args.runningTotals.entity_clients,
-      averageNewClients: calculateAverage(this.byMonthNewClients, 'entity_clients'),
+      averageNewClients: calculateAverage(this.args.barChartData, 'entity_clients') || '0',
     };
   }
 
   get nonEntityClientData() {
     return {
       runningTotal: this.args.runningTotals.non_entity_clients,
-      averageNewClients: calculateAverage(this.byMonthNewClients, 'non_entity_clients'),
+      averageNewClients: calculateAverage(this.args.barChartData, 'non_entity_clients') || '0',
     };
   }
 
@@ -80,7 +70,22 @@ export default class RunningTotal extends Component {
     );
   }
 
-  get singleMonthData() {
-    return this.args?.byMonthActivityData[0];
+  get showSingleMonth() {
+    if (this.args.lineChartData?.length === 1) {
+      const monthData = this.args?.lineChartData[0];
+      return {
+        total: {
+          total: monthData.clients,
+          entityClients: monthData.entity_clients,
+          nonEntityClients: monthData.non_entity_clients,
+        },
+        new: {
+          total: monthData.new_clients.clients,
+          entityClients: monthData.new_clients.entity_clients,
+          nonEntityClients: monthData.new_clients.non_entity_clients,
+        },
+      };
+    }
+    return null;
   }
 }
diff --git a/ui/app/components/clients/vertical-bar-chart.js b/ui/app/components/clients/vertical-bar-chart.js
index a0b51f206d2cf..6d10748674cb2 100644
--- a/ui/app/components/clients/vertical-bar-chart.js
+++ b/ui/app/components/clients/vertical-bar-chart.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 import { tracked } from '@glimmer/tracking';
@@ -98,15 +93,13 @@ export default class VerticalBarChart extends Component {
     const tooltipTether = chartSvg
       .append('g')
       .attr('transform', `translate(${BAR_WIDTH / 2})`)
-      .attr('data-test-vertical-chart', 'tooltip-tethers')
+      .attr('data-test-vertical-chart', 'tool-tip-tethers')
       .selectAll('circle')
       .data(filteredData)
       .enter()
       .append('circle')
-      .style('opacity', '0')
       .attr('cy', (d) => `${100 - yScale(d[this.yKey])}%`)
-      .attr('cx', (d) => xScale(d[this.xKey]))
-      .attr('r', 1);
+      .attr('cx', (d) => xScale(d[this.xKey]));
 
     // MAKE AXES //
     const yAxisScale = scaleLinear()
@@ -154,12 +147,12 @@ export default class VerticalBarChart extends Component {
 
     // MOUSE EVENT FOR TOOLTIP
     tooltipRect.on('mouseover', (data) => {
-      const hoveredMonth = data[this.xKey];
+      let hoveredMonth = data[this.xKey];
       this.tooltipTotal = `${formatNumber([data[this.yKey]])} ${data.new_clients ? 'total' : 'new'} clients`;
       this.entityClients = `${formatNumber([data.entity_clients])} entity clients`;
       this.nonEntityClients = `${formatNumber([data.non_entity_clients])} non-entity clients`;
       // filter for the tether point that matches the hoveredMonth
-      const hoveredElement = tooltipTether.filter((data) => data.month === hoveredMonth).node();
+      let hoveredElement = tooltipTether.filter((data) => data.month === hoveredMonth).node();
       this.tooltipTarget = hoveredElement; // grab the node from the list of rects
     });
   }
diff --git a/ui/app/components/cluster-info.js b/ui/app/components/cluster-info.js
new file mode 100644
index 0000000000000..e2f45efc28e2b
--- /dev/null
+++ b/ui/app/components/cluster-info.js
@@ -0,0 +1,27 @@
+import { inject as service } from '@ember/service';
+import Component from '@glimmer/component';
+
+/**
+ * @module ClusterInfo
+ *
+ * @example
+ * ```js
+ * <ClusterInfo @cluster={{cluster}} @onLinkClick={{action}} />
+ * ```
+ *
+ * @param {object} cluster - details of the current cluster, passed from the parent.
+ * @param {Function} onLinkClick - parent action which determines the behavior on link click
+ */
+export default class ClusterInfoComponent extends Component {
+  @service auth;
+  @service store;
+  @service version;
+
+  get activeCluster() {
+    return this.store.peekRecord('cluster', this.auth.activeCluster);
+  }
+
+  transitionToRoute() {
+    this.router.transitionTo(...arguments);
+  }
+}
diff --git a/ui/app/components/configure-aws-secret.js b/ui/app/components/configure-aws-secret.js
index 849ed34327e76..9e1aee011ad9d 100644
--- a/ui/app/components/configure-aws-secret.js
+++ b/ui/app/components/configure-aws-secret.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 
@@ -36,14 +31,12 @@ import { action } from '@ember/object';
  */
 export default class ConfigureAwsSecretComponent extends Component {
   @action
-  saveRootCreds(data, event) {
-    event.preventDefault();
+  saveRootCreds(data) {
     this.args.saveAWSRoot(data);
   }
 
   @action
-  saveLease(data, event) {
-    event.preventDefault();
+  saveLease(data) {
     this.args.saveAWSLease(data);
   }
 
diff --git a/ui/app/components/configure-ssh-secret.js b/ui/app/components/configure-ssh-secret.js
index d4474a494925a..562dd732e3588 100644
--- a/ui/app/components/configure-ssh-secret.js
+++ b/ui/app/components/configure-ssh-secret.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 
@@ -11,28 +6,19 @@ import { action } from '@ember/object';
  *
  * @example
  * ```js
- * <ConfigureSshSecret
- *    @model={{this.model}}
- *    @configured={{this.configured}}
- *    @saveConfig={{action "saveConfig"}}
- *    @loading={{this.loading}}
- *  />
+ *  <ConfigureSshSecret 
+      @model={{model}} 
+      @configured={{configured}} 
+      @saveConfig={{action "saveConfig"}} />
  * ```
  *
  * @param {string} model - ssh secret engine model
  * @param {Function} saveConfig - parent action which updates the configuration
- * @param {boolean} loading - property in parent that updates depending on status of parent's action
- *
+ * 
  */
 export default class ConfigureSshSecretComponent extends Component {
   @action
-  delete() {
-    this.args.saveConfig({ delete: true });
-  }
-
-  @action
-  saveConfig(event) {
-    event.preventDefault();
-    this.args.saveConfig({ delete: false });
+  saveConfig(data) {
+    this.args.saveConfig(data);
   }
 }
diff --git a/ui/app/components/console/command-input.js b/ui/app/components/console/command-input.js
index 62da662493d15..10aa19ef80f2e 100644
--- a/ui/app/components/console/command-input.js
+++ b/ui/app/components/console/command-input.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@ember/component';
 import keys from 'vault/lib/keycodes';
 
diff --git a/ui/app/components/console/log-help.js b/ui/app/components/console/log-help.js
new file mode 100644
index 0000000000000..55706477346c4
--- /dev/null
+++ b/ui/app/components/console/log-help.js
@@ -0,0 +1,3 @@
+import Component from '@ember/component';
+
+export default Component.extend({});
diff --git a/ui/app/components/console/log-json.js b/ui/app/components/console/log-json.js
index 78d4d342d1304..a176c260ede15 100644
--- a/ui/app/components/console/log-json.js
+++ b/ui/app/components/console/log-json.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@ember/component';
 
 export default Component.extend({
diff --git a/ui/app/components/console/log-list.js b/ui/app/components/console/log-list.js
index cdbe8c3c99a3b..28e226b39cd88 100644
--- a/ui/app/components/console/log-list.js
+++ b/ui/app/components/console/log-list.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { reads } from '@ember/object/computed';
 import Component from '@ember/component';
 
diff --git a/ui/app/components/console/log-object.js b/ui/app/components/console/log-object.js
index 3a256d362aabb..20ee00a3deff1 100644
--- a/ui/app/components/console/log-object.js
+++ b/ui/app/components/console/log-object.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { capitalize } from '@ember/string';
 import Component from '@ember/component';
 import { computed } from '@ember/object';
@@ -21,7 +16,7 @@ export function stringifyObjectValues(data) {
 export default Component.extend({
   content: null,
   columns: computed('content', function () {
-    const data = this.content;
+    let data = this.content;
     stringifyObjectValues(data);
 
     return columnify(data, {
diff --git a/ui/app/components/console/log-text.js b/ui/app/components/console/log-text.js
index d0b700430ead9..ebd80a51ec193 100644
--- a/ui/app/components/console/log-text.js
+++ b/ui/app/components/console/log-text.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@ember/component';
 
 export default Component.extend({
diff --git a/ui/app/components/console/output-log.js b/ui/app/components/console/output-log.js
index 16e6b15f25360..c2993f582d5da 100644
--- a/ui/app/components/console/output-log.js
+++ b/ui/app/components/console/output-log.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@ember/component';
 
 export default Component.extend({
diff --git a/ui/app/components/console/ui-panel.js b/ui/app/components/console/ui-panel.js
index 9b1194703201c..572dec8065ea3 100644
--- a/ui/app/components/console/ui-panel.js
+++ b/ui/app/components/console/ui-panel.js
@@ -1,24 +1,17 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import { alias, or } from '@ember/object/computed';
 import Component from '@ember/component';
 import { getOwner } from '@ember/application';
 import { schedule } from '@ember/runloop';
-import { camelize } from '@ember/string';
 import { task } from 'ember-concurrency';
 import ControlGroupError from 'vault/lib/control-group-error';
 import {
   parseCommand,
+  extractDataAndFlags,
   logFromResponse,
   logFromError,
-  formattedErrorFromInput,
+  logErrorFromInput,
   executeUICommand,
-  extractFlagsFromStrings,
-  extractDataFromStrings,
 } from 'vault/lib/console-helpers';
 
 export default Component.extend({
@@ -49,7 +42,7 @@ export default Component.extend({
 
   executeCommand: task(function* (command, shouldThrow = false) {
     this.set('inputValue', '');
-    const service = this.console;
+    let service = this.console;
     let serviceArgs;
 
     if (
@@ -66,25 +59,29 @@ export default Component.extend({
 
     // parse to verify it's valid
     try {
-      serviceArgs = parseCommand(command);
+      serviceArgs = parseCommand(command, shouldThrow);
     } catch (e) {
-      if (shouldThrow) {
-        this.logAndOutput(command, { type: 'help' });
-      }
+      this.logAndOutput(command, { type: 'help' });
+      return;
+    }
+    // we have a invalid command but don't want to throw
+    if (serviceArgs === false) {
       return;
     }
 
-    const { method, flagArray, path, dataArray } = serviceArgs;
-    const flags = extractFlagsFromStrings(flagArray, method);
-    const data = extractDataFromStrings(dataArray);
+    let [method, flagArray, path, dataArray] = serviceArgs;
+
+    if (dataArray || flagArray) {
+      var { data, flags } = extractDataAndFlags(method, dataArray, flagArray);
+    }
 
-    const inputError = formattedErrorFromInput(path, method, flags, dataArray);
+    let inputError = logErrorFromInput(path, method, flags, dataArray);
     if (inputError) {
       this.logAndOutput(command, inputError);
       return;
     }
     try {
-      const resp = yield service[camelize(method)].call(service, path, data, flags);
+      let resp = yield service[method].call(service, path, data, flags.wrapTTL);
       this.logAndOutput(command, logFromResponse(resp, path, method, flags));
     } catch (error) {
       if (error instanceof ControlGroupError) {
@@ -95,8 +92,8 @@ export default Component.extend({
   }),
 
   refreshRoute: task(function* () {
-    const owner = getOwner(this);
-    const currentRoute = owner.lookup(`router:main`).get('currentRouteName');
+    let owner = getOwner(this);
+    let currentRoute = owner.lookup(`router:main`).get('currentRouteName');
 
     try {
       this.store.clearAllDatasets();
@@ -108,7 +105,7 @@ export default Component.extend({
   }),
 
   routeToExplore: task(function* (command) {
-    const filter = command.replace('api', '').trim();
+    let filter = command.replace('api', '').trim();
     let content =
       'Welcome to the Vault API explorer! \nYou can search for endpoints, see what parameters they accept, and even execute requests with your current token.';
     if (filter) {
diff --git a/ui/app/components/control-group-success.js b/ui/app/components/control-group-success.js
index be586f242a64a..6c64cab571c2f 100644
--- a/ui/app/components/control-group-success.js
+++ b/ui/app/components/control-group-success.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import Component from '@ember/component';
 import { task } from 'ember-concurrency';
@@ -21,10 +16,10 @@ export default Component.extend({
   unwrapData: null,
 
   unwrap: task(function* (token) {
-    const adapter = this.store.adapterFor('tools');
+    let adapter = this.store.adapterFor('tools');
     this.set('error', null);
     try {
-      const response = yield adapter.toolAction('unwrap', null, { clientToken: token });
+      let response = yield adapter.toolAction('unwrap', null, { clientToken: token });
       this.set('unwrapData', response.auth || response.data);
       this.controlGroup.deleteControlGroupToken(this.model.id);
     } catch (e) {
@@ -34,7 +29,7 @@ export default Component.extend({
 
   markAndNavigate: task(function* () {
     this.controlGroup.markTokenForUnwrap(this.model.id);
-    const { url } = this.controlGroupResponse.uiParams;
+    let { url } = this.controlGroupResponse.uiParams;
     yield this.router.transitionTo(url);
   }).drop(),
 });
diff --git a/ui/app/components/control-group.js b/ui/app/components/control-group.js
index 64de0562f34a8..50f10e180877a 100644
--- a/ui/app/components/control-group.js
+++ b/ui/app/components/control-group.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import { alias, or } from '@ember/object/computed';
 import Component from '@ember/component';
@@ -19,8 +14,8 @@ export default Component.extend({
 
   didReceiveAttrs() {
     this._super(...arguments);
-    const accessor = this.model.id;
-    const data = this.controlGroup.wrapInfoForAccessor(accessor);
+    let accessor = this.model.id;
+    let data = this.controlGroup.wrapInfoForAccessor(accessor);
     this.set('controlGroupResponse', data);
   },
 
@@ -32,13 +27,13 @@ export default Component.extend({
   }),
 
   currentUserHasAuthorized: computed('currentUserEntityId', 'model.authorizations.@each.id', function () {
-    const authorizations = this.model.authorizations || [];
+    let authorizations = this.model.authorizations || [];
     return Boolean(authorizations.findBy('id', this.currentUserEntityId));
   }),
 
   isSuccess: or('currentUserHasAuthorized', 'model.approved'),
   requestorName: computed('currentUserIsRequesting', 'model.requestEntity', function () {
-    const entity = this.model.requestEntity;
+    let entity = this.model.requestEntity;
 
     if (this.currentUserIsRequesting) {
       return 'You';
@@ -60,8 +55,8 @@ export default Component.extend({
   }),
 
   bannerText: computed('model.approved', 'currentUserIsRequesting', 'currentUserHasAuthorized', function () {
-    const isApproved = this.model.approved;
-    const { currentUserHasAuthorized, currentUserIsRequesting } = this;
+    let isApproved = this.model.approved;
+    let { currentUserHasAuthorized, currentUserIsRequesting } = this;
     if (currentUserHasAuthorized) {
       return 'You have given authorization';
     }
diff --git a/ui/app/components/database-connection.js b/ui/app/components/database-connection.js
index b396e35c537e9..625919d94f2a6 100644
--- a/ui/app/components/database-connection.js
+++ b/ui/app/components/database-connection.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
@@ -32,7 +27,7 @@ export default class DatabaseConnectionEdit extends Component {
   showSaveModal = false; // used for create mode
 
   rotateCredentials(backend, name) {
-    const adapter = this.store.adapterFor('database/connection');
+    let adapter = this.store.adapterFor('database/connection');
     return adapter.rotateRootCredentials(backend, name);
   }
 
@@ -58,8 +53,8 @@ export default class DatabaseConnectionEdit extends Component {
   @action
   async handleCreateConnection(evt) {
     evt.preventDefault();
-    const secret = this.args.model;
-    const secretId = secret.name;
+    let secret = this.args.model;
+    let secretId = secret.name;
     secret.set('id', secretId);
     secret
       .save()
@@ -97,8 +92,8 @@ export default class DatabaseConnectionEdit extends Component {
   @action
   handleUpdateConnection(evt) {
     evt.preventDefault();
-    const secret = this.args.model;
-    const secretId = secret.name;
+    let secret = this.args.model;
+    let secretId = secret.name;
     secret
       .save()
       .then(() => {
@@ -123,7 +118,7 @@ export default class DatabaseConnectionEdit extends Component {
   @action
   reset() {
     const { name, backend } = this.args.model;
-    const adapter = this.store.adapterFor('database/connection');
+    let adapter = this.store.adapterFor('database/connection');
     adapter
       .resetConnection(backend, name)
       .then(() => {
diff --git a/ui/app/components/database-role-edit.js b/ui/app/components/database-role-edit.js
index 8f0c0003100a0..c53b4e81901d9 100644
--- a/ui/app/components/database-role-edit.js
+++ b/ui/app/components/database-role-edit.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
@@ -26,7 +21,7 @@ export default class DatabaseRoleEdit extends Component {
   @tracked loading = false;
 
   get warningMessages() {
-    const warnings = {};
+    let warnings = {};
     if (this.args.model.canUpdateDb === false) {
       warnings.database = `You don’t have permissions to update this database connection, so this role cannot be created.`;
     }
@@ -68,7 +63,7 @@ export default class DatabaseRoleEdit extends Component {
         try {
           this.router.transitionTo(LIST_ROOT_ROUTE, backend, { queryParams: { tab: 'role' } });
         } catch (e) {
-          console.debug(e); // eslint-disable-line
+          console.debug(e);
         }
       })
       .catch((e) => {
@@ -82,11 +77,11 @@ export default class DatabaseRoleEdit extends Component {
     this.loading = true;
 
     const mode = this.args.mode;
-    const roleSecret = this.args.model;
-    const secretId = roleSecret.name;
+    let roleSecret = this.args.model;
+    let secretId = roleSecret.name;
     if (mode === 'create') {
       roleSecret.set('id', secretId);
-      const path = roleSecret.type === 'static' ? 'static-roles' : 'roles';
+      let path = roleSecret.type === 'static' ? 'static-roles' : 'roles';
       roleSecret.set('path', path);
     }
     roleSecret
@@ -95,7 +90,7 @@ export default class DatabaseRoleEdit extends Component {
         try {
           this.router.transitionTo(SHOW_ROUTE, `role/${secretId}`);
         } catch (e) {
-          console.debug(e); // eslint-disable-line
+          console.debug(e);
         }
       })
       .catch((e) => {
@@ -109,7 +104,7 @@ export default class DatabaseRoleEdit extends Component {
   @action
   rotateRoleCred(id) {
     const backend = this.args.model?.backend;
-    const adapter = this.store.adapterFor('database/credential');
+    let adapter = this.store.adapterFor('database/credential');
     adapter
       .rotateRoleCredentials(backend, id)
       .then(() => {
diff --git a/ui/app/components/database-role-setting-form.js b/ui/app/components/database-role-setting-form.js
index c45b2d47a3897..9107c38b20a1e 100644
--- a/ui/app/components/database-role-setting-form.js
+++ b/ui/app/components/database-role-setting-form.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { getStatementFields, getRoleFields } from '../utils/database-helpers';
 
@@ -24,7 +19,7 @@ import { getStatementFields, getRoleFields } from '../utils/database-helpers';
 export default class DatabaseRoleSettingForm extends Component {
   get settingFields() {
     if (!this.args.roleType) return null;
-    const dbValidFields = getRoleFields(this.args.roleType);
+    let dbValidFields = getRoleFields(this.args.roleType);
     return this.args.attrs.filter((a) => {
       return dbValidFields.includes(a.name);
     });
@@ -34,7 +29,7 @@ export default class DatabaseRoleSettingForm extends Component {
     const type = this.args.roleType;
     const plugin = this.args.dbType;
     if (!type) return null;
-    const dbValidFields = getStatementFields(type, plugin);
+    let dbValidFields = getStatementFields(type, plugin);
     return this.args.attrs.filter((a) => {
       return dbValidFields.includes(a.name);
     });
diff --git a/ui/app/components/date-dropdown.js b/ui/app/components/date-dropdown.js
index e2ad4ade81919..bf9df37543979 100644
--- a/ui/app/components/date-dropdown.js
+++ b/ui/app/components/date-dropdown.js
@@ -1,85 +1,53 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 import { tracked } from '@glimmer/tracking';
-import { ARRAY_OF_MONTHS } from 'core/utils/date-formatters';
-import timestamp from 'core/utils/timestamp';
+
 /**
  * @module DateDropdown
- * DateDropdown components are used to display a dropdown of months and years to handle date selection. Future dates are disabled (current month and year are selectable).
- * The component returns an object with selected date info, example: { dateType: 'start', monthIdx: 0, monthName: 'January', year: 2022 }
+ * DateDropdown components are used to display a dropdown of months and years to handle date selection
  *
  * @example
  * ```js
- * <DateDropdown @handleSubmit={{this.actionFromParent}} @name="startTime" @submitText="Save" @handleCancel={{this.onCancel}}/>
+ * <DateDropdown @handleDateSelection={this.actionFromParent} @name={{"startTime"}} @submitText="Save"/>
  * ```
- * @param {function} handleSubmit - callback function from parent that the date picker triggers on submit
- * @param {function} [handleCancel] - optional callback for cancel action, if exists then buttons appear modal style with a light gray background
- * @param {string} [dateType] - optional argument to give the selected month/year a type
+ * @param {function} handleDateSelection - is the action from the parent that the date picker triggers
+ * @param {string} [name] - optional argument passed from date dropdown to parent function
  * @param {string} [submitText] - optional argument to change submit button text
- * @param {function} [validateDate] - parent function to validate date selection, receives date object and returns an error message that's passed to the inline alert
  */
 export default class DateDropdown extends Component {
-  currentDate = timestamp.now();
+  currentDate = new Date();
   currentYear = this.currentDate.getFullYear(); // integer of year
-  currentMonthIdx = this.currentDate.getMonth(); // integer of month, 0 indexed
-  dropdownMonths = ARRAY_OF_MONTHS.map((m, i) => ({ name: m, index: i }));
-  dropdownYears = Array.from({ length: 5 }, (item, i) => this.currentYear - i);
+  currentMonth = this.currentDate.getMonth(); // index of month
 
-  @tracked maxMonthIdx = 11; // disables months with index greater than this number, initially all months are selectable
-  @tracked disabledYear = null; // year as integer if current year should be disabled
-  @tracked selectedMonth = null;
-  @tracked selectedYear = null;
-  @tracked invalidDate = null;
+  @tracked allowedMonthMax = 12;
+  @tracked disabledYear = null;
+  @tracked startMonth = null;
+  @tracked startYear = null;
 
-  @action
-  selectMonth(month, dropdown) {
-    this.selectedMonth = month;
-    // disable current year if selected month is later than current month
-    this.disabledYear = month.index > this.currentMonthIdx ? this.currentYear : null;
-    dropdown.close();
-  }
+  months = Array.from({ length: 12 }, (item, i) => {
+    return new Date(0, i).toLocaleString('en-US', { month: 'long' });
+  });
+  years = Array.from({ length: 5 }, (item, i) => {
+    return new Date().getFullYear() - i;
+  });
 
   @action
-  selectYear(year, dropdown) {
-    this.selectedYear = year;
-    // disable months after current month if selected year is current year
-    this.maxMonthIdx = year === this.currentYear ? this.currentMonthIdx : 11;
-    dropdown.close();
+  selectStartMonth(month, event) {
+    this.startMonth = month;
+    // disables months if in the future
+    this.disabledYear = this.months.indexOf(month) >= this.currentMonth ? this.currentYear : null;
+    event.close();
   }
 
   @action
-  handleSubmit() {
-    if (this.args.validateDate) {
-      this.invalidDate = null;
-      this.invalidDate = this.args.validateDate(new Date(this.selectedYear, this.selectedMonth.index));
-      if (this.invalidDate) return;
-    }
-    const { index, name } = this.selectedMonth;
-    this.args.handleSubmit({
-      monthIdx: index,
-      monthName: name,
-      year: this.selectedYear,
-      dateType: this.args.dateType,
-    });
-    this.resetDropdown();
+  selectStartYear(year, event) {
+    this.startYear = year;
+    this.allowedMonthMax = year === this.currentYear ? this.currentMonth : 12;
+    event.close();
   }
 
   @action
-  handleCancel() {
-    this.args.handleCancel();
-    this.resetDropdown();
-  }
-
-  resetDropdown() {
-    this.maxMonthIdx = 11;
-    this.disabledYear = null;
-    this.selectedMonth = null;
-    this.selectedYear = null;
-    this.invalidDate = null;
+  saveDateSelection() {
+    this.args.handleDateSelection(this.startMonth, this.startYear, this.args.name);
   }
 }
diff --git a/ui/app/components/diff-version-selector.js b/ui/app/components/diff-version-selector.js
index dd0069fb7ebc4..76a43a0f0a485 100644
--- a/ui/app/components/diff-version-selector.js
+++ b/ui/app/components/diff-version-selector.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /* eslint-disable no-undef */
 import Component from '@glimmer/component';
 import { inject as service } from '@ember/service';
@@ -37,14 +32,14 @@ export default class DiffVersionSelector extends Component {
   }
 
   get leftSideDataInit() {
-    const string = `["${this.args.model.engineId}", "${this.args.model.id}", "${this.args.model.currentVersion}"]`;
+    let string = `["${this.args.model.engineId}", "${this.args.model.id}", "${this.args.model.currentVersion}"]`;
     return this.adapter
       .querySecretDataByVersion(string)
       .then((response) => response.data)
       .catch(() => null);
   }
   get rightSideDataInit() {
-    const string = `["${this.args.model.engineId}", "${this.args.model.id}", "${this.rightSideVersionInit}"]`;
+    let string = `["${this.args.model.engineId}", "${this.args.model.id}", "${this.rightSideVersionInit}"]`;
     return this.adapter
       .querySecretDataByVersion(string)
       .then((response) => response.data)
@@ -56,14 +51,13 @@ export default class DiffVersionSelector extends Component {
   }
 
   async createVisualDiff() {
-    const diffpatcher = jsondiffpatch.create({});
-    const leftSideVersionData = this.leftSideVersionDataSelected || (await this.leftSideDataInit);
-    const rightSideVersionData = this.rightSideVersionDataSelected || (await this.rightSideDataInit);
-    const delta = diffpatcher.diff(rightSideVersionData, leftSideVersionData);
+    let diffpatcher = jsondiffpatch.create({});
+    let leftSideVersionData = this.leftSideVersionDataSelected || (await this.leftSideDataInit);
+    let rightSideVersionData = this.rightSideVersionDataSelected || (await this.rightSideDataInit);
+    let delta = diffpatcher.diff(rightSideVersionData, leftSideVersionData);
     if (delta === undefined) {
       this.statesMatch = true;
-      // params: value, replacer (all properties included), space (white space and indentation, line break, etc.)
-      this.visualDiff = JSON.stringify(leftSideVersionData, undefined, 2);
+      this.visualDiff = JSON.stringify(leftSideVersionData, undefined, 2); // params: value, replacer (all properties included), space (white space and indentation, line break, etc.)
     } else {
       this.statesMatch = false;
       this.visualDiff = jsondiffpatch.formatters.html.format(delta, rightSideVersionData);
@@ -72,8 +66,8 @@ export default class DiffVersionSelector extends Component {
 
   @action
   async selectVersion(selectedVersion, actions, side) {
-    const string = `["${this.args.model.engineId}", "${this.args.model.id}", "${selectedVersion}"]`;
-    const secretData = await this.adapter.querySecretDataByVersion(string);
+    let string = `["${this.args.model.engineId}", "${this.args.model.id}", "${selectedVersion}"]`;
+    let secretData = await this.adapter.querySecretDataByVersion(string);
     if (side === 'left') {
       this.leftSideVersionDataSelected = secretData.data;
       this.leftSideVersionSelected = selectedVersion;
diff --git a/ui/app/components/file-to-array-buffer.js b/ui/app/components/file-to-array-buffer.js
index bdb14f4fd9c01..fb738e4cda46a 100644
--- a/ui/app/components/file-to-array-buffer.js
+++ b/ui/app/components/file-to-array-buffer.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@ember/component';
 import filesize from 'filesize';
 
@@ -28,7 +23,7 @@ export default Component.extend({
   fileHelpText: null,
 
   file: null,
-  filename: null,
+  fileName: null,
   fileSize: null,
   fileLastModified: null,
 
@@ -44,7 +39,7 @@ export default Component.extend({
 
   actions: {
     pickedFile(e) {
-      const { files } = e.target;
+      let { files } = e.target;
       if (!files.length) {
         return;
       }
@@ -56,10 +51,10 @@ export default Component.extend({
       this.send('onChange');
     },
     onChange(fileAsBytes, fileMeta) {
-      const { name, size, lastModifiedDate } = fileMeta || {};
-      const fileSize = size ? filesize(size) : null;
+      let { name, size, lastModifiedDate } = fileMeta || {};
+      let fileSize = size ? filesize(size) : null;
       this.set('file', fileAsBytes);
-      this.set('filename', name);
+      this.set('fileName', name);
       this.set('fileSize', fileSize);
       this.set('fileLastModified', lastModifiedDate);
       this.onChange(fileAsBytes, name);
diff --git a/ui/app/components/flash-message.js b/ui/app/components/flash-message.js
index fc6ca31ed29ad..788e0a34caebc 100644
--- a/ui/app/components/flash-message.js
+++ b/ui/app/components/flash-message.js
@@ -1,15 +1,15 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
+import { computed } from '@ember/object';
 import FlashMessage from 'ember-cli-flash/components/flash-message';
 
-export default class FlashMessageComponent extends FlashMessage {
+export default FlashMessage.extend({
   // override alertType to get Bulma specific prefix
-  //https://github.com/poteto/ember-cli-flash/blob/master/addon/components/flash-message.js#L55
-  get alertType() {
-    const flashType = this.args.flash.type || '';
-    return `is-${flashType}`;
-  }
-}
+  //https://github.com/poteto/ember-cli-flash/blob/master/addon/components/flash-message.js#L35
+  alertType: computed('flash.type', {
+    get() {
+      const flashType = this.flash.type || '';
+      let prefix = 'is-';
+
+      return `${prefix}${flashType}`;
+    },
+  }),
+});
diff --git a/ui/app/components/generate-credentials-database.js b/ui/app/components/generate-credentials-database.js
index 042b4623f9558..5cead9e9d31b2 100644
--- a/ui/app/components/generate-credentials-database.js
+++ b/ui/app/components/generate-credentials-database.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /**
  * @module GenerateCredentialsDatabase
  * GenerateCredentialsDatabase component is used on the credentials route for the Database metrics.
diff --git a/ui/app/components/generate-credentials.js b/ui/app/components/generate-credentials.js
index 055d67878badf..975c4f85e6ef6 100644
--- a/ui/app/components/generate-credentials.js
+++ b/ui/app/components/generate-credentials.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import { computed, set } from '@ember/object';
 import Component from '@ember/component';
@@ -63,9 +58,7 @@ export default Component.extend({
   },
 
   willDestroy() {
-    if (!this.model.isDestroyed && !this.model.isDestroying) {
-      this.model.unloadRecord();
-    }
+    this.model.unloadRecord();
     this._super(...arguments);
   },
 
@@ -93,7 +86,7 @@ export default Component.extend({
 
   actions: {
     create() {
-      const model = this.model;
+      let model = this.model;
       this.set('loading', true);
       this.model.save().finally(() => {
         model.set('hasGenerated', true);
diff --git a/ui/app/components/generated-item-list.js b/ui/app/components/generated-item-list.js
index 7a25dfd84df14..8e1f8e6a7c6fc 100644
--- a/ui/app/components/generated-item-list.js
+++ b/ui/app/components/generated-item-list.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
@@ -36,7 +31,7 @@ export default class GeneratedItemList extends Component {
 
   @action
   refreshItemList() {
-    const route = getOwner(this).lookup(`route:${this.router.currentRouteName}`);
+    let route = getOwner(this).lookup(`route:${this.router.currentRouteName}`);
     this.store.clearAllDatasets();
     route.refresh();
   }
diff --git a/ui/app/components/generated-item.js b/ui/app/components/generated-item.js
index 63f56b23ecd6d..f46e3fdbd0f21 100644
--- a/ui/app/components/generated-item.js
+++ b/ui/app/components/generated-item.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import AdapterError from '@ember-data/adapter/error';
 import { inject as service } from '@ember/service';
 import Component from '@ember/component';
@@ -53,13 +48,23 @@ export default Component.extend({
   ),
   init() {
     this._super(...arguments);
+    this.model.fieldGroups.forEach((element) => {
+      // overwriting the helpText for Token Polices.
+      // HelpText from the backend says add a comma separated list, which works on the CLI but not here on the UI.
+      // This effects TLS Certificates, Userpass, and Kubernetes. https://github.com/hashicorp/vault/issues/10346
+      if (element.Tokens) {
+        element.Tokens.find((attr) => attr.name === 'tokenPolicies').options.helpText =
+          'Add policies that will apply to the generated token for this user. One policy per row.';
+      }
+    });
+
     if (this.mode === 'edit') {
       // For validation to work in edit mode,
       // reconstruct the model values from field group
       this.model.fieldGroups.forEach((element) => {
         if (element.default) {
           element.default.forEach((attr) => {
-            const fieldValue = attr.options && attr.options.fieldValue;
+            let fieldValue = attr.options && attr.options.fieldValue;
             if (fieldValue) {
               this.model[attr.name] = this.model[fieldValue];
             }
diff --git a/ui/app/components/get-credentials-card.js b/ui/app/components/get-credentials-card.js
index 60ff42e335092..723b5cf3cd61f 100644
--- a/ui/app/components/get-credentials-card.js
+++ b/ui/app/components/get-credentials-card.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /**
  * @module GetCredentialsCard
  * GetCredentialsCard components are card-like components that display a title, and SearchSelect component that sends you to a credentials route for the selected item.
@@ -12,14 +7,14 @@
  * ```js
  * <GetCredentialsCard @title="Get Credentials" @searchLabel="Role to use" @models={{array 'database/roles'}} @type="role" @backend={{model.backend}}/>
  * ```
- * @param {string} title - The title displays the card title
- * @param {string} searchLabel - The text above the searchSelect component
- * @param {array} models - An array of model types to fetch from the API. Passed through to SearchSelect component
- * @param {string} type - 'role' or 'secret' - determines where the transitionTo goes
- * @param {boolean} [renderInputSearch=false] - If true, renders InputSearch instead of SearchSelect
- * @param {string} [subText] - Text below title
- * @param {string} [placeholder] - Input placeholder text (default for SearchSelect is 'Search', none for InputSearch)
- * @param {string} backend - Passed to SearchSelect query method to fetch dropdown options
+ * @param title=null {String} - The title displays the card title
+ * @param searchLabel=null {String} - The text above the searchSelect component
+ * @param models=null {Array} - An array of model types to fetch from the API.  Passed through to SearchSelect component
+ * @param type=null {String} - Determines where the transitionTo goes. If role to backend.credentials, if secret backend.show
+ * @param shouldUseFallback=[false] {Boolean} - If true the input is used instead of search select.
+ * @param subText=[null] {String} - Text below title
+ * @param placeHolder=[null] {String} - Only works if shouldUseFallback is true. Displays the helper text inside the input.
+ * @param backend=null {String} - Name of the backend to look up on search.
  */
 
 import Component from '@glimmer/component';
@@ -32,10 +27,6 @@ export default class GetCredentialsCard extends Component {
   @tracked role = '';
   @tracked secret = '';
 
-  get buttonDisabled() {
-    return !this.role && !this.secret;
-  }
-
   @action
   transitionToCredential() {
     const role = this.role;
@@ -48,8 +39,11 @@ export default class GetCredentialsCard extends Component {
     }
   }
 
+  get buttonDisabled() {
+    return !this.role && !this.secret;
+  }
   @action
-  handleInput(value) {
+  handleRoleInput(value) {
     if (this.args.type === 'role') {
       // if it comes in from the fallback component then the value is a string otherwise it's an array
       // which currently only happens if type is role.
diff --git a/ui/app/components/home-link.js b/ui/app/components/home-link.js
new file mode 100644
index 0000000000000..6d406c0d247d0
--- /dev/null
+++ b/ui/app/components/home-link.js
@@ -0,0 +1,28 @@
+import Component from '@glimmer/component';
+
+/**
+ * @module HomeLink
+ * `HomeLink` is a span that contains either the text `home` or the `LogoEdition` component.
+ *
+ * @example
+ * ```js
+ * <HomeLink @class="navbar-item splash-page-logo">
+ *  <LogoEdition />
+ * </HomeLink>
+ * ```
+ * @param {string} class - Classes attached to the the component.
+ * @param {string} text - Text displayed instead of logo.
+ *
+ * @see {@link https://github.com/hashicorp/vault/search?l=Handlebars&q=HomeLink|Uses of HomeLink}
+ * @see {@link https://github.com/hashicorp/vault/blob/main/ui/app/components/home-link.js|HomeLink Source Code}
+ */
+
+export default class HomeLink extends Component {
+  get text() {
+    return 'home';
+  }
+
+  get computedClasses() {
+    return this.classNames.join(' ');
+  }
+}
diff --git a/ui/app/components/hover-copy-button.js b/ui/app/components/hover-copy-button.js
index 862e79c0beb22..fc2a6705e2760 100644
--- a/ui/app/components/hover-copy-button.js
+++ b/ui/app/components/hover-copy-button.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 
diff --git a/ui/app/components/identity/_popup-base.js b/ui/app/components/identity/_popup-base.js
index 6d84afdff6ca4..eeda69e0d714e 100644
--- a/ui/app/components/identity/_popup-base.js
+++ b/ui/app/components/identity/_popup-base.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import { assert } from '@ember/debug';
 import Component from '@ember/component';
@@ -30,8 +25,8 @@ export default Component.extend({
 
   actions: {
     performTransaction() {
-      const args = [...arguments];
-      const messageArgs = this.messageArgs(...args);
+      let args = [...arguments];
+      let messageArgs = this.messageArgs(...args);
       return this.transaction(...args)
         .then(() => {
           this.onSuccess();
diff --git a/ui/app/components/identity/edit-form.js b/ui/app/components/identity/edit-form.js
index 1668fc8afe696..ae8b6c148e9d1 100644
--- a/ui/app/components/identity/edit-form.js
+++ b/ui/app/components/identity/edit-form.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import Component from '@ember/component';
 import { computed } from '@ember/object';
@@ -27,8 +22,8 @@ export default Component.extend({
   onSave: () => {},
 
   cancelLink: computed('mode', 'model.identityType', function () {
-    const { model, mode } = this;
-    const routes = {
+    let { model, mode } = this;
+    let routes = {
       'create-entity': 'vault.cluster.access.identity',
       'edit-entity': 'vault.cluster.access.identity.show',
       'merge-entity-merge': 'vault.cluster.access.identity',
@@ -39,14 +34,14 @@ export default Component.extend({
       'create-group-alias': 'vault.cluster.access.identity.aliases',
       'edit-group-alias': 'vault.cluster.access.identity.aliases.show',
     };
-    const key = model ? `${mode}-${model.identityType}` : 'merge-entity-alias';
+    let key = model ? `${mode}-${model.identityType}` : 'merge-entity-alias';
     return routes[key];
   }),
 
   getMessage(model, isDelete = false) {
-    const mode = this.mode;
-    const typeDisplay = humanize([model.identityType]);
-    const action = isDelete ? 'deleted' : 'saved';
+    let mode = this.mode;
+    let typeDisplay = humanize([model.identityType]);
+    let action = isDelete ? 'deleted' : 'saved';
     if (mode === 'merge') {
       return 'Successfully merged entities';
     }
@@ -58,8 +53,8 @@ export default Component.extend({
 
   save: task(
     waitFor(function* () {
-      const model = this.model;
-      const message = this.getMessage(model);
+      let model = this.model;
+      let message = this.getMessage(model);
 
       try {
         yield model.save();
@@ -74,7 +69,7 @@ export default Component.extend({
 
   willDestroy() {
     this._super(...arguments);
-    const model = this.model;
+    let model = this.model;
     if (!model) return;
     if ((model.get('isDirty') && !model.isDestroyed) || !model.isDestroying) {
       model.rollbackAttributes();
@@ -83,8 +78,8 @@ export default Component.extend({
 
   actions: {
     deleteItem(model) {
-      const message = this.getMessage(model, true);
-      const flash = this.flashMessages;
+      let message = this.getMessage(model, true);
+      let flash = this.flashMessages;
       model.destroyRecord().then(() => {
         flash.success(message);
         return this.onSave({ saveType: 'delete', model });
diff --git a/ui/app/components/identity/entity-nav.js b/ui/app/components/identity/entity-nav.js
index 34319e25f735e..55706477346c4 100644
--- a/ui/app/components/identity/entity-nav.js
+++ b/ui/app/components/identity/entity-nav.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@ember/component';
 
 export default Component.extend({});
diff --git a/ui/app/components/identity/item-details.js b/ui/app/components/identity/item-details.js
index d1661d90c368b..be4495673f568 100644
--- a/ui/app/components/identity/item-details.js
+++ b/ui/app/components/identity/item-details.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import Component from '@ember/component';
 
diff --git a/ui/app/components/identity/lookup-input.js b/ui/app/components/identity/lookup-input.js
index 4c2eb523f22cc..b974b9a8f771f 100644
--- a/ui/app/components/identity/lookup-input.js
+++ b/ui/app/components/identity/lookup-input.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import Component from '@ember/component';
 import { task } from 'ember-concurrency';
@@ -32,14 +27,14 @@ export default Component.extend({
   },
 
   adapter() {
-    const type = this.type;
-    const store = this.store;
+    let type = this.type;
+    let store = this.store;
     return store.adapterFor(`identity/${type}`);
   },
 
   data() {
-    const { param, paramValue, aliasMountAccessor } = this;
-    const data = {};
+    let { param, paramValue, aliasMountAccessor } = this;
+    let data = {};
 
     data[underscore([param])] = paramValue;
     if (param === 'alias name') {
@@ -49,10 +44,10 @@ export default Component.extend({
   },
 
   lookup: task(function* () {
-    const flash = this.flashMessages;
-    const type = this.type;
-    const store = this.store;
-    const { param, paramValue } = this;
+    let flash = this.flashMessages;
+    let type = this.type;
+    let store = this.store;
+    let { param, paramValue } = this;
     let response;
     try {
       response = yield this.adapter().lookup(store, this.data());
diff --git a/ui/app/components/identity/popup-alias.js b/ui/app/components/identity/popup-alias.js
index b69bd5d836495..20852421c4b7c 100644
--- a/ui/app/components/identity/popup-alias.js
+++ b/ui/app/components/identity/popup-alias.js
@@ -1,14 +1,9 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Base from './_popup-base';
 
 export default Base.extend({
   messageArgs(model) {
-    const type = model.get('identityType');
-    const id = model.id;
+    let type = model.get('identityType');
+    let id = model.id;
     return [type, id];
   },
 
@@ -17,7 +12,7 @@ export default Base.extend({
   },
 
   errorMessage(e, type, id) {
-    const error = e.errors ? e.errors.join(' ') : e.message;
+    let error = e.errors ? e.errors.join(' ') : e.message;
     return `There was a problem deleting ${type}: ${id} - ${error}`;
   },
 
diff --git a/ui/app/components/identity/popup-members.js b/ui/app/components/identity/popup-members.js
index 9703ef89ee7c4..de724f9871b28 100644
--- a/ui/app/components/identity/popup-members.js
+++ b/ui/app/components/identity/popup-members.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { alias } from '@ember/object/computed';
 import { computed } from '@ember/object';
 import Base from './_popup-base';
@@ -27,12 +22,12 @@ export default Base.extend({
   },
 
   errorMessage(e, model, groupArray, memberId) {
-    const error = e.errors ? e.errors.join(' ') : e.message;
+    let error = e.errors ? e.errors.join(' ') : e.message;
     return `There was a problem removing '${memberId}' from the group - ${error}`;
   },
 
   transaction(model, groupArray, memberId) {
-    const members = model.get(groupArray);
+    let members = model.get(groupArray);
     model.set(groupArray, members.without(memberId));
     return model.save();
   },
diff --git a/ui/app/components/identity/popup-metadata.js b/ui/app/components/identity/popup-metadata.js
index 899f5565e2217..6afc27e646cb4 100644
--- a/ui/app/components/identity/popup-metadata.js
+++ b/ui/app/components/identity/popup-metadata.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Base from './_popup-base';
 import { computed } from '@ember/object';
 import { alias } from '@ember/object/computed';
@@ -21,12 +16,12 @@ export default Base.extend({
     return `Successfully removed '${key}' from metadata`;
   },
   errorMessage(e, model, key) {
-    const error = e.errors ? e.errors.join(' ') : e.message;
+    let error = e.errors ? e.errors.join(' ') : e.message;
     return `There was a problem removing '${key}' from the metadata - ${error}`;
   },
 
   transaction(model, key) {
-    const metadata = model.metadata;
+    let metadata = model.metadata;
     delete metadata[key];
     model.set('metadata', { ...metadata });
     return model.save();
diff --git a/ui/app/components/identity/popup-policy.js b/ui/app/components/identity/popup-policy.js
index c5a38c1b0dcc9..7e3385e7a0d11 100644
--- a/ui/app/components/identity/popup-policy.js
+++ b/ui/app/components/identity/popup-policy.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { alias } from '@ember/object/computed';
 import { computed } from '@ember/object';
 import Base from './_popup-base';
@@ -22,12 +17,12 @@ export default Base.extend({
   },
 
   errorMessage(e, model, policyName) {
-    const error = e.errors ? e.errors.join(' ') : e.message;
+    let error = e.errors ? e.errors.join(' ') : e.message;
     return `There was a problem removing '${policyName}' policy - ${error}`;
   },
 
   transaction(model, policyName) {
-    const policies = model.get('policies');
+    let policies = model.get('policies');
     model.set('policies', policies.without(policyName));
     return model.save();
   },
diff --git a/ui/app/components/input-search.js b/ui/app/components/input-search.js
new file mode 100644
index 0000000000000..d90abed339849
--- /dev/null
+++ b/ui/app/components/input-search.js
@@ -0,0 +1,18 @@
+import Component from '@glimmer/component';
+import { action } from '@ember/object';
+import { tracked } from '@glimmer/tracking';
+
+export default class inputSelect extends Component {
+  /*
+   * @public
+   * @param Function
+   *
+   * Function called when any of the inputs change
+   *
+   */
+  @tracked searchInput = '';
+  @action
+  inputChanged() {
+    this.args.onChange(this.searchInput);
+  }
+}
diff --git a/ui/app/components/json-editor.js b/ui/app/components/json-editor.js
new file mode 100644
index 0000000000000..c905410376a63
--- /dev/null
+++ b/ui/app/components/json-editor.js
@@ -0,0 +1,45 @@
+import Component from '@glimmer/component';
+import { action } from '@ember/object';
+
+/**
+ * @module JsonEditor
+ *
+ * @example
+ * ```js
+ * <JsonEditor @title="Policy" @value={{codemirror.string}} @valueUpdated={{ action "codemirrorUpdate"}} />
+ * ```
+ *
+ * @param {string} [title] - Name above codemirror view
+ * @param {string} value - a specific string the comes from codemirror. It's the value inside the codemirror display
+ * @param {Function} [valueUpdated] - action to preform when you edit the codemirror value.
+ * @param {Function} [onFocusOut] - action to preform when you focus out of codemirror.
+ * @param {string} [helpText] - helper text.
+ * @param {Object} [extraKeys] - Provides keyboard shortcut methods for things like saving on shift + enter.
+ * @param {Array} [gutters] - An array of CSS class names or class name / CSS string pairs, each of which defines a width (and optionally a background), and which will be used to draw the background of the gutters.
+ * @param {string} [mode] - The mode defined for styling. Right now we only import ruby so mode must but be ruby or defaults to javascript. If you wanted another language you need to import it into the modifier.
+ * @param {Boolean} [readOnly] - Sets the view to readOnly, allowing for copying but no editing. It also hides the cursor. Defaults to false.
+ * @param {String} [theme] - Specify or customize the look via a named "theme" class in scss.
+ * @param {String} [value] - Value within the display. Generally, a json string.
+ * @param {String} [viewportMargin] - Size of viewport. Often set to "Infinity" to load/show all text regardless of length.
+ */
+
+export default class JsonEditorComponent extends Component {
+  get getShowToolbar() {
+    return this.args.showToolbar === false ? false : true;
+  }
+
+  @action
+  onUpdate(...args) {
+    if (!this.args.readOnly) {
+      // catching a situation in which the user is not readOnly and has not provided a valueUpdated function to the instance
+      this.args.valueUpdated(...args);
+    }
+  }
+
+  @action
+  onFocus(...args) {
+    if (this.args.onFocusOut) {
+      this.args.onFocusOut(...args);
+    }
+  }
+}
diff --git a/ui/app/components/key-version-select.js b/ui/app/components/key-version-select.js
index 8f027b69f0e03..4798652642ba8 100644
--- a/ui/app/components/key-version-select.js
+++ b/ui/app/components/key-version-select.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@ember/component';
 
 export default Component.extend({
diff --git a/ui/app/components/keymgmt/distribute.js b/ui/app/components/keymgmt/distribute.js
index 3a3aaa56f9df0..798a394356443 100644
--- a/ui/app/components/keymgmt/distribute.js
+++ b/ui/app/components/keymgmt/distribute.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
diff --git a/ui/app/components/keymgmt/key-edit.js b/ui/app/components/keymgmt/key-edit.js
index df03f39b52204..50a1e2cd1df0e 100644
--- a/ui/app/components/keymgmt/key-edit.js
+++ b/ui/app/components/keymgmt/key-edit.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
diff --git a/ui/app/components/keymgmt/provider-edit.js b/ui/app/components/keymgmt/provider-edit.js
index 1efdb0e56a1f4..a83c96c8021da 100644
--- a/ui/app/components/keymgmt/provider-edit.js
+++ b/ui/app/components/keymgmt/provider-edit.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
diff --git a/ui/app/components/kv-object-editor.js b/ui/app/components/kv-object-editor.js
new file mode 100644
index 0000000000000..907e2f997f3c4
--- /dev/null
+++ b/ui/app/components/kv-object-editor.js
@@ -0,0 +1,78 @@
+import Component from '@glimmer/component';
+import { tracked } from '@glimmer/tracking';
+import { isNone } from '@ember/utils';
+import { assert } from '@ember/debug';
+import { action } from '@ember/object';
+import { guidFor } from '@ember/object/internals';
+import KVObject from 'vault/lib/kv-object';
+
+/**
+ * @module KvObjectEditor
+ * KvObjectEditor components are called in FormFields when the editType on the model is kv.  They are used to show a key-value input field.
+ *
+ * @example
+ * ```js
+ * <KvObjectEditor
+ *  @value={{get model valuePath}}
+ *  @onChange={{action "setAndBroadcast" valuePath }}
+ *  @label="some label"
+   />
+ * ```
+ * @param {string} value - the value is captured from the model.
+ * @param {function} onChange - function that captures the value on change
+ * @param {function} [onKeyUp] - function passed in that handles the dom keyup event. Used for validation on the kv custom metadata.
+ * @param {string} [label] - label displayed over key value inputs
+ * @param {string} [labelClass] - override default label class in FormFieldLabel component
+ * @param {string} [warning] - warning that is displayed
+ * @param {string} [helpText] - helper text. In tooltip.
+ * @param {string} [subText] - placed under label.
+ * @param {string} [keyPlaceholder] - placeholder for key input
+ * @param {string} [valuePlaceholder] - placeholder for value input
+ */
+
+export default class KvObjectEditor extends Component {
+  @tracked kvData;
+
+  constructor() {
+    super(...arguments);
+    this.kvData = KVObject.create({ content: [] }).fromJSON(this.args.value);
+    this.addRow();
+  }
+
+  get placeholders() {
+    return {
+      key: this.args.keyPlaceholder || 'key',
+      value: this.args.valuePlaceholder || 'value',
+    };
+  }
+  get hasDuplicateKeys() {
+    return this.kvData.uniqBy('name').length !== this.kvData.get('length');
+  }
+
+  @action
+  addRow() {
+    if (!isNone(this.kvData.findBy('name', ''))) {
+      return;
+    }
+    const newObj = { name: '', value: '' };
+    guidFor(newObj);
+    this.kvData.addObject(newObj);
+  }
+  @action
+  updateRow() {
+    this.args.onChange(this.kvData.toJSON());
+  }
+  @action
+  deleteRow(object, index) {
+    const oldObj = this.kvData.objectAt(index);
+    assert('object guids match', guidFor(oldObj) === guidFor(object));
+    this.kvData.removeAt(index);
+    this.args.onChange(this.kvData.toJSON());
+  }
+  @action
+  handleKeyUp(event) {
+    if (this.args.onKeyUp) {
+      this.args.onKeyUp(event.target.value);
+    }
+  }
+}
diff --git a/ui/app/components/license-banners.js b/ui/app/components/license-banners.js
index 3733b611dcfe9..91f4d2b15044e 100644
--- a/ui/app/components/license-banners.js
+++ b/ui/app/components/license-banners.js
@@ -1,17 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
-import { action } from '@ember/object';
-import { tracked } from '@glimmer/tracking';
-import { inject as service } from '@ember/service';
-import isAfter from 'date-fns/isAfter';
-import differenceInDays from 'date-fns/differenceInDays';
-import localStorage from 'vault/lib/local-storage';
-import timestamp from 'core/utils/timestamp';
-
 /**
  * @module LicenseBanners
  * LicenseBanners components are used to display Vault-specific license expiry messages
@@ -23,55 +9,19 @@ import timestamp from 'core/utils/timestamp';
  * @param {string} expiry - RFC3339 date timestamp
  */
 
-export default class LicenseBanners extends Component {
-  @service version;
-
-  @tracked warningDismissed;
-  @tracked expiredDismissed;
-
-  constructor() {
-    super(...arguments);
-    // reset and show a previously dismissed license banner if:
-    // the version has been updated or the license has been updated (indicated by a change in the expiry date).
-    const bannerType = localStorage.getItem(this.dismissedBannerKey); // returns either warning or expired
-
-    this.updateDismissType(bannerType);
-  }
-
-  get currentVersion() {
-    return this.version.version;
-  }
-
-  get dismissedBannerKey() {
-    return `dismiss-license-banner-${this.currentVersion}-${this.args.expiry}`;
-  }
+import Component from '@glimmer/component';
+import isAfter from 'date-fns/isAfter';
+import differenceInDays from 'date-fns/differenceInDays';
 
+export default class LicenseBanners extends Component {
   get licenseExpired() {
     if (!this.args.expiry) return false;
-    return isAfter(timestamp.now(), new Date(this.args.expiry));
+    return isAfter(new Date(), new Date(this.args.expiry));
   }
 
   get licenseExpiringInDays() {
     // Anything more than 30 does not render a warning
     if (!this.args.expiry) return 99;
-    return differenceInDays(new Date(this.args.expiry), timestamp.now());
-  }
-
-  @action
-  dismissBanner(dismissAction) {
-    // if a client's version changed their old localStorage key will still exists.
-    localStorage.cleanupStorage('dismiss-license-banner', this.dismissedBannerKey);
-    // updates localStorage and then updates the template by calling updateDismissType
-    localStorage.setItem(this.dismissedBannerKey, dismissAction);
-    this.updateDismissType(dismissAction);
-  }
-
-  updateDismissType(dismissType) {
-    // updates tracked properties to update template
-    if (dismissType === 'warning') {
-      this.warningDismissed = true;
-    } else if (dismissType === 'expired') {
-      this.expiredDismissed = true;
-    }
+    return differenceInDays(new Date(this.args.expiry), new Date());
   }
 }
diff --git a/ui/app/components/license-info.js b/ui/app/components/license-info.js
index d1bca654390a6..2b82403b8326b 100644
--- a/ui/app/components/license-info.js
+++ b/ui/app/components/license-info.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { allFeatures } from 'vault/helpers/all-features';
 /**
@@ -29,9 +24,9 @@ import { allFeatures } from 'vault/helpers/all-features';
 export default class LicenseInfoComponent extends Component {
   get featuresInfo() {
     return allFeatures().map((feature) => {
-      const active = this.args.features.includes(feature);
+      let active = this.args.features.includes(feature);
       if (active && feature === 'Performance Standby') {
-        const count = this.args.performanceStandbyCount;
+        let count = this.args.performanceStandbyCount;
         return {
           name: feature,
           active: count ? active : false,
diff --git a/ui/app/components/link-status.js b/ui/app/components/link-status.js
index cb46f01ab6177..f7493ed4b57c0 100644
--- a/ui/app/components/link-status.js
+++ b/ui/app/components/link-status.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { inject as service } from '@ember/service';
 
diff --git a/ui/app/components/logo-edition.js b/ui/app/components/logo-edition.js
index 3d348e94f6821..0e2733facd46a 100644
--- a/ui/app/components/logo-edition.js
+++ b/ui/app/components/logo-edition.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import Component from '@ember/component';
 
diff --git a/ui/app/components/menu-sidebar.js b/ui/app/components/menu-sidebar.js
new file mode 100644
index 0000000000000..819ff0a816140
--- /dev/null
+++ b/ui/app/components/menu-sidebar.js
@@ -0,0 +1,15 @@
+import Component from '@ember/component';
+
+export default Component.extend({
+  classNames: ['column', 'is-sidebar'],
+  classNameBindings: ['isActive:is-active'],
+  isActive: false,
+  actions: {
+    openMenu() {
+      this.set('isActive', true);
+    },
+    closeMenu() {
+      this.set('isActive', false);
+    },
+  },
+});
diff --git a/ui/app/components/mfa/method-form.js b/ui/app/components/mfa/method-form.js
index 74aa47df21c0f..63cf929b5e9ba 100644
--- a/ui/app/components/mfa/method-form.js
+++ b/ui/app/components/mfa/method-form.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 import { tracked } from '@glimmer/tracking';
diff --git a/ui/app/components/mfa/mfa-form.js b/ui/app/components/mfa/mfa-form.js
index 8f231ed17f734..c73fb1197a05c 100644
--- a/ui/app/components/mfa/mfa-form.js
+++ b/ui/app/components/mfa/mfa-form.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
diff --git a/ui/app/components/mfa/mfa-login-enforcement-form.js b/ui/app/components/mfa/mfa-login-enforcement-form.js
index 95e9757cef451..250019be60d9e 100644
--- a/ui/app/components/mfa/mfa-login-enforcement-form.js
+++ b/ui/app/components/mfa/mfa-login-enforcement-form.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
@@ -61,7 +56,7 @@ export default class MfaLoginEnforcementForm extends Component {
   }
 
   async flattenTargets() {
-    for (const { label, key } of this.targetTypes) {
+    for (let { label, key } of this.targetTypes) {
       const targetArray = await this.args.model[key];
       const targets = targetArray.map((value) => ({ label, key, value }));
       this.targets.addObjects(targets);
diff --git a/ui/app/components/mfa/mfa-login-enforcement-header.js b/ui/app/components/mfa/mfa-login-enforcement-header.js
index 4e0430542f461..5b3449cef6d0b 100644
--- a/ui/app/components/mfa/mfa-login-enforcement-header.js
+++ b/ui/app/components/mfa/mfa-login-enforcement-header.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
diff --git a/ui/app/components/mfa/mfa-setup-step-one.js b/ui/app/components/mfa/mfa-setup-step-one.js
index 6edfef62d66f7..52b533b8c95ab 100644
--- a/ui/app/components/mfa/mfa-setup-step-one.js
+++ b/ui/app/components/mfa/mfa-setup-step-one.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
@@ -34,7 +29,7 @@ export default class MfaSetupStepOne extends Component {
   @action
   async verifyUUID(evt) {
     evt.preventDefault();
-    const response = await this.postCurrentTokenGenerate();
+    let response = await this.postAdminGenerate();
 
     if (response === 'stop_progress') {
       this.args.isUUIDVerified(false);
@@ -45,19 +40,20 @@ export default class MfaSetupStepOne extends Component {
     }
   }
 
-  async postCurrentTokenGenerate() {
+  async postAdminGenerate() {
     this.error = '';
     this.warning = '';
-    const adapter = this.store.adapterFor('mfa-setup');
+    let adapter = this.store.adapterFor('mfa-setup');
     let response;
 
     try {
-      response = await adapter.currentTokenGenerate({
+      response = await adapter.adminGenerate({
+        entity_id: this.args.entityId,
         method_id: this.UUID, // comes from value on the input
       });
       this.args.saveUUIDandQrCode(this.UUID, response.data?.url);
       // if there was a warning it won't fail but needs to be handled here and the flow needs to be interrupted
-      const warnings = response.warnings || [];
+      let warnings = response.warnings || [];
       if (warnings.length > 0) {
         this.UUID = ''; // clear UUID
         const alreadyGenerated = warnings.find((w) =>
diff --git a/ui/app/components/mfa/mfa-setup-step-two.js b/ui/app/components/mfa/mfa-setup-step-two.js
index d589ae4bb590b..d81765160ca47 100644
--- a/ui/app/components/mfa/mfa-setup-step-two.js
+++ b/ui/app/components/mfa/mfa-setup-step-two.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
@@ -30,7 +25,7 @@ export default class MfaSetupStepTwo extends Component {
   @action
   async restartSetup() {
     this.error = null;
-    const adapter = this.store.adapterFor('mfa-setup');
+    let adapter = this.store.adapterFor('mfa-setup');
     try {
       await adapter.adminDestroy({
         entity_id: this.args.entityId,
diff --git a/ui/app/components/modal-form/FYI.md b/ui/app/components/modal-form/FYI.md
deleted file mode 100644
index 35b65b1b4fb03..0000000000000
--- a/ui/app/components/modal-form/FYI.md
+++ /dev/null
@@ -1,3 +0,0 @@
-These templates parent form components that render within a modal to create inline items via SearchSelectWithModal.
-The modal opens when a user searches for an item that doesn't exist and clicks 'No results found for "${term}". Click here to create it.'
-The templates are rendered using the {{component}} helper in 'search-select-with-modal.hbs' and are responsible for creating the model passed to the form.
diff --git a/ui/app/components/modal-form/oidc-assignment-template.hbs b/ui/app/components/modal-form/oidc-assignment-template.hbs
deleted file mode 100644
index 8af71a03f647c..0000000000000
--- a/ui/app/components/modal-form/oidc-assignment-template.hbs
+++ /dev/null
@@ -1 +0,0 @@
-<Oidc::AssignmentForm @onSave={{this.onSave}} @model={{this.assignment}} @onCancel={{@onCancel}} />
\ No newline at end of file
diff --git a/ui/app/components/modal-form/oidc-assignment-template.js b/ui/app/components/modal-form/oidc-assignment-template.js
deleted file mode 100644
index cbc839fc7f6f0..0000000000000
--- a/ui/app/components/modal-form/oidc-assignment-template.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
-import { action } from '@ember/object';
-import { inject as service } from '@ember/service';
-import { tracked } from '@glimmer/tracking';
-
-/**
- * @module ModalForm::OidcAssignmentTemplate
- * ModalForm::OidcAssignmentTemplate components render within a modal and create a model using the input from the search select. The model is passed to the oidc/assignment-form.
- *
- * @example
- *  <ModalForm::OidcAssignmentTemplate
- *    @nameInput="new-item-name"
- *    @onSave={{this.closeModal}}
- *    @onCancel={{@onCancel}}
- *  />
- * ```
- * @callback onCancel - callback triggered when cancel button is clicked
- * @callback onSave - callback triggered when save button is clicked
- * @param {string} nameInput - the name of the newly created assignment
- */
-
-export default class OidcAssignmentTemplate extends Component {
-  @service store;
-  @tracked assignment = null; // model record passed to oidc/assignment-form
-
-  constructor() {
-    super(...arguments);
-    this.assignment = this.store.createRecord('oidc/assignment', { name: this.args.nameInput });
-  }
-
-  @action onSave(assignmentModel) {
-    this.args.onSave(assignmentModel);
-    // Reset component assignment for next use
-    this.assignment = null;
-  }
-}
diff --git a/ui/app/components/modal-form/policy-template.hbs b/ui/app/components/modal-form/policy-template.hbs
deleted file mode 100644
index 177b7cce0f2a8..0000000000000
--- a/ui/app/components/modal-form/policy-template.hbs
+++ /dev/null
@@ -1,76 +0,0 @@
-{{#if this.policy.policyType}}
-  <nav class="tabs has-bottom-margin-l">
-    <ul>
-      <li class={{unless this.showExamplePolicy "active"}}>
-        <button
-          data-test-tab-your-policy
-          type="button"
-          name="form"
-          class="link link-plain tab has-text-weight-semibold {{unless this.showExamplePolicy ' is-active'}}"
-          {{on "click" (fn (mut this.showExamplePolicy) false)}}
-        >
-          Your Policy
-        </button>
-      </li>
-      <li class={{if this.showExamplePolicy "active"}}>
-        <button
-          data-test-tab-example-policy
-          type="button"
-          name="form"
-          class="link link-plain tab has-text-weight-semibold {{if this.showExamplePolicy ' is-active'}}"
-          {{on "click" (fn (mut this.showExamplePolicy) true)}}
-        >
-          Example Policy
-        </button>
-      </li>
-    </ul>
-  </nav>
-{{/if}}
-{{#if this.showExamplePolicy}}
-  <div class="has-bottom-margin-s">
-    {{#if (eq this.policy.policyType "acl")}}
-      <p>
-        ACL Policies are written in Hashicorp Configuration Language (
-        <ExternalLink @href="https://github.com/hashicorp/hcl">HCL</ExternalLink>
-        ) or JSON and describe which paths in Vault a user or machine is allowed to access. Here is an example policy:
-      </p>
-    {{else}}
-      <p class="has-bottom-margin-s">
-        Role Governing Policies (RGPs) are tied to client tokens or identities which is similar to
-        <DocLink @path="/vault/tutorials/policies/policies">ACL policies</DocLink>. They use
-        <DocLink @path="/vault/docs/enterprise/sentinel">Sentinel</DocLink>
-        as a language framework to enable fine-grained policy decisions.
-      </p>
-      <p>
-        Here is an example policy that uses RGP to restrict access to the
-        <code class="tag is-marginless is-paddingless">admin</code>
-        policy such that a user named James or has the
-        <code class="tag is-marginless is-paddingless">Team Lead</code>
-        role can manage the
-        <code class="tag is-marginless is-paddingless">admin</code>
-        policy:
-      </p>
-    {{/if}}
-  </div>
-  <JsonEditor
-    @value={{get this.policyTemplates this.policy.policyType}}
-    @mode="ruby"
-    @readOnly={{true}}
-    @showToolbar={{true}}
-  />
-{{else}}
-  <Select
-    @name="policyType"
-    @label="Type"
-    @options={{this.policyOptions}}
-    @isFullwidth={{true}}
-    @selectedValue={{this.policy.policyType}}
-    @onChange={{this.setPolicyType}}
-    @noDefault={{true}}
-  />
-  {{#if this.policy.policyType}}
-    <PolicyForm @onSave={{this.onSave}} @model={{this.policy}} @onCancel={{@onCancel}} />
-  {{else}}
-    <EmptyState @title="No policy type selected" @message="Select a policy type to continue creating." />
-  {{/if}}
-{{/if}}
\ No newline at end of file
diff --git a/ui/app/components/modal-form/policy-template.js b/ui/app/components/modal-form/policy-template.js
deleted file mode 100644
index e88fcb60bfc7d..0000000000000
--- a/ui/app/components/modal-form/policy-template.js
+++ /dev/null
@@ -1,87 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
-import { action } from '@ember/object';
-import { inject as service } from '@ember/service';
-import { tracked } from '@glimmer/tracking';
-
-/**
- * @module ModalForm::PolicyTemplate
- * ModalForm::PolicyTemplate components are meant to render within a modal for creating a new policy of unknown type.
- *
- * @example
- *  <ModalForm::PolicyTemplate
- *    @nameInput="new-item-name"
- *    @onSave={{this.closeModal}}
- *    @onCancel={{this.closeModal}}
- *  />
- * ```
- * @callback onCancel - callback triggered when cancel button is clicked
- * @callback onSave - callback triggered when save button is clicked
- * @param {string} nameInput - the name of the newly created policy
- */
-
-export default class PolicyTemplate extends Component {
-  @service store;
-  @service version;
-
-  @tracked policy = null; // model record passed to policy-form
-  @tracked showExamplePolicy = false;
-
-  get policyOptions() {
-    return [
-      { label: 'ACL Policy', value: 'acl', isDisabled: false },
-      { label: 'Role Governing Policy', value: 'rgp', isDisabled: !this.version.hasSentinel },
-    ];
-  }
-  // formatting here is purposeful so that whitespace renders correctly in JsonEditor
-  policyTemplates = {
-    acl: `
-# Grant 'create', 'read' , 'update', and ‘list’ permission
-# to paths prefixed by 'secret/*'
-path "secret/*" {
-  capabilities = [ "create", "read", "update", "list" ]
-}
-
-# Even though we allowed secret/*, this line explicitly denies
-# secret/super-secret. This takes precedence.
-path "secret/super-secret" {
-  capabilities = ["deny"]
-}
-`,
-    rgp: `
-# Import strings library that exposes common string operations
-import "strings"
-
-# Conditional rule (precond) checks the incoming request endpoint
-# targeted to sys/policies/acl/admin
-precond = rule {
-    strings.has_prefix(request.path, "sys/policies/admin")
-}
-
-# Vault checks to see if the request was made by an entity
-# named James Thomas or Team Lead role defined as its metadata
-main = rule when precond {
-    identity.entity.metadata.role is "Team Lead" or
-      identity.entity.name is "James Thomas"
-}
-`,
-  };
-
-  @action
-  setPolicyType(type) {
-    if (this.policy) this.policy.unloadRecord(); // if user selects a different type, clear from store before creating a new record
-    // Create form model once type is chosen
-    this.policy = this.store.createRecord(`policy/${type}`, { name: this.args.nameInput });
-  }
-
-  @action
-  onSave(policyModel) {
-    this.args.onSave(policyModel);
-    // Reset component policy for next use
-    this.policy = null;
-  }
-}
diff --git a/ui/app/components/mount-accessor-select.js b/ui/app/components/mount-accessor-select.js
index c18f2c5d69812..d5263e692010e 100644
--- a/ui/app/components/mount-accessor-select.js
+++ b/ui/app/components/mount-accessor-select.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { inject as service } from '@ember/service';
 import { task } from 'ember-concurrency';
@@ -43,7 +38,7 @@ export default class MountAccessorSelect extends Component {
   }
 
   @task *authMethods() {
-    const methods = yield this.store.findAll('auth-method');
+    let methods = yield this.store.findAll('auth-method');
     if (!this.args.value && !this.args.noDefault) {
       const getValue = methods.get('firstObject.accessor');
       this.args.onChange(getValue);
diff --git a/ui/app/components/mount-backend-form.js b/ui/app/components/mount-backend-form.js
index 6b09f5e1f02fc..442e9ce52ca11 100644
--- a/ui/app/components/mount-backend-form.js
+++ b/ui/app/components/mount-backend-form.js
@@ -1,16 +1,12 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
+import Ember from 'ember';
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
-import { action } from '@ember/object';
+import { action, setProperties } from '@ember/object';
 import { task } from 'ember-concurrency';
-import { waitFor } from '@ember/test-waiters';
-import { supportedSecretBackends } from 'vault/helpers/supported-secret-backends';
 import { methods } from 'vault/helpers/mountable-auth-methods';
+import { engines, KMIP, TRANSFORM, KEYMGMT } from 'vault/helpers/mountable-secret-engines';
+import { waitFor } from '@ember/test-waiters';
 
 /**
  * @module MountBackendForm
@@ -24,104 +20,108 @@ import { methods } from 'vault/helpers/mountable-auth-methods';
  *
  */
 
+const METHODS = methods();
+const ENGINES = engines();
+
 export default class MountBackendForm extends Component {
   @service store;
   @service flashMessages;
+  @service version;
+
+  get mountType() {
+    return this.args.mountType || 'auth';
+  }
+
+  @tracked mountModel = null;
+  @tracked showEnable = false;
 
   // validation related properties
   @tracked modelValidations = null;
   @tracked invalidFormAlert = null;
 
+  @tracked mountIssue = false;
+
+  @tracked errors = '';
   @tracked errorMessage = '';
 
+  constructor() {
+    super(...arguments);
+    const type = this.args.mountType || 'auth';
+    const modelType = type === 'secret' ? 'secret-engine' : 'auth-method';
+    const model = this.store.createRecord(modelType);
+    this.mountModel = model;
+  }
+
+  get mountTypes() {
+    return this.mountType === 'secret' ? this.engines : METHODS;
+  }
+
+  get engines() {
+    if (this.version.isEnterprise) {
+      return ENGINES.concat([KMIP, TRANSFORM, KEYMGMT]);
+    }
+    return ENGINES;
+  }
+
   willDestroy() {
     // if unsaved, we want to unload so it doesn't show up in the auth mount list
     super.willDestroy(...arguments);
-    if (this.args.mountModel) {
-      const method = this.args.mountModel.isNew ? 'unloadRecord' : 'rollbackAttributes';
-      this.args.mountModel[method]();
+    if (this.mountModel) {
+      const method = this.mountModel.isNew ? 'unloadRecord' : 'rollbackAttributes';
+      this.mountModel[method]();
     }
   }
 
   checkPathChange(type) {
-    if (!type) return;
-    const mount = this.args.mountModel;
-    const currentPath = mount.path;
-    const mountTypes =
-      this.args.mountType === 'secret' ? supportedSecretBackends() : methods().map((auth) => auth.type);
-    // if the current path has not been altered by user,
+    let mount = this.mountModel;
+    let currentPath = mount.path;
+    let list = this.mountTypes;
+    // if the current path matches a type (meaning the user hasn't altered it),
     // change it here to match the new type
-    if (!currentPath || mountTypes.includes(currentPath)) {
+    let isUnchanged = list.findBy('type', currentPath);
+    if (!currentPath || isUnchanged) {
       mount.path = type;
     }
   }
 
-  typeChangeSideEffect(type) {
-    if (!this.args.mountType === 'secret') return;
-    if (type === 'pki') {
-      // If type PKI, set max lease to ~10years
-      this.args.mountModel.config.maxLeaseTtl = '3650d';
-    } else {
-      // otherwise reset
-      this.args.mountModel.config.maxLeaseTtl = 0;
-    }
-  }
-
   checkModelValidity(model) {
     const { isValid, state, invalidFormMessage } = model.validate();
-    this.modelValidations = state;
-    this.invalidFormAlert = invalidFormMessage;
-    return isValid;
-  }
+    setProperties(this, {
+      modelValidations: state,
+      invalidFormAlert: invalidFormMessage,
+    });
 
-  checkModelWarnings() {
-    // check for warnings on change
-    // since we only show errors on submit we need to clear those out and only send warning state
-    const { state } = this.args.mountModel.validate();
-    for (const key in state) {
-      state[key].errors = [];
-    }
-    this.modelValidations = state;
-    this.invalidFormAlert = null;
-  }
-
-  async showWarningsForKvv2() {
-    try {
-      const capabilities = await this.store.findRecord('capabilities', `${this.args.mountModel.path}/config`);
-      if (!capabilities?.canUpdate) {
-        // config error is not thrown from secret-engine adapter, so handling here
-        this.flashMessages.warning(
-          'You do not have access to the config endpoint. The secret engine was mounted, but the configuration settings were not saved.'
-        );
-        // remove the config data from the model otherwise it will persist in the store even though network request failed.
-        [
-          this.args.mountModel.maxVersions,
-          this.args.mountModel.casRequired,
-          this.args.mountModel.deleteVersionAfter,
-        ] = [0, false, 0];
-      }
-    } catch (e) {
-      // Show different warning if we're not sure the config saved
-      this.flashMessages.warning(
-        'You may not have access to the config endpoint. The secret engine was mounted, but the configuration settings may not be saved.'
-      );
-    }
-    return;
+    return isValid;
   }
 
   @task
   @waitFor
-  *mountBackend(event) {
-    event.preventDefault();
-    const mountModel = this.args.mountModel;
+  *mountBackend() {
+    const mountModel = this.mountModel;
     const { type, path } = mountModel;
     // only submit form if validations pass
     if (!this.checkModelValidity(mountModel)) {
       return;
     }
+    let capabilities = null;
+    try {
+      capabilities = yield this.store.findRecord('capabilities', `${path}/config`);
+    } catch (err) {
+      if (Ember.testing) {
+        //captures mount-backend-form component test
+        yield mountModel.save();
+        let mountType = this.mountType;
+        mountType = mountType === 'secret' ? `${mountType}s engine` : `${mountType} method`;
+        this.flashMessages.success(`Successfully mounted the ${type} ${mountType} at ${path}.`);
+        yield this.args.onMountSuccess(type, path);
+        return;
+      } else {
+        throw err;
+      }
+    }
 
-    const changedAttrKeys = Object.keys(mountModel.changedAttributes());
-    const updatesConfig =
+    let changedAttrKeys = Object.keys(mountModel.changedAttributes());
+    let updatesConfig =
       changedAttrKeys.includes('casRequired') ||
       changedAttrKeys.includes('deleteVersionAfter') ||
       changedAttrKeys.includes('maxVersions');
@@ -130,17 +130,18 @@ export default class MountBackendForm extends Component {
       yield mountModel.save();
     } catch (err) {
       if (err.httpStatus === 403) {
+        this.mountIssue = true;
         this.flashMessages.danger(
           'You do not have access to the sys/mounts endpoint. The secret engine was not mounted.'
         );
         return;
       }
       if (err.errors) {
-        const errors = err.errors.map((e) => {
+        let errors = err.errors.map((e) => {
           if (typeof e === 'object') return e.title || e.message || JSON.stringify(e);
           return e;
         });
-        this.errorMessage = errors;
+        this.errors = errors;
       } else if (err.message) {
         this.errorMessage = err.message;
       } else {
@@ -148,28 +149,40 @@ export default class MountBackendForm extends Component {
       }
       return;
     }
-    if (mountModel.isV2KV && updatesConfig) {
-      yield this.showWarningsForKvv2();
+    // mountModel must be after the save
+    if (mountModel.isV2KV && updatesConfig && !capabilities.get('canUpdate')) {
+      // config error is not thrown from secret-engine adapter, so handling here
+      this.flashMessages.warning(
+        'You do not have access to the config endpoint. The secret engine was mounted, but the configuration settings were not saved.'
+      );
+      // remove the config data from the model otherwise it will save it even if the network request failed.
+      [this.mountModel.maxVersions, this.mountModel.casRequired, this.mountModel.deleteVersionAfter] = [
+        0,
+        false,
+        0,
+      ];
     }
-    this.flashMessages.success(
-      `Successfully mounted the ${type} ${
-        this.args.mountType === 'secret' ? 'secrets engine' : 'auth method'
-      } at ${path}.`
-    );
+    let mountType = this.mountType;
+    mountType = mountType === 'secret' ? `${mountType}s engine` : `${mountType} method`;
+    this.flashMessages.success(`Successfully mounted the ${type} ${mountType} at ${path}.`);
     yield this.args.onMountSuccess(type, path);
     return;
   }
 
   @action
   onKeyUp(name, value) {
-    this.args.mountModel[name] = value;
-    this.checkModelWarnings();
+    this.mountModel.set(name, value);
+  }
+
+  @action
+  onTypeChange(path, value) {
+    if (path === 'type') {
+      this.checkPathChange(value);
+    }
   }
 
   @action
-  setMountType(value) {
-    this.args.mountModel.type = value;
-    this.typeChangeSideEffect(value);
-    this.checkPathChange(value);
+  toggleShowEnable(value) {
+    this.showEnable = value;
   }
 }
diff --git a/ui/app/components/mount-backend/type-form.hbs b/ui/app/components/mount-backend/type-form.hbs
deleted file mode 100644
index 758ec8d2e4e9e..0000000000000
--- a/ui/app/components/mount-backend/type-form.hbs
+++ /dev/null
@@ -1,37 +0,0 @@
-{{#each (array "generic" "cloud" "infra") as |category|}}
-  <h3 class="title box-radio-header">
-    {{capitalize category}}
-  </h3>
-  <div class="box-radio-container">
-    {{#each (filter-by "category" category this.mountTypes) as |type|}}
-      <BoxRadio
-        @displayName={{type.displayName}}
-        @type={{type.type}}
-        @glyph={{or type.glyph type.type}}
-        @groupValue={{this.selection}}
-        @groupName="mount-type"
-        @onRadioChange={{mut this.selection}}
-        @disabled={{if type.requiredFeature (not (has-feature type.requiredFeature)) false}}
-        @tooltipMessage={{if
-          (or (eq type.type "transform") (eq type.type "kmip") (eq type.type "keymgmt"))
-          (concat
-            type.displayName
-            " is part of the Advanced Data Protection module, which is not included in your enterprise license."
-          )
-          "This secret engine is not included in your license."
-        }}
-      />
-    {{/each}}
-  </div>
-{{/each}}
-<div class="field is-grouped box is-fullwidth is-bottomless">
-  <button
-    data-test-mount-next
-    type="button"
-    class="button is-primary"
-    {{on "click" (fn @setMountType this.selection)}}
-    disabled={{not this.selection}}
-  >
-    Next
-  </button>
-</div>
\ No newline at end of file
diff --git a/ui/app/components/mount-backend/type-form.js b/ui/app/components/mount-backend/type-form.js
deleted file mode 100644
index b58f4f8e67cc0..0000000000000
--- a/ui/app/components/mount-backend/type-form.js
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
-import { inject as service } from '@ember/service';
-import { methods } from 'vault/helpers/mountable-auth-methods';
-import { allEngines, mountableEngines } from 'vault/helpers/mountable-secret-engines';
-import { tracked } from '@glimmer/tracking';
-
-/**
- *
- * @module MountBackendTypeForm
- * MountBackendTypeForm components are used to display type options for
- * mounting either an auth method or secret engine.
- *
- * @example
- * ```js
- * <MountBackend::TypeForm @setMountType={{this.setMountType}} @mountType="secret" />
- * ```
- * @param {CallableFunction} setMountType - function will recieve the mount type string. Should update the model type value
- * @param {string} [mountType=auth] - mount type can be `auth` or `secret`
- */
-
-export default class MountBackendTypeForm extends Component {
-  @service version;
-  @tracked selection;
-
-  get secretEngines() {
-    return this.version.isEnterprise ? allEngines() : mountableEngines();
-  }
-
-  get mountTypes() {
-    return this.args.mountType === 'secret' ? this.secretEngines : methods();
-  }
-}
diff --git a/ui/app/components/namespace-link.js b/ui/app/components/namespace-link.js
index 45a213ee3330c..76a31fa7dcf38 100644
--- a/ui/app/components/namespace-link.js
+++ b/ui/app/components/namespace-link.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import { alias } from '@ember/object/computed';
 import Component from '@ember/component';
@@ -26,10 +21,10 @@ export default Component.extend({
   }),
 
   namespaceDisplay: computed('normalizedNamespace', 'showLastSegment', function () {
-    const ns = this.normalizedNamespace;
+    let ns = this.normalizedNamespace;
     if (!ns) return 'root';
-    const showLastSegment = this.showLastSegment;
-    const parts = ns?.split('/');
+    let showLastSegment = this.showLastSegment;
+    let parts = ns?.split('/');
     return showLastSegment ? parts[parts.length - 1] : ns;
   }),
 
@@ -38,7 +33,7 @@ export default Component.extend({
   }),
 
   get namespaceLink() {
-    const origin =
+    let origin =
       window.location.protocol +
       '//' +
       window.location.hostname +
diff --git a/ui/app/components/namespace-picker.js b/ui/app/components/namespace-picker.js
index 517f16cb2b1f4..23705e1f4b5da 100644
--- a/ui/app/components/namespace-picker.js
+++ b/ui/app/components/namespace-picker.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import { alias, gt } from '@ember/object/computed';
 import Component from '@ember/component';
@@ -32,8 +27,8 @@ export default Component.extend({
   didReceiveAttrs() {
     this._super(...arguments);
 
-    const ns = this.namespace;
-    const oldNS = this.oldNamespace;
+    let ns = this.namespace;
+    let oldNS = this.oldNamespace;
     if (!oldNS || ns !== oldNS) {
       this.setForAnimation.perform();
       this.fetchListCapability.perform();
@@ -43,7 +38,7 @@ export default Component.extend({
 
   fetchListCapability: task(function* () {
     try {
-      const capability = yield this.store.findRecord('capabilities', 'sys/namespaces/');
+      let capability = yield this.store.findRecord('capabilities', 'sys/namespaces/');
       this.set('listCapability', capability);
       this.set('canList', true);
     } catch (e) {
@@ -53,15 +48,15 @@ export default Component.extend({
     }
   }),
   setForAnimation: task(function* () {
-    const leaves = this.menuLeaves;
-    const lastLeaves = this.lastMenuLeaves;
+    let leaves = this.menuLeaves;
+    let lastLeaves = this.lastMenuLeaves;
     if (!lastLeaves) {
       this.set('lastMenuLeaves', leaves);
       yield timeout(0);
       return;
     }
-    const isAdding = leaves.length > lastLeaves.length;
-    const changedLeaf = (isAdding ? leaves : lastLeaves).get('lastObject');
+    let isAdding = leaves.length > lastLeaves.length;
+    let changedLeaf = (isAdding ? leaves : lastLeaves).get('lastObject');
     this.set('isAdding', isAdding);
     this.set('changedLeaf', changedLeaf);
 
@@ -87,7 +82,7 @@ export default Component.extend({
   inRootNamespace: alias('namespaceService.inRootNamespace'),
 
   namespaceTree: computed('accessibleNamespaces', function () {
-    const nsList = this.accessibleNamespaces;
+    let nsList = this.accessibleNamespaces;
 
     if (!nsList) {
       return [];
@@ -96,7 +91,7 @@ export default Component.extend({
   }),
 
   maybeAddRoot(leaves) {
-    const userRoot = this.auth.authData.userRootNamespace;
+    let userRoot = this.auth.authData.userRootNamespace;
     if (userRoot === '') {
       leaves.unshift('');
     }
@@ -142,8 +137,8 @@ export default Component.extend({
   // the nodes at the root of the namespace tree
   // these will get rendered as the bottom layer
   rootLeaves: computed('namespaceTree', function () {
-    const tree = this.namespaceTree;
-    const leaves = Object.keys(tree);
+    let tree = this.namespaceTree;
+    let leaves = Object.keys(tree);
     return leaves;
   }),
 
@@ -154,11 +149,9 @@ export default Component.extend({
   }),
 
   namespaceDisplay: computed('namespacePath', 'accessibleNamespaces', 'accessibleNamespaces.[]', function () {
-    const namespace = this.namespacePath;
-    if (!namespace) {
-      return 'root';
-    }
-    const parts = namespace?.split('/');
+    let namespace = this.namespacePath;
+    if (!namespace) return '';
+    let parts = namespace?.split('/');
     return parts[parts.length - 1];
   }),
 
diff --git a/ui/app/components/nav-header.js b/ui/app/components/nav-header.js
new file mode 100644
index 0000000000000..7f67b8f2582a0
--- /dev/null
+++ b/ui/app/components/nav-header.js
@@ -0,0 +1,29 @@
+import Component from '@ember/component';
+import { inject as service } from '@ember/service';
+import { computed } from '@ember/object';
+
+export default Component.extend({
+  router: service(),
+  currentCluster: service(),
+  'data-test-navheader': true,
+  attributeBindings: ['data-test-navheader'],
+  classNameBindings: 'consoleFullscreen:panel-fullscreen',
+  tagName: 'header',
+  navDrawerOpen: false,
+  consoleFullscreen: false,
+  hideLinks: computed('router.currentRouteName', function () {
+    let currentRoute = this.router.currentRouteName;
+    if ('vault.cluster.oidc-provider' === currentRoute) {
+      return true;
+    }
+    return false;
+  }),
+  actions: {
+    toggleNavDrawer(isOpen) {
+      if (isOpen !== undefined) {
+        return this.set('navDrawerOpen', isOpen);
+      }
+      this.toggleProperty('navDrawerOpen');
+    },
+  },
+});
diff --git a/ui/app/components/nav-header/home.js b/ui/app/components/nav-header/home.js
new file mode 100644
index 0000000000000..4798652642ba8
--- /dev/null
+++ b/ui/app/components/nav-header/home.js
@@ -0,0 +1,5 @@
+import Component from '@ember/component';
+
+export default Component.extend({
+  tagName: '',
+});
diff --git a/ui/app/components/nav-header/items.js b/ui/app/components/nav-header/items.js
new file mode 100644
index 0000000000000..4798652642ba8
--- /dev/null
+++ b/ui/app/components/nav-header/items.js
@@ -0,0 +1,5 @@
+import Component from '@ember/component';
+
+export default Component.extend({
+  tagName: '',
+});
diff --git a/ui/app/components/nav-header/main.js b/ui/app/components/nav-header/main.js
new file mode 100644
index 0000000000000..4798652642ba8
--- /dev/null
+++ b/ui/app/components/nav-header/main.js
@@ -0,0 +1,5 @@
+import Component from '@ember/component';
+
+export default Component.extend({
+  tagName: '',
+});
diff --git a/ui/app/components/not-found.js b/ui/app/components/not-found.js
index b176c76fb881e..9304562f6d077 100644
--- a/ui/app/components/not-found.js
+++ b/ui/app/components/not-found.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import { alias } from '@ember/object/computed';
 import Component from '@ember/component';
diff --git a/ui/app/components/oidc-consent-block.js b/ui/app/components/oidc-consent-block.js
index bf48538333066..fe497cd81b866 100644
--- a/ui/app/components/oidc-consent-block.js
+++ b/ui/app/components/oidc-consent-block.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /**
  * @module OidcConsentBlock
  * OidcConsentBlock components are used to show the consent form for the OIDC Authorization Code Flow
@@ -31,7 +26,7 @@ export default class OidcConsentBlockComponent extends Component {
 
   buildUrl(urlString, params) {
     try {
-      const url = new URL(urlString);
+      let url = new URL(urlString);
       Object.keys(params).forEach((key) => {
         if (params[key] && validParameters.includes(key)) {
           url.searchParams.append(key, params[key]);
@@ -39,7 +34,7 @@ export default class OidcConsentBlockComponent extends Component {
       });
       return url;
     } catch (e) {
-      console.debug('DEBUG: parsing url failed for', urlString); // eslint-disable-line
+      console.debug('DEBUG: parsing url failed for', urlString);
       throw new Error('Invalid URL');
     }
   }
@@ -47,8 +42,8 @@ export default class OidcConsentBlockComponent extends Component {
   @action
   handleSubmit(evt) {
     evt.preventDefault();
-    const { redirect, ...params } = this.args;
-    const redirectUrl = this.buildUrl(redirect, params);
+    let { redirect, ...params } = this.args;
+    let redirectUrl = this.buildUrl(redirect, params);
     if (Ember.testing) {
       this.args.testRedirect(redirectUrl.toString());
     } else {
diff --git a/ui/app/components/oidc/assignment-form.js b/ui/app/components/oidc/assignment-form.js
index 8b895bf6651f5..d521bce93cc1e 100644
--- a/ui/app/components/oidc/assignment-form.js
+++ b/ui/app/components/oidc/assignment-form.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
@@ -20,10 +15,11 @@ import { tracked } from '@glimmer/tracking';
  * @onSave={transition-to "vault.cluster.access.oidc.assignments.assignment.details" this.model.name}
  * />
  * ```
-
+ * @callback onCancel
+ * @callback onSave
  * @param {object} model - The parent's model
- * @callback onCancel - callback triggered when cancel button is clicked
- * @callback onSave - callback triggered when save button is clicked*
+ * @param {string} onCancel - callback triggered when cancel button is clicked
+ * @param {string} onSave - callback triggered when save button is clicked
  */
 
 export default class OidcAssignmentFormComponent extends Component {
diff --git a/ui/app/components/oidc/client-form.js b/ui/app/components/oidc/client-form.js
index 4ca887bee54e2..2de6cf92a04c7 100644
--- a/ui/app/components/oidc/client-form.js
+++ b/ui/app/components/oidc/client-form.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
@@ -16,13 +11,15 @@ import { task } from 'ember-concurrency';
  * ```js
  * <OidcClientForm @model={{this.model}} />
  * ```
+ * @callback onCancel
+ * @callback onSave
  * @param {Object} model - oidc client model
- * @callback onCancel - callback triggered when cancel button is clicked
- * @callback onSave - callback triggered on save success
- * @param {boolean} [isInline=false] - true when form is rendered within a modal
+ * @param {onCancel} onCancel - callback triggered when cancel button is clicked
+ * @param {onSave} onSave - callback triggered on save success
  */
 
 export default class OidcClientForm extends Component {
+  @service store;
   @service flashMessages;
   @tracked modelValidations;
   @tracked errorBanner;
diff --git a/ui/app/components/oidc/key-form.js b/ui/app/components/oidc/key-form.js
index a2650f5f5abaf..3fe518cf0608f 100644
--- a/ui/app/components/oidc/key-form.js
+++ b/ui/app/components/oidc/key-form.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
diff --git a/ui/app/components/oidc/provider-form.js b/ui/app/components/oidc/provider-form.js
index 6eacb3a9c9506..c51754da8ce6a 100644
--- a/ui/app/components/oidc/provider-form.js
+++ b/ui/app/components/oidc/provider-form.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
@@ -36,16 +31,9 @@ export default class OidcProviderForm extends Component {
       ? 'allow_all'
       : 'limited';
 
-  // function passed to search select
-  renderInfoTooltip(selection, dropdownOptions) {
-    // if a client has been deleted it will not exist in dropdownOptions (response from search select's query)
-    const clientExists = !!dropdownOptions.findBy('clientId', selection);
-    return !clientExists ? 'The application associated with this client_id no longer exists' : false;
-  }
-
-  // fired on did-insert from render modifier
-  @action
-  setIssuer(elem, [model]) {
+  constructor() {
+    super(...arguments);
+    const { model } = this.args;
     model.issuer = model.isNew ? '' : parseURL(model.issuer).origin;
   }
 
diff --git a/ui/app/components/oidc/scope-form.js b/ui/app/components/oidc/scope-form.js
index 0d8679ad1f036..0e1c3a9396957 100644
--- a/ui/app/components/oidc/scope-form.js
+++ b/ui/app/components/oidc/scope-form.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
diff --git a/ui/app/components/outer-html.js b/ui/app/components/outer-html.js
index 9b9d307a1f8c4..0962298353378 100644
--- a/ui/app/components/outer-html.js
+++ b/ui/app/components/outer-html.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 // THIS COMPONENT IS ONLY FOR EXTENDING
 // You should use this component if you want to use outerHTML symantics
 // in your components - this is the default for upcoming Glimmer components
diff --git a/ui/app/components/pagination-controls.js b/ui/app/components/pagination-controls.js
index 18d185c706ca9..de52c5e8da0d9 100644
--- a/ui/app/components/pagination-controls.js
+++ b/ui/app/components/pagination-controls.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
diff --git a/ui/app/components/pgp-file.js b/ui/app/components/pgp-file.js
index b0b4d2641ed39..fd1a7d1fbbe27 100644
--- a/ui/app/components/pgp-file.js
+++ b/ui/app/components/pgp-file.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@ember/component';
 import { set } from '@ember/object';
 import { task } from 'ember-concurrency';
@@ -59,7 +54,7 @@ export default Component.extend({
       // If after decoding it's not b64, we want
       // the original as it was only encoded when we used `readAsDataURL`.
       const fileData = decoded.match(BASE_64_REGEX) ? decoded : b64File;
-      yield this.onChange(this.index, { value: fileData, filename: filename });
+      yield this.onChange(this.index, { value: fileData, fileName: filename });
     })
   ),
 
diff --git a/ui/app/components/pgp-list.js b/ui/app/components/pgp-list.js
index a5633a2423860..4f71004308942 100644
--- a/ui/app/components/pgp-list.js
+++ b/ui/app/components/pgp-list.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@ember/component';
 
 export default Component.extend({
@@ -16,7 +11,7 @@ export default Component.extend({
     if (num) {
       num = parseInt(num, 10);
     }
-    const list = this.newList(num);
+    let list = this.newList(num);
     this.set('listData', list);
   },
 
@@ -50,7 +45,7 @@ export default Component.extend({
 
   actions: {
     setKey(index, key) {
-      const { listData } = this;
+      let { listData } = this;
       listData.splice(index, 1, key);
       this.onDataUpdate(listData.compact().map((k) => k.value));
     },
diff --git a/ui/app/components/pki/config-pki-ca.js b/ui/app/components/pki/config-pki-ca.js
new file mode 100644
index 0000000000000..c7ae3172ab391
--- /dev/null
+++ b/ui/app/components/pki/config-pki-ca.js
@@ -0,0 +1,185 @@
+import { inject as service } from '@ember/service';
+import { not } from '@ember/object/computed';
+import Component from '@ember/component';
+import { computed } from '@ember/object';
+
+export default Component.extend({
+  classNames: 'config-pki-ca',
+  store: service('store'),
+  flashMessages: service(),
+  errors: null,
+
+  /*
+   * @param boolean
+   * @private
+   * bool that gets flipped if you have a CA cert and click the Replace Cert button
+   */
+  replaceCA: false,
+
+  /*
+   * @param boolean
+   * @private
+   * bool that gets flipped if you push the click the "Set signed intermediate" button
+   */
+  setSignedIntermediate: false,
+
+  /*
+   * @param boolean
+   * @private
+   * bool that gets flipped if you push the click the "Set signed intermediate" button
+   */
+  signIntermediate: false,
+
+  /*
+   * @param boolean
+   * @private
+   *
+   * true when there's no CA cert currently configured
+   */
+  needsConfig: not('config.pem'),
+
+  /*
+   * @param DS.Model
+   * @private
+   *
+   * a `pki-ca-certificate` model used to back the form when uploading or creating a CA cert
+   * created and set on `init`, and unloaded on willDestroy
+   *
+   */
+  model: null,
+
+  /*
+   * @param DS.Model
+   * @public
+   *
+   * a `pki-config` model - passed in in the component usage
+   *
+   */
+  config: null,
+
+  /*
+   * @param Function
+   * @public
+   *
+   * function that gets called to refresh the config model
+   *
+   */
+  onRefresh() {},
+
+  loading: false,
+
+  willDestroy() {
+    const ca = this.model;
+    if (ca) {
+      ca.unloadRecord();
+    }
+    this._super(...arguments);
+  },
+
+  createOrReplaceModel(modelType) {
+    const ca = this.model;
+    const config = this.config;
+    const store = this.store;
+    const backend = config.get('backend');
+    if (ca) {
+      ca.unloadRecord();
+    }
+    const caCert = store.createRecord(modelType || 'pki-ca-certificate', {
+      id: `${backend}-ca-cert`,
+      backend,
+    });
+    this.set('model', caCert);
+  },
+
+  /*
+   * @private
+   * @returns array
+   *
+   * When a CA is configured, we let them download
+   * the CA in der, pem, and the CA Chain in pem (if one exists)
+   *
+   * This array provides the text and download hrefs for those links.
+   *
+   */
+  downloadHrefs: computed('config', 'config.{backend,pem,caChain,der}', function () {
+    const config = this.config;
+    const { backend, pem, caChain, der } = config;
+
+    if (!pem) {
+      return [];
+    }
+
+    const pemFile = new Blob([pem], { type: 'text/plain' });
+    const links = [
+      {
+        display: 'Download CA Certificate in PEM format',
+        name: `${backend}_ca.pem`,
+        url: URL.createObjectURL(pemFile),
+      },
+      {
+        display: 'Download CA Certificate in DER format',
+        name: `${backend}_ca.der`,
+        url: URL.createObjectURL(der),
+      },
+    ];
+    if (caChain) {
+      const caChainFile = new Blob([caChain], { type: 'text/plain' });
+      links.push({
+        display: 'Download CA Certificate Chain',
+        name: `${backend}_ca_chain.pem`,
+        url: URL.createObjectURL(caChainFile),
+      });
+    }
+    return links;
+  }),
+
+  actions: {
+    saveCA(method) {
+      this.set('loading', true);
+      const model = this.model;
+      const isUpload = this.model.uploadPemBundle;
+      model
+        .save({ adapterOptions: { method } })
+        .then(() => {
+          if (method === 'setSignedIntermediate' || isUpload) {
+            this.send('refresh');
+            this.flashMessages.success('The certificate for this backend has been updated.');
+          }
+        })
+        .catch((e) => {
+          this.set('errors', e.errors);
+        })
+        .finally(() => {
+          this.set('loading', false);
+        });
+    },
+    refresh() {
+      this.setProperties({
+        setSignedIntermediate: false,
+        signIntermediate: false,
+        replaceCA: false,
+      });
+      this.onRefresh();
+    },
+    toggleReplaceCA() {
+      if (!this.replaceCA) {
+        this.createOrReplaceModel();
+      }
+      this.toggleProperty('replaceCA');
+    },
+    toggleVal(name, val) {
+      if (!name) {
+        return;
+      }
+      const model = name === 'signIntermediate' ? 'pki-ca-certificate-sign' : null;
+      if (!this.get(name)) {
+        this.createOrReplaceModel(model);
+      }
+      if (val !== undefined) {
+        this.set(name, val);
+      } else {
+        this.toggleProperty(name);
+      }
+    },
+  },
+});
diff --git a/ui/app/components/pki/config-pki.js b/ui/app/components/pki/config-pki.js
new file mode 100644
index 0000000000000..d528cb0af4c1f
--- /dev/null
+++ b/ui/app/components/pki/config-pki.js
@@ -0,0 +1,73 @@
+import { inject as service } from '@ember/service';
+import Component from '@ember/component';
+import { get } from '@ember/object';
+
+export default Component.extend({
+  classNames: 'config-pki',
+  flashMessages: service(),
+  errors: null,
+  /*
+   *
+   * @param String
+   * @public
+   * String corresponding to the route parameter for the current section
+   *
+   */
+
+  section: null,
+
+  /*
+   * @param DS.Model
+   * @public
+   *
+   * a `pki-config` model - passed in in the component usage
+   *
+   */
+  config: null,
+
+  /*
+   * @param Function
+   * @public
+   *
+   * function that gets called to refresh the config model
+   *
+   */
+  onRefresh() {},
+
+  loading: false,
+
+  actions: {
+    handleCrlTtl({ enabled, goSafeTimeString }) {
+      this.config.disable = !enabled; // when TTL enabled, config disable=false
+      this.config.expiry = goSafeTimeString;
+    },
+    save(section) {
+      this.set('loading', true);
+      const config = this.config;
+      config
+        .save({
+          adapterOptions: {
+            method: section,
+            fields: get(config, `${section}Attrs`).map((attr) => attr.name),
+          },
+        })
+        .then(() => {
+          this.flashMessages.success(`The ${section} config for this backend has been updated.`);
+          // attrs aren't persistent for Tidy
+          if (section === 'tidy') {
+            config.rollbackAttributes();
+          }
+          this.send('refresh');
+        })
+        .catch((e) => {
+          this.set('errors', e.errors);
+        })
+        .finally(() => {
+          this.set('loading', false);
+        });
+    },
+    refresh() {
+      this.onRefresh();
+    },
+  },
+});
diff --git a/ui/app/components/pki/pki-cert-popup.js b/ui/app/components/pki/pki-cert-popup.js
new file mode 100644
index 0000000000000..49237e4b6471d
--- /dev/null
+++ b/ui/app/components/pki/pki-cert-popup.js
@@ -0,0 +1,24 @@
+import Component from '@glimmer/component';
+import { action } from '@ember/object';
+
+/**
+ * @module PkiCertPopup
+ * PkiCertPopup component is the hotdog menu button that allows you to see details or revoke a certificate.
+ *
+ * @example
+ * ```js
+ * <PkiCertPopup @item={{@item}}/>
+ * ```
+ * @param {class} item - the PKI cert in question.
+ */
+
+export default class PkiCertPopup extends Component {
+  get item() {
+    return this.args.item || null;
+  }
+
+  @action
+  delete(item) {
+    item.save({ adapterOptions: { method: 'revoke' } });
+  }
+}
diff --git a/ui/app/components/pki/pki-cert-show.js b/ui/app/components/pki/pki-cert-show.js
new file mode 100644
index 0000000000000..0c743eb151814
--- /dev/null
+++ b/ui/app/components/pki/pki-cert-show.js
@@ -0,0 +1,9 @@
+import RoleEdit from '../role-edit';
+
+export default RoleEdit.extend({
+  actions: {
+    delete() {
+      this.model.save({ adapterOptions: { method: 'revoke' } });
+    },
+  },
+});
diff --git a/ui/app/components/pki/role-pki-edit.js b/ui/app/components/pki/role-pki-edit.js
new file mode 100644
index 0000000000000..357b00cc2acfc
--- /dev/null
+++ b/ui/app/components/pki/role-pki-edit.js
@@ -0,0 +1,8 @@
+import RoleEdit from '../role-edit';
+
+export default RoleEdit.extend({
+  init() {
+    this._super(...arguments);
+    this.set('backendType', 'pki');
+  },
+});
diff --git a/ui/app/components/policy-form.hbs b/ui/app/components/policy-form.hbs
deleted file mode 100644
index 1119d6f1b448e..0000000000000
--- a/ui/app/components/policy-form.hbs
+++ /dev/null
@@ -1,108 +0,0 @@
-<form {{on "submit" (perform this.save)}} data-test-policy-form>
-  <div class="box is-bottomless is-fullwidth is-marginless">
-    <MessageError @errorMessage={{this.errorBanner}} />
-    <NamespaceReminder @mode={{if @model.isNew "create" "edit"}} @noun="policy" />
-    {{#if @model.isNew}}
-      <div class="field">
-        <label for="policy-name" class="is-label">Name</label>
-        <div class="control">
-          <Input
-            @type="text"
-            @value={{lowercase @model.name}}
-            id="policy-name"
-            class="input"
-            {{on "input" this.setModelName}}
-            data-test-policy-input="name"
-          />
-        </div>
-      </div>
-    {{/if}}
-    <div class="field">
-      {{#if @model.isNew}}
-        <Toolbar>
-          <label class="is-label">Policy</label>
-          <ToolbarActions>
-            <div class="toolbar-separator"></div>
-            <div class="control is-flex">
-              <Input
-                id="fileUploadToggle"
-                @type="checkbox"
-                name="fileUploadToggle"
-                class="switch is-rounded is-success is-small"
-                @checked={{this.showFileUpload}}
-                {{on "change" (fn (mut this.showFileUpload) (not this.showFileUpload))}}
-                data-test-policy-edit-toggle
-              />
-              <label for="fileUploadToggle">Upload file</label>
-            </div>
-          </ToolbarActions>
-        </Toolbar>
-        {{#if this.showFileUpload}}
-          <TextFile @uploadOnly={{true}} @onChange={{this.setPolicyFromFile}} />
-        {{else}}
-          <JsonEditor
-            @title="Policy"
-            @helpText="You can use Alt+Tab (Option+Tab on MacOS) in the code editor to skip to the next field"
-            @showToolbar={{false}}
-            @value={{@model.policy}}
-            @valueUpdated={{action (mut @model.policy)}}
-            @mode="ruby"
-            @extraKeys={{hash Shift-Enter=(perform this.save)}}
-            data-test-policy-editor
-          />
-        {{/if}}
-      {{else}}
-        {{! EDITING - no file upload toggle}}
-        <JsonEditor
-          @title="Policy"
-          @helpText="You can use Alt+Tab (Option+Tab on MacOS) in the code editor to skip to the next field"
-          @value={{@model.policy}}
-          @valueUpdated={{action (mut @model.policy)}}
-          @mode="ruby"
-          @extraKeys={{hash Shift-Enter=(perform this.save)}}
-          data-test-policy-editor
-        />
-      {{/if}}
-    </div>
-    {{#each @model.additionalAttrs as |attr|}}
-      <FormField data-test-field={{true}} @attr={{attr}} @model={{@model}} />
-    {{/each}}
-  </div>
-  <div class="has-bottom-margin-m">
-    <p>
-      More information about
-      {{uppercase @model.policyType}}
-      policies can be found
-      <DocLink
-        @path={{if
-          (eq @model.policyType "acl")
-          "/vault/docs/concepts/policies#capabilities"
-          "/vault/tutorials/policies/sentinel#role-governing-policies-rgps"
-        }}
-      >
-        here.
-      </DocLink>
-    </p>
-  </div>
-  <div class="field is-grouped box is-fullwidth is-bottomless">
-    <div class="control">
-      <button
-        type="submit"
-        class="button is-primary {{if this.save.isRunning 'is-loading'}}"
-        disabled={{this.save.isRunning}}
-        data-test-policy-save
-      >
-        {{if @model.isNew "Create policy" "Save"}}
-      </button>
-      <button
-        type="button"
-        class="button has-left-margin-s"
-        disabled={{this.save.isRunning}}
-        {{on "click" this.cancel}}
-        data-test-policy-cancel
-      >
-        Cancel
-      </button>
-    </div>
-  </div>
-</form>
\ No newline at end of file
diff --git a/ui/app/components/policy-form.js b/ui/app/components/policy-form.js
deleted file mode 100644
index 64f11c71972ea..0000000000000
--- a/ui/app/components/policy-form.js
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
-import { action } from '@ember/object';
-import { inject as service } from '@ember/service';
-import { task } from 'ember-concurrency';
-import trimRight from 'vault/utils/trim-right';
-import { tracked } from '@glimmer/tracking';
-
-/**
- * @module PolicyForm
- * PolicyForm components are the forms to create and edit all types of policies. This is only the form, not the outlying layout, and expects that the form model is passed from the parent.
- *
- * @example
- *  <PolicyForm
- *    @model={{this.model}}
- *    @onSave={{transition-to "vault.cluster.policy.show" this.model.policyType this.model.name}}
- *    @onCancel={{transition-to "vault.cluster.policies.index"}}
- *  />
- * ```
- * @callback onCancel - callback triggered when cancel button is clicked
- * @callback onSave - callback triggered when save button is clicked. Passes saved model
- * @param {object} model - ember data model from createRecord
- */
-
-export default class PolicyFormComponent extends Component {
-  @service flashMessages;
-
-  @tracked errorBanner = '';
-  @tracked showFileUpload = false;
-
-  @task
-  *save(event) {
-    event.preventDefault();
-    try {
-      const { name, policyType, isNew } = this.args.model;
-      yield this.args.model.save();
-      this.flashMessages.success(
-        `${policyType.toUpperCase()} policy "${name}" was successfully ${isNew ? 'created' : 'updated'}.`
-      );
-      this.args.onSave(this.args.model);
-    } catch (error) {
-      const message = error.errors ? error.errors.join('. ') : error.message;
-      this.errorBanner = message;
-    }
-  }
-
-  @action
-  setModelName({ target }) {
-    this.args.model.name = target.value.toLowerCase();
-  }
-
-  @action
-  setPolicyFromFile(fileInfo) {
-    const { value, filename } = fileInfo;
-    this.args.model.policy = value;
-    if (!this.args.model.name) {
-      const trimmedFileName = trimRight(filename, ['.json', '.txt', '.hcl', '.policy']);
-      this.args.model.name = trimmedFileName.toLowerCase();
-    }
-    this.showFileUpload = false;
-  }
-
-  @action
-  cancel() {
-    const method = this.args.model.isNew ? 'unloadRecord' : 'rollbackAttributes';
-    this.args.model[method]();
-    this.args.onCancel();
-  }
-}
diff --git a/ui/app/components/radial-progress.js b/ui/app/components/radial-progress.js
index 54a5cdaef6fae..ba2693d3cd898 100644
--- a/ui/app/components/radial-progress.js
+++ b/ui/app/components/radial-progress.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@ember/component';
 import { computed } from '@ember/object';
 
@@ -16,7 +11,7 @@ export default Component.extend({
   strokeWidth: 1,
 
   viewBox: computed('size', function () {
-    const s = this.size;
+    let s = this.size;
     return `0 0 ${s} ${s}`;
   }),
   centerValue: computed('size', function () {
diff --git a/ui/app/components/raft-join.js b/ui/app/components/raft-join.js
index 408a60a10ca0e..41de3921deb38 100644
--- a/ui/app/components/raft-join.js
+++ b/ui/app/components/raft-join.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 
 /**
@@ -29,8 +24,7 @@ export default Component.extend({
   preference: 'join',
   showJoinForm: false,
   actions: {
-    advanceFirstScreen(event) {
-      event.preventDefault();
+    advanceFirstScreen() {
       if (this.preference !== 'join') {
         this.onDismiss();
         return;
diff --git a/ui/app/components/raft-storage-overview.js b/ui/app/components/raft-storage-overview.js
index 1a631ba89ad71..b77028e679dfc 100644
--- a/ui/app/components/raft-storage-overview.js
+++ b/ui/app/components/raft-storage-overview.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@ember/component';
 import { getOwner } from '@ember/application';
 import config from '../config/environment';
@@ -52,11 +47,11 @@ export default Component.extend({
 
   actions: {
     async removePeer(model) {
-      const { nodeId } = model;
+      let { nodeId } = model;
       try {
         await model.destroyRecord();
       } catch (e) {
-        const errString = e.errors ? e.errors.join(' ') : e.message || e;
+        let errString = e.errors ? e.errors.join(' ') : e.message || e;
         this.flashMessages.danger(`There was an issue removing the peer ${nodeId}: ${errString}`);
         return;
       }
@@ -77,7 +72,7 @@ export default Component.extend({
       // then forcing a download by clicking a link that has a download attribute
       //
       // this is not the default because
-      const adapter = getOwner(this).lookup('adapter:application');
+      let adapter = getOwner(this).lookup('adapter:application');
 
       this.flashMessages.success('The snapshot download has begun.');
       let resp, blob;
@@ -85,18 +80,18 @@ export default Component.extend({
         resp = await adapter.rawRequest('/v1/sys/storage/raft/snapshot', 'GET');
         blob = await resp.blob();
       } catch (e) {
-        const errString = e.errors ? e.errors.join(' ') : e.message || e;
+        let errString = e.errors ? e.errors.join(' ') : e.message || e;
         this.flashMessages.danger(`There was an error trying to download the snapshot: ${errString}`);
       }
-      const filename = 'snapshot.gz';
-      const file = new Blob([blob], { type: 'application/x-gzip' });
+      let filename = 'snapshot.gz';
+      let file = new Blob([blob], { type: 'application/x-gzip' });
       file.name = filename;
       if ('msSaveOrOpenBlob' in navigator) {
         navigator.msSaveOrOpenBlob(file, filename);
         return;
       }
-      const a = document.createElement('a');
-      const objectURL = window.URL.createObjectURL(file);
+      let a = document.createElement('a');
+      let objectURL = window.URL.createObjectURL(file);
       a.href = objectURL;
       a.download = filename;
       document.body.appendChild(a);
diff --git a/ui/app/components/raft-storage-restore.js b/ui/app/components/raft-storage-restore.js
index 37f0a6f83d769..226217cc5ae01 100644
--- a/ui/app/components/raft-storage-restore.js
+++ b/ui/app/components/raft-storage-restore.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@ember/component';
 import { task } from 'ember-concurrency';
 import { getOwner } from '@ember/application';
@@ -19,14 +14,14 @@ export default Component.extend({
   abortController: null,
   restore: task(function* () {
     this.set('errors', null);
-    const adapter = getOwner(this).lookup('adapter:application');
+    let adapter = getOwner(this).lookup('adapter:application');
     try {
       let url = '/v1/sys/storage/raft/snapshot';
       if (this.forceRestore) {
         url = `${url}-force`;
       }
-      const file = new Blob([this.file], { type: 'application/gzip' });
-      const controller = new AbortController();
+      let file = new Blob([this.file], { type: 'application/gzip' });
+      let controller = new AbortController();
       this.set('abortController', controller);
       yield adapter.rawRequest(url, 'POST', { body: file, signal: controller.signal });
       this.flashMessages.success('The snapshot was successfully uploaded!');
@@ -38,7 +33,7 @@ export default Component.extend({
       if (e.json) {
         resp = yield e.json();
       }
-      const err = resp ? resp.errors : [e];
+      let err = resp ? resp.errors : [e];
       this.set('errors', err);
     }
   }),
diff --git a/ui/app/components/regex-validator.js b/ui/app/components/regex-validator.js
index 60181323053c0..5f769e4f4cad0 100644
--- a/ui/app/components/regex-validator.js
+++ b/ui/app/components/regex-validator.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /**
  * @module RegexValidator
  * RegexValidator components are used to provide input forms for regex values, along with a toggle-able validation input which does not get saved to the model.
diff --git a/ui/app/components/role-aws-edit.js b/ui/app/components/role-aws-edit.js
index a8fb0401b3f8d..4d0ad5cf4a9b4 100644
--- a/ui/app/components/role-aws-edit.js
+++ b/ui/app/components/role-aws-edit.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { isBlank } from '@ember/utils';
 import { set } from '@ember/object';
 import RoleEdit from './role-edit';
@@ -13,8 +8,7 @@ export default RoleEdit.extend({
     createOrUpdate(type, event) {
       event.preventDefault();
 
-      // all of the attributes with fieldValue:'id' are called `name`
-      const modelId = this.model.id || this.model.name;
+      const modelId = this.model.id;
       // prevent from submitting if there's no key
       // maybe do something fancier later
       if (type === 'create' && isBlank(modelId)) {
diff --git a/ui/app/components/role-edit.js b/ui/app/components/role-edit.js
index e5345f6a54201..b2b455311dfa7 100644
--- a/ui/app/components/role-edit.js
+++ b/ui/app/components/role-edit.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import { or } from '@ember/object/computed';
 import { isBlank } from '@ember/utils';
@@ -34,7 +29,7 @@ export default Component.extend(FocusOnInsertMixin, {
 
   waitForKeyUp: task(function* () {
     while (true) {
-      const event = yield waitForEvent(document.body, 'keyup');
+      let event = yield waitForEvent(document.body, 'keyup');
       this.onEscape(event);
     }
   })
@@ -69,8 +64,7 @@ export default Component.extend(FocusOnInsertMixin, {
     createOrUpdate(type, event) {
       event.preventDefault();
 
-      // all of the attributes with fieldValue:'id' are called `name`
-      const modelId = this.model.id || this.model.name;
+      const modelId = this.model.id;
       // prevent from submitting if there's no key
       // maybe do something fancier later
       if (type === 'create' && isBlank(modelId)) {
diff --git a/ui/app/components/role-ssh-edit.js b/ui/app/components/role-ssh-edit.js
index 763adad610a8f..05da151c99781 100644
--- a/ui/app/components/role-ssh-edit.js
+++ b/ui/app/components/role-ssh-edit.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import RoleEdit from './role-edit';
 
 export default RoleEdit.extend({
@@ -14,7 +9,7 @@ export default RoleEdit.extend({
   actions: {
     updateTtl(path, val) {
       const model = this.model;
-      const valueToSet = val.enabled === true ? `${val.seconds}s` : undefined;
+      let valueToSet = val.enabled === true ? `${val.seconds}s` : undefined;
       model.set(path, valueToSet);
     },
   },
diff --git a/ui/app/components/secret-create-or-update.js b/ui/app/components/secret-create-or-update.js
index 0427127a083ec..9f06310e2df0a 100644
--- a/ui/app/components/secret-create-or-update.js
+++ b/ui/app/components/secret-create-or-update.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /**
  * @module SecretCreateOrUpdate
  * SecretCreateOrUpdate component displays either the form for creating a new secret or creating a new version of the secret
@@ -32,9 +27,11 @@ import Component from '@glimmer/component';
 import ControlGroupError from 'vault/lib/control-group-error';
 import Ember from 'ember';
 import keys from 'vault/lib/keycodes';
+
 import { action, set } from '@ember/object';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
+
 import { isBlank, isNone } from '@ember/utils';
 import { task, waitForEvent } from 'ember-concurrency';
 
@@ -54,9 +51,9 @@ export default class SecretCreateOrUpdate extends Component {
   @service router;
   @service store;
 
-  @action
-  setup(elem, [secretData, model, mode]) {
-    this.codemirrorString = secretData.toJSONString();
+  constructor() {
+    super(...arguments);
+    this.codemirrorString = this.args.secretData.toJSONString();
     this.validationMessages = {
       path: '',
     };
@@ -64,16 +61,16 @@ export default class SecretCreateOrUpdate extends Component {
     if (Ember.testing) {
       this.secretPaths = ['beep', 'bop', 'boop'];
     } else {
-      const adapter = this.store.adapterFor('secret-v2');
-      const type = { modelName: 'secret-v2' };
-      const query = { backend: model.backend };
+      let adapter = this.store.adapterFor('secret-v2');
+      let type = { modelName: 'secret-v2' };
+      let query = { backend: this.args.model.backend };
       adapter.query(this.store, type, query).then((result) => {
         this.secretPaths = result.data.keys;
       });
     }
     this.checkRows();
 
-    if (mode === 'edit') {
+    if (this.args.mode === 'edit') {
       this.addRow();
     }
   }
@@ -96,7 +93,7 @@ export default class SecretCreateOrUpdate extends Component {
         ? set(this.validationMessages, name, `A secret with this ${name} already exists.`)
         : set(this.validationMessages, name, '');
     }
-    const values = Object.values(this.validationMessages);
+    let values = Object.values(this.validationMessages);
     this.validationErrorCount = values.filter(Boolean).length;
   }
   onEscape(e) {
@@ -111,22 +108,22 @@ export default class SecretCreateOrUpdate extends Component {
     }
   }
   pathHasWhiteSpace(value) {
-    const validation = new RegExp('\\s', 'g'); // search for whitespace
+    let validation = new RegExp('\\s', 'g'); // search for whitespace
     this.pathWhiteSpaceWarning = validation.test(value);
   }
   // successCallback is called in the context of the component
   persistKey(successCallback) {
-    const secret = this.args.model;
-    const secretData = this.args.modelForData;
-    const isV2 = this.args.isV2;
+    let secret = this.args.model;
+    let secretData = this.args.modelForData;
+    let isV2 = this.args.isV2;
     let key = secretData.get('path') || secret.id;
 
     if (key.startsWith('/')) {
       key = key.replace(/^\/+/g, '');
       secretData.set(secretData.pathAttr, key);
     }
-    const changed = secret.changedAttributes();
-    const changedKeys = Object.keys(changed);
+    let changed = secret.changedAttributes();
+    let changedKeys = Object.keys(changed);
 
     return secretData
       .save()
@@ -161,7 +158,7 @@ export default class SecretCreateOrUpdate extends Component {
       })
       .catch((error) => {
         if (error instanceof ControlGroupError) {
-          const errorMessage = this.controlGroup.logFromError(error);
+          let errorMessage = this.controlGroup.logFromError(error);
           this.error = errorMessage.content;
         }
         throw error;
@@ -175,7 +172,7 @@ export default class SecretCreateOrUpdate extends Component {
   }
 
   get isCreateNewVersionFromOldVersion() {
-    const model = this.args.model;
+    let model = this.args.model;
     if (!model) {
       return false;
     }
@@ -192,7 +189,7 @@ export default class SecretCreateOrUpdate extends Component {
   @(task(function* (name, value) {
     this.checkValidation(name, value);
     while (true) {
-      const event = yield waitForEvent(document.body, 'keyup');
+      let event = yield waitForEvent(document.body, 'keyup');
       this.onEscape(event);
     }
   })
@@ -253,16 +250,22 @@ export default class SecretCreateOrUpdate extends Component {
     this.codemirrorString = this.args.secretData.toJSONString(true);
   }
   @action
-  handleMaskedInputChange(secret, index, value) {
-    const row = { ...secret, value };
-    set(this.args.secretData, index, row);
-    this.handleChange();
-  }
-  @action
   handleChange() {
     this.codemirrorString = this.args.secretData.toJSONString(true);
     set(this.args.modelForData, 'secretData', this.args.secretData.toJSON());
   }
+  //submit on shift + enter
+  @action
+  handleKeyDown(e) {
+    e.stopPropagation();
+    if (!(e.keyCode === keys.ENTER && e.metaKey)) {
+      return;
+    }
+    let $form = this.element.querySelector('form');
+    if ($form.length) {
+      $form.submit();
+    }
+  }
   @action
   updateValidationErrorCount(errorCount) {
     this.validationErrorCount = errorCount;
diff --git a/ui/app/components/secret-delete-menu.js b/ui/app/components/secret-delete-menu.js
index 82a4e8133c55d..ab8bd5754077d 100644
--- a/ui/app/components/secret-delete-menu.js
+++ b/ui/app/components/secret-delete-menu.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /* eslint ember/no-computed-properties-in-native-classes: 'warn' */
 import Ember from 'ember';
 import { inject as service } from '@ember/service';
@@ -13,8 +8,7 @@ import { alias } from '@ember/object/computed';
 import { maybeQueryRecord } from 'vault/macros/maybe-query-record';
 
 const getErrorMessage = (errors) => {
-  const errorMessage =
-    errors?.join('. ') || 'Something went wrong. Check the Vault logs for more information.';
+  let errorMessage = errors?.join('. ') || 'Something went wrong. Check the Vault logs for more information.';
   return errorMessage;
 };
 export default class SecretDeleteMenu extends Component {
@@ -28,7 +22,7 @@ export default class SecretDeleteMenu extends Component {
     'capabilities',
     (context) => {
       if (!context.args || !context.args.modelForData || !context.args.modelForData.id) return;
-      const [backend, id] = JSON.parse(context.args.modelForData.id);
+      let [backend, id] = JSON.parse(context.args.modelForData.id);
       return {
         id: `${backend}/undelete/${id}`,
       };
@@ -42,7 +36,7 @@ export default class SecretDeleteMenu extends Component {
     'capabilities',
     (context) => {
       if (!context.args || !context.args.modelForData || !context.args.modelForData.id) return;
-      const [backend, id] = JSON.parse(context.args.modelForData.id);
+      let [backend, id] = JSON.parse(context.args.modelForData.id);
       return {
         id: `${backend}/destroy/${id}`,
       };
@@ -56,8 +50,8 @@ export default class SecretDeleteMenu extends Component {
     'capabilities',
     (context) => {
       if (!context.args.model || !context.args.model.engine || !context.args.model.id) return;
-      const backend = context.args.model.engine.id;
-      const id = context.args.model.id;
+      let backend = context.args.model.engine.id;
+      let id = context.args.model.id;
       return {
         id: `${backend}/metadata/${id}`,
       };
@@ -75,9 +69,9 @@ export default class SecretDeleteMenu extends Component {
       if (!context.args.model || context.args.mode === 'create') {
         return;
       }
-      const backend = context.args.isV2 ? context.args.model.engine.id : context.args.model.backend;
-      const id = context.args.model.id;
-      const path = context.args.isV2 ? `${backend}/data/${id}` : `${backend}/${id}`;
+      let backend = context.args.isV2 ? context.args.model.engine.id : context.args.model.backend;
+      let id = context.args.model.id;
+      let path = context.args.isV2 ? `${backend}/data/${id}` : `${backend}/${id}`;
       return {
         id: path,
       };
@@ -96,9 +90,9 @@ export default class SecretDeleteMenu extends Component {
       if (!context.args.model || context.args.mode === 'create') {
         return;
       }
-      const backend = context.args.isV2 ? context.args.model.engine.id : context.args.model.backend;
-      const id = context.args.model.id;
-      const path = context.args.isV2 ? `${backend}/delete/${id}` : `${backend}/${id}`;
+      let backend = context.args.isV2 ? context.args.model.engine.id : context.args.model.backend;
+      let id = context.args.model.id;
+      let path = context.args.isV2 ? `${backend}/delete/${id}` : `${backend}/${id}`;
       return {
         id: path,
       };
@@ -113,10 +107,10 @@ export default class SecretDeleteMenu extends Component {
 
   get isLatestVersion() {
     // must have metadata access.
-    const { model } = this.args;
+    let { model } = this.args;
     if (!model) return false;
-    const latestVersion = model.currentVersion;
-    const selectedVersion = model.selectedVersion.version;
+    let latestVersion = model.currentVersion;
+    let selectedVersion = model.selectedVersion.version;
     if (latestVersion !== selectedVersion) {
       return false;
     }
diff --git a/ui/app/components/secret-edit-metadata.js b/ui/app/components/secret-edit-metadata.js
index 470d529d334e8..996c8224712dd 100644
--- a/ui/app/components/secret-edit-metadata.js
+++ b/ui/app/components/secret-edit-metadata.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
@@ -33,7 +28,7 @@ export default class SecretEditMetadata extends Component {
   @tracked modelValidations;
 
   async save() {
-    const model = this.args.model;
+    let model = this.args.model;
     try {
       await model.save();
     } catch (e) {
@@ -54,7 +49,7 @@ export default class SecretEditMetadata extends Component {
       if (name === 'customMetadata') {
         // atypical case where property is not set on model on change - validate independently
         /* eslint-disable no-useless-escape */
-        const regex = /^[^\\]+$/g; // looking for a backward slash
+        let regex = /^[^\\]+$/g; // looking for a backward slash
         if (!value.match(regex)) {
           state[name] = {
             errors: ['Custom values cannot contain a backward slash.'],
@@ -68,7 +63,7 @@ export default class SecretEditMetadata extends Component {
       }
     }
     let count = 0;
-    for (const key in state) {
+    for (let key in state) {
       if (!state[key].isValid) {
         count++;
       }
diff --git a/ui/app/components/secret-edit-toolbar.js b/ui/app/components/secret-edit-toolbar.js
index 85b5f9a2106fb..b953c2545155d 100644
--- a/ui/app/components/secret-edit-toolbar.js
+++ b/ui/app/components/secret-edit-toolbar.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /**
  * @module SecretEditToolbar
  * SecretEditToolbar component is the toolbar component displaying the JSON toggle and the actions like delete in the show mode.
diff --git a/ui/app/components/secret-edit.js b/ui/app/components/secret-edit.js
index a2739389bd533..b4087407fdeb7 100644
--- a/ui/app/components/secret-edit.js
+++ b/ui/app/components/secret-edit.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /* eslint ember/no-computed-properties-in-native-classes: 'warn' */
 /**
  * @module SecretEdit
@@ -38,15 +33,16 @@ export default class SecretEdit extends Component {
   @tracked isV2 = false;
   @tracked codemirrorString = null;
 
-  // fired on did-insert from render modifier
-  @action
-  createKvData(elem, [model]) {
-    if (!model.secretData && model.selectedVersion) {
+  constructor() {
+    super(...arguments);
+    let secrets = this.args.model.secretData;
+    if (!secrets && this.args.model.selectedVersion) {
       this.isV2 = true;
-      model.secretData = model.belongsTo('selectedVersion').value().secretData;
+      secrets = this.args.model.belongsTo('selectedVersion').value().secretData;
     }
-    this.secretData = KVObject.create({ content: [] }).fromJSON(model.secretData);
-    this.codemirrorString = this.secretData.toJSONString();
+    const data = KVObject.create({ content: [] }).fromJSON(secrets);
+    this.secretData = data;
+    this.codemirrorString = data.toJSONString();
   }
 
   @maybeQueryRecord(
@@ -55,9 +51,9 @@ export default class SecretEdit extends Component {
       if (!context.args.model || context.args.mode === 'create') {
         return;
       }
-      const backend = context.isV2 ? context.args.model.engine.id : context.args.model.backend;
-      const id = context.args.model.id;
-      const path = context.isV2 ? `${backend}/data/${id}` : `${backend}/${id}`;
+      let backend = context.isV2 ? context.args.model.engine.id : context.args.model.backend;
+      let id = context.args.model.id;
+      let path = context.isV2 ? `${backend}/data/${id}` : `${backend}/${id}`;
       return {
         id: path,
       };
@@ -98,7 +94,7 @@ export default class SecretEdit extends Component {
   @or('requestInFlight', 'model.isFolder', 'model.flagsIsInvalid') buttonDisabled;
 
   get modelForData() {
-    const { model } = this.args;
+    let { model } = this.args;
     if (!model) return null;
     return this.isV2 ? model.belongsTo('selectedVersion').value() : model;
   }
diff --git a/ui/app/components/secret-link.js b/ui/app/components/secret-link.js
index 6efa8a7abe753..15a1ec41a2d2e 100644
--- a/ui/app/components/secret-link.js
+++ b/ui/app/components/secret-link.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 import { encodePath } from 'vault/utils/path-encoding-helpers';
diff --git a/ui/app/components/secret-list/database-list-item.js b/ui/app/components/secret-list/database-list-item.js
index 7b21d9ca76ded..32b0572482722 100644
--- a/ui/app/components/secret-list/database-list-item.js
+++ b/ui/app/components/secret-list/database-list-item.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /**
  * @module DatabaseListItem
  * DatabaseListItem components are used for the list items for the Database Secret Engines for Roles.
@@ -40,7 +35,7 @@ export default class DatabaseListItem extends Component {
   @action
   resetConnection(id) {
     const { backend } = this.args.item;
-    const adapter = this.store.adapterFor('database/connection');
+    let adapter = this.store.adapterFor('database/connection');
     adapter
       .resetConnection(backend, id)
       .then(() => {
@@ -53,7 +48,7 @@ export default class DatabaseListItem extends Component {
   @action
   rotateRootCred(id) {
     const { backend } = this.args.item;
-    const adapter = this.store.adapterFor('database/connection');
+    let adapter = this.store.adapterFor('database/connection');
     adapter
       .rotateRootCredentials(backend, id)
       .then(() => {
@@ -66,7 +61,7 @@ export default class DatabaseListItem extends Component {
   @action
   rotateRoleCred(id) {
     const { backend } = this.args.item;
-    const adapter = this.store.adapterFor('database/credential');
+    let adapter = this.store.adapterFor('database/credential');
     adapter
       .rotateRoleCredentials(backend, id)
       .then(() => {
diff --git a/ui/app/components/secret-list/transform-list-item.js b/ui/app/components/secret-list/transform-list-item.js
index b050b000cbcc4..f9c3e0ff84a84 100644
--- a/ui/app/components/secret-list/transform-list-item.js
+++ b/ui/app/components/secret-list/transform-list-item.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /**
  * @module TransformListItem
  * TransformListItem components are used for the list items for the Transform Secret Engines for all but Transformations.
diff --git a/ui/app/components/secret-version-menu.js b/ui/app/components/secret-version-menu.js
index ae21dfd454ba9..d718e5a30c33b 100644
--- a/ui/app/components/secret-version-menu.js
+++ b/ui/app/components/secret-version-menu.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
diff --git a/ui/app/components/section-tabs.js b/ui/app/components/section-tabs.js
index ab5682c5d9fd0..56969c79cbefd 100644
--- a/ui/app/components/section-tabs.js
+++ b/ui/app/components/section-tabs.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@ember/component';
 
 const SectionTabs = Component.extend({
diff --git a/ui/app/components/selectable-card.js b/ui/app/components/selectable-card.js
index f2a5bd42fff50..abe19949c5f25 100644
--- a/ui/app/components/selectable-card.js
+++ b/ui/app/components/selectable-card.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 
 /**
diff --git a/ui/app/components/shamir-progress.js b/ui/app/components/shamir-progress.js
index 29f8aba6c68b6..c4f5cb6b8bea9 100644
--- a/ui/app/components/shamir-progress.js
+++ b/ui/app/components/shamir-progress.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@ember/component';
 import { computed } from '@ember/object';
 
diff --git a/ui/app/components/sidebar/frame.hbs b/ui/app/components/sidebar/frame.hbs
deleted file mode 100644
index 63986925604b3..0000000000000
--- a/ui/app/components/sidebar/frame.hbs
+++ /dev/null
@@ -1,51 +0,0 @@
-<Hds::AppFrame @hasSidebar={{@showSidebar}} @hasHeader={{false}} @hasFooter={{false}} as |Frame|>
-  <Frame.Sidebar data-test-sidebar-nav>
-    <Hds::SideNav @isResponsive={{true}} @hasA11yRefocus={{true}} @a11yRefocusSkipTo="app-main-content">
-      <:header>
-        <Hds::SideNav::Header>
-          <:logo>
-            <Hds::SideNav::Header::HomeLink
-              @icon="vault"
-              @route="vault.cluster"
-              @model={{this.currentCluster.cluster.name}}
-              @ariaLabel="home link"
-              data-test-sidebar-logo
-            />
-          </:logo>
-          <:actions>
-            <Hds::SideNav::Header::IconButton
-              @icon="terminal-screen"
-              @ariaLabel="Console toggle"
-              data-test-console-toggle
-              {{on "click" (fn (mut this.console.isOpen) (not this.console.isOpen))}}
-            />
-            <Sidebar::UserMenu />
-          </:actions>
-        </Hds::SideNav::Header>
-      </:header>
-
-      {{! this block is where the Hds::SideNav::Portal components render into }}
-      <:body>
-        <Hds::SideNav::Portal::Target aria-label="sidebar navigation links" />
-      </:body>
-
-      <:footer>
-        {{#if (has-feature "Namespaces")}}
-          <NamespacePicker
-            @namespace={{this.clusterController.namespaceQueryParam}}
-            class="hds-side-nav-hide-when-minimized"
-          />
-        {{/if}}
-      </:footer>
-    </Hds::SideNav>
-  </Frame.Sidebar>
-  <Frame.Main id="app-main-content" class={{if this.console.isOpen "main--console-open"}}>
-    {{! outlet for app content }}
-    <div id="modal-wormhole"></div>
-    <LinkStatus @status={{this.currentCluster.cluster.hcpLinkStatus}} />
-    {{yield}}
-    <div data-test-console-panel class={{if this.console.isOpen "panel-open"}}>
-      <Console::UiPanel @isFullscreen={{this.consoleFullscreen}} />
-    </div>
-  </Frame.Main>
-</Hds::AppFrame>
\ No newline at end of file
diff --git a/ui/app/components/sidebar/frame.js b/ui/app/components/sidebar/frame.js
deleted file mode 100644
index 79b6e3acdac48..0000000000000
--- a/ui/app/components/sidebar/frame.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import Component from '@glimmer/component';
-import { inject as service } from '@ember/service';
-import { inject as controller } from '@ember/controller';
-
-export default class SidebarNavComponent extends Component {
-  @service currentCluster;
-  @service console;
-  @controller('vault.cluster') clusterController;
-}
diff --git a/ui/app/components/sidebar/nav/access.hbs b/ui/app/components/sidebar/nav/access.hbs
deleted file mode 100644
index 68ea407198833..0000000000000
--- a/ui/app/components/sidebar/nav/access.hbs
+++ /dev/null
@@ -1,65 +0,0 @@
-<Hds::SideNav::Portal @ariaLabel="Access Navigation Links" data-test-sidebar-nav-panel="Access" as |Nav|>
-  <Nav.BackLink
-    @route="vault.cluster"
-    @current-when={{false}}
-    @icon="arrow-left"
-    @text="Back to main navigation"
-    data-test-sidebar-nav-link="Back to main navigation"
-  />
-
-  {{#if (has-permission "access" routeParams=(array "methods" "mfa" "oidc"))}}
-    <Nav.Title data-test-sidebar-nav-heading="Authentication">Authentication</Nav.Title>
-  {{/if}}
-  {{#if (has-permission "access" routeParams="methods")}}
-    <Nav.Link
-      @route="vault.cluster.access.methods"
-      @current-when="vault.cluster.access.methods vault.cluster.access.method"
-      @text="Authentication methods"
-      data-test-sidebar-nav-link="Authentication methods"
-    />
-  {{/if}}
-  {{#if (has-permission "access" routeParams="mfa")}}
-    <Nav.Link
-      @route="vault.cluster.access.mfa.methods"
-      @current-when="vault.cluster.access.mfa.methods vault.cluster.access.mfa.enforcements vault.cluster.access.mfa.index"
-      @text="Multi-factor authentication"
-      data-test-sidebar-nav-link="Multi-factor authentication"
-    />
-  {{/if}}
-  {{#if (has-permission "access" routeParams="oidc")}}
-    <Nav.Link @route="vault.cluster.access.oidc" @text="OIDC provider" data-test-sidebar-nav-link="OIDC provider" />
-  {{/if}}
-
-  {{#if (and (has-feature "Control Groups") (has-permission "access" routeParams="control-groups"))}}
-    <Nav.Title data-test-sidebar-nav-heading="Access Control">Access Control</Nav.Title>
-    <Nav.Link
-      @route="vault.cluster.access.control-groups"
-      @current-when="vault.cluster.access.control-groups vault.cluster.access.control-group-accessor vault.cluster.access.control-groups-configure"
-      @text="Control Groups"
-      data-test-sidebar-nav-link="Control Groups"
-    />
-  {{/if}}
-
-  {{#if (has-permission "access" routeParams=(array "namespaces" "groups" "entities"))}}
-    <Nav.Title data-test-sidebar-nav-heading="Organization">Organization</Nav.Title>
-  {{/if}}
-  {{#if (and (has-feature "Namespaces") (has-permission "access" routeParams="namespaces"))}}
-    <Nav.Link @route="vault.cluster.access.namespaces" @text="Namespaces" data-test-sidebar-nav-link="Namespaces" />
-  {{/if}}
-  {{#if (has-permission "access" routeParams="groups")}}
-    <Nav.Link @route="vault.cluster.access.identity" @model="groups" @text="Groups" data-test-sidebar-nav-link="Groups" />
-  {{/if}}
-  {{#if (has-permission "access" routeParams="entities")}}
-    <Nav.Link
-      @route="vault.cluster.access.identity"
-      @model="entities"
-      @text="Entities"
-      data-test-sidebar-nav-link="Entities"
-    />
-  {{/if}}
-
-  {{#if (has-permission "access" routeParams="leases")}}
-    <Nav.Title data-test-sidebar-nav-heading="Administration">Administration</Nav.Title>
-    <Nav.Link @route="vault.cluster.access.leases" @text="Leases" data-test-sidebar-nav-link="Leases" />
-  {{/if}}
-</Hds::SideNav::Portal>
\ No newline at end of file
diff --git a/ui/app/components/sidebar/nav/cluster.hbs b/ui/app/components/sidebar/nav/cluster.hbs
deleted file mode 100644
index 5ec3a5e34c39d..0000000000000
--- a/ui/app/components/sidebar/nav/cluster.hbs
+++ /dev/null
@@ -1,98 +0,0 @@
-<Hds::SideNav::Portal @ariaLabel="Cluster Navigation Links" data-test-sidebar-nav-panel="Cluster" as |Nav|>
-  <Nav.Title data-test-sidebar-nav-heading="Vault">Vault</Nav.Title>
-
-  <Nav.Link
-    @route="vault.cluster.secrets"
-    @current-when="vault.cluster.secrets vault.cluster.settings.mount-secret-backend vault.cluster.settings.configure-secret-backend"
-    @text="Secrets engines"
-    data-test-sidebar-nav-link="Secrets engines"
-  />
-  {{#if (has-permission "access")}}
-    <Nav.Link
-      @route={{get (route-params-for "access") "route"}}
-      @models={{get (route-params-for "access") "models"}}
-      @current-when="vault.cluster.access vault.cluster.settings.auth"
-      @text="Access"
-      @hasSubItems={{true}}
-      data-test-sidebar-nav-link="Access"
-    />
-  {{/if}}
-  {{#if (has-permission "policies")}}
-    <Nav.Link
-      @route="vault.cluster.policies"
-      @models={{get (route-params-for "policies") "models"}}
-      @text="Policies"
-      @hasSubItems={{true}}
-      data-test-sidebar-nav-link="Policies"
-    />
-  {{/if}}
-  {{#if (has-permission "tools")}}
-    <Nav.Link
-      @route="vault.cluster.tools.tool"
-      @models={{get (route-params-for "tools") "models"}}
-      @text="Tools"
-      @hasSubItems={{true}}
-      data-test-sidebar-nav-link="Tools"
-    />
-  {{/if}}
-
-  {{#if
-    (and this.version.isEnterprise this.cluster.anyReplicationEnabled (has-permission "status" routeParams="replication"))
-  }}
-    <Nav.Title data-test-sidebar-nav-heading="Replication">Replication</Nav.Title>
-    <Nav.Link
-      @route="vault.cluster.replication.mode.index"
-      @model="dr"
-      @text="Disaster Recovery"
-      data-test-sidebar-nav-link="Disaster Recovery"
-    />
-
-    {{#if (has-feature "Performance Replication")}}
-      <Nav.Link
-        @route="vault.cluster.replication.mode.index"
-        @model="performance"
-        @text="Performance"
-        data-test-sidebar-nav-link="Performance"
-      />
-    {{/if}}
-  {{/if}}
-
-  {{#if
-    (or
-      (has-permission "status" routeParams=(array "replication" "raft" "license" "seal"))
-      (has-permission "clients" routeParams="activity")
-    )
-  }}
-    <Nav.Title data-test-sidebar-nav-heading="Monitoring">Monitoring</Nav.Title>
-  {{/if}}
-  {{#if (and this.version.isEnterprise (has-permission "status" routeParams="replication"))}}
-    <Nav.Link @route="vault.cluster.replication.index" @text="Replication" data-test-sidebar-nav-link="Replication" />
-  {{/if}}
-  {{#if (and this.cluster.usingRaft (has-permission "status" routeParams="raft"))}}
-    <Nav.Link
-      @route="vault.cluster.storage"
-      @model={{this.cluster.name}}
-      @text="Raft Storage"
-      data-test-sidebar-nav-link="Raft Storage"
-    />
-  {{/if}}
-  {{#if (and (has-permission "clients" routeParams="activity") (not this.cluster.dr.isSecondary))}}
-    <Nav.Link @route="vault.cluster.clients" @text="Client count" data-test-sidebar-nav-link="Client count" />
-  {{/if}}
-  {{#if (and this.version.features (has-permission "status" routeParams="license") (not this.cluster.dr.isSecondary))}}
-    <Nav.Link
-      @route="vault.cluster.license"
-      @model={{this.cluster.name}}
-      @text="License"
-      data-test-sidebar-nav-link="License"
-    />
-  {{/if}}
-  {{#if (and (has-permission "status" routeParams="seal") (not this.cluster.dr.isSecondary))}}
-    <Nav.Link
-      @route="vault.cluster.settings.seal"
-      @model={{this.cluster.name}}
-      @text="Seal Vault"
-      data-test-sidebar-nav-link="Seal Vault"
-    />
-  {{/if}}
-</Hds::SideNav::Portal>
\ No newline at end of file
diff --git a/ui/app/components/sidebar/nav/cluster.js b/ui/app/components/sidebar/nav/cluster.js
deleted file mode 100644
index 7136660ac4e25..0000000000000
--- a/ui/app/components/sidebar/nav/cluster.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import Component from '@glimmer/component';
-import { inject as service } from '@ember/service';
-
-export default class SidebarNavClusterComponent extends Component {
-  @service currentCluster;
-  @service version;
-  @service auth;
-
-  get cluster() {
-    return this.currentCluster.cluster;
-  }
-}
diff --git a/ui/app/components/sidebar/nav/policies.hbs b/ui/app/components/sidebar/nav/policies.hbs
deleted file mode 100644
index 53dc66dabdfee..0000000000000
--- a/ui/app/components/sidebar/nav/policies.hbs
+++ /dev/null
@@ -1,39 +0,0 @@
-<Hds::SideNav::Portal @ariaLabel="Policies Navigation Links" data-test-sidebar-nav-panel="Policies" as |Nav|>
-  <Nav.BackLink
-    @route="vault.cluster"
-    @current-when={{false}}
-    @icon="arrow-left"
-    @text="Back to main navigation"
-    data-test-sidebar-nav-link="Back to main navigation"
-  />
-
-  <Nav.Title data-test-sidebar-nav-heading="Policies">Policies</Nav.Title>
-
-  {{#if (has-permission "policies" routeParams="acl")}}
-    <Nav.Link
-      @route="vault.cluster.policies"
-      @model="acl"
-      @current-when="vault.cluster.policies vault.cluster.policy"
-      @text="ACL Policies"
-      data-test-sidebar-nav-link="ACL Policies"
-    />
-  {{/if}}
-  {{#if (and (has-feature "Sentinel") (has-permission "policies" routeParams="rgp"))}}
-    <Nav.Link
-      @route="vault.cluster.policies"
-      @model="rgp"
-      @current-when="vault.cluster.policies vault.cluster.policy"
-      @text="Role-Governing Policies"
-      data-test-sidebar-nav-link="Role-Governing Policies"
-    />
-  {{/if}}
-  {{#if (and (has-feature "Sentinel") (has-permission "policies" routeParams="egp"))}}
-    <Nav.Link
-      @route="vault.cluster.policies"
-      @model="egp"
-      @current-when="vault.cluster.policies vault.cluster.policy"
-      @text="Endpoint Governing Policies"
-      data-test-sidebar-nav-link="Endpoint Governing Policies"
-    />
-  {{/if}}
-</Hds::SideNav::Portal>
\ No newline at end of file
diff --git a/ui/app/components/sidebar/nav/tools.hbs b/ui/app/components/sidebar/nav/tools.hbs
deleted file mode 100644
index 798125e1e3329..0000000000000
--- a/ui/app/components/sidebar/nav/tools.hbs
+++ /dev/null
@@ -1,22 +0,0 @@
-<Hds::SideNav::Portal @ariaLabel="Tools Navigation Links" data-test-sidebar-nav-panel="Tools" as |Nav|>
-  <Nav.BackLink
-    @route="vault.cluster"
-    @current-when={{false}}
-    @icon="arrow-left"
-    @text="Back to main navigation"
-    data-test-sidebar-nav-link="Back to main navigation"
-  />
-
-  <Nav.Title data-test-sidebar-nav-heading="Tools">Tools</Nav.Title>
-
-  {{#each (tools-actions) as |supportedAction|}}
-    {{#if (has-permission "tools" routeParams=supportedAction)}}
-      <Nav.Link
-        @route="vault.cluster.tools.tool"
-        @model={{supportedAction}}
-        @text={{capitalize supportedAction}}
-        data-test-sidebar-nav-link={{capitalize supportedAction}}
-      />
-    {{/if}}
-  {{/each}}
-</Hds::SideNav::Portal>
\ No newline at end of file
diff --git a/ui/app/components/sidebar/user-menu.hbs b/ui/app/components/sidebar/user-menu.hbs
deleted file mode 100644
index 9a2a41c8637a8..0000000000000
--- a/ui/app/components/sidebar/user-menu.hbs
+++ /dev/null
@@ -1,83 +0,0 @@
-<BasicDropdown
-  @horizontalPosition="right"
-  @verticalPosition="below"
-  @renderInPlace={{true}}
-  class="sidebar-user-menu"
-  data-test-user-menu
-  as |Dropdown|
->
-  <Dropdown.Trigger data-test-user-menu-trigger>
-    <Hds::SideNav::Header::IconButton @icon="user" @ariaLabel="User menu" />
-  </Dropdown.Trigger>
-  <Dropdown.Content>
-    <Confirm as |c|>
-      <div class="popup-menu-content" data-test-user-menu-content>
-        <div class="box">
-          <div class="menu-label">
-            {{capitalize this.auth.authData.displayName}}
-          </div>
-          <nav class="menu">
-            <ul class="menu-list">
-              {{#if this.auth.allowExpiration}}
-                <li class="token-alert is-flex" data-test-user-menu-item="token alert">
-                  <span><Icon @name="alert-triangle-fill" class="has-text-highlight" /></span>
-                  <span class="is-size-8 has-text-semibold">
-                    We've stopped auto-renewing your token due to inactivity. It will expire on
-                    {{date-format this.auth.tokenExpirationDate "MMMM do yyyy, h:mm:ss a"}}.
-                  </span>
-                </li>
-              {{/if}}
-              {{#if this.hasEntityId}}
-                <li class="action">
-                  <LinkTo @route="vault.cluster.mfa-setup" data-test-user-menu-item="mfa">
-                    Multi-factor authentication
-                  </LinkTo>
-                </li>
-              {{/if}}
-              <li class="action">
-                <CopyButton
-                  @clipboardText={{this.auth.currentToken}}
-                  class="link"
-                  @buttonType="button"
-                  @success={{action (set-flash-message "Token copied!")}}
-                >
-                  Copy token
-                </CopyButton>
-              </li>
-              {{#if (is-before (now interval=1000) this.auth.tokenExpirationDate)}}
-                {{#if this.auth.authData.renewable}}
-                  <li class="action">
-                    <button
-                      type="button"
-                      {{on "click" this.renewToken}}
-                      class="link button {{if this.isRenewing 'is-loading'}}"
-                      data-test-user-menu-item="renew token"
-                    >
-                      Renew token
-                    </button>
-                  </li>
-                {{/if}}
-                <li class="action">
-                  <c.Message
-                    @id={{get this.auth "authData.displayName"}}
-                    @title={{concat "Revoke " (get this.auth "authData.displayName") "?"}}
-                    @onConfirm={{action "revokeToken"}}
-                    @message="You will not be able to log in again with this token."
-                    @triggerText="Revoke token"
-                    @confirmButtonText="Revoke"
-                    data-test-user-menu-item="revoke token"
-                  />
-                </li>
-              {{/if}}
-              <li class="action">
-                <LinkTo @route="vault.cluster.logout" @model={{this.currentCluster.cluster.name}} id="logout">
-                  Log out
-                </LinkTo>
-              </li>
-            </ul>
-          </nav>
-        </div>
-      </div>
-    </Confirm>
-  </Dropdown.Content>
-</BasicDropdown>
\ No newline at end of file
diff --git a/ui/app/components/sidebar/user-menu.js b/ui/app/components/sidebar/user-menu.js
deleted file mode 100644
index 0a1f425cd2643..0000000000000
--- a/ui/app/components/sidebar/user-menu.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import Component from '@glimmer/component';
-import { inject as service } from '@ember/service';
-import { later } from '@ember/runloop';
-import { action } from '@ember/object';
-import { tracked } from '@glimmer/tracking';
-
-export default class SidebarUserMenuComponent extends Component {
-  @service auth;
-  @service currentCluster;
-  @service router;
-
-  @tracked fakeRenew = false;
-
-  get hasEntityId() {
-    // root users will not have an entity_id because they are not associated with an entity.
-    // in order to use the MFA end user setup they need an entity_id
-    return !!this.auth.authData?.entity_id;
-  }
-
-  get isRenewing() {
-    return this.fakeRenew || this.auth.isRenewing;
-  }
-
-  transitionToRoute() {
-    this.router.transitionTo(...arguments);
-  }
-
-  @action
-  renewToken() {
-    this.fakeRenew = true;
-    later(() => {
-      this.auth.renew().then(() => {
-        this.fakeRenew = this.auth.isRenewing;
-      });
-    }, 200);
-  }
-
-  @action
-  revokeToken() {
-    this.auth.revokeCurrentToken().then(() => {
-      this.transitionToRoute('vault.cluster.logout');
-    });
-  }
-}
diff --git a/ui/app/components/splash-page.js b/ui/app/components/splash-page.js
index 56679784b79b7..e5560f76dcf5e 100644
--- a/ui/app/components/splash-page.js
+++ b/ui/app/components/splash-page.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /**
  * @module SplashPage
  * SplashPage component is used as a landing page with a box horizontally and center aligned on the page. It's used as the login landing page.
@@ -31,4 +26,8 @@ export default class SplashPage extends Component {
     // default is true unless showTruncatedNavBar is defined as false
     return this.args.showTruncatedNavBar === false ? false : true;
   }
+
+  get activeCluster() {
+    return this.store.peekRecord('cluster', this.auth.activeCluster);
+  }
 }
diff --git a/ui/app/components/splash-page/splash-content.js b/ui/app/components/splash-page/splash-content.js
index 8f027b69f0e03..4798652642ba8 100644
--- a/ui/app/components/splash-page/splash-content.js
+++ b/ui/app/components/splash-page/splash-content.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@ember/component';
 
 export default Component.extend({
diff --git a/ui/app/components/splash-page/splash-footer.js b/ui/app/components/splash-page/splash-footer.js
index 8f027b69f0e03..4798652642ba8 100644
--- a/ui/app/components/splash-page/splash-footer.js
+++ b/ui/app/components/splash-page/splash-footer.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@ember/component';
 
 export default Component.extend({
diff --git a/ui/app/components/splash-page/splash-header.js b/ui/app/components/splash-page/splash-header.js
index 8f027b69f0e03..4798652642ba8 100644
--- a/ui/app/components/splash-page/splash-header.js
+++ b/ui/app/components/splash-page/splash-header.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@ember/component';
 
 export default Component.extend({
diff --git a/ui/app/components/status-menu.js b/ui/app/components/status-menu.js
new file mode 100644
index 0000000000000..e489157f3fbb0
--- /dev/null
+++ b/ui/app/components/status-menu.js
@@ -0,0 +1,44 @@
+import Component from '@glimmer/component';
+import { action } from '@ember/object';
+import { inject as service } from '@ember/service';
+import { next } from '@ember/runloop';
+
+/**
+ * @module StatusMenu
+ * StatusMenu component is the drop down menu on the main navigation.
+ *
+ * @example
+ * ```js
+ * <StatusMenu @label='user' @onLinkClick={{action Nav.closeDrawer}}/>
+ * ```
+ * @param {string} [ariaLabel] - aria label for the status icon.
+ * @param {string} [label] - label for the status menu.
+ * @param {string} [type] - determines where the component is being used. e.g. replication, auth, etc.
+ * @param {function} [onLinkClick] - function to handle click on the nested links under content.
+ *
+ */
+
+export default class StatusMenu extends Component {
+  @service currentCluster;
+  @service auth;
+  @service media;
+  @service router;
+
+  get type() {
+    return this.args.type || 'cluster';
+  }
+
+  get glyphName() {
+    return this.type === 'user' ? 'user' : 'circle-dot';
+  }
+
+  @action
+  onLinkClick(dropdown) {
+    if (dropdown) {
+      // strange issue where closing dropdown triggers full transition which redirects to auth screen in production builds
+      // closing dropdown in next tick of run loop fixes it
+      next(() => dropdown.actions.close());
+    }
+    this.args.onLinkClick();
+  }
+}
diff --git a/ui/app/components/text-file.js b/ui/app/components/text-file.js
new file mode 100644
index 0000000000000..e94b69299478e
--- /dev/null
+++ b/ui/app/components/text-file.js
@@ -0,0 +1,83 @@
+import Component from '@glimmer/component';
+import { set, action } from '@ember/object';
+import { tracked } from '@glimmer/tracking';
+import { guidFor } from '@ember/object/internals';
+
+/**
+ * @module TextFile
+ * `TextFile` components are file upload components where you can either toggle to upload a file or enter text.
+ *
+ * @example
+ * <TextFile
+ *  @inputOnly={{true}}
+ *  @helpText="help text"
+ *  @file={{object}}
+ *  @onChange={{action "someOnChangeFunction"}}
+ *  @label={{"string"}}
+ * />
+ *
+ * @param [inputOnly] {bool} - When true, only the file input will be rendered
+ * @param [helpText] {string} - Text underneath label.
+ * @param file {object} - * Object in the shape of:
+ * {
+ *   value: 'file contents here',
+ *   fileName: 'nameOfFile.txt',
+ *   enterAsText: boolean ability to enter as text
+ * }
+ * @param [onChange=Function.prototype] {Function|action} - A function to call when the value of the input changes.
+ * @param [label=null] {string} - Text to use as the label for the file input. If null, a default will be rendered.
+ */
+
+export default class TextFile extends Component {
+  fileHelpText = 'Select a file from your computer';
+  textareaHelpText = 'Enter the value as text';
+  elementId = guidFor(this);
+  index = '';
+
+  @tracked file = null;
+  @tracked showValue = false;
+
+  get inputOnly() {
+    return this.args.inputOnly || false;
+  }
+  get label() {
+    return this.args.label || null;
+  }
+
+  readFile(file) {
+    const reader = new FileReader();
+    reader.onload = () => this.setFile(reader.result, file.name);
+    reader.readAsText(file);
+  }
+
+  setFile(contents, filename) {
+    this.args.onChange(this.index, { value: contents, fileName: filename });
+  }
+
+  @action
+  pickedFile(e) {
+    e.preventDefault();
+    const { files } = e.target;
+    if (!files.length) {
+      return;
+    }
+    for (let i = 0, len = files.length; i < len; i++) {
+      this.readFile(files[i]);
+    }
+  }
+  @action
+  updateData(e) {
+    e.preventDefault();
+    let file = this.args.file;
+    set(file, 'value', e.target.value);
+    this.args.onChange(this.index, file);
+  }
+  @action
+  clearFile() {
+    this.args.onChange(this.index, { value: '' });
+  }
+  @action
+  toggleMask() {
+    this.showValue = !this.showValue;
+  }
+}
diff --git a/ui/app/components/token-expire-warning.js b/ui/app/components/token-expire-warning.js
index 50f35b2dcd812..406b6670b8349 100644
--- a/ui/app/components/token-expire-warning.js
+++ b/ui/app/components/token-expire-warning.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { inject as service } from '@ember/service';
 
@@ -10,7 +5,7 @@ export default class TokenExpireWarning extends Component {
   @service router;
 
   get showWarning() {
-    const currentRoute = this.router.currentRouteName;
+    let currentRoute = this.router.currentRouteName;
     if ('vault.cluster.oidc-provider' === currentRoute) {
       return false;
     }
diff --git a/ui/app/components/tool-actions-form.js b/ui/app/components/tool-actions-form.js
index 8b7d6b72c6826..2ba7582fb9c6c 100644
--- a/ui/app/components/tool-actions-form.js
+++ b/ui/app/components/tool-actions-form.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { match } from '@ember/object/computed';
 import { assign } from '@ember/polyfills';
 import { inject as service } from '@ember/service';
@@ -82,9 +77,9 @@ export default Component.extend(DEFAULTS, {
 
   handleSuccess(resp, action) {
     let props = {};
-    const secret = (resp && resp.data) || resp.auth;
+    let secret = (resp && resp.data) || resp.auth;
     if (secret && action === 'unwrap') {
-      const details = {
+      let details = {
         'Request ID': resp.request_id,
         'Lease ID': resp.lease_id || 'None',
         Renewable: resp.renewable ? 'Yes' : 'No',
diff --git a/ui/app/components/tool-hash.js b/ui/app/components/tool-hash.js
index 8d1c49fe16be6..7d1f9e316b009 100644
--- a/ui/app/components/tool-hash.js
+++ b/ui/app/components/tool-hash.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 
diff --git a/ui/app/components/tool-lookup.js b/ui/app/components/tool-lookup.js
index a5c909b28cd8b..a9220f86de921 100644
--- a/ui/app/components/tool-lookup.js
+++ b/ui/app/components/tool-lookup.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 
diff --git a/ui/app/components/tool-random.js b/ui/app/components/tool-random.js
index c2f6a257735d0..c3e876e8152b0 100644
--- a/ui/app/components/tool-random.js
+++ b/ui/app/components/tool-random.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 
diff --git a/ui/app/components/tool-rewrap.js b/ui/app/components/tool-rewrap.js
index 49913d507f48a..c711b2ac19827 100644
--- a/ui/app/components/tool-rewrap.js
+++ b/ui/app/components/tool-rewrap.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 
diff --git a/ui/app/components/tool-unwrap.js b/ui/app/components/tool-unwrap.js
index 6700087d0eb39..acfafc94ccd08 100644
--- a/ui/app/components/tool-unwrap.js
+++ b/ui/app/components/tool-unwrap.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 
diff --git a/ui/app/components/tool-wrap.js b/ui/app/components/tool-wrap.js
index 902a2a7ae5620..360cfcaff7ac7 100644
--- a/ui/app/components/tool-wrap.js
+++ b/ui/app/components/tool-wrap.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 import { tracked } from '@glimmer/tracking';
diff --git a/ui/app/components/toolbar-secret-link.js b/ui/app/components/toolbar-secret-link.js
index 4bf7de9a03a99..44a1348ca673d 100644
--- a/ui/app/components/toolbar-secret-link.js
+++ b/ui/app/components/toolbar-secret-link.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 /**
  * @module ToolbarSecretLink
diff --git a/ui/app/components/transform-advanced-templating.js b/ui/app/components/transform-advanced-templating.js
index b56cbf821d587..762130dc31446 100644
--- a/ui/app/components/transform-advanced-templating.js
+++ b/ui/app/components/transform-advanced-templating.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { action, set } from '@ember/object';
diff --git a/ui/app/components/transform-create-form.js b/ui/app/components/transform-create-form.js
index 838c78f2140d4..12fadca2e76fb 100644
--- a/ui/app/components/transform-create-form.js
+++ b/ui/app/components/transform-create-form.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import TransformationEdit from './transformation-edit';
 
 export default TransformationEdit.extend({});
diff --git a/ui/app/components/transform-edit-base.js b/ui/app/components/transform-edit-base.js
index 4fb47b4853d39..252b8ac3e04b4 100644
--- a/ui/app/components/transform-edit-base.js
+++ b/ui/app/components/transform-edit-base.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import { or } from '@ember/object/computed';
 import { isBlank } from '@ember/utils';
diff --git a/ui/app/components/transform-edit-form.js b/ui/app/components/transform-edit-form.js
index 838c78f2140d4..12fadca2e76fb 100644
--- a/ui/app/components/transform-edit-form.js
+++ b/ui/app/components/transform-edit-form.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import TransformationEdit from './transformation-edit';
 
 export default TransformationEdit.extend({});
diff --git a/ui/app/components/transform-role-edit.js b/ui/app/components/transform-role-edit.js
index 83c2fe5f3b484..aff09afe33590 100644
--- a/ui/app/components/transform-role-edit.js
+++ b/ui/app/components/transform-role-edit.js
@@ -1,14 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import TransformBase, { addToList, removeFromList } from './transform-edit-base';
-import { inject as service } from '@ember/service';
 
 export default TransformBase.extend({
-  flashMessages: service(),
-  store: service(),
   initialTransformations: null,
 
   init() {
@@ -45,10 +37,10 @@ export default TransformBase.extend({
     });
 
     Promise.all(promises).then((res) => {
-      const hasError = res.find((r) => !!r.errorStatus);
+      let hasError = res.find((r) => !!r.errorStatus);
       if (hasError) {
-        const errorAdding = res.find((r) => r.errorStatus === 403 && r.action === 'ADD');
-        const errorRemoving = res.find((r) => r.errorStatus === 403 && r.action === 'REMOVE');
+        let errorAdding = res.find((r) => r.errorStatus === 403 && r.action === 'ADD');
+        let errorRemoving = res.find((r) => r.errorStatus === 403 && r.action === 'REMOVE');
 
         let message =
           'The edits to this role were successful, but allowed_roles for its transformations was not edited due to a lack of permissions.';
@@ -65,10 +57,7 @@ export default TransformBase.extend({
           message =
             'This role was edited to remove transformations, but this role was not removed from those transformations’ allowed_roles due to a lack of permissions.';
         }
-        this.flashMessages.info(message, {
-          sticky: true,
-          priority: 300,
-        });
+        this.flashMessages.stickyInfo(message);
       }
     });
   },
diff --git a/ui/app/components/transform-show-transformation.js b/ui/app/components/transform-show-transformation.js
index 9c7a0bede1e1e..a00970c9943a5 100644
--- a/ui/app/components/transform-show-transformation.js
+++ b/ui/app/components/transform-show-transformation.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import TransformBase from './transform-edit-base';
 import { computed } from '@ember/object';
 
@@ -12,12 +7,12 @@ export default TransformBase.extend({
       return;
     }
 
-    const { type, allowed_roles, tweak_source, name } = this.model;
-    const wildCardRole = allowed_roles.find((role) => role.includes('*'));
+    let { type, allowed_roles, tweak_source, name } = this.model;
+    let wildCardRole = allowed_roles.find((role) => role.includes('*'));
 
     // values to be returned
     let role = '<choose a role>';
-    const value = 'value=<enter your value here>';
+    let value = 'value=<enter your value here>';
     let tweak = '';
 
     // determine the role
diff --git a/ui/app/components/transform-template-edit.js b/ui/app/components/transform-template-edit.js
index 87e36f88701a0..548e2dd85c346 100644
--- a/ui/app/components/transform-template-edit.js
+++ b/ui/app/components/transform-template-edit.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import TransformBase from './transform-edit-base';
 
 export default TransformBase.extend({});
diff --git a/ui/app/components/transformation-edit.js b/ui/app/components/transformation-edit.js
index 15444da7b7283..a8bb726b8914a 100644
--- a/ui/app/components/transformation-edit.js
+++ b/ui/app/components/transformation-edit.js
@@ -1,14 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import TransformBase, { addToList, removeFromList } from './transform-edit-base';
-import { inject as service } from '@ember/service';
 
 export default TransformBase.extend({
-  flashMessages: service(),
-  store: service(),
   initialRoles: null,
 
   init() {
@@ -72,7 +64,7 @@ export default TransformBase.extend({
     const promises = updateRoles.map((r) => this.updateOrCreateRole(r, transformationId, backend));
 
     Promise.all(promises).then((results) => {
-      const hasError = results.find((role) => !!role.errorStatus);
+      let hasError = results.find((role) => !!role.errorStatus);
 
       if (hasError) {
         let message =
@@ -82,10 +74,7 @@ export default TransformBase.extend({
           // eg. trying to update a role with empty array as transformations
           message = `You've edited the allowed_roles for this transformation. However, the corresponding edits to some roles' transformations were not made`;
         }
-        this.flashMessages.info(message, {
-          sticky: true,
-          priority: 300,
-        });
+        this.flashMessages.stickyInfo(message);
       }
     });
   },
@@ -105,7 +94,7 @@ export default TransformBase.extend({
       event.preventDefault();
 
       this.applyChanges('save', () => {
-        const transformationId = this.model.id || this.model.name;
+        const transformationId = this.model.id;
         const newModelRoles = this.model.allowed_roles || [];
         const initialRoles = this.initialRoles || [];
 
diff --git a/ui/app/components/transit-edit.js b/ui/app/components/transit-edit.js
index ee0c1a88409b4..d8dae2a0082a1 100644
--- a/ui/app/components/transit-edit.js
+++ b/ui/app/components/transit-edit.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import { or } from '@ember/object/computed';
 import { isBlank } from '@ember/utils';
@@ -34,7 +29,7 @@ export default Component.extend(FocusOnInsertMixin, {
 
   waitForKeyUp: task(function* () {
     while (true) {
-      const event = yield waitForEvent(document.body, 'keyup');
+      let event = yield waitForEvent(document.body, 'keyup');
       this.onEscape(event);
     }
   })
diff --git a/ui/app/components/transit-key-action/export.js b/ui/app/components/transit-key-action/export.js
index e76a8b9ed5dc5..5f26aceee0143 100644
--- a/ui/app/components/transit-key-action/export.js
+++ b/ui/app/components/transit-key-action/export.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 
diff --git a/ui/app/components/transit-key-actions.js b/ui/app/components/transit-key-actions.js
index 39f61a955c4aa..1fd3894923b47 100644
--- a/ui/app/components/transit-key-actions.js
+++ b/ui/app/components/transit-key-actions.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { assign } from '@ember/polyfills';
 import { copy } from 'ember-copy';
 import { assert } from '@ember/debug';
@@ -98,7 +93,7 @@ export default Component.extend(TRANSIT_PARAMS, {
   },
 
   keyIsRSA: computed('key.type', function () {
-    const type = this.key.type;
+    let type = this.key.type;
     return type === 'rsa-2048' || type === 'rsa-3072' || type === 'rsa-4096';
   }),
 
@@ -125,9 +120,9 @@ export default Component.extend(TRANSIT_PARAMS, {
   },
 
   resetParams(oldAction, action) {
-    const params = copy(TRANSIT_PARAMS);
+    let params = copy(TRANSIT_PARAMS);
     let paramsToKeep;
-    const clearWithoutCheck =
+    let clearWithoutCheck =
       !oldAction ||
       // don't save values from datakey
       oldAction === 'datakey' ||
@@ -186,8 +181,8 @@ export default Component.extend(TRANSIT_PARAMS, {
   },
 
   compactData(data) {
-    const type = this.key.type;
-    const isRSA = type === 'rsa-2048' || type === 'rsa-3072' || type === 'rsa-4096';
+    let type = this.key.type;
+    let isRSA = type === 'rsa-2048' || type === 'rsa-3072' || type === 'rsa-4096';
     return Object.keys(data).reduce((result, key) => {
       if (key === 'signature_algorithm' && !isRSA) {
         return result;
@@ -221,11 +216,7 @@ export default Component.extend(TRANSIT_PARAMS, {
       this.toggleProperty('isModalActive');
     },
 
-    doSubmit(data, options = {}, maybeEvent) {
-      const event = options.type === 'submit' ? options : maybeEvent;
-      if (event) {
-        event.preventDefault();
-      }
+    doSubmit(data, options = {}) {
       const { backend, id } = this.getModelInfo();
       const action = this.selectedAction;
       const { encodedBase64, ...formData } = data || {};
@@ -237,7 +228,7 @@ export default Component.extend(TRANSIT_PARAMS, {
           formData.input = encodeString(formData.input);
         }
       }
-      const payload = formData ? this.compactData(formData) : null;
+      let payload = formData ? this.compactData(formData) : null;
       this.setProperties({
         errors: null,
         result: null,
diff --git a/ui/app/components/ui-wizard.js b/ui/app/components/ui-wizard.js
index 85d0d8ff0043d..0793a2a6be97f 100644
--- a/ui/app/components/ui-wizard.js
+++ b/ui/app/components/ui-wizard.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import { alias, or } from '@ember/object/computed';
 import Component from '@ember/component';
@@ -12,7 +7,6 @@ export default Component.extend({
   classNames: ['ui-wizard-container'],
   wizard: service(),
   auth: service(),
-  router: service(),
 
   shouldRender: or('auth.currentToken', 'wizard.showWhenUnauthenticated'),
   currentState: alias('wizard.currentState'),
@@ -22,7 +16,6 @@ export default Component.extend({
   componentState: alias('wizard.componentState'),
   nextFeature: alias('wizard.nextFeature'),
   nextStep: alias('wizard.nextStep'),
-  currentRouteName: alias('router.currentRouteName'),
 
   actions: {
     dismissWizard() {
@@ -30,8 +23,8 @@ export default Component.extend({
     },
 
     advanceWizard() {
-      const inInit = matchesState('init', this.wizard.currentState);
-      const event = inInit ? this.wizard.initEvent || 'CONTINUE' : 'CONTINUE';
+      let inInit = matchesState('init', this.wizard.currentState);
+      let event = inInit ? this.wizard.initEvent || 'CONTINUE' : 'CONTINUE';
       this.wizard.transitionTutorialMachine(this.currentState, event);
     },
 
diff --git a/ui/app/components/wizard-content.js b/ui/app/components/wizard-content.js
index 8cee2e9bf9411..ecba2d7efc2fe 100644
--- a/ui/app/components/wizard-content.js
+++ b/ui/app/components/wizard-content.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { alias, reads } from '@ember/object/computed';
 import { inject as service } from '@ember/service';
 import Component from '@ember/component';
@@ -68,8 +63,8 @@ export default Component.extend({
   ),
   currentTutorialProgress: computed('tutorialState', function () {
     if (this.tutorialState.includes('init.active')) {
-      const currentStepName = this.tutorialState.split('.')[2];
-      const currentStepNumber = INIT_STEPS.indexOf(currentStepName) + 1;
+      let currentStepName = this.tutorialState.split('.')[2];
+      let currentStepNumber = INIT_STEPS.indexOf(currentStepName) + 1;
       return {
         percentage: (currentStepNumber / INIT_STEPS.length) * 100,
         text: `Step ${currentStepNumber} of ${INIT_STEPS.length}`,
@@ -85,7 +80,7 @@ export default Component.extend({
     'currentTutorialProgress.percentage',
     'wizard.featureList',
     function () {
-      const bar = [];
+      let bar = [];
       if (this.currentTutorialProgress) {
         bar.push({
           style: `width:${this.currentTutorialProgress.percentage}%;`,
diff --git a/ui/app/components/wizard/features-selection.js b/ui/app/components/wizard/features-selection.js
index a14e993189436..669e6a2f93d66 100644
--- a/ui/app/components/wizard/features-selection.js
+++ b/ui/app/components/wizard/features-selection.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { or, not } from '@ember/object/computed';
 import { inject as service } from '@ember/service';
 import Component from '@ember/component';
@@ -20,13 +15,13 @@ export default Component.extend({
   },
 
   maybeHideFeatures() {
-    const features = this.allFeatures;
+    let features = this.allFeatures;
     features.forEach((feat) => {
       feat.disabled = this.doesNotHavePermission(feat.requiredPermissions);
     });
 
     if (this.showReplication === false) {
-      const feature = this.allFeatures.findBy('key', 'replication');
+      let feature = this.allFeatures.findBy('key', 'replication');
       feature.show = false;
     }
   },
@@ -45,7 +40,7 @@ export default Component.extend({
 
   estimatedTime: computed('selectedFeatures', function () {
     let time = 0;
-    for (const feature of Object.keys(FEATURE_MACHINE_TIME)) {
+    for (let feature of Object.keys(FEATURE_MACHINE_TIME)) {
       if (this.selectedFeatures.includes(feature)) {
         time += FEATURE_MACHINE_TIME[feature];
       }
@@ -141,7 +136,7 @@ export default Component.extend({
 
   actions: {
     saveFeatures() {
-      const wizard = this.wizard;
+      let wizard = this.wizard;
       wizard.saveFeatures(this.selectedFeatures);
       wizard.transitionTutorialMachine('active.select', 'CONTINUE');
     },
diff --git a/ui/app/components/wizard/mounts-wizard.js b/ui/app/components/wizard/mounts-wizard.js
index 8dc5c62edfcd6..8e76528aa5109 100644
--- a/ui/app/components/wizard/mounts-wizard.js
+++ b/ui/app/components/wizard/mounts-wizard.js
@@ -1,13 +1,8 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import { alias, equal } from '@ember/object/computed';
 import Component from '@ember/component';
 import { computed } from '@ember/object';
-import { mountableEngines } from 'vault/helpers/mountable-secret-engines';
+import { engines } from 'vault/helpers/mountable-secret-engines';
 import { methods } from 'vault/helpers/mountable-auth-methods';
 import { supportedSecretBackends } from 'vault/helpers/supported-secret-backends';
 const supportedSecrets = supportedSecretBackends();
@@ -29,7 +24,7 @@ export default Component.extend({
   needsEncryption: equal('mountSubtype', 'transit'),
   stepComponent: alias('wizard.stepComponent'),
   detailsComponent: computed('currentMachine', 'mountSubtype', function () {
-    const suffix = this.currentMachine === 'secrets' ? 'engine' : 'method';
+    let suffix = this.currentMachine === 'secrets' ? 'engine' : 'method';
     return this.mountSubtype ? `wizard/${this.mountSubtype}-${suffix}` : null;
   }),
   isSupported: computed('currentMachine', 'mountSubtype', function () {
@@ -41,7 +36,7 @@ export default Component.extend({
   }),
   mountName: computed('currentMachine', 'mountSubtype', function () {
     if (this.currentMachine === 'secrets') {
-      const secret = mountableEngines().find((engine) => {
+      var secret = engines().find((engine) => {
         return engine.type === this.mountSubtype;
       });
       if (secret) {
diff --git a/ui/app/components/wizard/secrets-keymgmt.js b/ui/app/components/wizard/secrets-keymgmt.js
index aedcc128b46e7..7ea5db24bf480 100644
--- a/ui/app/components/wizard/secrets-keymgmt.js
+++ b/ui/app/components/wizard/secrets-keymgmt.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 
 export default class WizardSecretsKeymgmtComponent extends Component {
diff --git a/ui/app/components/wrap-ttl.js b/ui/app/components/wrap-ttl.js
index b05620e44716a..8f40b688679a4 100644
--- a/ui/app/components/wrap-ttl.js
+++ b/ui/app/components/wrap-ttl.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { assert } from '@ember/debug';
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
diff --git a/ui/app/config/environment.d.ts b/ui/app/config/environment.d.ts
deleted file mode 100644
index d7110d08e149c..0000000000000
--- a/ui/app/config/environment.d.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-/**
- * Type declarations for
- *    import config from 'my-app/config/environment'
- */
-declare const config: {
-  environment: string;
-  modulePrefix: string;
-  podModulePrefix: string;
-  locationType: 'history' | 'hash' | 'none' | 'auto';
-  rootURL: string;
-  APP: Record<string, unknown>;
-};
-
-export default config;
diff --git a/ui/app/controllers/application.js b/ui/app/controllers/application.js
index ee8edcd4a4a92..22643644c6dba 100644
--- a/ui/app/controllers/application.js
+++ b/ui/app/controllers/application.js
@@ -1,14 +1,18 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import Controller from '@ember/controller';
+import { computed } from '@ember/object';
 import config from '../config/environment';
 
 export default Controller.extend({
   env: config.environment,
   auth: service(),
   store: service(),
+  activeCluster: computed('auth.activeCluster', function () {
+    let id = this.auth.activeCluster;
+    return id ? this.store.peekRecord('cluster', id) : null;
+  }),
+  activeClusterName: computed('activeCluster', function () {
+    const activeCluster = this.activeCluster;
+    return activeCluster ? activeCluster.get('name') : null;
+  }),
 });
diff --git a/ui/app/controllers/vault.js b/ui/app/controllers/vault.js
index bda485ffa1b50..827eace50f4a4 100644
--- a/ui/app/controllers/vault.js
+++ b/ui/app/controllers/vault.js
@@ -1,10 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import Controller from '@ember/controller';
+import { computed } from '@ember/object';
 import config from '../config/environment';
 
 export default Controller.extend({
@@ -19,4 +15,12 @@ export default Controller.extend({
   env: config.environment,
   auth: service(),
   store: service(),
+  activeCluster: computed('auth.activeCluster', function () {
+    let id = this.auth.activeCluster;
+    return id ? this.store.peekRecord('cluster', id) : null;
+  }),
+  activeClusterName: computed('activeCluster', function () {
+    const activeCluster = this.activeCluster;
+    return activeCluster ? activeCluster.get('name') : null;
+  }),
 });
diff --git a/ui/app/controllers/vault/cluster.js b/ui/app/controllers/vault/cluster.js
index c98cdf3cb1eb5..8528655e82d4c 100644
--- a/ui/app/controllers/vault/cluster.js
+++ b/ui/app/controllers/vault/cluster.js
@@ -1,13 +1,8 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /* eslint-disable ember/no-observers */
 import { inject as service } from '@ember/service';
 import { alias } from '@ember/object/computed';
 import Controller from '@ember/controller';
-import { observer } from '@ember/object';
+import { observer, computed } from '@ember/object';
 export default Controller.extend({
   auth: service(),
   store: service(),
@@ -15,7 +10,6 @@ export default Controller.extend({
   router: service(),
   permissions: service(),
   namespaceService: service('namespace'),
-  flashMessages: service(),
 
   vaultVersion: service('version'),
   console: service(),
@@ -36,7 +30,35 @@ export default Controller.extend({
   }),
 
   consoleOpen: alias('console.isOpen'),
-  activeCluster: alias('auth.activeCluster'),
+
+  activeCluster: computed('auth.activeCluster', function () {
+    return this.store.peekRecord('cluster', this.auth.activeCluster);
+  }),
+
+  activeClusterName: computed('activeCluster', function () {
+    const activeCluster = this.activeCluster;
+    return activeCluster ? activeCluster.get('name') : null;
+  }),
+
+  showNav: computed(
+    'router.currentRouteName',
+    'activeClusterName',
+    'auth.currentToken',
+    'activeCluster.{dr.isSecondary,needsInit,sealed}',
+    function () {
+      if (this.activeCluster.dr?.isSecondary || this.activeCluster.needsInit || this.activeCluster.sealed) {
+        return false;
+      }
+      if (
+        this.activeClusterName &&
+        this.auth.currentToken &&
+        this.router.currentRouteName !== 'vault.cluster.auth'
+      ) {
+        return true;
+      }
+      return;
+    }
+  ),
 
   actions: {
     toggleConsole() {
diff --git a/ui/app/controllers/vault/cluster/access/control-groups-configure.js b/ui/app/controllers/vault/cluster/access/control-groups-configure.js
index bd31e05291669..847ad46ca25db 100644
--- a/ui/app/controllers/vault/cluster/access/control-groups-configure.js
+++ b/ui/app/controllers/vault/cluster/access/control-groups-configure.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Controller from '@ember/controller';
 
 export default Controller.extend({
diff --git a/ui/app/controllers/vault/cluster/access/identity/aliases/add.js b/ui/app/controllers/vault/cluster/access/identity/aliases/add.js
index 48e62da10a46d..e22b4416a8455 100644
--- a/ui/app/controllers/vault/cluster/access/identity/aliases/add.js
+++ b/ui/app/controllers/vault/cluster/access/identity/aliases/add.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import CreateController from '../create';
 
 export default CreateController.extend({
diff --git a/ui/app/controllers/vault/cluster/access/identity/aliases/edit.js b/ui/app/controllers/vault/cluster/access/identity/aliases/edit.js
index a55ba46aa1d1b..dc06915f03b3f 100644
--- a/ui/app/controllers/vault/cluster/access/identity/aliases/edit.js
+++ b/ui/app/controllers/vault/cluster/access/identity/aliases/edit.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import CreateController from './add';
 
 export default CreateController.extend();
diff --git a/ui/app/controllers/vault/cluster/access/identity/aliases/index.js b/ui/app/controllers/vault/cluster/access/identity/aliases/index.js
index a15868b4d61ca..7c7ef6dddab4b 100644
--- a/ui/app/controllers/vault/cluster/access/identity/aliases/index.js
+++ b/ui/app/controllers/vault/cluster/access/identity/aliases/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Controller from '@ember/controller';
 import ListController from 'core/mixins/list-controller';
 
diff --git a/ui/app/controllers/vault/cluster/access/identity/create.js b/ui/app/controllers/vault/cluster/access/identity/create.js
index e4add3a24f1cc..704c262949bd0 100644
--- a/ui/app/controllers/vault/cluster/access/identity/create.js
+++ b/ui/app/controllers/vault/cluster/access/identity/create.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Controller from '@ember/controller';
 import { task } from 'ember-concurrency';
 
@@ -10,15 +5,15 @@ export default Controller.extend({
   showRoute: 'vault.cluster.access.identity.show',
   showTab: 'details',
   navAfterSave: task(function* ({ saveType, model }) {
-    const isDelete = saveType === 'delete';
-    const type = model.get('identityType');
-    const listRoutes = {
+    let isDelete = saveType === 'delete';
+    let type = model.get('identityType');
+    let listRoutes = {
       'entity-alias': 'vault.cluster.access.identity.aliases.index',
       'group-alias': 'vault.cluster.access.identity.aliases.index',
       group: 'vault.cluster.access.identity.index',
       entity: 'vault.cluster.access.identity.index',
     };
-    const routeName = listRoutes[type];
+    let routeName = listRoutes[type];
     if (!isDelete) {
       yield this.transitionToRoute(this.showRoute, model.id, this.showTab);
       return;
diff --git a/ui/app/controllers/vault/cluster/access/identity/edit.js b/ui/app/controllers/vault/cluster/access/identity/edit.js
index 543c64376ebb5..43916a85850ba 100644
--- a/ui/app/controllers/vault/cluster/access/identity/edit.js
+++ b/ui/app/controllers/vault/cluster/access/identity/edit.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import CreateController from './create';
 
 export default CreateController.extend();
diff --git a/ui/app/controllers/vault/cluster/access/identity/index.js b/ui/app/controllers/vault/cluster/access/identity/index.js
index 85d17570201cd..bd00ce7c60ff3 100644
--- a/ui/app/controllers/vault/cluster/access/identity/index.js
+++ b/ui/app/controllers/vault/cluster/access/identity/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import Controller from '@ember/controller';
 import ListController from 'core/mixins/list-controller';
@@ -12,8 +7,8 @@ export default Controller.extend(ListController, {
 
   actions: {
     delete(model) {
-      const type = model.get('identityType');
-      const id = model.id;
+      let type = model.get('identityType');
+      let id = model.id;
       return model
         .destroyRecord()
         .then(() => {
@@ -28,9 +23,9 @@ export default Controller.extend(ListController, {
     },
 
     toggleDisabled(model) {
-      const action = model.get('disabled') ? ['enabled', 'enabling'] : ['disabled', 'disabling'];
-      const type = model.get('identityType');
-      const id = model.id;
+      let action = model.get('disabled') ? ['enabled', 'enabling'] : ['disabled', 'disabling'];
+      let type = model.get('identityType');
+      let id = model.id;
       model.toggleProperty('disabled');
 
       model
diff --git a/ui/app/controllers/vault/cluster/access/identity/merge.js b/ui/app/controllers/vault/cluster/access/identity/merge.js
index 543c64376ebb5..43916a85850ba 100644
--- a/ui/app/controllers/vault/cluster/access/identity/merge.js
+++ b/ui/app/controllers/vault/cluster/access/identity/merge.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import CreateController from './create';
 
 export default CreateController.extend();
diff --git a/ui/app/controllers/vault/cluster/access/leases/index.js b/ui/app/controllers/vault/cluster/access/leases/index.js
index 1eaa337a80653..001ce04510ee5 100644
--- a/ui/app/controllers/vault/cluster/access/leases/index.js
+++ b/ui/app/controllers/vault/cluster/access/leases/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Controller from '@ember/controller';
 
 export default Controller.extend({
diff --git a/ui/app/controllers/vault/cluster/access/leases/list-root.js b/ui/app/controllers/vault/cluster/access/leases/list-root.js
index eb7ed18e3103c..ea1fedd0a52f6 100644
--- a/ui/app/controllers/vault/cluster/access/leases/list-root.js
+++ b/ui/app/controllers/vault/cluster/access/leases/list-root.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from './list';
diff --git a/ui/app/controllers/vault/cluster/access/leases/list.js b/ui/app/controllers/vault/cluster/access/leases/list.js
index 42ff83a518517..5fa6c5cbb72f2 100644
--- a/ui/app/controllers/vault/cluster/access/leases/list.js
+++ b/ui/app/controllers/vault/cluster/access/leases/list.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import { computed } from '@ember/object';
 import Controller, { inject as controller } from '@ember/controller';
@@ -30,8 +25,8 @@ export default Controller.extend(ListController, {
   }),
 
   emptyTitle: computed('baseKey.id', 'filter', 'filterIsFolder', function () {
-    const id = this.baseKey.id;
-    const filter = this.filter;
+    let id = this.baseKey.id;
+    let filter = this.filter;
     if (id === '') {
       return 'There are currently no leases.';
     }
diff --git a/ui/app/controllers/vault/cluster/access/leases/show.js b/ui/app/controllers/vault/cluster/access/leases/show.js
index 8d5ce795765ef..5ce78487c6429 100644
--- a/ui/app/controllers/vault/cluster/access/leases/show.js
+++ b/ui/app/controllers/vault/cluster/access/leases/show.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { next } from '@ember/runloop';
 import { inject as service } from '@ember/service';
 import { computed } from '@ember/object';
diff --git a/ui/app/controllers/vault/cluster/access/method/item/list.js b/ui/app/controllers/vault/cluster/access/method/item/list.js
index 92dd3578347e5..a89b15a6500d7 100644
--- a/ui/app/controllers/vault/cluster/access/method/item/list.js
+++ b/ui/app/controllers/vault/cluster/access/method/item/list.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Controller from '@ember/controller';
 import ListController from 'vault/mixins/list-controller';
 
diff --git a/ui/app/controllers/vault/cluster/access/methods.js b/ui/app/controllers/vault/cluster/access/methods.js
index 9e0fa3a98ed58..222874afc85e2 100644
--- a/ui/app/controllers/vault/cluster/access/methods.js
+++ b/ui/app/controllers/vault/cluster/access/methods.js
@@ -1,77 +1,17 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Controller from '@ember/controller';
-import { dropTask } from 'ember-concurrency';
-import { inject as service } from '@ember/service';
-import { action } from '@ember/object';
-import { tracked } from '@glimmer/tracking';
-
-export default class VaultClusterAccessMethodsController extends Controller {
-  @service flashMessages;
-
-  @tracked authMethodOptions = [];
-  @tracked selectedAuthType = null;
-  @tracked selectedAuthName = null;
-
-  queryParams = ['page, pageFilter'];
-
-  page = 1;
-  pageFilter = null;
-  filter = null;
-
-  get authMethodList() {
-    // return an options list to filter by engine type, ex: 'kv'
-    if (this.selectedAuthType) {
-      // check first if the user has also filtered by name.
-      // names are individualized across type so you can't have the same name for an aws auth method and userpass.
-      // this means it's fine to filter by first type and then name or just name.
-      if (this.selectedAuthName) {
-        return this.model.filter((method) => this.selectedAuthName === method.id);
-      }
-      // otherwise filter by auth type
-      return this.model.filter((method) => this.selectedAuthType === method.type);
-    }
-    // return an options list to filter by auth name, ex: 'my-userpass'
-    if (this.selectedAuthName) {
-      return this.model.filter((method) => this.selectedAuthName === method.id);
-    }
-    // no filters, return full sorted list.
-    return this.model;
-  }
-
-  get authMethodArrayByType() {
-    const arrayOfAllAuthTypes = this.authMethodList.map((modelObject) => modelObject.type);
-    // filter out repeated auth types (e.g. [userpass, userpass] => [userpass])
-    const arrayOfUniqueAuthTypes = [...new Set(arrayOfAllAuthTypes)];
-
-    return arrayOfUniqueAuthTypes.map((authType) => ({
-      name: authType,
-      id: authType,
-    }));
-  }
-
-  get authMethodArrayByName() {
-    return this.authMethodList.map((modelObject) => ({
-      name: modelObject.id,
-      id: modelObject.id,
-    }));
-  }
+import { task } from 'ember-concurrency';
 
-  @action
-  filterAuthType([type]) {
-    this.selectedAuthType = type;
-  }
+export default Controller.extend({
+  queryParams: {
+    page: 'page',
+    pageFilter: 'pageFilter',
+  },
 
-  @action
-  filterAuthName([name]) {
-    this.selectedAuthName = name;
-  }
+  page: 1,
+  pageFilter: null,
+  filter: null,
 
-  @dropTask
-  *disableMethod(method) {
+  disableMethod: task(function* (method) {
     const { type, path } = method;
     try {
       yield method.destroyRecord();
@@ -81,5 +21,5 @@ export default class VaultClusterAccessMethodsController extends Controller {
         `There was an error disabling Auth Method at ${path}: ${err.errors.join(' ')}.`
       );
     }
-  }
-}
+  }).drop(),
+});
diff --git a/ui/app/controllers/vault/cluster/access/mfa/enforcements/enforcement/index.js b/ui/app/controllers/vault/cluster/access/mfa/enforcements/enforcement/index.js
index 7bb9125a9cacf..202c988c390ee 100644
--- a/ui/app/controllers/vault/cluster/access/mfa/enforcements/enforcement/index.js
+++ b/ui/app/controllers/vault/cluster/access/mfa/enforcements/enforcement/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Controller from '@ember/controller';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
diff --git a/ui/app/controllers/vault/cluster/access/mfa/enforcements/index.js b/ui/app/controllers/vault/cluster/access/mfa/enforcements/index.js
index cb43614a36727..a7fae5de3c3d5 100644
--- a/ui/app/controllers/vault/cluster/access/mfa/enforcements/index.js
+++ b/ui/app/controllers/vault/cluster/access/mfa/enforcements/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Controller from '@ember/controller';
 
 export default class MfaEnforcementListController extends Controller {
diff --git a/ui/app/controllers/vault/cluster/access/mfa/methods.js b/ui/app/controllers/vault/cluster/access/mfa/methods.js
index 0303c754ed453..b24fe242eb6fc 100644
--- a/ui/app/controllers/vault/cluster/access/mfa/methods.js
+++ b/ui/app/controllers/vault/cluster/access/mfa/methods.js
@@ -1,12 +1,9 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Controller from '@ember/controller';
 
 export default class MfaMethodsListController extends Controller {
-  queryParams = ['page'];
+  queryParams = {
+    page: 'page',
+  };
 
   page = 1;
 }
diff --git a/ui/app/controllers/vault/cluster/access/mfa/methods/create.js b/ui/app/controllers/vault/cluster/access/mfa/methods/create.js
index 9070d1aa570b5..1af4032fb80db 100644
--- a/ui/app/controllers/vault/cluster/access/mfa/methods/create.js
+++ b/ui/app/controllers/vault/cluster/access/mfa/methods/create.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
@@ -11,7 +6,6 @@ import { capitalize } from '@ember/string';
 import { task } from 'ember-concurrency';
 
 export default class MfaMethodCreateController extends Controller {
-  @service store;
   @service flashMessages;
   @service router;
 
diff --git a/ui/app/controllers/vault/cluster/access/mfa/methods/method/index.js b/ui/app/controllers/vault/cluster/access/mfa/methods/method/index.js
index 021148afd3961..cce625543fa05 100644
--- a/ui/app/controllers/vault/cluster/access/mfa/methods/method/index.js
+++ b/ui/app/controllers/vault/cluster/access/mfa/methods/method/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
diff --git a/ui/app/controllers/vault/cluster/access/namespaces/create.js b/ui/app/controllers/vault/cluster/access/namespaces/create.js
index 6710ecfd77bc8..1f410dd2d909a 100644
--- a/ui/app/controllers/vault/cluster/access/namespaces/create.js
+++ b/ui/app/controllers/vault/cluster/access/namespaces/create.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import Controller from '@ember/controller';
 export default Controller.extend({
diff --git a/ui/app/controllers/vault/cluster/access/namespaces/index.js b/ui/app/controllers/vault/cluster/access/namespaces/index.js
index 8454f2544463d..c2b6041daf25a 100644
--- a/ui/app/controllers/vault/cluster/access/namespaces/index.js
+++ b/ui/app/controllers/vault/cluster/access/namespaces/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import { alias } from '@ember/object/computed';
 import Controller from '@ember/controller';
diff --git a/ui/app/controllers/vault/cluster/access/oidc.js b/ui/app/controllers/vault/cluster/access/oidc.js
index 28e06f16dcb54..c6ef6dd706f37 100644
--- a/ui/app/controllers/vault/cluster/access/oidc.js
+++ b/ui/app/controllers/vault/cluster/access/oidc.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
diff --git a/ui/app/controllers/vault/cluster/access/oidc/assignments/assignment/details.js b/ui/app/controllers/vault/cluster/access/oidc/assignments/assignment/details.js
index b01cf1deb8dd1..bf21dc72f8b55 100644
--- a/ui/app/controllers/vault/cluster/access/oidc/assignments/assignment/details.js
+++ b/ui/app/controllers/vault/cluster/access/oidc/assignments/assignment/details.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Controller from '@ember/controller';
 import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
diff --git a/ui/app/controllers/vault/cluster/access/oidc/clients/client.js b/ui/app/controllers/vault/cluster/access/oidc/clients/client.js
index 3aeabef594e07..4e3e0c148990f 100644
--- a/ui/app/controllers/vault/cluster/access/oidc/clients/client.js
+++ b/ui/app/controllers/vault/cluster/access/oidc/clients/client.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
diff --git a/ui/app/controllers/vault/cluster/access/oidc/clients/client/details.js b/ui/app/controllers/vault/cluster/access/oidc/clients/client/details.js
index ddf5ff9a4b17a..55a8b296ee49a 100644
--- a/ui/app/controllers/vault/cluster/access/oidc/clients/client/details.js
+++ b/ui/app/controllers/vault/cluster/access/oidc/clients/client/details.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Controller from '@ember/controller';
 import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
diff --git a/ui/app/controllers/vault/cluster/access/oidc/keys/key.js b/ui/app/controllers/vault/cluster/access/oidc/keys/key.js
index 63e06e2bed3b2..1658fda3a6d3d 100644
--- a/ui/app/controllers/vault/cluster/access/oidc/keys/key.js
+++ b/ui/app/controllers/vault/cluster/access/oidc/keys/key.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
diff --git a/ui/app/controllers/vault/cluster/access/oidc/keys/key/details.js b/ui/app/controllers/vault/cluster/access/oidc/keys/key/details.js
index 642337f5fe799..de844e1d7ff5d 100644
--- a/ui/app/controllers/vault/cluster/access/oidc/keys/key/details.js
+++ b/ui/app/controllers/vault/cluster/access/oidc/keys/key/details.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Controller from '@ember/controller';
 import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
@@ -10,7 +5,6 @@ import { task } from 'ember-concurrency';
 import { waitFor } from '@ember/test-waiters';
 
 export default class OidcKeyDetailsController extends Controller {
-  @service store;
   @service router;
   @service flashMessages;
 
diff --git a/ui/app/controllers/vault/cluster/access/oidc/providers/provider.js b/ui/app/controllers/vault/cluster/access/oidc/providers/provider.js
index 20876717ea03a..a0b1b295b9083 100644
--- a/ui/app/controllers/vault/cluster/access/oidc/providers/provider.js
+++ b/ui/app/controllers/vault/cluster/access/oidc/providers/provider.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
diff --git a/ui/app/controllers/vault/cluster/access/oidc/providers/provider/details.js b/ui/app/controllers/vault/cluster/access/oidc/providers/provider/details.js
index 2e493d4247ca7..6a15ef2e3fb71 100644
--- a/ui/app/controllers/vault/cluster/access/oidc/providers/provider/details.js
+++ b/ui/app/controllers/vault/cluster/access/oidc/providers/provider/details.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Controller from '@ember/controller';
 import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
diff --git a/ui/app/controllers/vault/cluster/access/oidc/scopes/scope/details.js b/ui/app/controllers/vault/cluster/access/oidc/scopes/scope/details.js
index 48946336c66b5..1934ae082e5c3 100644
--- a/ui/app/controllers/vault/cluster/access/oidc/scopes/scope/details.js
+++ b/ui/app/controllers/vault/cluster/access/oidc/scopes/scope/details.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Controller from '@ember/controller';
 import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
diff --git a/ui/app/controllers/vault/cluster/auth.js b/ui/app/controllers/vault/cluster/auth.js
index 9095f4934d547..496ceaf1c8bcf 100644
--- a/ui/app/controllers/vault/cluster/auth.js
+++ b/ui/app/controllers/vault/cluster/auth.js
@@ -1,32 +1,29 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import { alias } from '@ember/object/computed';
 import Controller, { inject as controller } from '@ember/controller';
 import { task, timeout } from 'ember-concurrency';
 
 export default Controller.extend({
-  flashMessages: service(),
   vaultController: controller('vault'),
   clusterController: controller('vault.cluster'),
   namespaceService: service('namespace'),
   featureFlagService: service('featureFlag'),
   auth: service(),
   router: service(),
+
   queryParams: [{ authMethod: 'with', oidcProvider: 'o' }],
+
   namespaceQueryParam: alias('clusterController.namespaceQueryParam'),
   wrappedToken: alias('vaultController.wrappedToken'),
   redirectTo: alias('vaultController.redirectTo'),
   managedNamespaceRoot: alias('featureFlagService.managedNamespaceRoot'),
+
   authMethod: '',
   oidcProvider: '',
 
   get managedNamespaceChild() {
-    const fullParam = this.namespaceQueryParam;
-    const split = fullParam.split('/');
+    let fullParam = this.namespaceQueryParam;
+    let split = fullParam.split('/');
     if (split.length > 1) {
       split.shift();
       return `/${split.join('/')}`;
diff --git a/ui/app/controllers/vault/cluster/clients.js b/ui/app/controllers/vault/cluster/clients.js
index 04fdebd10fb12..7892c93569fa1 100644
--- a/ui/app/controllers/vault/cluster/clients.js
+++ b/ui/app/controllers/vault/cluster/clients.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Controller from '@ember/controller';
 
 export default class ClientsController extends Controller {}
diff --git a/ui/app/controllers/vault/cluster/init.js b/ui/app/controllers/vault/cluster/init.js
index d70c6462fb112..d4a45c0d0e6e2 100644
--- a/ui/app/controllers/vault/cluster/init.js
+++ b/ui/app/controllers/vault/cluster/init.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { computed } from '@ember/object';
 import Controller from '@ember/controller';
 
@@ -41,9 +36,9 @@ export default Controller.extend(DEFAULTS, {
 
   actions: {
     initCluster(data) {
-      const isCloudSeal = !!this.model.sealType && this.model.sealType !== 'shamir';
+      let isCloudSeal = !!this.model.sealType && this.model.sealType !== 'shamir';
       if (data.secret_shares) {
-        const shares = parseInt(data.secret_shares, 10);
+        let shares = parseInt(data.secret_shares, 10);
         data.secret_shares = shares;
         if (isCloudSeal) {
           data.stored_shares = 1;
@@ -52,7 +47,7 @@ export default Controller.extend(DEFAULTS, {
         }
       }
       if (data.secret_threshold) {
-        const threshold = parseInt(data.secret_threshold, 10);
+        let threshold = parseInt(data.secret_threshold, 10);
         data.secret_threshold = threshold;
         if (isCloudSeal) {
           data.recovery_threshold = threshold;
diff --git a/ui/app/controllers/vault/cluster/mfa-setup.js b/ui/app/controllers/vault/cluster/mfa-setup.js
index 1dc60312a2ee5..54c250cc17184 100644
--- a/ui/app/controllers/vault/cluster/mfa-setup.js
+++ b/ui/app/controllers/vault/cluster/mfa-setup.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
diff --git a/ui/app/controllers/vault/cluster/oidc-callback.js b/ui/app/controllers/vault/cluster/oidc-callback.js
index ebf00f50ff249..aef72bb20cee3 100644
--- a/ui/app/controllers/vault/cluster/oidc-callback.js
+++ b/ui/app/controllers/vault/cluster/oidc-callback.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Controller from '@ember/controller';
 
 export default Controller.extend({
diff --git a/ui/app/controllers/vault/cluster/oidc-provider-ns.js b/ui/app/controllers/vault/cluster/oidc-provider-ns.js
index dd5c512bd1058..d3825446c9292 100644
--- a/ui/app/controllers/vault/cluster/oidc-provider-ns.js
+++ b/ui/app/controllers/vault/cluster/oidc-provider-ns.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import VaultClusterOidcProviderController from './oidc-provider';
 
 // Use same params as the base oidc-provider route
diff --git a/ui/app/controllers/vault/cluster/oidc-provider.js b/ui/app/controllers/vault/cluster/oidc-provider.js
index cd0434cf8363b..cd92bfcfc6535 100644
--- a/ui/app/controllers/vault/cluster/oidc-provider.js
+++ b/ui/app/controllers/vault/cluster/oidc-provider.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Controller from '@ember/controller';
 
 export default class VaultClusterOidcProviderController extends Controller {
diff --git a/ui/app/controllers/vault/cluster/policies/create.js b/ui/app/controllers/vault/cluster/policies/create.js
new file mode 100644
index 0000000000000..405f653270dd2
--- /dev/null
+++ b/ui/app/controllers/vault/cluster/policies/create.js
@@ -0,0 +1,20 @@
+import Controller from '@ember/controller';
+import trimRight from 'vault/utils/trim-right';
+import PolicyEditController from 'vault/mixins/policy-edit-controller';
+
+export default Controller.extend(PolicyEditController, {
+  showFileUpload: false,
+  file: null,
+  actions: {
+    setPolicyFromFile(index, fileInfo) {
+      let { value, fileName } = fileInfo;
+      let model = this.model;
+      model.set('policy', value);
+      if (!model.get('name')) {
+        let trimmedFileName = trimRight(fileName, ['.json', '.txt', '.hcl', '.policy']);
+        model.set('name', trimmedFileName);
+      }
+      this.set('showFileUpload', false);
+    },
+  },
+});
diff --git a/ui/app/controllers/vault/cluster/policies/index.js b/ui/app/controllers/vault/cluster/policies/index.js
index 0b0633ed23120..2eb3478b3b13d 100644
--- a/ui/app/controllers/vault/cluster/policies/index.js
+++ b/ui/app/controllers/vault/cluster/policies/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import { computed } from '@ember/object';
 import Controller from '@ember/controller';
@@ -53,9 +48,9 @@ export default Controller.extend({
       this.set('filterFocused', bool);
     },
     deletePolicy(model) {
-      const policyType = model.get('policyType');
-      const name = model.id;
-      const flash = this.flashMessages;
+      let policyType = model.get('policyType');
+      let name = model.id;
+      let flash = this.flashMessages;
       model
         .destroyRecord()
         .then(() => {
@@ -64,7 +59,7 @@ export default Controller.extend({
           flash.success(`${policyType.toUpperCase()} policy "${name}" was successfully deleted.`);
         })
         .catch((e) => {
-          const errors = e.errors ? e.errors.join('') : e.message;
+          let errors = e.errors ? e.errors.join('') : e.message;
           flash.danger(
             `There was an error deleting the ${policyType.toUpperCase()} policy "${name}": ${errors}.`
           );
diff --git a/ui/app/controllers/vault/cluster/policy/edit.js b/ui/app/controllers/vault/cluster/policy/edit.js
index ce438f49de466..8a14b3c903c90 100644
--- a/ui/app/controllers/vault/cluster/policy/edit.js
+++ b/ui/app/controllers/vault/cluster/policy/edit.js
@@ -1,28 +1,4 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Controller from '@ember/controller';
-import { action } from '@ember/object';
-import { inject as service } from '@ember/service';
-
-export default class PolicyEditController extends Controller {
-  @service router;
-  @service flashMessages;
+import PolicyEditController from 'vault/mixins/policy-edit-controller';
 
-  @action
-  async deletePolicy() {
-    const { policyType, name } = this.model;
-    try {
-      await this.model.destroyRecord();
-      this.flashMessages.success(`${policyType.toUpperCase()} policy "${name}" was successfully deleted.`);
-      this.router.transitionTo('vault.cluster.policies', policyType);
-    } catch (error) {
-      this.model.rollbackAttributes();
-      const errors = error.errors ? error.errors.join('. ') : error.message;
-      const message = `There was an error deleting the ${policyType.toUpperCase()} policy "${name}": ${errors}.`;
-      this.flashMessages.danger(message);
-    }
-  }
-}
+export default Controller.extend(PolicyEditController);
diff --git a/ui/app/controllers/vault/cluster/replication-dr-promote/index.js b/ui/app/controllers/vault/cluster/replication-dr-promote/index.js
index f067e115fbc32..0adb652d4f549 100644
--- a/ui/app/controllers/vault/cluster/replication-dr-promote/index.js
+++ b/ui/app/controllers/vault/cluster/replication-dr-promote/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Controller from '@ember/controller';
 
 export default Controller.extend({
diff --git a/ui/app/controllers/vault/cluster/secrets/backend.js b/ui/app/controllers/vault/cluster/secrets/backend.js
index 3f917d1fd1caf..adace52407407 100644
--- a/ui/app/controllers/vault/cluster/secrets/backend.js
+++ b/ui/app/controllers/vault/cluster/secrets/backend.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Controller from '@ember/controller';
 
 export default Controller.extend({
diff --git a/ui/app/controllers/vault/cluster/secrets/backend/actions-root.js b/ui/app/controllers/vault/cluster/secrets/backend/actions-root.js
index fa0c2d6b1cbf5..0b230db57416a 100644
--- a/ui/app/controllers/vault/cluster/secrets/backend/actions-root.js
+++ b/ui/app/controllers/vault/cluster/secrets/backend/actions-root.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from './actions';
diff --git a/ui/app/controllers/vault/cluster/secrets/backend/actions.js b/ui/app/controllers/vault/cluster/secrets/backend/actions.js
index 654bb1d2a24a5..b272f7ca48361 100644
--- a/ui/app/controllers/vault/cluster/secrets/backend/actions.js
+++ b/ui/app/controllers/vault/cluster/secrets/backend/actions.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Controller from '@ember/controller';
 import BackendCrumbMixin from 'vault/mixins/backend-crumb';
 
diff --git a/ui/app/controllers/vault/cluster/secrets/backend/configuration.js b/ui/app/controllers/vault/cluster/secrets/backend/configuration.js
index 886c94fcbd748..84f7cdeac41ba 100644
--- a/ui/app/controllers/vault/cluster/secrets/backend/configuration.js
+++ b/ui/app/controllers/vault/cluster/secrets/backend/configuration.js
@@ -1,14 +1,9 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { computed } from '@ember/object';
 import Controller from '@ember/controller';
 
 export default Controller.extend({
   isConfigurable: computed('model.type', function () {
-    const configurableEngines = ['aws', 'ssh'];
+    const configurableEngines = ['aws', 'ssh', 'pki'];
     return configurableEngines.includes(this.model.type);
   }),
 });
diff --git a/ui/app/controllers/vault/cluster/secrets/backend/create-root.js b/ui/app/controllers/vault/cluster/secrets/backend/create-root.js
index 42b31764287a6..28d5c8ccc5fd9 100644
--- a/ui/app/controllers/vault/cluster/secrets/backend/create-root.js
+++ b/ui/app/controllers/vault/cluster/secrets/backend/create-root.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from './create';
diff --git a/ui/app/controllers/vault/cluster/secrets/backend/create.js b/ui/app/controllers/vault/cluster/secrets/backend/create.js
index df469c3c9a7ca..5002b9b30d3fc 100644
--- a/ui/app/controllers/vault/cluster/secrets/backend/create.js
+++ b/ui/app/controllers/vault/cluster/secrets/backend/create.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Controller, { inject as controller } from '@ember/controller';
 import BackendCrumbMixin from 'vault/mixins/backend-crumb';
 
diff --git a/ui/app/controllers/vault/cluster/secrets/backend/credentials-root.js b/ui/app/controllers/vault/cluster/secrets/backend/credentials-root.js
index 2f652b3864a48..cbf926c3a54e1 100644
--- a/ui/app/controllers/vault/cluster/secrets/backend/credentials-root.js
+++ b/ui/app/controllers/vault/cluster/secrets/backend/credentials-root.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from './credentials';
diff --git a/ui/app/controllers/vault/cluster/secrets/backend/credentials.js b/ui/app/controllers/vault/cluster/secrets/backend/credentials.js
index 1a10c49f0712f..9c6455a0d90c2 100644
--- a/ui/app/controllers/vault/cluster/secrets/backend/credentials.js
+++ b/ui/app/controllers/vault/cluster/secrets/backend/credentials.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Controller from '@ember/controller';
 
 export default Controller.extend({
diff --git a/ui/app/controllers/vault/cluster/secrets/backend/diff.js b/ui/app/controllers/vault/cluster/secrets/backend/diff.js
index cdc0fb6c404ad..752bb56aa28b2 100644
--- a/ui/app/controllers/vault/cluster/secrets/backend/diff.js
+++ b/ui/app/controllers/vault/cluster/secrets/backend/diff.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Controller from '@ember/controller';
 import BackendCrumbMixin from 'vault/mixins/backend-crumb';
 
diff --git a/ui/app/controllers/vault/cluster/secrets/backend/edit-root.js b/ui/app/controllers/vault/cluster/secrets/backend/edit-root.js
index fa2cc7757f332..58cfd6a1cd78f 100644
--- a/ui/app/controllers/vault/cluster/secrets/backend/edit-root.js
+++ b/ui/app/controllers/vault/cluster/secrets/backend/edit-root.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from './edit';
diff --git a/ui/app/controllers/vault/cluster/secrets/backend/edit.js b/ui/app/controllers/vault/cluster/secrets/backend/edit.js
index 687e7fc1a45cc..8f973084722cc 100644
--- a/ui/app/controllers/vault/cluster/secrets/backend/edit.js
+++ b/ui/app/controllers/vault/cluster/secrets/backend/edit.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Controller, { inject as controller } from '@ember/controller';
 import BackendCrumbMixin from 'vault/mixins/backend-crumb';
 
diff --git a/ui/app/controllers/vault/cluster/secrets/backend/list-root.js b/ui/app/controllers/vault/cluster/secrets/backend/list-root.js
index eb7ed18e3103c..ea1fedd0a52f6 100644
--- a/ui/app/controllers/vault/cluster/secrets/backend/list-root.js
+++ b/ui/app/controllers/vault/cluster/secrets/backend/list-root.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from './list';
diff --git a/ui/app/controllers/vault/cluster/secrets/backend/list.js b/ui/app/controllers/vault/cluster/secrets/backend/list.js
index 8033b34ef2175..e5fa92a32dcd6 100644
--- a/ui/app/controllers/vault/cluster/secrets/backend/list.js
+++ b/ui/app/controllers/vault/cluster/secrets/backend/list.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { or } from '@ember/object/computed';
 import { computed } from '@ember/object';
 import { inject as service } from '@ember/service';
diff --git a/ui/app/controllers/vault/cluster/secrets/backend/metadata.js b/ui/app/controllers/vault/cluster/secrets/backend/metadata.js
index 7cd5d568cdaac..d97faf541775f 100644
--- a/ui/app/controllers/vault/cluster/secrets/backend/metadata.js
+++ b/ui/app/controllers/vault/cluster/secrets/backend/metadata.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Controller from '@ember/controller';
 import BackendCrumbMixin from 'vault/mixins/backend-crumb';
 import { action } from '@ember/object';
diff --git a/ui/app/controllers/vault/cluster/secrets/backend/show-root.js b/ui/app/controllers/vault/cluster/secrets/backend/show-root.js
index 95e38486328ef..98bd0c1a0c141 100644
--- a/ui/app/controllers/vault/cluster/secrets/backend/show-root.js
+++ b/ui/app/controllers/vault/cluster/secrets/backend/show-root.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from './show';
diff --git a/ui/app/controllers/vault/cluster/secrets/backend/show.js b/ui/app/controllers/vault/cluster/secrets/backend/show.js
index 4689ca61c0454..79925aa3be7f8 100644
--- a/ui/app/controllers/vault/cluster/secrets/backend/show.js
+++ b/ui/app/controllers/vault/cluster/secrets/backend/show.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Controller, { inject as controller } from '@ember/controller';
 import BackendCrumbMixin from 'vault/mixins/backend-crumb';
 
diff --git a/ui/app/controllers/vault/cluster/secrets/backend/sign-root.js b/ui/app/controllers/vault/cluster/secrets/backend/sign-root.js
index 316a201c0178f..d034c15952119 100644
--- a/ui/app/controllers/vault/cluster/secrets/backend/sign-root.js
+++ b/ui/app/controllers/vault/cluster/secrets/backend/sign-root.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from './sign';
diff --git a/ui/app/controllers/vault/cluster/secrets/backend/sign.js b/ui/app/controllers/vault/cluster/secrets/backend/sign.js
index cb1ff2ae7c9ec..514d232a72917 100644
--- a/ui/app/controllers/vault/cluster/secrets/backend/sign.js
+++ b/ui/app/controllers/vault/cluster/secrets/backend/sign.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import Controller from '@ember/controller';
 import { set } from '@ember/object';
@@ -30,7 +25,7 @@ export default Controller.extend({
 
     updateTtl(path, val) {
       const model = this.model;
-      const valueToSet = val.enabled === true ? `${val.seconds}s` : undefined;
+      let valueToSet = val.enabled === true ? `${val.seconds}s` : undefined;
       set(model, path, valueToSet);
     },
 
diff --git a/ui/app/controllers/vault/cluster/secrets/backends.js b/ui/app/controllers/vault/cluster/secrets/backends.js
index 13420ef8d48f3..d3daf50134f70 100644
--- a/ui/app/controllers/vault/cluster/secrets/backends.js
+++ b/ui/app/controllers/vault/cluster/secrets/backends.js
@@ -1,77 +1,30 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-/* eslint ember/no-computed-properties-in-native-classes: 'warn' */
-import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
-import { action } from '@ember/object';
-import { tracked } from '@glimmer/tracking';
 import { filterBy } from '@ember/object/computed';
-import { dropTask } from 'ember-concurrency';
-
-export default class VaultClusterSecretsBackendController extends Controller {
-  @service flashMessages;
-  @filterBy('model', 'shouldIncludeInList') displayableBackends;
-
-  @tracked secretEngineOptions = [];
-  @tracked selectedEngineType = null;
-  @tracked selectedEngineName = null;
-
-  get sortedDisplayableBackends() {
-    // show supported secret engines first and then organize those by id.
-    const sortedBackends = this.displayableBackends.sort(
-      (a, b) => b.isSupportedBackend - a.isSupportedBackend || a.id - b.id
-    );
-
-    // return an options list to filter by engine type, ex: 'kv'
-    if (this.selectedEngineType) {
-      // check first if the user has also filtered by name.
-      if (this.selectedEngineName) {
-        return sortedBackends.filter((backend) => this.selectedEngineName === backend.id);
-      }
-      // otherwise filter by engine type
-      return sortedBackends.filter((backend) => this.selectedEngineType === backend.engineType);
-    }
-
-    // return an options list to filter by engine name, ex: 'secret'
-    if (this.selectedEngineName) {
-      return sortedBackends.filter((backend) => this.selectedEngineName === backend.id);
+import { computed } from '@ember/object';
+import Controller from '@ember/controller';
+import { task } from 'ember-concurrency';
+import { supportedSecretBackends } from 'vault/helpers/supported-secret-backends';
+const LINKED_BACKENDS = supportedSecretBackends();
+
+export default Controller.extend({
+  displayableBackends: filterBy('model', 'shouldIncludeInList'),
+
+  supportedBackends: computed('displayableBackends', 'displayableBackends.[]', function () {
+    return (this.displayableBackends || [])
+      .filter((backend) => LINKED_BACKENDS.includes(backend.get('engineType')))
+      .sortBy('id');
+  }),
+
+  unsupportedBackends: computed(
+    'displayableBackends',
+    'displayableBackends.[]',
+    'supportedBackends',
+    'supportedBackends.[]',
+    function () {
+      return (this.displayableBackends || []).slice().removeObjects(this.supportedBackends).sortBy('id');
     }
-    // no filters, return full sorted list.
-    return sortedBackends;
-  }
-
-  get secretEngineArrayByType() {
-    const arrayOfAllEngineTypes = this.sortedDisplayableBackends.map((modelObject) => modelObject.engineType);
-    // filter out repeated engineTypes (e.g. [kv, kv] => [kv])
-    const arrayOfUniqueEngineTypes = [...new Set(arrayOfAllEngineTypes)];
-
-    return arrayOfUniqueEngineTypes.map((engineType) => ({
-      name: engineType,
-      id: engineType,
-    }));
-  }
-
-  get secretEngineArrayByName() {
-    return this.sortedDisplayableBackends.map((modelObject) => ({
-      name: modelObject.id,
-      id: modelObject.id,
-    }));
-  }
-
-  @action
-  filterEngineType([type]) {
-    this.selectedEngineType = type;
-  }
-
-  @action
-  filterEngineName([name]) {
-    this.selectedEngineName = name;
-  }
+  ),
 
-  @dropTask
-  *disableEngine(engine) {
+  disableEngine: task(function* (engine) {
     const { engineType, path } = engine;
     try {
       yield engine.destroyRecord();
@@ -81,5 +34,5 @@ export default class VaultClusterSecretsBackendController extends Controller {
         `There was an error disabling the ${engineType} Secrets Engine at ${path}: ${err.errors.join(' ')}.`
       );
     }
-  }
-}
+  }).drop(),
+});
diff --git a/ui/app/controllers/vault/cluster/settings.js b/ui/app/controllers/vault/cluster/settings.js
index 089202784ae39..40a25dbb2a1ff 100644
--- a/ui/app/controllers/vault/cluster/settings.js
+++ b/ui/app/controllers/vault/cluster/settings.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import Controller from '@ember/controller';
 export default Controller.extend({
diff --git a/ui/app/controllers/vault/cluster/settings/auth/enable.js b/ui/app/controllers/vault/cluster/settings/auth/enable.js
index ac4d291689596..da57dddab4b55 100644
--- a/ui/app/controllers/vault/cluster/settings/auth/enable.js
+++ b/ui/app/controllers/vault/cluster/settings/auth/enable.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Controller from '@ember/controller';
 
 export default Controller.extend({
diff --git a/ui/app/controllers/vault/cluster/settings/configure-secret-backend.js b/ui/app/controllers/vault/cluster/settings/configure-secret-backend.js
index 2da0bbf1d214d..9ce582a1d6b0f 100644
--- a/ui/app/controllers/vault/cluster/settings/configure-secret-backend.js
+++ b/ui/app/controllers/vault/cluster/settings/configure-secret-backend.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { isPresent } from '@ember/utils';
 import { inject as service } from '@ember/service';
 import Controller from '@ember/controller';
@@ -33,24 +28,16 @@ export default Controller.extend(CONFIG_ATTRS, {
       const isDelete = options.delete;
       if (this.model.type === 'ssh') {
         this.set('loading', true);
-        this.model
-          .saveCA({ isDelete })
-          .then(() => {
-            this.send('refreshRoute');
-            this.set('configured', !isDelete);
-            if (isDelete) {
-              this.flashMessages.success('SSH Certificate Authority Configuration deleted!');
-            } else {
-              this.flashMessages.success('SSH Certificate Authority Configuration saved!');
-            }
-          })
-          .catch((error) => {
-            const errorMessage = error.errors ? error.errors.join('. ') : error;
-            this.flashMessages.danger(errorMessage);
-          })
-          .finally(() => {
-            this.set('loading', false);
-          });
+        this.model.saveCA({ isDelete }).then(() => {
+          this.set('loading', false);
+          this.send('refreshRoute');
+          this.set('configured', !isDelete);
+          if (isDelete) {
+            this.flashMessages.success('SSH Certificate Authority Configuration deleted!');
+          } else {
+            this.flashMessages.success('SSH Certificate Authority Configuration saved!');
+          }
+        });
       }
     },
 
@@ -70,6 +57,7 @@ export default Controller.extend(CONFIG_ATTRS, {
           },
         })
         .then(() => {
+          this.model.send('pushedData');
           this.reset();
           this.flashMessages.success('The backend configuration saved successfully!');
         })
diff --git a/ui/app/controllers/vault/cluster/settings/mount-secret-backend.js b/ui/app/controllers/vault/cluster/settings/mount-secret-backend.js
index 72e2eb8e55447..785660bb59630 100644
--- a/ui/app/controllers/vault/cluster/settings/mount-secret-backend.js
+++ b/ui/app/controllers/vault/cluster/settings/mount-secret-backend.js
@@ -1,36 +1,26 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { inject as service } from '@ember/service';
 import Controller from '@ember/controller';
 import { supportedSecretBackends } from 'vault/helpers/supported-secret-backends';
-import { allEngines } from 'vault/helpers/mountable-secret-engines';
-import { action } from '@ember/object';
 
 const SUPPORTED_BACKENDS = supportedSecretBackends();
 
-export default class MountSecretBackendController extends Controller {
-  @service router;
-
-  @action
-  onMountSuccess(type, path) {
-    let transition;
-    if (SUPPORTED_BACKENDS.includes(type)) {
-      const engineInfo = allEngines().findBy('type', type);
-      if (engineInfo?.engineRoute) {
-        transition = this.router.transitionTo(
-          `vault.cluster.secrets.backend.${engineInfo.engineRoute}`,
-          path
-        );
+export default Controller.extend({
+  actions: {
+    onMountSuccess: function (type, path) {
+      let transition;
+      if (SUPPORTED_BACKENDS.includes(type)) {
+        if (type === 'kmip') {
+          transition = this.transitionToRoute('vault.cluster.secrets.backend.kmip.scopes', path);
+        } else if (type === 'keymgmt') {
+          transition = this.transitionToRoute('vault.cluster.secrets.backend.index', path, {
+            queryParams: { tab: 'provider' },
+          });
+        } else {
+          transition = this.transitionToRoute('vault.cluster.secrets.backend.index', path);
+        }
       } else {
-        const queryParams = engineInfo?.routeQueryParams || {};
-        transition = this.router.transitionTo('vault.cluster.secrets.backend.index', path, { queryParams });
+        transition = this.transitionToRoute('vault.cluster.secrets.backends');
       }
-    } else {
-      transition = this.router.transitionTo('vault.cluster.secrets.backends');
-    }
-    return transition.followRedirects();
-  }
-}
+      return transition.followRedirects();
+    },
+  },
+});
diff --git a/ui/app/controllers/vault/cluster/settings/seal.js b/ui/app/controllers/vault/cluster/settings/seal.js
index 419138f88e5ef..c7fc3dc1d6946 100644
--- a/ui/app/controllers/vault/cluster/settings/seal.js
+++ b/ui/app/controllers/vault/cluster/settings/seal.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import Controller from '@ember/controller';
 
diff --git a/ui/app/controllers/vault/cluster/unseal.js b/ui/app/controllers/vault/cluster/unseal.js
index a59fcde856452..ea5d4a8ce6a20 100644
--- a/ui/app/controllers/vault/cluster/unseal.js
+++ b/ui/app/controllers/vault/cluster/unseal.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Controller from '@ember/controller';
 
 export default Controller.extend({
diff --git a/ui/app/decorators/model-expanded-attributes.js b/ui/app/decorators/model-expanded-attributes.js
deleted file mode 100644
index a5aa840ba041c..0000000000000
--- a/ui/app/decorators/model-expanded-attributes.js
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { expandAttributeMeta } from 'vault/utils/field-to-attrs';
-import Model from '@ember-data/model';
-import { assert } from '@ember/debug';
-
-/**
- * sets allByKey properties on model class. These are all the attributes on the model
- * and any belongsTo models, expanded with attribute metadata. The value returned is an
- * object where the key is the attribute name, and the value is the expanded attribute
- * metadata.
- * This decorator also exposes a helper function `_expandGroups` which, when given groups
- * as expected in field-to-attrs util, will return a similar object with the expanded
- * attributes in place of the strings in the array.
- */
-
-export function withExpandedAttributes() {
-  return function decorator(SuperClass) {
-    if (!Object.prototype.isPrototypeOf.call(Model, SuperClass)) {
-      // eslint-disable-next-line
-      console.error(
-        'withExpandedAttributes decorator must be used on instance of ember-data Model class. Decorator not applied to returned class'
-      );
-      return SuperClass;
-    }
-    return class ModelExpandedAttrs extends SuperClass {
-      // Helper method for expanding dynamic groups on model
-      _expandGroups(groups) {
-        if (!Array.isArray(groups)) {
-          throw new Error('_expandGroups expects an array of objects');
-        }
-        /* Expects group shape to be something like:
-        [
-          { default: ['ttl', 'maxTtl'] },
-          { "Method Options": ['other', 'fieldNames'] },
-        ]*/
-        return groups.map((obj) => {
-          const [key, stringArray] = Object.entries(obj)[0];
-          const expanded = stringArray.map((fieldName) => this.allByKey[fieldName]).filter((f) => !!f);
-          assert(`all fields found in allByKey for group ${key}`, expanded.length === stringArray.length);
-          return { [key]: expanded };
-        });
-      }
-
-      _allByKey = null;
-      get allByKey() {
-        // Caching like this ensures allByKey only gets calculated once
-        if (!this._allByKey) {
-          const byKey = {};
-          // First, get attr names which are on the model directly
-          // By this time, OpenAPI should have populated non-explicit attrs
-          const mainFields = [];
-          this.eachAttribute(function (key) {
-            mainFields.push(key);
-          });
-          const expanded = expandAttributeMeta(this, mainFields);
-          expanded.forEach((attr) => {
-            // Add expanded attributes from the model
-            byKey[attr.name] = attr;
-          });
-
-          // Next, fetch and expand attrs for related models
-          this.eachRelationship(function (name, descriptor) {
-            // We don't worry about getting hasMany relationships
-            if (descriptor.kind !== 'belongsTo') return;
-            const rModel = this[name];
-            const rAttrNames = [];
-            rModel.eachAttribute(function (key) {
-              rAttrNames.push(key);
-            });
-            const expanded = expandAttributeMeta(rModel, rAttrNames);
-            expanded.forEach((attr) => {
-              byKey[`${name}.${attr.name}`] = {
-                ...attr,
-                options: {
-                  ...attr.options,
-                  // This ensures the correct path is updated in FormField
-                  fieldValue: `${name}.${attr.fieldValue || attr.name}`,
-                },
-              };
-            });
-          }, this);
-          this._allByKey = byKey;
-        }
-        return this._allByKey;
-      }
-    };
-  };
-}
diff --git a/ui/app/decorators/model-form-fields.js b/ui/app/decorators/model-form-fields.js
deleted file mode 100644
index e9f89b9947dcb..0000000000000
--- a/ui/app/decorators/model-form-fields.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import fieldToAttrs, { expandAttributeMeta } from 'vault/utils/field-to-attrs';
-import Model from '@ember-data/model';
-
-/**
- * sets formFields and/or formFieldGroups properties on model class based on attr options
- *
- * propertyNames must be an array of brace expansion supported strings that represent model attr names
- * groupPropertyNames must be an array of objects where the keys represent the group names and the values are propertyNames
- *
- * reference the field-to-attrs util for more information on expected format for fields and groups
- */
-
-export function withFormFields(propertyNames, groupPropertyNames) {
-  return function decorator(SuperClass) {
-    if (!Object.prototype.isPrototypeOf.call(Model, SuperClass)) {
-      // eslint-disable-next-line
-      console.error(
-        'withFormFields decorator must be used on instance of ember-data Model class. Decorator not applied to returned class'
-      );
-      return SuperClass;
-    }
-    return class ModelFormFields extends SuperClass {
-      constructor() {
-        super(...arguments);
-        if (propertyNames) {
-          this.formFields = expandAttributeMeta(this, propertyNames);
-        }
-        if (groupPropertyNames) {
-          this.formFieldGroups = fieldToAttrs(this, groupPropertyNames);
-        }
-        const allFields = [];
-        this.eachAttribute(function (key) {
-          allFields.push(key);
-        });
-        this.allFields = expandAttributeMeta(this, allFields);
-      }
-    };
-  };
-}
diff --git a/ui/app/decorators/model-validations.js b/ui/app/decorators/model-validations.js
index b300405817b9e..1db84446d1e42 100644
--- a/ui/app/decorators/model-validations.js
+++ b/ui/app/decorators/model-validations.js
@@ -1,13 +1,63 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /* eslint-disable no-console */
 import validators from 'vault/utils/validators';
 import { get } from '@ember/object';
 
-// see documentation at ui/docs/model-validations.md for detailed usage information
+/**
+ * used to validate properties on a class
+ *
+ * decorator expects validations object with the following shape:
+ * { [propertyKeyName]: [{ type, options, message, validator }] }
+ * each key in the validations object should refer to the property on the class to apply the validation to
+ * type refers to the type of validation to apply -- must be exported from validators util for lookup
+ * options is an optional object for given validator -- min, max, nullable etc. -- see validators in util
+ * message is added to the errors array and returned from the validate method if validation fails
+ * validator may be used in place of type to provide a function that gets executed in the validate method
+ * validator is useful when specific validations are needed (dependent on other class properties etc.)
+ * validator must be passed as function that takes the class context (this) as the only argument and returns true or false
+ * each property supports multiple validations provided as an array -- for example, presence and length for string
+ *
+ * validations must be invoked using the validate method which is added directly to the decorated class
+ * const { isValid, state } = this.model.validate();
+ * isValid represents the validity of the full class -- if no properties provided in the validations object are invalid this will be true
+ * state represents the error state of the properties defined in the validations object
+ * const { isValid, errors } = state[propertyKeyName];
+ * isValid represents the validity of the property
+ * errors will be populated with messages defined in the validations object when validations fail. message must be a complete sentence (and include punctuation)
+ * since a property can have multiple validations, errors is always returned as an array
+ *
+ *** basic example
+ *
+ * import Model from '@ember-data/model';
+ * import withModelValidations from 'vault/decorators/model-validations';
+ *
+ * Notes: all messages need to have a period at the end of them.
+ * const validations = { foo: [{ type: 'presence', message: 'foo is a required field.' }] };
+ * @withModelValidations(validations)
+ * class SomeModel extends Model { foo = null; }
+ *
+ * const model = new SomeModel();
+ * const { isValid, state } = model.validate();
+ * -> isValid = false;
+ * -> state.foo.isValid = false;
+ * -> state.foo.errors = ['foo is a required field'];
+ *
+ *** example using custom validator
+ *
+ * const validations = { foo: [{ validator: (model) => model.bar.includes('test') ? model.foo : false, message: 'foo is required if bar includes test.' }] };
+ * @withModelValidations(validations)
+ * class SomeModel extends Model { foo = false; bar = ['foo', 'baz']; }
+ *
+ * const model = new SomeModel();
+ * const { isValid, state } = model.validate();
+ * -> isValid = false;
+ * -> state.foo.isValid = false;
+ * -> state.foo.errors = ['foo is required if bar includes test.'];
+ *
+ * *** example adding class in hbs file
+ * all form-validations need to have a red border around them. Add this by adding a conditional class 'has-error-border'
+ * class="input field {{if this.errors.name.errors 'has-error-border'}}"
+ */
+
 export function withModelValidations(validations) {
   return function decorator(SuperClass) {
     return class ModelValidations extends SuperClass {
@@ -36,10 +86,10 @@ export function withModelValidations(validations) {
             continue;
           }
 
-          state[key] = { errors: [], warnings: [] };
+          state[key] = { errors: [] };
 
           for (const rule of rules) {
-            const { type, options, level, message, validator: customValidator } = rule;
+            const { type, options, message, validator: customValidator } = rule;
             // check for custom validator or lookup in validators util by type
             const useCustomValidator = typeof customValidator === 'function';
             const validator = useCustomValidator ? customValidator : validators[type];
@@ -58,17 +108,11 @@ export function withModelValidations(validations) {
               : validator(get(this, key), options); // dot notation may be used to define key for nested property
 
             if (!passedValidation) {
-              // message can also be a function
-              const validationMessage = typeof message === 'function' ? message(this) : message;
               // consider setting a prop like validationErrors directly on the model
               // for now return an errors object
-              if (level === 'warn') {
-                state[key].warnings.push(validationMessage);
-              } else {
-                state[key].errors.push(validationMessage);
-                if (isValid) {
-                  isValid = false;
-                }
+              state[key].errors.push(message);
+              if (isValid) {
+                isValid = false;
               }
             }
           }
@@ -82,7 +126,7 @@ export function withModelValidations(validations) {
       generateErrorCountMessage(errorCount) {
         if (errorCount < 1) return null;
         // returns count specific message: 'There is an error/are N errors with this form.'
-        const isPlural = errorCount > 1 ? `are ${errorCount} errors` : false;
+        let isPlural = errorCount > 1 ? `are ${errorCount} errors` : false;
         return `There ${isPlural ? isPlural : 'is an error'} with this form.`;
       }
     };
diff --git a/ui/app/helpers/-date-base.js b/ui/app/helpers/-date-base.js
index 401595df6ed62..4ca8dad2a5af9 100644
--- a/ui/app/helpers/-date-base.js
+++ b/ui/app/helpers/-date-base.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { run } from '@ember/runloop';
 import Helper from '@ember/component/helper';
 import Ember from 'ember';
diff --git a/ui/app/helpers/add-to-array.js b/ui/app/helpers/add-to-array.js
index 99dd685a98a2b..07968d275a8a5 100644
--- a/ui/app/helpers/add-to-array.js
+++ b/ui/app/helpers/add-to-array.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { helper as buildHelper } from '@ember/component/helper';
 import { assert } from '@ember/debug';
 
diff --git a/ui/app/helpers/add.js b/ui/app/helpers/add.js
index 2258df8d40206..df06eeb39e07e 100644
--- a/ui/app/helpers/add.js
+++ b/ui/app/helpers/add.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { helper as buildHelper } from '@ember/component/helper';
 
 export function add(params) {
diff --git a/ui/app/helpers/all-features.js b/ui/app/helpers/all-features.js
index 79124785af24e..addbefdd19c9d 100644
--- a/ui/app/helpers/all-features.js
+++ b/ui/app/helpers/all-features.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { helper as buildHelper } from '@ember/component/helper';
 
 const ALL_FEATURES = [
diff --git a/ui/app/helpers/await.js b/ui/app/helpers/await.js
index ffa61076e82d9..711276c28a4cb 100644
--- a/ui/app/helpers/await.js
+++ b/ui/app/helpers/await.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Helper from '@ember/component/helper';
 import { Promise } from 'rsvp';
 
diff --git a/ui/app/helpers/aws-regions.js b/ui/app/helpers/aws-regions.js
index 75e03623d56a2..90e187ba17e9e 100644
--- a/ui/app/helpers/aws-regions.js
+++ b/ui/app/helpers/aws-regions.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { helper as buildHelper } from '@ember/component/helper';
 
 //list from http://docs.aws.amazon.com/general/latest/gr/rande.html#sts_region
diff --git a/ui/app/helpers/coerce-eq.js b/ui/app/helpers/coerce-eq.js
index 62d2e3f744552..fb11338c07207 100644
--- a/ui/app/helpers/coerce-eq.js
+++ b/ui/app/helpers/coerce-eq.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /*jshint eqeqeq: false */
 import { helper as buildHelper } from '@ember/component/helper';
 
diff --git a/ui/app/helpers/date-from-now.js b/ui/app/helpers/date-from-now.js
index 6d39fbd9758b0..2f446fb6455ef 100644
--- a/ui/app/helpers/date-from-now.js
+++ b/ui/app/helpers/date-from-now.js
@@ -1,15 +1,10 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { helper } from '@ember/component/helper';
 import { formatDistanceToNow } from 'date-fns';
 
 export function dateFromNow([date], options = {}) {
   // check first if string. If it is, it could be ISO format or UTC, either way create a new date object
   // otherwise it's a number or object and just return
-  const newDate = typeof date === 'string' ? new Date(date) : date;
+  let newDate = typeof date === 'string' ? new Date(date) : date;
   return formatDistanceToNow(newDate, { ...options });
 }
 
diff --git a/ui/app/helpers/filter-wildcard.js b/ui/app/helpers/filter-wildcard.js
index 3d63a1be82cbe..bb3f4ab15f674 100644
--- a/ui/app/helpers/filter-wildcard.js
+++ b/ui/app/helpers/filter-wildcard.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { helper as buildHelper } from '@ember/component/helper';
 
 export function filterWildcard([string, array]) {
@@ -12,7 +7,7 @@ export function filterWildcard([string, array]) {
   if (!string.id && string) {
     string = { id: string };
   }
-  const stringId = string.id;
+  let stringId = string.id;
   const filterBy = (stringId) =>
     array.filter((item) => new RegExp('^' + stringId.replace(/\*/g, '.*') + '$').test(item));
   return filterBy(stringId).length;
diff --git a/ui/app/helpers/format-duration.js b/ui/app/helpers/format-duration.js
new file mode 100644
index 0000000000000..e7a58d609cbd7
--- /dev/null
+++ b/ui/app/helpers/format-duration.js
@@ -0,0 +1,23 @@
+import { helper } from '@ember/component/helper';
+import { formatDuration, intervalToDuration } from 'date-fns';
+
+export function duration([time], { nullable = false }) {
+  // intervalToDuration creates a durationObject that turns the seconds (ex 3600) to respective:
+  // { years: 0, months: 0, days: 0, hours: 1, minutes: 0, seconds: 0 }
+  // then formatDuration returns the filled in keys of the durationObject
+  // nullable if you don't want a value to be returned instead of 0s
+
+  if (nullable && (time === '0' || time === 0)) {
+    return null;
+  }
+
+  // time must be in seconds
+  let duration = Number.parseInt(time, 10);
+  if (isNaN(duration)) {
+    return time;
+  }
+
+  return formatDuration(intervalToDuration({ start: 0, end: duration * 1000 }));
+}
+
+export default helper(duration);
diff --git a/ui/app/helpers/has-permission.js b/ui/app/helpers/has-permission.js
index b1b5ab676940a..e528dfaaf1132 100644
--- a/ui/app/helpers/has-permission.js
+++ b/ui/app/helpers/has-permission.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /* eslint-disable ember/no-observers */
 import Helper from '@ember/component/helper';
 import { inject as service } from '@ember/service';
@@ -20,9 +15,9 @@ export default Helper.extend({
   ),
 
   compute([route], params) {
-    const { routeParams, requireAll } = params;
-    const permissions = this.permissions;
+    let { routeParams } = params;
+    let permissions = this.permissions;
 
-    return permissions.hasNavPermission(route, routeParams, requireAll);
+    return permissions.hasNavPermission(route, routeParams);
   },
 });
diff --git a/ui/app/helpers/img-path.js b/ui/app/helpers/img-path.js
new file mode 100644
index 0000000000000..3a806bb203f35
--- /dev/null
+++ b/ui/app/helpers/img-path.js
@@ -0,0 +1,6 @@
+import { helper } from '@ember/component/helper';
+import ENV from 'vault/config/environment';
+
+export default helper(function ([path]) {
+  return path.replace(/^~\//, `${ENV.rootURL}images/`);
+});
diff --git a/ui/app/helpers/is-after.js b/ui/app/helpers/is-after.js
index 9584b45e636c9..4916659d78cb6 100644
--- a/ui/app/helpers/is-after.js
+++ b/ui/app/helpers/is-after.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import DateBase from './-date-base';
 import { isAfter } from 'date-fns';
 
diff --git a/ui/app/helpers/is-before.js b/ui/app/helpers/is-before.js
index e7d3ef8cbd917..334c3c9626b22 100644
--- a/ui/app/helpers/is-before.js
+++ b/ui/app/helpers/is-before.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import DateBase from './-date-base';
 import { isBefore } from 'date-fns';
 
diff --git a/ui/app/helpers/is-empty-value.js b/ui/app/helpers/is-empty-value.js
index 6c033d0aca7d3..6f3de8abd1495 100644
--- a/ui/app/helpers/is-empty-value.js
+++ b/ui/app/helpers/is-empty-value.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { helper } from '@ember/component/helper';
 
 export default helper(function isEmptyValue([value], { hasDefault = false }) {
diff --git a/ui/app/helpers/is-wildcard-string.js b/ui/app/helpers/is-wildcard-string.js
index 4f40c46ec61e2..f103574146859 100644
--- a/ui/app/helpers/is-wildcard-string.js
+++ b/ui/app/helpers/is-wildcard-string.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { helper as buildHelper } from '@ember/component/helper';
 
 export function isWildcardString([string]) {
diff --git a/ui/app/helpers/jsonify.js b/ui/app/helpers/jsonify.js
index d6e8168c5a670..ce01a4a3d05c0 100644
--- a/ui/app/helpers/jsonify.js
+++ b/ui/app/helpers/jsonify.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { helper as buildHelper } from '@ember/component/helper';
 
 export function jsonify([target]) {
diff --git a/ui/app/helpers/mountable-auth-methods.js b/ui/app/helpers/mountable-auth-methods.js
index d3b16e2753c11..6fac2c1e26595 100644
--- a/ui/app/helpers/mountable-auth-methods.js
+++ b/ui/app/helpers/mountable-auth-methods.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { helper as buildHelper } from '@ember/component/helper';
 
 const MOUNTABLE_AUTH_METHODS = [
diff --git a/ui/app/helpers/mountable-secret-engines.js b/ui/app/helpers/mountable-secret-engines.js
index 143790701682d..f05c1e47ba778 100644
--- a/ui/app/helpers/mountable-secret-engines.js
+++ b/ui/app/helpers/mountable-secret-engines.js
@@ -1,131 +1,129 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { helper as buildHelper } from '@ember/component/helper';
 
-const ENTERPRISE_SECRET_ENGINES = [
-  {
-    displayName: 'KMIP',
-    type: 'kmip',
-    engineRoute: 'kmip.scopes',
-    category: 'generic',
-    requiredFeature: 'KMIP',
-  },
-  {
-    displayName: 'Transform',
-    type: 'transform',
-    category: 'generic',
-    requiredFeature: 'Transform Secrets Engine',
-  },
-  {
-    displayName: 'Key Management',
-    type: 'keymgmt',
-    glyph: 'key',
-    category: 'cloud',
-    requiredFeature: 'Key Management Secrets Engine',
-    routeQueryParams: { tab: 'provider' },
-  },
-];
+export const KMIP = {
+  displayName: 'KMIP',
+  value: 'kmip',
+  type: 'kmip',
+  category: 'generic',
+  requiredFeature: 'KMIP',
+};
+
+export const TRANSFORM = {
+  displayName: 'Transform',
+  value: 'transform',
+  type: 'transform',
+  category: 'generic',
+  requiredFeature: 'Transform Secrets Engine',
+};
+
+export const KEYMGMT = {
+  displayName: 'Key Management',
+  value: 'keymgmt',
+  type: 'keymgmt',
+  glyph: 'key',
+  category: 'cloud',
+  requiredFeature: 'Key Management Secrets Engine',
+};
 
 const MOUNTABLE_SECRET_ENGINES = [
   {
     displayName: 'Active Directory',
+    value: 'ad',
     type: 'ad',
     category: 'cloud',
   },
   {
     displayName: 'AliCloud',
+    value: 'alicloud',
     type: 'alicloud',
     category: 'cloud',
   },
   {
     displayName: 'AWS',
+    value: 'aws',
     type: 'aws',
     category: 'cloud',
     glyph: 'aws-color',
   },
   {
     displayName: 'Azure',
+    value: 'azure',
     type: 'azure',
     category: 'cloud',
     glyph: 'azure-color',
   },
   {
     displayName: 'Consul',
+    value: 'consul',
     type: 'consul',
     category: 'infra',
   },
   {
     displayName: 'Databases',
+    value: 'database',
     type: 'database',
     category: 'infra',
   },
   {
     displayName: 'Google Cloud',
+    value: 'gcp',
     type: 'gcp',
     category: 'cloud',
     glyph: 'gcp-color',
   },
   {
     displayName: 'Google Cloud KMS',
+    value: 'gcpkms',
     type: 'gcpkms',
     category: 'cloud',
     glyph: 'gcp-color',
   },
   {
     displayName: 'KV',
+    value: 'kv',
     type: 'kv',
     category: 'generic',
   },
   {
     displayName: 'Nomad',
+    value: 'nomad',
     type: 'nomad',
     category: 'infra',
   },
   {
     displayName: 'PKI Certificates',
+    value: 'pki',
     type: 'pki',
-    engineRoute: 'pki.overview',
     category: 'generic',
   },
   {
     displayName: 'RabbitMQ',
+    value: 'rabbitmq',
     type: 'rabbitmq',
     category: 'infra',
   },
   {
     displayName: 'SSH',
+    value: 'ssh',
     type: 'ssh',
     category: 'generic',
   },
   {
     displayName: 'Transit',
+    value: 'transit',
     type: 'transit',
     category: 'generic',
   },
   {
     displayName: 'TOTP',
+    value: 'totp',
     type: 'totp',
     category: 'generic',
   },
-  {
-    displayName: 'Kubernetes',
-    value: 'kubernetes',
-    type: 'kubernetes',
-    engineRoute: 'kubernetes.overview',
-    category: 'generic',
-    glyph: 'kubernetes-color',
-  },
 ];
 
-export function mountableEngines() {
+export function engines() {
   return MOUNTABLE_SECRET_ENGINES.slice();
 }
 
-export function allEngines() {
-  return [...MOUNTABLE_SECRET_ENGINES, ...ENTERPRISE_SECRET_ENGINES];
-}
-
-export default buildHelper(mountableEngines);
+export default buildHelper(engines);
diff --git a/ui/app/helpers/multi-line-join.js b/ui/app/helpers/multi-line-join.js
index 12c1d6fe08bf6..9607d4e605704 100644
--- a/ui/app/helpers/multi-line-join.js
+++ b/ui/app/helpers/multi-line-join.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { helper as buildHelper } from '@ember/component/helper';
 
 export function multiLineJoin([arr]) {
diff --git a/ui/app/helpers/nav-to-route.js b/ui/app/helpers/nav-to-route.js
index e86728aff9086..9eb816c8c315b 100644
--- a/ui/app/helpers/nav-to-route.js
+++ b/ui/app/helpers/nav-to-route.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import Helper from '@ember/component/helper';
 
diff --git a/ui/app/helpers/now.js b/ui/app/helpers/now.js
index 15b4687172d03..0cffa80759f8b 100644
--- a/ui/app/helpers/now.js
+++ b/ui/app/helpers/now.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import DateBase from './-date-base';
 
 export default DateBase.extend({
diff --git a/ui/app/helpers/number-to-word.js b/ui/app/helpers/number-to-word.js
index b0929905780c9..7369ecabd7ad5 100644
--- a/ui/app/helpers/number-to-word.js
+++ b/ui/app/helpers/number-to-word.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { helper } from '@ember/component/helper';
 
 export function numberToWord(number, capitalize) {
diff --git a/ui/app/helpers/parse-pki-cert.js b/ui/app/helpers/parse-pki-cert.js
new file mode 100644
index 0000000000000..b386b4f22127f
--- /dev/null
+++ b/ui/app/helpers/parse-pki-cert.js
@@ -0,0 +1,60 @@
+import { helper } from '@ember/component/helper';
+import * as asn1js from 'asn1js';
+import { fromBase64, stringToArrayBuffer } from 'pvutils';
+import { Certificate } from 'pkijs';
+
+export function parsePkiCert([model]) {
+  // model has to be the responseJSON from PKI serializer
+  // return if no certificate or if the "certificate" is actually a CRL
+  if (!model.certificate || model.certificate.includes('BEGIN X509 CRL')) {
+    return;
+  }
+  let cert;
+  try {
+    let cert_base64 = model.certificate.replace(/(-----(BEGIN|END) CERTIFICATE-----|\n)/g, '');
+    let cert_der = fromBase64(cert_base64);
+    let cert_asn1 = asn1js.fromBER(stringToArrayBuffer(cert_der));
+    cert = new Certificate({ schema: cert_asn1.result });
+  } catch (error) {
+    console.debug('DEBUG: Parsing Certificate', error);
+    return {
+      can_parse: false,
+    };
+  }
+
+  // We wish to get the CN element out of this certificate's subject. A
+  // subject is a list of RDNs, where each RDN is a (type, value) tuple
+  // and where a type is an OID. The OID for CN can be found here:
+  //
+  //    http://oid-info.com/get/2.5.4.3
+  //    https://datatracker.ietf.org/doc/html/rfc5280#page-112
+  //
+  // Each value is then encoded as another ASN.1 object; in the case of a
+  // CommonName field, this is usually a PrintableString, BMPString, or a
+  // UTF8String. Regardless of encoding, it should be present in the
+  // valueBlock's value field if it is renderable.
+  const commonNameOID = '2.5.4.3';
+  const commonNames = cert?.subject?.typesAndValues
+    .filter((rdn) => rdn?.type === commonNameOID)
+    .map((rdn) => rdn?.value?.valueBlock?.value);
+
+  // Theoretically, there might be multiple (or no) CommonNames -- but Vault
+  // presently refuses to issue certificates without CommonNames in most
+  // cases. For now, return the first CommonName we find. Alternatively, we
+  // might update our callers to handle multiple, or join them using some
+  // separator like ','.
+  const commonName = commonNames ? (commonNames.length ? commonNames[0] : null) : null;
+
+  // Date instances are stored in the value field as the notAfter/notBefore
+  // field themselves are Time values.
+  const expiryDate = cert?.notAfter?.value;
+  const issueDate = cert?.notBefore?.value;
+  return {
+    can_parse: true,
+    common_name: commonName,
+    expiry_date: expiryDate,
+    issue_date: issueDate,
+  };
+}
+
+export default helper(parsePkiCert);
diff --git a/ui/app/helpers/remove-from-array.js b/ui/app/helpers/remove-from-array.js
index 0774ca281149f..4e0fd77de1153 100644
--- a/ui/app/helpers/remove-from-array.js
+++ b/ui/app/helpers/remove-from-array.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { helper as buildHelper } from '@ember/component/helper';
 import { assert } from '@ember/debug';
 
diff --git a/ui/app/helpers/route-params-for.js b/ui/app/helpers/route-params-for.js
index 81326e9d8cef0..652e047272fee 100644
--- a/ui/app/helpers/route-params-for.js
+++ b/ui/app/helpers/route-params-for.js
@@ -1,15 +1,10 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Helper from '@ember/component/helper';
 import { inject as service } from '@ember/service';
 
 export default Helper.extend({
   permissions: service(),
   compute([navItem]) {
-    const permissions = this.permissions;
+    let permissions = this.permissions;
     return permissions.navPathParams(navItem);
   },
 });
diff --git a/ui/app/helpers/secret-query-params.js b/ui/app/helpers/secret-query-params.js
index 50767b2127868..04cb90c752e59 100644
--- a/ui/app/helpers/secret-query-params.js
+++ b/ui/app/helpers/secret-query-params.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { helper } from '@ember/component/helper';
 
 export function secretQueryParams([backendType, type = ''], { asQueryParams }) {
diff --git a/ui/app/helpers/sha2-digest-sizes.js b/ui/app/helpers/sha2-digest-sizes.js
index b6b77233df1a8..99bd6f171e420 100644
--- a/ui/app/helpers/sha2-digest-sizes.js
+++ b/ui/app/helpers/sha2-digest-sizes.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { helper as buildHelper } from '@ember/component/helper';
 
 const SHA2_DIGEST_SIZES = ['sha2-224', 'sha2-256', 'sha2-384', 'sha2-512'];
diff --git a/ui/app/helpers/split-object.js b/ui/app/helpers/split-object.js
index b7ba32643bb0a..6a7cbfaa8f2b9 100644
--- a/ui/app/helpers/split-object.js
+++ b/ui/app/helpers/split-object.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /**
  * @module SplitObject
  * SplitObject helper takes in a class of data as the first param and an array of keys that you want to split into another object as the second param. 
@@ -20,10 +15,10 @@
 import { helper as buildHelper } from '@ember/component/helper';
 
 export function splitObject(originalObject, array) {
-  const object1 = {};
-  const object2 = {};
+  let object1 = {};
+  let object2 = {};
   // convert object to key's array
-  const keys = Object.keys(originalObject);
+  let keys = Object.keys(originalObject);
   keys.forEach((key) => {
     if (array.includes(key)) {
       object1[key] = originalObject[key];
diff --git a/ui/app/helpers/stringify.js b/ui/app/helpers/stringify.js
index ddf34f7451440..d51441f0f9690 100644
--- a/ui/app/helpers/stringify.js
+++ b/ui/app/helpers/stringify.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { helper as buildHelper } from '@ember/component/helper';
 
 export function stringify([target], { skipFormat }) {
diff --git a/ui/app/helpers/sub.js b/ui/app/helpers/sub.js
index 3e4d0728ed23a..990f3bdbee94d 100644
--- a/ui/app/helpers/sub.js
+++ b/ui/app/helpers/sub.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { helper } from '@ember/component/helper';
 
 export default helper(function ([a, ...toSubtract]) {
diff --git a/ui/app/helpers/supported-auth-backends.js b/ui/app/helpers/supported-auth-backends.js
index b66b0f3caa1be..51365dc8ec6a7 100644
--- a/ui/app/helpers/supported-auth-backends.js
+++ b/ui/app/helpers/supported-auth-backends.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { helper as buildHelper } from '@ember/component/helper';
 
 const SUPPORTED_AUTH_BACKENDS = [
diff --git a/ui/app/helpers/supported-managed-auth-backends.js b/ui/app/helpers/supported-managed-auth-backends.js
index 7aef3f6a1a2af..695a6b2f57f00 100644
--- a/ui/app/helpers/supported-managed-auth-backends.js
+++ b/ui/app/helpers/supported-managed-auth-backends.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { helper as buildHelper } from '@ember/component/helper';
 
 const MANAGED_AUTH_BACKENDS = ['cert', 'userpass', 'ldap', 'okta', 'radius'];
diff --git a/ui/app/helpers/supported-secret-backends.js b/ui/app/helpers/supported-secret-backends.js
index efe5864a5bd0c..806b90513b556 100644
--- a/ui/app/helpers/supported-secret-backends.js
+++ b/ui/app/helpers/supported-secret-backends.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { helper as buildHelper } from '@ember/component/helper';
 
 const SUPPORTED_SECRET_BACKENDS = [
@@ -17,7 +12,6 @@ const SUPPORTED_SECRET_BACKENDS = [
   'kmip',
   'transform',
   'keymgmt',
-  'kubernetes',
 ];
 
 export function supportedSecretBackends() {
diff --git a/ui/app/helpers/tabs-for-auth-section.js b/ui/app/helpers/tabs-for-auth-section.js
index bcb6b3468ef7e..9911c80152f8f 100644
--- a/ui/app/helpers/tabs-for-auth-section.js
+++ b/ui/app/helpers/tabs-for-auth-section.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { helper as buildHelper } from '@ember/component/helper';
 import { pluralize } from 'ember-inflector';
 import { capitalize } from '@ember/string';
diff --git a/ui/app/helpers/tabs-for-identity-show.js b/ui/app/helpers/tabs-for-identity-show.js
index 40a33958fb115..f51c6ded74692 100644
--- a/ui/app/helpers/tabs-for-identity-show.js
+++ b/ui/app/helpers/tabs-for-identity-show.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { helper as buildHelper } from '@ember/component/helper';
 
 export const TABS = {
diff --git a/ui/app/helpers/to-label.js b/ui/app/helpers/to-label.js
index b4af0687b16a7..b784f8ef826a7 100644
--- a/ui/app/helpers/to-label.js
+++ b/ui/app/helpers/to-label.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { helper as buildHelper } from '@ember/component/helper';
 import { capitalize } from 'vault/helpers/capitalize';
 import { humanize } from 'vault/helpers/humanize';
diff --git a/ui/app/helpers/tools-actions.js b/ui/app/helpers/tools-actions.js
index 3e6574ceee7a9..32f36cf2db906 100644
--- a/ui/app/helpers/tools-actions.js
+++ b/ui/app/helpers/tools-actions.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { helper as buildHelper } from '@ember/component/helper';
 
 const TOOLS_ACTIONS = ['wrap', 'lookup', 'unwrap', 'rewrap', 'random', 'hash'];
diff --git a/ui/app/helpers/wizard-constants.js b/ui/app/helpers/wizard-constants.js
index 5fa2ce30dc6ca..5ac05689789d5 100644
--- a/ui/app/helpers/wizard-constants.js
+++ b/ui/app/helpers/wizard-constants.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import TutorialMachineConfig from 'vault/machines/tutorial-machine';
 import SecretsMachineConfig from 'vault/machines/secrets-machine';
 import PoliciesMachineConfig from 'vault/machines/policies-machine';
diff --git a/ui/app/index.html b/ui/app/index.html
index ef62456b60140..607c134b6a388 100644
--- a/ui/app/index.html
+++ b/ui/app/index.html
@@ -1,12 +1,8 @@
 <!DOCTYPE html lang="en">
-<!--
- Copyright (c) HashiCorp, Inc.
- SPDX-License-Identifier: MPL-2.0
--->
-
 <html>
   <head>
     <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta http-equiv="cache-control" content="no-store" />
     <meta http-equiv="expires" content="0" />
     <meta http-equiv="pragma" content="no-cache" />
diff --git a/ui/app/initializers/deprecation-filter.js b/ui/app/initializers/deprecation-filter.js
index 905c610ae55d0..a5c6fdb377b6e 100644
--- a/ui/app/initializers/deprecation-filter.js
+++ b/ui/app/initializers/deprecation-filter.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { registerDeprecationHandler } from '@ember/debug';
 
 // https://guides.emberjs.com/release/configuring-ember/handling-deprecations/#toc_filtering-deprecations
@@ -10,7 +5,7 @@ export function initialize() {
   registerDeprecationHandler((message, options, next) => {
     // filter deprecations that are scheduled to be removed in a specific version
     // when upgrading or addressing deprecation warnings be sure to update this or remove if not needed
-    if (options?.until !== '5.0.0') {
+    if (options?.until !== '4.0.0') {
       next(message, options);
     }
     return;
diff --git a/ui/app/initializers/disable-ember-inspector.js b/ui/app/initializers/disable-ember-inspector.js
index 825e6d7d236bf..739e10b7caffe 100644
--- a/ui/app/initializers/disable-ember-inspector.js
+++ b/ui/app/initializers/disable-ember-inspector.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import config from '../config/environment';
 
 export default {
diff --git a/ui/app/initializers/ember-data-identifiers.js b/ui/app/initializers/ember-data-identifiers.js
deleted file mode 100644
index 22733cfad2714..0000000000000
--- a/ui/app/initializers/ember-data-identifiers.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { setIdentifierGenerationMethod } from '@ember-data/store';
-import { dasherize } from '@ember/string';
-import { v4 as uuidv4 } from 'uuid';
-
-export function initialize() {
-  // see this GH issue for more information https://github.com/emberjs/data/issues/8106
-  // Ember Data uses uuidv4 library to generate ids which relies on the crypto API which is no available in unsecure contexts
-  // the suggested polyfill was added in 4.6.2 so until we upgrade we need to define our own id generation method
-  // https://api.emberjs.com/ember-data/4.5/classes/IdentifierCache/methods/getOrCreateRecordIdentifier?anchor=getOrCreateRecordIdentifier
-  // the uuid library was brought in to replace other usages of crypto in the app so it is safe to use in unsecure contexts
-  // adapted from defaultGenerationMethod -- https://github.com/emberjs/data/blob/v4.5.0/packages/store/addon/-private/identifier-cache.ts#LL82-L94C2
-  setIdentifierGenerationMethod((data) => {
-    if (data.lid) {
-      return data.lid;
-    }
-    if (data.id) {
-      return `@lid:${dasherize(data.type)}-${data.id}`;
-    }
-    return uuidv4();
-  });
-}
-
-export default {
-  name: 'ember-data-identifiers',
-  initialize,
-};
diff --git a/ui/app/initializers/enable-engines.js b/ui/app/initializers/enable-engines.js
index d27ed7af8e385..1c4408db735c7 100644
--- a/ui/app/initializers/enable-engines.js
+++ b/ui/app/initializers/enable-engines.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import config from '../config/environment';
 
 export function initialize(/* application */) {
diff --git a/ui/app/instance-initializers/track-csp-event.js b/ui/app/instance-initializers/track-csp-event.js
index c5225f225e9db..bc07a25e6ff16 100644
--- a/ui/app/instance-initializers/track-csp-event.js
+++ b/ui/app/instance-initializers/track-csp-event.js
@@ -1,10 +1,5 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export function initialize(appInstance) {
-  const service = appInstance.lookup('service:csp-event');
+  let service = appInstance.lookup('service:csp-event');
   service.attach();
 }
 
diff --git a/ui/app/lib/arg-tokenizer.js b/ui/app/lib/arg-tokenizer.js
index 9ee9cb22fa392..4a36d0c6f9852 100644
--- a/ui/app/lib/arg-tokenizer.js
+++ b/ui/app/lib/arg-tokenizer.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 // taken from https://github.com/yargs/yargs-parser/blob/v13.1.0/lib/tokenize-arg-string.js to get around import issue
 // take an un-split argv string and tokenize it.
 export default function (argString) {
diff --git a/ui/app/lib/attach-capabilities.js b/ui/app/lib/attach-capabilities.js
index b275a75687199..aabd5574d7d55 100644
--- a/ui/app/lib/attach-capabilities.js
+++ b/ui/app/lib/attach-capabilities.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { belongsTo } from '@ember-data/model';
 import { assert, debug } from '@ember/debug';
 import { typeOf } from '@ember/utils';
@@ -32,8 +27,8 @@ import { isArray } from '@ember/array';
  *
  */
 export default function attachCapabilities(modelClass, capabilities) {
-  const capabilityKeys = Object.keys(capabilities);
-  const newRelationships = capabilityKeys.reduce((ret, key) => {
+  let capabilityKeys = Object.keys(capabilities);
+  let newRelationships = capabilityKeys.reduce((ret, key) => {
     ret[key] = belongsTo('capabilities');
     return ret;
   }, {});
@@ -51,19 +46,19 @@ export default function attachCapabilities(modelClass, capabilities) {
         data = jsonAPIDoc;
       }
       if (isArray(data)) {
-        const newData = data.map(this.relatedCapabilities);
+        let newData = data.map(this.relatedCapabilities);
         return {
           data: newData,
           included,
         };
       }
-      const context = {
+      let context = {
         id: data.id,
         ...data.attributes,
       };
-      for (const newCapability of capabilityKeys) {
-        const templateFn = capabilities[newCapability];
-        const type = typeOf(templateFn);
+      for (let newCapability of capabilityKeys) {
+        let templateFn = capabilities[newCapability];
+        let type = typeOf(templateFn);
         assert(`expected value of ${newCapability} to be a function but found ${type}.`, type === 'function');
         data.relationships[newCapability] = {
           data: {
diff --git a/ui/app/lib/console-helpers.js b/ui/app/lib/console-helpers.js
new file mode 100644
index 0000000000000..d54ed77ebc672
--- /dev/null
+++ b/ui/app/lib/console-helpers.js
@@ -0,0 +1,197 @@
+import keys from 'vault/lib/keycodes';
+import argTokenizer from './arg-tokenizer';
+import { parse } from 'shell-quote';
+
+const supportedCommands = ['read', 'write', 'list', 'delete'];
+const uiCommands = ['api', 'clearall', 'clear', 'fullscreen', 'refresh'];
+
+export function extractDataAndFlags(method, data, flags) {
+  return data.concat(flags).reduce(
+    (accumulator, val) => {
+      // will be "key=value" or "-flag=value" or "foo=bar=baz"
+      // split on the first =
+      // default to value of empty string
+      let [item, value = ''] = val.split(/=(.+)?/);
+      if (item.startsWith('-')) {
+        let flagName = item.replace(/^-/, '');
+        if (flagName === 'wrap-ttl') {
+          flagName = 'wrapTTL';
+        } else if (method === 'write') {
+          if (flagName === 'f' || flagName === '-force') {
+            flagName = 'force';
+          }
+        }
+        accumulator.flags[flagName] = value || true;
+        return accumulator;
+      }
+      // if it exists in data already, then we have multiple
+      // foo=bar in the list and need to make it an array
+      if (accumulator.data[item]) {
+        accumulator.data[item] = [].concat(accumulator.data[item], value);
+        return accumulator;
+      }
+      accumulator.data[item] = value;
+      return accumulator;
+    },
+    { data: {}, flags: {} }
+  );
+}
+
+export function executeUICommand(command, logAndOutput, commandFns) {
+  let cmd = command.startsWith('api') ? 'api' : command;
+  let isUICommand = uiCommands.includes(cmd);
+  if (isUICommand) {
+    logAndOutput(command);
+  }
+  if (typeof commandFns[cmd] === 'function') {
+    commandFns[cmd]();
+  }
+  return isUICommand;
+}
+
+export function parseCommand(command, shouldThrow) {
+  let args = argTokenizer(parse(command));
+  if (args[0] === 'vault') {
+    args.shift();
+  }
+
+  let [method, ...rest] = args;
+  let path;
+  let flags = [];
+  let data = [];
+
+  rest.forEach((arg) => {
+    if (arg.startsWith('-')) {
+      flags.push(arg);
+    } else {
+      if (path) {
+        let strippedArg = arg
+          // we'll have arg=something or arg="lol I need spaces", so need to split on the first =
+          .split(/=(.+)/)
+          // if there were quotes, there's an empty string as the last member in the array that we don't want,
+          // so filter it out
+          .filter((str) => str !== '')
+          // glue the data back together
+          .join('=');
+        data.push(strippedArg);
+      } else {
+        path = arg;
+      }
+    }
+  });
+
+  if (!supportedCommands.includes(method)) {
+    if (shouldThrow) {
+      throw new Error('invalid command');
+    }
+    return false;
+  }
+  return [method, flags, path, data];
+}
+
+export function logFromResponse(response, path, method, flags) {
+  let { format, field } = flags;
+  let secret = response && (response.auth || response.data || response.wrap_info);
+  if (!secret) {
+    if (method === 'write') {
+      return { type: 'success', content: `Success! Data written to: ${path}` };
+    } else if (method === 'delete') {
+      return { type: 'success', content: `Success! Data deleted (if it existed) at: ${path}` };
+    } else {
+      secret = response;
+    }
+  }
+
+  if (field) {
+    let fieldValue = secret[field];
+    let response;
+    if (fieldValue) {
+      if (format && format === 'json') {
+        return { type: 'json', content: fieldValue };
+      }
+      if (typeof fieldValue == 'string') {
+        response = { type: 'text', content: fieldValue };
+      } else if (typeof fieldValue == 'number') {
+        response = { type: 'text', content: JSON.stringify(fieldValue) };
+      } else if (typeof fieldValue == 'boolean') {
+        response = { type: 'text', content: JSON.stringify(fieldValue) };
+      } else if (Array.isArray(fieldValue)) {
+        response = { type: 'text', content: JSON.stringify(fieldValue) };
+      } else {
+        response = { type: 'object', content: fieldValue };
+      }
+    } else {
+      response = { type: 'error', content: `Field "${field}" not present in secret` };
+    }
+    return response;
+  }
+
+  if (format && format === 'json') {
+    // just print whole response
+    return { type: 'json', content: response };
+  }
+
+  if (method === 'list') {
+    return { type: 'list', content: secret };
+  }
+
+  return { type: 'object', content: secret };
+}
+
+export function logFromError(error, vaultPath, method) {
+  let content;
+  let { httpStatus, path } = error;
+  let verbClause = {
+    read: 'reading from',
+    write: 'writing to',
+    list: 'listing',
+    delete: 'deleting at',
+  }[method];
+
+  content = `Error ${verbClause}: ${vaultPath}.\nURL: ${path}\nCode: ${httpStatus}`;
+
+  if (typeof error.errors[0] === 'string') {
+    content = `${content}\nErrors:\n  ${error.errors.join('\n  ')}`;
+  }
+
+  return { type: 'error', content };
+}
+
+export function shiftCommandIndex(keyCode, history, index) {
+  let newInputValue;
+  let commandHistoryLength = history.length;
+
+  if (!commandHistoryLength) {
+    return [];
+  }
+
+  if (keyCode === keys.UP) {
+    index -= 1;
+    if (index < 0) {
+      index = commandHistoryLength - 1;
+    }
+  } else {
+    index += 1;
+    if (index === commandHistoryLength) {
+      newInputValue = '';
+    }
+    if (index > commandHistoryLength) {
+      index -= 1;
+    }
+  }
+
+  if (newInputValue !== '') {
+    newInputValue = history.objectAt(index).content;
+  }
+
+  return [index, newInputValue];
+}
+
+export function logErrorFromInput(path, method, flags, dataArray) {
+  if (path === undefined) {
+    return { type: 'error', content: 'A path is required to make a request.' };
+  }
+  if (method === 'write' && !flags.force && dataArray.length === 0) {
+    return { type: 'error', content: 'Must supply data or use -force' };
+  }
+}
diff --git a/ui/app/lib/console-helpers.ts b/ui/app/lib/console-helpers.ts
deleted file mode 100644
index bc636d55a8336..0000000000000
--- a/ui/app/lib/console-helpers.ts
+++ /dev/null
@@ -1,258 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import keys from 'vault/lib/keycodes';
-import AdapterError from '@ember-data/adapter/error';
-import { parse } from 'shell-quote';
-
-import argTokenizer from './arg-tokenizer';
-import { StringMap } from 'vault/vault/app-types';
-
-// Add new commands to `log-help` component for visibility
-const supportedCommands = ['read', 'write', 'list', 'delete', 'kv-get'];
-const uiCommands = ['api', 'clearall', 'clear', 'fullscreen', 'refresh'];
-
-interface DataObj {
-  [key: string]: string | string[];
-}
-
-export function extractDataFromStrings(dataArray: string[]): DataObj {
-  if (!dataArray) return {};
-  return dataArray.reduce((accumulator: DataObj, val: string) => {
-    // will be "key=value" or "foo=bar=baz"
-    // split on the first =
-    // default to value of empty string
-    const [item = '', value = ''] = val.split(/=(.+)?/);
-    if (!item) return accumulator;
-
-    // if it exists in data already, then we have multiple
-    // foo=bar in the list and need to make it an array
-    const existingValue = accumulator[item];
-    if (existingValue) {
-      accumulator[item] = Array.isArray(existingValue) ? [...existingValue, value] : [existingValue, value];
-      return accumulator;
-    }
-    accumulator[item] = value;
-    return accumulator;
-  }, {});
-}
-
-interface Flags {
-  field?: string;
-  format?: string;
-  force?: boolean;
-  wrapTTL?: boolean;
-  [key: string]: string | boolean | undefined;
-}
-export function extractFlagsFromStrings(flagArray: string[], method: string): Flags {
-  if (!flagArray) return {};
-  return flagArray.reduce((accumulator: Flags, val: string) => {
-    // val will be "-flag=value" or "--force"
-    // split on the first =
-    // default to value or true
-    const [item, value] = val.split(/=(.+)?/);
-    if (!item) return accumulator;
-
-    let flagName = item.replace(/^-/, '');
-    if (flagName === 'wrap-ttl') {
-      flagName = 'wrapTTL';
-    } else if (method === 'write') {
-      if (flagName === 'f' || flagName === '-force') {
-        flagName = 'force';
-      }
-    }
-    accumulator[flagName] = value || true;
-    return accumulator;
-  }, {});
-}
-
-interface CommandFns {
-  [key: string]: CallableFunction;
-}
-
-export function executeUICommand(
-  command: string,
-  logAndOutput: CallableFunction,
-  commandFns: CommandFns
-): boolean {
-  const cmd = command.startsWith('api') ? 'api' : command;
-  const isUICommand = uiCommands.includes(cmd);
-  if (isUICommand) {
-    logAndOutput(command);
-  }
-  const execCommand = commandFns[cmd];
-  if (execCommand && typeof execCommand === 'function') {
-    execCommand();
-  }
-  return isUICommand;
-}
-
-interface ParsedCommand {
-  method: string;
-  path: string;
-  flagArray: string[];
-  dataArray: string[];
-}
-export function parseCommand(command: string): ParsedCommand {
-  const args: string[] = argTokenizer(parse(command));
-  if (args[0] === 'vault') {
-    args.shift();
-  }
-
-  const [method = '', ...rest] = args;
-  let path = '';
-  const flags: string[] = [];
-  const data: string[] = [];
-
-  rest.forEach((arg) => {
-    if (arg.startsWith('-')) {
-      flags.push(arg);
-    } else {
-      if (path) {
-        const strippedArg = arg
-          // we'll have arg=something or arg="lol I need spaces", so need to split on the first =
-          .split(/=(.+)/)
-          // if there were quotes, there's an empty string as the last member in the array that we don't want,
-          // so filter it out
-          .filter((str) => str !== '')
-          // glue the data back together
-          .join('=');
-        data.push(strippedArg);
-      } else {
-        path = arg;
-      }
-    }
-  });
-
-  if (!supportedCommands.includes(method)) {
-    throw new Error('invalid command');
-  }
-  return { method, flagArray: flags, path, dataArray: data };
-}
-
-interface LogResponse {
-  auth?: StringMap;
-  data?: StringMap;
-  wrap_info?: StringMap;
-  [key: string]: unknown;
-}
-
-export function logFromResponse(response: LogResponse, path: string, method: string, flags: Flags) {
-  const { format, field } = flags;
-  const respData: StringMap | undefined = response && (response.auth || response.data || response.wrap_info);
-  const secret: StringMap | LogResponse = respData || response;
-
-  if (!respData) {
-    if (method === 'write') {
-      return { type: 'success', content: `Success! Data written to: ${path}` };
-    } else if (method === 'delete') {
-      return { type: 'success', content: `Success! Data deleted (if it existed) at: ${path}` };
-    }
-  }
-
-  if (field) {
-    const fieldValue = secret[field];
-    let response;
-    if (fieldValue) {
-      if (format && format === 'json') {
-        return { type: 'json', content: fieldValue };
-      }
-      if (typeof fieldValue == 'string') {
-        response = { type: 'text', content: fieldValue };
-      } else if (typeof fieldValue == 'number') {
-        response = { type: 'text', content: JSON.stringify(fieldValue) };
-      } else if (typeof fieldValue == 'boolean') {
-        response = { type: 'text', content: JSON.stringify(fieldValue) };
-      } else if (Array.isArray(fieldValue)) {
-        response = { type: 'text', content: JSON.stringify(fieldValue) };
-      } else {
-        response = { type: 'object', content: fieldValue };
-      }
-    } else {
-      response = { type: 'error', content: `Field "${field}" not present in secret` };
-    }
-    return response;
-  }
-
-  if (format && format === 'json') {
-    // just print whole response
-    return { type: 'json', content: response };
-  }
-
-  if (method === 'list') {
-    return { type: 'list', content: secret };
-  }
-
-  return { type: 'object', content: secret };
-}
-
-interface CustomError extends AdapterError {
-  httpStatus: number;
-  path: string;
-  errors: string[];
-}
-export function logFromError(error: CustomError, vaultPath: string, method: string) {
-  let content;
-  const { httpStatus, path } = error;
-  const verbClause = {
-    read: 'reading from',
-    'kv-get': 'reading secret',
-    write: 'writing to',
-    list: 'listing',
-    delete: 'deleting at',
-  }[method];
-
-  content = `Error ${verbClause}: ${vaultPath}.\nURL: ${path}\nCode: ${httpStatus}`;
-
-  if (typeof error.errors[0] === 'string') {
-    content = `${content}\nErrors:\n  ${error.errors.join('\n  ')}`;
-  }
-
-  return { type: 'error', content };
-}
-
-interface CommandLog {
-  type: string;
-  content?: string;
-}
-export function shiftCommandIndex(keyCode: number, history: CommandLog[], index: number) {
-  let newInputValue;
-  const commandHistoryLength = history.length;
-
-  if (!commandHistoryLength) {
-    return [];
-  }
-
-  if (keyCode === keys.UP) {
-    index -= 1;
-    if (index < 0) {
-      index = commandHistoryLength - 1;
-    }
-  } else {
-    index += 1;
-    if (index === commandHistoryLength) {
-      newInputValue = '';
-    }
-    if (index > commandHistoryLength) {
-      index -= 1;
-    }
-  }
-
-  if (newInputValue !== '') {
-    newInputValue = history.objectAt(index)?.content;
-  }
-
-  return [index, newInputValue];
-}
-
-export function formattedErrorFromInput(path: string, method: string, flags: Flags, dataArray: string[]) {
-  if (path === undefined) {
-    return { type: 'error', content: 'A path is required to make a request.' };
-  }
-  if (method === 'write' && !flags.force && dataArray.length === 0) {
-    return { type: 'error', content: 'Must supply data or use -force' };
-  }
-  return;
-}
diff --git a/ui/app/lib/control-group-error.js b/ui/app/lib/control-group-error.js
index 9a27ced53d771..52094f1ae9e3c 100644
--- a/ui/app/lib/control-group-error.js
+++ b/ui/app/lib/control-group-error.js
@@ -1,13 +1,8 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import AdapterError from '@ember-data/adapter/error';
 
 export default class ControlGroupError extends AdapterError {
   constructor(wrapInfo) {
-    const { accessor, creation_path, creation_time, token, ttl } = wrapInfo;
+    let { accessor, creation_path, creation_time, token, ttl } = wrapInfo;
     super();
     this.message = 'Control Group encountered';
 
diff --git a/ui/app/lib/key-utils.js b/ui/app/lib/key-utils.js
index e629037181550..a1016036e831b 100644
--- a/ui/app/lib/key-utils.js
+++ b/ui/app/lib/key-utils.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 function keyIsFolder(key) {
   return key ? !!key.match(/\/$/) : false;
 }
diff --git a/ui/app/lib/keycodes.js b/ui/app/lib/keycodes.js
index 66164d350e26c..872468021f4f7 100644
--- a/ui/app/lib/keycodes.js
+++ b/ui/app/lib/keycodes.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 // a map of keyCode for use in keyboard event handlers
 export default {
   ENTER: 13,
diff --git a/ui/app/lib/kv-object.js b/ui/app/lib/kv-object.js
index 3df5c1ea2d819..9e44eb2b55212 100644
--- a/ui/app/lib/kv-object.js
+++ b/ui/app/lib/kv-object.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ArrayProxy from '@ember/array/proxy';
 import { typeOf } from '@ember/utils';
 import { guidFor } from '@ember/object/internals';
@@ -12,8 +7,8 @@ export default ArrayProxy.extend({
     if (json && typeOf(json) !== 'object') {
       throw new Error('Vault expects data to be formatted as an JSON object.');
     }
-    const contents = Object.keys(json || []).map((key) => {
-      const obj = {
+    let contents = Object.keys(json || []).map((key) => {
+      let obj = {
         name: key,
         value: json[key],
       };
@@ -43,7 +38,7 @@ export default ArrayProxy.extend({
       if (!includeBlanks && item.value === '' && item.name === '') {
         return obj;
       }
-      const val = typeof item.value === 'undefined' ? '' : item.value;
+      let val = typeof item.value === 'undefined' ? '' : item.value;
       obj[item.name || ''] = val;
       return obj;
     }, {});
diff --git a/ui/app/lib/local-storage.js b/ui/app/lib/local-storage.js
index e3be3447b6b44..86556835c7f86 100644
--- a/ui/app/lib/local-storage.js
+++ b/ui/app/lib/local-storage.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export default {
   getItem(key) {
     var item = window.localStorage.getItem(key);
@@ -20,14 +15,4 @@ export default {
   keys() {
     return Object.keys(window.localStorage);
   },
-
-  cleanupStorage(string, keyToKeep) {
-    if (!string) return;
-    const relevantKeys = this.keys().filter((str) => str.startsWith(string));
-    relevantKeys?.forEach((key) => {
-      if (key !== keyToKeep) {
-        localStorage.removeItem(key);
-      }
-    });
-  },
 };
diff --git a/ui/app/lib/memory-storage.js b/ui/app/lib/memory-storage.js
index 372871923ceaf..b702afd31de9f 100644
--- a/ui/app/lib/memory-storage.js
+++ b/ui/app/lib/memory-storage.js
@@ -1,9 +1,4 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-const cache = {};
+let cache = {};
 
 export default {
   getItem(key) {
diff --git a/ui/app/lib/path-to-tree.js b/ui/app/lib/path-to-tree.js
index 9359c48aacdc4..aac81b1fdb7ed 100644
--- a/ui/app/lib/path-to-tree.js
+++ b/ui/app/lib/path-to-tree.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import flat from 'flat';
 import deepmerge from 'deepmerge';
 
@@ -27,16 +22,16 @@ const DOT_REPLACEMENT = '☃';
 // }
 export default function (paths) {
   // first sort the list by length, then alphanumeric
-  const list = paths.slice(0).sort((a, b) => b.length - a.length || b.localeCompare(a));
+  let list = paths.slice(0).sort((a, b) => b.length - a.length || b.localeCompare(a));
   // then reduce to an array
   // and we remove all of the items that have a string
   // that starts with the same prefix from the list
   // so if we have "foo/bar/baz", both "foo" and "foo/bar"
   // won't be included in the list
   let tree = list.reduce((accumulator, ns) => {
-    const nsWithPrefix = accumulator.find((path) => path.startsWith(ns));
+    let nsWithPrefix = accumulator.find((path) => path.startsWith(ns));
     // we need to make sure it's a match for the full path part
-    const isFullMatch = nsWithPrefix && nsWithPrefix.charAt(ns.length) === '/';
+    let isFullMatch = nsWithPrefix && nsWithPrefix.charAt(ns.length) === '/';
     if (!isFullMatch) {
       accumulator.push(ns);
     }
diff --git a/ui/app/lib/route-paths.js b/ui/app/lib/route-paths.js
index e0125ae0e577a..221a6401ce64f 100644
--- a/ui/app/lib/route-paths.js
+++ b/ui/app/lib/route-paths.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export const INIT = 'vault.cluster.init';
 export const UNSEAL = 'vault.cluster.unseal';
 export const AUTH = 'vault.cluster.auth';
diff --git a/ui/app/lib/token-storage.js b/ui/app/lib/token-storage.js
index f96e0f51c7cb3..a50a5a1c348b3 100644
--- a/ui/app/lib/token-storage.js
+++ b/ui/app/lib/token-storage.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import localStorageWrapper from './local-storage';
 import memoryStorage from './memory-storage';
 
diff --git a/ui/app/machines/auth-machine.js b/ui/app/machines/auth-machine.js
index e04041817930c..6ee82dd08a628 100644
--- a/ui/app/machines/auth-machine.js
+++ b/ui/app/machines/auth-machine.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export default {
   key: 'auth',
   initial: 'idle',
diff --git a/ui/app/machines/policies-machine.js b/ui/app/machines/policies-machine.js
index db7c94e8105b8..fce6140dc4dc6 100644
--- a/ui/app/machines/policies-machine.js
+++ b/ui/app/machines/policies-machine.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export default {
   key: 'policies',
   initial: 'idle',
diff --git a/ui/app/machines/replication-machine.js b/ui/app/machines/replication-machine.js
index 5816ce5d65b58..99bf8b2735754 100644
--- a/ui/app/machines/replication-machine.js
+++ b/ui/app/machines/replication-machine.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export default {
   key: 'replication',
   initial: 'setup',
diff --git a/ui/app/machines/secrets-machine.js b/ui/app/machines/secrets-machine.js
index e8e9353b91371..8e399112bfdcc 100644
--- a/ui/app/machines/secrets-machine.js
+++ b/ui/app/machines/secrets-machine.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { supportedSecretBackends } from 'vault/helpers/supported-secret-backends';
 const supportedBackends = supportedSecretBackends();
 
diff --git a/ui/app/machines/tools-machine.js b/ui/app/machines/tools-machine.js
index 64643b64632d6..67b2734eca9f6 100644
--- a/ui/app/machines/tools-machine.js
+++ b/ui/app/machines/tools-machine.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export default {
   key: 'tools',
   initial: 'wrap',
diff --git a/ui/app/machines/tutorial-machine.js b/ui/app/machines/tutorial-machine.js
index 0519f029ae56b..9c66d5e9c16b2 100644
--- a/ui/app/machines/tutorial-machine.js
+++ b/ui/app/machines/tutorial-machine.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export default {
   key: 'tutorial',
   initial: 'idle',
diff --git a/ui/app/macros/identity-capabilities.js b/ui/app/macros/identity-capabilities.js
index da70c00fe59b3..91bb68d67bccb 100644
--- a/ui/app/macros/identity-capabilities.js
+++ b/ui/app/macros/identity-capabilities.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import lazyCapabilities, { apiPath } from 'vault/macros/lazy-capabilities';
 
 export default function () {
diff --git a/ui/app/macros/lazy-capabilities.js b/ui/app/macros/lazy-capabilities.js
index fa5d26597c222..5a4bf376dca2e 100644
--- a/ui/app/macros/lazy-capabilities.js
+++ b/ui/app/macros/lazy-capabilities.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 // usage:
 //
 // import lazyCapabilities, { apiPath } from 'vault/macros/lazy-capabilities';
@@ -20,8 +15,8 @@ import { maybeQueryRecord } from 'vault/macros/maybe-query-record';
 
 export function apiPath(strings, ...keys) {
   return function (data) {
-    const dict = data || {};
-    const result = [strings[0]];
+    let dict = data || {};
+    let result = [strings[0]];
     keys.forEach((key, i) => {
       result.push(dict[key], strings[i + 1]);
     });
@@ -30,14 +25,14 @@ export function apiPath(strings, ...keys) {
 }
 
 export default function () {
-  const [templateFn, ...keys] = arguments;
+  let [templateFn, ...keys] = arguments;
   return maybeQueryRecord(
     'capabilities',
     (context) => {
       // pull all context attrs
-      const contextObject = context.getProperties(...keys);
+      let contextObject = context.getProperties(...keys);
       // remove empty ones
-      const nonEmptyContexts = Object.keys(contextObject).reduce((ret, key) => {
+      let nonEmptyContexts = Object.keys(contextObject).reduce((ret, key) => {
         if (contextObject[key] != null) {
           ret[key] = contextObject[key];
         }
diff --git a/ui/app/macros/maybe-query-record.js b/ui/app/macros/maybe-query-record.js
index 94cc369923179..8e1a7fdacecf7 100644
--- a/ui/app/macros/maybe-query-record.js
+++ b/ui/app/macros/maybe-query-record.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { computed } from '@ember/object';
 import ObjectProxy from '@ember/object/proxy';
 import PromiseProxyMixin from '@ember/object/promise-proxy-mixin';
diff --git a/ui/app/mixins/backend-crumb.js b/ui/app/mixins/backend-crumb.js
index 57d81c8c30059..1f82d2d721935 100644
--- a/ui/app/mixins/backend-crumb.js
+++ b/ui/app/mixins/backend-crumb.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { computed } from '@ember/object';
 import Mixin from '@ember/object/mixin';
 
diff --git a/ui/app/mixins/cluster-route.js b/ui/app/mixins/cluster-route.js
index 6cb3a96ddaede..a438187253846 100644
--- a/ui/app/mixins/cluster-route.js
+++ b/ui/app/mixins/cluster-route.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import Mixin from '@ember/object/mixin';
 import RSVP from 'rsvp';
diff --git a/ui/app/mixins/focus-on-insert.js b/ui/app/mixins/focus-on-insert.js
index 08b2716718e3b..5b989ed526383 100644
--- a/ui/app/mixins/focus-on-insert.js
+++ b/ui/app/mixins/focus-on-insert.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { schedule } from '@ember/runloop';
 import { on } from '@ember/object/evented';
 import Mixin from '@ember/object/mixin';
diff --git a/ui/app/mixins/key-mixin.js b/ui/app/mixins/key-mixin.js
index f9d9aafb61c08..9a88470db51e2 100644
--- a/ui/app/mixins/key-mixin.js
+++ b/ui/app/mixins/key-mixin.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { computed } from '@ember/object';
 import Mixin from '@ember/object/mixin';
 import utils from 'vault/lib/key-utils';
diff --git a/ui/app/mixins/model-boundary-route.js b/ui/app/mixins/model-boundary-route.js
index 3d639d7c84aae..6461ef9fa4c41 100644
--- a/ui/app/mixins/model-boundary-route.js
+++ b/ui/app/mixins/model-boundary-route.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 // meant for use mixed-in to a Route file
 //
 // When a route is deactivated, this mixin clears the Ember Data store of
diff --git a/ui/app/mixins/policy-edit-controller.js b/ui/app/mixins/policy-edit-controller.js
new file mode 100644
index 0000000000000..8f77988491016
--- /dev/null
+++ b/ui/app/mixins/policy-edit-controller.js
@@ -0,0 +1,49 @@
+import { inject as service } from '@ember/service';
+import Mixin from '@ember/object/mixin';
+
+export default Mixin.create({
+  flashMessages: service(),
+  wizard: service(),
+  actions: {
+    deletePolicy(model) {
+      let policyType = model.get('policyType');
+      let name = model.get('name');
+      let flash = this.flashMessages;
+      model
+        .destroyRecord()
+        .then(() => {
+          flash.success(`${policyType.toUpperCase()} policy "${name}" was successfully deleted.`);
+          return this.transitionToRoute('vault.cluster.policies', policyType);
+        })
+        .catch((e) => {
+          let errors = e.errors ? e.errors.join('') : e.message;
+          flash.danger(
+            `There was an error deleting the ${policyType.toUpperCase()} policy "${name}": ${errors}.`
+          );
+        });
+    },
+
+    savePolicy(model) {
+      let flash = this.flashMessages;
+      let policyType = model.get('policyType');
+      let name = model.get('name');
+      model
+        .save()
+        .then((m) => {
+          flash.success(`${policyType.toUpperCase()} policy "${name}" was successfully saved.`);
+          if (this.wizard.featureState === 'create') {
+            this.wizard.transitionFeatureMachine('create', 'CONTINUE', policyType);
+          }
+          return this.transitionToRoute('vault.cluster.policy.show', m.get('policyType'), m.get('name'));
+        })
+        .catch(() => {
+          // swallow error -- model.errors set by Adapter
+          return;
+        });
+    },
+
+    setModelName(model, e) {
+      model.set('name', e.target.value.toLowerCase());
+    },
+  },
+});
diff --git a/ui/app/mixins/unload-model-route.js b/ui/app/mixins/unload-model-route.js
index 62375a4265797..ce5c370191ace 100644
--- a/ui/app/mixins/unload-model-route.js
+++ b/ui/app/mixins/unload-model-route.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Mixin from '@ember/object/mixin';
 import removeRecord from 'vault/utils/remove-record';
 
@@ -11,9 +6,9 @@ import removeRecord from 'vault/utils/remove-record';
 export default Mixin.create({
   modelPath: 'model',
   unloadModel() {
-    const { modelPath } = this;
+    let { modelPath } = this;
     /* eslint-disable-next-line ember/no-controller-access-in-routes */
-    const model = this.controller.get(modelPath);
+    let model = this.controller.get(modelPath);
     // error is thrown when you attempt to unload a record that is inFlight (isSaving)
     if (!model || !model.unloadRecord || model.isSaving) {
       return;
diff --git a/ui/app/mixins/unsaved-model-route.js b/ui/app/mixins/unsaved-model-route.js
index 717504dca623b..5c6b33a06b97c 100644
--- a/ui/app/mixins/unsaved-model-route.js
+++ b/ui/app/mixins/unsaved-model-route.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Mixin from '@ember/object/mixin';
 
 // this mixin relies on `unload-model-route` also being used
diff --git a/ui/app/mixins/with-nav-to-nearest-ancestor.js b/ui/app/mixins/with-nav-to-nearest-ancestor.js
index b7cc39a19de91..9ecb518881ce8 100644
--- a/ui/app/mixins/with-nav-to-nearest-ancestor.js
+++ b/ui/app/mixins/with-nav-to-nearest-ancestor.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Mixin from '@ember/object/mixin';
 import utils from 'vault/lib/key-utils';
 import { task } from 'ember-concurrency';
@@ -18,12 +13,12 @@ import { task } from 'ember-concurrency';
 // the ancestors array and transitions to the root
 export default Mixin.create({
   navToNearestAncestor: task(function* (key) {
-    const ancestors = utils.ancestorKeysForKey(key);
+    let ancestors = utils.ancestorKeysForKey(key);
     let errored = false;
     let nearest = ancestors.pop();
     while (nearest) {
       try {
-        const transition = this.transitionToRoute('vault.cluster.secrets.backend.list', nearest);
+        let transition = this.transitionToRoute('vault.cluster.secrets.backend.list', nearest);
         transition.data.isDeletion = true;
         yield transition.promise;
       } catch (e) {
diff --git a/ui/app/models/auth-config.js b/ui/app/models/auth-config.js
index 273330761d20c..49c5763164576 100644
--- a/ui/app/models/auth-config.js
+++ b/ui/app/models/auth-config.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Model, { belongsTo } from '@ember-data/model';
 
 export default Model.extend({
diff --git a/ui/app/models/auth-config/approle.js b/ui/app/models/auth-config/approle.js
index 099e01adadcfe..66657e064b150 100644
--- a/ui/app/models/auth-config/approle.js
+++ b/ui/app/models/auth-config/approle.js
@@ -1,7 +1,2 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import AuthConfig from '../auth-config';
 export default AuthConfig.extend({});
diff --git a/ui/app/models/auth-config/aws/client.js b/ui/app/models/auth-config/aws/client.js
index 6a94c5c9176df..37b73167c6cf5 100644
--- a/ui/app/models/auth-config/aws/client.js
+++ b/ui/app/models/auth-config/aws/client.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { attr } from '@ember-data/model';
 import { computed } from '@ember/object';
 import AuthConfig from '../../auth-config';
diff --git a/ui/app/models/auth-config/aws/identity-accesslist.js b/ui/app/models/auth-config/aws/identity-accesslist.js
index 687b730dd5ba4..a9c065da7327e 100644
--- a/ui/app/models/auth-config/aws/identity-accesslist.js
+++ b/ui/app/models/auth-config/aws/identity-accesslist.js
@@ -1,7 +1,2 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Tidy from './tidy';
 export default Tidy.extend();
diff --git a/ui/app/models/auth-config/aws/roletag-denylist.js b/ui/app/models/auth-config/aws/roletag-denylist.js
index 687b730dd5ba4..a9c065da7327e 100644
--- a/ui/app/models/auth-config/aws/roletag-denylist.js
+++ b/ui/app/models/auth-config/aws/roletag-denylist.js
@@ -1,7 +1,2 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Tidy from './tidy';
 export default Tidy.extend();
diff --git a/ui/app/models/auth-config/aws/tidy.js b/ui/app/models/auth-config/aws/tidy.js
index e6a83777125bc..c395901aef02f 100644
--- a/ui/app/models/auth-config/aws/tidy.js
+++ b/ui/app/models/auth-config/aws/tidy.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { attr } from '@ember-data/model';
 import { computed } from '@ember/object';
 import { expandAttributeMeta } from 'vault/utils/field-to-attrs';
diff --git a/ui/app/models/auth-config/azure.js b/ui/app/models/auth-config/azure.js
index 8c2633b2e88e5..72f5b2678c780 100644
--- a/ui/app/models/auth-config/azure.js
+++ b/ui/app/models/auth-config/azure.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { attr } from '@ember-data/model';
 import { computed } from '@ember/object';
 import AuthConfig from '../auth-config';
diff --git a/ui/app/models/auth-config/cert.js b/ui/app/models/auth-config/cert.js
index 099e01adadcfe..66657e064b150 100644
--- a/ui/app/models/auth-config/cert.js
+++ b/ui/app/models/auth-config/cert.js
@@ -1,7 +1,2 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import AuthConfig from '../auth-config';
 export default AuthConfig.extend({});
diff --git a/ui/app/models/auth-config/gcp.js b/ui/app/models/auth-config/gcp.js
index 3b87616f5792c..c1fb0b18bcecc 100644
--- a/ui/app/models/auth-config/gcp.js
+++ b/ui/app/models/auth-config/gcp.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { attr } from '@ember-data/model';
 import { computed } from '@ember/object';
 import AuthConfig from '../auth-config';
diff --git a/ui/app/models/auth-config/github.js b/ui/app/models/auth-config/github.js
index 76d8b9f5a1186..5dc48cd06a448 100644
--- a/ui/app/models/auth-config/github.js
+++ b/ui/app/models/auth-config/github.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { attr } from '@ember-data/model';
 import { computed } from '@ember/object';
 import AuthConfig from '../auth-config';
diff --git a/ui/app/models/auth-config/jwt.js b/ui/app/models/auth-config/jwt.js
index e1e0db56b7e7a..6926c6b108675 100644
--- a/ui/app/models/auth-config/jwt.js
+++ b/ui/app/models/auth-config/jwt.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { attr } from '@ember-data/model';
 import { computed } from '@ember/object';
 import AuthConfig from '../auth-config';
@@ -42,7 +37,7 @@ export default AuthConfig.extend({
     helpText: 'The value against which to match the iss claim in a JWT',
   }),
   fieldGroups: computed('constructor.modelName', 'newFields', function () {
-    const type = this.constructor.modelName.split('/')[1].toUpperCase();
+    let type = this.constructor.modelName.split('/')[1].toUpperCase();
     let groups = [
       {
         default: ['oidcDiscoveryUrl', 'defaultRole'],
diff --git a/ui/app/models/auth-config/kubernetes.js b/ui/app/models/auth-config/kubernetes.js
index 9a1ccc05ba0b8..e9312c4163c57 100644
--- a/ui/app/models/auth-config/kubernetes.js
+++ b/ui/app/models/auth-config/kubernetes.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { attr } from '@ember-data/model';
 import { computed } from '@ember/object';
 
diff --git a/ui/app/models/auth-config/ldap.js b/ui/app/models/auth-config/ldap.js
index a5fb4ca04a71b..a7b68774a3659 100644
--- a/ui/app/models/auth-config/ldap.js
+++ b/ui/app/models/auth-config/ldap.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { attr } from '@ember-data/model';
 import { computed } from '@ember/object';
 
diff --git a/ui/app/models/auth-config/oidc.js b/ui/app/models/auth-config/oidc.js
index 0cc4da74486bc..819ee0d1e1920 100644
--- a/ui/app/models/auth-config/oidc.js
+++ b/ui/app/models/auth-config/oidc.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from './jwt';
diff --git a/ui/app/models/auth-config/okta.js b/ui/app/models/auth-config/okta.js
index 44aa8c8514d1a..a8024e83a696c 100644
--- a/ui/app/models/auth-config/okta.js
+++ b/ui/app/models/auth-config/okta.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { attr } from '@ember-data/model';
 import { computed } from '@ember/object';
 import AuthConfig from '../auth-config';
diff --git a/ui/app/models/auth-config/radius.js b/ui/app/models/auth-config/radius.js
index 96752f12d178d..db098c9652bbd 100644
--- a/ui/app/models/auth-config/radius.js
+++ b/ui/app/models/auth-config/radius.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { attr } from '@ember-data/model';
 import { computed } from '@ember/object';
 import AuthConfig from '../auth-config';
diff --git a/ui/app/models/auth-config/userpass.js b/ui/app/models/auth-config/userpass.js
index 099e01adadcfe..66657e064b150 100644
--- a/ui/app/models/auth-config/userpass.js
+++ b/ui/app/models/auth-config/userpass.js
@@ -1,7 +1,2 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import AuthConfig from '../auth-config';
 export default AuthConfig.extend({});
diff --git a/ui/app/models/auth-method.js b/ui/app/models/auth-method.js
index 9cc365476a46a..a54cc80d4f020 100644
--- a/ui/app/models/auth-method.js
+++ b/ui/app/models/auth-method.js
@@ -1,27 +1,15 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Model, { belongsTo, hasMany, attr } from '@ember-data/model';
+import Model, { hasMany, attr } from '@ember-data/model';
 import { alias } from '@ember/object/computed'; // eslint-disable-line
 import { computed } from '@ember/object'; // eslint-disable-line
-import { inject as service } from '@ember/service';
+import { fragment } from 'ember-data-model-fragments/attributes';
 import fieldToAttrs, { expandAttributeMeta } from 'vault/utils/field-to-attrs';
+import { memberAction } from 'ember-api-actions';
 import apiPath from 'vault/utils/api-path';
 import attachCapabilities from 'vault/lib/attach-capabilities';
 import { withModelValidations } from 'vault/decorators/model-validations';
 
 const validations = {
-  path: [
-    { type: 'presence', message: "Path can't be blank." },
-    {
-      type: 'containsWhiteSpace',
-      message:
-        "Path contains whitespace. If this is desired, you'll need to encode it with %20 in API requests.",
-      level: 'warn',
-    },
-  ],
+  path: [{ type: 'presence', message: "Path can't be blank." }],
 };
 
 // unsure if ember-api-actions will work on native JS class model
@@ -29,9 +17,6 @@ const validations = {
 @withModelValidations(validations)
 class AuthMethodModel extends Model {}
 const ModelExport = AuthMethodModel.extend({
-  store: service(),
-
-  config: belongsTo('mount-config', { async: false, inverse: null }), // one-to-none that replaces former fragment
   authConfigs: hasMany('auth-config', { polymorphic: true, inverse: 'backend', async: false }),
   path: attr('string'),
   accessor: attr('string'),
@@ -45,6 +30,7 @@ const ModelExport = AuthMethodModel.extend({
   description: attr('string', {
     editType: 'textarea',
   }),
+  config: fragment('mount-config', { defaultValue: {} }),
   local: attr('boolean', {
     helpText:
       'When Replication is enabled, a local mount will not be replicated across clusters. This can only be specified at mount time.',
@@ -64,7 +50,7 @@ const ModelExport = AuthMethodModel.extend({
   }),
 
   tuneAttrs: computed('path', function () {
-    const { methodType } = this;
+    let { methodType } = this;
     let tuneAttrs;
     // token_type should not be tuneable for the token auth method
     if (methodType === 'token') {
@@ -81,6 +67,13 @@ const ModelExport = AuthMethodModel.extend({
     return expandAttributeMeta(this, tuneAttrs);
   }),
 
+  // sys/mounts/auth/[auth-path]/tune.
+  tune: memberAction({
+    path: 'tune',
+    type: 'post',
+    urlType: 'updateRecord',
+  }),
+
   formFields: computed(function () {
     return [
       'type',
@@ -117,10 +110,6 @@ const ModelExport = AuthMethodModel.extend({
   }),
   canDisable: alias('deletePath.canDelete'),
   canEdit: alias('configPath.canUpdate'),
-
-  tune(data) {
-    return this.store.adapterFor('auth-method').tune(this.path, data);
-  },
 });
 
 export default attachCapabilities(ModelExport, {
diff --git a/ui/app/models/aws-credential.js b/ui/app/models/aws-credential.js
index 1c8051f0738ef..6a9ff270f6a29 100644
--- a/ui/app/models/aws-credential.js
+++ b/ui/app/models/aws-credential.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Model, { attr } from '@ember-data/model';
 import { computed } from '@ember/object';
 import { expandAttributeMeta } from 'vault/utils/field-to-attrs';
@@ -57,8 +52,8 @@ export default Model.extend({
   securityToken: attr('string'),
 
   attrs: computed('credentialType', 'accessKey', 'securityToken', function () {
-    const type = this.credentialType;
-    const fieldsForType = {
+    let type = this.credentialType;
+    let fieldsForType = {
       iam_user: ['credentialType'],
       assumed_role: ['credentialType', 'ttl', 'roleArn'],
       federation_token: ['credentialType', 'ttl'],
diff --git a/ui/app/models/capabilities.js b/ui/app/models/capabilities.js
index cdd7b3449b14f..920eebf931a09 100644
--- a/ui/app/models/capabilities.js
+++ b/ui/app/models/capabilities.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 // This model represents the capabilities on a given `path`
 // `path` is also the primaryId
 // https://www.vaultproject.io/docs/concepts/policies.html#capabilities
diff --git a/ui/app/models/clients/activity.js b/ui/app/models/clients/activity.js
index 4f80ef41a6661..70d8f4914208f 100644
--- a/ui/app/models/clients/activity.js
+++ b/ui/app/models/clients/activity.js
@@ -1,13 +1,10 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Model, { attr } from '@ember-data/model';
 export default class Activity extends Model {
   @attr('array') byMonth;
   @attr('array') byNamespace;
   @attr('object') total;
+  @attr('array') formattedEndTime;
+  @attr('array') formattedStartTime;
   @attr('string') startTime;
   @attr('string') endTime;
   @attr('string') responseTimestamp;
diff --git a/ui/app/models/clients/config.js b/ui/app/models/clients/config.js
index 0be017a4cd22a..49c83a3597c38 100644
--- a/ui/app/models/clients/config.js
+++ b/ui/app/models/clients/config.js
@@ -1,48 +1,30 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Model, { attr } from '@ember-data/model';
-import lazyCapabilities, { apiPath } from 'vault/macros/lazy-capabilities';
-import { withFormFields } from 'vault/decorators/model-form-fields';
-import { withModelValidations } from 'vault/decorators/model-validations';
-
-const validations = {
-  retentionMonths: [
-    {
-      validator: (model) => parseInt(model.retentionMonths) >= model.minimumRetentionMonths,
-      message: (model) =>
-        `Retention period must be greater than or equal to ${model.minimumRetentionMonths}.`,
-    },
-  ],
-};
-
-@withModelValidations(validations)
-@withFormFields(['enabled', 'retentionMonths'])
-export default class ClientsConfigModel extends Model {
-  @attr('boolean') queriesAvailable; // true only if historical data exists, will be false if there is only current month data
-
-  @attr('number', {
+import { computed } from '@ember/object';
+import attachCapabilities from 'vault/lib/attach-capabilities';
+import { expandAttributeMeta } from 'vault/utils/field-to-attrs';
+import { apiPath } from 'vault/macros/lazy-capabilities';
+
+const M = Model.extend({
+  queriesAvailable: attr('boolean'),
+  retentionMonths: attr('number', {
     label: 'Retention period',
     subText: 'The number of months of activity logs to maintain for client tracking.',
-  })
-  retentionMonths;
-
-  @attr('number') minimumRetentionMonths;
-
-  @attr('string') enabled;
-
-  @attr('boolean') reportingEnabled;
-
-  @attr('date') billingStartTimestamp;
-
-  @lazyCapabilities(apiPath`sys/internal/counters/config`) configPath;
-
-  get canRead() {
-    return this.configPath.get('canRead') !== false;
-  }
-  get canEdit() {
-    return this.configPath.get('canUpdate') !== false;
-  }
-}
+  }),
+  enabled: attr('string', {
+    editType: 'boolean',
+    trueValue: 'On',
+    falseValue: 'Off',
+    label: 'Enable usage data collection',
+    helpText:
+      'Enable or disable client tracking. Keep in mind that disabling tracking will delete the data for the current month.',
+  }),
+
+  configAttrs: computed(function () {
+    let keys = ['enabled', 'retentionMonths'];
+    return expandAttributeMeta(this, keys);
+  }),
+});
+
+export default attachCapabilities(M, {
+  configPath: apiPath`sys/internal/counters/config`,
+});
diff --git a/ui/app/models/clients/monthly.js b/ui/app/models/clients/monthly.js
new file mode 100644
index 0000000000000..2ec3859b2ca13
--- /dev/null
+++ b/ui/app/models/clients/monthly.js
@@ -0,0 +1,6 @@
+import Model, { attr } from '@ember-data/model';
+export default class MonthlyModel extends Model {
+  @attr('string') responseTimestamp;
+  @attr('object') total; // total clients during the current/partial month
+  @attr('array') byNamespace;
+}
diff --git a/ui/app/models/clients/version-history.js b/ui/app/models/clients/version-history.js
index fae00d2755329..2175a2fc36ab5 100644
--- a/ui/app/models/clients/version-history.js
+++ b/ui/app/models/clients/version-history.js
@@ -1,11 +1,5 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Model, { attr } from '@ember-data/model';
 export default class VersionHistoryModel extends Model {
-  @attr('string') version;
   @attr('string') previousVersion;
   @attr('string') timestampInstalled;
 }
diff --git a/ui/app/models/cluster.js b/ui/app/models/cluster.js
index 0a8600a0db8a1..1f24ca9dc8279 100644
--- a/ui/app/models/cluster.js
+++ b/ui/app/models/cluster.js
@@ -1,12 +1,8 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Model, { attr, belongsTo, hasMany } from '@ember-data/model';
+import Model, { attr, hasMany } from '@ember-data/model';
 import { inject as service } from '@ember/service';
 import { alias, and, equal, gte, not, or } from '@ember/object/computed';
 import { get, computed } from '@ember/object';
+import { fragment } from 'ember-data-model-fragments/attributes';
 
 export default Model.extend({
   version: service(),
@@ -57,10 +53,10 @@ export default Model.extend({
   allReplicationDisabled: and('{dr,performance}.replicationDisabled'),
   anyReplicationEnabled: or('{dr,performance}.replicationEnabled'),
 
-  dr: belongsTo('replication-attributes', { async: false, inverse: null }),
-  performance: belongsTo('replication-attributes', { async: false, inverse: null }),
+  dr: fragment('replication-attributes'),
+  performance: fragment('replication-attributes'),
   // this service exposes what mode the UI is currently viewing
-  // replicationAttrs will then return the relevant `replication-attributes` model
+  // replicationAttrs will then return the relevant `replication-attributes` fragment
   rm: service('replication-mode'),
   drMode: alias('dr.mode'),
   replicationMode: alias('rm.mode'),
diff --git a/ui/app/models/control-group-config.js b/ui/app/models/control-group-config.js
index 31257263bcf42..a2dcf507f85db 100644
--- a/ui/app/models/control-group-config.js
+++ b/ui/app/models/control-group-config.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Model, { attr } from '@ember-data/model';
 import { alias } from '@ember/object/computed';
 import { computed } from '@ember/object';
diff --git a/ui/app/models/control-group.js b/ui/app/models/control-group.js
index f6d4efb55057f..054f6e331d7d5 100644
--- a/ui/app/models/control-group.js
+++ b/ui/app/models/control-group.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Model, { hasMany, belongsTo, attr } from '@ember-data/model';
 import { alias } from '@ember/object/computed';
 import lazyCapabilities, { apiPath } from 'vault/macros/lazy-capabilities';
diff --git a/ui/app/models/database/connection.js b/ui/app/models/database/connection.js
index a0ae34c410eb1..143882dca0cc1 100644
--- a/ui/app/models/database/connection.js
+++ b/ui/app/models/database/connection.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Model, { attr } from '@ember-data/model';
 import { computed } from '@ember/object';
 import { alias, or } from '@ember/object/computed';
@@ -59,7 +54,7 @@ export default Model.extend({
     defaultSubText:
       'Unless a custom policy is specified, Vault will use a default: 20 characters with at least 1 uppercase, 1 lowercase, 1 number, and 1 dash character.',
     defaultShown: 'Default',
-    docLink: '/vault/docs/concepts/password-policies',
+    docLink: '/docs/concepts/password-policies',
   }),
 
   // common fields
@@ -111,7 +106,7 @@ export default Model.extend({
     subText: 'Enter the custom username template to use.',
     defaultSubText:
       'Template describing how dynamic usernames are generated. Vault will use the default for this plugin.',
-    docLink: '/vault/docs/concepts/username-templating',
+    docLink: '/docs/concepts/username-templating',
     defaultShown: 'Default',
   }),
   max_open_connections: attr('number', {
@@ -176,10 +171,10 @@ export default Model.extend({
     if (!this.plugin_name) {
       return null;
     }
-    const pluginFields = AVAILABLE_PLUGIN_TYPES.find((a) => a.value === this.plugin_name).fields.filter(
+    let pluginFields = AVAILABLE_PLUGIN_TYPES.find((a) => a.value === this.plugin_name).fields.filter(
       (f) => f.group === 'pluginConfig'
     );
-    const groups = fieldsToGroups(pluginFields, 'subgroup');
+    let groups = fieldsToGroups(pluginFields, 'subgroup');
     return fieldToAttrs(this, groups);
   }),
 
@@ -187,7 +182,7 @@ export default Model.extend({
     if (!this.plugin_name) {
       return expandAttributeMeta(this, ['root_rotation_statements']);
     }
-    const fields = AVAILABLE_PLUGIN_TYPES.find((a) => a.value === this.plugin_name)
+    let fields = AVAILABLE_PLUGIN_TYPES.find((a) => a.value === this.plugin_name)
       .fields.filter((f) => f.group === 'statements')
       .map((field) => field.attr);
     return expandAttributeMeta(this, fields);
diff --git a/ui/app/models/database/credential.js b/ui/app/models/database/credential.js
index 110fa4e413cd4..080a738c4d257 100644
--- a/ui/app/models/database/credential.js
+++ b/ui/app/models/database/credential.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Model, { attr } from '@ember-data/model';
 
 export default Model.extend({
diff --git a/ui/app/models/database/role.js b/ui/app/models/database/role.js
index 3fd022a38742b..3816cdba148ea 100644
--- a/ui/app/models/database/role.js
+++ b/ui/app/models/database/role.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Model, { attr } from '@ember-data/model';
 import { computed } from '@ember/object';
 import { alias } from '@ember/object/computed';
@@ -17,12 +12,13 @@ export default Model.extend({
     label: 'Role name',
   }),
   database: attr('array', {
-    label: 'Connection name',
+    label: '',
     editType: 'searchSelect',
     fallbackComponent: 'string-list',
     models: ['database/connection'],
     selectLimit: 1,
     onlyAllowExisting: true,
+    subLabel: 'Connection name',
     subText: 'The database connection for which credentials will be generated.',
   }),
   type: attr('string', {
@@ -89,7 +85,7 @@ export default Model.extend({
   /* FIELD ATTRIBUTES */
   get fieldAttrs() {
     // Main fields on edit/create form
-    const fields = ['name', 'database', 'type'];
+    let fields = ['name', 'database', 'type'];
     return expandAttributeMeta(this, fields);
   },
 
@@ -105,7 +101,7 @@ export default Model.extend({
 
   roleSettingAttrs: computed(function () {
     // logic for which get displayed is on DatabaseRoleSettingForm
-    const allRoleSettingFields = [
+    let allRoleSettingFields = [
       'default_ttl',
       'max_ttl',
       'username',
diff --git a/ui/app/models/identity/_base.js b/ui/app/models/identity/_base.js
index 37971c2554419..2016b99d93509 100644
--- a/ui/app/models/identity/_base.js
+++ b/ui/app/models/identity/_base.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Model from '@ember-data/model';
 import { assert } from '@ember/debug';
 import { computed } from '@ember/object';
@@ -18,7 +13,7 @@ export default Model.extend({
   }),
 
   identityType: computed('constructor.modelName', function () {
-    const modelType = this.constructor.modelName.split('/')[1];
+    let modelType = this.constructor.modelName.split('/')[1];
     return modelType;
   }),
 });
diff --git a/ui/app/models/identity/entity-alias.js b/ui/app/models/identity/entity-alias.js
index 825dd9a5b0a06..db2d5d966d911 100644
--- a/ui/app/models/identity/entity-alias.js
+++ b/ui/app/models/identity/entity-alias.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { belongsTo, attr } from '@ember-data/model';
 import { computed } from '@ember/object';
 import { alias } from '@ember/object/computed';
diff --git a/ui/app/models/identity/entity-merge.js b/ui/app/models/identity/entity-merge.js
index 2d6771e8735fd..cc6967669304c 100644
--- a/ui/app/models/identity/entity-merge.js
+++ b/ui/app/models/identity/entity-merge.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { attr } from '@ember-data/model';
 import { computed } from '@ember/object';
 import IdentityModel from './_base';
diff --git a/ui/app/models/identity/entity.js b/ui/app/models/identity/entity.js
index bb22e11cf47b8..7cc686ff61f3d 100644
--- a/ui/app/models/identity/entity.js
+++ b/ui/app/models/identity/entity.js
@@ -1,17 +1,11 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { hasMany, attr } from '@ember-data/model';
 import { computed } from '@ember/object';
 import { alias } from '@ember/object/computed';
 import IdentityModel from './_base';
 import apiPath from 'vault/utils/api-path';
 import attachCapabilities from 'vault/lib/attach-capabilities';
-import lazyCapabilities from 'vault/macros/lazy-capabilities';
 
-const Model = IdentityModel.extend({
+let Model = IdentityModel.extend({
   formFields: computed(function () {
     return ['name', 'disabled', 'policies', 'metadata'];
   }),
@@ -26,8 +20,10 @@ const Model = IdentityModel.extend({
     editType: 'kv',
   }),
   policies: attr({
-    editType: 'yield',
-    isSectionHeader: true,
+    label: 'Policies',
+    editType: 'searchSelect',
+    fallbackComponent: 'string-list',
+    models: ['policy/acl', 'policy/rgp'],
   }),
   creationTime: attr('string', {
     readOnly: true,
@@ -49,8 +45,6 @@ const Model = IdentityModel.extend({
   canEdit: alias('updatePath.canUpdate'),
   canRead: alias('updatePath.canRead'),
   canAddAlias: alias('aliasPath.canCreate'),
-  policyPath: lazyCapabilities(apiPath`sys/policies`),
-  canCreatePolicies: alias('policyPath.canCreate'),
 });
 
 export default attachCapabilities(Model, {
diff --git a/ui/app/models/identity/group-alias.js b/ui/app/models/identity/group-alias.js
index b5ed78506c7eb..fa8c6c3a0367e 100644
--- a/ui/app/models/identity/group-alias.js
+++ b/ui/app/models/identity/group-alias.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { belongsTo, attr } from '@ember-data/model';
 import { computed } from '@ember/object';
 import { alias } from '@ember/object/computed';
diff --git a/ui/app/models/identity/group.js b/ui/app/models/identity/group.js
index 7a14ffab1233f..9a35f04e7a649 100644
--- a/ui/app/models/identity/group.js
+++ b/ui/app/models/identity/group.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { belongsTo, attr } from '@ember-data/model';
 import { alias } from '@ember/object/computed';
 import { computed } from '@ember/object';
@@ -12,7 +7,7 @@ import identityCapabilities from 'vault/macros/identity-capabilities';
 
 export default IdentityModel.extend({
   formFields: computed('type', function () {
-    const fields = ['name', 'type', 'policies', 'metadata'];
+    let fields = ['name', 'type', 'policies', 'metadata'];
     if (this.type === 'internal') {
       return fields.concat(['memberGroupIds', 'memberEntityIds']);
     }
@@ -39,27 +34,26 @@ export default IdentityModel.extend({
     editType: 'kv',
   }),
   policies: attr({
-    editType: 'yield',
-    isSectionHeader: true,
+    label: 'Policies',
+    editType: 'searchSelect',
+    fallbackComponent: 'string-list',
+    models: ['policy/acl', 'policy/rgp'],
   }),
   memberGroupIds: attr({
     label: 'Member Group IDs',
     editType: 'searchSelect',
-    isSectionHeader: true,
     fallbackComponent: 'string-list',
     models: ['identity/group'],
   }),
   parentGroupIds: attr({
     label: 'Parent Group IDs',
     editType: 'searchSelect',
-    isSectionHeader: true,
     fallbackComponent: 'string-list',
     models: ['identity/group'],
   }),
   memberEntityIds: attr({
     label: 'Member Entity IDs',
     editType: 'searchSelect',
-    isSectionHeader: true,
     fallbackComponent: 'string-list',
     models: ['identity/entity'],
   }),
@@ -69,14 +63,13 @@ export default IdentityModel.extend({
     'memberGroupIds',
     'memberGroupIds.[]',
     function () {
-      const { memberEntityIds, memberGroupIds } = this;
-      const numEntities = (memberEntityIds && memberEntityIds.length) || 0;
-      const numGroups = (memberGroupIds && memberGroupIds.length) || 0;
+      let { memberEntityIds, memberGroupIds } = this;
+      let numEntities = (memberEntityIds && memberEntityIds.length) || 0;
+      let numGroups = (memberGroupIds && memberGroupIds.length) || 0;
       return numEntities + numGroups > 0;
     }
   ),
-  policyPath: lazyCapabilities(apiPath`sys/policies`),
-  canCreatePolicies: alias('policyPath.canCreate'),
+
   alias: belongsTo('identity/group-alias', { async: false, readOnly: true }),
   updatePath: identityCapabilities(),
   canDelete: alias('updatePath.canDelete'),
@@ -84,8 +77,8 @@ export default IdentityModel.extend({
 
   aliasPath: lazyCapabilities(apiPath`identity/group-alias`),
   canAddAlias: computed('aliasPath.canCreate', 'type', 'alias', function () {
-    const type = this.type;
-    const alias = this.alias;
+    let type = this.type;
+    let alias = this.alias;
     // internal groups can't have aliases, and external groups can only have one
     if (type === 'internal' || alias) {
       return false;
diff --git a/ui/app/models/keymgmt/key.js b/ui/app/models/keymgmt/key.js
index 264f21d79dac6..ff570c2153f39 100644
--- a/ui/app/models/keymgmt/key.js
+++ b/ui/app/models/keymgmt/key.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Model, { attr } from '@ember-data/model';
 import { expandAttributeMeta } from 'vault/utils/field-to-attrs';
 import lazyCapabilities, { apiPath } from 'vault/macros/lazy-capabilities';
diff --git a/ui/app/models/keymgmt/provider.js b/ui/app/models/keymgmt/provider.js
index 7c605a9007ab1..5c541a57a5fcc 100644
--- a/ui/app/models/keymgmt/provider.js
+++ b/ui/app/models/keymgmt/provider.js
@@ -1,23 +1,15 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Model, { attr } from '@ember-data/model';
 import { tracked } from '@glimmer/tracking';
 import { expandAttributeMeta } from 'vault/utils/field-to-attrs';
 import { withModelValidations } from 'vault/decorators/model-validations';
 import lazyCapabilities, { apiPath } from 'vault/macros/lazy-capabilities';
-import { inject as service } from '@ember/service';
 
 const CRED_PROPS = {
   azurekeyvault: ['client_id', 'client_secret', 'tenant_id'],
   awskms: ['access_key', 'secret_key', 'session_token', 'endpoint'],
   gcpckms: ['service_account_file'],
 };
-
 const OPTIONAL_CRED_PROPS = ['session_token', 'endpoint'];
-
 // since we have dynamic credential attributes based on provider we need a dynamic presence validator
 // add validators for all cred props and return true for value if not associated with selected provider
 const credValidators = Object.keys(CRED_PROPS).reduce((obj, providerKey) => {
@@ -35,16 +27,13 @@ const credValidators = Object.keys(CRED_PROPS).reduce((obj, providerKey) => {
   });
   return obj;
 }, {});
-
 const validations = {
   name: [{ type: 'presence', message: 'Provider name is required' }],
   keyCollection: [{ type: 'presence', message: 'Key Vault instance name' }],
   ...credValidators,
 };
-
 @withModelValidations(validations)
 export default class KeymgmtProviderModel extends Model {
-  @service store;
   @attr('string') backend;
   @attr('string', {
     label: 'Provider name',
@@ -106,7 +95,7 @@ export default class KeymgmtProviderModel extends Model {
     const [creds, fields] = this.credentialProps.reduce(
       ([creds, fields], prop) => {
         creds[prop] = null;
-        const field = { name: `credentials.${prop}`, type: 'string', options: { label: prop } };
+        let field = { name: `credentials.${prop}`, type: 'string', options: { label: prop } };
         if (prop === 'service_account_file') {
           field.options.subText = 'The path to a Google service account key file, not the file itself.';
         }
diff --git a/ui/app/models/kmip/ca.js b/ui/app/models/kmip/ca.js
index 731d614a76446..7ef8847e98011 100644
--- a/ui/app/models/kmip/ca.js
+++ b/ui/app/models/kmip/ca.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Model, { belongsTo, attr } from '@ember-data/model';
 
 export default Model.extend({
diff --git a/ui/app/models/kmip/config.js b/ui/app/models/kmip/config.js
index 5ddfc8a4880bc..67b1cd3b5612d 100644
--- a/ui/app/models/kmip/config.js
+++ b/ui/app/models/kmip/config.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Model, { belongsTo } from '@ember-data/model';
 import { computed } from '@ember/object';
 import { combineFieldGroups } from 'vault/utils/openapi-to-attrs';
diff --git a/ui/app/models/kmip/credential.js b/ui/app/models/kmip/credential.js
index 99ec2c95a5867..58b11212b51d6 100644
--- a/ui/app/models/kmip/credential.js
+++ b/ui/app/models/kmip/credential.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Model, { attr } from '@ember-data/model';
 import fieldToAttrs from 'vault/utils/field-to-attrs';
 import { computed } from '@ember/object';
diff --git a/ui/app/models/kmip/role.js b/ui/app/models/kmip/role.js
index 5be47a428bd58..1b1c10b358612 100644
--- a/ui/app/models/kmip/role.js
+++ b/ui/app/models/kmip/role.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Model, { attr } from '@ember-data/model';
 import { computed } from '@ember/object';
 import fieldToAttrs, { expandAttributeMeta } from 'vault/utils/field-to-attrs';
@@ -24,7 +19,7 @@ export const COMPUTEDS = {
 
   // For rendering on the create/edit pages
   defaultFields: computed('newFields', 'operationFields', 'tlsFields', function () {
-    const excludeFields = ['role'].concat(this.operationFields, this.tlsFields);
+    let excludeFields = ['role'].concat(this.operationFields, this.tlsFields);
     return this.newFields.slice().removeObjects(excludeFields);
   }),
 
@@ -47,12 +42,12 @@ const ModelExport = Model.extend(COMPUTEDS, {
     if (this.defaultFields.length) {
       groups.unshift({ default: this.defaultFields });
     }
-    const ret = fieldToAttrs(this, groups);
+    let ret = fieldToAttrs(this, groups);
     return ret;
   }),
 
   operationFormFields: computed('operationFieldsWithoutSpecial', function () {
-    const objects = [
+    let objects = [
       'operationCreate',
       'operationActivate',
       'operationGet',
@@ -62,11 +57,9 @@ const ModelExport = Model.extend(COMPUTEDS, {
       'operationDestroy',
     ];
 
-    const attributes = ['operationAddAttribute', 'operationGetAttributes'];
-    const server = ['operationDiscoverVersions'];
-    const others = this.operationFieldsWithoutSpecial
-      .slice()
-      .removeObjects(objects.concat(attributes, server));
+    let attributes = ['operationAddAttribute', 'operationGetAttributes'];
+    let server = ['operationDiscoverVersion'];
+    let others = this.operationFieldsWithoutSpecial.slice().removeObjects(objects.concat(attributes, server));
     const groups = [
       { 'Managed Cryptographic Objects': objects },
       { 'Object Attributes': attributes },
diff --git a/ui/app/models/kmip/scope.js b/ui/app/models/kmip/scope.js
index aa1e185cd03ba..b673b850bafe0 100644
--- a/ui/app/models/kmip/scope.js
+++ b/ui/app/models/kmip/scope.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Model, { attr } from '@ember-data/model';
 import { computed } from '@ember/object';
 import apiPath from 'vault/utils/api-path';
@@ -10,7 +5,7 @@ import attachCapabilities from 'vault/lib/attach-capabilities';
 
 import { expandAttributeMeta } from 'vault/utils/field-to-attrs';
 
-const ModelExport = Model.extend({
+let ModelExport = Model.extend({
   name: attr('string'),
   backend: attr({ readOnly: true }),
   attrs: computed(function () {
diff --git a/ui/app/models/kubernetes/config.js b/ui/app/models/kubernetes/config.js
deleted file mode 100644
index bd557098d9e0c..0000000000000
--- a/ui/app/models/kubernetes/config.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Model, { attr } from '@ember-data/model';
-import { withFormFields } from 'vault/decorators/model-form-fields';
-import { withModelValidations } from 'vault/decorators/model-validations';
-
-const validations = {
-  kubernetesHost: [
-    {
-      validator: (model) => (model.disableLocalCaJwt && !model.kubernetesHost ? false : true),
-      message: 'Kubernetes host is required',
-    },
-  ],
-};
-@withModelValidations(validations)
-@withFormFields(['kubernetesHost', 'serviceAccountJwt', 'kubernetesCaCert'])
-export default class KubernetesConfigModel extends Model {
-  @attr('string') backend; // dynamic path of secret -- set on response from value passed to queryRecord
-  @attr('string', {
-    label: 'Kubernetes host',
-    subText: 'Kubernetes API URL to connect to.',
-  })
-  kubernetesHost;
-  @attr('string', {
-    label: 'Service account JWT',
-    subText:
-      'The JSON web token of the service account used by the secret engine to manage Kubernetes roles. Defaults to the local pod’s JWT if found.',
-  })
-  serviceAccountJwt;
-  @attr('string', {
-    label: 'Kubernetes CA Certificate',
-    subText:
-      'PEM-encoded CA certificate to use by the secret engine to verify the Kubernetes API server certificate. Defaults to the local pod’s CA if found.',
-    editType: 'textarea',
-  })
-  kubernetesCaCert;
-  @attr('boolean', { defaultValue: false }) disableLocalCaJwt;
-}
diff --git a/ui/app/models/kubernetes/role.js b/ui/app/models/kubernetes/role.js
deleted file mode 100644
index 03473e74f293e..0000000000000
--- a/ui/app/models/kubernetes/role.js
+++ /dev/null
@@ -1,158 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Model, { attr } from '@ember-data/model';
-import { withModelValidations } from 'vault/decorators/model-validations';
-import { withFormFields } from 'vault/decorators/model-form-fields';
-import lazyCapabilities, { apiPath } from 'vault/macros/lazy-capabilities';
-import { tracked } from '@glimmer/tracking';
-
-const validations = {
-  name: [{ type: 'presence', message: 'Name is required' }],
-};
-const formFieldProps = [
-  'name',
-  'serviceAccountName',
-  'kubernetesRoleType',
-  'kubernetesRoleName',
-  'allowedKubernetesNamespaces',
-  'tokenMaxTtl',
-  'tokenDefaultTtl',
-  'nameTemplate',
-];
-
-@withModelValidations(validations)
-@withFormFields(formFieldProps)
-export default class KubernetesRoleModel extends Model {
-  @attr('string') backend; // dynamic path of secret -- set on response from value passed to queryRecord
-  @attr('string', {
-    label: 'Role name',
-    subText: 'The role’s name in Vault.',
-  })
-  name;
-
-  @attr('string', {
-    label: 'Service account name',
-    subText: 'Vault will use the default template when generating service accounts, roles and role bindings.',
-  })
-  serviceAccountName;
-
-  @attr('string', {
-    label: 'Kubernetes role type',
-    editType: 'radio',
-    possibleValues: ['Role', 'ClusterRole'],
-  })
-  kubernetesRoleType;
-
-  @attr('string', {
-    label: 'Kubernetes role name',
-    subText: 'Vault will use the default template when generating service accounts, roles and role bindings.',
-  })
-  kubernetesRoleName;
-
-  @attr('string', {
-    label: 'Service account name',
-    subText: 'Vault will use the default template when generating service accounts, roles and role bindings.',
-  })
-  serviceAccountName;
-
-  @attr('string', {
-    label: 'Allowed Kubernetes namespaces',
-    subText:
-      'A list of the valid Kubernetes namespaces in which this role can be used for creating service accounts. If set to "*" all namespaces are allowed.',
-  })
-  allowedKubernetesNamespaces;
-
-  @attr({
-    label: 'Max Lease TTL',
-    editType: 'ttl',
-  })
-  tokenMaxTtl;
-
-  @attr({
-    label: 'Default Lease TTL',
-    editType: 'ttl',
-  })
-  tokenDefaultTtl;
-
-  @attr('string', {
-    label: 'Name template',
-    editType: 'optionalText',
-    defaultSubText:
-      'Vault will use the default template when generating service accounts, roles and role bindings.',
-    subText: 'Vault will use the default template when generating service accounts, roles and role bindings.',
-  })
-  nameTemplate;
-
-  @attr extraAnnotations;
-  @attr extraLabels;
-
-  @attr('string') generatedRoleRules;
-
-  @tracked _generationPreference;
-  get generationPreference() {
-    // when the user interacts with the radio cards the value will be set to the pseudo prop which takes precedence
-    if (this._generationPreference) {
-      return this._generationPreference;
-    }
-    // for existing roles, default the value based on which model prop has value -- only one can be set
-    let pref = null;
-    if (this.serviceAccountName) {
-      pref = 'basic';
-    } else if (this.kubernetesRoleName) {
-      pref = 'expanded';
-    } else if (this.generatedRoleRules) {
-      pref = 'full';
-    }
-    return pref;
-  }
-  set generationPreference(pref) {
-    // unset model props specific to filteredFormFields when changing preference
-    // only one of service_account_name, kubernetes_role_name or generated_role_rules can be set
-    const props = {
-      basic: ['kubernetesRoleType', 'kubernetesRoleName', 'generatedRoleRules', 'nameTemplate'],
-      expanded: ['serviceAccountName', 'generatedRoleRules'],
-      full: ['serviceAccountName', 'kubernetesRoleName'],
-    }[pref];
-    props.forEach((prop) => (this[prop] = null));
-    this._generationPreference = pref;
-  }
-
-  get filteredFormFields() {
-    // return different form fields based on generationPreference
-    const hiddenFieldIndices = {
-      basic: [2, 3, 7], // kubernetesRoleType, kubernetesRoleName and nameTemplate
-      expanded: [1], // serviceAccountName
-      full: [1, 3], // serviceAccountName and kubernetesRoleName
-    }[this.generationPreference];
-
-    return hiddenFieldIndices
-      ? this.formFields.filter((field, index) => !hiddenFieldIndices.includes(index))
-      : null;
-  }
-
-  @lazyCapabilities(apiPath`${'backend'}/roles/${'name'}`, 'backend', 'name') rolePath;
-  @lazyCapabilities(apiPath`${'backend'}/creds/${'name'}`, 'backend', 'name') credsPath;
-  @lazyCapabilities(apiPath`${'backend'}/roles`, 'backend') rolesPath;
-
-  get canCreate() {
-    return this.rolePath.get('canCreate');
-  }
-  get canDelete() {
-    return this.rolePath.get('canDelete');
-  }
-  get canEdit() {
-    return this.rolePath.get('canUpdate');
-  }
-  get canRead() {
-    return this.rolePath.get('canRead');
-  }
-  get canList() {
-    return this.rolesPath.get('canList');
-  }
-  get canGenerateCreds() {
-    return this.credsPath.get('canCreate');
-  }
-}
diff --git a/ui/app/models/lease.js b/ui/app/models/lease.js
index 4acb8d6bf07de..f288d6fde0d80 100644
--- a/ui/app/models/lease.js
+++ b/ui/app/models/lease.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Model, { attr } from '@ember-data/model';
 import { match } from '@ember/object/computed';
 import KeyMixin from 'vault/mixins/key-mixin';
diff --git a/ui/app/models/license.js b/ui/app/models/license.js
index 6818645e89f9a..7631302b635ec 100644
--- a/ui/app/models/license.js
+++ b/ui/app/models/license.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Model, { attr } from '@ember-data/model';
 
 /* sample response
diff --git a/ui/app/models/mfa-login-enforcement.js b/ui/app/models/mfa-login-enforcement.js
index f49c1437b9e48..fe8760551d852 100644
--- a/ui/app/models/mfa-login-enforcement.js
+++ b/ui/app/models/mfa-login-enforcement.js
@@ -1,15 +1,9 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Model, { attr, hasMany } from '@ember-data/model';
 import ArrayProxy from '@ember/array/proxy';
 import PromiseProxyMixin from '@ember/object/promise-proxy-mixin';
 import { methods } from 'vault/helpers/mountable-auth-methods';
 import { withModelValidations } from 'vault/decorators/model-validations';
 import { isPresent } from '@ember/utils';
-import { inject as service } from '@ember/service';
 
 const validations = {
   name: [{ type: 'presence', message: 'Name is required' }],
@@ -32,10 +26,8 @@ const validations = {
     },
   ],
 };
-
 @withModelValidations(validations)
 export default class MfaLoginEnforcementModel extends Model {
-  @service store;
   @attr('string') name;
   @hasMany('mfa-method') mfa_methods;
   @attr('string') namespace_id;
diff --git a/ui/app/models/mfa-method.js b/ui/app/models/mfa-method.js
index d8f3a02d406f9..c6be20108d860 100644
--- a/ui/app/models/mfa-method.js
+++ b/ui/app/models/mfa-method.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Model, { attr } from '@ember-data/model';
 import { capitalize } from '@ember/string';
 import { expandAttributeMeta } from 'vault/utils/field-to-attrs';
@@ -128,7 +123,6 @@ export default class MfaMethod extends Model {
     editType: 'ttl',
     helperTextEnabled: 'How long each generated TOTP is valid.',
     hideToggle: true,
-    defaultValue: 30, // API accepts both an integer as seconds and sting with unit e.g 30 || '30s'
   })
   period;
   @attr('number', {
diff --git a/ui/app/models/mount-config.js b/ui/app/models/mount-config.js
index 8f938b259907b..4a9be19835490 100644
--- a/ui/app/models/mount-config.js
+++ b/ui/app/models/mount-config.js
@@ -1,70 +1,41 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
+import { attr } from '@ember-data/model';
+import Fragment from 'ember-data-model-fragments/fragment';
 
-import Model, { attr } from '@ember-data/model';
-
-export default class MountConfigModel extends Model {
-  @attr({
+export default Fragment.extend({
+  defaultLeaseTtl: attr({
     label: 'Default Lease TTL',
     editType: 'ttl',
-  })
-  defaultLeaseTtl;
-
-  @attr({
+  }),
+  maxLeaseTtl: attr({
     label: 'Max Lease TTL',
     editType: 'ttl',
-  })
-  maxLeaseTtl;
-
-  @attr({
+  }),
+  auditNonHmacRequestKeys: attr({
     label: 'Request keys excluded from HMACing in audit',
     editType: 'stringArray',
     helpText: "Keys that will not be HMAC'd by audit devices in the request data object.",
-  })
-  auditNonHmacRequestKeys;
-
-  @attr({
+  }),
+  auditNonHmacResponseKeys: attr({
     label: 'Response keys excluded from HMACing in audit',
     editType: 'stringArray',
     helpText: "Keys that will not be HMAC'd by audit devices in the response data object.",
-  })
-  auditNonHmacResponseKeys;
-
-  @attr('string', {
+  }),
+  listingVisibility: attr('string', {
     editType: 'boolean',
     label: 'List method when unauthenticated',
     trueValue: 'unauth',
     falseValue: 'hidden',
-  })
-  listingVisibility;
-
-  @attr({
+  }),
+  passthroughRequestHeaders: attr({
     label: 'Allowed passthrough request headers',
     helpText: 'Headers to allow and pass from the request to the backend',
     editType: 'stringArray',
-  })
-  passthroughRequestHeaders;
-
-  @attr({
-    label: 'Allowed response headers',
-    helpText: 'Headers to allow, allowing a plugin to include them in the response.',
-    editType: 'stringArray',
-  })
-  allowedResponseHeaders;
-
-  @attr('string', {
+  }),
+  tokenType: attr('string', {
     label: 'Token Type',
     helpText:
-      'The type of token that should be generated via this role. For `default-service` and `default-batch` service and batch tokens will be issued respectively, unless the auth method explicitly requests a different type.',
-    possibleValues: ['default-service', 'default-batch', 'batch', 'service'],
-    noDefault: true,
-  })
-  tokenType;
-
-  @attr({
-    editType: 'stringArray',
-  })
-  allowedManagedKeys;
-}
+      "The type of token that should be generated via this role. Can be `service`, `batch`, or `default` to use the mount's default (which unless changed will be `service` tokens).",
+    possibleValues: ['default', 'batch', 'service'],
+    defaultFormValue: 'default',
+  }),
+});
diff --git a/ui/app/models/mount-options.js b/ui/app/models/mount-options.js
new file mode 100644
index 0000000000000..f0212be114dd6
--- /dev/null
+++ b/ui/app/models/mount-options.js
@@ -0,0 +1,13 @@
+import { attr } from '@ember-data/model';
+import Fragment from 'ember-data-model-fragments/fragment';
+
+export default Fragment.extend({
+  version: attr('number', {
+    label: 'Version',
+    helpText:
+      'The KV Secrets Engine can operate in different modes. Version 1 is the original generic Secrets Engine the allows for storing of static key/value pairs. Version 2 added more features including data versioning, TTLs, and check and set.',
+    possibleValues: [2, 1],
+    // This shouldn't be defaultValue because if no version comes back from API we should assume it's v1
+    defaultFormValue: 2, // Set the form to 2 by default
+  }),
+});
diff --git a/ui/app/models/namespace.js b/ui/app/models/namespace.js
index 87b964b1008fa..3dfc915c61da3 100644
--- a/ui/app/models/namespace.js
+++ b/ui/app/models/namespace.js
@@ -1,24 +1,19 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Model, { attr } from '@ember-data/model';
-import { withExpandedAttributes } from 'vault/decorators/model-expanded-attributes';
+import { computed } from '@ember/object';
+import { expandAttributeMeta } from 'vault/utils/field-to-attrs';
 
-@withExpandedAttributes()
-export default class NamespaceModel extends Model {
-  @attr('string', {
+export default Model.extend({
+  path: attr('string', {
     validationAttr: 'pathIsValid',
     invalidMessage: 'You have entered and invalid path please only include letters, numbers, -, ., and _.',
-  })
-  path;
-
-  get pathIsValid() {
+  }),
+  pathIsValid: computed('path', function () {
     return this.path && this.path.match(/^[\w\d-.]+$/g);
-  }
-
-  get fields() {
-    return ['path'].map((f) => this.allByKey[f]);
-  }
-}
+  }),
+  description: attr('string', {
+    editType: 'textarea',
+  }),
+  fields: computed(function () {
+    return expandAttributeMeta(this, ['path']);
+  }),
+});
diff --git a/ui/app/models/node.js b/ui/app/models/node.js
index cc74e57b1f9c0..efc9bd60a93c6 100644
--- a/ui/app/models/node.js
+++ b/ui/app/models/node.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Model, { attr } from '@ember-data/model';
 import { alias, and, equal } from '@ember/object/computed';
 
diff --git a/ui/app/models/oidc/assignment.js b/ui/app/models/oidc/assignment.js
index 8077c66383ada..45cbe519cd96d 100644
--- a/ui/app/models/oidc/assignment.js
+++ b/ui/app/models/oidc/assignment.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Model, { attr } from '@ember-data/model';
 import lazyCapabilities, { apiPath } from 'vault/macros/lazy-capabilities';
 import { withModelValidations } from 'vault/decorators/model-validations';
diff --git a/ui/app/models/oidc/client.js b/ui/app/models/oidc/client.js
index 09a11c4df2f62..7622dccde7673 100644
--- a/ui/app/models/oidc/client.js
+++ b/ui/app/models/oidc/client.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Model, { attr } from '@ember-data/model';
 import lazyCapabilities, { apiPath } from 'vault/macros/lazy-capabilities';
 import { expandAttributeMeta } from 'vault/utils/field-to-attrs';
diff --git a/ui/app/models/oidc/key.js b/ui/app/models/oidc/key.js
index 3c8762eaae4e3..6c90be4860585 100644
--- a/ui/app/models/oidc/key.js
+++ b/ui/app/models/oidc/key.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Model, { attr } from '@ember-data/model';
 import lazyCapabilities, { apiPath } from 'vault/macros/lazy-capabilities';
 import { expandAttributeMeta } from 'vault/utils/field-to-attrs';
diff --git a/ui/app/models/oidc/provider.js b/ui/app/models/oidc/provider.js
index a08dd79f9a51e..7ffa8fc6fa2eb 100644
--- a/ui/app/models/oidc/provider.js
+++ b/ui/app/models/oidc/provider.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Model, { attr } from '@ember-data/model';
 import lazyCapabilities, { apiPath } from 'vault/macros/lazy-capabilities';
 import { expandAttributeMeta } from 'vault/utils/field-to-attrs';
@@ -25,7 +20,7 @@ export default class OidcProviderModel extends Model {
     subText:
       'The scheme, host, and optional port for your issuer. This will be used to build the URL that validates ID tokens.',
     placeholderText: 'e.g. https://example.com:8200',
-    docLink: '/vault/api-docs/secret/identity/oidc-provider#create-or-update-a-provider',
+    docLink: '/api-docs/secret/identity/oidc-provider#create-or-update-a-provider',
     helpText: `Optional. This defaults to a URL with Vault's api_addr`,
   })
   issuer;
diff --git a/ui/app/models/oidc/scope.js b/ui/app/models/oidc/scope.js
index 4526bbd2552c0..d15ed52eeb5c9 100644
--- a/ui/app/models/oidc/scope.js
+++ b/ui/app/models/oidc/scope.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Model, { attr } from '@ember-data/model';
 import lazyCapabilities, { apiPath } from 'vault/macros/lazy-capabilities';
 import { expandAttributeMeta } from 'vault/utils/field-to-attrs';
diff --git a/ui/app/models/path-filter-config.js b/ui/app/models/path-filter-config.js
index 31dfcecabdd65..e306fac7664b7 100644
--- a/ui/app/models/path-filter-config.js
+++ b/ui/app/models/path-filter-config.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Model, { attr } from '@ember-data/model';
 
 export default Model.extend({
diff --git a/ui/app/models/pki-ca-certificate-sign.js b/ui/app/models/pki-ca-certificate-sign.js
new file mode 100644
index 0000000000000..84f5b73355f38
--- /dev/null
+++ b/ui/app/models/pki-ca-certificate-sign.js
@@ -0,0 +1,75 @@
+import { attr } from '@ember-data/model';
+import { copy } from 'ember-copy';
+import { computed } from '@ember/object';
+import Certificate from './pki-certificate-sign';
+
+export default Certificate.extend({
+  backend: attr('string', {
+    readOnly: true,
+  }),
+  useCsrValues: attr('boolean', {
+    defaultValue: false,
+    label: 'Use CSR values',
+  }),
+  maxPathLength: attr('number', {
+    defaultValue: -1,
+  }),
+  permittedDnsDomains: attr('string', {
+    label: 'Permitted DNS domains',
+  }),
+  ou: attr({
+    label: 'OU (OrganizationalUnit)',
+    editType: 'stringArray',
+  }),
+  organization: attr({
+    editType: 'stringArray',
+  }),
+  country: attr({
+    editType: 'stringArray',
+  }),
+  locality: attr({
+    editType: 'stringArray',
+    label: 'Locality/City',
+  }),
+  province: attr({
+    editType: 'stringArray',
+    label: 'Province/State',
+  }),
+  streetAddress: attr({
+    editType: 'stringArray',
+  }),
+  postalCode: attr({
+    editType: 'stringArray',
+  }),
+
+  fieldGroups: computed('useCsrValues', function () {
+    const options = [
+      {
+        Options: [
+          'altNames',
+          'ipSans',
+          'ttl',
+          'excludeCnFromSans',
+          'maxPathLength',
+          'permittedDnsDomains',
+          'ou',
+          'organization',
+          'otherSans',
+        ],
+      },
+      {
+        'Address Options': ['country', 'locality', 'province', 'streetAddress', 'postalCode'],
+      },
+    ];
+    let groups = [
+      {
+        default: ['csr', 'commonName', 'format', 'useCsrValues'],
+      },
+    ];
+    if (this.useCsrValues === false) {
+      groups = groups.concat(options);
+    }
+
+    return this.fieldsToAttrs(copy(groups, true));
+  }),
+});
diff --git a/ui/app/models/pki-ca-certificate.js b/ui/app/models/pki-ca-certificate.js
new file mode 100644
index 0000000000000..ec444c138361f
--- /dev/null
+++ b/ui/app/models/pki-ca-certificate.js
@@ -0,0 +1,152 @@
+import { attr } from '@ember-data/model';
+import { computed } from '@ember/object';
+import Certificate from './pki/cert';
+
+export default Certificate.extend({
+  DISPLAY_FIELDS: computed(function () {
+    return [
+      'csr',
+      'certificate',
+      'commonName',
+      'issueDate',
+      'expiryDate',
+      'issuingCa',
+      'caChain',
+      'privateKey',
+      'privateKeyType',
+      'serialNumber',
+    ];
+  }),
+  addBasicConstraints: attr('boolean', {
+    label: 'Add a Basic Constraints extension with CA: true',
+    helpText:
+      'Only needed as a workaround in some compatibility scenarios with Active Directory Certificate Services',
+  }),
+  backend: attr('string', {
+    readOnly: true,
+  }),
+  canParse: attr('boolean'),
+  caType: attr('string', {
+    possibleValues: ['root', 'intermediate'],
+    defaultValue: 'root',
+    label: 'CA Type',
+    readOnly: true,
+  }),
+  commonName: attr('string'),
+  csr: attr('string', {
+    editType: 'textarea',
+    label: 'CSR',
+    masked: true,
+  }),
+  expiryDate: attr('string', {
+    label: 'Expiration date',
+  }),
+  issueDate: attr('string'),
+  keyBits: attr('number', {
+    defaultValue: 2048,
+  }),
+  keyType: attr('string', {
+    possibleValues: ['rsa', 'ec', 'ed25519'],
+    defaultValue: 'rsa',
+  }),
+  maxPathLength: attr('number', {
+    defaultValue: -1,
+  }),
+  organization: attr({
+    editType: 'stringArray',
+  }),
+  ou: attr({
+    label: 'OU (OrganizationalUnit)',
+    editType: 'stringArray',
+  }),
+  pemBundle: attr('string', {
+    label: 'PEM bundle',
+    editType: 'file',
+  }),
+  permittedDnsDomains: attr('string', {
+    label: 'Permitted DNS domains',
+  }),
+  privateKeyFormat: attr('string', {
+    possibleValues: ['', 'der', 'pem', 'pkcs8'],
+    defaultValue: '',
+  }),
+  type: attr('string', {
+    possibleValues: ['internal', 'exported'],
+    defaultValue: 'internal',
+  }),
+  uploadPemBundle: attr('boolean', {
+    label: 'Upload PEM bundle',
+    readOnly: true,
+  }),
+
+  // address attrs
+  country: attr({
+    editType: 'stringArray',
+  }),
+  locality: attr({
+    editType: 'stringArray',
+    label: 'Locality/City',
+  }),
+  streetAddress: attr({
+    editType: 'stringArray',
+  }),
+  postalCode: attr({
+    editType: 'stringArray',
+  }),
+  province: attr({
+    editType: 'stringArray',
+    label: 'Province/State',
+  }),
+
+  fieldDefinition: computed('caType', 'uploadPemBundle', function () {
+    const type = this.caType;
+    const isUpload = this.uploadPemBundle;
+    let groups = [{ default: ['caType', 'uploadPemBundle'] }];
+    if (isUpload) {
+      groups[0].default.push('pemBundle');
+    } else {
+      groups[0].default.push('type', 'commonName');
+      if (type === 'root') {
+        groups.push({
+          Options: [
+            'altNames',
+            'ipSans',
+            'ttl',
+            'format',
+            'privateKeyFormat',
+            'keyType',
+            'keyBits',
+            'maxPathLength',
+            'permittedDnsDomains',
+            'excludeCnFromSans',
+            'ou',
+            'organization',
+            'otherSans',
+          ],
+        });
+      }
+      if (type === 'intermediate') {
+        groups.push({
+          Options: [
+            'altNames',
+            'ipSans',
+            'format',
+            'privateKeyFormat',
+            'keyType',
+            'keyBits',
+            'excludeCnFromSans',
+            'addBasicConstraints',
+            'ou',
+            'organization',
+            'otherSans',
+          ],
+        });
+      }
+    }
+    groups.push({
+      'Address Options': ['country', 'locality', 'province', 'streetAddress', 'postalCode'],
+    });
+
+    return groups;
+  }),
+});
diff --git a/ui/app/models/pki-certificate-sign.js b/ui/app/models/pki-certificate-sign.js
new file mode 100644
index 0000000000000..afc937f89cb72
--- /dev/null
+++ b/ui/app/models/pki-certificate-sign.js
@@ -0,0 +1,34 @@
+import { attr } from '@ember-data/model';
+import { copy } from 'ember-copy';
+import { computed } from '@ember/object';
+import Certificate from './pki/cert';
+import { combineFieldGroups } from 'vault/utils/openapi-to-attrs';
+
+export default Certificate.extend({
+  signVerbatim: attr('boolean', {
+    readOnly: true,
+    defaultValue: false,
+  }),
+  useOpenAPI: true,
+  csr: attr('string', {
+    label: 'Certificate Signing Request (CSR)',
+    editType: 'textarea',
+  }),
+
+  fieldGroups: computed('newFields', 'signVerbatim', function () {
+    const options = { Options: ['altNames', 'ipSans', 'ttl', 'excludeCnFromSans', 'otherSans'] };
+    let groups = [
+      {
+        default: ['csr', 'commonName', 'format', 'signVerbatim'],
+      },
+    ];
+    if (this.newFields) {
+      groups = combineFieldGroups(groups, this.newFields, []);
+    }
+    if (this.signVerbatim === false) {
+      groups.push(options);
+    }
+
+    return this.fieldsToAttrs(copy(groups, true));
+  }),
+});
diff --git a/ui/app/models/pki/action.js b/ui/app/models/pki/action.js
deleted file mode 100644
index 71c476b07e13f..0000000000000
--- a/ui/app/models/pki/action.js
+++ /dev/null
@@ -1,248 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Model, { attr } from '@ember-data/model';
-import { inject as service } from '@ember/service';
-import { tracked } from '@glimmer/tracking';
-import lazyCapabilities, { apiPath } from 'vault/macros/lazy-capabilities';
-import { withFormFields } from 'vault/decorators/model-form-fields';
-import { withModelValidations } from 'vault/decorators/model-validations';
-
-const validations = {
-  type: [{ type: 'presence', message: 'Type is required.' }],
-  commonName: [{ type: 'presence', message: 'Common name is required.' }],
-  issuerName: [
-    {
-      validator(model) {
-        if (
-          (model.actionType === 'generate-root' || model.actionType === 'rotate-root') &&
-          model.issuerName === 'default'
-        )
-          return false;
-        return true;
-      },
-      message: `Issuer name must be unique across all issuers and not be the reserved value 'default'.`,
-    },
-  ],
-  keyName: [
-    {
-      validator(model) {
-        if (model.keyName === 'default') return false;
-        return true;
-      },
-      message: `Key name cannot be the reserved value 'default'`,
-    },
-  ],
-};
-
-/**
- * This model maps to multiple PKI endpoints, specifically the ones that make up the
- * configuration/create workflow. These endpoints also share a nontypical behavior in that
- * a POST request to the endpoints don't necessarily result in a single entity created --
- * depending on the inputs, some number of issuers, keys, and certificates can be created
- * from the API.
- */
-@withModelValidations(validations)
-@withFormFields()
-export default class PkiActionModel extends Model {
-  @service secretMountPath;
-
-  @tracked actionType; // used to toggle between different form fields when creating configuration
-
-  /* actionType import */
-  @attr('string') pemBundle;
-
-  // parsed attrs from parse-pki-cert util if certificate on response
-  @attr parsedCertificate;
-
-  // readonly attrs returned after importing
-  @attr importedIssuers;
-  @attr importedKeys;
-  @attr mapping;
-  @attr('string', { readOnly: true, masked: true }) certificate;
-
-  /* actionType generate-root */
-
-  // readonly attrs returned right after root generation
-  @attr serialNumber;
-  @attr('string', { label: 'Issuing CA', readOnly: true, masked: true }) issuingCa;
-  // end of readonly
-
-  @attr('string', {
-    possibleValues: ['exported', 'internal', 'existing', 'kms'],
-    noDefault: true,
-  })
-  type;
-
-  @attr('string') issuerName;
-
-  @attr('string') keyName;
-
-  @attr('string', {
-    defaultValue: 'default',
-    label: 'Key reference',
-  })
-  keyRef; // type=existing only
-
-  @attr('string') commonName; // REQUIRED
-
-  @attr('string', {
-    label: 'Subject Alternative Names (SANs)',
-    editType: 'stringArray',
-  })
-  altNames;
-
-  @attr('string', {
-    label: 'IP Subject Alternative Names (IP SANs)',
-    editType: 'stringArray',
-  })
-  ipSans;
-
-  @attr('string', {
-    label: 'URI Subject Alternative Names (URI SANs)',
-    editType: 'stringArray',
-  })
-  uriSans;
-
-  @attr('string', {
-    label: 'Other SANs',
-    editType: 'stringArray',
-  })
-  otherSans;
-
-  @attr('string', {
-    defaultValue: 'pem',
-    possibleValues: ['pem', 'der', 'pem_bundle'],
-  })
-  format;
-
-  @attr('string', {
-    defaultValue: 'der',
-    possibleValues: ['der', 'pkcs8'],
-  })
-  privateKeyFormat;
-
-  @attr('string', {
-    defaultValue: 'rsa',
-    possibleValues: ['rsa', 'ed25519', 'ec'],
-  })
-  keyType;
-
-  @attr('string', {
-    defaultValue: '0',
-    // options management happens in pki-key-parameters
-  })
-  keyBits;
-
-  @attr('number', {
-    defaultValue: -1,
-  })
-  maxPathLength;
-
-  @attr('boolean', {
-    label: 'Exclude common name from SANs',
-    subText:
-      'If checked, the common name will not be included in DNS or Email Subject Alternate Names. This is useful if the CN is a human-readable identifier, not a hostname or email address.',
-    defaultValue: false,
-  })
-  excludeCnFromSans;
-
-  @attr('string', {
-    label: 'Permitted DNS domains',
-  })
-  permittedDnsDomains;
-
-  @attr('string', {
-    label: 'Organizational Units (OU)',
-    subText:
-      'A list of allowed serial numbers to be requested during certificate issuance. Shell-style globbing is supported. If empty, custom-specified serial numbers will be forbidden.',
-    editType: 'stringArray',
-  })
-  ou;
-  @attr({ editType: 'stringArray' }) organization;
-  @attr({ editType: 'stringArray' }) country;
-  @attr({ editType: 'stringArray' }) locality;
-  @attr({ editType: 'stringArray' }) province;
-  @attr({ editType: 'stringArray' }) streetAddress;
-  @attr({ editType: 'stringArray' }) postalCode;
-
-  @attr('string', {
-    subText:
-      "Specifies the requested Subject's named Serial Number value. This has no impact on the Certificate's serial number randomly generated by Vault.",
-  })
-  subjectSerialNumber;
-  // this is different from the number (16:5e:a0...) randomly generated by Vault
-  // https://developer.hashicorp.com/vault/api-docs/secret/pki#serial_number
-
-  @attr('boolean', {
-    subText: 'Whether to add a Basic Constraints extension with CA: true.',
-  })
-  addBasicConstraints;
-
-  @attr({
-    label: 'Backdate validity',
-    detailsLabel: 'Issued certificate backdating',
-    helperTextDisabled: 'Vault will use the default value, 30s',
-    helperTextEnabled:
-      'Also called the not_before_duration property. Allows certificates to be valid for a certain time period before now. This is useful to correct clock misalignment on various systems when setting up your CA.',
-    editType: 'ttl',
-    defaultValue: '30s',
-  })
-  notBeforeDuration;
-
-  @attr('string') managedKeyName;
-  @attr('string', {
-    label: 'Managed key UUID',
-  })
-  managedKeyId;
-
-  @attr({
-    label: 'Not valid after',
-    detailsLabel: 'Issued certificates expire after',
-    subText:
-      'The time after which this certificate will no longer be valid. This can be a TTL (a range of time from now) or a specific date.',
-    editType: 'yield',
-  })
-  customTtl;
-  @attr('string') ttl;
-  @attr('date') notAfter;
-
-  @attr('string', { label: 'Issuer ID', readOnly: true, detailLinkTo: 'issuers.issuer.details' }) issuerId; // returned from generate-root action
-
-  // For generating and signing a CSR
-  @attr('string', { label: 'CSR', masked: true }) csr;
-  @attr caChain;
-  @attr('string', { label: 'Key ID', detailLinkTo: 'keys.key.details' }) keyId;
-  @attr('string', { masked: true }) privateKey;
-  @attr('string') privateKeyType;
-
-  get backend() {
-    return this.secretMountPath.currentPath;
-  }
-
-  // To determine which endpoint the config adapter should use,
-  // we want to check capabilities on the newer endpoints (those
-  // prefixed with "issuers") and use the old path as fallback
-  // if user does not have permissions.
-  @lazyCapabilities(apiPath`${'backend'}/issuers/import/bundle`, 'backend') importBundlePath;
-  @lazyCapabilities(apiPath`${'backend'}/issuers/generate/root/${'type'}`, 'backend', 'type')
-  generateIssuerRootPath;
-  @lazyCapabilities(apiPath`${'backend'}/issuers/generate/intermediate/${'type'}`, 'backend', 'type')
-  generateIssuerCsrPath;
-  @lazyCapabilities(apiPath`${'backend'}/issuers/cross-sign`, 'backend') crossSignPath;
-
-  get canImportBundle() {
-    return this.importBundlePath.get('canCreate') === true;
-  }
-  get canGenerateIssuerRoot() {
-    return this.generateIssuerRootPath.get('canCreate') === true;
-  }
-  get canGenerateIssuerIntermediate() {
-    return this.generateIssuerCsrPath.get('canCreate') === true;
-  }
-  get canCrossSign() {
-    return this.crossSignPath.get('canCreate') === true;
-  }
-}
diff --git a/ui/app/models/pki/cert.js b/ui/app/models/pki/cert.js
new file mode 100644
index 0000000000000..92cd6d4f18973
--- /dev/null
+++ b/ui/app/models/pki/cert.js
@@ -0,0 +1,134 @@
+import Model, { attr } from '@ember-data/model';
+import { alias } from '@ember/object/computed';
+import { computed } from '@ember/object';
+import lazyCapabilities, { apiPath } from 'vault/macros/lazy-capabilities';
+import fieldToAttrs, { expandAttributeMeta } from 'vault/utils/field-to-attrs';
+
+export default Model.extend({
+  idPrefix: 'cert/',
+  //the id prefixed with `cert/` so we can use it as the *secret param for the secret show route
+  idForNav: attr('string', {
+    readOnly: true,
+  }),
+  DISPLAY_FIELDS: computed(function () {
+    return [
+      'certificate',
+      'commonName',
+      'issuingCa',
+      'caChain',
+      'privateKey',
+      'privateKeyType',
+      'revocationTime',
+      'issueDate',
+      'expiryDate',
+      'serialNumber',
+    ];
+  }),
+
+  altNames: attr('string', {
+    label: 'DNS/Email Subject Alternative Names (SANs)',
+  }),
+  backend: attr('string', {
+    readOnly: true,
+  }),
+  caChain: attr('string', {
+    label: 'CA chain',
+    masked: true,
+  }),
+  canParse: attr('boolean'),
+  certificate: attr('string', {
+    masked: true,
+  }),
+  commonName: attr('string'),
+  excludeCnFromSans: attr('boolean', {
+    label: 'Exclude Common Name from Subject Alternative Names (SANs)',
+    defaultValue: false,
+  }),
+  expiryDate: attr('string', {
+    label: 'Expiration date',
+  }),
+  format: attr('string', {
+    defaultValue: 'pem',
+    possibleValues: ['pem', 'der', 'pem_bundle'],
+  }),
+  ipSans: attr('string', {
+    label: 'IP Subject Alternative Names (SANs)',
+  }),
+  issueDate: attr('string'),
+  issuingCa: attr('string', {
+    label: 'Issuing CA',
+    masked: true,
+  }),
+  otherSans: attr({
+    editType: 'stringArray',
+    label: 'Other SANs',
+    helpText:
+      'The format is the same as OpenSSL: <oid>;<type>:<value> where the only current valid type is UTF8',
+  }),
+  privateKey: attr('string', {
+    masked: true,
+  }),
+  privateKeyType: attr('string'),
+  revocationTime: attr('number'),
+  role: attr('object', {
+    readOnly: true,
+  }),
+  serialNumber: attr('string'),
+  ttl: attr({
+    label: 'TTL',
+    editType: 'ttl',
+  }),
+
+  fieldsToAttrs(fieldGroups) {
+    return fieldToAttrs(this, fieldGroups);
+  },
+
+  fieldDefinition: computed(function () {
+    const groups = [
+      { default: ['commonName', 'format'] },
+      { Options: ['altNames', 'ipSans', 'ttl', 'excludeCnFromSans', 'otherSans'] },
+    ];
+    return groups;
+  }),
+
+  fieldGroups: computed('fieldDefinition', function () {
+    return this.fieldsToAttrs(this.fieldDefinition);
+  }),
+
+  attrs: computed('DISPLAY_FIELDS', 'certificate', 'csr', function () {
+    let keys = this.certificate || this.csr ? this.DISPLAY_FIELDS.slice(0) : [];
+    return expandAttributeMeta(this, keys);
+  }),
+
+  toCreds: computed(
+    'certificate',
+    'issuingCa',
+    'caChain',
+    'privateKey',
+    'privateKeyType',
+    'revocationTime',
+    'serialNumber',
+    function () {
+      const props = {
+        certificate: this.certificate,
+        issuingCa: this.issuingCa,
+        caChain: this.caChain,
+        privateKey: this.privateKey,
+        privateKeyType: this.privateKeyType,
+        revocationTime: this.revocationTime,
+        serialNumber: this.serialNumber,
+      };
+      const propsWithVals = Object.keys(props).reduce((ret, prop) => {
+        if (props[prop]) {
+          ret[prop] = props[prop];
+          return ret;
+        }
+        return ret;
+      }, {});
+      return JSON.stringify(propsWithVals, null, 2);
+    }
+  ),
+
+  revokePath: lazyCapabilities(apiPath`${'backend'}/revoke`, 'backend'),
+  canRevoke: alias('revokePath.canUpdate'),
+});
diff --git a/ui/app/models/pki/certificate/base.js b/ui/app/models/pki/certificate/base.js
deleted file mode 100644
index f83858811f900..0000000000000
--- a/ui/app/models/pki/certificate/base.js
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Model, { attr } from '@ember-data/model';
-import { assert } from '@ember/debug';
-import { service } from '@ember/service';
-import { withFormFields } from 'vault/decorators/model-form-fields';
-import lazyCapabilities, { apiPath } from 'vault/macros/lazy-capabilities';
-
-/**
- * There are many actions that involve certificates in PKI world.
- * The base certificate model contains shared attributes that make up a certificate's content.
- * Other models under pki/certificate will extend this model and include additional attributes
- * and associated adapter methods for performing various generation and signing actions.
- * This model also displays leaf certs and their parsed attributes (which exist as an object in
- * the attribute `parsedCertificate`)
- */
-
-// also displays parsedCertificate values in the template
-const certDisplayFields = ['certificate', 'commonName', 'revocationTime', 'serialNumber'];
-
-@withFormFields(certDisplayFields)
-export default class PkiCertificateBaseModel extends Model {
-  @service secretMountPath;
-
-  get useOpenAPI() {
-    return true;
-  }
-  get backend() {
-    return this.secretMountPath.currentPath;
-  }
-  getHelpUrl() {
-    assert('You must provide a helpUrl for OpenAPI', true);
-  }
-
-  // The attributes parsed from parse-pki-cert util live here
-  @attr parsedCertificate;
-
-  @attr('string') commonName;
-  @attr({
-    label: 'Not valid after',
-    detailsLabel: 'Issued certificates expire after',
-    subText:
-      'The time after which this certificate will no longer be valid. This can be a TTL (a range of time from now) or a specific date.',
-    editType: 'yield',
-  })
-  customTtl; // sets ttl and notAfter via one input <PkiNotValidAfterForm>
-
-  @attr('boolean', {
-    label: 'Exclude common name from SANs',
-    subText:
-      'If checked, the common name will not be included in DNS or Email Subject Alternate Names. This is useful if the CN is a human-readable identifier, not a hostname or email address.',
-    defaultValue: false,
-  })
-  excludeCnFromSans;
-
-  @attr('string', {
-    label: 'Subject Alternative Names (SANs)',
-    subText:
-      'The requested Subject Alternative Names; if email protection is enabled for the role, this may contain email addresses.',
-    editType: 'stringArray',
-  })
-  altNames;
-
-  // SANs below are editType: stringArray from openApi
-  @attr('string', {
-    label: 'IP Subject Alternative Names (IP SANs)',
-    subText: 'Only valid if the role allows IP SANs (which is the default).',
-  })
-  ipSans;
-
-  @attr('string', {
-    label: 'URI Subject Alternative Names (URI SANs)',
-    subText: 'If any requested URIs do not match role policy, the entire request will be denied.',
-  })
-  uriSans;
-
-  @attr('string', {
-    subText: 'Requested other SANs with the format <oid>;UTF8:<utf8 string value> for each entry.',
-  })
-  otherSans;
-
-  // Attrs that come back from API POST request
-  @attr({ label: 'CA Chain', masked: true }) caChain;
-  @attr('string', { masked: true }) certificate;
-  @attr('number') expiration;
-  @attr('string', { label: 'Issuing CA', masked: true }) issuingCa;
-  @attr('string') privateKey; // only returned for type=exported
-  @attr('string') privateKeyType; // only returned for type=exported
-  @attr('number', { formatDate: true }) revocationTime;
-  @attr('string') serialNumber;
-
-  @lazyCapabilities(apiPath`${'backend'}/revoke`, 'backend') revokePath;
-  get canRevoke() {
-    return this.revokePath.get('isLoading') || this.revokePath.get('canCreate') !== false;
-  }
-}
diff --git a/ui/app/models/pki/certificate/generate.js b/ui/app/models/pki/certificate/generate.js
deleted file mode 100644
index d5f7e30d8b5c0..0000000000000
--- a/ui/app/models/pki/certificate/generate.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { attr } from '@ember-data/model';
-import { withFormFields } from 'vault/decorators/model-form-fields';
-import PkiCertificateBaseModel from './base';
-
-const generateFromRole = [
-  {
-    default: ['commonName', 'customTtl', 'format', 'privateKeyFormat'],
-  },
-  {
-    'Subject Alternative Name (SAN) Options': [
-      'excludeCnFromSans',
-      'altNames',
-      'ipSans',
-      'uriSans',
-      'otherSans',
-    ],
-  },
-];
-@withFormFields(null, generateFromRole)
-export default class PkiCertificateGenerateModel extends PkiCertificateBaseModel {
-  getHelpUrl(backend) {
-    return `/v1/${backend}/issue/example?help=1`;
-  }
-  @attr('string') role; // role name to issue certificate against for request URL
-}
diff --git a/ui/app/models/pki/certificate/sign.js b/ui/app/models/pki/certificate/sign.js
deleted file mode 100644
index 307d703897af5..0000000000000
--- a/ui/app/models/pki/certificate/sign.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { attr } from '@ember-data/model';
-import { withFormFields } from 'vault/decorators/model-form-fields';
-import PkiCertificateBaseModel from './base';
-
-const generateFromRole = [
-  {
-    default: ['csr', 'commonName', 'customTtl', 'format', 'removeRootsFromChain'],
-  },
-  {
-    'Subject Alternative Name (SAN) Options': [
-      'excludeCnFromSans',
-      'altNames',
-      'ipSans',
-      'uriSans',
-      'otherSans',
-    ],
-  },
-];
-@withFormFields(null, generateFromRole)
-export default class PkiCertificateSignModel extends PkiCertificateBaseModel {
-  getHelpUrl(backend) {
-    return `/v1/${backend}/sign/example?help=1`;
-  }
-  @attr('string') role; // role name to create certificate against for request URL
-
-  @attr('string', {
-    label: 'CSR',
-    editType: 'textarea',
-  })
-  csr;
-
-  @attr('boolean', {
-    subText: 'When checked, the CA chain will not include self-signed CA certificates.',
-  })
-  removeRootsFromChain;
-}
diff --git a/ui/app/models/pki/config/acme.js b/ui/app/models/pki/config/acme.js
deleted file mode 100644
index 86025ed604328..0000000000000
--- a/ui/app/models/pki/config/acme.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Model, { attr } from '@ember-data/model';
-import { withFormFields } from 'vault/decorators/model-form-fields';
-import lazyCapabilities, { apiPath } from 'vault/macros/lazy-capabilities';
-
-@withFormFields()
-export default class PkiConfigAcmeModel extends Model {
-  // This model uses the backend value as the model ID
-  get useOpenAPI() {
-    return true;
-  }
-
-  getHelpUrl(backendPath) {
-    return `/v1/${backendPath}/config/acme?help=1`;
-  }
-
-  // attrs order in the form is determined by order here
-
-  @attr('boolean', {
-    label: 'ACME enabled',
-    subText: 'When ACME is disabled, all requests to ACME directory URLs will return 404.',
-  })
-  enabled;
-
-  @attr('string', {
-    subText:
-      "Specifies the behavior of the default ACME directory. Can be 'forbid', 'sign-verbatim' or a role given by 'role:<role_name>'. If a role is used, it must be present in 'allowed_roles'.",
-  })
-  defaultDirectoryPolicy;
-
-  @attr('array', {
-    editType: 'stringArray',
-    subText:
-      "The default value '*' allows every role within the mount to be used. If the default_directory_policy specifies a role, it must be allowed under this configuration.",
-  })
-  allowedRoles;
-
-  @attr('array', {
-    editType: 'stringArray',
-    subText:
-      "Specifies a list of issuers allowed to issue certificates via explicit ACME paths. If an allowed role specifies an issuer outside this list, it will be allowed. The default value '*' allows every issuer within the mount.",
-  })
-  allowedIssuers;
-
-  @attr('string', {
-    label: 'EAB policy',
-    possibleValues: ['not-required', 'new-account-required', 'always-required'],
-  })
-  eabPolicy;
-
-  @attr('string', {
-    label: 'DNS resolver',
-    subText:
-      'An optional overriding DNS resolver to use for challenge verification lookups. When not specified, the default system resolver will be used. This allows domains on peered networks with an accessible DNS resolver to be validated.',
-  })
-  dnsResolver;
-
-  @lazyCapabilities(apiPath`${'id'}/config/acme`, 'id')
-  acmePath;
-
-  get canSet() {
-    return this.acmePath.get('canUpdate') !== false;
-  }
-}
diff --git a/ui/app/models/pki/config/cluster.js b/ui/app/models/pki/config/cluster.js
deleted file mode 100644
index b89d6607d3f88..0000000000000
--- a/ui/app/models/pki/config/cluster.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Model, { attr } from '@ember-data/model';
-import { withFormFields } from 'vault/decorators/model-form-fields';
-import lazyCapabilities, { apiPath } from 'vault/macros/lazy-capabilities';
-
-@withFormFields()
-export default class PkiConfigClusterModel extends Model {
-  // This model uses the backend value as the model ID
-  get useOpenAPI() {
-    return true;
-  }
-
-  getHelpUrl(backendPath) {
-    return `/v1/${backendPath}/config/cluster?help=1`;
-  }
-
-  @attr('string', {
-    label: "Mount's API path",
-    subText:
-      "Specifies the path to this performance replication cluster's API mount path, including any namespaces as path components. This address is used for the ACME directories, which must be served over a TLS-enabled listener.",
-  })
-  path;
-  @attr('string', {
-    label: 'AIA path',
-    subText:
-      "Specifies the path to this performance replication cluster's AIA distribution point; may refer to an external, non-Vault responder.",
-  })
-  aiaPath;
-
-  // this is for pki-only cluster config, not the universal vault cluster
-  @lazyCapabilities(apiPath`${'id'}/config/cluster`, 'id') clusterPath;
-
-  get canSet() {
-    return this.clusterPath.get('canUpdate') !== false;
-  }
-}
diff --git a/ui/app/models/pki/config/crl.js b/ui/app/models/pki/config/crl.js
deleted file mode 100644
index 6d7490e3b6c8b..0000000000000
--- a/ui/app/models/pki/config/crl.js
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Model, { attr } from '@ember-data/model';
-import { withFormFields } from 'vault/decorators/model-form-fields';
-import lazyCapabilities, { apiPath } from 'vault/macros/lazy-capabilities';
-
-const formFieldGroups = [
-  {
-    'Certificate Revocation List (CRL)': ['expiry', 'autoRebuildGracePeriod', 'deltaRebuildInterval'],
-  },
-  {
-    'Online Certificate Status Protocol (OCSP)': ['ocspExpiry'],
-  },
-  { 'Unified Revocation': ['crossClusterRevocation', 'unifiedCrl', 'unifiedCrlOnExistingPaths'] },
-];
-@withFormFields(null, formFieldGroups)
-export default class PkiConfigCrlModel extends Model {
-  // This model uses the backend value as the model ID
-
-  @attr('boolean') autoRebuild;
-  @attr('string', {
-    label: 'Auto-rebuild on',
-    labelDisabled: 'Auto-rebuild off',
-    mapToBoolean: 'autoRebuild',
-    isOppositeValue: false,
-    editType: 'ttl',
-    helperTextEnabled: 'Vault will rebuild the CRL in the below grace period before expiration',
-    helperTextDisabled: 'Vault will not automatically rebuild the CRL',
-  })
-  autoRebuildGracePeriod;
-
-  @attr('boolean') enableDelta;
-  @attr('string', {
-    label: 'Delta CRL building on',
-    labelDisabled: 'Delta CRL building off',
-    mapToBoolean: 'enableDelta',
-    isOppositeValue: false,
-    editType: 'ttl',
-    helperTextEnabled: 'Vault will rebuild the delta CRL at the interval below:',
-    helperTextDisabled: 'Vault will not rebuild the delta CRL at an interval',
-  })
-  deltaRebuildInterval;
-
-  @attr('boolean') disable;
-  @attr('string', {
-    label: 'Expiry',
-    labelDisabled: 'No expiry',
-    mapToBoolean: 'disable',
-    isOppositeValue: true,
-    editType: 'ttl',
-    helperTextDisabled: 'The CRL will not be built.',
-    helperTextEnabled: 'The CRL will expire after:',
-  })
-  expiry;
-
-  @attr('boolean') ocspDisable;
-  @attr('string', {
-    label: 'OCSP responder APIs enabled',
-    labelDisabled: 'OCSP responder APIs disabled',
-    mapToBoolean: 'ocspDisable',
-    isOppositeValue: true,
-    editType: 'ttl',
-    helperTextEnabled: "Requests about a certificate's status will be valid for:",
-    helperTextDisabled: 'Requests cannot be made to check if an individual certificate is valid.',
-  })
-  ocspExpiry;
-
-  // enterprise only params
-  @attr('boolean', {
-    label: 'Cross-cluster revocation',
-    helpText:
-      'Enables cross-cluster revocation request queues. When a serial not issued on this local cluster is passed to the /revoke endpoint, it is replicated across clusters and revoked by the issuing cluster if it is online.',
-  })
-  crossClusterRevocation;
-
-  @attr('boolean', {
-    label: 'Unified CRL',
-    helpText:
-      'Enables unified CRL and OCSP building. This synchronizes all revocations between clusters; a single, unified CRL will be built on the active node of the primary performance replication (PR) cluster.',
-  })
-  unifiedCrl;
-
-  @attr('boolean', {
-    label: 'Unified CRL on existing paths',
-    helpText:
-      'If enabled, existing CRL and OCSP paths will return the unified CRL instead of a response based on cluster-local data.',
-  })
-  unifiedCrlOnExistingPaths;
-
-  @lazyCapabilities(apiPath`${'id'}/config/crl`, 'id') crlPath;
-
-  get canSet() {
-    return this.crlPath.get('canUpdate') !== false;
-  }
-}
diff --git a/ui/app/models/pki/config/urls.js b/ui/app/models/pki/config/urls.js
deleted file mode 100644
index d2b1aa277e2b0..0000000000000
--- a/ui/app/models/pki/config/urls.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Model, { attr } from '@ember-data/model';
-import { withFormFields } from 'vault/decorators/model-form-fields';
-import lazyCapabilities, { apiPath } from 'vault/macros/lazy-capabilities';
-
-@withFormFields()
-export default class PkiConfigUrlsModel extends Model {
-  // This model uses the backend value as the model ID
-  get useOpenAPI() {
-    return true;
-  }
-  getHelpUrl(backendPath) {
-    return `/v1/${backendPath}/config/urls?help=1`;
-  }
-
-  @attr({
-    label: 'Issuing certificates',
-    subText:
-      'The URL values for the Issuing Certificate field; these are different URLs for the same resource.',
-    showHelpText: false,
-    editType: 'stringArray',
-  })
-  issuingCertificates;
-
-  @attr({
-    label: 'CRL distribution points',
-    subText: 'Specifies the URL values for the CRL Distribution Points field.',
-    showHelpText: false,
-    editType: 'stringArray',
-  })
-  crlDistributionPoints;
-
-  @attr({
-    label: 'OSCP Servers',
-    subText: 'Specifies the URL values for the OCSP Servers field.',
-    showHelpText: false,
-    editType: 'stringArray',
-  })
-  ocspServers;
-
-  @lazyCapabilities(apiPath`${'id'}/config/urls`, 'id') urlsPath;
-
-  get canSet() {
-    return this.urlsPath.get('canUpdate') !== false;
-  }
-}
diff --git a/ui/app/models/pki/issuer.js b/ui/app/models/pki/issuer.js
deleted file mode 100644
index 6de6cfc27a78e..0000000000000
--- a/ui/app/models/pki/issuer.js
+++ /dev/null
@@ -1,164 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Model, { attr } from '@ember-data/model';
-import { withFormFields } from 'vault/decorators/model-form-fields';
-import lazyCapabilities, { apiPath } from 'vault/macros/lazy-capabilities';
-import { service } from '@ember/service';
-
-const issuerUrls = ['issuingCertificates', 'crlDistributionPoints', 'ocspServers'];
-const inputFields = [
-  'issuerName',
-  'leafNotAfterBehavior',
-  'usage',
-  'manualChain',
-  'revocationSignatureAlgorithm',
-  ...issuerUrls,
-];
-const displayFields = [
-  {
-    default: ['certificate', 'caChain', 'commonName', 'issuerName', 'issuerId', 'keyId'],
-    // also displays parsedCertificate values in the template
-  },
-  { 'Issuer URLs': issuerUrls },
-];
-@withFormFields(inputFields, displayFields)
-export default class PkiIssuerModel extends Model {
-  @service secretMountPath;
-  // TODO use openAPI after removing route extension (see pki/roles route for example)
-  get useOpenAPI() {
-    return false;
-  }
-  get backend() {
-    return this.secretMountPath.currentPath;
-  }
-  get issuerRef() {
-    return this.issuerName || this.issuerId;
-  }
-
-  // READ ONLY
-  @attr isDefault;
-  @attr('string', { label: 'Issuer ID', detailLinkTo: 'issuers.issuer.details' }) issuerId;
-  @attr('string', { label: 'Default key ID', detailLinkTo: 'keys.key.details' }) keyId;
-  @attr({ label: 'CA Chain', masked: true }) caChain;
-  @attr({ masked: true }) certificate;
-  @attr('string') serialNumber;
-
-  // parsed from certificate contents in serializer (see parse-pki-cert.js)
-  @attr parsedCertificate;
-  @attr('string') commonName;
-  @attr isRoot;
-
-  @attr subjectSerialNumber; // this is not the UUID serial number field randomly generated by Vault for leaf certificates
-  @attr({ label: 'Subject Alternative Names (SANs)' }) altNames;
-  @attr({ label: 'IP SANs' }) ipSans;
-  @attr({ label: 'URI SANs' }) uriSans;
-  @attr({ label: 'Other SANs' }) otherSans;
-
-  // UPDATING
-  @attr('string') issuerName;
-
-  @attr({
-    label: 'Leaf notAfter behavior',
-    subText:
-      'What happens when a leaf certificate is issued, but its NotAfter field (and therefore its expiry date) exceeds that of this issuer.',
-    docLink: '/vault/api-docs/secret/pki#update-issuer',
-    editType: 'yield',
-    valueOptions: ['err', 'truncate', 'permit'],
-  })
-  leafNotAfterBehavior;
-
-  @attr({
-    subText: 'Allowed usages for this issuer. It can always be read.',
-    editType: 'yield',
-    valueOptions: [
-      { label: 'Issuing certificates', value: 'issuing-certificates' },
-      { label: 'Signing CRLs', value: 'crl-signing' },
-      { label: 'Signing OCSPs', value: 'ocsp-signing' },
-    ],
-  })
-  usage;
-
-  @attr('string', {
-    subText:
-      "An advanced field useful when automatic chain building isn't desired. The first element must be the present issuer's reference.",
-  })
-  manualChain;
-
-  @attr({
-    subText:
-      'The signature algorithm to use when building CRLs. The default value (empty string) is for Go to select the signature algorithm automatically, which may not always work.',
-    noDefault: true,
-    possibleValues: [
-      'sha256withrsa',
-      'ecdsawithsha384',
-      'sha256withrsapss',
-      'ed25519',
-      'sha384withrsapss',
-      'sha512withrsapss',
-      'pureed25519',
-      'sha384withrsa',
-      'sha512withrsa',
-      'ecdsawithsha256',
-      'ecdsawithsha512',
-    ],
-  })
-  revocationSignatureAlgorithm;
-
-  @attr('string', {
-    subText:
-      'The URL values for the Issuing Certificate field; these are different URLs for the same resource.',
-    editType: 'stringArray',
-  })
-  issuingCertificates;
-
-  @attr('string', {
-    label: 'CRL distribution points',
-    subText: 'Specifies the URL values for the CRL Distribution Points field.',
-    editType: 'stringArray',
-  })
-  crlDistributionPoints;
-
-  @attr('string', {
-    label: 'OCSP servers',
-    subText: 'Specifies the URL values for the OCSP Servers field.',
-    editType: 'stringArray',
-  })
-  ocspServers;
-
-  // IMPORTING
-  @attr('string') pemBundle;
-  // readonly attrs returned after importing
-  @attr importedIssuers;
-  @attr importedKeys;
-  @attr mapping;
-
-  @lazyCapabilities(apiPath`${'backend'}/issuer/${'issuerId'}`) issuerPath;
-  @lazyCapabilities(apiPath`${'backend'}/root/rotate/exported`) rotateExported;
-  @lazyCapabilities(apiPath`${'backend'}/root/rotate/internal`) rotateInternal;
-  @lazyCapabilities(apiPath`${'backend'}/root/rotate/existing`) rotateExisting;
-  @lazyCapabilities(apiPath`${'backend'}/root`, 'backend') deletePath;
-  @lazyCapabilities(apiPath`${'backend'}/intermediate/cross-sign`) crossSignPath;
-  @lazyCapabilities(apiPath`${'backend'}/issuer/${'issuerId'}/sign-intermediate`) signIntermediate;
-  get canRotateIssuer() {
-    return (
-      this.rotateExported.get('canUpdate') !== false ||
-      this.rotateExisting.get('canUpdate') !== false ||
-      this.rotateInternal.get('canUpdate') !== false
-    );
-  }
-  get canCrossSign() {
-    return this.crossSignPath.get('canUpdate') !== false;
-  }
-  get canSignIntermediate() {
-    return this.signIntermediate.get('canUpdate') !== false;
-  }
-  get canConfigure() {
-    return this.issuerPath.get('canUpdate') !== false;
-  }
-  get canDeleteAllIssuers() {
-    return this.deletePath.get('isLoading') || this.deletePath.get('canDelete') !== false;
-  }
-}
diff --git a/ui/app/models/pki/key.js b/ui/app/models/pki/key.js
deleted file mode 100644
index e6a41a4be2775..0000000000000
--- a/ui/app/models/pki/key.js
+++ /dev/null
@@ -1,88 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Model, { attr } from '@ember-data/model';
-import { inject as service } from '@ember/service';
-import lazyCapabilities, { apiPath } from 'vault/macros/lazy-capabilities';
-import { withFormFields } from 'vault/decorators/model-form-fields';
-import { withModelValidations } from 'vault/decorators/model-validations';
-
-const validations = {
-  type: [{ type: 'presence', message: 'Type is required.' }],
-  keyType: [{ type: 'presence', message: 'Please select a key type.' }],
-  keyName: [
-    {
-      validator(model) {
-        if (model.keyName === 'default') return false;
-        return true;
-      },
-      message: `Key name cannot be the reserved value 'default'`,
-    },
-  ],
-};
-const displayFields = ['keyId', 'keyName', 'keyType', 'keyBits'];
-const formFieldGroups = [{ default: ['keyName', 'type'] }, { 'Key parameters': ['keyType', 'keyBits'] }];
-@withModelValidations(validations)
-@withFormFields(displayFields, formFieldGroups)
-export default class PkiKeyModel extends Model {
-  @service secretMountPath;
-
-  @attr('string', { detailsLabel: 'Key ID' }) keyId;
-  @attr('string', {
-    subText: `Optional, human-readable name for this key. The name must be unique across all keys and cannot be 'default'.`,
-  })
-  keyName;
-  @attr('string', {
-    noDefault: true,
-    possibleValues: ['internal', 'exported'],
-    subText:
-      'The type of operation. If exported, the private key will be returned in the response; if internal the private key will not be returned and cannot be retrieved later.',
-  })
-  type;
-  @attr('string', {
-    noDefault: true,
-    possibleValues: ['rsa', 'ec', 'ed25519'],
-    subText: 'The type of key that will be generated. Must be rsa, ed25519, or ec. ',
-  })
-  keyType;
-  @attr('string', {
-    label: 'Key bits',
-    noDefault: true,
-    subText: 'Bit length of the key to generate.',
-  })
-  keyBits; // no possibleValues because dependent on selected key type
-
-  @attr('string') pemBundle;
-  @attr('string') privateKey;
-
-  get backend() {
-    return this.secretMountPath.currentPath;
-  }
-
-  /* CAPABILITIES
-   * Default to show UI elements unless we know they can't access the given path
-   */
-
-  @lazyCapabilities(apiPath`${'backend'}/key/${'keyId'}`, 'backend', 'keyId') keyPath;
-  get canRead() {
-    return this.keyPath.get('canRead') !== false;
-  }
-  get canEdit() {
-    return this.keyPath.get('canUpdate') !== false;
-  }
-  get canDelete() {
-    return this.keyPath.get('canDelete') !== false;
-  }
-
-  @lazyCapabilities(apiPath`${'backend'}/keys/generate`, 'backend') generatePath;
-  get canGenerateKey() {
-    return this.generatePath.get('canUpdate') !== false;
-  }
-
-  @lazyCapabilities(apiPath`${'backend'}/keys/import`, 'backend') importPath;
-  get canImportKey() {
-    return this.importPath.get('canUpdate') !== false;
-  }
-}
diff --git a/ui/app/models/pki/pki-config.js b/ui/app/models/pki/pki-config.js
new file mode 100644
index 0000000000000..91770fca63cd5
--- /dev/null
+++ b/ui/app/models/pki/pki-config.js
@@ -0,0 +1,56 @@
+import Model, { attr } from '@ember-data/model';
+import { computed } from '@ember/object';
+import { expandAttributeMeta } from 'vault/utils/field-to-attrs';
+
+export default Model.extend({
+  backend: attr('string'),
+  der: attr(),
+  pem: attr('string'),
+  caChain: attr('string'),
+  attrList(keys) {
+    return expandAttributeMeta(this, keys);
+  },
+
+  //urls
+  urlsAttrs: computed(function () {
+    let keys = ['issuingCertificates', 'crlDistributionPoints', 'ocspServers'];
+    return this.attrList(keys);
+  }),
+  issuingCertificates: attr({
+    editType: 'stringArray',
+  }),
+  crlDistributionPoints: attr({
+    label: 'CRL Distribution Points',
+    editType: 'stringArray',
+  }),
+  ocspServers: attr({
+    label: 'OCSP Servers',
+    editType: 'stringArray',
+  }),
+
+  //tidy
+  tidyAttrs: computed(function () {
+    let keys = ['tidyCertStore', 'tidyRevocationList', 'safetyBuffer'];
+    return this.attrList(keys);
+  }),
+  tidyCertStore: attr('boolean', {
+    defaultValue: false,
+    label: 'Tidy the Certificate Store',
+  }),
+  tidyRevocationList: attr('boolean', {
+    defaultValue: false,
+    label: 'Tidy the Revocation List (CRL)',
+  }),
+  safetyBuffer: attr({
+    defaultValue: '72h',
+    editType: 'ttl',
+  }),
+
+  crlAttrs: computed(function () {
+    let keys = ['expiry', 'disable'];
+    return this.attrList(keys);
+  }),
+  //crl
+  expiry: attr('string', { defaultValue: '72h' }),
+  disable: attr('boolean', { defaultValue: false }),
+});
diff --git a/ui/app/models/pki/pki-role-engine.js b/ui/app/models/pki/pki-role-engine.js
new file mode 100644
index 0000000000000..f8aa946b6bd36
--- /dev/null
+++ b/ui/app/models/pki/pki-role-engine.js
@@ -0,0 +1,124 @@
+import Model, { attr } from '@ember-data/model';
+import lazyCapabilities, { apiPath } from 'vault/macros/lazy-capabilities';
+import { expandAttributeMeta } from 'vault/utils/field-to-attrs';
+import { withModelValidations } from 'vault/decorators/model-validations';
+
+import fieldToAttrs from 'vault/utils/field-to-attrs';
+
+const validations = {
+  name: [
+    { type: 'presence', message: 'Name is required.' },
+    {
+      type: 'containsWhiteSpace',
+      message: 'Name cannot contain whitespace.',
+    },
+  ],
+};
+
+@withModelValidations(validations)
+export default class PkiRolesEngineModel extends Model {
+  @attr('string', { readOnly: true }) backend;
+  @attr('string', {
+    label: 'Role name',
+    fieldValue: 'id',
+    readOnly: true,
+  })
+  name;
+
+  // must be a getter so it can be added to the prototype needed in the pathHelp service on the line here: if (newModel.merged || modelProto.useOpenAPI !== true) {
+  get useOpenAPI() {
+    return true;
+  }
+  getHelpUrl(backend) {
+    return `/v1/${backend}/roles/example?help=1`;
+  }
+  @lazyCapabilities(apiPath`${'backend'}/roles/${'id'}`, 'backend', 'id') updatePath;
+  get canDelete() {
+    return this.updatePath.get('canCreate');
+  }
+  get canEdit() {
+    return this.updatePath.get('canEdit');
+  }
+  get canRead() {
+    return this.updatePath.get('canRead');
+  }
+
+  @lazyCapabilities(apiPath`${'backend'}/issue/${'id'}`, 'backend', 'id') generatePath;
+  get canReadIssue() {
+    // ARG TODO was duplicate name, added Issue
+    return this.generatePath.get('canUpdate');
+  }
+  @lazyCapabilities(apiPath`${'backend'}/sign/${'id'}`, 'backend', 'id') signPath;
+  get canSign() {
+    return this.signPath.get('canUpdate');
+  }
+  @lazyCapabilities(apiPath`${'backend'}/sign-verbatim/${'id'}`, 'backend', 'id') signVerbatimPath;
+  get canSignVerbatim() {
+    return this.signVerbatimPath.get('canUpdate');
+  }
+
+  // Form Fields not hidden in toggle options
+  _attributeMeta = null;
+  get formFields() {
+    if (!this._attributeMeta) {
+      this._attributeMeta = expandAttributeMeta(this, ['name', 'clientType', 'redirectUris']);
+    }
+    return this._attributeMeta;
+  }
+
+  // Form fields hidden behind toggle options
+  _fieldToAttrsGroups = null;
+  // ARG TODO: I removed 'allowedDomains' but I'm fairly certain it needs to be somewhere. Confirm with design.
+  get fieldGroups() {
+    if (!this._fieldToAttrsGroups) {
+      this._fieldToAttrsGroups = fieldToAttrs(this, [
+        { default: ['name'] },
+        {
+          'Domain handling': [
+            'allowedDomainTemplate',
+            'allowBareDomains',
+            'allowSubdomains',
+            'allowGlobDomains',
+            'allowWildcardCertificates',
+            'allowLocalhost',
+            'allowAnyName',
+            'enforceHostnames',
+          ],
+        },
+        {
+          'Key parameters': ['keyType', 'keyBits', 'signatureBits'],
+        },
+        {
+          'Key usage': [
+            'DigitalSignature', // ARG TODO: capitalized in the docs, but should confirm
+            'KeyAgreement',
+            'KeyEncipherment',
+          ],
+        },
+        { 'Policy identifiers': ['policy_identifiers'] },
+        {
+          'Subject Alternative Name (SAN) Options': [
+            'allow_ip_sans',
+            'allowed_uri_sans',
+            'allowed_other_sans',
+          ],
+        },
+        {
+          'Additional subject fields': [
+            'allowed_serial_numbers',
+            'require_cn',
+            'use_csr_common_name',
+            'ou',
+            'organization',
+            'country',
+            'locality',
+            'province',
+            'streetAddress',
+            'postalCode',
+          ],
+        },
+      ]);
+    }
+    return this._fieldToAttrsGroups;
+  }
+}
diff --git a/ui/app/models/pki/pki-role.js b/ui/app/models/pki/pki-role.js
new file mode 100644
index 0000000000000..ccf5fd775cefc
--- /dev/null
+++ b/ui/app/models/pki/pki-role.js
@@ -0,0 +1,87 @@
+import Model, { attr } from '@ember-data/model';
+import { alias } from '@ember/object/computed';
+import { computed } from '@ember/object';
+import lazyCapabilities, { apiPath } from 'vault/macros/lazy-capabilities';
+import fieldToAttrs from 'vault/utils/field-to-attrs';
+import { combineFieldGroups } from 'vault/utils/openapi-to-attrs';
+
+export default Model.extend({
+  backend: attr('string', {
+    readOnly: true,
+  }),
+  name: attr('string', {
+    label: 'Role name',
+    fieldValue: 'id',
+    readOnly: true,
+  }),
+  useOpenAPI: true,
+  getHelpUrl: function (backend) {
+    return `/v1/${backend}/roles/example?help=1`;
+  },
+  updatePath: lazyCapabilities(apiPath`${'backend'}/roles/${'id'}`, 'backend', 'id'),
+  canDelete: alias('updatePath.canDelete'),
+  canEdit: alias('updatePath.canUpdate'),
+  canRead: alias('updatePath.canRead'),
+
+  generatePath: lazyCapabilities(apiPath`${'backend'}/issue/${'id'}`, 'backend', 'id'),
+  canGenerate: alias('generatePath.canUpdate'),
+
+  signPath: lazyCapabilities(apiPath`${'backend'}/sign/${'id'}`, 'backend', 'id'),
+  canSign: alias('signPath.canUpdate'),
+
+  signVerbatimPath: lazyCapabilities(apiPath`${'backend'}/sign-verbatim/${'id'}`, 'backend', 'id'),
+  canSignVerbatim: alias('signVerbatimPath.canUpdate'),
+
+  fieldGroups: computed('newFields', function () {
+    let groups = [
+      { default: ['name', 'keyType'] },
+      {
+        Options: [
+          'keyBits',
+          'ttl',
+          'maxTtl',
+          'allowAnyName',
+          'enforceHostnames',
+          'allowIpSans',
+          'requireCn',
+          'useCsrCommonName',
+          'useCsrSans',
+          'ou',
+          'organization',
+          'keyUsage',
+          'allowedOtherSans',
+          'notBeforeDuration',
+        ],
+      },
+      {
+        'Address Options': ['country', 'locality', 'province', 'streetAddress', 'postalCode'],
+      },
+      {
+        'Domain Handling': [
+          'allowLocalhost',
+          'allowBareDomains',
+          'allowSubdomains',
+          'allowGlobDomains',
+          'allowedDomains',
+        ],
+      },
+      {
+        'Extended Key Usage': [
+          'serverFlag',
+          'clientFlag',
+          'codeSigningFlag',
+          'emailProtectionFlag',
+          'extKeyUsageOids',
+        ],
+      },
+      {
+        Advanced: ['generateLease', 'noStore', 'basicConstraintsValidForNonCa', 'policyIdentifiers'],
+      },
+    ];
+    let excludedFields = ['extKeyUsage'];
+    if (this.newFields) {
+      groups = combineFieldGroups(groups, this.newFields, excludedFields);
+    }
+    return fieldToAttrs(this, groups);
+  }),
+});
diff --git a/ui/app/models/pki/role.js b/ui/app/models/pki/role.js
deleted file mode 100644
index ea74551914f81..0000000000000
--- a/ui/app/models/pki/role.js
+++ /dev/null
@@ -1,358 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Model, { attr } from '@ember-data/model';
-import lazyCapabilities, { apiPath } from 'vault/macros/lazy-capabilities';
-import { withModelValidations } from 'vault/decorators/model-validations';
-import { withFormFields } from 'vault/decorators/model-form-fields';
-
-const validations = {
-  name: [{ type: 'presence', message: 'Name is required.' }],
-};
-
-const fieldGroups = [
-  {
-    default: [
-      'name',
-      'issuerRef',
-      'customTtl',
-      'notBeforeDuration',
-      'maxTtl',
-      'generateLease',
-      'noStore',
-      'addBasicConstraints',
-    ],
-  },
-  {
-    'Domain handling': [
-      'allowedDomains',
-      'allowedDomainsTemplate',
-      'allowBareDomains',
-      'allowSubdomains',
-      'allowGlobDomains',
-      'allowWildcardCertificates',
-      'allowLocalhost', // default: true (returned true by OpenApi)
-      'allowAnyName',
-      'enforceHostnames', // default: true (returned true by OpenApi)
-    ],
-  },
-  {
-    'Key parameters': ['keyType', 'keyBits', 'signatureBits'],
-  },
-  {
-    'Key usage': ['keyUsage', 'extKeyUsage', 'extKeyUsageOids'],
-  },
-  { 'Policy identifiers': ['policyIdentifiers'] },
-  {
-    'Subject Alternative Name (SAN) Options': [
-      'allowIpSans',
-      'allowedUriSans',
-      'allowUriSansTemplate',
-      'allowedOtherSans',
-    ],
-  },
-  {
-    'Additional subject fields': [
-      'allowedSerialNumbers',
-      'requireCn',
-      'useCsrCommonName',
-      'useCsrSans',
-      'ou',
-      'organization',
-      'country',
-      'locality',
-      'province',
-      'streetAddress',
-      'postalCode',
-    ],
-  },
-];
-
-@withFormFields(null, fieldGroups)
-@withModelValidations(validations)
-export default class PkiRoleModel extends Model {
-  get useOpenAPI() {
-    // must be a getter so it can be accessed in path-help.js
-    return true;
-  }
-  getHelpUrl(backend) {
-    return `/v1/${backend}/roles/example?help=1`;
-  }
-
-  @attr('string', { readOnly: true }) backend;
-
-  /* Overriding OpenApi default options */
-  @attr('string', {
-    label: 'Role name',
-    fieldValue: 'name',
-    editDisabled: true,
-  })
-  name;
-
-  @attr('string', {
-    label: 'Issuer reference',
-    detailsLabel: 'Issuer',
-    defaultValue: 'default',
-    subText: `Specifies the issuer that will be used to create certificates with this role. To find this, run read -field=default pki_int/config/issuers in the console. By default, we will use the mounts default issuer.`,
-  })
-  issuerRef;
-
-  @attr({
-    label: 'Not valid after',
-    detailsLabel: 'Issued certificates expire after',
-    subText:
-      'The time after which this certificate will no longer be valid. This can be a TTL (a range of time from now) or a specific date.',
-    editType: 'yield',
-  })
-  customTtl;
-
-  @attr({
-    label: 'Backdate validity',
-    detailsLabel: 'Issued certificate backdating',
-    helperTextDisabled: 'Vault will use the default value, 30s',
-    helperTextEnabled:
-      'Also called the not_before_duration property. Allows certificates to be valid for a certain time period before now. This is useful to correct clock misalignment on various systems when setting up your CA.',
-    editType: 'ttl',
-    defaultValue: '30s',
-  })
-  notBeforeDuration;
-
-  @attr({
-    label: 'Max TTL',
-    helperTextDisabled:
-      'The maximum Time-To-Live of certificates generated by this role. If not set, the system max lease TTL will be used.',
-    editType: 'ttl',
-    defaultShown: 'System default',
-  })
-  maxTtl;
-
-  @attr('boolean', {
-    label: 'Generate lease with certificate',
-    subText:
-      'Specifies if certificates issued/signed against this role will have Vault leases attached to them.',
-    editType: 'boolean',
-    docLink: '/vault/api-docs/secret/pki#create-update-role',
-  })
-  generateLease;
-
-  @attr('boolean', {
-    label: 'Do not store certificates in storage backend',
-    detailsLabel: 'Store in storage backend', // template reverses value
-    subText:
-      'This can improve performance when issuing large numbers of certificates. However, certificates issued in this way cannot be enumerated or revoked.',
-    editType: 'boolean',
-    docLink: '/vault/api-docs/secret/pki#create-update-role',
-  })
-  noStore;
-
-  @attr('boolean', {
-    label: 'Basic constraints valid for non-CA',
-    detailsLabel: 'Add basic constraints',
-    subText: 'Mark Basic Constraints valid when issuing non-CA certificates.',
-    editType: 'boolean',
-  })
-  addBasicConstraints;
-  /* End of overriding default options */
-
-  /* Overriding OpenApi Domain handling options */
-  @attr({
-    label: 'Allowed domains',
-    subText: 'Specifies the domains this role is allowed to issue certificates for.',
-    editType: 'stringArray',
-  })
-  allowedDomains;
-
-  @attr('boolean', {
-    label: 'Allow templates in allowed domains',
-  })
-  allowedDomainsTemplate;
-  /* End of overriding Domain handling options */
-
-  /* Overriding OpenApi Key parameters options */
-  @attr('string', {
-    label: 'Key type',
-    possibleValues: ['rsa', 'ec', 'ed25519', 'any'],
-    defaultValue: 'rsa',
-  })
-  keyType;
-
-  @attr('string', {
-    label: 'Key bits',
-    defaultValue: '2048',
-  })
-  keyBits; // no possibleValues because options are dependent on selected key type
-
-  @attr('string', {
-    label: 'Signature bits',
-    subText: `Only applicable for key_type 'RSA'. Ignore for other key types.`,
-    defaultValue: '0',
-    possibleValues: ['0', '256', '384', '512'],
-  })
-  signatureBits;
-  /* End of overriding Key parameters options */
-
-  /* Overriding API Policy identifier option */
-  @attr({
-    label: 'Policy identifiers',
-    subText: 'A list of policy object identifiers (OIDs).',
-    editType: 'stringArray',
-  })
-  policyIdentifiers;
-  /* End of overriding Policy identifier options */
-
-  /* Overriding OpenApi SAN options */
-  @attr('boolean', {
-    label: 'Allow IP SANs',
-    subText: 'Specifies if clients can request IP Subject Alternative Names.',
-    editType: 'boolean',
-    defaultValue: true,
-  })
-  allowIpSans;
-
-  @attr({
-    label: 'URI Subject Alternative Names (URI SANs)',
-    subText: 'Defines allowed URI Subject Alternative Names.',
-    editType: 'stringArray',
-    docLink: '/vault/docs/concepts/policies',
-  })
-  allowedUriSans;
-
-  @attr('boolean', {
-    label: 'Allow URI SANs template',
-    subText: 'If true, the URI SANs above may contain templates, as with ACL Path Templating.',
-    editType: 'boolean',
-    docLink: '/vault/docs/concepts/policies',
-  })
-  allowUriSansTemplate;
-
-  @attr({
-    label: 'Other SANs',
-    subText: 'Defines allowed custom OID/UTF8-string SANs.',
-    editType: 'stringArray',
-  })
-  allowedOtherSans;
-  /* End of overriding SAN options */
-
-  /* Overriding OpenApi Additional subject field options */
-  @attr({
-    label: 'Allowed serial numbers',
-    subText:
-      'A list of allowed serial numbers to be requested during certificate issuance. Shell-style globbing is supported. If empty, custom-specified serial numbers will be forbidden.',
-    editType: 'stringArray',
-  })
-  allowedSerialNumbers;
-
-  @attr('boolean', {
-    label: 'Require common name',
-    subText: 'If set to false, common name will be optional when generating a certificate.',
-    defaultValue: true,
-  })
-  requireCn;
-
-  @attr('boolean', {
-    label: 'Use CSR common name',
-    subText:
-      'When used with the CSR signing endpoint, the common name in the CSR will be used instead of taken from the JSON data.',
-    defaultValue: true,
-  })
-  useCsrCommonName;
-
-  @attr('boolean', {
-    label: 'Use CSR SANs',
-    subText:
-      'When used with the CSR signing endpoint, the subject alternate names in the CSR will be used instead of taken from the JSON data.',
-    defaultValue: true,
-  })
-  useCsrSans;
-
-  @attr({
-    label: 'Organization Units (OU)',
-    subText:
-      'A list of allowed serial numbers to be requested during certificate issuance. Shell-style globbing is supported. If empty, custom-specified serial numbers will be forbidden.',
-    editType: 'stringArray',
-  })
-  ou;
-
-  @attr('array', {
-    defaultValue() {
-      return ['DigitalSignature', 'KeyAgreement', 'KeyEncipherment'];
-    },
-    defaultShown: 'None',
-  })
-  keyUsage;
-
-  @attr('array', {
-    defaultShown: 'None',
-  })
-  extKeyUsage;
-
-  @attr('array', {
-    defaultShown: 'None',
-  })
-  extKeyUsageOids;
-
-  @attr({ editType: 'stringArray' }) organization;
-  @attr({ editType: 'stringArray' }) country;
-  @attr({ editType: 'stringArray' }) locality;
-  @attr({ editType: 'stringArray' }) province;
-  @attr({ editType: 'stringArray' }) streetAddress;
-  @attr({ editType: 'stringArray' }) postalCode;
-  /* End of overriding Additional subject field options */
-
-  /* CAPABILITIES
-   * Default to show UI elements unless we know they can't access the given path
-   */
-  @lazyCapabilities(apiPath`${'backend'}/roles/${'id'}`, 'backend', 'id') updatePath;
-  get canDelete() {
-    return this.updatePath.get('isLoading') || this.updatePath.get('canCreate') !== false;
-  }
-  get canEdit() {
-    return this.updatePath.get('isLoading') || this.updatePath.get('canUpdate') !== false;
-  }
-  get canRead() {
-    return this.updatePath.get('isLoading') || this.updatePath.get('canRead') !== false;
-  }
-
-  @lazyCapabilities(apiPath`${'backend'}/issue/${'id'}`, 'backend', 'id') generatePath;
-  get canGenerateCert() {
-    return this.generatePath.get('isLoading') || this.generatePath.get('canUpdate') !== false;
-  }
-  @lazyCapabilities(apiPath`${'backend'}/sign/${'id'}`, 'backend', 'id') signPath;
-  get canSign() {
-    return this.signPath.get('isLoading') || this.signPath.get('canUpdate') !== false;
-  }
-  @lazyCapabilities(apiPath`${'backend'}/sign-verbatim/${'id'}`, 'backend', 'id') signVerbatimPath;
-  get canSignVerbatim() {
-    return this.signVerbatimPath.get('isLoading') || this.signVerbatimPath.get('canUpdate') !== false;
-  }
-
-  // Gets header/footer copy for specific toggle groups.
-  get fieldGroupsInfo() {
-    return {
-      'Domain handling': {
-        footer: {
-          text: 'These options can interact intricately with one another. For more information,',
-          docText: 'learn more here.',
-          docLink: '/vault/api-docs/secret/pki#allowed_domains',
-        },
-      },
-      'Key parameters': {
-        header: {
-          text: `These are the parameters for generating or validating the certificate's key material.`,
-        },
-      },
-      'Subject Alternative Name (SAN) Options': {
-        header: {
-          text: `Subject Alternative Names (SANs) are identities (domains, IP addresses, and URIs) Vault attaches to the requested certificates.`,
-        },
-      },
-      'Additional subject fields': {
-        header: {
-          text: `Additional identity metadata Vault can attach to the requested certificates.`,
-        },
-      },
-    };
-  }
-}
diff --git a/ui/app/models/pki/sign-intermediate.js b/ui/app/models/pki/sign-intermediate.js
deleted file mode 100644
index 6fe8845283081..0000000000000
--- a/ui/app/models/pki/sign-intermediate.js
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { attr } from '@ember-data/model';
-import { withFormFields } from 'vault/decorators/model-form-fields';
-import { withModelValidations } from 'vault/decorators/model-validations';
-import PkiCertificateBaseModel from './certificate/base';
-
-const validations = {
-  csr: [{ type: 'presence', message: 'CSR is required.' }],
-};
-@withModelValidations(validations)
-@withFormFields([
-  'csr',
-  'useCsrValues',
-  'commonName',
-  'excludeCnFromSans',
-  'customTtl',
-  'notBeforeDuration',
-  'format',
-  'permittedDnsDomains',
-  'maxPathLength',
-])
-export default class PkiSignIntermediateModel extends PkiCertificateBaseModel {
-  getHelpUrl(backend) {
-    return `/v1/${backend}/issuer/example/sign-intermediate?help=1`;
-  }
-
-  @attr issuerRef;
-
-  @attr('string', {
-    label: 'CSR',
-    editType: 'textarea',
-    subText: 'The PEM-encoded CSR to be signed.',
-  })
-  csr;
-
-  @attr('boolean', {
-    label: 'Use CSR values',
-    subText:
-      'Subject information and key usages specified in the CSR will be used over parameters provided here, and extensions in the CSR will be copied into the issued certificate.',
-    docLink: '/vault/api-docs/secret/pki#use_csr_values',
-  })
-  useCsrValues;
-
-  @attr({
-    label: 'Backdate validity',
-    detailsLabel: 'Issued certificate backdating',
-    helperTextDisabled: 'Vault will use the default value, 30s',
-    helperTextEnabled:
-      'Also called the not_before_duration property. Allows certificates to be valid for a certain time period before now. This is useful to correct clock misalignment on various systems when setting up your CA.',
-    editType: 'ttl',
-    defaultValue: '30s',
-  })
-  notBeforeDuration;
-
-  @attr({
-    label: 'Permitted DNS domains',
-    subText:
-      'DNS domains for which certificates are allowed to be issued or signed by this CA certificate. Enter each value as a new input.',
-  })
-  permittedDnsDomains;
-
-  @attr({
-    subText: 'Specifies the maximum path length to encode in the generated certificate. -1 means no limit',
-    defaultValue: '-1',
-  })
-  maxPathLength;
-
-  /* Signing Options overrides */
-  @attr({
-    label: 'Use PSS',
-    subText:
-      'If checked, PSS signatures will be used over PKCS#1v1.5 signatures when a RSA-type issuer is used. Ignored for ECDSA/Ed25519 issuers.',
-  })
-  usePss;
-
-  @attr({
-    label: 'Subject Key Identifier (SKID)',
-    subText:
-      'Value for the subject key identifier, specified as a string in hex format. If this is empty, Vault will automatically calculate the SKID. ',
-  })
-  skid;
-
-  @attr({
-    possibleValues: ['0', '256', '384', '512'],
-  })
-  signatureBits;
-
-  /* Additional subject  overrides */
-  @attr('string', {
-    subText:
-      "Specifies the requested Subject's named Serial Number value. This has no impact on the Certificate's serial number randomly generated by Vault.",
-  })
-  subjectSerialNumber;
-}
diff --git a/ui/app/models/pki/tidy.js b/ui/app/models/pki/tidy.js
deleted file mode 100644
index 4083a10e6724b..0000000000000
--- a/ui/app/models/pki/tidy.js
+++ /dev/null
@@ -1,171 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Model, { attr } from '@ember-data/model';
-import { service } from '@ember/service';
-import { withExpandedAttributes } from 'vault/decorators/model-expanded-attributes';
-
-@withExpandedAttributes()
-export default class PkiTidyModel extends Model {
-  // the backend mount is the model id, only one pki/tidy model will ever persist (the auto-tidy config)
-  @service version;
-
-  @attr({
-    label: 'Tidy ACME enabled',
-    labelDisabled: 'Tidy ACME disabled',
-    mapToBoolean: 'tidyAcme',
-    helperTextDisabled: 'Tidying of ACME accounts, orders and authorizations is disabled',
-    helperTextEnabled:
-      'The amount of time that must pass after creation that an account with no orders is marked revoked, and the amount of time after being marked revoked or deactivated.',
-    detailsLabel: 'ACME account safety buffer',
-    formatTtl: true,
-  })
-  acmeAccountSafetyBuffer;
-
-  @attr('boolean', {
-    label: 'Tidy ACME',
-    defaultValue: false,
-  })
-  tidyAcme;
-
-  @attr('boolean', {
-    label: 'Automatic tidy enabled',
-    defaultValue: false,
-  })
-  enabled; // auto-tidy only
-
-  @attr({
-    label: 'Automatic tidy enabled',
-    labelDisabled: 'Automatic tidy disabled',
-    mapToBoolean: 'enabled',
-    helperTextEnabled:
-      'Sets the interval_duration between automatic tidy operations; note that this is from the end of one operation to the start of the next.',
-    helperTextDisabled: 'Automatic tidy operations will not run.',
-    detailsLabel: 'Automatic tidy duration',
-    formatTtl: true,
-  })
-  intervalDuration; // auto-tidy only
-
-  @attr('string', {
-    editType: 'ttl',
-    helperTextEnabled:
-      'Specifies a duration that issuers should be kept for, past their NotAfter validity period. Defaults to 365 days (8760 hours).',
-    hideToggle: true,
-    formatTtl: true,
-  })
-  issuerSafetyBuffer;
-
-  @attr('string', {
-    editType: 'ttl',
-    helperTextEnabled:
-      'Specifies the duration to pause between tidying individual certificates. This releases the revocation lock and allows other operations to continue while tidy is running.',
-    hideToggle: true,
-    formatTtl: true,
-  })
-  pauseDuration;
-
-  @attr('string', {
-    editType: 'ttl',
-    helperTextEnabled:
-      'Specifies a duration after which cross-cluster revocation requests will be removed as expired.',
-    hideToggle: true,
-    formatTtl: true,
-  })
-  revocationQueueSafetyBuffer; // enterprise only
-
-  @attr('string', {
-    editType: 'ttl',
-    helperTextEnabled:
-      'For a certificate to be expunged, the time must be after the expiration time of the certificate (according to the local clock) plus the safety buffer. Defaults to 72 hours.',
-    hideToggle: true,
-    formatTtl: true,
-  })
-  safetyBuffer;
-
-  @attr('boolean', { label: 'Tidy the certificate store' })
-  tidyCertStore;
-
-  @attr('boolean', {
-    label: 'Tidy cross-cluster revoked certificates',
-    subText: 'Remove expired, cross-cluster revocation entries.',
-  })
-  tidyCrossClusterRevokedCerts; // enterprise only
-
-  @attr('boolean', {
-    subText: 'Automatically remove expired issuers after the issuer safety buffer duration has elapsed.',
-  })
-  tidyExpiredIssuers;
-
-  @attr('boolean', {
-    label: 'Tidy legacy CA bundle',
-    subText:
-      'Backup any legacy CA/issuers bundle (from Vault versions earlier than 1.11) to config/ca_bundle.bak. Migration will only occur after issuer safety buffer has passed.',
-  })
-  tidyMoveLegacyCaBundle;
-
-  @attr('boolean', {
-    label: 'Tidy cross-cluster revocation requests',
-  })
-  tidyRevocationQueue; // enterprise only
-
-  @attr('boolean', {
-    label: 'Tidy revoked certificate issuer associations',
-  })
-  tidyRevokedCertIssuerAssociations;
-
-  @attr('boolean', {
-    label: 'Tidy revoked certificates',
-    subText: 'Remove all invalid and expired certificates from storage.',
-  })
-  tidyRevokedCerts;
-
-  get useOpenAPI() {
-    return true;
-  }
-
-  getHelpUrl(backend) {
-    return `/v1/${backend}/config/auto-tidy?help=1`;
-  }
-
-  get allGroups() {
-    const groups = [{ autoTidy: ['enabled', 'intervalDuration'] }, ...this.sharedFields];
-    return this._expandGroups(groups);
-  }
-
-  // shared between auto and manual tidy operations
-  get sharedFields() {
-    const groups = [
-      {
-        'Universal operations': [
-          'tidyCertStore',
-          'tidyRevokedCerts',
-          'tidyRevokedCertIssuerAssociations',
-          'safetyBuffer',
-          'pauseDuration',
-        ],
-      },
-      {
-        'ACME operations': ['tidyAcme', 'acmeAccountSafetyBuffer'],
-      },
-      {
-        'Issuer operations': ['tidyExpiredIssuers', 'tidyMoveLegacyCaBundle', 'issuerSafetyBuffer'],
-      },
-    ];
-    if (this.version.isEnterprise) {
-      groups.push({
-        'Cross-cluster operations': [
-          'tidyRevocationQueue',
-          'tidyCrossClusterRevokedCerts',
-          'revocationQueueSafetyBuffer',
-        ],
-      });
-    }
-    return groups;
-  }
-
-  get formFieldGroups() {
-    return this._expandGroups(this.sharedFields);
-  }
-}
diff --git a/ui/app/models/policy.js b/ui/app/models/policy.js
index c180ba6e9ee91..647e367eca8b6 100644
--- a/ui/app/models/policy.js
+++ b/ui/app/models/policy.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Model, { attr } from '@ember-data/model';
 import { alias } from '@ember/object/computed';
 import { computed } from '@ember/object';
@@ -19,10 +14,10 @@ export default Model.extend({
   canEdit: alias('updatePath.canUpdate'),
   canRead: alias('updatePath.canRead'),
   format: computed('policy', function () {
-    const policy = this.policy;
+    let policy = this.policy;
     let isJSON;
     try {
-      const parsed = JSON.parse(policy);
+      let parsed = JSON.parse(policy);
       if (parsed) {
         isJSON = true;
       }
diff --git a/ui/app/models/policy/acl.js b/ui/app/models/policy/acl.js
index 9e37dd88ac25c..fd700b574237b 100644
--- a/ui/app/models/policy/acl.js
+++ b/ui/app/models/policy/acl.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import PolicyModel from '../policy';
 
 export default PolicyModel.extend();
diff --git a/ui/app/models/policy/egp.js b/ui/app/models/policy/egp.js
index af6fc849afbae..255bd66a7331c 100644
--- a/ui/app/models/policy/egp.js
+++ b/ui/app/models/policy/egp.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { attr } from '@ember-data/model';
 import { computed } from '@ember/object';
 
diff --git a/ui/app/models/policy/rgp.js b/ui/app/models/policy/rgp.js
index 33829a6e9f97d..9fb9303233ae9 100644
--- a/ui/app/models/policy/rgp.js
+++ b/ui/app/models/policy/rgp.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { attr } from '@ember-data/model';
 import { computed } from '@ember/object';
 
diff --git a/ui/app/models/raft-join.js b/ui/app/models/raft-join.js
index 374a5aab73977..4fae1b94cd302 100644
--- a/ui/app/models/raft-join.js
+++ b/ui/app/models/raft-join.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Model, { attr } from '@ember-data/model';
 import { expandAttributeMeta } from 'vault/utils/field-to-attrs';
 import { computed } from '@ember/object';
diff --git a/ui/app/models/replication-attributes.js b/ui/app/models/replication-attributes.js
index 749e6c4f389be..dd58f799673ac 100644
--- a/ui/app/models/replication-attributes.js
+++ b/ui/app/models/replication-attributes.js
@@ -1,13 +1,9 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Model, { attr } from '@ember-data/model';
 import { match, not } from '@ember/object/computed';
 import { computed } from '@ember/object';
+import { attr } from '@ember-data/model';
+import Fragment from 'ember-data-model-fragments/fragment';
 
-export default Model.extend({
+export default Fragment.extend({
   clusterId: attr('string'),
   clusterIdDisplay: computed('clusterId', 'mode', function () {
     const clusterId = this.clusterId;
diff --git a/ui/app/models/replication-mode.js b/ui/app/models/replication-mode.js
index d12520749ce27..b00a688b0cd6a 100644
--- a/ui/app/models/replication-mode.js
+++ b/ui/app/models/replication-mode.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Model, { attr } from '@ember-data/model';
 
 /* sample response
diff --git a/ui/app/models/role-aws.js b/ui/app/models/role-aws.js
index cb8003472b231..af631ceb5bff8 100644
--- a/ui/app/models/role-aws.js
+++ b/ui/app/models/role-aws.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Model, { attr } from '@ember-data/model';
 import { alias } from '@ember/object/computed';
 import { computed } from '@ember/object';
@@ -29,8 +24,10 @@ export default Model.extend({
   }),
   name: attr('string', {
     label: 'Role name',
+    fieldValue: 'id',
     readOnly: true,
   }),
+  useOpenAPI: false,
   // credentialTypes are for backwards compatibility.
   // we use this to populate "credentialType" in
   // the serializer. if there is more than one, the
@@ -54,11 +51,10 @@ export default Model.extend({
     editType: 'json',
     helpText:
       'A policy is an object in AWS that, when associated with an identity or resource, defines their permissions.',
-    defaultValue: '{\n}',
   }),
   fields: computed('credentialType', function () {
-    const credentialType = this.credentialType;
-    const keysForType = {
+    let credentialType = this.credentialType;
+    let keysForType = {
       iam_user: ['name', 'credentialType', 'policyArns', 'policyDocument'],
       assumed_role: ['name', 'credentialType', 'roleArns', 'policyDocument'],
       federation_token: ['name', 'credentialType', 'policyDocument'],
diff --git a/ui/app/models/role-jwt.js b/ui/app/models/role-jwt.js
index ddd5de04f18f6..d2de124f3a28c 100644
--- a/ui/app/models/role-jwt.js
+++ b/ui/app/models/role-jwt.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Model, { attr } from '@ember-data/model';
 import parseURL from 'core/utils/parse-url';
 
diff --git a/ui/app/models/role-ssh.js b/ui/app/models/role-ssh.js
index f66e3b93b2e03..07b4aeef79377 100644
--- a/ui/app/models/role-ssh.js
+++ b/ui/app/models/role-ssh.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Model, { attr } from '@ember-data/model';
 import { alias } from '@ember/object/computed';
 import { computed } from '@ember/object';
@@ -42,7 +37,6 @@ const CA_FIELDS = [
   'allowUserKeyIds',
   'keyIdFormat',
   'notBeforeDuration',
-  'algorithmSigner',
 ];
 
 export default Model.extend({
@@ -58,7 +52,7 @@ export default Model.extend({
   }),
   name: attr('string', {
     label: 'Role Name',
-    fieldValue: 'name',
+    fieldValue: 'id',
     readOnly: true,
   }),
   keyType: attr('string', {
@@ -123,21 +117,17 @@ export default Model.extend({
   keyIdFormat: attr('string', {
     helpText: 'When supplied, this value specifies a custom format for the key id of a signed certificate',
   }),
-  algorithmSigner: attr('string', {
-    helpText: 'When supplied, this value specifies a signing algorithm for the key',
-    possibleValues: ['default', 'ssh-rsa', 'rsa-sha2-256', 'rsa-sha2-512'],
-  }),
 
   showFields: computed('keyType', function () {
     const keyType = this.keyType;
-    const keys = keyType === 'ca' ? CA_FIELDS.slice(0) : OTP_FIELDS.slice(0);
+    let keys = keyType === 'ca' ? CA_FIELDS.slice(0) : OTP_FIELDS.slice(0);
     return expandAttributeMeta(this, keys);
   }),
 
   fieldGroups: computed('keyType', function () {
-    const numRequired = this.keyType === 'otp' ? 3 : 4;
-    const fields = this.keyType === 'otp' ? [...OTP_FIELDS] : [...CA_FIELDS];
-    const defaultFields = fields.splice(0, numRequired);
+    let numRequired = this.keyType === 'otp' ? 3 : 4;
+    let fields = this.keyType === 'otp' ? [...OTP_FIELDS] : [...CA_FIELDS];
+    let defaultFields = fields.splice(0, numRequired);
     const groups = [
       { default: defaultFields },
       {
diff --git a/ui/app/models/secret-engine.js b/ui/app/models/secret-engine.js
index afda9977d87f8..2fb064c372f7c 100644
--- a/ui/app/models/secret-engine.js
+++ b/ui/app/models/secret-engine.js
@@ -1,31 +1,16 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Model, { attr, belongsTo } from '@ember-data/model';
+import Model, { attr } from '@ember-data/model';
 import { computed } from '@ember/object'; // eslint-disable-line
 import { equal } from '@ember/object/computed'; // eslint-disable-line
+import { fragment } from 'ember-data-model-fragments/attributes';
+import fieldToAttrs, { expandAttributeMeta } from 'vault/utils/field-to-attrs';
 import { withModelValidations } from 'vault/decorators/model-validations';
-import { withExpandedAttributes } from 'vault/decorators/model-expanded-attributes';
-import { supportedSecretBackends } from 'vault/helpers/supported-secret-backends';
-
-const LINKED_BACKENDS = supportedSecretBackends();
 
 // identity will be managed separately and the inclusion
 // of the system backend is an implementation detail
 const LIST_EXCLUDED_BACKENDS = ['system', 'identity'];
 
 const validations = {
-  path: [
-    { type: 'presence', message: "Path can't be blank." },
-    {
-      type: 'containsWhiteSpace',
-      message:
-        "Path contains whitespace. If this is desired, you'll need to encode it with %20 in API requests.",
-      level: 'warn',
-    },
-  ],
+  path: [{ type: 'presence', message: "Path can't be blank." }],
   maxVersions: [
     { type: 'number', message: 'Maximum versions must be a number.' },
     { type: 'length', options: { min: 1, max: 16 }, message: 'You cannot go over 16 characters.' },
@@ -33,102 +18,126 @@ const validations = {
 };
 
 @withModelValidations(validations)
-@withExpandedAttributes()
-export default class SecretEngineModel extends Model {
-  @attr('string') path;
-  @attr('string') type;
-  @attr('string', {
+class SecretEngineModel extends Model {}
+export default SecretEngineModel.extend({
+  path: attr('string'),
+  accessor: attr('string'),
+  name: attr('string'),
+  type: attr('string', {
+    label: 'Secret engine type',
+  }),
+  description: attr('string', {
     editType: 'textarea',
-  })
-  description;
-  @belongsTo('mount-config', { async: false, inverse: null }) config;
-
-  // Enterprise options (still available on OSS)
-  @attr('boolean', {
+  }),
+  config: fragment('mount-config', { defaultValue: {} }),
+  options: fragment('mount-options', { defaultValue: {} }),
+  local: attr('boolean', {
     helpText:
       'When Replication is enabled, a local mount will not be replicated across clusters. This can only be specified at mount time.',
-  })
-  local;
-  @attr('boolean', {
+  }),
+  sealWrap: attr('boolean', {
     helpText:
       'When enabled - if a seal supporting seal wrapping is specified in the configuration, all critical security parameters (CSPs) in this backend will be seal wrapped. (For K/V mounts, all values will be seal wrapped.) This can only be specified at mount time.',
-  })
-  sealWrap;
-  @attr('boolean') externalEntropyAccess;
-
-  // options.version
-  @attr('number', {
-    label: 'Version',
-    helpText:
-      'The KV Secrets Engine can operate in different modes. Version 1 is the original generic Secrets Engine the allows for storing of static key/value pairs. Version 2 added more features including data versioning, TTLs, and check and set.',
-    possibleValues: [2, 1],
-    // This shouldn't be defaultValue because if no version comes back from API we should assume it's v1
-    defaultFormValue: 2, // Set the form to 2 by default
-  })
-  version;
-
-  // SSH specific attributes
-  @attr('string') privateKey;
-  @attr('string') publicKey;
-  @attr('boolean', {
-    defaultValue: true,
-  })
-  generateSigningKey;
-
-  // AWS specific attributes
-  @attr('string') lease;
-  @attr('string') leaseMax;
-
-  // Returned from API response
-  @attr('string') accessor;
-
+  }),
   // KV 2 additional config default options
-  @attr('number', {
+  maxVersions: attr('number', {
     defaultValue: 0,
     label: 'Maximum number of versions',
     subText:
       'The number of versions to keep per key. Once the number of keys exceeds the maximum number set here, the oldest version will be permanently deleted. This value applies to all keys, but a key’s metadata settings can overwrite this value. When 0 is used or the value is unset, Vault will keep 10 versions.',
-  })
-  maxVersions;
-  @attr('boolean', {
+  }),
+  casRequired: attr('boolean', {
     defaultValue: false,
     label: 'Require Check and Set',
     subText:
       'If checked, all keys will require the cas parameter to be set on all write requests. A key’s metadata settings can overwrite this value.',
-  })
-  casRequired;
-  @attr({
+  }),
+  deleteVersionAfter: attr({
     defaultValue: 0,
     editType: 'ttl',
     label: 'Automate secret deletion',
     helperTextDisabled: 'A secret’s version must be manually deleted.',
     helperTextEnabled: 'Delete all new versions of this secret after',
-  })
-  deleteVersionAfter;
+  }),
+
+  modelTypeForKV: computed('engineType', 'options.version', function () {
+    let type = this.engineType;
+    let version = this.options?.version;
+    let modelType = 'secret';
+    if ((type === 'kv' || type === 'generic') && version === 2) {
+      modelType = 'secret-v2';
+    }
+    return modelType;
+  }),
+
+  isV2KV: equal('modelTypeForKV', 'secret-v2'),
 
-  /* GETTERS */
-  get modelTypeForKV() {
-    const engineType = this.engineType;
-    if ((engineType === 'kv' || engineType === 'generic') && this.version === 2) {
-      return 'secret-v2';
+  formFields: computed('engineType', 'options.version', function () {
+    let type = this.engineType;
+    let version = this.options?.version;
+    let fields = ['type', 'path', 'description', 'accessor', 'local', 'sealWrap'];
+    // no ttl options for keymgmt
+    const ttl = type !== 'keymgmt' ? 'defaultLeaseTtl,maxLeaseTtl,' : '';
+    fields.push(`config.{${ttl}auditNonHmacRequestKeys,auditNonHmacResponseKeys,passthroughRequestHeaders}`);
+    if (type === 'kv' || type === 'generic') {
+      fields.push('options.{version}');
+    }
+    // version comes in as number not string
+    if (type === 'kv' && version === 2) {
+      fields.push('casRequired', 'deleteVersionAfter', 'maxVersions');
+    }
+    return fields;
+  }),
+
+  formFieldGroups: computed('engineType', function () {
+    let type = this.engineType;
+    let defaultGroup;
+    // KV has specific config options it adds on the enable engine. https://www.vaultproject.io/api/secret/kv/kv-v2#configure-the-kv-engine
+    if (type === 'kv') {
+      defaultGroup = { default: ['path', 'maxVersions', 'casRequired', 'deleteVersionAfter'] };
+    } else {
+      defaultGroup = { default: ['path'] };
     }
-    return 'secret';
-  }
-  get isV2KV() {
-    return this.modelTypeForKV === 'secret-v2';
-  }
+    let optionsGroup = {
+      'Method Options': ['description', 'config.listingVisibility', 'local', 'sealWrap'],
+    };
+    // no ttl options for keymgmt
+    const ttl = type !== 'keymgmt' ? 'defaultLeaseTtl,maxLeaseTtl,' : '';
+    optionsGroup['Method Options'].push(
+      `config.{${ttl}auditNonHmacRequestKeys,auditNonHmacResponseKeys,passthroughRequestHeaders}`
+    );
 
-  get attrs() {
-    return this.formFields.map((fieldName) => {
-      return this.allByKey[fieldName];
-    });
-  }
+    if (type === 'kv' || type === 'generic') {
+      optionsGroup['Method Options'].unshift('options.{version}');
+    }
+    if (type === 'database') {
+      // For the Database Secret Engine we want to highlight the defaultLeaseTtl and maxLeaseTtl, removing them from the options object
+      defaultGroup.default.push('config.{defaultLeaseTtl}', 'config.{maxLeaseTtl}');
+      return [
+        defaultGroup,
+        {
+          'Method Options': [
+            'description',
+            'config.listingVisibility',
+            'local',
+            'sealWrap',
+            'config.{auditNonHmacRequestKeys,auditNonHmacResponseKeys,passthroughRequestHeaders}',
+          ],
+        },
+      ];
+    }
+    return [defaultGroup, optionsGroup];
+  }),
+
+  attrs: computed('formFields', function () {
+    return expandAttributeMeta(this, this.formFields);
+  }),
 
-  get fieldGroups() {
-    return this._expandGroups(this.formFieldGroups);
-  }
+  fieldGroups: computed('formFieldGroups', function () {
+    return fieldToAttrs(this, this.formFieldGroups);
+  }),
 
-  get icon() {
+  icon: computed('engineType', function () {
     if (!this.engineType || this.engineType === 'kmip') {
       return 'secrets';
     }
@@ -136,140 +145,39 @@ export default class SecretEngineModel extends Model {
       return 'key';
     }
     return this.engineType;
-  }
+  }),
 
-  get engineType() {
+  // namespaces introduced types with a `ns_` prefix for built-in engines
+  // so we need to strip that to normalize the type
+  engineType: computed('type', function () {
     return (this.type || '').replace(/^ns_/, '');
-  }
+  }),
 
-  get shouldIncludeInList() {
+  shouldIncludeInList: computed('engineType', function () {
     return !LIST_EXCLUDED_BACKENDS.includes(this.engineType);
-  }
-
-  get isSupportedBackend() {
-    return LINKED_BACKENDS.includes(this.engineType);
-  }
-
-  get backendLink() {
-    if (this.engineType === 'kmip') {
-      return 'vault.cluster.secrets.backend.kmip.scopes';
-    }
-    if (this.engineType === 'database') {
-      return 'vault.cluster.secrets.backend.overview';
-    }
-    return 'vault.cluster.secrets.backend.list-root';
-  }
+  }),
 
-  get accessor() {
-    if (this.version === 2) {
-      return `v2 ${this.accessor}`;
-    }
-    return this.accessor;
-  }
-
-  get localDisplay() {
+  localDisplay: computed('local', function () {
     return this.local ? 'local' : 'replicated';
-  }
-
-  get formFields() {
-    const type = this.engineType;
-    const fields = ['type', 'path', 'description', 'accessor', 'local', 'sealWrap'];
-    // no ttl options for keymgmt
-    if (type !== 'keymgmt') {
-      fields.push('config.defaultLeaseTtl', 'config.maxLeaseTtl');
-    }
-    fields.push(
-      'config.allowedManagedKeys',
-      'config.auditNonHmacRequestKeys',
-      'config.auditNonHmacResponseKeys',
-      'config.passthroughRequestHeaders',
-      'config.allowedResponseHeaders'
-    );
-    if (type === 'kv' || type === 'generic') {
-      fields.push('version');
-    }
-    // version comes in as number not string
-    if (type === 'kv' && parseInt(this.version, 10) === 2) {
-      fields.push('casRequired', 'deleteVersionAfter', 'maxVersions');
-    }
-    return fields;
-  }
+  }),
 
-  get formFieldGroups() {
-    let defaultFields = ['path'];
-    let optionFields;
-    const CORE_OPTIONS = ['description', 'config.listingVisibility', 'local', 'sealWrap'];
-    const STANDARD_CONFIG = [
-      'config.auditNonHmacRequestKeys',
-      'config.auditNonHmacResponseKeys',
-      'config.passthroughRequestHeaders',
-      'config.allowedResponseHeaders',
-    ];
-
-    switch (this.engineType) {
-      case 'kv':
-        defaultFields = ['path', 'maxVersions', 'casRequired', 'deleteVersionAfter'];
-        optionFields = [
-          'version',
-          ...CORE_OPTIONS,
-          'config.defaultLeaseTtl',
-          'config.maxLeaseTtl',
-          'config.allowedManagedKeys',
-          ...STANDARD_CONFIG,
-        ];
-        break;
-      case 'generic':
-        optionFields = [
-          'version',
-          ...CORE_OPTIONS,
-          'config.defaultLeaseTtl',
-          'config.maxLeaseTtl',
-          'config.allowedManagedKeys',
-          ...STANDARD_CONFIG,
-        ];
-        break;
-      case 'database':
-        // Highlight TTLs in default
-        defaultFields = ['path', 'config.defaultLeaseTtl', 'config.maxLeaseTtl'];
-        optionFields = [...CORE_OPTIONS, 'config.allowedManagedKeys', ...STANDARD_CONFIG];
-        break;
-      case 'pki':
-        defaultFields = ['path', 'config.defaultLeaseTtl', 'config.maxLeaseTtl', 'config.allowedManagedKeys'];
-        optionFields = [...CORE_OPTIONS, ...STANDARD_CONFIG];
-        break;
-      case 'keymgmt':
-        // no ttl options for keymgmt
-        optionFields = [...CORE_OPTIONS, 'config.allowedManagedKeys', ...STANDARD_CONFIG];
-        break;
-      default:
-        defaultFields = ['path'];
-        optionFields = [
-          ...CORE_OPTIONS,
-          'config.defaultLeaseTtl',
-          'config.maxLeaseTtl',
-          'config.allowedManagedKeys',
-          ...STANDARD_CONFIG,
-        ];
-        break;
-    }
-
-    return [
-      { default: defaultFields },
-      {
-        'Method Options': optionFields,
-      },
-    ];
-  }
+  // ssh specific ones
+  privateKey: attr('string'),
+  publicKey: attr('string'),
+  generateSigningKey: attr('boolean', {
+    defaultValue: true,
+  }),
 
-  /* ACTIONS */
   saveCA(options) {
     if (this.type !== 'ssh') {
       return;
     }
     if (options.isDelete) {
-      this.privateKey = null;
-      this.publicKey = null;
-      this.generateSigningKey = false;
+      this.setProperties({
+        privateKey: null,
+        publicKey: null,
+        generateSigningKey: false,
+      });
     }
     return this.save({
       adapterOptions: {
@@ -278,7 +186,7 @@ export default class SecretEngineModel extends Model {
         attrsToSend: ['privateKey', 'publicKey', 'generateSigningKey'],
       },
     });
-  }
+  },
 
   saveZeroAddressConfig() {
     return this.save({
@@ -286,5 +194,9 @@ export default class SecretEngineModel extends Model {
         adapterMethod: 'saveZeroAddressConfig',
       },
     });
-  }
-}
+  },
+
+  // aws backend attrs
+  lease: attr('string'),
+  leaseMax: attr('string'),
+});
diff --git a/ui/app/models/secret-v2-version.js b/ui/app/models/secret-v2-version.js
index 2ce4aea2150ce..f413148f26d53 100644
--- a/ui/app/models/secret-v2-version.js
+++ b/ui/app/models/secret-v2-version.js
@@ -1,10 +1,4 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { belongsTo, attr } from '@ember-data/model';
-import timestamp from 'core/utils/timestamp';
 import SecretModel from './secret';
 
 export default class SecretV2VersionModel extends SecretModel {
@@ -21,7 +15,7 @@ export default class SecretV2VersionModel extends SecretModel {
 
   get deleted() {
     const deletionTime = new Date(this.deletionTime);
-    const now = timestamp.now();
+    const now = new Date();
     return deletionTime <= now;
   }
 }
diff --git a/ui/app/models/secret-v2.js b/ui/app/models/secret-v2.js
index 21ae5af591d44..c4945fcce1314 100644
--- a/ui/app/models/secret-v2.js
+++ b/ui/app/models/secret-v2.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Model, { belongsTo, hasMany, attr } from '@ember-data/model';
 import { computed } from '@ember/object'; // eslint-disable-line
 import { alias } from '@ember/object/computed'; // eslint-disable-line
diff --git a/ui/app/models/secret.js b/ui/app/models/secret.js
index 83c06782b1b01..86c528b26fe40 100644
--- a/ui/app/models/secret.js
+++ b/ui/app/models/secret.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Model, { attr } from '@ember-data/model';
 import { computed } from '@ember/object';
 import { alias } from '@ember/object/computed';
diff --git a/ui/app/models/server.js b/ui/app/models/server.js
index ba612f1cfa7e9..62dc72727be0b 100644
--- a/ui/app/models/server.js
+++ b/ui/app/models/server.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Model, { attr } from '@ember-data/model';
 
 //{"node_id":"1249bfbc-b234-96f3-0c66-07078ac3e16e","address":"127.0.0.1:8201","leader":true,"protocol_version":"3","voter":true}
diff --git a/ui/app/models/ssh-otp-credential.js b/ui/app/models/ssh-otp-credential.js
index b7044aa48ddf5..6740e9a4c162a 100644
--- a/ui/app/models/ssh-otp-credential.js
+++ b/ui/app/models/ssh-otp-credential.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { reads } from '@ember/object/computed';
 import Model, { attr } from '@ember-data/model';
 import { computed } from '@ember/object';
@@ -22,7 +17,7 @@ export default Model.extend({
   keyType: attr('string'),
   port: attr('number'),
   attrs: computed('key', function () {
-    const keys = this.key ? DISPLAY_FIELDS.slice(0) : CREATE_FIELDS.slice(0);
+    let keys = this.key ? DISPLAY_FIELDS.slice(0) : CREATE_FIELDS.slice(0);
     return expandAttributeMeta(this, keys);
   }),
   toCreds: reads('key'),
diff --git a/ui/app/models/ssh-sign.js b/ui/app/models/ssh-sign.js
index 1937479dac693..8cd177bbf8e14 100644
--- a/ui/app/models/ssh-sign.js
+++ b/ui/app/models/ssh-sign.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Model, { attr } from '@ember-data/model';
 import { computed } from '@ember/object';
 import { expandAttributeMeta } from 'vault/utils/field-to-attrs';
@@ -51,7 +46,7 @@ export default Model.extend({
   signedKey: attr('string'),
 
   attrs: computed('signedKey', function () {
-    const keys = this.signedKey ? DISPLAY_FIELDS.slice(0) : CREATE_FIELDS.slice(0);
+    let keys = this.signedKey ? DISPLAY_FIELDS.slice(0) : CREATE_FIELDS.slice(0);
     return expandAttributeMeta(this, keys);
   }),
 });
diff --git a/ui/app/models/test-form-model.js b/ui/app/models/test-form-model.js
index 8d47285d93ac4..e46d668ef1556 100644
--- a/ui/app/models/test-form-model.js
+++ b/ui/app/models/test-form-model.js
@@ -1,14 +1,9 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 // this model is just used for integration tests
 //
 
 import AuthMethodModel from './auth-method';
-import { belongsTo } from '@ember-data/model';
+import { fragment } from 'ember-data-model-fragments/attributes';
 
 export default AuthMethodModel.extend({
-  otherConfig: belongsTo('mount-config', { async: false, inverse: null }),
+  otherConfig: fragment('mount-config', { defaultValue: {} }),
 });
diff --git a/ui/app/models/transform.js b/ui/app/models/transform.js
index 043f0430df9d9..059a49d66116b 100644
--- a/ui/app/models/transform.js
+++ b/ui/app/models/transform.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Model, { attr } from '@ember-data/model';
 import { computed } from '@ember/object';
 import { apiPath } from 'vault/macros/lazy-capabilities';
@@ -39,9 +34,11 @@ const TWEAK_SOURCE = [
 ];
 
 const ModelExport = Model.extend({
+  useOpenAPI: false,
   name: attr('string', {
     // CBS TODO: make this required for making a transformation
     label: 'Name',
+    fieldValue: 'id',
     readOnly: true,
     subText: 'The name for your transformation. This cannot be edited later.',
   }),
@@ -66,18 +63,17 @@ const ModelExport = Model.extend({
   }),
   template: attr('array', {
     editType: 'searchSelect',
-    isSectionHeader: true,
     fallbackComponent: 'string-list',
     label: 'Template', // CBS TODO: make this required for making a transformation
     models: ['transform/template'],
     selectLimit: 1,
     onlyAllowExisting: true,
+    subLabel: 'Template Name',
     subText:
       'Templates allow Vault to determine what and how to capture the value to be transformed. Type to use an existing template or create a new one.',
   }),
   allowed_roles: attr('array', {
     editType: 'searchSelect',
-    isSectionHeader: true,
     label: 'Allowed roles',
     fallbackComponent: 'string-list',
     models: ['transform/role'],
diff --git a/ui/app/models/transform/alphabet.js b/ui/app/models/transform/alphabet.js
index 8f7f661787fce..1cff5bbae23a5 100644
--- a/ui/app/models/transform/alphabet.js
+++ b/ui/app/models/transform/alphabet.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Model, { attr } from '@ember-data/model';
 import { computed } from '@ember/object';
 import { apiPath } from 'vault/macros/lazy-capabilities';
@@ -12,11 +7,12 @@ import { expandAttributeMeta } from 'vault/utils/field-to-attrs';
 const M = Model.extend({
   idPrefix: 'alphabet/',
   idForNav: computed('id', 'idPrefix', function () {
-    const modelId = this.id || '';
+    let modelId = this.id || '';
     return `${this.idPrefix}${modelId}`;
   }),
 
   name: attr('string', {
+    fieldValue: 'id',
     readOnly: true,
     subText: 'The alphabet name. Keep in mind that spaces are not allowed and this cannot be edited later.',
   }),
@@ -27,7 +23,7 @@ const M = Model.extend({
   }),
 
   attrs: computed(function () {
-    const keys = ['name', 'alphabet'];
+    let keys = ['name', 'alphabet'];
     return expandAttributeMeta(this, keys);
   }),
 
diff --git a/ui/app/models/transform/role.js b/ui/app/models/transform/role.js
index daee45312ffa7..61ff802f334b5 100644
--- a/ui/app/models/transform/role.js
+++ b/ui/app/models/transform/role.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Model, { attr } from '@ember-data/model';
 import { computed } from '@ember/object';
 import { apiPath } from 'vault/macros/lazy-capabilities';
@@ -14,28 +9,29 @@ const ModelExport = Model.extend({
   idPrefix: 'role/',
   // the id prefixed with `role/` so we can use it as the *secret param for the secret show route
   idForNav: computed('id', 'idPrefix', function () {
-    const modelId = this.id || '';
+    let modelId = this.id || '';
     return `${this.idPrefix}${modelId}`;
   }),
 
   name: attr('string', {
     // TODO: make this required for making a transformation
     label: 'Name',
+    fieldValue: 'id',
     readOnly: true,
     subText: 'The name for your role. This cannot be edited later.',
   }),
   transformations: attr('array', {
     editType: 'searchSelect',
-    isSectionHeader: true,
     fallbackComponent: 'string-list',
     label: 'Transformations',
     models: ['transform'],
     onlyAllowExisting: true,
+    subLabel: 'Transformations',
     subText: 'Select which transformations this role will have access to. It must already exist.',
   }),
 
   attrs: computed('transformations', function () {
-    const keys = ['name', 'transformations'];
+    let keys = ['name', 'transformations'];
     return expandAttributeMeta(this, keys);
   }),
 
diff --git a/ui/app/models/transform/template.js b/ui/app/models/transform/template.js
index 0716d67e08502..045fb96b906e9 100644
--- a/ui/app/models/transform/template.js
+++ b/ui/app/models/transform/template.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Model, { attr } from '@ember-data/model';
 import { computed } from '@ember/object';
 import { apiPath } from 'vault/macros/lazy-capabilities';
@@ -12,11 +7,12 @@ import { expandAttributeMeta } from 'vault/utils/field-to-attrs';
 const M = Model.extend({
   idPrefix: 'template/',
   idForNav: computed('id', 'idPrefix', function () {
-    const modelId = this.id || '';
+    let modelId = this.id || '';
     return `${this.idPrefix}${modelId}`;
   }),
 
   name: attr('string', {
+    fieldValue: 'id',
     readOnly: true,
     subText:
       'Templates allow Vault to determine what and how to capture the value to be transformed. This cannot be edited later.',
@@ -30,7 +26,6 @@ const M = Model.extend({
     subText:
       'Alphabet defines a set of characters (UTF-8) that is used for FPE to determine the validity of plaintext and ciphertext values. You can choose a built-in one, or create your own.',
     editType: 'searchSelect',
-    isSectionHeader: true,
     fallbackComponent: 'string-list',
     label: 'Alphabet',
     models: ['transform/alphabet'],
@@ -41,7 +36,7 @@ const M = Model.extend({
   backend: attr('string', { readOnly: true }),
 
   readAttrs: computed(function () {
-    const keys = ['name', 'pattern', 'encodeFormat', 'decodeFormats', 'alphabet'];
+    let keys = ['name', 'pattern', 'encodeFormat', 'decodeFormats', 'alphabet'];
     return expandAttributeMeta(this, keys);
   }),
   writeAttrs: computed(function () {
diff --git a/ui/app/models/transit-key.js b/ui/app/models/transit-key.js
index 01e92b3c80a72..4c849a4d7746d 100644
--- a/ui/app/models/transit-key.js
+++ b/ui/app/models/transit-key.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Model, { attr } from '@ember-data/model';
 import { alias } from '@ember/object/computed';
 import { set, get, computed } from '@ember/object';
@@ -58,6 +53,7 @@ export default Model.extend({
   }),
   name: attr('string', {
     label: 'Name',
+    fieldValue: 'id',
     readOnly: true,
   }),
   autoRotatePeriod: attr({
@@ -118,7 +114,7 @@ export default Model.extend({
 
   keyVersions: computed('validKeyVersions', function () {
     let maxVersion = Math.max(...this.validKeyVersions);
-    const versions = [];
+    let versions = [];
     while (maxVersion > 0) {
       versions.unshift(maxVersion);
       maxVersion--;
@@ -144,8 +140,8 @@ export default Model.extend({
 
   keysForEncryption: computed('minEncryptionVersion', 'latestVersion', function () {
     let { minEncryptionVersion, latestVersion } = this;
-    const minVersion = clamp(minEncryptionVersion - 1, 0, latestVersion);
-    const versions = [];
+    let minVersion = clamp(minEncryptionVersion - 1, 0, latestVersion);
+    let versions = [];
     while (latestVersion > minVersion) {
       versions.push(latestVersion);
       latestVersion--;
@@ -158,7 +154,7 @@ export default Model.extend({
   }),
 
   exportKeyTypes: computed('exportable', 'supportsEncryption', 'supportsSigning', 'type', function () {
-    const types = ['hmac'];
+    let types = ['hmac'];
     if (this.supportsSigning) {
       types.unshift('signing');
     }
diff --git a/ui/app/modifiers/code-mirror.js b/ui/app/modifiers/code-mirror.js
new file mode 100644
index 0000000000000..f018c0974855d
--- /dev/null
+++ b/ui/app/modifiers/code-mirror.js
@@ -0,0 +1,68 @@
+import { action } from '@ember/object';
+import { bind } from '@ember/runloop';
+import codemirror from 'codemirror';
+import Modifier from 'ember-modifier';
+
+import 'codemirror/addon/edit/matchbrackets';
+import 'codemirror/addon/selection/active-line';
+import 'codemirror/addon/lint/lint.js';
+import 'codemirror/addon/lint/json-lint.js';
+// right now we only use the ruby and javascript, if you use another mode you'll need to import it.
+// https://codemirror.net/mode/
+import 'codemirror/mode/ruby/ruby';
+import 'codemirror/mode/javascript/javascript';
+
+export default class CodeMirrorModifier extends Modifier {
+  didInstall() {
+    this._setup();
+  }
+
+  didUpdateArguments() {
+    this._editor.setOption('readOnly', this.args.named.readOnly);
+    if (!this.args.named.content) {
+      return;
+    }
+    if (this._editor.getValue() !== this.args.named.content) {
+      this._editor.setValue(this.args.named.content);
+    }
+  }
+
+  @action
+  _onChange(editor) {
+    this.args.named.onUpdate(editor.getValue(), this._editor);
+  }
+
+  @action
+  _onFocus(editor) {
+    this.args.named.onFocus(editor.getValue());
+  }
+
+  _setup() {
+    if (!this.element) {
+      throw new Error('CodeMirror modifier has no element');
+    }
+    const editor = codemirror(this.element, {
+      // IMPORTANT: `gutters` must come before `lint` since the presence of
+      // `gutters` is cached internally when `lint` is toggled
+      gutters: this.args.named.gutters || ['CodeMirror-lint-markers'],
+      matchBrackets: true,
+      lint: { lintOnChange: true },
+      showCursorWhenSelecting: true,
+      styleActiveLine: true,
+      tabSize: 2,
+      // all values we can pass into the JsonEditor
+      extraKeys: this.args.named.extraKeys || '',
+      lineNumbers: this.args.named.lineNumbers,
+      mode: this.args.named.mode || 'application/json',
+      readOnly: this.args.named.readOnly || false,
+      theme: this.args.named.theme || 'hashi',
+      value: this.args.named.content || '',
+      viewportMargin: this.args.named.viewportMargin || '',
+    });
+
+    editor.on('change', bind(this, this._onChange));
+    editor.on('focus', bind(this, this._onFocus));
+
+    this._editor = editor;
+  }
+}
diff --git a/ui/app/router.js b/ui/app/router.js
index 1ac7175691cfc..4588691212963 100644
--- a/ui/app/router.js
+++ b/ui/app/router.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import EmberRouter from '@ember/routing/router';
 import config from 'vault/config/environment';
 
@@ -25,7 +20,8 @@ Router.map(function () {
       this.route('license');
       this.route('mfa-setup');
       this.route('clients', function () {
-        this.route('dashboard');
+        this.route('current');
+        this.route('history');
         this.route('config');
         this.route('edit');
       });
@@ -158,8 +154,9 @@ Router.map(function () {
         this.route('backends', { path: '/' });
         this.route('backend', { path: '/:backend' }, function () {
           this.mount('kmip');
-          this.mount('kubernetes');
-          this.mount('pki');
+          if (config.environment !== 'production') {
+            this.mount('pki');
+          }
           this.route('index', { path: '/' });
           this.route('configuration');
           // because globs / params can't be empty,
diff --git a/ui/app/routes/application.js b/ui/app/routes/application.js
index 5ac7b0ea1bcda..fbbe5f7061584 100644
--- a/ui/app/routes/application.js
+++ b/ui/app/routes/application.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import Route from '@ember/routing/route';
 import ControlGroupError from 'vault/lib/control-group-error';
@@ -18,18 +13,18 @@ export default Route.extend({
       window.scrollTo(0, 0);
     },
     error(error, transition) {
-      const controlGroup = this.controlGroup;
+      let controlGroup = this.controlGroup;
       if (error instanceof ControlGroupError) {
-        return controlGroup.handleError(error);
+        return controlGroup.handleError(error, transition);
       }
       if (error.path === '/v1/sys/wrapping/unwrap') {
         controlGroup.unmarkTokenForUnwrap();
       }
 
-      const router = this.routing;
+      let router = this.routing;
       //FIXME transition.intent likely needs to be replaced
       let errorURL = transition.intent.url;
-      const { name, contexts, queryParams } = transition.intent;
+      let { name, contexts, queryParams } = transition.intent;
 
       // If the transition is internal to Ember, we need to generate the URL
       // from the route parameters ourselves
diff --git a/ui/app/routes/loading.js b/ui/app/routes/loading.js
index 3818725d7081c..ad5294e83bcb8 100644
--- a/ui/app/routes/loading.js
+++ b/ui/app/routes/loading.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 
 export default Route.extend({
diff --git a/ui/app/routes/vault.js b/ui/app/routes/vault.js
index 625a74b214828..1748db61cd1f7 100644
--- a/ui/app/routes/vault.js
+++ b/ui/app/routes/vault.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { later } from '@ember/runloop';
 import { Promise } from 'rsvp';
 import { inject as service } from '@ember/service';
@@ -12,13 +7,10 @@ import Ember from 'ember';
 const SPLASH_DELAY = Ember.testing ? 0 : 300;
 
 export default Route.extend({
-  store: service(),
   version: service(),
-
   beforeModel() {
     return this.version.fetchVersion();
   },
-
   model() {
     // hardcode single cluster
     const fixture = {
diff --git a/ui/app/routes/vault/cluster.js b/ui/app/routes/vault/cluster.js
index 303bcc0b92fa0..327bfc99fc99c 100644
--- a/ui/app/routes/vault/cluster.js
+++ b/ui/app/routes/vault/cluster.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import { computed } from '@ember/object';
 import { reject } from 'rsvp';
@@ -68,7 +63,7 @@ export default Route.extend(ModelBoundaryRoute, ClusterRoute, {
         this.transitionTo({ queryParams: { namespace } });
       }
     } else if (managedRoot !== null) {
-      const managed = getManagedNamespace(namespace, managedRoot);
+      let managed = getManagedNamespace(namespace, managedRoot);
       if (managed !== namespace) {
         this.transitionTo({ queryParams: { namespace: managed } });
       }
@@ -135,5 +130,17 @@ export default Route.extend(ModelBoundaryRoute, ClusterRoute, {
       }
       return true;
     },
+    loading(transition) {
+      if (transition.queryParamsOnly || Ember.testing) {
+        return;
+      }
+      // eslint-disable-next-line ember/no-controller-access-in-routes
+      let controller = this.controllerFor('vault.cluster');
+      controller.set('currentlyLoading', true);
+
+      transition.finally(function () {
+        controller.set('currentlyLoading', false);
+      });
+    },
   },
 });
diff --git a/ui/app/routes/vault/cluster/access.js b/ui/app/routes/vault/cluster/access.js
index 5c1e44f445829..e4b6db7a4cd07 100644
--- a/ui/app/routes/vault/cluster/access.js
+++ b/ui/app/routes/vault/cluster/access.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { computed } from '@ember/object';
 import Route from '@ember/routing/route';
 import ClusterRoute from 'vault/mixins/cluster-route';
diff --git a/ui/app/routes/vault/cluster/access/control-group-accessor.js b/ui/app/routes/vault/cluster/access/control-group-accessor.js
index a4c28edd13399..c385dffab28b1 100644
--- a/ui/app/routes/vault/cluster/access/control-group-accessor.js
+++ b/ui/app/routes/vault/cluster/access/control-group-accessor.js
@@ -1,14 +1,8 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import Route from '@ember/routing/route';
 import UnloadModel from 'vault/mixins/unload-model-route';
 
 export default Route.extend(UnloadModel, {
-  store: service(),
   version: service(),
 
   beforeModel() {
@@ -18,7 +12,9 @@ export default Route.extend(UnloadModel, {
   },
 
   model(params) {
-    return this.version.hasControlGroups ? this.store.findRecord('control-group', params.accessor) : null;
+    return this.version.hasFeature('Control Groups')
+      ? this.store.findRecord('control-group', params.accessor)
+      : null;
   },
 
   actions: {
diff --git a/ui/app/routes/vault/cluster/access/control-groups-configure.js b/ui/app/routes/vault/cluster/access/control-groups-configure.js
index 177f22326b10c..d8b16670ea14a 100644
--- a/ui/app/routes/vault/cluster/access/control-groups-configure.js
+++ b/ui/app/routes/vault/cluster/access/control-groups-configure.js
@@ -1,14 +1,8 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import Route from '@ember/routing/route';
 import UnloadModel from 'vault/mixins/unload-model-route';
 
 export default Route.extend(UnloadModel, {
-  store: service(),
   version: service(),
 
   beforeModel() {
@@ -18,8 +12,8 @@ export default Route.extend(UnloadModel, {
   },
 
   model() {
-    const type = 'control-group-config';
-    return this.version.hasControlGroups
+    let type = 'control-group-config';
+    return this.version.hasFeature('Control Groups')
       ? this.store.findRecord(type, 'config').catch((e) => {
           // if you haven't saved a config, the API 404s, so create one here to edit and return it
           if (e.httpStatus === 404) {
diff --git a/ui/app/routes/vault/cluster/access/control-groups.js b/ui/app/routes/vault/cluster/access/control-groups.js
index c2f4380388603..e08b8d1d3f87b 100644
--- a/ui/app/routes/vault/cluster/access/control-groups.js
+++ b/ui/app/routes/vault/cluster/access/control-groups.js
@@ -1,14 +1,8 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import Route from '@ember/routing/route';
 import UnloadModel from 'vault/mixins/unload-model-route';
 
 export default Route.extend(UnloadModel, {
-  store: service(),
   version: service(),
 
   beforeModel() {
@@ -18,6 +12,6 @@ export default Route.extend(UnloadModel, {
   },
 
   model() {
-    return this.version.hasControlGroups ? this.store.createRecord('control-group') : null;
+    return this.version.hasFeature('Control Groups') ? this.store.createRecord('control-group') : null;
   },
 });
diff --git a/ui/app/routes/vault/cluster/access/identity.js b/ui/app/routes/vault/cluster/access/identity.js
index eabdc00890452..03cc052b82632 100644
--- a/ui/app/routes/vault/cluster/access/identity.js
+++ b/ui/app/routes/vault/cluster/access/identity.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import AdapterError from '@ember-data/adapter/error';
 import { set } from '@ember/object';
 import Route from '@ember/routing/route';
@@ -14,7 +9,7 @@ const MODEL_FROM_PARAM = {
 
 export default Route.extend({
   model(params) {
-    const model = MODEL_FROM_PARAM[params.item_type];
+    let model = MODEL_FROM_PARAM[params.item_type];
     if (!model) {
       const error = new AdapterError();
       set(error, 'httpStatus', 404);
diff --git a/ui/app/routes/vault/cluster/access/identity/aliases/add.js b/ui/app/routes/vault/cluster/access/identity/aliases/add.js
index 1d9b0064cc885..375e8862251ed 100644
--- a/ui/app/routes/vault/cluster/access/identity/aliases/add.js
+++ b/ui/app/routes/vault/cluster/access/identity/aliases/add.js
@@ -1,19 +1,11 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 import UnloadModelRoute from 'vault/mixins/unload-model-route';
 import UnsavedModelRoute from 'vault/mixins/unsaved-model-route';
-import { inject as service } from '@ember/service';
 
 export default Route.extend(UnloadModelRoute, UnsavedModelRoute, {
-  store: service(),
-
   model(params) {
-    const itemType = this.modelFor('vault.cluster.access.identity');
-    const modelType = `identity/${itemType}-alias`;
+    let itemType = this.modelFor('vault.cluster.access.identity');
+    let modelType = `identity/${itemType}-alias`;
     return this.store.createRecord(modelType, {
       canonicalId: params.item_id,
     });
diff --git a/ui/app/routes/vault/cluster/access/identity/aliases/edit.js b/ui/app/routes/vault/cluster/access/identity/aliases/edit.js
index 308b9eda983c3..7561f7cb16105 100644
--- a/ui/app/routes/vault/cluster/access/identity/aliases/edit.js
+++ b/ui/app/routes/vault/cluster/access/identity/aliases/edit.js
@@ -1,19 +1,11 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 import UnloadModelRoute from 'vault/mixins/unload-model-route';
 import UnsavedModelRoute from 'vault/mixins/unsaved-model-route';
-import { inject as service } from '@ember/service';
 
 export default Route.extend(UnloadModelRoute, UnsavedModelRoute, {
-  store: service(),
-
   model(params) {
-    const itemType = this.modelFor('vault.cluster.access.identity');
-    const modelType = `identity/${itemType}-alias`;
+    let itemType = this.modelFor('vault.cluster.access.identity');
+    let modelType = `identity/${itemType}-alias`;
     return this.store.findRecord(modelType, params.item_alias_id);
   },
 });
diff --git a/ui/app/routes/vault/cluster/access/identity/aliases/index.js b/ui/app/routes/vault/cluster/access/identity/aliases/index.js
index 3455935e5b7e9..fc9a9bca3a6cf 100644
--- a/ui/app/routes/vault/cluster/access/identity/aliases/index.js
+++ b/ui/app/routes/vault/cluster/access/identity/aliases/index.js
@@ -1,18 +1,10 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 import ListRoute from 'core/mixins/list-route';
-import { inject as service } from '@ember/service';
 
 export default Route.extend(ListRoute, {
-  store: service(),
-
   model(params) {
-    const itemType = this.modelFor('vault.cluster.access.identity');
-    const modelType = `identity/${itemType}-alias`;
+    let itemType = this.modelFor('vault.cluster.access.identity');
+    let modelType = `identity/${itemType}-alias`;
     return this.store
       .lazyPaginatedQuery(modelType, {
         responsePath: 'data.keys',
@@ -27,12 +19,10 @@ export default Route.extend(ListRoute, {
         }
       });
   },
-
   setupController(controller) {
     this._super(...arguments);
     controller.set('identityType', this.modelFor('vault.cluster.access.identity'));
   },
-
   actions: {
     willTransition(transition) {
       window.scrollTo(0, 0);
diff --git a/ui/app/routes/vault/cluster/access/identity/aliases/show.js b/ui/app/routes/vault/cluster/access/identity/aliases/show.js
index 074bdf4f64a32..1436d06060be7 100644
--- a/ui/app/routes/vault/cluster/access/identity/aliases/show.js
+++ b/ui/app/routes/vault/cluster/access/identity/aliases/show.js
@@ -1,23 +1,15 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import AdapterError from '@ember-data/adapter/error';
 import { hash } from 'rsvp';
 import { set } from '@ember/object';
 import Route from '@ember/routing/route';
 import { TABS } from 'vault/helpers/tabs-for-identity-show';
-import { inject as service } from '@ember/service';
 
 export default Route.extend({
-  store: service(),
-
   model(params) {
-    const { section } = params;
-    const itemType = this.modelFor('vault.cluster.access.identity') + '-alias';
-    const tabs = TABS[itemType];
-    const modelType = `identity/${itemType}`;
+    let { section } = params;
+    let itemType = this.modelFor('vault.cluster.access.identity') + '-alias';
+    let tabs = TABS[itemType];
+    let modelType = `identity/${itemType}`;
     if (!tabs.includes(section)) {
       const error = new AdapterError();
       set(error, 'httpStatus', 404);
@@ -31,7 +23,7 @@ export default Route.extend({
   },
 
   setupController(controller, resolvedModel) {
-    const { model, section } = resolvedModel;
+    let { model, section } = resolvedModel;
     controller.setProperties({
       model,
       section,
diff --git a/ui/app/routes/vault/cluster/access/identity/create.js b/ui/app/routes/vault/cluster/access/identity/create.js
index 6b7df568fd1cb..cf50fb39b90b4 100644
--- a/ui/app/routes/vault/cluster/access/identity/create.js
+++ b/ui/app/routes/vault/cluster/access/identity/create.js
@@ -1,19 +1,11 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 import UnloadModelRoute from 'vault/mixins/unload-model-route';
 import UnsavedModelRoute from 'vault/mixins/unsaved-model-route';
-import { inject as service } from '@ember/service';
 
 export default Route.extend(UnloadModelRoute, UnsavedModelRoute, {
-  store: service(),
-
   model() {
-    const itemType = this.modelFor('vault.cluster.access.identity');
-    const modelType = `identity/${itemType}`;
+    let itemType = this.modelFor('vault.cluster.access.identity');
+    let modelType = `identity/${itemType}`;
     return this.store.createRecord(modelType);
   },
 });
diff --git a/ui/app/routes/vault/cluster/access/identity/edit.js b/ui/app/routes/vault/cluster/access/identity/edit.js
index 7127720104778..0df6a00e34aff 100644
--- a/ui/app/routes/vault/cluster/access/identity/edit.js
+++ b/ui/app/routes/vault/cluster/access/identity/edit.js
@@ -1,19 +1,11 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 import UnloadModelRoute from 'vault/mixins/unload-model-route';
 import UnsavedModelRoute from 'vault/mixins/unsaved-model-route';
-import { inject as service } from '@ember/service';
 
 export default Route.extend(UnloadModelRoute, UnsavedModelRoute, {
-  store: service(),
-
   model(params) {
-    const itemType = this.modelFor('vault.cluster.access.identity');
-    const modelType = `identity/${itemType}`;
+    let itemType = this.modelFor('vault.cluster.access.identity');
+    let modelType = `identity/${itemType}`;
     return this.store.findRecord(modelType, params.item_id);
   },
 });
diff --git a/ui/app/routes/vault/cluster/access/identity/index.js b/ui/app/routes/vault/cluster/access/identity/index.js
index f709021cd2aa5..163b3c03eedba 100644
--- a/ui/app/routes/vault/cluster/access/identity/index.js
+++ b/ui/app/routes/vault/cluster/access/identity/index.js
@@ -1,18 +1,10 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 import ListRoute from 'core/mixins/list-route';
-import { inject as service } from '@ember/service';
 
 export default Route.extend(ListRoute, {
-  store: service(),
-
   model(params) {
-    const itemType = this.modelFor('vault.cluster.access.identity');
-    const modelType = `identity/${itemType}`;
+    let itemType = this.modelFor('vault.cluster.access.identity');
+    let modelType = `identity/${itemType}`;
     return this.store
       .lazyPaginatedQuery(modelType, {
         responsePath: 'data.keys',
diff --git a/ui/app/routes/vault/cluster/access/identity/merge.js b/ui/app/routes/vault/cluster/access/identity/merge.js
index c61d33f9260fd..c38dfbc856933 100644
--- a/ui/app/routes/vault/cluster/access/identity/merge.js
+++ b/ui/app/routes/vault/cluster/access/identity/merge.js
@@ -1,24 +1,15 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 import UnloadModelRoute from 'vault/mixins/unload-model-route';
-import { inject as service } from '@ember/service';
 
 export default Route.extend(UnloadModelRoute, {
-  store: service(),
-
   beforeModel() {
-    const itemType = this.modelFor('vault.cluster.access.identity');
+    let itemType = this.modelFor('vault.cluster.access.identity');
     if (itemType !== 'entity') {
       return this.transitionTo('vault.cluster.access.identity');
     }
   },
-
   model() {
-    const modelType = `identity/entity-merge`;
+    let modelType = `identity/entity-merge`;
     return this.store.createRecord(modelType);
   },
 });
diff --git a/ui/app/routes/vault/cluster/access/identity/show.js b/ui/app/routes/vault/cluster/access/identity/show.js
index 5a4e36e89cfa7..ee479a3ef1af9 100644
--- a/ui/app/routes/vault/cluster/access/identity/show.js
+++ b/ui/app/routes/vault/cluster/access/identity/show.js
@@ -1,24 +1,16 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import AdapterError from '@ember-data/adapter/error';
 import { next } from '@ember/runloop';
 import { hash } from 'rsvp';
 import { set } from '@ember/object';
 import Route from '@ember/routing/route';
 import { TABS } from 'vault/helpers/tabs-for-identity-show';
-import { inject as service } from '@ember/service';
 
 export default Route.extend({
-  store: service(),
-
   model(params) {
-    const { section } = params;
-    const itemType = this.modelFor('vault.cluster.access.identity');
-    const tabs = TABS[itemType];
-    const modelType = `identity/${itemType}`;
+    let { section } = params;
+    let itemType = this.modelFor('vault.cluster.access.identity');
+    let tabs = TABS[itemType];
+    let modelType = `identity/${itemType}`;
     if (!tabs.includes(section)) {
       const error = new AdapterError();
       set(error, 'httpStatus', 404);
@@ -56,14 +48,14 @@ export default Route.extend({
   },
 
   afterModel(resolvedModel) {
-    const { section, model } = resolvedModel;
+    let { section, model } = resolvedModel;
     if (model.get('identityType') === 'group' && model.get('type') === 'internal' && section === 'aliases') {
       return this.transitionTo('vault.cluster.access.identity.show', model.id, 'details');
     }
   },
 
   setupController(controller, resolvedModel) {
-    const { model, section } = resolvedModel;
+    let { model, section } = resolvedModel;
     controller.setProperties({
       model,
       section,
diff --git a/ui/app/routes/vault/cluster/access/leases.js b/ui/app/routes/vault/cluster/access/leases.js
index 39d599afb6741..63f3bb0e90664 100644
--- a/ui/app/routes/vault/cluster/access/leases.js
+++ b/ui/app/routes/vault/cluster/access/leases.js
@@ -1,15 +1,7 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 import ClusterRoute from 'vault/mixins/cluster-route';
-import { inject as service } from '@ember/service';
 
 export default Route.extend(ClusterRoute, {
-  store: service(),
-
   model() {
     return this.store.findRecord('capabilities', 'sys/leases/lookup/');
   },
diff --git a/ui/app/routes/vault/cluster/access/leases/index.js b/ui/app/routes/vault/cluster/access/leases/index.js
index 01e74e28c23c3..ae716fd52d583 100644
--- a/ui/app/routes/vault/cluster/access/leases/index.js
+++ b/ui/app/routes/vault/cluster/access/leases/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 
 export default Route.extend({
diff --git a/ui/app/routes/vault/cluster/access/leases/list-root.js b/ui/app/routes/vault/cluster/access/leases/list-root.js
index eb7ed18e3103c..ea1fedd0a52f6 100644
--- a/ui/app/routes/vault/cluster/access/leases/list-root.js
+++ b/ui/app/routes/vault/cluster/access/leases/list-root.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from './list';
diff --git a/ui/app/routes/vault/cluster/access/leases/list.js b/ui/app/routes/vault/cluster/access/leases/list.js
index c6f951d8447eb..c1ad888f1cfa0 100644
--- a/ui/app/routes/vault/cluster/access/leases/list.js
+++ b/ui/app/routes/vault/cluster/access/leases/list.js
@@ -1,16 +1,8 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { set } from '@ember/object';
 import { hash } from 'rsvp';
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
 
 export default Route.extend({
-  store: service(),
-
   queryParams: {
     page: {
       refreshModel: true,
diff --git a/ui/app/routes/vault/cluster/access/leases/show.js b/ui/app/routes/vault/cluster/access/leases/show.js
index b8035e565b3aa..2af259eb1bdb8 100644
--- a/ui/app/routes/vault/cluster/access/leases/show.js
+++ b/ui/app/routes/vault/cluster/access/leases/show.js
@@ -1,18 +1,11 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { set } from '@ember/object';
 import { hash } from 'rsvp';
 import Route from '@ember/routing/route';
 import UnloadModelRoute from 'vault/mixins/unload-model-route';
+
 import utils from 'vault/lib/key-utils';
-import { inject as service } from '@ember/service';
 
 export default Route.extend(UnloadModelRoute, {
-  store: service(),
-
   beforeModel() {
     const { lease_id: leaseId } = this.paramsFor(this.routeName);
     const parentKey = utils.parentKeyForKey(leaseId);
diff --git a/ui/app/routes/vault/cluster/access/method.js b/ui/app/routes/vault/cluster/access/method.js
index ade257b2e40d6..3da9bc42a74d5 100644
--- a/ui/app/routes/vault/cluster/access/method.js
+++ b/ui/app/routes/vault/cluster/access/method.js
@@ -1,17 +1,10 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import AdapterError from '@ember-data/adapter/error';
 import { set } from '@ember/object';
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 
 export default Route.extend({
-  store: service(),
   pathHelp: service('path-help'),
-
   model(params) {
     const { path } = params;
     return this.store.findAll('auth-method').then((modelArray) => {
diff --git a/ui/app/routes/vault/cluster/access/method/index.js b/ui/app/routes/vault/cluster/access/method/index.js
index b5a5c658d8c10..356fdef7ba8aa 100644
--- a/ui/app/routes/vault/cluster/access/method/index.js
+++ b/ui/app/routes/vault/cluster/access/method/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 import { tabsForAuthSection } from 'vault/helpers/tabs-for-auth-section';
 export default Route.extend({
diff --git a/ui/app/routes/vault/cluster/access/method/item.js b/ui/app/routes/vault/cluster/access/method/item.js
index e39b52c3d06e8..52f3fdfb8c499 100644
--- a/ui/app/routes/vault/cluster/access/method/item.js
+++ b/ui/app/routes/vault/cluster/access/method/item.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import Route from '@ember/routing/route';
 import { singularize } from 'ember-inflector';
@@ -12,7 +7,7 @@ export default Route.extend({
 
   beforeModel() {
     const { apiPath, type, authMethodPath, itemType } = this.getMethodAndModelInfo();
-    const modelType = `generated-${singularize(itemType)}-${type}`;
+    let modelType = `generated-${singularize(itemType)}-${type}`;
     return this.pathHelp.getNewModel(modelType, authMethodPath, apiPath, itemType);
   },
 
@@ -29,7 +24,7 @@ export default Route.extend({
     const { apiPath, authMethodPath, itemType } = this.getMethodAndModelInfo();
     controller.set('itemType', itemType);
     this.pathHelp.getPaths(apiPath, authMethodPath, itemType).then((paths) => {
-      const navigationPaths = paths.paths.filter((path) => path.navigation);
+      let navigationPaths = paths.paths.filter((path) => path.navigation);
       controller.set(
         'paths',
         navigationPaths.filter((path) => path.itemType.includes(itemType)).map((path) => path.path)
diff --git a/ui/app/routes/vault/cluster/access/method/item/create.js b/ui/app/routes/vault/cluster/access/method/item/create.js
index 32da7a3aaf08b..f8073f2cc9e79 100644
--- a/ui/app/routes/vault/cluster/access/method/item/create.js
+++ b/ui/app/routes/vault/cluster/access/method/item/create.js
@@ -1,17 +1,9 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 import UnloadModelRoute from 'vault/mixins/unload-model-route';
 import UnsavedModelRoute from 'vault/mixins/unsaved-model-route';
 import { singularize } from 'ember-inflector';
-import { inject as service } from '@ember/service';
 
 export default Route.extend(UnloadModelRoute, UnsavedModelRoute, {
-  store: service(),
-
   model() {
     const { item_type: itemType } = this.paramsFor('vault.cluster.access.method.item');
     const methodModel = this.modelFor('vault.cluster.access.method');
diff --git a/ui/app/routes/vault/cluster/access/method/item/edit.js b/ui/app/routes/vault/cluster/access/method/item/edit.js
index fcf4a5fd1c4dd..6841e03b1a7d7 100644
--- a/ui/app/routes/vault/cluster/access/method/item/edit.js
+++ b/ui/app/routes/vault/cluster/access/method/item/edit.js
@@ -1,17 +1,9 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 import UnloadModelRoute from 'vault/mixins/unload-model-route';
 import UnsavedModelRoute from 'vault/mixins/unsaved-model-route';
 import { singularize } from 'ember-inflector';
-import { inject as service } from '@ember/service';
 
 export default Route.extend(UnloadModelRoute, UnsavedModelRoute, {
-  store: service(),
-
   model(params) {
     const id = params.item_id;
     const { item_type: itemType } = this.paramsFor('vault.cluster.access.method.item');
diff --git a/ui/app/routes/vault/cluster/access/method/item/list.js b/ui/app/routes/vault/cluster/access/method/item/list.js
index 65f43d7784ee7..682a5ff7d1070 100644
--- a/ui/app/routes/vault/cluster/access/method/item/list.js
+++ b/ui/app/routes/vault/cluster/access/method/item/list.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import Route from '@ember/routing/route';
 import { singularize } from 'ember-inflector';
@@ -23,7 +18,7 @@ export default Route.extend(ListRoute, {
   model() {
     const { type, authMethodPath, itemType } = this.getMethodAndModelInfo();
     const { page, pageFilter } = this.paramsFor(this.routeName);
-    const modelType = `generated-${singularize(itemType)}-${type}`;
+    let modelType = `generated-${singularize(itemType)}-${type}`;
 
     return this.store
       .lazyPaginatedQuery(modelType, {
@@ -41,7 +36,6 @@ export default Route.extend(ListRoute, {
         }
       });
   },
-
   actions: {
     willTransition(transition) {
       window.scrollTo(0, 0);
@@ -55,7 +49,6 @@ export default Route.extend(ListRoute, {
       this.refresh();
     },
   },
-
   setupController(controller) {
     this._super(...arguments);
     const { apiPath, authMethodPath, itemType, methodModel } = this.getMethodAndModelInfo();
diff --git a/ui/app/routes/vault/cluster/access/method/item/show.js b/ui/app/routes/vault/cluster/access/method/item/show.js
index 5617d078a379d..cc6d2995dad69 100644
--- a/ui/app/routes/vault/cluster/access/method/item/show.js
+++ b/ui/app/routes/vault/cluster/access/method/item/show.js
@@ -1,16 +1,9 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { singularize } from 'ember-inflector';
 import { inject as service } from '@ember/service';
 import Route from '@ember/routing/route';
 
 export default Route.extend({
-  store: service(),
   pathHelp: service('path-help'),
-
   model(params) {
     const id = params.item_id;
     const { item_type: itemType } = this.paramsFor('vault.cluster.access.method.item');
diff --git a/ui/app/routes/vault/cluster/access/method/section.js b/ui/app/routes/vault/cluster/access/method/section.js
index fa6539f1894e5..ed88293c40029 100644
--- a/ui/app/routes/vault/cluster/access/method/section.js
+++ b/ui/app/routes/vault/cluster/access/method/section.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import AdapterError from '@ember-data/adapter/error';
 import { set } from '@ember/object';
 import Route from '@ember/routing/route';
@@ -22,7 +17,7 @@ export default Route.extend({
     const { section_name: section } = this.paramsFor(this.routeName);
     this._super(...arguments);
     controller.set('section', section);
-    const method = this.modelFor('vault.cluster.access.method');
+    let method = this.modelFor('vault.cluster.access.method');
     controller.set(
       'paths',
       method.paths.paths.filter((path) => path.navigation)
diff --git a/ui/app/routes/vault/cluster/access/methods.js b/ui/app/routes/vault/cluster/access/methods.js
index 7d573c2547687..018a574f15e06 100644
--- a/ui/app/routes/vault/cluster/access/methods.js
+++ b/ui/app/routes/vault/cluster/access/methods.js
@@ -1,24 +1,16 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-
-export default class VaultClusterAccessMethodsRoute extends Route {
-  @service store;
 
-  queryParams = {
+export default Route.extend({
+  queryParams: {
     page: {
       refreshModel: true,
     },
     pageFilter: {
       refreshModel: true,
     },
-  };
+  },
 
   model() {
     return this.store.findAll('auth-method');
-  }
-}
+  },
+});
diff --git a/ui/app/routes/vault/cluster/access/mfa/enforcements/create.js b/ui/app/routes/vault/cluster/access/mfa/enforcements/create.js
index 26e4e3520d0d4..6823de3527d28 100644
--- a/ui/app/routes/vault/cluster/access/mfa/enforcements/create.js
+++ b/ui/app/routes/vault/cluster/access/mfa/enforcements/create.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 
diff --git a/ui/app/routes/vault/cluster/access/mfa/enforcements/enforcement.js b/ui/app/routes/vault/cluster/access/mfa/enforcements/enforcement.js
index 1301965343c40..b03366b30cd8a 100644
--- a/ui/app/routes/vault/cluster/access/mfa/enforcements/enforcement.js
+++ b/ui/app/routes/vault/cluster/access/mfa/enforcements/enforcement.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 
diff --git a/ui/app/routes/vault/cluster/access/mfa/enforcements/enforcement/edit.js b/ui/app/routes/vault/cluster/access/mfa/enforcements/enforcement/edit.js
index 6a27d545ccfcd..1655c46c71ae4 100644
--- a/ui/app/routes/vault/cluster/access/mfa/enforcements/enforcement/edit.js
+++ b/ui/app/routes/vault/cluster/access/mfa/enforcements/enforcement/edit.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 
 export default class MfaLoginEnforcementEditRoute extends Route {}
diff --git a/ui/app/routes/vault/cluster/access/mfa/enforcements/index.js b/ui/app/routes/vault/cluster/access/mfa/enforcements/index.js
index 7b656fdc2a779..987fb44dea746 100644
--- a/ui/app/routes/vault/cluster/access/mfa/enforcements/index.js
+++ b/ui/app/routes/vault/cluster/access/mfa/enforcements/index.js
@@ -1,14 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
 
 export default class MfaEnforcementsRoute extends Route {
-  @service store;
-
   model() {
     return this.store.query('mfa-login-enforcement', {}).catch((err) => {
       if (err.httpStatus === 404) {
diff --git a/ui/app/routes/vault/cluster/access/mfa/index.js b/ui/app/routes/vault/cluster/access/mfa/index.js
index ef12533aab28d..cb6054567c420 100644
--- a/ui/app/routes/vault/cluster/access/mfa/index.js
+++ b/ui/app/routes/vault/cluster/access/mfa/index.js
@@ -1,14 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
 
 export default class MfaConfigureRoute extends Route {
-  @service store;
-
   beforeModel() {
     return this.store
       .query('mfa-method', {})
diff --git a/ui/app/routes/vault/cluster/access/mfa/methods/create.js b/ui/app/routes/vault/cluster/access/mfa/methods/create.js
index f5c3ced04c508..8802e86ab10c1 100644
--- a/ui/app/routes/vault/cluster/access/mfa/methods/create.js
+++ b/ui/app/routes/vault/cluster/access/mfa/methods/create.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 
 export default class MfaLoginEnforcementCreateRoute extends Route {
diff --git a/ui/app/routes/vault/cluster/access/mfa/methods/index.js b/ui/app/routes/vault/cluster/access/mfa/methods/index.js
index 7be2c2dba3dc8..8fa1ffea7ad64 100644
--- a/ui/app/routes/vault/cluster/access/mfa/methods/index.js
+++ b/ui/app/routes/vault/cluster/access/mfa/methods/index.js
@@ -1,13 +1,7 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 
 export default class MfaMethodsRoute extends Route {
-  @service store;
   @service router;
 
   model() {
diff --git a/ui/app/routes/vault/cluster/access/mfa/methods/method.js b/ui/app/routes/vault/cluster/access/mfa/methods/method.js
index f518efaddcf9c..d0b7dbfad5071 100644
--- a/ui/app/routes/vault/cluster/access/mfa/methods/method.js
+++ b/ui/app/routes/vault/cluster/access/mfa/methods/method.js
@@ -1,23 +1,14 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 import { hash } from 'rsvp';
-import { inject as service } from '@ember/service';
-
 export default class MfaMethodRoute extends Route {
-  @service store;
-
   model({ id }) {
     return hash({
       method: this.store.findRecord('mfa-method', id).then((data) => data),
       enforcements: this.store
         .query('mfa-login-enforcement', {})
         .then((data) => {
-          const filteredEnforcements = data.filter((item) => {
-            const results = item.hasMany('mfa_methods').ids();
+          let filteredEnforcements = data.filter((item) => {
+            let results = item.hasMany('mfa_methods').ids();
             return results.includes(id);
           });
           return filteredEnforcements;
diff --git a/ui/app/routes/vault/cluster/access/mfa/methods/method/edit.js b/ui/app/routes/vault/cluster/access/mfa/methods/method/edit.js
index 4dcdd876f4107..cd3d72b6700bb 100644
--- a/ui/app/routes/vault/cluster/access/mfa/methods/method/edit.js
+++ b/ui/app/routes/vault/cluster/access/mfa/methods/method/edit.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 
 export default class MfaMethodEditRoute extends Route {}
diff --git a/ui/app/routes/vault/cluster/access/namespaces/create.js b/ui/app/routes/vault/cluster/access/namespaces/create.js
index 14aee25197769..20522da7597bc 100644
--- a/ui/app/routes/vault/cluster/access/namespaces/create.js
+++ b/ui/app/routes/vault/cluster/access/namespaces/create.js
@@ -1,22 +1,14 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import Route from '@ember/routing/route';
 import UnloadModel from 'vault/mixins/unload-model-route';
 
 export default Route.extend(UnloadModel, {
-  store: service(),
   version: service(),
-
   beforeModel() {
     return this.version.fetchFeatures().then(() => {
       return this._super(...arguments);
     });
   },
-
   model() {
     return this.version.hasNamespaces ? this.store.createRecord('namespace') : null;
   },
diff --git a/ui/app/routes/vault/cluster/access/namespaces/index.js b/ui/app/routes/vault/cluster/access/namespaces/index.js
index f662de65f7637..4822effa52647 100644
--- a/ui/app/routes/vault/cluster/access/namespaces/index.js
+++ b/ui/app/routes/vault/cluster/access/namespaces/index.js
@@ -1,23 +1,14 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import Route from '@ember/routing/route';
 import UnloadModel from 'vault/mixins/unload-model-route';
 
 export default Route.extend(UnloadModel, {
-  store: service(),
-
   queryParams: {
     page: {
       refreshModel: true,
     },
   },
-
   version: service(),
-
   beforeModel() {
     this.store.unloadAll('namespace');
     return this.version.fetchFeatures().then(() => {
@@ -59,7 +50,6 @@ export default Route.extend(UnloadModel, {
       });
     }
   },
-
   actions: {
     error(error, transition) {
       /* eslint-disable-next-line ember/no-controller-access-in-routes */
diff --git a/ui/app/routes/vault/cluster/access/oidc.js b/ui/app/routes/vault/cluster/access/oidc.js
index 4683b3a63895b..18903d49eb9db 100644
--- a/ui/app/routes/vault/cluster/access/oidc.js
+++ b/ui/app/routes/vault/cluster/access/oidc.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 
 export default class OidcConfigureRoute extends Route {}
diff --git a/ui/app/routes/vault/cluster/access/oidc/assignments/assignment.js b/ui/app/routes/vault/cluster/access/oidc/assignments/assignment.js
index 0dc5133cf5b03..54011c1df6e2f 100644
--- a/ui/app/routes/vault/cluster/access/oidc/assignments/assignment.js
+++ b/ui/app/routes/vault/cluster/access/oidc/assignments/assignment.js
@@ -1,14 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
 
 export default class OidcAssignmentRoute extends Route {
-  @service store;
-
   model({ name }) {
     return this.store.findRecord('oidc/assignment', name);
   }
diff --git a/ui/app/routes/vault/cluster/access/oidc/assignments/assignment/details.js b/ui/app/routes/vault/cluster/access/oidc/assignments/assignment/details.js
index 9f353a808cfdf..bdc58a72308e0 100644
--- a/ui/app/routes/vault/cluster/access/oidc/assignments/assignment/details.js
+++ b/ui/app/routes/vault/cluster/access/oidc/assignments/assignment/details.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 
 export default class OidcAssignmentDetailsRoute extends Route {}
diff --git a/ui/app/routes/vault/cluster/access/oidc/assignments/assignment/edit.js b/ui/app/routes/vault/cluster/access/oidc/assignments/assignment/edit.js
index 94f96b4659a07..e4dd299a21694 100644
--- a/ui/app/routes/vault/cluster/access/oidc/assignments/assignment/edit.js
+++ b/ui/app/routes/vault/cluster/access/oidc/assignments/assignment/edit.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 
 export default class OidcAssignmentEditRoute extends Route {}
diff --git a/ui/app/routes/vault/cluster/access/oidc/assignments/create.js b/ui/app/routes/vault/cluster/access/oidc/assignments/create.js
index fc650930fc3a9..414ae467b52f5 100644
--- a/ui/app/routes/vault/cluster/access/oidc/assignments/create.js
+++ b/ui/app/routes/vault/cluster/access/oidc/assignments/create.js
@@ -1,14 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
 
 export default class OidcAssignmentsCreateRoute extends Route {
-  @service store;
-
   model() {
     return this.store.createRecord('oidc/assignment');
   }
diff --git a/ui/app/routes/vault/cluster/access/oidc/assignments/index.js b/ui/app/routes/vault/cluster/access/oidc/assignments/index.js
index 3c25c95405b4e..3956673c517de 100644
--- a/ui/app/routes/vault/cluster/access/oidc/assignments/index.js
+++ b/ui/app/routes/vault/cluster/access/oidc/assignments/index.js
@@ -1,13 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
 
 export default class OidcAssignmentsRoute extends Route {
-  @service store;
   model() {
     return this.store.query('oidc/assignment', {}).catch((err) => {
       if (err.httpStatus === 404) {
diff --git a/ui/app/routes/vault/cluster/access/oidc/clients/client.js b/ui/app/routes/vault/cluster/access/oidc/clients/client.js
index cd90870a32cc0..f2363a6e31ef6 100644
--- a/ui/app/routes/vault/cluster/access/oidc/clients/client.js
+++ b/ui/app/routes/vault/cluster/access/oidc/clients/client.js
@@ -1,14 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
 
 export default class OidcClientRoute extends Route {
-  @service store;
-
   model({ name }) {
     return this.store.findRecord('oidc/client', name);
   }
diff --git a/ui/app/routes/vault/cluster/access/oidc/clients/client/details.js b/ui/app/routes/vault/cluster/access/oidc/clients/client/details.js
index c02c28ea4880a..db38b60589a98 100644
--- a/ui/app/routes/vault/cluster/access/oidc/clients/client/details.js
+++ b/ui/app/routes/vault/cluster/access/oidc/clients/client/details.js
@@ -1,7 +1,2 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 export default class OidcClientDetailsRoute extends Route {}
diff --git a/ui/app/routes/vault/cluster/access/oidc/clients/client/edit.js b/ui/app/routes/vault/cluster/access/oidc/clients/client/edit.js
index a2aee447ebc70..fd4e7a5bb8cfc 100644
--- a/ui/app/routes/vault/cluster/access/oidc/clients/client/edit.js
+++ b/ui/app/routes/vault/cluster/access/oidc/clients/client/edit.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 
 export default class OidcClientEditRoute extends Route {}
diff --git a/ui/app/routes/vault/cluster/access/oidc/clients/client/providers.js b/ui/app/routes/vault/cluster/access/oidc/clients/client/providers.js
index 26f77b3bd56f8..653a50fabc135 100644
--- a/ui/app/routes/vault/cluster/access/oidc/clients/client/providers.js
+++ b/ui/app/routes/vault/cluster/access/oidc/clients/client/providers.js
@@ -1,14 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
 
 export default class OidcClientProvidersRoute extends Route {
-  @service store;
-
   model() {
     const model = this.modelFor('vault.cluster.access.oidc.clients.client');
     return this.store
diff --git a/ui/app/routes/vault/cluster/access/oidc/clients/create.js b/ui/app/routes/vault/cluster/access/oidc/clients/create.js
index 317ec6944bab2..ba86744710930 100644
--- a/ui/app/routes/vault/cluster/access/oidc/clients/create.js
+++ b/ui/app/routes/vault/cluster/access/oidc/clients/create.js
@@ -1,14 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
 
 export default class OidcClientsCreateRoute extends Route {
-  @service store;
-
   model() {
     return this.store.createRecord('oidc/client');
   }
diff --git a/ui/app/routes/vault/cluster/access/oidc/clients/index.js b/ui/app/routes/vault/cluster/access/oidc/clients/index.js
index 4f932de5d62df..08ec2bef288e3 100644
--- a/ui/app/routes/vault/cluster/access/oidc/clients/index.js
+++ b/ui/app/routes/vault/cluster/access/oidc/clients/index.js
@@ -1,12 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 export default class OidcClientsRoute extends Route {
-  @service store;
   @service router;
 
   model() {
diff --git a/ui/app/routes/vault/cluster/access/oidc/index.js b/ui/app/routes/vault/cluster/access/oidc/index.js
index a85a4d6abf83d..f7262a7e9fa1d 100644
--- a/ui/app/routes/vault/cluster/access/oidc/index.js
+++ b/ui/app/routes/vault/cluster/access/oidc/index.js
@@ -1,13 +1,7 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 
 export default class OidcConfigureRoute extends Route {
-  @service store;
   @service router;
 
   beforeModel() {
diff --git a/ui/app/routes/vault/cluster/access/oidc/keys/create.js b/ui/app/routes/vault/cluster/access/oidc/keys/create.js
index c34f8c8fc8057..424e2806c358c 100644
--- a/ui/app/routes/vault/cluster/access/oidc/keys/create.js
+++ b/ui/app/routes/vault/cluster/access/oidc/keys/create.js
@@ -1,14 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
 
 export default class OidcKeysCreateRoute extends Route {
-  @service store;
-
   model() {
     return this.store.createRecord('oidc/key');
   }
diff --git a/ui/app/routes/vault/cluster/access/oidc/keys/index.js b/ui/app/routes/vault/cluster/access/oidc/keys/index.js
index 4e0d8355c5687..5e9b48be99f3a 100644
--- a/ui/app/routes/vault/cluster/access/oidc/keys/index.js
+++ b/ui/app/routes/vault/cluster/access/oidc/keys/index.js
@@ -1,14 +1,5 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-
 export default class OidcKeysRoute extends Route {
-  @service store;
-
   model() {
     return this.store.query('oidc/key', {}).catch((err) => {
       if (err.httpStatus === 404) {
diff --git a/ui/app/routes/vault/cluster/access/oidc/keys/key.js b/ui/app/routes/vault/cluster/access/oidc/keys/key.js
index 84d8865d93864..d537e62c30049 100644
--- a/ui/app/routes/vault/cluster/access/oidc/keys/key.js
+++ b/ui/app/routes/vault/cluster/access/oidc/keys/key.js
@@ -1,14 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
 
 export default class OidcKeyRoute extends Route {
-  @service store;
-
   model({ name }) {
     return this.store.findRecord('oidc/key', name);
   }
diff --git a/ui/app/routes/vault/cluster/access/oidc/keys/key/clients.js b/ui/app/routes/vault/cluster/access/oidc/keys/key/clients.js
index f295cfd7061ab..a96aba0ae9d4e 100644
--- a/ui/app/routes/vault/cluster/access/oidc/keys/key/clients.js
+++ b/ui/app/routes/vault/cluster/access/oidc/keys/key/clients.js
@@ -1,14 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
 
 export default class OidcKeyClientsRoute extends Route {
-  @service store;
-
   async model() {
     const { allowedClientIds } = this.modelFor('vault.cluster.access.oidc.keys.key');
     return await this.store.query('oidc/client', { paramKey: 'client_id', filterFor: allowedClientIds });
diff --git a/ui/app/routes/vault/cluster/access/oidc/keys/key/details.js b/ui/app/routes/vault/cluster/access/oidc/keys/key/details.js
index 6762ec30f7b66..df05a168c427a 100644
--- a/ui/app/routes/vault/cluster/access/oidc/keys/key/details.js
+++ b/ui/app/routes/vault/cluster/access/oidc/keys/key/details.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 
 export default class OidcKeyDetailsRoute extends Route {}
diff --git a/ui/app/routes/vault/cluster/access/oidc/keys/key/edit.js b/ui/app/routes/vault/cluster/access/oidc/keys/key/edit.js
index f21031e3f7d54..c86f197c3f2b9 100644
--- a/ui/app/routes/vault/cluster/access/oidc/keys/key/edit.js
+++ b/ui/app/routes/vault/cluster/access/oidc/keys/key/edit.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 
 export default class OidcKeyEditRoute extends Route {}
diff --git a/ui/app/routes/vault/cluster/access/oidc/providers/create.js b/ui/app/routes/vault/cluster/access/oidc/providers/create.js
index f4d1a36ad9d3a..3a6b9667b567a 100644
--- a/ui/app/routes/vault/cluster/access/oidc/providers/create.js
+++ b/ui/app/routes/vault/cluster/access/oidc/providers/create.js
@@ -1,14 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
 
 export default class OidcProvidersCreateRoute extends Route {
-  @service store;
-
   model() {
     return this.store.createRecord('oidc/provider');
   }
diff --git a/ui/app/routes/vault/cluster/access/oidc/providers/index.js b/ui/app/routes/vault/cluster/access/oidc/providers/index.js
index 5b172e34f8557..82250f19dee93 100644
--- a/ui/app/routes/vault/cluster/access/oidc/providers/index.js
+++ b/ui/app/routes/vault/cluster/access/oidc/providers/index.js
@@ -1,14 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
 
 export default class OidcProvidersRoute extends Route {
-  @service store;
-
   model() {
     return this.store.query('oidc/provider', {}).catch((err) => {
       if (err.httpStatus === 404) {
diff --git a/ui/app/routes/vault/cluster/access/oidc/providers/provider.js b/ui/app/routes/vault/cluster/access/oidc/providers/provider.js
index d658ca39a3cc1..66a8fadaae6c9 100644
--- a/ui/app/routes/vault/cluster/access/oidc/providers/provider.js
+++ b/ui/app/routes/vault/cluster/access/oidc/providers/provider.js
@@ -1,14 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
 
 export default class OidcProviderRoute extends Route {
-  @service store;
-
   model({ name }) {
     return this.store.findRecord('oidc/provider', name);
   }
diff --git a/ui/app/routes/vault/cluster/access/oidc/providers/provider/clients.js b/ui/app/routes/vault/cluster/access/oidc/providers/provider/clients.js
index c7d98a0bd4d45..586a73c13e389 100644
--- a/ui/app/routes/vault/cluster/access/oidc/providers/provider/clients.js
+++ b/ui/app/routes/vault/cluster/access/oidc/providers/provider/clients.js
@@ -1,14 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
 
 export default class OidcProviderClientsRoute extends Route {
-  @service store;
-
   async model() {
     const { allowedClientIds } = this.modelFor('vault.cluster.access.oidc.providers.provider');
     return await this.store.query('oidc/client', { paramKey: 'client_id', filterFor: allowedClientIds });
diff --git a/ui/app/routes/vault/cluster/access/oidc/providers/provider/details.js b/ui/app/routes/vault/cluster/access/oidc/providers/provider/details.js
index 9faa77b17832f..af4d1077d2d1e 100644
--- a/ui/app/routes/vault/cluster/access/oidc/providers/provider/details.js
+++ b/ui/app/routes/vault/cluster/access/oidc/providers/provider/details.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 
 export default class OidcProviderDetailsRoute extends Route {}
diff --git a/ui/app/routes/vault/cluster/access/oidc/providers/provider/edit.js b/ui/app/routes/vault/cluster/access/oidc/providers/provider/edit.js
index ad1e9fc130527..365b2328e2a0e 100644
--- a/ui/app/routes/vault/cluster/access/oidc/providers/provider/edit.js
+++ b/ui/app/routes/vault/cluster/access/oidc/providers/provider/edit.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 
 export default class OidcProviderEditRoute extends Route {}
diff --git a/ui/app/routes/vault/cluster/access/oidc/scopes/create.js b/ui/app/routes/vault/cluster/access/oidc/scopes/create.js
index 65c1a5d644276..cd1862279f466 100644
--- a/ui/app/routes/vault/cluster/access/oidc/scopes/create.js
+++ b/ui/app/routes/vault/cluster/access/oidc/scopes/create.js
@@ -1,14 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
 
 export default class OidcScopesCreateRoute extends Route {
-  @service store;
-
   model() {
     return this.store.createRecord('oidc/scope');
   }
diff --git a/ui/app/routes/vault/cluster/access/oidc/scopes/index.js b/ui/app/routes/vault/cluster/access/oidc/scopes/index.js
index 64383c7dfdfef..e8108980ad5dd 100644
--- a/ui/app/routes/vault/cluster/access/oidc/scopes/index.js
+++ b/ui/app/routes/vault/cluster/access/oidc/scopes/index.js
@@ -1,14 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
 
 export default class OidcScopesRoute extends Route {
-  @service store;
-
   model() {
     return this.store.query('oidc/scope', {}).catch((err) => {
       if (err.httpStatus === 404) {
diff --git a/ui/app/routes/vault/cluster/access/oidc/scopes/scope.js b/ui/app/routes/vault/cluster/access/oidc/scopes/scope.js
index e3ad2260fece6..7a4c5c08dcc6c 100644
--- a/ui/app/routes/vault/cluster/access/oidc/scopes/scope.js
+++ b/ui/app/routes/vault/cluster/access/oidc/scopes/scope.js
@@ -1,14 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
 
 export default class OidcScopeRoute extends Route {
-  @service store;
-
   model({ name }) {
     return this.store.findRecord('oidc/scope', name);
   }
diff --git a/ui/app/routes/vault/cluster/access/oidc/scopes/scope/details.js b/ui/app/routes/vault/cluster/access/oidc/scopes/scope/details.js
index 5973918c9129b..6047afcfc3c04 100644
--- a/ui/app/routes/vault/cluster/access/oidc/scopes/scope/details.js
+++ b/ui/app/routes/vault/cluster/access/oidc/scopes/scope/details.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 
 export default class OidcScopeDetailsRoute extends Route {}
diff --git a/ui/app/routes/vault/cluster/access/oidc/scopes/scope/edit.js b/ui/app/routes/vault/cluster/access/oidc/scopes/scope/edit.js
index 0140ac9e4a621..fc8b61fc087e2 100644
--- a/ui/app/routes/vault/cluster/access/oidc/scopes/scope/edit.js
+++ b/ui/app/routes/vault/cluster/access/oidc/scopes/scope/edit.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 
 export default class OidcScopeEditRoute extends Route {}
diff --git a/ui/app/routes/vault/cluster/auth.js b/ui/app/routes/vault/cluster/auth.js
index fa9866e3ba42a..7bf2e80f933ce 100644
--- a/ui/app/routes/vault/cluster/auth.js
+++ b/ui/app/routes/vault/cluster/auth.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import ClusterRouteBase from './cluster-route-base';
 import config from 'vault/config/environment';
@@ -31,10 +26,7 @@ export default ClusterRouteBase.extend({
 
   afterModel() {
     if (config.welcomeMessage) {
-      this.flashMessages.info(config.welcomeMessage, {
-        sticky: true,
-        priority: 300,
-      });
+      this.flashMessages.stickyInfo(config.welcomeMessage);
     }
   },
 });
diff --git a/ui/app/routes/vault/cluster/clients.js b/ui/app/routes/vault/cluster/clients.js
index b611adf3531f1..84e280887db02 100644
--- a/ui/app/routes/vault/cluster/clients.js
+++ b/ui/app/routes/vault/cluster/clients.js
@@ -1,40 +1,51 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
-import { hash } from 'rsvp';
+import RSVP from 'rsvp';
 import { action } from '@ember/object';
 import getStorage from 'vault/lib/token-storage';
-import { inject as service } from '@ember/service';
-const INPUTTED_START_DATE = 'vault:ui-inputted-start-date';
 
+const INPUTTED_START_DATE = 'vault:ui-inputted-start-date';
 export default class ClientsRoute extends Route {
-  @service store;
   async getVersionHistory() {
-    return this.store
-      .findAll('clients/version-history')
-      .then((response) => {
-        return response.map(({ version, previousVersion, timestampInstalled }) => {
-          return {
-            version,
-            previousVersion,
-            timestampInstalled,
-          };
+    try {
+      let arrayOfModels = [];
+      let response = await this.store.findAll('clients/version-history'); // returns a class with nested models
+      response.forEach((model) => {
+        arrayOfModels.push({
+          id: model.id,
+          previousVersion: model.previousVersion,
+          timestampInstalled: model.timestampInstalled,
         });
-      })
-      .catch(() => []);
+      });
+      return arrayOfModels;
+    } catch (e) {
+      console.debug(e);
+      return [];
+    }
   }
 
-  model() {
-    // swallow config error so activity can show if no config permissions
-    return hash({
-      config: this.store.queryRecord('clients/config', {}).catch(() => {}),
+  async model() {
+    let config = await this.store.queryRecord('clients/config', {}).catch((e) => {
+      console.debug(e);
+      // swallowing error so activity can show if no config permissions
+      return {};
+    });
+
+    return RSVP.hash({
+      config,
       versionHistory: this.getVersionHistory(),
     });
   }
 
+  @action
+  async loading(transition) {
+    // eslint-disable-next-line ember/no-controller-access-in-routes
+    let controller = this.controllerFor(this.routeName);
+    controller.set('currentlyLoading', true);
+    transition.promise.finally(function () {
+      controller.set('currentlyLoading', false);
+    });
+  }
+
   @action
   deactivate() {
     // when navigating away from parent route, delete manually inputted license start date
diff --git a/ui/app/routes/vault/cluster/clients/config.js b/ui/app/routes/vault/cluster/clients/config.js
index b1046dbcd86dd..a44ea7fed1b86 100644
--- a/ui/app/routes/vault/cluster/clients/config.js
+++ b/ui/app/routes/vault/cluster/clients/config.js
@@ -1,14 +1,5 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-
 export default class ConfigRoute extends Route {
-  @service store;
-
   model() {
     return this.store.queryRecord('clients/config', {});
   }
diff --git a/ui/app/routes/vault/cluster/clients/current.js b/ui/app/routes/vault/cluster/clients/current.js
new file mode 100644
index 0000000000000..7cf8acf518abc
--- /dev/null
+++ b/ui/app/routes/vault/cluster/clients/current.js
@@ -0,0 +1,14 @@
+import Route from '@ember/routing/route';
+import RSVP from 'rsvp';
+
+export default class CurrentRoute extends Route {
+  async model() {
+    let parentModel = this.modelFor('vault.cluster.clients');
+
+    return RSVP.hash({
+      config: parentModel.config,
+      monthly: await this.store.queryRecord('clients/monthly', {}),
+      versionHistory: parentModel.versionHistory,
+    });
+  }
+}
diff --git a/ui/app/routes/vault/cluster/clients/dashboard.js b/ui/app/routes/vault/cluster/clients/dashboard.js
deleted file mode 100644
index 883d4aec3ab24..0000000000000
--- a/ui/app/routes/vault/cluster/clients/dashboard.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Route from '@ember/routing/route';
-import getStorage from 'vault/lib/token-storage';
-import { inject as service } from '@ember/service';
-import timestamp from 'core/utils/timestamp';
-
-export default class DashboardRoute extends Route {
-  @service store;
-  currentDate = timestamp.now().toISOString();
-
-  async getActivity(start_time) {
-    // on init ONLY make network request if we have a start_time
-    return start_time
-      ? await this.store.queryRecord('clients/activity', {
-          start_time: { timestamp: start_time },
-          end_time: { timestamp: this.currentDate },
-        })
-      : {};
-  }
-
-  async getLicenseStartTime() {
-    try {
-      const license = await this.store.queryRecord('license', {});
-      // if license.startTime is 'undefined' return 'null' for consistency
-      return license.startTime || getStorage().getItem('vault:ui-inputted-start-date') || null;
-    } catch (e) {
-      // return null so user can input date manually
-      // if already inputted manually, will be in localStorage
-      return getStorage().getItem('vault:ui-inputted-start-date') || null;
-    }
-  }
-
-  async model() {
-    const { config, versionHistory } = this.modelFor('vault.cluster.clients');
-    const licenseStart = await this.getLicenseStartTime();
-    const activity = await this.getActivity(licenseStart);
-    return {
-      config,
-      versionHistory,
-      activity,
-      licenseStartTimestamp: licenseStart,
-      currentDate: this.currentDate,
-    };
-  }
-}
diff --git a/ui/app/routes/vault/cluster/clients/edit.js b/ui/app/routes/vault/cluster/clients/edit.js
index d296d9aa13c9d..51f0bb9b86c43 100644
--- a/ui/app/routes/vault/cluster/clients/edit.js
+++ b/ui/app/routes/vault/cluster/clients/edit.js
@@ -1,14 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
 
 export default Route.extend({
-  store: service(),
-
   model() {
     return this.store.queryRecord('clients/config', {});
   },
diff --git a/ui/app/routes/vault/cluster/clients/history.js b/ui/app/routes/vault/cluster/clients/history.js
new file mode 100644
index 0000000000000..17914db89d34f
--- /dev/null
+++ b/ui/app/routes/vault/cluster/clients/history.js
@@ -0,0 +1,43 @@
+import Route from '@ember/routing/route';
+import { isSameMonth } from 'date-fns';
+import RSVP from 'rsvp';
+import getStorage from 'vault/lib/token-storage';
+import { parseRFC3339 } from 'core/utils/date-formatters';
+
+const INPUTTED_START_DATE = 'vault:ui-inputted-start-date';
+export default class HistoryRoute extends Route {
+  async getActivity(start_time) {
+    if (isSameMonth(new Date(start_time), new Date())) {
+      // triggers empty state to manually enter date if license begins in current month
+      return { isLicenseDateError: true };
+    }
+    // on init ONLY make network request if we have a start_time
+    return start_time ? await this.store.queryRecord('clients/activity', { start_time }) : {};
+  }
+
+  async getLicenseStartTime() {
+    try {
+      let license = await this.store.queryRecord('license', {});
+      // if license.startTime is 'undefined' return 'null' for consistency
+      return license.startTime || getStorage().getItem(INPUTTED_START_DATE) || null;
+    } catch (e) {
+      // return null so user can input date manually
+      // if already inputted manually, will be in localStorage
+      return getStorage().getItem(INPUTTED_START_DATE) || null;
+    }
+  }
+
+  async model() {
+    let parentModel = this.modelFor('vault.cluster.clients');
+    let licenseStart = await this.getLicenseStartTime();
+    let activity = await this.getActivity(licenseStart);
+
+    return RSVP.hash({
+      config: parentModel.config,
+      activity,
+      startTimeFromLicense: parseRFC3339(licenseStart),
+      endTimeFromResponse: parseRFC3339(activity?.endTime),
+      versionHistory: parentModel.versionHistory,
+    });
+  }
+}
diff --git a/ui/app/routes/vault/cluster/clients/index.js b/ui/app/routes/vault/cluster/clients/index.js
deleted file mode 100644
index 940f6347c258f..0000000000000
--- a/ui/app/routes/vault/cluster/clients/index.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-
-export default class ClientsIndexRoute extends Route {
-  @service router;
-
-  redirect() {
-    this.router.transitionTo('vault.cluster.clients.dashboard');
-  }
-}
diff --git a/ui/app/routes/vault/cluster/cluster-route-base.js b/ui/app/routes/vault/cluster/cluster-route-base.js
index 30972254a06dd..d4387968d7fba 100644
--- a/ui/app/routes/vault/cluster/cluster-route-base.js
+++ b/ui/app/routes/vault/cluster/cluster-route-base.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 // this is the base route for
 // all of the CLUSTER_ROUTES that are states before you can use vault
 //
diff --git a/ui/app/routes/vault/cluster/index.js b/ui/app/routes/vault/cluster/index.js
index 2397a7e34d57a..13f8d49113922 100644
--- a/ui/app/routes/vault/cluster/index.js
+++ b/ui/app/routes/vault/cluster/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 
 export default Route.extend({
diff --git a/ui/app/routes/vault/cluster/init.js b/ui/app/routes/vault/cluster/init.js
index cca869128b6b6..1495fc503fc3c 100644
--- a/ui/app/routes/vault/cluster/init.js
+++ b/ui/app/routes/vault/cluster/init.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ClusterRoute from './cluster-route-base';
 
 export default ClusterRoute.extend({});
diff --git a/ui/app/routes/vault/cluster/license.js b/ui/app/routes/vault/cluster/license.js
index a295df6a1b9e4..373f0f85d77bc 100644
--- a/ui/app/routes/vault/cluster/license.js
+++ b/ui/app/routes/vault/cluster/license.js
@@ -1,16 +1,9 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 import ClusterRoute from 'vault/mixins/cluster-route';
 import { inject as service } from '@ember/service';
 
 export default Route.extend(ClusterRoute, {
-  store: service(),
   version: service(),
-
   beforeModel() {
     if (this.version.isOSS) {
       this.transitionTo('vault.cluster');
diff --git a/ui/app/routes/vault/cluster/logout.js b/ui/app/routes/vault/cluster/logout.js
index 18ff383ba0497..11913ffa43a92 100644
--- a/ui/app/routes/vault/cluster/logout.js
+++ b/ui/app/routes/vault/cluster/logout.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Ember from 'ember';
 import { computed } from '@ember/object';
 import { inject as service } from '@ember/service';
diff --git a/ui/app/routes/vault/cluster/mfa-setup.js b/ui/app/routes/vault/cluster/mfa-setup.js
index b8aa955a6e659..e8f10fa096ac7 100644
--- a/ui/app/routes/vault/cluster/mfa-setup.js
+++ b/ui/app/routes/vault/cluster/mfa-setup.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 
 export default class MfaSetupRoute extends Route {}
diff --git a/ui/app/routes/vault/cluster/oidc-callback.js b/ui/app/routes/vault/cluster/oidc-callback.js
index 39c4f3d55fe3f..cbeb1d29e7d8e 100644
--- a/ui/app/routes/vault/cluster/oidc-callback.js
+++ b/ui/app/routes/vault/cluster/oidc-callback.js
@@ -1,43 +1,32 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 
-export function getParamsForCallback(qp, searchString) {
-  const queryString = decodeURIComponent(searchString);
-  let { path, code, state, namespace } = qp;
-  // namespace from state takes precedence over the cluster's ns
-  if (state?.includes(',ns=')) {
-    [state, namespace] = state.split(',ns=');
-  }
-  // some SSO providers do not return a url-encoded state param
-  // check for namespace using URLSearchParams instead of paramsFor
-  const urlParams = new URLSearchParams(queryString);
-  const checkState = urlParams.get('state');
-  if (checkState?.includes(',ns=')) {
-    [state, namespace] = checkState.split(',ns=');
-  }
-  path = window.decodeURIComponent(path);
-  const payload = { source: 'oidc-callback', path: path || '', code: code || '', state: state || '' };
-  if (namespace) {
-    payload.namespace = namespace;
-  }
-  return payload;
-}
-
 export default Route.extend({
   templateName: 'vault/cluster/oidc-callback',
   model() {
     // left blank so we render the template immediately
   },
   afterModel() {
-    const { auth_path: path, code, state } = this.paramsFor(this.routeName);
-    const { namespaceQueryParam: namespace } = this.paramsFor('vault.cluster');
-    const queryString = window.location.search;
-    const payload = getParamsForCallback({ path, code, state, namespace }, queryString);
-    window.opener.postMessage(payload, window.origin);
+    let { auth_path: path, code, state } = this.paramsFor(this.routeName);
+    let { namespaceQueryParam: namespace } = this.paramsFor('vault.cluster');
+    // namespace from state takes precedence over the cluster's ns
+    if (state?.includes(',ns=')) {
+      [state, namespace] = state.split(',ns=');
+    }
+    // some SSO providers do not return a url-encoded state param
+    // check for namespace using URLSearchParams instead of paramsFor
+    const queryString = decodeURIComponent(window.location.search);
+    const urlParams = new URLSearchParams(queryString);
+    const checkState = urlParams.get('state');
+    if (checkState?.includes(',ns=')) {
+      [state, namespace] = checkState.split(',ns=');
+    }
+    path = window.decodeURIComponent(path);
+    const source = 'oidc-callback'; // required by event listener in auth-jwt component
+    let queryParams = { source, path: path || '', code: code || '', state: state || '' };
+    if (namespace) {
+      queryParams.namespace = namespace;
+    }
+    window.opener.postMessage(queryParams, window.origin);
   },
   setupController(controller) {
     this._super(...arguments);
diff --git a/ui/app/routes/vault/cluster/oidc-provider-ns.js b/ui/app/routes/vault/cluster/oidc-provider-ns.js
index d056e4e2ee3a8..cee41094b21c8 100644
--- a/ui/app/routes/vault/cluster/oidc-provider-ns.js
+++ b/ui/app/routes/vault/cluster/oidc-provider-ns.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import VaultClusterOidcProviderRoute from './oidc-provider';
 
 export default class VaultClusterOidcProviderNsRoute extends VaultClusterOidcProviderRoute {}
diff --git a/ui/app/routes/vault/cluster/oidc-provider.js b/ui/app/routes/vault/cluster/oidc-provider.js
index 849d07e7998a9..cac51199616a8 100644
--- a/ui/app/routes/vault/cluster/oidc-provider.js
+++ b/ui/app/routes/vault/cluster/oidc-provider.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Ember from 'ember';
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
@@ -21,7 +16,7 @@ export default class VaultClusterOidcProviderRoute extends Route {
 
   _redirect(url, params) {
     if (!url) return;
-    const redir = this._buildUrl(url, params);
+    let redir = this._buildUrl(url, params);
     if (Ember.testing) {
       return redir;
     }
@@ -30,7 +25,7 @@ export default class VaultClusterOidcProviderRoute extends Route {
 
   beforeModel(transition) {
     const currentToken = this.auth.get('currentTokenName');
-    const qp = transition.to.queryParams;
+    let qp = transition.to.queryParams;
     // remove redirect_to if carried over from auth
     qp.redirect_to = null;
     if (!currentToken && 'none' === qp.prompt?.toLowerCase()) {
@@ -39,7 +34,7 @@ export default class VaultClusterOidcProviderRoute extends Route {
         error: 'login_required',
       });
     } else if (!currentToken || 'login' === qp.prompt?.toLowerCase()) {
-      const logout = !!currentToken;
+      let logout = !!currentToken;
       if ('login' === qp.prompt?.toLowerCase()) {
         // need to remove before redirect to avoid infinite loop
         qp.prompt = null;
@@ -53,7 +48,7 @@ export default class VaultClusterOidcProviderRoute extends Route {
   }
 
   _redirectToAuth({ provider_name, namespace = null, qp, logout = false }) {
-    const { cluster_name } = this.paramsFor('vault.cluster');
+    let { cluster_name } = this.paramsFor('vault.cluster');
     let url = namespace
       ? this.router.urlFor(NS_PROVIDER, cluster_name, namespace, provider_name, { queryParams: qp })
       : this.router.urlFor(PROVIDER, cluster_name, provider_name, { queryParams: qp });
@@ -66,7 +61,7 @@ export default class VaultClusterOidcProviderRoute extends Route {
       this.auth.deleteCurrentToken();
     }
     // o param can be anything, as long as it's present the auth page will change
-    const queryParams = {
+    let queryParams = {
       redirect_to: url,
       o: provider_name,
     };
@@ -78,7 +73,7 @@ export default class VaultClusterOidcProviderRoute extends Route {
 
   _buildUrl(urlString, params) {
     try {
-      const url = new URL(urlString);
+      let url = new URL(urlString);
       Object.keys(params).forEach((key) => {
         if (params[key]) {
           url.searchParams.append(key, params[key]);
@@ -86,21 +81,21 @@ export default class VaultClusterOidcProviderRoute extends Route {
       });
       return url;
     } catch (e) {
-      console.debug('DEBUG: parsing url failed for', urlString); // eslint-disable-line
+      console.debug('DEBUG: parsing url failed for', urlString);
       throw new Error('Invalid URL');
     }
   }
 
   _handleSuccess(response, baseUrl, state) {
     const { code } = response;
-    const redirectUrl = this._buildUrl(baseUrl, { code, state });
+    let redirectUrl = this._buildUrl(baseUrl, { code, state });
     if (Ember.testing) {
       return { redirectUrl };
     }
     this.win.location.replace(redirectUrl);
   }
   _handleError(errorResp, baseUrl) {
-    const redirectUrl = this._buildUrl(baseUrl, { ...errorResp });
+    let redirectUrl = this._buildUrl(baseUrl, { ...errorResp });
     if (Ember.testing) {
       return { redirectUrl };
     }
@@ -113,8 +108,8 @@ export default class VaultClusterOidcProviderRoute extends Route {
    * @returns object with provider_name (string), qp (object of query params), decodedRedirect (string, FQDN)
    */
   _getInfoFromParams(params) {
-    const { provider_name, namespace, ...qp } = params;
-    const decodedRedirect = decodeURI(qp.redirect_uri);
+    let { provider_name, namespace, ...qp } = params;
+    let decodedRedirect = decodeURI(qp.redirect_uri);
     return {
       provider_name,
       qp,
@@ -124,9 +119,9 @@ export default class VaultClusterOidcProviderRoute extends Route {
   }
 
   async model(params) {
-    const modelInfo = this._getInfoFromParams(params);
-    const { qp, decodedRedirect, ...routeParams } = modelInfo;
-    const endpoint = this._buildUrl(
+    let modelInfo = this._getInfoFromParams(params);
+    let { qp, decodedRedirect, ...routeParams } = modelInfo;
+    let endpoint = this._buildUrl(
       `${this.win.origin}/v1/identity/oidc/provider/${routeParams.provider_name}/authorize`,
       qp
     );
@@ -146,8 +141,8 @@ export default class VaultClusterOidcProviderRoute extends Route {
       }
       return this._handleSuccess(response, decodedRedirect, qp.state);
     } catch (errorRes) {
-      const resp = await errorRes.json();
-      const code = resp.error;
+      let resp = await errorRes.json();
+      let code = resp.error;
       if (code === 'max_age_violation' || resp?.errors?.includes('permission denied')) {
         this._redirectToAuth({ ...routeParams, qp, logout: true });
       } else if (code === 'invalid_redirect_uri') {
diff --git a/ui/app/routes/vault/cluster/policies.js b/ui/app/routes/vault/cluster/policies.js
index aead6a4790c6f..a33816e9b6ef7 100644
--- a/ui/app/routes/vault/cluster/policies.js
+++ b/ui/app/routes/vault/cluster/policies.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import Route from '@ember/routing/route';
 import ClusterRoute from 'vault/mixins/cluster-route';
@@ -19,7 +14,7 @@ export default Route.extend(ClusterRoute, {
   },
 
   model(params) {
-    const policyType = params.type;
+    let policyType = params.type;
     if (!ALLOWED_TYPES.includes(policyType)) {
       return this.transitionTo(this.routeName, ALLOWED_TYPES[0]);
     }
diff --git a/ui/app/routes/vault/cluster/policies/create.js b/ui/app/routes/vault/cluster/policies/create.js
index a16840df4684e..24dbb09ccfd34 100644
--- a/ui/app/routes/vault/cluster/policies/create.js
+++ b/ui/app/routes/vault/cluster/policies/create.js
@@ -1,15 +1,9 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import Route from '@ember/routing/route';
 import UnloadModelRoute from 'vault/mixins/unload-model-route';
 import UnsavedModelRoute from 'vault/mixins/unsaved-model-route';
 
 export default Route.extend(UnloadModelRoute, UnsavedModelRoute, {
-  store: service(),
   version: service(),
 
   model() {
diff --git a/ui/app/routes/vault/cluster/policies/index.js b/ui/app/routes/vault/cluster/policies/index.js
index f088a4dd38c7f..04827117808cf 100644
--- a/ui/app/routes/vault/cluster/policies/index.js
+++ b/ui/app/routes/vault/cluster/policies/index.js
@@ -1,15 +1,9 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import Route from '@ember/routing/route';
 import ClusterRoute from 'vault/mixins/cluster-route';
 import ListRoute from 'core/mixins/list-route';
 
 export default Route.extend(ClusterRoute, ListRoute, {
-  store: service(),
   version: service(),
 
   shouldReturnEmptyModel(policyType, version) {
@@ -17,7 +11,7 @@ export default Route.extend(ClusterRoute, ListRoute, {
   },
 
   model(params) {
-    const policyType = this.policyType();
+    let policyType = this.policyType();
     if (this.shouldReturnEmptyModel(policyType, this.version)) {
       return;
     }
@@ -60,7 +54,6 @@ export default Route.extend(ClusterRoute, ListRoute, {
       controller.set('filter', '');
     }
   },
-
   actions: {
     willTransition(transition) {
       window.scrollTo(0, 0);
diff --git a/ui/app/routes/vault/cluster/policy.js b/ui/app/routes/vault/cluster/policy.js
index 1241f78240604..69ac6db70247c 100644
--- a/ui/app/routes/vault/cluster/policy.js
+++ b/ui/app/routes/vault/cluster/policy.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import Route from '@ember/routing/route';
 import ClusterRoute from 'vault/mixins/cluster-route';
@@ -17,7 +12,7 @@ export default Route.extend(ClusterRoute, {
     });
   },
   model(params) {
-    const policyType = params.type;
+    let policyType = params.type;
     if (!ALLOWED_TYPES.includes(policyType)) {
       return this.transitionTo('vault.cluster.policies', ALLOWED_TYPES[0]);
     }
diff --git a/ui/app/routes/vault/cluster/policy/edit.js b/ui/app/routes/vault/cluster/policy/edit.js
index ddc0f5a7f46dd..c0743fc7546d5 100644
--- a/ui/app/routes/vault/cluster/policy/edit.js
+++ b/ui/app/routes/vault/cluster/policy/edit.js
@@ -1,9 +1,4 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import UnsavedModelRoute from 'vault/mixins/unsaved-model-route';
 import ShowRoute from './show';
 
-export default ShowRoute.extend(UnsavedModelRoute, {});
+export default ShowRoute.extend(UnsavedModelRoute);
diff --git a/ui/app/routes/vault/cluster/policy/index.js b/ui/app/routes/vault/cluster/policy/index.js
index 76c71e777a88e..47b03d9db6952 100644
--- a/ui/app/routes/vault/cluster/policy/index.js
+++ b/ui/app/routes/vault/cluster/policy/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 
 export default Route.extend({
diff --git a/ui/app/routes/vault/cluster/policy/show.js b/ui/app/routes/vault/cluster/policy/show.js
index 8194b1a3bfe43..4fa0c1b5f2a0e 100644
--- a/ui/app/routes/vault/cluster/policy/show.js
+++ b/ui/app/routes/vault/cluster/policy/show.js
@@ -1,26 +1,21 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { hash } from 'rsvp';
+import { inject as service } from '@ember/service';
 import Route from '@ember/routing/route';
 import UnloadModelRoute from 'vault/mixins/unload-model-route';
-import { inject as service } from '@ember/service';
 
 export default Route.extend(UnloadModelRoute, {
   store: service(),
 
   beforeModel() {
     const params = this.paramsFor(this.routeName);
-    const policyType = this.policyType();
+    let policyType = this.policyType();
     if (policyType === 'acl' && params.policy_name === 'root') {
       return this.transitionTo('vault.cluster.policies', 'acl');
     }
   },
 
   model(params) {
-    const type = this.policyType();
+    let type = this.policyType();
     return hash({
       policy: this.store.findRecord(`policy/${type}`, params.policy_name),
       capabilities: this.store.findRecord('capabilities', `sys/policies/${type}/${params.policy_name}`),
diff --git a/ui/app/routes/vault/cluster/redirect.js b/ui/app/routes/vault/cluster/redirect.js
index f80e638655dc6..2f58ddfd2e403 100644
--- a/ui/app/routes/vault/cluster/redirect.js
+++ b/ui/app/routes/vault/cluster/redirect.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 import { AUTH, CLUSTER } from 'vault/lib/route-paths';
diff --git a/ui/app/routes/vault/cluster/replication-dr-promote/details.js b/ui/app/routes/vault/cluster/replication-dr-promote/details.js
index 4f504a580c523..99614cc980de1 100644
--- a/ui/app/routes/vault/cluster/replication-dr-promote/details.js
+++ b/ui/app/routes/vault/cluster/replication-dr-promote/details.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import Base from '../cluster-route-base';
 
diff --git a/ui/app/routes/vault/cluster/replication-dr-promote/index.js b/ui/app/routes/vault/cluster/replication-dr-promote/index.js
index 4f504a580c523..99614cc980de1 100644
--- a/ui/app/routes/vault/cluster/replication-dr-promote/index.js
+++ b/ui/app/routes/vault/cluster/replication-dr-promote/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import Base from '../cluster-route-base';
 
diff --git a/ui/app/routes/vault/cluster/secrets.js b/ui/app/routes/vault/cluster/secrets.js
index d2ddd1e4beb1f..e0b62295b1a1d 100644
--- a/ui/app/routes/vault/cluster/secrets.js
+++ b/ui/app/routes/vault/cluster/secrets.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 import ClusterRoute from 'vault/mixins/cluster-route';
 
diff --git a/ui/app/routes/vault/cluster/secrets/backend.js b/ui/app/routes/vault/cluster/secrets/backend.js
index 99a97b4a07c1a..28754e3c4bc01 100644
--- a/ui/app/routes/vault/cluster/secrets/backend.js
+++ b/ui/app/routes/vault/cluster/secrets/backend.js
@@ -1,18 +1,11 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import Route from '@ember/routing/route';
 export default Route.extend({
-  store: service(),
   flashMessages: service(),
   secretMountPath: service(),
   oldModel: null,
-
   model(params) {
-    const { backend } = params;
+    let { backend } = params;
     this.secretMountPath.update(backend);
     return this.store
       .query('secret-engine', {
@@ -26,7 +19,7 @@ export default Route.extend({
   },
 
   afterModel(model, transition) {
-    const path = model && model.get('path');
+    let path = model && model.get('path');
     if (transition.targetName === this.routeName) {
       return this.replaceWith('vault.cluster.secrets.backend.list-root', path);
     }
diff --git a/ui/app/routes/vault/cluster/secrets/backend/actions.js b/ui/app/routes/vault/cluster/secrets/backend/actions.js
index cc9e12f1bbb9b..a33e06d93fb49 100644
--- a/ui/app/routes/vault/cluster/secrets/backend/actions.js
+++ b/ui/app/routes/vault/cluster/secrets/backend/actions.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import EditBase from './secret-edit';
 import utils from 'vault/lib/key-utils';
 
diff --git a/ui/app/routes/vault/cluster/secrets/backend/configuration.js b/ui/app/routes/vault/cluster/secrets/backend/configuration.js
index 0e3f591a1effe..6539bbc8461e5 100644
--- a/ui/app/routes/vault/cluster/secrets/backend/configuration.js
+++ b/ui/app/routes/vault/cluster/secrets/backend/configuration.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import Route from '@ember/routing/route';
 
@@ -11,7 +6,7 @@ export default Route.extend({
   async model() {
     const backend = this.modelFor('vault.cluster.secrets.backend');
     if (backend.isV2KV) {
-      const canRead = await this.store
+      let canRead = await this.store
         .findRecord('capabilities', `${backend.id}/config`)
         .then((response) => response.canRead);
       // only set these config params if they can read the config endpoint.
diff --git a/ui/app/routes/vault/cluster/secrets/backend/create-root.js b/ui/app/routes/vault/cluster/secrets/backend/create-root.js
index d8e8c0306d99c..8622711c78ebe 100644
--- a/ui/app/routes/vault/cluster/secrets/backend/create-root.js
+++ b/ui/app/routes/vault/cluster/secrets/backend/create-root.js
@@ -1,24 +1,19 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { hash } from 'rsvp';
 import { inject as service } from '@ember/service';
 import EditBase from './secret-edit';
 
-const secretModel = (store, backend, key) => {
-  const backendModel = store.peekRecord('secret-engine', backend);
-  const modelType = backendModel.modelTypeForKV;
+let secretModel = (store, backend, key) => {
+  let backendModel = store.peekRecord('secret-engine', backend);
+  let modelType = backendModel.get('modelTypeForKV');
   if (modelType !== 'secret-v2') {
-    const model = store.createRecord(modelType, {
+    let model = store.createRecord(modelType, {
       path: key,
     });
     return model;
   }
-  const secret = store.createRecord(modelType);
+  let secret = store.createRecord(modelType);
   secret.set('engine', backendModel);
-  const version = store.createRecord('secret-v2-version', {
+  let version = store.createRecord('secret-v2-version', {
     path: key,
   });
   secret.set('selectedVersion', version);
@@ -26,7 +21,7 @@ const secretModel = (store, backend, key) => {
 };
 
 const transformModel = (queryParams) => {
-  const modelType = 'transform';
+  let modelType = 'transform';
   if (!queryParams || !queryParams.itemType) return modelType;
 
   return `${modelType}/${queryParams.itemType}`;
diff --git a/ui/app/routes/vault/cluster/secrets/backend/create.js b/ui/app/routes/vault/cluster/secrets/backend/create.js
index 5a4e62a8732d7..3b45ac002b681 100644
--- a/ui/app/routes/vault/cluster/secrets/backend/create.js
+++ b/ui/app/routes/vault/cluster/secrets/backend/create.js
@@ -1,14 +1,9 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 
 export default Route.extend({
   beforeModel() {
-    const { secret, initialKey } = this.paramsFor(this.routeName);
-    const qp = initialKey || secret;
+    let { secret, initialKey } = this.paramsFor(this.routeName);
+    let qp = initialKey || secret;
     return this.transitionTo('vault.cluster.secrets.backend.create-root', {
       queryParams: { initialKey: qp },
     });
diff --git a/ui/app/routes/vault/cluster/secrets/backend/credentials-root.js b/ui/app/routes/vault/cluster/secrets/backend/credentials-root.js
index 2f652b3864a48..cbf926c3a54e1 100644
--- a/ui/app/routes/vault/cluster/secrets/backend/credentials-root.js
+++ b/ui/app/routes/vault/cluster/secrets/backend/credentials-root.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from './credentials';
diff --git a/ui/app/routes/vault/cluster/secrets/backend/credentials.js b/ui/app/routes/vault/cluster/secrets/backend/credentials.js
index 87b825afed09a..f5c0680710f50 100644
--- a/ui/app/routes/vault/cluster/secrets/backend/credentials.js
+++ b/ui/app/routes/vault/cluster/secrets/backend/credentials.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { resolve } from 'rsvp';
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
@@ -24,7 +19,7 @@ export default Route.extend({
     if (backend != 'ssh') {
       return;
     }
-    const modelType = 'ssh-otp-credential';
+    let modelType = 'ssh-otp-credential';
     return this.pathHelp.getNewModel(modelType, backend);
   },
 
@@ -35,7 +30,7 @@ export default Route.extend({
       }
       // Unless it's a control group error, we want to pass back error info
       // so we can render it on the GenerateCredentialsDatabase component
-      const status = error?.httpStatus;
+      let status = error?.httpStatus;
       let title;
       let message = `We ran into a problem and could not continue: ${
         error?.errors ? error.errors[0] : 'See Vault logs for details.'
@@ -55,11 +50,11 @@ export default Route.extend({
   },
 
   async model(params) {
-    const role = params.secret;
-    const backendModel = this.backendModel();
-    const backendPath = backendModel.get('id');
-    const backendType = backendModel.get('type');
-    const roleType = params.roleType;
+    let role = params.secret;
+    let backendModel = this.backendModel();
+    let backendPath = backendModel.get('id');
+    let backendType = backendModel.get('type');
+    let roleType = params.roleType;
     let dbCred;
     if (backendType === 'database') {
       dbCred = await this.getDatabaseCredential(backendPath, role, roleType);
diff --git a/ui/app/routes/vault/cluster/secrets/backend/diff.js b/ui/app/routes/vault/cluster/secrets/backend/diff.js
index 294480106b390..6ffb2e95dc994 100644
--- a/ui/app/routes/vault/cluster/secrets/backend/diff.js
+++ b/ui/app/routes/vault/cluster/secrets/backend/diff.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 
@@ -10,12 +5,12 @@ export default class diff extends Route {
   @service store;
 
   beforeModel() {
-    const { backend } = this.paramsFor('vault.cluster.secrets.backend');
+    let { backend } = this.paramsFor('vault.cluster.secrets.backend');
     this.backend = backend;
   }
 
   model(params) {
-    const { id } = params;
+    let { id } = params;
     return this.store.queryRecord('secret-v2', {
       backend: this.backend,
       id,
diff --git a/ui/app/routes/vault/cluster/secrets/backend/edit-metadata.js b/ui/app/routes/vault/cluster/secrets/backend/edit-metadata.js
index 9d46a72a869bd..2d033069d3d1c 100644
--- a/ui/app/routes/vault/cluster/secrets/backend/edit-metadata.js
+++ b/ui/app/routes/vault/cluster/secrets/backend/edit-metadata.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Metadata from './metadata';
 
 export default class EditMetadataRoute extends Metadata {}
diff --git a/ui/app/routes/vault/cluster/secrets/backend/edit-root.js b/ui/app/routes/vault/cluster/secrets/backend/edit-root.js
index fa2cc7757f332..58cfd6a1cd78f 100644
--- a/ui/app/routes/vault/cluster/secrets/backend/edit-root.js
+++ b/ui/app/routes/vault/cluster/secrets/backend/edit-root.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from './edit';
diff --git a/ui/app/routes/vault/cluster/secrets/backend/edit.js b/ui/app/routes/vault/cluster/secrets/backend/edit.js
index 1d353ae10ec25..1f4f747340857 100644
--- a/ui/app/routes/vault/cluster/secrets/backend/edit.js
+++ b/ui/app/routes/vault/cluster/secrets/backend/edit.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import EditBase from './secret-edit';
 
 export default EditBase.extend({
diff --git a/ui/app/routes/vault/cluster/secrets/backend/index.js b/ui/app/routes/vault/cluster/secrets/backend/index.js
index 56a271b7cb1c4..d370ba08e5c90 100644
--- a/ui/app/routes/vault/cluster/secrets/backend/index.js
+++ b/ui/app/routes/vault/cluster/secrets/backend/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 
 export default Route.extend({
diff --git a/ui/app/routes/vault/cluster/secrets/backend/list-root.js b/ui/app/routes/vault/cluster/secrets/backend/list-root.js
index eb7ed18e3103c..ea1fedd0a52f6 100644
--- a/ui/app/routes/vault/cluster/secrets/backend/list-root.js
+++ b/ui/app/routes/vault/cluster/secrets/backend/list-root.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from './list';
diff --git a/ui/app/routes/vault/cluster/secrets/backend/list.js b/ui/app/routes/vault/cluster/secrets/backend/list.js
index 575b5b718b163..dd5fbfd3500a9 100644
--- a/ui/app/routes/vault/cluster/secrets/backend/list.js
+++ b/ui/app/routes/vault/cluster/secrets/backend/list.js
@@ -1,28 +1,17 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { set } from '@ember/object';
 import { hash, all } from 'rsvp';
 import Route from '@ember/routing/route';
 import { supportedSecretBackends } from 'vault/helpers/supported-secret-backends';
-import { allEngines } from 'vault/helpers/mountable-secret-engines';
 import { inject as service } from '@ember/service';
 import { normalizePath } from 'vault/utils/path-encoding-helpers';
-import { assert } from '@ember/debug';
 
 const SUPPORTED_BACKENDS = supportedSecretBackends();
 
 export default Route.extend({
-  store: service(),
   templateName: 'vault/cluster/secrets/backend/list',
   pathHelp: service('path-help'),
-  router: service(),
-
   // By default assume user doesn't have permissions
   noMetadataPermissions: true,
-
   queryParams: {
     page: {
       refreshModel: true,
@@ -55,43 +44,37 @@ export default Route.extend({
   },
 
   secretParam() {
-    const { secret } = this.paramsFor(this.routeName);
+    let { secret } = this.paramsFor(this.routeName);
     return secret ? normalizePath(secret) : '';
   },
 
   enginePathParam() {
-    const { backend } = this.paramsFor('vault.cluster.secrets.backend');
+    let { backend } = this.paramsFor('vault.cluster.secrets.backend');
     return backend;
   },
 
   beforeModel() {
-    const secret = this.secretParam();
-    const backend = this.enginePathParam();
-    const { tab } = this.paramsFor('vault.cluster.secrets.backend.list-root');
-    const secretEngine = this.store.peekRecord('secret-engine', backend);
-    const type = secretEngine?.engineType;
-    assert('secretEngine.engineType is not defined', !!type);
-    const engineRoute = allEngines().findBy('type', type)?.engineRoute;
-
+    let secret = this.secretParam();
+    let backend = this.enginePathParam();
+    let { tab } = this.paramsFor('vault.cluster.secrets.backend.list-root');
+    let secretEngine = this.store.peekRecord('secret-engine', backend);
+    let type = secretEngine && secretEngine.get('engineType');
     if (!type || !SUPPORTED_BACKENDS.includes(type)) {
-      return this.router.transitionTo('vault.cluster.secrets');
+      return this.transitionTo('vault.cluster.secrets');
     }
     if (this.routeName === 'vault.cluster.secrets.backend.list' && !secret.endsWith('/')) {
-      return this.router.replaceWith('vault.cluster.secrets.backend.list', secret + '/');
-    }
-    if (engineRoute) {
-      return this.router.transitionTo(`vault.cluster.secrets.backend.${engineRoute}`, backend);
+      return this.replaceWith('vault.cluster.secrets.backend.list', secret + '/');
     }
-    const modelType = this.getModelType(backend, tab);
+    let modelType = this.getModelType(backend, tab);
     return this.pathHelp.getNewModel(modelType, backend).then(() => {
       this.store.unloadAll('capabilities');
     });
   },
 
   getModelType(backend, tab) {
-    const secretEngine = this.store.peekRecord('secret-engine', backend);
-    const type = secretEngine.engineType;
-    const types = {
+    let secretEngine = this.store.peekRecord('secret-engine', backend);
+    let type = secretEngine.get('engineType');
+    let types = {
       database: tab === 'role' ? 'database/role' : 'database/connection',
       transit: 'transit-key',
       ssh: 'role-ssh',
@@ -100,9 +83,9 @@ export default Route.extend({
       pki: `pki/${tab || 'pki-role'}`,
       // secret or secret-v2
       cubbyhole: 'secret',
-      kv: secretEngine.modelTypeForKV,
+      kv: secretEngine.get('modelTypeForKV'),
       keymgmt: `keymgmt/${tab || 'key'}`,
-      generic: secretEngine.modelTypeForKV,
+      generic: secretEngine.get('modelTypeForKV'),
     };
     return types[type];
   },
@@ -168,13 +151,13 @@ export default Route.extend({
   },
 
   setupController(controller, resolvedModel) {
-    const secretParams = this.paramsFor(this.routeName);
-    const secret = resolvedModel.secret;
-    const model = resolvedModel.secrets;
-    const backend = this.enginePathParam();
-    const backendModel = this.store.peekRecord('secret-engine', backend);
-    const has404 = this.has404;
-    const noMetadataPermissions = this.noMetadataPermissions;
+    let secretParams = this.paramsFor(this.routeName);
+    let secret = resolvedModel.secret;
+    let model = resolvedModel.secrets;
+    let backend = this.enginePathParam();
+    let backendModel = this.store.peekRecord('secret-engine', backend);
+    let has404 = this.has404;
+    let noMetadataPermissions = this.noMetadataPermissions;
     // only clear store cache if this is a new model
     if (secret !== controller.get('baseKey.id')) {
       this.store.clearAllDatasets();
@@ -214,11 +197,11 @@ export default Route.extend({
 
   actions: {
     error(error, transition) {
-      const secret = this.secretParam();
-      const backend = this.enginePathParam();
-      const is404 = error.httpStatus === 404;
+      let secret = this.secretParam();
+      let backend = this.enginePathParam();
+      let is404 = error.httpStatus === 404;
       /* eslint-disable-next-line ember/no-controller-access-in-routes */
-      const hasModel = this.controllerFor(this.routeName).get('hasModel');
+      let hasModel = this.controllerFor(this.routeName).get('hasModel');
 
       // this will occur if we've deleted something,
       // and navigate to its parent and the parent doesn't exist -
diff --git a/ui/app/routes/vault/cluster/secrets/backend/metadata.js b/ui/app/routes/vault/cluster/secrets/backend/metadata.js
index 935ad97a9168c..ea95f834b216d 100644
--- a/ui/app/routes/vault/cluster/secrets/backend/metadata.js
+++ b/ui/app/routes/vault/cluster/secrets/backend/metadata.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 
@@ -16,7 +11,7 @@ export default class MetadataShow extends Route {
   }
 
   model(params) {
-    const { secret } = params;
+    let { secret } = params;
     this.id = secret;
     return this.store
       .queryRecord('secret-v2', {
diff --git a/ui/app/routes/vault/cluster/secrets/backend/overview.js b/ui/app/routes/vault/cluster/secrets/backend/overview.js
index a4bfb9925d791..7ba2e38c865dc 100644
--- a/ui/app/routes/vault/cluster/secrets/backend/overview.js
+++ b/ui/app/routes/vault/cluster/secrets/backend/overview.js
@@ -1,21 +1,12 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 import { hash } from 'rsvp';
-import { inject as service } from '@ember/service';
 
 export default Route.extend({
-  store: service(),
   type: '',
-
   enginePathParam() {
-    const { backend } = this.paramsFor('vault.cluster.secrets.backend');
+    let { backend } = this.paramsFor('vault.cluster.secrets.backend');
     return backend;
   },
-
   async fetchConnection(queryOptions) {
     try {
       return await this.store.query('database/connection', queryOptions);
@@ -23,7 +14,6 @@ export default Route.extend({
       return e.httpStatus;
     }
   },
-
   async fetchAllRoles(queryOptions) {
     try {
       return await this.store.query('database/role', queryOptions);
@@ -31,34 +21,29 @@ export default Route.extend({
       return e.httpStatus;
     }
   },
-
   pathQuery(backend, endpoint) {
     return {
       id: `${backend}/${endpoint}/`,
     };
   },
-
   async fetchCapabilitiesRole(queryOptions) {
     return this.store.queryRecord('capabilities', this.pathQuery(queryOptions.backend, 'roles'));
   },
-
   async fetchCapabilitiesStaticRole(queryOptions) {
     return this.store.queryRecord('capabilities', this.pathQuery(queryOptions.backend, 'static-roles'));
   },
-
   async fetchCapabilitiesConnection(queryOptions) {
     return this.store.queryRecord('capabilities', this.pathQuery(queryOptions.backend, 'config'));
   },
-
   model() {
-    const backend = this.enginePathParam();
-    const queryOptions = { backend, id: '' };
+    let backend = this.enginePathParam();
+    let queryOptions = { backend, id: '' };
 
-    const connection = this.fetchConnection(queryOptions);
-    const role = this.fetchAllRoles(queryOptions);
-    const roleCapabilities = this.fetchCapabilitiesRole(queryOptions);
-    const staticRoleCapabilities = this.fetchCapabilitiesStaticRole(queryOptions);
-    const connectionCapabilities = this.fetchCapabilitiesConnection(queryOptions);
+    let connection = this.fetchConnection(queryOptions);
+    let role = this.fetchAllRoles(queryOptions);
+    let roleCapabilities = this.fetchCapabilitiesRole(queryOptions);
+    let staticRoleCapabilities = this.fetchCapabilitiesStaticRole(queryOptions);
+    let connectionCapabilities = this.fetchCapabilitiesConnection(queryOptions);
 
     return hash({
       backend,
@@ -72,16 +57,15 @@ export default Route.extend({
       icon: 'database',
     });
   },
-
   setupController(controller, model) {
     this._super(...arguments);
-    const showEmptyState = model.connections === 404 && model.roles === 404;
-    const noConnectionCapabilities =
+    let showEmptyState = model.connections === 404 && model.roles === 404;
+    let noConnectionCapabilities =
       !model.connectionCapabilities.canList &&
       !model.connectionCapabilities.canCreate &&
       !model.connectionCapabilities.canUpdate;
 
-    const emptyStateMessage = function () {
+    let emptyStateMessage = function () {
       if (noConnectionCapabilities) {
         return 'You cannot yet generate credentials.  Ask your administrator if you think you should have access.';
       } else {
diff --git a/ui/app/routes/vault/cluster/secrets/backend/secret-edit.js b/ui/app/routes/vault/cluster/secrets/backend/secret-edit.js
index 90cbf8c8ed4fb..3b6b796fe3b4d 100644
--- a/ui/app/routes/vault/cluster/secrets/backend/secret-edit.js
+++ b/ui/app/routes/vault/cluster/secrets/backend/secret-edit.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import AdapterError from '@ember-data/adapter/error';
 import { set } from '@ember/object';
 import { resolve } from 'rsvp';
@@ -13,24 +8,21 @@ import UnloadModelRoute from 'vault/mixins/unload-model-route';
 import { encodePath, normalizePath } from 'vault/utils/path-encoding-helpers';
 
 export default Route.extend(UnloadModelRoute, {
-  store: service(),
   pathHelp: service('path-help'),
   wizard: service(),
 
   secretParam() {
-    const { secret } = this.paramsFor(this.routeName);
+    let { secret } = this.paramsFor(this.routeName);
     return secret ? normalizePath(secret) : '';
   },
-
   enginePathParam() {
-    const { backend } = this.paramsFor('vault.cluster.secrets.backend');
+    let { backend } = this.paramsFor('vault.cluster.secrets.backend');
     return backend;
   },
-
   capabilities(secret, modelType) {
     const backend = this.enginePathParam();
-    const backendModel = this.modelFor('vault.cluster.secrets.backend');
-    const backendType = backendModel.engineType;
+    let backendModel = this.modelFor('vault.cluster.secrets.backend');
+    let backendType = backendModel.engineType;
     let path;
     if (backendModel.isV2KV) {
       path = `${backend}/data/${secret}`;
@@ -47,7 +39,7 @@ export default Route.extend(UnloadModelRoute, {
   },
 
   buildTransformPath(backend, secret, modelType) {
-    const noun = modelType.split('/')[1];
+    let noun = modelType.split('/')[1];
     return `${backend}/${noun}/${secret}`;
   },
 
@@ -77,7 +69,7 @@ export default Route.extend(UnloadModelRoute, {
   templateName: 'vault/cluster/secrets/backend/secretEditLayout',
 
   beforeModel({ to: { queryParams } }) {
-    const secret = this.secretParam();
+    let secret = this.secretParam();
     return this.buildModel(secret, queryParams).then(() => {
       const parentKey = utils.parentKeyForKey(secret);
       const mode = this.routeName.split('.').pop();
@@ -93,7 +85,7 @@ export default Route.extend(UnloadModelRoute, {
 
   buildModel(secret, queryParams) {
     const backend = this.enginePathParam();
-    const modelType = this.modelType(backend, secret, { queryParams });
+    let modelType = this.modelType(backend, secret, { queryParams });
     if (['secret', 'secret-v2'].includes(modelType)) {
       return resolve();
     }
@@ -101,9 +93,9 @@ export default Route.extend(UnloadModelRoute, {
   },
 
   modelType(backend, secret, options = {}) {
-    const backendModel = this.modelFor('vault.cluster.secrets.backend', backend);
-    const type = backendModel.get('engineType');
-    const types = {
+    let backendModel = this.modelFor('vault.cluster.secrets.backend', backend);
+    let type = backendModel.get('engineType');
+    let types = {
       database: secret && secret.startsWith('role/') ? 'database/role' : 'database/connection',
       transit: 'transit-key',
       ssh: 'role-ssh',
@@ -111,9 +103,9 @@ export default Route.extend(UnloadModelRoute, {
       aws: 'role-aws',
       pki: secret && secret.startsWith('cert/') ? 'pki/cert' : 'pki/pki-role',
       cubbyhole: 'secret',
-      kv: backendModel.modelTypeForKV,
+      kv: backendModel.get('modelTypeForKV'),
       keymgmt: `keymgmt/${options.queryParams?.itemType || 'key'}`,
-      generic: backendModel.modelTypeForKV,
+      generic: backendModel.get('modelTypeForKV'),
     };
     return types[type];
   },
@@ -130,16 +122,16 @@ export default Route.extend(UnloadModelRoute, {
   },
 
   async fetchV2Models(capabilities, secretModel, params) {
-    const backend = this.enginePathParam();
-    const backendModel = this.modelFor('vault.cluster.secrets.backend', backend);
-    const targetVersion = this.getTargetVersion(secretModel.currentVersion, params.version);
+    let backend = this.enginePathParam();
+    let backendModel = this.modelFor('vault.cluster.secrets.backend', backend);
+    let targetVersion = this.getTargetVersion(secretModel.currentVersion, params.version);
 
     // if we have the metadata, a list of versions are part of the payload
-    const version = secretModel.versions && secretModel.versions.findBy('version', targetVersion);
+    let version = secretModel.versions && secretModel.versions.findBy('version', targetVersion);
     // if it didn't fail the server read, and the version is not attached to the metadata,
     // this should 404
     if (!version && secretModel.failedServerRead !== true) {
-      const error = new AdapterError();
+      let error = new AdapterError();
       set(error, 'httpStatus', 404);
       throw error;
     }
@@ -154,12 +146,12 @@ export default Route.extend(UnloadModelRoute, {
   },
 
   async fetchV2VersionModel(capabilities, secretModel, version, targetVersion) {
-    const secret = this.secretParam();
-    const backend = this.enginePathParam();
+    let secret = this.secretParam();
+    let backend = this.enginePathParam();
 
     // v2 versions have a composite ID, we generated one here if we need to manually set it
     // after a failed fetch later;
-    const versionId = targetVersion ? [backend, secret, targetVersion] : [backend, secret];
+    let versionId = targetVersion ? [backend, secret, targetVersion] : [backend, secret];
 
     let versionModel;
     try {
@@ -218,10 +210,9 @@ export default Route.extend(UnloadModelRoute, {
         },
       },
     });
-    const secretModel = this.store.peekRecord(modelType, secretId);
+    let secretModel = this.store.peekRecord(modelType, secretId);
     return secretModel;
   },
-
   // wizard will pause unless we manually continue it
   updateWizard(params) {
     // verify that keymgmt tutorial is in progress
@@ -233,9 +224,9 @@ export default Route.extend(UnloadModelRoute, {
   async model(params, { to: { queryParams } }) {
     this.updateWizard(params);
     let secret = this.secretParam();
-    const backend = this.enginePathParam();
-    const modelType = this.modelType(backend, secret, { queryParams });
-    const type = params.type || '';
+    let backend = this.enginePathParam();
+    let modelType = this.modelType(backend, secret, { queryParams });
+    let type = params.type || '';
     if (!secret) {
       secret = '\u0020';
     }
@@ -250,7 +241,7 @@ export default Route.extend(UnloadModelRoute, {
     }
     let secretModel;
 
-    const capabilities = this.capabilities(secret, modelType);
+    let capabilities = this.capabilities(secret, modelType);
     try {
       secretModel = await this.store.queryRecord(modelType, { id: secret, backend, type });
     } catch (err) {
@@ -277,8 +268,8 @@ export default Route.extend(UnloadModelRoute, {
 
   setupController(controller, model) {
     this._super(...arguments);
-    const secret = this.secretParam();
-    const backend = this.enginePathParam();
+    let secret = this.secretParam();
+    let backend = this.enginePathParam();
     const preferAdvancedEdit =
       /* eslint-disable-next-line ember/no-controller-access-in-routes */
       this.controllerFor('vault.cluster.secrets.backend').get('preferAdvancedEdit') || false;
@@ -304,8 +295,8 @@ export default Route.extend(UnloadModelRoute, {
 
   actions: {
     error(error) {
-      const secret = this.secretParam();
-      const backend = this.enginePathParam();
+      let secret = this.secretParam();
+      let backend = this.enginePathParam();
       set(error, 'keyId', backend + '/' + secret);
       set(error, 'backend', backend);
       return true;
@@ -317,10 +308,10 @@ export default Route.extend(UnloadModelRoute, {
 
     willTransition(transition) {
       /* eslint-disable-next-line ember/no-controller-access-in-routes */
-      const { mode, model } = this.controller;
-      const version = model.get('selectedVersion');
-      const changed = model.changedAttributes();
-      const changedKeys = Object.keys(changed);
+      let { mode, model } = this.controller;
+      let version = model.get('selectedVersion');
+      let changed = model.changedAttributes();
+      let changedKeys = Object.keys(changed);
 
       // when you don't have read access on metadata we add currentVersion to the model
       // this makes it look like you have unsaved changes and prompts a browser warning
diff --git a/ui/app/routes/vault/cluster/secrets/backend/show-root.js b/ui/app/routes/vault/cluster/secrets/backend/show-root.js
index 95e38486328ef..98bd0c1a0c141 100644
--- a/ui/app/routes/vault/cluster/secrets/backend/show-root.js
+++ b/ui/app/routes/vault/cluster/secrets/backend/show-root.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from './show';
diff --git a/ui/app/routes/vault/cluster/secrets/backend/show.js b/ui/app/routes/vault/cluster/secrets/backend/show.js
index 1d353ae10ec25..1f4f747340857 100644
--- a/ui/app/routes/vault/cluster/secrets/backend/show.js
+++ b/ui/app/routes/vault/cluster/secrets/backend/show.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import EditBase from './secret-edit';
 
 export default EditBase.extend({
diff --git a/ui/app/routes/vault/cluster/secrets/backend/sign-root.js b/ui/app/routes/vault/cluster/secrets/backend/sign-root.js
index 316a201c0178f..d034c15952119 100644
--- a/ui/app/routes/vault/cluster/secrets/backend/sign-root.js
+++ b/ui/app/routes/vault/cluster/secrets/backend/sign-root.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from './sign';
diff --git a/ui/app/routes/vault/cluster/secrets/backend/sign.js b/ui/app/routes/vault/cluster/secrets/backend/sign.js
index 2072949bbee44..ee2f1212a2090 100644
--- a/ui/app/routes/vault/cluster/secrets/backend/sign.js
+++ b/ui/app/routes/vault/cluster/secrets/backend/sign.js
@@ -1,14 +1,7 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 import UnloadModel from 'vault/mixins/unload-model-route';
-import { inject as service } from '@ember/service';
 
 export default Route.extend(UnloadModel, {
-  store: service(),
   templateName: 'vault/cluster/secrets/backend/sign',
 
   backendModel() {
diff --git a/ui/app/routes/vault/cluster/secrets/backend/versions-root.js b/ui/app/routes/vault/cluster/secrets/backend/versions-root.js
index e8cbcb638864c..69de93ac8a8a6 100644
--- a/ui/app/routes/vault/cluster/secrets/backend/versions-root.js
+++ b/ui/app/routes/vault/cluster/secrets/backend/versions-root.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from './version';
diff --git a/ui/app/routes/vault/cluster/secrets/backend/versions.js b/ui/app/routes/vault/cluster/secrets/backend/versions.js
index dbe5ff25dda26..7604ea952c587 100644
--- a/ui/app/routes/vault/cluster/secrets/backend/versions.js
+++ b/ui/app/routes/vault/cluster/secrets/backend/versions.js
@@ -1,20 +1,13 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 import utils from 'vault/lib/key-utils';
 import UnloadModelRoute from 'vault/mixins/unload-model-route';
 import { normalizePath } from 'vault/utils/path-encoding-helpers';
-import { inject as service } from '@ember/service';
 
 export default Route.extend(UnloadModelRoute, {
-  store: service(),
   templateName: 'vault/cluster/secrets/backend/versions',
 
   beforeModel() {
-    const backendModel = this.modelFor('vault.cluster.secrets.backend');
+    let backendModel = this.modelFor('vault.cluster.secrets.backend');
     const { secret } = this.paramsFor(this.routeName);
     const parentKey = utils.parentKeyForKey(secret);
     if (backendModel.get('isV2KV')) {
@@ -28,9 +21,9 @@ export default Route.extend(UnloadModelRoute, {
   },
 
   model(params) {
-    const { secret } = params;
+    let { secret } = params;
     const { backend } = this.paramsFor('vault.cluster.secrets.backend');
-    const id = normalizePath(secret);
+    let id = normalizePath(secret);
     return this.store.queryRecord('secret-v2', { id, backend });
   },
 });
diff --git a/ui/app/routes/vault/cluster/secrets/backends.js b/ui/app/routes/vault/cluster/secrets/backends.js
index 192132f8152d3..5cfb276585671 100644
--- a/ui/app/routes/vault/cluster/secrets/backends.js
+++ b/ui/app/routes/vault/cluster/secrets/backends.js
@@ -1,14 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
 
 export default Route.extend({
-  store: service(),
-
   model() {
     return this.store.query('secret-engine', {});
   },
diff --git a/ui/app/routes/vault/cluster/settings.js b/ui/app/routes/vault/cluster/settings.js
index 18878a4d5cb6b..669017080b759 100644
--- a/ui/app/routes/vault/cluster/settings.js
+++ b/ui/app/routes/vault/cluster/settings.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 import ClusterRoute from 'vault/mixins/cluster-route';
 
diff --git a/ui/app/routes/vault/cluster/settings/auth/configure.js b/ui/app/routes/vault/cluster/settings/auth/configure.js
index e974c0ed3d5d2..a3f1c9ab2d7b3 100644
--- a/ui/app/routes/vault/cluster/settings/auth/configure.js
+++ b/ui/app/routes/vault/cluster/settings/auth/configure.js
@@ -1,14 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
 
 export default Route.extend({
-  store: service(),
-
   model() {
     const { method } = this.paramsFor(this.routeName);
     return this.store.findAll('auth-method').then(() => {
diff --git a/ui/app/routes/vault/cluster/settings/auth/configure/index.js b/ui/app/routes/vault/cluster/settings/auth/configure/index.js
index 51878795646d1..1ef0d9cd50f9f 100644
--- a/ui/app/routes/vault/cluster/settings/auth/configure/index.js
+++ b/ui/app/routes/vault/cluster/settings/auth/configure/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 import { tabsForAuthSection } from 'vault/helpers/tabs-for-auth-section';
 
diff --git a/ui/app/routes/vault/cluster/settings/auth/configure/section.js b/ui/app/routes/vault/cluster/settings/auth/configure/section.js
index 15a5a59376628..a4e54a471aeab 100644
--- a/ui/app/routes/vault/cluster/settings/auth/configure/section.js
+++ b/ui/app/routes/vault/cluster/settings/auth/configure/section.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import AdapterError from '@ember-data/adapter/error';
 import { inject as service } from '@ember/service';
 import { set } from '@ember/object';
@@ -13,7 +8,6 @@ import UnloadModelRoute from 'vault/mixins/unload-model-route';
 export default Route.extend(UnloadModelRoute, {
   modelPath: 'model.model',
   pathHelp: service('path-help'),
-  store: service(),
 
   modelType(backendType, section) {
     const MODELS = {
diff --git a/ui/app/routes/vault/cluster/settings/auth/enable.js b/ui/app/routes/vault/cluster/settings/auth/enable.js
deleted file mode 100644
index 356ac5ebe88af..0000000000000
--- a/ui/app/routes/vault/cluster/settings/auth/enable.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-
-export default class VaultClusterSettingsAuthEnableRoute extends Route {
-  @service store;
-
-  beforeModel() {
-    // Unload to prevent naming collisions when we mount a new engine
-    this.store.unloadAll('auth-method');
-  }
-
-  model() {
-    const authMethod = this.store.createRecord('auth-method');
-    authMethod.set('config', this.store.createRecord('mount-config'));
-    return authMethod;
-  }
-}
diff --git a/ui/app/routes/vault/cluster/settings/auth/index.js b/ui/app/routes/vault/cluster/settings/auth/index.js
index ed754a4555d16..798b2f1cf2cf1 100644
--- a/ui/app/routes/vault/cluster/settings/auth/index.js
+++ b/ui/app/routes/vault/cluster/settings/auth/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 
 export default Route.extend({
diff --git a/ui/app/routes/vault/cluster/settings/configure-secret-backend.js b/ui/app/routes/vault/cluster/settings/configure-secret-backend.js
index e7ceeb2f7e6d8..a1c3c27f3f3bf 100644
--- a/ui/app/routes/vault/cluster/settings/configure-secret-backend.js
+++ b/ui/app/routes/vault/cluster/settings/configure-secret-backend.js
@@ -1,21 +1,14 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import AdapterError from '@ember-data/adapter/error';
 import { set } from '@ember/object';
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-const CONFIGURABLE_BACKEND_TYPES = ['aws', 'ssh'];
 
-export default Route.extend({
-  store: service(),
+const CONFIGURABLE_BACKEND_TYPES = ['aws', 'ssh', 'pki'];
 
+export default Route.extend({
   model() {
     const { backend } = this.paramsFor(this.routeName);
     return this.store.query('secret-engine', { path: backend }).then((modelList) => {
-      const model = modelList && modelList.get('firstObject');
+      let model = modelList && modelList.get('firstObject');
       if (!model || !CONFIGURABLE_BACKEND_TYPES.includes(model.get('type'))) {
         const error = new AdapterError();
         set(error, 'httpStatus', 404);
@@ -32,9 +25,15 @@ export default Route.extend({
     });
   },
 
-  afterModel(model) {
+  afterModel(model, transition) {
     const type = model.get('type');
-
+    if (type === 'pki') {
+      if (transition.targetName === this.routeName) {
+        return this.transitionTo(`${this.routeName}.section`, 'cert');
+      } else {
+        return;
+      }
+    }
     if (type === 'aws') {
       return this.store
         .queryRecord('secret-engine', {
diff --git a/ui/app/routes/vault/cluster/settings/configure-secret-backend/index.js b/ui/app/routes/vault/cluster/settings/configure-secret-backend/index.js
new file mode 100644
index 0000000000000..9023f5e4c9704
--- /dev/null
+++ b/ui/app/routes/vault/cluster/settings/configure-secret-backend/index.js
@@ -0,0 +1,10 @@
+import Route from '@ember/routing/route';
+
+export default Route.extend({
+  beforeModel(transition) {
+    const type = this.modelFor('vault.cluster.settings.configure-secret-backend').get('type');
+    if (type === 'pki' && transition.targetName === this.routeName) {
+      return this.transitionTo('vault.cluster.settings.configure-secret-backend.section', 'cert');
+    }
+  },
+});
diff --git a/ui/app/routes/vault/cluster/settings/configure-secret-backend/section.js b/ui/app/routes/vault/cluster/settings/configure-secret-backend/section.js
new file mode 100644
index 0000000000000..ffb1e8d6a2c80
--- /dev/null
+++ b/ui/app/routes/vault/cluster/settings/configure-secret-backend/section.js
@@ -0,0 +1,50 @@
+import AdapterError from '@ember-data/adapter/error';
+import { set } from '@ember/object';
+import Route from '@ember/routing/route';
+
+// ARG TODO glimmerize
+const SECTIONS_FOR_TYPE = {
+  pki: ['cert', 'urls', 'crl', 'tidy'],
+};
+export default Route.extend({
+  fetchModel() {
+    const { section_name: sectionName } = this.paramsFor(this.routeName);
+    const backendModel = this.modelFor('vault.cluster.settings.configure-secret-backend');
+    const type = backendModel.get('type');
+    let modelType;
+    if (type === 'pki') {
+      // pki models are in models/pki
+      modelType = `${type}/${type}-config`;
+    } else {
+      modelType = `${type}-config`;
+    }
+    return this.store
+      .queryRecord(modelType, {
+        backend: backendModel.id,
+        section: sectionName,
+      })
+      .then((model) => {
+        model.set('backendType', type);
+        model.set('section', sectionName);
+        return model;
+      });
+  },
+
+  model(params) {
+    const { section_name: sectionName } = params;
+    const backendModel = this.modelFor('vault.cluster.settings.configure-secret-backend');
+    const sections = SECTIONS_FOR_TYPE[backendModel.get('type')];
+    const hasSection = sections.includes(sectionName);
+    if (!backendModel || !hasSection) {
+      const error = new AdapterError();
+      set(error, 'httpStatus', 404);
+      throw error;
+    }
+    return this.fetchModel();
+  },
+
+  setupController(controller) {
+    this._super(...arguments);
+    controller.set('onRefresh', () => this.fetchModel());
+  },
+});
diff --git a/ui/app/routes/vault/cluster/settings/index.js b/ui/app/routes/vault/cluster/settings/index.js
index 0a66a79bf0c1b..5b6928fe61134 100644
--- a/ui/app/routes/vault/cluster/settings/index.js
+++ b/ui/app/routes/vault/cluster/settings/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 
 export default Route.extend({
diff --git a/ui/app/routes/vault/cluster/settings/mount-secret-backend.js b/ui/app/routes/vault/cluster/settings/mount-secret-backend.js
index de9b16d1ad363..acd9fb2e6038b 100644
--- a/ui/app/routes/vault/cluster/settings/mount-secret-backend.js
+++ b/ui/app/routes/vault/cluster/settings/mount-secret-backend.js
@@ -1,22 +1,14 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-
-export default class VaultClusterSettingsMountSecretBackendRoute extends Route {
-  @service store;
-
-  beforeModel() {
-    // Unload to prevent naming collisions when we mount a new engine
-    this.store.unloadAll('secret-engine');
-  }
+import UnloadModelRoute from 'vault/mixins/unload-model-route';
+import UnsavedModelRoute from 'vault/mixins/unsaved-model-route';
 
+export default Route.extend(UnloadModelRoute, UnsavedModelRoute, {
+  // intentionally blank - we don't want a model until one is
+  // created via the form in the controller
   model() {
-    const secretEngine = this.store.createRecord('secret-engine');
-    secretEngine.set('config', this.store.createRecord('mount-config'));
-    return secretEngine;
-  }
-}
+    return {};
+  },
+  activate() {
+    this.store.unloadAll('secret-engine');
+  },
+});
diff --git a/ui/app/routes/vault/cluster/settings/seal.js b/ui/app/routes/vault/cluster/settings/seal.js
index 67a51c1903bf2..f162b5c76408c 100644
--- a/ui/app/routes/vault/cluster/settings/seal.js
+++ b/ui/app/routes/vault/cluster/settings/seal.js
@@ -1,15 +1,7 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { hash } from 'rsvp';
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
 
 export default Route.extend({
-  store: service(),
-
   model() {
     return hash({
       cluster: this.modelFor('vault.cluster'),
diff --git a/ui/app/routes/vault/cluster/storage.js b/ui/app/routes/vault/cluster/storage.js
index e6750917da9c9..c9808bc539ae9 100644
--- a/ui/app/routes/vault/cluster/storage.js
+++ b/ui/app/routes/vault/cluster/storage.js
@@ -1,15 +1,7 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 import ClusterRoute from 'vault/mixins/cluster-route';
-import { inject as service } from '@ember/service';
 
 export default Route.extend(ClusterRoute, {
-  store: service(),
-
   model() {
     // findAll method will return all records in store as well as response from server
     // when removing a peer via the cli, stale records would continue to appear until refresh
diff --git a/ui/app/routes/vault/cluster/tools.js b/ui/app/routes/vault/cluster/tools.js
index f4ec532ebf4db..b44d690a28437 100644
--- a/ui/app/routes/vault/cluster/tools.js
+++ b/ui/app/routes/vault/cluster/tools.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 import ClusterRoute from 'vault/mixins/cluster-route';
 
diff --git a/ui/app/routes/vault/cluster/tools/index.js b/ui/app/routes/vault/cluster/tools/index.js
index 0d93b71882628..6256b28ee676f 100644
--- a/ui/app/routes/vault/cluster/tools/index.js
+++ b/ui/app/routes/vault/cluster/tools/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import Route from '@ember/routing/route';
 import { toolsActions } from 'vault/helpers/tools-actions';
diff --git a/ui/app/routes/vault/cluster/tools/tool.js b/ui/app/routes/vault/cluster/tools/tool.js
index 948d46bddf25f..0c5ecfde7af6e 100644
--- a/ui/app/routes/vault/cluster/tools/tool.js
+++ b/ui/app/routes/vault/cluster/tools/tool.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 import { toolsActions } from 'vault/helpers/tools-actions';
 
diff --git a/ui/app/routes/vault/cluster/unseal.js b/ui/app/routes/vault/cluster/unseal.js
index cca869128b6b6..1495fc503fc3c 100644
--- a/ui/app/routes/vault/cluster/unseal.js
+++ b/ui/app/routes/vault/cluster/unseal.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ClusterRoute from './cluster-route-base';
 
 export default ClusterRoute.extend({});
diff --git a/ui/app/serializers/application.js b/ui/app/serializers/application.js
index 80ba210783095..ae257b9610a15 100644
--- a/ui/app/serializers/application.js
+++ b/ui/app/serializers/application.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import JSONSerializer from '@ember-data/serializer/json';
 import { isNone, isBlank } from '@ember/utils';
 import { assign } from '@ember/polyfills';
@@ -15,11 +10,11 @@ export default JSONSerializer.extend({
 
   normalizeItems(payload) {
     if (payload.data && payload.data.keys && Array.isArray(payload.data.keys)) {
-      const models = payload.data.keys.map((key) => {
+      let models = payload.data.keys.map((key) => {
         if (typeof key !== 'string') {
           return key;
         }
-        const pk = this.primaryKey || 'id';
+        let pk = this.primaryKey || 'id';
         let model = { [pk]: key };
         // if we've added _requestQuery in the adapter, we want
         // attach it to the individual models
diff --git a/ui/app/serializers/auth-method.js b/ui/app/serializers/auth-method.js
index ecb77679865a9..695c3f43a0b05 100644
--- a/ui/app/serializers/auth-method.js
+++ b/ui/app/serializers/auth-method.js
@@ -1,25 +1,8 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationSerializer from './application';
-import { EmbeddedRecordsMixin } from '@ember-data/serializer/rest';
 
-export default ApplicationSerializer.extend(EmbeddedRecordsMixin, {
-  attrs: {
-    config: { embedded: 'always' },
-  },
-  normalize(modelClass, data) {
-    // embedded records need a unique value to be stored
-    // use the uuid from the auth-method as the unique id for mount-config
-    if (data.config && !data.config.id) {
-      data.config.id = data.uuid;
-    }
-    return this._super(modelClass, data);
-  },
+export default ApplicationSerializer.extend({
   normalizeBackend(path, backend) {
-    const struct = { ...backend };
+    let struct = { ...backend };
     // strip the trailing slash off of the path so we
     // can navigate to it without getting `//` in the url
     struct.id = path.slice(0, -1);
diff --git a/ui/app/serializers/capabilities.js b/ui/app/serializers/capabilities.js
index 3b8577a454b1c..0a9351c867701 100644
--- a/ui/app/serializers/capabilities.js
+++ b/ui/app/serializers/capabilities.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationSerializer from './application';
 
 export default ApplicationSerializer.extend({
@@ -13,7 +8,7 @@ export default ApplicationSerializer.extend({
     if (id) {
       payload.path = id;
     }
-    const response = {
+    let response = {
       ...payload.data,
       path: payload.path,
     };
diff --git a/ui/app/serializers/clients/activity.js b/ui/app/serializers/clients/activity.js
index 0be0def81f600..a05dba9ccb9c0 100644
--- a/ui/app/serializers/clients/activity.js
+++ b/ui/app/serializers/clients/activity.js
@@ -1,24 +1,21 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationSerializer from '../application';
 import { formatISO } from 'date-fns';
+import { parseRFC3339 } from 'core/utils/date-formatters';
 import { formatByMonths, formatByNamespace, homogenizeClientNaming } from 'core/utils/client-count-utils';
-import timestamp from 'core/utils/timestamp';
 export default class ActivitySerializer extends ApplicationSerializer {
   normalizeResponse(store, primaryModelClass, payload, id, requestType) {
     if (payload.id === 'no-data') {
       return super.normalizeResponse(store, primaryModelClass, payload, id, requestType);
     }
-    const response_timestamp = formatISO(timestamp.now());
-    const transformedPayload = {
+    let response_timestamp = formatISO(new Date());
+    let transformedPayload = {
       ...payload,
       response_timestamp,
       by_namespace: formatByNamespace(payload.data.by_namespace),
       by_month: formatByMonths(payload.data.months),
       total: homogenizeClientNaming(payload.data.total),
+      formatted_end_time: parseRFC3339(payload.data.end_time),
+      formatted_start_time: parseRFC3339(payload.data.start_time),
     };
     delete payload.data.by_namespace;
     delete payload.data.months;
@@ -26,7 +23,7 @@ export default class ActivitySerializer extends ApplicationSerializer {
     return super.normalizeResponse(store, primaryModelClass, transformedPayload, id, requestType);
   }
 }
-/*
+/* 
 SAMPLE PAYLOAD BEFORE/AFTER:
 
 payload.data.by_namespace = [
diff --git a/ui/app/serializers/clients/config.js b/ui/app/serializers/clients/config.js
index 00b84ed2e5664..e1d0cdc3a0448 100644
--- a/ui/app/serializers/clients/config.js
+++ b/ui/app/serializers/clients/config.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationSerializer from '../application';
 
 export default ApplicationSerializer.extend({
@@ -22,7 +17,7 @@ export default ApplicationSerializer.extend({
   },
 
   serialize() {
-    const json = this._super(...arguments);
+    let json = this._super(...arguments);
     if (json.enabled === 'On' || json.enabled === 'Off') {
       const oldEnabled = json.enabled;
       json.enabled = oldEnabled === 'On' ? 'enable' : 'disable';
diff --git a/ui/app/serializers/clients/monthly.js b/ui/app/serializers/clients/monthly.js
new file mode 100644
index 0000000000000..90a285956fed8
--- /dev/null
+++ b/ui/app/serializers/clients/monthly.js
@@ -0,0 +1,25 @@
+import ApplicationSerializer from '../application';
+import { formatISO } from 'date-fns';
+import { formatByNamespace, homogenizeClientNaming } from 'core/utils/client-count-utils';
+
+export default class MonthlySerializer extends ApplicationSerializer {
+  normalizeResponse(store, primaryModelClass, payload, id, requestType) {
+    if (payload.id === 'no-data') {
+      return super.normalizeResponse(store, primaryModelClass, payload, id, requestType);
+    }
+    let response_timestamp = formatISO(new Date());
+    // TODO CMB: the following is assumed, need to confirm
+    // the months array will always include a single object: a timestamp of the current month and new/total count data, if available
+    let transformedPayload = {
+      ...payload,
+      response_timestamp,
+      by_namespace: formatByNamespace(payload.data.by_namespace),
+      // nest within 'total' object to mimic /activity response shape
+      total: homogenizeClientNaming(payload.data),
+    };
+    delete payload.data.by_namespace;
+    delete payload.data.months;
+    delete payload.data.total;
+    return super.normalizeResponse(store, primaryModelClass, transformedPayload, id, requestType);
+  }
+}
diff --git a/ui/app/serializers/clients/version-history.js b/ui/app/serializers/clients/version-history.js
index afe1565bc55d7..5e13f629cde69 100644
--- a/ui/app/serializers/clients/version-history.js
+++ b/ui/app/serializers/clients/version-history.js
@@ -1,16 +1,13 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationSerializer from '../application';
 
-export default class VersionHistorySerializer extends ApplicationSerializer {
-  primaryKey = 'version';
-
+export default ApplicationSerializer.extend({
   normalizeItems(payload) {
     if (payload.data.keys && Array.isArray(payload.data.keys)) {
-      return payload.data.keys.map((key) => ({ version: key, ...payload.data.key_info[key] }));
+      return payload.data.keys.map((key) => {
+        let model = payload.data.key_info[key];
+        model.id = key;
+        return model;
+      });
     }
-  }
-}
+  },
+});
diff --git a/ui/app/serializers/cluster.js b/ui/app/serializers/cluster.js
index f87bb33e81c13..d27c948831f6b 100644
--- a/ui/app/serializers/cluster.js
+++ b/ui/app/serializers/cluster.js
@@ -1,14 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import RESTSerializer, { EmbeddedRecordsMixin } from '@ember-data/serializer/rest';
 import { assign } from '@ember/polyfills';
 import { decamelize } from '@ember/string';
-import IdentityManager from '../utils/identity-manager';
-
-const uuids = new IdentityManager();
 
 export default RESTSerializer.extend(EmbeddedRecordsMixin, {
   keyForAttribute: function (attr) {
@@ -17,22 +9,6 @@ export default RESTSerializer.extend(EmbeddedRecordsMixin, {
 
   attrs: {
     nodes: { embedded: 'always' },
-    dr: { embedded: 'always' },
-    performance: { embedded: 'always' },
-  },
-
-  setReplicationId(data) {
-    if (data) {
-      data.id = data.cluster_id || uuids.fetch();
-    }
-  },
-
-  normalize(modelClass, data) {
-    // embedded records need a unique value to be stored
-    // set id for dr and performance to cluster_id or random unique id
-    this.setReplicationId(data.dr);
-    this.setReplicationId(data.performance);
-    return this._super(modelClass, data);
   },
 
   pushPayload(store, payload) {
diff --git a/ui/app/serializers/config.js b/ui/app/serializers/config.js
index 4d615922a6339..383d274b98705 100644
--- a/ui/app/serializers/config.js
+++ b/ui/app/serializers/config.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import RESTSerializer from '@ember-data/serializer/rest';
 import { assign } from '@ember/polyfills';
 import { decamelize } from '@ember/string';
diff --git a/ui/app/serializers/control-group.js b/ui/app/serializers/control-group.js
index abe6033f3dfd3..0bb5273f958ca 100644
--- a/ui/app/serializers/control-group.js
+++ b/ui/app/serializers/control-group.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { EmbeddedRecordsMixin } from '@ember-data/serializer/rest';
 import ApplicationSerializer from './application';
 
@@ -13,9 +8,9 @@ export default ApplicationSerializer.extend(EmbeddedRecordsMixin, {
   },
 
   normalizeResponse(store, primaryModelClass, payload) {
-    const entity = payload?.data?.request_entity;
+    let entity = payload?.data?.request_entity;
     if (Array.isArray(payload.data.authorizations)) {
-      for (const authorization of payload.data.authorizations) {
+      for (let authorization of payload.data.authorizations) {
         authorization.id = authorization.entity_id;
         authorization.name = authorization.entity_name;
       }
diff --git a/ui/app/serializers/database/connection.js b/ui/app/serializers/database/connection.js
index 2006015495238..3a6b9ecaaf78e 100644
--- a/ui/app/serializers/database/connection.js
+++ b/ui/app/serializers/database/connection.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import RESTSerializer from '@ember-data/serializer/rest';
 import { AVAILABLE_PLUGIN_TYPES } from '../../utils/database-helpers';
 
@@ -25,7 +20,7 @@ export default RESTSerializer.extend({
       return connections;
     }
     // Query single record response:
-    const response = {
+    let response = {
       id: payload.id,
       name: payload.id,
       backend: payload.backend,
@@ -53,18 +48,18 @@ export default RESTSerializer.extend({
   },
 
   serialize(snapshot, requestType) {
-    const data = this._super(snapshot, requestType);
+    let data = this._super(snapshot, requestType);
     if (!data.plugin_name) {
       return data;
     }
-    const pluginType = AVAILABLE_PLUGIN_TYPES.find((plugin) => plugin.value === data.plugin_name);
+    let pluginType = AVAILABLE_PLUGIN_TYPES.find((plugin) => plugin.value === data.plugin_name);
     if (!pluginType) {
       return data;
     }
-    const pluginAttributes = pluginType.fields.map((fields) => fields.attr).concat('backend');
+    let pluginAttributes = pluginType.fields.map((fields) => fields.attr).concat('backend');
 
     // filter data to only allow plugin specific attrs
-    const allowedAttributes = Object.keys(data).filter((dataAttrs) => pluginAttributes.includes(dataAttrs));
+    let allowedAttributes = Object.keys(data).filter((dataAttrs) => pluginAttributes.includes(dataAttrs));
     for (const key in data) {
       if (!allowedAttributes.includes(key)) {
         delete data[key];
diff --git a/ui/app/serializers/database/credential.js b/ui/app/serializers/database/credential.js
index a3c0f6bd20fa7..c0c157fb2a969 100644
--- a/ui/app/serializers/database/credential.js
+++ b/ui/app/serializers/database/credential.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import RESTSerializer from '@ember-data/serializer/rest';
 
 export default RESTSerializer.extend({
@@ -27,7 +22,7 @@ export default RESTSerializer.extend({
   normalizeResponse(store, primaryModelClass, payload, id, requestType) {
     const credentials = this.normalizePayload(payload);
     const { modelName } = primaryModelClass;
-    const transformedPayload = { [modelName]: credentials };
+    let transformedPayload = { [modelName]: credentials };
 
     return this._super(store, primaryModelClass, transformedPayload, id, requestType);
   },
diff --git a/ui/app/serializers/database/role.js b/ui/app/serializers/database/role.js
index f5513c77fc363..5b94fc2a7953c 100644
--- a/ui/app/serializers/database/role.js
+++ b/ui/app/serializers/database/role.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import RESTSerializer from '@ember-data/serializer/rest';
 
 export default RESTSerializer.extend({
@@ -75,7 +70,7 @@ export default RESTSerializer.extend({
   },
 
   serialize(snapshot, requestType) {
-    const data = this._super(snapshot, requestType);
+    let data = this._super(snapshot, requestType);
     if (data.database) {
       const db = data.database[0];
       data.db_name = db;
diff --git a/ui/app/serializers/identity/_base.js b/ui/app/serializers/identity/_base.js
index 4d9fd80c4fbd4..c28231d69addd 100644
--- a/ui/app/serializers/identity/_base.js
+++ b/ui/app/serializers/identity/_base.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { assign } from '@ember/polyfills';
 import ApplicationSerializer from '../application';
 
@@ -10,7 +5,7 @@ export default ApplicationSerializer.extend({
   normalizeItems(payload) {
     if (payload.data.keys && Array.isArray(payload.data.keys)) {
       return payload.data.keys.map((key) => {
-        const model = payload.data.key_info[key];
+        let model = payload.data.key_info[key];
         model.id = key;
         return model;
       });
diff --git a/ui/app/serializers/identity/entity-alias.js b/ui/app/serializers/identity/entity-alias.js
index a0087fddd0da4..c7246dba8a233 100644
--- a/ui/app/serializers/identity/entity-alias.js
+++ b/ui/app/serializers/identity/entity-alias.js
@@ -1,7 +1,2 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import IdentitySerializer from './_base';
 export default IdentitySerializer.extend();
diff --git a/ui/app/serializers/identity/entity.js b/ui/app/serializers/identity/entity.js
index 20694a9fdda4e..7dcea71eee252 100644
--- a/ui/app/serializers/identity/entity.js
+++ b/ui/app/serializers/identity/entity.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { EmbeddedRecordsMixin } from '@ember-data/serializer/rest';
 import IdentitySerializer from './_base';
 
diff --git a/ui/app/serializers/identity/group-alias.js b/ui/app/serializers/identity/group-alias.js
index a0087fddd0da4..c7246dba8a233 100644
--- a/ui/app/serializers/identity/group-alias.js
+++ b/ui/app/serializers/identity/group-alias.js
@@ -1,7 +1,2 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import IdentitySerializer from './_base';
 export default IdentitySerializer.extend();
diff --git a/ui/app/serializers/identity/group.js b/ui/app/serializers/identity/group.js
index 7429e26773f9e..9a4b576185996 100644
--- a/ui/app/serializers/identity/group.js
+++ b/ui/app/serializers/identity/group.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { EmbeddedRecordsMixin } from '@ember-data/serializer/rest';
 import IdentitySerializer from './_base';
 
@@ -19,7 +14,7 @@ export default IdentitySerializer.extend(EmbeddedRecordsMixin, {
   },
 
   serialize() {
-    const json = this._super(...arguments);
+    let json = this._super(...arguments);
     delete json.alias;
     if (json.type === 'external') {
       delete json.member_entity_ids;
diff --git a/ui/app/serializers/keymgmt/key.js b/ui/app/serializers/keymgmt/key.js
index 576a2842e08b4..6c8dcba5f7f6b 100644
--- a/ui/app/serializers/keymgmt/key.js
+++ b/ui/app/serializers/keymgmt/key.js
@@ -1,18 +1,13 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationSerializer from '../application';
 
 export default class KeymgmtKeySerializer extends ApplicationSerializer {
   normalizeItems(payload) {
-    const normalized = super.normalizeItems(payload);
+    let normalized = super.normalizeItems(payload);
     // Transform versions from object with number keys to array with key ids
     if (normalized.versions) {
       let lastRotated;
       let created;
-      const versions = [];
+      let versions = [];
       Object.keys(normalized.versions).forEach((key, i, arr) => {
         versions.push({
           id: parseInt(key, 10),
diff --git a/ui/app/serializers/keymgmt/provider.js b/ui/app/serializers/keymgmt/provider.js
index d65de5c19edf0..81b2574f838ca 100644
--- a/ui/app/serializers/keymgmt/provider.js
+++ b/ui/app/serializers/keymgmt/provider.js
@@ -1,15 +1,10 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationSerializer from '../application';
 
 export default class KeymgmtProviderSerializer extends ApplicationSerializer {
   primaryKey = 'name';
 
   normalizeItems(payload) {
-    const normalized = super.normalizeItems(payload);
+    let normalized = super.normalizeItems(payload);
     if (Array.isArray(normalized)) {
       normalized.forEach((provider) => {
         provider.id = provider.name;
diff --git a/ui/app/serializers/kubernetes/config.js b/ui/app/serializers/kubernetes/config.js
deleted file mode 100644
index fe732f0374ee8..0000000000000
--- a/ui/app/serializers/kubernetes/config.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import ApplicationSerializer from '../application';
-
-export default class KubernetesConfigSerializer extends ApplicationSerializer {
-  primaryKey = 'backend';
-
-  serialize() {
-    const json = super.serialize(...arguments);
-    // remove backend value from payload
-    delete json.backend;
-    // ensure that values from a previous manual configuration are unset
-    if (json.disable_local_ca_jwt === false) {
-      json.kubernetes_ca_cert = null;
-      json.kubernetes_host = null;
-      json.service_account_jwt = null;
-    }
-    return json;
-  }
-}
diff --git a/ui/app/serializers/kubernetes/role.js b/ui/app/serializers/kubernetes/role.js
deleted file mode 100644
index 580b4c60cd6ce..0000000000000
--- a/ui/app/serializers/kubernetes/role.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import ApplicationSerializer from '../application';
-
-export default class KubernetesConfigSerializer extends ApplicationSerializer {
-  primaryKey = 'name';
-
-  serialize() {
-    const json = super.serialize(...arguments);
-    // remove backend value from payload
-    delete json.backend;
-    return json;
-  }
-}
diff --git a/ui/app/serializers/lease.js b/ui/app/serializers/lease.js
index cfa86144fe458..c6c268b25f3e8 100644
--- a/ui/app/serializers/lease.js
+++ b/ui/app/serializers/lease.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import RESTSerializer from '@ember-data/serializer/rest';
 import { decamelize } from '@ember/string';
 
diff --git a/ui/app/serializers/license.js b/ui/app/serializers/license.js
index 42c078adc6e92..189ab03b4021c 100644
--- a/ui/app/serializers/license.js
+++ b/ui/app/serializers/license.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationSerializer from './application';
 
 export default ApplicationSerializer.extend({
diff --git a/ui/app/serializers/mfa-login-enforcement.js b/ui/app/serializers/mfa-login-enforcement.js
index bf71cb4f1e8b5..3deb9a305e1a7 100644
--- a/ui/app/serializers/mfa-login-enforcement.js
+++ b/ui/app/serializers/mfa-login-enforcement.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationSerializer from './application';
 
 export default class MfaLoginEnforcementSerializer extends ApplicationSerializer {
diff --git a/ui/app/serializers/mfa-method.js b/ui/app/serializers/mfa-method.js
index 693e0064719af..f04374bc938e4 100644
--- a/ui/app/serializers/mfa-method.js
+++ b/ui/app/serializers/mfa-method.js
@@ -1,16 +1,11 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationSerializer from './application';
 
 export default class KeymgmtKeySerializer extends ApplicationSerializer {
   normalizeItems(payload) {
     if (!payload?.data) return payload;
     if (payload.data.keys && Array.isArray(payload.data.keys)) {
-      const data = payload.data.keys.map((key) => {
-        const model = payload.data.key_info[key];
+      let data = payload.data.keys.map((key) => {
+        let model = payload.data.key_info[key];
         model.id = key;
         return model;
       });
diff --git a/ui/app/serializers/mount-config.js b/ui/app/serializers/mount-config.js
index 32fbf4c102b6f..16289da2584c1 100644
--- a/ui/app/serializers/mount-config.js
+++ b/ui/app/serializers/mount-config.js
@@ -1,7 +1,2 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationSerializer from './application';
 export default ApplicationSerializer.extend();
diff --git a/ui/app/serializers/namespace.js b/ui/app/serializers/namespace.js
index f94a818718d73..d9d8e557e27b8 100644
--- a/ui/app/serializers/namespace.js
+++ b/ui/app/serializers/namespace.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationSerializer from './application';
 
 export default class NamespaceSerializer extends ApplicationSerializer {
@@ -24,8 +19,8 @@ export default class NamespaceSerializer extends ApplicationSerializer {
 
   normalizeResponse(store, primaryModelClass, payload, id, requestType) {
     const nullResponses = ['deleteRecord', 'createRecord'];
-    const cid = (id || payload.id || '').replace(/\/$/, '');
-    const normalizedPayload = nullResponses.includes(requestType)
+    let cid = (id || payload.id || '').replace(/\/$/, '');
+    let normalizedPayload = nullResponses.includes(requestType)
       ? { id: cid, path: cid }
       : this.normalizeList(payload);
     return super.normalizeResponse(store, primaryModelClass, normalizedPayload, id, requestType);
diff --git a/ui/app/serializers/node.js b/ui/app/serializers/node.js
index e7586bae96bf8..35be4ee906d27 100644
--- a/ui/app/serializers/node.js
+++ b/ui/app/serializers/node.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import RESTSerializer, { EmbeddedRecordsMixin } from '@ember-data/serializer/rest';
 import { assign } from '@ember/polyfills';
 import { decamelize } from '@ember/string';
diff --git a/ui/app/serializers/oidc/assignment.js b/ui/app/serializers/oidc/assignment.js
index 096d7c16eed16..1a7693d6c99c1 100644
--- a/ui/app/serializers/oidc/assignment.js
+++ b/ui/app/serializers/oidc/assignment.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationSerializer from '../application';
 
 export default class OidcAssignmentSerializer extends ApplicationSerializer {
diff --git a/ui/app/serializers/oidc/client.js b/ui/app/serializers/oidc/client.js
index 4cdc9527795e1..784d56cc852b1 100644
--- a/ui/app/serializers/oidc/client.js
+++ b/ui/app/serializers/oidc/client.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationSerializer from '../application';
 
 export default class OidcClientSerializer extends ApplicationSerializer {
diff --git a/ui/app/serializers/oidc/key.js b/ui/app/serializers/oidc/key.js
index 49625d75f30b3..bf2890f4004b4 100644
--- a/ui/app/serializers/oidc/key.js
+++ b/ui/app/serializers/oidc/key.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationSerializer from '../application';
 
 export default class OidcKeySerializer extends ApplicationSerializer {
diff --git a/ui/app/serializers/oidc/provider.js b/ui/app/serializers/oidc/provider.js
index 14dd3c2bc8d23..da0b35e2945a1 100644
--- a/ui/app/serializers/oidc/provider.js
+++ b/ui/app/serializers/oidc/provider.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationSerializer from '../application';
 
 export default class OidcProviderSerializer extends ApplicationSerializer {
diff --git a/ui/app/serializers/oidc/scope.js b/ui/app/serializers/oidc/scope.js
index 0d829bb795f2a..17c7c02029523 100644
--- a/ui/app/serializers/oidc/scope.js
+++ b/ui/app/serializers/oidc/scope.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationSerializer from '../application';
 
 export default class OidcScopeSerializer extends ApplicationSerializer {
diff --git a/ui/app/serializers/path-filter-config.js b/ui/app/serializers/path-filter-config.js
index d6c335c1b3cf8..edf2d57782709 100644
--- a/ui/app/serializers/path-filter-config.js
+++ b/ui/app/serializers/path-filter-config.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import RESTSerializer from '@ember-data/serializer/rest';
 import { decamelize } from '@ember/string';
 
diff --git a/ui/app/serializers/pki/action.js b/ui/app/serializers/pki/action.js
deleted file mode 100644
index 692331d146ceb..0000000000000
--- a/ui/app/serializers/pki/action.js
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { underscore } from '@ember/string';
-import { keyParamsByType } from 'pki/utils/action-params';
-import ApplicationSerializer from '../application';
-import { parseCertificate } from 'vault/utils/parse-pki-cert';
-
-export default class PkiActionSerializer extends ApplicationSerializer {
-  attrs = {
-    customTtl: { serialize: false },
-    type: { serialize: false },
-  };
-
-  normalizeResponse(store, primaryModelClass, payload, id, requestType) {
-    if (payload.data.certificate) {
-      // Parse certificate back from the API and add to payload
-      const parsedCert = parseCertificate(payload.data.certificate);
-      const data = {
-        ...payload.data,
-        common_name: parsedCert.common_name,
-        parsed_certificate: parsedCert,
-      };
-      return super.normalizeResponse(store, primaryModelClass, { ...payload, data }, id, requestType);
-    }
-    return super.normalizeResponse(...arguments);
-  }
-
-  serialize(snapshot, requestType) {
-    const data = super.serialize(snapshot);
-    // requestType is a custom value specified from the pki/action adapter
-    const allowedPayloadAttributes = this._allowedParamsByType(requestType, snapshot.record.type);
-    if (!allowedPayloadAttributes) return data;
-    // the backend expects the subject's serial number param to be 'serial_number'
-    // we label it as subject_serial_number to differentiate from the vault generated UUID
-    data.serial_number = data.subject_serial_number;
-
-    const payload = {};
-    allowedPayloadAttributes.forEach((key) => {
-      if ('undefined' !== typeof data[key]) {
-        payload[key] = data[key];
-      }
-    });
-    return payload;
-  }
-
-  _allowedParamsByType(actionType, type) {
-    const keyFields = keyParamsByType(type).map((attrName) => underscore(attrName).toLowerCase());
-    const commonProps = [
-      'alt_names',
-      'common_name',
-      'country',
-      'exclude_cn_from_sans',
-      'format',
-      'ip_sans',
-      'locality',
-      'organization',
-      'other_sans',
-      'ou',
-      'postal_code',
-      'province',
-      'serial_number',
-      'street_address',
-      'type',
-      'uri_sans',
-      ...keyFields,
-    ];
-    switch (actionType) {
-      case 'import':
-        return ['pem_bundle'];
-      case 'generate-root':
-        return [
-          ...commonProps,
-          'issuer_name',
-          'max_path_length',
-          'not_after',
-          'not_before_duration',
-          'permitted_dns_domains',
-          'private_key_format',
-          'ttl',
-        ];
-      case 'rotate-root':
-        return [
-          ...commonProps,
-          'issuer_name',
-          'max_path_length',
-          'not_after',
-          'not_before_duration',
-          'permitted_dns_domains',
-          'private_key_format',
-          'ttl',
-        ];
-      case 'generate-csr':
-        return [...commonProps, 'add_basic_constraints'];
-      case 'sign-intermediate':
-        return ['common_name', 'issuer_name', 'csr'];
-      default:
-        // if type doesn't match, serialize all
-        return null;
-    }
-  }
-}
diff --git a/ui/app/serializers/pki/cert.js b/ui/app/serializers/pki/cert.js
new file mode 100644
index 0000000000000..3a91a3160599b
--- /dev/null
+++ b/ui/app/serializers/pki/cert.js
@@ -0,0 +1,72 @@
+import RESTSerializer from '@ember-data/serializer/rest';
+import { isNone, isBlank } from '@ember/utils';
+import { assign } from '@ember/polyfills';
+import { decamelize } from '@ember/string';
+import { parsePkiCert } from '../../helpers/parse-pki-cert';
+
+export default RESTSerializer.extend({
+  keyForAttribute: function (attr) {
+    return decamelize(attr);
+  },
+
+  pushPayload(store, payload) {
+    const transformedPayload = this.normalizeResponse(
+      store,
+      store.modelFor(payload.modelName),
+      payload,
+      payload.id,
+      'findRecord'
+    );
+    return store.push(transformedPayload);
+  },
+
+  normalizeItems(payload) {
+    if (payload.data && payload.data.keys && Array.isArray(payload.data.keys)) {
+      let ret = payload.data.keys.map((key) => {
+        let model = {
+          id_for_nav: `cert/${key}`,
+          id: key,
+        };
+        if (payload.backend) {
+          model.backend = payload.backend;
+        }
+        return model;
+      });
+      return ret;
+    }
+    assign(payload, payload.data);
+    delete payload.data;
+    return payload;
+  },
+
+  normalizeResponse(store, primaryModelClass, payload, id, requestType) {
+    const responseJSON = this.normalizeItems(payload);
+    const { modelName } = primaryModelClass;
+    let transformedPayload, certMetadata;
+    // hits cert/list endpoint first which returns an array of keys, only want to parse if response contains certificates
+    if (!Array.isArray(responseJSON)) {
+      certMetadata = parsePkiCert([responseJSON]);
+      transformedPayload = { [modelName]: { ...certMetadata, ...responseJSON } };
+    } else {
+      transformedPayload = { [modelName]: responseJSON };
+    }
+    return this._super(store, primaryModelClass, transformedPayload, id, requestType);
+  },
+
+  serializeAttribute(snapshot, json, key, attributes) {
+    const val = snapshot.attr(key);
+    const valHasNotChanged = isNone(snapshot.changedAttributes()[key]);
+    const valIsBlank = isBlank(val);
+    if (attributes.options.readOnly) {
+      return;
+    }
+    if (attributes.type === 'object' && val && Object.keys(val).length > 0 && valHasNotChanged) {
+      return;
+    }
+    if (valIsBlank && valHasNotChanged) {
+      return;
+    }
+
+    this._super(snapshot, json, key, attributes);
+  },
+});
diff --git a/ui/app/serializers/pki/certificate.js b/ui/app/serializers/pki/certificate.js
deleted file mode 100644
index 7a90df041ba95..0000000000000
--- a/ui/app/serializers/pki/certificate.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import CertSerializer from './cert';
-
-export default class PkiCertificateSerializer extends CertSerializer {}
diff --git a/ui/app/serializers/pki/certificate/base.js b/ui/app/serializers/pki/certificate/base.js
deleted file mode 100644
index cc74ed0aacfa7..0000000000000
--- a/ui/app/serializers/pki/certificate/base.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { parseCertificate } from 'vault/utils/parse-pki-cert';
-import ApplicationSerializer from '../../application';
-
-export default class PkiCertificateBaseSerializer extends ApplicationSerializer {
-  primaryKey = 'serial_number';
-
-  attrs = {
-    role: { serialize: false },
-  };
-
-  normalizeResponse(store, primaryModelClass, payload, id, requestType) {
-    if (payload.data.certificate) {
-      // Parse certificate back from the API and add to payload
-      const parsedCert = parseCertificate(payload.data.certificate);
-      return super.normalizeResponse(
-        store,
-        primaryModelClass,
-        { ...payload, parsed_certificate: parsedCert, common_name: parsedCert.common_name },
-        id,
-        requestType
-      );
-    }
-    return super.normalizeResponse(...arguments);
-  }
-}
diff --git a/ui/app/serializers/pki/certificate/generate.js b/ui/app/serializers/pki/certificate/generate.js
deleted file mode 100644
index b729e3d36a399..0000000000000
--- a/ui/app/serializers/pki/certificate/generate.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import PkiCertificateBaseSerializer from './base';
-
-export default class PkiCertificateGenerateSerializer extends PkiCertificateBaseSerializer {}
diff --git a/ui/app/serializers/pki/certificate/sign.js b/ui/app/serializers/pki/certificate/sign.js
deleted file mode 100644
index b729e3d36a399..0000000000000
--- a/ui/app/serializers/pki/certificate/sign.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import PkiCertificateBaseSerializer from './base';
-
-export default class PkiCertificateGenerateSerializer extends PkiCertificateBaseSerializer {}
diff --git a/ui/app/serializers/pki/issuer.js b/ui/app/serializers/pki/issuer.js
deleted file mode 100644
index d205c5f4ee870..0000000000000
--- a/ui/app/serializers/pki/issuer.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { parseCertificate } from 'vault/utils/parse-pki-cert';
-import ApplicationSerializer from '../application';
-
-export default class PkiIssuerSerializer extends ApplicationSerializer {
-  primaryKey = 'issuer_id';
-
-  attrs = {
-    caChain: { serialize: false },
-    certificate: { serialize: false },
-    commonName: { serialize: false },
-    isDefault: { serialize: false },
-    isRoot: { serialize: false },
-    issuerId: { serialize: false },
-    keyId: { serialize: false },
-    parsedCertificate: { serialize: false },
-    serialNumber: { serialize: false },
-  };
-
-  normalizeResponse(store, primaryModelClass, payload, id, requestType) {
-    if (payload.data.certificate) {
-      // Parse certificate back from the API and add to payload
-      const parsedCert = parseCertificate(payload.data.certificate);
-      const data = {
-        ...payload.data,
-        parsed_certificate: parsedCert,
-        common_name: parsedCert.common_name,
-      };
-      return super.normalizeResponse(store, primaryModelClass, { ...payload, data }, id, requestType);
-    }
-    return super.normalizeResponse(...arguments);
-  }
-
-  // rehydrate each issuers model so all model attributes are accessible from the LIST response
-  normalizeItems(payload) {
-    if (payload.data) {
-      if (payload.data?.keys && Array.isArray(payload.data.keys)) {
-        return payload.data.keys.map((key) => {
-          return {
-            issuer_id: key,
-            ...payload.data.key_info[key],
-          };
-        });
-      }
-      Object.assign(payload, payload.data);
-      delete payload.data;
-    }
-    return payload;
-  }
-}
diff --git a/ui/app/serializers/pki/key.js b/ui/app/serializers/pki/key.js
deleted file mode 100644
index ff7519fa13659..0000000000000
--- a/ui/app/serializers/pki/key.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import ApplicationSerializer from '../application';
-
-export default class PkiKeySerializer extends ApplicationSerializer {
-  primaryKey = 'key_id';
-  attrs = {
-    type: { serialize: false },
-  };
-
-  // rehydrate each keys model so all model attributes are accessible from the LIST response
-  normalizeItems(payload) {
-    if (payload.data) {
-      if (payload.data?.keys && Array.isArray(payload.data.keys)) {
-        return payload.data.keys.map((key) => ({ key_id: key, ...payload.data.key_info[key] }));
-      }
-      Object.assign(payload, payload.data);
-      delete payload.data;
-    }
-    return payload;
-  }
-}
diff --git a/ui/app/serializers/pki/pki-config.js b/ui/app/serializers/pki/pki-config.js
new file mode 100644
index 0000000000000..383d274b98705
--- /dev/null
+++ b/ui/app/serializers/pki/pki-config.js
@@ -0,0 +1,29 @@
+import RESTSerializer from '@ember-data/serializer/rest';
+import { assign } from '@ember/polyfills';
+import { decamelize } from '@ember/string';
+
+export default RESTSerializer.extend({
+  keyForAttribute: function (attr) {
+    return decamelize(attr);
+  },
+
+  normalizeAll(payload) {
+    if (payload.data) {
+      const data = assign({}, payload, payload.data);
+      return [data];
+    }
+    return [payload];
+  },
+
+  normalizeResponse(store, primaryModelClass, payload, id, requestType) {
+    const records = this.normalizeAll(payload);
+    const { modelName } = primaryModelClass;
+    let transformedPayload = { [modelName]: records };
+    // just return the single object because ember is picky
+    if (requestType === 'queryRecord') {
+      transformedPayload = { [modelName]: records[0] };
+    }
+
+    return this._super(store, primaryModelClass, transformedPayload, id, requestType);
+  },
+});
diff --git a/ui/app/serializers/pki/pki-role-engine.js b/ui/app/serializers/pki/pki-role-engine.js
new file mode 100644
index 0000000000000..47d752bf39bd3
--- /dev/null
+++ b/ui/app/serializers/pki/pki-role-engine.js
@@ -0,0 +1,3 @@
+import RoleSerializer from '../role';
+
+export default class PkiRoleEngineSerializer extends RoleSerializer {}
diff --git a/ui/app/serializers/pki/pki-role.js b/ui/app/serializers/pki/pki-role.js
new file mode 100644
index 0000000000000..9366ee82b1dbe
--- /dev/null
+++ b/ui/app/serializers/pki/pki-role.js
@@ -0,0 +1,3 @@
+import RoleSerializer from '../role';
+
+export default RoleSerializer.extend();
diff --git a/ui/app/serializers/pki/role.js b/ui/app/serializers/pki/role.js
deleted file mode 100644
index 5ee82a51c0945..0000000000000
--- a/ui/app/serializers/pki/role.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import ApplicationSerializer from '../application';
-
-export default class PkiRoleSerializer extends ApplicationSerializer {
-  attrs = {
-    name: { serialize: false },
-  };
-
-  serialize() {
-    const json = super.serialize(...arguments);
-    // attributes with empty arrays are stripped from serialized json
-    // but an empty list is acceptable for key_usage to specify no default constraints
-    // intercepting here to ensure an empty array persists (the backend assumes default values)
-    json.key_usage = json.key_usage || [];
-    return json;
-  }
-}
diff --git a/ui/app/serializers/pki/tidy.js b/ui/app/serializers/pki/tidy.js
deleted file mode 100644
index 77f2a9871d133..0000000000000
--- a/ui/app/serializers/pki/tidy.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import ApplicationSerializer from '../application';
-
-export default class PkiTidySerializer extends ApplicationSerializer {
-  serialize(snapshot, tidyType) {
-    const data = super.serialize(snapshot);
-    if (tidyType === 'manual') {
-      delete data?.enabled;
-      delete data?.intervalDuration;
-    }
-    return data;
-  }
-}
diff --git a/ui/app/serializers/policy.js b/ui/app/serializers/policy.js
index 9427c63470861..10c5685d69298 100644
--- a/ui/app/serializers/policy.js
+++ b/ui/app/serializers/policy.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationSerializer from './application';
 
 export default ApplicationSerializer.extend({
@@ -15,7 +10,7 @@ export default ApplicationSerializer.extend({
 
   normalizeResponse(store, primaryModelClass, payload, id, requestType) {
     const nullResponses = ['deleteRecord'];
-    const normalizedPayload = nullResponses.includes(requestType)
+    let normalizedPayload = nullResponses.includes(requestType)
       ? { name: id }
       : this.normalizePolicies(payload);
     return this._super(store, primaryModelClass, normalizedPayload, id, requestType);
diff --git a/ui/app/serializers/policy/acl.js b/ui/app/serializers/policy/acl.js
index 60237e0f3c7f9..ea1e2c990244f 100644
--- a/ui/app/serializers/policy/acl.js
+++ b/ui/app/serializers/policy/acl.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import PolicySerializer from '../policy';
 
 export default PolicySerializer.extend();
diff --git a/ui/app/serializers/policy/egp.js b/ui/app/serializers/policy/egp.js
index 60237e0f3c7f9..ea1e2c990244f 100644
--- a/ui/app/serializers/policy/egp.js
+++ b/ui/app/serializers/policy/egp.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import PolicySerializer from '../policy';
 
 export default PolicySerializer.extend();
diff --git a/ui/app/serializers/policy/rgp.js b/ui/app/serializers/policy/rgp.js
index 60237e0f3c7f9..ea1e2c990244f 100644
--- a/ui/app/serializers/policy/rgp.js
+++ b/ui/app/serializers/policy/rgp.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import PolicySerializer from '../policy';
 
 export default PolicySerializer.extend();
diff --git a/ui/app/serializers/replication-attributes.js b/ui/app/serializers/replication-attributes.js
index bb973ff7692d7..8a72a75874705 100644
--- a/ui/app/serializers/replication-attributes.js
+++ b/ui/app/serializers/replication-attributes.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import RESTSerializer from '@ember-data/serializer/rest';
 import { decamelize } from '@ember/string';
 
diff --git a/ui/app/serializers/replication-mode.js b/ui/app/serializers/replication-mode.js
index b06730356b515..2e6e9210bf9f3 100644
--- a/ui/app/serializers/replication-mode.js
+++ b/ui/app/serializers/replication-mode.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationSerializer from './application';
 
 export default ApplicationSerializer.extend({
diff --git a/ui/app/serializers/role-aws.js b/ui/app/serializers/role-aws.js
index 4d35ccde2679f..e479a61f8640f 100644
--- a/ui/app/serializers/role-aws.js
+++ b/ui/app/serializers/role-aws.js
@@ -1,27 +1,21 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationSerializer from './application';
-
 export default ApplicationSerializer.extend({
-  primaryKey: 'name',
-
   extractLazyPaginatedData(payload) {
-    return payload.data.keys.map((key) => {
-      const model = {
-        name: key,
+    let ret;
+    ret = payload.data.keys.map((key) => {
+      let model = {
+        id: key,
       };
       if (payload.backend) {
         model.backend = payload.backend;
       }
       return model;
     });
+    return ret;
   },
 
   normalizeItems() {
-    const normalized = this._super(...arguments);
+    let normalized = this._super(...arguments);
     // most roles will only have one in this array,
     // we'll default to the first, and keep the array on the
     // model and show a warning if there's more than one so that
diff --git a/ui/app/serializers/role-ssh.js b/ui/app/serializers/role-ssh.js
index b7eb493f4c889..d36af6b2f38b9 100644
--- a/ui/app/serializers/role-ssh.js
+++ b/ui/app/serializers/role-ssh.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import RoleSerializer from './role';
 
 export default RoleSerializer.extend();
diff --git a/ui/app/serializers/role.js b/ui/app/serializers/role.js
index 77ed54801324d..27d9d3653be2a 100644
--- a/ui/app/serializers/role.js
+++ b/ui/app/serializers/role.js
@@ -1,15 +1,9 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationSerializer from './application';
 
 export default ApplicationSerializer.extend({
-  primaryKey: 'name',
-
-  // Used for both pki-role (soon to be deprecated) and role-ssh
   extractLazyPaginatedData(payload) {
+    let ret;
+
     if (payload.zero_address_roles) {
       payload.zero_address_roles.forEach((role) => {
         // mutate key_info object to add zero_address info
@@ -18,8 +12,8 @@ export default ApplicationSerializer.extend({
     }
     if (!payload.data.key_info) {
       return payload.data.keys.map((key) => {
-        const model = {
-          name: key,
+        let model = {
+          id: key,
         };
         if (payload.backend) {
           model.backend = payload.backend;
@@ -28,9 +22,9 @@ export default ApplicationSerializer.extend({
       });
     }
 
-    const ret = payload.data.keys.map((key) => {
-      const model = {
-        name: key,
+    ret = payload.data.keys.map((key) => {
+      let model = {
+        id: key,
         key_type: payload.data.key_info[key].key_type,
         zero_address: payload.data.key_info[key].zero_address,
       };
diff --git a/ui/app/serializers/secret-engine.js b/ui/app/serializers/secret-engine.js
index f6e537d2784d3..e6100eb7cab37 100644
--- a/ui/app/serializers/secret-engine.js
+++ b/ui/app/serializers/secret-engine.js
@@ -1,31 +1,10 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { assign } from '@ember/polyfills';
 import ApplicationSerializer from './application';
-import { EmbeddedRecordsMixin } from '@ember-data/serializer/rest';
-
-export default ApplicationSerializer.extend(EmbeddedRecordsMixin, {
-  attrs: {
-    config: { embedded: 'always' },
-  },
-
-  normalize(modelClass, data) {
-    // embedded records need a unique value to be stored
-    // set id for config to uuid of secret engine
-    if (data.config && !data.config.id) {
-      data.config.id = data.uuid;
-    }
-    // move version out of options so it can be defined on secret-engine model
-    data.version = data.options ? data.options.version : null;
-    return this._super(modelClass, data);
-  },
 
+export default ApplicationSerializer.extend({
   normalizeBackend(path, backend) {
     let struct = {};
-    for (const attribute in backend) {
+    for (let attribute in backend) {
       struct[attribute] = backend[attribute];
     }
     //queryRecord adds path to the response
@@ -72,12 +51,8 @@ export default ApplicationSerializer.extend(EmbeddedRecordsMixin, {
   },
 
   serialize(snapshot) {
-    const type = snapshot.record.get('engineType');
-    const data = this._super(...arguments);
-    // move version back to options
-    data.options = data.version ? { version: data.version } : {};
-    delete data.version;
-
+    let type = snapshot.record.get('engineType');
+    let data = this._super(...arguments);
     if (type !== 'kv' || data.options.version === 1) {
       // These items are on the model, but used by the kv-v2 config endpoint only
       delete data.max_versions;
diff --git a/ui/app/serializers/secret-v2-version.js b/ui/app/serializers/secret-v2-version.js
index df10982635588..4cf77f839e27a 100644
--- a/ui/app/serializers/secret-v2-version.js
+++ b/ui/app/serializers/secret-v2-version.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { get } from '@ember/object';
 import { assign } from '@ember/polyfills';
 import ApplicationSerializer from './application';
@@ -10,7 +5,7 @@ import ApplicationSerializer from './application';
 export default ApplicationSerializer.extend({
   secretDataPath: 'data.data',
   normalizeItems(payload) {
-    const path = this.secretDataPath;
+    let path = this.secretDataPath;
     // move response that is the contents of the secret from the dataPath
     // to `secret_data` so it will be `secretData` in the model
     payload.secret_data = get(payload, path);
@@ -22,7 +17,7 @@ export default ApplicationSerializer.extend({
     return payload;
   },
   serialize(snapshot) {
-    const secret = snapshot.belongsTo('secret');
+    let secret = snapshot.belongsTo('secret');
     // if both models failed to read from the server, we need to write without CAS
     if (secret.record.failedServerRead && snapshot.record.failedServerRead) {
       return {
diff --git a/ui/app/serializers/secret-v2.js b/ui/app/serializers/secret-v2.js
index 7540ed22c6156..9af7b8905dea0 100644
--- a/ui/app/serializers/secret-v2.js
+++ b/ui/app/serializers/secret-v2.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { EmbeddedRecordsMixin } from '@ember-data/serializer/rest';
 import ApplicationSerializer from './application';
 
@@ -36,7 +31,7 @@ export default ApplicationSerializer.extend(EmbeddedRecordsMixin, {
     // transform versions to an array with composite IDs
     if (payload.data.versions) {
       payload.data.versions = Object.keys(payload.data.versions).map((version) => {
-        const body = payload.data.versions[version];
+        let body = payload.data.versions[version];
         body.version = version;
         body.path = payload.id;
         body.id = JSON.stringify([payload.backend, payload.id, version]);
diff --git a/ui/app/serializers/secret.js b/ui/app/serializers/secret.js
index 895602e240539..2a3a19dc8a5e7 100644
--- a/ui/app/serializers/secret.js
+++ b/ui/app/serializers/secret.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { get } from '@ember/object';
 import ApplicationSerializer from './application';
 
@@ -32,7 +27,7 @@ export default ApplicationSerializer.extend({
         return { id: fullSecretPath, backend: payload.backend };
       });
     }
-    const path = this.secretDataPath;
+    let path = this.secretDataPath;
     // move response that is the contents of the secret from the dataPath
     // to `secret_data` so it will be `secretData` in the model
     payload.secret_data = get(payload, path);
diff --git a/ui/app/serializers/server.js b/ui/app/serializers/server.js
index 0b5d41b0640b0..cce0ca2f913a3 100644
--- a/ui/app/serializers/server.js
+++ b/ui/app/serializers/server.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationSerializer from './application';
 
 export default ApplicationSerializer.extend({
diff --git a/ui/app/serializers/ssh.js b/ui/app/serializers/ssh.js
index 06622f984ee97..eb69b6fd168cd 100644
--- a/ui/app/serializers/ssh.js
+++ b/ui/app/serializers/ssh.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import RESTSerializer from '@ember-data/serializer/rest';
 import { isNone, isBlank } from '@ember/utils';
 import { assign } from '@ember/polyfills';
@@ -33,8 +28,8 @@ export default RESTSerializer.extend({
   normalizeResponse(store, primaryModelClass, payload, id, requestType) {
     const responseJSON = this.normalizeItems(payload);
     const { modelName } = primaryModelClass;
-    const transformedPayload = { [modelName]: responseJSON };
-    const ret = this._super(store, primaryModelClass, transformedPayload, id, requestType);
+    let transformedPayload = { [modelName]: responseJSON };
+    let ret = this._super(store, primaryModelClass, transformedPayload, id, requestType);
     return ret;
   },
 
diff --git a/ui/app/serializers/transform.js b/ui/app/serializers/transform.js
index 6ea968c5fe675..e86c3a3ebf7cd 100644
--- a/ui/app/serializers/transform.js
+++ b/ui/app/serializers/transform.js
@@ -1,20 +1,15 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationSerializer from './application';
 
 export default ApplicationSerializer.extend({
   normalizeResponse(store, primaryModelClass, payload, id, requestType) {
-    if (payload.data?.masking_character) {
+    if (payload.data.masking_character) {
       payload.data.masking_character = String.fromCharCode(payload.data.masking_character);
     }
     return this._super(store, primaryModelClass, payload, id, requestType);
   },
 
   serialize() {
-    const json = this._super(...arguments);
+    let json = this._super(...arguments);
     if (json.template && Array.isArray(json.template)) {
       // Transformations should only ever have one template
       json.template = json.template[0];
@@ -23,15 +18,16 @@ export default ApplicationSerializer.extend({
   },
 
   extractLazyPaginatedData(payload) {
-    return payload.data.keys.map((key) => {
-      const model = {
+    let ret;
+    ret = payload.data.keys.map((key) => {
+      let model = {
         id: key,
-        name: key,
       };
       if (payload.backend) {
         model.backend = payload.backend;
       }
       return model;
     });
+    return ret;
   },
 });
diff --git a/ui/app/serializers/transform/alphabet.js b/ui/app/serializers/transform/alphabet.js
index c7be724aeb5d9..957917b6c2fd2 100644
--- a/ui/app/serializers/transform/alphabet.js
+++ b/ui/app/serializers/transform/alphabet.js
@@ -1,23 +1,22 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationSerializer from '../application';
 
 export default ApplicationSerializer.extend({
-  primaryKey: 'name',
+  normalizeResponse(store, primaryModelClass, payload, id, requestType) {
+    payload.data.name = payload.id;
+    return this._super(store, primaryModelClass, payload, id, requestType);
+  },
 
   extractLazyPaginatedData(payload) {
-    return payload.data.keys.map((key) => {
-      const model = {
+    let ret;
+    ret = payload.data.keys.map((key) => {
+      let model = {
         id: key,
-        name: key,
       };
       if (payload.backend) {
         model.backend = payload.backend;
       }
       return model;
     });
+    return ret;
   },
 });
diff --git a/ui/app/serializers/transform/role.js b/ui/app/serializers/transform/role.js
index 6369f9955578e..29fcb4b040548 100644
--- a/ui/app/serializers/transform/role.js
+++ b/ui/app/serializers/transform/role.js
@@ -1,22 +1,17 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationSerializer from '../application';
 
 export default ApplicationSerializer.extend({
-  primaryKey: 'name',
   extractLazyPaginatedData(payload) {
-    return payload.data.keys.map((key) => {
-      const model = {
+    let ret;
+    ret = payload.data.keys.map((key) => {
+      let model = {
         id: key,
-        name: key,
       };
       if (payload.backend) {
         model.backend = payload.backend;
       }
       return model;
     });
+    return ret;
   },
 });
diff --git a/ui/app/serializers/transform/template.js b/ui/app/serializers/transform/template.js
index 3a8d94cd5d253..749cbe6bedb07 100644
--- a/ui/app/serializers/transform/template.js
+++ b/ui/app/serializers/transform/template.js
@@ -1,26 +1,20 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ApplicationSerializer from '../application';
 
 export default ApplicationSerializer.extend({
-  primaryKey: 'name',
-
   normalizeResponse(store, primaryModelClass, payload, id, requestType) {
-    if (payload.data?.alphabet) {
+    payload.data.name = payload.id;
+    if (payload.data.alphabet) {
       payload.data.alphabet = [payload.data.alphabet];
     }
     // strip out P character from any named capture groups
-    if (payload.data?.pattern) {
+    if (payload.data.pattern) {
       this._formatNamedCaptureGroups(payload.data, '?P', '?');
     }
     return this._super(store, primaryModelClass, payload, id, requestType);
   },
 
   serialize() {
-    const json = this._super(...arguments);
+    let json = this._super(...arguments);
     if (json.alphabet && Array.isArray(json.alphabet)) {
       // Templates should only ever have one alphabet
       json.alphabet = json.alphabet[0];
@@ -46,15 +40,16 @@ export default ApplicationSerializer.extend({
   },
 
   extractLazyPaginatedData(payload) {
-    return payload.data.keys.map((key) => {
-      const model = {
+    let ret;
+    ret = payload.data.keys.map((key) => {
+      let model = {
         id: key,
-        name: key,
       };
       if (payload.backend) {
         model.backend = payload.backend;
       }
       return model;
     });
+    return ret;
   },
 });
diff --git a/ui/app/serializers/transit-key.js b/ui/app/serializers/transit-key.js
index f0799e2fea6cd..127f49fa33cca 100644
--- a/ui/app/serializers/transit-key.js
+++ b/ui/app/serializers/transit-key.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import RESTSerializer from '@ember-data/serializer/rest';
 import { assign } from '@ember/polyfills';
 import { decamelize } from '@ember/string';
@@ -27,7 +22,7 @@ export default RESTSerializer.extend({
       payload.type === 'chacha20-poly1305' ||
       payload.type === 'aes128-gcm96'
     ) {
-      for (const version in payload.keys) {
+      for (let version in payload.keys) {
         payload.keys[version] = payload.keys[version] * 1000;
       }
     }
diff --git a/ui/app/services/auth.js b/ui/app/services/auth.js
index 170ca6e930b81..6134ac014ea4b 100644
--- a/ui/app/services/auth.js
+++ b/ui/app/services/auth.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Ember from 'ember';
 import { resolve, reject } from 'rsvp';
 import { assign } from '@ember/polyfills';
@@ -26,24 +21,20 @@ export { TOKEN_SEPARATOR, TOKEN_PREFIX, ROOT_PREFIX };
 
 export default Service.extend({
   permissions: service(),
-  store: service(),
-  router: service(),
   namespaceService: service('namespace'),
-
   IDLE_TIMEOUT: 3 * 60e3,
   expirationCalcTS: null,
   isRenewing: false,
   mfaErrors: null,
 
-  get tokenExpired() {
-    const expiration = this.tokenExpirationDate;
-    return expiration ? this.now() >= expiration : null;
+  init() {
+    this._super(...arguments);
+    this.checkForRootToken();
   },
 
-  get activeCluster() {
-    return this.activeClusterId ? this.store.peekRecord('cluster', this.activeClusterId) : null;
+  clusterAdapter() {
+    return getOwner(this).lookup('adapter:cluster');
   },
-
   // eslint-disable-next-line
   tokens: computed({
     get() {
@@ -54,84 +45,6 @@ export default Service.extend({
     },
   }),
 
-  isActiveSession: computed(
-    'router.currentRouteName',
-    'currentToken',
-    'activeCluster.{dr.isSecondary,needsInit,sealed,name}',
-    function () {
-      if (this.activeCluster) {
-        if (this.activeCluster.dr?.isSecondary || this.activeCluster.needsInit || this.activeCluster.sealed) {
-          return false;
-        }
-        if (
-          this.activeCluster.name &&
-          this.currentToken &&
-          this.router.currentRouteName !== 'vault.cluster.auth'
-        ) {
-          return true;
-        }
-      }
-      return false;
-    }
-  ),
-
-  tokenExpirationDate: computed('currentTokenName', 'expirationCalcTS', function () {
-    const tokenName = this.currentTokenName;
-    if (!tokenName) {
-      return;
-    }
-    const { tokenExpirationEpoch } = this.getTokenData(tokenName);
-    const expirationDate = new Date(0);
-    return tokenExpirationEpoch ? expirationDate.setUTCMilliseconds(tokenExpirationEpoch) : null;
-  }),
-
-  renewAfterEpoch: computed('currentTokenName', 'expirationCalcTS', function () {
-    const tokenName = this.currentTokenName;
-    const { expirationCalcTS } = this;
-    const data = this.getTokenData(tokenName);
-    if (!tokenName || !data || !expirationCalcTS) {
-      return null;
-    }
-    const { ttl, renewable } = data;
-    // renew after last expirationCalc time + half of the ttl (in ms)
-    return renewable ? Math.floor((ttl * 1e3) / 2) + expirationCalcTS : null;
-  }),
-
-  // returns the key for the token to use
-  currentTokenName: computed('activeClusterId', 'tokens', 'tokens.[]', function () {
-    const regex = new RegExp(this.activeClusterId);
-    return this.tokens.find((key) => regex.test(key));
-  }),
-
-  currentToken: computed('currentTokenName', function () {
-    const name = this.currentTokenName;
-    const data = name && this.getTokenData(name);
-    // data.token is undefined so that's why it returns current token undefined
-    return name && data ? data.token : null;
-  }),
-
-  authData: computed('currentTokenName', function () {
-    const token = this.currentTokenName;
-    if (!token) {
-      return;
-    }
-    const backend = this.backendFromTokenName(token);
-    const stored = this.getTokenData(token);
-
-    return assign(stored, {
-      backend: BACKENDS.findBy('type', backend),
-    });
-  }),
-
-  init() {
-    this._super(...arguments);
-    this.checkForRootToken();
-  },
-
-  clusterAdapter() {
-    return getOwner(this).lookup('adapter:cluster');
-  },
-
   generateTokenName({ backend, clusterId }, policies) {
     return (policies || []).includes('root')
       ? `${TOKEN_PREFIX}${ROOT_PREFIX}${TOKEN_SEPARATOR}${clusterId}`
@@ -165,7 +78,7 @@ export default Service.extend({
   },
 
   setCluster(clusterId) {
-    this.set('activeClusterId', clusterId);
+    this.set('activeCluster', clusterId);
   },
 
   ajax(url, method, options) {
@@ -178,12 +91,11 @@ export default Service.extend({
       },
     };
 
-    const namespace =
-      typeof options.namespace === 'undefined' ? this.namespaceService.path : options.namespace;
+    let namespace = typeof options.namespace === 'undefined' ? this.namespaceService.path : options.namespace;
     if (namespace) {
       defaults.headers['X-Vault-Namespace'] = namespace;
     }
-    const opts = assign(defaults, options);
+    let opts = assign(defaults, options);
 
     return fetch(url, {
       method: opts.method || 'GET',
@@ -200,19 +112,19 @@ export default Service.extend({
   },
 
   renewCurrentToken() {
-    const namespace = this.authData.userRootNamespace;
+    let namespace = this.authData.userRootNamespace;
     const url = '/v1/auth/token/renew-self';
     return this.ajax(url, 'POST', { namespace });
   },
 
   revokeCurrentToken() {
-    const namespace = this.authData.userRootNamespace;
+    let namespace = this.authData.userRootNamespace;
     const url = '/v1/auth/token/revoke-self';
     return this.ajax(url, 'POST', { namespace });
   },
 
   calculateExpiration(resp) {
-    const now = this.now();
+    let now = this.now();
     const ttl = resp.ttl || resp.lease_duration;
     const tokenExpirationEpoch = now + ttl * 1e3;
     this.set('expirationCalcTS', now);
@@ -223,9 +135,9 @@ export default Service.extend({
   },
 
   persistAuthData() {
-    const [firstArg, resp] = arguments;
-    const tokens = this.tokens;
-    const currentNamespace = this.namespaceService.path || '';
+    let [firstArg, resp] = arguments;
+    let tokens = this.tokens;
+    let currentNamespace = this.namespaceService.path || '';
     let tokenName;
     let options;
     let backend;
@@ -237,7 +149,7 @@ export default Service.extend({
       backend = options.backend;
     }
 
-    const currentBackend = BACKENDS.findBy('type', backend);
+    let currentBackend = BACKENDS.findBy('type', backend);
     let displayName;
     if (isArray(currentBackend.displayNamePath)) {
       displayName = currentBackend.displayNamePath.map((name) => get(resp, name)).join('/');
@@ -245,7 +157,7 @@ export default Service.extend({
       displayName = get(resp, currentBackend.displayNamePath);
     }
 
-    const { entity_id, policies, renewable, namespace_path } = resp;
+    let { entity_id, policies, renewable, namespace_path } = resp;
     // here we prefer namespace_path if its defined,
     // else we look and see if there's already a namespace saved
     // and then finally we'll use the current query param if the others
@@ -265,7 +177,7 @@ export default Service.extend({
     if (typeof userRootNamespace === 'undefined') {
       userRootNamespace = currentNamespace;
     }
-    const data = {
+    let data = {
       userRootNamespace,
       displayName,
       backend: currentBackend,
@@ -278,7 +190,7 @@ export default Service.extend({
     tokenName = this.generateTokenName(
       {
         backend,
-        clusterId: (options && options.clusterId) || this.activeClusterId,
+        clusterId: (options && options.clusterId) || this.activeCluster,
       },
       resp.policies
     );
@@ -313,6 +225,33 @@ export default Service.extend({
     return this.storage(token).removeItem(token);
   },
 
+  tokenExpirationDate: computed('currentTokenName', 'expirationCalcTS', function () {
+    const tokenName = this.currentTokenName;
+    if (!tokenName) {
+      return;
+    }
+    const { tokenExpirationEpoch } = this.getTokenData(tokenName);
+    const expirationDate = new Date(0);
+    return tokenExpirationEpoch ? expirationDate.setUTCMilliseconds(tokenExpirationEpoch) : null;
+  }),
+
+  get tokenExpired() {
+    const expiration = this.tokenExpirationDate;
+    return expiration ? this.now() >= expiration : null;
+  },
+
+  renewAfterEpoch: computed('currentTokenName', 'expirationCalcTS', function () {
+    const tokenName = this.currentTokenName;
+    let { expirationCalcTS } = this;
+    const data = this.getTokenData(tokenName);
+    if (!tokenName || !data || !expirationCalcTS) {
+      return null;
+    }
+    const { ttl, renewable } = data;
+    // renew after last expirationCalc time + half of the ttl (in ms)
+    return renewable ? Math.floor((ttl * 1e3) / 2) + expirationCalcTS : null;
+  }),
+
   renew() {
     const tokenName = this.currentTokenName;
     const currentlyRenewing = this.isRenewing;
@@ -397,7 +336,7 @@ export default Service.extend({
     if (mfa_requirement) {
       const { mfa_request_id, mfa_constraints } = mfa_requirement;
       const constraints = [];
-      for (const key in mfa_constraints) {
+      for (let key in mfa_constraints) {
         const methods = mfa_constraints[key].any;
         const isMulti = methods.length > 1;
 
@@ -477,6 +416,32 @@ export default Service.extend({
     this.set('tokens', tokenNames);
   },
 
+  // returns the key for the token to use
+  currentTokenName: computed('activeCluster', 'tokens', 'tokens.[]', function () {
+    const regex = new RegExp(this.activeCluster);
+    return this.tokens.find((key) => regex.test(key));
+  }),
+
+  currentToken: computed('currentTokenName', function () {
+    const name = this.currentTokenName;
+    const data = name && this.getTokenData(name);
+    // data.token is undefined so that's why it returns current token undefined
+    return name && data ? data.token : null;
+  }),
+
+  authData: computed('currentTokenName', function () {
+    const token = this.currentTokenName;
+    if (!token) {
+      return;
+    }
+    const backend = this.backendFromTokenName(token);
+    const stored = this.getTokenData(token);
+
+    return assign(stored, {
+      backend: BACKENDS.findBy('type', backend),
+    });
+  }),
+
   getOktaNumberChallengeAnswer(nonce, mount) {
     const url = `/v1/auth/${mount}/verify/${nonce}`;
     return this.ajax(url, 'GET', {}).then(
diff --git a/ui/app/services/console.js b/ui/app/services/console.js
index 9b4d6bd580eb3..5880074d61676 100644
--- a/ui/app/services/console.js
+++ b/ui/app/services/console.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 // Low level service that allows users to input paths to make requests to vault
 // this service provides the UI synecdote to the cli commands read, write, delete, and list
 import { filterBy } from '@ember/object/computed';
@@ -42,7 +37,7 @@ export default Service.extend({
   commandIndex: null,
 
   shiftCommandIndex(keyCode, setCommandFn = () => {}) {
-    const [newIndex, newCommand] = shiftCommandIndex(keyCode, this.commandHistory, this.commandIndex);
+    let [newIndex, newCommand] = shiftCommandIndex(keyCode, this.commandHistory, this.commandIndex);
     if (newCommand !== undefined && newIndex !== undefined) {
       this.set('commandIndex', newIndex);
       setCommandFn(newCommand);
@@ -50,7 +45,7 @@ export default Service.extend({
   },
 
   clearLog(clearAll = false) {
-    const log = this.log;
+    let log = this.log;
     let history;
     if (!clearAll) {
       history = this.commandHistory.slice();
@@ -63,7 +58,7 @@ export default Service.extend({
   },
 
   logAndOutput(command, logContent) {
-    const log = this.log;
+    let log = this.log;
     if (command) {
       log.pushObject({ type: 'command', content: command });
       this.set('commandIndex', null);
@@ -74,32 +69,21 @@ export default Service.extend({
   },
 
   ajax(operation, path, options = {}) {
-    const verb = VERBS[operation];
-    const adapter = this.adapter();
-    const url = adapter.buildURL(encodePath(path));
-    const { data, wrapTTL } = options;
+    let verb = VERBS[operation];
+    let adapter = this.adapter();
+    let url = adapter.buildURL(encodePath(path));
+    let { data, wrapTTL } = options;
     return adapter.ajax(url, verb, {
       data,
       wrapTTL,
     });
   },
 
-  kvGet(path, data, flags = {}) {
-    const { wrapTTL, metadata } = flags;
-    // Split on first / to find backend and secret path
-    const pathSegment = metadata ? 'metadata' : 'data';
-    const [backend, secretPath] = path.split(/\/(.+)?/);
-    const kvPath = `${backend}/${pathSegment}/${secretPath}`;
-    return this.ajax('read', sanitizePath(kvPath), { wrapTTL });
-  },
-
-  read(path, data, flags) {
-    const wrapTTL = flags?.wrapTTL;
+  read(path, data, wrapTTL) {
     return this.ajax('read', sanitizePath(path), { wrapTTL });
   },
 
-  write(path, data, flags) {
-    const wrapTTL = flags?.wrapTTL;
+  write(path, data, wrapTTL) {
     return this.ajax('write', sanitizePath(path), { data, wrapTTL });
   },
 
@@ -107,9 +91,8 @@ export default Service.extend({
     return this.ajax('delete', sanitizePath(path));
   },
 
-  list(path, data, flags) {
-    const wrapTTL = flags?.wrapTTL;
-    const listPath = ensureTrailingSlash(sanitizePath(path));
+  list(path, data, wrapTTL) {
+    let listPath = ensureTrailingSlash(sanitizePath(path));
     return this.ajax('list', listPath, {
       data: {
         list: true,
diff --git a/ui/app/services/control-group.js b/ui/app/services/control-group.js
index 61cf7a1074421..46a7e00c078cf 100644
--- a/ui/app/services/control-group.js
+++ b/ui/app/services/control-group.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Service, { inject as service } from '@ember/service';
 import RSVP from 'rsvp';
 import ControlGroupError from 'vault/lib/control-group-error';
@@ -35,31 +30,31 @@ export default Service.extend({
   },
 
   keyFromAccessor(accessor) {
-    const keys = this.storage().keys() || [];
-    const returnKey = keys
+    let keys = this.storage().keys() || [];
+    let returnKey = keys
       .filter((k) => k.startsWith(CONTROL_GROUP_PREFIX))
       .find((key) => key.replace(CONTROL_GROUP_PREFIX, '').startsWith(accessor));
     return returnKey ? returnKey : null;
   },
 
   storeControlGroupToken(info) {
-    const key = storageKey(info.accessor, info.creation_path);
+    let key = storageKey(info.accessor, info.creation_path);
     this.storage().setItem(key, info);
   },
 
   deleteControlGroupToken(accessor) {
     this.unmarkTokenForUnwrap();
-    const key = this.keyFromAccessor(accessor);
+    let key = this.keyFromAccessor(accessor);
     this.storage().removeItem(key);
   },
 
   deleteTokens() {
-    const keys = this.storage().keys() || [];
+    let keys = this.storage().keys() || [];
     keys.filter((k) => k.startsWith(CONTROL_GROUP_PREFIX)).forEach((key) => this.storage().removeItem(key));
   },
 
   wrapInfoForAccessor(accessor) {
-    const key = this.keyFromAccessor(accessor);
+    let key = this.keyFromAccessor(accessor);
     return key ? this.storage().getItem(key) : null;
   },
 
@@ -78,16 +73,16 @@ export default Service.extend({
     }
     let pathForUrl = parseURL(url).pathname;
     pathForUrl = pathForUrl.replace('/v1/', '');
-    const tokenInfo = this.tokenToUnwrap;
+    let tokenInfo = this.tokenToUnwrap;
     if (tokenInfo && tokenInfo.creation_path === pathForUrl) {
-      const { token, accessor, creation_time } = tokenInfo;
+      let { token, accessor, creation_time } = tokenInfo;
       return { token, accessor, creationTime: creation_time };
     }
     return null;
   },
 
   checkForControlGroup(callbackArgs, response, wasWrapTTLRequested) {
-    const creationPath = response && response?.wrap_info?.creation_path;
+    let creationPath = response && response?.wrap_info?.creation_path;
     if (
       this.version.isOSS ||
       wasWrapTTLRequested ||
@@ -97,25 +92,53 @@ export default Service.extend({
     ) {
       return RSVP.resolve(...callbackArgs);
     }
-    const error = new ControlGroupError(response.wrap_info);
+    let error = new ControlGroupError(response.wrap_info);
     return RSVP.reject(error);
   },
 
-  handleError(error) {
-    const { accessor, token, creation_path, creation_time, ttl } = error;
-    const data = { accessor, token, creation_path, creation_time, ttl };
-    data.uiParams = { url: this.router.currentURL };
+  paramsFromTransition(transitionTo, params, queryParams) {
+    let returnedParams = params.slice();
+    let qps = queryParams;
+    transitionTo.paramNames.map((name) => {
+      let param = transitionTo.params[name];
+      if (param.length) {
+        // push on to the front of the array since were're started at the end
+        returnedParams.unshift(param);
+      }
+    });
+    qps = { ...queryParams, ...transitionTo.queryParams };
+    // if there's a parent transition, recurse to get its route params
+    if (transitionTo.parent) {
+      [returnedParams, qps] = this.paramsFromTransition(transitionTo.parent, returnedParams, qps);
+    }
+    return [returnedParams, qps];
+  },
+
+  urlFromTransition(transitionObj) {
+    let transition = transitionObj.to;
+    let [params, queryParams] = this.paramsFromTransition(transition, [], {});
+    let url = this.router.urlFor(transition.name, ...params, {
+      queryParams,
+    });
+    return url.replace('/ui', '');
+  },
+
+  handleError(error, transition) {
+    let { accessor, token, creation_path, creation_time, ttl } = error;
+    let url = this.urlFromTransition(transition);
+    let data = { accessor, token, creation_path, creation_time, ttl };
+    data.uiParams = { url };
     this.storeControlGroupToken(data);
     return this.router.transitionTo('vault.cluster.access.control-group-accessor', accessor);
   },
 
   logFromError(error) {
-    const { accessor, token, creation_path, creation_time, ttl } = error;
-    const data = { accessor, token, creation_path, creation_time, ttl };
+    let { accessor, token, creation_path, creation_time, ttl } = error;
+    let data = { accessor, token, creation_path, creation_time, ttl };
     this.storeControlGroupToken(data);
 
-    const href = this.router.urlFor('vault.cluster.access.control-group-accessor', accessor);
-    const lines = [
+    let href = this.router.urlFor('vault.cluster.access.control-group-accessor', accessor);
+    let lines = [
       `A Control Group was encountered at ${error.creation_path}.`,
       `The Control Group Token is ${error.token}.`,
       `The Accessor is ${error.accessor}.`,
diff --git a/ui/app/services/csp-event.js b/ui/app/services/csp-event.js
index 54d87928e2b4b..d2c0ba1883c48 100644
--- a/ui/app/services/csp-event.js
+++ b/ui/app/services/csp-event.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /*eslint-disable no-constant-condition*/
 import { computed } from '@ember/object';
 
@@ -29,7 +24,7 @@ export default Service.extend({
     this.events.clear();
 
     while (true) {
-      const event = yield waitForEvent(window.document, 'securitypolicyviolation');
+      let event = yield waitForEvent(window.document, 'securitypolicyviolation');
       this.events.addObject(event);
     }
   }),
diff --git a/ui/app/services/current-cluster.js b/ui/app/services/current-cluster.js
index 2aa61b52c697a..688896aee7a51 100644
--- a/ui/app/services/current-cluster.js
+++ b/ui/app/services/current-cluster.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Service from '@ember/service';
 
 export default Service.extend({
diff --git a/ui/app/services/download-csv.js b/ui/app/services/download-csv.js
new file mode 100644
index 0000000000000..2dfdecb89895e
--- /dev/null
+++ b/ui/app/services/download-csv.js
@@ -0,0 +1,26 @@
+import Service from '@ember/service';
+
+// SAMPLE CSV FORMAT ('content' argument)
+// Must be a string with each row \n separated and each column comma separated
+// 'Namespace path,Authentication method,Total clients,Entity clients,Non-entity clients\n
+//  namespacelonglonglong4/,,191,171,20\n
+//  namespacelonglonglong4/,auth/method/uMGBU,35,20,15\n'
+
+export default class DownloadCsvService extends Service {
+  download(filename, content) {
+    // even though Blob type 'text/csv' is specified below, some browsers (ex. Firefox) require the filename has an explicit extension
+    let formattedFilename = `${filename?.replace(/\s+/g, '-')}.csv` || 'vault-data.csv';
+    let { document, URL } = window;
+    let downloadElement = document.createElement('a');
+    downloadElement.download = formattedFilename;
+    downloadElement.href = URL.createObjectURL(
+      new Blob([content], {
+        type: 'text/csv',
+      })
+    );
+    document.body.appendChild(downloadElement);
+    downloadElement.click();
+    URL.revokeObjectURL(downloadElement.href);
+    downloadElement.remove();
+  }
+}
diff --git a/ui/app/services/download.ts b/ui/app/services/download.ts
deleted file mode 100644
index 5f1a26b96a768..0000000000000
--- a/ui/app/services/download.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Service from '@ember/service';
-import timestamp from 'core/utils/timestamp';
-
-interface Extensions {
-  csv: string;
-  hcl: string;
-  sentinel: string;
-  json: string;
-  pem: string;
-  txt: string;
-}
-
-// https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Common_types
-const EXTENSION_TO_MIME: Extensions = {
-  csv: 'txt/csv',
-  hcl: 'text/plain',
-  sentinel: 'text/plain',
-  json: 'application/json',
-  pem: 'application/x-pem-file',
-  txt: 'text/plain',
-};
-
-export default class DownloadService extends Service {
-  download(filename: string, content: string, extension: string) {
-    // replace spaces with hyphens, append extension to filename
-    const formattedFilename =
-      `${filename?.replace(/\s+/g, '-')}.${extension}` ||
-      `vault-data-${timestamp.now().toISOString()}.${extension}`;
-
-    // map extension to MIME type or use default
-    const mimetype = EXTENSION_TO_MIME[extension as keyof Extensions] || 'text/plain';
-
-    // commence download
-    const { document, URL } = window;
-    const downloadElement = document.createElement('a');
-    const data = new File([content], formattedFilename, { type: mimetype });
-    downloadElement.download = formattedFilename;
-    downloadElement.href = URL.createObjectURL(data);
-    document.body.appendChild(downloadElement);
-    downloadElement.click();
-    URL.revokeObjectURL(downloadElement.href);
-    downloadElement.remove();
-    return formattedFilename;
-  }
-
-  // SAMPLE CSV FORMAT ('content' argument)
-  // Must be a string with each row \n separated and each column comma separated
-  // 'Namespace path,Authentication method,Total clients,Entity clients,Non-entity clients\n
-  //  namespacelonglonglong4/,,191,171,20\n
-  //  namespacelonglonglong4/,auth/method/uMGBU,35,20,15\n'
-  csv(filename: string, content: string) {
-    this.download(filename, content, 'csv');
-  }
-
-  pem(filename: string, content: string) {
-    this.download(filename, content, 'pem');
-  }
-
-  miscExtension(filename: string, content: string, extension: string) {
-    this.download(filename, content, extension);
-  }
-}
diff --git a/ui/app/services/feature-flag.js b/ui/app/services/feature-flag.js
index dd00d5d245977..fb1c85a0ecbca 100644
--- a/ui/app/services/feature-flag.js
+++ b/ui/app/services/feature-flag.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Service from '@ember/service';
 
 const FLAGS = {
diff --git a/ui/app/services/flash-messages.js b/ui/app/services/flash-messages.js
new file mode 100644
index 0000000000000..ae0258579fe38
--- /dev/null
+++ b/ui/app/services/flash-messages.js
@@ -0,0 +1,10 @@
+import FlashMessages from 'ember-cli-flash/services/flash-messages';
+
+export default FlashMessages.extend({
+  stickyInfo(message) {
+    return this.info(message, {
+      sticky: true,
+      priority: 300,
+    });
+  },
+});
diff --git a/ui/app/services/flash-messages.ts b/ui/app/services/flash-messages.ts
deleted file mode 100644
index 708fad47e48c3..0000000000000
--- a/ui/app/services/flash-messages.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import FlashMessages from 'ember-cli-flash/services/flash-messages';
-
-/*
-we extend the ember-cli-flash service here so each ember engine can
-import 'flash-messages' as a dependency giving it access to the 
-<FlashMessage> template in the main app's cluster.hbs file
-*/
-export default class FlashMessageService extends FlashMessages {}
diff --git a/ui/app/services/namespace.js b/ui/app/services/namespace.js
index 02926dd5fccb0..7a27d779c64ca 100644
--- a/ui/app/services/namespace.js
+++ b/ui/app/services/namespace.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { alias, equal } from '@ember/object/computed';
 import Service, { inject as service } from '@ember/service';
 import { task } from 'ember-concurrency';
@@ -32,17 +27,17 @@ export default Service.extend({
     // uses the adapter and the raw response here since
     // models get wiped when switching namespaces and we
     // want to keep track of these separately
-    const store = this.store;
-    const adapter = store.adapterFor('namespace');
-    const userRoot = this.auth.authData.userRootNamespace;
+    let store = this.store;
+    let adapter = store.adapterFor('namespace');
+    let userRoot = this.auth.authData.userRootNamespace;
     try {
-      const ns = yield adapter.findAll(store, 'namespace', null, {
+      let ns = yield adapter.findAll(store, 'namespace', null, {
         adapterOptions: {
           forUser: true,
           namespace: userRoot,
         },
       });
-      const keys = ns.data.keys || [];
+      let keys = ns.data.keys || [];
       this.set(
         'accessibleNamespaces',
         keys.map((n) => {
diff --git a/ui/app/services/path-help.js b/ui/app/services/path-help.js
index d4aca10a53262..1b2f941427228 100644
--- a/ui/app/services/path-help.js
+++ b/ui/app/services/path-help.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /*
   This service is used to pull an OpenAPI document describing the
   shape of data at a specific path to hydrate a model with attrs it
@@ -32,15 +27,15 @@ export default Service.extend({
   attrs: null,
   dynamicApiPath: '',
   ajax(url, options = {}) {
-    const appAdapter = getOwner(this).lookup(`adapter:application`);
-    const { data } = options;
+    let appAdapter = getOwner(this).lookup(`adapter:application`);
+    let { data } = options;
     return appAdapter.ajax(url, 'GET', {
       data,
     });
   },
 
   getNewModel(modelType, backend, apiPath, itemType) {
-    const owner = getOwner(this);
+    let owner = getOwner(this);
     const modelName = `model:${modelType}`;
 
     const modelFactory = owner.factoryFor(modelName);
@@ -79,9 +74,9 @@ export default Service.extend({
           const adapter = this.getNewAdapter(pathInfo, itemType);
           owner.register(`adapter:${modelType}`, adapter);
         }
-        let path;
+        let path, paths;
         // if we have an item we want the create info for that itemType
-        const paths = itemType ? this.filterPathsByItemType(pathInfo, itemType) : pathInfo.paths;
+        paths = itemType ? this.filterPathsByItemType(pathInfo, itemType) : pathInfo.paths;
         const createPath = paths.find((path) => path.operations.includes('post') && path.action !== 'Delete');
         path = createPath.path;
         path = path.includes('{') ? path.slice(0, path.indexOf('{') - 1) + '/example' : path;
@@ -98,7 +93,7 @@ export default Service.extend({
       })
       .catch((err) => {
         // TODO: we should handle the error better here
-        console.error(err); // eslint-disable-line
+        console.error(err);
       });
   },
 
@@ -161,14 +156,14 @@ export default Service.extend({
   },
 
   getPaths(apiPath, backend, itemType, itemID) {
-    const debugString =
+    let debugString =
       itemID && itemType
         ? `Fetching relevant paths for ${backend} ${itemType} ${itemID} from ${apiPath}`
         : `Fetching relevant paths for ${backend} ${itemType} from ${apiPath}`;
     debug(debugString);
     return this.ajax(`/v1/${apiPath}?help=1`, backend).then((help) => {
       const pathInfo = help.openapi.paths;
-      const paths = Object.entries(pathInfo);
+      let paths = Object.entries(pathInfo);
 
       return paths.reduce(this.reducePathsByPathName, {
         apiPath,
@@ -193,12 +188,12 @@ export default Service.extend({
       const path = Object.keys(help.openapi.paths)[0]; // do this or look at name
       const pathInfo = help.openapi.paths[path];
       const params = pathInfo.parameters;
-      const paramProp = {};
+      let paramProp = {};
 
       // include url params
       if (params) {
         const { name, schema, description } = params[0];
-        const label = capitalize(name.split('_').join(' '));
+        let label = capitalize(name.split('_').join(' '));
 
         paramProp[name] = {
           'x-vault-displayAttrs': {
@@ -216,7 +211,7 @@ export default Service.extend({
       if (schema.$ref) {
         // $ref will be shaped like `#/components/schemas/MyResponseType
         // which maps to the location of the item within the openApi response
-        const loc = schema.$ref.replace('#/', '').split('/');
+        let loc = schema.$ref.replace('#/', '').split('/');
         props = loc.reduce((prev, curr) => {
           return prev[curr] || {};
         }, help.openapi).properties;
@@ -232,7 +227,7 @@ export default Service.extend({
 
   getNewAdapter(pathInfo, itemType) {
     // we need list and create paths to set the correct urls for actions
-    const paths = this.filterPathsByItemType(pathInfo, itemType);
+    let paths = this.filterPathsByItemType(pathInfo, itemType);
     let { apiPath } = pathInfo;
     const getPath = paths.find((path) => path.operations.includes('get'));
 
@@ -302,7 +297,7 @@ export default Service.extend({
   registerNewModelWithProps(helpUrl, backend, newModel, modelName) {
     return this.getProps(helpUrl, backend).then((props) => {
       const { attrs, newFields } = combineAttributes(newModel.attributes, props);
-      const owner = getOwner(this);
+      let owner = getOwner(this);
       newModel = newModel.extend(attrs, { newFields });
       // if our newModel doesn't have fieldGroups already
       // we need to create them
@@ -351,10 +346,10 @@ export default Service.extend({
     });
   },
   getFieldGroups(newModel) {
-    const groups = {
+    let groups = {
       default: [],
     };
-    const fieldGroups = [];
+    let fieldGroups = [];
     newModel.attributes.forEach((attr) => {
       // if the attr comes in with a fieldGroup from OpenAPI,
       // add it to that group
@@ -369,7 +364,7 @@ export default Service.extend({
         groups.default.push(attr.name);
       }
     });
-    for (const group in groups) {
+    for (let group in groups) {
       fieldGroups.push({ [group]: groups[group] });
     }
     return fieldToAttrs(newModel, fieldGroups);
diff --git a/ui/app/services/permissions.js b/ui/app/services/permissions.js
index b2aa1b6c5606e..a8d50b953cfc2 100644
--- a/ui/app/services/permissions.js
+++ b/ui/app/services/permissions.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Service, { inject as service } from '@ember/service';
 import { task } from 'ember-concurrency';
 
@@ -74,7 +69,7 @@ export default Service.extend({
     }
 
     try {
-      const resp = yield this.store.adapterFor('permissions').query();
+      let resp = yield this.store.adapterFor('permissions').query();
       this.setPaths(resp);
       return;
     } catch (err) {
@@ -95,15 +90,12 @@ export default Service.extend({
     this.set('canViewAll', null);
   },
 
-  hasNavPermission(navItem, routeParams, requireAll) {
+  hasNavPermission(navItem, routeParams) {
     if (routeParams) {
       // viewing the entity and groups pages require the list capability, while the others require the default, which is anything other than deny
-      const capability = routeParams === 'entities' || routeParams === 'groups' ? ['list'] : [null];
-      // check that the user has permission to access all (requireAll = true) or any of the routes when array is passed
-      // useful for hiding nav headings when user does not have access to any of the links
-      const params = Array.isArray(routeParams) ? routeParams : [routeParams];
-      const evalMethod = !Array.isArray(routeParams) || requireAll ? 'every' : 'some';
-      return params[evalMethod]((param) => this.hasPermission(API_PATHS[navItem][param], capability));
+      let capability = routeParams === 'entities' || routeParams === 'groups' ? ['list'] : [null];
+
+      return this.hasPermission(API_PATHS[navItem][routeParams], capability);
     }
     return Object.values(API_PATHS[navItem]).some((path) => this.hasPermission(path));
   },
diff --git a/ui/app/services/replication-mode.js b/ui/app/services/replication-mode.js
index 25316f827df9c..b9200a0b6a582 100644
--- a/ui/app/services/replication-mode.js
+++ b/ui/app/services/replication-mode.js
@@ -1,15 +1,10 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Service from '@ember/service';
 
 export default Service.extend({
   mode: null,
 
   getMode() {
-    return this.mode;
+    this.mode;
   },
 
   setMode(mode) {
diff --git a/ui/app/services/secret-mount-path.js b/ui/app/services/secret-mount-path.js
index a29239078d894..4d6caa83096bc 100644
--- a/ui/app/services/secret-mount-path.js
+++ b/ui/app/services/secret-mount-path.js
@@ -1,19 +1,14 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Service from '@ember/service';
 
 // this service tracks the path of the currently viewed secret mount
 // so that we can access that inside of engines where parent route params
 // are not accessible
-export default class SecretMountPath extends Service {
-  currentPath = '';
+export default Service.extend({
+  currentPath: null,
   update(path) {
-    this.currentPath = path;
-  }
+    this.set('currentPath', path);
+  },
   get() {
     return this.currentPath;
-  }
-}
+  },
+});
diff --git a/ui/app/services/store.js b/ui/app/services/store.js
index 5d0579facfe0c..bd5c9aed9af96 100644
--- a/ui/app/services/store.js
+++ b/ui/app/services/store.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Store from '@ember-data/store';
 import { schedule } from '@ember/runloop';
 import { copy } from 'ember-copy';
@@ -166,7 +161,7 @@ export default Store.extend({
             'query'
           )
         );
-        const model = this.peekAll(modelName).toArray();
+        let model = this.peekAll(modelName).toArray();
         model.set('meta', response.meta);
         resolve(model);
       });
@@ -189,7 +184,7 @@ export default Store.extend({
   },
 
   clearDataset(modelName) {
-    const cacheList = this.lazyCaches;
+    let cacheList = this.lazyCaches;
     if (!cacheList.size) return;
     if (modelName && cacheList.has(modelName)) {
       cacheList.delete(modelName);
diff --git a/ui/app/services/version.js b/ui/app/services/version.js
index cd3be849d53ad..3d5f03e371b29 100644
--- a/ui/app/services/version.js
+++ b/ui/app/services/version.js
@@ -1,73 +1,78 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
+import { readOnly, match, not } from '@ember/object/computed';
 import Service, { inject as service } from '@ember/service';
-import { keepLatestTask, task } from 'ember-concurrency';
-import { tracked } from '@glimmer/tracking';
-
-export default class VersionService extends Service {
-  @service store;
-  @tracked features = [];
-  @tracked version = null;
+import { computed } from '@ember/object';
+import { task } from 'ember-concurrency';
 
-  get hasPerfReplication() {
-    return this.features.includes('Performance Replication');
+const hasFeatureMethod = (context, featureKey) => {
+  const features = context.get('features');
+  if (!features) {
+    return false;
   }
+  return features.includes(featureKey);
+};
+const hasFeature = (featureKey) => {
+  return computed('features', 'features.[]', function () {
+    return hasFeatureMethod(this, featureKey);
+  });
+};
+export default Service.extend({
+  _features: null,
+  features: readOnly('_features'),
+  version: null,
+  store: service(),
 
-  get hasDRReplication() {
-    return this.features.includes('DR Replication');
-  }
+  hasPerfReplication: hasFeature('Performance Replication'),
 
-  get hasSentinel() {
-    return this.features.includes('Sentinel');
-  }
+  hasDRReplication: hasFeature('DR Replication'),
 
-  get hasNamespaces() {
-    return this.features.includes('Namespaces');
-  }
+  hasSentinel: hasFeature('Sentinel'),
+  hasNamespaces: hasFeature('Namespaces'),
 
-  get hasControlGroups() {
-    return this.features.includes('Control Groups');
-  }
+  isEnterprise: match('version', /\+.+$/),
 
-  get isEnterprise() {
-    if (!this.version) return false;
-    return this.version.includes('+');
-  }
+  isOSS: not('isEnterprise'),
 
-  get isOSS() {
-    return !this.isEnterprise;
-  }
+  setVersion(resp) {
+    this.set('version', resp.version);
+  },
 
-  @task
-  *getVersion() {
-    if (this.version) return;
-    const response = yield this.store.adapterFor('cluster').health();
-    this.version = response.version;
+  hasFeature(feature) {
+    return hasFeatureMethod(this, feature);
+  },
+
+  setFeatures(resp) {
+    if (!resp.features) {
+      return;
+    }
+    this.set('_features', resp.features);
+  },
+
+  getVersion: task(function* () {
+    if (this.version) {
+      return;
+    }
+    let response = yield this.store.adapterFor('cluster').health();
+    this.setVersion(response);
     return;
-  }
+  }),
 
-  @keepLatestTask
-  *getFeatures() {
+  getFeatures: task(function* () {
     if (this.features?.length || this.isOSS) {
       return;
     }
     try {
-      const response = yield this.store.adapterFor('cluster').features();
-      this.features = response.features;
+      let response = yield this.store.adapterFor('cluster').features();
+      this.setFeatures(response);
       return;
     } catch (err) {
       // if we fail here, we're likely in DR Secondary mode and don't need to worry about it
     }
-  }
+  }).keepLatest(),
 
-  fetchVersion() {
+  fetchVersion: function () {
     return this.getVersion.perform();
-  }
-
-  fetchFeatures() {
+  },
+  fetchFeatures: function () {
     return this.getFeatures.perform();
-  }
-}
+  },
+});
diff --git a/ui/app/services/wizard.js b/ui/app/services/wizard.js
index c245f035e1321..d1f272aa55227 100644
--- a/ui/app/services/wizard.js
+++ b/ui/app/services/wizard.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { next } from '@ember/runloop';
 import { typeOf } from '@ember/utils';
 import Service, { inject as service } from '@ember/service';
@@ -35,7 +30,7 @@ export default Service.extend(DEFAULTS, {
 
   initializeMachines() {
     if (!this.storageHasKey(TUTORIAL_STATE)) {
-      const state = TutorialMachine.initialState;
+      let state = TutorialMachine.initialState;
       this.saveState('currentState', state.value);
       this.saveExtState(TUTORIAL_STATE, state.value);
     }
@@ -43,7 +38,7 @@ export default Service.extend(DEFAULTS, {
     if (this.storageHasKey(COMPONENT_STATE)) {
       this.set('componentState', this.getExtState(COMPONENT_STATE));
     }
-    const stateNodes = TutorialMachine.getStateNodes(this.currentState);
+    let stateNodes = TutorialMachine.getStateNodes(this.currentState);
     this.executeActions(
       stateNodes.reduce((acc, node) => acc.concat(node.onEntry), []),
       null,
@@ -65,7 +60,7 @@ export default Service.extend(DEFAULTS, {
   },
 
   clearFeatureData() {
-    const storage = this.storage();
+    let storage = this.storage();
     // empty storage
     [FEATURE_LIST, FEATURE_STATE, FEATURE_STATE_HISTORY, COMPLETED_FEATURES].forEach((key) =>
       storage.removeItem(key)
@@ -79,7 +74,7 @@ export default Service.extend(DEFAULTS, {
 
   restartGuide() {
     this.clearFeatureData();
-    const storage = this.storage();
+    let storage = this.storage();
     // empty storage
     [TUTORIAL_STATE, COMPONENT_STATE, RESUME_URL, RESUME_ROUTE].forEach((key) => storage.removeItem(key));
     // reset wizard state
@@ -96,17 +91,17 @@ export default Service.extend(DEFAULTS, {
       this.featureMachineHistory === null &&
       (state === 'idle' || state === 'wrap')
     ) {
-      const newHistory = [state];
+      let newHistory = [state];
       this.set('featureMachineHistory', newHistory);
     } else {
       if (this.featureMachineHistory) {
         if (!this.featureMachineHistory.includes(state)) {
-          const newHistory = this.featureMachineHistory.addObject(state);
+          let newHistory = this.featureMachineHistory.addObject(state);
           this.set('featureMachineHistory', newHistory);
         } else {
           //we're repeating steps
-          const stepIndex = this.featureMachineHistory.indexOf(state);
-          const newHistory = this.featureMachineHistory.splice(0, stepIndex + 1);
+          let stepIndex = this.featureMachineHistory.indexOf(state);
+          let newHistory = this.featureMachineHistory.splice(0, stepIndex + 1);
           this.set('featureMachineHistory', newHistory);
         }
       }
@@ -122,7 +117,7 @@ export default Service.extend(DEFAULTS, {
     }
     let stateKey = '';
     while (typeOf(state) === 'object') {
-      const newState = Object.keys(state);
+      let newState = Object.keys(state);
       stateKey += newState + '.';
       state = state[newState];
     }
@@ -139,7 +134,7 @@ export default Service.extend(DEFAULTS, {
       this.set('componentState', extendedState);
       this.saveExtState(COMPONENT_STATE, extendedState);
     }
-    const { actions, value } = TutorialMachine.transition(currentState, event);
+    let { actions, value } = TutorialMachine.transition(currentState, event);
     this.saveState('currentState', value);
     this.saveExtState(TUTORIAL_STATE, this.currentState);
     this.executeActions(actions, event, 'tutorial');
@@ -154,7 +149,7 @@ export default Service.extend(DEFAULTS, {
       this.saveExtState(COMPONENT_STATE, extendedState);
     }
 
-    const { actions, value } = FeatureMachine.transition(currentState, event, this.componentState);
+    let { actions, value } = FeatureMachine.transition(currentState, event, this.componentState);
     this.saveState('featureState', value);
     this.saveExtState(FEATURE_STATE, value);
     this.executeActions(actions, event, 'feature');
@@ -186,9 +181,9 @@ export default Service.extend(DEFAULTS, {
   executeActions(actions, event, machineType) {
     let transitionURL;
     let expectedRouteName;
-    const router = this.router;
+    let router = this.router;
 
-    for (const action of actions) {
+    for (let action of actions) {
       let type = action;
       if (action.type) {
         type = action.type;
@@ -252,7 +247,7 @@ export default Service.extend(DEFAULTS, {
   },
 
   handlePaused() {
-    const expected = this.expectedURL;
+    let expected = this.expectedURL;
     if (expected) {
       this.saveExtState(RESUME_URL, this.expectedURL);
       this.saveExtState(RESUME_ROUTE, this.expectedRouteName);
@@ -260,7 +255,7 @@ export default Service.extend(DEFAULTS, {
   },
 
   handleResume() {
-    const resumeURL = this.storage().getItem(RESUME_URL);
+    let resumeURL = this.storage().getItem(RESUME_URL);
     if (!resumeURL) {
       return;
     }
@@ -293,7 +288,7 @@ export default Service.extend(DEFAULTS, {
       return;
     }
     this.startFeature();
-    const nextFeature = this.featureList.length > 1 ? capitalize(this.featureList.objectAt(1)) : 'Finish';
+    let nextFeature = this.featureList.length > 1 ? capitalize(this.featureList.objectAt(1)) : 'Finish';
     this.set('nextFeature', nextFeature);
     let next;
     if (this.currentMachine === 'secrets' && this.featureState === 'display') {
@@ -302,7 +297,7 @@ export default Service.extend(DEFAULTS, {
       next = FeatureMachine.transition(this.featureState, 'CONTINUE', this.componentState);
     }
     this.saveState('nextStep', next.value);
-    const stateNodes = FeatureMachine.getStateNodes(this.featureState);
+    let stateNodes = FeatureMachine.getStateNodes(this.featureState);
     this.executeActions(
       stateNodes.reduce((acc, node) => acc.concat(node.onEntry), []),
       null,
@@ -330,10 +325,10 @@ export default Service.extend(DEFAULTS, {
   },
 
   completeFeature() {
-    const features = this.featureList;
-    const done = features.shift();
+    let features = this.featureList;
+    let done = features.shift();
     if (!this.getExtState(COMPLETED_FEATURES)) {
-      const completed = [];
+      let completed = [];
       completed.push(done);
       this.saveExtState(COMPLETED_FEATURES, completed);
     } else {
diff --git a/ui/app/styles/app.scss b/ui/app/styles/app.scss
index d1d6618838838..765038eaa9edc 100644
--- a/ui/app/styles/app.scss
+++ b/ui/app/styles/app.scss
@@ -1,12 +1,5 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-@import './reset';
 @import 'ember-basic-dropdown';
 @import 'ember-power-select';
-@import '@hashicorp/design-system-components';
 @import './core';
 
 @mixin font-face($name) {
@@ -20,3 +13,13 @@
 // Font comes from npm package: https://www.npmjs.com/package/text-security
 // We took the font we wanted and moved it into the ui/fonts folder
 @include font-face('text-security-square');
+
+.sr-only {
+  clip: rect(0 0 0 0);
+  clip-path: inset(50%);
+  height: 1px;
+  overflow: hidden;
+  position: absolute;
+  white-space: nowrap;
+  width: 1px;
+}
diff --git a/ui/app/styles/components/action-block.scss b/ui/app/styles/components/action-block.scss
index cc049d25c55b9..895a776973d79 100644
--- a/ui/app/styles/components/action-block.scss
+++ b/ui/app/styles/components/action-block.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 @mixin stacked-grid {
   grid-template-columns: 1fr;
   grid-row: 1/1;
@@ -53,7 +48,7 @@
   display: flex;
   flex-wrap: wrap;
   margin: $spacing-m 0;
-  @include until($mobile) {
+  @include until($tablet) {
     display: block;
   }
 }
@@ -67,7 +62,7 @@
 
 .replication-actions-grid-item .action-block {
   width: 100%;
-  @include until($mobile) {
+  @include until($tablet) {
     height: inherit;
   }
 }
diff --git a/ui/app/styles/components/auth-buttons.scss b/ui/app/styles/components/auth-buttons.scss
index c0e1b98d6691f..452fb2fe1235d 100644
--- a/ui/app/styles/components/auth-buttons.scss
+++ b/ui/app/styles/components/auth-buttons.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .auth-button-tile {
   height: 31px;
   width: 31px;
diff --git a/ui/app/styles/components/auth-form.scss b/ui/app/styles/components/auth-form.scss
index 155e85b218346..5bba1043107fb 100644
--- a/ui/app/styles/components/auth-form.scss
+++ b/ui/app/styles/components/auth-form.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .auth-form {
   @extend .box;
   @extend .is-bottomless;
diff --git a/ui/app/styles/components/autocomplete-input.scss b/ui/app/styles/components/autocomplete-input.scss
deleted file mode 100644
index e0b270dc3a3a1..0000000000000
--- a/ui/app/styles/components/autocomplete-input.scss
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-.autocomplete-input {
-  background: $white !important;
-  border: 1px solid $grey-light;
-  box-sizing: border-box;
-  border-radius: 3px;
-  width: 99%;
-  padding: 4px 0;
-  margin-left: 0.5%;
-  margin-top: -4px;
-}
-
-.autocomplete-input-option {
-  padding: 12px;
-  &:hover {
-    background-color: $grey-lightest;
-    cursor: pointer;
-  }
-}
diff --git a/ui/app/styles/components/b64-toggle.scss b/ui/app/styles/components/b64-toggle.scss
index ea9164b6d9135..676e9365e4631 100644
--- a/ui/app/styles/components/b64-toggle.scss
+++ b/ui/app/styles/components/b64-toggle.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .b64-toggle {
   padding: 0.75rem;
   font-size: $size-9;
diff --git a/ui/app/styles/components/box-label.scss b/ui/app/styles/components/box-label.scss
index a489139813506..4899b6f12309a 100644
--- a/ui/app/styles/components/box-label.scss
+++ b/ui/app/styles/components/box-label.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 label.box-label {
   cursor: pointer;
 }
@@ -10,7 +5,7 @@ label.box-label {
 .box-label {
   @extend .box;
   @extend .is-centered;
-
+  @extend .is-gapless;
   border-color: $grey-light;
   border-radius: 3px;
   box-shadow: $box-link-shadow;
@@ -63,6 +58,6 @@ label.box-label {
   color: $grey;
 
   .is-selected & {
-    color: $grey-darkest;
+    color: $text;
   }
 }
diff --git a/ui/app/styles/components/box-radio.scss b/ui/app/styles/components/box-radio.scss
index 19d6e48d6a38d..ce786104e5370 100644
--- a/ui/app/styles/components/box-radio.scss
+++ b/ui/app/styles/components/box-radio.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .box-radio-container {
   display: flex;
   flex-wrap: wrap;
diff --git a/ui/app/styles/components/calendar-widget.scss b/ui/app/styles/components/calendar-widget.scss
index 03c6a6519c4ff..b96b374b6752d 100644
--- a/ui/app/styles/components/calendar-widget.scss
+++ b/ui/app/styles/components/calendar-widget.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 $dark-gray: #535f73;
 
 .calendar-content {
@@ -20,6 +15,27 @@ $dark-gray: #535f73;
 .calendar-title {
   padding: $size-10 $size-8;
 }
+.calendar-widget-dropdown {
+  @extend .button;
+  @extend .is-ghost;
+  @extend .has-icon-right;
+  border: 0;
+  color: $black;
+  transition: background-color $speed;
+  width: 150px;
+
+  &:hover {
+    background-color: $ui-gray-100;
+    border: 0;
+    color: $blue;
+  }
+
+  &.is-active {
+    background-color: $ui-gray-100;
+    border: 0;
+    color: $blue;
+  }
+}
 
 .select-year {
   grid-area: select-year;
@@ -46,18 +62,18 @@ $dark-gray: #535f73;
 
   > button {
     &.is-month-list {
-      background-color: $white;
+      background-color: white;
       color: black;
       text-align: center;
-      border: $light-border;
-      border-radius: $radius;
+      border: 1px solid $ui-gray-200;
+      border-radius: 2px;
     }
     &.is-current-month {
       border: 1px solid $ui-gray-900;
     }
     &:hover {
       background-color: lighten($dark-gray, 30%);
-      color: $white;
+      color: white;
       text-align: center;
       cursor: pointer;
     }
@@ -66,6 +82,12 @@ $dark-gray: #535f73;
       color: lighten($dark-gray, 30%);
       pointer-events: none;
     }
+    &.is-selected-month {
+      background-color: lighten($dark-gray, 30%);
+      color: white;
+      text-align: center;
+      pointer-events: none;
+    }
   }
 }
 
@@ -83,7 +105,7 @@ $dark-gray: #535f73;
   grid-template-rows: 0.7fr 3fr;
   box-shadow: $box-shadow, $box-shadow-middle;
   background-color: white;
-  border-radius: $radius;
+  border-radius: 2px;
 }
 
 .calendar-widget-grid {
@@ -97,13 +119,12 @@ $dark-gray: #535f73;
 // for modal-dialog tooltips
 .calendar-tooltip {
   background-color: $ui-gray-700;
-  color: $white;
+  color: white;
   font-size: $size-8;
   padding: $size-9;
   border-radius: $radius-large;
   width: 141px;
 }
-
 .ember-modal-dialog {
   z-index: 1000;
 }
diff --git a/ui/app/styles/components/codemirror.scss b/ui/app/styles/components/codemirror.scss
index ad06b2783cf80..dfc8563873c85 100644
--- a/ui/app/styles/components/codemirror.scss
+++ b/ui/app/styles/components/codemirror.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 $light-grey: #dde3e7;
 $light-gray: #a4a4a4;
 $light-grey-blue: #6c7b81;
@@ -36,9 +31,9 @@ $gutter-grey: #2a2f36;
 
 .cm-s-hashi-read-only {
   &.CodeMirror {
-    background-color: $grey-lightest;
+    background-color: $grey-lighter;
     border: none;
-    color: $ui-gray-600;
+    color: #626873;
     font-family: $family-monospace;
     -webkit-font-smoothing: auto;
     line-height: 1.4;
diff --git a/ui/app/styles/components/confirm.scss b/ui/app/styles/components/confirm.scss
index 2f6c826f4d1d7..9e80017ae91ed 100644
--- a/ui/app/styles/components/confirm.scss
+++ b/ui/app/styles/components/confirm.scss
@@ -1,12 +1,7 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .confirm-wrapper {
   position: relative;
   overflow: hidden;
-  border-radius: $radius;
+  border-radius: 2px;
   box-shadow: $box-shadow, $box-shadow-middle;
 }
 
@@ -37,16 +32,16 @@
   button.link,
   a {
     background-color: $white;
-    color: $grey-darkest;
+    color: $menu-item-color;
 
     &:hover {
-      background-color: $ui-gray-050;
-      color: $ui-gray-900;
+      background-color: $menu-item-hover-background-color;
+      color: $menu-item-hover-color;
     }
 
     &.is-active {
-      background-color: $blue-500;
-      color: $blue;
+      background-color: $menu-item-active-background-color;
+      color: $menu-item-active-color;
     }
 
     &.is-destroy {
@@ -76,7 +71,7 @@
 }
 
 .confirm-action > span {
-  @include from($mobile) {
+  @include from($tablet) {
     align-items: center;
     display: flex;
   }
@@ -88,7 +83,7 @@
   .confirm-action-text:not(.is-block) {
     text-align: right;
 
-    @include until($mobile) {
+    @include until($tablet) {
       display: block;
       margin-bottom: $size-8;
       text-align: left;
diff --git a/ui/app/styles/components/console-ui-panel.scss b/ui/app/styles/components/console-ui-panel.scss
index 3338726ee2eb9..1542dcaec7add 100644
--- a/ui/app/styles/components/console-ui-panel.scss
+++ b/ui/app/styles/components/console-ui-panel.scss
@@ -1,28 +1,22 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-$console-close-height: 35px;
-
 .console-ui-panel {
-  background: var(--token-color-palette-neutral-700);
-  width: -moz-available;
-  width: -webkit-fill-available;
+  background: linear-gradient(to right, #191a1c, #1b212d);
   height: 0;
-  min-height: 0;
-  overflow: auto;
+  left: 0;
   position: fixed;
-  bottom: 0;
-  transition: min-height $speed $easing, transform $speed ease-in;
+  min-height: 0;
+  overflow: scroll;
+  right: 0;
+  top: $header-height;
+  transition: min-height $speed ease-out, transform $speed ease-in;
   will-change: transform, min-height;
   -webkit-overflow-scrolling: touch;
+  width: 100vw;
   z-index: 199;
 
   .button {
     background: transparent;
     border: none;
-    color: $white;
+    color: $grey;
     min-width: 0;
     padding: 0 $size-8;
 
@@ -38,30 +32,30 @@ $console-close-height: 35px;
   color: $white;
   display: flex;
   flex-direction: column;
-  font-size: 14px;
+  font-size: $body-size;
   font-weight: $font-weight-semibold;
   justify-content: flex-end;
-  min-height: calc(100% - $console-close-height); // account for close button that is sticky positioned
-  padding: $size-8 $size-8 $size-5;
+  min-height: 100%;
+  padding: $size-8 $size-8 $size-4;
   transition: justify-content $speed ease-in;
 
   pre,
   p {
     background: none;
     color: inherit;
-    font-size: 14px;
+    font-size: $body-size;
     min-height: 2rem;
     padding: 0;
 
     &:not(.console-ui-command):not(.CodeMirror-line) {
-      padding-left: $size-4;
+      padding-left: $console-spacing;
     }
   }
 
   .cm-s-hashi.CodeMirror {
     background-color: rgba($black, 0.5) !important;
     font-weight: $font-weight-normal;
-    margin-left: $size-4;
+    margin-left: $console-spacing;
     padding: $size-8 $size-4;
   }
 }
@@ -79,17 +73,16 @@ $console-close-height: 35px;
 
   input {
     background-color: rgba($black, 0.5);
-    border: 1px solid var(--token-color-palette-neutral-500);
-    border-radius: 2px;
+    border: 0;
     caret-color: $white;
     color: $white;
     flex: 1 1 auto;
     font-family: $family-monospace;
     font-size: 16px;
     font-weight: $font-weight-bold;
+    margin-left: -$size-10;
     outline: none;
     padding: $size-10;
-    margin-right: $spacing-xs;
     transition: background-color $speed;
   }
 }
@@ -110,7 +103,7 @@ $console-close-height: 35px;
 }
 
 .console-ui-alert {
-  margin-left: calc(#{$size-4} - 0.33rem);
+  margin-left: calc(#{$console-spacing} - 0.33rem);
   position: relative;
 
   svg {
@@ -125,15 +118,33 @@ $console-close-height: 35px;
   min-height: 400px;
 }
 
-.main--console-open {
-  padding-bottom: 400px;
-}
-
 .panel-open .console-ui-panel.fullscreen {
   bottom: 0;
-  right: 0;
+  top: 0;
   min-height: 100vh;
-  width: 100%;
+}
+
+.panel-open {
+  .navbar,
+  .navbar-sections {
+    transition: transform $speed ease-in;
+  }
+}
+
+.panel-open.panel-fullscreen {
+  .navbar,
+  .navbar-sections {
+    @include from($mobile) {
+      transform: translateY(-100px);
+    }
+  }
+}
+
+header .navbar,
+header .navbar-sections {
+  z-index: 200;
+  transform: translateY(0);
+  will-change: transform;
 }
 
 .console-spinner.control {
@@ -152,14 +163,12 @@ $console-close-height: 35px;
 }
 
 .console-close-button {
-  position: sticky;
-  top: $spacing-xs;
-  height: $console-close-height;
-  display: flex;
-  justify-content: flex-end;
+  position: absolute;
+  top: -3.25rem;
+  right: $spacing-xs;
   z-index: 210;
 
-  button {
-    margin-right: $spacing-xs;
+  @include from($mobile) {
+    display: none;
   }
 }
diff --git a/ui/app/styles/components/control-group.scss b/ui/app/styles/components/control-group.scss
index 16146c5410a48..8419369ca516e 100644
--- a/ui/app/styles/components/control-group.scss
+++ b/ui/app/styles/components/control-group.scss
@@ -1,15 +1,10 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .control-group,
 .control-group-success {
   @extend .box;
   box-shadow: $box-shadow-middle, 0 0 1px $grey-dark;
 }
 .control-group-success.is-editor {
-  background: $grey-lightest;
+  background: $grey-lighter;
 }
 
 .control-group a {
@@ -18,7 +13,7 @@
 .control-group-header {
   box-shadow: 0 0 1px currentColor;
   padding: $size-9 $size-6;
-  background: $grey-lightest;
+  background: $grey-lighter;
   color: $grey-dark;
   position: relative;
   strong {
diff --git a/ui/app/styles/components/diff-version-selector.scss b/ui/app/styles/components/diff-version-selector.scss
index a9432f190059e..13c1d2345c727 100644
--- a/ui/app/styles/components/diff-version-selector.scss
+++ b/ui/app/styles/components/diff-version-selector.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .visual-diff {
   background-color: black;
 
diff --git a/ui/app/styles/components/doc-link.scss b/ui/app/styles/components/doc-link.scss
index cc18482d79207..dd037117147fb 100644
--- a/ui/app/styles/components/doc-link.scss
+++ b/ui/app/styles/components/doc-link.scss
@@ -1,10 +1,5 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .doc-link {
-  color: $blue;
+  color: $link;
   text-decoration: none;
   font-weight: $font-weight-semibold;
   &:hover {
diff --git a/ui/app/styles/components/empty-state-component.scss b/ui/app/styles/components/empty-state-component.scss
deleted file mode 100644
index 2bfd5d6253258..0000000000000
--- a/ui/app/styles/components/empty-state-component.scss
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-.empty-state {
-  align-items: center;
-  color: $grey;
-  background: $ui-gray-010;
-  display: flex;
-  justify-content: center;
-  padding: $spacing-xxl $spacing-s;
-  box-shadow: 0 -2px 0 -1px $ui-gray-300;
-}
-
-.empty-state-transparent {
-  align-items: center;
-  color: $grey;
-  background: transparent;
-  display: flex;
-  justify-content: center;
-  padding: $spacing-xxl 0;
-  box-shadow: none;
-}
-
-.empty-state-content {
-  max-width: 320px;
-}
-
-.empty-state-title {
-  color: $grey;
-  font-size: $size-4;
-  font-weight: $font-weight-semibold;
-  line-height: 1.2;
-  margin-bottom: $spacing-xs;
-}
-
-.empty-state-subTitle {
-  font-size: $size-7;
-  margin-top: -10px;
-  padding-bottom: $spacing-s;
-}
-
-.empty-state-message.has-border-bottom-light {
-  padding-bottom: $spacing-s;
-}
-
-.empty-state-actions {
-  margin-top: $spacing-xs;
-  display: flex;
-  justify-content: space-between;
-
-  a,
-  .link,
-  a:not(.button):not(.file-delete-button):not(.tag) {
-    color: $blue;
-    font-size: $size-8;
-    font-weight: $font-weight-semibold;
-    text-decoration: none;
-  }
-
-  > * + * {
-    margin-left: $spacing-s;
-    margin-right: $spacing-s;
-  }
-}
-
-.empty-state-icon > .hs-icon,
-.empty-state-icon > .flight-icon {
-  float: left;
-  margin-right: $spacing-xs;
-}
diff --git a/ui/app/styles/components/empty-state.scss b/ui/app/styles/components/empty-state.scss
new file mode 100644
index 0000000000000..f45663eb450f5
--- /dev/null
+++ b/ui/app/styles/components/empty-state.scss
@@ -0,0 +1,67 @@
+.empty-state {
+  align-items: center;
+  color: $grey;
+  background: $ui-gray-010;
+  display: flex;
+  justify-content: center;
+  padding: $spacing-xxl $spacing-s;
+  box-shadow: 0 -2px 0 -1px $ui-gray-300;
+}
+
+.empty-state-transparent {
+  align-items: center;
+  color: $grey;
+  background: transparent;
+  display: flex;
+  justify-content: center;
+  padding: $spacing-xxl 0;
+  box-shadow: none;
+}
+
+.empty-state-content {
+  max-width: 320px;
+}
+
+.empty-state-title {
+  color: $grey;
+  font-size: $size-4;
+  font-weight: $font-weight-semibold;
+  line-height: 1.2;
+  margin-bottom: $spacing-xs;
+}
+
+.empty-state-subTitle {
+  font-size: $size-7;
+  margin-top: -10px;
+  padding-bottom: $spacing-s;
+}
+
+.empty-state-message.has-border-bottom-light {
+  padding-bottom: $spacing-s;
+}
+
+.empty-state-actions {
+  margin-top: $spacing-xs;
+  display: flex;
+  justify-content: space-between;
+
+  a,
+  .link,
+  a:not(.button):not(.file-delete-button):not(.tag) {
+    color: $blue;
+    font-size: $size-8;
+    font-weight: $font-weight-semibold;
+    text-decoration: none;
+  }
+
+  > * + * {
+    margin-left: $spacing-s;
+    margin-right: $spacing-s;
+  }
+}
+
+.empty-state-icon > .hs-icon,
+.empty-state-icon > .flight-icon {
+  float: left;
+  margin-right: $spacing-xs;
+}
diff --git a/ui/app/styles/components/env-banner.scss b/ui/app/styles/components/env-banner.scss
index f18e90ce0fceb..607abd2447fbf 100644
--- a/ui/app/styles/components/env-banner.scss
+++ b/ui/app/styles/components/env-banner.scss
@@ -1,20 +1,10 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .env-banner {
   align-self: center;
-  border-radius: $size-1;
-  background: linear-gradient(
-    135deg,
-    $blue,
-    hsl(271, 100%, 71%)
-  ); // only use case for purple in the app. define here instead of utils/color_var
+  border-radius: 3rem;
+  background: linear-gradient(135deg, $blue, $purple);
   animation: env-banner-color-rotate 8s infinite linear alternate;
   color: $white;
   margin-top: -20px;
-  margin-bottom: 6px;
 
   .hs-icon {
     margin: 0;
diff --git a/ui/app/styles/components/features-selection.scss b/ui/app/styles/components/features-selection.scss
index ac5904db05482..b7bac96337bde 100644
--- a/ui/app/styles/components/features-selection.scss
+++ b/ui/app/styles/components/features-selection.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .feature-header {
   font-size: $size-6;
   font-weight: $font-weight-semibold;
diff --git a/ui/app/styles/components/form-section.scss b/ui/app/styles/components/form-section.scss
index e351d9f9ba840..a6bbe524c22c5 100644
--- a/ui/app/styles/components/form-section.scss
+++ b/ui/app/styles/components/form-section.scss
@@ -1,15 +1,13 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .form-section {
   padding: 1.75rem 0;
   box-shadow: 0 -1px 0 0 rgba($black, 0.1);
+
+  > p.has-padding-bottom {
+    padding-bottom: 1.5rem;
+  }
 }
 
-.field:first-child .form-section,
-.box > .field > .field.form-section.string-list {
+.field:first-child .form-section {
   padding: 0;
   box-shadow: none;
 }
diff --git a/ui/app/styles/components/global-flash.scss b/ui/app/styles/components/global-flash.scss
index 1b5f77fc42754..f74d4553788c4 100644
--- a/ui/app/styles/components/global-flash.scss
+++ b/ui/app/styles/components/global-flash.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .global-flash {
   bottom: 0;
   left: $spacing-s;
diff --git a/ui/app/styles/components/hover-copy-button.scss b/ui/app/styles/components/hover-copy-button.scss
index bfe748a304331..2d45dace4a095 100644
--- a/ui/app/styles/components/hover-copy-button.scss
+++ b/ui/app/styles/components/hover-copy-button.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .has-copy-button {
   position: relative;
   color: $grey;
diff --git a/ui/app/styles/components/icon.scss b/ui/app/styles/components/icon.scss
index 1ed636d43a0f2..c97c63ed67957 100644
--- a/ui/app/styles/components/icon.scss
+++ b/ui/app/styles/components/icon.scss
@@ -1,33 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-.icon {
-  align-items: center;
-  display: inline-flex;
-  height: $size-4;
-  justify-content: center;
-  vertical-align: middle;
-  width: $size-4;
-  // override the display if .button.icon to .button's default display: inline-block. See manage namespaces icon button in the namespace picker
-  &.button {
-    display: inline-block;
-  }
-}
-
-.icon-blue {
-  color: $blue;
-}
-
-.flight-icon {
-  &.flight-icon-display-inline {
-    vertical-align: middle;
-    margin-left: $spacing-xxs;
-    margin-right: $spacing-xxs;
-  }
-}
-
 .hs-icon {
   flex: 0 0 auto;
   display: inline-flex;
@@ -64,7 +34,6 @@
   width: 24px;
   height: 24px;
 }
-
 .hs-icon-xl {
   width: 28px;
   height: 28px;
@@ -75,10 +44,14 @@
   height: 32px;
 }
 
-.brand-icon-large {
-  width: 62px;
+.flight-icon {
+  &.flight-icon-display-inline {
+    vertical-align: middle;
+    margin-left: 4px;
+    margin-right: 4px;
+  }
 }
 
-.error-icon {
-  width: 48px;
+.icon-blue {
+  color: $blue;
 }
diff --git a/ui/app/styles/components/info-table-row.scss b/ui/app/styles/components/info-table-row.scss
index 9112fddedba80..1203af22422bd 100644
--- a/ui/app/styles/components/info-table-row.scss
+++ b/ui/app/styles/components/info-table-row.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .info-table-row {
   box-shadow: 0 1px 0 $grey-light;
   margin: 0;
@@ -11,7 +6,7 @@
     box-shadow: none;
   }
 
-  @include from($mobile) {
+  @include from($tablet) {
     display: flex;
   }
 
@@ -27,6 +22,7 @@
 
   .column {
     align-self: center;
+    padding-left: 0px;
     padding: $spacing-m;
 
     &.info-table-row-edit {
@@ -48,13 +44,11 @@
   }
 
   .hs-icon {
-    margin-right: $size-11;
+    margin-right: 0.25rem;
   }
-
   .icon-true {
     color: $green-500;
   }
-
   .icon-false {
     color: $ui-gray-300;
   }
@@ -65,14 +59,14 @@
 }
 
 .info-table-row:not(.is-mobile) .column {
-  @include until($mobile) {
+  @include until($tablet) {
     padding: 0;
   }
 
   &:first-child {
     padding-left: 0;
 
-    @include until($mobile) {
+    @include until($tablet) {
       padding: $size-8 0 0;
     }
   }
@@ -80,7 +74,7 @@
   &:last-child {
     padding-right: 0;
 
-    @include until($mobile) {
+    @include until($tablet) {
       padding: 0 0 $size-8;
     }
   }
@@ -88,11 +82,8 @@
 
 .info-table-row-header {
   margin: 0;
-  font-size: $size-8;
-  color: $grey;
-  font-weight: $font-weight-semibold;
 
-  @include until($mobile) {
+  @include until($tablet) {
     display: none;
   }
   .info-table-row:not(.is-mobile) .column:last-child {
diff --git a/ui/app/styles/components/info-table.scss b/ui/app/styles/components/info-table.scss
new file mode 100644
index 0000000000000..00d9678a13d23
--- /dev/null
+++ b/ui/app/styles/components/info-table.scss
@@ -0,0 +1,9 @@
+.info-table {
+  &.vlt-table td {
+    padding-top: 0px;
+    padding-bottom: 0px;
+  }
+  .info-table-row {
+    box-shadow: none;
+  }
+}
diff --git a/ui/app/styles/components/init-illustration.scss b/ui/app/styles/components/init-illustration.scss
index c7f14ee50e12f..1f18018b8c1d6 100644
--- a/ui/app/styles/components/init-illustration.scss
+++ b/ui/app/styles/components/init-illustration.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .init-box {
   position: relative;
   z-index: 10;
diff --git a/ui/app/styles/components/input-hint.scss b/ui/app/styles/components/input-hint.scss
new file mode 100644
index 0000000000000..6e9e688e29120
--- /dev/null
+++ b/ui/app/styles/components/input-hint.scss
@@ -0,0 +1,5 @@
+.input-hint {
+  padding: 0 $size-9;
+  font-size: $size-8;
+  color: $grey;
+}
diff --git a/ui/app/styles/components/kmip-role-edit.scss b/ui/app/styles/components/kmip-role-edit.scss
index e878c19eae991..5e4c34ad3aeda 100644
--- a/ui/app/styles/components/kmip-role-edit.scss
+++ b/ui/app/styles/components/kmip-role-edit.scss
@@ -1,8 +1,8 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
+.kmip-allowed-operations-header {
+  @extend .title;
+  @extend .is-6;
+  padding-left: $spacing-s;
+}
 .kmip-role-allowed-operations {
   @extend .box;
   flex: 1 1 auto;
diff --git a/ui/app/styles/components/known-secondaries-card.scss b/ui/app/styles/components/known-secondaries-card.scss
index cb21c7c990cb6..63f1025be2f2e 100644
--- a/ui/app/styles/components/known-secondaries-card.scss
+++ b/ui/app/styles/components/known-secondaries-card.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .selectable-card.secondaries {
   grid-column: 2/3;
   grid-row: 1/3;
diff --git a/ui/app/styles/components/license-banners.scss b/ui/app/styles/components/license-banners.scss
index 665beeec5bd8a..2c12f180099ad 100644
--- a/ui/app/styles/components/license-banners.scss
+++ b/ui/app/styles/components/license-banners.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .license-banner-wrapper {
   width: 100%;
   max-width: 1344px;
diff --git a/ui/app/styles/components/linkable-item.scss b/ui/app/styles/components/linkable-item.scss
new file mode 100644
index 0000000000000..e7142c2162253
--- /dev/null
+++ b/ui/app/styles/components/linkable-item.scss
@@ -0,0 +1,12 @@
+.linkable-item {
+  display: grid;
+  grid-template-columns: minmax(0, 1fr) 50px 35px;
+  gap: 1em 1em;
+}
+
+.linkable-item-menu {
+  box-sizing: border-box;
+  grid-column: 3;
+  grid-row: 1;
+  align-self: center;
+}
diff --git a/ui/app/styles/components/linked-block.scss b/ui/app/styles/components/linked-block.scss
index 5b21d2564e259..2c86ba24c1f91 100644
--- a/ui/app/styles/components/linked-block.scss
+++ b/ui/app/styles/components/linked-block.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .linked-block {
   cursor: pointer;
 }
@@ -10,16 +5,3 @@
 .linked-block .columns {
   @extend .is-flex-center;
 }
-
-.linked-block-item {
-  display: grid;
-  grid-template-columns: minmax(0, 1fr) 50px 35px;
-  gap: 1em 1em;
-}
-
-.linked-block-popup-menu {
-  box-sizing: border-box;
-  grid-column: 3;
-  grid-row: 1;
-  align-self: center;
-}
diff --git a/ui/app/styles/components/list-item-row.scss b/ui/app/styles/components/list-item-row.scss
index 24a27ca8d4e23..9bdc702f3e9b9 100644
--- a/ui/app/styles/components/list-item-row.scss
+++ b/ui/app/styles/components/list-item-row.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .list-item-row {
   @extend .box;
   @extend .is-sideless;
@@ -41,10 +36,10 @@ a.list-item-row,
   &:hover,
   &:focus,
   &:active {
-    margin-left: #{-$size-9} !important;
-    margin-right: #{-$size-9} !important;
-    padding-left: $size-9;
-    padding-right: $size-9;
+    margin-left: #{-$column-gap} !important;
+    margin-right: #{-$column-gap} !important;
+    padding-left: $column-gap;
+    padding-right: $column-gap;
     position: relative;
     box-shadow: 0 2px 0 -1px $grey-light, 0 -2px 0 -1px $grey-light, $box-link-hover-shadow,
       $box-shadow-middle;
diff --git a/ui/app/styles/components/list-pagination.scss b/ui/app/styles/components/list-pagination.scss
index 5f487c4718a43..4f2d28ec175f7 100644
--- a/ui/app/styles/components/list-pagination.scss
+++ b/ui/app/styles/components/list-pagination.scss
@@ -1,55 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-// This file combines Bulma CSS with our own CSS that previously overrode Bulma. In the future we should adopt the HDS pagination.
-
-.pagination-previous[disabled],
-.pagination-next[disabled],
-.pagination-link[disabled],
-.pagination-ellipsis[disabled] {
-  cursor: not-allowed;
-}
-
-.pagination-previous,
-.pagination-next,
-.pagination-link,
-.pagination-ellipsis,
-.tabs {
-  user-select: none;
-}
-
-.pagination-previous,
-.pagination-next,
-.pagination-link,
-.pagination-ellipsis {
-  align-items: center;
-  box-shadow: none;
-  display: inline-flex;
-  font-size: $size-6;
-  justify-content: flex-start;
-  line-height: 1.5;
-  margin: $size-11;
-  padding-bottom: calc(0.5em - 1px);
-  padding-left: calc(0.75em - 1px);
-  padding-right: calc(0.75em - 1px);
-  padding-top: calc(0.5em - 1px);
-  position: relative;
-  vertical-align: top;
-}
-
-.pagination-link.is-current {
-  color: $white;
-}
-
-.pagination-list {
-  flex-grow: 1;
-  flex-shrink: 1;
-  justify-content: flex-start;
-  order: 1;
-}
-
 .list-pagination {
   @extend .has-slim-padding;
   position: relative;
@@ -76,21 +24,8 @@
   .pagination {
     justify-content: center;
   }
-
   .pagination-list {
     flex-grow: 0;
-    flex-wrap: wrap;
-
-    li {
-      list-style: none;
-    }
-  }
-  .pagination,
-  .pagination-list {
-    align-items: center;
-    display: flex;
-    justify-content: center;
-    text-align: center;
   }
   .pagination-ellipsis {
     margin: 0;
@@ -98,7 +33,6 @@
     padding-right: 0;
   }
 }
-
 .list-pagination .pagination-previous,
 .list-pagination .pagination-next {
   @extend .button;
@@ -106,11 +40,9 @@
   @extend .is-outlined;
   @extend .is-compact;
   background: $white;
-  border-color: $blue-500;
-  color: $blue-500;
   max-width: 8rem;
 
-  @include until($mobile) {
+  @include until($tablet) {
     max-width: 2rem;
     padding-left: 0;
     padding-right: 0;
@@ -118,7 +50,7 @@
 
   .pagination-next-label,
   .pagination-previous-label {
-    @include until($mobile) {
+    @include until($tablet) {
       display: none;
     }
   }
@@ -139,62 +71,8 @@
   }
 }
 
-.pagination-previous {
-  order: 1;
-}
-
-.pagination-next {
-  order: 3;
-}
-
-.pagination.is-centered {
-  &.pagination-previous {
-    order: 1;
-  }
-
-  &.pagination-list {
-    justify-content: center;
-    order: 2;
-  }
-
-  &.pagination-next {
-    order: 3;
-  }
-}
-
-.pagination.is-right {
-  &.pagination-previous {
-    order: 1;
-  }
-
-  &.pagination-next {
-    order: 2;
-  }
-
-  &.pagination-list {
-    justify-content: flex-end;
-    order: 3;
-  }
-}
-
-// responsive css
-@media screen and (max-width: 768px) {
-  .pagination {
-    flex-wrap: wrap;
-  }
-  .pagination-previous,
-  .pagination-next {
-    flex-grow: 1;
-    flex-shrink: 1;
-  }
-  .pagination-list li {
-    flex-grow: 1;
-    flex-shrink: 1;
-  }
-}
-
 .list-pagination .pagination-next {
-  @include until($mobile) {
+  @include until($tablet) {
     order: 3;
   }
 }
diff --git a/ui/app/styles/components/loader.scss b/ui/app/styles/components/loader.scss
index 51495cfa3db36..df2121b170c66 100644
--- a/ui/app/styles/components/loader.scss
+++ b/ui/app/styles/components/loader.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .loader-inner-page {
   height: 60vh;
 }
diff --git a/ui/app/styles/components/login-form.scss b/ui/app/styles/components/login-form.scss
index a04229b01fbc8..2740bf9446c58 100644
--- a/ui/app/styles/components/login-form.scss
+++ b/ui/app/styles/components/login-form.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .login-form {
   box-shadow: $box-shadow, $box-shadow-high;
   overflow: auto;
diff --git a/ui/app/styles/components/masked-input.scss b/ui/app/styles/components/masked-input.scss
index 03d78689344e2..32f6c5aac90b1 100644
--- a/ui/app/styles/components/masked-input.scss
+++ b/ui/app/styles/components/masked-input.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .masked-font {
   color: $ui-gray-300;
 }
@@ -24,7 +19,7 @@
 // need to be the same font and small
 .masked-input.masked .masked-value {
   font-size: 9px;
-  font-family: $family-sans;
+  font-family: $family-primary;
   line-height: 2.5;
 }
 
@@ -49,16 +44,14 @@
 }
 
 .button.masked-input-toggle,
-.button.copy-button,
-.button.download-button {
+.button.copy-button {
   min-width: $spacing-xl;
   border-left: 0;
   color: $grey;
   box-shadow: 0 3px 1px 0px rgba(10, 10, 10, 0.12);
 }
 
-.button.copy-button,
-.button.download-button {
+.button.copy-button {
   border-radius: 0;
 }
 
@@ -68,8 +61,7 @@
 
 .display-only {
   .button.masked-input-toggle,
-  .button.copy-button,
-  .button.download-button {
+  .button.copy-button {
     background: transparent;
     height: auto;
     line-height: 1rem;
@@ -83,6 +75,7 @@
     &:active,
     &.is-active,
     &:focus,
+    &.is-focused,
     &:hover,
     &:focus:not(:active) {
       color: $blue;
diff --git a/ui/app/styles/components/modal-component.scss b/ui/app/styles/components/modal-component.scss
deleted file mode 100644
index fbc55fdd31fe8..0000000000000
--- a/ui/app/styles/components/modal-component.scss
+++ /dev/null
@@ -1,161 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-.modal {
-  align-items: center;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  top: 0;
-  display: none;
-  justify-content: center;
-  overflow: hidden;
-  position: fixed;
-  z-index: 20;
-
-  &.is-active {
-    display: flex;
-  }
-}
-
-.modal-background {
-  background: $ui-gray-100;
-  bottom: 0;
-  left: 0;
-  opacity: 0.9;
-  position: absolute;
-  right: 0;
-  top: 0;
-}
-
-.modal-card {
-  box-shadow: $box-shadow-highest;
-  border: 1px solid $grey-light;
-  display: flex;
-  flex-direction: column;
-  max-height: calc(100vh - 70px);
-  margin-top: 60px;
-  min-width: calc(100vw * 0.3);
-  overflow: hidden;
-  position: relative;
-
-  &-head {
-    border-radius: 0;
-    background-color: $grey-lightest;
-    border-bottom: 1px solid $grey-light;
-    display: flex;
-    justify-content: flex-start;
-    padding: 20px;
-  }
-
-  &-foot {
-    border-radius: 0;
-    border: 0;
-    background-color: $white;
-    padding: 20px;
-
-    .button:not(:last-child) {
-      margin-right: 10px;
-    }
-  }
-
-  &-title.title {
-    margin: 0;
-    flex-grow: 1;
-  }
-
-  .copy-text {
-    background-color: $grey-lightest;
-    padding: $spacing-s;
-    margin-bottom: $spacing-s;
-
-    code {
-      overflow: scroll;
-      max-width: calc(100% - 36px);
-      background-color: inherit;
-    }
-  }
-
-  .copy-close {
-    margin-top: $spacing-s;
-  }
-}
-
-.modal-card-title.title {
-  display: flex;
-  align-items: center;
-}
-
-.modal-card-body {
-  background-color: $white;
-  flex-grow: 1;
-  flex-shrink: 1;
-  overflow: auto;
-  padding: 20px;
-}
-
-pre {
-  background-color: inherit;
-}
-
-.is-highlight {
-  .modal-card-head {
-    background: $yellow-010;
-    border: 1px solid $yellow-100;
-  }
-  .modal-card-title {
-    color: $yellow-dark;
-  }
-}
-
-.modal-confirm-section {
-  margin: $spacing-xl 0 $spacing-m;
-}
-
-.modal-card-foot-outlined {
-  background: $ui-gray-050;
-  border-top: $base-border;
-}
-
-.modal-radio-button {
-  display: flex;
-  align-items: baseline;
-  margin-bottom: $spacing-xs;
-
-  input {
-    top: 2px;
-  }
-
-  .helper-text {
-    margin-left: 10px;
-  }
-}
-
-// customize spacing (.modal-card-body is restricted to padding: 20px)
-.modal-card-custom {
-  background-color: white;
-  flex-grow: 1;
-  flex-shrink: 1;
-  overflow: auto;
-
-  &.has-padding-m {
-    padding: $spacing-m;
-  }
-
-  &.has-padding-btm-left {
-    padding-bottom: $spacing-m;
-    padding-left: $spacing-m;
-  }
-}
-
-// responsive css
-@media screen and (min-width: 769px), print {
-  .modal-card,
-  .modal-content {
-    margin: 0 auto;
-    max-height: calc(100vh - 40px);
-    width: 640px;
-  }
-}
diff --git a/ui/app/styles/components/modal.scss b/ui/app/styles/components/modal.scss
new file mode 100644
index 0000000000000..9378ced2f1df7
--- /dev/null
+++ b/ui/app/styles/components/modal.scss
@@ -0,0 +1,92 @@
+.modal-background {
+  background: rgb(235, 238, 242, 0.9);
+}
+
+.modal-card {
+  box-shadow: $box-shadow-highest;
+  border: 1px solid $grey-light;
+  max-height: calc(100vh - 70px);
+  margin-top: 60px;
+
+  &-head {
+    border-radius: 0;
+    background-color: $grey-lightest;
+    border-bottom: 1px solid $grey-light;
+  }
+
+  &-foot {
+    border-radius: 0;
+    border: 0;
+    background-color: $white;
+  }
+
+  &-title.title {
+    margin: 0;
+  }
+
+  .copy-text {
+    background-color: $grey-lightest;
+    padding: $spacing-s;
+    margin-bottom: $spacing-s;
+
+    code {
+      overflow: scroll;
+      max-width: calc(100% - 36px);
+      background-color: inherit;
+    }
+  }
+
+  .copy-close {
+    margin-top: $spacing-s;
+  }
+}
+
+.modal-card-title.title {
+  display: flex;
+  align-items: center;
+}
+
+pre {
+  background-color: inherit;
+}
+
+.is-highlight {
+  .modal-card-head {
+    background: $yellow-010;
+    border: 1px solid $yellow-100;
+  }
+  .modal-card-title {
+    color: $yellow-dark;
+  }
+}
+
+.modal-confirm-section .is-help {
+  color: $grey;
+  margin: $spacing-xxs 0;
+  strong {
+    color: inherit;
+  }
+}
+
+.modal-confirm-section {
+  margin: $spacing-xl 0 $spacing-m;
+}
+
+.modal-card-foot-outlined {
+  background: #f7f8fa;
+  border-top: 1px solid #bac1cc;
+}
+
+.modal-radio-button {
+  display: flex;
+  align-items: baseline;
+  margin-bottom: $spacing-xs;
+
+  input {
+    top: 2px;
+  }
+
+  .helper-text {
+    margin-left: 10px;
+  }
+}
diff --git a/ui/app/styles/components/namespace-picker.scss b/ui/app/styles/components/namespace-picker.scss
index 367f4c9844f67..596bad2f32e2d 100644
--- a/ui/app/styles/components/namespace-picker.scss
+++ b/ui/app/styles/components/namespace-picker.scss
@@ -1,37 +1,64 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .namespace-picker {
   position: relative;
-  color: var(--token-color-palette-neutral-300);
+  color: $white;
   display: flex;
+  fill: $white;
   padding: $spacing-xxs $spacing-xs;
   width: 100%;
+
+  @include from($mobile) {
+    margin-left: -$spacing-xs;
+    padding: $spacing-xxs 0 $spacing-xxs $spacing-s;
+    width: auto;
+  }
 }
 
 .namespace-picker.no-namespaces {
   border: none;
   padding-right: 0;
 }
-
 .namespace-picker-trigger {
   align-items: center;
   display: flex;
   flex: 1 1 auto;
   height: 2rem;
   justify-content: space-between;
-  margin-right: $spacing-xxs;
-}
+  padding: 0;
+  text-align: left;
+
+  @include from($mobile) {
+    height: auto;
+    padding: $spacing-xs $spacing-m;
+  }
+
+  .is-status-chevron {
+    transform: rotate(-90deg);
 
+    @include from($mobile) {
+      transform: rotate(0deg);
+    }
+  }
+
+  &.ember-basic-dropdown-trigger--below .is-status-chevron {
+    transform: rotate(0deg);
+
+    @include from($mobile) {
+      transform: rotate(180deg);
+    }
+  }
+}
 .namespace-name {
+  display: inline-block;
+  flex: 1 1 auto;
   font-size: 1rem;
-  margin-left: $spacing-xs;
-}
+  margin: 0 $spacing-xs;
 
+  @include from($mobile) {
+    margin-left: $size-10;
+  }
+}
 .namespace-picker-content {
-  width: 250px;
+  width: $drawer-width - ($spacing-xs * 2);
   max-height: 300px;
   overflow: auto;
   border-radius: $radius;
@@ -40,12 +67,16 @@
   &.ember-basic-dropdown-content {
     background: $white;
   }
-}
 
+  @include from($mobile) {
+    width: $drawer-width;
+  }
+}
 .namespace-picker-content .level-left {
   max-width: 210px;
   overflow-wrap: break-word;
   word-wrap: break-word;
+  -ms-word-break: break-all;
   word-break: break-all;
   word-break: break-word;
 }
@@ -59,14 +90,6 @@
 
 .namespace-manage-link {
   border-top: 1px solid rgba($black, 0.1);
-
-  .level-left {
-    font-weight: $font-weight-bold;
-    font-size: 14px;
-  }
-  .level-right {
-    margin-right: 10px;
-  }
 }
 
 .namespace-list {
@@ -84,11 +107,6 @@
 .namespace-link.is-current {
   margin-top: $size-8;
   margin-right: -$size-10;
-
-  svg {
-    margin-top: 2px;
-    color: var(--token-color-border-strong);
-  }
 }
 
 .leaf-panel {
@@ -104,11 +122,9 @@
   bottom: 0;
   z-index: 1;
 }
-
 .leaf-panel-left {
   transform: translateX(-$drawer-width);
 }
-
 .leaf-panel-adding,
 .leaf-panel-current {
   position: relative;
@@ -116,7 +132,6 @@
     margin-bottom: 4px;
   }
 }
-
 .animated-list {
   .leaf-panel-exiting,
   .leaf-panel-adding {
@@ -124,7 +139,6 @@
     z-index: 20;
   }
 }
-
 .leaf-panel-adding {
   z-index: 100;
 }
diff --git a/ui/app/styles/components/namespace-reminder.scss b/ui/app/styles/components/namespace-reminder.scss
index 462f92e3fc661..d5503069e7385 100644
--- a/ui/app/styles/components/namespace-reminder.scss
+++ b/ui/app/styles/components/namespace-reminder.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .namespace-reminder {
   color: $grey;
   margin: 0 0 $size-6 0;
diff --git a/ui/app/styles/components/navigate-input.scss b/ui/app/styles/components/navigate-input.scss
index c0e20102fb8b4..471e851770ac9 100644
--- a/ui/app/styles/components/navigate-input.scss
+++ b/ui/app/styles/components/navigate-input.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .search-icon {
   position: absolute;
   top: 6px;
diff --git a/ui/app/styles/components/page-header.scss b/ui/app/styles/components/page-header.scss
index 04c0ddf1ba287..e4fdbf7853f2d 100644
--- a/ui/app/styles/components/page-header.scss
+++ b/ui/app/styles/components/page-header.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .page-header {
   padding-bottom: $size-10;
   padding-top: $size-4;
@@ -15,18 +10,18 @@
     flex-grow: 1;
     flex-shrink: 1;
 
-    @include until($mobile) {
+    @include until($tablet) {
       margin-top: 0.5rem;
     }
   }
   .level-right {
-    @include from($mobile) {
+    @include from($tablet) {
       justify-content: flex-end;
     }
   }
 
   .title {
-    margin-top: $size-2;
+    margin-top: $size-1;
   }
 
   .title-with-icon {
diff --git a/ui/app/styles/components/popup-menu.scss b/ui/app/styles/components/popup-menu.scss
index 6a1fc14983b27..56446ab912b41 100644
--- a/ui/app/styles/components/popup-menu.scss
+++ b/ui/app/styles/components/popup-menu.scss
@@ -1,15 +1,10 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .popup-menu-content,
 .ember-power-select-options {
-  border-radius: $radius;
+  border-radius: 2px;
   margin: -2px 0 0 0;
 
   & > .box {
-    border-radius: $radius;
+    border-radius: 2px;
     box-shadow: $box-shadow, $box-shadow-middle;
     padding: 0;
     position: relative;
@@ -53,17 +48,16 @@
   .ember-power-select-option[aria-current='true'],
   a {
     background-color: $white;
-    color: $grey-darkest;
+    color: $menu-item-color;
 
     &:hover {
-      background-color: $ui-gray-050;
-      color: $ui-gray-900;
+      background-color: $menu-item-hover-background-color;
+      color: $menu-item-hover-color;
     }
 
-    &.active,
     &.is-active {
-      background-color: transparent;
-      color: $blue;
+      background-color: $menu-item-active-background-color;
+      color: $menu-item-active-color;
     }
 
     &.is-destroy {
@@ -132,6 +126,16 @@
   }
 }
 
+.status-menu-content {
+  margin-top: 8px;
+
+  .box {
+    @include until($mobile) {
+      width: $drawer-width - ($spacing-xs * 2);
+    }
+  }
+}
+
 .ember-basic-dropdown-content {
   background-color: transparent;
 
diff --git a/ui/app/styles/components/radial-progress.scss b/ui/app/styles/components/radial-progress.scss
index 1a065307e00cd..4f17bd6cd2151 100644
--- a/ui/app/styles/components/radial-progress.scss
+++ b/ui/app/styles/components/radial-progress.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .radial-progress {
   transform: rotate(-90deg) translateX(-20%);
 }
diff --git a/ui/app/styles/components/radio-card.scss b/ui/app/styles/components/radio-card.scss
index 1bf70e2114d1c..e98020eb68008 100644
--- a/ui/app/styles/components/radio-card.scss
+++ b/ui/app/styles/components/radio-card.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .radio-card-selector {
   display: flex;
   margin-bottom: $spacing-xs;
@@ -47,11 +42,6 @@
     opacity: 0.6;
     box-shadow: none;
   }
-
-  &.has-fixed-width {
-    width: 368px;
-    max-width: 368px;
-  }
 }
 .radio-card:first-child {
   margin-left: 0;
@@ -59,14 +49,9 @@
 .radio-card:last-child {
   margin-right: 0;
 }
-.radio-card-container {
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-}
+
 .radio-card-row {
   display: flex;
-  flex: 1;
   padding: $spacing-m;
 }
 .radio-card-icon {
diff --git a/ui/app/styles/components/raft-join.scss b/ui/app/styles/components/raft-join.scss
index a2209f93bf25f..942df4b465528 100644
--- a/ui/app/styles/components/raft-join.scss
+++ b/ui/app/styles/components/raft-join.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .raft-join .field {
   margin-bottom: 0;
 }
diff --git a/ui/app/styles/components/read-more.scss b/ui/app/styles/components/read-more.scss
index 7ce07892c0e55..a7ea33f9097a3 100644
--- a/ui/app/styles/components/read-more.scss
+++ b/ui/app/styles/components/read-more.scss
@@ -1,9 +1,4 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-.linked-block-seemore {
+.linkable-item-seemore {
   grid-column: 2;
   grid-row: 1;
   align-self: baseline;
@@ -11,10 +6,13 @@
 
 .overflow-ellipsis {
   box-sizing: border-box;
-
   &.is-closed {
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
   }
 }
+
+.has-font-weight-normal {
+  font-weight: $font-weight-normal;
+}
diff --git a/ui/app/styles/components/regex-validator.scss b/ui/app/styles/components/regex-validator.scss
index ab9c68d0b3b41..2f321333521f6 100644
--- a/ui/app/styles/components/regex-validator.scss
+++ b/ui/app/styles/components/regex-validator.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .regex-label-wrapper {
   display: flex;
   align-items: flex-end;
diff --git a/ui/app/styles/components/replication-dashboard.scss b/ui/app/styles/components/replication-dashboard.scss
index 68d5993dc3b15..3cca15c76a63c 100644
--- a/ui/app/styles/components/replication-dashboard.scss
+++ b/ui/app/styles/components/replication-dashboard.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .replication-dashboard {
   box-shadow: none;
 
@@ -62,7 +57,7 @@
         grid-template-rows: 0.2fr 1fr 0.2fr 1fr;
       }
 
-      &.has-error-border:hover {
+      &.has-border-danger:hover {
         box-shadow: none;
       }
 
diff --git a/ui/app/styles/components/replication-doc-link.scss b/ui/app/styles/components/replication-doc-link.scss
new file mode 100644
index 0000000000000..6bf2d02dfc601
--- /dev/null
+++ b/ui/app/styles/components/replication-doc-link.scss
@@ -0,0 +1,8 @@
+.documentation-link {
+  margin: $spacing-s 0 $spacing-l 0;
+  float: right;
+
+  .doc-link {
+    font-weight: normal;
+  }
+}
diff --git a/ui/app/styles/components/replication-header.scss b/ui/app/styles/components/replication-header.scss
new file mode 100644
index 0000000000000..7a93426306da8
--- /dev/null
+++ b/ui/app/styles/components/replication-header.scss
@@ -0,0 +1,5 @@
+.replication-header {
+  .tabs-container {
+    margin-bottom: $spacing-l;
+  }
+}
diff --git a/ui/app/styles/components/replication-mode-summary.scss b/ui/app/styles/components/replication-mode-summary.scss
index d1cb2cb1d5ba5..27ba8a577026d 100644
--- a/ui/app/styles/components/replication-mode-summary.scss
+++ b/ui/app/styles/components/replication-mode-summary.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .replication-description {
   flex-shrink: 1;
 
diff --git a/ui/app/styles/components/replication-page.scss b/ui/app/styles/components/replication-page.scss
index e81f480e87baf..8a4f1335367ed 100644
--- a/ui/app/styles/components/replication-page.scss
+++ b/ui/app/styles/components/replication-page.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .replication-page {
   .empty-state {
     background: none;
diff --git a/ui/app/styles/components/replication-primary-card.scss b/ui/app/styles/components/replication-primary-card.scss
index e0c9787f338d8..8cf99be14e845 100644
--- a/ui/app/styles/components/replication-primary-card.scss
+++ b/ui/app/styles/components/replication-primary-card.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .replication {
   .selectable-card {
     display: initial;
diff --git a/ui/app/styles/components/replication-summary.scss b/ui/app/styles/components/replication-summary.scss
index 6ab7be62db3bd..7e308a2d4cd79 100644
--- a/ui/app/styles/components/replication-summary.scss
+++ b/ui/app/styles/components/replication-summary.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .replication {
   .toolbar {
     border-top: 0px;
@@ -11,9 +6,4 @@
   .helper-text {
     font-weight: normal;
   }
-
-  .float-right {
-    margin: $spacing-s 0 $spacing-l 0;
-    float: right;
-  }
 }
diff --git a/ui/app/styles/components/role-item.scss b/ui/app/styles/components/role-item.scss
index 67c876bcfeb1d..9663deba0bcc0 100644
--- a/ui/app/styles/components/role-item.scss
+++ b/ui/app/styles/components/role-item.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .role-item-details {
   float: left;
   margin-left: 8px;
diff --git a/ui/app/styles/components/search-select.scss b/ui/app/styles/components/search-select.scss
index 8d76144c59c8e..95594757f2b21 100644
--- a/ui/app/styles/components/search-select.scss
+++ b/ui/app/styles/components/search-select.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .ember-power-select-dropdown {
   background: transparent;
   box-shadow: none;
@@ -76,8 +71,8 @@ div > .ember-power-select-options {
   }
 
   .ember-power-select-option[aria-current='true'] {
-    background-color: $ui-gray-050;
-    color: $ui-gray-900;
+    background-color: $menu-item-hover-background-color;
+    color: $menu-item-hover-color;
   }
 
   .ember-power-select-option--no-matches-message {
diff --git a/ui/app/styles/components/selectable-card-container.scss b/ui/app/styles/components/selectable-card-container.scss
index 8422993bc3e54..51c302d6e8ee9 100644
--- a/ui/app/styles/components/selectable-card-container.scss
+++ b/ui/app/styles/components/selectable-card-container.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .selectable-card-container {
   display: grid;
   grid-template-columns: repeat(auto-fit, minmax(240px, 1fr));
@@ -34,16 +29,3 @@
     padding: $spacing-l 0 14px $spacing-l; // modify bottom spacing to better align with other cards
   }
 }
-
-.selectable-card-container.has-grid.has-two-col-grid {
-  grid-template-columns: 2fr 2fr;
-  grid-template-rows: none;
-
-  @include until($mobile) {
-    grid-template-columns: 1fr;
-  }
-}
-.selectable-card-container.has-grid.has-three-col-grid {
-  grid-template-columns: 1fr 1fr 1fr;
-  grid-template-rows: none;
-}
diff --git a/ui/app/styles/components/selectable-card.scss b/ui/app/styles/components/selectable-card.scss
index f60c5a1d74402..4b5ae9d3155cc 100644
--- a/ui/app/styles/components/selectable-card.scss
+++ b/ui/app/styles/components/selectable-card.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .selectable-card {
   box-shadow: 0 0 0 1px rgba($grey-dark, 0.3);
   display: flex;
@@ -34,7 +29,7 @@
 
   .button {
     &:disabled {
-      border-color: $ui-gray-300;
+      border-color: $vault-gray-300;
     }
   }
 
@@ -96,7 +91,7 @@
   border-radius: $radius;
 }
 
-.selectable-card.has-error-border {
+.selectable-card.has-border-danger {
   box-shadow: none;
 }
 
diff --git a/ui/app/styles/components/shamir-modal-flow.scss b/ui/app/styles/components/shamir-modal-flow.scss
index f7f70d5e52cf4..d9ec1e2802640 100644
--- a/ui/app/styles/components/shamir-modal-flow.scss
+++ b/ui/app/styles/components/shamir-modal-flow.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .field-title {
   font-weight: 700;
   font-size: $size-7;
diff --git a/ui/app/styles/components/shamir-progress.scss b/ui/app/styles/components/shamir-progress.scss
index a23734de91c7c..1169b45a4db72 100644
--- a/ui/app/styles/components/shamir-progress.scss
+++ b/ui/app/styles/components/shamir-progress.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .shamir-progress {
   .shamir-progress-progress {
     display: inline-block;
@@ -10,7 +5,7 @@
     margin-right: $size-8;
   }
   .progress {
-    box-shadow: 0 0 0 4px $ui-gray-050;
+    box-shadow: 0 0 0 4px $progress-bar-background-color;
     margin-top: $size-10;
     min-width: 90px;
   }
diff --git a/ui/app/styles/components/sidebar.scss b/ui/app/styles/components/sidebar.scss
index f7c2178a171cd..6a50038348b92 100644
--- a/ui/app/styles/components/sidebar.scss
+++ b/ui/app/styles/components/sidebar.scss
@@ -1,46 +1,104 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
+.is-sidebar {
+  border-right: $base-border;
+  display: flex;
+  flex: 1 1 auto;
+  margin: 0.75rem 0.75rem 0.75rem 0;
+  padding: 0 0 0 0.75rem;
 
-.sidebar-user-menu {
-  align-self: center;
+  @include until($tablet) {
+    background-color: $white;
+    bottom: 0;
+    left: -1.5rem;
+    margin: 0;
+    max-width: $drawer-width;
+    padding: $spacing-m 0 0;
+    position: absolute;
+    right: $size-2;
+    transform: translateX(-100%);
+    transition: transform $speed;
+    top: 0;
+    z-index: 5;
+  }
 
-  .popup-menu-content {
-    .menu-label {
-      color: $black;
-      font-size: 14px;
-      font-weight: $font-weight-bold;
-      text-transform: unset;
+  &.is-active {
+    @include until($tablet) {
+      transform: translateX(0);
     }
-    .token-alert {
-      padding: $spacing-xs;
+
+    .menu-toggle {
+      left: auto;
+      right: $size-10;
     }
   }
-}
 
-.link-status {
-  height: 40px;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  font-size: $size-7;
-  font-weight: $font-weight-semibold;
+  .menu-toggle {
+    color: $blue;
+    cursor: pointer;
+    display: none;
+    margin-left: $size-10;
+    left: 100%;
+    position: absolute;
+    top: 0;
 
-  &.connected {
-    background-color: var(--token-color-surface-action);
-    color: var(--token-color-foreground-action-active);
+    @include until($tablet) {
+      display: block;
+    }
 
-    a {
-      color: var(--token-color-foreground-action-active);
+    .button {
+      min-width: 0;
+    }
+  }
+
+  .menu {
+    flex: 1 1 auto;
+    padding-top: 5.25rem;
+    position: relative;
+
+    @include until($tablet) {
+      padding-top: $size-6;
     }
   }
-  &.warning {
-    background-color: var(--token-color-surface-warning);
-    color: var(--token-color-palette-amber-300);
+
+  .menu-label {
+    color: $grey-light;
+    font-weight: $font-weight-bold;
+    font-size: $size-small;
+    line-height: 1;
+    margin-bottom: $size-8;
+    padding-left: $size-5;
+  }
+
+  .menu-list {
+    border-top: $base-border;
+    padding: $size-9 0;
+
+    @include until($tablet) {
+      padding-top: $size-4;
+    }
+
+    li {
+      a {
+        &.active {
+          border-right: 4px solid $blue;
+          color: $blue;
+        }
+      }
+    }
 
     a {
-      color: var(--token-color-palette-amber-300);
+      color: $grey-dark;
+      padding-left: $size-5;
+      transition: 250ms border-width;
+
+      &.active {
+        border-right: 4px solid $blue;
+      }
+    }
+
+    .tag {
+      @include from($fullhd) {
+        float: right;
+      }
     }
   }
 }
diff --git a/ui/app/styles/components/splash-page.scss b/ui/app/styles/components/splash-page.scss
index 48ca107921c34..637bfd5fa4bbb 100644
--- a/ui/app/styles/components/splash-page.scss
+++ b/ui/app/styles/components/splash-page.scss
@@ -1,9 +1,4 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-.splash-page-logo {
+.navbar-brand .splash-page-logo {
   padding: $spacing-xs $spacing-s $spacing-xs $spacing-l;
 
   @include from($mobile) {
diff --git a/ui/app/styles/components/stat-text.scss b/ui/app/styles/components/stat-text.scss
index 5fbf8b45be0c4..abe206db17bf7 100644
--- a/ui/app/styles/components/stat-text.scss
+++ b/ui/app/styles/components/stat-text.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .stat-text-container {
   line-height: normal;
   max-height: 100%;
diff --git a/ui/app/styles/components/status-menu.scss b/ui/app/styles/components/status-menu.scss
new file mode 100644
index 0000000000000..11560c93ed786
--- /dev/null
+++ b/ui/app/styles/components/status-menu.scss
@@ -0,0 +1,19 @@
+.status-indicator-button {
+  &[data-status='good'] {
+    .status-indicator-color {
+      color: $green-light;
+    }
+  }
+
+  &[data-status='mixed'] {
+    .status-indicator-color {
+      color: $yellow;
+    }
+  }
+
+  &[data-status='bad'] {
+    .status-indicator-color {
+      color: $red;
+    }
+  }
+}
diff --git a/ui/app/styles/components/tabs-component.scss b/ui/app/styles/components/tabs-component.scss
deleted file mode 100644
index baf3fabbc7840..0000000000000
--- a/ui/app/styles/components/tabs-component.scss
+++ /dev/null
@@ -1,101 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-// This file defines the style for .tabs-container, .tabs and .tab
-
-.page-header + .tabs-container {
-  box-shadow: none;
-}
-
-.tabs {
-  align-items: stretch;
-  box-shadow: inset 0 -1px 0 $grey-light;
-  display: flex;
-  justify-content: space-between;
-  overflow: hidden;
-  overflow-x: auto;
-  user-select: none;
-  white-space: nowrap;
-
-  ul {
-    align-items: center;
-    display: flex;
-    justify-content: flex-start;
-    min-height: 3rem;
-
-    > a {
-      &:focus {
-        box-shadow: none;
-      }
-      &.active,
-      &.active .tab {
-        border-color: $blue;
-        color: $blue;
-      }
-    }
-    li {
-      // solves for tools -> sub-tabs like "Unwrap data" -> "Data"
-      &.is-active {
-        border-bottom: 2px solid $blue;
-        color: $blue;
-
-        > button {
-          color: $blue;
-        }
-      }
-      // solves for tabs on auth mounts & secrets engines
-      > a {
-        &.active {
-          color: $blue;
-          background-color: transparent;
-          border-bottom: 2px solid $blue;
-        }
-      }
-    }
-  }
-
-  li {
-    &:focus {
-      box-shadow: none;
-    }
-    &.active a,
-    &.is-active a,
-    &.active .tab {
-      border-color: $blue;
-      color: $blue;
-    }
-  }
-  // important for auth tabs in active state, otherwise the border-bottom will not show.
-  a {
-    align-items: center;
-    display: flex;
-    justify-content: center;
-    vertical-align: top;
-  }
-
-  a,
-  .tab {
-    border-bottom: 2px solid transparent;
-    color: $grey;
-    font-weight: $font-weight-semibold;
-    padding: $size-6 $size-8 $size-8;
-    text-decoration: none;
-    transition: background-color $speed, border-color $speed;
-
-    &:hover,
-    &:active {
-      border-color: $grey-light;
-    }
-
-    &:hover {
-      background-color: $ui-gray-050;
-      color: $grey-darkest;
-    }
-  }
-
-  .ember-basic-dropdown-trigger {
-    outline: none;
-  }
-}
diff --git a/ui/app/styles/components/tabs.scss b/ui/app/styles/components/tabs.scss
new file mode 100644
index 0000000000000..088f77865ff5f
--- /dev/null
+++ b/ui/app/styles/components/tabs.scss
@@ -0,0 +1,63 @@
+.page-header + .tabs-container {
+  box-shadow: none;
+}
+
+.tabs {
+  box-shadow: inset 0 -1px 0 $grey-light;
+
+  ul {
+    border-color: transparent;
+    min-height: 3rem;
+
+    > a {
+      &:focus {
+        box-shadow: none;
+      }
+      &.active,
+      &.active .tab {
+        border-color: $blue;
+        color: $blue;
+      }
+    }
+    li {
+      > a &.active {
+        border-color: $blue;
+        color: $blue !important;
+      }
+    }
+  }
+
+  li {
+    &:focus {
+      box-shadow: none;
+    }
+    &.active a,
+    &.active .tab {
+      border-color: $blue;
+      color: $blue;
+    }
+  }
+
+  a,
+  .tab {
+    color: $grey;
+    font-weight: $font-weight-semibold;
+    text-decoration: none;
+    padding: $size-6 $size-8 $size-8;
+    border-bottom: 2px solid transparent;
+    transition: background-color $speed, border-color $speed;
+
+    &:hover,
+    &:active {
+      border-color: $grey-light;
+    }
+
+    &:hover {
+      background-color: $ui-gray-050;
+    }
+  }
+
+  .ember-basic-dropdown-trigger {
+    outline: none;
+  }
+}
diff --git a/ui/app/styles/components/text-file.scss b/ui/app/styles/components/text-file.scss
index 081beb2e5870c..f7dd0f8f7a3e0 100644
--- a/ui/app/styles/components/text-file.scss
+++ b/ui/app/styles/components/text-file.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .text-file {
   .has-icon-right {
     display: flex;
diff --git a/ui/app/styles/components/token-expire-warning.scss b/ui/app/styles/components/token-expire-warning.scss
index ca439660ca4b8..844e71bbc83e1 100644
--- a/ui/app/styles/components/token-expire-warning.scss
+++ b/ui/app/styles/components/token-expire-warning.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .token-expire-warning {
   position: absolute;
   z-index: 200;
diff --git a/ui/app/styles/components/tool-tip.scss b/ui/app/styles/components/tool-tip.scss
index 94a029a69efdf..3f3bf5d3e374a 100644
--- a/ui/app/styles/components/tool-tip.scss
+++ b/ui/app/styles/components/tool-tip.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .tool-tip {
   font-size: $size-7;
   text-transform: none;
diff --git a/ui/app/styles/components/toolbar.scss b/ui/app/styles/components/toolbar.scss
index 130d2585312fe..2f53edd8edf34 100644
--- a/ui/app/styles/components/toolbar.scss
+++ b/ui/app/styles/components/toolbar.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .tabs-container + .toolbar {
   border-top: 0;
 }
diff --git a/ui/app/styles/components/transform-edit.scss b/ui/app/styles/components/transform-edit.scss
index 4c189a328a499..3d6cb8903e0f7 100644
--- a/ui/app/styles/components/transform-edit.scss
+++ b/ui/app/styles/components/transform-edit.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .copy-text {
   background: $ui-gray-010;
 
diff --git a/ui/app/styles/components/transit-card.scss b/ui/app/styles/components/transit-card.scss
index f10d527ca034f..82a6628caee4f 100644
--- a/ui/app/styles/components/transit-card.scss
+++ b/ui/app/styles/components/transit-card.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .transit-card-container {
   display: grid;
   grid-template-columns: repeat(auto-fit, minmax(240px, 0.2fr));
diff --git a/ui/app/styles/components/ttl-picker.scss b/ui/app/styles/components/ttl-picker.scss
index 0a69524c7a4d2..2b5041a41a231 100644
--- a/ui/app/styles/components/ttl-picker.scss
+++ b/ui/app/styles/components/ttl-picker.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .ttl-show-picker {
   padding: 0.5rem 0 1.6rem 2.4rem;
 }
diff --git a/ui/app/styles/components/ui-wizard.scss b/ui/app/styles/components/ui-wizard.scss
index c113d7d29c982..3dd3397b57a06 100644
--- a/ui/app/styles/components/ui-wizard.scss
+++ b/ui/app/styles/components/ui-wizard.scss
@@ -1,9 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-// This file is not being used. https://github.com/hashicorp/vault/pull/19220
 .ui-wizard-container {
   display: flex;
   flex-direction: column;
@@ -24,7 +18,7 @@
   padding-right: 324px;
   padding-right: calc(324px + env(safe-area-inset-right));
 
-  @include until($mobile) {
+  @include until($tablet) {
     padding-right: 0;
     padding-bottom: 50vh;
   }
@@ -39,7 +33,7 @@
   position: fixed;
   right: $size-8;
   bottom: $size-8;
-  top: calc(#{4rem} + #{$size-8});
+  top: calc(#{$header-height} + #{$size-8});
   overflow: auto;
 
   p {
@@ -54,7 +48,7 @@
     z-index: 30;
   }
 
-  @include until($mobile) {
+  @include until($tablet) {
     box-shadow: $box-shadow, 0 0 20px rgba($black, 0.24);
     bottom: 0;
     left: 0;
@@ -80,7 +74,7 @@
   margin: $size-4 0;
   position: relative;
 
-  @include until($mobile) {
+  @include until($tablet) {
     margin-top: 0;
     padding-top: 0;
   }
@@ -104,9 +98,9 @@
   padding-bottom: $size-11;
   position: fixed;
   right: $size-8;
-  top: calc(#{4rem} + #{$size-8});
+  top: calc(#{$header-height} + #{$size-8});
 
-  @include until($mobile) {
+  @include until($tablet) {
     box-shadow: $box-shadow, 0 0 20px rgba($black, 0.24);
     bottom: 0;
     left: 0;
@@ -142,7 +136,7 @@
   margin: $size-8 0 0;
   padding: 0 $size-8;
   border-top: solid 1px $white;
-  border-image: linear-gradient(to right, $grey-dark, $grey) 1;
+  border-image: linear-gradient(to right, $vault-gray-dark, $vault-gray) 1;
   border-width: 1px 0 0;
   button {
     font-size: $size-7;
@@ -197,8 +191,8 @@
 }
 
 .progress-bar {
-  background: $ui-gray-050;
-  box-shadow: inset $box-link-shadow;
+  background: $progress-bar-background-color;
+  box-shadow: inset 0 0 0 1px $ui-gray-200;
   display: flex;
   height: $wizard-progress-bar-height;
   position: relative;
diff --git a/ui/app/styles/components/unseal-warning.scss b/ui/app/styles/components/unseal-warning.scss
index f40f320ac4e41..8a65b54df8f2e 100644
--- a/ui/app/styles/components/unseal-warning.scss
+++ b/ui/app/styles/components/unseal-warning.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .unseal-warning.message {
   margin: -1px -1px 0;
 }
diff --git a/ui/app/styles/components/vault-loading.scss b/ui/app/styles/components/vault-loading.scss
index a038a9689c1fb..0785f5ba8e0be 100644
--- a/ui/app/styles/components/vault-loading.scss
+++ b/ui/app/styles/components/vault-loading.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 @keyframes vault-loading-animation {
   0%,
   70%,
diff --git a/ui/app/styles/components/vlt-radio.scss b/ui/app/styles/components/vlt-radio.scss
index 972e63fcbcee4..bda8e560d9a50 100644
--- a/ui/app/styles/components/vlt-radio.scss
+++ b/ui/app/styles/components/vlt-radio.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .vlt-radio {
   position: relative;
   input[type='radio'] {
diff --git a/ui/app/styles/components/vlt-table.scss b/ui/app/styles/components/vlt-table.scss
index 47a4d90972a9a..c55633de6906c 100644
--- a/ui/app/styles/components/vlt-table.scss
+++ b/ui/app/styles/components/vlt-table.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .vlt-table {
   .is-collapsed {
     visibility: collapse;
@@ -18,11 +13,6 @@
     }
   }
 
-  table {
-    border-collapse: collapse;
-    border-spacing: 0;
-  }
-
   th,
   td {
     padding: $spacing-s;
@@ -32,8 +22,6 @@
     color: $grey-dark;
     font-weight: 500;
     font-size: $size-8;
-    text-align: left;
-    vertical-align: top;
   }
 
   tbody th {
diff --git a/ui/app/styles/core.scss b/ui/app/styles/core.scss
index 94fb005d21fad..6773a664c698f 100644
--- a/ui/app/styles/core.scss
+++ b/ui/app/styles/core.scss
@@ -1,61 +1,52 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
+// Start with Structure & Bulma variables as a foundation
+@import './utils/colors';
+@import './utils/spacing';
+@import 'bulma/sass/utilities/initial-variables';
 
-// Variables
-@import './utils/color_variables'; // colors need to come first.
-@import './utils/box-shadow_variables';
-@import './utils/font_variables';
-@import './utils/size_variables';
+// Override variables where appropriate
+@import './utils/bulma_variables';
 
-// Element styling
-@import './core/element-styling';
-
-// Mixins
+// Utils
 @import './utils/mixins';
 @import './utils/animations';
 
-// Core Styles: each file styles a class that is not associated with a component. Ex: box and not box-label.
+// Bring in the rest of Bulma
+@import 'bulma/bulma';
+@import 'bulma/switch';
+
+// Override Bulma details where appropriate
 @import './core/alert-banner';
+@import './core/generic';
 @import './core/box';
 @import './core/breadcrumb';
+@import './core/bulma-radio-checkboxes';
 @import './core/buttons';
-@import './core/charts';
-@import './core/checkbox-and-radio';
-@import './core/columns';
-@import './core/containers';
-@import './core/control';
-@import './core/field';
-@import './core/file';
 @import './core/footer';
-@import './core/inputs';
-@import './core/label';
+@import './core/forms';
+@import './core/charts';
+@import './core/helpers';
+@import './core/hero';
 @import './core/level';
-@import './core/link';
-@import './core/lists';
 @import './core/menu';
 @import './core/message';
+@import './core/navbar';
+@import './core/notification';
 @import './core/progress';
 @import './core/select';
 @import './core/switch';
-@import './core/tag';
+@import './core/tables';
+@import './core/tags';
 @import './core/title';
 @import './core/toggle';
 
-// Helpers
-@import './helper-classes/colors';
-@import './helper-classes/flexbox-and-grid';
-@import './helper-classes/layout';
-@import './helper-classes/general';
-@import './helper-classes/spacing';
-@import './helper-classes/typography';
+// bulma additions
+@import './core/layout';
+@import './core/lists';
 
-// Component specific styling
 @import './components/auth-buttons';
 @import './components/auth-form';
-@import './components/autocomplete-input';
 @import './components/b64-toggle';
+
 @import './components/box-label';
 @import './components/box-radio';
 @import './components/calendar-widget';
@@ -65,25 +56,27 @@
 @import './components/control-group';
 @import './components/diff-version-selector';
 @import './components/doc-link';
-@import './components/empty-state-component';
+@import './components/empty-state';
 @import './components/env-banner';
 @import './components/features-selection';
 @import './components/form-section';
 @import './components/global-flash';
 @import './components/hover-copy-button';
-@import './components/icon';
 @import './components/init-illustration';
+@import './components/info-table';
 @import './components/info-table-row';
+@import './components/input-hint';
 @import './components/kmip-role-edit';
 @import './components/known-secondaries-card.scss';
 @import './components/license-banners';
+@import './components/linkable-item';
 @import './components/linked-block';
 @import './components/list-item-row';
 @import './components/list-pagination';
 @import './components/loader';
 @import './components/login-form';
 @import './components/masked-input';
-@import './components/modal-component.scss';
+@import './components/modal';
 @import './components/namespace-picker';
 @import './components/namespace-reminder';
 @import './components/navigate-input';
@@ -95,6 +88,8 @@
 @import './components/read-more';
 @import './components/regex-validator';
 @import './components/replication-dashboard';
+@import './components/replication-doc-link';
+@import './components/replication-header';
 @import './components/replication-mode-summary';
 @import './components/replication-page';
 @import './components/replication-primary-card';
@@ -102,24 +97,28 @@
 @import './components/role-item';
 @import './components/search-select';
 @import './components/selectable-card';
-@import './components/selectable-card-container';
+@import './components/selectable-card-container.scss';
 // action-block extends selectable-card
-@import './components/action-block';
+@import './components/action-block.scss';
 @import './components/shamir-modal-flow';
 @import './components/shamir-progress';
 @import './components/sidebar';
 @import './components/splash-page';
 @import './components/stat-text';
-@import './components/tabs-component';
+@import './components/status-menu';
+@import './components/tabs';
 @import './components/text-file';
 @import './components/token-expire-warning';
 @import './components/toolbar';
 @import './components/tool-tip';
-@import './components/transform-edit';
+@import './components/transform-edit.scss';
 @import './components/transit-card';
 @import './components/ttl-picker';
 @import './components/unseal-warning';
-// @import './components/ui-wizard'; // remove, see PR https://github.com/hashicorp/vault/pull/19220
+@import './components/ui-wizard';
 @import './components/vault-loading';
 @import './components/vlt-radio';
 @import './components/vlt-table';
+
+// bulma-free-zone
+@import './components/icon';
diff --git a/ui/app/styles/core/alert-banner.scss b/ui/app/styles/core/alert-banner.scss
index 57ed20c7a2f49..9ab82281c1f2b 100644
--- a/ui/app/styles/core/alert-banner.scss
+++ b/ui/app/styles/core/alert-banner.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .alert-banner-message-body {
   border: 0;
   margin-top: $spacing-xxs;
diff --git a/ui/app/styles/core/box.scss b/ui/app/styles/core/box.scss
index b247dd772ea57..fc7cec98cfce2 100644
--- a/ui/app/styles/core/box.scss
+++ b/ui/app/styles/core/box.scss
@@ -1,40 +1,41 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .box {
-  background-color: $white;
-  border-radius: 0;
   box-shadow: 0 0 0 1px rgba($grey-dark, 0.3);
-  color: $ui-gray-900;
-  display: block;
-  padding: $size-5;
-
-  &:not(:last-child) {
-    margin-bottom: 1.5rem;
-  }
-
-  &.is-fullwidth {
-    padding-left: 0;
-    padding-right: 0;
-  }
-
-  &.no-padding-top {
-    padding-top: 0;
-  }
-
-  &.has-slim-padding {
-    padding: 9px 0;
-  }
 
-  &.no-top-shadow {
-    box-shadow: inset 0 -1px 0 0 rgba($black, 0.1);
+  .title {
+    &.has-padding-top {
+      padding-top: $spacing-m;
+    }
   }
-
-  &.has-container {
-    box-shadow: 0 4px 4px rgba($black, 0.25);
-    border: $base-border;
-    padding: $spacing-l;
+  p {
+    &.has-padding-bottom {
+      padding-bottom: $spacing-s;
+    }
   }
 }
+.box.is-fullwidth {
+  padding-left: 0;
+  padding-right: 0;
+}
+.box.no-padding-bottom {
+  padding-bottom: 0;
+}
+.box.no-padding-top {
+  padding-top: 0;
+}
+.box.has-slim-padding {
+  padding: 9px 0;
+}
+.box.has-glow {
+  box-shadow: 0 2px 4px 0 rgba($grey-dark, 0.5);
+}
+.box.is-rounded {
+  border-radius: 3px;
+}
+.box.no-top-shadow {
+  box-shadow: inset 0 -1px 0 0 rgba($black, 0.1);
+}
+.box.has-container {
+  box-shadow: 0 4px 4px rgba($black, 0.25);
+  border: 1px solid #bac1cc;
+  padding: $spacing-l;
+}
diff --git a/ui/app/styles/core/breadcrumb.scss b/ui/app/styles/core/breadcrumb.scss
index eb43c39a0cac8..cef86dfd5eaff 100644
--- a/ui/app/styles/core/breadcrumb.scss
+++ b/ui/app/styles/core/breadcrumb.scss
@@ -1,33 +1,22 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .breadcrumb {
-  display: flex;
+  -ms-user-select: text;
+  -webkit-user-select: text;
   user-select: text;
   min-height: 1.5rem;
   margin: 0;
   overflow-x: auto;
-  white-space: nowrap;
 
   &:not(:last-child) {
     margin: 0;
   }
 
-  ul,
-  ol {
-    align-items: center;
-    display: flex;
-    flex-grow: 1;
-    flex-shrink: 0;
-    justify-content: flex-start;
+  .is-sidebar + .column & {
+    @include until($tablet) {
+      margin-left: $size-2;
+    }
   }
 
   li {
-    align-items: center;
-    display: flex;
-
     & + li::before {
       display: none;
     }
@@ -37,17 +26,9 @@
         margin-left: 0;
       }
     }
-    &.is-active a {
-      color: $grey-darkest;
-      cursor: default;
-      pointer-events: none;
-    }
   }
 
   a {
-    align-items: center;
-    display: flex;
-    justify-content: center;
     line-height: 1;
     padding: 0 $size-11 0 0;
     text-decoration: none;
diff --git a/ui/app/styles/core/bulma-radio-checkboxes.scss b/ui/app/styles/core/bulma-radio-checkboxes.scss
new file mode 100644
index 0000000000000..d41699356b124
--- /dev/null
+++ b/ui/app/styles/core/bulma-radio-checkboxes.scss
@@ -0,0 +1,25 @@
+@import '../sass-svg-uri/svg-uri';
+
+.b-checkbox input[type='checkbox']:checked + label::before {
+  border-color: $blue;
+}
+
+.b-checkbox input[type='checkbox']:checked + label::after,
+.b-checkbox input[type='radio']:checked + label::after {
+  font-family: $family-monospace;
+  /*checkmark from ionicons*/
+  content: svg-uri(
+    '<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 512 512" fill="#{$blue}"><path d="M461.6 109.6l-54.9-43.3c-1.7-1.4-3.8-2.4-6.2-2.4-2.4 0-4.6 1-6.3 2.5L194.5 323s-78.5-75.5-80.7-77.7c-2.2-2.2-5.1-5.9-9.5-5.9s-6.4 3.1-8.7 5.4c-1.7 1.8-29.7 31.2-43.5 45.8-.8.9-1.3 1.4-2 2.1-1.2 1.7-2 3.6-2 5.7 0 2.2.8 4 2 5.7l2.8 2.6s139.3 133.8 141.6 136.1c2.3 2.3 5.1 5.2 9.2 5.2 4 0 7.3-4.3 9.2-6.2l249.1-320c1.2-1.7 2-3.6 2-5.8 0-2.5-1-4.6-2.4-6.4z"/></svg>'
+  );
+}
+
+.b-checkbox.no-label input[type='checkbox'] + label {
+  position: absolute;
+  top: 0;
+}
+
+.checkbox-help-text {
+  font-size: $size-7;
+  color: $ui-gray-700;
+  padding-left: 28px;
+}
diff --git a/ui/app/styles/core/buttons.scss b/ui/app/styles/core/buttons.scss
index f0841724a964e..2d8cf8ffb1e8d 100644
--- a/ui/app/styles/core/buttons.scss
+++ b/ui/app/styles/core/buttons.scss
@@ -1,101 +1,155 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
+$button-box-shadow-standard: 0 3px 1px 0 rgba($black, 0.12);
 
 .button {
-  align-items: center;
   background-color: $grey-lightest;
   border: 1px solid $grey-light;
-  border-radius: $radius;
   box-shadow: $box-shadow-low;
-  cursor: pointer;
   color: $ui-gray-800;
   display: inline-block;
-  font-size: $size-8;
+  font-size: $size-small;
   font-weight: $font-weight-semibold;
   height: 2.5rem;
   line-height: 1.6;
   min-width: 6rem;
   padding: $size-10 $size-8;
-  position: relative;
-  text-align: center;
   text-decoration: none;
   transition: background-color $speed, border-color $speed, box-shadow $speed, color $speed;
-  user-select: none;
   vertical-align: middle;
-  white-space: nowrap;
 
-  @keyframes spinAround {
-    from {
-      transform: rotate(0deg);
-    }
-    to {
-      transform: rotate(359deg);
-    }
+  &.is-icon {
+    padding: 0.25rem $size-3;
   }
 
   &:active,
   &.is-active,
-  &:focus {
+  &:focus,
+  &.is-focused {
     border-color: darken($grey-light, 10%);
     box-shadow: $button-box-shadow-standard;
     color: darken($grey-dark, 10%);
   }
 
-  &:focus:not(:active) {
-    box-shadow: 0 0 0 0.125em rgba(21, 99, 255, 0.25);
+  &.is-inverted.is-outlined {
+    box-shadow: none;
   }
 
-  &:disabled {
-    background-color: $white;
-    border-color: $ui-gray-050;
+  &.is-transparent {
+    color: currentColor;
+    background: none;
+    border: none;
+    box-shadow: none;
+    min-width: auto;
+    padding: 0;
+  }
+  &.is-flat {
+    min-width: auto;
+    border: none;
     box-shadow: none;
-    cursor: not-allowed;
-    opacity: 0.5;
   }
 
-  // Button types: is-compact, is-danger, is-danger-outlined, is-flat, is-ghost, is-icon, is-loading, is-link, is-outline, is-primary, is-transparent.
+  @each $name, $pair in $colors {
+    $color: nth($pair, 1);
+    @if $name == 'primary' {
+      $color: $blue;
+    }
+    $color-invert: nth($pair, 2);
+
+    &.is-#{$name} {
+      border-color: darken($color, 2%);
+      background-color: $color;
+      color: $color-invert;
+
+      &:hover:not([disabled]),
+      &.is-hovered {
+        background-color: darken($color, 5%);
+        border-color: darken($color, 5%);
+        box-shadow: $box-shadow-middle;
+      }
 
-  &.is-compact {
-    height: 2rem;
-    padding: $size-11 $size-8;
-  }
+      &:active,
+      &.is-active {
+        background-color: darken($color, 10%);
+        border-color: darken($color, 10%);
+        box-shadow: $box-shadow-middle;
+      }
 
-  &.is-danger {
-    background-color: $red-500;
-    border-color: darken($red-500, 2%);
-    color: $white;
-    text-shadow: 0 1px 1px rgba($black, 0.25);
+      &:focus,
+      &.is-focused {
+        border-color: darken($color, 10%);
+        box-shadow: $button-box-shadow-standard;
+      }
 
-    &:hover:not([disabled]) {
-      background-color: darken($red-500, 5%);
-      border-color: darken($red-500, 5%);
-      box-shadow: $box-shadow-middle;
-    }
+      &.is-outlined {
+        border-color: $color;
+        color: $color;
+        background-color: transparent;
 
-    &:active,
-    &.is-active {
-      background-color: darken($red-500, 10%);
-      border-color: darken($red-500, 10%);
-      box-shadow: $box-shadow-middle;
-    }
+        &.is-important {
+          border-color: $color;
+        }
+
+        &:hover,
+        &.is-hovered,
+        &:focus,
+        &.is-focused {
+          background-color: transparent;
+          border-color: darken($color, 10%);
+          color: $color;
+        }
+
+        &:active,
+        &.is-active {
+          background-color: transparent;
+          border-color: darken($color, 10%);
+          color: darken($color, 10%);
+        }
+      }
+
+      &.is-underlined {
+        &:active,
+        &.is-active {
+          background-color: transparent;
+          border-bottom: 2px solid darken($color, 10%);
+          border-radius: unset;
+          color: darken($color, 10%);
+        }
+      }
 
-    &:focus {
-      border-color: darken($red-500, 10%);
-      box-shadow: $button-box-shadow-standard;
+      &.is-inverted.is-outlined {
+        border-color: rgba($color-invert, 0.5);
+        color: rgba($color-invert, 0.9);
+
+        &:hover,
+        &.is-hovered,
+        &:focus,
+        &.is-focused {
+          background-color: transparent;
+          border-color: $color-invert;
+          color: $color-invert;
+        }
+
+        &:active,
+        &.is-active {
+          background-color: rgba($color-invert, 0.2);
+          border-color: $color-invert;
+          color: $color-invert;
+          box-shadow: none;
+        }
+      }
     }
   }
 
-  &.is-danger-outlined {
-    border: 1px solid $red-500;
-    color: $red-500;
+  &.is-primary {
+    font-weight: $font-weight-bold;
+    text-shadow: 0 1px 1px rgba($black, 0.25);
   }
 
-  &.is-flat {
-    min-width: auto;
-    border: none;
+  &.is-link {
+    color: $link;
+    text-decoration: none;
+    font-weight: $font-weight-semibold;
     box-shadow: none;
+    min-width: 4rem;
   }
 
   &.is-ghost {
@@ -103,129 +157,35 @@
     border-color: transparent;
     box-shadow: none;
     color: $blue;
-    text-decoration: none;
 
     &:hover {
-      color: $blue-500;
       background-color: $grey-lightest;
     }
   }
 
-  &.is-icon {
-    padding: 0.25rem $size-3;
-  }
+  &.is-orange {
+    background-color: $orange;
+    border-color: $orange;
+    color: $white;
 
-  &.is-loading {
-    color: transparent !important;
-    pointer-events: none;
-    &::after {
-      animation: spinAround 500ms infinite linear;
-      border: 2px solid $ui-gray-300;
-      border-radius: 290486px;
-      border-right-color: transparent;
-      border-top-color: transparent;
-      content: '';
-      display: block;
-      height: 1em;
-      width: 1em;
-      left: calc(50% - (1em / 2));
-      top: calc(50% - (1em / 2));
-      position: absolute !important;
+    &:hover,
+    &.is-hovered {
+      background-color: darken($orange, 5%);
+      border-color: darken($orange, 5%);
     }
   }
-
-  &.is-link {
-    background-color: transparent;
-    border-color: transparent;
-    color: $blue;
-    text-decoration: none;
-    font-weight: $font-weight-semibold;
-    box-shadow: none;
-    min-width: 4rem;
+  &.is-compact {
+    height: 2rem;
+    padding: $size-11 $size-8;
   }
 
-  &.is-primary {
-    background-color: $blue;
-    border-color: darken($blue, 2%);
-    color: $white;
-    font-weight: $font-weight-bold;
-    text-shadow: 0 1px 1px rgba($black, 0.25);
-
-    &:disabled {
-      background-color: $ui-gray-700;
-      border-color: transparent;
-      box-shadow: none;
-    }
-
-    &:hover:not([disabled]) {
-      background-color: darken($blue, 5%);
-      border-color: darken($blue, 5%);
-      box-shadow: $box-shadow-middle;
-    }
-
-    &:active,
-    &.is-active {
-      background-color: darken($blue, 10%);
-      border-color: darken($blue, 10%);
-      box-shadow: $box-shadow-middle;
-    }
-
-    &:focus {
-      border-color: darken($blue, 10%);
-      box-shadow: $button-box-shadow-standard;
-    }
-
-    &.is-loading::after {
-      border-color: transparent transparent $white $white;
-    }
-
-    &.is-underlined {
-      &:active,
-      &.is-active {
-        background-color: transparent;
-        border-bottom: 2px solid darken($blue, 10%);
-        border-radius: unset;
-        color: darken($blue, 10%);
-      }
-    }
-    // is-primary.is-outlined the only is-outlined buttons are primary.
-    &.is-outlined {
-      background-color: transparent;
-      border-color: $blue;
-      color: $blue;
-
-      &:hover,
-      &:focus {
-        background-color: transparent;
-        border-color: darken($blue, 10%);
-        color: $blue;
-      }
-
-      &:active,
-      &.is-active {
-        background-color: transparent;
-        border-color: darken($blue, 10%);
-        color: darken($blue, 10%);
-      }
-    }
-
-    &.is-outlined [disabled] {
-      background-color: transparent;
-      border-color: $ui-gray-700;
-      box-shadow: none;
-      color: $ui-gray-700;
-    }
+  .has-text-info & {
+    font-weight: $font-weight-semibold;
   }
 
-  &.is-transparent {
-    color: currentColor;
-    background: none;
-    border: none;
-    box-shadow: none;
-    min-width: auto;
-    padding: 0;
+  &.has-text-danger {
+    border: 1px solid $red-500;
   }
-  // End of button types
 
   &.tool-tip-trigger {
     color: $grey-dark;
diff --git a/ui/app/styles/core/charts.scss b/ui/app/styles/core/charts.scss
index 34a89de94b737..be73b2d0db9e9 100644
--- a/ui/app/styles/core/charts.scss
+++ b/ui/app/styles/core/charts.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .chart-wrapper {
   border: $light-border;
   border-radius: $radius-large;
@@ -57,7 +52,7 @@
   grid-column-start: 1;
   grid-column-end: span col4-end;
   grid-row-start: 1;
-  box-shadow: inset 0 -1px 0 $ui-gray-200;
+  box-shadow: inset 0 -1px 0 $vault-gray-200;
 }
 
 .has-header-link {
@@ -68,7 +63,9 @@
     text-align: right;
     > button {
       &:hover,
-      &:focus {
+      &.is-hovered,
+      &:focus,
+      &.is-focused {
         background-color: transparent;
         background-color: darken($ui-gray-050, 5%);
         border-color: darken($ui-gray-300, 5%);
@@ -99,7 +96,7 @@
   grid-row-end: 5;
   padding-bottom: $spacing-xl;
   margin-bottom: $spacing-s;
-  box-shadow: inset 0 -1px 0 $ui-gray-200;
+  box-shadow: inset 0 -1px 0 $vault-gray-200;
 
   > h2 {
     padding-left: 18px;
@@ -116,7 +113,7 @@
   grid-row-end: 5;
   padding-bottom: $spacing-xl;
   margin-bottom: $spacing-s;
-  box-shadow: inset 0 -1px 0 $ui-gray-200;
+  box-shadow: inset 0 -1px 0 $vault-gray-200;
 
   > h2 {
     padding-left: 18px;
@@ -202,7 +199,7 @@ h2.chart-title {
 
 p.chart-description {
   color: $ui-gray-700;
-  font-size: 14px;
+  font-size: $body-size;
   line-height: 18px;
   margin-bottom: $spacing-xs;
 }
@@ -217,7 +214,7 @@ p.chart-subtext {
 h3.data-details {
   font-weight: $font-weight-bold;
   font-size: $size-8;
-  line-height: 14px;
+  line-height: $body-size;
   margin-bottom: $spacing-xs;
 }
 
@@ -229,7 +226,7 @@ p.data-details {
 // MISC STYLES
 
 .light-dot {
-  background-color: $blue-100;
+  background-color: #bfd4ff;
   height: 10px;
   width: 10px;
   border-radius: 50%;
@@ -237,7 +234,7 @@ p.data-details {
 }
 
 .dark-dot {
-  background-color: $blue-500;
+  background-color: #1563ff;
   height: 10px;
   width: 10px;
   border-radius: 50%;
diff --git a/ui/app/styles/core/checkbox-and-radio.scss b/ui/app/styles/core/checkbox-and-radio.scss
deleted file mode 100644
index bdf678e276b52..0000000000000
--- a/ui/app/styles/core/checkbox-and-radio.scss
+++ /dev/null
@@ -1,124 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-// This file defines the styles for .checkbox, .radio and .b-checkboxes. The prefix "b" comes from Bulma.
-
-@import '../sass-svg-uri/svg-uri';
-
-// checkbox and radio styling
-.checkbox,
-.radio {
-  cursor: pointer;
-  display: inline-block;
-  line-height: 1.25;
-  position: relative;
-}
-
-.checkbox input,
-.radio input {
-  cursor: pointer;
-}
-
-.checkbox:hover,
-.radio:hover {
-  color: hsl(0, 0%, 21%);
-}
-
-.checkbox[disabled],
-.radio[disabled],
-.checkbox input[disabled],
-.radio input[disabled] {
-  color: $grey;
-  cursor: not-allowed;
-}
-
-// radio only styling
-.radio + .radio {
-  margin-left: 0.5em;
-}
-
-// one-off checkbox class
-.checkbox-help-text {
-  color: $ui-gray-700;
-  font-size: $size-7;
-  padding-left: 28px;
-}
-
-// b-checkbox styling
-.b-checkbox {
-  position: relative;
-}
-
-.b-checkbox label::before {
-  background-color: $white;
-  border-radius: 3px;
-  border: 1px solid $ui-gray-300;
-  content: '';
-  height: 17px;
-  left: 0;
-  position: absolute;
-  top: 1px;
-  transition: background 0.1s ease-in-out;
-  width: 17px;
-}
-
-.b-checkbox input[type='checkbox']:checked + label::before {
-  border-color: $blue;
-}
-
-.b-checkbox input[type='checkbox']:checked + label::after,
-.b-checkbox input[type='radio']:checked + label::after {
-  font-family: $family-monospace;
-  /*checkmark from ionicons*/
-  content: svg-uri(
-    '<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 512 512" fill="#{$blue}"><path d="M461.6 109.6l-54.9-43.3c-1.7-1.4-3.8-2.4-6.2-2.4-2.4 0-4.6 1-6.3 2.5L194.5 323s-78.5-75.5-80.7-77.7c-2.2-2.2-5.1-5.9-9.5-5.9s-6.4 3.1-8.7 5.4c-1.7 1.8-29.7 31.2-43.5 45.8-.8.9-1.3 1.4-2 2.1-1.2 1.7-2 3.6-2 5.7 0 2.2.8 4 2 5.7l2.8 2.6s139.3 133.8 141.6 136.1c2.3 2.3 5.1 5.2 9.2 5.2 4 0 7.3-4.3 9.2-6.2l249.1-320c1.2-1.7 2-3.6 2-5.8 0-2.5-1-4.6-2.4-6.4z"/></svg>'
-  );
-}
-
-.b-checkbox input[type='checkbox'],
-.b-checkbox input[type='radio'] {
-  cursor: pointer;
-  opacity: 0;
-  z-index: 1;
-}
-
-.b-checkbox label::after {
-  color: $ui-gray-800;
-  font-size: 12px;
-  height: 16px;
-  left: 3px;
-  position: absolute;
-  top: 3px;
-  width: 16px;
-}
-
-.b-checkbox label {
-  display: inline;
-  line-height: 1;
-  margin-left: 0.5rem;
-  padding-left: 5px;
-}
-
-.b-checkbox input[type='checkbox']:focus + label::before,
-.b-checkbox input[type='radio']:focus + label::before {
-  outline: thin dotted;
-  outline: 5px auto -webkit-focus-ring-color;
-  outline-offset: -2px;
-}
-
-.b-checkbox input[type='checkbox']:disabled + label::before,
-.b-checkbox input[type='radio']:disabled + label::before {
-  background-color: $ui-gray-100;
-  cursor: not-allowed;
-}
-
-.b-checkbox input[type='checkbox']:disabled + label,
-.b-checkbox input[type='radio']:disabled + label {
-  opacity: 0.65;
-}
-
-.b-checkbox > .sub-text {
-  padding-left: 2rem;
-}
diff --git a/ui/app/styles/core/columns.scss b/ui/app/styles/core/columns.scss
deleted file mode 100644
index 15b6a348d01e1..0000000000000
--- a/ui/app/styles/core/columns.scss
+++ /dev/null
@@ -1,201 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-// This file defines the styles for columns and column
-
-// Columns (plural)
-.columns {
-  margin-left: -$size-9;
-  margin-right: -$size-9;
-  margin-top: -$size-9;
-
-  &:last-child {
-    margin-bottom: -$size-9;
-  }
-
-  &.is-centered {
-    justify-content: center;
-  }
-
-  &.is-gapless {
-    margin-left: 0;
-    margin-right: 0;
-    margin-top: 0;
-  }
-
-  &.is-gapless > .column {
-    margin: 0;
-    padding: 0 !important;
-  }
-
-  &.is-gapless:not(:last-child) {
-    margin-bottom: $size-4;
-  }
-
-  &.is-gapless:last-child {
-    margin-bottom: 0;
-  }
-
-  &.is-mobile {
-    display: flex;
-
-    > .column.is-1 {
-      flex: none;
-      width: 8.33333%;
-    }
-
-    > .column.is-3 {
-      flex: none;
-      width: 25%;
-    }
-
-    > .column.is-10 {
-      flex: none;
-      width: 83.33333%;
-    }
-
-    > .column.is-12 {
-      flex: none;
-      width: 100%;
-    }
-  }
-
-  &.is-multiline {
-    flex-wrap: wrap;
-  }
-
-  // columnGap does not take vars
-  &.is-variable.is-1 {
-    --columnGap: $i * 0.25rem;
-  }
-
-  &.is-variable {
-    --columnGap: 0.75rem;
-    margin-left: calc(-1 * var(--columnGap));
-    margin-right: calc(-1 * var(--columnGap));
-  }
-
-  &.is-variable > .column {
-    padding-left: var(--columnGap);
-    padding-right: var(--columnGap);
-  }
-}
-
-// responsive css columns
-@media screen and (min-width: 769px), print {
-  .columns:not(.is-desktop) {
-    display: flex;
-  }
-  .columns.is-variable.is-7-tablet {
-    --columnGap: 1.75rem;
-  }
-}
-
-@media screen and (min-width: 1024px) {
-  .columns.is-desktop {
-    display: flex;
-  }
-}
-
-// Column (singular)
-.column {
-  display: block;
-  flex-basis: 0;
-  flex-grow: 1;
-  flex-shrink: 1;
-  padding: 0.75rem;
-
-  &.is-narrow {
-    flex: none;
-    width: unset;
-  }
-
-  &.is-1 {
-    flex: none;
-    width: 8.33333%;
-  }
-
-  &.is-3 {
-    flex: none;
-    width: 25%;
-  }
-
-  &.is-5,
-  .is-5-tablet {
-    flex: none;
-    width: 41.66667%;
-  }
-}
-
-// responsive css column (order matters here because some columns have several of these classes and they need to override in the correct order).
-@media screen and (min-width: 769px), print {
-  .column {
-    &.is-one-quarter {
-      flex: none;
-      width: 25%;
-    }
-
-    &.is-half {
-      flex: none;
-      width: 50%;
-    }
-
-    &.is-two-thirds {
-      flex: none;
-      width: 66.6666%;
-    }
-
-    &.is-one-third {
-      flex: none;
-      width: 33.3333%;
-    }
-
-    &.is-5 {
-      flex: none;
-      width: 41.66667%;
-    }
-
-    &.is-6,
-    &.is-6-tablet {
-      flex: none;
-      width: 50%;
-    }
-    &.is-9 {
-      flex: none;
-      width: 75%;
-    }
-
-    &.is-7,
-    &.is-7-tablet {
-      flex: none;
-      width: 58.33333%;
-    }
-
-    &.is-12 {
-      flex: none;
-      width: 100%;
-    }
-
-    &.is-full,
-    &.is-full-tablet {
-      flex: none;
-      width: 100%;
-    }
-  }
-}
-
-@media screen and (max-width: 768px) {
-  .column.is-10-mobile {
-    flex: none;
-    width: 83.33333%;
-  }
-}
-
-@media screen and (min-width: 1024px) {
-  .column.is-4-desktop {
-    flex: none;
-    width: 33.33333%;
-  }
-}
diff --git a/ui/app/styles/core/containers.scss b/ui/app/styles/core/containers.scss
deleted file mode 100644
index 40a5cb71ad13e..0000000000000
--- a/ui/app/styles/core/containers.scss
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-// This file defines the styles for the larger container elements like page-container, section and container.
-
-.ember-application > .ember-view {
-  display: flex;
-  flex-direction: column;
-}
-
-.page-container {
-  min-height: 100vh;
-  display: flex;
-  flex-direction: column;
-  justify-content: flex-end;
-}
-
-.section {
-  display: flex;
-  flex-grow: 1;
-  flex-direction: column;
-  padding: 0 $size-4;
-
-  > .container {
-    display: flex;
-    flex-grow: 1;
-    flex-direction: column;
-    width: 100%;
-
-    > .columns {
-      flex-grow: 1;
-    }
-  }
-}
-
-.container {
-  flex-grow: 1;
-  margin: 0 auto;
-  max-width: 1024px;
-  position: relative;
-  width: auto;
-}
diff --git a/ui/app/styles/core/control.scss b/ui/app/styles/core/control.scss
deleted file mode 100644
index 1ed375020fd1c..0000000000000
--- a/ui/app/styles/core/control.scss
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-// This file defines the style for .control
-
-.control.has-icons-left .icon,
-.control.has-icons-right .icon {
-  height: 2.5rem;
-}
-
-.control.has-icons-right .input {
-  padding-right: 2.25em;
-}
-
-.control {
-  font-size: 1rem;
-  max-width: 100%;
-  position: relative;
-  text-align: left;
-
-  // Modifiers
-  &.has-icons-left,
-  &.has-icons-right {
-    .input,
-    .select select {
-      padding-left: 2rem;
-
-      &:focus,
-      &:active,
-      &.is-active {
-        & ~ .icon {
-          color: currentColor;
-        }
-      }
-    }
-  }
-  &.has-checkbox-right {
-    label.checkbox {
-      display: inline-flex;
-      height: 2.5em;
-      position: absolute;
-      top: 0;
-      right: 0;
-      justify-content: flex-end;
-      margin-left: auto;
-    }
-    .input,
-    .select select {
-      padding-right: 10em;
-    }
-  }
-
-  &.is-align-end {
-    display: flex;
-    align-self: end;
-  }
-}
-
-.control.is-expanded {
-  flex-grow: 1;
-  flex-shrink: 1;
-}
diff --git a/ui/app/styles/core/element-styling.scss b/ui/app/styles/core/element-styling.scss
deleted file mode 100644
index 8b2029912f0a8..0000000000000
--- a/ui/app/styles/core/element-styling.scss
+++ /dev/null
@@ -1,167 +0,0 @@
-/* These come from bulma */
-html,
-body,
-p,
-ol,
-ul,
-li,
-dl,
-dt,
-dd,
-blockquote,
-figure,
-fieldset,
-legend,
-textarea,
-pre,
-iframe,
-hr,
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  margin: 0;
-  padding: 0;
-}
-
-a:hover,
-body,
-pre,
-strong,
-table th {
-  color: $ui-gray-900;
-}
-
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  font-size: 100%;
-  font-weight: normal;
-}
-
-ul {
-  list-style: none;
-}
-
-button,
-input,
-select,
-textarea {
-  margin: 0;
-}
-
-html {
-  box-sizing: border-box;
-}
-
-* {
-  box-sizing: inherit;
-}
-*:before,
-*:after {
-  box-sizing: inherit;
-}
-
-img,
-embed,
-object {
-  max-width: 100%;
-}
-
-html {
-  background-color: $white;
-  font-size: 14px;
-  -moz-osx-font-smoothing: grayscale;
-  -webkit-font-smoothing: antialiased;
-  min-width: 300px;
-  overflow-x: hidden;
-  overflow-y: scroll;
-  text-rendering: optimizeLegibility;
-  text-size-adjust: 100%;
-}
-
-article,
-aside,
-figure,
-footer,
-header,
-hgroup,
-section {
-  display: block;
-}
-
-body,
-button,
-input,
-select,
-textarea {
-  font-family: $family-sans;
-}
-
-code,
-pre {
-  -moz-osx-font-smoothing: auto;
-  -webkit-font-smoothing: inherit;
-  font-family: 'SFMono-Regular', Consolas, 'Liberation Mono', Menlo, Courier, monospace;
-  font-smooth: inherit;
-}
-
-a strong,
-pre code {
-  color: currentColor;
-}
-
-body {
-  font-size: $size-6;
-  line-height: 1.5;
-}
-
-a {
-  color: $blue-500;
-  cursor: pointer;
-  text-decoration: underline;
-
-  &:hover,
-  &:active,
-  &:focus {
-    position: relative;
-  }
-}
-
-a:hover {
-  color: $ui-gray-900;
-}
-
-code {
-  background-color: transparent;
-  color: $ui-gray-700;
-  font-size: 1em;
-  font-weight: 400;
-  padding: 0;
-}
-
-hr {
-  background-color: $ui-gray-300;
-  border: none;
-  display: block;
-  height: 1px;
-  margin: 1rem 0;
-}
-
-img {
-  height: auto;
-  max-width: 100%;
-}
-
-form {
-  margin: 0;
-}
-
-label {
-  cursor: pointer;
-}
diff --git a/ui/app/styles/core/field.scss b/ui/app/styles/core/field.scss
deleted file mode 100644
index 93eecd37ebc89..0000000000000
--- a/ui/app/styles/core/field.scss
+++ /dev/null
@@ -1,141 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-// This file defines the styles for .field, .field-body, .form-fieldset
-
-.field {
-  // cannot use :read-only selector because tag used for other purposes
-  &.is-readOnly {
-    background-color: $ui-gray-100;
-    cursor: not-allowed;
-  }
-
-  &:not(:last-child) {
-    margin-bottom: $size-4;
-  }
-}
-// must come after field due to overriding the margin-bottom of not last-child
-.field-body .field {
-  margin-bottom: 0;
-}
-
-.field.has-addons {
-  flex-wrap: wrap;
-  .control {
-    .button,
-    .checkbox,
-    .input,
-    .select select {
-      border-radius: 0;
-      &:hover {
-        z-index: 2;
-      }
-      &:focus,
-      &:active,
-      &.is-active {
-        z-index: 3;
-        &:hover {
-          z-index: 4;
-        }
-      }
-    }
-    &:first-of-type {
-      flex-grow: 1;
-      .button,
-      .checkbox,
-      .input,
-      .select select {
-        border-bottom-left-radius: $radius;
-        border-top-left-radius: $radius;
-      }
-    }
-    &:last-child {
-      .button,
-      .checkbox,
-      .input,
-      .select select {
-        border-bottom-right-radius: $radius;
-        border-top-right-radius: $radius;
-      }
-    }
-  }
-  & > .label {
-    flex-grow: 1;
-    flex-shrink: 0;
-    width: 100%;
-  }
-}
-
-fieldset.form-fieldset {
-  border: none;
-}
-
-// field.is-grouped styles
-.field.is-grouped {
-  display: flex;
-  justify-content: flex-start;
-
-  > .control.is-expanded {
-    flex-grow: 1;
-    flex-shrink: 1;
-  }
-
-  > .control {
-    flex-shrink: 0;
-  }
-
-  > .control:not(:last-child) {
-    margin-bottom: 0;
-    margin-right: 0.75rem;
-  }
-
-  > .control.is-expanded {
-    flex-grow: 1;
-    flex-shrink: 1;
-  }
-}
-
-// responsive css
-@media screen and (min-width: 769px), print {
-  .field.is-horizontal {
-    display: flex;
-  }
-
-  .field-body {
-    display: flex;
-    flex-basis: 0;
-    flex-grow: 5;
-    flex-shrink: 1;
-
-    > .field:not(:last-child) {
-      margin-right: $size-9;
-    }
-    .field:not(.is-narrow) {
-      flex-grow: 1;
-    }
-  }
-
-  .field-label {
-    flex-basis: 0;
-    flex-grow: 1;
-    flex-shrink: 0;
-    margin-right: 1.5rem;
-    text-align: right;
-
-    &.is-normal {
-      padding-top: 0.375em;
-    }
-
-    &.is-medium {
-      font-size: 1.25rem;
-      padding-top: 0.375em;
-    }
-
-    &.is-large {
-      font-size: 1.5rem;
-      padding-top: 0.375em;
-    }
-  }
-}
diff --git a/ui/app/styles/core/file.scss b/ui/app/styles/core/file.scss
deleted file mode 100644
index e08ddbcaffadd..0000000000000
--- a/ui/app/styles/core/file.scss
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-// This file defines the styles for file, file-cta, file-delete-button, file-icon, file-input,  file-label, file-name.
-
-.file {
-  user-select: none;
-}
-
-.file-cta {
-  align-items: center;
-  border: $base-border;
-  border-radius: $radius;
-  display: inline-flex;
-  height: 2.25em;
-  justify-content: flex-start;
-  min-width: auto;
-  padding-bottom: calc(0.375em - 1px);
-  padding-left: 1em;
-  padding-right: 1em;
-  padding-top: calc(0.375em - 1px);
-  position: relative;
-  vertical-align: top;
-  white-space: nowrap;
-
-  &.button {
-    height: $size-2; // in older parts of the code (Ex: shamir-modal-flow) this class is not a button. In newer parts of the code it is, and height needs to match the height of a button (2.5rem).
-  }
-
-  &:disabled {
-    cursor: not-allowed;
-  }
-
-  .icon:first-child:last-child {
-    display: inline-block;
-    margin-right: 0.1rem;
-    vertical-align: middle;
-  }
-}
-
-.file-delete-button {
-  @extend .button;
-  @extend .is-transparent;
-  color: $grey;
-  position: absolute;
-  right: $spacing-xs;
-}
-
-.file-icon {
-  align-items: center;
-  display: flex;
-  height: 1em;
-  justify-content: center;
-  margin-right: 0.5em;
-  width: 1em;
-}
-
-.file-input {
-  height: 0.01em;
-  left: 0;
-  outline: 0;
-  position: absolute;
-  top: 0;
-  width: 0.01em;
-  visibility: hidden;
-}
-
-.file-label {
-  align-items: stretch;
-  cursor: pointer;
-  display: flex;
-  justify-content: flex-start;
-  position: relative;
-}
-
-.file-name {
-  @extend .input;
-  border: $base-border;
-  border-radius: $radius;
-  box-shadow: 0 4px 1px rgba(10, 10, 10, 0.06) inset;
-  display: block;
-  font-size: 1em;
-  line-height: 1.5;
-  overflow: hidden;
-  padding-bottom: calc(0.375em - 1px);
-  padding-left: 1em;
-  padding-right: 1em;
-  padding-top: calc(0.375em - 1px);
-  position: relative;
-  text-align: left;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-
-  &:disabled {
-    cursor: not-allowed;
-  }
-}
diff --git a/ui/app/styles/core/footer.scss b/ui/app/styles/core/footer.scss
index 49aa90c27b24b..e3f3a3d79eead 100644
--- a/ui/app/styles/core/footer.scss
+++ b/ui/app/styles/core/footer.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .footer {
   background-color: transparent;
   border-top: $base-border;
diff --git a/ui/app/styles/core/forms.scss b/ui/app/styles/core/forms.scss
new file mode 100644
index 0000000000000..ef41a3eddb63e
--- /dev/null
+++ b/ui/app/styles/core/forms.scss
@@ -0,0 +1,355 @@
+form {
+  margin: 0;
+}
+label {
+  cursor: pointer;
+  &.is-select-list {
+    padding: 10px 0px;
+    &:hover {
+      color: $blue;
+    }
+  }
+}
+
+.masked-font {
+  font-family: obscure, text-security-square;
+  letter-spacing: 2px;
+}
+
+.label {
+  color: $grey-darker;
+  text-transform: uppercase;
+  font-size: $size-small;
+}
+
+.is-label,
+.b-checkbox .is-label {
+  color: $grey-darker;
+  display: inline-block;
+  font-size: $body-size;
+  font-weight: $font-weight-bold;
+
+  &:not(:last-child) {
+    margin-bottom: 0.25rem;
+  }
+  // Sizes
+  &.is-small {
+    font-size: $size-small;
+  }
+  &.is-medium {
+    font-size: $size-medium;
+  }
+  &.is-large {
+    font-size: $size-large;
+  }
+
+  &::before,
+  &::after {
+    transform: translateY(0.2em);
+  }
+
+  &::before {
+    border-color: $grey-light;
+  }
+}
+
+.b-checkbox .is-label {
+  display: inline;
+  margin-left: $size-10;
+}
+
+.b-checkbox > .sub-text {
+  padding-left: 2rem;
+}
+
+.help {
+  &.is-danger {
+    font-weight: $weight-bold;
+  }
+}
+
+.is-help {
+  font-size: $size-small;
+  margin-top: 0.25rem;
+  @each $name, $pair in $colors {
+    $color: nth($pair, 1);
+    &.is-#{$name} {
+      color: $color;
+    }
+  }
+}
+
+.sub-text {
+  color: $grey;
+  margin-bottom: 0.25rem;
+  font-size: $size-8;
+}
+.input,
+.textarea,
+.select select {
+  border-color: $grey-light;
+  color: $grey-dark;
+  padding-left: $size-8;
+  padding-right: $size-8;
+  @include until($desktop) {
+    font-size: 16px;
+  }
+  &::placeholder {
+    opacity: 0.5;
+  }
+}
+
+.input,
+.select select,
+.control.has-icons-left .icon,
+.control.has-icons-right .icon {
+  height: 2.5rem;
+}
+
+.input.variable {
+  font-family: $family-monospace;
+}
+.input[disabled],
+.textarea[disabled] {
+  border-color: $grey-light;
+  background-color: $white-ter;
+  color: $grey-light;
+}
+
+.control {
+  max-width: 100%;
+
+  // Modifiers
+  &.has-icons-left,
+  &.has-icons-right {
+    .input,
+    .select select {
+      padding-left: 2rem;
+
+      &:focus,
+      &.is-focused,
+      &:active,
+      &.is-active {
+        & ~ .icon {
+          color: currentColor;
+        }
+      }
+    }
+  }
+  &.has-checkbox-right {
+    label.checkbox {
+      display: inline-flex;
+      height: 2.5em;
+      position: absolute;
+      top: 0;
+      right: 0;
+      justify-content: flex-end;
+      margin-left: auto;
+    }
+    .input,
+    .select select {
+      padding-right: 10em;
+    }
+  }
+}
+
+.input,
+.textarea {
+  box-shadow: 0 4px 1px rgba($black, 0.06) inset;
+
+  @each $name, $pair in $colors {
+    $color: nth($pair, 1);
+    $color-invert: findColorInvert($color);
+    $color-bg: nth($pair, 2);
+    &.is-#{$name} {
+      border-color: $color;
+      background-color: $color-bg;
+      &.is-inverted {
+        border-color: rgba($color-invert, 0.3);
+        background-color: $color-bg;
+        &::placeholder {
+          color: rgba($color-invert, 0.3);
+        }
+        &:focus,
+        &.is-focused,
+        &:active,
+        &.is-active {
+          border-color: rgba($color-invert, 1);
+          background-color: $color-bg;
+          color: $color-invert;
+          &::placeholder {
+            color: rgba($color-invert, 0.7);
+          }
+        }
+      }
+    }
+  }
+  &:focus,
+  &.is-focused,
+  &:active,
+  &.is-active {
+    background-color: $input-focus-background-color;
+  }
+}
+
+.select select {
+  background-color: $ui-gray-050;
+  box-shadow: 0 3px 1px rgba($black, 0.12);
+
+  .has-background-grey-lighter & {
+    background-color: $white;
+  }
+}
+
+.select:not(.is-multiple) {
+  height: 2.5rem;
+}
+
+.select:not(.is-multiple)::after {
+  content: svg-uri(
+    '<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M12 5.83L15.17 9l1.41-1.41L12 3 7.41 7.59 8.83 9 12 5.83zm0 12.34L8.83 15l-1.41 1.41L12 21l4.59-4.59L15.17 15 12 18.17z" fill="currentColor"/></svg>'
+  );
+  border: 0;
+  height: 24px;
+  margin: 0;
+  right: $spacing-xs;
+  transform: translateY(-50%);
+  width: 24px;
+}
+
+.field:not(:last-child) {
+  margin-bottom: 1.5rem;
+}
+.field-body .field {
+  margin-bottom: 0;
+}
+.field {
+  // cannot use :read-only selector because tag used for other purposes
+  &.is-readOnly {
+    background-color: $ui-gray-100;
+    cursor: not-allowed;
+  }
+}
+.field.has-addons {
+  flex-wrap: wrap;
+  .control {
+    .button,
+    .checkbox,
+    .input,
+    .select select {
+      border-radius: 0;
+      &:hover,
+      &.is-hovered {
+        z-index: 2;
+      }
+      &:focus,
+      &.is-focused,
+      &:active,
+      &.is-active {
+        z-index: 3;
+        &:hover {
+          z-index: 4;
+        }
+      }
+    }
+    &:first-of-type {
+      flex-grow: 1;
+      .button,
+      .checkbox,
+      .input,
+      .select select {
+        border-bottom-left-radius: $input-radius;
+        border-top-left-radius: $input-radius;
+      }
+    }
+    &:last-child {
+      .button,
+      .checkbox,
+      .input,
+      .select select {
+        border-bottom-right-radius: $input-radius;
+        border-top-right-radius: $input-radius;
+      }
+    }
+  }
+  & > .label {
+    flex-grow: 1;
+    flex-shrink: 0;
+    width: 100%;
+  }
+  .checkbox {
+    @include input;
+    background-color: $grey-lightest;
+    @each $name, $pair in $colors {
+      $color: nth($pair, 1);
+      &.is-#{$name} {
+        border-color: $color;
+      }
+    }
+    input {
+      margin-right: 0.5em;
+    }
+  }
+}
+
+.file-label {
+  overflow: visible;
+}
+
+.file-input {
+  visibility: hidden;
+}
+
+.file-cta {
+  min-width: auto;
+
+  .icon:first-child:last-child {
+    display: inline-block;
+    margin-right: 0.1rem;
+    vertical-align: middle;
+  }
+}
+
+.file-name {
+  @extend .input;
+}
+
+.file-delete-button {
+  @extend .button;
+  @extend .is-transparent;
+  color: $grey;
+  position: absolute;
+  right: 8px;
+}
+
+fieldset.form-fieldset {
+  border: none;
+}
+
+.has-error-border,
+select.has-error-border {
+  border: 1px solid $red-500;
+}
+
+.dropdown-has-error-border > div.ember-basic-dropdown-trigger {
+  border: 1px solid $red-500;
+}
+
+
+.autocomplete-input {
+  background: $white !important;
+  border: 1px solid $grey-light;
+  box-sizing: border-box;
+  border-radius: 3px;
+  width: 99%;
+  padding: 4px 0;
+  margin-left: 0.5%;
+  margin-top: -4px;
+}
+.autocomplete-input-option {
+  padding: 12px;
+  &:hover {
+    background-color: $grey-lightest;
+    cursor: pointer;
+  }
+}
diff --git a/ui/app/styles/core/generic.scss b/ui/app/styles/core/generic.scss
new file mode 100644
index 0000000000000..b4d674d6c1aeb
--- /dev/null
+++ b/ui/app/styles/core/generic.scss
@@ -0,0 +1,57 @@
+// seriously ? yes. seriously.
+a {
+  text-decoration: underline;
+  &:hover,
+  &:active,
+  &:focus {
+    position: relative;
+  }
+}
+.menu a {
+  text-decoration: none;
+}
+code {
+  padding: 0;
+  font-size: 1em;
+}
+.icon {
+  min-width: 1.5rem;
+  vertical-align: middle;
+}
+code,
+pre {
+  font-smoothing: inherit;
+  -webkit-font-smoothing: inherit;
+}
+
+input::-webkit-outer-spin-button,
+input::-webkit-inner-spin-button {
+  -webkit-appearance: none;
+  margin: 0;
+}
+
+.link {
+  background: transparent;
+  border: 0;
+  color: $blue;
+  cursor: pointer;
+  display: inline;
+  font: inherit;
+  line-height: normal;
+  margin: 0;
+  padding: 0;
+  font-weight: $font-weight-semibold;
+  -webkit-user-select: text; /* Chrome all / Safari all */
+  -moz-user-select: text; /* Firefox all */
+  -ms-user-select: text; /* IE 10+ */
+  user-select: text;
+
+  &[disabled] {
+    opacity: 0.5;
+    cursor: default;
+  }
+}
+
+.link-plain {
+  text-decoration: none;
+}
diff --git a/ui/app/styles/core/helpers.scss b/ui/app/styles/core/helpers.scss
new file mode 100644
index 0000000000000..88b741088761b
--- /dev/null
+++ b/ui/app/styles/core/helpers.scss
@@ -0,0 +1,268 @@
+.is-invisible {
+  visibility: hidden;
+}
+.is-underline {
+  text-decoration: underline;
+}
+.is-no-underline {
+  text-decoration: none;
+}
+.is-sideless {
+  box-shadow: 0 2px 0 -1px $grey-light, 0 -2px 0 -1px $grey-light;
+}
+.is-bottomless {
+  box-shadow: 0 -1px 0 0 $grey-light;
+}
+.has-bottom-shadow {
+  box-shadow: $box-shadow !important;
+}
+.is-borderless {
+  border: none !important;
+}
+.is-box-shadowless {
+  box-shadow: none !important;
+}
+.is-relative {
+  position: relative;
+}
+.is-fullwidth {
+  width: 100%;
+}
+.is-in-bottom-right {
+  position: absolute;
+  bottom: 1rem;
+  right: 1rem;
+  z-index: 10;
+}
+
+.has-background-transition {
+  transition: background-color $easing $speed;
+}
+.is-flex-column {
+  display: flex;
+  flex-direction: column;
+}
+.is-flex-row {
+  display: flex;
+  flex-direction: row;
+}
+.is-flex-v-centered {
+  display: flex;
+  align-items: center;
+  align-self: center;
+  justify-content: center;
+}
+.is-flex-v-centered-tablet {
+  @include tablet {
+    display: flex;
+    align-items: center;
+    align-self: center;
+    justify-content: center;
+  }
+}
+.is-flex-center {
+  display: flex;
+  align-items: center;
+}
+.is-flex-align-baseline {
+  display: flex;
+  align-items: baseline;
+}
+.is-flex-1 {
+  flex-grow: 1;
+}
+.is-flex-wrap {
+  flex-flow: row wrap;
+}
+.is-flex-end {
+  display: flex !important;
+  justify-content: flex-end;
+}
+.is-flex-start {
+  display: flex !important;
+  justify-content: flex-start;
+
+  &.has-gap {
+    gap: $spacing-m;
+  }
+}
+.is-flex-full {
+  flex-basis: 100%;
+}
+.is-no-flex-grow {
+  flex-grow: 0 !important;
+}
+.is-auto-width {
+  width: auto;
+}
+
+.is-flex-between,
+.is-grouped-split {
+  display: flex;
+  justify-content: space-between !important;
+}
+.has-default-border {
+  border: 1px solid $grey !important;
+}
+.has-no-pointer {
+  pointer-events: none;
+}
+.has-pointer {
+  cursor: pointer;
+}
+.has-short-padding {
+  padding: 0.25rem 1.25rem;
+}
+.has-tall-padding {
+  padding: 2.25rem;
+}
+.has-top-bottom-margin {
+  margin: 1.25rem 0rem;
+}
+
+.is-sideless.has-short-padding {
+  padding: 0.25rem 1.25rem;
+}
+.has-current-color-fill {
+  &,
+  & svg {
+    fill: currentColor;
+  }
+}
+.is-word-break {
+  overflow-wrap: break-word;
+  word-wrap: break-word;
+  word-break: break-word;
+  white-space: pre-wrap;
+}
+.is-font-mono {
+  font-family: $family-monospace;
+}
+.is-size-8 {
+  font-size: $size-8 !important;
+}
+.is-size-9 {
+  font-size: $size-9 !important;
+}
+.is-hint {
+  color: $grey;
+  font-size: $size-8;
+  padding: $size-8 0;
+}
+@each $name, $shade in $shades {
+  .has-background-#{$name} {
+    background: $shade !important;
+  }
+}
+.has-background-transparent {
+  background: transparent !important;
+}
+@each $name, $pair in $colors {
+  $color: nth($pair, 1);
+  .has-background-#{$name} {
+    background: $color !important;
+  }
+}
+.is-optional {
+  color: $grey;
+  font-size: $size-8;
+  text-transform: lowercase;
+}
+.has-top-padding-s {
+  padding-top: $spacing-s;
+}
+.has-top-padding-l {
+  padding-top: $spacing-l;
+}
+.has-top-padding-xxl {
+  padding-top: $spacing-xxl;
+}
+.has-bottom-margin-xs {
+  margin-bottom: $spacing-xs;
+}
+.has-bottom-margin-s {
+  margin-bottom: $spacing-s;
+}
+.has-bottom-margin-m {
+  margin-bottom: $spacing-m;
+}
+.has-bottom-margin-l {
+  margin-bottom: $spacing-l;
+}
+.has-bottom-margin-xl {
+  margin-bottom: $spacing-xl;
+}
+.has-bottom-margin-xxl {
+  margin-bottom: $spacing-xxl;
+}
+.has-top-margin-s {
+  margin-top: $spacing-s;
+}
+.has-top-margin-xs {
+  margin-top: $spacing-xs;
+}
+.has-top-margin-m {
+  margin-top: $spacing-m;
+}
+.has-top-margin-l {
+  margin-top: $spacing-l;
+}
+.has-top-margin-xl {
+  margin-top: $spacing-xl;
+}
+.has-top-margin-xxl {
+  margin-top: $spacing-xxl;
+}
+.has-left-margin-xxs {
+  margin-left: $spacing-xxs;
+}
+.has-left-margin-xs {
+  margin-left: $spacing-xs;
+}
+.has-left-margin-s {
+  margin-left: $spacing-s;
+}
+.has-left-margin-m {
+  margin-left: $spacing-m;
+}
+.has-left-margin-l {
+  margin-left: $spacing-l;
+}
+.has-left-margin-xl {
+  margin-left: $spacing-xl;
+}
+.has-right-margin-m {
+  margin-right: $spacing-m;
+}
+.has-right-margin-l {
+  margin-right: $spacing-l;
+}
+.has-border-top-light {
+  border-radius: 0;
+  border-top: 1px solid $grey-light;
+}
+.has-border-bottom-light {
+  border-radius: 0;
+  border-bottom: 1px solid $grey-light;
+}
+.has-border-danger {
+  border: 1px solid $danger;
+}
+
+ul.bullet {
+  list-style: disc;
+  padding-left: $spacing-m;
+}
+
+.has-text-semibold {
+  font-weight: $font-weight-semibold;
+}
+.is-v-centered {
+  vertical-align: middle;
+}
+.has-text-grey-400 {
+  color: $ui-gray-400;
+}
+.has-text-align-center {
+  text-align: center;
+}
diff --git a/ui/app/styles/core/hero.scss b/ui/app/styles/core/hero.scss
new file mode 100644
index 0000000000000..bf040a64fb4bd
--- /dev/null
+++ b/ui/app/styles/core/hero.scss
@@ -0,0 +1,7 @@
+.hero-body {
+  padding: 3rem 2rem 1rem;
+
+  svg {
+    margin-bottom: $size-10;
+  }
+}
diff --git a/ui/app/styles/core/inputs.scss b/ui/app/styles/core/inputs.scss
deleted file mode 100644
index 826abdaecd776..0000000000000
--- a/ui/app/styles/core/inputs.scss
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-// This file defines the styles for .input, .textarea and .input-hint.
-
-.input,
-.textarea {
-  align-items: center;
-  border-radius: $radius;
-  border: $base-border;
-  box-shadow: 0 4px 1px rgba($black, 0.06) inset;
-  color: $grey-dark;
-  display: inline-flex;
-  font-size: $size-6;
-  height: $size-2;
-  line-height: 1.5;
-  max-width: 100%;
-  padding-bottom: calc(0.375em - 1px);
-  padding-left: $size-8;
-  padding-right: $size-8;
-  padding-top: calc(0.375em - 1px);
-  width: 100%;
-
-  &:focus,
-  &:active,
-  &.is-active,
-  &:focus-visible {
-    outline: none;
-    background-color: $white;
-    border-color: $blue-500 !important;
-    box-shadow: 0 0 0 0.125em rgba(21, 99, 255, 0.25);
-  }
-
-  &:hover {
-    border-color: $ui-gray-300;
-  }
-
-  @include until($desktop) {
-    font-size: $size-6;
-  }
-
-  &::placeholder {
-    opacity: 0.5;
-  }
-}
-
-.input[disabled],
-.textarea[disabled] {
-  border-color: $grey-light;
-  background-color: $ui-gray-100;
-  color: $ui-gray-500;
-  cursor: not-allowed;
-
-  &:hover {
-    border-color: $grey-light;
-  }
-}
-
-.input[readonly],
-.textarea[readonly] {
-  box-shadow: none;
-}
-
-// textarea specific css
-.textarea {
-  min-width: 100%;
-  padding-bottom: 0.625em;
-  padding-top: 0.625em;
-}
-
-.textarea:not([rows]) {
-  max-height: 600px;
-  min-height: 120px;
-}
-
-// custom input
-.input-hint {
-  padding: 0 $size-9;
-  font-size: $size-8;
-  color: $grey;
-}
diff --git a/ui/app/styles/core/label.scss b/ui/app/styles/core/label.scss
deleted file mode 100644
index 8e01e65f9da4a..0000000000000
--- a/ui/app/styles/core/label.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-// This file defines the style for .is-label
-
-.is-label {
-  color: $grey-darkest;
-  display: inline-block;
-  font-size: 14px;
-  font-weight: $font-weight-bold;
-
-  &:not(:last-child) {
-    margin-bottom: 0.25rem;
-  }
-
-  &::before,
-  &::after {
-    transform: translateY(0.2em);
-  }
-
-  &::before {
-    border-color: $grey-light;
-  }
-}
diff --git a/ui/app/styles/core/layout.scss b/ui/app/styles/core/layout.scss
new file mode 100644
index 0000000000000..2a12adb2c6161
--- /dev/null
+++ b/ui/app/styles/core/layout.scss
@@ -0,0 +1,30 @@
+.ember-application > .ember-view {
+  display: flex;
+  flex-direction: column;
+}
+.page-container {
+  min-height: calc(100vh - #{$header-height});
+  display: flex;
+  flex-direction: column;
+  margin-top: $header-height;
+  justify-content: flex-end;
+}
+
+.section {
+  display: flex;
+  flex-grow: 1;
+  flex-direction: column;
+  padding-top: 0;
+  padding-bottom: 0;
+
+  > .container {
+    display: flex;
+    flex-grow: 1;
+    flex-direction: column;
+    width: 100%;
+
+    > .columns {
+      flex-grow: 1;
+    }
+  }
+}
diff --git a/ui/app/styles/core/level.scss b/ui/app/styles/core/level.scss
index 712e3ffeaa86f..ffe88fb49b4d7 100644
--- a/ui/app/styles/core/level.scss
+++ b/ui/app/styles/core/level.scss
@@ -1,57 +1,7 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-.level {
-  align-items: center;
-  justify-content: space-between;
-}
-
-.level code {
-  border-radius: $radius;
-}
-
 .level:not(:last-child) {
   @include vault-block;
 }
 
-.level-left,
-.level-right {
-  flex-basis: auto;
-  flex-grow: 0;
-  flex-shrink: 0;
-}
-
-.level-right {
-  align-items: center;
-  justify-content: flex-end;
-}
-
-.level-left {
-  align-items: center;
-  justify-content: flex-start;
-}
-
-.level.is-mobile,
-.level.is-mobile .level-left,
-.level.is-mobile .level-right {
-  display: flex;
-}
-
-.level.is-mobile .level-left + .level-right {
-  margin-top: 0;
-}
-
-.level.is-mobile .level-item:not(:last-child) {
-  margin-bottom: 0;
-  margin-right: $size-9;
-}
-
-.level.is-mobile .level-item:not(.is-narrow) {
-  flex-grow: 1;
-}
-
 .level.has-padded-items {
   .level-item {
     flex: 0 1 auto;
@@ -63,35 +13,3 @@
     flex-basis: 25%;
   }
 }
-
-.level-item {
-  align-items: center;
-  display: flex;
-  flex-basis: auto;
-  flex-grow: 0;
-  flex-shrink: 0;
-  justify-content: center;
-}
-
-// responsive css
-@media screen and (min-width: 769px), print {
-  .level {
-    display: flex;
-  }
-  .level > .level-item:not(.is-narrow) {
-    flex-grow: 1;
-  }
-  .level-left {
-    display: flex;
-  }
-
-  .level-right {
-    display: flex;
-  }
-}
-
-@media screen and (max-width: 768px) {
-  .level-item:not(:last-child) {
-    margin-bottom: $size-9;
-  }
-}
diff --git a/ui/app/styles/core/link.scss b/ui/app/styles/core/link.scss
deleted file mode 100644
index 998573b3b2eab..0000000000000
--- a/ui/app/styles/core/link.scss
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-.link {
-  background: transparent;
-  border: 0;
-  color: $blue;
-  cursor: pointer;
-  display: inline;
-  font: inherit;
-  line-height: normal;
-  margin: 0;
-  padding: 0;
-  font-weight: $font-weight-semibold;
-  user-select: text;
-
-  &[disabled] {
-    opacity: 0.5;
-    cursor: default;
-  }
-}
-// NICE TO HAVE: replace all instances with helper "is-no-underline"
-.link-plain {
-  text-decoration: none;
-}
diff --git a/ui/app/styles/core/lists.scss b/ui/app/styles/core/lists.scss
index 824af1a1556d3..44f6f08d71dd7 100644
--- a/ui/app/styles/core/lists.scss
+++ b/ui/app/styles/core/lists.scss
@@ -1,16 +1,9 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-// This file defines styles for list type items, like: .sep, .list-header and ul.bullet.
-
 .sep {
   display: inline-flex;
   align-items: center;
   &:before {
     font-size: $size-5;
-    color: $blue-500;
+    color: $white-ter;
     content: '|';
     position: relative;
   }
@@ -23,8 +16,3 @@
   font-weight: $font-weight-semibold;
   text-transform: uppercase;
 }
-
-ul.bullet {
-  list-style: disc;
-  padding-left: $spacing-m;
-}
diff --git a/ui/app/styles/core/menu.scss b/ui/app/styles/core/menu.scss
index b9a781df05772..f970ade367e9d 100644
--- a/ui/app/styles/core/menu.scss
+++ b/ui/app/styles/core/menu.scss
@@ -1,27 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-.menu {
-  font-size: $size-6;
-}
-
-.menu a {
-  display: block;
-  padding: $size-10 $size-9;
-  text-decoration: none;
-}
-
-.menu-label {
-  letter-spacing: 0.1em;
-  text-transform: uppercase;
-}
-
-.menu-list {
-  line-height: 1.25;
-}
-
 .column .menu-list a {
   border-radius: 0;
   border-right: 0 solid transparent;
@@ -29,6 +5,7 @@
 
   &:hover,
   &.is-active {
-    color: $blue;
+    color: $menu-item-active-color;
+    background-color: $menu-item-active-background-color;
   }
 }
diff --git a/ui/app/styles/core/message.scss b/ui/app/styles/core/message.scss
index 0b4a26ea05956..197d7cdb59a02 100644
--- a/ui/app/styles/core/message.scss
+++ b/ui/app/styles/core/message.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .message {
   background: $blue-010;
   border: 1px solid $blue-100;
@@ -10,15 +5,21 @@
   padding: $spacing-s $spacing-m $spacing-m $spacing-s;
   position: relative;
 
-  &:not(:last-child) {
-    margin-bottom: $size-4;
-  }
-
   .message-icon {
     color: $blue;
     margin-right: $spacing-xs;
   }
 
+  .close-button {
+    background: transparent;
+    border: 0;
+    color: $grey;
+    cursor: pointer;
+    position: absolute;
+    right: $spacing-s;
+    top: $spacing-m;
+  }
+
   .message-title {
     color: $blue-500;
     font-size: 16px;
@@ -30,31 +31,19 @@
     }
   }
 
-  .close-button {
-    background: transparent;
-    border: 0;
-    color: $grey;
-    cursor: pointer;
-    position: absolute;
-    right: $spacing-s;
-    top: $spacing-m;
-  }
-
   .close-button + .message-title {
     padding-right: $spacing-m;
   }
 
   .message-body {
     border: 0;
-    padding: 1em 1.25em;
     margin-top: $spacing-xxs;
   }
-
   .message-body.pre {
     white-space: pre-wrap;
   }
-  // was p selector only, but padding was getting overridden by the message-body above
-  p.message-body {
+
+  p {
     font-size: $size-8;
     border: 0;
     padding: 0;
@@ -75,32 +64,10 @@
     }
   }
 
-  // message types, see message-types.js
-  &.is-danger {
-    background: $red-010;
-    border: 1px solid $red-050;
-
-    .message-body {
-      color: $red-700;
-    }
-
-    .message-icon {
-      color: $red-500;
-    }
-
-    .message-title {
-      color: $red-700;
-    }
-  }
-
   &.is-highlight {
     background: $yellow-010;
     border: 1px solid $yellow-100;
 
-    .message-body {
-      color: $ui-gray-900;
-    }
-
     .message-icon {
       color: $yellow-500;
     }
@@ -110,37 +77,29 @@
     }
   }
 
-  &.is-info {
-    background-color: $blue-010;
-
-    .message-body {
-      color: $blue-700;
-    }
+  &.is-success {
+    background: $green-010;
+    border: 1px solid $green-100;
 
-    .message-header {
-      background-color: $blue-500;
-      color: $white;
+    .message-icon {
+      color: $green-500;
     }
 
     .message-title {
-      color: $blue-700;
+      color: $green-700;
     }
   }
 
-  &.is-success {
-    background: $green-010;
-    border: 1px solid $green-100;
-
-    .message-body {
-      color: $green-900;
-    }
+  &.is-danger {
+    background: $red-010;
+    border: 1px solid $red-050;
 
     .message-icon {
-      color: $green-500;
+      color: $red-500;
     }
 
     .message-title {
-      color: $green-700;
+      color: $red-700;
     }
   }
 }
@@ -159,11 +118,11 @@
   }
 
   &.has-top {
-    margin-top: $size-6;
+    margin-top: 1rem;
   }
 
   &.size-small {
-    font-size: $size-8;
+    font-size: $size-7;
   }
 
   &.padding-top {
@@ -179,6 +138,10 @@
   }
 }
 
+.has-text-highlight {
+  color: $yellow-500;
+}
+
 .message.message-marginless {
   margin: 0;
 }
diff --git a/ui/app/styles/core/navbar.scss b/ui/app/styles/core/navbar.scss
new file mode 100644
index 0000000000000..48d9cc7d1f723
--- /dev/null
+++ b/ui/app/styles/core/navbar.scss
@@ -0,0 +1,289 @@
+.navbar {
+  left: 0;
+  position: fixed;
+  right: 0;
+  top: 0;
+  @include from($mobile) {
+    display: block;
+  }
+}
+
+.navbar-status {
+  height: 40px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-size: $size-7;
+  font-weight: $font-weight-semibold;
+
+  &.connected {
+    background-color: $ui-gray-800;
+    color: #c2c5cb;
+
+    a {
+      color: #c2c5cb;
+    }
+  }
+  &.warning {
+    background-color: #fcf6ea;
+    color: #975b06;
+
+    a {
+      color: #975b06;
+    }
+  }
+}
+
+.navbar-actions {
+  background-color: $black;
+  display: flex;
+  height: $header-height;
+  justify-content: flex-start;
+  padding: $spacing-xs $spacing-s $spacing-xs 0;
+}
+
+.navbar-brand {
+  background: $vault-gray;
+  border-radius: 0 $radius-large $radius-large 0;
+  margin-right: $spacing-s;
+  min-height: auto;
+  position: relative;
+  z-index: 203;
+
+  .navbar-item {
+    background-color: transparent;
+    padding: $spacing-xs $spacing-l;
+
+    &:hover,
+    .is-active {
+      background-color: transparent;
+    }
+  }
+}
+
+.navbar-drawer-toggle {
+  font-size: $size-6;
+  color: $vault-gray;
+  cursor: pointer;
+  font-weight: $font-weight-semibold;
+  margin-left: -$spacing-s;
+  padding: $spacing-xs $spacing-xxs;
+  background: none;
+  border: none;
+
+  .navbar-drawer & {
+    position: absolute;
+    top: $spacing-xs;
+    right: $spacing-xxs;
+  }
+}
+
+.navbar-drawer-overlay {
+  height: 100vh;
+  left: 0;
+  pointer-events: none;
+  position: fixed;
+  right: 0;
+  top: 0;
+  transition: background-color $speed, opacity $speed;
+  will-change: background-color, opacity;
+  z-index: -1;
+
+  &.is-active {
+    background-color: rgba($black, 0.25);
+    pointer-events: all;
+
+    @include from($mobile) {
+      background-color: transparent;
+      pointer-events: none;
+    }
+  }
+}
+
+.navbar-sections,
+.navbar-sections li,
+.navbar-drawer-scroll,
+.navbar-drawer-scroll > * {
+  @include from($mobile) {
+    align-items: center;
+    display: flex;
+  }
+}
+
+.navbar-sections {
+  a {
+    color: $grey-light;
+    display: block;
+    font-weight: $font-weight-semibold;
+    line-height: 1.3;
+    padding: $spacing-xs $spacing-m;
+    text-decoration: none;
+    transition: background-color $speed, color $speed;
+    will-change: background-color, color;
+
+    @include from($mobile) {
+      border-radius: $radius;
+      display: inline-block;
+      padding: $spacing-xxs $spacing-s;
+    }
+
+    &.is-active {
+      background-color: $vault-gray-700;
+      color: $white;
+    }
+
+    &:hover {
+      color: $white;
+    }
+  }
+}
+
+.navbar-end {
+  margin-left: auto;
+}
+
+.navbar-item {
+  padding: $spacing-xs;
+}
+
+.navbar-separator {
+  background-color: $ui-gray-700;
+  height: 1px;
+  margin: $spacing-xs 0;
+  width: 100%;
+
+  @include from($mobile) {
+    height: $spacing-l;
+    margin: 0 $spacing-s;
+    width: 1px;
+  }
+}
+
+.navbar-drawer {
+  flex: 1 1 auto;
+
+  @include until($mobile) {
+    background-color: $ui-gray-900;
+    display: flex;
+    flex-direction: column;
+    height: 100vh;
+    left: 0;
+    padding: 4rem 0 $spacing-m;
+    position: fixed;
+    top: 0;
+    transform: translateX(-100%);
+    transition: box-shadow $speed, transform $speed-slow;
+    width: $drawer-width;
+    will-change: transform, box-shadow;
+    z-index: 201;
+  }
+
+  &.is-active {
+    @include until($mobile) {
+      box-shadow: 5px 0 10px rgba($black, 0.36);
+      transform: translateX(0);
+    }
+  }
+
+  .navbar-item .button {
+    color: $grey-light;
+    display: flex;
+    font-size: 1rem;
+    height: auto;
+    justify-content: flex-start;
+    text-align: left;
+    width: 100%;
+
+    @include from($mobile) {
+      display: inline-flex;
+      height: $spacing-l;
+      width: auto;
+    }
+
+    &.popup-open,
+    &.ember-basic-dropdown-trigger--below {
+      color: $white;
+
+      .is-status-chevron {
+        transform: rotate(0deg);
+
+        @include from($mobile) {
+          transform: rotate(180deg);
+        }
+      }
+    }
+
+    .is-status-chevron {
+      transform: rotate(270deg);
+
+      @include from($mobile) {
+        transform: rotate(0deg);
+      }
+    }
+  }
+
+  .button .icon,
+  .button .icon:first-child:not(:last-child) {
+    flex: 0;
+    margin: 0 $spacing-xs 0 0;
+
+    @include from($mobile) {
+      margin: -$spacing-xxs;
+      margin-right: 0;
+    }
+  }
+
+  .status-menu-label {
+    flex: 1 1 auto;
+    line-height: 1;
+  }
+
+  .nav-console-button .status-menu-label,
+  .nav-user-button .status-menu-label {
+    flex: 1 1 auto;
+
+    @include from($mobile) {
+      display: none;
+    }
+  }
+}
+
+.nav-user-button .icon {
+  position: relative;
+}
+.nav-user-button.may-expire .icon:first-of-type::after {
+  content: '';
+  position: absolute;
+  top: 0;
+  right: 0;
+  height: 6px;
+  width: 6px;
+  border-radius: 50%;
+  background: $yellow;
+}
+.navbar-drawer-scroll {
+  overflow: auto;
+  height: 100%;
+  -webkit-overflow-scrolling: touch;
+
+  &::before {
+    background-image: linear-gradient(to bottom, $ui-gray-900, rgba($ui-gray-900, 0));
+    content: '';
+    height: $spacing-xs;
+    left: 0;
+    position: absolute;
+    right: 0;
+    top: $header-height;
+    z-index: 1;
+
+    @include from($mobile) {
+      display: none;
+    }
+  }
+}
+
+.navbar-drawer .ember-basic-dropdown-content {
+  @include until($mobile) {
+    position: relative;
+  }
+}
diff --git a/ui/app/styles/core/notification.scss b/ui/app/styles/core/notification.scss
new file mode 100644
index 0000000000000..187e864b7f95c
--- /dev/null
+++ b/ui/app/styles/core/notification.scss
@@ -0,0 +1,57 @@
+.notification {
+  padding: $spacing-m $spacing-m $spacing-m $spacing-s;
+
+  .title {
+    font-weight: $weight-bold;
+  }
+
+  &.has-border {
+    border: 1px solid currentColor;
+    border-left-width: 10px;
+  }
+
+  @each $name, $pair in $colors {
+    $color: nth($pair, 1);
+    $color-invert: nth($pair, 2);
+    $color-lightning: max((100% - lightness($color)) - 2%, 0%);
+    $color-luminance: colorLuminance($color);
+    $darken-percentage: $color-luminance * 70%;
+    $desaturate-percentage: $color-luminance * 30%;
+    &.is-#{$name} {
+      background-color: lighten($color, $color-lightning);
+      border-color: $color;
+      color: desaturate(darken($color, $darken-percentage), $desaturate-percentage);
+      .delete {
+        color: $color;
+      }
+      .title {
+        color: $color-invert;
+        margin-bottom: 0.5rem;
+      }
+    }
+  }
+
+  &.is-warning {
+    .title,
+    .delete {
+      color: $yellow-darkest;
+    }
+    border-color: $orange;
+    color: $yellow-darkest;
+  }
+
+  & > .delete {
+    &:before,
+    &:after {
+      content: none;
+    }
+    position: absolute;
+    background-color: transparent;
+    border: none;
+    color: currentColor;
+    right: 0.5rem;
+    top: 0.5rem;
+    height: 1.5rem;
+    width: 1.5rem;
+  }
+}
diff --git a/ui/app/styles/core/progress.scss b/ui/app/styles/core/progress.scss
index aab1a9f76df73..ceb4f8e9827e2 100644
--- a/ui/app/styles/core/progress.scss
+++ b/ui/app/styles/core/progress.scss
@@ -1,21 +1,10 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .progress {
-  appearance: none;
-  background: $ui-gray-050;
-  border: none;
-  box-shadow: inset $box-link-shadow;
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  background: $progress-bar-background-color;
+  box-shadow: inset 0 0 0 1px $ui-gray-200;
   border-radius: $radius;
-  display: block;
-  height: $size-6;
-  overflow: hidden;
-  padding: 0;
   margin-bottom: 0;
-  width: 100%;
-
   &.is-small {
     height: 0.5rem;
   }
@@ -23,64 +12,23 @@
     width: 30px;
   }
   &.is-medium {
-    height: $size-5;
     width: 120px;
   }
 }
 
 // style the container in chrome
 .progress[value]::-webkit-progress-bar {
-  background-color: #ededed;
-  box-shadow: inset $box-link-shadow;
+  box-shadow: inset 0 0 0 1px $ui-gray-200;
 }
 
 // style the bar in chrome
 .progress[value]::-webkit-progress-value {
-  background-color: #4a4a4a;
   border-radius: $radius;
-  transition: width 1s $easing;
+  transition: width 1s ease-out;
 }
 
 // style the bar in firefox
 .progress[value]::-moz-progress-bar {
   border-radius: $radius;
-  transition: width 1s $easing;
-}
-
-.progress::-ms-fill {
-  background-color: #4a4a4a;
-  border: none;
-}
-
-// is-success and is-info are the two types of progress bars we have
-.progress.is-info::-webkit-progress-value {
-  background-color: #3e8ed0;
-}
-
-.progress.is-info::-moz-progress-bar {
-  background-color: #3e8ed0;
-}
-
-.progress.is-info::-ms-fill {
-  background-color: #3e8ed0;
-}
-
-.progress.is-info:indeterminate {
-  background-image: linear-gradient(to right, #3e8ed0 30%, #ededed 30%);
-}
-
-.progress.is-success::-webkit-progress-value {
-  background-color: $green-500;
-}
-
-.progress.is-success::-moz-progress-bar {
-  background-color: $green-500;
-}
-
-.progress.is-success::-ms-fill {
-  background-color: $green-500;
-}
-
-.progress.is-success:indeterminate {
-  background-image: linear-gradient(to right, $green-500 30%, #ededed 30%);
+  transition: width 1s ease-out;
 }
diff --git a/ui/app/styles/core/select.scss b/ui/app/styles/core/select.scss
index d07e952c86c14..449bf9fb6a050 100644
--- a/ui/app/styles/core/select.scss
+++ b/ui/app/styles/core/select.scss
@@ -1,84 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-select {
-  width: 100%;
-  appearance: none;
-}
-
 .select select {
-  background-color: $ui-gray-050;
-  box-shadow: 0 3px 1px rgba($black, 0.12);
-  border: 1px solid $grey-light;
-  border-radius: $radius;
-  color: $grey-dark;
-  cursor: pointer;
-  display: block;
-  font-size: 1em;
-  height: 2.5rem;
-  max-width: 100%;
-  outline: none;
-  padding-bottom: calc(0.375em - 1px);
-  padding-left: $size-8;
-  padding-right: $size-8;
-  padding-top: calc(0.375em - 1px);
   text-rendering: auto !important;
-
-  @include until($desktop) {
-    font-size: 1rem;
-  }
-
-  &::placeholder {
-    opacity: 0.5;
-  }
-
-  &:active,
-  &:focus,
-  &:focus-visible,
-  &.is-active {
-    border-color: $blue-500;
-    box-shadow: 0 0 0 0.125em rgba(21, 99, 255, 0.25);
-  }
-}
-
-.select select:not([multiple]) {
-  padding-right: $size-2;
-}
-
-.select select[disabled] {
-  border-color: $grey-light;
-  background-color: $ui-gray-100;
-  color: $ui-gray-500;
-  cursor: not-allowed;
-  user-select: none;
-  &:hover {
-    border-color: $grey-light;
-  }
-}
-
-.select {
-  display: inline-block;
-  height: 2.5rem;
-  max-width: 100%;
-  position: relative;
-  vertical-align: top;
-}
-
-.select::after {
-  content: svg-uri(
-    '<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M12 5.83L15.17 9l1.41-1.41L12 3 7.41 7.59 8.83 9 12 5.83zm0 12.34L8.83 15l-1.41 1.41L12 21l4.59-4.59L15.17 15 12 18.17z" fill="currentColor"/></svg>'
-  );
-  border: 0;
-  display: block;
-  height: 24px;
-  margin: 0;
-  pointer-events: none;
-  position: absolute;
-  right: $spacing-xs;
-  top: 50%;
-  transform: translateY(-50%);
-  width: 24px;
-  z-index: 4;
 }
diff --git a/ui/app/styles/core/switch.scss b/ui/app/styles/core/switch.scss
index dffc48391e249..7163ab4f39b8f 100644
--- a/ui/app/styles/core/switch.scss
+++ b/ui/app/styles/core/switch.scss
@@ -1,152 +1,35 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-// This file defines the style for switch, with the nested classes: is-small, is-rounded, is-success
-
 .switch[type='checkbox'] {
-  display: inline-block;
-  outline: 0;
-  opacity: 0;
-  position: absolute;
-  user-select: none;
-
-  + label {
-    align-items: center;
-    cursor: pointer;
-    display: inline-flex;
-    font-size: $size-6;
-    justify-content: flex-start;
-    line-height: 1.5;
-    padding-left: 3.5rem;
-    position: relative;
-
-    &::before {
-      position: absolute;
-      display: block;
-      top: calc(50% - 1.5rem * 0.5);
-      left: 0;
-      width: $size-1;
-      height: $size-4;
-      border: 0.1rem solid transparent;
-      border-radius: $radius-large;
-      background: $ui-gray-300;
-      content: '';
-    }
-
-    &::after {
-      background: $white;
-      border-radius: $radius-large;
-      content: '';
-      display: block;
-      height: $size-6;
-      left: $size-11;
-      position: absolute;
-      top: calc(50% - 1rem * 0.5);
-      transform: translate3d(0, 0, 0);
-      transition: all 0.25s ease-out;
-      width: $size-6;
-    }
-
-    &:checked::after {
-      left: 1.625rem;
-    }
-  }
-}
-
-// is-rounded
-.switch[type='checkbox'].is-rounded {
-  + label {
-    &::before {
-      border-radius: 16px;
-    }
-    &::after {
-      border-radius: 50%;
-    }
-  }
   &.is-small {
     + label {
+      font-size: $size-8;
+      font-weight: bold;
+      padding-left: $size-8 * 2.5;
+      margin: 0 0.25rem;
       &::before {
-        border-radius: 16px;
+        top: $size-8 / 5;
+        height: $size-8;
+        width: $size-8 * 2;
       }
       &::after {
-        border-radius: 50%;
+        width: $size-8 * 0.8;
+        height: $size-8 * 0.8;
+        transform: translateX(0.15rem);
+        left: 0;
+        top: $size-8/ 4;
       }
     }
-  }
-}
-// is-small
-.switch[type='checkbox'].is-small {
-  + label {
-    cursor: pointer;
-    display: inline-block;
-    font-size: $size-8;
-    font-weight: bold;
-    height: 18px;
-    padding-left: $size-8 * 2.5;
-    position: relative;
-    margin: 0 $size-11;
-    &::before {
-      border: 0.1rem solid transparent;
-      border-radius: $radius-large;
-      background: $ui-gray-300;
-      display: block;
-      content: '';
-      height: $size-8;
-      position: absolute;
-      top: calc($size-8 / 5);
-      width: $size-8 * 2;
-    }
-    &::after {
-      background: $white;
-      border-radius: $radius-large;
-      content: '';
-      display: block;
-      height: $size-8 * 0.8;
+    &:checked + label::after {
       left: 0;
-      position: absolute;
-      top: calc($size-8 / 4);
-      transform: translateX(0.15rem);
-      transition: all 0.25s ease-out;
-      width: $size-8 * 0.8;
-      will-change: left;
-
-      &:checked {
-        left: $size-5;
-      }
+      transform: translateX(($size-8 * 2) - ($size-8 * 0.94));
     }
   }
-  &:checked + label::after {
-    left: 0;
-    transform: translateX(($size-8 * 2) - ($size-8 * 0.94));
-  }
 }
-
-// is-success
-.switch[type='checkbox'].is-success:checked + label::before {
-  background: $blue;
+.switch[type='checkbox'].is-small + label::after {
+  will-change: left;
 }
-
-// focus
 .switch[type='checkbox']:focus + label {
   box-shadow: 0 0 1px $blue;
 }
-
-// disabled
-.switch[type='checkbox'][disabled] {
-  cursor: not-allowed;
-}
-
-.switch[type='checkbox'][disabled] + label {
-  opacity: 0.5;
-}
-
-.switch[type='checkbox'][disabled] + label:hover {
-  cursor: not-allowed;
-}
-
-// misc.
-.field-body .switch[type='checkbox'] + label {
-  margin-top: 0.375em;
+.switch[type='checkbox'].is-success:checked + label::before {
+  background: $blue;
 }
diff --git a/ui/app/styles/core/tables.scss b/ui/app/styles/core/tables.scss
new file mode 100644
index 0000000000000..6d6d6c1203d91
--- /dev/null
+++ b/ui/app/styles/core/tables.scss
@@ -0,0 +1,39 @@
+.table {
+  thead,
+  .thead {
+    box-shadow: 0 1px 0 0 $grey-light, 0 -1px 0 0 $grey-light;
+
+    th,
+    .th {
+      font-size: $size-8;
+      color: $grey;
+      font-weight: $font-weight-semibold;
+      padding: 1rem 1.5rem 0;
+      border-width: 0 0 1px 0;
+      border-color: $grey-light;
+    }
+  }
+
+  .thead {
+    box-shadow: 0 -1px 0 0 $grey-light;
+  }
+  td,
+  .td {
+    font-size: $size-6;
+    color: $black;
+    padding: 1rem 1.5rem;
+    border-width: 0 0 1px 0;
+    border-color: $grey-light;
+    border-style: solid;
+  }
+  tr:hover {
+    background: rgba($grey-lighter, 0.4);
+  }
+}
+.table tbody tr:last-child td,
+.table tbody tr:last-child th {
+  border-bottom-width: inherit;
+}
+.table.has-expanded-borders {
+  border-collapse: inherit;
+}
diff --git a/ui/app/styles/core/tag.scss b/ui/app/styles/core/tag.scss
deleted file mode 100644
index 5f55d71677091..0000000000000
--- a/ui/app/styles/core/tag.scss
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-// This file defines the style for .tag
-
-.tag:not(body) {
-  align-items: center;
-  background-color: $ui-gray-100;
-  border-radius: $radius;
-  color: $grey;
-  display: inline-flex;
-  font-size: $size-8;
-  font-weight: $font-weight-normal;
-  height: auto;
-  justify-content: center;
-  line-height: 1.5;
-  margin-right: $size-10;
-  padding: 0 $size-10;
-  white-space: nowrap;
-  vertical-align: middle;
-
-  code {
-    color: $grey;
-  }
-
-  .icon {
-    height: 12px;
-    margin-left: -0.25em;
-    margin-right: 0.25em;
-    min-width: 0;
-    width: 12px;
-  }
-
-  &.has-extra-padding {
-    padding: $size-11 $spacing-xxs;
-  }
-}
-
-.tag {
-  &.is-bold {
-    font-weight: bold;
-  }
-
-  &.is-light {
-    background-color: whitesmoke;
-    color: rgba(0, 0, 0, 0.7);
-  }
-
-  &.is-outlined {
-    background-color: transparent;
-    border: 1px solid $grey-light;
-  }
-
-  &.is-transparent {
-    background-color: transparent;
-  }
-
-  &.is-small {
-    height: auto;
-  }
-
-  &.is-medium {
-    font-size: $size-6;
-  }
-
-  &.is-success {
-    background-color: $green-500;
-    color: $white;
-  }
-}
diff --git a/ui/app/styles/core/tags.scss b/ui/app/styles/core/tags.scss
new file mode 100644
index 0000000000000..4f97d5a3b6573
--- /dev/null
+++ b/ui/app/styles/core/tags.scss
@@ -0,0 +1,34 @@
+.tag:not(body) {
+  background-color: $ui-gray-100;
+  border-radius: 2px;
+  color: $grey;
+  height: auto;
+  padding: 0 $size-10;
+  margin-right: 0.5rem;
+  font-weight: normal;
+
+  code {
+    color: $grey;
+  }
+
+  .icon {
+    height: 12px;
+    margin-left: -0.25em;
+    margin-right: 0.25em;
+    min-width: 0;
+    width: 12px;
+  }
+}
+
+.tag.is-outlined {
+  background-color: transparent;
+  border: 1px solid $grey-light;
+}
+
+.tag.is-bold {
+  font-weight: bold;
+}
+
+.tag.is-small {
+  height: auto;
+}
diff --git a/ui/app/styles/core/title.scss b/ui/app/styles/core/title.scss
index 00e4e760cfcd9..0c6195e767062 100644
--- a/ui/app/styles/core/title.scss
+++ b/ui/app/styles/core/title.scss
@@ -1,51 +1,22 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-// This file styles the following styles: title, subtitle, form-section.title and title sizes
-
 .title:not(:last-child),
 .subtitle:not(:last-child) {
   display: block;
   margin-bottom: 1rem;
+
+  &.has-bottom-margin-xs {
+    margin-bottom: $spacing-xs;
+  }
 }
 
 .title {
-  color: hsl(0, 0%, 21%);
-  font-size: 2rem;
   font-weight: $font-weight-bold;
-  line-height: 1.125;
-  word-break: break-word;
 
   > a {
     color: $black;
     text-decoration: none;
   }
-
-  // title sizes
-  &.is-2 {
-    font-size: $size-2;
-  }
-
-  &.is-3 {
-    font-size: $size-3;
-  }
-
-  &.is-4 {
-    font-size: $size-4;
-  }
-
-  &.is-5 {
-    font-size: $size-5;
-  }
-
-  &.is-6 {
-    font-size: $size-6;
-  }
-
-  &.is-7 {
-    font-size: $size-7;
+  .has-font-weight-normal {
+    font-weight: $font-weight-normal;
   }
 }
 
diff --git a/ui/app/styles/core/toggle.scss b/ui/app/styles/core/toggle.scss
index 16b4b5ddfa16b..1dbe5a2bb60d0 100644
--- a/ui/app/styles/core/toggle.scss
+++ b/ui/app/styles/core/toggle.scss
@@ -1,10 +1,4 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-/* COPIED FROM BULMA SWITCH */
-
+/* COPIED FROM BULMA/SWITCH */
 .toggle[type='checkbox'] {
   outline: 0;
   user-select: none;
@@ -55,8 +49,8 @@
   height: 1rem;
   transform: translate3d(0, 0, 0);
   border-radius: 50%;
-  background: $white;
-  transition: all 0.25s $easing;
+  background: white;
+  transition: all 0.25s ease-out;
   content: '';
 }
 .toggle[type='checkbox']:checked + label::before {
@@ -74,7 +68,7 @@
       padding-left: $size-8 * 2.5;
       margin: 0 0.25rem;
       &::before {
-        top: calc($size-8 / 5);
+        top: $size-8 / 5;
         height: $size-8;
         width: $size-8 * 2;
       }
@@ -83,7 +77,7 @@
         height: $size-8 * 0.8;
         transform: translateX(0.15rem);
         left: 0;
-        top: calc($size-8 / 4);
+        top: $size-8/ 4;
       }
     }
     &:checked + label::after {
diff --git a/ui/app/styles/helper-classes/colors.scss b/ui/app/styles/helper-classes/colors.scss
deleted file mode 100644
index 64f6467acb46d..0000000000000
--- a/ui/app/styles/helper-classes/colors.scss
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-/* This helper includes styles referencing background color, border color, and text color. */
-
-// background colors
-.has-background-white-bis {
-  background: $ui-gray-050;
-}
-
-.has-background-gray-100 {
-  background-color: $ui-gray-100;
-}
-
-.has-background-gray-200 {
-  background-color: $ui-gray-200;
-}
-
-// borders
-.has-border-top-light {
-  border-radius: 0;
-  border-top: 1px solid $grey-light;
-}
-
-.has-border-bottom-light {
-  border-radius: 0;
-  border-bottom: 1px solid $grey-light;
-}
-
-.has-error-border,
-select.has-error-border {
-  border: 1px solid $red-500;
-}
-
-// specifically for the SearchSelect dropdown.
-.dropdown-has-error-border > div.ember-basic-dropdown-trigger {
-  border: 1px solid $red-500;
-}
-
-// text color
-.has-text-grey-light {
-  color: $ui-gray-300 !important;
-}
-
-.has-text-grey-400 {
-  color: $ui-gray-400;
-}
-
-.has-text-grey {
-  color: $ui-gray-500 !important;
-}
-
-.has-text-grey-dark {
-  color: $ui-gray-700 !important;
-}
-
-.has-text-white {
-  color: $white !important;
-}
-
-.has-text-black {
-  color: $black !important;
-}
-
-.has-text-info {
-  color: $blue-500 !important;
-}
-
-.has-text-success {
-  color: $green-500 !important;
-}
-
-.has-text-highlight {
-  color: $yellow-500;
-}
-
-.has-text-danger {
-  color: $red-500 !important;
-}
diff --git a/ui/app/styles/helper-classes/flexbox-and-grid.scss b/ui/app/styles/helper-classes/flexbox-and-grid.scss
deleted file mode 100644
index b2e3b560249b4..0000000000000
--- a/ui/app/styles/helper-classes/flexbox-and-grid.scss
+++ /dev/null
@@ -1,115 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-/* Helpers that define anything with the CSS flexbox or CSS grid. */
-
-/* Flexbox helpers */
-.is-flex {
-  display: flex !important;
-}
-
-.is-flex-column {
-  display: flex;
-  flex-direction: column;
-}
-
-.is-flex-row {
-  display: flex;
-  flex-direction: row;
-}
-
-// Alignment of the items
-.is-flex-v-centered {
-  display: flex;
-  align-items: center;
-  align-self: center;
-  justify-content: center;
-}
-
-.is-flex-center {
-  display: flex;
-  align-items: center;
-}
-
-.is-flex-align-baseline {
-  display: flex;
-  align-items: baseline;
-}
-
-// Justify-content
-.is-centered {
-  justify-content: center;
-}
-
-.is-flex-end {
-  display: flex !important;
-  justify-content: flex-end;
-}
-
-.is-flex-start {
-  display: flex !important;
-  justify-content: flex-start;
-
-  &.has-gap {
-    gap: $spacing-m;
-  }
-}
-
-.is-flex-between,
-.is-grouped-split {
-  display: flex;
-  justify-content: space-between !important;
-}
-
-// Flex basis, grow, stretch and flow
-.is-flex-full {
-  flex-basis: 100%;
-}
-
-.is-flex-1 {
-  flex-grow: 1;
-  &.basis-0 {
-    flex-basis: 0;
-  }
-}
-
-.is-no-flex-grow {
-  flex-grow: 0 !important;
-}
-
-.is-flex-wrap {
-  flex-flow: row wrap;
-}
-
-.is-flex-half {
-  flex: 50%;
-}
-
-/* Flex Responsive */
-@media screen and (min-width: 769px), print {
-  .is-flex-v-centered-tablet {
-    display: flex;
-    align-items: center;
-    align-self: center;
-    justify-content: center;
-  }
-}
-
-/* CSS GRID */
-.is-grid {
-  display: grid;
-}
-
-.is-grid-3-columns {
-  grid-template-columns: repeat(3, 1fr);
-}
-
-.is-medium-height {
-  height: 125px;
-}
-
-.is-grid-column-span-3 {
-  grid-column-end: span 3;
-}
diff --git a/ui/app/styles/helper-classes/general.scss b/ui/app/styles/helper-classes/general.scss
deleted file mode 100644
index ff77e6410d92b..0000000000000
--- a/ui/app/styles/helper-classes/general.scss
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-/* This helper includes styles relating to: box-shadow, border, transition, pointer, grouped css in one helper, and screen-reader only.*/
-
-// box-shadow helpers
-.has-only-top-shadow {
-  box-shadow: 0 -1px 0 -1px $grey-light, 0 -2px 0 -1px $grey-light;
-}
-
-.has-bottom-shadow {
-  box-shadow: $box-shadow !important;
-}
-
-.is-shadowless {
-  box-shadow: none !important;
-}
-
-.is-sideless {
-  box-shadow: 0 2px 0 -1px $grey-light, 0 -2px 0 -1px $grey-light;
-}
-
-// this helper needs to go after is-sideless as they are often used together and is-bottomless needs to override is-sideless (no this is not ideal).
-.is-bottomless {
-  box-shadow: 0 -1px 0 0 $grey-light;
-}
-
-// border helpers
-.has-default-border {
-  border: 1px solid $grey !important;
-}
-
-.is-borderless {
-  border: none !important;
-}
-
-// pointer helpers
-.has-no-pointer {
-  pointer-events: none;
-}
-
-.has-pointer {
-  cursor: pointer;
-}
-
-// other
-.has-background-transition {
-  transition: background-color ease-out $speed;
-}
-
-.has-current-color-fill {
-  &,
-  & svg {
-    fill: currentColor;
-  }
-}
-
-// large grouped css blocks
-.is-hint {
-  color: $grey;
-  font-size: $size-8;
-  padding: $size-8 0;
-}
-
-.is-optional {
-  color: $grey;
-  font-size: $size-8;
-  text-transform: lowercase;
-}
-
-.is-word-break {
-  overflow-wrap: break-word;
-  word-wrap: break-word;
-  word-break: break-word;
-  white-space: pre-wrap;
-}
-
-.truncate-second-line {
-  display: -webkit-box;
-  -webkit-line-clamp: 2;
-  -webkit-box-orient: vertical;
-  text-overflow: ellipsis;
-  overflow: hidden;
-}
-
-// screen reader only
-.sr-only {
-  border: 0;
-  clip-path: inset(50%);
-  clip: rect(0 0 0 0);
-  height: 1px;
-  margin: -1px;
-  overflow: hidden;
-  padding: 0px;
-  position: absolute;
-  white-space: nowrap;
-  width: 1px;
-}
diff --git a/ui/app/styles/helper-classes/layout.scss b/ui/app/styles/helper-classes/layout.scss
deleted file mode 100644
index 1011ed05768d3..0000000000000
--- a/ui/app/styles/helper-classes/layout.scss
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-/* This helper includes styles relating to: display, width, height, float, visibility, position, alignment. */
-
-// display
-.is-block {
-  display: block !important;
-}
-
-.is-hidden {
-  display: none !important;
-}
-
-.is-inline {
-  display: inline !important;
-}
-
-.is-inline-block {
-  display: inline-block !important;
-}
-
-// position
-.is-in-bottom-right {
-  position: absolute;
-  bottom: 1rem;
-  right: 1rem;
-  z-index: 10;
-}
-
-.is-relative {
-  position: relative;
-}
-
-// visibility
-.is-invisible {
-  visibility: hidden;
-}
-
-// width and height
-.is-fullwidth {
-  width: 100%;
-}
-
-.is-auto-width {
-  width: auto;
-}
-
-.is-min-width-0 {
-  min-width: 0;
-}
-
-.is-medium-height {
-  height: 125px;
-}
-
-// float
-.is-pulled-left {
-  float: left !important;
-}
-
-.is-pulled-right {
-  float: right !important;
-}
-
-// alignment
-.is-v-centered {
-  vertical-align: middle;
-}
-
-// responsive css
-@media screen and (min-width: 769px), print {
-  .is-hidden-tablet {
-    display: none !important;
-  }
-}
-
-@media screen and (max-width: 768px) {
-  .is-hidden-mobile {
-    display: none !important;
-  }
-}
-
-@media screen and (max-width: 1215px) {
-  .is-widescreen:not(.is-max-desktop) {
-    max-width: 1152px;
-  }
-}
diff --git a/ui/app/styles/helper-classes/spacing.scss b/ui/app/styles/helper-classes/spacing.scss
deleted file mode 100644
index 5f8c50087c376..0000000000000
--- a/ui/app/styles/helper-classes/spacing.scss
+++ /dev/null
@@ -1,169 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-/* Helpers that define anything with the margin or padding. */
-
-/* Notes
-- these helpers are generally defined in px but some (if they use $size-xx) are using rems.
-*/
-
-.is-paddingless {
-  padding: 0 !important;
-}
-
-.has-short-padding {
-  padding: $size-11 $size-5;
-}
-
-.has-tall-padding {
-  padding: $size-2;
-}
-
-.has-side-padding-s {
-  padding-left: $spacing-s;
-  padding-right: $spacing-s;
-}
-
-.has-padding-m {
-  padding: $spacing-m;
-}
-
-.has-bottom-padding-s {
-  padding-bottom: $spacing-s;
-}
-
-.has-bottom-padding-l {
-  padding-bottom: $spacing-l;
-}
-
-.has-top-padding-s {
-  padding-top: $spacing-s;
-}
-
-.has-top-padding-m {
-  padding-top: $spacing-m;
-}
-
-.has-top-padding-l {
-  padding-top: $spacing-l;
-}
-
-.has-left-padding-xs {
-  padding-left: $spacing-xs;
-}
-
-.has-left-padding-s {
-  padding-left: $spacing-s;
-}
-
-.has-left-padding-l {
-  padding-left: $spacing-l;
-}
-
-.has-top-padding-xxl {
-  padding-top: $spacing-xxl;
-}
-
-// All Margin helpers
-.is-marginless {
-  margin: 0 !important;
-}
-
-.has-top-bottom-margin {
-  margin: $size-5 0rem;
-}
-
-.has-top-bottom-margin-xxs {
-  margin: $spacing-xxs 0;
-}
-
-.has-top-bottom-margin-negative-m {
-  margin-top: -$spacing-m;
-  margin-bottom: -$spacing-m;
-}
-
-.has-bottom-margin-xs {
-  margin-bottom: $spacing-xs !important;
-}
-
-.has-bottom-margin-s {
-  margin-bottom: $spacing-s;
-}
-
-.has-bottom-margin-m {
-  margin-bottom: $spacing-m;
-}
-
-.has-bottom-margin-l {
-  margin-bottom: $spacing-l;
-}
-
-.has-bottom-margin-xl {
-  margin-bottom: $spacing-xl;
-}
-
-.has-bottom-margin-xxl {
-  margin-bottom: $spacing-xxl;
-}
-
-.has-top-margin-s {
-  margin-top: $spacing-s;
-}
-
-.has-top-margin-xs {
-  margin-top: $spacing-xs;
-}
-
-.has-top-margin-m {
-  margin-top: $spacing-m;
-}
-
-.has-top-margin-l {
-  margin-top: $spacing-l;
-}
-
-.has-top-margin-xl {
-  margin-top: $spacing-xl;
-}
-
-.has-top-margin-xxl {
-  margin-top: $spacing-xxl;
-}
-
-.has-top-margin-negative-s {
-  margin-top: (-1 * $spacing-s);
-}
-
-.has-left-margin-xxs {
-  margin-left: $spacing-xxs;
-}
-
-.has-left-margin-xs {
-  margin-left: $spacing-xs;
-}
-
-.has-left-margin-s {
-  margin-left: $spacing-s;
-}
-
-.has-left-margin-m {
-  margin-left: $spacing-m;
-}
-
-.has-left-margin-l {
-  margin-left: $spacing-l;
-}
-
-.has-left-margin-xl {
-  margin-left: $spacing-xl;
-}
-
-.has-right-margin-m {
-  margin-right: $spacing-m;
-}
-
-.has-right-margin-l {
-  margin-right: $spacing-l;
-}
diff --git a/ui/app/styles/helper-classes/typography.scss b/ui/app/styles/helper-classes/typography.scss
deleted file mode 100644
index af862435ad77d..0000000000000
--- a/ui/app/styles/helper-classes/typography.scss
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-/* This helper includes styles relating to: font-size, font-family, font-alignment, text-transform, text-weight, font-style, text-decoration. */
-
-// font size helpers
-.is-size-4 {
-  font-size: $size-4 !important;
-}
-
-.is-size-5 {
-  font-size: $size-5 !important;
-}
-
-.is-size-6 {
-  font-size: $size-6 !important;
-}
-
-.is-size-7 {
-  font-size: $size-7 !important;
-}
-
-.is-size-8 {
-  font-size: $size-8 !important;
-}
-
-.is-size-9 {
-  font-size: $size-9 !important;
-}
-
-// Font weight
-.has-font-weight-normal {
-  font-weight: $font-weight-normal;
-}
-
-.has-text-weight-semibold {
-  font-weight: $font-weight-semibold !important;
-}
-
-.has-text-weight-bold {
-  font-weight: $font-weight-bold !important;
-}
-
-// Font family
-.is-font-mono {
-  font-family: $family-monospace;
-}
-
-.masked-font {
-  font-family: obscure, text-security-square;
-  letter-spacing: 2px;
-}
-
-// Text decoration
-.is-underline {
-  text-decoration: underline;
-}
-.is-no-underline {
-  text-decoration: none;
-}
-
-// Text transformations
-.is-lowercase {
-  text-transform: lowercase !important;
-}
-
-.is-uppercase {
-  text-transform: uppercase !important;
-}
-
-// Text alignment
-.has-text-right {
-  text-align: right !important;
-}
-
-.has-text-centered {
-  text-align: center !important;
-}
-
-.has-line-height-1 {
-  line-height: 1;
-}
-
-// Text color or styling
-.is-help {
-  font-size: $size-8;
-  margin-top: $size-11;
-}
-
-.help {
-  display: block;
-  font-size: 0.85714rem;
-  margin-top: $size-11;
-}
-
-.sub-text {
-  color: $grey;
-  margin-bottom: $size-11;
-  font-size: $size-8;
-
-  strong {
-    color: inherit;
-  }
-}
diff --git a/ui/app/styles/reset.scss b/ui/app/styles/reset.scss
deleted file mode 100644
index 90a4e2a7c0f31..0000000000000
--- a/ui/app/styles/reset.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-// reset for HDS
-*,
-*::before,
-*::after {
-  box-sizing: border-box;
-}
diff --git a/ui/app/styles/utils/_box-shadow_variables.scss b/ui/app/styles/utils/_box-shadow_variables.scss
deleted file mode 100644
index 55eb3f756d896..0000000000000
--- a/ui/app/styles/utils/_box-shadow_variables.scss
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-// TODO: lots of inconsistent variation on box-shadow usage. Fix.
-
-// box
-$box-shadow: 0 0 0 1px rgba($black, 0.1);
-$box-shadow-low: 0 5px 1px -2px rgba($black, 0.12), 0 3px 2px -1px rgba($black, 0);
-$box-shadow-middle: 0 8px 4px -4px rgba($black, 0.1), 0 6px 8px -2px rgba($black, 0.05);
-$box-shadow-high: 0 12px 5px -7px rgba($black, 0.08), 0 11px 10px -3px rgba($black, 0.1);
-$box-shadow-highest: 0 16px 6px -10px rgba($black, 0.06), 0 16px 16px -4px rgba($black, 0.2);
-
-// box-link
-$box-link-shadow: 0 0 0 1px $ui-gray-200;
-$box-link-hover-shadow: 0 0 0 1px $ui-gray-300;
-
-// border
-$base-border: 1px solid $ui-gray-300;
-$light-border: 1px solid $ui-gray-200;
-
-// button specific
-$button-box-shadow-standard: 0 3px 1px 0 rgba($black, 0.12);
diff --git a/ui/app/styles/utils/_bulma_variables.scss b/ui/app/styles/utils/_bulma_variables.scss
new file mode 100644
index 0000000000000..930c645739289
--- /dev/null
+++ b/ui/app/styles/utils/_bulma_variables.scss
@@ -0,0 +1,93 @@
+// Color overrides
+$light: $grey-lightest;
+$primary: $grey-dark;
+$link: $blue;
+$text: $grey-darkest;
+$info: $blue;
+$success: $green;
+$warning: $yellow;
+$danger: $red;
+$black-bis: $ui-gray-900;
+$black-ter: $ui-gray-700;
+$grey-darker: $ui-gray-900;
+$grey-lighter: $ui-gray-050;
+$white-ter: rgba($white, 0.5);
+$white-bis: $ui-gray-050;
+$code: $grey-dark;
+$code-background: transparent;
+$border: $grey-light;
+
+$hr-margin: 1rem 0;
+
+$mobile: 769px;
+$header-height: 4rem;
+
+//typography
+$family-sans: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu',
+  'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif;
+$family-monospace: 'SFMono-Regular', Consolas, 'Liberation Mono', Menlo, Courier, monospace;
+$family-primary: $family-sans;
+$body-size: 14px;
+$size-3: (24/14) + 0rem; // ~1.714rem ~27px
+$size-4: 1.5rem; // 24px
+$size-5: 1.25rem; // 20px
+$size-7: (13/14) + 0rem; // ~.929rem ~15px
+$size-8: (12/14) + 0rem; // ~.857rem  ~13.7px
+$size-9: 0.75rem; // 12px
+$size-10: 0.5rem; // 8px
+$size-11: 0.25rem; // 4px
+$console-spacing: 1.5rem; // 24px
+$size-small: $size-8;
+$font-weight-normal: 400;
+$font-weight-semibold: 600;
+$font-weight-bold: 700;
+
+//input
+$input-background-color: $white;
+$input-focus-background-color: $white;
+$input-border-color: $grey;
+
+$radius: 2px;
+$radius-large: 4px;
+
+//box
+$box-radius: 0;
+$box-shadow: 0 0 0 1px rgba($black, 0.1);
+$box-shadow-low: 0 5px 1px -2px rgba($black, 0.12), 0 3px 2px -1px rgba($black, 0);
+$box-shadow-middle: 0 8px 4px -4px rgba($black, 0.1), 0 6px 8px -2px rgba($black, 0.05);
+$box-shadow-high: 0 12px 5px -7px rgba($black, 0.08), 0 11px 10px -3px rgba($black, 0.1);
+$box-shadow-highest: 0 16px 6px -10px rgba($black, 0.06), 0 16px 16px -4px rgba($black, 0.2);
+
+$breadcrumb-item-color: $blue;
+$breadcrumb-item-separator-color: rgba($blue, 0.5);
+$breadcrumb-item-active-color: $black;
+
+$navbar-background-color: transparent;
+
+$menu-item-hover-background-color: $blue;
+$menu-item-hover-color: $white;
+
+$progress-bar-background-color: $ui-gray-050;
+
+$base-border: 1px solid $ui-gray-300;
+$light-border: 1px solid $ui-gray-200;
+
+//menu
+$menu-item-hover-color: $text;
+$menu-item-hover-background-color: $grey-lightest;
+$menu-item-active-color: $link;
+$menu-item-active-background-color: transparent;
+
+$box-link-shadow: 0 0 0 1px $ui-gray-200;
+$box-link-hover-shadow: 0 0 0 1px $grey-light;
+
+// Nav
+$drawer-width: 300px;
+
+// animations
+$speed: 150ms;
+$speed-slow: $speed * 2;
+
+// Wizard
+$wizard-progress-bar-height: 6px;
+$wizard-progress-check-size: 16px;
diff --git a/ui/app/styles/utils/_color_variables.scss b/ui/app/styles/utils/_color_variables.scss
deleted file mode 100644
index c3c2676edd7ec..0000000000000
--- a/ui/app/styles/utils/_color_variables.scss
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-// UI Gray
-$ui-gray-010: #fbfbfc;
-$ui-gray-050: #f7f8fa;
-$ui-gray-100: #ebeef2;
-$ui-gray-200: #dce0e6;
-$ui-gray-300: #bac1cc;
-$ui-gray-400: #8e96a3;
-$ui-gray-500: #6f7682;
-$ui-gray-600: #626873;
-$ui-gray-700: #525761;
-$ui-gray-800: #373a42;
-$ui-gray-900: #1f2124;
-$grey-lightest: $ui-gray-050;
-$grey-light: $ui-gray-300;
-$grey: $ui-gray-500;
-$grey-dark: $ui-gray-700;
-$grey-darkest: $ui-gray-900;
-
-// Black
-$black: hsl(0, 0%, 4%); // in hex: #0a0a0a
-
-// White
-$white: hsl(0, 0%, 100%);
-
-// Blue
-$blue-010: #fbfcff;
-$blue-050: #f0f5ff;
-$blue-100: #bfd4ff;
-$blue-300: #5b92ff;
-$blue-500: #1563ff;
-$blue-700: #0e40a3;
-$blue-900: #061b46;
-$blue-lightest: $blue-050;
-$blue-light: $blue-300;
-$blue: $blue-500;
-$blue-dark: $blue-700;
-$blue-darkest: $blue-900;
-
-// Red
-$red-010: #fdfafb;
-$red-050: #f9ecee;
-$red-100: #efc7cc;
-$red-300: #db7d88;
-$red-500: #c73445;
-$red-700: #7f222c;
-$red-900: #370f13;
-$red-lightest: $red-050;
-$red-light: $red-300;
-$red: $red-500;
-$red-dark: $red-700;
-$red-darkest: $red-900;
-
-// Green
-$green-010: #fafdfa;
-$green-050: #ecf7ed;
-$green-100: #c6e9c9;
-$green-300: #7acc81;
-$green-500: #2eb039;
-$green-700: #1e7125;
-$green-900: #0d3010;
-$green-lightest: $green-050;
-$green-light: $green-300;
-$green: $green-500;
-$green-dark: $green-700;
-$green-darkest: $green-900;
-
-// Orange
-$orange-010: #fffcfa;
-$orange-050: #fef4ec;
-$orange-100: #fde0c8;
-$orange-300: #fbb77f;
-$orange-500: #fa8f37;
-$orange-700: #a05c23;
-$orange-900: #45270f;
-$orange-lightest: $orange-050;
-$orange-light: $orange-300;
-$orange: $orange-500;
-$orange-dark: $orange-700;
-$orange-darkest: $orange-900;
-
-// Yellow
-$yellow-010: #fffdf6;
-$yellow-050: #fffbed;
-$yellow-100: #fdeeba;
-$yellow-300: #fbd95e;
-$yellow-500: #fac402;
-$yellow-700: #a07d02;
-$yellow-900: #453601;
-$yellow-lightest: $yellow-050;
-$yellow-light: $yellow-300;
-$yellow: $yellow-500;
-$yellow-dark: $yellow-700;
-$yellow-darkest: $yellow-900;
diff --git a/ui/app/styles/utils/_colors.scss b/ui/app/styles/utils/_colors.scss
new file mode 100644
index 0000000000000..49c3ae66b7c37
--- /dev/null
+++ b/ui/app/styles/utils/_colors.scss
@@ -0,0 +1,104 @@
+// Colors that will eventually be in Structure package
+
+// Vault Gray
+$vault-gray-010: #fdfdfe;
+$vault-gray-050: #f7fafc;
+$vault-gray-100: #ebeef5;
+$vault-gray-200: #d3dbe6;
+$vault-gray-300: #b4bdcc;
+$vault-gray-400: #949fb0;
+$vault-gray-500: #7c8797;
+$vault-gray-600: #5a6370;
+$vault-gray-700: #3c434d;
+$vault-gray-800: #1d2126;
+$vault-gray-900: #060708;
+$vault-gray: $vault-gray-500;
+$vault-gray-dark: $vault-gray-700;
+
+// UI Gray
+$ui-gray-010: #fbfbfc;
+$ui-gray-050: #f7f8fa;
+$ui-gray-100: #ebeef2;
+$ui-gray-200: #dce0e6;
+$ui-gray-300: #bac1cc;
+$ui-gray-400: #8e96a3;
+$ui-gray-500: #6f7682;
+$ui-gray-600: #626873;
+$ui-gray-700: #525761;
+$ui-gray-800: #373a42;
+$ui-gray-900: #1f2124;
+$grey-lightest: $ui-gray-050;
+$grey-light: $ui-gray-300;
+$grey: $ui-gray-500;
+$grey-dark: $ui-gray-700;
+$grey-darkest: $ui-gray-900;
+
+// Blue
+$blue-010: #fbfcff;
+$blue-050: #f0f5ff;
+$blue-100: #bfd4ff;
+$blue-300: #5b92ff;
+$blue-500: #1563ff;
+$blue-700: #0e40a3;
+$blue-900: #061b46;
+$blue-lightest: $blue-050;
+$blue-light: $blue-300;
+$blue: $blue-500;
+$blue-dark: $blue-700;
+$blue-darkest: $blue-900;
+
+// Red
+$red-010: #fdfafb;
+$red-050: #f9ecee;
+$red-100: #efc7cc;
+$red-300: #db7d88;
+$red-500: #c73445;
+$red-700: #7f222c;
+$red-900: #370f13;
+$red-lightest: $red-050;
+$red-light: $red-300;
+$red: $red-500;
+$red-dark: $red-700;
+$red-darkest: $red-900;
+
+// Green
+$green-010: #fafdfa;
+$green-050: #ecf7ed;
+$green-100: #c6e9c9;
+$green-300: #7acc81;
+$green-500: #2eb039;
+$green-700: #1e7125;
+$green-900: #0d3010;
+$green-lightest: $green-050;
+$green-light: $green-300;
+$green: $green-500;
+$green-dark: $green-700;
+$green-darkest: $green-900;
+
+// Orange
+$orange-010: #fffcfa;
+$orange-050: #fef4ec;
+$orange-100: #fde0c8;
+$orange-300: #fbb77f;
+$orange-500: #fa8f37;
+$orange-700: #a05c23;
+$orange-900: #45270f;
+$orange-lightest: $orange-050;
+$orange-light: $orange-300;
+$orange: $orange-500;
+$orange-dark: $orange-700;
+$orange-darkest: $orange-900;
+
+// Yellow
+$yellow-010: #fffdf6;
+$yellow-050: #fffbed;
+$yellow-100: #fdeeba;
+$yellow-300: #fbd95e;
+$yellow-500: #fac402;
+$yellow-700: #a07d02;
+$yellow-900: #453601;
+$yellow-lightest: $yellow-050;
+$yellow-light: $yellow-300;
+$yellow: $yellow-500;
+$yellow-dark: $yellow-700;
+$yellow-darkest: $yellow-900;
diff --git a/ui/app/styles/utils/_font_variables.scss b/ui/app/styles/utils/_font_variables.scss
deleted file mode 100644
index 287b3e8dac9e6..0000000000000
--- a/ui/app/styles/utils/_font_variables.scss
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-// Vars relating to font-family or font-weight.
-
-$family-sans: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu',
-  'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif;
-
-$family-monospace: 'SFMono-Regular', Consolas, 'Liberation Mono', Menlo, Courier, monospace;
-
-/* Font weight */
-$font-weight-normal: 400;
-$font-weight-semibold: 600;
-$font-weight-bold: 700;
diff --git a/ui/app/styles/utils/_size_variables.scss b/ui/app/styles/utils/_size_variables.scss
deleted file mode 100644
index 3a59e78fdfcfd..0000000000000
--- a/ui/app/styles/utils/_size_variables.scss
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-/* General sizing in rem values used largely for text sizing.*/
-$size-1: 3rem; // 48px, same as $spacing-xxl
-$size-2: 2.5rem; // 40px
-$size-3: calc(24 / 14) + 0rem; // ~1.714rem ~27px
-$size-4: 1.5rem; // 24px same as $spacing-l
-$size-5: 1.25rem; // 20px
-$size-6: 1rem; // 16px same as $spacing-m
-$size-7: calc(13 / 14) + 0rem; // ~.929rem ~15px
-$size-8: calc(12 / 14) + 0rem; // ~.857rem  ~13.7px
-$size-9: 0.75rem; // 12px same as $spacing-s
-$size-10: 0.5rem; // 8px same as $spacing-xs
-$size-11: 0.25rem; // 4px same as spacing-xxs
-
-/* Spacing vars in px */
-$spacing-xxs: 4px;
-$spacing-xs: 8px;
-$spacing-s: 12px;
-$spacing-m: 16px;
-$spacing-l: 24px;
-$spacing-xl: 36px;
-$spacing-xxl: 48px;
-
-/* Border radius */
-$radius: 2px;
-$radius-large: 4px;
-
-/* Responsiveness */
-// 960, 1152, and 1344 have been chosen because they are divisible by both 12 and 16
-$mobile: 769px;
-// 960px container + 4rem
-$desktop: 960px + (2 * 32px);
-
-/* Animations and transitions */
-$speed: 150ms;
-$speed-slow: $speed * 2;
-$easing: ease-out;
-
-/* Nav */
-$drawer-width: 300px;
-
-// Wizard
-// Not being used: https://github.com/hashicorp/vault/pull/19220
-// $wizard-progress-bar-height: 6px;
-// $wizard-progress-check-size: 16px;
diff --git a/ui/app/styles/utils/_spacing.scss b/ui/app/styles/utils/_spacing.scss
new file mode 100644
index 0000000000000..029266d9c6e5e
--- /dev/null
+++ b/ui/app/styles/utils/_spacing.scss
@@ -0,0 +1,9 @@
+// Spacing that will eventually be in Structure package
+
+$spacing-xxs: 4px;
+$spacing-xs: 8px;
+$spacing-s: 12px;
+$spacing-m: 16px;
+$spacing-l: 24px;
+$spacing-xl: 36px;
+$spacing-xxl: 48px;
diff --git a/ui/app/styles/utils/animations.scss b/ui/app/styles/utils/animations.scss
index 40731346ce219..0020823b4584a 100644
--- a/ui/app/styles/utils/animations.scss
+++ b/ui/app/styles/utils/animations.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 @mixin keyframes($name) {
   @-webkit-keyframes #{$name} {
     @content;
diff --git a/ui/app/styles/utils/mixins.scss b/ui/app/styles/utils/mixins.scss
index c5fcef7a6a4da..212a011727bf6 100644
--- a/ui/app/styles/utils/mixins.scss
+++ b/ui/app/styles/utils/mixins.scss
@@ -1,10 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-// This file defines the following mixins: css-arrow, css-top-arrow, css-bottom-arrow, from, until, and vault-block
-
 @mixin css-arrow(
   $vertical-direction,
   $size,
@@ -70,20 +63,8 @@
   @include css-arrow('bottom', $size, $color, $border-width, $border-color, $left, $left-offset);
 }
 
-@mixin from($breakpoint) {
-  @media (min-width: $breakpoint) {
-    @content;
-  }
-}
-
-@mixin until($breakpoint) {
-  @media (max-width: $breakpoint) {
-    @content;
-  }
-}
-
 @mixin vault-block {
   &:not(:last-child) {
-    margin-bottom: calc(5 / 14) + 0rem;
+    margin-bottom: (5/14) + 0rem;
   }
 }
diff --git a/ui/app/templates/application.hbs b/ui/app/templates/application.hbs
index 26fb7cd455bdc..5ca395c18fd5a 100644
--- a/ui/app/templates/application.hbs
+++ b/ui/app/templates/application.hbs
@@ -1,5 +1,3 @@
-<Sidebar::Frame @showSidebar={{this.auth.isActiveSession}}>
-  <div class="page-container">
-    {{outlet}}
-  </div>
-</Sidebar::Frame>
\ No newline at end of file
+<div class="page-container">
+  {{outlet}}
+</div>
\ No newline at end of file
diff --git a/ui/app/templates/components/alert-popup.hbs b/ui/app/templates/components/alert-popup.hbs
new file mode 100644
index 0000000000000..c95751ff243fd
--- /dev/null
+++ b/ui/app/templates/components/alert-popup.hbs
@@ -0,0 +1,18 @@
+<div class="message {{this.type.class}}">
+  <div class="columns is-mobile is-variable is-1">
+    <div class="column is-narrow message-icon">
+      <Icon aria-hidden="true" @name={{this.type.glyph}} />
+    </div>
+    <div class="column">
+      <button type="button" class="close-button" {{on "click" this.close}}>
+        <Icon @name="x" aria-label="Close" />
+      </button>
+      <div class="message-title">
+        {{this.type.text}}
+      </div>
+      {{#if this.message}}
+        <p class="message-body {{if @isPreformatted 'pre'}}" data-test-flash-message-body="true">{{this.message}}</p>
+      {{/if}}
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/ui/app/templates/components/auth-form-options.hbs b/ui/app/templates/components/auth-form-options.hbs
index d774470bd50a2..d77609a635dc6 100644
--- a/ui/app/templates/components/auth-form-options.hbs
+++ b/ui/app/templates/components/auth-form-options.hbs
@@ -1,6 +1,6 @@
 {{#unless this.selectedAuthIsPath}}
   <div class="box has-slim-padding is-shadowless">
-    <ToggleButton @isOpen={{this.isOpen}} @onClick={{fn (mut this.isOpen)}} data-test-auth-form-options-toggle />
+    <ToggleButton @isOpen={{this.isOpen}} @onClick={{fn (mut this.isOpen)}} />
     {{#if this.isOpen}}
       <div class="field">
         <label for="custom-path" class="is-label">
@@ -14,7 +14,6 @@
             class="input"
             value={{@customPath}}
             oninput={{action @onPathChange value="target.value"}}
-            data-test-auth-form-mount-path
           />
         </div>
         <AlertInline
diff --git a/ui/app/templates/components/auth-form.hbs b/ui/app/templates/components/auth-form.hbs
index 2753b1d57ad2e..2aa6ef5eecb87 100644
--- a/ui/app/templates/components/auth-form.hbs
+++ b/ui/app/templates/components/auth-form.hbs
@@ -19,7 +19,7 @@
                   "is-active"
                   ""
                 }}
-                data-test-auth-method={{method.id}}
+                data-test-auth-method
               >
                 <LinkTo
                   @route="vault.cluster.auth"
@@ -32,16 +32,18 @@
               </li>
             {{/let}}
           {{/each}}
-          <li class={{unless this.selectedAuthIsPath "is-active" ""}} data-test-auth-method>
-            <LinkTo
-              @route="vault.cluster.auth"
-              @model={{this.cluster.name}}
-              @query={{hash with="token"}}
-              data-test-auth-method-link="other"
-            >
-              Other
-            </LinkTo>
-          </li>
+          {{#if this.hasMethodsWithPath}}
+            <li class={{unless this.selectedAuthIsPath "is-active" ""}} data-test-auth-method>
+              <LinkTo
+                @route="vault.cluster.auth"
+                @model={{this.cluster.name}}
+                @query={{hash with="token"}}
+                data-test-auth-method-link="other"
+              >
+                Other
+              </LinkTo>
+            </li>
+          {{/if}}
         </ul>
       </nav>
     {{/if}}
@@ -88,7 +90,7 @@
           />
         </AuthJwt>
       {{else}}
-        <form id="auth-form" onsubmit={{action "doSubmit" null}}>
+        <form id="auth-form" onsubmit={{action "doSubmit"}}>
           {{#if (eq this.providerName "github")}}
             <div class="field">
               <label for="token" class="is-label">GitHub token</label>
diff --git a/ui/app/templates/components/auth-info.hbs b/ui/app/templates/components/auth-info.hbs
new file mode 100644
index 0000000000000..29cca1d20d330
--- /dev/null
+++ b/ui/app/templates/components/auth-info.hbs
@@ -0,0 +1,81 @@
+<Confirm as |c|>
+  <div class="popup-menu-content">
+    <div class="box">
+      <div class="menu-label">
+        {{this.auth.authData.displayName}}
+      </div>
+      <nav class="menu">
+        <ul class="menu-list">
+          {{#if this.auth.allowExpiration}}
+            <li class="action">
+              <AlertBanner
+                @type="warning"
+                @message="We've stopped auto-renewing your token due to inactivity.
+                It will expire in {{date-from-now this.auth.tokenExpirationDate interval=1000 hideSuffix=true}}.
+                On {{date-format this.auth.tokenExpirationDate 'MMMM do yyyy, h:mm:ss a'}}"
+              />
+            </li>
+          {{/if}}
+          {{#if this.hasEntityId}}
+            <li class="action">
+              <LinkTo @route="vault.cluster.mfa-setup" data-test-status-link="mfa">
+                Multi-factor authentication
+              </LinkTo>
+            </li>
+          {{/if}}
+          <li class="action">
+            <CopyButton
+              @clipboardText={{this.auth.currentToken}}
+              class="link"
+              @buttonType="button"
+              @success={{action (set-flash-message "Token copied!")}}
+            >
+              Copy token
+            </CopyButton>
+          </li>
+          {{#if (is-before (now interval=1000) this.auth.tokenExpirationDate)}}
+            {{#if this.auth.authData.renewable}}
+              <li class="action">
+                <button type="button" {{on "click" this.renewToken}} class="link button {{if this.isRenewing 'is-loading'}}">
+                  Renew token
+                </button>
+              </li>
+              <li class="action">
+                <c.Message
+                  @id={{get this.auth "authData.displayName"}}
+                  @title={{concat "Revoke " (get this.auth "authData.displayName") "?"}}
+                  @onConfirm={{action "revokeToken"}}
+                  @message="You will not be able to log in again with this token."
+                  @triggerText="Revoke token"
+                  @confirmButtonText="Revoke"
+                />
+              </li>
+            {{else}}
+              <li class="action text-right">
+                <c.Message
+                  @id={{get this.auth "authData.displayName"}}
+                  @title={{concat "Revoke " (get this.auth "authData.displayName") "?"}}
+                  @onConfirm={{action "revokeToken"}}
+                  @message="You will not be able to log in again with this token."
+                  @triggerText="Revoke token"
+                  @confirmButtonText="Revoke"
+                />
+              </li>
+            {{/if}}
+          {{/if}}
+          <li class="action">
+            <LinkTo
+              @route="vault.cluster.logout"
+              @model={{@activeClusterName}}
+              id="logout"
+              class="is-destroy"
+              {{on "click" @onLinkClick}}
+            >
+              Sign out
+            </LinkTo>
+          </li>
+        </ul>
+      </nav>
+    </div>
+  </div>
+</Confirm>
\ No newline at end of file
diff --git a/ui/app/templates/components/calendar-widget.hbs b/ui/app/templates/components/calendar-widget.hbs
index e28288996bd2f..a5fff1e6f499f 100644
--- a/ui/app/templates/components/calendar-widget.hbs
+++ b/ui/app/templates/components/calendar-widget.hbs
@@ -1,8 +1,12 @@
 <BasicDropdown @class="popup-menu" @horizontalPosition="auto-right" @verticalPosition="below" as |D|>
-  <D.Trigger data-test-calendar-widget-trigger class={{concat "toolbar-link" (if D.isOpen " is-active")}} @htmlTag="button">
-    {{date-format this.startDate "MMM yyyy"}}
+  <D.Trigger
+    data-test-popup-menu-trigger="true"
+    class={{concat "toolbar-link" (if D.isOpen " is-active")}}
+    @htmlTag="button"
+  >
+    {{@startTimeDisplay}}
     -
-    {{date-format this.endDate "MMM yyyy"}}
+    {{@endTimeDisplay}}
     <Chevron @direction="down" @isButton={{true}} />
   </D.Trigger>
   <D.Content @defaultClass={{concat "popup-menu-content calendar-content" (if this.showCalendar " calendar-open")}}>
@@ -11,24 +15,12 @@
         DATE OPTIONS
       </div>
       <ul class="menu-list">
-        <li class="action">
-          <button
-            data-test-current-month
-            class="link link-plain has-text-weight-semibold is-ghost"
-            type="button"
-            name="currentMonth"
-            {{on "click" (fn this.handleDateShortcut D.actions)}}
-          >
-            Current month
-          </button>
-        </li>
         <li class="action">
           <button
             data-test-current-billing-period
             class="link link-plain has-text-weight-semibold is-ghost"
             type="button"
-            name="reset"
-            {{on "click" (fn this.handleDateShortcut D.actions)}}
+            {{on "click" (fn this.selectCurrentBillingPeriod D)}}
           >
             Current billing period
           </button>
@@ -73,7 +65,7 @@
             {{this.displayYear}}
           </p>
           <button
-            data-test-next-year
+            data-test-future-year
             type="button"
             class={{concat "button is-transparent " (if (or this.tooltipTarget) "negative-margin" "padding-right")}}
             disabled={{this.disableFutureYear}}
@@ -101,15 +93,15 @@
           {{/if}}
         </div>
         <div class="calendar-widget-grid calendar-widget">
-          {{#each this.widgetMonths as |month|}}
+          {{#each this.widgetMonths as |m|}}
             <button
-              data-test-calendar-month={{month.name}}
+              data-test-calendar-month={{m.month}}
               type="button"
-              class="is-month-list {{if month.readonly 'is-readOnly'}}"
-              id={{month.index}}
-              {{on "click" (fn this.selectMonth month D.actions)}}
+              class="is-month-list {{if m.readonly 'is-readOnly'}} {{if (eq m.id this.selectedMonthId) 'is-selected-month'}}"
+              id={{m.id}}
+              {{on "click" (fn this.selectEndMonth m.id D)}}
             >
-              {{month.name}}
+              {{m.month}}
             </button>
           {{/each}}
         </div>
diff --git a/ui/app/templates/components/clients/attribution.hbs b/ui/app/templates/components/clients/attribution.hbs
index cf57aacd9d44d..a71ce44e1ad3d 100644
--- a/ui/app/templates/components/clients/attribution.hbs
+++ b/ui/app/templates/components/clients/attribution.hbs
@@ -1,6 +1,6 @@
-{{! only show side-by-side horizontal bar charts if data is from a single, historical month }}
+{{! show single horizontal bar chart unless data is from a single, historical month (isDateRange = false) }}
 <div
-  class={{concat "chart-wrapper" (if @isHistoricalMonth " dual-chart-grid" " single-chart-grid")}}
+  class={{concat "chart-wrapper" (if (or @isCurrentMonth @isDateRange) " single-chart-grid" " dual-chart-grid")}}
   data-test-clients-attribution
 >
   <div class="chart-header has-header-link has-bottom-margin-m">
@@ -21,32 +21,12 @@
       {{/if}}
     </div>
   </div>
-  {{#if this.barChartTotalClients}}
-    {{#if @isHistoricalMonth}}
-      <div class="chart-container-left" data-test-chart-container="new-clients">
-        <h2 class="chart-title">New clients</h2>
-        <p class="chart-description">{{this.chartText.newCopy}}</p>
-        <Clients::HorizontalBarChart
-          @dataset={{this.barChartNewClients}}
-          @chartLegend={{@chartLegend}}
-          @totalCounts={{@newUsageCounts}}
-          @noDataMessage="There are no new clients for this namespace during this time period."
-        />
-      </div>
 
-      <div class="chart-container-right" data-test-chart-container="total-clients">
-        <h2 class="chart-title">Total clients</h2>
-        <p class="chart-description">{{this.chartText.totalCopy}}</p>
-        <Clients::HorizontalBarChart
-          @dataset={{this.barChartTotalClients}}
-          @chartLegend={{@chartLegend}}
-          @totalCounts={{@totalUsageCounts}}
-        />
-      </div>
-    {{else}}
+  {{#if this.barChartTotalClients}}
+    {{#if (or @isDateRange @isCurrentMonth)}}
       <div
         class={{concat (unless this.barChartTotalClients "chart-empty-state ") "chart-container-wide"}}
-        data-test-chart-container="single-chart"
+        data-test-chart-container="total-clients"
       >
         <Clients::HorizontalBarChart
           @dataset={{this.barChartTotalClients}}
@@ -67,6 +47,27 @@
         <h3 class="data-details">Clients in {{this.attributionBreakdown}}</h3>
         <p class="data-details">{{format-number this.topClientCounts.clients}}</p>
       </div>
+    {{else}}
+      <div class="chart-container-left" data-test-chart-container="new-clients">
+        <h2 class="chart-title">New clients</h2>
+        <p class="chart-description">{{this.chartText.newCopy}}</p>
+        <Clients::HorizontalBarChart
+          @dataset={{this.barChartNewClients}}
+          @chartLegend={{@chartLegend}}
+          @totalCounts={{@newUsageCounts}}
+          @noDataMessage={{"There are no new clients for this namespace during this time period."}}
+        />
+      </div>
+
+      <div class="chart-container-right" data-test-chart-container="total-clients">
+        <h2 class="chart-title">Total clients</h2>
+        <p class="chart-description">{{this.chartText.totalCopy}}</p>
+        <Clients::HorizontalBarChart
+          @dataset={{this.barChartTotalClients}}
+          @chartLegend={{@chartLegend}}
+          @totalCounts={{@totalUsageCounts}}
+        />
+      </div>
     {{/if}}
     <div class="legend-center">
       <span class="light-dot"></span><span class="legend-label">{{capitalize @chartLegend.0.label}}</span>
@@ -78,13 +79,12 @@
     </div>
   {{/if}}
   <div class="timestamp" data-test-attribution-timestamp>
-    {{#if @responseTimestamp}}
+    {{#if @timestamp}}
       Updated
-      {{date-format @responseTimestamp "MMM d yyyy, h:mm:ss aaa" withTimeZone=true}}
+      {{date-format @timestamp "MMM d yyyy, h:mm:ss aaa"}}
     {{/if}}
   </div>
 </div>
-
 {{! MODAL FOR CSV DOWNLOAD }}
 <Modal
   @title="Export attribution data"
@@ -97,30 +97,17 @@
     <p class="has-bottom-margin-s">
       This export will include the namespace path, authentication method path, and the associated total, entity, and
       non-entity clients for the below
-      {{if this.formattedEndDate "date range" "month"}}.
+      {{if @isCurrentMonth "month" "date range"}}.
     </p>
-    <p class="has-bottom-margin-s is-subtitle-gray">SELECTED DATE {{if this.formattedEndDate " RANGE"}}</p>
-    <p class="has-bottom-margin-s">{{this.formattedStartDate}} {{if this.formattedEndDate "-"}} {{this.formattedEndDate}}</p>
+    <p class="has-bottom-margin-s is-subtitle-gray">SELECTED DATE {{if @endTimeDisplay " RANGE"}}</p>
+    <p class="has-bottom-margin-s">{{@startTimeDisplay}} {{if @endTimeDisplay "-"}} {{@endTimeDisplay}}</p>
   </section>
   <footer class="modal-card-foot modal-card-foot-outlined">
-    <button type="button" class="button is-primary" {{on "click" (fn this.exportChartData this.formattedCsvFileName)}}>
+    <button type="button" class="button is-primary" {{on "click" (fn this.exportChartData this.getCsvFileName)}}>
       Export
     </button>
     <button type="button" class="button is-secondary" onclick={{action (mut this.showCSVDownloadModal) false}}>
       Cancel
     </button>
-    {{#if @upgradeExplanation}}
-      <div class="has-text-grey is-size-8">
-        <AlertInline @type="warning" @isMarginless={{true}}>
-          Your data contains an upgrade.
-          <DocLink
-            @path="/vault/docs/concepts/client-count/faq#q-which-vault-version-reflects-the-most-accurate-client-counts"
-          >
-            Learn more here.
-          </DocLink>
-        </AlertInline>
-        <p class="has-left-padding-l">{{@upgradeExplanation}}</p>
-      </div>
-    {{/if}}
   </footer>
 </Modal>
\ No newline at end of file
diff --git a/ui/app/templates/components/clients/config.hbs b/ui/app/templates/components/clients/config.hbs
index f87f7659185e0..5bee8ae24bc5b 100644
--- a/ui/app/templates/components/clients/config.hbs
+++ b/ui/app/templates/components/clients/config.hbs
@@ -1,38 +1,80 @@
 {{#if (eq @mode "edit")}}
-  <form onsubmit={{action "onSaveChanges"}} data-test-clients-config-form>
+  <form onsubmit={{action "onSaveChanges"}} data-test-pricing-metrics-config-form>
     <div class="box is-sideless is-fullwidth is-marginless">
       <MessageError @model={{@model}} @errorMessage={{this.error}} />
-      {{#each @model.formFields as |attr|}}
-        {{#if (eq attr.name "enabled")}}
+      {{#each @model.configAttrs as |attr|}}
+        {{#if (and (eq attr.type "string") (eq attr.options.editType "boolean"))}}
           <label class="is-label">Usage data collection</label>
-          <p class="sub-text">
-            Enable or disable client tracking. Keep in mind that disabling tracking will delete the data for the current
-            month.
-          </p>
+          {{#if attr.options.helpText}}
+            <p class="sub-text">
+              {{attr.options.helpText}}
+              {{#if attr.options.docLink}}
+                <DocLink @path={{attr.options.docLink}}>
+                  See our documentation
+                </DocLink>
+                for help.
+              {{/if}}
+            </p>
+          {{/if}}
           <div class="control is-flex has-bottom-margin-l">
             <input
-              data-test-input="enabled"
+              data-test-field
               type="checkbox"
-              id="enabled"
-              name="enabled"
+              id={{attr.name}}
+              name={{attr.name}}
               class="switch is-rounded is-success is-small"
-              disabled={{@model.reportingEnabled}}
-              checked={{eq @model.enabled "On"}}
-              {{on "change" this.toggleEnabled}}
+              checked={{eq (get @model attr.name) attr.options.trueValue}}
+              onchange={{action (action "updateBooleanValue" attr) value="target.checked"}}
             />
-            <label for="enabled">
-              Data collection is
-              {{lowercase @model.enabled}}
+            <label for={{attr.name}}>
+              {{#if (eq @model.enabled "Off")}}
+                Data collection is off
+              {{else}}
+                Data collection is on
+              {{/if}}
             </label>
           </div>
-        {{else}}
-          <FormField @attr={{attr}} @model={{@model}} @modelValidations={{this.validations}} />
+        {{else if (eq attr.type "number")}}
+          <div class="has-top-margin-s">
+            <label for={{attr.name}} class="is-label">
+              {{attr.options.label}}
+            </label>
+            {{#if attr.options.subText}}
+              <p class="sub-text">
+                {{attr.options.subText}}
+                {{#if attr.options.docLink}}
+                  <DocLink @path={{attr.options.docLink}}>
+                    See our documentation
+                  </DocLink>
+                  for help.
+                {{/if}}
+              </p>
+            {{/if}}
+            <div class="control">
+              <input
+                data-test-field
+                id={{attr.name}}
+                disabled={{eq @model.enabled "Off"}}
+                autocomplete="off"
+                spellcheck="false"
+                onchange={{action (mut (get @model attr.name)) value="target.value"}}
+                value={{or (get @model attr.name) attr.options.defaultValue}}
+                class="input"
+                maxLength={{attr.options.characterLimit}}
+              />
+            </div>
+          </div>
         {{/if}}
       {{/each}}
     </div>
     <div class="field is-grouped-split box is-fullwidth is-bottomless">
       <div class="control">
-        <button type="submit" disabled={{this.buttonDisabled}} class="button is-primary" data-test-clients-config-save>
+        <button
+          type="submit"
+          disabled={{this.buttonDisabled}}
+          class="button is-primary"
+          data-test-edit-metrics-config-save={{true}}
+        >
           Save
         </button>
         <LinkTo @route="vault.cluster.clients.config" class="button">
@@ -41,7 +83,6 @@
       </div>
     </div>
   </form>
-
   <Modal
     @title={{this.modalTitle}}
     @onClose={{action (mut this.modalOpen) false}}
@@ -51,13 +92,13 @@
   >
     <section class="modal-card-body">
       {{#if (eq @model.enabled "On")}}
-        <p class="has-bottom-margin-s" data-test-clients-config-modal="on">
+        <p class="has-bottom-margin-s">
           Vault will start tracking data starting from today’s date,
-          {{date-format (now) "MMMM d, yyyy"}}. If you’ve previously enabled usage tracking, that historical data will still
-          be available to you.
+          {{date-format (now) "d MMMM yyyy"}}. You will not be able to see or query usage until the end of the month.
         </p>
+        <p>If you’ve previously enabled usage tracking, that historical data will still be available to you.</p>
       {{else}}
-        <p class="has-bottom-margin-s" data-test-clients-config-modal="off">
+        <p class="has-bottom-margin-s">
           Turning usage tracking off means that all data for the current month will be deleted. You will still be able to
           query previous months.
         </p>
@@ -65,26 +106,24 @@
       {{/if}}
     </section>
     <footer class="modal-card-foot modal-card-foot-outlined">
-      <button
-        type="button"
-        class="button is-primary"
-        data-test-clients-config-modal="continue"
-        {{on "click" (perform this.save)}}
-      >
-        Continue
-      </button>
       <button
         type="button"
         class="button is-secondary"
-        {{on "click" (fn (mut this.modalOpen) false)}}
-        data-test-clients-config-modal="cancel"
+        onclick={{action (mut this.modalOpen) false}}
+        data-test-metrics-config-cancel
       >
         Cancel
       </button>
+      <button type="button" class="button is-primary" onclick={{perform this.save}}>
+        Continue
+      </button>
     </footer>
   </Modal>
 {{else}}
-  <div class="tabs-container box is-bottomless is-marginless is-fullwidth is-paddingless" data-test-clients-config-table>
+  <div
+    class="tabs-container box is-bottomless is-marginless is-fullwidth is-paddingless"
+    data-test-pricing-metrics-config-table
+  >
     {{#each this.infoRows as |item|}}
       <InfoTableRow @label={{item.label}} @helperText={{item.helperText}} @value={{get @model item.valueKey}} />
     {{/each}}
diff --git a/ui/app/templates/components/clients/current.hbs b/ui/app/templates/components/clients/current.hbs
new file mode 100644
index 0000000000000..6397216483fe1
--- /dev/null
+++ b/ui/app/templates/components/clients/current.hbs
@@ -0,0 +1,86 @@
+<div class="box is-sideless is-fullwidth is-marginless is-bottomless">
+  <p class="has-bottom-margin-s">
+    The below data is for the current month starting from the first day. For historical data, see the history tab.
+  </p>
+  {{#if (eq @model.config.enabled "Off")}}
+    <EmptyState
+      @title="Tracking is disabled"
+      @message="Tracking is disabled and data is not being collected. To turn it on edit the configuration."
+    >
+      {{#if @model.config.configPath.canUpdate}}
+        <LinkTo @route="vault.cluster.clients.config">
+          Go to configuration
+        </LinkTo>
+      {{/if}}
+    </EmptyState>
+  {{else if this.isGatheringData}}
+    <EmptyState
+      @title="No data received"
+      @message="Tracking is turned on and Vault is gathering data. It should appear here within 30 minutes."
+    />
+  {{else if (eq @model.monthly.id "no-data")}}
+    <EmptyState
+      @title="No data available"
+      @message="Tracking may be turned off. Check with your administrator or check back later."
+    />
+  {{else}}
+    <div class="is-subtitle-gray has-bottom-margin-m">
+      FILTERS
+      <Toolbar>
+        <ToolbarFilters data-test-clients-filter-bar>
+          <SearchSelect
+            @id="namespace-search-select-monthly"
+            @options={{this.namespaceArray}}
+            @selectLimit="1"
+            @disallowNewItems={{true}}
+            @fallbackComponent="input-search"
+            @onChange={{this.selectNamespace}}
+            @placeholder={{"Filter by namespace"}}
+            @displayInherit={{true}}
+            class="is-marginless"
+          />
+          {{#if (not (is-empty this.authMethodOptions))}}
+            <SearchSelect
+              @id="auth-method-search-select"
+              @options={{this.authMethodOptions}}
+              @selectLimit="1"
+              @disallowNewItems={{true}}
+              @fallbackComponent="input-search"
+              @onChange={{this.setAuthMethod}}
+              @placeholder={{"Filter by auth method"}}
+              @displayInherit={{true}}
+            />
+          {{/if}}
+        </ToolbarFilters>
+      </Toolbar>
+    </div>
+    {{#if this.upgradeDuringCurrentMonth}}
+      <AlertBanner @type="warning" @title="Warning">
+        {{this.upgradeVersionAndDate}}
+        {{this.versionSpecificText}}
+        <DocLink @path="/docs/concepts/client-count/faq#q-which-vault-version-reflects-the-most-accurate-client-counts">
+          Learn more here.
+        </DocLink>
+      </AlertBanner>
+    {{/if}}
+    {{#if this.totalUsageCounts}}
+      <Clients::UsageStats
+        @title={{date-format this.responseTimestamp "MMMM"}}
+        @totalUsageCounts={{this.totalUsageCounts}}
+      />
+      {{#if this.hasAttributionData}}
+        <Clients::Attribution
+          @chartLegend={{this.chartLegend}}
+          @totalUsageCounts={{this.totalUsageCounts}}
+          @newUsageCounts={{this.newUsageCounts}}
+          @totalClientAttribution={{this.totalClientAttribution}}
+          @selectedNamespace={{this.selectedNamespace}}
+          @startTimeDisplay={{date-format this.responseTimestamp "MMMM yyyy"}}
+          @isCurrentMonth={{true}}
+          @isDateRange={{false}}
+          @timestamp={{this.responseTimestamp}}
+        />
+      {{/if}}
+    {{/if}}
+  {{/if}}
+</div>
\ No newline at end of file
diff --git a/ui/app/templates/components/clients/dashboard.hbs b/ui/app/templates/components/clients/dashboard.hbs
deleted file mode 100644
index 01642cef20dff..0000000000000
--- a/ui/app/templates/components/clients/dashboard.hbs
+++ /dev/null
@@ -1,208 +0,0 @@
-<div class="box is-sideless is-fullwidth is-marginless is-bottomless">
-  <p class="has-bottom-margin-xl">
-    This dashboard will surface Vault client usage over time. Clients represent a user or service that has authenticated to
-    Vault. Documentation is available
-    <DocLink @path="/vault/docs/concepts/client-count">here.</DocLink>
-    Date queries are sent in UTC.
-  </p>
-  <h2 class="title is-6 has-bottom-margin-xs">
-    {{this.versionText.label}}
-  </h2>
-  <div data-test-start-date-editor class="is-flex-align-baseline">
-    {{#if this.formattedStartDate}}
-      <p class="is-size-6" data-test-date-display>{{this.formattedStartDate}}</p>
-      <button type="button" class="button is-link" {{on "click" (fn (mut this.showBillingStartModal) true)}}>
-        Edit
-      </button>
-    {{else}}
-      <DateDropdown @handleSubmit={{this.handleClientActivityQuery}} @dateType="startDate" @submitText="Save" />
-    {{/if}}
-  </div>
-  <p class="is-8 has-text-grey has-bottom-margin-xl">
-    {{this.versionText.description}}
-  </p>
-  {{#if this.noActivityData}}
-    {{#if (eq @model.config.enabled "On")}}
-      <EmptyState
-        @title="No data received  {{if this.dateRangeMessage this.dateRangeMessage}}"
-        @message="Tracking is turned on and Vault is gathering data. It should appear here within 30 minutes."
-      />
-    {{else}}
-      <EmptyState
-        @title="Data tracking is disabled"
-        @message="Tracking is disabled, and no data is being collected. To turn it on, edit the configuration."
-      >
-        {{#if @model.config.canEdit}}
-          <p>
-            <LinkTo @route="vault.cluster.clients.config">
-              Go to configuration
-            </LinkTo>
-          </p>
-        {{/if}}
-      </EmptyState>
-    {{/if}}
-  {{else if this.errorObject}}
-    <Clients::Error @error={{this.errorObject}} />
-  {{else}}
-    {{#if (eq @model.config.enabled "Off")}}
-      <AlertBanner data-test-tracking-disabled @type="warning" @title="Tracking is disabled">
-        Tracking is currently disabled and data is not being collected. Historical data can be searched, but you will need to
-        <LinkTo @route="vault.cluster.clients.edit">
-          edit the configuration
-        </LinkTo>
-        to enable tracking again.
-      </AlertBanner>
-    {{/if}}
-    {{#if (or this.totalUsageCounts this.hasAttributionData)}}
-      <div class="is-subtitle-gray has-bottom-margin-m">
-        FILTERS
-        <Toolbar data-test-clients-filter-bar>
-          <ToolbarFilters>
-            <CalendarWidget
-              @startTimestamp={{this.startMonthTimestamp}}
-              @endTimestamp={{this.endMonthTimestamp}}
-              @selectMonth={{this.handleClientActivityQuery}}
-            />
-            {{#if this.namespaceArray}}
-              <SearchSelect
-                @id="namespace-search-select"
-                @options={{this.namespaceArray}}
-                @selectLimit="1"
-                @disallowNewItems={{true}}
-                @fallbackComponent="input-search"
-                @onChange={{this.selectNamespace}}
-                @placeholder={{"Filter by namespace"}}
-                @displayInherit={{true}}
-                class="is-marginless"
-              />
-            {{/if}}
-            {{#if (not (is-empty this.authMethodOptions))}}
-              <SearchSelect
-                @id="auth-method-search-select"
-                @options={{this.authMethodOptions}}
-                @selectLimit="1"
-                @disallowNewItems={{true}}
-                @fallbackComponent="input-search"
-                @onChange={{this.setAuthMethod}}
-                @placeholder={{"Filter by auth method"}}
-                @displayInherit={{true}}
-              />
-            {{/if}}
-          </ToolbarFilters>
-        </Toolbar>
-      </div>
-
-      {{#if (or this.upgradeDuringActivity this.startTimeDiscrepancy)}}
-        <AlertBanner @type="warning" @title="Warning">
-          <ul class={{if (and this.versionUpdateText this.startTimeDiscrepancy) "bullet"}}>
-            {{#if this.startTimeDiscrepancy}}
-              <li>{{this.startTimeDiscrepancy}}</li>
-            {{/if}}
-            {{#if this.upgradeDuringActivity}}
-              <li>
-                {{this.upgradeVersionAndDate}}
-                {{this.upgradeExplanation}}
-                <DocLink
-                  @path="/vault/docs/concepts/client-count/faq#q-which-vault-version-reflects-the-most-accurate-client-counts"
-                >
-                  Learn more here.
-                </DocLink>
-              </li>
-            {{/if}}
-          </ul>
-        </AlertBanner>
-      {{/if}}
-      {{#if this.isLoadingQuery}}
-        <LayoutLoading />
-      {{else}}
-        {{#if this.totalUsageCounts}}
-          {{#unless this.byMonthActivityData}}
-            {{! UsageStats render when viewing a single, historical month AND activity data predates new client breakdown (< v1.10.0)
-             or viewing the current month filtered down to auth method }}
-            <Clients::UsageStats
-              @title="Total usage"
-              @description="These totals are within 
-              {{if this.selectedAuthMethod this.selectedAuthMethod 'this namespace and all its children'}}.
-              {{if
-                this.isCurrentMonth
-                "Only totals are available when viewing the current month. To see a breakdown of new and total clients for this month, select the 'Current Billing Period' filter."
-              }}"
-              @totalUsageCounts={{this.totalUsageCounts}}
-            />
-          {{/unless}}
-          {{#if this.byMonthActivityData}}
-            <Clients::RunningTotal
-              @chartLegend={{this.chartLegend}}
-              @selectedAuthMethod={{this.selectedAuthMethod}}
-              @byMonthActivityData={{this.byMonthActivityData}}
-              @isHistoricalMonth={{and (not this.isCurrentMonth) (not this.isDateRange)}}
-              @isCurrentMonth={{this.isCurrentMonth}}
-              @runningTotals={{this.totalUsageCounts}}
-              @upgradeData={{this.upgradeDuringActivity}}
-              @responseTimestamp={{this.responseTimestamp}}
-            />
-          {{/if}}
-          {{#if this.hasAttributionData}}
-            <Clients::Attribution
-              @chartLegend={{this.chartLegend}}
-              @totalUsageCounts={{this.totalUsageCounts}}
-              @newUsageCounts={{this.newClientCounts}}
-              @totalClientAttribution={{this.totalClientAttribution}}
-              @newClientAttribution={{this.newClientAttribution}}
-              @selectedNamespace={{this.selectedNamespace}}
-              @startTimestamp={{this.startMonthTimestamp}}
-              @endTimestamp={{this.endMonthTimestamp}}
-              @responseTimestamp={{this.responseTimestamp}}
-              @isHistoricalMonth={{and (not this.isCurrentMonth) (not this.isDateRange)}}
-              @upgradeExplanation={{this.upgradeExplanation}}
-            />
-          {{/if}}
-          {{#if this.hasMultipleMonthsData}}
-            <Clients::MonthlyUsage
-              @chartLegend={{this.chartLegend}}
-              @verticalBarChartData={{this.byMonthActivityData}}
-              @responseTimestamp={{this.responseTimestamp}}
-            />
-          {{/if}}
-        {{/if}}
-      {{/if}}
-    {{else if (and (not @model.licenseStartTimestamp) (not this.startMonthTimestamp))}}
-      {{! Empty state for no billing/license start date }}
-      <EmptyState @title={{this.versionText.title}} @message={{this.versionText.message}} />
-    {{else}}
-      <EmptyState
-        @title="No data received  {{if this.dateRangeMessage this.dateRangeMessage}}"
-        @message="Select a different start date above, or choose a different end date here:"
-      >
-        <DateDropdown
-          @handleSubmit={{this.handleClientActivityQuery}}
-          @validateDate={{this.isEndBeforeStart}}
-          @dateType="endDate"
-          @submitText="View"
-        />
-      </EmptyState>
-    {{/if}}
-  {{/if}}
-
-  {{! BILLING START DATE MODAL }}
-
-  <Modal
-    @title="Edit start month"
-    @onClose={{action (mut this.showBillingStartModal) false}}
-    @isActive={{this.showBillingStartModal}}
-    @showCloseButton={{true}}
-  >
-    <section class="modal-card-custom has-padding-m">
-      <p class="has-bottom-margin-s">
-        {{this.versionText.description}}
-      </p>
-      <p><strong>{{this.versionText.label}}</strong></p>
-    </section>
-    <DateDropdown
-      @handleSubmit={{this.handleClientActivityQuery}}
-      @dateType="startDate"
-      @submitText="Save"
-      @handleCancel={{fn this.handleClientActivityQuery (hash dateType="cancel")}}
-    />
-  </Modal>
-</div>
\ No newline at end of file
diff --git a/ui/app/templates/components/clients/history.hbs b/ui/app/templates/components/clients/history.hbs
new file mode 100644
index 0000000000000..fe378c439c271
--- /dev/null
+++ b/ui/app/templates/components/clients/history.hbs
@@ -0,0 +1,262 @@
+<div class="box is-sideless is-fullwidth is-marginless is-bottomless">
+  <p class="has-bottom-margin-xl">
+    This data is presented by full month. If there is data missing, it’s possible that tracking was turned off at the time.
+    Vault will only show data for contiguous blocks of time during which tracking was on. Documentation is available
+    <DocLink @path="/docs/concepts/client-count">here</DocLink>.
+  </p>
+  <h2 class="title is-6 has-bottom-margin-xs">
+    {{this.versionText.label}}
+  </h2>
+  <div data-test-start-date-editor class="is-flex-align-baseline">
+    {{#if this.startTimeDisplay}}
+      <p class="is-size-6" data-test-date-display>{{this.startTimeDisplay}}</p>
+      <button type="button" class="button is-link" {{on "click" (fn (mut this.isEditStartMonthOpen) true)}}>
+        Edit
+      </button>
+    {{else}}
+      <DateDropdown @handleDateSelection={{this.handleClientActivityQuery}} @name={{"startTime"}} @submitText="Save" />
+    {{/if}}
+  </div>
+  <p class="is-8 has-text-grey has-bottom-margin-xl">
+    {{this.versionText.description}}
+  </p>
+  {{#if this.licenseStartIsCurrentMonth}}
+    <EmptyState
+      @title="No data for this billing period"
+      @subTitle="Your billing period has just begun, so there is no data yet. Data will be available here on the first of next month."
+      @message="To view data from a previous billing period, you can enter your previous billing start date."
+      @bottomBorder={{true}}
+    >
+      <DateDropdown @handleDateSelection={{this.handleClientActivityQuery}} @name={{"startTime"}} @submitText="View" />
+    </EmptyState>
+  {{else if (eq @model.config.queriesAvailable false)}}
+    {{#if (eq @model.config.enabled "On")}}
+      <EmptyState
+        @title={{concat "No monthly history " (if this.noActivityDate "from ") this.noActivityDate}}
+        @message="There is no data in the monthly history yet. We collect it at the end of each month, so your data will be available on the first of next month."
+      />
+    {{else}}
+      <EmptyState
+        @title="Data tracking is disabled"
+        @message="Tracking is disabled, and no data is being collected. To turn it on, edit the configuration."
+      >
+        {{#if @model.config.configPath.canUpdate}}
+          <p>
+            <LinkTo @route="vault.cluster.clients.config">
+              Go to configuration
+            </LinkTo>
+          </p>
+        {{/if}}
+      </EmptyState>
+    {{/if}}
+  {{else if this.errorObject}}
+    <Clients::Error @error={{this.errorObject}} />
+  {{else}}
+    {{#if (eq @model.config.enabled "Off")}}
+      <AlertBanner data-test-tracking-disabled @type="warning" @title="Tracking is disabled">
+        Tracking is currently disabled and data is not being collected. Historical data can be searched, but you will need to
+        <LinkTo @route="vault.cluster.clients.edit">
+          edit the configuration
+        </LinkTo>
+        to enable tracking again.
+      </AlertBanner>
+    {{/if}}
+    {{#if (or this.totalUsageCounts this.hasAttributionData)}}
+      <div class="is-subtitle-gray has-bottom-margin-m">
+        FILTERS
+        <Toolbar data-test-clients-filter-bar>
+          <ToolbarFilters>
+            <CalendarWidget
+              @arrayOfMonths={{this.arrayOfMonths}}
+              @endTimeDisplay={{this.endTimeDisplay}}
+              @endTimeFromResponse={{this.endTimeFromResponse}}
+              @handleClientActivityQuery={{this.handleClientActivityQuery}}
+              @handleCurrentBillingPeriod={{this.handleCurrentBillingPeriod}}
+              @startTimeDisplay={{this.startTimeDisplay}}
+            />
+            {{#if this.namespaceArray}}
+              <SearchSelect
+                @id="namespace-search-select"
+                @options={{this.namespaceArray}}
+                @selectLimit="1"
+                @disallowNewItems={{true}}
+                @fallbackComponent="input-search"
+                @onChange={{this.selectNamespace}}
+                @placeholder={{"Filter by namespace"}}
+                @displayInherit={{true}}
+                class="is-marginless"
+              />
+            {{/if}}
+            {{#if (not (is-empty this.authMethodOptions))}}
+              <SearchSelect
+                @id="auth-method-search-select"
+                @options={{this.authMethodOptions}}
+                @selectLimit="1"
+                @disallowNewItems={{true}}
+                @fallbackComponent="input-search"
+                @onChange={{this.setAuthMethod}}
+                @placeholder={{"Filter by auth method"}}
+                @displayInherit={{true}}
+              />
+            {{/if}}
+          </ToolbarFilters>
+        </Toolbar>
+      </div>
+
+      {{#if (or this.upgradeDuringActivity this.responseRangeDiffMessage)}}
+        <AlertBanner @type="warning" @title="Warning">
+          <ul class={{if (and this.versionUpdateText this.responseRangeDiffMessage) "bullet"}}>
+            {{#if this.responseRangeDiffMessage}}
+              <li>{{this.responseRangeDiffMessage}}</li>
+            {{/if}}
+            {{#if this.upgradeDuringActivity}}
+              <li>
+                {{this.upgradeVersionAndDate}}
+                {{this.versionSpecificText}}
+                <DocLink
+                  @path="/docs/concepts/client-count/faq#q-which-vault-version-reflects-the-most-accurate-client-counts"
+                >
+                  Learn more here.
+                </DocLink>
+              </li>
+            {{/if}}
+          </ul>
+        </AlertBanner>
+      {{/if}}
+      {{#if this.isLoadingQuery}}
+        <LayoutLoading />
+      {{else}}
+        {{#if this.totalUsageCounts}}
+          {{#unless this.byMonthActivityData}}
+            <Clients::UsageStats @title="Total usage" @totalUsageCounts={{this.totalUsageCounts}} />
+          {{/unless}}
+          {{#if this.byMonthActivityData}}
+            <Clients::RunningTotal
+              @chartLegend={{this.chartLegend}}
+              @selectedAuthMethod={{this.selectedAuthMethod}}
+              @lineChartData={{this.byMonthActivityData}}
+              @barChartData={{this.byMonthNewClients}}
+              @runningTotals={{this.totalUsageCounts}}
+              @upgradeData={{this.upgradeDuringActivity}}
+              @timestamp={{this.responseTimestamp}}
+            />
+          {{/if}}
+          {{#if this.hasAttributionData}}
+            <Clients::Attribution
+              @chartLegend={{this.chartLegend}}
+              @totalUsageCounts={{this.totalUsageCounts}}
+              @newUsageCounts={{this.newClientCounts}}
+              @totalClientAttribution={{this.totalClientAttribution}}
+              @newClientAttribution={{this.newClientAttribution}}
+              @selectedNamespace={{this.selectedNamespace}}
+              @startTimeDisplay={{this.startTimeDisplay}}
+              @endTimeDisplay={{this.endTimeDisplay}}
+              @isDateRange={{this.isDateRange}}
+              @timestamp={{this.responseTimestamp}}
+            />
+          {{/if}}
+          {{#if this.hasMultipleMonthsData}}
+            <Clients::MonthlyUsage
+              @chartLegend={{this.chartLegend}}
+              @verticalBarChartData={{this.byMonthActivityData}}
+              @timestamp={{this.responseTimestamp}}
+            />
+          {{/if}}
+        {{/if}}
+      {{/if}}
+    {{else if (and (not @model.startTimeFromLicense) (not this.startTimeFromResponse))}}
+      {{! Empty state for no billing/license start date }}
+      <EmptyState @title={{this.versionText.title}} @message={{this.versionText.message}} />
+    {{else}}
+      <EmptyState
+        @title={{concat "No data received " (if this.noActivityDate "from ") this.noActivityDate}}
+        @message="No data exists for that query period. Try searching again."
+      />
+    {{/if}}
+  {{/if}}
+
+  {{! BILLING START DATE MODAL }}
+  <Modal
+    @title="Edit start month"
+    @onClose={{action (mut this.isEditStartMonthOpen) false}}
+    @isActive={{this.isEditStartMonthOpen}}
+    @showCloseButton={{true}}
+  >
+    <section class="modal-card-body">
+      <p class="has-bottom-margin-s">
+        {{this.versionText.description}}
+      </p>
+      <p class="has-bottom-margin-s"><strong>{{this.versionText.label}}</strong></p>
+      <div class="modal-radio-button">
+        <BasicDropdown @class="popup-menu" @horizontalPosition="auto-right" @verticalPosition="below" as |D|>
+          <D.Trigger
+            data-test-popup-menu-trigger="month"
+            class={{concat "toolbar-link" (if D.isOpen " is-active")}}
+            @htmlTag="button"
+          >
+            {{or this.startMonth "Month"}}
+            <Chevron @direction="down" @isButton={{true}} />
+          </D.Trigger>
+          <D.Content @defaultClass="popup-menu-content is-wide">
+            <nav class="box menu scroll">
+              <ul class="menu-list">
+                {{#each this.months as |month index|}}
+                  <button
+                    type="button"
+                    class="button link"
+                    data-test-date-modal-month={{month}}
+                    disabled={{if (lt index this.allowedMonthMax) false true}}
+                    {{on "click" (fn this.selectStartMonth month D.actions)}}
+                  >
+                    {{month}}
+                  </button>
+                {{/each}}
+              </ul>
+            </nav>
+          </D.Content>
+        </BasicDropdown>
+        <BasicDropdown @class="popup-menu" @horizontalPosition="auto-right" @verticalPosition="below" as |D|>
+          <D.Trigger
+            data-test-popup-menu-trigger="year"
+            class={{concat "toolbar-link" (if D.isOpen " is-active")}}
+            @htmlTag="button"
+          >
+            {{or this.startYear "Year"}}
+            <Chevron @direction="down" @isButton={{true}} />
+          </D.Trigger>
+          <D.Content @defaultClass="popup-menu-content is-wide">
+            <nav class="box menu">
+              <ul class="menu-list">
+                {{#each this.years as |year|}}
+                  <button
+                    type="button"
+                    class="button link"
+                    data-test-date-modal-year={{year}}
+                    disabled={{if (eq year this.disabledYear) true false}}
+                    {{on "click" (fn this.selectStartYear year D.actions)}}
+                  >
+                    {{year}}
+                  </button>
+                {{/each}}
+              </ul>
+            </nav>
+          </D.Content>
+        </BasicDropdown>
+      </div>
+    </section>
+    <footer class="modal-card-foot modal-card-foot-outlined">
+      <button
+        data-test-modal-save
+        type="button"
+        class="button is-primary"
+        disabled={{or (if (and this.startMonth this.startYear) false true)}}
+        {{on "click" (fn this.handleClientActivityQuery this.startMonth this.startYear "startTime")}}
+      >
+        Save
+      </button>
+      <button type="button" class="button is-secondary" {{on "click" (fn this.handleClientActivityQuery 0 0 "cancel")}}>
+        Cancel
+      </button>
+    </footer>
+  </Modal>
+</div>
\ No newline at end of file
diff --git a/ui/app/templates/components/clients/monthly-usage.hbs b/ui/app/templates/components/clients/monthly-usage.hbs
index 307c6b098fa49..9c65c64d9a317 100644
--- a/ui/app/templates/components/clients/monthly-usage.hbs
+++ b/ui/app/templates/components/clients/monthly-usage.hbs
@@ -32,9 +32,9 @@
   </div>
 
   <div data-test-monthly-usage-timestamp class="timestamp">
-    {{#if @responseTimestamp}}
+    {{#if @timestamp}}
       Updated
-      {{date-format @responseTimestamp "MMM d yyyy, h:mm:ss aaa" withTimeZone=true}}
+      {{date-format @timestamp "MMM d yyyy, h:mm:ss aaa"}}
     {{/if}}
   </div>
 
diff --git a/ui/app/templates/components/clients/running-total.hbs b/ui/app/templates/components/clients/running-total.hbs
index 2a857cbbe4013..d20289d41d29a 100644
--- a/ui/app/templates/components/clients/running-total.hbs
+++ b/ui/app/templates/components/clients/running-total.hbs
@@ -1,4 +1,46 @@
-{{#if (gt @byMonthActivityData.length 1)}}
+{{#if this.showSingleMonth}}
+  <div class="chart-wrapper single-month-grid" data-test-running-total="single-month-stats">
+    <div class="chart-header has-bottom-margin-sm">
+      <h2 class="chart-title">Vault client counts</h2>
+      <p class="chart-description">
+        A client is any user or service that interacts with Vault. They are made up of entity clients and non-entity clients.
+        The total client count number is an important consideration for Vault billing.
+      </p>
+    </div>
+    <div class="single-month-stats" data-test-new>
+      <div class="single-month-section-title">
+        <StatText
+          @label="New clients"
+          @subText="This is the number of clients which were created in Vault for the first time in the selected month."
+          @value={{this.showSingleMonth.new.total}}
+          @size="l"
+        />
+      </div>
+      <div class="single-month-breakdown-entity">
+        <StatText @label="Entity clients" @value={{this.showSingleMonth.new.entityClients}} @size="m" />
+      </div>
+      <div class="single-month-breakdown-nonentity">
+        <StatText @label="Non-entity clients" @value={{this.showSingleMonth.new.nonEntityClients}} @size="m" />
+      </div>
+    </div>
+    <div class="single-month-stats" data-test-total>
+      <div class="single-month-section-title">
+        <StatText
+          @label="Total monthly clients"
+          @subText="This is the number of total clients which used Vault for the given month, both new and previous."
+          @value={{this.showSingleMonth.total.total}}
+          @size="l"
+        />
+      </div>
+      <div class="single-month-breakdown-entity">
+        <StatText @label="Entity clients" @value={{this.showSingleMonth.total.entityClients}} @size="m" />
+      </div>
+      <div class="single-month-breakdown-nonentity">
+        <StatText @label="Non-entity clients" @value={{this.showSingleMonth.total.nonEntityClients}} @size="m" />
+      </div>
+    </div>
+  </div>
+{{else}}
   <div class="chart-wrapper stacked-charts" data-test-running-total="monthly-charts">
     <div class="single-chart-grid">
       <div class="chart-header has-bottom-margin-xl">
@@ -9,8 +51,8 @@
         </p>
       </div>
 
-      <div class={{concat (unless @byMonthActivityData "chart-empty-state ") "chart-container-wide"}}>
-        <Clients::LineChart @dataset={{@byMonthActivityData}} @upgradeData={{@upgradeData}} />
+      <div class={{concat (unless @lineChartData "chart-empty-state ") "chart-container-wide"}}>
+        <Clients::LineChart @dataset={{@lineChartData}} @upgradeData={{@upgradeData}} />
       </div>
 
       <div class="chart-subTitle">
@@ -35,11 +77,11 @@
     <div class="single-chart-grid">
       <div class={{concat (unless this.hasAverageNewClients "chart-empty-state ") "chart-container-wide"}}>
         <Clients::VerticalBarChart
-          @dataset={{if this.hasAverageNewClients this.byMonthNewClients false}}
+          @dataset={{if this.hasAverageNewClients @barChartData false}}
           @chartLegend={{@chartLegend}}
           @noDataTitle="No new clients"
           @noDataMessage={{concat
-            "There is no new client data available for this "
+            "There are no new clients for this "
             (if @selectedAuthMethod "auth method" "namespace")
             " in this date range"
           }}
@@ -53,26 +95,24 @@
         </p>
       </div>
 
-      {{#if this.hasAverageNewClients}}
-        <div class="data-details-top" data-test-running-new-entity>
-          <h3 class="data-details">Average new entity clients per month</h3>
-          <p class="data-details">
-            {{format-number this.entityClientData.averageNewClients}}
-          </p>
-        </div>
+      <div class="data-details-top" data-test-running-new-entity>
+        <h3 class="data-details">Average new entity clients per month</h3>
+        <p class="data-details">
+          {{format-number this.entityClientData.averageNewClients}}
+        </p>
+      </div>
 
-        <div class="data-details-bottom" data-test-running-new-nonentity>
-          <h3 class="data-details">Average new non-entity clients per month</h3>
-          <p class="data-details">
-            {{format-number this.nonEntityClientData.averageNewClients}}
-          </p>
-        </div>
-      {{/if}}
+      <div class="data-details-bottom" data-test-running-new-nonentity>
+        <h3 class="data-details">Average new non-entity clients per month</h3>
+        <p class="data-details">
+          {{format-number this.nonEntityClientData.averageNewClients}}
+        </p>
+      </div>
 
       <div class="timestamp" data-test-running-total-timestamp>
-        {{#if @responseTimestamp}}
+        {{#if @timestamp}}
           Updated
-          {{date-format @responseTimestamp "MMM d yyyy, h:mm:ss aaa" withTimeZone=true}}
+          {{date-format @timestamp "MMM d yyyy, h:mm:ss aaa"}}
         {{/if}}
       </div>
 
@@ -84,61 +124,4 @@
       {{/if}}
     </div>
   </div>
-{{else}}
-  {{#if (and @isHistoricalMonth this.singleMonthData.new_clients.clients)}}
-    <div class="chart-wrapper single-month-grid" data-test-running-total="single-month-stats">
-      <div class="chart-header has-bottom-margin-sm">
-        <h2 class="chart-title">Vault client counts</h2>
-        <p class="chart-description">
-          A client is any user or service that interacts with Vault. They are made up of entity clients and non-entity
-          clients. The total client count number is an important consideration for Vault billing.
-        </p>
-      </div>
-      <div class="single-month-stats" data-test-new>
-        <div class="single-month-section-title">
-          <StatText
-            @label="New clients"
-            @subText="This is the number of clients which were created in Vault for the first time in the selected month."
-            @value={{this.singleMonthData.new_clients.clients}}
-            @size="l"
-          />
-        </div>
-        <div class="single-month-breakdown-entity">
-          <StatText @label="Entity clients" @value={{this.singleMonthData.new_clients.entity_clients}} @size="m" />
-        </div>
-        <div class="single-month-breakdown-nonentity">
-          <StatText @label="Non-entity clients" @value={{this.singleMonthData.new_clients.non_entity_clients}} @size="m" />
-        </div>
-      </div>
-      <div class="single-month-stats" data-test-total>
-        <div class="single-month-section-title">
-          <StatText
-            @label="Total monthly clients"
-            @subText="This is the number of total clients which used Vault for the given month, both new and previous."
-            @value={{this.singleMonthData.clients}}
-            @size="l"
-          />
-        </div>
-        <div class="single-month-breakdown-entity">
-          <StatText @label="Entity clients" @value={{this.singleMonthData.entity_clients}} @size="m" />
-        </div>
-        <div class="single-month-breakdown-nonentity">
-          <StatText @label="Non-entity clients" @value={{this.singleMonthData.non_entity_clients}} @size="m" />
-        </div>
-      </div>
-    </div>
-  {{else}}
-    {{! This renders when either: 
-    -> viewing the current month and all namespaces (no filters)
-    -> filtering by a namespace with no month over month data
-    if filtering by a mount with no month over month data <UsageStats> in dashboard.hbs renders }}
-    <Clients::UsageStats
-      @title="Total usage"
-      @description="These totals are within this namespace and all its children. {{if
-        @isCurrentMonth
-        "Only totals are available when viewing the current month. To see a breakdown of new and total clients for this month, select the 'Current Billing Period' filter."
-      }}"
-      @totalUsageCounts={{@runningTotals}}
-    />
-  {{/if}}
 {{/if}}
\ No newline at end of file
diff --git a/ui/app/templates/components/clients/usage-stats.hbs b/ui/app/templates/components/clients/usage-stats.hbs
index f993a7e5b1df9..bef91ab497713 100644
--- a/ui/app/templates/components/clients/usage-stats.hbs
+++ b/ui/app/templates/components/clients/usage-stats.hbs
@@ -2,12 +2,12 @@
   <div class="chart-header has-header-link has-bottom-margin-m">
     <div class="header-left">
       <h2 class="chart-title">{{@title}}</h2>
-      <p class="chart-description"> {{or @description "These totals are within this namespace and all its children."}}</p>
+      <p class="chart-description"> These totals are within this namespace and all its children. </p>
     </div>
     <div class="header-right">
-      <DocLink @path="/vault/tutorials/monitoring/usage-metrics">
+      <LearnLink @path="/tutorials/vault/usage-metrics">
         Learn more
-      </DocLink>
+      </LearnLink>
     </div>
   </div>
 
@@ -15,7 +15,7 @@
     <div class="column">
       <StatText
         @label="Total clients"
-        @value={{@totalUsageCounts.clients}}
+        @value={{or @totalUsageCounts.clients "0"}}
         @size="l"
         @subText="The sum of entity clientIDs and non-entity clientIDs; this is Vault’s primary billing metric."
         data-test-stat-text="total-clients"
@@ -25,7 +25,7 @@
       <StatText
         class="column"
         @label="Entity clients"
-        @value={{@totalUsageCounts.entity_clients}}
+        @value={{or @totalUsageCounts.entity_clients "0"}}
         @size="l"
         @subText="Representations of a particular user, client, or application that created a token via login."
         data-test-stat-text="entity-clients"
@@ -35,7 +35,7 @@
       <StatText
         class="column"
         @label="Non-entity clients"
-        @value={{@totalUsageCounts.non_entity_clients}}
+        @value={{or @totalUsageCounts.non_entity_clients "0"}}
         @size="l"
         @subText="Clients created with a shared set of permissions, but not associated with an entity. "
         data-test-stat-text="non-entity-clients"
diff --git a/ui/app/templates/components/cluster-info.hbs b/ui/app/templates/components/cluster-info.hbs
new file mode 100644
index 0000000000000..2e059b538fe8c
--- /dev/null
+++ b/ui/app/templates/components/cluster-info.hbs
@@ -0,0 +1,150 @@
+<div class="popup-menu-content">
+  <div class="box">
+    {{#unless this.version.isOSS}}
+      {{#if (and this.activeCluster.unsealed this.auth.currentToken)}}
+        {{#if @cluster.dr.isSecondary}}
+          {{#if (has-permission "status" routeParams="replication")}}
+            <nav class="menu" aria-label="replication secondary menu">
+              <p class="menu-label">Replication</p>
+              <ul>
+                {{#if @cluster.anyReplicationEnabled}}
+                  <li>
+                    <LinkTo
+                      @route="vault.cluster.replication-dr-promote.details"
+                      @disabled={{not this.auth.currentToken}}
+                      {{on "click" @onLinkClick}}
+                    >
+                      <ReplicationModeSummary @mode="dr" @display="menu" @cluster={{@cluster}} />
+                    </LinkTo>
+                  </li>
+                {{/if}}
+              </ul>
+            </nav>
+            <hr />
+          {{/if}}
+        {{else}}
+          {{#if (has-permission "status" routeParams="replication")}}
+            <nav class="menu" aria-label="replication menu">
+              <p class="menu-label">Replication</p>
+              <ul>
+                {{#if @cluster.anyReplicationEnabled}}
+                  <li>
+                    <LinkTo
+                      @route="vault.cluster.replication.mode.index"
+                      @model="dr"
+                      @disabled={{not this.auth.currentToken}}
+                      {{on "click" @onLinkClick}}
+                    >
+                      <ReplicationModeSummary @mode="dr" @display="menu" @cluster={{@cluster}} />
+                    </LinkTo>
+                  </li>
+                  <li>
+                    {{#if (has-feature "Performance Replication")}}
+                      <LinkTo
+                        @route="vault.cluster.replication.mode.index"
+                        @model="performance"
+                        @disabled={{not this.auth.currentToken}}
+                        {{on "click" @onLinkClick}}
+                      >
+                        <ReplicationModeSummary @mode="performance" @display="menu" @cluster={{@cluster}} @tagName="span" />
+                      </LinkTo>
+                    {{else}}
+                      <ReplicationModeSummary @mode="performance" @display="menu" @cluster={{@cluster}} @class="menu-item" />
+                    {{/if}}
+                  </li>
+                {{else}}
+                  <li>
+                    <LinkTo @route="vault.cluster.replication" {{on "click" @onLinkClick}}>
+                      <div class="level is-mobile">
+                        <span class="level-left">Enable</span>
+                        <Icon @name="plus-circle" class="has-text-grey-light level-right" />
+                      </div>
+                    </LinkTo>
+                  </li>
+                {{/if}}
+              </ul>
+            </nav>
+            <hr />
+          {{/if}}
+        {{/if}}
+      {{/if}}
+    {{/unless}}
+    <nav class="menu" aria-label="server menu">
+      <div class="menu-label">
+        Server
+      </div>
+      <ul class="menu-list">
+        <li class="action">
+          {{#if this.activeCluster.unsealed}}
+            {{#if (and (has-permission "status" routeParams="seal") (not @cluster.dr.isSecondary))}}
+              <LinkTo @route="vault.cluster.settings.seal" @model={{@cluster.name}} {{on "click" @onLinkClick}}>
+                <div class="level is-mobile">
+                  <span class="level-left">Unsealed</span>
+                  <Icon @name="check-circle" class="has-text-success level-right" />
+                </div>
+              </LinkTo>
+            {{else}}
+              <span class="menu-item">
+                <div class="level is-mobile">
+                  <span class="level-left">Unsealed</span>
+                  <Icon @name="check-circle" class="has-text-success level-right" />
+                </div>
+              </span>
+            {{/if}}
+          {{else}}
+            <span class="menu-item">
+              <div class="level is-mobile">
+                <span class="level-left has-text-danger">Sealed</span>
+                <Icon @name="x-circle" class="has-text-danger level-right" />
+              </div>
+            </span>
+          {{/if}}
+        </li>
+      </ul>
+      {{#if
+        (and
+          (or
+            (and this.version.features (has-permission "status" routeParams="license"))
+            (and @cluster.usingRaft (has-permission "status" routeParams="raft"))
+          )
+          (not @cluster.dr.isSecondary)
+        )
+      }}
+        <ul class="menu-list">
+          {{#if (and this.version.features (has-permission "status" routeParams="license") (not @cluster.dr.isSecondary))}}
+            <li class="action">
+              <LinkTo @route="vault.cluster.license" @model={{this.activeCluster.name}} {{on "click" @onLinkClick}}>
+                <div class="level is-mobile">
+                  <span class="level-left">License</span>
+                  <Chevron class="has-text-grey-light level-right" />
+                </div>
+              </LinkTo>
+            </li>
+          {{/if}}
+          {{#if (and @cluster.usingRaft (has-permission "status" routeParams="raft"))}}
+            <li class="action">
+              <LinkTo @route="vault.cluster.storage" @model={{this.activeCluster.name}} {{on "click" @onLinkClick}}>
+                <div class="level is-mobile">
+                  <span class="level-left">Raft Storage</span>
+                  <Chevron class="has-text-grey-light level-right" />
+                </div>
+              </LinkTo>
+            </li>
+          {{/if}}
+        </ul>
+      {{/if}}
+      {{#if (and (has-permission "clients" routeParams="activity") (not @cluster.dr.isSecondary) this.auth.currentToken)}}
+        <ul class="menu-list">
+          <li class="action">
+            <LinkTo @route="vault.cluster.clients.current" {{on "click" @onLinkClick}}>
+              <div class="level is-mobile">
+                <span class="level-left">Client count</span>
+                <Chevron class="has-text-grey-light level-right" />
+              </div>
+            </LinkTo>
+          </li>
+        </ul>
+      {{/if}}
+    </nav>
+  </div>
+</div>
\ No newline at end of file
diff --git a/ui/app/templates/components/configure-aws-secret.hbs b/ui/app/templates/components/configure-aws-secret.hbs
index d872ecf0a95bb..8c387497a077d 100644
--- a/ui/app/templates/components/configure-aws-secret.hbs
+++ b/ui/app/templates/components/configure-aws-secret.hbs
@@ -22,11 +22,7 @@
 </div>
 
 {{#if (eq @tab "leases")}}
-  <form
-    onsubmit={{action "saveLease" (hash lease=@model.lease lease_max=@model.leaseMax)}}
-    aria-label="save lease form"
-    data-test-aws-leases-form="true"
-  >
+  <form onsubmit={{action "saveLease" (hash lease=@model.lease lease_max=@model.leaseMax)}} data-test-aws-leases-form="true">
     <div class="box is-fullwidth is-shadowless is-marginless">
       <NamespaceReminder @mode="saved" @noun="configuration" />
       <MessageError @model={{@model}} />
diff --git a/ui/app/templates/components/configure-ssh-secret.hbs b/ui/app/templates/components/configure-ssh-secret.hbs
index 8e61dc38e92b0..f2efa3c7083ea 100644
--- a/ui/app/templates/components/configure-ssh-secret.hbs
+++ b/ui/app/templates/components/configure-ssh-secret.hbs
@@ -31,14 +31,14 @@
       <ConfirmAction
         @buttonClasses="button"
         @confirmMessage="This will remove the CA certificate information."
-        @onConfirmAction={{this.delete}}
+        @onConfirmAction={{action "saveConfig" (hash delete=true)}}
       >
         Delete
       </ConfirmAction>
     </div>
   </div>
 {{else}}
-  <form {{on "submit" this.saveConfig}} data-test-ssh-configure-form="true">
+  <form onsubmit={{action "saveConfig"}} data-test-ssh-configure-form="true">
     <div class="box is-fullwidth is-sideless is-marginless">
       <NamespaceReminder @mode="save" @noun="configuration" />
       <div class="field">
@@ -46,13 +46,7 @@
           Private key
         </label>
         <div class="control">
-          <MaskedInput
-            @name="privateKey"
-            id="privateKey"
-            class="input"
-            @value={{@model.privateKey}}
-            @onChange={{mut @model.privateKey}}
-          />
+          <Textarea name="privateKey" id="privateKey" class="input" @value={{@model.privateKey}} />
         </div>
       </div>
       <div class="field">
@@ -64,13 +58,13 @@
         </div>
       </div>
       <div class="b-checkbox">
-        <Input
-          @type="checkbox"
+        <input
+          type="checkbox"
           id="generateSigningKey"
           class="styled"
-          @checked={{@model.generateSigningKey}}
-          {{on "change" (fn (mut @model.generateSigningKey) (not @model.generateSigningKey))}}
-          data-test-ssh-input="generate-signing-key-checkbox"
+          checked={{@model.generateSigningKey}}
+          onchange={{action (mut @model.generateSigningKey) value="target.checked"}}
+          data-test-ssh-input={{this.generateSigningKey}}
         />
         <label for="generateSigningKey" class="is-label">
           Generate signing key
@@ -84,8 +78,8 @@
       <div class="control">
         <button
           type="submit"
-          class="button is-primary {{if @loading 'is-loading'}}"
-          disabled={{@loading}}
+          class="button is-primary {{if this.loading 'is-loading'}}"
+          disabled={{this.loading}}
           data-test-ssh-input="configure-submit"
         >
           Save
diff --git a/ui/app/templates/components/console/command-input.hbs b/ui/app/templates/components/console/command-input.hbs
index aa19df21fac32..1fcde14e66c4c 100644
--- a/ui/app/templates/components/console/command-input.hbs
+++ b/ui/app/templates/components/console/command-input.hbs
@@ -5,7 +5,7 @@
     <Chevron />
   {{/if}}
   <input onkeyup={{action "handleKeyUp"}} value={{this.value}} autocomplete="off" spellcheck="false" />
-  <ToolTip @horizontalPosition="auto-right" @verticalPosition="above" as |d|>
+  <ToolTip @horizontalPosition="auto-right" @verticalPosition={{if this.isFullscreen "above" "below"}} as |d|>
     <d.Trigger>
       <button
         type="button"
diff --git a/ui/app/templates/components/console/log-command.hbs b/ui/app/templates/components/console/log-command.hbs
index 5844ca21b266b..e282e32cbc4f3 100644
--- a/ui/app/templates/components/console/log-command.hbs
+++ b/ui/app/templates/components/console/log-command.hbs
@@ -1,4 +1,2 @@
-<div class="is-flex-center">
-  <Icon @name="chevron-right" />
-  <pre class="console-ui-command">{{@content}}</pre>
-</div>
\ No newline at end of file
+{{! using Icon here instead of Chevron because two nested tagless components results in a rendered line break between the tags breaking the layout in the <pre> }}
+<p class="console-ui-command is-font-mono"><Icon @name="chevron-right" />{{@content}}</p>
\ No newline at end of file
diff --git a/ui/app/templates/components/console/log-help.hbs b/ui/app/templates/components/console/log-help.hbs
index 33b3232409085..9ed233ca8cb2f 100644
--- a/ui/app/templates/components/console/log-help.hbs
+++ b/ui/app/templates/components/console/log-help.hbs
@@ -6,7 +6,6 @@
 
 Commands:
   read        Read data and retrieves secrets
-  kv-get      Read data for kv v2 secret engines. Use -metadata flag to read metadata
   write       Write data, configuration, and secrets
   delete      Delete secrets and configuration
   list        List data or secrets
diff --git a/ui/app/templates/components/console/ui-panel.hbs b/ui/app/templates/components/console/ui-panel.hbs
index 2982d7dd2f124..ef05cecc05b62 100644
--- a/ui/app/templates/components/console/ui-panel.hbs
+++ b/ui/app/templates/components/console/ui-panel.hbs
@@ -1,22 +1,12 @@
-<div class="console-close-button">
-  <button type="button" class="button is-ghost" {{action "closeConsole"}} data-test-console-panel-close>
-    <Icon @name="x" aria-label="Close console" />
-  </button>
-</div>
+<button type="button" class="button is-ghost console-close-button" {{action "closeConsole"}}>
+  <Icon @name="x" aria-label="Close console" />
+</button>
 <div class="console-ui-panel-content">
-  <div class="content has-bottom-margin-l">
-    <p class="has-text-grey is-font-mono has-bottom-margin-s">
-      The Vault Browser CLI provides an easy way to execute common Vault CLI commands, such as write, read, delete, and list.
-      It does not include kv v2 write or put commands. For guidance, type `help`.
+  <div class="content">
+    <p class="has-text-grey is-font-mono">
+      The Vault Browser CLI provides an easy way to execute the most common CLI commands, such as write, read, delete, and
+      list.
     </p>
-    <p class="has-text-grey is-font-mono has-bottom-margin-s">Examples:</p>
-    <p class="has-text-grey is-font-mono">→ Write secrets to kv v1: write &lt;mount&gt;/my-secret foo=bar</p>
-    <p class="has-text-grey is-font-mono">→ List kv v1 secret keys: list &lt;mount&gt;/</p>
-    <p class="has-text-grey is-font-mono">→ Read a kv v1 secret: read &lt;mount&gt;/my-secret</p>
-    <p class="has-text-grey is-font-mono">→ Mount a kv v2 secret engine: write sys/mounts/&lt;mount&gt; type=kv
-      options=version=2</p>
-    <p class="has-text-grey is-font-mono">→ Read a kv v2 secret: kv-get &lt;mount&gt;/secret-path</p>
-    <p class="has-text-grey is-font-mono">→ Read a kv v2 secret's metadata: kv-get &lt;mount&gt;/secret-path -metadata</p>
   </div>
   <Console::OutputLog @outputLog={{this.cliLog}} />
   <Console::CommandInput
diff --git a/ui/app/templates/components/database-connection.hbs b/ui/app/templates/components/database-connection.hbs
index 74d97d70f6685..ac1036e8af33b 100644
--- a/ui/app/templates/components/database-connection.hbs
+++ b/ui/app/templates/components/database-connection.hbs
@@ -63,7 +63,7 @@
             @secret=""
             @mode="create"
             @type="add"
-            @queryParams={{hash initialKey=@model.name itemType="role"}}
+            @queryParams={{query-params initialKey=@model.name itemType="role"}}
             data-test-secret-create={{true}}
           >
             Add role
@@ -89,7 +89,7 @@
     </AlertBanner>
   {{/if}}
 
-  <form {{on "submit" this.handleCreateConnection}} aria-label="create connection form">
+  <form {{on "submit" this.handleCreateConnection}}>
     {{#each @model.fieldAttrs as |attr|}}
       {{#if (not-eq attr.options.readOnly true)}}
         <FormField data-test-field={{true}} @attr={{attr}} @model={{@model}} />
@@ -107,7 +107,7 @@
                 <div class="columns is-desktop is-multiline">
                   {{#each fields as |attr|}}
                     {{#if
-                      (includes attr.name (array "max_open_connections" "max_idle_connections" "max_connection_lifetime"))
+                      (contains attr.name (array "max_open_connections" "max_idle_connections" "max_connection_lifetime"))
                     }}
                       <div class="column is-one-third">
                         <FormField data-test-field={{true}} @attr={{attr}} @model={{@model}} />
@@ -177,7 +177,7 @@
     </div>
   </form>
 {{else if (and (eq @mode "edit") @model.isAvailablePlugin)}}
-  <form {{on "submit" this.handleUpdateConnection}} aria-label="plugin config form">
+  <form {{on "submit" this.handleUpdateConnection}}>
     {{#each @model.fieldAttrs as |attr|}}
       {{#if (or (eq attr.name "name") (eq attr.name "plugin_name"))}}
         <ReadonlyFormField @attr={{attr}} @value={{get @model attr.name}} />
@@ -196,7 +196,7 @@
               <div class="columns is-desktop is-multiline">
                 {{#each fields as |attr|}}
                   {{#if
-                    (includes attr.name (array "max_open_connections" "max_idle_connections" "max_connection_lifetime"))
+                    (contains attr.name (array "max_open_connections" "max_idle_connections" "max_connection_lifetime"))
                   }}
                     <div class="column is-one-third">
                       <FormField data-test-field={{true}} @attr={{attr}} @model={{@model}} />
@@ -272,7 +272,7 @@
     </div>
 
     {{! Statements Edit Section }}
-    {{#if (not (and @model.plugin_name (not @model.statementFields)))}}
+    {{#unless (and @model.plugin_name (not @model.statementFields))}}
       <div class="form-section box is-shadowless is-fullwidth">
         <fieldset class="form-fieldset">
           <legend class="title is-5">Statements</legend>
@@ -281,7 +281,7 @@
           {{/each}}
         </fieldset>
       </div>
-    {{/if}}
+    {{/unless}}
 
     <div class="field is-grouped is-grouped-split is-fullwidth box is-bottomless">
       <div class="field is-grouped">
@@ -310,7 +310,7 @@
       <Chevron @direction="left" />
       Go back
     </LinkTo>
-    <DocLink @path="/api/secret/databases">Documentation</DocLink>
+    <a href="https://www.vaultproject.io/api/secret/databases" target="_blank" rel="noreferrer noopener">Documentation</a>
   </EmptyState>
 {{else}}
   {{#each @model.showAttrs as |attr|}}
diff --git a/ui/app/templates/components/database-role-edit.hbs b/ui/app/templates/components/database-role-edit.hbs
index f6b1e85a5fad4..6df07ced8fafc 100644
--- a/ui/app/templates/components/database-role-edit.hbs
+++ b/ui/app/templates/components/database-role-edit.hbs
@@ -56,7 +56,7 @@
           @secret={{concat "role/" @model.id}}
           @mode="edit"
           @replace={{true}}
-          @queryParams={{hash itemType="role"}}
+          @queryParams={{query-params itemType="role"}}
           data-test-edit-link={{true}}
         >
           Edit role
diff --git a/ui/app/templates/components/database-role-setting-form.hbs b/ui/app/templates/components/database-role-setting-form.hbs
index e14f6ee94e05c..4b43fe831b3d5 100644
--- a/ui/app/templates/components/database-role-setting-form.hbs
+++ b/ui/app/templates/components/database-role-setting-form.hbs
@@ -19,17 +19,17 @@
 {{#unless (and @roleType (not this.statementFields))}}
   <div class="box is-sideless is-fullwidth is-marginless" data-test-statements-section>
     <h3 class="title is-5">Statements</h3>
-    {{#if this.statementFields}}
+    {{#unless this.statementFields}}
+      <EmptyState
+        @title="No role type selected"
+        @message="Select a type of role to be able to add statements for creation, revocation, and/or rotation."
+      />
+    {{else}}
       <div class="form-section">
         {{#each this.statementFields as |attr|}}
           <FormField data-test-field={{true}} @attr={{attr}} @model={{@model}} />
         {{/each}}
       </div>
-    {{else}}
-      <EmptyState
-        @title="No role type selected"
-        @message="Select a type of role to be able to add statements for creation, revocation, and/or rotation."
-      />
-    {{/if}}
+    {{/unless}}
   </div>
 {{/unless}}
\ No newline at end of file
diff --git a/ui/app/templates/components/date-dropdown.hbs b/ui/app/templates/components/date-dropdown.hbs
index e08837014aaf3..aaef773c59fa7 100644
--- a/ui/app/templates/components/date-dropdown.hbs
+++ b/ui/app/templates/components/date-dropdown.hbs
@@ -1,86 +1,61 @@
-<div class="modal-card-custom has-padding-btm-left">
-  <BasicDropdown @class="popup-menu" @horizontalPosition="auto-right" @verticalPosition="below" as |D|>
-    <D.Trigger
-      data-test-popup-menu-trigger="month"
-      class={{concat "toolbar-link" (if D.isOpen " is-active")}}
-      @htmlTag="button"
-    >
-      {{or this.selectedMonth.name "Month"}}
-      <Chevron @direction="down" @isButton={{true}} />
-    </D.Trigger>
-    <D.Content @defaultClass="popup-menu-content is-wide">
-      <nav class="box menu scroll" aria-label="months">
-        <ul data-test-month-list class="menu-list">
-          {{#each this.dropdownMonths as |month|}}
-            <button
-              data-test-dropdown-month={{month.name}}
-              type="button"
-              class="button link"
-              disabled={{if (gt month.index this.maxMonthIdx) true false}}
-              {{on "click" (fn this.selectMonth month D.actions)}}
-            >
-              {{month.name}}
-            </button>
-          {{/each}}
-        </ul>
-      </nav>
-    </D.Content>
-  </BasicDropdown>
-  <BasicDropdown @class="popup-menu" @horizontalPosition="auto-right" @verticalPosition="below" as |D|>
-    <D.Trigger
-      data-test-popup-menu-trigger="year"
-      class={{concat "toolbar-link" (if D.isOpen " is-active")}}
-      @htmlTag="button"
-    >
-      {{or this.selectedYear "Year"}}
-      <Chevron @direction="down" @isButton={{true}} />
-    </D.Trigger>
-    <D.Content @defaultClass="popup-menu-content is-wide">
-      <nav class="box menu" aria-label="years">
-        <ul data-test-year-list class="menu-list">
-          {{#each this.dropdownYears as |year|}}
-            <button
-              data-test-dropdown-year={{year}}
-              type="button"
-              class="button link"
-              disabled={{if (eq year this.disabledYear) true false}}
-              {{on "click" (fn this.selectYear year D.actions)}}
-            >
-              {{year}}
-            </button>
-          {{/each}}
-        </ul>
-      </nav>
-    </D.Content>
-  </BasicDropdown>
-  {{#unless @handleCancel}}
-    <button
-      data-test-date-dropdown-submit
-      type="button"
-      class="button is-primary"
-      disabled={{if (and this.selectedMonth this.selectedYear) false true}}
-      {{on "click" this.handleSubmit}}
-    >
-      {{or @submitText "Submit"}}
-    </button>
-  {{/unless}}
-  {{#if this.invalidDate}}
-    <AlertInline @type="danger" @message={{this.invalidDate}} @paddingTop={{true}} @mimicRefresh={{true}} />
-  {{/if}}
-</div>
-{{#if @handleCancel}}
-  <footer class="modal-card-foot modal-card-foot-outlined">
-    <button
-      data-test-date-dropdown-submit
-      type="button"
-      class="button is-primary"
-      disabled={{if (and this.selectedMonth this.selectedYear) false true}}
-      {{on "click" this.handleSubmit}}
-    >
-      {{or @submitText "Submit"}}
-    </button>
-    <button data-test-date-dropdown-cancel type="button" class="button is-secondary" {{on "click" this.handleCancel}}>
-      Cancel
-    </button>
-  </footer>
-{{/if}}
\ No newline at end of file
+<BasicDropdown @class="popup-menu" @horizontalPosition="auto-right" @verticalPosition="below" as |D|>
+  <D.Trigger
+    data-test-popup-menu-trigger="month"
+    class={{concat "toolbar-link" (if D.isOpen " is-active")}}
+    @htmlTag="button"
+  >
+    {{or this.startMonth "Month"}}
+    <Chevron @direction="down" @isButton={{true}} />
+  </D.Trigger>
+  <D.Content @defaultClass="popup-menu-content is-wide">
+    <nav class="box menu scroll">
+      <ul data-test-month-list class="menu-list">
+        {{#each this.months as |month index|}}
+          <button
+            type="button"
+            class="button link"
+            disabled={{if (lt index this.allowedMonthMax) false true}}
+            {{on "click" (fn this.selectStartMonth month D.actions)}}
+          >
+            {{month}}
+          </button>
+        {{/each}}
+      </ul>
+    </nav>
+  </D.Content>
+</BasicDropdown>
+<BasicDropdown @class="popup-menu" @horizontalPosition="auto-right" @verticalPosition="below" as |D|>
+  <D.Trigger
+    data-test-popup-menu-trigger="year"
+    class={{concat "toolbar-link" (if D.isOpen " is-active")}}
+    @htmlTag="button"
+  >
+    {{or this.startYear "Year"}}
+    <Chevron @direction="down" @isButton={{true}} />
+  </D.Trigger>
+  <D.Content @defaultClass="popup-menu-content is-wide">
+    <nav class="box menu">
+      <ul data-test-year-list class="menu-list">
+        {{#each this.years as |year|}}
+          <button
+            type="button"
+            class="button link"
+            disabled={{if (eq year this.disabledYear) true false}}
+            {{on "click" (fn this.selectStartYear year D.actions)}}
+          >
+            {{year}}
+          </button>
+        {{/each}}
+      </ul>
+    </nav>
+  </D.Content>
+</BasicDropdown>
+<button
+  data-test-date-dropdown-submit
+  type="button"
+  class="button is-primary"
+  disabled={{if (and this.startMonth this.startYear) false true}}
+  {{on "click" this.saveDateSelection}}
+>
+  {{or @submitText "Submit"}}
+</button>
\ No newline at end of file
diff --git a/ui/app/templates/components/diff-version-selector.hbs b/ui/app/templates/components/diff-version-selector.hbs
index 9114f38867550..50936aff4f1b1 100644
--- a/ui/app/templates/components/diff-version-selector.hbs
+++ b/ui/app/templates/components/diff-version-selector.hbs
@@ -12,7 +12,7 @@
         <Chevron @direction="down" @isButton={{true}} />
       </D.Trigger>
       <D.Content @defaultClass="popup-menu-content">
-        <nav class="box menu" aria-label="version">
+        <nav class="box menu">
           <ul class="menu-list">
             {{#each (reverse @model.versions) as |leftSideSecretVersion|}}
               <li class="action" data-test-leftSide-version={{leftSideSecretVersion.version}}>
@@ -55,7 +55,7 @@
         <Chevron @direction="down" @isButton={{true}} />
       </D.Trigger>
       <D.Content @defaultClass="popup-menu-content">
-        <nav class="box menu" aria-label="versions to diff">
+        <nav class="box menu">
           <ul class="menu-list">
             {{#each (reverse @model.versions) as |rightSideSecretVersion|}}
               <li class="action">
diff --git a/ui/app/templates/components/file-to-array-buffer.hbs b/ui/app/templates/components/file-to-array-buffer.hbs
index 0cf81fe38e480..368c7b9d1ecff 100644
--- a/ui/app/templates/components/file-to-array-buffer.hbs
+++ b/ui/app/templates/components/file-to-array-buffer.hbs
@@ -5,31 +5,27 @@
         {{this.label}}
       {{/if}}
     </label>
-    <div class="file is-fullwidth">
-      <div class="file-label" aria-label="Choose a file">
-        <input id="file-input" class="file-input" type="file" onchange={{action "pickedFile"}} data-test-file-input />
-        <label for="file-input" class="file-cta button">
+    <div class="file has-name is-fullwidth">
+      <label class="file-label">
+        <input class="file-input" type="file" onchange={{action "pickedFile"}} data-test-file-input />
+        <span class="file-cta button">
           <Icon @name="upload" class="has-light-grey-text" />
           Choose a file…
-        </label>
+        </span>
         <span class="file-name has-text-grey-dark" data-test-text-file-input-label={{true}}>
-          {{or this.filename "No file chosen"}}
+          {{or this.fileName "No file chosen"}}
         </span>
-        {{#if this.filename}}
-          <button
-            type="button"
-            class="file-delete-button"
-            aria-label="Clear file selection"
-            {{action "clearFile"}}
-            data-test-text-clear
-          >
+        {{#if this.fileName}}
+          {{! template-lint-configure no-nested-interactive "warn" }}
+          <button type="button" class="file-delete-button" {{action "clearFile"}} data-test-text-clear>
             <Icon @name="x-circle" />
           </button>
+          {{! template-lint-configure no-nested-interactive "on" }}
         {{/if}}
-      </div>
+      </label>
     </div>
   </div>
-  {{#if this.filename}}
+  {{#if this.fileName}}
     <p class="help has-text-grey">
       This file is
       {{this.fileSize}}
diff --git a/ui/app/templates/components/form-field-from-model.hbs b/ui/app/templates/components/form-field-from-model.hbs
index 27aeb2ed45848..f5963ddebb762 100644
--- a/ui/app/templates/components/form-field-from-model.hbs
+++ b/ui/app/templates/components/form-field-from-model.hbs
@@ -2,7 +2,7 @@
 <div class="field" data-test-form-field-from-model>
   {{#unless
     (or
-      (includes
+      (contains
         @attr.options.editType (array "boolean" "searchSelect" "mountAccessor" "kv" "file" "ttl" "stringArray" "json")
       )
       (eq @attr.type "boolean")
diff --git a/ui/app/templates/components/form-field-groups-loop.hbs b/ui/app/templates/components/form-field-groups-loop.hbs
new file mode 100644
index 0000000000000..fdb5c9b9f5e2a
--- /dev/null
+++ b/ui/app/templates/components/form-field-groups-loop.hbs
@@ -0,0 +1,30 @@
+{{#each @model.fieldGroups as |fieldGroup|}}
+  {{#each-in fieldGroup as |group fields|}}
+    {{#if (eq group "default")}}
+      {{#each fields as |attr|}}
+        {{! template-lint-configure simple-unless "warn"  }}
+        {{#unless (and (not-eq @mode "create") (eq attr.name "name"))}}
+          <FormField data-test-field={{true}} @attr={{attr}} @model={{@model}} />
+        {{/unless}}
+      {{/each}}
+    {{else}}
+      {{#let (camelize (concat "show" group)) as |prop|}}
+        <ToggleButton
+          @isOpen={{get @model prop}}
+          @openLabel={{concat "Hide " group}}
+          @closedLabel={{group}}
+          @onClick={{fn (mut (get @model prop))}}
+          class="is-block"
+          data-test-toggle-group={{group}}
+        />
+        {{#if (get @model prop)}}
+          <div class="box is-marginless">
+            {{#each fields as |attr|}}
+              <FormField data-test-field={{true}} @attr={{attr}} @model={{@model}} />
+            {{/each}}
+          </div>
+        {{/if}}
+      {{/let}}
+    {{/if}}
+  {{/each-in}}
+{{/each}}
\ No newline at end of file
diff --git a/ui/app/templates/components/generate-credentials-database.hbs b/ui/app/templates/components/generate-credentials-database.hbs
index 956edc48d0f77..094c79362653d 100644
--- a/ui/app/templates/components/generate-credentials-database.hbs
+++ b/ui/app/templates/components/generate-credentials-database.hbs
@@ -1,6 +1,6 @@
 <PageHeader as |p|>
   <p.top>
-    <nav class="breadcrumb" aria-label="breadcrumbs">
+    <nav class="breadcrumb">
       <ul>
         <li>
           <span class="sep">&#x0002f;</span>
@@ -28,15 +28,15 @@
       @bottomBorder={{true}}
       @message={{@model.errorMessage}}
     >
-      <nav class="breadcrumb" aria-label="help breadcrumb">
+      <nav class="breadcrumb">
         <ul class="is-grouped-split">
           <li>
             {{! Empty because they can't go "back" anywhere }}
           </li>
           <li>
-            <DocLink @path="/vault/docs/secrets/databases" @class="has-text-grey">
+            <LearnLink @path="/vault/database-secrets" @class="has-text-grey">
               Need help?
-            </DocLink>
+            </LearnLink>
           </li>
         </ul>
       </nav>
diff --git a/ui/app/templates/components/generated-item-list.hbs b/ui/app/templates/components/generated-item-list.hbs
index b4a1b7cce224c..b9e402eb9f81c 100644
--- a/ui/app/templates/components/generated-item-list.hbs
+++ b/ui/app/templates/components/generated-item-list.hbs
@@ -37,10 +37,9 @@
 <Toolbar>
   <ToolbarActions>
     <ToolbarLink
-      @route="vault.cluster.access.method.item.create"
-      @model={{this.itemType}}
-      @type="add"
       data-test-entity-create-link={{this.itemType}}
+      @type="add"
+      @params={{array "vault.cluster.access.method.item.create" this.itemType}}
     >
       Create
       {{singularize this.itemType}}
diff --git a/ui/app/templates/components/generated-item.hbs b/ui/app/templates/components/generated-item.hbs
index 4e777e482077b..0b7cd77ca01b9 100644
--- a/ui/app/templates/components/generated-item.hbs
+++ b/ui/app/templates/components/generated-item.hbs
@@ -44,8 +44,7 @@
       </ConfirmAction>
       <div class="toolbar-separator"></div>
       <ToolbarLink
-        @route="vault.cluster.access.method.item.edit"
-        @models={{array this.itemType this.model.id}}
+        @params={{array "vault.cluster.access.method.item.edit" this.itemType this.model.id}}
         data-test-configure-link="true"
       >
         Edit
diff --git a/ui/app/templates/components/get-credentials-card.hbs b/ui/app/templates/components/get-credentials-card.hbs
index 563a5d862532c..bb885fa755d50 100644
--- a/ui/app/templates/components/get-credentials-card.hbs
+++ b/ui/app/templates/components/get-credentials-card.hbs
@@ -6,32 +6,24 @@
     <p class="is-label search-label">{{@searchLabel}}</p>
   </div>
   <p class="sub-text">{{@subText}}</p>
-  {{#if @renderInputSearch}}
-    <InputSearch
-      @id="search-input-{{@type}}"
-      @onChange={{this.handleInput}}
-      @placeholder={{@placeholder}}
-      data-test-search-roles
-    />
-  {{else}}
-    <SearchSelect
-      @id="search-input-{{@type}}"
-      @models={{@models}}
-      @selectLimit="1"
-      @backend={{@backend}}
-      @fallbackComponent="input-search"
-      @onChange={{this.handleInput}}
-      @placeholder={{@placeholder}}
-      data-test-search-roles
-    />
-  {{/if}}
-  <button
-    type="button"
+  <SearchSelect
+    @id={{this.id}}
+    @models={{@models}}
+    @selectLimit="1"
+    @backend={{@backend}}
+    @fallbackComponent="input-search"
+    @shouldUseFallback={{@shouldUseFallback}}
+    @onChange={{action "handleRoleInput"}}
+    @inputValue={{get this.model this.valuePath}}
+    @placeHolder={{@placeHolder}}
+    data-test-search-roles
+  />
+  <input
+    type="submit"
+    value={{@title}}
     class="button is-secondary"
     disabled={{this.buttonDisabled}}
-    {{on "click" this.transitionToCredential}}
+    onclick={{action "transitionToCredential"}}
     data-test-get-credentials
-  >
-    {{@title}}
-  </button>
+  />
 </form>
\ No newline at end of file
diff --git a/ui/app/templates/components/home-link.hbs b/ui/app/templates/components/home-link.hbs
new file mode 100644
index 0000000000000..255ebfeb0f674
--- /dev/null
+++ b/ui/app/templates/components/home-link.hbs
@@ -0,0 +1,7 @@
+<span class={{@class}}>
+  {{#if (has-block)}}
+    {{yield}}
+  {{else}}
+    {{@text}}
+  {{/if}}
+</span>
\ No newline at end of file
diff --git a/ui/app/templates/components/identity/edit-form.hbs b/ui/app/templates/components/identity/edit-form.hbs
index 469e8251d13e6..869fc3cd7b18e 100644
--- a/ui/app/templates/components/identity/edit-form.hbs
+++ b/ui/app/templates/components/identity/edit-form.hbs
@@ -24,34 +24,7 @@
       />
     {{/if}}
     {{#each this.model.fields as |attr|}}
-      <FormField data-test-field={{true}} @attr={{attr}} @model={{@model}}>
-        <div class="form-section">
-          {{#if this.model.canCreatePolicies}}
-            <SearchSelectWithModal
-              @id="policies"
-              @label="Policies"
-              @labelClass="title is-4"
-              @models={{array "policy/acl" "policy/rgp"}}
-              @inputValue={{@model.policies}}
-              @onChange={{action (mut this.model.policies)}}
-              @fallbackComponent="string-list"
-              @modalFormTemplate="modal-form/policy-template"
-              @excludeOptions={{array "root"}}
-            />
-          {{else}}
-            <SearchSelect
-              @id="policies"
-              @label="Policies"
-              @labelClass="title is-4"
-              @models={{array "policy/acl" "policy/rgp"}}
-              @inputValue={{@model.policies}}
-              @onChange={{action (mut this.model.policies)}}
-              @fallbackComponent="string-list"
-              @disallowNewItems={{true}}
-            />
-          {{/if}}
-        </div>
-      </FormField>
+      <FormField data-test-field={{true}} @attr={{attr}} @model={{@model}} />
     {{/each}}
   </div>
 
diff --git a/ui/app/templates/components/identity/entity-nav.hbs b/ui/app/templates/components/identity/entity-nav.hbs
index 1484102f7de56..7f77b523f1ef8 100644
--- a/ui/app/templates/components/identity/entity-nav.hbs
+++ b/ui/app/templates/components/identity/entity-nav.hbs
@@ -26,8 +26,7 @@
   <ToolbarActions>
     {{#if (eq this.identityType "entity")}}
       <ToolbarLink
-        @route={{"vault.cluster.access.identity.merge"}}
-        @model={{pluralize this.identityType}}
+        @params={{array "vault.cluster.access.identity.merge" (pluralize this.identityType)}}
         data-test-entity-merge-link={{true}}
       >
         Merge
@@ -35,9 +34,8 @@
       </ToolbarLink>
     {{/if}}
     <ToolbarLink
-      @route="vault.cluster.access.identity.create"
-      @model={{pluralize this.identityType}}
       @type="add"
+      @params={{array "vault.cluster.access.identity.create" (pluralize this.identityType)}}
       data-test-entity-create-link={{true}}
     >
       Create
diff --git a/ui/app/templates/components/identity/item-metadata.hbs b/ui/app/templates/components/identity/item-metadata.hbs
index 9850f11158517..ea329342d516b 100644
--- a/ui/app/templates/components/identity/item-metadata.hbs
+++ b/ui/app/templates/components/identity/item-metadata.hbs
@@ -27,8 +27,8 @@
       Edit
       {{lowercase (humanize @model.identityType)}}
     </LinkTo>
-    <DocLink @path="/vault/tutorials/auth-methods/identity">
+    <LearnLink @path="/vault/identity-access-management/iam-identity">
       Learn more
-    </DocLink>
+    </LearnLink>
   </EmptyState>
 {{/each-in}}
\ No newline at end of file
diff --git a/ui/lib/core/addon/components/input-search.hbs b/ui/app/templates/components/input-search.hbs
similarity index 80%
rename from ui/lib/core/addon/components/input-search.hbs
rename to ui/app/templates/components/input-search.hbs
index 22b35c7f8a6bf..3caaac987bbe4 100644
--- a/ui/lib/core/addon/components/input-search.hbs
+++ b/ui/app/templates/components/input-search.hbs
@@ -1,4 +1,4 @@
-<div class="field is-grouped" ...attributes>
+<div class="field is-grouped">
   <div class="control is-expanded">
     {{#if @label}}
       <label for={{@id}} class="is-label">{{@label}}</label>
@@ -12,7 +12,7 @@
       @type="text"
       @value={{this.searchInput}}
       {{on "keyup" this.inputChanged}}
-      placeholder={{@placeholder}}
+      placeholder={{@placeHolder}}
     />
   </div>
 </div>
\ No newline at end of file
diff --git a/ui/lib/core/addon/components/json-editor.hbs b/ui/app/templates/components/json-editor.hbs
similarity index 100%
rename from ui/lib/core/addon/components/json-editor.hbs
rename to ui/app/templates/components/json-editor.hbs
diff --git a/ui/app/templates/components/keymgmt/distribute.hbs b/ui/app/templates/components/keymgmt/distribute.hbs
index 50bbf6bdd0a62..86e49e68d1052 100644
--- a/ui/app/templates/components/keymgmt/distribute.hbs
+++ b/ui/app/templates/components/keymgmt/distribute.hbs
@@ -10,7 +10,8 @@
           @inputValue={{this.formData.key}}
           @subText="Type to use the name of an existing key that you’d like to add to this provider, or to create one."
           @wildcardLabel="key"
-          @label="Key name"
+          @label=""
+          @subLabel="Key name"
           @fallbackComponent="string-list"
           @selectLimit="1"
           @backend={{@backend}}
@@ -20,7 +21,7 @@
             <AlertInline @paddingTop={{true}} @sizeSmall={{true}} @type="danger" data-test-keymgmt-error="key">
               {{this.validMatchError.key}}
               To check compatibility,
-              <DocLink class="doc-link-subtle" @path="/vault/docs/secrets/key-management#compatibility">refer to this table</DocLink>.
+              <DocLink class="doc-link-subtle" @path="/docs/secrets/key-management#compatibility">refer to this table</DocLink>.
             </AlertInline>
           {{/if}}
         </SearchSelect>
@@ -54,7 +55,7 @@
             <AlertInline @paddingTop={{true}} @sizeSmall={{true}} @type="danger" data-test-keymgmt-error="new-key">
               {{this.validMatchError.key}}
               To check compatibility,
-              <DocLink class="doc-link-subtle" @path="/vault/docs/secrets/key-management#compatibility">refer to this table</DocLink>.
+              <DocLink class="doc-link-subtle" @path="/docs/secrets/key-management#compatibility">refer to this table</DocLink>.
             </AlertInline>
           {{/if}}
         </div>
@@ -70,7 +71,8 @@
           @passObject={{false}}
           @inputValue={{this.formData.provider}}
           @subText="Select a provider in Vault. If it doesn’t exist yet, you’ll need to add it first."
-          @label="Provider"
+          @label=""
+          @subLabel="Provider"
           @fallbackComponent="input-search"
           @selectLimit="1"
           @backend={{@backend}}
@@ -81,7 +83,7 @@
             <AlertInline @paddingTop={{true}} @sizeSmall={{true}} @type="danger" data-test-keymgmt-error="provider">
               {{this.validMatchError.provider}}
               To check compatibility,
-              <DocLink class="doc-link-subtle" @path="/vault/docs/secrets/key-management#compatibility">refer to this table</DocLink>.
+              <DocLink class="doc-link-subtle" @path="/docs/secrets/key-management#compatibility">refer to this table</DocLink>.
             </AlertInline>
           {{/if}}
         </SearchSelect>
diff --git a/ui/app/templates/components/keymgmt/key-edit.hbs b/ui/app/templates/components/keymgmt/key-edit.hbs
index d85c79bf026f3..852599c831b08 100644
--- a/ui/app/templates/components/keymgmt/key-edit.hbs
+++ b/ui/app/templates/components/keymgmt/key-edit.hbs
@@ -102,7 +102,7 @@
             @secret={{@model.id}}
             @mode="edit"
             @replace={{true}}
-            @queryParams={{hash itemType="key"}}
+            @queryParams={{query-params itemType="key"}}
             @data-test-edit-link={{true}}
           >
             Edit key
diff --git a/ui/app/templates/components/keymgmt/provider-edit.hbs b/ui/app/templates/components/keymgmt/provider-edit.hbs
index de51a8a6e239a..2672cabed0a82 100644
--- a/ui/app/templates/components/keymgmt/provider-edit.hbs
+++ b/ui/app/templates/components/keymgmt/provider-edit.hbs
@@ -83,7 +83,7 @@
               @secret={{@model.id}}
               @mode="edit"
               @replace={{true}}
-              @queryParams={{hash itemType="provider"}}
+              @queryParams={{query-params itemType="provider"}}
               disabled={{(not @model.canEdit)}}
             >
               Update credentials
@@ -182,7 +182,7 @@
               @title="No keys for this provider"
               @message="Keys for this provider will be listed here. Add a key to get started."
             >
-              <SecretLink @mode="create" @secret="" @queryParams={{hash itemType="key"}} class="link">
+              <SecretLink @mode="create" @secret="" @queryParams={{query-params itemType="key"}} class="link">
                 Create key
               </SecretLink>
             </EmptyState>
diff --git a/ui/app/templates/components/kv-object-editor.hbs b/ui/app/templates/components/kv-object-editor.hbs
new file mode 100644
index 0000000000000..aaed61599210c
--- /dev/null
+++ b/ui/app/templates/components/kv-object-editor.hbs
@@ -0,0 +1,69 @@
+<div class="field" ...attributes>
+  <FormFieldLabel
+    @label={{@label}}
+    @helpText={{@helpText}}
+    @subText={{@subText}}
+    class={{@labelClass}}
+    data-test-kv-label={{true}}
+  />
+  {{#if @validationError}}
+    <div>
+      <AlertInline @type="danger" @message={{@validationError}} @paddingTop={{true}} />
+    </div>
+  {{/if}}
+  {{#each this.kvData as |row index|}}
+    <div class="columns is-variable" data-test-kv-row>
+      <div class="column is-one-quarter">
+        <Input
+          data-test-kv-key={{true}}
+          @value={{row.name}}
+          placeholder={{this.placeholders.key}}
+          {{on "change" (fn this.updateRow row index)}}
+          class="input"
+        />
+      </div>
+      <div class="column">
+        {{#if (has-block)}}
+          {{yield row this.kvData}}
+        {{else}}
+          <Textarea
+            data-test-kv-value={{index}}
+            name={{row.name}}
+            class="input {{if @validationError 'has-error-border'}}"
+            @value={{row.value}}
+            wrap="off"
+            placeholder={{this.placeholders.value}}
+            rows={{1}}
+            {{on "change" (fn this.updateRow row index)}}
+            {{on "keyup" this.handleKeyUp}}
+          />
+        {{/if}}
+      </div>
+      <div class="column is-narrow">
+        {{#if (eq this.kvData.length (inc index))}}
+          <button type="button" {{action "addRow"}} class="button is-outlined is-primary" data-test-kv-add-row={{true}}>
+            Add
+          </button>
+        {{else}}
+          <button
+            class="button has-text-grey is-expanded is-icon"
+            type="button"
+            {{action "deleteRow" row index}}
+            aria-label="Delete row"
+            data-test-kv-delete-row={{index}}
+          >
+            <Icon @name="trash" />
+          </button>
+        {{/if}}
+      </div>
+    </div>
+  {{/each}}
+  {{#if this.hasDuplicateKeys}}
+    <AlertBanner
+      @type="warning"
+      @message="More than one key shares the same name. Please be sure to have unique key names or some data may be lost when saving."
+      @class="is-marginless"
+      data-test-duplicate-error-warnings
+    />
+  {{/if}}
+</div>
\ No newline at end of file
diff --git a/ui/app/templates/components/license-banners.hbs b/ui/app/templates/components/license-banners.hbs
index 0c9c09c60eec1..1416290972e36 100644
--- a/ui/app/templates/components/license-banners.hbs
+++ b/ui/app/templates/components/license-banners.hbs
@@ -1,26 +1,28 @@
-{{#if (and this.licenseExpired (not this.expiredDismissed))}}
+{{#if this.licenseExpired}}
   <div class="license-banner-wrapper" data-test-license-banner data-test-license-banner-expired>
     <AlertBanner
+      @bannerType="license"
       @type="danger"
       @title="License expired"
       @message="Your Vault license expired on {{date-format
         @expiry
         'MMM d, yyyy'
       }}. Add a new license to your configuration and restart Vault."
-      class="message-marginless"
+      @marginless={{true}}
     >
-      <DocLink @path="/vault/tutorials/enterprise/hashicorp-enterprise-license">
-        <Icon @name="learn-link" />
+      <a
+        href="https://learn.hashicorp.com/tutorials/nomad/hashicorp-enterprise-license"
+        target="_blank"
+        rel="noreferrer noopener"
+      >
         Read documentation
-      </DocLink>
-      <button type="button" class="close-button" {{on "click" (fn this.dismissBanner "expired")}} data-test-dismiss-expired>
-        <Icon @name="x" aria-label="dismiss license expired warning" />
-      </button>
+      </a>
     </AlertBanner>
   </div>
-{{else if (and (lte this.licenseExpiringInDays 30) (not this.warningDismissed))}}
+{{else if (lte this.licenseExpiringInDays 30)}}
   <div class="license-banner-wrapper" data-test-license-banner data-test-license-banner-warning>
     <AlertBanner
+      @bannerType="license"
       @type="warning"
       @title="Vault license expiring"
       @message="Your Vault license will expire in {{this.licenseExpiringInDays}} days at {{date-format
@@ -31,15 +33,15 @@
         'Add a new license to your configuration.'
         'Keep in mind that your next license will need to be autoloaded'
       }}"
-      class="message-marginless"
+      @marginless={{true}}
     >
-      <DocLink @path="/vault/tutorials/enterprise/hashicorp-enterprise-license">
-        <Icon @name="learn-link" />
+      <a
+        href="https://learn.hashicorp.com/tutorials/nomad/hashicorp-enterprise-license"
+        target="_blank"
+        rel="noreferrer noopener"
+      >
         Read documentation
-      </DocLink>
-      <button type="button" class="close-button" {{on "click" (fn this.dismissBanner "warning")}} data-test-dismiss-warning>
-        <Icon @name="x" aria-label="dismiss license expire soon warning" />
-      </button>
+      </a>
     </AlertBanner>
   </div>
 {{/if}}
\ No newline at end of file
diff --git a/ui/app/templates/components/link-status.hbs b/ui/app/templates/components/link-status.hbs
index 2e09b07d81df6..2ff89bd0dc546 100644
--- a/ui/app/templates/components/link-status.hbs
+++ b/ui/app/templates/components/link-status.hbs
@@ -1,12 +1,12 @@
 {{#if (and this.state this.version.isEnterprise)}}
-  <div class="link-status {{if (eq this.state 'connected') 'connected' 'warning'}}">
+  <div class="navbar-status {{if (eq this.state 'connected') 'connected' 'warning'}}">
     <Icon @name="info" />
     <p data-test-link-status>
       {{#if (eq this.state "connected")}}
         This self-managed Vault is linked to
-        <ExternalLink @href="https://portal.cloud.hashicorp.com/sign-in">
+        <a href="https://portal.cloud.hashicorp.com/sign-in" target="_blank" rel="noopener noreferrer">
           HCP.
-        </ExternalLink>
+        </a>
       {{else}}
         There was an error connecting to HCP. Click
         <button type="button" class="text-button is-underline" {{on "click" (fn (mut this.showModal))}}>
diff --git a/ui/app/templates/components/menu-sidebar.hbs b/ui/app/templates/components/menu-sidebar.hbs
new file mode 100644
index 0000000000000..adc6c52da47d7
--- /dev/null
+++ b/ui/app/templates/components/menu-sidebar.hbs
@@ -0,0 +1,21 @@
+<aside class="menu">
+  {{#if this.title}}
+    <p class="menu-label">
+      {{this.title}}
+    </p>
+  {{/if}}
+  <ul class="menu-list">
+    {{yield}}
+  </ul>
+  <div class="menu-toggle">
+    {{#if this.isActive}}
+      <button type="button" class="button is-ghost" {{action "closeMenu"}}>
+        <Icon @name="x" aria-label="Close menu" />
+      </button>
+    {{else}}
+      <button type="button" class="button is-ghost has-text-grey-light" {{action "openMenu"}}>
+        <Icon @name="more-vertical" aria-label="Open menu" />
+      </button>
+    {{/if}}
+  </div>
+</aside>
\ No newline at end of file
diff --git a/ui/app/templates/components/mfa/mfa-login-enforcement-form.hbs b/ui/app/templates/components/mfa/mfa-login-enforcement-form.hbs
index ad9af012cd0de..7b8c51a0ca0d4 100644
--- a/ui/app/templates/components/mfa/mfa-login-enforcement-form.hbs
+++ b/ui/app/templates/components/mfa/mfa-login-enforcement-form.hbs
@@ -105,7 +105,8 @@
           <SearchSelect
             @placeholder="Search for an existing target"
             @options={{this.searchSelect.options}}
-            @parentManageSelected={{this.searchSelect.selected}}
+            {{! workaround since there is no way provided by component to externally clear selected options }}
+            @selectedOptions={{this.searchSelect.selected}}
             @shouldRenderName={{true}}
             @selectLimit={{1}}
             @onChange={{this.setTargetValue}}
diff --git a/ui/app/templates/components/mfa/mfa-login-enforcement-header.hbs b/ui/app/templates/components/mfa/mfa-login-enforcement-header.hbs
index e44a944f1fe65..089e37df6c501 100644
--- a/ui/app/templates/components/mfa/mfa-login-enforcement-header.hbs
+++ b/ui/app/templates/components/mfa/mfa-login-enforcement-header.hbs
@@ -31,7 +31,7 @@
       An enforcement will define which auth types, auth mounts, groups, and/or entities will require this MFA method. Keep in
       mind that only one of these conditions needs to be satisfied. For example, if an authentication method is added here,
       all entities and groups which make use of that authentication method will be subject to an MFA request.
-      <DocLink @path="/vault/docs/auth/login-mfa">Learn more here.</DocLink>
+      <DocLink @path="/docs/auth/login-mfa">Learn more here.</DocLink>
     {{/if}}
   </p>
   {{#if @isInline}}
@@ -68,6 +68,7 @@
     {{#if (eq @radioCardGroupValue "existing")}}
       <SearchSelect
         @label="Enforcement"
+        @labelClass="is-label"
         @subText="Choose the existing enforcement(s) to add to this MFA method."
         @placeholder="Search for an existing enforcement"
         @options={{this.enforcements}}
diff --git a/ui/app/templates/components/mfa/mfa-setup-step-two.hbs b/ui/app/templates/components/mfa/mfa-setup-step-two.hbs
index d55af7e9795d7..0d4999e8f235a 100644
--- a/ui/app/templates/components/mfa/mfa-setup-step-two.hbs
+++ b/ui/app/templates/components/mfa/mfa-setup-step-two.hbs
@@ -38,13 +38,7 @@
       </div>
     {{/if}}
     <div class="is-flex-start has-gap has-top-margin-l">
-      <button
-        id="restart"
-        type="button"
-        class="button is-danger-outlined"
-        {{on "click" this.restartSetup}}
-        data-test-restart
-      >
+      <button id="restart" type="button" class="button has-text-danger" {{on "click" this.restartSetup}} data-test-restart>
         Restart setup
       </button>
       <button id="cancel" type="button" {{on "click" this.redirectPreviousPage}} class="button is-primary" data-test-done>
diff --git a/ui/app/templates/components/mount-backend-form.hbs b/ui/app/templates/components/mount-backend-form.hbs
index 4552342647c9b..1a89eac60c486 100644
--- a/ui/app/templates/components/mount-backend-form.hbs
+++ b/ui/app/templates/components/mount-backend-form.hbs
@@ -2,65 +2,99 @@
   <p.levelLeft>
     <h1 class="title is-3 title-with-icon" data-test-mount-form-header="true">
       {{#if this.showEnable}}
-        {{#let (find-by "type" @mountModel.type @mountTypes) as |typeInfo|}}
+        {{#let (find-by "type" this.mountModel.type this.mountTypes) as |typeInfo|}}
           <Icon @name={{or typeInfo.glyph typeInfo.type}} @size="24" class="has-text-grey-light" />
-          {{#if (eq @mountType "secret")}}
-            {{concat "Enable " typeInfo.displayName " Secrets Engine"}}
-          {{else}}
+          {{#if (eq this.mountType "auth")}}
             {{concat "Enable " typeInfo.displayName " Authentication Method"}}
+          {{else}}
+            {{concat "Enable " typeInfo.displayName " Secrets Engine"}}
           {{/if}}
         {{/let}}
-      {{else if (eq @mountType "secret")}}
-        Enable a Secrets Engine
-      {{else}}
+      {{else if (eq this.mountType "auth")}}
         Enable an Authentication Method
+      {{else}}
+        Enable a Secrets Engine
       {{/if}}
     </h1>
   </p.levelLeft>
 </PageHeader>
-
-<div class="box is-sideless is-fullwidth is-marginless">
-  <NamespaceReminder @mode="enable" @noun={{if (eq @mountType "secret") "Secret Engine" "Auth Method"}} />
-  <MessageError @errorMessage={{this.errorMessage}} />
-  {{#if @mountModel.type}}
-    <form {{on "submit" (perform this.mountBackend)}}>
+<form {{on "submit" (perform this.mountBackend)}}>
+  <div class="box is-sideless is-fullwidth is-marginless">
+    <NamespaceReminder @mode="enable" @noun={{if (eq this.mountType "auth") "Auth Method" "Secret Engine"}} />
+    <MessageError @model={{this.model}} @errorMessage={{this.errorMessage}} @errors={{this.errors}} />
+    {{#if this.showEnable}}
       <FormFieldGroups
-        @model={{@mountModel}}
+        @model={{this.mountModel}}
         @renderGroup="default"
         @modelValidations={{this.modelValidations}}
         @onKeyUp={{this.onKeyUp}}
       />
-      <FormFieldGroups @model={{@mountModel}} @renderGroup="Method Options" />
-
-      <div class="field is-grouped box is-fullwidth is-bottomless">
-        <div class="control">
-          <button
-            type="submit"
-            data-test-mount-submit="true"
-            class="button is-primary {{if this.mountBackend.isRunning 'loading'}}"
-            disabled={{this.mountBackend.isRunning}}
-          >
-            {{#if (eq @mountType "secret")}}
-              Enable Engine
-            {{else}}
-              Enable Method
-            {{/if}}
-          </button>
+      <FormFieldGroups @model={{this.mountModel}} @onChange={{this.onTypeChange}} @renderGroup="Method Options" />
+    {{else}}
+      {{#each (array "generic" "cloud" "infra") as |category|}}
+        <h3 class="title box-radio-header">
+          {{capitalize category}}
+        </h3>
+        <div class="box-radio-container">
+          {{#each (filter-by "category" category this.mountTypes) as |type|}}
+            <BoxRadio
+              @displayName={{type.displayName}}
+              @type={{type.type}}
+              @glyph={{or type.glyph type.type}}
+              @groupValue={{this.mountModel.type}}
+              @groupName="mount-type"
+              @onRadioChange={{queue (fn (mut this.mountModel.type)) (fn this.onTypeChange "type")}}
+              @disabled={{if type.requiredFeature (not (has-feature type.requiredFeature)) false}}
+              @tooltipMessage={{if
+                (or (eq type.type "transform") (eq type.type "kmip") (eq type.type "keymgmt"))
+                (concat
+                  type.displayName
+                  " is part of the Advanced Data Protection module, which is not included in your enterprise license."
+                )
+                "This secret engine is not included in your license."
+              }}
+            />
+          {{/each}}
         </div>
+      {{/each}}
+    {{/if}}
+  </div>
+  <div class="field is-grouped box is-fullwidth is-bottomless">
+    {{#if this.showEnable}}
+      <div class="control">
+        <button
+          type="submit"
+          data-test-mount-submit="true"
+          class="button is-primary {{if this.mountBackend.isRunning 'loading'}}"
+          disabled={{this.mountBackend.isRunning}}
+        >
+          {{#if (eq this.mountType "auth")}}
+            Enable Method
+          {{else}}
+            Enable Engine
+          {{/if}}
+        </button>
+      </div>
+      <div class="control">
+        <button data-test-mount-back type="button" class="button" {{on "click" (fn this.toggleShowEnable false)}}>
+          Back
+        </button>
+      </div>
+      {{#if this.invalidFormAlert}}
         <div class="control">
-          <button data-test-mount-back type="button" class="button" {{on "click" (fn this.setMountType "")}}>
-            Back
-          </button>
+          <AlertInline @type="danger" @paddingTop={{true}} @message={{this.invalidFormAlert}} @mimicRefresh={{true}} />
         </div>
-        {{#if this.invalidFormAlert}}
-          <div class="control">
-            <AlertInline @type="danger" @paddingTop={{true}} @message={{this.invalidFormAlert}} @mimicRefresh={{true}} />
-          </div>
-        {{/if}}
-      </div>
-    </form>
-  {{else}}
-    {{!  Type not yet set, show type options }}
-    <MountBackend::TypeForm @setMountType={{this.setMountType}} @mountType={{@mountType}} />
-  {{/if}}
-</div>
\ No newline at end of file
+      {{/if}}
+    {{else}}
+      <button
+        data-test-mount-next
+        type="button"
+        class="button is-primary"
+        {{on "click" (fn this.toggleShowEnable true)}}
+        disabled={{not this.mountModel.type}}
+      >
+        Next
+      </button>
+    {{/if}}
+  </div>
+</form>
\ No newline at end of file
diff --git a/ui/app/templates/components/namespace-link.hbs b/ui/app/templates/components/namespace-link.hbs
index 24452b7e8ba3e..9b0f906169683 100644
--- a/ui/app/templates/components/namespace-link.hbs
+++ b/ui/app/templates/components/namespace-link.hbs
@@ -1,17 +1,16 @@
-<ExternalLink
-  @href={{this.namespaceLink}}
-  @sameTab={{true}}
-  class={{concat "is-block " this.class}}
-  data-test-namespace-link={{this.normalizedNamespace}}
->
+<a href={{this.namespaceLink}} class={{concat "is-block " this.class}} data-test-namespace-link={{this.normalizedNamespace}}>
   {{#if (has-block)}}
     {{yield}}
   {{else}}
     <div class="level is-mobile">
       <span class="level-left">{{this.namespaceDisplay}}</span>
       <span class="level-right">
-        <Chevron @isButton={{true}} class="button is-ghost icon has-text-grey" />
+        {{! template-lint-configure no-nested-interactive "warn" }}
+        <button type="button" class="button is-ghost icon">
+          <Chevron @isButton={{true}} class="has-text-grey" />
+        </button>
+        {{! template-lint-configure no-nested-interactive "on" }}
       </span>
     </div>
   {{/if}}
-</ExternalLink>
\ No newline at end of file
+</a>
\ No newline at end of file
diff --git a/ui/app/templates/components/namespace-picker.hbs b/ui/app/templates/components/namespace-picker.hbs
index 3bab05d42d82c..8766ce4f11761 100644
--- a/ui/app/templates/components/namespace-picker.hbs
+++ b/ui/app/templates/components/namespace-picker.hbs
@@ -1,32 +1,25 @@
-<div class="namespace-picker" ...attributes>
-  <BasicDropdown @horizontalPosition="left" @verticalPosition="above" as |D|>
-    <D.Trigger
-      @htmlTag="button"
-      class="button is-transparent namespace-picker-trigger has-current-color"
-      data-test-namespace-toggle
-    >
-      <div class="is-flex-center">
-        <Icon @name="org" />
-        <span class="namespace-name">{{this.namespaceDisplay}}</span>
-      </div>
-      <Icon @name="caret" />
-    </D.Trigger>
-    <D.Content @defaultClass="namespace-picker-content">
-      <div class="is-mobile level-left">
-        <h5 class="list-header">Current namespace</h5>
-      </div>
-      <div class="namespace-header-bar level is-mobile">
-        <div class="level-left">
-          <header>
-            <div class="level is-mobile namespace-link">
-              <span class="level-left" data-test-current-namespace>
-                {{if this.namespacePath (concat this.namespacePath "/") "root"}}
-              </span>
-            </div>
-          </header>
-        </div>
-      </div>
-      <div class="namespace-list {{if this.isAnimating 'animated-list'}}">
+{{#if (and (not this.accessibleNamespaces.length) this.inRootNamespace)}}
+  <div class="namespace-picker no-namespaces">
+    {{! Just yield the logo if they're in the root namespace and only have access to it }}
+    {{yield}}
+  </div>
+{{else}}
+  <div class="namespace-picker">
+    <BasicDropdown @horizontalPosition="auto-left" @verticalPosition="below" as |D|>
+      <D.Trigger
+        @htmlTag="button"
+        class="button is-transparent namespace-picker-trigger has-current-color"
+        data-test-namespace-toggle
+      >
+        {{yield}}
+        {{#if this.namespaceDisplay}}
+          <span class="namespace-name">{{this.namespaceDisplay}}</span>
+        {{else}}
+          <span class="namespace-name is-hidden-tablet">/ (Root)</span>
+        {{/if}}
+        <Chevron @direction="down" @class="has-text-white auto-width is-status-chevron" />
+      </D.Trigger>
+      <D.Content @defaultClass="namespace-picker-content">
         <div class="is-mobile level-left">
           {{#unless this.isUserRootNamespace}}
             <NamespaceLink
@@ -34,23 +27,51 @@
                 (object-at (dec 2 this.menuLeaves.length) this.lastMenuLeaves)
                 this.auth.authData.userRootNamespace
               }}
-              @class="namespace-link is-current button is-transparent icon"
+              @class="namespace-link is-current button is-ghost icon"
             >
               <Chevron @direction="left" @class="has-text-grey" />
             </NamespaceLink>
           {{/unless}}
-          <h5 class="list-header">Namespaces</h5>
+          <h5 class="list-header">Current namespace</h5>
         </div>
-        {{#if (includes "" this.lastMenuLeaves)}}
-          {{! leaf is '' which is the root namespace, and then we need to iterate the root leaves }}
-          <div class="leaf-panel {{if (eq '' this.currentLeaf) 'leaf-panel-current' 'leaf-panel-left'}} ">
-            {{#each this.rootLeaves as |rootLeaf|}}
-              <NamespaceLink @targetNamespace={{rootLeaf}} @class="namespace-link" @showLastSegment={{true}} />
-            {{/each}}
+        <div class="namespace-header-bar level is-mobile">
+          <div class="level-left">
+            <header>
+              <div class="level is-mobile namespace-link">
+                <span class="level-left" data-test-current-namespace>
+                  {{if this.namespacePath (concat this.namespacePath "/") "root"}}
+                </span>
+                <span class="level-right">
+                  <Icon @name="check-circle" class="has-text-success" />
+                </span>
+              </div>
+            </header>
           </div>
-        {{/if}}
-        {{#each this.lastMenuLeaves as |leaf|}}
-          {{#if leaf}}
+        </div>
+        <div class="namespace-list {{if this.isAnimating 'animated-list'}}">
+          <div class="is-mobile level-left">
+            {{#unless this.isUserRootNamespace}}
+              <NamespaceLink
+                @targetNamespace={{or
+                  (object-at (dec 2 this.menuLeaves.length) this.lastMenuLeaves)
+                  this.auth.authData.userRootNamespace
+                }}
+                @class="namespace-link is-current button is-ghost icon"
+              >
+                <Chevron @direction="left" @class="has-text-grey" />
+              </NamespaceLink>
+            {{/unless}}
+            <h5 class="list-header">Namespaces</h5>
+          </div>
+          {{#if (contains "" this.lastMenuLeaves)}}
+            {{! leaf is '' which is the root namespace, and then we need to iterate the root leaves }}
+            <div class="leaf-panel {{if (eq '' this.currentLeaf) 'leaf-panel-current' 'leaf-panel-left'}} ">
+              {{~#each this.rootLeaves as |rootLeaf|}}
+                <NamespaceLink @targetNamespace={{rootLeaf}} @class="namespace-link" @showLastSegment={{true}} />
+              {{/each~}}
+            </div>
+          {{/if}}
+          {{#each this.lastMenuLeaves as |leaf|}}
             <div
               class="leaf-panel
                 {{if (eq leaf this.currentLeaf) 'leaf-panel-current' 'leaf-panel-left'}}
@@ -58,38 +79,32 @@
                 {{if (and (not this.isAdding) (eq leaf this.changedLeaf)) 'leaf-panel-exiting'}}
                 "
             >
-              {{#each-in (get this.namespaceTree leaf) as |leafName|}}
+              {{~#each-in (get this.namespaceTree leaf) as |leafName|}}
                 <NamespaceLink
                   @targetNamespace={{concat leaf "/" leafName}}
                   @class="namespace-link"
                   @showLastSegment={{true}}
                 />
-              {{/each-in}}
+              {{/each-in~}}
             </div>
-          {{/if}}
-        {{/each}}
-        {{#if this.canList}}
-          <div class="leaf-panel leaf-panel-current">
-            <div class="level">
-              <span class="level-left">
-                <LinkTo @route="vault.cluster.access.namespaces" class="is-block namespace-link namespace-manage-link">
-                  Manage Namespaces
-                </LinkTo>
-              </span>
-              <span class="level-right">
-                <button
-                  type="button"
-                  class="button is-ghost icon has-right-margin-m"
-                  data-test-refresh-namespaces
-                  onclick={{action "refreshNamespaceList"}}
-                >
-                  <Icon @name="reload" class="has-text-grey" />
-                </button>
-              </span>
+          {{/each}}
+          {{#if this.canList}}
+            <div class="leaf-panel leaf-panel-current">
+              <LinkTo @route="vault.cluster.access.namespaces" class="is-block namespace-link namespace-manage-link">
+                <div class="level is-mobile">
+                  <span class="level-left">Manage namespaces</span>
+                  <span class="level-right">
+                    <button type="button" class="button is-ghost icon" onclick={{action "refreshNamespaceList"}}>
+                      <Icon @name="reload" class="has-text-grey" />
+                    </button>
+                  </span>
+                </div>
+              </LinkTo>
             </div>
-          </div>
-        {{/if}}
-      </div>
-    </D.Content>
-  </BasicDropdown>
-</div>
\ No newline at end of file
+          {{/if}}
+        </div>
+      </D.Content>
+    </BasicDropdown>
+  </div>
+  <div class="navbar-separator"></div>
+{{/if}}
\ No newline at end of file
diff --git a/ui/app/templates/components/nav-header.hbs b/ui/app/templates/components/nav-header.hbs
new file mode 100644
index 0000000000000..ba37e51b97c9f
--- /dev/null
+++ b/ui/app/templates/components/nav-header.hbs
@@ -0,0 +1,42 @@
+<nav class="navbar">
+  <LinkStatus @status={{this.currentCluster.cluster.hcpLinkStatus}} />
+
+  <div class="navbar-actions">
+    <div class="navbar-brand" data-test-navheader-home>
+      {{yield (hash home=(component "nav-header/home"))}}
+    </div>
+
+    {{#unless this.navDrawerOpen}}
+      <button type="button" class="navbar-drawer-toggle is-hidden-tablet" {{action "toggleNavDrawer"}}>
+        <Icon @name="more-vertical" />
+        Menu
+      </button>
+    {{/unless}}
+
+    {{#unless this.hideLinks}}
+      <div class="navbar-drawer{{if this.navDrawerOpen ' is-active'}}">
+        <div class="navbar-drawer-scroll">
+          <div data-test-navheader-main>
+            {{yield (hash main=(component "nav-header/main") closeDrawer=(action "toggleNavDrawer" false))}}
+          </div>
+          <div class="navbar-end" data-test-navheader-items>
+            {{yield (hash items=(component "nav-header/items") closeDrawer=(action "toggleNavDrawer" false))}}
+          </div>
+        </div>
+
+        {{#if this.navDrawerOpen}}
+          <button class="navbar-drawer-toggle is-hidden-tablet" type="button" {{action "toggleNavDrawer" false}}>
+            <Icon @name="x" />
+          </button>
+        {{/if}}
+      </div>
+    {{/unless}}
+
+    <div
+      class="navbar-drawer-overlay{{if this.navDrawerOpen ' is-active'}}"
+      role="button"
+      onclick={{action "toggleNavDrawer" (not this.navDrawerOpen)}}
+    ></div>
+  </div>
+</nav>
+<Console::UiPanel @isFullscreen={{this.consoleFullscreen}} />
\ No newline at end of file
diff --git a/ui/app/templates/components/not-found.hbs b/ui/app/templates/components/not-found.hbs
index 5ae30e74f602a..fcfc1b6e5d70d 100644
--- a/ui/app/templates/components/not-found.hbs
+++ b/ui/app/templates/components/not-found.hbs
@@ -8,9 +8,6 @@
   </PageHeader>
   <div class="box is-sideless has-background-white-bis has-text-grey has-text-centered">
     <p>Sorry, we were unable to find any content at <code>{{or this.model.path this.path}}</code>.</p>
-    <p>
-      Double check the url or
-      <ExternalLink @href="/" @sameTab={{true}}>go back home</ExternalLink>.
-    </p>
+    <p>Double check the url or go back <HomeLink @text="home" />.</p>
   </div>
 </div>
\ No newline at end of file
diff --git a/ui/app/templates/components/oidc/assignment-form.hbs b/ui/app/templates/components/oidc/assignment-form.hbs
index 6f4d2734c27e6..5ec1131872a1f 100644
--- a/ui/app/templates/components/oidc/assignment-form.hbs
+++ b/ui/app/templates/components/oidc/assignment-form.hbs
@@ -1,3 +1,32 @@
+{{#unless @isInline}}
+  <PageHeader as |p|>
+    <p.top>
+      <nav class="breadcrumb" aria-label="breadcrumbs">
+        <ul>
+          <li>
+            <span class="sep">&#x0002f;</span>
+            {{#if @model.isNew}}
+              <LinkTo @route={{"vault.cluster.access.oidc.assignments"}}>
+                Assignments
+              </LinkTo>
+            {{else}}
+              {{! You're editing in this view }}
+              <LinkTo @route={{"vault.cluster.access.oidc.assignments.assignment.details"}} @model={{@model.name}}>
+                Details
+              </LinkTo>
+            {{/if}}
+          </li>
+        </ul>
+      </nav>
+    </p.top>
+    <p.levelLeft>
+      <h1 class="title is-3" data-test-oidc-assignment-title>
+        {{if @model.isNew "Create" "Edit"}}
+        assignment
+      </h1>
+    </p.levelLeft>
+  </PageHeader>
+{{/unless}}
 <form {{on "submit" (perform this.save)}}>
   <div class="box is-sideless is-fullwidth is-marginless">
     <MessageError @errorMessage={{this.errorBanner}} class="has-top-margin-s" />
@@ -17,6 +46,7 @@
     <SearchSelect
       @id="entities"
       @label="Entities"
+      @labelClass="is-label"
       @placeholder="Search"
       @models={{array "identity/entity"}}
       @inputValue={{@model.entityIds}}
@@ -29,6 +59,7 @@
     <SearchSelect
       @id="groups"
       @label="Groups"
+      @labelClass="is-label"
       @placeholder="Search"
       @models={{array "identity/group"}}
       @inputValue={{@model.groupIds}}
diff --git a/ui/app/templates/components/oidc/client-form.hbs b/ui/app/templates/components/oidc/client-form.hbs
index d8a262e24e02e..893ff199a7bc5 100644
--- a/ui/app/templates/components/oidc/client-form.hbs
+++ b/ui/app/templates/components/oidc/client-form.hbs
@@ -39,7 +39,6 @@
     <h4 class="title is-4">Assign access</h4>
     <div class="is-flex-row">
       <RadioCard
-        data-test-oidc-radio="allow-all"
         @title="Allow everyone to access existing"
         @description="All Vault entities can authenticate through this application."
         @icon="org"
@@ -48,7 +47,6 @@
         @onChange={{this.handleAssignmentSelection}}
       />
       <RadioCard
-        data-test-oidc-radio="limited"
         @title="Limit access to selected users"
         @description="Choose or create an assignment to give access to selected entities."
         @icon="users"
@@ -62,12 +60,12 @@
         @id="assignments"
         @label="Assignment name"
         @subText="Search for an existing assignment, or type a new name to create it."
-        @models={{array "oidc/assignment"}}
+        @model="oidc/assignment"
         @inputValue={{this.modelAssignments}}
         @onChange={{this.handleAssignmentSelection}}
         @excludeOptions={{array "allow_all"}}
         @fallbackComponent="string-list"
-        @modalFormTemplate="modal-form/oidc-assignment-template"
+        @modalFormComponent="oidc/assignment-form"
         @modalSubtext="Use assignment to specify which Vault entities and groups are allowed to authenticate."
       />
     {{/if}}
diff --git a/ui/app/templates/components/oidc/key-form.hbs b/ui/app/templates/components/oidc/key-form.hbs
index 3d1c57ed7d621..2df87e951c161 100644
--- a/ui/app/templates/components/oidc/key-form.hbs
+++ b/ui/app/templates/components/oidc/key-form.hbs
@@ -37,7 +37,6 @@
     <h4 class="title is-4">Allowed applications</h4>
     <div class="is-flex-row">
       <RadioCard
-        data-test-oidc-radio="allow-all"
         @title="Allow every application to use"
         @description="All applications can use this key for authentication requests."
         @icon="globe"
@@ -46,7 +45,6 @@
         @onChange={{this.handleClientSelection}}
       />
       <RadioCard
-        data-test-oidc-radio="limited"
         @title="Limit access to selected application"
         @description="Only selected applications can use this key for authentication requests."
         @icon="globe-private"
@@ -60,7 +58,7 @@
     {{#if (eq this.radioCardGroupValue "limited")}}
       <SearchSelect
         @id="allowedClientIds"
-        @label="Application name"
+        @subLabel="Application name"
         @subText="Select which applications are allowed to use this key. Only applications that currently reference this key will appear in the dropdown."
         @models={{array "oidc/client"}}
         @inputValue={{@model.allowedClientIds}}
diff --git a/ui/app/templates/components/oidc/provider-form.hbs b/ui/app/templates/components/oidc/provider-form.hbs
index e717fdeec4460..4fc0cd1dd32b2 100644
--- a/ui/app/templates/components/oidc/provider-form.hbs
+++ b/ui/app/templates/components/oidc/provider-form.hbs
@@ -25,7 +25,7 @@
   </p.levelLeft>
 </PageHeader>
 
-<form {{on "submit" (perform this.save)}} {{did-insert this.setIssuer @model}}>
+<form {{on "submit" (perform this.save)}}>
   <div class="box is-sideless is-fullwidth is-bottomless">
     <MessageError @errorMessage={{this.errorBanner}} class="has-top-margin-s" />
     {{! name field }}
@@ -60,6 +60,7 @@
       @attr={{get @model.formFields "2"}}
       @model={{@model}}
       @modelValidations={{this.modelValidations}}
+      @labelClass="is-label"
     />
   </div>
   {{! RADIO CARD + SEARCH SELECT }}
@@ -67,7 +68,6 @@
     <h4 class="title is-4">Allowed applications</h4>
     <div class="is-flex-row">
       <RadioCard
-        data-test-oidc-radio="allow-all"
         @title="Allow every application to use"
         @description="All applications can use this provider for authentication requests."
         @icon="globe"
@@ -76,7 +76,6 @@
         @onChange={{this.handleClientSelection}}
       />
       <RadioCard
-        data-test-oidc-radio="limited"
         @title="Limit access to selected application"
         @description="Only selected applications can use this provider for authentication requests."
         @icon="globe-private"
@@ -88,7 +87,7 @@
     {{#if (eq this.radioCardGroupValue "limited")}}
       <SearchSelect
         @id="allowedClientIds"
-        @label="Application name"
+        @subLabel="Application name"
         @models={{array "oidc/client"}}
         @inputValue={{@model.allowedClientIds}}
         @onChange={{this.handleClientSelection}}
@@ -96,7 +95,7 @@
         @fallbackComponent="string-list"
         @passObject={{true}}
         @objectKeys={{array "clientId"}}
-        @renderInfoTooltip={{this.renderInfoTooltip}}
+        @renderInfoTooltip={{true}}
       />
     {{/if}}
   </div>
diff --git a/ui/app/templates/components/oidc/scope-form.hbs b/ui/app/templates/components/oidc/scope-form.hbs
index cacff831dd29f..108aa8e45b73e 100644
--- a/ui/app/templates/components/oidc/scope-form.hbs
+++ b/ui/app/templates/components/oidc/scope-form.hbs
@@ -100,7 +100,7 @@
     {{/if}}
     <p class="has-top-margin-m">
       The full list of template parameters can be found
-      <DocLink @path="/vault/docs/concepts/oidc-provider#scopes">
+      <DocLink @path="/docs/concepts/oidc-provider#scopes">
         here.
       </DocLink>
     </p>
diff --git a/ui/app/templates/components/pgp-file.hbs b/ui/app/templates/components/pgp-file.hbs
index 3e7c270cdb3c0..4e4e527a6e2f2 100644
--- a/ui/app/templates/components/pgp-file.hbs
+++ b/ui/app/templates/components/pgp-file.hbs
@@ -45,32 +45,28 @@
   {{else}}
     <div class="control is-expanded">
       <div class="file">
-        <div class="file-label is-fullwidth">
-          <input
-            id="file-input"
-            class="file-input"
-            type="file"
-            onchange={{action "pickedFile"}}
-            data-test-pgp-file-input={{true}}
-          />
+        <label class="file-label is-fullwidth">
+          <input class="file-input" type="file" onchange={{action "pickedFile"}} data-test-pgp-file-input={{true}} />
           <span class="file-cta is-fullwidth">
             <span class="file-icon has-text-grey-dark">
               <Icon @name="file" />
             </span>
-            <label for="file-input" class="file-label has-text-grey-dark" data-test-pgp-file-input-label={{true}}>
-              {{#if this.key.filename}}
-                {{this.key.filename}}
+            <span class="file-label has-text-grey-dark" data-test-pgp-file-input-label={{true}}>
+              {{#if this.key.fileName}}
+                {{this.key.fileName}}
               {{else}}
                 Choose a file&hellip;
               {{/if}}
-            </label>
-            {{#if this.key.filename}}
+            </span>
+            {{#if this.key.fileName}}
+              {{! template-lint-configure no-nested-interactive "warn" }}
               <button type="button" class="file-delete-button" {{action "clearKey"}} data-test-pgp-clear={{true}}>
                 <Icon @name="x" aria-label="Close" />
               </button>
+              {{! template-lint-configure no-nested-interactive "on" }}
             {{/if}}
           </span>
-        </div>
+        </label>
       </div>
     </div>
     <p class="help has-text-grey">
diff --git a/ui/app/templates/components/pki/config-pki-ca.hbs b/ui/app/templates/components/pki/config-pki-ca.hbs
new file mode 100644
index 0000000000000..24735e76b3b17
--- /dev/null
+++ b/ui/app/templates/components/pki/config-pki-ca.hbs
@@ -0,0 +1,260 @@
+{{#if this.replaceCA}}
+  <MessageError @model={{this.model}} />
+  <h2 data-test-title class="title is-3">
+    {{#if this.needsConfig}}
+      Configure CA Certificate
+    {{else}}
+      {{#if this.model.certificate}}
+        Generated Certificate
+      {{else}}
+        Add CA Certificate
+      {{/if}}
+    {{/if}}
+  </h2>
+  {{#if (or this.model.certificate this.model.csr)}}
+    {{#if (eq this.model.canParse false)}}
+      <AlertBanner
+        @type="info"
+        @message="There was an error parsing the certificate's metadata. As a result, Vault cannot display the issue and expiration dates. This will not interfere with the certificate's functionality."
+        data-test-warning
+      />
+    {{/if}}
+    {{#each this.model.attrs as |attr|}}
+      {{#if (and attr.options.masked (get this.model attr.name))}}
+        <InfoTableRow
+          data-test-table-row
+          @label={{capitalize (or attr.options.label (humanize (dasherize attr.name)))}}
+          @value={{get this.model attr.name}}
+        >
+          <MaskedInput @value={{get this.model attr.name}} @displayOnly={{true}} @allowCopy={{true}} />
+        </InfoTableRow>
+      {{else if (and (get this.model attr.name) (or (eq attr.name "issueDate") (eq attr.name "expiryDate")))}}
+        <InfoTableRow
+          data-test-table-row={{this.value}}
+          @label={{capitalize (or attr.options.label (humanize (dasherize attr.name)))}}
+          @value={{date-format (get this.model attr.name) "MMM dd, yyyy hh:mm:ss a" isFormatted=true}}
+        />
+      {{else}}
+        <InfoTableRow
+          data-test-table-row={{this.value}}
+          @label={{capitalize (or attr.options.label (humanize (dasherize attr.name)))}}
+          @value={{get this.model attr.name}}
+        />
+      {{/if}}
+    {{/each}}
+    <div class="field is-grouped box is-fullwidth is-bottomless">
+      <div class="control">
+        <CopyButton
+          @clipboardText={{or this.model.certificate this.model.csr}}
+          @class="button"
+          @buttonType="button"
+          @success={{action (set-flash-message (concat (if this.model.certificate "Certificate" "CSR") " copied!"))}}
+        >
+          Copy
+          {{if this.model.certificate "Certificate" "CSR"}}
+        </CopyButton>
+      </div>
+      <div class="control">
+        <button data-test-back-button {{action "refresh"}} type="button" class="button">
+          Back
+        </button>
+      </div>
+    </div>
+  {{else}}
+    <form {{action "saveCA" on="submit"}} data-test-generate-root-cert="true">
+      <NamespaceReminder @mode="save" @noun="PKI change" />
+      <FormFieldGroupsLoop @model={{this.model}} @mode={{this.mode}} />
+      <div class="field is-grouped is-grouped-split box is-fullwidth is-bottomless">
+        <div class="field is-grouped">
+          <div class="control">
+            <button
+              data-test-submit
+              type="submit"
+              class="button is-primary {{if this.loading 'is-loading'}}"
+              disabled={{this.loading}}
+            >
+              Save
+            </button>
+          </div>
+          <div class="control">
+            <button data-test-back-button {{action "toggleReplaceCA"}} type="button" class="button">
+              Cancel
+            </button>
+          </div>
+        </div>
+      </div>
+    </form>
+  {{/if}}
+{{else if this.signIntermediate}}
+  {{#if (or this.model.certificate)}}
+    <AlertBanner
+      @type="warning"
+      @message="If using this for an Intermediate CA in Vault, copy the certificate below and write it to the PKI mount being used as an intermediate using the `Set signed Intermediate` endpoint."
+      data-test-warning
+    />
+    {{#each this.model.attrs as |attr|}}
+      {{#if (and attr.options.masked (get this.model attr.name))}}
+        <InfoTableRow
+          data-test-table-row={{this.value}}
+          @label={{capitalize (or attr.options.label (humanize (dasherize attr.name)))}}
+          @value={{get this.model attr.name}}
+        >
+          <MaskedInput @value={{get this.model attr.name}} @displayOnly={{true}} @allowCopy={{true}} />
+        </InfoTableRow>
+      {{else if (and (get this.model attr.name) (or (eq attr.name "issueDate") (eq attr.name "expiryDate")))}}
+        <InfoTableRow
+          data-test-table-row={{this.value}}
+          @label={{capitalize (or attr.options.label (humanize (dasherize attr.name)))}}
+          @value={{date-format (get this.model attr.name) "MMM dd, yyyy hh:mm:ss a" isFormatted=true}}
+        />
+      {{else}}
+        <InfoTableRow
+          data-test-table-row={{this.value}}
+          @label={{capitalize (or attr.options.label (humanize (dasherize attr.name)))}}
+          @value={{get this.model attr.name}}
+        />
+      {{/if}}
+    {{/each}}
+    <div class="field is-grouped box is-fullwidth is-bottomless">
+      <div class="control">
+        <CopyButton
+          @clipboardText={{this.model.certificate}}
+          @class="button"
+          @buttonType="button"
+          @success={{action (set-flash-message "Certificate copied!")}}
+        >
+          Copy Certificate
+        </CopyButton>
+      </div>
+      <div class="control">
+        <button data-test-back-button {{action "refresh"}} type="button" class="button">
+          Back
+        </button>
+      </div>
+    </div>
+  {{else}}
+    <h2 data-test-title class="title is-3">Sign intermediate</h2>
+    <NamespaceReminder @mode="save" @noun="PKI change" />
+    <MessageError @model={{this.model}} @errors={{this.errors}} />
+    <form {{action "saveCA" on="submit"}} data-test-sign-intermediate-form="true">
+      <FormFieldGroupsLoop @model={{this.model}} @mode={{this.mode}} />
+      <div class="field is-grouped box is-fullwidth is-bottomless">
+        <div class="control">
+          <button
+            data-test-submit
+            type="submit"
+            class="button is-primary {{if this.loading 'is-loading'}}"
+            disabled={{this.loading}}
+          >
+            Save
+          </button>
+        </div>
+        <div class="control">
+          <button {{action "toggleVal" "signIntermediate" false}} type="button" class="button">
+            Cancel
+          </button>
+        </div>
+      </div>
+    </form>
+  {{/if}}
+{{else if this.setSignedIntermediate}}
+  <h2 data-test-title class="title is-3">Set signed intermediate</h2>
+  <NamespaceReminder @mode="save" @noun="PKI change" />
+  <MessageError @model={{this.model}} />
+  <p class="has-text-grey-dark">
+    Submit a signed CA certificate corresponding to a generated private key.
+  </p>
+  <form {{action "saveCA" "setSignedIntermediate" on="submit"}} data-test-set-signed-intermediate-form="true">
+    <div class="field">
+      <label for="certificate" class="is-label">
+        Signed Intermediate Certificate
+      </label>
+      <div class="control">
+        <Textarea
+          data-test-signed-intermediate
+          class="textarea"
+          id="certificate"
+          name="certificate"
+          @value={{this.model.certificate}}
+        />
+      </div>
+    </div>
+    <div class="field is-grouped box is-fullwidth is-bottomless">
+      <div class="control">
+        <button
+          data-test-submit
+          type="submit"
+          class="button is-primary {{if this.loading 'is-loading'}}"
+          disabled={{this.loading}}
+        >
+          Save
+        </button>
+      </div>
+      <div class="control">
+        <button data-test-back-button {{action "toggleVal" "setSignedIntermediate" false}} type="button" class="button">
+          Cancel
+        </button>
+      </div>
+    </div>
+  </form>
+{{else}}
+  <p class="has-text-grey-dark">
+    This is the default CA certificate used in Vault. It is not used for self-signed certificates or if you have a signed
+    intermediate CA certificate with a generated key.
+  </p>
+  {{#each this.downloadHrefs as |dl|}}
+    <div class="box is-shadowless is-marginless is-fullwidth has-slim-padding">
+      <a data-test-ca-download-link href={{dl.url}} download={{dl.name}}>
+        {{dl.display}}
+      </a>
+    </div>
+  {{/each}}
+
+  <div class="field is-grouped box is-fullwidth is-shadowless">
+    <div class="control">
+      <button data-test-go-replace-ca type="button" {{action "toggleReplaceCA"}} class="button">
+        {{#if this.needsConfig}}
+          Configure CA
+        {{else}}
+          Add CA
+        {{/if}}
+      </button>
+    </div>
+    {{#if this.config.pem}}
+      <div class="control">
+        <button data-test-go-sign-intermediate type="button" {{action "toggleVal" "signIntermediate"}} class="button">
+          Sign intermediate
+        </button>
+      </div>
+    {{/if}}
+    <div class="control">
+      <button
+        data-test-go-set-signed-intermediate
+        type="button"
+        {{action "toggleVal" "setSignedIntermediate"}}
+        class="button"
+      >
+        Set signed intermediate
+      </button>
+    </div>
+    {{#unless this.needsConfig}}
+      <div class="control">
+        <ToolTip @verticalPosition="above" @horizontalPosition="center" as |T|>
+          <T.Trigger data-test-tooltip-trigger tabindex="-1">
+            <button type="button" class="button is-primary" disabled={{true}}>
+              Delete
+            </button>
+          </T.Trigger>
+          <T.Content @defaultClass="tool-tip smaller-font">
+            <div class="box" data-test-hover-copy-tooltip-text>
+              Deleting a CA is only available via the CLI and API.
+              <DocLink @path="/api-docs/secret/pki#delete-issuer" class="doc-link-subtle">
+                Learn more
+              </DocLink>
+            </div>
+          </T.Content>
+        </ToolTip>
+      </div>
+    {{/unless}}
+  </div>
+{{/if}}
\ No newline at end of file
diff --git a/ui/app/templates/components/pki/config-pki.hbs b/ui/app/templates/components/pki/config-pki.hbs
new file mode 100644
index 0000000000000..50eb0a182957b
--- /dev/null
+++ b/ui/app/templates/components/pki/config-pki.hbs
@@ -0,0 +1,46 @@
+<NamespaceReminder @mode="save" @noun="PKI change" />
+
+{{#if (eq this.section "tidy")}}
+  <p class="has-text-grey-dark" data-test-text="true">
+    You can tidy up the backend storage and/or CRL by removing certificates that have expired and are past a certain buffer
+    period beyond their expiration time.
+  </p>
+{{else if (eq this.section "crl")}}
+  <h2 class="title is-5" data-test-title="true">
+    Certificate Revocation List (CRL) config
+  </h2>
+  <p class="has-text-grey-dark" data-test-text="true">
+    Set the duration for which the generated CRL should be marked valid.
+  </p>
+{{/if}}
+
+<MessageError @model={{this.config}} @errors={{this.errors}} />
+<form {{action "save" this.section on="submit"}} class="box is-shadowless is-marginless is-fullwidth has-slim-padding">
+  {{#if (eq this.section "crl")}}
+    <TtlPicker
+      data-test-input="expiry"
+      @onChange={{action "handleCrlTtl"}}
+      @label={{if (get this.config "disable") "CRL building disabled" "CRL building enabled"}}
+      @helperTextDisabled="The CRL will not be built."
+      @helperTextEnabled="The CRL will expire after"
+      @initialValue={{get this.config "expiry"}}
+      @initialEnabled={{not (get this.config "disable")}}
+    />
+  {{else}}
+    {{#each (get this.config (concat this.section "Attrs")) as |attr|}}
+      <FormField @attr={{attr}} @model={{this.config}} @data-test-field={{attr.name}} />
+    {{/each}}
+  {{/if}}
+  <div class="field has-top-margin-m is-grouped box is-fullwidth is-bottomless">
+    <div class="control">
+      <button
+        data-test-submit
+        type="submit"
+        class="button is-primary {{if this.loading 'is-loading'}}"
+        disabled={{this.loading}}
+      >
+        Save
+      </button>
+    </div>
+  </div>
+</form>
\ No newline at end of file
diff --git a/ui/app/templates/components/pki/configure-pki-secret.hbs b/ui/app/templates/components/pki/configure-pki-secret.hbs
new file mode 100644
index 0000000000000..17008d88eedfc
--- /dev/null
+++ b/ui/app/templates/components/pki/configure-pki-secret.hbs
@@ -0,0 +1,19 @@
+<div class="tabs-container box is-bottomless is-fullwidth is-paddingless">
+  <nav class="tabs">
+    <ul>
+      {{#each (array "cert" "urls" "crl" "tidy") as |section|}}
+        <LinkTo @route="vault.cluster.settings.configure-secret-backend.section" @model={{section}}>
+          {{#if (eq section "cert")}}
+            CA certificate
+          {{else if (eq section "urls")}}
+            URLs
+          {{else if (eq section "crl")}}
+            CRL
+          {{else if (eq section "tidy")}}
+            Tidy
+          {{/if}}
+        </LinkTo>
+      {{/each}}
+    </ul>
+  </nav>
+</div>
\ No newline at end of file
diff --git a/ui/app/templates/components/pki/pki-cert-popup.hbs b/ui/app/templates/components/pki/pki-cert-popup.hbs
new file mode 100644
index 0000000000000..1c2d400fc0218
--- /dev/null
+++ b/ui/app/templates/components/pki/pki-cert-popup.hbs
@@ -0,0 +1,25 @@
+<PopupMenu @name="role-aws-nav" @contentClass="is-wide">
+  <nav class="menu">
+    <ul class="menu-list">
+      <li class="action">
+        <LinkTo @route="vault.cluster.secrets.backend.show" @model={{@item.idForNav}} data-test-pki-cert-link="show">
+          Details
+        </LinkTo>
+      </li>
+      {{#if @item.canRevoke}}
+        <li class="action">
+          <ConfirmAction
+            @buttonClasses="link is-destroy"
+            @onConfirmAction={{fn this.delete @item}}
+            @confirmTitle="Revoke this cert?"
+            @confirmMessage="Any services using this cert may be affected."
+            @confirmButtonText="Revoke"
+            data-test-cert-revoke-delete={{@item.id}}
+          >
+            Revoke
+          </ConfirmAction>
+        </li>
+      {{/if}}
+    </ul>
+  </nav>
+</PopupMenu>
\ No newline at end of file
diff --git a/ui/app/templates/components/pki/pki-cert-show.hbs b/ui/app/templates/components/pki/pki-cert-show.hbs
new file mode 100644
index 0000000000000..d08e2732dde12
--- /dev/null
+++ b/ui/app/templates/components/pki/pki-cert-show.hbs
@@ -0,0 +1,94 @@
+<PageHeader as |p|>
+  <p.top>
+    <KeyValueHeader
+      @baseKey={{hash display=this.model.id id=this.model.idForNav}}
+      @path="vault.cluster.secrets.backend.list"
+      @mode={{this.mode}}
+      @root={{this.root}}
+      @showCurrent={{true}}
+    />
+  </p.top>
+  <p.levelLeft>
+    <h1 class="title is-3" data-test-secret-header="true">
+      PKI Certificate
+    </h1>
+  </p.levelLeft>
+</PageHeader>
+{{#if (eq this.model.canParse false)}}
+  <AlertBanner
+    @type="info"
+    @message="There was an error parsing the certificate's metadata. As a result, Vault cannot display the common name or the issue and expiration dates. This will not interfere with the certificate's functionality."
+    data-test-warning
+  />
+{{/if}}
+<div class="box is-fullwidth is-sideless is-paddingless is-marginless">
+  <MessageError @model={{this.model}} />
+  {{#each this.model.attrs as |attr|}}
+    {{#if (eq attr.type "object")}}
+      <InfoTableRow
+        data-test-table-row
+        @label={{capitalize (or attr.options.label (humanize (dasherize attr.name)))}}
+        @value={{stringify (get this.model attr.name)}}
+      />
+    {{else}}
+      {{#if (and attr.options.masked (get this.model attr.name))}}
+        <InfoTableRow
+          data-test-table-row
+          @label={{capitalize (or attr.options.label (humanize (dasherize attr.name)))}}
+          @value={{get this.model attr.name}}
+        >
+          <MaskedInput @value={{get this.model attr.name}} @displayOnly={{true}} @allowCopy={{true}} />
+        </InfoTableRow>
+      {{else if (and (get this.model attr.name) (or (eq attr.name "issueDate") (eq attr.name "expiryDate")))}}
+        <InfoTableRow
+          data-test-table-row
+          @label={{capitalize (or attr.options.label (humanize (dasherize attr.name)))}}
+          @value={{date-format (get this.model attr.name) "MMM dd, yyyy hh:mm:ss a" isFormatted=true}}
+        />
+      {{else if (eq attr.name "revocationTime")}}
+        <InfoTableRow
+          data-test-table-row
+          @label={{capitalize (or attr.options.label (humanize (dasherize attr.name)))}}
+          @value={{date-format (get this.model attr.name) "MMM dd, yyyy hh:mm:ss a"}}
+        />
+      {{else}}
+        <InfoTableRow
+          data-test-table-row
+          @label={{capitalize (or attr.options.label (humanize (dasherize attr.name)))}}
+          @value={{get this.model attr.name}}
+        />
+      {{/if}}
+    {{/if}}
+  {{/each}}
+</div>
+
+<div class="field is-grouped is-grouped-split box is-fullwidth is-bottomless">
+  <div class="field is-grouped">
+    <div class="control">
+      <CopyButton
+        @clipboardText={{this.model.toCreds}}
+        @class="button is-primary"
+        @buttonType="button"
+        @success={{action (set-flash-message "Credentials copied!")}}
+      >
+        Copy credentials
+      </CopyButton>
+    </div>
+    <div class="control">
+      <LinkTo @route="vault.cluster.secrets.backend.list-root" @query={{hash tab="cert"}} class="button">
+        Back
+      </LinkTo>
+    </div>
+  </div>
+  {{#if (and (not this.model.revocationTime) this.model.canRevoke)}}
+    <ConfirmAction
+      @buttonClasses="button"
+      @onConfirmAction={{action "delete"}}
+      @confirmTitle="Revoke this cert?"
+      @confirmMessage="Any services using this cert may be affected."
+      @confirmButtonText="Revoke"
+    >
+      Revoke
+    </ConfirmAction>
+  {{/if}}
+</div>
\ No newline at end of file
diff --git a/ui/app/templates/components/pki/role-pki-edit.hbs b/ui/app/templates/components/pki/role-pki-edit.hbs
new file mode 100644
index 0000000000000..b3404ae8c3f33
--- /dev/null
+++ b/ui/app/templates/components/pki/role-pki-edit.hbs
@@ -0,0 +1,113 @@
+<PageHeader as |p|>
+  <p.top>
+    <KeyValueHeader
+      @baseKey={{this.model}}
+      @path="vault.cluster.secrets.backend.list"
+      @mode={{this.mode}}
+      @root={{this.root}}
+      @showCurrent={{true}}
+    />
+  </p.top>
+  <p.levelLeft>
+    <h1 class="title is-3" data-test-secret-header="true">
+      {{#if (eq this.mode "create")}}
+        Create a PKI Role
+      {{else if (eq this.mode "edit")}}
+        Edit PKI Role
+      {{else}}
+        PKI Role
+        <code>{{this.model.id}}</code>
+      {{/if}}
+    </h1>
+  </p.levelLeft>
+</PageHeader>
+
+{{#if (eq this.mode "show")}}
+  <Toolbar>
+    <ToolbarActions>
+      {{#if this.model.canDelete}}
+        <ConfirmAction @buttonClasses="toolbar-link" @onConfirmAction={{action "delete"}} data-test-role-delete="true">
+          Delete role
+        </ConfirmAction>
+        <div class="toolbar-separator"></div>
+      {{/if}}
+      {{#if this.model.canGenerate}}
+        <ToolbarSecretLink
+          @secret={{this.model.id}}
+          @mode="credentials"
+          @queryParams={{query-params action="issue"}}
+          data-test-credentials-link={{true}}
+        >
+          Generate Certificate
+        </ToolbarSecretLink>
+      {{/if}}
+      {{#if this.model.canSign}}
+        <ToolbarSecretLink
+          @secret={{this.model.id}}
+          @mode="credentials"
+          @queryParams={{query-params action="sign"}}
+          data-test-sign-link={{true}}
+        >
+          Sign Certificate
+        </ToolbarSecretLink>
+      {{/if}}
+      {{#if this.model.canEdit}}
+        <ToolbarSecretLink @secret={{this.model.id}} @mode="edit" data-test-edit-link={{true}} @replace={{true}}>
+          Edit role
+        </ToolbarSecretLink>
+      {{/if}}
+    </ToolbarActions>
+  </Toolbar>
+{{/if}}
+{{#if (or (eq this.mode "edit") (eq this.mode "create"))}}
+  <form onsubmit={{action "createOrUpdate" "create"}}>
+    <div class="box is-sideless is-fullwidth is-marginless">
+      <MessageError @model={{this.model}} />
+      <NamespaceReminder @mode={{this.mode}} @noun="PKI role" />
+      <FormFieldGroupsLoop @model={{this.model}} @mode={{this.mode}} />
+    </div>
+    <div class="field is-grouped-split box is-fullwidth is-bottomless">
+      <div class="control">
+        <button type="submit" disabled={{this.buttonDisabled}} class="button is-primary" data-test-role-create={{true}}>
+          {{#if (eq this.mode "create")}}
+            Create role
+          {{else if (eq this.mode "edit")}}
+            Save
+          {{/if}}
+        </button>
+        <SecretLink @mode={{if (eq this.mode "create") "list" "show"}} class="button" @secret={{this.model.id}}>
+          Cancel
+        </SecretLink>
+      </div>
+    </div>
+  </form>
+{{else}}
+  <div class="box is-sideless is-fullwidth is-marginless">
+    {{#each this.model.fieldGroups as |fieldGroup|}}
+      {{#each-in fieldGroup as |group fields|}}
+        {{#if (or (eq group "default") (eq group "Options"))}}
+          {{#each fields as |attr|}}
+            <InfoTableRow
+              @alwaysRender={{true}}
+              @label={{capitalize (or attr.options.label (humanize (dasherize attr.name)))}}
+              @value={{get this.model attr.name}}
+            />
+          {{/each}}
+        {{else}}
+          <div class="box is-sideless is-fullwidth is-marginless">
+            <h2 class="title is-5">
+              {{group}}
+            </h2>
+            {{#each fields as |attr|}}
+              <InfoTableRow
+                @alwaysRender={{true}}
+                @label={{capitalize (or attr.options.label (humanize (dasherize attr.name)))}}
+                @value={{get this.model attr.name}}
+              />
+            {{/each}}
+          </div>
+        {{/if}}
+      {{/each-in}}
+    {{/each}}
+  </div>
+{{/if}}
\ No newline at end of file
diff --git a/ui/lib/core/addon/components/radio-card.hbs b/ui/app/templates/components/radio-card.hbs
similarity index 82%
rename from ui/lib/core/addon/components/radio-card.hbs
rename to ui/app/templates/components/radio-card.hbs
index 3c4213c06b6df..df29246c3ca99 100644
--- a/ui/lib/core/addon/components/radio-card.hbs
+++ b/ui/app/templates/components/radio-card.hbs
@@ -1,16 +1,16 @@
 <label
-  for={{dasherize (or @title @value)}}
+  for={{dasherize @value}}
   class="radio-card {{if (eq @value @groupValue) 'is-selected'}} {{if @disabled 'is-disabled'}}"
   ...attributes
 >
   <ToolTip @verticalPosition="above" @horizontalPosition="center" as |T|>
-    <T.Trigger tabindex="-1" class="radio-card-container">
+    <T.Trigger tabindex="-1">
       {{#if (has-block)}}
         {{yield}}
       {{else}}
         <div class="radio-card-row">
           <div>
-            <Icon @name={{@icon}} @size="24" class={{or @iconClass "has-text-grey-light"}} />
+            <Icon @name={{@icon}} @size="24" class="has-text-grey-light" />
           </div>
           <div class="has-left-margin-s">
             <h5 class="radio-card-message-title">
@@ -24,7 +24,7 @@
       {{/if}}
       <div class="radio-card-radio-row">
         <RadioButton
-          id={{dasherize (or @title @value)}}
+          id={{dasherize @value}}
           name="config-mode"
           class="radio"
           @disabled={{@disabled}}
diff --git a/ui/app/templates/components/raft-join.hbs b/ui/app/templates/components/raft-join.hbs
index c00409e422a37..e55376aa4ced3 100644
--- a/ui/app/templates/components/raft-join.hbs
+++ b/ui/app/templates/components/raft-join.hbs
@@ -1,4 +1,11 @@
-<AlertBanner @type="warning" class="is-marginless" @title="Vault is sealed" />
+<AlertBanner @type="warning" @message="Vault is sealed" @yieldWithoutColumn={{true}} class="is-marginless">
+  <div class="is-flex is-flex-v-centered">
+    <div>
+      <span class="message-title">Warning</span>
+      Vault is sealed
+    </div>
+  </div>
+</AlertBanner>
 {{#if this.showJoinForm}}
   <div class="box is-marginless is-shadowless">
     <h2 class="title is-5" data-test-join-header>
diff --git a/ui/app/templates/components/raft-storage-overview.hbs b/ui/app/templates/components/raft-storage-overview.hbs
index b6bd618f32c03..5b4db33d9a01e 100644
--- a/ui/app/templates/components/raft-storage-overview.hbs
+++ b/ui/app/templates/components/raft-storage-overview.hbs
@@ -17,17 +17,16 @@
         <Chevron @direction="down" @isButton={{true}} />
       </D.Trigger>
       <D.Content @defaultClass="popup-menu-content">
-        <nav class="box menu" aria-label="snapshots actions">
+        <nav class="box menu">
           <ul class="menu-list">
             <li class="action">
               {{#if this.useServiceWorker}}
-                <ExternalLink
-                  @href="/v1/sys/storage/raft/snapshot"
-                  @sameTab={{true}}
+                <a
+                  href="/v1/sys/storage/raft/snapshot"
                   onclick={{queue (action "downloadViaServiceWorker") (action D.actions.close)}}
                 >
                   Download
-                </ExternalLink>
+                </a>
               {{else}}
                 <button
                   type="button"
@@ -79,7 +78,7 @@
         <td class="middle no-padding has-text-right">
           <PopupMenu>
             <Confirm as |c|>
-              <nav aria-label="remove peer">
+              <nav>
                 <ul>
                   <li class="action">
                     <c.Message
diff --git a/ui/app/templates/components/secret-create-or-update.hbs b/ui/app/templates/components/secret-create-or-update.hbs
index 28a8a635edaa0..14037fef2806c 100644
--- a/ui/app/templates/components/secret-create-or-update.hbs
+++ b/ui/app/templates/components/secret-create-or-update.hbs
@@ -1,10 +1,5 @@
 {{#if (eq @mode "create")}}
-  <form
-    class={{if @showAdvancedMode "advanced-edit" "simple-edit"}}
-    onsubmit={{action "createOrUpdateKey" @mode}}
-    aria-label="secret create form"
-    {{did-insert this.setup @secretData @model @mode}}
-  >
+  <form class={{if @showAdvancedMode "advanced-edit" "simple-edit"}} onsubmit={{action "createOrUpdateKey" @mode}}>
     <div class="field box is-fullwidth is-sideless is-marginless">
       <NamespaceReminder @mode="create" @noun="secret" />
       <MessageError @model={{@modelForData}} @errorMessage={{this.error}} />
@@ -29,7 +24,7 @@
         />
       {{/if}}
       {{#if @modelForData.isFolder}}
-        <p class="help has-text-danger">
+        <p class="help is-danger">
           The secret path may not end in
           <code>/</code>
         </p>
@@ -75,7 +70,8 @@
             <div class="column info-table-row-edit">
               <MaskedInput
                 @name={{secret.name}}
-                @onChange={{fn this.handleMaskedInputChange secret index}}
+                @onKeyDown={{action "handleKeyDown"}}
+                @onChange={{action "handleChange"}}
                 @value={{secret.value}}
                 data-test-secret-value="true"
               />
@@ -153,11 +149,7 @@
 
 {{#if (eq @mode "edit")}}
   {{! no metadata option because metadata is version agnostic }}
-  <form
-    onsubmit={{action "createOrUpdateKey" "edit"}}
-    aria-label="secret edit form"
-    {{did-insert this.setup @secretData @model @mode}}
-  >
+  <form onsubmit={{action "createOrUpdateKey" "edit"}}>
     <div class="box is-sideless is-fullwidth is-marginless padding-top">
       <MessageError @model={{@modelForData}} @errorMessage={{this.error}} />
       {{#if (eq @canReadSecretData false)}}
@@ -211,7 +203,8 @@
               <div class="column">
                 <MaskedInput
                   @name={{secret.name}}
-                  @onChange={{fn this.handleMaskedInputChange secret index}}
+                  @onKeyDown={{action "handleKeyDown"}}
+                  @onChange={{action "handleChange"}}
                   @value={{secret.value}}
                   data-test-secret-value="true"
                 />
@@ -255,7 +248,12 @@
           </button>
         </div>
         <div class="control">
-          <SecretLink @mode="show" @secret={{@model.id}} @queryParams={{hash version=@modelForData.version}} class="button">
+          <SecretLink
+            @mode="show"
+            @secret={{@model.id}}
+            @queryParams={{query-params version=@modelForData.version}}
+            class="button"
+          >
             Cancel
           </SecretLink>
         </div>
diff --git a/ui/app/templates/components/secret-delete-menu.hbs b/ui/app/templates/components/secret-delete-menu.hbs
index f9afe3fe4f62d..11b1fda7fd8d2 100644
--- a/ui/app/templates/components/secret-delete-menu.hbs
+++ b/ui/app/templates/components/secret-delete-menu.hbs
@@ -119,7 +119,7 @@
     <footer class="modal-card-foot modal-card-foot-outlined">
       <button
         type="button"
-        class="button is-danger-outlined"
+        class="button has-text-danger"
         {{on "click" (fn this.handleDelete this.deleteType (action (mut this.showDeleteModal) false))}}
         disabled={{if this.deleteType false true}}
         data-test-modal-delete
diff --git a/ui/app/templates/components/secret-edit-metadata.hbs b/ui/app/templates/components/secret-edit-metadata.hbs
index feb15e45f63bb..1b1f695a18002 100644
--- a/ui/app/templates/components/secret-edit-metadata.hbs
+++ b/ui/app/templates/components/secret-edit-metadata.hbs
@@ -18,7 +18,7 @@
           @modelValidations={{this.modelValidations}}
           @mode={{@mode}}
         />
-        <label class="title has-top-padding-m is-{{if (eq @mode 'create') '5' '4'}}">
+        <label class={{if (eq @mode "create") "title has-padding-top is-5" "title has-padding-top is-4"}}>
           Additional options
         </label>
       {{/if}}
diff --git a/ui/app/templates/components/secret-edit-toolbar.hbs b/ui/app/templates/components/secret-edit-toolbar.hbs
index 574871772fec0..80eb99556d3c0 100644
--- a/ui/app/templates/components/secret-edit-toolbar.hbs
+++ b/ui/app/templates/components/secret-edit-toolbar.hbs
@@ -71,6 +71,8 @@
                       @displayOnly={{true}}
                       @allowCopy={{true}}
                       @value={{this.wrappedData}}
+                      @success={{action "handleCopySuccess"}}
+                      @error={{action "handleCopyError"}}
                     />
                   {{/if}}
                 </li>
@@ -90,17 +92,19 @@
         {{#if @isV2}}
           <ToolbarLink
             {{! Always create new version from latest if no metadata read access }}
-            @route={{targetRoute}}
-            @model={{@model.id}}
-            @query={{hash version=(if @model.canReadMetadata @modelForData.version "")}}
+            @params={{array
+              targetRoute
+              @model.id
+              (query-params version=(if @model.canReadMetadata @modelForData.version ""))
+            }}
+            data-test-secret-edit="true"
             @replace={{true}}
             @type="add"
-            data-test-secret-edit="true"
           >
             Create new version
           </ToolbarLink>
         {{else}}
-          <ToolbarLink @route={{targetRoute}} @model={{@model.id}} @replace={{true}} data-test-secret-edit="true">
+          <ToolbarLink @params={{array targetRoute @model.id}} data-test-secret-edit="true" @replace={{true}}>
             Edit secret
           </ToolbarLink>
         {{/if}}
diff --git a/ui/app/templates/components/secret-edit.hbs b/ui/app/templates/components/secret-edit.hbs
index 78596e897e300..e55d46fb2eb42 100644
--- a/ui/app/templates/components/secret-edit.hbs
+++ b/ui/app/templates/components/secret-edit.hbs
@@ -1,85 +1,81 @@
-<div {{did-insert this.createKvData @model}}>
-  <PageHeader as |p|>
-    <p.top>
-      <KeyValueHeader
-        @baseKey={{@baseKey}}
-        @path="vault.cluster.secrets.backend.list"
-        @mode={{@mode}}
-        @root={{@root}}
-        @showCurrent={{true}}
-      />
-    </p.top>
-    <p.levelLeft>
-      <h1 class="title is-3">
-        {{#if (eq @mode "create")}}
-          Create secret
-        {{else if (and this.isV2 (eq @mode "edit"))}}
-          Create new version
-        {{else if (eq @mode "edit")}}
-          Edit secret
-        {{else}}
-          {{@key.id}}
-        {{/if}}
-      </h1>
-    </p.levelLeft>
-  </PageHeader>
-  {{! tabs for show only }}
-  {{#if (eq @mode "show")}}
-    <div class="tabs-container box is-bottomless is-marginless is-fullwidth is-paddingless">
-      <nav class="tabs">
-        <ul>
-          <LinkTo @route="vault.cluster.secrets.backend.show" @model={{@key.id}} data-test-secret-tab>
-            Secret
-          </LinkTo>
-          {{! must have read access to /metadata see tab or update to update metadata}}
-          {{#if (or this.canReadSecretMetadata this.canUpdateSecretMetadata)}}
-            <LinkTo @route="vault.cluster.secrets.backend.metadata" @model={{@key.id}} data-test-secret-metadata-tab>
-              Metadata
-            </LinkTo>
-          {{/if}}
-        </ul>
-      </nav>
-    </div>
-  {{/if}}
-
-  {{#if (and @model (not-eq this.secretData null))}}
-    <SecretEditToolbar
+<PageHeader as |p|>
+  <p.top>
+    <KeyValueHeader
+      @baseKey={{@baseKey}}
+      @path="vault.cluster.secrets.backend.list"
       @mode={{@mode}}
-      @model={{@model}}
-      @isV2={{this.isV2}}
-      @isWriteWithoutRead={{this.isWriteWithoutRead}}
-      @secretDataIsAdvanced={{this.secretDataIsAdvanced}}
-      @showAdvancedMode={{this.showAdvancedMode}}
-      @modelForData={{this.modelForData}}
-      @canUpdateSecretData={{this.canUpdateSecretData}}
-      @canReadSecretMetadata={{this.canReadSecretMetadata}}
-      @codemirrorString={{this.codemirrorString}}
-      @editActions={{hash toggleAdvanced=(action "toggleAdvanced") refresh=(action "refresh")}}
+      @root={{@root}}
+      @showCurrent={{true}}
     />
+  </p.top>
+  <p.levelLeft>
+    <h1 class="title is-3">
+      {{#if (eq @mode "create")}}
+        Create secret
+      {{else if (and this.isV2 (eq @mode "edit"))}}
+        Create new version
+      {{else if (eq @mode "edit")}}
+        Edit secret
+      {{else}}
+        {{@key.id}}
+      {{/if}}
+    </h1>
+  </p.levelLeft>
+</PageHeader>
+{{! tabs for show only }}
+{{#if (eq @mode "show")}}
+  <div class="tabs-container box is-bottomless is-marginless is-fullwidth is-paddingless">
+    <nav class="tabs">
+      <ul>
+        <LinkTo @route="vault.cluster.secrets.backend.show" @model={{@key.id}} data-test-secret-tab>
+          Secret
+        </LinkTo>
+        {{! must have read access to /metadata see tab or update to update metadata}}
+        {{#if (or this.canReadSecretMetadata this.canUpdateSecretMetadata)}}
+          <LinkTo @route="vault.cluster.secrets.backend.metadata" @model={{@key.id}} data-test-secret-metadata-tab>
+            Metadata
+          </LinkTo>
+        {{/if}}
+      </ul>
+    </nav>
+  </div>
+{{/if}}
+
+<SecretEditToolbar
+  @mode={{@mode}}
+  @model={{@model}}
+  @isV2={{this.isV2}}
+  @isWriteWithoutRead={{this.isWriteWithoutRead}}
+  @secretDataIsAdvanced={{this.secretDataIsAdvanced}}
+  @showAdvancedMode={{this.showAdvancedMode}}
+  @modelForData={{this.modelForData}}
+  @canUpdateSecretData={{this.canUpdateSecretData}}
+  @canReadSecretMetadata={{this.canReadSecretMetadata}}
+  @codemirrorString={{this.codemirrorString}}
+  @editActions={{hash toggleAdvanced=(action "toggleAdvanced") refresh=(action "refresh")}}
+/>
 
-    {{#if (or (eq @mode "create") (eq @mode "edit"))}}
-      <SecretCreateOrUpdate
-        @mode={{@mode}}
-        @model={{@model}}
-        @showAdvancedMode={{this.showAdvancedMode}}
-        @modelForData={{this.modelForData}}
-        @error={{this.error}}
-        @isV2={{this.isV2}}
-        @secretData={{this.secretData}}
-        @buttonDisabled={{this.buttonDisabled}}
-        @canUpdateSecretMetadata={{this.canUpdateSecretMetadata}}
-        @canReadSecretData={{this.canReadSecretData}}
-        @canReadSecretMetadata={{this.canReadSecretMetadata}}
-      />
-    {{else if (eq @mode "show")}}
-      <SecretFormShow
-        @isV2={{this.isV2}}
-        @modelForData={{this.modelForData}}
-        @isWriteWithoutRead={{this.isWriteWithoutRead}}
-        @showAdvancedMode={{this.showAdvancedMode}}
-      />
-    {{else}}
-      <EmptyState @title="No secret view was selected" />
-    {{/if}}
-  {{/if}}
-</div>
\ No newline at end of file
+{{#if (or (eq @mode "create") (eq @mode "edit"))}}
+  <SecretCreateOrUpdate
+    @mode={{@mode}}
+    @model={{@model}}
+    @showAdvancedMode={{this.showAdvancedMode}}
+    @modelForData={{this.modelForData}}
+    @error={{this.error}}
+    @isV2={{this.isV2}}
+    @secretData={{this.secretData}}
+    @buttonDisabled={{this.buttonDisabled}}
+    @canUpdateSecretMetadata={{this.canUpdateSecretMetadata}}
+    @canReadSecretData={{this.canReadSecretData}}
+    @canReadSecretMetadata={{this.canReadSecretMetadata}}
+  />
+{{else if (eq @mode "show")}}
+  <SecretFormShow
+    @isV2={{this.isV2}}
+    @modelForData={{this.modelForData}}
+    @isWriteWithoutRead={{this.isWriteWithoutRead}}
+    @showAdvancedMode={{this.showAdvancedMode}}
+  />
+{{else}}
+  <EmptyState @title="No secret view was selected" />
+{{/if}}
\ No newline at end of file
diff --git a/ui/app/templates/components/secret-form-show.hbs b/ui/app/templates/components/secret-form-show.hbs
index 4616b5dd3aa7d..cf6c99fb8cd28 100644
--- a/ui/app/templates/components/secret-form-show.hbs
+++ b/ui/app/templates/components/secret-form-show.hbs
@@ -3,7 +3,7 @@
     @title="Version {{@modelForData.version}} of this secret has been permanently destroyed"
     @message="A version that has been permanently deleted cannot be restored. You can see other versions of this secret in the History menu."
   >
-    <DocLink @path="/vault/docs/secrets/kv/kv-v2">
+    <DocLink @path="/docs/secrets/kv/kv-v2.html">
       Learn more
     </DocLink>
   </EmptyState>
@@ -13,7 +13,7 @@
     @message="A version that has been deleted but can be undeleted using the Version {{@modelForData.version}} menu above.
       You can also see other versions of this secret in the History menu."
   >
-    <DocLink @path="/vault/docs/secrets/kv/kv-v2">
+    <DocLink @path="/docs/secrets/kv/kv-v2.html">
       Learn more
     </DocLink>
   </EmptyState>
@@ -37,7 +37,7 @@
       />
     </div>
   {{else}}
-    <div class="info-table-row-header">
+    <div class="table info-table-row-header">
       <div class="info-table-row thead">
         <div class="th column is-one-quarter">
           Key
@@ -46,19 +46,17 @@
           Value
         </div>
         <div class="th column justify-right" data-test-created-time>
-          {{#if @modelForData.createdTime}}
-            <ToolTip @verticalPosition="above" @horizontalPosition="center" as |T|>
-              <T.Trigger data-test-tooltip-trigger tabindex="-1">
-                Version created
-                {{date-format @modelForData.createdTime "MMM dd, yyyy hh:mm a"}}
-              </T.Trigger>
-              <T.Content @defaultClass="tool-tip smaller-font">
-                <div class="box" data-test-hover-copy-tooltip-text>
-                  {{@modelForData.createdTime}}
-                </div>
-              </T.Content>
-            </ToolTip>
-          {{/if}}
+          <ToolTip @verticalPosition="above" @horizontalPosition="center" as |T|>
+            <T.Trigger data-test-tooltip-trigger tabindex="-1" data-test-created-time>
+              Version created
+              {{date-format @modelForData.createdTime "MMM dd, yyyy hh:mm a"}}
+            </T.Trigger>
+            <T.Content @defaultClass="tool-tip smaller-font">
+              <div class="box" data-test-hover-copy-tooltip-text>
+                {{@modelForData.createdTime}}
+              </div>
+            </T.Content>
+          </ToolTip>
         </div>
       </div>
     </div>
@@ -66,13 +64,7 @@
       {{#each @modelForData.secretKeyAndValue as |secret|}}
         <InfoTableRow @label={{secret.key}} @value={{secret.value}} @alwaysRender={{true}}>
           {{#if secret.value}}
-            <MaskedInput
-              @name={{secret.key}}
-              @value={{secret.value}}
-              @displayOnly={{true}}
-              @allowCopy={{true}}
-              @allowDownload={{@isV2}}
-            />
+            <MaskedInput @value={{secret.value}} @displayOnly={{true}} @allowCopy={{true}} />
           {{else}}
             <Icon @name="minus" />
           {{/if}}
diff --git a/ui/app/templates/components/secret-list/pki-cert-item.hbs b/ui/app/templates/components/secret-list/pki-cert-item.hbs
new file mode 100644
index 0000000000000..a7e674533edfa
--- /dev/null
+++ b/ui/app/templates/components/secret-list/pki-cert-item.hbs
@@ -0,0 +1,24 @@
+<LinkedBlock
+  @params={{array (concat "vault.cluster.secrets.backend." "show" (unless @item.id "-root")) @item.idForNav}}
+  class="list-item-row"
+  data-test-secret-link={{@item.id}}
+  @encode={{true}}
+>
+  <div class="columns is-mobile">
+    <div class="column is-10">
+      <LinkTo
+        @route={{concat "vault.cluster.secrets.backend." "show" (unless @item.id "-root")}}
+        @model={{@item.idForNav}}
+        class="has-text-black has-text-weight-semibold"
+      >
+        <Icon @name="file" class="has-text-grey-light is-pulled-left" />
+        <div class="role-item-details">
+          <span class="is-underline">{{if (eq @item.id " ") "(self)" (or @item.keyWithoutParent @item.id)}}</span>
+        </div>
+      </LinkTo>
+    </div>
+    <div class="column has-text-right">
+      <Pki::PkiCertPopup @item={{@item}} />
+    </div>
+  </div>
+</LinkedBlock>
\ No newline at end of file
diff --git a/ui/app/templates/components/secret-list/pki-role-item.hbs b/ui/app/templates/components/secret-list/pki-role-item.hbs
new file mode 100644
index 0000000000000..b2bdd241e6603
--- /dev/null
+++ b/ui/app/templates/components/secret-list/pki-role-item.hbs
@@ -0,0 +1,101 @@
+<LinkedBlock
+  @params={{array (concat "vault.cluster.secrets.backend." "credentials" (unless @item.id "-root")) @item.backend @item.id}}
+  @queryParams={{hash action="issue"}}
+  class="list-item-row"
+  data-test-secret-link={{@item.id}}
+  @encode={{true}}
+>
+  <div class="columns is-mobile">
+    <div class="column is-10">
+      <LinkTo
+        @route={{concat "vault.cluster.secrets.backend." "credentials" (unless @item.id "-root")}}
+        @model={{@item.id}}
+        @query={{hash action="issue"}}
+        class="has-text-black has-text-weight-semibold"
+      >
+        <Icon @name="user" class="has-text-grey-light is-pulled-left" />
+        <div class="role-item-details">
+          <span class="is-underline">{{if (eq @item.id " ") "(self)" (or @item.keyWithoutParent @item.id)}}</span>
+        </div>
+      </LinkTo>
+    </div>
+    <div class="column has-text-right">
+      <PopupMenu @name="role-aws-nav">
+        <Confirm as |c|>
+          <nav class="menu">
+            {{#if (or @item.generatePath.isPending @item.signPath.isPending)}}
+              <ul class="menu-list">
+                <li class="action">
+                  <button disabled type="button" class="link button is-loading is-transparent">
+                    loading
+                  </button>
+                </li>
+              </ul>
+            {{else if (or @item.canGenerate @item.canSign)}}
+              <ul class="menu-list">
+                {{#if @item.canGenerate}}
+                  <li class="action">
+                    <LinkTo
+                      @route="vault.cluster.secrets.backend.credentials"
+                      @model={{@item.id}}
+                      @query={{hash action="issue"}}
+                      data-test-role-pki-link="generate-certificate"
+                    >
+                      Generate certificate
+                    </LinkTo>
+                  </li>
+                {{/if}}
+                {{#if @item.canSign}}
+                  <li class="action">
+                    <LinkTo
+                      @route="vault.cluster.secrets.backend.credentials"
+                      @model={{@item.id}}
+                      @query={{hash action="sign"}}
+                      data-test-role-pki-link="sign-certificate"
+                    >
+                      Sign certificate
+                    </LinkTo>
+                  </li>
+                {{/if}}
+              </ul>
+            {{/if}}
+            <ul class="menu-list">
+              {{#if @item.updatePath.isPending}}
+                <li class="action">
+                  <button disabled type="button" class="link button is-loading is-transparent">
+                    loading
+                  </button>
+                </li>
+                <li class="action">
+                  <button disabled type="button" class="link button is-loading is-transparent">
+                    loading
+                  </button>
+                </li>
+              {{else}}
+                {{#if @item.canRead}}
+                  <li class="action">
+                    <LinkTo @route="vault.cluster.secrets.backend.show" @model={{@item.id}} data-test-role-pki-link="show">
+                      Details
+                    </LinkTo>
+                  </li>
+                {{/if}}
+                {{#if @item.canEdit}}
+                  <li class="action">
+                    <LinkTo @route="vault.cluster.secrets.backend.edit" @model={{@item.id}} data-test-role-pki-link="edit">
+                      Edit
+                    </LinkTo>
+                  </li>
+                {{/if}}
+                {{#if @item.canDelete}}
+                  <li class="action">
+                    <c.Message @id={{@item.id}} @onConfirm={{@delete}} data-test-pki-role-delete={{@item.id}} />
+                  </li>
+                {{/if}}
+              {{/if}}
+            </ul>
+          </nav>
+        </Confirm>
+      </PopupMenu>
+    </div>
+  </div>
+</LinkedBlock>
\ No newline at end of file
diff --git a/ui/app/templates/components/secret-list/transform-list-item.hbs b/ui/app/templates/components/secret-list/transform-list-item.hbs
index 18e7703196654..9afcac14715d8 100644
--- a/ui/app/templates/components/secret-list/transform-list-item.hbs
+++ b/ui/app/templates/components/secret-list/transform-list-item.hbs
@@ -11,7 +11,7 @@
         <SecretLink
           @mode="show"
           @secret={{@itemPath}}
-          @queryParams={{hash type=@modelType}}
+          @queryParams={{query-params type=@modelType}}
           class="has-text-black has-text-weight-semibold"
         >
           <Icon @name="file" class="has-text-grey-light" />
diff --git a/ui/app/templates/components/secret-list/transform-transformation-item.hbs b/ui/app/templates/components/secret-list/transform-transformation-item.hbs
index c6efb88edb719..6d3990c924d2f 100644
--- a/ui/app/templates/components/secret-list/transform-transformation-item.hbs
+++ b/ui/app/templates/components/secret-list/transform-transformation-item.hbs
@@ -12,7 +12,7 @@
         <SecretLink
           @mode="show"
           @secret={{@item.id}}
-          @queryParams={{if (eq @backendModel.type "transform") (hash tab="actions") ""}}
+          @queryParams={{if (eq @backendModel.type "transform") (query-params tab="actions") ""}}
           class="has-text-black has-text-weight-semibold"
         >
           <Icon @name="file" class="has-text-grey-light" />
diff --git a/ui/app/templates/components/selectable-card.hbs b/ui/app/templates/components/selectable-card.hbs
index 0bab3347e88b0..16b74b04b0c46 100644
--- a/ui/app/templates/components/selectable-card.hbs
+++ b/ui/app/templates/components/selectable-card.hbs
@@ -14,7 +14,7 @@
       <h3 class="title is-5">{{@cardTitle}}</h3>
       <LinkTo
         @route={{@actionTo}}
-        class="has-icon-right is-ghost is-no-underline has-text-weight-semibold"
+        class="has-icon-right is-ghost is-no-underline has-text-semibold"
         @query={{hash itemType=@queryParam}}
         data-test-action-text={{@actionText}}
       >
diff --git a/ui/app/templates/components/splash-page.hbs b/ui/app/templates/components/splash-page.hbs
index 7d36d2993523b..105b08e9fcabf 100644
--- a/ui/app/templates/components/splash-page.hbs
+++ b/ui/app/templates/components/splash-page.hbs
@@ -1,3 +1,17 @@
+{{#if this.showTruncatedNavBar}}
+  <NavHeader as |Nav|>
+    <Nav.home>
+      <HomeLink @class="navbar-item splash-page-logo has-text-white">
+        <LogoEdition />
+      </HomeLink>
+    </Nav.home>
+    <Nav.items>
+      <div class="navbar-item status-indicator-button" data-status={{if this.activeCluster.unsealed "good" "bad"}}>
+        <StatusMenu @label="Status" @onLinkClick={{Nav.closeDrawer}} />
+      </div>
+    </Nav.items>
+  </NavHeader>
+{{/if}}
 {{! bypass container styling }}
 {{#if @hasAltContent}}
   {{yield (hash altContent=(component "splash-page/splash-content"))}}
diff --git a/ui/app/templates/components/status-menu.hbs b/ui/app/templates/components/status-menu.hbs
new file mode 100644
index 0000000000000..cdd3ba325f4f6
--- /dev/null
+++ b/ui/app/templates/components/status-menu.hbs
@@ -0,0 +1,23 @@
+<BasicDropdown @horizontalPosition="auto-left" @verticalPosition="below" @renderInPlace={{this.media.isMobile}} as |d|>
+  <d.Trigger
+    @htmlTag={{if (eq this.type "replication") "span" "button"}}
+    class={{if (eq this.type "replication") "" "button is-transparent"}}
+  >
+    <span class="status-indicator-color">
+      <Icon @name={{this.glyphName}} aria-label={{@ariaLabel}} />
+    </span>
+    <div class="status-menu-label">
+      {{@label}}
+    </div>
+    <Chevron @direction="down" class="has-text-white is-status-chevron" />
+  </d.Trigger>
+  <d.Content @defaultClass={{concat "status-menu-content status-menu-content-" this.type}}>
+    {{#if (eq this.type "user")}}
+      {{#if (and this.currentCluster.cluster.name this.auth.currentToken)}}
+        <AuthInfo @activeClusterName={{this.currentCluster.cluster.name}} @onLinkClick={{fn this.onLinkClick null}} />
+      {{/if}}
+    {{else}}
+      <ClusterInfo @cluster={{this.currentCluster.cluster}} @onLinkClick={{fn this.onLinkClick d}} />
+    {{/if}}
+  </d.Content>
+</BasicDropdown>
\ No newline at end of file
diff --git a/ui/app/templates/components/text-file.hbs b/ui/app/templates/components/text-file.hbs
new file mode 100644
index 0000000000000..b2a9c85b7a0b9
--- /dev/null
+++ b/ui/app/templates/components/text-file.hbs
@@ -0,0 +1,90 @@
+{{#unless this.inputOnly}}
+  <div class="level is-mobile">
+    <div class="level-left">
+      <label class="is-label" data-test-text-label={{true}}>
+        {{#if this.label}}
+          {{this.label}}
+          {{#if @helpText}}
+            <InfoTooltip>
+              <span data-test-help-text>
+                {{@helpText}}
+              </span>
+            </InfoTooltip>
+          {{/if}}
+        {{else}}
+          File
+        {{/if}}
+      </label>
+    </div>
+    <div class="level-right">
+      <div class="control is-flex">
+        <input
+          data-test-text-toggle
+          id={{concat "useText-" this.elementId}}
+          type="checkbox"
+          name={{concat "useText-" this.elementId}}
+          class="switch is-rounded is-success is-small"
+          checked={{@file.enterAsText}}
+          {{on "change" (toggle "enterAsText" @file)}}
+        />
+        <label for={{concat "useText-" this.elementId}}>
+          Enter as text
+        </label>
+      </div>
+    </div>
+  </div>
+{{/unless}}
+<div
+  class="field text-file box is-fullwidth is-marginless is-shadowless {{if this.inputOnly 'is-paddingless'}}"
+  data-test-component="text-file"
+>
+  {{#if @file.enterAsText}}
+    <div class="control has-icon-right">
+      <textarea
+        class="textarea {{unless this.showValue 'masked-font'}}"
+        {{on "input" this.updateData}}
+        data-test-text-file-textarea={{true}}
+      >{{@file.value}}</textarea>
+      <button
+        {{on "click" this.toggleMask}}
+        type="button"
+        class="{{if (eq this.value '') 'has-text-grey'}} masked-input-toggle button {{if this.displayOnly 'is-compact'}}"
+        data-test-button
+      >
+        <Icon @name={{if this.showValue "eye" "eye-off"}} />
+      </button>
+    </div>
+    <p class="help has-text-grey">
+      {{this.textareaHelpText}}
+    </p>
+  {{else}}
+    <div class="control is-expanded">
+      <div class="file has-name is-fullwidth">
+        <label class="file-label">
+          <input class="file-input" type="file" {{on "change" this.pickedFile}} data-test-text-file-input={{true}} />
+          <span class="file-cta button">
+            <Icon @name="upload" class="has-light-grey-text" />
+            Choose a file…
+          </span>
+          <span class="file-name has-text-grey-dark" data-test-text-file-input-label={{true}}>
+            {{#if @file.fileName}}
+              {{@file.fileName}}
+            {{else}}
+              No file chosen
+            {{/if}}
+          </span>
+          {{#if @file.fileName}}
+            {{! template-lint-configure no-nested-interactive "warn" }}
+            <button type="button" class="file-delete-button" {{on "click" this.clearFile}} data-test-text-clear={{true}}>
+              <Icon @name="x-circle" />
+            </button>
+            {{! template-lint-configure no-nested-interactive "on" }}
+          {{/if}}
+        </label>
+      </div>
+    </div>
+    <p class="help has-text-grey">
+      {{this.fileHelpText}}
+    </p>
+  {{/if}}
+</div>
\ No newline at end of file
diff --git a/ui/app/templates/components/tool-actions-form.hbs b/ui/app/templates/components/tool-actions-form.hbs
index 27781f0f38f68..aada57d35cc52 100644
--- a/ui/app/templates/components/tool-actions-form.hbs
+++ b/ui/app/templates/components/tool-actions-form.hbs
@@ -7,7 +7,7 @@
       @algorithm={{this.algorithm}}
       @errors={{this.errors}}
       @format={{this.format}}
-      @input={{this.input}}
+      @input={{input}}
     />
     {{! template-lint-enable no-passed-in-event-handlers }}
   {{else if (eq this.selectedAction "random")}}
diff --git a/ui/app/templates/components/tool-unwrap.hbs b/ui/app/templates/components/tool-unwrap.hbs
index 09c7f856fdb78..dfd8fe0f574aa 100644
--- a/ui/app/templates/components/tool-unwrap.hbs
+++ b/ui/app/templates/components/tool-unwrap.hbs
@@ -8,7 +8,7 @@
 
 {{#if @unwrap_data}}
   <div class="box is-sideless is-fullwidth is-marginless">
-    <nav class="tabs has-bottom-margin-l">
+    <nav class="tabs">
       <ul>
         {{! template-lint-configure no-nested-interactive "warn" }}
         <li
diff --git a/ui/app/templates/components/toolbar-download-button.hbs b/ui/app/templates/components/toolbar-download-button.hbs
new file mode 100644
index 0000000000000..b7fd647a7d5ba
--- /dev/null
+++ b/ui/app/templates/components/toolbar-download-button.hbs
@@ -0,0 +1,2 @@
+{{@actionText}}
+<Chevron @isButton={{true}} />
\ No newline at end of file
diff --git a/ui/app/templates/components/transform-advanced-templating.hbs b/ui/app/templates/components/transform-advanced-templating.hbs
index 3f41f320b8bf4..d5e23330e656b 100644
--- a/ui/app/templates/components/transform-advanced-templating.hbs
+++ b/ui/app/templates/components/transform-advanced-templating.hbs
@@ -12,9 +12,13 @@
     <p>
       Using your template's regex as a starting point, you can specify which parts of your input to encode and decode. For
       example, you may want to handle input formatting or only decode part of an input. For more information, see
-      <DocLink @path="/vault/tutorials/adp/transform#advanced-handling">
+      <a
+        href="https://learn.hashicorp.com/tutorials/vault/transform#advanced-handling"
+        target="_blank"
+        rel="noopener noreferrer"
+      >
         our documentation.
-      </DocLink>
+      </a>
     </p>
     <div class="has-top-margin-l">
       <RegexValidator
diff --git a/ui/app/templates/components/transit-form-create.hbs b/ui/app/templates/components/transit-form-create.hbs
index 3f96a62c7be1a..31e8ba5dd5fe4 100644
--- a/ui/app/templates/components/transit-form-create.hbs
+++ b/ui/app/templates/components/transit-form-create.hbs
@@ -1,4 +1,4 @@
-<form data-test-transit-create-form onsubmit={{@createOrUpdateKey}}>
+<form onsubmit={{@createOrUpdateKey}}>
   <div class="box is-sideless is-fullwidth is-marginless">
     <MessageError @model={{@key}} />
     <NamespaceReminder @mode="create" @noun="transit key" />
diff --git a/ui/app/templates/components/transit-form-edit.hbs b/ui/app/templates/components/transit-form-edit.hbs
index 220145c87b4a5..e6ea07e081cdd 100644
--- a/ui/app/templates/components/transit-form-edit.hbs
+++ b/ui/app/templates/components/transit-form-edit.hbs
@@ -1,4 +1,4 @@
-<form data-test-transit-edit-form onsubmit={{@createOrUpdateKey}}>
+<form onsubmit={{@createOrUpdateKey}}>
   <div class="box is-sideless is-fullwidth is-marginless">
     <MessageError @model={{@key}} />
     <NamespaceReminder @mode="edit" @noun="transit key" />
@@ -19,7 +19,7 @@
     <div class="field">
       <TtlPicker
         @initialValue={{or @key.autoRotatePeriod "30d"}}
-        @initialEnabled={{not (eq @key.autoRotatePeriod 0)}}
+        @initialEnabled={{not (eq @key.autoRotatePeriod "0s")}}
         @label="Auto-rotation period"
         @helperTextDisabled="Key will never be automatically rotated"
         @helperTextEnabled="Key will be automatically rotated every"
diff --git a/ui/app/templates/components/transit-form-show.hbs b/ui/app/templates/components/transit-form-show.hbs
index 825ebd720e9c5..e9aa546f62f87 100644
--- a/ui/app/templates/components/transit-form-show.hbs
+++ b/ui/app/templates/components/transit-form-show.hbs
@@ -1,12 +1,12 @@
 <div class="tabs-container box is-sideless is-fullwidth is-paddingless is-marginless">
-  <nav class="tabs" aria-label="tabs">
+  <nav class="tabs">
     <ul>
       <li class={{if (eq @tab "actions") "is-active"}}>
         <SecretLink
           @secret={{@key.id}}
           @mode="show"
           @replace={{true}}
-          @queryParams={{hash tab="actions"}}
+          @queryParams={{query-params tab="actions"}}
           data-test-transit-key-actions-link={{true}}
         >
           Key Actions
@@ -18,7 +18,7 @@
           @secret={{@key.id}}
           @mode="show"
           @replace={{true}}
-          @queryParams={{hash tab="details"}}
+          @queryParams={{query-params tab="details"}}
           data-test-transit-link="details"
         >
           Details
@@ -30,7 +30,7 @@
           @secret={{@key.id}}
           @mode="show"
           @replace={{true}}
-          @queryParams={{hash tab="versions"}}
+          @queryParams={{query-params tab="versions"}}
           data-test-transit-link="versions"
         >
           Versions
@@ -147,7 +147,7 @@
           </div>
           <div class="column is-1 is-flex-end">
             <PopupMenu name="secret-menu">
-              <nav class="menu" aria-label="copy public key">
+              <nav class="menu">
                 <ul class="menu-list">
                   <li class="action">
                     <CopyButton
@@ -171,7 +171,7 @@
   <InfoTableRow @label="Type" @value={{@key.type}} />
   <InfoTableRow
     @label="Auto-rotation period"
-    @value={{or (format-duration @key.autoRotatePeriod) "Key will not be automatically rotated"}}
+    @value={{or (format-duration @key.autoRotatePeriod nullable=true) "Key will not be automatically rotated"}}
   />
   <InfoTableRow @label="Deletion allowed" @value={{stringify @key.deletionAllowed}} />
 
diff --git a/ui/app/templates/components/transit-key-action/datakey.hbs b/ui/app/templates/components/transit-key-action/datakey.hbs
index 7831aa3badba5..fa73768bb8cdd 100644
--- a/ui/app/templates/components/transit-key-action/datakey.hbs
+++ b/ui/app/templates/components/transit-key-action/datakey.hbs
@@ -1,7 +1,7 @@
 <form onsubmit={{action @doSubmit (hash param=@param context=@context nonce=@nonce bits=@bits)}}>
   <div class="box is-sideless is-fullwidth is-marginless">
     <NamespaceReminder @mode="perform" @noun="datakey creation" />
-    <div class="content has-bottom-margin-l">
+    <div class="content">
       <p>Generate a new high-entropy key and value using <code>{{@key.name}}</code> as the encryption key.</p>
     </div>
     <div class="field">
diff --git a/ui/app/templates/components/transit-key-action/decrypt.hbs b/ui/app/templates/components/transit-key-action/decrypt.hbs
index 52ea048ceb84c..85745296ed099 100644
--- a/ui/app/templates/components/transit-key-action/decrypt.hbs
+++ b/ui/app/templates/components/transit-key-action/decrypt.hbs
@@ -1,6 +1,6 @@
 <form onsubmit={{action @doSubmit (hash ciphertext=@ciphertext context=@context nonce=@nonce)}}>
   <div class="box is-sideless is-fullwidth is-marginless">
-    <div class="content has-bottom-margin-l">
+    <div class="content">
       <p>You can decrypt ciphertext using <code>{{@key.name}}</code> as the encryption key.</p>
     </div>
     <div class="field">
diff --git a/ui/app/templates/components/transit-key-action/encrypt.hbs b/ui/app/templates/components/transit-key-action/encrypt.hbs
index cb32cc19e4a6f..2a51e3d85af75 100644
--- a/ui/app/templates/components/transit-key-action/encrypt.hbs
+++ b/ui/app/templates/components/transit-key-action/encrypt.hbs
@@ -6,7 +6,7 @@
 >
   <div class="box is-sideless is-fullwidth is-marginless">
     <NamespaceReminder @mode="perform" @noun="encryption" />
-    <div class="content has-bottom-margin-l">
+    <div class="content">
       <p>You can encrypt plaintext data using <code>{{@key.name}}</code> as the encryption key.</p>
     </div>
     <KeyVersionSelect @key={{@key}} @onVersionChange={{action (mut @key_version)}} @key_version={{@key_version}} />
diff --git a/ui/app/templates/components/transit-key-action/hmac.hbs b/ui/app/templates/components/transit-key-action/hmac.hbs
index 9bbfba05074e5..5c45924c5e64c 100644
--- a/ui/app/templates/components/transit-key-action/hmac.hbs
+++ b/ui/app/templates/components/transit-key-action/hmac.hbs
@@ -6,7 +6,7 @@
 >
   <div class="box is-sideless is-fullwidth is-marginless">
     <NamespaceReminder @mode="perform" @noun="HMAC creation" />
-    <div class="content has-bottom-margin-l">
+    <div class="content">
       <p>
         Generate the digest of given data using the specified hash algorithm and
         <code>{{@key.name}}</code>
diff --git a/ui/app/templates/components/transit-key-action/rewrap.hbs b/ui/app/templates/components/transit-key-action/rewrap.hbs
index 9239207321940..0570b8e1c3905 100644
--- a/ui/app/templates/components/transit-key-action/rewrap.hbs
+++ b/ui/app/templates/components/transit-key-action/rewrap.hbs
@@ -1,7 +1,7 @@
 <form onsubmit={{action @doSubmit (hash ciphertext=@ciphertext context=@context nonce=@nonce key_version=@key_version)}}>
   <div class="box is-sideless is-fullwidth is-marginless">
     <NamespaceReminder @mode="perform" @noun="rewrap" />
-    <div class="content has-bottom-margin-l">
+    <div class="content">
       <p>
         You can rewrap the provided ciphertext using the latest version of
         <code>{{@key.name}}</code>
@@ -44,7 +44,7 @@
     {{/if}}
   </div>
   <div class="field box is-fullwidth is-bottomless">
-    <div class="content has-bottom-margin-l">
+    <div class="content">
       <p class="help">
         Submitting this form will update the
         <code>ciphertext</code>
diff --git a/ui/app/templates/components/transit-key-action/verify.hbs b/ui/app/templates/components/transit-key-action/verify.hbs
index 3205bf6d1d171..4e9a49a6e7335 100644
--- a/ui/app/templates/components/transit-key-action/verify.hbs
+++ b/ui/app/templates/components/transit-key-action/verify.hbs
@@ -14,7 +14,7 @@
   }}
 >
   <div class="box is-sideless is-fullwidth is-marginless">
-    <div class="content has-bottom-margin-l">
+    <div class="content">
       <p>Check whether the provided signature is valid for the given data.</p>
     </div>
     <div class="field">
diff --git a/ui/app/templates/components/ui-wizard.hbs b/ui/app/templates/components/ui-wizard.hbs
index 90d8b31839cf0..f846cf0c9a224 100644
--- a/ui/app/templates/components/ui-wizard.hbs
+++ b/ui/app/templates/components/ui-wizard.hbs
@@ -16,7 +16,6 @@
       onRepeat=(action "repeatStep")
       onReset=(action "resetFeature")
       onAdvance=(action "advanceFeature")
-      currentRouteName=this.currentRouteName
     }}
   {{/component}}
 {{/if}}
\ No newline at end of file
diff --git a/ui/app/templates/components/wizard/policies-delete.hbs b/ui/app/templates/components/wizard/policies-delete.hbs
index 3bc9183da9a03..d0430edb8b2b5 100644
--- a/ui/app/templates/components/wizard/policies-delete.hbs
+++ b/ui/app/templates/components/wizard/policies-delete.hbs
@@ -7,11 +7,7 @@
     @instructions='Click on "Delete" to remove the policy that you created.'
   >
     <p>
-      {{#if (eq @currentRouteName "vault.cluster.policies.index")}}
-        You can delete your test policy by clicking the "..." icon to the right of the policy name.
-      {{else}}
-        You can delete your test policy by clicking "Delete" in the toolbar.
-      {{/if}}
+      You can delete your test policy by clicking the "..." icon to the right of the policy name.
     </p>
   </WizardSection>
 </WizardContent>
\ No newline at end of file
diff --git a/ui/app/templates/components/wizard/policies-details.hbs b/ui/app/templates/components/wizard/policies-details.hbs
index d6eb2b15a3b80..a2cdab12e0b13 100644
--- a/ui/app/templates/components/wizard/policies-details.hbs
+++ b/ui/app/templates/components/wizard/policies-details.hbs
@@ -7,7 +7,7 @@
     @instructions='Click on "ACL Policies" in the sidebar to go back to the list of policies.'
   >
     <p>
-      Good job! Here you can see your new policy. If you'd like to edit it, you'd just click "Edit policy" in the toolbar.
+      Good job! Here you can see your new policy. If you'd like to edit it, you'd just click the "Edit" toggle.
     </p>
   </WizardSection>
 </WizardContent>
\ No newline at end of file
diff --git a/ui/app/templates/components/wizard/replication-setup.hbs b/ui/app/templates/components/wizard/replication-setup.hbs
index 8c0961e9b2d43..47dc637c91f28 100644
--- a/ui/app/templates/components/wizard/replication-setup.hbs
+++ b/ui/app/templates/components/wizard/replication-setup.hbs
@@ -11,15 +11,15 @@
       more interested in speed of access?
     </p>
 
-    <DocLink @path="/vault/tutorials/enterprise/performance-replication">
+    <LearnLink @path="/vault/operations/ops-replication">
       <Icon @name="learn-link" />
       Learn: Setting Up Performance Replication
-    </DocLink>
+    </LearnLink>
 
-    <DocLink @path="/vault/tutorials/enterprise/disaster-recovery">
+    <LearnLink @path="/vault/operations/ops-disaster-recovery">
       <Icon @name="learn-link" />
       Learn: Setting up Disaster Recovery
-    </DocLink>
+    </LearnLink>
 
   </WizardSection>
   <WizardSection @headerText="Cluster mode" @class="wizard-details">
diff --git a/ui/app/templates/vault.hbs b/ui/app/templates/vault.hbs
index 7d61510db9e43..6106e707d00db 100644
--- a/ui/app/templates/vault.hbs
+++ b/ui/app/templates/vault.hbs
@@ -7,22 +7,22 @@
     HashiCorp
   </span>
   <span>
-    <ExternalLink @href={{changelog-url-for this.auth.activeCluster.leaderNode.version}} class="link has-text-grey">
+    <a href={{changelog-url-for this.activeCluster.leaderNode.version}} class="link has-text-grey">
       Vault
-      {{this.auth.activeCluster.leaderNode.version}}
-    </ExternalLink>
+      {{this.activeCluster.leaderNode.version}}
+    </a>
   </span>
   {{#if (is-version "OSS")}}
     <span>
-      <ExternalLink @href="https://hashicorp.com/products/vault/trial?source=vaultui" class="link has-text-grey">
+      <a href="https://hashicorp.com/products/vault/trial?source=vaultui" class="link has-text-grey">
         Upgrade to Vault Enterprise
-      </ExternalLink>
+      </a>
     </span>
   {{/if}}
   <span>
-    <DocLink @path="/vault" class="has-text-grey">
+    <a class="has-text-grey" target="_blank" rel="noreferrer noopener" href="https://www.vaultproject.io/docs/index.html">
       Documentation
-    </DocLink>
+    </a>
   </span>
 </footer>
 {{#if (eq this.env "development")}}
@@ -33,4 +33,5 @@
       <Icon @name="pencil-tool" /><Icon @name="git-branch" />
     </div>
   </div>
-{{/if}}
\ No newline at end of file
+{{/if}}
+<div id="modal-wormhole"></div>
\ No newline at end of file
diff --git a/ui/app/templates/vault/cluster.hbs b/ui/app/templates/vault/cluster.hbs
index e9c55ce38f559..0aa51386a6554 100644
--- a/ui/app/templates/vault/cluster.hbs
+++ b/ui/app/templates/vault/cluster.hbs
@@ -1,11 +1,117 @@
-<Sidebar::Nav::Cluster />
-{{! Only show license banners for Enterprise }}
-{{#if this.activeCluster.version.isEnterprise}}
-  <LicenseBanners
-    @expiry={{this.activeCluster.licenseExpiry}}
-    @autoloaded={{eq this.activeCluster.licenseState "autoloaded"}}
-  />
+{{#if this.showNav}}
+  <NavHeader data-test-header-with-nav @class={{if this.consoleOpen "panel-open"}} as |Nav|>
+    <Nav.home>
+      <HomeLink @class="navbar-item has-text-white has-current-color-fill">
+        <Icon @name="vault-logo" />
+      </HomeLink>
+    </Nav.home>
+    <Nav.main>
+      <ul class="navbar-sections {{if (has-feature 'Namespaces') 'with-ns-picker'}}">
+        {{#if (has-feature "Namespaces")}}
+          <li>
+            <NamespacePicker @class="navbar-item" @namespace={{this.namespaceQueryParam}} />
+          </li>
+        {{/if}}
+        <li class={{if (is-active-route "vault.cluster.secrets") "is-active"}}>
+          <LinkTo
+            @route="vault.cluster.secrets"
+            @current-when="vault.cluster.secrets vault.cluster.settings.mount-secret-backend vault.cluster.settings.configure-secret-backend"
+            {{on "click" Nav.closeDrawer}}
+            data-test-navbar-item="secrets"
+          >
+            Secrets
+          </LinkTo>
+        </li>
+        {{#if (has-permission "access")}}
+          <li class={{if (is-active-route "vault.cluster.access") "is-active"}}>
+            <LinkTo
+              @route={{get (route-params-for "access") "route"}}
+              @models={{get (route-params-for "access") "models"}}
+              @current-when="vault.cluster.access vault.cluster.settings.auth"
+              {{on "click" Nav.closeDrawer}}
+              data-test-navbar-item="access"
+            >
+              Access
+            </LinkTo>
+          </li>
+        {{/if}}
+        {{#if (has-permission "policies")}}
+          <li class={{if (is-active-route (array "vault.cluster.policies" "vault.cluster.policy")) "is-active"}}>
+            <LinkTo
+              @route="vault.cluster.policies"
+              @models={{get (route-params-for "policies") "models"}}
+              @current-when="vault.cluster.policies vault.cluster.policy"
+              {{on "click" Nav.closeDrawer}}
+              data-test-navbar-item="policies"
+            >
+              Policies
+            </LinkTo>
+          </li>
+        {{/if}}
+        {{#if (has-permission "tools")}}
+          <li class={{if (is-active-route "vault.cluster.tools") "is-active"}}>
+            <LinkTo
+              @route="vault.cluster.tools.tool"
+              @models={{get (route-params-for "tools") "models"}}
+              {{on "click" Nav.closeDrawer}}
+            >
+              Tools
+            </LinkTo>
+          </li>
+        {{/if}}
+      </ul>
+    </Nav.main>
+    <Nav.items>
+      <div class="navbar-separator is-hidden-tablet"></div>
+      {{! template-lint-disable block-indentation }}
+      {{#if this.namespaceService.inRootNamespace}}
+        <div class="navbar-item status-indicator-button" data-status={{if this.activeCluster.unsealed "good" "bad"}}>
+          <StatusMenu @label="Status" @onLinkClick={{action Nav.closeDrawer}} />
+        </div>
+        <div class="navbar-separator is-hidden-mobile"></div>
+      {{else if (and
+        (has-permission "clients" routeParams="activity") (not this.cluster.dr.isSecondary) this.auth.currentToken
+      )}}
+        <div class="navbar-sections">
+          <div class={{if (is-active-route "vault.cluster.clients") "is-active"}}>
+            <LinkTo
+              @route="vault.cluster.clients.history"
+              @current-when="vault.cluster.clients.history"
+              data-test-navbar-item="metrics"
+            >
+              Client count
+            </LinkTo>
+          </div>
+        </div>
+      {{/if}}
+      {{! template-lint-enable block-indentation }}
+      <div class="navbar-item">
+        <button
+          type="button"
+          class="button is-transparent nav-console-button{{if this.consoleOpen ' popup-open'}}"
+          {{action (queue (action "toggleConsole") (action Nav.closeDrawer))}}
+          data-test-console-toggle
+        >
+          <Icon @name="terminal-screen" />
+          <div class="status-menu-label">
+            Console
+          </div>
+          <Chevron @direction="down" class="has-text-white is-status-chevron" />
+        </button>
+      </div>
+      <div
+        class="navbar-item nav-user-button {{if this.auth.allowExpiration 'may-expire'}}"
+        data-test-allow-expiration={{this.auth.allowExpiration}}
+      >
+        <StatusMenu @type="user" @label="User" @onLinkClick={{action Nav.closeDrawer}} />
+      </div>
+    </Nav.items>
+  </NavHeader>
 {{/if}}
+<LicenseBanners
+  @expiry={{this.activeCluster.licenseExpiry}}
+  @autoloaded={{eq this.activeCluster.licenseState "autoloaded"}}
+/>
 <div class="global-flash">
   {{#each this.flashMessages.queue as |flash|}}
     <FlashMessage data-test-flash-message={{true}} @flash={{flash}} as |customComponent flash close|>
@@ -22,15 +128,18 @@
     </FlashMessage>
   {{/each}}
 </div>
-
-{{#if this.auth.isActiveSession}}
-  <section class="section">
-    <div class="container is-widescreen">
-      <TokenExpireWarning @expirationDate={{this.auth.tokenExpirationDate}}>
-        {{outlet}}
-      </TokenExpireWarning>
-    </div>
-  </section>
+{{#if this.currentlyLoading}}
+  <LogoSplash />
 {{else}}
-  {{outlet}}
+  {{#if this.showNav}}
+    <section class="section">
+      <div class="container is-widescreen">
+        <TokenExpireWarning @expirationDate={{this.auth.tokenExpirationDate}}>
+          {{outlet}}
+        </TokenExpireWarning>
+      </div>
+    </section>
+  {{else}}
+    {{outlet}}
+  {{/if}}
 {{/if}}
\ No newline at end of file
diff --git a/ui/app/templates/vault/cluster/access.hbs b/ui/app/templates/vault/cluster/access.hbs
index 4aa301e54d875..4f9a8b4f6396a 100644
--- a/ui/app/templates/vault/cluster/access.hbs
+++ b/ui/app/templates/vault/cluster/access.hbs
@@ -1,2 +1,75 @@
-<Sidebar::Nav::Access />
-{{outlet}}
\ No newline at end of file
+<div class="columns">
+  <MenuSidebar @title="Access" @class="is-3" @data-test-sidebar={{true}}>
+    {{#if (has-permission "access" routeParams="methods")}}
+      <li>
+        <LinkTo
+          @route="vault.cluster.access.methods"
+          data-test-link={{true}}
+          @current-when="vault.cluster.access.methods vault.cluster.access.method"
+        >
+          Auth Methods
+        </LinkTo>
+      </li>
+    {{/if}}
+    {{#if (has-permission "access" routeParams="mfa")}}
+      <li>
+        <LinkTo
+          @route="vault.cluster.access.mfa.methods"
+          @current-when="vault.cluster.access.mfa.methods vault.cluster.access.mfa.enforcements vault.cluster.access.mfa.index"
+          data-test-link="mfa"
+        >
+          Multi-factor authentication
+        </LinkTo>
+      </li>
+    {{/if}}
+    {{#if (has-permission "access" routeParams="entities")}}
+      <li>
+        <LinkTo @route="vault.cluster.access.identity" @model="entities" data-test-link={{true}}>
+          Entities
+        </LinkTo>
+      </li>
+    {{/if}}
+    {{#if (has-permission "access" routeParams="groups")}}
+      <li>
+        <LinkTo @route="vault.cluster.access.identity" @model="groups" data-test-link={{true}}>
+          Groups
+        </LinkTo>
+      </li>
+    {{/if}}
+    {{#if (has-permission "access" routeParams="leases")}}
+      <li>
+        <LinkTo @route="vault.cluster.access.leases" data-test-link={{true}}>
+          Leases
+        </LinkTo>
+      </li>
+    {{/if}}
+    {{#if (and (has-feature "Namespaces") (has-permission "access" routeParams="namespaces"))}}
+      <li>
+        <LinkTo @route="vault.cluster.access.namespaces" data-test-link={{true}}>
+          Namespaces
+        </LinkTo>
+      </li>
+    {{/if}}
+    {{#if (and (has-feature "Control Groups") (has-permission "access" routeParams="control-groups"))}}
+      <li>
+        <LinkTo
+          @route="vault.cluster.access.control-groups"
+          data-test-link={{true}}
+          @current-when="vault.cluster.access.control-groups vault.cluster.access.control-group-accessor vault.cluster.access.control-groups-configure"
+        >
+          Control Groups
+        </LinkTo>
+      </li>
+    {{/if}}
+    {{#if (has-permission "access" routeParams="oidc")}}
+      <li>
+        <LinkTo @route="vault.cluster.access.oidc" data-test-link="oidc">
+          OIDC Provider
+        </LinkTo>
+      </li>
+    {{/if}}
+  </MenuSidebar>
+  <div class="column is-9">
+    {{outlet}}
+  </div>
+</div>
\ No newline at end of file
diff --git a/ui/app/templates/vault/cluster/access/control-group-accessor.hbs b/ui/app/templates/vault/cluster/access/control-group-accessor.hbs
index 5393a969f28f9..d27192a649df9 100644
--- a/ui/app/templates/vault/cluster/access/control-group-accessor.hbs
+++ b/ui/app/templates/vault/cluster/access/control-group-accessor.hbs
@@ -9,7 +9,7 @@
   {{#if this.model.canConfigure}}
     <Toolbar>
       <ToolbarActions>
-        <ToolbarLink @route="vault.cluster.access.control-groups-configure">
+        <ToolbarLink @params={{array "vault.cluster.access.control-groups-configure"}}>
           Configure
         </ToolbarLink>
       </ToolbarActions>
diff --git a/ui/app/templates/vault/cluster/access/control-groups.hbs b/ui/app/templates/vault/cluster/access/control-groups.hbs
index 8d8f24b6ea307..3d43ced8664a9 100644
--- a/ui/app/templates/vault/cluster/access/control-groups.hbs
+++ b/ui/app/templates/vault/cluster/access/control-groups.hbs
@@ -9,7 +9,7 @@
   {{#if this.model.canConfigure}}
     <Toolbar>
       <ToolbarActions>
-        <ToolbarLink @route="vault.cluster.access.control-groups-configure">
+        <ToolbarLink @params={{array "vault.cluster.access.control-groups-configure"}}>
           Configure
         </ToolbarLink>
       </ToolbarActions>
diff --git a/ui/app/templates/vault/cluster/access/identity/aliases/index.hbs b/ui/app/templates/vault/cluster/access/identity/aliases/index.hbs
index 75f5642f88d0b..610067715e4b1 100644
--- a/ui/app/templates/vault/cluster/access/identity/aliases/index.hbs
+++ b/ui/app/templates/vault/cluster/access/identity/aliases/index.hbs
@@ -49,8 +49,8 @@
       Create
       {{this.identityType}}
     </LinkTo>
-    <DocLink @path="/vault/tutorials/auth-methods/identity">
+    <LearnLink @path="/vault/identity-access-management/iam-identity">
       Learn more
-    </DocLink>
+    </LearnLink>
   </EmptyState>
 {{/if}}
\ No newline at end of file
diff --git a/ui/app/templates/vault/cluster/access/identity/aliases/show.hbs b/ui/app/templates/vault/cluster/access/identity/aliases/show.hbs
index e0321be7ae166..fa27949dbca83 100644
--- a/ui/app/templates/vault/cluster/access/identity/aliases/show.hbs
+++ b/ui/app/templates/vault/cluster/access/identity/aliases/show.hbs
@@ -1,6 +1,6 @@
 <PageHeader as |p|>
   <p.top>
-    <nav class="breadcrumb" aria-label="breadcrumbs">
+    <nav class="breadcrumb">
       <ul>
         <li>
           <span class="sep">&#x0002f;</span>
@@ -18,7 +18,7 @@
   </p.levelLeft>
 </PageHeader>
 <div class="tabs-container box is-sideless is-fullwidth is-paddingless is-marginless">
-  <nav class="tabs sub-nav" aria-label="tabs">
+  <nav class="tabs sub-nav">
     <ul>
       {{#each (tabs-for-identity-show this.model.identityType) as |tab|}}
         <LinkTo @route="vault.cluster.access.identity.aliases.show" @models={{array this.model.id tab}}>
@@ -30,7 +30,10 @@
 </div>
 <Toolbar>
   <ToolbarActions>
-    <ToolbarLink @route="vault.cluster.access.identity.aliases.edit" @model={{this.model.id}} data-test-alias-edit-link>
+    <ToolbarLink
+      @params={{array "vault.cluster.access.identity.aliases.edit" this.model.id}}
+      data-test-alias-edit-link={{true}}
+    >
       Edit
       {{lowercase (humanize this.model.identityType)}}
     </ToolbarLink>
diff --git a/ui/app/templates/vault/cluster/access/identity/index.hbs b/ui/app/templates/vault/cluster/access/identity/index.hbs
index 4656e56af4809..b582d10f09c82 100644
--- a/ui/app/templates/vault/cluster/access/identity/index.hbs
+++ b/ui/app/templates/vault/cluster/access/identity/index.hbs
@@ -109,8 +109,8 @@
       Create
       {{this.identityType}}
     </LinkTo>
-    <DocLink @path="/vault/tutorials/auth-methods/identity">
+    <LearnLink @path="/vault/identity-access-management/iam-identity">
       Learn more
-    </DocLink>
+    </LearnLink>
   </EmptyState>
 {{/if}}
\ No newline at end of file
diff --git a/ui/app/templates/vault/cluster/access/identity/show.hbs b/ui/app/templates/vault/cluster/access/identity/show.hbs
index dde68c9579e92..e1d0b6babdbc6 100644
--- a/ui/app/templates/vault/cluster/access/identity/show.hbs
+++ b/ui/app/templates/vault/cluster/access/identity/show.hbs
@@ -1,6 +1,6 @@
 <PageHeader as |p|>
   <p.top>
-    <nav class="breadcrumb" aria-label="breadcrumbs">
+    <nav class="breadcrumb">
       <ul>
         <li>
           <span class="sep">&#x0002f;</span>
@@ -18,7 +18,7 @@
   </p.levelLeft>
 </PageHeader>
 <div class="tabs-container box is-sideless is-fullwidth is-paddingless is-marginless">
-  <nav class="tabs sub-nav" aria-label="tabs">
+  <nav class="tabs sub-nav">
     <ul>
       {{#each (tabs-for-identity-show this.model.identityType this.model.type) as |tab|}}
         <LinkTo
@@ -34,21 +34,18 @@
 </div>
 <Toolbar>
   <ToolbarActions>
-    {{! template-lint-disable simple-unless }}
+    {{! template-lint-configure simple-unless "warn" }}
     {{#unless (or (and (eq this.model.identityType "group") (eq this.model.type "internal")) this.model.alias)}}
       <ToolbarLink
-        @route="vault.cluster.access.identity.aliases.add"
-        @models={{array (pluralize this.model.identityType) this.model.id}}
         @type="add"
+        @params={{array "vault.cluster.access.identity.aliases.add" (pluralize this.model.identityType) this.model.id}}
         data-test-entity-create-link={{true}}
       >
         Add alias
       </ToolbarLink>
     {{/unless}}
-    {{! template-lint-enable simple-unless }}
     <ToolbarLink
-      @route="vault.cluster.access.identity.edit"
-      @models={{array (pluralize this.model.identityType) this.model.id}}
+      @params={{array "vault.cluster.access.identity.edit" (pluralize this.model.identityType) this.model.id}}
       data-test-entity-edit-link={{true}}
     >
       Edit
diff --git a/ui/app/templates/vault/cluster/access/leases/list.hbs b/ui/app/templates/vault/cluster/access/leases/list.hbs
index 017da9cac6fa2..d6894bbaaafe6 100644
--- a/ui/app/templates/vault/cluster/access/leases/list.hbs
+++ b/ui/app/templates/vault/cluster/access/leases/list.hbs
@@ -31,9 +31,9 @@
       @placeholder="Filter leases"
     />
     {{#if this.filterFocused}}
-      {{! template-lint-disable no-whitespace-for-layout }}
+      {{!template-lint-configure no-whitespace-for-layout "warn"}}
       &nbsp; &nbsp;
-      {{! template-lint-enable no-whitespace-for-layout }}
+      {{!template-lint-configure no-whitespace-for-layout "on"}}
       {{#if this.filterMatchesKey}}
         {{#unless this.filterIsFolder}}
           <p class="help has-text-grey is-size-8">
diff --git a/ui/app/templates/vault/cluster/access/loading.hbs b/ui/app/templates/vault/cluster/access/loading.hbs
deleted file mode 100644
index d92eddc543009..0000000000000
--- a/ui/app/templates/vault/cluster/access/loading.hbs
+++ /dev/null
@@ -1 +0,0 @@
-<LayoutLoading />
\ No newline at end of file
diff --git a/ui/app/templates/vault/cluster/access/method/section.hbs b/ui/app/templates/vault/cluster/access/method/section.hbs
index bb1c8945e1a73..df24feda43733 100644
--- a/ui/app/templates/vault/cluster/access/method/section.hbs
+++ b/ui/app/templates/vault/cluster/access/method/section.hbs
@@ -18,10 +18,10 @@
   </p.levelLeft>
 </PageHeader>
 
-{{#if (not (includes this.model.type (supported-managed-auth-backends)))}}
+{{#if (not (contains this.model.type (supported-managed-auth-backends)))}}
   <div class="has-text-grey has-top-bottom-margin" data-test-doc-link>
     The Vault UI only supports configuration for this authentication method. For management, the
-    <DocLink @path="/vault/api-docs">API or CLI</DocLink>
+    <DocLink @path="/api/auth">API or CLI</DocLink>
     should be used.
   </div>
 {{/if}}
@@ -31,7 +31,7 @@
 {{#if (eq this.section "configuration")}}
   <Toolbar>
     <ToolbarActions>
-      <ToolbarLink @route="vault.cluster.settings.auth.configure" @model={{this.model.id}} data-test-configure-link="true">
+      <ToolbarLink @params={{array "vault.cluster.settings.auth.configure" this.model.id}} data-test-configure-link="true">
         Configure
       </ToolbarLink>
     </ToolbarActions>
diff --git a/ui/app/templates/vault/cluster/access/methods.hbs b/ui/app/templates/vault/cluster/access/methods.hbs
index c04c4c7f30551..b5bb95572573c 100644
--- a/ui/app/templates/vault/cluster/access/methods.hbs
+++ b/ui/app/templates/vault/cluster/access/methods.hbs
@@ -7,41 +7,14 @@
 </PageHeader>
 
 <Toolbar>
-  <ToolbarFilters>
-    <SearchSelect
-      @id="filter-by-auth-type"
-      @options={{this.authMethodArrayByType}}
-      @selectLimit="1"
-      @disallowNewItems={{true}}
-      @fallbackComponent="input-search"
-      @onChange={{this.filterAuthType}}
-      @placeholder={{"Filter by auth type"}}
-      @displayInherit={{true}}
-      @inputValue={{if this.selectedAuthType (array this.selectedAuthType)}}
-      @disabled={{if this.selectedAuthName true false}}
-      class="is-marginless"
-    />
-    <SearchSelect
-      @id="filter-by-auth-name"
-      @options={{this.authMethodArrayByName}}
-      @selectLimit="1"
-      @disallowNewItems={{true}}
-      @fallbackComponent="input-search"
-      @onChange={{this.filterAuthName}}
-      @placeholder={{"Filter by auth name"}}
-      @displayInherit={{true}}
-      @inputValue={{if this.selectedAuthName (array this.selectedAuthName)}}
-      class="is-marginless has-left-padding-s"
-    />
-  </ToolbarFilters>
   <ToolbarActions>
-    <ToolbarLink @route="vault.cluster.settings.auth.enable" @type="add" data-test-auth-enable>
+    <ToolbarLink @type="add" @params={{array "vault.cluster.settings.auth.enable"}} data-test-auth-enable>
       Enable new method
     </ToolbarLink>
   </ToolbarActions>
 </Toolbar>
 
-{{#each (sort-by "path" this.authMethodList) as |method|}}
+{{#each (sort-by "path" this.model) as |method|}}
   <LinkedBlock
     @params={{array "vault.cluster.access.method" method.id}}
     class="list-item-row"
diff --git a/ui/app/templates/vault/cluster/access/mfa/enforcements/enforcement/index.hbs b/ui/app/templates/vault/cluster/access/mfa/enforcements/enforcement/index.hbs
index bc2804cba210b..c819d52f53423 100644
--- a/ui/app/templates/vault/cluster/access/mfa/enforcements/enforcement/index.hbs
+++ b/ui/app/templates/vault/cluster/access/mfa/enforcements/enforcement/index.hbs
@@ -50,9 +50,8 @@
     </button>
     <div class="toolbar-separator"></div>
     <ToolbarLink
-      @route="vault.cluster.access.mfa.enforcements.enforcement.edit"
-      @model={{this.model.id}}
-      data-test-enforcement-edit
+      @params={{array "vault.cluster.access.mfa.enforcements.enforcement.edit" this.model.id}}
+      data-test-enforcement-edit={{true}}
     >
       Edit enforcement
     </ToolbarLink>
diff --git a/ui/app/templates/vault/cluster/access/mfa/enforcements/index.hbs b/ui/app/templates/vault/cluster/access/mfa/enforcements/index.hbs
index 89e6dd017e3f7..14eddccba0e52 100644
--- a/ui/app/templates/vault/cluster/access/mfa/enforcements/index.hbs
+++ b/ui/app/templates/vault/cluster/access/mfa/enforcements/index.hbs
@@ -10,7 +10,11 @@
 
 <Toolbar>
   <ToolbarActions>
-    <ToolbarLink @route="vault.cluster.access.mfa.enforcements.create" @type="add" data-test-enforcement-create>
+    <ToolbarLink
+      @type="add"
+      @params={{array "vault.cluster.access.mfa.enforcements.create"}}
+      data-test-enforcement-create={{true}}
+    >
       New enforcement
     </ToolbarLink>
   </ToolbarActions>
diff --git a/ui/app/templates/vault/cluster/access/mfa/index.hbs b/ui/app/templates/vault/cluster/access/mfa/index.hbs
index 148d68314336b..fd7ec3433be02 100644
--- a/ui/app/templates/vault/cluster/access/mfa/index.hbs
+++ b/ui/app/templates/vault/cluster/access/mfa/index.hbs
@@ -6,14 +6,14 @@
   </p.levelLeft>
 </PageHeader>
 
-<div class="box is-fullwidth is-sideless is-flex-between is-shadowless is-marginless">
+<div class="box is-fullwidth is-sideless is-flex-between is-box-shadowless is-marginless">
   <p>
     Configure and enforce multi-factor authentication (MFA) for users logging into Vault, for any
     <br />
     authentication method.
-    <DocLink @path="/vault/tutorials/auth-methods/multi-factor-authentication">
+    <LearnLink @path="/tutorials/vault/multi-factor-authentication">
       Learn more
-    </DocLink>
+    </LearnLink>
   </p>
   <button
     type="submit"
diff --git a/ui/app/templates/vault/cluster/access/mfa/methods/create.hbs b/ui/app/templates/vault/cluster/access/mfa/methods/create.hbs
index b60673d098bac..9b75d119f9daa 100644
--- a/ui/app/templates/vault/cluster/access/mfa/methods/create.hbs
+++ b/ui/app/templates/vault/cluster/access/mfa/methods/create.hbs
@@ -25,12 +25,12 @@
 </PageHeader>
 <div class="has-border-top-light has-top-padding-l">
   {{#if this.showForms}}
-    <h3 class="is-size-4 has-text-weight-semibold">Settings</h3>
+    <h3 class="is-size-4 has-text-semibold">Settings</h3>
     <p class="has-border-top-light has-top-padding-l">
       {{this.description}}
-      <DocLink @path={{concat "/vault/api-docs/secret/identity/mfa/" this.type}}>Learn more.</DocLink>
+      <DocLink @path={{concat "/api-docs/secret/identity/mfa/" this.type}}>Learn more.</DocLink>
     </p>
-    <Mfa::MethodForm @model={{this.method}} @validations={{this.methodErrors}} class="is-shadowless" />
+    <Mfa::MethodForm @model={{this.method}} @validations={{this.methodErrors}} class="is-box-shadowless" />
     <Mfa::MfaLoginEnforcementHeader
       @isInline={{true}}
       @radioCardGroupValue={{this.enforcementPreference}}
@@ -49,7 +49,7 @@
     <p>
       Multi-factor authentication (MFA) allows you to set up another layer of security on top of existing authentication
       methods. Vault has four available methods.
-      <DocLink @path="/vault/api-docs/secret/identity/mfa">Learn more.</DocLink>
+      <DocLink @path="/api-docs/secret/identity/mfa">Learn more.</DocLink>
     </p>
     <div class="is-flex-row has-top-margin-xl">
       {{#each this.methodNames as |methodName|}}
@@ -66,7 +66,7 @@
                 @size="24"
                 class={{if (eq methodName "TOTP") "has-text-grey"}}
               />
-              <p class="has-text-weight-semibold has-text-center {{if (eq methodName 'Okta') 'has-top-margin-xs'}}">
+              <p class="has-text-semibold has-text-align-center {{if (eq methodName 'Okta') 'has-top-margin-xs'}}">
                 {{methodName}}
               </p>
             </div>
@@ -77,7 +77,7 @@
     {{#if this.type}}
       <p class="has-top-margin-l">
         {{this.description}}
-        <DocLink @path={{concat "/vault/api-docs/secret/identity/mfa/" this.type}}>Learn more.</DocLink>
+        <DocLink @path={{concat "/api-docs/secret/identity/mfa/" this.type}}>Learn more.</DocLink>
       </p>
       {{! in a future release cards may be displayed to choose from either template or custom config for TOTP }}
       {{! if template is selected a user could choose a predefined config for common authenticators and the values would be populated on the model }}
diff --git a/ui/app/templates/vault/cluster/access/mfa/methods/index.hbs b/ui/app/templates/vault/cluster/access/mfa/methods/index.hbs
index 5730da152673a..404427745ccb7 100644
--- a/ui/app/templates/vault/cluster/access/mfa/methods/index.hbs
+++ b/ui/app/templates/vault/cluster/access/mfa/methods/index.hbs
@@ -10,7 +10,7 @@
 
 <Toolbar>
   <ToolbarActions>
-    <ToolbarLink @route="vault.cluster.access.mfa.methods.create" @type="add" data-test-mfa-method-create>
+    <ToolbarLink @type="add" @params={{array "vault.cluster.access.mfa.methods.create"}} data-test-mfa-method-create>
       New MFA method
     </ToolbarLink>
   </ToolbarActions>
diff --git a/ui/app/templates/vault/cluster/access/mfa/methods/method/index.hbs b/ui/app/templates/vault/cluster/access/mfa/methods/method/index.hbs
index bcbd77bd831a2..f9c1b7fd1d2e4 100644
--- a/ui/app/templates/vault/cluster/access/mfa/methods/method/index.hbs
+++ b/ui/app/templates/vault/cluster/access/mfa/methods/method/index.hbs
@@ -1,6 +1,6 @@
 <PageHeader as |p|>
   <p.top>
-    <nav class="breadcrumb" aria-label="breadcrumbs">
+    <nav class="breadcrumb">
       <ul>
         <li>
           <span class="sep">&#x0002f;</span>
@@ -20,7 +20,7 @@
 </PageHeader>
 
 <div class="tabs-container box is-sideless is-fullwidth is-paddingless is-marginless">
-  <nav class="tabs" aria-label="tabs">
+  <nav class="tabs">
     <ul>
       <LinkTo @route="vault.cluster.access.mfa.methods.method" @query={{hash tab="config"}} data-test-tab="config">
         Configuration
@@ -50,8 +50,7 @@
         Delete
       </ConfirmAction>
       <ToolbarLink
-        @route="vault.cluster.access.mfa.methods.method.edit"
-        @model={{this.model.method.id}}
+        @params={{array "vault.cluster.access.mfa.methods.method.edit" this.model.method.id}}
         data-test-mfa-method-edit
       >
         Edit
@@ -78,7 +77,7 @@
 {{else if (eq this.tab "enforcements")}}
   <Toolbar>
     <ToolbarActions>
-      <ToolbarLink @route="vault.cluster.access.mfa.enforcements.create" @type="add" data-test-enforcement-create>
+      <ToolbarLink @type="add" @params={{array "vault.cluster.access.mfa.enforcements.create"}}>
         New enforcement
       </ToolbarLink>
     </ToolbarActions>
diff --git a/ui/app/templates/vault/cluster/access/namespaces/index.hbs b/ui/app/templates/vault/cluster/access/namespaces/index.hbs
index c4e56997ca6d1..1c12cb4b4c658 100644
--- a/ui/app/templates/vault/cluster/access/namespaces/index.hbs
+++ b/ui/app/templates/vault/cluster/access/namespaces/index.hbs
@@ -9,7 +9,7 @@
 
   <Toolbar>
     <ToolbarActions>
-      <ToolbarLink @route="vault.cluster.access.namespaces.create" @type="add">
+      <ToolbarLink @type="add" @params={{array "vault.cluster.access.namespaces.create"}}>
         Create namespace
       </ToolbarLink>
     </ToolbarActions>
@@ -22,9 +22,9 @@
           Create Namespace
         </LinkTo>
 
-        <DocLink @path="/vault/tutorials/enterprise/namespaces">
+        <LearnLink @path="/vault/security/namespaces">
           Learn more
-        </DocLink>
+        </LearnLink>
       </list.empty>
     {{else}}
       <ListItem as |Item|>
@@ -33,7 +33,7 @@
         </Item.content>
         <Item.menu as |m|>
           {{#let (concat this.currentNamespace (if this.currentNamespace "/") list.item.id) as |targetNamespace|}}
-            {{#if (includes targetNamespace this.accessibleNamespaces)}}
+            {{#if (contains targetNamespace this.accessibleNamespaces)}}
               <li class="action">
                 <NamespaceLink @targetNamespace={{targetNamespace}} @unparsed={{true}} @class="is-block">
                   Switch to Namespace
diff --git a/ui/app/templates/vault/cluster/access/oidc.hbs b/ui/app/templates/vault/cluster/access/oidc.hbs
index 1417be59f9906..ff76bc722ef39 100644
--- a/ui/app/templates/vault/cluster/access/oidc.hbs
+++ b/ui/app/templates/vault/cluster/access/oidc.hbs
@@ -6,7 +6,7 @@
       </h1>
     </p.levelLeft>
   </PageHeader>
-  <div class="box is-fullwidth is-sideless is-flex-between is-shadowless is-marginless" data-test-oidc-header>
+  <div class="box is-fullwidth is-sideless is-flex-between is-box-shadowless is-marginless" data-test-oidc-header>
     <p>
       Configure Vault to act as an OIDC identity provider, and offer
       {{"Vault’s"}}
@@ -15,9 +15,9 @@
         <br />
       {{/if}}
       methods and source of identity to any client applications.
-      <DocLink @path="/vault/tutorials/auth-methods/oidc-identity-provider">
+      <LearnLink @path="/tutorials/vault/oidc-identity-provider">
         Learn more
-      </DocLink>
+      </LearnLink>
     </p>
     {{#if this.isCta}}
       <button
diff --git a/ui/app/templates/vault/cluster/access/oidc/assignments/assignment/details.hbs b/ui/app/templates/vault/cluster/access/oidc/assignments/assignment/details.hbs
index e7ff6591c17df..6a9ad186d6ef6 100644
--- a/ui/app/templates/vault/cluster/access/oidc/assignments/assignment/details.hbs
+++ b/ui/app/templates/vault/cluster/access/oidc/assignments/assignment/details.hbs
@@ -49,8 +49,7 @@
     {{/if}}
     {{#if @model.canEdit}}
       <ToolbarLink
-        @route="vault.cluster.access.oidc.assignments.assignment.edit"
-        @model={{@model.name}}
+        @params={{array "vault.cluster.access.oidc.assignments.assignment.edit" @model.name}}
         data-test-oidc-assignment-edit
       >
         Edit assignment
diff --git a/ui/app/templates/vault/cluster/access/oidc/assignments/assignment/edit.hbs b/ui/app/templates/vault/cluster/access/oidc/assignments/assignment/edit.hbs
index 5ffb72175368f..1c302ffa93fdb 100644
--- a/ui/app/templates/vault/cluster/access/oidc/assignments/assignment/edit.hbs
+++ b/ui/app/templates/vault/cluster/access/oidc/assignments/assignment/edit.hbs
@@ -1,22 +1,3 @@
-<PageHeader as |p|>
-  <p.top>
-    <nav class="breadcrumb" aria-label="breadcrumbs">
-      <ul>
-        <li>
-          <span class="sep">&#x0002f;</span>
-          <LinkTo @route={{"vault.cluster.access.oidc.assignments.assignment.details"}} @model={{this.model.name}}>
-            Details
-          </LinkTo>
-        </li>
-      </ul>
-    </nav>
-  </p.top>
-  <p.levelLeft>
-    <h1 class="title is-3" data-test-oidc-assignment-title>
-      Edit assignment
-    </h1>
-  </p.levelLeft>
-</PageHeader>
 <Oidc::AssignmentForm
   @model={{this.model}}
   @onCancel={{transition-to "vault.cluster.access.oidc.assignments.assignment.details" this.model.name}}
diff --git a/ui/app/templates/vault/cluster/access/oidc/assignments/create.hbs b/ui/app/templates/vault/cluster/access/oidc/assignments/create.hbs
index 0b252a194b4f2..221e6d790f310 100644
--- a/ui/app/templates/vault/cluster/access/oidc/assignments/create.hbs
+++ b/ui/app/templates/vault/cluster/access/oidc/assignments/create.hbs
@@ -1,22 +1,3 @@
-<PageHeader as |p|>
-  <p.top>
-    <nav class="breadcrumb" aria-label="breadcrumbs">
-      <ul>
-        <li>
-          <span class="sep">&#x0002f;</span>
-          <LinkTo @route={{"vault.cluster.access.oidc.assignments"}}>
-            Assignments
-          </LinkTo>
-        </li>
-      </ul>
-    </nav>
-  </p.top>
-  <p.levelLeft>
-    <h1 class="title is-3" data-test-oidc-assignment-title>
-      Create assignment
-    </h1>
-  </p.levelLeft>
-</PageHeader>
 <Oidc::AssignmentForm
   @model={{this.model}}
   @onCancel={{transition-to "vault.cluster.access.oidc.assignments"}}
diff --git a/ui/app/templates/vault/cluster/access/oidc/assignments/index.hbs b/ui/app/templates/vault/cluster/access/oidc/assignments/index.hbs
index e54a035617381..2eb79dc07ccde 100644
--- a/ui/app/templates/vault/cluster/access/oidc/assignments/index.hbs
+++ b/ui/app/templates/vault/cluster/access/oidc/assignments/index.hbs
@@ -1,6 +1,10 @@
 <Toolbar>
   <ToolbarActions>
-    <ToolbarLink @route="vault.cluster.access.oidc.assignments.create" @type="add" data-test-oidc-assignment-create>
+    <ToolbarLink
+      @type="add"
+      @params={{array "vault.cluster.access.oidc.assignments.create"}}
+      data-test-oidc-assignment-create
+    >
       Create assignment
     </ToolbarLink>
   </ToolbarActions>
@@ -23,7 +27,7 @@
           {{#if (eq model.name "allow_all")}}
             <div class="is-size-8">
               This is a built-in assignment that cannot be modified or deleted.
-              <DocLink @path="/vault/docs/concepts/oidc-provider#assignments">
+              <DocLink @path="/docs/concepts/oidc-provider#assignments">
                 Learn more
               </DocLink>
             </div>
diff --git a/ui/app/templates/vault/cluster/access/oidc/clients/client/details.hbs b/ui/app/templates/vault/cluster/access/oidc/clients/client/details.hbs
index b40addd213fc5..6b4db378f0427 100644
--- a/ui/app/templates/vault/cluster/access/oidc/clients/client/details.hbs
+++ b/ui/app/templates/vault/cluster/access/oidc/clients/client/details.hbs
@@ -15,9 +15,8 @@
     {{/if}}
     {{#if this.model.canEdit}}
       <ToolbarLink
-        @route="vault.cluster.access.oidc.clients.client.edit"
-        @model={{this.model.name}}
         data-test-oidc-client-edit
+        @params={{array "vault.cluster.access.oidc.clients.client.edit" this.model.name}}
       >
         Edit application
       </ToolbarLink>
diff --git a/ui/app/templates/vault/cluster/access/oidc/clients/index.hbs b/ui/app/templates/vault/cluster/access/oidc/clients/index.hbs
index 6e4a1baef7dbf..ccca4b996d33f 100644
--- a/ui/app/templates/vault/cluster/access/oidc/clients/index.hbs
+++ b/ui/app/templates/vault/cluster/access/oidc/clients/index.hbs
@@ -1,6 +1,6 @@
 <Toolbar>
   <ToolbarActions>
-    <ToolbarLink @route="vault.cluster.access.oidc.clients.create" @type="add" data-test-oidc-client-create>
+    <ToolbarLink data-test-oidc-client-create @type="add" @params={{array "vault.cluster.access.oidc.clients.create"}}>
       Create application
     </ToolbarLink>
   </ToolbarActions>
diff --git a/ui/app/templates/vault/cluster/access/oidc/keys/index.hbs b/ui/app/templates/vault/cluster/access/oidc/keys/index.hbs
index 2d68878a2c714..514667a198227 100644
--- a/ui/app/templates/vault/cluster/access/oidc/keys/index.hbs
+++ b/ui/app/templates/vault/cluster/access/oidc/keys/index.hbs
@@ -1,6 +1,6 @@
 <Toolbar>
   <ToolbarActions>
-    <ToolbarLink @route="vault.cluster.access.oidc.keys.create" @type="add" data-test-oidc-key-create>
+    <ToolbarLink data-test-oidc-key-create @type="add" @params={{array "vault.cluster.access.oidc.keys.create"}}>
       Create key
     </ToolbarLink>
   </ToolbarActions>
diff --git a/ui/app/templates/vault/cluster/access/oidc/keys/key/details.hbs b/ui/app/templates/vault/cluster/access/oidc/keys/key/details.hbs
index 837279042f4c2..4d208cf326c1d 100644
--- a/ui/app/templates/vault/cluster/access/oidc/keys/key/details.hbs
+++ b/ui/app/templates/vault/cluster/access/oidc/keys/key/details.hbs
@@ -39,7 +39,7 @@
       </ConfirmAction>
     {{/if}}
     {{#if this.model.canEdit}}
-      <ToolbarLink @route="vault.cluster.access.oidc.keys.key.edit" @model={{this.model.name}} data-test-oidc-key-edit>
+      <ToolbarLink data-test-oidc-key-edit @params={{array "vault.cluster.access.oidc.keys.key.edit" this.model.name}}>
         Edit key
       </ToolbarLink>
     {{/if}}
diff --git a/ui/app/templates/vault/cluster/access/oidc/providers/index.hbs b/ui/app/templates/vault/cluster/access/oidc/providers/index.hbs
index 35f099078c7c3..7439e03ccdfcd 100644
--- a/ui/app/templates/vault/cluster/access/oidc/providers/index.hbs
+++ b/ui/app/templates/vault/cluster/access/oidc/providers/index.hbs
@@ -1,6 +1,6 @@
 <Toolbar>
   <ToolbarActions>
-    <ToolbarLink @route="vault.cluster.access.oidc.providers.create" @type="add" data-test-oidc-provider-create>
+    <ToolbarLink data-test-oidc-provider-create @type="add" @params={{array "vault.cluster.access.oidc.providers.create"}}>
       Create provider
     </ToolbarLink>
   </ToolbarActions>
diff --git a/ui/app/templates/vault/cluster/access/oidc/providers/provider/details.hbs b/ui/app/templates/vault/cluster/access/oidc/providers/provider/details.hbs
index 377d9623df67a..7034ab7dcebc9 100644
--- a/ui/app/templates/vault/cluster/access/oidc/providers/provider/details.hbs
+++ b/ui/app/templates/vault/cluster/access/oidc/providers/provider/details.hbs
@@ -27,9 +27,8 @@
     {{/if}}
     {{#if this.model.canEdit}}
       <ToolbarLink
-        @route="vault.cluster.access.oidc.providers.provider.edit"
-        @model={{this.model.name}}
         data-test-oidc-provider-edit
+        @params={{array "vault.cluster.access.oidc.providers.provider.edit" this.model.name}}
       >
         Edit provider
       </ToolbarLink>
diff --git a/ui/app/templates/vault/cluster/access/oidc/scopes/index.hbs b/ui/app/templates/vault/cluster/access/oidc/scopes/index.hbs
index 02a4c6970fa22..b521c0a61e96f 100644
--- a/ui/app/templates/vault/cluster/access/oidc/scopes/index.hbs
+++ b/ui/app/templates/vault/cluster/access/oidc/scopes/index.hbs
@@ -1,6 +1,6 @@
 <Toolbar>
   <ToolbarActions>
-    <ToolbarLink @route="vault.cluster.access.oidc.scopes.create" @type="add" data-test-oidc-scope-create>
+    <ToolbarLink @type="add" @params={{array "vault.cluster.access.oidc.scopes.create"}} data-test-oidc-scope-create>
       Create scope
     </ToolbarLink>
   </ToolbarActions>
@@ -59,7 +59,7 @@
   <EmptyState @title="No scopes yet" data-test-oidc-scope-empty-state>
     <div>
       <p>Use scope to define identity information about the authenticated user.
-        <DocLink @path="/vault/docs/concepts/oidc-provider#scopes">
+        <DocLink @path="/docs/concepts/oidc-provider#scopes">
           Learn more.
         </DocLink>
       </p>
diff --git a/ui/app/templates/vault/cluster/access/oidc/scopes/scope/details.hbs b/ui/app/templates/vault/cluster/access/oidc/scopes/scope/details.hbs
index 3021c4b20cf4e..bd2612051273c 100644
--- a/ui/app/templates/vault/cluster/access/oidc/scopes/scope/details.hbs
+++ b/ui/app/templates/vault/cluster/access/oidc/scopes/scope/details.hbs
@@ -44,7 +44,7 @@
       <div class="toolbar-separator"></div>
     {{/if}}
     {{#if this.model.canEdit}}
-      <ToolbarLink @route="vault.cluster.access.oidc.scopes.scope.edit" @model={{this.model.name}} data-test-oidc-scope-edit>
+      <ToolbarLink data-test-oidc-scope-edit @params={{array "vault.cluster.access.oidc.scopes.scope.edit" this.model.name}}>
         Edit scope
       </ToolbarLink>
     {{/if}}
diff --git a/ui/app/templates/vault/cluster/auth.hbs b/ui/app/templates/vault/cluster/auth.hbs
index bdbf5716dd9e6..442a1f4711e5d 100644
--- a/ui/app/templates/vault/cluster/auth.hbs
+++ b/ui/app/templates/vault/cluster/auth.hbs
@@ -7,7 +7,7 @@
         @icon="alert-circle"
         @bottomBorder={{true}}
         @subTitle={{join ". " this.mfaErrors}}
-        class="is-shadowless"
+        class="is-box-shadowless"
       >
         <button type="button" class="button is-ghost is-transparent" {{on "click" (action "onMfaErrorDismiss")}}>
           <Icon @name="chevron-left" />
@@ -22,11 +22,6 @@
         <LogoEdition aria-label="Sign in with Hashicorp Vault" />
       </div>
     {{else}}
-      <div class="is-flex-v-centered has-bottom-margin-xxl">
-        <div class="brand-icon-large">
-          <Icon @name="vault" @size="24" @stretched={{true}} />
-        </div>
-      </div>
       <div class="is-flex-row">
         {{#if this.mfaAuthData}}
           <button type="button" class="icon-button" {{on "click" (fn (mut this.mfaAuthData) null)}}>
@@ -87,7 +82,6 @@
               <div class="field">
                 <div class="control">
                   <input
-                    data-test-auth-form-ns-input
                     value={{this.namespaceQueryParam}}
                     placeholder="/ (Root)"
                     oninput={{perform this.updateNamespace value="target.value"}}
diff --git a/ui/app/templates/vault/cluster/clients.hbs b/ui/app/templates/vault/cluster/clients.hbs
index a54e9d942b1d5..f8cfd1665f4fd 100644
--- a/ui/app/templates/vault/cluster/clients.hbs
+++ b/ui/app/templates/vault/cluster/clients.hbs
@@ -6,22 +6,25 @@
   </p.levelLeft>
 </PageHeader>
 
-<div class="tabs-container box is-bottomless is-marginless is-fullwidth is-paddingless">
+<div class="tabs-container box is-bottomless is-marginless is-fullwidth is-paddingless" data-test-pricing-metrics>
   <nav class="tabs">
     <ul>
-      <LinkTo @route="vault.cluster.clients.dashboard" data-test-dashboard>
-        Dashboard
+      <LinkTo @route="vault.cluster.clients.current" data-test-current-month>
+        Current month
       </LinkTo>
-      {{#if (or @model.config.canRead @model.canRead)}}
-        <LinkTo
-          @route="vault.cluster.clients.config"
-          @current-when="vault.cluster.clients.config vault.cluster.clients.edit"
-        >
+      <LinkTo @route="vault.cluster.clients.history" data-test-history>
+        History
+      </LinkTo>
+      {{#if (or @model.config.configPath.canRead @model.configPath.canRead)}}
+        <LinkTo @route="vault.cluster.clients.config">
           Configuration
         </LinkTo>
       {{/if}}
     </ul>
   </nav>
 </div>
-
-{{outlet}}
\ No newline at end of file
+{{#if this.currentlyLoading}}
+  <LayoutLoading />
+{{else}}
+  {{outlet}}
+{{/if}}
\ No newline at end of file
diff --git a/ui/app/templates/vault/cluster/clients/config.hbs b/ui/app/templates/vault/cluster/clients/config.hbs
index bdc3bd0073a5a..57b559f75fa02 100644
--- a/ui/app/templates/vault/cluster/clients/config.hbs
+++ b/ui/app/templates/vault/cluster/clients/config.hbs
@@ -1,6 +1,6 @@
 <Toolbar>
   <ToolbarActions>
-    {{#if @model.canEdit}}
+    {{#if @model.configPath.canUpdate}}
       <LinkTo @route="vault.cluster.clients.edit" class="toolbar-link">
         Edit configuration
       </LinkTo>
diff --git a/ui/app/templates/vault/cluster/clients/current.hbs b/ui/app/templates/vault/cluster/clients/current.hbs
new file mode 100644
index 0000000000000..b7b0eb5dc1ad4
--- /dev/null
+++ b/ui/app/templates/vault/cluster/clients/current.hbs
@@ -0,0 +1 @@
+<Clients::Current @model={{@model}} />
\ No newline at end of file
diff --git a/ui/app/templates/vault/cluster/clients/dashboard.hbs b/ui/app/templates/vault/cluster/clients/dashboard.hbs
deleted file mode 100644
index b85e787c43eb9..0000000000000
--- a/ui/app/templates/vault/cluster/clients/dashboard.hbs
+++ /dev/null
@@ -1 +0,0 @@
-<Clients::Dashboard @model={{@model}} />
\ No newline at end of file
diff --git a/ui/app/templates/vault/cluster/clients/history.hbs b/ui/app/templates/vault/cluster/clients/history.hbs
new file mode 100644
index 0000000000000..9ebf08cb50884
--- /dev/null
+++ b/ui/app/templates/vault/cluster/clients/history.hbs
@@ -0,0 +1 @@
+<Clients::History @model={{@model}} />
\ No newline at end of file
diff --git a/ui/app/templates/vault/cluster/clients/loading.hbs b/ui/app/templates/vault/cluster/clients/loading.hbs
deleted file mode 100644
index d92eddc543009..0000000000000
--- a/ui/app/templates/vault/cluster/clients/loading.hbs
+++ /dev/null
@@ -1 +0,0 @@
-<LayoutLoading />
\ No newline at end of file
diff --git a/ui/app/templates/vault/cluster/init.hbs b/ui/app/templates/vault/cluster/init.hbs
index 4b15cc81edd73..047795d13268a 100644
--- a/ui/app/templates/vault/cluster/init.hbs
+++ b/ui/app/templates/vault/cluster/init.hbs
@@ -90,10 +90,11 @@
             </div>
           {{/if}}
           <DownloadButton
-            class="button is-ghost"
-            @filename={{this.keyFilename}}
             @data={{this.keyData}}
+            @filename={{this.keyFilename}}
+            @mime="application/json"
             @extension="json"
+            @class="button is-ghost"
             @stringify={{true}}
           >
             <Icon @name="download" />
diff --git a/ui/app/templates/vault/cluster/mfa-setup.hbs b/ui/app/templates/vault/cluster/mfa-setup.hbs
index b885a998f1506..a0ca099337e1d 100644
--- a/ui/app/templates/vault/cluster/mfa-setup.hbs
+++ b/ui/app/templates/vault/cluster/mfa-setup.hbs
@@ -7,6 +7,7 @@
       <div class="box">
         {{#if (eq this.onStep 1)}}
           <Mfa::MfaSetupStepOne
+            @entityId={{this.entityId}}
             @isUUIDVerified={{this.isUUIDVerified}}
             @restartFlow={{this.restartFlow}}
             @saveUUIDandQrCode={{this.saveUUIDandQrCode}}
diff --git a/ui/app/templates/vault/cluster/policies.hbs b/ui/app/templates/vault/cluster/policies.hbs
index b3d4b9ec0402e..cf5c83720284b 100644
--- a/ui/app/templates/vault/cluster/policies.hbs
+++ b/ui/app/templates/vault/cluster/policies.hbs
@@ -1,2 +1,51 @@
-<Sidebar::Nav::Policies />
-{{outlet}}
\ No newline at end of file
+{{#if
+  (and
+    (has-feature "Sentinel") (or (has-permission "policies" routeParams="rgp") (has-permission "policies" routeParams="egp"))
+  )
+}}
+  <div class="columns">
+    <MenuSidebar @title="Policies" @class="is-3" @data-test-sidebar={{true}}>
+      {{#if (has-permission "policies" routeParams="acl")}}
+        <li>
+          <LinkTo
+            @route="vault.cluster.policies"
+            @model="acl"
+            data-test-link={{true}}
+            class={{if (is-active-route "vault.cluster.policies" "acl") "is-active"}}
+          >
+            ACL Policies
+          </LinkTo>
+        </li>
+      {{/if}}
+      {{#if (has-permission "policies" routeParams="rgp")}}
+        <li>
+          <LinkTo
+            @route="vault.cluster.policies"
+            @model="rgp"
+            data-test-link={{true}}
+            class={{if (is-active-route "vault.cluster.policies" "rgp") "is-active"}}
+          >
+            Role Governing Policies
+          </LinkTo>
+        </li>
+      {{/if}}
+      {{#if (has-permission "policies" routeParams="egp")}}
+        <li>
+          <LinkTo
+            @route="vault.cluster.policies"
+            @model="egp"
+            data-test-link={{true}}
+            class={{if (is-active-route "vault.cluster.policies" "egp") "is-active"}}
+          >
+            Endpoint Governing Policies
+          </LinkTo>
+        </li>
+      {{/if}}
+    </MenuSidebar>
+    <div class="column is-9">
+      {{outlet}}
+    </div>
+  </div>
+{{else}}
+  {{outlet}}
+{{/if}}
\ No newline at end of file
diff --git a/ui/app/templates/vault/cluster/policies/create.hbs b/ui/app/templates/vault/cluster/policies/create.hbs
index 23041d15e2fce..a119b7b7b42b6 100644
--- a/ui/app/templates/vault/cluster/policies/create.hbs
+++ b/ui/app/templates/vault/cluster/policies/create.hbs
@@ -17,8 +17,70 @@
   </p.levelLeft>
 </PageHeader>
 
-<PolicyForm
-  @model={{this.model}}
-  @onSave={{transition-to "vault.cluster.policy.show" this.model.policyType this.model.name}}
-  @onCancel={{transition-to "vault.cluster.policies.index"}}
-/>
\ No newline at end of file
+<form {{action "savePolicy" this.model on="submit"}}>
+  <div class="box is-bottomless is-fullwidth is-marginless">
+    <MessageError @model={{this.model}} @errors={{this.model.errors}} />
+    <NamespaceReminder @mode="create" @noun="policy" />
+    <div class="field">
+      <label for="policy-name" class="is-label">Name</label>
+      <div class="control">
+        <input
+          type="text"
+          id="policy-name"
+          class="input"
+          value={{this.model.name}}
+          oninput={{action "setModelName" this.model}}
+          data-test-policy-input="name"
+        />
+      </div>
+    </div>
+    <div class="field">
+      <Toolbar>
+        <label class="is-label">Policy</label>
+        <ToolbarActions>
+          <div class="toolbar-separator"></div>
+          <div class="control is-flex">
+            <Input
+              id="fileUploadToggle"
+              @type="checkbox"
+              name="fileUploadToggle"
+              class="switch is-rounded is-success is-small"
+              @checked={{this.showFileUpload}}
+              {{on "change" (toggle-action "showFileUpload" this)}}
+              data-test-policy-edit-toggle={{true}}
+            />
+            <label for="fileUploadToggle">Upload file</label>
+          </div>
+        </ToolbarActions>
+      </Toolbar>
+      {{#if this.showFileUpload}}
+        <TextFile @inputOnly={{true}} @file={{this.file}} @onChange={{action "setPolicyFromFile"}} />
+      {{else}}
+        <JsonEditor
+          @title="Policy"
+          @helpText="You can use Alt+Tab (Option+Tab on MacOS) in the code editor to skip to the next field"
+          @showToolbar={{false}}
+          @value={{this.model.policy}}
+          @valueUpdated={{action (mut this.model.policy)}}
+          @mode="ruby"
+          @extraKeys={{hash Shift-Enter=(action "savePolicy" this.model)}}
+        />
+      {{/if}}
+    </div>
+    {{#each this.model.additionalAttrs as |attr|}}
+      <FormField data-test-field={{true}} @attr={{attr}} @model={{@model}} />
+    {{/each}}
+  </div>
+  <div class="field is-grouped box is-fullwidth is-bottomless">
+    <div class="control">
+      <button type="submit" disabled={{this.buttonDisabled}} class="button is-primary" data-test-policy-save={{true}}>
+        Create policy
+      </button>
+    </div>
+    <div class="control">
+      <LinkTo @route="vault.cluster.policies" @replace={{true}} class="button">
+        Cancel
+      </LinkTo>
+    </div>
+  </div>
+</form>
\ No newline at end of file
diff --git a/ui/app/templates/vault/cluster/policies/index.hbs b/ui/app/templates/vault/cluster/policies/index.hbs
index 925e27e506885..1404fb4e35f7d 100644
--- a/ui/app/templates/vault/cluster/policies/index.hbs
+++ b/ui/app/templates/vault/cluster/policies/index.hbs
@@ -16,7 +16,7 @@
     {{#if this.model.meta.total}}
       <ToolbarFilters>
         <NavigateInput
-          @filterFocusDidChange={{action "setFilterFocus"}}
+          filterFocusDidChange={{action "setFilterFocus"}}
           @filterDidChange={{action "setFilter"}}
           @filter={{this.filter}}
           @filterMatchesKey={{this.filterMatchesKey}}
@@ -44,7 +44,7 @@
       </ToolbarFilters>
     {{/if}}
     <ToolbarActions>
-      <ToolbarLink @route="vault.cluster.policies.create" @type="add" data-test-policy-create-link>
+      <ToolbarLink @type="add" @params={{array "vault.cluster.policies.create"}} data-test-policy-create-link={{true}}>
         Create
         {{uppercase this.policyType}}
         policy
@@ -166,10 +166,10 @@
         policy
         <Chevron />
       </LinkTo>
-      <DocLink @path="/vault/tutorials/getting-started/getting-started-policies">
+      <LearnLink @path="/vault/getting-started/policies">
         Learn more
         <Chevron />
-      </DocLink>
+      </LearnLink>
     </EmptyState>
   {{/if}}
 {{else}}
diff --git a/ui/app/templates/vault/cluster/policy.hbs b/ui/app/templates/vault/cluster/policy.hbs
index b3d4b9ec0402e..7e2149548d198 100644
--- a/ui/app/templates/vault/cluster/policy.hbs
+++ b/ui/app/templates/vault/cluster/policy.hbs
@@ -1,2 +1,45 @@
-<Sidebar::Nav::Policies />
-{{outlet}}
\ No newline at end of file
+<div class="columns">
+  <MenuSidebar @title="Policies" @class="is-3" @data-test-sidebar={{true}}>
+    {{#if (has-permission "policies" routeParams="acl")}}
+      <li>
+        <LinkTo
+          @route="vault.cluster.policies"
+          @model="acl"
+          data-test-link={{true}}
+          class={{if (is-active-route "vault.cluster.policy" "acl") "is-active"}}
+        >
+          ACL Policies
+        </LinkTo>
+      </li>
+    {{/if}}
+    {{#if (has-feature "Sentinel")}}
+      {{#if (has-permission "policies" routeParams="rgp")}}
+        <li>
+          <LinkTo
+            @route="vault.cluster.policies"
+            @model="rgp"
+            data-test-link={{true}}
+            class={{if (is-active-route "vault.cluster.policy" "rgp") "is-active"}}
+          >
+            Role Governing Policies
+          </LinkTo>
+        </li>
+      {{/if}}
+      {{#if (has-permission "policies" routeParams="egp")}}
+        <li>
+          <LinkTo
+            @route="vault.cluster.policies"
+            @model="egp"
+            data-test-link={{true}}
+            class={{if (is-active-route "vault.cluster.policy" "egp") "is-active"}}
+          >
+            Endpoint Governing Policies
+          </LinkTo>
+        </li>
+      {{/if}}
+    {{/if}}
+  </MenuSidebar>
+  <div class="column is-9">
+    {{outlet}}
+  </div>
+</div>
\ No newline at end of file
diff --git a/ui/app/templates/vault/cluster/policy/edit.hbs b/ui/app/templates/vault/cluster/policy/edit.hbs
index bd057e4e9f3d7..bc36db87a4927 100644
--- a/ui/app/templates/vault/cluster/policy/edit.hbs
+++ b/ui/app/templates/vault/cluster/policy/edit.hbs
@@ -28,22 +28,55 @@
         <ConfirmAction
           @buttonClasses="toolbar-link"
           @confirmMessage="This may affect access to Vault data."
-          @onConfirmAction={{this.deletePolicy}}
+          @onConfirmAction={{action "deletePolicy" this.model}}
           data-test-policy-delete="true"
         >
           Delete
         </ConfirmAction>
         <div class="toolbar-separator"></div>
       {{/if}}
-      <ToolbarLink @route="vault.cluster.policy.show" @model={{this.model.id}} data-test-policy-edit-toggle>
+      <ToolbarLink @params={{array "vault.cluster.policy.show" this.model.id}} data-test-policy-edit-toggle={{true}}>
         Back to policy
       </ToolbarLink>
     </ToolbarActions>
   </Toolbar>
 {{/if}}
-
-<PolicyForm
-  @model={{this.model}}
-  @onSave={{transition-to "vault.cluster.policy.show" this.model.policyType this.model.name}}
-  @onCancel={{transition-to "vault.cluster.policy.show" this.model.policyType this.model.name}}
-/>
\ No newline at end of file
+<form {{action "savePolicy" this.model on="submit"}}>
+  <div class="box is-bottomless is-fullwidth is-marginless">
+    <MessageError @model={{this.model}} />
+    <NamespaceReminder @mode="edit" @noun="policy" />
+    <div class="field">
+      <JsonEditor
+        @title="Policy"
+        @value={{this.model.policy}}
+        @valueUpdated={{action (mut this.model.policy)}}
+        @mode="ruby"
+        @extraKeys={{hash Shift-Enter=(action "savePolicy" this.model)}}
+      />
+      <div class="box is-shadowless is-fullwidth has-short-padding">
+        <p class="help-text has-text-grey-dark is-size-7">
+          You can use Alt+Tab (Option+Tab on MacOS) in the code editor to skip to the next field
+        </p>
+      </div>
+    </div>
+    {{#each this.model.additionalAttrs as |attr|}}
+      <FormField data-test-field={{true}} @attr={{attr}} @model={{@model}} />
+    {{/each}}
+    <div class="field is-grouped is-grouped-split is-fullwidth box is-bottomless">
+      <div class="field is-grouped">
+        {{#if this.capabilities.canUpdate}}
+          <div class="control">
+            <button type="submit" disabled={{this.buttonDisabled}} class="button is-primary" data-test-policy-save={{true}}>
+              Save
+            </button>
+          </div>
+        {{/if}}
+        <div class="control">
+          <LinkTo @route="vault.cluster.policy.show" @model={{this.model.id}} @replace={{true}} class="button">
+            Cancel
+          </LinkTo>
+        </div>
+      </div>
+    </div>
+  </div>
+</form>
\ No newline at end of file
diff --git a/ui/app/templates/vault/cluster/policy/show.hbs b/ui/app/templates/vault/cluster/policy/show.hbs
index 7606b4af9626f..a24ae1492f0b8 100644
--- a/ui/app/templates/vault/cluster/policy/show.hbs
+++ b/ui/app/templates/vault/cluster/policy/show.hbs
@@ -23,17 +23,14 @@
 </PageHeader>
 <Toolbar>
   <ToolbarActions>
-    <DownloadButton
-      class="toolbar-link"
+    <ToolbarDownloadButton
+      @actionText="Download policy"
+      @extension={{if (eq this.policyType "acl") this.model.format "sentinel"}}
       @filename={{this.model.name}}
       @data={{this.model.policy}}
-      @extension={{if (eq this.policyType "acl") this.model.format "sentinel"}}
-    >
-      Download policy
-      <Chevron @isButton={{true}} />
-    </DownloadButton>
+    />
     {{#if (and (not-eq this.model.id "root") (or this.capabilities.canUpdate this.capabilities.canDelete))}}
-      <ToolbarLink @route="vault.cluster.policy.edit" @model={{this.model.id}} data-test-policy-edit-toggle>
+      <ToolbarLink @params={{array "vault.cluster.policy.edit" this.model.id}} data-test-policy-edit-toggle={{true}}>
         Edit policy
       </ToolbarLink>
     {{/if}}
diff --git a/ui/app/templates/vault/cluster/replication-dr-promote/details.hbs b/ui/app/templates/vault/cluster/replication-dr-promote/details.hbs
index 98703b490f133..4bdd7733b8eaa 100644
--- a/ui/app/templates/vault/cluster/replication-dr-promote/details.hbs
+++ b/ui/app/templates/vault/cluster/replication-dr-promote/details.hbs
@@ -18,9 +18,9 @@
                 </LinkTo>
               </li>
               <li>
-                <DocLink @path="/vault/tutorials/enterprise/disaster-recovery" @class="has-text-grey">
+                <LearnLink @path="/vault/operations/ops-disaster-recovery" @class="has-text-grey">
                   Need help?
-                </DocLink>
+                </LearnLink>
               </li>
             </ul>
           </nav>
diff --git a/ui/app/templates/vault/cluster/replication-dr-promote/index.hbs b/ui/app/templates/vault/cluster/replication-dr-promote/index.hbs
index 873296228a9ca..8c5075d552d03 100644
--- a/ui/app/templates/vault/cluster/replication-dr-promote/index.hbs
+++ b/ui/app/templates/vault/cluster/replication-dr-promote/index.hbs
@@ -18,9 +18,9 @@
                 </LinkTo>
               </li>
               <li>
-                <DocLink @path="/vault/tutorials/enterprise/disaster-recovery" @class="has-text-grey">
+                <LearnLink @path="/vault/operations/ops-disaster-recovery" @class="has-text-grey">
                   Need help?
-                </DocLink>
+                </LearnLink>
               </li>
             </ul>
           </nav>
diff --git a/ui/app/templates/vault/cluster/secrets/backend/configuration.hbs b/ui/app/templates/vault/cluster/secrets/backend/configuration.hbs
index 7890b5d316678..33ee61fdb1df0 100644
--- a/ui/app/templates/vault/cluster/secrets/backend/configuration.hbs
+++ b/ui/app/templates/vault/cluster/secrets/backend/configuration.hbs
@@ -13,9 +13,8 @@
   <Toolbar>
     <ToolbarActions>
       <ToolbarLink
-        @route="vault.cluster.settings.configure-secret-backend"
-        @model={{this.model.id}}
-        data-test-secret-backend-configure
+        @params={{array "vault.cluster.settings.configure-secret-backend" this.model.id}}
+        data-test-secret-backend-configure={{true}}
       >
         Configure
       </ToolbarLink>
@@ -29,14 +28,13 @@
       <InfoTableRow
         @alwaysRender={{not (is-empty-value (get this.model attr.name))}}
         @label={{or attr.options.label (to-label attr.name)}}
-        @value={{stringify (get this.model (or attr.options.fieldValue attr.name))}}
+        @value={{stringify (get this.model attr.name)}}
       />
     {{else}}
       <InfoTableRow
-        @alwaysRender={{and (not (is-empty-value (get this.model attr.name))) (not-eq attr.name "version")}}
-        @formatTtl={{eq attr.options.editType "ttl"}}
+        @alwaysRender={{and (not (is-empty-value (get this.model attr.name))) (not-eq attr.name "options.version")}}
         @label={{or attr.options.label (to-label attr.name)}}
-        @value={{get this.model (or attr.options.fieldValue attr.name)}}
+        @value={{get this.model attr.name}}
       />
     {{/if}}
   {{/each}}
diff --git a/ui/app/templates/vault/cluster/secrets/backend/edit-metadata.hbs b/ui/app/templates/vault/cluster/secrets/backend/edit-metadata.hbs
index a6173a682785d..293c07111ae24 100644
--- a/ui/app/templates/vault/cluster/secrets/backend/edit-metadata.hbs
+++ b/ui/app/templates/vault/cluster/secrets/backend/edit-metadata.hbs
@@ -15,6 +15,6 @@
     <LinkTo @route="vault.cluster.secrets.backend.metadata" @model={{this.model.id}} class="link">
       View Metadata
     </LinkTo>
-    <DocLink @path="/vault/api-docs/secret/kv/kv-v2#create-update-metadata">More here</DocLink>
+    <DocLink @path="/api/secret/kv/kv-v2#create-update-metadata">More here</DocLink>
   </EmptyState>
 {{/if}}
\ No newline at end of file
diff --git a/ui/app/templates/vault/cluster/secrets/backend/error.hbs b/ui/app/templates/vault/cluster/secrets/backend/error.hbs
index f59be2db1a1e6..504403a90f84f 100644
--- a/ui/app/templates/vault/cluster/secrets/backend/error.hbs
+++ b/ui/app/templates/vault/cluster/secrets/backend/error.hbs
@@ -56,7 +56,7 @@
           {{#if this.model.secret}}
             <LinkTo @route="vault.cluster.secrets.backend.list-root">Navigate back to the root</LinkTo>.
           {{else}}
-            <LinkTo @route="vault.cluster">Go back home</LinkTo>.
+            <HomeLink>Go back home</HomeLink>.
           {{/if}}
         </p>
       {{/if}}
diff --git a/ui/app/templates/vault/cluster/secrets/backend/list.hbs b/ui/app/templates/vault/cluster/secrets/backend/list.hbs
index e4e314f94da8a..76f96ad7636fb 100644
--- a/ui/app/templates/vault/cluster/secrets/backend/list.hbs
+++ b/ui/app/templates/vault/cluster/secrets/backend/list.hbs
@@ -13,7 +13,7 @@
         @secret=""
         @mode="create"
         @type="add"
-        @queryParams={{hash initialKey=(or this.filter this.baseKey.id) itemType=this.tab}}
+        @queryParams={{query-params initialKey=(or this.filter this.baseKey.id) itemType=this.tab}}
         data-test-secret-create={{true}}
       >
         Create Secret
@@ -23,11 +23,11 @@
   <div class="box is-fullwidth is-shadowless has-tall-padding">
     <div class="selectable-card-container one-card">
       <GetCredentialsCard
-        @renderInputSearch={{true}}
+        @shouldUseFallback={{true}}
         @title="View secret"
         @searchLabel="Secret path"
         @subText="Type the path of the secret you want to read"
-        @placeholder="secret/"
+        @placeHolder="secret/"
         @backend="kv"
         @type="secret"
       />
@@ -76,7 +76,7 @@
             @secret=""
             @mode="create"
             @type="add"
-            @queryParams={{hash initialKey=(or this.filter this.baseKey.id) itemType=this.tab}}
+            @queryParams={{query-params initialKey=(or this.filter this.baseKey.id) itemType=this.tab}}
             data-test-secret-create={{true}}
           >
             {{options.create}}
@@ -129,11 +129,14 @@
     {{else}}
       {{#if (eq this.baseKey.id "")}}
         {{#if (and options.firstStep (not this.tab))}}
-          <EmptyState @title="Get started with {{capitalize this.backendType}}" @message={{options.firstStep}}>
+          <EmptyState
+            @title="Get started with {{capitalize this.backendType}}"
+            @message="To use {{this.backendType}}, you'll need to {{options.firstStep}}."
+          >
             <SecretLink
               @mode="create"
               @secret=""
-              @queryParams={{hash initialKey=(or this.filter this.baseKey.id) itemType=this.tab}}
+              @queryParams={{query-params initialKey=(or this.filter this.baseKey.id) itemType=this.tab}}
               class="link"
             >
               {{options.create}}
@@ -142,14 +145,12 @@
         {{else}}
           <EmptyState
             @title="No {{pluralize options.item}} in this backend"
-            @message="{{pluralize (capitalize options.item)}}
-            in this backend will be listed here. 
-            {{or options.message (concat 'Add a ' options.item ' to get started.')}}"
+            @message="Secrets in this backend will be listed here. Add a secret to get started."
           >
             <SecretLink
               @mode="create"
               @secret=""
-              @queryParams={{hash initialKey=(or this.filter this.baseKey.id) itemType=this.tab}}
+              @queryParams={{query-params initialKey=(or this.filter this.baseKey.id) itemType=this.tab}}
               class="link"
             >
               {{options.create}}
diff --git a/ui/app/templates/vault/cluster/secrets/backend/metadata.hbs b/ui/app/templates/vault/cluster/secrets/backend/metadata.hbs
index 1bc2b037fd829..1b27dcd0ad84d 100644
--- a/ui/app/templates/vault/cluster/secrets/backend/metadata.hbs
+++ b/ui/app/templates/vault/cluster/secrets/backend/metadata.hbs
@@ -32,7 +32,7 @@
   {{! You must have update on metadata, create is not enough. }}
   {{#if this.model.canUpdateMetadata}}
     <ToolbarActions>
-      <ToolbarLink @route="vault.cluster.secrets.backend.edit-metadata" @model={{this.id}}>
+      <ToolbarLink @params={{array "vault.cluster.secrets.backend.edit-metadata" this.id}}>
         Edit metadata
       </ToolbarLink>
     </ToolbarActions>
@@ -40,7 +40,7 @@
 </Toolbar>
 
 <div class="form-section">
-  <label class="title is-5 has-top-padding-m">
+  <label class="title has-padding-top is-5">
     Custom metadata
   </label>
 </div>
@@ -69,7 +69,7 @@
 </div>
 {{#unless this.noReadAccess}}
   <div class="form-section">
-    <label class="title is-5 has-top-padding-m">
+    <label class="title has-padding-top is-5">
       Secret Metadata
     </label>
   </div>
diff --git a/ui/app/templates/vault/cluster/secrets/backend/overview.hbs b/ui/app/templates/vault/cluster/secrets/backend/overview.hbs
index 0ea3c28f06107..6fea24a5f9871 100644
--- a/ui/app/templates/vault/cluster/secrets/backend/overview.hbs
+++ b/ui/app/templates/vault/cluster/secrets/backend/overview.hbs
@@ -14,7 +14,7 @@
         <SecretLink
           @mode="create"
           @secret=""
-          @queryParams={{hash initialKey=(or this.filter this.baseKey.id) itemType=this.tab}}
+          @queryParams={{query-params initialKey=(or this.filter this.baseKey.id) itemType=this.tab}}
           class="link"
           data-test-secret-create="connections"
         >
diff --git a/ui/app/templates/vault/cluster/secrets/backend/transit-actions-layout.hbs b/ui/app/templates/vault/cluster/secrets/backend/transit-actions-layout.hbs
index 3144f5d4998f8..cee76e516cdb2 100644
--- a/ui/app/templates/vault/cluster/secrets/backend/transit-actions-layout.hbs
+++ b/ui/app/templates/vault/cluster/secrets/backend/transit-actions-layout.hbs
@@ -17,7 +17,7 @@
             @secret={{this.model.id}}
             @mode="show"
             @replace={{true}}
-            @queryParams={{hash tab="actions"}}
+            @queryParams={{query-params tab="actions"}}
             data-test-transit-link="actions"
           >
             <Icon @name="arrow-left" />
@@ -35,7 +35,7 @@
               <SecretLink
                 @mode="actions"
                 @secret={{this.model.id}}
-                @queryParams={{hash action=supportedAction.name}}
+                @queryParams={{query-params action=supportedAction.name}}
                 data-test-transit-action-link={{supportedAction.name}}
               >
                 {{#if (eq supportedAction.name "export")}}
diff --git a/ui/app/templates/vault/cluster/secrets/backend/versions.hbs b/ui/app/templates/vault/cluster/secrets/backend/versions.hbs
index 9a6929e226ccb..f64bed8898172 100644
--- a/ui/app/templates/vault/cluster/secrets/backend/versions.hbs
+++ b/ui/app/templates/vault/cluster/secrets/backend/versions.hbs
@@ -87,7 +87,7 @@
                   @mode="show"
                   @secret={{this.model.id}}
                   class="has-text-black has-text-weight-semibold"
-                  @queryParams={{hash version=list.item.version}}
+                  @queryParams={{query-params version=list.item.version}}
                 >
                   View version
                   {{list.item.version}}
@@ -98,7 +98,7 @@
                   @mode="edit"
                   @secret={{this.model.id}}
                   class="has-text-black has-text-weight-semibold"
-                  @queryParams={{hash version=list.item.version}}
+                  @queryParams={{query-params version=list.item.version}}
                 >
                   Create new version from
                   {{list.item.version}}
diff --git a/ui/app/templates/vault/cluster/secrets/backends.hbs b/ui/app/templates/vault/cluster/secrets/backends.hbs
index c766eed5b8987..f829155309a35 100644
--- a/ui/app/templates/vault/cluster/secrets/backends.hbs
+++ b/ui/app/templates/vault/cluster/secrets/backends.hbs
@@ -7,114 +7,110 @@
 </PageHeader>
 
 <Toolbar>
-  <ToolbarFilters>
-    <SearchSelect
-      @id="filter-by-engine-type"
-      @options={{this.secretEngineArrayByType}}
-      @selectLimit="1"
-      @disallowNewItems={{true}}
-      @fallbackComponent="input-search"
-      @onChange={{this.filterEngineType}}
-      @placeholder={{"Filter by engine type"}}
-      @displayInherit={{true}}
-      @inputValue={{if this.selectedEngineType (array this.selectedEngineType)}}
-      @disabled={{if this.selectedEngineName true false}}
-      class="is-marginless"
-    />
-    <SearchSelect
-      @id="filter-by-engine-name"
-      @options={{this.secretEngineArrayByName}}
-      @selectLimit="1"
-      @disallowNewItems={{true}}
-      @fallbackComponent="input-search"
-      @onChange={{this.filterEngineName}}
-      @placeholder={{"Filter by engine name"}}
-      @displayInherit={{true}}
-      @inputValue={{if this.selectedEngineName (array this.selectedEngineName)}}
-      class="is-marginless has-left-padding-s"
-    />
-  </ToolbarFilters>
   <ToolbarActions>
-    <ToolbarLink @route="vault.cluster.settings.mount-secret-backend" @type="add" data-test-enable-engine>
+    <ToolbarLink
+      @type="add"
+      @params={{array "vault.cluster.settings.mount-secret-backend"}}
+      data-test-enable-engine={{true}}
+    >
       Enable new engine
     </ToolbarLink>
   </ToolbarActions>
 </Toolbar>
-{{#each this.sortedDisplayableBackends as |backend|}}
-  <LinkedBlock
-    @params={{array backend.backendLink backend.id}}
-    class="list-item-row linked-block-item is-no-underline"
-    data-test-auth-backend-link={{backend.id}}
-    @disabled={{if backend.isSupportedBackend false true}}
-  >
-    <div>
-      <div class="has-text-grey">
-        {{#if backend.icon}}
-          <ToolTip @horizontalPosition="left" as |T|>
-            <T.Trigger>
-              <Icon @name={{backend.icon}} class="has-text-grey-light" />
-            </T.Trigger>
-            <T.Content @defaultClass="tool-tip">
-              <div class="box">
-                {{or backend.engineType backend.path}}
-              </div>
-            </T.Content>
-          </ToolTip>
-        {{/if}}
-        {{#if backend.path}}
-          {{#if backend.isSupportedBackend}}
-            <LinkTo
-              @route={{backend.backendLink}}
-              @model={{backend.id}}
-              class="has-text-black has-text-weight-semibold"
-              data-test-secret-path
-            >
-              {{backend.path}}
-            </LinkTo>
-          {{else}}
-            <span data-test-secret-path>{{backend.path}}</span>
-          {{/if}}
-        {{/if}}
-      </div>
-      {{#if backend.accessor}}
-        <code class="has-text-grey is-size-8">
-          {{backend.accessor}}
-        </code>
-      {{/if}}
-      {{#if backend.description}}
-        <ReadMore>
-          {{backend.description}}
-        </ReadMore>
-      {{/if}}
-    </div>
-    {{! meatball sandwich menu }}
-    <div class="linked-block-popup-menu">
-      <PopupMenu @name="engine-menu">
+
+{{#each this.supportedBackends as |backend|}}
+  {{#let
+    (if
+      (eq backend.engineType "kmip")
+      "vault.cluster.secrets.backend.kmip.scopes"
+      (if
+        (eq backend.engineType "database") "vault.cluster.secrets.backend.overview" "vault.cluster.secrets.backend.list-root"
+      )
+    )
+    as |backendLink|
+  }}
+    <LinkableItem data-test-secret-backend-row={{backend.id}} @link={{hash route=backendLink model=backend.id}} as |Li|>
+      <Li.content
+        @accessor={{if (eq backend.options.version 2) (concat "v2 " backend.accessor) backend.accessor}}
+        @description={{backend.description}}
+        @glyphText={{backend.engineType}}
+        @glyph={{backend.icon}}
+        @link={{hash route=backendLink model=backend.id}}
+        @title={{backend.path}}
+      />
+      <Li.menu>
+        <PopupMenu @name="engine-menu">
+          <Confirm as |c|>
+            <nav class="menu">
+              <ul class="menu-list">
+                <li class="action">
+                  <LinkTo @route="vault.cluster.secrets.backend.configuration" @model={{backend.id}}>
+                    View configuration
+                  </LinkTo>
+                </li>
+                {{#if (not-eq backend.type "cubbyhole")}}
+                  <li class="action">
+                    <c.Message
+                      @id={{backend.id}}
+                      @triggerText="Disable"
+                      @message="Any data in this engine will be permanently deleted."
+                      @title="Disable engine?"
+                      @confirmButtonText="Disable"
+                      @onConfirm={{perform this.disableEngine backend}}
+                      data-test-engine-disable="true"
+                    />
+                  </li>
+                {{/if}}
+                {{#if this.item.updatePath.isPending}}
+                  <li class="action">
+                    <button disabled type="button" class="link button is-loading is-transparent">
+                      loading
+                    </button>
+                  </li>
+                {{/if}}
+              </ul>
+            </nav>
+          </Confirm>
+        </PopupMenu>
+      </Li.menu>
+    </LinkableItem>
+  {{/let}}
+{{/each}}
+
+{{#each this.unsupportedBackends as |backend|}}
+  <LinkableItem data-test-secret-backend-row={{backend.id}} @disabled={{true}} as |Li|>
+    <Li.content
+      @accessor={{if (eq backend.options.version 2) (concat "v2 " backend.accessor) backend.accessor}}
+      @description={{backend.description}}
+      @glyphText={{backend.engineType}}
+      @glyph={{or (if (eq backend.engineType "kmip") "secrets" backend.engineType) "secrets"}}
+      @title={{backend.path}}
+    />
+    <Li.menu>
+      <PopupMenu name="engine-menu">
         <Confirm as |c|>
-          <nav class="menu" aria-label="{{if backend.isSupportedBackend 'supported' 'unsupported'}} secrets engine menu">
+          <nav class="menu">
             <ul class="menu-list">
               <li class="action">
                 <LinkTo @route="vault.cluster.secrets.backend.configuration" @model={{backend.id}} data-test-engine-config>
                   View configuration
                 </LinkTo>
               </li>
-              {{#if (not-eq backend.type "cubbyhole")}}
-                <li class="action">
-                  <c.Message
-                    @id={{backend.id}}
-                    @triggerText="Disable"
-                    @message="Any data in this engine will be permanently deleted."
-                    @title="Disable engine?"
-                    @confirmButtonText="Disable"
-                    @onConfirm={{perform this.disableEngine backend}}
-                    data-test-engine-disable="true"
-                  />
-                </li>
-              {{/if}}
+              <li>
+                <c.Message
+                  @id={{backend.id}}
+                  @triggerText="Disable"
+                  @message="Any data in this engine will be permanently deleted."
+                  @title="Disable engine?"
+                  @confirmButtonText="Disable"
+                  @onConfirm={{perform this.disableEngine backend}}
+                  data-test-engine-disable="true"
+                />
+              </li>
             </ul>
           </nav>
         </Confirm>
       </PopupMenu>
-    </div>
-  </LinkedBlock>
+    </Li.menu>
+  </LinkableItem>
 {{/each}}
\ No newline at end of file
diff --git a/ui/app/templates/vault/cluster/settings/auth.hbs b/ui/app/templates/vault/cluster/settings/auth.hbs
deleted file mode 100644
index 4aa301e54d875..0000000000000
--- a/ui/app/templates/vault/cluster/settings/auth.hbs
+++ /dev/null
@@ -1,2 +0,0 @@
-<Sidebar::Nav::Access />
-{{outlet}}
\ No newline at end of file
diff --git a/ui/app/templates/vault/cluster/settings/auth/configure.hbs b/ui/app/templates/vault/cluster/settings/auth/configure.hbs
index 980830dd7da3d..9275a2ebf8abb 100644
--- a/ui/app/templates/vault/cluster/settings/auth/configure.hbs
+++ b/ui/app/templates/vault/cluster/settings/auth/configure.hbs
@@ -14,7 +14,7 @@
 
 <Toolbar>
   <ToolbarActions>
-    <ToolbarLink @route="vault.cluster.access.method" @model={{this.model.id}} data-test-backend-view-link>
+    <ToolbarLink @params={{array "vault.cluster.access.method" this.model.id}} data-test-backend-view-link={{true}}>
       View method
     </ToolbarLink>
   </ToolbarActions>
diff --git a/ui/app/templates/vault/cluster/settings/auth/enable.hbs b/ui/app/templates/vault/cluster/settings/auth/enable.hbs
index b472892b16a4b..086bf983f8b8c 100644
--- a/ui/app/templates/vault/cluster/settings/auth/enable.hbs
+++ b/ui/app/templates/vault/cluster/settings/auth/enable.hbs
@@ -1 +1 @@
-<MountBackendForm @mountModel={{this.model}} @onMountSuccess={{action "onMountSuccess"}} />
\ No newline at end of file
+<MountBackendForm @onMountSuccess={{action "onMountSuccess"}} />
\ No newline at end of file
diff --git a/ui/app/templates/vault/cluster/settings/configure-secret-backend.hbs b/ui/app/templates/vault/cluster/settings/configure-secret-backend.hbs
index 64f1faf172f7f..450755c525bae 100644
--- a/ui/app/templates/vault/cluster/settings/configure-secret-backend.hbs
+++ b/ui/app/templates/vault/cluster/settings/configure-secret-backend.hbs
@@ -17,7 +17,7 @@
 
 <Toolbar>
   <ToolbarActions>
-    <ToolbarLink @route="vault.cluster.secrets.backend" @model={{this.model.id}} data-test-backend-view-link>
+    <ToolbarLink @params={{array "vault.cluster.secrets.backend" this.model.id}} data-test-backend-view-link={{true}}>
       View backend
     </ToolbarLink>
   </ToolbarActions>
@@ -35,13 +35,10 @@
     @saveAWSRoot={{action "save" "saveAWSRoot"}}
     @saveAWSLease={{action "save" "saveAWSLease"}}
   />
+{{else if (eq this.model.type "pki")}}
+  <Pki::ConfigurePkiSecret />
 {{else if (eq this.model.type "ssh")}}
-  <ConfigureSshSecret
-    @model={{this.model}}
-    @configured={{this.configured}}
-    @saveConfig={{action "saveConfig"}}
-    @loading={{this.loading}}
-  />
+  <ConfigureSshSecret @model={{this.model}} @configured={{this.configured}} @saveConfig={{action "saveConfig"}} />
 {{/if}}
 
 {{outlet}}
\ No newline at end of file
diff --git a/ui/app/templates/vault/cluster/settings/configure-secret-backend/section.hbs b/ui/app/templates/vault/cluster/settings/configure-secret-backend/section.hbs
new file mode 100644
index 0000000000000..9fe243914031b
--- /dev/null
+++ b/ui/app/templates/vault/cluster/settings/configure-secret-backend/section.hbs
@@ -0,0 +1,7 @@
+{{#if (eq this.model.backendType "pki")}}
+  {{#if (eq this.model.section "cert")}}
+    <Pki::ConfigPkiCa @config={{this.model}} @onRefresh={{this.onRefresh}} />
+  {{else}}
+    <Pki::ConfigPki @config={{this.model}} @onRefresh={{this.onRefresh}} @section={{this.model.section}} />
+  {{/if}}
+{{/if}}
\ No newline at end of file
diff --git a/ui/app/templates/vault/cluster/settings/mount-secret-backend.hbs b/ui/app/templates/vault/cluster/settings/mount-secret-backend.hbs
index ab699d7625875..1a241c5438ce7 100644
--- a/ui/app/templates/vault/cluster/settings/mount-secret-backend.hbs
+++ b/ui/app/templates/vault/cluster/settings/mount-secret-backend.hbs
@@ -1 +1 @@
-<MountBackendForm @mountModel={{this.model}} @mountType="secret" @onMountSuccess={{action "onMountSuccess"}} />
\ No newline at end of file
+<MountBackendForm @mountType="secret" @onMountSuccess={{action "onMountSuccess"}} />
\ No newline at end of file
diff --git a/ui/app/templates/vault/cluster/tools/tool.hbs b/ui/app/templates/vault/cluster/tools/tool.hbs
index bbad12bb2c6a9..68405b2e4c08b 100644
--- a/ui/app/templates/vault/cluster/tools/tool.hbs
+++ b/ui/app/templates/vault/cluster/tools/tool.hbs
@@ -1,2 +1,21 @@
-<Sidebar::Nav::Tools />
-<ToolActionsForm @selectedAction={{this.selectedAction}} />
\ No newline at end of file
+<div class="columns">
+  <MenuSidebar @title="Tools" @class="is-3">
+    {{#each (tools-actions) as |supportedAction|}}
+      {{#if (has-permission "tools" routeParams=supportedAction)}}
+        <li>
+          <LinkTo
+            @route="vault.cluster.tools.tool"
+            @model={{supportedAction}}
+            class="(if (eq supportedAction selectedAction) 'is-active')"
+            data-test-tools-action-link={{supportedAction}}
+          >
+            {{capitalize supportedAction}}
+          </LinkTo>
+        </li>
+      {{/if}}
+    {{/each}}
+  </MenuSidebar>
+  <div class="column is-9">
+    <ToolActionsForm @selectedAction={{this.selectedAction}} />
+  </div>
+</div>
\ No newline at end of file
diff --git a/ui/app/templates/vault/cluster/unseal.hbs b/ui/app/templates/vault/cluster/unseal.hbs
index 98f9598c63271..2fe270fa477f0 100644
--- a/ui/app/templates/vault/cluster/unseal.hbs
+++ b/ui/app/templates/vault/cluster/unseal.hbs
@@ -1,4 +1,16 @@
 {{#if this.showLicenseError}}
+  <NavHeader as |Nav|>
+    <Nav.home>
+      <HomeLink @class="navbar-item splash-page-logo has-text-white">
+        <LogoEdition />
+      </HomeLink>
+    </Nav.home>
+    <Nav.items>
+      <div class="navbar-item status-indicator-button" data-status={{if this.activeCluster.unsealed "good" "bad"}}>
+        <StatusMenu @label="Status" @onLinkClick={{action Nav.closeDrawer}} />
+      </div>
+    </Nav.items>
+  </NavHeader>
   <div class="section is-flex-v-centered-tablet is-flex-1 is-fullwidth">
     <div class="columns is-centered is-gapless is-fullwidth">
       <EmptyState
@@ -10,9 +22,13 @@
         @message="Your Vault license has terminated and Vault is sealed. To unseal, add a current license to your configuration and restart Vault."
       >
         <p class="align-right">
-          <DocLink @path="/vault/tutorials/enterprise/hashicorp-enterprise-license">
+          <a
+            href="https://learn.hashicorp.com/tutorials/nomad/hashicorp-enterprise-license"
+            target="_blank"
+            rel="noreferrer noopener"
+          >
             License documentation
-          </DocLink>
+          </a>
         </p>
       </EmptyState>
     </div>
@@ -50,9 +66,9 @@
     <Page.footer>
       <div class="box is-borderless is-shadowless">
         <p>
-          <ExternalLink @href="https://www.vaultproject.io/docs/concepts/seal">
+          <a target="_blank" rel="noreferrer noopener" href="https://www.vaultproject.io/docs/concepts/seal">
             Seal/unseal documentation
-          </ExternalLink>
+          </a>
         </p>
       </div>
     </Page.footer>
diff --git a/ui/app/templates/vault/error.hbs b/ui/app/templates/vault/error.hbs
index 795d7e6d9dc6f..67dd0760ef87b 100644
--- a/ui/app/templates/vault/error.hbs
+++ b/ui/app/templates/vault/error.hbs
@@ -1,45 +1,34 @@
-<div class="is-flex-1 is-flex-v-centered">
-  <div class="empty-state-content">
-    <div class="is-flex-v-centered has-bottom-margin-xxl">
-      <div class="brand-icon-large">
-        <Icon @name="vault" @size="24" @stretched={{true}} />
-      </div>
-    </div>
-    <div class="is-flex-center">
-      <div class="error-icon">
-        <Icon @name="help" @size="24" class="has-text-grey" @stretched={{true}} />
-      </div>
-      <div class="has-left-margin-s">
-        <h1 class="is-size-4 has-text-semibold has-text-grey has-line-height-1">
-          {{#if (eq this.model.httpStatus 403)}}
-            Not authorized
-          {{else if (eq this.model.httpStatus 404)}}
-            Page not found
-          {{else}}
-            Error
-          {{/if}}
-        </h1>
-        <p class="has-text-grey is-size-8">Error {{this.model.httpStatus}}</p>
-      </div>
-    </div>
-
-    <p class="has-text-grey has-top-margin-m has-bottom-padding-l has-border-bottom-light" data-test-error-description>
-      {{#if (eq this.model.httpStatus 404)}}
-        Sorry, we were unable to find any content at that URL. Double check it or go back home.
-      {{else}}
-        {{this.model.message}}
-        {{join ". " this.model.errors}}
-      {{/if}}
-    </p>
-
-    <div class="is-flex-between has-top-margin-s">
-      <ExternalLink @href="/" @sameTab={{true}} class="is-no-underline is-flex-center has-text-semibold">
-        <Chevron @direction="left" />
-        Go home
-      </ExternalLink>
-      <DocLink @path="/vault/api-docs#http-status-codes">
-        Learn more
-      </DocLink>
-    </div>
+<NavHeader data-test-header-without-nav as |Nav|>
+  <Nav.home>
+    <HomeLink @class="navbar-item splash-page-logo">
+      <LogoEdition />
+    </HomeLink>
+  </Nav.home>
+</NavHeader>
+<section class="section">
+  <div class="container">
+    {{#if (eq this.model.httpStatus 404)}}
+      <NotFound @model={{this.model}} />
+    {{else}}
+      <PageHeader as |p|>
+        <p.levelLeft>
+          <h1 class="title is-3 has-text-grey">
+            {{#if (eq this.model.httpStatus 403)}}
+              Not authorized
+            {{else}}
+              Error
+            {{/if}}
+          </h1>
+        </p.levelLeft>
+      </PageHeader>
+      <BlockError>
+        {{#if this.model.message}}
+          <p>{{this.model.message}}</p>
+        {{/if}}
+        {{#each this.model.errors as |error|}}
+          <p>{{error}}</p>
+        {{/each}}
+      </BlockError>
+    {{/if}}
   </div>
-</div>
\ No newline at end of file
+</section>
\ No newline at end of file
diff --git a/ui/app/templates/vault/not-found.hbs b/ui/app/templates/vault/not-found.hbs
index 95d71697f4cfd..f6e7adf52685a 100644
--- a/ui/app/templates/vault/not-found.hbs
+++ b/ui/app/templates/vault/not-found.hbs
@@ -1 +1,14 @@
-<NotFound @model={{this.model}} />
\ No newline at end of file
+<header>
+  <nav class="navbar is-grouped-split">
+    <div class="navbar-brand">
+      <HomeLink @class="navbar-item has-text-white has-current-color-fill">
+        <Icon @name="vault-logo" />
+      </HomeLink>
+    </div>
+  </nav>
+</header>
+<section class="section">
+  <div class="container is-widescreen">
+    <NotFound @model={{this.model}} />
+  </div>
+</section>
\ No newline at end of file
diff --git a/ui/app/transforms/array.js b/ui/app/transforms/array.js
index 3bfd08e80b231..54ad17fbd69be 100644
--- a/ui/app/transforms/array.js
+++ b/ui/app/transforms/array.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Transform from '@ember-data/serializer/transform';
 import { isArray, A } from '@ember/array';
 /*
diff --git a/ui/app/transforms/object.js b/ui/app/transforms/object.js
index 49b3c6b2e3de7..fcf6c3614ec7a 100644
--- a/ui/app/transforms/object.js
+++ b/ui/app/transforms/object.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Transform from '@ember-data/serializer/transform';
 import { typeOf } from '@ember/utils';
 /*
diff --git a/ui/app/utils/api-path.js b/ui/app/utils/api-path.js
index 2bfa2b8b93ce6..431d0acf83ca6 100644
--- a/ui/app/utils/api-path.js
+++ b/ui/app/utils/api-path.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { assert } from '@ember/debug';
 
 // This is a tagged template function that will
@@ -15,8 +10,8 @@ import { assert } from '@ember/debug';
 
 export default function apiPath(strings, ...keys) {
   return function (data) {
-    const dict = data || {};
-    const result = [strings[0]];
+    let dict = data || {};
+    let result = [strings[0]];
     assert(
       `Expected ${keys.length} keys in apiPath context, only recieved ${Object.keys(data).join(',')}`,
       Object.keys(data).length >= keys.length
diff --git a/ui/app/utils/camelize-object-keys.js b/ui/app/utils/camelize-object-keys.js
deleted file mode 100644
index bb988700d3b66..0000000000000
--- a/ui/app/utils/camelize-object-keys.js
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-import { camelize } from '@ember/string';
-
-export default function camelizeKeys(object) {
-  const newObject = {};
-  Object.entries(object).forEach(([key, value]) => {
-    newObject[camelize(key)] = value;
-  });
-  return newObject;
-}
diff --git a/ui/app/utils/chart-helpers.js b/ui/app/utils/chart-helpers.js
index fcc7761f7f5a5..25dc57460e99c 100644
--- a/ui/app/utils/chart-helpers.js
+++ b/ui/app/utils/chart-helpers.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { format } from 'd3-format';
 import { mean } from 'd3-array';
 
@@ -33,13 +28,10 @@ export function formatTooltipNumber(value) {
 }
 
 export function calculateAverage(dataset, objectKey) {
-  // before mapping for values, check that the objectKey exists at least once in the dataset because
-  // map returns 0 when dataset[objectKey] is undefined in order to calculate average
-  if (!Array.isArray(dataset) || !objectKey || !dataset.some((d) => Object.keys(d).includes(objectKey))) {
-    return null;
-  }
-
-  const integers = dataset.map((d) => (d[objectKey] ? d[objectKey] : 0));
-  const checkIntegers = integers.every((n) => Number.isInteger(n)); // decimals will be false
-  return checkIntegers ? Math.round(mean(integers)) : null;
+  if (!Array.isArray(dataset) || dataset?.length === 0) return null;
+  // if an array of objects, objectKey of the integer we want to calculate, ex: 'entity_clients'
+  // if d[objectKey] is undefined there is no value, so return 0
+  const getIntegers = objectKey ? dataset?.map((d) => (d[objectKey] ? d[objectKey] : 0)) : dataset;
+  let checkIntegers = getIntegers.every((n) => Number.isInteger(n)); // decimals will be false
+  return checkIntegers ? Math.round(mean(getIntegers)) : null;
 }
diff --git a/ui/app/utils/clamp.js b/ui/app/utils/clamp.js
index 08b99d20f620e..b2c60a826a6f4 100644
--- a/ui/app/utils/clamp.js
+++ b/ui/app/utils/clamp.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export default function (num, min, max) {
   let inRangeNumber;
   if (typeof num !== 'number') {
diff --git a/ui/app/utils/database-helpers.js b/ui/app/utils/database-helpers.js
index 6ef6c92cae076..b1a34833b5fd7 100644
--- a/ui/app/utils/database-helpers.js
+++ b/ui/app/utils/database-helpers.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export const AVAILABLE_PLUGIN_TYPES = [
   {
     value: 'elasticsearch-database-plugin',
diff --git a/ui/app/utils/error-message.js b/ui/app/utils/error-message.js
deleted file mode 100644
index ccaa8573e2b02..0000000000000
--- a/ui/app/utils/error-message.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-// accepts an error and returns error.errors joined with a comma, error.message or a fallback message
-export default function (error, fallbackMessage = 'An error occurred, please try again') {
-  if (error instanceof Error && error?.errors) {
-    return error.errors.join(', ');
-  }
-  return error?.message || fallbackMessage;
-}
diff --git a/ui/app/utils/field-to-attrs.js b/ui/app/utils/field-to-attrs.js
index 0f87d27819594..511da05656ffc 100644
--- a/ui/app/utils/field-to-attrs.js
+++ b/ui/app/utils/field-to-attrs.js
@@ -1,8 +1,4 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
+import { get } from '@ember/object';
 import { expandProperties } from '@ember/object/computed';
 /*
  *
@@ -39,46 +35,44 @@ import { expandProperties } from '@ember/object/computed';
  *
  */
 
-export const expandAttributeMeta = function (modelClass, attributeNames) {
-  const fields = [];
+export const expandAttributeMeta = function (modelClass, attributeNames, namePrefix, map) {
+  let fields = [];
   // expand all attributes
-  // see docs for examples of brace-expansion - https://api.emberjs.com/ember/4.4/functions/@ember%2Fobject%2Fcomputed/expandProperties
-  attributeNames.map((field) => expandProperties(field, (prop) => fields.push(prop)));
-  // cache results of eachAttribute so we don't call it on each iteration of fields loop
-  const modelAttrs = {};
-
-  const getAttributeMeta = (klass, attrKey) => {
-    // populate cache if empty
-    if (!modelAttrs[klass.modelName]) {
-      modelAttrs[klass.modelName] = [];
-      klass.eachAttribute((name, meta) => {
-        modelAttrs[klass.modelName].push(meta);
-      });
+  attributeNames.forEach((field) => expandProperties(field, (x) => fields.push(x)));
+  let attributeMap = map || new Map();
+  modelClass.eachAttribute((name, meta) => {
+    let fieldName = namePrefix ? namePrefix + name : name;
+    let maybeFragment = get(modelClass, fieldName);
+    if (meta.isFragment && maybeFragment) {
+      // pass the fragment and all fields that start with
+      // the fragment name down to get extracted from the Fragment
+      expandAttributeMeta(
+        maybeFragment,
+        fields.filter((f) => f.startsWith(fieldName)),
+        fieldName + '.',
+        attributeMap
+      );
+      return;
     }
-    // lookup attr and return meta
-    return modelAttrs[klass.modelName].findBy('name', attrKey);
-  };
+    attributeMap.set(fieldName, meta);
+  });
 
-  return fields.map((field) => {
-    let meta = {};
-    // check for relationship by presence of dot nation in field name
-    if (field.includes('.')) {
-      const [relKey, prop] = field.split('.');
-      const rel = modelClass.belongsTo(relKey);
-      const relModelClass = modelClass.store.modelFor(rel.type);
-      meta = getAttributeMeta(relModelClass, prop);
-    } else {
-      meta = getAttributeMeta(modelClass, field);
+  // we have all of the attributes in the map now,
+  // so we'll replace each key in `fields` with the expanded meta
+  fields = fields.map((field) => {
+    let meta = attributeMap.get(field);
+    if (meta) {
+      var { type, options } = meta;
     }
-    const { type, options } = meta || {};
     return {
       // using field name here because it is the full path,
-      // name on the attribute meta will be relative to the relationship if applicable
+      // name on the attribute meta will be relative to the fragment it's on
       name: field,
-      type,
-      options,
+      type: type,
+      options: options,
     };
   });
+  return fields;
 };
 
 /*
diff --git a/ui/app/utils/identity-manager.js b/ui/app/utils/identity-manager.js
deleted file mode 100644
index f678c06691d07..0000000000000
--- a/ui/app/utils/identity-manager.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { v4 as uuidv4 } from 'uuid';
-
-// manage a set of unique ids
-export default class {
-  constructor() {
-    this.ids = new Set();
-  }
-  /**
-   * Returns a unique identifier.
-   *
-   * @method fetch
-   * @param {Object} data Records attributes hash
-   * @return {String} Unique identifier
-   * @public
-   */
-  fetch() {
-    let uuid = uuidv4();
-    // odds are incredibly low that we'll run into a duplicate but just to be safe...
-    while (this.ids.has(uuid)) {
-      uuid = uuidv4();
-    }
-    this.ids.add(uuid);
-    return uuid;
-  }
-  /**
-   * Register an identifier.
-   * Must throw if identifier is already used.
-   *
-   * @method set
-   * @param {String|Number} id
-   * @public
-   */
-  set(id) {
-    if (this.ids.has(id)) {
-      throw new Error(`ID ${id} is in use.`);
-    }
-    this.ids.add(id);
-  }
-  /**
-   * Reset identity manager.
-   *
-   * @method reset
-   * @public
-   */
-  reset() {
-    this.ids.clear();
-  }
-}
diff --git a/ui/app/utils/openapi-to-attrs.js b/ui/app/utils/openapi-to-attrs.js
index 9ad5227ff12b0..4672e147141c0 100644
--- a/ui/app/utils/openapi-to-attrs.js
+++ b/ui/app/utils/openapi-to-attrs.js
@@ -1,14 +1,9 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { attr } from '@ember-data/model';
 import { assign } from '@ember/polyfills';
 import { camelize, capitalize } from '@ember/string';
 
 export const expandOpenApiProps = function (props) {
-  const attrs = {};
+  let attrs = {};
   // expand all attributes
   for (const propName in props) {
     const prop = props[propName];
@@ -16,23 +11,12 @@ export const expandOpenApiProps = function (props) {
     if (deprecated === true) {
       continue;
     }
-    let {
-      name,
-      value,
-      group,
-      sensitive,
-      editType,
-      description: displayDescription,
-    } = prop['x-vault-displayAttrs'] || {};
+    let { name, value, group, sensitive, editType } = prop['x-vault-displayAttrs'] || {};
 
     if (type === 'integer') {
       type = 'number';
     }
 
-    if (displayDescription) {
-      description = displayDescription;
-    }
-
     editType = editType || type;
 
     if (format === 'seconds') {
@@ -41,7 +25,7 @@ export const expandOpenApiProps = function (props) {
       editType = items.type + capitalize(type);
     }
 
-    const attrDefn = {
+    let attrDefn = {
       editType,
       helpText: description,
       possibleValues: prop['enum'],
@@ -61,8 +45,8 @@ export const expandOpenApiProps = function (props) {
       attrDefn.sensitive = true;
     }
 
-    // only set a label if we have one from OpenAPI
-    // otherwise the propName will be humanized by the form-field component
+    //only set a label if we have one from OpenAPI
+    //otherwise the propName will be humanized by the form-field component
     if (name) {
       attrDefn.label = name;
     }
@@ -74,7 +58,7 @@ export const expandOpenApiProps = function (props) {
     }
 
     // loop to remove empty vals
-    for (const attrProp in attrDefn) {
+    for (let attrProp in attrDefn) {
       if (attrDefn[attrProp] == null) {
         delete attrDefn[attrProp];
       }
@@ -85,8 +69,8 @@ export const expandOpenApiProps = function (props) {
 };
 
 export const combineAttributes = function (oldAttrs, newProps) {
-  const newAttrs = {};
-  const newFields = [];
+  let newAttrs = {};
+  let newFields = [];
   if (oldAttrs) {
     oldAttrs.forEach(function (value, name) {
       if (newProps[name]) {
@@ -96,7 +80,7 @@ export const combineAttributes = function (oldAttrs, newProps) {
       }
     });
   }
-  for (const prop in newProps) {
+  for (let prop in newProps) {
     if (newAttrs[prop]) {
       continue;
     } else {
@@ -108,7 +92,7 @@ export const combineAttributes = function (oldAttrs, newProps) {
 };
 
 export const combineFields = function (currentFields, newFields, excludedFields) {
-  const otherFields = newFields.filter((field) => {
+  let otherFields = newFields.filter((field) => {
     return !currentFields.includes(field) && !excludedFields.includes(field);
   });
   if (otherFields.length) {
@@ -119,11 +103,11 @@ export const combineFields = function (currentFields, newFields, excludedFields)
 
 export const combineFieldGroups = function (currentGroups, newFields, excludedFields) {
   let allFields = [];
-  for (const group of currentGroups) {
-    const fieldName = Object.keys(group)[0];
+  for (let group of currentGroups) {
+    let fieldName = Object.keys(group)[0];
     allFields = allFields.concat(group[fieldName]);
   }
-  const otherFields = newFields.filter((field) => {
+  let otherFields = newFields.filter((field) => {
     return !allFields.includes(field) && !excludedFields.includes(field);
   });
   if (otherFields.length) {
diff --git a/ui/app/utils/parse-pki-cert-oids.js b/ui/app/utils/parse-pki-cert-oids.js
deleted file mode 100644
index 281758f4bf25d..0000000000000
--- a/ui/app/utils/parse-pki-cert-oids.js
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-//* lookup OIDs: http://oid-info.com/basic-search.htm
-export const SUBJECT_OIDs = {
-  common_name: '2.5.4.3',
-  subject_serial_number: '2.5.4.5',
-  ou: '2.5.4.11',
-  organization: '2.5.4.10',
-  country: '2.5.4.6',
-  locality: '2.5.4.7',
-  province: '2.5.4.8',
-  street_address: '2.5.4.9',
-  postal_code: '2.5.4.17',
-};
-
-export const EXTENSION_OIDs = {
-  key_usage: '2.5.29.15', // contains keyUsage values (KEY_USAGE_BITS below)
-  subject_alt_name: '2.5.29.17', // contains SAN_TYPES below
-  basic_constraints: '2.5.29.19', // contains max_path_length
-  name_constraints: '2.5.29.30', // contains permitted_dns_domains
-};
-
-// these are allowed ext oids, but not parsed and passed to cross-signed certs
-export const IGNORED_OIDs = {
-  // These two extensions are controlled by the parent authority.
-  authority_key_identifier: '2.5.29.35',
-  authority_access_info: '1.3.6.1.5.5.7.1.1',
-  // This extension is based off the key material of the new issuer, which
-  // will automatically match the existing issuer's key material.
-  subject_key_identifier: '2.5.29.14',
-};
-
-export const KEY_USAGE_BITS = [
-  'DigitalSignature',
-  'ContentCommitment',
-  'KeyEncipherment',
-  'DataEncipherment',
-  'KeyAgreement',
-  'CertSign',
-  'CRLSign',
-  'EncipherOnly',
-  'DecipherOnly',
-];
-
-// SubjectAltName/GeneralName types (scroll up to page 38 -> https://datatracker.ietf.org/doc/html/rfc5280#section-4.2.1.7 )
-export const SAN_TYPES = {
-  other_sans: 0, // <OID>;UTF8:<value>
-  alt_names: 2, // dNSName
-  uri_sans: 6, // uniformResourceIdentifier
-  ip_sans: 7, // iPAddress - OCTET STRING
-};
-
-export const SIGNATURE_ALGORITHM_OIDs = {
-  '1.2.840.113549.1.1.2': '0', // MD2-RSA
-  '1.2.840.113549.1.1.4': '0', // MD5-RSA
-  '1.2.840.113549.1.1.5': '0', // SHA1-RSA
-  '1.2.840.113549.1.1.11': '256', // SHA256-RSA
-  '1.2.840.113549.1.1.12': '384', // SHA384-RSA
-  '1.2.840.113549.1.1.13': '512', // SHA512-RSA
-  '1.2.840.113549.1.1.10': {
-    // RSA-PSS have additional OIDs that need to be mapped
-    '2.16.840.1.101.3.4.2.1': '256', // SHA-256
-    '2.16.840.1.101.3.4.2.2': '384', // SHA-384
-    '2.16.840.1.101.3.4.2.3': '512', // SHA-512
-  },
-  '1.2.840.10040.4.3': '0', // DSA-SHA1
-  '2.16.840.1.101.3.4.3.2': '256', // DSA-SHA256
-  '1.2.840.10045.4.1': '0', // ECDSA-SHA1
-  '1.2.840.10045.4.3.2': '256', // ECDSA-SHA256
-  '1.2.840.10045.4.3.3': '384', // ECDSA-SHA384
-  '1.2.840.10045.4.3.4': '512', // ECDSA-SHA512
-  '1.3.101.112': '0', // Ed25519
-};
-
-// returns array of strings that correspond to possible returned values from parsing cert
-export const parsedParameterKeys = [
-  ...Object.keys(SUBJECT_OIDs),
-  ...Object.keys(EXTENSION_OIDs),
-  ...Object.keys(SAN_TYPES),
-  'use_pss',
-  'not_valid_before',
-  'not_valid_after',
-];
diff --git a/ui/app/utils/parse-pki-cert.js b/ui/app/utils/parse-pki-cert.js
deleted file mode 100644
index 5aca3e7aeae92..0000000000000
--- a/ui/app/utils/parse-pki-cert.js
+++ /dev/null
@@ -1,389 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import * as asn1js from 'asn1js';
-import { fromBase64, stringToArrayBuffer } from 'pvutils';
-import { Certificate } from 'pkijs';
-import { differenceInHours, getUnixTime } from 'date-fns';
-import {
-  EXTENSION_OIDs,
-  IGNORED_OIDs,
-  KEY_USAGE_BITS,
-  SAN_TYPES,
-  SIGNATURE_ALGORITHM_OIDs,
-  SUBJECT_OIDs,
-} from './parse-pki-cert-oids';
-
-/* 
- It may be helpful to visualize a certificate's SEQUENCE structure alongside this parsing file.
- You can do so by decoding a certificate here: https://lapo.it/asn1js/#
-
- A certificate is encoded in ASN.1 data - a SEQUENCE is how you define structures in ASN.1.
- GeneralNames, Extension, AlgorithmIdentifier are all examples of SEQUENCEs 
-
- * Error handling: 
-{ can_parse: false } -> returned if the external library cannot convert the certificate 
-{ parsing_errors: [] } -> returned if the certificate was converted, but there's ANY problem parsing certificate details. 
- This means we cannot cross-sign in the UI and prompt the user to do so manually using the CLI.
- */
-
-export function jsonToCertObject(jsonString) {
-  const cert_base64 = jsonString.replace(/(-----(BEGIN|END) CERTIFICATE-----|\n)/g, '');
-  const cert_der = fromBase64(cert_base64);
-  const cert_asn1 = asn1js.fromBER(stringToArrayBuffer(cert_der));
-  return new Certificate({ schema: cert_asn1.result });
-}
-
-export function parseCertificate(certificateContent) {
-  let cert;
-  try {
-    cert = jsonToCertObject(certificateContent);
-  } catch (error) {
-    console.debug('DEBUG: Converting Certificate', error); // eslint-disable-line
-    return { can_parse: false };
-  }
-
-  let parsedCertificateValues;
-  try {
-    const subjectValues = parseSubject(cert?.subject?.typesAndValues);
-    const extensionValues = parseExtensions(cert?.extensions);
-    const [signature_bits, use_pss] = mapSignatureBits(cert?.signatureAlgorithm);
-    const formattedValues = formatValues(subjectValues, extensionValues);
-    parsedCertificateValues = { ...formattedValues, signature_bits, use_pss };
-  } catch (error) {
-    console.debug('DEBUG: Parsing Certificate', error); // eslint-disable-line
-    parsedCertificateValues = { parsing_errors: [new Error('error parsing certificate values')] };
-  }
-
-  const expiryDate = cert?.notAfter?.value;
-  const issueDate = cert?.notBefore?.value;
-  const ttl = `${differenceInHours(expiryDate, issueDate)}h`;
-
-  return {
-    ...parsedCertificateValues,
-    can_parse: true,
-    not_valid_after: getUnixTime(expiryDate),
-    not_valid_before: getUnixTime(issueDate),
-    ttl,
-  };
-}
-
-export function parsePkiCert(model) {
-  // model has to be the responseJSON from PKI serializer
-  // return if no certificate or if the "certificate" is actually a CRL
-  if (!model.certificate || model.certificate.includes('BEGIN X509 CRL')) {
-    return;
-  }
-  return parseCertificate(model.certificate);
-}
-
-export function formatValues(subject, extension) {
-  if (!subject || !extension) {
-    return { parsing_errors: [new Error('error formatting certificate values')] };
-  }
-  const { subjValues, subjErrors } = subject;
-  const { extValues, extErrors } = extension;
-  const parsing_errors = [...subjErrors, ...extErrors];
-  const exclude_cn_from_sans =
-    extValues.alt_names?.length > 0 && !extValues.alt_names?.includes(subjValues?.common_name) ? true : false;
-  // now that we've finished parsing data, join all extension arrays
-  for (const ext in extValues) {
-    if (Array.isArray(extValues[ext])) {
-      extValues[ext] = extValues[ext].length !== 0 ? extValues[ext].join(', ') : null;
-    }
-  }
-
-  return {
-    ...subjValues,
-    ...extValues,
-    parsing_errors,
-    exclude_cn_from_sans,
-  };
-}
-
-/*
-Explanation of cross-signing and how to use the verify function: 
-(See setup script here: https://github.com/hashicorp/vault-tools/blob/main/vault-ui/pki/pki-cross-sign-config.sh)
-1. A trust chain exists between "old-parent-issuer-name" -> "old-intermediate"
-2. We create a new root, "my-parent-issuer-name" to phase out the old one
-
-* cross-signing step performed in the UI * 
-3. Cross-sign "old-intermediate" against new root "my-parent-issuer-name" which generates a new intermediate issuer, 
-"newly-cross-signed-int-name", to phase out the old intermediate
-
-* validate cross-signing accurately copied the old intermediate issuer *
-4. Generate a leaf certificate from "newly-cross-signed-int-name", let's call it "baby-leaf"
-5. Verify that "baby-leaf" validates against both chains: 
-"old-parent-issuer-name" -> "old-intermediate" -> "baby-leaf"
-"my-parent-issuer-name" -> "newly-cross-signed-int-name" -> "baby-leaf"
-
-We're just concerned with the link between the leaf and both intermediates
-to confirm the UI performed the cross-sign correctly
-(which already assumes the link between each parent and intermediate is valid)
-
-verifyCertificates(oldIntermediate, crossSignedCert, leaf)
-
-*/
-export async function verifyCertificates(certA, certB, leaf) {
-  const parsedCertA = jsonToCertObject(certA);
-  const parsedCertB = jsonToCertObject(certB);
-  if (leaf) {
-    const parsedLeaf = jsonToCertObject(leaf);
-    const chainA = await parsedLeaf.verify(parsedCertA);
-    const chainB = await parsedLeaf.verify(parsedCertB);
-    // the leaf's issuer should be equal to the subject data of the intermediate certs
-    const isEqualA = parsedLeaf.issuer.isEqual(parsedCertA.subject);
-    const isEqualB = parsedLeaf.issuer.isEqual(parsedCertB.subject);
-    return chainA && chainB && isEqualA && isEqualB;
-  }
-  // can be used to validate if a certificate is self-signed (i.e. a root cert), by passing it as both certA and B
-  return (await parsedCertA.verify(parsedCertB)) && parsedCertA.issuer.isEqual(parsedCertB.subject);
-}
-
-//* PARSING HELPERS
-/*
-  We wish to get each SUBJECT_OIDs (see utils/parse-pki-cert-oids.js) out of this certificate's subject. 
-  A subject is a list of RDNs, where each RDN is a (type, value) tuple
-  and where a type is an OID. The OID for CN can be found here:
-     
-     https://datatracker.ietf.org/doc/html/rfc5280#page-112
-  
-  Each value is then encoded as another ASN.1 object; in the case of a
-  CommonName field, this is usually a PrintableString, BMPString, or a
-  UTF8String. Regardless of encoding, it should be present in the
-  valueBlock's value field if it is renderable.
-*/
-export function parseSubject(subject) {
-  if (!subject) return null;
-  const values = {};
-  const errors = [];
-
-  const isUnexpectedSubjectOid = (rdn) => !Object.values(SUBJECT_OIDs).includes(rdn.type);
-  if (subject.any(isUnexpectedSubjectOid)) {
-    const unknown = subject.filter(isUnexpectedSubjectOid).map((rdn) => rdn.type);
-    errors.push(new Error('certificate contains unsupported subject OIDs: ' + unknown.join(', ')));
-  }
-
-  const returnValues = (OID) => {
-    const values = subject.filter((rdn) => rdn?.type === OID).map((rdn) => rdn?.value?.valueBlock?.value);
-    // Theoretically, there might be multiple (or no) CommonNames -- but Vault
-    // presently refuses to issue certificates without CommonNames in most
-    // cases. For now, return the first CommonName we find. Alternatively, we
-    // might update our callers to handle multiple and return a string array
-    return values ? (values?.length ? values[0] : null) : null;
-  };
-  Object.keys(SUBJECT_OIDs).forEach((key) => (values[key] = returnValues(SUBJECT_OIDs[key])));
-  return { subjValues: values, subjErrors: errors };
-}
-
-export function parseExtensions(extensions) {
-  if (!extensions) return null;
-  const values = {};
-  const errors = [];
-  const allowedOids = Object.values({ ...EXTENSION_OIDs, ...IGNORED_OIDs });
-  const isUnknownExtension = (ext) => !allowedOids.includes(ext.extnID);
-  if (extensions.any(isUnknownExtension)) {
-    const unknown = extensions.filter(isUnknownExtension).map((ext) => ext.extnID);
-    errors.push(new Error('certificate contains unsupported extension OIDs: ' + unknown.join(', ')));
-  }
-
-  // make each extension its own key/value pair
-  for (const attrName in EXTENSION_OIDs) {
-    values[attrName] = extensions.find((ext) => ext.extnID === EXTENSION_OIDs[attrName])?.parsedValue;
-  }
-
-  if (values.subject_alt_name) {
-    // we only support SANs of type 2 (altNames), 6 (uri) and 7 (ipAddress)
-    const supportedTypes = Object.values(SAN_TYPES);
-    const supportedNames = Object.keys(SAN_TYPES);
-    const sans = values.subject_alt_name?.altNames;
-    if (!sans) {
-      errors.push(new Error('certificate contains an unsupported subjectAltName construction'));
-    } else if (sans.any((san) => !supportedTypes.includes(san.type))) {
-      // pass along error that unsupported values exist
-      errors.push(new Error('subjectAltName contains unsupported types'));
-      // still check and parse any supported values
-      if (sans.any((san) => supportedTypes.includes(san.type))) {
-        supportedNames.forEach((attrName) => {
-          values[attrName] = sans
-            .filter((gn) => gn.type === Number(SAN_TYPES[attrName]))
-            .map((gn) => gn.value);
-        });
-      }
-    } else if (sans.every((san) => supportedTypes.includes(san.type))) {
-      supportedNames.forEach((attrName) => {
-        values[attrName] = sans.filter((gn) => gn.type === Number(SAN_TYPES[attrName])).map((gn) => gn.value);
-      });
-    } else {
-      errors.push(new Error('unsupported subjectAltName values'));
-    }
-  }
-
-  // permitted_dns_domains
-  if (values.name_constraints) {
-    // we only support Name Constraints of dnsName (type 2), this value lives in the permittedSubtree of the Name Constraints sequence
-    // permittedSubtrees contain an array of subtree objects, each object has a 'base' key and EITHER a 'minimum' or 'maximum' key
-    // GeneralSubtree { "base": {   "type": 2,  "value": "dnsname1.com" }, minimum: 0 }
-    const nameConstraints = values.name_constraints;
-    if (Object.keys(nameConstraints).includes('excludedSubtrees')) {
-      errors.push(new Error('nameConstraints contains excludedSubtrees'));
-    } else if (nameConstraints.permittedSubtrees.any((subtree) => subtree.minimum !== 0)) {
-      errors.push(new Error('nameConstraints permittedSubtree contains non-zero minimums'));
-    } else if (nameConstraints.permittedSubtrees.any((subtree) => subtree.maximum)) {
-      errors.push(new Error('nameConstraints permittedSubtree contains maximum'));
-    } else if (nameConstraints.permittedSubtrees.any((subtree) => subtree.base.type !== 2)) {
-      errors.push(new Error('nameConstraints permittedSubtree can only contain dnsName (type 2)'));
-      // still check and parse any supported values
-      if (nameConstraints.permittedSubtrees.any((subtree) => subtree.base.type === 2)) {
-        values.permitted_dns_domains = nameConstraints.permittedSubtrees
-          .filter((gn) => gn.base.type === 2)
-          .map((gn) => gn.base.value);
-      }
-    } else if (nameConstraints.permittedSubtrees.every((subtree) => subtree.base.type === 2)) {
-      values.permitted_dns_domains = nameConstraints.permittedSubtrees.map((gn) => gn.base.value);
-    } else {
-      errors.push(new Error('unsupported nameConstraints values'));
-    }
-  }
-
-  if (values.basic_constraints) {
-    values.max_path_length = values.basic_constraints?.pathLenConstraint;
-  }
-
-  if (values.ip_sans) {
-    const parsed_ips = [];
-    for (const ip_san of values.ip_sans) {
-      const unused = ip_san.valueBlock.unusedBits;
-      if (unused !== undefined && unused !== null && unused !== 0) {
-        errors.push(new Error('unsupported ip_san value: non-zero unused bits in encoding'));
-        continue;
-      }
-
-      const ip = new Uint8Array(ip_san.valueBlock.valueHex);
-
-      // Length of the IP determines the type: 4 bytes for IPv4, 16 bytes for
-      // IPv6.
-      if (ip.length === 4) {
-        const ip_addr = ip.join('.');
-        parsed_ips.push(ip_addr);
-      } else if (ip.length === 16) {
-        const src = new Array(...ip);
-        const hex = src.map((value) => '0' + new Number(value).toString(16));
-        const trimmed = hex.map((value) => value.slice(value.length - 2, 3));
-        // add a colon after every other number (those with an odd index)
-        let ip_addr = trimmed.map((value, index) => (index % 2 === 0 ? value : value + ':')).join('');
-        // Remove trailing :, if any.
-        ip_addr = ip_addr.slice(-1) === ':' ? ip_addr.slice(0, -1) : ip_addr;
-        parsed_ips.push(ip_addr);
-      } else {
-        errors.push(
-          new Error(
-            'unsupported ip_san value: unknown IP address size (should be 4 or 16 bytes, was ' +
-              parseInt(ip.length / 2) +
-              ')'
-          )
-        );
-      }
-    }
-    values.ip_sans = parsed_ips;
-  }
-
-  if (values.key_usage) {
-    // KeyUsage is a big-endian bit-packed enum. Unused right-most bits are
-    // truncated. So, a KeyUsage with CertSign+CRLSign would be "000001100",
-    // with the right two bits truncated, and packed into an 8-bit, one-byte
-    // string ("00000011"), introducing a leading zero. unused indicates that
-    // this bit can be discard, shifting our result over by one, to go back
-    // to its original form (minus trailing zeros).
-    //
-    // We can thus take our enumeration (KEY_USAGE_BITS), check whether the
-    // bits are asserted, and push in our pretty names as appropriate.
-    const unused = values.key_usage.valueBlock.unusedBits;
-    const keyUsage = new Uint8Array(values.key_usage.valueBlock.valueHex);
-
-    const computedKeyUsages = [];
-    for (const enumIndex in KEY_USAGE_BITS) {
-      // May span two bytes.
-      const byteIndex = parseInt(enumIndex / 8);
-      const bitIndex = parseInt(enumIndex % 8);
-      const enumName = KEY_USAGE_BITS[enumIndex];
-      const mask = 1 << (8 - bitIndex); // Big endian.
-      if (byteIndex >= keyUsage.length) {
-        // DecipherOnly is rare and would push into a second byte, but we
-        // don't have one so exit.
-        break;
-      }
-
-      let enumByte = keyUsage[byteIndex];
-      const needsAdjust = byteIndex + 1 === keyUsage.length && unused > 0;
-      if (needsAdjust) {
-        enumByte = parseInt(enumByte << unused);
-      }
-
-      const isSet = (mask & enumByte) === mask;
-      if (isSet) {
-        computedKeyUsages.push(enumName);
-      }
-    }
-
-    // Vault currently doesn't allow setting key_usage during issuer
-    // generation, but will allow it if it comes in via an externally
-    // generated CSR. Validate that key_usage matches expectations and
-    // prune accordingly.
-    const expectedUsages = ['CertSign', 'CRLSign'];
-    const isUnexpectedKeyUsage = (ext) => !expectedUsages.includes(ext);
-
-    if (computedKeyUsages.any(isUnexpectedKeyUsage)) {
-      const unknown = computedKeyUsages.filter(isUnexpectedKeyUsage);
-      errors.push(new Error('unsupported key usage value on issuer certificate: ' + unknown.join(', ')));
-    }
-
-    values.key_usage = computedKeyUsages;
-  }
-
-  if (values.other_sans) {
-    // We need to parse these into their server-side values.
-    const parsed_sans = [];
-    for (const san of values.other_sans) {
-      let [objectId, constructed] = san.valueBlock.value;
-      objectId = objectId.toJSON().valueBlock.value;
-      constructed = constructed.valueBlock.value[0].toJSON(); // can I just grab the first element here?
-      const { blockName } = constructed;
-      const value = constructed.valueBlock.value;
-      parsed_sans.push(`${objectId};${blockName.replace('String', '')}:${value}`);
-    }
-    values.other_sans = parsed_sans;
-  }
-
-  delete values.subject_alt_name;
-  delete values.basic_constraints;
-  delete values.name_constraints;
-  return { extValues: values, extErrors: errors };
-  /*
-  values is an object with keys from EXTENSION_OIDs and SAN_TYPES
-  values = {
-    "alt_names": string[],
-    "uri_sans": string[],
-    "permitted_dns_domains": string[],
-    "max_path_length": int,
-    "key_usage": ['CertSign', 'CRLSign'],
-    "ip_sans": ['192.158.1.38', '1234:fd2:5621:1:89::4500'],
-  }
-  */
-}
-
-function mapSignatureBits(sigAlgo) {
-  const { algorithmId } = sigAlgo;
-
-  // use_pss is true, additional OIDs need to be mapped
-  if (algorithmId === '1.2.840.113549.1.1.10') {
-    // object identifier for PSS is very nested
-    const objId = sigAlgo.algorithmParams?.valueBlock?.value[0]?.valueBlock?.value[0]?.valueBlock?.value[0]
-      .toString()
-      .split(' : ')[1];
-    return [SIGNATURE_ALGORITHM_OIDs[algorithmId][objId], true];
-  }
-  return [SIGNATURE_ALGORITHM_OIDs[algorithmId], false];
-}
diff --git a/ui/app/utils/path-encoding-helpers.js b/ui/app/utils/path-encoding-helpers.js
index ea0f9976c8601..1e89905b9d999 100644
--- a/ui/app/utils/path-encoding-helpers.js
+++ b/ui/app/utils/path-encoding-helpers.js
@@ -1,27 +1,11 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
+import RouteRecognizer from 'route-recognizer';
 
-function encodePath(path) {
-  return path
-    ? path
-        .split('/')
-        .map((segment) => encodeURIComponent(segment))
-        .join('/')
-    : path;
-}
+const {
+  Normalizer: { normalizePath, encodePathSegment },
+} = RouteRecognizer;
 
-function normalizePath(path) {
-  // Unlike normalizePath from route-recognizer, this method assumes
-  // we do not have percent-encoded data octets as defined in
-  // https://datatracker.ietf.org/doc/html/rfc3986
-  return path
-    ? path
-        .split('/')
-        .map((segment) => decodeURIComponent(segment))
-        .join('/')
-    : '';
+export function encodePath(path) {
+  return path ? path.split('/').map(encodePathSegment).join('/') : path;
 }
 
-export { normalizePath, encodePath };
+export { normalizePath, encodePathSegment };
diff --git a/ui/app/utils/remove-record.js b/ui/app/utils/remove-record.js
index f7095b7bfcea3..257276c4d51ba 100644
--- a/ui/app/utils/remove-record.js
+++ b/ui/app/utils/remove-record.js
@@ -1,12 +1,7 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 // Unlinks a record from all its relationships and unloads it from
 // the store.
 export default function removeRecord(store, record) {
-  const id = record.path || record.id;
+  let id = record.path || record.id;
   if (id) {
     // Collect relationship property names and types
     const relationshipMeta = [];
diff --git a/ui/app/utils/trim-right.js b/ui/app/utils/trim-right.js
index fc434c92037fb..4d5fcf078f99c 100644
--- a/ui/app/utils/trim-right.js
+++ b/ui/app/utils/trim-right.js
@@ -1,13 +1,8 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 // will trim a given set of endings from the end of a string
 // if isExtension is true, the first char of that string will be escaped
 // in the regex
 export default function (str, endings = [], isExtension = true) {
-  const prefix = isExtension ? '\\' : '';
-  const trimRegex = new RegExp(endings.map((ext) => `${prefix}${ext}$`).join('|'));
+  let prefix = isExtension ? '\\' : '';
+  let trimRegex = new RegExp(endings.map((ext) => `${prefix}${ext}$`).join('|'));
   return str.replace(trimRegex, '');
 }
diff --git a/ui/app/utils/validators.js b/ui/app/utils/validators.js
index ceab04ef396fe..1842f9410657c 100644
--- a/ui/app/utils/validators.js
+++ b/ui/app/utils/validators.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { isPresent } from '@ember/utils';
 
 export const presence = (value) => isPresent(value);
@@ -26,7 +21,7 @@ export const number = (value, { nullable = false } = {}) => {
 };
 
 export const containsWhiteSpace = (value) => {
-  const validation = new RegExp('\\s', 'g'); // search for whitespace
+  let validation = new RegExp('\\s', 'g'); // search for whitespace
   return !validation.test(value);
 };
 
diff --git a/ui/blueprints/component/files/__root__/__path__/__name__.js b/ui/blueprints/component/files/__root__/__path__/__name__.js
new file mode 100644
index 0000000000000..e2409dfef8e82
--- /dev/null
+++ b/ui/blueprints/component/files/__root__/__path__/__name__.js
@@ -0,0 +1,20 @@
+import Component from '@glimmer/component';
+<%= importTemplate %>
+<%= setComponentTemplate %>
+/**
+ * @module <%= classifiedModuleName %>
+ * <%= classifiedModuleName %> components are used to...
+ *
+ * @example
+ * ```js
+ * <<%= classifiedModuleName %> @requiredParam={requiredParam} @optionalParam={optionalParam} @param1={{param1}}/>
+ * ```
+ * @param {object} requiredParam - requiredParam is...
+ * @param {string} [optionalParam] - optionalParam is...
+ * @param {string} [param1=defaultValue] - param1 is...
+ */
+
+<%= exportDefault %>class <%= classifiedModuleName %> extends Component { 
+}
+
+<%= exportAddOn %>
diff --git a/ui/blueprints/component/files/__root__/__templatepath__/__templatename__.hbs b/ui/blueprints/component/files/__root__/__templatepath__/__templatename__.hbs
new file mode 100644
index 0000000000000..7bc14dacccba9
--- /dev/null
+++ b/ui/blueprints/component/files/__root__/__templatepath__/__templatename__.hbs
@@ -0,0 +1,2 @@
+{{!-- template-lint-disable --}}
+{{yield}}
\ No newline at end of file
diff --git a/ui/blueprints/component/index.js b/ui/blueprints/component/index.js
new file mode 100644
index 0000000000000..35948a6cf11c5
--- /dev/null
+++ b/ui/blueprints/component/index.js
@@ -0,0 +1,89 @@
+'use strict';
+/* eslint-disable node/no-extraneous-require */
+/* eslint-disable ember/no-string-prototype-extensions */
+const path = require('path');
+const stringUtil = require('ember-cli-string-utils');
+const pathUtil = require('ember-cli-path-utils');
+const getPathOption = require('ember-cli-get-component-path-option');
+const normalizeEntityName = require('ember-cli-normalize-entity-name');
+
+module.exports = {
+  description: 'Generates a component.',
+
+  availableOptions: [
+    {
+      name: 'path',
+      type: String,
+      default: 'components',
+      aliases: [{ 'no-path': '' }],
+    },
+  ],
+
+  filesPath: function () {
+    let filesDirectory = 'files';
+
+    return path.join(this.path, filesDirectory);
+  },
+
+  fileMapTokens: function () {
+    return {
+      __path__: function (options) {
+        if (options.pod) {
+          return path.join(options.podPath, options.locals.path, options.dasherizedModuleName);
+        } else {
+          return 'components';
+        }
+      },
+      __templatepath__: function (options) {
+        if (options.pod) {
+          return path.join(options.podPath, options.locals.path, options.dasherizedModuleName);
+        }
+        return 'templates/components';
+      },
+      __templatename__: function (options) {
+        if (options.pod) {
+          return 'template';
+        }
+        return options.dasherizedModuleName;
+      },
+    };
+  },
+
+  normalizeEntityName: function (entityName) {
+    return normalizeEntityName(entityName);
+  },
+
+  locals: function (options) {
+    let exportDefault = 'export default ';
+    let exportAddOn = '';
+    let importTemplate = '';
+    let setComponentTemplate = '';
+    let templatePath = '';
+
+    // if we're in an addon, build import statement and set layout
+    if (options.project.isEmberCLIAddon() || (options.inRepoAddon && !options.inDummy) || !!options.in) {
+      if (options.pod) {
+        templatePath = './template';
+      } else {
+        templatePath =
+          pathUtil.getRelativeParentPath(options.entity.name) +
+          'templates/components/' +
+          stringUtil.dasherize(options.entity.name);
+      }
+      exportDefault = '';
+      exportAddOn = `export default setComponentTemplate(layout, ${stringUtil.classify(
+        options.entity.name
+      )})`;
+      importTemplate = "import layout from '" + templatePath + "';";
+      setComponentTemplate = "import { setComponentTemplate } from '@ember/component'; \n";
+    }
+
+    return {
+      exportDefault: exportDefault,
+      exportAddOn: exportAddOn,
+      importTemplate: importTemplate,
+      setComponentTemplate: setComponentTemplate,
+      path: getPathOption(options),
+    };
+  },
+};
diff --git a/ui/config/content-security-policy.js b/ui/config/content-security-policy.js
deleted file mode 100644
index 648475647fc60..0000000000000
--- a/ui/config/content-security-policy.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-module.exports = function (environment) {
-  return {
-    delivery: ['header', 'meta'],
-    enabled: environment !== 'production',
-    failTests: true,
-    policy: {
-      'default-src': ["'none'"],
-      'script-src': ["'self'"],
-      'font-src': ["'self'"],
-      'connect-src': ["'self'"],
-      'img-src': ["'self'", 'data:'],
-      'style-src': ["'unsafe-inline'", "'self'"],
-      'media-src': ["'self'"],
-      'form-action': ["'none'"],
-    },
-    reportOnly: false,
-  };
-};
diff --git a/ui/config/deprecation-workflow.js b/ui/config/deprecation-workflow.js
index a6b053a00ae02..d516d20bdaa4d 100644
--- a/ui/config/deprecation-workflow.js
+++ b/ui/config/deprecation-workflow.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /* global self */
 self.deprecationWorkflow = self.deprecationWorkflow || {};
 //self.deprecationWorkflow.config = {
@@ -10,15 +5,20 @@ self.deprecationWorkflow = self.deprecationWorkflow || {};
 //}
 self.deprecationWorkflow.config = {
   // current output from deprecationWorkflow.flushDeprecations();
-  // deprecations that will not be removed until 5.0.0 are filtered by deprecation-filter initializer rather than silencing below
+  // deprecations that will not be removed until 4.0.0 are filtered by deprecation-filter initializer rather than silencing below
   workflow: [
-    { handler: 'silence', matchId: 'ember-data:model-save-promise' },
-    { handler: 'silence', matchId: 'ember-engines.deprecation-camelized-engine-names' },
-    { handler: 'silence', matchId: 'ember-engines.deprecation-router-service-from-host' },
-    { handler: 'silence', matchId: 'ember-modifier.use-modify' },
-    { handler: 'silence', matchId: 'ember-modifier.no-element-property' },
-    { handler: 'silence', matchId: 'ember-modifier.no-args-property' },
-    { handler: 'silence', matchId: 'ember-cli-mirage-config-routes-only-export' },
-    { handler: 'silence', matchId: 'setting-on-hash' },
+    { handler: 'log', matchId: 'routing.transition-methods' },
+    { handler: 'log', matchId: 'implicit-injections' },
+    { handler: 'log', matchId: 'ember-metal.get-with-default' },
+    { handler: 'log', matchId: 'manager-capabilities.modifiers-3-13' },
+    { handler: 'log', matchId: 'computed-property.override' },
+    { handler: 'log', matchId: 'ember-glimmer.link-to.positional-arguments' },
+    { handler: 'log', matchId: 'this-property-fallback' },
+    { handler: 'log', matchId: 'ember-source.deprecation-without-for' },
+    { handler: 'log', matchId: 'ember-source.deprecation-without-since' },
+    { handler: 'log', matchId: 'ember-composable-helpers.contains-helper' },
+    { handler: 'log', matchId: 'ember-component.is-visible' },
+    { handler: 'log', matchId: 'ember-engines.deprecation-camelized-engine-names' },
+    { handler: 'log', matchId: 'ember-engines.deprecation-router-service-from-host' },
   ],
 };
diff --git a/ui/config/ember-cli-update.json b/ui/config/ember-cli-update.json
index 9f8a7b10cc3c2..18405cde8cd7d 100644
--- a/ui/config/ember-cli-update.json
+++ b/ui/config/ember-cli-update.json
@@ -3,7 +3,7 @@
   "packages": [
     {
       "name": "ember-cli",
-      "version": "4.4.0",
+      "version": "3.28.5",
       "blueprints": [
         {
           "name": "app",
diff --git a/ui/config/environment.js b/ui/config/environment.js
index b744744435eb7..42548523b2f20 100644
--- a/ui/config/environment.js
+++ b/ui/config/environment.js
@@ -1,18 +1,13 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /* eslint-env node */
 'use strict';
 
 module.exports = function (environment) {
-  const ENV = {
+  let ENV = {
     modulePrefix: 'vault',
-    environment,
+    environment: environment,
     rootURL: '/ui/',
     serviceWorkerScope: '/v1/sys/storage/raft/snapshot',
-    locationType: 'history',
+    locationType: 'auto',
     EmberENV: {
       FEATURES: {
         // Here you can enable experimental features on an ember canary build
@@ -73,6 +68,16 @@ module.exports = function (environment) {
   }
   if (environment !== 'production') {
     ENV.APP.DEFAULT_PAGE_SIZE = 15;
+    ENV.contentSecurityPolicyHeader = 'Content-Security-Policy';
+    ENV.contentSecurityPolicyMeta = true;
+    ENV.contentSecurityPolicy = {
+      'connect-src': ["'self'"],
+      'img-src': ["'self'", 'data:'],
+      'font-src': ["'self'"],
+      'form-action': ["'none'"],
+      'script-src': ["'self'"],
+      'style-src': ["'unsafe-inline'", "'self'"],
+    };
   }
 
   ENV.welcomeMessage = process.env.UI_AUTH_WELCOME;
diff --git a/ui/config/targets.js b/ui/config/targets.js
index d92bdaecb8150..f22368fd03718 100644
--- a/ui/config/targets.js
+++ b/ui/config/targets.js
@@ -1,12 +1,23 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 'use strict';
-
-const browsers = ['last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions'];
-
+// Ember's browser support policy is changing, and IE11 support will end in
+// v4.0 onwards.
+//
+// See https://deprecations.emberjs.com/v3.x#toc_3-0-browser-support-policy
+//
+// If you need IE11 support on a version of Ember that still offers support
+// for it, uncomment the code block below.
+//
+// const isCI = Boolean(process.env.CI);
+// const isProduction = process.env.EMBER_ENV === 'production';
+//
+// if (isCI || isProduction) {
+//   browsers.push('ie 11');
+// }
 module.exports = {
-  browsers,
+  browsers: [
+    'last 1 edge versions',
+    'last 1 Chrome versions',
+    'last 1 Firefox versions',
+    'last 1 Safari versions',
+  ],
 };
diff --git a/ui/docs/components.md b/ui/docs/components.md
deleted file mode 100644
index b38aeafa427b1..0000000000000
--- a/ui/docs/components.md
+++ /dev/null
@@ -1,61 +0,0 @@
-# Writing and consuming components
-
-Components can range from small, highly reusable "atoms" to large units with lots of business logic specific to one workflow or action. In any scenario, these are things to keep in mind while developing components for the Vault UI.
-
-Please note that these guidelines are aspirational and you will see instances of antipatterns in the codebase. Many of these should be updated as we move forward. As with any ruleset, sometimes it is appropriate to break the rule.
-
-## Page components for every route
-
-Route templates should render a `Page` component, which includes breadcrumbs, page title, and then renders whatever else should be on the page (often another scoped component).
-
-- This component should be named something like `<Page::CreateFoo />` and you can create it like `ember g component page/create-foo -gc`.
-- The Route should pass the model hook data into the component in the template. However, if the model hook returns multiple objects they should each be passed into the Page component as separate args. For example: within a route's template whose model hook returns two different data models, the route's template would look like:
-
-```hbs
-<Page::CreateFoo @config={{this.model.config}} @foo={{this.model.foo}} />
-```
-
-## Conditional rendering
-
-Generally, we want the burden of deciding whether a component should render to live in the parent rather than the child.
-
-- **Readability** - it's easier to tell at a glance that a component will sometimes not render if the `{{#if}}` block is on the parent.
-- **Performance** - when a component is in charge of its own rendering logic, the component's lifecycle hooks will fire whether or not the component will render on the page. This can lead to degraded performance, for example if hundreds of the same component are listed on the page.
-
-## Reusable components
-
-When developing components, make sure to:
-
-- Add splattributes to the top level, eg:
-
-  ```hbs
-  <div data-test-stuff ...attributes>Stuff!</div>
-  ```
-
-- Consider passing splattributes or yielding something instead of passing a new arg
-
-  ❌ **Instead of:** passing a new arg that controls a style
-
-  ```
-  <Block @title="Example" @hasPadding={{false}} />
-  ```
-
-  ✅ **Prefer:** passing a class or helper that controls a style
-
-  ```
-  <Block @title="Example" class="padding-0" />
-  ```
-
-- Minimize the number of args that must be passed
-
-  ❌ **Instead of:** Passing in separate args that are both required for icon to render
-
-  ```
-  <Block @title="Example" @hasIcon={{true}} @iconName="key" />
-  ```
-
-  ✅ **Prefer:** One arg that is rendered if present
-
-  ```
-  <Block @title="Example" @icon="key" />
-  ```
diff --git a/ui/docs/css.md b/ui/docs/css.md
deleted file mode 100644
index 211699929ecfc..0000000000000
--- a/ui/docs/css.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# CSS/SCSS
-
-<!-- START doctoc generated TOC please keep comment here to allow auto update -->
-<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
-
-- [Guidelines](#guidelines)
-  - [Helper classes](#helper-classes)
-  - [Core class styles](#core-class-styles)
-
-<!-- END doctoc generated TOC please keep comment here to allow auto update -->
-
-## Guidelines
-
-- [**Helper classes**](#helper-classes) should be used if a styling block does not already exist and/or a reasonable number of helper classes can cover the desired style.
-- [**Core classes**](#core-class-styles) provide styling for any classes not associated with a component. The scope of each file is defined by the file name.
-- **Component specific styling** should only be added to, or created when you cannot achieve the styling with a helper class or core class.
-- **Utils'** files define mixins, and variables. 
-
-> ### Known issues
-> The following are known issues that we are working to address in conjunction with the adoption of HDS.
-> 1. **Size variables** The UI does not follow a consistent size variable pattern. We use both px and rem to define font-size and we use px, rem, and ems to define margins, heights and widths. For accessibility reasons we _should_ define all font-sizing at the very least by rem, though this is not consistently done in the app.
-> 2. **Variable naming** The UI does not have a consistent pattern to variable naming. We use a mix of numbers and words (ex: `ui-gray-050` is the same as `ui-gray-lightest`).
-> 3. **Random variables** We have dieing but not dead variables. For example, we have some variables that define box-shadows and we have some variables to define animations, but we are missing many box-shadow definitions and we do not consistently use the animation variables.
-> 4. **Missing variables** The UI does not have a variable for all commonly occurring sizes and colors. For example, we do not have a variable that covers the `14px` though it is a commonly used size.
-> 5. **!Important** `!important` is sprinkled throughout helper, core and component files. Ideally, the cascading and order of styles would eliminate the need of this keyword. However, because `!important` exist randomly in many of our files, we now have cascading issues inside helper files and core files. In all known cases where these issues exist a comment has been left as to why the order of classes in that particular area matters.
-
-### Helper classes
-
-A good portion of our class definitions have come from Bulma. Bulma has since been removed, but we still rely on many of its class definitions. Bulma class definitions, specifically their helper classes, always end in the keyword  `!important`. This use of `important!` and Bulma specific naming patterns has led to a mix of inconsistent helper class names. Moving forward, we have agreed as a team to pursue the following patterns. When it makes sense, please default to these instead of relying on existing helper names for guidance.
-
-- Drop the starting verb. Many of our helper classes start with a verb `has` or `is`. Going forward we prefer to drop the verb. `margin-bottom` instead of `is-margin-bottom`.
-- Start your helper class name with what the class controls. `margin-bottom` instead of `bottom-margin`.
-- Match your helper class size to a pre-existing size variable. `margin-bottom-large` instead of `margin-bottom-big`.
-
-### Core class styles
-
-All files under `app/styles/core` directory define style for the class of the file name. Think of these as files for the heavily used classes that are not defined as a component. Things like `.box` or `.title`. These classes are used in our app over many files that span multiple components, but they are themselves are _not_ components.
-
-If the core file ends in a `s` (e.g. `lists` or `containers`) the plural indicates that the file defines more than just the style for the class `container`. The `core/containers.scss` file defines classes for all things relating to container-type classes: `page-container`, `section` as well as the `container` class. There are only a few plural core files as they are the exception and not the norm.
diff --git a/ui/docs/ember-engines.md b/ui/docs/ember-engines.md
deleted file mode 100644
index 25282b523377c..0000000000000
--- a/ui/docs/ember-engines.md
+++ /dev/null
@@ -1,175 +0,0 @@
-# [Ember Engines](https://ember-engines.com/docs)
-
-This is a quickstart guide inspired by [ember engine quickstart](https://ember-engines.com/docs/quickstart) on how to set up an ember engine in Vault!
-
-## Create a new in-repo engine:
-
-`ember g in-repo-engine <engine-name>`
-
-_This blueprint in-repo engine command will add a new folder `lib/<engine-name>` and add the engine to our main app’s `package.json`_
-
-## Engine’s package.json:
-
-```json
-{
-  "name": "<engine-name>",
-
-  "dependencies": {
-    "ember-cli-htmlbars": "*",
-    "ember-cli-babel": "*"
-  },
-
-  "ember-addon": {
-    "paths": ["../core"]
-  }
-}
-```
-
-For our application, we want to include the **ember-addon** path `../core`
-
-By adding this **ember-addon** path, we are able to share elements between your in-repo addon and the Vault application[^1].
-
-## Configure your Engine
-
-In the engine’s `index.js` file:
-
-```js
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-/* eslint-disable node/no-extraneous-require */
-const { buildEngine } = require('ember-engines/lib/engine-addon');
-
-module.exports = buildEngine({
-  name: '<engine-name>',
-  lazyLoading: {
-    enabled: false,
-  },
-  isDevelopingAddon() {
-    return true;
-  },
-});
-```
-
-Within your Engine’s `config/environment.js` file:
-
-```js
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-// config/environment.js
-
-'use strict';
-
-module.exports = function (environment) {
-  const ENV = {
-    modulePrefix: '<engine-name>',
-    environment: environment,
-  };
-
-  return ENV;
-};
-```
-
-Within your Engine’s `addon/engine.js` file:
-
-```js
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Engine from '@ember/engine';
-
-import loadInitializers from 'ember-load-initializers';
-import Resolver from 'ember-resolver';
-
-import config from './config/environment';
-
-const { modulePrefix } = config;
-
-export default class <EngineName>Engine extends Engine {
-  modulePrefix = modulePrefix;
-  Resolver = Resolver;
-  dependencies = {
-    services: ['router', 'store', 'secret-mount-path', 'flash-messages'],
-    externalRoutes: ['secrets'],
-  };
-}
-
-loadInitializers(<EngineName>Engine, modulePrefix);
-```
-
-### Service Dependencies:
-
-The services in the example above are common services that we often use in our engines. If your engine requires other services from the main application, add them to the services array.
-
-#### Notes:
-
-- Service dependencies are OPTIONAL. If your engine does not use any external services, you do not need to include a services dependency array.
-- Remember to include any dependencies here in the engine's dependencies in app/app.js
-
-### External Route Dependencies:
-
-The external route dependencies allow you to link to a route outside of your engine. In this example, we list 'secrets' in the externalRoute and the route is defined in the `app.js` file.
-
-#### Notes:
-
-- In order to link to the other routes in the main app using the `LinkToExternal` component from your engine, you need to add the route to the `app/app.js` and your engine’s `addon/engine.js`. More information on [Linking to An External Context.](https://ember-engines.com/docs/link-to-external).
-
-## Additional info about your engine's `application.hbs`:
-
-- Optional step: Add some text in the engine’s `application.hbs` file (to see if your engine was set up correctly).
-- **NOTE: Most of our existing engines do not keep the generated `application.hbs` template file. If nothing will be added to it and it remains as just an `{{outlet}}` it can safely be removed.**
-
-## Register your engine with our main application:
-
-In our `app/app.js` file in the engines object, add your engine’s name and dependencies.
-
-```js
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Application from '@ember/application';
-import Resolver from 'ember-resolver';
-import loadInitializers from 'ember-load-initializers';
-import config from 'vault/config/environment';
-
-export default class App extends Application {
-	...
-  engines = {
-    <engine-name>: {
-      dependencies: {
-        services: ['router', 'store', 'secret-mount-path', 'flash-messages', <any-other-dependencies-you-have>],
-        externalRoutes: {
-          secrets: 'vault.cluster.secrets.backends',
-        },
-      },
-    },
-  };
-}
-
-loadInitializers(App, config.modulePrefix);
-```
-
-If you used `ember g in-repo-engine <engine-name>` to generate the engine’s blueprint, it should have added `this.mount(<engine-name>)` to the main app’s `router.js` file (this adds your engine and its associated routes). \*Move `this.mount(<engine-name>)` to match your engine’s route structure. For more information about [Routable Engines](https://ember-engines.com/docs/quickstart#routable-engines).
-
-### Important Notes:
-
-- Anytime a new engine is created, you will need to `yarn install` and **RESTART** ember server!
-- To add `package.json` **dependencies** or **devDependencies**, you can copy + paste the dependency into corresponding sections. Most of the time, we will want to use "\*" in place of the version number to ensure all the dependencies have the latest version.
-
-### Common blueprint commands:
-
-- **Generating In-repo engines routes:** `ember generate route <route-name> --in-repo <in-repo-name>` - _generates tests and route files and templates_
-- **Remove In-repo engines routes:** `ember destroy route <route-name> --in-repo <in-repo-name>` - _removes tests and route files and templates_
-- **Generating In-repo engines components:** `ember generate component <component-name> --in-repo <in-repo-name>`- _generates tests and component files and templates_
-- **Remove In-repo engines components:** `ember destroy component <component-name> --in-repo <in-repo-name>`- _removes tests and component files and templates_
-
-[^1]: https://ember-engines.com/docs/quickstart#create-as-in-repo-engine
diff --git a/ui/docs/forms.md b/ui/docs/forms.md
deleted file mode 100644
index 050bec35fcee0..0000000000000
--- a/ui/docs/forms.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# Forms
-
-<!-- START doctoc generated TOC please keep comment here to allow auto update -->
-<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
-
-- [Guidelines](#guidelines)
-
-<!-- END doctoc generated TOC please keep comment here to allow auto update -->
-
-## Guidelines
-
-- Render `FlashMessage` on success
-- Handling errors/validation messages:
-  - Render API errors using the `AlertBanner` at the top of forms
-  - Display validation error messages `onsubmit` (not `onchange` for inputs)
-  - Render an `<AlertInline>` [beside](../lib/pki/addon/components/pki-role-generate.hbs) form buttons, especially if the error banner is hidden from view (long forms). Message options:
-    - The `invalidFormMessage` from a model's `validate()` method that includes an error count
-    - Generic message for API errors or forms without model validations: 'There was an error submitting this form.'
-  - Add `has-error-border` class to invalid inputs
diff --git a/ui/docs/model-validations.md b/ui/docs/model-validations.md
deleted file mode 100644
index ad0ce0dace6a8..0000000000000
--- a/ui/docs/model-validations.md
+++ /dev/null
@@ -1,159 +0,0 @@
-# Model Validations Decorator
-  
-The model-validations decorator provides a method on a model class which may be used for validating properties based on a provided rule set.
-
-## API
-
-The decorator expects a validations object as the only argument with the following shape:
-
-``` js
-const validations = {
-  [propertyKeyName]: [
-    { type, options, message, level, validator }
-  ]
-};
-```
-**propertyKeyName** [string] - each key in the validations object should refer to the property on the class to apply the validation to.
- 
-**type** [string] - the type of validation to apply. These must be exported from the [validators util](../app/utils/validators.js) for lookup. Type is required if a *validator* function is not provided.
-
-**options** [object] - an optional object for the given validator -- min, max, nullable etc.
-
-**message** [string | function] - string added to the errors array and returned in the state object from the validate method if validation fails. A function may also be provided with the model as the lone argument that returns a string. Since this value is typically displayed to the user it should be a complete sentence with proper punctuation.
-
-**level** [string] *optional* - string that defaults to 'error'. Currently the only other accepted value is 'warn'.
-
-**validator** [function] *optional* - a function that may be used in place of type that is invoked in the validate method. This is useful when specific validations are needed which may be dependent on other class properties.
-This function takes the class context (this) as the only argument and returns true or false.
-
-## Usage
-
-Each property defined in the validations object supports multiple validations provided as an array. For example, *presence* and *containsWhiteSpace* can both be added as validations for a string property. 
-
-```js
-const validations = {
-  name: [
-    { type: 'presence', message: 'Name is required.' },
-    {
-      type: 'containsWhiteSpace',
-      message: 'Name cannot contain whitespace.',
-    },
-  ],
-};
-```
-Decorate the model class and pass the validations object as the argument
-
-```js
-import Model, { attr } from '@ember-data/model';
-import withModelValidations from 'vault/decorators/model-validations';
-
-const validations = {
-  name: [
-    { type: 'presence', message: 'Name is required.' },
-  ],
-};
-
-@withModelValidations(validations)
-class SomeModel extends Model {
-  @attr name;
-}
-```
-
-Validations must be invoked using the validate method which is added directly to the decorated class.
-
-```js
-const model = await this.store.findRecord('some-model', id);
-const { isValid, state, invalidFormMessage } = model.validate();
-
-if (isValid) {
-  await model.save();
-} else {
-  this.formError = invalidFormMessage;
-  this.errors = state;
-}
-```
-**isValid** [boolean] - the validity of the full class. If no properties provided in the validations object are invalid this will be true.
-
-**state** [object] - the error state of the properties defined in the validations object. This object is keyed by the property names from the validations object and each property contains an *isValid* and *errors* value. The *errors* array will be populated with messages defined in the validations object when validations fail. Since a property can have multiple validations, errors is always returned as an array.
-
-**invalidFormMessage** [string] - message describing the number of errors currently present on the model class.
- 
-```js
-const { state } = model.validate();
-const { isValid, errors } = state[propertyKeyName];
-if (!isValid) {
-  this.flashMessages.danger(errors.join('. '));
-}
-```
-
-## Examples
-### Basic
-
-```js
-const validations = {
-  foo: [
-    { type: 'presence', message: 'foo is a required field.' }
-  ],
-};
-
-@withModelValidations(validations)
-class SomeModel extends Model { foo = null; }
-
-const model = new SomeModel();
-const { isValid, state } = model.validate();
-
-console.log(isValid); // false
-console.log(state.foo.isValid); // false
-console.log(state.foo.errors); // ['foo is a required field']
-```
-### Custom validator
-
-```js
-const validations = {
-  foo: [{
-    validator: (model) => model.bar.includes('test') ? model.foo : false,
-    message: 'foo is required if bar includes test.'
-  }],
-};
-
-@withModelValidations(validations)
-class SomeModel extends Model {
-  foo = false;
-  bar = ['foo', 'baz'];
-}
-
-const model = new SomeModel();
-const { isValid, state } = model.validate();
-
-console.log(isValid); // false
-console.log(state.foo.isValid); // false
-console.log(state.foo.errors); // ['foo is required if bar includes test.']
-
-model.foo = true;
-model.bar.push('test');
-
-console.log(isValid); // true
-console.log(state.foo.isValid); // true
-console.log(state.foo.errors); // []
-```
-
-### Adding class in template based on validation state
-
-All form validation errors must have a red border around them. Add this by adding a conditional class *has-error-border* to the element.
-
-```js
-@action
-async save() {
-  const { isValid, state } = this.model.validate();
-
-  if (isValid) {
-    await this.model.save();
-  } else {
-    this.isNameInvalid = !state.name.isValid;
-  }
-}
-```
-
-```hbs
- <input class="input field {{if this.isNameInvalid 'has-error-border'}}" />
-```
\ No newline at end of file
diff --git a/ui/docs/models.md b/ui/docs/models.md
deleted file mode 100644
index a13a56cbcf2cf..0000000000000
--- a/ui/docs/models.md
+++ /dev/null
@@ -1,153 +0,0 @@
-# Models
-
-<!-- START doctoc generated TOC please keep comment here to allow auto update -->
-<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
-
-- [Models](#models)
-  - [Capabilities](#capabilities)
-  - [Decorators](#decorators)
-    - [@withFormFields()](#withformfields)
-    - [@withModelValidations()](#withmodelvalidations)
-
-<!-- END doctoc generated TOC please keep comment here to allow auto update -->
-
-## Capabilities
-
-- The API will prevent users from performing disallowed actions, adding capabilities is purely to improve UX
-- Always test the capability works as expected (never assume the API path 🙂), the extra string interpolation can lead to sneaky typos and incorrect returns from the getters
-
-```js
-import lazyCapabilities, { apiPath } from 'vault/macros/lazy-capabilities';
-
-export default class FooModel extends Model {
-  @attr backend;
-  @attr('string') fooId;
-
-  // use string interpolation for dynamic parts of API path
-  // the first arg is the apiPath, and the rest are the model attribute paths for those values
-  @lazyCapabilities(apiPath`${'backend'}/foo/${'fooId'}`, 'backend', 'fooId') fooPath;
-
-  // explicitly check for false because default behavior is showing the thing (i.e. the capability hasn't loaded yet and is undefined)
-  get canRead() {
-    return this.fooPath.get('canRead') !== false;
-  }
-  get canEdit() {
-    return this.fooPath.get('canUpdate') !== false;
-  }
-}
-```
-
-## Decorators
-
-### [@withFormFields()](../app/decorators/model-form-fields.js)
-
-- Sets `allFields`, `formFields` and/or `formFieldGroups` properties on a model class
-- `allFields` includes every model attribute (regardless of args passed to decorator)
-- `formFields` and `formFieldGroups` only exist if the relevant arg is passed to the decorator
-
-```js
-import { withFormFields } from 'vault/decorators/model-form-fields';
-
-const formFieldAttrs = ['attrName', 'anotherAttr'];
-const formGroupObjects = [
-  // In form-field-groups.hbs form toggle group names are determined by key names
-  // 'default' attribute fields render before any toggle groups
-  //  additional attribute fields render inside toggle groups
-  { default: ['someAttribute'] },
-  { 'Additional options': ['anotherAttr'] },
-];
-
-@withFormFields(formFieldAttrs, formGroupObjects)
-export default class SomeModel extends Model {
-  @attr('string', { ...options }) someAttribute;
-  @attr('boolean', { ...options }) anotherAttr;
-}
-```
-
-- Each model attribute expands into the following object:
-
-```js
-{
-  name: 'someAttribute',
-  type: 'string',
-  options: { ...options },
-}
-```
-
-```js
-// only includes attributes passed to the first argument
-model.formFields = [
-  {
-    name: 'someAttribute',
-    type: 'string',
-    options: { ...options },
-  },
-];
-
-// expanded attributes are grouped by key
-model.formFieldGroups = [
-  {
-    default: [
-      {
-        name: 'someAttribute',
-        type: 'string',
-        options: { ...options },
-      },
-    ],
-  },
-  {
-    'Additional options': [
-      {
-        name: 'anotherAttr',
-        type: 'boolean',
-        options: { ...options },
-      },
-    ],
-  },
-];
-```
-
-### [@withModelValidations()](../app/decorators/model-validations.js)
-
-- Adds `validate()` method on model to check attributes are valid before making an API request
-- Option to write a custom validation, or use validation method from the [validators util](../app/utils/validators.js) which is referenced by the `type` key
-- Option to add `level: 'warn'` to draw user attention to the input, without preventing form submission
-- Component example [here](../lib/pki/addon/components/pki-generate-root.ts)
-
-```js
-import { withModelValidations } from 'vault/decorators/model-validations';
-
-const validations = {
-  // object key is the model's attribute name
-  password: [{ type: 'presence', message: 'Password is required' }],
-  keyName: [
-    {
-      validator(model) {
-        return model.keyName === 'default' ? false : true;
-      },
-      message: `Key name cannot be the reserved value 'default'`,
-    },
-  ],
-};
-
-@withModelValidations(validations)
-export default class FooModel extends Model {}
-
-// calling validate() returns an object:
-model.validate() = {
-  isValid: false,
-  state: {
-    password: {
-      errors: ['Password is required.'],
-      warnings: [],
-      isValid: false,
-    },
-    keyName: {
-      errors: ["Key name cannot be the reserved value 'default'"],
-      warnings: [],
-      isValid: true,
-    },
-  },
-  invalidFormMessage: 'There are 2 errors with this form.',
-};
-```
diff --git a/ui/docs/routing.md b/ui/docs/routing.md
deleted file mode 100644
index add1ff868863d..0000000000000
--- a/ui/docs/routing.md
+++ /dev/null
@@ -1,92 +0,0 @@
-# Routing
-
-<!-- START doctoc generated TOC please keep comment here to allow auto update -->
-<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
-
-- [Guidelines](#guidelines)
-- [File structure](#file-structure)
-- [Shared functionality](#shared-functionality)
-- [Decorators](#decorators)
-  - [@withConfirmLeave()](#withconfirmleave)
-
-<!-- END doctoc generated TOC please keep comment here to allow auto update -->
-
-## Guidelines
-
-- Parent route typically serves to group related child resources
-- Parent index route typically displays empty state placeholder with call to action or redirects to default child resource
-- Child resource names are pluralized
-- Child index route represents list view.
-- Child singularized name + /details is the read view.
-- _Avoid_ extending routes. This can lead to unnecessary inheritance which gets messy quickly. For [shared functionality](#shared-functionality), consider a decorator.
-
-## File structure
-
-The file structure can be leveraged to simplify CRUD actions and passing data. The singular resource route should live at the same level as its folder, this automatically passes its model to any route nested within the folder.
-Below, `details.js` and `edit.js` will automatically receive the model returned by the model hook in `resource-foo.js`. Alternately, if defining a custom model hook in those routes, we can use methods like `this.modelFor` instead of re-querying records.
-
-```
-├── routes/vault/cluster/access
-│   ├── parent/
-│   │   ├── index.js
-│   │   ├── resource-foos /
-│   │   │   ├── resource-foo.js
-│   │   │   ├── create.js
-│   │   │   ├── index.js
-│   │   │   ├── resource-foo/
-│   │   │   │   ├── details.js
-│   │   │   │   ├── edit.js
-```
-
-> For example, [OIDC](../app/routes/vault/cluster/access/oidc/) route structure [_original PR_](https://github.com/hashicorp/vault/pull/16028):
-
-```
-├── routes/vault/cluster/access
-│   ├── oidc/
-│   │   ├── index.js
-│   │   ├── clients/
-│   │   │   ├── client.js
-│   │   │   ├── create.js
-│   │   │   ├── index.js
-│   │   │   ├── client/
-│   │   │   │   ├── details.js
-│   │   │   │   ├── edit.js
-│   │   │   │   ├── providers.js <- utilizes the modelFor method to get id about parent's clientId
-```
-
-## Shared functionality
-
-To guide users, we sometimes have a call to action that depends on a resource's state. For example, if a secret engine hasn't been configured routing to the first step to do so, and otherwise navigating to its overview page.
-
-Instead of extending route classes to share this `isConfigured` state, consider a decorator! [withConfig()](../../ui/lib/kubernetes/addon/decorators/fetch-config.js) is a great example.
-
-## Decorators
-
-### [@withConfirmLeave()](../lib/core/addon/decorators/confirm-leave.js)
-
-- Renders `window.confirm()` alert that a user has unsaved changes if navigaing away from route with the decorator
-- Unloads or rolls back Ember data model record
-
-<!-- TODO add withConfig() if we refactor for more general use -->
-
-<!-- ### [withConfig()](../../ui/lib/kubernetes/addon/decorators/fetch-config.js)
-
-We sometimes have a call to action guiding users that depends on a resource's state. For example, if a secret engine hasn't been configured the UI renders an empty state linking to the first configuration step. Otherwise, it routes to the overview page of that engine.
-
-Sample use:
-
-```js
-import { withConfig } from '../decorators/fetch-config';
-@withConfig()
-export default class SomeRouter extends Route {
-  model() {
-    // in case of any error other than 404 we want to display that to the user
-    if (this.configError) {
-      throw this.configError;
-    }
-    return {
-      config: this.configModel, // configuration data to determine UI state
-    };
-  }
-}
-``` -->
diff --git a/ui/docs/serializers-adapters.md b/ui/docs/serializers-adapters.md
deleted file mode 100644
index ec035a5ea42be..0000000000000
--- a/ui/docs/serializers-adapters.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# Serializers & Adapters
-
-<!-- START doctoc generated TOC please keep comment here to allow auto update -->
-<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
-
-- [Guidelines](#guidelines)
-- [Gotchas](#gotchas)
-
-<!-- END doctoc generated TOC please keep comment here to allow auto update -->
-
-## Guidelines
-
-- Prepend internal functions with an underscore to differentiate from Ember methods `_getUrl`
-- Consider using the [named-path](../app/adapters/named-path.js) adapter if the model name is part of the request path
-- Utilize the serializer to remove sending model attributes that do not correspond to an API parameter. Example in [key serializer](../app/serializers/pki/key.js)
-
-```js
-export default class SomeSerializer extends ApplicationSerializer {
-  attrs = {
-    attrName: { serialize: false },
-  };
-}
-```
-
-> Note: this will remove the attribute when calling `snapshot.serialize()` even if the method is called within the serialize method where custom logic may be written
-
-## Gotchas
-
-- The JSON serializer removes attributes with empty arrays [Example in MFA serializer](https://github.com/hashicorp/vault/blob/e55c18ed1299e0d36b88e603fa9f12adaf8e75dc/ui/app/serializers/mfa-login-enforcement.js#L37-L44)
diff --git a/ui/ember-cli-build.js b/ui/ember-cli-build.js
index 241eecfd6bc3d..6ea847f16a198 100644
--- a/ui/ember-cli-build.js
+++ b/ui/ember-cli-build.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /* eslint-env node */
 'use strict';
 
@@ -45,16 +40,6 @@ const appConfig = {
   sassOptions: {
     sourceMap: false,
     onlyIncluded: true,
-    precision: 4,
-    includePaths: [
-      './node_modules/@hashicorp/design-system-components/app/styles',
-      './node_modules/@hashicorp/design-system-tokens/dist/products/css',
-    ],
-  },
-  minifyCSS: {
-    options: {
-      advanced: false,
-    },
   },
   autoprefixer: {
     enabled: isTest || isProd,
@@ -76,7 +61,7 @@ const appConfig = {
 };
 
 module.exports = function (defaults) {
-  const app = new EmberApp(defaults, appConfig);
+  let app = new EmberApp(defaults, appConfig);
 
   app.import('vendor/string-includes.js');
   app.import('node_modules/string.prototype.endswith/endswith.js');
diff --git a/ui/lib/.eslintrc.js b/ui/lib/.eslintrc.js
index eae63673d65a0..02fab21e154cc 100644
--- a/ui/lib/.eslintrc.js
+++ b/ui/lib/.eslintrc.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 module.exports = {
   env: {
     node: true,
diff --git a/ui/lib/core/addon/components/alert-banner.hbs b/ui/lib/core/addon/components/alert-banner.hbs
deleted file mode 100644
index 0f47bdb767150..0000000000000
--- a/ui/lib/core/addon/components/alert-banner.hbs
+++ /dev/null
@@ -1,32 +0,0 @@
-<div data-test-alert-banner="alert" class="message {{this.alertType.class}}" ...attributes>
-  <div class="columns is-mobile is-variable is-1">
-    <div class="column is-narrow message-icon">
-      <Icon class={{this.alertType.glyphClass}} aria-hidden="true" @name={{this.alertType.glyph}} />
-    </div>
-    <div class="column">
-      <div class="message-title">
-        {{or @title this.alertType.text}}
-        {{#if @showLoading}}
-          <Icon class="loading" aria-hidden="true" @name="loading" />
-        {{/if}}
-        {{#if @progressBar}}
-          <progress
-            value={{@progressBar.value}}
-            max={{@progressBar.max}}
-            class="progress is-success is-medium is-inline-block"
-          ></progress>
-        {{/if}}
-      </div>
-      {{#if @message}}
-        <p class="alert-banner-message-body">
-          {{@message}}
-        </p>
-      {{/if}}
-      {{#if (has-block)}}
-        <p class="message-actions">
-          {{yield}}
-        </p>
-      {{/if}}
-    </div>
-  </div>
-</div>
\ No newline at end of file
diff --git a/ui/lib/core/addon/components/alert-banner.js b/ui/lib/core/addon/components/alert-banner.js
index 4cc8686a7777b..81daff8ba64f5 100644
--- a/ui/lib/core/addon/components/alert-banner.js
+++ b/ui/lib/core/addon/components/alert-banner.js
@@ -1,11 +1,7 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
+import Component from '@ember/component';
+import { computed } from '@ember/object';
 import { messageTypes } from 'core/helpers/message-types';
-import { assert } from '@ember/debug';
+import layout from '../templates/components/alert-banner';
 
 /**
  * @module AlertBanner
@@ -17,17 +13,36 @@ import { assert } from '@ember/debug';
  * ```
  *
  * @param {String} type=null  - The banner type. This comes from the message-types helper.
- * @param {String} [message=null] - The message to display within the banner.
+ * @param {String} [secondIconType=null] - If you want a second icon to appear to the right of the title. This comes from the message-types helper.
  * @param {Object} [progressBar=null] - An object containing a value and maximum for a progress bar. Will be displayed next to the message title.
- * @param {Boolean} [showLoading=false] - Shows a loading icon to the right of the title.
+ * @param {String} [message=null] - The message to display within the banner.
  * @param {String} [title=null] - A title to show above the message. If this is not provided, there are default values for each type of alert.
+ * @param {String} [bannerType=alert] - Defaults to 'alert', can be used to specify an alert banner's test selector
+ *
  */
 
-export default class AlertBanner extends Component {
-  get alertType() {
-    if (!this.args.type) {
-      assert('alert-banner component expects attr type');
-    }
-    return messageTypes([this.args.type]);
-  }
-}
+export default Component.extend({
+  layout,
+  type: null,
+  message: null,
+  title: null,
+  secondIconType: null,
+  progressBar: null,
+  yieldWithoutColumn: false,
+  marginless: false,
+  classNameBindings: ['containerClass'],
+  bannerType: 'alert',
+
+  containerClass: computed('type', 'marginless', function () {
+    const base = this.marginless ? 'message message-marginless ' : 'message ';
+    return base + messageTypes([this.type]).class;
+  }),
+
+  alertType: computed('type', function () {
+    return messageTypes([this.type]);
+  }),
+
+  secondAlertType: computed('secondIconType', function () {
+    return messageTypes([this.secondIconType]);
+  }),
+});
diff --git a/ui/lib/core/addon/components/alert-inline.js b/ui/lib/core/addon/components/alert-inline.js
index 9f4fa5453f59d..8c7482b409996 100644
--- a/ui/lib/core/addon/components/alert-inline.js
+++ b/ui/lib/core/addon/components/alert-inline.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 import { later } from '@ember/runloop';
diff --git a/ui/lib/core/addon/components/alert-popup.hbs b/ui/lib/core/addon/components/alert-popup.hbs
deleted file mode 100644
index 34fbd4aa7c0fe..0000000000000
--- a/ui/lib/core/addon/components/alert-popup.hbs
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="message {{@type.class}}">
-  <div class="columns is-mobile is-variable is-1">
-    <div class="column is-narrow message-icon">
-      <Icon aria-hidden="true" @name={{@type.glyph}} />
-    </div>
-    <div class="column">
-      <button type="button" class="close-button" {{on "click" @close}}>
-        <Icon @name="x" aria-label="Close" />
-      </button>
-      <div class="message-title">
-        {{@type.text}}
-      </div>
-      {{#if @message}}
-        <p class="message-body {{if @isPreformatted 'pre'}}" data-test-flash-message-body="true">{{@message}}</p>
-      {{/if}}
-    </div>
-  </div>
-</div>
\ No newline at end of file
diff --git a/ui/lib/core/addon/components/autocomplete-input.hbs b/ui/lib/core/addon/components/autocomplete-input.hbs
index d30f9fca13d49..f808ae6a5bb07 100644
--- a/ui/lib/core/addon/components/autocomplete-input.hbs
+++ b/ui/lib/core/addon/components/autocomplete-input.hbs
@@ -11,7 +11,7 @@
       class="input"
       {{on "input" this.onInput}}
     />
-    <BasicDropdown @registerAPI={{this.setDropdownAPI}} @renderInPlace={{true}} as |D|>
+    <BasicDropdown @registerAPI={{fn (mut this.dropdownAPI)}} @renderInPlace={{true}} as |D|>
       <D.Content @defaultClass="autocomplete-input">
         {{#each @options as |option|}}
           <div class="autocomplete-input-option" role="button" {{on "click" (fn this.selectOption option.value)}}>
diff --git a/ui/lib/core/addon/components/autocomplete-input.js b/ui/lib/core/addon/components/autocomplete-input.js
index f7a8cb8541d25..695113c77355b 100644
--- a/ui/lib/core/addon/components/autocomplete-input.js
+++ b/ui/lib/core/addon/components/autocomplete-input.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 
@@ -33,10 +28,6 @@ export default class AutocompleteInput extends Component {
     this.inputElement = element.querySelector('.input');
   }
   @action
-  setDropdownAPI(dropdownAPI) {
-    this.dropdownAPI = dropdownAPI;
-  }
-  @action
   onInput(event) {
     const { options = [], optionsTrigger } = this.args;
     if (optionsTrigger && options.length) {
diff --git a/ui/lib/core/addon/components/box-radio.js b/ui/lib/core/addon/components/box-radio.js
index 556a13e00a6eb..c365c8672bb25 100644
--- a/ui/lib/core/addon/components/box-radio.js
+++ b/ui/lib/core/addon/components/box-radio.js
@@ -1,10 +1,3 @@
-import Component from '@glimmer/component';
-
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /**
  * @module BoxRadio
  * BoxRadio components are used to display options for a radio selection.
@@ -23,8 +16,13 @@ import Component from '@glimmer/component';
  * @param {string} [tooltipMessage=default] - The message that shows in the tooltip if the radio option is disabled
  */
 
-export default class BoxRadio extends Component {
-  get tooltipMessage() {
-    return this.args.tooltipMessage || 'This option is not available to you at this time.';
-  }
+import Component from '@glimmer/component';
+import layout from '../templates/components/box-radio';
+import { setComponentTemplate } from '@ember/component';
+
+class BoxRadio extends Component {
+  disabled = false;
+  tooltipMessage = 'This option is not available to you at this time.';
 }
+
+export default setComponentTemplate(layout, BoxRadio);
diff --git a/ui/lib/core/addon/components/checkbox-grid.hbs b/ui/lib/core/addon/components/checkbox-grid.hbs
deleted file mode 100644
index 321a9f506b40f..0000000000000
--- a/ui/lib/core/addon/components/checkbox-grid.hbs
+++ /dev/null
@@ -1,23 +0,0 @@
-<div data-test-checkbox-grid ...attributes>
-  <FormFieldLabel for={{@name}} @label={{@label}} @subText={{@subText}} />
-  <div class="is-grid is-grid-3-columns is-medium-height">
-    {{#each this.checkboxes as |checkbox|}}
-      <div class="field">
-        <div class="b-checkbox">
-          <Input
-            @type="checkbox"
-            id={{checkbox.key}}
-            name={{checkbox.key}}
-            class="styled"
-            @checked={{checkbox.value}}
-            {{on "change" this.checkboxChange}}
-            data-test-checkbox={{checkbox.key}}
-          />
-          <label for={{checkbox.key}} class="is-label">
-            {{checkbox.label}}
-          </label>
-        </div>
-      </div>
-    {{/each}}
-  </div>
-</div>
\ No newline at end of file
diff --git a/ui/lib/core/addon/components/checkbox-grid.ts b/ui/lib/core/addon/components/checkbox-grid.ts
deleted file mode 100644
index ac2883d1905c4..0000000000000
--- a/ui/lib/core/addon/components/checkbox-grid.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
-import { action } from '@ember/object';
-import { HTMLElementEvent } from 'forms';
-
-interface CheckboxGridArgs {
-  name: string;
-  label: string;
-  subText?: string;
-  fields: Field[];
-  value: string[] | undefined;
-  onChange: (name: string, value: string[]) => void;
-}
-interface Field {
-  key: string;
-  label: string;
-}
-
-/**
- * @module CheckboxGrid
- * CheckboxGrid components are used to allow users to select any
- * number of predetermined options, aligned in a 3-column grid.
- *
- * @example
- * ```js
- * <CheckboxGrid
- *   @name="modelKey"
- *   @label="Model Attribute Label"
- *   @fields={{options}}
- *   @value={{['Hello', 'Yes']}}
- * />
- * ```
- */
-
-export default class CheckboxGrid extends Component<CheckboxGridArgs> {
-  get checkboxes() {
-    const list = this.args.value || [];
-    return this.args.fields.map((field) => ({
-      ...field,
-      value: list.includes(field.key),
-    }));
-  }
-
-  @action checkboxChange(event: HTMLElementEvent<HTMLInputElement>) {
-    const list = this.args.value || [];
-    const checkboxName = event.target.id;
-    const checkboxVal = event.target.checked;
-    const idx = list.indexOf(checkboxName);
-    if (checkboxVal === true && idx < 0) {
-      list.push(checkboxName);
-    } else if (checkboxVal === false && idx >= 0) {
-      list.splice(idx, 1);
-    }
-    this.args.onChange(this.args.name, list);
-  }
-}
diff --git a/ui/lib/core/addon/components/chevron.js b/ui/lib/core/addon/components/chevron.js
index b8873937d0f81..4e16f0c623bae 100644
--- a/ui/lib/core/addon/components/chevron.js
+++ b/ui/lib/core/addon/components/chevron.js
@@ -1,13 +1,3 @@
-import Component from '@glimmer/component';
-import { assert } from '@ember/debug';
-
-const DIRECTIONS = ['right', 'left', 'up', 'down'];
-
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /**
  * @module Chevron
  * `Chevron` components render `Icon` with one of the `chevron-` glyphs.
@@ -22,19 +12,25 @@ const DIRECTIONS = ['right', 'left', 'up', 'down'];
  * @param [isButton=false] {String} - if true, adjusts the CSS classes to push the icon closer to the right of a button.
  *
  */
+import Component from '@ember/component';
+import { computed } from '@ember/object';
+import { assert } from '@ember/debug';
 
-export default class Chevron extends Component {
-  get direction() {
-    return this.args.direction || 'right';
-  }
+import layout from '../templates/components/chevron';
 
-  get glyph() {
-    const { direction } = this;
+const DIRECTIONS = ['right', 'left', 'up', 'down'];
 
+export default Component.extend({
+  tagName: '',
+  layout,
+  direction: 'right',
+  isButton: false,
+  glyph: computed('direction', function () {
+    let { direction } = this;
     assert(
-      `The direction property of Chevron must be one of the following: ${DIRECTIONS.join(', ')}`,
+      `The direction property of ${this.toString()} must be one of the following: ${DIRECTIONS.join(', ')}`,
       DIRECTIONS.includes(direction)
     );
     return `chevron-${direction}`;
-  }
-}
+  }),
+});
diff --git a/ui/lib/core/addon/components/confirm-action.js b/ui/lib/core/addon/components/confirm-action.js
index 715540d267a8e..9630ce992fcd6 100644
--- a/ui/lib/core/addon/components/confirm-action.js
+++ b/ui/lib/core/addon/components/confirm-action.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 import { assert } from '@ember/debug';
diff --git a/ui/lib/core/addon/components/confirm.js b/ui/lib/core/addon/components/confirm.js
index f7511ce420ad8..877eb03c86695 100644
--- a/ui/lib/core/addon/components/confirm.js
+++ b/ui/lib/core/addon/components/confirm.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@ember/component';
 import { computed } from '@ember/object';
 import layout from '../templates/components/confirm';
@@ -48,7 +43,8 @@ export default Component.extend({
     this.updateHeight();
   },
   updateHeight: function () {
-    const height = this.openTrigger
+    let height;
+    height = this.openTrigger
       ? this.element.querySelector('.confirm-overlay').clientHeight
       : this.element.querySelector('.confirm').clientHeight;
     this.set('height', height);
diff --git a/ui/lib/core/addon/components/confirm/message.js b/ui/lib/core/addon/components/confirm/message.js
index 461b0f37e160e..71ab54531f5e9 100644
--- a/ui/lib/core/addon/components/confirm/message.js
+++ b/ui/lib/core/addon/components/confirm/message.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@ember/component';
 import { computed } from '@ember/object';
 import layout from '../../templates/components/confirm/message';
diff --git a/ui/lib/core/addon/components/confirmation-modal.hbs b/ui/lib/core/addon/components/confirmation-modal.hbs
index c71c61eecf32f..95f8621d37e01 100644
--- a/ui/lib/core/addon/components/confirmation-modal.hbs
+++ b/ui/lib/core/addon/components/confirmation-modal.hbs
@@ -5,10 +5,7 @@
       <p class="has-text-weight-semibold is-size-6">
         Confirm
       </p>
-      <p class="sub-text has-top-bottom-margin-xxs">Type
-        <strong>{{this.confirmText}}</strong>
-        to confirm
-        {{this.toConfirmMsg}}</p>
+      <p class="is-help">Type <strong>{{this.confirmText}}</strong> to confirm {{this.toConfirmMsg}}</p>
       <Input
         @type="text"
         @value={{this.confirmationInput}}
diff --git a/ui/lib/core/addon/components/confirmation-modal.js b/ui/lib/core/addon/components/confirmation-modal.js
index 0675129aedd39..7c935705a406c 100644
--- a/ui/lib/core/addon/components/confirmation-modal.js
+++ b/ui/lib/core/addon/components/confirmation-modal.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 /**
  * @module ConfirmationModal
diff --git a/ui/lib/core/addon/components/doc-link.js b/ui/lib/core/addon/components/doc-link.js
index 73659678e4215..763dfed57b810 100644
--- a/ui/lib/core/addon/components/doc-link.js
+++ b/ui/lib/core/addon/components/doc-link.js
@@ -1,26 +1,33 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import ExternalLink from './external-link';
+import Component from '@ember/component';
+import { computed } from '@ember/object';
+import hbs from 'htmlbars-inline-precompile';
 
 /**
  * @module DocLink
- * `DocLink` components are used to render anchor links to relevant Vault documentation at developer.hashicorp.com.
+ * `DocLink` components are used to render anchor links to relevant Vault documentation.
  *
  * @example
  * ```js
-    <DocLink @path="/vault/docs/secrets/kv/kv-v2.html">Learn about KV v2</DocLink>
+    <DocLink @path="/docs/secrets/kv/kv-v2.html">Learn about KV v2</DocLink>
  * ```
  *
- * @param {string} path="/" - The path to documentation on developer.hashicorp.com that the component should link to.
+ * @param path="/"{String} - The path to documentation on vaultproject.io that the component should link to.
  *
  */
-export default class DocLinkComponent extends ExternalLink {
-  host = 'https://developer.hashicorp.com';
 
-  get href() {
-    return `${this.host}${this.args.path}`;
-  }
-}
+export default Component.extend({
+  tagName: 'a',
+  classNames: ['doc-link'],
+  attributeBindings: ['target', 'rel', 'href'],
+
+  layout: hbs`{{yield}}`,
+
+  target: '_blank',
+  rel: 'noreferrer noopener',
+  host: 'https://www.vaultproject.io',
+
+  path: '/',
+  href: computed('host', 'path', function () {
+    return `${this.host}${this.path}`;
+  }),
+});
diff --git a/ui/lib/core/addon/components/download-button.hbs b/ui/lib/core/addon/components/download-button.hbs
deleted file mode 100644
index 492809856ecb3..0000000000000
--- a/ui/lib/core/addon/components/download-button.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-<button data-test-download-button type="button" {{on "click" this.handleDownload}} ...attributes>
-  {{yield}}
-</button>
\ No newline at end of file
diff --git a/ui/lib/core/addon/components/download-button.js b/ui/lib/core/addon/components/download-button.js
index 49f17f8a5a9be..1f4186977b2de 100644
--- a/ui/lib/core/addon/components/download-button.js
+++ b/ui/lib/core/addon/components/download-button.js
@@ -1,80 +1,51 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
+import Component from '@ember/component';
+import { computed } from '@ember/object';
+import hbs from 'htmlbars-inline-precompile';
 
-import Component from '@glimmer/component';
-import { action } from '@ember/object';
-import { inject as service } from '@ember/service';
-import errorMessage from 'vault/utils/error-message';
-import timestamp from 'vault/utils/timestamp';
-import { tracked } from '@glimmer/tracking';
-import { assert } from '@ember/debug';
-/**
- * @module DownloadButton
- * DownloadButton components are an action button used to download data. Both the action text and icon are yielded.
- * * NOTE: when using in an engine, remember to add the 'download' service to its dependencies (in /engine.js) and map to it in /app.js
- * [ember-docs](https://ember-engines.com/docs/services)
- * @example
- * ```js
- *   <DownloadButton
- *     class="button"
- *     @data={{this.data}}
- *     @filename={{this.filename}}
- *     @mime={{this.mime}}
- *     @extension={{this.extension}}
- *     @stringify={{true}}
- *   >
- *    <Icon @name="download" />
- *      Download
- *   </DownloadButton>
- * ```
- * @param {string} [filename] - name of file that prefixes the ISO timestamp generated at download
- * @param {string} [data] - data to download
- * @param {function} [fetchData] - function that fetches data and returns download content
- * @param {string} [extension='txt'] - file extension, the download service uses this to determine the mimetype
- * @param {boolean} [stringify=false] - argument to stringify the data before passing to the File constructor
- */
+export default Component.extend({
+  layout: hbs`{{#if (has-block)}} {{yield}} {{else}} {{actionText}} {{/if}}`,
+  tagName: 'a',
+  role: 'button',
+  attributeBindings: ['role', 'download', 'href'],
+  download: computed('filename', 'extension', function () {
+    return `${this.filename}-${new Date().toISOString()}.${this.extension}`;
+  }),
 
-export default class DownloadButton extends Component {
-  @service download;
-  @service flashMessages;
-  @tracked fetchedData;
-
-  constructor() {
-    super(...arguments);
-    const hasConflictingArgs = this.args.data && this.args.fetchData;
-    assert(
-      'Only pass either @data or @fetchData, passing both means @data will be overwritten by the return value of @fetchData',
-      !hasConflictingArgs
-    );
-  }
-  get filename() {
-    const ts = timestamp.now().toISOString();
-    return this.args.filename ? this.args.filename + '-' + ts : ts;
-  }
-
-  get content() {
-    if (this.args.stringify) {
-      return JSON.stringify(this.args.data, null, 2);
+  fileLike: computed('data', 'mime', 'stringify', 'download', function () {
+    let file;
+    let data = this.data;
+    let filename = this.download;
+    let mime = this.mime;
+    if (this.stringify) {
+      data = JSON.stringify(data, null, 2);
+    }
+    if (window.navigator.msSaveOrOpenBlob) {
+      file = new Blob([data], { type: mime });
+      file.name = filename;
+    } else {
+      file = new File([data], filename, { type: mime });
     }
-    return this.fetchedData || this.args.data;
-  }
+    return file;
+  }),
 
-  get extension() {
-    return this.args.extension || 'txt';
-  }
+  href: computed('fileLike', function () {
+    return window.URL.createObjectURL(this.fileLike);
+  }),
 
-  @action
-  async handleDownload() {
-    if (this.args.fetchData) {
-      this.fetchedData = await this.args.fetchData();
+  click(event) {
+    if (!window.navigator.msSaveOrOpenBlob) {
+      return;
     }
-    try {
-      this.download.miscExtension(this.filename, this.content, this.extension);
-      this.flashMessages.info(`Downloading ${this.filename}`);
-    } catch (error) {
-      this.flashMessages.danger(errorMessage(error, 'There was a problem downloading. Please try again.'));
-    }
-  }
-}
+    event.preventDefault();
+    let file = this.fileLike;
+    //lol whyyyy
+    window.navigator.msSaveOrOpenBlob(file, file.name);
+  },
+
+  actionText: 'Download',
+  data: null,
+  filename: null,
+  mime: 'text/plain',
+  extension: 'txt',
+  stringify: false,
+});
diff --git a/ui/lib/core/addon/components/edit-form.js b/ui/lib/core/addon/components/edit-form.js
index c409fdebc39a0..1762b71d2ead3 100644
--- a/ui/lib/core/addon/components/edit-form.js
+++ b/ui/lib/core/addon/components/edit-form.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import AdapterError from '@ember-data/adapter/error';
 import { inject as service } from '@ember/service';
 import Component from '@ember/component';
@@ -40,8 +35,8 @@ export default Component.extend({
 
   save: task(
     waitFor(function* (model, options = { method: 'save' }) {
-      const { method } = options;
-      const messageKey = method === 'save' ? 'successMessage' : 'deleteSuccessMessage';
+      let { method } = options;
+      let messageKey = method === 'save' ? 'successMessage' : 'deleteSuccessMessage';
       try {
         yield model[method]();
       } catch (err) {
@@ -67,7 +62,7 @@ export default Component.extend({
 
   willDestroy() {
     this._super(...arguments);
-    const { model } = this;
+    let { model } = this;
     if (!model) return;
     if ((model.get('isDirty') && !model.isDestroyed) || !model.isDestroying) {
       model.rollbackAttributes();
diff --git a/ui/lib/core/addon/components/empty-state.hbs b/ui/lib/core/addon/components/empty-state.hbs
deleted file mode 100644
index 0110d976c0597..0000000000000
--- a/ui/lib/core/addon/components/empty-state.hbs
+++ /dev/null
@@ -1,40 +0,0 @@
-<div data-test-component="empty-state" class="empty-state" ...attributes>
-  <div class="empty-state-content">
-    {{#if @icon}}
-      <div class="empty-state-icon">
-        <Icon @name={{@icon}} @size="24" />
-        <h3 class="empty-state-title" data-test-empty-state-title>
-          {{@title}}
-        </h3>
-      </div>
-      {{#if @subTitle}}
-        <p class="empty-state-subTitle" data-test-empty-state-subText>
-          {{@subTitle}}
-        </p>
-      {{/if}}
-    {{else}}
-      <h3 class={{concat "empty-state-title" (if @subTitle " has-bottom-margin-m")}} data-test-empty-state-title>
-        {{@title}}
-      </h3>
-      {{#if @subTitle}}
-        <p class="empty-state-subTitle" data-test-empty-state-subText>
-          {{@subTitle}}
-        </p>
-      {{/if}}
-    {{/if}}
-    {{#if @message}}
-      <p class={{concat "empty-state-message" (if @bottomBorder " has-border-bottom-light")}} data-test-empty-state-message>
-        {{@message}}
-      </p>
-    {{/if}}
-    {{#if (has-block)}}
-      <div class="empty-state-actions" data-test-empty-state-actions>
-        {{yield}}
-      </div>
-    {{else if @emptyActions}}
-      <div class="empty-state-actions" data-test-empty-state-actions>
-        {{component @emptyActions}}
-      </div>
-    {{/if}}
-  </div>
-</div>
\ No newline at end of file
diff --git a/ui/lib/core/addon/components/empty-state.js b/ui/lib/core/addon/components/empty-state.js
new file mode 100644
index 0000000000000..62b82ec1af653
--- /dev/null
+++ b/ui/lib/core/addon/components/empty-state.js
@@ -0,0 +1,28 @@
+import Component from '@ember/component';
+import layout from '../templates/components/empty-state';
+
+/**
+ * @module EmptyState
+ * `EmptyState` components are used to render a helpful message and any necessary content when a user
+ * encounters a state that would usually be blank.
+ *
+ * @example
+ * ```js
+ * <EmptyState @title="You don't have an secrets yet" @message="An explanation of why you don't have any secrets but also you maybe want to create one." />
+ * ```
+ *
+ * @param title=null{String} - A short label for the empty state
+ * @param subTitle=null{String} - A sub title that goes underneath the main title
+ * @param message=null{String} - A description of why a user might be seeing the empty state and possibly instructions for actions they may take.
+ * @param [icon='']{String} - An optional param to display icon to the left of the title
+ * @param bottomBorder=false{Boolean} - A bottom border underneath the message.  Generally used when you have links under the message
+ */
+
+export default Component.extend({
+  layout,
+  tagName: '',
+  title: null,
+  message: null,
+  icon: '',
+  bottomBorder: false,
+});
diff --git a/ui/lib/core/addon/components/external-link.hbs b/ui/lib/core/addon/components/external-link.hbs
deleted file mode 100644
index 17270ca8fbf8e..0000000000000
--- a/ui/lib/core/addon/components/external-link.hbs
+++ /dev/null
@@ -1,9 +0,0 @@
-{{#if @sameTab}}
-  <a href={{this.href}} ...attributes>
-    {{yield}}
-  </a>
-{{else}}
-  <a href={{this.href}} target="_blank" rel="noopener noreferrer" class="doc-link" ...attributes>
-    {{yield}}
-  </a>
-{{/if}}
\ No newline at end of file
diff --git a/ui/lib/core/addon/components/external-link.js b/ui/lib/core/addon/components/external-link.js
deleted file mode 100644
index d2825af424fb5..0000000000000
--- a/ui/lib/core/addon/components/external-link.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
-
-/**
- * @module ExternalLinkComponent
- * `ExternalLink` components are used to render anchor links to non-cluster links. Automatically opens in a new tab with noopener noreferrer.
- *  To link to developer.hashicorp.com, use DocLink .
- *
- * @example
- * ```js
-    <ExternalLink @href="https://hashicorp.com">Arbitrary Link</ExternalLink>
- * ```
- *
- * @param {string} href="https://example.com/" - The full href with protocol
- * @param {boolean} [sameTab=false] - by default, these links open in new tab. To override, pass @sameTab={{true}}
- *
- */
-export default class ExternalLinkComponent extends Component {
-  get href() {
-    return this.args.href;
-  }
-}
diff --git a/ui/lib/core/addon/components/field-group-show.js b/ui/lib/core/addon/components/field-group-show.js
new file mode 100644
index 0000000000000..1d0a71bf035e8
--- /dev/null
+++ b/ui/lib/core/addon/components/field-group-show.js
@@ -0,0 +1,20 @@
+/**
+ * @module FieldGroupShow
+ * FieldGroupShow components are used to...
+ *
+ * @example
+ * ```js
+ * <FieldGroupShow @param1={param1} @param2={param2} />
+ * ```
+ *
+ * @param param1 {String} - param1 is...
+ * @param [param2=value] {String} - param2 is... //brackets mean it is optional and = sets the default value
+ */
+import Component from '@ember/component';
+import layout from '../templates/components/field-group-show';
+
+export default Component.extend({
+  layout,
+  model: null,
+  showAllFields: false,
+});
diff --git a/ui/lib/core/addon/components/form-error.js b/ui/lib/core/addon/components/form-error.js
new file mode 100644
index 0000000000000..62378ff10d3d5
--- /dev/null
+++ b/ui/lib/core/addon/components/form-error.js
@@ -0,0 +1,18 @@
+/**
+ * @module FormError
+ * FormError components are used to show an error on a form field that is more compact than the
+ * normal MessageError component. This component adds an icon and styling to the content of the
+ * component, so additionally styling (bold, italic) and links are allowed.
+ *
+ * @example
+ * ```js
+ * <FormError>Oh no <em>something bad</em>! <a href="#">Do something</a></FormError>
+ * ```
+ */
+
+import Component from '@ember/component';
+import layout from '../templates/components/form-error';
+
+export default Component.extend({
+  layout,
+});
diff --git a/ui/lib/core/addon/components/form-field-groups-loop.hbs b/ui/lib/core/addon/components/form-field-groups-loop.hbs
deleted file mode 100644
index b740384f0c8b7..0000000000000
--- a/ui/lib/core/addon/components/form-field-groups-loop.hbs
+++ /dev/null
@@ -1,46 +0,0 @@
-{{#each (get @model this.fieldGroups) as |fieldGroup|}}
-  {{#each-in fieldGroup as |group fields|}}
-    {{#if (eq group "default")}}
-      {{#each fields as |attr|}}
-        {{! template-lint-configure simple-unless "warn"  }}
-        {{#unless (and (not-eq @mode "create") (eq attr.name "name"))}}
-          <FormField
-            data-test-field={{true}}
-            @attr={{attr}}
-            @model={{@model}}
-            @modelValidations={{@modelValidations}}
-            @showHelpText={{@showHelpText}}
-          >
-            {{yield attr}}
-          </FormField>
-        {{/unless}}
-      {{/each}}
-    {{else}}
-      {{#let (camelize (concat "show" group)) as |prop|}}
-        <ToggleButton
-          @isOpen={{get @model prop}}
-          @openLabel={{concat "Hide " group}}
-          @closedLabel={{group}}
-          @onClick={{fn (mut (get @model prop))}}
-          class="is-block"
-          data-test-toggle-group={{group}}
-        />
-        {{#if (get @model prop)}}
-          <div class="box is-marginless">
-            {{#each fields as |attr|}}
-              <FormField
-                data-test-field={{true}}
-                @attr={{attr}}
-                @model={{@model}}
-                @modelValidations={{@modelValidations}}
-                @showHelpText={{@showHelpText}}
-              >
-                {{yield attr}}
-              </FormField>
-            {{/each}}
-          </div>
-        {{/if}}
-      {{/let}}
-    {{/if}}
-  {{/each-in}}
-{{/each}}
\ No newline at end of file
diff --git a/ui/lib/core/addon/components/form-field-groups-loop.js b/ui/lib/core/addon/components/form-field-groups-loop.js
deleted file mode 100644
index a464c5efb0e27..0000000000000
--- a/ui/lib/core/addon/components/form-field-groups-loop.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
-
-/**
- * @module FormFieldGroupsLoop
- * FormFieldGroupsLoop components loop through the "groups" set on a model and display them either as default or behind toggle components.
- *
- * @example
- * ```js
- <FormFieldGroupsLoop @model={{this.model}} @mode={{if @model.isNew "create" "update"}}/>
- * ```
- * @param {class} model - The routes model class.
- * @param {string} mode - "create" or "update" used to hide the name form field. TODO: not ideal, would prefer to disable it to follow new design patterns.
- * @param {function} [modelValidations] - Passed through to formField.
- * @param {boolean} [showHelpText] - Passed through to formField.
- * @param {string} [groupName="fieldGroups"] - option to override key on the model where groups are located
- */
-export default class FormFieldGroupsLoop extends Component {
-  get fieldGroups() {
-    return this.args.groupName || 'fieldGroups';
-  }
-}
diff --git a/ui/lib/core/addon/components/form-field-groups.hbs b/ui/lib/core/addon/components/form-field-groups.hbs
index 226076ea5a636..3bb2c37edb0d3 100644
--- a/ui/lib/core/addon/components/form-field-groups.hbs
+++ b/ui/lib/core/addon/components/form-field-groups.hbs
@@ -1,4 +1,4 @@
-{{#each (get @model this.fieldGroups) as |fieldGroup|}}
+{{#each @model.fieldGroups as |fieldGroup|}}
   {{#each-in fieldGroup as |group fields|}}
     {{#if (or (not @renderGroup) (and @renderGroup (eq group @renderGroup)))}}
       {{#if (eq group "default")}}
@@ -13,7 +13,6 @@
               @onChange={{@onChange}}
               @onKeyUp={{@onKeyUp}}
               @modelValidations={{@modelValidations}}
-              @showHelpText={{@showHelpText}}
             />
           {{else}}
             {{! OTHERWISE WE'RE EDITING }}
@@ -28,7 +27,6 @@
                 @onChange={{@onChange}}
                 @onKeyUp={{@onKeyUp}}
                 @modelValidations={{@modelValidations}}
-                @showHelpText={{@showHelpText}}
               />
             {{/if}}
           {{/if}}
@@ -55,7 +53,6 @@
                   @onChange={{@onChange}}
                   @onKeyUp={{@onKeyUp}}
                   @modelValidations={{@modelValidations}}
-                  @showHelpText={{@showHelpText}}
                 />
               {{else}}
                 {{! OTHERWISE WE'RE EDITING }}
@@ -70,7 +67,6 @@
                     @onChange={{@onChange}}
                     @onKeyUp={{@onKeyUp}}
                     @modelValidations={{@modelValidations}}
-                    @showHelpText={{@showHelpText}}
                   />
                 {{/if}}
               {{/if}}
diff --git a/ui/lib/core/addon/components/form-field-groups.js b/ui/lib/core/addon/components/form-field-groups.js
index 54af8717ffe5e..b26ac3a6f5e83 100644
--- a/ui/lib/core/addon/components/form-field-groups.js
+++ b/ui/lib/core/addon/components/form-field-groups.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
@@ -34,7 +29,7 @@ import { action } from '@ember/object';
  * @param {onChangeCallback} [onChange] - Handler that will get set on the `FormField` component.
  * @param {onKeyUpCallback} [onKeyUp] - Handler that will set the value and trigger validation on input changes
  * @param {ModelValidations} [modelValidations] - Object containing validation message for each property
- * @param {string} [groupName='fieldGroups'] - attribute name where the field groups are
+ *
  */
 
 export default class FormFieldGroupsComponent extends Component {
@@ -44,8 +39,4 @@ export default class FormFieldGroupsComponent extends Component {
   toggleGroup(group, isOpen) {
     this.showGroup = isOpen ? group : null;
   }
-
-  get fieldGroups() {
-    return this.args.groupName || 'fieldGroups';
-  }
 }
diff --git a/ui/lib/core/addon/components/form-field-label.js b/ui/lib/core/addon/components/form-field-label.js
index aa40a4a1f3bfc..4e0ee35f9875a 100644
--- a/ui/lib/core/addon/components/form-field-label.js
+++ b/ui/lib/core/addon/components/form-field-label.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import templateOnly from '@ember/component/template-only';
 
 /**
diff --git a/ui/lib/core/addon/components/form-field.hbs b/ui/lib/core/addon/components/form-field.hbs
index 38b520aac8a3b..4a54e19486c39 100644
--- a/ui/lib/core/addon/components/form-field.hbs
+++ b/ui/lib/core/addon/components/form-field.hbs
@@ -1,13 +1,23 @@
 {{! template-lint-configure simple-unless "warn" }}
 <div class="field" data-test-field={{or @attr.name true}}>
-  {{#unless this.hideLabel}}
-    <FormFieldLabel
-      for={{@attr.name}}
-      @label={{this.labelString}}
-      @helpText={{(if this.showHelpText @attr.options.helpText)}}
-      @subText={{@attr.options.subText}}
-      @docLink={{@attr.options.docLink}}
-    />
+  {{#unless
+    (or
+      (eq @attr.type "boolean")
+      (contains
+        @attr.options.editType
+        (array "boolean" "optionalText" "searchSelect" "mountAccessor" "kv" "file" "ttl" "stringArray" "json" "regex")
+      )
+    )
+  }}
+    {{#unless (eq @attr.type "object")}}
+      <FormFieldLabel
+        for={{@attr.name}}
+        @label={{this.labelString}}
+        @helpText={{@attr.options.helpText}}
+        @subText={{@attr.options.subText}}
+        @docLink={{@attr.options.docLink}}
+      />
+    {{/unless}}
   {{/unless}}
   {{#if @attr.options.possibleValues}}
     {{#if (eq @attr.options.editType "radio")}}
@@ -33,33 +43,19 @@
     {{else}}
       <div class="control is-expanded">
         <div class="select is-fullwidth">
-          <select
-            class="{{if this.validationError 'has-error-border'}}"
-            name={{@attr.name}}
-            id={{@attr.name}}
-            onchange={{this.onChangeWithEvent}}
-            data-test-input={{@attr.name}}
-          >
+          <select name={{@attr.name}} id={{@attr.name}} onchange={{this.onChangeWithEvent}} data-test-input={{@attr.name}}>
             {{#if @attr.options.noDefault}}
               <option value="">
                 Select one
               </option>
             {{/if}}
             {{#each (path-or-array @attr.options.possibleValues @model) as |val|}}
-              <option selected={{loose-equal (get @model this.valuePath) (or val.value val)}} value={{or val.value val}}>
+              <option selected={{eq (get @model this.valuePath) (or val.value val)}} value={{or val.value val}}>
                 {{or val.displayName val}}
               </option>
             {{/each}}
           </select>
         </div>
-        {{#if this.validationError}}
-          <AlertInline
-            @type="danger"
-            @message={{this.validationError}}
-            @paddingTop={{true}}
-            data-test-field-validation={{@attr.name}}
-          />
-        {{/if}}
       </div>
     {{/if}}
   {{else if (and (eq @attr.type "string") (eq @attr.options.editType "boolean"))}}
@@ -75,7 +71,7 @@
 
       <label for={{@attr.name}} class="is-label">
         {{this.labelString}}
-        {{#if (and this.showHelpText @attr.options.helpText)}}
+        {{#if @attr.options.helpText}}
           <InfoTooltip>{{@attr.options.helpText}}</InfoTooltip>
         {{/if}}
       </label>
@@ -87,15 +83,16 @@
         @models={{@attr.options.models}}
         @onChange={{this.setAndBroadcast}}
         @inputValue={{get @model this.valuePath}}
+        @helpText={{@attr.options.helpText}}
+        @subText={{@attr.options.subText}}
         @wildcardLabel={{@attr.options.wildcardLabel}}
         @label={{this.labelString}}
-        @labelClass={{if @attr.options.isSectionHeader "title is-4" "is-label"}}
-        @subText={{@attr.options.subText}}
-        @helpText={{@attr.options.helpText}}
+        @subLabel={{@attr.options.subLabel}}
         @fallbackComponent={{@attr.options.fallbackComponent}}
         @selectLimit={{@attr.options.selectLimit}}
         @backend={{@model.backend}}
         @disallowNewItems={{@attr.options.onlyAllowExisting}}
+        @labelClass={{@labelClass}}
         class={{if this.validationError "dropdown-has-error-border"}}
       />
     </div>
@@ -125,14 +122,12 @@
     />
   {{else if (eq @attr.options.editType "file")}}
     {{! File Input }}
-    <div class="has-bottom-margin-m">
-      <TextFile
-        @label={{this.labelString}}
-        @helpText={{@attr.options.helpText}}
-        @onChange={{this.setFile}}
-        @validationError={{this.validationError}}
-      />
-    </div>
+    <TextFile
+      @helpText={{@attr.options.helpText}}
+      @file={{this.file}}
+      @onChange={{this.setFile}}
+      @label={{this.labelString}}
+    />
   {{else if (eq @attr.options.editType "ttl")}}
     {{! TTL Picker }}
     <div class="field">
@@ -209,18 +204,19 @@
     <StringList
       data-test-input={{@attr.name}}
       @label={{this.labelString}}
-      @helpText={{if this.showHelpText @attr.options.helpText}}
+      @warning={{@attr.options.warning}}
+      @helpText={{@attr.options.helpText}}
       @inputValue={{get @model this.valuePath}}
       @onChange={{this.setAndBroadcast}}
       @attrName={{@attr.name}}
-      @subText="{{@attr.options.subText}} Add one item per row."
     />
   {{else if (eq @attr.options.sensitive true)}}
+    {{! Masked Input }}
     <MaskedInput
-      @name={{@attr.name}}
       @value={{or (get @model this.valuePath) @attr.options.defaultValue}}
       @allowCopy="true"
       @onChange={{this.setAndBroadcast}}
+      @name={{@attr.name}}
       @onKeyUp={{@onKeyUp}}
     />
     {{#if this.validationError}}
@@ -235,11 +231,8 @@
           id={{@attr.name}}
           value={{or (get @model this.valuePath) @attr.options.defaultValue}}
           oninput={{this.onChangeWithEvent}}
-          class="textarea {{if this.validationError 'has-error-border'}}"
+          class="textarea"
         ></textarea>
-        {{#if this.validationError}}
-          <AlertInline @type="danger" @message={{this.validationError}} @paddingTop={{true}} />
-        {{/if}}
       {{else if (eq @attr.options.editType "password")}}
         <Input
           data-test-input={{@attr.name}}
@@ -302,9 +295,8 @@
           autocomplete="off"
           spellcheck="false"
           value={{or (get @model this.valuePath) @attr.options.defaultValue}}
-          {{on "input" this.onChangeWithEvent}}
-          {{on "change" this.onChangeWithEvent}}
-          {{on "keyup" this.handleKeyUp}}
+          onchange={{this.onChangeWithEvent}}
+          onkeyup={{this.handleKeyUp}}
           class="input {{if this.validationError 'has-error-border'}}"
           maxLength={{@attr.options.characterLimit}}
         />
@@ -316,14 +308,6 @@
         {{#if this.validationError}}
           <AlertInline @type="danger" @message={{this.validationError}} @paddingTop={{true}} />
         {{/if}}
-        {{#if this.validationWarning}}
-          <AlertInline
-            @type="warning"
-            @message={{this.validationWarning}}
-            @paddingTop={{true}}
-            data-test-validation-warning
-          />
-        {{/if}}
       {{/if}}
     </div>
   {{else if (eq @attr.type "boolean")}}
@@ -337,6 +321,7 @@
         onchange={{this.onChangeWithEvent}}
         data-test-input={{@attr.name}}
       />
+
       <label for={{@attr.name}} class="is-label">
         {{this.labelString}}
         {{#if (and this.showHelpText @attr.options.helpText)}}
@@ -344,14 +329,7 @@
         {{/if}}
       </label>
       {{#if @attr.options.subText}}
-        <p class="sub-text">
-          {{@attr.options.subText}}
-          {{#if @attr.options.docLink}}
-            <DocLink @path={{@attr.options.docLink}}>
-              Learn more here.
-            </DocLink>
-          {{/if}}
-        </p>
+        <p class="sub-text">{{@attr.options.subText}}</p>
       {{/if}}
     </div>
   {{else if (eq @attr.type "object")}}
@@ -361,7 +339,5 @@
       @valueUpdated={{fn this.codemirrorUpdated false}}
       @helpText={{@attr.options.helpText}}
     />
-  {{else if (eq @attr.options.editType "yield")}}
-    {{yield}}
   {{/if}}
 </div>
\ No newline at end of file
diff --git a/ui/lib/core/addon/components/form-field.js b/ui/lib/core/addon/components/form-field.js
index 3473cae589400..81408e49c60fe 100644
--- a/ui/lib/core/addon/components/form-field.js
+++ b/ui/lib/core/addon/components/form-field.js
@@ -1,15 +1,9 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { capitalize } from 'vault/helpers/capitalize';
 import { humanize } from 'vault/helpers/humanize';
 import { dasherize } from 'vault/helpers/dasherize';
-import { assert } from '@ember/debug';
 /**
  * @module FormField
  * `FormField` components are field elements associated with a particular model.
@@ -27,7 +21,7 @@ import { assert } from '@ember/debug';
  *     label: "Foo", // custom label to be shown, otherwise attr.name will be displayed
  *     defaultValue: "", // default value to display if model value is not present
  *     fieldValue: "bar", // used for value lookup on model over attr.name
- *     editType: "ttl", type of field to use. List of editTypes:boolean, file, json, kv, optionalText, mountAccessor, password, radio, regex, searchSelect, stringArray, textarea, ttl, yield.
+ *     editType: "ttl", type of field to use -- example boolean, searchSelect, etc.
  *     helpText: "This will be in a tooltip",
  *     readOnly: true
  *   },
@@ -48,47 +42,23 @@ import { assert } from '@ember/debug';
  */
 
 export default class FormFieldComponent extends Component {
-  emptyData = '{\n}';
-  shouldHideLabel = [
-    'boolean',
-    'file',
-    'json',
-    'kv',
-    'mountAccessor',
-    'optionalText',
-    'regex',
-    'searchSelect',
-    'stringArray',
-    'ttl',
-  ];
   @tracked showInput = false;
+  @tracked file = { value: '' }; // used by the pgp-file component when an attr is editType of 'file'
+  emptyData = '{\n}';
 
   constructor() {
     super(...arguments);
     const { attr, model } = this.args;
     const valuePath = attr.options?.fieldValue || attr.name;
-    assert(
-      'Form is attempting to modify an ID. Ember-data does not allow this.',
-      valuePath.toLowerCase() !== 'id'
-    );
     const modelValue = model[valuePath];
     this.showInput = !!modelValue;
   }
 
-  get hideLabel() {
-    const { type, options } = this.args.attr;
-    if (type === 'boolean' || type === 'object' || options?.isSectionHeader) {
-      return true;
-    }
-    // falsey values render a <FormFieldLabel>
-    return this.shouldHideLabel.includes(options?.editType);
-  }
-
   get disabled() {
     return this.args.disabled || false;
   }
   get showHelpText() {
-    return this.args.showHelpText === false ? false : true;
+    return this.args.showHelpText || true;
   }
   get subText() {
     return this.args.subText || '';
@@ -117,11 +87,6 @@ export default class FormFieldComponent extends Component {
     const state = validations[this.valuePath];
     return state && !state.isValid ? state.errors.join(' ') : null;
   }
-  get validationWarning() {
-    const validations = this.args.modelValidations || {};
-    const state = validations[this.valuePath];
-    return state?.warnings?.length ? state.warnings.join(' ') : null;
-  }
 
   onChange() {
     if (this.args.onChange) {
@@ -130,11 +95,12 @@ export default class FormFieldComponent extends Component {
   }
 
   @action
-  setFile(keyFile) {
+  setFile(_, keyFile) {
     const path = this.valuePath;
     const { value } = keyFile;
     this.args.model.set(path, value);
     this.onChange(path, value);
+    this.file = keyFile;
   }
   @action
   setAndBroadcast(value) {
@@ -143,20 +109,20 @@ export default class FormFieldComponent extends Component {
   }
   @action
   setAndBroadcastBool(trueVal, falseVal, event) {
-    const valueToSet = event.target.checked === true ? trueVal : falseVal;
+    let valueToSet = event.target.checked === true ? trueVal : falseVal;
     this.setAndBroadcast(valueToSet);
   }
   @action
   setAndBroadcastTtl(value) {
     const alwaysSendValue = this.valuePath === 'expiry' || this.valuePath === 'safetyBuffer';
-    const valueToSet = value.enabled === true || alwaysSendValue ? `${value.seconds}s` : 0;
+    let valueToSet = value.enabled === true || alwaysSendValue ? `${value.seconds}s` : 0;
     this.setAndBroadcast(`${valueToSet}`);
   }
   @action
   codemirrorUpdated(isString, value, codemirror) {
     codemirror.performLint();
     const hasErrors = codemirror.state.lint.marked.length > 0;
-    const valToSet = isString ? value : JSON.parse(value);
+    let valToSet = isString ? value : JSON.parse(value);
 
     if (!hasErrors) {
       this.args.model.set(this.valuePath, valToSet);
diff --git a/ui/lib/core/addon/components/form-save-buttons.js b/ui/lib/core/addon/components/form-save-buttons.js
index 9bfa234bb1c91..978796de1f3d4 100644
--- a/ui/lib/core/addon/components/form-save-buttons.js
+++ b/ui/lib/core/addon/components/form-save-buttons.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@ember/component';
 import { computed } from '@ember/object';
 import layout from '../templates/components/form-save-buttons';
diff --git a/ui/lib/core/addon/components/icon.hbs b/ui/lib/core/addon/components/icon.hbs
deleted file mode 100644
index 3ee2056a9ecde..0000000000000
--- a/ui/lib/core/addon/components/icon.hbs
+++ /dev/null
@@ -1,7 +0,0 @@
-{{#if this.isFlightIcon}}
-  <FlightIcon @name={{this.name}} @size={{this.size}} @stretched={{@stretched}} ...attributes />
-{{else}}
-  <span class="hs-icon {{this.hsIconClass}}" ...attributes>
-    {{svg-jar this.name}}
-  </span>
-{{/if}}
\ No newline at end of file
diff --git a/ui/lib/core/addon/components/icon.js b/ui/lib/core/addon/components/icon.js
index b9b3b6d503b99..cfb4025b2c5e4 100644
--- a/ui/lib/core/addon/components/icon.js
+++ b/ui/lib/core/addon/components/icon.js
@@ -1,13 +1,9 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
+import Component from '@ember/component';
+import { computed } from '@ember/object';
 import { assert } from '@ember/debug';
+import layout from '../templates/components/icon';
 import flightIconMap from '@hashicorp/flight-icons/catalog.json';
 const flightIconNames = flightIconMap.assets.mapBy('iconName').uniq();
-
 /**
  * @module Icon
  * `Icon` components are glyphs used to indicate important information.
@@ -22,27 +18,22 @@ const flightIconNames = flightIconMap.assets.mapBy('iconName').uniq();
  * @param {string} [size=16] - size for flight icon, can be 16 or 24
  *
  */
+export default Component.extend({
+  tagName: '',
+  layout,
+  name: null,
+  size: '16',
 
-export default class Icon extends Component {
-  constructor(owner, args) {
-    super(owner, args);
+  init() {
+    this._super(...arguments);
     assert('Icon component size argument must be either "16" or "24"', ['16', '24'].includes(this.size));
-  }
-
-  get size() {
-    return this.args.size || '16';
-  }
-
-  get name() {
-    return this.args.name || null;
-  }
+  },
 
   // favor flight icon set and fall back to structure icons if not found
-  get isFlightIcon() {
+  isFlightIcon: computed('name', function () {
     return this.name ? flightIconNames.includes(this.name) : false;
-  }
-
-  get hsIconClass() {
+  }),
+  hsIconClass: computed('size', function () {
     return this.size === '24' ? 'hs-icon-xl' : 'hs-icon-l';
-  }
-}
+  }),
+});
diff --git a/ui/lib/core/addon/components/info-table-item-array.hbs b/ui/lib/core/addon/components/info-table-item-array.hbs
index aed30d39c286e..5a3f1e3c7f409 100644
--- a/ui/lib/core/addon/components/info-table-item-array.hbs
+++ b/ui/lib/core/addon/components/info-table-item-array.hbs
@@ -1,5 +1,5 @@
-{{! the class linked-block-item is needed for the read-more component }}
-<div data-test-info-table-item-array {{did-insert this.fetchOptions}} class="linked-block-item">
+{{! the class linkable-item is needed for the read-more component }}
+<div data-test-info-table-item-array {{did-insert this.fetchOptions}} class="linkable-item">
   {{#if @isLink}}
     <div data-test-row-value={{@label}}>
       {{#if this.fetchComplete}}
diff --git a/ui/lib/core/addon/components/info-table-item-array.js b/ui/lib/core/addon/components/info-table-item-array.js
index 2b78184c0edf1..3c9291ec4b72e 100644
--- a/ui/lib/core/addon/components/info-table-item-array.js
+++ b/ui/lib/core/addon/components/info-table-item-array.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
@@ -59,9 +54,9 @@ export default class InfoTableItemArray extends Component {
   }
 
   get displayArrayTruncated() {
-    const { displayArray } = this.args;
+    let { displayArray } = this.args;
     if (!displayArray) return null;
-    if (displayArray.length >= 10 && !this.args.doNotTruncate) {
+    if ((displayArray.length >= 10) & !this.args.doNotTruncate) {
       // if array greater than 10 in length only display the first 5
       return displayArray.slice(0, 5);
     }
@@ -70,9 +65,9 @@ export default class InfoTableItemArray extends Component {
 
   @action async fetchOptions() {
     if (this.args.isLink && this.args.modelType) {
-      const queryOptions = this.args.backend ? { backend: this.args.backend } : {};
+      let queryOptions = this.args.backend ? { backend: this.args.backend } : {};
 
-      const modelRecords = await this.store.query(this.args.modelType, queryOptions).catch((err) => {
+      let modelRecords = await this.store.query(this.args.modelType, queryOptions).catch((err) => {
         if (err.httpStatus === 404) {
           return [];
         } else {
diff --git a/ui/lib/core/addon/components/info-table-row.hbs b/ui/lib/core/addon/components/info-table-row.hbs
index a1baf69298026..0ad903dfcec27 100644
--- a/ui/lib/core/addon/components/info-table-row.hbs
+++ b/ui/lib/core/addon/components/info-table-row.hbs
@@ -61,8 +61,6 @@
         {{/if}}
       {{else if @formatDate}}
         {{date-format @value @formatDate}}
-      {{else if @formatTtl}}
-        {{format-duration @value}}
       {{else}}
         {{#if (eq @type "array")}}
           <InfoTableItemArray
@@ -89,7 +87,7 @@
                   @clipboardText={{@tooltipText}}
                   @success={{action (set-flash-message "Data copied!")}}
                   @tagName="div"
-                  disabled={{not @isTooltipCopyable}}
+                  @disabled={{not @isTooltipCopyable}}
                   class={{if @isTooltipCopyable "has-pointer"}}
                   data-test-tooltip-copy
                 >
diff --git a/ui/lib/core/addon/components/info-table-row.js b/ui/lib/core/addon/components/info-table-row.js
index 218abb99019bd..b057b18a8c007 100644
--- a/ui/lib/core/addon/components/info-table-row.js
+++ b/ui/lib/core/addon/components/info-table-row.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { typeOf } from '@ember/utils';
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
@@ -18,22 +13,19 @@ import { action } from '@ember/object';
  * <InfoTableRow @value={{5}} @label="TTL" @helperText="Some description"/>
  * ```
  *
- * @param {string} label=null - The display name for the value.
- * @param {string} helperText=null - Text to describe the value displayed beneath the label.
- * @param {any} value=null  - The the data to be displayed - by default the content of the component will only show if there is a value. Also note that special handling is given to boolean values - they will render `Yes` for true and `No` for false. Overridden by block if exists
- * @param {boolean} [alwaysRender=false] - Indicates if the component content should be always be rendered.  When false, the value of `value` will be used to determine if the component should render.
- * @param {string} [defaultShown] - Text that renders as value if alwaysRender=true. Eg. "Vault default"
- * @param {string} [tooltipText] - Text if a tooltip should display over the value.
- * @param {boolean} [isTooltipCopyable]  - Allows tooltip click to copy
- * @param {string} [formatDate] - A string of the desired date format that's passed to the date-format helper to render timestamps (ex. "MMM d yyyy, h:mm:ss aaa", see: https://date-fns.org/v2.30.0/docs/format)
- * @param {boolean} [formatTtl=false] - When true, value is passed to the format-duration helper, useful for TTL values
- * @param {string} [type=array] - The type of value being passed in.  This is used for when you want to trim an array.  For example, if you have an array value that can equal length 15+ this will trim to show 5 and count how many more are there
- * * InfoTableItemArray *
- * @param {boolean} [isLink=true] - Passed through to InfoTableItemArray. Indicates if the item should contain a link-to component.  Only setup for arrays, but this could be changed if needed.
- * @param {string} [modelType=null] - Passed through to InfoTableItemArray. Tells what model you want data for the allOptions to be returned from.  Used in conjunction with the the isLink.
- * @param {string} [queryParam] - Passed through to InfoTableItemArray. If you want to specific a tab for the View All XX to display to.  Ex= role
- * @param {string} [backend] - Passed through to InfoTableItemArray. To specify secrets backend to point link to  Ex= transformation
- * @param {string} [viewAll] - Passed through to InfoTableItemArray. Specify the word at the end of the link View all.
+ * @param label=null {string} - The display name for the value.
+ * @param helperText=null {string} - Text to describe the value displayed beneath the label.
+ * @param value=null {any} - The the data to be displayed - by default the content of the component will only show if there is a value. Also note that special handling is given to boolean values - they will render `Yes` for true and `No` for false. Overridden by block if exists
+ * @param [alwaysRender=false] {Boolean} - Indicates if the component content should be always be rendered.  When false, the value of `value` will be used to determine if the component should render.
+ * @param [defaultShown] {String} - Text that renders as value if alwaysRender=true. Eg. "Vault default"
+ * @param [tooltipText] {String} - Text if a tooltip should display over the value.
+ * @param [isTooltipCopyable] {Boolean} - Allows tooltip click to copy
+ * @param [type=array] {string} - The type of value being passed in.  This is used for when you want to trim an array.  For example, if you have an array value that can equal length 15+ this will trim to show 5 and count how many more are there
+ * @param [isLink=true] {Boolean} - Passed through to InfoTableItemArray. Indicates if the item should contain a link-to component.  Only setup for arrays, but this could be changed if needed.
+ * @param [modelType=null] {string} - Passed through to InfoTableItemArray. Tells what model you want data for the allOptions to be returned from.  Used in conjunction with the the isLink.
+ * @param [queryParam] {String} - Passed through to InfoTableItemArray. If you want to specific a tab for the View All XX to display to.  Ex= role
+ * @param [backend] {String} - Passed through to InfoTableItemArray. To specify secrets backend to point link to  Ex= transformation
+ * @param [viewAll] {String} - Passed through to InfoTableItemArray. Specify the word at the end of the link View all.
  */
 
 export default class InfoTableRowComponent extends Component {
@@ -49,7 +41,7 @@ export default class InfoTableRowComponent extends Component {
   }
 
   get valueIsEmpty() {
-    const { value } = this.args;
+    let { value } = this.args;
     if (typeOf(value) === 'array' && value.length === 0) {
       return true;
     }
diff --git a/ui/lib/core/addon/components/info-table.js b/ui/lib/core/addon/components/info-table.js
index 39b56489ec6d7..13959817d403e 100644
--- a/ui/lib/core/addon/components/info-table.js
+++ b/ui/lib/core/addon/components/info-table.js
@@ -1,9 +1,5 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
+import Component from '@ember/component';
+import layout from '../templates/components/info-table';
 
 /**
  * @module InfoTable
@@ -22,8 +18,10 @@ import Component from '@glimmer/component';
  * @param {Array} items=null - An array of strings which will be used as the InfoTableRow value.
  */
 
-export default class InfoTable extends Component {
-  get title() {
-    return this.args.title || 'Info Table';
-  }
-}
+export default Component.extend({
+  layout,
+  tagName: '',
+  title: 'Info Table',
+  header: null,
+  items: null,
+});
diff --git a/ui/lib/core/addon/components/info-tooltip.hbs b/ui/lib/core/addon/components/info-tooltip.hbs
deleted file mode 100644
index 73a15c8020944..0000000000000
--- a/ui/lib/core/addon/components/info-tooltip.hbs
+++ /dev/null
@@ -1,24 +0,0 @@
-<span class="is-inline-block" data-test-component="info-tooltip" data-test-tooltip>
-  <ToolTip
-    @verticalPosition={{or @verticalPosition "below"}}
-    @horizontalPosition={{or @horizontalPosition "auto-right"}}
-    data-test-component="info-tooltip"
-    data-test-tooltip
-    as |d|
-  >
-    <d.Trigger
-      @htmlTag="button"
-      @type="button"
-      class="tool-tip-trigger button is-ghost is-compact"
-      data-test-tool-tip-trigger={{true}}
-      {{on "click" this.preventSubmit}}
-    >
-      <Icon @name="info" class="auto-width" aria-label="help" />
-    </d.Trigger>
-    <d.Content @defaultClass="tool-tip">
-      <div class="box" data-test-info-tooltip-content>
-        {{yield}}
-      </div>
-    </d.Content>
-  </ToolTip>
-</span>
\ No newline at end of file
diff --git a/ui/lib/core/addon/components/info-tooltip.js b/ui/lib/core/addon/components/info-tooltip.js
index 83831e8a4d48c..c72fd4874a6bb 100644
--- a/ui/lib/core/addon/components/info-tooltip.js
+++ b/ui/lib/core/addon/components/info-tooltip.js
@@ -1,27 +1,16 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
+import Component from '@ember/component';
+import layout from '../templates/components/info-tooltip';
 
-import Component from '@glimmer/component';
-import { action } from '@ember/object';
+export default Component.extend({
+  layout,
+  'data-test-component': 'info-tooltip',
+  attributeBindings: ['data-test-component'],
+  tagName: 'span',
+  classNames: ['is-inline-block'],
 
-/**
- * @module JsonEditor
- *
- * @example
- * ```js
- * <JsonEditor @title="Policy" @value={{codemirror.string}} @valueUpdated={{ action "codemirrorUpdate"}} />
- * ```
- *
- * @param {string} [verticalPosition] - vertical position specification (above, below)
- * @param {string} [horizontalPosition] - horizontal position specification (center, auto-right)
-
- */
-
-export default class InfoTooltip extends Component {
-  @action
-  preventSubmit(e) {
-    e.preventDefault();
-  }
-}
+  actions: {
+    preventSubmit(e) {
+      e.preventDefault();
+    },
+  },
+});
diff --git a/ui/lib/core/addon/components/input-search.js b/ui/lib/core/addon/components/input-search.js
deleted file mode 100644
index 83eda1f6e0f1d..0000000000000
--- a/ui/lib/core/addon/components/input-search.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
-import { action } from '@ember/object';
-import { tracked } from '@glimmer/tracking';
-
-export default class inputSelect extends Component {
-  /*
-   * @public
-   * @param Function
-   *
-   * Function called when any of the inputs change
-   *
-   */
-  @tracked searchInput = '';
-  @action
-  inputChanged() {
-    this.args.onChange(this.searchInput);
-  }
-}
diff --git a/ui/lib/core/addon/components/json-editor.js b/ui/lib/core/addon/components/json-editor.js
deleted file mode 100644
index 831f32c385f14..0000000000000
--- a/ui/lib/core/addon/components/json-editor.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
-import { action } from '@ember/object';
-
-/**
- * @module JsonEditor
- *
- * @example
- * ```js
- * <JsonEditor @title="Policy" @value={{codemirror.string}} @valueUpdated={{ action "codemirrorUpdate"}} />
- * ```
- *
- * @param {string} [title] - Name above codemirror view
- * @param {string} value - a specific string the comes from codemirror. It's the value inside the codemirror display
- * @param {Function} [valueUpdated] - action to preform when you edit the codemirror value.
- * @param {Function} [onFocusOut] - action to preform when you focus out of codemirror.
- * @param {string} [helpText] - helper text.
- * @param {Object} [extraKeys] - Provides keyboard shortcut methods for things like saving on shift + enter.
- * @param {Array} [gutters] - An array of CSS class names or class name / CSS string pairs, each of which defines a width (and optionally a background), and which will be used to draw the background of the gutters.
- * @param {string} [mode] - The mode defined for styling. Right now we only import ruby so mode must but be ruby or defaults to javascript. If you wanted another language you need to import it into the modifier.
- * @param {Boolean} [readOnly] - Sets the view to readOnly, allowing for copying but no editing. It also hides the cursor. Defaults to false.
- * @param {String} [theme] - Specify or customize the look via a named "theme" class in scss.
- * @param {String} [value] - Value within the display. Generally, a json string.
- * @param {String} [viewportMargin] - Size of viewport. Often set to "Infinity" to load/show all text regardless of length.
- */
-
-export default class JsonEditorComponent extends Component {
-  get getShowToolbar() {
-    return this.args.showToolbar === false ? false : true;
-  }
-
-  @action
-  onUpdate(...args) {
-    if (!this.args.readOnly) {
-      // catching a situation in which the user is not readOnly and has not provided a valueUpdated function to the instance
-      this.args.valueUpdated(...args);
-    }
-  }
-
-  @action
-  onFocus(...args) {
-    if (this.args.onFocusOut) {
-      this.args.onFocusOut(...args);
-    }
-  }
-}
diff --git a/ui/lib/core/addon/components/key-value-header.js b/ui/lib/core/addon/components/key-value-header.js
index b0d03fac96d4c..90171a556c88e 100644
--- a/ui/lib/core/addon/components/key-value-header.js
+++ b/ui/lib/core/addon/components/key-value-header.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import utils from 'vault/lib/key-utils';
 import { encodePath } from 'vault/utils/path-encoding-helpers';
@@ -45,7 +40,7 @@ export default class KeyValueHeader extends Component {
   }
 
   get secretPath() {
-    const crumbs = [];
+    let crumbs = [];
     const root = this.args.root;
     const baseKey = this.args.baseKey?.display || this.args.baseKey?.id;
     const baseKeyModel = encodePath(this.args.baseKey?.id);
@@ -83,7 +78,7 @@ export default class KeyValueHeader extends Component {
         label: parts[index],
         text: this.stripTrailingSlash(parts[index]),
         path: path,
-        model: encodePath(ancestor),
+        model: ancestor,
       });
     });
 
diff --git a/ui/lib/core/addon/components/kv-object-editor.hbs b/ui/lib/core/addon/components/kv-object-editor.hbs
deleted file mode 100644
index 5f63876ad412d..0000000000000
--- a/ui/lib/core/addon/components/kv-object-editor.hbs
+++ /dev/null
@@ -1,71 +0,0 @@
-<div class="field" ...attributes {{did-insert this.createKvData @value}}>
-  <FormFieldLabel
-    @label={{@label}}
-    @helpText={{@helpText}}
-    @subText={{@subText}}
-    class={{@labelClass}}
-    data-test-kv-label={{true}}
-  />
-  {{#if @validationError}}
-    <div>
-      <AlertInline @type="danger" @message={{@validationError}} @paddingTop={{true}} />
-    </div>
-  {{/if}}
-  {{#if this.kvData}}
-    {{#each this.kvData as |row index|}}
-      <div class="columns is-variable" data-test-kv-row>
-        <div class="column is-one-quarter">
-          <Input
-            data-test-kv-key={{true}}
-            @value={{row.name}}
-            placeholder={{this.placeholders.key}}
-            {{on "change" (fn this.updateRow row index)}}
-            class="input"
-          />
-        </div>
-        <div class="column">
-          {{#if (has-block)}}
-            {{yield row this.kvData}}
-          {{else}}
-            <Textarea
-              data-test-kv-value={{index}}
-              name={{row.name}}
-              class="input {{if @validationError 'has-error-border'}}"
-              @value={{row.value}}
-              wrap="off"
-              placeholder={{this.placeholders.value}}
-              rows={{1}}
-              {{on "change" (fn this.updateRow row index)}}
-              {{on "keyup" this.handleKeyUp}}
-            />
-          {{/if}}
-        </div>
-        <div class="column is-narrow">
-          {{#if (eq this.kvData.length (inc index))}}
-            <button type="button" {{action "addRow"}} class="button is-outlined is-primary" data-test-kv-add-row={{true}}>
-              Add
-            </button>
-          {{else}}
-            <button
-              class="button has-text-grey is-expanded is-icon"
-              type="button"
-              {{action "deleteRow" row index}}
-              aria-label="Delete row"
-              data-test-kv-delete-row={{index}}
-            >
-              <Icon @name="trash" />
-            </button>
-          {{/if}}
-        </div>
-      </div>
-    {{/each}}
-    {{#if this.hasDuplicateKeys}}
-      <AlertBanner
-        @type="warning"
-        @message="More than one key shares the same name. Please be sure to have unique key names or some data may be lost when saving."
-        @class="is-marginless"
-        data-test-duplicate-error-warnings
-      />
-    {{/if}}
-  {{/if}}
-</div>
\ No newline at end of file
diff --git a/ui/lib/core/addon/components/kv-object-editor.js b/ui/lib/core/addon/components/kv-object-editor.js
deleted file mode 100644
index f95b3dde30352..0000000000000
--- a/ui/lib/core/addon/components/kv-object-editor.js
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
-import { tracked } from '@glimmer/tracking';
-import { isNone } from '@ember/utils';
-import { assert } from '@ember/debug';
-import { action } from '@ember/object';
-import { guidFor } from '@ember/object/internals';
-import KVObject from 'vault/lib/kv-object';
-
-/**
- * @module KvObjectEditor
- * KvObjectEditor components are called in FormFields when the editType on the model is kv.  They are used to show a key-value input field.
- *
- * @example
- * ```js
- * <KvObjectEditor
- *  @value={{get model valuePath}}
- *  @onChange={{action "setAndBroadcast" valuePath }}
- *  @label="some label"
-   />
- * ```
- * @param {string} value - the value is captured from the model.
- * @param {function} onChange - function that captures the value on change
- * @param {function} [onKeyUp] - function passed in that handles the dom keyup event. Used for validation on the kv custom metadata.
- * @param {string} [label] - label displayed over key value inputs
- * @param {string} [labelClass] - override default label class in FormFieldLabel component
- * @param {string} [warning] - warning that is displayed
- * @param {string} [helpText] - helper text. In tooltip.
- * @param {string} [subText] - placed under label.
- * @param {string} [keyPlaceholder] - placeholder for key input
- * @param {string} [valuePlaceholder] - placeholder for value input
- */
-
-export default class KvObjectEditor extends Component {
-  @tracked kvData;
-
-  get placeholders() {
-    return {
-      key: this.args.keyPlaceholder || 'key',
-      value: this.args.valuePlaceholder || 'value',
-    };
-  }
-  get hasDuplicateKeys() {
-    return this.kvData.uniqBy('name').length !== this.kvData.get('length');
-  }
-
-  // fired on did-insert from render modifier
-  @action
-  createKvData(elem, [value]) {
-    this.kvData = KVObject.create({ content: [] }).fromJSON(value);
-    this.addRow();
-  }
-  @action
-  addRow() {
-    if (!isNone(this.kvData.findBy('name', ''))) {
-      return;
-    }
-    const newObj = { name: '', value: '' };
-    guidFor(newObj);
-    this.kvData.addObject(newObj);
-  }
-  @action
-  updateRow() {
-    this.args.onChange(this.kvData.toJSON());
-  }
-  @action
-  deleteRow(object, index) {
-    const oldObj = this.kvData.objectAt(index);
-    assert('object guids match', guidFor(oldObj) === guidFor(object));
-    this.kvData.removeAt(index);
-    this.args.onChange(this.kvData.toJSON());
-  }
-  @action
-  handleKeyUp(event) {
-    if (this.args.onKeyUp) {
-      this.args.onKeyUp(event.target.value);
-    }
-  }
-}
diff --git a/ui/lib/core/addon/components/layout-loading.js b/ui/lib/core/addon/components/layout-loading.js
new file mode 100644
index 0000000000000..5723895b68983
--- /dev/null
+++ b/ui/lib/core/addon/components/layout-loading.js
@@ -0,0 +1,17 @@
+import Component from '@ember/component';
+import layout from '../templates/components/layout-loading';
+
+/**
+ * @module LayoutLoading
+ * `LayoutLoading` displays the `VaultLogoSpinner` component in a centered full-page layout.
+ *
+ * @example
+ * ```js
+ * <LayoutLoading />
+ * ```
+ */
+
+export default Component.extend({
+  layout,
+  tagName: '',
+});
diff --git a/ui/lib/core/addon/components/learn-link.js b/ui/lib/core/addon/components/learn-link.js
new file mode 100644
index 0000000000000..1071690186cd7
--- /dev/null
+++ b/ui/lib/core/addon/components/learn-link.js
@@ -0,0 +1,5 @@
+import DocLink from './doc-link';
+
+export default DocLink.extend({
+  host: 'https://learn.hashicorp.com',
+});
diff --git a/ui/lib/core/addon/components/linkable-item.js b/ui/lib/core/addon/components/linkable-item.js
new file mode 100644
index 0000000000000..d55ccbe65e1ec
--- /dev/null
+++ b/ui/lib/core/addon/components/linkable-item.js
@@ -0,0 +1,23 @@
+import Component from '@glimmer/component';
+import layout from '../templates/components/linkable-item';
+import { setComponentTemplate } from '@ember/component';
+
+/**
+ * @module LinkableItem
+ * LinkableItem components have two contextual components, a Content component used to show information on the left with a Menu component on the right, all aligned vertically centered. If passed a link, the block will be clickable.
+ *
+ * @example
+ * ```js
+ * <LinkableItem @link={{hash route='vault.backends' model='my-backend-path'}} data-test-row="my-backend-path">
+ * // Use <LinkableItem.content> and <LinkableItem.menu> here
+ * </LinkableItem>
+ * ```
+ *
+ * @param {object} [link=null] - Link should have route and model
+ * @param {boolean} [disabled=false] - If no link then should be given a disabled attribute equal to true
+ */
+
+/* eslint ember/no-empty-glimmer-component-classes: 'warn' */
+class LinkableItemComponent extends Component {}
+
+export default setComponentTemplate(layout, LinkableItemComponent);
diff --git a/ui/lib/core/addon/components/linkable-item/content.js b/ui/lib/core/addon/components/linkable-item/content.js
new file mode 100644
index 0000000000000..c9449b7aa62c4
--- /dev/null
+++ b/ui/lib/core/addon/components/linkable-item/content.js
@@ -0,0 +1,31 @@
+import Component from '@glimmer/component';
+import layout from '../../templates/components/linkable-item/content';
+import { setComponentTemplate } from '@ember/component';
+
+/**
+ * @module Content
+ * Content components are contextual components of LinkableItem, used to display content on the left side of a LinkableItem component.
+ *
+ * @example
+ * ```js
+ * <LinkableItem as |Li|>
+ *  <Li.content
+ *    @accessor="cubbyhole_e21f8ee6"
+ *    @description="per-token private secret storage"
+ *    @glyphText="tooltip text"
+ *    @glyph=glyph
+ *    @title="title"
+ *  />
+ * </LinkableItem>
+ * ```
+ * @param {string} accessor=null - formatted as HTML <code> tag
+ * @param {string} description=null - will truncate if wider than parent div
+ * @param {string} glyphText=null - tooltip for glyph
+ * @param {string} glyph=null - will display as icon beside the title
+ * @param {string} title=null - if @link object is passed in then title will link to @link.route
+ */
+
+/* eslint ember/no-empty-glimmer-component-classes: 'warn' */
+class ContentComponent extends Component {}
+
+export default setComponentTemplate(layout, ContentComponent);
diff --git a/ui/lib/core/addon/components/linkable-item/menu.js b/ui/lib/core/addon/components/linkable-item/menu.js
new file mode 100644
index 0000000000000..aa4a0fc283cce
--- /dev/null
+++ b/ui/lib/core/addon/components/linkable-item/menu.js
@@ -0,0 +1,22 @@
+import Component from '@glimmer/component';
+import layout from '../../templates/components/linkable-item/menu';
+import { setComponentTemplate } from '@ember/component';
+
+/**
+ * @module Menu
+ * Menu components are contextual components of LinkableItem, used to display a menu on the right side of a LinkableItem component.
+ *
+ * @example
+ * ```js
+ * <LinkableItem as |Li|>
+ *  <Li.menu>
+ *     Some menu here
+ *  </Li.menu>
+ * </LinkableItem>
+ * ```
+ */
+
+/* eslint ember/no-empty-glimmer-component-classes: 'warn' */
+class MenuComponent extends Component {}
+
+export default setComponentTemplate(layout, MenuComponent);
diff --git a/ui/lib/core/addon/components/linked-block.js b/ui/lib/core/addon/components/linked-block.js
index 8b413959cbfb0..2c6ddb1c68efb 100644
--- a/ui/lib/core/addon/components/linked-block.js
+++ b/ui/lib/core/addon/components/linked-block.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
diff --git a/ui/lib/core/addon/components/list-item.js b/ui/lib/core/addon/components/list-item.js
index 0efcc94aa3e96..2f379ecfb668f 100644
--- a/ui/lib/core/addon/components/list-item.js
+++ b/ui/lib/core/addon/components/list-item.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import Component from '@ember/component';
 import { task } from 'ember-concurrency';
@@ -19,13 +14,13 @@ export default Component.extend({
   hasMenu: true,
 
   callMethod: task(function* (method, model, successMessage, failureMessage, successCallback = () => {}) {
-    const flash = this.flashMessages;
+    let flash = this.flashMessages;
     try {
       yield model[method]();
       flash.success(successMessage);
       successCallback();
     } catch (e) {
-      const errString = e.errors.join(' ');
+      let errString = e.errors.join(' ');
       flash.danger(failureMessage + ' ' + errString);
       model.rollbackAttributes();
     }
diff --git a/ui/lib/core/addon/components/list-item/content.js b/ui/lib/core/addon/components/list-item/content.js
index 8f027b69f0e03..4798652642ba8 100644
--- a/ui/lib/core/addon/components/list-item/content.js
+++ b/ui/lib/core/addon/components/list-item/content.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@ember/component';
 
 export default Component.extend({
diff --git a/ui/lib/core/addon/components/list-item/popup-menu.js b/ui/lib/core/addon/components/list-item/popup-menu.js
index 17d914f3f1f94..467a1a68604d5 100644
--- a/ui/lib/core/addon/components/list-item/popup-menu.js
+++ b/ui/lib/core/addon/components/list-item/popup-menu.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@ember/component';
 import layout from '../../templates/components/list-item/popup-menu';
 
diff --git a/ui/lib/core/addon/components/list-pagination.js b/ui/lib/core/addon/components/list-pagination.js
index ec1f9713fb3c3..f41c9012707e7 100644
--- a/ui/lib/core/addon/components/list-pagination.js
+++ b/ui/lib/core/addon/components/list-pagination.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { gt } from '@ember/object/computed';
 import Component from '@ember/component';
 import { computed } from '@ember/object';
@@ -10,8 +5,6 @@ import { range } from 'ember-composable-helpers/helpers/range';
 import { A } from '@ember/array';
 import layout from '../templates/components/list-pagination';
 
-// In non-dev mode, the pagination defaults to the config/environment variable. Set to 100.
-
 export default Component.extend({
   layout,
   classNames: ['box', 'is-shadowless', 'list-pagination'],
@@ -32,7 +25,7 @@ export default Component.extend({
     const { spread, page, lastPage } = this;
 
     let lower = Math.max(2, page - spread);
-    const upper = Math.min(lastPage - 1, lower + spread * 2);
+    let upper = Math.min(lastPage - 1, lower + spread * 2);
     // we're closer to lastPage than the spread
     if (upper - lower < 5) {
       lower = upper - 4;
diff --git a/ui/lib/core/addon/components/list-view.js b/ui/lib/core/addon/components/list-view.js
index f7c3825e8dedc..e479e99fc3196 100644
--- a/ui/lib/core/addon/components/list-view.js
+++ b/ui/lib/core/addon/components/list-view.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { pluralize } from 'ember-inflector';
 
@@ -41,17 +36,17 @@ export default class ListView extends Component {
   }
 
   get showPagination() {
-    const meta = this.args.items.meta;
+    let meta = this.args.items.meta;
     return this.args.paginationRouteName && meta && meta.lastPage > 1 && meta.total > 0;
   }
 
   get emptyTitle() {
-    const items = pluralize(this.itemNoun);
+    let items = pluralize(this.itemNoun);
     return `No ${items} yet`;
   }
 
   get emptyMessage() {
-    const items = pluralize(this.itemNoun);
+    let items = pluralize(this.itemNoun);
     return `Your ${items} will be listed here. Add your first ${this.itemNoun} to get started.`;
   }
 }
diff --git a/ui/lib/core/addon/components/masked-input.hbs b/ui/lib/core/addon/components/masked-input.hbs
deleted file mode 100644
index c08edb9eb05ab..0000000000000
--- a/ui/lib/core/addon/components/masked-input.hbs
+++ /dev/null
@@ -1,58 +0,0 @@
-<div
-  class="masked-input {{if @displayOnly 'display-only'}} {{if @allowCopy 'allow-copy'}}"
-  data-test-masked-input
-  data-test-field
-  ...attributes
->
-  {{#if @displayOnly}}
-    {{#if this.showValue}}
-      <pre class="masked-value display-only is-word-break">{{@value}}</pre>
-    {{else}}
-      <pre class="masked-value display-only masked-font">***********</pre>
-    {{/if}}
-  {{else}}
-    <Textarea
-      id={{this.textareaId}}
-      name={{@name}}
-      @value={{@value}}
-      class="input masked-value {{unless this.showValue 'masked-font'}}"
-      rows={{1}}
-      wrap="off"
-      spellcheck="false"
-      {{on "change" this.onChange}}
-      {{on "keyup" (fn this.handleKeyUp @name)}}
-      data-test-textarea
-    />
-  {{/if}}
-  {{#if @allowCopy}}
-    <CopyButton
-      @clipboardText={{@value}}
-      @success={{action (set-flash-message "Data copied!")}}
-      class="copy-button button {{if @displayOnly 'is-compact'}}"
-      data-test-copy-button
-    >
-      <Icon @name="clipboard-copy" aria-hidden="Copy value" />
-    </CopyButton>
-  {{/if}}
-  {{#if @allowDownload}}
-    <DownloadButton
-      class="button download-button"
-      @filename={{or @name "secret-value"}}
-      @data={{@value}}
-      @stringify={{true}}
-      aria-label="Download secret value"
-    >
-      <Icon @name="download" />
-    </DownloadButton>
-  {{/if}}
-  <button
-    onclick={{this.toggleMask}}
-    type="button"
-    aria-label={{if this.showValue "mask value" "show value"}}
-    title={{if this.showValue "mask value" "show value"}}
-    class="{{if (eq @value '') 'has-text-grey'}} masked-input-toggle button"
-    data-test-button="toggle-masked"
-  >
-    <Icon @name={{if this.showValue "eye" "eye-off"}} />
-  </button>
-</div>
\ No newline at end of file
diff --git a/ui/lib/core/addon/components/masked-input.js b/ui/lib/core/addon/components/masked-input.js
index 1729b95d2c646..30ea93feca637 100644
--- a/ui/lib/core/addon/components/masked-input.js
+++ b/ui/lib/core/addon/components/masked-input.js
@@ -1,14 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { debug } from '@ember/debug';
-import { action } from '@ember/object';
-import { guidFor } from '@ember/object/internals';
-import Component from '@glimmer/component';
-import { tracked } from '@glimmer/tracking';
+import Component from '@ember/component';
 import autosize from 'autosize';
+import layout from '../templates/components/masked-input';
 
 /**
  * @module MaskedInput
@@ -16,51 +8,53 @@ import autosize from 'autosize';
  *
  * @example
  * <MaskedInput
- *  @value={{get @model attr.name}}
+ *  @value={{attr.options.defaultValue}}
  *  @allowCopy={{true}}
- *  @allowDownload={{true}}
- *  @onChange={{this.handleChange}}
- *  @onKeyUp={{this.handleKeyUp}}
+ *  @onChange={{action "someAction"}}
+ *  @onKeyUp={{action "onKeyUp"}}
  * />
  *
- * @param value {String} - The value to display in the input.
- * @param name {String} - The key correlated to the value. Used for the download file name.
- * @param [onChange=Callback] {Function|action} - Callback triggered on change, sends new value. Must set the value of @value
- * @param [allowCopy=false] {bool} - Whether or not the input should render with a copy button.
+ * @param [value] {String} - The value to display in the input.
+ * @param [allowCopy=null] {bool} - Whether or not the input should render with a copy button.
  * @param [displayOnly=false] {bool} - Whether or not to display the value as a display only `pre` element or as an input.
+ * @param [onChange=Function.prototype] {Function|action} - A function to call when the value of the input changes.
+ * @param [onKeyUp=Function.prototype] {Function|action} - A function to call whenever on the dom event onkeyup. Generally passed down from higher level parent.
+ * @param [isCertificate=false] {bool} - If certificate display the label and icons differently.
  *
  */
-export default class MaskedInputComponent extends Component {
-  textareaId = 'textarea-' + guidFor(this);
-  @tracked showValue = false;
-
-  constructor() {
-    super(...arguments);
-    if (!this.args.onChange && !this.args.displayOnly) {
-      debug('onChange is required for editable Masked Input!');
-    }
-    this.updateSize();
-  }
-
-  updateSize() {
-    autosize(document.getElementById(this.textareaId));
-  }
-
-  @action onChange(evt) {
-    const value = evt.target.value;
-    if (this.args.onChange) {
-      this.args.onChange(value);
-    }
-  }
-
-  @action handleKeyUp(name, evt) {
-    this.updateSize();
-    const { value } = evt.target;
-    if (this.args.onKeyUp) {
-      this.args.onKeyUp(name, value);
-    }
-  }
-  @action toggleMask() {
-    this.showValue = !this.showValue;
-  }
-}
+export default Component.extend({
+  layout,
+  value: null,
+  showValue: false,
+  didInsertElement() {
+    this._super(...arguments);
+    autosize(this.element.querySelector('textarea'));
+  },
+  didUpdate() {
+    this._super(...arguments);
+    autosize.update(this.element.querySelector('textarea'));
+  },
+  willDestroyElement() {
+    this._super(...arguments);
+    autosize.destroy(this.element.querySelector('textarea'));
+  },
+  displayOnly: false,
+  onKeyDown() {},
+  onKeyUp() {},
+  onChange() {},
+  actions: {
+    toggleMask() {
+      this.toggleProperty('showValue');
+    },
+    updateValue(e) {
+      let value = e.target.value;
+      this.set('value', value);
+      this.onChange(value);
+    },
+    handleKeyUp(name, value) {
+      if (this.onKeyUp) {
+        this.onKeyUp(name, value);
+      }
+    },
+  },
+});
diff --git a/ui/lib/core/addon/components/menu-loader.hbs b/ui/lib/core/addon/components/menu-loader.hbs
deleted file mode 100644
index f9e3dad6754f7..0000000000000
--- a/ui/lib/core/addon/components/menu-loader.hbs
+++ /dev/null
@@ -1,9 +0,0 @@
-<li class="action">
-  {{#if @loadingParam}}
-    <button disabled type="button" class="link button is-loading is-transparent">
-      loading
-    </button>
-  {{else}}
-    {{yield}}
-  {{/if}}
-</li>
\ No newline at end of file
diff --git a/ui/lib/core/addon/components/menu-loader.js b/ui/lib/core/addon/components/menu-loader.js
new file mode 100644
index 0000000000000..0710d5369332c
--- /dev/null
+++ b/ui/lib/core/addon/components/menu-loader.js
@@ -0,0 +1,22 @@
+/**
+ * @module MenuLoader
+ * MenuLoader components are used to show a loading state when fetching data is triggered by opening a
+ * popup menu.
+ *
+ * @example
+ * ```js
+ * <MenuLoader @loadingParam={model.updatePath.isPending} />
+ * ```
+ *
+ * @param loadingParam {Boolean} - If the value of this param is true, the loading state will be rendered,
+ * else the component will yield.
+ */
+import Component from '@ember/component';
+import layout from '../templates/components/menu-loader';
+
+export default Component.extend({
+  tagName: 'li',
+  classNames: 'action',
+  layout,
+  loadingParam: null,
+});
diff --git a/ui/lib/core/addon/components/message-error.js b/ui/lib/core/addon/components/message-error.js
index e6a92317eb91c..cdd7b1812d66c 100644
--- a/ui/lib/core/addon/components/message-error.js
+++ b/ui/lib/core/addon/components/message-error.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import layout from '../templates/components/message-error';
 import { setComponentTemplate } from '@ember/component';
@@ -24,7 +19,7 @@ import { setComponentTemplate } from '@ember/component';
 
 class MessageError extends Component {
   get displayErrors() {
-    const { errorMessage, errors, model } = this.args;
+    let { errorMessage, errors, model } = this.args;
     if (errorMessage) {
       return [errorMessage];
     }
@@ -34,7 +29,7 @@ class MessageError extends Component {
     }
 
     if (model?.isError) {
-      const adapterError = model?.adapterError;
+      let adapterError = model?.adapterError;
       if (!adapterError) {
         return null;
       }
diff --git a/ui/lib/core/addon/components/modal.hbs b/ui/lib/core/addon/components/modal.hbs
index 2f64d694f2b78..fd2967a2249a9 100644
--- a/ui/lib/core/addon/components/modal.hbs
+++ b/ui/lib/core/addon/components/modal.hbs
@@ -12,18 +12,16 @@
               data-test-modal-glyph={{this.glyph.glyph}}
             />
           {{/if}}
-          <span class={{if this.glyph "has-left-padding-xs"}}>{{@title}}</span>
+          <span>{{@title}}</span>
         </h2>
         {{#if this.showCloseButton}}
           <button
             type="button"
-            class="icon-button has-text-grey"
+            class="delete"
             aria-label="close"
             {{on "click" @onClose}}
             data-test-modal-close-button
-          >
-            <Icon @name="x-circle" class="close-icon" />
-          </button>
+          ></button>
         {{/if}}
       </header>
       {{yield}}
diff --git a/ui/lib/core/addon/components/modal.js b/ui/lib/core/addon/components/modal.js
index d99d723bf6015..0be7baaff8dca 100644
--- a/ui/lib/core/addon/components/modal.js
+++ b/ui/lib/core/addon/components/modal.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { messageTypes } from 'core/helpers/message-types';
 /**
diff --git a/ui/lib/core/addon/components/namespace-reminder.js b/ui/lib/core/addon/components/namespace-reminder.js
index 4b67f8165724d..20c73b36be898 100644
--- a/ui/lib/core/addon/components/namespace-reminder.js
+++ b/ui/lib/core/addon/components/namespace-reminder.js
@@ -1,26 +1,21 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
 import { inject as service } from '@ember/service';
+import { not } from '@ember/object/computed';
+import Component from '@ember/component';
+import { computed } from '@ember/object';
+import layout from '../templates/components/namespace-reminder';
 
-export default class NamespaceReminder extends Component {
-  @service namespace;
-
-  get showMessage() {
-    return !this.namespace.inRootNamespace;
-  }
-
-  get mode() {
-    return this.args.mode || 'edit';
-  }
-
-  get modeVerb() {
-    if (!this.mode) {
+export default Component.extend({
+  layout,
+  namespace: service(),
+  showMessage: not('namespace.inRootNamespace'),
+  //public API
+  noun: null,
+  mode: 'edit',
+  modeVerb: computed('mode', function () {
+    let mode = this.mode;
+    if (!mode) {
       return '';
     }
-    return this.mode.endsWith('e') ? `${this.mode}d` : `${this.mode}ed`;
-  }
-}
+    return mode.endsWith('e') ? `${mode}d` : `${mode}ed`;
+  }),
+});
diff --git a/ui/lib/core/addon/components/navigate-input.hbs b/ui/lib/core/addon/components/navigate-input.hbs
deleted file mode 100644
index a16588a0acb1d..0000000000000
--- a/ui/lib/core/addon/components/navigate-input.hbs
+++ /dev/null
@@ -1,20 +0,0 @@
-<div class="navigate-filter">
-  <div class="field" data-test-nav-input>
-    <p class="control has-icons-left">
-      {{! template-lint-disable no-down-event-binding }}
-      <input
-        class="filter input"
-        value={{@filter}}
-        placeholder={{or @placeholder "Filter items"}}
-        type="text"
-        data-test-component="navigate-input"
-        {{on "input" this.handleInput}}
-        {{on "keyup" this.handleKeyUp}}
-        {{on "keydown" this.handleKeyPress}}
-        {{on "focus" (fn this.setFilterFocused true)}}
-        {{on "blur" (fn this.setFilterFocused false)}}
-      />
-      <Icon @name="search" class="search-icon has-text-grey-light" />
-    </p>
-  </div>
-</div>
\ No newline at end of file
diff --git a/ui/lib/core/addon/components/navigate-input.js b/ui/lib/core/addon/components/navigate-input.js
index 2a54a25472163..578a63181592e 100644
--- a/ui/lib/core/addon/components/navigate-input.js
+++ b/ui/lib/core/addon/components/navigate-input.js
@@ -1,39 +1,14 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { debounce } from '@ember/runloop';
+import { schedule, debounce } from '@ember/runloop';
 import { inject as service } from '@ember/service';
-import Component from '@glimmer/component';
-import { action } from '@ember/object';
+import Component from '@ember/component';
 
-// TODO MOVE THESE TO THE ADDON
+//TODO MOVE THESE TO THE ADDON
 import utils from 'vault/lib/key-utils';
 import keys from 'vault/lib/keycodes';
+import FocusOnInsertMixin from 'vault/mixins/focus-on-insert';
 import { encodePath } from 'vault/utils/path-encoding-helpers';
 
-/**
- * @module NavigateInput
- * `NavigateInput` components are used to filter list data.
- *
- * @example
- * ```js
- * <NavigateInput @filter={@roleFiltered} @placeholder="placeholder text" urls="{{hash list="vault.cluster.secrets.backend.kubernetes.roles"}}"/>
- * ```
- *
- * @param {String} filter=null  - The filtered string.
- * @param {String} [placeholder="Filter items"] - The message inside the input to indicate what the user should enter into the space.
- * @param {Object} [urls=null] - An object containing list=route url.
- * @param {Function} [filterFocusDidChange=null] - A function called when the focus changes.
- * @param {Function} [filterDidChange=null] - A function called when the filter string changes.
- * @param {Function} [filterMatchesKey=null] - A function used to match to a specific key, such as an Id.
- * @param {Function} [filterPartialMatch=null] - A function used to filter through a partial match. Such as "oo" of "root".
- * @param {String} [baseKey=""] - A string to transition by Id.
- * @param {Boolean} [shouldNavigateTree=false] - If true, navigate a larger tree, such as when you're navigating leases under access.
- * @param {String} [mode="secrets"] - Mode which plays into navigation type.
- * @param {String} [extraNavParams=""] - A string used in route transition when necessary.
- */
+import layout from '../templates/components/navigate-input';
 
 const routeFor = function (type, mode, urls) {
   const MODES = {
@@ -59,15 +34,28 @@ const routeFor = function (type, mode, urls) {
   return useSuffix ? modeVal + '.' + typeVal : modeVal;
 };
 
-export default class NavigateInput extends Component {
-  @service router;
+export default Component.extend(FocusOnInsertMixin, {
+  layout,
+  router: service(),
 
-  get mode() {
-    return this.args.mode || 'secrets';
-  }
+  classNames: ['navigate-filter'],
+  urls: null,
+
+  // these get passed in from the outside
+  // actions that get passed in
+  filterFocusDidChange: null,
+  filterDidChange: null,
+  mode: 'secrets',
+  shouldNavigateTree: false,
+  extraNavParams: null,
+
+  baseKey: null,
+  filter: null,
+  filterMatchesKey: null,
+  firstPartialMatch: null,
 
   transitionToRoute(...args) {
-    const params = args.map((param, index) => {
+    let params = args.map((param, index) => {
       if (index === 0 || typeof param !== 'string') {
         return param;
       }
@@ -75,37 +63,43 @@ export default class NavigateInput extends Component {
     });
 
     this.router.transitionTo(...params);
-  }
+  },
+
+  shouldFocus: false,
+
+  didReceiveAttrs() {
+    this._super(...arguments);
+    if (!this.filter) return;
+    schedule('afterRender', this, 'forceFocus');
+  },
 
   keyForNav(key) {
     if (this.mode !== 'secrets-cert') {
       return key;
     }
     return `cert/${key}`;
-  }
-
-  onEnter(val) {
-    const mode = this.mode;
-    const baseKey = this.args.baseKey;
-    const extraParams = this.args.extraNavParams;
+  },
+  onEnter: function (val) {
+    let { baseKey, mode } = this;
+    let extraParams = this.extraNavParams;
     if (mode.startsWith('secrets') && (!val || val === baseKey)) {
       return;
     }
-    if (this.args.filterMatchesKey && !utils.keyIsFolder(val)) {
-      const params = [routeFor('show', mode, this.args.urls), extraParams, this.keyForNav(val)].compact();
+    if (this.filterMatchesKey && !utils.keyIsFolder(val)) {
+      let params = [routeFor('show', mode, this.urls), extraParams, this.keyForNav(val)].compact();
       this.transitionToRoute(...params);
     } else {
       if (mode === 'policies') {
         return;
       }
-      const route = routeFor('create', mode, this.args.urls);
+      let route = routeFor('create', mode, this.urls);
       if (baseKey) {
         this.transitionToRoute(route, this.keyForNav(baseKey), {
           queryParams: {
             initialKey: val,
           },
         });
-      } else if (this.args.urls) {
+      } else if (this.urls) {
         this.transitionToRoute(route, {
           queryParams: {
             initialKey: this.keyForNav(val),
@@ -119,35 +113,35 @@ export default class NavigateInput extends Component {
         });
       }
     }
-  }
+  },
 
   // pop to the nearest parentKey or to the root
-  onEscape(val) {
-    const key = utils.parentKeyForKey(val) || '';
-    this.args.filterDidChange(key);
+  onEscape: function (val) {
+    var key = utils.parentKeyForKey(val) || '';
+    this.filterDidChange(key);
     this.filterUpdated(key);
-  }
+  },
 
-  onTab(event) {
-    const firstPartialMatch = this.args.firstPartialMatch.id;
+  onTab: function (event) {
+    var firstPartialMatch = this.firstPartialMatch.id;
     if (!firstPartialMatch) {
       return;
     }
     event.preventDefault();
-    this.args.filterDidChange(firstPartialMatch);
+    this.filterDidChange(firstPartialMatch);
     this.filterUpdated(firstPartialMatch);
-  }
+  },
 
   // as you type, navigates through the k/v tree
-  filterUpdated(val) {
-    const mode = this.mode;
-    if (mode === 'policies' || !this.args.shouldNavigateTree) {
+  filterUpdated: function (val) {
+    var mode = this.mode;
+    if (mode === 'policies' || !this.shouldNavigateTree) {
       this.filterUpdatedNoNav(val, mode);
       return;
     }
     // select the key to nav to, assumed to be a folder
-    let key = val ? val.trim() : '';
-    const isFolder = utils.keyIsFolder(key);
+    var key = val ? val.trim() : '';
+    var isFolder = utils.keyIsFolder(key);
 
     if (!isFolder) {
       // nav to the closest parentKey (or the root)
@@ -156,11 +150,11 @@ export default class NavigateInput extends Component {
 
     const pageFilter = val.replace(key, '');
     this.navigate(this.keyForNav(key), mode, pageFilter);
-  }
+  },
 
   navigate(key, mode, pageFilter) {
-    const route = routeFor(key ? 'list' : 'list-root', mode, this.args.urls);
-    const args = [route];
+    const route = routeFor(key ? 'list' : 'list-root', mode, this.urls);
+    let args = [route];
     if (key) {
       args.push(key);
     }
@@ -180,46 +174,43 @@ export default class NavigateInput extends Component {
       });
     }
     this.transitionToRoute(...args);
-  }
+  },
 
-  filterUpdatedNoNav(val, mode) {
-    const key = val ? val.trim() : null;
-    this.transitionToRoute(routeFor('list-root', mode, this.args.urls), {
+  filterUpdatedNoNav: function (val, mode) {
+    var key = val ? val.trim() : null;
+    this.transitionToRoute(routeFor('list-root', mode, this.urls), {
       queryParams: {
         pageFilter: key,
         page: 1,
       },
     });
-  }
+  },
 
-  @action
-  handleInput(filter) {
-    if (this.args.filterDidChange) {
-      this.args.filterDidChange(filter.target.value);
-    }
-    debounce(this, this.filterUpdated, filter.target.value, 200);
-  }
-  @action
-  setFilterFocused(isFocused) {
-    if (this.args.filterFocusDidChange) {
-      this.args.filterFocusDidChange(isFocused);
-    }
-  }
-  @action
-  handleKeyPress(event) {
-    if (event.keyCode === keys.TAB) {
-      this.onTab(event);
-    }
-  }
-  @action
-  handleKeyUp(event) {
-    const keyCode = event.keyCode;
-    const val = event.target.value;
-    if (keyCode === keys.ENTER) {
-      this.onEnter(val);
-    }
-    if (keyCode === keys.ESC) {
-      this.onEscape(val);
-    }
-  }
-}
+  actions: {
+    handleInput: function (filter) {
+      this.filterDidChange(filter);
+      debounce(this, 'filterUpdated', filter, 200);
+    },
+
+    setFilterFocused: function (isFocused) {
+      this.filterFocusDidChange(isFocused);
+    },
+
+    handleKeyPress: function (event) {
+      if (event.keyCode === keys.TAB) {
+        this.onTab(event);
+      }
+    },
+
+    handleKeyUp: function (event) {
+      var keyCode = event.keyCode;
+      let val = event.target.value;
+      if (keyCode === keys.ENTER) {
+        this.onEnter(val);
+      }
+      if (keyCode === keys.ESC) {
+        this.onEscape(val);
+      }
+    },
+  },
+});
diff --git a/ui/lib/core/addon/components/object-list-input.hbs b/ui/lib/core/addon/components/object-list-input.hbs
deleted file mode 100644
index 6bf7ac0eac6fe..0000000000000
--- a/ui/lib/core/addon/components/object-list-input.hbs
+++ /dev/null
@@ -1,59 +0,0 @@
-{{yield}}
-{{#each this.inputList as |row index|}}
-  {{#let (get @validationErrors index) as |rowValidations|}}
-    <div class="field is-grouped">
-      {{#each-in row as |inputKey value|}}
-        {{#let (find-by "key" inputKey @objectKeys) as |field|}}
-          <div class="control is-expanded">
-            {{#if (eq index 0)}}
-              <h2 data-test-object-list-label={{inputKey}}>{{field.label}}</h2>
-            {{/if}}
-            {{#let (get rowValidations field.key) as |inputError|}}
-              <Input
-                data-test-object-list-input="{{field.key}}-{{index}}"
-                aria-label="{{or field.placeholder field.label}} input for row index {{index}}"
-                class="input {{if (and (not inputError.isValid) inputError.errors) 'has-error-border'}}"
-                placeholder={{or field.placeholder ""}}
-                @type="text"
-                @value={{value}}
-                name={{field.key}}
-                id="{{field.key}}-{{index}}"
-                {{on "input" (fn this.handleInput index)}}
-              />
-              {{#if (and (not inputError.isValid) inputError.errors)}}
-                <AlertInline @type="danger" @message={{inputError.errors}} @paddingTop={{true}} />
-              {{/if}}
-            {{/let}}
-          </div>
-        {{/let}}
-      {{/each-in}}
-      <div class="control {{if (includes false (map-by 'isValid' rowValidations)) '' 'is-align-end'}}">
-        {{#if (eq index 0)}}
-          <br />
-        {{/if}}
-        {{#if (eq (inc index) this.inputList.length)}}
-          <button
-            data-test-object-list-add-button
-            type="button"
-            class="button is-outlined is-primary"
-            disabled={{this.disableAdd}}
-            aria-label="add"
-            {{on "click" this.addRow}}
-          >
-            Add
-          </button>
-        {{else}}
-          <button
-            data-test-object-list-delete-button={{index}}
-            type="button"
-            class="button is-icon"
-            aria-label="remove"
-            {{on "click" (fn this.removeRow index)}}
-          >
-            <Icon @name="trash" />
-          </button>
-        {{/if}}
-      </div>
-    </div>
-  {{/let}}
-{{/each}}
\ No newline at end of file
diff --git a/ui/lib/core/addon/components/object-list-input.js b/ui/lib/core/addon/components/object-list-input.js
deleted file mode 100644
index 96fe498847509..0000000000000
--- a/ui/lib/core/addon/components/object-list-input.js
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
-import { action } from '@ember/object';
-import { tracked } from '@glimmer/tracking';
-import { assert } from '@ember/debug';
-
-/**
- * @module ObjectListInput
- * ObjectListInput components are used to render a variable number of text inputs in a single row
- * with an "Add" button at the end of the row. Clicking 'add' generates a new row of empty inputs.
- * Each input field is generated by an object in the @objectKeys array. Labels render above each column.
- * sample object:
- *   {
- *     label: 'Input label', // required key
- *     key: 'attrKey', // required key
- *     placeholder: 'Enter input here'
- *   }
- *
- * @example
- * ```js
- * <ObjectListInput @objectKeys={{this.arrayOfObjects}} @onChange={{this.handleChange}} @inputValue={{this.inputValue}}/>
- * ```
- * @param {array} objectKeys - an array of objects (sample above), the length determines the number of columns the component renders
- * @callback onChange - callback triggered when any input changes or when a row is deleted, called with array of objects containing each input's key and value ex: [ { attrKey: 'some input value' } ]
- * @param {string} [inputValue] - an array of objects to pre-fill the component inputs, key name must match objectKey[key]
- * @param {array} [validationErrors] - an array of validation objects, the index of each object corresponds to the row with an invalid input. each object has a key that matches a key in objectKeys
- * ex: (the nested object with 'errors' and 'isValid' matches the structure returned by the model validations decorator)
- *   { "attrKey": { "errors": ["Name is required."], "isValid": false } }
- */
-
-export default class ObjectListInput extends Component {
-  @tracked inputList = [];
-  @tracked inputKeys;
-  @tracked disableAdd = true;
-
-  constructor() {
-    super(...arguments);
-    const requiredKeys = ['label', 'key'];
-    this.assertKeys(this.args.objectKeys, requiredKeys);
-    this.inputKeys = this.args.objectKeys.map((e) => e.key);
-
-    if (this.args.inputValue) {
-      this.assertKeys(this.args.inputValue, this.inputKeys);
-    }
-    const emptyRow = this.createEmptyRow(this.inputKeys);
-    this.inputList = this.args.inputValue ? [...this.args.inputValue, emptyRow] : [emptyRow];
-  }
-
-  assertKeys(arrayOfObjects, requiredKeys) {
-    const argName = requiredKeys.includes('label') ? '@objectKeys' : '@inputValue';
-    return assert(
-      `objects in the ${argName} array must include keys called: ${requiredKeys.join(', ')}`,
-      arrayOfObjects.every((obj) => requiredKeys.every((k) => Object.keys(obj).includes(k)))
-    );
-  }
-
-  createEmptyRow(keys) {
-    // create a new object from input keys that have empty values
-    return Object.fromEntries(keys.map((key) => [key, '']));
-  }
-
-  @action
-  handleInput(idx, { target }) {
-    const inputObj = this.inputList.objectAt(idx);
-    inputObj[target.name] = target.value;
-    this.handleChange();
-  }
-
-  @action
-  addRow() {
-    const emptyRow = this.createEmptyRow(this.inputKeys);
-    this.inputList = [...this.inputList, emptyRow];
-    this.disableAdd = true;
-  }
-
-  @action
-  removeRow(idx) {
-    const row = this.inputList.objectAt(idx);
-    this.inputList.removeObject(row);
-    this.handleChange();
-  }
-
-  @action
-  handleChange() {
-    // disable/enable "add" button based on last row
-    const lastObject = this.inputList[this.inputList.length - 1];
-    this.disableAdd = Object.values(lastObject).any((input) => input === '') ? true : false;
-
-    // don't send an empty last object to parent
-    if (Object.values(lastObject).every((input) => input === '')) {
-      this.args.onChange(this.inputList.slice(0, -1));
-    } else {
-      this.args.onChange(this.inputList);
-    }
-  }
-}
diff --git a/ui/lib/core/addon/components/overview-card.hbs b/ui/lib/core/addon/components/overview-card.hbs
deleted file mode 100644
index 2d60a8e59c144..0000000000000
--- a/ui/lib/core/addon/components/overview-card.hbs
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="selectable-card is-rounded no-flex" data-test-selectable-card-container={{@cardTitle}}>
-  <div class="is-flex-between is-fullwidth card-details" data-test-selectable-card={{@cardTitle}}>
-    <h3 class="title is-5">{{@cardTitle}}</h3>
-    {{#if @actionText}}
-      <LinkTo
-        class="has-icon-right is-ghost is-no-underline has-text-weight-semibold"
-        @route={{@actionTo}}
-        @query={{hash @actionQuery}}
-        data-test-action-text={{@actionText}}
-      >
-        {{@actionText}}
-        <Icon @name="chevron-right" />
-      </LinkTo>
-    {{/if}}
-  </div>
-  <p class="has-text-grey is-size-8 {{unless @actionText 'has-top-margin-s'}}">{{@subText}}</p>
-  {{yield}}
-</div>
\ No newline at end of file
diff --git a/ui/lib/core/addon/components/page-header-level-left.js b/ui/lib/core/addon/components/page-header-level-left.js
new file mode 100644
index 0000000000000..4798652642ba8
--- /dev/null
+++ b/ui/lib/core/addon/components/page-header-level-left.js
@@ -0,0 +1,5 @@
+import Component from '@ember/component';
+
+export default Component.extend({
+  tagName: '',
+});
diff --git a/ui/lib/core/addon/components/page-header-level-right.js b/ui/lib/core/addon/components/page-header-level-right.js
new file mode 100644
index 0000000000000..4798652642ba8
--- /dev/null
+++ b/ui/lib/core/addon/components/page-header-level-right.js
@@ -0,0 +1,5 @@
+import Component from '@ember/component';
+
+export default Component.extend({
+  tagName: '',
+});
diff --git a/ui/lib/core/addon/components/page-header-level.hbs b/ui/lib/core/addon/components/page-header-level.hbs
deleted file mode 100644
index a72f27861b5c2..0000000000000
--- a/ui/lib/core/addon/components/page-header-level.hbs
+++ /dev/null
@@ -1,2 +0,0 @@
-{{! template-lint-disable no-yield-only }}
-{{yield}}
\ No newline at end of file
diff --git a/ui/lib/core/addon/components/page-header-top.js b/ui/lib/core/addon/components/page-header-top.js
new file mode 100644
index 0000000000000..4798652642ba8
--- /dev/null
+++ b/ui/lib/core/addon/components/page-header-top.js
@@ -0,0 +1,5 @@
+import Component from '@ember/component';
+
+export default Component.extend({
+  tagName: '',
+});
diff --git a/ui/lib/core/addon/components/page-header.hbs b/ui/lib/core/addon/components/page-header.hbs
deleted file mode 100644
index 692299acb7333..0000000000000
--- a/ui/lib/core/addon/components/page-header.hbs
+++ /dev/null
@@ -1,15 +0,0 @@
-<header class="page-header">
-  {{#if this.hasLevel}}
-    {{yield (hash top=(component "page-header-level"))}}
-    <div class="level">
-      <div class="level-left">
-        {{yield (hash levelLeft=(component "page-header-level"))}}
-      </div>
-      <div class="level-right field is-grouped">
-        {{yield (hash levelRight=(component "page-header-level"))}}
-      </div>
-    </div>
-  {{else}}
-    {{yield (hash top=(component "page-header-level"))}}
-  {{/if}}
-</header>
\ No newline at end of file
diff --git a/ui/lib/core/addon/components/page-header.js b/ui/lib/core/addon/components/page-header.js
index b012d749e3c29..0c6040701b051 100644
--- a/ui/lib/core/addon/components/page-header.js
+++ b/ui/lib/core/addon/components/page-header.js
@@ -1,12 +1,8 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
+import Component from '@ember/component';
+import layout from '../templates/components/page-header';
 
-import Component from '@glimmer/component';
-
-export default class PageHeader extends Component {
-  get hasLevel() {
-    return this.args.hasLevel === undefined ? true : this.args.hasLevel;
-  }
-}
+export default Component.extend({
+  layout,
+  tagName: '',
+  hasLevel: true,
+});
diff --git a/ui/lib/core/addon/components/page/breadcrumbs.hbs b/ui/lib/core/addon/components/page/breadcrumbs.hbs
deleted file mode 100644
index 6ed6c51b6e3b0..0000000000000
--- a/ui/lib/core/addon/components/page/breadcrumbs.hbs
+++ /dev/null
@@ -1,18 +0,0 @@
-<nav class="breadcrumb" aria-label="breadcrumbs" data-test-breadcrumbs>
-  <ul>
-    {{#each @breadcrumbs as |breadcrumb|}}
-      <li>
-        <span class="sep">/</span>
-        {{#if breadcrumb.linkExternal}}
-          <LinkToExternal @route={{breadcrumb.route}}>{{breadcrumb.label}}</LinkToExternal>
-        {{else if breadcrumb.route}}
-          <LinkTo @route={{breadcrumb.route}}>
-            {{breadcrumb.label}}
-          </LinkTo>
-        {{else}}
-          {{breadcrumb.label}}
-        {{/if}}
-      </li>
-    {{/each}}
-  </ul>
-</nav>
\ No newline at end of file
diff --git a/ui/lib/core/addon/components/page/breadcrumbs.js b/ui/lib/core/addon/components/page/breadcrumbs.js
deleted file mode 100644
index 1e8ad318c0c3e..0000000000000
--- a/ui/lib/core/addon/components/page/breadcrumbs.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
-import { assert } from '@ember/debug';
-
-/**
- * @module Page::Breadcrumbs
- * Page::Breadcrumbs components are used to display breadcrumb links. This is component will be replaced when HDS system is incorporated
- *
- * @example
- * ```js
- * <Page::Breadcrumbs @breadcrumbs={{this.breadcrumbs}}  />
- * ```
- * @param {array} breadcrumbs - array of objects with a label and route to display as breadcrumbs
- */
-
-export default class Breadcrumbs extends Component {
-  constructor() {
-    super(...arguments);
-    this.args.breadcrumbs.forEach((breadcrumb) => {
-      assert('breadcrumb has a label key', Object.keys(breadcrumb).includes('label'));
-    });
-  }
-}
diff --git a/ui/lib/core/addon/components/page/error.hbs b/ui/lib/core/addon/components/page/error.hbs
deleted file mode 100644
index b69dc7e8c7ee6..0000000000000
--- a/ui/lib/core/addon/components/page/error.hbs
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="box is-sideless has-background-white-bis has-text-grey has-text-centered has-tall-padding" data-test-page-error>
-  {{#if (eq @error.httpStatus 404)}}
-    <h1 class="title is-3 has-text-grey">
-      404 Not Found
-    </h1>
-    <p>Sorry, we were unable to find any content at <code>{{@error.path}}</code>.</p>
-  {{else if (eq @error.httpStatus 403)}}
-    <h1 class="title is-3 has-text-grey">
-      Not authorized
-    </h1>
-    <p>You are not authorized to access content at <code>{{@error.path}}</code>.</p>
-  {{else}}
-    <h1 class="title is-3 has-text-grey">
-      Error
-    </h1>
-    <p>
-      {{#if @error.message}}
-        <p data-test-page-error-message>{{@error.message}}</p>
-      {{/if}}
-      {{#each @error.errors as |error index|}}
-        <p data-test-page-error-details={{index}}>{{error}}</p>
-      {{/each}}
-    </p>
-  {{/if}}
-</div>
\ No newline at end of file
diff --git a/ui/lib/core/addon/components/popup-menu.hbs b/ui/lib/core/addon/components/popup-menu.hbs
deleted file mode 100644
index 7dee271b477ce..0000000000000
--- a/ui/lib/core/addon/components/popup-menu.hbs
+++ /dev/null
@@ -1,16 +0,0 @@
-<span>
-  <BasicDropdown class="popup-menu" horizontalPosition="auto-right" verticalPosition="below" onOpen={{@onOpen}} as |d|>
-    <d.Trigger
-      @htmlTag="button"
-      class={{concat "popup-menu-trigger button is-ghost" (if d.isOpen " is-active")}}
-      data-test-popup-menu-trigger
-    >
-      <Icon @name="more-horizontal" class="has-text-black auto-width" aria-label="More options" />
-    </d.Trigger>
-    <d.Content @defaultClass={{concat "popup-menu-content " @contentClass}}>
-      <div class="box">
-        {{yield}}
-      </div>
-    </d.Content>
-  </BasicDropdown>
-</span>
\ No newline at end of file
diff --git a/ui/lib/core/addon/components/popup-menu.js b/ui/lib/core/addon/components/popup-menu.js
new file mode 100644
index 0000000000000..916cfb8439a5c
--- /dev/null
+++ b/ui/lib/core/addon/components/popup-menu.js
@@ -0,0 +1,21 @@
+import Component from '@ember/component';
+import layout from '../templates/components/popup-menu';
+
+/**
+ * @module PopupMenu
+ * `PopupMenu` displays a button that when pressed will toggle open a menu that is yielded in the content
+ * block.
+ *
+ * @example
+ * ```js
+ * <PopupMenu><nav class="menu"> <ul class="menu-list"> <li class="action"> <button type="button">A menu!</button> </li> </ul> </nav></PopupMenu>
+ * ```
+ *
+ * @param contentClass=''{String} A class that will be applied to the yielded content of the popup.
+ */
+
+export default Component.extend({
+  layout,
+  contentClass: '',
+  tagName: 'span',
+});
diff --git a/ui/lib/core/addon/components/read-more.js b/ui/lib/core/addon/components/read-more.js
index ba259fc2cf8b3..7b53df2d68150 100644
--- a/ui/lib/core/addon/components/read-more.js
+++ b/ui/lib/core/addon/components/read-more.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import layout from '../templates/components/read-more';
 import { setComponentTemplate } from '@ember/component';
diff --git a/ui/lib/core/addon/components/readonly-form-field.js b/ui/lib/core/addon/components/readonly-form-field.js
index 5f6ca2b7ac52d..181a937dcced1 100644
--- a/ui/lib/core/addon/components/readonly-form-field.js
+++ b/ui/lib/core/addon/components/readonly-form-field.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /**
  * @module ReadonlyFormField
  * ReadonlyFormField components are used to...
diff --git a/ui/lib/core/addon/components/replication-action-demote.js b/ui/lib/core/addon/components/replication-action-demote.js
index 9c07c90b1ea8c..2281722f6e50c 100644
--- a/ui/lib/core/addon/components/replication-action-demote.js
+++ b/ui/lib/core/addon/components/replication-action-demote.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Actions from 'core/components/replication-actions-single';
 import layout from '../templates/components/replication-action-demote';
 
diff --git a/ui/lib/core/addon/components/replication-action-disable.js b/ui/lib/core/addon/components/replication-action-disable.js
index a0bf58363c132..69ac63563ca73 100644
--- a/ui/lib/core/addon/components/replication-action-disable.js
+++ b/ui/lib/core/addon/components/replication-action-disable.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Actions from 'core/components/replication-actions-single';
 import layout from '../templates/components/replication-action-disable';
 
diff --git a/ui/lib/core/addon/components/replication-action-generate-token.js b/ui/lib/core/addon/components/replication-action-generate-token.js
index 15a241128549f..5e3fda8b0398b 100644
--- a/ui/lib/core/addon/components/replication-action-generate-token.js
+++ b/ui/lib/core/addon/components/replication-action-generate-token.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Actions from './replication-actions-single';
 import layout from '../templates/components/replication-action-generate-token';
 
diff --git a/ui/lib/core/addon/components/replication-action-promote.js b/ui/lib/core/addon/components/replication-action-promote.js
index 48c810152be95..d93f1dda055c8 100644
--- a/ui/lib/core/addon/components/replication-action-promote.js
+++ b/ui/lib/core/addon/components/replication-action-promote.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Actions from './replication-actions-single';
 import layout from '../templates/components/replication-action-promote';
 
diff --git a/ui/lib/core/addon/components/replication-action-recover.js b/ui/lib/core/addon/components/replication-action-recover.js
index 3ffe17e8bad53..243c18fe2ce49 100644
--- a/ui/lib/core/addon/components/replication-action-recover.js
+++ b/ui/lib/core/addon/components/replication-action-recover.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Actions from 'core/components/replication-actions-single';
 import layout from '../templates/components/replication-action-recover';
 
diff --git a/ui/lib/core/addon/components/replication-action-reindex.js b/ui/lib/core/addon/components/replication-action-reindex.js
index 49285c9562749..b66f44e82b569 100644
--- a/ui/lib/core/addon/components/replication-action-reindex.js
+++ b/ui/lib/core/addon/components/replication-action-reindex.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Actions from 'core/components/replication-actions-single';
 import layout from '../templates/components/replication-action-reindex';
 
diff --git a/ui/lib/core/addon/components/replication-action-update-primary.js b/ui/lib/core/addon/components/replication-action-update-primary.js
index 8aff95c874252..f10cf4f94f711 100644
--- a/ui/lib/core/addon/components/replication-action-update-primary.js
+++ b/ui/lib/core/addon/components/replication-action-update-primary.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Actions from './replication-actions-single';
 import layout from '../templates/components/replication-action-update-primary';
 
diff --git a/ui/lib/core/addon/components/replication-actions-single.js b/ui/lib/core/addon/components/replication-actions-single.js
index 3ecd710f71909..b922c382a9aeb 100644
--- a/ui/lib/core/addon/components/replication-actions-single.js
+++ b/ui/lib/core/addon/components/replication-actions-single.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@ember/component';
 
 export default Component.extend({
diff --git a/ui/lib/core/addon/components/replication-actions.js b/ui/lib/core/addon/components/replication-actions.js
index caf4d1d0629c6..25d0b7fd56efc 100644
--- a/ui/lib/core/addon/components/replication-actions.js
+++ b/ui/lib/core/addon/components/replication-actions.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { alias } from '@ember/object/computed';
 import Component from '@ember/component';
 import ReplicationActions from 'core/mixins/replication-actions';
diff --git a/ui/lib/core/addon/components/replication-dashboard.js b/ui/lib/core/addon/components/replication-dashboard.js
index 1993c6d578262..ddb1a4ae837be 100644
--- a/ui/lib/core/addon/components/replication-dashboard.js
+++ b/ui/lib/core/addon/components/replication-dashboard.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@ember/component';
 import { computed } from '@ember/object';
 import { clusterStates } from 'core/helpers/cluster-states';
@@ -86,7 +81,7 @@ export default Component.extend({
       // when DR and Performance is enabled on the same cluster,
       // the states should always be the same
       // we are leaving this console log statement to be sure
-      console.log('DR State: ', drState, 'Performance State: ', performanceState); // eslint-disable-line
+      console.log('DR State: ', drState, 'Performance State: ', performanceState);
     }
 
     return drState;
diff --git a/ui/lib/core/addon/components/replication-doc-link.js b/ui/lib/core/addon/components/replication-doc-link.js
new file mode 100644
index 0000000000000..af4f814a4ab2b
--- /dev/null
+++ b/ui/lib/core/addon/components/replication-doc-link.js
@@ -0,0 +1,17 @@
+import Component from '@ember/component';
+import layout from '../templates/components/replication-doc-link';
+
+/**
+ * @module ReplicationDocLink
+ * The `ReplicationDocLink` component is a learn link with helper text used on the Replication Dashboards.
+ * The link takes you to the key monitoring metrics learn doc.
+ *
+ * @example
+ * ```js
+ * <ReplicationDocLink />
+ * ```
+ */
+
+export default Component.extend({
+  layout,
+});
diff --git a/ui/lib/core/addon/components/replication-header.js b/ui/lib/core/addon/components/replication-header.js
index f6c29e4569ab5..829950f71c672 100644
--- a/ui/lib/core/addon/components/replication-header.js
+++ b/ui/lib/core/addon/components/replication-header.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@ember/component';
 import layout from '../templates/components/replication-header';
 
diff --git a/ui/lib/core/addon/components/replication-mode-summary.js b/ui/lib/core/addon/components/replication-mode-summary.js
index 8a7c7147c2aa1..b745c9149ea1a 100644
--- a/ui/lib/core/addon/components/replication-mode-summary.js
+++ b/ui/lib/core/addon/components/replication-mode-summary.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import { equal } from '@ember/object/computed';
 import { get, computed } from '@ember/object';
diff --git a/ui/lib/core/addon/components/replication-page.js b/ui/lib/core/addon/components/replication-page.js
index 89b1a2b340c8d..354c0dc6f964e 100644
--- a/ui/lib/core/addon/components/replication-page.js
+++ b/ui/lib/core/addon/components/replication-page.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@ember/component';
 import { computed } from '@ember/object';
 import layout from '../templates/components/replication-page';
@@ -112,7 +107,7 @@ export default Component.extend({
       return;
     }
     if (isSummaryDashboard) {
-      const combinedObject = {};
+      let combinedObject = {};
       combinedObject.dr = model['dr'];
       combinedObject.performance = model['performance'];
       return combinedObject;
diff --git a/ui/lib/core/addon/components/replication-secondary-card.js b/ui/lib/core/addon/components/replication-secondary-card.js
index 6d6be25dddee9..a5eab99c3a07a 100644
--- a/ui/lib/core/addon/components/replication-secondary-card.js
+++ b/ui/lib/core/addon/components/replication-secondary-card.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { equal, reads } from '@ember/object/computed';
 import Component from '@ember/component';
 import { computed } from '@ember/object';
diff --git a/ui/lib/core/addon/components/replication-summary-card.js b/ui/lib/core/addon/components/replication-summary-card.js
index ffab4c31fb058..d99ce2fe49596 100644
--- a/ui/lib/core/addon/components/replication-summary-card.js
+++ b/ui/lib/core/addon/components/replication-summary-card.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@ember/component';
 import { computed } from '@ember/object';
 import layout from '../templates/components/replication-summary-card';
diff --git a/ui/lib/core/addon/components/replication-table-rows.js b/ui/lib/core/addon/components/replication-table-rows.js
index fbaa296aa544d..e3bf1e8f2feb0 100644
--- a/ui/lib/core/addon/components/replication-table-rows.js
+++ b/ui/lib/core/addon/components/replication-table-rows.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { reads } from '@ember/object/computed';
 import Component from '@ember/component';
 import { computed } from '@ember/object';
diff --git a/ui/lib/core/addon/components/search-select-placeholder.hbs b/ui/lib/core/addon/components/search-select-placeholder.hbs
deleted file mode 100644
index 60ed981b7dfc4..0000000000000
--- a/ui/lib/core/addon/components/search-select-placeholder.hbs
+++ /dev/null
@@ -1,8 +0,0 @@
-<div>
-  <div class="field">
-    <p class="control has-icons-left has-icons-right">
-      <span class="input has-text-grey-light">{{or @placeholder "Search"}}</span>
-      <Icon @name="search" class="search-icon has-text-grey-light" />
-    </p>
-  </div>
-</div>
\ No newline at end of file
diff --git a/ui/lib/core/addon/components/search-select-placeholder.js b/ui/lib/core/addon/components/search-select-placeholder.js
new file mode 100644
index 0000000000000..cf5e49baff5f8
--- /dev/null
+++ b/ui/lib/core/addon/components/search-select-placeholder.js
@@ -0,0 +1,6 @@
+import Component from '@ember/component';
+import layout from '../templates/components/search-select-placeholder';
+
+export default Component.extend({
+  layout,
+});
diff --git a/ui/lib/core/addon/components/search-select-with-modal.hbs b/ui/lib/core/addon/components/search-select-with-modal.hbs
index efe6247bde26e..600ba810695ac 100644
--- a/ui/lib/core/addon/components/search-select-with-modal.hbs
+++ b/ui/lib/core/addon/components/search-select-with-modal.hbs
@@ -1,24 +1,18 @@
-<div
-  {{did-insert (perform this.fetchOptions)}}
-  id={{@id}}
-  class="field search-select {{if @displayInherit 'display-inherit'}}"
-  data-test-search-select-with-modal
-  ...attributes
->
+<div {{did-insert this.fetchOptions}} ...attributes data-test-search-select-with-modal>
   {{#if this.shouldUseFallback}}
     {{component
       @fallbackComponent
-      label=@label
+      label=(or @label @subLabel)
       subText=@subText
       onChange=@onChange
       inputValue=@inputValue
       helpText=@helpText
-      placeholder=@placeholder
+      placeHolder=@placeHolder
       id=@id
     }}
   {{else}}
     {{#if @label}}
-      <label for={{@id}} class={{or @labelClass "is-label"}} data-test-field-label>
+      <label for={{@id}} class="is-label" data-test-field-label>
         {{@label}}
         {{#if @helpText}}
           <InfoTooltip>{{@helpText}}</InfoTooltip>
@@ -26,15 +20,16 @@
       </label>
     {{/if}}
     {{#if @subText}}
-      <p data-test-modal-subtext class="sub-text">{{@subText}}</p>
+      <p class="sub-text">{{@subText}}</p>
     {{/if}}
-    {{#unless this.hidePowerSelect}}
+    {{! template-lint-configure simple-unless "warn" }}
+    {{#unless (gte this.selectedOptions.length @selectLimit)}}
       <PowerSelect
         @eventType="click"
         @placeholder={{@placeholder}}
         @searchEnabled={{true}}
         @search={{this.searchAndSuggest}}
-        @options={{this.dropdownOptions}}
+        @options={{this.allOptions}}
         @onChange={{this.selectOrCreate}}
         @placeholderComponent={{component "search-select-placeholder"}}
         @verticalPosition="below"
@@ -42,22 +37,20 @@
       >
         {{#if this.shouldRenderName}}
           {{option.name}}
-          {{#unless option.__isSuggestion__}}
-            <small class="search-select-list-key" data-test-smaller-id="true">
-              {{option.id}}
-            </small>
-          {{/unless}}
+          <small class="search-select-list-key" data-test-smaller-id="true">
+            {{option.id}}
+          </small>
         {{else}}
           {{option.id}}
         {{/if}}
       </PowerSelect>
     {{/unless}}
     <ul class="search-select-list">
-      {{#each this.selectedOptions as |selected index|}}
-        <li class="search-select-list-item" data-test-selected-option={{index}}>
+      {{#each this.selectedOptions as |selected|}}
+        <li class="search-select-list-item" data-test-selected-option="true">
           {{#if this.shouldRenderName}}
             {{selected.name}}
-            <small class="search-select-list-key" data-test-smaller-id={{index}}>
+            <small class="search-select-list-key" data-test-smaller-id="true">
               {{selected.id}}
             </small>
           {{else}}
@@ -80,9 +73,7 @@
     </ul>
 
   {{/if}}
-
-  {{! wait until user has selected 'create a new item' before rendering modal}}
-  {{#if this.nameInput}}
+  {{#if this.newModelRecord}}
     <Modal
       @title="Create new {{singularize @id}}"
       @onClose={{action (mut this.showModal) false}}
@@ -91,17 +82,21 @@
       @showCloseButton={{false}}
     >
       <section class="modal-card-body">
-        {{#if @modalSubtext}}
-          <p class="has-bottom-margin-s" data-test-modal-subtext>
-            {{@modalSubtext}}
-          </p>
-        {{/if}}
+        <p class="has-bottom-margin-s" data-test-modal-subtext>
+          {{@modalSubtext}}
+        </p>
         {{#if (has-block)}}
           {{yield}}
         {{else}}
-          {{! dynamically render template from modal-form/ folder}}
+          {{! dynamically render passed in form component }}
           {{! form must receive an @onSave and @onCancel arg that executes the callback}}
-          {{component @modalFormTemplate nameInput=this.nameInput onSave=this.resetModal onCancel=this.resetModal}}
+          {{component
+            @modalFormComponent
+            model=this.newModelRecord
+            onSave=this.resetModal
+            onCancel=this.resetModal
+            isInline=true
+          }}
         {{/if}}
       </section>
     </Modal>
diff --git a/ui/lib/core/addon/components/search-select-with-modal.js b/ui/lib/core/addon/components/search-select-with-modal.js
index 77b95a8223e60..81f5bfb83c043 100644
--- a/ui/lib/core/addon/components/search-select-with-modal.js
+++ b/ui/lib/core/addon/components/search-select-with-modal.js
@@ -1,157 +1,150 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 import { tracked } from '@glimmer/tracking';
-import { task } from 'ember-concurrency';
+import { singularize } from 'ember-inflector';
+import { resolve } from 'rsvp';
 import { filterOptions, defaultMatcher } from 'ember-power-select/utils/group-utils';
 
 /**
  * @module SearchSelectWithModal
- * The `SearchSelectWithModal` is an implementation of the [ember-power-select](https://github.com/cibernox/ember-power-select) used for form elements where options come dynamically from the API.
- * It renders a passed template component that parents a form so records can be created inline, via a modal that pops up after clicking 'No results found for "${term}". Click here to create it.' from the dropdown menu.
- * **!! NOTE: any form passed must be able to receive an @onSave and @onCancel arg so that the modal will close properly. See `oidc/client-form.hbs` that renders a modal for the `oidc-assignment-template.hbs` as an example.
+ * The `SearchSelectWithModal` is an implementation of the [ember-power-select](https://github.com/cibernox/ember-power-select) used for form elements where options come dynamically from the API. It can only accept a single model.
+ * It renders a passed in form component so records can be created inline, via a modal that pops up after clicking "Create new <id>" from the dropdown menu.
+ * **!! NOTE: any form passed must be able to receive an @onSave and @onCancel arg so that the modal will close properly. See `oidc/client-form.hbs` that renders a modal for the `oidc/assignment-form.hbs` as an example.
  * @example
  * <SearchSelectWithModal
- *   @id="assignments"
- *   @models={{array "oidc/assignment"}}
- *   @label="assignment name"
- *   @subText="Search for an existing assignment, or type a new name to create it."
- *   @inputValue={{map-by "id" @model.assignments}}
- *   @onChange={{this.handleSearchSelect}}
- *   {{! since this is the "limited" radio select option we do not want to include 'allow_all' }}
- *   @excludeOptions={{array "allow_all"}}
- *   @fallbackComponent="string-list"
- *   @modalFormTemplate="modal-form/some-template"
- *   @modalSubtext="Use assignment to specify which Vault entities and groups are allowed to authenticate."
- * />
+ *         @id="assignments"
+ *         @model="oidc/assignment"
+ *         @label="assignment name"
+ *         @labelClass="is-label"
+ *         @subText="Search for an existing assignment, or type a new name to create it."
+ *         @inputValue={{map-by "id" @model.assignments}}
+ *         @onChange={{this.handleSearchSelect}}
+ *         {{! since this is the "limited" radio select option we do not want to include 'allow_all' }}
+ *         @excludeOptions={{array "allow_all"}}
+ *         @fallbackComponent="string-list"
+ *         @modalFormComponent="oidc/assignment-form"
+ *         @modalSubtext="Use assignment to specify which Vault entities and groups are allowed to authenticate."
+ *       />
  *
- // * component functionality
- * @param {function} onChange - The onchange action for this form field. ** SEE UTIL ** search-select-has-many.js if selecting models from a hasMany relationship
- * @param {array} [inputValue] - Array of strings corresponding to the input's initial value, e.g. an array of model ids that on edit will appear as selected items below the input
- * @param {boolean} [shouldRenderName=false] - By default an item's id renders in the dropdown, `true` displays the name with its id in smaller text beside it *NOTE: the boolean flips automatically with 'identity' models
- * @param {array} [excludeOptions] - array of strings containing model ids to filter from the dropdown (ex: ['allow_all'])
-
-// * query params for dropdown items
- * @param {array} models - models to fetch from API. models with varying permissions should be ordered from least restricted to anticipated most restricted (ex. if one model is an enterprise only feature, pass it in last)
-
- // * template only/display args
- * @param {string} id - The name of the form field
- * @param {string} [label] - Label appears above the form field
- * @param {string} [labelClass] - overwrite default label size (14px) from class="is-label"
+ * @param {string} id - the model's attribute for the form field, will be interpolated into create new text: `Create new ${singularize(this.args.id)}`
+ * @param {Array} model - model type to fetch from API (can only be a single model)
+ * @param {string} label - Label that appears above the form field
  * @param {string} [helpText] - Text to be displayed in the info tooltip for this form field
  * @param {string} [subText] - Text to be displayed below the label
- * @param {string} fallbackComponent - name of component to be rendered if the API call 403s
  * @param {string} [placeholder] - placeholder text to override the default text of "Search"
- * @param {boolean} [displayInherit=false] - if you need the search select component to display inherit instead of box.
+ * @param {function} onChange - The onchange action for this form field. ** SEE UTIL ** search-select-has-many.js if selecting models from a hasMany relationship
+ * @param {string | Array} inputValue -  A comma-separated string or an array of strings -- array of ids for models.
+ * @param {string} fallbackComponent - name of component to be rendered if the API returns a 403s
+ * @param {boolean} [passObject=false] - When true, the onChange callback returns an array of objects with id (string) and isNew (boolean)
+ * @param {number} [selectLimit] - A number that sets the limit to how many select options they can choose
+ * @param {array} [excludeOptions] - array of strings containing model ids to filter from the dropdown (ex: ['allow_all'])
+ * @param {function} search - *Advanced usage* - Customizes how the power-select component searches for matches -
+ * see the power-select docs for more information.
+ *
  */
 export default class SearchSelectWithModal extends Component {
   @service store;
-  @tracked shouldUseFallback = false;
-  @tracked selectedOptions = []; // list of selected options
-  @tracked dropdownOptions = []; // options that will render in dropdown, updates as selections are added/discarded
+
+  @tracked selectedOptions = null; // list of selected options
+  @tracked allOptions = null; // all possible options
   @tracked showModal = false;
-  @tracked nameInput = null;
+  @tracked newModelRecord = null;
+  @tracked shouldUseFallback = false;
 
-  get hidePowerSelect() {
-    return this.selectedOptions.length >= this.args.selectLimit;
+  constructor() {
+    super(...arguments);
+    this.selectedOptions = this.inputValue;
   }
 
-  get shouldRenderName() {
-    return this.args.models?.some((model) => model.includes('identity')) || this.args.shouldRenderName
-      ? true
-      : false;
+  get inputValue() {
+    return this.args.inputValue || [];
   }
 
-  addSearchText(optionsToFormat) {
-    // maps over array models from query
-    return optionsToFormat.toArray().map((option) => {
-      option.searchText = `${option.name} ${option.id}`;
-      return option;
-    });
+  get shouldRenderName() {
+    return this.args.shouldRenderName || false;
   }
 
-  formatInputAndUpdateDropdown(inputValues) {
-    // inputValues are initially an array of strings from @inputValue
-    // map over so selectedOptions are objects
-    return inputValues.map((option) => {
-      const matchingOption = this.dropdownOptions.findBy('id', option);
-      // remove any matches from dropdown list
-      this.dropdownOptions.removeObject(matchingOption);
-      return {
-        id: option,
-        name: matchingOption ? matchingOption.name : option,
-        searchText: matchingOption ? matchingOption.searchText : option,
-      };
-    });
+  get excludeOptions() {
+    return this.args.excludeOptions || null;
   }
 
-  @task
-  *fetchOptions() {
-    this.dropdownOptions = []; // reset dropdown anytime we re-fetch
-    if (!this.args.models) {
-      return;
-    }
+  get passObject() {
+    return this.args.passObject || false;
+  }
 
-    for (const modelType of this.args.models) {
-      try {
-        // fetch options from the store
-        let options = yield this.store.query(modelType, {});
-        if (this.args.excludeOptions) {
-          options = options.filter((o) => !this.args.excludeOptions.includes(o.id));
-        }
-        // add to dropdown options
-        this.dropdownOptions = [...this.dropdownOptions, ...this.addSearchText(options)];
-      } catch (err) {
-        if (err.httpStatus === 404) {
-          // continue to query other models even if one 404s
-          // and so selectedOptions will be set after for loop
-          continue;
-        }
-        if (err.httpStatus === 403) {
-          // when multiple models are passed in, don't use fallback if the first query is successful
-          // (i.e. policies ['acl', 'rgp'] - rgp policies are ENT only so will always fail on OSS)
-          if (this.dropdownOptions.length > 0 && this.args.models.length > 1) continue;
-          this.shouldUseFallback = true;
-          return;
+  @action
+  async fetchOptions() {
+    try {
+      let queryOptions = {};
+      let options = await this.store.query(this.args.model, queryOptions);
+      this.formatOptions(options);
+    } catch (err) {
+      if (err.httpStatus === 404) {
+        if (!this.allOptions) {
+          // If the call failed but the resource has items
+          // from a different namespace, this allows the
+          // selected items to display
+          this.allOptions = [];
         }
-        throw err;
+        return;
+      }
+      if (err.httpStatus === 403) {
+        this.shouldUseFallback = true;
+        return;
       }
+      throw err;
     }
+  }
+  formatOptions(options) {
+    options = options.toArray();
+    if (this.excludeOptions) {
+      options = options.filter((o) => !this.excludeOptions.includes(o.id));
+    }
+    options = options.map((option) => {
+      option.searchText = `${option.name} ${option.id}`;
+      return option;
+    });
 
-    // after all models are queried, set selectedOptions and remove matches from dropdown list
-    this.selectedOptions = this.args.inputValue
-      ? this.formatInputAndUpdateDropdown(this.args.inputValue)
-      : [];
+    if (this.selectedOptions.length > 0) {
+      this.selectedOptions = this.selectedOptions.map((option) => {
+        let matchingOption = options.findBy('id', option);
+        options.removeObject(matchingOption);
+        return {
+          id: option,
+          name: matchingOption ? matchingOption.name : option,
+          searchText: matchingOption ? matchingOption.searchText : option,
+        };
+      });
+    }
+    this.allOptions = options;
   }
 
-  @action
   handleChange() {
     if (this.selectedOptions.length && typeof this.selectedOptions.firstObject === 'object') {
-      this.args.onChange(Array.from(this.selectedOptions, (option) => option.id));
+      if (this.passObject) {
+        this.args.onChange(
+          Array.from(this.selectedOptions, (option) => ({ id: option.id, isNew: !!option.new }))
+        );
+      } else {
+        this.args.onChange(Array.from(this.selectedOptions, (option) => option.id));
+      }
     } else {
       this.args.onChange(this.selectedOptions);
     }
   }
-
-  shouldShowCreate(id, searchResults) {
-    if (searchResults && searchResults.length && searchResults.firstObject.groupName) {
-      return !searchResults.some((group) => group.options.findBy('id', id));
+  shouldShowCreate(id, options) {
+    if (options && options.length && options.firstObject.groupName) {
+      return !options.some((group) => group.options.findBy('id', id));
     }
-    const existingOption =
-      this.dropdownOptions &&
-      (this.dropdownOptions.findBy('id', id) || this.dropdownOptions.findBy('name', id));
+    let existingOption =
+      this.allOptions && (this.allOptions.findBy('id', id) || this.allOptions.findBy('name', id));
     return !existingOption;
   }
-
-  // ----- adapted from ember-power-select-with-create
+  //----- adapted from ember-power-select-with-create
   addCreateOption(term, results) {
     if (this.shouldShowCreate(term, results)) {
-      const name = `No results found for "${term}". Click here to create it.`;
+      const name = `Create new ${singularize(this.args.id)}: ${term}`;
       const suggestion = {
         __isSuggestion__: true,
         __value__: term,
@@ -161,44 +154,51 @@ export default class SearchSelectWithModal extends Component {
       results.unshift(suggestion);
     }
   }
-
   filter(options, searchText) {
     const matcher = (option, text) => defaultMatcher(option.searchText, text);
     return filterOptions(options || [], searchText, matcher);
   }
   // -----
+
   @action
   discardSelection(selected) {
     this.selectedOptions.removeObject(selected);
-    this.dropdownOptions.pushObject(selected);
+    this.allOptions.pushObject(selected);
     this.handleChange();
   }
-
   // ----- adapted from ember-power-select-with-create
   @action
-  searchAndSuggest(term) {
+  searchAndSuggest(term, select) {
     if (term.length === 0) {
-      return this.dropdownOptions;
+      return this.allOptions;
     }
-    if (this.args.models?.some((model) => model.includes('policy'))) {
-      term = term.toLowerCase();
+    if (this.search) {
+      return resolve(this.search(term, select)).then((results) => {
+        if (results.toArray) {
+          results = results.toArray();
+        }
+        this.addCreateOption(term, results);
+        return results;
+      });
     }
-    const newOptions = this.filter(this.dropdownOptions, term);
+    const newOptions = this.filter(this.allOptions, term);
     this.addCreateOption(term, newOptions);
     return newOptions;
   }
-
   @action
-  selectOrCreate(selection) {
+  async selectOrCreate(selection) {
+    // if creating we call handleChange in the resetModal action to ensure the model is valid and successfully created
+    // before adding it to the DOM (and parent model)
+    // if just selecting, then we handleChange immediately
     if (selection && selection.__isSuggestion__) {
-      // user has clicked to create a new item
-      // wait to handleChange below in resetModal
-      this.nameInput = selection.__value__; // input is passed to form component
+      const name = selection.__value__;
       this.showModal = true;
+      let createRecord = await this.store.createRecord(this.args.model);
+      createRecord.name = name;
+      this.newModelRecord = createRecord;
     } else {
-      // user has selected an existing item, handleChange immediately
       this.selectedOptions.pushObject(selection);
-      this.dropdownOptions.removeObject(selection);
+      this.allOptions.removeObject(selection);
       this.handleChange();
     }
   }
@@ -206,13 +206,12 @@ export default class SearchSelectWithModal extends Component {
 
   @action
   resetModal(model) {
-    // resetModal fires when the form component calls onSave or onCancel
     this.showModal = false;
     if (model && model.currentState.isSaved) {
       const { name } = model;
       this.selectedOptions.pushObject({ name, id: name });
       this.handleChange();
     }
-    this.nameInput = null;
+    this.newModelRecord = null;
   }
 }
diff --git a/ui/lib/core/addon/components/search-select.hbs b/ui/lib/core/addon/components/search-select.hbs
deleted file mode 100644
index e0621d9d177f0..0000000000000
--- a/ui/lib/core/addon/components/search-select.hbs
+++ /dev/null
@@ -1,101 +0,0 @@
-<div
-  {{did-insert (perform this.fetchOptions)}}
-  {{did-update (perform this.fetchOptions) (or @options @models)}}
-  id={{@id}}
-  class="field search-select {{if @displayInherit 'display-inherit'}}"
-  data-test-component="search-select"
-  ...attributes
->
-  {{#if this.shouldUseFallback}}
-    {{component
-      @fallbackComponent
-      id=@id
-      label=@label
-      subText=@subText
-      onChange=@onChange
-      inputValue=@inputValue
-      helpText=@helpText
-      placeholder=@placeholder
-    }}
-  {{else}}
-    {{#if @label}}
-      <label for={{@id}} class={{or @labelClass "is-label"}} data-test-field-label>
-        {{@label}}
-        {{#if @helpText}}
-          <InfoTooltip>{{@helpText}}</InfoTooltip>
-        {{/if}}
-      </label>
-    {{/if}}
-    {{#if @subText}}
-      <p class="sub-text">{{@subText}}</p>
-    {{/if}}
-    {{#unless this.hidePowerSelect}}
-      <PowerSelect
-        @eventType="click"
-        @placeholder={{@placeholder}}
-        @searchEnabled={{true}}
-        @search={{this.searchAndSuggest}}
-        @options={{this.dropdownOptions}}
-        @onChange={{this.selectOrCreate}}
-        @placeholderComponent={{component "search-select-placeholder"}}
-        @verticalPosition="below"
-        @disabled={{@disabled}}
-        as |option|
-      >
-        {{#if this.shouldRenderName}}
-          {{get option this.nameKey}}
-          <small class="search-select-list-key" data-test-smaller-id="true">
-            {{get option this.idKey}}
-          </small>
-        {{else}}
-          {{get option this.idKey}}
-        {{/if}}
-      </PowerSelect>
-    {{/unless}}
-    <ul class="search-select-list">
-      {{#each this.selectedOptions as |selected index|}}
-        <li class="search-select-list-item" data-test-selected-option={{index}}>
-          {{#if (and this.shouldRenderName (get selected this.nameKey))}}
-            {{get selected this.nameKey}}
-            <small class="search-select-list-key" data-test-smaller-id={{index}}>
-              {{get selected this.idKey}}
-            </small>
-          {{else}}
-            <div>
-              {{selected.id}}
-              {{#if @wildcardLabel}}
-                {{#if (is-wildcard-string selected.id)}}
-                  {{#let (filter-wildcard selected this.allOptions) as |wildcardCount|}}
-                    <span class="tag is-light has-text-grey-dark" data-test-count={{wildcardCount}}>
-                      includes
-                      {{wildcardCount}}
-                      {{if (eq wildcardCount 1) @wildcardLabel (pluralize @wildcardLabel)}}
-                    </span>
-                  {{/let}}
-                {{/if}}
-              {{/if}}
-            </div>
-          {{/if}}
-          <div class="control">
-            {{#if selected.addTooltip}}
-              <InfoTooltip>
-                {{selected.addTooltip}}
-              </InfoTooltip>
-            {{/if}}
-            <button
-              type="button"
-              class="button is-ghost"
-              data-test-selected-list-button="delete"
-              {{on "click" (fn this.discardSelection selected)}}
-            >
-              <Icon @name="trash" class="has-text-grey" />
-            </button>
-          </div>
-        </li>
-      {{/each}}
-    </ul>
-    {{#if (has-block)}}
-      {{yield}}
-    {{/if}}
-  {{/if}}
-</div>
\ No newline at end of file
diff --git a/ui/lib/core/addon/components/search-select.js b/ui/lib/core/addon/components/search-select.js
index 9e5e1e31d14f4..48901bf47b62f 100644
--- a/ui/lib/core/addon/components/search-select.js
+++ b/ui/lib/core/addon/components/search-select.js
@@ -1,223 +1,179 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
+import Component from '@ember/component';
 import { inject as service } from '@ember/service';
 import { task } from 'ember-concurrency';
-import { action } from '@ember/object';
-import { tracked } from '@glimmer/tracking';
+import { computed } from '@ember/object';
+import { singularize } from 'ember-inflector';
 import { resolve } from 'rsvp';
 import { filterOptions, defaultMatcher } from 'ember-power-select/utils/group-utils';
+import layout from '../templates/components/search-select';
+import { isWildcardString } from 'vault/helpers/is-wildcard-string';
+
 /**
  * @module SearchSelect
  * The `SearchSelect` is an implementation of the [ember-power-select](https://github.com/cibernox/ember-power-select) used for form elements where options come dynamically from the API.
  * @example
- *  <SearchSelect
- *    @id="policy"
- *    @models={{array "policies/acl"}}
- *    @onChange={{this.onChange}}
- *    @inputValue={{get @model this.valuePath}}
- *    @wildcardLabel="role"
- *    @fallbackComponent="string-list"
- *    @selectLimit={{1}}
- *    @backend={{@model.backend}}
- *    @disallowNewItems={{true}}
- *    class={{if this.validationError "dropdown-has-error-border"}}
- * />
+ * <SearchSelect @id="group-policies" @models={{["policies/acl"]}} @onChange={{onChange}} @selectLimit={{2}} @inputValue={{get model valuePath}} @helpText="Policies associated with this group" @label="Policies" @fallbackComponent="string-list" />
  *
- // * component functionality
- * @param {function} onChange - The onchange action for this form field. ** SEE UTIL ** search-select-has-many.js if selecting models from a hasMany relationship
- * @param {array} [inputValue] - Array of strings corresponding to the input's initial value, e.g. an array of model ids that on edit will appear as selected items below the input
- * @param {boolean} [disallowNewItems=false] - Controls whether or not the user can add a new item if none found
- * @param {boolean} [shouldRenderName=false] - By default an item's id renders in the dropdown, `true` displays the name with its id in smaller text beside it *NOTE: the boolean flips automatically with 'identity' models or if this.idKey !== 'id'
- * @param {string} [nameKey="name"] - if shouldRenderName=true, you can use this arg to specify which key to use for the rendered name. Defaults to "name".
- * @param {array} [parentManageSelected] - Array of selected items if the parent is keeping track of selections, see mfa-login-enforcement-form.js
- * @param {boolean} [passObject=false] - When true, the onChange callback returns an array of objects with id (string) and isNew (boolean) (and any params from objectKeys). By default - onChange returns an array of id strings.
- * @param {array} [objectKeys] - Array of values that correlate to model attrs. Used to render attr other than 'id' beside the name if shouldRenderName=true. If passObject=true, objectKeys are added to the passed, selected object.
- * @param {number} [selectLimit] - Sets select limit
-
-// * query params for dropdown items
- * @param {Array} models - An array of model types to fetch from the API.
- * @param {string} [backend] - name of the backend if the query for options needs additional information (eg. secret backend)
- * @param {object} [queryObject] - object passed as query options to this.store.query(). NOTE: will override @backend
-
- // * template only/display args
  * @param {string} id - The name of the form field
- * @param {string} [label] - Label for this form field
- * @param {string} [labelClass] - overwrite default label size (14px) from class="is-label"
- * @param {string} [subText] - Text to be displayed below the label
+ * @param {Array} models - An array of model types to fetch from the API.
+ * @param {object} [queryObject] - object passed as query options to this.store.query(). NOTE: will override this.backend
+ * @param {function} onChange - The onchange action for this form field. ** SEE UTIL ** search-select-has-many.js if selecting models from a hasMany relationship
+ * @param {string | Array} inputValue -  A comma-separated string or an array of strings -- array of ids for models.
+ * @param {string} label - Label for this form field
  * @param {string} fallbackComponent - name of component to be rendered if the API call 403s
+ * @param {string} [backend] - name of the backend if the query for options needs additional information (eg. secret backend)
+ * @param {boolean} [disallowNewItems=false] - Controls whether or not the user can add a new item if none found
+ * @param {boolean} [passObject=false] - When true, the onChange callback returns an array of objects with id (string) and isNew (boolean) (instead of an array of id strings)
+ * @param {array} [objectKeys=null] - Array of values that correlate to model attrs. When passObject=true, objectKeys are added to the passed object. NOTE: make 'id' as the first element in objectKeys if you do not want to override the default of 'id'
  * @param {string} [helpText] - Text to be displayed in the info tooltip for this form field
- * @param {string} [wildcardLabel] - string (singular) for rendering label tag beside a wildcard selection (i.e. 'role*'), for the number of items it includes, e.g. @wildcardLabel="role" -> "includes 4 roles"
+ * @param {number} [selectLimit] - A number that sets the limit to how many select options they can choose
+ * @param {string} [subText] - Text to be displayed below the label
+ * @param {string} [subLabel] - a smaller label below the main Label
+ * @param {string} [wildcardLabel] - when you want the searchSelect component to return a count on the model for options returned when using a wildcard you must provide a label of the count e.g. role.  Should be singular.
  * @param {string} [placeholder] - text you wish to replace the default "search" with
- * @param {boolean} [displayInherit=false] - if you need the search select component to display inherit instead of box.
- * @param {function} [renderInfoTooltip] - receives each inputValue string and list of dropdownOptions as args, so parent can determine when to render a tooltip beside a selectedOption and the tooltip text. see 'oidc/provider-form.js'
- * @param {boolean} [disabled] - if true sets the disabled property on the ember-power-select component and makes it unusable.
+ * @param {boolean} [displayInherit] - if you need the search select component to display inherit instead of box.
+ * @param {boolean} [renderInfoTooltip=false] - if you want search select to render a tooltip beside a selected item if no corresponding model was returned from .query
  *
- // * advanced customization
- * @param {Array} options - array of objects passed directly to the power-select component. If doing this, `models` should not also be passed as that will overwrite the
- * passed options. ex: [{ name: 'namespace45', id: 'displayedName' }]. It's recommended the parent should manage the array of selected items if manually passing in options.
- * @param {function} search - Customizes how the power-select component searches for matches - see the power-select docs for more information.
+ * @param {Array} options - *Advanced usage* - `options` can be passed directly from the outside to the
+ * power-select component. If doing this, `models` should not also be passed as that will overwrite the
+ * passed value. ex: [{ name: 'namespace45', id: 'displayedName' }];
+ * @param {function} search - *Advanced usage* - Customizes how the power-select component searches for matches -
+ * see the power-select docs for more information.
  *
  */
-
-export default class SearchSelect extends Component {
-  @service store;
-  @tracked shouldUseFallback = false;
-  @tracked selectedOptions = []; // array of selected options (initially set by @inputValue)
-  @tracked dropdownOptions = []; // options that will render in dropdown, updates as selections are added/discarded
-  @tracked allOptions = []; // both selected and unselected options, used for wildcard filter
-
-  get hidePowerSelect() {
-    return this.selectedOptions.length >= this.args.selectLimit;
-  }
-
-  get idKey() {
-    // if objectKeys exists, use the first element of the array as the identifier
-    // make 'id' as the first element in objectKeys if you do not want to override the default of 'id'
-    return this.args.objectKeys ? this.args.objectKeys[0] : 'id';
-  }
-
-  get shouldRenderName() {
-    return this.args.models?.some((model) => model.includes('identity')) ||
-      this.idKey !== 'id' ||
-      this.args.shouldRenderName
-      ? true
-      : false;
-  }
-
-  get nameKey() {
-    return this.args.nameKey || 'name';
-  }
-
-  addSearchText(optionsToFormat) {
-    // maps over array of objects or response from query
-    return optionsToFormat.toArray().map((option) => {
-      const id = option[this.idKey] ? option[this.idKey] : option.id;
-      option.searchText = `${option[this.nameKey]} ${id}`;
+export default Component.extend({
+  layout,
+  'data-test-component': 'search-select',
+  attributeBindings: ['data-test-component'],
+  classNameBindings: ['displayInherit:display-inherit'],
+  classNames: ['field', 'search-select'],
+  store: service(),
+  onChange: () => {},
+  inputValue: computed(function () {
+    return [];
+  }),
+  allOptions: null, // list of options including matched
+  selectedOptions: null, // list of selected options
+  options: null, // all possible options
+  shouldUseFallback: false,
+  shouldRenderName: false,
+  disallowNewItems: false,
+  passObject: false,
+  objectKeys: null,
+  idKey: computed('objectKeys', function () {
+    // if objectKeys exists, then use the first element of the array as the identifier
+    return this.objectKeys ? this.objectKeys[0] : 'id';
+  }),
+  init() {
+    this._super(...arguments);
+    this.set('selectedOptions', this.inputValue || []);
+  },
+  didRender() {
+    this._super(...arguments);
+    let { oldOptions, options, selectedOptions } = this;
+    let hasFormattedInput = typeof selectedOptions.firstObject !== 'string';
+    if (options && !oldOptions && !hasFormattedInput) {
+      // this is the first time they've been set, so we need to format them
+      this.formatOptions(options);
+    }
+    this.set('oldOptions', options);
+  },
+  formatOptions: function (options) {
+    options = options.toArray().map((option) => {
+      option.searchText = `${option.name} ${option[this.idKey]}`;
       return option;
     });
-  }
-
-  formatInputAndUpdateDropdown(inputValues) {
-    // inputValues are initially an array of strings from @inputValue
-    // map over so selectedOptions are objects
-    return inputValues.map((option) => {
-      const matchingOption = this.dropdownOptions.findBy(this.idKey, option);
-      // tooltip text comes from return of parent function
-      const addTooltip = this.args.renderInfoTooltip
-        ? this.args.renderInfoTooltip(option, this.dropdownOptions)
-        : false;
-
-      // remove any matches from dropdown list
-      this.dropdownOptions.removeObject(matchingOption);
+    let allOptions = options.toArray().map((option) => {
+      return option.id;
+    });
+    this.set('allOptions', allOptions); // used by filter-wildcard helper
+    let formattedOptions = this.selectedOptions.map((option) => {
+      let matchingOption = options.findBy(this.idKey, option);
+      // an undefined matchingOption means a selectedOption, on edit, didn't match a model returned from the query
+      // this means it is a wildcard string or no longer exists
+      // permissions shouldn't inhibit viewing a record here, because the fallback component would render instead of search-select
+      let addTooltip = matchingOption || isWildcardString([option]) ? false : true; // add tooltip to let user know the selection may not exist
+      options.removeObject(matchingOption);
       return {
         id: option,
-        name: matchingOption ? matchingOption[this.nameKey] : option,
+        name: matchingOption ? matchingOption.name : option,
         searchText: matchingOption ? matchingOption.searchText : option,
         addTooltip,
-        // add additional attrs if we're using a dynamic idKey
+        // conditionally spread configured object if we're using the dynamic idKey
         ...(this.idKey !== 'id' && this.customizeObject(matchingOption)),
       };
     });
-  }
-
-  @task
-  *fetchOptions() {
-    this.dropdownOptions = []; // reset dropdown anytime we re-fetch
-
-    if (this.args.parentManageSelected) {
-      // works in tandem with parent passing in @options directly
-      this.selectedOptions = this.args.parentManageSelected;
+    this.set('selectedOptions', formattedOptions);
+    if (this.options) {
+      options = this.options.concat(options).uniq();
     }
-
-    if (!this.args.models) {
-      if (this.args.options) {
-        const { options } = this.args;
-        // if options are nested, let parent handle formatting - see path-filter-config-list.js
-        this.dropdownOptions = options.some((e) => Object.keys(e).includes('groupName'))
-          ? options
-          : [...this.addSearchText(options)];
-
-        if (!this.args.parentManageSelected) {
-          //  set selectedOptions and remove matches from dropdown list
-          this.selectedOptions = this.args.inputValue
-            ? this.formatInputAndUpdateDropdown(this.args.inputValue)
-            : [];
-        }
+    this.set('options', options);
+  },
+  fetchOptions: task(function* () {
+    if (!this.models) {
+      if (this.options) {
+        this.formatOptions(this.options);
       }
       return;
     }
-
-    for (const modelType of this.args.models) {
+    if (this.idKey !== 'id') {
+      // if passing a dynamic idKey, then display it in the dropdown beside the name
+      this.set('shouldRenderName', true);
+    }
+    for (let modelType of this.models) {
+      if (modelType.includes('identity')) {
+        this.set('shouldRenderName', true);
+      }
       try {
-        let queryParams = {};
-        if (this.args.backend) {
-          queryParams = { backend: this.args.backend };
+        let queryOptions = {};
+        if (this.backend) {
+          queryOptions = { backend: this.backend };
         }
-        if (this.args.queryObject) {
-          queryParams = this.args.queryObject;
+        if (this.queryObject) {
+          queryOptions = this.queryObject;
         }
-        // fetch options from the store
-        const options = yield this.store.query(modelType, queryParams);
-
-        // store both select + unselected options in tracked property used by wildcard filter
-        this.allOptions = [...this.allOptions, ...options.mapBy('id')];
-
-        // add to dropdown options
-        this.dropdownOptions = [...this.dropdownOptions, ...this.addSearchText(options)];
+        let options = yield this.store.query(modelType, queryOptions);
+        this.formatOptions(options);
       } catch (err) {
         if (err.httpStatus === 404) {
-          // continue to query other models even if one 404s
-          // and so selectedOptions will be set after for loop
-          continue;
+          if (!this.options) {
+            // If the call failed but the resource has items
+            // from a different namespace, this allows the
+            // selected items to display
+            this.set('options', []);
+          }
+
+          return;
         }
         if (err.httpStatus === 403) {
-          this.shouldUseFallback = true;
+          this.set('shouldUseFallback', true);
           return;
         }
         throw err;
       }
     }
-
-    // after all models are queried, set selectedOptions and remove matches from dropdown list
-    this.selectedOptions = this.args.inputValue
-      ? this.formatInputAndUpdateDropdown(this.args.inputValue)
-      : [];
-  }
-
-  @action
+  }).on('didInsertElement'),
   handleChange() {
     if (this.selectedOptions.length && typeof this.selectedOptions.firstObject === 'object') {
-      this.args.onChange(
-        Array.from(this.selectedOptions, (option) =>
-          this.args.passObject ? this.customizeObject(option) : option.id
-        )
-      );
+      this.onChange(Array.from(this.selectedOptions, (option) => this.customizeObject(option)));
     } else {
-      this.args.onChange(this.selectedOptions);
+      this.onChange(this.selectedOptions);
     }
-  }
-
-  shouldShowCreate(id, searchResults) {
-    if (searchResults && searchResults.length && searchResults.firstObject.groupName) {
-      return !searchResults.some((group) => group.options.findBy('id', id));
+  },
+  shouldShowCreate(id, options) {
+    if (options && options.length && options.firstObject.groupName) {
+      return !options.some((group) => group.options.findBy('id', id));
     }
-    const existingOption =
-      this.dropdownOptions &&
-      (this.dropdownOptions.findBy('id', id) || this.dropdownOptions.findBy('name', id));
-    if (this.args.disallowNewItems && !existingOption) {
+    let existingOption = this.options && (this.options.findBy('id', id) || this.options.findBy('name', id));
+    if (this.disallowNewItems && !existingOption) {
       return false;
     }
     return !existingOption;
-  }
-
-  // ----- adapted from ember-power-select-with-create
+  },
+  //----- adapted from ember-power-select-with-create
   addCreateOption(term, results) {
     if (this.shouldShowCreate(term, results)) {
-      const name = `Click to add new item: ${term}`;
+      const name = `Add new ${singularize(this.label || 'item')}: ${term}`;
       const suggestion = {
         __isSuggestion__: true,
         __value__: term,
@@ -226,76 +182,76 @@ export default class SearchSelect extends Component {
       };
       results.unshift(suggestion);
     }
-  }
-
+  },
   filter(options, searchText) {
     const matcher = (option, text) => defaultMatcher(option.searchText, text);
     return filterOptions(options || [], searchText, matcher);
-  }
+  },
   // -----
-
   customizeObject(option) {
     if (!option) return;
-
-    let additionalKeys;
-    if (this.args.objectKeys) {
-      // pull attrs corresponding to objectKeys from model record, add to the selection
-      additionalKeys = Object.fromEntries(this.args.objectKeys.map((key) => [key, option[key]]));
-      // filter any undefined attrs, which could mean the model was not hydrated,
-      // the record is new or the model doesn't have that attribute
-      Object.keys(additionalKeys).forEach((key) => {
-        if (additionalKeys[key] === undefined) {
-          delete additionalKeys[key];
-        }
-      });
-    }
-    return {
-      id: option.id,
-      isNew: !!option.new,
-      ...additionalKeys,
-    };
-  }
-
-  @action
-  discardSelection(selected) {
-    this.selectedOptions.removeObject(selected);
-    if (!selected.new) {
-      this.dropdownOptions.pushObject(selected);
-    }
-    this.handleChange();
-  }
-
-  // ----- adapted from ember-power-select-with-create
-  @action
-  searchAndSuggest(term, select) {
-    if (term.length === 0) {
-      return this.dropdownOptions;
-    }
-    if (this.args.search) {
-      return resolve(this.args.search(term, select)).then((results) => {
-        if (results.toArray) {
-          results = results.toArray();
-        }
-        this.addCreateOption(term, results);
-        return results;
-      });
-    }
-    const newOptions = this.filter(this.dropdownOptions, term);
-    this.addCreateOption(term, newOptions);
-    return newOptions;
-  }
-
-  @action
-  selectOrCreate(selection) {
-    if (selection && selection.__isSuggestion__) {
-      const name = selection.__value__;
-      this.selectedOptions.pushObject({ name, id: name, new: true });
-    } else {
-      this.selectedOptions.pushObject(selection);
-      this.dropdownOptions.removeObject(selection);
+    // if passObject=true return object, otherwise return string of option id
+    if (this.passObject) {
+      let additionalKeys;
+      if (this.objectKeys) {
+        // pull attrs corresponding to objectKeys from model record, add to the selected option (object) and send to the parent
+        additionalKeys = Object.fromEntries(this.objectKeys.map((key) => [key, option[key]]));
+        // filter any undefined attrs, which means the model did not have a value for that attr
+        // no value could mean the model was not hydrated, the record is new or the model doesn't have that attribute
+        Object.keys(additionalKeys).forEach((key) => {
+          if (additionalKeys[key] === undefined) {
+            delete additionalKeys[key];
+          }
+        });
+      }
+      return {
+        id: option.id,
+        isNew: !!option.new,
+        ...additionalKeys,
+      };
     }
-    this.handleChange();
-  }
-
-  // -----
-}
+    return option.id;
+  },
+  actions: {
+    onChange(val) {
+      this.onChange(val);
+    },
+    discardSelection(selected) {
+      this.selectedOptions.removeObject(selected);
+      // fire off getSelectedValue action higher up in get-credentials-card component
+      if (!selected.new) {
+        this.options.pushObject(selected);
+      }
+      this.handleChange();
+    },
+    // ----- adapted from ember-power-select-with-create
+    searchAndSuggest(term, select) {
+      if (term.length === 0) {
+        return this.options;
+      }
+      if (this.search) {
+        return resolve(this.search(term, select)).then((results) => {
+          if (results.toArray) {
+            results = results.toArray();
+          }
+          this.addCreateOption(term, results);
+          return results;
+        });
+      }
+      const newOptions = this.filter(this.options, term);
+      this.addCreateOption(term, newOptions);
+      return newOptions;
+    },
+    selectOrCreate(selection) {
+      if (selection && selection.__isSuggestion__) {
+        const name = selection.__value__;
+        this.selectedOptions.pushObject({ name, id: name, new: true });
+      } else {
+        this.selectedOptions.pushObject(selection);
+        this.options.removeObject(selection);
+      }
+      this.handleChange();
+    },
+    // -----
+  },
+});
diff --git a/ui/lib/core/addon/components/secret-list-header-tab.hbs b/ui/lib/core/addon/components/secret-list-header-tab.hbs
index 5bda9ed305e55..b38e9904b3034 100644
--- a/ui/lib/core/addon/components/secret-list-header-tab.hbs
+++ b/ui/lib/core/addon/components/secret-list-header-tab.hbs
@@ -1,6 +1,6 @@
 {{#unless this.dontShowTab}}
   {{#if @isEngine}}
-    <LinkTo @route={{@link}} data-test-secret-list-tab={{@label}}>
+    <LinkTo @route={{@link}}>
       {{@label}}
     </LinkTo>
   {{else}}
diff --git a/ui/lib/core/addon/components/secret-list-header-tab.js b/ui/lib/core/addon/components/secret-list-header-tab.js
index 93e82c4254c06..ef281b5d13463 100644
--- a/ui/lib/core/addon/components/secret-list-header-tab.js
+++ b/ui/lib/core/addon/components/secret-list-header-tab.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /**
  * @module SecretListHeaderTab
  * SecretListHeaderTab component passes in properties that are used to check capabilities and either display or not display the component.
@@ -43,9 +38,9 @@ export default class SecretListHeaderTab extends Component {
   }
 
   async fetchCapabilities() {
-    const capabilitiesArray = ['canList', 'canCreate', 'canUpdate'];
-    const checkCapabilities = function (object) {
-      const array = [];
+    let capabilitiesArray = ['canList', 'canCreate', 'canUpdate'];
+    let checkCapabilities = function (object) {
+      let array = [];
       // we only want to look at the canList, canCreate and canUpdate on the capabilities record
       capabilitiesArray.forEach((item) => {
         // object is sometimes null
@@ -55,19 +50,19 @@ export default class SecretListHeaderTab extends Component {
       });
       return array;
     };
-    const checker = (arr) => arr.every((item) => !item); // same things as listing every item as !item && !item, etc.
+    let checker = (arr) => arr.every((item) => !item); // same things as listing every item as !item && !item, etc.
     // For now only check capabilities for the Database Secrets Engine
     if (this.args.displayName === 'Database') {
-      const peekRecordRoles = this.store.peekRecord('capabilities', 'database/roles/');
-      const peekRecordStaticRoles = this.store.peekRecord('capabilities', 'database/static-roles/');
-      const peekRecordConnections = this.store.peekRecord('capabilities', 'database/config/');
+      let peekRecordRoles = this.store.peekRecord('capabilities', 'database/roles/');
+      let peekRecordStaticRoles = this.store.peekRecord('capabilities', 'database/static-roles/');
+      let peekRecordConnections = this.store.peekRecord('capabilities', 'database/config/');
       // peekRecord if the capabilities store data is there for the connections (config) and roles model
       if (
         (peekRecordRoles && this.args.path === 'roles') ||
         (peekRecordStaticRoles && this.args.path === 'roles')
       ) {
-        const roles = checker(checkCapabilities(peekRecordRoles));
-        const staticRoles = checker(checkCapabilities(peekRecordStaticRoles));
+        let roles = checker(checkCapabilities(peekRecordRoles));
+        let staticRoles = checker(checkCapabilities(peekRecordStaticRoles));
 
         this.dontShowTab = roles && staticRoles;
         return;
@@ -77,7 +72,7 @@ export default class SecretListHeaderTab extends Component {
         return;
       }
       // otherwise queryRecord and create an instance on the capabilities.
-      const response = await this.store.queryRecord(
+      let response = await this.store.queryRecord(
         'capabilities',
         this.pathQuery(this.args.id, this.args.path)
       );
diff --git a/ui/lib/core/addon/components/secret-list-header.hbs b/ui/lib/core/addon/components/secret-list-header.hbs
index 2204f55b9bc87..7399bd0b723d2 100644
--- a/ui/lib/core/addon/components/secret-list-header.hbs
+++ b/ui/lib/core/addon/components/secret-list-header.hbs
@@ -12,7 +12,7 @@
             /
           </span>
           {{#if @isEngine}}
-            <LinkToExternal @route="secrets">secrets</LinkToExternal>
+            {{link-to-external "secrets" "secrets"}}
           {{else}}
             <LinkTo @route="vault.cluster.secrets">
               secrets
@@ -28,11 +28,10 @@
         {{#if this.isKV}}
           <span class="tag" data-test-kv-version-badge>
             Version
-            {{or @model.version "1"}}
+            {{or @model.options.version "1"}}
           </span>
         {{/if}}
       </h1>
-
     </p.levelLeft>
   </PageHeader>
   {{#if options.tabs}}
@@ -78,7 +77,7 @@
     <div class="tabs-container box is-bottomless is-marginless is-fullwidth is-paddingless">
       <nav class="tabs" aria-label="tabs">
         <ul>
-          {{#if (includes @model.engineType (supported-secret-backends))}}
+          {{#if (contains @model.engineType (supported-secret-backends))}}
             <LinkTo
               @route="vault.cluster.secrets.backend.list-root"
               @current-when="vault.cluster.secrets.backend.list-root vault.cluster.secrets.backend.list"
diff --git a/ui/lib/core/addon/components/secret-list-header.js b/ui/lib/core/addon/components/secret-list-header.js
index ee839fe32bb4a..c462452dd50e8 100644
--- a/ui/lib/core/addon/components/secret-list-header.js
+++ b/ui/lib/core/addon/components/secret-list-header.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 
 /**
diff --git a/ui/lib/core/addon/components/select.js b/ui/lib/core/addon/components/select.js
index 37eec9631b9f1..00b4e531c6f93 100644
--- a/ui/lib/core/addon/components/select.js
+++ b/ui/lib/core/addon/components/select.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@ember/component';
 import layout from '../templates/components/select';
 
diff --git a/ui/lib/core/addon/components/shamir-flow.js b/ui/lib/core/addon/components/shamir-flow.js
index 7346078493f6d..461026573ba8b 100644
--- a/ui/lib/core/addon/components/shamir-flow.js
+++ b/ui/lib/core/addon/components/shamir-flow.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import { gt } from '@ember/object/computed';
 import { camelize } from '@ember/string';
@@ -71,9 +66,9 @@ export default Component.extend(DEFAULTS, {
   hasProgress: gt('progress', 0),
 
   actionSuccess(resp) {
-    const { onUpdate, isComplete, onShamirSuccess, thresholdPath } = this;
-    const threshold = get(resp, thresholdPath);
-    const props = {
+    let { onUpdate, isComplete, onShamirSuccess, thresholdPath } = this;
+    let threshold = get(resp, thresholdPath);
+    let props = {
       ...resp,
       threshold,
     };
@@ -105,7 +100,7 @@ export default Component.extend(DEFAULTS, {
   },
 
   generateStep: computed('generateWithPGP', 'haveSavedPGPKey', 'pgp_key', function () {
-    const { generateWithPGP, pgp_key, haveSavedPGPKey } = this;
+    let { generateWithPGP, pgp_key, haveSavedPGPKey } = this;
     if (!generateWithPGP && !pgp_key) {
       return 'chooseMethod';
     }
diff --git a/ui/lib/core/addon/components/shamir-modal-flow.js b/ui/lib/core/addon/components/shamir-modal-flow.js
index a36f039b129d8..4ae6fed508e4c 100644
--- a/ui/lib/core/addon/components/shamir-modal-flow.js
+++ b/ui/lib/core/addon/components/shamir-modal-flow.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /**
  * @module ShamirModalFlow
  * ShamirModalFlow is an extension of the ShamirFlow component that does the Generate Action Token workflow inside of a Modal.
diff --git a/ui/lib/core/addon/components/stat-text.hbs b/ui/lib/core/addon/components/stat-text.hbs
deleted file mode 100644
index 34c6997283d3c..0000000000000
--- a/ui/lib/core/addon/components/stat-text.hbs
+++ /dev/null
@@ -1,12 +0,0 @@
-<div
-  class={{concat "stat-text-container " @size (unless @subText "-no-subText")}}
-  data-test-stat-text-container={{(or @label "true")}}
-  ...attributes
->
-  <div class="stat-label has-bottom-margin-xs">{{@label}}</div>
-  {{#if @subText}}
-    <div class="stat-text">{{@subText}}</div>
-  {{/if}}
-  {{! Ember reads 0 as falsy, so only render a dash if the value is truly undefined}}
-  <div class="stat-value">{{if (or @value (eq @value 0)) (format-number @value) "-"}}</div>
-</div>
\ No newline at end of file
diff --git a/ui/lib/core/addon/components/stat-text.js b/ui/lib/core/addon/components/stat-text.js
new file mode 100644
index 0000000000000..dfa5f4fa9f379
--- /dev/null
+++ b/ui/lib/core/addon/components/stat-text.js
@@ -0,0 +1,21 @@
+/**
+ * @module StatText
+ * StatText components are used to display a label and associated value beneath, with the option to include a description.
+ *
+ * @example
+ * ```js
+ * <StatText @label="Active Clients" @value="4,198" @size="l" @subText="These are the active client counts"/>
+ * ```
+ * @param {string} label=null - The label for the statistic
+ * @param {number} value=null - Value passed in, usually a number or statistic
+ * @param {string} size=null - Sizing changes whether or not there is subtext. If there is subtext 's' and 'l' are valid sizes. If no subtext, then 'm' is also acceptable.
+ * @param {string} [subText] - SubText is optional and will display below the label
+ */
+
+import Component from '@glimmer/component';
+import layout from '../templates/components/stat-text';
+import { setComponentTemplate } from '@ember/component';
+/* eslint ember/no-empty-glimmer-component-classes: 'warn' */
+class StatTextComponent extends Component {}
+
+export default setComponentTemplate(layout, StatTextComponent);
diff --git a/ui/lib/core/addon/components/string-list.hbs b/ui/lib/core/addon/components/string-list.hbs
index 9ce556a0d8f6f..5ad86eb5cbe31 100644
--- a/ui/lib/core/addon/components/string-list.hbs
+++ b/ui/lib/core/addon/components/string-list.hbs
@@ -7,24 +7,22 @@
   ...attributes
 >
   {{#if @label}}
-    <label class="is-label" data-test-string-list-label="true">
+    <label class="title is-label" data-test-string-list-label="true">
       {{@label}}
-      {{#if @helpText}}
-        <InfoTooltip>{{@helpText}}</InfoTooltip>
+      {{#if this.helpText}}
+        <InfoTooltip>{{this.helpText}}</InfoTooltip>
       {{/if}}
     </label>
-    {{#if @subText}}
-      <p class="sub-text">
-        {{@subText}}
-      </p>
-    {{/if}}
+  {{/if}}
+  {{#if @warning}}
+    <AlertBanner @type="warning" @message={{@warning}} />
   {{/if}}
   {{#each this.inputList as |data index|}}
     <div class="field is-grouped" data-test-string-list-row={{index}}>
       <div class="control is-expanded">
         <Textarea
           data-test-string-list-input={{index}}
-          class="input {{if (includes index this.indicesWithComma) 'has-warning-border'}}"
+          class="input"
           @value={{data.value}}
           name={{concat this.elementId "-" index}}
           id={{concat this.elementId "-" index}}
@@ -53,16 +51,6 @@
           </button>
         {{/if}}
       </div>
-      {{#if (includes index this.indicesWithComma)}}
-        <Icon class="is-flex-v-centered has-text-highlight" @name="alert-triangle-fill" />
-      {{/if}}
     </div>
   {{/each}}
-  {{#if this.indicesWithComma}}
-    <AlertInline
-      @type="warning"
-      @message="Input contains a comma. Please separate values into individual rows."
-      @isMarginless={{true}}
-    />
-  {{/if}}
 </div>
\ No newline at end of file
diff --git a/ui/lib/core/addon/components/string-list.js b/ui/lib/core/addon/components/string-list.js
index 8924f65063c3e..cacdfed5b6d51 100644
--- a/ui/lib/core/addon/components/string-list.js
+++ b/ui/lib/core/addon/components/string-list.js
@@ -1,15 +1,8 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ArrayProxy from '@ember/array/proxy';
 import Component from '@glimmer/component';
 import autosize from 'autosize';
 import { action } from '@ember/object';
 import { set } from '@ember/object';
-import { next } from '@ember/runloop';
-import { tracked } from '@glimmer/tracking';
 
 /**
  * @module StringList
@@ -21,15 +14,13 @@ import { tracked } from '@glimmer/tracking';
  * @param {string} label - Text displayed in the header above all the inputs.
  * @param {function} onChange - Function called when any of the inputs change.
  * @param {string} inputValue - A string or an array of strings.
+ * @param {string} warning - Text displayed as a warning.
  * @param {string} helpText - Text displayed as a tooltip.
  * @param {string} type=array - Optional type for inputValue.
  * @param {string} attrName - We use this to check the type so we can modify the tooltip content.
- * @param {string} subText - Text below the label.
  */
 
 export default class StringList extends Component {
-  @tracked indicesWithComma = [];
-
   constructor() {
     super(...arguments);
 
@@ -46,10 +37,8 @@ export default class StringList extends Component {
     });
     this.type = this.args.type || 'array';
     this.setType();
-    next(() => {
-      this.toList();
-      this.addInput();
-    });
+    this.toList();
+    this.addInput();
   }
 
   setType() {
@@ -71,12 +60,20 @@ export default class StringList extends Component {
 
   toVal() {
     const inputs = this.inputList.filter((x) => x.value).mapBy('value');
-    if (this.args.type === 'string') {
+    if (this.format === 'string') {
       return inputs.join(',');
     }
     return inputs;
   }
 
+  get helpText() {
+    if (this.args.attrName === 'tokenBoundCidrs') {
+      return 'Specifies the blocks of IP addresses which are allowed to use the generated token. One entry per row.';
+    } else {
+      return this.args.helpText;
+    }
+  }
+
   @action
   autoSize(element) {
     autosize(element.querySelector('textarea'));
@@ -89,14 +86,10 @@ export default class StringList extends Component {
 
   @action
   inputChanged(idx, event) {
-    if (event.target.value.includes(',') && !this.indicesWithComma.includes(idx)) {
-      this.indicesWithComma.pushObject(idx);
-    }
-    if (!event.target.value.includes(',')) this.indicesWithComma.removeObject(idx);
-
     const inputObj = this.inputList.objectAt(idx);
+    const onChange = this.args.onChange;
     set(inputObj, 'value', event.target.value);
-    this.args.onChange(this.toVal());
+    onChange(this.toVal());
   }
 
   @action
@@ -109,8 +102,9 @@ export default class StringList extends Component {
 
   @action
   removeInput(idx) {
+    const onChange = this.args.onChange;
     const inputs = this.inputList;
     inputs.removeObject(inputs.objectAt(idx));
-    this.args.onChange(this.toVal());
+    onChange(this.toVal());
   }
 }
diff --git a/ui/lib/core/addon/components/text-file.hbs b/ui/lib/core/addon/components/text-file.hbs
deleted file mode 100644
index 7a145ab8594a3..0000000000000
--- a/ui/lib/core/addon/components/text-file.hbs
+++ /dev/null
@@ -1,94 +0,0 @@
-{{#unless @uploadOnly}}
-  <div class="level is-mobile">
-    <div class="level-left">
-      <label for="input-{{this.elementId}}" class="is-label" data-test-text-file-label>
-        {{or @label "File"}}
-        {{#if @helpText}}
-          <InfoTooltip>
-            <span data-test-help-text>
-              {{@helpText}}
-            </span>
-          </InfoTooltip>
-        {{/if}}
-      </label>
-    </div>
-    <div class="level-right">
-      <div class="control is-flex">
-        <Input
-          data-test-text-toggle
-          id="use-text-{{this.elementId}}"
-          class="switch is-rounded is-success is-small"
-          @type="checkbox"
-          @checked={{this.showTextArea}}
-          {{on "change" (fn (mut this.showTextArea) (not this.showTextArea))}}
-        />
-        <label for="use-text-{{this.elementId}}">
-          Enter as text
-        </label>
-      </div>
-    </div>
-  </div>
-{{/unless}}
-<div class="field text-file box is-fullwidth is-marginless is-shadowless is-paddingless" data-test-component="text-file">
-  {{#if this.showTextArea}}
-    <div class="control has-icon-right">
-      <Textarea
-        id="input-{{this.elementId}}"
-        @value={{this.content}}
-        class="textarea {{if (and (not this.showValue) this.content) 'masked-font'}}"
-        {{on "input" this.handleTextInput}}
-        data-test-text-file-textarea
-      />
-      <button
-        type="button"
-        class="masked-input-toggle button is-compact"
-        data-test-button="toggle-masked"
-        {{on "click" (fn (mut this.showValue) (not this.showValue))}}
-      >
-        <Icon @name={{if this.showValue "eye" "eye-off"}} @stretched={{true}} />
-      </button>
-    </div>
-    <p class="help has-text-grey">Enter the value as text</p>
-  {{else}}
-    <div class="control is-expanded">
-      <div class="file is-fullwidth">
-        <div class="file-label" aria-label="Choose a file">
-          <Input
-            id="file-input-{{this.elementId}}"
-            class="file-input"
-            @type="file"
-            {{on "change" this.handleFileUpload}}
-            data-test-text-file-input
-          />
-          <label for="file-input-{{this.elementId}}" class="file-cta button">
-            <Icon @name="upload" class="has-light-grey-text" />
-            Choose a file…
-          </label>
-          <span class="file-name has-text-grey-dark" data-test-text-file-input-label>
-            {{or this.filename "No file chosen"}}
-          </span>
-          {{#if this.filename}}
-            <button
-              type="button"
-              class="file-delete-button"
-              aria-label="Clear file selection"
-              {{on "click" this.clearFile}}
-              data-test-text-clear
-            >
-              <Icon @name="x-circle" />
-            </button>
-          {{/if}}
-        </div>
-      </div>
-    </div>
-    <p class="help has-text-grey">Select a file from your computer</p>
-    {{#if (or @validationError this.uploadError)}}
-      <AlertInline
-        @type="danger"
-        @message={{or @validationError this.uploadError}}
-        @paddingTop={{true}}
-        data-test-field-validation="text-file"
-      />
-    {{/if}}
-  {{/if}}
-</div>
\ No newline at end of file
diff --git a/ui/lib/core/addon/components/text-file.js b/ui/lib/core/addon/components/text-file.js
deleted file mode 100644
index f20bddb9f8c91..0000000000000
--- a/ui/lib/core/addon/components/text-file.js
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
-import { action } from '@ember/object';
-import { tracked } from '@glimmer/tracking';
-import { guidFor } from '@ember/object/internals';
-/**
- * @module TextFile
- * `TextFile` components render a file upload input with the option to toggle a "Enter as text" button
- *  that changes the input into a textarea
- *
- * @example
- * <TextFile
- *  @uploadOnly={{true}}
- *  @helpText="help text"
- *  @onChange={{this.handleChange}}
- *  @label="PEM Bundle"
- * />
- *
- * @param {function} onChange - Callback function to call when the value of the input changes, returns an object in the shape of { value: fileContents, filename: 'some-file.txt' }
- * @param {bool} [uploadOnly=false] - When true, renders a static file upload input and removes the option to toggle and input plain text
- * @param {string} [helpText] - Text underneath label.
- * @param {string} [label='File']  - Text to use as the label for the file input. If none, default of 'File' is rendered
- */
-
-export default class TextFileComponent extends Component {
-  @tracked content = '';
-  @tracked filename = '';
-  @tracked uploadError = '';
-  @tracked showValue = false;
-  @tracked showTextArea = false;
-  elementId = guidFor(this);
-
-  async readFile(file) {
-    try {
-      this.content = await file.text();
-      this.filename = file.name;
-      this.handleChange();
-    } catch (error) {
-      this.clearFile();
-      this.uploadError = 'There was a problem uploading. Please try again.';
-    }
-  }
-
-  @action
-  handleFileUpload(e) {
-    e.preventDefault();
-    const { files } = e.target;
-    if (!files.length) return;
-    this.readFile(files[0]);
-  }
-
-  @action
-  handleTextInput(e) {
-    e.preventDefault();
-    this.content = e.target.value;
-    this.handleChange();
-  }
-
-  @action
-  clearFile() {
-    this.content = '';
-    this.filename = '';
-    this.handleChange();
-  }
-
-  handleChange() {
-    this.args.onChange({ value: this.content, filename: this.filename });
-    this.uploadError = '';
-  }
-}
diff --git a/ui/lib/core/addon/components/toggle-button.js b/ui/lib/core/addon/components/toggle-button.js
index 94ebe89c9861f..c9ecc44a71ad4 100644
--- a/ui/lib/core/addon/components/toggle-button.js
+++ b/ui/lib/core/addon/components/toggle-button.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 
 /**
diff --git a/ui/lib/core/addon/components/toggle.js b/ui/lib/core/addon/components/toggle.js
index a16b2e3e9e871..be9c1f79aae47 100644
--- a/ui/lib/core/addon/components/toggle.js
+++ b/ui/lib/core/addon/components/toggle.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /**
  * @module Toggle
  * Toggle components are used to indicate boolean values which can be toggled on or off.
@@ -41,8 +36,8 @@ export default class ToggleComponent extends Component {
     return `toggle-${this.name.replace(/\W/g, '')}`;
   }
   get inputClasses() {
-    const size = this.args.size || 'normal';
-    const status = this.args.status || 'normal';
+    let size = this.args.size || 'normal';
+    let status = this.args.status || 'normal';
     const sizeClass = `is-${size}`;
     const statusClass = `is-${status}`;
     return `toggle ${statusClass} ${sizeClass}`;
diff --git a/ui/lib/core/addon/components/tool-tip.js b/ui/lib/core/addon/components/tool-tip.js
index 072c8b542f01d..88c893f4889de 100644
--- a/ui/lib/core/addon/components/tool-tip.js
+++ b/ui/lib/core/addon/components/tool-tip.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 import { debounce } from '@ember/runloop';
diff --git a/ui/lib/core/addon/components/toolbar-actions.js b/ui/lib/core/addon/components/toolbar-actions.js
new file mode 100644
index 0000000000000..ecda84500e23a
--- /dev/null
+++ b/ui/lib/core/addon/components/toolbar-actions.js
@@ -0,0 +1,25 @@
+/**
+ * @module ToolbarActions
+ * `ToolbarActions` is a container for toolbar links such as "Add item".
+ * It should only be used inside of `Toolbar`.
+ *
+ * @example
+ * ```js
+ * <Toolbar>
+ *   <ToolbarActions>
+ *     <ToolbarLink @params={{array 'vault.cluster.policy.edit'}}>
+ *       Edit policy
+ *     </ToolbarLink>
+ *   </ToolbarActions>
+ * </Toolbar>
+ * ```
+ *
+ */
+
+import Component from '@ember/component';
+import layout from '../templates/components/toolbar-actions';
+
+export default Component.extend({
+  tagName: '',
+  layout,
+});
diff --git a/ui/lib/core/addon/components/toolbar-download-button.js b/ui/lib/core/addon/components/toolbar-download-button.js
new file mode 100644
index 0000000000000..ceb301e7bf76d
--- /dev/null
+++ b/ui/lib/core/addon/components/toolbar-download-button.js
@@ -0,0 +1,21 @@
+/**
+ * @module ToolbarSecretLink
+ * `ToolbarSecretLink` styles SecretLink for the Toolbar.
+ * It should only be used inside of `Toolbar`.
+ *
+ * @example
+ * ```js
+ * <Toolbar>
+ *   <ToolbarActions>
+ *     <ToolbarDownloadButton @actionText="Download policy" @extension={{if (eq policyType "acl") model.format "sentinel"}} @filename={{model.name}} @data={{model.policy}} />
+ *   </ToolbarActions>
+ * </Toolbar>
+ * ```
+ *
+ */
+
+import DownloadButton from './download-button';
+
+export default DownloadButton.extend({
+  classNames: ['toolbar-link'],
+});
diff --git a/ui/lib/core/addon/components/toolbar-filters.js b/ui/lib/core/addon/components/toolbar-filters.js
new file mode 100644
index 0000000000000..400ca6d13be59
--- /dev/null
+++ b/ui/lib/core/addon/components/toolbar-filters.js
@@ -0,0 +1,26 @@
+/**
+ * @module ToolbarFilters
+ * `ToolbarFilters` components are containers for Toolbar filters and toggles.
+ * It should only be used inside of `Toolbar`.
+ *
+ * @example
+ * ```js
+ * <Toolbar>
+ *   <ToolbarFilters>
+ *     <div class="control has-icons-left">
+ *       <input class="filter input" placeholder="Filter keys" type="text">
+ *       <Icon @name="search" @size="24" class="search-icon has-text-grey-light" />
+ *     </div>
+ *   </ToolbarFilters>
+ * </Toolbar>
+ ```
+ *
+ */
+
+import Component from '@ember/component';
+import layout from '../templates/components/toolbar-filters';
+
+export default Component.extend({
+  layout,
+  tagName: '',
+});
diff --git a/ui/lib/core/addon/components/toolbar-link.hbs b/ui/lib/core/addon/components/toolbar-link.hbs
index 5fd0f96aa694e..6d4da11531e49 100644
--- a/ui/lib/core/addon/components/toolbar-link.hbs
+++ b/ui/lib/core/addon/components/toolbar-link.hbs
@@ -1,36 +1,22 @@
-{{#if (and @disabled @disabledTooltip)}}
-  <ToolTip @verticalPosition="above" as |T|>
-    <T.Trigger tabindex="-1">
-      <LinkTo
-        class="toolbar-link"
-        ...attributes
-        @route={{@route}}
-        @models={{this.models}}
-        @query={{this.query}}
-        @replace={{@replace}}
-        @disabled={{@disabled}}
-      >
-        {{yield}}
-        <Icon @name={{this.glyph}} data-test-icon={{this.glyph}} />
-      </LinkTo>
-    </T.Trigger>
-    <T.Content @defaultClass="tool-tip smaller-font">
-      <div class="box" data-test-disabled-tooltip>
-        {{@disabledTooltip}}
-      </div>
-    </T.Content>
-  </ToolTip>
-{{else}}
-  <LinkTo
-    class="toolbar-link"
-    ...attributes
-    @route={{@route}}
-    @models={{this.models}}
-    @query={{this.query}}
-    @replace={{@replace}}
-    @disabled={{@disabled}}
-  >
-    {{yield}}
-    <Icon @name={{this.glyph}} data-test-icon={{this.glyph}} />
-  </LinkTo>
-{{/if}}
\ No newline at end of file
+{{#let (component "link-to" class="toolbar-link" disabled=@disabled params=@params) as |LinkToComponent|}}
+  {{#if (and @disabled @disabledTooltip)}}
+    <ToolTip @verticalPosition="above" as |T|>
+      <T.Trigger tabindex="-1">
+        <LinkToComponent ...attributes>
+          {{yield}}
+          <Icon @name={{this.glyph}} data-test-icon={{this.glyph}} />
+        </LinkToComponent>
+      </T.Trigger>
+      <T.Content @defaultClass="tool-tip smaller-font">
+        <div class="box" data-test-disabled-tooltip>
+          {{@disabledTooltip}}
+        </div>
+      </T.Content>
+    </ToolTip>
+  {{else}}
+    <LinkToComponent ...attributes>
+      {{yield}}
+      <Icon @name={{this.glyph}} data-test-icon={{this.glyph}} />
+    </LinkToComponent>
+  {{/if}}
+{{/let}}
\ No newline at end of file
diff --git a/ui/lib/core/addon/components/toolbar-link.js b/ui/lib/core/addon/components/toolbar-link.js
index b8014434410f8..cbc1b228c641c 100644
--- a/ui/lib/core/addon/components/toolbar-link.js
+++ b/ui/lib/core/addon/components/toolbar-link.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@glimmer/component';
 /**
  * @module ToolbarLink
@@ -13,39 +8,21 @@ import Component from '@glimmer/component';
  * ```js
  * <Toolbar>
  *   <ToolbarActions>
- *     <ToolbarLink @route="vault.cluster.policies.create" @type="add" @disabled={{true}} @disabledTooltip="This link is disabled">
+ *     <ToolbarLink @params={{array 'vault.cluster.policies.create'}} @type="add" @disabled={{true}} @disabledTooltip="This link is disabled">
  *       Create policy
  *     </ToolbarLink>
  *   </ToolbarActions>
  * </Toolbar>
  * ```
  *
- * @param {string} route - route to pass to LinkTo
- * @param {Model} model - model to pass to LinkTo
- * @param {Array} models - array of models to pass to LinkTo
- * @param {Object} query - query params to pass to LinkTo
- * @param {boolean} replace - replace arg to pass to LinkTo
- * @param {string} type - Use "add" to change icon to plus sign, or pass in your own kind of icon.
+ * @param {array} params - Array to pass to LinkTo
+ * @param {string} type - Use "add" to change icon
  * @param {boolean} disabled - pass true to disable link
  * @param {string} disabledTooltip - tooltip to display on hover when disabled
  */
 
 export default class ToolbarLinkComponent extends Component {
   get glyph() {
-    // not ideal logic. Without refactoring, this allows us to add in our own icon type outside of chevron-right or plus.
-    // For a later refactor we should remove the substitution for add to plus and just return type.
-    const { type } = this.args;
-    if (!type) return 'chevron-right';
-    return type === 'add' ? 'plus' : type;
-  }
-  get models() {
-    const { model, models } = this.args;
-    if (model) {
-      return [model];
-    }
-    return models || [];
-  }
-  get query() {
-    return this.args.query || {};
+    return this.args.type == 'add' ? 'plus' : 'chevron-right';
   }
 }
diff --git a/ui/lib/core/addon/components/toolbar.js b/ui/lib/core/addon/components/toolbar.js
new file mode 100644
index 0000000000000..dd57c446dd6c4
--- /dev/null
+++ b/ui/lib/core/addon/components/toolbar.js
@@ -0,0 +1,24 @@
+/**
+ * @module Toolbar
+ * `Toolbar` components are containers for Toolbar actions.
+ *
+ * @example
+ * ```js
+ * <Toolbar>
+ *   <ToolbarActions>
+ *     <ToolbarSecretLink @params={{array 'vault.cluster.policies.create'}} @type="add">
+ *       Create policy
+ *     </ToolbarSecretLink>
+ *   </ToolbarActions>
+ * </Toolbar>
+ * ```
+ *
+ */
+
+import Component from '@ember/component';
+import layout from '../templates/components/toolbar';
+
+export default Component.extend({
+  tagName: '',
+  layout,
+});
diff --git a/ui/lib/core/addon/components/ttl-picker.js b/ui/lib/core/addon/components/ttl-picker.js
index c05fff67644f6..8560fdd9aa06a 100644
--- a/ui/lib/core/addon/components/ttl-picker.js
+++ b/ui/lib/core/addon/components/ttl-picker.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /**
  * @module TtlPicker
  * TtlPicker components are used to enable and select duration values such as TTL.
@@ -18,7 +13,6 @@
  * @param onChange {Function} - This function will be passed a TTL object, which includes enabled{bool}, seconds{number}, timeString{string}, goSafeTimeString{string}.
  * @param initialEnabled=false {Boolean} - Set this value if you want the toggle on when component is mounted
  * @param label="Time to live (TTL)" {String} - Label is the main label that lives next to the toggle. Yielded values will replace the label
- * @param labelDisabled=Label to display when TTL is toggled off
  * @param helperTextEnabled="" {String} - This helper text is shown under the label when the toggle is switched on
  * @param helperTextDisabled="" {String} - This helper text is shown under the label when the toggle is switched off
  * @param initialValue=null {string} - InitialValue is the duration value which will be shown when the component is loaded. If it can't be parsed, will default to 0.
@@ -30,16 +24,41 @@ import Component from '@glimmer/component';
 import { typeOf } from '@ember/utils';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
+import Duration from '@icholy/duration';
 import { guidFor } from '@ember/object/internals';
 import Ember from 'ember';
 import { restartableTask, timeout } from 'ember-concurrency';
-import {
-  convertFromSeconds,
-  convertToSeconds,
-  durationToSeconds,
-  goSafeConvertFromSeconds,
-  largestUnitFromSeconds,
-} from 'core/utils/duration-utils';
+
+export const secondsMap = {
+  s: 1,
+  m: 60,
+  h: 3600,
+  d: 86400,
+};
+const convertToSeconds = (time, unit) => {
+  return time * secondsMap[unit];
+};
+const convertFromSeconds = (seconds, unit) => {
+  return seconds / secondsMap[unit];
+};
+const goSafeConvertFromSeconds = (seconds, unit) => {
+  // Go only accepts s, m, or h units
+  const u = unit === 'd' ? 'h' : unit;
+  return convertFromSeconds(seconds, u) + u;
+};
+const largestUnitFromSeconds = (seconds) => {
+  let unit = 's';
+  if (seconds === 0) return unit;
+  // get largest unit with no remainder
+  if (seconds % secondsMap.d === 0) {
+    unit = 'd';
+  } else if (seconds % secondsMap.h === 0) {
+    unit = 'h';
+  } else if (seconds % secondsMap.m === 0) {
+    unit = 'm';
+  }
+  return unit;
+};
 export default class TtlPickerComponent extends Component {
   @tracked enableTTL = false;
   @tracked recalculateSeconds = false;
@@ -53,9 +72,6 @@ export default class TtlPickerComponent extends Component {
   elementId = 'ttl-' + guidFor(this);
 
   get label() {
-    if (this.args.label && this.args.labelDisabled) {
-      return this.enableTTL ? this.args.label : this.args.labelDisabled;
-    }
     return this.args.label || 'Time to live (TTL)';
   }
   get helperText() {
@@ -80,19 +96,18 @@ export default class TtlPickerComponent extends Component {
 
   initializeTtl() {
     const initialValue = this.args.initialValue;
-
     let seconds = 0;
-
     if (typeof initialValue === 'number') {
       // if the passed value is a number, assume unit is seconds
       seconds = initialValue;
     } else {
-      const parseDuration = durationToSeconds(initialValue);
-      // if parsing fails leave it empty
-      if (parseDuration === null) return;
-      seconds = parseDuration;
+      try {
+        seconds = Duration.parse(initialValue).seconds();
+      } catch (e) {
+        // if parsing fails leave it empty
+        return;
+      }
     }
-
     const unit = largestUnitFromSeconds(seconds);
     this.time = convertFromSeconds(seconds, unit);
     this.unit = unit;
diff --git a/ui/lib/core/addon/components/upgrade-page.hbs b/ui/lib/core/addon/components/upgrade-page.hbs
deleted file mode 100644
index 1b0145ad10409..0000000000000
--- a/ui/lib/core/addon/components/upgrade-page.hbs
+++ /dev/null
@@ -1,21 +0,0 @@
-<PageHeader as |p|>
-  <p.levelLeft>
-    <h1 class="title is-3">
-      {{this.title}}
-    </h1>
-  </p.levelLeft>
-</PageHeader>
-
-<EmptyState
-  @title="Upgrade to use {{this.featureName}}"
-  @message="You will need {{this.minimumEdition}} with {{this.featureName}} included to use this feature."
->
-  <ExternalLink
-    @href="https://www.hashicorp.com/products/vault/enterprise?source=vaultui_{{this.featureName}}"
-    class="link has-icon-right"
-    data-test-upgrade-link
-  >
-    Vault Enterprise
-    <Chevron />
-  </ExternalLink>
-</EmptyState>
\ No newline at end of file
diff --git a/ui/lib/core/addon/components/upgrade-page.js b/ui/lib/core/addon/components/upgrade-page.js
index 69194c3847770..ef5051c386ef7 100644
--- a/ui/lib/core/addon/components/upgrade-page.js
+++ b/ui/lib/core/addon/components/upgrade-page.js
@@ -1,19 +1,13 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
+import Component from '@ember/component';
+import { computed } from '@ember/object';
+import layout from '../templates/components/upgrade-page';
 
-import Component from '@glimmer/component';
-
-export default class UpgradePage extends Component {
-  get minimumEdition() {
-    return this.args.minimumEdition || 'Vault Enterprise';
-  }
-  get title() {
-    return this.args.title || 'Vault Enterprise';
-  }
-
-  get featureName() {
-    return this.title === 'Vault Enterprise' ? 'this feature' : this.title;
-  }
-}
+export default Component.extend({
+  layout,
+  title: 'Vault Enterprise',
+  featureName: computed('title', function () {
+    let title = this.title;
+    return title === 'Vault Enterprise' ? 'this feature' : title;
+  }),
+  minimumEdition: 'Vault Enterprise',
+});
diff --git a/ui/lib/core/addon/components/vault-logo-spinner.js b/ui/lib/core/addon/components/vault-logo-spinner.js
new file mode 100644
index 0000000000000..270837619a8ff
--- /dev/null
+++ b/ui/lib/core/addon/components/vault-logo-spinner.js
@@ -0,0 +1,17 @@
+import Component from '@ember/component';
+import layout from '../templates/components/vault-logo-spinner';
+
+/**
+ * @module VaultLogoSpinner
+ * `VaultLogoSpinner` displays an animated Vault logo to use for loading screens.
+ *
+ * @example
+ * ```js
+ * <VaultLogoSpinner />
+ * ```
+ */
+
+export default Component.extend({
+  layout,
+  tagName: '',
+});
diff --git a/ui/lib/core/addon/decorators/confirm-leave.js b/ui/lib/core/addon/decorators/confirm-leave.js
deleted file mode 100644
index 77d2360237391..0000000000000
--- a/ui/lib/core/addon/decorators/confirm-leave.js
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { action } from '@ember/object';
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-import Ember from 'ember';
-
-/**
- * Confirm that the user wants to discard unsaved changes before leaving the page. This decorator hooks into
- * the willTransition action. If you override setupController, be sure to set 'model' on the controller to
- * store data or this won't work.
- *
- * By default it will check if the route's model is dirty and prompt when leaving. Usage for this is simple:
- *
- * @withConfirmLeave()
- * export default class MyRoute extends Route {
- *   @service store;
- *   model() {
- *     return this.store.createRecord('some-model')
- *   }
- * }
- *
- * If the route has ember-data models at multiple paths, you can pass an array of secondary modelPaths which
- * will rollback on exit after the prompt for the first model is confirmed. In the example below, the window
- * will only prompt on leave if `model.main` is dirty. Either way, `model.secondary` and `model.optional`
- * will be cleaned up from the data store.
- *
- * @withConfirmLeave('model.main', ['model.secondary', 'model.optional'])
- * export default class MyRoute extends Route {
- *   @service store;
- *   model() {
- *     return {
- *       main: this.store.peekRecord('some-model', 'abc1')
- *       secondary: this.store.createRecord('some-other')
- *       optional: this.store.createRecord('optional')
- *     }
- *   }
- * }
- *
- */
-export function withConfirmLeave(modelPath = 'model', silentCleanupPaths) {
-  return function decorator(SuperClass) {
-    if (!Object.prototype.isPrototypeOf.call(Route, SuperClass)) {
-      // eslint-disable-next-line
-      console.error(
-        'withConfirmLeave decorator must be used on instance of ember Route class. Decorator not applied to returned class'
-      );
-      return SuperClass;
-    }
-    return class ConfirmLeave extends SuperClass {
-      @service store;
-
-      _rollbackModel(modelPath) {
-        const model = this.controller.get(modelPath);
-        // we only want to complete rollback if the model is dirty and not saving
-        if (model && model.hasDirtyAttributes && !model.isSaving) {
-          const method = model.isNew ? 'unloadRecord' : 'rollbackAttributes';
-          model[method]();
-        }
-      }
-
-      @action
-      willTransition(transition) {
-        try {
-          super.willTransition(...arguments);
-        } catch (e) {
-          // if the SuperClass doesn't have willTransition
-          // defined calling it will throw an error.
-        }
-        const model = this.controller.get(modelPath);
-
-        if (model && model.hasDirtyAttributes && !model.isSaving) {
-          if (
-            Ember.testing ||
-            window.confirm(
-              'You have unsaved changes. Navigating away will discard these changes. Are you sure you want to discard your changes?'
-            )
-          ) {
-            this._rollbackModel(modelPath);
-          } else {
-            transition.abort();
-            return false;
-          }
-        }
-        silentCleanupPaths?.forEach((pathToModel) => {
-          this._rollbackModel(pathToModel);
-        });
-        return true;
-      }
-    };
-  };
-}
diff --git a/ui/lib/core/addon/helpers/changelog-url-for.js b/ui/lib/core/addon/helpers/changelog-url-for.js
index fc7171b299a8b..9aac5e2260c39 100644
--- a/ui/lib/core/addon/helpers/changelog-url-for.js
+++ b/ui/lib/core/addon/helpers/changelog-url-for.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { helper } from '@ember/component/helper';
 
 /*
@@ -19,19 +14,19 @@ etc.
 */
 
 export function changelogUrlFor([version]) {
-  const url = 'https://www.github.com/hashicorp/vault/blob/main/CHANGELOG.md#';
+  let url = 'https://www.github.com/hashicorp/vault/blob/main/CHANGELOG.md#';
   if (!version) return url;
   try {
     // strip the '+prem' from enterprise versions and remove periods
-    const versionNumber = version.split('+')[0].split('.').join('');
+    let versionNumber = version.split('+')[0].split('.').join('');
 
     // only recent versions have a predictable url
     if (versionNumber >= '143') {
       return url.concat(versionNumber);
     }
   } catch (e) {
-    console.log(e); // eslint-disable-line
-    console.log('Cannot generate URL for version: ', version); // eslint-disable-line
+    console.log(e);
+    console.log('Cannot generate URL for version: ', version);
   }
   return url;
 }
diff --git a/ui/lib/core/addon/helpers/cluster-states.js b/ui/lib/core/addon/helpers/cluster-states.js
index 6bfa38583b59e..014e5d224d29d 100644
--- a/ui/lib/core/addon/helpers/cluster-states.js
+++ b/ui/lib/core/addon/helpers/cluster-states.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { helper as buildHelper } from '@ember/component/helper';
 
 // A hash of cluster states to ensure that the status menu and replication dashboards
diff --git a/ui/lib/core/addon/helpers/date-format.js b/ui/lib/core/addon/helpers/date-format.js
index f5b0c772c4972..f2f8f9ec4b047 100644
--- a/ui/lib/core/addon/helpers/date-format.js
+++ b/ui/lib/core/addon/helpers/date-format.js
@@ -1,16 +1,16 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { helper } from '@ember/component/helper';
 import { format, parseISO } from 'date-fns';
 
-export function dateFormat([date, style], { isFormatted = false, withTimeZone = false }) {
+export function dateFormat([date, style], { isFormatted = false, dateOnly = false }) {
   // see format breaking in upgrade to date-fns 2.x https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md#changed-5
   if (isFormatted) {
     return format(new Date(date), style);
   }
+  // when date is in '2021-09-01T00:00:00Z' format
+  // remove hours so date displays unaffected by timezone
+  if (dateOnly && typeof date === 'string') {
+    date = date.split('T')[0];
+  }
   let number = typeof date === 'string' ? parseISO(date) : date;
   if (!number) {
     return;
@@ -18,15 +18,7 @@ export function dateFormat([date, style], { isFormatted = false, withTimeZone =
   if (number.toString().length === 10) {
     number = new Date(number * 1000);
   }
-  let zone; // local timezone ex: 'PST'
-  try {
-    // passing undefined means default to the browser's locale
-    zone = ' ' + number.toLocaleTimeString(undefined, { timeZoneName: 'short' }).split(' ')[2];
-  } catch (e) {
-    zone = '';
-  }
-  zone = withTimeZone ? zone : '';
-  return format(number, style) + zone;
+  return format(number, style);
 }
 
 export default helper(dateFormat);
diff --git a/ui/lib/core/addon/helpers/format-duration.js b/ui/lib/core/addon/helpers/format-duration.js
deleted file mode 100644
index 18f5128e0c222..0000000000000
--- a/ui/lib/core/addon/helpers/format-duration.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { helper } from '@ember/component/helper';
-import { durationToSeconds } from 'core/utils/duration-utils';
-import { formatDuration, intervalToDuration } from 'date-fns';
-
-export function duration([time]) {
-  // 0 (integer) does not necessarily mean 0 seconds, i.e. it can represent using system ttl defaults
-  if (time === 0) return time;
-
-  // assume numbers are seconds or parses duration strings into seconds
-  const seconds = durationToSeconds(time);
-
-  if (Number.isInteger(seconds)) {
-    // durationObject: { years: 0, months: 0, days: 0, hours: 1, minutes: 0, seconds: 6 }
-    const durationObject = intervalToDuration({ start: 0, end: seconds * 1000 });
-
-    if (Object.values(durationObject).every((v) => v === 0)) {
-      // formatDuration returns an empty string if every value is 0
-      return '0 seconds';
-    }
-    // convert to human-readable format: '1 hour 6 seconds'
-    return formatDuration(durationObject);
-  }
-  return time;
-}
-
-export default helper(duration);
diff --git a/ui/lib/core/addon/helpers/format-number.js b/ui/lib/core/addon/helpers/format-number.js
index f0f0567a0a10c..51bad2971a01e 100644
--- a/ui/lib/core/addon/helpers/format-number.js
+++ b/ui/lib/core/addon/helpers/format-number.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { helper } from '@ember/component/helper';
 
 export function formatNumber([value]) {
diff --git a/ui/lib/core/addon/helpers/has-feature.js b/ui/lib/core/addon/helpers/has-feature.js
index 77c192b6ea70a..02afb86aefe81 100644
--- a/ui/lib/core/addon/helpers/has-feature.js
+++ b/ui/lib/core/addon/helpers/has-feature.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /* eslint-disable ember/no-observers */
 import { inject as service } from '@ember/service';
 import { assert } from '@ember/debug';
diff --git a/ui/lib/core/addon/helpers/img-path.js b/ui/lib/core/addon/helpers/img-path.js
deleted file mode 100644
index 86f0e013f553d..0000000000000
--- a/ui/lib/core/addon/helpers/img-path.js
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { helper } from '@ember/component/helper';
-import ENV from 'vault/config/environment';
-
-export default helper(function ([path]) {
-  return path.replace(/^~\//, `${ENV.rootURL}images/`);
-});
diff --git a/ui/lib/core/addon/helpers/is-active-route.js b/ui/lib/core/addon/helpers/is-active-route.js
index b101b42fd4677..36029f8839226 100644
--- a/ui/lib/core/addon/helpers/is-active-route.js
+++ b/ui/lib/core/addon/helpers/is-active-route.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /* eslint-disable ember/no-observers */
 import { inject as service } from '@ember/service';
 import { isArray } from '@ember/array';
@@ -24,7 +19,7 @@ export default Helper.extend({
     const currentRoute = router.get('currentRouteName');
     let currentURL = router.get('currentURL');
     // if we have any query params we want to discard them
-    currentURL = currentURL?.split('?')[0];
+    currentURL = currentURL.split('?')[0];
     const comparator = isExact ? exact : startsWith;
     if (!currentRoute) {
       return false;
diff --git a/ui/lib/core/addon/helpers/is-version.js b/ui/lib/core/addon/helpers/is-version.js
index 82bd768a94318..a9bb0fd6ed8e3 100644
--- a/ui/lib/core/addon/helpers/is-version.js
+++ b/ui/lib/core/addon/helpers/is-version.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /* eslint-disable ember/no-observers */
 import { inject as service } from '@ember/service';
 import { assert } from '@ember/debug';
diff --git a/ui/lib/core/addon/helpers/loose-equal.js b/ui/lib/core/addon/helpers/loose-equal.js
deleted file mode 100644
index 78767fe552eb5..0000000000000
--- a/ui/lib/core/addon/helpers/loose-equal.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { helper } from '@ember/component/helper';
-
-/* 
- * use sparingly *
-  ex: logic for an HTML element's selected boolean because <select> values are strings
-  strict equal (===) will fail if the API param is a number
-  <option selected={{loose-equal model.someAttr someOption)}} value={{someOption}}>
-*/
-export function looseEqual([a, b]) {
-  // loose equal 0 == '' returns true, we don't want that
-  if ((a === 0 && b === '') || (a === '' && b === 0)) {
-    return false;
-  }
-  return a == b;
-}
-
-export default helper(looseEqual);
diff --git a/ui/lib/core/addon/helpers/message-types.js b/ui/lib/core/addon/helpers/message-types.js
index b80ea201916be..a3416dee203cc 100644
--- a/ui/lib/core/addon/helpers/message-types.js
+++ b/ui/lib/core/addon/helpers/message-types.js
@@ -1,10 +1,4 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { helper as buildHelper } from '@ember/component/helper';
-import { assert } from '@ember/debug';
 
 export const MESSAGE_TYPES = {
   info: {
@@ -37,17 +31,9 @@ export const MESSAGE_TYPES = {
     glyph: 'loading',
     text: 'Loading',
   },
-  rotation: {
-    class: 'is-info',
-    glyphClass: 'has-text-grey',
-    glyph: 'rotate-cw',
-  },
 };
 
 export function messageTypes([type]) {
-  if (!(type in MESSAGE_TYPES)) {
-    assert('type is not a valid message type.');
-  }
   return MESSAGE_TYPES[type];
 }
 
diff --git a/ui/lib/core/addon/helpers/options-for-backend.js b/ui/lib/core/addon/helpers/options-for-backend.js
index e12a667a46b68..64728d8f599ed 100644
--- a/ui/lib/core/addon/helpers/options-for-backend.js
+++ b/ui/lib/core/addon/helpers/options-for-backend.js
@@ -1,13 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { helper as buildHelper } from '@ember/component/helper';
 import { capitalize } from '@ember/string';
-
-// TODO move all pki related logic to its ember engine
-// then we can remove use of SecretListHeader there, and use self-managed component like TabPageHeader in k8
+import { assign } from '@ember/polyfills';
 
 const DEFAULT_DISPLAY = {
   searchPlaceholder: 'Filter secrets',
@@ -17,40 +10,37 @@ const DEFAULT_DISPLAY = {
   editComponent: 'secret-edit',
   listItemPartial: 'secret-list/item',
 };
-
-const PKI_ENGINE_BACKEND = {
-  displayName: 'PKI',
-  navigateTree: false,
-  tabs: [
-    {
-      label: 'Overview',
-      link: 'overview',
-    },
-    {
-      label: 'Roles',
-      link: 'roles',
-    },
-    {
-      label: 'Issuers',
-      link: 'issuers',
-    },
-    {
-      label: 'Keys',
-      link: 'keys',
-    },
-    {
-      label: 'Certificates',
-      link: 'certificates',
-    },
-    {
-      label: 'Tidy',
-      link: 'tidy',
-    },
-    {
-      label: 'Configuration',
-      link: 'configuration',
-    },
-  ],
+const ENGINE_SECRET_BACKENDS = {
+  pki: {
+    displayName: 'PKI',
+    navigateTree: false,
+    tabs: [
+      {
+        label: 'Overview',
+        link: 'overview',
+      },
+      {
+        label: 'Roles',
+        link: 'roles',
+      },
+      {
+        label: 'Issuers',
+        link: 'issuers',
+      },
+      {
+        label: 'Certificates',
+        link: 'certificates',
+      },
+      {
+        label: 'Keys',
+        link: 'keys',
+      },
+      {
+        label: 'Configuration',
+        link: 'configuration',
+      },
+    ],
+  },
 };
 const SECRET_BACKENDS = {
   aws: {
@@ -62,6 +52,32 @@ const SECRET_BACKENDS = {
     editComponent: 'role-aws-edit',
     listItemPartial: 'secret-list/aws-role-item',
   },
+  pki: {
+    displayName: 'PKI',
+    navigateTree: false,
+    listItemPartial: 'secret-list/pki-role-item',
+    tabs: [
+      {
+        name: 'roles',
+        label: 'Roles',
+        searchPlaceholder: 'Filter roles',
+        item: 'role',
+        create: 'Create role',
+        editComponent: 'pki/role-pki-edit',
+      },
+      {
+        name: 'cert',
+        modelPrefix: 'cert/',
+        label: 'Certificates',
+        searchPlaceholder: 'Filter certificates',
+        item: 'certificates',
+        create: 'Create role',
+        tab: 'cert',
+        listItemPartial: 'secret-list/pki-cert-item',
+        editComponent: 'pki/pki-cert-show',
+      },
+    ],
+  },
   ssh: {
     displayName: 'SSH',
     searchPlaceholder: 'Filter roles',
@@ -128,7 +144,7 @@ const SECRET_BACKENDS = {
     displayName: 'Transformation',
     navigateTree: false,
     listItemPartial: 'secret-list/transform-list-item',
-    firstStep: `To use transform, you'll need to create a transformation and a role.`,
+    firstStep: 'create a transformation and a role',
     tabs: [
       {
         name: 'transformations',
@@ -178,29 +194,26 @@ const SECRET_BACKENDS = {
     navigateTree: false,
     editComponent: 'transit-edit',
     listItemPartial: 'secret-list/item',
-    firstStep: `To use transit, you'll need to create an encryption key`,
+    firstStep: 'create an encryption key',
   },
 };
 
-export function optionsForBackend(backend, tab, isEngine) {
-  let selected = SECRET_BACKENDS[backend];
-  if (backend === 'pki' && isEngine) {
-    selected = PKI_ENGINE_BACKEND;
-  }
-
+export function optionsForBackend([backend, tab, isEngine]) {
+  const selected = isEngine ? ENGINE_SECRET_BACKENDS[backend] : SECRET_BACKENDS[backend];
   let backendOptions;
+
   if (selected && selected.tabs) {
-    const tabData =
+    let tabData =
       selected.tabs.findBy('name', tab) || selected.tabs.findBy('modelPrefix', tab) || selected.tabs[0];
-    backendOptions = { ...selected, ...tabData };
+    backendOptions = assign({}, selected, tabData);
   } else if (selected) {
     backendOptions = selected;
   } else {
-    backendOptions = { ...DEFAULT_DISPLAY, displayName: backend === 'kv' ? 'KV' : capitalize(backend) };
+    backendOptions = assign({}, DEFAULT_DISPLAY, {
+      displayName: backend === 'kv' ? 'KV' : capitalize(backend),
+    });
   }
   return backendOptions;
 }
 
-export default buildHelper(function ([backend, tab, isEngine]) {
-  return optionsForBackend(backend, tab, isEngine);
-});
+export default buildHelper(optionsForBackend);
diff --git a/ui/lib/core/addon/helpers/path-or-array.js b/ui/lib/core/addon/helpers/path-or-array.js
index ba157e29f427c..3d037e1ef7778 100644
--- a/ui/lib/core/addon/helpers/path-or-array.js
+++ b/ui/lib/core/addon/helpers/path-or-array.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { helper as buildHelper } from '@ember/component/helper';
 
 export function pathOrArray([maybeArray, target]) {
diff --git a/ui/lib/core/addon/helpers/replication-action-for-mode.js b/ui/lib/core/addon/helpers/replication-action-for-mode.js
index 0289fa8110c1b..d560871f43a4e 100644
--- a/ui/lib/core/addon/helpers/replication-action-for-mode.js
+++ b/ui/lib/core/addon/helpers/replication-action-for-mode.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { helper as buildHelper } from '@ember/component/helper';
 import { get } from '@ember/object';
 const ACTIONS = {
diff --git a/ui/lib/core/addon/helpers/replication-mode-description.js b/ui/lib/core/addon/helpers/replication-mode-description.js
index a6c9262b033c1..66941569522af 100644
--- a/ui/lib/core/addon/helpers/replication-mode-description.js
+++ b/ui/lib/core/addon/helpers/replication-mode-description.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { helper as buildHelper } from '@ember/component/helper';
 
 const REPLICATION_MODE_DESCRIPTIONS = {
diff --git a/ui/lib/core/addon/helpers/set-flash-message.js b/ui/lib/core/addon/helpers/set-flash-message.js
index 20abeb6384bc1..b20a7544ec477 100644
--- a/ui/lib/core/addon/helpers/set-flash-message.js
+++ b/ui/lib/core/addon/helpers/set-flash-message.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import Helper from '@ember/component/helper';
 
diff --git a/ui/lib/core/addon/mixins/list-controller.js b/ui/lib/core/addon/mixins/list-controller.js
index c830001824eef..ed5f39d8a22b7 100644
--- a/ui/lib/core/addon/mixins/list-controller.js
+++ b/ui/lib/core/addon/mixins/list-controller.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { computed } from '@ember/object';
 import Mixin from '@ember/object/mixin';
 import escapeStringRegexp from 'escape-string-regexp';
@@ -22,21 +17,21 @@ export default Mixin.create({
   isLoading: false,
 
   filterMatchesKey: computed('filter', 'model', 'model.[]', function () {
-    const { filter, model: content } = this;
+    let { filter, model: content } = this;
     return !!(content.length && content.findBy('id', filter));
   }),
 
   firstPartialMatch: computed('filter', 'model', 'model.[]', 'filterMatchesKey', function () {
-    const { filter, filterMatchesKey, model: content } = this;
-    const re = new RegExp('^' + escapeStringRegexp(filter));
-    const matchSet = content.filter((key) => re.test(key.id));
-    const match = matchSet[0];
+    let { filter, filterMatchesKey, model: content } = this;
+    let re = new RegExp('^' + escapeStringRegexp(filter));
+    let matchSet = content.filter((key) => re.test(key.id));
+    let match = matchSet[0];
 
     if (filterMatchesKey || !match) {
       return null;
     }
 
-    const sharedPrefix = commonPrefix(content);
+    let sharedPrefix = commonPrefix(content);
     // if we already are filtering the prefix, then next we want
     // the exact match
     if (filter === sharedPrefix || matchSet.length === 1) {
diff --git a/ui/lib/core/addon/mixins/list-route.js b/ui/lib/core/addon/mixins/list-route.js
index 724b9516a32e4..c489dc1efbfdc 100644
--- a/ui/lib/core/addon/mixins/list-route.js
+++ b/ui/lib/core/addon/mixins/list-route.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Mixin from '@ember/object/mixin';
 
 export default Mixin.create({
@@ -16,7 +11,7 @@ export default Mixin.create({
   },
 
   setupController(controller, resolvedModel) {
-    const { pageFilter } = this.paramsFor(this.routeName);
+    let { pageFilter } = this.paramsFor(this.routeName);
     this._super(...arguments);
     controller.setProperties({
       filter: pageFilter || '',
diff --git a/ui/lib/core/addon/mixins/replication-actions.js b/ui/lib/core/addon/mixins/replication-actions.js
index c326f17f215e8..974a42dca5365 100644
--- a/ui/lib/core/addon/mixins/replication-actions.js
+++ b/ui/lib/core/addon/mixins/replication-actions.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import { or } from '@ember/object/computed';
 import { isPresent } from '@ember/utils';
@@ -17,7 +12,7 @@ export default Mixin.create({
   onDisable() {},
   onPromote() {},
   submitHandler: task(function* (action, clusterMode, data, event) {
-    const replicationMode = (data && data.replicationMode) || this.replicationMode;
+    let replicationMode = (data && data.replicationMode) || this.replicationMode;
     if (event && event.preventDefault) {
       event.preventDefault();
     }
@@ -79,7 +74,7 @@ export default Mixin.create({
       // do something to show model is pending
       cluster.set(
         replicationMode,
-        store.createRecord('replication-attributes', {
+        store.createFragment('replication-attributes', {
           mode: 'bootstrapping',
         })
       );
diff --git a/ui/lib/core/addon/modifiers/code-mirror.js b/ui/lib/core/addon/modifiers/code-mirror.js
deleted file mode 100644
index edce3247c5d88..0000000000000
--- a/ui/lib/core/addon/modifiers/code-mirror.js
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { action } from '@ember/object';
-import { bind } from '@ember/runloop';
-import codemirror from 'codemirror';
-import Modifier from 'ember-modifier';
-
-import 'codemirror/addon/edit/matchbrackets';
-import 'codemirror/addon/selection/active-line';
-import 'codemirror/addon/lint/lint.js';
-import 'codemirror/addon/lint/json-lint.js';
-// right now we only use the ruby and javascript, if you use another mode you'll need to import it.
-// https://codemirror.net/mode/
-import 'codemirror/mode/ruby/ruby';
-import 'codemirror/mode/javascript/javascript';
-
-export default class CodeMirrorModifier extends Modifier {
-  didInstall() {
-    this._setup();
-  }
-
-  didUpdateArguments() {
-    this._editor.setOption('readOnly', this.args.named.readOnly);
-    if (!this.args.named.content) {
-      return;
-    }
-    if (this._editor.getValue() !== this.args.named.content) {
-      this._editor.setValue(this.args.named.content);
-    }
-  }
-
-  @action
-  _onChange(editor) {
-    // avoid sending change event after initial setup when editor value is set to content
-    if (this.args.named.content !== editor.getValue()) {
-      this.args.named.onUpdate(editor.getValue(), this._editor);
-    }
-  }
-
-  @action
-  _onFocus(editor) {
-    this.args.named.onFocus(editor.getValue());
-  }
-
-  _setup() {
-    if (!this.element) {
-      throw new Error('CodeMirror modifier has no element');
-    }
-    const editor = codemirror(this.element, {
-      // IMPORTANT: `gutters` must come before `lint` since the presence of
-      // `gutters` is cached internally when `lint` is toggled
-      gutters: this.args.named.gutters || ['CodeMirror-lint-markers'],
-      matchBrackets: true,
-      lint: { lintOnChange: true },
-      showCursorWhenSelecting: true,
-      styleActiveLine: true,
-      tabSize: 2,
-      // all values we can pass into the JsonEditor
-      extraKeys: this.args.named.extraKeys || '',
-      lineNumbers: this.args.named.lineNumbers,
-      mode: this.args.named.mode || 'application/json',
-      readOnly: this.args.named.readOnly || false,
-      theme: this.args.named.theme || 'hashi',
-      value: this.args.named.content || '',
-      viewportMargin: this.args.named.viewportMargin || '',
-    });
-
-    editor.on('change', bind(this, this._onChange));
-    editor.on('focus', bind(this, this._onFocus));
-
-    this._editor = editor;
-  }
-}
diff --git a/ui/lib/core/addon/templates/components/alert-banner.hbs b/ui/lib/core/addon/templates/components/alert-banner.hbs
new file mode 100644
index 0000000000000..cbb9d772d3c1a
--- /dev/null
+++ b/ui/lib/core/addon/templates/components/alert-banner.hbs
@@ -0,0 +1,36 @@
+<div data-test-alert-banner={{this.bannerType}}>
+  <div class="columns is-mobile is-variable is-1">
+    <div class="column is-narrow message-icon">
+      <Icon class={{this.alertType.glyphClass}} aria-hidden="true" @name={{this.alertType.glyph}} />
+    </div>
+    {{#if @yieldWithoutColumn}}
+      {{yield}}
+    {{else}}
+      <div class="column">
+        <div class="message-title">
+          {{or @title this.alertType.text}}
+          {{#if @secondIconType}}
+            <Icon class={{this.secondAlertType.glyphClass}} aria-hidden="true" @name={{this.secondAlertType.glyph}} />
+          {{/if}}
+          {{#if @progressBar}}
+            <progress
+              value={{this.progressBar.value}}
+              max={{this.progressBar.max}}
+              class="progress is-success is-medium is-inline-block"
+            ></progress>
+          {{/if}}
+        </div>
+        {{#if @message}}
+          <p class="alert-banner-message-body">
+            {{@message}}
+          </p>
+        {{/if}}
+        {{#if (has-block)}}
+          <p class="message-actions">
+            {{yield}}
+          </p>
+        {{/if}}
+      </div>
+    {{/if}}
+  </div>
+</div>
\ No newline at end of file
diff --git a/ui/lib/core/addon/components/box-radio.hbs b/ui/lib/core/addon/templates/components/box-radio.hbs
similarity index 100%
rename from ui/lib/core/addon/components/box-radio.hbs
rename to ui/lib/core/addon/templates/components/box-radio.hbs
diff --git a/ui/lib/core/addon/components/chevron.hbs b/ui/lib/core/addon/templates/components/chevron.hbs
similarity index 100%
rename from ui/lib/core/addon/components/chevron.hbs
rename to ui/lib/core/addon/templates/components/chevron.hbs
diff --git a/ui/lib/core/addon/templates/components/empty-state.hbs b/ui/lib/core/addon/templates/components/empty-state.hbs
new file mode 100644
index 0000000000000..f96eb63841735
--- /dev/null
+++ b/ui/lib/core/addon/templates/components/empty-state.hbs
@@ -0,0 +1,43 @@
+<div data-test-component="empty-state" class="empty-state" ...attributes>
+  <div class="empty-state-content">
+    {{#if this.icon}}
+      <div class="empty-state-icon">
+        <Icon @name={{this.icon}} @size="24" />
+        <h3 class="empty-state-title" data-test-empty-state-title>
+          {{this.title}}
+        </h3>
+      </div>
+      {{#if this.subTitle}}
+        <p class="empty-state-subTitle" data-test-empty-state-subText>
+          {{this.subTitle}}
+        </p>
+      {{/if}}
+    {{else}}
+      <h3 class={{concat "empty-state-title" (if this.subTitle " has-bottom-margin-m")}} data-test-empty-state-title>
+        {{this.title}}
+      </h3>
+      {{#if this.subTitle}}
+        <p class="empty-state-subTitle" data-test-empty-state-subText>
+          {{this.subTitle}}
+        </p>
+      {{/if}}
+    {{/if}}
+    {{#if this.message}}
+      <p
+        class={{concat "empty-state-message" (if this.bottomBorder " has-border-bottom-light")}}
+        data-test-empty-state-message
+      >
+        {{this.message}}
+      </p>
+    {{/if}}
+    {{#if (has-block)}}
+      <div class="empty-state-actions">
+        {{yield}}
+      </div>
+    {{else if this.emptyActions}}
+      <div class="empty-state-actions">
+        {{component this.emptyActions}}
+      </div>
+    {{/if}}
+  </div>
+</div>
\ No newline at end of file
diff --git a/ui/lib/core/addon/components/field-group-show.hbs b/ui/lib/core/addon/templates/components/field-group-show.hbs
similarity index 86%
rename from ui/lib/core/addon/components/field-group-show.hbs
rename to ui/lib/core/addon/templates/components/field-group-show.hbs
index ad6cd01ef9fa9..f82c0e3894606 100644
--- a/ui/lib/core/addon/components/field-group-show.hbs
+++ b/ui/lib/core/addon/templates/components/field-group-show.hbs
@@ -5,7 +5,7 @@
         {{#each fields as |attr|}}
           {{#if (not (includes attr.options.fieldValue (array "id" "mutableId")))}}
             <InfoTableRow
-              @alwaysRender={{@showAllFields}}
+              @alwaysRender={{this.showAllFields}}
               @label={{capitalize (or attr.options.label (humanize (dasherize attr.name)))}}
             >
               {{#if attr.options.sensitive}}
@@ -17,13 +17,13 @@
           {{/if}}
         {{/each}}
       {{else}}
-        <div class="box {{unless @showAllFields 'is-shadowless'}} is-fullwidth is-sideless is-marginless">
+        <div class="box {{unless this.showAllFields 'is-shadowless'}} is-fullwidth is-sideless is-marginless">
           <h2 class="title is-5">
             {{group}}
           </h2>
           {{#each fields as |attr|}}
             <InfoTableRow
-              @alwaysRender={{@showAllFields}}
+              @alwaysRender={{this.showAllFields}}
               @label={{capitalize (or attr.options.label (humanize (dasherize attr.name)))}}
             >
               {{#if attr.options.sensitive}}
diff --git a/ui/lib/core/addon/components/form-error.hbs b/ui/lib/core/addon/templates/components/form-error.hbs
similarity index 100%
rename from ui/lib/core/addon/components/form-error.hbs
rename to ui/lib/core/addon/templates/components/form-error.hbs
diff --git a/ui/lib/core/addon/templates/components/icon.hbs b/ui/lib/core/addon/templates/components/icon.hbs
new file mode 100644
index 0000000000000..f61cc50d2514d
--- /dev/null
+++ b/ui/lib/core/addon/templates/components/icon.hbs
@@ -0,0 +1,7 @@
+{{#if this.isFlightIcon}}
+  <FlightIcon @name={{@name}} @size={{@size}} ...attributes />
+{{else}}
+  <span class="hs-icon {{this.hsIconClass}}" ...attributes>
+    {{svg-jar @name}}
+  </span>
+{{/if}}
\ No newline at end of file
diff --git a/ui/lib/core/addon/components/info-table.hbs b/ui/lib/core/addon/templates/components/info-table.hbs
similarity index 86%
rename from ui/lib/core/addon/components/info-table.hbs
rename to ui/lib/core/addon/templates/components/info-table.hbs
index f813395052847..664f3653104b2 100644
--- a/ui/lib/core/addon/components/info-table.hbs
+++ b/ui/lib/core/addon/templates/components/info-table.hbs
@@ -6,12 +6,12 @@
     <thead class="has-text-weight-semibold">
       <tr>
         <th scope="col">
-          {{@header}}
+          {{this.header}}
         </th>
       </tr>
     </thead>
     <tbody>
-      {{#each @items as |item|}}
+      {{#each this.items as |item|}}
         <tr>
           <td>
             <InfoTableRow @value={{item}} />
diff --git a/ui/lib/core/addon/templates/components/info-tooltip.hbs b/ui/lib/core/addon/templates/components/info-tooltip.hbs
new file mode 100644
index 0000000000000..c5fa1c9f08eba
--- /dev/null
+++ b/ui/lib/core/addon/templates/components/info-tooltip.hbs
@@ -0,0 +1,16 @@
+<ToolTip as |d|>
+  <d.Trigger
+    @htmlTag="button"
+    @type="button"
+    class="tool-tip-trigger button is-ghost is-compact"
+    data-test-tool-tip-trigger={{true}}
+    onclick={{action "preventSubmit"}}
+  >
+    <Icon @name="info" class="auto-width" aria-label="help" />
+  </d.Trigger>
+  <d.Content @defaultClass="tool-tip">
+    <div class="box" data-test-info-tooltip-content>
+      {{yield}}
+    </div>
+  </d.Content>
+</ToolTip>
\ No newline at end of file
diff --git a/ui/lib/core/addon/components/layout-loading.hbs b/ui/lib/core/addon/templates/components/layout-loading.hbs
similarity index 100%
rename from ui/lib/core/addon/components/layout-loading.hbs
rename to ui/lib/core/addon/templates/components/layout-loading.hbs
diff --git a/ui/lib/core/addon/templates/components/linkable-item.hbs b/ui/lib/core/addon/templates/components/linkable-item.hbs
new file mode 100644
index 0000000000000..d2de17e04502d
--- /dev/null
+++ b/ui/lib/core/addon/templates/components/linkable-item.hbs
@@ -0,0 +1,17 @@
+<div ...attributes>
+  {{#if @disabled}}
+    <div class="list-item-row linkable-item is-no-underline">
+      {{yield (hash content=(component "linkable-item/content"))}}
+      {{yield (hash menu=(component "linkable-item/menu"))}}
+    </div>
+  {{else}}
+    <LinkedBlock
+      @params={{array @link.route @link.model}}
+      class="list-item-row linkable-item is-no-underline"
+      data-test-auth-backend-link={{@link.model}}
+    >
+      {{yield (hash content=(component "linkable-item/content"))}}
+      {{yield (hash menu=(component "linkable-item/menu"))}}
+    </LinkedBlock>
+  {{/if}}
+</div>
\ No newline at end of file
diff --git a/ui/lib/core/addon/templates/components/linkable-item/content.hbs b/ui/lib/core/addon/templates/components/linkable-item/content.hbs
new file mode 100644
index 0000000000000..d8f77fa01b843
--- /dev/null
+++ b/ui/lib/core/addon/templates/components/linkable-item/content.hbs
@@ -0,0 +1,44 @@
+<div class="linkable-item-content" data-test-linkable-item-content ...attributes>
+  <div class="has-text-grey">
+    {{#if @glyph}}
+      <ToolTip @horizontalPosition="left" as |T|>
+        <T.Trigger>
+          <Icon @name={{@glyph}} class="has-text-grey-light" data-test-linkable-item-glyph />
+        </T.Trigger>
+        <T.Content @defaultClass="tool-tip">
+          <div class="box">
+            {{or @glyphText @title}}
+          </div>
+        </T.Content>
+      </ToolTip>
+    {{/if}}
+
+    {{#if @title}}
+      {{#if @link}}
+        <LinkTo
+          @route={{@link.route}}
+          @model={{@link.model}}
+          class="has-text-black has-text-weight-semibold"
+          data-test-secret-path
+        >
+          {{@title}}
+        </LinkTo>
+      {{else}}
+        <span data-test-secret-path>{{@title}}</span>
+      {{/if}}
+    {{/if}}
+  </div>
+  {{#if @accessor}}
+    <code class="has-text-grey is-size-8" data-test-linkable-item-accessor>
+      {{@accessor}}
+    </code>
+  {{/if}}
+
+  {{#if @description}}
+    <ReadMore data-test-linkable-item-description>
+      {{@description}}
+    </ReadMore>
+  {{/if}}
+
+  {{yield}}
+</div>
\ No newline at end of file
diff --git a/ui/lib/core/addon/templates/components/linkable-item/menu.hbs b/ui/lib/core/addon/templates/components/linkable-item/menu.hbs
new file mode 100644
index 0000000000000..2361fb7da48e4
--- /dev/null
+++ b/ui/lib/core/addon/templates/components/linkable-item/menu.hbs
@@ -0,0 +1,3 @@
+<div class="linkable-item-menu" data-test-linkable-item-menu ...attributes>
+  {{yield}}
+</div>
\ No newline at end of file
diff --git a/ui/lib/core/addon/templates/components/masked-input.hbs b/ui/lib/core/addon/templates/components/masked-input.hbs
new file mode 100644
index 0000000000000..9f27c5f6c5d75
--- /dev/null
+++ b/ui/lib/core/addon/templates/components/masked-input.hbs
@@ -0,0 +1,52 @@
+<div
+  class="masked-input {{if this.displayOnly 'display-only'}} {{if this.allowCopy 'allow-copy'}}"
+  data-test-masked-input
+  data-test-field
+>
+  {{#if this.displayOnly}}
+    {{#if this.showValue}}
+      <pre class="masked-value display-only is-word-break">{{this.value}}</pre>
+    {{else}}
+      <pre class="masked-value display-only masked-font">***********</pre>
+    {{/if}}
+  {{else if this.inputField}}
+    <input
+      autocomplete="off"
+      spellcheck="false"
+      value={{this.value}}
+      class="input {{unless this.showValue 'masked-font'}}"
+      onchange={{action "updateValue"}}
+      data-test-input
+    />
+  {{else}}
+    <textarea
+      class="input masked-value {{unless this.showValue 'masked-font'}}"
+      rows={{1}}
+      wrap="off"
+      onkeydown={{action this.onKeyDown}}
+      onchange={{action "updateValue"}}
+      onkeyup={{action (action "handleKeyUp" this.name) value="target.value"}}
+      value={{this.value}}
+      spellcheck="false"
+      data-test-textarea
+    ></textarea>
+  {{/if}}
+  {{#if this.allowCopy}}
+    <CopyButton
+      @clipboardText={{this.value}}
+      @success={{action (set-flash-message "Data copied!")}}
+      class="copy-button button {{if this.displayOnly 'is-compact'}}"
+      data-test-copy-button
+    >
+      <Icon @name="clipboard-copy" aria-hidden="Copy value" />
+    </CopyButton>
+  {{/if}}
+  <button
+    onclick={{action "toggleMask"}}
+    type="button"
+    class="{{if (eq this.value '') 'has-text-grey'}} masked-input-toggle button"
+    data-test-button
+  >
+    <Icon @name={{if this.showValue "eye" "eye-off"}} />
+  </button>
+</div>
\ No newline at end of file
diff --git a/ui/lib/core/addon/templates/components/menu-loader.hbs b/ui/lib/core/addon/templates/components/menu-loader.hbs
new file mode 100644
index 0000000000000..82c2c31721286
--- /dev/null
+++ b/ui/lib/core/addon/templates/components/menu-loader.hbs
@@ -0,0 +1,7 @@
+{{#if @loadingParam}}
+  <button disabled type="button" class="link button is-loading is-transparent">
+    loading
+  </button>
+{{else}}
+  {{yield}}
+{{/if}}
\ No newline at end of file
diff --git a/ui/lib/core/addon/components/namespace-reminder.hbs b/ui/lib/core/addon/templates/components/namespace-reminder.hbs
similarity index 92%
rename from ui/lib/core/addon/components/namespace-reminder.hbs
rename to ui/lib/core/addon/templates/components/namespace-reminder.hbs
index ccadb1b04fcf1..d7be9666cf08d 100644
--- a/ui/lib/core/addon/components/namespace-reminder.hbs
+++ b/ui/lib/core/addon/templates/components/namespace-reminder.hbs
@@ -6,7 +6,7 @@
   {{else}}
     <p class="namespace-reminder">
       This
-      {{@noun}}
+      {{this.noun}}
       will be
       {{this.modeVerb}}
       in the
diff --git a/ui/lib/core/addon/templates/components/navigate-input.hbs b/ui/lib/core/addon/templates/components/navigate-input.hbs
new file mode 100644
index 0000000000000..257a37b0d09c5
--- /dev/null
+++ b/ui/lib/core/addon/templates/components/navigate-input.hbs
@@ -0,0 +1,18 @@
+<div class="field" data-test-nav-input>
+  <p class="control has-icons-left">
+    <input
+      class="filter input"
+      disabled={{this.disabled}}
+      value={{@filter}}
+      placeholder={{or @placeholder "Filter keys"}}
+      type="text"
+      data-test-comoponent="navigate-input"
+      oninput={{action "handleInput" value="target.value"}}
+      onkeyup={{action "handleKeyUp"}}
+      onkeydown={{action "handleKeyPress"}}
+      onfocus={{action "setFilterFocused" true}}
+      onblur={{action "setFilterFocused" false}}
+    />
+    <Icon @name="search" class="search-icon has-text-grey-light" />
+  </p>
+</div>
\ No newline at end of file
diff --git a/ui/lib/core/addon/templates/components/page-header.hbs b/ui/lib/core/addon/templates/components/page-header.hbs
new file mode 100644
index 0000000000000..852b616393c21
--- /dev/null
+++ b/ui/lib/core/addon/templates/components/page-header.hbs
@@ -0,0 +1,15 @@
+<header class="page-header">
+  {{#if this.hasLevel}}
+    {{yield (hash top=(component "page-header-top"))}}
+    <div class="level">
+      <div class="level-left">
+        {{yield (hash levelLeft=(component "page-header-level-left"))}}
+      </div>
+      <div class="level-right field is-grouped">
+        {{yield (hash levelRight=(component "page-header-level-right"))}}
+      </div>
+    </div>
+  {{else}}
+    {{yield (hash top=(component "page-header-top"))}}
+  {{/if}}
+</header>
\ No newline at end of file
diff --git a/ui/lib/core/addon/templates/components/popup-menu.hbs b/ui/lib/core/addon/templates/components/popup-menu.hbs
new file mode 100644
index 0000000000000..6b3aef4e6ca7c
--- /dev/null
+++ b/ui/lib/core/addon/templates/components/popup-menu.hbs
@@ -0,0 +1,14 @@
+<BasicDropdown class="popup-menu" horizontalPosition="auto-right" verticalPosition="below" onOpen={{this.onOpen}} as |d|>
+  <d.Trigger
+    @htmlTag="button"
+    class={{concat "popup-menu-trigger button is-ghost" (if d.isOpen " is-active")}}
+    data-test-popup-menu-trigger
+  >
+    <Icon @name="more-horizontal" class="has-text-black auto-width" aria-label="More options" />
+  </d.Trigger>
+  <d.Content @defaultClass={{concat "popup-menu-content " this.contentClass}}>
+    <div class="box">
+      {{yield}}
+    </div>
+  </d.Content>
+</BasicDropdown>
\ No newline at end of file
diff --git a/ui/lib/core/addon/templates/components/read-more.hbs b/ui/lib/core/addon/templates/components/read-more.hbs
index 381d783531baa..541e4f3bc3e65 100644
--- a/ui/lib/core/addon/templates/components/read-more.hbs
+++ b/ui/lib/core/addon/templates/components/read-more.hbs
@@ -8,7 +8,7 @@
     {{yield}}
   </span>
   {{#if this.hasOverflow}}
-    <div class="linked-block-seemore" data-test-readmore-toggle>
+    <div class="linkable-item-seemore" data-test-readmore-toggle>
       <button {{on "click" this.toggleOpen}} class="link link-plain" type="button">
         {{#if this.isOpen}}
           See Less
diff --git a/ui/lib/core/addon/templates/components/replication-dashboard.hbs b/ui/lib/core/addon/templates/components/replication-dashboard.hbs
index 8e0aaef58eb41..9b5f5741d9310 100644
--- a/ui/lib/core/addon/templates/components/replication-dashboard.hbs
+++ b/ui/lib/core/addon/templates/components/replication-dashboard.hbs
@@ -53,7 +53,7 @@
       <AlertBanner
         @title="Syncing in progress"
         @type="info"
-        @showLoading={{true}}
+        @secondIconType="loading"
         @message="The cluster is syncing. This happens when the secondary is too far behind the primary to use the normal stream-wals state for catching up."
         data-test-isSyncing
       />
@@ -61,13 +61,6 @@
   {{/if}}
   {{#unless this.isSummaryDashboard}}
     <ReplicationTableRows @replicationDetails={{this.replicationDetails}} @clusterMode={{this.clusterMode}} />
-    <div class="replication helper-text float-right" data-test-replication-doc-link>
-      <p class="has-text-grey">
-        We have additional time series telemetry that can be found
-        <DocLink @path="/vault/tutorials/monitoring/monitor-replication#key-monitoring-metrics">
-          in our documentation.
-        </DocLink>
-      </p>
-    </div>
+    <ReplicationDocLink data-test-replication-doc-link />
   {{/unless}}
 </div>
\ No newline at end of file
diff --git a/ui/lib/core/addon/templates/components/replication-doc-link.hbs b/ui/lib/core/addon/templates/components/replication-doc-link.hbs
new file mode 100644
index 0000000000000..355ae56b178c6
--- /dev/null
+++ b/ui/lib/core/addon/templates/components/replication-doc-link.hbs
@@ -0,0 +1,9 @@
+<div class="documentation-link">
+  <p class="has-text-grey">
+    We have additional timeseries telemetry that can be found
+    <LearnLink @path="/vault/operations/monitor-replication#key-monitoring-metrics">
+      in our documentation
+    </LearnLink>
+    .
+  </p>
+</div>
\ No newline at end of file
diff --git a/ui/lib/core/addon/templates/components/replication-header.hbs b/ui/lib/core/addon/templates/components/replication-header.hbs
index a103443f9038a..26d1a30557f9f 100644
--- a/ui/lib/core/addon/templates/components/replication-header.hbs
+++ b/ui/lib/core/addon/templates/components/replication-header.hbs
@@ -1,3 +1,18 @@
+{{! DR Secondary has a different Nav Header with access only to the Status menu }}
+{{#if this.isSecondary}}
+  <NavHeader as |Nav|>
+    <Nav.home>
+      <HomeLink @class="navbar-item splash-page-logo has-text-white">
+        <LogoEdition />
+      </HomeLink>
+    </Nav.home>
+    <Nav.items>
+      <div class="navbar-item status-indicator-button" data-status={{if this.data.unsealed "good" "bad"}}>
+        <StatusMenu @label="Status" @onLinkClick={{action Nav.closeDrawer}} />
+      </div>
+    </Nav.items>
+  </NavHeader>
+{{/if}}
 <PageHeader as |p|>
   <p.top>
     {{! template-lint-configure simple-unless "warn" }}
@@ -30,20 +45,24 @@
 </PageHeader>
 
 {{#if this.showTabs}}
-  <div class="tabs-container box is-bottomless is-fullwidth is-paddingless has-bottom-margin-l" data-test-tabs>
+  <div class="tabs-container box is-bottomless is-fullwidth is-paddingless" data-test-tabs>
     <nav class="tabs">
       {{#if this.isSummaryDashboard}}
         <ul>
           <li class="is-active">
-            <LinkToExternal @route="replication">Summary</LinkToExternal>
+            {{link-to-external "Summary" "replication"}}
           </li>
         </ul>
       {{else}}
         <ul>
-          <LinkTo @route="vault.cluster.replication-dr-promote.details">
+          <LinkTo @route="vault.cluster.replication-dr-promote.details" @activeClass="is-active">
             Details
           </LinkTo>
-          <LinkTo @route="vault.cluster.replication-dr-promote" @current-when="vault.cluster.replication-dr-promote.index">
+          <LinkTo
+            @route="vault.cluster.replication-dr-promote"
+            @activeClass="is-active"
+            @current-when="vault.cluster.replication-dr-promote.index"
+          >
             Manage
           </LinkTo>
         </ul>
diff --git a/ui/lib/core/addon/templates/components/replication-mode-summary.hbs b/ui/lib/core/addon/templates/components/replication-mode-summary.hbs
index 971d0e487d7c5..fba50f57ea731 100644
--- a/ui/lib/core/addon/templates/components/replication-mode-summary.hbs
+++ b/ui/lib/core/addon/templates/components/replication-mode-summary.hbs
@@ -60,14 +60,14 @@
             Performance Replication is a feature of Vault Enterprise Premium.
           </p>
           <p class="has-text-centered">
-            <ExternalLink
-              @href="https://hashicorp.com/products/vault/trial?source=vaultui_Performance%20Replication"
+            <a
+              href="https://hashicorp.com/products/vault/trial?source=vaultui_Performance%20Replication"
               class="button is-ghost has-icon-right"
-              data-test-upgrade-link
+              data-test-upgrade-link="true"
             >
               Learn more
               <Chevron />
-            </ExternalLink>
+            </a>
           </p>
         {{else if this.replicationEnabled}}
           <h6 class="title is-6 is-uppercase">
@@ -98,12 +98,7 @@
     </div>
     <div class="level-right">
       {{#if this.replicationDisabled}}
-        <LinkTo
-          @route="mode.index"
-          @models={{array this.cluster.name this.mode}}
-          class="button is-primary"
-          data-test-replication-promote-secondary
-        >
+        <LinkTo @route="mode.index" @models={{array this.cluster.name this.mode}} class="button is-primary">
           Enable
         </LinkTo>
       {{else}}
diff --git a/ui/lib/core/addon/templates/components/replication-secondary-card.hbs b/ui/lib/core/addon/templates/components/replication-secondary-card.hbs
index e92766f876464..731c90144a1ce 100644
--- a/ui/lib/core/addon/templates/components/replication-secondary-card.hbs
+++ b/ui/lib/core/addon/templates/components/replication-secondary-card.hbs
@@ -1,5 +1,5 @@
 <div
-  class="selectable-card is-rounded card-container {{if this.hasErrorClass 'has-error-border'}}"
+  class="selectable-card is-rounded card-container {{if this.hasErrorClass 'has-border-danger'}}"
   data-test-replication-secondary-card
 >
   {{! Check if Status or Primary Cluster Card }}
@@ -85,10 +85,10 @@
     </div>
     {{#if (and this.primaryUiUrl this.knownPrimaryClusterAddrs)}}
       <div class="grid-item-top-right">
-        <ExternalLink @href={{concat this.primaryUiUrl "/ui/"}} class="toolbar-link" data-test-primary-link>
+        <a href={{concat this.primaryUiUrl "/ui/"}} class="toolbar-link" data-test-primary-link>
           View primary cluster
           <Icon @name="chevron-right" />
-        </ExternalLink>
+        </a>
       </div>
     {{/if}}
     <div class="grid-item-second-row">
@@ -105,9 +105,9 @@
           @title="No known_primary_cluster_addrs"
           @message="These addresses are used by the secondary to communicate with the primary cluster. Should always be non-zero in a functioning replication setup."
         >
-          <DocLink @path="/vault/tutorials/monitoring/monitor-replication">
+          <LearnLink @path="/vault/operations/monitor-replication">
             Learn more
-          </DocLink>
+          </LearnLink>
         </EmptyState>
       {{else}}
         <InfoTable @title="Known Primary Cluster Addrs" @header="cluster_addr" @items={{this.knownPrimaryClusterAddrs}} />
diff --git a/ui/lib/core/addon/templates/components/replication-summary-card.hbs b/ui/lib/core/addon/templates/components/replication-summary-card.hbs
index 791277f4f3c0d..7f4a6f1b16d57 100644
--- a/ui/lib/core/addon/templates/components/replication-summary-card.hbs
+++ b/ui/lib/core/addon/templates/components/replication-summary-card.hbs
@@ -1,12 +1,12 @@
 <div
-  class="selectable-card is-rounded card-container summary {{if this.hasErrorClass 'has-error-border'}}"
+  class="selectable-card is-rounded card-container summary {{if this.hasErrorClass 'has-border-danger'}}"
   data-test-replication-summary-card
 >
   {{! Check if DR or Performance Card }}
   {{#if (eq this.title "Disaster Recovery")}}
     <h3 class="title is-5 grid-item-top-left card-title">{{this.title}}</h3>
     <div class="grid-item-top-right">
-      <ToolbarLink @route="mode.index" @model="dr" data-test-manage-link={{this.title}}>
+      <ToolbarLink @params={{array "mode.index" "dr"}} data-test-manage-link={{this.title}}>
         Details
       </ToolbarLink>
     </div>
@@ -30,7 +30,7 @@
   {{else}}
     <h3 class="title is-5 grid-item-top-left card-title">{{this.title}}</h3>
     <div class="grid-item-top-right">
-      <ToolbarLink @route="mode.index" @model="performance" data-test-manage-link={{this.title}}>
+      <ToolbarLink @params={{array "mode.index" "performance"}} data-test-manage-link={{this.title}}>
         Details
       </ToolbarLink>
     </div>
diff --git a/ui/lib/core/addon/templates/components/search-select-placeholder.hbs b/ui/lib/core/addon/templates/components/search-select-placeholder.hbs
new file mode 100644
index 0000000000000..2adbd9e3cfa34
--- /dev/null
+++ b/ui/lib/core/addon/templates/components/search-select-placeholder.hbs
@@ -0,0 +1,6 @@
+<div class="field">
+  <p class="control has-icons-left has-icons-right">
+    <span class="input has-text-grey-light">{{or this.placeholder "Search"}}</span>
+    <Icon @name="search" class="search-icon has-text-grey-light" />
+  </p>
+</div>
\ No newline at end of file
diff --git a/ui/lib/core/addon/templates/components/search-select.hbs b/ui/lib/core/addon/templates/components/search-select.hbs
new file mode 100644
index 0000000000000..9d1b42a0e212d
--- /dev/null
+++ b/ui/lib/core/addon/templates/components/search-select.hbs
@@ -0,0 +1,97 @@
+{{#if this.shouldUseFallback}}
+  {{component
+    this.fallbackComponent
+    label=(or this.label this.subLabel)
+    subText=this.subText
+    onChange=(action "onChange")
+    inputValue=this.inputValue
+    helpText=this.helpText
+    placeHolder=this.placeHolder
+    id=this.id
+  }}
+{{else}}
+  {{#if this.label}}
+    <label for={{this.id}} class={{if this.labelClass this.labelClass "title is-4"}} data-test-field-label>
+      {{this.label}}
+      {{#if this.helpText}}
+        <InfoTooltip>{{this.helpText}}</InfoTooltip>
+      {{/if}}
+    </label>
+  {{/if}}
+  {{#if this.subLabel}}
+    <p class="is-label">{{this.subLabel}}</p>
+  {{/if}}
+  {{#if this.subText}}
+    <p class="sub-text">{{this.subText}}</p>
+  {{/if}}
+  {{! template-lint-configure simple-unless "warn" }}
+  {{#unless (gte this.selectedOptions.length this.selectLimit)}}
+    <PowerSelect
+      @eventType="click"
+      @placeholder={{this.placeholder}}
+      @searchEnabled={{true}}
+      @search={{action "searchAndSuggest"}}
+      @options={{this.options}}
+      @onChange={{action "selectOrCreate"}}
+      @placeholderComponent={{component "search-select-placeholder"}}
+      @verticalPosition="below"
+      as |option|
+    >
+      {{#if this.shouldRenderName}}
+        {{option.name}}
+        <small class="search-select-list-key" data-test-smaller-id="true">
+          {{get option this.idKey}}
+        </small>
+      {{else}}
+        {{option.id}}
+      {{/if}}
+    </PowerSelect>
+  {{/unless}}
+  <ul class="search-select-list">
+    {{#each this.selectedOptions as |selected index|}}
+      <li class="search-select-list-item" data-test-selected-option={{index}}>
+        {{#if this.shouldRenderName}}
+          {{selected.name}}
+          <small class="search-select-list-key" data-test-smaller-id="true">
+            {{get selected this.idKey}}
+          </small>
+        {{else}}
+          <div>
+            {{selected.id}}
+            {{#if this.wildcardLabel}}
+              {{#if (is-wildcard-string selected.id)}}
+                {{#let (filter-wildcard selected this.allOptions) as |wildcardCount|}}
+                  <span class="tag is-light has-text-grey-dark" data-test-count={{wildcardCount}}>
+                    includes
+                    {{if wildcardCount wildcardCount 0}}
+                    {{if (eq wildcardCount 1) this.wildcardLabel (pluralize this.wildcardLabel)}}
+                  </span>
+                {{/let}}
+              {{/if}}
+            {{/if}}
+          </div>
+        {{/if}}
+        <div class="control">
+          {{#if (and selected.addTooltip @renderInfoTooltip)}}
+            <InfoTooltip>
+              The item associated with this
+              {{to-label this.idKey}}
+              may no longer exist.
+            </InfoTooltip>
+          {{/if}}
+          <button
+            type="button"
+            class="button is-ghost"
+            data-test-selected-list-button="delete"
+            {{action "discardSelection" selected}}
+          >
+            <Icon @name="trash" class="has-text-grey" />
+          </button>
+        </div>
+      </li>
+    {{/each}}
+  </ul>
+  {{#if (has-block)}}
+    {{yield}}
+  {{/if}}
+{{/if}}
\ No newline at end of file
diff --git a/ui/lib/core/addon/templates/components/select.hbs b/ui/lib/core/addon/templates/components/select.hbs
index 9bf1eca0aa911..c04fcd70dade6 100644
--- a/ui/lib/core/addon/templates/components/select.hbs
+++ b/ui/lib/core/addon/templates/components/select.hbs
@@ -18,7 +18,6 @@
       {{/if}}
       {{#each this.options as |op|}}
         <option
-          disabled={{or op.isDisabled false}}
           value={{or (get op this.valueAttribute) op}}
           selected={{eq this.selectedValue (or (get op this.valueAttribute) op)}}
         >
diff --git a/ui/lib/core/addon/templates/components/shamir-flow.hbs b/ui/lib/core/addon/templates/components/shamir-flow.hbs
index e0b6fd6fb2b8d..7cfd75d1ed32a 100644
--- a/ui/lib/core/addon/templates/components/shamir-flow.hbs
+++ b/ui/lib/core/addon/templates/components/shamir-flow.hbs
@@ -47,7 +47,7 @@
     </button>
   </div>
 {{else if (and this.generateAction (not this.started))}}
-  <form {{action "startGenerate" (hash pgp_key=this.pgp_key) on="submit"}} id="shamir" aria-label="shamir generate form">
+  <form {{action "startGenerate" (hash pgp_key=this.pgp_key) on="submit"}} id="shamir">
     <MessageError @errors={{this.errors}} />
     {{#if (eq this.generateStep "chooseMethod")}}
       <div class="box is-marginless is-shadowless">
@@ -57,14 +57,14 @@
           begin generation of the Operation Token.
         </p>
       </div>
-      <div class="box is-shadowless field is-grouped is-centered is-flex-center">
+      <div class="box is-shadowless field is-grouped is-grouped-centered">
         <div class="control">
           <button type="button" class="button is-primary" {{action (mut this.generateWithPGP) true}}>
             Provide PGP Key
           </button>
         </div>
         <div class="control">
-          <span class="has-side-padding-s">
+          <span class="button auto-width is-white is-static">
             or
           </span>
         </div>
@@ -107,7 +107,7 @@
           <div class="message-body">
             <h4 class="title is-7 is-marginless">
               PGP Key
-              {{this.pgpKeyFile.filename}}
+              {{this.pgpKeyFile.fileName}}
             </h4>
             <code class="is-word-break">{{this.pgp_key}}</code>
           </div>
@@ -128,7 +128,7 @@
     {{/if}}
   </form>
 {{else}}
-  <form {{action "onSubmit" (hash key=this.key) on="submit"}} id="shamir" aria-label="shamir form">
+  <form {{action "onSubmit" (hash key=this.key) on="submit"}} id="shamir">
     <div class="box is-shadowless">
       {{#if this.errors}}
         <div class="box is-shadowless is-marginless no-padding-top is-fullwidth">
diff --git a/ui/lib/core/addon/templates/components/shamir-modal-flow.hbs b/ui/lib/core/addon/templates/components/shamir-modal-flow.hbs
index b4b4d046b9db6..b5692ff52c6b4 100644
--- a/ui/lib/core/addon/templates/components/shamir-modal-flow.hbs
+++ b/ui/lib/core/addon/templates/components/shamir-modal-flow.hbs
@@ -75,20 +75,20 @@
         </button>
       </div>
     {{else if (and this.generateAction (not this.started))}}
-      <form {{action "startGenerate" (hash pgp_key=this.pgp_key) on="submit"}} id="shamir" aria-label="shamir generate form">
+      <form {{action "startGenerate" (hash pgp_key=this.pgp_key) on="submit"}} id="shamir">
         <MessageError @errors={{this.errors}} />
         {{#if (eq this.generateStep "chooseMethod")}}
           <div class="has-bottom-margin-m" data-test-shamir-modal-body>
             {{yield}}
           </div>
-          <div class="field is-grouped is-flex-center">
+          <div class="field is-grouped">
             <div class="control is-flex-row">
               <button type="button" class="link" {{action (mut this.generateWithPGP) true}}>
                 Provide PGP Key
               </button>
             </div>
             <div class="control">
-              <span class="has-side-padding-s">
+              <span class="button auto-width is-white is-static">
                 or
               </span>
             </div>
@@ -129,7 +129,7 @@
             </p>
             <h4 class="field-title has-bottom-padding-m is-fullwidth">
               PGP Key
-              {{this.pgpKeyFile.filename}}
+              {{this.pgpKeyFile.fileName}}
             </h4>
             <div class="message is-list has-copy-button" tabindex="-1">
               <HoverCopyButton @copyValue={{this.pgp_key}} />
@@ -151,7 +151,7 @@
         {{/if}}
       </form>
     {{else}}
-      <form {{action "onSubmit" (hash key=this.key) on="submit"}} id="shamir" aria-label="shamir form">
+      <form {{action "onSubmit" (hash key=this.key) on="submit"}} id="shamir">
         <div class="has-bottom-margin-m">
           {{#if this.errors}}
             <div class="box is-shadowless is-marginless no-padding-top is-fullwidth">
@@ -166,8 +166,7 @@
                 </h4>
                 <p class="help has-text-grey has-bottom-margin-xs">
                   This OTP will be used to decode the generated operation token.
-                  <span class="has-text-weight-semibold">Save this</span>, as you will need it later to decode the operation
-                  token.
+                  <span class="has-text-semibold">Save this</span>, as you will need it later to decode the operation token.
                 </p>
                 <div class="message is-list has-copy-button" tabindex="-1">
                   <HoverCopyButton @copyValue={{this.otp}} />
diff --git a/ui/lib/core/addon/templates/components/stat-text.hbs b/ui/lib/core/addon/templates/components/stat-text.hbs
new file mode 100644
index 0000000000000..66eb70db9e490
--- /dev/null
+++ b/ui/lib/core/addon/templates/components/stat-text.hbs
@@ -0,0 +1,11 @@
+<div
+  class={{concat "stat-text-container " @size (unless @subText "-no-subText")}}
+  data-test-stat-text-container={{(or @label "true")}}
+  ...attributes
+>
+  <div class="stat-label has-bottom-margin-xs">{{@label}}</div>
+  {{#if @subText}}
+    <div class="stat-text">{{@subText}}</div>
+  {{/if}}
+  <div class="stat-value">{{format-number @value}}</div>
+</div>
\ No newline at end of file
diff --git a/ui/lib/core/addon/components/toolbar-actions.hbs b/ui/lib/core/addon/templates/components/toolbar-actions.hbs
similarity index 100%
rename from ui/lib/core/addon/components/toolbar-actions.hbs
rename to ui/lib/core/addon/templates/components/toolbar-actions.hbs
diff --git a/ui/lib/core/addon/components/toolbar-filters.hbs b/ui/lib/core/addon/templates/components/toolbar-filters.hbs
similarity index 100%
rename from ui/lib/core/addon/components/toolbar-filters.hbs
rename to ui/lib/core/addon/templates/components/toolbar-filters.hbs
diff --git a/ui/lib/core/addon/components/toolbar.hbs b/ui/lib/core/addon/templates/components/toolbar.hbs
similarity index 100%
rename from ui/lib/core/addon/components/toolbar.hbs
rename to ui/lib/core/addon/templates/components/toolbar.hbs
diff --git a/ui/lib/core/addon/templates/components/upgrade-page.hbs b/ui/lib/core/addon/templates/components/upgrade-page.hbs
new file mode 100644
index 0000000000000..381c3479197f4
--- /dev/null
+++ b/ui/lib/core/addon/templates/components/upgrade-page.hbs
@@ -0,0 +1,23 @@
+<PageHeader as |p|>
+  <p.levelLeft>
+    <h1 class="title is-3">
+      {{this.title}}
+    </h1>
+  </p.levelLeft>
+</PageHeader>
+
+<EmptyState
+  @title="Upgrade to use {{this.featureName}}"
+  @message="You will need {{this.minimumEdition}} with {{this.featureName}} included to use this feature."
+>
+  <a
+    href="https://www.hashicorp.com/products/vault/enterprise?source=vaultui_{{this.featureName}}"
+    class="link has-icon-right"
+    target="_blank"
+    rel="noopener noreferrer"
+    data-test-upgrade-link="true"
+  >
+    Vault Enterprise
+    <Chevron />
+  </a>
+</EmptyState>
\ No newline at end of file
diff --git a/ui/lib/core/addon/components/vault-logo-spinner.hbs b/ui/lib/core/addon/templates/components/vault-logo-spinner.hbs
similarity index 100%
rename from ui/lib/core/addon/components/vault-logo-spinner.hbs
rename to ui/lib/core/addon/templates/components/vault-logo-spinner.hbs
diff --git a/ui/lib/core/addon/utils/b64.js b/ui/lib/core/addon/utils/b64.js
index eb65fa057d80b..edffd57d8a30a 100644
--- a/ui/lib/core/addon/utils/b64.js
+++ b/ui/lib/core/addon/utils/b64.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /* eslint-disable no-undef */
 import base64js from 'base64-js';
 
diff --git a/ui/lib/core/addon/utils/client-count-utils.js b/ui/lib/core/addon/utils/client-count-utils.js
index f8b04faa26c77..877c9016fc9f0 100644
--- a/ui/lib/core/addon/utils/client-count-utils.js
+++ b/ui/lib/core/addon/utils/client-count-utils.js
@@ -1,32 +1,25 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { parseAPITimestamp } from 'core/utils/date-formatters';
 import { compareAsc } from 'date-fns';
 
 export const formatByMonths = (monthsArray) => {
-  // the monthsArray will always include a timestamp of the month and either new/total client data or counts = null
+  // the months array will always include a timestamp of the month and either new/total client data or counts = null
   if (!Array.isArray(monthsArray)) return monthsArray;
 
   const sortedPayload = sortMonthsByTimestamp(monthsArray);
   return sortedPayload?.map((m) => {
     const month = parseAPITimestamp(m.timestamp, 'M/yy');
-    const totalClientsByNamespace = formatByNamespace(m.namespaces);
-    const newClientsByNamespace = formatByNamespace(m.new_clients?.namespaces);
+    let totalClientsByNamespace = formatByNamespace(m.namespaces);
+    let newClientsByNamespace = formatByNamespace(m.new_clients?.namespaces);
     if (Object.keys(m).includes('counts')) {
-      const totalCounts = flattenDataset(m);
-      const newCounts = m.new_clients ? flattenDataset(m.new_clients) : {};
+      let totalCounts = flattenDataset(m);
+      let newCounts = m.new_clients ? flattenDataset(m.new_clients) : {};
       return {
         month,
-        timestamp: m.timestamp,
         ...totalCounts,
         namespaces: formatByNamespace(m.namespaces) || [],
         namespaces_by_key: namespaceArrayToObject(totalClientsByNamespace, newClientsByNamespace, month),
         new_clients: {
           month,
-          timestamp: m.timestamp,
           ...newCounts,
           namespaces: formatByNamespace(m.new_clients?.namespaces) || [],
         },
@@ -40,8 +33,8 @@ export const formatByNamespace = (namespaceArray) => {
   return namespaceArray?.map((ns) => {
     // 'namespace_path' is an empty string for root
     if (ns['namespace_id'] === 'root') ns['namespace_path'] = 'root';
-    const label = ns['namespace_path'];
-    const flattenedNs = flattenDataset(ns);
+    let label = ns['namespace_path'];
+    let flattenedNs = flattenDataset(ns);
     // if no mounts, mounts will be an empty array
     flattenedNs.mounts = [];
     if (ns?.mounts && ns.mounts.length > 0) {
@@ -64,7 +57,7 @@ export const formatByNamespace = (namespaceArray) => {
 export const homogenizeClientNaming = (object) => {
   // if new key names exist, only return those key/value pairs
   if (Object.keys(object).includes('entity_clients')) {
-    const { clients, entity_clients, non_entity_clients } = object;
+    let { clients, entity_clients, non_entity_clients } = object;
     return {
       clients,
       entity_clients,
@@ -73,7 +66,7 @@ export const homogenizeClientNaming = (object) => {
   }
   // if object only has outdated key names, update naming
   if (Object.keys(object).includes('distinct_entities')) {
-    const { clients, distinct_entities, non_entity_tokens } = object;
+    let { clients, distinct_entities, non_entity_tokens } = object;
     return {
       clients,
       entity_clients: distinct_entities,
@@ -85,7 +78,7 @@ export const homogenizeClientNaming = (object) => {
 
 export const flattenDataset = (object) => {
   if (object?.counts) {
-    const flattenedObject = {};
+    let flattenedObject = {};
     Object.keys(object['counts']).forEach((key) => (flattenedObject[key] = object['counts'][key]));
     return homogenizeClientNaming(flattenedObject);
   }
@@ -105,12 +98,12 @@ export const namespaceArrayToObject = (totalClientsByNamespace, newClientsByName
   // FIRST: iterate and nest respective 'new_clients' data within each namespace and mount object
   // note: this is happening within the month object
   const nestNewClientsWithinNamespace = totalClientsByNamespace?.map((ns) => {
-    const newNamespaceCounts = newClientsByNamespace?.find((n) => n.label === ns.label);
+    let newNamespaceCounts = newClientsByNamespace?.find((n) => n.label === ns.label);
     if (newNamespaceCounts) {
-      const { label, clients, entity_clients, non_entity_clients } = newNamespaceCounts;
-      const newClientsByMount = [...newNamespaceCounts?.mounts];
-      const nestNewClientsWithinMounts = ns.mounts?.map((mount) => {
-        const new_clients = newClientsByMount?.find((m) => m.label === mount.label) || {};
+      let { label, clients, entity_clients, non_entity_clients } = newNamespaceCounts;
+      let newClientsByMount = [...newNamespaceCounts?.mounts];
+      let nestNewClientsWithinMounts = ns.mounts?.map((mount) => {
+        let new_clients = newClientsByMount?.find((m) => m.label === mount.label) || {};
         return {
           ...mount,
           new_clients,
@@ -123,7 +116,6 @@ export const namespaceArrayToObject = (totalClientsByNamespace, newClientsByName
           clients,
           entity_clients,
           non_entity_clients,
-          mounts: newClientsByMount,
         },
         mounts: [...nestNewClientsWithinMounts],
       };
@@ -134,10 +126,10 @@ export const namespaceArrayToObject = (totalClientsByNamespace, newClientsByName
     };
   });
   // SECOND: create a new object (namespace_by_key) in which each namespace label is a key
-  const namespaces_by_key = {};
+  let namespaces_by_key = {};
   nestNewClientsWithinNamespace?.forEach((namespaceObject) => {
     // THIRD: make another object within the namespace where each mount label is a key
-    const mounts_by_key = {};
+    let mounts_by_key = {};
     namespaceObject.mounts.forEach((mountObject) => {
       mounts_by_key[mountObject.label] = {
         month,
@@ -146,7 +138,7 @@ export const namespaceArrayToObject = (totalClientsByNamespace, newClientsByName
       };
     });
 
-    const { label, clients, entity_clients, non_entity_clients, new_clients } = namespaceObject;
+    let { label, clients, entity_clients, non_entity_clients, new_clients } = namespaceObject;
     namespaces_by_key[label] = {
       month,
       clients,
@@ -157,103 +149,98 @@ export const namespaceArrayToObject = (totalClientsByNamespace, newClientsByName
     };
   });
   return namespaces_by_key;
-  /*
-  structure of object returned
-  namespace_by_key: {
-    "namespace_label": {
-      month: "3/22",
-      clients: 32,
-      entity_clients: 16,
-      non_entity_clients: 16,
-      new_clients: {
-        month: "3/22",
-        clients: 5,
-        entity_clients: 2,
-        non_entity_clients: 3,
-        mounts: [...array of this namespace's mounts and their new client counts],
-      },
-      mounts_by_key: {
-        "mount_label": {
-           month: "3/22",
-           clients: 3,
-           entity_clients: 2,
-           non_entity_clients: 1,
-           new_clients: {
-            month: "3/22",
-            clients: 5,
-            entity_clients: 2,
-            non_entity_clients: 3,
-          },
-        },
-      },
-    },
-  };
-  */
+  // structure of object returned
+  // namespace_by_key: {
+  //   "namespace_label": {
+  //     month: "3/22",
+  //     clients: 32,
+  //     entity_clients: 16,
+  //     non_entity_clients: 16,
+  //     new_clients: {
+  //       month: "3/22",
+  //       clients: 5,
+  //       entity_clients: 2,
+  //       non_entity_clients: 3,
+  //     },
+  //     mounts_by_key: {
+  //       "mount_label": {
+  //          month: "3/22",
+  //          clients: 3,
+  //          entity_clients: 2,
+  //          non_entity_clients: 1,
+  //          new_clients: {
+  //           month: "3/22",
+  //           clients: 5,
+  //           entity_clients: 2,
+  //           non_entity_clients: 3,
+  //         },
+  //       },
+  //     },
+  //   },
+  // };
 };
 
-/*
-API RESPONSE STRUCTURE:
-data: {
-  ** by_namespace organized in descending order of client count number **
-  by_namespace: [
-    {
-      namespace_id: '96OwG',
-      namespace_path: 'test-ns/',
-      counts: {},
-      mounts: [{ mount_path: 'path-1', counts: {} }],
-    },
-  ],
-  ** months organized in ascending order of timestamps, oldest to most recent
-  months: [
-    {
-      timestamp: '2022-03-01T00:00:00Z',
-      counts: {},
-      namespaces: [
-        {
-          namespace_id: 'root',
-          namespace_path: '',
-          counts: {},
-          mounts: [{ mount_path: 'auth/up2/', counts: {} }],
-        },
-      ],
-      new_clients: {
-        counts: {},
-        namespaces: [
-          {
-            namespace_id: 'root',
-            namespace_path: '',
-            counts: {},
-            mounts: [{ mount_path: 'auth/up2/', counts: {} }],
-          },
-        ],
-      },
-    },
-    {
-      timestamp: '2022-04-01T00:00:00Z',
-      counts: {},
-      namespaces: [
-        {
-          namespace_id: 'root',
-          namespace_path: '',
-          counts: {},
-          mounts: [{ mount_path: 'auth/up2/', counts: {} }],
-        },
-      ],
-      new_clients: {
-        counts: {},
-        namespaces: [
-          {
-            namespace_id: 'root',
-            namespace_path: '',
-            counts: {},
-            mounts: [{ mount_path: 'auth/up2/', counts: {} }],
-          },
-        ],
-      },
-    },
-  ],
-  start_time: 'start timestamp string',
-  end_time: 'end timestamp string',
-  total: { clients: 300, non_entity_clients: 100, entity_clients: 400} ,
-}
-*/
+// API RESPONSE STRUCTURE:
+// data: {
+//   ** by_namespace organized in descending order of client count number **
+//   by_namespace: [
+//     {
+//       namespace_id: '96OwG',
+//       namespace_path: 'test-ns/',
+//       counts: {},
+//       mounts: [{ mount_path: 'path-1', counts: {} }],
+//     },
+//   ],
+//   ** months organized in ascending order of timestamps, oldest to most recent
+//   months: [
+//     {
+//       timestamp: '2022-03-01T00:00:00Z',
+//       counts: {},
+//       namespaces: [
+//         {
+//           namespace_id: 'root',
+//           namespace_path: '',
+//           counts: {},
+//           mounts: [{ mount_path: 'auth/up2/', counts: {} }],
+//         },
+//       ],
+//       new_clients: {
+//         counts: {},
+//         namespaces: [
+//           {
+//             namespace_id: 'root',
+//             namespace_path: '',
+//             counts: {},
+//             mounts: [{ mount_path: 'auth/up2/', counts: {} }],
+//           },
+//         ],
+//       },
+//     },
+//     {
+//       timestamp: '2022-04-01T00:00:00Z',
+//       counts: {},
+//       namespaces: [
+//         {
+//           namespace_id: 'root',
+//           namespace_path: '',
+//           counts: {},
+//           mounts: [{ mount_path: 'auth/up2/', counts: {} }],
+//         },
+//       ],
+//       new_clients: {
+//         counts: {},
+//         namespaces: [
+//           {
+//             namespace_id: 'root',
+//             namespace_path: '',
+//             counts: {},
+//             mounts: [{ mount_path: 'auth/up2/', counts: {} }],
+//           },
+//         ],
+//       },
+//     },
+//   ],
+//   start_time: 'start timestamp string',
+//   end_time: 'end timestamp string',
+//   total: { clients: 300, non_entity_clients: 100, entity_clients: 400} ,
+// }
diff --git a/ui/lib/core/addon/utils/common-prefix.js b/ui/lib/core/addon/utils/common-prefix.js
index 89cb1b7099c41..c943a7cd30d03 100644
--- a/ui/lib/core/addon/utils/common-prefix.js
+++ b/ui/lib/core/addon/utils/common-prefix.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export default function (arr = [], attribute = 'id') {
   if (!arr.length) {
     return '';
@@ -10,11 +5,11 @@ export default function (arr = [], attribute = 'id') {
   // this assumes an already sorted array
   // if the array is sorted, we want to compare the first and last
   // item in the array - if they share a prefix, all of the items do
-  const firstString = arr[0][attribute];
-  const lastString = arr[arr.length - 1][attribute];
+  let firstString = arr[0][attribute];
+  let lastString = arr[arr.length - 1][attribute];
 
   // the longest the shared prefix could be is the length of the match
-  const targetLength = firstString.length;
+  let targetLength = firstString.length;
   let prefixLength = 0;
   // walk the two strings, and if they match at the current length,
   // increment the prefixLength and try again
diff --git a/ui/lib/core/addon/utils/date-formatters.js b/ui/lib/core/addon/utils/date-formatters.js
index f4baeb7f6ed48..25736d3f4f0ef 100644
--- a/ui/lib/core/addon/utils/date-formatters.js
+++ b/ui/lib/core/addon/utils/date-formatters.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { format, parseISO } from 'date-fns';
 
 export const ARRAY_OF_MONTHS = [
@@ -23,15 +18,26 @@ export const ARRAY_OF_MONTHS = [
 // convert API timestamp ( '2021-03-21T00:00:00Z' ) to date object, optionally format
 export const parseAPITimestamp = (timestamp, style) => {
   if (typeof timestamp !== 'string') return;
-  const date = parseISO(timestamp.split('T')[0]);
+  let date = parseISO(timestamp.split('T')[0]);
   if (!style) return date;
   return format(date, style);
 };
 
+// convert ISO timestamp '2021-03-21T00:00:00Z' to ['2021', 2]
+// (e.g. 2021 March, month is zero indexed) (used by calendar widget)
+export const parseRFC3339 = (timestamp) => {
+  if (Array.isArray(timestamp)) {
+    // return if already formatted correctly
+    return timestamp;
+  }
+  let date = parseAPITimestamp(timestamp);
+  return date ? [`${date.getFullYear()}`, date.getMonth()] : null;
+};
+
 // convert M/yy (format of dates in charts) to 'Month yyyy' (format in tooltip)
 export function formatChartDate(date) {
-  const array = date.split('/');
+  let array = date.split('/');
   array.splice(1, 0, '01');
-  const dateString = array.join('/');
+  let dateString = array.join('/');
   return format(new Date(dateString), 'MMMM yyyy');
 }
diff --git a/ui/lib/core/addon/utils/duration-utils.ts b/ui/lib/core/addon/utils/duration-utils.ts
deleted file mode 100644
index 89e9840257059..0000000000000
--- a/ui/lib/core/addon/utils/duration-utils.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-/**
- * These utils are used for managing Duration type values
- * (eg. '30m', '365d'). Most often used in the context of TTLs
- */
-import Duration from '@icholy/duration';
-
-interface SecondsMap {
-  s: 1;
-  m: 60;
-  h: 3600;
-  d: 86400;
-  [key: string]: number;
-}
-export const secondsMap: SecondsMap = {
-  s: 1,
-  m: 60,
-  h: 3600,
-  d: 86400,
-};
-export const convertToSeconds = (time: number, unit: string) => {
-  return time * (secondsMap[unit] || 1);
-};
-export const convertFromSeconds = (seconds: number, unit: string) => {
-  return seconds / (secondsMap[unit] || 1);
-};
-export const goSafeConvertFromSeconds = (seconds: number, unit: string) => {
-  // Go only accepts s, m, or h units
-  const u = unit === 'd' ? 'h' : unit;
-  return convertFromSeconds(seconds, u) + u;
-};
-export const largestUnitFromSeconds = (seconds: number) => {
-  let unit = 's';
-  if (seconds === 0) return unit;
-  // get largest unit with no remainder
-  if (seconds % secondsMap.d === 0) {
-    unit = 'd';
-  } else if (seconds % secondsMap.h === 0) {
-    unit = 'h';
-  } else if (seconds % secondsMap.m === 0) {
-    unit = 'm';
-  }
-  return unit;
-};
-
-// parses duration string ('3m') and returns seconds
-export const durationToSeconds = (duration: string) => {
-  // we assume numbers are seconds
-  if (typeof duration === 'number') return duration;
-  try {
-    return Duration.parse(duration).seconds();
-  } catch (e) {
-    // since 0 is falsy, parent should explicitly check for null and decide how to handle parsing error
-    return null;
-  }
-};
diff --git a/ui/lib/core/addon/utils/parse-url.js b/ui/lib/core/addon/utils/parse-url.js
index c026ce8cedad9..7289e696f9772 100644
--- a/ui/lib/core/addon/utils/parse-url.js
+++ b/ui/lib/core/addon/utils/parse-url.js
@@ -1,14 +1,9 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 // adapted from https://gist.github.com/jed/964849
-const fn = (function (anchor) {
+let fn = (function (anchor) {
   return function (url) {
     anchor.href = url;
-    const parts = {};
-    for (const prop in anchor) {
+    let parts = {};
+    for (let prop in anchor) {
       if ('' + anchor[prop] === anchor[prop]) {
         parts[prop] = anchor[prop];
       }
diff --git a/ui/lib/core/addon/utils/search-select-has-many.js b/ui/lib/core/addon/utils/search-select-has-many.js
index 44357e89ee030..b4aa9bbc3c65b 100644
--- a/ui/lib/core/addon/utils/search-select-has-many.js
+++ b/ui/lib/core/addon/utils/search-select-has-many.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /**
  * Util to add/remove models in a hasMany relationship via the search-select component
  *
diff --git a/ui/lib/core/addon/utils/timestamp.js b/ui/lib/core/addon/utils/timestamp.js
deleted file mode 100644
index 7878ce6300a9e..0000000000000
--- a/ui/lib/core/addon/utils/timestamp.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * Use this instead of new Date() throughout the app so that time-related logic is easier to test.
- */
-const timestamp = {
-  // Method defined within an object so it can be stubbed
-  /**
-   * * Use timestamp.now to create a date for the current moment. In testing context, stub this method so it returns an expected value
-   * @returns Date object
-   */
-  now: () => {
-    return new Date();
-  },
-};
-
-export default timestamp;
diff --git a/ui/lib/core/app/components/alert-banner.js b/ui/lib/core/app/components/alert-banner.js
index 1c1902106622b..64985f13c61f2 100644
--- a/ui/lib/core/app/components/alert-banner.js
+++ b/ui/lib/core/app/components/alert-banner.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/alert-banner';
diff --git a/ui/lib/core/app/components/alert-inline.js b/ui/lib/core/app/components/alert-inline.js
index 3dcc0b205be09..c0de083f8351b 100644
--- a/ui/lib/core/app/components/alert-inline.js
+++ b/ui/lib/core/app/components/alert-inline.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/alert-inline';
diff --git a/ui/lib/core/app/components/alert-popup.js b/ui/lib/core/app/components/alert-popup.js
deleted file mode 100644
index cc0cbb2212dc1..0000000000000
--- a/ui/lib/core/app/components/alert-popup.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from 'core/components/alert-popup';
diff --git a/ui/lib/core/app/components/autocomplete-input.js b/ui/lib/core/app/components/autocomplete-input.js
index d43dd48fcbfe2..969b2694fce59 100644
--- a/ui/lib/core/app/components/autocomplete-input.js
+++ b/ui/lib/core/app/components/autocomplete-input.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/autocomplete-input';
diff --git a/ui/lib/core/app/components/box-radio.js b/ui/lib/core/app/components/box-radio.js
index 8687b9a7505d8..44286f902bcd7 100644
--- a/ui/lib/core/app/components/box-radio.js
+++ b/ui/lib/core/app/components/box-radio.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/box-radio';
diff --git a/ui/lib/core/app/components/checkbox-grid.js b/ui/lib/core/app/components/checkbox-grid.js
deleted file mode 100644
index 3dba09bf8b9ec..0000000000000
--- a/ui/lib/core/app/components/checkbox-grid.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-export { default } from 'core/components/checkbox-grid';
diff --git a/ui/lib/core/app/components/chevron.js b/ui/lib/core/app/components/chevron.js
index 7857437fb11c8..803db39f8e668 100644
--- a/ui/lib/core/app/components/chevron.js
+++ b/ui/lib/core/app/components/chevron.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/chevron';
diff --git a/ui/lib/core/app/components/confirm-action.js b/ui/lib/core/app/components/confirm-action.js
index 31cabe8c030bc..59524549311aa 100644
--- a/ui/lib/core/app/components/confirm-action.js
+++ b/ui/lib/core/app/components/confirm-action.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/confirm-action';
diff --git a/ui/lib/core/app/components/confirm.js b/ui/lib/core/app/components/confirm.js
index 6cd42fcde80a1..58f22e40fe815 100644
--- a/ui/lib/core/app/components/confirm.js
+++ b/ui/lib/core/app/components/confirm.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/confirm';
diff --git a/ui/lib/core/app/components/confirm/message.js b/ui/lib/core/app/components/confirm/message.js
index ca9d777d329a1..5d6b1e2b5d435 100644
--- a/ui/lib/core/app/components/confirm/message.js
+++ b/ui/lib/core/app/components/confirm/message.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/confirm/message';
diff --git a/ui/lib/core/app/components/confirmation-modal.js b/ui/lib/core/app/components/confirmation-modal.js
index 462d091e081dd..9cfcc6021b689 100644
--- a/ui/lib/core/app/components/confirmation-modal.js
+++ b/ui/lib/core/app/components/confirmation-modal.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/confirmation-modal';
diff --git a/ui/lib/core/app/components/doc-link.js b/ui/lib/core/app/components/doc-link.js
index bccc3a9ea11b0..d495e84f123ae 100644
--- a/ui/lib/core/app/components/doc-link.js
+++ b/ui/lib/core/app/components/doc-link.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/doc-link';
diff --git a/ui/lib/core/app/components/download-button.js b/ui/lib/core/app/components/download-button.js
index e6d8a1de432c9..f0d49046ccdd2 100644
--- a/ui/lib/core/app/components/download-button.js
+++ b/ui/lib/core/app/components/download-button.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/download-button';
diff --git a/ui/lib/core/app/components/edit-form.js b/ui/lib/core/app/components/edit-form.js
index cb7fde5fc6f56..912355721a836 100644
--- a/ui/lib/core/app/components/edit-form.js
+++ b/ui/lib/core/app/components/edit-form.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/edit-form';
diff --git a/ui/lib/core/app/components/empty-state.js b/ui/lib/core/app/components/empty-state.js
index 1cf1d1be2e44a..5ec2afae9da6d 100644
--- a/ui/lib/core/app/components/empty-state.js
+++ b/ui/lib/core/app/components/empty-state.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/empty-state';
diff --git a/ui/lib/core/app/components/external-link.js b/ui/lib/core/app/components/external-link.js
deleted file mode 100644
index 41ee56f72cfa5..0000000000000
--- a/ui/lib/core/app/components/external-link.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-export { default } from 'core/components/external-link';
diff --git a/ui/lib/core/app/components/field-group-show.js b/ui/lib/core/app/components/field-group-show.js
index 8ba0703274a62..c081c09c18044 100644
--- a/ui/lib/core/app/components/field-group-show.js
+++ b/ui/lib/core/app/components/field-group-show.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/field-group-show';
diff --git a/ui/lib/core/app/components/form-error.js b/ui/lib/core/app/components/form-error.js
index 888dfe9148024..c227ba885bfb9 100644
--- a/ui/lib/core/app/components/form-error.js
+++ b/ui/lib/core/app/components/form-error.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/form-error';
diff --git a/ui/lib/core/app/components/form-field-groups-loop.js b/ui/lib/core/app/components/form-field-groups-loop.js
deleted file mode 100644
index 4ae3f9f944300..0000000000000
--- a/ui/lib/core/app/components/form-field-groups-loop.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-export { default } from 'core/components/form-field-groups-loop';
diff --git a/ui/lib/core/app/components/form-field-groups.js b/ui/lib/core/app/components/form-field-groups.js
index 2bd6d964757fc..188b5dee4687d 100644
--- a/ui/lib/core/app/components/form-field-groups.js
+++ b/ui/lib/core/app/components/form-field-groups.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/form-field-groups';
diff --git a/ui/lib/core/app/components/form-field-label.js b/ui/lib/core/app/components/form-field-label.js
index 69ca6ae1ac9b7..22b4835af63df 100644
--- a/ui/lib/core/app/components/form-field-label.js
+++ b/ui/lib/core/app/components/form-field-label.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/form-field-label';
diff --git a/ui/lib/core/app/components/form-field.js b/ui/lib/core/app/components/form-field.js
index a9f71d9c2d529..e1a443b6fa6ee 100644
--- a/ui/lib/core/app/components/form-field.js
+++ b/ui/lib/core/app/components/form-field.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/form-field';
diff --git a/ui/lib/core/app/components/form-save-buttons.js b/ui/lib/core/app/components/form-save-buttons.js
index c82d77eeb0ffc..95359d60c0235 100644
--- a/ui/lib/core/app/components/form-save-buttons.js
+++ b/ui/lib/core/app/components/form-save-buttons.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/form-save-buttons';
diff --git a/ui/lib/core/app/components/icon.js b/ui/lib/core/app/components/icon.js
index 00b2e20d3bcb6..456ada2c3d8b9 100644
--- a/ui/lib/core/app/components/icon.js
+++ b/ui/lib/core/app/components/icon.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/icon';
diff --git a/ui/lib/core/app/components/info-table-item-array.js b/ui/lib/core/app/components/info-table-item-array.js
index 759c0fe6d06b3..f5b4973ca6162 100644
--- a/ui/lib/core/app/components/info-table-item-array.js
+++ b/ui/lib/core/app/components/info-table-item-array.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/info-table-item-array';
diff --git a/ui/lib/core/app/components/info-table-row.js b/ui/lib/core/app/components/info-table-row.js
index d84451e140db6..318bcafc269d8 100644
--- a/ui/lib/core/app/components/info-table-row.js
+++ b/ui/lib/core/app/components/info-table-row.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/info-table-row';
diff --git a/ui/lib/core/app/components/info-table.js b/ui/lib/core/app/components/info-table.js
index cb86bc6c24029..246a31e31fb93 100644
--- a/ui/lib/core/app/components/info-table.js
+++ b/ui/lib/core/app/components/info-table.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/info-table';
diff --git a/ui/lib/core/app/components/info-tooltip.js b/ui/lib/core/app/components/info-tooltip.js
index ec815ef309852..f60c56421fadf 100644
--- a/ui/lib/core/app/components/info-tooltip.js
+++ b/ui/lib/core/app/components/info-tooltip.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/info-tooltip';
diff --git a/ui/lib/core/app/components/input-search.js b/ui/lib/core/app/components/input-search.js
deleted file mode 100644
index c105e13872ed5..0000000000000
--- a/ui/lib/core/app/components/input-search.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-export { default } from 'core/components/input-search';
diff --git a/ui/lib/core/app/components/json-editor.js b/ui/lib/core/app/components/json-editor.js
deleted file mode 100644
index a22814bd1350d..0000000000000
--- a/ui/lib/core/app/components/json-editor.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-export { default } from 'core/components/json-editor';
diff --git a/ui/lib/core/app/components/key-value-header.js b/ui/lib/core/app/components/key-value-header.js
index 572b28fb82f62..af86eb02acc3b 100644
--- a/ui/lib/core/app/components/key-value-header.js
+++ b/ui/lib/core/app/components/key-value-header.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/key-value-header';
diff --git a/ui/lib/core/app/components/kv-object-editor.js b/ui/lib/core/app/components/kv-object-editor.js
deleted file mode 100644
index 6c27b86ee714d..0000000000000
--- a/ui/lib/core/app/components/kv-object-editor.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-export { default } from 'core/components/kv-object-editor';
diff --git a/ui/lib/core/app/components/layout-loading.js b/ui/lib/core/app/components/layout-loading.js
index 5ce95baf95e91..ebdfe539c9756 100644
--- a/ui/lib/core/app/components/layout-loading.js
+++ b/ui/lib/core/app/components/layout-loading.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/layout-loading';
diff --git a/ui/lib/core/app/components/learn-link.js b/ui/lib/core/app/components/learn-link.js
new file mode 100644
index 0000000000000..7beac1aca0b0e
--- /dev/null
+++ b/ui/lib/core/app/components/learn-link.js
@@ -0,0 +1 @@
+export { default } from 'core/components/learn-link';
diff --git a/ui/lib/core/app/components/linkable-item.js b/ui/lib/core/app/components/linkable-item.js
new file mode 100644
index 0000000000000..d0405c829f9cd
--- /dev/null
+++ b/ui/lib/core/app/components/linkable-item.js
@@ -0,0 +1 @@
+export { default } from 'core/components/linkable-item';
diff --git a/ui/lib/core/app/components/linkable-item/content.js b/ui/lib/core/app/components/linkable-item/content.js
new file mode 100644
index 0000000000000..996f144d66eb8
--- /dev/null
+++ b/ui/lib/core/app/components/linkable-item/content.js
@@ -0,0 +1 @@
+export { default } from 'core/components/linkable-item/content';
diff --git a/ui/lib/core/app/components/linkable-item/menu.js b/ui/lib/core/app/components/linkable-item/menu.js
new file mode 100644
index 0000000000000..c95fca8eab3e3
--- /dev/null
+++ b/ui/lib/core/app/components/linkable-item/menu.js
@@ -0,0 +1 @@
+export { default } from 'core/components/linkable-item/menu';
diff --git a/ui/lib/core/app/components/linked-block.js b/ui/lib/core/app/components/linked-block.js
index d8952e926218b..04a77b6185f58 100644
--- a/ui/lib/core/app/components/linked-block.js
+++ b/ui/lib/core/app/components/linked-block.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/linked-block';
diff --git a/ui/lib/core/app/components/list-item.js b/ui/lib/core/app/components/list-item.js
index 394a62ecd49bc..8498eaaddd88d 100644
--- a/ui/lib/core/app/components/list-item.js
+++ b/ui/lib/core/app/components/list-item.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/list-item';
diff --git a/ui/lib/core/app/components/list-item/content.js b/ui/lib/core/app/components/list-item/content.js
index 9cd7d1b8231ea..2976bd9c4d61c 100644
--- a/ui/lib/core/app/components/list-item/content.js
+++ b/ui/lib/core/app/components/list-item/content.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/list-item/content';
diff --git a/ui/lib/core/app/components/list-item/popup-menu.js b/ui/lib/core/app/components/list-item/popup-menu.js
index ade982a89c9cf..e0017879a15f8 100644
--- a/ui/lib/core/app/components/list-item/popup-menu.js
+++ b/ui/lib/core/app/components/list-item/popup-menu.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/list-item/popup-menu';
diff --git a/ui/lib/core/app/components/list-pagination.js b/ui/lib/core/app/components/list-pagination.js
index ad33536e0400b..87760c2e88b6f 100644
--- a/ui/lib/core/app/components/list-pagination.js
+++ b/ui/lib/core/app/components/list-pagination.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/list-pagination';
diff --git a/ui/lib/core/app/components/list-view.js b/ui/lib/core/app/components/list-view.js
index 63a72b7a67ab1..d2f2b145c7049 100644
--- a/ui/lib/core/app/components/list-view.js
+++ b/ui/lib/core/app/components/list-view.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/list-view';
diff --git a/ui/lib/core/app/components/masked-input.js b/ui/lib/core/app/components/masked-input.js
index 63406158bb546..1cd0be5419868 100644
--- a/ui/lib/core/app/components/masked-input.js
+++ b/ui/lib/core/app/components/masked-input.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/masked-input';
diff --git a/ui/lib/core/app/components/menu-loader.js b/ui/lib/core/app/components/menu-loader.js
index dde98f2e7eac6..c357979e253e8 100644
--- a/ui/lib/core/app/components/menu-loader.js
+++ b/ui/lib/core/app/components/menu-loader.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/menu-loader';
diff --git a/ui/lib/core/app/components/message-error.js b/ui/lib/core/app/components/message-error.js
index f332f18cec8ed..f1aa6ebdaa436 100644
--- a/ui/lib/core/app/components/message-error.js
+++ b/ui/lib/core/app/components/message-error.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/message-error';
diff --git a/ui/lib/core/app/components/modal.js b/ui/lib/core/app/components/modal.js
index b09d9f3a07b60..730887225dafe 100644
--- a/ui/lib/core/app/components/modal.js
+++ b/ui/lib/core/app/components/modal.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/modal';
diff --git a/ui/lib/core/app/components/namespace-reminder.js b/ui/lib/core/app/components/namespace-reminder.js
index afd95f7057cda..4e400178d737a 100644
--- a/ui/lib/core/app/components/namespace-reminder.js
+++ b/ui/lib/core/app/components/namespace-reminder.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/namespace-reminder';
diff --git a/ui/lib/core/app/components/navigate-input.js b/ui/lib/core/app/components/navigate-input.js
index 7599fe6bce4b7..d81c0e805d162 100644
--- a/ui/lib/core/app/components/navigate-input.js
+++ b/ui/lib/core/app/components/navigate-input.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/navigate-input';
diff --git a/ui/lib/core/app/components/object-list-input.js b/ui/lib/core/app/components/object-list-input.js
deleted file mode 100644
index 2cb717113fcb7..0000000000000
--- a/ui/lib/core/app/components/object-list-input.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-export { default } from 'core/components/object-list-input';
diff --git a/ui/lib/core/app/components/overview-card.js b/ui/lib/core/app/components/overview-card.js
deleted file mode 100644
index e9534f8b60c8a..0000000000000
--- a/ui/lib/core/app/components/overview-card.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-export { default } from 'core/components/overview-card';
diff --git a/ui/lib/core/app/components/page-header-level-left.js b/ui/lib/core/app/components/page-header-level-left.js
new file mode 100644
index 0000000000000..4d219df1e3810
--- /dev/null
+++ b/ui/lib/core/app/components/page-header-level-left.js
@@ -0,0 +1 @@
+export { default } from 'core/components/page-header-level-left';
diff --git a/ui/lib/core/app/components/page-header-level-right.js b/ui/lib/core/app/components/page-header-level-right.js
new file mode 100644
index 0000000000000..3eb8615b70218
--- /dev/null
+++ b/ui/lib/core/app/components/page-header-level-right.js
@@ -0,0 +1 @@
+export { default } from 'core/components/page-header-level-right';
diff --git a/ui/lib/core/app/components/page-header-level.js b/ui/lib/core/app/components/page-header-level.js
deleted file mode 100644
index baa9ee529b200..0000000000000
--- a/ui/lib/core/app/components/page-header-level.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from 'core/components/page-header-level';
diff --git a/ui/lib/core/app/components/page-header-top.js b/ui/lib/core/app/components/page-header-top.js
new file mode 100644
index 0000000000000..c7bf111a7fc5d
--- /dev/null
+++ b/ui/lib/core/app/components/page-header-top.js
@@ -0,0 +1 @@
+export { default } from 'core/components/page-header-top';
diff --git a/ui/lib/core/app/components/page-header.js b/ui/lib/core/app/components/page-header.js
index 9da47802fc06b..ce908e6c702fa 100644
--- a/ui/lib/core/app/components/page-header.js
+++ b/ui/lib/core/app/components/page-header.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/page-header';
diff --git a/ui/lib/core/app/components/page/breadcrumbs.js b/ui/lib/core/app/components/page/breadcrumbs.js
deleted file mode 100644
index 8cb68fca7b8e2..0000000000000
--- a/ui/lib/core/app/components/page/breadcrumbs.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-export { default } from 'core/components/page/breadcrumbs';
diff --git a/ui/lib/core/app/components/page/error.js b/ui/lib/core/app/components/page/error.js
deleted file mode 100644
index 2109403cf6687..0000000000000
--- a/ui/lib/core/app/components/page/error.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-export { default } from 'core/components/page/error';
diff --git a/ui/lib/core/app/components/popup-menu.js b/ui/lib/core/app/components/popup-menu.js
index 4bfd26f05500c..ea03c2430e2a8 100644
--- a/ui/lib/core/app/components/popup-menu.js
+++ b/ui/lib/core/app/components/popup-menu.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/popup-menu';
diff --git a/ui/lib/core/app/components/radio-button.js b/ui/lib/core/app/components/radio-button.js
index 8896580047f17..226a997c774b5 100644
--- a/ui/lib/core/app/components/radio-button.js
+++ b/ui/lib/core/app/components/radio-button.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/radio-button';
diff --git a/ui/lib/core/app/components/radio-card.js b/ui/lib/core/app/components/radio-card.js
deleted file mode 100644
index c03e99f808e8a..0000000000000
--- a/ui/lib/core/app/components/radio-card.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-export { default } from 'core/components/radio-card';
diff --git a/ui/lib/core/app/components/read-more.js b/ui/lib/core/app/components/read-more.js
index cbeb2e3194901..cac58b44ab67d 100644
--- a/ui/lib/core/app/components/read-more.js
+++ b/ui/lib/core/app/components/read-more.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/read-more';
diff --git a/ui/lib/core/app/components/readonly-form-field.js b/ui/lib/core/app/components/readonly-form-field.js
index c0b28a4ca50d9..a3527dea0e5c7 100644
--- a/ui/lib/core/app/components/readonly-form-field.js
+++ b/ui/lib/core/app/components/readonly-form-field.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/readonly-form-field';
diff --git a/ui/lib/core/app/components/replication-action-demote.js b/ui/lib/core/app/components/replication-action-demote.js
index e5bc52981cb98..064b3d459ba2d 100644
--- a/ui/lib/core/app/components/replication-action-demote.js
+++ b/ui/lib/core/app/components/replication-action-demote.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/replication-action-demote';
diff --git a/ui/lib/core/app/components/replication-action-disable.js b/ui/lib/core/app/components/replication-action-disable.js
index 41b2421bb9145..64bd793ee32c5 100644
--- a/ui/lib/core/app/components/replication-action-disable.js
+++ b/ui/lib/core/app/components/replication-action-disable.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/replication-action-disable';
diff --git a/ui/lib/core/app/components/replication-action-generate-token.js b/ui/lib/core/app/components/replication-action-generate-token.js
index 50f18ee3d6c3f..cfb9a56c60eb3 100644
--- a/ui/lib/core/app/components/replication-action-generate-token.js
+++ b/ui/lib/core/app/components/replication-action-generate-token.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/replication-action-generate-token';
diff --git a/ui/lib/core/app/components/replication-action-promote.js b/ui/lib/core/app/components/replication-action-promote.js
index cacd12811217e..89344dad477df 100644
--- a/ui/lib/core/app/components/replication-action-promote.js
+++ b/ui/lib/core/app/components/replication-action-promote.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/replication-action-promote';
diff --git a/ui/lib/core/app/components/replication-action-recover.js b/ui/lib/core/app/components/replication-action-recover.js
index 9b799e40039a2..bb7563b7e5799 100644
--- a/ui/lib/core/app/components/replication-action-recover.js
+++ b/ui/lib/core/app/components/replication-action-recover.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/replication-action-recover';
diff --git a/ui/lib/core/app/components/replication-action-reindex.js b/ui/lib/core/app/components/replication-action-reindex.js
index bd4164632c070..27ebd4ba5588f 100644
--- a/ui/lib/core/app/components/replication-action-reindex.js
+++ b/ui/lib/core/app/components/replication-action-reindex.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/replication-action-reindex';
diff --git a/ui/lib/core/app/components/replication-action-update-primary.js b/ui/lib/core/app/components/replication-action-update-primary.js
index 878ac61e8b471..82eadbef09d71 100644
--- a/ui/lib/core/app/components/replication-action-update-primary.js
+++ b/ui/lib/core/app/components/replication-action-update-primary.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/replication-action-update-primary';
diff --git a/ui/lib/core/app/components/replication-actions-single.js b/ui/lib/core/app/components/replication-actions-single.js
index 0a705b69ba997..65a99d5c376e5 100644
--- a/ui/lib/core/app/components/replication-actions-single.js
+++ b/ui/lib/core/app/components/replication-actions-single.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/replication-actions-single';
diff --git a/ui/lib/core/app/components/replication-actions.js b/ui/lib/core/app/components/replication-actions.js
index b3faec73b87e9..debe69531d47a 100644
--- a/ui/lib/core/app/components/replication-actions.js
+++ b/ui/lib/core/app/components/replication-actions.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/replication-actions';
diff --git a/ui/lib/core/app/components/replication-dashboard.js b/ui/lib/core/app/components/replication-dashboard.js
index 45697ac2c2a21..4eb3a05dbd25f 100644
--- a/ui/lib/core/app/components/replication-dashboard.js
+++ b/ui/lib/core/app/components/replication-dashboard.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/replication-dashboard';
diff --git a/ui/lib/core/app/components/replication-doc-link.js b/ui/lib/core/app/components/replication-doc-link.js
new file mode 100644
index 0000000000000..b473bd2171978
--- /dev/null
+++ b/ui/lib/core/app/components/replication-doc-link.js
@@ -0,0 +1 @@
+export { default } from 'core/components/replication-doc-link';
diff --git a/ui/lib/core/app/components/replication-header.js b/ui/lib/core/app/components/replication-header.js
index ba6976c2ae0a7..1d351dd02c40d 100644
--- a/ui/lib/core/app/components/replication-header.js
+++ b/ui/lib/core/app/components/replication-header.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/replication-header';
diff --git a/ui/lib/core/app/components/replication-mode-summary.js b/ui/lib/core/app/components/replication-mode-summary.js
index 787dc4e78ad32..fbe45992db1dc 100644
--- a/ui/lib/core/app/components/replication-mode-summary.js
+++ b/ui/lib/core/app/components/replication-mode-summary.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/replication-mode-summary';
diff --git a/ui/lib/core/app/components/replication-page.js b/ui/lib/core/app/components/replication-page.js
index d0aa22e862455..7d3472e192919 100644
--- a/ui/lib/core/app/components/replication-page.js
+++ b/ui/lib/core/app/components/replication-page.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/replication-page';
diff --git a/ui/lib/core/app/components/replication-secondary-card.js b/ui/lib/core/app/components/replication-secondary-card.js
index 63d770466e3fa..c59635a6ec353 100644
--- a/ui/lib/core/app/components/replication-secondary-card.js
+++ b/ui/lib/core/app/components/replication-secondary-card.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/replication-secondary-card';
diff --git a/ui/lib/core/app/components/replication-summary-card.js b/ui/lib/core/app/components/replication-summary-card.js
index 52e8d81b638b7..41ee0173f2542 100644
--- a/ui/lib/core/app/components/replication-summary-card.js
+++ b/ui/lib/core/app/components/replication-summary-card.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/replication-summary-card';
diff --git a/ui/lib/core/app/components/replication-table-rows.js b/ui/lib/core/app/components/replication-table-rows.js
index 50cbc9445aeaa..3835a992b1a9d 100644
--- a/ui/lib/core/app/components/replication-table-rows.js
+++ b/ui/lib/core/app/components/replication-table-rows.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/replication-table-rows';
diff --git a/ui/lib/core/app/components/search-select-placeholder.js b/ui/lib/core/app/components/search-select-placeholder.js
index d15c191be1d3b..bbf9dc53e11d7 100644
--- a/ui/lib/core/app/components/search-select-placeholder.js
+++ b/ui/lib/core/app/components/search-select-placeholder.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/search-select-placeholder';
diff --git a/ui/lib/core/app/components/search-select-with-modal.js b/ui/lib/core/app/components/search-select-with-modal.js
index b6788f2f24891..8dcfa0c589f23 100644
--- a/ui/lib/core/app/components/search-select-with-modal.js
+++ b/ui/lib/core/app/components/search-select-with-modal.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/search-select-with-modal';
diff --git a/ui/lib/core/app/components/search-select.js b/ui/lib/core/app/components/search-select.js
index 92454fe8e6d6b..4311c237c3f40 100644
--- a/ui/lib/core/app/components/search-select.js
+++ b/ui/lib/core/app/components/search-select.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/search-select';
diff --git a/ui/lib/core/app/components/secret-list-header-tab.js b/ui/lib/core/app/components/secret-list-header-tab.js
index d3d4fb8a4819d..fe2874d345489 100644
--- a/ui/lib/core/app/components/secret-list-header-tab.js
+++ b/ui/lib/core/app/components/secret-list-header-tab.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/secret-list-header-tab';
diff --git a/ui/lib/core/app/components/secret-list-header.js b/ui/lib/core/app/components/secret-list-header.js
index 0d8c259ae52a4..ed151c7b9a330 100644
--- a/ui/lib/core/app/components/secret-list-header.js
+++ b/ui/lib/core/app/components/secret-list-header.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/secret-list-header';
diff --git a/ui/lib/core/app/components/select.js b/ui/lib/core/app/components/select.js
index d56bd48137643..9d12b31eab8ff 100644
--- a/ui/lib/core/app/components/select.js
+++ b/ui/lib/core/app/components/select.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/select';
diff --git a/ui/lib/core/app/components/shamir-flow.js b/ui/lib/core/app/components/shamir-flow.js
index 86f7cfad4d345..e7ef071bb7f54 100644
--- a/ui/lib/core/app/components/shamir-flow.js
+++ b/ui/lib/core/app/components/shamir-flow.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/shamir-flow';
diff --git a/ui/lib/core/app/components/shamir-modal-flow.js b/ui/lib/core/app/components/shamir-modal-flow.js
index f7e78e549b0a7..16669241c46a4 100644
--- a/ui/lib/core/app/components/shamir-modal-flow.js
+++ b/ui/lib/core/app/components/shamir-modal-flow.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/shamir-modal-flow';
diff --git a/ui/lib/core/app/components/stat-text.js b/ui/lib/core/app/components/stat-text.js
index 73b1bff777ea0..a15c6b560fcbc 100644
--- a/ui/lib/core/app/components/stat-text.js
+++ b/ui/lib/core/app/components/stat-text.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/stat-text';
diff --git a/ui/lib/core/app/components/string-list.js b/ui/lib/core/app/components/string-list.js
index dfb96ba0c15b2..1c05052cd30bd 100644
--- a/ui/lib/core/app/components/string-list.js
+++ b/ui/lib/core/app/components/string-list.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/string-list';
diff --git a/ui/lib/core/app/components/text-file.js b/ui/lib/core/app/components/text-file.js
deleted file mode 100644
index b82fab4f42610..0000000000000
--- a/ui/lib/core/app/components/text-file.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-export { default } from 'core/components/text-file';
diff --git a/ui/lib/core/app/components/toggle-button.js b/ui/lib/core/app/components/toggle-button.js
index f902dbce5e27f..c3272665914d1 100644
--- a/ui/lib/core/app/components/toggle-button.js
+++ b/ui/lib/core/app/components/toggle-button.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/toggle-button';
diff --git a/ui/lib/core/app/components/toggle.js b/ui/lib/core/app/components/toggle.js
index 7f9b913a6cece..36e3784c91100 100644
--- a/ui/lib/core/app/components/toggle.js
+++ b/ui/lib/core/app/components/toggle.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/toggle';
diff --git a/ui/lib/core/app/components/tool-tip.js b/ui/lib/core/app/components/tool-tip.js
index d95d8939e8f7f..03985964d8659 100644
--- a/ui/lib/core/app/components/tool-tip.js
+++ b/ui/lib/core/app/components/tool-tip.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/tool-tip';
diff --git a/ui/lib/core/app/components/toolbar-actions.js b/ui/lib/core/app/components/toolbar-actions.js
index b180df25906ea..82d1f80d29542 100644
--- a/ui/lib/core/app/components/toolbar-actions.js
+++ b/ui/lib/core/app/components/toolbar-actions.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/toolbar-actions';
diff --git a/ui/lib/core/app/components/toolbar-download-button.js b/ui/lib/core/app/components/toolbar-download-button.js
new file mode 100644
index 0000000000000..1a8170f2a452a
--- /dev/null
+++ b/ui/lib/core/app/components/toolbar-download-button.js
@@ -0,0 +1 @@
+export { default } from 'core/components/toolbar-download-button';
diff --git a/ui/lib/core/app/components/toolbar-filters.js b/ui/lib/core/app/components/toolbar-filters.js
index 80530a4c1e420..f83c9e1f684f5 100644
--- a/ui/lib/core/app/components/toolbar-filters.js
+++ b/ui/lib/core/app/components/toolbar-filters.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/toolbar-filters';
diff --git a/ui/lib/core/app/components/toolbar-link.js b/ui/lib/core/app/components/toolbar-link.js
index c031b1bbc0cf5..b26f45409d33a 100644
--- a/ui/lib/core/app/components/toolbar-link.js
+++ b/ui/lib/core/app/components/toolbar-link.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/toolbar-link';
diff --git a/ui/lib/core/app/components/toolbar.js b/ui/lib/core/app/components/toolbar.js
index 3db94e5c6cfa8..c2273a27ee6bc 100644
--- a/ui/lib/core/app/components/toolbar.js
+++ b/ui/lib/core/app/components/toolbar.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/toolbar';
diff --git a/ui/lib/core/app/components/ttl-picker.js b/ui/lib/core/app/components/ttl-picker.js
index 3f365aad27948..bd9cd6441045f 100644
--- a/ui/lib/core/app/components/ttl-picker.js
+++ b/ui/lib/core/app/components/ttl-picker.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/ttl-picker';
diff --git a/ui/lib/core/app/components/upgrade-page.js b/ui/lib/core/app/components/upgrade-page.js
index 30ea01bac96b7..bf9f0e794035b 100644
--- a/ui/lib/core/app/components/upgrade-page.js
+++ b/ui/lib/core/app/components/upgrade-page.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/upgrade-page';
diff --git a/ui/lib/core/app/components/vault-logo-spinner.js b/ui/lib/core/app/components/vault-logo-spinner.js
index ed78505eaf467..f6b77c9dee19a 100644
--- a/ui/lib/core/app/components/vault-logo-spinner.js
+++ b/ui/lib/core/app/components/vault-logo-spinner.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/components/vault-logo-spinner';
diff --git a/ui/lib/core/app/decorators/confirm-leave.js b/ui/lib/core/app/decorators/confirm-leave.js
deleted file mode 100644
index 3742b58239ff9..0000000000000
--- a/ui/lib/core/app/decorators/confirm-leave.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-export { withConfirmLeave } from 'core/decorators/confirm-leave';
diff --git a/ui/lib/core/app/helpers/changelog-url-for.js b/ui/lib/core/app/helpers/changelog-url-for.js
index bbe5f926efbbb..75934aff36f35 100644
--- a/ui/lib/core/app/helpers/changelog-url-for.js
+++ b/ui/lib/core/app/helpers/changelog-url-for.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default, changelogUrlFor } from 'core/helpers/changelog-url-for';
diff --git a/ui/lib/core/app/helpers/cluster-states.js b/ui/lib/core/app/helpers/cluster-states.js
index 66975517812a9..97887155aee5e 100644
--- a/ui/lib/core/app/helpers/cluster-states.js
+++ b/ui/lib/core/app/helpers/cluster-states.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default, clusterStates, CLUSTER_STATES } from 'core/helpers/cluster-states';
diff --git a/ui/lib/core/app/helpers/date-format.js b/ui/lib/core/app/helpers/date-format.js
index ec0827aba58ee..a9d25fc47d760 100644
--- a/ui/lib/core/app/helpers/date-format.js
+++ b/ui/lib/core/app/helpers/date-format.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/helpers/date-format';
diff --git a/ui/lib/core/app/helpers/format-duration.js b/ui/lib/core/app/helpers/format-duration.js
deleted file mode 100644
index 944e085628380..0000000000000
--- a/ui/lib/core/app/helpers/format-duration.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-export { default } from 'core/helpers/format-duration';
diff --git a/ui/lib/core/app/helpers/format-number.js b/ui/lib/core/app/helpers/format-number.js
index f2ecf017e3242..3d26913f18c6f 100644
--- a/ui/lib/core/app/helpers/format-number.js
+++ b/ui/lib/core/app/helpers/format-number.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default, formatNumber } from 'core/helpers/format-number';
diff --git a/ui/lib/core/app/helpers/has-feature.js b/ui/lib/core/app/helpers/has-feature.js
index 6db9dcdc5759c..c5a79021c2c6e 100644
--- a/ui/lib/core/app/helpers/has-feature.js
+++ b/ui/lib/core/app/helpers/has-feature.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/helpers/has-feature';
diff --git a/ui/lib/core/app/helpers/img-path.js b/ui/lib/core/app/helpers/img-path.js
deleted file mode 100644
index f605ab187d9d2..0000000000000
--- a/ui/lib/core/app/helpers/img-path.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-export { default } from 'core/helpers/img-path';
diff --git a/ui/lib/core/app/helpers/is-active-route.js b/ui/lib/core/app/helpers/is-active-route.js
index b74fdb1cce390..da955ae2581f5 100644
--- a/ui/lib/core/app/helpers/is-active-route.js
+++ b/ui/lib/core/app/helpers/is-active-route.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default, isActiveRoute } from 'core/helpers/is-active-route';
diff --git a/ui/lib/core/app/helpers/is-version.js b/ui/lib/core/app/helpers/is-version.js
index 4efefd67612c0..59c8931490c58 100644
--- a/ui/lib/core/app/helpers/is-version.js
+++ b/ui/lib/core/app/helpers/is-version.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/helpers/is-version';
diff --git a/ui/lib/core/app/helpers/loose-equal.js b/ui/lib/core/app/helpers/loose-equal.js
deleted file mode 100644
index 9e6cc0f2bcd9b..0000000000000
--- a/ui/lib/core/app/helpers/loose-equal.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-export { default } from 'core/helpers/loose-equal';
diff --git a/ui/lib/core/app/helpers/message-types.js b/ui/lib/core/app/helpers/message-types.js
index ddda522252a19..a2ebe335680e0 100644
--- a/ui/lib/core/app/helpers/message-types.js
+++ b/ui/lib/core/app/helpers/message-types.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default, messageTypes, MESSAGE_TYPES } from 'core/helpers/message-types';
diff --git a/ui/lib/core/app/helpers/options-for-backend.js b/ui/lib/core/app/helpers/options-for-backend.js
index 72bccad749a54..c31004620ebab 100644
--- a/ui/lib/core/app/helpers/options-for-backend.js
+++ b/ui/lib/core/app/helpers/options-for-backend.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/helpers/options-for-backend';
diff --git a/ui/lib/core/app/helpers/path-or-array.js b/ui/lib/core/app/helpers/path-or-array.js
index 28f551416b406..67628b392fba7 100644
--- a/ui/lib/core/app/helpers/path-or-array.js
+++ b/ui/lib/core/app/helpers/path-or-array.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/helpers/path-or-array';
diff --git a/ui/lib/core/app/helpers/replication-action-for-mode.js b/ui/lib/core/app/helpers/replication-action-for-mode.js
index 48354e1b72b3b..ae5d3dac48688 100644
--- a/ui/lib/core/app/helpers/replication-action-for-mode.js
+++ b/ui/lib/core/app/helpers/replication-action-for-mode.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/helpers/replication-action-for-mode';
diff --git a/ui/lib/core/app/helpers/replication-mode-description.js b/ui/lib/core/app/helpers/replication-mode-description.js
index 3cddde049ff00..40186c1a7fe6e 100644
--- a/ui/lib/core/app/helpers/replication-mode-description.js
+++ b/ui/lib/core/app/helpers/replication-mode-description.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export {
   default,
   replicationModeDescription,
diff --git a/ui/lib/core/app/helpers/set-flash-message.js b/ui/lib/core/app/helpers/set-flash-message.js
index 9dcf0ae1793c2..2e14427578275 100644
--- a/ui/lib/core/app/helpers/set-flash-message.js
+++ b/ui/lib/core/app/helpers/set-flash-message.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default, setFlashMessage } from 'core/helpers/set-flash-message';
diff --git a/ui/lib/core/app/mixins/list-controller.js b/ui/lib/core/app/mixins/list-controller.js
index be874a6a45d3e..df52684542b48 100644
--- a/ui/lib/core/app/mixins/list-controller.js
+++ b/ui/lib/core/app/mixins/list-controller.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/mixins/list-controller';
diff --git a/ui/lib/core/app/mixins/list-route.js b/ui/lib/core/app/mixins/list-route.js
index 849ae696c96fc..9118b4ca3c5ed 100644
--- a/ui/lib/core/app/mixins/list-route.js
+++ b/ui/lib/core/app/mixins/list-route.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/mixins/list-route';
diff --git a/ui/lib/core/app/mixins/replication-actions.js b/ui/lib/core/app/mixins/replication-actions.js
index 7810a5e1ac36a..6ba429de1df81 100644
--- a/ui/lib/core/app/mixins/replication-actions.js
+++ b/ui/lib/core/app/mixins/replication-actions.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from 'core/mixins/replication-actions';
diff --git a/ui/lib/core/app/modifiers/code-mirror.js b/ui/lib/core/app/modifiers/code-mirror.js
deleted file mode 100644
index aabcfe7d36391..0000000000000
--- a/ui/lib/core/app/modifiers/code-mirror.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-export { default } from 'core/modifiers/code-mirror';
diff --git a/ui/lib/core/app/utils/b64.js b/ui/lib/core/app/utils/b64.js
index c816e997d7a59..cf7ae94797111 100644
--- a/ui/lib/core/app/utils/b64.js
+++ b/ui/lib/core/app/utils/b64.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { encodeString, decodeString } from 'core/utils/b64';
diff --git a/ui/lib/core/app/utils/timestamp.js b/ui/lib/core/app/utils/timestamp.js
deleted file mode 100644
index a0b94c1221543..0000000000000
--- a/ui/lib/core/app/utils/timestamp.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from 'core/utils/timestamp';
diff --git a/ui/lib/core/icon-mappings.js b/ui/lib/core/icon-mappings.js
index 667a6556b99dd..3d11821f42e56 100644
--- a/ui/lib/core/icon-mappings.js
+++ b/ui/lib/core/icon-mappings.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 // icons that exist in the public folder which are not part of the Structure set
 // values represent match to icon in Flight set with null representing no match
 export const localIconMap = {
diff --git a/ui/lib/core/index.js b/ui/lib/core/index.js
index 26adfef9e7356..6a11283511b1d 100644
--- a/ui/lib/core/index.js
+++ b/ui/lib/core/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /* eslint-disable */
 
 module.exports = {
diff --git a/ui/lib/core/package.json b/ui/lib/core/package.json
index 3fcb0c7345554..2746f30f5b644 100644
--- a/ui/lib/core/package.json
+++ b/ui/lib/core/package.json
@@ -15,7 +15,6 @@
     "ember-cli-clipboard": "*",
     "ember-cli-htmlbars": "*",
     "ember-cli-string-helpers": "*",
-    "ember-cli-typescript": "*",
     "ember-composable-helpers": "*",
     "ember-concurrency": "*",
     "ember-maybe-in-element": "*",
@@ -27,8 +26,6 @@
     "ember-wormhole": "*",
     "escape-string-regexp": "*",
     "@hashicorp/ember-flight-icons": "*",
-    "@hashicorp/flight-icons": "*",
-    "codemirror": "*",
-    "ember-modifier": "*"
+    "@hashicorp/flight-icons": "*"
   }
 }
diff --git a/ui/lib/css/index.js b/ui/lib/css/index.js
index f4c7d904d3409..8ddc07a148807 100644
--- a/ui/lib/css/index.js
+++ b/ui/lib/css/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /* eslint-env node */
 /* eslint-disable node/no-extraneous-require */
 'use strict';
@@ -12,7 +7,7 @@ var Funnel = require('broccoli-funnel');
 var mergeTrees = require('broccoli-merge-trees');
 
 module.exports = {
-  name: 'sassSvgUri',
+  name: 'bulma',
 
   isDevelopingAddon() {
     return true;
@@ -26,17 +21,36 @@ module.exports = {
       app = app.app;
     }
 
+    this.bulmaPath = path.dirname(require.resolve('bulma'));
+    this.bulmaSwitchPath = path.dirname(require.resolve('bulma-switch/switch.sass'));
+    this.bulmaCheckPath = path.dirname(require.resolve('cool-checkboxes-for-bulma.io'));
     this.sassSVGURIPath = path.dirname(require.resolve('sass-svg-uri'));
     return app;
   },
 
   treeForStyles: function () {
+    var bulma = new Funnel(this.bulmaPath, {
+      srcDir: '/',
+      destDir: 'app/styles/bulma',
+      annotation: 'Funnel (bulma)',
+    });
+
+    var bulmaSwitch = new Funnel(this.bulmaSwitchPath, {
+      srcDir: '/',
+      destDir: 'app/styles/bulma',
+      annotation: 'Funnel (bulma-switch)',
+    });
+    var bulmaCheck = new Funnel(this.bulmaCheckPath, {
+      srcDir: '/',
+      destDir: 'app/styles/bulma',
+      annotation: 'Funnel (bulma-check)',
+    });
     var sassSVGURI = new Funnel(this.sassSVGURIPath, {
       srcDir: '/',
       destDir: 'app/styles/sass-svg-uri',
       annotation: 'Sass SVG URI',
     });
 
-    return mergeTrees([sassSVGURI], { overwrite: true });
+    return mergeTrees([bulmaCheck, bulmaSwitch, bulma, sassSVGURI], { overwrite: true });
   },
 };
diff --git a/ui/lib/keep-gitkeep/index.js b/ui/lib/keep-gitkeep/index.js
deleted file mode 100644
index 63e2b5877e0a1..0000000000000
--- a/ui/lib/keep-gitkeep/index.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-'use strict';
-const fs = require('fs');
-module.exports = {
-  name: require('./package').name,
-
-  isDevelopingAddon() {
-    return true;
-  },
-
-  postBuild(result) {
-    // We gitignore the contents of our output directory http/web_ui
-    // but we need to keep the folder structure for the Vault build
-    fs.writeFileSync(result.directory + '/.gitkeep', '');
-  },
-};
diff --git a/ui/lib/keep-gitkeep/package.json b/ui/lib/keep-gitkeep/package.json
deleted file mode 100644
index ee6855a0ba265..0000000000000
--- a/ui/lib/keep-gitkeep/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "name": "keep-gitkeep",
-  "keywords": [
-    "ember-addon"
-  ]
-}
diff --git a/ui/lib/kmip/addon/components/edit-form-kmip-role.js b/ui/lib/kmip/addon/components/edit-form-kmip-role.js
index a3d27f01d0ab4..3de03f8f80459 100644
--- a/ui/lib/kmip/addon/components/edit-form-kmip-role.js
+++ b/ui/lib/kmip/addon/components/edit-form-kmip-role.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import EditForm from 'core/components/edit-form';
 import { computed } from '@ember/object';
 import layout from '../templates/components/edit-form-kmip-role';
@@ -45,11 +40,6 @@ export default EditForm.extend({
       if (model.operationAll || model.operationNone) {
         model.operationFieldsWithoutSpecial.forEach((field) => model.set(field, null));
       }
-      // set operationNone if user unchecks 'operationAll' instead of toggling the 'operationNone' input
-      // doing here instead of on the 'operationNone' input because a user might deselect all, then reselect some options
-      // and immediately setting operationNone will hide all of the checkboxes in the UI
-      this.model.operationNone =
-        model.operationFieldsWithoutSpecial.every((attr) => !model[attr]) && !this.model.operationAll;
     },
   },
 });
diff --git a/ui/lib/kmip/addon/components/header-scope.js b/ui/lib/kmip/addon/components/header-scope.js
index 7b1403903302f..fb9153aea3c08 100644
--- a/ui/lib/kmip/addon/components/header-scope.js
+++ b/ui/lib/kmip/addon/components/header-scope.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@ember/component';
 import { inject as service } from '@ember/service';
 import layout from '../templates/components/header-scope';
diff --git a/ui/lib/kmip/addon/components/kmip-breadcrumb.js b/ui/lib/kmip/addon/components/kmip-breadcrumb.js
index d2d0f34affdbe..533da3cbfcd28 100644
--- a/ui/lib/kmip/addon/components/kmip-breadcrumb.js
+++ b/ui/lib/kmip/addon/components/kmip-breadcrumb.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@ember/component';
 import { inject as service } from '@ember/service';
 import layout from '../templates/components/kmip-breadcrumb';
diff --git a/ui/lib/kmip/addon/components/operation-field-display.js b/ui/lib/kmip/addon/components/operation-field-display.js
index 5c8928ea0169d..26619f88f947b 100644
--- a/ui/lib/kmip/addon/components/operation-field-display.js
+++ b/ui/lib/kmip/addon/components/operation-field-display.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /**
  * @module OperationFieldDisplay
  * OperationFieldDisplay components are used on KMIP role show pages to display the allowed operations on that model
diff --git a/ui/lib/kmip/addon/controllers/credentials/index.js b/ui/lib/kmip/addon/controllers/credentials/index.js
index 3c510b6c017e7..247de7697fab8 100644
--- a/ui/lib/kmip/addon/controllers/credentials/index.js
+++ b/ui/lib/kmip/addon/controllers/credentials/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ListController from 'core/mixins/list-controller';
 import Controller from '@ember/controller';
 import { computed } from '@ember/object';
diff --git a/ui/lib/kmip/addon/controllers/credentials/show.js b/ui/lib/kmip/addon/controllers/credentials/show.js
index a9fdaf23b729a..1327edd3acaa2 100644
--- a/ui/lib/kmip/addon/controllers/credentials/show.js
+++ b/ui/lib/kmip/addon/controllers/credentials/show.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
diff --git a/ui/lib/kmip/addon/controllers/role.js b/ui/lib/kmip/addon/controllers/role.js
index fd8652b3046ea..847c8d554db4a 100644
--- a/ui/lib/kmip/addon/controllers/role.js
+++ b/ui/lib/kmip/addon/controllers/role.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
diff --git a/ui/lib/kmip/addon/controllers/scope/roles.js b/ui/lib/kmip/addon/controllers/scope/roles.js
index 3c510b6c017e7..247de7697fab8 100644
--- a/ui/lib/kmip/addon/controllers/scope/roles.js
+++ b/ui/lib/kmip/addon/controllers/scope/roles.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ListController from 'core/mixins/list-controller';
 import Controller from '@ember/controller';
 import { computed } from '@ember/object';
diff --git a/ui/lib/kmip/addon/controllers/scopes/index.js b/ui/lib/kmip/addon/controllers/scopes/index.js
index 3c510b6c017e7..247de7697fab8 100644
--- a/ui/lib/kmip/addon/controllers/scopes/index.js
+++ b/ui/lib/kmip/addon/controllers/scopes/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ListController from 'core/mixins/list-controller';
 import Controller from '@ember/controller';
 import { computed } from '@ember/object';
diff --git a/ui/lib/kmip/addon/engine.js b/ui/lib/kmip/addon/engine.js
index 15f6a3cc24763..db307e290db43 100644
--- a/ui/lib/kmip/addon/engine.js
+++ b/ui/lib/kmip/addon/engine.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Engine from 'ember-engines/engine';
 import loadInitializers from 'ember-load-initializers';
 import Resolver from './resolver';
@@ -16,7 +11,6 @@ const Eng = Engine.extend({
   dependencies: {
     services: [
       'auth',
-      'download',
       'flash-messages',
       'namespace',
       'path-help',
diff --git a/ui/lib/kmip/addon/resolver.js b/ui/lib/kmip/addon/resolver.js
index 9a3b4b378edb5..2fb563d6c0488 100644
--- a/ui/lib/kmip/addon/resolver.js
+++ b/ui/lib/kmip/addon/resolver.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Resolver from 'ember-resolver';
 
 export default Resolver;
diff --git a/ui/lib/kmip/addon/routes.js b/ui/lib/kmip/addon/routes.js
index e3f238843ebee..d0a703fc01a82 100644
--- a/ui/lib/kmip/addon/routes.js
+++ b/ui/lib/kmip/addon/routes.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import buildRoutes from 'ember-engines/routes';
 
 export default buildRoutes(function () {
diff --git a/ui/lib/kmip/addon/routes/configuration.js b/ui/lib/kmip/addon/routes/configuration.js
index fe80f6f1a90c2..82195edab937c 100644
--- a/ui/lib/kmip/addon/routes/configuration.js
+++ b/ui/lib/kmip/addon/routes/configuration.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 import UnloadModel from 'vault/mixins/unload-model-route';
diff --git a/ui/lib/kmip/addon/routes/configure.js b/ui/lib/kmip/addon/routes/configure.js
index 5baa76d331838..02395b88d28c3 100644
--- a/ui/lib/kmip/addon/routes/configure.js
+++ b/ui/lib/kmip/addon/routes/configure.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 
@@ -16,7 +11,7 @@ export default Route.extend({
   model() {
     return this.store.findRecord('kmip/config', this.secretMountPath.currentPath).catch((err) => {
       if (err.httpStatus === 404) {
-        const model = this.store.createRecord('kmip/config');
+        let model = this.store.createRecord('kmip/config');
         model.set('id', this.secretMountPath.currentPath);
         return model;
       } else {
diff --git a/ui/lib/kmip/addon/routes/credentials/generate.js b/ui/lib/kmip/addon/routes/credentials/generate.js
index 1a5ae5980d0ee..1dec607b66e9e 100644
--- a/ui/lib/kmip/addon/routes/credentials/generate.js
+++ b/ui/lib/kmip/addon/routes/credentials/generate.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 
@@ -21,7 +16,7 @@ export default Route.extend({
 
   setupController(controller) {
     this._super(...arguments);
-    const { scope_name: scope, role_name: role } = this.paramsFor('credentials');
+    let { scope_name: scope, role_name: role } = this.paramsFor('credentials');
     controller.setProperties({ role, scope });
   },
 });
diff --git a/ui/lib/kmip/addon/routes/credentials/index.js b/ui/lib/kmip/addon/routes/credentials/index.js
index a386c5d299d9b..6cb0b971ed836 100644
--- a/ui/lib/kmip/addon/routes/credentials/index.js
+++ b/ui/lib/kmip/addon/routes/credentials/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 import ListRoute from 'core/mixins/list-route';
 import { inject as service } from '@ember/service';
@@ -11,14 +6,14 @@ export default Route.extend(ListRoute, {
   store: service(),
   secretMountPath: service(),
   credParams() {
-    const { role_name: role, scope_name: scope } = this.paramsFor('credentials');
+    let { role_name: role, scope_name: scope } = this.paramsFor('credentials');
     return {
       role,
       scope,
     };
   },
   model(params) {
-    const { role, scope } = this.credParams();
+    let { role, scope } = this.credParams();
     return this.store
       .lazyPaginatedQuery('kmip/credential', {
         role,
@@ -38,7 +33,7 @@ export default Route.extend(ListRoute, {
   },
 
   setupController(controller) {
-    const { role, scope } = this.credParams();
+    let { role, scope } = this.credParams();
     this._super(...arguments);
     controller.setProperties({ role, scope });
   },
diff --git a/ui/lib/kmip/addon/routes/credentials/show.js b/ui/lib/kmip/addon/routes/credentials/show.js
index 8ce7fef6acf28..682543389ec3d 100644
--- a/ui/lib/kmip/addon/routes/credentials/show.js
+++ b/ui/lib/kmip/addon/routes/credentials/show.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 
@@ -10,14 +5,14 @@ export default Route.extend({
   store: service(),
   secretMountPath: service(),
   credParams() {
-    const { role_name: role, scope_name: scope } = this.paramsFor('credentials');
+    let { role_name: role, scope_name: scope } = this.paramsFor('credentials');
     return {
       role,
       scope,
     };
   },
   model(params) {
-    const { role, scope } = this.credParams();
+    let { role, scope } = this.credParams();
     return this.store.queryRecord('kmip/credential', {
       role,
       scope,
@@ -27,7 +22,7 @@ export default Route.extend({
   },
 
   setupController(controller) {
-    const { role, scope } = this.credParams();
+    let { role, scope } = this.credParams();
     this._super(...arguments);
     controller.setProperties({ role, scope });
   },
diff --git a/ui/lib/kmip/addon/routes/role.js b/ui/lib/kmip/addon/routes/role.js
index 08a768925a34c..c9155e006c4c5 100644
--- a/ui/lib/kmip/addon/routes/role.js
+++ b/ui/lib/kmip/addon/routes/role.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 
@@ -25,7 +20,7 @@ export default class KmipRoleRoute extends Route {
 
   setupController(controller) {
     super.setupController(...arguments);
-    const { scope_name: scope, role_name: role } = this.paramsFor('role');
+    let { scope_name: scope, role_name: role } = this.paramsFor('role');
     controller.setProperties({ role, scope });
   }
 }
diff --git a/ui/lib/kmip/addon/routes/role/edit.js b/ui/lib/kmip/addon/routes/role/edit.js
index bd911cd410565..bede947e22d50 100644
--- a/ui/lib/kmip/addon/routes/role/edit.js
+++ b/ui/lib/kmip/addon/routes/role/edit.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 
@@ -24,7 +19,7 @@ export default Route.extend({
 
   setupController(controller) {
     this._super(...arguments);
-    const { scope_name: scope, role_name: role } = this.paramsFor(this.routeName);
+    let { scope_name: scope, role_name: role } = this.paramsFor(this.routeName);
     controller.setProperties({ role, scope });
   },
 });
diff --git a/ui/lib/kmip/addon/routes/scope/roles.js b/ui/lib/kmip/addon/routes/scope/roles.js
index c3734fb9a460a..6a67677e2c78a 100644
--- a/ui/lib/kmip/addon/routes/scope/roles.js
+++ b/ui/lib/kmip/addon/routes/scope/roles.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 import ListRoute from 'core/mixins/list-route';
 import { inject as service } from '@ember/service';
diff --git a/ui/lib/kmip/addon/routes/scope/roles/create.js b/ui/lib/kmip/addon/routes/scope/roles/create.js
index 035a0bac1f2d4..467dcf1523ff9 100644
--- a/ui/lib/kmip/addon/routes/scope/roles/create.js
+++ b/ui/lib/kmip/addon/routes/scope/roles/create.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 
@@ -18,7 +13,7 @@ export default Route.extend({
     return this.pathHelp.getNewModel('kmip/role', this.secretMountPath.currentPath);
   },
   model() {
-    const model = this.store.createRecord('kmip/role', {
+    let model = this.store.createRecord('kmip/role', {
       backend: this.secretMountPath.currentPath,
       scope: this.scope(),
     });
diff --git a/ui/lib/kmip/addon/routes/scopes/create.js b/ui/lib/kmip/addon/routes/scopes/create.js
index 55533fa87ba93..5f46aefa8ffc8 100644
--- a/ui/lib/kmip/addon/routes/scopes/create.js
+++ b/ui/lib/kmip/addon/routes/scopes/create.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 
@@ -13,7 +8,7 @@ export default Route.extend({
     this.store.unloadAll('kmip/scope');
   },
   model() {
-    const model = this.store.createRecord('kmip/scope', {
+    let model = this.store.createRecord('kmip/scope', {
       backend: this.secretMountPath.currentPath,
     });
     return model;
diff --git a/ui/lib/kmip/addon/routes/scopes/index.js b/ui/lib/kmip/addon/routes/scopes/index.js
index af6cf887a3d73..73f21077a57d0 100644
--- a/ui/lib/kmip/addon/routes/scopes/index.js
+++ b/ui/lib/kmip/addon/routes/scopes/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 import ListRoute from 'core/mixins/list-route';
diff --git a/ui/lib/kmip/addon/templates/components/edit-form-kmip-role.hbs b/ui/lib/kmip/addon/templates/components/edit-form-kmip-role.hbs
index 4b91ab8e0a57e..5f1cebbfb87de 100644
--- a/ui/lib/kmip/addon/templates/components/edit-form-kmip-role.hbs
+++ b/ui/lib/kmip/addon/templates/components/edit-form-kmip-role.hbs
@@ -20,7 +20,7 @@
     </div>
     {{#unless this.model.operationNone}}
       <Toolbar>
-        <h3 class="title is-6 has-left-padding-s">
+        <h3 class="kmip-allowed-operations-header">
           Allowed Operations
         </h3>
       </Toolbar>
diff --git a/ui/lib/kmip/addon/templates/components/kmip-breadcrumb.hbs b/ui/lib/kmip/addon/templates/components/kmip-breadcrumb.hbs
index 14d072d44ea3f..74fab6153525b 100644
--- a/ui/lib/kmip/addon/templates/components/kmip-breadcrumb.hbs
+++ b/ui/lib/kmip/addon/templates/components/kmip-breadcrumb.hbs
@@ -2,7 +2,7 @@
   <ul>
     <li>
       <span class="sep">&#x0002f;</span>
-      <LinkToExternal @route="secrets">Secrets</LinkToExternal>
+      {{link-to-external "Secrets" "secrets"}}
     </li>
     {{#if this.shouldShowPath}}
       <li>
diff --git a/ui/lib/kmip/addon/templates/configuration.hbs b/ui/lib/kmip/addon/templates/configuration.hbs
index cf134fb710dc5..0c477f3f8934b 100644
--- a/ui/lib/kmip/addon/templates/configuration.hbs
+++ b/ui/lib/kmip/addon/templates/configuration.hbs
@@ -2,17 +2,14 @@
 <Toolbar>
   <ToolbarActions>
     {{#if this.model}}
-      <DownloadButton
-        class="toolbar-link"
+      <ToolbarDownloadButton
+        @actionText="Download CA cert"
+        @extension="pem"
         @filename={{concat this.model.ca.id "-ca"}}
         @data={{this.model.ca.caPem}}
-        @extension="pem"
-      >
-        Download CA cert
-        <Chevron @isButton={{true}} />
-      </DownloadButton>
+      />
     {{/if}}
-    <ToolbarLink @route="configure" data-test-kmip-link-configure>
+    <ToolbarLink @params={{array "configure"}} data-test-kmip-link-configure>
       Configure
     </ToolbarLink>
   </ToolbarActions>
diff --git a/ui/lib/kmip/addon/templates/credentials/index.hbs b/ui/lib/kmip/addon/templates/credentials/index.hbs
index 6416fcb264363..bd07eaed1739b 100644
--- a/ui/lib/kmip/addon/templates/credentials/index.hbs
+++ b/ui/lib/kmip/addon/templates/credentials/index.hbs
@@ -35,7 +35,7 @@
     </ToolbarFilters>
   {{/if}}
   <ToolbarActions>
-    <ToolbarLink @route={{"credentials.generate"}} @type="add" data-test-kmip-link-generate-credentials>
+    <ToolbarLink @type="add" @params={{array "credentials.generate"}} data-test-kmip-link-generate-credentials>
       Generate credentials
     </ToolbarLink>
   </ToolbarActions>
diff --git a/ui/lib/kmip/addon/templates/credentials/show.hbs b/ui/lib/kmip/addon/templates/credentials/show.hbs
index bc01357a7386d..12600333717dc 100644
--- a/ui/lib/kmip/addon/templates/credentials/show.hbs
+++ b/ui/lib/kmip/addon/templates/credentials/show.hbs
@@ -23,7 +23,7 @@
       </ConfirmAction>
       <div class="toolbar-separator"></div>
     {{/if}}
-    <ToolbarLink @route="credentials.index" @models={{array this.scope this.role}} data-test-kmip-link-back-to-role>
+    <ToolbarLink @params={{array "credentials.index" this.scope this.role}} data-test-kmip-link-back-to-role>
       Back to role
     </ToolbarLink>
     <CopyButton
diff --git a/ui/lib/kmip/addon/templates/role.hbs b/ui/lib/kmip/addon/templates/role.hbs
index 549c9326ad4f3..a46353631384c 100644
--- a/ui/lib/kmip/addon/templates/role.hbs
+++ b/ui/lib/kmip/addon/templates/role.hbs
@@ -13,7 +13,7 @@
       <div class="toolbar-separator"></div>
     {{/if}}
     {{#if this.model.updatePath.canUpdate}}
-      <ToolbarLink @route="role.edit" @models={{array this.scope this.role}} data-test-kmip-link-edit-role>
+      <ToolbarLink @params={{array "role.edit" this.scope this.role}} data-test-kmip-link-edit-role>
         Edit role
       </ToolbarLink>
     {{/if}}
diff --git a/ui/lib/kmip/addon/templates/scope/roles.hbs b/ui/lib/kmip/addon/templates/scope/roles.hbs
index 4f8147416a1f7..41e1f227d6800 100644
--- a/ui/lib/kmip/addon/templates/scope/roles.hbs
+++ b/ui/lib/kmip/addon/templates/scope/roles.hbs
@@ -45,7 +45,7 @@
     </ToolbarFilters>
   {{/if}}
   <ToolbarActions>
-    <ToolbarLink @route="scope.roles.create" @type="add" data-test-role-create>
+    <ToolbarLink @type="add" @params={{array "scope.roles.create"}} data-test-role-create>
       Create role
     </ToolbarLink>
   </ToolbarActions>
diff --git a/ui/lib/kmip/addon/templates/scopes/index.hbs b/ui/lib/kmip/addon/templates/scopes/index.hbs
index d5e9832133421..ac59ce7a5fc81 100644
--- a/ui/lib/kmip/addon/templates/scopes/index.hbs
+++ b/ui/lib/kmip/addon/templates/scopes/index.hbs
@@ -34,7 +34,7 @@
     </ToolbarFilters>
   {{/if}}
   <ToolbarActions>
-    <ToolbarLink @route="scopes.create" @type="add" data-test-scope-create>
+    <ToolbarLink @type="add" @params={{array "scopes.create"}} data-test-scope-create>
       Create scope
     </ToolbarLink>
   </ToolbarActions>
diff --git a/ui/lib/kmip/config/environment.js b/ui/lib/kmip/config/environment.js
index 77254ece3c8fa..5a667362d2b62 100644
--- a/ui/lib/kmip/config/environment.js
+++ b/ui/lib/kmip/config/environment.js
@@ -1,13 +1,8 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /* eslint-env node */
 'use strict';
 
 module.exports = function (environment) {
-  const ENV = {
+  let ENV = {
     modulePrefix: 'kmip',
     environment,
   };
diff --git a/ui/lib/kmip/index.js b/ui/lib/kmip/index.js
index 7d9c08da3cb72..a20c55d09a2e8 100644
--- a/ui/lib/kmip/index.js
+++ b/ui/lib/kmip/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /* eslint-env node */
 /* eslint-disable ember/avoid-leaking-state-in-ember-objects */
 /* eslint-disable node/no-extraneous-require */
diff --git a/ui/lib/kubernetes/addon/components/config-cta.hbs b/ui/lib/kubernetes/addon/components/config-cta.hbs
deleted file mode 100644
index f810534f95062..0000000000000
--- a/ui/lib/kubernetes/addon/components/config-cta.hbs
+++ /dev/null
@@ -1,9 +0,0 @@
-<EmptyState
-  data-test-config-cta
-  @title="Kubernetes not configured"
-  @message="Get started by establishing the URL of the Kubernetes API to connect to, along with some additional options."
->
-  <LinkTo class="has-top-margin-xs" @route="configure">
-    Configure Kubernetes
-  </LinkTo>
-</EmptyState>
\ No newline at end of file
diff --git a/ui/lib/kubernetes/addon/components/page/configuration.hbs b/ui/lib/kubernetes/addon/components/page/configuration.hbs
deleted file mode 100644
index 9dee03246c8ab..0000000000000
--- a/ui/lib/kubernetes/addon/components/page/configuration.hbs
+++ /dev/null
@@ -1,51 +0,0 @@
-<TabPageHeader @model={{@backend}} @breadcrumbs={{@breadcrumbs}}>
-  <ToolbarLink @route="configure" data-test-toolbar-config-action>
-    {{if @config "Edit configuration" "Configure Kubernetes"}}
-  </ToolbarLink>
-</TabPageHeader>
-
-{{#if @config}}
-  {{#if @config.disableLocalCaJwt}}
-    <InfoTableRow @label="Kubernetes host" @value={{@config.kubernetesHost}} />
-    {{#if @config.kubernetesCaCert}}
-      <InfoTableRow @label="Certificate">
-        <div class="column is-half box is-rounded">
-          <div class="is-flex-row">
-            <span class="has-left-margin-s">
-              <Icon @name="certificate" @size="24" data-test-certificate-icon />
-            </span>
-            <div class="has-left-margin-m is-min-width-0">
-              <p class="has-text-weight-bold" data-test-certificate-label>
-                PEM Format
-              </p>
-              <code class="is-size-8 truncate-second-line has-text-grey" data-test-certificate-value>
-                {{@config.kubernetesCaCert}}
-              </code>
-            </div>
-            <div class="is-flex has-background-white-bis has-side-padding-s has-top-bottom-margin-negative-m">
-              <CopyButton
-                data-test-certificate-copy
-                class="button is-transparent is-flex-v-centered"
-                @clipboardText={{@config.kubernetesCaCert}}
-                @buttonType="button"
-                @success={{action (set-flash-message "Certificate copied")}}
-              >
-                <Icon @name="clipboard-copy" aria-label="Copy" />
-              </CopyButton>
-            </div>
-          </div>
-        </div>
-      </InfoTableRow>
-    {{/if}}
-  {{else}}
-    <div class="has-top-margin-l" data-test-inferred-message>
-      <Icon @name="check-circle-fill" class="has-text-success" />
-      <span>
-        These details were successfully inferred from Vault’s kubernetes environment and were not explicity set in this
-        config.
-      </span>
-    </div>
-  {{/if}}
-{{else}}
-  <ConfigCta />
-{{/if}}
\ No newline at end of file
diff --git a/ui/lib/kubernetes/addon/components/page/configure.hbs b/ui/lib/kubernetes/addon/components/page/configure.hbs
deleted file mode 100644
index acdf9538eedeb..0000000000000
--- a/ui/lib/kubernetes/addon/components/page/configure.hbs
+++ /dev/null
@@ -1,123 +0,0 @@
-<PageHeader as |p|>
-  <p.top>
-    <Page::Breadcrumbs @breadcrumbs={{@breadcrumbs}} />
-  </p.top>
-  <p.levelLeft>
-    <h1 class="title is-3">
-      Configure kubernetes
-    </h1>
-  </p.levelLeft>
-</PageHeader>
-
-<hr class="is-marginless has-background-gray-200" />
-
-<p class="has-top-margin-m">
-  To customize your configuration, specify the type of Kubernetes cluster that credentials will be generated for.
-</p>
-
-<div class="is-flex-row has-top-margin-s">
-  <RadioCard
-    class="has-fixed-width"
-    @title="Local cluster"
-    @description="Generate credentials for the local Kubernetes cluster that Vault is running on, using Vault’s service account."
-    @icon="kubernetes-color"
-    @value={{false}}
-    @groupValue={{@model.disableLocalCaJwt}}
-    @onChange={{this.onRadioSelect}}
-    data-test-radio-card="local"
-  />
-  <RadioCard
-    class="has-fixed-width"
-    @title="Manual configuration"
-    @description="Generate credentials for an external Kubernetes cluster, using a service account that you specify."
-    @icon="vault"
-    @iconClass="has-text-black"
-    @value={{true}}
-    @groupValue={{@model.disableLocalCaJwt}}
-    @onChange={{this.onRadioSelect}}
-    data-test-radio-card="manual"
-  />
-</div>
-
-<div class="has-top-margin-m" data-test-config>
-  {{#if @model.disableLocalCaJwt}}
-    <MessageError @errorMessage={{this.error}} />
-    {{#each @model.formFields as |attr|}}
-      <FormField @attr={{attr}} @model={{@model}} @modelValidations={{this.modelValidations}} />
-    {{/each}}
-  {{else if (eq this.inferredState "success")}}
-    <Icon @name="check-circle-fill" class="has-text-success" />
-    <span>Configuration values were inferred successfully.</span>
-  {{else if (eq this.inferredState "error")}}
-    <Icon @name="x-square-fill" class="has-text-danger" />
-    <span class="has-text-danger">
-      Vault could not infer a configuration from your environment variables. Check your configuration file to edit or delete
-      them, or configure manually.
-    </span>
-  {{else}}
-    <p>
-      Configuration values can be inferred from the pod and your local environment variables.
-    </p>
-    <div>
-      <button
-        class="button has-top-margin-s {{if this.fetchInferred.isRunning 'is-loading'}}"
-        type="button"
-        disabled={{this.fetchInferred.isRunning}}
-        {{on "click" (perform this.fetchInferred)}}
-      >
-        Get config values
-      </button>
-    </div>
-  {{/if}}
-</div>
-
-<hr class="has-background-gray-200 has-top-margin-l" />
-
-<div class="has-top-margin-s has-bottom-margin-s is-flex">
-  <button
-    data-test-config-save
-    class="button is-primary"
-    type="button"
-    disabled={{this.isDisabled}}
-    {{on "click" (perform this.save)}}
-  >
-    Save
-  </button>
-  <button
-    data-test-config-cancel
-    class="button has-left-margin-xs"
-    type="button"
-    disabled={{or this.save.isRunning this.fetchInferred.isRunning}}
-    {{on "click" this.cancel}}
-  >
-    Back
-  </button>
-  {{#if this.alert}}
-    <AlertInline @type="danger" @paddingTop={{true}} @message={{this.alert}} @mimicRefresh={{true}} data-test-alert />
-  {{/if}}
-</div>
-
-{{#if this.showConfirm}}
-  <Modal
-    @title="Edit configuration"
-    @type="warning"
-    @isActive={{this.showConfirm}}
-    @showCloseButton={{true}}
-    @onClose={{fn (mut this.showConfirm) false}}
-  >
-    <section class="modal-card-body">
-      <p>
-        Making changes to your configuration may affect how Vault will reach the Kubernetes API and authenticate with it. Are
-        you sure?
-      </p>
-    </section>
-    <footer class="modal-card-foot modal-card-foot-outlined">
-      <button data-test-config-confirm type="button" class="button is-primary" {{on "click" (perform this.save)}}>
-        Confirm
-      </button>
-      <button type="button" class="button" onclick={{fn (mut this.showConfirm) false}}>
-        Cancel
-      </button>
-    </footer>
-  </Modal>
-{{/if}}
\ No newline at end of file
diff --git a/ui/lib/kubernetes/addon/components/page/configure.js b/ui/lib/kubernetes/addon/components/page/configure.js
deleted file mode 100644
index e1eb5d1f2b057..0000000000000
--- a/ui/lib/kubernetes/addon/components/page/configure.js
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
-import { inject as service } from '@ember/service';
-import { tracked } from '@glimmer/tracking';
-import { action } from '@ember/object';
-import { task } from 'ember-concurrency';
-import { waitFor } from '@ember/test-waiters';
-import errorMessage from 'vault/utils/error-message';
-
-/**
- * @module Configure
- * ConfigurePage component is a child component to configure kubernetes secrets engine.
- *
- * @param {object} model - config model that contains kubernetes configuration
- */
-export default class ConfigurePageComponent extends Component {
-  @service router;
-  @service store;
-
-  @tracked inferredState;
-  @tracked modelValidations;
-  @tracked alert;
-  @tracked error;
-  @tracked showConfirm;
-
-  constructor() {
-    super(...arguments);
-    if (!this.args.model.isNew && !this.args.model.disableLocalCaJwt) {
-      this.inferredState = 'success';
-    }
-  }
-
-  get isDisabled() {
-    if (!this.args.model.disableLocalCaJwt && this.inferredState !== 'success') {
-      return true;
-    }
-    return this.save.isRunning || this.fetchInferred.isRunning;
-  }
-
-  leave(route) {
-    this.router.transitionTo(`vault.cluster.secrets.backend.kubernetes.${route}`);
-  }
-
-  @action
-  onRadioSelect(value) {
-    this.args.model.disableLocalCaJwt = value;
-    this.inferredState = null;
-  }
-
-  @task
-  @waitFor
-  *fetchInferred() {
-    try {
-      yield this.store.adapterFor('kubernetes/config').checkConfigVars(this.args.model.backend);
-      this.inferredState = 'success';
-    } catch {
-      this.inferredState = 'error';
-    }
-  }
-
-  @task
-  @waitFor
-  *save() {
-    if (!this.args.model.isNew && !this.showConfirm) {
-      this.showConfirm = true;
-      return;
-    }
-    this.showConfirm = false;
-
-    const { isValid, state, invalidFormMessage } = yield this.args.model.validate();
-    if (!isValid) {
-      this.modelValidations = state;
-      this.alert = invalidFormMessage;
-      return;
-    }
-
-    try {
-      yield this.args.model.save();
-      this.leave('configuration');
-    } catch (error) {
-      this.error = errorMessage(error, 'Error saving configuration. Please try again or contact support');
-    }
-  }
-
-  @action
-  cancel() {
-    const { model } = this.args;
-    const transitionRoute = model.isNew ? 'overview' : 'configuration';
-    const cleanupMethod = model.isNew ? 'unloadRecord' : 'rollbackAttributes';
-    model[cleanupMethod]();
-    this.leave(transitionRoute);
-  }
-}
diff --git a/ui/lib/kubernetes/addon/components/page/credentials.hbs b/ui/lib/kubernetes/addon/components/page/credentials.hbs
deleted file mode 100644
index 84d7d37f8cabf..0000000000000
--- a/ui/lib/kubernetes/addon/components/page/credentials.hbs
+++ /dev/null
@@ -1,119 +0,0 @@
-<PageHeader as |p|>
-  <p.top>
-    <Page::Breadcrumbs @breadcrumbs={{@breadcrumbs}} />
-  </p.top>
-  <p.levelLeft>
-    <h1 class="title is-3 has-bottom-margin-2" data-test-credentials-header>
-      {{if this.credentials "Credentials" "Generate credentials"}}
-    </h1>
-  </p.levelLeft>
-</PageHeader>
-
-{{#if this.credentials}}
-  <div class="box is-sideless is-fullwidth is-marginless has-bottom-padding-l" data-test-credentials-details>
-    <AlertBanner
-      @class="is-marginless"
-      @type="warning"
-      @title="Warning"
-      @message="You won't be able to access these credentials later, so please copy them now."
-    />
-    <InfoTableRow @label="Service account token">
-      <MaskedInput
-        @value={{this.credentials.service_account_token}}
-        @name="Service Account Token"
-        @displayOnly={{true}}
-        @allowCopy={{true}}
-      />
-    </InfoTableRow>
-    <InfoTableRow
-      @label="Namespace"
-      @value={{this.credentials.service_account_namespace}}
-      @addCopyButton={{true}}
-      @alwaysRender={{true}}
-    />
-    <InfoTableRow
-      @label="Service account name"
-      @value={{this.credentials.service_account_name}}
-      @addCopyButton={{true}}
-      @alwaysRender={{true}}
-    />
-    <InfoTableRow @label="Lease expiry" @value={{date-format this.leaseExpiry "MMMM do yyyy, h:mm:ss a"}} />
-    <InfoTableRow @label="lease_id" @value={{this.credentials.lease_id}} />
-    <InfoTableRow />
-  </div>
-
-  <div class="has-top-margin-l">
-    <button class="button is-primary" type="button" data-test-generate-credentials-done {{on "click" this.cancel}}>
-      Done
-    </button>
-  </div>
-{{else}}
-  <div data-test-generate-credentials>
-    <form {{on "submit" (perform this.fetchCredentials)}}>
-      <div class="field box is-sideless is-fullwidth is-marginless">
-        <p>This will generate credentials using the role <span class="is-font-mono">{{@roleName}}</span>.</p>
-
-        {{#if this.error}}
-          <MessageError class="has-top-margin-l" @errorMessage={{this.error}} />
-        {{/if}}
-
-        <label for="token" class="is-label has-top-margin-l">Kubernetes namespace</label>
-        <div class="has-text-grey is-size-8 has-bottom-margin-xs">
-          The namespace in which to generate the credentials.
-        </div>
-        <Input
-          @type="text"
-          @value={{this.kubernetesNamespace}}
-          class="input"
-          {{on "input" this.setKubernetesNamespace}}
-          data-test-kubernetes-namespace
-        />
-
-        <div class="has-top-margin-l has-bottom-margin-l">
-          <Toggle
-            @status="success"
-            @size="small"
-            @checked={{this.clusterRoleBinding}}
-            @onChange={{(toggle-action "clusterRoleBinding" this)}}
-            data-test-kubernetes-clusterRoleBinding
-          >
-            <h3 class="title is-7 is-marginless">ClusterRoleBinding</h3>
-            <div class="description has-text-grey">
-              <span>
-                Generate a ClusterRoleBinding to grant permissions across the whole cluster instead of within a namespace.
-                This requires the Vault role to have kubernetes_role_type set to ClusterRole.
-              </span>
-            </div>
-          </Toggle>
-        </div>
-
-        <TtlPicker
-          class="has-top-margin-l has-bottom-margin-m"
-          @initialEnabled={{false}}
-          @label="Time-to-Live (TTL)"
-          @onChange={{this.updateTtl}}
-          @helperTextDisabled="The TTL of the generated Kubernetes service account token. Defaults to the role's default TTL, or the default system TTL."
-        />
-      </div>
-      <div class="has-top-margin-l">
-        <button
-          class="button is-primary {{if this.fetchCredentials.isRunning 'is-loading'}}"
-          type="submit"
-          disabled={{this.fetchCredentials.isRunning}}
-          data-test-generate-credentials-button
-        >
-          Generate credentials
-        </button>
-        <button
-          class="button has-left-margin-xs"
-          type="button"
-          disabled={{this.fetchCredentials.isRunning}}
-          {{on "click" this.cancel}}
-          data-test-generate-credentials-back
-        >
-          Back
-        </button>
-      </div>
-    </form>
-  </div>
-{{/if}}
\ No newline at end of file
diff --git a/ui/lib/kubernetes/addon/components/page/credentials.js b/ui/lib/kubernetes/addon/components/page/credentials.js
deleted file mode 100644
index 778f4822fa12a..0000000000000
--- a/ui/lib/kubernetes/addon/components/page/credentials.js
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
-import { inject as service } from '@ember/service';
-import { tracked } from '@glimmer/tracking';
-import { action } from '@ember/object';
-import { task } from 'ember-concurrency';
-import { waitFor } from '@ember/test-waiters';
-import { add } from 'date-fns';
-import errorMessage from 'vault/utils/error-message';
-import timestamp from 'vault/utils/timestamp';
-/**
- * @module Credentials
- * CredentialsPage component is a child component to show the generate and view
- * credentials form.
- *
- * @param {string} roleName - role name as a string
- * @param {string} backend - backend as a string
- * @param {array} breadcrumbs - breadcrumbs as an array of objects that contain label and route
- */
-export default class CredentialsPageComponent extends Component {
-  @service store;
-  @service router;
-
-  @tracked ttl = '';
-  @tracked clusterRoleBinding = false;
-  @tracked kubernetesNamespace;
-  @tracked error;
-
-  @tracked credentials;
-
-  get leaseExpiry() {
-    return add(timestamp.now(), { seconds: this.credentials.lease_duration });
-  }
-
-  @action
-  cancel() {
-    this.router.transitionTo('vault.cluster.secrets.backend.kubernetes.roles.role.details');
-  }
-
-  @action
-  setKubernetesNamespace({ target }) {
-    this.kubernetesNamespace = target.value;
-  }
-
-  @action
-  updateTtl({ goSafeTimeString }) {
-    this.ttl = goSafeTimeString;
-  }
-
-  @task
-  @waitFor
-  *fetchCredentials(event) {
-    event.preventDefault();
-    try {
-      const payload = {
-        role: this.args.roleName,
-        kubernetes_namespace: this.kubernetesNamespace,
-        cluster_role_binding: this.clusterRoleBinding,
-        ttl: this.ttl,
-      };
-
-      this.credentials = yield this.store
-        .adapterFor('kubernetes/role')
-        .generateCredentials(this.args.backend, payload);
-    } catch (error) {
-      this.error = errorMessage(error);
-    }
-  }
-}
diff --git a/ui/lib/kubernetes/addon/components/page/overview.hbs b/ui/lib/kubernetes/addon/components/page/overview.hbs
deleted file mode 100644
index 228135f3f7253..0000000000000
--- a/ui/lib/kubernetes/addon/components/page/overview.hbs
+++ /dev/null
@@ -1,43 +0,0 @@
-<TabPageHeader @model={{@backend}} @breadcrumbs={{@breadcrumbs}}>
-  <ToolbarLink @route="configure">Configure Kubernetes</ToolbarLink>
-</TabPageHeader>
-
-{{#if @promptConfig}}
-  <ConfigCta />
-{{else}}
-  <div class="selectable-card-container has-grid has-top-margin-l has-two-col-grid">
-    <OverviewCard
-      @cardTitle="Roles"
-      @subText="The number of Vault roles being used to generate Kubernetes credentials."
-      @actionText={{if @roles.length "View Roles" "Create Role"}}
-      @actionTo={{if @roles.length "roles" "roles.create"}}
-    >
-      <h2 class="title is-2 has-font-weight-normal has-top-margin-m" data-test-roles-card-overview-num>{{or
-          @roles.length
-          "None"
-        }}</h2>
-    </OverviewCard>
-    <OverviewCard @cardTitle="Generate credentials" @subText="Quickly generate credentials by typing the role name.">
-      <div class="has-top-margin-m is-flex">
-        <SearchSelect
-          class="is-flex-1"
-          @placeholder="Type to find a role..."
-          @disallowNewItems={{true}}
-          @options={{this.roleOptions}}
-          @selectLimit="1"
-          @fallbackComponent="input-search"
-          @onChange={{this.selectRole}}
-        />
-        <button
-          class="button has-left-margin-s"
-          type="button"
-          disabled={{not this.selectedRole}}
-          {{on "click" this.generateCredential}}
-          data-test-generate-credential-button
-        >
-          Generate
-        </button>
-      </div>
-    </OverviewCard>
-  </div>
-{{/if}}
\ No newline at end of file
diff --git a/ui/lib/kubernetes/addon/components/page/overview.js b/ui/lib/kubernetes/addon/components/page/overview.js
deleted file mode 100644
index b97037230a4f4..0000000000000
--- a/ui/lib/kubernetes/addon/components/page/overview.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
-import { inject as service } from '@ember/service';
-import { tracked } from '@glimmer/tracking';
-import { action } from '@ember/object';
-
-/**
- * @module Overview
- * OverviewPage component is a child component to overview kubernetes secrets engine.
- *
- * @param {boolean} promptConfig - whether or not to display config cta
- * @param {object} backend - backend model that contains kubernetes configuration
- * @param {array} roles - array of roles
- * @param {array} breadcrumbs - breadcrumbs as an array of objects that contain label and route
- */
-
-export default class OverviewPageComponent extends Component {
-  @service router;
-
-  @tracked selectedRole = null;
-  @tracked roleOptions = [];
-
-  constructor() {
-    super(...arguments);
-    this.roleOptions = this.args.roles.map((role) => {
-      return { name: role.name, id: role.name };
-    });
-  }
-
-  @action
-  selectRole([roleName]) {
-    this.selectedRole = roleName;
-  }
-
-  @action
-  generateCredential() {
-    this.router.transitionTo(
-      'vault.cluster.secrets.backend.kubernetes.roles.role.credentials',
-      this.selectedRole
-    );
-  }
-}
diff --git a/ui/lib/kubernetes/addon/components/page/role/create-and-edit.hbs b/ui/lib/kubernetes/addon/components/page/role/create-and-edit.hbs
deleted file mode 100644
index fad90586b9d78..0000000000000
--- a/ui/lib/kubernetes/addon/components/page/role/create-and-edit.hbs
+++ /dev/null
@@ -1,151 +0,0 @@
-<PageHeader as |p|>
-  <p.top>
-    <Page::Breadcrumbs @breadcrumbs={{@breadcrumbs}} />
-  </p.top>
-  <p.levelLeft>
-    <h1 class="title is-3">
-      {{if @model.isNew "Create role" "Edit role"}}
-    </h1>
-  </p.levelLeft>
-</PageHeader>
-
-<hr class="is-marginless has-background-gray-200" />
-
-<p class="has-top-margin-m">
-  A role in Vault dictates what will be generated for Kubernetes and what kind of rules will be used to do so. It is not a
-  Kubernetes role.
-</p>
-
-<div class="is-flex-row has-top-margin-s">
-  {{#each this.generationPreferences as |pref|}}
-    <RadioCard
-      @title={{pref.title}}
-      @description={{pref.description}}
-      @icon="token"
-      @value={{pref.value}}
-      @groupValue={{@model.generationPreference}}
-      @onChange={{this.changePreference}}
-      data-test-radio-card={{pref.value}}
-    />
-  {{/each}}
-</div>
-
-<div class="has-top-margin-xl has-bottom-margin-l">
-  <h2 class="title is-4">
-    Role options
-  </h2>
-  <hr class="is-marginless has-background-gray-200" />
-</div>
-
-{{#if @model.generationPreference}}
-  <form id="role" {{on "submit" this.onSave}} data-test-policy-form>
-    {{#if this.errorBanner}}
-      <MessageError @errorMessage={{this.errorBanner}} class="has-top-margin-s" />
-    {{/if}}
-
-    {{#each @model.filteredFormFields as |field|}}
-      <FormField @attr={{field}} @model={{@model}} @modelValidations={{this.modelValidations}} />
-    {{/each}}
-
-    <div class="has-bottom-margin-s">
-      <ToggleButton
-        data-test-field="annotations"
-        @isOpen={{this.showAnnotations}}
-        @openLabel="Hide annotations and labels"
-        @closedLabel="Annotations and labels"
-        @onClick={{fn (mut this.showAnnotations)}}
-      />
-      {{#if this.showAnnotations}}
-        <div class="box" data-test-annotations>
-          {{#each this.extraFields as |field|}}
-            <div class={{if (eq field.type "labels") "has-top-margin-xl"}}>
-              <h2 class="title is-4">Extra {{field.type}}</h2>
-              <p>
-                {{field.description}}
-                See
-                <ExternalLink @href="https://kubernetes.io/docs/concepts/overview/working-with-objects/{{field.type}}/">
-                  Kubernetes
-                  {{singularize field.type}}
-                  documentation here
-                </ExternalLink>.
-              </p>
-              <KvObjectEditor
-                class="has-top-margin-m"
-                data-test-kv={{field.type}}
-                @value={{get @model field.key}}
-                @onChange={{fn (mut (get @model field.key))}}
-              />
-            </div>
-            <hr />
-          {{/each}}
-        </div>
-      {{/if}}
-    </div>
-
-    {{#if (eq @model.generationPreference "full")}}
-      <div class="has-top-margin-m has-bottom-margin-l" data-test-generated-role-rules>
-        <h2 class="title is-4">
-          Generated role rules
-        </h2>
-        <FormFieldLabel
-          for="templates"
-          @label="Role rules template"
-          @subText="Start with a template for role rules based on your use case"
-        />
-        <div class="select is-fullwidth">
-          <select id="templates" data-test-select-template {{on "change" this.selectTemplate}}>
-            {{#each this.roleRulesTemplates as |template|}}
-              <option selected={{eq this.selectedTemplateId template.id}} value={{template.id}}>
-                {{template.label}}
-              </option>
-            {{/each}}
-          </select>
-        </div>
-        {{#let (find-by "id" this.selectedTemplateId this.roleRulesTemplates) as |template|}}
-          <JsonEditor
-            class="has-top-margin-l"
-            data-test-rules
-            @title="Role rules"
-            @value={{template.rules}}
-            @mode="ruby"
-            @valueUpdated={{fn (mut template.rules)}}
-            @helpText={{sanitized-html this.roleRulesHelpText}}
-          >
-            <button type="button" class="toolbar-link" {{on "click" this.resetRoleRules}} data-test-restore-example>
-              Restore example
-              <Icon @name="reload" />
-            </button>
-          </JsonEditor>
-        {{/let}}
-      </div>
-    {{/if}}
-    {{#if this.invalidFormAlert}}
-      <div class="control" data-test-invalid-form-alert>
-        <AlertInline @type="danger" @paddingTop={{true}} @message={{this.invalidFormAlert}} @mimicRefresh={{true}} />
-      </div>
-    {{/if}}
-  </form>
-{{else}}
-  <EmptyState
-    class="is-shadowless"
-    @title="Choose an option above"
-    @message="To configure a Vault role, choose what should be generated in Kubernetes by Vault."
-  />
-{{/if}}
-
-<hr class="is-marginless has-background-gray-200" />
-
-<div class="has-top-margin-l has-bottom-margin-s">
-  <button
-    type="submit"
-    form="role"
-    class="button is-primary {{if this.save.isRunning 'is-loading'}}"
-    disabled={{or (not @model.generationPreference) this.save.isRunning}}
-    data-test-save
-  >
-    Save
-  </button>
-  <button type="button" class="button has-left-margin-s" data-test-cancel {{on "click" this.cancel}}>
-    Back
-  </button>
-</div>
\ No newline at end of file
diff --git a/ui/lib/kubernetes/addon/components/page/role/create-and-edit.js b/ui/lib/kubernetes/addon/components/page/role/create-and-edit.js
deleted file mode 100644
index c70792eb12f37..0000000000000
--- a/ui/lib/kubernetes/addon/components/page/role/create-and-edit.js
+++ /dev/null
@@ -1,173 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
-import { inject as service } from '@ember/service';
-import { tracked } from '@glimmer/tracking';
-import { action } from '@ember/object';
-import { task } from 'ember-concurrency';
-import { waitFor } from '@ember/test-waiters';
-import { getRules } from '../../../utils/generated-role-rules';
-import errorMessage from 'vault/utils/error-message';
-
-/**
- * @module CreateAndEditRolePage
- * CreateAndEditRolePage component is a child component for create and edit role pages.
- *
- * @param {object} model - role model that contains role record and backend
- */
-
-export default class CreateAndEditRolePageComponent extends Component {
-  @service router;
-  @service flashMessages;
-
-  @tracked roleRulesTemplates;
-  @tracked selectedTemplateId;
-  @tracked modelValidations;
-  @tracked invalidFormAlert;
-  @tracked errorBanner;
-
-  constructor() {
-    super(...arguments);
-    // generated role rules are only rendered for the full object chain option
-    if (this.args.model.generationPreference === 'full') {
-      this.initRoleRules();
-    }
-    // if editing and annotations or labels exist expand the section
-    const { extraAnnotations, extraLabels } = this.args.model;
-    if (extraAnnotations || extraLabels) {
-      this.showAnnotations = true;
-    }
-  }
-
-  get generationPreferences() {
-    return [
-      {
-        title: 'Generate token only using existing service account',
-        description:
-          'Enter a service account that already exists in Kubernetes and Vault will dynamically generate a token.',
-        value: 'basic',
-      },
-      {
-        title: 'Generate token, service account, and role binding objects',
-        description:
-          'Enter a pre-existing role (or ClusterRole) to use. Vault will generate a token, a service account and role binding objects.',
-        value: 'expanded',
-      },
-      {
-        title: 'Generate entire Kubernetes object chain',
-        description:
-          'Vault will generate the entire chain— a role, a token, a service account, and role binding objects— based on rules you supply.',
-        value: 'full',
-      },
-    ];
-  }
-
-  get extraFields() {
-    return [
-      {
-        type: 'annotations',
-        key: 'extraAnnotations',
-        description: 'Attach arbitrary non-identifying metadata to objects.',
-      },
-      {
-        type: 'labels',
-        key: 'extraLabels',
-        description:
-          'Labels specify identifying attributes of objects that are meaningful and relevant to users.',
-      },
-    ];
-  }
-
-  get roleRulesHelpText() {
-    const message =
-      'This specifies the Role or ClusterRole rules to use when generating a role. Kubernetes documentation is';
-    const link =
-      '<a href="https://kubernetes.io/docs/reference/access-authn-authz/rbac/" target="_blank" rel="noopener noreferrer">available here</>';
-    return `${message} ${link}.`;
-  }
-
-  @action
-  initRoleRules() {
-    // first check if generatedRoleRules matches one of the templates, the user may have chosen a template and not made changes
-    // in this case we need to select the corresponding template in the dropdown
-    // if there is no match then replace the example rules with the user defined value for no template option
-    const { generatedRoleRules } = this.args.model;
-    const rulesTemplates = getRules();
-    this.selectedTemplateId = '1';
-
-    if (generatedRoleRules) {
-      const template = rulesTemplates.findBy('rules', generatedRoleRules);
-      if (template) {
-        this.selectedTemplateId = template.id;
-      } else {
-        rulesTemplates.findBy('id', '1').rules = generatedRoleRules;
-      }
-    }
-    this.roleRulesTemplates = rulesTemplates;
-  }
-
-  @action
-  resetRoleRules() {
-    this.roleRulesTemplates = getRules();
-  }
-
-  @action
-  selectTemplate(event) {
-    this.selectedTemplateId = event.target.value;
-  }
-
-  @action
-  changePreference(pref) {
-    if (pref === 'full') {
-      this.initRoleRules();
-    } else {
-      this.selectedTemplateId = null;
-    }
-    this.args.model.generationPreference = pref;
-  }
-
-  @task
-  @waitFor
-  *save() {
-    try {
-      // set generatedRoleRoles to value of selected template
-      const selectedTemplate = this.roleRulesTemplates?.findBy('id', this.selectedTemplateId);
-      if (selectedTemplate) {
-        this.args.model.generatedRoleRules = selectedTemplate.rules;
-      }
-      yield this.args.model.save();
-      this.router.transitionTo(
-        'vault.cluster.secrets.backend.kubernetes.roles.role.details',
-        this.args.model.name
-      );
-    } catch (error) {
-      const message = errorMessage(error, 'Error saving role. Please try again or contact support');
-      this.errorBanner = message;
-      this.invalidFormAlert = 'There was an error submitting this form.';
-    }
-  }
-
-  @action
-  async onSave(event) {
-    event.preventDefault();
-    const { isValid, state, invalidFormMessage } = await this.args.model.validate();
-    if (isValid) {
-      this.modelValidations = null;
-      this.save.perform();
-    } else {
-      this.invalidFormAlert = invalidFormMessage;
-      this.modelValidations = state;
-    }
-  }
-
-  @action
-  cancel() {
-    const { model } = this.args;
-    const method = model.isNew ? 'unloadRecord' : 'rollbackAttributes';
-    model[method]();
-    this.router.transitionTo('vault.cluster.secrets.backend.kubernetes.roles');
-  }
-}
diff --git a/ui/lib/kubernetes/addon/components/page/role/details.hbs b/ui/lib/kubernetes/addon/components/page/role/details.hbs
deleted file mode 100644
index 9001a7c781fdb..0000000000000
--- a/ui/lib/kubernetes/addon/components/page/role/details.hbs
+++ /dev/null
@@ -1,64 +0,0 @@
-<PageHeader as |p|>
-  <p.top>
-    <Page::Breadcrumbs @breadcrumbs={{@breadcrumbs}} />
-  </p.top>
-  <p.levelLeft>
-    <h1 class="title is-3" data-test-header-title>
-      {{@model.name}}
-    </h1>
-  </p.levelLeft>
-</PageHeader>
-
-<Toolbar>
-  <ToolbarActions>
-    {{#if @model.canDelete}}
-      <ConfirmAction @buttonClasses="toolbar-link" @onConfirmAction={{this.delete}} data-test-delete>
-        Delete role
-      </ConfirmAction>
-      <div class="toolbar-separator"></div>
-    {{/if}}
-    {{#if @model.canGenerateCreds}}
-      <ToolbarLink @route="roles.role.credentials" data-test-generate-credentials>
-        Generate credentials
-      </ToolbarLink>
-    {{/if}}
-    {{#if @model.canEdit}}
-      <ToolbarLink @route="roles.role.edit" data-test-edit>
-        Edit role
-      </ToolbarLink>
-    {{/if}}
-  </ToolbarActions>
-</Toolbar>
-
-{{#each @model.filteredFormFields as |field|}}
-  {{#let (get @model field.name) as |value|}}
-    <InfoTableRow
-      data-test-filtered-field
-      @label={{field.options.label}}
-      @value={{if (eq field.options.editType "ttl") (format-duration value) value}}
-    />
-  {{/let}}
-{{/each}}
-
-{{#if @model.generatedRoleRules}}
-  <div class="has-top-margin-xl" data-test-generated-role-rules>
-    <h2 class="title is-4">Generated role rules</h2>
-    <JsonEditor
-      @title="Role rules"
-      @value={{@model.generatedRoleRules}}
-      @mode="ruby"
-      @readOnly={{true}}
-      @showToolbar={{true}}
-      @theme="hashi auto-height"
-    />
-  </div>
-{{/if}}
-
-{{#each this.extraFields as |field|}}
-  <div class="has-top-margin-xl" data-test-extra-fields={{field.label}}>
-    <h2 class="title is-4 is-marginless">{{field.label}}</h2>
-    {{#each-in (get @model field.key) as |key value|}}
-      <InfoTableRow @label={{key}} @value={{value}} />
-    {{/each-in}}
-  </div>
-{{/each}}
\ No newline at end of file
diff --git a/ui/lib/kubernetes/addon/components/page/role/details.js b/ui/lib/kubernetes/addon/components/page/role/details.js
deleted file mode 100644
index b3223d93b8be0..0000000000000
--- a/ui/lib/kubernetes/addon/components/page/role/details.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
-import { action } from '@ember/object';
-import { inject as service } from '@ember/service';
-import errorMessage from 'vault/utils/error-message';
-
-/**
- * @module RoleDetailsPage
- * RoleDetailsPage component is a child component for create and edit role pages.
- *
- * @param {object} model - role model that contains role record and backend
- * @param {array} breadcrumbs - breadcrumbs as an array of objects that contain label and route
- */
-
-export default class RoleDetailsPageComponent extends Component {
-  @service router;
-  @service flashMessages;
-
-  get extraFields() {
-    const fields = [];
-    if (this.args.model.extraAnnotations) {
-      fields.push({ label: 'Annotations', key: 'extraAnnotations' });
-    }
-    if (this.args.model.extraLabels) {
-      fields.push({ label: 'Labels', key: 'extraLabels' });
-    }
-    return fields;
-  }
-
-  @action
-  async delete() {
-    try {
-      await this.args.model.destroyRecord();
-      this.router.transitionTo('vault.cluster.secrets.backend.kubernetes.roles');
-    } catch (error) {
-      const message = errorMessage(error, 'Unable to delete role. Please try again or contact support');
-      this.flashMessages.danger(message);
-    }
-  }
-}
diff --git a/ui/lib/kubernetes/addon/components/page/roles.hbs b/ui/lib/kubernetes/addon/components/page/roles.hbs
deleted file mode 100644
index 960b249b986a9..0000000000000
--- a/ui/lib/kubernetes/addon/components/page/roles.hbs
+++ /dev/null
@@ -1,83 +0,0 @@
-<TabPageHeader
-  @model={{@backend}}
-  @filterRoles={{not @promptConfig}}
-  @rolesFilterValue={{@filterValue}}
-  @breadcrumbs={{@breadcrumbs}}
->
-  {{#unless @promptConfig}}
-    <ToolbarLink @route="roles.create" @type="add" data-test-toolbar-roles-action>
-      Create role
-    </ToolbarLink>
-  {{/unless}}
-</TabPageHeader>
-
-{{#if @promptConfig}}
-  <ConfigCta />
-{{else if (not @roles)}}
-  {{#if @filterValue}}
-    <EmptyState @title="There are no roles matching &quot;{{@filterValue}}&quot;" />
-  {{else}}
-    <EmptyState
-      data-test-config-cta
-      @title="No roles yet"
-      @message="When created, roles will be listed here. Create a role to start generating service account tokens."
-    >
-      <LinkTo class="has-top-margin-xs" @route="roles.create">
-        Create role
-      </LinkTo>
-    </EmptyState>
-  {{/if}}
-{{else}}
-  <div class="has-bottom-margin-s">
-    {{#each @roles as |role|}}
-      <ListItem @linkPrefix={{this.mountPoint}} @linkParams={{array "roles.role.details" role.name}} as |Item|>
-        <Item.content>
-          <Icon @name="user" />
-          <span data-test-role={{role.name}}>{{role.name}}</span>
-        </Item.content>
-        <Item.menu as |Menu|>
-          {{#if role.rolesPath.isLoading}}
-            <li class="action">
-              <button disabled type="button" class="link button is-loading is-transparent">
-                loading
-              </button>
-            </li>
-          {{else}}
-            <li class="action">
-              <LinkTo
-                class="has-text-black has-text-weight-semibold"
-                data-test-details
-                @route="roles.role.details"
-                @model={{role}}
-                @disabled={{eq role.canRead false}}
-              >
-                Details
-              </LinkTo>
-            </li>
-            <li class="action">
-              <LinkTo
-                class="has-text-black has-text-weight-semibold"
-                data-test-edit
-                @route="roles.role.edit"
-                @model={{role}}
-                @disabled={{not role.canEdit}}
-              >
-                Edit
-              </LinkTo>
-            </li>
-            <li class="action">
-              <Menu.Message
-                data-test-delete
-                @id={{role.id}}
-                @triggerText="Delete"
-                @title="Are you sure?"
-                @message="Deleting this role means that you’ll need to recreate it in order to generate credentials again."
-                @onConfirm={{fn this.onDelete role}}
-              />
-            </li>
-          {{/if}}
-        </Item.menu>
-      </ListItem>
-    {{/each}}
-  </div>
-{{/if}}
\ No newline at end of file
diff --git a/ui/lib/kubernetes/addon/components/page/roles.js b/ui/lib/kubernetes/addon/components/page/roles.js
deleted file mode 100644
index b0e9ad61e1d4b..0000000000000
--- a/ui/lib/kubernetes/addon/components/page/roles.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
-import { inject as service } from '@ember/service';
-import { action } from '@ember/object';
-import { getOwner } from '@ember/application';
-import errorMessage from 'vault/utils/error-message';
-
-/**
- * @module Roles
- * RolesPage component is a child component to show list of roles
- *
- * @param {array} roles - array of roles
- * @param {boolean} promptConfig - whether or not to display config cta
- * @param {array} pageFilter - array of filtered roles
- * @param {array} breadcrumbs - breadcrumbs as an array of objects that contain label and route
- */
-export default class RolesPageComponent extends Component {
-  @service flashMessages;
-
-  get mountPoint() {
-    return getOwner(this).mountPoint;
-  }
-
-  @action
-  async onDelete(model) {
-    try {
-      const message = `Successfully deleted role ${model.name}`;
-      await model.destroyRecord();
-      this.args.roles.removeObject(model);
-      this.flashMessages.success(message);
-    } catch (error) {
-      const message = errorMessage(error, 'Error deleting role. Please try again or contact support');
-      this.flashMessages.danger(message);
-    }
-  }
-}
diff --git a/ui/lib/kubernetes/addon/components/tab-page-header.hbs b/ui/lib/kubernetes/addon/components/tab-page-header.hbs
deleted file mode 100644
index 0048a90ff12ee..0000000000000
--- a/ui/lib/kubernetes/addon/components/tab-page-header.hbs
+++ /dev/null
@@ -1,36 +0,0 @@
-<PageHeader as |p|>
-  <p.top>
-    <Page::Breadcrumbs @breadcrumbs={{@breadcrumbs}} />
-  </p.top>
-  <p.levelLeft>
-    <h1 class="title is-3" data-test-header-title>
-      <Icon @name={{@model.icon}} @size="24" class="has-text-grey-light" />
-      {{@model.id}}
-    </h1>
-  </p.levelLeft>
-</PageHeader>
-
-<div class="tabs-container box is-bottomless is-marginless is-paddingless">
-  <nav class="tabs" aria-label="kubernetes tabs">
-    <ul>
-      <LinkTo @route="overview" data-test-tab="overview">Overview</LinkTo>
-      <LinkTo @route="roles" data-test-tab="roles">Roles</LinkTo>
-      <LinkTo @route="configuration" data-test-tab="config">Configuration</LinkTo>
-    </ul>
-  </nav>
-</div>
-
-<Toolbar>
-  {{#if @filterRoles}}
-    <ToolbarFilters>
-      <NavigateInput
-        @filter={{@rolesFilterValue}}
-        @placeholder="Filter roles"
-        @urls={{hash list="vault.cluster.secrets.backend.kubernetes.roles"}}
-      />
-    </ToolbarFilters>
-  {{/if}}
-  <ToolbarActions>
-    {{yield}}
-  </ToolbarActions>
-</Toolbar>
\ No newline at end of file
diff --git a/ui/lib/kubernetes/addon/controllers/roles/index.js b/ui/lib/kubernetes/addon/controllers/roles/index.js
deleted file mode 100644
index ae59557624c87..0000000000000
--- a/ui/lib/kubernetes/addon/controllers/roles/index.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Controller from '@ember/controller';
-
-export default class KubernetesRolesController extends Controller {
-  queryParams = ['pageFilter'];
-}
diff --git a/ui/lib/kubernetes/addon/decorators/fetch-config.js b/ui/lib/kubernetes/addon/decorators/fetch-config.js
deleted file mode 100644
index a5e8adecfad65..0000000000000
--- a/ui/lib/kubernetes/addon/decorators/fetch-config.js
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Route from '@ember/routing/route';
-
-/**
- * the overview, configure, configuration and roles routes all need to be aware of the config for the engine
- * if the user has not configured they are prompted to do so in each of the routes
- * decorate the necessary routes to perform the check in the beforeModel hook since that may change what is returned for the model
- */
-
-export function withConfig() {
-  return function decorator(SuperClass) {
-    if (!Object.prototype.isPrototypeOf.call(Route, SuperClass)) {
-      // eslint-disable-next-line
-      console.error(
-        'withConfig decorator must be used on an instance of ember Route class. Decorator not applied to returned class'
-      );
-      return SuperClass;
-    }
-    return class FetchConfig extends SuperClass {
-      configModel = null;
-      configError = null;
-      promptConfig = false;
-
-      async beforeModel() {
-        super.beforeModel(...arguments);
-
-        const backend = this.secretMountPath.get();
-        // check the store for record first
-        this.configModel = this.store.peekRecord('kubernetes/config', backend);
-        if (!this.configModel) {
-          return this.store
-            .queryRecord('kubernetes/config', { backend })
-            .then((record) => {
-              this.configModel = record;
-              this.promptConfig = false;
-            })
-            .catch((error) => {
-              // we need to ignore if the user does not have permission or other failures so as to not block the other operations
-              if (error.httpStatus === 404) {
-                this.promptConfig = true;
-              } else {
-                // not considering 404 an error since it triggers the cta
-                // this error is thrown in the configuration route so we can display the error in the view
-                this.configError = error;
-              }
-            });
-        } else {
-          this.promptConfig = false;
-        }
-      }
-    };
-  };
-}
diff --git a/ui/lib/kubernetes/addon/engine.js b/ui/lib/kubernetes/addon/engine.js
deleted file mode 100644
index 5830ad4652832..0000000000000
--- a/ui/lib/kubernetes/addon/engine.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Engine from '@ember/engine';
-
-import loadInitializers from 'ember-load-initializers';
-import Resolver from 'ember-resolver';
-
-import config from './config/environment';
-
-const { modulePrefix } = config;
-
-export default class KubernetesEngine extends Engine {
-  modulePrefix = modulePrefix;
-  Resolver = Resolver;
-  dependencies = {
-    services: ['router', 'store', 'secret-mount-path', 'flash-messages'],
-    externalRoutes: ['secrets'],
-  };
-}
-
-loadInitializers(KubernetesEngine, modulePrefix);
diff --git a/ui/lib/kubernetes/addon/routes.js b/ui/lib/kubernetes/addon/routes.js
deleted file mode 100644
index 36d86c60ccf98..0000000000000
--- a/ui/lib/kubernetes/addon/routes.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import buildRoutes from 'ember-engines/routes';
-
-export default buildRoutes(function () {
-  this.route('overview');
-  this.route('roles', function () {
-    this.route('create');
-    this.route('role', { path: '/:name' }, function () {
-      this.route('details');
-      this.route('edit');
-      this.route('credentials');
-    });
-  });
-  this.route('configure');
-  this.route('configuration');
-});
diff --git a/ui/lib/kubernetes/addon/routes/configuration.js b/ui/lib/kubernetes/addon/routes/configuration.js
deleted file mode 100644
index 2fffbdfee56e6..0000000000000
--- a/ui/lib/kubernetes/addon/routes/configuration.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-import { withConfig } from '../decorators/fetch-config';
-
-@withConfig()
-export default class KubernetesConfigureRoute extends Route {
-  @service store;
-  @service secretMountPath;
-
-  model() {
-    // in case of any error other than 404 we want to display that to the user
-    if (this.configError) {
-      throw this.configError;
-    }
-    return {
-      backend: this.modelFor('application'),
-      config: this.configModel,
-    };
-  }
-
-  setupController(controller, resolvedModel) {
-    super.setupController(controller, resolvedModel);
-
-    controller.breadcrumbs = [
-      { label: 'secrets', route: 'secrets', linkExternal: true },
-      { label: resolvedModel.backend.id },
-    ];
-  }
-}
diff --git a/ui/lib/kubernetes/addon/routes/configure.js b/ui/lib/kubernetes/addon/routes/configure.js
deleted file mode 100644
index ea00f0a7e9067..0000000000000
--- a/ui/lib/kubernetes/addon/routes/configure.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-import { withConfig } from '../decorators/fetch-config';
-
-@withConfig()
-export default class KubernetesConfigureRoute extends Route {
-  @service store;
-  @service secretMountPath;
-
-  async model() {
-    const backend = this.secretMountPath.get();
-    return this.configModel || this.store.createRecord('kubernetes/config', { backend });
-  }
-
-  setupController(controller, resolvedModel) {
-    super.setupController(controller, resolvedModel);
-
-    controller.breadcrumbs = [
-      { label: 'secrets', route: 'secrets', linkExternal: true },
-      { label: resolvedModel.backend, route: 'overview' },
-      { label: 'configure' },
-    ];
-  }
-}
diff --git a/ui/lib/kubernetes/addon/routes/error.js b/ui/lib/kubernetes/addon/routes/error.js
deleted file mode 100644
index 49987ed18d3c7..0000000000000
--- a/ui/lib/kubernetes/addon/routes/error.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-
-export default class KubernetesErrorRoute extends Route {
-  @service secretMountPath;
-
-  setupController(controller) {
-    super.setupController(...arguments);
-    controller.breadcrumbs = [
-      { label: 'secrets', route: 'secrets', linkExternal: true },
-      { label: this.secretMountPath.currentPath, route: 'overview' },
-    ];
-    controller.backend = this.modelFor('application');
-  }
-}
diff --git a/ui/lib/kubernetes/addon/routes/index.js b/ui/lib/kubernetes/addon/routes/index.js
deleted file mode 100644
index f2619548a9af4..0000000000000
--- a/ui/lib/kubernetes/addon/routes/index.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-
-export default class KubernetesRoute extends Route {
-  @service router;
-
-  redirect() {
-    this.router.transitionTo('vault.cluster.secrets.backend.kubernetes.overview');
-  }
-}
diff --git a/ui/lib/kubernetes/addon/routes/overview.js b/ui/lib/kubernetes/addon/routes/overview.js
deleted file mode 100644
index 7a478cd90013e..0000000000000
--- a/ui/lib/kubernetes/addon/routes/overview.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-import { withConfig } from 'kubernetes/decorators/fetch-config';
-import { hash } from 'rsvp';
-
-@withConfig()
-export default class KubernetesOverviewRoute extends Route {
-  @service store;
-  @service secretMountPath;
-
-  async model() {
-    const backend = this.secretMountPath.get();
-    return hash({
-      promptConfig: this.promptConfig,
-      backend: this.modelFor('application'),
-      roles: this.store.query('kubernetes/role', { backend }).catch(() => []),
-    });
-  }
-
-  setupController(controller, resolvedModel) {
-    super.setupController(controller, resolvedModel);
-
-    controller.breadcrumbs = [
-      { label: 'secrets', route: 'secrets', linkExternal: true },
-      { label: resolvedModel.backend.id },
-    ];
-  }
-}
diff --git a/ui/lib/kubernetes/addon/routes/roles/create.js b/ui/lib/kubernetes/addon/routes/roles/create.js
deleted file mode 100644
index 5a434a65448a3..0000000000000
--- a/ui/lib/kubernetes/addon/routes/roles/create.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-
-export default class KubernetesRolesCreateRoute extends Route {
-  @service store;
-  @service secretMountPath;
-
-  model() {
-    const backend = this.secretMountPath.get();
-    return this.store.createRecord('kubernetes/role', { backend });
-  }
-
-  setupController(controller, resolvedModel) {
-    super.setupController(controller, resolvedModel);
-
-    controller.breadcrumbs = [
-      { label: resolvedModel.backend, route: 'overview' },
-      { label: 'roles', route: 'roles' },
-      { label: 'create' },
-    ];
-  }
-}
diff --git a/ui/lib/kubernetes/addon/routes/roles/index.js b/ui/lib/kubernetes/addon/routes/roles/index.js
deleted file mode 100644
index 7023ad36bf318..0000000000000
--- a/ui/lib/kubernetes/addon/routes/roles/index.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-import { withConfig } from 'kubernetes/decorators/fetch-config';
-import { hash } from 'rsvp';
-
-@withConfig()
-export default class KubernetesRolesRoute extends Route {
-  @service store;
-  @service secretMountPath;
-
-  model(params, transition) {
-    // filter roles based on pageFilter value
-    const { pageFilter } = transition.to.queryParams;
-    const roles = this.store
-      .query('kubernetes/role', { backend: this.secretMountPath.get() })
-      .then((models) =>
-        pageFilter
-          ? models.filter((model) => model.name.toLowerCase().includes(pageFilter.toLowerCase()))
-          : models
-      )
-      .catch((error) => {
-        if (error.httpStatus === 404) {
-          return [];
-        }
-        throw error;
-      });
-    return hash({
-      backend: this.modelFor('application'),
-      promptConfig: this.promptConfig,
-      roles,
-    });
-  }
-
-  setupController(controller, resolvedModel) {
-    super.setupController(controller, resolvedModel);
-
-    controller.breadcrumbs = [
-      { label: 'secrets', route: 'secrets', linkExternal: true },
-      { label: resolvedModel.backend.id },
-    ];
-  }
-}
diff --git a/ui/lib/kubernetes/addon/routes/roles/role/credentials.js b/ui/lib/kubernetes/addon/routes/roles/role/credentials.js
deleted file mode 100644
index 910ab51d18254..0000000000000
--- a/ui/lib/kubernetes/addon/routes/roles/role/credentials.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-export default class KubernetesRoleCredentialsRoute extends Route {
-  @service secretMountPath;
-
-  model() {
-    return {
-      roleName: this.paramsFor('roles.role').name,
-      backend: this.secretMountPath.get(),
-    };
-  }
-
-  setupController(controller, resolvedModel) {
-    super.setupController(controller, resolvedModel);
-
-    controller.breadcrumbs = [
-      { label: resolvedModel.backend, route: 'overview' },
-      { label: 'roles', route: 'roles' },
-      { label: resolvedModel.roleName, route: 'roles.role.details' },
-      { label: 'credentials' },
-    ];
-  }
-}
diff --git a/ui/lib/kubernetes/addon/routes/roles/role/details.js b/ui/lib/kubernetes/addon/routes/roles/role/details.js
deleted file mode 100644
index bc33352931b45..0000000000000
--- a/ui/lib/kubernetes/addon/routes/roles/role/details.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-
-export default class KubernetesRoleDetailsRoute extends Route {
-  @service store;
-  @service secretMountPath;
-
-  model() {
-    const backend = this.secretMountPath.get();
-    const { name } = this.paramsFor('roles.role');
-    return this.store.queryRecord('kubernetes/role', { backend, name });
-  }
-
-  setupController(controller, resolvedModel) {
-    super.setupController(controller, resolvedModel);
-
-    controller.breadcrumbs = [
-      { label: resolvedModel.backend, route: 'overview' },
-      { label: 'roles', route: 'roles' },
-      { label: resolvedModel.name },
-    ];
-  }
-}
diff --git a/ui/lib/kubernetes/addon/routes/roles/role/edit.js b/ui/lib/kubernetes/addon/routes/roles/role/edit.js
deleted file mode 100644
index fa6acdb0c8ffe..0000000000000
--- a/ui/lib/kubernetes/addon/routes/roles/role/edit.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-
-export default class KubernetesRoleEditRoute extends Route {
-  @service store;
-  @service secretMountPath;
-
-  model() {
-    const backend = this.secretMountPath.get();
-    const { name } = this.paramsFor('roles.role');
-    return this.store.queryRecord('kubernetes/role', { backend, name });
-  }
-
-  setupController(controller, resolvedModel) {
-    super.setupController(controller, resolvedModel);
-
-    controller.breadcrumbs = [
-      { label: resolvedModel.backend, route: 'overview' },
-      { label: 'roles', route: 'roles' },
-      { label: resolvedModel.name, route: 'roles.role' },
-      { label: 'edit' },
-    ];
-  }
-}
diff --git a/ui/lib/kubernetes/addon/routes/roles/role/index.js b/ui/lib/kubernetes/addon/routes/roles/role/index.js
deleted file mode 100644
index 48b484f1faf72..0000000000000
--- a/ui/lib/kubernetes/addon/routes/roles/role/index.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-
-export default class KubernetesRoleRoute extends Route {
-  @service router;
-
-  redirect() {
-    this.router.transitionTo('vault.cluster.secrets.backend.kubernetes.roles.role.details');
-  }
-}
diff --git a/ui/lib/kubernetes/addon/templates/configuration.hbs b/ui/lib/kubernetes/addon/templates/configuration.hbs
deleted file mode 100644
index 5b84c30104ced..0000000000000
--- a/ui/lib/kubernetes/addon/templates/configuration.hbs
+++ /dev/null
@@ -1 +0,0 @@
-<Page::Configuration @config={{this.model.config}} @backend={{this.model.backend}} @breadcrumbs={{this.breadcrumbs}} />
\ No newline at end of file
diff --git a/ui/lib/kubernetes/addon/templates/configure.hbs b/ui/lib/kubernetes/addon/templates/configure.hbs
deleted file mode 100644
index ade9f95d59add..0000000000000
--- a/ui/lib/kubernetes/addon/templates/configure.hbs
+++ /dev/null
@@ -1 +0,0 @@
-<Page::Configure @model={{this.model}} @breadcrumbs={{this.breadcrumbs}} />
\ No newline at end of file
diff --git a/ui/lib/kubernetes/addon/templates/error.hbs b/ui/lib/kubernetes/addon/templates/error.hbs
deleted file mode 100644
index ec31dbdc45a4f..0000000000000
--- a/ui/lib/kubernetes/addon/templates/error.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-<TabPageHeader @model={{this.backend}} @breadcrumbs={{this.breadcrumbs}} />
-
-<Page::Error @error={{this.model}} />
\ No newline at end of file
diff --git a/ui/lib/kubernetes/addon/templates/overview.hbs b/ui/lib/kubernetes/addon/templates/overview.hbs
deleted file mode 100644
index 477d635b718e2..0000000000000
--- a/ui/lib/kubernetes/addon/templates/overview.hbs
+++ /dev/null
@@ -1,6 +0,0 @@
-<Page::Overview
-  @promptConfig={{this.model.promptConfig}}
-  @backend={{this.model.backend}}
-  @roles={{this.model.roles}}
-  @breadcrumbs={{this.breadcrumbs}}
-/>
\ No newline at end of file
diff --git a/ui/lib/kubernetes/addon/templates/roles/create.hbs b/ui/lib/kubernetes/addon/templates/roles/create.hbs
deleted file mode 100644
index a5770ab85a58a..0000000000000
--- a/ui/lib/kubernetes/addon/templates/roles/create.hbs
+++ /dev/null
@@ -1 +0,0 @@
-<Page::Role::CreateAndEdit @model={{this.model}} @breadcrumbs={{this.breadcrumbs}} />
\ No newline at end of file
diff --git a/ui/lib/kubernetes/addon/templates/roles/index.hbs b/ui/lib/kubernetes/addon/templates/roles/index.hbs
deleted file mode 100644
index 5376c6c21140c..0000000000000
--- a/ui/lib/kubernetes/addon/templates/roles/index.hbs
+++ /dev/null
@@ -1,7 +0,0 @@
-<Page::Roles
-  @roles={{this.model.roles}}
-  @promptConfig={{this.model.promptConfig}}
-  @backend={{this.model.backend}}
-  @filterValue={{this.pageFilter}}
-  @breadcrumbs={{this.breadcrumbs}}
-/>
\ No newline at end of file
diff --git a/ui/lib/kubernetes/addon/templates/roles/role/credentials.hbs b/ui/lib/kubernetes/addon/templates/roles/role/credentials.hbs
deleted file mode 100644
index 3562e18edb5cc..0000000000000
--- a/ui/lib/kubernetes/addon/templates/roles/role/credentials.hbs
+++ /dev/null
@@ -1 +0,0 @@
-<Page::Credentials @roleName={{this.model.roleName}} @backend={{this.model.backend}} @breadcrumbs={{this.breadcrumbs}} />
\ No newline at end of file
diff --git a/ui/lib/kubernetes/addon/templates/roles/role/details.hbs b/ui/lib/kubernetes/addon/templates/roles/role/details.hbs
deleted file mode 100644
index e7ad643c75080..0000000000000
--- a/ui/lib/kubernetes/addon/templates/roles/role/details.hbs
+++ /dev/null
@@ -1 +0,0 @@
-<Page::Role::Details @model={{@model}} @breadcrumbs={{this.breadcrumbs}} />
\ No newline at end of file
diff --git a/ui/lib/kubernetes/addon/templates/roles/role/edit.hbs b/ui/lib/kubernetes/addon/templates/roles/role/edit.hbs
deleted file mode 100644
index a5770ab85a58a..0000000000000
--- a/ui/lib/kubernetes/addon/templates/roles/role/edit.hbs
+++ /dev/null
@@ -1 +0,0 @@
-<Page::Role::CreateAndEdit @model={{this.model}} @breadcrumbs={{this.breadcrumbs}} />
\ No newline at end of file
diff --git a/ui/lib/kubernetes/addon/utils/generated-role-rules.js b/ui/lib/kubernetes/addon/utils/generated-role-rules.js
deleted file mode 100644
index b6383859d4fb8..0000000000000
--- a/ui/lib/kubernetes/addon/utils/generated-role-rules.js
+++ /dev/null
@@ -1,155 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-const example = `# The below is an example that you can use as a starting point.
-# 
-# rules:
-#   - apiGroups: [""]
-#     resources: ["serviceaccounts", "serviceaccounts/token"]
-#     verbs: ["create", "update", "delete"]
-#   - apiGroups: ["rbac.authorization.k8s.io"]
-#     resources: ["rolebindings", "clusterrolebindings"]
-#     verbs: ["create", "update", "delete"]
-#   - apiGroups: ["rbac.authorization.k8s.io"]
-#     resources: ["roles", "clusterroles"]
-#     verbs: ["bind", "escalate", "create", "update", "delete"]
-`;
-
-const readResources = `rules:
-- apiGroups: [""]
-  resources: ["*"]
-  verbs: ["get", "watch", "list"]
-- apiGroups: ["extensions"]
-  resources: ["*"]
-  verbs: ["get", "watch", "list"]
-- apiGroups: ["apps"]
-  resources: ["*"]
-  verbs: ["get", "watch", "list"]
-- apiGroups: ["batch"]
-  resources: ["*"]
-  verbs: ["get", "watch", "list"]
-- apiGroups: ["policy"]
-  resources: ["*"]
-  verbs: ["get", "watch", "list"]
-- apiGroups: ["networking.k8s.io"]
-  resources: ["*"]
-  verbs: ["get", "watch", "list"]
-- apiGroups: ["autoscaling"]
-  resources: ["*"]
-  verbs: ["get", "watch", "list"]
-`;
-
-const editResources = `rules:
-- apiGroups: [""]
-  resources: ["*"]
-  verbs: ["get", "watch", "list"]
-- apiGroups: [""]
-  resources:
-    ["pods", "pods/attach", "pods/exec", "pods/portforward", "pods/proxy"]
-  verbs: ["create", "delete", "deletecollection", "patch", "update"]
-- apiGroups: [""]
-  resources:
-    [
-      "configmaps",
-      "events",
-      "persistentvolumeclaims",
-      "replicationcontrollers",
-      "replicationcontrollers/scale",
-      "secrets",
-      "serviceaccounts",
-      "services",
-      "services/proxy",
-    ]
-  verbs: ["create", "delete", "deletecollection", "patch", "update"]
-- apiGroups: [""]
-  resources: ["serviceaccounts/token"]
-  verbs: ["create"]
-- apiGroups: ["extensions"]
-  resources: ["*"]
-  verbs: ["get", "watch", "list"]
-- apiGroups: ["extensions"]
-  resources:
-    [
-      "daemonsets",
-      "deployments",
-      "deployments/rollback",
-      "deployments/scale",
-      "ingresses",
-      "networkpolicies",
-      "replicasets",
-      "replicasets/scale",
-      "replicationcontrollers/scale",
-    ]
-  verbs: ["create", "delete", "deletecollection", "patch", "update"]
-- apiGroups: ["apps"]
-  resources: ["*"]
-  verbs: ["get", "watch", "list"]
-- apiGroups: ["apps"]
-  resources:
-    [
-      "daemonsets",
-      "deployments",
-      "deployments/rollback",
-      "deployments/scale",
-      "replicasets",
-      "replicasets/scale",
-      "statefulsets",
-      "statefulsets/scale",
-    ]
-  verbs: ["create", "delete", "deletecollection", "patch", "update"]
-- apiGroups: ["batch"]
-  resources: ["*"]
-  verbs: ["get", "watch", "list"]
-- apiGroups: ["batch"]
-  resources: ["cronjobs", "jobs"]
-  verbs: ["create", "delete", "deletecollection", "patch", "update"]
-- apiGroups: ["policy"]
-  resources: ["*"]
-  verbs: ["get", "watch", "list"]
-- apiGroups: ["policy"]
-  resources: ["poddisruptionbudgets"]
-  verbs: ["create", "delete", "deletecollection", "patch", "update"]
-- apiGroups: ["networking.k8s.io"]
-  resources: ["*"]
-  verbs: ["get", "watch", "list"]
-- apiGroups: ["networking.k8s.io"]
-  resources: ["ingresses", "networkpolicies"]
-  verbs: ["create", "delete", "deletecollection", "patch", "update"]
-- apiGroups: ["autoscaling"]
-  resources: ["*"]
-  verbs: ["get", "watch", "list"]
-- apiGroups: ["autoscaling"]
-  resources: ["horizontalpodautoscalers"]
-  verbs: ["create", "delete", "deletecollection", "patch", "update"]
-`;
-
-const updatePods = `rules:
-- apiGroups: [""]
-  resources: ["secrets", "configmaps", "pods", "endpoints"]
-  verbs: ["get", "watch", "list", "create", "delete", "deletecollection", "patch", "update"]
-`;
-
-const updateServices = `rules:
-- apiGroups: [""]
-  resources: ["secrets", "services"]
-  verbs: ["get", "watch", "list", "create", "delete", "deletecollection", "patch", "update"]
-`;
-
-const usePolicies = `rules:
-- apiGroups: ['policy']
-  resources: ['podsecuritypolicies']
-  verbs:     ['use']
-  resourceNames:
-  - <list of policies to authorize>
-`;
-
-export const getRules = () => [
-  { id: '1', label: 'No template', rules: example },
-  { id: '2', label: 'Read resources in a namespace', rules: readResources },
-  { id: '3', label: 'Edit resources in a namespace', rules: editResources },
-  { id: '4', label: 'Update pods, secrets, configmaps, and endpoints', rules: updatePods },
-  { id: '5', label: 'Update services and secrets', rules: updateServices },
-  { id: '6', label: 'Use pod security policies', rules: usePolicies },
-];
diff --git a/ui/lib/kubernetes/config/environment.js b/ui/lib/kubernetes/config/environment.js
deleted file mode 100644
index 8c5c7a7ebd8f9..0000000000000
--- a/ui/lib/kubernetes/config/environment.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-/* eslint-env node */
-'use strict';
-
-module.exports = function (environment) {
-  const ENV = {
-    modulePrefix: 'kubernetes',
-    environment,
-  };
-
-  return ENV;
-};
diff --git a/ui/lib/kubernetes/index.js b/ui/lib/kubernetes/index.js
deleted file mode 100644
index 660b12f279fe6..0000000000000
--- a/ui/lib/kubernetes/index.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-/* eslint-env node */
-/* eslint-disable node/no-extraneous-require */
-'use strict';
-
-const { buildEngine } = require('ember-engines/lib/engine-addon');
-
-module.exports = buildEngine({
-  name: 'kubernetes',
-  lazyLoading: {
-    enabled: false,
-  },
-  isDevelopingAddon() {
-    return true;
-  },
-});
diff --git a/ui/lib/kubernetes/package.json b/ui/lib/kubernetes/package.json
deleted file mode 100644
index 068934f6f16bb..0000000000000
--- a/ui/lib/kubernetes/package.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "name": "kubernetes",
-  "keywords": [
-    "ember-addon",
-    "ember-engine"
-  ],
-  "dependencies": {
-    "ember-cli-htmlbars": "*",
-    "ember-cli-babel": "*",
-    "ember-concurrency": "*",
-    "@ember/test-waiters": "*",
-    "ember-inflector": "*"
-  },
-  "ember-addon": {
-    "paths": [
-      "../core"
-    ]
-  }
-}
diff --git a/ui/lib/open-api-explorer/addon/components/swagger-ui.js b/ui/lib/open-api-explorer/addon/components/swagger-ui.js
index 9ecc938cc80f3..1c3b63c1d36cc 100644
--- a/ui/lib/open-api-explorer/addon/components/swagger-ui.js
+++ b/ui/lib/open-api-explorer/addon/components/swagger-ui.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@ember/component';
 import { inject as service } from '@ember/service';
 import parseURL from 'core/utils/parse-url';
@@ -18,7 +13,7 @@ const SearchFilterPlugin = () => {
         return (
           taggedOps
             .map((tagObj) => {
-              const operations = tagObj.get('operations').filter((operationObj) => {
+              let operations = tagObj.get('operations').filter((operationObj) => {
                 return operationObj.get('path').includes(phrase);
               });
               return tagObj.set('operations', operations);
@@ -52,7 +47,7 @@ const CONFIG = (SwaggerUIBundle, componentInstance, initialFilter) => {
       // and namepace headers for things to work properly
       req.headers['X-Vault-Token'] = componentInstance.auth.currentToken;
 
-      const namespace = componentInstance.namespaceService.path;
+      let namespace = componentInstance.namespaceService.path;
       if (namespace && !APP.NAMESPACE_ROOT_URLS.some((str) => req.url.includes(str))) {
         req.headers['X-Vault-Namespace'] = namespace;
       }
@@ -83,7 +78,7 @@ export default Component.extend({
     const { default: SwaggerUIBundle } = await import('swagger-ui-dist/swagger-ui-bundle.js');
     this._super(...arguments);
     // trim any initial slashes
-    const initialFilter = this.initialFilter.replace(/^(\/)+/, '');
+    let initialFilter = this.initialFilter.replace(/^(\/)+/, '');
     SwaggerUIBundle(CONFIG(SwaggerUIBundle, this, initialFilter));
   },
 
@@ -93,14 +88,14 @@ export default Component.extend({
       this.onFilterChange(e.target.value || '');
     },
     proxyEvent(e) {
-      const swaggerInput = this.element.querySelector('.operation-filter-input');
+      let swaggerInput = this.element.querySelector('.operation-filter-input');
       // if this breaks because of a react upgrade,
       // change this to
       //let originalSetter = Object.getOwnPropertyDescriptor(window.HTMLInputElement.prototype, 'value').set;
       //originalSetter.call(swaggerInput, e.target.value);
       // see post on triggering react events externally for an explanation of
       // why this works: https://stackoverflow.com/a/46012210
-      const evt = new Event('input', { bubbles: true });
+      let evt = new Event('input', { bubbles: true });
       evt.simulated = true;
       swaggerInput.value = e.target.value.replace(/^(\/)+/, '');
       swaggerInput.dispatchEvent(evt);
diff --git a/ui/lib/open-api-explorer/addon/controllers/index.js b/ui/lib/open-api-explorer/addon/controllers/index.js
index 413c837f761d7..704157fa82e8e 100644
--- a/ui/lib/open-api-explorer/addon/controllers/index.js
+++ b/ui/lib/open-api-explorer/addon/controllers/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Controller from '@ember/controller';
 
 export default Controller.extend({
diff --git a/ui/lib/open-api-explorer/addon/engine.js b/ui/lib/open-api-explorer/addon/engine.js
index 4cd7c42dfcb17..9555408ea4595 100644
--- a/ui/lib/open-api-explorer/addon/engine.js
+++ b/ui/lib/open-api-explorer/addon/engine.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Engine from 'ember-engines/engine';
 import loadInitializers from 'ember-load-initializers';
 import Resolver from './resolver';
diff --git a/ui/lib/open-api-explorer/addon/resolver.js b/ui/lib/open-api-explorer/addon/resolver.js
index 9a3b4b378edb5..2fb563d6c0488 100644
--- a/ui/lib/open-api-explorer/addon/resolver.js
+++ b/ui/lib/open-api-explorer/addon/resolver.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Resolver from 'ember-resolver';
 
 export default Resolver;
diff --git a/ui/lib/open-api-explorer/addon/routes.js b/ui/lib/open-api-explorer/addon/routes.js
index e626a00b4c598..98597f491e234 100644
--- a/ui/lib/open-api-explorer/addon/routes.js
+++ b/ui/lib/open-api-explorer/addon/routes.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import buildRoutes from 'ember-engines/routes';
 
 export default buildRoutes(function () {
diff --git a/ui/lib/open-api-explorer/addon/routes/index.js b/ui/lib/open-api-explorer/addon/routes/index.js
index 9b8ec81e61247..fef65b0eaeffa 100644
--- a/ui/lib/open-api-explorer/addon/routes/index.js
+++ b/ui/lib/open-api-explorer/addon/routes/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 
@@ -12,7 +7,7 @@ export default Route.extend({
   // query params, so here we're no-op'ing the model hook
   model() {},
   afterModel() {
-    const warning = `The "Try it out" functionality in this API explorer will make requests to this Vault server on your behalf.
+    let warning = `The "Try it out" functionality in this API explorer will make requests to this Vault server on your behalf.
 
 IF YOUR TOKEN HAS THE PROPER CAPABILITIES, THIS WILL CREATE AND DELETE ITEMS ON THE VAULT SERVER.
 
diff --git a/ui/lib/open-api-explorer/addon/styles/addon.css b/ui/lib/open-api-explorer/addon/styles/addon.css
index 1dfe7180904cf..25d1d86898287 100644
--- a/ui/lib/open-api-explorer/addon/styles/addon.css
+++ b/ui/lib/open-api-explorer/addon/styles/addon.css
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 .swagger-ember .swagger-ui .wrapper {
   padding: 0;
 }
diff --git a/ui/lib/open-api-explorer/addon/templates/components/swagger-ui.hbs b/ui/lib/open-api-explorer/addon/templates/components/swagger-ui.hbs
index 2219b94605931..18ee47292fa1f 100644
--- a/ui/lib/open-api-explorer/addon/templates/components/swagger-ui.hbs
+++ b/ui/lib/open-api-explorer/addon/templates/components/swagger-ui.hbs
@@ -10,11 +10,8 @@
   <ToolbarFilters>
     <div class="field is-marginless">
       <p class="control has-icons-left">
-        <label for="swagger-result-filter" class="sr-only">Filter operations by path</label>
         <input
-          id="swagger-result-filter"
-          {{on "input" (action "proxyEvent")}}
-          {{on "change" (action "updateFilter")}}
+          oninput={{queue (action "updateFilter") (action "proxyEvent")}}
           value={{@initialFilter}}
           disabled={{this.swaggerLoading}}
           class="filter input"
@@ -34,7 +31,7 @@
     <code>X-Vault-Namespace: {{R.namespace.path}}</code>. You can also use
     <code>{{R.namespace.path}}</code>
     as an API prefix. See
-    <DocLink @path="/vault/api-docs#namespaces">docs</DocLink>
+    <DocLink @path="/api-docs#namespaces">docs</DocLink>
     for examples.
   </NamespaceReminder>
   <div id="{{this.elementId}}-swagger" class="swagger-ember"></div>
diff --git a/ui/lib/open-api-explorer/config/environment.js b/ui/lib/open-api-explorer/config/environment.js
index 5b109d068fd8d..4a78890a89dd3 100644
--- a/ui/lib/open-api-explorer/config/environment.js
+++ b/ui/lib/open-api-explorer/config/environment.js
@@ -1,13 +1,8 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /* eslint-env node */
 'use strict';
 
 module.exports = function (environment) {
-  const ENV = {
+  let ENV = {
     modulePrefix: 'open-api-explorer',
     environment,
     APP: {
diff --git a/ui/lib/open-api-explorer/index.js b/ui/lib/open-api-explorer/index.js
index 1d3bcd42eeb5f..cc218a605b257 100644
--- a/ui/lib/open-api-explorer/index.js
+++ b/ui/lib/open-api-explorer/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /* eslint-env node */
 /* eslint-disable ember/avoid-leaking-state-in-ember-objects */
 /* eslint-disable node/no-extraneous-require */
diff --git a/ui/lib/pki/README.md b/ui/lib/pki/README.md
deleted file mode 100644
index 0f1895cbdd76b..0000000000000
--- a/ui/lib/pki/README.md
+++ /dev/null
@@ -1,69 +0,0 @@
-# Vault PKI
-
-Welcome to the Vault PKI (Ember) Engine! Below is an overview of PKI and resources for how to get started working within this engine.
-
-## About PKI
-
-> Public Key Infrastructure (PKI) is a system of processes, technologies, and policies that allows you to encrypt and sign data. (source: [digicert.com](https://www.digicert.com/what-is-pki))
-
-The [Vault PKI Secrets Engine](https://developer.hashicorp.com/vault/api-docs/secret/pki) allows security engineers to [create a chain of PKI certificates](https://developer.hashicorp.com/vault/tutorials/secrets-management/pki-engine) much easier than they would with traditional workflows.
-
-## About the UI engine
-
-If you couldn't tell from the documentation above, PKI is _complex_. As such, the data doesn't map cleanly to a CRUD model and so the first thing you might notice is that the models and adapters for PKI (which [live in the main app](https://ember-engines.com/docs/addons#using-ember-data), not the engine) have some custom logic that differentiate it from most other secret engines. Below are the models used throughout PKI and how they are used to interact with the mount. Aside from `pki/action`, each model has a corresponding tab in the UI that takes you to its `LIST` view.
-
-- ### [pki/action](../../app/models/pki/action.js)
-
-  This model is used to perform different `POST` requests that receive similar parameters but don't create a single item (which would be a record in Ember data). These various actions may create multiple items that contain different attributes than those submitted in the `POST` request. For example:
-
-  > - `POST pki/generate/root/:type` creates a new self-signed CA certificate (an issuer) and private key, which is only returned if `type = exported`
-  > - `POST pki/issuer/:issuer_ref/sign-intermediate` creates a certificate, and returns issuing CA and CA chain data that is only available once
-
-  The `pki/action`[adapter](../../app/adapters/pki/action.js) is used to map the desired action to the corresponding endpoint, and the `pki/action` [serializer](../../app/serializers/pki/action.js) includes logic to send the relevant attributes. The following PKI workflows use this model:
-
-  - [Root generation and rotation](https://developer.hashicorp.com/vault/api-docs/secret/pki#generate-root)
-  - [Import CA cert and keys](https://developer.hashicorp.com/vault/api-docs/secret/pki#import-ca-certificates-and-keys)
-  - [Generate intermediate CSR](https://developer.hashicorp.com/vault/api-docs/secret/pki#generate-intermediate-csr)
-  - [Sign intermediate](https://developer.hashicorp.com/vault/api-docs/secret/pki#sign-intermediate)
-
-- ### [pki/certificate/base](../../app/models/pki/certificate/base.js)
-
-  This model is for specific interactions with certificate data. The base model contains attributes that make up a certificate's content. The other models that extend this model [certificate/generate](../../app/models/pki/certificate/generate.js) and [certificate/sign](../../app/models/pki/certificate/sign.js) include additional attributes to perform their relevant requests.
-
-  The `parsedCertificate` attribute is an object that houses all of the parsed certificate data returned by the [parse-pki-cert.js](../../app/utils/parse-pki-cert.js) util.
-
-- ### [pki/tidy](../../app/models/pki/tidy.js)
-
-  This model is used to manage [tidy](https://developer.hashicorp.com/vault/api-docs/secret/pki#tidy) operations in a few different contexts. All of the following endpoints share the same parameters _except_ `enabled` and `interval_duration` which are reserved for auto-tidy operations only.
-
-  > _`pki/tidy-status` does not use an Ember data model because it is read-only_
-
-  - `POST pki/tidy` - perform a single, manual tidy operation
-  - `POST pki/config/auto-tidy` - set configuration for automating the tidy process
-  - `GET pki/config/auto-tidy` - read auto-tidy configuration settings
-
-  The auto-tidy config is the only data that persists so `findRecord` and `updateRecord` in the `pki/tidy.js` [adapter](../../app/adapters/pki/tidy.js) only interact with the `/config/auto-tidy` endpoint. For each manual tidy operation, a new record is created so on `save()` the model uses the `createRecord` method which only ever uses the `/tidy` endpoint.
-
-> _The following models more closely follow a CRUD pattern:_
-
-- ### [pki/issuer](../../app/models/pki/issuer.js)
-
-  > _Issuers are created by the `pki/action` model by either [importing a CA](https://developer.hashicorp.com/vault/api-docs/secret/pki#import-ca-certificates-and-keys) or [generating a root](https://developer.hashicorp.com/vault/api-docs/secret/pki#generate-root)_
-
-  - [update](https://developer.hashicorp.com/vault/api-docs/secret/pki#read-issuer-certificate)
-  - [read](https://developer.hashicorp.com/vault/api-docs/secret/pki#read-issuer-certificate)
-  - [list](https://developer.hashicorp.com/vault/api-docs/secret/pki#list-issuers)
-
-- ### [pki/role](../../app/models/pki/role.js)
-
-  - [create/update](https://developer.hashicorp.com/vault/api-docs/secret/pki#create-update-role)
-  - [read](https://developer.hashicorp.com/vault/api-docs/secret/pki#read-role)
-  - [list](https://developer.hashicorp.com/vault/api-docs/secret/pki#list-roles)
-
-- ### [pki/key](../../app/models/pki/key.js)
-
-  - `CREATE` has two options:
-    - [generate](https://developer.hashicorp.com/vault/api-docs/secret/pki#import-ca-certificates-and-keys)
-    - [import](https://developer.hashicorp.com/vault/api-docs/secret/pki#import-key)
-  - [read](https://developer.hashicorp.com/vault/api-docs/secret/pki#read-key)
-  - [list](https://developer.hashicorp.com/vault/api-docs/secret/pki#list-keys)
diff --git a/ui/lib/pki/addon/components/page/pki-certificate-details.hbs b/ui/lib/pki/addon/components/page/pki-certificate-details.hbs
deleted file mode 100644
index ba79e7ad610ea..0000000000000
--- a/ui/lib/pki/addon/components/page/pki-certificate-details.hbs
+++ /dev/null
@@ -1,57 +0,0 @@
-<Toolbar>
-  <ToolbarActions>
-    <button type="button" class="toolbar-link" {{on "click" this.downloadCert}} data-test-pki-cert-download-button>
-      Download
-      <Chevron @direction="down" @isButton={{true}} />
-    </button>
-    {{#if @model.canRevoke}}
-      <ConfirmAction
-        @buttonClasses="toolbar-link"
-        @onConfirmAction={{fn (perform this.revoke)}}
-        @confirmTitle="Revoke certificate?"
-        @confirmButtonText="Revoke"
-        data-test-pki-cert-revoke-button
-      >
-        Revoke certificate
-      </ConfirmAction>
-    {{/if}}
-  </ToolbarActions>
-</Toolbar>
-
-{{#each @model.formFields as |field|}}
-  {{#if (eq field.name "certificate")}}
-    <InfoTableRow @label="Certificate">
-      <MaskedInput @value={{@model.certificate}} @displayOnly={{true}} @allowCopy={{true}} />
-    </InfoTableRow>
-  {{else if (eq field.name "serialNumber")}}
-    <InfoTableRow @label="Serial number">
-      <code class="has-text-black">{{@model.serialNumber}}</code>
-    </InfoTableRow>
-  {{else}}
-    <InfoTableRow
-      @label={{capitalize (humanize (dasherize field.name))}}
-      {{! formatDate fields can be 0 which will cause them to always render -- pass null instead }}
-      @value={{or (get @model field.name) null}}
-      @formatDate={{if field.options.formatDate "MMM dd yyyy hh:mm:ss a"}}
-      @alwaysRender={{false}}
-    />
-  {{/if}}
-{{/each}}
-
-<ParsedCertificateInfoRows @model={{@model.parsedCertificate}} />
-
-{{#if @onBack}}
-  <div class="field is-grouped box is-fullwidth is-bottomless">
-    <div class="control">
-      <button
-        type="button"
-        class="button"
-        disabled={{this.revoke.isRunning}}
-        {{on "click" @onBack}}
-        data-test-pki-cert-details-back
-      >
-        Back
-      </button>
-    </div>
-  </div>
-{{/if}}
\ No newline at end of file
diff --git a/ui/lib/pki/addon/components/page/pki-certificate-details.ts b/ui/lib/pki/addon/components/page/pki-certificate-details.ts
deleted file mode 100644
index e9f1f36598a2b..0000000000000
--- a/ui/lib/pki/addon/components/page/pki-certificate-details.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
-import { service } from '@ember/service';
-import { action } from '@ember/object';
-import { task } from 'ember-concurrency';
-import { waitFor } from '@ember/test-waiters';
-import errorMessage from 'vault/utils/error-message';
-import type FlashMessageService from 'vault/services/flash-messages';
-import type DownloadService from 'vault/services/download';
-import type PkiCertificateBaseModel from 'vault/models/pki/certificate/base';
-
-interface Args {
-  model: PkiCertificateBaseModel;
-  onRevoke?: CallableFunction;
-  onBack?: CallableFunction;
-}
-
-export default class PkiCertificateDetailsComponent extends Component<Args> {
-  @service declare readonly flashMessages: FlashMessageService;
-  @service declare readonly download: DownloadService;
-
-  @action
-  downloadCert() {
-    try {
-      const formattedSerial = this.args.model.serialNumber?.replace(/(\s|:)+/g, '-');
-      this.download.pem(formattedSerial, this.args.model.certificate);
-      this.flashMessages.info('Your download has started.');
-    } catch (err) {
-      this.flashMessages.danger(errorMessage(err, 'Unable to prepare certificate for download.'));
-    }
-  }
-
-  @task
-  @waitFor
-  *revoke() {
-    try {
-      // the adapter updateRecord method calls the revoke endpoint since it is the only way to update a cert
-      yield this.args.model.save();
-      this.flashMessages.success('The certificate has been revoked.');
-      if (this.args.onRevoke) {
-        this.args.onRevoke();
-      }
-    } catch (error) {
-      this.flashMessages.danger(
-        errorMessage(error, 'Could not revoke certificate. See Vault logs for details.')
-      );
-    }
-  }
-}
diff --git a/ui/lib/pki/addon/components/page/pki-configuration-details.hbs b/ui/lib/pki/addon/components/page/pki-configuration-details.hbs
deleted file mode 100644
index 4f0e04c0f31cc..0000000000000
--- a/ui/lib/pki/addon/components/page/pki-configuration-details.hbs
+++ /dev/null
@@ -1,146 +0,0 @@
-{{#if @hasConfig}}
-  <Toolbar>
-    <ToolbarActions>
-      {{#if @canDeleteAllIssuers}}
-        <button
-          type="button"
-          class="toolbar-link"
-          {{on "click" (fn (mut this.showDeleteAllIssuers) true)}}
-          data-test-delete-all-issuers-link
-        >
-          Delete all issuers
-          <Icon @name="chevron-right" />
-
-        </button>
-        <div class="toolbar-separator"></div>
-      {{/if}}
-      <ToolbarLink @route="configuration.edit">
-        Edit configuration
-      </ToolbarLink>
-    </ToolbarActions>
-  </Toolbar>
-
-  {{#if (not (eq @cluster 403))}}
-    <h2 class="title is-4 has-bottom-margin-xs has-top-margin-xl has-border-bottom-light has-bottom-padding-s">
-      Cluster Config
-    </h2>
-    {{#each @cluster.allFields as |attr|}}
-      <InfoTableRow
-        @label={{or attr.options.label (humanize (dasherize attr.name))}}
-        @value={{or (get @cluster attr.name) "None"}}
-      />
-    {{/each}}
-  {{/if}}
-
-  {{#if (not (eq @acme 403))}}
-    <h2 class="title is-4 has-bottom-margin-xs has-top-margin-xl has-border-bottom-light has-bottom-padding-s">
-      ACME Config
-    </h2>
-    {{#each @acme.allFields as |attr|}}
-      <InfoTableRow
-        @label={{or attr.options.label (humanize (dasherize attr.name))}}
-        @value={{or (get @acme attr.name) "None"}}
-      />
-    {{/each}}
-  {{/if}}
-
-  {{#if (not (eq @urls 403))}}
-    <h2 class="title is-4 has-bottom-margin-xs has-top-margin-xl has-border-bottom-light has-bottom-padding-s">
-      Global URLs
-    </h2>
-    <InfoTableRow @label="Issuing certificates" @value={{or @urls.issuingCertificates "None"}} />
-    <InfoTableRow
-      @label="CRL distribution points"
-      @value={{if @urls.crlDistributionPoints @urls.crlDistributionPoints "None"}}
-    />
-  {{/if}}
-
-  {{#if (not (eq @crl 403))}}
-    <h2 class="title is-4 has-bottom-margin-xs has-top-margin-xl has-border-bottom-light has-bottom-padding-s">
-      Certificate Revocation List (CRL)
-    </h2>
-    <InfoTableRow @label="CRL building" @value={{if @crl.disable "Disabled" "Enabled"}} />
-    {{#unless @crl.disable}}
-      <InfoTableRow @label="Expiry" @value={{@crl.expiry}} />
-      <InfoTableRow @label="Auto-rebuild">
-        <Icon
-          class={{if @crl.autoRebuild "icon-true" "icon-false"}}
-          @name={{if @crl.autoRebuild "check-circle" "x-square"}}
-        />
-        {{if @crl.autoRebuild "On" "Off"}}
-      </InfoTableRow>
-      {{#if @crl.autoRebuild}}
-        <InfoTableRow @label="Auto-rebuild grace period" @value={{@crl.autoRebuildGracePeriod}} />
-      {{/if}}
-      <InfoTableRow @label="Delta CRL building">
-        <Icon
-          class={{if @crl.enableDelta "icon-true" "icon-false"}}
-          @name={{if @crl.enableDelta "check-circle" "x-square"}}
-        />
-        {{if @crl.enableDelta "On" "Off"}}
-      </InfoTableRow>
-      {{#if @crl.enableDelta}}
-        <InfoTableRow @label="Delta rebuild interval" @value={{@crl.deltaRebuildInterval}} />
-      {{/if}}
-    {{/unless}}
-    <h2 class="title is-4 has-bottom-margin-xs has-top-margin-xl has-border-bottom-light has-bottom-padding-s">
-      Online Certificate Status Protocol (OCSP)
-    </h2>
-    <InfoTableRow @label="Responder APIs" @value={{if @crl.ocspDisable "Disabled" "Enabled"}} />
-    {{#unless @crl.ocspDisable}}
-      <InfoTableRow @label="Interval" @value={{@crl.ocspExpiry}} />
-    {{/unless}}
-
-    {{#if this.isEnterprise}}
-      <h2 class="title is-4 has-bottom-margin-xs has-top-margin-xl has-border-bottom-light has-bottom-padding-s">
-        Unified Revocation
-      </h2>
-      <InfoTableRow @label="Cross-cluster revocation" @value={{@crl.crossClusterRevocation}} />
-      <InfoTableRow @label="Unified CRL" @value={{@crl.unifiedCrl}} />
-      <InfoTableRow @label="Unified CRL on existing paths" @value={{@crl.unifiedCrlOnExistingPaths}} />
-    {{/if}}
-  {{/if}}
-{{else}}
-  <Toolbar>
-    <ToolbarActions>
-      <ToolbarLink @route="configuration.create" data-test-configure-pki-button>
-        Configure
-      </ToolbarLink>
-    </ToolbarActions>
-  </Toolbar>
-{{/if}}
-
-<h2
-  class="title is-4 has-bottom-margin-xs has-border-bottom-light has-bottom-padding-s
-    {{if (or @hasConfig (and (eq @crl 403) (eq @urls 403))) 'has-top-margin-xl' 'has-top-margin-m'}}"
->
-  Mount Configuration
-</h2>
-<InfoTableRow @label="Secret engine type" @value={{@mountConfig.engineType}} />
-<InfoTableRow @label="Path" @value={{@mountConfig.path}} />
-<InfoTableRow @label="Accessor" @value={{@mountConfig.accessor}} />
-<InfoTableRow @label="Local" @value={{@mountConfig.local}} />
-<InfoTableRow @label="Seal wrap" @value={{@mountConfig.sealWrap}} />
-<InfoTableRow @label="Default lease TTL" @value={{@mountConfig.config.defaultLeaseTtl}} />
-<InfoTableRow @label="Max lease TTL" @value={{@mountConfig.config.maxLeaseTtl}} />
-<InfoTableRow @label="Allowed managed keys" @value={{or @mountConfig.config.allowedManagedKeys "None"}} />
-<div class="has-top-margin-l"></div>
-
-{{#if this.showDeleteAllIssuers}}
-  <ConfirmationModal
-    @title="Delete All Issuers?"
-    @toConfirmMsg="deleting all issuers and keys."
-    @buttonText="Confirm"
-    @confirmText="delete-all"
-    @isActive={{this.showDeleteAllIssuers}}
-    @onClose={{action (mut this.showDeleteAllIssuers) false}}
-    @onConfirm={{this.deleteAllIssuers}}
-  >
-    <section class="modal-card-custom">
-      This endpoint deletes
-      <strong>all</strong>
-      issuers and keys within the mount. It is highly recommended to use the individual delete operations instead. This mount
-      will be unusable until new issuers and keys are provisioned.
-    </section>
-  </ConfirmationModal>
-{{/if}}
\ No newline at end of file
diff --git a/ui/lib/pki/addon/components/page/pki-configuration-details.ts b/ui/lib/pki/addon/components/page/pki-configuration-details.ts
deleted file mode 100644
index 5f88e98e12519..0000000000000
--- a/ui/lib/pki/addon/components/page/pki-configuration-details.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
-import { inject as service } from '@ember/service';
-import { action } from '@ember/object';
-import { tracked } from '@glimmer/tracking';
-import errorMessage from 'vault/utils/error-message';
-import type RouterService from '@ember/routing/router-service';
-import type FlashMessageService from 'vault/services/flash-messages';
-import type Store from '@ember-data/store';
-import type VersionService from 'vault/services/version';
-
-interface Args {
-  backend: string;
-}
-
-export default class PkiConfigurationDetails extends Component<Args> {
-  @service declare readonly store: Store;
-  @service declare readonly router: RouterService;
-  @service declare readonly flashMessages: FlashMessageService;
-  @service declare readonly version: VersionService;
-  @tracked showDeleteAllIssuers = false;
-
-  get isEnterprise() {
-    return this.version.isEnterprise;
-  }
-
-  @action
-  async deleteAllIssuers() {
-    try {
-      const issuerAdapter = this.store.adapterFor('pki/issuer');
-      await issuerAdapter.deleteAllIssuers(this.args.backend);
-      this.flashMessages.success('Successfully deleted all issuers and keys');
-      this.showDeleteAllIssuers = false;
-      this.router.transitionTo('vault.cluster.secrets.backend.pki.configuration.index');
-    } catch (error) {
-      this.showDeleteAllIssuers = false;
-      this.flashMessages.danger(errorMessage(error));
-    }
-  }
-}
diff --git a/ui/lib/pki/addon/components/page/pki-configuration-edit.hbs b/ui/lib/pki/addon/components/page/pki-configuration-edit.hbs
deleted file mode 100644
index 092e59923af14..0000000000000
--- a/ui/lib/pki/addon/components/page/pki-configuration-edit.hbs
+++ /dev/null
@@ -1,144 +0,0 @@
-<div class="box is-sideless is-fullwidth is-marginless">
-  {{#if this.errorBanner}}
-    <AlertBanner @type="danger" @message={{this.errorBanner}} data-test-error-banner />
-  {{/if}}
-  <form {{on "submit" (perform this.save)}}>
-    <fieldset class="is-shadowless is-marginless is-borderless is-fullwidth" data-test-cluster-config-edit-section>
-      <h2 class="title is-size-5 has-border-bottom-light page-header">
-        Cluster Config
-      </h2>
-      {{#if @cluster.canSet}}
-        {{#each @cluster.allFields as |attr|}}
-          <FormField @attr={{attr}} @model={{@cluster}} @showHelpText={{false}} />
-        {{/each}}
-      {{else}}
-        <EmptyState
-          class="is-shadowless"
-          @title="You do not have permission to set this mount's the cluster config"
-          @message="Ask your administrator if you think you should have access to:"
-        >
-          <code>POST /{{@backend}}/config/cluster</code>
-        </EmptyState>
-      {{/if}}
-    </fieldset>
-
-    <fieldset class="box is-shadowless is-marginless is-borderless is-fullwidth" data-test-acme-edit-section>
-      <h2 class="title is-size-5 has-border-bottom-light page-header">
-        ACME Config
-      </h2>
-      {{#if @acme.canSet}}
-        {{#each @acme.allFields as |attr|}}
-          <FormField @attr={{attr}} @model={{@acme}} @showHelpText={{false}} @backend={{@backend}} />
-        {{/each}}
-      {{else}}
-        <EmptyState
-          class="is-shadowless"
-          @title="You do not have permission to set this mount's ACME config"
-          @message="Ask your administrator if you think you should have access to:"
-        >
-          <code>POST /{{@backend}}/config/acme</code>
-        </EmptyState>
-      {{/if}}
-    </fieldset>
-
-    <fieldset class="box is-shadowless is-marginless is-borderless is-fullwidth" data-test-urls-edit-section>
-      <h2 class="title is-size-5 has-border-bottom-light page-header">
-        Global URLs
-      </h2>
-      {{#if @urls.canSet}}
-        {{#each @urls.allFields as |attr|}}
-          <FormField @attr={{attr}} @model={{@urls}} @showHelpText={{false}} />
-        {{/each}}
-      {{else}}
-        <EmptyState
-          class="is-shadowless"
-          @title="You do not have permission to set this mount's URLs"
-          @message="Ask your administrator if you think you should have access to:"
-        >
-          <code>POST /{{@backend}}/config/urls</code>
-        </EmptyState>
-      {{/if}}
-    </fieldset>
-
-    <fieldset class="box is-shadowless is-marginless is-borderless is-fullwidth" data-test-crl-edit-section>
-      {{#if @crl.canSet}}
-        {{#each @crl.formFieldGroups as |fieldGroup|}}
-          {{#each-in fieldGroup as |group fields|}}
-            {{#if (or (not-eq group "Unified Revocation") this.isEnterprise)}}
-              <h2 class="title is-size-5 has-border-bottom-light page-header" data-test-crl-header={{group}}>
-                {{group}}
-              </h2>
-            {{/if}}
-            {{#each fields as |attr|}}
-              {{#if (eq attr.options.editType "ttl")}}
-                {{#if (or (includes attr.name (array "expiry" "ocspExpiry")) (not @crl.disable))}}
-                  {{#let (get @crl attr.options.mapToBoolean) as |enabled|}}
-                    {{! 'enabled' is the pki/crl model's boolean attr that corresponds to the duration set by the ttl }}
-                    <div class="field">
-                      <TtlPicker
-                        data-test-input={{attr.name}}
-                        @onChange={{fn this.handleTtl attr}}
-                        @label={{attr.options.label}}
-                        @labelDisabled={{attr.options.labelDisabled}}
-                        @helperTextDisabled={{attr.options.helperTextDisabled}}
-                        @helperTextEnabled={{attr.options.helperTextEnabled}}
-                        @initialEnabled={{if attr.options.isOppositeValue (not enabled) enabled}}
-                        @initialValue={{get @crl attr.name}}
-                      />
-                    </div>
-                  {{/let}}
-                {{/if}}
-              {{else}}
-                {{#if this.isEnterprise}}
-                  <FormField @attr={{attr}} @model={{@crl}} />
-                {{/if}}
-              {{/if}}
-            {{/each}}
-          {{/each-in}}
-        {{/each}}
-      {{else}}
-        <EmptyState
-          @title="You do not have permission to set this mount's revocation configuration"
-          @message="Ask your administrator if you think you should have access to:"
-        >
-          <code>POST /{{@backend}}/config/crl</code>
-        </EmptyState>
-      {{/if}}
-    </fieldset>
-
-    <div class="field is-grouped box is-fullwidth is-bottomless">
-      <div class="control">
-        {{#if (or @urls.canSet @crl.canSet)}}
-          <button
-            type="submit"
-            class="button is-primary {{if this.save.isRunning 'is-loading'}}"
-            disabled={{this.save.isRunning}}
-            data-test-configuration-edit-save
-          >
-            Save
-          </button>
-        {{/if}}
-        <button
-          {{on "click" this.cancel}}
-          type="button"
-          class="button has-left-margin-s"
-          disabled={{this.save.isRunning}}
-          data-test-configuration-edit-cancel
-        >
-          Cancel
-        </button>
-      </div>
-      {{#if this.invalidFormAlert}}
-        <div class="control">
-          <AlertInline
-            @type="danger"
-            @paddingTop={{true}}
-            @message={{this.invalidFormAlert}}
-            @mimicRefresh={{true}}
-            data-test-configuration-edit-validation-alert
-          />
-        </div>
-      {{/if}}
-    </div>
-  </form>
-</div>
\ No newline at end of file
diff --git a/ui/lib/pki/addon/components/page/pki-configuration-edit.ts b/ui/lib/pki/addon/components/page/pki-configuration-edit.ts
deleted file mode 100644
index d6b73c0f49dc1..0000000000000
--- a/ui/lib/pki/addon/components/page/pki-configuration-edit.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
-import { tracked } from '@glimmer/tracking';
-import { inject as service } from '@ember/service';
-import { action } from '@ember/object';
-import { task } from 'ember-concurrency';
-import { waitFor } from '@ember/test-waiters';
-import errorMessage from 'vault/utils/error-message';
-import type RouterService from '@ember/routing/router-service';
-import type FlashMessageService from 'vault/services/flash-messages';
-import type VersionService from 'vault/services/version';
-import type PkiConfigAcmeModel from 'vault/models/pki/config/acme';
-import type PkiConfigClusterModel from 'vault/models/pki/config/cluster';
-import type PkiConfigCrlModel from 'vault/models/pki/config/crl';
-import type PkiConfigUrlsModel from 'vault/models/pki/config/urls';
-import type { FormField, TtlEvent } from 'vault/app-types';
-
-interface Args {
-  acme: PkiConfigAcmeModel;
-  cluster: PkiConfigClusterModel;
-  crl: PkiConfigCrlModel;
-  urls: PkiConfigUrlsModel;
-}
-interface PkiConfigCrlTtls {
-  autoRebuildGracePeriod: string;
-  expiry: string;
-  deltaRebuildInterval: string;
-  ocspExpiry: string;
-}
-interface PkiConfigCrlBooleans {
-  autoRebuild: boolean;
-  enableDelta: boolean;
-  disable: boolean;
-  ocspDisable: boolean;
-}
-export default class PkiConfigurationEditComponent extends Component<Args> {
-  @service declare readonly router: RouterService;
-  @service declare readonly flashMessages: FlashMessageService;
-  @service declare readonly version: VersionService;
-
-  @tracked invalidFormAlert = '';
-  @tracked errorBanner = '';
-
-  get isEnterprise() {
-    return this.version.isEnterprise;
-  }
-
-  @task
-  @waitFor
-  *save(event: Event) {
-    event.preventDefault();
-    try {
-      for (const model of ['cluster', 'acme', 'urls', 'crl']) {
-        // only call save() if user has permission
-        if (this.args[model as keyof Args].canSet) {
-          yield this.args[model as keyof Args].save();
-          this.flashMessages.success(`Successfully updated ${model} config`);
-        }
-      }
-      this.router.transitionTo('vault.cluster.secrets.backend.pki.configuration.index');
-    } catch (error) {
-      this.invalidFormAlert = 'There was an error submitting this form.';
-      this.errorBanner = errorMessage(error);
-    }
-  }
-
-  @action
-  cancel() {
-    this.router.transitionTo('vault.cluster.secrets.backend.pki.configuration.index');
-  }
-
-  @action
-  handleTtl(attr: FormField, e: TtlEvent) {
-    const { enabled, goSafeTimeString } = e;
-    const ttlAttr = attr.name;
-    this.args.crl[ttlAttr as keyof PkiConfigCrlTtls] = goSafeTimeString;
-    // expiry and ocspExpiry both correspond to 'disable' booleans
-    // so when ttl is enabled, the booleans are set to false
-    this.args.crl[attr.options.mapToBoolean as keyof PkiConfigCrlBooleans] = attr.options.isOppositeValue
-      ? !enabled
-      : enabled;
-  }
-}
diff --git a/ui/lib/pki/addon/components/page/pki-configure-create.hbs b/ui/lib/pki/addon/components/page/pki-configure-create.hbs
deleted file mode 100644
index 72b946e9b8ed2..0000000000000
--- a/ui/lib/pki/addon/components/page/pki-configure-create.hbs
+++ /dev/null
@@ -1,95 +0,0 @@
-<PageHeader as |p|>
-  <p.top>
-    <Page::Breadcrumbs @breadcrumbs={{@breadcrumbs}} />
-  </p.top>
-  <p.levelLeft>
-    <h1 class="title is-3" data-test-pki-engine-page-title>
-      {{this.title}}
-    </h1>
-  </p.levelLeft>
-</PageHeader>
-
-{{#if @config.id}}
-  <Toolbar />
-{{else}}
-  <div class="box is-bottomless is-fullwidth is-marginless">
-    <div class="columns">
-      {{#each this.configTypes as |option|}}
-        <div class="column is-flex">
-          <label for={{option.key}} class="box-label is-column {{if (eq @config.actionType option.key) 'is-selected'}}">
-            <div>
-              <h3 class="box-label-header title is-6">
-                <Icon @size="24" @name={{option.icon}} />
-                {{option.label}}
-              </h3>
-              <p class="help has-text-grey-dark">
-                {{option.description}}
-              </p>
-            </div>
-            <div>
-              <RadioButton
-                id={{option.key}}
-                name="pki-config-type"
-                @value={{option.key}}
-                @groupValue={{@config.actionType}}
-                @onChange={{fn (mut @config.actionType) option.key}}
-                data-test-pki-config-option={{option.key}}
-              />
-              <label for={{option.key}}></label>
-            </div>
-          </label>
-        </div>
-      {{/each}}
-    </div>
-  </div>
-{{/if}}
-{{#if (eq @config.actionType "import")}}
-  <PkiImportPemBundle
-    @model={{@config}}
-    @onCancel={{@onCancel}}
-    @onSave={{fn (mut this.title) "View imported items"}}
-    @onComplete={{transition-to "vault.cluster.secrets.backend.pki.overview"}}
-    @adapterOptions={{hash actionType=@config.actionType useIssuer=@config.canImportBundle}}
-  />
-{{else if (eq @config.actionType "generate-root")}}
-  {{#if @config.privateKey}}
-    <div class="has-top-margin-m">
-      <AlertBanner
-        @title="Next steps"
-        @type="warning"
-        @message="The private_key is only available once. Make sure you copy and save it now."
-      />
-    </div>
-  {{/if}}
-  <PkiGenerateRoot
-    @model={{@config}}
-    @urls={{@urls}}
-    @onCancel={{@onCancel}}
-    @adapterOptions={{hash actionType=@config.actionType useIssuer=@config.canGenerateIssuerRoot}}
-    @onSave={{fn (mut this.title) "View root certificate"}}
-    @onComplete={{transition-to "vault.cluster.secrets.backend.pki.overview"}}
-  />
-{{else if (eq @config.actionType "generate-csr")}}
-  <PkiGenerateCsr
-    @model={{@config}}
-    @onCancel={{@onCancel}}
-    @onSave={{fn (mut this.title) "View generated CSR"}}
-    @onComplete={{transition-to "vault.cluster.secrets.backend.pki.overview"}}
-  />
-{{else}}
-  <EmptyState
-    @title="Choose an option"
-    @message="To see configuration options, choose your desired output above."
-    data-test-configuration-empty-state
-  />
-  <div class="field is-grouped box is-fullwidth is-bottomless">
-    <div class="control">
-      <button type="button" class="button is-primary" disabled={{true}} data-test-pki-config-save>
-        Done
-      </button>
-      <button type="button" class="button has-left-margin-s" {{on "click" @onCancel}} data-test-pki-config-cancel>
-        Cancel
-      </button>
-    </div>
-  </div>
-{{/if}}
\ No newline at end of file
diff --git a/ui/lib/pki/addon/components/page/pki-configure-create.ts b/ui/lib/pki/addon/components/page/pki-configure-create.ts
deleted file mode 100644
index ac008dd2ada4a..0000000000000
--- a/ui/lib/pki/addon/components/page/pki-configure-create.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
-import { inject as service } from '@ember/service';
-import { tracked } from '@glimmer/tracking';
-import type Store from '@ember-data/store';
-import type Router from '@ember/routing/router';
-import type FlashMessageService from 'vault/services/flash-messages';
-import type PkiActionModel from 'vault/models/pki/action';
-import type { Breadcrumb } from 'vault/vault/app-types';
-
-interface Args {
-  config: PkiActionModel;
-  onCancel: CallableFunction;
-  breadcrumbs: Breadcrumb;
-}
-
-/**
- * @module PkiConfigureCreate
- * Page::PkiConfigureCreate component is used to configure a PKI engine mount.
- * The component shows three options for configuration and which form
- * is shown. The sub-forms rendered handle rendering the form itself
- * and form submission and cancel actions.
- */
-export default class PkiConfigureCreate extends Component<Args> {
-  @service declare readonly store: Store;
-  @service declare readonly router: Router;
-  @service declare readonly flashMessages: FlashMessageService;
-
-  @tracked title = 'Configure PKI';
-
-  get configTypes() {
-    return [
-      {
-        key: 'import',
-        icon: 'download',
-        label: 'Import a CA',
-        description:
-          'Import CA information via a PEM file containing the CA certificate and any private keys, concatenated together, in any order.',
-      },
-      {
-        key: 'generate-root',
-        icon: 'file-plus',
-        label: 'Generate root',
-        description:
-          'Generates a new self-signed CA certificate and private key. This generated root will sign its own CRL.',
-      },
-      {
-        key: 'generate-csr',
-        icon: 'files',
-        label: 'Generate intermediate CSR',
-        description:
-          'Generate a new CSR for signing, optionally generating a new private key. No new issuer is created by this call.',
-      },
-    ];
-  }
-}
diff --git a/ui/lib/pki/addon/components/page/pki-issuer-details.hbs b/ui/lib/pki/addon/components/page/pki-issuer-details.hbs
deleted file mode 100644
index 67b0707c2617a..0000000000000
--- a/ui/lib/pki/addon/components/page/pki-issuer-details.hbs
+++ /dev/null
@@ -1,188 +0,0 @@
-<Toolbar>
-  <ToolbarActions>
-    {{#if (and @isRotatable @canRotate)}}
-      <button
-        type="button"
-        class="toolbar-link"
-        {{on "click" (fn (mut this.showRotationModal) true)}}
-        data-test-pki-issuer-rotate-root
-      >
-        Rotate this root
-        <Icon @name="rotate-cw" />
-      </button>
-    {{/if}}
-    {{#if @canCrossSign}}
-      <ToolbarLink @route="issuers.issuer.cross-sign" @type="pen-tool" @model={{@issuer.id}} data-test-pki-issuer-cross-sign>
-        Cross-sign issuers
-      </ToolbarLink>
-    {{/if}}
-    {{#if @canSignIntermediate}}
-      <ToolbarLink @route="issuers.issuer.sign" @type="pen-tool" @issuer={{@issuer.id}} data-test-pki-issuer-sign-int>
-        Sign Intermediate
-      </ToolbarLink>
-    {{/if}}
-    <BasicDropdown @class="popup-menu" @horizontalPosition="auto-right" @verticalPosition="below" as |D|>
-      <D.Trigger
-        data-test-popup-menu-trigger="true"
-        class={{concat "toolbar-link" (if D.isOpen " is-active")}}
-        @htmlTag="button"
-        data-test-issuer-download
-      >
-        Download
-        <Chevron @direction="down" @isButton={{true}} />
-      </D.Trigger>
-      <D.Content @defaultClass="popup-menu-content">
-        <nav class="box menu" aria-label="snapshots actions">
-          <ul class="menu-list">
-            {{#if @pem}}
-              {{! should never be null, but if it is we don't want to let users download an empty file }}
-              <li class="action">
-                <DownloadButton
-                  class="link"
-                  @filename={{@issuer.id}}
-                  @data={{@pem}}
-                  @extension="pem"
-                  data-test-issuer-download-type="pem"
-                >
-                  PEM format
-                </DownloadButton>
-              </li>
-            {{/if}}
-            {{#if @der}}
-              {{! should never be null, but if it is we don't want to let users download an empty file }}
-              <li class="action">
-                <DownloadButton
-                  class="link"
-                  @filename={{@issuer.id}}
-                  @data={{@der}}
-                  @extension="der"
-                  data-test-issuer-download-type="der"
-                >
-                  DER format
-                </DownloadButton>
-              </li>
-            {{/if}}
-          </ul>
-        </nav>
-      </D.Content>
-    </BasicDropdown>
-
-    {{#if @canConfigure}}
-      <ToolbarLink @route="issuers.issuer.edit" @model={{@issuer.id}} data-test-pki-issuer-configure>
-        Configure
-      </ToolbarLink>
-    {{/if}}
-  </ToolbarActions>
-</Toolbar>
-
-{{#if @issuer.isDefault}}
-  <p class="has-top-margin-m">
-    This is your default issuer certificate. You will see it in your
-    <LinkTo @route="issuers.index">
-      list of Issuers.
-    </LinkTo>
-    You may also want to configure its usage and other behaviors.
-  </p>
-{{/if}}
-<main data-test-issuer-details>
-  {{#each @issuer.formFieldGroups as |fieldGroup|}}
-    {{#each-in fieldGroup as |group fields|}}
-      <div class="box is-sideless is-fullwidth is-shadowless" data-test-details-group={{group}}>
-        {{#if (not-eq group "default")}}
-          <h2 class="title is-5 has-margin-top" data-test-group-title>
-            {{group}}
-          </h2>
-        {{/if}}
-        {{#each fields as |attr|}}
-          {{#if attr.options.masked}}
-            <InfoTableRow @label={{or attr.options.label (humanize (dasherize attr.name))}} @value={{get @issuer attr.name}}>
-              <MaskedInput
-                @name={{or attr.options.label (humanize (dasherize attr.name))}}
-                @value={{get @issuer attr.name}}
-                @displayOnly={{true}}
-                @allowCopy={{true}}
-              />
-            </InfoTableRow>
-          {{else if (eq attr.name "keyId")}}
-            <InfoTableRow @label={{or attr.options.label (humanize (dasherize attr.name))}} @value={{get @issuer attr.name}}>
-              {{#if @issuer.keyId}}
-                <LinkTo @route="keys.key.details" @model={{@issuer.keyId}}>{{@issuer.keyId}}</LinkTo>
-              {{else}}
-                <Icon @name="minus" />
-              {{/if}}
-            </InfoTableRow>
-          {{else}}
-            <InfoTableRow
-              @label={{or attr.options.label (humanize (dasherize attr.name))}}
-              @value={{get @issuer attr.name}}
-              @formatDate={{if attr.options.formatDate "MMM d yyyy HH:mm:ss a zzzz"}}
-              @alwaysRender={{true}}
-              @addCopyButton={{(eq attr.name "issuerId")}}
-            />
-          {{/if}}
-        {{/each}}
-        {{#if (eq group "default")}}
-          <ParsedCertificateInfoRows @model={{@issuer.parsedCertificate}} />
-        {{/if}}
-      </div>
-    {{/each-in}}
-  {{/each}}
-</main>
-{{#if (or (eq @issuer.parsedCertificate.can_parse false) this.parsingErrors)}}
-  <AlertBanner
-    data-test-parsing-error-alert-banner
-    class="has-top-margin-m"
-    @type="info"
-    @title="There was an error parsing certificate metadata"
-  >
-    Vault cannot display unparsed values, but this will not interfere with the certificate's functionality. However, if you
-    wish to cross-sign this issuer it must be done manually using the CLI.
-    {{#if this.parsingErrors}}
-      <p class="sub-text is-font-mono">Parsing error(s): {{this.parsingErrors}} </p>
-    {{/if}}
-  </AlertBanner>
-{{/if}}
-
-{{! ROOT ROTATION MODAL }}
-<Modal
-  @type="rotation"
-  @title="Rotate this root"
-  @onClose={{fn (mut this.showRotationModal) false}}
-  @isActive={{this.showRotationModal}}
-  @showCloseButton={{true}}
->
-  <section class="modal-card-body">
-    <h3 class="title is-5">Root rotation</h3>
-    <p class="has-text-grey has-bottom-padding-s">
-      Root rotation is an impactful process. Please be ready to ensure that the new root is properly distributed to
-      end-users’ trust stores. You can also do this manually by
-      <DocLink @path="/vault/docs/secrets/pki/rotation-primitives#suggested-root-rotation-procedure">
-        following our documentation.
-      </DocLink>
-    </p>
-    <h3 class="title is-5 has-top-bottom-margin">How root rotation will work</h3>
-    <p class="has-text-grey">
-      <ol class="has-left-margin-m has-bottom-margin-s">
-        <li>The new root will be generated using defaults from the old one that you can customize.</li>
-        <li>You will identify intermediates, which Vault will then cross-sign.</li>
-      </ol>
-      Then, you can begin re-issuing leaf certs and phase out the old root.
-    </p>
-    <div class="has-top-margin-l has-tall-padding">
-      <img src={{img-path "~/pki-rotate-root.png"}} alt="pki root rotation diagram" />
-    </div>
-  </section>
-  <footer class="modal-card-foot modal-card-foot-outlined">
-    <button
-      type="button"
-      class="button is-primary"
-      {{on "click" (transition-to "vault.cluster.secrets.backend.pki.issuers.issuer.rotate-root")}}
-      data-test-root-rotate-step-one
-    >
-      Generate new root
-    </button>
-    <button type="button" class="button is-secondary" {{on "click" (fn (mut this.showRotationModal) false)}}>
-      Cancel
-    </button>
-  </footer>
-</Modal>
\ No newline at end of file
diff --git a/ui/lib/pki/addon/components/page/pki-issuer-details.ts b/ui/lib/pki/addon/components/page/pki-issuer-details.ts
deleted file mode 100644
index 56ba60d04e51d..0000000000000
--- a/ui/lib/pki/addon/components/page/pki-issuer-details.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
-import { tracked } from '@glimmer/tracking';
-import type PkiIssuerModel from 'vault/models/pki/issuer';
-
-interface Args {
-  issuer: PkiIssuerModel;
-}
-
-export default class PkiIssuerDetailsComponent extends Component<Args> {
-  @tracked showRotationModal = false;
-
-  get parsingErrors() {
-    if (this.args.issuer.parsedCertificate?.parsing_errors?.length) {
-      return this.args.issuer.parsedCertificate.parsing_errors.map((e: Error) => e.message).join(', ');
-    }
-    return '';
-  }
-}
diff --git a/ui/lib/pki/addon/components/page/pki-issuer-edit.hbs b/ui/lib/pki/addon/components/page/pki-issuer-edit.hbs
deleted file mode 100644
index 37031a41fa4ad..0000000000000
--- a/ui/lib/pki/addon/components/page/pki-issuer-edit.hbs
+++ /dev/null
@@ -1,77 +0,0 @@
-<form {{on "submit" (perform this.save)}}>
-  <div class="box is-sideless is-fullwidth is-marginless">
-    <MessageError @errorMessage={{this.error}} />
-    {{#each @model.formFields as |field|}}
-      {{#if (eq field.name "issuingCertificates")}}
-        <div class="has-top-margin-m has-bottom-margin-s">
-          <h2 class="title is-4">
-            Issuer URLs
-          </h2>
-        </div>
-      {{/if}}
-      <FormField @attr={{field}} @model={{@model}}>
-        {{#if (eq field.name "usage")}}
-          {{#each field.options.valueOptions as |option|}}
-            <div class="is-flex-center has-text-grey has-text-weight-bold">
-              <Input
-                data-test-usage={{option.label}}
-                id={{option.value}}
-                @type="checkbox"
-                @checked={{includes option.value this.usageValues}}
-                {{on "change" (fn this.setUsage option.value)}}
-              />
-              <label for={{option.value}} class="has-left-margin-s">{{option.label}}</label>
-            </div>
-          {{/each}}
-        {{else if (eq field.name "leafNotAfterBehavior")}}
-          <div class="control is-expanded">
-            <div class="select is-fullwidth">
-              <select
-                name={{@attr.name}}
-                id={{@attr.name}}
-                {{on "change" (pipe (pick "target.value") (fn (mut @model.leafNotAfterBehavior)))}}
-                onchange={{this.onChangeWithEvent}}
-              >
-                {{#each field.options.valueOptions as |value|}}
-                  <option selected={{eq @model.leafNotAfterBehavior value}} value={{value}}>
-                    {{capitalize (if (eq value "err") "error" value)}}
-                    if the computed NotAfter exceeds that of this issuer
-                  </option>
-                {{/each}}
-              </select>
-            </div>
-          </div>
-        {{/if}}
-      </FormField>
-    {{/each}}
-  </div>
-  <div class="has-top-margin-l has-bottom-margin-l">
-    <button
-      type="submit"
-      class="button is-primary {{if this.save.isRunning 'is-loading'}}"
-      disabled={{this.save.isRunning}}
-      data-test-save
-    >
-      Update
-    </button>
-    <button
-      type="button"
-      class="button has-left-margin-s"
-      disabled={{this.save.isRunning}}
-      {{on "click" this.cancel}}
-      data-test-cancel
-    >
-      Cancel
-    </button>
-    {{#if this.error}}
-      <div class="control">
-        <AlertInline
-          @type="danger"
-          @paddingTop={{true}}
-          @message="There was an error submitting this form."
-          @mimicRefresh={{true}}
-        />
-      </div>
-    {{/if}}
-  </div>
-</form>
\ No newline at end of file
diff --git a/ui/lib/pki/addon/components/page/pki-issuer-edit.ts b/ui/lib/pki/addon/components/page/pki-issuer-edit.ts
deleted file mode 100644
index 4123235417929..0000000000000
--- a/ui/lib/pki/addon/components/page/pki-issuer-edit.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
-import { tracked } from '@glimmer/tracking';
-import { inject as service } from '@ember/service';
-import { action } from '@ember/object';
-import { task } from 'ember-concurrency';
-import { waitFor } from '@ember/test-waiters';
-import errorMessage from 'vault/utils/error-message';
-import type RouterService from '@ember/routing/router-service';
-import type FlashMessageService from 'vault/services/flash-messages';
-import type PkiIssuerModel from 'vault/models/pki/issuer';
-
-interface Args {
-  model: PkiIssuerModel;
-}
-
-export default class PkiIssuerEditComponent extends Component<Args> {
-  @service declare readonly router: RouterService;
-  @service declare readonly flashMessages: FlashMessageService;
-
-  @tracked usageValues: Array<string> = [];
-  @tracked error = null;
-
-  constructor(owner: unknown, args: Args) {
-    super(owner, args);
-    this.usageValues = (this.args.model.usage || '').split(',');
-  }
-
-  toDetails() {
-    this.router.transitionTo('vault.cluster.secrets.backend.pki.issuers.issuer.details');
-  }
-
-  @action
-  setUsage(value: string) {
-    const method = this.usageValues.includes(value) ? 'removeObject' : 'addObject';
-    this.usageValues[method](value);
-    this.args.model.usage = this.usageValues.join(',');
-  }
-
-  @task
-  @waitFor
-  *save(event: Event) {
-    event.preventDefault();
-    try {
-      yield this.args.model.save();
-      this.flashMessages.success('Successfully updated issuer');
-      this.toDetails();
-    } catch (error) {
-      this.error = errorMessage(error);
-    }
-  }
-
-  @action
-  cancel() {
-    this.args.model.rollbackAttributes();
-    this.toDetails();
-  }
-}
diff --git a/ui/lib/pki/addon/components/page/pki-issuer-generate-intermediate.hbs b/ui/lib/pki/addon/components/page/pki-issuer-generate-intermediate.hbs
deleted file mode 100644
index bdb96825376e5..0000000000000
--- a/ui/lib/pki/addon/components/page/pki-issuer-generate-intermediate.hbs
+++ /dev/null
@@ -1,20 +0,0 @@
-<PageHeader as |p|>
-  <p.top>
-    <Page::Breadcrumbs @breadcrumbs={{@breadcrumbs}} />
-  </p.top>
-  <p.levelLeft>
-    <h1 class="title is-3" data-test-pki-page-title>
-      {{this.title}}
-    </h1>
-  </p.levelLeft>
-</PageHeader>
-
-{{#if @model.id}}
-  <Toolbar />
-{{/if}}
-<PkiGenerateCsr
-  @model={{@model}}
-  @onCancel={{transition-to "vault.cluster.secrets.backend.pki.issuers.index"}}
-  @onSave={{fn (mut this.title) "View generated CSR"}}
-  @onComplete={{transition-to "vault.cluster.secrets.backend.pki.issuers.index"}}
-/>
\ No newline at end of file
diff --git a/ui/lib/pki/addon/components/page/pki-issuer-generate-intermediate.ts b/ui/lib/pki/addon/components/page/pki-issuer-generate-intermediate.ts
deleted file mode 100644
index 6cd3194181787..0000000000000
--- a/ui/lib/pki/addon/components/page/pki-issuer-generate-intermediate.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import Component from '@glimmer/component';
-import { tracked } from '@glimmer/tracking';
-import type PkiActionModel from 'vault/vault/models/pki/action';
-
-interface Args {
-  model: PkiActionModel;
-}
-
-export default class PagePkiIssuerGenerateIntermediateComponent extends Component<Args> {
-  @tracked title = 'Generate intermediate CSR';
-}
diff --git a/ui/lib/pki/addon/components/page/pki-issuer-generate-root.hbs b/ui/lib/pki/addon/components/page/pki-issuer-generate-root.hbs
deleted file mode 100644
index 6813d279e48ca..0000000000000
--- a/ui/lib/pki/addon/components/page/pki-issuer-generate-root.hbs
+++ /dev/null
@@ -1,30 +0,0 @@
-<PageHeader as |p|>
-  <p.top>
-    <Page::Breadcrumbs @breadcrumbs={{@breadcrumbs}} />
-  </p.top>
-  <p.levelLeft>
-    <h1 class="title is-3" data-test-pki-page-title>
-      {{this.title}}
-    </h1>
-  </p.levelLeft>
-</PageHeader>
-
-{{#if @model.id}}
-  <Toolbar />
-{{/if}}
-{{#if @model.privateKey}}
-  <div class="has-top-margin-m">
-    <AlertBanner
-      @title="Next steps"
-      @type="warning"
-      @message="The private_key is only available once. Make sure you copy and save it now."
-    />
-  </div>
-{{/if}}
-<PkiGenerateRoot
-  @model={{@model}}
-  @onCancel={{transition-to "vault.cluster.secrets.backend.pki.issuers.index"}}
-  @onComplete={{transition-to "vault.cluster.secrets.backend.pki.issuers.index"}}
-  @onSave={{fn (mut this.title) "View generated root"}}
-  @adapterOptions={{hash actionType="generate-root" useIssuer=@model.canGenerateIssuerRoot}}
-/>
\ No newline at end of file
diff --git a/ui/lib/pki/addon/components/page/pki-issuer-generate-root.ts b/ui/lib/pki/addon/components/page/pki-issuer-generate-root.ts
deleted file mode 100644
index 61cecb7562a92..0000000000000
--- a/ui/lib/pki/addon/components/page/pki-issuer-generate-root.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import Component from '@glimmer/component';
-import { tracked } from '@glimmer/tracking';
-import type PkiActionModel from 'vault/vault/models/pki/action';
-
-interface Args {
-  model: PkiActionModel;
-}
-
-export default class PagePkiIssuerGenerateRootComponent extends Component<Args> {
-  @tracked title = 'Generate root';
-}
diff --git a/ui/lib/pki/addon/components/page/pki-issuer-import.hbs b/ui/lib/pki/addon/components/page/pki-issuer-import.hbs
deleted file mode 100644
index ad19937832464..0000000000000
--- a/ui/lib/pki/addon/components/page/pki-issuer-import.hbs
+++ /dev/null
@@ -1,21 +0,0 @@
-<PageHeader as |p|>
-  <p.top>
-    <Page::Breadcrumbs @breadcrumbs={{@breadcrumbs}} />
-  </p.top>
-  <p.levelLeft>
-    <h1 class="title is-3" data-test-pki-page-title>
-      {{this.title}}
-    </h1>
-  </p.levelLeft>
-</PageHeader>
-
-{{#if @model.id}}
-  <Toolbar />
-{{/if}}
-<PkiImportPemBundle
-  @model={{@model}}
-  @onCancel={{transition-to "vault.cluster.secrets.backend.pki.issuers.index"}}
-  @onComplete={{transition-to "vault.cluster.secrets.backend.pki.issuers.index"}}
-  @onSave={{fn (mut this.title) "View imported items"}}
-  @adapterOptions={{hash actionType="import" useIssuer=true}}
-/>
\ No newline at end of file
diff --git a/ui/lib/pki/addon/components/page/pki-issuer-import.ts b/ui/lib/pki/addon/components/page/pki-issuer-import.ts
deleted file mode 100644
index 2430984ee5cf2..0000000000000
--- a/ui/lib/pki/addon/components/page/pki-issuer-import.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import Component from '@glimmer/component';
-import { tracked } from '@glimmer/tracking';
-import type PkiActionModel from 'vault/vault/models/pki/action';
-
-interface Args {
-  model: PkiActionModel;
-}
-
-export default class PagePkiIssuerImportComponent extends Component<Args> {
-  @tracked title = 'Import a CA';
-}
diff --git a/ui/lib/pki/addon/components/page/pki-issuer-list.hbs b/ui/lib/pki/addon/components/page/pki-issuer-list.hbs
deleted file mode 100644
index 649fa419f721f..0000000000000
--- a/ui/lib/pki/addon/components/page/pki-issuer-list.hbs
+++ /dev/null
@@ -1,65 +0,0 @@
-{{#each @issuers as |pkiIssuer idx|}}
-  <LinkedBlock class="list-item-row" @params={{array "issuers.issuer.details" pkiIssuer.id}} @linkPrefix={{@mountPoint}}>
-    <div class="level is-mobile">
-      <div class="level-left">
-        <div>
-          <Icon @name="certificate" class="has-text-grey-light" />
-          <span class="has-text-weight-semibold is-underline">
-            {{pkiIssuer.issuerRef}}
-            {{#if pkiIssuer.issuerName}}
-              <span class="tag has-text-grey-dark">{{pkiIssuer.id}}</span>
-            {{/if}}
-          </span>
-          <div class="is-flex-row has-left-margin-l has-top-margin-xs">
-            {{#if pkiIssuer.isDefault}}
-              <span class="tag has-text-grey-dark" data-test-is-default={{idx}}>default issuer</span>
-            {{/if}}
-            {{#if (not (eq pkiIssuer.isRoot undefined))}}
-              <span class="tag has-text-grey-dark" data-test-is-root-tag={{idx}}>{{if
-                  pkiIssuer.isRoot
-                  "root"
-                  "intermediate"
-                }}</span>
-            {{/if}}
-            {{#if pkiIssuer.serialNumber}}
-              <span class="tag is-transparent has-right-margin-none" data-test-serial-number={{idx}}>
-                <InfoTooltip>
-                  Serial number
-                </InfoTooltip>
-                {{pkiIssuer.serialNumber}}
-              </span>
-            {{/if}}
-            {{#if pkiIssuer.parsedCertificate.common_name}}
-              <span class="tag is-transparent has-left-margin-none" data-test-common-name={{idx}}>
-                <InfoTooltip>
-                  Common name
-                </InfoTooltip>
-                {{pkiIssuer.parsedCertificate.common_name}}
-              </span>
-            {{/if}}
-          </div>
-        </div>
-      </div>
-      <div class="level-right is-flex is-paddingless is-marginless">
-        <div class="level-item">
-          <PopupMenu>
-            <nav class="menu" aria-label="issuer config options">
-              <ul class="menu-list">
-                <li data-test-popup-menu-details>
-                  <LinkTo @route="issuers.issuer.details" @model={{pkiIssuer.id}}>
-                    Details
-                  </LinkTo>
-                </li>
-                <li>
-                  <LinkTo @route="issuers.issuer.edit" @model={{pkiIssuer.id}}>
-                    Edit
-                  </LinkTo>
-                </li>
-              </ul>
-            </nav>
-          </PopupMenu>
-        </div>
-      </div>
-    </div>
-  </LinkedBlock>
-{{/each}}
\ No newline at end of file
diff --git a/ui/lib/pki/addon/components/page/pki-issuer-rotate-root.hbs b/ui/lib/pki/addon/components/page/pki-issuer-rotate-root.hbs
deleted file mode 100644
index 5254f2efa4a24..0000000000000
--- a/ui/lib/pki/addon/components/page/pki-issuer-rotate-root.hbs
+++ /dev/null
@@ -1,189 +0,0 @@
-<PageHeader as |p|>
-  <p.top>
-    <Page::Breadcrumbs @breadcrumbs={{@breadcrumbs}} />
-  </p.top>
-  <p.levelLeft>
-    <h1 class="title is-3" data-test-pki-page-title>
-      {{if @newRootModel.id "View issuer certificate" "Generate new root"}}
-    </h1>
-  </p.levelLeft>
-</PageHeader>
-
-{{#if @newRootModel.id}}
-  <Toolbar>
-    <ToolbarActions>
-      <ToolbarLink
-        @route="issuers.issuer.cross-sign"
-        @type="pen-tool"
-        @model={{@newRootModel.issuerId}}
-        data-test-pki-issuer-cross-sign
-      >
-        Cross-sign issuers
-      </ToolbarLink>
-      <ToolbarLink
-        @route="issuers.issuer.sign"
-        @type="pen-tool"
-        @model={{@newRootModel.issuerId}}
-        data-test-pki-issuer-sign-int
-      >
-        Sign Intermediate
-      </ToolbarLink>
-      <BasicDropdown @class="popup-menu" @horizontalPosition="auto-right" @verticalPosition="below" as |D|>
-        <D.Trigger
-          data-test-popup-menu-trigger
-          class={{concat "toolbar-link" (if D.isOpen " is-active")}}
-          @htmlTag="button"
-          data-test-issuer-download
-        >
-          Download
-          <Chevron @direction="down" @isButton={{true}} />
-        </D.Trigger>
-        <D.Content @defaultClass="popup-menu-content">
-          <nav class="box menu" aria-label="snapshots actions">
-            <ul class="menu-list">
-              <li class="action">
-                <DownloadButton
-                  class="link"
-                  @filename={{@newRootModel.issuerId}}
-                  @extension="pem"
-                  @fetchData={{fn this.fetchDataForDownload "pem"}}
-                  data-test-issuer-download-type="pem"
-                >
-                  PEM format
-                </DownloadButton>
-              </li>
-              <li class="action">
-                <DownloadButton
-                  class="link"
-                  @filename={{@newRootModel.issuerId}}
-                  @extension="der"
-                  @fetchData={{fn this.fetchDataForDownload "der"}}
-                  data-test-issuer-download-type="der"
-                >
-                  DER format
-                </DownloadButton>
-              </li>
-            </ul>
-          </nav>
-        </D.Content>
-      </BasicDropdown>
-      <ToolbarLink @route="issuers.issuer.edit" @model={{@newRootModel.issuerId}} data-test-pki-issuer-configure>
-        Configure
-      </ToolbarLink>
-    </ToolbarActions>
-  </Toolbar>
-{{/if}}
-
-{{#if @newRootModel.id}}
-  <div class="has-top-margin-m">
-    <AlertBanner @title="Next steps" @type="warning">
-      Your new root has been generated.
-      {{#if @newRootModel.privateKey}}
-        Make sure to copy and save the
-        <strong>private_key</strong>
-        as it is only available once.
-      {{/if}}
-      If you’re ready, you can begin cross-signing issuers now. If not, the option to cross-sign is available when you use
-      this certificate.
-      <br />
-      <LinkTo class="is-marginless" @route="issuers.issuer.cross-sign" @model={{@newRootModel.issuerId}}>
-        Cross-sign issuers
-      </LinkTo>
-    </AlertBanner>
-  </div>
-{{else}}
-  <div class="box is-bottomless is-marginless is-flex-start">
-    {{#each this.generateOptions as |option|}}
-      <RadioCard
-        class="has-fixed-width"
-        @title={{option.label}}
-        @description={{option.description}}
-        @icon={{option.icon}}
-        @value={{option.key}}
-        @groupValue={{this.displayedForm}}
-        @onChange={{fn (mut this.displayedForm) option.key}}
-        data-test-radio={{option.key}}
-      />
-    {{/each}}
-  </div>
-{{/if}}
-
-{{#if (eq this.displayedForm "use-old-settings")}}
-  {{#if @newRootModel.id}}
-    <PkiInfoTableRows @model={{@newRootModel}} @displayFields={{this.displayFields}} />
-    <ParsedCertificateInfoRows @model={{@newRootModel.parsedCertificate}} />
-    <div class="field is-grouped is-fullwidth has-top-margin-l has-bottom-margin-s">
-      <div class="control">
-        <button type="button" class="button is-primary" {{on "click" @onComplete}} data-test-done>
-          Done
-        </button>
-      </div>
-    </div>
-  {{else}}
-    {{!  USE OLD SETTINGS FORM INPUTS  }}
-    <h2 class="title is-size-5 has-border-bottom-light page-header">
-      Root parameters
-    </h2>
-    <form {{on "submit" (perform this.save)}} data-test-pki-rotate-old-settings-form>
-      {{#if @parsingErrors}}
-        <AlertBanner
-          @title="Not all of the certificate values could be parsed and transferred to new root"
-          @type="warning"
-          @message={{@parsingErrors}}
-          data-test-warning-banner
-        />
-      {{/if}}
-      {{#if this.alertBanner}}
-        <AlertBanner @type="danger" @message={{this.alertBanner}} data-test-error-banner />
-      {{/if}}
-      {{#let (find-by "name" "commonName" @newRootModel.allFields) as |attr|}}
-        <FormField @attr={{attr}} @model={{@newRootModel}} @modelValidations={{this.modelValidations}} />
-      {{/let}}
-      {{#let (find-by "name" "issuerName" @newRootModel.allFields) as |attr|}}
-        <FormField @attr={{attr}} @model={{@newRootModel}} @modelValidations={{this.modelValidations}} />
-      {{/let}}
-      <div class="box has-slim-padding is-shadowless">
-        <ToggleButton
-          data-test-details-toggle
-          @closedLabel="Old root settings"
-          @openLabel="Hide old root settings"
-          @isOpen={{this.showOldSettings}}
-          @onClick={{fn (mut this.showOldSettings)}}
-        />
-        {{#if this.showOldSettings}}
-          <PkiInfoTableRows @model={{@oldRoot}} @displayFields={{this.displayFields}} />
-          <ParsedCertificateInfoRows @model={{@oldRoot.parsedCertificate}} />
-        {{/if}}
-      </div>
-
-      <div class="field is-grouped box is-fullwidth is-bottomless">
-        <div class="control">
-          <button type="submit" class="button is-primary" data-test-pki-rotate-root-save>
-            Done
-          </button>
-          <button {{on "click" @onCancel}} type="button" class="button has-left-margin-s" data-test-pki-rotate-root-cancel>
-            Cancel
-          </button>
-        </div>
-        {{#if this.invalidFormAlert}}
-          <div class="control">
-            <AlertInline
-              @type="danger"
-              @paddingTop={{true}}
-              @message={{this.invalidFormAlert}}
-              @mimicRefresh={{true}}
-              data-test-pki-rotate-root-validation-error
-            />
-          </div>
-        {{/if}}
-      </div>
-    </form>
-  {{/if}}
-{{else}}
-  <PkiGenerateRoot
-    @model={{@newRootModel}}
-    @onCancel={{@onCancel}}
-    @onComplete={{@onComplete}}
-    @adapterOptions={{hash actionType="rotate-root"}}
-  />
-{{/if}}
\ No newline at end of file
diff --git a/ui/lib/pki/addon/components/page/pki-issuer-rotate-root.ts b/ui/lib/pki/addon/components/page/pki-issuer-rotate-root.ts
deleted file mode 100644
index c5f4ff623fb7f..0000000000000
--- a/ui/lib/pki/addon/components/page/pki-issuer-rotate-root.ts
+++ /dev/null
@@ -1,118 +0,0 @@
-import Component from '@glimmer/component';
-import { inject as service } from '@ember/service';
-import { tracked } from '@glimmer/tracking';
-import { action } from '@ember/object';
-import { waitFor } from '@ember/test-waiters';
-import { task } from 'ember-concurrency';
-import errorMessage from 'vault/utils/error-message';
-import type Store from '@ember-data/store';
-import type Router from '@ember/routing/router';
-import type FlashMessageService from 'vault/services/flash-messages';
-import type SecretMountPath from 'vault/services/secret-mount-path';
-import type PkiIssuerModel from 'vault/models/pki/issuer';
-import type PkiActionModel from 'vault/vault/models/pki/action';
-import type { Breadcrumb, ValidationMap } from 'vault/vault/app-types';
-
-interface Args {
-  oldRoot: PkiIssuerModel;
-  newRootModel: PkiActionModel;
-  breadcrumbs: Breadcrumb;
-  parsingErrors: string;
-}
-
-const RADIO_BUTTON_KEY = {
-  oldSettings: 'use-old-settings',
-  customizeNew: 'customize',
-};
-
-export default class PagePkiIssuerRotateRootComponent extends Component<Args> {
-  @service declare readonly store: Store;
-  @service declare readonly router: Router;
-  @service declare readonly flashMessages: FlashMessageService;
-  @service declare readonly secretMountPath: SecretMountPath;
-
-  @tracked displayedForm = RADIO_BUTTON_KEY.oldSettings;
-  @tracked showOldSettings = false;
-  @tracked modelValidations: ValidationMap | null = null;
-  // form alerts below are only for "use old settings" option
-  // validations/errors for "customize new root" are handled by <PkiGenerateRoot> component
-  @tracked alertBanner = '';
-  @tracked invalidFormAlert = '';
-
-  get generateOptions() {
-    return [
-      {
-        key: RADIO_BUTTON_KEY.oldSettings,
-        icon: 'certificate',
-        label: 'Use old root settings',
-        description: `Provide only a new common name and issuer name, using the old root’s settings. Selecting this option generates a root with Vault-internal key material.`,
-      },
-      {
-        key: RADIO_BUTTON_KEY.customizeNew,
-        icon: 'award',
-        label: 'Customize new root certificate',
-        description:
-          'Generates a new self-signed CA certificate and private key. This generated root will sign its own CRL.',
-      },
-    ];
-  }
-
-  // for displaying old root details, and generated root details
-  get displayFields() {
-    const addKeyFields = ['privateKey', 'privateKeyType'];
-    const defaultFields = [
-      'certificate',
-      'caChain',
-      'issuerId',
-      'issuerName',
-      'issuingCa',
-      'keyName',
-      'keyId',
-      'serialNumber',
-    ];
-    return this.args.newRootModel.id ? [...defaultFields, ...addKeyFields] : defaultFields;
-  }
-
-  checkFormValidity() {
-    if (this.args.newRootModel.validate) {
-      const { isValid, state, invalidFormMessage } = this.args.newRootModel.validate();
-      this.modelValidations = state;
-      this.invalidFormAlert = invalidFormMessage;
-      return isValid;
-    }
-    return true;
-  }
-
-  @task
-  @waitFor
-  *save(event: Event) {
-    event.preventDefault();
-    const continueSave = this.checkFormValidity();
-    if (!continueSave) return;
-    try {
-      yield this.args.newRootModel.save({ adapterOptions: { actionType: 'rotate-root' } });
-      this.flashMessages.success('Successfully generated root.');
-    } catch (e) {
-      this.alertBanner = errorMessage(e);
-      this.invalidFormAlert = 'There was a problem generating root.';
-    }
-  }
-
-  @action
-  async fetchDataForDownload(format: string) {
-    const endpoint = `/v1/${this.secretMountPath.currentPath}/issuer/${this.args.newRootModel.issuerId}/${format}`;
-    const adapter = this.store.adapterFor('application');
-    try {
-      return adapter
-        .rawRequest(endpoint, 'GET', { unauthenticated: true })
-        .then(function (response: Response) {
-          if (format === 'der') {
-            return response.blob();
-          }
-          return response.text();
-        });
-    } catch (e) {
-      return null;
-    }
-  }
-}
diff --git a/ui/lib/pki/addon/components/page/pki-key-details.hbs b/ui/lib/pki/addon/components/page/pki-key-details.hbs
deleted file mode 100644
index 828253f82a324..0000000000000
--- a/ui/lib/pki/addon/components/page/pki-key-details.hbs
+++ /dev/null
@@ -1,56 +0,0 @@
-<Toolbar>
-  <ToolbarActions>
-    {{#if @canDelete}}
-      <ConfirmAction
-        @buttonClasses="toolbar-link"
-        @onConfirmAction={{this.deleteKey}}
-        @confirmTitle="Delete key?"
-        @confirmButtonText="Delete"
-        data-test-pki-key-delete
-      >
-        Delete
-      </ConfirmAction>
-      <div class="toolbar-separator"></div>
-    {{/if}}
-    {{#if @key.privateKey}}
-      <DownloadButton
-        class="toolbar-link"
-        @filename="{{@key.backend}}-{{or @key.keyName 'private-key'}}"
-        @data={{@key.privateKey}}
-        @extension="pem"
-      >
-        Download private key
-        <Chevron @isButton={{true}} />
-      </DownloadButton>
-    {{/if}}
-    {{#if @canEdit}}
-      <ToolbarLink @route="keys.key.edit" @model={{@key.keyId}} data-test-pki-key-edit>
-        Edit key
-      </ToolbarLink>
-    {{/if}}
-  </ToolbarActions>
-</Toolbar>
-
-<div class="box is-fullwidth is-sideless is-paddingless is-marginless">
-  {{#if @key.privateKey}}
-    <div class="has-top-margin-m">
-      <AlertBanner
-        @title="Next steps"
-        @type="warning"
-        @message="This private key material will only be available once. Copy or download it now."
-      />
-    </div>
-  {{/if}}
-  {{#each @key.formFields as |attr|}}
-    <InfoTableRow
-      @label={{capitalize (or attr.options.detailsLabel attr.options.label (humanize (dasherize attr.name)))}}
-      @value={{get @key attr.name}}
-      @addCopyButton={{eq attr.name "keyId"}}
-    />
-  {{/each}}
-  {{#if @key.privateKey}}
-    <InfoTableRow @label="Private key">
-      <MaskedInput @value={{@key.privateKey}} @name="Private key" @displayOnly={{true}} @allowCopy={{true}} />
-    </InfoTableRow>
-  {{/if}}
-</div>
\ No newline at end of file
diff --git a/ui/lib/pki/addon/components/page/pki-key-details.ts b/ui/lib/pki/addon/components/page/pki-key-details.ts
deleted file mode 100644
index ebcf91a02bea5..0000000000000
--- a/ui/lib/pki/addon/components/page/pki-key-details.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
-import { action } from '@ember/object';
-import { inject as service } from '@ember/service';
-import errorMessage from 'vault/utils/error-message';
-import type RouterService from '@ember/routing/router-service';
-import type FlashMessageService from 'vault/services/flash-messages';
-import type PkiKeyModel from 'vault/models/pki/key';
-interface Args {
-  key: PkiKeyModel;
-}
-
-export default class PkiKeyDetails extends Component<Args> {
-  @service declare readonly router: RouterService;
-  @service declare readonly flashMessages: FlashMessageService;
-
-  @action
-  async deleteKey() {
-    try {
-      await this.args.key.destroyRecord();
-      this.flashMessages.success('Key deleted successfully.');
-      this.router.transitionTo('vault.cluster.secrets.backend.pki.keys.index');
-    } catch (error) {
-      this.args.key.rollbackAttributes();
-      this.flashMessages.danger(errorMessage(error));
-    }
-  }
-}
diff --git a/ui/lib/pki/addon/components/page/pki-key-list.hbs b/ui/lib/pki/addon/components/page/pki-key-list.hbs
deleted file mode 100644
index 8b7a16e752c75..0000000000000
--- a/ui/lib/pki/addon/components/page/pki-key-list.hbs
+++ /dev/null
@@ -1,71 +0,0 @@
-<Toolbar>
-  <ToolbarActions>
-    {{#if @canImportKey}}
-      <ToolbarLink @route="keys.import" @type="download" data-test-pki-key-import>
-        Import
-      </ToolbarLink>
-    {{/if}}
-    {{#if @canGenerateKey}}
-      <ToolbarLink @route="keys.create" @type="add" data-test-pki-key-generate>
-        Generate
-      </ToolbarLink>
-    {{/if}}
-  </ToolbarActions>
-</Toolbar>
-<p class="has-padding">Below is information about the private keys used by the issuers to sign certificates. While
-  certificates represent a public assertion of an identity, private keys represent the private part of that identity, a
-  secret used to prove who they are and who they trust.</p>
-
-{{#if @keyModels.length}}
-  {{#each @keyModels as |pkiKey|}}
-    <LinkedBlock class="list-item-row" @params={{array "keys.key.details" pkiKey.keyId}} @linkPrefix={{@mountPoint}}>
-      <div class="level is-mobile">
-        <div class="level-left">
-          <div>
-            <Icon @name="certificate" class="has-text-grey-light" />
-            <span class="has-text-weight-semibold is-underline" data-test-key={{if pkiKey.keyName "name" "id"}}>
-              {{or pkiKey.keyName pkiKey.id}}
-            </span>
-            <div class="is-flex-row has-left-margin-l has-top-margin-xs">
-              {{#if pkiKey.keyName}}
-                <span class="tag has-text-grey-dark" data-test-key="id">{{pkiKey.id}}</span>
-              {{/if}}
-            </div>
-          </div>
-        </div>
-        <div class="level-right is-flex is-paddingless is-marginless">
-          <div class="level-item">
-            <PopupMenu>
-              <nav class="menu">
-                <ul class="menu-list">
-                  <li>
-                    <LinkTo
-                      @route="keys.key.details"
-                      @model={{pkiKey.keyId}}
-                      @disabled={{not @canRead}}
-                      data-test-key-menu-link="details"
-                    >
-                      Details
-                    </LinkTo>
-                  </li>
-                  <li>
-                    <LinkTo
-                      @route="keys.key.edit"
-                      @model={{pkiKey.keyId}}
-                      @disabled={{not @canEdit}}
-                      data-test-key-menu-link="edit"
-                    >
-                      Edit
-                    </LinkTo>
-                  </li>
-                </ul>
-              </nav>
-            </PopupMenu>
-          </div>
-        </div>
-      </div>
-    </LinkedBlock>
-  {{/each}}
-{{else}}
-  <EmptyState @title="No keys yet" @message="There are no keys in this PKI mount. You can generate or create one." />
-{{/if}}
\ No newline at end of file
diff --git a/ui/lib/pki/addon/components/page/pki-overview.hbs b/ui/lib/pki/addon/components/page/pki-overview.hbs
deleted file mode 100644
index b96cad10b7bfe..0000000000000
--- a/ui/lib/pki/addon/components/page/pki-overview.hbs
+++ /dev/null
@@ -1,96 +0,0 @@
-<div class="selectable-card-container has-grid has-top-margin-l has-two-col-grid">
-  <OverviewCard
-    @cardTitle="Issuers"
-    @subText="The total number of issuers in this PKI mount. Includes both root and intermediate certificates."
-    @actionText="View issuers"
-    @actionTo="issuers"
-  >
-    <h2 class="title-number">{{format-number (if (eq @issuers 404) 0 @issuers.length)}}</h2>
-  </OverviewCard>
-  {{#if (not (eq @roles 403))}}
-    <OverviewCard
-      @cardTitle="Roles"
-      @subText="The total number of roles in this PKI mount that have been created to generate certificates."
-      @actionText="View roles"
-      @actionTo="roles"
-    >
-      <h2 class="title-number">{{format-number (if (eq @roles 404) 0 @roles.length)}}</h2>
-    </OverviewCard>
-  {{/if}}
-  <OverviewCard @cardTitle="Issue certificate" @subText="Begin issuing a certificate by choosing a role.">
-    <div class="has-top-margin-m is-flex">
-      <SearchSelect
-        class="is-flex-1"
-        @selectLimit="1"
-        @models={{array "pki/role"}}
-        @backend={{@engine.id}}
-        @placeholder="Type to find a role..."
-        @disallowNewItems={{true}}
-        @onChange={{this.handleRolesInput}}
-        @fallbackComponent="input-search"
-        data-test-issue-certificate-input
-      />
-      <button
-        type="submit"
-        class="button is-secondary has-left-margin-s"
-        disabled={{unless this.rolesValue true}}
-        {{on "click" this.transitionToIssueCertificates}}
-        data-test-issue-certificate-button
-      >
-        Issue
-      </button>
-    </div>
-  </OverviewCard>
-
-  <OverviewCard @cardTitle="View certificate" @subText="Quickly view a certificate by typing its serial number.">
-    <div class="has-top-margin-m is-flex">
-      <SearchSelect
-        class="is-flex-1"
-        @selectLimit="1"
-        @models={{array "pki/certificate/base"}}
-        @backend={{@engine.id}}
-        @placeholder="33:a3:..."
-        @disallowNewItems={{true}}
-        @onChange={{this.handleCertificateInput}}
-        @fallbackComponent="input-search"
-        data-test-view-certificate-input
-      />
-      <button
-        type="button"
-        class="button is-secondary has-left-margin-s"
-        disabled={{unless this.certificateValue true}}
-        {{on "click" this.transitionToViewCertificates}}
-        data-test-view-certificate-button
-      >
-        View
-      </button>
-    </div>
-  </OverviewCard>
-
-  <OverviewCard @cardTitle="View issuer" @subText="Choose or type an issuer name or ID to view its details">
-    <div class="has-top-margin-m is-flex">
-      <SearchSelect
-        class="is-flex-1"
-        @selectLimit="1"
-        @models={{array "pki/issuer"}}
-        @backend={{@engine.id}}
-        @placeholder="Type to find an issuer..."
-        @disallowNewItems={{true}}
-        @onChange={{this.handleIssuerSearch}}
-        @fallbackComponent="input-search"
-        @shouldRenderName={{true}}
-        @nameKey={{"issuerName"}}
-        data-test-issue-issuer-input
-      />
-      <button
-        type="submit"
-        class="button is-secondary has-left-margin-s"
-        disabled={{unless this.issuerValue true}}
-        {{on "click" this.transitionToIssuerDetails}}
-        data-test-view-issuer-button
-      >
-        View
-      </button>
-    </div>
-  </OverviewCard>
-</div>
\ No newline at end of file
diff --git a/ui/lib/pki/addon/components/page/pki-overview.ts b/ui/lib/pki/addon/components/page/pki-overview.ts
deleted file mode 100644
index f0538065acdea..0000000000000
--- a/ui/lib/pki/addon/components/page/pki-overview.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
-import { action } from '@ember/object';
-import { tracked } from '@glimmer/tracking';
-import { inject as service } from '@ember/service';
-import type Store from '@ember-data/store';
-import type RouterService from '@ember/routing/router-service';
-import type PkiIssuerModel from 'vault/models/pki/issuer';
-import type PkiRoleModel from 'vault/models/pki/role';
-
-interface Args {
-  issuers: PkiIssuerModel | number;
-  roles: PkiRoleModel | number;
-  engine: string;
-}
-
-export default class PkiOverview extends Component<Args> {
-  @service declare readonly router: RouterService;
-  @service declare readonly store: Store;
-
-  @tracked rolesValue = '';
-  @tracked certificateValue = '';
-  @tracked issuerValue = '';
-
-  @action
-  transitionToViewCertificates() {
-    this.router.transitionTo(
-      'vault.cluster.secrets.backend.pki.certificates.certificate.details',
-      this.certificateValue
-    );
-  }
-  @action
-  transitionToIssueCertificates() {
-    this.router.transitionTo('vault.cluster.secrets.backend.pki.roles.role.generate', this.rolesValue);
-  }
-
-  @action
-  transitionToIssuerDetails() {
-    this.router.transitionTo('vault.cluster.secrets.backend.pki.issuers.issuer.details', this.issuerValue);
-  }
-
-  @action
-  handleRolesInput(roles: string) {
-    if (Array.isArray(roles)) {
-      this.rolesValue = roles[0];
-    } else {
-      this.rolesValue = roles;
-    }
-  }
-
-  @action
-  handleCertificateInput(certificate: string) {
-    if (Array.isArray(certificate)) {
-      this.certificateValue = certificate[0];
-    } else {
-      this.certificateValue = certificate;
-    }
-  }
-
-  @action
-  handleIssuerSearch(issuers: string) {
-    if (Array.isArray(issuers)) {
-      this.issuerValue = issuers[0];
-    } else {
-      this.issuerValue = issuers;
-    }
-  }
-}
diff --git a/ui/lib/pki/addon/components/page/pki-role-details.hbs b/ui/lib/pki/addon/components/page/pki-role-details.hbs
deleted file mode 100644
index 71e2e9e4af67f..0000000000000
--- a/ui/lib/pki/addon/components/page/pki-role-details.hbs
+++ /dev/null
@@ -1,84 +0,0 @@
-<Toolbar>
-  <ToolbarActions>
-    {{#if @role.canDelete}}
-      <ConfirmAction
-        @buttonClasses="toolbar-link"
-        @onConfirmAction={{this.deleteRole}}
-        @confirmTitle="Delete role?"
-        @confirmButtonText="Delete"
-        data-test-pki-role-delete
-      >
-        Delete
-      </ConfirmAction>
-      <div class="toolbar-separator"></div>
-    {{/if}}
-    {{#if @role.canGenerateCert}}
-      <LinkTo class="toolbar-link" @route="roles.role.generate" @model={{@role.id}} data-test-pki-role-generate-cert>
-        Generate Certificate
-        <Icon @name="chevron-right" />
-      </LinkTo>
-    {{/if}}
-    {{#if @role.canSign}}
-      <LinkTo class="toolbar-link" @route="roles.role.sign" @model={{@role.id}} data-test-pki-role-sign-cert>
-        Sign Certificate
-        <Icon @name="chevron-right" />
-      </LinkTo>
-    {{/if}}
-    {{#if @role.canEdit}}
-      <LinkTo class="toolbar-link" @route="roles.role.edit" @model={{@role.id}} data-test-pki-role-edit-link>
-        Edit
-        <Icon @name="chevron-right" />
-      </LinkTo>
-    {{/if}}
-  </ToolbarActions>
-</Toolbar>
-{{#each @role.formFieldGroups as |fg|}}
-  {{#each-in fg as |group fields|}}
-    {{#if (not-eq group "default")}}
-      <h3 class="is-size-4 has-text-weight-semibold has-top-margin-m">{{group}}</h3>
-    {{/if}}
-    {{#each fields as |attr|}}
-      {{#let (get @role attr.name) as |val|}}
-        {{#if (eq attr.name "issuerRef")}}
-          <InfoTableRow
-            @label={{capitalize (or attr.options.detailsLabel attr.options.label (humanize (dasherize attr.name)))}}
-            @value={{val}}
-            @alwaysRender={{true}}
-          >
-            <LinkTo @route="issuers.issuer.details" @model={{val}}>{{val}}</LinkTo>
-          </InfoTableRow>
-        {{else if (includes attr.name this.arrayAttrs)}}
-          <InfoTableRow
-            @label={{capitalize (or attr.options.detailsLabel attr.options.label (humanize (dasherize attr.name)))}}
-            @value={{val}}
-            @alwaysRender={{true}}
-          />
-        {{else if (eq attr.name "noStore")}}
-          <InfoTableRow
-            @label={{capitalize (or attr.options.detailsLabel attr.options.label (humanize (dasherize attr.name)))}}
-            @value={{not val}}
-            @alwaysRender={{true}}
-          />
-        {{else if (eq attr.name "customTtl")}}
-          {{! Show either notAfter or ttl }}
-          <InfoTableRow
-            @label={{capitalize (or attr.options.detailsLabel attr.options.label (humanize (dasherize attr.name)))}}
-            @value={{or @role.notAfter @role.ttl}}
-            @alwaysRender={{true}}
-            @formatDate={{if @role.notAfter "MMM d yyyy HH:mm zzzz"}}
-            @formatTtl={{@role.ttl}}
-          />
-        {{else}}
-          <InfoTableRow
-            @label={{capitalize (or attr.options.detailsLabel attr.options.label (humanize (dasherize attr.name)))}}
-            @value={{val}}
-            @alwaysRender={{true}}
-            @type={{or attr.type attr.options.type}}
-            @defaultShown={{attr.options.defaultShown}}
-            @formatTtl={{eq attr.options.editType "ttl"}}
-          />
-        {{/if}}
-      {{/let}}
-    {{/each}}
-  {{/each-in}}
-{{/each}}
\ No newline at end of file
diff --git a/ui/lib/pki/addon/components/page/pki-role-details.ts b/ui/lib/pki/addon/components/page/pki-role-details.ts
deleted file mode 100644
index 36bf046085b53..0000000000000
--- a/ui/lib/pki/addon/components/page/pki-role-details.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
-import { action } from '@ember/object';
-import { inject as service } from '@ember/service';
-import errorMessage from 'vault/utils/error-message';
-import type SecretMountPath from 'vault/services/secret-mount-path';
-import type FlashMessageService from 'vault/services/flash-messages';
-import type RouterService from '@ember/routing/router-service';
-import type PkiRoleModel from 'vault/models/pki/role';
-
-interface Args {
-  role: PkiRoleModel;
-}
-
-export default class DetailsPage extends Component<Args> {
-  @service declare readonly router: RouterService;
-  @service declare readonly flashMessages: FlashMessageService;
-  @service declare readonly secretMountPath: SecretMountPath;
-
-  get breadcrumbs() {
-    return [
-      { label: 'secrets', route: 'secrets', linkExternal: true },
-      { label: this.secretMountPath.currentPath, route: 'overview' },
-      { label: 'roles', route: 'roles.index' },
-      { label: this.args.role.id },
-    ];
-  }
-
-  get arrayAttrs() {
-    return ['keyUsage', 'extKeyUsage', 'extKeyUsageOids'];
-  }
-
-  @action
-  async deleteRole() {
-    try {
-      await this.args.role.destroyRecord();
-      this.flashMessages.success('Role deleted successfully');
-      this.router.transitionTo('vault.cluster.secrets.backend.pki.roles.index');
-    } catch (error) {
-      this.args.role.rollbackAttributes();
-      this.flashMessages.danger(errorMessage(error));
-    }
-  }
-}
diff --git a/ui/lib/pki/addon/components/page/pki-tidy-auto-configure.hbs b/ui/lib/pki/addon/components/page/pki-tidy-auto-configure.hbs
deleted file mode 100644
index a7c35a25eeb54..0000000000000
--- a/ui/lib/pki/addon/components/page/pki-tidy-auto-configure.hbs
+++ /dev/null
@@ -1,18 +0,0 @@
-<PageHeader as |p|>
-  <p.top>
-    <Page::Breadcrumbs @breadcrumbs={{@breadcrumbs}} />
-  </p.top>
-  <p.levelLeft>
-    <h1 class="title is-3">
-      <Icon @name="pki" @size="24" class="has-text-grey-light" />
-      Configure automatic tidy
-    </h1>
-  </p.levelLeft>
-</PageHeader>
-
-<PkiTidyForm
-  @tidy={{@model}}
-  @tidyType="auto"
-  @onSave={{transition-to "vault.cluster.secrets.backend.pki.tidy.auto"}}
-  @onCancel={{transition-to (concat "vault.cluster.secrets.backend.pki.tidy" (if @model.enabled ".auto" ""))}}
-/>
\ No newline at end of file
diff --git a/ui/lib/pki/addon/components/page/pki-tidy-auto-settings.hbs b/ui/lib/pki/addon/components/page/pki-tidy-auto-settings.hbs
deleted file mode 100644
index de5d76d209c93..0000000000000
--- a/ui/lib/pki/addon/components/page/pki-tidy-auto-settings.hbs
+++ /dev/null
@@ -1,40 +0,0 @@
-<PageHeader as |p|>
-  <p.top>
-    <Page::Breadcrumbs @breadcrumbs={{@breadcrumbs}} />
-  </p.top>
-  <p.levelLeft>
-    <h1 class="title is-3" data-test-header-title>
-      Automatic tidy configuration
-    </h1>
-  </p.levelLeft>
-</PageHeader>
-
-<Toolbar>
-  <ToolbarActions>
-    <LinkTo @route="tidy.auto.configure" class="toolbar-link" data-test-pki-edit-tidy-auto-link>
-      Edit auto-tidy
-      <Icon @name="chevron-right" />
-    </LinkTo>
-  </ToolbarActions>
-</Toolbar>
-
-<main>
-  {{#each @model.allGroups as |group|}}
-    {{#each-in group as |label fields|}}
-      {{#if (not-eq label "autoTidy")}}
-        <h2 class="title is-5 has-top-margin-l has-bottom-margin-xs" data-test-group-title={{label}}>
-          {{label}}
-        </h2>
-      {{/if}}
-
-      {{#each fields as |attr|}}
-        <InfoTableRow
-          @label={{or attr.options.detailsLabel attr.options.label (humanize (dasherize attr.name))}}
-          @value={{get @model attr.name}}
-          @formatTtl={{attr.options.formatTtl}}
-          data-test-row={{attr.name}}
-        />
-      {{/each}}
-    {{/each-in}}
-  {{/each}}
-</main>
\ No newline at end of file
diff --git a/ui/lib/pki/addon/components/page/pki-tidy-manual.hbs b/ui/lib/pki/addon/components/page/pki-tidy-manual.hbs
deleted file mode 100644
index 592919c942384..0000000000000
--- a/ui/lib/pki/addon/components/page/pki-tidy-manual.hbs
+++ /dev/null
@@ -1,18 +0,0 @@
-<PageHeader as |p|>
-  <p.top>
-    <Page::Breadcrumbs @breadcrumbs={{@breadcrumbs}} />
-  </p.top>
-  <p.levelLeft>
-    <h1 class="title is-3">
-      <Icon @name="pki" @size="24" class="has-text-grey-light" />
-      Manual tidy
-    </h1>
-  </p.levelLeft>
-</PageHeader>
-
-<PkiTidyForm
-  @tidy={{@model}}
-  @tidyType="manual"
-  @onSave={{transition-to "vault.cluster.secrets.backend.pki.tidy"}}
-  @onCancel={{transition-to "vault.cluster.secrets.backend.pki.tidy"}}
-/>
\ No newline at end of file
diff --git a/ui/lib/pki/addon/components/page/pki-tidy-status.hbs b/ui/lib/pki/addon/components/page/pki-tidy-status.hbs
deleted file mode 100644
index 651f000712a61..0000000000000
--- a/ui/lib/pki/addon/components/page/pki-tidy-status.hbs
+++ /dev/null
@@ -1,193 +0,0 @@
-<Toolbar>
-  <ToolbarActions>
-    <div class="toolbar-separator"></div>
-    {{#if @autoTidyConfig.enabled}}
-      <ToolbarLink @route="tidy.auto" data-test-pki-auto-tidy-config>
-        Auto-tidy configuration
-      </ToolbarLink>
-      <ToolbarLink @route="tidy.manual" data-test-pki-manual-tidy-config>
-        Perform manual tidy
-      </ToolbarLink>
-    {{else}}
-      <button
-        type="button"
-        class="toolbar-link"
-        {{on "click" (fn (mut this.tidyOptionsModal) true)}}
-        data-test-pki-tidy-options-modal
-      >
-        Tidy
-        <Icon @name="chevron-right" />
-      </button>
-    {{/if}}
-  </ToolbarActions>
-</Toolbar>
-
-{{#if this.hasTidyConfig}}
-  <Hds::Alert
-    @type="inline"
-    @color={{this.tidyStateAlertBanner.color}}
-    @icon={{this.tidyStateAlertBanner.icon}}
-    class="has-top-margin-m"
-    data-test-hds-alert
-    as |A|
-  >
-    <A.Title data-test-hds-alert-title>{{this.tidyStateAlertBanner.title}}</A.Title>
-    <A.Description data-test-hds-alert-description>{{this.tidyStateAlertBanner.message}}</A.Description>
-    {{#if this.tidyStateAlertBanner.shouldShowCancelTidy}}
-      <A.Button
-        @text="Cancel tidy"
-        @color="critical"
-        @icon={{if this.cancelTidy.isRunning "loading"}}
-        {{on "click" (fn (mut this.confirmCancelTidy) true)}}
-        data-test-cancel-tidy-action
-      />
-    {{/if}}
-    {{#if @tidyStatus.responseTimestamp}}
-      <A.Description class="has-top-margin-xs" data-test-hds-alert-updated-at>
-        Updated
-        {{date-format @tidyStatus.responseTimestamp "MMM d yyyy, h:mm:ss aaa" withTimeZone=true}}
-      </A.Description>
-    {{/if}}
-  </Hds::Alert>
-
-  {{#each this.tidyStatusGeneralFields as |attr|}}
-    <InfoTableRow
-      @label={{humanize (dasherize attr)}}
-      @formatDate={{if
-        (includes attr (array "time_started" "time_finished" "last_auto_tidy_finished"))
-        "MMM dd, yyyy hh:mm:ss a"
-      }}
-      @value={{get @tidyStatus attr}}
-      @alwaysRender={{true}}
-    />
-  {{/each}}
-
-  <h2 class="title is-4 has-bottom-margin-xs has-top-margin-l has-border-bottom-light has-bottom-padding-s">
-    {{if (eq this.tidyState "Running") "Current" "Last"}}
-    tidy settings
-  </h2>
-  {{#each this.tidyStatusConfigFields as |attr|}}
-    <InfoTableRow
-      @label={{humanize (dasherize attr)}}
-      @value={{get @tidyStatus attr}}
-      @formatTtl={{includes attr (array "safety_buffer" "issuer_safety_buffer")}}
-      @alwaysRender={{true}}
-    />
-  {{/each}}
-
-  {{#if this.isEnterprise}}
-    {{#each this.crossClusterOperation as |attr|}}
-      <InfoTableRow
-        @label={{humanize (dasherize attr)}}
-        @value={{get @tidyStatus attr}}
-        @formatTtl={{eq attr "revocation_queue_safety_buffer"}}
-        @alwaysRender={{true}}
-      />
-    {{/each}}
-  {{/if}}
-{{else}}
-  <EmptyState
-    @title="Tidy status unavailable"
-    @message="After the next tidy operation has been performed, information about the current or most recent tidy operation will display here."
-  >
-    <button
-      type="button"
-      class="link"
-      {{on "click" (fn (mut this.tidyOptionsModal) true)}}
-      data-test-tidy-empty-state-configure
-    >
-      Tidy
-    </button>
-  </EmptyState>
-{{/if}}
-
-{{! TIDY OPTIONS MODAL }}
-<Modal
-  @title="Tidy this mount"
-  @onClose={{fn (mut this.tidyOptionsModal) false}}
-  @isActive={{this.tidyOptionsModal}}
-  @showCloseButton={{true}}
->
-  <section aria-label="tidy-options-modal-content" class="modal-card-body">
-    <h3 class="title is-5">How tidying will work</h3>
-    <p class="has-text-grey has-bottom-padding-s">
-      Tidying cleans up the storage backend and/or CRL by removing certificates that have expired and are past a certain
-      buffer period beyond their expiration time.
-      <DocLink @path="/vault/docs/secrets/pki/considerations#automate-crl-building-and-tidying">
-        Documentation.
-      </DocLink>
-    </p>
-    <p class="has-text-grey">
-      <ol class="has-left-margin-m has-bottom-margin-s">
-        <li>Select a tidy operation:</li>
-        <ul class="bullet has-bottom-margin-xs">
-          <li><strong>Automatic tidy</strong>
-            periodically runs a tidy operation with saved configuration settings after waiting the specified interval
-            duration between tidies
-          </li>
-          <li><strong>Manual tidy</strong> runs a tidy operation once</li>
-        </ul>
-        <li>Configure the parameters that determine how to tidy and run the operation.</li>
-      </ol>
-    </p>
-    <div class="has-top-margin-l has-padding">
-      <img src={{img-path "~/pki-tidy.png"}} alt="tidy operation diagram" />
-    </div>
-  </section>
-  <footer aria-label="tidy-option-buttons" class="modal-card-foot modal-card-foot-outlined">
-    <button
-      type="button"
-      class="button is-primary"
-      {{on "click" (transition-to "vault.cluster.secrets.backend.pki.tidy.auto.configure")}}
-      data-test-tidy-modal-auto-button
-    >
-      Automatic tidy
-    </button>
-    <button
-      type="button"
-      class="button is-primary"
-      {{on "click" (transition-to "vault.cluster.secrets.backend.pki.tidy.manual")}}
-      data-test-tidy-modal-manual-button
-    >
-      Manual tidy
-    </button>
-    <button
-      type="button"
-      class="button is-secondary"
-      {{on "click" (fn (mut this.tidyOptionsModal) false)}}
-      data-test-tidy-modal-cancel-button
-    >
-      Cancel
-    </button>
-  </footer>
-</Modal>
-
-{{! CANCEL TIDY CONFIRMATION MODAL }}
-{{#if this.confirmCancelTidy}}
-  <Modal
-    @type="warning"
-    @title="Cancel tidy?"
-    @onClose={{fn (mut this.confirmCancelTidy) false}}
-    @isActive={{this.confirmCancelTidy}}
-    @showCloseButton={{true}}
-  >
-    <section aria-label="confirm-cancel-modal-content" class="modal-card-body">
-      This will cancel the tidy at the next available checkpoint, which may process additional certificates between when the
-      operation was marked as cancelled and when the operation stopped.
-      <p class="has-top-margin-s">Click “Confirm” to cancel the running tidy operation.</p>
-    </section>
-    <footer aria-label="confirm-cancel-buttons" class="modal-card-foot modal-card-foot-outlined">
-      <button
-        type="button"
-        class="button is-primary"
-        {{on "click" (perform this.cancelTidy)}}
-        data-test-tidy-modal-cancel-button
-      >
-        Confirm
-      </button>
-      <button type="button" class="button is-secondary" {{on "click" (fn (mut this.confirmCancelTidy) false)}}>
-        Cancel
-      </button>
-    </footer>
-  </Modal>
-{{/if}}
\ No newline at end of file
diff --git a/ui/lib/pki/addon/components/page/pki-tidy-status.ts b/ui/lib/pki/addon/components/page/pki-tidy-status.ts
deleted file mode 100644
index d15b8ad502fb0..0000000000000
--- a/ui/lib/pki/addon/components/page/pki-tidy-status.ts
+++ /dev/null
@@ -1,157 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
-import { tracked } from '@glimmer/tracking';
-import { inject as service } from '@ember/service';
-import { task } from 'ember-concurrency';
-import { waitFor } from '@ember/test-waiters';
-import errorMessage from 'vault/utils/error-message';
-
-import type Store from '@ember-data/store';
-import type SecretMountPath from 'vault/services/secret-mount-path';
-import type FlashMessageService from 'vault/services/flash-messages';
-import type VersionService from 'vault/services/version';
-import type PkiTidyModel from 'vault/models/pki/tidy';
-import type RouterService from '@ember/routing/router-service';
-
-interface Args {
-  autoTidyConfig: PkiTidyModel;
-  tidyStatus: TidyStatusParams;
-}
-
-interface TidyStatusParams {
-  safety_buffer: number;
-  tidy_cert_store: boolean;
-  tidy_revoked_certs: boolean;
-  state: string;
-  error: string;
-  time_started: string | null;
-  time_finished: string | null;
-  message: string;
-  cert_store_deleted_count: number;
-  revoked_cert_deleted_count: number;
-  missing_issuer_cert_count: number;
-  tidy_expired_issuers: boolean;
-  issuer_safety_buffer: string;
-  tidy_move_legacy_ca_bundle: boolean;
-  tidy_revocation_queue: boolean;
-  revocation_queue_deleted_count: number;
-  tidy_cross_cluster_revoked_certs: boolean;
-  cross_revoked_cert_deleted_count: number;
-  revocation_queue_safety_buffer: string;
-}
-
-export default class PkiTidyStatusComponent extends Component<Args> {
-  @service declare readonly store: Store;
-  @service declare readonly secretMountPath: SecretMountPath;
-  @service declare readonly flashMessages: FlashMessageService;
-  @service declare readonly version: VersionService;
-  @service declare readonly router: RouterService;
-
-  @tracked tidyOptionsModal = false;
-  @tracked confirmCancelTidy = false;
-
-  tidyStatusGeneralFields = [
-    'time_started',
-    'time_finished',
-    'last_auto_tidy_finished',
-    'cert_store_deleted_count',
-    'missing_issuer_cert_count',
-    'revocation_queue_deleted_count',
-  ];
-
-  tidyStatusConfigFields = [
-    'tidy_cert_store',
-    'tidy_revocation_queue',
-    'tidy_cross_cluster_revoked_certs',
-    'safety_buffer',
-    'pause_duration',
-    'tidy_expired_issuers',
-    'tidy_move_legacy_ca_bundle',
-    'issuer_safety_buffer',
-  ];
-
-  crossClusterOperation = ['tidy_revocation_queue', 'revocation_queue_safety_buffer'];
-
-  get isEnterprise() {
-    return this.version.isEnterprise;
-  }
-
-  get tidyState() {
-    return this.args.tidyStatus?.state;
-  }
-
-  get hasTidyConfig() {
-    return !this.tidyStatusConfigFields.every(
-      (attr) => this.args.tidyStatus[attr as keyof TidyStatusParams] === null
-    );
-  }
-
-  get tidyStateAlertBanner() {
-    const tidyState = this.tidyState;
-
-    switch (tidyState) {
-      case 'Inactive':
-        return {
-          color: 'highlight',
-          title: 'Tidy is inactive',
-          message: this.args.tidyStatus?.message,
-        };
-      case 'Running':
-        return {
-          color: 'highlight',
-          title: 'Tidy in progress',
-          message: this.args.tidyStatus?.message,
-          shouldShowCancelTidy: true,
-        };
-      case 'Finished':
-        return {
-          color: 'success',
-          title: 'Tidy operation finished',
-          message: this.args.tidyStatus?.message,
-        };
-      case 'Error':
-        return {
-          color: 'warning',
-          title: 'Tidy operation failed',
-          message: this.args.tidyStatus?.error,
-        };
-      case 'Cancelling':
-        return {
-          color: 'warning',
-          title: 'Tidy operation cancelling',
-          icon: 'loading',
-        };
-      case 'Cancelled':
-        return {
-          color: 'warning',
-          title: 'Tidy operation cancelled',
-          message:
-            'Your tidy operation has been cancelled. If this was a mistake configure and run another tidy operation.',
-        };
-      default:
-        return {
-          color: 'warning',
-          title: 'Tidy status not found',
-          message: "The system reported no tidy status. It's recommended to perform a new tidy operation.",
-        };
-    }
-  }
-
-  @task
-  @waitFor
-  *cancelTidy() {
-    try {
-      const tidyAdapter = this.store.adapterFor('pki/tidy');
-      yield tidyAdapter.cancelTidy(this.secretMountPath.currentPath);
-      this.router.transitionTo('vault.cluster.secrets.backend.pki.tidy');
-    } catch (error) {
-      this.flashMessages.danger(errorMessage(error));
-    } finally {
-      this.confirmCancelTidy = false;
-    }
-  }
-}
diff --git a/ui/lib/pki/addon/components/parsed-certificate-info-rows.hbs b/ui/lib/pki/addon/components/parsed-certificate-info-rows.hbs
deleted file mode 100644
index 07155159ef78b..0000000000000
--- a/ui/lib/pki/addon/components/parsed-certificate-info-rows.hbs
+++ /dev/null
@@ -1,9 +0,0 @@
-{{#each this.possibleFields as |field|}}
-  {{#let (get @model field.key) as |value|}}
-    <InfoTableRow
-      @label={{or field.label (humanize (dasherize field.key))}}
-      @value={{value}}
-      @formatDate={{field.formatDate}}
-    />
-  {{/let}}
-{{/each}}
\ No newline at end of file
diff --git a/ui/lib/pki/addon/components/parsed-certificate-info-rows.ts b/ui/lib/pki/addon/components/parsed-certificate-info-rows.ts
deleted file mode 100644
index 7f2ec51b04bc8..0000000000000
--- a/ui/lib/pki/addon/components/parsed-certificate-info-rows.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import Component from '@glimmer/component';
-import { parsedParameterKeys } from 'vault/utils/parse-pki-cert-oids';
-import { ParsedCertificateData } from 'vault/vault/utils/parse-pki-cert';
-
-/**
- * @module ParsedCertificateInfoRowsComponent
- * Renders attributes parsed from a PKI certificate (provided from parse-pki-cert util). It will only render rows for
- * defined values that match `parsedParameterKeys` imported from the helper. It never renders common_name, even though
- * the value is returned from the parse cert util, because `common_name` is important to PKI and we render it at the top.
- *
- * @example ```js
- * <ParsedCertificateInfoRows @model={{@model.parsedCertificate}} />
- * ```
- *
- * @param {object} model - object of parsed attributes from parse-pki-cert util
- */
-
-interface AttrOptions {
-  [key: string]: {
-    label?: string;
-    formatDate?: string;
-  };
-}
-
-interface Args {
-  model: ParsedCertificateData;
-}
-
-export default class ParsedCertificateInfoRowsComponent extends Component<Args> {
-  get possibleFields() {
-    // We show common name elsewhere on the details view, so no need to render it here
-    const fieldKeys = parsedParameterKeys.filter((k) => k !== 'common_name');
-    const attrsByKey: AttrOptions = {
-      other_sans: { label: 'Other SANs' },
-      alt_names: { label: 'Subject Alternative Names (SANs)' },
-      uri_sans: { label: 'URI SANs' },
-      ip_sans: { label: 'IP SANs' },
-      permitted_dns_domains: { label: 'Permitted DNS domains' },
-      exclude_cn_from_sans: { label: 'Exclude CN from SANs' },
-      use_pss: { label: 'Use PSS' },
-      ttl: { label: 'TTL' },
-      ou: { label: 'Organizational units (OU)' },
-      not_valid_after: { formatDate: 'MMM d yyyy HH:mm:ss a zzzz' },
-      not_valid_before: { formatDate: 'MMM d yyyy HH:mm:ss a zzzz' },
-    };
-
-    return fieldKeys.map((key) => {
-      return {
-        key,
-        ...attrsByKey[key],
-      };
-    });
-  }
-}
diff --git a/ui/lib/pki/addon/components/pki-generate-csr.hbs b/ui/lib/pki/addon/components/pki-generate-csr.hbs
deleted file mode 100644
index 4fbb98376d962..0000000000000
--- a/ui/lib/pki/addon/components/pki-generate-csr.hbs
+++ /dev/null
@@ -1,75 +0,0 @@
-{{#if @model.id}}
-  {{! Model only has ID once form has been submitted and saved }}
-  <main data-test-generate-csr-result>
-    <div class="box is-sideless is-fullwidth is-shadowless">
-      <AlertBanner @title="Next steps" @type="warning">
-        Copy the CSR below for a parent issuer to sign and then import the signed certificate back into this mount.
-        {{#if @model.privateKey}}
-          The
-          <code>private_key</code>
-          is only available once. Make sure you copy and save it now.
-        {{/if}}
-      </AlertBanner>
-      {{#each this.showFields as |fieldName|}}
-        {{#let (find-by "name" fieldName @model.allFields) as |attr|}}
-          {{#let (get @model attr.name) as |value|}}
-            <InfoTableRow
-              @label={{or attr.options.label (humanize (dasherize attr.name))}}
-              @value={{value}}
-              @addCopyButton={{eq attr.name "keyId"}}
-            >
-              {{#if (and attr.options.masked value)}}
-                <MaskedInput @value={{value}} @displayOnly={{true}} @allowCopy={{true}} />
-              {{else if (eq attr.name "keyId")}}
-                <LinkTo @route="keys.key.details" @model={{@model.keyId}}>
-                  {{@model.keyId}}
-                </LinkTo>
-              {{else}}
-                {{! this block only ever renders privateKey and privateKeyType }}
-                <span class="{{unless value 'tag'}}">{{or value "internal"}}</span>
-              {{/if}}
-            </InfoTableRow>
-          {{/let}}
-        {{/let}}
-      {{/each}}
-    </div>
-  </main>
-  <footer>
-    <div class="field is-grouped is-fullwidth has-top-margin-l">
-      <div class="control">
-        <button type="button" class="button is-primary" {{on "click" @onComplete}} data-test-done>
-          Done
-        </button>
-      </div>
-    </div>
-  </footer>
-{{else}}
-  <form {{on "submit" (perform this.save)}}>
-    <MessageError @errorMessage={{this.error}} class="has-top-margin-s" />
-    <h2 class="title is-size-5 has-border-bottom-light page-header">
-      CSR parameters
-    </h2>
-
-    {{#each this.formFields as |field|}}
-      <FormField @attr={{field}} @model={{@model}} @modelValidations={{this.modelValidations}} />
-    {{/each}}
-
-    <PkiGenerateToggleGroups @model={{@model}} @modelValidations={{this.modelValidations}} />
-
-    <div class="field is-grouped box is-fullwidth is-bottomless has-top-margin-l">
-      <div class="control">
-        <button type="submit" class="button is-primary" data-test-save>
-          Generate
-        </button>
-        <button {{on "click" this.cancel}} type="button" class="button has-left-margin-s" data-test-cancel>
-          Cancel
-        </button>
-      </div>
-      {{#if this.alert}}
-        <div class="control">
-          <AlertInline @type="danger" @paddingTop={{true}} @message={{this.alert}} @mimicRefresh={{true}} data-test-alert />
-        </div>
-      {{/if}}
-    </div>
-  </form>
-{{/if}}
\ No newline at end of file
diff --git a/ui/lib/pki/addon/components/pki-generate-csr.ts b/ui/lib/pki/addon/components/pki-generate-csr.ts
deleted file mode 100644
index 4e088d927b0c5..0000000000000
--- a/ui/lib/pki/addon/components/pki-generate-csr.ts
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
-import { tracked } from '@glimmer/tracking';
-import { inject as service } from '@ember/service';
-import { action } from '@ember/object';
-import { task } from 'ember-concurrency';
-import { waitFor } from '@ember/test-waiters';
-import { expandAttributeMeta } from 'vault/utils/field-to-attrs';
-import errorMessage from 'vault/utils/error-message';
-import type FlashMessageService from 'vault/services/flash-messages';
-import type PkiActionModel from 'vault/models/pki/action';
-import type { ValidationMap } from 'vault/vault/app-types';
-
-interface Args {
-  model: PkiActionModel;
-  useIssuer: boolean;
-  onComplete: CallableFunction;
-  onCancel: CallableFunction;
-  onSave?: CallableFunction;
-}
-
-/**
- * @module PkiGenerateCsrComponent
- * PkiGenerateCsr shows only the fields valid for the generate CSR endpoint.
- * This component renders the form, handles the model save and rollback actions,
- * and shows the resulting data on success. onCancel is required for the cancel
- * transition, and if onSave is provided it will call that after save for any
- * side effects in the parent.
- *
- * @example
- * ```js
- * <PkiGenerateRoot @model={{this.model}} @onCancel={{transition-to "vault.cluster"}} @onSave={{fn (mut this.title) "Successful"}} @adapterOptions={{hash actionType="import" useIssuer=false}} />
- * ```
- *
- * @param {Object} model - pki/action model.
- * @callback onCancel - Callback triggered when cancel button is clicked, after model is unloaded
- * @callback onSave - Optional - Callback triggered after model is saved, as a side effect. Results are shown on the same component
- * @callback onComplete - Callback triggered when "Done" button clicked, on results view
- * @param {Object} adapterOptions - object passed as adapterOptions on the model.save method
- */
-export default class PkiGenerateCsrComponent extends Component<Args> {
-  @service declare readonly flashMessages: FlashMessageService;
-
-  @tracked modelValidations: ValidationMap | null = null;
-  @tracked error: string | null = null;
-  @tracked alert: string | null = null;
-
-  formFields;
-  // fields rendered after CSR generation
-  showFields = ['csr', 'keyId', 'privateKey', 'privateKeyType'];
-
-  constructor(owner: unknown, args: Args) {
-    super(owner, args);
-    this.formFields = expandAttributeMeta(this.args.model, [
-      'type',
-      'commonName',
-      'excludeCnFromSans',
-      'format',
-      'subjectSerialNumber',
-      'addBasicConstraints',
-    ]);
-  }
-
-  @action
-  cancel() {
-    this.args.model.unloadRecord();
-    this.args.onCancel();
-  }
-
-  async getCapability(): Promise<boolean> {
-    try {
-      const issuerCapabilities = await this.args.model.generateIssuerCsrPath;
-      return issuerCapabilities.get('canCreate') === true;
-    } catch (error) {
-      return false;
-    }
-  }
-
-  @task
-  @waitFor
-  *save(event: Event): Generator<Promise<boolean | PkiActionModel>> {
-    event.preventDefault();
-    try {
-      const { model, onSave } = this.args;
-      const { isValid, state, invalidFormMessage } = model.validate();
-      if (isValid) {
-        const useIssuer = yield this.getCapability();
-        yield model.save({ adapterOptions: { actionType: 'generate-csr', useIssuer } });
-        this.flashMessages.success('Successfully generated CSR.');
-        // This component shows the results, but call `onSave` for any side effects on parent
-        if (onSave) {
-          onSave();
-        }
-        window?.scrollTo(0, 0);
-      } else {
-        this.modelValidations = state;
-        this.alert = invalidFormMessage;
-      }
-    } catch (e) {
-      this.error = errorMessage(e);
-      this.alert = 'There was a problem generating the CSR.';
-    }
-  }
-}
diff --git a/ui/lib/pki/addon/components/pki-generate-root.hbs b/ui/lib/pki/addon/components/pki-generate-root.hbs
deleted file mode 100644
index 01d7129b56473..0000000000000
--- a/ui/lib/pki/addon/components/pki-generate-root.hbs
+++ /dev/null
@@ -1,119 +0,0 @@
-{{! Show results if model has an ID, which is only generated after save }}
-{{#if @model.id}}
-  <main class="box is-fullwidth is-sideless is-paddingless is-marginless">
-    {{#each this.returnedFields as |field|}}
-      {{#let (find-by "name" field @model.allFields) as |attr|}}
-        {{#if attr.options.detailLinkTo}}
-          <InfoTableRow
-            @label={{capitalize (or attr.options.detailsLabel attr.options.label (humanize (dasherize attr.name)))}}
-            @value={{get @model attr.name}}
-            @addCopyButton={{or (eq attr.name "issuerId") (eq attr.name "keyId")}}
-          >
-            <LinkTo @route={{attr.options.detailLinkTo}} @model={{get @model attr.name}}>{{get @model attr.name}}</LinkTo>
-          </InfoTableRow>
-        {{else if attr.options.masked}}
-          <InfoTableRow
-            @label={{capitalize (or attr.options.detailsLabel attr.options.label (humanize (dasherize attr.name)))}}
-          >
-            <MaskedInput @value={{get @model attr.name}} @displayOnly={{true}} @allowCopy={{true}} />
-          </InfoTableRow>
-        {{else}}
-          <InfoTableRow
-            @label={{capitalize (or attr.options.detailsLabel attr.options.label (humanize (dasherize attr.name)))}}
-            @value={{get @model attr.name}}
-          />
-        {{/if}}
-      {{/let}}
-    {{/each}}
-    <InfoTableRow @label="Private key">
-      {{#if @model.privateKey}}
-        <MaskedInput @value={{@model.privateKey}} @displayOnly={{true}} @allowCopy={{true}} />
-      {{else}}
-        <span class="tag">internal</span>
-      {{/if}}
-    </InfoTableRow>
-    <InfoTableRow @label="Private key type" @value={{@model.privateKeyType}}>
-      <span class="{{unless @model.privateKeyType 'tag'}}">{{or @model.privateKeyType "internal"}}</span>
-    </InfoTableRow>
-    <ParsedCertificateInfoRows @model={{@model.parsedCertificate}} />
-  </main>
-  <footer>
-    <div class="field is-grouped is-fullwidth has-top-margin-l">
-      <div class="control">
-        <button type="button" class="button is-primary" {{on "click" @onComplete}} data-test-done>
-          Done
-        </button>
-      </div>
-    </div>
-  </footer>
-{{else}}
-  <form {{on "submit" (perform this.save)}} data-test-pki-config-generate-root-form>
-    <MessageError @errorMessage={{this.errorBanner}} class="has-top-margin-s" />
-    <h2 class="title is-size-5 has-border-bottom-light page-header" data-test-generate-root-title="Root parameters">
-      Root parameters
-    </h2>
-    {{#each this.defaultFields as |field|}}
-      {{#let (find-by "name" field @model.allFields) as |attr|}}
-        <FormField @attr={{attr}} @model={{@model}} @modelValidations={{this.modelValidations}} data-test-field>
-          {{#if (eq field "customTtl")}}
-            {{! customTtl attr has editType yield, which will render this }}
-            <PkiNotValidAfterForm @attr={{attr}} @model={{@model}} />
-          {{/if}}
-        </FormField>
-      {{/let}}
-    {{/each}}
-
-    <PkiGenerateToggleGroups @model={{@model}} @modelValidations={{this.modelValidations}} />
-
-    {{#if @urls}}
-      <fieldset class="box is-shadowless is-marginless is-borderless is-fullwidth" data-test-urls-section>
-        <h2
-          class="title is-size-5 page-header {{if @urls.canCreate 'has-border-bottom-light' 'is-borderless'}}"
-          data-test-generate-root-title="Issuer URLs"
-        >
-          Issuer URLs
-        </h2>
-        {{#if @urls.canSet}}
-          {{#each @urls.allFields as |attr|}}
-            {{#if (not (eq attr.name "mountPath"))}}
-              <FormField
-                @attr={{attr}}
-                @mode="create"
-                @model={{@urls}}
-                @showHelpText={{attr.options.showHelpText}}
-                data-test-urls-field
-              />
-            {{/if}}
-          {{/each}}
-        {{else}}
-          <EmptyState
-            @title="You do not have permissions to set URLs."
-            @message="These are not required but will need to be configured later. You can do this via the CLI or by changing your permissions and returning to this form."
-          />
-        {{/if}}
-      </fieldset>
-    {{/if}}
-
-    <div class="field is-grouped box is-fullwidth is-bottomless">
-      <div class="control">
-        <button type="submit" class="button is-primary" data-test-pki-generate-root-save>
-          Done
-        </button>
-        <button {{on "click" @onCancel}} type="button" class="button has-left-margin-s" data-test-pki-generate-root-cancel>
-          Cancel
-        </button>
-      </div>
-      {{#if this.invalidFormAlert}}
-        <div class="control">
-          <AlertInline
-            @type="danger"
-            @paddingTop={{true}}
-            @message={{this.invalidFormAlert}}
-            @mimicRefresh={{true}}
-            data-test-pki-generate-root-validation-error
-          />
-        </div>
-      {{/if}}
-    </div>
-  </form>
-{{/if}}
\ No newline at end of file
diff --git a/ui/lib/pki/addon/components/pki-generate-root.ts b/ui/lib/pki/addon/components/pki-generate-root.ts
deleted file mode 100644
index 5bd3c99f55a5c..0000000000000
--- a/ui/lib/pki/addon/components/pki-generate-root.ts
+++ /dev/null
@@ -1,130 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
-import { action } from '@ember/object';
-import { service } from '@ember/service';
-import { waitFor } from '@ember/test-waiters';
-import { tracked } from '@glimmer/tracking';
-import { task } from 'ember-concurrency';
-import errorMessage from 'vault/utils/error-message';
-import type PkiActionModel from 'vault/models/pki/action';
-import type PkiConfigUrlsModel from 'vault/models/pki/config/urls';
-import type FlashMessageService from 'vault/services/flash-messages';
-import type RouterService from '@ember/routing/router-service';
-import type { ValidationMap } from 'vault/vault/app-types';
-
-interface AdapterOptions {
-  actionType: string;
-  useIssuer: boolean | undefined;
-}
-interface Args {
-  model: PkiActionModel;
-  urls: PkiConfigUrlsModel;
-  onCancel: CallableFunction;
-  onComplete: CallableFunction;
-  onSave?: CallableFunction;
-  adapterOptions: AdapterOptions;
-  hideAlertBanner: boolean;
-}
-
-/**
- * @module PkiGenerateRoot
- * PkiGenerateRoot shows only the fields valid for the generate root endpoint.
- * This component renders the form, handles the model save and rollback actions,
- * and shows the resulting data on success. onCancel is required for the cancel
- * transition, and if onSave is provided it will call that after save for any
- * side effects in the parent.
- *
- * @example
- * ```js
- * <PkiGenerateRoot @model={{this.model}} @onCancel={{transition-to "vault.cluster"}} @onSave={{fn (mut this.title) "Successful"}} @adapterOptions={{hash actionType="import" useIssuer=false}} />
- * ```
- *
- * @param {Object} model - pki/action model.
- * @callback onCancel - Callback triggered when cancel button is clicked, after model is unloaded
- * @callback onSave - Optional - Callback triggered after model is saved, as a side effect. Results are shown on the same component
- * @callback onComplete - Callback triggered when "Done" button clicked, on results view
- * @param {Object} adapterOptions - object passed as adapterOptions on the model.save method
- */
-export default class PkiGenerateRootComponent extends Component<Args> {
-  @service declare readonly flashMessages: FlashMessageService;
-  @service declare readonly router: RouterService;
-
-  @tracked modelValidations: ValidationMap | null = null;
-  @tracked errorBanner = '';
-  @tracked invalidFormAlert = '';
-
-  get defaultFields() {
-    return [
-      'type',
-      'commonName',
-      'issuerName',
-      'customTtl',
-      'notBeforeDuration',
-      'format',
-      'permittedDnsDomains',
-      'maxPathLength',
-    ];
-  }
-
-  get returnedFields() {
-    return [
-      'certificate',
-      'commonName',
-      'issuerId',
-      'issuerName',
-      'issuingCa',
-      'keyName',
-      'keyId',
-      'serialNumber',
-    ];
-  }
-
-  @action cancel() {
-    // Generate root form will always have a new model
-    this.args.model.unloadRecord();
-    this.args.onCancel();
-  }
-
-  @action
-  checkFormValidity() {
-    if (this.args.model.validate) {
-      const { isValid, state, invalidFormMessage } = this.args.model.validate();
-      this.modelValidations = state;
-      this.invalidFormAlert = invalidFormMessage;
-      return isValid;
-    }
-    return true;
-  }
-
-  @task
-  @waitFor
-  *save(event: Event) {
-    event.preventDefault();
-    const continueSave = this.checkFormValidity();
-    if (!continueSave) return;
-    try {
-      yield this.args.model.save({ adapterOptions: this.args.adapterOptions });
-      // root generation must occur first in case templates are used for URL fields
-      // this way an issuer_id exists for backend to interpolate into the template
-      yield this.setUrls();
-      this.flashMessages.success('Successfully generated root.');
-      // This component shows the results, but call `onSave` for any side effects on parent
-      if (this.args.onSave) {
-        this.args.onSave();
-      }
-      window?.scrollTo(0, 0);
-    } catch (e) {
-      this.errorBanner = errorMessage(e);
-      this.invalidFormAlert = 'There was a problem generating the root.';
-    }
-  }
-
-  async setUrls() {
-    if (!this.args.urls || !this.args.urls.canSet || !this.args.urls.hasDirtyAttributes) return;
-    return this.args.urls.save();
-  }
-}
diff --git a/ui/lib/pki/addon/components/pki-generate-toggle-groups.hbs b/ui/lib/pki/addon/components/pki-generate-toggle-groups.hbs
deleted file mode 100644
index a210d33d13345..0000000000000
--- a/ui/lib/pki/addon/components/pki-generate-toggle-groups.hbs
+++ /dev/null
@@ -1,57 +0,0 @@
-{{#each-in this.groups as |group fields|}}
-  <ToggleButton
-    @isOpen={{eq this.showGroup group}}
-    @openLabel={{concat "Hide " group}}
-    @closedLabel={{group}}
-    @onClick={{fn this.toggleGroup group}}
-    class="is-block"
-    data-test-toggle-group={{group}}
-  />
-  {{#if (eq this.showGroup group)}}
-    <div class="box is-marginless" data-test-group={{group}}>
-      {{#if (eq group "Key parameters")}}
-        <p class="has-bottom-margin-m" data-test-toggle-group-description>
-          {{#if (eq @model.type "internal")}}
-            This certificate type is internal. This means that the private key will not be returned and cannot be retrieved
-            later. Below, you will name the key and define its type and key bits.
-          {{else if (eq @model.type "kms")}}
-            This certificate type is kms, meaning managed keys will be used. Below, you will name the key and tell Vault
-            where to find it in your KMS or HSM.
-            <DocLink @path="/vault/docs/enterprise/managed-keys">Learn more about managed keys.</DocLink>
-          {{else if (eq @model.type "exported")}}
-            This certificate type is exported. This means the private key will be returned in the response. Below, you will
-            name the key and define its type and key bits.
-          {{else if (eq @model.type "existing")}}
-            You chose to use an existing key. This means that we’ll use the key reference to create the CSR or root. Please
-            provide the reference to the key.
-          {{else}}
-            Please choose a type to see key parameter options.
-          {{/if}}
-        </p>
-        {{#if this.keyParamFields}}
-          <PkiKeyParameters @model={{@model}} @fields={{this.keyParamFields}} @modelValidations={{@modelValidations}} />
-        {{/if}}
-      {{else}}
-        <p class="has-bottom-margin-m" data-test-toggle-group-description>
-          {{#if (eq group "Subject Alternative Name (SAN) Options")}}
-            SAN fields are an extension that allow you specify additional host names (sites, IP addresses, common names,
-            etc.) to be protected by a single certificate.
-          {{else if (eq group "Additional subject fields")}}
-            These fields provide more information about the client to which the certificate belongs.
-          {{/if}}
-        </p>
-        {{#each fields as |fieldName|}}
-          {{#let (find-by "name" fieldName @model.allFields) as |attr|}}
-            <FormField
-              data-test-field
-              @attr={{attr}}
-              @model={{@model}}
-              @showHelpText={{false}}
-              @modelValidations={{@modelValidations}}
-            />
-          {{/let}}
-        {{/each}}
-      {{/if}}
-    </div>
-  {{/if}}
-{{/each-in}}
\ No newline at end of file
diff --git a/ui/lib/pki/addon/components/pki-generate-toggle-groups.ts b/ui/lib/pki/addon/components/pki-generate-toggle-groups.ts
deleted file mode 100644
index 9ab64c1f87cf3..0000000000000
--- a/ui/lib/pki/addon/components/pki-generate-toggle-groups.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
-import { tracked } from '@glimmer/tracking';
-import { action } from '@ember/object';
-import { keyParamsByType } from 'pki/utils/action-params';
-import type PkiActionModel from 'vault/models/pki/action';
-import type { ModelValidations } from 'vault/vault/app-types';
-
-interface Args {
-  model: PkiActionModel;
-  groups: Map<[key: string], Array<string>> | null;
-  modelValidations?: ModelValidations;
-}
-
-export default class PkiGenerateToggleGroupsComponent extends Component<Args> {
-  @tracked showGroup: string | null = null;
-
-  get keyParamFields() {
-    const { type } = this.args.model;
-    if (!type) return null;
-    const fields = keyParamsByType(type);
-    return fields.map((fieldName) => {
-      return this.args.model.allFields.find((attr) => attr.name === fieldName);
-    });
-  }
-
-  get groups() {
-    if (this.args.groups) return this.args.groups;
-    const groups = {
-      'Key parameters': this.keyParamFields,
-      'Subject Alternative Name (SAN) Options': ['altNames', 'ipSans', 'uriSans', 'otherSans'],
-      'Additional subject fields': [
-        'ou',
-        'organization',
-        'country',
-        'locality',
-        'province',
-        'streetAddress',
-        'postalCode',
-      ],
-    };
-    // excludeCnFromSans and serialNumber are present in default fields for generate-csr -- only include for other types
-    if (this.args.model.actionType !== 'generate-csr') {
-      groups['Subject Alternative Name (SAN) Options'].unshift('excludeCnFromSans', 'subjectSerialNumber');
-    }
-    return groups;
-  }
-
-  @action
-  toggleGroup(group: string, isOpen: boolean) {
-    this.showGroup = isOpen ? group : null;
-  }
-}
diff --git a/ui/lib/pki/addon/components/pki-import-pem-bundle.hbs b/ui/lib/pki/addon/components/pki-import-pem-bundle.hbs
deleted file mode 100644
index 33b20fa27d178..0000000000000
--- a/ui/lib/pki/addon/components/pki-import-pem-bundle.hbs
+++ /dev/null
@@ -1,89 +0,0 @@
-{{#if this.importedResponse}}
-  <div class="is-flex-start has-top-margin-xs">
-    <div class="is-flex-1 basis-0 has-text-grey has-bottom-margin-xs">
-      <h2>
-        Imported Issuer
-      </h2>
-    </div>
-    <div class="is-flex-1 basis-0 has-text-grey has-bottom-margin-xs">
-      <h2>
-        Imported Key
-      </h2>
-    </div>
-  </div>
-  <div class="box is-fullwidth is-sideless is-marginless is-paddingless" data-test-imported-bundle-mapping>
-    {{#each this.importedResponse as |imported|}}
-      <div
-        class="box is-marginless no-top-shadow has-slim-padding"
-        data-test-import-pair={{concat imported.issuer "_" imported.key}}
-      >
-        <div class="is-flex-start">
-          <div class="is-flex-1 basis-0 has-bottom-margin-xs" data-test-imported-issuer>
-            {{#if imported.issuer}}
-              <LinkTo @route="issuers.issuer.details" @model={{imported.issuer}}>
-                {{imported.issuer}}
-              </LinkTo>
-            {{else}}
-              None
-            {{/if}}
-          </div>
-          <div class="is-flex-1 basis-0 has-bottom-margin-xs" data-test-imported-key>
-            {{#if imported.key}}
-              <LinkTo @route="keys.key.details" @model={{imported.key}}>
-                {{imported.key}}
-              </LinkTo>
-            {{else}}
-              None
-            {{/if}}
-          </div>
-        </div>
-      </div>
-    {{/each}}
-  </div>
-  <footer>
-    <div class="field is-grouped is-fullwidth has-top-margin-l">
-      <div class="control">
-        <button type="button" class="button is-primary" {{on "click" @onComplete}} data-test-done>
-          Done
-        </button>
-      </div>
-    </div>
-  </footer>
-{{else}}
-  <div class="field">
-    <div class="form-section">
-      <label class="title is-5 has-top-padding-m" data-test-import-section-label>
-        Certificate parameters
-      </label>
-      <form {{on "submit" (perform this.submitForm)}} data-test-pki-import-pem-bundle-form>
-        <MessageError @errorMessage={{this.errorBanner}} class="has-top-margin-s" />
-        <div class="box is-sideless is-fullwidth is-marginless has-top-padding-l">
-          <TextFile @onChange={{this.onFileUploaded}} @label="PEM Bundle" />
-          <p class="has-top-margin-m has-bottom-margin-l">
-            Issuer URLs (Issuing certificates, CRL distribution points, OCSP servers, and delta CRL URLs) can be specified by
-            editing the individual issuer once it is uploaded to Vault.
-          </p>
-        </div>
-        <div class="has-top-padding-s">
-          <button
-            type="submit"
-            class="button is-primary {{if this.submitForm.isRunning 'is-loading'}}"
-            disabled={{this.submitForm.isRunning}}
-            data-test-pki-import-pem-bundle
-          >
-            Import issuer
-          </button>
-          <button
-            type="button"
-            class="button has-left-margin-s"
-            disabled={{this.submitForm.isRunning}}
-            {{on "click" this.cancel}}
-            data-test-pki-ca-cert-cancel
-          >
-            Cancel
-          </button>
-        </div>
-      </form>
-    </div>
-  </div>
-{{/if}}
\ No newline at end of file
diff --git a/ui/lib/pki/addon/components/pki-import-pem-bundle.ts b/ui/lib/pki/addon/components/pki-import-pem-bundle.ts
deleted file mode 100644
index e8dc5a5e64168..0000000000000
--- a/ui/lib/pki/addon/components/pki-import-pem-bundle.ts
+++ /dev/null
@@ -1,107 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
-import { action } from '@ember/object';
-import { inject as service } from '@ember/service';
-import { task } from 'ember-concurrency';
-import { tracked } from '@glimmer/tracking';
-import { waitFor } from '@ember/test-waiters';
-import errorMessage from 'vault/utils/error-message';
-import type FlashMessageService from 'vault/services/flash-messages';
-import type PkiActionModel from 'vault/models/pki/action';
-
-/**
- * @module PkiImportPemBundle
- * PkiImportPemBundle components are used to import PKI CA certificates and keys via pem_bundle.
- * https://github.com/hashicorp/vault/blob/main/website/content/api-docs/secret/pki.mdx#import-ca-certificates-and-keys
- *
- * @example
- * ```js
- * <PkiImportPemBundle @model={{this.model}} />
- * ```
- *
- * @param {Object} model - certificate model from route
- * @callback onCancel - Callback triggered when cancel button is clicked.
- * @callback onSave - Callback triggered on submit success.
- * @callback onComplete - Callback triggered on "done" button click.
- */
-
-interface AdapterOptions {
-  actionType: string;
-  useIssuer: boolean | undefined;
-}
-interface Args {
-  onSave?: CallableFunction;
-  onCancel: CallableFunction;
-  onComplete: CallableFunction;
-  model: PkiActionModel;
-  adapterOptions: AdapterOptions;
-}
-
-export default class PkiImportPemBundle extends Component<Args> {
-  @service declare readonly flashMessages: FlashMessageService;
-
-  @tracked errorBanner = '';
-
-  get importedResponse() {
-    const { mapping, importedIssuers, importedKeys } = this.args.model;
-    // Even if there are no imported items, mapping will be an empty object from API response
-    if (undefined === mapping) return null;
-
-    const importList = (importedIssuers || []).map((issuer: string) => {
-      const key = mapping[issuer];
-      return { issuer, key };
-    });
-
-    // Check each imported key and make sure it's in the list
-    (importedKeys || []).forEach((key) => {
-      const matchIdx = importList.findIndex((item) => item.key === key);
-      // If key isn't accounted for, add it without a matching issuer
-      if (matchIdx === -1) {
-        importList.push({ issuer: '', key });
-      }
-    });
-
-    if (importList.length === 0) {
-      // If no new items were imported but the import call was successful, the UI will show accordingly
-      return [{ issuer: '', key: '' }];
-    }
-    return importList;
-  }
-
-  @task
-  @waitFor
-  *submitForm(event: Event) {
-    event.preventDefault();
-    this.errorBanner = '';
-    if (!this.args.model.pemBundle) {
-      this.errorBanner = 'please upload your PEM bundle';
-      return;
-    }
-    try {
-      yield this.args.model.save({ adapterOptions: this.args.adapterOptions });
-      this.flashMessages.success('Successfully imported data.');
-      // This component shows the results, but call `onSave` for any side effects on parent
-      if (this.args.onSave) {
-        this.args.onSave();
-      }
-      window?.scrollTo(0, 0);
-    } catch (error) {
-      this.errorBanner = errorMessage(error);
-    }
-  }
-
-  @action
-  onFileUploaded({ value }: { value: string }) {
-    this.args.model.pemBundle = value;
-  }
-
-  @action
-  cancel() {
-    this.args.model.unloadRecord();
-    this.args.onCancel();
-  }
-}
diff --git a/ui/lib/pki/addon/components/pki-info-table-rows.hbs b/ui/lib/pki/addon/components/pki-info-table-rows.hbs
deleted file mode 100644
index 5799ff3c773e3..0000000000000
--- a/ui/lib/pki/addon/components/pki-info-table-rows.hbs
+++ /dev/null
@@ -1,26 +0,0 @@
-{{#each @displayFields as |field|}}
-  {{#let (find-by "name" field @model.allFields) as |attr|}}
-    {{#let (get @model attr.name) as |value|}}
-      {{! only render if there's a value, unless it's the commonName or privateKey/Type }}
-      {{#if (or value (or (eq attr.name "commonName") (eq attr.name "privateKey") (eq attr.name "privateKeyType")))}}
-        <InfoTableRow
-          @label={{or attr.options.label (humanize (dasherize attr.name))}}
-          @value={{value}}
-          @addCopyButton={{or (eq attr.name "issuerId") (eq attr.name "keyId")}}
-        >
-          {{#if (and attr.options.masked value)}}
-            <MaskedInput @value={{value}} @displayOnly={{true}} @allowCopy={{true}} />
-          {{else if attr.options.detailLinkTo}}
-            <LinkTo @route={{attr.options.detailLinkTo}} @model={{value}}>{{value}}</LinkTo>
-          {{else if (or (eq attr.name "privateKey") (eq attr.name "privateKeyType"))}}
-            <span class="{{unless value 'tag'}}">{{or value "internal"}}</span>
-          {{else if attr.options.formatDate}}
-            {{date-format value "MMM d yyyy HH:mm:ss a zzzz"}}
-          {{else}}
-            {{value}}
-          {{/if}}
-        </InfoTableRow>
-      {{/if}}
-    {{/let}}
-  {{/let}}
-{{/each}}
\ No newline at end of file
diff --git a/ui/lib/pki/addon/components/pki-issuer-cross-sign.hbs b/ui/lib/pki/addon/components/pki-issuer-cross-sign.hbs
deleted file mode 100644
index cba1504dadf66..0000000000000
--- a/ui/lib/pki/addon/components/pki-issuer-cross-sign.hbs
+++ /dev/null
@@ -1,110 +0,0 @@
-<h3 class="title is-4">Intermediates</h3>
-<div class="box is-fullwidth has-only-top-shadow">
-  <p class="has-bottom-margin-l">
-    Intermediates are identified by specifying the mount path and the issuer’s current name, as well as the new name it will
-    have when it is imported to Vault.
-  </p>
-  {{#if this.signedIssuers}}
-    <h2 data-test-cross-sign-status-count class="title is-5">Cross-signing complete ({{this.statusCount}})</h2>
-    <p class="has-bottom-margin-xl">
-      The next step is to
-      <DocLink class="has-font-weight-normal" @path="/vault/docs/secrets/pki/rotation-primitives#notes-on-manual_chain">
-        update the manual_chain<Icon @name="docs-link" />
-      </DocLink>
-      for each of your new certificates listed below, and the existing issuer.
-    </p>
-    <div class="is-flex-start">
-      {{#each this.inputFields as |column|}}
-        <div class="is-flex-1 basis-0 has-text-grey has-bottom-margin-xs">
-          <h2 data-test-info-table-label={{column.key}}>
-            {{column.label}}
-            {{#if column.helpText}}
-              <InfoTooltip @verticalPosition="above" @horizontalPosition="center">{{column.helpText}}</InfoTooltip>
-            {{/if}}
-          </h2>
-        </div>
-      {{/each}}
-    </div>
-    <div class="box is-fullwidth is-sideless">
-      {{#each this.signedIssuers as |crossSignRow idx|}}
-        <div class="box is-marginless no-top-shadow has-slim-padding">
-          <div data-test-info-table-row={{idx}} class="is-flex-start">
-            <Icon
-              @name={{if crossSignRow.hasError "alert-circle-fill" "check-circle"}}
-              class={{if crossSignRow.hasError "has-text-danger" "has-text-success"}}
-            />
-            {{#each (map-by "key" this.inputFields) as |columnAttr|}}
-              {{#let (get crossSignRow columnAttr) as |data|}}
-                <div data-test-info-table-column={{columnAttr}} class="is-flex-1 basis-0 has-bottom-margin-xs">
-                  {{#if (eq columnAttr "intermediateMount")}}
-                    <LinkTo class="has-text-black has-text-weight-semibold" @route="overview" @model={{data}}>
-                      {{data}}
-                    </LinkTo>
-                  {{else if crossSignRow.hasError}}
-                    <span class="has-text-grey has-text-weight-semibold">
-                      {{data}}
-                    </span>
-                  {{else}}
-                    <LinkToExternal
-                      class="has-text-black has-text-weight-semibold"
-                      @route="externalMountIssuer"
-                      @models={{array (get crossSignRow "intermediateMount") data.issuerId}}
-                    >
-                      {{data.issuerRef}}
-                    </LinkToExternal>
-                  {{/if}}
-                </div>
-              {{/let}}
-            {{/each}}
-          </div>
-          {{#if crossSignRow.hasError}}
-            <AlertBanner
-              @type="danger"
-              @title={{if crossSignRow.hasUnsupportedParams crossSignRow.hasError "Cross-sign failed"}}
-              @message={{if crossSignRow.hasUnsupportedParams crossSignRow.hasUnsupportedParams crossSignRow.hasError}}
-              class="message-marginless"
-            />
-          {{/if}}
-        </div>
-      {{/each}}
-    </div>
-    <button
-      type="button"
-      class="button is-primary"
-      {{on "click" (transition-to "vault.cluster.secrets.backend.pki.issuers.issuer.details")}}
-      data-test-cross-sign-done
-    >
-      Done
-    </button>
-    <button type="button" class="button has-left-margin-s" data-test-cross-sign-more {{on "click" this.reset}}>
-      Sign more issuers
-    </button>
-  {{else}}
-    <form {{on "submit" (perform this.submit)}} data-test-cross-sign-form>
-      <ObjectListInput
-        @objectKeys={{this.inputFields}}
-        @onChange={{fn (mut this.formData)}}
-        @validationErrors={{this.validationErrors}}
-      />
-      <div class="control box is-fullwidth has-only-top-shadow">
-        <button
-          type="submit"
-          class="button is-primary {{if this.submit.isRunning 'is-loading'}}"
-          disabled={{this.submit.isRunning}}
-          data-test-cross-sign-submit
-        >
-          Cross-sign
-        </button>
-        <button
-          type="button"
-          class="button has-left-margin-s"
-          disabled={{this.submit.isRunning}}
-          {{on "click" (transition-to "vault.cluster.secrets.backend.pki.issuers.issuer.details")}}
-          data-test-cross-sign-cancel
-        >
-          Cancel
-        </button>
-      </div>
-    </form>
-  {{/if}}
-</div>
\ No newline at end of file
diff --git a/ui/lib/pki/addon/components/pki-issuer-cross-sign.js b/ui/lib/pki/addon/components/pki-issuer-cross-sign.js
deleted file mode 100644
index 7d0609b9cf925..0000000000000
--- a/ui/lib/pki/addon/components/pki-issuer-cross-sign.js
+++ /dev/null
@@ -1,253 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
-import { action } from '@ember/object';
-import { task } from 'ember-concurrency';
-import { inject as service } from '@ember/service';
-import { tracked } from '@glimmer/tracking';
-import errorMessage from 'vault/utils/error-message';
-import { waitFor } from '@ember/test-waiters';
-import { parseCertificate } from 'vault/utils/parse-pki-cert';
-/**
- * @module PkiIssuerCrossSign
- * PkiIssuerCrossSign components render from a parent issuer's details page to cross-sign an intermediate issuer (from a different mount).
- * The component reads an existing intermediate issuer, cross-signs it with a parent issuer and imports the new
- * issuer into the existing intermediate mount using three inputs from the user:
- * intermediateMount (the mount path where the issuer to be cross signed lives)
- * intermediateIssuer (the name of the intermediate issuer, located in the above mount)
- * newCrossSignedIssuer (the name of the to-be-cross-signed, new issuer)
- *
- * The requests involved and how those inputs are used:
- * 1. Read an existing intermediate issuer
- *    -> GET /:intermediateMount/issuer/:intermediateIssuer
- * 2. Create a new CSR based on this existing issuer ID
- *    -> POST /:intermediateMount/intermediate/generate/existing
- * 3. Sign it with the new parent issuer, minting a new certificate.
- *    -> POST /this.args.parentIssuer.backend/issuer/this.args.parentIssuer.issuerRef/sign-intermediate
- * 4. Import it back into the existing mount
- *    -> POST /:intermediateMount/issuers/import/bundle
- * 5. Read the imported issuer
- *    -> GET /:intermediateMount/issuer/:issuer_id
- * 6. Update this issuer with the newCrossSignedIssuer
- *    -> POST /:intermediateMount/issuer/:issuer_id
- *
- * @example
- * ```js
- * <PkiIssuerCrossSign @parentIssuer={{this.model}} />
- * ```
- * @param {object} parentIssuer - the model of the issuing certificate that will sign the issuer to-be cross-signed
- */
-
-export default class PkiIssuerCrossSign extends Component {
-  @service store;
-  @tracked formData = [];
-  @tracked signedIssuers = [];
-  @tracked intermediateIssuers = {};
-  @tracked validationErrors = [];
-
-  inputFields = [
-    {
-      label: 'Mount path',
-      key: 'intermediateMount',
-      placeholder: 'Mount path',
-      helpText: 'The mount in which your new certificate can be found.',
-    },
-    {
-      label: "Issuer's current name",
-      key: 'intermediateIssuer',
-      placeholder: 'Current issuer name',
-      helpText: 'The API name of the previous intermediate which was cross-signed.',
-    },
-    {
-      label: 'New issuer name',
-      key: 'newCrossSignedIssuer',
-      placeholder: 'Enter a new issuer name',
-      helpText: `This is your new issuer’s name in the API.`,
-    },
-  ];
-
-  get statusCount() {
-    const error = this.signedIssuers.filter((issuer) => issuer.hasError).length;
-    const success = this.signedIssuers.length - error;
-    return `${success} successful, ${error} ${error === 1 ? 'error' : 'errors'}`;
-  }
-
-  @task
-  @waitFor
-  *submit(e) {
-    e.preventDefault();
-    this.signedIssuers = [];
-    this.validationErrors = [];
-
-    // Validate name input for new issuer does not already exist in mount
-    for (let row = 0; row < this.formData.length; row++) {
-      const { intermediateMount, newCrossSignedIssuer } = this.formData[row];
-      const issuers = yield this.store
-        .query('pki/issuer', { backend: intermediateMount })
-        .then((resp) => resp.map(({ issuerName, issuerId }) => ({ issuerName, issuerId })))
-        .catch(() => []);
-
-      // for cross-signing error handling we want to record the list of issuers before the process starts
-      this.intermediateIssuers[intermediateMount] = issuers;
-      this.validationErrors.addObject({
-        newCrossSignedIssuer: this.nameValidation(newCrossSignedIssuer, issuers),
-      });
-    }
-    if (this.validationErrors.any((row) => !row.newCrossSignedIssuer.isValid)) return;
-
-    // iterate through submitted data and cross-sign each certificate
-    for (let row = 0; row < this.formData.length; row++) {
-      const { intermediateMount, intermediateIssuer, newCrossSignedIssuer } = this.formData[row];
-      try {
-        // returns data from existing and newly cross-signed issuers
-        // { intermediateIssuer: existingIssuer, newCrossSignedIssuer: crossSignedIssuer, intermediateMount: intMount }
-        const data = yield this.crossSignIntermediate(
-          intermediateMount,
-          intermediateIssuer,
-          newCrossSignedIssuer
-        );
-        this.signedIssuers.addObject({ ...data, hasError: false });
-      } catch (error) {
-        this.signedIssuers.addObject({
-          ...this.formData[row],
-          hasError: errorMessage(error),
-          hasUnsupportedParams: error.cause ? error.cause.map((e) => e.message).join(', ') : null,
-        });
-      }
-    }
-  }
-
-  @action
-  async crossSignIntermediate(intMount, intName, newCrossSignedIssuer) {
-    // 1. Fetch issuer we want to sign
-    // What/Recovery: any failure is early enough that you can bail safely/normally.
-    const existingIssuer = await this.store.queryRecord('pki/issuer', {
-      backend: intMount,
-      id: intName,
-    });
-
-    // Return if user is attempting to self-sign issuer
-    if (existingIssuer.issuerId === this.args.parentIssuer.issuerId) {
-      throw new Error('Cross-signing a root issuer with itself must be performed manually using the CLI.');
-    }
-
-    // Translate certificate values to API parameters to pass along: CSR -> Signed CSR -> Cross-Signed issuer
-    // some of these values do not apply to a CSR, but pass anyway. If there is any issue parsing the certificate,
-    // (ex. the certificate contains unsupported values) direct user to manually cross-sign via CLI
-    const certData = parseCertificate(existingIssuer.certificate);
-    if (certData.parsing_errors.length > 0) {
-      throw new Error('Certificate must be manually cross-signed using the CLI.', {
-        cause: certData.parsing_errors,
-      });
-    }
-
-    // 2. Create the new CSR
-    // What/Recovery: any failure is early enough that you can bail safely/normally.
-    const newCsr = await this.store
-      .createRecord('pki/action', {
-        keyRef: existingIssuer.keyId,
-        commonName: existingIssuer.commonName,
-        type: 'existing',
-        ...certData,
-      })
-      .save({
-        adapterOptions: { actionType: 'generate-csr', mount: intMount, useIssuer: false },
-      })
-      .then(({ csr }) => csr);
-
-    // 3. Sign newCSR with correct parent to create cross-signed cert, "issuing"
-    // an intermediate certificate.
-    // What/Recovery: any failure is early enough that you can bail safely/normally.
-    const signedCaChain = await this.store
-      .createRecord('pki/action', {
-        csr: newCsr,
-        commonName: existingIssuer.commonName,
-        ...certData,
-      })
-      .save({
-        adapterOptions: {
-          actionType: 'sign-intermediate',
-          mount: this.args.parentIssuer.backend,
-          issuerRef: this.args.parentIssuer.issuerRef,
-        },
-      })
-      .then(({ caChain }) => caChain.join('\n'));
-
-    // 4. Import the newly cross-signed cert to become an issuer
-    // What/Recovery:
-    //   1. Permission issue -> give the cert (`signedCaChain`) to the user,
-    //      let them import & name. (Issue you have is that you already issued
-    //      it (step 3) and so "undo" would mean revoking the cert, which
-    //      you might not have permissions to do either).
-    //
-    //   2. CRL rebuilding fails ("the CRL" in error message). Server returns
-    //      an error, we wanted the CRL rebuilt -- but the issuer was still
-    //      imported anyways. Only way to detect would be to do a list issuers
-    //      before and after. Recovery would be on the operator in this case;
-    //      reproduce the error and let them deal with it.
-    //
-    // End result: user should solve this issue, but we shouldn't undo anything
-    // either.
-    //
-    //    -> For 1 though, make sure to give the `signedCaChain` in the
-    //       error message for them.
-    //    -> For 2, you could list before and after to find the id of the
-    //       new issuer(s) so they can name them and fix any issues with
-    //       them.
-    //
-    // If its not a permissions error _and_ you did two lists, not finding
-    // a new issuer...
-    //
-    //    -> Unknown error. Could give them `signedCaChain` and serial of
-    //       the newly issued intermediate CA, so that they can do recovery
-    //       as they'd like.
-    const issuerId = await this.store
-      .createRecord('pki/action', { pemBundle: signedCaChain })
-      .save({ adapterOptions: { actionType: 'import', mount: intMount, useIssuer: true } })
-      .then((importedIssuer) => {
-        return Object.keys(importedIssuer.mapping).find(
-          // matching key is the issuer_id
-          (key) => importedIssuer.mapping[key] === existingIssuer.keyId
-        );
-      })
-      .catch((e) => {
-        console.debug('CA_CHAIN \n', signedCaChain); // eslint-disable-line
-        throw new Error(`${errorMessage(e)} See console for signed ca_chain data.`);
-      });
-
-    // 5. Fetch issuer imported above by issuer_id, name and save
-    // Recovery: cosmetic issue; can let the user deal with it. Usually
-    // fails because the name is in use.
-    // Pre-fix: list all issuers, check the desired name isn't either
-    // an existing issuer_id or an issuer_name.
-    const crossSignedIssuer = await this.store.queryRecord('pki/issuer', { backend: intMount, id: issuerId });
-    crossSignedIssuer.issuerName = newCrossSignedIssuer;
-    await crossSignedIssuer.save({ adapterOptions: { mount: intMount } });
-
-    // 6. Return the data to our caller.
-    return {
-      intermediateIssuer: existingIssuer,
-      newCrossSignedIssuer: crossSignedIssuer,
-      intermediateMount: intMount,
-    };
-  }
-
-  @action
-  reset() {
-    this.signedIssuers = [];
-    this.validationErrors = [];
-    this.formData = [];
-  }
-
-  nameValidation(nameInput, existing) {
-    if (existing.any((i) => i.issuerName === nameInput || i.issuerId === nameInput))
-      return {
-        errors: [`Issuer reference '${nameInput}' already exists in this mount.`],
-        isValid: false,
-      };
-    return { errors: [], isValid: true };
-  }
-}
diff --git a/ui/lib/pki/addon/components/pki-key-form.hbs b/ui/lib/pki/addon/components/pki-key-form.hbs
deleted file mode 100644
index ef65e9d45a087..0000000000000
--- a/ui/lib/pki/addon/components/pki-key-form.hbs
+++ /dev/null
@@ -1,63 +0,0 @@
-<form {{on "submit" (perform this.save)}}>
-  <div class="box is-sideless is-fullwidth is-marginless">
-    <MessageError @errorMessage={{this.errorBanner}} class="has-top-margin-s" />
-    <NamespaceReminder @mode={{if @model.isNew "generate" "update"}} @noun="PKI key" />
-    {{#if @model.isNew}}
-      {{#each @model.formFieldGroups as |fieldGroup|}}
-        {{#each-in fieldGroup as |group fields|}}
-          {{#if (eq group "Key parameters")}}
-            <PkiKeyParameters @model={{@model}} @fields={{fields}} @modelValidations={{this.modelValidations}} />
-          {{else}}
-            {{#each fields as |attr|}}
-              <FormField
-                data-test-field={{attr}}
-                @attr={{attr}}
-                @model={{@model}}
-                @modelValidations={{this.modelValidations}}
-                @showHelpText={{false}}
-              />
-            {{/each}}
-          {{/if}}
-        {{/each-in}}
-      {{/each}}
-    {{else}}
-      {{! only key name is edit-able }}
-      {{#let (find-by "name" "keyName" @model.formFields) as |keyName|}}
-        <FormField data-test-field={{keyName}} @attr={{keyName}} @model={{@model}} @showHelpText={{false}} />
-      {{/let}}
-      {{#let (find-by "name" "keyType" @model.formFields) as |keyType|}}
-        <ReadonlyFormField @attr={{keyType}} @value={{@model.keyType}} />
-      {{/let}}
-    {{/if}}
-  </div>
-  <div class="has-top-padding-s">
-    <button
-      type="submit"
-      class="button is-primary {{if this.save.isRunning 'is-loading'}}"
-      disabled={{this.save.isRunning}}
-      data-test-pki-key-save
-    >
-      {{if @model.isNew "Generate key" "Edit key"}}
-    </button>
-    <button
-      type="button"
-      class="button has-left-margin-s"
-      disabled={{this.save.isRunning}}
-      {{on "click" @onCancel}}
-      data-test-pki-key-cancel
-    >
-      Cancel
-    </button>
-    {{#if this.invalidFormAlert}}
-      <div class="control">
-        <AlertInline
-          @type="danger"
-          @paddingTop={{true}}
-          @message={{this.invalidFormAlert}}
-          @mimicRefresh={{true}}
-          data-test-pki-key-validation-error
-        />
-      </div>
-    {{/if}}
-  </div>
-</form>
\ No newline at end of file
diff --git a/ui/lib/pki/addon/components/pki-key-form.ts b/ui/lib/pki/addon/components/pki-key-form.ts
deleted file mode 100644
index 721c304e327de..0000000000000
--- a/ui/lib/pki/addon/components/pki-key-form.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
-import { inject as service } from '@ember/service';
-import { task } from 'ember-concurrency';
-import { tracked } from '@glimmer/tracking';
-import { waitFor } from '@ember/test-waiters';
-import errorMessage from 'vault/utils/error-message';
-import type FlashMessageService from 'vault/services/flash-messages';
-import type PkiKeyModel from 'vault/models/pki/key';
-import type { ValidationMap } from 'vault/app-types';
-
-/**
- * @module PkiKeyForm
- * PkiKeyForm components are used to create and update PKI keys.
- *
- * @example
- * ```js
- * <PkiKeyForm @model={{this.model}} @onCancel={{transition-to "vault.cluster"}} @onSave={{transition-to "vault.cluster"}} />
- * ```
- *
- * @param {Object} model - pki/key model.
- * @callback onCancel - Callback triggered when cancel button is clicked.
- * @callback onSave - Callback triggered on save success.
- */
-
-interface Args {
-  model: PkiKeyModel;
-  onSave: CallableFunction;
-}
-
-export default class PkiKeyForm extends Component<Args> {
-  @service declare readonly flashMessages: FlashMessageService;
-
-  @tracked errorBanner = '';
-  @tracked invalidFormAlert = '';
-  @tracked modelValidations: ValidationMap | null = null;
-
-  @task
-  @waitFor
-  *save(event: Event) {
-    event.preventDefault();
-    try {
-      const { isNew, keyName } = this.args.model;
-      const { isValid, state, invalidFormMessage } = this.args.model.validate();
-      if (isNew) {
-        this.modelValidations = isValid ? null : state;
-        this.invalidFormAlert = invalidFormMessage;
-      }
-      if (!isValid && isNew) return;
-      yield this.args.model.save({ adapterOptions: { import: false } });
-      this.flashMessages.success(
-        `Successfully ${isNew ? 'generated' : 'updated'} key${keyName ? ` ${keyName}.` : '.'}`
-      );
-      this.args.onSave();
-    } catch (error) {
-      this.errorBanner = errorMessage(error);
-      this.invalidFormAlert = 'There was an error submitting this form.';
-    }
-  }
-}
diff --git a/ui/lib/pki/addon/components/pki-key-import.hbs b/ui/lib/pki/addon/components/pki-key-import.hbs
deleted file mode 100644
index 1f541fc263037..0000000000000
--- a/ui/lib/pki/addon/components/pki-key-import.hbs
+++ /dev/null
@@ -1,45 +0,0 @@
-<form {{on "submit" (perform this.submitForm)}} data-test-pki-key-import-form>
-  <MessageError @errorMessage={{this.errorBanner}} class="has-top-margin-s" />
-  <div class="box is-sideless is-fullwidth is-marginless">
-    <p class="has-bottom-margin-l">
-      Use this form to import a single pem encoded rsa, ec, or ed25519 key.
-      <DocLink @path="/vault/api-docs/secret/pki#import-key">
-        Learn more here.
-      </DocLink>
-    </p>
-    {{#let (find-by "name" "keyName" @model.formFields) as |attr|}}
-      <FormField data-test-field={{attr}} @attr={{attr}} @model={{@model}} @showHelpText={{false}} />
-    {{/let}}
-    <TextFile @onChange={{this.onFileUploaded}} @label="PEM Bundle" data-test-pki-key-file />
-  </div>
-  <div class="has-top-padding-s">
-    <button
-      type="submit"
-      class="button is-primary {{if this.submitForm.isRunning 'is-loading'}}"
-      disabled={{this.submitForm.isRunning}}
-      data-test-pki-key-import
-    >
-      Import key
-    </button>
-    <button
-      type="button"
-      class="button has-left-margin-s"
-      disabled={{this.submitForm.isRunning}}
-      {{on "click" this.cancel}}
-      data-test-pki-key-cancel
-    >
-      Cancel
-    </button>
-    {{#if this.invalidFormAlert}}
-      <div class="control">
-        <AlertInline
-          @type="danger"
-          @paddingTop={{true}}
-          @message={{this.invalidFormAlert}}
-          @mimicRefresh={{true}}
-          data-test-pki-key-validation-error
-        />
-      </div>
-    {{/if}}
-  </div>
-</form>
\ No newline at end of file
diff --git a/ui/lib/pki/addon/components/pki-key-import.ts b/ui/lib/pki/addon/components/pki-key-import.ts
deleted file mode 100644
index 652e9a86ab5b3..0000000000000
--- a/ui/lib/pki/addon/components/pki-key-import.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
-import { action } from '@ember/object';
-import { task } from 'ember-concurrency';
-import { tracked } from '@glimmer/tracking';
-import { waitFor } from '@ember/test-waiters';
-import { inject as service } from '@ember/service';
-import trimRight from 'vault/utils/trim-right';
-import errorMessage from 'vault/utils/error-message';
-import type PkiKeyModel from 'vault/models/pki/key';
-import type FlashMessageService from 'vault/services/flash-messages';
-
-/**
- * @module PkiKeyImport
- * PkiKeyImport components are used to import PKI keys.
- *
- * @example
- * ```js
- * <PkiKeyImport @model={{this.model}} />
- * ```
- *
- * @param {Object} model - pki/key model.
- * @callback onCancel - Callback triggered when cancel button is clicked.
- * @callback onSubmit - Callback triggered on submit success.
- */
-interface Args {
-  model: PkiKeyModel;
-  onSave: CallableFunction;
-  onCancel: CallableFunction;
-}
-
-export default class PkiKeyImport extends Component<Args> {
-  @service declare readonly flashMessages: FlashMessageService;
-
-  @tracked errorBanner = '';
-  @tracked invalidFormAlert = '';
-
-  @task
-  @waitFor
-  *submitForm(event: Event) {
-    event.preventDefault();
-    try {
-      const { keyName } = this.args.model;
-      yield this.args.model.save({ adapterOptions: { import: true } });
-      this.flashMessages.success(`Successfully imported key${keyName ? ` ${keyName}.` : '.'}`);
-      this.args.onSave();
-    } catch (error) {
-      this.errorBanner = errorMessage(error);
-      this.invalidFormAlert = 'There was a problem importing key.';
-    }
-  }
-
-  @action
-  onFileUploaded({ value, filename }: { value: string; filename: string }) {
-    this.args.model.pemBundle = value;
-    if (!this.args.model.keyName) {
-      const trimmedFileName = trimRight(filename, ['.json', '.pem']);
-      this.args.model.keyName = trimmedFileName;
-    }
-  }
-
-  @action
-  cancel() {
-    this.args.model.unloadRecord();
-    this.args.onCancel();
-  }
-}
diff --git a/ui/lib/pki/addon/components/pki-key-parameters.hbs b/ui/lib/pki/addon/components/pki-key-parameters.hbs
deleted file mode 100644
index d4435b273f9c4..0000000000000
--- a/ui/lib/pki/addon/components/pki-key-parameters.hbs
+++ /dev/null
@@ -1,54 +0,0 @@
-{{yield}}
-{{#each @fields as |attr|}}
-  {{#if (eq attr.name "keyBits")}}
-    <div class="field" data-test-field="keyBits">
-      <FormFieldLabel
-        for={{attr.name}}
-        @label={{capitalize (or attr.options.label (humanize (dasherize attr.name)))}}
-        @subText={{attr.options.subText}}
-      />
-      <div class="control is-expanded">
-        <ToolTip @verticalPosition="above" @horizontalPosition="center" as |T|>
-          <T.Trigger tabindex="-1">
-            <div class="select is-fullwidth">
-              <select
-                id={{attr.name}}
-                name={{attr.name}}
-                data-test-input={{attr.name}}
-                disabled={{unless @model.keyType true}}
-                {{on "change" this.onKeyBitsChange}}
-              >
-                {{#if (and attr.options.noDefault (not @model.keyType))}}
-                  <option value="">
-                    Select one
-                  </option>
-                {{/if}}
-                {{#each this.keyBitOptions as |val|}}
-                  <option selected={{loose-equal (get @model "keyBits") val}} value={{val}}>
-                    {{val}}
-                  </option>
-                {{/each}}
-              </select>
-            </div>
-          </T.Trigger>
-          {{#unless @model.keyType}}
-            <T.Content @defaultClass="tool-tip smaller-font">
-              <div class="box">
-                Choose a key type before specifying bit length.
-              </div>
-            </T.Content>
-          {{/unless}}
-        </ToolTip>
-      </div>
-    </div>
-  {{else}}
-    <FormField
-      data-test-field={{attr}}
-      @attr={{attr}}
-      @model={{@model}}
-      @modelValidations={{@modelValidations}}
-      @showHelpText={{false}}
-      @onChange={{this.handleSelection}}
-    />
-  {{/if}}
-{{/each}}
\ No newline at end of file
diff --git a/ui/lib/pki/addon/components/pki-key-parameters.ts b/ui/lib/pki/addon/components/pki-key-parameters.ts
deleted file mode 100644
index 3313dc7251c86..0000000000000
--- a/ui/lib/pki/addon/components/pki-key-parameters.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
-import { action } from '@ember/object';
-import type PkiRoleModel from 'vault/models/pki/role';
-import type PkiKeyModel from 'vault/models/pki/key';
-import type PkiActionModel from 'vault/models/pki/action';
-import type { HTMLElementEvent } from 'forms';
-/**
- * @module PkiKeyParameters
- * PkiKeyParameters components are used to display a list of key bit options depending on the selected key type. The key bits field is disabled until a key type is selected.
- * If the component renders in a group, other attrs may be passed in and will be rendered using the <FormField> component
- * @example
- * ```js
- * <PkiKeyParameters @model={{@model}} @fields={{fields}}/>
- * ```
- * @param {class} model - The pki/role, pki/action, pki/key model.
- * @param {string} fields - Array of attributes from a formFieldGroup generated by the @withFormFields decorator ex: [{ name: 'attrName', type: 'string', options: {...} }]
- */
-interface Args {
-  model: PkiRoleModel | PkiKeyModel | PkiActionModel;
-}
-interface ModelAttributeName {
-  keyType: string;
-  keyBits: string;
-}
-interface TypeOptions {
-  rsa: string;
-  ec: string;
-  ed25519: string;
-  any: string;
-}
-interface BitOptions {
-  [key: string]: Array<string>;
-}
-
-// first value in array is the default bits for that key type
-const KEY_BITS_OPTIONS: BitOptions = {
-  rsa: ['2048', '3072', '4096', '0'],
-  ec: ['256', '224', '384', '521', '0'],
-  ed25519: ['0'],
-  any: ['0'],
-};
-
-export default class PkiKeyParameters extends Component<Args> {
-  get keyBitOptions() {
-    if (!this.args.model.keyType) return [];
-    return KEY_BITS_OPTIONS[this.args.model.keyType];
-  }
-
-  @action handleSelection(name: string, selection: string) {
-    this.args.model[name as keyof ModelAttributeName] = selection;
-
-    if (name === 'keyType' && Object.keys(KEY_BITS_OPTIONS)?.includes(selection)) {
-      const bitOptions = KEY_BITS_OPTIONS[selection as keyof TypeOptions];
-      this.args.model.keyBits = bitOptions?.firstObject;
-    }
-  }
-
-  @action onKeyBitsChange(event: HTMLElementEvent<HTMLInputElement>) {
-    this.handleSelection(event.target.name, event.target.value);
-  }
-}
diff --git a/ui/lib/pki/addon/components/pki-key-usage.hbs b/ui/lib/pki/addon/components/pki-key-usage.hbs
deleted file mode 100644
index bed89141bd197..0000000000000
--- a/ui/lib/pki/addon/components/pki-key-usage.hbs
+++ /dev/null
@@ -1,31 +0,0 @@
-<CheckboxGrid
-  @name="keyUsage"
-  @label="Key usage"
-  @subText="Specifies the default key usage constraint on the issued certificate. To specify no default key_usage constraints, uncheck every item in this list."
-  @fields={{this.keyUsageFields}}
-  @value={{@model.keyUsage}}
-  @onChange={{this.checkboxChange}}
-  data-test-key-usage-key-usage-checkboxes
-/>
-<CheckboxGrid
-  @name="extKeyUsage"
-  @label="Extended key usage"
-  @subText="Specifies the default key usage constraint on the issued certificate. To specify no default ext_key_usage constraints, uncheck every item in this list."
-  @fields={{this.extKeyUsageFields}}
-  @value={{@model.extKeyUsage}}
-  @onChange={{this.checkboxChange}}
-  class="has-top-margin-s"
-  data-test-key-usage-ext-key-usage-checkboxes
-/>
-<div class="has-top-margin-xxl">
-  <StringList
-    class="is-shadowless"
-    data-test-input="extKeyUsageOids"
-    @label="Extended key usage OIDs"
-    @inputValue={{get @model "extKeyUsageOids"}}
-    @onChange={{this.onStringListChange}}
-    @attrName="extKeyUsageOids"
-    @subText="A list of extended key usage OIDs. Add one item per row."
-    @showHelpText={{false}}
-  />
-</div>
\ No newline at end of file
diff --git a/ui/lib/pki/addon/components/pki-key-usage.ts b/ui/lib/pki/addon/components/pki-key-usage.ts
deleted file mode 100644
index bf1c989c5b02b..0000000000000
--- a/ui/lib/pki/addon/components/pki-key-usage.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
-import { action } from '@ember/object';
-
-/**
- * @module PkiKeyUsage
- * PkiKeyUsage components are used to build out the toggle options for PKI's role create/update key_usage, ext_key_usage and ext_key_usage_oids model params.
- * Instead of having the user search on the following goLang pages for these options we present them in checkbox form and manually add them to the params as an array of strings.
- * key_usage options: https://pkg.go.dev/crypto/x509#KeyUsage
- * ext_key_usage options (not all are include on purpose): https://pkg.go.dev/crypto/x509#ExtKeyUsage
- * @example
- * ```js
- * <PkiKeyUsage @model={@model} @group={group}/>
- * ```
- * @param {class} model - The pki/pki-role-engine model.
- * @param {string} group - The name of the group created in the model. In this case, it's the "Key usage" group.
- */
-
-interface Field {
-  key: string;
-  label: string;
-}
-
-const KEY_USAGE_FIELDS: Field[] = [
-  { key: 'DigitalSignature', label: 'Digital Signature' },
-  { key: 'ContentCommitment', label: 'Content Commitment' },
-  { key: 'CrlSign', label: 'CRL Sign' },
-  { key: 'KeyAgreement', label: 'Key Agreement' },
-  { key: 'DataEncipherment', label: 'Data Encipherment' },
-  { key: 'EncipherOnly', label: 'Encipher Only' },
-  { key: 'KeyEncipherment', label: 'Key Encipherment' },
-  { key: 'CertSign', label: 'Cert Sign' },
-  { key: 'DecipherOnly', label: 'Decipher Only' },
-];
-
-const EXT_KEY_USAGE_FIELDS: Field[] = [
-  { key: 'Any', label: 'Any' },
-  { key: 'EmailProtection', label: 'Email Protection' },
-  { key: 'TimeStamping', label: 'Time Stamping' },
-  { key: 'ServerAuth', label: 'Server Auth' },
-  { key: 'IpsecEndSystem', label: 'IPSEC End System' },
-  { key: 'OcspSigning', label: 'OCSP Signing' },
-  { key: 'ClientAuth', label: 'Client Auth' },
-  { key: 'IpsecTunnel', label: 'IPSEC Tunnel' },
-  { key: 'IpsecUser', label: 'IPSEC User' },
-  { key: 'CodeSigning', label: 'Code Signing' },
-];
-
-interface PkiKeyUsageArgs {
-  group: string;
-  model: {
-    keyUsage: string[];
-    extKeyUsageOids: string[];
-    extKeyUsage: string[];
-  };
-}
-
-export default class PkiKeyUsage extends Component<PkiKeyUsageArgs> {
-  keyUsageFields = KEY_USAGE_FIELDS;
-  extKeyUsageFields = EXT_KEY_USAGE_FIELDS;
-
-  @action onStringListChange(value: string[]) {
-    this.args.model.extKeyUsageOids = value;
-  }
-
-  @action checkboxChange(name: string, value: string[]) {
-    // Make sure we can set this value type to this model key
-    if (name === 'keyUsage' || name === 'extKeyUsage') {
-      this.args.model[name] = value;
-    }
-  }
-}
diff --git a/ui/lib/pki/addon/components/pki-not-valid-after-form.hbs b/ui/lib/pki/addon/components/pki-not-valid-after-form.hbs
deleted file mode 100644
index fc4294fb710c8..0000000000000
--- a/ui/lib/pki/addon/components/pki-not-valid-after-form.hbs
+++ /dev/null
@@ -1,58 +0,0 @@
-<div class="column is-narrow is-flex-align-baseline has-text-grey has-right-margin-s has-padding-xs">
-  <RadioButton
-    id="ttlType"
-    class="radio"
-    name="notValidAfterOption"
-    @value="ttl"
-    @onChange={{this.onRadioButtonChange}}
-    @groupValue={{this.groupValue}}
-    data-test-radio-button="ttl"
-  />
-  <div class="has-left-margin-xs">
-    <label class="has-left-margin-xs" for="ttlType" data-test-radio-label="ttl">
-      <span class="ttl-picker-label is-large">TTL</span>
-    </label>
-    {{#if (eq this.groupValue "ttl")}}
-      <TtlPicker
-        data-test-input="ttl"
-        @onChange={{this.setAndBroadcastTtl}}
-        @label="TTL"
-        @helperTextEnabled={{@attr.options.helperTextEnabled}}
-        @description={{@attr.helpText}}
-        @initialValue={{@model.ttl}}
-        @hideToggle={{true}}
-      >
-        <label class="sr-only" for="ttl">Set relative certificate expiry with TTL</label>
-      </TtlPicker>
-    {{/if}}
-  </div>
-</div>
-<div
-  class="column is-narrow is-flex-align-baseline has-text-grey has-right-margin-s has-top-margin-negative-s has-padding-xs"
->
-  <RadioButton
-    id="dateType"
-    class="radio"
-    name="notValidAfterOption"
-    @value="specificDate"
-    @onChange={{this.onRadioButtonChange}}
-    @groupValue={{this.groupValue}}
-    data-test-radio-button="not_after"
-  />
-  <div class="has-left-margin-xs">
-    <label class="ttl-picker-label is-large" for="dateType" data-test-radio-label="specificDate">Specific date</label>
-    {{#if (eq this.groupValue "specificDate")}}
-      <label class="sr-only" for="not_after">Set certificate expiry with specified date value</label>
-      <Input
-        id="not_after"
-        @type="date"
-        autocomplete="off"
-        spellcheck="false"
-        @value={{this.formDate}}
-        {{on "input" this.setAndBroadcastInput}}
-        class="input"
-        data-test-input="not_after"
-      />
-    {{/if}}
-  </div>
-</div>
\ No newline at end of file
diff --git a/ui/lib/pki/addon/components/pki-not-valid-after-form.ts b/ui/lib/pki/addon/components/pki-not-valid-after-form.ts
deleted file mode 100644
index 91a344b5286b1..0000000000000
--- a/ui/lib/pki/addon/components/pki-not-valid-after-form.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
-import { action } from '@ember/object';
-import { tracked } from '@glimmer/tracking';
-import { format } from 'date-fns';
-import type { HTMLElementEvent } from 'forms';
-
-/**
- * <PkiNotValidAfterForm /> components are used to manage two mutually exclusive role options in the form.
- */
-interface Args {
-  model: {
-    notAfter: string;
-    ttl: string | number;
-    set: (key: string, value: string | number) => void;
-  };
-}
-
-export default class RadioSelectTtlOrString extends Component<Args> {
-  @tracked groupValue = 'ttl';
-  @tracked cachedNotAfter: string;
-  @tracked cachedTtl: string | number;
-  @tracked formDate: string;
-
-  constructor(owner: unknown, args: Args) {
-    super(owner, args);
-    const { model } = this.args;
-    this.cachedNotAfter = model.notAfter || '';
-    this.formDate = this.calculateFormDate(model.notAfter);
-    this.cachedTtl = model.ttl || '';
-    if (model.notAfter) {
-      this.groupValue = 'specificDate';
-    }
-  }
-
-  calculateFormDate(value: string) {
-    // API expects and returns full ISO string
-    // but the form input only accepts yyyy-MM-dd format
-    if (value) {
-      return format(new Date(value), 'yyyy-MM-dd');
-    }
-    return '';
-  }
-
-  @action onRadioButtonChange(selection: string) {
-    this.groupValue = selection;
-    // Clear the previous selection if they have clicked the other radio button.
-    if (selection === 'specificDate') {
-      this.args.model.ttl = '';
-      this.args.model.notAfter = this.cachedNotAfter;
-      this.formDate = this.calculateFormDate(this.cachedNotAfter);
-    }
-    if (selection === 'ttl') {
-      this.args.model.notAfter = '';
-      this.args.model.ttl = this.cachedTtl;
-      this.formDate = '';
-    }
-  }
-
-  @action setAndBroadcastTtl(ttlObject: { enabled: boolean; goSafeTimeString: string }) {
-    const { enabled, goSafeTimeString } = ttlObject;
-    if (this.groupValue === 'specificDate') {
-      // do not save ttl on the model unless the ttl radio button is selected
-      return;
-    }
-    const ttlVal = enabled === true ? goSafeTimeString : 0;
-    this.cachedTtl = ttlVal;
-    this.args.model.ttl = ttlVal;
-  }
-
-  @action setAndBroadcastInput(evt: HTMLElementEvent<HTMLInputElement>) {
-    const setDate = evt.target.valueAsDate?.toISOString();
-    if (!setDate) return;
-
-    this.cachedNotAfter = setDate;
-    this.args.model.notAfter = setDate;
-    this.formDate = this.calculateFormDate(setDate);
-  }
-}
diff --git a/ui/lib/pki/addon/components/pki-role-form.hbs b/ui/lib/pki/addon/components/pki-role-form.hbs
deleted file mode 100644
index c4a699639c4dc..0000000000000
--- a/ui/lib/pki/addon/components/pki-role-form.hbs
+++ /dev/null
@@ -1,145 +0,0 @@
-<form {{on "submit" (perform this.save)}}>
-  <div class="box is-sideless is-fullwidth is-marginless">
-    <MessageError @errorMessage={{this.errorBanner}} class="has-top-margin-s" />
-    {{! ARG TODO write a test for namespace reminder }}
-    <NamespaceReminder @mode={{if @role.isNew "create" "update"}} @noun="PKI role" />
-    {{#each @role.formFieldGroups as |fieldGroup|}}
-      {{#each-in fieldGroup as |group fields|}}
-        {{! DEFAULT VIEW }}
-        {{#if (eq group "default")}}
-          {{#each fields as |attr|}}
-            {{#if (and (eq attr.name "issuerRef") @issuers)}}
-              <div class="has-top-margin-m {{unless this.showDefaultIssuer 'has-bottom-margin-xs' 'has-bottom-margin-m'}}">
-                <FormFieldLabel
-                  for={{attr.name}}
-                  @label="Issuer ref"
-                  @helpText={{(if this.showHelpText attr.options.helpText)}}
-                  @subText={{attr.options.subText}}
-                />
-                <Toggle
-                  @name={{concat attr.name "-toggle"}}
-                  @status="success"
-                  @size="small"
-                  @checked={{this.showDefaultIssuer}}
-                  @onChange={{this.toggleShowDefaultIssuer}}
-                >
-                  <span class="has-text-grey">Use default issuer</span>
-                </Toggle>
-              </div>
-              {{#unless this.showDefaultIssuer}}
-                <div class="has-top-margin-xs has-bottom-margin-l">
-                  <div class="select is-fullwidth">
-                    <Select
-                      @name={{attr.name}}
-                      @options={{this.issuers}}
-                      @valueAttribute={{"issuerDisplayName"}}
-                      @labelAttribute={{"issuerDisplayName"}}
-                      @isFullwidth={{true}}
-                      @selectedValue={{@role.issuerRef}}
-                      @onChange={{action (mut @role.issuerRef)}}
-                    />
-                  </div>
-                </div>
-              {{/unless}}
-            {{else}}
-              <FormField
-                data-test-field={{attr}}
-                @attr={{attr}}
-                @model={{@role}}
-                @modelValidations={{this.modelValidations}}
-                @showHelpText={{false}}
-              >
-                <PkiNotValidAfterForm @attr={{attr}} @model={{@role}} />
-              </FormField>
-            {{/if}}
-          {{/each}}
-        {{else}}
-          {{#let (camelize (concat "show" group)) as |prop|}}
-            <ToggleButton
-              @isOpen={{get @role prop}}
-              @openLabel={{concat "Hide " group}}
-              @closedLabel={{group}}
-              @onClick={{fn (mut (get @role prop))}}
-              class="is-block"
-              data-test-toggle-group={{group}}
-            />
-            {{#if (get @role prop)}}
-              <div class="box is-tall is-marginless" data-test-toggle-div={{group}}>
-                {{#let (get @role.fieldGroupsInfo group) as |toggleGroup|}}
-                  {{! HEADER }}
-                  {{#if toggleGroup.header}}
-                    <div class="has-bottom-margin-s">
-                      <FormFieldLabel
-                        for={{toggleGroup.header.name}}
-                        @label={{toggleGroup.header.label}}
-                        @subText={{toggleGroup.header.text}}
-                        @docLink={{toggleGroup.header.docLink}}
-                      />
-                    </div>
-                  {{/if}}
-                  {{! FIELDS }}
-                  {{#if (eq group "Key usage")}}
-                    <PkiKeyUsage @model={{@role}} />
-                  {{else if (eq group "Key parameters")}}
-                    <PkiKeyParameters @model={{@role}} @fields={{fields}} />
-                  {{else}}
-                    {{#each fields as |attr|}}
-                      <FormField
-                        data-test-field={{true}}
-                        @attr={{attr}}
-                        @model={{@role}}
-                        @modelValidations={{@roleValidations}}
-                        @showHelpText={{false}}
-                      >
-                        {{yield attr}}
-                      </FormField>
-                    {{/each}}
-                  {{/if}}
-                  {{! FOOTER }}
-                  {{#if toggleGroup.footer}}
-                    <p class="sub-text">
-                      <Icon @name="info" />
-                      {{toggleGroup.footer.text}}
-                      {{#if toggleGroup.footer.docLink}}
-                        <DocLink @path={{toggleGroup.footer.docLink}}>
-                          {{toggleGroup.footer.docText}}
-                        </DocLink>
-                      {{/if}}
-                    </p>
-                  {{/if}}
-                {{/let}}
-              </div>
-            {{/if}}
-          {{/let}}
-        {{/if}}
-      {{/each-in}}
-    {{/each}}
-  </div>
-  <div class="has-top-padding-s">
-    <button
-      type="submit"
-      class="button is-primary {{if this.save.isRunning 'is-loading'}}"
-      disabled={{this.save.isRunning}}
-      data-test-pki-role-save
-    >
-      {{if @role.isNew "Create" "Update"}}
-    </button>
-    <button
-      type="button"
-      class="button has-left-margin-s"
-      disabled={{this.save.isRunning}}
-      {{on "click" @onCancel}}
-      data-test-pki-role-cancel
-    >
-      Cancel
-    </button>
-    {{#if this.modelValidations.targets.errors}}
-      <AlertInline @type="danger" @message={{join ", " this.modelValidations.targets.errors}} @paddingTop={{true}} />
-    {{/if}}
-    {{#if this.invalidFormAlert}}
-      <div class="control">
-        <AlertInline @type="danger" @paddingTop={{true}} @message={{this.invalidFormAlert}} @mimicRefresh={{true}} />
-      </div>
-    {{/if}}
-  </div>
-</form>
\ No newline at end of file
diff --git a/ui/lib/pki/addon/components/pki-role-form.ts b/ui/lib/pki/addon/components/pki-role-form.ts
deleted file mode 100644
index 6243f9c1fcfb3..0000000000000
--- a/ui/lib/pki/addon/components/pki-role-form.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
-import { inject as service } from '@ember/service';
-import { task } from 'ember-concurrency';
-import { tracked } from '@glimmer/tracking';
-import { action } from '@ember/object';
-import errorMessage from 'vault/utils/error-message';
-import type Store from '@ember-data/store';
-import type FlashMessageService from 'vault/services/flash-messages';
-import type SecretMountPathService from 'vault/services/secret-mount-path';
-import type PkiRoleModel from 'vault/models/pki/role';
-import type PkiIssuerModel from 'vault/models/pki/issuer';
-import type { ValidationMap } from 'vault/app-types';
-
-/**
- * @module PkiRoleForm
- * PkiRoleForm components are used to create and update PKI roles.
- *
- * @example
- * ```js
- * <PkiRoleForm @model={{this.model}}/>
- * ```
- * @callback onCancel
- * @callback onSave
- * @param {Object} role - pki/role model.
- * @param {Array} issuers - pki/issuer model.
- * @param {onCancel} onCancel - Callback triggered when cancel button is clicked.
- * @param {onSave} onSave - Callback triggered on save success.
- */
-
-interface Args {
-  role: PkiRoleModel;
-  issuers: PkiIssuerModel[];
-  onSave: CallableFunction;
-}
-
-export default class PkiRoleForm extends Component<Args> {
-  @service declare readonly store: Store;
-  @service declare readonly flashMessages: FlashMessageService;
-  @service declare readonly secretMountPath: SecretMountPathService;
-
-  @tracked errorBanner = '';
-  @tracked invalidFormAlert = '';
-  @tracked modelValidations: ValidationMap | null = null;
-  @tracked showDefaultIssuer = true;
-
-  constructor(owner: unknown, args: Args) {
-    super(owner, args);
-
-    this.showDefaultIssuer = this.args.role.issuerRef === 'default';
-  }
-
-  get issuers() {
-    return this.args.issuers?.map((issuer) => {
-      return { issuerDisplayName: issuer.issuerName || issuer.issuerId };
-    });
-  }
-
-  @task
-  *save(event: Event) {
-    event.preventDefault();
-    try {
-      const { isValid, state, invalidFormMessage } = this.args.role.validate();
-      this.modelValidations = isValid ? null : state;
-      this.invalidFormAlert = invalidFormMessage;
-      if (isValid) {
-        const { isNew, name } = this.args.role;
-        yield this.args.role.save();
-        this.flashMessages.success(`Successfully ${isNew ? 'created' : 'updated'} the role ${name}.`);
-        this.args.onSave();
-      }
-    } catch (error) {
-      this.errorBanner = errorMessage(error);
-      this.invalidFormAlert = 'There was an error submitting this form.';
-    }
-  }
-
-  @action
-  toggleShowDefaultIssuer() {
-    this.showDefaultIssuer = !this.showDefaultIssuer;
-
-    if (this.showDefaultIssuer) {
-      this.args.role.issuerRef = 'default';
-    }
-  }
-}
diff --git a/ui/lib/pki/addon/components/pki-role-generate.hbs b/ui/lib/pki/addon/components/pki-role-generate.hbs
deleted file mode 100644
index 94fb3cc62fe7f..0000000000000
--- a/ui/lib/pki/addon/components/pki-role-generate.hbs
+++ /dev/null
@@ -1,49 +0,0 @@
-{{#if @model.serialNumber}}
-  <Page::PkiCertificateDetails @model={{@model}} @onRevoke={{this.cancel}} @onBack={{this.cancel}} />
-{{else}}
-  <form {{on "submit" (perform this.save)}} data-test-pki-generate-cert-form>
-    <div class="box is-bottomless is-fullwidth is-marginless">
-      <MessageError @errorMessage={{this.errorBanner}} />
-      <NamespaceReminder @mode="create" @noun="certificate" />
-      {{#let (get @model.formFieldGroups "0") as |defaultGroup|}}
-        {{#each defaultGroup.default as |attr|}}
-          <FormField @model={{@model}} @attr={{attr}} @modelValidations={{this.modelValidations}}>
-            <PkiNotValidAfterForm @attr={{attr}} @model={{@model}} />
-          </FormField>
-        {{/each}}
-      {{/let}}
-      <FormFieldGroups
-        @model={{@model}}
-        @renderGroup="Subject Alternative Name (SAN) Options"
-        @groupName="formFieldGroups"
-        @showHelpText={{false}}
-      />
-    </div>
-    <div class="field is-grouped box is-fullwidth is-bottomless">
-      <div class="control">
-        <button
-          type="submit"
-          class="button is-primary {{if this.save.isRunning 'is-loading'}}"
-          disabled={{this.save.isRunning}}
-          data-test-pki-generate-button
-        >
-          {{capitalize this.verb}}
-        </button>
-        <button
-          type="button"
-          class="button has-left-margin-s"
-          disabled={{this.save.isRunning}}
-          {{on "click" this.cancel}}
-          data-test-pki-generate-cancel
-        >
-          Cancel
-        </button>
-      </div>
-      {{#if this.invalidFormAlert}}
-        <div class="control" data-test-alert>
-          <AlertInline @type="danger" @paddingTop={{true}} @message={{this.invalidFormAlert}} @mimicRefresh={{true}} />
-        </div>
-      {{/if}}
-    </div>
-  </form>
-{{/if}}
\ No newline at end of file
diff --git a/ui/lib/pki/addon/components/pki-role-generate.ts b/ui/lib/pki/addon/components/pki-role-generate.ts
deleted file mode 100644
index 03dc8db6adc34..0000000000000
--- a/ui/lib/pki/addon/components/pki-role-generate.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
-import { action } from '@ember/object';
-import { task } from 'ember-concurrency';
-import { service } from '@ember/service';
-import { tracked } from '@glimmer/tracking';
-import errorMessage from 'vault/utils/error-message';
-import type Router from '@ember/routing/router';
-import type Store from '@ember-data/store';
-import type FlashMessageService from 'vault/services/flash-messages';
-import type DownloadService from 'vault/services/download';
-import type PkiCertificateGenerateModel from 'vault/models/pki/certificate/generate';
-import type PkiCertificateSignModel from 'vault/models/pki/certificate/sign';
-
-interface Args {
-  onSuccess: CallableFunction;
-  model: PkiCertificateGenerateModel | PkiCertificateSignModel;
-  type: string;
-}
-
-export default class PkiRoleGenerate extends Component<Args> {
-  @service declare readonly router: Router;
-  @service declare readonly store: Store;
-  @service declare readonly flashMessages: FlashMessageService;
-  @service declare readonly download: DownloadService;
-
-  @tracked errorBanner = '';
-  @tracked invalidFormAlert = '';
-
-  get verb() {
-    return this.args.type === 'sign' ? 'sign' : 'generate';
-  }
-
-  @task
-  *save(evt: Event) {
-    evt.preventDefault();
-    this.errorBanner = '';
-    const { model, onSuccess } = this.args;
-    try {
-      yield model.save();
-      onSuccess();
-    } catch (err) {
-      this.errorBanner = errorMessage(err, `Could not ${this.verb} certificate. See Vault logs for details.`);
-      this.invalidFormAlert = 'There was an error submitting this form.';
-    }
-  }
-
-  @action cancel() {
-    this.args.model.unloadRecord();
-    this.router.transitionTo('vault.cluster.secrets.backend.pki.roles.role.details');
-  }
-}
diff --git a/ui/lib/pki/addon/components/pki-sign-intermediate-form.hbs b/ui/lib/pki/addon/components/pki-sign-intermediate-form.hbs
deleted file mode 100644
index da925613ad1a4..0000000000000
--- a/ui/lib/pki/addon/components/pki-sign-intermediate-form.hbs
+++ /dev/null
@@ -1,82 +0,0 @@
-{{#if @model.id}}
-  {{! Model only has ID once form has been submitted and saved }}
-  <Toolbar />
-  <main data-test-sign-intermediate-result>
-    <div class="box is-sideless is-fullwidth is-shadowless">
-      <AlertBanner
-        @title="Next steps"
-        @type="warning"
-        @message="The CA Chain and Issuing CA values will only be available once. Make sure you copy and save it now."
-      />
-
-      {{#each this.showFields as |fieldName|}}
-        {{#let (find-by "name" fieldName @model.allFields) as |attr|}}
-          <InfoTableRow @label={{or attr.options.label (humanize (dasherize attr.name))}} @value={{get @model attr.name}}>
-            {{#if (and attr.options.masked (get @model attr.name))}}
-              <MaskedInput @value={{get @model attr.name}} @displayOnly={{true}} @allowCopy={{true}} />
-            {{else if (eq attr.name "serialNumber")}}
-              <LinkTo
-                @route="certificates.certificate.details"
-                @model={{@model.serialNumber}}
-              >{{@model.serialNumber}}</LinkTo>
-            {{else}}
-              <Icon @name="minus" />
-            {{/if}}
-          </InfoTableRow>
-        {{/let}}
-      {{/each}}
-      <ParsedCertificateInfoRows @model={{@model.parsedCertificate}} />
-    </div>
-  </main>
-{{else}}
-  <form {{on "submit" (perform this.save)}} data-test-sign-intermediate-form>
-    <div class="box is-sideless is-fullwidth is-marginless">
-      <MessageError @errorMessage={{this.errorBanner}} class="has-top-margin-s" />
-      <NamespaceReminder @mode={{"create"}} @noun="signed intermediate" />
-      {{#each @model.formFields as |attr|}}
-        <FormField
-          data-test-field={{attr}}
-          @attr={{attr}}
-          @model={{@model}}
-          @modelValidations={{this.modelValidations}}
-          @showHelpText={{false}}
-        >
-          {{! attr customTtl has editType yield and will show this component }}
-          <PkiNotValidAfterForm @attr={{attr}} @model={{@model}} />
-        </FormField>
-      {{/each}}
-
-      <PkiGenerateToggleGroups @model={{@model}} @groups={{this.groups}} />
-    </div>
-    <div class="has-top-padding-s">
-      <button
-        type="submit"
-        class="button is-primary {{if this.save.isRunning 'is-loading'}}"
-        disabled={{this.save.isRunning}}
-        data-test-pki-sign-intermediate-save
-      >
-        Save
-      </button>
-      <button
-        type="button"
-        class="button has-left-margin-s"
-        disabled={{this.save.isRunning}}
-        {{on "click" this.cancel}}
-        data-test-pki-sign-intermediate-cancel
-      >
-        Cancel
-      </button>
-      {{#if this.inlineFormAlert}}
-        <div class="control">
-          <AlertInline
-            @type="danger"
-            @paddingTop={{true}}
-            @message={{this.inlineFormAlert}}
-            @mimicRefresh={{true}}
-            data-test-form-error
-          />
-        </div>
-      {{/if}}
-    </div>
-  </form>
-{{/if}}
\ No newline at end of file
diff --git a/ui/lib/pki/addon/components/pki-sign-intermediate-form.ts b/ui/lib/pki/addon/components/pki-sign-intermediate-form.ts
deleted file mode 100644
index 912ec162687c3..0000000000000
--- a/ui/lib/pki/addon/components/pki-sign-intermediate-form.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
-import { action } from '@ember/object';
-import { service } from '@ember/service';
-import { waitFor } from '@ember/test-waiters';
-import { tracked } from '@glimmer/tracking';
-import { task } from 'ember-concurrency';
-import errorMessage from 'vault/utils/error-message';
-import type PkiCertificateSignIntermediate from 'vault/models/pki/certificate/sign-intermediate';
-import type FlashMessageService from 'vault/services/flash-messages';
-import type { ValidationMap } from 'vault/vault/app-types';
-
-interface Args {
-  onCancel: CallableFunction;
-  model: PkiCertificateSignIntermediate;
-}
-
-export default class PkiSignIntermediateFormComponent extends Component<Args> {
-  @service declare readonly flashMessages: FlashMessageService;
-  @tracked errorBanner = '';
-  @tracked inlineFormAlert = '';
-  @tracked modelValidations: ValidationMap | null = null;
-
-  @action cancel() {
-    this.args.model.unloadRecord();
-    this.args.onCancel();
-  }
-  @task
-  @waitFor
-  *save(event: Event) {
-    event.preventDefault();
-    const { isValid, state, invalidFormMessage } = this.args.model.validate();
-    this.modelValidations = isValid ? null : state;
-    this.inlineFormAlert = invalidFormMessage;
-    if (!isValid) return;
-    try {
-      yield this.args.model.save();
-      this.flashMessages.success('Successfully signed CSR.');
-      window?.scrollTo(0, 0);
-    } catch (e) {
-      this.errorBanner = errorMessage(e);
-      this.inlineFormAlert = 'There was a problem signing the CSR.';
-    }
-  }
-
-  get groups() {
-    return {
-      'Signing options': ['usePss', 'skid', 'signatureBits'],
-      'Subject Alternative Name (SAN) Options': ['altNames', 'ipSans', 'uriSans', 'otherSans'],
-      'Additional subject fields': [
-        'ou',
-        'organization',
-        'country',
-        'locality',
-        'province',
-        'streetAddress',
-        'postalCode',
-        'subjectSerialNumber', // this is different from the UUID serial number generated by vault (in show fields below)
-      ],
-    };
-  }
-
-  get showFields() {
-    return ['serialNumber', 'certificate', 'issuingCa', 'caChain'];
-  }
-}
diff --git a/ui/lib/pki/addon/components/pki-tidy-form.hbs b/ui/lib/pki/addon/components/pki-tidy-form.hbs
deleted file mode 100644
index 2a3d6e8bf8982..0000000000000
--- a/ui/lib/pki/addon/components/pki-tidy-form.hbs
+++ /dev/null
@@ -1,80 +0,0 @@
-<hr class="is-marginless has-background-gray-200" />
-
-<p class="has-top-margin-m has-bottom-margin-l">Tidying cleans up the storage backend and/or CRL by removing certificates
-  that have expired and are past a certain buffer period beyond their expiration time.
-  <DocLink @path="/vault/api-docs/secret/pki#{{if (eq @tidyType 'manual') 'tidy' 'configure-automatic-tidy'}}">Learn more</DocLink>
-</p>
-
-<MessageError @errorMessage={{this.errorBanner}} class="has-top-margin-s" />
-
-<form class="has-bottom-margin-s" {{on "submit" (perform this.save)}} data-test-tidy-form={{@tidyType}}>
-  {{#if (and (eq @tidyType "auto") this.intervalDurationAttr)}}
-    {{#let this.intervalDurationAttr as |attr|}}
-      <TtlPicker
-        data-test-input={{attr.name}}
-        @onChange={{fn this.handleTtl attr}}
-        @label={{attr.options.label}}
-        @labelDisabled={{attr.options.labelDisabled}}
-        @helperTextDisabled={{attr.options.helperTextDisabled}}
-        @helperTextEnabled={{attr.options.helperTextEnabled}}
-        @initialEnabled={{get @tidy attr.options.mapToBoolean}}
-        @initialValue={{get @tidy attr.name}}
-      />
-    {{/let}}
-  {{/if}}
-  {{#each @tidy.formFieldGroups as |fieldGroup|}}
-    {{#each-in fieldGroup as |group fields|}}
-      {{#if (or (eq @tidyType "manual") @tidy.enabled)}}
-        <h2 class="title is-size-5 has-border-bottom-light page-header" data-test-tidy-header={{group}}>
-          {{group}}
-        </h2>
-        {{#each fields as |attr|}}
-          {{#if (eq attr.name "acmeAccountSafetyBuffer")}}
-            <TtlPicker
-              data-test-input={{attr.name}}
-              @onChange={{fn this.handleTtl attr}}
-              @label={{attr.options.label}}
-              @labelDisabled={{attr.options.labelDisabled}}
-              @helperTextDisabled={{attr.options.helperTextDisabled}}
-              @helperTextEnabled={{attr.options.helperTextEnabled}}
-              @initialEnabled={{get @tidy attr.options.mapToBoolean}}
-              @initialValue={{get @tidy attr.name}}
-            />
-          {{else}}
-            {{! tidyAcme is handled by the ttl above }}
-            {{#if (not-eq attr.name "tidyAcme")}}
-              <FormField @attr={{attr}} @model={{@tidy}} />
-            {{/if}}
-          {{/if}}
-        {{/each}}
-      {{/if}}
-    {{/each-in}}
-  {{/each}}
-
-  <hr class="is-marginless has-background-gray-200" />
-
-  <div class="has-top-margin-m">
-    <button
-      type="submit"
-      class="button is-primary {{if this.save.isRunning 'is-loading'}}"
-      disabled={{this.save.isRunning}}
-      data-test-pki-tidy-button
-    >
-      {{if (eq @tidyType "manual") "Perform tidy" "Save"}}
-    </button>
-    <button
-      type="button"
-      class="button is-secondary"
-      disabled={{this.save.isRunning}}
-      {{on "click" @onCancel}}
-      data-test-pki-tidy-cancel
-    >
-      Cancel
-    </button>
-    {{#if this.invalidFormAlert}}
-      <div class="control">
-        <AlertInline @type="danger" @paddingTop={{true}} @message={{this.invalidFormAlert}} @mimicRefresh={{true}} />
-      </div>
-    {{/if}}
-  </div>
-</form>
\ No newline at end of file
diff --git a/ui/lib/pki/addon/components/pki-tidy-form.ts b/ui/lib/pki/addon/components/pki-tidy-form.ts
deleted file mode 100644
index ca5ee1a651ab8..0000000000000
--- a/ui/lib/pki/addon/components/pki-tidy-form.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@glimmer/component';
-import errorMessage from 'vault/utils/error-message';
-import { action } from '@ember/object';
-import { inject as service } from '@ember/service';
-import { task } from 'ember-concurrency';
-import { waitFor } from '@ember/test-waiters';
-import { tracked } from '@glimmer/tracking';
-
-import type RouterService from '@ember/routing/router-service';
-import type PkiTidyModel from 'vault/models/pki/tidy';
-import type { FormField, TtlEvent } from 'vault/app-types';
-
-interface Args {
-  tidy: PkiTidyModel;
-  tidyType: string;
-  onSave: CallableFunction;
-  onCancel: CallableFunction;
-}
-
-interface PkiTidyTtls {
-  intervalDuration: string;
-  acmeAccountSafetyBuffer: string;
-}
-interface PkiTidyBooleans {
-  enabled: boolean;
-  tidyAcme: boolean;
-}
-
-export default class PkiTidyForm extends Component<Args> {
-  @service declare readonly router: RouterService;
-
-  @tracked errorBanner = '';
-  @tracked invalidFormAlert = '';
-
-  get intervalDurationAttr() {
-    return this.args.tidy?.allByKey.intervalDuration;
-  }
-
-  @task
-  @waitFor
-  *save(event: Event) {
-    event.preventDefault();
-    try {
-      yield this.args.tidy.save({ adapterOptions: { tidyType: this.args.tidyType } });
-      this.args.onSave();
-    } catch (e) {
-      this.errorBanner = errorMessage(e);
-      this.invalidFormAlert = 'There was an error submitting this form.';
-    }
-  }
-
-  @action
-  handleTtl(attr: FormField, e: TtlEvent) {
-    const { enabled, goSafeTimeString } = e;
-    const ttlAttr = attr.name;
-    this.args.tidy[ttlAttr as keyof PkiTidyTtls] = goSafeTimeString;
-    this.args.tidy[attr.options.mapToBoolean as keyof PkiTidyBooleans] = enabled;
-  }
-}
diff --git a/ui/lib/pki/addon/controllers/certificates/index.js b/ui/lib/pki/addon/controllers/certificates/index.js
deleted file mode 100644
index 6c52422765c4c..0000000000000
--- a/ui/lib/pki/addon/controllers/certificates/index.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Controller from '@ember/controller';
-import { getOwner } from '@ember/application';
-import { action } from '@ember/object';
-
-export default class PkiCertificatesIndexController extends Controller {
-  get mountPoint() {
-    return getOwner(this).mountPoint;
-  }
-
-  @action setFilter(val) {
-    this.filter = val;
-  }
-  @action setFilterFocus(bool) {
-    this.filterFocused = bool;
-  }
-}
diff --git a/ui/lib/pki/addon/controllers/issuers/index.js b/ui/lib/pki/addon/controllers/issuers/index.js
deleted file mode 100644
index 80de13bf3a461..0000000000000
--- a/ui/lib/pki/addon/controllers/issuers/index.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Controller from '@ember/controller';
-import { action } from '@ember/object';
-import { next } from '@ember/runloop';
-import { getOwner } from '@ember/application';
-
-export default class PkiIssuerIndexController extends Controller {
-  get mountPoint() {
-    return getOwner(this).mountPoint;
-  }
-  // To prevent production build bug of passing D.actions to on "click": https://github.com/hashicorp/vault/pull/16983
-  @action onLinkClick(D) {
-    next(() => D.actions.close());
-  }
-}
diff --git a/ui/lib/pki/addon/controllers/keys/index.js b/ui/lib/pki/addon/controllers/keys/index.js
deleted file mode 100644
index 2f9dc81861503..0000000000000
--- a/ui/lib/pki/addon/controllers/keys/index.js
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Controller from '@ember/controller';
-import { getOwner } from '@ember/application';
-
-export default class PkiKeysIndexController extends Controller {
-  get mountPoint() {
-    return getOwner(this).mountPoint;
-  }
-}
diff --git a/ui/lib/pki/addon/controllers/roles/index.js b/ui/lib/pki/addon/controllers/roles/index.js
index 74d63420415d0..f18a6bf393b81 100644
--- a/ui/lib/pki/addon/controllers/roles/index.js
+++ b/ui/lib/pki/addon/controllers/roles/index.js
@@ -1,12 +1,7 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Controller from '@ember/controller';
 import { getOwner } from '@ember/application';
 
-export default class PkiRolesIndexController extends Controller {
+export default class BlogPostController extends Controller {
   get mountPoint() {
     return getOwner(this).mountPoint;
   }
diff --git a/ui/lib/pki/addon/controllers/roles/role/generate.js b/ui/lib/pki/addon/controllers/roles/role/generate.js
deleted file mode 100644
index 5b198bd8fd0b5..0000000000000
--- a/ui/lib/pki/addon/controllers/roles/role/generate.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Controller from '@ember/controller';
-import { action } from '@ember/object';
-import { tracked } from '@glimmer/tracking';
-
-export default class PkiRolesGenerateController extends Controller {
-  @tracked hasSubmitted = false;
-
-  @action
-  toggleTitle() {
-    this.hasSubmitted = !this.hasSubmitted;
-  }
-}
diff --git a/ui/lib/pki/addon/controllers/roles/role/sign.js b/ui/lib/pki/addon/controllers/roles/role/sign.js
deleted file mode 100644
index f3cceb6f6b074..0000000000000
--- a/ui/lib/pki/addon/controllers/roles/role/sign.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Controller from '@ember/controller';
-import { action } from '@ember/object';
-import { tracked } from '@glimmer/tracking';
-
-export default class PkiRolesSignController extends Controller {
-  @tracked hasSubmitted = false;
-
-  @action
-  toggleTitle() {
-    this.hasSubmitted = !this.hasSubmitted;
-  }
-}
diff --git a/ui/lib/pki/addon/controllers/tidy/index.js b/ui/lib/pki/addon/controllers/tidy/index.js
deleted file mode 100644
index ffa0962866f65..0000000000000
--- a/ui/lib/pki/addon/controllers/tidy/index.js
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-import Ember from 'ember';
-import Controller from '@ember/controller';
-import { task, timeout } from 'ember-concurrency';
-import { tracked } from '@glimmer/tracking';
-import { inject as service } from '@ember/service';
-
-const POLL_INTERVAL_MS = 5000;
-
-export default class PkiTidyIndexController extends Controller {
-  @service store;
-  @service secretMountPath;
-
-  @tracked tidyStatus = null;
-
-  // this task is cancelled by resetController() upon leaving the pki.tidy.index route
-  @task
-  *pollTidyStatus() {
-    while (true) {
-      // when testing, the polling loop causes promises to never settle so acceptance tests hang
-      // to get around that, we just disable the poll in tests
-      if (Ember.testing) {
-        return;
-      }
-      yield timeout(POLL_INTERVAL_MS);
-      try {
-        const tidyStatusResponse = yield this.fetchTidyStatus();
-        this.tidyStatus = tidyStatusResponse;
-      } catch (e) {
-        // we want to keep polling here
-      }
-    }
-  }
-}
diff --git a/ui/lib/pki/addon/decorators/check-config.js b/ui/lib/pki/addon/decorators/check-config.js
deleted file mode 100644
index 7101e3f7af04b..0000000000000
--- a/ui/lib/pki/addon/decorators/check-config.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-
-/**
- * the overview, roles, issuers, certificates, and key routes all need to be aware of the whether there is a config for the engine
- * if the user has not configured they are prompted to do so in each of the routes
- * decorate the necessary routes to perform the check in the beforeModel hook since that may change what is returned for the model
- */
-
-export function withConfig() {
-  return function decorator(SuperClass) {
-    if (!Object.prototype.isPrototypeOf.call(Route, SuperClass)) {
-      // eslint-disable-next-line
-      console.error(
-        'withConfig decorator must be used on an instance of ember Route class. Decorator not applied to returned class'
-      );
-      return SuperClass;
-    }
-    return class CheckConfig extends SuperClass {
-      @service secretMountPath;
-      shouldPromptConfig = false;
-
-      async beforeModel() {
-        super.beforeModel(...arguments);
-
-        // When the engine is configured, it creates a default issuer.
-        // If the issuers list is empty, we know it hasn't been configured
-        return (
-          this.store
-            .query('pki/issuer', { backend: this.secretMountPath.currentPath })
-            .then(() => (this.shouldPromptConfig = true))
-            // this endpoint is unauthenticated, so we're not worried about permissions errors
-            .catch(() => (this.shouldPromptConfig = false))
-        );
-      }
-    };
-  };
-}
diff --git a/ui/lib/pki/addon/engine.js b/ui/lib/pki/addon/engine.js
index bd8af43cb08fa..2628bdcbc1322 100644
--- a/ui/lib/pki/addon/engine.js
+++ b/ui/lib/pki/addon/engine.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Engine from '@ember/engine';
 
 import loadInitializers from 'ember-load-initializers';
@@ -18,16 +13,15 @@ export default class PkiEngine extends Engine {
   dependencies = {
     services: [
       'auth',
-      'download',
       'flash-messages',
       'namespace',
       'path-help',
       'router',
-      'secret-mount-path',
       'store',
       'version',
+      'secret-mount-path',
     ],
-    externalRoutes: ['secrets', 'secretsListRootConfiguration', 'externalMountIssuer'],
+    externalRoutes: ['secrets'],
   };
 }
 
diff --git a/ui/lib/pki/addon/routes.js b/ui/lib/pki/addon/routes.js
index 6429a155fa639..c868bcd3c9556 100644
--- a/ui/lib/pki/addon/routes.js
+++ b/ui/lib/pki/addon/routes.js
@@ -1,61 +1,46 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import buildRoutes from 'ember-engines/routes';
 
 export default buildRoutes(function () {
   this.route('overview');
-  this.route('roles', function () {
+  this.route('configuration', function () {
     this.route('index', { path: '/' });
+    this.route('tidy');
+    this.route('create', function () {
+      this.route('index', { path: '/' });
+      this.route('import-ca');
+      this.route('generate-root');
+      this.route('generate-csr');
+    });
+    this.route('edit');
+    this.route('details');
+  });
+  this.route('roles', function () {
+    this.route('index', { path: '/' }); // ARG TODO remove
     this.route('create');
-    this.route('role', { path: '/:role' }, function () {
+    this.route('role', { path: '/:id' }, function () {
       this.route('details');
       this.route('edit');
-      this.route('generate');
-      this.route('sign');
     });
   });
   this.route('issuers', function () {
-    this.route('index', { path: '/' });
-    this.route('import');
-    this.route('generate-root');
-    this.route('generate-intermediate');
-    this.route('issuer', { path: '/:issuer_ref' }, function () {
+    this.route('create');
+    this.route('issuer', { path: '/:id' }, function () {
       this.route('details');
       this.route('edit');
-      this.route('sign');
-      this.route('cross-sign');
-      this.route('rotate-root');
     });
   });
-  this.route('keys', function () {
-    this.route('index', { path: '/' });
+  this.route('certificates', function () {
     this.route('create');
-    this.route('import');
-    this.route('key', { path: '/:key_id' }, function () {
+    this.route('certificate', { path: '/:id' }, function () {
       this.route('details');
       this.route('edit');
     });
   });
-  this.route('certificates', function () {
-    this.route('index', { path: '/' });
-    this.route('certificate', { path: '/:serial' }, function () {
+  this.route('keys', function () {
+    this.route('create');
+    this.route('key', { path: '/:id' }, function () {
       this.route('details');
       this.route('edit');
     });
   });
-  this.route('tidy', function () {
-    this.route('index', { path: '/' });
-    this.route('auto', function () {
-      this.route('configure');
-    });
-    this.route('manual');
-  });
-  this.route('configuration', function () {
-    this.route('index', { path: '/' });
-    this.route('create');
-    this.route('edit');
-  });
 });
diff --git a/ui/lib/pki/addon/routes/application.js b/ui/lib/pki/addon/routes/application.js
deleted file mode 100644
index 76c5e0c1ebaf1..0000000000000
--- a/ui/lib/pki/addon/routes/application.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-import { hash } from 'rsvp';
-
-export default class PkiRoute extends Route {
-  @service pathHelp;
-  @service secretMountPath;
-
-  beforeModel() {
-    // We call pathHelp for all the models in this engine that use OpenAPI before any model hooks
-    // so that the model attributes hydrate correctly. These only need to be called once to add
-    // the openAPI attributes to the model prototype
-    const mountPath = this.secretMountPath.currentPath;
-    return hash({
-      acme: this.pathHelp.getNewModel('pki/config/acme', mountPath),
-      certGenerate: this.pathHelp.getNewModel('pki/certificate/generate', mountPath),
-      certSign: this.pathHelp.getNewModel('pki/certificate/sign', mountPath),
-      cluster: this.pathHelp.getNewModel('pki/config/cluster', mountPath),
-      key: this.pathHelp.getNewModel('pki/key', mountPath),
-      role: this.pathHelp.getNewModel('pki/role', mountPath),
-      signCsr: this.pathHelp.getNewModel('pki/sign-intermediate', mountPath),
-      tidy: this.pathHelp.getNewModel('pki/tidy', mountPath),
-      urls: this.pathHelp.getNewModel('pki/config/urls', mountPath),
-    });
-  }
-}
diff --git a/ui/lib/pki/addon/routes/certificates.js b/ui/lib/pki/addon/routes/certificates.js
new file mode 100644
index 0000000000000..6de74b7b614f3
--- /dev/null
+++ b/ui/lib/pki/addon/routes/certificates.js
@@ -0,0 +1,3 @@
+import Route from '@ember/routing/route';
+
+export default class PkiCertificatesRoute extends Route {}
diff --git a/ui/lib/pki/addon/routes/certificates/certificate/details.js b/ui/lib/pki/addon/routes/certificates/certificate/details.js
deleted file mode 100644
index 6466bbb8cc5d3..0000000000000
--- a/ui/lib/pki/addon/routes/certificates/certificate/details.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-
-export default class PkiCertificateDetailsRoute extends Route {
-  @service store;
-  @service secretMountPath;
-
-  model() {
-    const id = this.paramsFor('certificates/certificate').serial;
-    return this.store.queryRecord('pki/certificate/base', { backend: this.secretMountPath.currentPath, id });
-  }
-  setupController(controller, model) {
-    super.setupController(controller, model);
-    controller.breadcrumbs = [
-      { label: 'secrets', route: 'secrets', linkExternal: true },
-      { label: this.secretMountPath.currentPath, route: 'overview' },
-      { label: 'certificates', route: 'certificates.index' },
-      { label: model.id },
-    ];
-  }
-}
diff --git a/ui/lib/pki/addon/routes/certificates/index.js b/ui/lib/pki/addon/routes/certificates/index.js
deleted file mode 100644
index 2b88c90f0e726..0000000000000
--- a/ui/lib/pki/addon/routes/certificates/index.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-import { withConfig } from 'pki/decorators/check-config';
-import { hash } from 'rsvp';
-import { getCliMessage } from 'pki/routes/overview';
-
-@withConfig()
-export default class PkiCertificatesIndexRoute extends Route {
-  @service store;
-  @service secretMountPath;
-
-  async fetchCertificates() {
-    try {
-      return await this.store.query('pki/certificate/base', { backend: this.secretMountPath.currentPath });
-    } catch (e) {
-      if (e.httpStatus === 404) {
-        return { parentModel: this.modelFor('certificates') };
-      } else {
-        throw e;
-      }
-    }
-  }
-
-  model() {
-    return hash({
-      hasConfig: this.shouldPromptConfig,
-      certificates: this.fetchCertificates(),
-      parentModel: this.modelFor('certificates'),
-    });
-  }
-
-  setupController(controller, resolvedModel) {
-    super.setupController(controller, resolvedModel);
-    const certificates = resolvedModel.certificates;
-
-    if (certificates?.length) controller.notConfiguredMessage = getCliMessage('certificates');
-    else controller.notConfiguredMessage = getCliMessage();
-  }
-}
diff --git a/ui/lib/pki/addon/routes/configuration.js b/ui/lib/pki/addon/routes/configuration.js
deleted file mode 100644
index 90e4e0f23e719..0000000000000
--- a/ui/lib/pki/addon/routes/configuration.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-import { hash } from 'rsvp';
-
-export default class PkiConfigurationRoute extends Route {
-  @service store;
-
-  model() {
-    const engine = this.modelFor('application');
-    return hash({
-      engine,
-      acme: this.store.findRecord('pki/config/acme', engine.id).catch((e) => e.httpStatus),
-      cluster: this.store.findRecord('pki/config/cluster', engine.id).catch((e) => e.httpStatus),
-      urls: this.store.findRecord('pki/config/urls', engine.id).catch((e) => e.httpStatus),
-      crl: this.store.findRecord('pki/config/crl', engine.id).catch((e) => e.httpStatus),
-    });
-  }
-}
diff --git a/ui/lib/pki/addon/routes/configuration/create.js b/ui/lib/pki/addon/routes/configuration/create.js
deleted file mode 100644
index 61786d15b7c3f..0000000000000
--- a/ui/lib/pki/addon/routes/configuration/create.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-import { withConfirmLeave } from 'core/decorators/confirm-leave';
-import { hash } from 'rsvp';
-
-@withConfirmLeave('model.config', ['model.urls'])
-export default class PkiConfigurationCreateRoute extends Route {
-  @service secretMountPath;
-  @service store;
-
-  model() {
-    return hash({
-      config: this.store.createRecord('pki/action'),
-      urls: this.modelFor('configuration').urls,
-    });
-  }
-
-  setupController(controller, resolvedModel) {
-    super.setupController(controller, resolvedModel);
-    controller.breadcrumbs = [
-      { label: 'secrets', route: 'secrets', linkExternal: true },
-      { label: this.secretMountPath.currentPath, route: 'overview' },
-      { label: 'configure' },
-    ];
-  }
-}
diff --git a/ui/lib/pki/addon/routes/configuration/create/index.js b/ui/lib/pki/addon/routes/configuration/create/index.js
new file mode 100644
index 0000000000000..70fc318ba2f0e
--- /dev/null
+++ b/ui/lib/pki/addon/routes/configuration/create/index.js
@@ -0,0 +1,3 @@
+import Route from '@ember/routing/route';
+
+export default class ConfigurationCreateIndexRoute extends Route {}
diff --git a/ui/lib/pki/addon/routes/configuration/details.js b/ui/lib/pki/addon/routes/configuration/details.js
new file mode 100644
index 0000000000000..9f719c1886fcb
--- /dev/null
+++ b/ui/lib/pki/addon/routes/configuration/details.js
@@ -0,0 +1,3 @@
+import Route from '@ember/routing/route';
+
+export default class ConfigurationDetailsRoute extends Route {}
diff --git a/ui/lib/pki/addon/routes/configuration/edit.js b/ui/lib/pki/addon/routes/configuration/edit.js
index 38c084d5551e3..d987c6325dea9 100644
--- a/ui/lib/pki/addon/routes/configuration/edit.js
+++ b/ui/lib/pki/addon/routes/configuration/edit.js
@@ -1,34 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-import { withConfirmLeave } from 'core/decorators/confirm-leave';
-
-@withConfirmLeave('model.config', ['model.urls', 'model.crl'])
-export default class PkiConfigurationEditRoute extends Route {
-  @service secretMountPath;
-
-  model() {
-    const { acme, cluster, urls, crl, engine } = this.modelFor('configuration');
-    return {
-      engineId: engine.id,
-      acme,
-      cluster,
-      urls,
-      crl,
-    };
-  }
 
-  setupController(controller, resolvedModel) {
-    super.setupController(controller, resolvedModel);
-    controller.breadcrumbs = [
-      { label: 'secrets', route: 'secrets', linkExternal: true },
-      { label: this.secretMountPath.currentPath, route: 'overview' },
-      { label: 'configuration', route: 'configuration.index' },
-      { label: 'edit' },
-    ];
-  }
-}
+export default class ConfigurationEditRoute extends Route {}
diff --git a/ui/lib/pki/addon/routes/configuration/index.js b/ui/lib/pki/addon/routes/configuration/index.js
index e81a520dc6e86..fe5c5eba7a22f 100644
--- a/ui/lib/pki/addon/routes/configuration/index.js
+++ b/ui/lib/pki/addon/routes/configuration/index.js
@@ -1,35 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-import { withConfig } from 'pki/decorators/check-config';
-import { hash } from 'rsvp';
-
-@withConfig()
-export default class ConfigurationIndexRoute extends Route {
-  @service store;
-
-  async fetchMountConfig(backend) {
-    const mountConfig = await this.store.query('secret-engine', { path: backend });
-    if (mountConfig) {
-      return mountConfig.get('firstObject');
-    }
-  }
 
-  model() {
-    const { acme, cluster, urls, crl, engine } = this.modelFor('configuration');
-    return hash({
-      hasConfig: this.shouldPromptConfig,
-      engine,
-      acme,
-      cluster,
-      urls,
-      crl,
-      mountConfig: this.fetchMountConfig(engine.id),
-      issuerModel: this.store.createRecord('pki/issuer'),
-    });
-  }
-}
+export default class ConfigurationIndexRoute extends Route {}
diff --git a/ui/lib/pki/addon/routes/configuration/tidy.js b/ui/lib/pki/addon/routes/configuration/tidy.js
new file mode 100644
index 0000000000000..da9693e62c459
--- /dev/null
+++ b/ui/lib/pki/addon/routes/configuration/tidy.js
@@ -0,0 +1,3 @@
+import Route from '@ember/routing/route';
+
+export default class ConfigurationTidyRoute extends Route {}
diff --git a/ui/lib/pki/addon/routes/error.js b/ui/lib/pki/addon/routes/error.js
deleted file mode 100644
index 071a7f726e464..0000000000000
--- a/ui/lib/pki/addon/routes/error.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-
-export default class PkiRolesErrorRoute extends Route {
-  @service secretMountPath;
-
-  setupController(controller) {
-    super.setupController(...arguments);
-    controller.breadcrumbs = [
-      { label: 'secrets', route: 'secrets', linkExternal: true },
-      { label: this.secretMountPath.currentPath, route: 'overview' },
-    ];
-    controller.tabs = [
-      { label: 'Overview', route: 'overview' },
-      { label: 'Roles', route: 'roles.index' },
-      { label: 'Issuers', route: 'issuers.index' },
-      { label: 'Keys', route: 'keys.index' },
-      { label: 'Certificates', route: 'certificates.index' },
-      { label: 'Tidy', route: 'tidy.index' },
-      { label: 'Configuration', route: 'configuration.index' },
-    ];
-    controller.title = this.secretMountPath.currentPath;
-  }
-}
diff --git a/ui/lib/pki/addon/routes/index.js b/ui/lib/pki/addon/routes/index.js
deleted file mode 100644
index 4e0b5918f8502..0000000000000
--- a/ui/lib/pki/addon/routes/index.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-
-export default class PkiRoute extends Route {
-  @service router;
-
-  redirect() {
-    this.router.transitionTo('vault.cluster.secrets.backend.pki.overview');
-  }
-}
diff --git a/ui/lib/pki/addon/routes/issuers.js b/ui/lib/pki/addon/routes/issuers.js
new file mode 100644
index 0000000000000..acf837cd33f3e
--- /dev/null
+++ b/ui/lib/pki/addon/routes/issuers.js
@@ -0,0 +1,3 @@
+import Route from '@ember/routing/route';
+
+export default class PkiIssuersRoute extends Route {}
diff --git a/ui/lib/pki/addon/routes/issuers/generate-intermediate.js b/ui/lib/pki/addon/routes/issuers/generate-intermediate.js
deleted file mode 100644
index 4e4b31507b09e..0000000000000
--- a/ui/lib/pki/addon/routes/issuers/generate-intermediate.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-import { withConfirmLeave } from 'core/decorators/confirm-leave';
-
-@withConfirmLeave()
-export default class PkiIssuersGenerateIntermediateRoute extends Route {
-  @service store;
-  @service secretMountPath;
-
-  model() {
-    return this.store.createRecord('pki/action', { actionType: 'generate-csr' });
-  }
-
-  setupController(controller, resolvedModel) {
-    super.setupController(controller, resolvedModel);
-    controller.breadcrumbs = [
-      { label: 'secrets', route: 'secrets', linkExternal: true },
-      { label: this.secretMountPath.currentPath, route: 'overview' },
-      { label: 'issuers', route: 'issuers.index' },
-      { label: 'generate CSR' },
-    ];
-  }
-}
diff --git a/ui/lib/pki/addon/routes/issuers/generate-root.js b/ui/lib/pki/addon/routes/issuers/generate-root.js
deleted file mode 100644
index bc40f69637779..0000000000000
--- a/ui/lib/pki/addon/routes/issuers/generate-root.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-import { withConfirmLeave } from 'core/decorators/confirm-leave';
-
-@withConfirmLeave()
-export default class PkiIssuersGenerateRootRoute extends Route {
-  @service secretMountPath;
-  @service store;
-
-  model() {
-    return this.store.createRecord('pki/action', { actionType: 'generate-root' });
-  }
-
-  setupController(controller, resolvedModel) {
-    super.setupController(controller, resolvedModel);
-    controller.breadcrumbs = [
-      { label: 'secrets', route: 'secrets', linkExternal: true },
-      { label: this.secretMountPath.currentPath, route: 'overview' },
-      { label: 'generate root' },
-    ];
-  }
-}
diff --git a/ui/lib/pki/addon/routes/issuers/import.js b/ui/lib/pki/addon/routes/issuers/import.js
deleted file mode 100644
index c6312960e077c..0000000000000
--- a/ui/lib/pki/addon/routes/issuers/import.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-import { withConfirmLeave } from 'core/decorators/confirm-leave';
-
-@withConfirmLeave()
-export default class PkiIssuersImportRoute extends Route {
-  @service store;
-  @service secretMountPath;
-
-  model() {
-    return this.store.createRecord('pki/action');
-  }
-
-  setupController(controller, resolvedModel) {
-    super.setupController(controller, resolvedModel);
-    controller.breadcrumbs = [
-      { label: 'secrets', route: 'secrets', linkExternal: true },
-      { label: this.secretMountPath.currentPath, route: 'overview' },
-      { label: 'issuers', route: 'issuers.index' },
-      { label: 'import' },
-    ];
-  }
-}
diff --git a/ui/lib/pki/addon/routes/issuers/index.js b/ui/lib/pki/addon/routes/issuers/index.js
deleted file mode 100644
index a41fe59cc7512..0000000000000
--- a/ui/lib/pki/addon/routes/issuers/index.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-import { PKI_DEFAULT_EMPTY_STATE_MSG } from 'pki/routes/overview';
-
-export default class PkiIssuersListRoute extends Route {
-  @service store;
-  @service secretMountPath;
-
-  model() {
-    return this.store
-      .query('pki/issuer', { backend: this.secretMountPath.currentPath, isListView: true })
-      .then((issuersModel) => {
-        return { issuersModel, parentModel: this.modelFor('issuers') };
-      })
-      .catch((err) => {
-        if (err.httpStatus === 404) {
-          return { parentModel: this.modelFor('issuers') };
-        } else {
-          throw err;
-        }
-      });
-  }
-
-  setupController(controller, resolvedModel) {
-    super.setupController(controller, resolvedModel);
-    controller.breadcrumbs = [
-      { label: 'secrets', route: 'secrets', linkExternal: true },
-      { label: this.secretMountPath.currentPath, route: 'overview' },
-      { label: 'issuers', route: 'issuers.index' },
-    ];
-    controller.notConfiguredMessage = PKI_DEFAULT_EMPTY_STATE_MSG;
-  }
-}
diff --git a/ui/lib/pki/addon/routes/issuers/issuer.js b/ui/lib/pki/addon/routes/issuers/issuer.js
deleted file mode 100644
index b347dab1e7cc8..0000000000000
--- a/ui/lib/pki/addon/routes/issuers/issuer.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-
-export default class PkiIssuerIndexRoute extends Route {
-  @service store;
-  @service secretMountPath;
-
-  model() {
-    const { issuer_ref } = this.paramsFor('issuers/issuer');
-    return this.store.queryRecord('pki/issuer', {
-      backend: this.secretMountPath.currentPath,
-      id: issuer_ref,
-    });
-  }
-
-  setupController(controller, resolvedModel) {
-    super.setupController(controller, resolvedModel);
-    controller.breadcrumbs = [
-      { label: 'secrets', route: 'secrets', linkExternal: true },
-      { label: this.secretMountPath.currentPath, route: 'overview' },
-      { label: 'issuers', route: 'issuers.index' },
-    ];
-  }
-}
diff --git a/ui/lib/pki/addon/routes/issuers/issuer/cross-sign.js b/ui/lib/pki/addon/routes/issuers/issuer/cross-sign.js
deleted file mode 100644
index f3cb81a569739..0000000000000
--- a/ui/lib/pki/addon/routes/issuers/issuer/cross-sign.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-import { withConfirmLeave } from 'core/decorators/confirm-leave';
-
-@withConfirmLeave()
-export default class PkiIssuerCrossSignRoute extends Route {
-  @service store;
-  @service secretMountPath;
-
-  model() {
-    return this.modelFor('issuers.issuer');
-  }
-
-  setupController(controller, resolvedModel) {
-    super.setupController(controller, resolvedModel);
-
-    controller.breadcrumbs = [
-      { label: 'secrets', route: 'secrets', linkExternal: true },
-      { label: this.secretMountPath.currentPath, route: 'overview' },
-      { label: 'issuers', route: 'issuers.index' },
-      { label: resolvedModel.id, route: 'issuers.issuer.details' },
-      { label: 'cross-sign' },
-    ];
-  }
-}
diff --git a/ui/lib/pki/addon/routes/issuers/issuer/details.js b/ui/lib/pki/addon/routes/issuers/issuer/details.js
deleted file mode 100644
index fdbc988502cfe..0000000000000
--- a/ui/lib/pki/addon/routes/issuers/issuer/details.js
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-import { verifyCertificates } from 'vault/utils/parse-pki-cert';
-import { hash } from 'rsvp';
-
-export default class PkiIssuerDetailsRoute extends Route {
-  @service store;
-  @service secretMountPath;
-
-  model() {
-    const issuer = this.modelFor('issuers.issuer');
-    return hash({
-      issuer,
-      pem: this.fetchCertByFormat(issuer.id, 'pem'),
-      der: this.fetchCertByFormat(issuer.id, 'der'),
-      isRotatable: this.isRoot(issuer),
-    });
-  }
-
-  setupController(controller, resolvedModel) {
-    super.setupController(controller, resolvedModel);
-    controller.breadcrumbs = [
-      { label: 'secrets', route: 'secrets', linkExternal: true },
-      { label: this.secretMountPath.currentPath, route: 'overview' },
-      { label: 'issuers', route: 'issuers.index' },
-      { label: resolvedModel.issuer.id },
-    ];
-  }
-
-  /**
-   * @private fetches cert by format so it's available for download
-   */
-  fetchCertByFormat(issuerId, format) {
-    const endpoint = `/v1/${this.secretMountPath.currentPath}/issuer/${issuerId}/${format}`;
-    const adapter = this.store.adapterFor('application');
-    try {
-      return adapter.rawRequest(endpoint, 'GET', { unauthenticated: true }).then(function (response) {
-        if (format === 'der') {
-          return response.blob();
-        }
-        return response.text();
-      });
-    } catch (e) {
-      return null;
-    }
-  }
-
-  async isRoot({ certificate, keyId }) {
-    const isSelfSigned = await verifyCertificates(certificate, certificate);
-    return isSelfSigned && !!keyId;
-  }
-}
diff --git a/ui/lib/pki/addon/routes/issuers/issuer/edit.js b/ui/lib/pki/addon/routes/issuers/issuer/edit.js
deleted file mode 100644
index 0c2b6a0c0ceaa..0000000000000
--- a/ui/lib/pki/addon/routes/issuers/issuer/edit.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-import { withConfirmLeave } from 'core/decorators/confirm-leave';
-
-@withConfirmLeave()
-export default class PkiIssuerEditRoute extends Route {
-  @service store;
-  @service secretMountPath;
-
-  model() {
-    const { issuer_ref } = this.paramsFor('issuers/issuer');
-    return this.store.queryRecord('pki/issuer', {
-      backend: this.secretMountPath.currentPath,
-      id: issuer_ref,
-    });
-  }
-
-  setupController(controller, resolvedModel) {
-    super.setupController(controller, resolvedModel);
-    controller.breadcrumbs = [
-      { label: 'secrets', route: 'secrets', linkExternal: true },
-      { label: this.secretMountPath.currentPath, route: 'overview' },
-      { label: 'issuers', route: 'issuers.index' },
-      { label: resolvedModel.id, route: 'issuers.issuer.details' },
-      { label: 'update' },
-    ];
-  }
-}
diff --git a/ui/lib/pki/addon/routes/issuers/issuer/rotate-root.js b/ui/lib/pki/addon/routes/issuers/issuer/rotate-root.js
deleted file mode 100644
index 2d3dfbed38f1f..0000000000000
--- a/ui/lib/pki/addon/routes/issuers/issuer/rotate-root.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-import { hash } from 'rsvp';
-import { parseCertificate } from 'vault/utils/parse-pki-cert';
-import camelizeKeys from 'vault/utils/camelize-object-keys';
-import { withConfirmLeave } from 'core/decorators/confirm-leave';
-
-@withConfirmLeave('model.newRootModel')
-export default class PkiIssuerRotateRootRoute extends Route {
-  @service secretMountPath;
-  @service store;
-
-  model() {
-    const oldRoot = this.modelFor('issuers.issuer');
-    const certData = parseCertificate(oldRoot.certificate);
-    let parsingErrors;
-    if (certData.parsing_errors && certData.parsing_errors.length > 0) {
-      const errorMessage = certData.parsing_errors.map((e) => e.message).join(', ');
-      parsingErrors = errorMessage;
-    }
-    const newRootModel = this.store.createRecord('pki/action', {
-      actionType: 'rotate-root',
-      type: 'internal',
-      ...camelizeKeys(certData), // copy old root settings over to new one
-    });
-    return hash({
-      oldRoot,
-      newRootModel,
-      parsingErrors,
-    });
-  }
-
-  setupController(controller, resolvedModel) {
-    super.setupController(controller, resolvedModel);
-    controller.breadcrumbs = [
-      { label: 'secrets', route: 'secrets', linkExternal: true },
-      { label: this.secretMountPath.currentPath, route: 'overview' },
-      { label: 'issuers', route: 'issuers.index' },
-      { label: resolvedModel.oldRoot.id, route: 'issuers.issuer.details' },
-      { label: 'rotate root' },
-    ];
-  }
-}
diff --git a/ui/lib/pki/addon/routes/issuers/issuer/sign.js b/ui/lib/pki/addon/routes/issuers/issuer/sign.js
deleted file mode 100644
index 00e76255c1747..0000000000000
--- a/ui/lib/pki/addon/routes/issuers/issuer/sign.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Route from '@ember/routing/route';
-import { service } from '@ember/service';
-import { withConfirmLeave } from 'core/decorators/confirm-leave';
-
-@withConfirmLeave()
-export default class PkiIssuerSignRoute extends Route {
-  @service store;
-  @service secretMountPath;
-
-  model() {
-    const { issuer_ref } = this.paramsFor('issuers/issuer');
-    return this.store.createRecord('pki/sign-intermediate', { issuerRef: issuer_ref });
-  }
-  setupController(controller, resolvedModel) {
-    super.setupController(controller, resolvedModel);
-    controller.breadcrumbs = [
-      { label: 'secrets', route: 'secrets', linkExternal: true },
-      { label: this.secretMountPath.currentPath, route: 'overview' },
-      { label: 'issuers', route: 'issuers.index' },
-      { label: resolvedModel.issuerRef, route: 'issuers.issuer.details' },
-      { label: 'sign intermediate' },
-    ];
-  }
-}
diff --git a/ui/lib/pki/addon/routes/keys.js b/ui/lib/pki/addon/routes/keys.js
new file mode 100644
index 0000000000000..48d0037370cf3
--- /dev/null
+++ b/ui/lib/pki/addon/routes/keys.js
@@ -0,0 +1,3 @@
+import Route from '@ember/routing/route';
+
+export default class PkiKeysRoute extends Route {}
diff --git a/ui/lib/pki/addon/routes/keys/create.js b/ui/lib/pki/addon/routes/keys/create.js
deleted file mode 100644
index 044f9c26b0d63..0000000000000
--- a/ui/lib/pki/addon/routes/keys/create.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-import { withConfirmLeave } from 'core/decorators/confirm-leave';
-
-@withConfirmLeave()
-export default class PkiKeysCreateRoute extends Route {
-  @service secretMountPath;
-  @service store;
-
-  model() {
-    return this.store.createRecord('pki/key');
-  }
-
-  setupController(controller, resolvedModel) {
-    super.setupController(controller, resolvedModel);
-    controller.breadcrumbs = [
-      { label: 'secrets', route: 'secrets', linkExternal: true },
-      { label: this.secretMountPath.currentPath, route: 'overview' },
-      { label: 'keys', route: 'keys.index' },
-      { label: 'generate' },
-    ];
-  }
-}
diff --git a/ui/lib/pki/addon/routes/keys/import.js b/ui/lib/pki/addon/routes/keys/import.js
deleted file mode 100644
index ce95a5af31ca4..0000000000000
--- a/ui/lib/pki/addon/routes/keys/import.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-import { withConfirmLeave } from 'core/decorators/confirm-leave';
-
-@withConfirmLeave()
-export default class PkiKeysImportRoute extends Route {
-  @service secretMountPath;
-  @service store;
-
-  model() {
-    return this.store.createRecord('pki/key');
-  }
-
-  setupController(controller, resolvedModel) {
-    super.setupController(controller, resolvedModel);
-    controller.breadcrumbs = [
-      { label: 'secrets', route: 'secrets', linkExternal: true },
-      { label: this.secretMountPath.currentPath, route: 'overview' },
-      { label: 'keys', route: 'keys.index' },
-      { label: 'import' },
-    ];
-  }
-}
diff --git a/ui/lib/pki/addon/routes/keys/index.js b/ui/lib/pki/addon/routes/keys/index.js
deleted file mode 100644
index 1c00969b0d531..0000000000000
--- a/ui/lib/pki/addon/routes/keys/index.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-import { withConfig } from 'pki/decorators/check-config';
-import { hash } from 'rsvp';
-import { PKI_DEFAULT_EMPTY_STATE_MSG } from 'pki/routes/overview';
-
-@withConfig()
-export default class PkiKeysIndexRoute extends Route {
-  @service secretMountPath;
-  @service store;
-
-  model() {
-    return hash({
-      hasConfig: this.shouldPromptConfig,
-      parentModel: this.modelFor('keys'),
-      keyModels: this.store.query('pki/key', { backend: this.secretMountPath.currentPath }).catch((err) => {
-        if (err.httpStatus === 404) {
-          return [];
-        } else {
-          throw err;
-        }
-      }),
-    });
-  }
-
-  setupController(controller, resolvedModel) {
-    super.setupController(controller, resolvedModel);
-    controller.breadcrumbs = [
-      { label: 'secrets', route: 'secrets', linkExternal: true },
-      { label: this.secretMountPath.currentPath, route: 'overview' },
-      { label: 'keys', route: 'keys.index' },
-    ];
-    controller.notConfiguredMessage = PKI_DEFAULT_EMPTY_STATE_MSG;
-  }
-}
diff --git a/ui/lib/pki/addon/routes/keys/key.js b/ui/lib/pki/addon/routes/keys/key.js
deleted file mode 100644
index 73136a0439b55..0000000000000
--- a/ui/lib/pki/addon/routes/keys/key.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-
-export default class PkiKeyRoute extends Route {
-  @service secretMountPath;
-  @service store;
-
-  model() {
-    const { key_id } = this.paramsFor('keys/key');
-    return this.store.queryRecord('pki/key', {
-      backend: this.secretMountPath.currentPath,
-      id: key_id,
-    });
-  }
-}
diff --git a/ui/lib/pki/addon/routes/keys/key/details.js b/ui/lib/pki/addon/routes/keys/key/details.js
deleted file mode 100644
index 42c1fc31b4bcf..0000000000000
--- a/ui/lib/pki/addon/routes/keys/key/details.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-
-export default class PkiKeyDetailsRoute extends Route {
-  @service secretMountPath;
-
-  model() {
-    return this.modelFor('keys.key');
-  }
-  setupController(controller, resolvedModel) {
-    super.setupController(controller, resolvedModel);
-    controller.breadcrumbs = [
-      { label: 'secrets', route: 'secrets', linkExternal: true },
-      { label: this.secretMountPath.currentPath, route: 'overview' },
-      { label: 'keys', route: 'keys.index' },
-      { label: resolvedModel.id },
-    ];
-  }
-}
diff --git a/ui/lib/pki/addon/routes/keys/key/edit.js b/ui/lib/pki/addon/routes/keys/key/edit.js
deleted file mode 100644
index 8c29d48b59f8e..0000000000000
--- a/ui/lib/pki/addon/routes/keys/key/edit.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { withConfirmLeave } from 'core/decorators/confirm-leave';
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-
-@withConfirmLeave()
-export default class PkiKeyEditRoute extends Route {
-  @service secretMountPath;
-
-  model() {
-    return this.modelFor('keys.key');
-  }
-
-  setupController(controller, resolvedModel) {
-    super.setupController(controller, resolvedModel);
-    controller.breadcrumbs = [
-      { label: 'secrets', route: 'secrets', linkExternal: true },
-      { label: this.secretMountPath.currentPath, route: 'overview' },
-      { label: 'keys', route: 'keys.index' },
-      { label: resolvedModel.id },
-    ];
-  }
-}
diff --git a/ui/lib/pki/addon/routes/overview.js b/ui/lib/pki/addon/routes/overview.js
index 63ede09b88c92..90a3856448c61 100644
--- a/ui/lib/pki/addon/routes/overview.js
+++ b/ui/lib/pki/addon/routes/overview.js
@@ -1,72 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-import { withConfig } from 'pki/decorators/check-config';
-import { hash } from 'rsvp';
-
-export const PKI_DEFAULT_EMPTY_STATE_MSG =
-  "This PKI mount hasn't yet been configured with a certificate issuer.";
-
-export const getCliMessage = (msg) => {
-  if (!msg) return PKI_DEFAULT_EMPTY_STATE_MSG;
-
-  return `${PKI_DEFAULT_EMPTY_STATE_MSG} There are existing ${msg}. Use the CLI to perform any operations with them until an issuer is configured.`;
-};
-
-@withConfig()
-export default class PkiOverviewRoute extends Route {
-  @service secretMountPath;
-  @service auth;
-  @service store;
-
-  async fetchAllCertificates() {
-    try {
-      return await this.store.query('pki/certificate/base', { backend: this.secretMountPath.currentPath });
-    } catch (e) {
-      return e.httpStatus;
-    }
-  }
-
-  async fetchAllRoles() {
-    try {
-      return await this.store.query('pki/role', { backend: this.secretMountPath.currentPath });
-    } catch (e) {
-      return e.httpStatus;
-    }
-  }
-
-  async fetchAllIssuers() {
-    try {
-      return await this.store.query('pki/issuer', { backend: this.secretMountPath.currentPath });
-    } catch (e) {
-      return e.httpStatus;
-    }
-  }
-
-  async model() {
-    return hash({
-      hasConfig: this.shouldPromptConfig,
-      engine: this.modelFor('application'),
-      roles: this.fetchAllRoles(),
-      issuers: this.fetchAllIssuers(),
-      certificates: this.fetchAllCertificates(),
-    });
-  }
-
-  setupController(controller, resolvedModel) {
-    super.setupController(controller, resolvedModel);
-    const roles = resolvedModel.roles;
-    const certificates = resolvedModel.certificates;
-
-    controller.notConfiguredMessage = getCliMessage();
 
-    if (roles?.length) controller.notConfiguredMessage = getCliMessage('roles');
-    if (certificates?.length) controller.notConfiguredMessage = getCliMessage('certificates');
-    if (roles?.length && certificates?.length)
-      controller.notConfiguredMessage = getCliMessage('roles and certificates');
-  }
-}
+export default class PkiOverviewRoute extends Route {}
diff --git a/ui/lib/pki/addon/routes/roles.js b/ui/lib/pki/addon/routes/roles.js
new file mode 100644
index 0000000000000..b135ba450b80e
--- /dev/null
+++ b/ui/lib/pki/addon/routes/roles.js
@@ -0,0 +1,3 @@
+import Route from '@ember/routing/route';
+
+export default class PkiRolesRoute extends Route {}
diff --git a/ui/lib/pki/addon/routes/roles/create.js b/ui/lib/pki/addon/routes/roles/create.js
deleted file mode 100644
index f17fd4ba38489..0000000000000
--- a/ui/lib/pki/addon/routes/roles/create.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-import { withConfirmLeave } from 'core/decorators/confirm-leave';
-import { hash } from 'rsvp';
-
-@withConfirmLeave('model.role', ['model.issuers'])
-export default class PkiRolesCreateRoute extends Route {
-  @service store;
-  @service secretMountPath;
-
-  model() {
-    const backend = this.secretMountPath.currentPath;
-    return hash({
-      role: this.store.createRecord('pki/role', { backend }),
-      issuers: this.store.query('pki/issuer', { backend }).catch((err) => {
-        if (err.httpStatus === 404) {
-          return [];
-        } else {
-          throw err;
-        }
-      }),
-    });
-  }
-
-  setupController(controller, resolvedModel) {
-    super.setupController(controller, resolvedModel);
-    controller.breadcrumbs = [
-      { label: 'secrets', route: 'secrets', linkExternal: true },
-      { label: this.secretMountPath.currentPath, route: 'overview' },
-      { label: 'roles', route: 'roles.index' },
-      { label: 'create' },
-    ];
-  }
-}
diff --git a/ui/lib/pki/addon/routes/roles/index.js b/ui/lib/pki/addon/routes/roles/index.js
index 25c6dddfeb241..89af38eea3984 100644
--- a/ui/lib/pki/addon/routes/roles/index.js
+++ b/ui/lib/pki/addon/routes/roles/index.js
@@ -1,43 +1,24 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
-import { withConfig } from 'pki/decorators/check-config';
-import { hash } from 'rsvp';
-import { getCliMessage } from 'pki/routes/overview';
-@withConfig()
-export default class PkiRolesIndexRoute extends Route {
+
+export default class RolesIndexRoute extends Route {
   @service store;
   @service secretMountPath;
+  @service pathHelp;
 
-  async fetchRoles() {
-    try {
-      return await this.store.query('pki/role', { backend: this.secretMountPath.currentPath });
-    } catch (e) {
-      if (e.httpStatus === 404) {
-        return { parentModel: this.modelFor('roles') };
-      } else {
-        throw e;
-      }
-    }
-  }
-
-  model() {
-    return hash({
-      hasConfig: this.shouldPromptConfig,
-      roles: this.fetchRoles(),
-      parentModel: this.modelFor('roles'),
-    });
-  }
-
-  setupController(controller, resolvedModel) {
-    super.setupController(controller, resolvedModel);
-    const roles = resolvedModel.roles;
+  async model() {
+    // the pathHelp service is needed for adding openAPI to the model
+    await this.pathHelp.getNewModel('pki/pki-role-engine', 'pki');
 
-    if (roles?.length) controller.notConfiguredMessage = getCliMessage('roles');
-    else controller.notConfiguredMessage = getCliMessage();
+    let response = await this.store
+      .query('pki/pki-role-engine', { backend: this.secretMountPath.currentPath })
+      .catch((err) => {
+        if (err.httpStatus === 404) {
+          return [];
+        } else {
+          throw err;
+        }
+      });
+    return response;
   }
 }
diff --git a/ui/lib/pki/addon/routes/roles/role/details.js b/ui/lib/pki/addon/routes/roles/role/details.js
index 25e77d947d22b..a1ac0a95bcf61 100644
--- a/ui/lib/pki/addon/routes/roles/role/details.js
+++ b/ui/lib/pki/addon/routes/roles/role/details.js
@@ -1,31 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-
-export default class RolesRoleDetailsRoute extends Route {
-  @service store;
-  @service secretMountPath;
-
-  model() {
-    const { role } = this.paramsFor('roles/role');
-    return this.store.queryRecord('pki/role', {
-      backend: this.secretMountPath.currentPath,
-      id: role,
-    });
-  }
 
-  setupController(controller, resolvedModel) {
-    super.setupController(controller, resolvedModel);
-    const { id } = resolvedModel;
-    controller.breadcrumbs = [
-      { label: 'secrets', route: 'secrets', linkExternal: true },
-      { label: this.secretMountPath.currentPath, route: 'overview' },
-      { label: 'roles', route: 'roles.index' },
-      { label: id },
-    ];
-  }
-}
+export default class RolesRoleDetailsRoute extends Route {}
diff --git a/ui/lib/pki/addon/routes/roles/role/edit.js b/ui/lib/pki/addon/routes/roles/role/edit.js
index a08426a36c481..5f192cc684edf 100644
--- a/ui/lib/pki/addon/routes/roles/role/edit.js
+++ b/ui/lib/pki/addon/routes/roles/role/edit.js
@@ -1,48 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-import { withConfirmLeave } from 'core/decorators/confirm-leave';
-import { hash } from 'rsvp';
-
-@withConfirmLeave('model.role', ['model.issuers'])
-export default class PkiRoleEditRoute extends Route {
-  @service store;
-  @service secretMountPath;
-
-  model() {
-    const { role } = this.paramsFor('roles/role');
-    const backend = this.secretMountPath.currentPath;
-
-    return hash({
-      role: this.store.queryRecord('pki/role', {
-        backend,
-        id: role,
-      }),
-      issuers: this.store.query('pki/issuer', { backend }).catch((err) => {
-        if (err.httpStatus === 404) {
-          return [];
-        } else {
-          throw err;
-        }
-      }),
-    });
-  }
 
-  setupController(controller, resolvedModel) {
-    super.setupController(controller, resolvedModel);
-    const {
-      role: { id },
-    } = resolvedModel;
-    controller.breadcrumbs = [
-      { label: 'secrets', route: 'secrets', linkExternal: true },
-      { label: this.secretMountPath.currentPath, route: 'overview' },
-      { label: 'roles', route: 'roles.index' },
-      { label: id, route: 'roles.role.details' },
-      { label: 'edit' },
-    ];
-  }
-}
+export default class RolesRoleEditRoute extends Route {}
diff --git a/ui/lib/pki/addon/routes/roles/role/generate.js b/ui/lib/pki/addon/routes/roles/role/generate.js
deleted file mode 100644
index 047933037c236..0000000000000
--- a/ui/lib/pki/addon/routes/roles/role/generate.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-import { withConfirmLeave } from 'core/decorators/confirm-leave';
-
-withConfirmLeave();
-export default class PkiRoleGenerateRoute extends Route {
-  @service store;
-  @service secretMountPath;
-
-  async model() {
-    const { role } = this.paramsFor('roles/role');
-    return this.store.createRecord('pki/certificate/generate', {
-      role,
-    });
-  }
-
-  setupController(controller, resolvedModel) {
-    super.setupController(controller, resolvedModel);
-    const { role } = this.paramsFor('roles/role');
-    controller.breadcrumbs = [
-      { label: 'secrets', route: 'secrets', linkExternal: true },
-      { label: this.secretMountPath.currentPath, route: 'overview' },
-      { label: 'roles', route: 'roles.index' },
-      { label: role, route: 'roles.role.details' },
-      { label: 'generate certificate' },
-    ];
-    // This is updated on successful generate in the controller
-    controller.hasSubmitted = false;
-  }
-}
diff --git a/ui/lib/pki/addon/routes/roles/role/sign.js b/ui/lib/pki/addon/routes/roles/role/sign.js
deleted file mode 100644
index e37f60edc5df9..0000000000000
--- a/ui/lib/pki/addon/routes/roles/role/sign.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-import { withConfirmLeave } from 'core/decorators/confirm-leave';
-
-withConfirmLeave();
-export default class PkiRoleSignRoute extends Route {
-  @service store;
-  @service secretMountPath;
-
-  model() {
-    const { role } = this.paramsFor('roles/role');
-    return this.store.createRecord('pki/certificate/sign', {
-      role,
-    });
-  }
-
-  setupController(controller, resolvedModel) {
-    super.setupController(controller, resolvedModel);
-    const { role } = this.paramsFor('roles/role');
-    controller.breadcrumbs = [
-      { label: 'secrets', route: 'secrets', linkExternal: true },
-      { label: this.secretMountPath.currentPath, route: 'overview' },
-      { label: 'roles', route: 'roles.index' },
-      { label: role, route: 'roles.role.details' },
-      { label: 'sign certificate' },
-    ];
-    // This is updated on successful generate in the controller
-    controller.hasSubmitted = false;
-  }
-}
diff --git a/ui/lib/pki/addon/routes/tidy.js b/ui/lib/pki/addon/routes/tidy.js
deleted file mode 100644
index d82b255c9849c..0000000000000
--- a/ui/lib/pki/addon/routes/tidy.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-import { withConfig } from 'pki/decorators/check-config';
-import { hash } from 'rsvp';
-
-@withConfig()
-export default class PkiTidyRoute extends Route {
-  @service store;
-
-  model() {
-    const engine = this.modelFor('application');
-    return hash({
-      hasConfig: this.shouldPromptConfig,
-      engine,
-      autoTidyConfig: this.store.findRecord('pki/tidy', engine.id),
-    });
-  }
-}
diff --git a/ui/lib/pki/addon/routes/tidy/auto.js b/ui/lib/pki/addon/routes/tidy/auto.js
deleted file mode 100644
index d52962cb46190..0000000000000
--- a/ui/lib/pki/addon/routes/tidy/auto.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import Route from '@ember/routing/route';
-
-export default class PkiTidyAutoRoute extends Route {
-  model() {
-    const { autoTidyConfig } = this.modelFor('tidy');
-    return autoTidyConfig;
-  }
-}
diff --git a/ui/lib/pki/addon/routes/tidy/auto/configure.js b/ui/lib/pki/addon/routes/tidy/auto/configure.js
deleted file mode 100644
index d119b5c282227..0000000000000
--- a/ui/lib/pki/addon/routes/tidy/auto/configure.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-import { withConfirmLeave } from 'core/decorators/confirm-leave';
-
-@withConfirmLeave()
-export default class PkiTidyAutoConfigureRoute extends Route {
-  @service store;
-  @service secretMountPath;
-
-  // inherits model from tidy/auto
-
-  setupController(controller, resolvedModel) {
-    super.setupController(controller, resolvedModel);
-    controller.breadcrumbs = [
-      { label: 'secrets', route: 'secrets', linkExternal: true },
-      { label: this.secretMountPath.currentPath, route: 'overview' },
-      { label: 'configuration', route: 'configuration.index' },
-      { label: 'tidy', route: 'tidy' },
-      { label: 'auto', route: 'tidy.auto' },
-      { label: 'configure' },
-    ];
-  }
-}
diff --git a/ui/lib/pki/addon/routes/tidy/auto/index.js b/ui/lib/pki/addon/routes/tidy/auto/index.js
deleted file mode 100644
index bab854823d2fc..0000000000000
--- a/ui/lib/pki/addon/routes/tidy/auto/index.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import Route from '@ember/routing/route';
-import { service } from '@ember/service';
-
-export default class TidyAutoIndexRoute extends Route {
-  @service secretMountPath;
-  @service store;
-
-  // inherits model from tidy/auto
-
-  setupController(controller) {
-    super.setupController(...arguments);
-    controller.breadcrumbs = [
-      { label: 'secrets', route: 'secrets', linkExternal: true },
-      { label: this.secretMountPath.currentPath, route: 'overview' },
-      { label: 'tidy', route: 'tidy.index' },
-      { label: 'auto' },
-    ];
-    controller.title = this.secretMountPath.currentPath;
-  }
-}
diff --git a/ui/lib/pki/addon/routes/tidy/index.js b/ui/lib/pki/addon/routes/tidy/index.js
deleted file mode 100644
index 335b713c86da2..0000000000000
--- a/ui/lib/pki/addon/routes/tidy/index.js
+++ /dev/null
@@ -1,47 +0,0 @@
-import Route from '@ember/routing/route';
-import { PKI_DEFAULT_EMPTY_STATE_MSG } from '../overview';
-import { hash } from 'rsvp';
-import { inject as service } from '@ember/service';
-import timestamp from 'core/utils/timestamp';
-
-export default class PkiTidyIndexRoute extends Route {
-  @service store;
-  @service secretMountPath;
-
-  async fetchTidyStatus() {
-    const adapter = this.store.adapterFor('application');
-    const tidyStatusResponse = await adapter.ajax(
-      `/v1/${this.secretMountPath.currentPath}/tidy-status`,
-      'GET'
-    );
-    const responseTimestamp = timestamp.now();
-    tidyStatusResponse.data.responseTimestamp = responseTimestamp;
-    return tidyStatusResponse.data;
-  }
-
-  model() {
-    const { hasConfig, autoTidyConfig, engine } = this.modelFor('tidy');
-
-    return hash({
-      tidyStatus: this.fetchTidyStatus(),
-      hasConfig,
-      autoTidyConfig,
-      engine,
-    });
-  }
-
-  setupController(controller, resolvedModel) {
-    super.setupController(controller, resolvedModel);
-    controller.notConfiguredMessage = PKI_DEFAULT_EMPTY_STATE_MSG;
-
-    controller.tidyStatus = resolvedModel.tidyStatus;
-    controller.fetchTidyStatus = this.fetchTidyStatus;
-    controller.pollTidyStatus.perform();
-  }
-
-  resetController(controller, isExiting) {
-    if (isExiting) {
-      controller.pollTidyStatus.cancelAll();
-    }
-  }
-}
diff --git a/ui/lib/pki/addon/routes/tidy/manual.js b/ui/lib/pki/addon/routes/tidy/manual.js
deleted file mode 100644
index 48f2ecd05eba1..0000000000000
--- a/ui/lib/pki/addon/routes/tidy/manual.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-import { withConfirmLeave } from 'core/decorators/confirm-leave';
-
-@withConfirmLeave()
-export default class PkiTidyManualRoute extends Route {
-  @service store;
-  @service secretMountPath;
-
-  model() {
-    return this.store.createRecord('pki/tidy', { backend: this.secretMountPath.currentPath });
-  }
-
-  setupController(controller, resolvedModel) {
-    super.setupController(controller, resolvedModel);
-    controller.breadcrumbs = [
-      { label: 'secrets', route: 'secrets', linkExternal: true },
-      { label: this.secretMountPath.currentPath, route: 'overview' },
-      { label: 'configuration', route: 'configuration.index' },
-      { label: 'tidy', route: 'tidy' },
-      { label: 'manual' },
-    ];
-  }
-}
diff --git a/ui/lib/pki/addon/templates/certificates.hbs b/ui/lib/pki/addon/templates/certificates.hbs
new file mode 100644
index 0000000000000..ed227a84ce7df
--- /dev/null
+++ b/ui/lib/pki/addon/templates/certificates.hbs
@@ -0,0 +1,10 @@
+<SecretListHeader
+  @model={{this.model}}
+  @backendCrumb={{hash
+    label=this.model.id
+    text=this.model.id
+    path="vault.cluster.secrets.backend.list-root"
+    model=this.model.id
+  }}
+  @isEngine={{true}}
+/>
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/certificates/certificate/details.hbs b/ui/lib/pki/addon/templates/certificates/certificate/details.hbs
deleted file mode 100644
index 895f1bd0a35cc..0000000000000
--- a/ui/lib/pki/addon/templates/certificates/certificate/details.hbs
+++ /dev/null
@@ -1,12 +0,0 @@
-<PageHeader as |p|>
-  <p.top>
-    <Page::Breadcrumbs @breadcrumbs={{this.breadcrumbs}} />
-  </p.top>
-  <p.levelLeft>
-    <h1 class="title is-3">
-      <Icon @name="certificate" @size="24" class="has-text-grey-light" />
-      View certificate
-    </h1>
-  </p.levelLeft>
-</PageHeader>
-<Page::PkiCertificateDetails @model={{this.model}} />
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/certificates/index.hbs b/ui/lib/pki/addon/templates/certificates/index.hbs
deleted file mode 100644
index e7e76fb6680c2..0000000000000
--- a/ui/lib/pki/addon/templates/certificates/index.hbs
+++ /dev/null
@@ -1,76 +0,0 @@
-<SecretListHeader
-  @model={{this.model.parentModel}}
-  @backendCrumb={{hash
-    label=this.model.parentModel.id
-    text=this.model.parentModel.id
-    path="vault.cluster.secrets.backend.list-root"
-    model=this.model.parentModel.id
-  }}
-  @isEngine={{true}}
-/>
-{{outlet}}
-<Toolbar>
-  {{#if this.model.certificates.length}}
-    <ToolbarFilters>
-      {{! TODO add NavigateInput component }}
-    </ToolbarFilters>
-  {{/if}}
-</Toolbar>
-
-{{#if this.model.hasConfig}}
-  {{#if this.model.certificates.length}}
-    {{#each this.model.certificates as |pkiCertificate|}}
-      <LinkedBlock
-        class="list-item-row"
-        @params={{array "certificates.certificate.details" pkiCertificate.id}}
-        @linkPrefix={{this.mountPoint}}
-      >
-        <div class="level is-mobile">
-          <div class="level-left">
-            <div>
-              <Icon @name="certificate" class="has-text-grey-light" />
-              <span class="has-text-weight-semibold is-underline">
-                {{pkiCertificate.id}}
-              </span>
-              <div class="is-flex-row has-left-margin-l has-top-margin-xs">
-              </div>
-            </div>
-          </div>
-          <div class="level-right is-flex is-paddingless is-marginless">
-            <div class="level-item">
-              <PopupMenu>
-                <nav class="menu">
-                  <ul class="menu-list">
-                    <li>
-                      <LinkTo @route="certificates.certificate.details" @model={{pkiCertificate.id}}>
-                        Details
-                      </LinkTo>
-                    </li>
-                    {{! ARG TODO ask Ivana if we wnat revoke or maybe download action here? }}
-                  </ul>
-                </nav>
-              </PopupMenu>
-            </div>
-          </div>
-        </div>
-      </LinkedBlock>
-    {{/each}}
-  {{else}}
-    <EmptyState @title="No certificates yet">
-      <div>
-        <p>When created, certificates will be listed here. Select a role to start generating certificates.</p>
-        <div class="has-top-margin-m">
-          <LinkTo @route="roles.index">
-            View roles
-          </LinkTo>
-        </div>
-      </div>
-    </EmptyState>
-  {{/if}}
-{{else}}
-  <EmptyState @title="PKI not configured" @message={{this.notConfiguredMessage}}>
-    <LinkTo @route="configuration.create">
-      Configure PKI
-    </LinkTo>
-  </EmptyState>
-{{/if}}
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/configuration.hbs b/ui/lib/pki/addon/templates/configuration.hbs
deleted file mode 100644
index e2147cab02d61..0000000000000
--- a/ui/lib/pki/addon/templates/configuration.hbs
+++ /dev/null
@@ -1 +0,0 @@
-{{outlet}}
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/configuration/create.hbs b/ui/lib/pki/addon/templates/configuration/create.hbs
deleted file mode 100644
index 2c180aa03a6b9..0000000000000
--- a/ui/lib/pki/addon/templates/configuration/create.hbs
+++ /dev/null
@@ -1,6 +0,0 @@
-<Page::PkiConfigureCreate
-  @breadcrumbs={{this.breadcrumbs}}
-  @config={{this.model.config}}
-  @urls={{this.model.urls}}
-  @onCancel={{transition-to "vault.cluster.secrets.backend.pki.overview"}}
-/>
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/configuration/create/index.hbs b/ui/lib/pki/addon/templates/configuration/create/index.hbs
new file mode 100644
index 0000000000000..6b8911318eb46
--- /dev/null
+++ b/ui/lib/pki/addon/templates/configuration/create/index.hbs
@@ -0,0 +1 @@
+configuration.create.index
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/configuration/details.hbs b/ui/lib/pki/addon/templates/configuration/details.hbs
new file mode 100644
index 0000000000000..313389f227080
--- /dev/null
+++ b/ui/lib/pki/addon/templates/configuration/details.hbs
@@ -0,0 +1 @@
+configuration.details
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/configuration/edit.hbs b/ui/lib/pki/addon/templates/configuration/edit.hbs
index 995c5660caae7..e24ee323248bb 100644
--- a/ui/lib/pki/addon/templates/configuration/edit.hbs
+++ b/ui/lib/pki/addon/templates/configuration/edit.hbs
@@ -1,19 +1 @@
-<PageHeader as |p|>
-  <p.top>
-    <Page::Breadcrumbs @breadcrumbs={{this.breadcrumbs}} />
-  </p.top>
-  <p.levelLeft>
-    <h1 class="title is-3">
-      <Icon @name="file-text" @size="24" class="has-text-grey-light" />
-      Edit PKI configuration
-    </h1>
-  </p.levelLeft>
-</PageHeader>
-
-<Page::PkiConfigurationEdit
-  @acme={{this.model.acme}}
-  @cluster={{this.model.cluster}}
-  @urls={{this.model.urls}}
-  @crl={{this.model.crl}}
-  @backend={{this.model.engineId}}
-/>
\ No newline at end of file
+configuration.edit
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/configuration/index.hbs b/ui/lib/pki/addon/templates/configuration/index.hbs
index 460ac10e86fdd..c6206b69f772d 100644
--- a/ui/lib/pki/addon/templates/configuration/index.hbs
+++ b/ui/lib/pki/addon/templates/configuration/index.hbs
@@ -1,21 +1,39 @@
 <SecretListHeader
-  @model={{this.model.engine}}
+  @model={{this.model}}
   @backendCrumb={{hash
-    label=this.model.engine.id
-    text=this.model.engine.id
+    label=this.model.id
+    text=this.model.id
     path="vault.cluster.secrets.backend.list-root"
-    model=this.model.engine.id
+    model=this.model.id
   }}
   @isEngine={{true}}
 />
+<Toolbar>
+  <ToolbarActions>
+    <ToolbarLink @params={{array "configuration.tidy"}}>
+      Tidy
+    </ToolbarLink>
+    <ToolbarLink @params={{array "configuration.edit"}}>
+      Edit configuration
+    </ToolbarLink>
+  </ToolbarActions>
+</Toolbar>
 
-<Page::PkiConfigurationDetails
-  @acme={{this.model.acme}}
-  @cluster={{this.model.cluster}}
-  @urls={{this.model.urls}}
-  @crl={{this.model.crl}}
-  @mountConfig={{this.model.mountConfig}}
-  @backend={{this.model.engine.id}}
-  @canDeleteAllIssuers={{this.model.issuerModel.canDeleteAllIssuers}}
-  @hasConfig={{this.model.hasConfig}}
-/>
\ No newline at end of file
+<div class="form-section">
+  <label class="title has-padding-top is-5">
+    URLs
+  </label>
+</div>
+<div class="form-section">
+  <label class="title has-padding-top is-5">
+    CRL
+  </label>
+</div>
+<div class="form-section">
+  <label class="title has-padding-top is-5">
+    Mount Configuration
+  </label>
+  <div class="box is-fullwidth is-sideless is-paddingless is-marginless">
+    {{! ARG TODO component and empty state }}
+  </div>
+</div>
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/configuration/tidy.hbs b/ui/lib/pki/addon/templates/configuration/tidy.hbs
new file mode 100644
index 0000000000000..0fcbb9beab87b
--- /dev/null
+++ b/ui/lib/pki/addon/templates/configuration/tidy.hbs
@@ -0,0 +1 @@
+configuration.tidy
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/error.hbs b/ui/lib/pki/addon/templates/error.hbs
deleted file mode 100644
index 754cce2d874f0..0000000000000
--- a/ui/lib/pki/addon/templates/error.hbs
+++ /dev/null
@@ -1,24 +0,0 @@
-<PageHeader as |p|>
-  <p.top>
-    <Page::Breadcrumbs @breadcrumbs={{this.breadcrumbs}} />
-  </p.top>
-  <p.levelLeft>
-    <h1 class="title is-3">
-      <Icon @name="file-text" @size="24" class="has-text-grey-light" />
-      {{this.title}}
-    </h1>
-  </p.levelLeft>
-</PageHeader>
-<div class="tabs-container box is-bottomless is-marginless is-fullwidth is-paddingless">
-  <nav class="tabs" aria-label="secret tabs">
-    <ul>
-      {{#each this.tabs as |oTab|}}
-        <LinkTo @route={{oTab.route}} data-test-tab={{oTab.route}}>
-          {{oTab.label}}
-        </LinkTo>
-      {{/each}}
-    </ul>
-  </nav>
-</div>
-
-<Page::Error @error={{this.model}} />
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/issuers.hbs b/ui/lib/pki/addon/templates/issuers.hbs
new file mode 100644
index 0000000000000..ed227a84ce7df
--- /dev/null
+++ b/ui/lib/pki/addon/templates/issuers.hbs
@@ -0,0 +1,10 @@
+<SecretListHeader
+  @model={{this.model}}
+  @backendCrumb={{hash
+    label=this.model.id
+    text=this.model.id
+    path="vault.cluster.secrets.backend.list-root"
+    model=this.model.id
+  }}
+  @isEngine={{true}}
+/>
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/issuers/generate-intermediate.hbs b/ui/lib/pki/addon/templates/issuers/generate-intermediate.hbs
deleted file mode 100644
index 4523afd309baf..0000000000000
--- a/ui/lib/pki/addon/templates/issuers/generate-intermediate.hbs
+++ /dev/null
@@ -1 +0,0 @@
-<Page::PkiIssuerGenerateIntermediate @model={{this.model}} @breadcrumbs={{this.breadcrumbs}} />
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/issuers/generate-root.hbs b/ui/lib/pki/addon/templates/issuers/generate-root.hbs
deleted file mode 100644
index 574b54e396bc2..0000000000000
--- a/ui/lib/pki/addon/templates/issuers/generate-root.hbs
+++ /dev/null
@@ -1 +0,0 @@
-<Page::PkiIssuerGenerateRoot @model={{this.model}} @breadcrumbs={{this.breadcrumbs}} />
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/issuers/import.hbs b/ui/lib/pki/addon/templates/issuers/import.hbs
deleted file mode 100644
index 695e9e621a79b..0000000000000
--- a/ui/lib/pki/addon/templates/issuers/import.hbs
+++ /dev/null
@@ -1 +0,0 @@
-<Page::PkiIssuerImport @model={{this.model}} @breadcrumbs={{this.breadcrumbs}} />
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/issuers/index.hbs b/ui/lib/pki/addon/templates/issuers/index.hbs
deleted file mode 100644
index 4ad6b33719b01..0000000000000
--- a/ui/lib/pki/addon/templates/issuers/index.hbs
+++ /dev/null
@@ -1,57 +0,0 @@
-<SecretListHeader
-  @model={{this.model.parentModel}}
-  @backendCrumb={{hash
-    label=this.model.parentModel.id
-    text=this.model.parentModel.id
-    path="vault.cluster.secrets.backend.list-root"
-    model=this.model.parentModel.id
-  }}
-  @isEngine={{true}}
-/>
-<Toolbar>
-  <ToolbarActions>
-    <ToolbarLink @route="issuers.import" data-test-generate-issuer="import">
-      Import
-    </ToolbarLink>
-    <BasicDropdown @class="popup-menu" @horizontalPosition="auto-right" @verticalPosition="below" as |D|>
-      <D.Trigger
-        class={{concat "toolbar-link" (if D.isOpen " is-active")}}
-        @htmlTag="button"
-        data-test-issuer-generate-dropdown
-      >
-        Generate
-        <Chevron @direction="down" @isButton={{true}} />
-      </D.Trigger>
-      <D.Content @defaultClass="popup-menu-content">
-        <nav class="box menu" aria-label="generate options">
-          <ul class="menu-list">
-            <li class="action">
-              <LinkTo @route="issuers.generate-root" {{on "click" (fn this.onLinkClick D)}} data-test-generate-issuer="root">
-                Root
-              </LinkTo>
-            </li>
-            <li class="action">
-              <LinkTo
-                @route="issuers.generate-intermediate"
-                {{on "click" (fn this.onLinkClick D)}}
-                data-test-generate-issuer="intermediate"
-              >
-                Intermediate CSR
-              </LinkTo>
-            </li>
-          </ul>
-        </nav>
-      </D.Content>
-    </BasicDropdown>
-  </ToolbarActions>
-</Toolbar>
-
-{{#if this.model.issuersModel.length}}
-  <Page::PkiIssuerList @issuers={{this.model.issuersModel}} @mountPoint={{this.mountPoint}} />
-{{else}}
-  <EmptyState @title="PKI not configured" @message={{this.notConfiguredMessage}}>
-    <LinkTo @route="configuration.create">
-      Configure PKI
-    </LinkTo>
-  </EmptyState>
-{{/if}}
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/issuers/issuer/cross-sign.hbs b/ui/lib/pki/addon/templates/issuers/issuer/cross-sign.hbs
deleted file mode 100644
index 03d93d10f0d67..0000000000000
--- a/ui/lib/pki/addon/templates/issuers/issuer/cross-sign.hbs
+++ /dev/null
@@ -1,36 +0,0 @@
-<PageHeader as |p|>
-  <p.top>
-    <Page::Breadcrumbs @breadcrumbs={{this.breadcrumbs}} />
-  </p.top>
-  <p.levelLeft>
-    <h1 class="title is-3" data-test-pki-issuer-page-title>
-      Cross-sign issuers
-    </h1>
-  </p.levelLeft>
-</PageHeader>
-
-<div class="is-flex-row has-top-margin-s box is-fullwidth has-only-top-shadow">
-  <div class="has-right-margin-m" data-test-pki-cross-sign-steps>
-    <h2 class="title is-5">Cross-signing</h2>
-    <p class="has-text-grey">
-      Cross-signing will ensure that a chain of trust leads back to both your old root and the new one. This completes the
-      process of root rotation.
-    </p>
-    <h2 class="title is-5 has-top-padding-m">How cross-signing will work</h2>
-    <p class="has-text-grey">
-      <ol class="has-left-margin-m has-bottom-margin-s">
-        <li>You identify which intermediates need to be cross-signed.</li>
-        <li>The new CSR for your intermediate(s) will be generated.</li>
-        <li>The CSR is signed with the root <strong>{{this.model.issuerRef}}</strong>.</li>
-        <li>Your new intermediate(s) are imported into any existing mount(s).</li>
-      </ol>
-      Then, you can begin re-issuing leaf certs and phase out the old root.
-    </p>
-  </div>
-
-  <div class="has-left-margin-m">
-    <img data-test-pki-cross-sign-img src={{img-path "~/pki-cross-sign.png"}} alt="cross signing issuers diagram" />
-  </div>
-</div>
-
-<PkiIssuerCrossSign @parentIssuer={{this.model}} />
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/issuers/issuer/details.hbs b/ui/lib/pki/addon/templates/issuers/issuer/details.hbs
deleted file mode 100644
index 1aa7db2fc15e0..0000000000000
--- a/ui/lib/pki/addon/templates/issuers/issuer/details.hbs
+++ /dev/null
@@ -1,22 +0,0 @@
-<PageHeader as |p|>
-  <p.top>
-    <Page::Breadcrumbs @breadcrumbs={{this.breadcrumbs}} />
-  </p.top>
-  <p.levelLeft>
-    <h1 class="title is-3" data-test-pki-issuer-page-title>
-      <Icon @name="file-text" @size="24" class="has-text-grey-light" />
-      View issuer certificate
-    </h1>
-  </p.levelLeft>
-</PageHeader>
-
-<Page::PkiIssuerDetails
-  @issuer={{this.model.issuer}}
-  @pem={{this.model.pem}}
-  @der={{this.model.der}}
-  @isRotatable={{this.model.isRotatable}}
-  @canRotate={{this.model.issuer.canRotateIssuer}}
-  @canCrossSign={{this.model.issuer.canCrossSign}}
-  @canSignIntermediate={{this.model.issuer.canSignIntermediate}}
-  @canConfigure={{this.model.issuer.canConfigure}}
-/>
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/issuers/issuer/edit.hbs b/ui/lib/pki/addon/templates/issuers/issuer/edit.hbs
deleted file mode 100644
index f7e2eb42367fa..0000000000000
--- a/ui/lib/pki/addon/templates/issuers/issuer/edit.hbs
+++ /dev/null
@@ -1,12 +0,0 @@
-<PageHeader as |p|>
-  <p.top>
-    <Page::Breadcrumbs @breadcrumbs={{this.breadcrumbs}} />
-  </p.top>
-  <p.levelLeft>
-    <h1 class="title is-3" data-test-pki-issuer-page-title>
-      Update issuer
-    </h1>
-  </p.levelLeft>
-</PageHeader>
-
-<Page::PkiIssuerEdit @model={{this.model}} />
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/issuers/issuer/rotate-root.hbs b/ui/lib/pki/addon/templates/issuers/issuer/rotate-root.hbs
deleted file mode 100644
index 69d138ba2088f..0000000000000
--- a/ui/lib/pki/addon/templates/issuers/issuer/rotate-root.hbs
+++ /dev/null
@@ -1,8 +0,0 @@
-<Page::PkiIssuerRotateRoot
-  @oldRoot={{this.model.oldRoot}}
-  @newRootModel={{this.model.newRootModel}}
-  @parsingErrors={{this.model.parsingErrors}}
-  @breadcrumbs={{this.breadcrumbs}}
-  @onCancel={{transition-to "vault.cluster.secrets.backend.pki.issuers.issuer.details"}}
-  @onComplete={{transition-to "vault.cluster.secrets.backend.pki.issuers"}}
-/>
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/issuers/issuer/sign.hbs b/ui/lib/pki/addon/templates/issuers/issuer/sign.hbs
deleted file mode 100644
index 665cfa8c22e7d..0000000000000
--- a/ui/lib/pki/addon/templates/issuers/issuer/sign.hbs
+++ /dev/null
@@ -1,16 +0,0 @@
-<PageHeader as |p|>
-  <p.top>
-    <Page::Breadcrumbs @breadcrumbs={{this.breadcrumbs}} />
-  </p.top>
-  <p.levelLeft>
-    <h1 class="title is-3" data-test-pki-issuer-page-title>
-      <Icon @name="file-text" @size="24" class="has-text-grey-light" />
-      Sign intermediate
-    </h1>
-  </p.levelLeft>
-</PageHeader>
-
-<PkiSignIntermediateForm
-  @model={{this.model}}
-  @onCancel={{transition-to "vault.cluster.secrets.backend.pki.issuers.issuer.details" model=this.model.issuerRef}}
-/>
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/keys.hbs b/ui/lib/pki/addon/templates/keys.hbs
new file mode 100644
index 0000000000000..ed227a84ce7df
--- /dev/null
+++ b/ui/lib/pki/addon/templates/keys.hbs
@@ -0,0 +1,10 @@
+<SecretListHeader
+  @model={{this.model}}
+  @backendCrumb={{hash
+    label=this.model.id
+    text=this.model.id
+    path="vault.cluster.secrets.backend.list-root"
+    model=this.model.id
+  }}
+  @isEngine={{true}}
+/>
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/keys/create.hbs b/ui/lib/pki/addon/templates/keys/create.hbs
deleted file mode 100644
index 86a32f81282fd..0000000000000
--- a/ui/lib/pki/addon/templates/keys/create.hbs
+++ /dev/null
@@ -1,16 +0,0 @@
-<PageHeader as |p|>
-  <p.top>
-    <Page::Breadcrumbs @breadcrumbs={{this.breadcrumbs}} />
-  </p.top>
-  <p.levelLeft>
-    <h1 class="title is-3" data-test-pki-key-page-title>
-      Generate key
-    </h1>
-  </p.levelLeft>
-</PageHeader>
-
-<PkiKeyForm
-  @model={{this.model}}
-  @onCancel={{transition-to "vault.cluster.secrets.backend.pki.keys.index"}}
-  @onSave={{transition-to "vault.cluster.secrets.backend.pki.keys.key.details" this.model.id}}
-/>
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/keys/import.hbs b/ui/lib/pki/addon/templates/keys/import.hbs
deleted file mode 100644
index 8b03df5f1e9b5..0000000000000
--- a/ui/lib/pki/addon/templates/keys/import.hbs
+++ /dev/null
@@ -1,16 +0,0 @@
-<PageHeader as |p|>
-  <p.top>
-    <Page::Breadcrumbs @breadcrumbs={{this.breadcrumbs}} />
-  </p.top>
-  <p.levelLeft>
-    <h1 class="title is-3" data-test-pki-key-page-title>
-      Import key
-    </h1>
-  </p.levelLeft>
-</PageHeader>
-
-<PkiKeyImport
-  @model={{this.model}}
-  @onCancel={{transition-to "vault.cluster.secrets.backend.pki.keys.index"}}
-  @onSave={{transition-to "vault.cluster.secrets.backend.pki.keys.key.details" this.model.id}}
-/>
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/keys/index.hbs b/ui/lib/pki/addon/templates/keys/index.hbs
deleted file mode 100644
index eddf92d86891d..0000000000000
--- a/ui/lib/pki/addon/templates/keys/index.hbs
+++ /dev/null
@@ -1,27 +0,0 @@
-<SecretListHeader
-  @model={{this.model.parentModel}}
-  @backendCrumb={{hash
-    label=this.model.parentModel.id
-    text=this.model.parentModel.id
-    path="vault.cluster.secrets.backend.list-root"
-    model=this.model.parentModel.id
-  }}
-  @isEngine={{true}}
-/>
-{{#if (or this.model.hasConfig this.model.keyModels)}}
-  <Page::PkiKeyList
-    @keyModels={{this.model.keyModels}}
-    @mountPoint={{this.mountPoint}}
-    @canImportKey={{this.model.keyModels.firstObject.canImportKey}}
-    @canGenerateKey={{this.model.keyModels.firstObject.canGenerateKey}}
-    @canRead={{this.model.keyModels.firstObject.canRead}}
-    @canEdit={{this.model.keyModels.firstObject.canEdit}}
-  />
-{{else}}
-  <Toolbar />
-  <EmptyState @title="PKI not configured" @message={{this.notConfiguredMessage}}>
-    <LinkTo @route="configuration.create">
-      Configure PKI
-    </LinkTo>
-  </EmptyState>
-{{/if}}
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/keys/key/details.hbs b/ui/lib/pki/addon/templates/keys/key/details.hbs
deleted file mode 100644
index 1f44f2b3fcbff..0000000000000
--- a/ui/lib/pki/addon/templates/keys/key/details.hbs
+++ /dev/null
@@ -1,13 +0,0 @@
-<PageHeader as |p|>
-  <p.top>
-    <Page::Breadcrumbs @breadcrumbs={{this.breadcrumbs}} />
-  </p.top>
-  <p.levelLeft>
-    <h1 class="title is-3" data-test-key-details-title>
-      <Icon @name="certificate" @size="24" class="has-text-grey-light" />
-      View key
-    </h1>
-  </p.levelLeft>
-</PageHeader>
-
-<Page::PkiKeyDetails @key={{this.model}} @canDelete={{this.model.canDelete}} @canEdit={{this.model.canEdit}} />
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/keys/key/edit.hbs b/ui/lib/pki/addon/templates/keys/key/edit.hbs
deleted file mode 100644
index d97cd57e5588f..0000000000000
--- a/ui/lib/pki/addon/templates/keys/key/edit.hbs
+++ /dev/null
@@ -1,17 +0,0 @@
-<PageHeader as |p|>
-  <p.top>
-    <Page::Breadcrumbs @breadcrumbs={{this.breadcrumbs}} />
-  </p.top>
-  <p.levelLeft>
-    <h1 class="title is-3" data-test-key-details-title>
-      <Icon @name="certificate" @size="24" class="has-text-grey-light" />
-      Edit key
-    </h1>
-  </p.levelLeft>
-</PageHeader>
-
-<PkiKeyForm
-  @model={{this.model}}
-  @onCancel={{transition-to "vault.cluster.secrets.backend.pki.keys.key.details" this.model.id}}
-  @onSave={{transition-to "vault.cluster.secrets.backend.pki.keys.key.details" this.model.id}}
-/>
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/overview.hbs b/ui/lib/pki/addon/templates/overview.hbs
index f47fee3c4f736..d96973f6e0e0b 100644
--- a/ui/lib/pki/addon/templates/overview.hbs
+++ b/ui/lib/pki/addon/templates/overview.hbs
@@ -1,29 +1,24 @@
 <SecretListHeader
-  @model={{this.model.engine}}
+  @model={{this.model}}
   @backendCrumb={{hash
-    label=this.model.engine.id
-    text=this.model.engine.id
+    label=this.model.id
+    text=this.model.id
     path="vault.cluster.secrets.backend.list-root"
-    model=this.model.engine.id
+    model=this.model.id
   }}
   @isEngine={{true}}
 />
 <Toolbar>
   <ToolbarActions>
-    {{#unless this.model.hasConfig}}
-      <ToolbarLink @route="configuration.create">
-        Configure PKI
-      </ToolbarLink>
-    {{/unless}}
+    <ToolbarLink @params={{array "configuration.create.index"}}>
+      Configure PKI
+    </ToolbarLink>
   </ToolbarActions>
 </Toolbar>
 
-{{#if this.model.hasConfig}}
-  <Page::PkiOverview @issuers={{this.model.issuers}} @roles={{this.model.roles}} @engine={{this.model.engine}} />
-{{else}}
-  <EmptyState @title="PKI not configured" @message={{this.notConfiguredMessage}}>
-    <LinkTo @route="configuration.create">
-      Configure PKI
-    </LinkTo>
-  </EmptyState>
-{{/if}}
\ No newline at end of file
+{{! ARG TODO: add conditional for empty state }}
+<EmptyState @title="PKI not configured" @message="This PKI mount hasn’t yet been configured with a certificate issuer.">
+  <LinkTo @route="configuration.create.index" @model={{this.model}}>
+    Configure PKI
+  </LinkTo>
+</EmptyState>
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/roles.hbs b/ui/lib/pki/addon/templates/roles.hbs
new file mode 100644
index 0000000000000..c1651378d9bb9
--- /dev/null
+++ b/ui/lib/pki/addon/templates/roles.hbs
@@ -0,0 +1,11 @@
+<SecretListHeader
+  @model={{this.model}}
+  @backendCrumb={{hash
+    label=this.model.id
+    text=this.model.id
+    path="vault.cluster.secrets.backend.list-root"
+    model=this.model.id
+  }}
+  @isEngine={{true}}
+/>
+{{outlet}}
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/roles/create.hbs b/ui/lib/pki/addon/templates/roles/create.hbs
deleted file mode 100644
index 17018893df569..0000000000000
--- a/ui/lib/pki/addon/templates/roles/create.hbs
+++ /dev/null
@@ -1,18 +0,0 @@
-<PageHeader as |p|>
-  <p.top>
-    <Page::Breadcrumbs @breadcrumbs={{this.breadcrumbs}} />
-  </p.top>
-  <p.levelLeft>
-    <h1 class="title is-3" data-test-pki-role-page-title>
-      Create a PKI role
-    </h1>
-  </p.levelLeft>
-</PageHeader>
-
-<PkiRoleForm
-  @role={{this.model.role}}
-  @issuers={{this.model.issuers}}
-  @model={{this.model}}
-  @onCancel={{transition-to "vault.cluster.secrets.backend.pki.roles.index"}}
-  @onSave={{transition-to "vault.cluster.secrets.backend.pki.roles.role.details" this.model.role.id}}
-/>
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/roles/index.hbs b/ui/lib/pki/addon/templates/roles/index.hbs
index 89ad0fcb7e888..4fa9b0fca32ef 100644
--- a/ui/lib/pki/addon/templates/roles/index.hbs
+++ b/ui/lib/pki/addon/templates/roles/index.hbs
@@ -1,75 +1,65 @@
-<SecretListHeader
-  @model={{this.model.parentModel}}
-  @backendCrumb={{hash
-    label=this.model.parentModel.id
-    text=this.model.parentModel.id
-    path="vault.cluster.secrets.backend.list-root"
-    model=this.model.parentModel.id
-  }}
-  @isEngine={{true}}
-/>
+<Toolbar>
+  <ToolbarActions>
+    <ToolbarLink @type="add" @params={{array "roles.create"}}>
+      Create role
+    </ToolbarLink>
+  </ToolbarActions>
+</Toolbar>
 
-{{#if this.model.hasConfig}}
-  <Toolbar>
-    <ToolbarActions>
-      <ToolbarLink @type="add" @route="roles.create" data-test-pki-role-create-link>
-        Create role
-      </ToolbarLink>
-    </ToolbarActions>
-  </Toolbar>
-
-  {{#if this.model.roles.length}}
-    {{#each this.model.roles as |pkiRole|}}
-      <LinkedBlock class="list-item-row" @params={{array "roles.role.details" pkiRole.id}} @linkPrefix={{this.mountPoint}}>
-        <div class="level is-mobile">
-          <div class="level-left">
-            <div>
-              <Icon @name="user" class="has-text-grey-light" />
-              <span class="has-text-weight-semibold is-underline">
-                {{pkiRole.id}}
-              </span>
-            </div>
-          </div>
-          <div class="level-right is-flex is-paddingless is-marginless">
-            <div class="level-item">
-              <PopupMenu>
-                <nav class="menu">
-                  <ul class="menu-list">
-                    <li>
-                      <LinkTo @route="roles.role.details" @model={{pkiRole.id}}>
-                        Details
-                      </LinkTo>
-                    </li>
-                    <li>
-                      <LinkTo @route="roles.role.edit" @model={{pkiRole.id}}>
-                        Edit
-                      </LinkTo>
-                    </li>
-                  </ul>
-                </nav>
-              </PopupMenu>
-            </div>
+{{#if (gt this.model.length 0)}}
+  {{#each this.model as |model|}}
+    <LinkedBlock class="list-item-row" @params={{array "roles.role.details" model.id}} @linkPrefix={{this.mountPoint}}>
+      <div class="level is-mobile">
+        <div class="level-left">
+          <div>
+            <Icon @name="file" class="has-text-grey-light" />
+            <span class="has-text-weight-semibold is-underline">
+              {{model.id}}
+            </span>
           </div>
         </div>
-      </LinkedBlock>
-    {{/each}}
-  {{else}}
-    <EmptyState @title="No roles yet">
-      <div>
-        <p>When created, roles will be listed here. Create a role to start generating certificates.</p>
-        <div class="has-top-margin-m">
-          <LinkTo @route="roles.create">
-            Create role
-          </LinkTo>
+        <div class="level-right is-flex is-paddingless is-marginless">
+          <div class="level-item">
+            <PopupMenu>
+              <nav class="menu">
+                <ul class="menu-list">
+                  <li>
+                    <LinkTo
+                      @route="roles.role.details"
+                      @model={{model.id}}
+                      {{! ARG TODO return with permissions }}
+                      {{!-- @disabled={{eq model.canRead false}} --}}
+                    >
+                      Details
+                    </LinkTo>
+                  </li>
+                  <li>
+                    <LinkTo
+                      @route="roles.role.edit"
+                      @model={{model.id}}
+                      {{! ARG TODO return with permissions }}
+                      {{!-- @disabled={{eq model.canEdit false}} --}}
+                    >
+                      Edit
+                    </LinkTo>
+                  </li>
+                </ul>
+              </nav>
+            </PopupMenu>
+          </div>
         </div>
       </div>
-    </EmptyState>
-  {{/if}}
+    </LinkedBlock>
+  {{/each}}
 {{else}}
-  <Toolbar />
-  <EmptyState @title="PKI not configured" @message={{this.notConfiguredMessage}}>
-    <LinkTo @route="configuration.create">
-      Configure PKI
-    </LinkTo>
+  <EmptyState @title="No roles yet">
+    <div>
+      <p>When created, roles will be listed here. Create a role to start generating certificates.</p>
+      <div class="has-top-margin-m">
+        <LinkTo @route="roles.create">
+          Create role
+        </LinkTo>
+      </div>
+    </div>
   </EmptyState>
 {{/if}}
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/roles/role/details.hbs b/ui/lib/pki/addon/templates/roles/role/details.hbs
index b7d370af3361a..42c9f3efa94b0 100644
--- a/ui/lib/pki/addon/templates/roles/role/details.hbs
+++ b/ui/lib/pki/addon/templates/roles/role/details.hbs
@@ -1,13 +1 @@
-<PageHeader as |p|>
-  <p.top>
-    <Page::Breadcrumbs @breadcrumbs={{this.breadcrumbs}} />
-  </p.top>
-  <p.levelLeft>
-    <h1 class="title is-3" data-test-pki-role-page-title>
-      <Icon @name="file-text" @size="24" class="has-text-grey-light" />
-      PKI Role
-      <code>{{this.model.name}}</code>
-    </h1>
-  </p.levelLeft>
-</PageHeader>
-<Page::PkiRoleDetails @role={{this.model}} />
\ No newline at end of file
+roles.role.details
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/roles/role/edit.hbs b/ui/lib/pki/addon/templates/roles/role/edit.hbs
index 5e86297e65d70..716c573293a33 100644
--- a/ui/lib/pki/addon/templates/roles/role/edit.hbs
+++ b/ui/lib/pki/addon/templates/roles/role/edit.hbs
@@ -1,16 +1 @@
-<PageHeader as |p|>
-  <p.top>
-    <Page::Breadcrumbs @breadcrumbs={{this.breadcrumbs}} />
-  </p.top>
-  <p.levelLeft>
-    <h1 class="title is-3" data-test-pki-role-page-title>
-      Edit role
-    </h1>
-  </p.levelLeft>
-</PageHeader>
-<PkiRoleForm
-  @role={{this.model.role}}
-  @issuers={{this.model.issuers}}
-  @onCancel={{transition-to "vault.cluster.secrets.backend.pki.roles.role.details" this.model.role.id}}
-  @onSave={{transition-to "vault.cluster.secrets.backend.pki.roles.role.details" this.model.role.id}}
-/>
\ No newline at end of file
+roles.role.edit
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/roles/role/generate.hbs b/ui/lib/pki/addon/templates/roles/role/generate.hbs
deleted file mode 100644
index fd9b09f243747..0000000000000
--- a/ui/lib/pki/addon/templates/roles/role/generate.hbs
+++ /dev/null
@@ -1,13 +0,0 @@
-<PageHeader as |p|>
-  <p.top>
-    <Page::Breadcrumbs @breadcrumbs={{this.breadcrumbs}} />
-  </p.top>
-  <p.levelLeft>
-    <h1 class="title is-3" data-test-pki-role-page-title>
-      <Icon @name="certificate" @size="24" class="has-text-grey-light" />
-      {{if this.hasSubmitted "View generated certificate" "Generate certificate"}}
-    </h1>
-  </p.levelLeft>
-</PageHeader>
-
-<PkiRoleGenerate @onSuccess={{this.toggleTitle}} @model={{this.model}} />
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/roles/role/sign.hbs b/ui/lib/pki/addon/templates/roles/role/sign.hbs
deleted file mode 100644
index af0953d8d6236..0000000000000
--- a/ui/lib/pki/addon/templates/roles/role/sign.hbs
+++ /dev/null
@@ -1,13 +0,0 @@
-<PageHeader as |p|>
-  <p.top>
-    <Page::Breadcrumbs @breadcrumbs={{this.breadcrumbs}} />
-  </p.top>
-  <p.levelLeft>
-    <h1 class="title is-3" data-test-pki-role-page-title>
-      <Icon @name="certificate" @size="24" class="has-text-grey-light" />
-      {{if this.hasSubmitted "View signed certificate" "Sign certificate"}}
-    </h1>
-  </p.levelLeft>
-</PageHeader>
-
-<PkiRoleGenerate @model={{this.model}} @type="sign" @onSuccess={{this.toggleTitle}} />
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/tidy.hbs b/ui/lib/pki/addon/templates/tidy.hbs
deleted file mode 100644
index e2147cab02d61..0000000000000
--- a/ui/lib/pki/addon/templates/tidy.hbs
+++ /dev/null
@@ -1 +0,0 @@
-{{outlet}}
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/tidy/auto.hbs b/ui/lib/pki/addon/templates/tidy/auto.hbs
deleted file mode 100644
index e2147cab02d61..0000000000000
--- a/ui/lib/pki/addon/templates/tidy/auto.hbs
+++ /dev/null
@@ -1 +0,0 @@
-{{outlet}}
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/tidy/auto/configure.hbs b/ui/lib/pki/addon/templates/tidy/auto/configure.hbs
deleted file mode 100644
index cf2da60b40b86..0000000000000
--- a/ui/lib/pki/addon/templates/tidy/auto/configure.hbs
+++ /dev/null
@@ -1 +0,0 @@
-<Page::PkiTidyAutoConfigure @model={{this.model}} @breadcrumbs={{this.breadcrumbs}} />
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/tidy/auto/index.hbs b/ui/lib/pki/addon/templates/tidy/auto/index.hbs
deleted file mode 100644
index 82aec5f6f7b8c..0000000000000
--- a/ui/lib/pki/addon/templates/tidy/auto/index.hbs
+++ /dev/null
@@ -1 +0,0 @@
-<Page::PkiTidyAutoSettings @model={{this.model}} @breadcrumbs={{this.breadcrumbs}} />
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/tidy/index.hbs b/ui/lib/pki/addon/templates/tidy/index.hbs
deleted file mode 100644
index 608d5b498dce7..0000000000000
--- a/ui/lib/pki/addon/templates/tidy/index.hbs
+++ /dev/null
@@ -1,20 +0,0 @@
-<SecretListHeader
-  @model={{this.model.engine}}
-  @backendCrumb={{hash
-    label=this.model.engine.id
-    text=this.model.engine.id
-    path="vault.cluster.secrets.backend.list-root"
-    model=this.model.engine.id
-  }}
-  @isEngine={{true}}
-/>
-{{#if this.model.hasConfig}}
-  <Page::PkiTidyStatus @autoTidyConfig={{this.model.autoTidyConfig}} @tidyStatus={{this.tidyStatus}} />
-{{else}}
-  <Toolbar />
-  <EmptyState @title="PKI not configured" @message={{this.notConfiguredMessage}}>
-    <LinkTo @route="configuration.create">
-      Configure PKI
-    </LinkTo>
-  </EmptyState>
-{{/if}}
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/tidy/manual.hbs b/ui/lib/pki/addon/templates/tidy/manual.hbs
deleted file mode 100644
index b751914f5e52c..0000000000000
--- a/ui/lib/pki/addon/templates/tidy/manual.hbs
+++ /dev/null
@@ -1 +0,0 @@
-<Page::PkiTidyManual @model={{this.model}} @breadcrumbs={{this.breadcrumbs}} />
\ No newline at end of file
diff --git a/ui/lib/pki/addon/utils/action-params.js b/ui/lib/pki/addon/utils/action-params.js
deleted file mode 100644
index a57d0dd164032..0000000000000
--- a/ui/lib/pki/addon/utils/action-params.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-/**
- * keyParamsByType
- * @param {string} type - refers to `type` attribute on the pki/action model. Should be one of 'exported', 'internal', 'existing', 'kms'
- * @returns array of valid key-related attribute names (camelCase). NOTE: Key params are not used on all action endpoints
- */
-export function keyParamsByType(type) {
-  let fields = ['keyName', 'keyType', 'keyBits'];
-  if (type === 'existing') {
-    fields = ['keyRef'];
-  } else if (type === 'kms') {
-    fields = ['keyName', 'managedKeyName', 'managedKeyId'];
-  } else if (type === 'exported') {
-    fields = [...fields, 'privateKeyFormat'];
-  }
-  return fields;
-}
diff --git a/ui/lib/pki/app/utils/action-params.js b/ui/lib/pki/app/utils/action-params.js
deleted file mode 100644
index a40217fce3de8..0000000000000
--- a/ui/lib/pki/app/utils/action-params.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-// Necessary so that the pki-generate-root component tests work
-export { keyParamsByType } from 'pki/utils/action-params';
diff --git a/ui/lib/pki/config/environment.js b/ui/lib/pki/config/environment.js
index 9f6cf11709275..9d47f12d12ed3 100644
--- a/ui/lib/pki/config/environment.js
+++ b/ui/lib/pki/config/environment.js
@@ -1,13 +1,8 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /* eslint-env node */
 'use strict';
 
 module.exports = function (environment) {
-  const ENV = {
+  let ENV = {
     modulePrefix: 'pki',
     environment,
   };
diff --git a/ui/lib/pki/index.js b/ui/lib/pki/index.js
index afe3b983373cb..29837b151d29f 100644
--- a/ui/lib/pki/index.js
+++ b/ui/lib/pki/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /* eslint-disable node/no-extraneous-require */
 const { buildEngine } = require('ember-engines/lib/engine-addon');
 
diff --git a/ui/lib/pki/package.json b/ui/lib/pki/package.json
index 873f81402a886..85e8445646391 100644
--- a/ui/lib/pki/package.json
+++ b/ui/lib/pki/package.json
@@ -5,38 +5,8 @@
     "ember-engine"
   ],
   "dependencies": {
-    "ember-cli-babel": "*",
     "ember-cli-htmlbars": "*",
-    "ember-cli-typescript": "*",
-    "@hashicorp/design-system-components": "*",
-    "@types/ember": "latest",
-    "@types/ember-data": "latest",
-    "@types/ember-data__adapter": "latest",
-    "@types/ember-data__model": "latest",
-    "@types/ember-data__serializer": "latest",
-    "@types/ember-data__store": "latest",
-    "@types/ember-qunit": "latest",
-    "@types/ember-resolver": "latest",
-    "@types/ember__application": "latest",
-    "@types/ember__array": "latest",
-    "@types/ember__component": "latest",
-    "@types/ember__controller": "latest",
-    "@types/ember__debug": "latest",
-    "@types/ember__destroyable": "latest",
-    "@types/ember__engine": "latest",
-    "@types/ember__error": "latest",
-    "@types/ember__object": "latest",
-    "@types/ember__polyfills": "latest",
-    "@types/ember__routing": "latest",
-    "@types/ember__runloop": "latest",
-    "@types/ember__service": "latest",
-    "@types/ember__string": "latest",
-    "@types/ember__template": "latest",
-    "@types/ember__test": "latest",
-    "@types/ember__test-helpers": "latest",
-    "@types/ember__utils": "latest",
-    "@types/qunit": "latest",
-    "@types/rsvp": "latest"
+    "ember-cli-babel": "*"
   },
   "ember-addon": {
     "paths": [
diff --git a/ui/lib/replication/addon/.eslintrc.js b/ui/lib/replication/addon/.eslintrc.js
index fdcd34bad8796..3735f9a597823 100644
--- a/ui/lib/replication/addon/.eslintrc.js
+++ b/ui/lib/replication/addon/.eslintrc.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /* eslint-disable no-undef */
 module.exports = {
   env: {
diff --git a/ui/lib/replication/addon/components/known-secondaries-card.js b/ui/lib/replication/addon/components/known-secondaries-card.js
index 4594b718c9c5d..922796e6413d8 100644
--- a/ui/lib/replication/addon/components/known-secondaries-card.js
+++ b/ui/lib/replication/addon/components/known-secondaries-card.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@ember/component';
 
 /**
diff --git a/ui/lib/replication/addon/components/known-secondaries-table.js b/ui/lib/replication/addon/components/known-secondaries-table.js
index 07f529aae88bd..8b975e8c9f045 100644
--- a/ui/lib/replication/addon/components/known-secondaries-table.js
+++ b/ui/lib/replication/addon/components/known-secondaries-table.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@ember/component';
 
 /**
diff --git a/ui/lib/replication/addon/components/path-filter-config-list.js b/ui/lib/replication/addon/components/path-filter-config-list.js
index 68af82b2b73ac..ee5280098da5a 100644
--- a/ui/lib/replication/addon/components/path-filter-config-list.js
+++ b/ui/lib/replication/addon/components/path-filter-config-list.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@ember/component';
 import { set, computed } from '@ember/object';
 import { inject as service } from '@ember/service';
@@ -30,15 +25,15 @@ export default Component.extend({
   },
 
   fetchMountsForNamespace: task(function* (ns) {
-    const adapter = this.store.adapterFor('application');
-    const secret = [];
-    const auth = [];
-    const mounts = ns
+    let adapter = this.store.adapterFor('application');
+    let secret = [];
+    let auth = [];
+    let mounts = ns
       ? yield adapter.ajax('/v1/sys/internal/ui/mounts', 'GET', { namespace: ns })
       : yield adapter.ajax('/v1/sys/internal/ui/mounts', 'GET');
 
     ['secret', 'auth'].forEach((key) => {
-      for (const [id, info] of Object.entries(mounts.data[key])) {
+      for (let [id, info] of Object.entries(mounts.data[key])) {
         let longId;
         if (key === 'auth') {
           longId = ns ? `${ns}/auth/${id}` : `auth/${id}`;
@@ -64,10 +59,10 @@ export default Component.extend({
   }),
 
   filterOptions(list, term) {
-    const paths = this.config.paths;
+    let paths = this.config.paths;
     return list
       .map(({ groupName, options }) => {
-        const trimmedOptions = options.filter((op) => {
+        let trimmedOptions = options.filter((op) => {
           if (term) {
             return op.searchText.includes(term) && !paths.includes(op.id);
           }
@@ -79,23 +74,23 @@ export default Component.extend({
   },
 
   setAutoCompleteOptions: task(function* (term) {
-    const { namespaces, lastOptions } = this;
-    const namespaceToFetch = namespaces.find((ns) => ns === term);
+    let { namespaces, lastOptions } = this;
+    let namespaceToFetch = namespaces.find((ns) => ns === term);
     let secretList = [];
     let authList = [];
-    const options = [];
+    let options = [];
     if (term) {
       yield timeout(200);
     }
     if (!term || (term && namespaceToFetch)) {
       // fetch auth and secret methods from sys/internal/ui/mounts for the given namespace
-      const result = yield this.fetchMountsForNamespace.perform(namespaceToFetch);
+      let result = yield this.fetchMountsForNamespace.perform(namespaceToFetch);
       secretList = result.secret;
       authList = result.auth;
     }
     var currentSecrets = lastOptions && lastOptions.findBy('groupName', 'Secret Engines');
     var currentAuths = lastOptions && lastOptions.findBy('groupName', 'Auth Methods');
-    const formattedNamespaces = namespaces.map((val) => {
+    let formattedNamespaces = namespaces.map((val) => {
       return {
         id: val,
         name: val,
@@ -104,13 +99,13 @@ export default Component.extend({
     });
 
     options.push({ groupName: 'Namespaces', options: formattedNamespaces });
-    const secretOptions = currentSecrets ? [...currentSecrets.options, ...secretList] : secretList;
+    let secretOptions = currentSecrets ? [...currentSecrets.options, ...secretList] : secretList;
 
     options.push({ groupName: 'Secret Engines', options: secretOptions.uniqBy('id') });
-    const authOptions = currentAuths ? [...currentAuths.options, ...authList] : authList;
+    let authOptions = currentAuths ? [...currentAuths.options, ...authList] : authList;
 
     options.push({ groupName: 'Auth Methods', options: authOptions.uniqBy('id') });
-    const filtered = term ? this.filterOptions(options, term) : this.filterOptions(options);
+    let filtered = term ? this.filterOptions(options, term) : this.filterOptions(options);
     if (!term) {
       this.set('autoCompleteOptions', filtered);
     }
@@ -128,20 +123,12 @@ export default Component.extend({
   },
 
   actions: {
-    async pathsChanged(paths) {
+    pathsChanged(paths) {
       // set paths on the model
       set(this.config, 'paths', paths);
-
-      // if dropdown is empty or has options without groupName, re-fetch
-      if (
-        this.autoCompleteOptions.length === 0 ||
-        this.autoCompleteOptions.any((option) => !Object.keys(option).includes('groupName'))
-      ) {
-        await this.setAutoCompleteOptions.perform();
-      }
       if (paths.length) {
         // remove the selected item from the default list of options
-        const filtered = this.filterOptions(this.autoCompleteOptions);
+        let filtered = this.filterOptions(this.autoCompleteOptions);
         this.set('autoCompleteOptions', filtered);
       } else {
         // if there's no paths, we need to re-fetch like on init
diff --git a/ui/lib/replication/addon/components/replication-primary-card.js b/ui/lib/replication/addon/components/replication-primary-card.js
index 3a60dd3255b65..70d9fede47efe 100644
--- a/ui/lib/replication/addon/components/replication-primary-card.js
+++ b/ui/lib/replication/addon/components/replication-primary-card.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Component from '@ember/component';
 import { computed } from '@ember/object';
 import { clusterStates } from 'core/helpers/cluster-states';
diff --git a/ui/lib/replication/addon/components/replication-summary.js b/ui/lib/replication/addon/components/replication-summary.js
index 416cfb60444c8..4addef571677e 100644
--- a/ui/lib/replication/addon/components/replication-summary.js
+++ b/ui/lib/replication/addon/components/replication-summary.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import { alias } from '@ember/object/computed';
 import { computed } from '@ember/object';
diff --git a/ui/lib/replication/addon/controllers/application.js b/ui/lib/replication/addon/controllers/application.js
index 2891b9918faf8..dd833f1532f1d 100644
--- a/ui/lib/replication/addon/controllers/application.js
+++ b/ui/lib/replication/addon/controllers/application.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { isPresent } from '@ember/utils';
 import { alias } from '@ember/object/computed';
 import { inject as service } from '@ember/service';
diff --git a/ui/lib/replication/addon/controllers/index.js b/ui/lib/replication/addon/controllers/index.js
index 8e32ad30f8a19..4966bce8f3f03 100644
--- a/ui/lib/replication/addon/controllers/index.js
+++ b/ui/lib/replication/addon/controllers/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Controller from './replication-mode';
 
 export default Controller.extend();
diff --git a/ui/lib/replication/addon/controllers/mode.js b/ui/lib/replication/addon/controllers/mode.js
index 8e32ad30f8a19..4966bce8f3f03 100644
--- a/ui/lib/replication/addon/controllers/mode.js
+++ b/ui/lib/replication/addon/controllers/mode.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Controller from './replication-mode';
 
 export default Controller.extend();
diff --git a/ui/lib/replication/addon/controllers/mode/index.js b/ui/lib/replication/addon/controllers/mode/index.js
index 2c0729bf1a77b..b0d0fc2eedcfd 100644
--- a/ui/lib/replication/addon/controllers/mode/index.js
+++ b/ui/lib/replication/addon/controllers/mode/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Controller from '../replication-mode';
 
 export default Controller.extend();
diff --git a/ui/lib/replication/addon/controllers/mode/manage.js b/ui/lib/replication/addon/controllers/mode/manage.js
index 2c0729bf1a77b..b0d0fc2eedcfd 100644
--- a/ui/lib/replication/addon/controllers/mode/manage.js
+++ b/ui/lib/replication/addon/controllers/mode/manage.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Controller from '../replication-mode';
 
 export default Controller.extend();
diff --git a/ui/lib/replication/addon/controllers/mode/secondaries.js b/ui/lib/replication/addon/controllers/mode/secondaries.js
index 2c0729bf1a77b..b0d0fc2eedcfd 100644
--- a/ui/lib/replication/addon/controllers/mode/secondaries.js
+++ b/ui/lib/replication/addon/controllers/mode/secondaries.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Controller from '../replication-mode';
 
 export default Controller.extend();
diff --git a/ui/lib/replication/addon/controllers/mode/secondaries/add.js b/ui/lib/replication/addon/controllers/mode/secondaries/add.js
index 3cc5e4a5cd890..56644333cd032 100644
--- a/ui/lib/replication/addon/controllers/mode/secondaries/add.js
+++ b/ui/lib/replication/addon/controllers/mode/secondaries/add.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ReplicationController from 'replication/controllers/application';
 
 export default ReplicationController.extend({
diff --git a/ui/lib/replication/addon/controllers/mode/secondaries/config-create.js b/ui/lib/replication/addon/controllers/mode/secondaries/config-create.js
index cec4b84e3ed0d..092ead178f4d3 100644
--- a/ui/lib/replication/addon/controllers/mode/secondaries/config-create.js
+++ b/ui/lib/replication/addon/controllers/mode/secondaries/config-create.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export { default } from './config-edit';
diff --git a/ui/lib/replication/addon/controllers/mode/secondaries/config-edit.js b/ui/lib/replication/addon/controllers/mode/secondaries/config-edit.js
index ebd8366b7cbc0..a6dc615cf9133 100644
--- a/ui/lib/replication/addon/controllers/mode/secondaries/config-edit.js
+++ b/ui/lib/replication/addon/controllers/mode/secondaries/config-edit.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { alias } from '@ember/object/computed';
 import { inject as service } from '@ember/service';
 import Controller from '@ember/controller';
@@ -25,7 +20,7 @@ export default Controller.extend({
 
     saveConfig(config) {
       // if the mode is null, we want no filtering, so we should delete any existing config
-      const isDelete = config.mode === null;
+      let isDelete = config.mode === null;
       const flash = this.flashMessages;
       const id = config.id;
       const redirectArgs = isDelete
diff --git a/ui/lib/replication/addon/controllers/mode/secondaries/config-show.js b/ui/lib/replication/addon/controllers/mode/secondaries/config-show.js
index 1cff207dceda0..b5b82ad762fa8 100644
--- a/ui/lib/replication/addon/controllers/mode/secondaries/config-show.js
+++ b/ui/lib/replication/addon/controllers/mode/secondaries/config-show.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { alias } from '@ember/object/computed';
 import { inject as service } from '@ember/service';
 import Controller from '@ember/controller';
diff --git a/ui/lib/replication/addon/controllers/mode/secondaries/index.js b/ui/lib/replication/addon/controllers/mode/secondaries/index.js
index cb0fcc12893fb..6a80887200bae 100644
--- a/ui/lib/replication/addon/controllers/mode/secondaries/index.js
+++ b/ui/lib/replication/addon/controllers/mode/secondaries/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ReplicationController from 'replication/controllers/application';
 
 export default ReplicationController.extend();
diff --git a/ui/lib/replication/addon/controllers/mode/secondaries/revoke.js b/ui/lib/replication/addon/controllers/mode/secondaries/revoke.js
index cb0fcc12893fb..6a80887200bae 100644
--- a/ui/lib/replication/addon/controllers/mode/secondaries/revoke.js
+++ b/ui/lib/replication/addon/controllers/mode/secondaries/revoke.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ReplicationController from 'replication/controllers/application';
 
 export default ReplicationController.extend();
diff --git a/ui/lib/replication/addon/controllers/replication-mode.js b/ui/lib/replication/addon/controllers/replication-mode.js
index 39302ddce375c..c44dda45c2b4d 100644
--- a/ui/lib/replication/addon/controllers/replication-mode.js
+++ b/ui/lib/replication/addon/controllers/replication-mode.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { alias } from '@ember/object/computed';
 import { inject as service } from '@ember/service';
 import Controller from '@ember/controller';
diff --git a/ui/lib/replication/addon/engine.js b/ui/lib/replication/addon/engine.js
index 0c51771823398..26906b1c7c5a1 100644
--- a/ui/lib/replication/addon/engine.js
+++ b/ui/lib/replication/addon/engine.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Engine from 'ember-engines/engine';
 import loadInitializers from 'ember-load-initializers';
 import Resolver from './resolver';
diff --git a/ui/lib/replication/addon/resolver.js b/ui/lib/replication/addon/resolver.js
index 9a3b4b378edb5..2fb563d6c0488 100644
--- a/ui/lib/replication/addon/resolver.js
+++ b/ui/lib/replication/addon/resolver.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Resolver from 'ember-resolver';
 
 export default Resolver;
diff --git a/ui/lib/replication/addon/routes.js b/ui/lib/replication/addon/routes.js
index e0cffab193ee7..05ceec78194bd 100644
--- a/ui/lib/replication/addon/routes.js
+++ b/ui/lib/replication/addon/routes.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import buildRoutes from 'ember-engines/routes';
 
 export default buildRoutes(function () {
diff --git a/ui/lib/replication/addon/routes/application.js b/ui/lib/replication/addon/routes/application.js
index 7d98ecdfe8963..8c6fb9914d148 100644
--- a/ui/lib/replication/addon/routes/application.js
+++ b/ui/lib/replication/addon/routes/application.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import { setProperties } from '@ember/object';
 import { hash } from 'rsvp';
@@ -21,7 +16,8 @@ export default Route.extend(ClusterRoute, {
   },
 
   model() {
-    return this.auth.activeCluster;
+    const activeClusterId = this.auth.activeCluster;
+    return this.store.peekRecord('cluster', activeClusterId);
   },
 
   afterModel(model) {
diff --git a/ui/lib/replication/addon/routes/index.js b/ui/lib/replication/addon/routes/index.js
index 3bedf2ae6188d..ebc58f3835a2b 100644
--- a/ui/lib/replication/addon/routes/index.js
+++ b/ui/lib/replication/addon/routes/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import Route from '@ember/routing/route';
 
diff --git a/ui/lib/replication/addon/routes/mode.js b/ui/lib/replication/addon/routes/mode.js
index 014ab5d94117c..abf970c1a4c9b 100644
--- a/ui/lib/replication/addon/routes/mode.js
+++ b/ui/lib/replication/addon/routes/mode.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { inject as service } from '@ember/service';
 import { hash } from 'rsvp';
 import { setProperties } from '@ember/object';
diff --git a/ui/lib/replication/addon/routes/mode/index.js b/ui/lib/replication/addon/routes/mode/index.js
index 0f74690e59d61..7f064887e5bfc 100644
--- a/ui/lib/replication/addon/routes/mode/index.js
+++ b/ui/lib/replication/addon/routes/mode/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { setProperties } from '@ember/object';
 import { hash } from 'rsvp';
 import Route from '@ember/routing/route';
diff --git a/ui/lib/replication/addon/routes/mode/manage.js b/ui/lib/replication/addon/routes/mode/manage.js
index db037b4046596..cfa5e8452717c 100644
--- a/ui/lib/replication/addon/routes/mode/manage.js
+++ b/ui/lib/replication/addon/routes/mode/manage.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { camelize } from '@ember/string';
 import { all } from 'rsvp';
 import { inject as service } from '@ember/service';
diff --git a/ui/lib/replication/addon/routes/mode/secondaries.js b/ui/lib/replication/addon/routes/mode/secondaries.js
index 0f74690e59d61..7f064887e5bfc 100644
--- a/ui/lib/replication/addon/routes/mode/secondaries.js
+++ b/ui/lib/replication/addon/routes/mode/secondaries.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { setProperties } from '@ember/object';
 import { hash } from 'rsvp';
 import Route from '@ember/routing/route';
diff --git a/ui/lib/replication/addon/routes/mode/secondaries/add.js b/ui/lib/replication/addon/routes/mode/secondaries/add.js
index 741c8a1731573..467ebe29f151d 100644
--- a/ui/lib/replication/addon/routes/mode/secondaries/add.js
+++ b/ui/lib/replication/addon/routes/mode/secondaries/add.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Base from '../../replication-base';
 
 export default Base.extend({
diff --git a/ui/lib/replication/addon/routes/mode/secondaries/config-create.js b/ui/lib/replication/addon/routes/mode/secondaries/config-create.js
index ef51e9763d980..c664542ac03d1 100644
--- a/ui/lib/replication/addon/routes/mode/secondaries/config-create.js
+++ b/ui/lib/replication/addon/routes/mode/secondaries/config-create.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { hash } from 'rsvp';
 import { inject as service } from '@ember/service';
 import Base from '../../replication-base';
diff --git a/ui/lib/replication/addon/routes/mode/secondaries/config-edit.js b/ui/lib/replication/addon/routes/mode/secondaries/config-edit.js
index a208e9d2769b4..c0c38d85b0ba4 100644
--- a/ui/lib/replication/addon/routes/mode/secondaries/config-edit.js
+++ b/ui/lib/replication/addon/routes/mode/secondaries/config-edit.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { hash } from 'rsvp';
 import Base from '../../replication-base';
 
@@ -18,7 +13,7 @@ export default Base.extend({
 
   redirect(model) {
     const cluster = model.cluster;
-    const replicationMode = this.paramsFor('mode').replication_mode;
+    let replicationMode = this.paramsFor('mode').replication_mode;
     if (
       !this.version.hasPerfReplication ||
       replicationMode !== 'performance' ||
diff --git a/ui/lib/replication/addon/routes/mode/secondaries/config-show.js b/ui/lib/replication/addon/routes/mode/secondaries/config-show.js
index b08568367b8f7..e57e0fb2f1327 100644
--- a/ui/lib/replication/addon/routes/mode/secondaries/config-show.js
+++ b/ui/lib/replication/addon/routes/mode/secondaries/config-show.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { hash, resolve } from 'rsvp';
 import Base from '../../replication-base';
 
diff --git a/ui/lib/replication/addon/routes/mode/secondaries/revoke.js b/ui/lib/replication/addon/routes/mode/secondaries/revoke.js
index 923499d6ab28b..ef21ea863baf0 100644
--- a/ui/lib/replication/addon/routes/mode/secondaries/revoke.js
+++ b/ui/lib/replication/addon/routes/mode/secondaries/revoke.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Base from '../../replication-base';
 
 export default Base.extend({
diff --git a/ui/lib/replication/addon/routes/replication-base.js b/ui/lib/replication/addon/routes/replication-base.js
index c4e68b17bec51..b6599b926001d 100644
--- a/ui/lib/replication/addon/routes/replication-base.js
+++ b/ui/lib/replication/addon/routes/replication-base.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { alias } from '@ember/object/computed';
 import { inject as service } from '@ember/service';
 import Route from '@ember/routing/route';
diff --git a/ui/lib/replication/addon/templates/components/known-secondaries-card.hbs b/ui/lib/replication/addon/templates/components/known-secondaries-card.hbs
index 73177dde53b8b..335aacc6c8c4f 100644
--- a/ui/lib/replication/addon/templates/components/known-secondaries-card.hbs
+++ b/ui/lib/replication/addon/templates/components/known-secondaries-card.hbs
@@ -1,7 +1,7 @@
 <div class="selectable-card is-rounded secondaries">
   <div class="level">
     <h3 class="card-title title is-5">{{this.replicationAttrs.secondaries.length}} Known Secondaries</h3>
-    <ToolbarLink @route="mode.secondaries" @model={{this.cluster.replicationMode}} data-test-manage-link>
+    <ToolbarLink @params={{array "mode.secondaries" this.cluster.replicationMode}} data-test-manage-link={{true}}>
       View all
     </ToolbarLink>
   </div>
diff --git a/ui/lib/replication/addon/templates/components/replication-primary-card.hbs b/ui/lib/replication/addon/templates/components/replication-primary-card.hbs
index 628b77524d993..4c0a7586ef345 100644
--- a/ui/lib/replication/addon/templates/components/replication-primary-card.hbs
+++ b/ui/lib/replication/addon/templates/components/replication-primary-card.hbs
@@ -1,4 +1,4 @@
-<div class="selectable-card is-rounded {{dasherize this.title}} {{if this.hasError 'has-error-border'}}">
+<div class="selectable-card is-rounded {{dasherize this.title}} {{if this.hasError 'has-border-danger'}}">
   <h3 class="card-title title is-5">{{this.title}}</h3>
   <div>
     {{#if this.hasError}}
diff --git a/ui/lib/replication/addon/templates/components/replication-summary.hbs b/ui/lib/replication/addon/templates/components/replication-summary.hbs
index e86b810997210..cf72ebb2956c5 100644
--- a/ui/lib/replication/addon/templates/components/replication-summary.hbs
+++ b/ui/lib/replication/addon/templates/components/replication-summary.hbs
@@ -1,4 +1,5 @@
-{{#if (not (has-feature "DR Replication"))}}
+{{! template-lint-configure simple-unless "warn" }}
+{{#unless (has-feature "DR Replication")}}
   <UpgradePage @title="Replication" />
 {{else if (or this.cluster.allReplicationDisabled this.cluster.replicationAttrs.replicationDisabled)}}
   <PageHeader as |p|>
@@ -48,15 +49,15 @@
             <Icon @size="24" @name="replication-perf" />
             Performance Replication
           </h3>
-          {{#if (has-feature "Performance Replication")}}
+          {{#unless (has-feature "Performance Replication")}}
             <p class="help has-text-grey-dark">
-              {{replication-mode-description "performance"}}
+              Performance Replication is a feature of Vault Enterprise Premium
             </p>
           {{else}}
             <p class="help has-text-grey-dark">
-              Performance Replication is a feature of Vault Enterprise Premium
+              {{replication-mode-description "performance"}}
             </p>
-          {{/if}}
+          {{/unless}}
         {{/if}}
       {{else}}
         <p class="has-text-grey-dark box is-shadowless is-fullwidth has-slim-padding">
@@ -183,7 +184,7 @@
               (has-feature "Performance Replication")
             )
           }}
-            <div>
+            <div class="has-text-danger">
               <ToggleButton
                 @isOpen={{this.showExplanation}}
                 @openLabel="Disable Performance Replication in order to enable this cluster as a DR secondary."
@@ -211,9 +212,9 @@
             <div class="field">
               <label for="primary_api_addr" class="is-label">
                 Primary API address
-                {{#if (not (and this.token (not this.tokenIncludesAPIAddr)))}}
+                {{#unless (and this.token (not this.tokenIncludesAPIAddr))}}
                   <em class="is-optional">(optional)</em>
-                {{/if}}
+                {{/unless}}
               </label>
               <div class="control">
                 <Input @value={{this.primary_api_addr}} id="primary_api_addr" name="primary_api_addr" class="input" />
@@ -287,7 +288,7 @@
     {{/if}}
   </form>
 {{else if this.showModeSummary}}
-  {{#if (not (and this.cluster.dr.replicationEnabled this.cluster.performance.replicationEnabled))}}
+  {{#unless (and this.cluster.dr.replicationEnabled this.cluster.performance.replicationEnabled)}}
     <PageHeader as |p|>
       <p.levelLeft>
         <h1 class="title is-3">
@@ -295,7 +296,7 @@
         </h1>
       </p.levelLeft>
     </PageHeader>
-  {{/if}}
+  {{/unless}}
 
   {{#if (and (eq this.cluster.dr.mode "primary") (eq this.cluster.performance.mode "primary"))}}
     <ReplicationPage @model={{this.cluster}} as |Page|>
@@ -323,7 +324,7 @@
         <ReplicationModeSummary @mode="dr" @cluster={{this.cluster}} @tagName="div" />
       {{/if}}
     </div>
-    {{#if (not (and this.submit.isRunning (eq this.cluster.dr.mode "bootstrapping")))}}
+    {{#unless (and this.submit.isRunning (eq this.cluster.dr.mode "bootstrapping"))}}
       <div class="box is-bottomless is-fullwidth is-marginless">
         <h3 class="title is-flex-center is-5 is-marginless">
           <Icon @size="24" @name="replication-perf" />
@@ -333,7 +334,7 @@
           <ReplicationModeSummary @mode="performance" @cluster={{this.cluster}} @tagName="span" />
         </LinkTo>
       </div>
-    {{/if}}
+    {{/unless}}
   {{/if}}
 {{else}}
   {{#if (eq this.replicationAttrs.mode "initializing")}}
@@ -372,4 +373,4 @@
       </ReplicationPage>
     </div>
   {{/if}}
-{{/if}}
\ No newline at end of file
+{{/unless}}
\ No newline at end of file
diff --git a/ui/lib/replication/addon/templates/index.hbs b/ui/lib/replication/addon/templates/index.hbs
index bae4ef0ef918d..9aeac90ad7456 100644
--- a/ui/lib/replication/addon/templates/index.hbs
+++ b/ui/lib/replication/addon/templates/index.hbs
@@ -1,6 +1,7 @@
 <section class="section">
   <div class="container is-widescreen">
     {{#if this.model.replicationIsInitializing}}
+      <nav class="navbar"></nav>
       <LayoutLoading />
     {{else}}
       {{#if (eq this.model.mode "unsupported")}}
diff --git a/ui/lib/replication/addon/templates/mode.hbs b/ui/lib/replication/addon/templates/mode.hbs
index 0709e12cce3c6..90fc027ce16e0 100644
--- a/ui/lib/replication/addon/templates/mode.hbs
+++ b/ui/lib/replication/addon/templates/mode.hbs
@@ -1,6 +1,7 @@
 <section class="section">
   <div class="container is-widescreen">
     {{#if (and (eq this.model.drMode "secondary") (eq this.model.drModeInit "primary"))}}
+      <nav class="navbar"></nav>
       <LayoutLoading />
     {{else}}
       {{#if this.model.replicationAttrs.replicationEnabled}}
diff --git a/ui/lib/replication/addon/templates/mode/secondaries/config-show.hbs b/ui/lib/replication/addon/templates/mode/secondaries/config-show.hbs
index 504f7e6d6a750..52ce12069aced 100644
--- a/ui/lib/replication/addon/templates/mode/secondaries/config-show.hbs
+++ b/ui/lib/replication/addon/templates/mode/secondaries/config-show.hbs
@@ -2,16 +2,14 @@
   <ToolbarActions>
     {{#if this.model.config.mode}}
       <ToolbarLink
-        @route="mode.secondaries.config-edit"
-        @model={{this.model.config.id}}
+        @params={{array "mode.secondaries.config-edit" this.model.config.id}}
         data-test-replication-link="edit-mount-config"
       >
         Edit config
       </ToolbarLink>
     {{else}}
       <ToolbarLink
-        @route="mode.secondaries.config-create"
-        @params={{this.model.config.id}}
+        @params={{array "mode.secondaries.config-create" this.model.config.id}}
         data-test-replication-link="create-mount-config"
       >
         Create config
diff --git a/ui/lib/replication/addon/templates/mode/secondaries/index.hbs b/ui/lib/replication/addon/templates/mode/secondaries/index.hbs
index 6c4584eac37f0..193b3d2ebc446 100644
--- a/ui/lib/replication/addon/templates/mode/secondaries/index.hbs
+++ b/ui/lib/replication/addon/templates/mode/secondaries/index.hbs
@@ -3,13 +3,17 @@
     <ToolbarActions>
       {{#if this.model.replicationAttrs.knownSecondaries.length}}
         {{#if this.model.canRevokeSecondary}}
-          <ToolbarLink @route="mode.secondaries.revoke" @model={{this.replicationMode}}>
+          <ToolbarLink @params={{array "mode.secondaries.revoke" this.replicationMode}}>
             Revoke secondary
           </ToolbarLink>
         {{/if}}
       {{/if}}
       {{#if this.model.canAddSecondary}}
-        <ToolbarLink @route="mode.secondaries.add" @model={{this.replicationMode}} @type="add" data-test-secondary-add>
+        <ToolbarLink
+          @type="add"
+          @params={{array "mode.secondaries.add" this.replicationMode}}
+          data-test-secondary-add={{true}}
+        >
           Add secondary
         </ToolbarLink>
       {{/if}}
@@ -71,7 +75,7 @@
           Add secondary
         </LinkTo>
       {{/if}}
-      <DocLink @path="/vault/docs/internals/replication">
+      <DocLink @path="/docs/internals/replication.html">
         Learn more
       </DocLink>
     </EmptyState>
diff --git a/ui/lib/replication/addon/utils/decode-config-from-jwt.js b/ui/lib/replication/addon/utils/decode-config-from-jwt.js
index c4ddca3042f97..4cf9496ec12c4 100644
--- a/ui/lib/replication/addon/utils/decode-config-from-jwt.js
+++ b/ui/lib/replication/addon/utils/decode-config-from-jwt.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { decodeString } from 'core/utils/b64';
 
 /*
diff --git a/ui/lib/replication/config/environment.js b/ui/lib/replication/config/environment.js
index 35de50e6a9d5a..5b306f803d299 100644
--- a/ui/lib/replication/config/environment.js
+++ b/ui/lib/replication/config/environment.js
@@ -1,13 +1,8 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /* eslint-env node */
 'use strict';
 
 module.exports = function (environment) {
-  const ENV = {
+  let ENV = {
     modulePrefix: 'replication',
     environment,
   };
diff --git a/ui/lib/replication/index.js b/ui/lib/replication/index.js
index 5260ac2c87446..e8bb7caf46c07 100644
--- a/ui/lib/replication/index.js
+++ b/ui/lib/replication/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /* eslint-env node */
 /* eslint-disable ember/avoid-leaking-state-in-ember-objects */
 /* eslint-disable node/no-extraneous-require */
diff --git a/ui/lib/service-worker-authenticated-download/index.js b/ui/lib/service-worker-authenticated-download/index.js
index c7a9c04c1351b..bbec17dec2d16 100644
--- a/ui/lib/service-worker-authenticated-download/index.js
+++ b/ui/lib/service-worker-authenticated-download/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 'use strict';
 
 module.exports = {
diff --git a/ui/lib/service-worker-authenticated-download/service-worker-registration/index.js b/ui/lib/service-worker-authenticated-download/service-worker-registration/index.js
index 06630e6266ed3..6236505e09a73 100644
--- a/ui/lib/service-worker-authenticated-download/service-worker-registration/index.js
+++ b/ui/lib/service-worker-authenticated-download/service-worker-registration/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { addSuccessHandler } from 'ember-service-worker/service-worker-registration';
 
 addSuccessHandler(function (registration) {
diff --git a/ui/lib/service-worker-authenticated-download/service-worker/index.js b/ui/lib/service-worker-authenticated-download/service-worker/index.js
index ef719ff2b1e0b..5e180c6b767b9 100644
--- a/ui/lib/service-worker-authenticated-download/service-worker/index.js
+++ b/ui/lib/service-worker-authenticated-download/service-worker/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { createUrlRegEx, urlMatchesAnyPattern } from 'ember-service-worker/service-worker/url-utils';
 
 var patterns = ['/v1/sys/storage/raft/snapshot'];
@@ -28,7 +23,7 @@ function sendMessage(message) {
 
 function authenticateRequest(request) {
   // copy the reaquest headers so we can mutate them
-  const headers = new Headers(request.headers);
+  let headers = new Headers(request.headers);
 
   // get and set vault token so the request is authenticated
   return sendMessage({ action: 'getToken' }).then(function (token) {
diff --git a/ui/mirage/config.js b/ui/mirage/config.js
index 1ce4dea9ac5ce..c6eacb581d084 100644
--- a/ui/mirage/config.js
+++ b/ui/mirage/config.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import ENV from 'vault/config/environment';
 import handlers from './handlers';
 
diff --git a/ui/mirage/factories/configuration.js b/ui/mirage/factories/configuration.js
index df07dc81cf87f..a64f830923baf 100644
--- a/ui/mirage/factories/configuration.js
+++ b/ui/mirage/factories/configuration.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { Factory, trait } from 'ember-cli-mirage';
 
 export default Factory.extend({
diff --git a/ui/mirage/factories/feature.js b/ui/mirage/factories/feature.js
index 69935f61dee8a..832aee5ed152e 100644
--- a/ui/mirage/factories/feature.js
+++ b/ui/mirage/factories/feature.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { Factory } from 'ember-cli-mirage';
 
 export default Factory.extend({
diff --git a/ui/mirage/factories/kubernetes-config.js b/ui/mirage/factories/kubernetes-config.js
deleted file mode 100644
index 1c99abf5ee480..0000000000000
--- a/ui/mirage/factories/kubernetes-config.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { Factory } from 'ember-cli-mirage';
-
-export default Factory.extend({
-  kubernetes_host: 'https://192.168.99.100:8443',
-  kubernetes_ca_cert:
-    '-----BEGIN CERTIFICATE-----\nMIIDNTCCAh2gApGgAwIBAgIULNEk+01LpkDeJujfsAgIULNEkAgIULNEckApGgAwIBAg+01LpkDeJuj\n-----END CERTIFICATE-----',
-  disable_local_ca_jwt: true,
-
-  // property used only for record lookup and filtered from response payload
-  path: null,
-});
diff --git a/ui/mirage/factories/kubernetes-role.js b/ui/mirage/factories/kubernetes-role.js
deleted file mode 100644
index 9b9f7c593deb3..0000000000000
--- a/ui/mirage/factories/kubernetes-role.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { Factory, trait } from 'ember-cli-mirage';
-
-const generated_role_rules = `rules:
-- apiGroups: [""]
-  resources: ["secrets", "services"]
-  verbs: ["get", "watch", "list", "create", "delete", "deletecollection", "patch", "update"]
-`;
-const name_template = '{{.FieldName | lowercase}}';
-const extra_annotations = { foo: 'bar', baz: 'qux' };
-const extra_labels = { foobar: 'baz', barbaz: 'foo' };
-
-export default Factory.extend({
-  name: (i) => `role-${i}`,
-  allowed_kubernetes_namespaces: '*',
-  allowed_kubernetes_namespace_selector: '',
-  token_max_ttl: 86400,
-  token_default_ttl: 600,
-  service_account_name: 'default',
-  kubernetes_role_name: '',
-  kubernetes_role_type: 'Role',
-  generated_role_rules: '',
-  name_template: '',
-  extra_annotations: null,
-  extra_labels: null,
-
-  afterCreate(record) {
-    // only one of these three props can be defined
-    if (record.generated_role_rules) {
-      record.service_account_name = null;
-      record.kubernetes_role_name = null;
-    } else if (record.kubernetes_role_name) {
-      record.service_account_name = null;
-      record.generated_role_rules = null;
-    } else if (record.service_account_name) {
-      record.generated_role_rules = null;
-      record.kubernetes_role_name = null;
-    }
-  },
-  withRoleName: trait({
-    service_account_name: null,
-    generated_role_rules: null,
-    kubernetes_role_name: 'vault-k8s-secrets-role',
-    extra_annotations,
-    name_template,
-  }),
-  withRoleRules: trait({
-    service_account_name: null,
-    kubernetes_role_name: null,
-    generated_role_rules,
-    extra_annotations,
-    extra_labels,
-    name_template,
-  }),
-});
diff --git a/ui/mirage/factories/mfa-duo-method.js b/ui/mirage/factories/mfa-duo-method.js
index 25d98b1d3ae47..9f8d132c27c64 100644
--- a/ui/mirage/factories/mfa-duo-method.js
+++ b/ui/mirage/factories/mfa-duo-method.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { Factory } from 'ember-cli-mirage';
 
 export default Factory.extend({
diff --git a/ui/mirage/factories/mfa-login-enforcement.js b/ui/mirage/factories/mfa-login-enforcement.js
index aaa03323c6bb2..ca62a991fe714 100644
--- a/ui/mirage/factories/mfa-login-enforcement.js
+++ b/ui/mirage/factories/mfa-login-enforcement.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { Factory } from 'ember-cli-mirage';
 
 export default Factory.extend({
diff --git a/ui/mirage/factories/mfa-method.js b/ui/mirage/factories/mfa-method.js
index e807b3d66af46..e4857dbf4eed5 100644
--- a/ui/mirage/factories/mfa-method.js
+++ b/ui/mirage/factories/mfa-method.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { Factory } from 'ember-cli-mirage';
 
 export default Factory.extend({
diff --git a/ui/mirage/factories/mfa-okta-method.js b/ui/mirage/factories/mfa-okta-method.js
index cd60f65d5f8e2..2bf495066e559 100644
--- a/ui/mirage/factories/mfa-okta-method.js
+++ b/ui/mirage/factories/mfa-okta-method.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { Factory } from 'ember-cli-mirage';
 
 export default Factory.extend({
diff --git a/ui/mirage/factories/mfa-pingid-method.js b/ui/mirage/factories/mfa-pingid-method.js
index 3d3e63a41ac0d..947d3640d8e69 100644
--- a/ui/mirage/factories/mfa-pingid-method.js
+++ b/ui/mirage/factories/mfa-pingid-method.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { Factory } from 'ember-cli-mirage';
 
 export default Factory.extend({
diff --git a/ui/mirage/factories/mfa-totp-method.js b/ui/mirage/factories/mfa-totp-method.js
index 86eb1b2d0ec19..9b82a2b316c5e 100644
--- a/ui/mirage/factories/mfa-totp-method.js
+++ b/ui/mirage/factories/mfa-totp-method.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { Factory } from 'ember-cli-mirage';
 
 export default Factory.extend({
diff --git a/ui/mirage/factories/secret-engine.js b/ui/mirage/factories/secret-engine.js
index 0039379e068f1..57f5c09089eb9 100644
--- a/ui/mirage/factories/secret-engine.js
+++ b/ui/mirage/factories/secret-engine.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { Factory } from 'ember-cli-mirage';
 
 export default Factory.extend({
diff --git a/ui/mirage/factories/server.js b/ui/mirage/factories/server.js
index 5e03f76a656c3..2d9100b4d00eb 100644
--- a/ui/mirage/factories/server.js
+++ b/ui/mirage/factories/server.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { Factory } from 'ember-cli-mirage';
 
 export default Factory.extend({
diff --git a/ui/mirage/handlers/activity.js b/ui/mirage/handlers/activity.js
new file mode 100644
index 0000000000000..c783f8be1e61e
--- /dev/null
+++ b/ui/mirage/handlers/activity.js
@@ -0,0 +1,5666 @@
+export default function (server) {
+  // 1.10 API response
+  server.get('sys/version-history', function () {
+    return {
+      keys: ['1.9.0', '1.9.1', '1.9.2'],
+      key_info: {
+        '1.9.0': {
+          previous_version: null,
+          timestamp_installed: '2021-11-03T10:23:16Z',
+        },
+        '1.9.1': {
+          previous_version: '1.9.0',
+          timestamp_installed: '2021-12-03T10:23:16Z',
+        },
+        '1.9.2': {
+          previous_version: '1.9.1',
+          timestamp_installed: '2021-01-03T10:23:16Z',
+        },
+      },
+    };
+  });
+
+  server.get('sys/internal/counters/config', function () {
+    return {
+      request_id: '00001',
+      data: {
+        default_report_months: 12,
+        enabled: 'default-enable',
+        queries_available: true,
+        retention_months: 24,
+      },
+    };
+  });
+
+  server.get(
+    '/sys/internal/counters/activity',
+    function (_, req) {
+      const start_time = req.queryParams.start_time || '2021-03-17T00:00:00Z';
+      const end_time = req.queryParams.end_time || '2021-12-31T23:59:59Z';
+      return {
+        request_id: '26be5ab9-dcac-9237-ec12-269a8ca647d5',
+        data: {
+          start_time,
+          end_time,
+          total: {
+            _comment1: 'total client counts',
+            clients: 3637,
+            _comment2: 'following 2 fields are deprecated',
+            entity_clients: 1643,
+            non_entity_clients: 1994,
+          },
+          by_namespace: [
+            {
+              namespace_id: '5SWT8',
+              namespace_path: 'namespacelonglonglong4/',
+              counts: {
+                entity_clients: 171,
+                non_entity_clients: 20,
+                clients: 191,
+              },
+              mounts: [
+                {
+                  path: 'auth/method/uMGBU',
+                  counts: {
+                    clients: 35,
+                    entity_clients: 20,
+                    non_entity_clients: 15,
+                  },
+                },
+                {
+                  path: 'auth/method/8YJO3',
+                  counts: {
+                    clients: 28,
+                    entity_clients: 18,
+                    non_entity_clients: 10,
+                  },
+                },
+                {
+                  path: 'auth/method/Ro774',
+                  counts: {
+                    clients: 25,
+                    entity_clients: 15,
+                    non_entity_clients: 10,
+                  },
+                },
+                {
+                  path: 'auth/method/ZIpjT',
+                  counts: {
+                    clients: 20,
+                    entity_clients: 10,
+                    non_entity_clients: 10,
+                  },
+                },
+                {
+                  path: 'auth/method/jdRjF',
+                  counts: {
+                    clients: 27,
+                    entity_clients: 15,
+                    non_entity_clients: 12,
+                  },
+                },
+                {
+                  path: 'auth/method/yyBoC',
+                  counts: {
+                    clients: 24,
+                    entity_clients: 14,
+                    non_entity_clients: 10,
+                  },
+                },
+                {
+                  path: 'auth/method/WLxYp',
+                  counts: {
+                    clients: 18,
+                    entity_clients: 11,
+                    non_entity_clients: 7,
+                  },
+                },
+                {
+                  path: 'auth/method/SNM6V',
+                  counts: {
+                    clients: 5,
+                    entity_clients: 2,
+                    non_entity_clients: 3,
+                  },
+                },
+                {
+                  path: 'auth/method/vNHtH',
+                  counts: {
+                    clients: 9,
+                    entity_clients: 5,
+                    non_entity_clients: 4,
+                  },
+                },
+                {
+                  path: 'auth/method/EqmlO',
+                  counts: {
+                    clients: 0,
+                    entity_clients: 0,
+                    non_entity_clients: 0,
+                  },
+                },
+              ],
+            },
+            {
+              namespace_id: 'BCl56',
+              namespace_path: 'namespace8/',
+              counts: {
+                entity_clients: 141,
+                non_entity_clients: 47,
+                clients: 188,
+              },
+              mounts: [
+                {
+                  path: 'auth/method/LpVqc',
+                  counts: {
+                    clients: 35,
+                    entity_clients: 20,
+                    non_entity_clients: 15,
+                  },
+                },
+                {
+                  path: 'auth/method/VFHO6',
+                  counts: {
+                    clients: 33,
+                    entity_clients: 19,
+                    non_entity_clients: 14,
+                  },
+                },
+                {
+                  path: 'auth/method/utu0r',
+                  counts: {
+                    clients: 25,
+                    entity_clients: 16,
+                    non_entity_clients: 9,
+                  },
+                },
+                {
+                  path: 'auth/method/xikiW',
+                  counts: {
+                    clients: 25,
+                    entity_clients: 13,
+                    non_entity_clients: 12,
+                  },
+                },
+                {
+                  path: 'auth/method/uPSo6',
+                  counts: {
+                    clients: 18,
+                    entity_clients: 12,
+                    non_entity_clients: 6,
+                  },
+                },
+                {
+                  path: 'auth/method/Z8fpo',
+                  counts: {
+                    clients: 14,
+                    entity_clients: 7,
+                    non_entity_clients: 7,
+                  },
+                },
+                {
+                  path: 'auth/method/5BBm7',
+                  counts: {
+                    clients: 10,
+                    entity_clients: 8,
+                    non_entity_clients: 2,
+                  },
+                },
+                {
+                  path: 'auth/method/Eyxkz',
+                  counts: {
+                    clients: 11,
+                    entity_clients: 8,
+                    non_entity_clients: 3,
+                  },
+                },
+                {
+                  path: 'auth/method/QBC0w',
+                  counts: {
+                    clients: 13,
+                    entity_clients: 9,
+                    non_entity_clients: 4,
+                  },
+                },
+                {
+                  path: 'auth/method/8MdGr',
+                  counts: {
+                    clients: 4,
+                    entity_clients: 3,
+                    non_entity_clients: 1,
+                  },
+                },
+              ],
+            },
+            {
+              namespace_id: 'yHcL9',
+              namespace_path: 'namespace11/',
+              counts: {
+                entity_clients: 10,
+                non_entity_clients: 176,
+                clients: 186,
+              },
+              mounts: [
+                {
+                  path: 'auth/method/qT4Wl',
+                  counts: {
+                    clients: 33,
+                    entity_clients: 20,
+                    non_entity_clients: 13,
+                  },
+                },
+                {
+                  path: 'auth/method/Vhu56',
+                  counts: {
+                    clients: 22,
+                    entity_clients: 8,
+                    non_entity_clients: 14,
+                  },
+                },
+                {
+                  path: 'auth/method/PCc58',
+                  counts: {
+                    clients: 29,
+                    entity_clients: 16,
+                    non_entity_clients: 13,
+                  },
+                },
+                {
+                  path: 'auth/method/nPP4c',
+                  counts: {
+                    clients: 20,
+                    entity_clients: 13,
+                    non_entity_clients: 7,
+                  },
+                },
+                {
+                  path: 'auth/method/LY3am',
+                  counts: {
+                    clients: 29,
+                    entity_clients: 16,
+                    non_entity_clients: 13,
+                  },
+                },
+                {
+                  path: 'auth/method/McQ4X',
+                  counts: {
+                    clients: 20,
+                    entity_clients: 15,
+                    non_entity_clients: 5,
+                  },
+                },
+                {
+                  path: 'auth/method/NpjhH',
+                  counts: {
+                    clients: 17,
+                    entity_clients: 11,
+                    non_entity_clients: 6,
+                  },
+                },
+                {
+                  path: 'auth/method/ToKO8',
+                  counts: {
+                    clients: 12,
+                    entity_clients: 9,
+                    non_entity_clients: 3,
+                  },
+                },
+                {
+                  path: 'auth/method/wfApH',
+                  counts: {
+                    clients: 3,
+                    entity_clients: 2,
+                    non_entity_clients: 1,
+                  },
+                },
+                {
+                  path: 'auth/method/L9uWV',
+                  counts: {
+                    clients: 1,
+                    entity_clients: 0,
+                    non_entity_clients: 1,
+                  },
+                },
+              ],
+            },
+            {
+              namespace_id: 'bw5UO',
+              namespace_path: 'namespace6/',
+              counts: {
+                entity_clients: 29,
+                non_entity_clients: 155,
+                clients: 184,
+              },
+              mounts: [
+                {
+                  path: 'auth/method/XQUrA',
+                  counts: {
+                    clients: 34,
+                    entity_clients: 19,
+                    non_entity_clients: 15,
+                  },
+                },
+                {
+                  path: 'auth/method/1p6HR',
+                  counts: {
+                    clients: 30,
+                    entity_clients: 15,
+                    non_entity_clients: 15,
+                  },
+                },
+                {
+                  path: 'auth/method/qRjoJ',
+                  counts: {
+                    clients: 24,
+                    entity_clients: 12,
+                    non_entity_clients: 12,
+                  },
+                },
+                {
+                  path: 'auth/method/x9QQB',
+                  counts: {
+                    clients: 27,
+                    entity_clients: 16,
+                    non_entity_clients: 11,
+                  },
+                },
+                {
+                  path: 'auth/method/rezK4',
+                  counts: {
+                    clients: 20,
+                    entity_clients: 15,
+                    non_entity_clients: 5,
+                  },
+                },
+                {
+                  path: 'auth/method/qWNSS',
+                  counts: {
+                    clients: 23,
+                    entity_clients: 15,
+                    non_entity_clients: 8,
+                  },
+                },
+                {
+                  path: 'auth/method/OmQEf',
+                  counts: {
+                    clients: 14,
+                    entity_clients: 10,
+                    non_entity_clients: 4,
+                  },
+                },
+                {
+                  path: 'auth/method/PhoAy',
+                  counts: {
+                    clients: 8,
+                    entity_clients: 6,
+                    non_entity_clients: 2,
+                  },
+                },
+                {
+                  path: 'auth/method/aUuyM',
+                  counts: {
+                    clients: 3,
+                    entity_clients: 3,
+                    non_entity_clients: 0,
+                  },
+                },
+                {
+                  path: 'auth/method/kUj1S',
+                  counts: {
+                    clients: 1,
+                    entity_clients: 1,
+                    non_entity_clients: 0,
+                  },
+                },
+              ],
+            },
+            {
+              namespace_id: 'F0xGm',
+              namespace_path: 'namespace10/',
+              counts: {
+                entity_clients: 75,
+                non_entity_clients: 107,
+                clients: 182,
+              },
+              mounts: [
+                {
+                  path: 'auth/method/xYL0l',
+                  counts: {
+                    clients: 34,
+                    entity_clients: 19,
+                    non_entity_clients: 15,
+                  },
+                },
+                {
+                  path: 'auth/method/CwWM7',
+                  counts: {
+                    clients: 25,
+                    entity_clients: 13,
+                    non_entity_clients: 12,
+                  },
+                },
+                {
+                  path: 'auth/method/swCd0',
+                  counts: {
+                    clients: 29,
+                    entity_clients: 17,
+                    non_entity_clients: 12,
+                  },
+                },
+                {
+                  path: 'auth/method/0CZTs',
+                  counts: {
+                    clients: 21,
+                    entity_clients: 8,
+                    non_entity_clients: 13,
+                  },
+                },
+                {
+                  path: 'auth/method/9v04G',
+                  counts: {
+                    clients: 21,
+                    entity_clients: 13,
+                    non_entity_clients: 8,
+                  },
+                },
+                {
+                  path: 'auth/method/6hAlO',
+                  counts: {
+                    clients: 23,
+                    entity_clients: 12,
+                    non_entity_clients: 11,
+                  },
+                },
+                {
+                  path: 'auth/method/ydSdP',
+                  counts: {
+                    clients: 8,
+                    entity_clients: 4,
+                    non_entity_clients: 4,
+                  },
+                },
+                {
+                  path: 'auth/method/i0CTY',
+                  counts: {
+                    clients: 8,
+                    entity_clients: 6,
+                    non_entity_clients: 2,
+                  },
+                },
+                {
+                  path: 'auth/method/nevwU',
+                  counts: {
+                    clients: 6,
+                    entity_clients: 3,
+                    non_entity_clients: 3,
+                  },
+                },
+                {
+                  path: 'auth/method/k2jYC',
+                  counts: {
+                    clients: 7,
+                    entity_clients: 4,
+                    non_entity_clients: 3,
+                  },
+                },
+              ],
+            },
+            {
+              namespace_id: 'MSgZE',
+              namespace_path: 'namespace7/',
+              counts: {
+                entity_clients: 72,
+                non_entity_clients: 109,
+                clients: 181,
+              },
+              mounts: [
+                {
+                  path: 'auth/method/gD50V',
+                  counts: {
+                    clients: 31,
+                    entity_clients: 19,
+                    non_entity_clients: 12,
+                  },
+                },
+                {
+                  path: 'auth/method/iJRmf',
+                  counts: {
+                    clients: 31,
+                    entity_clients: 17,
+                    non_entity_clients: 14,
+                  },
+                },
+                {
+                  path: 'auth/method/GrNjy',
+                  counts: {
+                    clients: 18,
+                    entity_clients: 12,
+                    non_entity_clients: 6,
+                  },
+                },
+                {
+                  path: 'auth/method/r0Uw3',
+                  counts: {
+                    clients: 23,
+                    entity_clients: 11,
+                    non_entity_clients: 12,
+                  },
+                },
+                {
+                  path: 'auth/method/k2lQG',
+                  counts: {
+                    clients: 25,
+                    entity_clients: 18,
+                    non_entity_clients: 7,
+                  },
+                },
+                {
+                  path: 'auth/method/hJxto',
+                  counts: {
+                    clients: 15,
+                    entity_clients: 8,
+                    non_entity_clients: 7,
+                  },
+                },
+                {
+                  path: 'auth/method/vtDck',
+                  counts: {
+                    clients: 16,
+                    entity_clients: 8,
+                    non_entity_clients: 8,
+                  },
+                },
+                {
+                  path: 'auth/method/1CenH',
+                  counts: {
+                    clients: 9,
+                    entity_clients: 4,
+                    non_entity_clients: 5,
+                  },
+                },
+                {
+                  path: 'auth/method/M47Ey',
+                  counts: {
+                    clients: 8,
+                    entity_clients: 4,
+                    non_entity_clients: 4,
+                  },
+                },
+                {
+                  path: 'auth/method/gVT0t',
+                  counts: {
+                    clients: 5,
+                    entity_clients: 5,
+                    non_entity_clients: 0,
+                  },
+                },
+              ],
+            },
+            {
+              namespace_id: 'AAidI',
+              namespace_path: 'namespace20/',
+              counts: {
+                entity_clients: 39,
+                non_entity_clients: 141,
+                clients: 180,
+              },
+              mounts: [
+                {
+                  path: 'auth/method/zolCO',
+                  counts: {
+                    clients: 35,
+                    entity_clients: 20,
+                    non_entity_clients: 15,
+                  },
+                },
+                {
+                  path: 'auth/method/6p3g4',
+                  counts: {
+                    clients: 26,
+                    entity_clients: 15,
+                    non_entity_clients: 11,
+                  },
+                },
+                {
+                  path: 'auth/method/iKOdR',
+                  counts: {
+                    clients: 22,
+                    entity_clients: 12,
+                    non_entity_clients: 10,
+                  },
+                },
+                {
+                  path: 'auth/method/brnKt',
+                  counts: {
+                    clients: 30,
+                    entity_clients: 19,
+                    non_entity_clients: 11,
+                  },
+                },
+                {
+                  path: 'auth/method/qK3rr',
+                  counts: {
+                    clients: 17,
+                    entity_clients: 12,
+                    non_entity_clients: 5,
+                  },
+                },
+                {
+                  path: 'auth/method/DmAuN',
+                  counts: {
+                    clients: 13,
+                    entity_clients: 7,
+                    non_entity_clients: 6,
+                  },
+                },
+                {
+                  path: 'auth/method/krE4t',
+                  counts: {
+                    clients: 21,
+                    entity_clients: 13,
+                    non_entity_clients: 8,
+                  },
+                },
+                {
+                  path: 'auth/method/sFrWK',
+                  counts: {
+                    clients: 11,
+                    entity_clients: 10,
+                    non_entity_clients: 1,
+                  },
+                },
+                {
+                  path: 'auth/method/bQg4l',
+                  counts: {
+                    clients: 4,
+                    entity_clients: 2,
+                    non_entity_clients: 2,
+                  },
+                },
+                {
+                  path: 'auth/method/Jaw0k',
+                  counts: {
+                    clients: 1,
+                    entity_clients: 0,
+                    non_entity_clients: 1,
+                  },
+                },
+              ],
+            },
+            {
+              namespace_id: '5KxXA',
+              namespace_path: 'namespace18anotherlong/',
+              counts: {
+                entity_clients: 168,
+                non_entity_clients: 11,
+                clients: 179,
+              },
+              mounts: [
+                {
+                  path: 'auth/method/GkDM1',
+                  counts: {
+                    clients: 33,
+                    entity_clients: 18,
+                    non_entity_clients: 15,
+                  },
+                },
+                {
+                  path: 'auth/method/7deLa',
+                  counts: {
+                    clients: 30,
+                    entity_clients: 15,
+                    non_entity_clients: 15,
+                  },
+                },
+                {
+                  path: 'auth/method/Ash3Y',
+                  counts: {
+                    clients: 30,
+                    entity_clients: 17,
+                    non_entity_clients: 13,
+                  },
+                },
+                {
+                  path: 'auth/method/doKJ0',
+                  counts: {
+                    clients: 21,
+                    entity_clients: 13,
+                    non_entity_clients: 8,
+                  },
+                },
+                {
+                  path: 'auth/method/9Irmo',
+                  counts: {
+                    clients: 13,
+                    entity_clients: 5,
+                    non_entity_clients: 8,
+                  },
+                },
+                {
+                  path: 'auth/method/jdYx5',
+                  counts: {
+                    clients: 18,
+                    entity_clients: 12,
+                    non_entity_clients: 6,
+                  },
+                },
+                {
+                  path: 'auth/method/sYe2h',
+                  counts: {
+                    clients: 11,
+                    entity_clients: 6,
+                    non_entity_clients: 5,
+                  },
+                },
+                {
+                  path: 'auth/method/Z5F36',
+                  counts: {
+                    clients: 6,
+                    entity_clients: 3,
+                    non_entity_clients: 3,
+                  },
+                },
+                {
+                  path: 'auth/method/O0cuK',
+                  counts: {
+                    clients: 11,
+                    entity_clients: 6,
+                    non_entity_clients: 5,
+                  },
+                },
+                {
+                  path: 'auth/method/0clSt',
+                  counts: {
+                    clients: 6,
+                    entity_clients: 2,
+                    non_entity_clients: 4,
+                  },
+                },
+              ],
+            },
+            {
+              namespace_id: 'yYNw2',
+              namespace_path: 'namespace19/',
+              counts: {
+                entity_clients: 50,
+                non_entity_clients: 129,
+                clients: 179,
+              },
+              mounts: [
+                {
+                  path: 'auth/method/zD8lQ',
+                  counts: {
+                    clients: 31,
+                    entity_clients: 16,
+                    non_entity_clients: 15,
+                  },
+                },
+                {
+                  path: 'auth/method/Dl96I',
+                  counts: {
+                    clients: 31,
+                    entity_clients: 19,
+                    non_entity_clients: 12,
+                  },
+                },
+                {
+                  path: 'auth/method/ElIse',
+                  counts: {
+                    clients: 31,
+                    entity_clients: 19,
+                    non_entity_clients: 12,
+                  },
+                },
+                {
+                  path: 'auth/method/AXzhE',
+                  counts: {
+                    clients: 20,
+                    entity_clients: 13,
+                    non_entity_clients: 7,
+                  },
+                },
+                {
+                  path: 'auth/method/cNuC6',
+                  counts: {
+                    clients: 22,
+                    entity_clients: 12,
+                    non_entity_clients: 10,
+                  },
+                },
+                {
+                  path: 'auth/method/gXtbE',
+                  counts: {
+                    clients: 20,
+                    entity_clients: 13,
+                    non_entity_clients: 7,
+                  },
+                },
+                {
+                  path: 'auth/method/PptIE',
+                  counts: {
+                    clients: 12,
+                    entity_clients: 7,
+                    non_entity_clients: 5,
+                  },
+                },
+                {
+                  path: 'auth/method/QILdh',
+                  counts: {
+                    clients: 7,
+                    entity_clients: 5,
+                    non_entity_clients: 2,
+                  },
+                },
+                {
+                  path: 'auth/method/cClAS',
+                  counts: {
+                    clients: 2,
+                    entity_clients: 2,
+                    non_entity_clients: 0,
+                  },
+                },
+                {
+                  path: 'auth/method/YYm3v',
+                  counts: {
+                    clients: 3,
+                    entity_clients: 3,
+                    non_entity_clients: 0,
+                  },
+                },
+              ],
+            },
+            {
+              namespace_id: 'R6L40',
+              namespace_path: 'namespace2/',
+              counts: {
+                entity_clients: 121,
+                non_entity_clients: 56,
+                clients: 177,
+              },
+              mounts: [
+                {
+                  path: 'auth/method/824CE',
+                  counts: {
+                    clients: 33,
+                    entity_clients: 18,
+                    non_entity_clients: 15,
+                  },
+                },
+                {
+                  path: 'auth/method/r2zb4',
+                  counts: {
+                    clients: 29,
+                    entity_clients: 17,
+                    non_entity_clients: 12,
+                  },
+                },
+                {
+                  path: 'auth/method/1zfD6',
+                  counts: {
+                    clients: 25,
+                    entity_clients: 15,
+                    non_entity_clients: 10,
+                  },
+                },
+                {
+                  path: 'auth/method/L14lj',
+                  counts: {
+                    clients: 24,
+                    entity_clients: 14,
+                    non_entity_clients: 10,
+                  },
+                },
+                {
+                  path: 'auth/method/cTsw9',
+                  counts: {
+                    clients: 19,
+                    entity_clients: 12,
+                    non_entity_clients: 7,
+                  },
+                },
+                {
+                  path: 'auth/method/3KTWZ',
+                  counts: {
+                    clients: 19,
+                    entity_clients: 11,
+                    non_entity_clients: 8,
+                  },
+                },
+                {
+                  path: 'auth/method/Douf5',
+                  counts: {
+                    clients: 13,
+                    entity_clients: 6,
+                    non_entity_clients: 7,
+                  },
+                },
+                {
+                  path: 'auth/method/30eez',
+                  counts: {
+                    clients: 9,
+                    entity_clients: 7,
+                    non_entity_clients: 2,
+                  },
+                },
+                {
+                  path: 'auth/method/xSSJz',
+                  counts: {
+                    clients: 5,
+                    entity_clients: 3,
+                    non_entity_clients: 2,
+                  },
+                },
+                {
+                  path: 'auth/method/pR3x7',
+                  counts: {
+                    clients: 1,
+                    entity_clients: 0,
+                    non_entity_clients: 1,
+                  },
+                },
+              ],
+            },
+            {
+              namespace_id: 'Z4Rzh',
+              namespace_path: 'namespace1/',
+              counts: {
+                entity_clients: 142,
+                non_entity_clients: 33,
+                clients: 175,
+              },
+              mounts: [
+                {
+                  path: 'auth/method/NqMeC',
+                  counts: {
+                    clients: 34,
+                    entity_clients: 20,
+                    non_entity_clients: 14,
+                  },
+                },
+                {
+                  path: 'auth/method/S0FaZ',
+                  counts: {
+                    clients: 30,
+                    entity_clients: 20,
+                    non_entity_clients: 10,
+                  },
+                },
+                {
+                  path: 'auth/method/vzH3z',
+                  counts: {
+                    clients: 28,
+                    entity_clients: 17,
+                    non_entity_clients: 11,
+                  },
+                },
+                {
+                  path: 'auth/method/uP1zV',
+                  counts: {
+                    clients: 26,
+                    entity_clients: 14,
+                    non_entity_clients: 12,
+                  },
+                },
+                {
+                  path: 'auth/method/yAga3',
+                  counts: {
+                    clients: 14,
+                    entity_clients: 6,
+                    non_entity_clients: 8,
+                  },
+                },
+                {
+                  path: 'auth/method/DTAFz',
+                  counts: {
+                    clients: 17,
+                    entity_clients: 9,
+                    non_entity_clients: 8,
+                  },
+                },
+                {
+                  path: 'auth/method/Rk3Pt',
+                  counts: {
+                    clients: 16,
+                    entity_clients: 9,
+                    non_entity_clients: 7,
+                  },
+                },
+                {
+                  path: 'auth/method/wnNH5',
+                  counts: {
+                    clients: 3,
+                    entity_clients: 2,
+                    non_entity_clients: 1,
+                  },
+                },
+                {
+                  path: 'auth/method/N3BJy',
+                  counts: {
+                    clients: 4,
+                    entity_clients: 2,
+                    non_entity_clients: 2,
+                  },
+                },
+                {
+                  path: 'auth/method/C5qsy',
+                  counts: {
+                    clients: 3,
+                    entity_clients: 3,
+                    non_entity_clients: 0,
+                  },
+                },
+              ],
+            },
+            {
+              namespace_id: 'XGu7R',
+              namespace_path: 'namespace12/',
+              counts: {
+                entity_clients: 18,
+                non_entity_clients: 157,
+                clients: 175,
+              },
+              mounts: [
+                {
+                  path: 'auth/method/qcuLl',
+                  counts: {
+                    clients: 35,
+                    entity_clients: 20,
+                    non_entity_clients: 15,
+                  },
+                },
+                {
+                  path: 'auth/method/KGWiS',
+                  counts: {
+                    clients: 29,
+                    entity_clients: 17,
+                    non_entity_clients: 12,
+                  },
+                },
+                {
+                  path: 'auth/method/iM8pi',
+                  counts: {
+                    clients: 21,
+                    entity_clients: 13,
+                    non_entity_clients: 8,
+                  },
+                },
+                {
+                  path: 'auth/method/IeyA4',
+                  counts: {
+                    clients: 27,
+                    entity_clients: 18,
+                    non_entity_clients: 9,
+                  },
+                },
+                {
+                  path: 'auth/method/KGFfV',
+                  counts: {
+                    clients: 21,
+                    entity_clients: 13,
+                    non_entity_clients: 8,
+                  },
+                },
+                {
+                  path: 'auth/method/23AQk',
+                  counts: {
+                    clients: 14,
+                    entity_clients: 10,
+                    non_entity_clients: 4,
+                  },
+                },
+                {
+                  path: 'auth/method/PqTWe',
+                  counts: {
+                    clients: 11,
+                    entity_clients: 9,
+                    non_entity_clients: 2,
+                  },
+                },
+                {
+                  path: 'auth/method/pPSo1',
+                  counts: {
+                    clients: 8,
+                    entity_clients: 6,
+                    non_entity_clients: 2,
+                  },
+                },
+                {
+                  path: 'auth/method/HMu5H',
+                  counts: {
+                    clients: 7,
+                    entity_clients: 4,
+                    non_entity_clients: 3,
+                  },
+                },
+                {
+                  path: 'auth/method/xpOk3',
+                  counts: {
+                    clients: 2,
+                    entity_clients: 0,
+                    non_entity_clients: 2,
+                  },
+                },
+              ],
+            },
+            {
+              namespace_id: 'IeyJp',
+              namespace_path: 'namespace14/',
+              counts: {
+                entity_clients: 33,
+                non_entity_clients: 142,
+                clients: 175,
+              },
+              mounts: [
+                {
+                  path: 'auth/method/8NFVo',
+                  counts: {
+                    clients: 30,
+                    entity_clients: 16,
+                    non_entity_clients: 14,
+                  },
+                },
+                {
+                  path: 'auth/method/XnNDy',
+                  counts: {
+                    clients: 31,
+                    entity_clients: 18,
+                    non_entity_clients: 13,
+                  },
+                },
+                {
+                  path: 'auth/method/RYrzg',
+                  counts: {
+                    clients: 26,
+                    entity_clients: 14,
+                    non_entity_clients: 12,
+                  },
+                },
+                {
+                  path: 'auth/method/SOKji',
+                  counts: {
+                    clients: 27,
+                    entity_clients: 17,
+                    non_entity_clients: 10,
+                  },
+                },
+                {
+                  path: 'auth/method/CEYXo',
+                  counts: {
+                    clients: 19,
+                    entity_clients: 13,
+                    non_entity_clients: 6,
+                  },
+                },
+                {
+                  path: 'auth/method/RPjsj',
+                  counts: {
+                    clients: 15,
+                    entity_clients: 10,
+                    non_entity_clients: 5,
+                  },
+                },
+                {
+                  path: 'auth/method/dIqPJ',
+                  counts: {
+                    clients: 9,
+                    entity_clients: 6,
+                    non_entity_clients: 3,
+                  },
+                },
+                {
+                  path: 'auth/method/wThqG',
+                  counts: {
+                    clients: 8,
+                    entity_clients: 6,
+                    non_entity_clients: 2,
+                  },
+                },
+                {
+                  path: 'auth/method/Sa1dO',
+                  counts: {
+                    clients: 7,
+                    entity_clients: 5,
+                    non_entity_clients: 2,
+                  },
+                },
+                {
+                  path: 'auth/method/0JVs1',
+                  counts: {
+                    clients: 3,
+                    entity_clients: 3,
+                    non_entity_clients: 0,
+                  },
+                },
+              ],
+            },
+            {
+              namespace_id: 'kxU4t',
+              namespace_path: 'namespacelonglonglong3/',
+              counts: {
+                entity_clients: 151,
+                non_entity_clients: 21,
+                clients: 172,
+              },
+              mounts: [
+                {
+                  path: 'auth/method/lDz9c',
+                  counts: {
+                    clients: 32,
+                    entity_clients: 17,
+                    non_entity_clients: 15,
+                  },
+                },
+                {
+                  path: 'auth/method/GtbUu',
+                  counts: {
+                    clients: 23,
+                    entity_clients: 13,
+                    non_entity_clients: 10,
+                  },
+                },
+                {
+                  path: 'auth/method/WCyYz',
+                  counts: {
+                    clients: 30,
+                    entity_clients: 17,
+                    non_entity_clients: 13,
+                  },
+                },
+                {
+                  path: 'auth/method/j227p',
+                  counts: {
+                    clients: 21,
+                    entity_clients: 14,
+                    non_entity_clients: 7,
+                  },
+                },
+                {
+                  path: 'auth/method/9V6aN',
+                  counts: {
+                    clients: 20,
+                    entity_clients: 13,
+                    non_entity_clients: 7,
+                  },
+                },
+                {
+                  path: 'auth/method/USYOd',
+                  counts: {
+                    clients: 17,
+                    entity_clients: 13,
+                    non_entity_clients: 4,
+                  },
+                },
+                {
+                  path: 'auth/method/8pfWr',
+                  counts: {
+                    clients: 12,
+                    entity_clients: 7,
+                    non_entity_clients: 5,
+                  },
+                },
+                {
+                  path: 'auth/method/0L511',
+                  counts: {
+                    clients: 6,
+                    entity_clients: 2,
+                    non_entity_clients: 4,
+                  },
+                },
+                {
+                  path: 'auth/method/6d0rw',
+                  counts: {
+                    clients: 6,
+                    entity_clients: 4,
+                    non_entity_clients: 2,
+                  },
+                },
+                {
+                  path: 'auth/method/ECHpZ',
+                  counts: {
+                    clients: 5,
+                    entity_clients: 5,
+                    non_entity_clients: 0,
+                  },
+                },
+              ],
+            },
+            {
+              namespace_id: '5xKya',
+              namespace_path: 'namespace15/',
+              counts: {
+                entity_clients: 73,
+                non_entity_clients: 98,
+                clients: 171,
+              },
+              mounts: [
+                {
+                  path: 'auth/method/u2r0G',
+                  counts: {
+                    clients: 35,
+                    entity_clients: 20,
+                    non_entity_clients: 15,
+                  },
+                },
+                {
+                  path: 'auth/method/mKqBV',
+                  counts: {
+                    clients: 29,
+                    entity_clients: 18,
+                    non_entity_clients: 11,
+                  },
+                },
+                {
+                  path: 'auth/method/nGOa2',
+                  counts: {
+                    clients: 19,
+                    entity_clients: 9,
+                    non_entity_clients: 10,
+                  },
+                },
+                {
+                  path: 'auth/method/46UKX',
+                  counts: {
+                    clients: 21,
+                    entity_clients: 11,
+                    non_entity_clients: 10,
+                  },
+                },
+                {
+                  path: 'auth/method/WHW73',
+                  counts: {
+                    clients: 26,
+                    entity_clients: 15,
+                    non_entity_clients: 11,
+                  },
+                },
+                {
+                  path: 'auth/method/KcO46',
+                  counts: {
+                    clients: 20,
+                    entity_clients: 12,
+                    non_entity_clients: 8,
+                  },
+                },
+                {
+                  path: 'auth/method/y2vSv',
+                  counts: {
+                    clients: 13,
+                    entity_clients: 12,
+                    non_entity_clients: 1,
+                  },
+                },
+                {
+                  path: 'auth/method/VNy4X',
+                  counts: {
+                    clients: 3,
+                    entity_clients: 1,
+                    non_entity_clients: 2,
+                  },
+                },
+                {
+                  path: 'auth/method/cEDV9',
+                  counts: {
+                    clients: 2,
+                    entity_clients: 2,
+                    non_entity_clients: 0,
+                  },
+                },
+                {
+                  path: 'auth/method/CZTaj',
+                  counts: {
+                    clients: 3,
+                    entity_clients: 3,
+                    non_entity_clients: 0,
+                  },
+                },
+              ],
+            },
+            {
+              namespace_id: 'root',
+              namespace_path: '',
+              counts: {
+                entity_clients: 112,
+                non_entity_clients: 58,
+                clients: 170,
+              },
+              mounts: [
+                {
+                  path: 'auth/method/koO6h',
+                  counts: {
+                    clients: 35,
+                    entity_clients: 20,
+                    non_entity_clients: 15,
+                  },
+                },
+                {
+                  path: 'auth/method/iF9oZ',
+                  counts: {
+                    clients: 31,
+                    entity_clients: 20,
+                    non_entity_clients: 11,
+                  },
+                },
+                {
+                  path: 'auth/method/N6guZ',
+                  counts: {
+                    clients: 28,
+                    entity_clients: 16,
+                    non_entity_clients: 12,
+                  },
+                },
+                {
+                  path: 'auth/method/h2CxN',
+                  counts: {
+                    clients: 16,
+                    entity_clients: 9,
+                    non_entity_clients: 7,
+                  },
+                },
+                {
+                  path: 'auth/method/pA5pU',
+                  counts: {
+                    clients: 21,
+                    entity_clients: 15,
+                    non_entity_clients: 6,
+                  },
+                },
+                {
+                  path: 'auth/method/xbqJh',
+                  counts: {
+                    clients: 9,
+                    entity_clients: 6,
+                    non_entity_clients: 3,
+                  },
+                },
+                {
+                  path: 'auth/method/m7vOo',
+                  counts: {
+                    clients: 10,
+                    entity_clients: 6,
+                    non_entity_clients: 4,
+                  },
+                },
+                {
+                  path: 'auth/method/lULhW',
+                  counts: {
+                    clients: 9,
+                    entity_clients: 7,
+                    non_entity_clients: 2,
+                  },
+                },
+                {
+                  path: 'auth/method/hB9qn',
+                  counts: {
+                    clients: 10,
+                    entity_clients: 8,
+                    non_entity_clients: 2,
+                  },
+                },
+                {
+                  path: 'auth/method/RIEKI',
+                  counts: {
+                    clients: 1,
+                    entity_clients: 0,
+                    non_entity_clients: 1,
+                  },
+                },
+              ],
+            },
+            {
+              namespace_id: 'DcgzU',
+              namespace_path: 'namespace17/',
+              counts: {
+                entity_clients: 43,
+                non_entity_clients: 125,
+                clients: 168,
+              },
+              mounts: [
+                {
+                  path: 'auth/method/cdZ64',
+                  counts: {
+                    clients: 35,
+                    entity_clients: 20,
+                    non_entity_clients: 15,
+                  },
+                },
+                {
+                  path: 'auth/method/UpXi1',
+                  counts: {
+                    clients: 33,
+                    entity_clients: 19,
+                    non_entity_clients: 14,
+                  },
+                },
+                {
+                  path: 'auth/method/6OzPw',
+                  counts: {
+                    clients: 22,
+                    entity_clients: 10,
+                    non_entity_clients: 12,
+                  },
+                },
+                {
+                  path: 'auth/method/PkimI',
+                  counts: {
+                    clients: 21,
+                    entity_clients: 10,
+                    non_entity_clients: 11,
+                  },
+                },
+                {
+                  path: 'auth/method/7ecN2',
+                  counts: {
+                    clients: 14,
+                    entity_clients: 10,
+                    non_entity_clients: 4,
+                  },
+                },
+                {
+                  path: 'auth/method/AYdDo',
+                  counts: {
+                    clients: 16,
+                    entity_clients: 8,
+                    non_entity_clients: 8,
+                  },
+                },
+                {
+                  path: 'auth/method/kS9h6',
+                  counts: {
+                    clients: 9,
+                    entity_clients: 4,
+                    non_entity_clients: 5,
+                  },
+                },
+                {
+                  path: 'auth/method/dIoMU',
+                  counts: {
+                    clients: 6,
+                    entity_clients: 3,
+                    non_entity_clients: 3,
+                  },
+                },
+                {
+                  path: 'auth/method/eXB1u',
+                  counts: {
+                    clients: 7,
+                    entity_clients: 3,
+                    non_entity_clients: 4,
+                  },
+                },
+                {
+                  path: 'auth/method/SQ8Ty',
+                  counts: {
+                    clients: 5,
+                    entity_clients: 3,
+                    non_entity_clients: 2,
+                  },
+                },
+              ],
+            },
+            {
+              namespace_id: 'Uc0o8',
+              namespace_path: 'namespace16/',
+              counts: {
+                entity_clients: 56,
+                non_entity_clients: 112,
+                clients: 168,
+              },
+              mounts: [
+                {
+                  path: 'auth/method/my50c',
+                  counts: {
+                    clients: 33,
+                    entity_clients: 18,
+                    non_entity_clients: 15,
+                  },
+                },
+                {
+                  path: 'auth/method/D8zfa',
+                  counts: {
+                    clients: 29,
+                    entity_clients: 17,
+                    non_entity_clients: 12,
+                  },
+                },
+                {
+                  path: 'auth/method/w2xnA',
+                  counts: {
+                    clients: 32,
+                    entity_clients: 18,
+                    non_entity_clients: 14,
+                  },
+                },
+                {
+                  path: 'auth/method/FwR7Z',
+                  counts: {
+                    clients: 20,
+                    entity_clients: 12,
+                    non_entity_clients: 8,
+                  },
+                },
+                {
+                  path: 'auth/method/wwNCu',
+                  counts: {
+                    clients: 17,
+                    entity_clients: 10,
+                    non_entity_clients: 7,
+                  },
+                },
+                {
+                  path: 'auth/method/vv2O6',
+                  counts: {
+                    clients: 11,
+                    entity_clients: 7,
+                    non_entity_clients: 4,
+                  },
+                },
+                {
+                  path: 'auth/method/zRqUm',
+                  counts: {
+                    clients: 9,
+                    entity_clients: 6,
+                    non_entity_clients: 3,
+                  },
+                },
+                {
+                  path: 'auth/method/Yez2v',
+                  counts: {
+                    clients: 8,
+                    entity_clients: 3,
+                    non_entity_clients: 5,
+                  },
+                },
+                {
+                  path: 'auth/method/SBBJ2',
+                  counts: {
+                    clients: 5,
+                    entity_clients: 3,
+                    non_entity_clients: 2,
+                  },
+                },
+                {
+                  path: 'auth/method/NNSCC',
+                  counts: {
+                    clients: 4,
+                    entity_clients: 1,
+                    non_entity_clients: 3,
+                  },
+                },
+              ],
+            },
+            {
+              namespace_id: 'Rqa3W',
+              namespace_path: 'namespace13/',
+              counts: {
+                entity_clients: 9,
+                non_entity_clients: 156,
+                clients: 165,
+              },
+              mounts: [
+                {
+                  path: 'auth/method/KPlRb',
+                  counts: {
+                    clients: 33,
+                    entity_clients: 20,
+                    non_entity_clients: 13,
+                  },
+                },
+                {
+                  path: 'auth/method/199gy',
+                  counts: {
+                    clients: 29,
+                    entity_clients: 19,
+                    non_entity_clients: 10,
+                  },
+                },
+                {
+                  path: 'auth/method/UDpxk',
+                  counts: {
+                    clients: 24,
+                    entity_clients: 14,
+                    non_entity_clients: 10,
+                  },
+                },
+                {
+                  path: 'auth/method/bmgSl',
+                  counts: {
+                    clients: 21,
+                    entity_clients: 13,
+                    non_entity_clients: 8,
+                  },
+                },
+                {
+                  path: 'auth/method/oyWlP',
+                  counts: {
+                    clients: 20,
+                    entity_clients: 12,
+                    non_entity_clients: 8,
+                  },
+                },
+                {
+                  path: 'auth/method/z7Uka',
+                  counts: {
+                    clients: 15,
+                    entity_clients: 5,
+                    non_entity_clients: 10,
+                  },
+                },
+                {
+                  path: 'auth/method/ftNn7',
+                  counts: {
+                    clients: 10,
+                    entity_clients: 6,
+                    non_entity_clients: 4,
+                  },
+                },
+                {
+                  path: 'auth/method/pvdQ7',
+                  counts: {
+                    clients: 9,
+                    entity_clients: 7,
+                    non_entity_clients: 2,
+                  },
+                },
+                {
+                  path: 'auth/method/DsnIn',
+                  counts: {
+                    clients: 4,
+                    entity_clients: 2,
+                    non_entity_clients: 2,
+                  },
+                },
+                {
+                  path: 'auth/method/E1YLg',
+                  counts: {
+                    clients: 0,
+                    entity_clients: 0,
+                    non_entity_clients: 0,
+                  },
+                },
+              ],
+            },
+            {
+              namespace_id: 'aJuQG',
+              namespace_path: 'namespace9/',
+              counts: {
+                entity_clients: 80,
+                non_entity_clients: 71,
+                clients: 151,
+              },
+              mounts: [
+                {
+                  path: 'auth/method/RCpUn',
+                  counts: {
+                    clients: 31,
+                    entity_clients: 18,
+                    non_entity_clients: 13,
+                  },
+                },
+                {
+                  path: 'auth/method/S0O4t',
+                  counts: {
+                    clients: 21,
+                    entity_clients: 7,
+                    non_entity_clients: 14,
+                  },
+                },
+                {
+                  path: 'auth/method/QqXfg',
+                  counts: {
+                    clients: 25,
+                    entity_clients: 12,
+                    non_entity_clients: 13,
+                  },
+                },
+                {
+                  path: 'auth/method/CSSoi',
+                  counts: {
+                    clients: 23,
+                    entity_clients: 13,
+                    non_entity_clients: 10,
+                  },
+                },
+                {
+                  path: 'auth/method/klonh',
+                  counts: {
+                    clients: 15,
+                    entity_clients: 7,
+                    non_entity_clients: 8,
+                  },
+                },
+                {
+                  path: 'auth/method/JyhFQ',
+                  counts: {
+                    clients: 15,
+                    entity_clients: 5,
+                    non_entity_clients: 10,
+                  },
+                },
+                {
+                  path: 'auth/method/S66CH',
+                  counts: {
+                    clients: 7,
+                    entity_clients: 4,
+                    non_entity_clients: 3,
+                  },
+                },
+                {
+                  path: 'auth/method/6pBz3',
+                  counts: {
+                    clients: 6,
+                    entity_clients: 4,
+                    non_entity_clients: 2,
+                  },
+                },
+                {
+                  path: 'auth/method/qHCZa',
+                  counts: {
+                    clients: 6,
+                    entity_clients: 4,
+                    non_entity_clients: 2,
+                  },
+                },
+                {
+                  path: 'auth/method/I6OpF',
+                  counts: {
+                    clients: 2,
+                    entity_clients: 2,
+                    non_entity_clients: 0,
+                  },
+                },
+              ],
+            },
+            {
+              namespace_id: 'DochC',
+              namespace_path: 'ns2/',
+              counts: {
+                _comment3: 'simulating response with old key names',
+                distinct_entities: 45,
+                non_entity_tokens: 55,
+                clients: 100,
+              },
+            },
+            {
+              namespace_id: 'RtgpW',
+              namespace_path: 'ns1/',
+              counts: {
+                _comment4: 'and another namespace with old key names',
+                distinct_entities: 5,
+                non_entity_tokens: 15,
+                clients: 20,
+              },
+            },
+          ],
+          months: [
+            {
+              timestamp: '2022-01-01T08:00:00.000Z',
+              counts: {
+                clients: 68,
+                entity_clients: 23,
+                non_entity_clients: 45,
+              },
+              namespaces: [
+                {
+                  counts: {
+                    entity_clients: 14,
+                    non_entity_clients: 18,
+                    clients: 32,
+                  },
+                  mounts: [
+                    {
+                      path: 'auth/method/cdZ64',
+                      counts: {
+                        clients: 18,
+                        entity_clients: 8,
+                        non_entity_clients: 10,
+                      },
+                    },
+                    {
+                      path: 'auth/method/UpXi1',
+                      counts: {
+                        clients: 6,
+                        entity_clients: 3,
+                        non_entity_clients: 3,
+                      },
+                    },
+                    {
+                      path: 'auth/method/6OzPw',
+                      counts: {
+                        clients: 5,
+                        entity_clients: 2,
+                        non_entity_clients: 3,
+                      },
+                    },
+                    {
+                      path: 'auth/method/PkimI',
+                      counts: {
+                        clients: 3,
+                        entity_clients: 1,
+                        non_entity_clients: 2,
+                      },
+                    },
+                  ],
+                  id: 'namespace17/',
+                  path: '',
+                },
+                {
+                  counts: {
+                    entity_clients: 4,
+                    non_entity_clients: 13,
+                    clients: 17,
+                  },
+                  mounts: [
+                    {
+                      path: 'auth/method/KPlRb',
+                      counts: {
+                        clients: 8,
+                        entity_clients: 1,
+                        non_entity_clients: 7,
+                      },
+                    },
+                    {
+                      path: 'auth/method/199gy',
+                      counts: {
+                        clients: 4,
+                        entity_clients: 1,
+                        non_entity_clients: 3,
+                      },
+                    },
+                    {
+                      path: 'auth/method/UDpxk',
+                      counts: {
+                        clients: 3,
+                        entity_clients: 1,
+                        non_entity_clients: 2,
+                      },
+                    },
+                    {
+                      path: 'auth/method/bmgSl',
+                      counts: {
+                        clients: 2,
+                        entity_clients: 1,
+                        non_entity_clients: 1,
+                      },
+                    },
+                  ],
+                  id: 'namespace13/',
+                  path: '',
+                },
+                {
+                  counts: {
+                    entity_clients: 3,
+                    non_entity_clients: 12,
+                    clients: 15,
+                  },
+                  mounts: [
+                    {
+                      path: 'auth/method/uMGBU',
+                      counts: {
+                        clients: 5,
+                        entity_clients: 1,
+                        non_entity_clients: 4,
+                      },
+                    },
+                    {
+                      path: 'auth/method/8YJO3',
+                      counts: {
+                        clients: 4,
+                        entity_clients: 1,
+                        non_entity_clients: 3,
+                      },
+                    },
+                    {
+                      path: 'auth/method/Ro774',
+                      counts: {
+                        clients: 4,
+                        entity_clients: 1,
+                        non_entity_clients: 3,
+                      },
+                    },
+                    {
+                      path: 'auth/method/ZIpjT',
+                      counts: {
+                        clients: 2,
+                        entity_clients: 0,
+                        non_entity_clients: 2,
+                      },
+                    },
+                  ],
+                  id: 'namespacelonglonglong4/',
+                  path: '',
+                },
+                {
+                  counts: {
+                    entity_clients: 2,
+                    non_entity_clients: 2,
+                    clients: 4,
+                  },
+                  mounts: [
+                    {
+                      path: 'auth/method/qcuLl',
+                      counts: {
+                        clients: 2,
+                        entity_clients: 1,
+                        non_entity_clients: 1,
+                      },
+                    },
+                    {
+                      path: 'auth/method/KGWiS',
+                      counts: {
+                        clients: 2,
+                        entity_clients: 1,
+                        non_entity_clients: 1,
+                      },
+                    },
+                    {
+                      path: 'auth/method/iM8pi',
+                      counts: {
+                        clients: 0,
+                        entity_clients: 0,
+                        non_entity_clients: 0,
+                      },
+                    },
+                    {
+                      path: 'auth/method/IeyA4',
+                      counts: {
+                        clients: 0,
+                        entity_clients: 0,
+                        non_entity_clients: 0,
+                      },
+                    },
+                  ],
+                  id: 'namespace12/',
+                  path: '',
+                },
+              ],
+              new_clients: {
+                counts: {
+                  clients: 47,
+                  entity_clients: 11,
+                  non_entity_clients: 36,
+                },
+                namespaces: [
+                  {
+                    counts: {
+                      clients: 14,
+                      entity_clients: 11,
+                      non_entity_clients: 3,
+                    },
+                    mounts: [
+                      {
+                        path: 'auth/method/cdZ64',
+                        counts: {
+                          clients: 6,
+                          entity_clients: 4,
+                          non_entity_clients: 813,
+                        },
+                      },
+                      {
+                        path: 'auth/method/UpXi1',
+                        counts: {
+                          clients: 5,
+                          entity_clients: 3,
+                          non_entity_clients: 113,
+                        },
+                      },
+                      {
+                        path: 'auth/method/6OzPw',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 45,
+                        },
+                      },
+                      {
+                        path: 'auth/method/PkimI',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 168,
+                        },
+                      },
+                    ],
+                    id: 'namespace17/',
+                    path: '',
+                  },
+                  {
+                    counts: {
+                      clients: 11,
+                      entity_clients: 9,
+                      non_entity_clients: 2,
+                    },
+                    mounts: [
+                      {
+                        path: 'auth/method/KPlRb',
+                        counts: {
+                          clients: 5,
+                          entity_clients: 1,
+                          non_entity_clients: 346,
+                        },
+                      },
+                      {
+                        path: 'auth/method/199gy',
+                        counts: {
+                          clients: 2,
+                          entity_clients: 1,
+                          non_entity_clients: 85,
+                        },
+                      },
+                      {
+                        path: 'auth/method/UDpxk',
+                        counts: {
+                          clients: 2,
+                          entity_clients: 1,
+                          non_entity_clients: 3,
+                        },
+                      },
+                      {
+                        path: 'auth/method/bmgSl',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 2,
+                        },
+                      },
+                    ],
+                    id: 'namespace13/',
+                    path: '',
+                  },
+                  {
+                    counts: {
+                      clients: 10,
+                      entity_clients: 8,
+                      non_entity_clients: 2,
+                    },
+                    mounts: [
+                      {
+                        path: 'auth/method/uMGBU',
+                        counts: {
+                          clients: 4,
+                          entity_clients: 1,
+                          non_entity_clients: 453,
+                        },
+                      },
+                      {
+                        path: 'auth/method/8YJO3',
+                        counts: {
+                          clients: 3,
+                          entity_clients: 1,
+                          non_entity_clients: 291,
+                        },
+                      },
+                      {
+                        path: 'auth/method/Ro774',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 13,
+                        },
+                      },
+                      {
+                        path: 'auth/method/ZIpjT',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 4,
+                        },
+                      },
+                    ],
+                    id: 'namespacelonglonglong4/',
+                    path: '',
+                  },
+                  {
+                    counts: {
+                      clients: 1,
+                      entity_clients: 1,
+                      non_entity_clients: 0,
+                    },
+                    mounts: [
+                      {
+                        path: 'auth/method/qcuLl',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 253,
+                        },
+                      },
+                      {
+                        path: 'auth/method/KGWiS',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 26,
+                        },
+                      },
+                      {
+                        path: 'auth/method/iM8pi',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 126,
+                        },
+                      },
+                      {
+                        path: 'auth/method/IeyA4',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 53,
+                        },
+                      },
+                    ],
+                    id: 'namespace12/',
+                    path: '',
+                  },
+                ],
+              },
+            },
+            {
+              timestamp: '2022-02-01T08:00:00.000Z',
+              counts: {
+                clients: 115,
+                entity_clients: 95,
+                non_entity_clients: 20,
+              },
+              namespaces: [
+                {
+                  counts: {
+                    entity_clients: 83,
+                    non_entity_clients: 17,
+                    clients: 100,
+                  },
+                  mounts: [
+                    {
+                      path: 'auth/method/cdZ64',
+                      counts: {
+                        clients: 73,
+                        entity_clients: 61,
+                        non_entity_clients: 12,
+                      },
+                    },
+                    {
+                      path: 'auth/method/UpXi1',
+                      counts: {
+                        clients: 19,
+                        entity_clients: 17,
+                        non_entity_clients: 2,
+                      },
+                    },
+                    {
+                      path: 'auth/method/6OzPw',
+                      counts: {
+                        clients: 5,
+                        entity_clients: 3,
+                        non_entity_clients: 2,
+                      },
+                    },
+                    {
+                      path: 'auth/method/PkimI',
+                      counts: {
+                        clients: 3,
+                        entity_clients: 2,
+                        non_entity_clients: 1,
+                      },
+                    },
+                  ],
+                  id: 'namespace17/',
+                  path: '',
+                },
+                {
+                  counts: {
+                    entity_clients: 10,
+                    non_entity_clients: 1,
+                    clients: 11,
+                  },
+                  mounts: [
+                    {
+                      path: 'auth/method/824CE',
+                      counts: {
+                        clients: 7,
+                        entity_clients: 6,
+                        non_entity_clients: 1,
+                      },
+                    },
+                    {
+                      path: 'auth/method/r2zb4',
+                      counts: {
+                        clients: 2,
+                        entity_clients: 2,
+                        non_entity_clients: 0,
+                      },
+                    },
+                    {
+                      path: 'auth/method/1zfD6',
+                      counts: {
+                        clients: 1,
+                        entity_clients: 1,
+                        non_entity_clients: 0,
+                      },
+                    },
+                    {
+                      path: 'auth/method/L14lj',
+                      counts: {
+                        clients: 1,
+                        entity_clients: 1,
+                        non_entity_clients: 0,
+                      },
+                    },
+                  ],
+                  id: 'namespace2/',
+                  path: '',
+                },
+                {
+                  counts: {
+                    entity_clients: 1,
+                    non_entity_clients: 1,
+                    clients: 2,
+                  },
+                  mounts: [
+                    {
+                      path: 'auth/method/uMGBU',
+                      counts: {
+                        clients: 2,
+                        entity_clients: 1,
+                        non_entity_clients: 1,
+                      },
+                    },
+                    {
+                      path: 'auth/method/8YJO3',
+                      counts: {
+                        clients: 0,
+                        entity_clients: 0,
+                        non_entity_clients: 0,
+                      },
+                    },
+                    {
+                      path: 'auth/method/Ro774',
+                      counts: {
+                        clients: 0,
+                        entity_clients: 0,
+                        non_entity_clients: 0,
+                      },
+                    },
+                    {
+                      path: 'auth/method/ZIpjT',
+                      counts: {
+                        clients: 0,
+                        entity_clients: 0,
+                        non_entity_clients: 0,
+                      },
+                    },
+                  ],
+                  id: 'namespacelonglonglong4/',
+                  path: '',
+                },
+                {
+                  counts: {
+                    entity_clients: 1,
+                    non_entity_clients: 1,
+                    clients: 2,
+                  },
+                  mounts: [
+                    {
+                      path: 'auth/method/qT4Wl',
+                      counts: {
+                        clients: 2,
+                        entity_clients: 1,
+                        non_entity_clients: 1,
+                      },
+                    },
+                    {
+                      path: 'auth/method/Vhu56',
+                      counts: {
+                        clients: 0,
+                        entity_clients: 0,
+                        non_entity_clients: 0,
+                      },
+                    },
+                    {
+                      path: 'auth/method/PCc58',
+                      counts: {
+                        clients: 0,
+                        entity_clients: 0,
+                        non_entity_clients: 0,
+                      },
+                    },
+                    {
+                      path: 'auth/method/nPP4c',
+                      counts: {
+                        clients: 0,
+                        entity_clients: 0,
+                        non_entity_clients: 0,
+                      },
+                    },
+                  ],
+                  id: 'namespace11/',
+                  path: '',
+                },
+              ],
+              new_clients: {
+                counts: {
+                  clients: 30,
+                  entity_clients: 26,
+                  non_entity_clients: 4,
+                },
+                namespaces: [
+                  {
+                    counts: {
+                      clients: 0,
+                      entity_clients: 0,
+                      non_entity_clients: 0,
+                    },
+                    mounts: [
+                      {
+                        path: 'auth/method/cdZ64',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/UpXi1',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/6OzPw',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/PkimI',
+                        counts: {
+                          clients: -1,
+                          entity_clients: -1,
+                          non_entity_clients: 0,
+                        },
+                      },
+                    ],
+                    id: 'namespace17/',
+                    path: '',
+                  },
+                  {
+                    counts: {
+                      clients: 0,
+                      entity_clients: 0,
+                      non_entity_clients: 0,
+                    },
+                    mounts: [
+                      {
+                        path: 'auth/method/824CE',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/r2zb4',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/1zfD6',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/L14lj',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                    ],
+                    id: 'namespace2/',
+                    path: '',
+                  },
+                  {
+                    counts: {
+                      clients: 0,
+                      entity_clients: 0,
+                      non_entity_clients: 0,
+                    },
+                    mounts: [
+                      {
+                        path: 'auth/method/uMGBU',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/8YJO3',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/Ro774',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/ZIpjT',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                    ],
+                    id: 'namespacelonglonglong4/',
+                    path: '',
+                  },
+                  {
+                    counts: {
+                      clients: 0,
+                      entity_clients: 0,
+                      non_entity_clients: -1,
+                    },
+                    mounts: [
+                      {
+                        path: 'auth/method/qT4Wl',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/Vhu56',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/PCc58',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/nPP4c',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                    ],
+                    id: 'namespace11/',
+                    path: '',
+                  },
+                ],
+              },
+            },
+            {
+              timestamp: '2022-03-01T08:00:00.000Z',
+              counts: {
+                clients: 145,
+                entity_clients: 121,
+                non_entity_clients: 24,
+              },
+              namespaces: [
+                {
+                  counts: {
+                    entity_clients: 83,
+                    non_entity_clients: 20,
+                    clients: 103,
+                  },
+                  mounts: [
+                    {
+                      path: 'auth/method/cdZ64',
+                      counts: {
+                        clients: 71,
+                        entity_clients: 61,
+                        non_entity_clients: 10,
+                      },
+                    },
+                    {
+                      path: 'auth/method/UpXi1',
+                      counts: {
+                        clients: 21,
+                        entity_clients: 15,
+                        non_entity_clients: 6,
+                      },
+                    },
+                    {
+                      path: 'auth/method/6OzPw',
+                      counts: {
+                        clients: 8,
+                        entity_clients: 6,
+                        non_entity_clients: 2,
+                      },
+                    },
+                    {
+                      path: 'auth/method/PkimI',
+                      counts: {
+                        clients: 3,
+                        entity_clients: 1,
+                        non_entity_clients: 2,
+                      },
+                    },
+                  ],
+                  id: 'namespace17/',
+                  path: '',
+                },
+                {
+                  counts: {
+                    entity_clients: 20,
+                    non_entity_clients: 2,
+                    clients: 22,
+                  },
+                  mounts: [
+                    {
+                      path: 'auth/method/824CE',
+                      counts: {
+                        clients: 11,
+                        entity_clients: 10,
+                        non_entity_clients: 1,
+                      },
+                    },
+                    {
+                      path: 'auth/method/r2zb4',
+                      counts: {
+                        clients: 7,
+                        entity_clients: 6,
+                        non_entity_clients: 1,
+                      },
+                    },
+                    {
+                      path: 'auth/method/1zfD6',
+                      counts: {
+                        clients: 3,
+                        entity_clients: 3,
+                        non_entity_clients: 0,
+                      },
+                    },
+                    {
+                      path: 'auth/method/L14lj',
+                      counts: {
+                        clients: 1,
+                        entity_clients: 1,
+                        non_entity_clients: 0,
+                      },
+                    },
+                  ],
+                  id: 'namespace2/',
+                  path: '',
+                },
+                {
+                  counts: {
+                    entity_clients: 15,
+                    non_entity_clients: 1,
+                    clients: 16,
+                  },
+                  mounts: [
+                    {
+                      path: 'auth/method/uMGBU',
+                      counts: {
+                        clients: 11,
+                        entity_clients: 10,
+                        non_entity_clients: 1,
+                      },
+                    },
+                    {
+                      path: 'auth/method/8YJO3',
+                      counts: {
+                        clients: 2,
+                        entity_clients: 2,
+                        non_entity_clients: 0,
+                      },
+                    },
+                    {
+                      path: 'auth/method/Ro774',
+                      counts: {
+                        clients: 2,
+                        entity_clients: 2,
+                        non_entity_clients: 0,
+                      },
+                    },
+                    {
+                      path: 'auth/method/ZIpjT',
+                      counts: {
+                        clients: 1,
+                        entity_clients: 1,
+                        non_entity_clients: 0,
+                      },
+                    },
+                  ],
+                  id: 'namespacelonglonglong4/',
+                  path: '',
+                },
+                {
+                  counts: {
+                    entity_clients: 3,
+                    non_entity_clients: 1,
+                    clients: 4,
+                  },
+                  mounts: [
+                    {
+                      path: 'auth/method/qT4Wl',
+                      counts: {
+                        clients: 2,
+                        entity_clients: 1,
+                        non_entity_clients: 1,
+                      },
+                    },
+                    {
+                      path: 'auth/method/Vhu56',
+                      counts: {
+                        clients: 1,
+                        entity_clients: 1,
+                        non_entity_clients: 0,
+                      },
+                    },
+                    {
+                      path: 'auth/method/PCc58',
+                      counts: {
+                        clients: 1,
+                        entity_clients: 1,
+                        non_entity_clients: 0,
+                      },
+                    },
+                    {
+                      path: 'auth/method/nPP4c',
+                      counts: {
+                        clients: 0,
+                        entity_clients: 0,
+                        non_entity_clients: 0,
+                      },
+                    },
+                  ],
+                  id: 'namespace11/',
+                  path: '',
+                },
+              ],
+              new_clients: {
+                counts: {
+                  clients: 29,
+                  entity_clients: 21,
+                  non_entity_clients: 8,
+                },
+                namespaces: [
+                  {
+                    counts: {
+                      clients: 127,
+                      entity_clients: 119,
+                      non_entity_clients: 8,
+                    },
+                    mounts: [
+                      {
+                        path: 'auth/method/cdZ64',
+                        counts: {
+                          clients: 108,
+                          entity_clients: 69,
+                          non_entity_clients: 813,
+                        },
+                      },
+                      {
+                        path: 'auth/method/UpXi1',
+                        counts: {
+                          clients: 9,
+                          entity_clients: 1,
+                          non_entity_clients: 113,
+                        },
+                      },
+                      {
+                        path: 'auth/method/6OzPw',
+                        counts: {
+                          clients: 5,
+                          entity_clients: 4,
+                          non_entity_clients: 45,
+                        },
+                      },
+                      {
+                        path: 'auth/method/PkimI',
+                        counts: {
+                          clients: 3,
+                          entity_clients: 2,
+                          non_entity_clients: 168,
+                        },
+                      },
+                    ],
+                    id: 'namespace17/',
+                    path: '',
+                  },
+                  {
+                    counts: {
+                      clients: 40,
+                      entity_clients: 39,
+                      non_entity_clients: 1,
+                    },
+                    mounts: [
+                      {
+                        path: 'auth/method/824CE',
+                        counts: {
+                          clients: 35,
+                          entity_clients: 10,
+                          non_entity_clients: 3,
+                        },
+                      },
+                      {
+                        path: 'auth/method/r2zb4',
+                        counts: {
+                          clients: 2,
+                          entity_clients: 1,
+                          non_entity_clients: 495,
+                        },
+                      },
+                      {
+                        path: 'auth/method/1zfD6',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 8,
+                        },
+                      },
+                      {
+                        path: 'auth/method/L14lj',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 5,
+                        },
+                      },
+                    ],
+                    id: 'namespace2/',
+                    path: '',
+                  },
+                  {
+                    counts: {
+                      clients: 21,
+                      entity_clients: 15,
+                      non_entity_clients: 6,
+                    },
+                    mounts: [
+                      {
+                        path: 'auth/method/uMGBU',
+                        counts: {
+                          clients: 10,
+                          entity_clients: 2,
+                          non_entity_clients: 453,
+                        },
+                      },
+                      {
+                        path: 'auth/method/8YJO3',
+                        counts: {
+                          clients: 4,
+                          entity_clients: 3,
+                          non_entity_clients: 291,
+                        },
+                      },
+                      {
+                        path: 'auth/method/Ro774',
+                        counts: {
+                          clients: 3,
+                          entity_clients: 1,
+                          non_entity_clients: 13,
+                        },
+                      },
+                      {
+                        path: 'auth/method/ZIpjT',
+                        counts: {
+                          clients: 2,
+                          entity_clients: 1,
+                          non_entity_clients: 4,
+                        },
+                      },
+                    ],
+                    id: 'namespacelonglonglong4/',
+                    path: '',
+                  },
+                  {
+                    counts: {
+                      clients: 2,
+                      entity_clients: 1,
+                      non_entity_clients: 1,
+                    },
+                    mounts: [
+                      {
+                        path: 'auth/method/qT4Wl',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 1019,
+                        },
+                      },
+                      {
+                        path: 'auth/method/Vhu56',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 11,
+                        },
+                      },
+                      {
+                        path: 'auth/method/PCc58',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 29,
+                        },
+                      },
+                      {
+                        path: 'auth/method/nPP4c',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 7,
+                        },
+                      },
+                    ],
+                    id: 'namespace11/',
+                    path: '',
+                  },
+                ],
+              },
+            },
+            {
+              timestamp: '2022-04-01T07:00:00.000Z',
+              counts: {
+                clients: 174,
+                entity_clients: 81,
+                non_entity_clients: 93,
+              },
+              namespaces: [
+                {
+                  counts: {
+                    entity_clients: 53,
+                    non_entity_clients: 83,
+                    clients: 136,
+                  },
+                  mounts: [
+                    {
+                      path: 'auth/method/uMGBU',
+                      counts: {
+                        clients: 102,
+                        entity_clients: 37,
+                        non_entity_clients: 65,
+                      },
+                    },
+                    {
+                      path: 'auth/method/8YJO3',
+                      counts: {
+                        clients: 25,
+                        entity_clients: 12,
+                        non_entity_clients: 13,
+                      },
+                    },
+                    {
+                      path: 'auth/method/Ro774',
+                      counts: {
+                        clients: 5,
+                        entity_clients: 2,
+                        non_entity_clients: 3,
+                      },
+                    },
+                    {
+                      path: 'auth/method/ZIpjT',
+                      counts: {
+                        clients: 4,
+                        entity_clients: 2,
+                        non_entity_clients: 2,
+                      },
+                    },
+                  ],
+                  id: 'namespacelonglonglong4/',
+                  path: '',
+                },
+                {
+                  counts: {
+                    entity_clients: 14,
+                    non_entity_clients: 5,
+                    clients: 19,
+                  },
+                  mounts: [
+                    {
+                      path: 'auth/method/qT4Wl',
+                      counts: {
+                        clients: 11,
+                        entity_clients: 9,
+                        non_entity_clients: 2,
+                      },
+                    },
+                    {
+                      path: 'auth/method/Vhu56',
+                      counts: {
+                        clients: 4,
+                        entity_clients: 3,
+                        non_entity_clients: 1,
+                      },
+                    },
+                    {
+                      path: 'auth/method/PCc58',
+                      counts: {
+                        clients: 2,
+                        entity_clients: 1,
+                        non_entity_clients: 1,
+                      },
+                    },
+                    {
+                      path: 'auth/method/nPP4c',
+                      counts: {
+                        clients: 2,
+                        entity_clients: 1,
+                        non_entity_clients: 1,
+                      },
+                    },
+                  ],
+                  id: 'namespace11/',
+                  path: '',
+                },
+                {
+                  counts: {
+                    entity_clients: 7,
+                    non_entity_clients: 4,
+                    clients: 11,
+                  },
+                  mounts: [
+                    {
+                      path: 'auth/method/xYL0l',
+                      counts: {
+                        clients: 3,
+                        entity_clients: 2,
+                        non_entity_clients: 1,
+                      },
+                    },
+                    {
+                      path: 'auth/method/CwWM7',
+                      counts: {
+                        clients: 3,
+                        entity_clients: 2,
+                        non_entity_clients: 1,
+                      },
+                    },
+                    {
+                      path: 'auth/method/swCd0',
+                      counts: {
+                        clients: 3,
+                        entity_clients: 2,
+                        non_entity_clients: 1,
+                      },
+                    },
+                    {
+                      path: 'auth/method/0CZTs',
+                      counts: {
+                        clients: 2,
+                        entity_clients: 1,
+                        non_entity_clients: 1,
+                      },
+                    },
+                  ],
+                  id: 'namespace10/',
+                  path: '',
+                },
+                {
+                  counts: {
+                    entity_clients: 7,
+                    non_entity_clients: 1,
+                    clients: 8,
+                  },
+                  mounts: [
+                    {
+                      path: 'auth/method/RCpUn',
+                      counts: {
+                        clients: 3,
+                        entity_clients: 2,
+                        non_entity_clients: 1,
+                      },
+                    },
+                    {
+                      path: 'auth/method/S0O4t',
+                      counts: {
+                        clients: 2,
+                        entity_clients: 2,
+                        non_entity_clients: 0,
+                      },
+                    },
+                    {
+                      path: 'auth/method/QqXfg',
+                      counts: {
+                        clients: 2,
+                        entity_clients: 2,
+                        non_entity_clients: 0,
+                      },
+                    },
+                    {
+                      path: 'auth/method/CSSoi',
+                      counts: {
+                        clients: 1,
+                        entity_clients: 1,
+                        non_entity_clients: 0,
+                      },
+                    },
+                  ],
+                  id: 'namespace9/',
+                  path: '',
+                },
+              ],
+              new_clients: {
+                counts: {
+                  clients: 20,
+                  entity_clients: 5,
+                  non_entity_clients: 15,
+                },
+                namespaces: [
+                  {
+                    counts: {
+                      clients: 725,
+                      entity_clients: 416,
+                      non_entity_clients: 309,
+                    },
+                    mounts: [
+                      {
+                        path: 'auth/method/uMGBU',
+                        counts: {
+                          clients: 281,
+                          entity_clients: 48,
+                          non_entity_clients: 453,
+                        },
+                      },
+                      {
+                        path: 'auth/method/8YJO3',
+                        counts: {
+                          clients: 252,
+                          entity_clients: 142,
+                          non_entity_clients: 291,
+                        },
+                      },
+                      {
+                        path: 'auth/method/Ro774',
+                        counts: {
+                          clients: 93,
+                          entity_clients: 43,
+                          non_entity_clients: 13,
+                        },
+                      },
+                      {
+                        path: 'auth/method/ZIpjT',
+                        counts: {
+                          clients: 86,
+                          entity_clients: 19,
+                          non_entity_clients: 4,
+                        },
+                      },
+                    ],
+                    id: 'namespacelonglonglong4/',
+                    path: '',
+                  },
+                  {
+                    counts: {
+                      clients: 178,
+                      entity_clients: 99,
+                      non_entity_clients: 79,
+                    },
+                    mounts: [
+                      {
+                        path: 'auth/method/qT4Wl',
+                        counts: {
+                          clients: 76,
+                          entity_clients: 69,
+                          non_entity_clients: 1019,
+                        },
+                      },
+                      {
+                        path: 'auth/method/Vhu56',
+                        counts: {
+                          clients: 64,
+                          entity_clients: 38,
+                          non_entity_clients: 11,
+                        },
+                      },
+                      {
+                        path: 'auth/method/PCc58',
+                        counts: {
+                          clients: 20,
+                          entity_clients: 12,
+                          non_entity_clients: 29,
+                        },
+                      },
+                      {
+                        path: 'auth/method/nPP4c',
+                        counts: {
+                          clients: 15,
+                          entity_clients: 12,
+                          non_entity_clients: 7,
+                        },
+                      },
+                    ],
+                    id: 'namespace11/',
+                    path: '',
+                  },
+                  {
+                    counts: {
+                      clients: 40,
+                      entity_clients: 28,
+                      non_entity_clients: 12,
+                    },
+                    mounts: [
+                      {
+                        path: 'auth/method/xYL0l',
+                        counts: {
+                          clients: 24,
+                          entity_clients: 9,
+                          non_entity_clients: 195,
+                        },
+                      },
+                      {
+                        path: 'auth/method/CwWM7',
+                        counts: {
+                          clients: 10,
+                          entity_clients: 8,
+                          non_entity_clients: 88,
+                        },
+                      },
+                      {
+                        path: 'auth/method/swCd0',
+                        counts: {
+                          clients: 4,
+                          entity_clients: 2,
+                          non_entity_clients: 58,
+                        },
+                      },
+                      {
+                        path: 'auth/method/0CZTs',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 1,
+                        },
+                      },
+                    ],
+                    id: 'namespace10/',
+                    path: '',
+                  },
+                  {
+                    counts: {
+                      clients: 34,
+                      entity_clients: 21,
+                      non_entity_clients: 13,
+                    },
+                    mounts: [
+                      {
+                        path: 'auth/method/RCpUn',
+                        counts: {
+                          clients: 27,
+                          entity_clients: 14,
+                          non_entity_clients: 445,
+                        },
+                      },
+                      {
+                        path: 'auth/method/S0O4t',
+                        counts: {
+                          clients: 4,
+                          entity_clients: 1,
+                          non_entity_clients: 378,
+                        },
+                      },
+                      {
+                        path: 'auth/method/QqXfg',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 3,
+                        },
+                      },
+                      {
+                        path: 'auth/method/CSSoi',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 4,
+                        },
+                      },
+                    ],
+                    id: 'namespace9/',
+                    path: '',
+                  },
+                ],
+              },
+            },
+            {
+              timestamp: '2022-05-01T07:00:00.000Z',
+              counts: {
+                clients: 194,
+                entity_clients: 187,
+                non_entity_clients: 7,
+              },
+              namespaces: [
+                {
+                  counts: {
+                    entity_clients: 106,
+                    non_entity_clients: 3,
+                    clients: 109,
+                  },
+                  mounts: [
+                    {
+                      path: 'auth/method/cdZ64',
+                      counts: {
+                        clients: 44,
+                        entity_clients: 43,
+                        non_entity_clients: 1,
+                      },
+                    },
+                    {
+                      path: 'auth/method/UpXi1',
+                      counts: {
+                        clients: 34,
+                        entity_clients: 33,
+                        non_entity_clients: 1,
+                      },
+                    },
+                    {
+                      path: 'auth/method/6OzPw',
+                      counts: {
+                        clients: 21,
+                        entity_clients: 20,
+                        non_entity_clients: 1,
+                      },
+                    },
+                    {
+                      path: 'auth/method/PkimI',
+                      counts: {
+                        clients: 10,
+                        entity_clients: 10,
+                        non_entity_clients: 0,
+                      },
+                    },
+                  ],
+                  id: 'namespace17/',
+                  path: '',
+                },
+                {
+                  counts: {
+                    entity_clients: 80,
+                    non_entity_clients: 3,
+                    clients: 83,
+                  },
+                  mounts: [
+                    {
+                      path: 'auth/method/qcuLl',
+                      counts: {
+                        clients: 37,
+                        entity_clients: 36,
+                        non_entity_clients: 1,
+                      },
+                    },
+                    {
+                      path: 'auth/method/KGWiS',
+                      counts: {
+                        clients: 35,
+                        entity_clients: 34,
+                        non_entity_clients: 1,
+                      },
+                    },
+                    {
+                      path: 'auth/method/iM8pi',
+                      counts: {
+                        clients: 10,
+                        entity_clients: 9,
+                        non_entity_clients: 1,
+                      },
+                    },
+                    {
+                      path: 'auth/method/IeyA4',
+                      counts: {
+                        clients: 1,
+                        entity_clients: 1,
+                        non_entity_clients: 0,
+                      },
+                    },
+                  ],
+                  id: 'namespace12/',
+                  path: '',
+                },
+                {
+                  counts: {
+                    entity_clients: 1,
+                    non_entity_clients: 1,
+                    clients: 2,
+                  },
+                  mounts: [
+                    {
+                      path: 'auth/method/XQUrA',
+                      counts: {
+                        clients: 2,
+                        entity_clients: 1,
+                        non_entity_clients: 1,
+                      },
+                    },
+                    {
+                      path: 'auth/method/1p6HR',
+                      counts: {
+                        clients: null,
+                        non_entity_clients: 0,
+                      },
+                    },
+                    {
+                      path: 'auth/method/qRjoJ',
+                      counts: {
+                        clients: null,
+                        non_entity_clients: 0,
+                      },
+                    },
+                    {
+                      path: 'auth/method/x9QQB',
+                      counts: {
+                        clients: null,
+                        non_entity_clients: 0,
+                      },
+                    },
+                  ],
+                  id: 'namespace6/',
+                  path: '',
+                },
+              ],
+              new_clients: {
+                counts: {
+                  clients: 38,
+                  entity_clients: 29,
+                  non_entity_clients: 9,
+                },
+                namespaces: [
+                  {
+                    counts: {
+                      clients: 62,
+                      entity_clients: 37,
+                      non_entity_clients: 25,
+                    },
+                    mounts: [
+                      {
+                        path: 'auth/method/cdZ64',
+                        counts: {
+                          clients: 57,
+                          entity_clients: 26,
+                          non_entity_clients: 813,
+                        },
+                      },
+                      {
+                        path: 'auth/method/UpXi1',
+                        counts: {
+                          clients: 2,
+                          entity_clients: 1,
+                          non_entity_clients: 113,
+                        },
+                      },
+                      {
+                        path: 'auth/method/6OzPw',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 45,
+                        },
+                      },
+                      {
+                        path: 'auth/method/PkimI',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 168,
+                        },
+                      },
+                    ],
+                    id: 'namespace17/',
+                    path: '',
+                  },
+                  {
+                    counts: {
+                      clients: 31,
+                      entity_clients: 20,
+                      non_entity_clients: 11,
+                    },
+                    mounts: [
+                      {
+                        path: 'auth/method/qcuLl',
+                        counts: {
+                          clients: 27,
+                          entity_clients: 24,
+                          non_entity_clients: 253,
+                        },
+                      },
+                      {
+                        path: 'auth/method/KGWiS',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 26,
+                        },
+                      },
+                      {
+                        path: 'auth/method/iM8pi',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 126,
+                        },
+                      },
+                      {
+                        path: 'auth/method/IeyA4',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 53,
+                        },
+                      },
+                    ],
+                    id: 'namespace12/',
+                    path: '',
+                  },
+                  {
+                    counts: {
+                      clients: 30,
+                      entity_clients: 21,
+                      non_entity_clients: 9,
+                    },
+                    mounts: [
+                      {
+                        path: 'auth/method/XQUrA',
+                        counts: {
+                          clients: 15,
+                          entity_clients: 5,
+                          non_entity_clients: 164,
+                        },
+                      },
+                      {
+                        path: 'auth/method/1p6HR',
+                        counts: {
+                          clients: 7,
+                          entity_clients: 4,
+                          non_entity_clients: 292,
+                        },
+                      },
+                      {
+                        path: 'auth/method/qRjoJ',
+                        counts: {
+                          clients: 6,
+                          entity_clients: 1,
+                          non_entity_clients: 47,
+                        },
+                      },
+                      {
+                        path: 'auth/method/x9QQB',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 33,
+                        },
+                      },
+                    ],
+                    id: 'namespace6/',
+                    path: '',
+                  },
+                ],
+              },
+            },
+            {
+              timestamp: '2022-06-01T07:00:00.000Z',
+              counts: {
+                clients: 232,
+                entity_clients: 47,
+                non_entity_clients: 185,
+              },
+              namespaces: [
+                {
+                  counts: {
+                    entity_clients: 21,
+                    non_entity_clients: 102,
+                    clients: 123,
+                  },
+                  mounts: [
+                    {
+                      path: 'auth/method/cdZ64',
+                      counts: {
+                        clients: 111,
+                        entity_clients: 12,
+                        non_entity_clients: 99,
+                      },
+                    },
+                    {
+                      path: 'auth/method/UpXi1',
+                      counts: {
+                        clients: 7,
+                        entity_clients: 6,
+                        non_entity_clients: 1,
+                      },
+                    },
+                    {
+                      path: 'auth/method/6OzPw',
+                      counts: {
+                        clients: 3,
+                        entity_clients: 2,
+                        non_entity_clients: 1,
+                      },
+                    },
+                    {
+                      path: 'auth/method/PkimI',
+                      counts: {
+                        clients: 2,
+                        entity_clients: 1,
+                        non_entity_clients: 1,
+                      },
+                    },
+                  ],
+                  id: 'namespace17/',
+                  path: '',
+                },
+                {
+                  counts: {
+                    entity_clients: 19,
+                    non_entity_clients: 59,
+                    clients: 78,
+                  },
+                  mounts: [
+                    {
+                      path: 'auth/method/qT4Wl',
+                      counts: {
+                        clients: 37,
+                        entity_clients: 8,
+                        non_entity_clients: 29,
+                      },
+                    },
+                    {
+                      path: 'auth/method/Vhu56',
+                      counts: {
+                        clients: 25,
+                        entity_clients: 5,
+                        non_entity_clients: 20,
+                      },
+                    },
+                    {
+                      path: 'auth/method/PCc58',
+                      counts: {
+                        clients: 9,
+                        entity_clients: 4,
+                        non_entity_clients: 5,
+                      },
+                    },
+                    {
+                      path: 'auth/method/nPP4c',
+                      counts: {
+                        clients: 7,
+                        entity_clients: 2,
+                        non_entity_clients: 5,
+                      },
+                    },
+                  ],
+                  id: 'namespace11/',
+                  path: '',
+                },
+                {
+                  counts: {
+                    entity_clients: 7,
+                    non_entity_clients: 24,
+                    clients: 31,
+                  },
+                  mounts: [
+                    {
+                      path: 'auth/method/my50c',
+                      counts: {
+                        clients: 20,
+                        entity_clients: 4,
+                        non_entity_clients: 16,
+                      },
+                    },
+                    {
+                      path: 'auth/method/D8zfa',
+                      counts: {
+                        clients: 7,
+                        entity_clients: 1,
+                        non_entity_clients: 6,
+                      },
+                    },
+                    {
+                      path: 'auth/method/w2xnA',
+                      counts: {
+                        clients: 2,
+                        entity_clients: 1,
+                        non_entity_clients: 1,
+                      },
+                    },
+                    {
+                      path: 'auth/method/FwR7Z',
+                      counts: {
+                        clients: 2,
+                        entity_clients: 1,
+                        non_entity_clients: 1,
+                      },
+                    },
+                  ],
+                  id: 'namespace16/',
+                  path: '',
+                },
+              ],
+              new_clients: {
+                counts: {
+                  clients: 71,
+                  entity_clients: 49,
+                  non_entity_clients: 22,
+                },
+                namespaces: [
+                  {
+                    counts: {
+                      clients: 0,
+                      entity_clients: 0,
+                      non_entity_clients: 0,
+                    },
+                    mounts: [
+                      {
+                        path: 'auth/method/cdZ64',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/UpXi1',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/6OzPw',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/PkimI',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                    ],
+                    id: 'namespace17/',
+                    path: '',
+                  },
+                  {
+                    counts: {
+                      clients: 0,
+                      entity_clients: 0,
+                      non_entity_clients: 0,
+                    },
+                    mounts: [
+                      {
+                        path: 'auth/method/qT4Wl',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/Vhu56',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/PCc58',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/nPP4c',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                    ],
+                    id: 'namespace11/',
+                    path: '',
+                  },
+                  {
+                    counts: {
+                      clients: 0,
+                      entity_clients: 0,
+                      non_entity_clients: 0,
+                    },
+                    mounts: [
+                      {
+                        path: 'auth/method/my50c',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/D8zfa',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/w2xnA',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/FwR7Z',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                    ],
+                    id: 'namespace16/',
+                    path: '',
+                  },
+                ],
+              },
+            },
+            {
+              timestamp: '2022-07-01T07:00:00.000Z',
+              counts: {
+                clients: 303,
+                entity_clients: 218,
+                non_entity_clients: 85,
+              },
+              namespaces: [
+                {
+                  counts: {
+                    entity_clients: 120,
+                    non_entity_clients: 44,
+                    clients: 164,
+                  },
+                  mounts: [
+                    {
+                      path: 'auth/method/cdZ64',
+                      counts: {
+                        clients: 81,
+                        entity_clients: 61,
+                        non_entity_clients: 20,
+                      },
+                    },
+                    {
+                      path: 'auth/method/UpXi1',
+                      counts: {
+                        clients: 44,
+                        entity_clients: 31,
+                        non_entity_clients: 13,
+                      },
+                    },
+                    {
+                      path: 'auth/method/6OzPw',
+                      counts: {
+                        clients: 32,
+                        entity_clients: 24,
+                        non_entity_clients: 8,
+                      },
+                    },
+                    {
+                      path: 'auth/method/PkimI',
+                      counts: {
+                        clients: 7,
+                        entity_clients: 4,
+                        non_entity_clients: 3,
+                      },
+                    },
+                  ],
+                  id: 'namespace17/',
+                  path: '',
+                },
+                {
+                  counts: {
+                    entity_clients: 65,
+                    non_entity_clients: 35,
+                    clients: 100,
+                  },
+                  mounts: [
+                    {
+                      path: 'auth/method/qT4Wl',
+                      counts: {
+                        clients: 88,
+                        entity_clients: 62,
+                        non_entity_clients: 26,
+                      },
+                    },
+                    {
+                      path: 'auth/method/Vhu56',
+                      counts: {
+                        clients: 7,
+                        entity_clients: 1,
+                        non_entity_clients: 6,
+                      },
+                    },
+                    {
+                      path: 'auth/method/PCc58',
+                      counts: {
+                        clients: 3,
+                        entity_clients: 1,
+                        non_entity_clients: 2,
+                      },
+                    },
+                    {
+                      path: 'auth/method/nPP4c',
+                      counts: {
+                        clients: 2,
+                        entity_clients: 1,
+                        non_entity_clients: 1,
+                      },
+                    },
+                  ],
+                  id: 'namespace11/',
+                  path: '',
+                },
+                {
+                  counts: {
+                    entity_clients: 33,
+                    non_entity_clients: 6,
+                    clients: 39,
+                  },
+                  mounts: [
+                    {
+                      path: 'auth/method/my50c',
+                      counts: {
+                        clients: 29,
+                        entity_clients: 26,
+                        non_entity_clients: 3,
+                      },
+                    },
+                    {
+                      path: 'auth/method/D8zfa',
+                      counts: {
+                        clients: 4,
+                        entity_clients: 3,
+                        non_entity_clients: 1,
+                      },
+                    },
+                    {
+                      path: 'auth/method/w2xnA',
+                      counts: {
+                        clients: 3,
+                        entity_clients: 2,
+                        non_entity_clients: 1,
+                      },
+                    },
+                    {
+                      path: 'auth/method/FwR7Z',
+                      counts: {
+                        clients: 3,
+                        entity_clients: 2,
+                        non_entity_clients: 1,
+                      },
+                    },
+                  ],
+                  id: 'namespace16/',
+                  path: '',
+                },
+              ],
+              new_clients: {
+                counts: {
+                  clients: 72,
+                  entity_clients: 46,
+                  non_entity_clients: 26,
+                },
+                namespaces: [
+                  {
+                    counts: {
+                      clients: 41,
+                      entity_clients: 39,
+                      non_entity_clients: 2,
+                    },
+                    mounts: [
+                      {
+                        path: 'auth/method/cdZ64',
+                        counts: {
+                          clients: 21,
+                          entity_clients: 18,
+                          non_entity_clients: 3,
+                        },
+                      },
+                      {
+                        path: 'auth/method/UpXi1',
+                        counts: {
+                          clients: 12,
+                          entity_clients: 9,
+                          non_entity_clients: 3,
+                        },
+                      },
+                      {
+                        path: 'auth/method/6OzPw',
+                        counts: {
+                          clients: 3,
+                          entity_clients: 2,
+                          non_entity_clients: 1,
+                        },
+                      },
+                      {
+                        path: 'auth/method/PkimI',
+                        counts: {
+                          clients: 3,
+                          entity_clients: 2,
+                          non_entity_clients: 1,
+                        },
+                      },
+                    ],
+                    id: 'namespace17/',
+                    path: '',
+                  },
+                  {
+                    counts: {
+                      clients: 14,
+                      entity_clients: 13,
+                      non_entity_clients: 1,
+                    },
+                    mounts: [
+                      {
+                        path: 'auth/method/qT4Wl',
+                        counts: {
+                          clients: 8,
+                          entity_clients: 6,
+                          non_entity_clients: 2,
+                        },
+                      },
+                      {
+                        path: 'auth/method/Vhu56',
+                        counts: {
+                          clients: 3,
+                          entity_clients: 1,
+                          non_entity_clients: 2,
+                        },
+                      },
+                      {
+                        path: 'auth/method/PCc58',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/nPP4c',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 0,
+                        },
+                      },
+                    ],
+                    id: 'namespace11/',
+                    path: '',
+                  },
+                  {
+                    counts: {
+                      clients: 10,
+                      entity_clients: 6,
+                      non_entity_clients: 4,
+                    },
+                    mounts: [
+                      {
+                        path: 'auth/method/my50c',
+                        counts: {
+                          clients: 6,
+                          entity_clients: 5,
+                          non_entity_clients: 1,
+                        },
+                      },
+                      {
+                        path: 'auth/method/D8zfa',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/w2xnA',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/FwR7Z',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 0,
+                        },
+                      },
+                    ],
+                    id: 'namespace16/',
+                    path: '',
+                  },
+                ],
+              },
+            },
+            {
+              timestamp: '2022-08-01T07:00:00.000Z',
+              counts: {
+                clients: 375,
+                entity_clients: 80,
+                non_entity_clients: 295,
+              },
+              namespaces: [
+                {
+                  counts: {
+                    entity_clients: 63,
+                    non_entity_clients: 216,
+                    clients: 279,
+                  },
+                  mounts: [
+                    {
+                      path: 'auth/method/cdZ64',
+                      counts: {
+                        clients: 200,
+                        entity_clients: 43,
+                        non_entity_clients: 157,
+                      },
+                    },
+                    {
+                      path: 'auth/method/UpXi1',
+                      counts: {
+                        clients: 49,
+                        entity_clients: 14,
+                        non_entity_clients: 35,
+                      },
+                    },
+                    {
+                      path: 'auth/method/6OzPw',
+                      counts: {
+                        clients: 19,
+                        entity_clients: 4,
+                        non_entity_clients: 15,
+                      },
+                    },
+                    {
+                      path: 'auth/method/PkimI',
+                      counts: {
+                        clients: 11,
+                        entity_clients: 2,
+                        non_entity_clients: 9,
+                      },
+                    },
+                  ],
+                  id: 'namespace17/',
+                  path: '',
+                },
+                {
+                  counts: {
+                    entity_clients: 14,
+                    non_entity_clients: 45,
+                    clients: 59,
+                  },
+                  mounts: [
+                    {
+                      path: 'auth/method/xYL0l',
+                      counts: {
+                        clients: 40,
+                        entity_clients: 6,
+                        non_entity_clients: 34,
+                      },
+                    },
+                    {
+                      path: 'auth/method/CwWM7',
+                      counts: {
+                        clients: 9,
+                        entity_clients: 4,
+                        non_entity_clients: 5,
+                      },
+                    },
+                    {
+                      path: 'auth/method/swCd0',
+                      counts: {
+                        clients: 6,
+                        entity_clients: 2,
+                        non_entity_clients: 4,
+                      },
+                    },
+                    {
+                      path: 'auth/method/0CZTs',
+                      counts: {
+                        clients: 4,
+                        entity_clients: 2,
+                        non_entity_clients: 2,
+                      },
+                    },
+                  ],
+                  id: 'namespace10/',
+                  path: '',
+                },
+                {
+                  counts: {
+                    entity_clients: 3,
+                    non_entity_clients: 34,
+                    clients: 37,
+                  },
+                  mounts: [
+                    {
+                      path: 'auth/method/RCpUn',
+                      counts: {
+                        clients: 29,
+                        entity_clients: 1,
+                        non_entity_clients: 28,
+                      },
+                    },
+                    {
+                      path: 'auth/method/S0O4t',
+                      counts: {
+                        clients: 5,
+                        entity_clients: 1,
+                        non_entity_clients: 4,
+                      },
+                    },
+                    {
+                      path: 'auth/method/QqXfg',
+                      counts: {
+                        clients: 2,
+                        entity_clients: 1,
+                        non_entity_clients: 1,
+                      },
+                    },
+                    {
+                      path: 'auth/method/CSSoi',
+                      counts: {
+                        clients: 1,
+                        entity_clients: 0,
+                        non_entity_clients: 1,
+                      },
+                    },
+                  ],
+                  id: 'namespace9/',
+                  path: '',
+                },
+              ],
+              new_clients: {
+                counts: {
+                  clients: 0,
+                  entity_clients: 0,
+                  non_entity_clients: 0,
+                },
+                namespaces: [
+                  {
+                    counts: {
+                      clients: 0,
+                      entity_clients: 0,
+                      non_entity_clients: 0,
+                    },
+                    mounts: [
+                      {
+                        path: 'auth/method/cdZ64',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/UpXi1',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/6OzPw',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/PkimI',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                    ],
+                    id: 'namespace17/',
+                    path: '',
+                  },
+                  {
+                    counts: {
+                      clients: 0,
+                      entity_clients: 0,
+                      non_entity_clients: 0,
+                    },
+                    mounts: [
+                      {
+                        path: 'auth/method/xYL0l',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/CwWM7',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/swCd0',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/0CZTs',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                    ],
+                    id: 'namespace10/',
+                    path: '',
+                  },
+                  {
+                    counts: {
+                      clients: 0,
+                      entity_clients: 0,
+                      non_entity_clients: 0,
+                    },
+                    mounts: [
+                      {
+                        path: 'auth/method/RCpUn',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/S0O4t',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/QqXfg',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/CSSoi',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                    ],
+                    id: 'namespace9/',
+                    path: '',
+                  },
+                ],
+              },
+            },
+            {
+              timestamp: '2022-09-01T07:00:00.000Z',
+              counts: {
+                clients: 375,
+                entity_clients: 67,
+                non_entity_clients: 308,
+              },
+              namespaces: [
+                {
+                  counts: {
+                    entity_clients: 34,
+                    non_entity_clients: 230,
+                    clients: 264,
+                  },
+                  mounts: [
+                    {
+                      path: 'auth/method/cdZ64',
+                      counts: {
+                        clients: 107,
+                        entity_clients: 26,
+                        non_entity_clients: 81,
+                      },
+                    },
+                    {
+                      path: 'auth/method/UpXi1',
+                      counts: {
+                        clients: 81,
+                        entity_clients: 4,
+                        non_entity_clients: 77,
+                      },
+                    },
+                    {
+                      path: 'auth/method/6OzPw',
+                      counts: {
+                        clients: 55,
+                        entity_clients: 3,
+                        non_entity_clients: 52,
+                      },
+                    },
+                    {
+                      path: 'auth/method/PkimI',
+                      counts: {
+                        clients: 21,
+                        entity_clients: 1,
+                        non_entity_clients: 20,
+                      },
+                    },
+                  ],
+                  id: 'namespace17/',
+                  path: '',
+                },
+                {
+                  counts: {
+                    entity_clients: 24,
+                    non_entity_clients: 48,
+                    clients: 72,
+                  },
+                  mounts: [
+                    {
+                      path: 'auth/method/xYL0l',
+                      counts: {
+                        clients: 59,
+                        entity_clients: 21,
+                        non_entity_clients: 38,
+                      },
+                    },
+                    {
+                      path: 'auth/method/CwWM7',
+                      counts: {
+                        clients: 7,
+                        entity_clients: 1,
+                        non_entity_clients: 6,
+                      },
+                    },
+                    {
+                      path: 'auth/method/swCd0',
+                      counts: {
+                        clients: 4,
+                        entity_clients: 1,
+                        non_entity_clients: 3,
+                      },
+                    },
+                    {
+                      path: 'auth/method/0CZTs',
+                      counts: {
+                        clients: 2,
+                        entity_clients: 1,
+                        non_entity_clients: 1,
+                      },
+                    },
+                  ],
+                  id: 'namespace10/',
+                  path: '',
+                },
+                {
+                  counts: {
+                    entity_clients: 9,
+                    non_entity_clients: 30,
+                    clients: 39,
+                  },
+                  mounts: [
+                    {
+                      path: 'auth/method/RCpUn',
+                      counts: {
+                        clients: 18,
+                        entity_clients: 3,
+                        non_entity_clients: 15,
+                      },
+                    },
+                    {
+                      path: 'auth/method/S0O4t',
+                      counts: {
+                        clients: 14,
+                        entity_clients: 3,
+                        non_entity_clients: 11,
+                      },
+                    },
+                    {
+                      path: 'auth/method/QqXfg',
+                      counts: {
+                        clients: 5,
+                        entity_clients: 2,
+                        non_entity_clients: 3,
+                      },
+                    },
+                    {
+                      path: 'auth/method/CSSoi',
+                      counts: {
+                        clients: 2,
+                        entity_clients: 1,
+                        non_entity_clients: 1,
+                      },
+                    },
+                  ],
+                  id: 'namespace9/',
+                  path: '',
+                },
+              ],
+              new_clients: {
+                counts: {
+                  clients: 114,
+                  entity_clients: 63,
+                  non_entity_clients: 51,
+                },
+                namespaces: [
+                  {
+                    counts: {
+                      clients: 7,
+                      entity_clients: 6,
+                      non_entity_clients: 1,
+                    },
+                    mounts: [
+                      {
+                        path: 'auth/method/cdZ64',
+                        counts: {
+                          clients: 2,
+                          entity_clients: 2,
+                          non_entity_clients: 1,
+                        },
+                      },
+                      {
+                        path: 'auth/method/UpXi1',
+                        counts: {
+                          clients: 2,
+                          entity_clients: 1,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/6OzPw',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 5,
+                        },
+                      },
+                      {
+                        path: 'auth/method/PkimI',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 0,
+                        },
+                      },
+                    ],
+                    id: 'namespace17/',
+                    path: '',
+                  },
+                  {
+                    counts: {
+                      clients: 1,
+                      entity_clients: 1,
+                      non_entity_clients: 0,
+                    },
+                    mounts: [
+                      {
+                        path: 'auth/method/xYL0l',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/CwWM7',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/swCd0',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/0CZTs',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                    ],
+                    id: 'namespace10/',
+                    path: '',
+                  },
+                  {
+                    counts: {
+                      clients: 1,
+                      entity_clients: 1,
+                      non_entity_clients: 0,
+                    },
+                    mounts: [
+                      {
+                        path: 'auth/method/RCpUn',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/S0O4t',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/QqXfg',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/CSSoi',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                    ],
+                    id: 'namespace9/',
+                    path: '',
+                  },
+                ],
+              },
+            },
+            {
+              timestamp: '2022-10-01T07:00:00.000Z',
+              counts: {
+                clients: 489,
+                entity_clients: 134,
+                non_entity_clients: 355,
+              },
+              namespaces: [
+                {
+                  counts: {
+                    entity_clients: 108,
+                    non_entity_clients: 322,
+                    clients: 430,
+                  },
+                  mounts: [
+                    {
+                      path: 'auth/method/uMGBU',
+                      counts: {
+                        clients: 257,
+                        entity_clients: 35,
+                        non_entity_clients: 222,
+                      },
+                    },
+                    {
+                      path: 'auth/method/8YJO3',
+                      counts: {
+                        clients: 79,
+                        entity_clients: 34,
+                        non_entity_clients: 45,
+                      },
+                    },
+                    {
+                      path: 'auth/method/Ro774',
+                      counts: {
+                        clients: 65,
+                        entity_clients: 32,
+                        non_entity_clients: 33,
+                      },
+                    },
+                    {
+                      path: 'auth/method/ZIpjT',
+                      counts: {
+                        clients: 29,
+                        entity_clients: 7,
+                        non_entity_clients: 22,
+                      },
+                    },
+                  ],
+                  id: 'namespacelonglonglong4/',
+                  path: '',
+                },
+                {
+                  counts: {
+                    entity_clients: 15,
+                    non_entity_clients: 26,
+                    clients: 41,
+                  },
+                  mounts: [
+                    {
+                      path: 'auth/method/qT4Wl',
+                      counts: {
+                        clients: 22,
+                        entity_clients: 9,
+                        non_entity_clients: 13,
+                      },
+                    },
+                    {
+                      path: 'auth/method/Vhu56',
+                      counts: {
+                        clients: 9,
+                        entity_clients: 3,
+                        non_entity_clients: 6,
+                      },
+                    },
+                    {
+                      path: 'auth/method/PCc58',
+                      counts: {
+                        clients: 7,
+                        entity_clients: 2,
+                        non_entity_clients: 5,
+                      },
+                    },
+                    {
+                      path: 'auth/method/nPP4c',
+                      counts: {
+                        clients: 3,
+                        entity_clients: 1,
+                        non_entity_clients: 2,
+                      },
+                    },
+                  ],
+                  id: 'namespace11/',
+                  path: '',
+                },
+                {
+                  counts: {
+                    entity_clients: 11,
+                    non_entity_clients: 7,
+                    clients: 18,
+                  },
+                  mounts: [
+                    {
+                      path: 'auth/method/xYL0l',
+                      counts: {
+                        clients: 8,
+                        entity_clients: 5,
+                        non_entity_clients: 3,
+                      },
+                    },
+                    {
+                      path: 'auth/method/CwWM7',
+                      counts: {
+                        clients: 5,
+                        entity_clients: 3,
+                        non_entity_clients: 2,
+                      },
+                    },
+                    {
+                      path: 'auth/method/swCd0',
+                      counts: {
+                        clients: 3,
+                        entity_clients: 2,
+                        non_entity_clients: 1,
+                      },
+                    },
+                    {
+                      path: 'auth/method/0CZTs',
+                      counts: {
+                        clients: 2,
+                        entity_clients: 1,
+                        non_entity_clients: 1,
+                      },
+                    },
+                  ],
+                  id: 'namespace10/',
+                  path: '',
+                },
+              ],
+              new_clients: {
+                counts: {
+                  clients: 21,
+                  entity_clients: 11,
+                  non_entity_clients: 10,
+                },
+                namespaces: [
+                  {
+                    counts: {
+                      clients: 154,
+                      entity_clients: 129,
+                      non_entity_clients: 25,
+                    },
+                    mounts: [
+                      {
+                        path: 'auth/method/uMGBU',
+                        counts: {
+                          clients: 114,
+                          entity_clients: 84,
+                          non_entity_clients: 453,
+                        },
+                      },
+                      {
+                        path: 'auth/method/8YJO3',
+                        counts: {
+                          clients: 33,
+                          entity_clients: 25,
+                          non_entity_clients: 291,
+                        },
+                      },
+                      {
+                        path: 'auth/method/Ro774',
+                        counts: {
+                          clients: 4,
+                          entity_clients: 2,
+                          non_entity_clients: 13,
+                        },
+                      },
+                      {
+                        path: 'auth/method/ZIpjT',
+                        counts: {
+                          clients: 2,
+                          entity_clients: 1,
+                          non_entity_clients: 4,
+                        },
+                      },
+                    ],
+                    id: 'namespacelonglonglong4/',
+                    path: '',
+                  },
+                  {
+                    counts: {
+                      clients: 6,
+                      entity_clients: 3,
+                      non_entity_clients: 3,
+                    },
+                    mounts: [
+                      {
+                        path: 'auth/method/qT4Wl',
+                        counts: {
+                          clients: 2,
+                          entity_clients: 1,
+                          non_entity_clients: 1019,
+                        },
+                      },
+                      {
+                        path: 'auth/method/Vhu56',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 11,
+                        },
+                      },
+                      {
+                        path: 'auth/method/PCc58',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 29,
+                        },
+                      },
+                      {
+                        path: 'auth/method/nPP4c',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 7,
+                        },
+                      },
+                    ],
+                    id: 'namespace11/',
+                    path: '',
+                  },
+                  {
+                    counts: {
+                      clients: 4,
+                      entity_clients: 2,
+                      non_entity_clients: 2,
+                    },
+                    mounts: [
+                      {
+                        path: 'auth/method/xYL0l',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 195,
+                        },
+                      },
+                      {
+                        path: 'auth/method/CwWM7',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 88,
+                        },
+                      },
+                      {
+                        path: 'auth/method/swCd0',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 58,
+                        },
+                      },
+                      {
+                        path: 'auth/method/0CZTs',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 1,
+                        },
+                      },
+                    ],
+                    id: 'namespace10/',
+                    path: '',
+                  },
+                ],
+              },
+            },
+            {
+              timestamp: '2022-11-01T07:00:00.000Z',
+              counts: {
+                clients: 510,
+                entity_clients: 164,
+                non_entity_clients: 346,
+              },
+              namespaces: [
+                {
+                  counts: {
+                    entity_clients: 66,
+                    non_entity_clients: 176,
+                    clients: 242,
+                  },
+                  mounts: [
+                    {
+                      path: 'auth/method/cdZ64',
+                      counts: {
+                        clients: 108,
+                        entity_clients: 26,
+                        non_entity_clients: 82,
+                      },
+                    },
+                    {
+                      path: 'auth/method/UpXi1',
+                      counts: {
+                        clients: 93,
+                        entity_clients: 22,
+                        non_entity_clients: 71,
+                      },
+                    },
+                    {
+                      path: 'auth/method/6OzPw',
+                      counts: {
+                        clients: 29,
+                        entity_clients: 15,
+                        non_entity_clients: 14,
+                      },
+                    },
+                    {
+                      path: 'auth/method/PkimI',
+                      counts: {
+                        clients: 12,
+                        entity_clients: 3,
+                        non_entity_clients: 9,
+                      },
+                    },
+                  ],
+                  id: 'namespace17/',
+                  path: '',
+                },
+                {
+                  counts: {
+                    entity_clients: 51,
+                    non_entity_clients: 120,
+                    clients: 171,
+                  },
+                  mounts: [
+                    {
+                      path: 'auth/method/lDz9c',
+                      counts: {
+                        clients: 144,
+                        entity_clients: 31,
+                        non_entity_clients: 113,
+                      },
+                    },
+                    {
+                      path: 'auth/method/GtbUu',
+                      counts: {
+                        clients: 15,
+                        entity_clients: 10,
+                        non_entity_clients: 5,
+                      },
+                    },
+                    {
+                      path: 'auth/method/WCyYz',
+                      counts: {
+                        clients: 7,
+                        entity_clients: 6,
+                        non_entity_clients: 1,
+                      },
+                    },
+                    {
+                      path: 'auth/method/j227p',
+                      counts: {
+                        clients: 5,
+                        entity_clients: 4,
+                        non_entity_clients: 1,
+                      },
+                    },
+                  ],
+                  id: 'namespacelonglonglong3/',
+                  path: '',
+                },
+                {
+                  counts: {
+                    entity_clients: 47,
+                    non_entity_clients: 50,
+                    clients: 97,
+                  },
+                  mounts: [
+                    {
+                      path: 'auth/method/uMGBU',
+                      counts: {
+                        clients: 53,
+                        entity_clients: 23,
+                        non_entity_clients: 30,
+                      },
+                    },
+                    {
+                      path: 'auth/method/8YJO3',
+                      counts: {
+                        clients: 33,
+                        entity_clients: 16,
+                        non_entity_clients: 17,
+                      },
+                    },
+                    {
+                      path: 'auth/method/Ro774',
+                      counts: {
+                        clients: 9,
+                        entity_clients: 7,
+                        non_entity_clients: 2,
+                      },
+                    },
+                    {
+                      path: 'auth/method/ZIpjT',
+                      counts: {
+                        clients: 2,
+                        entity_clients: 1,
+                        non_entity_clients: 1,
+                      },
+                    },
+                  ],
+                  id: 'namespacelonglonglong4/',
+                  path: '',
+                },
+              ],
+              new_clients: {
+                counts: {
+                  clients: 27,
+                  entity_clients: 8,
+                  non_entity_clients: 19,
+                },
+                namespaces: [
+                  {
+                    counts: {
+                      clients: 79,
+                      entity_clients: 40,
+                      non_entity_clients: 39,
+                    },
+                    mounts: [
+                      {
+                        path: 'auth/method/cdZ64',
+                        counts: {
+                          clients: 43,
+                          entity_clients: 19,
+                          non_entity_clients: 813,
+                        },
+                      },
+                      {
+                        path: 'auth/method/UpXi1',
+                        counts: {
+                          clients: 19,
+                          entity_clients: 15,
+                          non_entity_clients: 113,
+                        },
+                      },
+                      {
+                        path: 'auth/method/6OzPw',
+                        counts: {
+                          clients: 9,
+                          entity_clients: 6,
+                          non_entity_clients: 45,
+                        },
+                      },
+                      {
+                        path: 'auth/method/PkimI',
+                        counts: {
+                          clients: 4,
+                          entity_clients: 2,
+                          non_entity_clients: 168,
+                        },
+                      },
+                    ],
+                    id: 'namespace17/',
+                    path: '',
+                  },
+                  {
+                    counts: {
+                      clients: 4,
+                      entity_clients: 3,
+                      non_entity_clients: 1,
+                    },
+                    mounts: [
+                      {
+                        path: 'auth/method/lDz9c',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 392,
+                        },
+                      },
+                      {
+                        path: 'auth/method/GtbUu',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 32,
+                        },
+                      },
+                      {
+                        path: 'auth/method/WCyYz',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 1,
+                        },
+                      },
+                      {
+                        path: 'auth/method/j227p',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 51,
+                        },
+                      },
+                    ],
+                    id: 'namespacelonglonglong3/',
+                    path: '',
+                  },
+                  {
+                    counts: {
+                      clients: 3,
+                      entity_clients: 2,
+                      non_entity_clients: 1,
+                    },
+                    mounts: [
+                      {
+                        path: 'auth/method/uMGBU',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 453,
+                        },
+                      },
+                      {
+                        path: 'auth/method/8YJO3',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 291,
+                        },
+                      },
+                      {
+                        path: 'auth/method/Ro774',
+                        counts: {
+                          clients: 1,
+                          entity_clients: 1,
+                          non_entity_clients: 13,
+                        },
+                      },
+                      {
+                        path: 'auth/method/ZIpjT',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 4,
+                        },
+                      },
+                    ],
+                    id: 'namespacelonglonglong4/',
+                    path: '',
+                  },
+                ],
+              },
+            },
+            {
+              timestamp: '2022-12-01T08:00:00.000Z',
+              counts: {
+                clients: 537,
+                entity_clients: 125,
+                non_entity_clients: 412,
+              },
+              namespaces: [
+                {
+                  counts: {
+                    entity_clients: 89,
+                    non_entity_clients: 188,
+                    clients: 277,
+                  },
+                  mounts: [
+                    {
+                      path: 'auth/method/cdZ64',
+                      counts: {
+                        clients: 148,
+                        entity_clients: 79,
+                        non_entity_clients: 69,
+                      },
+                    },
+                    {
+                      path: 'auth/method/UpXi1',
+                      counts: {
+                        clients: 63,
+                        entity_clients: 4,
+                        non_entity_clients: 59,
+                      },
+                    },
+                    {
+                      path: 'auth/method/6OzPw',
+                      counts: {
+                        clients: 40,
+                        entity_clients: 3,
+                        non_entity_clients: 37,
+                      },
+                    },
+                    {
+                      path: 'auth/method/PkimI',
+                      counts: {
+                        clients: 26,
+                        entity_clients: 3,
+                        non_entity_clients: 23,
+                      },
+                    },
+                  ],
+                  id: 'namespace17/',
+                  path: '',
+                },
+                {
+                  counts: {
+                    entity_clients: 24,
+                    non_entity_clients: 187,
+                    clients: 211,
+                  },
+                  mounts: [
+                    {
+                      path: 'auth/method/u2r0G',
+                      counts: {
+                        clients: 190,
+                        entity_clients: 17,
+                        non_entity_clients: 173,
+                      },
+                    },
+                    {
+                      path: 'auth/method/mKqBV',
+                      counts: {
+                        clients: 12,
+                        entity_clients: 4,
+                        non_entity_clients: 8,
+                      },
+                    },
+                    {
+                      path: 'auth/method/nGOa2',
+                      counts: {
+                        clients: 7,
+                        entity_clients: 2,
+                        non_entity_clients: 5,
+                      },
+                    },
+                    {
+                      path: 'auth/method/46UKX',
+                      counts: {
+                        clients: 2,
+                        entity_clients: 1,
+                        non_entity_clients: 1,
+                      },
+                    },
+                  ],
+                  id: 'namespace15/',
+                  path: '',
+                },
+                {
+                  counts: {
+                    entity_clients: 12,
+                    non_entity_clients: 37,
+                    clients: 49,
+                  },
+                  mounts: [
+                    {
+                      path: 'auth/method/uMGBU',
+                      counts: {
+                        clients: 22,
+                        entity_clients: 6,
+                        non_entity_clients: 16,
+                      },
+                    },
+                    {
+                      path: 'auth/method/8YJO3',
+                      counts: {
+                        clients: 14,
+                        entity_clients: 4,
+                        non_entity_clients: 10,
+                      },
+                    },
+                    {
+                      path: 'auth/method/Ro774',
+                      counts: {
+                        clients: 9,
+                        entity_clients: 1,
+                        non_entity_clients: 8,
+                      },
+                    },
+                    {
+                      path: 'auth/method/ZIpjT',
+                      counts: {
+                        clients: 4,
+                        entity_clients: 1,
+                        non_entity_clients: 3,
+                      },
+                    },
+                  ],
+                  id: 'namespacelonglonglong4/',
+                  path: '',
+                },
+              ],
+              new_clients: {
+                counts: {
+                  clients: 0,
+                  entity_clients: 0,
+                  non_entity_clients: 0,
+                },
+                namespaces: [
+                  {
+                    counts: {
+                      clients: 0,
+                      entity_clients: 0,
+                      non_entity_clients: 0,
+                    },
+                    mounts: [
+                      {
+                        path: 'auth/method/cdZ64',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/UpXi1',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/6OzPw',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/PkimI',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                    ],
+                    id: 'namespace17/',
+                    path: '',
+                  },
+                  {
+                    counts: {
+                      clients: 0,
+                      entity_clients: 0,
+                      non_entity_clients: 0,
+                    },
+                    mounts: [
+                      {
+                        path: 'auth/method/u2r0G',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/mKqBV',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/nGOa2',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/46UKX',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                    ],
+                    id: 'namespace15/',
+                    path: '',
+                  },
+                  {
+                    counts: {
+                      clients: 0,
+                      entity_clients: 0,
+                      non_entity_clients: 0,
+                    },
+                    mounts: [
+                      {
+                        path: 'auth/method/uMGBU',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/8YJO3',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/Ro774',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                      {
+                        path: 'auth/method/ZIpjT',
+                        counts: {
+                          clients: 0,
+                          entity_clients: 0,
+                          non_entity_clients: 0,
+                        },
+                      },
+                    ],
+                    id: 'namespacelonglonglong4/',
+                    path: '',
+                  },
+                ],
+              },
+            },
+          ],
+        },
+      };
+    },
+    { timing: 3000 }
+  );
+
+  server.get('/sys/internal/counters/activity/monthly', function () {
+    return {
+      request_id: '26be5ab9-dcac-9237-ec12-269a8ca64742',
+      lease_id: '',
+      renewable: false,
+      lease_duration: 0,
+      data: {
+        by_namespace: [
+          {
+            namespace_id: '0lHBL',
+            namespace_path: 'ns1/',
+            counts: {
+              distinct_entities: 85,
+              non_entity_tokens: 15,
+              clients: 100,
+            },
+            mounts: [
+              {
+                path: 'auth/method/uMGBU',
+                counts: {
+                  clients: 35,
+                  entity_clients: 20,
+                  non_entity_clients: 15,
+                },
+              },
+              {
+                path: 'auth/method/woiej',
+                counts: {
+                  clients: 35,
+                  entity_clients: 20,
+                  non_entity_clients: 15,
+                },
+              },
+            ],
+          },
+          {
+            namespace_id: 'RxD81',
+            namespace_path: 'ns2/',
+            counts: {
+              distinct_entities: 35,
+              non_entity_tokens: 20,
+              clients: 55,
+            },
+            mounts: [
+              {
+                path: 'auth/method/ABCD1',
+                counts: {
+                  clients: 35,
+                  entity_clients: 20,
+                  non_entity_clients: 15,
+                },
+              },
+              {
+                path: 'auth/method/ABCD2',
+                counts: {
+                  clients: 35,
+                  entity_clients: 20,
+                  non_entity_clients: 15,
+                },
+              },
+            ],
+          },
+          {
+            namespace_id: 'root',
+            namespace_path: '',
+            counts: {
+              distinct_entities: 12,
+              non_entity_tokens: 8,
+              clients: 20,
+            },
+            mounts: [
+              {
+                path: 'auth/method/XYZZ2',
+                counts: {
+                  clients: 35,
+                  entity_clients: 20,
+                  non_entity_clients: 15,
+                },
+              },
+              {
+                path: 'auth/method/XYZZ1',
+                counts: {
+                  clients: 35,
+                  entity_clients: 20,
+                  non_entity_clients: 15,
+                },
+              },
+            ],
+          },
+        ],
+        distinct_entities: 132,
+        non_entity_tokens: 43,
+        clients: 175,
+      },
+      wrap_info: null,
+      warnings: null,
+      auth: null,
+    };
+  });
+}
diff --git a/ui/mirage/handlers/base.js b/ui/mirage/handlers/base.js
index ba27ea8fc0068..98810f6009083 100644
--- a/ui/mirage/handlers/base.js
+++ b/ui/mirage/handlers/base.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 // base handlers used in mirage config when a specific handler is not specified
 const EXPIRY_DATE = '2021-05-12T23:20:50.52Z';
 
diff --git a/ui/mirage/handlers/clients.js b/ui/mirage/handlers/clients.js
index e54fe2a108a6a..ebb6009c550f0 100644
--- a/ui/mirage/handlers/clients.js
+++ b/ui/mirage/handlers/clients.js
@@ -1,133 +1,2839 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import {
+  formatISO,
+  isAfter,
   isBefore,
+  sub,
+  isSameMonth,
   startOfMonth,
   endOfMonth,
   addMonths,
   subMonths,
   differenceInCalendarMonths,
-  fromUnixTime,
-  isAfter,
-  formatRFC3339,
 } from 'date-fns';
 import { parseAPITimestamp } from 'core/utils/date-formatters';
+import formatRFC3339 from 'date-fns/formatRFC3339';
+
+const NEW_DATE = new Date();
+const COUNTS_START = subMonths(NEW_DATE, 12); // pretend vault user started cluster 1 year ago
 
-// Matches mocked date in client-dashboard-test file
-const CURRENT_DATE = new Date('2023-01-13T14:15:00');
-const COUNTS_START = subMonths(CURRENT_DATE, 12); // pretend vault user started cluster 6 months ago
 // for testing, we're in the middle of a license/billing period
-const LICENSE_START = startOfMonth(subMonths(CURRENT_DATE, 6));
+const LICENSE_START = startOfMonth(subMonths(NEW_DATE, 6));
+const LICENSE_END = endOfMonth(addMonths(NEW_DATE, 6));
+
 // upgrade happened 1 month after license start
 const UPGRADE_DATE = addMonths(LICENSE_START, 1);
-
-function getSum(array, key) {
-  return array.reduce((sum, { counts }) => sum + counts[key], 0);
-}
-
-function getTotalCounts(array) {
-  return {
-    distinct_entities: getSum(array, 'entity_clients'),
-    entity_clients: getSum(array, 'entity_clients'),
-    non_entity_tokens: getSum(array, 'non_entity_clients'),
-    non_entity_clients: getSum(array, 'non_entity_clients'),
-    clients: getSum(array, 'clients'),
-  };
-}
-
-function randomBetween(min, max) {
-  return Math.floor(Math.random() * (max - min + 1) + min);
-}
-
-function arrayOfCounts(max, arrayLength) {
-  var result = [];
-  var sum = 0;
-  for (var i = 0; i < arrayLength - 1; i++) {
-    result[i] = randomBetween(1, max - (arrayLength - i - 1) - sum);
-    sum += result[i];
-  }
-  result[arrayLength - 1] = max - sum;
-  return result.sort((a, b) => b - a);
-}
-
-function generateNamespaceBlock(idx = 0, isLowerCounts = false, ns) {
-  const min = isLowerCounts ? 10 : 50;
-  const max = isLowerCounts ? 100 : 5000;
-  const nsBlock = {
-    namespace_id: ns?.namespace_id || (idx === 0 ? 'root' : Math.random().toString(36).slice(2, 7) + idx),
-    namespace_path: ns?.namespace_path || (idx === 0 ? '' : `ns/${idx}`),
-    counts: {},
-  };
-  const mounts = [];
-  Array.from(Array(10)).forEach((mount, index) => {
-    const mountClients = randomBetween(min, max);
-    const [nonEntity, entity] = arrayOfCounts(mountClients, 2);
-    mounts.push({
-      mount_path: `auth/authid${index}`,
+// Oldest to newest
+const MOCK_MONTHLY_DATA = [
+  {
+    timestamp: formatISO(UPGRADE_DATE),
+    counts: {
+      distinct_entities: 0,
+      entity_clients: 10433,
+      non_entity_tokens: 0,
+      non_entity_clients: 7555,
+      clients: 17988,
+    },
+    namespaces: [
+      {
+        namespace_id: 'PU6JB',
+        namespace_path: 'test-ns-2/',
+        counts: {
+          distinct_entities: 0,
+          entity_clients: 3458,
+          non_entity_tokens: 0,
+          non_entity_clients: 1631,
+          clients: 5089,
+        },
+        mounts: [
+          {
+            mount_path: 'path-1',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 948,
+              non_entity_tokens: 0,
+              non_entity_clients: 714,
+              clients: 1662,
+            },
+          },
+          {
+            mount_path: 'path-4-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 899,
+              non_entity_tokens: 0,
+              non_entity_clients: 301,
+              clients: 1200,
+            },
+          },
+          {
+            mount_path: 'path-2',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 692,
+              non_entity_tokens: 0,
+              non_entity_clients: 474,
+              clients: 1166,
+            },
+          },
+          {
+            mount_path: 'path-3-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 919,
+              non_entity_tokens: 0,
+              non_entity_clients: 142,
+              clients: 1061,
+            },
+          },
+        ],
+      },
+      {
+        namespace_id: '3lq5r',
+        namespace_path: 'test-ns-2-with-namespace-length-over-18-characters/',
+        counts: {
+          distinct_entities: 0,
+          entity_clients: 2428,
+          non_entity_tokens: 0,
+          non_entity_clients: 1841,
+          clients: 4269,
+        },
+        mounts: [
+          {
+            mount_path: 'path-3-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 969,
+              non_entity_tokens: 0,
+              non_entity_clients: 396,
+              clients: 1365,
+            },
+          },
+          {
+            mount_path: 'path-4-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 794,
+              non_entity_tokens: 0,
+              non_entity_clients: 501,
+              clients: 1295,
+            },
+          },
+          {
+            mount_path: 'path-1',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 289,
+              non_entity_tokens: 0,
+              non_entity_clients: 666,
+              clients: 955,
+            },
+          },
+          {
+            mount_path: 'path-2',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 376,
+              non_entity_tokens: 0,
+              non_entity_clients: 278,
+              clients: 654,
+            },
+          },
+        ],
+      },
+      {
+        namespace_id: 'sJRLj',
+        namespace_path: 'test-ns-1-with-namespace-length-over-18-characters/',
+        counts: {
+          distinct_entities: 0,
+          entity_clients: 2384,
+          non_entity_tokens: 0,
+          non_entity_clients: 1278,
+          clients: 3662,
+        },
+        mounts: [
+          {
+            mount_path: 'path-2',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 853,
+              non_entity_tokens: 0,
+              non_entity_clients: 553,
+              clients: 1406,
+            },
+          },
+          {
+            mount_path: 'path-1',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 677,
+              non_entity_tokens: 0,
+              non_entity_clients: 182,
+              clients: 859,
+            },
+          },
+          {
+            mount_path: 'path-4-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 582,
+              non_entity_tokens: 0,
+              non_entity_clients: 175,
+              clients: 757,
+            },
+          },
+          {
+            mount_path: 'path-3-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 272,
+              non_entity_tokens: 0,
+              non_entity_clients: 368,
+              clients: 640,
+            },
+          },
+        ],
+      },
+      {
+        namespace_id: 'root',
+        namespace_path: '',
+        counts: {
+          distinct_entities: 0,
+          entity_clients: 943,
+          non_entity_tokens: 0,
+          non_entity_clients: 1595,
+          clients: 2538,
+        },
+        mounts: [
+          {
+            mount_path: 'path-4-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 318,
+              non_entity_tokens: 0,
+              non_entity_clients: 735,
+              clients: 1053,
+            },
+          },
+          {
+            mount_path: 'path-3-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 362,
+              non_entity_tokens: 0,
+              non_entity_clients: 415,
+              clients: 777,
+            },
+          },
+          {
+            mount_path: 'path-2',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 158,
+              non_entity_tokens: 0,
+              non_entity_clients: 325,
+              clients: 483,
+            },
+          },
+          {
+            mount_path: 'path-1',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 105,
+              non_entity_tokens: 0,
+              non_entity_clients: 120,
+              clients: 225,
+            },
+          },
+        ],
+      },
+      {
+        namespace_id: 'opmJ1',
+        namespace_path: 'test-ns-1/',
+        counts: {
+          distinct_entities: 0,
+          entity_clients: 1220,
+          non_entity_tokens: 0,
+          non_entity_clients: 1210,
+          clients: 2430,
+        },
+        mounts: [
+          {
+            mount_path: 'path-3-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 697,
+              non_entity_tokens: 0,
+              non_entity_clients: 516,
+              clients: 1213,
+            },
+          },
+          {
+            mount_path: 'path-1',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 154,
+              non_entity_tokens: 0,
+              non_entity_clients: 480,
+              clients: 634,
+            },
+          },
+          {
+            mount_path: 'path-4-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 223,
+              non_entity_tokens: 0,
+              non_entity_clients: 97,
+              clients: 320,
+            },
+          },
+          {
+            mount_path: 'path-2',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 146,
+              non_entity_tokens: 0,
+              non_entity_clients: 117,
+              clients: 263,
+            },
+          },
+        ],
+      },
+    ],
+    new_clients: {
       counts: {
-        clients: mountClients,
-        entity_clients: entity,
-        non_entity_clients: nonEntity,
-        distinct_entities: entity,
-        non_entity_tokens: nonEntity,
+        distinct_entities: 0,
+        entity_clients: 5032,
+        non_entity_tokens: 0,
+        non_entity_clients: 2888,
+        clients: 7920,
       },
-    });
-  });
-  mounts.sort((a, b) => b.counts.clients - a.counts.clients);
-  nsBlock.mounts = mounts;
-  nsBlock.counts = getTotalCounts(mounts);
-  return nsBlock;
-}
+      namespaces: [
+        {
+          namespace_id: 'sJRLj',
+          namespace_path: 'test-ns-1-with-namespace-length-over-18-characters/',
+          counts: {
+            distinct_entities: 0,
+            entity_clients: 1907,
+            non_entity_tokens: 0,
+            non_entity_clients: 354,
+            clients: 2261,
+          },
+          mounts: [
+            {
+              mount_path: 'path-2',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 753,
+                non_entity_tokens: 0,
+                non_entity_clients: 138,
+                clients: 891,
+              },
+            },
+            {
+              mount_path: 'path-1',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 516,
+                non_entity_tokens: 0,
+                non_entity_clients: 91,
+                clients: 607,
+              },
+            },
+            {
+              mount_path: 'path-4-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 474,
+                non_entity_tokens: 0,
+                non_entity_clients: 1,
+                clients: 475,
+              },
+            },
+            {
+              mount_path: 'path-3-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 164,
+                non_entity_tokens: 0,
+                non_entity_clients: 124,
+                clients: 288,
+              },
+            },
+          ],
+        },
+        {
+          namespace_id: '3lq5r',
+          namespace_path: 'test-ns-2-with-namespace-length-over-18-characters/',
+          counts: {
+            distinct_entities: 0,
+            entity_clients: 843,
+            non_entity_tokens: 0,
+            non_entity_clients: 748,
+            clients: 1591,
+          },
+          mounts: [
+            {
+              mount_path: 'path-4-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 597,
+                non_entity_tokens: 0,
+                non_entity_clients: 369,
+                clients: 966,
+              },
+            },
+            {
+              mount_path: 'path-3-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 185,
+                non_entity_tokens: 0,
+                non_entity_clients: 156,
+                clients: 341,
+              },
+            },
+            {
+              mount_path: 'path-1',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 59,
+                non_entity_tokens: 0,
+                non_entity_clients: 223,
+                clients: 282,
+              },
+            },
+            {
+              mount_path: 'path-2',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 2,
+                non_entity_tokens: 0,
+                non_entity_clients: 0,
+                clients: 2,
+              },
+            },
+          ],
+        },
+        {
+          namespace_id: 'PU6JB',
+          namespace_path: 'test-ns-2/',
+          counts: {
+            distinct_entities: 0,
+            entity_clients: 1291,
+            non_entity_tokens: 0,
+            non_entity_clients: 268,
+            clients: 1559,
+          },
+          mounts: [
+            {
+              mount_path: 'path-2',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 518,
+                non_entity_tokens: 0,
+                non_entity_clients: 78,
+                clients: 596,
+              },
+            },
+            {
+              mount_path: 'path-1',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 291,
+                non_entity_tokens: 0,
+                non_entity_clients: 85,
+                clients: 376,
+              },
+            },
+            {
+              mount_path: 'path-4-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 276,
+                non_entity_tokens: 0,
+                non_entity_clients: 59,
+                clients: 335,
+              },
+            },
+            {
+              mount_path: 'path-3-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 206,
+                non_entity_tokens: 0,
+                non_entity_clients: 46,
+                clients: 252,
+              },
+            },
+          ],
+        },
+        {
+          namespace_id: 'opmJ1',
+          namespace_path: 'test-ns-1/',
+          counts: {
+            distinct_entities: 0,
+            entity_clients: 663,
+            non_entity_tokens: 0,
+            non_entity_clients: 778,
+            clients: 1441,
+          },
+          mounts: [
+            {
+              mount_path: 'path-3-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 478,
+                non_entity_tokens: 0,
+                non_entity_clients: 309,
+                clients: 787,
+              },
+            },
+            {
+              mount_path: 'path-1',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 129,
+                non_entity_tokens: 0,
+                non_entity_clients: 313,
+                clients: 442,
+              },
+            },
+            {
+              mount_path: 'path-2',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 32,
+                non_entity_tokens: 0,
+                non_entity_clients: 79,
+                clients: 111,
+              },
+            },
+            {
+              mount_path: 'path-4-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 24,
+                non_entity_tokens: 0,
+                non_entity_clients: 77,
+                clients: 101,
+              },
+            },
+          ],
+        },
+        {
+          namespace_id: 'root',
+          namespace_path: '',
+          counts: {
+            distinct_entities: 0,
+            entity_clients: 328,
+            non_entity_tokens: 0,
+            non_entity_clients: 740,
+            clients: 1068,
+          },
+          mounts: [
+            {
+              mount_path: 'path-4-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 143,
+                non_entity_tokens: 0,
+                non_entity_clients: 273,
+                clients: 416,
+              },
+            },
+            {
+              mount_path: 'path-2',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 136,
+                non_entity_tokens: 0,
+                non_entity_clients: 142,
+                clients: 278,
+              },
+            },
+            {
+              mount_path: 'path-3-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 19,
+                non_entity_tokens: 0,
+                non_entity_clients: 216,
+                clients: 235,
+              },
+            },
+            {
+              mount_path: 'path-1',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 30,
+                non_entity_tokens: 0,
+                non_entity_clients: 109,
+                clients: 139,
+              },
+            },
+          ],
+        },
+      ],
+    },
+  },
+  {
+    timestamp: formatISO(addMonths(UPGRADE_DATE, 1)),
+    counts: {
+      distinct_entities: 0,
+      entity_clients: 10285,
+      non_entity_tokens: 0,
+      non_entity_clients: 10425,
+      clients: 20710,
+    },
+    namespaces: [
+      {
+        namespace_id: '3lq5r',
+        namespace_path: 'test-ns-2-with-namespace-length-over-18-characters/',
+        counts: {
+          distinct_entities: 0,
+          entity_clients: 2335,
+          non_entity_tokens: 0,
+          non_entity_clients: 2644,
+          clients: 4979,
+        },
+        mounts: [
+          {
+            mount_path: 'path-2',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 939,
+              non_entity_tokens: 0,
+              non_entity_clients: 649,
+              clients: 1588,
+            },
+          },
+          {
+            mount_path: 'path-1',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 461,
+              non_entity_tokens: 0,
+              non_entity_clients: 870,
+              clients: 1331,
+            },
+          },
+          {
+            mount_path: 'path-4-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 172,
+              non_entity_tokens: 0,
+              non_entity_clients: 990,
+              clients: 1162,
+            },
+          },
+          {
+            mount_path: 'path-3-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 763,
+              non_entity_tokens: 0,
+              non_entity_clients: 135,
+              clients: 898,
+            },
+          },
+        ],
+      },
+      {
+        namespace_id: 'root',
+        namespace_path: '',
+        counts: {
+          distinct_entities: 0,
+          entity_clients: 2054,
+          non_entity_tokens: 0,
+          non_entity_clients: 2747,
+          clients: 4801,
+        },
+        mounts: [
+          {
+            mount_path: 'path-2',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 540,
+              non_entity_tokens: 0,
+              non_entity_clients: 941,
+              clients: 1481,
+            },
+          },
+          {
+            mount_path: 'path-1',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 722,
+              non_entity_tokens: 0,
+              non_entity_clients: 507,
+              clients: 1229,
+            },
+          },
+          {
+            mount_path: 'path-3-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 611,
+              non_entity_tokens: 0,
+              non_entity_clients: 520,
+              clients: 1131,
+            },
+          },
+          {
+            mount_path: 'path-4-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 181,
+              non_entity_tokens: 0,
+              non_entity_clients: 779,
+              clients: 960,
+            },
+          },
+        ],
+      },
+      {
+        namespace_id: 'PU6JB',
+        namespace_path: 'test-ns-2/',
+        counts: {
+          distinct_entities: 0,
+          entity_clients: 2788,
+          non_entity_tokens: 0,
+          non_entity_clients: 1720,
+          clients: 4508,
+        },
+        mounts: [
+          {
+            mount_path: 'path-2',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 643,
+              non_entity_tokens: 0,
+              non_entity_clients: 814,
+              clients: 1457,
+            },
+          },
+          {
+            mount_path: 'path-3-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 811,
+              non_entity_tokens: 0,
+              non_entity_clients: 385,
+              clients: 1196,
+            },
+          },
+          {
+            mount_path: 'path-1',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 932,
+              non_entity_tokens: 0,
+              non_entity_clients: 72,
+              clients: 1004,
+            },
+          },
+          {
+            mount_path: 'path-4-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 402,
+              non_entity_tokens: 0,
+              non_entity_clients: 449,
+              clients: 851,
+            },
+          },
+        ],
+      },
+      {
+        namespace_id: 'sJRLj',
+        namespace_path: 'test-ns-1-with-namespace-length-over-18-characters/',
+        counts: {
+          distinct_entities: 0,
+          entity_clients: 1162,
+          non_entity_tokens: 0,
+          non_entity_clients: 2187,
+          clients: 3349,
+        },
+        mounts: [
+          {
+            mount_path: 'path-2',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 483,
+              non_entity_tokens: 0,
+              non_entity_clients: 839,
+              clients: 1322,
+            },
+          },
+          {
+            mount_path: 'path-4-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 373,
+              non_entity_tokens: 0,
+              non_entity_clients: 858,
+              clients: 1231,
+            },
+          },
+          {
+            mount_path: 'path-1',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 271,
+              non_entity_tokens: 0,
+              non_entity_clients: 154,
+              clients: 425,
+            },
+          },
+          {
+            mount_path: 'path-3-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 35,
+              non_entity_tokens: 0,
+              non_entity_clients: 336,
+              clients: 371,
+            },
+          },
+        ],
+      },
+      {
+        namespace_id: 'opmJ1',
+        namespace_path: 'test-ns-1/',
+        counts: {
+          distinct_entities: 0,
+          entity_clients: 1946,
+          non_entity_tokens: 0,
+          non_entity_clients: 1127,
+          clients: 3073,
+        },
+        mounts: [
+          {
+            mount_path: 'path-4-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 322,
+              non_entity_tokens: 0,
+              non_entity_clients: 537,
+              clients: 859,
+            },
+          },
+          {
+            mount_path: 'path-1',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 685,
+              non_entity_tokens: 0,
+              non_entity_clients: 132,
+              clients: 817,
+            },
+          },
+          {
+            mount_path: 'path-3-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 321,
+              non_entity_tokens: 0,
+              non_entity_clients: 385,
+              clients: 706,
+            },
+          },
+          {
+            mount_path: 'path-2',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 618,
+              non_entity_tokens: 0,
+              non_entity_clients: 73,
+              clients: 691,
+            },
+          },
+        ],
+      },
+    ],
+    new_clients: {
+      counts: {
+        distinct_entities: 0,
+        entity_clients: 5315,
+        non_entity_tokens: 0,
+        non_entity_clients: 5724,
+        clients: 11039,
+      },
+      namespaces: [
+        {
+          namespace_id: 'root',
+          namespace_path: '',
+          counts: {
+            distinct_entities: 0,
+            entity_clients: 1253,
+            non_entity_tokens: 0,
+            non_entity_clients: 1529,
+            clients: 2782,
+          },
+          mounts: [
+            {
+              mount_path: 'path-2',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 452,
+                non_entity_tokens: 0,
+                non_entity_clients: 433,
+                clients: 885,
+              },
+            },
+            {
+              mount_path: 'path-4-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 134,
+                non_entity_tokens: 0,
+                non_entity_clients: 732,
+                clients: 866,
+              },
+            },
+            {
+              mount_path: 'path-3-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 472,
+                non_entity_tokens: 0,
+                non_entity_clients: 361,
+                clients: 833,
+              },
+            },
+            {
+              mount_path: 'path-1',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 195,
+                non_entity_tokens: 0,
+                non_entity_clients: 3,
+                clients: 198,
+              },
+            },
+          ],
+        },
+        {
+          namespace_id: '3lq5r',
+          namespace_path: 'test-ns-2-with-namespace-length-over-18-characters/',
+          counts: {
+            distinct_entities: 0,
+            entity_clients: 1032,
+            non_entity_tokens: 0,
+            non_entity_clients: 1652,
+            clients: 2684,
+          },
+          mounts: [
+            {
+              mount_path: 'path-4-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 93,
+                non_entity_tokens: 0,
+                non_entity_clients: 849,
+                clients: 942,
+              },
+            },
+            {
+              mount_path: 'path-3-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 692,
+                non_entity_tokens: 0,
+                non_entity_clients: 117,
+                clients: 809,
+              },
+            },
+            {
+              mount_path: 'path-1',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 159,
+                non_entity_tokens: 0,
+                non_entity_clients: 596,
+                clients: 755,
+              },
+            },
+            {
+              mount_path: 'path-2',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 88,
+                non_entity_tokens: 0,
+                non_entity_clients: 90,
+                clients: 178,
+              },
+            },
+          ],
+        },
+        {
+          namespace_id: 'opmJ1',
+          namespace_path: 'test-ns-1/',
+          counts: {
+            distinct_entities: 0,
+            entity_clients: 1482,
+            non_entity_tokens: 0,
+            non_entity_clients: 742,
+            clients: 2224,
+          },
+          mounts: [
+            {
+              mount_path: 'path-3-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 278,
+                non_entity_tokens: 0,
+                non_entity_clients: 372,
+                clients: 650,
+              },
+            },
+            {
+              mount_path: 'path-1',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 546,
+                non_entity_tokens: 0,
+                non_entity_clients: 52,
+                clients: 598,
+              },
+            },
+            {
+              mount_path: 'path-4-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 313,
+                non_entity_tokens: 0,
+                non_entity_clients: 264,
+                clients: 577,
+              },
+            },
+            {
+              mount_path: 'path-2',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 345,
+                non_entity_tokens: 0,
+                non_entity_clients: 54,
+                clients: 399,
+              },
+            },
+          ],
+        },
+        {
+          namespace_id: 'PU6JB',
+          namespace_path: 'test-ns-2/',
+          counts: {
+            distinct_entities: 0,
+            entity_clients: 1090,
+            non_entity_tokens: 0,
+            non_entity_clients: 600,
+            clients: 1690,
+          },
+          mounts: [
+            {
+              mount_path: 'path-2',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 632,
+                non_entity_tokens: 0,
+                non_entity_clients: 7,
+                clients: 639,
+              },
+            },
+            {
+              mount_path: 'path-4-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 180,
+                non_entity_tokens: 0,
+                non_entity_clients: 317,
+                clients: 497,
+              },
+            },
+            {
+              mount_path: 'path-3-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 214,
+                non_entity_tokens: 0,
+                non_entity_clients: 239,
+                clients: 453,
+              },
+            },
+            {
+              mount_path: 'path-1',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 64,
+                non_entity_tokens: 0,
+                non_entity_clients: 37,
+                clients: 101,
+              },
+            },
+          ],
+        },
+        {
+          namespace_id: 'sJRLj',
+          namespace_path: 'test-ns-1-with-namespace-length-over-18-characters/',
+          counts: {
+            distinct_entities: 0,
+            entity_clients: 458,
+            non_entity_tokens: 0,
+            non_entity_clients: 1201,
+            clients: 1659,
+          },
+          mounts: [
+            {
+              mount_path: 'path-4-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 134,
+                non_entity_tokens: 0,
+                non_entity_clients: 827,
+                clients: 961,
+              },
+            },
+            {
+              mount_path: 'path-1',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 232,
+                non_entity_tokens: 0,
+                non_entity_clients: 112,
+                clients: 344,
+              },
+            },
+            {
+              mount_path: 'path-3-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 4,
+                non_entity_tokens: 0,
+                non_entity_clients: 193,
+                clients: 197,
+              },
+            },
+            {
+              mount_path: 'path-2',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 88,
+                non_entity_tokens: 0,
+                non_entity_clients: 69,
+                clients: 157,
+              },
+            },
+          ],
+        },
+      ],
+    },
+  },
+  {
+    timestamp: formatISO(addMonths(UPGRADE_DATE, 2)),
+    counts: {
+      distinct_entities: 0,
+      entity_clients: 9721,
+      non_entity_tokens: 0,
+      non_entity_clients: 11472,
+      clients: 21193,
+    },
+    namespaces: [
+      {
+        namespace_id: 'sJRLj',
+        namespace_path: 'test-ns-1-with-namespace-length-over-18-characters/',
+        counts: {
+          distinct_entities: 0,
+          entity_clients: 2321,
+          non_entity_tokens: 0,
+          non_entity_clients: 2864,
+          clients: 5185,
+        },
+        mounts: [
+          {
+            mount_path: 'path-3-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 616,
+              non_entity_tokens: 0,
+              non_entity_clients: 940,
+              clients: 1556,
+            },
+          },
+          {
+            mount_path: 'path-4-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 965,
+              non_entity_tokens: 0,
+              non_entity_clients: 393,
+              clients: 1358,
+            },
+          },
+          {
+            mount_path: 'path-1',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 587,
+              non_entity_tokens: 0,
+              non_entity_clients: 724,
+              clients: 1311,
+            },
+          },
+          {
+            mount_path: 'path-2',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 153,
+              non_entity_tokens: 0,
+              non_entity_clients: 807,
+              clients: 960,
+            },
+          },
+        ],
+      },
+      {
+        namespace_id: 'PU6JB',
+        namespace_path: 'test-ns-2/',
+        counts: {
+          distinct_entities: 0,
+          entity_clients: 2711,
+          non_entity_tokens: 0,
+          non_entity_clients: 1883,
+          clients: 4594,
+        },
+        mounts: [
+          {
+            mount_path: 'path-3-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 619,
+              non_entity_tokens: 0,
+              non_entity_clients: 925,
+              clients: 1544,
+            },
+          },
+          {
+            mount_path: 'path-4-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 661,
+              non_entity_tokens: 0,
+              non_entity_clients: 814,
+              clients: 1475,
+            },
+          },
+          {
+            mount_path: 'path-2',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 954,
+              non_entity_tokens: 0,
+              non_entity_clients: 7,
+              clients: 961,
+            },
+          },
+          {
+            mount_path: 'path-1',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 477,
+              non_entity_tokens: 0,
+              non_entity_clients: 137,
+              clients: 614,
+            },
+          },
+        ],
+      },
+      {
+        namespace_id: '3lq5r',
+        namespace_path: 'test-ns-2-with-namespace-length-over-18-characters/',
+        counts: {
+          distinct_entities: 0,
+          entity_clients: 1426,
+          non_entity_tokens: 0,
+          non_entity_clients: 2978,
+          clients: 4404,
+        },
+        mounts: [
+          {
+            mount_path: 'path-2',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 780,
+              non_entity_tokens: 0,
+              non_entity_clients: 696,
+              clients: 1476,
+            },
+          },
+          {
+            mount_path: 'path-4-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 369,
+              non_entity_tokens: 0,
+              non_entity_clients: 977,
+              clients: 1346,
+            },
+          },
+          {
+            mount_path: 'path-3-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 200,
+              non_entity_tokens: 0,
+              non_entity_clients: 753,
+              clients: 953,
+            },
+          },
+          {
+            mount_path: 'path-1',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 77,
+              non_entity_tokens: 0,
+              non_entity_clients: 552,
+              clients: 629,
+            },
+          },
+        ],
+      },
+      {
+        namespace_id: 'opmJ1',
+        namespace_path: 'test-ns-1/',
+        counts: {
+          distinct_entities: 0,
+          entity_clients: 2213,
+          non_entity_tokens: 0,
+          non_entity_clients: 1851,
+          clients: 4064,
+        },
+        mounts: [
+          {
+            mount_path: 'path-1',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 610,
+              non_entity_tokens: 0,
+              non_entity_clients: 893,
+              clients: 1503,
+            },
+          },
+          {
+            mount_path: 'path-3-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 957,
+              non_entity_tokens: 0,
+              non_entity_clients: 136,
+              clients: 1093,
+            },
+          },
+          {
+            mount_path: 'path-2',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 262,
+              non_entity_tokens: 0,
+              non_entity_clients: 605,
+              clients: 867,
+            },
+          },
+          {
+            mount_path: 'path-4-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 384,
+              non_entity_tokens: 0,
+              non_entity_clients: 217,
+              clients: 601,
+            },
+          },
+        ],
+      },
+      {
+        namespace_id: 'root',
+        namespace_path: '',
+        counts: {
+          distinct_entities: 0,
+          entity_clients: 1050,
+          non_entity_tokens: 0,
+          non_entity_clients: 1896,
+          clients: 2946,
+        },
+        mounts: [
+          {
+            mount_path: 'path-4-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 74,
+              non_entity_tokens: 0,
+              non_entity_clients: 978,
+              clients: 1052,
+            },
+          },
+          {
+            mount_path: 'path-1',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 238,
+              non_entity_tokens: 0,
+              non_entity_clients: 530,
+              clients: 768,
+            },
+          },
+          {
+            mount_path: 'path-3-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 367,
+              non_entity_tokens: 0,
+              non_entity_clients: 199,
+              clients: 566,
+            },
+          },
+          {
+            mount_path: 'path-2',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 371,
+              non_entity_tokens: 0,
+              non_entity_clients: 189,
+              clients: 560,
+            },
+          },
+        ],
+      },
+    ],
+    new_clients: {
+      counts: {
+        distinct_entities: 0,
+        entity_clients: 4637,
+        non_entity_tokens: 0,
+        non_entity_clients: 5789,
+        clients: 10426,
+      },
+      namespaces: [
+        {
+          namespace_id: 'sJRLj',
+          namespace_path: 'test-ns-1-with-namespace-length-over-18-characters/',
+          counts: {
+            distinct_entities: 0,
+            entity_clients: 1170,
+            non_entity_tokens: 0,
+            non_entity_clients: 1525,
+            clients: 2695,
+          },
+          mounts: [
+            {
+              mount_path: 'path-3-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 511,
+                non_entity_tokens: 0,
+                non_entity_clients: 720,
+                clients: 1231,
+              },
+            },
+            {
+              mount_path: 'path-2',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 76,
+                non_entity_tokens: 0,
+                non_entity_clients: 479,
+                clients: 555,
+              },
+            },
+            {
+              mount_path: 'path-4-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 431,
+                non_entity_tokens: 0,
+                non_entity_clients: 72,
+                clients: 503,
+              },
+            },
+            {
+              mount_path: 'path-1',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 152,
+                non_entity_tokens: 0,
+                non_entity_clients: 254,
+                clients: 406,
+              },
+            },
+          ],
+        },
+        {
+          namespace_id: 'opmJ1',
+          namespace_path: 'test-ns-1/',
+          counts: {
+            distinct_entities: 0,
+            entity_clients: 1482,
+            non_entity_tokens: 0,
+            non_entity_clients: 1129,
+            clients: 2611,
+          },
+          mounts: [
+            {
+              mount_path: 'path-1',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 553,
+                non_entity_tokens: 0,
+                non_entity_clients: 884,
+                clients: 1437,
+              },
+            },
+            {
+              mount_path: 'path-3-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 664,
+                non_entity_tokens: 0,
+                non_entity_clients: 11,
+                clients: 675,
+              },
+            },
+            {
+              mount_path: 'path-2',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 153,
+                non_entity_tokens: 0,
+                non_entity_clients: 230,
+                clients: 383,
+              },
+            },
+            {
+              mount_path: 'path-4-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 112,
+                non_entity_tokens: 0,
+                non_entity_clients: 4,
+                clients: 116,
+              },
+            },
+          ],
+        },
+        {
+          namespace_id: 'PU6JB',
+          namespace_path: 'test-ns-2/',
+          counts: {
+            distinct_entities: 0,
+            entity_clients: 1067,
+            non_entity_tokens: 0,
+            non_entity_clients: 968,
+            clients: 2035,
+          },
+          mounts: [
+            {
+              mount_path: 'path-3-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 0,
+                non_entity_tokens: 0,
+                non_entity_clients: 865,
+                clients: 865,
+              },
+            },
+            {
+              mount_path: 'path-2',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 659,
+                non_entity_tokens: 0,
+                non_entity_clients: 4,
+                clients: 663,
+              },
+            },
+            {
+              mount_path: 'path-4-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 292,
+                non_entity_tokens: 0,
+                non_entity_clients: 40,
+                clients: 332,
+              },
+            },
+            {
+              mount_path: 'path-1',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 116,
+                non_entity_tokens: 0,
+                non_entity_clients: 59,
+                clients: 175,
+              },
+            },
+          ],
+        },
+        {
+          namespace_id: '3lq5r',
+          namespace_path: 'test-ns-2-with-namespace-length-over-18-characters/',
+          counts: {
+            distinct_entities: 0,
+            entity_clients: 547,
+            non_entity_tokens: 0,
+            non_entity_clients: 1270,
+            clients: 1817,
+          },
+          mounts: [
+            {
+              mount_path: 'path-4-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 36,
+                non_entity_tokens: 0,
+                non_entity_clients: 546,
+                clients: 582,
+              },
+            },
+            {
+              mount_path: 'path-1',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 61,
+                non_entity_tokens: 0,
+                non_entity_clients: 467,
+                clients: 528,
+              },
+            },
+            {
+              mount_path: 'path-2',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 286,
+                non_entity_tokens: 0,
+                non_entity_clients: 216,
+                clients: 502,
+              },
+            },
+            {
+              mount_path: 'path-3-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 164,
+                non_entity_tokens: 0,
+                non_entity_clients: 41,
+                clients: 205,
+              },
+            },
+          ],
+        },
+        {
+          namespace_id: 'root',
+          namespace_path: '',
+          counts: {
+            distinct_entities: 0,
+            entity_clients: 371,
+            non_entity_tokens: 0,
+            non_entity_clients: 897,
+            clients: 1268,
+          },
+          mounts: [
+            {
+              mount_path: 'path-1',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 152,
+                non_entity_tokens: 0,
+                non_entity_clients: 490,
+                clients: 642,
+              },
+            },
+            {
+              mount_path: 'path-2',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 70,
+                non_entity_tokens: 0,
+                non_entity_clients: 160,
+                clients: 230,
+              },
+            },
+            {
+              mount_path: 'path-3-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 84,
+                non_entity_tokens: 0,
+                non_entity_clients: 141,
+                clients: 225,
+              },
+            },
+            {
+              mount_path: 'path-4-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 65,
+                non_entity_tokens: 0,
+                non_entity_clients: 106,
+                clients: 171,
+              },
+            },
+          ],
+        },
+      ],
+    },
+  },
+  {
+    timestamp: formatISO(addMonths(UPGRADE_DATE, 3)),
+    counts: {
+      distinct_entities: 0,
+      entity_clients: 10873,
+      non_entity_tokens: 0,
+      non_entity_clients: 9343,
+      clients: 20216,
+    },
+    namespaces: [
+      {
+        namespace_id: 'root',
+        namespace_path: '',
+        counts: {
+          distinct_entities: 0,
+          entity_clients: 1303,
+          non_entity_tokens: 0,
+          non_entity_clients: 3388,
+          clients: 4691,
+        },
+        mounts: [
+          {
+            mount_path: 'path-2',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 721,
+              non_entity_tokens: 0,
+              non_entity_clients: 980,
+              clients: 1701,
+            },
+          },
+          {
+            mount_path: 'path-1',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 377,
+              non_entity_tokens: 0,
+              non_entity_clients: 838,
+              clients: 1215,
+            },
+          },
+          {
+            mount_path: 'path-4-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 127,
+              non_entity_tokens: 0,
+              non_entity_clients: 877,
+              clients: 1004,
+            },
+          },
+          {
+            mount_path: 'path-3-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 78,
+              non_entity_tokens: 0,
+              non_entity_clients: 693,
+              clients: 771,
+            },
+          },
+        ],
+      },
+      {
+        namespace_id: 'opmJ1',
+        namespace_path: 'test-ns-1/',
+        counts: {
+          distinct_entities: 0,
+          entity_clients: 2404,
+          non_entity_tokens: 0,
+          non_entity_clients: 2085,
+          clients: 4489,
+        },
+        mounts: [
+          {
+            mount_path: 'path-3-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 830,
+              non_entity_tokens: 0,
+              non_entity_clients: 779,
+              clients: 1609,
+            },
+          },
+          {
+            mount_path: 'path-4-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 926,
+              non_entity_tokens: 0,
+              non_entity_clients: 311,
+              clients: 1237,
+            },
+          },
+          {
+            mount_path: 'path-2',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 82,
+              non_entity_tokens: 0,
+              non_entity_clients: 896,
+              clients: 978,
+            },
+          },
+          {
+            mount_path: 'path-1',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 566,
+              non_entity_tokens: 0,
+              non_entity_clients: 99,
+              clients: 665,
+            },
+          },
+        ],
+      },
+      {
+        namespace_id: '3lq5r',
+        namespace_path: 'test-ns-2-with-namespace-length-over-18-characters/',
+        counts: {
+          distinct_entities: 0,
+          entity_clients: 3076,
+          non_entity_tokens: 0,
+          non_entity_clients: 1396,
+          clients: 4472,
+        },
+        mounts: [
+          {
+            mount_path: 'path-4-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 874,
+              non_entity_tokens: 0,
+              non_entity_clients: 601,
+              clients: 1475,
+            },
+          },
+          {
+            mount_path: 'path-2',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 921,
+              non_entity_tokens: 0,
+              non_entity_clients: 428,
+              clients: 1349,
+            },
+          },
+          {
+            mount_path: 'path-3-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 885,
+              non_entity_tokens: 0,
+              non_entity_clients: 204,
+              clients: 1089,
+            },
+          },
+          {
+            mount_path: 'path-1',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 396,
+              non_entity_tokens: 0,
+              non_entity_clients: 163,
+              clients: 559,
+            },
+          },
+        ],
+      },
+      {
+        namespace_id: 'sJRLj',
+        namespace_path: 'test-ns-1-with-namespace-length-over-18-characters/',
+        counts: {
+          distinct_entities: 0,
+          entity_clients: 2298,
+          non_entity_tokens: 0,
+          non_entity_clients: 1632,
+          clients: 3930,
+        },
+        mounts: [
+          {
+            mount_path: 'path-3-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 858,
+              non_entity_tokens: 0,
+              non_entity_clients: 663,
+              clients: 1521,
+            },
+          },
+          {
+            mount_path: 'path-4-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 669,
+              non_entity_tokens: 0,
+              non_entity_clients: 272,
+              clients: 941,
+            },
+          },
+          {
+            mount_path: 'path-1',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 183,
+              non_entity_tokens: 0,
+              non_entity_clients: 567,
+              clients: 750,
+            },
+          },
+          {
+            mount_path: 'path-2',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 588,
+              non_entity_tokens: 0,
+              non_entity_clients: 130,
+              clients: 718,
+            },
+          },
+        ],
+      },
+      {
+        namespace_id: 'PU6JB',
+        namespace_path: 'test-ns-2/',
+        counts: {
+          distinct_entities: 0,
+          entity_clients: 1792,
+          non_entity_tokens: 0,
+          non_entity_clients: 842,
+          clients: 2634,
+        },
+        mounts: [
+          {
+            mount_path: 'path-2',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 611,
+              non_entity_tokens: 0,
+              non_entity_clients: 215,
+              clients: 826,
+            },
+          },
+          {
+            mount_path: 'path-1',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 365,
+              non_entity_tokens: 0,
+              non_entity_clients: 368,
+              clients: 733,
+            },
+          },
+          {
+            mount_path: 'path-4-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 469,
+              non_entity_tokens: 0,
+              non_entity_clients: 244,
+              clients: 713,
+            },
+          },
+          {
+            mount_path: 'path-3-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 347,
+              non_entity_tokens: 0,
+              non_entity_clients: 15,
+              clients: 362,
+            },
+          },
+        ],
+      },
+    ],
+    new_clients: {
+      counts: {
+        distinct_entities: 0,
+        entity_clients: 5855,
+        non_entity_tokens: 0,
+        non_entity_clients: 4729,
+        clients: 10584,
+      },
+      namespaces: [
+        {
+          namespace_id: 'opmJ1',
+          namespace_path: 'test-ns-1/',
+          counts: {
+            distinct_entities: 0,
+            entity_clients: 1409,
+            non_entity_tokens: 0,
+            non_entity_clients: 1429,
+            clients: 2838,
+          },
+          mounts: [
+            {
+              mount_path: 'path-3-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 532,
+                non_entity_tokens: 0,
+                non_entity_clients: 563,
+                clients: 1095,
+              },
+            },
+            {
+              mount_path: 'path-4-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 655,
+                non_entity_tokens: 0,
+                non_entity_clients: 179,
+                clients: 834,
+              },
+            },
+            {
+              mount_path: 'path-2',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 34,
+                non_entity_tokens: 0,
+                non_entity_clients: 658,
+                clients: 692,
+              },
+            },
+            {
+              mount_path: 'path-1',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 188,
+                non_entity_tokens: 0,
+                non_entity_clients: 29,
+                clients: 217,
+              },
+            },
+          ],
+        },
+        {
+          namespace_id: '3lq5r',
+          namespace_path: 'test-ns-2-with-namespace-length-over-18-characters/',
+          counts: {
+            distinct_entities: 0,
+            entity_clients: 1869,
+            non_entity_tokens: 0,
+            non_entity_clients: 592,
+            clients: 2461,
+          },
+          mounts: [
+            {
+              mount_path: 'path-4-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 745,
+                non_entity_tokens: 0,
+                non_entity_clients: 239,
+                clients: 984,
+              },
+            },
+            {
+              mount_path: 'path-2',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 539,
+                non_entity_tokens: 0,
+                non_entity_clients: 132,
+                clients: 671,
+              },
+            },
+            {
+              mount_path: 'path-1',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 294,
+                non_entity_tokens: 0,
+                non_entity_clients: 110,
+                clients: 404,
+              },
+            },
+            {
+              mount_path: 'path-3-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 291,
+                non_entity_tokens: 0,
+                non_entity_clients: 111,
+                clients: 402,
+              },
+            },
+          ],
+        },
+        {
+          namespace_id: 'root',
+          namespace_path: '',
+          counts: {
+            distinct_entities: 0,
+            entity_clients: 838,
+            non_entity_tokens: 0,
+            non_entity_clients: 1486,
+            clients: 2324,
+          },
+          mounts: [
+            {
+              mount_path: 'path-2',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 629,
+                non_entity_tokens: 0,
+                non_entity_clients: 742,
+                clients: 1371,
+              },
+            },
+            {
+              mount_path: 'path-1',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 166,
+                non_entity_tokens: 0,
+                non_entity_clients: 410,
+                clients: 576,
+              },
+            },
+            {
+              mount_path: 'path-4-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 12,
+                non_entity_tokens: 0,
+                non_entity_clients: 279,
+                clients: 291,
+              },
+            },
+            {
+              mount_path: 'path-3-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 31,
+                non_entity_tokens: 0,
+                non_entity_clients: 55,
+                clients: 86,
+              },
+            },
+          ],
+        },
+        {
+          namespace_id: 'sJRLj',
+          namespace_path: 'test-ns-1-with-namespace-length-over-18-characters/',
+          counts: {
+            distinct_entities: 0,
+            entity_clients: 996,
+            non_entity_tokens: 0,
+            non_entity_clients: 805,
+            clients: 1801,
+          },
+          mounts: [
+            {
+              mount_path: 'path-3-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 484,
+                non_entity_tokens: 0,
+                non_entity_clients: 145,
+                clients: 629,
+              },
+            },
+            {
+              mount_path: 'path-4-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 396,
+                non_entity_tokens: 0,
+                non_entity_clients: 156,
+                clients: 552,
+              },
+            },
+            {
+              mount_path: 'path-1',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 18,
+                non_entity_tokens: 0,
+                non_entity_clients: 401,
+                clients: 419,
+              },
+            },
+            {
+              mount_path: 'path-2',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 98,
+                non_entity_tokens: 0,
+                non_entity_clients: 103,
+                clients: 201,
+              },
+            },
+          ],
+        },
+        {
+          namespace_id: 'PU6JB',
+          namespace_path: 'test-ns-2/',
+          counts: {
+            distinct_entities: 0,
+            entity_clients: 743,
+            non_entity_tokens: 0,
+            non_entity_clients: 417,
+            clients: 1160,
+          },
+          mounts: [
+            {
+              mount_path: 'path-2',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 188,
+                non_entity_tokens: 0,
+                non_entity_clients: 168,
+                clients: 356,
+              },
+            },
+            {
+              mount_path: 'path-4-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 196,
+                non_entity_tokens: 0,
+                non_entity_clients: 115,
+                clients: 311,
+              },
+            },
+            {
+              mount_path: 'path-3-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 291,
+                non_entity_tokens: 0,
+                non_entity_clients: 3,
+                clients: 294,
+              },
+            },
+            {
+              mount_path: 'path-1',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 68,
+                non_entity_tokens: 0,
+                non_entity_clients: 131,
+                clients: 199,
+              },
+            },
+          ],
+        },
+      ],
+    },
+  },
+  {
+    timestamp: formatISO(addMonths(UPGRADE_DATE, 4)),
+    counts: {
+      distinct_entities: 0,
+      entity_clients: 10342,
+      non_entity_tokens: 0,
+      non_entity_clients: 13170,
+      clients: 23512,
+    },
+    namespaces: [
+      {
+        namespace_id: 'PU6JB',
+        namespace_path: 'test-ns-2/',
+        counts: {
+          distinct_entities: 0,
+          entity_clients: 2816,
+          non_entity_tokens: 0,
+          non_entity_clients: 3098,
+          clients: 5914,
+        },
+        mounts: [
+          {
+            mount_path: 'path-1',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 726,
+              non_entity_tokens: 0,
+              non_entity_clients: 995,
+              clients: 1721,
+            },
+          },
+          {
+            mount_path: 'path-3-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 737,
+              non_entity_tokens: 0,
+              non_entity_clients: 850,
+              clients: 1587,
+            },
+          },
+          {
+            mount_path: 'path-4-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 754,
+              non_entity_tokens: 0,
+              non_entity_clients: 617,
+              clients: 1371,
+            },
+          },
+          {
+            mount_path: 'path-2',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 599,
+              non_entity_tokens: 0,
+              non_entity_clients: 636,
+              clients: 1235,
+            },
+          },
+        ],
+      },
+      {
+        namespace_id: 'sJRLj',
+        namespace_path: 'test-ns-1-with-namespace-length-over-18-characters/',
+        counts: {
+          distinct_entities: 0,
+          entity_clients: 2253,
+          non_entity_tokens: 0,
+          non_entity_clients: 2404,
+          clients: 4657,
+        },
+        mounts: [
+          {
+            mount_path: 'path-3-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 775,
+              non_entity_tokens: 0,
+              non_entity_clients: 689,
+              clients: 1464,
+            },
+          },
+          {
+            mount_path: 'path-1',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 699,
+              non_entity_tokens: 0,
+              non_entity_clients: 652,
+              clients: 1351,
+            },
+          },
+          {
+            mount_path: 'path-2',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 566,
+              non_entity_tokens: 0,
+              non_entity_clients: 487,
+              clients: 1053,
+            },
+          },
+          {
+            mount_path: 'path-4-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 213,
+              non_entity_tokens: 0,
+              non_entity_clients: 576,
+              clients: 789,
+            },
+          },
+        ],
+      },
+      {
+        namespace_id: 'opmJ1',
+        namespace_path: 'test-ns-1/',
+        counts: {
+          distinct_entities: 0,
+          entity_clients: 1725,
+          non_entity_tokens: 0,
+          non_entity_clients: 2927,
+          clients: 4652,
+        },
+        mounts: [
+          {
+            mount_path: 'path-2',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 811,
+              non_entity_tokens: 0,
+              non_entity_clients: 417,
+              clients: 1228,
+            },
+          },
+          {
+            mount_path: 'path-4-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 294,
+              non_entity_tokens: 0,
+              non_entity_clients: 900,
+              clients: 1194,
+            },
+          },
+          {
+            mount_path: 'path-3-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 503,
+              non_entity_tokens: 0,
+              non_entity_clients: 620,
+              clients: 1123,
+            },
+          },
+          {
+            mount_path: 'path-1',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 117,
+              non_entity_tokens: 0,
+              non_entity_clients: 990,
+              clients: 1107,
+            },
+          },
+        ],
+      },
+      {
+        namespace_id: 'root',
+        namespace_path: '',
+        counts: {
+          distinct_entities: 0,
+          entity_clients: 1678,
+          non_entity_tokens: 0,
+          non_entity_clients: 2775,
+          clients: 4453,
+        },
+        mounts: [
+          {
+            mount_path: 'path-1',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 972,
+              non_entity_tokens: 0,
+              non_entity_clients: 608,
+              clients: 1580,
+            },
+          },
+          {
+            mount_path: 'path-3-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 172,
+              non_entity_tokens: 0,
+              non_entity_clients: 957,
+              clients: 1129,
+            },
+          },
+          {
+            mount_path: 'path-4-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 220,
+              non_entity_tokens: 0,
+              non_entity_clients: 756,
+              clients: 976,
+            },
+          },
+          {
+            mount_path: 'path-2',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 314,
+              non_entity_tokens: 0,
+              non_entity_clients: 454,
+              clients: 768,
+            },
+          },
+        ],
+      },
+      {
+        namespace_id: '3lq5r',
+        namespace_path: 'test-ns-2-with-namespace-length-over-18-characters/',
+        counts: {
+          distinct_entities: 0,
+          entity_clients: 1870,
+          non_entity_tokens: 0,
+          non_entity_clients: 1966,
+          clients: 3836,
+        },
+        mounts: [
+          {
+            mount_path: 'path-4-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 839,
+              non_entity_tokens: 0,
+              non_entity_clients: 762,
+              clients: 1601,
+            },
+          },
+          {
+            mount_path: 'path-3-with-over-18-characters',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 447,
+              non_entity_tokens: 0,
+              non_entity_clients: 583,
+              clients: 1030,
+            },
+          },
+          {
+            mount_path: 'path-2',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 382,
+              non_entity_tokens: 0,
+              non_entity_clients: 375,
+              clients: 757,
+            },
+          },
+          {
+            mount_path: 'path-1',
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 202,
+              non_entity_tokens: 0,
+              non_entity_clients: 246,
+              clients: 448,
+            },
+          },
+        ],
+      },
+    ],
+    new_clients: {
+      counts: {
+        distinct_entities: 0,
+        entity_clients: 5959,
+        non_entity_tokens: 0,
+        non_entity_clients: 6985,
+        clients: 12944,
+      },
+      namespaces: [
+        {
+          namespace_id: 'opmJ1',
+          namespace_path: 'test-ns-1/',
+          counts: {
+            distinct_entities: 0,
+            entity_clients: 873,
+            non_entity_tokens: 0,
+            non_entity_clients: 2355,
+            clients: 3228,
+          },
+          mounts: [
+            {
+              mount_path: 'path-4-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 196,
+                non_entity_tokens: 0,
+                non_entity_clients: 811,
+                clients: 1007,
+              },
+            },
+            {
+              mount_path: 'path-1',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 38,
+                non_entity_tokens: 0,
+                non_entity_clients: 931,
+                clients: 969,
+              },
+            },
+            {
+              mount_path: 'path-3-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 148,
+                non_entity_tokens: 0,
+                non_entity_clients: 608,
+                clients: 756,
+              },
+            },
+            {
+              mount_path: 'path-2',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 491,
+                non_entity_tokens: 0,
+                non_entity_clients: 5,
+                clients: 496,
+              },
+            },
+          ],
+        },
+        {
+          namespace_id: 'sJRLj',
+          namespace_path: 'test-ns-1-with-namespace-length-over-18-characters/',
+          counts: {
+            distinct_entities: 0,
+            entity_clients: 1352,
+            non_entity_tokens: 0,
+            non_entity_clients: 1506,
+            clients: 2858,
+          },
+          mounts: [
+            {
+              mount_path: 'path-1',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 245,
+                non_entity_tokens: 0,
+                non_entity_clients: 560,
+                clients: 805,
+              },
+            },
+            {
+              mount_path: 'path-3-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 465,
+                non_entity_tokens: 0,
+                non_entity_clients: 332,
+                clients: 797,
+              },
+            },
+            {
+              mount_path: 'path-2',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 529,
+                non_entity_tokens: 0,
+                non_entity_clients: 117,
+                clients: 646,
+              },
+            },
+            {
+              mount_path: 'path-4-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 113,
+                non_entity_tokens: 0,
+                non_entity_clients: 497,
+                clients: 610,
+              },
+            },
+          ],
+        },
+        {
+          namespace_id: '3lq5r',
+          namespace_path: 'test-ns-2-with-namespace-length-over-18-characters/',
+          counts: {
+            distinct_entities: 0,
+            entity_clients: 1355,
+            non_entity_tokens: 0,
+            non_entity_clients: 1353,
+            clients: 2708,
+          },
+          mounts: [
+            {
+              mount_path: 'path-4-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 557,
+                non_entity_tokens: 0,
+                non_entity_clients: 538,
+                clients: 1095,
+              },
+            },
+            {
+              mount_path: 'path-3-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 410,
+                non_entity_tokens: 0,
+                non_entity_clients: 496,
+                clients: 906,
+              },
+            },
+            {
+              mount_path: 'path-1',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 146,
+                non_entity_tokens: 0,
+                non_entity_clients: 237,
+                clients: 383,
+              },
+            },
+            {
+              mount_path: 'path-2',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 242,
+                non_entity_tokens: 0,
+                non_entity_clients: 82,
+                clients: 324,
+              },
+            },
+          ],
+        },
+        {
+          namespace_id: 'PU6JB',
+          namespace_path: 'test-ns-2/',
+          counts: {
+            distinct_entities: 0,
+            entity_clients: 1514,
+            non_entity_tokens: 0,
+            non_entity_clients: 578,
+            clients: 2092,
+          },
+          mounts: [
+            {
+              mount_path: 'path-4-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 602,
+                non_entity_tokens: 0,
+                non_entity_clients: 147,
+                clients: 749,
+              },
+            },
+            {
+              mount_path: 'path-3-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 259,
+                non_entity_tokens: 0,
+                non_entity_clients: 344,
+                clients: 603,
+              },
+            },
+            {
+              mount_path: 'path-2',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 349,
+                non_entity_tokens: 0,
+                non_entity_clients: 43,
+                clients: 392,
+              },
+            },
+            {
+              mount_path: 'path-1',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 304,
+                non_entity_tokens: 0,
+                non_entity_clients: 44,
+                clients: 348,
+              },
+            },
+          ],
+        },
+        {
+          namespace_id: 'root',
+          namespace_path: '',
+          counts: {
+            distinct_entities: 0,
+            entity_clients: 865,
+            non_entity_tokens: 0,
+            non_entity_clients: 1193,
+            clients: 2058,
+          },
+          mounts: [
+            {
+              mount_path: 'path-4-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 10,
+                non_entity_tokens: 0,
+                non_entity_clients: 722,
+                clients: 732,
+              },
+            },
+            {
+              mount_path: 'path-1',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 643,
+                non_entity_tokens: 0,
+                non_entity_clients: 4,
+                clients: 647,
+              },
+            },
+            {
+              mount_path: 'path-2',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 93,
+                non_entity_tokens: 0,
+                non_entity_clients: 379,
+                clients: 472,
+              },
+            },
+            {
+              mount_path: 'path-3-with-over-18-characters',
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 119,
+                non_entity_tokens: 0,
+                non_entity_clients: 88,
+                clients: 207,
+              },
+            },
+          ],
+        },
+      ],
+    },
+  },
+];
 
-function generateMonths(startDate, endDate, namespaces) {
-  const startDateObject = startOfMonth(parseAPITimestamp(startDate));
-  const endDateObject = startOfMonth(parseAPITimestamp(endDate));
-  const numberOfMonths = differenceInCalendarMonths(endDateObject, startDateObject) + 1;
-  const months = [];
-  if (isBefore(startDateObject, UPGRADE_DATE) && isBefore(endDateObject, UPGRADE_DATE)) {
-    // months block is empty if dates do not span an upgrade
-    return [];
-  }
+function generateNullMonths(startDate, endDate) {
+  let numberOfMonths = differenceInCalendarMonths(endDate, startDate);
+  let months = [];
   for (let i = 0; i < numberOfMonths; i++) {
-    const month = addMonths(startDateObject, i);
-    const hasNoData = isBefore(month, UPGRADE_DATE);
-    if (hasNoData) {
-      months.push({
-        timestamp: formatRFC3339(month),
-        counts: null,
-        namespaces: null,
-        new_clients: null,
-      });
-      continue;
-    }
-
-    const monthNs = namespaces.map((ns, idx) => generateNamespaceBlock(idx, true, ns));
-    const newClients = namespaces.map((ns, idx) => generateNamespaceBlock(idx, true, ns));
     months.push({
-      timestamp: formatRFC3339(month),
-      counts: getTotalCounts(monthNs),
-      namespaces: monthNs.sort((a, b) => b.counts.clients - a.counts.clients),
-      new_clients: {
-        counts: getTotalCounts(newClients),
-        namespaces: newClients.sort((a, b) => b.counts.clients - a.counts.clients),
-      },
+      timestamp: formatRFC3339(startOfMonth(addMonths(startDate, i))),
+      counts: null,
+      namespace: null,
+      new_clients: null,
     });
+    continue;
   }
   return months;
 }
 
-function generateActivityResponse(namespaces, startDate, endDate) {
-  return {
-    start_time: isAfter(new Date(startDate), COUNTS_START) ? startDate : formatRFC3339(COUNTS_START),
-    end_time: endDate,
-    by_namespace: namespaces.sort((a, b) => b.counts.clients - a.counts.clients),
-    months: generateMonths(startDate, endDate, namespaces),
-    total: getTotalCounts(namespaces),
-  };
-}
+const handleMockQuery = (queryStartTimestamp, queryEndTimestamp, monthlyData) => {
+  const queryStartDate = startOfMonth(parseAPITimestamp(queryStartTimestamp));
+  const queryEndDate = parseAPITimestamp(queryEndTimestamp);
+  // monthlyData is oldest to newest
+  const dataEarliestMonth = parseAPITimestamp(monthlyData[0].timestamp);
+  const dataLatestMonth = parseAPITimestamp(monthlyData[monthlyData.length - 1].timestamp);
+  let transformedMonthlyArray = [...monthlyData];
+  // If query end is before last month in array, return only through end query
+  if (isBefore(queryEndDate, dataLatestMonth)) {
+    let indexQueryStart = monthlyData.findIndex((e) =>
+      isSameMonth(queryStartDate, parseAPITimestamp(e.timestamp))
+    );
+    let indexQueryEnd = monthlyData.findIndex((e) =>
+      isSameMonth(queryEndDate, parseAPITimestamp(e.timestamp))
+    );
+    return transformedMonthlyArray.slice(indexQueryStart, indexQueryEnd + 1);
+  }
+  // If query wants months previous to the data we have, generate months without data prior
+  if (isBefore(queryStartDate, dataEarliestMonth)) {
+    return [...generateNullMonths(queryStartDate, dataEarliestMonth), ...transformedMonthlyArray];
+  }
+  // If query is after earliest month in array, return latest to month that matches query
+  if (isAfter(queryStartDate, dataEarliestMonth)) {
+    let index = monthlyData.findIndex((e) => isSameMonth(queryStartDate, parseAPITimestamp(e.timestamp)));
+    return transformedMonthlyArray.slice(index);
+  }
+  return transformedMonthlyArray;
+};
 
 export default function (server) {
   server.get('sys/license/status', function () {
@@ -137,7 +2843,7 @@ export default function (server) {
         autoloaded: {
           license_id: 'my-license-id',
           start_time: formatRFC3339(LICENSE_START),
-          expiration_time: formatRFC3339(endOfMonth(addMonths(CURRENT_DATE, 6))),
+          expiration_time: formatRFC3339(LICENSE_END),
         },
       },
     };
@@ -156,17 +2862,520 @@ export default function (server) {
   });
 
   server.get('/sys/internal/counters/activity', (schema, req) => {
-    let { start_time, end_time } = req.queryParams;
-    // backend returns a timestamp if given unix time, so first convert to timestamp string here
-    if (!start_time.includes('T')) start_time = fromUnixTime(start_time).toISOString();
-    if (!end_time.includes('T')) end_time = fromUnixTime(end_time).toISOString();
-    const namespaces = Array.from(Array(12)).map((v, idx) => generateNamespaceBlock(idx));
+    const { start_time, end_time } = req.queryParams;
+
     return {
-      request_id: 'some-activity-id',
+      request_id: '25f55fbb-f253-9c46-c6f0-3cdd3ada91ab',
       lease_id: '',
       renewable: false,
       lease_duration: 0,
-      data: generateActivityResponse(namespaces, start_time, end_time),
+      data: {
+        by_namespace: [
+          {
+            namespace_id: 'PU6JB',
+            namespace_path: 'test-ns-2/',
+            counts: {
+              distinct_entities: 23326,
+              entity_clients: 23326,
+              non_entity_tokens: 17826,
+              non_entity_clients: 17826,
+              clients: 41152,
+            },
+            mounts: [
+              {
+                mount_path: 'path-2',
+                counts: {
+                  distinct_entities: 6508,
+                  entity_clients: 6508,
+                  non_entity_tokens: 3634,
+                  non_entity_clients: 3634,
+                  clients: 10142,
+                },
+              },
+              {
+                mount_path: 'path-4-with-over-18-characters',
+                counts: {
+                  distinct_entities: 5118,
+                  entity_clients: 5118,
+                  non_entity_tokens: 4942,
+                  non_entity_clients: 4942,
+                  clients: 10060,
+                },
+              },
+              {
+                mount_path: 'path-3-with-over-18-characters',
+                counts: {
+                  distinct_entities: 5931,
+                  entity_clients: 5931,
+                  non_entity_tokens: 4057,
+                  non_entity_clients: 4057,
+                  clients: 9988,
+                },
+              },
+              {
+                mount_path: 'path-1',
+                counts: {
+                  distinct_entities: 4962,
+                  entity_clients: 4962,
+                  non_entity_tokens: 3739,
+                  non_entity_clients: 3739,
+                  clients: 8701,
+                },
+              },
+            ],
+          },
+          {
+            namespace_id: '3lq5r',
+            namespace_path: 'test-ns-2-with-namespace-length-over-18-characters/',
+            counts: {
+              distinct_entities: 19842,
+              entity_clients: 19842,
+              non_entity_tokens: 20799,
+              non_entity_clients: 20799,
+              clients: 40641,
+            },
+            mounts: [
+              {
+                mount_path: 'path-4-with-over-18-characters',
+                counts: {
+                  distinct_entities: 4695,
+                  entity_clients: 4695,
+                  non_entity_tokens: 6620,
+                  non_entity_clients: 6620,
+                  clients: 11315,
+                },
+              },
+              {
+                mount_path: 'path-3-with-over-18-characters',
+                counts: {
+                  distinct_entities: 5762,
+                  entity_clients: 5762,
+                  non_entity_tokens: 4112,
+                  non_entity_clients: 4112,
+                  clients: 9874,
+                },
+              },
+              {
+                mount_path: 'path-2',
+                counts: {
+                  distinct_entities: 5303,
+                  entity_clients: 5303,
+                  non_entity_tokens: 4538,
+                  non_entity_clients: 4538,
+                  clients: 9841,
+                },
+              },
+              {
+                mount_path: 'path-1',
+                counts: {
+                  distinct_entities: 3501,
+                  entity_clients: 3501,
+                  non_entity_tokens: 4974,
+                  non_entity_clients: 4974,
+                  clients: 8475,
+                },
+              },
+            ],
+          },
+          {
+            namespace_id: 'sJRLj',
+            namespace_path: 'test-ns-1-with-namespace-length-over-18-characters/',
+            counts: {
+              distinct_entities: 20389,
+              entity_clients: 20389,
+              non_entity_tokens: 19445,
+              non_entity_clients: 19445,
+              clients: 39834,
+            },
+            mounts: [
+              {
+                mount_path: 'path-3-with-over-18-characters',
+                counts: {
+                  distinct_entities: 5356,
+                  entity_clients: 5356,
+                  non_entity_tokens: 5075,
+                  non_entity_clients: 5075,
+                  clients: 10431,
+                },
+              },
+              {
+                mount_path: 'path-4-with-over-18-characters',
+                counts: {
+                  distinct_entities: 4639,
+                  entity_clients: 4639,
+                  non_entity_tokens: 5242,
+                  non_entity_clients: 5242,
+                  clients: 9881,
+                },
+              },
+              {
+                mount_path: 'path-2',
+                counts: {
+                  distinct_entities: 4926,
+                  entity_clients: 4926,
+                  non_entity_tokens: 4163,
+                  non_entity_clients: 4163,
+                  clients: 9089,
+                },
+              },
+              {
+                mount_path: 'path-1',
+                counts: {
+                  distinct_entities: 4437,
+                  entity_clients: 4437,
+                  non_entity_tokens: 4201,
+                  non_entity_clients: 4201,
+                  clients: 8638,
+                },
+              },
+            ],
+          },
+          {
+            namespace_id: 'opmJ1',
+            namespace_path: 'test-ns-1/',
+            counts: {
+              distinct_entities: 19316,
+              entity_clients: 19316,
+              non_entity_tokens: 18450,
+              non_entity_clients: 18450,
+              clients: 37766,
+            },
+            mounts: [
+              {
+                mount_path: 'path-3-with-over-18-characters',
+                counts: {
+                  distinct_entities: 4952,
+                  entity_clients: 4952,
+                  non_entity_tokens: 5080,
+                  non_entity_clients: 5080,
+                  clients: 10032,
+                },
+              },
+              {
+                mount_path: 'path-4-with-over-18-characters',
+                counts: {
+                  distinct_entities: 5198,
+                  entity_clients: 5198,
+                  non_entity_tokens: 3825,
+                  non_entity_clients: 3825,
+                  clients: 9023,
+                },
+              },
+              {
+                mount_path: 'path-1',
+                counts: {
+                  distinct_entities: 3827,
+                  entity_clients: 3827,
+                  non_entity_tokens: 5156,
+                  non_entity_clients: 5156,
+                  clients: 8983,
+                },
+              },
+              {
+                mount_path: 'path-2',
+                counts: {
+                  distinct_entities: 3981,
+                  entity_clients: 3981,
+                  non_entity_tokens: 3661,
+                  non_entity_clients: 3661,
+                  clients: 7642,
+                },
+              },
+            ],
+          },
+          {
+            namespace_id: 'root',
+            namespace_path: '',
+            counts: {
+              distinct_entities: 15416,
+              entity_clients: 15416,
+              non_entity_tokens: 19892,
+              non_entity_clients: 19892,
+              clients: 35308,
+            },
+            mounts: [
+              {
+                mount_path: 'path-2',
+                counts: {
+                  distinct_entities: 3936,
+                  entity_clients: 3936,
+                  non_entity_tokens: 5428,
+                  non_entity_clients: 5428,
+                  clients: 9364,
+                },
+              },
+              {
+                mount_path: 'path-1',
+                counts: {
+                  distinct_entities: 4021,
+                  entity_clients: 4021,
+                  non_entity_tokens: 4530,
+                  non_entity_clients: 4530,
+                  clients: 8551,
+                },
+              },
+              {
+                mount_path: 'path-4-with-over-18-characters',
+                counts: {
+                  distinct_entities: 2934,
+                  entity_clients: 2934,
+                  non_entity_tokens: 5357,
+                  non_entity_clients: 5357,
+                  clients: 8291,
+                },
+              },
+              {
+                mount_path: 'path-3-with-over-18-characters',
+                counts: {
+                  distinct_entities: 3938,
+                  entity_clients: 3938,
+                  non_entity_tokens: 3932,
+                  non_entity_clients: 3932,
+                  clients: 7870,
+                },
+              },
+            ],
+          },
+        ],
+        end_time: end_time || formatISO(endOfMonth(sub(NEW_DATE, { months: 1 }))),
+        months: handleMockQuery(start_time, end_time, MOCK_MONTHLY_DATA),
+        start_time: isBefore(new Date(start_time), COUNTS_START) ? formatRFC3339(COUNTS_START) : start_time,
+        total: {
+          distinct_entities: 98289,
+          entity_clients: 98289,
+          non_entity_tokens: 96412,
+          non_entity_clients: 96412,
+          clients: 194701,
+        },
+      },
+      wrap_info: null,
+      warnings: null,
+      auth: null,
+    };
+  });
+
+  server.get('/sys/internal/counters/activity/monthly', function () {
+    const timestamp = NEW_DATE;
+    return {
+      request_id: '26be5ab9-dcac-9237-ec12-269a8ca64742',
+      lease_id: '',
+      renewable: false,
+      lease_duration: 0,
+      data: {
+        by_namespace: [
+          {
+            namespace_id: '0lHBL',
+            namespace_path: 'ns1/',
+            counts: {
+              distinct_entities: 85,
+              non_entity_tokens: 15,
+              clients: 100,
+            },
+            mounts: [
+              {
+                mount_path: 'auth/method/uMGBU',
+                counts: {
+                  clients: 35,
+                  entity_clients: 20,
+                  non_entity_clients: 15,
+                },
+              },
+              {
+                mount_path: 'auth/method/woiej',
+                counts: {
+                  clients: 35,
+                  entity_clients: 20,
+                  non_entity_clients: 15,
+                },
+              },
+            ],
+          },
+          {
+            namespace_id: 'RxD81',
+            namespace_path: 'ns2/',
+            counts: {
+              distinct_entities: 35,
+              non_entity_tokens: 20,
+              clients: 55,
+            },
+            mounts: [
+              {
+                mount_path: 'auth/method/ABCD1',
+                counts: {
+                  clients: 35,
+                  entity_clients: 20,
+                  non_entity_clients: 15,
+                },
+              },
+              {
+                mount_path: 'auth/method/ABCD2',
+                counts: {
+                  clients: 35,
+                  entity_clients: 20,
+                  non_entity_clients: 15,
+                },
+              },
+            ],
+          },
+          {
+            namespace_id: 'root',
+            namespace_path: '',
+            counts: {
+              distinct_entities: 12,
+              non_entity_tokens: 8,
+              clients: 20,
+            },
+            mounts: [
+              {
+                mount_path: 'auth/method/XYZZ2',
+                counts: {
+                  clients: 35,
+                  entity_clients: 20,
+                  non_entity_clients: 15,
+                },
+              },
+              {
+                mount_path: 'auth/method/XYZZ1',
+                counts: {
+                  clients: 35,
+                  entity_clients: 20,
+                  non_entity_clients: 15,
+                },
+              },
+              {
+                mount_path: 'auth_userpass_3158c012',
+                counts: {
+                  clients: 2,
+                  entity_clients: 2,
+                  non_entity_clients: 0,
+                },
+              },
+            ],
+          },
+        ],
+        months: [
+          {
+            timestamp: startOfMonth(timestamp).toISOString(),
+            counts: {
+              distinct_entities: 0,
+              entity_clients: 4,
+              non_entity_tokens: 0,
+              non_entity_clients: 0,
+              clients: 4,
+            },
+            namespaces: [
+              {
+                namespace_id: 'lHmap',
+                namespace_path: 'education/',
+                counts: {
+                  distinct_entities: 0,
+                  entity_clients: 2,
+                  non_entity_tokens: 0,
+                  non_entity_clients: 0,
+                  clients: 2,
+                },
+                mounts: [
+                  {
+                    mount_path: 'auth_userpass_a36c8125',
+                    counts: {
+                      distinct_entities: 0,
+                      entity_clients: 2,
+                      non_entity_tokens: 0,
+                      non_entity_clients: 0,
+                      clients: 2,
+                    },
+                  },
+                ],
+              },
+              {
+                namespace_id: 'root',
+                namespace_path: '',
+                counts: {
+                  distinct_entities: 0,
+                  entity_clients: 2,
+                  non_entity_tokens: 0,
+                  non_entity_clients: 0,
+                  clients: 2,
+                },
+                mounts: [
+                  {
+                    mount_path: 'auth_userpass_3158c012',
+                    counts: {
+                      distinct_entities: 0,
+                      entity_clients: 2,
+                      non_entity_tokens: 0,
+                      non_entity_clients: 0,
+                      clients: 2,
+                    },
+                  },
+                ],
+              },
+            ],
+            new_clients: {
+              counts: {
+                distinct_entities: 0,
+                entity_clients: 4,
+                non_entity_tokens: 0,
+                non_entity_clients: 0,
+                clients: 4,
+              },
+              namespaces: [
+                {
+                  namespace_id: 'root',
+                  namespace_path: '',
+                  counts: {
+                    distinct_entities: 0,
+                    entity_clients: 2,
+                    non_entity_tokens: 0,
+                    non_entity_clients: 0,
+                    clients: 2,
+                  },
+                  mounts: [
+                    {
+                      mount_path: 'auth_userpass_3158c012',
+                      counts: {
+                        distinct_entities: 0,
+                        entity_clients: 2,
+                        non_entity_tokens: 0,
+                        non_entity_clients: 0,
+                        clients: 2,
+                      },
+                    },
+                  ],
+                },
+                {
+                  namespace_id: 'lHmap',
+                  namespace_path: 'education/',
+                  counts: {
+                    distinct_entities: 0,
+                    entity_clients: 2,
+                    non_entity_tokens: 0,
+                    non_entity_clients: 0,
+                    clients: 2,
+                  },
+                  mounts: [
+                    {
+                      mount_path: 'auth_userpass_a36c8125',
+                      counts: {
+                        distinct_entities: 0,
+                        entity_clients: 2,
+                        non_entity_tokens: 0,
+                        non_entity_clients: 0,
+                        clients: 2,
+                      },
+                    },
+                  ],
+                },
+              ],
+            },
+          },
+        ],
+        distinct_entities: 132,
+        entity_clients: 132,
+        non_entity_tokens: 43,
+        non_entity_clients: 43,
+        clients: 175,
+      },
       wrap_info: null,
       warnings: null,
       auth: null,
diff --git a/ui/mirage/handlers/db.js b/ui/mirage/handlers/db.js
index 920bb3db46334..ca4ee390a56a5 100644
--- a/ui/mirage/handlers/db.js
+++ b/ui/mirage/handlers/db.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export default function (server) {
   server.get('/database/static-roles', function () {
     return {
diff --git a/ui/mirage/handlers/hcp-link.js b/ui/mirage/handlers/hcp-link.js
index ad2495583e1da..3d4953c1666b2 100644
--- a/ui/mirage/handlers/hcp-link.js
+++ b/ui/mirage/handlers/hcp-link.js
@@ -1,10 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import modifyPassthroughResponse from '../helpers/modify-passthrough-response';
-
 export const statuses = [
   'connected',
   'disconnected since 2022-09-21T11:25:02.196835-07:00; error: unable to establish a connection with HCP',
@@ -15,6 +8,22 @@ export const statuses = [
 let index = null;
 
 export default function (server) {
+  const handleResponse = (req, props) => {
+    const xhr = req.passthrough();
+    xhr.onreadystatechange = () => {
+      if (xhr.readyState === 4 && xhr.status < 300) {
+        // XMLHttpRequest response prop only has a getter -- redefine as writable and set value
+        Object.defineProperty(xhr, 'response', {
+          writable: true,
+          value: JSON.stringify({
+            ...JSON.parse(xhr.responseText),
+            ...props,
+          }),
+        });
+      }
+    };
+  };
+
   server.get('sys/seal-status', (schema, req) => {
     // return next status from statuses array
     if (index === null || index === statuses.length - 1) {
@@ -22,8 +31,8 @@ export default function (server) {
     } else {
       index++;
     }
-    return modifyPassthroughResponse(req, { hcp_link_status: statuses[index] });
+    return handleResponse(req, { hcp_link_status: statuses[index] });
   });
   // enterprise only feature initially
-  server.get('sys/health', (schema, req) => modifyPassthroughResponse(req, { version: '1.12.0-dev1+ent' }));
+  server.get('sys/health', (schema, req) => handleResponse(req, { version: '1.12.0-dev1+ent' }));
 }
diff --git a/ui/mirage/handlers/index.js b/ui/mirage/handlers/index.js
index d7c652c816d98..8c28ffa4dedc1 100644
--- a/ui/mirage/handlers/index.js
+++ b/ui/mirage/handlers/index.js
@@ -1,11 +1,7 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 // add all handlers here
 // individual lookup done in mirage config
 import base from './base';
+import activity from './activity';
 import clients from './clients';
 import db from './db';
 import kms from './kms';
@@ -13,6 +9,5 @@ import mfaConfig from './mfa-config';
 import mfaLogin from './mfa-login';
 import oidcConfig from './oidc-config';
 import hcpLink from './hcp-link';
-import kubernetes from './kubernetes';
 
-export { base, clients, db, kms, mfaConfig, mfaLogin, oidcConfig, hcpLink, kubernetes };
+export { base, activity, clients, db, kms, mfaConfig, mfaLogin, oidcConfig, hcpLink };
diff --git a/ui/mirage/handlers/kms.js b/ui/mirage/handlers/kms.js
index 3d7118279a668..5bad5ede7ab83 100644
--- a/ui/mirage/handlers/kms.js
+++ b/ui/mirage/handlers/kms.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export default function (server) {
   server.get('keymgmt/key?list=true', function () {
     return {
@@ -13,7 +8,7 @@ export default function (server) {
   });
 
   server.get('keymgmt/key/:name', function (_, request) {
-    const name = request.params.name;
+    let name = request.params.name;
     return {
       data: {
         name,
diff --git a/ui/mirage/handlers/kubernetes.js b/ui/mirage/handlers/kubernetes.js
deleted file mode 100644
index a646519fcd00c..0000000000000
--- a/ui/mirage/handlers/kubernetes.js
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { Response } from 'miragejs';
-
-export default function (server) {
-  const getRecord = (schema, req, dbKey) => {
-    const { path, name } = req.params;
-    const findBy = dbKey === 'kubernetesConfigs' ? { path } : { name };
-    const record = schema.db[dbKey].findBy(findBy);
-    if (record) {
-      delete record.path;
-      delete record.id;
-    }
-    return record ? { data: record } : new Response(404, {}, { errors: [] });
-  };
-  const createRecord = (req, key) => {
-    const data = JSON.parse(req.requestBody);
-    if (key === 'kubernetes-config') {
-      data.path = req.params.path;
-    }
-    server.create(key, data);
-    return new Response(204);
-  };
-  const deleteRecord = (schema, req, dbKey) => {
-    const { name } = req.params;
-    const record = schema.db[dbKey].findBy({ name });
-    if (record) {
-      schema.db[dbKey].remove(record.id);
-    }
-    return new Response(204);
-  };
-
-  server.get('/:path/config', (schema, req) => {
-    return getRecord(schema, req, 'kubernetesConfigs');
-  });
-  server.post('/:path/config', (schema, req) => {
-    return createRecord(req, 'kubernetes-config');
-  });
-  server.delete('/:path/config', (schema, req) => {
-    return deleteRecord(schema, req, 'kubernetesConfigs');
-  });
-  // endpoint for checking for environment variables necessary for inferred config
-  server.get('/:path/check', () => {
-    const response = {};
-    const status = Math.random() > 0.5 ? 204 : 404;
-    if (status === 404) {
-      response.errors = [
-        'Missing environment variables: KUBERNETES_SERVICE_HOST, KUBERNETES_SERVICE_PORT_HTTPS',
-      ];
-    }
-    return new Response(status, response);
-  });
-  server.get('/:path/roles', (schema) => {
-    return {
-      data: {
-        keys: schema.db.kubernetesRoles.where({}).mapBy('name'),
-      },
-    };
-  });
-  server.get('/:path/roles/:name', (schema, req) => {
-    return getRecord(schema, req, 'kubernetesRoles');
-  });
-  server.post('/:path/roles/:name', (schema, req) => {
-    return createRecord(req, 'kubernetes-role');
-  });
-  server.delete('/:path/roles/:name', (schema, req) => {
-    return deleteRecord(schema, req, 'kubernetesRoles');
-  });
-  server.post('/:path/creds/:role', (schema, req) => {
-    const { role } = req.params;
-    const record = schema.db.kubernetesRoles.findBy({ name: role });
-    const data = JSON.parse(req.requestBody);
-    let errors;
-    if (!record) {
-      errors = [`role '${role}' does not exist`];
-    } else if (!data.kubernetes_namespace) {
-      errors = ["'kubernetes_namespace' is required"];
-    }
-    // creds cannot be fetched after creation so we don't need to store them
-    return errors
-      ? new Response(400, {}, { errors })
-      : {
-          request_id: '58fefc6c-5195-c17a-94f2-8f889f3df57c',
-          lease_id: 'kubernetes/creds/default-role/aWczfcfJ7NKUdiirJrPXIs38',
-          renewable: false,
-          lease_duration: 3600,
-          data: {
-            service_account_name: 'default',
-            service_account_namespace: 'default',
-            service_account_token: 'eyJhbGciOiJSUzI1NiIsImtpZCI6Imlr',
-          },
-        };
-  });
-
-  server.get('/sys/internal/ui/mounts/kubernetes', () => ({
-    data: {
-      accessor: 'kubernetes_9f846a87',
-      path: 'kubernetes/',
-      type: 'kubernetes',
-    },
-  }));
-}
diff --git a/ui/mirage/handlers/mfa-config.js b/ui/mirage/handlers/mfa-config.js
index 6771692b5a8e9..944e4429ce27e 100644
--- a/ui/mirage/handlers/mfa-config.js
+++ b/ui/mirage/handlers/mfa-config.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { Response } from 'miragejs';
 
 export default function (server) {
@@ -144,7 +139,7 @@ export default function (server) {
       'identity_entity_ids',
     ];
     let hasRequired = false;
-    for (const key of required) {
+    for (let key of required) {
       if (data[key]?.length) {
         hasRequired = true;
         break;
diff --git a/ui/mirage/handlers/mfa-login.js b/ui/mirage/handlers/mfa-login.js
index b409e253b3895..6ead5ccec2406 100644
--- a/ui/mirage/handlers/mfa-login.js
+++ b/ui/mirage/handlers/mfa-login.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { Response } from 'miragejs';
 import Ember from 'ember';
 import fetch from 'fetch';
@@ -23,7 +18,7 @@ export const validationHandler = (schema, req) => {
       return new Response(404, {}, { errors: ['MFA Request ID not found'] });
     }
     // validate request body
-    for (const constraintId in mfa_payload) {
+    for (let constraintId in mfa_payload) {
       // ensure ids were passed in map
       const method = mfaRequest.methods.find(({ id }) => id === constraintId);
       if (!method) {
@@ -44,7 +39,7 @@ export const validationHandler = (schema, req) => {
               limit:
                 'maximum TOTP validation attempts 4 exceeded the allowed attempts 3. Please try again in 15 seconds',
             }[passcode] || 'failed to validate';
-          console.log(error); // eslint-disable-line
+          console.log(error);
           return new Response(403, {}, { errors: [error] });
         }
       } else if (passcode) {
@@ -54,7 +49,7 @@ export const validationHandler = (schema, req) => {
     }
     return authResponses[mfa_request_id];
   } catch (error) {
-    console.log(error); // eslint-disable-line
+    console.log(error);
     return new Response(500, {}, { errors: ['Mirage Handler Error: /sys/mfa/validate'] });
   }
 };
@@ -101,7 +96,11 @@ export default function (server) {
     } else if (user === 'mfa-k') {
       [mfa_constraints, methods] = generator([m('duo', true)]); // test duo passcode and prepending passcode= to user input
     }
-    const mfa_request_id = crypto.randomUUID();
+    const numbers = (length) =>
+      Math.random()
+        .toString()
+        .substring(2, length + 2);
+    const mfa_request_id = `${numbers(8)}-${numbers(4)}-${numbers(4)}-${numbers(4)}-${numbers(12)}`;
     const mfa_requirement = {
       mfa_request_id,
       mfa_constraints,
diff --git a/ui/mirage/handlers/oidc-config.js b/ui/mirage/handlers/oidc-config.js
index 11c3a3b1664cb..be139c2418b02 100644
--- a/ui/mirage/handlers/oidc-config.js
+++ b/ui/mirage/handlers/oidc-config.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export default function (server) {
   // ENTITY SEARCH SELECT
   server.get('/identity/entity/id', () => ({
diff --git a/ui/mirage/helpers/modify-passthrough-response.js b/ui/mirage/helpers/modify-passthrough-response.js
deleted file mode 100644
index c6a794b46d577..0000000000000
--- a/ui/mirage/helpers/modify-passthrough-response.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// passthrough request and modify response from server
-// pass object as second arg of properties in response to override
-export default function (req, props = {}) {
-  return new Promise((resolve) => {
-    const xhr = req.passthrough();
-    xhr.onreadystatechange = () => {
-      if (xhr.readyState === 4) {
-        if (xhr.status < 300) {
-          // XMLHttpRequest response prop only has a getter -- redefine as writable and set value
-          Object.defineProperty(xhr, 'response', {
-            writable: true,
-            value: JSON.stringify({
-              ...JSON.parse(xhr.responseText),
-              ...props,
-            }),
-          });
-        }
-        resolve();
-      }
-    };
-  });
-}
diff --git a/ui/mirage/identity-managers/application.js b/ui/mirage/identity-managers/application.js
index a71912f719faa..4c5c951d9f2dd 100644
--- a/ui/mirage/identity-managers/application.js
+++ b/ui/mirage/identity-managers/application.js
@@ -1,8 +1,47 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import IdentityManager from 'vault/utils/identity-manager';
 // to more closely match the Vault backend this will return UUIDs as identifiers for records in mirage
-export default IdentityManager;
+export default class {
+  constructor() {
+    this.ids = new Set();
+  }
+  /**
+   * Returns a unique identifier.
+   *
+   * @method fetch
+   * @param {Object} data Records attributes hash
+   * @return {String} Unique identifier
+   * @public
+   */
+  fetch() {
+    let uuid = crypto.randomUUID();
+    // odds are incredibly low that we'll run into a duplicate using crypto.randomUUID()
+    // but just to be safe...
+    while (this.ids.has(uuid)) {
+      uuid = crypto.randomUUID();
+    }
+    this.ids.add(uuid);
+    return uuid;
+  }
+  /**
+   * Register an identifier.
+   * Must throw if identifier is already used.
+   *
+   * @method set
+   * @param {String|Number} id
+   * @public
+   */
+  set(id) {
+    if (this.ids.has(id)) {
+      throw new Error(`ID ${id} is in use.`);
+    }
+    this.ids.add(id);
+  }
+  /**
+   * Reset identity manager.
+   *
+   * @method reset
+   * @public
+   */
+  reset() {
+    this.ids.clear();
+  }
+}
diff --git a/ui/mirage/models/feature.js b/ui/mirage/models/feature.js
index cc93d19980410..4f84f3bd71dca 100644
--- a/ui/mirage/models/feature.js
+++ b/ui/mirage/models/feature.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { Model } from 'ember-cli-mirage';
 
 export default Model.extend({
diff --git a/ui/mirage/scenarios/default.js b/ui/mirage/scenarios/default.js
index cafa0e83ad718..86080aa5feaff 100644
--- a/ui/mirage/scenarios/default.js
+++ b/ui/mirage/scenarios/default.js
@@ -1,17 +1,4 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import ENV from 'vault/config/environment';
-const { handler } = ENV['ember-cli-mirage'];
-import kubernetesScenario from './kubernetes';
-
 export default function (server) {
   server.create('clients/config');
   server.create('feature', { feature_flags: ['SOME_FLAG', 'VAULT_CLOUD_ADMIN_NAMESPACE'] });
-
-  if (handler === 'kubernetes') {
-    kubernetesScenario(server);
-  }
 }
diff --git a/ui/mirage/scenarios/kubernetes.js b/ui/mirage/scenarios/kubernetes.js
deleted file mode 100644
index bc30ae732cdee..0000000000000
--- a/ui/mirage/scenarios/kubernetes.js
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-export default function (server, shouldConfigureRoles = true) {
-  server.create('kubernetes-config', { path: 'kubernetes' });
-  if (shouldConfigureRoles) {
-    server.create('kubernetes-role');
-    server.create('kubernetes-role', 'withRoleName');
-    server.create('kubernetes-role', 'withRoleRules');
-  }
-}
diff --git a/ui/mirage/serializers/application.js b/ui/mirage/serializers/application.js
index 4620ee530f49a..42feb0e4754d7 100644
--- a/ui/mirage/serializers/application.js
+++ b/ui/mirage/serializers/application.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { JSONAPISerializer } from 'ember-cli-mirage';
 
 export default JSONAPISerializer.extend({
diff --git a/ui/package.json b/ui/package.json
index 1126c67f6861f..2f3245b53feca 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -22,7 +22,7 @@
     "fmt:js": "prettier --config .prettierrc.js --write '{app,tests,config,lib}/**/*.js'",
     "fmt:hbs": "prettier --config .prettierrc.js --write '**/*.hbs'",
     "fmt:styles": "prettier --write app/styles/**/*.*",
-    "start": "VAULT_ADDR=http://localhost:8200; ember server --proxy=$VAULT_ADDR",
+    "start": "export VAULT_ADDR=http://localhost:8200; ember server --proxy=$VAULT_ADDR",
     "start2": "ember server --proxy=http://localhost:8202 --port=4202",
     "start:mirage": "start () { MIRAGE_DEV_HANDLER=$1 yarn run start; }; start",
     "test": "npm-run-all lint:js:quiet lint:hbs:quiet && node scripts/start-vault.js",
@@ -30,7 +30,6 @@
     "test:oss": "yarn run test -f='!enterprise'",
     "test:quick": "node scripts/start-vault.js",
     "test:quick-oss": "yarn test:quick -f='!enterprise'",
-    "types:declare": "declare () { yarn tsc $1 --declaration --allowJs --emitDeclarationOnly --experimentalDecorators --outDir $2; }; declare",
     "vault": "VAULT_REDIRECT_ADDR=http://127.0.0.1:8200 vault server -log-level=error -dev -dev-root-token-id=root -dev-ha -dev-transactional",
     "vault:cluster": "VAULT_REDIRECT_ADDR=http://127.0.0.1:8202 vault server -log-level=error -dev -dev-root-token-id=root -dev-listen-address=127.0.0.1:8202 -dev-ha -dev-transactional"
   },
@@ -53,48 +52,15 @@
   "devDependencies": {
     "@babel/plugin-proposal-object-rest-spread": "^7.12.1",
     "@babel/plugin-transform-block-scoping": "^7.12.1",
-    "@ember/legacy-built-in-components": "^0.4.1",
     "@ember/optional-features": "^2.0.0",
     "@ember/render-modifiers": "^1.0.2",
-    "@ember/test-helpers": "2.8.1",
+    "@ember/test-helpers": "^2.6.0",
     "@ember/test-waiters": "^3.0.0",
-    "@glimmer/component": "^1.1.2",
-    "@glimmer/tracking": "^1.1.2",
-    "@hashicorp/ember-flight-icons": "^3.0.2",
+    "@glimmer/component": "^1.0.3",
+    "@glimmer/tracking": "^1.0.3",
+    "@hashicorp/ember-flight-icons": "2.0.3",
     "@hashicorp/structure-icons": "^1.3.0",
     "@icholy/duration": "^5.1.0",
-    "@tsconfig/ember": "^1.0.1",
-    "@types/ember": "^4.0.2",
-    "@types/ember-data": "^4.4.6",
-    "@types/ember-data__adapter": "^4.0.1",
-    "@types/ember-data__model": "^4.0.0",
-    "@types/ember-data__serializer": "^4.0.1",
-    "@types/ember-data__store": "^4.0.2",
-    "@types/ember-qunit": "^5.0.2",
-    "@types/ember-resolver": "^5.0.13",
-    "@types/ember__application": "^4.0.4",
-    "@types/ember__array": "^4.0.3",
-    "@types/ember__component": "^4.0.11",
-    "@types/ember__controller": "^4.0.3",
-    "@types/ember__debug": "^4.0.3",
-    "@types/ember__destroyable": "^4.0.1",
-    "@types/ember__engine": "^4.0.4",
-    "@types/ember__error": "^4.0.1",
-    "@types/ember__object": "^4.0.5",
-    "@types/ember__polyfills": "^4.0.1",
-    "@types/ember__routing": "^4.0.12",
-    "@types/ember__runloop": "^4.0.2",
-    "@types/ember__service": "^4.0.1",
-    "@types/ember__string": "^3.0.10",
-    "@types/ember__template": "^4.0.1",
-    "@types/ember__test": "^4.0.1",
-    "@types/ember__test-helpers": "^2.8.2",
-    "@types/ember__utils": "^4.0.2",
-    "@types/qunit": "^2.19.3",
-    "@types/rsvp": "^4.0.4",
-    "@types/shell-quote": "^1.7.1",
-    "@typescript-eslint/eslint-plugin": "^5.19.0",
-    "@typescript-eslint/parser": "^5.19.0",
     "asn1js": "^2.2.0",
     "autosize": "^4.0.0",
     "babel-eslint": "^10.1.0",
@@ -102,8 +68,11 @@
     "base64-js": "^1.3.1",
     "broccoli-asset-rev": "^3.0.0",
     "broccoli-sri-hash": "meirish/broccoli-sri-hash#rooturl",
+    "bulma": "^0.5.2",
+    "bulma-switch": "^0.0.1",
     "codemirror": "^5.58.2",
     "columnify": "^1.5.4",
+    "cool-checkboxes-for-bulma.io": "^1.1.0",
     "d3-axis": "^1.0.8",
     "d3-ease": "^1.0.5",
     "d3-scale": "^1.0.7",
@@ -115,51 +84,52 @@
     "date-fns-tz": "^1.2.2",
     "deepmerge": "^4.0.0",
     "doctoc": "^2.2.0",
+    "ember-api-actions": "^0.2.8",
     "dompurify": "^3.0.2",
     "ember-auto-import": "2.4.2",
-    "ember-basic-dropdown": "6.0.1",
-    "ember-cli": "~4.4.0",
+    "ember-basic-dropdown": "4.0.3",
+    "ember-cli": "~3.28.5",
     "ember-cli-autoprefixer": "^0.8.1",
-    "ember-cli-babel": "^7.26.11",
-    "ember-cli-clipboard": "0.16.0",
-    "ember-cli-content-security-policy": "2.0.3",
-    "ember-cli-dependency-checker": "^3.3.1",
+    "ember-cli-babel": "^7.26.10",
+    "ember-cli-clipboard": "^0.13.0",
+    "ember-cli-content-security-policy": "^1.0.0",
+    "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-deprecation-workflow": "^2.1.0",
-    "ember-cli-flash": "4.0.0",
-    "ember-cli-htmlbars": "^6.0.1",
+    "ember-cli-flash": "^1.7.2",
+    "ember-cli-htmlbars": "^5.7.2",
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-mirage": "2.4.0",
-    "ember-cli-page-object": "1.17.10",
-    "ember-cli-sass": "11.0.1",
+    "ember-cli-page-object": "1.17.9",
+    "ember-cli-sass": "^10.0.1",
     "ember-cli-sri": "meirish/ember-cli-sri#rooturl",
     "ember-cli-string-helpers": "6.1.0",
     "ember-cli-terser": "^4.0.2",
-    "ember-cli-typescript": "^5.2.1",
-    "ember-composable-helpers": "5.0.0",
-    "ember-concurrency": "2.3.4",
+    "ember-composable-helpers": "^4.3.0",
+    "ember-concurrency": "^2.1.2",
     "ember-copy": "2.0.1",
     "ember-d3": "^0.5.1",
-    "ember-data": "~4.5.0",
-    "ember-engines": "0.8.23",
+    "ember-data": "~3.28.6",
+    "ember-data-model-fragments": "5.0.0-beta.5",
+    "ember-engines": "^0.8.3",
     "ember-export-application-global": "^2.0.1",
     "ember-fetch": "^8.1.1",
     "ember-inflector": "4.0.2",
     "ember-load-initializers": "^2.1.2",
     "ember-maybe-in-element": "^2.0.3",
-    "ember-modal-dialog": "^4.0.1",
+    "ember-modal-dialog": "4.0.0",
     "ember-modifier": "^3.1.0",
-    "ember-page-title": "^7.0.0",
-    "ember-power-select": "6.0.1",
+    "ember-page-title": "^6.2.2",
+    "ember-power-select": "^5.0.3",
     "ember-qrcode-shim": "^0.4.0",
-    "ember-qunit": "6.0.0",
+    "ember-qunit": "^5.1.5",
     "ember-resolver": "^8.0.3",
-    "ember-responsive": "5.0.0",
+    "ember-responsive": "^3.0.0-beta.3",
     "ember-router-helpers": "^0.4.0",
     "ember-service-worker": "meirish/ember-service-worker#configurable-scope",
     "ember-sinon": "^4.0.0",
-    "ember-source": "4.4.4",
-    "ember-svg-jar": "2.4.0",
-    "ember-template-lint": "4.8.0",
+    "ember-source": "3.28.10",
+    "ember-svg-jar": "^2.1.0",
+    "ember-template-lint": "4.3.0",
     "ember-template-lint-plugin-prettier": "4.0.0",
     "ember-test-selectors": "6.0.0",
     "ember-tether": "^2.0.1",
@@ -167,59 +137,72 @@
     "ember-wormhole": "0.6.0",
     "escape-string-regexp": "^2.0.0",
     "eslint": "^7.32.0",
-    "eslint-config-prettier": "^8.5.0",
+    "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-compat": "4.0.2",
-    "eslint-plugin-ember": "^10.6.1",
+    "eslint-plugin-ember": "^10.5.8",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-qunit": "^7.2.0",
+    "eslint-plugin-prettier": "^3.4.1",
+    "eslint-plugin-qunit": "^6.2.0",
     "filesize": "^4.2.1",
     "flat": "^4.1.0",
+    "ivy-codemirror": "IvyApp/ivy-codemirror#fb09333c5144da47e14a9e6260f80577d5408374",
     "jsondiffpatch": "^0.4.1",
     "jsonlint": "^1.6.3",
-    "lint-staged": "^10.5.1",
     "loader.js": "^4.7.0",
+    "node-sass": "6.0.1",
     "normalize.css": "4.1.1",
     "npm-run-all": "^4.1.5",
     "pkijs": "^2.2.2",
     "pretender": "^3.4.3",
-    "prettier": "2.6.2",
-    "prettier-eslint-cli": "^7.1.0",
+    "prettier": "2.6.1",
+    "prettier-eslint-cli": "^5.0.0",
     "pvutils": "^1.0.17",
-    "qunit": "^2.19.1",
-    "qunit-dom": "^2.0.0",
-    "sass": "^1.58.3",
+    "qunit": "^2.17.2",
+    "qunit-dom": "^1.6.0",
+    "route-recognizer": "^0.3.4",
+    "sass": "^1.29.0",
     "sass-svg-uri": "^1.0.0",
     "shell-quote": "^1.6.1",
     "string.prototype.endswith": "^0.2.0",
     "string.prototype.startswith": "^0.2.0",
     "swagger-ui-dist": "^3.36.2",
     "text-encoder-lite": "2.0.0",
-    "typescript": "^4.8.4",
     "walk-sync": "^2.0.2",
     "webpack": "5.73.0",
     "xstate": "^3.3.3"
   },
+  "optionalDependencies": {
+    "@babel/core": "^7.12.3",
+    "babel-loader": "^8.1.0",
+    "lint-staged": "^10.5.1"
+  },
   "resolutions": {
     "cryptiles": "^4.1.2",
     "eslint-utils": "^1.4.1",
-    "ember-basic-dropdown": "6.0.1",
+    "ember-basic-dropdown": "4.0.3",
     "growl": "^1.10.0",
+    "handlebars": "^4.3.0",
     "highlight.js": "^10.4.1",
     "https-proxy-agent": "^2.2.3",
     "ini": "^1.3.6",
+    "js-yaml": "^3.13.1",
     "kind-of": "^6.0.3",
+    "lodash.defaultsdeep": "^4.6.1",
+    "lodash.merge": "^4.6.2",
+    "lodash": "^4.17.13",
     "minimatch": "^3.0.2",
+    "minimist": "^1.2.2",
     "node-notifier": "^8.0.1",
     "prismjs": "^1.21.0",
     "qs": "^6.3.0",
     "serialize-javascript": "^3.1.0",
     "underscore": "^1.12.1",
     "trim": "^0.0.3",
-    "xmlhttprequest-ssl": "^1.6.2"
+    "xmlhttprequest-ssl": "^1.6.2",
+    "@hashicorp/ember-flight-icons": "2.0.3"
   },
   "engines": {
-    "node": "16"
+    "node": "12.* || 14.* || >= 16"
   },
   "ember": {
     "edition": "octane"
@@ -229,9 +212,7 @@
     "paths": [
       "lib/core",
       "lib/css",
-      "lib/keep-gitkeep",
       "lib/kmip",
-      "lib/kubernetes",
       "lib/open-api-explorer",
       "lib/pki",
       "lib/replication",
@@ -239,11 +220,11 @@
     ]
   },
   "dependencies": {
-    "@hashicorp/design-system-components": "2.3.1",
-    "handlebars": "4.7.7",
+    "handlebars": "^4.3.0",
     "highlight.js": "^10.4.1",
+    "js-yaml": "^3.13.1",
+    "lodash": "^4.17.13",
     "node-notifier": "^8.0.1",
     "uuid": "^9.0.0"
-  },
-  "packageManager": "yarn@3.5.0"
+  }
 }
diff --git a/ui/public/images/pki-cross-sign.png b/ui/public/images/pki-cross-sign.png
deleted file mode 100644
index 7016466dd2264..0000000000000
Binary files a/ui/public/images/pki-cross-sign.png and /dev/null differ
diff --git a/ui/public/images/pki-rotate-root.png b/ui/public/images/pki-rotate-root.png
deleted file mode 100644
index 819e0f9ab9078..0000000000000
Binary files a/ui/public/images/pki-rotate-root.png and /dev/null differ
diff --git a/ui/public/images/pki-tidy.png b/ui/public/images/pki-tidy.png
deleted file mode 100644
index 320e9058d9347..0000000000000
Binary files a/ui/public/images/pki-tidy.png and /dev/null differ
diff --git a/ui/scripts/codemods/dropdown-transform.js b/ui/scripts/codemods/dropdown-transform.js
index 43715da55b7d0..7018478640007 100644
--- a/ui/scripts/codemods/dropdown-transform.js
+++ b/ui/scripts/codemods/dropdown-transform.js
@@ -1,9 +1,4 @@
 #!/usr/bin/env node
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /* eslint-env node */
 
 /**
diff --git a/ui/scripts/codemods/icon-transform.js b/ui/scripts/codemods/icon-transform.js
index 4c1b3082f5b7a..e39604e54e91d 100644
--- a/ui/scripts/codemods/icon-transform.js
+++ b/ui/scripts/codemods/icon-transform.js
@@ -1,9 +1,4 @@
 #!/usr/bin/env node
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /* eslint-env node */
 /**
  * Codemod to transform Icon component to new API to accomodate FlightIcon
diff --git a/ui/scripts/codemods/inject-service.js b/ui/scripts/codemods/inject-service.js
deleted file mode 100644
index 206492edceab0..0000000000000
--- a/ui/scripts/codemods/inject-service.js
+++ /dev/null
@@ -1,149 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import babylonParser from './jscodeshift-babylon-parser';
-
-// use babylon parser with decorators-legacy plugin
-export const parser = babylonParser;
-
-// checks for access of specified service on this
-// injects service if not present and imports inject as service if needed
-// example usage - npx jscodeshift -t ./scripts/codemods/inject-service.js ./app/**/*.js --service=store
-// --service arg is required with name of service
-// pass -d for dry run (no files transformed)
-
-export default function transformer({ source }, api, { service }) {
-  if (!service) {
-    throw new Error('Missing service arg. Pass --service=store for example to script');
-  }
-  const j = api.jscodeshift;
-  const filterForService = (path) => {
-    return j(path.value).find(j.MemberExpression, {
-      object: {
-        type: 'ThisExpression',
-      },
-      property: {
-        name: service,
-      },
-    }).length;
-  };
-  const recastOptions = {
-    reuseWhitespace: false,
-    wrapColumn: 110,
-    quote: 'single',
-    trailingComma: true,
-  };
-  let didInjectService = false;
-
-  // find class bodies and filter down to ones that access service
-  const classesAccessingService = j(source).find(j.ClassBody).filter(filterForService);
-
-  if (classesAccessingService.length) {
-    // filter down to class bodies where service is not injected
-    const missingService = classesAccessingService.filter((path) => {
-      return !j(path.value)
-        .find(j.ClassProperty, {
-          key: {
-            name: service,
-          },
-        })
-        .filter((path) => {
-          // ensure service property belongs to service decorator
-          return path.value.decorators.find((path) => path.expression.name === 'service');
-        }).length;
-    });
-
-    if (missingService.length) {
-      // inject service
-      const serviceInjection = j.classProperty(j.identifier(`@service ${service}`), null);
-      // adding a decorator this way will force injection down to a new line and then add a new line
-      // leaving in just in case it's needed
-      // serviceInjection.decorators = [j.decorator(j.identifier('service'))];
-
-      source = missingService
-        .forEach((path) => {
-          path.value.body.unshift(serviceInjection);
-        })
-        .toSource();
-
-      didInjectService = true;
-    }
-  }
-
-  // find .extend object expressions and filter down to ones that access this[service]
-  const objectsAccessingService = j(source)
-    .find(j.CallExpression, {
-      callee: {
-        type: 'MemberExpression',
-        property: {
-          name: 'extend',
-        },
-      },
-    })
-    .filter(filterForService)
-    .find(j.ObjectExpression)
-    .filter((path) => {
-      // filter object expressions that belong to .extend
-      // otherwise service will also be injected in actions: { } block of component for example
-      const callee = path.parent.value.callee;
-      return callee && callee.property?.name === 'extend';
-    });
-
-  if (objectsAccessingService.length) {
-    // filter down to objects where service is not injected
-    const missingService = objectsAccessingService.filter((path) => {
-      return !j(path.value).find(j.ObjectProperty, {
-        key: {
-          name: service,
-        },
-        value: {
-          callee: {
-            name: 'service',
-          },
-        },
-      }).length;
-    });
-
-    if (missingService.length) {
-      // inject service
-      const serviceInjection = j.objectProperty(
-        j.identifier(service),
-        j.callExpression(j.identifier('service'), [])
-      );
-
-      source = missingService
-        .forEach((path) => {
-          path.value.properties.unshift(serviceInjection);
-        })
-        .toSource(recastOptions);
-
-      didInjectService = true;
-    }
-  }
-
-  // if service was injected here check if inject has been imported
-  if (didInjectService) {
-    const needsImport = !j(source).find(j.ImportSpecifier, {
-      imported: {
-        name: 'inject',
-      },
-    }).length;
-
-    if (needsImport) {
-      const injectionImport = j.importDeclaration(
-        [j.importSpecifier(j.identifier('inject'), j.identifier('service'))],
-        j.literal('@ember/service')
-      );
-
-      const imports = j(source).find(j.ImportDeclaration);
-      source = imports
-        .at(imports.length - 1)
-        .insertAfter(injectionImport)
-        .toSource(recastOptions);
-    }
-  }
-
-  return source;
-}
diff --git a/ui/scripts/codemods/jscodeshift-babylon-parser.js b/ui/scripts/codemods/jscodeshift-babylon-parser.js
deleted file mode 100644
index 42f3b5e3e30c3..0000000000000
--- a/ui/scripts/codemods/jscodeshift-babylon-parser.js
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/env node
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-/* eslint-env node */
-
-// Read more: https://github.com/facebook/jscodeshift#parser
-
-const babylon = require('@babel/parser');
-
-const parserConfig = {
-  sourceType: 'module',
-  allowImportExportEverywhere: true,
-  allowReturnOutsideFunction: true,
-  startLine: 1,
-  tokens: true,
-  plugins: [
-    ['flow', { all: true }],
-    'flowComments',
-    'jsx',
-    'asyncGenerators',
-    'bigInt',
-    'classProperties',
-    'classPrivateProperties',
-    'classPrivateMethods',
-    'decorators-legacy', // allows decorator to come before export statement
-    'doExpressions',
-    'dynamicImport',
-    'exportDefaultFrom',
-    'exportNamespaceFrom',
-    'functionBind',
-    'functionSent',
-    'importMeta',
-    'logicalAssignment',
-    'nullishCoalescingOperator',
-    'numericSeparator',
-    'objectRestSpread',
-    'optionalCatchBinding',
-    'optionalChaining',
-    ['pipelineOperator', { proposal: 'minimal' }],
-    'throwExpressions',
-  ],
-};
-
-export default {
-  parse: function (source) {
-    return babylon.parse(source, parserConfig);
-  },
-};
diff --git a/ui/scripts/codemods/linkto-with-on-modifier.js b/ui/scripts/codemods/linkto-with-on-modifier.js
index dc8c4e918d82a..d5386c37b0ae6 100644
--- a/ui/scripts/codemods/linkto-with-on-modifier.js
+++ b/ui/scripts/codemods/linkto-with-on-modifier.js
@@ -1,9 +1,4 @@
 #!/usr/bin/env node
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /* eslint-env node */
 
 // print to console all files that include LinkTo elements using the {{on modifier}}
diff --git a/ui/scripts/codemods/no-quoteless-attributes.js b/ui/scripts/codemods/no-quoteless-attributes.js
index 1e28a8b41f8bc..69c234842b594 100644
--- a/ui/scripts/codemods/no-quoteless-attributes.js
+++ b/ui/scripts/codemods/no-quoteless-attributes.js
@@ -1,9 +1,4 @@
 #!/usr/bin/env node
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /* eslint-env node */
 
 /**
diff --git a/ui/scripts/codemods/transform-deprecated-args.js b/ui/scripts/codemods/transform-deprecated-args.js
index 352cced2c0e8e..a13120c566976 100644
--- a/ui/scripts/codemods/transform-deprecated-args.js
+++ b/ui/scripts/codemods/transform-deprecated-args.js
@@ -1,9 +1,4 @@
 #!/usr/bin/env node
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /* eslint-env node */
 /**
  * Codemod to convert args to attributes for Input and TextArea built in components
diff --git a/ui/scripts/enos-test-ember.js b/ui/scripts/enos-test-ember.js
index 1965c3c1e8935..6415a48916a3c 100755
--- a/ui/scripts/enos-test-ember.js
+++ b/ui/scripts/enos-test-ember.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /* eslint-env node */
 /* eslint-disable no-console */
 
diff --git a/ui/scripts/gen-story-md.js b/ui/scripts/gen-story-md.js
index 63a4593ccd687..a1cf6059dc150 100755
--- a/ui/scripts/gen-story-md.js
+++ b/ui/scripts/gen-story-md.js
@@ -1,9 +1,4 @@
 #!/usr/bin/env node
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /* eslint-disable */
 // run this script via yarn in the ui directory:
 // yarn gen-story-md some-component
diff --git a/ui/scripts/list-templates.js b/ui/scripts/list-templates.js
index 37315efae374e..bda10af901e4c 100755
--- a/ui/scripts/list-templates.js
+++ b/ui/scripts/list-templates.js
@@ -1,9 +1,4 @@
 #!/usr/bin/env node
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /* eslint-disable */
 
 // We need an array in this format for all of the files
@@ -12,7 +7,7 @@
 var walkSync = require('walk-sync');
 var templates = walkSync('app', { globs: ['**/*.hbs'] });
 
-templates = templates.map((path) => {
+templates = templates.map(path => {
   // we want the relative path w/o the extension:
   // 'app/templates/path/to/file/filename'
   return `app/${path.replace(/\.hbs$/, '')}`;
diff --git a/ui/scripts/start-vault.js b/ui/scripts/start-vault.js
index f069f8dfa06bc..270bc46a22e76 100755
--- a/ui/scripts/start-vault.js
+++ b/ui/scripts/start-vault.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /* eslint-env node */
 /* eslint-disable no-console */
 /* eslint-disable no-process-exit */
@@ -26,7 +21,7 @@ async function processLines(input, eachLine = () => {}) {
 
 (async function () {
   try {
-    const vault = testHelper.run(
+    let vault = testHelper.run(
       'vault',
       [
         'server',
diff --git a/ui/scripts/test-helper.js b/ui/scripts/test-helper.js
index 8ff4961f40b15..b125ddcf10552 100644
--- a/ui/scripts/test-helper.js
+++ b/ui/scripts/test-helper.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /* eslint-env node */
 /* eslint-disable no-console */
 
@@ -22,7 +17,7 @@ function writeKeysFile(unsealKeys, rootToken, filePath) {
   if (filePath === undefined) {
     filePath = path.join(process.cwd(), 'tests/helpers/vault-keys.js');
   }
-  const keys = {};
+  let keys = {};
   keys.unsealKeys = unsealKeys;
   keys.rootToken = rootToken;
 
@@ -47,7 +42,7 @@ function run(command, args = [], shareStd = true) {
   if (shareStd) {
     return execa(command, args, { cleanup: true, stdin: 'inherit', stdout: 'inherit', stderr: 'inherit' });
   }
-  const p = execa(command, args, { cleanup: true });
+  let p = execa(command, args, { cleanup: true });
   p.stdout.pipe(process.stdout);
   p.stderr.pipe(process.stderr);
   return p;
diff --git a/ui/testem.enos.js b/ui/testem.enos.js
index c76635c12c0de..b9bcdb6a05b50 100644
--- a/ui/testem.enos.js
+++ b/ui/testem.enos.js
@@ -1,14 +1,9 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /* eslint-env node */
 
 'use strict';
 
 const vault_addr = process.env.VAULT_ADDR;
-console.log('VAULT_ADDR=' + vault_addr); // eslint-disable-line
+console.log('VAULT_ADDR=' + vault_addr);
 
 module.exports = {
   test_page: 'tests/index.html?hidepassed',
diff --git a/ui/testem.js b/ui/testem.js
index 81aa185a542a2..ccf0228f4bcb0 100644
--- a/ui/testem.js
+++ b/ui/testem.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 'use strict';
 
 module.exports = {
diff --git a/ui/tests/.eslintrc.js b/ui/tests/.eslintrc.js
index 8c897a3ce9962..dbd2a5460c1cc 100644
--- a/ui/tests/.eslintrc.js
+++ b/ui/tests/.eslintrc.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /* eslint-disable no-undef */
 module.exports = {
   env: {
diff --git a/ui/tests/acceptance/access/identity/_shared-alias-tests.js b/ui/tests/acceptance/access/identity/_shared-alias-tests.js
index 5cadcb945ccf8..f54e5def8adf4 100644
--- a/ui/tests/acceptance/access/identity/_shared-alias-tests.js
+++ b/ui/tests/acceptance/access/identity/_shared-alias-tests.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { currentRouteName, settled } from '@ember/test-helpers';
 import page from 'vault/tests/pages/access/identity/aliases/add';
 import aliasIndexPage from 'vault/tests/pages/access/identity/aliases/index';
@@ -11,6 +6,9 @@ import createItemPage from 'vault/tests/pages/access/identity/create';
 import showItemPage from 'vault/tests/pages/access/identity/show';
 
 export const testAliasCRUD = async function (name, itemType, assert) {
+  let itemID;
+  let aliasID;
+  let idRow;
   if (itemType === 'groups') {
     await createItemPage.createItem(itemType, 'external');
     await settled();
@@ -18,8 +16,8 @@ export const testAliasCRUD = async function (name, itemType, assert) {
     await createItemPage.createItem(itemType);
     await settled();
   }
-  let idRow = showItemPage.rows.filterBy('hasLabel').filterBy('rowLabel', 'ID')[0];
-  const itemID = idRow.rowValue;
+  idRow = showItemPage.rows.filterBy('hasLabel').filterBy('rowLabel', 'ID')[0];
+  itemID = idRow.rowValue;
   await page.visit({ item_type: itemType, id: itemID });
   await settled();
   await page.editForm.name(name).submit();
@@ -30,8 +28,8 @@ export const testAliasCRUD = async function (name, itemType, assert) {
   );
 
   idRow = aliasShowPage.rows.filterBy('hasLabel').filterBy('rowLabel', 'ID')[0];
-  const aliasID = idRow.rowValue;
-  assert.strictEqual(
+  aliasID = idRow.rowValue;
+  assert.equal(
     currentRouteName(),
     'vault.cluster.access.identity.aliases.show',
     'navigates to the correct route'
@@ -40,13 +38,13 @@ export const testAliasCRUD = async function (name, itemType, assert) {
 
   await aliasIndexPage.visit({ item_type: itemType });
   await settled();
-  assert.strictEqual(
+  assert.equal(
     aliasIndexPage.items.filterBy('name', name).length,
     1,
     `${itemType}: lists the entity in the entity list`
   );
 
-  const item = aliasIndexPage.items.filterBy('name', name)[0];
+  let item = aliasIndexPage.items.filterBy('name', name)[0];
   await item.menu();
   await settled();
   await aliasIndexPage.delete();
@@ -58,14 +56,13 @@ export const testAliasCRUD = async function (name, itemType, assert) {
     `${itemType}: shows flash message`
   );
 
-  assert.strictEqual(
-    aliasIndexPage.items.filterBy('id', aliasID).length,
-    0,
-    `${itemType}: the row is deleted`
-  );
+  assert.equal(aliasIndexPage.items.filterBy('id', aliasID).length, 0, `${itemType}: the row is deleted`);
 };
 
 export const testAliasDeleteFromForm = async function (name, itemType, assert) {
+  let itemID;
+  let aliasID;
+  let idRow;
   if (itemType === 'groups') {
     await createItemPage.createItem(itemType, 'external');
     await settled();
@@ -73,17 +70,17 @@ export const testAliasDeleteFromForm = async function (name, itemType, assert) {
     await createItemPage.createItem(itemType);
     await settled();
   }
-  let idRow = showItemPage.rows.filterBy('hasLabel').filterBy('rowLabel', 'ID')[0];
-  const itemID = idRow.rowValue;
+  idRow = showItemPage.rows.filterBy('hasLabel').filterBy('rowLabel', 'ID')[0];
+  itemID = idRow.rowValue;
   await page.visit({ item_type: itemType, id: itemID });
   await settled();
   await page.editForm.name(name).submit();
   await settled();
   idRow = aliasShowPage.rows.filterBy('hasLabel').filterBy('rowLabel', 'ID')[0];
-  const aliasID = idRow.rowValue;
+  aliasID = idRow.rowValue;
   await aliasShowPage.edit();
   await settled();
-  assert.strictEqual(
+  assert.equal(
     currentRouteName(),
     'vault.cluster.access.identity.aliases.edit',
     `${itemType}: navigates to edit on create`
@@ -96,12 +93,12 @@ export const testAliasDeleteFromForm = async function (name, itemType, assert) {
     aliasIndexPage.flashMessage.latestMessage.startsWith('Successfully deleted'),
     `${itemType}: shows flash message`
   );
-  assert.strictEqual(
+  assert.equal(
     currentRouteName(),
     'vault.cluster.access.identity.aliases.index',
     `${itemType}: navigates to list page on delete`
   );
-  assert.strictEqual(
+  assert.equal(
     aliasIndexPage.items.filterBy('id', aliasID).length,
     0,
     `${itemType}: the row does not show in the list`
diff --git a/ui/tests/acceptance/access/identity/_shared-tests.js b/ui/tests/acceptance/access/identity/_shared-tests.js
index b667e59da9f66..d2bcefea1b268 100644
--- a/ui/tests/acceptance/access/identity/_shared-tests.js
+++ b/ui/tests/acceptance/access/identity/_shared-tests.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { settled, currentRouteName, click, waitUntil, find } from '@ember/test-helpers';
 import { selectChoose, clickTrigger } from 'ember-power-select/test-support/helpers';
 import page from 'vault/tests/pages/access/identity/create';
@@ -18,7 +13,7 @@ export const testCRUD = async (name, itemType, assert) => {
     showPage.flashMessage.latestMessage.startsWith('Successfully saved'),
     `${itemType}: shows a flash message`
   );
-  assert.strictEqual(
+  assert.equal(
     currentRouteName(),
     'vault.cluster.access.identity.show',
     `${itemType}: navigates to show on create`
@@ -27,7 +22,7 @@ export const testCRUD = async (name, itemType, assert) => {
 
   await indexPage.visit({ item_type: itemType });
   await settled();
-  assert.strictEqual(
+  assert.equal(
     indexPage.items.filterBy('name', name).length,
     1,
     `${itemType}: lists the entity in the entity list`
@@ -42,7 +37,7 @@ export const testCRUD = async (name, itemType, assert) => {
     indexPage.flashMessage.latestMessage.startsWith('Successfully deleted'),
     `${itemType}: shows flash message`
   );
-  assert.strictEqual(indexPage.items.filterBy('name', name).length, 0, `${itemType}: the row is deleted`);
+  assert.equal(indexPage.items.filterBy('name', name).length, 0, `${itemType}: the row is deleted`);
 };
 
 export const testDeleteFromForm = async (name, itemType, assert) => {
@@ -60,7 +55,7 @@ export const testDeleteFromForm = async (name, itemType, assert) => {
   await click('[data-test-tab-subnav="metadata"]');
   assert.dom('.info-table-row').hasText('hello goodbye', 'Metadata shows on tab');
   await showPage.edit();
-  assert.strictEqual(
+  assert.equal(
     currentRouteName(),
     'vault.cluster.access.identity.edit',
     `${itemType}: navigates to edit on create`
@@ -74,12 +69,12 @@ export const testDeleteFromForm = async (name, itemType, assert) => {
     indexPage.flashMessage.latestMessage.startsWith('Successfully deleted'),
     `${itemType}: shows flash message`
   );
-  assert.strictEqual(
+  assert.equal(
     currentRouteName(),
     'vault.cluster.access.identity.index',
     `${itemType}: navigates to list page on delete`
   );
-  assert.strictEqual(
+  assert.equal(
     indexPage.items.filterBy('name', name).length,
     0,
     `${itemType}: the row does not show in the list`
diff --git a/ui/tests/acceptance/access/identity/entities/aliases/create-test.js b/ui/tests/acceptance/access/identity/entities/aliases/create-test.js
index 6f81e3398f349..d608e8d9957fc 100644
--- a/ui/tests/acceptance/access/identity/entities/aliases/create-test.js
+++ b/ui/tests/acceptance/access/identity/entities/aliases/create-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, skip, test } from 'qunit';
 import { settled } from '@ember/test-helpers';
 import { setupApplicationTest } from 'ember-qunit';
@@ -20,14 +15,14 @@ module('Acceptance | /access/identity/entities/aliases/add', function (hooks) {
 
   skip('it allows create, list, delete of an entity alias', async function (assert) {
     assert.expect(6);
-    const name = `alias-${Date.now()}`;
+    let name = `alias-${Date.now()}`;
     await testAliasCRUD(name, 'entities', assert);
     await settled();
   });
 
   test('it allows delete from the edit form', async function (assert) {
     assert.expect(4);
-    const name = `alias-${Date.now()}`;
+    let name = `alias-${Date.now()}`;
     await testAliasDeleteFromForm(name, 'entities', assert);
     await settled();
   });
diff --git a/ui/tests/acceptance/access/identity/entities/create-test.js b/ui/tests/acceptance/access/identity/entities/create-test.js
index 86589f136d0b2..458c59e17e5ec 100644
--- a/ui/tests/acceptance/access/identity/entities/create-test.js
+++ b/ui/tests/acceptance/access/identity/entities/create-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { currentRouteName } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
@@ -19,7 +14,7 @@ module('Acceptance | /access/identity/entities/create', function (hooks) {
 
   test('it visits the correct page', async function (assert) {
     await page.visit({ item_type: 'entities' });
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.identity.create',
       'navigates to the correct route'
@@ -28,13 +23,13 @@ module('Acceptance | /access/identity/entities/create', function (hooks) {
 
   test('it allows create, list, delete of an entity', async function (assert) {
     assert.expect(6);
-    const name = `entity-${Date.now()}`;
+    let name = `entity-${Date.now()}`;
     await testCRUD(name, 'entities', assert);
   });
 
   test('it can be deleted from the edit form', async function (assert) {
     assert.expect(6);
-    const name = `entity-${Date.now()}`;
+    let name = `entity-${Date.now()}`;
     await testDeleteFromForm(name, 'entities', assert);
   });
 });
diff --git a/ui/tests/acceptance/access/identity/entities/index-test.js b/ui/tests/acceptance/access/identity/entities/index-test.js
index 79dbbfe3125f1..dc1aab887b0aa 100644
--- a/ui/tests/acceptance/access/identity/entities/index-test.js
+++ b/ui/tests/acceptance/access/identity/entities/index-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { currentRouteName } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
@@ -18,19 +13,11 @@ module('Acceptance | /access/identity/entities', function (hooks) {
 
   test('it renders the entities page', async function (assert) {
     await page.visit({ item_type: 'entities' });
-    assert.strictEqual(
-      currentRouteName(),
-      'vault.cluster.access.identity.index',
-      'navigates to the correct route'
-    );
+    assert.equal(currentRouteName(), 'vault.cluster.access.identity.index', 'navigates to the correct route');
   });
 
   test('it renders the groups page', async function (assert) {
     await page.visit({ item_type: 'groups' });
-    assert.strictEqual(
-      currentRouteName(),
-      'vault.cluster.access.identity.index',
-      'navigates to the correct route'
-    );
+    assert.equal(currentRouteName(), 'vault.cluster.access.identity.index', 'navigates to the correct route');
   });
 });
diff --git a/ui/tests/acceptance/access/identity/groups/aliases/create-test.js b/ui/tests/acceptance/access/identity/groups/aliases/create-test.js
index 486464ada2fd0..b7a09d458a1e9 100644
--- a/ui/tests/acceptance/access/identity/groups/aliases/create-test.js
+++ b/ui/tests/acceptance/access/identity/groups/aliases/create-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, skip, test } from 'qunit';
 import { settled } from '@ember/test-helpers';
 import { setupApplicationTest } from 'ember-qunit';
@@ -20,7 +15,7 @@ module('Acceptance | /access/identity/groups/aliases/add', function (hooks) {
   skip('it allows create, list, delete of an entity alias', async function (assert) {
     // TODO figure out what is wrong with this test
     assert.expect(6);
-    const name = `alias-${Date.now()}`;
+    let name = `alias-${Date.now()}`;
     await testAliasCRUD(name, 'groups', assert);
     await settled();
   });
@@ -28,7 +23,7 @@ module('Acceptance | /access/identity/groups/aliases/add', function (hooks) {
   test('it allows delete from the edit form', async function (assert) {
     // TODO figure out what is wrong with this test
     assert.expect(4);
-    const name = `alias-${Date.now()}`;
+    let name = `alias-${Date.now()}`;
     await testAliasDeleteFromForm(name, 'groups', assert);
     await settled();
   });
diff --git a/ui/tests/acceptance/access/identity/groups/create-test.js b/ui/tests/acceptance/access/identity/groups/create-test.js
index 4e54bec85acba..5782d371712c5 100644
--- a/ui/tests/acceptance/access/identity/groups/create-test.js
+++ b/ui/tests/acceptance/access/identity/groups/create-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { currentRouteName } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
@@ -19,7 +14,7 @@ module('Acceptance | /access/identity/groups/create', function (hooks) {
 
   test('it visits the correct page', async function (assert) {
     await page.visit({ item_type: 'groups' });
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.identity.create',
       'navigates to the correct route'
@@ -28,13 +23,13 @@ module('Acceptance | /access/identity/groups/create', function (hooks) {
 
   test('it allows create, list, delete of an group', async function (assert) {
     assert.expect(6);
-    const name = `group-${Date.now()}`;
+    let name = `group-${Date.now()}`;
     await testCRUD(name, 'groups', assert);
   });
 
   test('it can be deleted from the group edit form', async function (assert) {
     assert.expect(6);
-    const name = `group-${Date.now()}`;
+    let name = `group-${Date.now()}`;
     await testDeleteFromForm(name, 'groups', assert);
   });
 });
diff --git a/ui/tests/acceptance/access/methods-test.js b/ui/tests/acceptance/access/methods-test.js
index b44d6f269208b..ebf314c8cdc15 100644
--- a/ui/tests/acceptance/access/methods-test.js
+++ b/ui/tests/acceptance/access/methods-test.js
@@ -1,74 +1,20 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { currentRouteName } from '@ember/test-helpers';
-import { clickTrigger } from 'ember-power-select/test-support/helpers';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
-import { create } from 'ember-cli-page-object';
 import page from 'vault/tests/pages/access/methods';
-import authEnable from 'vault/tests/pages/settings/auth/enable';
 import authPage from 'vault/tests/pages/auth';
-import ss from 'vault/tests/pages/components/search-select';
-import consoleClass from 'vault/tests/pages/components/console/ui-panel';
-
-import { v4 as uuidv4 } from 'uuid';
-
-const consoleComponent = create(consoleClass);
-const searchSelect = create(ss);
 
-module('Acceptance | auth-methods list view', function (hooks) {
+module('Acceptance | /access/', function (hooks) {
   setupApplicationTest(hooks);
 
   hooks.beforeEach(function () {
-    this.uid = uuidv4();
     return authPage.login();
   });
 
-  test('it navigates to auth method', async function (assert) {
-    await page.visit();
-    assert.strictEqual(currentRouteName(), 'vault.cluster.access.methods', 'navigates to the correct route');
-    assert.ok(page.methodsLink.isActive, 'the first link is active');
-    assert.strictEqual(page.methodsLink.text, 'Authentication methods');
-  });
-
-  test('it filters by name and auth type', async function (assert) {
-    assert.expect(4);
-    const authPath1 = `userpass-1-${this.uid}`;
-    const authPath2 = `userpass-2-${this.uid}`;
-    const type = 'userpass';
-    await authEnable.visit();
-    await authEnable.enable(type, authPath1);
-    await authEnable.visit();
-    await authEnable.enable(type, authPath2);
+  test('it navigates', async function (assert) {
     await page.visit();
-    // filter by auth type
-
-    await clickTrigger('#filter-by-auth-type');
-    await searchSelect.options.objectAt(0).click();
-
-    const rows = document.querySelectorAll('[data-test-auth-backend-link]');
-    const rowsUserpass = Array.from(rows).filter((row) => row.innerText.includes('userpass'));
-
-    assert.strictEqual(rows.length, rowsUserpass.length, 'all rows returned are userpass');
-
-    // filter by name
-    await clickTrigger('#filter-by-auth-name');
-    const firstItemToSelect = searchSelect.options.objectAt(0).text;
-    await searchSelect.options.objectAt(0).click();
-    const singleRow = document.querySelectorAll('[data-test-auth-backend-link]');
-
-    assert.strictEqual(singleRow.length, 1, 'returns only one row');
-    assert.dom(singleRow[0]).includesText(firstItemToSelect, 'shows the filtered by auth name');
-    // clear filter by engine name
-    await searchSelect.deleteButtons.objectAt(1).click();
-    const rowsAgain = document.querySelectorAll('[data-test-auth-backend-link]');
-    assert.ok(rowsAgain.length > 1, 'filter has been removed');
-
-    // cleanup
-    await consoleComponent.runCommands([`delete sys/auth/${authPath1}`]);
-    await consoleComponent.runCommands([`delete sys/auth/${authPath2}`]);
+    assert.equal(currentRouteName(), 'vault.cluster.access.methods', 'navigates to the correct route');
+    assert.ok(page.navLinks.objectAt(0).isActive, 'the first link is active');
+    assert.equal(page.navLinks.objectAt(0).text, 'Auth Methods');
   });
 });
diff --git a/ui/tests/acceptance/access/namespaces/index-test.js b/ui/tests/acceptance/access/namespaces/index-test.js
index 6a756a1888572..f3b4250eec2b1 100644
--- a/ui/tests/acceptance/access/namespaces/index-test.js
+++ b/ui/tests/acceptance/access/namespaces/index-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { currentRouteName } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
@@ -26,7 +21,7 @@ module('Acceptance | Enterprise | /access/namespaces', function (hooks) {
   test('it navigates to namespaces page', async function (assert) {
     assert.expect(1);
     await page.visit();
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.namespaces.index',
       'navigates to the correct route'
@@ -38,7 +33,7 @@ module('Acceptance | Enterprise | /access/namespaces', function (hooks) {
     await page.visit();
     const store = this.owner.lookup('service:store');
     // Default page size is 15
-    assert.strictEqual(store.peekAll('namespace').length, 15, 'Store has 15 namespaces records');
+    assert.equal(store.peekAll('namespace').length, 15, 'Store has 15 namespaces records');
     assert.dom('.list-item-row').exists({ count: 15 });
     assert.dom('[data-test-list-view-pagination]').exists();
   });
diff --git a/ui/tests/acceptance/api-explorer/index-test.js b/ui/tests/acceptance/api-explorer/index-test.js
index 1307110b9b0b0..daebfe8947f05 100644
--- a/ui/tests/acceptance/api-explorer/index-test.js
+++ b/ui/tests/acceptance/api-explorer/index-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { find, fillIn, visit, waitUntil } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
diff --git a/ui/tests/acceptance/auth-list-test.js b/ui/tests/acceptance/auth-list-test.js
index 05ac3f5698730..0244e2f5a7c0f 100644
--- a/ui/tests/acceptance/auth-list-test.js
+++ b/ui/tests/acceptance/auth-list-test.js
@@ -1,23 +1,22 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /* eslint qunit/no-conditional-assertions: "warn" */
-import { click, fillIn, settled, visit, triggerKeyEvent, find, waitUntil } from '@ember/test-helpers';
+import {
+  click,
+  findAll,
+  fillIn,
+  settled,
+  visit,
+  triggerEvent,
+  triggerKeyEvent,
+  find,
+  waitUntil,
+} from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
-import { v4 as uuidv4 } from 'uuid';
-
 import authPage from 'vault/tests/pages/auth';
 import logout from 'vault/tests/pages/logout';
 import enablePage from 'vault/tests/pages/settings/auth/enable';
 import { supportedAuthBackends } from 'vault/helpers/supported-auth-backends';
 import { supportedManagedAuthBackends } from 'vault/helpers/supported-managed-auth-backends';
-import { create } from 'ember-cli-page-object';
-import consoleClass from 'vault/tests/pages/components/console/ui-panel';
-
-const consoleComponent = create(consoleClass);
 
 module('Acceptance | auth backend list', function (hooks) {
   setupApplicationTest(hooks);
@@ -71,6 +70,17 @@ module('Acceptance | auth backend list', function (hooks) {
     await triggerKeyEvent('[data-test-input="username"]', 'keyup', 65);
     await fillIn('[data-test-textarea]', user2);
     await triggerKeyEvent('[data-test-textarea]', 'keyup', 65);
+    // test for modified helpText on generated token policies
+    await click('[data-test-toggle-group="Tokens"]');
+    let policyFormField = document.querySelector('[data-test-input="tokenPolicies"]');
+    let tooltipTrigger = policyFormField.querySelector('[data-test-tool-tip-trigger]');
+    await triggerEvent(tooltipTrigger, 'mouseenter');
+    assert
+      .dom('[data-test-info-tooltip-content]')
+      .hasText(
+        'Add policies that will apply to the generated token for this user. One policy per row.',
+        'Overwritten tooltip text displays in token form field.'
+      );
 
     await click('[data-test-save-config="true"]');
 
@@ -89,22 +99,24 @@ module('Acceptance | auth backend list', function (hooks) {
 
   test('auth methods are linkable and link to correct view', async function (assert) {
     assert.expect(16);
-    const uid = uuidv4();
+
     await visit('/vault/access');
 
-    const supportManaged = supportedManagedAuthBackends();
-    const backends = supportedAuthBackends();
-    for (const backend of backends) {
-      const { type } = backend;
-      const path = `auth-list-${type}-${uid}`;
+    let supportManaged = supportedManagedAuthBackends();
+    let backends = supportedAuthBackends();
+
+    for (let backend of backends) {
+      let { type } = backend;
+
       if (type !== 'token') {
-        await enablePage.enable(type, path);
+        await enablePage.enable(type, type);
       }
       await settled();
       await visit('/vault/access');
 
       // all auth methods should be linkable
-      await click(`[data-test-auth-backend-link="${type === 'token' ? type : path}"]`);
+      await click(`[data-test-auth-backend-link="${type}"]`);
+
       if (!supportManaged.includes(type)) {
         assert.dom('[data-test-auth-section-tab]').exists({ count: 1 });
         assert
@@ -112,15 +124,12 @@ module('Acceptance | auth backend list', function (hooks) {
           .hasText('Configuration', `only shows configuration tab for ${type} auth method`);
         assert.dom('[data-test-doc-link] .doc-link').exists(`includes doc link for ${type} auth method`);
       } else {
-        let expectedTabs = 2;
-        if (type == 'ldap' || type === 'okta') {
-          expectedTabs = 3;
-        }
-        assert
-          .dom('[data-test-auth-section-tab]')
-          .exists({ count: expectedTabs }, `has management tabs for ${type} auth method`);
-        // cleanup method
-        await consoleComponent.runCommands(`delete sys/auth/${path}`);
+        // managed auth methods should have more than 1 tab
+        assert.notEqual(
+          findAll('[data-test-auth-section-tab]').length,
+          1,
+          `has management tabs for ${type} auth method`
+        );
       }
     }
   });
diff --git a/ui/tests/acceptance/auth-test.js b/ui/tests/acceptance/auth-test.js
index 5496b5c43d386..fb4ce4365a471 100644
--- a/ui/tests/acceptance/auth-test.js
+++ b/ui/tests/acceptance/auth-test.js
@@ -1,20 +1,18 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /* eslint qunit/no-conditional-assertions: "warn" */
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
 import sinon from 'sinon';
-import { click, currentURL, visit, waitUntil, find } from '@ember/test-helpers';
+import { click, currentURL, visit, settled } from '@ember/test-helpers';
 import { supportedAuthBackends } from 'vault/helpers/supported-auth-backends';
 import authForm from '../pages/components/auth-form';
 import jwtForm from '../pages/components/auth-jwt';
 import { create } from 'ember-cli-page-object';
 import apiStub from 'vault/tests/helpers/noop-all-api-requests';
+import authPage from 'vault/tests/pages/auth';
 import logout from 'vault/tests/pages/logout';
+import consoleClass from 'vault/tests/pages/components/console/ui-panel';
 
+const consoleComponent = create(consoleClass);
 const component = create(authForm);
 const jwtComponent = create(jwtForm);
 
@@ -37,13 +35,13 @@ module('Acceptance | auth', function (hooks) {
   });
 
   test('auth query params', async function (assert) {
-    const backends = supportedAuthBackends();
+    let backends = supportedAuthBackends();
     assert.expect(backends.length + 1);
     await visit('/vault/auth');
-    assert.strictEqual(currentURL(), '/vault/auth?with=token');
-    for (const backend of backends.reverse()) {
+    assert.equal(currentURL(), '/vault/auth?with=token');
+    for (let backend of backends.reverse()) {
       await component.selectMethod(backend.type);
-      assert.strictEqual(
+      assert.equal(
         currentURL(),
         `/vault/auth?with=${backend.type}`,
         `has the correct URL for ${backend.type}`
@@ -53,17 +51,17 @@ module('Acceptance | auth', function (hooks) {
 
   test('it clears token when changing selected auth method', async function (assert) {
     await visit('/vault/auth');
-    assert.strictEqual(currentURL(), '/vault/auth?with=token');
+    assert.equal(currentURL(), '/vault/auth?with=token');
     await component.token('token').selectMethod('github');
     await component.selectMethod('token');
-    assert.strictEqual(component.tokenValue, '', 'it clears the token value when toggling methods');
+    assert.equal(component.tokenValue, '', 'it clears the token value when toggling methods');
   });
 
   test('it sends the right attributes when authenticating', async function (assert) {
     assert.expect(8);
-    const backends = supportedAuthBackends();
+    let backends = supportedAuthBackends();
     await visit('/vault/auth');
-    for (const backend of backends.reverse()) {
+    for (let backend of backends.reverse()) {
       await component.selectMethod(backend.type);
       if (backend.type === 'github') {
         await component.token('token');
@@ -72,7 +70,7 @@ module('Acceptance | auth', function (hooks) {
         await jwtComponent.role('test');
       }
       await component.login();
-      const lastRequest = this.server.passthroughRequests[this.server.passthroughRequests.length - 1];
+      let lastRequest = this.server.passthroughRequests[this.server.passthroughRequests.length - 1];
       let body = JSON.parse(lastRequest.requestBody);
       // Note: x-vault-token used to be lowercase prior to upgrade
       if (backend.type === 'token') {
@@ -83,7 +81,7 @@ module('Acceptance | auth', function (hooks) {
       } else if (backend.type === 'github') {
         assert.ok(Object.keys(body).includes('token'), 'GitHub includes token');
       } else if (backend.type === 'jwt' || backend.type === 'oidc') {
-        const authReq = this.server.passthroughRequests[this.server.passthroughRequests.length - 2];
+        let authReq = this.server.passthroughRequests[this.server.passthroughRequests.length - 2];
         body = JSON.parse(authReq.requestBody);
         assert.ok(Object.keys(body).includes('role'), `${backend.type} includes role`);
       } else {
@@ -92,19 +90,32 @@ module('Acceptance | auth', function (hooks) {
     }
   });
 
-  test('it shows the push notification warning after submit', async function (assert) {
-    assert.expect(1);
+  test('it shows the token warning beacon on the menu', async function (assert) {
+    let authService = this.owner.lookup('service:auth');
+    await authPage.login();
+    await settled();
+    await consoleComponent.runCommands([
+      'write -field=client_token auth/token/create policies=default ttl=1h',
+    ]);
+    let token = consoleComponent.lastTextOutput;
+    await logout.visit();
+    await settled();
+    await authPage.login(token);
+    await settled();
+    this.clock.tick(authService.IDLE_TIMEOUT);
+    authService.shouldRenew();
+    await settled();
+    assert.dom('[data-test-allow-expiration]').exists('shows expiration beacon');
 
-    this.server.get('/v1/auth/token/lookup-self', async () => {
-      assert.ok(
-        await waitUntil(() => find('[data-test-auth-message="push"]')),
-        'shows push notification message'
-      );
-      return [204, { 'Content-Type': 'application/json' }, JSON.stringify({})];
-    });
+    await visit('/vault/access');
 
+    assert.dom('[data-test-allow-expiration]').doesNotExist('hides beacon when the api is used again');
+  });
+
+  test('it shows the push notification warning after submit', async function (assert) {
     await visit('/vault/auth');
     await component.selectMethod('token');
     await click('[data-test-auth-submit]');
+    assert.dom('[data-test-auth-message="push"]').exists('shows push notification message');
   });
 });
diff --git a/ui/tests/acceptance/aws-test.js b/ui/tests/acceptance/aws-test.js
index ef46972c7540c..d8d25a0e20c7b 100644
--- a/ui/tests/acceptance/aws-test.js
+++ b/ui/tests/acceptance/aws-test.js
@@ -1,13 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { click, fillIn, findAll, currentURL, find, settled, waitUntil } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
-import { v4 as uuidv4 } from 'uuid';
-
 import authPage from 'vault/tests/pages/auth';
 import logout from 'vault/tests/pages/logout';
 import enablePage from 'vault/tests/pages/settings/mount-secret-backend';
@@ -16,7 +9,6 @@ module('Acceptance | aws secret backend', function (hooks) {
   setupApplicationTest(hooks);
 
   hooks.beforeEach(function () {
-    this.uid = uuidv4();
     return authPage.login();
   });
 
@@ -35,8 +27,8 @@ module('Acceptance | aws secret backend', function (hooks) {
     ],
   };
   test('aws backend', async function (assert) {
-    assert.expect(12);
-    const path = `aws-${this.uid}`;
+    const now = new Date().getTime();
+    const path = `aws-${now}`;
     const roleName = 'awsrole';
 
     await enablePage.enable('aws', path);
@@ -45,7 +37,7 @@ module('Acceptance | aws secret backend', function (hooks) {
 
     await click('[data-test-secret-backend-configure]');
 
-    assert.strictEqual(currentURL(), `/vault/settings/secrets/configure/${path}`);
+    assert.equal(currentURL(), `/vault/settings/secrets/configure/${path}`);
     assert.ok(findAll('[data-test-aws-root-creds-form]').length, 'renders the empty root creds form');
     assert.ok(findAll('[data-test-aws-link="root-creds"]').length, 'renders the root creds link');
     assert.ok(findAll('[data-test-aws-link="leases"]').length, 'renders the leases config link');
@@ -71,7 +63,7 @@ module('Acceptance | aws secret backend', function (hooks) {
 
     await click('[data-test-backend-view-link]');
 
-    assert.strictEqual(currentURL(), `/vault/secrets/${path}/list`, `navigates to the roles list`);
+    assert.equal(currentURL(), `/vault/secrets/${path}/list`, `navigates to the roles list`);
 
     await click('[data-test-secret-create]');
 
@@ -87,7 +79,7 @@ module('Acceptance | aws secret backend', function (hooks) {
     // save the role
     await click('[data-test-role-aws-create]');
     await waitUntil(() => currentURL() === `/vault/secrets/${path}/show/${roleName}`); // flaky without this
-    assert.strictEqual(
+    assert.equal(
       currentURL(),
       `/vault/secrets/${path}/show/${roleName}`,
       `$aws: navigates to the show page on creation`
@@ -95,14 +87,17 @@ module('Acceptance | aws secret backend', function (hooks) {
 
     await click('[data-test-secret-root-link]');
 
-    assert.strictEqual(currentURL(), `/vault/secrets/${path}/list`);
+    assert.equal(currentURL(), `/vault/secrets/${path}/list`);
     assert.ok(findAll(`[data-test-secret-link="${roleName}"]`).length, `aws: role shows in the list`);
 
     //and delete
-    await click(`[data-test-secret-link="${roleName}"] [data-test-popup-menu-trigger]`);
-    await waitUntil(() => find(`[data-test-aws-role-delete="${roleName}"]`)); // flaky without
-    await click(`[data-test-aws-role-delete="${roleName}"]`);
-    await click(`[data-test-confirm-button]`);
-    assert.dom(`[data-test-secret-link="${roleName}"]`).doesNotExist(`aws: role is no longer in the list`);
+    // TODO the button does not populate quickly enough.
+    // await click(`[data-test-secret-link="${roleName}"] [data-test-popup-menu-trigger]`);
+    // await settled();
+    // await click(`[data-test-aws-role-delete="${roleName}"]`);
+
+    // await click(`[data-test-confirm-button]`);
+    // await settled();
+    // assert.dom(`[data-test-secret-link="${roleName}"]`).doesNotExist(`aws: role is no longer in the list`);
   });
 });
diff --git a/ui/tests/acceptance/client-current-test.js b/ui/tests/acceptance/client-current-test.js
new file mode 100644
index 0000000000000..1c18f1c2bdbe6
--- /dev/null
+++ b/ui/tests/acceptance/client-current-test.js
@@ -0,0 +1,175 @@
+import { module, test } from 'qunit';
+import { visit, currentURL, settled, click } from '@ember/test-helpers';
+import { setupApplicationTest } from 'ember-qunit';
+import { setupMirage } from 'ember-cli-mirage/test-support';
+import ENV from 'vault/config/environment';
+import authPage from 'vault/tests/pages/auth';
+import { create } from 'ember-cli-page-object';
+import { clickTrigger } from 'ember-power-select/test-support/helpers';
+import ss from 'vault/tests/pages/components/search-select';
+import { overrideResponse, SELECTORS } from '../helpers/clients';
+
+const searchSelect = create(ss);
+
+module('Acceptance | clients current tab', function (hooks) {
+  setupApplicationTest(hooks);
+  setupMirage(hooks);
+
+  hooks.before(function () {
+    ENV['ember-cli-mirage'].handler = 'clients';
+  });
+
+  hooks.after(function () {
+    ENV['ember-cli-mirage'].handler = null;
+  });
+
+  hooks.beforeEach(function () {
+    return authPage.login();
+  });
+
+  test('shows empty state when config disabled, no data', async function (assert) {
+    assert.expect(3);
+    this.server.get('sys/internal/counters/config', () => {
+      return {
+        request_id: 'some-config-id',
+        data: {
+          default_report_months: 12,
+          enabled: 'default-disable',
+          retention_months: 24,
+        },
+      };
+    });
+    this.server.get('sys/internal/counters/activity/monthly', () => overrideResponse(204));
+    await visit('/vault/clients/current');
+    assert.equal(currentURL(), '/vault/clients/current');
+    assert.dom(SELECTORS.currentMonthActiveTab).hasText('Current month', 'current month tab is active');
+    assert.dom(SELECTORS.emptyStateTitle).hasText('Tracking is disabled');
+  });
+
+  test('shows empty state when config enabled, no data', async function (assert) {
+    assert.expect(3);
+    this.server.get('sys/internal/counters/activity/monthly', () => {
+      return {
+        request_id: 'some-monthly-id',
+        data: {
+          by_namespace: [],
+          clients: 0,
+          distinct_entities: 0,
+          entity_clients: 0,
+          months: [],
+          non_entity_clients: 0,
+          non_entity_tokens: 0,
+        },
+      };
+    });
+    await visit('/vault/clients/current');
+    assert.equal(currentURL(), '/vault/clients/current');
+    assert.dom(SELECTORS.currentMonthActiveTab).hasText('Current month', 'current month tab is active');
+    assert.dom(SELECTORS.emptyStateTitle).hasText('No data received');
+  });
+
+  test('filters correctly on current with full data', async function (assert) {
+    assert.expect(27);
+    await visit('/vault/clients/current');
+    assert.equal(currentURL(), '/vault/clients/current');
+    assert.dom(SELECTORS.currentMonthActiveTab).hasText('Current month', 'current month tab is active');
+    assert.dom(SELECTORS.usageStats).exists('usage stats block exists');
+    assert.dom('[data-test-stat-text-container]').exists({ count: 3 }, '3 stat texts exist');
+
+    // TODO update with dynamic counts
+    assert.dom('[data-test-stat-text="total-clients"] .stat-value').hasText('175');
+    assert.dom('[data-test-stat-text="entity-clients"] .stat-value').hasText('132');
+    assert.dom('[data-test-stat-text="non-entity-clients"] .stat-value').hasText('43');
+    assert.dom('[data-test-clients-attribution]').exists('Shows attribution area');
+    assert.dom('[data-test-chart-container="new-clients"]').doesNotExist();
+    await settled();
+
+    // FILTER BY NAMESPACE
+    await clickTrigger();
+    await searchSelect.options.objectAt(0).click();
+    await settled();
+    assert.dom('[data-test-stat-text="total-clients"] .stat-value').hasText('100');
+    assert.dom('[data-test-stat-text="entity-clients"] .stat-value').hasText('85');
+    assert.dom('[data-test-stat-text="non-entity-clients"] .stat-value').hasText('15');
+    assert.dom('[data-test-chart-container="new-clients"]').doesNotExist();
+    await settled();
+
+    // FILTER BY AUTH METHOD
+    await clickTrigger();
+    await searchSelect.options.objectAt(0).click();
+    await settled();
+
+    assert.dom('[data-test-stat-text="total-clients"] .stat-value').hasText('35');
+    assert.dom('[data-test-stat-text="entity-clients"] .stat-value').hasText('20');
+    assert.dom('[data-test-stat-text="non-entity-clients"] .stat-value').hasText('15');
+    assert.dom(SELECTORS.attributionBlock).doesNotExist('Does not show attribution block');
+
+    // Delete auth filter goes back to filtered only on namespace
+    await click('#auth-method-search-select [data-test-selected-list-button="delete"]');
+
+    assert.dom('[data-test-stat-text="total-clients"] .stat-value').hasText('100');
+    assert.dom('[data-test-stat-text="entity-clients"] .stat-value').hasText('85');
+    assert.dom('[data-test-stat-text="non-entity-clients"] .stat-value').hasText('15');
+    await settled();
+    assert.dom('[data-test-chart-container="new-clients"]').doesNotExist();
+    assert.dom(SELECTORS.attributionBlock).exists('Still shows attribution block');
+    await clickTrigger();
+    await searchSelect.options.objectAt(0).click();
+    await settled();
+    // Delete namespace filter with auth filter on
+    await click('#namespace-search-select-monthly [data-test-selected-list-button="delete"]');
+    // Goes back to no filters
+    // TODO update with dynamic counts
+    assert.dom('[data-test-stat-text="total-clients"] .stat-value').hasText('175');
+    assert.dom('[data-test-stat-text="entity-clients"] .stat-value').hasText('132');
+    assert.dom('[data-test-stat-text="non-entity-clients"] .stat-value').hasText('43');
+    assert.dom('[data-test-chart-container="new-clients"]').doesNotExist();
+    assert.dom('[data-test-chart-container="new-clients"] [data-test-empty-state-subtext]').doesNotExist();
+  });
+
+  test('filters correctly on current with no auth mounts', async function (assert) {
+    assert.expect(16);
+    await visit('/vault/clients/current');
+    assert.equal(currentURL(), '/vault/clients/current');
+    assert.dom(SELECTORS.currentMonthActiveTab).hasText('Current month', 'current month tab is active');
+    assert.dom(SELECTORS.usageStats).exists('usage stats block exists');
+    assert.dom('[data-test-stat-text-container]').exists({ count: 3 }, '3 stat texts exist');
+    // TODO CMB update with dynamic data
+    assert.dom('[data-test-stat-text="total-clients"] .stat-value').hasText('175');
+    assert.dom('[data-test-stat-text="entity-clients"] .stat-value').hasText('132');
+    assert.dom('[data-test-stat-text="non-entity-clients"] .stat-value').hasText('43');
+    assert.dom('[data-test-clients-attribution]').exists('Shows attribution area');
+    assert.dom('[data-test-chart-container="new-clients"]').doesNotExist();
+
+    // Filter by namespace
+    await clickTrigger();
+    await searchSelect.options.objectAt(0).click();
+    await settled();
+
+    assert.dom('[data-test-stat-text="total-clients"] .stat-value').hasText('100');
+    assert.dom('[data-test-stat-text="entity-clients"] .stat-value').hasText('85');
+    assert.dom('[data-test-stat-text="non-entity-clients"] .stat-value').hasText('15');
+
+    // TODO add month data without mounts
+    // assert.dom(SELECTORS.attributionBlock).doesNotExist('Does not show attribution');
+    // assert.dom('#auth-method-search-select').doesNotExist('Auth method filter is not shown');
+
+    // Remove namespace filter
+    await click('#namespace-search-select-monthly [data-test-selected-list-button="delete"]');
+
+    // Goes back to no filters
+    assert.dom('[data-test-stat-text="total-clients"] .stat-value').hasText('175');
+    assert.dom('[data-test-stat-text="entity-clients"] .stat-value').hasText('132');
+    assert.dom('[data-test-stat-text="non-entity-clients"] .stat-value').hasText('43');
+    assert.dom('[data-test-chart-container="new-clients"]').doesNotExist();
+  });
+
+  test('shows correct empty state when config off but no read on config', async function (assert) {
+    assert.expect(2);
+    this.server.get('sys/internal/counters/activity/monthly', () => overrideResponse(204));
+    this.server.get('sys/internal/counters/config', () => overrideResponse(403));
+    await visit('/vault/clients/current');
+    assert.dom(SELECTORS.filterBar).doesNotExist('Filter bar is not shown');
+    assert.dom(SELECTORS.emptyStateTitle).containsText('No data available', 'Shows no data empty state');
+  });
+});
diff --git a/ui/tests/acceptance/client-dashboard-test.js b/ui/tests/acceptance/client-dashboard-test.js
deleted file mode 100644
index 6da39877e5a86..0000000000000
--- a/ui/tests/acceptance/client-dashboard-test.js
+++ /dev/null
@@ -1,393 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import sinon from 'sinon';
-import { visit, currentURL, click, findAll, find, settled } from '@ember/test-helpers';
-import { setupApplicationTest } from 'ember-qunit';
-import authPage from 'vault/tests/pages/auth';
-import { addMonths, formatRFC3339, startOfMonth, subMonths } from 'date-fns';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import ENV from 'vault/config/environment';
-import { SELECTORS, overrideResponse } from '../helpers/clients';
-import { create } from 'ember-cli-page-object';
-import ss from 'vault/tests/pages/components/search-select';
-import { clickTrigger } from 'ember-power-select/test-support/helpers';
-import { ARRAY_OF_MONTHS } from 'core/utils/date-formatters';
-import { formatNumber } from 'core/helpers/format-number';
-import timestamp from 'core/utils/timestamp';
-
-const searchSelect = create(ss);
-
-const STATIC_NOW = new Date('2023-01-13T14:15:00');
-// for testing, we're in the middle of a license/billing period
-const LICENSE_START = startOfMonth(subMonths(STATIC_NOW, 6)); // 2022-07-01
-// upgrade happened 1 month after license start
-const UPGRADE_DATE = addMonths(LICENSE_START, 1); // 2022-08-01
-
-module('Acceptance | client counts dashboard tab', function (hooks) {
-  setupApplicationTest(hooks);
-  setupMirage(hooks);
-
-  hooks.before(function () {
-    sinon.stub(timestamp, 'now').callsFake(() => STATIC_NOW);
-    ENV['ember-cli-mirage'].handler = 'clients';
-  });
-
-  hooks.beforeEach(function () {
-    this.store = this.owner.lookup('service:store');
-  });
-
-  hooks.after(function () {
-    timestamp.now.restore();
-    ENV['ember-cli-mirage'].handler = null;
-  });
-
-  hooks.beforeEach(function () {
-    return authPage.login();
-  });
-
-  test('shows warning when config off, no data', async function (assert) {
-    assert.expect(4);
-    this.server.get('sys/internal/counters/activity', () => overrideResponse(204));
-    this.server.get('sys/internal/counters/config', () => {
-      return {
-        request_id: 'some-config-id',
-        data: {
-          default_report_months: 12,
-          enabled: 'default-disable',
-          queries_available: false,
-          retention_months: 24,
-        },
-      };
-    });
-    await visit('/vault/clients/dashboard');
-    assert.strictEqual(currentURL(), '/vault/clients/dashboard');
-    assert.dom(SELECTORS.dashboardActiveTab).hasText('Dashboard', 'dashboard tab is active');
-    assert.dom(SELECTORS.emptyStateTitle).hasText('Data tracking is disabled');
-    assert.dom(SELECTORS.filterBar).doesNotExist('Filter bar is hidden when no data available');
-  });
-
-  test('shows empty state when config enabled and no data', async function (assert) {
-    assert.expect(4);
-    this.server.get('sys/internal/counters/activity', () => overrideResponse(204));
-    this.server.get('sys/internal/counters/config', () => {
-      return {
-        request_id: 'some-config-id',
-        data: {
-          default_report_months: 12,
-          enabled: 'default-enable',
-          retention_months: 24,
-        },
-      };
-    });
-    await visit('/vault/clients/dashboard');
-    assert.strictEqual(currentURL(), '/vault/clients/dashboard');
-    assert.dom(SELECTORS.dashboardActiveTab).hasText('Dashboard', 'dashboard tab is active');
-    assert.dom(SELECTORS.emptyStateTitle).hasTextContaining('No data received');
-    assert.dom(SELECTORS.filterBar).doesNotExist('Does not show filter bar');
-  });
-
-  test('visiting dashboard tab config on and data with mounts', async function (assert) {
-    assert.expect(8);
-    await visit('/vault/clients/dashboard');
-    assert.strictEqual(currentURL(), '/vault/clients/dashboard');
-    assert
-      .dom(SELECTORS.dateDisplay)
-      .hasText('July 2022', 'billing start month is correctly parsed from license');
-    assert
-      .dom(SELECTORS.rangeDropdown)
-      .hasText(`Jul 2022 - Jan 2023`, 'Date range shows dates correctly parsed activity response');
-    assert.dom(SELECTORS.attributionBlock).exists('Shows attribution area');
-    assert.dom(SELECTORS.monthlyUsageBlock).exists('Shows monthly usage block');
-    assert
-      .dom(SELECTORS.runningTotalMonthlyCharts)
-      .exists('Shows running totals with monthly breakdown charts');
-    assert
-      .dom(find('[data-test-line-chart="x-axis-labels"] g.tick text'))
-      .hasText(`7/22`, 'x-axis labels start with billing start date');
-    assert.strictEqual(
-      findAll('[data-test-line-chart="plot-point"]').length,
-      6,
-      `line chart plots 6 points to match query`
-    );
-  });
-
-  test('updates correctly when querying date ranges', async function (assert) {
-    assert.expect(27);
-    await visit('/vault/clients/dashboard');
-    assert.strictEqual(currentURL(), '/vault/clients/dashboard');
-    // query for single, historical month with no new counts
-    await click(SELECTORS.rangeDropdown);
-    await click('[data-test-show-calendar]');
-    if (parseInt(find('[data-test-display-year]').innerText) > LICENSE_START.getFullYear()) {
-      await click('[data-test-previous-year]');
-    }
-    await click(find(`[data-test-calendar-month=${ARRAY_OF_MONTHS[LICENSE_START.getMonth()]}]`));
-    assert.dom('[data-test-usage-stats]').exists('total usage stats show');
-    assert
-      .dom(SELECTORS.runningTotalMonthStats)
-      .doesNotExist('running total single month stat boxes do not show');
-    assert
-      .dom(SELECTORS.runningTotalMonthlyCharts)
-      .doesNotExist('running total month over month charts do not show');
-    assert.dom(SELECTORS.monthlyUsageBlock).doesNotExist('does not show monthly usage block');
-    assert.dom(SELECTORS.attributionBlock).exists('attribution area shows');
-    assert
-      .dom('[data-test-chart-container="new-clients"] [data-test-component="empty-state"]')
-      .exists('new client attribution has empty state');
-    assert
-      .dom('[data-test-empty-state-subtext]')
-      .hasText('There are no new clients for this namespace during this time period.    ');
-    assert.dom('[data-test-chart-container="total-clients"]').exists('total client attribution chart shows');
-
-    // reset to billing period
-    await click(SELECTORS.rangeDropdown);
-    await click('[data-test-current-billing-period]');
-
-    // change billing start to month/year of first upgrade
-    await click('[data-test-start-date-editor] button');
-    await click(SELECTORS.monthDropdown);
-    await click(`[data-test-dropdown-month="${ARRAY_OF_MONTHS[UPGRADE_DATE.getMonth()]}"]`);
-    await click(SELECTORS.yearDropdown);
-    await click(`[data-test-dropdown-year="${UPGRADE_DATE.getFullYear()}"]`);
-    await click('[data-test-date-dropdown-submit]');
-    assert.dom(SELECTORS.attributionBlock).exists('Shows attribution area');
-    assert.dom(SELECTORS.monthlyUsageBlock).exists('Shows monthly usage block');
-    assert
-      .dom(SELECTORS.runningTotalMonthlyCharts)
-      .exists('Shows running totals with monthly breakdown charts');
-    assert
-      .dom(find('[data-test-line-chart="x-axis-labels"] g.tick text'))
-      .hasText(`8/22`, 'x-axis labels start with updated billing start month');
-    assert.strictEqual(
-      findAll('[data-test-line-chart="plot-point"]').length,
-      6,
-      `line chart plots 6 points to match query`
-    );
-
-    // query three months ago (Oct 2022)
-    await click(SELECTORS.rangeDropdown);
-    await click('[data-test-show-calendar]');
-    await click('[data-test-previous-year]');
-    await click(find(`[data-test-calendar-month="October"]`));
-
-    assert.dom(SELECTORS.attributionBlock).exists('Shows attribution area');
-    assert.dom(SELECTORS.monthlyUsageBlock).exists('Shows monthly usage block');
-    assert
-      .dom(SELECTORS.runningTotalMonthlyCharts)
-      .exists('Shows running totals with monthly breakdown charts');
-    assert.strictEqual(
-      findAll('[data-test-line-chart="plot-point"]').length,
-      3,
-      `line chart plots 3 points to match query`
-    );
-    const xAxisLabels = findAll('[data-test-line-chart="x-axis-labels"] g.tick text');
-    assert
-      .dom(xAxisLabels[xAxisLabels.length - 1])
-      .hasText(`10/22`, 'x-axis labels end with queried end month');
-
-    // query for single, historical month (upgrade month)
-    await click(SELECTORS.rangeDropdown);
-    await click('[data-test-show-calendar]');
-    assert.dom('[data-test-display-year]').hasText('2022');
-    await click(find(`[data-test-calendar-month="August"]`));
-
-    assert.dom(SELECTORS.runningTotalMonthStats).exists('running total single month stat boxes show');
-    assert
-      .dom(SELECTORS.runningTotalMonthlyCharts)
-      .doesNotExist('running total month over month charts do not show');
-    assert.dom(SELECTORS.monthlyUsageBlock).doesNotExist('Does not show monthly usage block');
-    assert.dom(SELECTORS.attributionBlock).exists('attribution area shows');
-    assert.dom('[data-test-chart-container="new-clients"]').exists('new client attribution chart shows');
-    assert.dom('[data-test-chart-container="total-clients"]').exists('total client attribution chart shows');
-
-    // reset to billing period
-    await click(SELECTORS.rangeDropdown);
-    await click('[data-test-current-billing-period]');
-    // query month older than count start date
-    await click('[data-test-start-date-editor] button');
-    await click(SELECTORS.monthDropdown);
-    await click(`[data-test-dropdown-month="${ARRAY_OF_MONTHS[LICENSE_START.getMonth()]}"]`);
-    await click(SELECTORS.yearDropdown);
-    await click(`[data-test-dropdown-year="${LICENSE_START.getFullYear() - 3}"]`);
-    await click('[data-test-date-dropdown-submit]');
-    assert
-      .dom('[data-test-alert-banner="alert"]')
-      .hasTextContaining(
-        `We only have data from January 2022`,
-        'warning banner displays that date queried was prior to count start date'
-      );
-  });
-
-  test('dashboard filters correctly with full data', async function (assert) {
-    assert.expect(21);
-    await visit('/vault/clients/dashboard');
-    assert.strictEqual(currentURL(), '/vault/clients/dashboard', 'clients/dashboard URL is correct');
-    assert.dom(SELECTORS.dashboardActiveTab).hasText('Dashboard', 'dashboard tab is active');
-    assert
-      .dom(SELECTORS.runningTotalMonthlyCharts)
-      .exists('Shows running totals with monthly breakdown charts');
-    assert.dom(SELECTORS.attributionBlock).exists('Shows attribution area');
-    assert.dom(SELECTORS.monthlyUsageBlock).exists('Shows monthly usage block');
-    const response = await this.store.peekRecord('clients/activity', 'some-activity-id');
-
-    // FILTER BY NAMESPACE
-    await clickTrigger();
-    await searchSelect.options.objectAt(0).click();
-    await settled();
-    const topNamespace = response.byNamespace[0];
-    const topMount = topNamespace.mounts[0];
-    assert.ok(true, 'Filter by first namespace');
-    assert.strictEqual(
-      find(SELECTORS.selectedNs).innerText.toLowerCase(),
-      topNamespace.label,
-      'selects top namespace'
-    );
-    assert.dom('[data-test-top-attribution]').includesText('Top auth method');
-    assert
-      .dom('[data-test-running-total-entity] p')
-      .includesText(`${formatNumber([topNamespace.entity_clients])}`, 'total entity clients is accurate');
-    assert
-      .dom('[data-test-running-total-nonentity] p')
-      .includesText(
-        `${formatNumber([topNamespace.non_entity_clients])}`,
-        'total non-entity clients is accurate'
-      );
-    assert
-      .dom('[data-test-attribution-clients] p')
-      .includesText(`${formatNumber([topMount.clients])}`, 'top attribution clients accurate');
-
-    // FILTER BY AUTH METHOD
-    await clickTrigger();
-    await searchSelect.options.objectAt(0).click();
-    await settled();
-    assert.ok(true, 'Filter by first auth method');
-    assert.strictEqual(
-      find(SELECTORS.selectedAuthMount).innerText.toLowerCase(),
-      topMount.label,
-      'selects top mount'
-    );
-    assert
-      .dom('[data-test-running-total-entity] p')
-      .includesText(`${formatNumber([topMount.entity_clients])}`, 'total entity clients is accurate');
-    assert
-      .dom('[data-test-running-total-nonentity] p')
-      .includesText(`${formatNumber([topMount.non_entity_clients])}`, 'total non-entity clients is accurate');
-    assert.dom(SELECTORS.attributionBlock).doesNotExist('Does not show attribution block');
-
-    await click('#namespace-search-select [data-test-selected-list-button="delete"]');
-    assert.ok(true, 'Remove namespace filter without first removing auth method filter');
-    assert.dom('[data-test-top-attribution]').includesText('Top namespace');
-    assert
-      .dom('[data-test-running-total-entity]')
-      .hasTextContaining(
-        `${formatNumber([response.total.entity_clients])}`,
-        'total entity clients is back to unfiltered value'
-      );
-    assert
-      .dom('[data-test-running-total-nonentity]')
-      .hasTextContaining(
-        `${formatNumber([formatNumber([response.total.non_entity_clients])])}`,
-        'total non-entity clients is back to unfiltered value'
-      );
-    assert
-      .dom('[data-test-attribution-clients]')
-      .hasTextContaining(
-        `${formatNumber([topNamespace.clients])}`,
-        'top attribution clients back to unfiltered value'
-      );
-  });
-
-  test('shows warning if upgrade happened within license period', async function (assert) {
-    assert.expect(3);
-    this.server.get('sys/version-history', function () {
-      return {
-        data: {
-          keys: ['1.9.0', '1.9.1', '1.9.2', '1.10.1'],
-          key_info: {
-            '1.9.0': {
-              previous_version: null,
-              timestamp_installed: formatRFC3339(subMonths(UPGRADE_DATE, 4)),
-            },
-            '1.9.1': {
-              previous_version: '1.9.0',
-              timestamp_installed: formatRFC3339(subMonths(UPGRADE_DATE, 3)),
-            },
-            '1.9.2': {
-              previous_version: '1.9.1',
-              timestamp_installed: formatRFC3339(subMonths(UPGRADE_DATE, 2)),
-            },
-            '1.10.1': {
-              previous_version: '1.9.2',
-              timestamp_installed: formatRFC3339(UPGRADE_DATE),
-            },
-          },
-        },
-      };
-    });
-    await visit('/vault/clients/dashboard');
-    assert.strictEqual(currentURL(), '/vault/clients/dashboard', 'clients/dashboard URL is correct');
-    assert.dom(SELECTORS.dashboardActiveTab).hasText('Dashboard', 'dashboard tab is active');
-    assert
-      .dom('[data-test-alert-banner="alert"]')
-      .hasTextContaining(
-        `Warning Vault was upgraded to 1.10.1 on Aug 1, 2022. We added monthly breakdowns and mount level attribution starting in 1.10, so keep that in mind when looking at the data. Learn more here.`
-      );
-  });
-
-  test('Shows empty if license start date is current month', async function (assert) {
-    // TODO cmb update to reflect new behavior
-    const licenseStart = STATIC_NOW;
-    const licenseEnd = addMonths(licenseStart, 12);
-    this.server.get('sys/license/status', function () {
-      return {
-        request_id: 'my-license-request-id',
-        data: {
-          autoloaded: {
-            license_id: 'my-license-id',
-            start_time: formatRFC3339(licenseStart),
-            expiration_time: formatRFC3339(licenseEnd),
-          },
-        },
-      };
-    });
-    await visit('/vault/clients/dashboard');
-    assert.strictEqual(currentURL(), '/vault/clients/dashboard', 'clients/dashboard URL is correct');
-    assert.dom(SELECTORS.emptyStateTitle).doesNotExist('No data for this billing period');
-  });
-
-  test('shows correct interface if no permissions on license', async function (assert) {
-    this.server.get('/sys/license/status', () => overrideResponse(403));
-    await visit('/vault/clients/dashboard');
-    assert.strictEqual(currentURL(), '/vault/clients/dashboard', 'clients/dashboard URL is correct');
-    assert.dom(SELECTORS.dashboardActiveTab).hasText('Dashboard', 'dashboard tab is active');
-    // Message changes depending on ent or OSS
-    assert.dom(SELECTORS.emptyStateTitle).exists('Empty state exists');
-    assert.dom(SELECTORS.monthDropdown).exists('Dropdown exists to select month');
-    assert.dom(SELECTORS.yearDropdown).exists('Dropdown exists to select year');
-  });
-
-  test('shows error template if permissions denied querying activity response with no data', async function (assert) {
-    this.server.get('sys/license/status', () => overrideResponse(403));
-    this.server.get('sys/version-history', () => overrideResponse(403));
-    this.server.get('sys/internal/counters/config', () => overrideResponse(403));
-    this.server.get('sys/internal/counters/activity', () => overrideResponse(403));
-
-    await visit('/vault/clients/dashboard');
-    assert.strictEqual(currentURL(), '/vault/clients/dashboard', 'clients/dashboard URL is correct');
-    assert
-      .dom(SELECTORS.emptyStateTitle)
-      .includesText('start date found', 'Empty state shows no billing start date');
-    await click(SELECTORS.monthDropdown);
-    await click(this.element.querySelector('[data-test-month-list] button:not([disabled])'));
-    await click(SELECTORS.yearDropdown);
-    await click(this.element.querySelector('[data-test-year-list] button:not([disabled])'));
-    await click(SELECTORS.dateDropdownSubmit);
-    assert
-      .dom(SELECTORS.emptyStateTitle)
-      .hasText('You are not authorized', 'Empty state displays not authorized message');
-  });
-});
diff --git a/ui/tests/acceptance/client-history-test.js b/ui/tests/acceptance/client-history-test.js
new file mode 100644
index 0000000000000..c3e066349387b
--- /dev/null
+++ b/ui/tests/acceptance/client-history-test.js
@@ -0,0 +1,399 @@
+import { module, test } from 'qunit';
+import { visit, currentURL, click, findAll, find, settled } from '@ember/test-helpers';
+import { setupApplicationTest } from 'ember-qunit';
+import authPage from 'vault/tests/pages/auth';
+import { addMonths, format, formatRFC3339, startOfMonth, subMonths } from 'date-fns';
+import { setupMirage } from 'ember-cli-mirage/test-support';
+import ENV from 'vault/config/environment';
+import { SELECTORS, overrideResponse } from '../helpers/clients';
+import { create } from 'ember-cli-page-object';
+import ss from 'vault/tests/pages/components/search-select';
+import { clickTrigger } from 'ember-power-select/test-support/helpers';
+import { ARRAY_OF_MONTHS } from 'core/utils/date-formatters';
+
+const searchSelect = create(ss);
+
+const NEW_DATE = new Date();
+const LAST_MONTH = startOfMonth(subMonths(NEW_DATE, 1));
+const COUNTS_START = subMonths(NEW_DATE, 12); // pretend vault user started cluster 1 year ago
+
+// for testing, we're in the middle of a license/billing period
+const LICENSE_START = startOfMonth(subMonths(NEW_DATE, 6));
+
+// upgrade happened 1 month after license start
+const UPGRADE_DATE = addMonths(LICENSE_START, 1);
+
+module('Acceptance | clients history tab', function (hooks) {
+  setupApplicationTest(hooks);
+  setupMirage(hooks);
+
+  hooks.before(function () {
+    ENV['ember-cli-mirage'].handler = 'clients';
+  });
+
+  hooks.after(function () {
+    ENV['ember-cli-mirage'].handler = null;
+  });
+
+  hooks.beforeEach(function () {
+    return authPage.login();
+  });
+
+  test('shows warning when config off, no data, queries_available=true', async function (assert) {
+    assert.expect(6);
+    this.server.get('sys/internal/counters/activity', () => overrideResponse(204));
+    this.server.get('sys/internal/counters/config', () => {
+      return {
+        request_id: 'some-config-id',
+        data: {
+          default_report_months: 12,
+          enabled: 'default-disable',
+          queries_available: true,
+          retention_months: 24,
+        },
+      };
+    });
+    await visit('/vault/clients/history');
+    assert.equal(currentURL(), '/vault/clients/history');
+    assert.dom(SELECTORS.historyActiveTab).hasText('History', 'history tab is active');
+    assert.dom('[data-test-tracking-disabled] .message-title').hasText('Tracking is disabled');
+    assert.dom(SELECTORS.emptyStateTitle).hasText('No data received');
+    assert.dom(SELECTORS.filterBar).doesNotExist('Shows filter bar to search previous dates');
+    assert.dom(SELECTORS.usageStats).doesNotExist('No usage stats');
+  });
+
+  test('shows warning when config off, no data, queries_available=false', async function (assert) {
+    assert.expect(4);
+    this.server.get('sys/internal/counters/activity', () => overrideResponse(204));
+    this.server.get('sys/internal/counters/config', () => {
+      return {
+        request_id: 'some-config-id',
+        data: {
+          default_report_months: 12,
+          enabled: 'default-disable',
+          queries_available: false,
+          retention_months: 24,
+        },
+      };
+    });
+    await visit('/vault/clients/history');
+    assert.equal(currentURL(), '/vault/clients/history');
+    assert.dom(SELECTORS.historyActiveTab).hasText('History', 'history tab is active');
+    assert.dom(SELECTORS.emptyStateTitle).hasText('Data tracking is disabled');
+    assert.dom(SELECTORS.filterBar).doesNotExist('Filter bar is hidden when no data available');
+  });
+
+  test('shows empty state when config enabled and queries_available=false', async function (assert) {
+    assert.expect(4);
+    this.server.get('sys/internal/counters/activity', () => overrideResponse(204));
+    this.server.get('sys/internal/counters/config', () => {
+      return {
+        request_id: 'some-config-id',
+        data: {
+          default_report_months: 12,
+          enabled: 'default-enable',
+          queries_available: false,
+          retention_months: 24,
+        },
+      };
+    });
+    await visit('/vault/clients/history');
+    assert.equal(currentURL(), '/vault/clients/history');
+    assert.dom(SELECTORS.historyActiveTab).hasText('History', 'history tab is active');
+
+    assert.dom(SELECTORS.emptyStateTitle).hasText('No monthly history');
+    assert.dom(SELECTORS.filterBar).doesNotExist('Does not show filter bar');
+  });
+
+  test('visiting history tab config on and data with mounts', async function (assert) {
+    assert.expect(8);
+    await visit('/vault/clients/history');
+    assert.equal(currentURL(), '/vault/clients/history');
+
+    assert
+      .dom(SELECTORS.dateDisplay)
+      .hasText(format(LICENSE_START, 'MMMM yyyy'), 'billing start month is correctly parsed from license');
+    assert
+      .dom(SELECTORS.rangeDropdown)
+      .hasText(
+        `${format(LICENSE_START, 'MMMM yyyy')} - ${format(LAST_MONTH, 'MMMM yyyy')}`,
+        'Date range shows dates correctly parsed activity response'
+      );
+    assert.dom(SELECTORS.attributionBlock).exists('Shows attribution area');
+    assert.dom(SELECTORS.monthlyUsageBlock).exists('Shows monthly usage block');
+    assert
+      .dom(SELECTORS.runningTotalMonthlyCharts)
+      .exists('Shows running totals with monthly breakdown charts');
+    assert
+      .dom(find('[data-test-line-chart="x-axis-labels"] g.tick text'))
+      .hasText(`${format(LICENSE_START, 'M/yy')}`, 'x-axis labels start with billing start date');
+    assert.equal(
+      findAll('[data-test-line-chart="plot-point"]').length,
+      5,
+      `line chart plots 5 points to match query`
+    );
+  });
+
+  test('updates correctly when querying date ranges', async function (assert) {
+    assert.expect(26);
+    // TODO CMB: wire up dynamically generated activity to mirage clients handler
+    // const activity = generateActivityResponse(5, LICENSE_START, LAST_MONTH);
+    await visit('/vault/clients/history');
+    assert.equal(currentURL(), '/vault/clients/history');
+
+    // query for single, historical month with no new counts
+    await click(SELECTORS.rangeDropdown);
+    await click('[data-test-show-calendar]');
+    if (parseInt(find('[data-test-display-year]').innerText) > LICENSE_START.getFullYear()) {
+      await click('[data-test-previous-year]');
+    }
+    await click(find(`[data-test-calendar-month=${ARRAY_OF_MONTHS[LICENSE_START.getMonth()]}]`));
+
+    assert.dom('[data-test-usage-stats]').exists('total usage stats show');
+    assert
+      .dom(SELECTORS.runningTotalMonthStats)
+      .doesNotExist('running total single month stat boxes do not show');
+    assert
+      .dom(SELECTORS.runningTotalMonthlyCharts)
+      .doesNotExist('running total month over month charts do not show');
+    assert.dom(SELECTORS.monthlyUsageBlock).doesNotExist('does not show monthly usage block');
+    assert.dom(SELECTORS.attributionBlock).exists('attribution area shows');
+    assert
+      .dom('[data-test-chart-container="new-clients"] [data-test-component="empty-state"]')
+      .exists('new client attribution has empty state');
+    assert
+      .dom('[data-test-empty-state-subtext]')
+      .hasText('There are no new clients for this namespace during this time period.    ');
+    assert.dom('[data-test-chart-container="total-clients"]').exists('total client attribution chart shows');
+
+    // reset to billing period
+    await click('[data-test-popup-menu-trigger]');
+    await click('[data-test-current-billing-period]');
+
+    // change billing start to month/year of first upgrade
+    await click('[data-test-start-date-editor] button');
+    await click(SELECTORS.monthDropdown);
+    await click(find(`[data-test-date-modal-month="${ARRAY_OF_MONTHS[UPGRADE_DATE.getMonth()]}"]`));
+    await click(SELECTORS.yearDropdown);
+    await click(find(`[data-test-date-modal-year="${UPGRADE_DATE.getFullYear()}`));
+    await click('[data-test-modal-save]');
+
+    assert.dom(SELECTORS.attributionBlock).exists('Shows attribution area');
+    assert.dom(SELECTORS.monthlyUsageBlock).exists('Shows monthly usage block');
+    assert
+      .dom(SELECTORS.runningTotalMonthlyCharts)
+      .exists('Shows running totals with monthly breakdown charts');
+    assert
+      .dom(find('[data-test-line-chart="x-axis-labels"] g.tick text'))
+      .hasText(`${format(UPGRADE_DATE, 'M/yy')}`, 'x-axis labels start with updated billing start month');
+    assert.equal(
+      findAll('[data-test-line-chart="plot-point"]').length,
+      5,
+      `line chart plots 5 points to match query`
+    );
+
+    // query custom end month
+    const customEndDate = subMonths(NEW_DATE, 3);
+    await click(SELECTORS.rangeDropdown);
+    await click('[data-test-show-calendar]');
+    if (parseInt(find('[data-test-display-year]').innerText) !== customEndDate.getFullYear()) {
+      await click('[data-test-previous-year]');
+    }
+    await click(find(`[data-test-calendar-month=${ARRAY_OF_MONTHS[customEndDate.getMonth()]}]`));
+
+    assert.dom(SELECTORS.attributionBlock).exists('Shows attribution area');
+    assert.dom(SELECTORS.monthlyUsageBlock).exists('Shows monthly usage block');
+    assert
+      .dom(SELECTORS.runningTotalMonthlyCharts)
+      .exists('Shows running totals with monthly breakdown charts');
+    assert.equal(
+      findAll('[data-test-line-chart="plot-point"]').length,
+      3,
+      `line chart plots 3 points to match query`
+    );
+    let xAxisLabels = findAll('[data-test-line-chart="x-axis-labels"] g.tick text');
+    assert
+      .dom(xAxisLabels[xAxisLabels.length - 1])
+      .hasText(`${format(subMonths(LAST_MONTH, 2), 'M/yy')}`, 'x-axis labels end with queried end month');
+
+    // query for single, historical month
+    await click(SELECTORS.rangeDropdown);
+    await click('[data-test-show-calendar]');
+    if (parseInt(find('[data-test-display-year]').innerText) !== UPGRADE_DATE.getFullYear()) {
+      await click('[data-test-previous-year]');
+    }
+    await click(find(`[data-test-calendar-month=${ARRAY_OF_MONTHS[UPGRADE_DATE.getMonth()]}]`));
+
+    assert.dom(SELECTORS.runningTotalMonthStats).exists('running total single month stat boxes show');
+    assert
+      .dom(SELECTORS.runningTotalMonthlyCharts)
+      .doesNotExist('running total month over month charts do not show');
+    assert.dom(SELECTORS.monthlyUsageBlock).doesNotExist('Does not show monthly usage block');
+    assert.dom(SELECTORS.attributionBlock).exists('attribution area shows');
+    assert.dom('[data-test-chart-container="new-clients"]').exists('new client attribution chart shows');
+    assert.dom('[data-test-chart-container="total-clients"]').exists('total client attribution chart shows');
+
+    // reset to billing period
+    await click('[data-test-popup-menu-trigger]');
+    await click('[data-test-current-billing-period]');
+
+    // query month older than count start date
+    await click('[data-test-start-date-editor] button');
+    await click(SELECTORS.yearDropdown);
+    await click(find(`[data-test-date-modal-year="${LICENSE_START.getFullYear() - 3}`));
+    await click('[data-test-modal-save]');
+
+    assert
+      .dom('[data-test-alert-banner="alert"]')
+      .hasTextContaining(
+        `We only have data from ${format(COUNTS_START, 'MMMM yyyy')}`,
+        'warning banner displays that date queried was prior to count start date'
+      );
+  });
+
+  test('filters correctly on history with full data', async function (assert) {
+    assert.expect(19);
+    await visit('/vault/clients/history');
+    assert.equal(currentURL(), '/vault/clients/history', 'clients/history URL is correct');
+    assert.dom(SELECTORS.historyActiveTab).hasText('History', 'history tab is active');
+    assert
+      .dom(SELECTORS.runningTotalMonthlyCharts)
+      .exists('Shows running totals with monthly breakdown charts');
+    assert.dom(SELECTORS.attributionBlock).exists('Shows attribution area');
+    assert.dom(SELECTORS.monthlyUsageBlock).exists('Shows monthly usage block');
+
+    // FILTER BY NAMESPACE
+    await clickTrigger();
+    await searchSelect.options.objectAt(0).click();
+
+    await settled();
+    assert.ok(true, 'Filter by first namespace');
+    assert.dom('[data-test-top-attribution]').includesText('Top auth method');
+    assert.dom('[data-test-running-total-entity]').includesText('23,326', 'total entity clients is accurate');
+    assert
+      .dom('[data-test-running-total-nonentity]')
+      .includesText('17,826', 'total non-entity clients is accurate');
+    assert.dom('[data-test-attribution-clients]').includesText('10,142', 'top attribution clients accurate');
+
+    // FILTER BY AUTH METHOD
+    await clickTrigger();
+    await searchSelect.options.objectAt(0).click();
+    await settled();
+    assert.ok(true, 'Filter by first auth method');
+    assert.dom('[data-test-running-total-entity]').includesText('6,508', 'total entity clients is accurate');
+    assert
+      .dom('[data-test-running-total-nonentity]')
+      .includesText('3,634', 'total non-entity clients is accurate');
+    assert.dom(SELECTORS.attributionBlock).doesNotExist('Does not show attribution block');
+
+    await click('#namespace-search-select [data-test-selected-list-button="delete"]');
+    assert.ok(true, 'Remove namespace filter without first removing auth method filter');
+    assert.dom('[data-test-top-attribution]').includesText('Top namespace');
+    assert
+      .dom('[data-test-attribution-clients]')
+      .hasTextContaining('41,152', 'top attribution clients back to unfiltered value');
+    assert
+      .dom('[data-test-running-total-entity]')
+      .hasTextContaining('98,289', 'total entity clients is back to unfiltered value');
+    assert
+      .dom('[data-test-running-total-nonentity]')
+      .hasTextContaining('96,412', 'total non-entity clients is back to unfiltered value');
+  });
+
+  test('shows warning if upgrade happened within license period', async function (assert) {
+    assert.expect(3);
+    this.server.get('sys/version-history', function () {
+      return {
+        data: {
+          keys: ['1.9.0', '1.9.1', '1.9.2', '1.10.1'],
+          key_info: {
+            '1.9.0': {
+              previous_version: null,
+              timestamp_installed: formatRFC3339(subMonths(UPGRADE_DATE, 4)),
+            },
+            '1.9.1': {
+              previous_version: '1.9.0',
+              timestamp_installed: formatRFC3339(subMonths(UPGRADE_DATE, 3)),
+            },
+            '1.9.2': {
+              previous_version: '1.9.1',
+              timestamp_installed: formatRFC3339(subMonths(UPGRADE_DATE, 2)),
+            },
+            '1.10.1': {
+              previous_version: '1.9.2',
+              timestamp_installed: formatRFC3339(UPGRADE_DATE),
+            },
+          },
+        },
+      };
+    });
+    await visit('/vault/clients/history');
+    assert.equal(currentURL(), '/vault/clients/history', 'clients/history URL is correct');
+    assert.dom(SELECTORS.historyActiveTab).hasText('History', 'history tab is active');
+    assert
+      .dom('[data-test-alert-banner="alert"]')
+      .hasTextContaining(
+        `Warning Vault was upgraded to 1.10.1 on ${format(
+          UPGRADE_DATE,
+          'MMM d, yyyy'
+        )}. We added monthly breakdowns and mount level attribution starting in 1.10, so keep that in mind when looking at the data below. Learn more here.`
+      );
+  });
+
+  test('Shows empty if license start date is current month', async function (assert) {
+    const licenseStart = NEW_DATE;
+    const licenseEnd = addMonths(NEW_DATE, 12);
+    this.server.get('sys/license/status', function () {
+      return {
+        request_id: 'my-license-request-id',
+        data: {
+          autoloaded: {
+            license_id: 'my-license-id',
+            start_time: formatRFC3339(licenseStart),
+            expiration_time: formatRFC3339(licenseEnd),
+          },
+        },
+      };
+    });
+    await visit('/vault/clients/history');
+    assert.equal(currentURL(), '/vault/clients/history', 'clients/history URL is correct');
+    assert.dom(SELECTORS.emptyStateTitle).hasText('No data for this billing period');
+    assert
+      .dom(SELECTORS.dateDisplay)
+      .hasText(format(licenseStart, 'MMMM yyyy'), 'Shows license date, gives ability to edit');
+    assert.dom(SELECTORS.monthDropdown).exists('Dropdown exists to select month');
+    assert.dom(SELECTORS.yearDropdown).exists('Dropdown exists to select year');
+  });
+
+  test('shows correct interface if no permissions on license', async function (assert) {
+    this.server.get('/sys/license/status', () => overrideResponse(403));
+    await visit('/vault/clients/history');
+    assert.equal(currentURL(), '/vault/clients/history', 'clients/history URL is correct');
+    assert.dom(SELECTORS.historyActiveTab).hasText('History', 'history tab is active');
+    // Message changes depending on ent or OSS
+    assert.dom(SELECTORS.emptyStateTitle).exists('Empty state exists');
+    assert.dom(SELECTORS.monthDropdown).exists('Dropdown exists to select month');
+    assert.dom(SELECTORS.yearDropdown).exists('Dropdown exists to select year');
+  });
+
+  test('shows error template if permissions denied querying activity response with no data', async function (assert) {
+    this.server.get('sys/license/status', () => overrideResponse(403));
+    this.server.get('sys/version-history', () => overrideResponse(403));
+    this.server.get('sys/internal/counters/config', () => overrideResponse(403));
+    this.server.get('sys/internal/counters/activity', () => overrideResponse(403));
+
+    await visit('/vault/clients/history');
+    assert.equal(currentURL(), '/vault/clients/history', 'clients/history URL is correct');
+    assert
+      .dom(SELECTORS.emptyStateTitle)
+      .includesText('start date found', 'Empty state shows no billing start date');
+    await click(SELECTORS.monthDropdown);
+    await click(this.element.querySelector('[data-test-month-list] button:not([disabled])'));
+    await click(SELECTORS.yearDropdown);
+    await click(this.element.querySelector('[data-test-year-list] button:not([disabled])'));
+    await click(SELECTORS.dateDropdownSubmit);
+    assert
+      .dom(SELECTORS.emptyStateTitle)
+      .hasText('You are not authorized', 'Empty state displays not authorized message');
+  });
+});
diff --git a/ui/tests/acceptance/cluster-test.js b/ui/tests/acceptance/cluster-test.js
index 26bb8fb121045..7180b175e47be 100644
--- a/ui/tests/acceptance/cluster-test.js
+++ b/ui/tests/acceptance/cluster-test.js
@@ -1,14 +1,7 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { create } from 'ember-cli-page-object';
-import { settled, click, visit } from '@ember/test-helpers';
+import { settled, click } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
-import { v4 as uuidv4 } from 'uuid';
-
 import authPage from 'vault/tests/pages/auth';
 import logout from 'vault/tests/pages/logout';
 import enablePage from 'vault/tests/pages/settings/auth/enable';
@@ -25,6 +18,19 @@ const tokenWithPolicy = async function (name, policy) {
   return consoleComponent.lastLogOutput;
 };
 
+const USER = 'end-user';
+const PASSWORD = 'mypassword';
+
+const authAccessor = async function (path) {
+  await enablePage.enable('userpass', path);
+  await consoleComponent.runCommands([`write auth/${path}/users/end-user password="${PASSWORD}"`]);
+};
+
+const setupUser = async function () {
+  let authMethodPath = `userpass-${new Date().getTime()}`;
+  await authAccessor(authMethodPath);
+};
+
 module('Acceptance | cluster', function (hooks) {
   setupApplicationTest(hooks);
 
@@ -43,31 +49,25 @@ module('Acceptance | cluster', function (hooks) {
     const userToken = await tokenWithPolicy('hide-policies-nav', deny_policies_policy);
     await logout.visit();
     await authPage.login(userToken);
-    await visit('/vault/access');
 
-    assert.dom('[data-test-sidebar-nav-link="Policies"]').doesNotExist();
+    assert.dom('[data-test-navbar-item="policies"]').doesNotExist();
     await logout.visit();
   });
 
   test('it hides mfa setup if user has not entityId (ex: is a root user)', async function (assert) {
-    const user = 'end-user';
-    const password = 'mypassword';
-    const path = `cluster-userpass-${uuidv4()}`;
-
-    await enablePage.enable('userpass', path);
-    await consoleComponent.runCommands([`write auth/${path}/users/end-user password="${password}"`]);
+    await setupUser();
 
     await logout.visit();
     await settled();
-    await authPage.loginUsername(user, password, path);
-    await click('[data-test-user-menu-trigger]');
-    assert.dom('[data-test-user-menu-item="mfa"]').exists();
+    await authPage.loginUsername(USER, PASSWORD);
+    await click('.nav-user-button button');
+    assert.dom('[data-test-status-link="mfa"]').exists();
     await logout.visit();
 
     await authPage.login('root');
     await settled();
-    await click('[data-test-user-menu-trigger]');
-    assert.dom('[data-test-user-menu-item="mfa"]').doesNotExist();
+    await click('.nav-user-button button');
+    assert.dom('[data-test-status-link="mfa"]').doesNotExist();
   });
 
   test('enterprise nav item links to first route that user has access to', async function (assert) {
@@ -80,9 +80,8 @@ module('Acceptance | cluster', function (hooks) {
     const userToken = await tokenWithPolicy('show-policies-nav', read_rgp_policy);
     await logout.visit();
     await authPage.login(userToken);
-    await visit('/vault/access');
-
-    assert.dom('[data-test-sidebar-nav-link="Policies"]').hasAttribute('href', '/ui/vault/policies/rgp');
+    await settled();
+    assert.dom('[data-test-navbar-item="policies"]').hasAttribute('href', '/ui/vault/policies/rgp');
     await logout.visit();
   });
 });
diff --git a/ui/tests/acceptance/console-test.js b/ui/tests/acceptance/console-test.js
index b8ed7da2738e7..f2344dc6e4a06 100644
--- a/ui/tests/acceptance/console-test.js
+++ b/ui/tests/acceptance/console-test.js
@@ -1,10 +1,5 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
-import { settled, waitUntil, click } from '@ember/test-helpers';
+import { settled, waitUntil } from '@ember/test-helpers';
 import { create } from 'ember-cli-page-object';
 import { setupApplicationTest } from 'ember-qunit';
 import enginesPage from 'vault/tests/pages/secrets/backends';
@@ -23,26 +18,18 @@ module('Acceptance | console', function (hooks) {
   test("refresh reloads the current route's data", async function (assert) {
     await enginesPage.visit();
     await settled();
-    const numEngines = enginesPage.rows.length;
+    let numEngines = enginesPage.rows.length;
     await consoleComponent.toggle();
     await settled();
-    for (const num of [1, 2, 3]) {
-      const inputString = `write sys/mounts/console-route-${num} type=kv`;
+    let now = Date.now();
+    for (let num of [1, 2, 3]) {
+      let inputString = `write sys/mounts/${now + num} type=kv`;
       await consoleComponent.runCommands(inputString);
       await settled();
     }
     await consoleComponent.runCommands('refresh');
     await settled();
-    assert.strictEqual(enginesPage.rows.length, numEngines + 3, 'new engines were added to the page');
-    // Clean up
-    for (const num of [1, 2, 3]) {
-      const inputString = `delete sys/mounts/console-route-${num}`;
-      await consoleComponent.runCommands(inputString);
-      await settled();
-    }
-    await consoleComponent.runCommands('refresh');
-    await settled();
-    assert.strictEqual(enginesPage.rows.length, numEngines, 'engines were removed from the page');
+    assert.equal(enginesPage.rows.length, numEngines + 3, 'new engines were added to the page');
   });
 
   test('fullscreen command expands the cli panel', async function (assert) {
@@ -53,11 +40,8 @@ module('Acceptance | console', function (hooks) {
     const consoleEle = document.querySelector('[data-test-component="console/ui-panel"]');
     // wait for the CSS transition to finish
     await waitUntil(() => consoleEle.offsetHeight === window.innerHeight);
-    assert.strictEqual(
-      consoleEle.offsetHeight,
-      window.innerHeight,
-      'fullscreen is the same height as the window'
-    );
+    assert.equal(consoleEle.offsetHeight, window.innerHeight, 'fullscreen is the same height as the window');
+    assert.equal(consoleEle.offsetTop, 0, 'fullscreen is aligned to the top of window');
   });
 
   test('array output is correctly formatted', async function (assert) {
@@ -69,7 +53,7 @@ module('Acceptance | console', function (hooks) {
     // wait for the CSS transition to finish
     await waitUntil(() => consoleOut.innerText);
     assert.notOk(consoleOut.innerText.includes('function(){'));
-    assert.strictEqual(consoleOut.innerText, '["root"]');
+    assert.equal(consoleOut.innerText, '["root"]');
   });
 
   test('number output is correctly formatted', async function (assert) {
@@ -80,7 +64,7 @@ module('Acceptance | console', function (hooks) {
     const consoleOut = document.querySelector('.console-ui-output>pre');
     // wait for the CSS transition to finish
     await waitUntil(() => consoleOut.innerText);
-    assert.strictEqual(consoleOut.innerText.match(/^\d+$/).length, 1);
+    assert.equal(consoleOut.innerText.match(/^\d+$/).length, 1);
   });
 
   test('boolean output is correctly formatted', async function (assert) {
@@ -88,23 +72,9 @@ module('Acceptance | console', function (hooks) {
     await settled();
     await consoleComponent.runCommands('read -field=orphan /auth/token/lookup-self');
     await settled();
-    const consoleOut = document.querySelector('.console-ui-output>pre');
+    let consoleOut = document.querySelector('.console-ui-output>pre');
     // have to wrap in a later so that we can wait for the CSS transition to finish
     await waitUntil(() => consoleOut.innerText);
-    assert.strictEqual(consoleOut.innerText.match(/^(true|false)$/g).length, 1);
-  });
-
-  test('it should open and close console panel', async function (assert) {
-    await click('[data-test-console-toggle]');
-    assert.dom('[data-test-console-panel]').hasClass('panel-open', 'Sidebar button opens console panel');
-    await click('[data-test-console-toggle]');
-    assert
-      .dom('[data-test-console-panel]')
-      .doesNotHaveClass('panel-open', 'Sidebar button closes console panel');
-    await click('[data-test-console-toggle]');
-    await click('[data-test-console-panel-close]');
-    assert
-      .dom('[data-test-console-panel]')
-      .doesNotHaveClass('panel-open', 'Console panel close button closes console panel');
+    assert.equal(consoleOut.innerText.match(/^(true|false)$/g).length, 1);
   });
 });
diff --git a/ui/tests/acceptance/enterprise-control-groups-test.js b/ui/tests/acceptance/enterprise-control-groups-test.js
index f5307acc51353..81434e11dbbce 100644
--- a/ui/tests/acceptance/enterprise-control-groups-test.js
+++ b/ui/tests/acceptance/enterprise-control-groups-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { settled, currentURL, currentRouteName, visit, waitUntil } from '@ember/test-helpers';
 import { module, test, skip } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
@@ -74,7 +69,9 @@ module('Acceptance | Enterprise | control groups', function (hooks) {
   const ADMIN_USER = 'authorizer';
   const ADMIN_PASSWORD = 'test';
   const setupControlGroup = async (context) => {
+    let userpassAccessor;
     await visit('/vault/secrets');
+
     await consoleComponent.toggle();
     await settled();
     await consoleComponent.runCommands([
@@ -93,14 +90,14 @@ module('Acceptance | Enterprise | control groups', function (hooks) {
       'read -field=accessor sys/internal/ui/mounts/auth/userpass',
     ]);
     await settled();
-    const userpassAccessor = consoleComponent.lastTextOutput;
+    userpassAccessor = consoleComponent.lastTextOutput;
 
     await consoleComponent.runCommands([
       // lookup entity id for our authorizer
       `write -field=id identity/lookup/entity name=${ADMIN_USER}`,
     ]);
     await settled();
-    const authorizerEntityId = consoleComponent.lastTextOutput;
+    let authorizerEntityId = consoleComponent.lastTextOutput;
     await consoleComponent.runCommands([
       // create alias for authorizor and add them to the managers group
       `write identity/alias mount_accessor=${userpassAccessor} entity_id=${authorizerEntityId} name=${ADMIN_USER}`,
@@ -140,15 +137,17 @@ module('Acceptance | Enterprise | control groups', function (hooks) {
   });
 
   const workflow = async (assert, context, shouldStoreToken) => {
-    const url = '/vault/secrets/kv/show/foo';
+    let controlGroupToken;
+    let accessor;
+    let url = '/vault/secrets/kv/show/foo';
     await setupControlGroup(context);
     await settled();
     // as the requestor, go to the URL that's blocked by the control group
     // and store the values
     await visit(url);
 
-    const accessor = controlGroupComponent.accessor;
-    const controlGroupToken = controlGroupComponent.token;
+    accessor = controlGroupComponent.accessor;
+    controlGroupToken = controlGroupComponent.token;
     await authPage.logout();
     await settled();
     // log in as the admin, navigate to the accessor page,
@@ -167,7 +166,7 @@ module('Acceptance | Enterprise | control groups', function (hooks) {
     assert.dom('[data-test-authorize-button]').exists();
     await controlGroupComponent.authorize();
     await settled();
-    assert.strictEqual(controlGroupComponent.bannerPrefix, 'Thanks!', 'text display changes');
+    assert.equal(controlGroupComponent.bannerPrefix, 'Thanks!', 'text display changes');
     await settled();
     await authPage.logout();
     await settled();
@@ -190,7 +189,7 @@ module('Acceptance | Enterprise | control groups', function (hooks) {
       assert.ok(controlGroupSuccessComponent.showsNavigateMessage, 'shows user the navigate message');
       await controlGroupSuccessComponent.navigate();
       await settled();
-      assert.strictEqual(currentURL(), url, 'successfully loads the target url');
+      assert.equal(currentURL(), url, 'successfully loads the target url');
     } else {
       await visit(`/vault/access/control-groups/${accessor}`);
 
@@ -219,7 +218,7 @@ module('Acceptance | Enterprise | control groups', function (hooks) {
     await settled();
     await consoleComponent.runCommands('read kv/foo');
     await settled();
-    const output = consoleComponent.lastLogOutput;
+    let output = consoleComponent.lastLogOutput;
     assert.ok(output.includes('A Control Group was encountered at kv/foo'));
     assert.ok(output.includes('The Control Group Token is'));
     assert.ok(output.includes('The Accessor is'));
diff --git a/ui/tests/acceptance/enterprise-kmip-test.js b/ui/tests/acceptance/enterprise-kmip-test.js
index 18df8b42a121f..de08fdc75cf1e 100644
--- a/ui/tests/acceptance/enterprise-kmip-test.js
+++ b/ui/tests/acceptance/enterprise-kmip-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { currentURL, currentRouteName, settled, fillIn, waitUntil, find } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
@@ -25,15 +20,15 @@ const getRandomPort = () => {
 
 const mount = async (shouldConfig = true) => {
   const now = Date.now();
-  const path = `kmip-${now}`;
-  const addr = `127.0.0.1:${getRandomPort()}`; // use random port
+  let path = `kmip-${now}`;
+  let addr = `127.0.0.1:${getRandomPort()}`; // use random port
   await settled();
-  const commands = shouldConfig
+  let commands = shouldConfig
     ? [`write sys/mounts/${path} type=kmip`, `write ${path}/config listen_addrs=${addr}`]
     : [`write sys/mounts/${path} type=kmip`];
   await uiConsole.runCommands(commands);
   await settled();
-  const res = uiConsole.lastLogOutput;
+  let res = uiConsole.lastLogOutput;
   if (res.includes('Error')) {
     throw new Error(`Error mounting secrets engine: ${res}`);
   }
@@ -41,13 +36,13 @@ const mount = async (shouldConfig = true) => {
 };
 
 const createScope = async () => {
-  const path = await mount();
+  let path = await mount();
   await settled();
-  const scope = `scope-${Date.now()}`;
+  let scope = `scope-${Date.now()}`;
   await settled();
   await uiConsole.runCommands([`write ${path}/scope/${scope} -force`]);
   await settled();
-  const res = uiConsole.lastLogOutput;
+  let res = uiConsole.lastLogOutput;
   if (res.includes('Error')) {
     throw new Error(`Error creating scope: ${res}`);
   }
@@ -55,12 +50,12 @@ const createScope = async () => {
 };
 
 const createRole = async () => {
-  const { path, scope } = await createScope();
+  let { path, scope } = await createScope();
   await settled();
-  const role = `role-${Date.now()}`;
+  let role = `role-${Date.now()}`;
   await uiConsole.runCommands([`write ${path}/scope/${scope}/role/${role} operation_all=true`]);
   await settled();
-  const res = uiConsole.lastLogOutput;
+  let res = uiConsole.lastLogOutput;
   if (res.includes('Error')) {
     throw new Error(`Error creating role: ${res}`);
   }
@@ -68,12 +63,12 @@ const createRole = async () => {
 };
 
 const generateCreds = async () => {
-  const { path, scope, role } = await createRole();
+  let { path, scope, role } = await createRole();
   await settled();
   await uiConsole.runCommands([
     `write ${path}/scope/${scope}/role/${role}/credential/generate format=pem -field=serial_number`,
   ]);
-  const serial = uiConsole.lastLogOutput;
+  let serial = uiConsole.lastLogOutput;
   if (serial.includes('Error')) {
     throw new Error(`Credential generation failed with error: ${serial}`);
   }
@@ -88,10 +83,10 @@ module('Acceptance | Enterprise | KMIP secrets', function (hooks) {
   });
 
   test('it enables KMIP secrets engine', async function (assert) {
-    const path = `kmip-${Date.now()}`;
+    let path = `kmip-${Date.now()}`;
     await mountSecrets.enable('kmip', path);
     await settled();
-    assert.strictEqual(
+    assert.equal(
       currentURL(),
       `/vault/secrets/${path}/kmip/scopes`,
       'mounts and redirects to the kmip scopes page'
@@ -100,12 +95,12 @@ module('Acceptance | Enterprise | KMIP secrets', function (hooks) {
   });
 
   test('it can configure a KMIP secrets engine', async function (assert) {
-    const path = await mount(false);
+    let path = await mount(false);
     await scopesPage.visit({ backend: path });
     await settled();
     await scopesPage.configurationLink();
     await settled();
-    assert.strictEqual(
+    assert.equal(
       currentURL(),
       `/vault/secrets/${path}/kmip/configuration`,
       'configuration navigates to the config page'
@@ -114,17 +109,17 @@ module('Acceptance | Enterprise | KMIP secrets', function (hooks) {
 
     await scopesPage.configureLink();
     await settled();
-    assert.strictEqual(
+    assert.equal(
       currentURL(),
       `/vault/secrets/${path}/kmip/configure`,
       'configuration navigates to the configure page'
     );
-    const addr = `127.0.0.1:${getRandomPort()}`;
+    let addr = `127.0.0.1:${getRandomPort()}`;
     await fillIn('[data-test-string-list-input="0"]', addr);
 
     await scopesPage.submit();
     await settled();
-    assert.strictEqual(
+    assert.equal(
       currentURL(),
       `/vault/secrets/${path}/kmip/configuration`,
       'redirects to configuration page after saving config'
@@ -133,7 +128,7 @@ module('Acceptance | Enterprise | KMIP secrets', function (hooks) {
   });
 
   test('it can revoke from the credentials show page', async function (assert) {
-    const { path, scope, role, serial } = await generateCreds();
+    let { path, scope, role, serial } = await generateCreds();
     await settled();
     await credentialsPage.visitDetail({ backend: path, scope, role, serial });
     await settled();
@@ -142,7 +137,7 @@ module('Acceptance | Enterprise | KMIP secrets', function (hooks) {
     await credentialsPage.delete().confirmDelete();
     await settled();
 
-    assert.strictEqual(
+    assert.equal(
       currentURL(),
       `/vault/secrets/${path}/kmip/scopes/${scope}/roles/${role}/credentials`,
       'redirects to the credentials list'
@@ -151,12 +146,12 @@ module('Acceptance | Enterprise | KMIP secrets', function (hooks) {
   });
 
   test('it can create a scope', async function (assert) {
-    const path = await mount(this);
+    let path = await mount(this);
     await scopesPage.visit({ backend: path });
     await settled();
     await scopesPage.createLink();
     await settled();
-    assert.strictEqual(
+    assert.equal(
       currentURL(),
       `/vault/secrets/${path}/kmip/scopes/create`,
       'navigates to the kmip scope create page'
@@ -167,16 +162,16 @@ module('Acceptance | Enterprise | KMIP secrets', function (hooks) {
     await settled();
     await scopesPage.submit();
     await settled();
-    assert.strictEqual(
+    assert.equal(
       currentURL(),
       `/vault/secrets/${path}/kmip/scopes`,
       'navigates to the kmip scopes page after create'
     );
-    assert.strictEqual(scopesPage.listItemLinks.length, 1, 'renders a single scope');
+    assert.equal(scopesPage.listItemLinks.length, 1, 'renders a single scope');
   });
 
   test('it can delete a scope from the list', async function (assert) {
-    const { path } = await createScope();
+    let { path } = await createScope();
     await scopesPage.visit({ backend: path });
     await settled();
     // delete the scope
@@ -186,29 +181,29 @@ module('Acceptance | Enterprise | KMIP secrets', function (hooks) {
     await settled();
     await scopesPage.confirmDelete();
     await settled();
-    assert.strictEqual(scopesPage.listItemLinks.length, 0, 'no scopes');
+    assert.equal(scopesPage.listItemLinks.length, 0, 'no scopes');
     assert.ok(scopesPage.isEmpty, 'renders the empty state');
   });
 
   test('it can create a role', async function (assert) {
     // moving create scope here to help with flaky test
-    const path = await mount();
+    let path = await mount();
     await settled();
-    const scope = `scope-for-can-create-role`;
+    let scope = `scope-for-can-create-role`;
     await settled();
     await uiConsole.runCommands([`write ${path}/scope/${scope} -force`]);
     await settled();
-    const res = uiConsole.lastLogOutput;
+    let res = uiConsole.lastLogOutput;
     if (res.includes('Error')) {
       throw new Error(`Error creating scope: ${res}`);
     }
-    const role = `role-new-role`;
+    let role = `role-new-role`;
     await rolesPage.visit({ backend: path, scope });
     await settled();
     assert.ok(rolesPage.isEmpty, 'renders the empty role page');
     await rolesPage.create();
     await settled();
-    assert.strictEqual(
+    assert.equal(
       currentURL(),
       `/vault/secrets/${path}/kmip/scopes/${scope}/roles/create`,
       'links to the role create form'
@@ -218,17 +213,17 @@ module('Acceptance | Enterprise | KMIP secrets', function (hooks) {
     await settled();
     await rolesPage.submit();
     await settled();
-    assert.strictEqual(
+    assert.equal(
       currentURL(),
       `/vault/secrets/${path}/kmip/scopes/${scope}/roles`,
       'redirects to roles list'
     );
 
-    assert.strictEqual(rolesPage.listItemLinks.length, 1, 'renders a single role');
+    assert.equal(rolesPage.listItemLinks.length, 1, 'renders a single role');
   });
 
   test('it can delete a role from the list', async function (assert) {
-    const { path, scope } = await createRole();
+    let { path, scope } = await createRole();
     await rolesPage.visit({ backend: path, scope });
     await settled();
     // delete the role
@@ -238,33 +233,33 @@ module('Acceptance | Enterprise | KMIP secrets', function (hooks) {
     await settled();
     await rolesPage.confirmDelete();
     await settled();
-    assert.strictEqual(rolesPage.listItemLinks.length, 0, 'renders no roles');
+    assert.equal(rolesPage.listItemLinks.length, 0, 'renders no roles');
     assert.ok(rolesPage.isEmpty, 'renders empty');
   });
 
   test('it can delete a role from the detail page', async function (assert) {
-    const { path, scope, role } = await createRole();
+    let { path, scope, role } = await createRole();
     await settled();
     await rolesPage.visitDetail({ backend: path, scope, role });
     await settled();
     await waitUntil(() => find('[data-test-kmip-link-edit-role]'));
     await rolesPage.detailEditLink();
     await settled();
-    assert.strictEqual(
+    assert.equal(
       currentURL(),
       `/vault/secrets/${path}/kmip/scopes/${scope}/roles/${role}/edit`,
       'navigates to role edit'
     );
     await rolesPage.cancelLink();
     await settled();
-    assert.strictEqual(
+    assert.equal(
       currentURL(),
       `/vault/secrets/${path}/kmip/scopes/${scope}/roles/${role}`,
       'cancel navigates to role show'
     );
     await rolesPage.delete().confirmDelete();
     await settled();
-    assert.strictEqual(
+    assert.equal(
       currentURL(),
       `/vault/secrets/${path}/kmip/scopes/${scope}/roles`,
       'redirects to the roles list'
@@ -274,31 +269,31 @@ module('Acceptance | Enterprise | KMIP secrets', function (hooks) {
 
   test('it can create a credential', async function (assert) {
     // TODO come back and figure out why issue here with test
-    const { path, scope, role } = await createRole();
+    let { path, scope, role } = await createRole();
     await credentialsPage.visit({ backend: path, scope, role });
     await settled();
     assert.ok(credentialsPage.isEmpty, 'renders empty creds page');
     await credentialsPage.generateCredentialsLink();
     await settled();
-    assert.strictEqual(
+    assert.equal(
       currentURL(),
       `/vault/secrets/${path}/kmip/scopes/${scope}/roles/${role}/credentials/generate`,
       'navigates to generate credentials'
     );
     await credentialsPage.submit();
     await settled();
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.secrets.backend.kmip.credentials.show',
       'generate redirects to the show page'
     );
     await credentialsPage.backToRoleLink();
     await settled();
-    assert.strictEqual(credentialsPage.listItemLinks.length, 1, 'renders a single credential');
+    assert.equal(credentialsPage.listItemLinks.length, 1, 'renders a single credential');
   });
 
   test('it can revoke a credential from the list', async function (assert) {
-    const { path, scope, role } = await generateCreds();
+    let { path, scope, role } = await generateCreds();
     await credentialsPage.visit({ backend: path, scope, role });
     // revoke the credentials
     await settled();
@@ -306,7 +301,7 @@ module('Acceptance | Enterprise | KMIP secrets', function (hooks) {
     await settled();
     await credentialsPage.delete().confirmDelete();
     await settled();
-    assert.strictEqual(credentialsPage.listItemLinks.length, 0, 'renders no credentials');
+    assert.equal(credentialsPage.listItemLinks.length, 0, 'renders no credentials');
     assert.ok(credentialsPage.isEmpty, 'renders empty');
   });
 });
diff --git a/ui/tests/acceptance/enterprise-kmse-test.js b/ui/tests/acceptance/enterprise-kmse-test.js
index 2b61129d83afd..1795105ba9905 100644
--- a/ui/tests/acceptance/enterprise-kmse-test.js
+++ b/ui/tests/acceptance/enterprise-kmse-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
 import { click, fillIn } from '@ember/test-helpers';
diff --git a/ui/tests/acceptance/enterprise-license-banner-test.js b/ui/tests/acceptance/enterprise-license-banner-test.js
index 3f790b6d1406b..2c4c8de7176ea 100644
--- a/ui/tests/acceptance/enterprise-license-banner-test.js
+++ b/ui/tests/acceptance/enterprise-license-banner-test.js
@@ -1,28 +1,21 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
-import sinon from 'sinon';
 import { visit } from '@ember/test-helpers';
 import { setupApplicationTest } from 'ember-qunit';
 import Pretender from 'pretender';
 import formatRFC3339 from 'date-fns/formatRFC3339';
 import { addDays, subDays } from 'date-fns';
-import timestamp from 'core/utils/timestamp';
 
-const generateHealthResponse = (now, state) => {
+const generateHealthResponse = (state) => {
   let expiry;
   switch (state) {
     case 'expired':
-      expiry = subDays(now, 2);
+      expiry = subDays(new Date(), 2);
       break;
     case 'expiring':
-      expiry = addDays(now, 10);
+      expiry = addDays(new Date(), 10);
       break;
     default:
-      expiry = addDays(now, 33);
+      expiry = addDays(new Date(), 33);
       break;
   }
   return {
@@ -47,27 +40,18 @@ const generateHealthResponse = (now, state) => {
 module('Acceptance | Enterprise | License banner warnings', function (hooks) {
   setupApplicationTest(hooks);
 
-  hooks.before(function () {
-    sinon.stub(timestamp, 'now').callsFake(() => new Date('2018-04-03T14:15:30'));
-  });
-  hooks.beforeEach(function () {
-    this.now = timestamp.now();
-  });
   hooks.afterEach(function () {
     this.server.shutdown();
   });
-  hooks.after(function () {
-    timestamp.now.restore();
-  });
 
   test('it shows no license banner if license expires in > 30 days', async function (assert) {
-    const healthResp = generateHealthResponse(this.now);
+    const healthResp = generateHealthResponse();
     this.server = new Pretender(function () {
       this.get('/v1/sys/health', (response) => {
         return [response, { 'Content-Type': 'application/json' }, JSON.stringify(healthResp)];
       });
       this.get('/v1/sys/internal/ui/feature-flags', this.passthrough);
-      this.get('/v1/sys/internal/ui/mounts', this.passthrough);
+      // this.get('/v1/sys/health', this.passthrough);
       this.get('/v1/sys/seal-status', this.passthrough);
       this.get('/v1/sys/license/features', this.passthrough);
     });
@@ -76,13 +60,12 @@ module('Acceptance | Enterprise | License banner warnings', function (hooks) {
     this.server.shutdown();
   });
   test('it shows license banner warning if license expires within 30 days', async function (assert) {
-    const healthResp = generateHealthResponse(this.now, 'expiring');
+    const healthResp = generateHealthResponse('expiring');
     this.server = new Pretender(function () {
       this.get('/v1/sys/health', (response) => {
         return [response, { 'Content-Type': 'application/json' }, JSON.stringify(healthResp)];
       });
       this.get('/v1/sys/internal/ui/feature-flags', this.passthrough);
-      this.get('/v1/sys/internal/ui/mounts', this.passthrough);
       this.get('/v1/sys/seal-status', this.passthrough);
       this.get('/v1/sys/license/features', this.passthrough);
     });
@@ -92,13 +75,12 @@ module('Acceptance | Enterprise | License banner warnings', function (hooks) {
   });
 
   test('it shows license banner alert if license has already expired', async function (assert) {
-    const healthResp = generateHealthResponse(this.now, 'expired');
+    const healthResp = generateHealthResponse('expired');
     this.server = new Pretender(function () {
       this.get('/v1/sys/health', (response) => {
         return [response, { 'Content-Type': 'application/json' }, JSON.stringify(healthResp)];
       });
       this.get('/v1/sys/internal/ui/feature-flags', this.passthrough);
-      this.get('/v1/sys/internal/ui/mounts', this.passthrough);
       this.get('/v1/sys/seal-status', this.passthrough);
       this.get('/v1/sys/license/features', this.passthrough);
     });
diff --git a/ui/tests/acceptance/enterprise-namespaces-test.js b/ui/tests/acceptance/enterprise-namespaces-test.js
index 63429fd73eb16..ed5c3d934d27e 100644
--- a/ui/tests/acceptance/enterprise-namespaces-test.js
+++ b/ui/tests/acceptance/enterprise-namespaces-test.js
@@ -1,19 +1,17 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { click, settled, visit, fillIn, currentURL } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
 import { create } from 'ember-cli-page-object';
+
 import consoleClass from 'vault/tests/pages/components/console/ui-panel';
 import authPage from 'vault/tests/pages/auth';
 import logout from 'vault/tests/pages/logout';
 
 const shell = create(consoleClass);
 
-const createNS = async (name) => shell.runCommands(`write sys/namespaces/${name} -force`);
+const createNS = async (name) => {
+  await shell.runCommands(`write sys/namespaces/${name} -force`);
+};
 
 module('Acceptance | Enterprise | namespaces', function (hooks) {
   setupApplicationTest(hooks);
@@ -23,40 +21,42 @@ module('Acceptance | Enterprise | namespaces', function (hooks) {
   });
 
   test('it clears namespaces when you log out', async function (assert) {
-    const ns = 'foo';
+    let ns = 'foo';
     await createNS(ns);
     await shell.runCommands(`write -field=client_token auth/token/create policies=default`);
-    const token = shell.lastLogOutput;
+    let token = shell.lastLogOutput;
     await logout.visit();
     await authPage.login(token);
-    await click('[data-test-namespace-toggle]');
-    assert.dom('[data-test-current-namespace]').hasText('root', 'root renders as current namespace');
-    assert.dom('[data-test-namespace-link]').doesNotExist('Additional namespace have been cleared');
+    assert.dom('[data-test-namespace-toggle]').doesNotExist('does not show the namespace picker');
     await logout.visit();
   });
 
   test('it shows nested namespaces if you log in with a namspace starting with a /', async function (assert) {
-    assert.expect(5);
-
-    await click('[data-test-namespace-toggle]');
-
-    const nses = ['beep', 'boop', 'bop'];
-    for (const [i, ns] of nses.entries()) {
+    let nses = ['beep', 'boop', 'bop'];
+    for (let [i, ns] of nses.entries()) {
       await createNS(ns);
       await settled();
+      // this is usually triggered when creating a ns in the form, here we'll trigger a reload of the
+      // namespaces manually
+      await this.owner.lookup('service:namespace').findNamespacesForUser.perform();
+      if (i === nses.length - 1) {
+        break;
+      }
       // the namespace path will include all of the namespaces up to this point
-      const targetNamespace = nses.slice(0, i + 1).join('/');
-      const url = `/vault/secrets?namespace=${targetNamespace}`;
-      // this is usually triggered when creating a ns in the form -- trigger a reload of the namespaces manually
-      await click('[data-test-refresh-namespaces]');
+      let targetNamespace = nses.slice(0, i + 1).join('/');
+      let url = `/vault/secrets?namespace=${targetNamespace}`;
+      // check if namespace is in the toggle
+      await click('[data-test-namespace-toggle]');
+
       // check that the single namespace "beep" or "boop" not "beep/boop" shows in the toggle display
       assert
         .dom(`[data-test-namespace-link="${targetNamespace}"]`)
-        .hasText(ns, `shows the namespace ${ns} in the toggle component`);
+        .hasText(ns, 'shows the namespace in the toggle component');
+      // close toggle
+      await click('[data-test-namespace-toggle]');
       // because quint does not like page reloads, visiting url directing instead of clicking on namespace in toggle
       await visit(url);
     }
-
     await logout.visit();
     await settled();
     await authPage.visit({ namespace: '/beep/boop' });
@@ -74,15 +74,15 @@ module('Acceptance | Enterprise | namespaces', function (hooks) {
   test('it shows the regular namespace toolbar when not managed', async function (assert) {
     // This test is the opposite of the test in managed-namespace-test
     await logout.visit();
-    assert.strictEqual(currentURL(), '/vault/auth?with=token', 'Does not redirect');
+    assert.equal(currentURL(), '/vault/auth?with=token', 'Does not redirect');
     assert.dom('[data-test-namespace-toolbar]').exists('Normal namespace toolbar exists');
     assert
       .dom('[data-test-managed-namespace-toolbar]')
       .doesNotExist('Managed namespace toolbar does not exist');
     assert.dom('input#namespace').hasAttribute('placeholder', '/ (Root)');
     await fillIn('input#namespace', '/foo');
-    const encodedNamespace = encodeURIComponent('/foo');
-    assert.strictEqual(
+    let encodedNamespace = encodeURIComponent('/foo');
+    assert.equal(
       currentURL(),
       `/vault/auth?namespace=${encodedNamespace}&with=token`,
       'Does not prepend root to namespace'
diff --git a/ui/tests/acceptance/enterprise-oidc-namespace-test.js b/ui/tests/acceptance/enterprise-oidc-namespace-test.js
deleted file mode 100644
index a28a38792cf64..0000000000000
--- a/ui/tests/acceptance/enterprise-oidc-namespace-test.js
+++ /dev/null
@@ -1,91 +0,0 @@
-import { visit, currentURL } from '@ember/test-helpers';
-import { module, test } from 'qunit';
-import { setupApplicationTest } from 'ember-qunit';
-import { create } from 'ember-cli-page-object';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import parseURL from 'core/utils/parse-url';
-import consoleClass from 'vault/tests/pages/components/console/ui-panel';
-import authPage from 'vault/tests/pages/auth';
-
-const shell = create(consoleClass);
-
-const createNS = async (name) => {
-  await shell.runCommands(`write sys/namespaces/${name} -force`);
-};
-const SELECTORS = {
-  authTab: (path) => `[data-test-auth-method="${path}"] a`,
-};
-
-module('Acceptance | Enterprise | oidc auth namespace test', function (hooks) {
-  setupApplicationTest(hooks);
-  setupMirage(hooks);
-
-  hooks.beforeEach(async function () {
-    this.namespace = 'test-ns';
-    this.rootOidc = 'root-oidc';
-    this.nsOidc = 'ns-oidc';
-
-    this.server.post(`/auth/:path/config`, () => {});
-
-    this.enableOidc = (path, role = '') => {
-      return shell.runCommands([
-        `write sys/auth/${path} type=oidc`,
-        `write auth/${path}/config default_role="${role}" oidc_discovery_url="https://example.com"`,
-        // show method as tab
-        `write sys/auth/${path}/tune listing_visibility="unauth"`,
-      ]);
-    };
-
-    this.disableOidc = (path) => shell.runCommands([`delete /sys/auth/${path}`]);
-  });
-
-  test('oidc: request is made to auth_url when a namespace is inputted', async function (assert) {
-    assert.expect(5);
-
-    this.server.post(`/auth/${this.rootOidc}/oidc/auth_url`, (schema, req) => {
-      const { redirect_uri } = JSON.parse(req.requestBody);
-      const { pathname, search } = parseURL(redirect_uri);
-      assert.strictEqual(
-        pathname + search,
-        `/ui/vault/auth/${this.rootOidc}/oidc/callback`,
-        'request made to auth_url when the login page is visited'
-      );
-    });
-    this.server.post(`/auth/${this.nsOidc}/oidc/auth_url`, (schema, req) => {
-      const { redirect_uri } = JSON.parse(req.requestBody);
-      const { pathname, search } = parseURL(redirect_uri);
-      assert.strictEqual(
-        pathname + search,
-        `/ui/vault/auth/${this.nsOidc}/oidc/callback?namespace=${this.namespace}`,
-        'request made to correct auth_url when namespace is filled in'
-      );
-    });
-
-    await authPage.login();
-    // enable oidc in root namespace, without default role
-    await this.enableOidc(this.rootOidc);
-    // create child namespace to enable oidc
-    await createNS(this.namespace);
-    // enable oidc in child namespace with default role
-    await authPage.loginNs(this.namespace);
-    await this.enableOidc(this.nsOidc, `${this.nsOidc}-role`);
-    await authPage.logout();
-
-    await visit('/vault/auth');
-    assert.dom(SELECTORS.authTab(this.rootOidc)).exists('renders oidc method tab for root');
-    await authPage.namespaceInput(this.namespace);
-    assert.strictEqual(
-      currentURL(),
-      `/vault/auth?namespace=${this.namespace}&with=${this.nsOidc}%2F`,
-      'url updates with namespace value'
-    );
-    assert.dom(SELECTORS.authTab(this.nsOidc)).exists('renders oidc method tab for child namespace');
-
-    // disable methods to cleanup test state for re-running
-    await authPage.login();
-    await this.disableOidc(this.rootOidc);
-    await this.disableOidc(this.nsOidc);
-    await shell.runCommands([`delete /sys/auth/${this.namespace}`]);
-    await authPage.logout();
-  });
-});
diff --git a/ui/tests/acceptance/enterprise-replication-test.js b/ui/tests/acceptance/enterprise-replication-test.js
index f72875fb99908..4ee79bd9ae6de 100644
--- a/ui/tests/acceptance/enterprise-replication-test.js
+++ b/ui/tests/acceptance/enterprise-replication-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { clickTrigger } from 'ember-power-select/test-support/helpers';
 import { click, fillIn, findAll, currentURL, find, visit, settled, waitUntil } from '@ember/test-helpers';
 import { module, test } from 'qunit';
@@ -32,7 +27,7 @@ const disableReplication = async (type, assert) => {
 
     if (assert) {
       // bypassing for now -- remove if tests pass reliably
-      // assert.strictEqual(
+      // assert.equal(
       //   flash.latestMessage,
       //   'This cluster is having replication disabled. Vault will be unavailable for a brief period and will resume service shortly.',
       //   'renders info flash when disabled'
@@ -69,6 +64,7 @@ module('Acceptance | Enterprise | replication', function (hooks) {
     assert.expect(17);
     const secondaryName = 'firstSecondary';
     const mode = 'deny';
+    let mountPath;
 
     // confirm unable to visit dr secondary details page when both replications are disabled
     await visit('/vault/replication-dr-promote/details');
@@ -87,7 +83,7 @@ module('Acceptance | Enterprise | replication', function (hooks) {
 
     await visit('/vault/replication');
 
-    assert.strictEqual(currentURL(), '/vault/replication');
+    assert.equal(currentURL(), '/vault/replication');
 
     // enable perf replication
     await click('[data-test-replication-type-select="performance"]');
@@ -110,7 +106,7 @@ module('Acceptance | Enterprise | replication', function (hooks) {
 
     await click('#deny');
     await clickTrigger();
-    const mountPath = searchSelect.options.objectAt(0).text;
+    mountPath = searchSelect.options.objectAt(0).text;
     await searchSelect.options.objectAt(0).click();
     await click('[data-test-secondary-add]');
 
@@ -122,10 +118,7 @@ module('Acceptance | Enterprise | replication', function (hooks) {
 
     await click('[data-test-replication-path-filter-link]');
 
-    assert.strictEqual(
-      currentURL(),
-      `/vault/replication/performance/secondaries/config/show/${secondaryName}`
-    );
+    assert.equal(currentURL(), `/vault/replication/performance/secondaries/config/show/${secondaryName}`);
     assert.dom('[data-test-mount-config-mode]').includesText(mode, 'show page renders the correct mode');
     assert
       .dom('[data-test-mount-config-paths]')
@@ -139,12 +132,12 @@ module('Acceptance | Enterprise | replication', function (hooks) {
     await click('[data-test-config-save]');
     await settled(); // eslint-disable-line
 
-    assert.strictEqual(
+    assert.equal(
       flash.latestMessage,
       `The performance mount filter config for the secondary ${secondaryName} was successfully deleted.`,
       'renders success flash upon deletion'
     );
-    assert.strictEqual(
+    assert.equal(
       currentURL(),
       `/vault/replication/performance/secondaries`,
       'redirects to the secondaries page'
@@ -279,10 +272,10 @@ module('Acceptance | Enterprise | replication', function (hooks) {
 
     await pollCluster(this.owner);
     await settled();
-    const modalDefaultTtl = document.querySelector('[data-test-row-value="TTL"]').innerText;
+    let modalDefaultTtl = document.querySelector('[data-test-row-value="TTL"]').innerText;
     // checks on secondary token modal
     assert.dom('#modal-wormhole').exists();
-    assert.strictEqual(modalDefaultTtl, '1800s', 'shows the correct TTL of 1800s');
+    assert.equal(modalDefaultTtl, '1800s', 'shows the correct TTL of 1800s');
     // click off the modal to make sure you don't just have to click on the copy-close button to copy the token
     await click('[data-test-modal-background="Copy your token"]');
 
@@ -297,12 +290,12 @@ module('Acceptance | Enterprise | replication', function (hooks) {
 
     await pollCluster(this.owner);
     await settled();
-    const modalTtl = document.querySelector('[data-test-row-value="TTL"]').innerText;
-    assert.strictEqual(modalTtl, '180s', 'shows the correct TTL of 180s');
+    let modalTtl = document.querySelector('[data-test-row-value="TTL"]').innerText;
+    assert.equal(modalTtl, '180s', 'shows the correct TTL of 180s');
     await click('[data-test-modal-background="Copy your token"]');
 
     // confirm you were redirected to the secondaries page
-    assert.strictEqual(
+    assert.equal(
       currentURL(),
       `/vault/replication/performance/secondaries`,
       'redirects to the secondaries page'
@@ -330,7 +323,10 @@ module('Acceptance | Enterprise | replication', function (hooks) {
       .doesNotExist(`does not render replication summary card when both modes are not enabled as primary`);
 
     // enable DR primary replication
-    await click('[data-test-replication-promote-secondary]');
+    const enableButton = document.querySelector('.is-primary');
+
+    await click(enableButton);
+
     await click('[data-test-replication-enable]');
 
     await pollCluster(this.owner);
@@ -349,7 +345,7 @@ module('Acceptance | Enterprise | replication', function (hooks) {
     assert
       .dom('[data-test-selectable-card-container="primary"]')
       .exists('shows the correct card on the details dashboard');
-    assert.strictEqual(currentURL(), '/vault/replication/dr');
+    assert.equal(currentURL(), '/vault/replication/dr');
   });
 
   test('render performance secondary and navigate to the details page', async function (assert) {
diff --git a/ui/tests/acceptance/enterprise-sidebar-nav-test.js b/ui/tests/acceptance/enterprise-sidebar-nav-test.js
deleted file mode 100644
index 270efe6f16c23..0000000000000
--- a/ui/tests/acceptance/enterprise-sidebar-nav-test.js
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupApplicationTest } from 'ember-qunit';
-import { click, currentURL, fillIn } from '@ember/test-helpers';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import authPage from 'vault/tests/pages/auth';
-
-const link = (label) => `[data-test-sidebar-nav-link="${label}"]`;
-const panel = (label) => `[data-test-sidebar-nav-panel="${label}"]`;
-
-module('Acceptance | Enterprise | sidebar navigation', function (hooks) {
-  setupApplicationTest(hooks);
-  setupMirage(hooks);
-
-  hooks.beforeEach(function () {
-    return authPage.login();
-  });
-
-  // common links are tested in the sidebar-nav test and will not be covered here
-  test('it should render enterprise only navigation links', async function (assert) {
-    assert.dom(panel('Cluster')).exists('Cluster nav panel renders');
-
-    await click(link('Replication'));
-    assert.strictEqual(currentURL(), '/vault/replication', 'Replication route renders');
-    await click('[data-test-replication-enable]');
-
-    await click(link('Performance'));
-    assert.strictEqual(
-      currentURL(),
-      '/vault/replication/performance',
-      'Replication performance route renders'
-    );
-
-    await click(link('Disaster Recovery'));
-    assert.strictEqual(currentURL(), '/vault/replication/dr', 'Replication dr route renders');
-    // disable replication now that we have checked the links
-    await click('[data-test-replication-link="manage"]');
-    await click('[data-test-replication-action-trigger]');
-    await fillIn('[data-test-confirmation-modal-input="Disable Replication?"]', 'Disaster Recovery');
-    await click('[data-test-confirm-button="Disable Replication?"]');
-
-    await click(link('Client count'));
-    assert.strictEqual(currentURL(), '/vault/clients/dashboard', 'Client counts route renders');
-
-    await click(link('License'));
-    assert.strictEqual(currentURL(), '/vault/license', 'License route renders');
-
-    await click(link('Access'));
-    await click(link('Control Groups'));
-    assert.strictEqual(currentURL(), '/vault/access/control-groups', 'Control groups route renders');
-
-    await click(link('Namespaces'));
-    assert.strictEqual(currentURL(), '/vault/access/namespaces?page=1', 'Replication route renders');
-
-    await click(link('Back to main navigation'));
-    await click(link('Policies'));
-    await click(link('Role-Governing Policies'));
-    assert.strictEqual(currentURL(), '/vault/policies/rgp', 'Role-Governing Policies route renders');
-
-    await click(link('Endpoint Governing Policies'));
-    assert.strictEqual(currentURL(), '/vault/policies/egp', 'Endpoint Governing Policies route renders');
-  });
-});
diff --git a/ui/tests/acceptance/enterprise-transform-test.js b/ui/tests/acceptance/enterprise-transform-test.js
index 6122473d1e13d..87c2b17ef8ade 100644
--- a/ui/tests/acceptance/enterprise-transform-test.js
+++ b/ui/tests/acceptance/enterprise-transform-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
 import { currentURL, click, settled } from '@ember/test-helpers';
@@ -20,7 +15,7 @@ import searchSelect from 'vault/tests/pages/components/search-select';
 const searchSelectComponent = create(searchSelect);
 
 const mount = async () => {
-  const path = `transform-${Date.now()}`;
+  let path = `transform-${Date.now()}`;
   await mountSecrets.enable('transform', path);
   await settled();
   return path;
@@ -66,10 +61,10 @@ module('Acceptance | Enterprise | Transform secrets', function (hooks) {
   });
 
   test('it enables Transform secrets engine and shows tabs', async function (assert) {
-    const backend = `transform-${Date.now()}`;
+    let backend = `transform-${Date.now()}`;
     await mountSecrets.enable('transform', backend);
     await settled();
-    assert.strictEqual(
+    assert.equal(
       currentURL(),
       `/vault/secrets/${backend}/list`,
       'mounts and redirects to the transformations list page'
@@ -84,17 +79,13 @@ module('Acceptance | Enterprise | Transform secrets', function (hooks) {
   });
 
   test('it can create a transformation and add itself to the role attached', async function (assert) {
-    const backend = await mount();
+    let backend = await mount();
     const transformationName = 'foo';
     const roleName = 'foo-role';
     await settled();
     await transformationsPage.createLink({ backend });
     await settled();
-    assert.strictEqual(
-      currentURL(),
-      `/vault/secrets/${backend}/create`,
-      'redirects to create transformation page'
-    );
+    assert.equal(currentURL(), `/vault/secrets/${backend}/create`, 'redirects to create transformation page');
     await transformationsPage.name(transformationName);
     await settled();
     assert.dom('[data-test-input="type"]').hasValue('fpe', 'Has type FPE by default');
@@ -107,7 +98,7 @@ module('Acceptance | Enterprise | Transform secrets', function (hooks) {
     assert.dom('[data-test-input="tweak_source"]').doesNotExist('Does not show tweak source when masking');
     await clickTrigger('#template');
     await settled();
-    assert.strictEqual(searchSelectComponent.options.length, 2, 'list shows two builtin options by default');
+    assert.equal(searchSelectComponent.options.length, 2, 'list shows two builtin options by default');
     await selectChoose('#template', '.ember-power-select-option', 0);
     await settled();
 
@@ -119,52 +110,44 @@ module('Acceptance | Enterprise | Transform secrets', function (hooks) {
     await settled();
     await transformationsPage.submit();
     await settled();
-    assert.strictEqual(
+    assert.equal(
       currentURL(),
       `/vault/secrets/${backend}/show/${transformationName}`,
       'redirects to show transformation page after submit'
     );
     await click(`[data-test-secret-breadcrumb="${backend}"]`);
-    assert.strictEqual(
-      currentURL(),
-      `/vault/secrets/${backend}/list`,
-      'Links back to list view from breadcrumb'
-    );
+    assert.equal(currentURL(), `/vault/secrets/${backend}/list`, 'Links back to list view from breadcrumb');
   });
 
   test('it can create a role and add itself to the transformation attached', async function (assert) {
     const roleName = 'my-role';
-    const backend = await mount();
+    let backend = await mount();
     // create transformation without role
     await newTransformation(backend, 'a-transformation', true);
     await click(`[data-test-secret-breadcrumb="${backend}"]`);
-    assert.strictEqual(
-      currentURL(),
-      `/vault/secrets/${backend}/list`,
-      'Links back to list view from breadcrumb'
-    );
+    assert.equal(currentURL(), `/vault/secrets/${backend}/list`, 'Links back to list view from breadcrumb');
     await click('[data-test-secret-list-tab="Roles"]');
-    assert.strictEqual(currentURL(), `/vault/secrets/${backend}/list?tab=role`, 'links to role list page');
+    assert.equal(currentURL(), `/vault/secrets/${backend}/list?tab=role`, 'links to role list page');
     // create role with transformation attached
     await rolesPage.createLink();
-    assert.strictEqual(
+    assert.equal(
       currentURL(),
       `/vault/secrets/${backend}/create?itemType=role`,
       'redirects to create role page'
     );
     await rolesPage.name(roleName);
     await clickTrigger('#transformations');
-    assert.strictEqual(searchSelectComponent.options.length, 1, 'lists the transformation');
+    assert.equal(searchSelectComponent.options.length, 1, 'lists the transformation');
     await selectChoose('#transformations', '.ember-power-select-option', 0);
     await rolesPage.submit();
     await settled();
-    assert.strictEqual(
+    assert.equal(
       currentURL(),
       `/vault/secrets/${backend}/show/role/${roleName}`,
       'redirects to show role page after submit'
     );
     await click(`[data-test-secret-breadcrumb="${backend}"]`);
-    assert.strictEqual(
+    assert.equal(
       currentURL(),
       `/vault/secrets/${backend}/list?tab=role`,
       'Links back to role list view from breadcrumb'
@@ -173,22 +156,20 @@ module('Acceptance | Enterprise | Transform secrets', function (hooks) {
 
   test('it adds a role to a transformation when added to a role', async function (assert) {
     const roleName = 'role-test';
-    const backend = await mount();
-    const transformation = await newTransformation(backend, 'b-transformation', true);
+    let backend = await mount();
+    let transformation = await newTransformation(backend, 'b-transformation', true);
     await newRole(backend, roleName);
     await transformationsPage.visitShow({ backend, id: transformation });
-    await settled();
     assert.dom('[data-test-row-value="Allowed roles"]').hasText(roleName);
   });
 
   test('it shows a message if an update fails after save', async function (assert) {
     const roleName = 'role-remove';
-    const backend = await mount();
+    let backend = await mount();
     // Create transformation
-    const transformation = await newTransformation(backend, 'c-transformation', true);
+    let transformation = await newTransformation(backend, 'c-transformation', true);
     // create role
     await newRole(backend, roleName);
-    await settled();
     await transformationsPage.visitShow({ backend, id: transformation });
     assert.dom('[data-test-row-value="Allowed roles"]').hasText(roleName);
     // Edit transformation
@@ -196,7 +177,7 @@ module('Acceptance | Enterprise | Transform secrets', function (hooks) {
     assert.dom('.modal.is-active').exists('Confirmation modal appears');
     await rolesPage.modalConfirm();
     await settled();
-    assert.strictEqual(
+    assert.equal(
       currentURL(),
       `/vault/secrets/${backend}/edit/${transformation}`,
       'Correctly links to edit page for secret'
@@ -208,7 +189,7 @@ module('Acceptance | Enterprise | Transform secrets', function (hooks) {
     await transformationsPage.save();
     await settled();
     assert.dom('.flash-message.is-info').exists('Shows info message since role could not be updated');
-    assert.strictEqual(
+    assert.equal(
       currentURL(),
       `/vault/secrets/${backend}/show/${transformation}`,
       'Correctly links to show page for secret'
@@ -220,17 +201,13 @@ module('Acceptance | Enterprise | Transform secrets', function (hooks) {
 
   test('it allows creation and edit of a template', async function (assert) {
     const templateName = 'my-template';
-    const backend = await mount();
+    let backend = await mount();
     await click('[data-test-secret-list-tab="Templates"]');
 
-    assert.strictEqual(
-      currentURL(),
-      `/vault/secrets/${backend}/list?tab=template`,
-      'links to template list page'
-    );
+    assert.equal(currentURL(), `/vault/secrets/${backend}/list?tab=template`, 'links to template list page');
     await settled();
     await templatesPage.createLink();
-    assert.strictEqual(
+    assert.equal(
       currentURL(),
       `/vault/secrets/${backend}/create?itemType=template`,
       'redirects to create template page'
@@ -244,14 +221,14 @@ module('Acceptance | Enterprise | Transform secrets', function (hooks) {
     assert.dom('#alphabet .ember-power-select-trigger').doesNotExist('Alphabet input no longer searchable');
     await templatesPage.submit();
     await settled();
-    assert.strictEqual(
+    assert.equal(
       currentURL(),
       `/vault/secrets/${backend}/show/template/${templateName}`,
       'redirects to show template page after submit'
     );
     await templatesPage.editLink();
     await settled();
-    assert.strictEqual(
+    assert.equal(
       currentURL(),
       `/vault/secrets/${backend}/edit/template/${templateName}`,
       'Links to template edit page'
@@ -262,17 +239,13 @@ module('Acceptance | Enterprise | Transform secrets', function (hooks) {
 
   test('it allows creation and edit of an alphabet', async function (assert) {
     const alphabetName = 'vowels-only';
-    const backend = await mount();
+    let backend = await mount();
     await click('[data-test-secret-list-tab="Alphabets"]');
 
-    assert.strictEqual(
-      currentURL(),
-      `/vault/secrets/${backend}/list?tab=alphabet`,
-      'links to alphabet list page'
-    );
+    assert.equal(currentURL(), `/vault/secrets/${backend}/list?tab=alphabet`, 'links to alphabet list page');
     await alphabetsPage.createLink();
     await settled();
-    assert.strictEqual(
+    assert.equal(
       currentURL(),
       `/vault/secrets/${backend}/create?itemType=alphabet`,
       'redirects to create alphabet page'
@@ -281,7 +254,7 @@ module('Acceptance | Enterprise | Transform secrets', function (hooks) {
     await alphabetsPage.alphabet('aeiou');
     await alphabetsPage.submit();
     await settled();
-    assert.strictEqual(
+    assert.equal(
       currentURL(),
       `/vault/secrets/${backend}/show/alphabet/${alphabetName}`,
       'redirects to show alphabet page after submit'
@@ -290,7 +263,7 @@ module('Acceptance | Enterprise | Transform secrets', function (hooks) {
     assert.dom('[data-test-row-value="Alphabet"]').hasText('aeiou');
     await alphabetsPage.editLink();
     await settled();
-    assert.strictEqual(
+    assert.equal(
       currentURL(),
       `/vault/secrets/${backend}/edit/alphabet/${alphabetName}`,
       'Links to alphabet edit page'
diff --git a/ui/tests/acceptance/init-test.js b/ui/tests/acceptance/init-test.js
index a10169bf1c53f..93c6b1c534078 100644
--- a/ui/tests/acceptance/init-test.js
+++ b/ui/tests/acceptance/init-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
 
@@ -17,7 +12,7 @@ const HEALTH_RESPONSE = {
   replication_performance_mode: 'unknown',
   replication_dr_mode: 'unknown',
   server_time_utc: 1538066726,
-  version: '1.13.0-dev1',
+  version: '0.11.0+prem',
 };
 
 const CLOUD_SEAL_RESPONSE = {
@@ -83,12 +78,12 @@ const assertRequest = (req, assert, isCloud) => {
 module('Acceptance | init', function (hooks) {
   setupApplicationTest(hooks);
 
-  const setInitResponse = (server, resp) => {
+  let setInitResponse = (server, resp) => {
     server.put('/v1/sys/init', () => {
       return [200, { 'Content-Type': 'application/json' }, JSON.stringify(resp)];
     });
   };
-  const setStatusResponse = (server, resp) => {
+  let setStatusResponse = (server, resp) => {
     server.get('/v1/sys/seal-status', () => {
       return [200, { 'Content-Type': 'application/json' }, JSON.stringify(resp)];
     });
diff --git a/ui/tests/acceptance/jwt-auth-method-test.js b/ui/tests/acceptance/jwt-auth-method-test.js
index 166f0f9aa7047..6e5d4d0321715 100644
--- a/ui/tests/acceptance/jwt-auth-method-test.js
+++ b/ui/tests/acceptance/jwt-auth-method-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
 import { click, visit, fillIn } from '@ember/test-helpers';
@@ -16,7 +11,6 @@ module('Acceptance | jwt auth method', function (hooks) {
   setupMirage(hooks);
 
   hooks.beforeEach(function () {
-    localStorage.clear(); // ensure that a token isn't stored otherwise visit('/vault/auth') will redirect to secrets
     this.stub = sinon.stub();
     this.server.post(
       '/auth/:path/oidc/auth_url',
@@ -37,8 +31,8 @@ module('Acceptance | jwt auth method', function (hooks) {
     this.server.post('/auth/jwt/login', (schema, req) => {
       const { jwt, role } = JSON.parse(req.requestBody);
       assert.ok(true, 'request made to auth/jwt/login after submit');
-      assert.strictEqual(jwt, 'my-test-jwt-token', 'JWT token is sent in body');
-      assert.strictEqual(role, undefined, 'role is not sent in body when not filled in');
+      assert.equal(jwt, 'my-test-jwt-token', 'JWT token is sent in body');
+      assert.equal(role, undefined, 'role is not sent in body when not filled in');
       req.passthrough();
     });
     await visit('/vault/auth');
@@ -55,8 +49,8 @@ module('Acceptance | jwt auth method', function (hooks) {
     this.server.post('/auth/jwt/login', (schema, req) => {
       const { jwt, role } = JSON.parse(req.requestBody);
       assert.ok(true, 'request made to auth/jwt/login after login');
-      assert.strictEqual(jwt, 'my-test-jwt-token', 'JWT token is sent in body');
-      assert.strictEqual(role, 'some-role', 'role is sent in the body when filled in');
+      assert.equal(jwt, 'my-test-jwt-token', 'JWT token is sent in body');
+      assert.equal(role, 'some-role', 'role is sent in the body when filled in');
       req.passthrough();
     });
     await visit('/vault/auth');
@@ -82,8 +76,8 @@ module('Acceptance | jwt auth method', function (hooks) {
     this.server.post('/auth/test-jwt/login', (schema, req) => {
       const { jwt, role } = JSON.parse(req.requestBody);
       assert.ok(true, 'request made to auth/custom-jwt-login after login');
-      assert.strictEqual(jwt, 'my-test-jwt-token', 'JWT token is sent in body');
-      assert.strictEqual(role, 'some-role', 'role is sent in body when filled in');
+      assert.equal(jwt, 'my-test-jwt-token', 'JWT token is sent in body');
+      assert.equal(role, 'some-role', 'role is sent in body when filled in');
       req.passthrough();
     });
     await visit('/vault/auth');
diff --git a/ui/tests/acceptance/leases-test.js b/ui/tests/acceptance/leases-test.js
index de306d6f3dbef..1b2ac06a67427 100644
--- a/ui/tests/acceptance/leases-test.js
+++ b/ui/tests/acceptance/leases-test.js
@@ -1,10 +1,5 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { click, currentRouteName, visit } from '@ember/test-helpers';
-// TESTS HERE ARE SKIPPED
+// TESTS HERE ARE SKPPED
 // running vault with -dev-leased-kv flag lets you run some of these tests
 // but generating leases programmatically is currently difficult
 //
@@ -12,7 +7,6 @@ import { click, currentRouteName, visit } from '@ember/test-helpers';
 
 import { module, skip } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
-import { v4 as uuidv4 } from 'uuid';
 import secretList from 'vault/tests/pages/secrets/backend/list';
 import secretEdit from 'vault/tests/pages/secrets/backend/kv/edit-secret';
 import mountSecrets from 'vault/tests/pages/settings/mount-secret-backend';
@@ -24,7 +18,7 @@ module('Acceptance | leases', function (hooks) {
 
   hooks.beforeEach(async function () {
     await authPage.login();
-    this.enginePath = `kv-for-lease-${uuidv4()}`;
+    this.enginePath = `kv-for-lease-${new Date().getTime()}`;
     // need a version 1 mount for leased secrets here
     return mountSecrets.visit().path(this.enginePath).type('kv').version(1).submit();
   });
@@ -34,7 +28,7 @@ module('Acceptance | leases', function (hooks) {
   });
 
   const createSecret = async (context, isRenewable) => {
-    context.name = `secret-${uuidv4()}`;
+    context.name = `secret-${new Date().getTime()}`;
     await secretList.visitRoot({ backend: context.enginePath });
     await secretList.create();
     if (isRenewable) {
@@ -54,7 +48,7 @@ module('Acceptance | leases', function (hooks) {
   skip('it renders the show page', function (assert) {
     createSecret(this);
     navToDetail(this);
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.leases.show',
       'a lease for the secret is in the list'
@@ -68,7 +62,7 @@ module('Acceptance | leases', function (hooks) {
   skip('it renders the show page with a picker', function (assert) {
     createSecret(this, true);
     navToDetail(this);
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.leases.show',
       'a lease for the secret is in the list'
@@ -83,7 +77,7 @@ module('Acceptance | leases', function (hooks) {
     navToDetail(this);
     await click('[data-test-lease-revoke] button');
     await click('[data-test-confirm-button]');
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.leases.list-root',
       'it navigates back to the leases root on revocation'
@@ -100,7 +94,7 @@ module('Acceptance | leases', function (hooks) {
     await visit(`/vault/access/leases/list/${this.enginePath}`);
     await click('[data-test-lease-revoke-prefix] button');
     await click('[data-test-confirm-button]');
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.leases.list-root',
       'it navigates back to the leases root on revocation'
diff --git a/ui/tests/acceptance/managed-namespace-test.js b/ui/tests/acceptance/managed-namespace-test.js
index 6f6bb4061ea31..950164ff84849 100644
--- a/ui/tests/acceptance/managed-namespace-test.js
+++ b/ui/tests/acceptance/managed-namespace-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { currentURL, visit, fillIn } from '@ember/test-helpers';
 import { setupApplicationTest } from 'ember-qunit';
@@ -48,8 +43,8 @@ module('Acceptance | Enterprise | Managed namespace root', function (hooks) {
     assert.dom('[data-test-managed-namespace-root]').hasText('/admin', 'Shows /admin namespace prefix');
     assert.dom('input#namespace').hasAttribute('placeholder', '/ (Default)');
     await fillIn('input#namespace', '/foo');
-    const encodedNamespace = encodeURIComponent('admin/foo');
-    assert.strictEqual(
+    let encodedNamespace = encodeURIComponent('admin/foo');
+    assert.equal(
       currentURL(),
       `/vault/auth?namespace=${encodedNamespace}&with=token`,
       'Correctly prepends root to namespace'
@@ -58,17 +53,17 @@ module('Acceptance | Enterprise | Managed namespace root', function (hooks) {
 
   test('getManagedNamespace helper works as expected', function (assert) {
     let managedNs = getManagedNamespace(null, 'admin');
-    assert.strictEqual(managedNs, 'admin', 'returns root ns when no namespace present');
+    assert.equal(managedNs, 'admin', 'returns root ns when no namespace present');
     managedNs = getManagedNamespace('admin/', 'admin');
-    assert.strictEqual(managedNs, 'admin', 'returns root ns when matches passed ns');
+    assert.equal(managedNs, 'admin', 'returns root ns when matches passed ns');
     managedNs = getManagedNamespace('adminfoo/', 'admin');
-    assert.strictEqual(
+    assert.equal(
       managedNs,
       'admin/adminfoo/',
       'appends passed namespace to root even if it matches without slashes'
     );
     managedNs = getManagedNamespace('admin/foo/', 'admin');
-    assert.strictEqual(managedNs, 'admin/foo/', 'returns passed namespace if it starts with root and /');
+    assert.equal(managedNs, 'admin/foo/', 'returns passed namespace if it starts with root and /');
   });
 
   test('it redirects to root prefixed ns when non-root passed', async function (assert) {
diff --git a/ui/tests/acceptance/mfa-login-enforcement-test.js b/ui/tests/acceptance/mfa-login-enforcement-test.js
index bd8e05e0c2b4e..6b720c1aa9e78 100644
--- a/ui/tests/acceptance/mfa-login-enforcement-test.js
+++ b/ui/tests/acceptance/mfa-login-enforcement-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
 import { click, currentRouteName, fillIn, visit } from '@ember/test-helpers';
@@ -26,7 +21,7 @@ module('Acceptance | mfa-login-enforcement', function (hooks) {
 
   test('it should create login enforcement', async function (assert) {
     await visit('/ui/vault/access');
-    await click('[data-test-sidebar-nav-link="Multi-factor authentication"]');
+    await click('[data-test-link="mfa"]');
     await click('[data-test-tab="enforcements"]');
     await click('[data-test-enforcement-create]');
 
@@ -37,14 +32,14 @@ module('Acceptance | mfa-login-enforcement', function (hooks) {
       .exists({ count: 3 }, 'Validation error messages are displayed');
 
     await click('[data-test-mlef-cancel]');
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.mfa.enforcements.index',
       'Cancel transitions to enforcements list'
     );
     await click('[data-test-enforcement-create]');
     await click('.breadcrumb a');
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.mfa.enforcements.index',
       'Breadcrumb transitions to enforcements list'
@@ -57,7 +52,7 @@ module('Acceptance | mfa-login-enforcement', function (hooks) {
     await fillIn('[data-test-mount-accessor-select]', 'auth_userpass_bb95c2b1');
     await click('[data-test-mlef-add-target]');
     await click('[data-test-mlef-save]');
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.mfa.enforcements.enforcement.index',
       'Route transitions to enforcement on save success'
@@ -73,7 +68,7 @@ module('Acceptance | mfa-login-enforcement', function (hooks) {
       .includesText('New enforcement', 'New enforcement link renders');
 
     await click('[data-test-enforcement-create]');
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.mfa.enforcements.create',
       'New enforcement link transitions to create route'
@@ -90,7 +85,7 @@ module('Acceptance | mfa-login-enforcement', function (hooks) {
 
     await click('[data-test-popup-menu-trigger]');
     await click('[data-test-list-item-link="details"]');
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.mfa.enforcements.enforcement.index',
       'Details more menu action transitions to enforcement route'
@@ -98,7 +93,7 @@ module('Acceptance | mfa-login-enforcement', function (hooks) {
     await click('.breadcrumb a');
     await click('[data-test-popup-menu-trigger]');
     await click('[data-test-list-item-link="edit"]');
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.mfa.enforcements.enforcement.edit',
       'Edit more menu action transitions to enforcement edit route'
@@ -171,7 +166,7 @@ module('Acceptance | mfa-login-enforcement', function (hooks) {
     assert.dom('[data-test-confirm-button]').isDisabled('Delete button disabled with no confirmation');
     await fillIn('[data-test-confirmation-modal-input]', enforcement.name);
     await click('[data-test-confirm-button]');
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.mfa.enforcements.index',
       'Route transitions to enforcements list on delete success'
@@ -210,7 +205,7 @@ module('Acceptance | mfa-login-enforcement', function (hooks) {
     await click('[data-test-mlef-remove-target="Authentication method"]');
     await click('[data-test-mlef-save]');
 
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.mfa.enforcements.enforcement.index',
       'Route transitions to enforcement on save success'
diff --git a/ui/tests/acceptance/mfa-login-test.js b/ui/tests/acceptance/mfa-login-test.js
index e30ca59528aa8..449cadc4ce7e5 100644
--- a/ui/tests/acceptance/mfa-login-test.js
+++ b/ui/tests/acceptance/mfa-login-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
 import { click, currentRouteName, fillIn, visit, waitUntil, find } from '@ember/test-helpers';
@@ -36,7 +31,7 @@ module('Acceptance | mfa-login', function (hooks) {
     await click('[data-test-auth-submit]');
   };
   const didLogin = (assert) => {
-    assert.strictEqual(currentRouteName(), 'vault.cluster.secrets.backends', 'Route transitions after login');
+    assert.equal(currentRouteName(), 'vault.cluster.secrets.backends', 'Route transitions after login');
   };
   const validate = async (multi) => {
     await fillIn('[data-test-mfa-passcode="0"]', 'test');
diff --git a/ui/tests/acceptance/mfa-method-test.js b/ui/tests/acceptance/mfa-method-test.js
index 400b69b25dc2e..1069e07a92aa4 100644
--- a/ui/tests/acceptance/mfa-method-test.js
+++ b/ui/tests/acceptance/mfa-method-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
 import { click, currentRouteName, currentURL, fillIn, visit } from '@ember/test-helpers';
@@ -37,18 +32,18 @@ module('Acceptance | mfa-method', function (hooks) {
   test('it should display landing page when no methods exist', async function (assert) {
     this.server.get('/identity/mfa/method/', () => new Response(404, {}, { errors: [] }));
     await visit('/vault/access/mfa/methods');
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.mfa.index',
       'Route redirects to mfa index when no methods exist'
     );
     await click('[data-test-mfa-configure]');
-    assert.strictEqual(currentRouteName(), 'vault.cluster.access.mfa.methods.create');
+    assert.equal(currentRouteName(), 'vault.cluster.access.mfa.methods.create');
   });
 
   test('it should list methods', async function (assert) {
     await visit('/vault/access/mfa');
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.mfa.methods.index',
       'Parent route redirects to methods when some exist'
@@ -58,7 +53,7 @@ module('Acceptance | mfa-method', function (hooks) {
     assert.dom('[data-test-mfa-method-create]').includesText('New MFA method', 'New mfa link renders');
 
     await click('[data-test-mfa-method-create]');
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.mfa.methods.create',
       'New method link transitions to create route'
@@ -78,7 +73,7 @@ module('Acceptance | mfa-method', function (hooks) {
 
     await click('[data-test-popup-menu-trigger]');
     await click('[data-test-mfa-method-menu-link="details"]');
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.mfa.methods.method.index',
       'Details more menu action transitions to method route'
@@ -86,7 +81,7 @@ module('Acceptance | mfa-method', function (hooks) {
     await click('.breadcrumb a');
     await click('[data-test-popup-menu-trigger]');
     await click('[data-test-mfa-method-menu-link="edit"]');
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.mfa.methods.method.edit',
       'Edit more menu action transitions to method edit route'
@@ -143,7 +138,7 @@ module('Acceptance | mfa-method', function (hooks) {
 
     await click('[data-test-mfa-method-list-item]');
     await click('[data-test-mfa-method-edit]');
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.mfa.methods.method.edit',
       'Toolbar action transitions to edit route'
@@ -196,7 +191,7 @@ module('Acceptance | mfa-method', function (hooks) {
         await fillIn(`[data-test-${inputType}="${field}"]`, 'foo');
       }
       await click('[data-test-mfa-create-save]');
-      assert.strictEqual(
+      assert.equal(
         currentRouteName(),
         'vault.cluster.access.mfa.methods.method.index',
         `${type} method is displayed on save`
@@ -217,14 +212,14 @@ module('Acceptance | mfa-method', function (hooks) {
     await fillIn('[data-test-mount-accessor-select]', 'auth_userpass_bb95c2b1');
     await click('[data-test-mlef-add-target]');
     await click('[data-test-mfa-create-save]');
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.mfa.methods.method.index',
       'Route transitions to method on save'
     );
     await click('[data-test-tab="enforcements"]');
     assert.dom('[data-test-list-item]').hasText('bar', 'Enforcement is listed in method view');
-    await click('[data-test-sidebar-nav-link="Multi-factor authentication"]');
+    await click('[data-test-link="mfa"]');
     await click('[data-test-tab="enforcements"]');
     assert.dom('[data-test-list-item="bar"]').hasText('bar', 'Enforcement is listed in enforcements view');
     await click('[data-test-list-item="bar"]');
@@ -245,7 +240,7 @@ module('Acceptance | mfa-method', function (hooks) {
     const name = enforcement.children[0].textContent.trim();
     await click(enforcement);
     await click('[data-test-mfa-create-save]');
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.mfa.methods.method.index',
       'Route transitions to method on save'
@@ -269,7 +264,7 @@ module('Acceptance | mfa-method', function (hooks) {
           .hasValue(model.period.toString(), 'Period form field is populated with model value');
         assert.dom('[data-test-select="ttl-unit"]').hasValue('s', 'Correct time unit is shown for period');
       } else if (key === 'algorithm' || key === 'digits' || key === 'skew') {
-        const radioElem = this.element.querySelector(`input[name=${key}]:checked`);
+        let radioElem = this.element.querySelector(`input[name=${key}]:checked`);
         assert
           .dom(radioElem)
           .hasValue(model[key].toString(), `${key} form field is populated with model value`);
@@ -281,7 +276,7 @@ module('Acceptance | mfa-method', function (hooks) {
     });
 
     await fillIn('[data-test-input="issuer"]', 'foo');
-    const SHA1radioBtn = this.element.querySelectorAll('input[name=algorithm]')[0];
+    let SHA1radioBtn = this.element.querySelectorAll('input[name=algorithm]')[0];
     await click(SHA1radioBtn);
     await fillIn('[data-test-input="max_validation_attempts"]', 10);
     await click('[data-test-mfa-method-save]');
@@ -294,16 +289,4 @@ module('Acceptance | mfa-method', function (hooks) {
       .dom('[data-test-row-value="Max validation attempts"]')
       .hasText('10', 'Max validation attempts field is updated');
   });
-
-  test('it should navigate to enforcements create route from method enforcement tab', async function (assert) {
-    await visit('/vault/access/mfa/methods');
-    await click('[data-test-mfa-method-list-item]');
-    await click('[data-test-tab="enforcements"]');
-    await click('[data-test-enforcement-create]');
-    assert.strictEqual(
-      currentRouteName(),
-      'vault.cluster.access.mfa.enforcements.create',
-      'Navigates to enforcements create route from toolbar action'
-    );
-  });
 });
diff --git a/ui/tests/acceptance/mfa-setup-test.js b/ui/tests/acceptance/mfa-setup-test.js
index 9e7f08db255cd..c8abe31887a7e 100644
--- a/ui/tests/acceptance/mfa-setup-test.js
+++ b/ui/tests/acceptance/mfa-setup-test.js
@@ -1,15 +1,10 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { create } from 'ember-cli-page-object';
-import { v4 as uuidv4 } from 'uuid';
 import { setupApplicationTest } from 'ember-qunit';
 import { click, fillIn } from '@ember/test-helpers';
 import authPage from 'vault/tests/pages/auth';
 import enablePage from 'vault/tests/pages/settings/auth/enable';
+import logout from 'vault/tests/pages/logout';
 import consoleClass from 'vault/tests/pages/components/console/ui-panel';
 import { setupMirage } from 'ember-cli-mirage/test-support';
 
@@ -34,7 +29,8 @@ const writeUserWithPolicy = async function (path) {
   ]);
 };
 
-const setupUser = async function (path) {
+const setupUser = async function () {
+  let path = `userpass-${new Date().getTime()}`;
   await writePolicy(path);
   await writeUserWithPolicy(path);
   await click('[data-test-save-config="true"]');
@@ -45,21 +41,21 @@ module('Acceptance | mfa-setup', function (hooks) {
   setupMirage(hooks);
 
   hooks.beforeEach(async function () {
-    const path = `userpass-${uuidv4()}`;
-    await authPage.login();
-    await setupUser(path);
-    await authPage.logout();
-    await authPage.loginUsername(USER, PASSWORD, path);
-    await click('[data-test-user-menu-trigger]');
-    await click('[data-test-user-menu-item="mfa"]');
+    await logout.visit();
+    await authPage.login('root');
+    await setupUser();
+    await logout.visit();
+    await authPage.loginUsername(USER, PASSWORD);
+    await click('.nav-user-button button');
+    await click('[data-test-status-link="mfa"]');
   });
 
-  test('it should login through MFA and post to generate and be able to restart the setup', async function (assert) {
+  test('it should login through MFA and post to admin-generate and be able to restart the setup', async function (assert) {
     assert.expect(5);
     // the network requests required in this test
-    this.server.post('/identity/mfa/method/totp/generate', (scheme, req) => {
+    this.server.post('/identity/mfa/method/totp/admin-generate', (scheme, req) => {
       const json = JSON.parse(req.requestBody);
-      assert.strictEqual(json.method_id, '123', 'sends the UUID value');
+      assert.equal(json.method_id, '123', 'sends the UUID value');
       return {
         data: {
           barcode:
@@ -71,7 +67,7 @@ module('Acceptance | mfa-setup', function (hooks) {
     });
     this.server.post('/identity/mfa/method/totp/admin-destroy', (scheme, req) => {
       const json = JSON.parse(req.requestBody);
-      assert.strictEqual(json.method_id, '123', 'sends the UUID value');
+      assert.equal(json.method_id, '123', 'sends the UUID value');
       // returns nothing
       return {};
     });
@@ -86,7 +82,7 @@ module('Acceptance | mfa-setup', function (hooks) {
   test('it should show a warning if you enter in the same UUID without restarting the setup', async function (assert) {
     assert.expect(2);
     // the network requests required in this test
-    this.server.post('/identity/mfa/method/totp/generate', () => {
+    this.server.post('/identity/mfa/method/totp/admin-generate', () => {
       return {
         data: null,
         warnings: ['Entity already has a secret for MFA method “”'],
diff --git a/ui/tests/acceptance/not-found-test.js b/ui/tests/acceptance/not-found-test.js
index 9375273620312..cda752501c867 100644
--- a/ui/tests/acceptance/not-found-test.js
+++ b/ui/tests/acceptance/not-found-test.js
@@ -1,9 +1,4 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { visit } from '@ember/test-helpers';
+import { findAll, visit } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
 import authPage from 'vault/tests/pages/auth';
@@ -28,22 +23,23 @@ module('Acceptance | not-found', function (hooks) {
 
   test('top-level not-found', async function (assert) {
     await visit('/404');
-    assert
-      .dom('[data-test-error-description]')
-      .hasText(
-        'Sorry, we were unable to find any content at that URL. Double check it or go back home.',
-        'renders cluster error template'
-      );
+    assert.ok(findAll('[data-test-not-found]').length, 'renders the not found component');
+    assert.ok(
+      findAll('[data-test-header-without-nav]').length,
+      'renders the not found component with a header'
+    );
   });
 
   test('vault route not-found', async function (assert) {
     await visit('/vault/404');
     assert.dom('[data-test-not-found]').exists('renders the not found component');
+    assert.ok(findAll('[data-test-header-with-nav]').length, 'renders header with nav');
   });
 
   test('cluster route not-found', async function (assert) {
     await visit('/vault/secrets/secret/404/show');
     assert.dom('[data-test-not-found]').exists('renders the not found component');
+    assert.ok(findAll('[data-test-header-with-nav]').length, 'renders header with nav');
   });
 
   test('secret not-found', async function (assert) {
diff --git a/ui/tests/acceptance/oidc-auth-method-test.js b/ui/tests/acceptance/oidc-auth-method-test.js
index 96a7d99415816..d9f70b2e9c2ed 100644
--- a/ui/tests/acceptance/oidc-auth-method-test.js
+++ b/ui/tests/acceptance/oidc-auth-method-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
 import { click, fillIn, find, waitUntil } from '@ember/test-helpers';
@@ -18,7 +13,6 @@ module('Acceptance | oidc auth method', function (hooks) {
 
   hooks.beforeEach(function () {
     this.openStub = sinon.stub(window, 'open').callsFake(() => fakeWindow.create());
-    // OIDC test fails when using fake timestamps, we use the real timestamp.now here
     this.server.post('/auth/oidc/oidc/auth_url', () => ({
       data: { auth_url: 'http://example.com' },
     }));
@@ -97,8 +91,7 @@ module('Acceptance | oidc auth method', function (hooks) {
       cancelTimers();
     }, 50);
     await click('[data-test-auth-submit]');
-    await waitUntil(() => find('[data-test-user-menu-trigger]'));
-    await click('[data-test-user-menu-trigger]');
+    await click('.nav-user-button button');
     await click('#logout');
     assert
       .dom('[data-test-select="auth-method"]')
diff --git a/ui/tests/acceptance/oidc-config/clients-assignments-test.js b/ui/tests/acceptance/oidc-config/clients-assignments-test.js
index b774dadd6f4d7..4056694abca78 100644
--- a/ui/tests/acceptance/oidc-config/clients-assignments-test.js
+++ b/ui/tests/acceptance/oidc-config/clients-assignments-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { visit, currentURL, click, fillIn, findAll, currentRouteName } from '@ember/test-helpers';
 import { setupApplicationTest } from 'ember-qunit';
@@ -54,7 +49,7 @@ module('Acceptance | oidc-config clients and assignments', function (hooks) {
     await clearRecord(this.store, 'oidc/assignment', 'test-assignment');
 
     await visit(OIDC_BASE_URL + '/assignments');
-    assert.strictEqual(currentURL(), '/vault/access/oidc/assignments');
+    assert.equal(currentURL(), '/vault/access/oidc/assignments');
     assert.dom('[data-test-tab="assignments"]').hasClass('active', 'assignments tab is active');
     assert
       .dom('[data-test-oidc-assignment-linked-block="allow_all"]')
@@ -66,7 +61,7 @@ module('Acceptance | oidc-config clients and assignments', function (hooks) {
     this.server.get('/identity/oidc/client', () => overrideMirageResponse(404));
 
     await visit(OIDC_BASE_URL);
-    assert.strictEqual(currentURL(), '/vault/access/oidc');
+    assert.equal(currentURL(), '/vault/access/oidc');
     assert.dom('h1.title.is-3').hasText('OIDC Provider');
     assert.dom(SELECTORS.oidcHeader).hasText(
       `Configure Vault to act as an OIDC identity provider, and offer Vault’s various authentication
@@ -89,23 +84,19 @@ module('Acceptance | oidc-config clients and assignments', function (hooks) {
 
     // create a client with allow all access
     await visit(OIDC_BASE_URL + '/clients/create');
-    assert.strictEqual(
-      currentRouteName(),
-      'vault.cluster.access.oidc.clients.create',
-      'navigates to create form'
-    );
+    assert.equal(currentRouteName(), 'vault.cluster.access.oidc.clients.create', 'navigates to create form');
     await fillIn('[data-test-input="name"]', 'test-app');
     await click('[data-test-toggle-group="More options"]');
     // toggle ttls to false, testing it sets correct default duration
     await click('[data-test-input="idTokenTtl"]');
     await click('[data-test-input="accessTokenTtl"]');
     await click(SELECTORS.clientSaveButton);
-    assert.strictEqual(
+    assert.equal(
       flashMessage.latestMessage,
       'Successfully created the application test-app.',
       'renders success flash upon client creation'
     );
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.oidc.clients.client.details',
       'navigates to client details view after save'
@@ -132,7 +123,7 @@ module('Acceptance | oidc-config clients and assignments', function (hooks) {
     // edit client
     await click(SELECTORS.clientDetailsTab);
     await click(SELECTORS.clientEditButton);
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.oidc.clients.client.edit',
       'navigates to edit page from details'
@@ -140,7 +131,7 @@ module('Acceptance | oidc-config clients and assignments', function (hooks) {
     await fillIn('[data-test-input="redirectUris"] [data-test-string-list-input="0"]', 'some-url.com');
 
     // limit access & create new assignment inline
-    await click('[data-test-oidc-radio="limited"]');
+    await click('label[for=limited]');
     await clickTrigger();
     await fillIn('.ember-power-select-search input', 'assignment-inline');
     await searchSelect.options.objectAt(0).click();
@@ -149,18 +140,18 @@ module('Acceptance | oidc-config clients and assignments', function (hooks) {
     await click('[data-test-search-select="groups"] .ember-basic-dropdown-trigger');
     await searchSelect.options.objectAt(0).click();
     await click(SELECTORS.assignmentSaveButton);
-    assert.strictEqual(
+    assert.equal(
       flashMessage.latestMessage,
       'Successfully created the assignment assignment-inline.',
       'renders success flash upon assignment creating'
     );
     await click(SELECTORS.clientSaveButton);
-    assert.strictEqual(
+    assert.equal(
       flashMessage.latestMessage,
       'Successfully updated the application test-app.',
       'renders success flash upon client updating'
     );
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.oidc.clients.client.details',
       'navigates back to details on update'
@@ -173,7 +164,7 @@ module('Acceptance | oidc-config clients and assignments', function (hooks) {
     // edit back to allow_all
     await click(SELECTORS.clientEditButton);
     assert.dom(SELECTORS.clientSaveButton).hasText('Update', 'form button renders correct text');
-    await click('[data-test-oidc-radio="allow-all"]');
+    await click('label[for=allow-all]');
     await click(SELECTORS.clientSaveButton);
     assert
       .dom('[data-test-value-div="Assignment"]')
@@ -187,22 +178,22 @@ module('Acceptance | oidc-config clients and assignments', function (hooks) {
     // immediately delete client, test transition
     await click(SELECTORS.clientDeleteButton);
     await click(SELECTORS.confirmActionButton);
-    assert.strictEqual(
+    assert.equal(
       flashMessage.latestMessage,
       'Application deleted successfully',
       'renders success flash upon deleting client'
     );
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.oidc.clients.index',
       'navigates back to list view after delete'
     );
     // delete last client
     await click('[data-test-oidc-client-linked-block]');
-    assert.strictEqual(currentRouteName(), 'vault.cluster.access.oidc.clients.client.details');
+    assert.equal(currentRouteName(), 'vault.cluster.access.oidc.clients.client.details');
     await click(SELECTORS.clientDeleteButton);
     await click(SELECTORS.confirmActionButton);
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.oidc.index',
       'redirects to call to action if only existing client is deleted'
@@ -212,7 +203,7 @@ module('Acceptance | oidc-config clients and assignments', function (hooks) {
   });
 
   test('it creates, updates, and deletes an assignment', async function (assert) {
-    assert.expect(14);
+    assert.expect(12);
     await visit(OIDC_BASE_URL + '/assignments');
 
     //* ensure clean test state
@@ -220,22 +211,21 @@ module('Acceptance | oidc-config clients and assignments', function (hooks) {
 
     // create a new assignment
     await click(SELECTORS.assignmentCreateButton);
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.oidc.assignments.create',
       'navigates to create form'
     );
-    assert.dom('[data-test-oidc-assignment-title]').hasText('Create assignment', 'Form title renders');
     await fillIn('[data-test-input="name"]', 'test-assignment');
     await click('[data-test-component="search-select"]#entities .ember-basic-dropdown-trigger');
     await click('.ember-power-select-option');
     await click(SELECTORS.assignmentSaveButton);
-    assert.strictEqual(
+    assert.equal(
       flashMessage.latestMessage,
       'Successfully created the assignment test-assignment.',
       'renders success flash upon creating the assignment'
     );
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.oidc.assignments.assignment.details',
       'navigates to the assignments detail view after save'
@@ -247,17 +237,16 @@ module('Acceptance | oidc-config clients and assignments', function (hooks) {
 
     // edit assignment
     await click(SELECTORS.assignmentEditButton);
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.oidc.assignments.assignment.edit',
       'navigates to the assignment edit page from details'
     );
-    assert.dom('[data-test-oidc-assignment-title]').hasText('Edit assignment', 'Form title renders');
     await click('[data-test-component="search-select"]#groups .ember-basic-dropdown-trigger');
     await click('.ember-power-select-option');
     assert.dom('[data-test-oidc-assignment-save]').hasText('Update');
     await click(SELECTORS.assignmentSaveButton);
-    assert.strictEqual(
+    assert.equal(
       flashMessage.latestMessage,
       'Successfully updated the assignment test-assignment.',
       'renders success flash upon updating the assignment'
@@ -269,12 +258,12 @@ module('Acceptance | oidc-config clients and assignments', function (hooks) {
     // delete the assignment
     await click(SELECTORS.assignmentDeleteButton);
     await click(SELECTORS.confirmActionButton);
-    assert.strictEqual(
+    assert.equal(
       flashMessage.latestMessage,
       'Assignment deleted successfully',
       'renders success flash upon deleting assignment'
     );
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.oidc.assignments.index',
       'navigates back to assignment list view after delete'
@@ -295,13 +284,13 @@ module('Acceptance | oidc-config clients and assignments', function (hooks) {
       .exists('displays linked block for test-assignment');
 
     await click(SELECTORS.assignmentCreateButton);
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.oidc.assignments.create',
       'assignments index toolbar navigates to create form'
     );
     await click(SELECTORS.assignmentCancelButton);
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.oidc.assignments.index',
       'create form navigates back to assignment index on cancel'
@@ -309,13 +298,13 @@ module('Acceptance | oidc-config clients and assignments', function (hooks) {
 
     await click('[data-test-popup-menu-trigger]');
     await click('[data-test-oidc-assignment-menu-link="edit"]');
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.oidc.assignments.assignment.edit',
       'linked block popup menu navigates to edit'
     );
     await click(SELECTORS.assignmentCancelButton);
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.oidc.assignments.assignment.details',
       'edit form navigates back to assignment details on cancel'
@@ -324,7 +313,7 @@ module('Acceptance | oidc-config clients and assignments', function (hooks) {
     await visit('/vault/access/oidc/assignments');
     await click('[data-test-popup-menu-trigger]');
     await click('[data-test-oidc-assignment-menu-link="details"]');
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.oidc.assignments.assignment.details',
       'popup menu navigates to assignment details'
@@ -351,7 +340,7 @@ module('Acceptance | oidc-config clients and assignments', function (hooks) {
     assert.dom(SELECTORS.assignmentDetailsTab).hasClass('active', 'details tab is active');
     assert.dom(SELECTORS.assignmentDeleteButton).doesNotExist('delete option is hidden');
     assert.dom(SELECTORS.assignmentEditButton).doesNotExist('edit button is hidden');
-    assert.strictEqual(
+    assert.equal(
       findAll('[data-test-component="info-table-row"]').length,
       3,
       'renders all assignment info rows'
diff --git a/ui/tests/acceptance/oidc-config/clients-keys-test.js b/ui/tests/acceptance/oidc-config/clients-keys-test.js
index 2e9704758f9ed..e664e999fd441 100644
--- a/ui/tests/acceptance/oidc-config/clients-keys-test.js
+++ b/ui/tests/acceptance/oidc-config/clients-keys-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { visit, click, fillIn, findAll, currentRouteName } from '@ember/test-helpers';
 import { setupApplicationTest } from 'ember-qunit';
@@ -65,7 +60,7 @@ module('Acceptance | oidc-config clients and keys', function (hooks) {
 
     // check reroutes from oidc index to clients index when client exists
     await visit(OIDC_BASE_URL);
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.oidc.clients.index',
       'redirects to clients index route when clients exist'
@@ -78,7 +73,7 @@ module('Acceptance | oidc-config clients and keys', function (hooks) {
     // navigate to keys
     await click('[data-test-tab="keys"]');
     assert.dom('[data-test-tab="keys"]').hasClass('active', 'keys tab is active');
-    assert.strictEqual(currentRouteName(), 'vault.cluster.access.oidc.keys.index');
+    assert.equal(currentRouteName(), 'vault.cluster.access.oidc.keys.index');
     assert
       .dom('[data-test-oidc-key-linked-block="default"]')
       .hasText('default', 'index page lists default key');
@@ -88,13 +83,13 @@ module('Acceptance | oidc-config clients and keys', function (hooks) {
     await click('[data-test-oidc-key-menu-link="details"]');
     assert.dom(SELECTORS.keyDeleteButton).isDisabled('delete button is disabled for default key');
     await click(SELECTORS.keyEditButton);
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.oidc.keys.key.edit',
       'navigates to edit from key details'
     );
     await click(SELECTORS.keyCancelButton);
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.oidc.keys.key.details',
       'key edit form navigates back to details on cancel'
@@ -106,20 +101,16 @@ module('Acceptance | oidc-config clients and keys', function (hooks) {
 
     // create a new key
     await click('[data-test-breadcrumb-link="oidc-keys"]');
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.oidc.keys.index',
       'keys breadcrumb navigates back to list view'
     );
     await click('[data-test-oidc-key-create]');
-    assert.strictEqual(
-      currentRouteName(),
-      'vault.cluster.access.oidc.keys.create',
-      'navigates to key create form'
-    );
+    assert.equal(currentRouteName(), 'vault.cluster.access.oidc.keys.create', 'navigates to key create form');
     await fillIn('[data-test-input="name"]', 'test-key');
     await click(SELECTORS.keySaveButton);
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.oidc.keys.key.details',
       'navigates to key details after save'
@@ -139,25 +130,25 @@ module('Acceptance | oidc-config clients and keys', function (hooks) {
     await visit(OIDC_BASE_URL + '/keys');
     await click('[data-test-oidc-key-linked-block="test-key"] [data-test-popup-menu-trigger]');
     await click('[data-test-oidc-key-menu-link="edit"]');
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.oidc.keys.key.edit',
       'key linked block popup menu navigates to edit'
     );
-    await click('[data-test-oidc-radio="limited"]');
+    await click('label[for=limited]');
     await clickTrigger();
-    assert.strictEqual(searchSelect.options.length, 1, 'dropdown has only application that uses this key');
+    assert.equal(searchSelect.options.length, 1, 'dropdown has only application that uses this key');
     assert
       .dom('.ember-power-select-option')
       .hasTextContaining('client-with-test-key', 'dropdown renders correct application');
     await searchSelect.options.objectAt(0).click();
     await click(SELECTORS.keySaveButton);
-    assert.strictEqual(
+    assert.equal(
       flashMessage.latestMessage,
       'Successfully updated the key test-key.',
       'renders success flash upon key updating'
     );
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.oidc.keys.key.details',
       'navigates back to details on update'
@@ -166,12 +157,12 @@ module('Acceptance | oidc-config clients and keys', function (hooks) {
     assert
       .dom('[data-test-oidc-client-linked-block="client-with-test-key"]')
       .exists('lists client-with-test-key');
-    assert.strictEqual(findAll('[data-test-oidc-client-linked-block]').length, 1, 'it lists only one client');
+    assert.equal(findAll('[data-test-oidc-client-linked-block]').length, 1, 'it lists only one client');
 
     // edit back to allow all
     await click(SELECTORS.keyDetailsTab);
     await click(SELECTORS.keyEditButton);
-    await click('[data-test-oidc-radio="allow-all"]');
+    await click('label[for=allow-all]');
     await click(SELECTORS.keySaveButton);
     await click(SELECTORS.keyClientsTab);
     assert.notEqual(
@@ -192,7 +183,7 @@ module('Acceptance | oidc-config clients and keys', function (hooks) {
     this.server.get('/identity/oidc/client', () => overrideMirageResponse(null, CLIENT_LIST_RESPONSE));
     this.server.post('/identity/oidc/key/test-key/rotate', (schema, req) => {
       const json = JSON.parse(req.requestBody);
-      assert.strictEqual(json.verification_ttl, 86400, 'request made with correct args to accurate endpoint');
+      assert.equal(json.verification_ttl, 86400, 'request made with correct args to accurate endpoint');
     });
 
     //* clear out test state
@@ -204,14 +195,10 @@ module('Acceptance | oidc-config clients and keys', function (hooks) {
     // toggle ttls to false, testing it sets correct default duration
     await click('[data-test-input="rotationPeriod"]');
     await click('[data-test-input="verificationTtl"]');
-    assert
-      .dom('[data-test-oidc-radio="limited"] input')
-      .isDisabled('limiting access radio button is disabled on create');
-    assert
-      .dom('[data-test-oidc-radio="limited"]')
-      .hasClass('is-disabled', 'limited radio button label has disabled class');
+    assert.dom('input#limited').isDisabled('limiting access radio button is disabled on create');
+    assert.dom('label[for=limited]').hasClass('is-disabled', 'limited radio button label has disabled class');
     await click(SELECTORS.keySaveButton);
-    assert.strictEqual(
+    assert.equal(
       flashMessage.latestMessage,
       'Successfully created the key test-key.',
       'renders success flash upon key creation'
@@ -230,7 +217,7 @@ module('Acceptance | oidc-config clients and keys', function (hooks) {
     await click(SELECTORS.keyDetailsTab);
     await click(SELECTORS.keyRotateButton);
     await click(SELECTORS.confirmActionButton);
-    assert.strictEqual(
+    assert.equal(
       flashMessage.latestMessage,
       'Success: test-key connection was rotated.',
       'renders success flash upon key rotation'
@@ -238,12 +225,12 @@ module('Acceptance | oidc-config clients and keys', function (hooks) {
     // delete
     await click(SELECTORS.keyDeleteButton);
     await click(SELECTORS.confirmActionButton);
-    assert.strictEqual(
+    assert.equal(
       flashMessage.latestMessage,
       'Key deleted successfully',
       'success flash message renders after deleting key'
     );
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.oidc.keys.index',
       'navigates back to list view after delete'
@@ -262,10 +249,10 @@ module('Acceptance | oidc-config clients and keys', function (hooks) {
     assert.dom(SELECTORS.clientDetailsTab).hasClass('active', 'details tab is active');
     assert.dom(SELECTORS.clientDeleteButton).exists('toolbar renders delete option');
     assert.dom(SELECTORS.clientEditButton).exists('toolbar renders edit button');
-    assert.strictEqual(findAll('[data-test-component="info-table-row"]').length, 9, 'renders all info rows');
+    assert.equal(findAll('[data-test-component="info-table-row"]').length, 9, 'renders all info rows');
 
     await click(SELECTORS.clientProvidersTab);
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.oidc.clients.client.providers',
       'navigates to client providers route'
@@ -290,7 +277,7 @@ module('Acceptance | oidc-config clients and keys', function (hooks) {
     assert.dom(SELECTORS.clientDetailsTab).hasClass('active', 'details tab is active');
     assert.dom(SELECTORS.clientDeleteButton).doesNotExist('delete option is hidden');
     assert.dom(SELECTORS.clientEditButton).doesNotExist('edit button is hidden');
-    assert.strictEqual(findAll('[data-test-component="info-table-row"]').length, 9, 'renders all info rows');
+    assert.equal(findAll('[data-test-component="info-table-row"]').length, 9, 'renders all info rows');
   });
 
   test('it hides delete and edit key when no permission', async function (assert) {
@@ -313,6 +300,6 @@ module('Acceptance | oidc-config clients and keys', function (hooks) {
     assert.dom(SELECTORS.keyDetailsTab).hasClass('active', 'details tab is active');
     assert.dom(SELECTORS.keyDeleteButton).doesNotExist('delete option is hidden');
     assert.dom(SELECTORS.keyEditButton).doesNotExist('edit button is hidden');
-    assert.strictEqual(findAll('[data-test-component="info-table-row"]').length, 4, 'renders all info rows');
+    assert.equal(findAll('[data-test-component="info-table-row"]').length, 4, 'renders all info rows');
   });
 });
diff --git a/ui/tests/acceptance/oidc-config/providers-scopes-test.js b/ui/tests/acceptance/oidc-config/providers-scopes-test.js
index 845453031405d..f6945c7635333 100644
--- a/ui/tests/acceptance/oidc-config/providers-scopes-test.js
+++ b/ui/tests/acceptance/oidc-config/providers-scopes-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { visit, currentURL, click, fillIn, findAll, currentRouteName } from '@ember/test-helpers';
 import { setupApplicationTest } from 'ember-qunit';
@@ -60,7 +55,7 @@ module('Acceptance |  oidc-config providers and scopes', function (hooks) {
     this.server.get('/identity/oidc/scope', () => overrideMirageResponse(404));
     await visit(OIDC_BASE_URL);
     await click('[data-test-tab="scopes"]');
-    assert.strictEqual(currentURL(), '/vault/access/oidc/scopes');
+    assert.equal(currentURL(), '/vault/access/oidc/scopes');
     assert.dom('[data-test-tab="scopes"]').hasClass('active', 'scopes tab is active');
     assert
       .dom(SELECTORS.scopeEmptyState)
@@ -81,7 +76,7 @@ module('Acceptance |  oidc-config providers and scopes', function (hooks) {
       overrideMirageResponse(null, SCOPE_DATA_RESPONSE)
     );
     await visit(OIDC_BASE_URL + '/scopes');
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.oidc.scopes.index',
       'redirects to scopes index route when scopes exist'
@@ -92,13 +87,13 @@ module('Acceptance |  oidc-config providers and scopes', function (hooks) {
 
     // navigates to/from create, edit, detail views from list view
     await click(SELECTORS.scopeCreateButton);
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.oidc.scopes.create',
       'scope index toolbar navigates to create form'
     );
     await click(SELECTORS.scopeCancelButton);
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.oidc.scopes.index',
       'create form navigates back to index on cancel'
@@ -106,13 +101,13 @@ module('Acceptance |  oidc-config providers and scopes', function (hooks) {
 
     await click('[data-test-popup-menu-trigger]');
     await click('[data-test-oidc-scope-menu-link="edit"]');
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.oidc.scopes.scope.edit',
       'linked block popup menu navigates to edit'
     );
     await click(SELECTORS.scopeCancelButton);
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.oidc.scopes.scope.details',
       'scope edit form navigates back to details on cancel'
@@ -122,7 +117,7 @@ module('Acceptance |  oidc-config providers and scopes', function (hooks) {
     await click('[data-test-breadcrumb-link="oidc-scopes"]');
     await click('[data-test-popup-menu-trigger]');
     await click('[data-test-oidc-scope-menu-link="details"]');
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.oidc.scopes.scope.details',
       'popup menu navigates to details'
@@ -131,7 +126,7 @@ module('Acceptance |  oidc-config providers and scopes', function (hooks) {
     assert.dom(SELECTORS.scopeDetailsTab).hasClass('active', 'details tab is active');
     assert.dom(SELECTORS.scopeDeleteButton).exists('toolbar renders delete option');
     assert.dom(SELECTORS.scopeEditButton).exists('toolbar renders edit button');
-    assert.strictEqual(findAll('[data-test-component="info-table-row"]').length, 2, 'renders all info rows');
+    assert.equal(findAll('[data-test-component="info-table-row"]').length, 2, 'renders all info rows');
   });
 
   // ERROR DELETING SCOPE
@@ -163,7 +158,7 @@ module('Acceptance |  oidc-config providers and scopes', function (hooks) {
     // try to delete scope
     await click(SELECTORS.scopeDeleteButton);
     await click(SELECTORS.confirmActionButton);
-    assert.strictEqual(
+    assert.equal(
       flashMessage.latestMessage,
       'unable to delete scope "test-scope" because it is currently referenced by these providers: test-provider',
       'renders error flash upon scope deletion'
@@ -171,8 +166,8 @@ module('Acceptance |  oidc-config providers and scopes', function (hooks) {
   });
 
   // CRUD SCOPE + CRUD PROVIDER
-  test('it creates a scope, and creates a provider with that scope', async function (assert) {
-    assert.expect(28);
+  test('it creates a scope, then adds it to a new a provider', async function (assert) {
+    assert.expect(27);
 
     //* clear out test state
     await clearRecord(this.store, 'oidc/scope', 'test-scope');
@@ -180,21 +175,17 @@ module('Acceptance |  oidc-config providers and scopes', function (hooks) {
 
     // create a new scope
     await visit(OIDC_BASE_URL + '/scopes/create');
-    assert.strictEqual(
-      currentRouteName(),
-      'vault.cluster.access.oidc.scopes.create',
-      'navigates to create form'
-    );
+    assert.equal(currentRouteName(), 'vault.cluster.access.oidc.scopes.create', 'navigates to create form');
     await fillIn('[data-test-input="name"]', 'test-scope');
     await fillIn('[data-test-input="description"]', 'this is a test');
     await fillIn('[data-test-component="code-mirror-modifier"] textarea', SCOPE_DATA_RESPONSE.template);
     await click(SELECTORS.scopeSaveButton);
-    assert.strictEqual(
+    assert.equal(
       flashMessage.latestMessage,
       'Successfully created the scope test-scope.',
       'renders success flash upon scope creation'
     );
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.oidc.scopes.scope.details',
       'navigates to scope detail view after save'
@@ -207,19 +198,19 @@ module('Acceptance |  oidc-config providers and scopes', function (hooks) {
 
     // edit scope
     await click(SELECTORS.scopeEditButton);
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.oidc.scopes.scope.edit',
       'navigates to edit page from details'
     );
     await fillIn('[data-test-input="description"]', 'this is an edit test');
     await click(SELECTORS.scopeSaveButton);
-    assert.strictEqual(
+    assert.equal(
       flashMessage.latestMessage,
       'Successfully updated the scope test-scope.',
       'renders success flash upon scope updating'
     );
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.oidc.scopes.scope.details',
       'navigates back to scope details on update'
@@ -233,7 +224,7 @@ module('Acceptance |  oidc-config providers and scopes', function (hooks) {
     await click('[data-test-tab="providers"]');
     assert.dom('[data-test-tab="providers"]').hasClass('active', 'providers tab is active');
     await click('[data-test-oidc-provider-create]');
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.oidc.providers.create',
       'navigates to provider create form'
@@ -242,12 +233,12 @@ module('Acceptance |  oidc-config providers and scopes', function (hooks) {
     await clickTrigger('#scopesSupported');
     await selectChoose('#scopesSupported', 'test-scope');
     await click(SELECTORS.providerSaveButton);
-    assert.strictEqual(
+    assert.equal(
       flashMessage.latestMessage,
       'Successfully created the OIDC provider test-provider.',
       'renders success flash upon provider creation'
     );
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.oidc.providers.provider.details',
       'navigates to provider detail view after save'
@@ -264,7 +255,7 @@ module('Acceptance |  oidc-config providers and scopes', function (hooks) {
 
     // check provider's application list view
     await click(SELECTORS.providerClientsTab);
-    assert.strictEqual(
+    assert.equal(
       findAll('[data-test-oidc-client-linked-block]').length,
       2,
       'all applications appear in provider applications tab'
@@ -273,32 +264,26 @@ module('Acceptance |  oidc-config providers and scopes', function (hooks) {
     // edit and limit applications
     await click(SELECTORS.providerDetailsTab);
     await click(SELECTORS.providerEditButton);
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.oidc.providers.provider.edit',
       'navigates to provider edit page from details'
     );
-    await click('[data-test-oidc-radio="limited"]');
+    await click('label[for=limited]');
     await click('[data-test-component="search-select"]#allowedClientIds .ember-basic-dropdown-trigger');
     await fillIn('.ember-power-select-search input', 'test-app');
     await searchSelect.options.objectAt(0).click();
     await click(SELECTORS.providerSaveButton);
-    assert.strictEqual(
+    assert.equal(
       flashMessage.latestMessage,
       'Successfully updated the OIDC provider test-provider.',
       'renders success flash upon provider updating'
     );
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.oidc.providers.provider.details',
       'navigates back to provider details after updating'
     );
-    const providerModel = this.store.peekRecord('oidc/provider', 'test-provider');
-    assert.propEqual(
-      providerModel.allowedClientIds,
-      ['whaT7KB0C3iBH1l3rXhd5HPf0n6vXU0s'],
-      'provider saves client_id (not id or name) in allowed_client_ids param'
-    );
     await click(SELECTORS.providerClientsTab);
     assert
       .dom('[data-test-oidc-client-linked-block]')
@@ -307,10 +292,10 @@ module('Acceptance |  oidc-config providers and scopes', function (hooks) {
     // edit back to allow all
     await click(SELECTORS.providerDetailsTab);
     await click(SELECTORS.providerEditButton);
-    await click('[data-test-oidc-radio="allow-all"]');
+    await click('label[for=allow-all]');
     await click(SELECTORS.providerSaveButton);
     await click(SELECTORS.providerClientsTab);
-    assert.strictEqual(
+    assert.equal(
       findAll('[data-test-oidc-client-linked-block]').length,
       2,
       'all applications appear in provider applications tab'
@@ -320,12 +305,12 @@ module('Acceptance |  oidc-config providers and scopes', function (hooks) {
     await click(SELECTORS.providerDetailsTab);
     await click(SELECTORS.providerDeleteButton);
     await click(SELECTORS.confirmActionButton);
-    assert.strictEqual(
+    assert.equal(
       flashMessage.latestMessage,
       'Provider deleted successfully',
       'success flash message renders after deleting provider'
     );
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.oidc.providers.index',
       'navigates back to list view after delete'
@@ -335,12 +320,12 @@ module('Acceptance |  oidc-config providers and scopes', function (hooks) {
     await visit(OIDC_BASE_URL + '/scopes/test-scope/details');
     await click(SELECTORS.scopeDeleteButton);
     await click(SELECTORS.confirmActionButton);
-    assert.strictEqual(
+    assert.equal(
       flashMessage.latestMessage,
       'Scope deleted successfully',
       'renders success flash upon deleting scope'
     );
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.oidc.scopes.index',
       'navigates back to list view after delete'
@@ -353,20 +338,20 @@ module('Acceptance |  oidc-config providers and scopes', function (hooks) {
     await visit(OIDC_BASE_URL);
     await click('[data-test-tab="providers"]');
     assert.dom('[data-test-tab="providers"]').hasClass('active', 'providers tab is active');
-    assert.strictEqual(currentURL(), '/vault/access/oidc/providers');
+    assert.equal(currentURL(), '/vault/access/oidc/providers');
     assert
       .dom('[data-test-oidc-provider-linked-block="default"]')
       .exists('index page lists default provider');
     await click('[data-test-popup-menu-trigger]');
 
     await click('[data-test-oidc-provider-menu-link="edit"]');
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.oidc.providers.provider.edit',
       'provider linked block popup menu navigates to edit'
     );
     await click(SELECTORS.providerCancelButton);
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.oidc.providers.provider.details',
       'provider edit form navigates back to details on cancel'
@@ -374,7 +359,7 @@ module('Acceptance |  oidc-config providers and scopes', function (hooks) {
 
     // navigate to details from index page
     await click('[data-test-breadcrumb-link="oidc-providers"]');
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.access.oidc.providers.index',
       'providers breadcrumb navigates back to list view'
diff --git a/ui/tests/acceptance/oidc-provider-test.js b/ui/tests/acceptance/oidc-provider-test.js
index 8955287dd80dd..a52fdb3b5b57c 100644
--- a/ui/tests/acceptance/oidc-provider-test.js
+++ b/ui/tests/acceptance/oidc-provider-test.js
@@ -1,13 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { create } from 'ember-cli-page-object';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
-import { v4 as uuidv4 } from 'uuid';
-
 import authPage from 'vault/tests/pages/auth';
 import logout from 'vault/tests/pages/logout';
 import authForm from 'vault/tests/pages/components/auth-form';
@@ -35,7 +28,7 @@ const GROUP_TOKEN_TEMPLATE = `{
 }`;
 const oidcEntity = async function (name, policy) {
   await consoleComponent.runCommands([
-    `write sys/policies/acl/${name} policy=${window.btoa(policy)}`,
+    `write sys/policies/acl/${name} policy=${btoa(policy)}`,
     `write identity/entity name="${OIDC_USER}" policies="${name}" metadata="email=vault@hashicorp.com" metadata="phone_number=123-456-7890"`,
     `read -field=id identity/entity/name/${OIDC_USER}`,
   ]);
@@ -73,19 +66,19 @@ const entityAlias = async function (entityId, accessor, groupId) {
   return consoleComponent.lastLogOutput.includes('Success');
 };
 const setupWebapp = async function (redirect) {
-  const webappName = 'my-webapp';
+  let webappName = 'my-webapp';
   await consoleComponent.runCommands([
     `write identity/oidc/client/${webappName} redirect_uris="${redirect}" assignments="my-assignment" key="sigkey" id_token_ttl="30m" access_token_ttl="1h"`,
     `read -field=client_id identity/oidc/client/${webappName}`,
   ]);
-  const output = consoleComponent.lastLogOutput;
+  let output = consoleComponent.lastLogOutput;
   if (output.includes('error occurred')) {
     throw new Error(`OIDC setup failed: ${output}`);
   }
   return output;
 };
 const setupProvider = async function (clientId) {
-  const providerName = `my-provider`;
+  let providerName = `my-provider`;
   await consoleComponent.runCommands(
     `write identity/oidc/provider/${providerName} allowed_client_ids="${clientId}" scopes="user,groups"`
   );
@@ -93,7 +86,7 @@ const setupProvider = async function (clientId) {
 };
 
 const getAuthzUrl = (providerName, redirect, clientId, params) => {
-  const queryParams = {
+  let queryParams = {
     client_id: clientId,
     nonce: 'abc123',
     redirect_uri: encodeURIComponent(redirect),
@@ -102,7 +95,7 @@ const getAuthzUrl = (providerName, redirect, clientId, params) => {
     state: 'foobar',
     ...params,
   };
-  const queryString = Object.keys(queryParams).reduce((prev, key, idx) => {
+  let queryString = Object.keys(queryParams).reduce((prev, key, idx) => {
     if (idx === 0) {
       return `${prev}${key}=${queryParams[key]}`;
     }
@@ -111,15 +104,15 @@ const getAuthzUrl = (providerName, redirect, clientId, params) => {
   return `/vault/identity/oidc/provider/${providerName}/authorize${queryString}`;
 };
 
-const setupOidc = async function (uid) {
+const setupOidc = async function () {
   const callback = 'http://127.0.0.1:8251/callback';
   const entityId = await oidcEntity('oidc', OIDC_POLICY);
   const groupId = await oidcGroup(entityId);
-  const authMethodPath = `oidc-userpass-${uid}`;
+  let authMethodPath = `userpass-${new Date().getTime()}`;
   const accessor = await authAccessor(authMethodPath);
   await entityAlias(entityId, accessor, groupId);
   const clientId = await setupWebapp(callback);
-  const providerName = await setupProvider(clientId);
+  let providerName = await setupProvider(clientId);
   return {
     providerName,
     callback,
@@ -132,18 +125,17 @@ module('Acceptance | oidc provider', function (hooks) {
   setupApplicationTest(hooks);
 
   hooks.beforeEach(async function () {
-    this.uid = uuidv4();
     this.store = await this.owner.lookup('service:store');
     await logout.visit();
     return authPage.login();
   });
 
   test('OIDC Provider logs in and redirects correctly', async function (assert) {
-    const { providerName, callback, clientId, authMethodPath } = await setupOidc(this.uid);
+    let { providerName, callback, clientId, authMethodPath } = await setupOidc();
 
     await logout.visit();
     await settled();
-    const url = getAuthzUrl(providerName, callback, clientId);
+    let url = getAuthzUrl(providerName, callback, clientId);
     await visit(url);
 
     assert.ok(currentURL().startsWith('/vault/auth'), 'redirects to auth when no token');
@@ -163,7 +155,7 @@ module('Acceptance | oidc provider', function (hooks) {
     await authFormComponent.password(USER_PASSWORD);
     await authFormComponent.login();
     await settled();
-    assert.strictEqual(currentURL(), url, 'URL is as expected after login');
+    assert.equal(currentURL(), url, 'URL is as expected after login');
     assert.dom('[data-test-oidc-redirect]').exists('redirect text exists');
     assert
       .dom('[data-test-oidc-redirect]')
@@ -175,7 +167,7 @@ module('Acceptance | oidc provider', function (hooks) {
   });
 
   test('OIDC Provider redirects to auth if current token and prompt = login', async function (assert) {
-    const { providerName, callback, clientId, authMethodPath } = await setupOidc(this.uid);
+    const { providerName, callback, clientId, authMethodPath } = await setupOidc();
     await settled();
     const url = getAuthzUrl(providerName, callback, clientId, { prompt: 'login' });
     await visit(url);
@@ -200,7 +192,7 @@ module('Acceptance | oidc provider', function (hooks) {
   });
 
   test('OIDC Provider shows consent form when prompt = consent', async function (assert) {
-    const { providerName, callback, clientId, authMethodPath } = await setupOidc(this.uid);
+    const { providerName, callback, clientId, authMethodPath } = await setupOidc();
     const url = getAuthzUrl(providerName, callback, clientId, { prompt: 'consent' });
     await logout.visit();
     await authFormComponent.selectMethod(authMethodPath);
diff --git a/ui/tests/acceptance/pki/pki-action-forms-test.js b/ui/tests/acceptance/pki/pki-action-forms-test.js
deleted file mode 100644
index e4b2c892bbe7d..0000000000000
--- a/ui/tests/acceptance/pki/pki-action-forms-test.js
+++ /dev/null
@@ -1,298 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupApplicationTest } from 'ember-qunit';
-import { click, currentURL, fillIn, typeIn, visit } from '@ember/test-helpers';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import { v4 as uuidv4 } from 'uuid';
-
-import authPage from 'vault/tests/pages/auth';
-import logout from 'vault/tests/pages/logout';
-import enablePage from 'vault/tests/pages/settings/mount-secret-backend';
-import { runCommands } from 'vault/tests/helpers/pki/pki-run-commands';
-import { SELECTORS as S } from 'vault/tests/helpers/pki/workflow';
-import { issuerPemBundle } from 'vault/tests/helpers/pki/values';
-
-module('Acceptance | pki action forms test', function (hooks) {
-  setupApplicationTest(hooks);
-
-  hooks.beforeEach(async function () {
-    await authPage.login();
-    // Setup PKI engine
-    const mountPath = `pki-workflow-${uuidv4()}`;
-    await enablePage.enable('pki', mountPath);
-    this.mountPath = mountPath;
-    await logout.visit();
-  });
-
-  hooks.afterEach(async function () {
-    await logout.visit();
-    await authPage.login();
-    // Cleanup engine
-    await runCommands([`delete sys/mounts/${this.mountPath}`]);
-    await logout.visit();
-  });
-
-  module('import', function (hooks) {
-    setupMirage(hooks);
-
-    hooks.beforeEach(function () {
-      this.pemBundle = issuerPemBundle;
-    });
-
-    test('happy path', async function (assert) {
-      await authPage.login(this.pkiAdminToken);
-      await visit(`/vault/secrets/${this.mountPath}/pki/overview`);
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/overview`);
-      await click(S.emptyStateLink);
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/configuration/create`);
-      assert.dom(S.configuration.title).hasText('Configure PKI');
-      assert.dom(S.configuration.emptyState).exists({ count: 1 }, 'Shows empty state by default');
-      await click(S.configuration.optionByKey('import'));
-      assert.dom(S.configuration.emptyState).doesNotExist();
-      // Submit before filling out form shows an error
-      await click('[data-test-pki-import-pem-bundle]');
-      assert.dom('[data-test-alert-banner="alert"]').hasText('Error please upload your PEM bundle');
-      // Fill in form data
-      await click('[data-test-text-toggle]');
-      await fillIn('[data-test-text-file-textarea]', this.pemBundle);
-      await click('[data-test-pki-import-pem-bundle]');
-
-      assert.strictEqual(
-        currentURL(),
-        `/vault/secrets/${this.mountPath}/pki/configuration/create`,
-        'stays on page on success'
-      );
-      assert.dom(S.configuration.title).hasText('View imported items');
-      assert.dom(S.configuration.importForm).doesNotExist('import form is hidden after save');
-      assert.dom(S.configuration.importMapping).exists('import mapping is shown after save');
-      await click('[data-test-done]');
-      assert.strictEqual(
-        currentURL(),
-        `/vault/secrets/${this.mountPath}/pki/overview`,
-        'redirects to overview when done'
-      );
-    });
-    test('with many imports', async function (assert) {
-      this.server.post(`${this.mountPath}/config/ca`, () => {
-        return {
-          request_id: 'some-config-id',
-          data: {
-            imported_issuers: ['my-imported-issuer', 'imported2'],
-            imported_keys: ['my-imported-key', 'imported3'],
-            mapping: {
-              'my-imported-issuer': 'my-imported-key',
-              imported2: '',
-            },
-          },
-        };
-      });
-      await authPage.login(this.pkiAdminToken);
-      await visit(`/vault/secrets/${this.mountPath}/pki/configuration/create`);
-      await click(S.configuration.optionByKey('import'));
-      assert.dom(S.configuration.importForm).exists('import form is shown save');
-      await click('[data-test-text-toggle]');
-      await fillIn('[data-test-text-file-textarea]', this.pemBundle);
-      await click('[data-test-pki-import-pem-bundle]');
-
-      assert.strictEqual(
-        currentURL(),
-        `/vault/secrets/${this.mountPath}/pki/configuration/create`,
-        'stays on page on success'
-      );
-      assert.dom(S.configuration.title).hasText('View imported items');
-      assert.dom(S.configuration.importForm).doesNotExist('import form is hidden after save');
-      assert.dom(S.configuration.importMapping).exists('import mapping is shown after save');
-      assert.dom(S.configuration.importedIssuer).hasText('my-imported-issuer', 'Issuer value is displayed');
-      assert.dom(S.configuration.importedKey).hasText('my-imported-key', 'Key value is displayed');
-      await click('[data-test-done]');
-      assert.strictEqual(
-        currentURL(),
-        `/vault/secrets/${this.mountPath}/pki/overview`,
-        'redirects to overview when done'
-      );
-    });
-    test('shows imported items when keys is empty', async function (assert) {
-      this.server.post(`${this.mountPath}/config/ca`, () => {
-        return {
-          request_id: 'some-config-id',
-          data: {
-            imported_issuers: ['my-imported-issuer', 'my-imported-issuer2'],
-            imported_keys: null,
-            mapping: {
-              'my-imported-issuer': '',
-              'my-imported-issuer2': '',
-            },
-          },
-        };
-      });
-      await authPage.login(this.pkiAdminToken);
-      await visit(`/vault/secrets/${this.mountPath}/pki/configuration/create`);
-      await click(S.configuration.optionByKey('import'));
-      assert.dom(S.configuration.importForm).exists('import form is shown save');
-      await click('[data-test-text-toggle]');
-      await fillIn('[data-test-text-file-textarea]', this.pemBundle);
-      await click('[data-test-pki-import-pem-bundle]');
-
-      assert.dom(S.configuration.importForm).doesNotExist('import form is hidden after save');
-      assert.dom(S.configuration.importMapping).exists('import mapping is shown after save');
-      assert.dom(S.configuration.importedIssuer).hasText('my-imported-issuer', 'Issuer value is displayed');
-      assert.dom(S.configuration.importedKey).hasText('None', 'Shows placeholder value for key');
-    });
-    test('shows None for imported items if nothing new imported', async function (assert) {
-      this.server.post(`${this.mountPath}/config/ca`, () => {
-        return {
-          request_id: 'some-config-id',
-          data: {
-            imported_issuers: null,
-            imported_keys: null,
-            mapping: {},
-          },
-        };
-      });
-      await authPage.login(this.pkiAdminToken);
-      await visit(`/vault/secrets/${this.mountPath}/pki/configuration/create`);
-      await click(S.configuration.optionByKey('import'));
-      assert.dom(S.configuration.importForm).exists('import form is shown save');
-      await click('[data-test-text-toggle]');
-      await fillIn('[data-test-text-file-textarea]', this.pemBundle);
-      await click('[data-test-pki-import-pem-bundle]');
-
-      assert.dom(S.configuration.importForm).doesNotExist('import form is hidden after save');
-      assert.dom(S.configuration.importMapping).exists('import mapping is shown after save');
-      assert.dom(S.configuration.importedIssuer).hasText('None', 'Shows placeholder value for issuer');
-      assert.dom(S.configuration.importedKey).hasText('None', 'Shows placeholder value for key');
-    });
-  });
-
-  module('generate root', function () {
-    test('happy path', async function (assert) {
-      const commonName = 'my-common-name';
-      const issuerName = 'my-first-issuer';
-      const keyName = 'my-first-key';
-      await authPage.login();
-      await visit(`/vault/secrets/${this.mountPath}/pki/overview`);
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/overview`);
-      await click(S.emptyStateLink);
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/configuration/create`);
-      assert.dom(S.configuration.title).hasText('Configure PKI');
-      assert.dom(S.configuration.emptyState).exists({ count: 1 }, 'Shows empty state by default');
-      await click(S.configuration.optionByKey('generate-root'));
-      assert.dom(S.configuration.emptyState).doesNotExist();
-      // The URLs section is populated based on params returned from OpenAPI. This test will break when
-      // the backend adds fields. We should update the count accordingly.
-      assert.dom(S.configuration.urlField).exists({ count: 4 });
-      // Fill in form
-      await fillIn(S.configuration.typeField, 'internal');
-      await typeIn(S.configuration.inputByName('commonName'), commonName);
-      await typeIn(S.configuration.inputByName('issuerName'), issuerName);
-      await click(S.configuration.keyParamsGroupToggle);
-      await typeIn(S.configuration.inputByName('keyName'), keyName);
-      await click(S.configuration.generateRootSave);
-
-      assert.strictEqual(
-        currentURL(),
-        `/vault/secrets/${this.mountPath}/pki/configuration/create`,
-        'stays on page on success'
-      );
-      assert.dom(S.configuration.title).hasText('View root certificate');
-      assert.dom('[data-test-alert-banner="alert"]').doesNotExist('no private key warning');
-      assert.dom(S.configuration.title).hasText('View root certificate', 'Updates title on page');
-      assert.dom(S.configuration.saved.certificate).hasClass('allow-copy', 'copyable certificate is masked');
-      assert.dom(S.configuration.saved.issuerName).hasText(issuerName);
-      assert.dom(S.configuration.saved.issuerLink).exists('Issuer link exists');
-      assert.dom(S.configuration.saved.keyLink).exists('Key link exists');
-      assert.dom(S.configuration.saved.keyName).hasText(keyName);
-      assert.dom('[data-test-done]').exists('Done button exists');
-      // Check that linked issuer has correct common name
-      await click(S.configuration.saved.issuerLink);
-      assert.dom(S.issuerDetails.valueByName('Common name')).hasText(commonName);
-    });
-    test('type=exported', async function (assert) {
-      const commonName = 'my-exported-name';
-      await authPage.login();
-      await visit(`/vault/secrets/${this.mountPath}/pki/configuration/create`);
-      await click(S.configuration.optionByKey('generate-root'));
-      // Fill in form
-      await fillIn(S.configuration.typeField, 'exported');
-      await typeIn(S.configuration.inputByName('commonName'), commonName);
-      await click(S.configuration.generateRootSave);
-
-      assert.strictEqual(
-        currentURL(),
-        `/vault/secrets/${this.mountPath}/pki/configuration/create`,
-        'stays on page on success'
-      );
-      assert.dom(S.configuration.title).hasText('View root certificate');
-      assert
-        .dom('[data-test-alert-banner="alert"]')
-        .hasText('Next steps The private_key is only available once. Make sure you copy and save it now.');
-      assert.dom(S.configuration.title).hasText('View root certificate', 'Updates title on page');
-      assert
-        .dom(S.configuration.saved.certificate)
-        .hasClass('allow-copy', 'copyable masked certificate exists');
-      assert
-        .dom(S.configuration.saved.issuerName)
-        .doesNotExist('Issuer name not shown because it was not named');
-      assert.dom(S.configuration.saved.issuerLink).exists('Issuer link exists');
-      assert.dom(S.configuration.saved.keyLink).exists('Key link exists');
-      assert
-        .dom(S.configuration.saved.privateKey)
-        .hasClass('allow-copy', 'copyable masked private key exists');
-      assert.dom(S.configuration.saved.keyName).doesNotExist('Key name not shown because it was not named');
-      assert.dom('[data-test-done]').exists('Done button exists');
-      // Check that linked issuer has correct common name
-      await click(S.configuration.saved.issuerLink);
-      assert.dom(S.issuerDetails.valueByName('Common name')).hasText(commonName);
-    });
-  });
-
-  module('generate CSR', function () {
-    test('happy path', async function (assert) {
-      await authPage.login();
-      await visit(`/vault/secrets/${this.mountPath}/pki/overview`);
-      await click(S.emptyStateLink);
-      assert.dom(S.configuration.title).hasText('Configure PKI');
-      await click(S.configuration.optionByKey('generate-csr'));
-      await fillIn(S.configuration.typeField, 'internal');
-      await fillIn(S.configuration.inputByName('commonName'), 'my-common-name');
-      await click('[data-test-save]');
-      assert.dom(S.configuration.title).hasText('View generated CSR');
-      await assert.dom(S.configuration.csrDetails).exists('renders CSR details after save');
-      await click('[data-test-done]');
-      assert.strictEqual(
-        currentURL(),
-        `/vault/secrets/${this.mountPath}/pki/overview`,
-        'Transitions to overview after viewing csr details'
-      );
-    });
-    test('type = exported', async function (assert) {
-      await authPage.login();
-      await visit(`/vault/secrets/${this.mountPath}/pki/overview`);
-      await click(S.emptyStateLink);
-      await click(S.configuration.optionByKey('generate-csr'));
-      await fillIn(S.configuration.typeField, 'exported');
-      await fillIn(S.configuration.inputByName('commonName'), 'my-common-name');
-      await click('[data-test-save]');
-      await assert.dom(S.configuration.csrDetails).exists('renders CSR details after save');
-      assert.dom(S.configuration.title).hasText('View generated CSR');
-      assert
-        .dom('[data-test-alert-banner="alert"]')
-        .hasText(
-          'Next steps Copy the CSR below for a parent issuer to sign and then import the signed certificate back into this mount. The private_key is only available once. Make sure you copy and save it now.'
-        );
-      assert
-        .dom(S.configuration.saved.privateKey)
-        .hasClass('allow-copy', 'copyable masked private key exists');
-      await click('[data-test-done]');
-      assert.strictEqual(
-        currentURL(),
-        `/vault/secrets/${this.mountPath}/pki/overview`,
-        'Transitions to overview after viewing csr details'
-      );
-    });
-  });
-});
diff --git a/ui/tests/acceptance/pki/pki-configuration-test.js b/ui/tests/acceptance/pki/pki-configuration-test.js
deleted file mode 100644
index 67f47d7a625f0..0000000000000
--- a/ui/tests/acceptance/pki/pki-configuration-test.js
+++ /dev/null
@@ -1,197 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupApplicationTest } from 'ember-qunit';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import { click, currentURL, fillIn, visit, isSettled, waitUntil } from '@ember/test-helpers';
-import { v4 as uuidv4 } from 'uuid';
-
-import authPage from 'vault/tests/pages/auth';
-import logout from 'vault/tests/pages/logout';
-import enablePage from 'vault/tests/pages/settings/mount-secret-backend';
-import { runCommands } from 'vault/tests/helpers/pki/pki-run-commands';
-import { SELECTORS } from 'vault/tests/helpers/pki/workflow';
-import { issuerPemBundle } from 'vault/tests/helpers/pki/values';
-
-module('Acceptance | pki configuration test', function (hooks) {
-  setupApplicationTest(hooks);
-
-  hooks.beforeEach(async function () {
-    this.pemBundle = issuerPemBundle;
-    await authPage.login();
-    // Setup PKI engine
-    const mountPath = `pki-workflow-${uuidv4()}`;
-    await enablePage.enable('pki', mountPath);
-    this.mountPath = mountPath;
-    await logout.visit();
-  });
-
-  hooks.afterEach(async function () {
-    await logout.visit();
-    await authPage.login();
-    // Cleanup engine
-    await runCommands([`delete sys/mounts/${this.mountPath}`]);
-    await logout.visit();
-  });
-
-  module('delete all issuers modal and empty states', function (hooks) {
-    setupMirage(hooks);
-
-    test('it shows the delete all issuers modal', async function (assert) {
-      await authPage.login(this.pkiAdminToken);
-      await visit(`/vault/secrets/${this.mountPath}/pki/configuration`);
-      await click(SELECTORS.configuration.configureButton);
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/configuration/create`);
-      await isSettled();
-      await click(SELECTORS.configuration.generateRootOption);
-      await fillIn(SELECTORS.configuration.typeField, 'exported');
-      await fillIn(SELECTORS.configuration.generateRootCommonNameField, 'issuer-common-0');
-      await fillIn(SELECTORS.configuration.generateRootIssuerNameField, 'issuer-0');
-      await click(SELECTORS.configuration.generateRootSave);
-      await click(SELECTORS.configuration.doneButton);
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/overview`);
-      await isSettled();
-      await click(SELECTORS.configTab);
-      await isSettled();
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/configuration`);
-      await click(SELECTORS.configuration.issuerLink);
-      await isSettled();
-      assert.dom(SELECTORS.configuration.deleteAllIssuerModal).exists();
-      await fillIn(SELECTORS.configuration.deleteAllIssuerInput, 'delete-all');
-      await click(SELECTORS.configuration.deleteAllIssuerButton);
-      assert.dom(SELECTORS.configuration.deleteAllIssuerModal).doesNotExist();
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/configuration`);
-    });
-
-    test('it shows the correct empty state message if certificates exists after delete all issuers', async function (assert) {
-      await authPage.login(this.pkiAdminToken);
-      await visit(`/vault/secrets/${this.mountPath}/pki/configuration`);
-      await click(SELECTORS.configuration.configureButton);
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/configuration/create`);
-      await click(SELECTORS.configuration.generateRootOption);
-      await fillIn(SELECTORS.configuration.typeField, 'exported');
-      await fillIn(SELECTORS.configuration.generateRootCommonNameField, 'issuer-common-0');
-      await fillIn(SELECTORS.configuration.generateRootIssuerNameField, 'issuer-0');
-      await click(SELECTORS.configuration.generateRootSave);
-      await click(SELECTORS.configuration.doneButton);
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/overview`);
-      await click(SELECTORS.configTab);
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/configuration`);
-      await click(SELECTORS.configuration.issuerLink);
-      assert.dom(SELECTORS.configuration.deleteAllIssuerModal).exists();
-      await fillIn(SELECTORS.configuration.deleteAllIssuerInput, 'delete-all');
-      await click(SELECTORS.configuration.deleteAllIssuerButton);
-      await isSettled();
-      assert.dom(SELECTORS.configuration.deleteAllIssuerModal).doesNotExist();
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/configuration`);
-      await isSettled();
-      await visit(`/vault/secrets/${this.mountPath}/pki/overview`);
-      await waitUntil(() => currentURL() === `/vault/secrets/${this.mountPath}/pki/overview`);
-      await isSettled();
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/overview`);
-      assert
-        .dom(SELECTORS.emptyStateMessage)
-        .hasText(
-          "This PKI mount hasn't yet been configured with a certificate issuer. There are existing certificates. Use the CLI to perform any operations with them until an issuer is configured."
-        );
-
-      await visit(`/vault/secrets/${this.mountPath}/pki/roles`);
-      await isSettled();
-      assert
-        .dom(SELECTORS.emptyStateMessage)
-        .hasText("This PKI mount hasn't yet been configured with a certificate issuer.");
-
-      await visit(`/vault/secrets/${this.mountPath}/pki/issuers`);
-      await isSettled();
-      assert
-        .dom(SELECTORS.emptyStateMessage)
-        .hasText("This PKI mount hasn't yet been configured with a certificate issuer.");
-
-      await visit(`/vault/secrets/${this.mountPath}/pki/keys`);
-      await isSettled();
-      assert
-        .dom(SELECTORS.emptyStateMessage)
-        .hasText("This PKI mount hasn't yet been configured with a certificate issuer.");
-
-      await visit(`/vault/secrets/${this.mountPath}/pki/certificates`);
-      await isSettled();
-      assert
-        .dom(SELECTORS.emptyStateMessage)
-        .hasText(
-          "This PKI mount hasn't yet been configured with a certificate issuer. There are existing certificates. Use the CLI to perform any operations with them until an issuer is configured."
-        );
-    });
-
-    test('it shows the correct empty state message if roles and certificates exists after delete all issuers', async function (assert) {
-      await authPage.login(this.pkiAdminToken);
-      await visit(`/vault/secrets/${this.mountPath}/pki/configuration`);
-      await click(SELECTORS.configuration.configureButton);
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/configuration/create`);
-      await click(SELECTORS.configuration.generateRootOption);
-      await fillIn(SELECTORS.configuration.typeField, 'exported');
-      await fillIn(SELECTORS.configuration.generateRootCommonNameField, 'issuer-common-0');
-      await fillIn(SELECTORS.configuration.generateRootIssuerNameField, 'issuer-0');
-      await click(SELECTORS.configuration.generateRootSave);
-      await click(SELECTORS.configuration.doneButton);
-      await runCommands([
-        `write ${this.mountPath}/roles/some-role \
-        issuer_ref="default" \
-        allowed_domains="example.com" \
-        allow_subdomains=true \
-        max_ttl="720h"`,
-      ]);
-      await runCommands([`write ${this.mountPath}/root/generate/internal common_name="Hashicorp Test"`]);
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/overview`);
-      await click(SELECTORS.configTab);
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/configuration`);
-      await click(SELECTORS.configuration.issuerLink);
-      assert.dom(SELECTORS.configuration.deleteAllIssuerModal).exists();
-      await fillIn(SELECTORS.configuration.deleteAllIssuerInput, 'delete-all');
-      await click(SELECTORS.configuration.deleteAllIssuerButton);
-      await isSettled();
-      assert.dom(SELECTORS.configuration.deleteAllIssuerModal).doesNotExist();
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/configuration`);
-      await isSettled();
-      await visit(`/vault/secrets/${this.mountPath}/pki/overview`);
-      await waitUntil(() => currentURL() === `/vault/secrets/${this.mountPath}/pki/overview`);
-      await isSettled();
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/overview`);
-      assert
-        .dom(SELECTORS.emptyStateMessage)
-        .hasText(
-          "This PKI mount hasn't yet been configured with a certificate issuer. There are existing roles and certificates. Use the CLI to perform any operations with them until an issuer is configured."
-        );
-
-      await visit(`/vault/secrets/${this.mountPath}/pki/roles`);
-      await isSettled();
-      assert
-        .dom(SELECTORS.emptyStateMessage)
-        .hasText(
-          "This PKI mount hasn't yet been configured with a certificate issuer. There are existing roles. Use the CLI to perform any operations with them until an issuer is configured."
-        );
-
-      await visit(`/vault/secrets/${this.mountPath}/pki/issuers`);
-      await isSettled();
-      assert
-        .dom(SELECTORS.emptyStateMessage)
-        .hasText("This PKI mount hasn't yet been configured with a certificate issuer.");
-
-      await visit(`/vault/secrets/${this.mountPath}/pki/keys`);
-      await isSettled();
-      assert
-        .dom(SELECTORS.emptyStateMessage)
-        .hasText("This PKI mount hasn't yet been configured with a certificate issuer.");
-
-      await visit(`/vault/secrets/${this.mountPath}/pki/certificates`);
-      await isSettled();
-      assert
-        .dom(SELECTORS.emptyStateMessage)
-        .hasText(
-          "This PKI mount hasn't yet been configured with a certificate issuer. There are existing certificates. Use the CLI to perform any operations with them until an issuer is configured."
-        );
-    });
-  });
-});
diff --git a/ui/tests/acceptance/pki/pki-cross-sign-test.js b/ui/tests/acceptance/pki/pki-cross-sign-test.js
deleted file mode 100644
index f20d9fc9c9105..0000000000000
--- a/ui/tests/acceptance/pki/pki-cross-sign-test.js
+++ /dev/null
@@ -1,111 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { visit, click, fillIn, find } from '@ember/test-helpers';
-import { setupApplicationTest } from 'vault/tests/helpers';
-import { v4 as uuidv4 } from 'uuid';
-
-import authPage from 'vault/tests/pages/auth';
-import logout from 'vault/tests/pages/logout';
-import enablePage from 'vault/tests/pages/settings/mount-secret-backend';
-import { runCommands } from 'vault/tests/helpers/pki/pki-run-commands';
-import { SELECTORS } from 'vault/tests/helpers/pki/pki-issuer-cross-sign';
-import { verifyCertificates } from 'vault/utils/parse-pki-cert';
-module('Acceptance | pki/pki cross sign', function (hooks) {
-  setupApplicationTest(hooks);
-
-  hooks.beforeEach(async function () {
-    await authPage.login();
-    this.parentMountPath = `parent-mount-${uuidv4()}`;
-    this.oldParentIssuerName = 'old-parent-issuer'; // old parent issuer we're transferring from
-    this.parentIssuerName = 'new-parent-issuer'; // issuer where cross-signing action will begin
-    this.intMountPath = `intermediate-mount-${uuidv4()}`; // first input box in cross-signing page
-    this.intIssuerName = 'my-intermediate-issuer'; // second input box in cross-signing page
-    this.newlySignedIssuer = 'my-newly-signed-int'; // third input
-    await enablePage.enable('pki', this.parentMountPath);
-    await enablePage.enable('pki', this.intMountPath);
-
-    await runCommands([
-      `write "${this.parentMountPath}/root/generate/internal" common_name="Long-Lived Root X1" ttl=8960h issuer_name="${this.oldParentIssuerName}"`,
-      `write "${this.parentMountPath}/root/generate/internal" common_name="Long-Lived Root X2" ttl=8960h issuer_name="${this.parentIssuerName}"`,
-      `write "${this.parentMountPath}/config/issuers" default="${this.parentIssuerName}"`,
-    ]);
-  });
-
-  hooks.afterEach(async function () {
-    // Cleanup engine
-    await runCommands([`delete sys/mounts/${this.intMountPath}`]);
-    await runCommands([`delete sys/mounts/${this.parentMountPath}`]);
-    await logout.visit();
-  });
-
-  test('it cross-signs an issuer', async function (assert) {
-    // configure parent and intermediate mounts to make them cross-signable
-    await visit(`/vault/secrets/${this.intMountPath}/pki/configuration/create`);
-    await click(SELECTORS.configure.optionByKey('generate-csr'));
-    await fillIn(SELECTORS.inputByName('type'), 'internal');
-    await fillIn(SELECTORS.inputByName('commonName'), 'Short-Lived Int R1');
-    await click('[data-test-save]');
-    const csr = find(SELECTORS.copyButton('CSR')).getAttribute('data-clipboard-text');
-    await visit(`vault/secrets/${this.parentMountPath}/pki/issuers/${this.oldParentIssuerName}/sign`);
-    await fillIn(SELECTORS.inputByName('csr'), csr);
-    await fillIn(SELECTORS.inputByName('format'), 'pem_bundle');
-    await click('[data-test-pki-sign-intermediate-save]');
-    const pemBundle = find(SELECTORS.copyButton('CA Chain'))
-      .getAttribute('data-clipboard-text')
-      .replace(/,/, '\n');
-    await visit(`vault/secrets/${this.intMountPath}/pki/configuration/create`);
-    await click(SELECTORS.configure.optionByKey('import'));
-    await click('[data-test-text-toggle]');
-    await fillIn('[data-test-text-file-textarea]', pemBundle);
-    await click(SELECTORS.configure.importSubmit);
-    await visit(`vault/secrets/${this.intMountPath}/pki/issuers`);
-    await click('[data-test-is-default]');
-    // name default issuer of intermediate
-    const oldIntIssuerId = find(SELECTORS.rowValue('Issuer ID')).innerText;
-    const oldIntCert = find(SELECTORS.copyButton('Certificate')).getAttribute('data-clipboard-text');
-    await click(SELECTORS.details.configure);
-    await fillIn(SELECTORS.inputByName('issuerName'), this.intIssuerName);
-    await click('[data-test-save]');
-
-    // perform cross-sign
-    await visit(`vault/secrets/${this.parentMountPath}/pki/issuers/${this.parentIssuerName}/cross-sign`);
-    await fillIn(SELECTORS.objectListInput('intermediateMount'), this.intMountPath);
-    await fillIn(SELECTORS.objectListInput('intermediateIssuer'), this.intIssuerName);
-    await fillIn(SELECTORS.objectListInput('newCrossSignedIssuer'), this.newlySignedIssuer);
-    await click(SELECTORS.submitButton);
-    assert
-      .dom(`${SELECTORS.signedIssuerCol('intermediateMount')} a`)
-      .hasAttribute('href', `/ui/vault/secrets/${this.intMountPath}/pki/overview`);
-    assert
-      .dom(`${SELECTORS.signedIssuerCol('intermediateIssuer')} a`)
-      .hasAttribute('href', `/ui/vault/secrets/${this.intMountPath}/pki/issuers/${oldIntIssuerId}/details`);
-
-    // get certificate data of newly signed issuer
-    await click(`${SELECTORS.signedIssuerCol('newCrossSignedIssuer')} a`);
-    const newIntCert = find(SELECTORS.copyButton('Certificate')).getAttribute('data-clipboard-text');
-
-    // verify cross-sign was accurate by creating a role to issue a leaf certificate
-    const myRole = 'some-role';
-    await runCommands([
-      `write ${this.intMountPath}/roles/${myRole} \
-    issuer_ref=${this.newlySignedIssuer}\
-    allow_any_name=true \
-    max_ttl="720h"`,
-    ]);
-    await visit(`vault/secrets/${this.intMountPath}/pki/roles/${myRole}/generate`);
-    await fillIn(SELECTORS.inputByName('commonName'), 'my-leaf');
-    await fillIn('[data-test-ttl-value="TTL"]', '3600');
-    await click('[data-test-pki-generate-button]');
-    const myLeafCert = find(SELECTORS.copyButton('Certificate')).getAttribute('data-clipboard-text');
-
-    // see comments in utils/parse-pki-cert.js for step-by-step explanation of of verifyCertificates method
-    assert.true(
-      await verifyCertificates(oldIntCert, newIntCert, myLeafCert),
-      'the leaf certificate validates against both intermediate certificates'
-    );
-  });
-});
diff --git a/ui/tests/acceptance/pki/pki-engine-route-cleanup-test.js b/ui/tests/acceptance/pki/pki-engine-route-cleanup-test.js
deleted file mode 100644
index 9dde991c70c06..0000000000000
--- a/ui/tests/acceptance/pki/pki-engine-route-cleanup-test.js
+++ /dev/null
@@ -1,406 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupApplicationTest } from 'ember-qunit';
-import { v4 as uuidv4 } from 'uuid';
-
-import authPage from 'vault/tests/pages/auth';
-import logout from 'vault/tests/pages/logout';
-import enablePage from 'vault/tests/pages/settings/mount-secret-backend';
-import { click, currentURL, fillIn, visit } from '@ember/test-helpers';
-import { runCommands } from 'vault/tests/helpers/pki/pki-run-commands';
-import { SELECTORS } from 'vault/tests/helpers/pki/workflow';
-
-/**
- * This test module should test that dirty route models are cleaned up when the user leaves the page
- */
-module('Acceptance | pki engine route cleanup test', function (hooks) {
-  setupApplicationTest(hooks);
-
-  hooks.beforeEach(async function () {
-    this.store = this.owner.lookup('service:store');
-    await authPage.login();
-    // Setup PKI engine
-    const mountPath = `pki-workflow-${uuidv4()}`;
-    await enablePage.enable('pki', mountPath);
-    this.mountPath = mountPath;
-    await logout.visit();
-  });
-
-  hooks.afterEach(async function () {
-    await logout.visit();
-    await authPage.login();
-    // Cleanup engine
-    await runCommands([`delete sys/mounts/${this.mountPath}`]);
-    await logout.visit();
-  });
-
-  module('configuration', function () {
-    test('create config', async function (assert) {
-      let configs, urls, config;
-      await authPage.login(this.pkiAdminToken);
-      await visit(`/vault/secrets/${this.mountPath}/pki/overview`);
-      await click(SELECTORS.emptyStateLink);
-      configs = this.store.peekAll('pki/action');
-      urls = this.store.peekRecord('pki/config/urls', this.mountPath);
-      config = configs.objectAt(0);
-      assert.strictEqual(configs.length, 1, 'One config model present');
-      assert.false(urls.hasDirtyAttributes, 'URLs is loaded from endpoint');
-      assert.true(config.hasDirtyAttributes, 'Config model is dirty');
-
-      // Cancel button rolls it back
-      await click(SELECTORS.configuration.cancelButton);
-      configs = this.store.peekAll('pki/action');
-      urls = this.store.peekRecord('pki/config/urls', this.mountPath);
-      assert.strictEqual(configs.length, 0, 'config model is rolled back on cancel');
-      assert.strictEqual(urls.id, this.mountPath, 'Urls still exists on exit');
-
-      await click(SELECTORS.emptyStateLink);
-      configs = this.store.peekAll('pki/action');
-      urls = this.store.peekRecord('pki/config/urls', this.mountPath);
-      config = configs.objectAt(0);
-      assert.strictEqual(configs.length, 1, 'One config model present');
-      assert.false(urls.hasDirtyAttributes, 'URLs is loaded from endpoint');
-      assert.true(config.hasDirtyAttributes, 'Config model is dirty');
-
-      // Exit page via link rolls it back
-      await click(SELECTORS.overviewBreadcrumb);
-      configs = this.store.peekAll('pki/action');
-      urls = this.store.peekRecord('pki/config/urls', this.mountPath);
-      assert.strictEqual(configs.length, 0, 'config model is rolled back on cancel');
-      assert.strictEqual(urls.id, this.mountPath, 'Urls still exists on exit');
-    });
-  });
-
-  module('role routes', function (hooks) {
-    hooks.beforeEach(async function () {
-      await authPage.login();
-      // Configure PKI
-      await visit(`/vault/secrets/${this.mountPath}/pki/overview`);
-      await click(SELECTORS.emptyStateLink);
-      await click(SELECTORS.configuration.optionByKey('generate-root'));
-      await fillIn(SELECTORS.configuration.typeField, 'internal');
-      await fillIn(SELECTORS.configuration.inputByName('commonName'), 'my-root-cert');
-      await click(SELECTORS.configuration.generateRootSave);
-      await logout.visit();
-    });
-
-    test('create role exit via cancel', async function (assert) {
-      let roles;
-      await authPage.login();
-      // Create PKI
-      await visit(`/vault/secrets/${this.mountPath}/pki/overview`);
-      await click(SELECTORS.rolesTab);
-      roles = this.store.peekAll('pki/role');
-      assert.strictEqual(roles.length, 0, 'No roles exist yet');
-      await click(SELECTORS.createRoleLink);
-      roles = this.store.peekAll('pki/role');
-      const role = roles.objectAt(0);
-      assert.strictEqual(roles.length, 1, 'New role exists');
-      assert.true(role.isNew, 'Role is new model');
-      await click(SELECTORS.roleForm.roleCancelButton);
-      roles = this.store.peekAll('pki/role');
-      assert.strictEqual(roles.length, 0, 'Role is removed from store');
-    });
-    test('create role exit via breadcrumb', async function (assert) {
-      let roles;
-      await authPage.login();
-      // Create PKI
-      await visit(`/vault/secrets/${this.mountPath}/pki/overview`);
-      await click(SELECTORS.rolesTab);
-      roles = this.store.peekAll('pki/role');
-      assert.strictEqual(roles.length, 0, 'No roles exist yet');
-      await click(SELECTORS.createRoleLink);
-      roles = this.store.peekAll('pki/role');
-      const role = roles.objectAt(0);
-      assert.strictEqual(roles.length, 1, 'New role exists');
-      assert.true(role.isNew, 'Role is new model');
-      await click(SELECTORS.overviewBreadcrumb);
-      roles = this.store.peekAll('pki/role');
-      assert.strictEqual(roles.length, 0, 'Role is removed from store');
-    });
-    test('edit role', async function (assert) {
-      let roles, role;
-      const roleId = 'workflow-edit-role';
-      await authPage.login();
-      // Create PKI
-      await visit(`/vault/secrets/${this.mountPath}/pki/overview`);
-      await click(SELECTORS.rolesTab);
-      roles = this.store.peekAll('pki/role');
-      assert.strictEqual(roles.length, 0, 'No roles exist yet');
-      await click(SELECTORS.createRoleLink);
-      await fillIn(SELECTORS.roleForm.roleName, roleId);
-      await click(SELECTORS.roleForm.roleCreateButton);
-      assert.dom('[data-test-value-div="Role name"]').hasText(roleId, 'Shows correct role after create');
-      roles = this.store.peekAll('pki/role');
-      role = roles.objectAt(0);
-      assert.strictEqual(roles.length, 1, 'Role is created');
-      assert.false(role.hasDirtyAttributes, 'Role no longer has dirty attributes');
-
-      // Edit role
-      await click(SELECTORS.editRoleLink);
-      await click(SELECTORS.roleForm.issuerRefToggle);
-      await fillIn(SELECTORS.roleForm.issuerRefSelect, 'foobar');
-      role = this.store.peekRecord('pki/role', roleId);
-      assert.true(role.hasDirtyAttributes, 'Role has dirty attrs');
-      // Exit page via cancel button
-      await click(SELECTORS.roleForm.roleCancelButton);
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/roles/${roleId}/details`);
-      role = this.store.peekRecord('pki/role', roleId);
-      assert.false(role.hasDirtyAttributes, 'Role dirty attrs have been rolled back');
-
-      // Edit again
-      await click(SELECTORS.editRoleLink);
-      await click(SELECTORS.roleForm.issuerRefToggle);
-      await fillIn(SELECTORS.roleForm.issuerRefSelect, 'foobar2');
-      role = this.store.peekRecord('pki/role', roleId);
-      assert.true(role.hasDirtyAttributes, 'Role has dirty attrs');
-      // Exit page via breadcrumbs
-      await click(SELECTORS.overviewBreadcrumb);
-      role = this.store.peekRecord('pki/role', roleId);
-      assert.false(role.hasDirtyAttributes, 'Role dirty attrs have been rolled back');
-    });
-  });
-
-  module('issuer routes', function () {
-    test('import issuer exit via cancel', async function (assert) {
-      let issuers;
-      await authPage.login();
-      await visit(`/vault/secrets/${this.mountPath}/pki/overview`);
-      await click(SELECTORS.issuersTab);
-      issuers = this.store.peekAll('pki/issuer');
-      assert.strictEqual(issuers.length, 0, 'No issuer models exist yet');
-      await click(SELECTORS.importIssuerLink);
-      issuers = this.store.peekAll('pki/action');
-      assert.strictEqual(issuers.length, 1, 'Action model created');
-      const issuer = issuers.objectAt(0);
-      assert.true(issuer.hasDirtyAttributes, 'Action has dirty attrs');
-      assert.true(issuer.isNew, 'Action is new');
-      // Exit
-      await click('[data-test-pki-ca-cert-cancel]');
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/issuers`);
-      issuers = this.store.peekAll('pki/action');
-      assert.strictEqual(issuers.length, 0, 'Action is removed from store');
-    });
-    test('import issuer exit via breadcrumb', async function (assert) {
-      let issuers;
-      await authPage.login();
-      await visit(`/vault/secrets/${this.mountPath}/pki/overview`);
-      await click(SELECTORS.issuersTab);
-      issuers = this.store.peekAll('pki/issuer');
-      assert.strictEqual(issuers.length, 0, 'No issuers exist yet');
-      await click(SELECTORS.importIssuerLink);
-      issuers = this.store.peekAll('pki/action');
-      assert.strictEqual(issuers.length, 1, 'Action model created');
-      const issuer = issuers.objectAt(0);
-      assert.true(issuer.hasDirtyAttributes, 'Action model has dirty attrs');
-      assert.true(issuer.isNew, 'Action model is new');
-      // Exit
-      await click(SELECTORS.overviewBreadcrumb);
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/overview`);
-      issuers = this.store.peekAll('pki/action');
-      assert.strictEqual(issuers.length, 0, 'Issuer is removed from store');
-    });
-    test('generate root exit via cancel', async function (assert) {
-      let actions;
-      await authPage.login();
-      await visit(`/vault/secrets/${this.mountPath}/pki/overview`);
-      await click(SELECTORS.issuersTab);
-      actions = this.store.peekAll('pki/action');
-      assert.strictEqual(actions.length, 0, 'No actions exist yet');
-      await click(SELECTORS.generateIssuerDropdown);
-      await click(SELECTORS.generateIssuerRoot);
-      actions = this.store.peekAll('pki/action');
-      assert.strictEqual(actions.length, 1, 'Action model for generate-root created');
-      const action = actions.objectAt(0);
-      assert.true(action.hasDirtyAttributes, 'Action has dirty attrs');
-      assert.true(action.isNew, 'Action is new');
-      assert.strictEqual(action.actionType, 'generate-root', 'Action type is correct');
-      // Exit
-      await click(SELECTORS.configuration.generateRootCancel);
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/issuers`);
-      actions = this.store.peekAll('pki/action');
-      assert.strictEqual(actions.length, 0, 'Action is removed from store');
-    });
-    test('generate root exit via breadcrumb', async function (assert) {
-      let actions;
-      await authPage.login();
-      await visit(`/vault/secrets/${this.mountPath}/pki/overview`);
-      await click(SELECTORS.issuersTab);
-      actions = this.store.peekAll('pki/action');
-      assert.strictEqual(actions.length, 0, 'No actions exist yet');
-      await click(SELECTORS.generateIssuerDropdown);
-      await click(SELECTORS.generateIssuerRoot);
-      actions = this.store.peekAll('pki/action');
-      assert.strictEqual(actions.length, 1, 'Action model for generate-root created');
-      const action = actions.objectAt(0);
-      assert.true(action.hasDirtyAttributes, 'Action has dirty attrs');
-      assert.true(action.isNew, 'Action is new');
-      assert.strictEqual(action.actionType, 'generate-root');
-      // Exit
-      await click(SELECTORS.overviewBreadcrumb);
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/overview`);
-      actions = this.store.peekAll('pki/action');
-      assert.strictEqual(actions.length, 0, 'Action is removed from store');
-    });
-    test('generate intermediate csr exit via cancel', async function (assert) {
-      let actions;
-      await authPage.login();
-      await visit(`/vault/secrets/${this.mountPath}/pki/overview`);
-      await click(SELECTORS.issuersTab);
-      actions = this.store.peekAll('pki/action');
-      assert.strictEqual(actions.length, 0, 'No actions exist yet');
-      await await click(SELECTORS.generateIssuerDropdown);
-      await click(SELECTORS.generateIssuerIntermediate);
-      actions = this.store.peekAll('pki/action');
-      assert.strictEqual(actions.length, 1, 'Action model for generate-csr created');
-      const action = actions.objectAt(0);
-      assert.true(action.hasDirtyAttributes, 'Action has dirty attrs');
-      assert.true(action.isNew, 'Action is new');
-      assert.strictEqual(action.actionType, 'generate-csr');
-      // Exit
-      await click('[data-test-cancel]');
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/issuers`);
-      actions = this.store.peekAll('pki/action');
-      assert.strictEqual(actions.length, 0, 'Action is removed from store');
-    });
-    test('generate intermediate csr exit via breadcrumb', async function (assert) {
-      let actions;
-      await authPage.login();
-      await visit(`/vault/secrets/${this.mountPath}/pki/overview`);
-      await click(SELECTORS.issuersTab);
-      actions = this.store.peekAll('pki/action');
-      assert.strictEqual(actions.length, 0, 'No actions exist yet');
-      await click(SELECTORS.generateIssuerDropdown);
-      await click(SELECTORS.generateIssuerIntermediate);
-      actions = this.store.peekAll('pki/action');
-      assert.strictEqual(actions.length, 1, 'Action model for generate-csr created');
-      const action = actions.objectAt(0);
-      assert.true(action.hasDirtyAttributes, 'Action has dirty attrs');
-      assert.true(action.isNew, 'Action is new');
-      assert.strictEqual(action.actionType, 'generate-csr');
-      // Exit
-      await click(SELECTORS.overviewBreadcrumb);
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/overview`);
-      actions = this.store.peekAll('pki/action');
-      assert.strictEqual(actions.length, 0, 'Action is removed from store');
-    });
-    test('edit issuer exit', async function (assert) {
-      let issuers, issuer;
-      await authPage.login();
-      await visit(`/vault/secrets/${this.mountPath}/pki/overview`);
-      await click(SELECTORS.emptyStateLink);
-      await click(SELECTORS.configuration.optionByKey('generate-root'));
-      await fillIn(SELECTORS.configuration.typeField, 'internal');
-      await fillIn(SELECTORS.configuration.inputByName('commonName'), 'my-root-cert');
-      await click(SELECTORS.configuration.generateRootSave);
-      // Go to list view so we fetch all the issuers
-      await visit(`/vault/secrets/${this.mountPath}/pki/issuers`);
-
-      issuers = this.store.peekAll('pki/issuer');
-      const issuerId = issuers.objectAt(0).id;
-      assert.strictEqual(issuers.length, 1, 'Issuer exists on model in list');
-      await visit(`/vault/secrets/${this.mountPath}/pki/issuers/${issuerId}/details`);
-      await click(SELECTORS.issuerDetails.configure);
-      issuer = this.store.peekRecord('pki/issuer', issuerId);
-      assert.false(issuer.hasDirtyAttributes, 'Model not dirty');
-      await fillIn('[data-test-input="issuerName"]', 'foobar');
-      assert.true(issuer.hasDirtyAttributes, 'Model is dirty');
-      await click(SELECTORS.overviewBreadcrumb);
-      issuers = this.store.peekAll('pki/issuer');
-      assert.strictEqual(issuers.length, 1, 'Issuer exists on model in overview');
-      issuer = this.store.peekRecord('pki/issuer', issuerId);
-      assert.false(issuer.hasDirtyAttributes, 'Dirty attrs were rolled back');
-    });
-  });
-
-  module('key routes', function (hooks) {
-    hooks.beforeEach(async function () {
-      await authPage.login();
-      // Configure PKI -- key creation not allowed unless configured
-      await visit(`/vault/secrets/${this.mountPath}/pki/overview`);
-      await click(SELECTORS.emptyStateLink);
-      await click(SELECTORS.configuration.optionByKey('generate-root'));
-      await fillIn(SELECTORS.configuration.typeField, 'internal');
-      await fillIn(SELECTORS.configuration.inputByName('commonName'), 'my-root-cert');
-      await click(SELECTORS.configuration.generateRootSave);
-      await logout.visit();
-    });
-    test('create key exit', async function (assert) {
-      let keys, key;
-      await authPage.login();
-      await visit(`/vault/secrets/${this.mountPath}/pki/overview`);
-      await click(SELECTORS.keysTab);
-      keys = this.store.peekAll('pki/key');
-      const configKeyId = keys.objectAt(0).id;
-      assert.strictEqual(keys.length, 1, 'One key exists from config');
-      // Create key
-      await click(SELECTORS.keyPages.generateKey);
-      keys = this.store.peekAll('pki/key');
-      key = keys.objectAt(1);
-      assert.strictEqual(keys.length, 2, 'New key exists');
-      assert.true(key.isNew, 'Role is new model');
-      // Exit
-      await click(SELECTORS.keyForm.keyCancelButton);
-      keys = this.store.peekAll('pki/key');
-      assert.strictEqual(keys.length, 1, 'Second key is removed from store');
-      assert.strictEqual(keys.objectAt(0).id, configKeyId);
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/keys`, 'url is correct');
-
-      // Create again
-      await click(SELECTORS.keyPages.generateKey);
-      assert.strictEqual(keys.length, 2, 'New key exists');
-      keys = this.store.peekAll('pki/key');
-      key = keys.objectAt(1);
-      assert.true(key.isNew, 'Key is new model');
-      // Exit
-      await click(SELECTORS.overviewBreadcrumb);
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/overview`, 'url is correct');
-      keys = this.store.peekAll('pki/key');
-      assert.strictEqual(keys.length, 1, 'Key is removed from store');
-    });
-    test('edit key exit', async function (assert) {
-      let keys, key;
-      await authPage.login();
-      await visit(`/vault/secrets/${this.mountPath}/pki/overview`);
-      await click(SELECTORS.keysTab);
-      keys = this.store.peekAll('pki/key');
-      assert.strictEqual(keys.length, 1, 'One key from config exists');
-      assert.dom('.list-item-row').exists({ count: 1 }, 'single row for key');
-      await click('.list-item-row');
-      // Edit
-      await click(SELECTORS.keyPages.keyEditLink);
-      await fillIn(SELECTORS.keyForm.keyNameInput, 'foobar');
-      keys = this.store.peekAll('pki/key');
-      key = keys.objectAt(0);
-      assert.true(key.hasDirtyAttributes, 'Key model is dirty');
-      // Exit
-      await click(SELECTORS.keyForm.keyCancelButton);
-      assert.strictEqual(
-        currentURL(),
-        `/vault/secrets/${this.mountPath}/pki/keys/${key.id}/details`,
-        'url is correct'
-      );
-      keys = this.store.peekAll('pki/key');
-      assert.strictEqual(keys.length, 1, 'Key list has 1');
-      assert.false(key.hasDirtyAttributes, 'Key dirty attrs have been rolled back');
-
-      // Edit again
-      await click(SELECTORS.keyPages.keyEditLink);
-      await fillIn(SELECTORS.keyForm.keyNameInput, 'foobar');
-      keys = this.store.peekAll('pki/key');
-      key = keys.objectAt(0);
-      assert.true(key.hasDirtyAttributes, 'Key model is dirty');
-
-      // Exit via breadcrumb
-      await click(SELECTORS.overviewBreadcrumb);
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/overview`, 'url is correct');
-      keys = this.store.peekAll('pki/key');
-      assert.strictEqual(keys.length, 1, 'Key list has 1');
-      assert.false(key.hasDirtyAttributes, 'Key dirty attrs have been rolled back');
-    });
-  });
-});
diff --git a/ui/tests/acceptance/pki/pki-engine-workflow-test.js b/ui/tests/acceptance/pki/pki-engine-workflow-test.js
deleted file mode 100644
index 987ccbb694c6f..0000000000000
--- a/ui/tests/acceptance/pki/pki-engine-workflow-test.js
+++ /dev/null
@@ -1,517 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupApplicationTest } from 'ember-qunit';
-import { v4 as uuidv4 } from 'uuid';
-
-import authPage from 'vault/tests/pages/auth';
-import logout from 'vault/tests/pages/logout';
-import enablePage from 'vault/tests/pages/settings/mount-secret-backend';
-import { click, currentURL, fillIn, find, isSettled, visit } from '@ember/test-helpers';
-import { SELECTORS } from 'vault/tests/helpers/pki/workflow';
-import { adminPolicy, readerPolicy, updatePolicy } from 'vault/tests/helpers/policy-generator/pki';
-import { tokenWithPolicy, runCommands } from 'vault/tests/helpers/pki/pki-run-commands';
-import { unsupportedPem } from 'vault/tests/helpers/pki/values';
-
-/**
- * This test module should test the PKI workflow, including:
- * - link between pages and confirm that the url is as expected
- * - log in as user with a policy and ensure expected UI elements are shown/hidden
- */
-module('Acceptance | pki workflow', function (hooks) {
-  setupApplicationTest(hooks);
-
-  hooks.beforeEach(async function () {
-    await authPage.login();
-    // Setup PKI engine
-    const mountPath = `pki-workflow-${uuidv4()}`;
-    await enablePage.enable('pki', mountPath);
-    this.mountPath = mountPath;
-    await logout.visit();
-  });
-
-  hooks.afterEach(async function () {
-    await logout.visit();
-    await authPage.login();
-    // Cleanup engine
-    await runCommands([`delete sys/mounts/${this.mountPath}`]);
-    await logout.visit();
-  });
-
-  test('empty state messages are correct when PKI not configured', async function (assert) {
-    assert.expect(21);
-    const assertEmptyState = (assert, resource) => {
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/${resource}`);
-      assert
-        .dom(SELECTORS.emptyStateTitle)
-        .hasText(
-          'PKI not configured',
-          `${resource} index renders correct empty state title when PKI not configured`
-        );
-      assert.dom(SELECTORS.emptyStateLink).hasText('Configure PKI');
-      assert
-        .dom(SELECTORS.emptyStateMessage)
-        .hasText(
-          `This PKI mount hasn't yet been configured with a certificate issuer.`,
-          `${resource} index empty state message correct when PKI not configured`
-        );
-    };
-    await authPage.login(this.pkiAdminToken);
-    await visit(`/vault/secrets/${this.mountPath}/pki/overview`);
-    assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/overview`);
-
-    await click(SELECTORS.rolesTab);
-    assertEmptyState(assert, 'roles');
-
-    await click(SELECTORS.issuersTab);
-    assertEmptyState(assert, 'issuers');
-
-    await click(SELECTORS.certsTab);
-    assertEmptyState(assert, 'certificates');
-    await click(SELECTORS.keysTab);
-    assertEmptyState(assert, 'keys');
-    await click(SELECTORS.tidyTab);
-    assertEmptyState(assert, 'tidy');
-  });
-
-  module('roles', function (hooks) {
-    hooks.beforeEach(async function () {
-      await authPage.login();
-      // Setup role-specific items
-      await runCommands([
-        `write ${this.mountPath}/roles/some-role \
-      issuer_ref="default" \
-      allowed_domains="example.com" \
-      allow_subdomains=true \
-      max_ttl="720h"`,
-      ]);
-      await runCommands([`write ${this.mountPath}/root/generate/internal common_name="Hashicorp Test"`]);
-      const pki_admin_policy = adminPolicy(this.mountPath, 'roles');
-      const pki_reader_policy = readerPolicy(this.mountPath, 'roles');
-      const pki_editor_policy = updatePolicy(this.mountPath, 'roles');
-      this.pkiRoleReader = await tokenWithPolicy('pki-reader', pki_reader_policy);
-      this.pkiRoleEditor = await tokenWithPolicy('pki-editor', pki_editor_policy);
-      this.pkiAdminToken = await tokenWithPolicy('pki-admin', pki_admin_policy);
-      await logout.visit();
-    });
-
-    test('shows correct items if user has all permissions', async function (assert) {
-      await authPage.login(this.pkiAdminToken);
-      await visit(`/vault/secrets/${this.mountPath}/pki/overview`);
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/overview`);
-      assert.dom(SELECTORS.rolesTab).exists('Roles tab is present');
-      await click(SELECTORS.rolesTab);
-      assert.dom(SELECTORS.createRoleLink).exists({ count: 1 }, 'Create role link is rendered');
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/roles`);
-      assert.dom('.linked-block').exists({ count: 1 }, 'One role is in list');
-      await click('.linked-block');
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/roles/some-role/details`);
-
-      assert.dom(SELECTORS.generateCertLink).exists('Generate cert link is shown');
-      await click(SELECTORS.generateCertLink);
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/roles/some-role/generate`);
-
-      // Go back to details and test all the links
-      await visit(`/vault/secrets/${this.mountPath}/pki/roles/some-role/details`);
-      assert.dom(SELECTORS.signCertLink).exists('Sign cert link is shown');
-      await click(SELECTORS.signCertLink);
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/roles/some-role/sign`);
-
-      await visit(`/vault/secrets/${this.mountPath}/pki/roles/some-role/details`);
-      assert.dom(SELECTORS.editRoleLink).exists('Edit link is shown');
-      await click(SELECTORS.editRoleLink);
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/roles/some-role/edit`);
-
-      await visit(`/vault/secrets/${this.mountPath}/pki/roles/some-role/details`);
-      assert.dom(SELECTORS.deleteRoleButton).exists('Delete role button is shown');
-      await click(`${SELECTORS.deleteRoleButton} [data-test-confirm-action-trigger]`);
-      await click(`[data-test-confirm-button]`);
-      assert.strictEqual(
-        currentURL(),
-        `/vault/secrets/${this.mountPath}/pki/roles`,
-        'redirects to roles list after deletion'
-      );
-    });
-
-    test('it does not show toolbar items the user does not have permission to see', async function (assert) {
-      await authPage.login(this.pkiRoleReader);
-      await visit(`/vault/secrets/${this.mountPath}/pki/overview`);
-      assert.dom(SELECTORS.rolesTab).exists('Roles tab is present');
-      await click(SELECTORS.rolesTab);
-      assert.dom(SELECTORS.createRoleLink).exists({ count: 1 }, 'Create role link is rendered');
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/roles`);
-      assert.dom('.linked-block').exists({ count: 1 }, 'One role is in list');
-      await click('.linked-block');
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/roles/some-role/details`);
-      assert.dom(SELECTORS.deleteRoleButton).doesNotExist('Delete role button is not shown');
-      assert.dom(SELECTORS.generateCertLink).doesNotExist('Generate cert link is not shown');
-      assert.dom(SELECTORS.signCertLink).doesNotExist('Sign cert link is not shown');
-      assert.dom(SELECTORS.editRoleLink).doesNotExist('Edit link is not shown');
-    });
-
-    test('it shows correct toolbar items for the user policy', async function (assert) {
-      await authPage.login(this.pkiRoleEditor);
-      await visit(`/vault/secrets/${this.mountPath}/pki/overview`);
-      assert.dom(SELECTORS.rolesTab).exists('Roles tab is present');
-      await click(SELECTORS.rolesTab);
-      assert.dom(SELECTORS.createRoleLink).exists({ count: 1 }, 'Create role link is rendered');
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/roles`);
-      assert.dom('.linked-block').exists({ count: 1 }, 'One role is in list');
-      await click('.linked-block');
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/roles/some-role/details`);
-      assert.dom(SELECTORS.deleteRoleButton).doesNotExist('Delete role button is not shown');
-      assert.dom(SELECTORS.generateCertLink).exists('Generate cert link is shown');
-      assert.dom(SELECTORS.signCertLink).exists('Sign cert link is shown');
-      assert.dom(SELECTORS.editRoleLink).exists('Edit link is shown');
-      await click(SELECTORS.editRoleLink);
-      assert.strictEqual(
-        currentURL(),
-        `/vault/secrets/${this.mountPath}/pki/roles/some-role/edit`,
-        'Links to edit view'
-      );
-      await click(SELECTORS.roleForm.roleCancelButton);
-      assert.strictEqual(
-        currentURL(),
-        `/vault/secrets/${this.mountPath}/pki/roles/some-role/details`,
-        'Cancel from edit goes to details'
-      );
-      await click(SELECTORS.generateCertLink);
-      assert.strictEqual(
-        currentURL(),
-        `/vault/secrets/${this.mountPath}/pki/roles/some-role/generate`,
-        'Generate cert button goes to generate page'
-      );
-      await click(SELECTORS.generateCertForm.cancelButton);
-      assert.strictEqual(
-        currentURL(),
-        `/vault/secrets/${this.mountPath}/pki/roles/some-role/details`,
-        'Cancel from generate goes to details'
-      );
-    });
-
-    test('create role happy path', async function (assert) {
-      const roleName = 'another-role';
-      await authPage.login(this.pkiAdminToken);
-      await visit(`/vault/secrets/${this.mountPath}/pki/overview`);
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/overview`);
-      assert.dom(SELECTORS.rolesTab).exists('Roles tab is present');
-      await click(SELECTORS.rolesTab);
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/roles`);
-      await click(SELECTORS.createRoleLink);
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/roles/create`);
-      assert.dom(SELECTORS.breadcrumbContainer).exists({ count: 1 }, 'breadcrumbs are rendered');
-      assert.dom(SELECTORS.breadcrumbs).exists({ count: 4 }, 'Shows 4 breadcrumbs');
-      assert.dom(SELECTORS.pageTitle).hasText('Create a PKI role');
-
-      await fillIn(SELECTORS.roleForm.roleName, roleName);
-      await click(SELECTORS.roleForm.roleCreateButton);
-
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/roles/${roleName}/details`);
-      assert.dom(SELECTORS.breadcrumbs).exists({ count: 4 }, 'Shows 4 breadcrumbs');
-      assert.dom(SELECTORS.pageTitle).hasText(`PKI Role ${roleName}`);
-    });
-  });
-
-  module('keys', function (hooks) {
-    hooks.beforeEach(async function () {
-      await authPage.login();
-      // base config pki so empty state doesn't show
-      await runCommands([`write ${this.mountPath}/root/generate/internal common_name="Hashicorp Test"`]);
-      const pki_admin_policy = adminPolicy(this.mountPath);
-      const pki_reader_policy = readerPolicy(this.mountPath, 'keys', true);
-      const pki_editor_policy = updatePolicy(this.mountPath, 'keys');
-      this.pkiKeyReader = await tokenWithPolicy('pki-reader', pki_reader_policy);
-      this.pkiKeyEditor = await tokenWithPolicy('pki-editor', pki_editor_policy);
-      this.pkiAdminToken = await tokenWithPolicy('pki-admin', pki_admin_policy);
-      await logout.visit();
-    });
-
-    test('shows correct items if user has all permissions', async function (assert) {
-      await authPage.login(this.pkiAdminToken);
-      await visit(`/vault/secrets/${this.mountPath}/pki/overview`);
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/overview`);
-      await click(SELECTORS.keysTab);
-      // index page
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/keys`);
-      assert
-        .dom(SELECTORS.keyPages.importKey)
-        .hasAttribute(
-          'href',
-          `/ui/vault/secrets/${this.mountPath}/pki/keys/import`,
-          'import link renders with correct url'
-        );
-      let keyId = find(SELECTORS.keyPages.keyId).innerText;
-      assert.dom('.linked-block').exists({ count: 1 }, 'One key is in list');
-      await click('.linked-block');
-      // details page
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/keys/${keyId}/details`);
-      assert.dom(SELECTORS.keyPages.downloadButton).doesNotExist('does not download button for private key');
-
-      // edit page
-      await click(SELECTORS.keyPages.keyEditLink);
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/keys/${keyId}/edit`);
-      await click(SELECTORS.keyForm.keyCancelButton);
-      assert.strictEqual(
-        currentURL(),
-        `/vault/secrets/${this.mountPath}/pki/keys/${keyId}/details`,
-        'navigates back to details on cancel'
-      );
-      await visit(`/vault/secrets/${this.mountPath}/pki/keys/${keyId}/edit`);
-      await fillIn(SELECTORS.keyForm.keyNameInput, 'test-key');
-      await click(SELECTORS.keyForm.keyCreateButton);
-      assert.strictEqual(
-        currentURL(),
-        `/vault/secrets/${this.mountPath}/pki/keys/${keyId}/details`,
-        'navigates to details after save'
-      );
-      assert.dom(SELECTORS.keyPages.keyNameValue).hasText('test-key', 'updates key name');
-
-      // key generate and delete navigation
-      await visit(`/vault/secrets/${this.mountPath}/pki/keys`);
-      await click(SELECTORS.keyPages.generateKey);
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/keys/create`);
-      await fillIn(SELECTORS.keyForm.typeInput, 'exported');
-      await fillIn(SELECTORS.keyForm.keyTypeInput, 'rsa');
-      await click(SELECTORS.keyForm.keyCreateButton);
-      keyId = find(SELECTORS.keyPages.keyIdValue).innerText;
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/keys/${keyId}/details`);
-
-      assert
-        .dom(SELECTORS.alertBanner)
-        .hasText(
-          'Next steps This private key material will only be available once. Copy or download it now.',
-          'renders banner to save private key'
-        );
-      assert.dom(SELECTORS.keyPages.downloadButton).exists('renders download button');
-      await click(SELECTORS.keyPages.keyDeleteButton);
-      await click(SELECTORS.keyPages.confirmDelete);
-      assert.strictEqual(
-        currentURL(),
-        `/vault/secrets/${this.mountPath}/pki/keys`,
-        'navigates back to key list view on delete'
-      );
-    });
-
-    test('it hide corrects actions for user with read policy', async function (assert) {
-      await authPage.login(this.pkiKeyReader);
-      await visit(`/vault/secrets/${this.mountPath}/pki/overview`);
-      await click(SELECTORS.keysTab);
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/keys`);
-      await isSettled();
-      assert.dom(SELECTORS.keyPages.importKey).doesNotExist();
-      assert.dom(SELECTORS.keyPages.generateKey).doesNotExist();
-      assert.dom('.linked-block').exists({ count: 1 }, 'One key is in list');
-      const keyId = find(SELECTORS.keyPages.keyId).innerText;
-      await click(SELECTORS.keyPages.popupMenuTrigger);
-      assert.dom(SELECTORS.keyPages.popupMenuEdit).hasClass('disabled', 'popup menu edit link is disabled');
-      await click(SELECTORS.keyPages.popupMenuDetails);
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/keys/${keyId}/details`);
-      assert.dom(SELECTORS.keyPages.keyDeleteButton).doesNotExist('Delete key button is not shown');
-      assert.dom(SELECTORS.keyPages.keyEditLink).doesNotExist('Edit key button does not render');
-    });
-
-    test('it shows correct toolbar items for the user with update policy', async function (assert) {
-      await authPage.login(this.pkiKeyEditor);
-      await visit(`/vault/secrets/${this.mountPath}/pki/overview`);
-      await click(SELECTORS.keysTab);
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/keys`);
-      await isSettled();
-      assert.dom(SELECTORS.keyPages.importKey).exists('import action exists');
-      assert.dom(SELECTORS.keyPages.generateKey).exists('generate action exists');
-      assert.dom('.linked-block').exists({ count: 1 }, 'One key is in list');
-      const keyId = find(SELECTORS.keyPages.keyId).innerText;
-      await click(SELECTORS.keyPages.popupMenuTrigger);
-      assert
-        .dom(SELECTORS.keyPages.popupMenuEdit)
-        .doesNotHaveClass('disabled', 'popup menu edit link is not disabled');
-      await click('.linked-block');
-      assert.dom(SELECTORS.keyPages.keyDeleteButton).doesNotExist('Delete key button is not shown');
-      await click(SELECTORS.keyPages.keyEditLink);
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/keys/${keyId}/edit`);
-      assert.dom(SELECTORS.keyPages.title).hasText('Edit key');
-      await click(SELECTORS.keyForm.keyCancelButton);
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/keys/${keyId}/details`);
-    });
-  });
-
-  module('issuers', function (hooks) {
-    hooks.beforeEach(async function () {
-      await authPage.login();
-      // Configure engine with a default issuer
-      await runCommands([
-        `write ${this.mountPath}/root/generate/internal common_name="Hashicorp Test" name="Hashicorp Test"`,
-      ]);
-      await logout.visit();
-    });
-    test('lists the correct issuer metadata info', async function (assert) {
-      assert.expect(6);
-      await authPage.login(this.pkiAdminToken);
-      await visit(`/vault/secrets/${this.mountPath}/pki/overview`);
-      assert.dom(SELECTORS.issuersTab).exists('Issuers tab is present');
-      await click(SELECTORS.issuersTab);
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/issuers`);
-      assert.dom('.linked-block').exists({ count: 1 }, 'One issuer is in list');
-      assert.dom('[data-test-is-root-tag="0"]').hasText('root');
-      assert.dom('[data-test-serial-number="0"]').exists({ count: 1 }, 'displays serial number tag');
-      assert.dom('[data-test-common-name="0"]').exists({ count: 1 }, 'displays cert common name tag');
-    });
-    test('lists the correct issuer metadata info when user has only read permission', async function (assert) {
-      assert.expect(2);
-      await authPage.login();
-      await visit(`/vault/secrets/${this.mountPath}/pki/overview`);
-      await click(SELECTORS.issuersTab);
-      await click(SELECTORS.issuerPopupMenu);
-      await click(SELECTORS.issuerPopupDetails);
-      const issuerId = find(SELECTORS.issuerDetails.valueByName('Issuer ID')).innerText;
-      const pki_issuer_denied_policy = `
-      path "${this.mountPath}/*" {
-        capabilities = ["create", "read", "update", "delete", "list"]
-      },
-      path "${this.mountPath}/issuer/${issuerId}" {
-        capabilities = ["deny"]
-      }
-      `;
-      this.token = await tokenWithPolicy('pki-issuer-denied-policy', pki_issuer_denied_policy);
-      await logout.visit();
-      await authPage.login(this.token);
-      await visit(`/vault/secrets/${this.mountPath}/pki/overview`);
-      await click(SELECTORS.issuersTab);
-      assert.dom('[data-test-serial-number="0"]').exists({ count: 1 }, 'displays serial number tag');
-      assert.dom('[data-test-common-name="0"]').exists({ count: 1 }, 'displays cert common name tag');
-    });
-
-    test('details view renders correct number of info items', async function (assert) {
-      assert.expect(13);
-      await authPage.login(this.pkiAdminToken);
-      await visit(`/vault/secrets/${this.mountPath}/pki/overview`);
-      assert.dom(SELECTORS.issuersTab).exists('Issuers tab is present');
-      await click(SELECTORS.issuersTab);
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/issuers`);
-      assert.dom('.linked-block').exists({ count: 1 }, 'One issuer is in list');
-      await click('.linked-block');
-      assert.ok(
-        currentURL().match(`/vault/secrets/${this.mountPath}/pki/issuers/.+/details`),
-        `/vault/secrets/${this.mountPath}/pki/issuers/my-issuer/details`
-      );
-      assert.dom(SELECTORS.issuerDetails.title).hasText('View issuer certificate');
-      ['Certificate', 'CA Chain', 'Common name', 'Issuer name', 'Issuer ID', 'Default key ID'].forEach(
-        (label) => {
-          assert
-            .dom(`${SELECTORS.issuerDetails.defaultGroup} ${SELECTORS.issuerDetails.valueByName(label)}`)
-            .exists({ count: 1 }, `${label} value rendered`);
-        }
-      );
-      assert
-        .dom(`${SELECTORS.issuerDetails.urlsGroup} ${SELECTORS.issuerDetails.row}`)
-        .exists({ count: 3 }, 'Renders 3 info table items under URLs group');
-      assert.dom(SELECTORS.issuerDetails.groupTitle).exists({ count: 1 }, 'only 1 group title rendered');
-    });
-
-    test('toolbar links navigate to expected routes', async function (assert) {
-      await authPage.login(this.pkiAdminToken);
-      await visit(`/vault/secrets/${this.mountPath}/pki/overview`);
-      await click(SELECTORS.issuersTab);
-      await click(SELECTORS.issuerPopupMenu);
-      await click(SELECTORS.issuerPopupDetails);
-
-      const issuerId = find(SELECTORS.issuerDetails.valueByName('Issuer ID')).innerText;
-      assert.strictEqual(
-        currentURL(),
-        `/vault/secrets/${this.mountPath}/pki/issuers/${issuerId}/details`,
-        'it navigates to details route'
-      );
-      assert
-        .dom(SELECTORS.issuerDetails.crossSign)
-        .hasAttribute('href', `/ui/vault/secrets/${this.mountPath}/pki/issuers/${issuerId}/cross-sign`);
-      assert
-        .dom(SELECTORS.issuerDetails.signIntermediate)
-        .hasAttribute('href', `/ui/vault/secrets/${this.mountPath}/pki/issuers/${issuerId}/sign`);
-      assert
-        .dom(SELECTORS.issuerDetails.configure)
-        .hasAttribute('href', `/ui/vault/secrets/${this.mountPath}/pki/issuers/${issuerId}/edit`);
-      await click(SELECTORS.issuerDetails.rotateRoot);
-      assert.dom(find(SELECTORS.issuerDetails.rotateModal).parentElement).hasClass('is-active');
-      await click(SELECTORS.issuerDetails.rotateModalGenerate);
-      assert.strictEqual(
-        currentURL(),
-        `/vault/secrets/${this.mountPath}/pki/issuers/${issuerId}/rotate-root`,
-        'it navigates to root rotate form'
-      );
-      assert
-        .dom('[data-test-input="commonName"]')
-        .hasValue('Hashicorp Test', 'form prefilled with parent issuer cn');
-    });
-  });
-
-  module('rotate', function (hooks) {
-    hooks.beforeEach(async function () {
-      await authPage.login();
-      await runCommands([`write ${this.mountPath}/root/generate/internal issuer_name="existing-issuer"`]);
-      await logout.visit();
-    });
-    test('it renders a warning banner when parent issuer has unsupported OIDs', async function (assert) {
-      await authPage.login();
-      await visit(`/vault/secrets/${this.mountPath}/pki/configuration/create`);
-      await click(SELECTORS.configuration.optionByKey('import'));
-      await click('[data-test-text-toggle]');
-      await fillIn('[data-test-text-file-textarea]', unsupportedPem);
-      await click(SELECTORS.configuration.importSubmit);
-      const issuerId = find(SELECTORS.configuration.importedIssuer).innerText;
-      await click(`${SELECTORS.configuration.importedIssuer} a`);
-
-      // navigating directly to route because the rotate button is not visible for non-root issuers
-      // but we're just testing that route model was parsed and passed as expected
-      await visit(`/vault/secrets/${this.mountPath}/pki/issuers/${issuerId}/rotate-root`);
-      assert
-        .dom('[data-test-warning-banner]')
-        .hasTextContaining(
-          'Not all of the certificate values could be parsed and transferred to new root',
-          'it renders warning banner'
-        );
-      assert.dom('[data-test-input="commonName"]').hasValue('fancy-cert-unsupported-subj-and-ext-oids');
-      await fillIn('[data-test-input="issuerName"]', 'existing-issuer');
-      await click('[data-test-pki-rotate-root-save]');
-      assert
-        .dom('[data-test-error-banner]')
-        .hasText('Error issuer name already in use', 'it renders error banner');
-    });
-  });
-
-  module('config', function (hooks) {
-    hooks.beforeEach(async function () {
-      await authPage.login();
-      await runCommands([`write ${this.mountPath}/root/generate/internal issuer_name="existing-issuer"`]);
-      const mixed_config_policy = `
-      ${adminPolicy(this.mountPath)}
-      ${readerPolicy(this.mountPath, 'config/cluster')}
-      `;
-      this.mixedConfigCapabilities = await tokenWithPolicy('pki-reader', mixed_config_policy);
-      await logout.visit();
-    });
-
-    test('it updates config when user only has permission to some endpoints', async function (assert) {
-      await authPage.login(this.mixedConfigCapabilities);
-      await visit(`/vault/secrets/${this.mountPath}/pki/configuration/edit`);
-      assert
-        .dom(`${SELECTORS.configEdit.configEditSection} [data-test-component="empty-state"]`)
-        .hasText(
-          `You do not have permission to set this mount's the cluster config Ask your administrator if you think you should have access to: POST /${this.mountPath}/config/cluster`
-        );
-      assert.dom(SELECTORS.configEdit.acmeEditSection).exists();
-      assert.dom(SELECTORS.configEdit.urlsEditSection).exists();
-      assert.dom(SELECTORS.configEdit.crlEditSection).exists();
-      assert.dom(`${SELECTORS.acmeEditSection} [data-test-component="empty-state"]`).doesNotExist();
-      assert.dom(`${SELECTORS.urlsEditSection} [data-test-component="empty-state"]`).doesNotExist();
-      assert.dom(`${SELECTORS.crlEditSection} [data-test-component="empty-state"]`).doesNotExist();
-      await click(SELECTORS.configEdit.crlToggleInput('expiry'));
-      await click(SELECTORS.configEdit.saveButton);
-      assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/configuration`);
-      assert
-        .dom('[data-test-value-div="CRL building"]')
-        .hasText('Disabled', 'Successfully saves config with partial permission');
-    });
-  });
-});
diff --git a/ui/tests/acceptance/pki/pki-overview-test.js b/ui/tests/acceptance/pki/pki-overview-test.js
deleted file mode 100644
index fcdf2e4c1c77c..0000000000000
--- a/ui/tests/acceptance/pki/pki-overview-test.js
+++ /dev/null
@@ -1,126 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupApplicationTest } from 'ember-qunit';
-import authPage from 'vault/tests/pages/auth';
-import logout from 'vault/tests/pages/logout';
-import enablePage from 'vault/tests/pages/settings/mount-secret-backend';
-import { click, currentURL, currentRouteName, visit } from '@ember/test-helpers';
-import { SELECTORS } from 'vault/tests/helpers/pki/overview';
-import { tokenWithPolicy, runCommands } from 'vault/tests/helpers/pki/pki-run-commands';
-
-module('Acceptance | pki overview', function (hooks) {
-  setupApplicationTest(hooks);
-
-  hooks.beforeEach(async function () {
-    await authPage.login();
-    // Setup PKI engine
-    const mountPath = `pki`;
-    await enablePage.enable('pki', mountPath);
-    this.mountPath = mountPath;
-    await runCommands([`write ${this.mountPath}/root/generate/internal common_name="Hashicorp Test"`]);
-    const pki_admin_policy = `
-    path "${this.mountPath}/*" {
-      capabilities = ["create", "read", "update", "delete", "list"]
-    },
-  `;
-    const pki_issuers_list_policy = `
-    path "${this.mountPath}/issuers" {
-      capabilities = ["list"]
-    },
-    `;
-    const pki_roles_list_policy = `
-    path "${this.mountPath}/roles" {
-      capabilities = ["list"]
-    },
-    `;
-
-    this.pkiRolesList = await tokenWithPolicy('pki-roles-list', pki_roles_list_policy);
-    this.pkiIssuersList = await tokenWithPolicy('pki-issuers-list', pki_issuers_list_policy);
-    this.pkiAdminToken = await tokenWithPolicy('pki-admin', pki_admin_policy);
-    await logout.visit();
-  });
-
-  hooks.afterEach(async function () {
-    await logout.visit();
-    await authPage.login();
-    // Cleanup engine
-    await runCommands([`delete sys/mounts/${this.mountPath}`]);
-    await logout.visit();
-  });
-
-  test('navigates to view issuers when link is clicked on issuer card', async function (assert) {
-    await authPage.login(this.pkiAdminToken);
-    await visit(`/vault/secrets/${this.mountPath}/pki/overview`);
-    assert.dom(SELECTORS.issuersCardTitle).hasText('Issuers');
-    assert.dom(SELECTORS.issuersCardOverviewNum).hasText('1');
-    await click(SELECTORS.issuersCardLink);
-    assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/issuers`);
-    await visit(`/vault/secrets/${this.mountPath}/pki/overview`);
-  });
-
-  test('navigates to view roles when link is clicked on roles card', async function (assert) {
-    await authPage.login(this.pkiAdminToken);
-    await visit(`/vault/secrets/${this.mountPath}/pki/overview`);
-    assert.dom(SELECTORS.rolesCardTitle).hasText('Roles');
-    assert.dom(SELECTORS.rolesCardOverviewNum).hasText('0');
-    await click(SELECTORS.rolesCardLink);
-    assert.strictEqual(currentURL(), `/vault/secrets/${this.mountPath}/pki/roles`);
-    await runCommands([
-      `write ${this.mountPath}/roles/some-role \
-    issuer_ref="default" \
-    allowed_domains="example.com" \
-    allow_subdomains=true \
-    max_ttl="720h"`,
-    ]);
-    await visit(`/vault/secrets/${this.mountPath}/pki/overview`);
-    assert.dom(SELECTORS.rolesCardOverviewNum).hasText('1');
-  });
-
-  test('hides roles card if user does not have permissions', async function (assert) {
-    await authPage.login(this.pkiIssuersList);
-    await visit(`/vault/secrets/${this.mountPath}/pki/overview`);
-    assert.dom(SELECTORS.rolesCardTitle).doesNotExist('Roles card does not exist');
-    assert.dom(SELECTORS.issuersCardTitle).exists('Issuers card exists');
-  });
-
-  test('navigates to generate certificate page for Issue Certificates card', async function (assert) {
-    await authPage.login(this.pkiAdminToken);
-    await runCommands([
-      `write ${this.mountPath}/roles/some-role \
-    issuer_ref="default" \
-    allowed_domains="example.com" \
-    allow_subdomains=true \
-    max_ttl="720h"`,
-    ]);
-    await visit(`/vault/secrets/${this.mountPath}/pki/overview`);
-    await click(SELECTORS.issueCertificatePowerSearch);
-    await click(SELECTORS.firstPowerSelectOption);
-    await click(SELECTORS.issueCertificateButton);
-    assert.strictEqual(currentRouteName(), 'vault.cluster.secrets.backend.pki.roles.role.generate');
-  });
-
-  test('navigates to certificate details page for View Certificates card', async function (assert) {
-    await authPage.login(this.pkiAdminToken);
-    await visit(`/vault/secrets/${this.mountPath}/pki/overview`);
-    await click(SELECTORS.viewCertificatePowerSearch);
-    await click(SELECTORS.firstPowerSelectOption);
-    await click(SELECTORS.viewCertificateButton);
-    assert.strictEqual(
-      currentRouteName(),
-      'vault.cluster.secrets.backend.pki.certificates.certificate.details'
-    );
-  });
-
-  test('navigates to issuer details page for View Issuer card', async function (assert) {
-    await authPage.login(this.pkiAdminToken);
-    await visit(`/vault/secrets/${this.mountPath}/pki/overview`);
-    await click(SELECTORS.viewIssuerPowerSearch);
-    await click(SELECTORS.firstPowerSelectOption);
-    await click(SELECTORS.viewIssuerButton);
-    assert.strictEqual(currentRouteName(), 'vault.cluster.secrets.backend.pki.issuers.issuer.details');
-  });
-});
diff --git a/ui/tests/acceptance/pki/pki-tidy-test.js b/ui/tests/acceptance/pki/pki-tidy-test.js
deleted file mode 100644
index 4d6907c92ae38..0000000000000
--- a/ui/tests/acceptance/pki/pki-tidy-test.js
+++ /dev/null
@@ -1,181 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupApplicationTest } from 'ember-qunit';
-import { click, currentRouteName, fillIn, visit } from '@ember/test-helpers';
-
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import { v4 as uuidv4 } from 'uuid';
-
-import authPage from 'vault/tests/pages/auth';
-import logout from 'vault/tests/pages/logout';
-import enablePage from 'vault/tests/pages/settings/mount-secret-backend';
-import { runCommands } from 'vault/tests/helpers/pki/pki-run-commands';
-import { SELECTORS } from 'vault/tests/helpers/pki/page/pki-tidy';
-
-module('Acceptance | pki tidy', function (hooks) {
-  setupApplicationTest(hooks);
-  setupMirage(hooks);
-
-  hooks.beforeEach(async function () {
-    await authPage.login();
-    // Setup PKI engine
-    const mountPath = `pki-workflow-${uuidv4()}`;
-    await enablePage.enable('pki', mountPath);
-    this.mountPath = mountPath;
-    await runCommands([
-      `write ${this.mountPath}/root/generate/internal common_name="Hashicorp Test" name="Hashicorp Test"`,
-    ]);
-    await logout.visit();
-  });
-
-  hooks.afterEach(async function () {
-    await logout.visit();
-    await authPage.login();
-    // Cleanup engine
-    await runCommands([`delete sys/mounts/${this.mountPath}`]);
-    await logout.visit();
-  });
-
-  test('it configures a manual tidy operation and shows its details and tidy states', async function (assert) {
-    await authPage.login(this.pkiAdminToken);
-    await visit(`/vault/secrets/${this.mountPath}/pki/tidy`);
-    await click(SELECTORS.tidyEmptyStateConfigure);
-    assert.dom(SELECTORS.tidyConfigureModal.configureTidyModal).exists('Configure tidy modal exists');
-    assert.dom(SELECTORS.tidyConfigureModal.tidyModalAutoButton).exists('Configure auto tidy button exists');
-    assert
-      .dom(SELECTORS.tidyConfigureModal.tidyModalManualButton)
-      .exists('Configure manual tidy button exists');
-    await click(SELECTORS.tidyConfigureModal.tidyModalManualButton);
-    assert.dom(SELECTORS.tidyForm.tidyFormName('manual')).exists('Manual tidy form exists');
-    await click(SELECTORS.tidyForm.inputByAttr('tidyCertStore'));
-    await fillIn(SELECTORS.tidyForm.tidyPauseDuration, '10');
-    await click(SELECTORS.tidyForm.tidySave);
-    await click(SELECTORS.cancelTidyAction);
-    assert.dom(SELECTORS.cancelTidyModalBackground).exists('Confirm cancel tidy modal exits');
-    await click(SELECTORS.tidyConfigureModal.tidyModalCancelButton);
-    // we can't properly test the background refresh fetching of tidy status in testing
-    this.server.get(`${this.mountPath}/tidy-status`, () => {
-      return {
-        request_id: 'dba2d42d-1a6e-1551-80f8-4ddb364ede4b',
-        lease_id: '',
-        renewable: false,
-        lease_duration: 0,
-        data: {
-          acme_account_deleted_count: 0,
-          acme_account_revoked_count: 0,
-          acme_account_safety_buffer: 2592000,
-          acme_orders_deleted_count: 0,
-          cert_store_deleted_count: 0,
-          cross_revoked_cert_deleted_count: 0,
-          current_cert_store_count: null,
-          current_revoked_cert_count: null,
-          error: null,
-          internal_backend_uuid: '964a41f7-a159-53aa-d62e-fc1914e4a7e1',
-          issuer_safety_buffer: 31536000,
-          last_auto_tidy_finished: '2023-05-19T10:27:11.721825-07:00',
-          message: 'Tidying certificate store: checking entry 0 of 1',
-          missing_issuer_cert_count: 0,
-          pause_duration: '1m40s',
-          revocation_queue_deleted_count: 0,
-          revocation_queue_safety_buffer: 36000,
-          revoked_cert_deleted_count: 0,
-          safety_buffer: 2073600,
-          state: 'Cancelled',
-          tidy_acme: false,
-          tidy_cert_store: true,
-          tidy_cross_cluster_revoked_certs: false,
-          tidy_expired_issuers: false,
-          tidy_move_legacy_ca_bundle: false,
-          tidy_revocation_queue: false,
-          tidy_revoked_cert_issuer_associations: false,
-          tidy_revoked_certs: false,
-          time_finished: '2023-05-19T10:28:51.733092-07:00',
-          time_started: '2023-05-19T10:27:11.721846-07:00',
-          total_acme_account_count: 0,
-        },
-        wrap_info: null,
-        warnings: null,
-        auth: null,
-      };
-    });
-    await visit(`/vault/secrets/${this.mountPath}/pki/configuration`);
-    await visit(`/vault/secrets/${this.mountPath}/pki/tidy`);
-    assert.dom(SELECTORS.hdsAlertTitle).hasText('Tidy operation cancelled');
-    assert
-      .dom(SELECTORS.hdsAlertDescription)
-      .hasText(
-        'Your tidy operation has been cancelled. If this was a mistake configure and run another tidy operation.'
-      );
-    assert.dom(SELECTORS.alertUpdatedAt).exists();
-  });
-
-  test('it configures an auto tidy operation and shows its details', async function (assert) {
-    await authPage.login(this.pkiAdminToken);
-    await visit(`/vault/secrets/${this.mountPath}/pki/tidy`);
-    await click(SELECTORS.tidyEmptyStateConfigure);
-    assert.dom(SELECTORS.tidyConfigureModal.configureTidyModal).exists('Configure tidy modal exists');
-    assert.dom(SELECTORS.tidyConfigureModal.tidyModalAutoButton).exists('Configure auto tidy button exists');
-    assert
-      .dom(SELECTORS.tidyConfigureModal.tidyModalManualButton)
-      .exists('Configure manual tidy button exists');
-    await click(SELECTORS.tidyConfigureModal.tidyModalAutoButton);
-    assert.dom(SELECTORS.tidyForm.tidyFormName('auto')).exists('Auto tidy form exists');
-    await click(SELECTORS.tidyForm.tidyCancel);
-    assert.strictEqual(currentRouteName(), 'vault.cluster.secrets.backend.pki.tidy.index');
-    await click(SELECTORS.tidyEmptyStateConfigure);
-    await click(SELECTORS.tidyConfigureModal.tidyModalAutoButton);
-    assert.dom(SELECTORS.tidyForm.tidyFormName('auto')).exists('Auto tidy form exists');
-    await click(SELECTORS.tidyForm.toggleLabel('Automatic tidy disabled'));
-    assert
-      .dom(SELECTORS.tidyForm.tidySectionHeader('ACME operations'))
-      .exists('Auto tidy form enabled shows ACME operations field');
-    await click(SELECTORS.tidyForm.inputByAttr('tidyCertStore'));
-    await click(SELECTORS.tidyForm.tidySave);
-    assert.strictEqual(currentRouteName(), 'vault.cluster.secrets.backend.pki.tidy.auto.index');
-    await click(SELECTORS.tidyForm.editAutoTidyButton);
-    assert.strictEqual(currentRouteName(), 'vault.cluster.secrets.backend.pki.tidy.auto.configure');
-    await click(SELECTORS.tidyForm.inputByAttr('tidyRevokedCerts'));
-    await click(SELECTORS.tidyForm.tidySave);
-    assert.strictEqual(currentRouteName(), 'vault.cluster.secrets.backend.pki.tidy.auto.index');
-  });
-
-  test('it opens a tidy modal when the user clicks on the tidy toolbar action', async function (assert) {
-    await authPage.login(this.pkiAdminToken);
-    await visit(`/vault/secrets/${this.mountPath}/pki/tidy`);
-    await click(SELECTORS.tidyConfigureModal.tidyOptionsModal);
-    assert.dom(SELECTORS.tidyConfigureModal.configureTidyModal).exists('Configure tidy modal exists');
-    assert.dom(SELECTORS.tidyConfigureModal.tidyModalAutoButton).exists('Configure auto tidy button exists');
-    assert
-      .dom(SELECTORS.tidyConfigureModal.tidyModalManualButton)
-      .exists('Configure manual tidy button exists');
-    await click(SELECTORS.tidyConfigureModal.tidyModalCancelButton);
-    assert.dom(SELECTORS.tidyEmptyState).exists();
-  });
-
-  test('it should show correct toolbar action depending on whether auto tidy is enabled', async function (assert) {
-    await authPage.login(this.pkiAdminToken);
-    await visit(`/vault/secrets/${this.mountPath}/pki/tidy`);
-    assert
-      .dom(SELECTORS.tidyConfigureModal.tidyOptionsModal)
-      .exists('Configure tidy modal options button exists');
-    await click(SELECTORS.tidyConfigureModal.tidyOptionsModal);
-    assert.dom(SELECTORS.tidyConfigureModal.configureTidyModal).exists('Configure tidy modal exists');
-    await click(SELECTORS.tidyConfigureModal.tidyOptionsModal);
-    await click(SELECTORS.tidyConfigureModal.tidyModalAutoButton);
-    await click(SELECTORS.tidyForm.toggleLabel('Automatic tidy disabled'));
-    await click(SELECTORS.tidyForm.inputByAttr('tidyCertStore'));
-    await click(SELECTORS.tidyForm.inputByAttr('tidyRevokedCerts'));
-    await click(SELECTORS.tidyForm.tidySave);
-    await visit(`/vault/secrets/${this.mountPath}/pki/tidy`);
-    assert
-      .dom(SELECTORS.manualTidyToolbar)
-      .exists('Manual tidy toolbar action exists if auto tidy is configured');
-    assert
-      .dom(SELECTORS.autoTidyToolbar)
-      .exists('Auto tidy toolbar action exists if auto tidy is configured');
-  });
-});
diff --git a/ui/tests/acceptance/policies-acl-old-test.js b/ui/tests/acceptance/policies-acl-old-test.js
index 6ae35710a2f44..dab76e2af6c50 100644
--- a/ui/tests/acceptance/policies-acl-old-test.js
+++ b/ui/tests/acceptance/policies-acl-old-test.js
@@ -1,13 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { click, fillIn, find, currentURL, waitUntil } from '@ember/test-helpers';
+import { click, fillIn, find, findAll, currentURL, waitUntil } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
-import { v4 as uuidv4 } from 'uuid';
-
 import page from 'vault/tests/pages/policies/index';
 import authPage from 'vault/tests/pages/auth';
 
@@ -15,13 +8,13 @@ module('Acceptance | policies (old)', function (hooks) {
   setupApplicationTest(hooks);
 
   hooks.beforeEach(function () {
-    this.uid = uuidv4();
     return authPage.login();
   });
 
   test('policies', async function (assert) {
+    const now = new Date().getTime();
     const policyString = 'path "*" { capabilities = ["update"]}';
-    const policyName = `Policy test ${this.uid}`;
+    const policyName = `Policy test ${now}`;
     const policyLower = policyName.toLowerCase();
 
     await page.visit({ type: 'acl' });
@@ -30,14 +23,13 @@ module('Acceptance | policies (old)', function (hooks) {
 
     await fillIn('[data-test-policy-input="name"]', policyName);
     await click('[data-test-policy-save]');
-    assert
-      .dom('[data-test-error]')
-      .hasText(`Error 'policy' parameter not supplied or empty`, 'renders error message on save');
+    const errors = await waitUntil(() => findAll('[data-test-error]'));
+    assert.equal(errors.length, 1, 'renders error messages on save');
     find('.CodeMirror').CodeMirror.setValue(policyString);
     await click('[data-test-policy-save]');
 
     await waitUntil(() => currentURL() === `/vault/policy/acl/${encodeURIComponent(policyLower)}`);
-    assert.strictEqual(
+    assert.equal(
       currentURL(),
       `/vault/policy/acl/${encodeURIComponent(policyLower)}`,
       'navigates to policy show on successful save'
@@ -59,11 +51,7 @@ module('Acceptance | policies (old)', function (hooks) {
 
     await click('[data-test-confirm-button]');
     await waitUntil(() => currentURL() === `/vault/policies/acl`);
-    assert.strictEqual(
-      currentURL(),
-      `/vault/policies/acl`,
-      'navigates to policy list on successful deletion'
-    );
+    assert.equal(currentURL(), `/vault/policies/acl`, 'navigates to policy list on successful deletion');
     assert
       .dom(`[data-test-policy-item="${policyLower}"]`)
       .doesNotExist('deleted policy is not shown in the list');
@@ -71,8 +59,9 @@ module('Acceptance | policies (old)', function (hooks) {
 
   // https://github.com/hashicorp/vault/issues/4395
   test('it properly fetches policies when the name ends in a ,', async function (assert) {
+    const now = new Date().getTime();
     const policyString = 'path "*" { capabilities = ["update"]}';
-    const policyName = `${this.uid}-policy-symbol,.`;
+    const policyName = `${now}-symbol,.`;
 
     await page.visit({ type: 'acl' });
     // new policy creation
diff --git a/ui/tests/acceptance/policies-test.js b/ui/tests/acceptance/policies-test.js
index 5e545bb2bc079..952a7366fcdf7 100644
--- a/ui/tests/acceptance/policies-test.js
+++ b/ui/tests/acceptance/policies-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { currentURL, currentRouteName, visit } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
@@ -17,17 +12,17 @@ module('Acceptance | policies', function (hooks) {
 
   test('it redirects to acls on unknown policy type', async function (assert) {
     await visit('/vault/policy/foo/default');
-    assert.strictEqual(currentRouteName(), 'vault.cluster.policies.index');
-    assert.strictEqual(currentURL(), '/vault/policies/acl');
+    assert.equal(currentRouteName(), 'vault.cluster.policies.index');
+    assert.equal(currentURL(), '/vault/policies/acl');
 
     await visit('/vault/policy/foo/default/edit');
-    assert.strictEqual(currentRouteName(), 'vault.cluster.policies.index');
-    assert.strictEqual(currentURL(), '/vault/policies/acl');
+    assert.equal(currentRouteName(), 'vault.cluster.policies.index');
+    assert.equal(currentURL(), '/vault/policies/acl');
   });
 
   test('it redirects to acls on index navigation', async function (assert) {
     await visit('/vault/policy/acl');
-    assert.strictEqual(currentRouteName(), 'vault.cluster.policies.index');
-    assert.strictEqual(currentURL(), '/vault/policies/acl');
+    assert.equal(currentRouteName(), 'vault.cluster.policies.index');
+    assert.equal(currentURL(), '/vault/policies/acl');
   });
 });
diff --git a/ui/tests/acceptance/policies/index-test.js b/ui/tests/acceptance/policies/index-test.js
index feb8eda5f43ba..971067a95458a 100644
--- a/ui/tests/acceptance/policies/index-test.js
+++ b/ui/tests/acceptance/policies/index-test.js
@@ -1,9 +1,4 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { currentURL, currentRouteName, settled, find, findAll, click } from '@ember/test-helpers';
+import { currentURL, currentRouteName, settled } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
 import { create } from 'ember-cli-page-object';
@@ -24,14 +19,9 @@ module('Acceptance | policies/acl', function (hooks) {
   test('it lists default and root acls', async function (assert) {
     await page.visit({ type: 'acl' });
     await settled();
-    assert.strictEqual(currentURL(), '/vault/policies/acl');
-    assert.ok(page.findPolicyByName('default'), 'default policy shown in the list');
-    if (find('nav.pagination')) {
-      // Root ACL is always last in the list
-      const paginationLinks = findAll('.pagination-link');
-      await click(paginationLinks[paginationLinks.length - 1]);
-    }
+    assert.equal(currentURL(), '/vault/policies/acl');
     assert.ok(page.findPolicyByName('root'), 'root policy shown in the list');
+    assert.ok(page.findPolicyByName('default'), 'default policy shown in the list');
   });
 
   test('it navigates to show when clicking on the link', async function (assert) {
@@ -39,18 +29,18 @@ module('Acceptance | policies/acl', function (hooks) {
     await settled();
     await page.findPolicyByName('default').click();
     await settled();
-    assert.strictEqual(currentRouteName(), 'vault.cluster.policy.show');
-    assert.strictEqual(currentURL(), '/vault/policy/acl/default');
+    assert.equal(currentRouteName(), 'vault.cluster.policy.show');
+    assert.equal(currentURL(), '/vault/policy/acl/default');
   });
 
   test('it allows deletion of policies with dots in names', async function (assert) {
     const POLICY = 'path "*" { capabilities = ["list"]}';
-    const policyName = 'list.policy';
+    let policyName = 'list.policy';
     await consoleComponent.runCommands([`write sys/policies/acl/${policyName} policy=${btoa(POLICY)}`]);
     await settled();
     await page.visit({ type: 'acl' });
     await settled();
-    const policy = page.row.filterBy('name', policyName)[0];
+    let policy = page.row.filterBy('name', policyName)[0];
     assert.ok(policy, 'policy is shown in the list');
     await policy.menu();
     await settled();
diff --git a/ui/tests/acceptance/policy-test.js b/ui/tests/acceptance/policy-test.js
index 4df25804d785d..cfa844a1490c8 100644
--- a/ui/tests/acceptance/policy-test.js
+++ b/ui/tests/acceptance/policy-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { currentURL, currentRouteName, visit } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
@@ -22,7 +17,7 @@ module('Acceptance | policies', function (hooks) {
 
   test('it redirects to acls with unknown policy type', async function (assert) {
     await visit('/vault/policies/foo');
-    assert.strictEqual(currentRouteName(), 'vault.cluster.policies.index');
-    assert.strictEqual(currentURL(), '/vault/policies/acl');
+    assert.equal(currentRouteName(), 'vault.cluster.policies.index');
+    assert.equal(currentURL(), '/vault/policies/acl');
   });
 });
diff --git a/ui/tests/acceptance/policy/edit-test.js b/ui/tests/acceptance/policy/edit-test.js
index b67e03e56f4e1..484903c61369a 100644
--- a/ui/tests/acceptance/policy/edit-test.js
+++ b/ui/tests/acceptance/policy/edit-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { currentURL } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
@@ -18,11 +13,7 @@ module('Acceptance | policy/acl/:name/edit', function (hooks) {
 
   test('it redirects to list if navigating to root', async function (assert) {
     await page.visit({ type: 'acl', name: 'root' });
-    assert.strictEqual(
-      currentURL(),
-      '/vault/policies/acl',
-      'navigation to root show redirects you to policy list'
-    );
+    assert.equal(currentURL(), '/vault/policies/acl', 'navigation to root show redirects you to policy list');
   });
 
   test('it does not show delete for default policy', async function (assert) {
@@ -32,6 +23,6 @@ module('Acceptance | policy/acl/:name/edit', function (hooks) {
 
   test('it navigates to show when the toggle is clicked', async function (assert) {
     await page.visit({ type: 'acl', name: 'default' }).toggleEdit();
-    assert.strictEqual(currentURL(), '/vault/policy/acl/default', 'toggle navigates from edit to show');
+    assert.equal(currentURL(), '/vault/policy/acl/default', 'toggle navigates from edit to show');
   });
 });
diff --git a/ui/tests/acceptance/policy/show-test.js b/ui/tests/acceptance/policy/show-test.js
index 6b1032d0f2266..adbfcfd41550c 100644
--- a/ui/tests/acceptance/policy/show-test.js
+++ b/ui/tests/acceptance/policy/show-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { currentURL } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
@@ -18,15 +13,11 @@ module('Acceptance | policy/acl/:name', function (hooks) {
 
   test('it redirects to list if navigating to root', async function (assert) {
     await page.visit({ type: 'acl', name: 'root' });
-    assert.strictEqual(
-      currentURL(),
-      '/vault/policies/acl',
-      'navigation to root show redirects you to policy list'
-    );
+    assert.equal(currentURL(), '/vault/policies/acl', 'navigation to root show redirects you to policy list');
   });
 
   test('it navigates to edit when the toggle is clicked', async function (assert) {
     await page.visit({ type: 'acl', name: 'default' }).toggleEdit();
-    assert.strictEqual(currentURL(), '/vault/policy/acl/default/edit', 'toggle navigates to edit page');
+    assert.equal(currentURL(), '/vault/policy/acl/default/edit', 'toggle navigates to edit page');
   });
 });
diff --git a/ui/tests/acceptance/raft-storage-test.js b/ui/tests/acceptance/raft-storage-test.js
index 1209d762b5523..35fbc3945a378 100644
--- a/ui/tests/acceptance/raft-storage-test.js
+++ b/ui/tests/acceptance/raft-storage-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
 import { setupMirage } from 'ember-cli-mirage/test-support';
@@ -46,7 +41,7 @@ module('Acceptance | raft storage', function (hooks) {
     await visit('/vault/secrets');
     await visit('/vault/storage/raft');
     const store = this.owner.lookup('service:store');
-    assert.strictEqual(
+    assert.equal(
       store.peekAll('server').length,
       2,
       'Store contains 2 server records since remove peer was triggered externally'
@@ -60,7 +55,7 @@ module('Acceptance | raft storage', function (hooks) {
     this.server.get('/sys/storage/raft/configuration', () => this.config);
     this.server.post('/sys/storage/raft/remove-peer', (schema, req) => {
       const body = JSON.parse(req.requestBody);
-      assert.strictEqual(
+      assert.equal(
         body.server_id,
         this.config.data.config.servers[1].node_id,
         'Remove peer request made with node id'
diff --git a/ui/tests/acceptance/redirect-to-test.js b/ui/tests/acceptance/redirect-to-test.js
index a5f1680a0a56c..698a140c92d40 100644
--- a/ui/tests/acceptance/redirect-to-test.js
+++ b/ui/tests/acceptance/redirect-to-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { currentURL, visit as _visit, settled } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
@@ -28,7 +23,7 @@ const wrappedAuth = async () => {
   await consoleComponent.runCommands(`write -field=token auth/token/create policies=default -wrap-ttl=5m`);
   await settled();
   // because of flaky test, trying to capture the token using a dom selector instead of the page object
-  const token = document.querySelector('[data-test-component="console/log-text"] pre').textContent;
+  let token = document.querySelector('[data-test-component="console/log-text"] pre').textContent;
   if (token.includes('Error')) {
     throw new Error(`Error mounting secrets engine: ${token}`);
   }
@@ -42,7 +37,7 @@ const setupWrapping = async () => {
   await settled();
   await auth.tokenInput('root').submit();
   await settled();
-  const wrappedToken = await wrappedAuth();
+  let wrappedToken = await wrappedAuth();
   return wrappedToken;
 };
 module('Acceptance | redirect_to query param functionality', function (hooks) {
@@ -55,7 +50,7 @@ module('Acceptance | redirect_to query param functionality', function (hooks) {
     localStorage.clear();
   });
   test('redirect to a route after authentication', async function (assert) {
-    const url = '/vault/secrets/secret/create';
+    let url = '/vault/secrets/secret/create';
     await visit(url);
     assert.ok(
       currentURL().includes(`redirect_to=${encodeURIComponent(url)}`),
@@ -64,17 +59,17 @@ module('Acceptance | redirect_to query param functionality', function (hooks) {
     // the login method on this page does another visit call that we don't want here
     await auth.tokenInput('root').submit();
     await settled();
-    assert.strictEqual(currentURL(), url, 'navigates to the redirect_to url after auth');
+    assert.equal(currentURL(), url, 'navigates to the redirect_to url after auth');
   });
 
   test('redirect from root does not include redirect_to', async function (assert) {
-    const url = '/';
+    let url = '/';
     await visit(url);
     assert.ok(currentURL().indexOf('redirect_to') < 0, 'there is no redirect_to query param');
   });
 
   test('redirect to a route after authentication with a query param', async function (assert) {
-    const url = '/vault/secrets/secret/create?initialKey=hello';
+    let url = '/vault/secrets/secret/create?initialKey=hello';
     await visit(url);
     assert.ok(
       currentURL().includes(`?redirect_to=${encodeURIComponent(url)}`),
@@ -82,12 +77,12 @@ module('Acceptance | redirect_to query param functionality', function (hooks) {
     );
     await auth.tokenInput('root').submit();
     await settled();
-    assert.strictEqual(currentURL(), url, 'navigates to the redirect_to with the query param after auth');
+    assert.equal(currentURL(), url, 'navigates to the redirect_to with the query param after auth');
   });
 
   test('redirect to logout with wrapped token authenticates you', async function (assert) {
-    const wrappedToken = await setupWrapping();
-    const url = '/vault/secrets/cubbyhole/create';
+    let wrappedToken = await setupWrapping();
+    let url = '/vault/secrets/cubbyhole/create';
 
     await auth.logout({
       redirect_to: url,
@@ -95,6 +90,6 @@ module('Acceptance | redirect_to query param functionality', function (hooks) {
     });
     await settled();
 
-    assert.strictEqual(currentURL(), url, 'authenticates then navigates to the redirect_to url after auth');
+    assert.equal(currentURL(), url, 'authenticates then navigates to the redirect_to url after auth');
   });
 });
diff --git a/ui/tests/acceptance/secrets/backend/alicloud/secret-test.js b/ui/tests/acceptance/secrets/backend/alicloud/secret-test.js
index 6e7306a618720..d66355f951339 100644
--- a/ui/tests/acceptance/secrets/backend/alicloud/secret-test.js
+++ b/ui/tests/acceptance/secrets/backend/alicloud/secret-test.js
@@ -1,13 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { currentRouteName, settled } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
-import { v4 as uuidv4 } from 'uuid';
-
 import mountSecrets from 'vault/tests/pages/settings/mount-secret-backend';
 import backendsPage from 'vault/tests/pages/secrets/backends';
 import authPage from 'vault/tests/pages/auth';
@@ -16,12 +9,11 @@ module('Acceptance | alicloud/enable', function (hooks) {
   setupApplicationTest(hooks);
 
   hooks.beforeEach(function () {
-    this.uid = uuidv4();
     return authPage.login();
   });
 
   test('enable alicloud', async function (assert) {
-    const enginePath = `alicloud-${this.uid}`;
+    let enginePath = `alicloud-${new Date().getTime()}`;
     await mountSecrets.visit();
     await settled();
     await mountSecrets.selectType('alicloud');
@@ -29,11 +21,7 @@ module('Acceptance | alicloud/enable', function (hooks) {
     await mountSecrets.next().path(enginePath).submit();
     await settled();
 
-    assert.strictEqual(
-      currentRouteName(),
-      'vault.cluster.secrets.backends',
-      'redirects to the backends page'
-    );
+    assert.equal(currentRouteName(), 'vault.cluster.secrets.backends', 'redirects to the backends page');
     await settled();
     assert.ok(backendsPage.rows.filterBy('path', `${enginePath}/`)[0], 'shows the alicloud engine');
   });
diff --git a/ui/tests/acceptance/secrets/backend/cubbyhole/secret-test.js b/ui/tests/acceptance/secrets/backend/cubbyhole/secret-test.js
index d50ddcd54573a..e3009ee4ad0ef 100644
--- a/ui/tests/acceptance/secrets/backend/cubbyhole/secret-test.js
+++ b/ui/tests/acceptance/secrets/backend/cubbyhole/secret-test.js
@@ -1,13 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { currentRouteName, settled } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
-import { v4 as uuidv4 } from 'uuid';
-
 import editPage from 'vault/tests/pages/secrets/backend/kv/edit-secret';
 import showPage from 'vault/tests/pages/secrets/backend/kv/show';
 import listPage from 'vault/tests/pages/secrets/backend/list';
@@ -18,7 +11,6 @@ module('Acceptance | secrets/cubbyhole/create', function (hooks) {
   setupApplicationTest(hooks);
 
   hooks.beforeEach(function () {
-    this.uid = uuidv4();
     this.server = apiStub({ usePassthrough: true });
     return authPage.login();
   });
@@ -28,25 +20,16 @@ module('Acceptance | secrets/cubbyhole/create', function (hooks) {
   });
 
   test('it creates and can view a secret with the cubbyhole backend', async function (assert) {
-    const kvPath = `cubbyhole-kv-${this.uid}`;
+    const kvPath = `cubbyhole-kv-${new Date().getTime()}`;
     await listPage.visitRoot({ backend: 'cubbyhole' });
     await settled();
-    assert.strictEqual(
-      currentRouteName(),
-      'vault.cluster.secrets.backend.list-root',
-      'navigates to the list page'
-    );
+    assert.equal(currentRouteName(), 'vault.cluster.secrets.backend.list-root', 'navigates to the list page');
 
     await listPage.create();
     await settled();
     await editPage.createSecret(kvPath, 'foo', 'bar');
     await settled();
-    assert.strictEqual(
-      currentRouteName(),
-      'vault.cluster.secrets.backend.show',
-      'redirects to the show page'
-    );
-    assert.dom('[data-test-created-time]').hasText('', 'it does not render created time if blank');
+    assert.equal(currentRouteName(), 'vault.cluster.secrets.backend.show', 'redirects to the show page');
     assert.ok(showPage.editIsPresent, 'shows the edit button');
   });
 });
diff --git a/ui/tests/acceptance/secrets/backend/database/secret-test.js b/ui/tests/acceptance/secrets/backend/database/secret-test.js
index 6a4ee538e54b2..457ca82810908 100644
--- a/ui/tests/acceptance/secrets/backend/database/secret-test.js
+++ b/ui/tests/acceptance/secrets/backend/database/secret-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
 import { currentURL, settled, click, visit, fillIn, typeIn } from '@ember/test-helpers';
@@ -28,7 +23,7 @@ const MODEL = {
 };
 
 const mount = async () => {
-  const path = `database-${Date.now()}`;
+  let path = `database-${Date.now()}`;
   await mountSecrets.enable('database', path);
   await settled();
   return path;
@@ -234,12 +229,6 @@ const connectionTests = [
       assert
         .dom('[data-test-input="root_rotation_statements"]')
         .exists(`Root rotation statements exists for ${name}`);
-      assert
-        .dom('[data-test-alert-banner="alert"]')
-        .hasTextContaining(
-          `Warning Please ensure that your Oracle plugin has the default name of vault-plugin-database-oracle. Custom naming is not supported in the UI at this time. If the plugin is already named vault-plugin-database-oracle, disregard this warning.`,
-          'warning banner displays about connections with SSL.'
-        );
     },
   },
 ];
@@ -256,10 +245,10 @@ module('Acceptance | secrets/database/*', function (hooks) {
   });
 
   test('can enable the database secrets engine', async function (assert) {
-    const backend = `database-${Date.now()}`;
+    let backend = `database-${Date.now()}`;
     await mountSecrets.enable('database', backend);
     await settled();
-    assert.strictEqual(
+    assert.equal(
       currentURL(),
       `/vault/secrets/${backend}/list`,
       'Mounts and redirects to connection list page'
@@ -269,17 +258,17 @@ module('Acceptance | secrets/database/*', function (hooks) {
       .dom('.active[data-test-secret-list-tab="Connections"]')
       .exists('Has Connections tab which is active');
     await click('[data-test-tab="overview"]');
-    assert.strictEqual(currentURL(), `/vault/secrets/${backend}/overview`, 'Tab links to overview page');
+    assert.equal(currentURL(), `/vault/secrets/${backend}/overview`, 'Tab links to overview page');
     assert.dom('[data-test-component="empty-state"]').exists('Empty state also exists on overview page');
     assert.dom('[data-test-secret-list-tab="Roles"]').exists('Has Roles tab');
   });
 
   test('Connection create and edit form for each plugin', async function (assert) {
-    assert.expect(161);
+    assert.expect(160);
     const backend = await mount();
-    for (const testCase of connectionTests) {
+    for (let testCase of connectionTests) {
       await connectionPage.visitCreate({ backend });
-      assert.strictEqual(currentURL(), `/vault/secrets/${backend}/create`, 'Correct creation URL');
+      assert.equal(currentURL(), `/vault/secrets/${backend}/create`, 'Correct creation URL');
       assert
         .dom('[data-test-empty-state-title]')
         .hasText('No plugin selected', 'No plugin is selected by default and empty state shows');
@@ -327,7 +316,7 @@ module('Acceptance | secrets/database/*', function (hooks) {
       // click "Add Role"
       await connectionPage.addRole();
       await settled();
-      assert.strictEqual(
+      assert.equal(
         searchSelectComponent.selectedOptions[0].text,
         testCase.name,
         'Database connection is pre-selected on the form'
@@ -349,13 +338,13 @@ module('Acceptance | secrets/database/*', function (hooks) {
         { label: 'Write concern', name: 'write_concern' },
       ],
     };
-    assert.strictEqual(
+    assert.equal(
       currentURL(),
       `/vault/secrets/${backend}/list`,
       'Mounts and redirects to connection list page'
     );
     await connectionPage.createLink();
-    assert.strictEqual(currentURL(), `/vault/secrets/${backend}/create`, 'Create link goes to create page');
+    assert.equal(currentURL(), `/vault/secrets/${backend}/create`, 'Create link goes to create page');
     assert
       .dom('[data-test-empty-state-title]')
       .hasText('No plugin selected', 'No plugin is selected by default and empty state shows');
@@ -377,7 +366,7 @@ module('Acceptance | secrets/database/*', function (hooks) {
       .dom('.modal.is-active .title')
       .hasText('Rotate your root credentials?', 'Modal appears asking to ');
     await connectionPage.enable();
-    assert.strictEqual(
+    assert.equal(
       currentURL(),
       `/vault/secrets/${backend}/show/${connectionDetails.id}`,
       'Saves connection and takes you to show page'
@@ -400,7 +389,7 @@ module('Acceptance | secrets/database/*', function (hooks) {
     await fillIn('[data-test-confirmation-modal-input="Delete connection?"]', connectionDetails.id);
     await click('[data-test-confirm-button]');
 
-    assert.strictEqual(currentURL(), `/vault/secrets/${backend}/list`, 'Redirects to connection list page');
+    assert.equal(currentURL(), `/vault/secrets/${backend}/list`, 'Redirects to connection list page');
     assert
       .dom('[data-test-empty-state-title]')
       .hasText('No connections in this backend', 'No connections listed because it was deleted');
@@ -434,15 +423,11 @@ module('Acceptance | secrets/database/*', function (hooks) {
       `write sys/policies/acl/test-policy policy=${btoa(CONNECTION_VIEW_ONLY)}`,
       'write -field=client_token auth/token/create policies=test-policy ttl=1h',
     ]);
-    const token = consoleComponent.lastTextOutput;
+    let token = consoleComponent.lastTextOutput;
     await logout.visit();
     await authPage.login(token);
     await connectionPage.visitShow({ backend, id: connection });
-    assert.strictEqual(
-      currentURL(),
-      `/vault/secrets/${backend}/show/${connection}`,
-      'Allows reading connection'
-    );
+    assert.equal(currentURL(), `/vault/secrets/${backend}/show/${connection}`, 'Allows reading connection');
     assert
       .dom('[data-test-database-connection-delete]')
       .doesNotExist('Delete button does not show due to permissions');
@@ -472,7 +457,7 @@ module('Acceptance | secrets/database/*', function (hooks) {
       .dom('[data-test-component="empty-state"]')
       .exists({ count: 2 }, 'Two empty states exist before selections made');
     await clickTrigger('#database');
-    assert.strictEqual(searchSelectComponent.options.length, 1, 'list shows existing connections so far');
+    assert.equal(searchSelectComponent.options.length, 1, 'list shows existing connections so far');
     await selectChoose('#database', '.ember-power-select-option', 0);
     assert
       .dom('[data-test-component="empty-state"]')
@@ -495,7 +480,7 @@ module('Acceptance | secrets/database/*', function (hooks) {
 
   test('root and limited access', async function (assert) {
     this.set('model', MODEL);
-    const backend = 'database';
+    let backend = 'database';
     const NO_ROLES_POLICY = `
       path "database/roles/*" {
         capabilities = ["delete"]
@@ -515,7 +500,7 @@ module('Acceptance | secrets/database/*', function (hooks) {
       `write sys/policies/acl/test-policy policy=${btoa(NO_ROLES_POLICY)}`,
       'write -field=client_token auth/token/create policies=test-policy ttl=1h',
     ]);
-    const token = consoleComponent.lastTextOutput;
+    let token = consoleComponent.lastTextOutput;
 
     // test root user flow
     await settled();
@@ -529,7 +514,7 @@ module('Acceptance | secrets/database/*', function (hooks) {
     assert.dom('[data-test-secret-list-tab="Roles"]').exists('renders connections tab');
 
     await click('[data-test-secret-create="connections"]');
-    assert.strictEqual(currentURL(), '/vault/secrets/database/create');
+    assert.equal(currentURL(), '/vault/secrets/database/create');
 
     // Login with restricted policy
     await logout.visit();
@@ -547,6 +532,6 @@ module('Acceptance | secrets/database/*', function (hooks) {
       .exists({ count: 1 }, 'renders only the connection card');
 
     await click('[data-test-action-text="Configure new"]');
-    assert.strictEqual(currentURL(), '/vault/secrets/database/create?itemType=connection');
+    assert.equal(currentURL(), '/vault/secrets/database/create?itemType=connection');
   });
 });
diff --git a/ui/tests/acceptance/secrets/backend/engines-test.js b/ui/tests/acceptance/secrets/backend/engines-test.js
index 60fd9a2a8f90f..e603596ea8b38 100644
--- a/ui/tests/acceptance/secrets/backend/engines-test.js
+++ b/ui/tests/acceptance/secrets/backend/engines-test.js
@@ -1,116 +1,39 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { currentRouteName, settled } from '@ember/test-helpers';
-import { clickTrigger } from 'ember-power-select/test-support/helpers';
-import { create } from 'ember-cli-page-object';
 import { module, test } from 'qunit';
-import consoleClass from 'vault/tests/pages/components/console/ui-panel';
 import { setupApplicationTest } from 'ember-qunit';
-import { v4 as uuidv4 } from 'uuid';
-
 import mountSecrets from 'vault/tests/pages/settings/mount-secret-backend';
 import backendsPage from 'vault/tests/pages/secrets/backends';
 import authPage from 'vault/tests/pages/auth';
-import ss from 'vault/tests/pages/components/search-select';
-
-const consoleComponent = create(consoleClass);
-const searchSelect = create(ss);
 
-module('Acceptance | secret-engine list view', function (hooks) {
+module('Acceptance | engine/disable', function (hooks) {
   setupApplicationTest(hooks);
 
   hooks.beforeEach(function () {
-    this.uid = uuidv4();
     return authPage.login();
   });
 
-  test('it allows you to disable an engine', async function (assert) {
+  test('disable engine', async function (assert) {
     // first mount an engine so we can disable it.
-    const enginePath = `alicloud-disable-${this.uid}`;
+    let enginePath = `alicloud-${new Date().getTime()}`;
     await mountSecrets.enable('alicloud', enginePath);
     await settled();
     assert.ok(backendsPage.rows.filterBy('path', `${enginePath}/`)[0], 'shows the mounted engine');
 
     await backendsPage.visit();
     await settled();
-    const row = backendsPage.rows.filterBy('path', `${enginePath}/`)[0];
+    let row = backendsPage.rows.filterBy('path', `${enginePath}/`)[0];
     await row.menu();
     await settled();
     await backendsPage.disableButton();
     await settled();
     await backendsPage.confirmDisable();
     await settled();
-    assert.strictEqual(
-      currentRouteName(),
-      'vault.cluster.secrets.backends',
-      'redirects to the backends page'
-    );
-    assert.strictEqual(
+    assert.equal(currentRouteName(), 'vault.cluster.secrets.backends', 'redirects to the backends page');
+
+    assert.equal(
       backendsPage.rows.filterBy('path', `${enginePath}/`).length,
       0,
       'does not show the disabled engine'
     );
   });
-
-  test('it adds disabled css styling to unsupported secret engines', async function (assert) {
-    assert.expect(2);
-    // first mount engine that is not supported
-    const enginePath = `nomad-${this.uid}`;
-
-    await mountSecrets.enable('nomad', enginePath);
-    await settled();
-    await backendsPage.visit();
-    await settled();
-
-    const rows = document.querySelectorAll('[data-test-auth-backend-link]');
-    const rowUnsupported = Array.from(rows).filter((row) => row.innerText.includes('nomad'));
-    const rowSupported = Array.from(rows).filter((row) => row.innerText.includes('cubbyhole'));
-    assert
-      .dom(rowUnsupported[0])
-      .doesNotHaveClass(
-        'linked-block',
-        `the linked-block class is not added to unsupported engines, which effectively disables it.`
-      );
-    assert.dom(rowSupported[0]).hasClass('linked-block', `linked-block class is added to supported engines.`);
-
-    // cleanup
-    await consoleComponent.runCommands([`delete sys/mounts/${enginePath}`]);
-  });
-
-  test('it filters by name and engine type', async function (assert) {
-    assert.expect(4);
-    const enginePath1 = `aws-1-${this.uid}`;
-    const enginePath2 = `aws-2-${this.uid}`;
-
-    await mountSecrets.enable('aws', enginePath1);
-    await mountSecrets.enable('aws', enginePath2);
-    await backendsPage.visit();
-    await settled();
-    // filter by type
-    await clickTrigger('#filter-by-engine-type');
-    await searchSelect.options.objectAt(0).click();
-
-    const rows = document.querySelectorAll('[data-test-auth-backend-link]');
-    const rowsAws = Array.from(rows).filter((row) => row.innerText.includes('aws'));
-
-    assert.strictEqual(rows.length, rowsAws.length, 'all rows returned are aws');
-    // filter by name
-    await clickTrigger('#filter-by-engine-name');
-    const firstItemToSelect = searchSelect.options.objectAt(0).text;
-    await searchSelect.options.objectAt(0).click();
-    const singleRow = document.querySelectorAll('[data-test-auth-backend-link]');
-    assert.strictEqual(singleRow.length, 1, 'returns only one row');
-    assert.dom(singleRow[0]).includesText(firstItemToSelect, 'shows the filtered by name engine');
-    // clear filter by engine name
-    await searchSelect.deleteButtons.objectAt(1).click();
-    const rowsAgain = document.querySelectorAll('[data-test-auth-backend-link]');
-    assert.ok(rowsAgain.length > 1, 'filter has been removed');
-
-    // cleanup
-    await consoleComponent.runCommands([`delete sys/mounts/${enginePath1}`]);
-    await consoleComponent.runCommands([`delete sys/mounts/${enginePath2}`]);
-  });
 });
diff --git a/ui/tests/acceptance/secrets/backend/gcpkms/secrets-test.js b/ui/tests/acceptance/secrets/backend/gcpkms/secrets-test.js
index 28acf35f22cbb..53e5e8ad28ac3 100644
--- a/ui/tests/acceptance/secrets/backend/gcpkms/secrets-test.js
+++ b/ui/tests/acceptance/secrets/backend/gcpkms/secrets-test.js
@@ -1,13 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { currentRouteName, settled } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
-import { v4 as uuidv4 } from 'uuid';
-
 import mountSecrets from 'vault/tests/pages/settings/mount-secret-backend';
 import backendsPage from 'vault/tests/pages/secrets/backends';
 import authPage from 'vault/tests/pages/auth';
@@ -16,23 +9,18 @@ module('Acceptance | gcpkms/enable', function (hooks) {
   setupApplicationTest(hooks);
 
   hooks.beforeEach(function () {
-    this.uid = uuidv4();
     return authPage.login();
   });
 
   test('enable gcpkms', async function (assert) {
     // Error: Cannot call `visit` without having first called `setupApplicationContext`.
-    const enginePath = `gcpkms-${this.uid}`;
+    let enginePath = `gcpkms-${new Date().getTime()}`;
     await mountSecrets.visit();
     await settled();
     await mountSecrets.selectType('gcpkms');
     await mountSecrets.next().path(enginePath).submit();
     await settled();
-    assert.strictEqual(
-      currentRouteName(),
-      'vault.cluster.secrets.backends',
-      'redirects to the backends page'
-    );
+    assert.equal(currentRouteName(), 'vault.cluster.secrets.backends', 'redirects to the backends page');
     assert.ok(backendsPage.rows.filterBy('path', `${enginePath}/`)[0], 'shows the gcpkms engine');
   });
 });
diff --git a/ui/tests/acceptance/secrets/backend/generic/secret-test.js b/ui/tests/acceptance/secrets/backend/generic/secret-test.js
index cdec0e8185027..6de2f57c8757b 100644
--- a/ui/tests/acceptance/secrets/backend/generic/secret-test.js
+++ b/ui/tests/acceptance/secrets/backend/generic/secret-test.js
@@ -1,13 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { currentRouteName } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
-import { v4 as uuidv4 } from 'uuid';
-
 import editPage from 'vault/tests/pages/secrets/backend/kv/edit-secret';
 import showPage from 'vault/tests/pages/secrets/backend/kv/show';
 import listPage from 'vault/tests/pages/secrets/backend/list';
@@ -24,7 +17,6 @@ module('Acceptance | secrets/generic/create', function (hooks) {
   setupApplicationTest(hooks);
 
   hooks.beforeEach(function () {
-    this.uid = uuidv4();
     this.server = apiStub({ usePassthrough: true });
     return authPage.login();
   });
@@ -34,30 +26,22 @@ module('Acceptance | secrets/generic/create', function (hooks) {
   });
 
   test('it creates and can view a secret with the generic backend', async function (assert) {
-    const path = `generic-${this.uid}`;
-    const kvPath = `generic-kv-${this.uid}`;
+    const path = `generic-${new Date().getTime()}`;
+    const kvPath = `generic-kv-${new Date().getTime()}`;
     await cli.runCommands([`write sys/mounts/${path} type=generic`, `write ${path}/foo bar=baz`]);
     await listPage.visitRoot({ backend: path });
-    assert.strictEqual(
-      currentRouteName(),
-      'vault.cluster.secrets.backend.list-root',
-      'navigates to the list page'
-    );
-    assert.strictEqual(listPage.secrets.length, 1, 'lists one secret in the backend');
+    assert.equal(currentRouteName(), 'vault.cluster.secrets.backend.list-root', 'navigates to the list page');
+    assert.equal(listPage.secrets.length, 1, 'lists one secret in the backend');
 
     await listPage.create();
     await editPage.createSecret(kvPath, 'foo', 'bar');
-    assert.strictEqual(
-      currentRouteName(),
-      'vault.cluster.secrets.backend.show',
-      'redirects to the show page'
-    );
+    assert.equal(currentRouteName(), 'vault.cluster.secrets.backend.show', 'redirects to the show page');
     assert.ok(showPage.editIsPresent, 'shows the edit button');
   });
 
   test('upgrading generic to version 2 lists all existing secrets, and CRUD continues to work', async function (assert) {
-    const path = `generic-${this.uid}`;
-    const kvPath = `generic-kv-${this.uid}`;
+    const path = `generic-${new Date().getTime()}`;
+    const kvPath = `generic-kv-${new Date().getTime()}`;
     await cli.runCommands([
       `write sys/mounts/${path} type=generic`,
       `write ${path}/foo bar=baz`,
@@ -65,16 +49,12 @@ module('Acceptance | secrets/generic/create', function (hooks) {
       `write sys/mounts/${path}/tune options=version=2`,
     ]);
     await listPage.visitRoot({ backend: path });
-    assert.strictEqual(
-      currentRouteName(),
-      'vault.cluster.secrets.backend.list-root',
-      'navigates to the list page'
-    );
-    assert.strictEqual(listPage.secrets.length, 1, 'lists the old secret in the backend');
+    assert.equal(currentRouteName(), 'vault.cluster.secrets.backend.list-root', 'navigates to the list page');
+    assert.equal(listPage.secrets.length, 1, 'lists the old secret in the backend');
 
     await listPage.create();
     await editPage.createSecret(kvPath, 'foo', 'bar');
     await listPage.visitRoot({ backend: path });
-    assert.strictEqual(listPage.secrets.length, 2, 'lists two secrets in the backend');
+    assert.equal(listPage.secrets.length, 2, 'lists two secrets in the backend');
   });
 });
diff --git a/ui/tests/acceptance/secrets/backend/kubernetes/configuration-test.js b/ui/tests/acceptance/secrets/backend/kubernetes/configuration-test.js
deleted file mode 100644
index 781b97ee1e869..0000000000000
--- a/ui/tests/acceptance/secrets/backend/kubernetes/configuration-test.js
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupApplicationTest } from 'ember-qunit';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import kubernetesScenario from 'vault/mirage/scenarios/kubernetes';
-import ENV from 'vault/config/environment';
-import authPage from 'vault/tests/pages/auth';
-import { visit, click, currentRouteName } from '@ember/test-helpers';
-import { Response } from 'miragejs';
-
-module('Acceptance | kubernetes | configuration', function (hooks) {
-  setupApplicationTest(hooks);
-  setupMirage(hooks);
-
-  hooks.before(function () {
-    ENV['ember-cli-mirage'].handler = 'kubernetes';
-  });
-
-  hooks.beforeEach(function () {
-    kubernetesScenario(this.server);
-    this.visitConfiguration = () => {
-      return visit('/vault/secrets/kubernetes/kubernetes/configuration');
-    };
-    this.validateRoute = (assert, route, message) => {
-      assert.strictEqual(currentRouteName(), `vault.cluster.secrets.backend.kubernetes.${route}`, message);
-    };
-    return authPage.login();
-  });
-
-  hooks.after(function () {
-    ENV['ember-cli-mirage'].handler = null;
-  });
-
-  test('it should transition to configure page on Edit Configuration click from toolbar', async function (assert) {
-    assert.expect(1);
-    await this.visitConfiguration();
-    await click('[data-test-toolbar-config-action]');
-    this.validateRoute(assert, 'configure', 'Transitions to Configure route on click');
-  });
-
-  test('it should transition to the configuration page on Save click in Configure', async function (assert) {
-    assert.expect(1);
-    await this.visitConfiguration();
-    await click('[data-test-toolbar-config-action]');
-    await click('[data-test-config-save]');
-    await click('[data-test-config-confirm]');
-    this.validateRoute(assert, 'configuration', 'Transitions to Configuration route on click');
-  });
-
-  test('it should transition to the configuration page on Cancel click in Configure', async function (assert) {
-    assert.expect(1);
-    await this.visitConfiguration();
-    await click('[data-test-toolbar-config-action]');
-    await click('[data-test-config-cancel]');
-    this.validateRoute(assert, 'configuration', 'Transitions to Configuration route on click');
-  });
-
-  test('it should transition to error route on config fetch error other than 404', async function (assert) {
-    this.server.get('/kubernetes/config', () => new Response(403));
-    await this.visitConfiguration();
-    assert.strictEqual(
-      currentRouteName(),
-      'vault.cluster.secrets.backend.kubernetes.error',
-      'Transitions to error route on config fetch error'
-    );
-  });
-
-  test('it should not transition to error route on config fetch 404', async function (assert) {
-    this.server.get('/kubernetes/config', () => new Response(404));
-    await this.visitConfiguration();
-    assert.strictEqual(
-      currentRouteName(),
-      'vault.cluster.secrets.backend.kubernetes.configuration',
-      'Transitions to configuration route on fetch 404'
-    );
-    assert.dom('[data-test-empty-state-title]').hasText('Kubernetes not configured', 'Config cta renders');
-  });
-});
diff --git a/ui/tests/acceptance/secrets/backend/kubernetes/credentials-test.js b/ui/tests/acceptance/secrets/backend/kubernetes/credentials-test.js
deleted file mode 100644
index 05e9e114735e2..0000000000000
--- a/ui/tests/acceptance/secrets/backend/kubernetes/credentials-test.js
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupApplicationTest } from 'ember-qunit';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import kubernetesScenario from 'vault/mirage/scenarios/kubernetes';
-import ENV from 'vault/config/environment';
-import authPage from 'vault/tests/pages/auth';
-import { fillIn, visit, click, currentRouteName } from '@ember/test-helpers';
-
-module('Acceptance | kubernetes | credentials', function (hooks) {
-  setupApplicationTest(hooks);
-  setupMirage(hooks);
-
-  hooks.before(function () {
-    ENV['ember-cli-mirage'].handler = 'kubernetes';
-  });
-  hooks.beforeEach(function () {
-    kubernetesScenario(this.server);
-    this.visitRoleCredentials = () => {
-      return visit('/vault/secrets/kubernetes/kubernetes/roles/role-0/credentials');
-    };
-    this.validateRoute = (assert, route, message) => {
-      assert.strictEqual(currentRouteName(), `vault.cluster.secrets.backend.kubernetes.${route}`, message);
-    };
-    return authPage.login();
-  });
-  hooks.after(function () {
-    ENV['ember-cli-mirage'].handler = null;
-  });
-
-  test('it should have correct breadcrumb links in credentials view', async function (assert) {
-    assert.expect(3);
-    await this.visitRoleCredentials();
-    await click('[data-test-breadcrumbs] li:nth-child(3) a');
-    this.validateRoute(assert, 'roles.role.details', 'Transitions to role details route on breadcrumb click');
-    await this.visitRoleCredentials();
-    await click('[data-test-breadcrumbs] li:nth-child(2) a');
-    this.validateRoute(assert, 'roles.index', 'Transitions to roles route on breadcrumb click');
-    await this.visitRoleCredentials();
-    await click('[data-test-breadcrumbs] li:nth-child(1) a');
-    this.validateRoute(assert, 'overview', 'Transitions to overview route on breadcrumb click');
-  });
-
-  test('it should transition to role details view on Back click', async function (assert) {
-    assert.expect(1);
-    await this.visitRoleCredentials();
-    await click('[data-test-generate-credentials-back]');
-
-    await this.validateRoute(assert, 'roles.role.details', 'Transitions to role details on Back click');
-  });
-
-  test('it should transition to role details view on Done click', async function (assert) {
-    assert.expect(1);
-    await this.visitRoleCredentials();
-    this.server.post('/kubernetes-test/creds/role-0', () => {
-      assert.ok('POST request made to generate credentials');
-      return {
-        request_id: '58fefc6c-5195-c17a-94f2-8f889f3df57c',
-        lease_id: 'kubernetes/creds/default-role/aWczfcfJ7NKUdiirJrPXIs38',
-        renewable: false,
-        lease_duration: 3600,
-        data: {
-          service_account_name: 'default',
-          service_account_namespace: 'default',
-          service_account_token: 'eyJhbGciOiJSUzI1NiIsImtpZCI6Imlr',
-        },
-      };
-    });
-    await fillIn('[data-test-kubernetes-namespace]', 'kubernetes-test');
-    await click('[data-test-toggle-input]');
-    await click('[data-test-toggle-input="Time-to-Live (TTL)"]');
-    await fillIn('[data-test-ttl-value="Time-to-Live (TTL)"]', 2);
-    await click('[data-test-generate-credentials-button]');
-    await click('[data-test-generate-credentials-done]');
-
-    await this.validateRoute(assert, 'roles.role.details', 'Transitions to role details on Done click');
-  });
-});
diff --git a/ui/tests/acceptance/secrets/backend/kubernetes/overview-test.js b/ui/tests/acceptance/secrets/backend/kubernetes/overview-test.js
deleted file mode 100644
index 42e18ed871de0..0000000000000
--- a/ui/tests/acceptance/secrets/backend/kubernetes/overview-test.js
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupApplicationTest } from 'ember-qunit';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import kubernetesScenario from 'vault/mirage/scenarios/kubernetes';
-import ENV from 'vault/config/environment';
-import authPage from 'vault/tests/pages/auth';
-import { visit, click, currentRouteName } from '@ember/test-helpers';
-import { selectChoose } from 'ember-power-select/test-support';
-import { SELECTORS } from 'vault/tests/helpers/kubernetes/overview';
-
-module('Acceptance | kubernetes | overview', function (hooks) {
-  setupApplicationTest(hooks);
-  setupMirage(hooks);
-
-  hooks.before(function () {
-    ENV['ember-cli-mirage'].handler = 'kubernetes';
-  });
-  hooks.beforeEach(function () {
-    this.createScenario = (shouldConfigureRoles = true) =>
-      shouldConfigureRoles ? kubernetesScenario(this.server) : kubernetesScenario(this.server, false);
-
-    this.visitOverview = () => {
-      return visit('/vault/secrets/kubernetes/kubernetes/overview');
-    };
-    this.validateRoute = (assert, route, message) => {
-      assert.strictEqual(currentRouteName(), `vault.cluster.secrets.backend.kubernetes.${route}`, message);
-    };
-    return authPage.login();
-  });
-  hooks.after(function () {
-    ENV['ember-cli-mirage'].handler = null;
-  });
-
-  test('it should transition to configuration page during empty state', async function (assert) {
-    assert.expect(1);
-    await this.visitOverview();
-    await click('[data-test-component="empty-state"] a');
-    this.validateRoute(assert, 'configure', 'Transitions to Configure route on click');
-  });
-
-  test('it should transition to view roles', async function (assert) {
-    assert.expect(1);
-    this.createScenario();
-    await this.visitOverview();
-    await click(SELECTORS.rolesCardLink);
-    this.validateRoute(assert, 'roles.index', 'Transitions to roles route on View Roles click');
-  });
-
-  test('it should transition to create roles', async function (assert) {
-    assert.expect(1);
-    this.createScenario(false);
-    await this.visitOverview();
-    await click(SELECTORS.rolesCardLink);
-    this.validateRoute(assert, 'roles.create', 'Transitions to roles route on Create Roles click');
-  });
-
-  test('it should transition to generate credentials', async function (assert) {
-    assert.expect(1);
-    await this.createScenario();
-    await this.visitOverview();
-    await selectChoose('.search-select', 'role-0');
-    await click('[data-test-generate-credential-button]');
-    this.validateRoute(assert, 'roles.role.credentials', 'Transitions to roles route on Generate click');
-  });
-});
diff --git a/ui/tests/acceptance/secrets/backend/kubernetes/roles-test.js b/ui/tests/acceptance/secrets/backend/kubernetes/roles-test.js
deleted file mode 100644
index efcba9fed487c..0000000000000
--- a/ui/tests/acceptance/secrets/backend/kubernetes/roles-test.js
+++ /dev/null
@@ -1,129 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupApplicationTest } from 'ember-qunit';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import kubernetesScenario from 'vault/mirage/scenarios/kubernetes';
-import ENV from 'vault/config/environment';
-import authPage from 'vault/tests/pages/auth';
-import { fillIn, visit, currentURL, click, currentRouteName } from '@ember/test-helpers';
-
-module('Acceptance | kubernetes | roles', function (hooks) {
-  setupApplicationTest(hooks);
-  setupMirage(hooks);
-
-  hooks.before(function () {
-    ENV['ember-cli-mirage'].handler = 'kubernetes';
-  });
-  hooks.beforeEach(function () {
-    kubernetesScenario(this.server);
-    this.visitRoles = () => {
-      return visit('/vault/secrets/kubernetes/kubernetes/roles');
-    };
-    this.validateRoute = (assert, route, message) => {
-      assert.strictEqual(currentRouteName(), `vault.cluster.secrets.backend.kubernetes.${route}`, message);
-    };
-    return authPage.login();
-  });
-  hooks.after(function () {
-    ENV['ember-cli-mirage'].handler = null;
-  });
-
-  test('it should filter roles', async function (assert) {
-    await this.visitRoles();
-    assert.dom('[data-test-list-item-link]').exists({ count: 3 }, 'Roles list renders');
-    await fillIn('[data-test-component="navigate-input"]', '1');
-    assert.dom('[data-test-list-item-link]').exists({ count: 1 }, 'Filtered roles list renders');
-    assert.ok(currentURL().includes('pageFilter=1'), 'pageFilter query param value is set');
-  });
-
-  test('it should link to role details on list item click', async function (assert) {
-    assert.expect(1);
-    await this.visitRoles();
-    await click('[data-test-list-item-link]');
-    this.validateRoute(assert, 'roles.role.details', 'Transitions to details route on list item click');
-  });
-
-  test('it should have correct breadcrumb links in role details view', async function (assert) {
-    assert.expect(2);
-    await this.visitRoles();
-    await click('[data-test-list-item-link]');
-    await click('[data-test-breadcrumbs] li:nth-child(2) a');
-    this.validateRoute(assert, 'roles.index', 'Transitions to roles route on breadcrumb click');
-    await click('[data-test-list-item-link]');
-    await click('[data-test-breadcrumbs] li:nth-child(1) a');
-    this.validateRoute(assert, 'overview', 'Transitions to overview route on breadcrumb click');
-  });
-
-  test('it should have functional list item menu', async function (assert) {
-    assert.expect(3);
-    await this.visitRoles();
-    for (const action of ['details', 'edit', 'delete']) {
-      await click('[data-test-list-item-popup] button');
-      await click(`[data-test-${action}]`);
-      if (action === 'delete') {
-        await click('[data-test-confirm-button]');
-        assert.dom('[data-test-list-item-link]').exists({ count: 2 }, 'Deleted role removed from list');
-      } else {
-        this.validateRoute(
-          assert,
-          `roles.role.${action}`,
-          `Transitions to ${action} route on menu action click`
-        );
-        const selector =
-          action === 'details' ? '[data-test-breadcrumbs] li:nth-child(2) a' : '[data-test-cancel]';
-        await click(selector);
-      }
-    }
-  });
-
-  test('it should create role', async function (assert) {
-    assert.expect(2);
-    await this.visitRoles();
-    await click('[data-test-toolbar-roles-action]');
-    await click('[data-test-radio-card="basic"]');
-    await fillIn('[data-test-input="name"]', 'new-test-role');
-    await fillIn('[data-test-input="serviceAccountName"]', 'default');
-    await fillIn('[data-test-input="allowedKubernetesNamespaces"]', '*');
-    await click('[data-test-save]');
-    this.validateRoute(assert, 'roles.role.details', 'Transitions to details route on save success');
-    await click('[data-test-breadcrumbs] li:nth-child(2) a');
-    assert.dom('[data-test-role="new-test-role"]').exists('New role renders in list');
-  });
-
-  test('it should have functional toolbar actions in details view', async function (assert) {
-    assert.expect(3);
-    await this.visitRoles();
-    await click('[data-test-list-item-link]');
-    await click('[data-test-generate-credentials]');
-    this.validateRoute(assert, 'roles.role.credentials', 'Transitions to credentials route');
-    await click('[data-test-breadcrumbs] li:nth-child(3) a');
-    await click('[data-test-edit]');
-    this.validateRoute(assert, 'roles.role.edit', 'Transitions to edit route');
-    await click('[data-test-cancel]');
-    await click('[data-test-list-item-link]');
-    await click('[data-test-delete] button');
-    await click('[data-test-confirm-button]');
-    assert
-      .dom('[data-test-list-item-link]')
-      .exists({ count: 2 }, 'Transitions to roles route and deleted role removed from list');
-  });
-
-  test('it should generate credentials for role', async function (assert) {
-    assert.expect(1);
-    await this.visitRoles();
-    await click('[data-test-list-item-link]');
-    await click('[data-test-generate-credentials]');
-    await fillIn('[data-test-kubernetes-namespace]', 'test-namespace');
-    await click('[data-test-generate-credentials-button]');
-    await click('[data-test-generate-credentials-done]');
-    this.validateRoute(
-      assert,
-      'roles.role.details',
-      'Transitions to details route when done generating credentials'
-    );
-  });
-});
diff --git a/ui/tests/acceptance/secrets/backend/kv/diff-test.js b/ui/tests/acceptance/secrets/backend/kv/diff-test.js
index d5ba2e3aafa96..1591fd9d1d75f 100644
--- a/ui/tests/acceptance/secrets/backend/kv/diff-test.js
+++ b/ui/tests/acceptance/secrets/backend/kv/diff-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { click, settled, fillIn } from '@ember/test-helpers';
 import { create } from 'ember-cli-page-object';
 import { module, test } from 'qunit';
@@ -49,8 +44,8 @@ module('Acceptance | kv2 diff view', function (hooks) {
     // add another version
     await click('[data-test-secret-edit="true"]');
 
-    const secondKey = document.querySelectorAll('[data-test-secret-key]')[1];
-    const secondValue = document.querySelectorAll('.masked-value')[1];
+    let secondKey = document.querySelectorAll('[data-test-secret-key]')[1];
+    let secondValue = document.querySelectorAll('.masked-value')[1];
     await fillIn(secondKey, 'version2');
     await fillIn(secondValue, 'world!');
     await click('[data-test-secret-save]');
@@ -61,8 +56,8 @@ module('Acceptance | kv2 diff view', function (hooks) {
 
     await click('[data-test-view-diff]');
 
-    const diffBetweenVersion2and1 = document.querySelector('.jsondiffpatch-added').innerText;
-    assert.strictEqual(diffBetweenVersion2and1, 'version2"world!"', 'shows the correct added part');
+    let diffBetweenVersion2and1 = document.querySelector('.jsondiffpatch-added').innerText;
+    assert.equal(diffBetweenVersion2and1, 'version2"world!"', 'shows the correct added part');
 
     await click('[data-test-popup-menu-trigger="right-version"]');
 
diff --git a/ui/tests/acceptance/secrets/backend/kv/secret-test.js b/ui/tests/acceptance/secrets/backend/kv/secret-test.js
index 39951a2017fa0..2e569e9a5e0d7 100644
--- a/ui/tests/acceptance/secrets/backend/kv/secret-test.js
+++ b/ui/tests/acceptance/secrets/backend/kv/secret-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import {
   click,
   visit,
@@ -16,8 +11,6 @@ import {
 import { create } from 'ember-cli-page-object';
 import { module, skip, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
-import { v4 as uuidv4 } from 'uuid';
-
 import editPage from 'vault/tests/pages/secrets/backend/kv/edit-secret';
 import showPage from 'vault/tests/pages/secrets/backend/kv/show';
 import listPage from 'vault/tests/pages/secrets/backend/list';
@@ -67,7 +60,6 @@ module('Acceptance | secrets/secret/create, read, delete', function (hooks) {
   setupApplicationTest(hooks);
 
   hooks.beforeEach(async function () {
-    this.uid = uuidv4();
     this.server = apiStub({ usePassthrough: true });
     await authPage.login();
   });
@@ -79,7 +71,7 @@ module('Acceptance | secrets/secret/create, read, delete', function (hooks) {
 
   test('it creates a secret and redirects', async function (assert) {
     assert.expect(5);
-    const secretPath = `kv-path-${this.uid}`;
+    const secretPath = `kv-path-${new Date().getTime()}`;
     const path = `kv-engine-${this.uid}`;
     await enablePage.enable('kv', path);
     await listPage.visitRoot({ backend: path });
@@ -89,6 +81,7 @@ module('Acceptance | secrets/secret/create, read, delete', function (hooks) {
       'vault.cluster.secrets.backend.list-root',
       'navigates to the list page'
     );
+
     await listPage.create();
     await settled();
     await editPage.toggleMetadata();
@@ -108,7 +101,7 @@ module('Acceptance | secrets/secret/create, read, delete', function (hooks) {
 
   test('it can create a secret when check-and-set is required', async function (assert) {
     assert.expect(3);
-    const enginePath = `kv-secret-${this.uid}`;
+    const enginePath = `kv-${new Date().getTime()}`;
     const secretPath = 'foo/bar';
     await mountSecrets.visit();
     await mountSecrets.enable('kv', enginePath);
@@ -125,9 +118,9 @@ module('Acceptance | secrets/secret/create, read, delete', function (hooks) {
 
   test('it can create a secret with a non default max version and add metadata', async function (assert) {
     assert.expect(4);
-    const enginePath = `kv-secret-${this.uid}`;
+    const enginePath = `kv-${new Date().getTime()}`;
     const secretPath = 'maxVersions';
-    const maxVersions = 101;
+    let maxVersions = 101;
     await mountSecrets.visit();
     await mountSecrets.enable('kv', enginePath);
     await settled();
@@ -141,7 +134,7 @@ module('Acceptance | secrets/secret/create, read, delete', function (hooks) {
     await settled();
     await editPage.metadataTab();
     await settled();
-    const savedMaxVersions = Number(
+    let savedMaxVersions = Number(
       document.querySelector('[data-test-value-div="Maximum versions"]').innerText
     );
     assert.strictEqual(
@@ -154,8 +147,8 @@ module('Acceptance | secrets/secret/create, read, delete', function (hooks) {
     await fillIn('[data-test-kv-key]', 'key');
     await fillIn('[data-test-kv-value]', 'value');
     await click('[data-test-save-metadata]');
-    const key = document.querySelector('[data-test-row-label="key"]').innerText;
-    const value = document.querySelector('[data-test-row-value="key"]').innerText;
+    let key = document.querySelector('[data-test-row-label="key"]').innerText;
+    let value = document.querySelector('[data-test-row-value="key"]').innerText;
     assert.strictEqual(key, 'key', 'metadata key displays after adding it.');
     assert.strictEqual(value, 'value', 'metadata value displays after adding it.');
     await deleteEngine(enginePath, assert);
@@ -192,8 +185,8 @@ module('Acceptance | secrets/secret/create, read, delete', function (hooks) {
 
   test('it can mount a KV 2 secret engine with config metadata', async function (assert) {
     assert.expect(4);
-    const enginePath = `kv-secret-${this.uid}`;
-    const maxVersion = '101';
+    const enginePath = `kv-${new Date().getTime()}`;
+    let maxVersion = 101;
     await mountSecrets.visit();
     await click('[data-test-mount-type="kv"]');
 
@@ -209,23 +202,18 @@ module('Acceptance | secrets/secret/create, read, delete', function (hooks) {
 
     await click('[data-test-configuration-tab]');
 
-    const cas = document.querySelector('[data-test-value-div="Require Check and Set"]').innerText;
-    const deleteVersionAfter = document.querySelector(
+    let cas = document.querySelector('[data-test-value-div="Require Check and Set"]').innerText;
+    let deleteVersionAfter = document.querySelector(
       '[data-test-value-div="Automate secret deletion"]'
     ).innerText;
-    const savedMaxVersion = document.querySelector(
-      '[data-test-value-div="Maximum number of versions"]'
-    ).innerText;
 
-    assert.strictEqual(
-      maxVersion,
-      savedMaxVersion,
-      'displays the max version set when configuring the secret-engine'
-    );
+    assert
+      .dom('[data-test-value-div="Maximum number of versions"]')
+      .hasText(maxVersion.toString(), 'displays the max version set when configuring the secret-engine');
     assert.strictEqual(cas.trim(), 'Yes', 'displays the cas set when configuring the secret-engine');
     assert.strictEqual(
       deleteVersionAfter.trim(),
-      '1 second',
+      '1s',
       'displays the delete version after set when configuring the secret-engine'
     );
     await deleteEngine(enginePath, assert);
@@ -233,9 +221,9 @@ module('Acceptance | secrets/secret/create, read, delete', function (hooks) {
 
   test('it can create a secret and metadata can be created and edited', async function (assert) {
     assert.expect(2);
-    const enginePath = `kv-secret-${this.uid}`;
+    const enginePath = `kv-${new Date().getTime()}`;
     const secretPath = 'metadata';
-    const maxVersions = 101;
+    let maxVersions = 101;
     await mountSecrets.visit();
     await mountSecrets.enable('kv', enginePath);
     await settled();
@@ -249,7 +237,7 @@ module('Acceptance | secrets/secret/create, read, delete', function (hooks) {
     await settled();
     await editPage.metadataTab();
     await settled();
-    const savedMaxVersions = Number(document.querySelectorAll('[data-test-value-div]')[0].innerText);
+    let savedMaxVersions = Number(document.querySelectorAll('[data-test-value-div]')[0].innerText);
     assert.strictEqual(
       maxVersions,
       savedMaxVersions,
@@ -260,7 +248,7 @@ module('Acceptance | secrets/secret/create, read, delete', function (hooks) {
 
   test('it disables save when validation errors occur', async function (assert) {
     assert.expect(5);
-    const enginePath = `kv-secret-${this.uid}`;
+    const enginePath = `kv-${new Date().getTime()}`;
     const secretPath = 'not-duplicate';
     await mountSecrets.visit();
     await mountSecrets.enable('kv', enginePath);
@@ -296,8 +284,10 @@ module('Acceptance | secrets/secret/create, read, delete', function (hooks) {
 
   test('it navigates to version history and to a specific version', async function (assert) {
     assert.expect(6);
-    const enginePath = `kv-secret-${this.uid}`;
+    const enginePath = `kv-${new Date().getTime()}`;
     const secretPath = `specific-version`;
+    let today = new Date();
+    let month = today.toString().split(' ')[1];
     await mountSecrets.visit();
     await mountSecrets.enable('kv', enginePath);
     await settled();
@@ -308,7 +298,7 @@ module('Acceptance | secrets/secret/create, read, delete', function (hooks) {
     await editPage.createSecret(secretPath, 'foo', 'bar');
     await click('[data-test-popup-menu-trigger="version"]');
 
-    assert.dom('[data-test-created-time]').includesText('Version created ', 'shows version created time');
+    assert.dom('[ data-test-created-time]').includesText(month, 'created time shows todays month');
 
     await click('[data-test-version-history]');
 
@@ -330,7 +320,7 @@ module('Acceptance | secrets/secret/create, read, delete', function (hooks) {
 
   test('version 1 performs the correct capabilities lookup and does not show metadata tab', async function (assert) {
     assert.expect(4);
-    const enginePath = `kv-secret-${this.uid}`;
+    const enginePath = `kv-${new Date().getTime()}`;
     const secretPath = 'foo/bar';
     // mount version 1 engine
     await mountSecrets.visit();
@@ -352,7 +342,7 @@ module('Acceptance | secrets/secret/create, read, delete', function (hooks) {
   // https://github.com/hashicorp/vault/issues/5960
   test('version 1: nested paths creation maintains ability to navigate the tree', async function (assert) {
     assert.expect(6);
-    const enginePath = `kv-secret-${this.uid}`;
+    const enginePath = `kv-${new Date().getTime()}`;
     const secretPath = '1/2/3/4';
     // mount version 1 engine
     await mountSecrets.visit();
@@ -378,7 +368,7 @@ module('Acceptance | secrets/secret/create, read, delete', function (hooks) {
     await listPage.visitRoot({ backend: enginePath });
     await listPage.secrets.filterBy('text', '1/')[0].click();
     await listPage.secrets.filterBy('text', '2/')[0].click();
-    const secretLink = listPage.secrets.filterBy('text', '3/')[0];
+    let secretLink = listPage.secrets.filterBy('text', '3/')[0];
     assert.ok(secretLink, 'link to the 3/ branch displays properly');
 
     await listPage.secrets.filterBy('text', '3/')[0].click();
@@ -405,7 +395,7 @@ module('Acceptance | secrets/secret/create, read, delete', function (hooks) {
 
   test('first level secrets redirect properly upon deletion', async function (assert) {
     assert.expect(2);
-    const enginePath = `kv-secret-${this.uid}`;
+    const enginePath = `kv-${new Date().getTime()}`;
     const secretPath = 'test';
     // mount version 1 engine
     await mountSecrets.visit();
@@ -437,7 +427,7 @@ module('Acceptance | secrets/secret/create, read, delete', function (hooks) {
 
   test('it redirects to the path ending in / for list pages', async function (assert) {
     assert.expect(3);
-    const secretPath = `foo/bar/kv-list-${this.uid}`;
+    const secretPath = `foo/bar/kv-path-${new Date().getTime()}`;
     await consoleComponent.runCommands(['vault write sys/mounts/secret type=kv']);
     await listPage.visitRoot({ backend: 'secret' });
     await listPage.create();
@@ -452,13 +442,13 @@ module('Acceptance | secrets/secret/create, read, delete', function (hooks) {
 
   test('it can edit via the JSON input', async function (assert) {
     assert.expect(4);
-    const content = JSON.stringify({ foo: 'fa', bar: 'boo' });
-    const secretPath = `kv-json-${this.uid}`;
+    let content = JSON.stringify({ foo: 'fa', bar: 'boo' });
+    const secretPath = `kv-path-${new Date().getTime()}`;
     await consoleComponent.runCommands(['vault write sys/mounts/secret type=kv']);
     await listPage.visitRoot({ backend: 'secret' });
     await listPage.create();
     await editPage.path(secretPath).toggleJSON();
-    const instance = document.querySelector('.CodeMirror').CodeMirror;
+    let instance = document.querySelector('.CodeMirror').CodeMirror;
     instance.setValue(content);
     await editPage.save();
 
@@ -468,7 +458,7 @@ module('Acceptance | secrets/secret/create, read, delete', function (hooks) {
       'redirects to the show page'
     );
     assert.ok(showPage.editIsPresent, 'shows the edit button');
-    const savedInstance = document.querySelector('.CodeMirror').CodeMirror;
+    let savedInstance = document.querySelector('.CodeMirror').CodeMirror;
     assert.strictEqual(
       savedInstance.options.value,
       JSON.stringify({ bar: 'boo', foo: 'fa' }, null, 2),
@@ -478,8 +468,8 @@ module('Acceptance | secrets/secret/create, read, delete', function (hooks) {
   });
 
   test('paths are properly encoded', async function (assert) {
-    const backend = `kv-encoding-${this.uid}`;
-    const paths = [
+    let backend = `kv-encoding-${this.uid}`;
+    let paths = [
       '(',
       ')',
       '"',
@@ -520,7 +510,7 @@ module('Acceptance | secrets/secret/create, read, delete', function (hooks) {
 
   test('create secret with space shows version data and shows space warning', async function (assert) {
     assert.expect(4);
-    const enginePath = `kv-engine-${this.uid}`;
+    const enginePath = `kv-${new Date().getTime()}`;
     const secretPath = 'space space';
     // mount version 2
     await mountSecrets.visit();
@@ -546,44 +536,11 @@ module('Acceptance | secrets/secret/create, read, delete', function (hooks) {
     await click('[data-test-version]');
 
     // perform encode function that should be done by the encodePath
-    const encodedSecretPath = secretPath.replace(/ /g, '%20');
+    let encodedSecretPath = secretPath.replace(/ /g, '%20');
     assert.strictEqual(currentURL(), `/vault/secrets/${enginePath}/show/${encodedSecretPath}?version=1`);
     await deleteEngine(enginePath, assert);
   });
 
-  test('UI handles secret with % in path correctly', async function (assert) {
-    assert.expect(7);
-    const enginePath = `kv-engine-${this.uid}`;
-    const secretPath = 'per%cent/%fu ll';
-    const [firstPath, secondPath] = secretPath.split('/');
-    const commands = [`write sys/mounts/${enginePath} type=kv`, `write '${enginePath}/${secretPath}' 3=4`];
-    await consoleComponent.runCommands(commands);
-    await listPage.visitRoot({ backend: enginePath });
-    assert.dom(`[data-test-secret-link="${firstPath}/"]`).exists('First section item exists');
-    await click(`[data-test-secret-link="${firstPath}/"]`);
-
-    assert.strictEqual(
-      currentURL(),
-      `/vault/secrets/${enginePath}/list/${encodeURIComponent(firstPath)}/`,
-      'First part of path is encoded in URL'
-    );
-    assert.dom(`[data-test-secret-link="${secretPath}"]`).exists('Link to secret exists');
-    await click(`[data-test-secret-link="${secretPath}"]`);
-    assert.strictEqual(
-      currentURL(),
-      `/vault/secrets/${enginePath}/show/${encodeURIComponent(firstPath)}/${encodeURIComponent(secondPath)}`,
-      'secret path is encoded in URL'
-    );
-    assert.dom('h1').hasText(secretPath, 'Path renders correctly on show page');
-    await click(`[data-test-secret-breadcrumb="${firstPath}"]`);
-    assert.strictEqual(
-      currentURL(),
-      `/vault/secrets/${enginePath}/list/${encodeURIComponent(firstPath)}/`,
-      'Breadcrumb link encodes correctly'
-    );
-    await deleteEngine(enginePath, assert);
-  });
-
   // the web cli does not handle a quote as part of a path, so we test it here via the UI
   test('creating a secret with a single or double quote works properly', async function (assert) {
     assert.expect(5);
@@ -833,7 +790,7 @@ module('Acceptance | secrets/secret/create, read, delete', function (hooks) {
     assert.dom('[data-test-secret-v2-delete="true"]').exists('drop down delete shows');
     await showPage.deleteSecretV2();
     // unable to reload page in test scenario so going to list and back to secret to confirm deletion
-    const url = `/vault/secrets/${enginePath}/list`;
+    let url = `/vault/secrets/${enginePath}/list`;
     await visit(url);
 
     await click(`[data-test-secret-link="${secretPath}"]`);
@@ -998,7 +955,7 @@ module('Acceptance | secrets/secret/create, read, delete', function (hooks) {
       }
     `;
 
-    const version = backend === 'kv-v2' ? 2 : 1;
+    let version = backend === 'kv-v2' ? 2 : 1;
     let policy;
     if (backend === 'kv-v2' && canReadMeta) {
       policy = V2_WRITE_WITH_META_READ_POLICY;
@@ -1012,8 +969,8 @@ module('Acceptance | secrets/secret/create, read, delete', function (hooks) {
   };
   test('write without read: version 2', async function (assert) {
     assert.expect(5);
-    const backend = 'kv-v2';
-    const userToken = await setupNoRead(backend);
+    let backend = 'kv-v2';
+    let userToken = await setupNoRead(backend);
     await writeSecret(backend, 'secret', 'foo', 'bar');
     await logout.visit();
     await authPage.login(userToken);
@@ -1036,8 +993,9 @@ module('Acceptance | secrets/secret/create, read, delete', function (hooks) {
 
   test('write without read: version 2 with metadata read', async function (assert) {
     assert.expect(5);
-    const backend = 'kv-v2';
-    const userToken = await setupNoRead(backend, true);
+    let backend = 'kv-v2';
+    let userToken = await setupNoRead(backend, true);
+
     await writeSecret(backend, 'secret', 'foo', 'bar');
     await logout.visit();
     await authPage.login(userToken);
@@ -1062,8 +1020,9 @@ module('Acceptance | secrets/secret/create, read, delete', function (hooks) {
 
   test('write without read: version 1', async function (assert) {
     assert.expect(4);
-    const backend = 'kv-v1';
-    const userToken = await setupNoRead(backend);
+    let backend = 'kv-v1';
+    let userToken = await setupNoRead(backend);
+
     await writeSecret(backend, 'secret', 'foo', 'bar');
     await logout.visit();
     await authPage.login(userToken);
diff --git a/ui/tests/acceptance/secrets/backend/pki/cert-test.js b/ui/tests/acceptance/secrets/backend/pki/cert-test.js
new file mode 100644
index 0000000000000..0824cd9ce3ccf
--- /dev/null
+++ b/ui/tests/acceptance/secrets/backend/pki/cert-test.js
@@ -0,0 +1,109 @@
+import { currentRouteName, currentURL, settled } from '@ember/test-helpers';
+import { module, test } from 'qunit';
+import { setupApplicationTest } from 'ember-qunit';
+import editPage from 'vault/tests/pages/secrets/backend/pki/edit-role';
+import listPage from 'vault/tests/pages/secrets/backend/list';
+import generatePage from 'vault/tests/pages/secrets/backend/pki/generate-cert';
+import configPage from 'vault/tests/pages/settings/configure-secret-backends/pki/section-cert';
+import enablePage from 'vault/tests/pages/settings/mount-secret-backend';
+import authPage from 'vault/tests/pages/auth';
+import { SELECTORS } from 'vault/tests/helpers/pki';
+
+module('Acceptance | secrets/pki/list?tab=cert', function (hooks) {
+  setupApplicationTest(hooks);
+
+  hooks.beforeEach(function () {
+    return authPage.login();
+  });
+  // important for this comment to stay here otherwise the formatting mangles the CSR
+  // prettier-ignore
+  const CSR = `-----BEGIN CERTIFICATE REQUEST-----
+MIICdDCCAVwCAQAwDjEMMAoGA1UEAxMDbG9sMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA4Dz2b/nAP/M6bqyk5mctqqYAAcoME//xPBy0wREHuZ776Pu4
+l45kDL3dPXiY8U2P9pn8WIr2KpLK6oWUfSsiG2P082bpWDL20UymkWqDhhrA4unf
+ZRq68UIDbcetlLw15YKnlNdvNZ7Qr8Se8KV0YGR/wFqI7QfS6VE3lhxZWEBUayI0
+egqOuDbXAcZTON1AZ92/F+WFSbc43iYdDk16XfAPFKhtvLr6zQQuzebAb7HG04Hc
+GhRskixxyJ8XY6XUplfsa1HcpUXE4f1GeUvq3g6ltVCSJ0p7qI9FFjV4t+DCLVVV
+LnwHUi9Vzz6i2wjMt7P6+gHR+RrOWBgRMn38fwIDAQABoCEwHwYJKoZIhvcNAQkO
+MRIwEDAOBgNVHREEBzAFggNsb2wwDQYJKoZIhvcNAQELBQADggEBAAm3AHQ1ctdV
+8HCrMOXGVLgI2cB1sFd6VYVxPBxIk812Y4wyO8Q6POE5VZNTIgMcSeIaFu5lgHNL
+Peeb54F+zEa+OJYkcWgCAX5mY/0HoML4p2bxFTSjllSpcX7ktjq4IEIY/LRpqSgc
+jgZHHRwanFfkeIOhN4Q5qJWgBPNhDAcNPE7T0M/4mxqYDqMSJvMYmC67hq1UOOug
+/QVDUDJRC1C0aDw9if+DbG/bt1V6HpMQhDIEUjzfu4zG8pcag3cJpOA8JhW1hnG0
+XA2ZOCA7s34/szr2FczXtIoKiYmv3UzPyO9/4mc0Q2+/nR4CG8NU9WW/XJCne9ID
+elRplAzrMF4=
+-----END CERTIFICATE REQUEST-----`;
+
+  // mount, generate CA, nav to create role page
+  const setup = async (assert, action = 'issue') => {
+    const path = `pki-${new Date().getTime()}`;
+    const roleName = 'role';
+    await enablePage.enable('pki', path);
+    await settled();
+    await configPage.visit({ backend: path }).form.generateCA();
+    await settled();
+    await editPage.visitRoot({ backend: path });
+    await settled();
+    await editPage.createRole('role', 'example.com');
+    await settled();
+    await generatePage.visit({ backend: path, id: roleName, action });
+    await settled();
+    return path;
+  };
+
+  test('it issues a cert', async function (assert) {
+    assert.expect(10);
+    const mount = await setup(assert);
+    await settled();
+    await generatePage.issueCert('foo');
+    await settled();
+    assert.equal(currentURL(), `/vault/secrets/${mount}/credentials/role?action=issue`);
+    assert.dom(SELECTORS.certificate).exists('displays masked certificate');
+    assert.dom(SELECTORS.commonName).exists('displays common name');
+    assert.dom(SELECTORS.issueDate).exists('displays issue date');
+    assert.dom(SELECTORS.expiryDate).exists('displays expiration date');
+    assert.dom(SELECTORS.issuingCa).exists('displays masked issuing CA');
+    assert.dom(SELECTORS.privateKey).exists('displays masked private key');
+    assert.dom(SELECTORS.serialNumber).exists('displays serial number');
+    assert.dom(SELECTORS.caChain).exists('displays the CA chain');
+
+    await generatePage.back();
+    await settled();
+    assert.notOk(generatePage.commonNameValue, 'the form is cleared');
+  });
+
+  test('it signs a csr', async function (assert) {
+    assert.expect(4);
+    await setup(assert, 'sign');
+    await settled();
+    await generatePage.sign('common', CSR);
+    await settled();
+    assert.ok(SELECTORS.certificate, 'displays masked certificate');
+    assert.ok(SELECTORS.commonName, 'displays common name');
+    assert.ok(SELECTORS.issuingCa, 'displays masked issuing CA');
+    assert.ok(SELECTORS.serialNumber, 'displays serial number');
+  });
+
+  test('it views a cert', async function (assert) {
+    assert.expect(12);
+    const path = await setup(assert);
+    await generatePage.issueCert('foo');
+    await settled();
+    await listPage.visitRoot({ backend: path, tab: 'cert' });
+    await settled();
+    assert.equal(currentURL(), `/vault/secrets/${path}/list?tab=cert`);
+    assert.equal(listPage.secrets.length, 2, 'lists certs');
+    await listPage.secrets.objectAt(0).click();
+    await settled();
+    assert.equal(currentRouteName(), 'vault.cluster.secrets.backend.show', 'navigates to the show page');
+    assert.dom(SELECTORS.certificate).exists('displays masked certificate');
+    assert.dom(SELECTORS.commonName).exists('displays common name');
+    assert.dom(SELECTORS.issueDate).exists('displays issue date');
+    assert.dom(SELECTORS.expiryDate).exists('displays expiration date');
+    assert.dom(SELECTORS.serialNumber).exists('displays serial number');
+    assert.dom(SELECTORS.revocationTime).doesNotExist('does not display revocation time of 0');
+    assert.dom(SELECTORS.issuingCa).doesNotExist('does not display empty issuing CA');
+    assert.dom(SELECTORS.caChain).doesNotExist('does not display empty CA chain');
+    assert.dom(SELECTORS.privateKey).doesNotExist('does not display empty private key');
+  });
+});
diff --git a/ui/tests/acceptance/secrets/backend/pki/list-test.js b/ui/tests/acceptance/secrets/backend/pki/list-test.js
new file mode 100644
index 0000000000000..fa775e94777be
--- /dev/null
+++ b/ui/tests/acceptance/secrets/backend/pki/list-test.js
@@ -0,0 +1,51 @@
+import { click, currentRouteName, settled } from '@ember/test-helpers';
+import { module, test } from 'qunit';
+import { setupApplicationTest } from 'ember-qunit';
+import page from 'vault/tests/pages/secrets/backend/list';
+import authPage from 'vault/tests/pages/auth';
+import enablePage from 'vault/tests/pages/settings/mount-secret-backend';
+
+module('Acceptance | secrets/pki/list', function (hooks) {
+  setupApplicationTest(hooks);
+
+  hooks.beforeEach(function () {
+    return authPage.login();
+  });
+
+  const mountAndNav = async () => {
+    const path = `pki-${new Date().getTime()}`;
+    await enablePage.enable('pki', path);
+    await page.visitRoot({ backend: path });
+  };
+
+  test('it renders an empty list', async function (assert) {
+    assert.expect(5);
+    await mountAndNav(assert);
+    assert.equal(currentRouteName(), 'vault.cluster.secrets.backend.list-root', 'redirects from the index');
+    assert.ok(page.createIsPresent, 'create button is present');
+    await click('[data-test-configuration-tab]');
+    assert.ok(page.configureIsPresent, 'configure button is present');
+    assert.equal(page.tabs.length, 2, 'shows 2 tabs');
+    assert.ok(page.backendIsEmpty);
+  });
+
+  test('it navigates to the create page', async function (assert) {
+    assert.expect(1);
+    await mountAndNav(assert);
+    await page.create();
+    assert.equal(currentRouteName(), 'vault.cluster.secrets.backend.create-root', 'links to the create page');
+  });
+
+  test('it navigates to the configure page', async function (assert) {
+    assert.expect(1);
+    await mountAndNav(assert);
+    await click('[data-test-configuration-tab]');
+    await page.configure();
+    await settled();
+    assert.equal(
+      currentRouteName(),
+      'vault.cluster.settings.configure-secret-backend.section',
+      'links to the configure page'
+    );
+  });
+});
diff --git a/ui/tests/acceptance/secrets/backend/pki/role-test.js b/ui/tests/acceptance/secrets/backend/pki/role-test.js
new file mode 100644
index 0000000000000..292adfa4f8be1
--- /dev/null
+++ b/ui/tests/acceptance/secrets/backend/pki/role-test.js
@@ -0,0 +1,77 @@
+import { currentRouteName, settled, visit, waitUntil } from '@ember/test-helpers';
+import { module, test, skip } from 'qunit';
+import { setupApplicationTest } from 'ember-qunit';
+import editPage from 'vault/tests/pages/secrets/backend/pki/edit-role';
+import showPage from 'vault/tests/pages/secrets/backend/pki/show';
+import listPage from 'vault/tests/pages/secrets/backend/list';
+import enablePage from 'vault/tests/pages/settings/mount-secret-backend';
+import authPage from 'vault/tests/pages/auth';
+
+module('Acceptance | secrets/pki/create', function (hooks) {
+  setupApplicationTest(hooks);
+
+  hooks.beforeEach(function () {
+    return authPage.login();
+  });
+
+  skip('it creates a role and redirects', async function (assert) {
+    const path = `pki-${new Date().getTime()}`;
+    await enablePage.enable('pki', path);
+    await settled();
+    await editPage.visitRoot({ backend: path });
+    await settled();
+    await editPage.createRole('role', 'example.com');
+    await settled();
+    assert.equal(currentRouteName(), 'vault.cluster.secrets.backend.show', 'redirects to the show page');
+    assert.dom('[data-test-edit-link="true"]').exists('shows the edit button');
+    assert.dom('[data-test-credentials-link="true"]').exists('shows the generate button');
+    assert.dom('[data-test-sign-link="true"]').exists('shows the sign button');
+
+    await showPage.visit({ backend: path, id: 'role' });
+    await settled();
+    await showPage.generateCert();
+    await settled();
+    assert.equal(
+      currentRouteName(),
+      'vault.cluster.secrets.backend.credentials',
+      'navs to the credentials page'
+    );
+
+    await showPage.visit({ backend: path, id: 'role' });
+    await settled();
+    await visit(`/vault/secrets/${path}/credentials/role?action=sign`);
+
+    assert.equal(
+      currentRouteName(),
+      'vault.cluster.secrets.backend.credentials',
+      'navs to the credentials page'
+    );
+
+    await listPage.visitRoot({ backend: path });
+    await settled();
+    assert.equal(listPage.secrets.length, 1, 'shows role in the list');
+    let secret = listPage.secrets.objectAt(0);
+    await secret.menuToggle();
+    await settled();
+    assert.ok(listPage.menuItems.length > 0, 'shows links in the menu');
+  });
+
+  test('it deletes a role', async function (assert) {
+    const path = `pki-${new Date().getTime()}`;
+    await enablePage.enable('pki', path);
+    await settled();
+    await editPage.visitRoot({ backend: path });
+    await settled();
+    await editPage.createRole('role', 'example.com');
+    await settled();
+    await showPage.visit({ backend: path, id: 'role' });
+    await settled();
+    await showPage.deleteRole();
+    await settled();
+    assert.ok(
+      await waitUntil(() => currentRouteName() === 'vault.cluster.secrets.backend.list-root'),
+      'redirects to list page'
+    );
+    assert.ok(listPage.backendIsEmpty, 'no roles listed');
+  });
+});
diff --git a/ui/tests/acceptance/secrets/backend/ssh/role-test.js b/ui/tests/acceptance/secrets/backend/ssh/role-test.js
index b2dbfafe07f07..2379b0d98fd7c 100644
--- a/ui/tests/acceptance/secrets/backend/ssh/role-test.js
+++ b/ui/tests/acceptance/secrets/backend/ssh/role-test.js
@@ -1,13 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { currentRouteName, settled } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
-import { v4 as uuidv4 } from 'uuid';
-
 import editPage from 'vault/tests/pages/secrets/backend/ssh/edit-role';
 import showPage from 'vault/tests/pages/secrets/backend/ssh/show';
 import generatePage from 'vault/tests/pages/secrets/backend/ssh/generate-otp';
@@ -19,12 +12,11 @@ module('Acceptance | secrets/ssh', function (hooks) {
   setupApplicationTest(hooks);
 
   hooks.beforeEach(function () {
-    this.uid = uuidv4();
     return authPage.login();
   });
 
-  const mountAndNav = async (uid) => {
-    const path = `ssh-${uid}`;
+  const mountAndNav = async () => {
+    const path = `ssh-${new Date().getTime()}`;
     await enablePage.enable('ssh', path);
     await settled();
     await editPage.visitRoot({ backend: path });
@@ -34,21 +26,17 @@ module('Acceptance | secrets/ssh', function (hooks) {
 
   test('it creates a role and redirects', async function (assert) {
     assert.expect(5);
-    const path = await mountAndNav(this.uid);
+    const path = await mountAndNav(assert);
     await editPage.createOTPRole('role');
     await settled();
-    assert.strictEqual(
-      currentRouteName(),
-      'vault.cluster.secrets.backend.show',
-      'redirects to the show page'
-    );
+    assert.equal(currentRouteName(), 'vault.cluster.secrets.backend.show', 'redirects to the show page');
     assert.ok(showPage.generateIsPresent, 'shows the generate button');
 
     await showPage.visit({ backend: path, id: 'role' });
     await settled();
     await showPage.generate();
     await settled();
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.secrets.backend.credentials',
       'navs to the credentials page'
@@ -56,46 +44,38 @@ module('Acceptance | secrets/ssh', function (hooks) {
 
     await listPage.visitRoot({ backend: path });
     await settled();
-    assert.strictEqual(listPage.secrets.length, 1, 'shows role in the list');
-    const secret = listPage.secrets.objectAt(0);
+    assert.equal(listPage.secrets.length, 1, 'shows role in the list');
+    let secret = listPage.secrets.objectAt(0);
     await secret.menuToggle();
     assert.ok(listPage.menuItems.length > 0, 'shows links in the menu');
   });
 
   test('it deletes a role', async function (assert) {
     assert.expect(2);
-    const path = await mountAndNav(this.uid);
+    const path = await mountAndNav(assert);
     await editPage.createOTPRole('role');
     await settled();
     await showPage.visit({ backend: path, id: 'role' });
     await settled();
     await showPage.deleteRole();
     await settled();
-    assert.strictEqual(
-      currentRouteName(),
-      'vault.cluster.secrets.backend.list-root',
-      'redirects to list page'
-    );
+    assert.equal(currentRouteName(), 'vault.cluster.secrets.backend.list-root', 'redirects to list page');
     assert.ok(listPage.backendIsEmpty, 'no roles listed');
   });
 
   test('it generates an OTP', async function (assert) {
     assert.expect(6);
-    const path = await mountAndNav(this.uid);
+    const path = await mountAndNav(assert);
     await editPage.createOTPRole('role');
     await settled();
-    assert.strictEqual(
-      currentRouteName(),
-      'vault.cluster.secrets.backend.show',
-      'redirects to the show page'
-    );
+    assert.equal(currentRouteName(), 'vault.cluster.secrets.backend.show', 'redirects to the show page');
     assert.ok(showPage.generateIsPresent, 'shows the generate button');
 
     await showPage.visit({ backend: path, id: 'role' });
     await settled();
     await showPage.generate();
     await settled();
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.secrets.backend.credentials',
       'navs to the credentials page'
diff --git a/ui/tests/acceptance/settings-test.js b/ui/tests/acceptance/settings-test.js
index f4210aa1653ea..c041ae597c443 100644
--- a/ui/tests/acceptance/settings-test.js
+++ b/ui/tests/acceptance/settings-test.js
@@ -1,13 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { currentURL, find, visit, settled } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
-import { v4 as uuidv4 } from 'uuid';
-
 import backendListPage from 'vault/tests/pages/secrets/backends';
 import mountSecrets from 'vault/tests/pages/settings/mount-secret-backend';
 import authPage from 'vault/tests/pages/auth';
@@ -17,7 +10,6 @@ module('Acceptance | settings', function (hooks) {
   setupApplicationTest(hooks);
 
   hooks.beforeEach(function () {
-    this.uid = uuidv4();
     return authPage.login();
   });
 
@@ -26,13 +18,14 @@ module('Acceptance | settings', function (hooks) {
   });
 
   test('settings', async function (assert) {
+    const now = new Date().getTime();
     const type = 'consul';
-    const path = `settings-path-${this.uid}`;
+    const path = `path-${now}`;
 
     // mount unsupported backend
     await visit('/vault/settings/mount-secret-backend');
 
-    assert.strictEqual(currentURL(), '/vault/settings/mount-secret-backend');
+    assert.equal(currentURL(), '/vault/settings/mount-secret-backend');
 
     await mountSecrets.selectType(type);
     await mountSecrets
@@ -49,10 +42,10 @@ module('Acceptance | settings', function (hooks) {
       `Successfully mounted '${type}' at '${path}'!`
     );
     await settled();
-    assert.strictEqual(currentURL(), `/vault/secrets`, 'redirects to secrets page');
-    const row = backendListPage.rows.filterBy('path', path + '/')[0];
+    assert.equal(currentURL(), `/vault/secrets`, 'redirects to secrets page');
+    let row = backendListPage.rows.filterBy('path', path + '/')[0];
     await row.menu();
     await backendListPage.configLink();
-    assert.strictEqual(currentURL(), `/vault/secrets/${path}/configuration`, 'navigates to the config page');
+    assert.equal(currentURL(), `/vault/secrets/${path}/configuration`, 'navigates to the config page');
   });
 });
diff --git a/ui/tests/acceptance/settings/auth/configure/index-test.js b/ui/tests/acceptance/settings/auth/configure/index-test.js
index ce04431098087..bb6a4ba88c181 100644
--- a/ui/tests/acceptance/settings/auth/configure/index-test.js
+++ b/ui/tests/acceptance/settings/auth/configure/index-test.js
@@ -1,13 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { currentURL, currentRouteName } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
-import { v4 as uuidv4 } from 'uuid';
-
 import enablePage from 'vault/tests/pages/settings/auth/enable';
 import page from 'vault/tests/pages/settings/auth/configure/index';
 import authPage from 'vault/tests/pages/auth';
@@ -16,30 +9,25 @@ module('Acceptance | settings/auth/configure', function (hooks) {
   setupApplicationTest(hooks);
 
   hooks.beforeEach(function () {
-    this.uid = uuidv4();
     return authPage.login();
   });
 
   test('it redirects to section options when there are no other sections', async function (assert) {
-    const path = `approle-config-${this.uid}`;
+    const path = `approle-${new Date().getTime()}`;
     const type = 'approle';
     await enablePage.enable(type, path);
     await page.visit({ path });
-    assert.strictEqual(currentRouteName(), 'vault.cluster.settings.auth.configure.section');
-    assert.strictEqual(
-      currentURL(),
-      `/vault/settings/auth/configure/${path}/options`,
-      'loads the options route'
-    );
+    assert.equal(currentRouteName(), 'vault.cluster.settings.auth.configure.section');
+    assert.equal(currentURL(), `/vault/settings/auth/configure/${path}/options`, 'loads the options route');
   });
 
   test('it redirects to the first section', async function (assert) {
-    const path = `aws-redirect-${this.uid}`;
+    const path = `aws-${new Date().getTime()}`;
     const type = 'aws';
     await enablePage.enable(type, path);
     await page.visit({ path });
-    assert.strictEqual(currentRouteName(), 'vault.cluster.settings.auth.configure.section');
-    assert.strictEqual(
+    assert.equal(currentRouteName(), 'vault.cluster.settings.auth.configure.section');
+    assert.equal(
       currentURL(),
       `/vault/settings/auth/configure/${path}/client`,
       'loads the first section for the type of auth method'
diff --git a/ui/tests/acceptance/settings/auth/configure/section-test.js b/ui/tests/acceptance/settings/auth/configure/section-test.js
index 24617ff6b8af7..8c673017a6660 100644
--- a/ui/tests/acceptance/settings/auth/configure/section-test.js
+++ b/ui/tests/acceptance/settings/auth/configure/section-test.js
@@ -1,14 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
 import { create } from 'ember-cli-page-object';
-import { fillIn } from '@ember/test-helpers';
-import { v4 as uuidv4 } from 'uuid';
-
 import enablePage from 'vault/tests/pages/settings/auth/enable';
 import page from 'vault/tests/pages/settings/auth/configure/section';
 import indexPage from 'vault/tests/pages/settings/auth/configure/index';
@@ -22,7 +14,6 @@ module('Acceptance | settings/auth/configure/section', function (hooks) {
   setupApplicationTest(hooks);
 
   hooks.beforeEach(function () {
-    this.uid = uuidv4();
     this.server = apiStub({ usePassthrough: true });
     return authPage.login();
   });
@@ -32,43 +23,33 @@ module('Acceptance | settings/auth/configure/section', function (hooks) {
   });
 
   test('it can save options', async function (assert) {
-    const path = `approle-save-${this.uid}`;
+    const path = `approle-${new Date().getTime()}`;
     const type = 'approle';
     const section = 'options';
     await enablePage.enable(type, path);
     await page.visit({ path, section });
     await page.fillInTextarea('description', 'This is AppRole!');
-    assert
-      .dom('[data-test-input="config.tokenType"]')
-      .hasValue('default-service', 'as default the token type selected is default-service.');
-    await fillIn('[data-test-input="config.tokenType"]', 'batch');
     await page.save();
-    assert.strictEqual(
+    assert.equal(
       page.flash.latestMessage,
       `The configuration was saved successfully.`,
       'success flash shows'
     );
-    const tuneRequest = this.server.passthroughRequests.filterBy(
-      'url',
-      `/v1/sys/mounts/auth/${path}/tune`
-    )[0];
-    const keys = Object.keys(JSON.parse(tuneRequest.requestBody));
-    const token_type = JSON.parse(tuneRequest.requestBody).token_type;
-    assert.strictEqual(token_type, 'batch', 'passes new token type');
+    let tuneRequest = this.server.passthroughRequests.filterBy('url', `/v1/sys/mounts/auth/${path}/tune`)[0];
+    let keys = Object.keys(JSON.parse(tuneRequest.requestBody));
     assert.ok(keys.includes('default_lease_ttl'), 'passes default_lease_ttl on tune');
     assert.ok(keys.includes('max_lease_ttl'), 'passes max_lease_ttl on tune');
-    assert.ok(keys.includes('description'), 'passes updated description on tune');
   });
 
-  for (const type of ['aws', 'azure', 'gcp', 'github', 'kubernetes']) {
+  for (let type of ['aws', 'azure', 'gcp', 'github', 'kubernetes']) {
     test(`it shows tabs for auth method: ${type}`, async function (assert) {
-      const path = `${type}-showtab-${this.uid}`;
+      let path = `${type}-${Date.now()}`;
       await cli.consoleInput(`write sys/auth/${path} type=${type}`);
       await cli.enter();
       await indexPage.visit({ path });
       // aws has 4 tabs, the others will have 'Configuration' and 'Method Options' tabs
-      const numTabs = type === 'aws' ? 4 : 2;
-      assert.strictEqual(page.tabs.length, numTabs, 'shows correct number of tabs');
+      let numTabs = type === 'aws' ? 4 : 2;
+      assert.equal(page.tabs.length, numTabs, 'shows correct number of tabs');
     });
   }
 });
diff --git a/ui/tests/acceptance/settings/auth/enable-test.js b/ui/tests/acceptance/settings/auth/enable-test.js
index 02ed844242ecc..37c0fb091123f 100644
--- a/ui/tests/acceptance/settings/auth/enable-test.js
+++ b/ui/tests/acceptance/settings/auth/enable-test.js
@@ -1,13 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { currentRouteName, settled } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
-import { v4 as uuidv4 } from 'uuid';
-
 import page from 'vault/tests/pages/settings/auth/enable';
 import listPage from 'vault/tests/pages/access/methods';
 import authPage from 'vault/tests/pages/auth';
@@ -16,24 +9,23 @@ module('Acceptance | settings/auth/enable', function (hooks) {
   setupApplicationTest(hooks);
 
   hooks.beforeEach(function () {
-    this.uid = uuidv4();
     return authPage.login();
   });
 
   test('it mounts and redirects', async function (assert) {
     // always force the new mount to the top of the list
-    const path = `aaa-approle-${this.uid}`;
+    const path = `approle-${new Date().getTime()}`;
     const type = 'approle';
     await page.visit();
-    assert.strictEqual(currentRouteName(), 'vault.cluster.settings.auth.enable');
+    assert.equal(currentRouteName(), 'vault.cluster.settings.auth.enable');
     await page.enable(type, path);
     await settled();
-    await assert.strictEqual(
+    await assert.equal(
       page.flash.latestMessage,
       `Successfully mounted the ${type} auth method at ${path}.`,
       'success flash shows'
     );
-    assert.strictEqual(
+    assert.equal(
       currentRouteName(),
       'vault.cluster.settings.auth.configure.section',
       'redirects to the auth config page'
diff --git a/ui/tests/acceptance/settings/configure-secret-backends/configure-ssh-secret-test.js b/ui/tests/acceptance/settings/configure-secret-backends/configure-ssh-secret-test.js
deleted file mode 100644
index 5b35bbd2697cb..0000000000000
--- a/ui/tests/acceptance/settings/configure-secret-backends/configure-ssh-secret-test.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { click, settled } from '@ember/test-helpers';
-import { module, test } from 'qunit';
-import { setupApplicationTest } from 'ember-qunit';
-import { v4 as uuidv4 } from 'uuid';
-
-import { visit } from '@ember/test-helpers';
-import authPage from 'vault/tests/pages/auth';
-import enablePage from 'vault/tests/pages/settings/mount-secret-backend';
-import { create } from 'ember-cli-page-object';
-import fm from 'vault/tests/pages/components/flash-message';
-const flashMessage = create(fm);
-const SELECTORS = {
-  generateSigningKey: '[data-test-ssh-input="generate-signing-key-checkbox"]',
-  saveConfig: '[data-test-ssh-input="configure-submit"]',
-  publicKey: '[data-test-ssh-input="public-key"]',
-};
-module('Acceptance | settings/configure/secrets/ssh', function (hooks) {
-  setupApplicationTest(hooks);
-
-  hooks.beforeEach(function () {
-    this.uid = uuidv4();
-    return authPage.login();
-  });
-
-  test('it configures ssh ca', async function (assert) {
-    const path = `ssh-configure-${this.uid}`;
-    await enablePage.enable('ssh', path);
-    await settled();
-    visit(`/vault/settings/secrets/configure/${path}`);
-    await settled();
-    assert.dom(SELECTORS.generateSigningKey).isChecked('generate_signing_key defaults to true');
-    await click(SELECTORS.generateSigningKey);
-    await click(SELECTORS.saveConfig);
-    assert.strictEqual(
-      flashMessage.latestMessage,
-      'missing public_key',
-      'renders warning flash message for failed save'
-    );
-    await click(SELECTORS.generateSigningKey);
-    await click(SELECTORS.saveConfig);
-    assert.dom(SELECTORS.publicKey).exists('renders public key after saving config');
-  });
-});
diff --git a/ui/tests/acceptance/settings/configure-secret-backends/pki/index-test.js b/ui/tests/acceptance/settings/configure-secret-backends/pki/index-test.js
new file mode 100644
index 0000000000000..e0760ced2963e
--- /dev/null
+++ b/ui/tests/acceptance/settings/configure-secret-backends/pki/index-test.js
@@ -0,0 +1,27 @@
+import { currentRouteName, settled } from '@ember/test-helpers';
+import { module, test } from 'qunit';
+import { setupApplicationTest } from 'ember-qunit';
+import page from 'vault/tests/pages/settings/configure-secret-backends/pki/index';
+import authPage from 'vault/tests/pages/auth';
+import enablePage from 'vault/tests/pages/settings/mount-secret-backend';
+
+module('Acceptance | settings/configure/secrets/pki', function (hooks) {
+  setupApplicationTest(hooks);
+
+  hooks.beforeEach(function () {
+    return authPage.login();
+  });
+
+  test('it redirects to the cert section', async function (assert) {
+    const path = `pki-${new Date().getTime()}`;
+    await enablePage.enable('pki', path);
+    await settled();
+    await page.visit({ backend: path });
+    await settled();
+    assert.equal(
+      currentRouteName(),
+      'vault.cluster.settings.configure-secret-backend.section',
+      'redirects from the index'
+    );
+  });
+});
diff --git a/ui/tests/acceptance/settings/configure-secret-backends/pki/section-cert-test.js b/ui/tests/acceptance/settings/configure-secret-backends/pki/section-cert-test.js
new file mode 100644
index 0000000000000..504ea66857456
--- /dev/null
+++ b/ui/tests/acceptance/settings/configure-secret-backends/pki/section-cert-test.js
@@ -0,0 +1,144 @@
+import { currentRouteName, settled, click } from '@ember/test-helpers';
+import { module, test } from 'qunit';
+import { setupApplicationTest } from 'ember-qunit';
+import page from 'vault/tests/pages/settings/configure-secret-backends/pki/section-cert';
+import { SELECTORS } from 'vault/tests/helpers/pki';
+import authPage from 'vault/tests/pages/auth';
+import enablePage from 'vault/tests/pages/settings/mount-secret-backend';
+
+module('Acceptance | settings/configure/secrets/pki/cert', function (hooks) {
+  setupApplicationTest(hooks);
+
+  hooks.beforeEach(function () {
+    return authPage.login();
+  });
+
+  //prettier-ignore
+  const PEM_BUNDLE = `-----BEGIN CERTIFICATE-----
+MIIDGjCCAgKgAwIBAgIUFvnhb2nQ8+KNS3SzjlfYDMHGIRgwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAxMCZmEwHhcNMTgwMTEwMTg1NDI5WhcNMTgwMjExMTg1NDU5
+WjANMQswCQYDVQQDEwJmYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AN2VtBn6EMlA4aYre/xoKHxlgNDxJnfSQWfs6yF/K201qPnt4QF9AXChatbmcKVn
+OaURq+XEJrGVgF/u2lSos3NRZdhWVe8o3/sOetsGxcrd0gXAieOSmkqJjp27bYdl
+uY3WsxhyiPvdfS6xz39OehsK/YCB6qCzwB4eEfSKqbkvfDL9sLlAiOlaoHC9pczf
+6/FANKp35UDwInSwmq5vxGbnWk9zMkh5Jq6hjOWHZnVc2J8J49PYvkIM8uiHDgOE
+w71T2xM5plz6crmZnxPCOcTKIdF7NTEP2lUfiqc9lONV9X1Pi4UclLPHJf5bwTmn
+JaWgbKeY+IlF61/mgxzhC7cCAwEAAaNyMHAwDgYDVR0PAQH/BAQDAgEGMA8GA1Ud
+EwEB/wQFMAMBAf8wHQYDVR0OBBYEFLDtc6+HZN2lv60JSDAZq3+IHoq7MB8GA1Ud
+IwQYMBaAFLDtc6+HZN2lv60JSDAZq3+IHoq7MA0GA1UdEQQGMASCAmZhMA0GCSqG
+SIb3DQEBCwUAA4IBAQDVt6OddTV1MB0UvF5v4zL1bEB9bgXvWx35v/FdS+VGn/QP
+cC2c4ZNukndyHhysUEPdqVg4+up1aXm4eKXzNmGMY/ottN2pEhVEWQyoIIA1tH0e
+8Kv/bysYpHZKZuoGg5+mdlHS2p2Dh2bmYFyBLJ8vaeP83NpTs2cNHcmEvWh/D4UN
+UmYDODRN4qh9xYruKJ8i89iMGQfbdcq78dCC4JwBIx3bysC8oF4lqbTYoYNVTnAi
+LVqvLdHycEOMlqV0ecq8uMLhPVBalCmIlKdWNQFpXB0TQCsn95rCCdi7ZTsYk5zv
+Q4raFvQrZth3Cz/X5yPTtQL78oBYrmHzoQKDFJ2z
+-----END CERTIFICATE-----
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEA3ZW0GfoQyUDhpit7/GgofGWA0PEmd9JBZ+zrIX8rbTWo+e3h
+AX0BcKFq1uZwpWc5pRGr5cQmsZWAX+7aVKizc1Fl2FZV7yjf+w562wbFyt3SBcCJ
+45KaSomOnbtth2W5jdazGHKI+919LrHPf056Gwr9gIHqoLPAHh4R9IqpuS98Mv2w
+uUCI6VqgcL2lzN/r8UA0qnflQPAidLCarm/EZudaT3MySHkmrqGM5YdmdVzYnwnj
+09i+Qgzy6IcOA4TDvVPbEzmmXPpyuZmfE8I5xMoh0Xs1MQ/aVR+Kpz2U41X1fU+L
+hRyUs8cl/lvBOaclpaBsp5j4iUXrX+aDHOELtwIDAQABAoIBACLdk2Ei/9Eq7FaB
+MRkeKoCoWASIbU0dQD1iAf1bTTH554Sr8WOSj89xFqaJy9+6xk864Jleq9f1diWi
+J6h6gwH6JNRNgWgIPnX6aUpdXnH1RT6ydP/h6XUg/9fBzhIn53Jx/ewy2WsIBtJ6
+F/QoHP50VD8MMibnIaubf6fCycHhc97u4BKM2QdnAugn1sWjSiTIoYmFw/3Ej8mB
+bItLWZTg9oMASgCtDwPEstlKn7yPqirOJj+G/a+6sIcP2fynd0fISsfLZ0ovN+yW
+d3SV3orC0RNj83GVwYykqwCc/3pP0mRfX9fl8DKbXusITqUiGL8LGb+H6YDDpbNU
+5Fj7VwECgYEA5P6aIcGfCZayEJtHKlTCA2/KBkGTOP/0iNKWhntBQT/GK+bjmr+D
+GO1zR8ZFEIRdlUA5MjC9wU2AQikgFQzzmtz604Wt34fDN2NFrxq8sWN7Hjr65Fjf
+ivJ6faT5r5gcNEq3EM/GLF9oJH8M+B5ccFe9iXH8AbmZHOO0FZtYxIcCgYEA97dm
+Kj1qyuKlINXKt4KXdYMuIT+Z3G1B92wNN9TY/eJZgCJ7zlNcinUF/OFbiGgsk4t+
+P0yVMs8BENQML0TH4Gebf4HfnDFno4J1M9HDt6HSMhsLKyvFYjFvb8hF4SPrY1pF
+wW3lM3zMMzAVi8044vRrTvxfxL8QJX+1Hesye1ECgYAT5/H8Fzm8+qWV/fmMu3t2
+EwSr0I18uftG3Y+KNzKv+lw+ur50WEuMIjAQQDMGwYrlC4UtUMFeCV+p4KtSSSLw
+Bl+jfY5kzQdyTCXll9xpSy2LrjLbIMKl8Hgnbezqj7176jbJtlYSy2RhL84vz2vX
+tDjcttTiTYD62uxvqGZqBwKBgFQ3tPM9aDZL8coFBWN4cZfRHnjNT7kCKEA/KwtF
+QPSn5LfMgXz3GGo2OO/tihoJGMac0TIiDkN03y7ieLYFU1L2xoYGGIjYvxx2+PPC
+KCEhUf4Y9aYavoOQvQsq8p8FgDyJ71dAzoC/uAjbGygpgGKgqG71HHYeYxXsoh3m
+3YXRAoGAE7MBnVJWiIN5s63gGz9f9V6k1dPLfcPE1I0KMM/SDOIV0oLMsYQecTTB
+ZzkXwRCdcJARkaKulTfjby7+oGpQydP8iZr+CNKFxwf838UbhhsXHnN6rc62qzYD
+BXUV2Uwtxf+QCphnlht9muX2fsLIzDJea0JipWj1uf2H8OZsjE8=
+-----END RSA PRIVATE KEY-----`;
+
+  const mountAndNav = async (assert, prefix) => {
+    const path = `${prefix}pki-${new Date().getTime()}`;
+    await enablePage.enable('pki', path);
+    await settled();
+    await page.visit({ backend: path });
+    await settled();
+    return path;
+  };
+
+  test('cert config: generate', async function (assert) {
+    assert.expect(10);
+    await mountAndNav(assert);
+    await settled();
+    assert.equal(currentRouteName(), 'vault.cluster.settings.configure-secret-backend.section');
+
+    await page.form.generateCA();
+    await settled();
+
+    assert.dom(SELECTORS.certificate).exists('certificate is present and masked');
+    assert.dom(SELECTORS.commonName).exists('displays common name');
+    assert.dom(SELECTORS.issueDate).exists('displays issue date');
+    assert.dom(SELECTORS.expiryDate).exists('displays expiration date');
+    assert.dom(SELECTORS.issuingCa).exists('displays masked issuing CA');
+    assert.dom(SELECTORS.serialNumber).exists('displays serial number');
+    assert.dom(SELECTORS.csr).doesNotExist('does not display empty CSR');
+    assert.dom(SELECTORS.caChain).doesNotExist('does not display empty CA chain');
+    assert.dom(SELECTORS.privateKey).doesNotExist('does not display empty private key');
+    await page.form.back();
+    await page.form.generateCA();
+    await settled();
+  });
+
+  test('cert config: upload', async function (assert) {
+    assert.expect(2);
+    await mountAndNav(assert);
+    await settled();
+    assert.equal(page.form.downloadLinks.length, 0, 'there are no download links');
+
+    await page.form.uploadCA(PEM_BUNDLE);
+    await settled();
+    assert.ok(
+      page.flash.latestMessage.startsWith('The certificate for this backend has been updated'),
+      'flash message displays properly'
+    );
+  });
+
+  test('cert config: sign intermediate and set signed intermediate', async function (assert) {
+    assert.expect(3);
+    let csrVal, intermediateCert;
+    const rootPath = await mountAndNav(assert, 'root-');
+    await page.form.generateCA();
+    await settled();
+    const intermediatePath = await mountAndNav(assert, 'intermediate-');
+    await page.form.generateCA('Intermediate CA', 'intermediate');
+    await settled();
+    // cache csr
+    await click('.masked-input-toggle');
+    csrVal = document.querySelector('.masked-value').innerText;
+    await page.form.back();
+    await settled();
+    await page.visit({ backend: rootPath });
+    await settled();
+    await page.form.signIntermediate('Intermediate CA');
+    await settled();
+    await page.form.csrField(csrVal).submit();
+    await settled();
+    assert.dom(SELECTORS.caChain).exists('full CA chain is shown');
+    assert.dom(SELECTORS.privateKey).doesNotExist('does not display empty private key');
+    await click('.masked-input-toggle');
+    intermediateCert = document.querySelector('[data-test-masked-input]').innerText;
+    await page.form.back();
+    await settled();
+    await page.visit({ backend: intermediatePath });
+    await settled();
+    await page.form.setSignedIntermediateBtn().signedIntermediate(intermediateCert);
+    await settled();
+    await page.form.submit();
+    await settled();
+    assert.dom('[data-test-go-replace-ca]').exists();
+  });
+});
diff --git a/ui/tests/acceptance/settings/configure-secret-backends/pki/section-crl-test.js b/ui/tests/acceptance/settings/configure-secret-backends/pki/section-crl-test.js
new file mode 100644
index 0000000000000..ccbfe2ff496a1
--- /dev/null
+++ b/ui/tests/acceptance/settings/configure-secret-backends/pki/section-crl-test.js
@@ -0,0 +1,28 @@
+import { currentRouteName, settled } from '@ember/test-helpers';
+import { module, test } from 'qunit';
+import { setupApplicationTest } from 'ember-qunit';
+import page from 'vault/tests/pages/settings/configure-secret-backends/pki/section';
+import authPage from 'vault/tests/pages/auth';
+import enablePage from 'vault/tests/pages/settings/mount-secret-backend';
+
+module('Acceptance | settings/configure/secrets/pki/crl', function (hooks) {
+  setupApplicationTest(hooks);
+
+  hooks.beforeEach(function () {
+    return authPage.login();
+  });
+
+  test('it saves crl config', async function (assert) {
+    const path = `pki-${new Date().getTime()}`;
+    await enablePage.enable('pki', path);
+    await settled();
+    await page.visit({ backend: path, section: 'crl' });
+    await settled();
+    assert.equal(currentRouteName(), 'vault.cluster.settings.configure-secret-backend.section');
+    await page.form.fillInUnit('h');
+    await page.form.fillInValue(3);
+    await page.form.submit();
+    await settled();
+    assert.equal(page.lastMessage, 'The crl config for this backend has been updated.');
+  });
+});
diff --git a/ui/tests/acceptance/settings/configure-secret-backends/pki/section-tidy-test.js b/ui/tests/acceptance/settings/configure-secret-backends/pki/section-tidy-test.js
new file mode 100644
index 0000000000000..fd38d67701352
--- /dev/null
+++ b/ui/tests/acceptance/settings/configure-secret-backends/pki/section-tidy-test.js
@@ -0,0 +1,28 @@
+import { currentRouteName, settled } from '@ember/test-helpers';
+import { module, test } from 'qunit';
+import { setupApplicationTest } from 'ember-qunit';
+import page from 'vault/tests/pages/settings/configure-secret-backends/pki/section';
+import authPage from 'vault/tests/pages/auth';
+import enablePage from 'vault/tests/pages/settings/mount-secret-backend';
+
+module('Acceptance | settings/configure/secrets/pki/tidy', function (hooks) {
+  setupApplicationTest(hooks);
+
+  hooks.beforeEach(function () {
+    return authPage.login();
+  });
+
+  test('it saves tidy config', async function (assert) {
+    const path = `pki-${new Date().getTime()}`;
+    await enablePage.enable('pki', path);
+    await settled();
+    await page.visit({ backend: path, section: 'tidy' });
+    await settled();
+    assert.equal(currentRouteName(), 'vault.cluster.settings.configure-secret-backend.section');
+    await page.form.fields.objectAt(0).clickLabel();
+
+    await page.form.submit();
+    await settled();
+    assert.equal(page.lastMessage, 'The tidy config for this backend has been updated.');
+  });
+});
diff --git a/ui/tests/acceptance/settings/configure-secret-backends/pki/section-urls-test.js b/ui/tests/acceptance/settings/configure-secret-backends/pki/section-urls-test.js
new file mode 100644
index 0000000000000..b70d1b8d2a2ca
--- /dev/null
+++ b/ui/tests/acceptance/settings/configure-secret-backends/pki/section-urls-test.js
@@ -0,0 +1,33 @@
+import { currentRouteName, settled, find, waitUntil } from '@ember/test-helpers';
+import { module, test } from 'qunit';
+import { setupApplicationTest } from 'ember-qunit';
+import page from 'vault/tests/pages/settings/configure-secret-backends/pki/section';
+import authPage from 'vault/tests/pages/auth';
+import enablePage from 'vault/tests/pages/settings/mount-secret-backend';
+
+module('Acceptance | settings/configure/secrets/pki/urls', function (hooks) {
+  setupApplicationTest(hooks);
+
+  hooks.beforeEach(function () {
+    return authPage.login();
+  });
+
+  test('it saves urls config', async function (assert) {
+    const path = `pki-${new Date().getTime()}`;
+    await enablePage.enable('pki', path);
+    await settled();
+    await page.visit({ backend: path, section: 'urls' });
+    await settled();
+    assert.equal(currentRouteName(), 'vault.cluster.settings.configure-secret-backend.section');
+
+    await page.form.fields.objectAt(0).textarea('foo').change();
+    await page.form.submit();
+    await waitUntil(() => find('[data-test-error]'));
+    assert.ok(page.form.hasError, 'shows error on invalid input');
+
+    await page.form.fields.objectAt(0).textarea('foo.example.com').change();
+    await page.form.submit();
+    await settled();
+    assert.equal(page.lastMessage, 'The urls config for this backend has been updated.');
+  });
+});
diff --git a/ui/tests/acceptance/settings/mount-secret-backend-test.js b/ui/tests/acceptance/settings/mount-secret-backend-test.js
index a853d31722a08..ee81798e4c97d 100644
--- a/ui/tests/acceptance/settings/mount-secret-backend-test.js
+++ b/ui/tests/acceptance/settings/mount-secret-backend-test.js
@@ -1,13 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { currentRouteName, currentURL, settled } from '@ember/test-helpers';
+import { currentRouteName, settled } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
-import { v4 as uuidv4 } from 'uuid';
-
 import { create } from 'ember-cli-page-object';
 import page from 'vault/tests/pages/settings/mount-secret-backend';
 import configPage from 'vault/tests/pages/secrets/backend/configuration';
@@ -15,7 +8,6 @@ import authPage from 'vault/tests/pages/auth';
 import consoleClass from 'vault/tests/pages/components/console/ui-panel';
 import logout from 'vault/tests/pages/logout';
 import mountSecrets from 'vault/tests/pages/settings/mount-secret-backend';
-import { allEngines } from 'vault/helpers/mountable-secret-engines';
 
 const consoleComponent = create(consoleClass);
 
@@ -23,23 +15,20 @@ module('Acceptance | settings/mount-secret-backend', function (hooks) {
   setupApplicationTest(hooks);
 
   hooks.beforeEach(function () {
-    this.uid = uuidv4();
-    this.calcDays = (hours) => {
-      const days = Math.floor(hours / 24);
-      const remainder = hours % 24;
-      return `${days} days ${remainder} hours`;
-    };
     return authPage.login();
   });
 
   test('it sets the ttl correctly when mounting', async function (assert) {
     // always force the new mount to the top of the list
-    const path = `mount-kv-${this.uid}`;
+    const path = `kv-${new Date().getTime()}`;
     const defaultTTLHours = 100;
     const maxTTLHours = 300;
+    const defaultTTLSeconds = defaultTTLHours * 60 * 60;
+    const maxTTLSeconds = maxTTLHours * 60 * 60;
+
     await page.visit();
 
-    assert.strictEqual(currentRouteName(), 'vault.cluster.settings.mount-secret-backend');
+    assert.equal(currentRouteName(), 'vault.cluster.settings.mount-secret-backend');
     await page.selectType('kv');
     await page
       .next()
@@ -53,60 +42,33 @@ module('Acceptance | settings/mount-secret-backend', function (hooks) {
       .maxTTLVal(maxTTLHours)
       .submit();
     await configPage.visit({ backend: path });
-    assert.strictEqual(configPage.defaultTTL, `${this.calcDays(defaultTTLHours)}`, 'shows the proper TTL');
-    assert.strictEqual(configPage.maxTTL, `${this.calcDays(maxTTLHours)}`, 'shows the proper max TTL');
+    assert.equal(configPage.defaultTTL, defaultTTLSeconds, 'shows the proper TTL');
+    assert.equal(configPage.maxTTL, maxTTLSeconds, 'shows the proper max TTL');
   });
 
   test('it sets the ttl when enabled then disabled', async function (assert) {
     // always force the new mount to the top of the list
-    const path = `mount-kv-${this.uid}`;
+    const path = `kv-${new Date().getTime()}`;
     const maxTTLHours = 300;
+    const maxTTLSeconds = maxTTLHours * 60 * 60;
 
     await page.visit();
 
-    assert.strictEqual(currentRouteName(), 'vault.cluster.settings.mount-secret-backend');
+    assert.equal(currentRouteName(), 'vault.cluster.settings.mount-secret-backend');
     await page.selectType('kv');
     await page
       .next()
       .path(path)
       .toggleOptions()
       .enableDefaultTtl()
+      .enableDefaultTtl()
       .enableMaxTtl()
       .maxTTLUnit('h')
       .maxTTLVal(maxTTLHours)
       .submit();
     await configPage.visit({ backend: path });
-    assert.strictEqual(
-      configPage.defaultTTL,
-      '0',
-      'shows 0 (with no seconds) which means using the system default TTL'
-    ); // https://developer.hashicorp.com/vault/api-docs/system/mounts#default_lease_ttl-1
-    assert.strictEqual(configPage.maxTTL, `${this.calcDays(maxTTLHours)}`, 'shows the proper max TTL');
-  });
-
-  test('it sets the max ttl after pki chosen, resets after', async function (assert) {
-    await page.visit();
-    assert.strictEqual(currentRouteName(), 'vault.cluster.settings.mount-secret-backend');
-    await page.selectType('pki');
-    await page.next();
-    assert.dom('[data-test-input="maxLeaseTtl"]').exists();
-    assert
-      .dom('[data-test-input="maxLeaseTtl"] [data-test-ttl-toggle]')
-      .isChecked('Toggle is checked by default');
-    assert.dom('[data-test-input="maxLeaseTtl"] [data-test-ttl-value]').hasValue('3650');
-    assert.dom('[data-test-input="maxLeaseTtl"] [data-test-select="ttl-unit"]').hasValue('d');
-
-    // Go back and choose a different type
-    await page.back();
-    await page.selectType('database');
-    await page.next();
-    assert.dom('[data-test-input="maxLeaseTtl"]').exists('3650');
-    assert
-      .dom('[data-test-input="maxLeaseTtl"] [data-test-ttl-toggle]')
-      .isNotChecked('Toggle is unchecked by default');
-    await page.enableMaxTtl();
-    assert.dom('[data-test-input="maxLeaseTtl"] [data-test-ttl-value]').hasValue('');
-    assert.dom('[data-test-input="maxLeaseTtl"] [data-test-select="ttl-unit"]').hasValue('s');
+    assert.equal(configPage.defaultTTL, 0, 'shows the proper TTL');
+    assert.equal(configPage.maxTTL, maxTTLSeconds, 'shows the proper max TTL');
   });
 
   test('it throws error if setting duplicate path name', async function (assert) {
@@ -119,7 +81,7 @@ module('Acceptance | settings/mount-secret-backend', function (hooks) {
 
     await page.visit();
 
-    assert.strictEqual(currentRouteName(), 'vault.cluster.settings.mount-secret-backend');
+    assert.equal(currentRouteName(), 'vault.cluster.settings.mount-secret-backend');
     await page.selectType('kv');
     await page.next().path(path).submit();
     await page.secretList();
@@ -128,17 +90,17 @@ module('Acceptance | settings/mount-secret-backend', function (hooks) {
     await page.selectType('kv');
     await page.next().path(path).submit();
     assert.dom('[data-test-alert-banner="alert"]').containsText(`path is already in use at ${path}`);
-    assert.strictEqual(currentRouteName(), 'vault.cluster.settings.mount-secret-backend');
+    assert.equal(currentRouteName(), 'vault.cluster.settings.mount-secret-backend');
 
     await page.secretList();
     await settled();
     assert
-      .dom(`[data-test-auth-backend-link=${path}]`)
+      .dom(`[data-test-secret-backend-row=${path}]`)
       .exists({ count: 1 }, 'renders only one instance of the engine');
   });
 
   test('version 2 with no update to config endpoint still allows mount of secret engine', async function (assert) {
-    const enginePath = `kv-noUpdate-${this.uid}`;
+    let enginePath = `kv-noUpdate-${new Date().getTime()}`;
     const V2_POLICY = `
       path "${enginePath}/*" {
         capabilities = ["list","create","read","sudo","delete"]
@@ -153,10 +115,6 @@ module('Acceptance | settings/mount-secret-backend', function (hooks) {
       {
         capabilities = ["read"]
       }
-      # Allow page to load after mount
-      path "sys/internal/ui/mounts/${enginePath}" {
-        capabilities = ["read"]
-      }
     `;
     await consoleComponent.runCommands([
       // delete any previous mount with same name
@@ -165,7 +123,7 @@ module('Acceptance | settings/mount-secret-backend', function (hooks) {
       'write -field=client_token auth/token/create policies=kv-v2-degrade',
     ]);
     await settled();
-    const userToken = consoleComponent.lastLogOutput;
+    let userToken = consoleComponent.lastLogOutput;
     await logout.visit();
     await authPage.login(userToken);
     // create the engine
@@ -178,29 +136,8 @@ module('Acceptance | settings/mount-secret-backend', function (hooks) {
       .containsText(
         `You do not have access to the config endpoint. The secret engine was mounted, but the configuration settings were not saved.`
       );
-    assert.strictEqual(
-      currentURL(),
-      `/vault/secrets/${enginePath}/list`,
-      'After mounting, redirects to secrets list page'
-    );
     await configPage.visit({ backend: enginePath });
     await settled();
     assert.dom('[data-test-row-value="Maximum number of versions"]').hasText('Not set');
   });
-
-  test('it should transition to engine route on success if defined in mount config', async function (assert) {
-    await consoleComponent.runCommands([
-      // delete any previous mount with same name
-      `delete sys/mounts/kubernetes`,
-    ]);
-    await mountSecrets.visit();
-    await mountSecrets.selectType('kubernetes');
-    await mountSecrets.next().path('kubernetes').submit();
-    const { engineRoute } = allEngines().findBy('type', 'kubernetes');
-    assert.strictEqual(
-      currentRouteName(),
-      `vault.cluster.secrets.backend.${engineRoute}`,
-      'Transitions to engine route on mount success'
-    );
-  });
 });
diff --git a/ui/tests/acceptance/sidebar-nav-test.js b/ui/tests/acceptance/sidebar-nav-test.js
deleted file mode 100644
index f68c99563f325..0000000000000
--- a/ui/tests/acceptance/sidebar-nav-test.js
+++ /dev/null
@@ -1,122 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupApplicationTest } from 'ember-qunit';
-import { click, currentURL } from '@ember/test-helpers';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import authPage from 'vault/tests/pages/auth';
-import modifyPassthroughResponse from 'vault/mirage/helpers/modify-passthrough-response';
-
-const link = (label) => `[data-test-sidebar-nav-link="${label}"]`;
-const panel = (label) => `[data-test-sidebar-nav-panel="${label}"]`;
-
-module('Acceptance | sidebar navigation', function (hooks) {
-  setupApplicationTest(hooks);
-  setupMirage(hooks);
-
-  hooks.beforeEach(function () {
-    // set storage_type to raft to test link
-    this.server.get('/sys/seal-status', (schema, req) => {
-      return modifyPassthroughResponse(req, { storage_type: 'raft' });
-    });
-    this.server.get('/sys/storage/raft/configuration', () => this.server.create('configuration', 'withRaft'));
-
-    return authPage.login();
-  });
-
-  test('it should link to correct routes at the cluster level', async function (assert) {
-    assert.expect(10);
-
-    assert.dom(panel('Cluster')).exists('Cluster nav panel renders');
-
-    const subNavs = [
-      { label: 'Access', route: 'access' },
-      { label: 'Policies', route: 'policies/acl' },
-      { label: 'Tools', route: 'tools/wrap' },
-    ];
-
-    for (const subNav of subNavs) {
-      const { label, route } = subNav;
-      await click(link(label));
-      assert.strictEqual(currentURL(), `/vault/${route}`, `${label} route renders`);
-      assert.dom(panel(label)).exists(`${label} nav panel renders`);
-      await click(link('Back to main navigation'));
-    }
-
-    const links = [
-      { label: 'Raft Storage', route: '/vault/storage/raft' },
-      { label: 'Seal Vault', route: '/vault/settings/seal' },
-      { label: 'Secrets engines', route: '/vault/secrets' },
-    ];
-
-    for (const l of links) {
-      await click(link(l.label));
-      assert.strictEqual(currentURL(), l.route, `${l.label} route renders`);
-    }
-  });
-
-  test('it should link to correct routes at the access level', async function (assert) {
-    assert.expect(7);
-
-    await click(link('Access'));
-    assert.dom(panel('Access')).exists('Access nav panel renders');
-
-    const links = [
-      { label: 'Multi-factor authentication', route: '/vault/access/mfa' },
-      { label: 'OIDC provider', route: '/vault/access/oidc' },
-      { label: 'Groups', route: '/vault/access/identity/groups' },
-      { label: 'Entities', route: '/vault/access/identity/entities' },
-      { label: 'Leases', route: '/vault/access/leases/list' },
-      { label: 'Authentication methods', route: '/vault/access' },
-    ];
-
-    for (const l of links) {
-      await click(link(l.label));
-      assert.ok(currentURL().includes(l.route), `${l.label} route renders`);
-    }
-  });
-
-  test('it should link to correct routes at the policies level', async function (assert) {
-    assert.expect(2);
-
-    await click(link('Policies'));
-    assert.dom(panel('Policies')).exists('Access nav panel renders');
-
-    await click(link('ACL Policies'));
-    assert.strictEqual(currentURL(), '/vault/policies/acl', 'ACL Policies route renders');
-  });
-
-  test('it should link to correct routes at the tools level', async function (assert) {
-    assert.expect(7);
-
-    await click(link('Tools'));
-    assert.dom(panel('Tools')).exists('Access nav panel renders');
-
-    const links = [
-      { label: 'Wrap', route: '/vault/tools/wrap' },
-      { label: 'Lookup', route: '/vault/tools/lookup' },
-      { label: 'Unwrap', route: '/vault/tools/unwrap' },
-      { label: 'Rewrap', route: '/vault/tools/rewrap' },
-      { label: 'Random', route: '/vault/tools/random' },
-      { label: 'Hash', route: '/vault/tools/hash' },
-    ];
-
-    for (const l of links) {
-      await click(link(l.label));
-      assert.strictEqual(currentURL(), l.route, `${l.label} route renders`);
-    }
-  });
-
-  test('it should display access nav when mounting and configuring auth methods', async function (assert) {
-    await click(link('Access'));
-    await click('[data-test-auth-enable]');
-    assert.dom('[data-test-sidebar-nav-panel="Access"]').exists('Access nav panel renders');
-    await click(link('Authentication methods'));
-    await click('[data-test-auth-backend-link="token"]');
-    await click('[data-test-configure-link]');
-    assert.dom('[data-test-sidebar-nav-panel="Access"]').exists('Access nav panel renders');
-  });
-});
diff --git a/ui/tests/acceptance/ssh-test.js b/ui/tests/acceptance/ssh-test.js
index 461349fd5382a..d69d2671c4d0a 100644
--- a/ui/tests/acceptance/ssh-test.js
+++ b/ui/tests/acceptance/ssh-test.js
@@ -1,13 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { click, fillIn, findAll, currentURL, find, settled, waitUntil } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
-import { v4 as uuidv4 } from 'uuid';
-
 import authPage from 'vault/tests/pages/auth';
 import enablePage from 'vault/tests/pages/settings/mount-secret-backend';
 
@@ -15,7 +8,6 @@ module('Acceptance | ssh secret backend', function (hooks) {
   setupApplicationTest(hooks);
 
   hooks.beforeEach(function () {
-    this.uid = uuidv4();
     return authPage.login();
   });
 
@@ -39,16 +31,12 @@ module('Acceptance | ssh secret backend', function (hooks) {
       },
       assertBeforeGenerate(assert) {
         assert.dom('[data-test-form-field-from-model]').exists('renders the FormFieldFromModel');
-        const value = document.querySelector('[data-test-ttl-value="TTL"]').value;
+        let value = document.querySelector('[data-test-ttl-value="TTL"]').value;
         // confirms that the actions are correctly being passed down to the FormFieldFromModel component
-        assert.strictEqual(value, '30', 'renders action updateTtl');
+        assert.equal(value, '30', 'renders action updateTtl');
       },
       assertAfterGenerate(assert, sshPath) {
-        assert.strictEqual(
-          currentURL(),
-          `/vault/secrets/${sshPath}/sign/${this.name}`,
-          'ca sign url is correct'
-        );
+        assert.equal(currentURL(), `/vault/secrets/${sshPath}/sign/${this.name}`, 'ca sign url is correct');
         assert.dom('[data-test-row-label="Signed key"]').exists({ count: 1 }, 'renders the signed key');
         assert
           .dom('[data-test-row-value="Signed key"]')
@@ -70,7 +58,7 @@ module('Acceptance | ssh secret backend', function (hooks) {
         await fillIn('[data-test-input="ip"]', '1.2.3.4');
       },
       assertAfterGenerate(assert, sshPath) {
-        assert.strictEqual(
+        assert.equal(
           currentURL(),
           `/vault/secrets/${sshPath}/credentials/${this.name}`,
           'otp credential url is correct'
@@ -83,8 +71,9 @@ module('Acceptance | ssh secret backend', function (hooks) {
     },
   ];
   test('ssh backend', async function (assert) {
-    assert.expect(28);
-    const sshPath = `ssh-${this.uid}`;
+    assert.expect(26);
+    const now = new Date().getTime();
+    const sshPath = `ssh-${now}`;
 
     await enablePage.enable('ssh', sshPath);
     await settled();
@@ -92,7 +81,7 @@ module('Acceptance | ssh secret backend', function (hooks) {
 
     await click('[data-test-secret-backend-configure]');
 
-    assert.strictEqual(currentURL(), `/vault/settings/secrets/configure/${sshPath}`);
+    assert.equal(currentURL(), `/vault/settings/secrets/configure/${sshPath}`);
     assert.ok(findAll('[data-test-ssh-configure-form]').length, 'renders the empty configuration form');
 
     // default has generate CA checked so we just submit the form
@@ -104,9 +93,9 @@ module('Acceptance | ssh secret backend', function (hooks) {
     );
     await click('[data-test-backend-view-link]');
 
-    assert.strictEqual(currentURL(), `/vault/secrets/${sshPath}/list`, `redirects to ssh index`);
+    assert.equal(currentURL(), `/vault/secrets/${sshPath}/list`, `redirects to ssh index`);
 
-    for (const role of ROLES) {
+    for (let role of ROLES) {
       // create a role
       await click('[ data-test-secret-create]');
 
@@ -123,7 +112,7 @@ module('Acceptance | ssh secret backend', function (hooks) {
       // save the role
       await click('[data-test-role-ssh-create]');
       await waitUntil(() => currentURL() === `/vault/secrets/${sshPath}/show/${role.name}`); // flaky without this
-      assert.strictEqual(
+      assert.equal(
         currentURL(),
         `/vault/secrets/${sshPath}/show/${role.name}`,
         `${role.type}: navigates to the show page on creation`
@@ -153,7 +142,7 @@ module('Acceptance | ssh secret backend', function (hooks) {
 
       await click('[data-test-secret-generate-cancel]');
 
-      assert.strictEqual(
+      assert.equal(
         currentURL(),
         `/vault/secrets/${sshPath}/list`,
         `${role.type}: cancel takes you to ssh index`
@@ -164,13 +153,17 @@ module('Acceptance | ssh secret backend', function (hooks) {
       );
 
       //and delete
-      await click(`[data-test-secret-link="${role.name}"] [data-test-popup-menu-trigger]`);
-      await waitUntil(() => find('[data-test-ssh-role-delete]')); // flaky without
-      await click(`[data-test-ssh-role-delete]`);
-      await click(`[data-test-confirm-button]`);
-      assert
-        .dom(`[data-test-secret-link="${role.name}"]`)
-        .doesNotExist(`${role.type}: role is no longer in the list`);
+      // TODO confirmed functionality works, but it can not find the data-test-ssh-role-delete in time.
+      // await click(`[data-test-secret-link="${role.name}"] [data-test-popup-menu-trigger]`);
+      // await settled();
+      // await click(`[data-test-ssh-role-delete]`);
+      // await settled();
+      // await click(`[data-test-confirm-button]`);
+
+      // await settled();
+      // assert
+      //   .dom(`[data-test-secret-link="${role.name}"]`)
+      //   .doesNotExist(`${role.type}: role is no longer in the list`);
     }
   });
 });
diff --git a/ui/tests/acceptance/tools-test.js b/ui/tests/acceptance/tools-test.js
index 6ed46e33e7f38..fb2740f424b71 100644
--- a/ui/tests/acceptance/tools-test.js
+++ b/ui/tests/acceptance/tools-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { click, fillIn, find, findAll, currentURL, visit, settled, waitUntil } from '@ember/test-helpers';
 import Pretender from 'pretender';
 import { module, test } from 'qunit';
@@ -10,7 +5,6 @@ import { setupApplicationTest } from 'ember-qunit';
 import { toolsActions } from 'vault/helpers/tools-actions';
 import authPage from 'vault/tests/pages/auth';
 import logout from 'vault/tests/pages/logout';
-import { capitalize } from '@ember/string';
 
 module('Acceptance | tools', function (hooks) {
   setupApplicationTest(hooks);
@@ -30,7 +24,7 @@ module('Acceptance | tools', function (hooks) {
   data-test-tools-input="wrapping-token"
   data-test-tools-input="rewrapped-token"
   data-test-tools="token-lookup-row"
-  data-test-sidebar-nav-link=supportedAction
+  data-test-tools-action-link=supportedAction
   */
 
   var createTokenStore = () => {
@@ -48,9 +42,9 @@ module('Acceptance | tools', function (hooks) {
     var tokenStore = createTokenStore();
     await visit('/vault/tools');
 
-    assert.strictEqual(currentURL(), '/vault/tools/wrap', 'forwards to the first action');
+    assert.equal(currentURL(), '/vault/tools/wrap', 'forwards to the first action');
     TOOLS_ACTIONS.forEach((action) => {
-      assert.dom(`[data-test-sidebar-nav-link="${capitalize(action)}"]`).exists(`${action} link renders`);
+      assert.dom(`[data-test-tools-action-link="${action}"]`).exists(`${action} link renders`);
     });
 
     const { CodeMirror } = await waitUntil(() => find('.CodeMirror'));
@@ -65,7 +59,7 @@ module('Acceptance | tools', function (hooks) {
       .hasValue(wrappedToken.value, 'has a wrapping token');
 
     //lookup
-    await click('[data-test-sidebar-nav-link="Lookup"]');
+    await click('[data-test-tools-action-link="lookup"]');
 
     await fillIn('[data-test-tools-input="wrapping-token"]', tokenStore.get());
     await click('[data-test-tools-submit]');
@@ -76,7 +70,7 @@ module('Acceptance | tools', function (hooks) {
     assert.dom(rows[2]).hasText(/Creation TTL/, 'show creation ttl row');
 
     //rewrap
-    await click('[data-test-sidebar-nav-link="Rewrap"]');
+    await click('[data-test-tools-action-link="rewrap"]');
 
     await fillIn('[data-test-tools-input="wrapping-token"]', tokenStore.get());
     await click('[data-test-tools-submit]');
@@ -87,7 +81,7 @@ module('Acceptance | tools', function (hooks) {
     await settled();
 
     //unwrap
-    await click('[data-test-sidebar-nav-link="Unwrap"]');
+    await click('[data-test-tools-action-link="unwrap"]');
 
     await fillIn('[data-test-tools-input="wrapping-token"]', tokenStore.get());
     await click('[data-test-tools-submit]');
@@ -102,7 +96,7 @@ module('Acceptance | tools', function (hooks) {
     assert.dom('.CodeMirror').exists();
 
     //random
-    await click('[data-test-sidebar-nav-link="Random"]');
+    await click('[data-test-tools-action-link="random"]');
 
     assert.dom('[data-test-tools-input="bytes"]').hasValue('32', 'defaults to 32 bytes');
     await click('[data-test-tools-submit]');
@@ -110,7 +104,7 @@ module('Acceptance | tools', function (hooks) {
     assert.ok(randomBytes.value, 'shows the returned value of random bytes');
 
     //hash
-    await click('[data-test-sidebar-nav-link="Hash"]');
+    await click('[data-test-tools-action-link="hash"]');
 
     await fillIn('[data-test-tools-input="hash-input"]', 'foo');
     await click('[data-test-transit-b64-toggle="input"]');
@@ -159,7 +153,7 @@ module('Acceptance | tools', function (hooks) {
     await visit('/vault/tools');
 
     //unwrap
-    await click('[data-test-sidebar-nav-link="Unwrap"]');
+    await click('[data-test-tools-action-link="unwrap"]');
 
     await fillIn('[data-test-tools-input="wrapping-token"]', 'sometoken');
     await click('[data-test-tools-submit]');
diff --git a/ui/tests/acceptance/transit-test.js b/ui/tests/acceptance/transit-test.js
index 98202f5a3fe4a..fdc0f49fd89b0 100644
--- a/ui/tests/acceptance/transit-test.js
+++ b/ui/tests/acceptance/transit-test.js
@@ -1,13 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { click, fillIn, find, currentURL, settled, visit, waitUntil, findAll } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
-import { v4 as uuidv4 } from 'uuid';
-
 import { encodeString } from 'vault/utils/b64';
 import authPage from 'vault/tests/pages/auth';
 import enablePage from 'vault/tests/pages/settings/mount-secret-backend';
@@ -96,8 +89,8 @@ const keyTypes = [
   },
 ];
 
-const generateTransitKey = async function (key, now) {
-  const name = key.name(now);
+let generateTransitKey = async function (key, now) {
+  let name = key.name(now);
   await click('[data-test-secret-create]');
 
   await fillIn('[data-test-transit-key-name]', name);
@@ -149,7 +142,7 @@ const testConvergentEncryption = async function (assert, keyName) {
 
       assertAfterDecrypt: (key) => {
         assert.dom('.modal.is-active').exists(`${key}: Modal opens after decrypt`);
-        assert.strictEqual(
+        assert.equal(
           find('[data-test-encrypted-value="plaintext"]').innerText,
           'NaXud2QW7KjyK6Me9ggh+zmnCeBGdG93LQED49PtoOI=',
           `${key}: the ui shows the base64-encoded plaintext`
@@ -177,7 +170,7 @@ const testConvergentEncryption = async function (assert, keyName) {
       },
       assertAfterDecrypt: (key) => {
         assert.dom('.modal.is-active').exists(`${key}: Modal opens after decrypt`);
-        assert.strictEqual(
+        assert.equal(
           find('[data-test-encrypted-value="plaintext"]').innerText,
           'NaXud2QW7KjyK6Me9ggh+zmnCeBGdG93LQED49PtoOI=',
           `${key}: the ui shows the base64-encoded plaintext`
@@ -205,7 +198,7 @@ const testConvergentEncryption = async function (assert, keyName) {
       },
       assertAfterDecrypt: (key) => {
         assert.dom('.modal.is-active').exists(`${key}: Modal opens after decrypt`);
-        assert.strictEqual(
+        assert.equal(
           find('[data-test-encrypted-value="plaintext"]').innerText,
           encodeString('This is the secret'),
           `${key}: the ui decodes plaintext`
@@ -234,7 +227,7 @@ const testConvergentEncryption = async function (assert, keyName) {
       },
       assertAfterDecrypt: (key) => {
         assert.dom('.modal.is-active').exists(`${key}: Modal opens after decrypt`);
-        assert.strictEqual(
+        assert.equal(
           find('[data-test-encrypted-value="plaintext"]').innerText,
           encodeString('There are many secrets 🤐'),
           `${key}: the ui decodes plaintext`
@@ -243,7 +236,7 @@ const testConvergentEncryption = async function (assert, keyName) {
     },
   ];
 
-  for (const testCase of tests) {
+  for (let testCase of tests) {
     await click('[data-test-transit-action-link="encrypt"]');
 
     find('#plaintext-control .CodeMirror').CodeMirror.setValue(testCase.plaintext);
@@ -289,29 +282,30 @@ const testConvergentEncryption = async function (assert, keyName) {
 };
 module('Acceptance | transit', function (hooks) {
   setupApplicationTest(hooks);
+  let path;
+  let now;
 
   hooks.beforeEach(async function () {
-    const uid = uuidv4();
     await authPage.login();
     await settled();
-    this.uid = uid;
-    this.path = `transit-${uid}`;
+    now = new Date().getTime();
+    path = `transit-${now}`;
 
-    await enablePage.enable('transit', `transit-${uid}`);
+    await enablePage.enable('transit', path);
     await settled();
   });
 
   test(`transit backend: list menu`, async function (assert) {
-    await generateTransitKey(keyTypes[0], this.uid);
+    await generateTransitKey(keyTypes[0], now);
     await secretListPage.secrets.objectAt(0).menuToggle();
     await settled();
-    assert.strictEqual(secretListPage.menuItems.length, 2, 'shows 2 items in the menu');
+    assert.equal(secretListPage.menuItems.length, 2, 'shows 2 items in the menu');
   });
-  for (const key of keyTypes) {
+  for (let key of keyTypes) {
     test(`transit backend: ${key.type}`, async function (assert) {
       assert.expect(key.convergent ? 43 : 7);
-      const name = await generateTransitKey(key, this.uid);
-      await visit(`vault/secrets/${this.path}/show/${name}`);
+      let name = await generateTransitKey(key, now);
+      await visit(`vault/secrets/${path}/show/${name}`);
 
       const expectedRotateValue = key.autoRotate ? '30 days' : 'Key will not be automatically rotated';
       assert
@@ -334,7 +328,7 @@ module('Acceptance | transit', function (hooks) {
       await click('[data-test-transit-key-actions-link]');
 
       assert.ok(
-        currentURL().startsWith(`/vault/secrets/${this.path}/show/${name}?tab=actions`),
+        currentURL().startsWith(`/vault/secrets/${path}/show/${name}?tab=actions`),
         `${name}: navigates to transit actions`
       );
 
diff --git a/ui/tests/acceptance/unseal-test.js b/ui/tests/acceptance/unseal-test.js
index 8663224ef9b2d..a1a8f67c089c0 100644
--- a/ui/tests/acceptance/unseal-test.js
+++ b/ui/tests/acceptance/unseal-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { click, currentRouteName, currentURL, fillIn, settled, visit } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
@@ -27,7 +22,7 @@ module('Acceptance | unseal', function (hooks) {
   test('seal then unseal', async function (assert) {
     await visit('/vault/settings/seal');
 
-    assert.strictEqual(currentURL(), '/vault/settings/seal');
+    assert.equal(currentURL(), '/vault/settings/seal');
 
     // seal
     await click('[data-test-seal] button');
@@ -36,7 +31,7 @@ module('Acceptance | unseal', function (hooks) {
 
     await pollCluster(this.owner);
     await settled();
-    assert.strictEqual(currentURL(), '/vault/unseal', 'vault is on the unseal page');
+    assert.equal(currentURL(), '/vault/unseal', 'vault is on the unseal page');
 
     // unseal
     for (const key of unsealKeys) {
@@ -49,6 +44,6 @@ module('Acceptance | unseal', function (hooks) {
     }
 
     assert.dom('[data-test-cluster-status]').doesNotExist('ui does not show sealed warning');
-    assert.strictEqual(currentRouteName(), 'vault.cluster.auth', 'vault is ready to authenticate');
+    assert.equal(currentRouteName(), 'vault.cluster.auth', 'vault is ready to authenticate');
   });
 });
diff --git a/ui/tests/acceptance/wrapped-token-test.js b/ui/tests/acceptance/wrapped-token-test.js
index fe6b7f1cc5fbd..53b026605ab5e 100644
--- a/ui/tests/acceptance/wrapped-token-test.js
+++ b/ui/tests/acceptance/wrapped-token-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
 import { settled, currentURL, visit } from '@ember/test-helpers';
@@ -26,7 +21,7 @@ const setupWrapping = async () => {
   await settled();
   await auth.tokenInput('root').submit();
   await settled();
-  const token = await wrappedAuth();
+  let token = await wrappedAuth();
   await auth.logout();
   await settled();
   return token;
@@ -36,17 +31,17 @@ module('Acceptance | wrapped_token query param functionality', function (hooks)
   setupMirage(hooks);
 
   test('it authenticates you if the query param is present', async function (assert) {
-    const token = await setupWrapping();
+    let token = await setupWrapping();
     await auth.visit({ wrapped_token: token });
     await settled();
-    assert.strictEqual(currentURL(), '/vault/secrets', 'authenticates and redirects to home');
+    assert.equal(currentURL(), '/vault/secrets', 'authenticates and redirects to home');
   });
 
   test('it authenticates when used with the with=token query param', async function (assert) {
-    const token = await setupWrapping();
+    let token = await setupWrapping();
     await auth.visit({ wrapped_token: token, with: 'token' });
     await settled();
-    assert.strictEqual(currentURL(), '/vault/secrets', 'authenticates and redirects to home');
+    assert.equal(currentURL(), '/vault/secrets', 'authenticates and redirects to home');
   });
 
   test('it should authenticate when hitting logout url with wrapped_token when logged out', async function (assert) {
diff --git a/ui/tests/helpers/.gitkeep b/ui/tests/helpers/.gitkeep
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/ui/tests/helpers/clients.js b/ui/tests/helpers/clients.js
index 1f463ac0c8a0c..f2f9dbcaa18bd 100644
--- a/ui/tests/helpers/clients.js
+++ b/ui/tests/helpers/clients.js
@@ -1,8 +1,4 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
+import { addMonths, differenceInCalendarMonths, formatRFC3339, startOfMonth } from 'date-fns';
 import { Response } from 'miragejs';
 
 /** Scenarios
@@ -22,21 +18,20 @@ import { Response } from 'miragejs';
   License start date this month
 */
 export const SELECTORS = {
-  dashboardActiveTab: '.active[data-test-dashboard]',
+  currentMonthActiveTab: '.active[data-test-current-month]',
+  historyActiveTab: '.active[data-test-history]',
   emptyStateTitle: '[data-test-empty-state-title]',
   usageStats: '[data-test-usage-stats]',
   dateDisplay: '[data-test-date-display]',
   attributionBlock: '[data-test-clients-attribution]',
   filterBar: '[data-test-clients-filter-bar]',
-  rangeDropdown: '[data-test-calendar-widget-trigger]',
+  rangeDropdown: '[data-test-popup-menu-trigger]',
   monthDropdown: '[data-test-popup-menu-trigger="month"]',
   yearDropdown: '[data-test-popup-menu-trigger="year"]',
   dateDropdownSubmit: '[data-test-date-dropdown-submit]',
   runningTotalMonthStats: '[data-test-running-total="single-month-stats"]',
   runningTotalMonthlyCharts: '[data-test-running-total="monthly-charts"]',
   monthlyUsageBlock: '[data-test-monthly-usage]',
-  selectedAuthMount: 'div#auth-method-search-select [data-test-selected-option] div',
-  selectedNs: 'div#namespace-search-select [data-test-selected-option] div',
 };
 
 export const CHART_ELEMENTS = {
@@ -79,3 +74,187 @@ export function overrideResponse(httpStatus, data) {
   }
   return new Response(200, { 'Content-Type': 'application/json' }, JSON.stringify(data));
 }
+
+function generateNamespaceBlock(idx = 0, skipMounts = false) {
+  let mountCount = 1;
+  const nsBlock = {
+    namespace_id: `${idx}UUID`,
+    namespace_path: `${idx}/namespace`,
+    counts: {
+      clients: mountCount * 15,
+      entity_clients: mountCount * 5,
+      non_entity_clients: mountCount * 10,
+      distinct_entities: mountCount * 5,
+      non_entity_tokens: mountCount * 10,
+    },
+  };
+  if (!skipMounts) {
+    mountCount = Math.floor((Math.random() + idx) * 20);
+    let mounts = [];
+    Array.from(Array(mountCount)).forEach((v, index) => {
+      mounts.push({
+        mount_path: `auth/authid${index}`,
+        counts: {
+          clients: 5,
+          entity_clients: 3,
+          non_entity_clients: 2,
+          distinct_entities: 3,
+          non_entity_tokens: 2,
+        },
+      });
+    });
+    nsBlock.mounts = mounts;
+  }
+  return nsBlock;
+}
+
+function generateCounts(max, arrayLength) {
+  function randomBetween(min, max) {
+    return Math.floor(Math.random() * (max - min + 1) + min);
+  }
+  var result = [];
+  var sum = 0;
+  for (var i = 0; i < arrayLength - 1; i++) {
+    result[i] = randomBetween(1, max - (arrayLength - i - 1) - sum);
+    sum += result[i];
+  }
+  result[arrayLength - 1] = max - sum;
+  return result.sort((a, b) => b - a);
+}
+
+function generateMonths(startDate, endDate, hasNoData = false) {
+  let numberOfMonths = differenceInCalendarMonths(endDate, startDate) + 1;
+  let months = [];
+
+  for (let i = 0; i < numberOfMonths; i++) {
+    if (hasNoData) {
+      months.push({
+        timestamp: formatRFC3339(startOfMonth(addMonths(startDate, i))),
+        counts: null,
+        namespace: null,
+        new_clients: null,
+      });
+      continue;
+    }
+    const namespaces = Array.from(Array(5)).map((v, idx) => {
+      return generateNamespaceBlock(idx);
+    });
+    const clients = numberOfMonths * 5 + i * 5;
+    const [entity_clients, non_entity_clients] = generateCounts(clients, 2);
+    const counts = {
+      clients,
+      entity_clients,
+      non_entity_clients,
+      distinct_entities: entity_clients,
+      non_entity_tokens: non_entity_clients,
+    };
+    const new_counts = 5 + i;
+    const [new_entity, new_non_entity] = generateCounts(new_counts, 2);
+    months.push({
+      timestamp: formatRFC3339(startOfMonth(addMonths(startDate, i))),
+      counts,
+      namespaces,
+      new_clients: {
+        counts: {
+          distinct_entities: new_entity,
+          entity_clients: new_entity,
+          non_entity_tokens: new_non_entity,
+          non_entity_clients: new_non_entity,
+          clients: new_counts,
+        },
+        namespaces,
+      },
+    });
+  }
+  return months;
+}
+
+export function generateActivityResponse(nsCount = 1, startDate, endDate) {
+  if (nsCount === 0) {
+    return {
+      request_id: 'some-activity-id',
+      data: {
+        start_time: formatRFC3339(startDate),
+        end_time: formatRFC3339(endDate),
+        total: {
+          clients: 0,
+          entity_clients: 0,
+          non_entity_clients: 0,
+        },
+        by_namespace: [
+          {
+            namespace_id: `root`,
+            namespace_path: '',
+            counts: {
+              entity_clients: 0,
+              non_entity_clients: 0,
+              clients: 0,
+            },
+          },
+        ],
+        months: generateMonths(startDate, endDate, false),
+      },
+    };
+  }
+  let namespaces = Array.from(Array(nsCount)).map((v, idx) => {
+    return generateNamespaceBlock(idx);
+  });
+  return {
+    request_id: 'some-activity-id',
+    data: {
+      start_time: formatRFC3339(startDate),
+      end_time: formatRFC3339(endDate),
+      total: {
+        clients: 999,
+        entity_clients: 666,
+        non_entity_clients: 333,
+      },
+      by_namespace: namespaces,
+      months: generateMonths(startDate, endDate),
+    },
+  };
+}
+
+export function generateCurrentMonthResponse(namespaceCount, skipMounts = false, configEnabled = true) {
+  if (!configEnabled) {
+    return {
+      data: { id: 'no-data' },
+    };
+  }
+  if (!namespaceCount) {
+    return {
+      request_id: 'monthly-response-id',
+      data: {
+        by_namespace: [],
+        clients: 0,
+        distinct_entities: 0,
+        entity_clients: 0,
+        non_entity_clients: 0,
+        non_entity_tokens: 0,
+        months: [],
+      },
+    };
+  }
+  // generate by_namespace data
+  const by_namespace = Array.from(Array(namespaceCount)).map((ns, idx) =>
+    generateNamespaceBlock(idx, skipMounts)
+  );
+  const counts = by_namespace.reduce(
+    (prev, curr) => {
+      return {
+        clients: prev.clients + curr.counts.clients,
+        entity_clients: prev.entity_clients + curr.counts.entity_clients,
+        non_entity_clients: prev.non_entity_clients + curr.counts.non_entity_clients,
+      };
+    },
+    { clients: 0, entity_clients: 0, non_entity_clients: 0 }
+  );
+  return {
+    request_id: 'monthly-response-id',
+    data: {
+      by_namespace,
+      ...counts,
+      months: [],
+    },
+  };
+}
diff --git a/ui/tests/helpers/codemirror.js b/ui/tests/helpers/codemirror.js
index 0c01c77e3d806..71b5f38bd057f 100644
--- a/ui/tests/helpers/codemirror.js
+++ b/ui/tests/helpers/codemirror.js
@@ -1,19 +1,14 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 const invariant = (truthy, error) => {
   if (!truthy) throw new Error(error);
 };
 
 export default function (context, selector) {
-  const cmService = context.owner.lookup('service:code-mirror');
+  let cmService = context.owner.lookup('service:code-mirror');
 
-  const element = document.querySelector(selector);
+  let element = document.querySelector(selector);
   invariant(element, `Selector ${selector} matched no elements`);
 
-  const cm = cmService.instanceFor(element.id);
+  let cm = cmService.instanceFor(element.id);
   invariant(cm, `No registered CodeMirror instance for ${selector}`);
 
   return cm;
diff --git a/ui/tests/helpers/components/sidebar-nav.js b/ui/tests/helpers/components/sidebar-nav.js
deleted file mode 100644
index 34abfec9db55c..0000000000000
--- a/ui/tests/helpers/components/sidebar-nav.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import { allFeatures } from 'vault/helpers/all-features';
-import sinon from 'sinon';
-
-export const stubFeaturesAndPermissions = (owner, isEnterprise = false, setCluster = false) => {
-  const permissions = owner.lookup('service:permissions');
-  sinon.stub(permissions, 'hasNavPermission').returns(true);
-  sinon.stub(permissions, 'navPathParams');
-
-  const version = owner.lookup('service:version');
-  sinon.stub(version, 'features').value(allFeatures());
-  sinon.stub(version, 'isEnterprise').value(isEnterprise);
-
-  const auth = owner.lookup('service:auth');
-  sinon.stub(auth, 'authData').value({});
-
-  if (setCluster) {
-    owner.lookup('service:currentCluster').setCluster({
-      id: 'foo',
-      anyReplicationEnabled: true,
-      usingRaft: true,
-    });
-  }
-};
diff --git a/ui/tests/helpers/components/ttl-picker.js b/ui/tests/helpers/components/ttl-picker.js
index a6000227dbd0b..5ab52efee499b 100644
--- a/ui/tests/helpers/components/ttl-picker.js
+++ b/ui/tests/helpers/components/ttl-picker.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 const selectors = {
   ttlFormGroup: '[data-test-ttl-inputs]',
   toggle: '[data-test-ttl-toggle]',
diff --git a/ui/tests/helpers/flash-message.js b/ui/tests/helpers/flash-message.js
index f98432d4e46b6..56646e876660a 100644
--- a/ui/tests/helpers/flash-message.js
+++ b/ui/tests/helpers/flash-message.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import FlashObject from 'ember-cli-flash/flash/object';
 
 FlashObject.reopen({ init() {} });
diff --git a/ui/tests/helpers/index.js b/ui/tests/helpers/index.js
deleted file mode 100644
index a223051d6ae33..0000000000000
--- a/ui/tests/helpers/index.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import {
-  setupApplicationTest as upstreamSetupApplicationTest,
-  setupRenderingTest as upstreamSetupRenderingTest,
-  setupTest as upstreamSetupTest,
-} from 'ember-qunit';
-
-// This file exists to provide wrappers around ember-qunit's / ember-mocha's
-// test setup functions. This way, you can easily extend the setup that is
-// needed per test type.
-
-function setupApplicationTest(hooks, options) {
-  upstreamSetupApplicationTest(hooks, options);
-
-  // Additional setup for application tests can be done here.
-  //
-  // For example, if you need an authenticated session for each
-  // application test, you could do:
-  //
-  // hooks.beforeEach(async function () {
-  //   await authenticateSession(); // ember-simple-auth
-  // });
-  //
-  // This is also a good place to call test setup functions coming
-  // from other addons:
-  //
-  // setupIntl(hooks); // ember-intl
-  // setupMirage(hooks); // ember-cli-mirage
-}
-
-function setupRenderingTest(hooks, options) {
-  upstreamSetupRenderingTest(hooks, options);
-
-  // Additional setup for rendering tests can be done here.
-}
-
-function setupTest(hooks, options) {
-  upstreamSetupTest(hooks, options);
-
-  // Additional setup for unit tests can be done here.
-}
-
-export { setupApplicationTest, setupRenderingTest, setupTest };
diff --git a/ui/tests/helpers/kubernetes/overview.js b/ui/tests/helpers/kubernetes/overview.js
deleted file mode 100644
index 49b647b309ea8..0000000000000
--- a/ui/tests/helpers/kubernetes/overview.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-export const SELECTORS = {
-  rolesCardTitle: '[data-test-selectable-card="Roles"] .title',
-  rolesCardSubTitle: '[data-test-selectable-card-container="Roles"] p',
-  rolesCardLink: '[data-test-selectable-card="Roles"] a',
-  rolesCardNumRoles: '[data-test-roles-card-overview-num]',
-  generateCredentialsCardTitle: '[data-test-selectable-card="Generate credentials"] .title',
-  generateCredentialsCardSubTitle: '[data-test-selectable-card-container="Generate credentials"] p',
-  generateCredentialsCardButton: '[data-test-generate-credential-button]',
-  emptyStateTitle: '.empty-state .empty-state-title',
-  emptyStateMessage: '.empty-state .empty-state-message',
-  emptyStateActionText: '.empty-state .empty-state-actions',
-};
diff --git a/ui/tests/helpers/mirage-to-models.js b/ui/tests/helpers/mirage-to-models.js
index cf7576a494a37..23009a080cbed 100644
--- a/ui/tests/helpers/mirage-to-models.js
+++ b/ui/tests/helpers/mirage-to-models.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { getContext } from '@ember/test-helpers';
 
 export default (data) => {
diff --git a/ui/tests/helpers/noop-all-api-requests.js b/ui/tests/helpers/noop-all-api-requests.js
index fbf0dd2785833..ba93c0dd70de7 100644
--- a/ui/tests/helpers/noop-all-api-requests.js
+++ b/ui/tests/helpers/noop-all-api-requests.js
@@ -1,23 +1,20 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Pretender from 'pretender';
-import { noopStub } from './stubs';
 
-/**
- * DEPRECATED prefer to use `setupMirage` along with stubs in vault/tests/helpers/stubs
- */
+const noop = (response) => {
+  return function () {
+    return [response, { 'Content-Type': 'application/json' }, JSON.stringify({})];
+  };
+};
+
 export default function (options = { usePassthrough: false }) {
   return new Pretender(function () {
-    let fn = noopStub();
+    let fn = noop();
     if (options.usePassthrough) {
       fn = this.passthrough;
     }
     this.post('/v1/**', fn);
     this.put('/v1/**', fn);
     this.get('/v1/**', fn);
-    this.delete('/v1/**', fn || noopStub(204));
+    this.delete('/v1/**', fn || noop(204));
   });
 }
diff --git a/ui/tests/helpers/oidc-config.js b/ui/tests/helpers/oidc-config.js
index 03ae0d2a2100a..5b6c94c6c6449 100644
--- a/ui/tests/helpers/oidc-config.js
+++ b/ui/tests/helpers/oidc-config.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { Response } from 'miragejs';
 
 export const OIDC_BASE_URL = `/vault/access/oidc`;
diff --git a/ui/tests/helpers/oidc-window-stub.js b/ui/tests/helpers/oidc-window-stub.js
index 17d7fb07d6bcc..f318da4cfedd8 100644
--- a/ui/tests/helpers/oidc-window-stub.js
+++ b/ui/tests/helpers/oidc-window-stub.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import EmberObject, { computed } from '@ember/object';
 import Evented from '@ember/object/evented';
 
diff --git a/ui/tests/helpers/pki.js b/ui/tests/helpers/pki.js
index c91dbaebd97de..f0aeac38bfb1c 100644
--- a/ui/tests/helpers/pki.js
+++ b/ui/tests/helpers/pki.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export const SELECTORS = {
   caChain: '[data-test-value-div="CA chain"] [data-test-masked-input]',
   certificate: '[data-test-value-div="Certificate"] [data-test-masked-input]',
diff --git a/ui/tests/helpers/pki/overview.js b/ui/tests/helpers/pki/overview.js
deleted file mode 100644
index 78329cd9f3f25..0000000000000
--- a/ui/tests/helpers/pki/overview.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-export const SELECTORS = {
-  issuersCardTitle: '[data-test-selectable-card-container="Issuers"] h3',
-  issuersCardSubtitle: '[data-test-selectable-card-container="Issuers"] p',
-  issuersCardLink: '[data-test-selectable-card-container="Issuers"] a',
-  issuersCardOverviewNum: '[data-test-selectable-card-container="Issuers"] .title-number',
-  rolesCardTitle: '[data-test-selectable-card-container="Roles"] h3',
-  rolesCardSubtitle: '[data-test-selectable-card-container="Roles"] p',
-  rolesCardLink: '[data-test-selectable-card-container="Roles"] a',
-  rolesCardOverviewNum: '[data-test-selectable-card-container="Roles"] .title-number',
-  issueCertificate: '[data-test-selectable-card-container="Issue certificate"] h3',
-  issueCertificateInput: '[data-test-issue-certificate-input]',
-  issueCertificatePowerSearch: '[data-test-issue-certificate-input] span',
-  issueCertificateButton: '[data-test-issue-certificate-button]',
-  viewCertificate: '[data-test-selectable-card-container="View certificate"] h3',
-  viewCertificateInput: '[data-test-view-certificate-input]',
-  viewCertificatePowerSearch: '[data-test-view-certificate-input] span',
-  viewCertificateButton: '[data-test-view-certificate-button]',
-  viewIssuerInput: '[data-test-issue-issuer-input]',
-  viewIssuerPowerSearch: '[data-test-issue-issuer-input] span',
-  viewIssuerButton: '[data-test-view-issuer-button]',
-  firstPowerSelectOption: '[data-option-index="0"]',
-};
diff --git a/ui/tests/helpers/pki/page/pki-configuration-edit.js b/ui/tests/helpers/pki/page/pki-configuration-edit.js
deleted file mode 100644
index f7f4c3efeda7f..0000000000000
--- a/ui/tests/helpers/pki/page/pki-configuration-edit.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-export const SELECTORS = {
-  errorBanner: '[data-test-error-banner]',
-  acmeEditSection: '[data-test-acme-edit-section]',
-  configEditSection: '[data-test-cluster-config-edit-section]',
-  configInput: (attr) => `[data-test-input="${attr}"]`,
-  stringListInput: (attr) => `[data-test-input="${attr}"] [data-test-string-list-input="0"]`,
-  urlsEditSection: '[data-test-urls-edit-section]',
-  urlFieldInput: (attr) => `[data-test-input="${attr}"] textarea`,
-  urlFieldLabel: (attr) => `[data-test-input="${attr}"] label`,
-  crlEditSection: '[data-test-crl-edit-section]',
-  crlToggleInput: (attr) => `[data-test-input="${attr}"] input`,
-  crlTtlInput: (attr) => `[data-test-ttl-value="${attr}"]`,
-  crlFieldLabel: (attr) => `[data-test-input="${attr}"] label`,
-  saveButton: '[data-test-configuration-edit-save]',
-  cancelButton: '[data-test-configuration-edit-cancel]',
-  validationAlert: '[data-test-configuration-edit-validation-alert]',
-  deleteButton: (attr) => `[data-test-input="${attr}"] [data-test-string-list-button="delete"]`,
-  groupHeader: (group) => `[data-test-crl-header="${group}"]`,
-  checkboxInput: (attr) => `[data-test-input="${attr}"]`,
-};
diff --git a/ui/tests/helpers/pki/page/pki-keys.js b/ui/tests/helpers/pki/page/pki-keys.js
deleted file mode 100644
index fbbd9c1f82265..0000000000000
--- a/ui/tests/helpers/pki/page/pki-keys.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-export const SELECTORS = {
-  // key index
-  importKey: '[data-test-pki-key-import]',
-  generateKey: '[data-test-pki-key-generate]',
-  keyId: '[data-test-key="id"]',
-  keyName: '[data-test-key="name"]',
-  popupMenuTrigger: '[data-test-popup-menu-trigger]',
-  popupMenuDetails: '[data-test-key-menu-link="details"]',
-  popupMenuEdit: '[data-test-key-menu-link="edit"]',
-  // key details
-  title: '[data-test-key-details-title]',
-  keyIdValue: '[data-test-value-div="Key ID"]',
-  keyNameValue: '[data-test-value-div="Key name"]',
-  keyTypeValue: '[data-test-value-div="Key type"]',
-  keyBitsValue: '[data-test-value-div="Key bits"]',
-  keyDeleteButton: '[data-test-pki-key-delete] button',
-  downloadButton: '[data-test-download-button]',
-  keyEditLink: '[data-test-pki-key-edit]',
-  confirmDelete: '[data-test-confirm-button]',
-};
diff --git a/ui/tests/helpers/pki/page/pki-role-details.js b/ui/tests/helpers/pki/page/pki-role-details.js
deleted file mode 100644
index 88f5b48dc07e7..0000000000000
--- a/ui/tests/helpers/pki/page/pki-role-details.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-export const SELECTORS = {
-  issuerLabel: '[data-test-row-label="Issuer"]',
-  noStoreValue: '[data-test-value-div="Store in storage backend"]',
-  keyUsageValue: '[data-test-value-div="Key usage"]',
-  extKeyUsageValue: '[data-test-value-div="Ext key usage"]',
-  customTtlValue: '[data-test-value-div="Issued certificates expire after"]',
-};
diff --git a/ui/tests/helpers/pki/page/pki-tidy-form.js b/ui/tests/helpers/pki/page/pki-tidy-form.js
deleted file mode 100644
index 1a877f50a6a69..0000000000000
--- a/ui/tests/helpers/pki/page/pki-tidy-form.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-export const SELECTORS = {
-  tidyFormName: (attr) => `[data-test-tidy-form="${attr}"]`,
-  inputByAttr: (attr) => `[data-test-input="${attr}"]`,
-  toggleInput: (attr) => `[data-test-input="${attr}"] input`,
-  intervalDuration: '[data-test-ttl-value="Automatic tidy enabled"]',
-  acmeAccountSafetyBuffer: '[data-test-ttl-value="Tidy ACME enabled"]',
-  toggleLabel: (label) => `[data-test-toggle-label="${label}"]`,
-  tidySectionHeader: (header) => `[data-test-tidy-header="${header}"]`,
-  tidySave: '[data-test-pki-tidy-button]',
-  tidyCancel: '[data-test-pki-tidy-cancel]',
-  tidyPauseDuration: '[data-test-ttl-value="Pause duration"]',
-  editAutoTidyButton: '[data-test-pki-edit-tidy-auto-link]',
-};
diff --git a/ui/tests/helpers/pki/page/pki-tidy.js b/ui/tests/helpers/pki/page/pki-tidy.js
deleted file mode 100644
index 783efc8d60080..0000000000000
--- a/ui/tests/helpers/pki/page/pki-tidy.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-import { SELECTORS as TIDY_FORM } from './pki-tidy-form';
-
-export const SELECTORS = {
-  hdsAlertTitle: '[data-test-hds-alert-title]',
-  hdsAlertDescription: '[data-test-hds-alert-description]',
-  alertUpdatedAt: '[data-test-hds-alert-updated-at]',
-  cancelTidyAction: '[data-test-cancel-tidy-action]',
-  hdsAlertButtonText: '[data-test-cancel-tidy-action] .hds-button__text',
-  timeStartedRow: '[data-test-value-div="Time started"]',
-  timeFinishedRow: '[data-test-value-div="Time finished"]',
-  cancelTidyModalBackground: '[data-test-modal-background="Cancel tidy?"]',
-  tidyEmptyStateConfigure: '[data-test-tidy-empty-state-configure]',
-  manualTidyToolbar: '[data-test-pki-manual-tidy-config]',
-  autoTidyToolbar: '[data-test-pki-auto-tidy-config]',
-  tidyConfigureModal: {
-    configureTidyModal: '[data-test-modal-background="Tidy this mount"]',
-    tidyModalAutoButton: '[data-test-tidy-modal-auto-button]',
-    tidyModalManualButton: '[data-test-tidy-modal-manual-button]',
-    tidyModalCancelButton: '[data-test-tidy-modal-cancel-button]',
-    tidyOptionsModal: '[data-test-pki-tidy-options-modal]',
-  },
-  tidyEmptyState: '[data-test-component="empty-state"]',
-  tidyForm: {
-    ...TIDY_FORM,
-  },
-};
diff --git a/ui/tests/helpers/pki/pki-configure-create.js b/ui/tests/helpers/pki/pki-configure-create.js
deleted file mode 100644
index 374ffddecd6dc..0000000000000
--- a/ui/tests/helpers/pki/pki-configure-create.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { SELECTORS as GENERATE_ROOT } from './pki-generate-root';
-
-export const SELECTORS = {
-  // page::pki-configure-create
-  breadcrumbContainer: '[data-test-breadcrumbs]',
-  title: '[data-test-pki-engine-page-title]',
-  option: '[data-test-pki-config-option]',
-  optionByKey: (key) => `[data-test-pki-config-option="${key}"]`,
-  cancelButton: '[data-test-pki-config-cancel]',
-  saveButton: '[data-test-pki-config-save]',
-  doneButton: '[data-test-done]',
-  configureButton: '[data-test-configure-pki-button]',
-  // pki-generate-root
-  ...GENERATE_ROOT,
-  generateRootOption: '[data-test-pki-config-option="generate-root"]',
-  // pki-ca-cert-import
-  importForm: '[data-test-pki-import-pem-bundle-form]',
-  importSubmit: '[data-test-pki-import-pem-bundle]',
-  importSectionLabel: '[data-test-import-section-label]',
-  importMapping: '[data-test-imported-bundle-mapping]',
-  importedIssuer: '[data-test-imported-issuer]',
-  importedKey: '[data-test-imported-key]',
-  // generate-intermediate
-  csrDetails: '[data-test-generate-csr-result]',
-};
diff --git a/ui/tests/helpers/pki/pki-delete-all-issuers.js b/ui/tests/helpers/pki/pki-delete-all-issuers.js
deleted file mode 100644
index 397f71a38774f..0000000000000
--- a/ui/tests/helpers/pki/pki-delete-all-issuers.js
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-export const SELECTORS = {
-  issuerLink: '[data-test-delete-all-issuers-link]',
-  deleteAllIssuerModal: '[data-test-modal-background="Delete All Issuers?"]',
-  deleteAllIssuerInput: '[data-test-confirmation-modal-input="Delete All Issuers?"]',
-  deleteAllIssuerButton: '[data-test-confirm-button="Delete All Issuers?"]',
-};
diff --git a/ui/tests/helpers/pki/pki-generate-root.js b/ui/tests/helpers/pki/pki-generate-root.js
deleted file mode 100644
index 4e16f72c2cf8b..0000000000000
--- a/ui/tests/helpers/pki/pki-generate-root.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-export const SELECTORS = {
-  mainSectionTitle: '[data-test-generate-root-title="Root parameters"]',
-  urlSectionTitle: '[data-test-generate-root-title="Issuer URLs"]',
-  keyParamsGroupToggle: '[data-test-toggle-group="Key parameters"]',
-  sanGroupToggle: '[data-test-toggle-group="Subject Alternative Name (SAN) Options"]',
-  additionalGroupToggle: '[data-test-toggle-group="Additional subject fields"]',
-  toggleGroupDescription: '[data-test-toggle-group-description]',
-  formField: '[data-test-field]',
-  typeField: '[data-test-input="type"]',
-  inputByName: (name) => `[data-test-input="${name}"]`,
-  fieldByName: (name) => `[data-test-field="${name}"]`,
-  generateRootSave: '[data-test-pki-generate-root-save]',
-  generateRootCancel: '[data-test-pki-generate-root-cancel]',
-  generateRootCommonNameField: '[data-test-input="commonName"]',
-  generateRootIssuerNameField: '[data-test-input="issuerName"]',
-  formInvalidError: '[data-test-pki-generate-root-validation-error]',
-  urlsSection: '[data-test-urls-section]',
-  urlField: '[data-test-urls-section] [data-test-input]',
-  // Shown values after save
-  saved: {
-    certificate: '[data-test-value-div="Certificate"] [data-test-masked-input]',
-    commonName: '[data-test-row-value="Common name"]',
-    issuerName: '[data-test-row-value="Issuer name"]',
-    issuerLink: '[data-test-value-div="Issuer ID"] a',
-    keyName: '[data-test-row-value="Key name"]',
-    keyLink: '[data-test-value-div="Key ID"] a',
-    privateKey: '[data-test-value-div="Private key"] [data-test-masked-input]',
-    serialNumber: '[data-test-row-value="Serial number"]',
-  },
-};
diff --git a/ui/tests/helpers/pki/pki-issuer-cross-sign.js b/ui/tests/helpers/pki/pki-issuer-cross-sign.js
deleted file mode 100644
index 86700e9301387..0000000000000
--- a/ui/tests/helpers/pki/pki-issuer-cross-sign.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { SELECTORS as CONFIGURE } from './pki-configure-create';
-import { SELECTORS as DETAILS } from './pki-issuer-details';
-
-export const SELECTORS = {
-  objectListInput: (key, row = 0) => `[data-test-object-list-input="${key}-${row}"]`,
-  inputByName: (name) => `[data-test-input="${name}"]`,
-  addRow: '[data-test-object-list-add-button',
-  submitButton: '[data-test-cross-sign-submit]',
-  cancelButton: '[data-test-cross-sign-cancel]',
-  statusCount: '[data-test-cross-sign-status-count]',
-  signedIssuerRow: (row = 0) => `[data-test-info-table-row="${row}"]`,
-  signedIssuerCol: (attr) => `[data-test-info-table-column="${attr}"]`,
-  // for cross signing acceptance tests
-  configure: { ...CONFIGURE },
-  details: { ...DETAILS },
-  rowValue: (attr) => `[data-test-row-value="${attr}"]`,
-  copyButton: (attr) => `[data-test-value-div="${attr}"] [data-test-copy-button]`,
-};
diff --git a/ui/tests/helpers/pki/pki-issuer-details.js b/ui/tests/helpers/pki/pki-issuer-details.js
deleted file mode 100644
index 8235ac8755f9d..0000000000000
--- a/ui/tests/helpers/pki/pki-issuer-details.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-export const SELECTORS = {
-  configure: '[data-test-pki-issuer-configure]',
-  crossSign: '[data-test-pki-issuer-cross-sign]',
-  defaultGroup: '[data-test-details-group="default"]',
-  download: '[data-test-issuer-download]',
-  groupTitle: '[data-test-group-title]',
-  parsingAlertBanner: '[data-test-parsing-error-alert-banner]',
-  rotateModal: '[data-test-modal-background="Rotate this root"]',
-  rotateModalGenerate: '[data-test-root-rotate-step-one]',
-  rotateRoot: '[data-test-pki-issuer-rotate-root]',
-  row: '[data-test-component="info-table-row"]',
-  signIntermediate: '[data-test-pki-issuer-sign-int]',
-  urlsGroup: '[data-test-details-group="Issuer URLs"]',
-  valueByName: (name) => `[data-test-value-div="${name}"]`,
-};
diff --git a/ui/tests/helpers/pki/pki-key-form.js b/ui/tests/helpers/pki/pki-key-form.js
deleted file mode 100644
index 71ecd80afafe1..0000000000000
--- a/ui/tests/helpers/pki/pki-key-form.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-export const SELECTORS = {
-  keyCreateButton: '[data-test-pki-key-save]',
-  keyCancelButton: '[data-test-pki-key-cancel]',
-  keyNameInput: '[data-test-input="keyName"]',
-  typeInput: '[data-test-input="type"]',
-  keyTypeInput: '[data-test-input="keyType"]',
-  keyBitsInput: '[data-test-input="keyBits"]',
-  validationError: '[data-test-pki-key-validation-error]',
-  fieldErrorByName: (name) => `[data-test-field-validation="${name}"]`,
-};
diff --git a/ui/tests/helpers/pki/pki-not-valid-after-form.js b/ui/tests/helpers/pki/pki-not-valid-after-form.js
deleted file mode 100644
index 6a22272f7aa72..0000000000000
--- a/ui/tests/helpers/pki/pki-not-valid-after-form.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-export const SELECTORS = {
-  radioTtl: '[data-test-radio-button="ttl"]',
-  radioTtlLabel: '[data-test-radio-label="ttl"]',
-  radioDate: '[data-test-radio-button="not_after"]',
-  radioDateLabel: '[data-test-radio-label="specificDate"]',
-  ttlForm: '[data-test-ttl-inputs]',
-  ttlTimeInput: '[data-test-ttl-value="TTL"]',
-  ttlUnitInput: '[data-test-select="ttl-unit"]',
-  dateInput: '[data-test-input="not_after"]',
-};
diff --git a/ui/tests/helpers/pki/pki-role-form.js b/ui/tests/helpers/pki/pki-role-form.js
deleted file mode 100644
index 605ee22d6109f..0000000000000
--- a/ui/tests/helpers/pki/pki-role-form.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-export const PKI_BASE_URL = `/vault/cluster/secrets/backend/pki/roles`;
-
-export const SELECTORS = {
-  roleName: '[data-test-input="name"]',
-  issuerRef: '[data-test-input="issuerRef"]',
-  issuerRefSelect: '[data-test-select="issuerRef"]',
-  issuerRefToggle: '[data-test-toggle-label="issuerRef-toggle"]',
-  customTtl: '[data-test-field="customTtl"]',
-  backdateValidity: '[data-test-ttl-value="Backdate validity"]',
-  maxTtl: '[data-test-toggle-label="Max TTL"]',
-  generateLease: '[data-test-field="generateLease"]',
-  noStore: '[data-test-field="noStore"]',
-  addBasicConstraints: '[data-test-input="addBasicConstraints"]',
-  domainHandling: '[data-test-toggle-group="Domain handling"]',
-  keyParams: '[data-test-toggle-group="Key parameters"]',
-  keyType: '[data-test-input="keyType"]',
-  keyBits: '[data-test-input="keyBits"]',
-  signatureBits: '[data-test-input="signatureBits"]',
-  keyUsage: '[data-test-toggle-group="Key usage"]',
-  extKeyUsageOids: '[data-test-input="extKeyUsageOids"]',
-  digitalSignature: '[data-test-checkbox="DigitalSignature"]',
-  keyAgreement: '[data-test-checkbox="KeyAgreement"]',
-  keyEncipherment: '[data-test-checkbox="KeyEncipherment"]',
-  any: '[data-test-checkbox="Any"]',
-  serverAuth: '[data-test-checkbox="ServerAuth"]',
-  policyIdentifiers: '[data-test-toggle-group="Policy identifiers"]',
-  san: '[data-test-toggle-group="Subject Alternative Name (SAN) Options"]',
-  additionalSubjectFields: '[data-test-toggle-group="Additional subject fields"]',
-  roleCreateButton: '[data-test-pki-role-save]',
-  roleCancelButton: '[data-test-pki-role-cancel]',
-};
diff --git a/ui/tests/helpers/pki/pki-role-generate.js b/ui/tests/helpers/pki/pki-role-generate.js
deleted file mode 100644
index e7af1b2ebf557..0000000000000
--- a/ui/tests/helpers/pki/pki-role-generate.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-export const SELECTORS = {
-  form: '[data-test-pki-generate-cert-form]',
-  commonNameField: '[data-test-input="commonName"]',
-  optionsToggle: '[data-test-toggle-group="Subject Alternative Name (SAN) Options"]',
-  generateButton: '[data-test-pki-generate-button]',
-  cancelButton: '[data-test-pki-generate-cancel]',
-  downloadButton: '[data-test-pki-cert-download-button]',
-  revokeButton: '[data-test-pki-cert-revoke-button]',
-  serialNumber: '[data-test-value-div="Serial number"]',
-  certificate: '[data-test-value-div="Certificate"]',
-  inlineAlert: '[data-test-alert]',
-  commonNameInlineError: '[data-test-field="commonName"] [data-test-inline-alert]',
-  commonNameErrorBorder: '[data-test-input="commonName"]',
-};
diff --git a/ui/tests/helpers/pki/pki-run-commands.js b/ui/tests/helpers/pki/pki-run-commands.js
deleted file mode 100644
index c99748d62e161..0000000000000
--- a/ui/tests/helpers/pki/pki-run-commands.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import consoleClass from 'vault/tests/pages/components/console/ui-panel';
-import { create } from 'ember-cli-page-object';
-
-const consoleComponent = create(consoleClass);
-
-export const tokenWithPolicy = async function (name, policy) {
-  await consoleComponent.runCommands([
-    `write sys/policies/acl/${name} policy=${btoa(policy)}`,
-    `write -field=client_token auth/token/create policies=${name}`,
-  ]);
-  return consoleComponent.lastLogOutput;
-};
-
-export const runCommands = async function (commands) {
-  try {
-    await consoleComponent.runCommands(commands);
-    const res = consoleComponent.lastLogOutput;
-    if (res.includes('Error')) {
-      throw new Error(res);
-    }
-    return res;
-  } catch (error) {
-    // eslint-disable-next-line no-console
-    console.error(
-      `The following occurred when trying to run the command(s):\n ${commands.join('\n')} \n\n ${
-        consoleComponent.lastLogOutput
-      }`
-    );
-    throw error;
-  }
-};
diff --git a/ui/tests/helpers/pki/values.js b/ui/tests/helpers/pki/values.js
deleted file mode 100644
index 1c49bb5830d0b..0000000000000
--- a/ui/tests/helpers/pki/values.js
+++ /dev/null
@@ -1,182 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-// Expires Jan 10, 2033
-export const rootPem = `-----BEGIN CERTIFICATE-----
-MIIDezCCAmOgAwIBAgIUTBbQcZijQsmd0rjd6COikPsrGyowDQYJKoZIhvcNAQEL
-BQAwFDESMBAGA1UEAxMJdGVzdC1yb290MB4XDTIzMDEyMDE3NTcxMloXDTIzMDIy
-MTE3NTc0MlowFDESMBAGA1UEAxMJdGVzdC1yb290MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAlUHfvQLsocXtvwRCpTnXGzwMCD+3KKK7y1+SUCgpAD9Y
-RV2xLAbqh0iK3x2WI4+Pek1Ub6dYaWczzBob6wRq9iFB72uLPpbL8yRf+tc1egmP
-wwJQS9qidb1hcSi4p6x/JwOpr2v2PDqJPDoHrfaHeJgCuBGS00qUFH7oHQz9Usim
-lHjIbVNF3Qa1Hq2bgwkZmRjRn3Bez/xy3YEiQ41GTicUBqY4NAGWuS1LiHyEUW81
-iQ+1iGlbpuAL4H7lpKmrhv1xZXEsF9vNL6H0Y7kjjAImTQnmo+ozcArnKnwh2wmS
-f/TrVnN4RRc8dvN8P8nWvVsJYK/D40yc7YMljIESKQIDAQABo4HEMIHBMA4GA1Ud
-DwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBT6rcf5twb19wLL
-JjhPOVywd41d2jAfBgNVHSMEGDAWgBT6rcf5twb19wLLJjhPOVywd41d2jArBggr
-BgEFBQcBAQQfMB0wGwYIKwYBBQUHMAKGD2Z1bmZvcmVjYXN0LmNvbTAUBgNVHREE
-DTALggl0ZXN0LXJvb3QwGwYDVR0fBBQwEjAQoA6gDIYKZ29vZ2xlLmNvbTANBgkq
-hkiG9w0BAQsFAAOCAQEAjG7km+QsIuW7KNY3h8YHJZhdr+tIx57k9tUR4w1+d8QI
-t44FTdCYdN8n89lsFK9bONZatd0LY3qqcOARE2ni0Hg/zV9u8TTVKTKAOOx8zBd1
-TnwzhXb8mssqnXK9lcECexuWf/s5lkyHjcWOuzNVI0PohrX9tGZwdzsZEgH4Y49i
-o8I9DD+uBHknwByRLXSDmgggwgOYsyTg/IfYoHlLHDD3CaOpkCvUCZvM9bI7nrlx
-2GByQ/WDT4ArAHcf+Z1iaSIbV6WG6QWoPsu2/WKybcuN2fznaXtJMwgRl50BUv2h
-DU3c2oZTc0mPYGft6U8mVwLqfYTcEduGidTLAQPE5w==
------END CERTIFICATE-----`;
-
-export const issuerPemBundle = `
------BEGIN CERTIFICATE-----
-MIIDRTCCAi2gAwIBAgIUdKagCL6TnN5xLkwhPbNY8JEcY0YwDQYJKoZIhvcNAQEL
-BQAwGzEZMBcGA1UEAxMQd3d3LnRlc3QtaW50LmNvbTAeFw0yMzAxMDkxOTA1NTBa
-Fw0yMzAyMTAxOTA2MjBaMBsxGTAXBgNVBAMTEHd3dy50ZXN0LWludC5jb20wggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCfd5o9JfyRAXH+E1vE2U0xjSqs
-A/cxDqsDXRHBnNJvzAa+7gPKXCDQZbr6chjxLXpP6Bv2/O+dZHq1fo/f6q9PDDGW
-JYIluwbACpe7W1UB7q9xFkZg85yQsNYokGZlwv/AMGpFBxDwVlNGL+4fxvFTv7uF
-mIlDzSIPrzByyCrqAFMNNqNwlAerDt/C6DMZae/rTGXIXsTfUpxPy21bzkeA+70I
-YCV1ffK8UnAeBYNUJ+v8+XgTQ5KhRyQ+fscUkO3T2s6f3O9Q2sWxswkf2YmZB+V1
-cTZ5w6hqiuFdBXz7GRnACi1/gbWbaExQTJRplArFwIHka7dqJh8tYkXDjai3AgMB
-AAGjgYAwfjAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E
-FgQU68/xXIgvsleKkuA8clK/6YslB/IwHwYDVR0jBBgwFoAU68/xXIgvsleKkuA8
-clK/6YslB/IwGwYDVR0RBBQwEoIQd3d3LnRlc3QtaW50LmNvbTANBgkqhkiG9w0B
-AQsFAAOCAQEAWSff0BH3SJv/XqwN/flqc1CVzOios72/IJ+KBBv0AzFCZ8wJPi+c
-hH1bw7tqi01Bgh595TctogDFN1b6pjN+jrlIP4N+FF9Moj79Q+jHQMnuJomyPuI7
-i07vqUcxgSmvEBBWOWS+/vxe6TfWDg18nyPf127CWQN8IHTo1f/GavX+XmRve6XT
-EWoqcQshEk9i87oqCbaT7B40jgjTAd1r4Cc6P4s1fAGPt9e9eqMj13kTyVDNuCoD
-FSZYalrlkASpg+c9oDQIh2MikGQINXHv/zIEHOW93siKMWeA4ni6phHtMg/p5eJt
-SxnVZsSzj8QLy2uwX1AADR0QUvJzMxptyA==
------END CERTIFICATE-----
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAn3eaPSX8kQFx/hNbxNlNMY0qrAP3MQ6rA10RwZzSb8wGvu4D
-ylwg0GW6+nIY8S16T+gb9vzvnWR6tX6P3+qvTwwxliWCJbsGwAqXu1tVAe6vcRZG
-YPOckLDWKJBmZcL/wDBqRQcQ8FZTRi/uH8bxU7+7hZiJQ80iD68wcsgq6gBTDTaj
-cJQHqw7fwugzGWnv60xlyF7E31KcT8ttW85HgPu9CGAldX3yvFJwHgWDVCfr/Pl4
-E0OSoUckPn7HFJDt09rOn9zvUNrFsbMJH9mJmQfldXE2ecOoaorhXQV8+xkZwAot
-f4G1m2hMUEyUaZQKxcCB5Gu3aiYfLWJFw42otwIDAQABAoIBADC+vZ4Ne4vTtkWl
-Izsj9Y29Chs0xx3uzuWjUGcvib/0zOcWGICF8t3hCuu9btRiQ24jlFDGdnRVH5FV
-E6OtuFLgdlPgOU1RQzn2wvTZcT26+VQHLBI8xVIRTBVwNmzK06Sq6AEbrNjaenAM
-/KwoAuLHzAmFXAgmr0++DIA5oayPWyi5IoyFO7EoRv79Xz5LWfu5j8CKOFXmI5MT
-vEVYM6Gb2xHRa2Ng0SJ4VzwC09GcXlHKRAz+CubJuncvjbcM/EryvexozKkUq4XA
-KqGr9xxdZ4XDlo3Rj9S9P9JaOin0I1mwwz6p+iwMF0zr+/ldjE4oPBdB1PUgSJ7j
-2CZcS1kCgYEAwIZ3UsMIXqkMlkMz/7nu2sqzV3EgQjY5QRoz98ligKg4fhYKz+K4
-yXvJrRyLkwEBaPdLppCZbs4xsuuv3jiqUHV5n7sfpUA5HVKkKh6XY7jnszbqV732
-iB1mQVEjzM92/amew2hDKLGQDW0nglrg6uV+bx0Lnp6Glahr8NOAyk0CgYEA1Ar3
-jTqTkU+NQX7utlxx0HPVL//JH/erp/Gnq9fN8dZhK/yjwX5savUlNHpgePoXf1pE
-lgi21/INQsvp7O2AUKuj96k+jBHQ0SS58AQGFv8iNDkLE57N74vCO6+Xdi1rHj/Y
-7jglr00box/7SOmvb4SZz2o0jm0Ejsg2M0aBuRMCgYEAgTB6F34qOqMDgD1eQka5
-QfXs/Es8E1Ihf08e+jIXuC+poOoXnUINL56ySUizXBS7pnzzNbUoUFNqxB4laF/r
-4YvC7m15ocED0mpnIKBghBlK2VaLUA93xAS+XiwdcszwkuzkTUnEbyUfffL2JSHo
-dZdEDTmXV3wW4Ywfyn2Sma0CgYAeNNG/FLEg6iw9QE/ROqob/+RGyjFklGunqQ0x
-tbRo1xlQotTRI6leMz3xk91aXoYqZjmPBf7GFH0/Hr1cOxkkZM8e4MVAPul4Ybr7
-LheP/xhoSBgD24OKtGYfCoyRETdJP98vUGBN8LYXLt8lK+UKBeHDYmXKRE156ZuP
-AmRIcQKBgFvp+xMoyAsBeOlTjVDZ0mTnFh1yp8f7N3yXdHPpFShwjXjlqLmLO5RH
-mZAvaH0Ux/wCfvwHhdC46jBrs9S4zLBvj3+44NYOzvz2dBWP/5MuXgzFe30h9Yd0
-zUlyEaWm0jY2Ylzax8ECKRL0td2bv36vxOYtTax8MSB15szsnPJ+
------END RSA PRIVATE KEY-----
-`;
-
-export const csr = `-----BEGIN CERTIFICATE REQUEST-----
-MIICdDCCAVwCAQAwDjEMMAoGA1UEAxMDbG9sMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA4Dz2b/nAP/M6bqyk5mctqqYAAcoME//xPBy0wREHuZ776Pu4
-l45kDL3dPXiY8U2P9pn8WIr2KpLK6oWUfSsiG2P082bpWDL20UymkWqDhhrA4unf
-ZRq68UIDbcetlLw15YKnlNdvNZ7Qr8Se8KV0YGR/wFqI7QfS6VE3lhxZWEBUayI0
-egqOuDbXAcZTON1AZ92/F+WFSbc43iYdDk16XfAPFKhtvLr6zQQuzebAb7HG04Hc
-GhRskixxyJ8XY6XUplfsa1HcpUXE4f1GeUvq3g6ltVCSJ0p7qI9FFjV4t+DCLVVV
-LnwHUi9Vzz6i2wjMt7P6+gHR+RrOWBgRMn38fwIDAQABoCEwHwYJKoZIhvcNAQkO
-MRIwEDAOBgNVHREEBzAFggNsb2wwDQYJKoZIhvcNAQELBQADggEBAAm3AHQ1ctdV
-8HCrMOXGVLgI2cB1sFd6VYVxPBxIk812Y4wyO8Q6POE5VZNTIgMcSeIaFu5lgHNL
-Peeb54F+zEa+OJYkcWgCAX5mY/0HoML4p2bxFTSjllSpcX7ktjq4IEIY/LRpqSgc
-jgZHHRwanFfkeIOhN4Q5qJWgBPNhDAcNPE7T0M/4mxqYDqMSJvMYmC67hq1UOOug
-/QVDUDJRC1C0aDw9if+DbG/bt1V6HpMQhDIEUjzfu4zG8pcag3cJpOA8JhW1hnG0
-XA2ZOCA7s34/szr2FczXtIoKiYmv3UzPyO9/4mc0Q2+/nR4CG8NU9WW/XJCne9ID
-elRplAzrMF4=
------END CERTIFICATE REQUEST-----`;
-
-export const csr2 = `-----BEGIN CERTIFICATE REQUEST-----
-MIIChDCCAWwCAQAwFjEUMBIGA1UEAxMLZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCuW9C58M1wO0vdGmtLcJbbCkKyfsHJJae1j4LL
-xdGqs1j9UKD66UALSzZEeMCBdtTNNzThAgYJqCSA5swqpbRf6WZ3K/X7oHbfcrHi
-SAm8v/0QsJDF5Rphiy6wyggaoaHEsbSp83kYy9r+h48vFW5Dr8UvJTsp5kdRn31L
-bTHr56iqOaHQbu6hDj4Ompg/0OElPH1tV2X947o8timR+L89utZzR+d8x/eeTdPl
-H7TEkMEomRvt7NTRHGYRsm3Gzq4AA6PalzIxzwJrNgXfJDutNn/QwcVd5sImwYCO
-GaHsOvGfc02w+Vqqva9EOEQSr6B90kA+vc30I6uSiugzV9TFAgMBAAGgKTAnBgkq
-hkiG9w0BCQ4xGjAYMBYGA1UdEQQPMA2CC2V4YW1wbGUuY29tMA0GCSqGSIb3DQEB
-CwUAA4IBAQAjm6JTU7axU6TzLlXlOp7hZ4+nep2/8vvJ9EOXzL8x/qtTTizctdG9
-Op70gywoUxAS2tatwa4fmW9DbA2eGiLU+Ibj/5b0Veq5DQdp1Qg3MLBP/+AcM/7m
-rrgA9MhkpQahXCj4vXo6NeXYaTh6Jo/s8C9h3WxTD6ptDMiaPFcEuWcx0e3AjjH0
-pe7k9/MfB2wLfQ7+5wee/tCFWZN4tk8YfjQeQA1extXYKM/f8eu3Z/wjbbMOVpwb
-xst+VTY7X9T8cU/hjDEoNG677meI+W5MgiwX0rxTpoz991fqr3vp7PELYj3GMyii
-D1YfvqXieNij4UrduRqCXj1m8SVZlM+X
------END CERTIFICATE REQUEST-----`;
-
-export const componentPemBundle = `-----BEGIN CERTIFICATE-----
-MIIDGjCCAgKgAwIBAgIUFvnhb2nQ8+KNS3SzjlfYDMHGIRgwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAxMCZmEwHhcNMTgwMTEwMTg1NDI5WhcNMTgwMjExMTg1NDU5
-WjANMQswCQYDVQQDEwJmYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AN2VtBn6EMlA4aYre/xoKHxlgNDxJnfSQWfs6yF/K201qPnt4QF9AXChatbmcKVn
-OaURq+XEJrGVgF/u2lSos3NRZdhWVe8o3/sOetsGxcrd0gXAieOSmkqJjp27bYdl
-uY3WsxhyiPvdfS6xz39OehsK/YCB6qCzwB4eEfSKqbkvfDL9sLlAiOlaoHC9pczf
-6/FANKp35UDwInSwmq5vxGbnWk9zMkh5Jq6hjOWHZnVc2J8J49PYvkIM8uiHDgOE
-w71T2xM5plz6crmZnxPCOcTKIdF7NTEP2lUfiqc9lONV9X1Pi4UclLPHJf5bwTmn
-JaWgbKeY+IlF61/mgxzhC7cCAwEAAaNyMHAwDgYDVR0PAQH/BAQDAgEGMA8GA1Ud
-EwEB/wQFMAMBAf8wHQYDVR0OBBYEFLDtc6+HZN2lv60JSDAZq3+IHoq7MB8GA1Ud
-IwQYMBaAFLDtc6+HZN2lv60JSDAZq3+IHoq7MA0GA1UdEQQGMASCAmZhMA0GCSqG
-SIb3DQEBCwUAA4IBAQDVt6OddTV1MB0UvF5v4zL1bEB9bgXvWx35v/FdS+VGn/QP
-cC2c4ZNukndyHhysUEPdqVg4+up1aXm4eKXzNmGMY/ottN2pEhVEWQyoIIA1tH0e
-8Kv/bysYpHZKZuoGg5+mdlHS2p2Dh2bmYFyBLJ8vaeP83NpTs2cNHcmEvWh/D4UN
-UmYDODRN4qh9xYruKJ8i89iMGQfbdcq78dCC4JwBIx3bysC8oF4lqbTYoYNVTnAi
-LVqvLdHycEOMlqV0ecq8uMLhPVBalCmIlKdWNQFpXB0TQCsn95rCCdi7ZTsYk5zv
-Q4raFvQrZth3Cz/X5yPTtQL78oBYrmHzoQKDFJ2z
------END CERTIFICATE-----`;
-
-// for parse-pki-cert tests:
-// certificate contains all allowable params
-export const loadedCert = `-----BEGIN CERTIFICATE-----\nMIIE7TCCA9WgAwIBAgIULcrWXSz3/kG81EgBo0A4Zt+ZgkYwDQYJKoZIhvcNAQEL\nBQAwga0xDzANBgNVBAYTBkZyYW5jZTESMBAGA1UECBMJQ2hhbXBhZ25lMQ4wDAYD\nVQQHEwVQYXJpczETMBEGA1UECRMKMjM0IHNlc2FtZTEPMA0GA1UEERMGMTIzNDU2\nMQ8wDQYDVQQKEwZXaWRnZXQxEDAOBgNVBAsTB0ZpbmFuY2UxGDAWBgNVBAMTD2Nv\nbW1vbi1uYW1lLmNvbTETMBEGA1UEBRMKY2VyZWFsMTI5MjAeFw0yMzAyMDMxNzI3\nMzNaFw0yMzAzMDcxNzI4MDNaMIGtMQ8wDQYDVQQGEwZGcmFuY2UxEjAQBgNVBAgT\nCUNoYW1wYWduZTEOMAwGA1UEBxMFUGFyaXMxEzARBgNVBAkTCjIzNCBzZXNhbWUx\nDzANBgNVBBETBjEyMzQ1NjEPMA0GA1UEChMGV2lkZ2V0MRAwDgYDVQQLEwdGaW5h\nbmNlMRgwFgYDVQQDEw9jb21tb24tbmFtZS5jb20xEzARBgNVBAUTCmNlcmVhbDEy\nOTIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8NO7LXHp28SzOqmQv\nns4fGogKydEklWG4JEN3pM+k9nTyEgA8DFhtSLvcqF0cqhEydw4FVU+LEUGySUer\nmM4VNl9qglFBgmYE8TNgWkUw9ZP6MNgx13I8zXTXOIDj0iwXks02x8451oPbqqdq\nXsCc4vSP7BPwQOjc0C56c54zyRC1zFm9jlh+As0QinuYcjFjVabCku6JSYc4kunh\nz7derU9cURUxB5/ja9zC7jGS8tg4XUWdUkbj1O/krEWfjQx9Kj8aEU1gFfAvW/Bd\nIqgAlHATYN6i8HDmAmdGty9zLht9wUgnAtVh3lK3939h/rI0qCLV6N/RjCC7csnz\n9I67AgMBAAGjggEBMIH+MA4GA1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/\nAgERMB0GA1UdDgQWBBSSdKle0wMGy0jvPmcoDanGduhLqzAfBgNVHSMEGDAWgBSS\ndKle0wMGy0jvPmcoDanGduhLqzAuBgNVHR4BAf8EJDAioCAwDoIMZG5zbmFtZTEu\nY29tMA6CDGRzbm5hbWUyLmNvbTBoBgNVHREEYTBfoB0GCCsBBAEFCQIGoBEMD3Nv\nbWUtdXRmLXN0cmluZ4IIYWx0bmFtZTGCCGFsdG5hbWUyhwTAngEmhxASNA/SViEA\nAQCJAAAAAEUAhgh0ZXN0dXJpMYYIdGVzdHVyaTIwDQYJKoZIhvcNAQELBQADggEB\nAAQukDwIg01QLQK2MQqjePNZlJleKLMK9LiabyGqc7u4bgmX3gYIrH7uopvO5cIv\nvqxcVBATQ6ez29t5MagzDu1+vnwE8fQhRoe0sp5TRLiGSlBJf53+0Wb3vbaOT0Fx\n/FFK0f2wHqYv3h/CTxu8YxDY4DwCRTPJ2KfTvT85BXtTUlzKIp1ytALSKcz0Owoe\neQPtQUdi8UHef8uHuWbk7DftMXojXbCqtHQdS3Rrl9zyc+Ds67flb5hKEseQZRgw\ntPtAIxhjSfZPTjl/3aasCBikESdeS8IOxIXL1bGun0xWnIBBc9uRe8hpdPjZj7Eh\nIt7ucIzFep0DLWCeQrAHeqo=\n-----END CERTIFICATE-----`;
-// use_pss = true
-export const pssTrueCert = `-----BEGIN CERTIFICATE-----\nMIIDqTCCAl2gAwIBAgIUVY2PTRZl1t/fjfyEwrG4HvGjYekwQQYJKoZIhvcNAQEK\nMDSgDzANBglghkgBZQMEAgEFAKEcMBoGCSqGSIb3DQEBCDANBglghkgBZQMEAgEF\nAKIDAgEgMBoxGDAWBgNVBAMTD2NvbW1vbi1uYW1lLmNvbTAeFw0yMzAxMjEwMTA3\nNDBaFw0yMzAyMjIwMTA4MTBaMBoxGDAWBgNVBAMTD2NvbW1vbi1uYW1lLmNvbTCC\nASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANlG6DuZ4B6Tv8u8rI+pUvQv\n2E7dFCu+i1YAbEJSnuAQ9XFUG5Uf3uHB8AFrOKRBAaFdBV4hKvBpfvMj3jl93d0b\nHdHeIM+sancDwpexpLvSW4yDpbIhAnkYzbUYgZyEAJeIgq/4ufT77TCK8XIzDywD\nhXZtDJkc6w3mm6hiqEQXLKnDQTfKLK8Fbsq4OuQ4vO5VIJrVZ1gKemDs7W/9WIzp\n0iSjzcIfWnUy1Dpk+AF8HhXok8CbhHfOGgbQZ6DcXOIJeb4XarJ9sgLJNAuhdcHR\ngP0TkPiOewbBG9Ish1p3F+pkI3vjQk4cghmilAuEkMc2NCNNy6q1bwSELVQnMiMC\nAwEAAaN/MH0wDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O\nBBYEFAsrMoFu6tt1pybxx9ln6w5QK/2tMB8GA1UdIwQYMBaAFAsrMoFu6tt1pybx\nx9ln6w5QK/2tMBoGA1UdEQQTMBGCD2NvbW1vbi1uYW1lLmNvbTBBBgkqhkiG9w0B\nAQowNKAPMA0GCWCGSAFlAwQCAQUAoRwwGgYJKoZIhvcNAQEIMA0GCWCGSAFlAwQC\nAQUAogMCASADggEBAFh+PMwEmxaZR6OtfB0Uvw2vA7Oodmm3W0bYjQlEz8U+Q+JZ\ncIPa4VnRy1QALmKbPCbRApA/gcWzIwtzo1JhLtcDINg2Tl0nj4WvgpIvj0/lQNMq\nmwP7G/K4PyJTv3+y5XwVfepZAZITB0w5Sg5dLC6HP8AGVIaeb3hGNHYvPlE+pbT+\njL0xxzFjOorWoy5fxbWoVyVv9iZ4j0zRnbkYHIi3d8g56VV6Rbyw4WJt6p87lmQ8\n0wbiJTtuew/0Rpuc3PEcR9XfB5ct8bvaGGTSTwh6JQ33ohKKAKjbBNmhBDSP1thQ\n2mTkms/mbDRaTiQKHZx25TmOlLN5Ea1TSS0K6yw=\n-----END CERTIFICATE-----`;
-// only has common name
-export const skeletonCert = `-----BEGIN CERTIFICATE-----\nMIIDQTCCAimgAwIBAgIUVQy58VgdVpAK9c8SfS31idSv6FUwDQYJKoZIhvcNAQEL\nBQAwGjEYMBYGA1UEAxMPY29tbW9uLW5hbWUuY29tMB4XDTIzMDEyMTAxMjAyOVoX\nDTIzMDIyMjAxMjA1OVowGjEYMBYGA1UEAxMPY29tbW9uLW5hbWUuY29tMIIBIjAN\nBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2UboO5ngHpO/y7ysj6lS9C/YTt0U\nK76LVgBsQlKe4BD1cVQblR/e4cHwAWs4pEEBoV0FXiEq8Gl+8yPeOX3d3Rsd0d4g\nz6xqdwPCl7Gku9JbjIOlsiECeRjNtRiBnIQAl4iCr/i59PvtMIrxcjMPLAOFdm0M\nmRzrDeabqGKoRBcsqcNBN8osrwVuyrg65Di87lUgmtVnWAp6YOztb/1YjOnSJKPN\nwh9adTLUOmT4AXweFeiTwJuEd84aBtBnoNxc4gl5vhdqsn2yAsk0C6F1wdGA/ROQ\n+I57BsEb0iyHWncX6mQje+NCThyCGaKUC4SQxzY0I03LqrVvBIQtVCcyIwIDAQAB\no38wfTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU\nCysygW7q23WnJvHH2WfrDlAr/a0wHwYDVR0jBBgwFoAUCysygW7q23WnJvHH2Wfr\nDlAr/a0wGgYDVR0RBBMwEYIPY29tbW9uLW5hbWUuY29tMA0GCSqGSIb3DQEBCwUA\nA4IBAQDPco+FIHXczf0HTwFAmIVu4HKaeIwDsVPxoUqqWEix8AyCsB5uqpKZasby\nedlrdBohM4dnoV+VmV0de04y95sdo3Ot60hm/czLog3tHg4o7AmfA7saS+5hCL1M\nCJWqoJHRFo0hOWJHpLJRWz5DqRZWspASoVozLOYyjRD+tNBjO5hK4FtaG6eri38t\nOpTt7sdInVODlntpNuuCVprPpHGj4kPOcViQULoFQq5fwyadpdjqSXmEGlt0to5Y\nMbTb4Jhj0HywgO53BUUmMzzY9idXh/8A7ThrM5LtqhxaYHLVhyeo+5e0mgiXKp+n\nQ8Uh4TNNTCvOUlAHycZNaxYTlEPn\n-----END CERTIFICATE-----`;
-// contains unsupported subject and extension OIDs
-export const unsupportedOids = `-----BEGIN CERTIFICATE-----\nMIIEjDCCA3SgAwIBAgIUD4EeORgh/i+ZZFOk8KsGKQPWsoIwDQYJKoZIhvcNAQEL\nBQAwgZIxMTAvBgNVBAMMKGZhbmN5LWNlcnQtdW5zdXBwb3J0ZWQtc3Viai1hbmQt\nZXh0LW9pZHMxCzAJBgNVBAYTAlVTMQ8wDQYDVQQIDAZLYW5zYXMxDzANBgNVBAcM\nBlRvcGVrYTESMBAGA1UECgwJQWNtZSwgSW5jMRowGAYJKoZIhvcNAQkBFgtmb29A\nYmFyLmNvbTAeFw0yMzAxMjMxODQ3MjNaFw0zMzAxMjAxODQ3MjNaMIGSMTEwLwYD\nVQQDDChmYW5jeS1jZXJ0LXVuc3VwcG9ydGVkLXN1YmotYW5kLWV4dC1vaWRzMQsw\nCQYDVQQGEwJVUzEPMA0GA1UECAwGS2Fuc2FzMQ8wDQYDVQQHDAZUb3Bla2ExEjAQ\nBgNVBAoMCUFjbWUsIEluYzEaMBgGCSqGSIb3DQEJARYLZm9vQGJhci5jb20wggEi\nMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDyYH5qS7krfZ2tA5uZsY2qXbTb\ntGNG1BsyDhZ/qqVlQybjDsHJZwNUbpfhBcCLaKyAwH1R9n54NOOOn6bYgfKWTgy3\nL7224YDAqYe7Y/GPjgI2MRvRfn6t2xzQxtJ0l0k8LeyNcwhiqYLQyOOfDdc127fm\nW40r2nmhLpH0i9e2I/YP1HQ+ldVgVBqeUTntgVSBfrQF56v9mAcvvHEa5sdHqmX4\nJ2lhWTnx9jqb7NZxCem76BlX1Gt5TpP3Ym2ZFVQI9fuPK4O8JVhk1KBCmIgR3Ft+\nPpFUs/c41EMunKJNzveYrInSDScaC6voIJpK23nMAiM1HckLfUUc/4UojD+VAgMB\nAAGjgdcwgdQwHQYDVR0OBBYEFH7tt4enejKTZtYjUKUUx6PXyzlgMB8GA1UdIwQY\nMBaAFH7tt4enejKTZtYjUKUUx6PXyzlgMA4GA1UdDwEB/wQEAwIFoDAgBgNVHSUB\nAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwEgYDVR0TAQH/BAgwBgEB/wIBCjBM\nBgNVHREERTBDhwTAngEmhgx1cmlTdXBwb3J0ZWSCEWRucy1OYW1lU3VwcG9ydGVk\noBoGAyoDBKATDBFleGFtcGxlIG90aGVybmFtZTANBgkqhkiG9w0BAQsFAAOCAQEA\nP6ckVJgbcJue+MK3RVDuG+Mh7dl89ynC7NwpQFRjLVZQuoMHZT/dcLlVeFejVXu5\nR+IPLmQU6NV7JAmy4zGap8awf12QTy3g410ecrSF94WWlu8bPoekfUnnP+kfzLPH\nCUAkRKxWDSRKX5C8cMMxacVBBaBIayuusLcHkHmxLLDw34PFzyz61gtZOJq7JYnD\nhU9YsNh6bCDmnBDBsDMOI7h8lBRQwTiWVoSD9YNVvFiY29YvFbJQGdh+pmBtf7E+\n1B/0t5NbvqlQSbhMM0QgYFhuCxr3BGNob7kRjgW4i+oh+Nc5ptA5q70QMaYudqRS\nd8SYWhRdxmH3qcHNPcR1iw==\n-----END CERTIFICATE-----`;
-// unsupportedPem is same cert as above, formatted differently
-export const unsupportedPem = `
------BEGIN CERTIFICATE-----
-MIIEjDCCA3SgAwIBAgIUD4EeORgh/i+ZZFOk8KsGKQPWsoIwDQYJKoZIhvcNAQEL
-BQAwgZIxMTAvBgNVBAMMKGZhbmN5LWNlcnQtdW5zdXBwb3J0ZWQtc3Viai1hbmQt
-ZXh0LW9pZHMxCzAJBgNVBAYTAlVTMQ8wDQYDVQQIDAZLYW5zYXMxDzANBgNVBAcM
-BlRvcGVrYTESMBAGA1UECgwJQWNtZSwgSW5jMRowGAYJKoZIhvcNAQkBFgtmb29A
-YmFyLmNvbTAeFw0yMzAxMjMxODQ3MjNaFw0zMzAxMjAxODQ3MjNaMIGSMTEwLwYD
-VQQDDChmYW5jeS1jZXJ0LXVuc3VwcG9ydGVkLXN1YmotYW5kLWV4dC1vaWRzMQsw
-CQYDVQQGEwJVUzEPMA0GA1UECAwGS2Fuc2FzMQ8wDQYDVQQHDAZUb3Bla2ExEjAQ
-BgNVBAoMCUFjbWUsIEluYzEaMBgGCSqGSIb3DQEJARYLZm9vQGJhci5jb20wggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDyYH5qS7krfZ2tA5uZsY2qXbTb
-tGNG1BsyDhZ/qqVlQybjDsHJZwNUbpfhBcCLaKyAwH1R9n54NOOOn6bYgfKWTgy3
-L7224YDAqYe7Y/GPjgI2MRvRfn6t2xzQxtJ0l0k8LeyNcwhiqYLQyOOfDdc127fm
-W40r2nmhLpH0i9e2I/YP1HQ+ldVgVBqeUTntgVSBfrQF56v9mAcvvHEa5sdHqmX4
-J2lhWTnx9jqb7NZxCem76BlX1Gt5TpP3Ym2ZFVQI9fuPK4O8JVhk1KBCmIgR3Ft+
-PpFUs/c41EMunKJNzveYrInSDScaC6voIJpK23nMAiM1HckLfUUc/4UojD+VAgMB
-AAGjgdcwgdQwHQYDVR0OBBYEFH7tt4enejKTZtYjUKUUx6PXyzlgMB8GA1UdIwQY
-MBaAFH7tt4enejKTZtYjUKUUx6PXyzlgMA4GA1UdDwEB/wQEAwIFoDAgBgNVHSUB
-Af8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwEgYDVR0TAQH/BAgwBgEB/wIBCjBM
-BgNVHREERTBDhwTAngEmhgx1cmlTdXBwb3J0ZWSCEWRucy1OYW1lU3VwcG9ydGVk
-oBoGAyoDBKATDBFleGFtcGxlIG90aGVybmFtZTANBgkqhkiG9w0BAQsFAAOCAQEA
-P6ckVJgbcJue+MK3RVDuG+Mh7dl89ynC7NwpQFRjLVZQuoMHZT/dcLlVeFejVXu5
-R+IPLmQU6NV7JAmy4zGap8awf12QTy3g410ecrSF94WWlu8bPoekfUnnP+kfzLPH
-CUAkRKxWDSRKX5C8cMMxacVBBaBIayuusLcHkHmxLLDw34PFzyz61gtZOJq7JYnD
-hU9YsNh6bCDmnBDBsDMOI7h8lBRQwTiWVoSD9YNVvFiY29YvFbJQGdh+pmBtf7E+
-1B/0t5NbvqlQSbhMM0QgYFhuCxr3BGNob7kRjgW4i+oh+Nc5ptA5q70QMaYudqRS
-d8SYWhRdxmH3qcHNPcR1iw==
------END CERTIFICATE-----`;
-export const certWithoutCN = `-----BEGIN CERTIFICATE-----\nMIIDUDCCAjigAwIBAgIUEUpM5i7XMd/imZkR9XvonMaqPyYwDQYJKoZIhvcNAQEL\nBQAwHDEaMBgGCSqGSIb3DQEJARYLZm9vQGJhci5jb20wHhcNMjMwMTIzMjMyODEw\nWhcNMzMwMTIwMjMyODEwWjAcMRowGAYJKoZIhvcNAQkBFgtmb29AYmFyLmNvbTCC\nASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPGSdeqLICZcoUzxk88F8Tp+\nVNI+mS74L8pHyb9ZNZfeXPo0E9L5pi+KKI7rkxAtBGUecG1ENSxDDK9p6XZhWHSU\nZ6bdjOsjcIlfiM+1hhtDclIVxIDnz2Jt1/Vmnm8DXwdwVATWiFLTnfm288deNwsT\npl0ehAR3BadkZvteC6t+giEw/4qm1/FP53GEBOQeUWJDZRvtL37rdx4joFv3cR4w\nV0dukOjc5AGXtIOorO145OSZj8s7RsW3pfGcFUcOg7/flDxfK1UqFflQa7veLvKa\nWE/fOMyB/711QjSkTuQ5Rw3Rf9Fr2pqVJQgElTIW1SKaX5EJTB9mtGB34UqUXtsC\nAwEAAaOBiTCBhjAdBgNVHQ4EFgQUyhFP/fm+798mErPD5VQvEaAZQrswHwYDVR0j\nBBgwFoAUyhFP/fm+798mErPD5VQvEaAZQrswDgYDVR0PAQH/BAQDAgWgMCAGA1Ud\nJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjASBgNVHRMBAf8ECDAGAQH/AgEK\nMA0GCSqGSIb3DQEBCwUAA4IBAQCishzVkhuSAtqxgsZdYzBs3GpakGIio5zReW27\n6dk96hYCbbe4K3DtcFbRD1B8t6aTJlHxkFRaOWErSXu9WP3fUhIDNRE64Qsrg1zk\n3Km430qBlorXmTp6xhYHQfY5bn5rT2YY7AmaYIlIFxRhod43i5GDbBP+e+d/vTqR\nv1AJflYofeR4LeATP64B6a4R+QQVoxI43+pyH3ka+nRHwJBR9h8SMtJoqBy7x9pl\nYlBDa8lSn05doA3+e03VIzitvBBWI4oX1XB0tShSLk6YJXayIwe0ZNVvfYLIRKCp\nb4DUwChYzG/FwFSssUAqzVFhu3i+uU3Z47bsLVm0R5m7hLiZ\n-----END CERTIFICATE-----`;
-
-// CROSS-SIGNING:
-export const newCSR = {
-  common_name: 'Short-Lived Int R1',
-  csr: `-----BEGIN CERTIFICATE REQUEST-----\nMIICYjCCAUoCAQAwHTEbMBkGA1UEAxMSU2hvcnQtTGl2ZWQgSW50IFIxMIIBIjAN\nBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqsvFU7lzt06n1w6BL+Waf9zd+Z3G\n90Kv0HAksoLaWYinhkxNIUTU8ar9HLa2WV4EoJbNq91Hn+jFc2SYEXtRV+jm0kEh\nz4C4AoQ4D0s83JcYNssiNbVA04wa5ovD0iA/pzwVz8TnJSfAAuZ3vXFlyIbQ3ESo\nzt9hGjo/JOpoBh67E7xkuzw4lnC2rXGHdh9pk1Di+wqREnKU4nuhDLnTC/LL+Mkm\n07F1aMAW3Z/PWFmmsDJHMhZnaYo2LGCwU4A0U1ED0XpwflobVbkzZDmCXOPEI8UX\nG6VcL36zWnzEQnlZKN91MAa+s0E4z40KHKVSblSkjYD1K6n0y787ic2mDwIDAQAB\noAAwDQYJKoZIhvcNAQELBQADggEBAFQtiJaRfaQS3jHr7aFeszB/JmDRQiOoML3g\nhA3EcVd2rvDjiqikwD9EFdLTJyYJfb+9yiKDJqB7Fw2GPSrFxrd+jC9qZRI3VEWK\n8VdflLbruc1FcqJcE/0z2hWa11eud1bMLq8U6AfxNHL4r4ukrp2D5elrdsrDnhZj\nwMi3FtEFd4RZVaWZYVmWcQTeH7Zz/LYwkVDgBuvC+SOCaNNo/dCurkAAoxw8obBj\n1FS2F/3oHQxMui8vS8j6sMWMPZ5D3Q0xSC3HBUNoI2ZC77Mxn9yfj6ianUXKOOlf\nQMRaPBVajxZm9ovV64QKr+7HK7W7U/fNEqvoKBUDCqEuWmSsxMk=\n-----END CERTIFICATE REQUEST-----`,
-};
-
-export const oldParentIssuerCert = `-----BEGIN CERTIFICATE-----\nMIIDKzCCAhOgAwIBAgIUMCEF+bzBC4NQIWjE1sv/RbnYfUgwDQYJKoZIhvcNAQEL\nBQAwHTEbMBkGA1UEAxMSTG9uZy1MaXZlZCBSb290IFgxMB4XDTIzMDEyNTAwMjQz\nM1oXDTIzMDIyNjAwMjUwM1owHTEbMBkGA1UEAxMSTG9uZy1MaXZlZCBSb290IFgx\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0zrpJvjWcBV49Eor+zfh\nGW40xH6PcPSpzWGCCFiMPFwKrBSjuGRwwkLsXU7u2P15jIV/IU2kPS+WOW+EIe0x\ns5X2SoujZGOmM6du/6HIo9lz9yjb5G1SHdv/e65Q45QWb6wQcuO4axffvPzmAU9L\nQcunEF4g3rCz4cHYumi0osybbwR45z+8owNhykdbu7AwV0Cyz3C/lT1wxDxbFr0Y\n1NEjQ8AF4oRzqkmGoLp6ixDxp8zMpOlKWWYem1mx0RbqlwLP7khiS5YKi8+j8aog\nOhHA/W4i+ihrBzkv4GtOSdkhJz5qacifydUXtJ7SmvYs9Fi+hFgw61sw23ywbr3+\nywIDAQABo2MwYTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNV\nHQ4EFgQUQsdYFMtsNMYNDIhZHMd77kcLLi8wHwYDVR0jBBgwFoAUQsdYFMtsNMYN\nDIhZHMd77kcLLi8wDQYJKoZIhvcNAQELBQADggEBAFNKTnNUzjZGHpXVK9Go8k/i\nVMNBktjGp58z+EN32TJnq/tOW1eVswUmq71S3R16Iho4XZDZVchuK+zhqSwlAmgM\no1vs6L5IJ0rVZcLZpysxFtawlbA362zBOX0F7tqStdEeBWaXw6J+MQ26xAPgHjXo\nc3fqqNWGbrOPt1uFoXWD+0Bg8M90a7OT0ijubh/PcuCe1yF9G2BqRQruB05gZiHl\n0NGbUka1ntD/lxYfLeSnp+FHJVDrcAHwPhKQS8HHr/ZBjKEGY8In+JIi/KBV/M8b\nGeW2k5odl6r2UIR6PWSei1WKKHe09WzO7rGJaN6uKLP14c0nSF3/q+AQY3m+tPY=\n-----END CERTIFICATE-----\n`;
-export const parentIssuerCert = `-----BEGIN CERTIFICATE-----\nMIIDKzCCAhOgAwIBAgIUBxLeuD3K0hF5dGpaEgZqytTN3lswDQYJKoZIhvcNAQEL\nBQAwHTEbMBkGA1UEAxMSTG9uZy1MaXZlZCBSb290IFgyMB4XDTIzMDEyNTAwMjQz\nM1oXDTIzMDIyNjAwMjUwM1owHTEbMBkGA1UEAxMSTG9uZy1MaXZlZCBSb290IFgy\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuqkwN4m5dFLwFi0iYs4r\nTO4HWzloF4yCOaNfVksh1cOafVu9vjFwOWgHZFe6h8BOn6biKdFtvGTyIzlMHe5t\nyFmec9pfjX243bH9Ev4n2RTMKs818g9LdoZT6SI7DxHEu3yuHBg9TM87+GB+dA1V\nkRsK5hgtNCSMdgFSljM169sYbNilpk8M7O2hr+AmgRi0c1nUEPCe4JAr0Zv8iweJ\ntFRVHiQJXD9WIVxaWVxqWFsHoXseZS7H76RSdf4jNfENmBguHZMAPhtqlc/pMan8\nu0IJETWjWENn+WYC7DnnfQtNqyebU2LdT3oKO8tELqITygjT2tCS1Zavmsy69VY0\nYwIDAQABo2MwYTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNV\nHQ4EFgQUxgchIBo+1F++IFW0F586I5QDFGYwHwYDVR0jBBgwFoAUxgchIBo+1F++\nIFW0F586I5QDFGYwDQYJKoZIhvcNAQELBQADggEBAI6DdnW8q/FqGqk/Y0k7iUrZ\nYkfMRlss6uBTzLev53eXqFIJ3+EFVfV+ohDEedlYYm2QCELzQcJSR7Q2I22PQj8X\nTO0yqk6LOCMv/4yiDhF4D+haiDU4joq5GX1dpFdlNSQ5fJmnLKu8HYbOhbwUo4ns\n4yGzIMulZR1Zqf/HGEOCYPDQ0ZHucmHn7uGhmV+kgYGoKVEZ8XxfmyNPKuwTAUHL\nfInPJZtbxXTVmiWWy3iraeI4XcUvaD0JtVnsVphYrqrSZ60DjgFsjiyenxePGHXf\nYXV9HIS6OXlvWhJKlSINOTv9fAa+e+JtK7frdvxJNHoTG34PiGXfOV2swTvLJQo=\n-----END CERTIFICATE-----\n`;
-export const intIssuerCert = `-----BEGIN CERTIFICATE-----\nMIIDKzCCAhOgAwIBAgIUPt5VyO6gyA4hVaMkdpNyBlP+I64wDQYJKoZIhvcNAQEL\nBQAwHTEbMBkGA1UEAxMSTG9uZy1MaXZlZCBSb290IFgxMB4XDTIzMDEyNTAwMjQz\nM1oXDTIzMDIyNjAwMjUwM1owHTEbMBkGA1UEAxMSU2hvcnQtTGl2ZWQgSW50IFIx\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqsvFU7lzt06n1w6BL+Wa\nf9zd+Z3G90Kv0HAksoLaWYinhkxNIUTU8ar9HLa2WV4EoJbNq91Hn+jFc2SYEXtR\nV+jm0kEhz4C4AoQ4D0s83JcYNssiNbVA04wa5ovD0iA/pzwVz8TnJSfAAuZ3vXFl\nyIbQ3ESozt9hGjo/JOpoBh67E7xkuzw4lnC2rXGHdh9pk1Di+wqREnKU4nuhDLnT\nC/LL+Mkm07F1aMAW3Z/PWFmmsDJHMhZnaYo2LGCwU4A0U1ED0XpwflobVbkzZDmC\nXOPEI8UXG6VcL36zWnzEQnlZKN91MAa+s0E4z40KHKVSblSkjYD1K6n0y787ic2m\nDwIDAQABo2MwYTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNV\nHQ4EFgQUkBK+oGpo5DNj2pCKoUE08WFOxQUwHwYDVR0jBBgwFoAUQsdYFMtsNMYN\nDIhZHMd77kcLLi8wDQYJKoZIhvcNAQELBQADggEBAIf4Bp/NYftiN8LmQrVzPWAe\nc4Bxm/NFFtkwQEvFhndMN68MUyXa5yxAdnYAHN+fRpYPxbjoZNXjW/jx3Kjft44r\ntyNGrrkjR80TI9FbL53nN7hLtZQdizsQD0Wype4Q1JOIxYw2Wd5Hr/PVPrJZ3PGg\nwNeI5IRu/cVbVT/vkRaHqYSwpa+V2cZTaEk6h62KPaKu3ui+omoeitU6qXHOysXQ\nrdGkJl/x831sIKmN0dMiGeoJdHGAr/E2f3ijKbVPsjIxZbm2SSumldOFYWn9cNYD\nI6sizFH976Wpde/GRIvBIzJnlK3xgfy0D9AUvwKyt75PVEnshc9tlhxoSVlKaUE=\n-----END CERTIFICATE-----\n`;
-export const newlySignedCert = `-----BEGIN CERTIFICATE-----\nMIIDKzCCAhOgAwIBAgIUKapKK5Coau2sfIJgqA9jcC6BkWIwDQYJKoZIhvcNAQEL\nBQAwHTEbMBkGA1UEAxMSTG9uZy1MaXZlZCBSb290IFgyMB4XDTIzMDEyNTIyMjky\nNVoXDTIzMDIyNjIyMjk1NVowHTEbMBkGA1UEAxMSU2hvcnQtTGl2ZWQgSW50IFIx\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqsvFU7lzt06n1w6BL+Wa\nf9zd+Z3G90Kv0HAksoLaWYinhkxNIUTU8ar9HLa2WV4EoJbNq91Hn+jFc2SYEXtR\nV+jm0kEhz4C4AoQ4D0s83JcYNssiNbVA04wa5ovD0iA/pzwVz8TnJSfAAuZ3vXFl\nyIbQ3ESozt9hGjo/JOpoBh67E7xkuzw4lnC2rXGHdh9pk1Di+wqREnKU4nuhDLnT\nC/LL+Mkm07F1aMAW3Z/PWFmmsDJHMhZnaYo2LGCwU4A0U1ED0XpwflobVbkzZDmC\nXOPEI8UXG6VcL36zWnzEQnlZKN91MAa+s0E4z40KHKVSblSkjYD1K6n0y787ic2m\nDwIDAQABo2MwYTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNV\nHQ4EFgQUkBK+oGpo5DNj2pCKoUE08WFOxQUwHwYDVR0jBBgwFoAUxgchIBo+1F++\nIFW0F586I5QDFGYwDQYJKoZIhvcNAQELBQADggEBAJaems1vgEjxgb3d1y9PYxzN\nLZbuf/+0+BCVa9k4bEsbuhXhEecFdIi2OKS6fabeoEOF97Gvqrgc+LEpNsU6lIRA\nkJ/nHe0CD2hf0aBQsGsOllYy/4QnrPlbowb4KizPknEMWdGcvfnlzzOJzo4/UuMk\nMZ9vn2GrINzfml/sLocOzP/MsPd8bBhXI2Emh2O9tJ4+zeHLhEzcM1gdNk8pp+wP\nEOks0EcN4UBkpEnDZcDTJVgp9XpWy19EEGqsxjBq6rlpIvPW8XHoH1jZSGY1KWBJ\nRGtDcGugwTxO9jYHz/a1qu4BVt5FFcb0L3IOvcr+3QCCeiJQHcVY8QRbO9M4AQk=\n-----END CERTIFICATE-----\n`;
diff --git a/ui/tests/helpers/pki/workflow.js b/ui/tests/helpers/pki/workflow.js
deleted file mode 100644
index 42b7a5bc82c6a..0000000000000
--- a/ui/tests/helpers/pki/workflow.js
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { SELECTORS as ROLEFORM } from './pki-role-form';
-import { SELECTORS as GENERATECERT } from './pki-role-generate';
-import { SELECTORS as KEYFORM } from './pki-key-form';
-import { SELECTORS as KEYPAGES } from './page/pki-keys';
-import { SELECTORS as ISSUERDETAILS } from './pki-issuer-details';
-import { SELECTORS as CONFIGURATION } from './pki-configure-create';
-import { SELECTORS as DELETE } from './pki-delete-all-issuers';
-import { SELECTORS as TIDY } from './page/pki-tidy-form';
-import { SELECTORS as CONFIGEDIT } from './page/pki-configuration-edit';
-
-export const SELECTORS = {
-  breadcrumbContainer: '[data-test-breadcrumbs]',
-  breadcrumbs: '[data-test-breadcrumbs] li',
-  overviewBreadcrumb: '[data-test-breadcrumbs] li:nth-of-type(2) > a',
-  pageTitle: '[data-test-pki-role-page-title]',
-  alertBanner: '[data-test-alert-banner="alert"]',
-  emptyState: '[data-test-component="empty-state"]',
-  emptyStateTitle: '[data-test-empty-state-title]',
-  emptyStateLink: '.empty-state-actions a',
-  emptyStateMessage: '[data-test-empty-state-message]',
-  // TABS
-  overviewTab: '[data-test-secret-list-tab="Overview"]',
-  rolesTab: '[data-test-secret-list-tab="Roles"]',
-  issuersTab: '[data-test-secret-list-tab="Issuers"]',
-  certsTab: '[data-test-secret-list-tab="Certificates"]',
-  keysTab: '[data-test-secret-list-tab="Keys"]',
-  tidyTab: '[data-test-secret-list-tab="Tidy"]',
-  configTab: '[data-test-secret-list-tab="Configuration"]',
-  // ROLES
-  deleteRoleButton: '[data-test-pki-role-delete]',
-  generateCertLink: '[data-test-pki-role-generate-cert]',
-  signCertLink: '[data-test-pki-role-sign-cert]',
-  editRoleLink: '[data-test-pki-role-edit-link]',
-  createRoleLink: '[data-test-pki-role-create-link]',
-  roleForm: {
-    ...ROLEFORM,
-  },
-  generateCertForm: {
-    ...GENERATECERT,
-  },
-  // KEYS
-  keyForm: {
-    ...KEYFORM,
-  },
-  keyPages: {
-    ...KEYPAGES,
-  },
-  // ISSUERS
-  importIssuerLink: '[data-test-generate-issuer="import"]',
-  generateIssuerDropdown: '[data-test-issuer-generate-dropdown]',
-  generateIssuerRoot: '[data-test-generate-issuer="root"]',
-  generateIssuerIntermediate: '[data-test-generate-issuer="intermediate"]',
-  issuerPopupMenu: '[data-test-popup-menu-trigger]',
-  issuerPopupDetails: '[data-test-popup-menu-details] a',
-  issuerDetails: {
-    title: '[data-test-pki-issuer-page-title]',
-    ...ISSUERDETAILS,
-  },
-  // CONFIGURATION
-  configuration: {
-    title: '[data-test-pki-configuration-page-title]',
-    emptyState: '[data-test-configuration-empty-state]',
-    pkiBetaBanner: '[data-test-pki-configuration-banner]',
-    pkiBetaBannerLink: '[data-test-pki-configuration-banner] a',
-    ...CONFIGURATION,
-    ...DELETE,
-    ...TIDY,
-  },
-  // EDIT CONFIGURATION
-  configEdit: {
-    ...CONFIGEDIT,
-  },
-};
diff --git a/ui/tests/helpers/policy-generator/pki.js b/ui/tests/helpers/policy-generator/pki.js
deleted file mode 100644
index f1630b57d48d8..0000000000000
--- a/ui/tests/helpers/policy-generator/pki.js
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { singularize } from 'ember-inflector';
-
-export const adminPolicy = (mountPath) => {
-  return `
-    path "${mountPath}/*" {
-      capabilities = ["create", "read", "update", "delete", "list"]
-    },
-  `;
-};
-
-// keys require singularized paths for GET
-export const readerPolicy = (mountPath, resource) => {
-  return `
-    path "${mountPath}/${resource}" {
-      capabilities = ["read", "list"]
-    },
-    path "${mountPath}/${resource}/*" {
-      capabilities = ["read", "list"]
-    },
-    path "${mountPath}/${singularize(resource)}" {
-      capabilities = ["read", "list"]
-    },
-    path "${mountPath}/${singularize(resource)}/*" {
-      capabilities = ["read", "list"]
-    },
-  `;
-};
-export const updatePolicy = (mountPath, resource) => {
-  return `
-    path "${mountPath}/${resource}" {
-      capabilities = ["read", "list"]
-    },
-    path "${mountPath}/${resource}/*" {
-      capabilities = ["read", "update"]
-    },
-    path "${mountPath}/${singularize(resource)}/*" {
-      capabilities = ["read", "update"]
-    },    
-    path "${mountPath}/issue/*" {
-      capabilities = ["update"]
-    },
-    path "${mountPath}/generate/*" {
-      capabilities = ["update"]
-    },
-    path "${mountPath}/import" {
-      capabilities = ["update"]
-    },
-    path "${mountPath}/sign/*" {
-      capabilities = ["update"]
-    },
-  `;
-};
diff --git a/ui/tests/helpers/poll-cluster.js b/ui/tests/helpers/poll-cluster.js
index a4bb708c1322c..01b7cf7ec7437 100644
--- a/ui/tests/helpers/poll-cluster.js
+++ b/ui/tests/helpers/poll-cluster.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { settled } from '@ember/test-helpers';
 
 export async function pollCluster(owner) {
diff --git a/ui/tests/helpers/stubs.js b/ui/tests/helpers/stubs.js
deleted file mode 100644
index ece48eddf9ed8..0000000000000
--- a/ui/tests/helpers/stubs.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-export function capabilitiesStub(requestPath, capabilitiesArray) {
-  // sample of capabilitiesArray: ['read', 'update']
-  return {
-    [requestPath]: capabilitiesArray,
-    capabilities: capabilitiesArray,
-    request_id: '40f7e44d-af5c-9b60-bd20-df72eb17e294',
-    lease_id: '',
-    renewable: false,
-    lease_duration: 0,
-    data: {
-      [requestPath]: capabilitiesArray,
-      capabilities: capabilitiesArray,
-    },
-    wrap_info: null,
-    warnings: null,
-    auth: null,
-  };
-}
-
-export const noopStub = (response) => {
-  return function () {
-    return [response, { 'Content-Type': 'application/json' }, JSON.stringify({})];
-  };
-};
-
-/**
- * allowAllCapabilitiesStub mocks the response from capabilities-self
- * that allows the user to do any action (root user)
- * Example usage assuming setupMirage(hooks) was called:
- * this.server.post('/sys/capabilities-self', allowAllCapabilitiesStub(['read']));
- */
-export function allowAllCapabilitiesStub(capabilitiesList = ['root']) {
-  return function (_, { requestBody }) {
-    const { paths } = JSON.parse(requestBody);
-    const specificCapabilities = paths.reduce((obj, path) => {
-      return {
-        ...obj,
-        [path]: capabilitiesList,
-      };
-    }, {});
-    return {
-      ...specificCapabilities,
-      capabilities: capabilitiesList,
-      request_id: 'mirage-795dc9e1-0321-9ac6-71fc',
-      lease_id: '',
-      renewable: false,
-      lease_duration: 0,
-      data: { ...specificCapabilities, capabilities: capabilitiesList },
-      wrap_info: null,
-      warnings: null,
-      auth: null,
-    };
-  };
-}
diff --git a/ui/tests/helpers/wait-for-error.js b/ui/tests/helpers/wait-for-error.js
index 5ebda46f038fc..7be1c5775bedb 100644
--- a/ui/tests/helpers/wait-for-error.js
+++ b/ui/tests/helpers/wait-for-error.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { waitUntil } from '@ember/test-helpers';
 import Ember from 'ember';
 
diff --git a/ui/tests/index.html b/ui/tests/index.html
index b8c5799e944ed..400eaa7d99dfb 100644
--- a/ui/tests/index.html
+++ b/ui/tests/index.html
@@ -1,12 +1,8 @@
 <!DOCTYPE html>
-<!--
- Copyright (c) HashiCorp, Inc.
- SPDX-License-Identifier: MPL-2.0
--->
-
 <html>
   <head>
     <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <title>Vault Tests</title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">
diff --git a/ui/tests/integration/components/alert-inline-test.js b/ui/tests/integration/components/alert-inline-test.js
index c0aad24433048..6397c165da9ff 100644
--- a/ui/tests/integration/components/alert-inline-test.js
+++ b/ui/tests/integration/components/alert-inline-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render, settled, find, waitUntil } from '@ember/test-helpers';
@@ -13,7 +8,6 @@ module('Integration | Component | alert-inline', function (hooks) {
 
   hooks.beforeEach(function () {
     this.set('message', 'some very important alert');
-    this.set('type', 'warning');
   });
 
   test('it renders alert message with correct class args', async function (assert) {
@@ -23,7 +17,6 @@ module('Integration | Component | alert-inline', function (hooks) {
       @isMarginless={{true}}
       @sizeSmall={{true}}
       @message={{this.message}}
-      @type={{this.type}}
     />
     `);
     assert.dom('[data-test-inline-error-message]').hasText('some very important alert');
@@ -34,7 +27,7 @@ module('Integration | Component | alert-inline', function (hooks) {
 
   test('it yields to block text', async function (assert) {
     await render(hbs`
-    <AlertInline @message={{this.message}} @type={{this.type}}> 
+    <AlertInline @message={{this.message}}> 
       A much more important alert
     </AlertInline>
     `);
@@ -56,6 +49,7 @@ module('Integration | Component | alert-inline', function (hooks) {
   });
 
   test('it renders correctly for type=warning', async function (assert) {
+    this.set('type', 'warning');
     await render(hbs`
     <AlertInline 
       @type={{this.type}}
@@ -71,7 +65,6 @@ module('Integration | Component | alert-inline', function (hooks) {
     <AlertInline 
       @message={{this.message}}
       @mimicRefresh={{true}} 
-      @type={{this.type}}
     />
     `);
     assert
diff --git a/ui/tests/integration/components/alert-popup-test.js b/ui/tests/integration/components/alert-popup-test.js
deleted file mode 100644
index 25f476e8d58a5..0000000000000
--- a/ui/tests/integration/components/alert-popup-test.js
+++ /dev/null
@@ -1,58 +0,0 @@
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'vault/tests/helpers';
-import { render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-import { click } from '@ember/test-helpers';
-
-module('Integration | Component | alert-popup', function (hooks) {
-  setupRenderingTest(hooks);
-
-  hooks.beforeEach(function () {
-    this.set('message', 'some very important alert');
-    this.set('type', 'warning');
-    this.set('close', () => this.set('closed', true));
-  });
-
-  test('it renders the alert popup input', async function (assert) {
-    await render(hbs`
-      <AlertPopup @message={{this.message}} @type={{message-types this.type}} @close={{this.close}} />
-    `);
-
-    assert.dom(this.element).hasText('Warning some very important alert');
-  });
-
-  test('it invokes the close action', async function (assert) {
-    assert.expect(1);
-
-    await render(hbs`
-      <AlertPopup @message={{this.message}} @type={{message-types this.type}} @close={{this.close}} />
-    `);
-    await click('.close-button');
-
-    assert.true(this.closed);
-  });
-
-  test('it renders the alert popup with different colors based on types', async function (assert) {
-    await render(hbs`
-      <AlertPopup @message={{this.message}} @type={{message-types this.type}} @close={{this.close}} />
-    `);
-
-    assert.dom('.message').hasClass('is-highlight');
-
-    this.set('type', 'info');
-
-    await render(hbs`
-    <AlertPopup @message={{this.message}} @type={{message-types this.type}} @close={{this.close}} />
-    `);
-
-    assert.dom('.message').hasClass('is-info');
-
-    this.set('type', 'danger');
-
-    await render(hbs`
-    <AlertPopup @message={{this.message}} @type={{message-types this.type}} @close={{this.close}} />
-    `);
-
-    assert.dom('.message').hasClass('is-danger');
-  });
-});
diff --git a/ui/tests/integration/components/auth-config-form/options-test.js b/ui/tests/integration/components/auth-config-form/options-test.js
index 24ddaf6e95c8f..740844f50cebe 100644
--- a/ui/tests/integration/components/auth-config-form/options-test.js
+++ b/ui/tests/integration/components/auth-config-form/options-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { resolve } from 'rsvp';
 import EmberObject from '@ember/object';
 import { module, test } from 'qunit';
@@ -37,7 +32,7 @@ module('Integration | Component | auth-config-form options', function (hooks) {
 
   test('it submits data correctly', async function (assert) {
     assert.expect(1);
-    const model = EmberObject.create({
+    let model = EmberObject.create({
       tune() {
         return resolve();
       },
@@ -49,7 +44,7 @@ module('Integration | Component | auth-config-form options', function (hooks) {
     });
     sinon.spy(model.config, 'serialize');
     this.set('model', model);
-    await render(hbs`{{auth-config-form/options model=this.model}}`);
+    await render(hbs`{{auth-config-form/options model=model}}`);
     component.save();
     return settled().then(() => {
       assert.ok(model.config.serialize.calledOnce);
diff --git a/ui/tests/integration/components/auth-form-test.js b/ui/tests/integration/components/auth-form-test.js
index b8cd73df34e17..e6c2b40d8f59e 100644
--- a/ui/tests/integration/components/auth-form-test.js
+++ b/ui/tests/integration/components/auth-form-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { later, _cancelTimers as cancelTimers } from '@ember/runloop';
 import EmberObject from '@ember/object';
 import { resolve } from 'rsvp';
@@ -11,6 +6,7 @@ import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render, settled } from '@ember/test-helpers';
 import hbs from 'htmlbars-inline-precompile';
+import fetch from 'fetch';
 import sinon from 'sinon';
 import Pretender from 'pretender';
 import { create } from 'ember-cli-page-object';
@@ -19,6 +15,14 @@ import { validate } from 'uuid';
 
 const component = create(authForm);
 
+const authService = Service.extend({
+  async authenticate() {
+    return fetch('http://localhost:2000');
+  },
+  handleError() {},
+  setLastFetch() {},
+});
+
 const workingAuthService = Service.extend({
   authenticate() {
     return resolve({});
@@ -41,25 +45,37 @@ module('Integration | Component | auth form', function (hooks) {
   setupRenderingTest(hooks);
 
   hooks.beforeEach(function () {
+    this.owner.lookup('service:csp-event').attach();
     this.owner.register('service:router', routerService);
     this.router = this.owner.lookup('service:router');
   });
 
+  hooks.afterEach(function () {
+    this.owner.lookup('service:csp-event').remove();
+  });
+
   const CSP_ERR_TEXT = `Error This is a standby Vault node but can't communicate with the active node via request forwarding. Sign in at the active node to use the Vault UI.`;
   test('it renders error on CSP violation', async function (assert) {
     assert.expect(2);
+    this.owner.unregister('service:auth');
+    this.owner.register('service:auth', authService);
+    this.auth = this.owner.lookup('service:auth');
     this.set('cluster', EmberObject.create({ standby: true }));
     this.set('selectedAuth', 'token');
-    await render(hbs`{{auth-form cluster=this.cluster selectedAuth=this.selectedAuth}}`);
+    await render(hbs`{{auth-form cluster=cluster selectedAuth=selectedAuth}}`);
     assert.false(component.errorMessagePresent, false);
-    this.owner.lookup('service:csp-event').events.addObject({ violatedDirective: 'connect-src' });
-    await settled();
-    assert.strictEqual(component.errorText, CSP_ERR_TEXT);
+    component.login();
+    // because this is an ember-concurrency backed service,
+    // we have to manually force settling the run queue
+    later(() => cancelTimers(), 50);
+    return settled().then(() => {
+      assert.equal(component.errorText, CSP_ERR_TEXT);
+    });
   });
 
   test('it renders with vault style errors', async function (assert) {
     assert.expect(1);
-    const server = new Pretender(function () {
+    let server = new Pretender(function () {
       this.get('/v1/auth/**', () => {
         return [
           400,
@@ -69,56 +85,54 @@ module('Integration | Component | auth form', function (hooks) {
           }),
         ];
       });
-      this.get('/v1/sys/internal/ui/mounts', this.passthrough);
     });
 
     this.set('cluster', EmberObject.create({}));
     this.set('selectedAuth', 'token');
-    await render(hbs`{{auth-form cluster=this.cluster selectedAuth=this.selectedAuth}}`);
+    await render(hbs`{{auth-form cluster=cluster selectedAuth=selectedAuth}}`);
     return component.login().then(() => {
-      assert.strictEqual(component.errorText, 'Error Authentication failed: Not allowed');
+      assert.equal(component.errorText, 'Error Authentication failed: Not allowed');
       server.shutdown();
     });
   });
 
   test('it renders AdapterError style errors', async function (assert) {
     assert.expect(1);
-    const server = new Pretender(function () {
+    let server = new Pretender(function () {
       this.get('/v1/auth/**', () => {
         return [400, { 'Content-Type': 'application/json' }];
       });
-      this.get('/v1/sys/internal/ui/mounts', this.passthrough);
     });
 
     this.set('cluster', EmberObject.create({}));
     this.set('selectedAuth', 'token');
-    await render(hbs`{{auth-form cluster=this.cluster selectedAuth=this.selectedAuth}}`);
-    // returns null because test does not return details of failed network request. On the app it will return the details of the error instead of null.
+    await render(hbs`{{auth-form cluster=cluster selectedAuth=selectedAuth}}`);
+    // ARG TODO research and see if adapter errors changed, but null used to be Bad Request
     return component.login().then(() => {
-      assert.strictEqual(component.errorText, 'Error Authentication failed: null');
+      assert.equal(component.errorText, 'Error Authentication failed: null');
       server.shutdown();
     });
   });
 
   test('it renders no tabs when no methods are passed', async function (assert) {
-    const methods = {
+    let methods = {
       'approle/': {
         type: 'approle',
       },
     };
-    const server = new Pretender(function () {
+    let server = new Pretender(function () {
       this.get('/v1/sys/internal/ui/mounts', () => {
         return [200, { 'Content-Type': 'application/json' }, JSON.stringify({ data: { auth: methods } })];
       });
     });
-    await render(hbs`<AuthForm @cluster={{this.cluster}} />`);
+    await render(hbs`<AuthForm @cluster={{cluster}} />`);
 
-    assert.strictEqual(component.tabs.length, 0, 'renders a tab for every backend');
+    assert.equal(component.tabs.length, 0, 'renders a tab for every backend');
     server.shutdown();
   });
 
   test('it renders all the supported methods and Other tab when methods are present', async function (assert) {
-    const methods = {
+    let methods = {
       'foo/': {
         type: 'userpass',
       },
@@ -126,41 +140,37 @@ module('Integration | Component | auth form', function (hooks) {
         type: 'approle',
       },
     };
-    const server = new Pretender(function () {
+    let server = new Pretender(function () {
       this.get('/v1/sys/internal/ui/mounts', () => {
         return [200, { 'Content-Type': 'application/json' }, JSON.stringify({ data: { auth: methods } })];
       });
     });
 
     this.set('cluster', EmberObject.create({}));
-    await render(hbs`{{auth-form cluster=this.cluster }}`);
+    await render(hbs`{{auth-form cluster=cluster }}`);
 
-    assert.strictEqual(component.tabs.length, 2, 'renders a tab for userpass and Other');
-    assert.strictEqual(component.tabs.objectAt(0).name, 'foo', 'uses the path in the label');
-    assert.strictEqual(component.tabs.objectAt(1).name, 'Other', 'second tab is the Other tab');
+    assert.equal(component.tabs.length, 2, 'renders a tab for userpass and Other');
+    assert.equal(component.tabs.objectAt(0).name, 'foo', 'uses the path in the label');
+    assert.equal(component.tabs.objectAt(1).name, 'Other', 'second tab is the Other tab');
     server.shutdown();
   });
 
   test('it renders the description', async function (assert) {
-    const methods = {
+    let methods = {
       'approle/': {
         type: 'userpass',
         description: 'app description',
       },
     };
-    const server = new Pretender(function () {
+    let server = new Pretender(function () {
       this.get('/v1/sys/internal/ui/mounts', () => {
         return [200, { 'Content-Type': 'application/json' }, JSON.stringify({ data: { auth: methods } })];
       });
     });
     this.set('cluster', EmberObject.create({}));
-    await render(hbs`{{auth-form cluster=this.cluster }}`);
+    await render(hbs`{{auth-form cluster=cluster }}`);
 
-    assert.strictEqual(
-      component.descriptionText,
-      'app description',
-      'renders a description for auth methods'
-    );
+    assert.equal(component.descriptionText, 'app description', 'renders a description for auth methods');
     server.shutdown();
   });
 
@@ -168,13 +178,13 @@ module('Integration | Component | auth form', function (hooks) {
     this.owner.unregister('service:auth');
     this.owner.register('service:auth', workingAuthService);
     this.auth = this.owner.lookup('service:auth');
-    const authSpy = sinon.spy(this.auth, 'authenticate');
-    const methods = {
+    let authSpy = sinon.spy(this.auth, 'authenticate');
+    let methods = {
       'foo/': {
         type: 'userpass',
       },
     };
-    const server = new Pretender(function () {
+    let server = new Pretender(function () {
       this.get('/v1/sys/internal/ui/mounts', () => {
         return [200, { 'Content-Type': 'application/json' }, JSON.stringify({ data: { auth: methods } })];
       });
@@ -182,40 +192,40 @@ module('Integration | Component | auth form', function (hooks) {
 
     this.set('cluster', EmberObject.create({}));
     this.set('selectedAuth', 'foo/');
-    await render(hbs`{{auth-form cluster=this.cluster selectedAuth=this.selectedAuth}}`);
+    await render(hbs`{{auth-form cluster=cluster selectedAuth=selectedAuth}}`);
     await component.login();
 
     await settled();
     assert.ok(authSpy.calledOnce, 'a call to authenticate was made');
-    const { data } = authSpy.getCall(0).args[0];
-    assert.strictEqual(data.path, 'foo', 'uses the id for the path');
+    let { data } = authSpy.getCall(0).args[0];
+    assert.equal(data.path, 'foo', 'uses the id for the path');
     authSpy.restore();
     server.shutdown();
   });
 
   test('it renders no tabs when no supported methods are present in passed methods', async function (assert) {
-    const methods = {
+    let methods = {
       'approle/': {
         type: 'approle',
       },
     };
-    const server = new Pretender(function () {
+    let server = new Pretender(function () {
       this.get('/v1/sys/internal/ui/mounts', () => {
         return [200, { 'Content-Type': 'application/json' }, JSON.stringify({ data: { auth: methods } })];
       });
     });
     this.set('cluster', EmberObject.create({}));
-    await render(hbs`<AuthForm @cluster={{this.cluster}} />`);
+    await render(hbs`<AuthForm @cluster={{cluster}} />`);
 
     server.shutdown();
-    assert.strictEqual(component.tabs.length, 0, 'renders a tab for every backend');
+    assert.equal(component.tabs.length, 0, 'renders a tab for every backend');
   });
 
   test('it makes a request to unwrap if passed a wrappedToken and logs in', async function (assert) {
     this.owner.register('service:auth', workingAuthService);
     this.auth = this.owner.lookup('service:auth');
-    const authSpy = sinon.spy(this.auth, 'authenticate');
-    const server = new Pretender(function () {
+    let authSpy = sinon.spy(this.auth, 'authenticate');
+    let server = new Pretender(function () {
       this.post('/v1/sys/wrapping/unwrap', () => {
         return [
           200,
@@ -229,18 +239,14 @@ module('Integration | Component | auth form', function (hooks) {
       });
     });
 
-    const wrappedToken = '54321';
+    let wrappedToken = '54321';
     this.set('wrappedToken', wrappedToken);
     this.set('cluster', EmberObject.create({}));
-    await render(hbs`<AuthForm @cluster={{this.cluster}} @wrappedToken={{this.wrappedToken}} />`);
+    await render(hbs`<AuthForm @cluster={{cluster}} @wrappedToken={{wrappedToken}} />`);
     later(() => cancelTimers(), 50);
     await settled();
-    assert.strictEqual(
-      server.handledRequests[0].url,
-      '/v1/sys/wrapping/unwrap',
-      'makes call to unwrap the token'
-    );
-    assert.strictEqual(
+    assert.equal(server.handledRequests[0].url, '/v1/sys/wrapping/unwrap', 'makes call to unwrap the token');
+    assert.equal(
       server.handledRequests[0].requestHeaders['X-Vault-Token'],
       wrappedToken,
       'uses passed wrapped token for the unwrap'
@@ -251,7 +257,7 @@ module('Integration | Component | auth form', function (hooks) {
   });
 
   test('it shows an error if unwrap errors', async function (assert) {
-    const server = new Pretender(function () {
+    let server = new Pretender(function () {
       this.post('/v1/sys/wrapping/unwrap', () => {
         return [
           400,
@@ -264,11 +270,11 @@ module('Integration | Component | auth form', function (hooks) {
     });
 
     this.set('wrappedToken', '54321');
-    await render(hbs`{{auth-form cluster=this.cluster wrappedToken=this.wrappedToken}}`);
+    await render(hbs`{{auth-form cluster=cluster wrappedToken=wrappedToken}}`);
     later(() => cancelTimers(), 50);
 
     await settled();
-    assert.strictEqual(
+    assert.equal(
       component.errorText,
       'Error Token unwrap failed: There was an error unwrapping!',
       'shows the error'
diff --git a/ui/tests/integration/components/auth-jwt-test.js b/ui/tests/integration/components/auth-jwt-test.js
index 6c114d9077128..c0e30cb6c498e 100644
--- a/ui/tests/integration/components/auth-jwt-test.js
+++ b/ui/tests/integration/components/auth-jwt-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { _cancelTimers as cancelTimers } from '@ember/runloop';
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
@@ -39,26 +34,26 @@ const OIDC_AUTH_RESPONSE = {
 };
 
 const renderIt = async (context, path = 'jwt') => {
-  const handler = (data, e) => {
+  let handler = (data, e) => {
     if (e && e.preventDefault) e.preventDefault();
     return resolve();
   };
-  const fake = fakeWindow.create();
+  let fake = fakeWindow.create();
   context.set('window', fake);
   context.set('handler', sinon.spy(handler));
   context.set('roleName', '');
   context.set('selectedAuthPath', path);
   await render(hbs`
     <AuthJwt
-      @window={{this.window}}
-      @roleName={{this.roleName}}
-      @selectedAuthPath={{this.selectedAuthPath}}
-      @onError={{action (mut this.error)}}
-      @onLoading={{action (mut this.isLoading)}}
-      @onNamespace={{action (mut this.namespace)}}
-      @onSelectedAuth={{action (mut this.selectedAuth)}}
-      @onSubmit={{action this.handler}}
-      @onRoleName={{action (mut this.roleName)}}
+      @window={{window}}
+      @roleName={{roleName}}
+      @selectedAuthPath={{selectedAuthPath}}
+      @onError={{action (mut error)}}
+      @onLoading={{action (mut isLoading)}}
+      @onNamespace={{action (mut namespace)}}
+      @onSelectedAuth={{action (mut selectedAuth)}}
+      @onSubmit={{action handler}}
+      @onRoleName={{action (mut roleName)}}
     />
     `);
 };
@@ -100,8 +95,8 @@ module('Integration | Component | auth jwt', function (hooks) {
   });
 
   test('it renders the yield', async function (assert) {
-    await render(hbs`<AuthJwt @onSubmit={{action (mut this.submit)}}>Hello!</AuthJwt>`);
-    assert.strictEqual(component.yieldContent, 'Hello!', 'yields properly');
+    await render(hbs`<AuthJwt @onSubmit={{action (mut submit)}}>Hello!</AuthJwt>`);
+    assert.equal(component.yieldContent, 'Hello!', 'yields properly');
   });
 
   test('jwt: it renders and makes auth_url requests', async function (assert) {
@@ -109,12 +104,12 @@ module('Integration | Component | auth jwt', function (hooks) {
     await settled();
     assert.ok(component.jwtPresent, 'renders jwt field');
     assert.ok(component.rolePresent, 'renders jwt field');
-    assert.strictEqual(this.server.handledRequests.length, 1, 'request to the default path is made');
-    assert.strictEqual(this.server.handledRequests[0].url, '/v1/auth/jwt/oidc/auth_url');
+    assert.equal(this.server.handledRequests.length, 1, 'request to the default path is made');
+    assert.equal(this.server.handledRequests[0].url, '/v1/auth/jwt/oidc/auth_url');
     this.set('selectedAuthPath', 'foo');
     await settled();
-    assert.strictEqual(this.server.handledRequests.length, 2, 'a second request was made');
-    assert.strictEqual(
+    assert.equal(this.server.handledRequests.length, 2, 'a second request was made');
+    assert.equal(
       this.server.handledRequests[1].url,
       '/v1/auth/foo/oidc/auth_url',
       'requests when path is set'
@@ -134,16 +129,12 @@ module('Integration | Component | auth jwt', function (hooks) {
     await component.role('test');
     await settled();
     assert.notOk(component.jwtPresent, 'does not show jwt input for OIDC type login');
-    assert.strictEqual(component.loginButtonText, 'Sign in with OIDC Provider');
+    assert.equal(component.loginButtonText, 'Sign in with OIDC Provider');
 
     await component.role('okta');
     // 1 for initial render, 1 for each time role changed = 3
-    assert.strictEqual(this.server.handledRequests.length, 4, 'fetches the auth_url when the path changes');
-    assert.strictEqual(
-      component.loginButtonText,
-      'Sign in with Okta',
-      'recognizes auth methods with certain urls'
-    );
+    assert.equal(this.server.handledRequests.length, 4, 'fetches the auth_url when the path changes');
+    assert.equal(component.loginButtonText, 'Sign in with Okta', 'recognizes auth methods with certain urls');
   });
 
   test('oidc: it calls window.open popup window on login', async function (assert) {
@@ -155,7 +146,7 @@ module('Integration | Component | auth jwt', function (hooks) {
       return this.openSpy.calledOnce;
     });
     cancelTimers();
-    const call = this.openSpy.getCall(0);
+    let call = this.openSpy.getCall(0);
     assert.deepEqual(
       call.args,
       ['http://example.com', 'vaultOIDCWindow', 'width=500,height=600,resizable,scrollbars=yes,top=0,left=0'],
@@ -173,7 +164,7 @@ module('Integration | Component | auth jwt', function (hooks) {
     });
     this.window.close();
     await settled();
-    assert.strictEqual(this.error, ERROR_WINDOW_CLOSED, 'calls onError with error string');
+    assert.equal(this.error, ERROR_WINDOW_CLOSED, 'calls onError with error string');
   });
 
   test('oidc: shows error when message posted with state key, wrong params', async function (assert) {
@@ -189,7 +180,7 @@ module('Integration | Component | auth jwt', function (hooks) {
       buildMessage({ data: { source: 'oidc-callback', state: 'state', foo: 'bar' } })
     );
     cancelTimers();
-    assert.strictEqual(this.error, ERROR_MISSING_PARAMS, 'calls onError with params missing error');
+    assert.equal(this.error, ERROR_MISSING_PARAMS, 'calls onError with params missing error');
   });
 
   test('oidc: storage event fires with state key, correct params', async function (assert) {
diff --git a/ui/tests/integration/components/autocomplete-input-test.js b/ui/tests/integration/components/autocomplete-input-test.js
index 051dd17327061..cebdb4dd34513 100644
--- a/ui/tests/integration/components/autocomplete-input-test.js
+++ b/ui/tests/integration/components/autocomplete-input-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { click, fillIn, triggerEvent, typeIn, render } from '@ember/test-helpers';
@@ -34,7 +29,7 @@ module('Integration | Component | autocomplete-input', function (hooks) {
     const changeValue = 'foo bar';
     this.value = 'test';
     this.placeholder = 'text goes here';
-    this.onChange = (value) => assert.strictEqual(value, changeValue, 'Value sent in onChange callback');
+    this.onChange = (value) => assert.equal(value, changeValue, 'Value sent in onChange callback');
 
     await render(
       hbs`
@@ -87,6 +82,6 @@ module('Integration | Component | autocomplete-input', function (hooks) {
     assert
       .dom('input')
       .hasValue('$foo-$bar', 'Value is updated correctly. Trigger character is prepended to option.');
-    assert.strictEqual(this.value, '$foo-$bar', 'Value prop is updated correctly onChange');
+    assert.equal(this.value, '$foo-$bar', 'Value prop is updated correctly onChange');
   });
 });
diff --git a/ui/tests/integration/components/b64-toggle-test.js b/ui/tests/integration/components/b64-toggle-test.js
index 6a9a6f81d26a0..1a59a03c21ad0 100644
--- a/ui/tests/integration/components/b64-toggle-test.js
+++ b/ui/tests/integration/components/b64-toggle-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render, click, find } from '@ember/test-helpers';
@@ -18,24 +13,24 @@ module('Integration | Component | b64 toggle', function (hooks) {
 
   test('it toggles encoding on the passed string', async function (assert) {
     this.set('value', 'value');
-    await render(hbs`{{b64-toggle value=this.value}}`);
+    await render(hbs`{{b64-toggle value=value}}`);
     await click('button');
-    assert.strictEqual(this.value, btoa('value'), 'encodes to base64');
+    assert.equal(this.value, btoa('value'), 'encodes to base64');
     await click('button');
-    assert.strictEqual(this.value, 'value', 'decodes from base64');
+    assert.equal(this.value, 'value', 'decodes from base64');
   });
 
   test('it toggles encoding starting with base64', async function (assert) {
     this.set('value', btoa('value'));
-    await render(hbs`{{b64-toggle value=this.value initialEncoding='base64'}}`);
+    await render(hbs`{{b64-toggle value=value initialEncoding='base64'}}`);
     assert.ok(find('button').textContent.includes('Decode'), 'renders as on when in b64 mode');
     await click('button');
-    assert.strictEqual(this.value, 'value', 'decodes from base64');
+    assert.equal(this.value, 'value', 'decodes from base64');
   });
 
   test('it detects changes to value after encoding', async function (assert) {
     this.set('value', btoa('value'));
-    await render(hbs`{{b64-toggle value=this.value initialEncoding='base64'}}`);
+    await render(hbs`{{b64-toggle value=value initialEncoding='base64'}}`);
     assert.ok(find('button').textContent.includes('Decode'), 'renders as on when in b64 mode');
     this.set('value', btoa('value') + '=');
     assert.ok(find('button').textContent.includes('Encode'), 'toggles off since value has changed');
@@ -48,7 +43,7 @@ module('Integration | Component | b64 toggle', function (hooks) {
 
   test('it does not toggle when the value is empty', async function (assert) {
     this.set('value', '');
-    await render(hbs`{{b64-toggle value=this.value}}`);
+    await render(hbs`{{b64-toggle value=value}}`);
     await click('button');
     assert.ok(find('button').textContent.includes('Encode'));
   });
diff --git a/ui/tests/integration/components/box-radio-test.js b/ui/tests/integration/components/box-radio-test.js
index 9cf26bb36c8e0..7d59da393e6f3 100644
--- a/ui/tests/integration/components/box-radio-test.js
+++ b/ui/tests/integration/components/box-radio-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import sinon from 'sinon';
@@ -23,11 +18,11 @@ module('Integration | Component | box-radio', function (hooks) {
     const spy = sinon.spy();
     this.set('onRadioChange', spy);
     await render(hbs`<BoxRadio
-      @type={{this.type}}
-      @glyph={{this.type}}
-      @displayName={{this.displayName}}
-      @onRadioChange={{this.onRadioChange}}
-      @disabled={{this.disabled}}
+      @type={{type}}
+      @glyph={{type}}
+      @displayName={{displayName}}
+      @onRadioChange={{onRadioChange}}
+      @disabled={{disabled}}
     />`);
 
     assert.dom(this.element).hasText('An Option', 'shows the display name of the option');
@@ -40,11 +35,11 @@ module('Integration | Component | box-radio', function (hooks) {
     const spy = sinon.spy();
     this.set('onRadioChange', spy);
     await render(hbs`<BoxRadio
-      @type={{this.type}}
-      @glyph={{this.type}}
-      @displayName={{this.displayName}}
-      @onRadioChange={{this.onRadioChange}}
-      @disabled={{true}}
+      @type={{type}}
+      @glyph={{type}}
+      @displayName={{displayName}}
+      @onRadioChange={{onRadioChange}}
+      @disabled=true
     />`);
 
     assert.dom(this.element).hasText('An Option', 'shows the display name of the option');
diff --git a/ui/tests/integration/components/calendar-widget-test.js b/ui/tests/integration/components/calendar-widget-test.js
index 9a9c2d639c91d..a725ea294d9b4 100644
--- a/ui/tests/integration/components/calendar-widget-test.js
+++ b/ui/tests/integration/components/calendar-widget-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render, click } from '@ember/test-helpers';
@@ -10,248 +5,136 @@ import sinon from 'sinon';
 import hbs from 'htmlbars-inline-precompile';
 import calendarDropdown from 'vault/tests/pages/components/calendar-widget';
 import { ARRAY_OF_MONTHS } from 'core/utils/date-formatters';
-import { subMonths, subYears } from 'date-fns';
-import timestamp from 'core/utils/timestamp';
+import { subYears } from 'date-fns';
 
 module('Integration | Component | calendar-widget', function (hooks) {
   setupRenderingTest(hooks);
 
-  hooks.before(function () {
-    sinon.stub(timestamp, 'now').callsFake(() => new Date('2018-04-03T14:15:30'));
-  });
   hooks.beforeEach(function () {
-    const CURRENT_DATE = timestamp.now();
-    this.set('currentDate', CURRENT_DATE);
-    this.set('calendarStartDate', subMonths(CURRENT_DATE, 12));
-    this.set('calendarEndDate', CURRENT_DATE);
-    this.set('startTimestamp', subMonths(CURRENT_DATE, 12).toISOString());
-    this.set('endTimestamp', CURRENT_DATE.toISOString());
+    const CURRENT_YEAR = new Date().getFullYear();
+    const PREVIOUS_YEAR = subYears(new Date(), 1).getFullYear();
+    this.set('currentYear', CURRENT_YEAR);
+    this.set('previousYear', PREVIOUS_YEAR);
     this.set('handleClientActivityQuery', sinon.spy());
-  });
-  hooks.after(function () {
-    timestamp.now.restore();
+    this.set('handleCurrentBillingPeriod', sinon.spy());
+    this.set('arrayOfMonths', ARRAY_OF_MONTHS);
+    this.set('endTimeFromResponse', [CURRENT_YEAR, 0]);
   });
 
-  test('it renders and disables correct months when start date is 12 months ago', async function (assert) {
-    assert.expect(14);
+  test('it renders and can open the calendar view', async function (assert) {
     await render(hbs`
       <CalendarWidget
-        @startTimestamp={{this.startTimestamp}}
-        @endTimestamp={{this.endTimestamp}}
-        @selectMonth={{this.handleClientActivityQuery}}
+        @arrayOfMonths={{arrayOfMonths}}
+        @endTimeDisplay={{concat "January " currentYear}}
+        @endTimeFromResponse={{endTimeFromResponse}}
+        @handleClientActivityQuery={{handleClientActivityQuery}}
+        @handleCurrentBillingPeriod={{handleCurrentBillingPeriod}}
+        @startTimeDisplay={{concat "February " previousYear}}
       />
     `);
-    assert
-      .dom('[data-test-calendar-widget-trigger]')
-      .hasText(`Apr 2017 - Apr 2018`, 'renders and formats start and end dates');
+
     await calendarDropdown.openCalendar();
     assert.ok(calendarDropdown.showsCalendar, 'renders the calendar component');
-    // assert months in current year are disabled/enabled correctly
-    const enabledMonths = ['January', 'February', 'March', 'April'];
-    ARRAY_OF_MONTHS.forEach(function (month) {
-      if (enabledMonths.includes(month)) {
-        assert
-          .dom(`[data-test-calendar-month="${month}"]`)
-          .doesNotHaveClass('is-readOnly', `${month} is enabled`);
-      } else {
-        assert.dom(`[data-test-calendar-month="${month}"]`).hasClass('is-readOnly', `${month} is read only`);
-      }
-    });
   });
 
-  test('it renders and disables months before start timestamp', async function (assert) {
+  test('it does not allow a user to click to a future year but does allow a user to click to previous year', async function (assert) {
     await render(hbs`
       <CalendarWidget
-        @startTimestamp={{this.startTimestamp}}
-        @endTimestamp={{this.endTimestamp}}
-        @selectMonth={{this.handleClientActivityQuery}}
+        @arrayOfMonths={{arrayOfMonths}}
+        @endTimeDisplay={{concat "March " currentYear}}
+        @endTimeFromResponse={{endTimeFromResponse}}
+        @handleClientActivityQuery={{handleClientActivityQuery}}
+        @handleCurrentBillingPeriod={{handleCurrentBillingPeriod}}
+        @startTimeDisplay={{concat "February " previousYear}}
       />
     `);
 
     await calendarDropdown.openCalendar();
-    assert.dom('[data-test-next-year]').isDisabled('Future year is disabled');
+    assert.dom('[data-test-future-year]').isDisabled('Future year is disabled');
+
     await calendarDropdown.clickPreviousYear();
+    assert.dom('[data-test-display-year]').hasText(this.previousYear.toString(), 'shows the previous year');
     assert
-      .dom('[data-test-display-year]')
-      .hasText(`${subYears(this.currentDate, 1).getFullYear()}`, 'shows the previous year');
-    assert.dom('[data-test-previous-year]').isDisabled('disables previous year');
-
-    // assert months in previous year are disabled/enabled correctly
-    const disabledMonths = ['January', 'February', 'March'];
-    ARRAY_OF_MONTHS.forEach(function (month) {
-      if (disabledMonths.includes(month)) {
-        assert.dom(`[data-test-calendar-month="${month}"]`).hasClass('is-readOnly', `${month} is read only`);
-      } else {
-        assert
-          .dom(`[data-test-calendar-month="${month}"]`)
-          .doesNotHaveClass('is-readOnly', `${month} is enabled`);
-      }
-    });
+      .dom('[data-test-calendar-month="January"]')
+      .hasClass(
+        'is-readOnly',
+        `January ${this.previousYear} is disabled because it comes before startTimeDisplay`
+      );
   });
 
-  test('it calls parent callback with correct arg when clicking "Current billing period"', async function (assert) {
+  test('it disables the current month', async function (assert) {
     await render(hbs`
       <CalendarWidget
-        @startTimestamp={{this.startTimestamp}}
-        @endTimestamp={{this.endTimestamp}}
-        @selectMonth={{this.handleClientActivityQuery}}
+        @arrayOfMonths={{arrayOfMonths}}
+        @endTimeDisplay={{concat "January " currentYear}}
+        @endTimeFromResponse={{endTimeFromResponse}}
+        @handleClientActivityQuery={{handleClientActivityQuery}}
+        @handleCurrentBillingPeriod={{handleCurrentBillingPeriod}}
+        @startTimeDisplay={{concat "February " previousYear}}
       />
     `);
-    await calendarDropdown.menuToggle();
-    await calendarDropdown.clickCurrentBillingPeriod();
-    assert.propEqual(
-      this.handleClientActivityQuery.args[0][0],
-      { dateType: 'reset' },
-      'it calls parent function with reset dateType'
-    );
+    await calendarDropdown.openCalendar();
+    const month = this.arrayOfMonths[new Date().getMonth()];
+    assert
+      .dom(`[data-test-calendar-month="${month}"]`)
+      .hasClass('is-readOnly', `${month} ${this.currentYear} is disabled`);
+    // The component also disables all months after the current one, but this
+    // is tricky to test since it's based on browser time, so the behavior
+    // would be different in december than other months
   });
 
-  test('it calls parent callback with correct arg when clicking "Current month"', async function (assert) {
+  test('it allows you to reset the billing period', async function (assert) {
     await render(hbs`
-      <CalendarWidget
-        @startTimestamp={{this.startTimestamp}}
-        @endTimestamp={{this.endTimestamp}}
-        @selectMonth={{this.handleClientActivityQuery}}
-      />
-    `);
+    <CalendarWidget
+      @arrayOfMonths={{arrayOfMonths}}
+      @endTimeDisplay={{concat "January " currentYear}}
+      @endTimeFromResponse={{endTimeFromResponse}}
+      @handleClientActivityQuery={{handleClientActivityQuery}}
+      @handleCurrentBillingPeriod={{handleCurrentBillingPeriod}}
+      @startTimeDisplay={{concat "February " previousYear}}
+    />
+  `);
     await calendarDropdown.menuToggle();
-    await calendarDropdown.clickCurrentMonth();
-    assert.propEqual(
-      this.handleClientActivityQuery.args[0][0],
-      { dateType: 'currentMonth' },
-      'it calls parent function with currentMoth dateType'
-    );
+    await calendarDropdown.clickCurrentBillingPeriod();
+    assert.ok(this.handleCurrentBillingPeriod.calledOnce, 'it calls the parents handleCurrentBillingPeriod');
   });
 
-  test('it calls parent callback with correct arg when selecting a month', async function (assert) {
+  test('it passes the appropriate data to the handleCurrentBillingPeriod when a date is selected', async function (assert) {
     await render(hbs`
-      <CalendarWidget
-        @startTimestamp={{this.startTimestamp}}
-        @endTimestamp={{this.endTimestamp}}
-        @selectMonth={{this.handleClientActivityQuery}}
-      />
-    `);
-    await calendarDropdown.openCalendar();
-    await click(`[data-test-calendar-month="April"`);
-    assert.propEqual(
-      this.handleClientActivityQuery.lastCall.lastArg,
-      {
-        dateType: 'endDate',
-        monthIdx: 3,
-        monthName: 'April',
-        year: 2018,
-      },
-      'it calls parent function with end date (current) month/year'
-    );
-
+    <CalendarWidget
+      @arrayOfMonths={{arrayOfMonths}}
+      @endTimeDisplay={{concat "January " currentYear}}
+      @endTimeFromResponse={{endTimeFromResponse}}
+      @handleClientActivityQuery={{handleClientActivityQuery}}
+      @handleCurrentBillingPeriod={{handleCurrentBillingPeriod}}
+      @startTimeDisplay={{concat "February " previousYear}}
+    />
+  `);
     await calendarDropdown.openCalendar();
     await calendarDropdown.clickPreviousYear();
-    await click(`[data-test-calendar-month="March"]`);
-    assert.propEqual(
-      this.handleClientActivityQuery.lastCall.lastArg,
-      {
-        dateType: 'endDate',
-        monthIdx: 2,
-        monthName: 'March',
-        year: 2017,
-      },
-      'it calls parent function with selected start date month/year'
+    await click('[data-test-calendar-month="October"]'); // select endTime of October 2021
+    assert.ok(this.handleClientActivityQuery.calledOnce, 'it calls the parents handleClientActivityQuery');
+    assert.ok(
+      this.handleClientActivityQuery.calledWith(9, this.previousYear, 'endTime'),
+      'Passes the month as an index, year and date type to the parent'
     );
   });
 
-  test('it disables correct months when start date 6 months ago', async function (assert) {
-    this.set('calendarStartDate', subMonths(this.currentDate, 6)); // Nov 3, 2017
-    this.set('startTimestamp', subMonths(this.currentDate, 6).toISOString());
+  test('it displays the year from endTimeDisplay when opened', async function (assert) {
+    this.set('endTimeFromResponse', [this.previousYear, 11]);
     await render(hbs`
-      <CalendarWidget
-        @startTimestamp={{this.startTimestamp}}
-        @endTimestamp={{this.endTimestamp}}
-        @selectMonth={{this.handleClientActivityQuery}}
-      />
-    `);
-
+    <CalendarWidget
+      @arrayOfMonths={{arrayOfMonths}}
+      @endTimeDisplay={{concat "December " previousYear}}
+      @endTimeFromResponse={{endTimeFromResponse}}
+      @handleClientActivityQuery={{handleClientActivityQuery}}
+      @handleCurrentBillingPeriod={{handleCurrentBillingPeriod}}
+      @startTimeDisplay={{"March 2020"}}
+    />
+  `);
     await calendarDropdown.openCalendar();
-    assert.dom('[data-test-next-year]').isDisabled('Future year is disabled');
-
-    // Check start year disables correct months
-    await calendarDropdown.clickPreviousYear();
-    assert.dom('[data-test-previous-year]').isDisabled('previous year is disabled');
-    const prevYearEnabled = ['October', 'November', 'December'];
-    ARRAY_OF_MONTHS.forEach(function (month) {
-      if (prevYearEnabled.includes(month)) {
-        assert
-          .dom(`[data-test-calendar-month="${month}"]`)
-          .doesNotHaveClass('is-readOnly', `${month} is enabled`);
-      } else {
-        assert.dom(`[data-test-calendar-month="${month}"]`).hasClass('is-readOnly', `${month} is read only`);
-      }
-    });
-
-    // Check end year disables correct months
-    await click('[data-test-next-year]');
-    const currYearEnabled = ['January', 'February', 'March', 'April'];
-    ARRAY_OF_MONTHS.forEach(function (month) {
-      if (currYearEnabled.includes(month)) {
-        assert
-          .dom(`[data-test-calendar-month="${month}"]`)
-          .doesNotHaveClass('is-readOnly', `${month} is enabled`);
-      } else {
-        assert.dom(`[data-test-calendar-month="${month}"]`).hasClass('is-readOnly', `${month} is read only`);
-      }
-    });
-  });
-
-  test('it disables correct months when start date 36 months ago', async function (assert) {
-    this.set('calendarStartDate', subMonths(this.currentDate, 36)); // April 3 2015
-    this.set('startTimestamp', subMonths(this.currentDate, 36).toISOString());
-    await render(hbs`
-      <CalendarWidget
-        @startTimestamp={{this.startTimestamp}}
-        @endTimestamp={{this.endTimestamp}}
-        @selectMonth={{this.handleClientActivityQuery}}
-      />
-    `);
-
-    await calendarDropdown.openCalendar();
-    assert.dom('[data-test-next-year]').isDisabled('Future year is disabled');
-
-    for (const year of [2017, 2016, 2015]) {
-      await calendarDropdown.clickPreviousYear();
-      assert.dom('[data-test-display-year]').hasText(year.toString());
-    }
-
-    assert.dom('[data-test-previous-year]').isDisabled('previous year is disabled');
-    assert.dom('[data-test-next-year]').isEnabled('next year is enabled');
-
-    assert.dom('.calendar-widget .is-readOnly').exists('Some months disabled');
-
-    const disabledMonths = ['January', 'February', 'March'];
-    ARRAY_OF_MONTHS.forEach(function (month) {
-      if (disabledMonths.includes(month)) {
-        assert.dom(`[data-test-calendar-month="${month}"]`).hasClass('is-readOnly', `${month} is read only`);
-      } else {
-        assert
-          .dom(`[data-test-calendar-month="${month}"]`)
-          .doesNotHaveClass('is-readOnly', `${month} is enabled`);
-      }
-    });
-
-    await click('[data-test-next-year]');
-    assert.dom('.calendar-widget .is-readOnly').doesNotExist('All months enabled for 2016');
-    await click('[data-test-next-year]');
-    assert.dom('.calendar-widget .is-readOnly').doesNotExist('All months enabled for 2017');
-    await click('[data-test-next-year]');
-    assert.dom('.calendar-widget .is-readOnly').exists('Some months disabled for 2018');
-
-    const enabledMonths = ['January', 'February', 'March', 'April'];
-    ARRAY_OF_MONTHS.forEach(function (month) {
-      if (enabledMonths.includes(month)) {
-        assert
-          .dom(`[data-test-calendar-month="${month}"]`)
-          .doesNotHaveClass('is-readOnly', `${month} is enabled`);
-      } else {
-        assert.dom(`[data-test-calendar-month="${month}"]`).hasClass('is-readOnly', `${month} is read only`);
-      }
-    });
+    assert
+      .dom('[data-test-display-year]')
+      .hasText(this.previousYear.toString(), 'Shows year from the end response');
   });
 });
diff --git a/ui/tests/integration/components/checkbox-grid-test.js b/ui/tests/integration/components/checkbox-grid-test.js
deleted file mode 100644
index d31b7eb95448d..0000000000000
--- a/ui/tests/integration/components/checkbox-grid-test.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { render, click } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-import Sinon from 'sinon';
-
-module('Integration | Component | checkbox-grid', function (hooks) {
-  setupRenderingTest(hooks);
-
-  hooks.beforeEach(function () {
-    this.name = 'fooBar';
-    this.label = 'Foo bar';
-    this.fields = [
-      { key: 'abc', label: 'All Bears Cry' },
-      { key: 'def', label: 'Dark Eel Feelings' },
-    ];
-
-    this.onChange = Sinon.spy();
-  });
-
-  test('it renders with minimum inputs', async function (assert) {
-    const changeSpy = Sinon.spy();
-    this.set('onChange', changeSpy);
-    await render(
-      hbs`<CheckboxGrid @name={{this.name}} @label={{this.label}} @fields={{this.fields}} @onChange={{this.onChange}} />`
-    );
-
-    assert.dom('[data-test-checkbox]').exists({ count: 2 }, 'One checkbox is rendered for each field');
-    assert.dom('[data-test-checkbox]').isNotChecked('no fields are checked by default');
-    await click('[data-test-checkbox="abc"]');
-    assert.ok(changeSpy.calledOnceWithExactly('fooBar', ['abc']));
-  });
-
-  test('it renders with values set', async function (assert) {
-    const changeSpy = Sinon.spy();
-    this.set('onChange', changeSpy);
-    this.set('currentValue', ['abc']);
-    await render(
-      hbs`<CheckboxGrid @name={{this.name}} @label={{this.label}} @fields={{this.fields}} @onChange={{this.onChange}} @value={{this.currentValue}} />`
-    );
-
-    assert.dom('[data-test-checkbox]').exists({ count: 2 }, 'One checkbox is rendered for each field');
-    assert.dom('[data-test-checkbox="abc"]').isChecked('abc field is checked on load');
-    assert.dom('[data-test-checkbox="def"]').isNotChecked('def field is unchecked on load');
-    await click('[data-test-checkbox="abc"]');
-    assert.ok(changeSpy.calledOnceWithExactly('fooBar', []), 'Sends correct payload when unchecking');
-    await click('[data-test-checkbox="def"]');
-    await click('[data-test-checkbox="abc"]');
-    assert.ok(
-      changeSpy.calledWithExactly('fooBar', ['def', 'abc']),
-      'sends correct payload with multiple checked'
-    );
-  });
-});
diff --git a/ui/tests/integration/components/chevron-test.js b/ui/tests/integration/components/chevron-test.js
index ec8f096b8f553..20cc99083900e 100644
--- a/ui/tests/integration/components/chevron-test.js
+++ b/ui/tests/integration/components/chevron-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
@@ -25,12 +20,11 @@ module('Integration | Component | chevron', function (hooks) {
     await render(hbs`<Chevron @direction='left' @isButton={{true}} />`);
     assert.dom('.flight-icon').doesNotHaveClass('hs-icon-button-right', 'renders');
 
-    const promise = waitForError();
+    let promise = waitForError();
     render(hbs`<Chevron @direction='lol' />`);
-    const err = await promise;
-
+    let err = await promise;
     assert.ok(
-      err.message.includes('The direction property of Chevron'),
+      err.message.includes('The direction property of <vault@component:chevron:'),
       'asserts about unsupported direction'
     );
   });
diff --git a/ui/tests/integration/components/clients/attribution-test.js b/ui/tests/integration/components/clients/attribution-test.js
index 76efdca34ffd8..04dcd8a0f9e71 100644
--- a/ui/tests/integration/components/clients/attribution-test.js
+++ b/ui/tests/integration/components/clients/attribution-test.js
@@ -1,30 +1,17 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
-import sinon from 'sinon';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
-import { endOfMonth, formatRFC3339 } from 'date-fns';
+import { formatRFC3339 } from 'date-fns';
 import { click } from '@ember/test-helpers';
-import subMonths from 'date-fns/subMonths';
-import timestamp from 'core/utils/timestamp';
 
 module('Integration | Component | clients/attribution', function (hooks) {
   setupRenderingTest(hooks);
 
-  hooks.before(function () {
-    sinon.stub(timestamp, 'now').callsFake(() => new Date('2018-04-03T14:15:30'));
-  });
   hooks.beforeEach(function () {
-    const mockNow = timestamp.now();
-    this.mockNow = mockNow;
-    this.set('startTimestamp', formatRFC3339(subMonths(mockNow, 6)));
-    this.set('timestamp', formatRFC3339(mockNow));
+    this.set('timestamp', formatRFC3339(new Date()));
     this.set('selectedNamespace', null);
+    this.set('isDateRange', true);
     this.set('chartLegend', [
       { label: 'entity clients', key: 'entity_clients' },
       { label: 'non-entity clients', key: 'non_entity_clients' },
@@ -40,14 +27,11 @@ module('Integration | Component | clients/attribution', function (hooks) {
       { label: 'auth2/', clients: 2, entity_clients: 1, non_entity_clients: 1 },
     ]);
   });
-  hooks.after(function () {
-    timestamp.now.restore();
-  });
 
   test('it renders empty state with no data', async function (assert) {
     await render(hbs`
       <div id="modal-wormhole"></div>
-      <Clients::Attribution @chartLegend={{this.chartLegend}} />
+      <Clients::Attribution @chartLegend={{chartLegend}} />
     `);
 
     assert.dom('[data-test-component="empty-state"]').exists();
@@ -60,15 +44,13 @@ module('Integration | Component | clients/attribution', function (hooks) {
   test('it renders with data for namespaces', async function (assert) {
     await render(hbs`
       <div id="modal-wormhole"></div>
-      <Clients::Attribution
-        @chartLegend={{this.chartLegend}}
-        @totalClientAttribution={{this.totalClientAttribution}}
-        @totalUsageCounts={{this.totalUsageCounts}}
-        @responseTimestamp={{this.timestamp}}
-        @startTimestamp={{this.startTimestamp}}
-        @endTimestamp={{this.timestamp}}
-        @selectedNamespace={{this.selectedNamespace}}
-        @isHistoricalMonth={{false}}
+      <Clients::Attribution 
+        @chartLegend={{chartLegend}}
+        @totalClientAttribution={{totalClientAttribution}} 
+        @totalUsageCounts={{totalUsageCounts}} 
+        @timestamp={{timestamp}} 
+        @selectedNamespace={{selectedNamespace}}
+        @isDateRange={{isDateRange}}
         />
     `);
 
@@ -89,20 +71,17 @@ module('Integration | Component | clients/attribution', function (hooks) {
     assert.dom('[data-test-attribution-clients]').includesText('namespace').includesText('10');
   });
 
-  test('it renders two charts and correct text for single, historical month', async function (assert) {
-    this.start = formatRFC3339(subMonths(this.mockNow, 1));
-    this.end = formatRFC3339(subMonths(endOfMonth(this.mockNow), 1));
+  test('it renders correct text for a single month', async function (assert) {
+    this.set('isDateRange', false);
     await render(hbs`
       <div id="modal-wormhole"></div>
-      <Clients::Attribution
-        @chartLegend={{this.chartLegend}}
-        @totalClientAttribution={{this.totalClientAttribution}}
-        @totalUsageCounts={{this.totalUsageCounts}}
-        @responseTimestamp={{this.timestamp}}
-        @startTimestamp={{this.start}}
-        @endTimestamp={{this.end}}
-        @selectedNamespace={{this.selectedNamespace}}
-        @isHistoricalMonth={{true}}
+      <Clients::Attribution 
+        @chartLegend={{chartLegend}}
+        @totalClientAttribution={{totalClientAttribution}} 
+        @totalUsageCounts={{totalUsageCounts}} 
+        @timestamp={{timestamp}} 
+        @selectedNamespace={{selectedNamespace}}
+        @isDateRange={{isDateRange}}
         />
     `);
     assert
@@ -145,64 +124,17 @@ module('Integration | Component | clients/attribution', function (hooks) {
       );
   });
 
-  test('it renders single chart for current month', async function (assert) {
-    await render(hbs`
-      <div id="modal-wormhole"></div>
-      <Clients::Attribution
-        @chartLegend={{this.chartLegend}}
-        @totalClientAttribution={{this.totalClientAttribution}}
-        @totalUsageCounts={{this.totalUsageCounts}}
-        @responseTimestamp={{this.timestamp}}
-        @startTimestamp={{this.timestamp}}
-        @endTimestamp={{this.timestamp}}
-        @selectedNamespace={{this.selectedNamespace}}
-        @isHistoricalMonth={{false}}
-        />
-    `);
-    assert
-      .dom('[data-test-chart-container="single-chart"]')
-      .exists('renders single chart with total clients');
-    assert
-      .dom('[data-test-attribution-subtext]')
-      .hasTextContaining('this month', 'renders total monthly namespace text');
-  });
-
-  test('it renders single chart and correct text for for date range', async function (assert) {
-    await render(hbs`
-      <div id="modal-wormhole"></div>
-      <Clients::Attribution
-        @chartLegend={{this.chartLegend}}
-        @totalClientAttribution={{this.totalClientAttribution}}
-        @totalUsageCounts={{this.totalUsageCounts}}
-        @responseTimestamp={{this.timestamp}}
-        @startTimestamp={{this.startTimestamp}}
-        @endTimestamp={{this.timestamp}}
-        @selectedNamespace={{this.selectedNamespace}}
-        @isHistoricalMonth={{false}}
-        />
-    `);
-
-    assert
-      .dom('[data-test-chart-container="single-chart"]')
-      .exists('renders single chart with total clients');
-    assert
-      .dom('[data-test-attribution-subtext]')
-      .hasTextContaining('date range', 'renders total monthly namespace text');
-  });
-
   test('it renders with data for selected namespace auth methods for a date range', async function (assert) {
     this.set('selectedNamespace', 'second');
     await render(hbs`
       <div id="modal-wormhole"></div>
-      <Clients::Attribution
-        @chartLegend={{this.chartLegend}}
-        @totalClientAttribution={{this.namespaceMountsData}}
-        @totalUsageCounts={{this.totalUsageCounts}}
-        @responseTimestamp={{this.timestamp}}
-        @startTimestamp={{this.startTimestamp}}
-        @endTimestamp={{this.timestamp}}
-        @selectedNamespace={{this.selectedNamespace}}
-        @isHistoricalMonth={{this.isHistoricalMonth}}
+      <Clients::Attribution 
+        @chartLegend={{chartLegend}}
+        @totalClientAttribution={{namespaceMountsData}} 
+        @totalUsageCounts={{totalUsageCounts}} 
+        @timestamp={{timestamp}} 
+        @selectedNamespace={{selectedNamespace}}
+        @isDateRange={{isDateRange}}
         />
     `);
 
@@ -226,16 +158,16 @@ module('Integration | Component | clients/attribution', function (hooks) {
   test('it renders modal', async function (assert) {
     await render(hbs`
       <div id="modal-wormhole"></div>
-      <Clients::Attribution
-        @chartLegend={{this.chartLegend}}
-        @totalClientAttribution={{this.namespaceMountsData}}
-        @responseTimestamp={{this.timestamp}}
-        @startTimestamp="2022-06-01T23:00:11.050Z"
-        @endTimestamp="2022-12-01T23:00:11.050Z"
+      <Clients::Attribution 
+        @chartLegend={{chartLegend}}
+        @totalClientAttribution={{namespaceMountsData}} 
+        @timestamp={{timestamp}} 
+        @startTimeDisplay={{"January 2022"}}
+        @endTimeDisplay={{"February 2022"}}
         />
     `);
     await click('[data-test-attribution-export-button]');
     assert.dom('.modal.is-active .title').hasText('Export attribution data', 'modal appears to export csv');
-    assert.dom('.modal.is-active').includesText('June 2022 - December 2022');
+    assert.dom('.modal.is-active').includesText('January 2022 - February 2022');
   });
 });
diff --git a/ui/tests/integration/components/clients/config-test.js b/ui/tests/integration/components/clients/config-test.js
index 65e8ea3d4cfa9..2c0d36bb0fcf7 100644
--- a/ui/tests/integration/components/clients/config-test.js
+++ b/ui/tests/integration/components/clients/config-test.js
@@ -1,46 +1,56 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
-import { render, find, click, fillIn } from '@ember/test-helpers';
-import { setupMirage } from 'ember-cli-mirage/test-support';
+import { render, find, click } from '@ember/test-helpers';
+import { resolve } from 'rsvp';
 import hbs from 'htmlbars-inline-precompile';
-import sinon from 'sinon';
 
 module('Integration | Component | client count config', function (hooks) {
   setupRenderingTest(hooks);
-  setupMirage(hooks);
+
+  const createAttr = (name, type, options) => {
+    return {
+      name,
+      type,
+      options,
+    };
+  };
+
+  const generateModel = (overrides) => {
+    return {
+      enabled: 'On',
+      retentionMonths: 24,
+      defaultReportMonths: 12,
+      configAttrs: [
+        createAttr('enabled', 'string', { editType: 'boolean' }),
+        createAttr('retentionMonths', 'number'),
+      ],
+      changedAttributes: () => ({}),
+      save: () => {},
+      ...overrides,
+    };
+  };
 
   hooks.beforeEach(function () {
     this.router = this.owner.lookup('service:router');
-    this.transitionStub = sinon.stub(this.router, 'transitionTo');
-    const store = this.owner.lookup('service:store');
-    this.createModel = (enabled = 'enable', reporting_enabled = false, minimum_retention_months = 0) => {
-      store.pushPayload('clients/config', {
-        modelName: 'clients/config',
-        id: 'foo',
-        data: {
-          enabled,
-          reporting_enabled,
-          minimum_retention_months,
-          retention_months: 24,
-        },
-      });
-      this.model = store.peekRecord('clients/config', 'foo');
-    };
+    this.router.reopen({
+      transitionTo() {
+        return {
+          followRedirects() {
+            return resolve();
+          },
+        };
+      },
+    });
+    let model = generateModel();
+    this.model = model;
   });
 
   test('it shows the table with the correct rows by default', async function (assert) {
-    this.createModel();
+    await render(hbs`<Clients::Config @model={{model}} />`);
 
-    await render(hbs`<Clients::Config @model={{this.model}} />`);
-
-    assert.dom('[data-test-clients-config-table]').exists('Clients config table exists');
+    assert.dom('[data-test-pricing-metrics-config-table]').exists('Pricing metrics config table exists');
     const rows = document.querySelectorAll('.info-table-row');
-    assert.strictEqual(rows.length, 2, 'renders 2 info table rows');
+    assert.equal(rows.length, 2, 'renders 2 infotable rows');
     assert.ok(
       find('[data-test-row-value="Usage data collection"]').textContent.includes('On'),
       'Enabled value matches model'
@@ -51,122 +61,72 @@ module('Integration | Component | client count config', function (hooks) {
     );
   });
 
-  test('it should function in edit mode when reporting is disabled', async function (assert) {
-    assert.expect(13);
-
-    this.server.put('/sys/internal/counters/config', (schema, req) => {
-      const { enabled, retention_months } = JSON.parse(req.requestBody);
-      const expected = { enabled: 'enable', retention_months: 5 };
-      assert.deepEqual(expected, { enabled, retention_months }, 'Correct data sent in PUT request');
-      return {};
-    });
-
-    this.createModel('disable');
-
+  test('TODO: it shows the config edit form when mode = edit', async function (assert) {
     await render(hbs`
       <div id="modal-wormhole"></div>
-      <Clients::Config @model={{this.model}} @mode="edit" />
+      <Clients::Config @model={{model}} @mode="edit" />
     `);
 
-    assert.dom('[data-test-input="enabled"]').isNotChecked('Data collection checkbox is not checked');
-    assert
-      .dom('label[for="enabled"]')
-      .hasText('Data collection is off', 'Correct label renders when data collection is off');
-    assert.dom('[data-test-input="retentionMonths"]').hasValue('24', 'Retention months render');
-
-    await click('[data-test-input="enabled"]');
-    await fillIn('[data-test-input="retentionMonths"]', -3);
-    await click('[data-test-clients-config-save]');
-    assert
-      .dom('[data-test-inline-error-message]')
-      .hasText(
-        'Retention period must be greater than or equal to 0.',
-        'Validation error shows for incorrect retention period'
-      );
+    assert.dom('[data-test-pricing-metrics-config-form]').exists('Pricing metrics config form exists');
+    const fields = document.querySelectorAll('[data-test-field]');
+    assert.equal(fields.length, 2, 'renders 2 fields');
+  });
 
-    await fillIn('[data-test-input="retentionMonths"]', 5);
-    await click('[data-test-clients-config-save]');
-    assert.dom('.modal.is-active').exists('Modal renders');
-    assert
-      .dom('[data-test-modal-title] span')
-      .hasText('Turn usage tracking on?', 'Correct modal title renders');
-    assert.dom('[data-test-clients-config-modal="on"]').exists('Correct modal description block renders');
+  test('it shows a modal with correct messaging when disabling', async function (assert) {
+    // Simulates the model when enabled value has been changed from On to Off
+    const simModel = generateModel({
+      enabled: 'Off',
+      changedAttributes: () => ({ enabled: ['On', 'Off'] }),
+    });
+    this.set('model', simModel);
+    await render(hbs`
+      <div id="modal-wormhole"></div>
+      <Clients::Config @model={{model}} @mode="edit" />
+    `);
 
-    await click('[data-test-clients-config-modal="continue"]');
+    await click('[data-test-edit-metrics-config-save]');
+    assert.dom('.modal.is-active').exists('Modal appears');
     assert.ok(
-      this.transitionStub.calledWith('vault.cluster.clients.config'),
-      'Route transitions correctly on save success'
+      find('[data-test-modal-title]').textContent.includes('Turn usage tracking off?'),
+      'Modal confirming turn tracking off'
     );
-
-    await click('[data-test-input="enabled"]');
-    await click('[data-test-clients-config-save]');
-    assert.dom('.modal.is-active').exists('Modal renders');
-    assert
-      .dom('[data-test-modal-title] span')
-      .hasText('Turn usage tracking off?', 'Correct modal title renders');
-    assert.dom('[data-test-clients-config-modal="off"]').exists('Correct modal description block renders');
-
-    await click('[data-test-clients-config-modal="cancel"]');
-    assert.dom('.modal.is-active').doesNotExist('Modal is hidden on cancel');
+    await click('[data-test-metrics-config-cancel]');
+    assert.dom('.modal.is-active').doesNotExist('Modal goes away');
   });
 
-  test('it should function in edit mode when reporting is enabled', async function (assert) {
-    assert.expect(6);
-
-    this.server.put('/sys/internal/counters/config', (schema, req) => {
-      const { enabled, retention_months } = JSON.parse(req.requestBody);
-      const expected = { enabled: 'enable', retention_months: 48 };
-      assert.deepEqual(expected, { enabled, retention_months }, 'Correct data sent in PUT request');
-      return {};
+  test('it shows a modal with correct messaging when enabling', async function (assert) {
+    // Simulates the model when enabled value has been changed from On to Off
+    const simModel = generateModel({
+      changedAttributes: () => ({ enabled: ['Off', 'On'] }),
     });
-
-    this.createModel('enable', true, 24);
-
+    this.set('model', simModel);
     await render(hbs`
       <div id="modal-wormhole"></div>
-      <Clients::Config @model={{this.model}} @mode="edit" />
+      <Clients::Config @model={{model}} @mode="edit" />
     `);
 
-    assert.dom('[data-test-input="enabled"]').isChecked('Data collection input is checked');
-    assert
-      .dom('[data-test-input="enabled"]')
-      .isDisabled('Data collection input disabled when reporting is enabled');
-    assert
-      .dom('label[for="enabled"]')
-      .hasText('Data collection is on', 'Correct label renders when data collection is on');
-    assert.dom('[data-test-input="retentionMonths"]').hasValue('24', 'Retention months render');
-
-    await fillIn('[data-test-input="retentionMonths"]', 5);
-    await click('[data-test-clients-config-save]');
-    assert
-      .dom('[data-test-inline-error-message]')
-      .hasText(
-        'Retention period must be greater than or equal to 24.',
-        'Validation error shows for incorrect retention period'
-      );
-
-    await fillIn('[data-test-input="retentionMonths"]', 48);
-    await click('[data-test-clients-config-save]');
+    await click('[data-test-edit-metrics-config-save]');
+    assert.dom('.modal.is-active').exists('Modal appears');
+    assert.ok(
+      find('[data-test-modal-title]').textContent.includes('Turn usage tracking on?'),
+      'Modal confirming turn tracking on'
+    );
+    await click('[data-test-metrics-config-cancel]');
+    assert.dom('.modal.is-active').doesNotExist('Modal goes away');
   });
 
-  test('it should not show modal when data collection is not changed', async function (assert) {
-    assert.expect(1);
-
-    this.server.put('/sys/internal/counters/config', (schema, req) => {
-      const { enabled, retention_months } = JSON.parse(req.requestBody);
-      const expected = { enabled: 'enable', retention_months: 5 };
-      assert.deepEqual(expected, { enabled, retention_months }, 'Correct data sent in PUT request');
-      return {};
+  test('it does not show a modal on save if enable left unchanged', async function (assert) {
+    // Simulates the model when something other than enabled changed
+    const simModel = generateModel({
+      changedAttributes: () => ({ retentionMonths: [24, '48'] }),
     });
-
-    this.createModel();
-
+    this.set('model', simModel);
     await render(hbs`
       <div id="modal-wormhole"></div>
-      <Clients::Config @model={{this.model}} @mode="edit" />
+      <Clients::Config @model={{model}} @mode="edit" />
     `);
 
-    await fillIn('[data-test-input="retentionMonths"]', 5);
-    await click('[data-test-clients-config-save]');
+    await click('[data-test-edit-metrics-config-save]');
+    assert.dom('.modal.is-active').doesNotExist('No modal appears');
   });
 });
diff --git a/ui/tests/integration/components/clients/horizontal-bar-chart-test.js b/ui/tests/integration/components/clients/horizontal-bar-chart-test.js
index 31f1c4da7439c..a79bfdbdc4077 100644
--- a/ui/tests/integration/components/clients/horizontal-bar-chart-test.js
+++ b/ui/tests/integration/components/clients/horizontal-bar-chart-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { findAll, render, triggerEvent } from '@ember/test-helpers';
@@ -29,16 +24,16 @@ module('Integration | Component | clients/horizontal-bar-chart', function (hooks
     await render(hbs`
     <Clients::HorizontalBarChart
       @dataset={{this.totalClientAttribution}}
-      @chartLegend={{this.chartLegend}}
-      @totalCounts={{this.totalCounts}}
+      @chartLegend={{chartLegend}}
+      @totalCounts={{totalCounts}}
     />`);
 
     assert.dom('[data-test-horizontal-bar-chart]').exists();
     const dataBars = findAll('[data-test-horizontal-bar-chart] rect.data-bar');
     const actionBars = findAll('[data-test-horizontal-bar-chart] rect.action-bar');
 
-    assert.strictEqual(actionBars.length, dataArray.length, 'renders correct number of hover bars');
-    assert.strictEqual(dataBars.length, dataArray.length * 2, 'renders correct number of data bars');
+    assert.equal(actionBars.length, dataArray.length, 'renders correct number of hover bars');
+    assert.equal(dataBars.length, dataArray.length * 2, 'renders correct number of data bars');
 
     const textLabels = this.element.querySelectorAll('[data-test-horizontal-bar-chart] .tick text');
     const textTotals = this.element.querySelectorAll('[data-test-horizontal-bar-chart] text.total-value');
@@ -48,10 +43,10 @@ module('Integration | Component | clients/horizontal-bar-chart', function (hooks
     textTotals.forEach((label, index) => {
       assert.dom(label).hasText(`${dataArray[index].clients}`, 'total value renders correct number');
     });
-    for (const [i, bar] of actionBars.entries()) {
-      const percent = Math.round((dataArray[i].clients / totalObject.clients) * 100);
+    for (let [i, bar] of actionBars.entries()) {
+      let percent = Math.round((dataArray[i].clients / totalObject.clients) * 100);
       await triggerEvent(bar, 'mouseover');
-      const tooltip = document.querySelector('.ember-modal-dialog');
+      let tooltip = document.querySelector('.ember-modal-dialog');
       assert.dom(tooltip).includesText(`${percent}%`, 'tooltip renders correct percentage');
     }
   });
@@ -68,21 +63,21 @@ module('Integration | Component | clients/horizontal-bar-chart', function (hooks
     await render(hbs`
     <Clients::HorizontalBarChart
       @dataset={{this.totalClientAttribution}}
-      @chartLegend={{this.chartLegend}}
-      @totalCounts={{this.totalCounts}}
+      @chartLegend={{chartLegend}}
+      @totalCounts={{totalCounts}}
     />`);
 
     assert.dom('[data-test-horizontal-bar-chart]').exists();
     const dataBars = findAll('[data-test-horizontal-bar-chart] rect.data-bar');
     const actionBars = findAll('[data-test-horizontal-bar-chart] rect.action-bar');
 
-    assert.strictEqual(actionBars.length, dataArray.length, 'renders correct number of hover bars');
-    assert.strictEqual(dataBars.length, dataArray.length * 2, 'renders correct number of data bars');
+    assert.equal(actionBars.length, dataArray.length, 'renders correct number of hover bars');
+    assert.equal(dataBars.length, dataArray.length * 2, 'renders correct number of data bars');
 
-    for (const [i, bar] of actionBars.entries()) {
-      const percent = Math.round((dataArray[i].clients / totalObject.clients) * 100);
+    for (let [i, bar] of actionBars.entries()) {
+      let percent = Math.round((dataArray[i].clients / totalObject.clients) * 100);
       await triggerEvent(bar, 'mouseover');
-      const tooltip = document.querySelector('.ember-modal-dialog');
+      let tooltip = document.querySelector('.ember-modal-dialog');
       assert.dom(tooltip).includesText(`${percent}%`, 'tooltip renders correct percentage');
     }
   });
diff --git a/ui/tests/integration/components/clients/line-chart-test.js b/ui/tests/integration/components/clients/line-chart-test.js
index 723df5dedeea6..013e7633678a0 100644
--- a/ui/tests/integration/components/clients/line-chart-test.js
+++ b/ui/tests/integration/components/clients/line-chart-test.js
@@ -1,22 +1,12 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
-import sinon from 'sinon';
 import { setupRenderingTest } from 'ember-qunit';
 import { find, render, findAll, triggerEvent } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
 import { format, formatRFC3339, subMonths } from 'date-fns';
 import { formatChartDate } from 'core/utils/date-formatters';
-import timestamp from 'core/utils/timestamp';
-
 module('Integration | Component | clients/line-chart', function (hooks) {
   setupRenderingTest(hooks);
-  hooks.before(function () {
-    sinon.stub(timestamp, 'now').callsFake(() => new Date('2018-04-03T14:15:30'));
-  });
+  const CURRENT_DATE = new Date();
   hooks.beforeEach(function () {
     this.set('xKey', 'foo');
     this.set('yKey', 'bar');
@@ -39,14 +29,11 @@ module('Integration | Component | clients/line-chart', function (hooks) {
       },
     ]);
   });
-  hooks.after(function () {
-    timestamp.now.restore();
-  });
 
   test('it renders', async function (assert) {
     await render(hbs`
     <div class="chart-container-wide">
-      <Clients::LineChart @dataset={{this.dataset}} @xKey={{this.xKey}} @yKey={{this.yKey}} />
+      <Clients::LineChart @dataset={{dataset}} @xKey={{xKey}} @yKey={{yKey}} />
       </div>
     `);
 
@@ -64,22 +51,21 @@ module('Integration | Component | clients/line-chart', function (hooks) {
   });
 
   test('it renders upgrade data', async function (assert) {
-    const now = timestamp.now();
     this.set('dataset', [
       {
-        foo: format(subMonths(now, 4), 'M/yy'),
+        foo: format(subMonths(CURRENT_DATE, 4), 'M/yy'),
         bar: 4,
       },
       {
-        foo: format(subMonths(now, 3), 'M/yy'),
+        foo: format(subMonths(CURRENT_DATE, 3), 'M/yy'),
         bar: 8,
       },
       {
-        foo: format(subMonths(now, 2), 'M/yy'),
+        foo: format(subMonths(CURRENT_DATE, 2), 'M/yy'),
         bar: 14,
       },
       {
-        foo: format(subMonths(now, 1), 'M/yy'),
+        foo: format(subMonths(CURRENT_DATE, 1), 'M/yy'),
         bar: 10,
       },
     ]);
@@ -87,16 +73,16 @@ module('Integration | Component | clients/line-chart', function (hooks) {
       {
         id: '1.10.1',
         previousVersion: '1.9.2',
-        timestampInstalled: formatRFC3339(subMonths(now, 2)),
+        timestampInstalled: formatRFC3339(subMonths(CURRENT_DATE, 2)),
       },
     ]);
     await render(hbs`
     <div class="chart-container-wide">
-      <Clients::LineChart
-        @dataset={{this.dataset}}
-        @upgradeData={{this.upgradeData}}
-        @xKey={{this.xKey}}
-        @yKey={{this.yKey}}
+      <Clients::LineChart 
+        @dataset={{dataset}} 
+        @upgradeData={{upgradeData}} 
+        @xKey={{xKey}} 
+        @yKey={{yKey}} 
       />
     </div>
     `);
@@ -110,31 +96,30 @@ module('Integration | Component | clients/line-chart', function (hooks) {
   });
 
   test('it renders tooltip', async function (assert) {
-    const now = timestamp.now();
     const tooltipData = [
       {
-        month: format(subMonths(now, 4), 'M/yy'),
+        month: format(subMonths(CURRENT_DATE, 4), 'M/yy'),
         clients: 4,
         new_clients: {
           clients: 0,
         },
       },
       {
-        month: format(subMonths(now, 3), 'M/yy'),
+        month: format(subMonths(CURRENT_DATE, 3), 'M/yy'),
         clients: 8,
         new_clients: {
           clients: 4,
         },
       },
       {
-        month: format(subMonths(now, 2), 'M/yy'),
+        month: format(subMonths(CURRENT_DATE, 2), 'M/yy'),
         clients: 14,
         new_clients: {
           clients: 6,
         },
       },
       {
-        month: format(subMonths(now, 1), 'M/yy'),
+        month: format(subMonths(CURRENT_DATE, 1), 'M/yy'),
         clients: 20,
         new_clients: {
           clients: 4,
@@ -146,23 +131,23 @@ module('Integration | Component | clients/line-chart', function (hooks) {
       {
         id: '1.10.1',
         previousVersion: '1.9.2',
-        timestampInstalled: formatRFC3339(subMonths(now, 2)),
+        timestampInstalled: formatRFC3339(subMonths(CURRENT_DATE, 2)),
       },
     ]);
     await render(hbs`
     <div class="chart-container-wide">
-      <Clients::LineChart
-        @dataset={{this.dataset}}
-        @upgradeData={{this.upgradeData}}
+      <Clients::LineChart 
+        @dataset={{dataset}} 
+        @upgradeData={{upgradeData}}
       />
     </div>
     `);
 
     const tooltipHoverCircles = findAll('[data-test-line-chart] circle.hover-circle');
-    for (const [i, bar] of tooltipHoverCircles.entries()) {
+    for (let [i, bar] of tooltipHoverCircles.entries()) {
       await triggerEvent(bar, 'mouseover');
-      const tooltip = document.querySelector('.ember-modal-dialog');
-      const { month, clients, new_clients } = tooltipData[i];
+      let tooltip = document.querySelector('.ember-modal-dialog');
+      let { month, clients, new_clients } = tooltipData[i];
       assert
         .dom(tooltip)
         .includesText(
@@ -176,11 +161,11 @@ module('Integration | Component | clients/line-chart', function (hooks) {
     this.set('upgradeData', { some: 'object' });
     await render(hbs`
     <div class="chart-container-wide">
-    <Clients::LineChart
-    @dataset={{this.dataset}}
-    @upgradeData={{this.upgradeData}}
-    @xKey={{this.xKey}}
-    @yKey={{this.yKey}}
+    <Clients::LineChart 
+    @dataset={{dataset}} 
+    @upgradeData={{upgradeData}} 
+    @xKey={{xKey}} 
+    @yKey={{yKey}} 
     />
     </div>
     `);
@@ -194,11 +179,11 @@ module('Integration | Component | clients/line-chart', function (hooks) {
     this.set('upgradeData', [{ incorrect: 'key names' }]);
     await render(hbs`
     <div class="chart-container-wide">
-    <Clients::LineChart
-    @dataset={{this.dataset}}
-    @upgradeData={{this.upgradeData}}
-    @xKey={{this.xKey}}
-    @yKey={{this.yKey}}
+    <Clients::LineChart 
+    @dataset={{dataset}} 
+    @upgradeData={{upgradeData}} 
+    @xKey={{xKey}} 
+    @yKey={{yKey}} 
     />
     </div>
     `);
diff --git a/ui/tests/integration/components/clients/monthly-usage-test.js b/ui/tests/integration/components/clients/monthly-usage-test.js
index 8efc7bf8b6345..e14d0183b8591 100644
--- a/ui/tests/integration/components/clients/monthly-usage-test.js
+++ b/ui/tests/integration/components/clients/monthly-usage-test.js
@@ -1,10 +1,4 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
-import sinon from 'sinon';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
@@ -12,7 +6,6 @@ import { formatRFC3339 } from 'date-fns';
 import { findAll } from '@ember/test-helpers';
 import { calculateAverage } from 'vault/utils/chart-helpers';
 import { formatNumber } from 'core/helpers/format-number';
-import timestamp from 'core/utils/timestamp';
 
 module('Integration | Component | clients/monthly-usage', function (hooks) {
   setupRenderingTest(hooks);
@@ -1415,11 +1408,8 @@ module('Integration | Component | clients/monthly-usage', function (hooks) {
       },
     },
   ];
-  hooks.before(function () {
-    sinon.stub(timestamp, 'now').callsFake(() => new Date('2018-04-03T14:15:30'));
-  });
   hooks.beforeEach(function () {
-    this.set('timestamp', formatRFC3339(timestamp.now()));
+    this.set('timestamp', formatRFC3339(new Date()));
     this.set('isDateRange', true);
     this.set('chartLegend', [
       { label: 'entity clients', key: 'entity_clients' },
@@ -1427,14 +1417,11 @@ module('Integration | Component | clients/monthly-usage', function (hooks) {
     ]);
     this.set('byMonthActivityData', DATASET);
   });
-  hooks.after(function () {
-    timestamp.now.restore();
-  });
 
   test('it renders empty state with no data', async function (assert) {
     await render(hbs`
       <div id="modal-wormhole"></div>
-      <Clients::MonthlyUsage @chartLegend={{this.chartLegend}} @responseTimestamp={{this.timestamp}}/>
+      <Clients::MonthlyUsage @chartLegend={{chartLegend}} @timestamp={{timestamp}}/>
     `);
     assert.dom('[data-test-monthly-usage]').exists('monthly usage component renders');
     assert.dom('[data-test-component="empty-state"]').exists();
@@ -1456,10 +1443,10 @@ module('Integration | Component | clients/monthly-usage', function (hooks) {
     ]);
     await render(hbs`
     <div id="modal-wormhole"></div>
-    <Clients::MonthlyUsage
-    @chartLegend={{this.chartLegend}}
-    @verticalBarChartData={{this.byMonthActivityData}}
-    @responseTimestamp={{this.timestamp}}
+    <Clients::MonthlyUsage 
+    @chartLegend={{chartLegend}}
+    @verticalBarChartData={{byMonthActivityData}} 
+    @timestamp={{timestamp}}
     />
     `);
     assert.dom('[data-test-monthly-usage]').exists('monthly usage component renders');
diff --git a/ui/tests/integration/components/clients/running-total-test.js b/ui/tests/integration/components/clients/running-total-test.js
index 3e71afa36e055..82fa0adb04a81 100644
--- a/ui/tests/integration/components/clients/running-total-test.js
+++ b/ui/tests/integration/components/clients/running-total-test.js
@@ -1,10 +1,4 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
-import sinon from 'sinon';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
@@ -12,7 +6,6 @@ import { formatRFC3339 } from 'date-fns';
 import { findAll } from '@ember/test-helpers';
 import { calculateAverage } from 'vault/utils/chart-helpers';
 import { formatNumber } from 'core/helpers/format-number';
-import timestamp from 'core/utils/timestamp';
 
 module('Integration | Component | clients/running-total', function (hooks) {
   setupRenderingTest(hooks);
@@ -1421,22 +1414,17 @@ module('Integration | Component | clients/running-total', function (hooks) {
     entity_clients: 20818,
     non_entity_clients: 17850,
   };
-  hooks.before(function () {
-    sinon.stub(timestamp, 'now').callsFake(() => new Date('2018-04-03T14:15:30'));
-  });
   hooks.beforeEach(function () {
-    this.set('timestamp', formatRFC3339(timestamp.now()));
+    this.set('timestamp', formatRFC3339(new Date()));
     this.set('chartLegend', [
       { label: 'entity clients', key: 'entity_clients' },
       { label: 'non-entity clients', key: 'non_entity_clients' },
     ]);
   });
-  hooks.after(function () {
-    timestamp.now.restore();
-  });
 
   test('it renders with full monthly activity data', async function (assert) {
     this.set('byMonthActivityData', MONTHLY_ACTIVITY);
+    this.set('byMonthNewClients', NEW_ACTIVITY);
     this.set('totalUsageCounts', TOTAL_USAGE_COUNTS);
     const expectedTotalEntity = formatNumber([TOTAL_USAGE_COUNTS.entity_clients]);
     const expectedTotalNonEntity = formatNumber([TOTAL_USAGE_COUNTS.non_entity_clients]);
@@ -1446,13 +1434,13 @@ module('Integration | Component | clients/running-total', function (hooks) {
     await render(hbs`
       <div id="modal-wormhole"></div>
       <Clients::RunningTotal
-      @chartLegend={{this.chartLegend}}
-      @selectedAuthMethod={{this.selectedAuthMethod}}
-      @byMonthActivityData={{this.byMonthActivityData}}
-      @runningTotals={{this.totalUsageCounts}}
-      @upgradeData={{this.upgradeDuringActivity}}
-      @responseTimestamp={{this.timestamp}}
-      @isHistoricalMonth={{false}}
+      @chartLegend={{chartLegend}}
+      @selectedAuthMethod={{selectedAuthMethod}}
+      // @lineChartData={{byMonthActivityData}}
+      // @barChartData={{byMonthNewClients}}
+      @runningTotals={{totalUsageCounts}}
+      @upgradeData={{upgradeDuringActivity}}
+      @timestamp={{timestamp}}
     />
     `);
 
@@ -1508,8 +1496,8 @@ module('Integration | Component | clients/running-total', function (hooks) {
   });
 
   test('it renders with no new monthly data', async function (assert) {
-    const monthlyWithoutNew = MONTHLY_ACTIVITY.map((d) => ({ ...d, new_clients: { month: d.month } }));
-    this.set('byMonthActivityData', monthlyWithoutNew);
+    this.set('byMonthActivityData', MONTHLY_ACTIVITY);
+    this.set('byMonthNewClients', NEW_ACTIVITY);
     this.set('totalUsageCounts', TOTAL_USAGE_COUNTS);
     const expectedTotalEntity = formatNumber([TOTAL_USAGE_COUNTS.entity_clients]);
     const expectedTotalNonEntity = formatNumber([TOTAL_USAGE_COUNTS.non_entity_clients]);
@@ -1517,14 +1505,14 @@ module('Integration | Component | clients/running-total', function (hooks) {
     await render(hbs`
       <div id="modal-wormhole"></div>
       <Clients::RunningTotal
-      @chartLegend={{this.chartLegend}}
-      @selectedAuthMethod={{this.selectedAuthMethod}}
-      @byMonthActivityData={{this.byMonthActivityData}}
-      @runningTotals={{this.totalUsageCounts}}
-      @responseTimestamp={{this.timestamp}}
-      @isHistoricalMonth={{false}}
+      @chartLegend={{chartLegend}}
+      @selectedAuthMethod={{selectedAuthMethod}}
+      @lineChartData={{byMonthActivityData}}
+      @runningTotals={{totalUsageCounts}}
+      @timestamp={{timestamp}}
     />
     `);
+
     assert.dom('[data-test-running-total]').exists('running total component renders');
     assert.dom('[data-test-line-chart]').exists('line chart renders');
     assert.dom('[data-test-vertical-bar-chart]').doesNotExist('vertical bar chart does not render');
@@ -1540,16 +1528,17 @@ module('Integration | Component | clients/running-total', function (hooks) {
       .hasText(`${expectedTotalNonEntity}`, `renders correct new average ${expectedTotalNonEntity}`);
     assert
       .dom('[data-test-running-new-entity] p.data-details')
-      .doesNotExist('new client counts does not exist');
+      .hasText('0', 'renders 0 average new entity clients');
     assert
       .dom('[data-test-running-new-nonentity] p.data-details')
-      .doesNotExist('average new client counts does not exist');
+      .hasText('0', 'renders 0 average entity clients');
   });
 
   test('it renders with single historical month data', async function (assert) {
     const singleMonth = MONTHLY_ACTIVITY[MONTHLY_ACTIVITY.length - 1];
     const singleMonthNew = NEW_ACTIVITY[NEW_ACTIVITY.length - 1];
     this.set('singleMonth', [singleMonth]);
+    this.set('singleMonthNew', [singleMonthNew]);
     const expectedTotalClients = formatNumber([singleMonth.clients]);
     const expectedTotalEntity = formatNumber([singleMonth.entity_clients]);
     const expectedTotalNonEntity = formatNumber([singleMonth.non_entity_clients]);
@@ -1560,12 +1549,12 @@ module('Integration | Component | clients/running-total', function (hooks) {
     await render(hbs`
       <div id="modal-wormhole"></div>
       <Clients::RunningTotal
-      @chartLegend={{this.chartLegend}}
-      @selectedAuthMethod={{this.selectedAuthMethod}}
-      @byMonthActivityData={{this.singleMonth}}
-      @runningTotals={{this.totalUsageCounts}}
-      @responseTimestamp={{this.timestamp}}
-      @isHistoricalMonth={{true}}
+      @chartLegend={{chartLegend}}
+      @selectedAuthMethod={{selectedAuthMethod}}
+      @lineChartData={{singleMonth}}
+      @barChartData={{singleMonthNew}}
+      @runningTotals={{totalUsageCounts}}
+      @timestamp={{timestamp}}
     />
     `);
     assert.dom('[data-test-running-total]').exists('running total component renders');
diff --git a/ui/tests/integration/components/clients/usage-stats-test.js b/ui/tests/integration/components/clients/usage-stats-test.js
index f77697523bff4..b75556e9ac171 100644
--- a/ui/tests/integration/components/clients/usage-stats-test.js
+++ b/ui/tests/integration/components/clients/usage-stats-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
@@ -16,18 +11,14 @@ module('Integration | Component | clients/usage-stats', function (hooks) {
 
     assert.dom('[data-test-stat-text]').exists({ count: 3 }, 'Renders 3 Stat texts even with no data passed');
     assert.dom('[data-test-stat-text="total-clients"]').exists('Total clients exists');
-    assert.dom('[data-test-stat-text="total-clients"] .stat-value').hasText('-', 'renders dash when no data');
+    assert.dom('[data-test-stat-text="total-clients"] .stat-value').hasText('0', 'Value defaults to zero');
     assert.dom('[data-test-stat-text="entity-clients"]').exists('Entity clients exists');
-    assert
-      .dom('[data-test-stat-text="entity-clients"] .stat-value')
-      .hasText('-', 'renders dash when no data');
+    assert.dom('[data-test-stat-text="entity-clients"] .stat-value').hasText('0', 'Value defaults to zero');
     assert.dom('[data-test-stat-text="non-entity-clients"]').exists('Non entity clients exists');
     assert
       .dom('[data-test-stat-text="non-entity-clients"] .stat-value')
-      .hasText('-', 'renders dash when no data');
-    assert
-      .dom('a')
-      .hasAttribute('href', 'https://developer.hashicorp.com/vault/tutorials/monitoring/usage-metrics');
+      .hasText('0', 'Value defaults to zero');
+    assert.dom('a').hasAttribute('href', 'https://learn.hashicorp.com/tutorials/vault/usage-metrics');
   });
 
   test('it renders with data', async function (assert) {
@@ -36,7 +27,7 @@ module('Integration | Component | clients/usage-stats', function (hooks) {
       entity_clients: 7,
       non_entity_clients: 10,
     });
-    await render(hbs`<Clients::UsageStats @totalUsageCounts={{this.counts}} />`);
+    await render(hbs`<Clients::UsageStats @totalUsageCounts={{counts}} />`);
 
     assert.dom('[data-test-stat-text]').exists({ count: 3 }, 'Renders 3 Stat texts even with no data passed');
     assert.dom('[data-test-stat-text="total-clients"]').exists('Total clients exists');
diff --git a/ui/tests/integration/components/clients/vertical-bar-chart-test.js b/ui/tests/integration/components/clients/vertical-bar-chart-test.js
index 2300b91b1708f..0d2d323e4aa1f 100644
--- a/ui/tests/integration/components/clients/vertical-bar-chart-test.js
+++ b/ui/tests/integration/components/clients/vertical-bar-chart-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render, findAll, find, triggerEvent } from '@ember/test-helpers';
@@ -27,8 +22,8 @@ module('Integration | Component | clients/vertical-bar-chart', function (hooks)
     await render(hbs`   
     <div class="chart-container-wide">
       <Clients::VerticalBarChart 
-        @dataset={{this.barChartData}} 
-        @chartLegend={{this.chartLegend}} 
+        @dataset={{barChartData}} 
+        @chartLegend={{chartLegend}} 
       />
     </div>
     `);
@@ -43,9 +38,9 @@ module('Integration | Component | clients/vertical-bar-chart', function (hooks)
       assert.dom(e).hasText(`${barChartData[i].month}`, `renders x-axis label: ${barChartData[i].month}`);
     });
 
-    for (const [i, bar] of tooltipHoverBars.entries()) {
+    for (let [i, bar] of tooltipHoverBars.entries()) {
       await triggerEvent(bar, 'mouseover');
-      const tooltip = document.querySelector('.ember-modal-dialog');
+      let tooltip = document.querySelector('.ember-modal-dialog');
       assert
         .dom(tooltip)
         .includesText(
@@ -65,8 +60,8 @@ module('Integration | Component | clients/vertical-bar-chart', function (hooks)
     await render(hbs`   
     <div class="chart-container-wide">
       <Clients::VerticalBarChart 
-        @dataset={{this.barChartData}} 
-        @chartLegend={{this.chartLegend}} 
+        @dataset={{barChartData}} 
+        @chartLegend={{chartLegend}} 
       />
     </div>
     `);
@@ -82,9 +77,9 @@ module('Integration | Component | clients/vertical-bar-chart', function (hooks)
       assert.dom(e).hasText(`${barChartData[i].month}`, `renders x-axis label: ${barChartData[i].month}`);
     });
 
-    for (const [i, bar] of tooltipHoverBars.entries()) {
+    for (let [i, bar] of tooltipHoverBars.entries()) {
       await triggerEvent(bar, 'mouseover');
-      const tooltip = document.querySelector('.ember-modal-dialog');
+      let tooltip = document.querySelector('.ember-modal-dialog');
       assert
         .dom(tooltip)
         .includesText(
diff --git a/ui/tests/integration/components/confirm-action-test.js b/ui/tests/integration/components/confirm-action-test.js
index 9b30c33266f26..1f557b326920a 100644
--- a/ui/tests/integration/components/confirm-action-test.js
+++ b/ui/tests/integration/components/confirm-action-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render, click } from '@ember/test-helpers';
@@ -13,11 +8,11 @@ module('Integration | Component | confirm-action', function (hooks) {
   setupRenderingTest(hooks);
 
   test('it renders and on click shows the correct icon', async function (assert) {
-    const confirmAction = sinon.spy();
+    let confirmAction = sinon.spy();
     this.set('onConfirm', confirmAction);
     await render(hbs`
       <ConfirmAction
-        @onConfirmAction={{this.onConfirm}}
+        @onConfirmAction={{onConfirm}}
         @buttonClasses="toolbar-link"
       >
         DELETE
@@ -30,11 +25,11 @@ module('Integration | Component | confirm-action', function (hooks) {
   });
 
   test('it closes the confirmation modal on successful delete', async function (assert) {
-    const confirmAction = sinon.spy();
+    let confirmAction = sinon.spy();
     this.set('onConfirm', confirmAction);
     await render(hbs`
       <ConfirmAction
-        @onConfirmAction={{this.onConfirm}}
+        @onConfirmAction={{onConfirm}}
         @buttonClasses="toolbar-link"
       >
         DELETE
diff --git a/ui/tests/integration/components/confirm-test.js b/ui/tests/integration/components/confirm-test.js
index f172f5b4678e4..3c50dc2d6e587 100644
--- a/ui/tests/integration/components/confirm-test.js
+++ b/ui/tests/integration/components/confirm-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render, click } from '@ember/test-helpers';
@@ -24,14 +19,14 @@ module('Integration | Component | Confirm', function (hooks) {
     await render(hbs`
       <Confirm as |c|>
         <c.Message
-          @id={{this.id}}
-          @title={{this.title}}
-          @triggerText={{this.triggerText}}
-          @message={{this.message}}
-          @onConfirm={{this.onConfirm}}
-        />
-      </Confirm>
-    `);
+          @id={{id}}
+          @title={{title}}
+          @triggerText={{triggerText}}
+          @message={{message}}
+          @onConfirm={{onConfirm}}
+          />
+        </Confirm>
+      `);
 
     assert.dom('.confirm-wrapper').exists();
     assert.dom('.confirm').containsText(this.triggerText);
@@ -41,14 +36,14 @@ module('Integration | Component | Confirm', function (hooks) {
     await render(hbs`
       <Confirm as |c|>
         <c.Message
-          @id={{this.id}}
-          @title={{this.title}}
-          @triggerText={{this.triggerText}}
-          @message={{this.message}}
-          @onConfirm={{this.onConfirm}}
-        />
-      </Confirm>
-    `);
+          @id={{id}}
+          @title={{title}}
+          @triggerText={{triggerText}}
+          @message={{message}}
+          @onConfirm={{onConfirm}}
+          />
+        </Confirm>
+      `);
     assert.dom('.confirm-overlay').doesNotContainText(this.message);
 
     await click('[data-test-confirm-action-trigger]');
@@ -61,14 +56,14 @@ module('Integration | Component | Confirm', function (hooks) {
     await render(hbs`
       <Confirm as |c|>
         <c.Message
-          @id={{this.id}}
-          @title={{this.title}}
-          @triggerText={{this.triggerText}}
-          @message={{this.message}}
-          @onConfirm={{this.onConfirm}}
-        />
-      </Confirm>
-    `);
+          @id={{id}}
+          @title={{title}}
+          @triggerText={{triggerText}}
+          @message={{message}}
+          @onConfirm={{onConfirm}}
+          />
+        </Confirm>
+      `);
     await click('[data-test-confirm-action-trigger]');
     await click('[data-test-confirm-button=true]');
 
@@ -79,20 +74,20 @@ module('Integration | Component | Confirm', function (hooks) {
     await render(hbs`
       <Confirm as |c|>
         <c.Message
-          @id={{this.id}}
-          @title={{this.title}}
-          @triggerText={{this.triggerText}}
-          @message={{this.message}}
-          @onConfirm={{this.onConfirm}}
-        />
+          @id={{id}}
+          @title={{title}}
+          @triggerText={{triggerText}}
+          @message={{message}}
+          @onConfirm={{onConfirm}}
+          />
         <c.Message
           @id='bar'
           @title='Wow'
           @message='Bazinga!'
-          @onConfirm={{this.onConfirm}}
-        />
-      </Confirm>
-    `);
+          @onConfirm={{onConfirm}}
+          />
+        </Confirm>
+      `);
 
     await click(`[data-test-confirm-action-trigger=${this.id}]`);
     assert.dom('.confirm-overlay').containsText(this.title);
diff --git a/ui/tests/integration/components/confirmation-modal-test.js b/ui/tests/integration/components/confirmation-modal-test.js
index 76d79e18918ad..c66098880072d 100644
--- a/ui/tests/integration/components/confirmation-modal-test.js
+++ b/ui/tests/integration/components/confirmation-modal-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import sinon from 'sinon';
@@ -13,8 +8,8 @@ module('Integration | Component | confirmation-modal', function (hooks) {
   setupRenderingTest(hooks);
 
   test('it renders with disabled confirmation button until input matches', async function (assert) {
-    const confirmAction = sinon.spy();
-    const closeAction = sinon.spy();
+    let confirmAction = sinon.spy();
+    let closeAction = sinon.spy();
     this.set('onConfirm', confirmAction);
     this.set('onClose', closeAction);
     await render(hbs`
diff --git a/ui/tests/integration/components/console/log-command-test.js b/ui/tests/integration/components/console/log-command-test.js
index b3c0740659d15..df4d8e5dceb4b 100644
--- a/ui/tests/integration/components/console/log-command-test.js
+++ b/ui/tests/integration/components/console/log-command-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
@@ -15,7 +10,7 @@ module('Integration | Component | console/log command', function (hooks) {
     const commandText = 'list this/path';
     this.set('content', commandText);
 
-    await render(hbs`<Console::LogCommand @content={{this.content}} />`);
-    assert.dom('.console-ui-command').includesText(commandText);
+    await render(hbs`{{console/log-command content=this.content}}`);
+    assert.dom('p').includesText(commandText);
   });
 });
diff --git a/ui/tests/integration/components/console/log-error-test.js b/ui/tests/integration/components/console/log-error-test.js
index 36c65be76915f..38ace01d99aef 100644
--- a/ui/tests/integration/components/console/log-error-test.js
+++ b/ui/tests/integration/components/console/log-error-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
@@ -14,7 +9,7 @@ module('Integration | Component | console/log error', function (hooks) {
   test('it renders', async function (assert) {
     const errorText = 'Error deleting at: sys/foo. URL: v1/sys/foo Code: 404';
     this.set('content', errorText);
-    await render(hbs`{{console/log-error content=this.content}}`);
+    await render(hbs`{{console/log-error content=content}}`);
     assert.dom('pre').includesText(errorText);
   });
 });
diff --git a/ui/tests/integration/components/console/log-json-test.js b/ui/tests/integration/components/console/log-json-test.js
index e759c079ad5c2..0a30352b30b2b 100644
--- a/ui/tests/integration/components/console/log-json-test.js
+++ b/ui/tests/integration/components/console/log-json-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render, find } from '@ember/test-helpers';
@@ -23,8 +18,8 @@ module('Integration | Component | console/log json', function (hooks) {
 
     this.set('content', objectContent);
 
-    await render(hbs`{{console/log-json content=this.content}}`);
+    await render(hbs`{{console/log-json content=content}}`);
     const instance = find('[data-test-component=code-mirror-modifier]').innerText;
-    assert.strictEqual(instance, expectedText);
+    assert.equal(instance, expectedText);
   });
 });
diff --git a/ui/tests/integration/components/console/log-list-test.js b/ui/tests/integration/components/console/log-list-test.js
index e47ac1322a052..78a3c23541175 100644
--- a/ui/tests/integration/components/console/log-list-test.js
+++ b/ui/tests/integration/components/console/log-list-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
@@ -19,7 +14,7 @@ module('Integration | Component | console/log list', function (hooks) {
 
     this.set('content', listContent);
 
-    await render(hbs`{{console/log-list content=this.content}}`);
+    await render(hbs`{{console/log-list content=content}}`);
 
     assert.dom('pre').includesText(`${expectedText}`);
   });
diff --git a/ui/tests/integration/components/console/log-object-test.js b/ui/tests/integration/components/console/log-object-test.js
index b364311722f9c..f5d7ddd6604a6 100644
--- a/ui/tests/integration/components/console/log-object-test.js
+++ b/ui/tests/integration/components/console/log-object-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
@@ -19,7 +14,7 @@ module('Integration | Component | console/log object', function (hooks) {
     const expectedText = 'Key Value one two three four seven {"five":"six"} eight [5,6]';
     this.set('content', objectContent);
 
-    await render(hbs`{{console/log-object content=this.content}}`);
+    await render(hbs`{{console/log-object content=content}}`);
     assert.dom('pre').includesText(expectedText);
   });
 });
diff --git a/ui/tests/integration/components/console/log-text-test.js b/ui/tests/integration/components/console/log-text-test.js
index c27bdc4606f64..5d0ef31684ea1 100644
--- a/ui/tests/integration/components/console/log-text-test.js
+++ b/ui/tests/integration/components/console/log-text-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
@@ -17,7 +12,7 @@ module('Integration | Component | console/log text', function (hooks) {
     const text = 'Success! You did a thing!';
     this.set('content', text);
 
-    await render(hbs`{{console/log-text content=this.content}}`);
+    await render(hbs`{{console/log-text content=content}}`);
 
     assert.dom('pre').includesText(text);
   });
diff --git a/ui/tests/integration/components/console/ui-panel-test.js b/ui/tests/integration/components/console/ui-panel-test.js
index d64f12d6803a9..fa542f56d9755 100644
--- a/ui/tests/integration/components/console/ui-panel-test.js
+++ b/ui/tests/integration/components/console/ui-panel-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render, settled } from '@ember/test-helpers';
@@ -26,7 +21,7 @@ module('Integration | Component | console/ui panel', function (hooks) {
 
     await component.runCommands('list this/thing/here');
     await settled();
-    assert.strictEqual(component.consoleInputValue, '', 'empties input field on enter');
+    assert.equal(component.consoleInputValue, '', 'empties input field on enter');
   });
 
   test('it clears the log when using clear command', async function (assert) {
@@ -40,8 +35,8 @@ module('Integration | Component | console/ui panel', function (hooks) {
     await settled();
     await component.up();
     await settled();
-    assert.strictEqual(component.logOutput, '', 'clears the output log');
-    assert.strictEqual(
+    assert.equal(component.logOutput, '', 'clears the output log');
+    assert.equal(
       component.consoleInputValue,
       'clear',
       'populates console input with previous command on up after enter'
@@ -55,14 +50,14 @@ module('Integration | Component | console/ui panel', function (hooks) {
     await settled();
     await component.up();
     await settled();
-    assert.strictEqual(
+    assert.equal(
       component.consoleInputValue,
       'list this/thing/here',
       'populates console input with previous command on up after enter'
     );
     await component.down();
     await settled();
-    assert.strictEqual(component.consoleInputValue, '', 'populates console input with next command on down');
+    assert.equal(component.consoleInputValue, '', 'populates console input with next command on down');
   });
 
   test('it cycles through history with more than one command', async function (assert) {
@@ -72,35 +67,35 @@ module('Integration | Component | console/ui panel', function (hooks) {
     await settled();
     await component.up();
     await settled();
-    assert.strictEqual(
+    assert.equal(
       component.consoleInputValue,
       'qwerty',
       'populates console input with previous command on up after enter'
     );
     await component.up();
     await settled();
-    assert.strictEqual(
+    assert.equal(
       component.consoleInputValue,
       'read that/thing/there',
       'populates console input with previous command on up'
     );
     await component.up();
     await settled();
-    assert.strictEqual(
+    assert.equal(
       component.consoleInputValue,
       'list this/thing/here',
       'populates console input with previous command on up'
     );
     await component.up();
     await settled();
-    assert.strictEqual(
+    assert.equal(
       component.consoleInputValue,
       'qwerty',
       'populates console input with initial command if cycled through all previous commands'
     );
     await component.down();
     await settled();
-    assert.strictEqual(
+    assert.equal(
       component.consoleInputValue,
       '',
       'clears console input if down pressed after history is on most recent command'
diff --git a/ui/tests/integration/components/control-group-success-test.js b/ui/tests/integration/components/control-group-success-test.js
index 857c91206af3d..6a866a21bf0a9 100644
--- a/ui/tests/integration/components/control-group-success-test.js
+++ b/ui/tests/integration/components/control-group-success-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { later, run, _cancelTimers as cancelTimers } from '@ember/runloop';
 import { resolve } from 'rsvp';
 import Service from '@ember/service';
@@ -56,13 +51,13 @@ module('Integration | Component | control group success', function (hooks) {
   };
   test('render with saved token', async function (assert) {
     assert.expect(3);
-    const response = {
+    let response = {
       uiParams: { url: '/foo' },
       token: 'token',
     };
     this.set('model', MODEL);
     this.set('response', response);
-    await render(hbs`{{control-group-success model=this.model controlGroupResponse=this.response }}`);
+    await render(hbs`{{control-group-success model=model controlGroupResponse=response }}`);
     assert.ok(component.showsNavigateMessage, 'shows unwrap message');
     await component.navigate();
     later(() => cancelTimers(), 50);
@@ -75,7 +70,7 @@ module('Integration | Component | control group success', function (hooks) {
   test('render without token', async function (assert) {
     assert.expect(2);
     this.set('model', MODEL);
-    await render(hbs`{{control-group-success model=this.model}}`);
+    await render(hbs`{{control-group-success model=model}}`);
     assert.ok(component.showsUnwrapForm, 'shows unwrap form');
     await component.token('token');
     component.unwrap();
diff --git a/ui/tests/integration/components/control-group-test.js b/ui/tests/integration/components/control-group-test.js
index 49a0b17499c09..e021a5e8e4fbb 100644
--- a/ui/tests/integration/components/control-group-test.js
+++ b/ui/tests/integration/components/control-group-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Service from '@ember/service';
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
@@ -37,14 +32,14 @@ module('Integration | Component | control group', function (hooks) {
   });
 
   const setup = (modelData = {}, authData = {}) => {
-    const modelDefaults = {
+    let modelDefaults = {
       approved: false,
       requestPath: 'foo/bar',
       id: 'accessor',
       requestEntity: { id: 'requestor', name: 'entity8509' },
       reload: sinon.stub(),
     };
-    const authDataDefaults = { entity_id: 'requestor' };
+    let authDataDefaults = { entity_id: 'requestor' };
 
     return {
       model: {
@@ -59,74 +54,71 @@ module('Integration | Component | control group', function (hooks) {
   };
 
   test('requestor rendering', async function (assert) {
-    const { model, authData } = setup();
+    let { model, authData } = setup();
     this.set('model', model);
     this.set('auth.authData', authData);
-    await render(hbs`{{control-group model=this.model}}`);
+    await render(hbs`{{control-group model=model}}`);
     assert.ok(component.showsAccessorCallout, 'shows accessor callout');
-    assert.strictEqual(component.bannerPrefix, 'Locked');
-    assert.strictEqual(component.bannerText, 'The path you requested is locked by a Control Group');
-    assert.strictEqual(component.requestorText, `You are requesting access to ${model.requestPath}`);
+    assert.equal(component.bannerPrefix, 'Locked');
+    assert.equal(component.bannerText, 'The path you requested is locked by a Control Group');
+    assert.equal(component.requestorText, `You are requesting access to ${model.requestPath}`);
     assert.false(component.showsTokenText, 'does not show token message when there is no token');
     assert.ok(component.showsRefresh, 'shows refresh button');
     assert.ok(component.authorizationText, 'Awaiting authorization.');
   });
 
   test('requestor rendering: with token', async function (assert) {
-    const { model, authData } = setup();
+    let { model, authData } = setup();
     this.set('model', model);
     this.set('auth.authData', authData);
     this.set('controlGroup.wrapInfo', { token: 'token' });
-    await render(hbs`{{control-group model=this.model}}`);
+    await render(hbs`{{control-group model=model}}`);
     assert.true(component.showsTokenText, 'shows token message');
-    assert.strictEqual(component.token, 'token', 'shows token value');
+    assert.equal(component.token, 'token', 'shows token value');
   });
 
   test('requestor rendering: some approvals', async function (assert) {
-    const { model, authData } = setup({ authorizations: [{ name: 'manager 1' }, { name: 'manager 2' }] });
+    let { model, authData } = setup({ authorizations: [{ name: 'manager 1' }, { name: 'manager 2' }] });
     this.set('model', model);
     this.set('auth.authData', authData);
-    await render(hbs`{{control-group model=this.model}}`);
+    await render(hbs`{{control-group model=model}}`);
     assert.ok(component.authorizationText, 'Already approved by manager 1, manager 2');
   });
 
   test('requestor rendering: approved with no token', async function (assert) {
-    const { model, authData } = setup({ approved: true });
+    let { model, authData } = setup({ approved: true });
     this.set('model', model);
     this.set('auth.authData', authData);
-    await render(hbs`{{control-group model=this.model}}`);
+    await render(hbs`{{control-group model=model}}`);
 
-    assert.strictEqual(component.bannerPrefix, 'Success!');
-    assert.strictEqual(component.bannerText, 'You have been given authorization');
+    assert.equal(component.bannerPrefix, 'Success!');
+    assert.equal(component.bannerText, 'You have been given authorization');
     assert.false(component.showsTokenText, 'does not show token message when there is no token');
     assert.notOk(component.showsRefresh, 'does not shows refresh button');
     assert.ok(component.showsSuccessComponent, 'renders control group success');
   });
 
   test('requestor rendering: approved with token', async function (assert) {
-    const { model, authData } = setup({ approved: true });
+    let { model, authData } = setup({ approved: true });
     this.set('model', model);
     this.set('auth.authData', authData);
     this.set('controlGroup.wrapInfo', { token: 'token' });
-    await render(hbs`{{control-group model=this.model}}`);
+    await render(hbs`{{control-group model=model}}`);
     assert.true(component.showsTokenText, 'shows token');
     assert.notOk(component.showsRefresh, 'does not shows refresh button');
     assert.ok(component.showsSuccessComponent, 'renders control group success');
   });
 
   test('authorizer rendering', async function (assert) {
-    const { model, authData } = setup({ canAuthorize: true }, { entity_id: 'manager' });
+    let { model, authData } = setup({ canAuthorize: true }, { entity_id: 'manager' });
 
     this.set('model', model);
     this.set('auth.authData', authData);
-    await render(hbs`{{control-group model=this.model}}`);
+    await render(hbs`{{control-group model=model}}`);
 
-    assert.strictEqual(component.bannerPrefix, 'Locked');
-    assert.strictEqual(
-      component.bannerText,
-      'Someone is requesting access to a path locked by a Control Group'
-    );
-    assert.strictEqual(
+    assert.equal(component.bannerPrefix, 'Locked');
+    assert.equal(component.bannerText, 'Someone is requesting access to a path locked by a Control Group');
+    assert.equal(
       component.requestorText,
       `${model.requestEntity.name} is requesting access to ${model.requestPath}`
     );
@@ -136,34 +128,34 @@ module('Integration | Component | control group', function (hooks) {
   });
 
   test('authorizer rendering:authorized', async function (assert) {
-    const { model, authData } = setup(
+    let { model, authData } = setup(
       { canAuthorize: true, authorizations: [{ id: 'manager', name: 'manager' }] },
       { entity_id: 'manager' }
     );
 
     this.set('model', model);
     this.set('auth.authData', authData);
-    await render(hbs`{{control-group model=this.model}}`);
+    await render(hbs`{{control-group model=model}}`);
 
-    assert.strictEqual(component.bannerPrefix, 'Thanks!');
-    assert.strictEqual(component.bannerText, 'You have given authorization');
+    assert.equal(component.bannerPrefix, 'Thanks!');
+    assert.equal(component.bannerText, 'You have given authorization');
     assert.ok(component.showsBackLink, 'back link is visible');
   });
 
   test('authorizer rendering: authorized and success', async function (assert) {
-    const { model, authData } = setup(
+    let { model, authData } = setup(
       { approved: true, canAuthorize: true, authorizations: [{ id: 'manager', name: 'manager' }] },
       { entity_id: 'manager' }
     );
 
     this.set('model', model);
     this.set('auth.authData', authData);
-    await render(hbs`{{control-group model=this.model}}`);
+    await render(hbs`{{control-group model=model}}`);
 
-    assert.strictEqual(component.bannerPrefix, 'Thanks!');
-    assert.strictEqual(component.bannerText, 'You have given authorization');
+    assert.equal(component.bannerPrefix, 'Thanks!');
+    assert.equal(component.bannerText, 'You have given authorization');
     assert.ok(component.showsBackLink, 'back link is visible');
-    assert.strictEqual(
+    assert.equal(
       component.requestorText,
       `${model.requestEntity.name} is authorized to access ${model.requestPath}`
     );
@@ -171,16 +163,16 @@ module('Integration | Component | control group', function (hooks) {
   });
 
   test('third-party: success', async function (assert) {
-    const { model, authData } = setup(
+    let { model, authData } = setup(
       { approved: true, canAuthorize: true, authorizations: [{ id: 'foo', name: 'foo' }] },
       { entity_id: 'manager' }
     );
 
     this.set('model', model);
     this.set('auth.authData', authData);
-    await render(hbs`{{control-group model=this.model}}`);
-    assert.strictEqual(component.bannerPrefix, 'Success!');
-    assert.strictEqual(component.bannerText, 'This Control Group has been authorized');
+    await render(hbs`{{control-group model=model}}`);
+    assert.equal(component.bannerPrefix, 'Success!');
+    assert.equal(component.bannerText, 'This Control Group has been authorized');
     assert.ok(component.showsBackLink, 'back link is visible');
     assert.notOk(component.showsSuccessComponent, 'does not render control group success');
   });
diff --git a/ui/tests/integration/components/database-role-edit-test.js b/ui/tests/integration/components/database-role-edit-test.js
deleted file mode 100644
index d0e9a431c702e..0000000000000
--- a/ui/tests/integration/components/database-role-edit-test.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import { capabilitiesStub } from 'vault/tests/helpers/stubs';
-
-module('Integration | Component | database-role-edit', function (hooks) {
-  setupRenderingTest(hooks);
-  setupMirage(hooks);
-
-  hooks.beforeEach(function () {
-    this.store = this.owner.lookup('service:store');
-    this.store.pushPayload('database-role', {
-      modelName: 'database/role',
-      database: ['my-mongodb-database'],
-      backend: 'database',
-      type: 'static',
-      name: 'my-static-role',
-      id: 'my-static-role',
-    });
-    this.store.pushPayload('database-role', {
-      modelName: 'database/role',
-      database: ['my-mongodb-database'],
-      backend: 'database',
-      type: 'dynamic',
-      name: 'my-dynamic-role',
-      id: 'my-dynamic-role',
-    });
-    this.modelStatic = this.store.peekRecord('database/role', 'my-static-role');
-    this.modelDynamic = this.store.peekRecord('database/role', 'my-dynamic-role');
-  });
-
-  test('it should show Get credentials button when a user has the correct policy', async function (assert) {
-    this.server.post('/sys/capabilities-self', capabilitiesStub('database/static-creds/my-role', ['read']));
-    await render(hbs`<DatabaseRoleEdit @model={{this.modelStatic}} @mode="show"/>`);
-    assert.dom('[data-test-database-role-creds="static"]').exists('Get credentials button exists');
-  });
-
-  test('it should show Generate credentials button when a user has the correct policy', async function (assert) {
-    this.server.post('/sys/capabilities-self', capabilitiesStub('database/creds/my-role', ['read']));
-    await render(hbs`<DatabaseRoleEdit @model={{this.modelDynamic}} @mode="show"/>`);
-    assert.dom('[data-test-database-role-creds="dynamic"]').exists('Generate credentials button exists');
-  });
-});
diff --git a/ui/tests/integration/components/database-role-setting-form-test.js b/ui/tests/integration/components/database-role-setting-form-test.js
index 39bfbb94c343a..d2e8080a7512c 100644
--- a/ui/tests/integration/components/database-role-setting-form-test.js
+++ b/ui/tests/integration/components/database-role-setting-form-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import EmberObject from '@ember/object';
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
@@ -101,7 +96,7 @@ module('Integration | Component | database-role-setting-form', function (hooks)
   });
 
   test('it shows empty states when no roleType passed in', async function (assert) {
-    await render(hbs`<DatabaseRoleSettingForm @attrs={{this.model.attrs}} @model={{this.model}}/>`);
+    await render(hbs`<DatabaseRoleSettingForm @attrs={{model.attrs}} @model={{model}}/>`);
     assert.dom('[data-test-component="empty-state"]').exists({ count: 2 }, 'Two empty states exist');
   });
 
@@ -110,16 +105,16 @@ module('Integration | Component | database-role-setting-form', function (hooks)
     this.set('dbType', '');
     await render(hbs`
       <DatabaseRoleSettingForm
-        @attrs={{this.model.attrs}}
-        @model={{this.model}}
-        @roleType={{this.roleType}}
-        @dbType={{this.dbType}}
+        @attrs={{model.attrs}}
+        @model={{model}}
+        @roleType={{roleType}}
+        @dbType={{dbType}}
       />
     `);
     assert.dom('[data-test-component="empty-state"]').doesNotExist('Does not show empty states');
-    for (const testCase of testCases) {
-      const staticFields = getFields(testCase.staticRoleFields);
-      const dynamicFields = getFields(testCase.dynamicRoleFields);
+    for (let testCase of testCases) {
+      let staticFields = getFields(testCase.staticRoleFields);
+      let dynamicFields = getFields(testCase.dynamicRoleFields);
       this.set('dbType', testCase.pluginType);
       this.set('roleType', 'static');
       staticFields.show.forEach((attr) => {
diff --git a/ui/tests/integration/components/date-dropdown-test.js b/ui/tests/integration/components/date-dropdown-test.js
index 5d4456912d392..4319e948197c1 100644
--- a/ui/tests/integration/components/date-dropdown-test.js
+++ b/ui/tests/integration/components/date-dropdown-test.js
@@ -1,186 +1,176 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import sinon from 'sinon';
+/* eslint qunit/no-conditional-assertions: "warn" */
+import { module, skip, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { click, render } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
-import { ARRAY_OF_MONTHS } from 'core/utils/date-formatters';
-import timestamp from 'core/utils/timestamp';
-
-const SELECTORS = {
-  monthDropdown: '[data-test-popup-menu-trigger="month"]',
-  specificMonth: (m) => `[data-test-dropdown-month="${m}"]`,
-  yearDropdown: '[data-test-popup-menu-trigger="year"]',
-  specificYear: (y) => `[data-test-dropdown-year="${y}"]`,
 
-  submitButton: '[data-test-date-dropdown-submit]',
-  cancelButton: '[data-test-date-dropdown-cancel]',
-  monthOptions: '[data-test-month-list] button',
-};
+const ARRAY_OF_MONTHS = [
+  'January',
+  'February',
+  'March',
+  'April',
+  'May',
+  'June',
+  'July',
+  'August',
+  'September',
+  'October',
+  'November',
+  'December',
+];
+
+const CURRENT_DATE = new Date();
+const CURRENT_YEAR = CURRENT_DATE.getFullYear(); // integer of year
+const CURRENT_MONTH = CURRENT_DATE.getMonth(); // index of month
 
 module('Integration | Component | date-dropdown', function (hooks) {
   setupRenderingTest(hooks);
 
-  hooks.before(function () {
-    sinon.stub(timestamp, 'now').callsFake(() => new Date('2018-04-03T14:15:30'));
-  });
-  hooks.after(function () {
-    timestamp.now.restore();
-  });
-
   test('it renders dropdown', async function (assert) {
+    this.set('text', 'Save');
+
     await render(hbs`
       <div class="is-flex-align-baseline">
         <DateDropdown/>
       </div>
     `);
-    assert.dom(SELECTORS.submitButton).hasText('Submit', 'button renders default text');
-    assert.dom(SELECTORS.cancelButton).doesNotExist('it does not render cancel button by default');
-  });
-
-  test('it fires off cancel callback', async function (assert) {
-    assert.expect(2);
-    const onCancel = () => {
-      assert.ok('fires onCancel callback');
-    };
-    this.set('onCancel', onCancel);
+    assert.dom('[data-test-date-dropdown-submit]').hasText('Submit', 'button renders default text');
     await render(hbs`
       <div class="is-flex-align-baseline">
-        <DateDropdown @handleCancel={{this.onCancel}} @submitText="Save"/>
+        <DateDropdown @submitText={{text}}/>
       </div>
     `);
-    assert.dom(SELECTORS.submitButton).hasText('Save', 'button renders passed in text');
-    await click(SELECTORS.cancelButton);
+    assert.dom('[data-test-date-dropdown-submit]').hasText('Save', 'button renders passed in text');
   });
 
-  test('it renders dropdown and selects month and year', async function (assert) {
-    assert.expect(26);
-    const parentAction = (args) => {
-      assert.propEqual(
-        args,
-        {
-          dateType: 'start',
-          monthIdx: 1,
-          monthName: 'February',
-          year: 2016,
-        },
-        'sends correct args to parent'
-      );
+  // skip until https://github.com/hashicorp/vault/pull/17575 is merged which refactors these tests and fixes flakiness
+  skip('it renders dropdown and selects month and year', async function (assert) {
+    assert.expect(27);
+    let parentAction = (month, year) => {
+      assert.equal(month, 'January', 'sends correct month to parent callback');
+      assert.equal(year, CURRENT_YEAR, 'sends correct year to parent callback');
     };
     this.set('parentAction', parentAction);
 
     await render(hbs`
     <div class="is-flex-align-baseline">
-    <DateDropdown
-      @handleSubmit={{this.parentAction}}
-      @dateType="start"
-    />
+    <DateDropdown 
+    @handleDateSelection={{parentAction}} />
     </div>
     `);
-    assert.dom(SELECTORS.submitButton).isDisabled('button is disabled when no month or year selected');
 
-    await click(SELECTORS.monthDropdown);
+    const monthDropdown = this.element.querySelector('[data-test-popup-menu-trigger="month"]');
+    const yearDropdown = this.element.querySelector('[data-test-popup-menu-trigger="year"]');
+    const submitButton = this.element.querySelector('[data-test-date-dropdown-submit]');
+
+    assert.true(submitButton.disabled, 'button is disabled when no month or year selected');
 
-    assert.dom(SELECTORS.monthOptions).exists({ count: 12 }, 'dropdown has 12 months');
-    ARRAY_OF_MONTHS.forEach((month) => {
-      assert.dom(SELECTORS.specificMonth(month)).hasText(`${month}`, `dropdown includes ${month}`);
-    });
+    await click(monthDropdown);
+    let dropdownListMonths = this.element.querySelectorAll('[data-test-month-list] button');
+    assert.equal(dropdownListMonths.length, 12, 'dropdown has 12 months');
+    for (let [index, month] of ARRAY_OF_MONTHS.entries()) {
+      assert.dom(dropdownListMonths[index]).hasText(`${month}`, `dropdown includes ${month}`);
+    }
 
-    await click(SELECTORS.specificMonth('February'));
-    assert.dom(SELECTORS.monthDropdown).hasText('February', 'dropdown shows selected month');
+    await click(dropdownListMonths[0]);
+    assert.dom(monthDropdown).hasText('January', 'dropdown selects January');
     assert.dom('.ember-basic-dropdown-content').doesNotExist('dropdown closes after selecting month');
 
-    await click(SELECTORS.yearDropdown);
+    await click(yearDropdown);
+    let dropdownListYears = this.element.querySelectorAll('[data-test-year-list] button');
+    assert.equal(dropdownListYears.length, 5, 'dropdown has 5 years');
 
-    assert.dom('[data-test-dropdown-year]').exists({ count: 5 }, 'dropdown has 5 years');
-    for (const year of [2018, 2017, 2016, 2015, 2014]) {
-      assert.dom(SELECTORS.specificYear(year)).exists();
+    for (let [index, year] of dropdownListYears.entries()) {
+      let comparisonYear = CURRENT_YEAR - index;
+      assert.dom(year).hasText(`${comparisonYear}`, `dropdown includes ${comparisonYear}`);
     }
 
-    await click('[data-test-dropdown-year="2016"]');
-    assert.dom(SELECTORS.yearDropdown).hasText(`2016`, `dropdown shows selected year`);
+    await click(dropdownListYears[0]);
+    assert.dom(yearDropdown).hasText(`${CURRENT_YEAR}`, `dropdown selects ${CURRENT_YEAR}`);
     assert.dom('.ember-basic-dropdown-content').doesNotExist('dropdown closes after selecting year');
-    assert.dom(SELECTORS.submitButton).isNotDisabled('button enabled when month and year selected');
+    assert.false(submitButton.disabled, 'button enabled when month and year selected');
 
-    await click(SELECTORS.submitButton);
+    await click(submitButton);
   });
 
-  test('selecting month first: current year enabled when current month selected', async function (assert) {
-    assert.expect(5);
+  skip('it disables correct years when selecting month first', async function (assert) {
+    assert.expect(60);
     await render(hbs`
     <div class="is-flex-align-baseline">
       <DateDropdown/>
     </div>
     `);
-    // select current month
-    await click(SELECTORS.monthDropdown);
-    await click(SELECTORS.specificMonth('January'));
-    await click(SELECTORS.yearDropdown);
-    // all years should be selectable
-    for (const year of [2018, 2017, 2016, 2015, 2014]) {
-      assert.dom(SELECTORS.specificYear(year)).isNotDisabled(`year ${year} is selectable`);
-    }
-  });
 
-  test('selecting month first: it disables current year when future months selected', async function (assert) {
-    assert.expect(5);
-    await render(hbs`
-    <div class="is-flex-align-baseline">
-      <DateDropdown/>
-    </div>
-    `);
+    const monthDropdown = this.element.querySelector('[data-test-popup-menu-trigger="month"]');
+    const yearDropdown = this.element.querySelector('[data-test-popup-menu-trigger="year"]');
 
-    // select future month
-    await click(SELECTORS.monthDropdown);
-    await click(SELECTORS.specificMonth('June'));
-    await click(SELECTORS.yearDropdown);
+    for (let i = 0; i < 12; i++) {
+      await click(monthDropdown);
+      let dropdownListMonths = this.element.querySelectorAll('[data-test-month-list] button');
+      await click(dropdownListMonths[i]);
 
-    assert.dom(SELECTORS.specificYear(2018)).isDisabled(`current year is disabled`);
-    // previous years should be selectable
-    for (const year of [2017, 2016, 2015, 2014]) {
-      assert.dom(SELECTORS.specificYear(year)).isNotDisabled(`year ${year} is selectable`);
-    }
-  });
+      await click(yearDropdown);
+      let dropdownListYears = this.element.querySelectorAll('[data-test-year-list] button');
 
-  test('selecting year first: it disables future months when current year selected', async function (assert) {
-    assert.expect(12);
-    await render(hbs`
-    <div class="is-flex-align-baseline">
-      <DateDropdown/>
-    </div>
-    `);
-    await click(SELECTORS.yearDropdown);
-    await click(SELECTORS.specificYear(2018));
-    await click(SELECTORS.monthDropdown);
-
-    const expectedSelectable = ['January', 'February', 'March', 'April'];
-    ARRAY_OF_MONTHS.forEach((month) => {
-      if (expectedSelectable.includes(month)) {
-        assert.dom(SELECTORS.specificMonth(month)).isNotDisabled(`${month} is selectable for current year`);
+      if (i < CURRENT_MONTH) {
+        for (let year of dropdownListYears) {
+          assert.false(year.disabled, `${ARRAY_OF_MONTHS[i]} ${year.innerText} valid`);
+        }
       } else {
-        assert.dom(SELECTORS.specificMonth(month)).isDisabled(`${month} is disabled for current year`);
+        for (let [yearIndex, year] of dropdownListYears.entries()) {
+          if (yearIndex === 0) {
+            assert.true(year.disabled, `${ARRAY_OF_MONTHS[i]} ${year.innerText} disabled`);
+          } else {
+            assert.false(year.disabled, `${ARRAY_OF_MONTHS[i]} ${year.innerText} valid`);
+          }
+        }
       }
-    });
+      await click(yearDropdown);
+    }
   });
 
-  test('selecting year first: it enables all months when past year is selected', async function (assert) {
-    assert.expect(12);
+  skip('it disables correct months when selecting year first', async function (assert) {
+    assert.expect(60);
     await render(hbs`
     <div class="is-flex-align-baseline">
       <DateDropdown/>
     </div>
     `);
 
-    await click(SELECTORS.yearDropdown);
-    await click(SELECTORS.specificYear(2017));
-    await click(SELECTORS.monthDropdown);
-
-    ARRAY_OF_MONTHS.forEach((month) => {
-      assert.dom(SELECTORS.specificMonth(month)).isNotDisabled(`${month} is selectable for previous year`);
-    });
+    const monthDropdown = this.element.querySelector('[data-test-popup-menu-trigger="month"]');
+    const yearDropdown = this.element.querySelector('[data-test-popup-menu-trigger="year"]');
+
+    for (let i = 0; i < 5; i++) {
+      await click(yearDropdown);
+      let dropdownListYears = this.element.querySelectorAll('[data-test-year-list] button');
+      await click(dropdownListYears[i]);
+
+      await click(monthDropdown);
+      let dropdownListMonths = this.element.querySelectorAll('[data-test-month-list] button');
+
+      if (i === 0) {
+        for (let [monthIndex, month] of dropdownListMonths.entries()) {
+          if (monthIndex < CURRENT_MONTH) {
+            assert.false(
+              month.disabled,
+              `${ARRAY_OF_MONTHS[monthIndex]} ${dropdownListYears[i].innerText.trim()} valid`
+            );
+          } else {
+            assert.true(
+              month.disabled,
+              `${ARRAY_OF_MONTHS[monthIndex]} ${dropdownListYears[i].innerText.trim()} disabled`
+            );
+          }
+        }
+      } else {
+        for (let [monthIndex, month] of dropdownListMonths.entries()) {
+          assert.false(
+            month.disabled,
+            `${ARRAY_OF_MONTHS[monthIndex]} ${dropdownListYears[i].innerText.trim()} valid`
+          );
+        }
+      }
+      await click(monthDropdown);
+    }
   });
 });
diff --git a/ui/tests/integration/components/diff-version-selector-test.js b/ui/tests/integration/components/diff-version-selector-test.js
index 3ecce59724b0c..8aafac4491b3b 100644
--- a/ui/tests/integration/components/diff-version-selector-test.js
+++ b/ui/tests/integration/components/diff-version-selector-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import EmberObject from '@ember/object';
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
@@ -30,10 +25,10 @@ module('Integration | Component | diff-version-selector', function (hooks) {
       })
     );
     await render(hbs`<DiffVersionSelector @model={{this.model}} />`);
-    const leftSideVersion = document
+    let leftSideVersion = document
       .querySelector('[data-test-popup-menu-trigger="left-version"]')
       .innerText.trim();
-    assert.strictEqual(leftSideVersion, 'Version 2', 'left side toolbar defaults to currentVersion');
+    assert.equal(leftSideVersion, 'Version 2', 'left side toolbar defaults to currentVersion');
 
     await click('[data-test-popup-menu-trigger="left-version"]');
 
diff --git a/ui/tests/integration/components/download-button-test.js b/ui/tests/integration/components/download-button-test.js
deleted file mode 100644
index b31c6c33ae74c..0000000000000
--- a/ui/tests/integration/components/download-button-test.js
+++ /dev/null
@@ -1,110 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { click, render, resetOnerror, setupOnerror } from '@ember/test-helpers';
-import { isPresent } from 'ember-cli-page-object';
-import hbs from 'htmlbars-inline-precompile';
-import sinon from 'sinon';
-
-const SELECTORS = {
-  button: '[data-test-download-button]',
-  icon: '[data-test-icon="download"]',
-};
-module('Integration | Component | download button', function (hooks) {
-  setupRenderingTest(hooks);
-
-  hooks.beforeEach(function () {
-    const downloadService = this.owner.lookup('service:download');
-    this.downloadSpy = sinon.stub(downloadService, 'miscExtension');
-
-    this.data = 'my data to download';
-    this.filename = 'my special file';
-    this.extension = 'csv';
-  });
-
-  test('it renders', async function (assert) {
-    await render(hbs`
-     <DownloadButton class="button">
-      <Icon @name="download" />
-        Download
-     </DownloadButton>
-   `);
-    assert.dom(SELECTORS.button).hasClass('button');
-    assert.ok(isPresent(SELECTORS.icon), 'renders yielded icon');
-    assert.dom(SELECTORS.button).hasTextContaining('Download', 'renders yielded text');
-  });
-
-  test('it downloads with defaults when only passed @data arg', async function (assert) {
-    assert.expect(3);
-
-    await render(hbs`
-      <DownloadButton class="button"
-        @data={{this.data}}
-      >
-        Download
-      </DownloadButton>
-    `);
-    await click(SELECTORS.button);
-    const [filename, content, extension] = this.downloadSpy.getCall(0).args;
-    assert.ok(filename.includes('Z'), 'filename defaults to ISO string');
-    assert.strictEqual(content, this.data, 'called with correct data');
-    assert.strictEqual(extension, 'txt', 'called with default extension');
-  });
-
-  test('it calls download service with passed in args', async function (assert) {
-    assert.expect(3);
-
-    await render(hbs`
-      <DownloadButton class="button"
-        @data={{this.data}}
-        @filename={{this.filename}}
-        @mime={{this.mime}}
-        @extension={{this.extension}}
-      >
-        Download
-      </DownloadButton>
-    `);
-
-    await click(SELECTORS.button);
-    const [filename, content, extension] = this.downloadSpy.getCall(0).args;
-    assert.ok(filename.includes(`${this.filename}-`), 'filename added to ISO string');
-    assert.strictEqual(content, this.data, 'called with correct data');
-    assert.strictEqual(extension, this.extension, 'called with passed in extension');
-  });
-
-  test('it sets download content with arg passed to fetchData', async function (assert) {
-    assert.expect(3);
-    this.fetchData = () => 'this is fetched data from a parent function';
-    await render(hbs`
-      <DownloadButton class="button" @fetchData={{this.fetchData}} >
-        Download
-      </DownloadButton>
-    `);
-
-    await click(SELECTORS.button);
-    const [filename, content, extension] = this.downloadSpy.getCall(0).args;
-    assert.ok(filename.includes('Z'), 'filename defaults to ISO string');
-    assert.strictEqual(content, this.fetchData(), 'called with fetched data');
-    assert.strictEqual(extension, 'txt', 'called with default extension');
-  });
-
-  test('it throws error when both data and fetchData are passed as args', async function (assert) {
-    assert.expect(1);
-    setupOnerror((error) => {
-      assert.strictEqual(
-        error.message,
-        'Assertion Failed: Only pass either @data or @fetchData, passing both means @data will be overwritten by the return value of @fetchData',
-        'throws error with incorrect args'
-      );
-    });
-    this.fetchData = () => 'this is fetched data from a parent function';
-    await render(hbs`
-        <DownloadButton class="button" @data={{this.data}} @fetchData={{this.fetchData}} />
-      `);
-    resetOnerror();
-  });
-});
diff --git a/ui/tests/integration/components/edit-form-kmip-role-test.js b/ui/tests/integration/components/edit-form-kmip-role-test.js
index f92ba4f6841c3..f25903960631d 100644
--- a/ui/tests/integration/components/edit-form-kmip-role-test.js
+++ b/ui/tests/integration/components/edit-form-kmip-role-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { later, run, _cancelTimers as cancelTimers } from '@ember/runloop';
 import { resolve } from 'rsvp';
 import EmberObject, { computed } from '@ember/object';
@@ -12,8 +7,9 @@ import { setupRenderingTest } from 'ember-qunit';
 import { click, render, settled } from '@ember/test-helpers';
 import hbs from 'htmlbars-inline-precompile';
 import sinon from 'sinon';
-import { setupEngine } from 'ember-engines/test-support';
+import engineResolverFor from 'ember-engines/test-support/engine-resolver-for';
 import { COMPUTEDS } from 'vault/models/kmip/role';
+const resolver = engineResolverFor('kmip');
 
 const flash = Service.extend({
   success: sinon.stub(),
@@ -23,7 +19,7 @@ const namespace = Service.extend({});
 const fieldToCheckbox = (field) => ({ name: field, type: 'boolean' });
 
 const createModel = (options) => {
-  const model = EmberObject.extend(COMPUTEDS, {
+  let model = EmberObject.extend(COMPUTEDS, {
     /* eslint-disable ember/avoid-leaking-state-in-ember-objects */
     newFields: [
       'role',
@@ -60,97 +56,49 @@ const createModel = (options) => {
 };
 
 module('Integration | Component | edit form kmip role', function (hooks) {
-  setupRenderingTest(hooks);
-  setupEngine(hooks, 'kmip');
+  setupRenderingTest(hooks, { resolver });
 
   hooks.beforeEach(function () {
-    this.context = { owner: this.engine }; // this.engine set by setupEngine
     run(() => {
-      this.engine.unregister('service:flash-messages');
-      this.engine.register('service:flash-messages', flash);
-      this.engine.register('service:namespace', namespace);
+      this.owner.unregister('service:flash-messages');
+      this.owner.register('service:flash-messages', flash);
+      this.owner.register('service:namespace', namespace);
     });
   });
 
   test('it renders: new model', async function (assert) {
-    assert.expect(3);
-    const model = createModel({ isNew: true });
+    let model = createModel({ isNew: true });
     this.set('model', model);
-    this.onSave = ({ model }) => {
-      assert.false(model.operationNone, 'callback fires with operationNone as false');
-      assert.true(model.operationAll, 'callback fires with operationAll as true');
-    };
-    await render(hbs`<EditFormKmipRole @model={{this.model}} @onSave={{this.onSave}} />`, this.context);
+    await render(hbs`<EditFormKmipRole @model={{model}} />`);
 
     assert.dom('[data-test-input="operationAll"]').isChecked('sets operationAll');
-    await click('[data-test-edit-form-submit]');
   });
 
   test('it renders: operationAll', async function (assert) {
-    assert.expect(3);
-    const model = createModel({ operationAll: true });
+    let model = createModel({ operationAll: true });
     this.set('model', model);
-    this.onSave = ({ model }) => {
-      assert.false(model.operationNone, 'callback fires with operationNone as false');
-      assert.true(model.operationAll, 'callback fires with operationAll as true');
-    };
-    await render(hbs`<EditFormKmipRole @model={{this.model}} @onSave={{this.onSave}} />`, this.context);
+    await render(hbs`<EditFormKmipRole @model={{model}} />`);
     assert.dom('[data-test-input="operationAll"]').isChecked('sets operationAll');
-    await click('[data-test-edit-form-submit]');
   });
 
   test('it renders: operationNone', async function (assert) {
-    assert.expect(2);
-    const model = createModel({ operationNone: true, operationAll: undefined });
+    let model = createModel({ operationNone: true });
     this.set('model', model);
+    await render(hbs`<EditFormKmipRole @model={{model}} />`);
 
-    this.onSave = ({ model }) => {
-      assert.true(model.operationNone, 'callback fires with operationNone as true');
-    };
-    await render(hbs`<EditFormKmipRole @model={{this.model}} @onSave={{this.onSave}} />`, this.context);
     assert.dom('[data-test-input="operationNone"]').isNotChecked('sets operationNone');
-    await click('[data-test-edit-form-submit]');
   });
 
   test('it renders: choose operations', async function (assert) {
-    assert.expect(3);
-    const model = createModel({ operationGet: true });
+    let model = createModel({ operationGet: true });
     this.set('model', model);
-    this.onSave = ({ model }) => {
-      assert.false(model.operationNone, 'callback fires with operationNone as false');
-    };
-    await render(hbs`<EditFormKmipRole @model={{this.model}} @onSave={{this.onSave}} />`, this.context);
+    await render(hbs`<EditFormKmipRole @model={{model}} />`);
 
     assert.dom('[data-test-input="operationNone"]').isChecked('sets operationNone');
     assert.dom('[data-test-input="operationAll"]').isNotChecked('sets operationAll');
-    await click('[data-test-edit-form-submit]');
-  });
-
-  test('it saves operationNone=true when unchecking operationAll box', async function (assert) {
-    assert.expect(15);
-    const model = createModel({ isNew: true });
-    this.set('model', model);
-    this.onSave = ({ model }) => {
-      assert.true(model.operationNone, 'callback fires with operationNone as true');
-      assert.false(model.operationAll, 'callback fires with operationAll as false');
-    };
-
-    await render(hbs`<EditFormKmipRole @model={{this.model}} @onSave={{this.onSave}} />`, this.context);
-    await click('[data-test-input="operationAll"]');
-    for (const field of model.fields) {
-      const { name } = field;
-      if (name === 'operationNone') continue;
-      assert.dom(`[data-test-input="${name}"]`).isNotChecked(`${name} is unchecked`);
-    }
-
-    assert.dom('[data-test-input="operationAll"]').isNotChecked('sets operationAll');
-    assert
-      .dom('[data-test-input="operationNone"]')
-      .isChecked('operationNone toggle is true which means allow operations');
-    await click('[data-test-edit-form-submit]');
   });
 
-  const savingTests = [
+  let savingTests = [
     [
       'setting operationAll',
       { operationNone: true, operationGet: true },
@@ -201,32 +149,28 @@ module('Integration | Component | edit form kmip role', function (hooks) {
       7,
     ],
   ];
-  for (const testCase of savingTests) {
-    const [name, initialState, displayClicks, stateBeforeSave, stateAfterSave, assertionCount] = testCase;
+  for (let testCase of savingTests) {
+    let [name, initialState, displayClicks, stateBeforeSave, stateAfterSave, assertionCount] = testCase;
     test(name, async function (assert) {
       assert.expect(assertionCount);
-      const model = createModel(initialState);
+      let model = createModel(initialState);
       this.set('model', model);
-      const clickTargets = displayClicks.split(',');
-      await render(hbs`<EditFormKmipRole @model={{this.model}} />`, this.context);
+      let clickTargets = displayClicks.split(',');
+      await render(hbs`<EditFormKmipRole @model={{model}} />`);
 
-      for (const clickTarget of clickTargets) {
+      for (let clickTarget of clickTargets) {
         await click(`label[for=${clickTarget}]`);
       }
-      for (const beforeStateKey of Object.keys(stateBeforeSave)) {
-        assert.strictEqual(
-          model.get(beforeStateKey),
-          stateBeforeSave[beforeStateKey],
-          `sets ${beforeStateKey}`
-        );
+      for (let beforeStateKey of Object.keys(stateBeforeSave)) {
+        assert.equal(model.get(beforeStateKey), stateBeforeSave[beforeStateKey], `sets ${beforeStateKey}`);
       }
 
       click('[data-test-edit-form-submit]');
 
       later(() => cancelTimers(), 50);
       return settled().then(() => {
-        for (const afterStateKey of Object.keys(stateAfterSave)) {
-          assert.strictEqual(
+        for (let afterStateKey of Object.keys(stateAfterSave)) {
+          assert.equal(
             model.get(afterStateKey),
             stateAfterSave[afterStateKey],
             `sets ${afterStateKey} on save`
diff --git a/ui/tests/integration/components/edit-form-test.js b/ui/tests/integration/components/edit-form-test.js
index 6e54781b2f8dd..ba74feba84f75 100644
--- a/ui/tests/integration/components/edit-form-test.js
+++ b/ui/tests/integration/components/edit-form-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { later, run, _cancelTimers as cancelTimers } from '@ember/runloop';
 import { resolve } from 'rsvp';
 import EmberObject from '@ember/object';
@@ -49,31 +44,33 @@ module('Integration | Component | edit form', function (hooks) {
   });
 
   test('it renders', async function (assert) {
-    this.set('model', createModel());
-    await render(hbs`{{edit-form model=this.model}}`);
+    let model = createModel();
+    this.set('model', model);
+    await render(hbs`{{edit-form model=model}}`);
 
     assert.ok(component.fields.length, 2);
   });
 
   test('it calls flash message fns on save', async function (assert) {
     assert.expect(4);
-    const onSave = () => {
+    let model = createModel();
+    let onSave = () => {
       return resolve();
     };
-    this.set('model', createModel());
+    this.set('model', model);
     this.set('onSave', onSave);
-    const saveSpy = sinon.spy(this, 'onSave');
+    let saveSpy = sinon.spy(this, 'onSave');
 
-    await render(hbs`{{edit-form model=this.model onSave=this.onSave}}`);
+    await render(hbs`{{edit-form model=model onSave=onSave}}`);
 
     component.submit();
     later(() => cancelTimers(), 50);
     return settled().then(() => {
       assert.ok(saveSpy.calledOnce, 'calls passed onSave');
-      assert.strictEqual(saveSpy.getCall(0).args[0].saveType, 'save');
-      assert.deepEqual(saveSpy.getCall(0).args[0].model, this.model, 'passes model to onSave');
-      const flash = this.owner.lookup('service:flash-messages');
-      assert.strictEqual(flash.success.callCount, 1, 'calls flash message success');
+      assert.equal(saveSpy.getCall(0).args[0].saveType, 'save');
+      assert.deepEqual(saveSpy.getCall(0).args[0].model, model, 'passes model to onSave');
+      let flash = this.owner.lookup('service:flash-messages');
+      assert.equal(flash.success.callCount, 1, 'calls flash message success');
     });
   });
 });
diff --git a/ui/tests/integration/components/empty-state-test.js b/ui/tests/integration/components/empty-state-test.js
index e3cef83dda02c..537890a6ca573 100644
--- a/ui/tests/integration/components/empty-state-test.js
+++ b/ui/tests/integration/components/empty-state-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/tests/integration/components/features-selection-test.js b/ui/tests/integration/components/features-selection-test.js
index 8cc67cccb9947..0fe7984f45ac7 100644
--- a/ui/tests/integration/components/features-selection-test.js
+++ b/ui/tests/integration/components/features-selection-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
@@ -37,7 +32,7 @@ module('Integration | Component | features-selection', function (hooks) {
     await render(hbs`<Wizard::FeaturesSelection/>`);
 
     component.wizardItems.forEach((i) => {
-      assert.strictEqual(
+      assert.equal(
         i.hasDisabledTooltip,
         !enabled[i.text],
         'shows a tooltip only when the wizard item is not enabled'
diff --git a/ui/tests/integration/components/form-error-test.js b/ui/tests/integration/components/form-error-test.js
index c847c3f43f49c..3a7d1db084152 100644
--- a/ui/tests/integration/components/form-error-test.js
+++ b/ui/tests/integration/components/form-error-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/tests/integration/components/form-field-label-test.js b/ui/tests/integration/components/form-field-label-test.js
index 3b45c165d8cd8..cb3a863d7057e 100644
--- a/ui/tests/integration/components/form-field-label-test.js
+++ b/ui/tests/integration/components/form-field-label-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
@@ -44,8 +39,6 @@ module('Integration | Component | form-field-label', function (hooks) {
     assert.dom('a').doesNotExist('docLink hidden when not provided');
     this.set('docLink', '/doc/path');
     assert.dom('.sub-text').includesText('See our documentation for help', 'Doc link text renders');
-    assert
-      .dom('a')
-      .hasAttribute('href', 'https://developer.hashicorp.com' + this.docLink, 'Doc link renders');
+    assert.dom('a').hasAttribute('href', 'https://www.vaultproject.io' + this.docLink, 'Doc link renders');
   });
 });
diff --git a/ui/tests/integration/components/form-field-test.js b/ui/tests/integration/components/form-field-test.js
index 641889f4c55e3..a96d273d48e53 100644
--- a/ui/tests/integration/components/form-field-test.js
+++ b/ui/tests/integration/components/form-field-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import EmberObject from '@ember/object';
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
@@ -26,8 +21,8 @@ module('Integration | Component | form field', function (hooks) {
   };
 
   const setup = async function (attr) {
-    const model = EmberObject.create({});
-    const spy = sinon.spy();
+    let model = EmberObject.create({});
+    let spy = sinon.spy();
     this.set('onChange', spy);
     this.set('model', model);
     this.set('attr', attr);
@@ -36,28 +31,29 @@ module('Integration | Component | form field', function (hooks) {
   };
 
   test('it renders', async function (assert) {
-    const model = EmberObject.create({});
+    let model = EmberObject.create({});
     this.attr = { name: 'foo' };
     this.model = model;
     await render(hbs`<FormField @attr={{this.attr}} @model={{this.model}} />`);
-    assert.strictEqual(component.fields.objectAt(0).labelText[0], 'Foo', 'renders a label');
+
+    assert.equal(component.fields.objectAt(0).labelText, 'Foo', 'renders a label');
     assert.notOk(component.hasInput, 'renders only the label');
   });
 
   test('it renders: string', async function (assert) {
-    const [model, spy] = await setup.call(this, createAttr('foo', 'string', { defaultValue: 'default' }));
-    assert.strictEqual(component.fields.objectAt(0).labelText[0], 'Foo', 'renders a label');
-    assert.strictEqual(component.fields.objectAt(0).inputValue, 'default', 'renders default value');
+    let [model, spy] = await setup.call(this, createAttr('foo', 'string', { defaultValue: 'default' }));
+    assert.equal(component.fields.objectAt(0).labelText, 'Foo', 'renders a label');
+    assert.equal(component.fields.objectAt(0).inputValue, 'default', 'renders default value');
     assert.ok(component.hasInput, 'renders input for string');
     await component.fields.objectAt(0).input('bar').change();
 
-    assert.strictEqual(model.get('foo'), 'bar');
+    assert.equal(model.get('foo'), 'bar');
     assert.ok(spy.calledWith('foo', 'bar'), 'onChange called with correct args');
   });
 
   test('it renders: boolean', async function (assert) {
-    const [model, spy] = await setup.call(this, createAttr('foo', 'boolean', { defaultValue: false }));
-    assert.strictEqual(component.fields.objectAt(0).labelText[0], 'Foo', 'renders a label');
+    let [model, spy] = await setup.call(this, createAttr('foo', 'boolean', { defaultValue: false }));
+    assert.equal(component.fields.objectAt(0).labelText, 'Foo', 'renders a label');
     assert.notOk(component.fields.objectAt(0).inputChecked, 'renders default value');
     assert.ok(component.hasCheckbox, 'renders a checkbox for boolean');
     await component.fields.objectAt(0).clickLabel();
@@ -67,40 +63,40 @@ module('Integration | Component | form field', function (hooks) {
   });
 
   test('it renders: number', async function (assert) {
-    const [model, spy] = await setup.call(this, createAttr('foo', 'number', { defaultValue: 5 }));
-    assert.strictEqual(component.fields.objectAt(0).labelText[0], 'Foo', 'renders a label');
-    assert.strictEqual(component.fields.objectAt(0).inputValue, '5', 'renders default value');
+    let [model, spy] = await setup.call(this, createAttr('foo', 'number', { defaultValue: 5 }));
+    assert.equal(component.fields.objectAt(0).labelText, 'Foo', 'renders a label');
+    assert.equal(component.fields.objectAt(0).inputValue, 5, 'renders default value');
     assert.ok(component.hasInput, 'renders input for number');
     await component.fields.objectAt(0).input(8).change();
 
-    assert.strictEqual(model.get('foo'), '8');
+    assert.equal(model.get('foo'), 8);
     assert.ok(spy.calledWith('foo', '8'), 'onChange called with correct args');
   });
 
   test('it renders: object', async function (assert) {
     await setup.call(this, createAttr('foo', 'object'));
-    assert.strictEqual(component.fields.objectAt(0).labelText[0], 'Foo', 'renders a label');
+    assert.equal(component.fields.objectAt(0).labelText, 'Foo', 'renders a label');
     assert.ok(component.hasJSONEditor, 'renders the json editor');
   });
 
   test('it renders: string as json with clear button', async function (assert) {
     await setup.call(this, createAttr('foo', 'string', { editType: 'json', allowReset: true }));
-    assert.strictEqual(component.fields.objectAt(0).labelText[0], 'Foo', 'renders a label');
+    assert.equal(component.fields.objectAt(0).labelText, 'Foo', 'renders a label');
     assert.ok(component.hasJSONEditor, 'renders the json editor');
     assert.ok(component.hasJSONClearButton, 'renders button that will clear the JSON value');
   });
 
   test('it renders: editType textarea', async function (assert) {
-    const [model, spy] = await setup.call(
+    let [model, spy] = await setup.call(
       this,
       createAttr('foo', 'string', { defaultValue: 'goodbye', editType: 'textarea' })
     );
-    assert.strictEqual(component.fields.objectAt(0).labelText[0], 'Foo', 'renders a label');
+    assert.equal(component.fields.objectAt(0).labelText, 'Foo', 'renders a label');
     assert.ok(component.hasTextarea, 'renders a textarea');
-    assert.strictEqual(component.fields.objectAt(0).textareaValue, 'goodbye', 'renders default value');
+    assert.equal(component.fields.objectAt(0).textareaValue, 'goodbye', 'renders default value');
     await component.fields.objectAt(0).textarea('hello');
 
-    assert.strictEqual(model.get('foo'), 'hello');
+    assert.equal(model.get('foo'), 'hello');
     assert.ok(spy.calledWith('foo', 'hello'), 'onChange called with correct args');
   });
 
@@ -110,47 +106,44 @@ module('Integration | Component | form field', function (hooks) {
     await click('[data-test-text-toggle]');
     await fillIn('[data-test-text-file-textarea]', 'hello world');
     assert.dom('[data-test-text-file-textarea]').hasClass('masked-font');
-    await click('[data-test-button="toggle-masked"]');
+    await click('[data-test-button]');
     assert.dom('[data-test-text-file-textarea]').doesNotHaveClass('masked-font');
   });
 
   test('it renders: editType ttl', async function (assert) {
-    const [model, spy] = await setup.call(this, createAttr('foo', null, { editType: 'ttl' }));
+    let [model, spy] = await setup.call(this, createAttr('foo', null, { editType: 'ttl' }));
     assert.ok(component.hasTTLPicker, 'renders the ttl-picker component');
     await component.fields.objectAt(0).toggleTtl();
     await component.fields.objectAt(0).select('h').change();
     await component.fields.objectAt(0).ttlTime('3');
     const expectedSeconds = `${3 * 3600}s`;
-    assert.strictEqual(model.get('foo'), expectedSeconds);
+    assert.equal(model.get('foo'), expectedSeconds);
     assert.ok(spy.calledWith('foo', expectedSeconds), 'onChange called with correct args');
   });
 
   test('it renders: editType ttl without toggle', async function (assert) {
-    const [model, spy] = await setup.call(
-      this,
-      createAttr('foo', null, { editType: 'ttl', hideToggle: true })
-    );
+    let [model, spy] = await setup.call(this, createAttr('foo', null, { editType: 'ttl', hideToggle: true }));
     await component.fields.objectAt(0).select('h').change();
     await component.fields.objectAt(0).ttlTime('3');
     const expectedSeconds = `${3 * 3600}s`;
-    assert.strictEqual(model.get('foo'), expectedSeconds);
+    assert.equal(model.get('foo'), expectedSeconds);
     assert.ok(spy.calledWith('foo', expectedSeconds), 'onChange called with correct args');
   });
 
   test('it renders: radio buttons for possible values', async function (assert) {
-    const [model, spy] = await setup.call(
+    let [model, spy] = await setup.call(
       this,
       createAttr('foo', null, { editType: 'radio', possibleValues: ['SHA1', 'SHA256'] })
     );
     assert.ok(component.hasRadio, 'renders radio buttons');
     const selectedValue = 'SHA256';
     await component.selectRadioInput(selectedValue);
-    assert.strictEqual(model.get('foo'), selectedValue);
+    assert.equal(model.get('foo'), selectedValue);
     assert.ok(spy.calledWith('foo', selectedValue), 'onChange called with correct args');
   });
 
   test('it renders: editType stringArray', async function (assert) {
-    const [model, spy] = await setup.call(this, createAttr('foo', 'string', { editType: 'stringArray' }));
+    let [model, spy] = await setup.call(this, createAttr('foo', 'string', { editType: 'stringArray' }));
     assert.ok(component.hasStringList, 'renders the string-list component');
 
     await component.fields.objectAt(0).textarea('array').change();
@@ -159,20 +152,16 @@ module('Integration | Component | form field', function (hooks) {
   });
 
   test('it renders: sensitive', async function (assert) {
-    const [model, spy] = await setup.call(this, createAttr('password', 'string', { sensitive: true }));
+    let [model, spy] = await setup.call(this, createAttr('password', 'string', { sensitive: true }));
     assert.ok(component.hasMaskedInput, 'renders the masked-input component');
     await component.fields.objectAt(0).textarea('secret');
-    assert.strictEqual(model.get('password'), 'secret');
+    assert.equal(model.get('password'), 'secret');
     assert.ok(spy.calledWith('password', 'secret'), 'onChange called with correct args');
   });
 
   test('it uses a passed label', async function (assert) {
     await setup.call(this, createAttr('foo', 'string', { label: 'Not Foo' }));
-    assert.strictEqual(
-      component.fields.objectAt(0).labelText[0],
-      'Not Foo',
-      'renders the label from options'
-    );
+    assert.equal(component.fields.objectAt(0).labelText, 'Not Foo', 'renders the label from options');
   });
 
   test('it renders a help tooltip', async function (assert) {
@@ -210,20 +199,4 @@ module('Integration | Component | form field', function (hooks) {
     assert.dom('[data-test-toggle-input="Foo"]').isChecked('Toggle is initially checked when given value');
     assert.dom('[data-test-ttl-value="Foo"]').hasValue('1', 'Ttl input displays with correct value');
   });
-
-  test('it should show validation warning', async function (assert) {
-    const model = this.owner.lookup('service:store').createRecord('auth-method');
-    model.path = 'foo bar';
-    this.validations = model.validate().state;
-    this.setProperties({
-      model,
-      attr: createAttr('path', 'string'),
-      onChange: () => {},
-    });
-
-    await render(
-      hbs`<FormField @attr={{this.attr}} @model={{this.model}} @modelValidations={{this.validations}} @onChange={{this.onChange}} />`
-    );
-    assert.dom('[data-test-validation-warning]').exists('Validation warning renders');
-  });
 });
diff --git a/ui/tests/integration/components/get-credentials-card-test.js b/ui/tests/integration/components/get-credentials-card-test.js
index 61d1e4b7a3d28..61e137f86d24d 100644
--- a/ui/tests/integration/components/get-credentials-card-test.js
+++ b/ui/tests/integration/components/get-credentials-card-test.js
@@ -1,15 +1,10 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
+import { run } from '@ember/runloop';
 import { setupRenderingTest } from 'ember-qunit';
 import Service from '@ember/service';
-import { click, find, render, typeIn } from '@ember/test-helpers';
+import { render, typeIn } from '@ember/test-helpers';
 import { selectChoose, clickTrigger } from 'ember-power-select/test-support/helpers';
 import hbs from 'htmlbars-inline-precompile';
-import sinon from 'sinon';
 
 const TITLE = 'Get Credentials';
 const SEARCH_LABEL = 'Role to use';
@@ -34,17 +29,12 @@ module('Integration | Component | get-credentials-card', function (hooks) {
   setupRenderingTest(hooks);
 
   hooks.beforeEach(function () {
-    this.router = this.owner.lookup('service:router');
-    this.router.transitionTo = sinon.stub();
-
-    this.owner.unregister('service:store');
-    this.owner.register('service:store', storeService);
-    this.set('title', TITLE);
-    this.set('searchLabel', SEARCH_LABEL);
-  });
-
-  hooks.afterEach(function () {
-    this.router.transitionTo.reset();
+    run(() => {
+      this.owner.unregister('service:store');
+      this.owner.register('service:store', storeService);
+      this.set('title', TITLE);
+      this.set('searchLabel', SEARCH_LABEL);
+    });
   });
 
   test('it shows a disabled button when no item is selected', async function (assert) {
@@ -56,44 +46,22 @@ module('Integration | Component | get-credentials-card', function (hooks) {
     const models = ['database/role'];
     this.set('models', models);
     await render(
-      hbs`<GetCredentialsCard @title={{this.title}} @searchLabel={{this.searchLabel}} @placeholder="Search for a role..." @models={{this.models}} @type="role"/>`
+      hbs`<GetCredentialsCard @title={{this.title}} @searchLabel={{this.searchLabel}} @models={{this.models}} @type="role"/>`
     );
-    assert
-      .dom('[data-test-component="search-select"]#search-input-role')
-      .exists('renders search select component by default');
-    assert
-      .dom('[data-test-component="search-select"]#search-input-role')
-      .hasText('Search for a role...', 'renders placeholder text passed to search select');
     await clickTrigger();
     await selectChoose('', 'my-role');
     assert.dom('[data-test-get-credentials]').isEnabled();
-    await click('[data-test-get-credentials]');
-    assert.propEqual(
-      this.router.transitionTo.lastCall.args,
-      ['vault.cluster.secrets.backend.credentials', 'my-role'],
-      'transitionTo is called with correct route and role name'
-    );
   });
 
-  test('it renders input search field when renderInputSearch=true and shows placeholder text', async function (assert) {
+  test('it shows input field that can be clicked to a secret when role is secret', async function (assert) {
     await render(
-      hbs`<GetCredentialsCard @title={{this.title}} @renderInputSearch={{true}} @placeholder="secret/" @backend="kv" @type="secret"/>`
-    );
-    assert
-      .dom('[data-test-component="search-select"]')
-      .doesNotExist('does not render search select component');
-    assert.strictEqual(
-      find('[data-test-search-roles] input').placeholder,
-      'secret/',
-      'renders placeholder text passed to search input'
-    );
-    await typeIn('[data-test-search-roles] input', 'test');
-    assert.dom('[data-test-get-credentials]').isEnabled('submit button enables after typing input text');
-    await click('[data-test-get-credentials]');
-    assert.propEqual(
-      this.router.transitionTo.lastCall.args,
-      ['vault.cluster.secrets.backend.show', 'test'],
-      'transitionTo is called with correct route and secret name'
+      hbs`<GetCredentialsCard @title={{this.title}} @shouldUseFallback={{true}} @placeHolder="secret/" @backend="kv" @type="secret"/>`
     );
+    let card = document.querySelector('[data-test-search-roles]').childNodes[1];
+    let placeholder = card.querySelector('input').placeholder;
+    assert.equal(placeholder, 'secret/');
+
+    await typeIn(card.querySelector('input'), 'test');
+    assert.dom('[data-test-get-credentials]').isEnabled();
   });
 });
diff --git a/ui/tests/integration/components/hover-copy-button-test.js b/ui/tests/integration/components/hover-copy-button-test.js
index 568fd813b4a58..b72f74182ba5c 100644
--- a/ui/tests/integration/components/hover-copy-button-test.js
+++ b/ui/tests/integration/components/hover-copy-button-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render, settled } from '@ember/test-helpers';
@@ -26,7 +21,7 @@ module('Integration | Component | hover copy button', function (hooks) {
     assert.ok(component.buttonIsVisible);
     await component.mouseEnter();
     await settled();
-    assert.strictEqual(component.tooltipText, 'Copy', 'shows copy');
+    assert.equal(component.tooltipText, 'Copy', 'shows copy');
   });
 
   test('it has the correct class when alwaysShow is true', async function (assert) {
@@ -36,7 +31,7 @@ module('Integration | Component | hover copy button', function (hooks) {
       @alwaysShow={{true}}
     />
   `);
-    await render(hbs`{{hover-copy-button alwaysShow=true copyValue=this.copyValue}}`);
+    await render(hbs`{{hover-copy-button alwaysShow=true copyValue=copyValue}}`);
     assert.ok(component.buttonIsVisible);
     assert.ok(component.wrapperClass.includes('hover-copy-button-static'));
   });
diff --git a/ui/tests/integration/components/icon-test.js b/ui/tests/integration/components/icon-test.js
index ccb58a1c79169..111aba8914215 100644
--- a/ui/tests/integration/components/icon-test.js
+++ b/ui/tests/integration/components/icon-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
@@ -29,10 +24,10 @@ module('Integration | Component | icon', function (hooks) {
     await render(hbs`<Icon @name="vault-logo" @size="24"/>`);
     assert.dom('.hs-icon').hasClass('hs-icon-xl', 'adds the larger size class');
 
-    const promise = waitForError();
+    let promise = waitForError();
     render(hbs`<Icon @name="vault-logo" @size="12"/>`);
-    const err = await promise;
-    assert.strictEqual(
+    let err = await promise;
+    assert.equal(
       err.message,
       'Assertion Failed: Icon component size argument must be either "16" or "24"',
       'Error is thrown when supported size is not provided'
@@ -52,7 +47,7 @@ module('Integration | Component | icon', function (hooks) {
     const promise = waitForError();
     render(hbs`<Icon @name="x" @size="12"/>`);
     const err = await promise;
-    assert.strictEqual(
+    assert.equal(
       err.message,
       'Assertion Failed: Icon component size argument must be either "16" or "24"',
       'Error is thrown when supported size is not provided'
diff --git a/ui/tests/integration/components/identity/item-details-test.js b/ui/tests/integration/components/identity/item-details-test.js
index 5ddaef99d1898..ec464f1bd72dd 100644
--- a/ui/tests/integration/components/identity/item-details-test.js
+++ b/ui/tests/integration/components/identity/item-details-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { resolve } from 'rsvp';
 import EmberObject from '@ember/object';
 import { module, test } from 'qunit';
@@ -23,7 +18,7 @@ module('Integration | Component | identity/item details', function (hooks) {
   });
 
   test('it renders the disabled warning', async function (assert) {
-    const model = EmberObject.create({
+    let model = EmberObject.create({
       save() {
         return resolve();
       },
@@ -32,7 +27,7 @@ module('Integration | Component | identity/item details', function (hooks) {
     });
     sinon.spy(model, 'save');
     this.set('model', model);
-    await render(hbs`{{identity/item-details model=this.model}}`);
+    await render(hbs`{{identity/item-details model=model}}`);
     assert.dom('[data-test-disabled-warning]').exists();
     await component.enable();
 
@@ -40,21 +35,21 @@ module('Integration | Component | identity/item details', function (hooks) {
   });
 
   test('it does not render the button if canEdit is false', async function (assert) {
-    const model = EmberObject.create({
+    let model = EmberObject.create({
       disabled: true,
     });
 
     this.set('model', model);
-    await render(hbs`{{identity/item-details model=this.model}}`);
+    await render(hbs`{{identity/item-details model=model}}`);
     assert.dom('[data-test-disabled-warning]').exists('shows the warning banner');
     assert.dom('[data-test-enable]').doesNotExist('does not show the enable button');
   });
 
   test('it does not render the banner when item is enabled', async function (assert) {
-    const model = EmberObject.create();
+    let model = EmberObject.create();
     this.set('model', model);
 
-    await render(hbs`{{identity/item-details model=this.model}}`);
+    await render(hbs`{{identity/item-details model=model}}`);
     assert.dom('[data-test-disabled-warning]').doesNotExist('does not show the warning banner');
   });
 });
diff --git a/ui/tests/integration/components/info-table-item-array-test.js b/ui/tests/integration/components/info-table-item-array-test.js
index 9e7c354784936..392595e22046d 100644
--- a/ui/tests/integration/components/info-table-item-array-test.js
+++ b/ui/tests/integration/components/info-table-item-array-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import Service from '@ember/service';
 import { setupRenderingTest } from 'ember-qunit';
@@ -73,8 +68,8 @@ module('Integration | Component | InfoTableItemArray', function (hooks) {
       />`);
 
     assert.dom('[data-test-info-table-item-array]').exists();
-    const noLinkString = document.querySelector('code').textContent.trim();
-    assert.strictEqual(
+    let noLinkString = document.querySelector('code').textContent.trim();
+    assert.equal(
       noLinkString.length,
       DISPLAY_ARRAY.toString().length,
       'renders a string of the array if isLink is not provided'
@@ -91,7 +86,7 @@ module('Integration | Component | InfoTableItemArray', function (hooks) {
         @backend={{this.backend}}
       />
     `);
-    assert.strictEqual(
+    assert.equal(
       document.querySelectorAll('a > span').length,
       DISPLAY_ARRAY.length,
       'renders each item in array with link'
@@ -110,7 +105,7 @@ module('Integration | Component | InfoTableItemArray', function (hooks) {
       @queryParam={{this.queryParam}}
       @backend={{this.backend}}
     />`);
-    assert.strictEqual(
+    assert.equal(
       document.querySelectorAll('a > span').length,
       DISPLAY_ARRAY.length - 1,
       'renders each item in array with link'
@@ -146,7 +141,7 @@ module('Integration | Component | InfoTableItemArray', function (hooks) {
       @backend={{this.backend}}
     />`);
     const numberCutOffTruncatedArray = displayArrayWithWildcard.length - 5;
-    assert.strictEqual(document.querySelectorAll('a > span').length, 5, 'renders truncated array of five');
+    assert.equal(document.querySelectorAll('a > span').length, 5, 'renders truncated array of five');
     assert
       .dom(`[data-test-and="${numberCutOffTruncatedArray}"]`)
       .exists('correctly counts with wildcard filter and shows the count');
@@ -178,7 +173,7 @@ module('Integration | Component | InfoTableItemArray', function (hooks) {
       @queryParam={{this.queryParam}}
       @backend={{this.backend}}
     />`);
-    assert.strictEqual(findAll('[data-test-item]').length, 4, 'lists 4 roles');
+    assert.equal(findAll('[data-test-item]').length, 4, 'lists 4 roles');
     assert.dom('[data-test-readmore-content]').hasTextContaining('r*', 'renders wildcard');
     assert.dom('[data-test-count="0"]').doesNotExist('does not render badge');
     assert.dom('[data-test-view-all="roles"]').hasText('View all roles.', 'renders correct view all text');
@@ -211,7 +206,7 @@ module('Integration | Component | InfoTableItemArray', function (hooks) {
       @backend={{this.backend}}
     />`);
     assert.dom('[data-test-count="0"]').hasText('includes 0', 'renders badge');
-    assert.strictEqual(findAll('[data-test-item]').length, 4, 'renders list of 4 roles');
+    assert.equal(findAll('[data-test-item]').length, 4, 'renders list of 4 roles');
     assert.dom('[data-test-view-all="roles"]').hasText('View all roles.', 'renders view all text');
   });
 
@@ -229,7 +224,7 @@ module('Integration | Component | InfoTableItemArray', function (hooks) {
     />`);
     assert.dom('[data-test-item="6"]').hasText('six', `renders name of 'six' instead of id`);
     assert.dom('[data-test-item="8"]').hasText('eight', `renders 'eight' instead of id`);
-    assert.strictEqual(findAll('[data-test-item]').length, 3, 'renders all entities');
+    assert.equal(findAll('[data-test-item]').length, 3, 'renders all entities');
     assert
       .dom('[data-test-item="123-id"]')
       .hasText('123-id', 'renders id instead of name if no record for name');
@@ -249,7 +244,7 @@ module('Integration | Component | InfoTableItemArray', function (hooks) {
     />`);
     assert.dom('[data-test-item="1"]').hasText('one', `renders name of 'one' instead of id`);
     assert.dom('[data-test-item="3-id"]').hasText('3-id', 'renders id instead of name if no record for name');
-    assert.strictEqual(findAll('[data-test-item]').length, 5, 'only lists 5 entities');
+    assert.equal(findAll('[data-test-item]').length, 5, 'only lists 5 entities');
   });
 
   test('it truncates using read more component when overflows div', async function (assert) {
diff --git a/ui/tests/integration/components/info-table-row-test.js b/ui/tests/integration/components/info-table-row-test.js
index 685a6ab9aa024..23082077424e1 100644
--- a/ui/tests/integration/components/info-table-row-test.js
+++ b/ui/tests/integration/components/info-table-row-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { resolve } from 'rsvp';
 import Service from '@ember/service';
@@ -71,8 +66,8 @@ module('Integration | Component | InfoTableRow', function (hooks) {
 
     await triggerEvent('[data-test-value-div="test label"] .ember-basic-dropdown-trigger', 'mouseenter');
 
-    const tooltip = document.querySelector('div.box').textContent.trim();
-    assert.strictEqual(tooltip, 'Tooltip text!', 'renders tooltip text');
+    let tooltip = document.querySelector('div.box').textContent.trim();
+    assert.equal(tooltip, 'Tooltip text!', 'renders tooltip text');
   });
 
   test('it should copy tooltip', async function (assert) {
@@ -152,12 +147,8 @@ module('Integration | Component | InfoTableRow', function (hooks) {
     this.set('value', '');
     this.set('label', '');
     this.set('default', '');
-    const dashCount = document.querySelectorAll('.flight-icon').length;
-    assert.strictEqual(
-      dashCount,
-      2,
-      'Renders dash (-) when both label and value do not exist (and no defaults)'
-    );
+    let dashCount = document.querySelectorAll('.flight-icon').length;
+    assert.equal(dashCount, 2, 'Renders dash (-) when both label and value do not exist (and no defaults)');
   });
 
   test('block content overrides any passed in value content', async function (assert) {
@@ -168,8 +159,8 @@ module('Integration | Component | InfoTableRow', function (hooks) {
       Block content is here
       </InfoTableRow>`);
 
-    const block = document.querySelector('[data-test-value-div]').textContent.trim();
-    assert.strictEqual(block, 'Block content is here', 'renders block passed through');
+    let block = document.querySelector('[data-test-value-div]').textContent.trim();
+    assert.equal(block, 'Block content is here', 'renders block passed through');
   });
 
   test('Row renders when block content even if alwaysRender = false', async function (assert) {
@@ -259,37 +250,14 @@ module('Integration | Component | InfoTableRow', function (hooks) {
   });
 
   test('Formats the value as date when formatDate present', async function (assert) {
-    this.set('value', new Date('2018-04-03T14:15:30'));
+    let yearString = new Date().getFullYear().toString();
+    this.set('value', new Date());
     await render(hbs`<InfoTableRow
       @label={{this.label}}
       @value={{this.value}}
       @formatDate={{'yyyy'}}
     />`);
 
-    assert.dom('[data-test-value-div]').hasText('2018', 'Renders date with passed format');
-  });
-
-  test('Formats the value as TTL when formatTtl present', async function (assert) {
-    this.set('value', 6000);
-    await render(hbs`<InfoTableRow
-      @label={{this.label}}
-      @value={{this.value}}
-      @formatTtl={{true}}
-    />`);
-
-    assert
-      .dom('[data-test-value-div]')
-      .hasText('1 hour 40 minutes', 'Translates number value to largest unit with carryover of minutes');
-  });
-
-  test('Formats string value when formatTtl present', async function (assert) {
-    this.set('value', '45m');
-    await render(hbs`<InfoTableRow
-      @label={{this.label}}
-      @value={{this.value}}
-      @formatTtl={{true}}
-    />`);
-
-    assert.dom('[data-test-value-div]').hasText('45 minutes', 'it formats string duration');
+    assert.dom('[data-test-value-div]').hasText(yearString, 'Renders date with passed format');
   });
 });
diff --git a/ui/tests/integration/components/info-table-test.js b/ui/tests/integration/components/info-table-test.js
index 54cdb3b2cd4c4..bed39dfb4a4cf 100644
--- a/ui/tests/integration/components/info-table-test.js
+++ b/ui/tests/integration/components/info-table-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
@@ -10,7 +5,7 @@ import hbs from 'htmlbars-inline-precompile';
 
 const TITLE = 'My Table';
 const HEADER = 'Cool Header';
-const ITEMS = ['https://127.0.0.1:8201', 'hello', '3'];
+const ITEMS = ['https://127.0.0.1:8201', 'hello', 3];
 
 module('Integration | Component | InfoTable', function (hooks) {
   setupRenderingTest(hooks);
@@ -24,19 +19,19 @@ module('Integration | Component | InfoTable', function (hooks) {
   test('it renders', async function (assert) {
     assert.expect(6);
     await render(hbs`<InfoTable
-        @title={{this.title}}
-        @header={{this.header}}
-        @items={{this.items}}
+        @title={{title}}
+        @header={{header}}
+        @items={{items}}
       />`);
 
     assert.dom('[data-test-info-table]').exists();
     assert.dom('[data-test-info-table] th').includesText(HEADER, `shows the table header`);
 
     const rows = document.querySelectorAll('.info-table-row');
-    assert.strictEqual(rows.length, ITEMS.length, 'renders an InfoTableRow for each item');
+    assert.equal(rows.length, ITEMS.length, 'renders an InfoTableRow for each item');
 
     rows.forEach((row, i) => {
-      assert.strictEqual(row.innerText, ITEMS[i], 'handles strings and numbers as row values');
+      assert.equal(row.innerText, ITEMS[i], 'handles strings and numbers as row values');
     });
   });
 });
diff --git a/ui/tests/integration/components/json-editor-test.js b/ui/tests/integration/components/json-editor-test.js
index 582e700b682a9..a2919bbb2afd7 100644
--- a/ui/tests/integration/components/json-editor-test.js
+++ b/ui/tests/integration/components/json-editor-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { create } from 'ember-cli-page-object';
@@ -39,7 +34,7 @@ module('Integration | Component | json-editor', function (hooks) {
         @readOnly={{true}}
       />`);
 
-    assert.strictEqual(component.title, 'Test title', 'renders the provided title');
+    assert.equal(component.title, 'Test title', 'renders the provided title');
     assert.true(component.hasToolbar, 'renders the toolbar');
     assert.true(component.hasJSONEditor, 'renders the code mirror modifier');
     assert.ok(component.canEdit, 'json editor can be edited');
diff --git a/ui/tests/integration/components/keymgmt/distribute-test.js b/ui/tests/integration/components/keymgmt/distribute-test.js
index 5e193c3dc854c..877b16d6fd6cc 100644
--- a/ui/tests/integration/components/keymgmt/distribute-test.js
+++ b/ui/tests/integration/components/keymgmt/distribute-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import Pretender from 'pretender';
@@ -104,12 +99,12 @@ module('Integration | Component | keymgmt/distribute', function (hooks) {
   test('it does not allow operation selection until valid key/provider combo selected', async function (assert) {
     assert.expect(6);
     await render(
-      hbs`<Keymgmt::Distribute @backend="keymgmt" @key="example-1" @providers={{this.providers}} @onClose={{fn (mut this.onClose)}} />`
+      hbs`<Keymgmt::Distribute @backend="keymgmt" @key="example-1" @providers={{providers}} @onClose={{fn (mut this.onClose)}} />`
     );
     assert.dom(SELECTORS.operationsSection).hasAttribute('disabled');
     // Select
     await clickTrigger();
-    assert.strictEqual(ssComponent.options.length, 3, 'shows all provider options');
+    assert.equal(ssComponent.options.length, 3, 'shows all provider options');
     await typeInSearch('aws');
     await ssComponent.selectOption();
     await settled();
@@ -128,7 +123,7 @@ module('Integration | Component | keymgmt/distribute', function (hooks) {
   test('it shows key type select field if new key created', async function (assert) {
     assert.expect(2);
     await render(
-      hbs`<Keymgmt::Distribute @backend="keymgmt" @providers={{this.providers}} @onClose={{fn (mut this.onClose)}} />`
+      hbs`<Keymgmt::Distribute @backend="keymgmt" @providers={{providers}} @onClose={{fn (mut this.onClose)}} />`
     );
     assert.dom(SELECTORS.keyTypeSection).doesNotExist('Key Type section is not rendered by default');
     // Add new item on search-select
@@ -162,7 +157,7 @@ module('Integration | Component | keymgmt/distribute', function (hooks) {
   test('it hides the key field if passed from the parent', async function (assert) {
     assert.expect(4);
     await render(
-      hbs`<Keymgmt::Distribute @backend="keymgmt" @providers={{this.providers}} @key="example-1" @onClose={{fn (mut this.onClose)}} />`
+      hbs`<Keymgmt::Distribute @backend="keymgmt" @providers={{providers}} @key="example-1" @onClose={{fn (mut this.onClose)}} />`
     );
     assert.dom(SELECTORS.providerInput).exists('Provider input shown');
     assert.dom(SELECTORS.keySection).doesNotExist('Key input not shown');
diff --git a/ui/tests/integration/components/keymgmt/key-edit-test.js b/ui/tests/integration/components/keymgmt/key-edit-test.js
index 3d2e553e012c9..0d67fffdf30c2 100644
--- a/ui/tests/integration/components/keymgmt/key-edit-test.js
+++ b/ui/tests/integration/components/keymgmt/key-edit-test.js
@@ -1,36 +1,26 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
-import sinon from 'sinon';
 import EmberObject from '@ember/object';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
-import timestamp from 'core/utils/timestamp';
 
 module('Integration | Component | keymgmt/key-edit', function (hooks) {
   setupRenderingTest(hooks);
 
-  hooks.before(function () {
-    sinon.stub(timestamp, 'now').callsFake(() => new Date('2018-04-03T14:15:30'));
-  });
   hooks.beforeEach(function () {
-    const now = timestamp.now();
-    const model = EmberObject.create({
+    const now = new Date().toString();
+    let model = EmberObject.create({
       name: 'Unicorns',
       id: 'Unicorns',
       minEnabledVersion: 1,
       versions: [
         {
           id: 1,
-          creation_time: now.toString(),
+          creation_time: now,
         },
         {
           id: 2,
-          creation_time: now.toString(),
+          creation_time: now,
         },
       ],
       canDelete: true,
@@ -38,16 +28,11 @@ module('Integration | Component | keymgmt/key-edit', function (hooks) {
     this.model = model;
     this.tab = '';
   });
-  hooks.after(function () {
-    timestamp.now.restore();
-  });
 
   // TODO: Add capabilities tests
   test('it renders show view as default', async function (assert) {
     assert.expect(8);
-    await render(
-      hbs`<Keymgmt::KeyEdit @model={{this.model}} @tab={{this.tab}} /><div id="modal-wormhole" />`
-    );
+    await render(hbs`<Keymgmt::KeyEdit @model={{model}} @tab={{tab}} /><div id="modal-wormhole" />`);
     assert.dom('[data-test-secret-header]').hasText('Unicorns', 'Shows key name');
     assert.dom('[data-test-keymgmt-key-toolbar]').exists('Subnav toolbar exists');
     assert.dom('[data-test-tab="Details"]').exists('Details tab exists');
@@ -64,16 +49,14 @@ module('Integration | Component | keymgmt/key-edit', function (hooks) {
 
   test('it renders the correct elements on edit view', async function (assert) {
     assert.expect(4);
-    const model = EmberObject.create({
+    let model = EmberObject.create({
       name: 'Unicorns',
       id: 'Unicorns',
     });
     this.set('mode', 'edit');
     this.set('model', model);
 
-    await render(
-      hbs`<Keymgmt::KeyEdit @model={{this.model}} @mode={{this.mode}} /><div id="modal-wormhole" />`
-    );
+    await render(hbs`<Keymgmt::KeyEdit @model={{model}} @mode={{mode}} /><div id="modal-wormhole" />`);
     assert.dom('[data-test-secret-header]').hasText('Edit key', 'Shows edit header');
     assert.dom('[data-test-keymgmt-key-toolbar]').doesNotExist('Subnav toolbar does not exist');
     assert.dom('[data-test-tab="Details"]').doesNotExist('Details tab does not exist');
@@ -82,13 +65,11 @@ module('Integration | Component | keymgmt/key-edit', function (hooks) {
 
   test('it renders the correct elements on create view', async function (assert) {
     assert.expect(4);
-    const model = EmberObject.create({});
+    let model = EmberObject.create({});
     this.set('mode', 'create');
     this.set('model', model);
 
-    await render(
-      hbs`<Keymgmt::KeyEdit @model={{this.model}} @mode={{this.mode}} /><div id="modal-wormhole" />`
-    );
+    await render(hbs`<Keymgmt::KeyEdit @model={{model}} @mode={{mode}} /><div id="modal-wormhole" />`);
     assert.dom('[data-test-secret-header]').hasText('Create key', 'Shows edit header');
     assert.dom('[data-test-keymgmt-key-toolbar]').doesNotExist('Subnav toolbar does not exist');
     assert.dom('[data-test-tab="Details"]').doesNotExist('Details tab does not exist');
@@ -100,9 +81,7 @@ module('Integration | Component | keymgmt/key-edit', function (hooks) {
     const store = this.owner.lookup('service:store');
     this.model = store.createRecord('keymgmt/key');
     this.set('mode', 'create');
-    await render(
-      hbs`<Keymgmt::KeyEdit @model={{this.model}} @mode={{this.mode}} /><div id="modal-wormhole" />`
-    );
+    await render(hbs`<Keymgmt::KeyEdit @model={{model}} @mode={{mode}} /><div id="modal-wormhole" />`);
     assert.dom('[data-test-input="type"]').hasValue('rsa-2048', 'Has type rsa-2048 by default');
   });
 });
diff --git a/ui/tests/integration/components/keymgmt/provider-edit-test.js b/ui/tests/integration/components/keymgmt/provider-edit-test.js
index 1a420730f4e75..0b866efd6d58e 100644
--- a/ui/tests/integration/components/keymgmt/provider-edit-test.js
+++ b/ui/tests/integration/components/keymgmt/provider-edit-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
@@ -70,8 +65,8 @@ module('Integration | Component | keymgmt/provider-edit', function (hooks) {
     });
     this.owner.lookup('service:router').reopen({
       transitionTo(path, model, { queryParams: { tab } }) {
-        assert.strictEqual(path, root.path, 'Root path sent in transitionTo on delete');
-        assert.strictEqual(model, root.model, 'Root model sent in transitionTo on delete');
+        assert.equal(path, root.path, 'Root path sent in transitionTo on delete');
+        assert.equal(model, root.model, 'Root model sent in transitionTo on delete');
         assert.deepEqual(tab, 'provider', 'Correct query params sent in transitionTo on delete');
       },
     });
@@ -135,12 +130,8 @@ module('Integration | Component | keymgmt/provider-edit', function (hooks) {
     });
     this.owner.lookup('service:router').reopen({
       transitionTo(path, model, { queryParams: { itemType } }) {
-        assert.strictEqual(
-          path,
-          'vault.cluster.secrets.backend.show',
-          'Show route sent in transitionTo on save'
-        );
-        assert.strictEqual(model, 'foo', 'Model id sent in transitionTo on save');
+        assert.equal(path, 'vault.cluster.secrets.backend.show', 'Show route sent in transitionTo on save');
+        assert.equal(model, 'foo', 'Model id sent in transitionTo on save');
         assert.deepEqual(itemType, 'provider', 'Correct query params sent in transitionTo on save');
       },
     });
@@ -199,12 +190,8 @@ module('Integration | Component | keymgmt/provider-edit', function (hooks) {
     });
     this.owner.lookup('service:router').reopen({
       transitionTo(path, model, { queryParams: { itemType } }) {
-        assert.strictEqual(
-          path,
-          'vault.cluster.secrets.backend.show',
-          'Show route sent in transitionTo on save'
-        );
-        assert.strictEqual(model, 'foo', 'Model id sent in transitionTo on save');
+        assert.equal(path, 'vault.cluster.secrets.backend.show', 'Show route sent in transitionTo on save');
+        assert.equal(model, 'foo', 'Model id sent in transitionTo on save');
         assert.deepEqual(itemType, 'provider', 'Correct query params sent in transitionTo on save');
       },
     });
diff --git a/ui/tests/integration/components/known-secondaries-card-test.js b/ui/tests/integration/components/known-secondaries-card-test.js
index ef6353636b4ce..0ef05df4b0e59 100644
--- a/ui/tests/integration/components/known-secondaries-card-test.js
+++ b/ui/tests/integration/components/known-secondaries-card-test.js
@@ -1,13 +1,9 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
-import { setupEngine } from 'ember-engines/test-support';
+import engineResolverFor from 'ember-engines/test-support/engine-resolver-for';
 import hbs from 'htmlbars-inline-precompile';
+const resolver = engineResolverFor('replication');
 
 const CLUSTER = {
   canAddSecondary: true,
@@ -23,19 +19,16 @@ const REPLICATION_ATTRS = {
 };
 
 module('Integration | Component | replication known-secondaries-card', function (hooks) {
-  setupRenderingTest(hooks);
-  setupEngine(hooks, 'replication');
+  setupRenderingTest(hooks, { resolver });
 
   hooks.beforeEach(function () {
-    this.context = { owner: this.engine }; // this.engine set by setupEngine
     this.set('cluster', CLUSTER);
     this.set('replicationAttrs', REPLICATION_ATTRS);
   });
 
   test('it renders with a table of known secondaries', async function (assert) {
     await render(
-      hbs`<KnownSecondariesCard @cluster={{this.cluster}} @replicationAttrs={{this.replicationAttrs}} />`,
-      this.context
+      hbs`<KnownSecondariesCard @cluster={{this.cluster}} @replicationAttrs={{this.replicationAttrs}} />`
     );
 
     assert
@@ -50,8 +43,7 @@ module('Integration | Component | replication known-secondaries-card', function
     };
     this.set('replicationAttrs', noSecondaries);
     await render(
-      hbs`<KnownSecondariesCard @cluster={{this.cluster}} @replicationAttrs={{this.replicationAttrs}} />`,
-      this.context
+      hbs`<KnownSecondariesCard @cluster={{this.cluster}} @replicationAttrs={{this.replicationAttrs}} />`
     );
 
     assert
@@ -64,8 +56,7 @@ module('Integration | Component | replication known-secondaries-card', function
 
   test('it renders an Add secondary link if user has capabilites', async function (assert) {
     await render(
-      hbs`<KnownSecondariesCard @cluster={{this.cluster}} @replicationAttrs={{this.replicationAttrs}} />`,
-      this.context
+      hbs`<KnownSecondariesCard @cluster={{this.cluster}} @replicationAttrs={{this.replicationAttrs}} />`
     );
 
     assert.dom('.add-secondaries').exists();
@@ -77,8 +68,7 @@ module('Integration | Component | replication known-secondaries-card', function
     };
     this.set('cluster', noCapabilities);
     await render(
-      hbs`<KnownSecondariesCard @cluster={{this.cluster}} @replicationAttrs={{this.replicationAttrs}} />`,
-      this.context
+      hbs`<KnownSecondariesCard @cluster={{this.cluster}} @replicationAttrs={{this.replicationAttrs}} />`
     );
 
     assert.dom('.add-secondaries').doesNotExist();
diff --git a/ui/tests/integration/components/known-secondaries-table-test.js b/ui/tests/integration/components/known-secondaries-table-test.js
index da6dbd77ff207..3afe5cee1f675 100644
--- a/ui/tests/integration/components/known-secondaries-table-test.js
+++ b/ui/tests/integration/components/known-secondaries-table-test.js
@@ -1,14 +1,10 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /* eslint qunit/no-conditional-assertions: "warn" */
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
-import { setupEngine } from 'ember-engines/test-support';
+import engineResolverFor from 'ember-engines/test-support/engine-resolver-for';
 import hbs from 'htmlbars-inline-precompile';
+const resolver = engineResolverFor('replication');
 
 const SECONDARIES = [
   { node_id: 'secondary-1', api_address: 'https://127.0.0.1:52304', connection_status: 'connected' },
@@ -17,26 +13,24 @@ const SECONDARIES = [
 ];
 
 module('Integration | Component | replication known-secondaries-table', function (hooks) {
-  setupRenderingTest(hooks);
-  setupEngine(hooks, 'replication');
+  setupRenderingTest(hooks, { resolver });
 
   hooks.beforeEach(function () {
-    this.context = { owner: this.engine }; // this.engine set by setupEngine
     this.set('secondaries', SECONDARIES);
   });
 
   test('it renders a table of known secondaries', async function (assert) {
-    await render(hbs`<KnownSecondariesTable @secondaries={{this.secondaries}} />`, this.context);
+    await render(hbs`<KnownSecondariesTable @secondaries={{secondaries}} />`);
 
     assert.dom('[data-test-known-secondaries-table]').exists();
   });
 
   test('it shows the secondary URL and connection_status', async function (assert) {
     assert.expect(9);
-    await render(hbs`<KnownSecondariesTable @secondaries={{this.secondaries}} />`, this.context);
+    await render(hbs`<KnownSecondariesTable @secondaries={{secondaries}} />`);
 
     SECONDARIES.forEach((secondary) => {
-      assert.strictEqual(
+      assert.equal(
         this.element.querySelector(`[data-test-secondaries=row-for-${secondary.node_id}]`).innerHTML.trim(),
         secondary.node_id,
         'shows a table row and ID for each known secondary'
@@ -45,7 +39,7 @@ module('Integration | Component | replication known-secondaries-table', function
       if (secondary.api_address) {
         const expectedUrl = `${secondary.api_address}/ui/`;
 
-        assert.strictEqual(
+        assert.equal(
           this.element.querySelector(`[data-test-secondaries=api-address-for-${secondary.node_id}]`).href,
           expectedUrl,
           'renders a URL to the secondary UI'
@@ -56,7 +50,7 @@ module('Integration | Component | replication known-secondaries-table', function
         );
       }
 
-      assert.strictEqual(
+      assert.equal(
         this.element
           .querySelector(`[data-test-secondaries=connection-status-for-${secondary.node_id}]`)
           .innerHTML.trim(),
diff --git a/ui/tests/integration/components/kubernetes/config-cta-test.js b/ui/tests/integration/components/kubernetes/config-cta-test.js
deleted file mode 100644
index 9ce85853c9fc5..0000000000000
--- a/ui/tests/integration/components/kubernetes/config-cta-test.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { setupEngine } from 'ember-engines/test-support';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import { render } from '@ember/test-helpers';
-import hbs from 'htmlbars-inline-precompile';
-
-module('Integration | Component | kubernetes | ConfigCta', function (hooks) {
-  setupRenderingTest(hooks);
-  setupEngine(hooks, 'kubernetes');
-  setupMirage(hooks);
-
-  test('it should render message and action', async function (assert) {
-    await render(hbs`<ConfigCta />`, { owner: this.engine });
-    assert.dom('[data-test-empty-state-title]').hasText('Kubernetes not configured', 'Title renders');
-    assert
-      .dom('[data-test-empty-state-message]')
-      .hasText(
-        'Get started by establishing the URL of the Kubernetes API to connect to, along with some additional options.',
-        'Message renders'
-      );
-    assert.dom('[data-test-config-cta] a').hasText('Configure Kubernetes', 'Action renders');
-  });
-});
diff --git a/ui/tests/integration/components/kubernetes/page/configuration-test.js b/ui/tests/integration/components/kubernetes/page/configuration-test.js
deleted file mode 100644
index 25cd99d57332b..0000000000000
--- a/ui/tests/integration/components/kubernetes/page/configuration-test.js
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { setupEngine } from 'ember-engines/test-support';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import { render } from '@ember/test-helpers';
-import hbs from 'htmlbars-inline-precompile';
-
-module('Integration | Component | kubernetes | Page::Configuration', function (hooks) {
-  setupRenderingTest(hooks);
-  setupEngine(hooks, 'kubernetes');
-  setupMirage(hooks);
-
-  hooks.beforeEach(function () {
-    this.store = this.owner.lookup('service:store');
-    this.store.pushPayload('secret-engine', {
-      modelName: 'secret-engine',
-      data: {
-        accessor: 'kubernetes_f3400dee',
-        path: 'kubernetes-test/',
-        type: 'kubernetes',
-      },
-    });
-    this.backend = this.store.peekRecord('secret-engine', 'kubernetes-test');
-    this.config = null;
-
-    this.setConfig = (disableLocal) => {
-      const data = this.server.create(
-        'kubernetes-config',
-        !disableLocal ? { disable_local_ca_jwt: false } : null
-      );
-      this.store.pushPayload('kubernetes/config', {
-        modelName: 'kubernetes/config',
-        backend: 'kubernetes-test',
-        ...data,
-      });
-      this.config = this.store.peekRecord('kubernetes/config', 'kubernetes-test');
-    };
-
-    this.breadcrumbs = [
-      { label: 'secrets', route: 'secrets', linkExternal: true },
-      { label: this.backend.id },
-    ];
-
-    this.renderComponent = () => {
-      return render(
-        hbs`<Page::Configuration @backend={{this.backend}} @config={{this.config}} @breadcrumbs={{this.breadcrumbs}} />`,
-        {
-          owner: this.engine,
-        }
-      );
-    };
-  });
-
-  test('it should render tab page header and config cta', async function (assert) {
-    await this.renderComponent();
-    assert.dom('.title svg').hasClass('flight-icon-kubernetes', 'Kubernetes icon renders in title');
-    assert.dom('.title').hasText('kubernetes-test', 'Mount path renders in title');
-    assert
-      .dom('[data-test-toolbar-config-action]')
-      .hasText('Configure Kubernetes', 'Toolbar action has correct text');
-    assert.dom('[data-test-config-cta]').exists('Config cta renders');
-  });
-
-  test('it should render message for inferred configuration', async function (assert) {
-    this.setConfig(false);
-    await this.renderComponent();
-    assert
-      .dom('[data-test-inferred-message] svg')
-      .hasClass('flight-icon-check-circle-fill', 'Inferred message icon renders');
-    const message =
-      'These details were successfully inferred from Vault’s kubernetes environment and were not explicity set in this config.';
-    assert.dom('[data-test-inferred-message]').hasText(message, 'Inferred message renders');
-    assert
-      .dom('[data-test-toolbar-config-action]')
-      .hasText('Edit configuration', 'Toolbar action has correct text');
-  });
-
-  test('it should render host and certificate info', async function (assert) {
-    this.setConfig(true);
-    await this.renderComponent();
-    assert.dom('[data-test-row-label="Kubernetes host"]').exists('Kubernetes host label renders');
-    assert
-      .dom('[data-test-row-value="Kubernetes host"]')
-      .hasText(this.config.kubernetesHost, 'Kubernetes host value renders');
-    assert.dom('[data-test-row-label="Certificate"]').exists('Certificate label renders');
-    assert
-      .dom('[data-test-certificate-icon]')
-      .hasClass('flight-icon-certificate', 'Certificate card icon renders');
-    assert.dom('[data-test-certificate-label]').hasText('PEM Format', 'Certificate card label renders');
-    assert
-      .dom('[data-test-certificate-value]')
-      .hasText(this.config.kubernetesCaCert, 'Certificate card value renders');
-    assert.dom('[data-test-certificate-copy]').exists('Certificate copy button renders');
-  });
-});
diff --git a/ui/tests/integration/components/kubernetes/page/configure-test.js b/ui/tests/integration/components/kubernetes/page/configure-test.js
deleted file mode 100644
index bc068de7de788..0000000000000
--- a/ui/tests/integration/components/kubernetes/page/configure-test.js
+++ /dev/null
@@ -1,279 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { setupEngine } from 'ember-engines/test-support';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import { render, click, waitUntil, find, fillIn } from '@ember/test-helpers';
-import hbs from 'htmlbars-inline-precompile';
-import { Response } from 'miragejs';
-import sinon from 'sinon';
-
-module('Integration | Component | kubernetes | Page::Configure', function (hooks) {
-  setupRenderingTest(hooks);
-  setupEngine(hooks, 'kubernetes');
-  setupMirage(hooks);
-
-  hooks.beforeEach(function () {
-    this.store = this.owner.lookup('service:store');
-    this.newModel = this.store.createRecord('kubernetes/config', { backend: 'kubernetes-new' });
-    this.existingConfig = {
-      kubernetes_host: 'https://192.168.99.100:8443',
-      kubernetes_ca_cert: '-----BEGIN CERTIFICATE-----\n.....\n-----END CERTIFICATE-----',
-      service_account_jwt: 'test-jwt',
-      disable_local_ca_jwt: true,
-    };
-    this.store.pushPayload('kubernetes/config', {
-      modelName: 'kubernetes/config',
-      backend: 'kubernetes-edit',
-      ...this.existingConfig,
-    });
-    this.editModel = this.store.peekRecord('kubernetes/config', 'kubernetes-edit');
-    this.breadcrumbs = [
-      { label: 'secrets', route: 'secrets', linkExternal: true },
-      { label: 'kubernetes', route: 'overview' },
-      { label: 'configure' },
-    ];
-    this.expectedInferred = {
-      disable_local_ca_jwt: false,
-      kubernetes_ca_cert: null,
-      kubernetes_host: null,
-      service_account_jwt: null,
-    };
-  });
-
-  test('it should display proper options when toggling radio cards', async function (assert) {
-    await render(hbs`<Page::Configure @model={{this.newModel}} @breadcrumbs={{this.breadcrumbs}} />`, {
-      owner: this.engine,
-    });
-    assert
-      .dom('[data-test-radio-card="local"] input')
-      .isChecked('Local cluster radio card is checked by default');
-    assert
-      .dom('[data-test-config] p')
-      .hasText(
-        'Configuration values can be inferred from the pod and your local environment variables.',
-        'Inferred text is displayed'
-      );
-    assert.dom('[data-test-config] button').hasText('Get config values', 'Get config button renders');
-    assert
-      .dom('[data-test-config-save]')
-      .isDisabled('Save button is disabled when config values have not been inferred');
-    assert.dom('[data-test-config-cancel]').hasText('Back', 'Back button renders');
-
-    await click('[data-test-radio-card="manual"]');
-    assert.dom('[data-test-field]').exists({ count: 3 }, 'Form fields render');
-    assert.dom('[data-test-config-save]').isNotDisabled('Save button is enabled');
-    assert.dom('[data-test-config-cancel]').hasText('Back', 'Back button renders');
-  });
-
-  test('it should check for inferred config variables', async function (assert) {
-    assert.expect(8);
-
-    let status = 404;
-    this.server.get('/:path/check', () => {
-      assert.ok(
-        waitUntil(() => find('[data-test-config] button').disabled),
-        'Button is disabled while request is in flight'
-      );
-      return new Response(status, {});
-    });
-
-    await render(hbs`<Page::Configure @model={{this.newModel}} @breadcrumbs={{this.breadcrumbs}} />`, {
-      owner: this.engine,
-    });
-
-    await click('[data-test-config] button');
-    assert
-      .dom('[data-test-icon="x-square-fill"]')
-      .hasClass('has-text-danger', 'Icon is displayed for error state with correct styling');
-    const error =
-      'Vault could not infer a configuration from your environment variables. Check your configuration file to edit or delete them, or configure manually.';
-    assert.dom('[data-test-config] span').hasText(error, 'Error text is displayed');
-    assert.dom('[data-test-config-save]').isDisabled('Save button is disabled in error state');
-
-    status = 204;
-    await click('[data-test-radio-card="manual"]');
-    await click('[data-test-radio-card="local"]');
-    await click('[data-test-config] button');
-    assert
-      .dom('[data-test-icon="check-circle-fill"]')
-      .hasClass('has-text-success', 'Icon is displayed for success state with correct styling');
-    assert
-      .dom('[data-test-config] span')
-      .hasText('Configuration values were inferred successfully.', 'Success text is displayed');
-    assert.dom('[data-test-config-save]').isNotDisabled('Save button is enabled in success state');
-  });
-
-  test('it should create new manual config', async function (assert) {
-    assert.expect(2);
-
-    this.server.post('/:path/config', (schema, req) => {
-      const json = JSON.parse(req.requestBody);
-      assert.deepEqual(json, this.existingConfig, 'Values are passed to create endpoint');
-      return new Response(204, {});
-    });
-
-    const stub = sinon.stub(this.owner.lookup('service:router'), 'transitionTo');
-
-    await render(hbs`<Page::Configure @model={{this.newModel}} @breadcrumbs={{this.breadcrumbs}} />`, {
-      owner: this.engine,
-    });
-
-    await click('[data-test-radio-card="manual"]');
-    await fillIn('[data-test-input="kubernetesHost"]', this.existingConfig.kubernetes_host);
-    await fillIn('[data-test-input="serviceAccountJwt"]', this.existingConfig.service_account_jwt);
-    await fillIn('[data-test-input="kubernetesCaCert"]', this.existingConfig.kubernetes_ca_cert);
-    await click('[data-test-config-save]');
-    assert.ok(
-      stub.calledWith('vault.cluster.secrets.backend.kubernetes.configuration'),
-      'Transitions to configuration route on save success'
-    );
-  });
-
-  test('it should edit existing manual config', async function (assert) {
-    assert.expect(6);
-
-    const stub = sinon.stub(this.owner.lookup('service:router'), 'transitionTo');
-
-    await render(hbs`<Page::Configure @model={{this.editModel}} @breadcrumbs={{this.breadcrumbs}} />`, {
-      owner: this.engine,
-    });
-
-    assert.dom('[data-test-radio-card="manual"] input').isChecked('Manual config radio card is checked');
-    assert
-      .dom('[data-test-input="kubernetesHost"]')
-      .hasValue(this.existingConfig.kubernetes_host, 'Host field is populated');
-    assert
-      .dom('[data-test-input="serviceAccountJwt"]')
-      .hasValue(this.existingConfig.service_account_jwt, 'JWT field is populated');
-    assert
-      .dom('[data-test-input="kubernetesCaCert"]')
-      .hasValue(this.existingConfig.kubernetes_ca_cert, 'Cert field is populated');
-
-    await fillIn('[data-test-input="kubernetesHost"]', 'http://localhost:1212');
-    await click('[data-test-config-cancel]');
-
-    assert.ok(
-      stub.calledWith('vault.cluster.secrets.backend.kubernetes.configuration'),
-      'Transitions to configuration route when cancelling edit'
-    );
-    assert.strictEqual(
-      this.editModel.kubernetesHost,
-      this.existingConfig.kubernetes_host,
-      'Model values are rolled back on cancel'
-    );
-  });
-
-  test('it should display inferred success message when editing model using local values', async function (assert) {
-    this.store.pushPayload('kubernetes/config', {
-      modelName: 'kubernetes/config',
-      backend: 'kubernetes-edit-2',
-      disable_local_ca_jwt: false,
-    });
-    this.model = this.store.peekRecord('kubernetes/config', 'kubernetes-edit-2');
-
-    await render(hbs`<Page::Configure @model={{this.model}} @breadcrumbs={{this.breadcrumbs}} />`, {
-      owner: this.engine,
-    });
-
-    assert.dom('[data-test-radio-card="local"] input').isChecked('Local cluster radio card is checked');
-    assert
-      .dom('[data-test-icon="check-circle-fill"]')
-      .hasClass('has-text-success', 'Icon is displayed for success state with correct styling');
-    assert
-      .dom('[data-test-config] span')
-      .hasText('Configuration values were inferred successfully.', 'Success text is displayed');
-  });
-
-  test('it should show confirmation modal when saving edits', async function (assert) {
-    assert.expect(2);
-
-    this.server.post('/:path/config', () => {
-      assert.ok(true, 'Save request made after confirmation');
-      return new Response(204, {});
-    });
-
-    await render(
-      hbs`
-      <div id="modal-wormhole"></div>
-      <Page::Configure @model={{this.editModel}} @breadcrumbs={{this.breadcrumbs}} />
-    `,
-      { owner: this.engine }
-    );
-    await click('[data-test-config-save]');
-    assert
-      .dom('.modal-card-body')
-      .hasText(
-        'Making changes to your configuration may affect how Vault will reach the Kubernetes API and authenticate with it. Are you sure?',
-        'Confirm modal renders'
-      );
-    await click('[data-test-config-confirm]');
-  });
-
-  test('it should validate form and show errors', async function (assert) {
-    await render(hbs`<Page::Configure @model={{this.newModel}} @breadcrumbs={{this.breadcrumbs}} />`, {
-      owner: this.engine,
-    });
-
-    await click('[data-test-radio-card="manual"]');
-    await click('[data-test-config-save]');
-
-    assert
-      .dom('[data-test-inline-error-message]')
-      .hasText('Kubernetes host is required', 'Error renders for required field');
-    assert.dom('[data-test-alert] p').hasText('There is an error with this form.', 'Alert renders');
-  });
-
-  test('it should save inferred config', async function (assert) {
-    assert.expect(2);
-
-    this.server.get('/:path/check', () => new Response(204, {}));
-    this.server.post('/:path/config', (schema, req) => {
-      const json = JSON.parse(req.requestBody);
-      assert.deepEqual(json, this.expectedInferred, 'Values are passed to create endpoint');
-      return new Response(204, {});
-    });
-
-    const stub = sinon.stub(this.owner.lookup('service:router'), 'transitionTo');
-
-    await render(hbs`<Page::Configure @model={{this.newModel}} @breadcrumbs={{this.breadcrumbs}} />`, {
-      owner: this.engine,
-    });
-
-    await click('[data-test-config] button');
-    await click('[data-test-config-save]');
-
-    assert.ok(
-      stub.calledWith('vault.cluster.secrets.backend.kubernetes.configuration'),
-      'Transitions to configuration route on save success'
-    );
-  });
-
-  test('it should unset manual config values when saving local cluster option', async function (assert) {
-    assert.expect(1);
-
-    this.server.get('/:path/check', () => new Response(204, {}));
-    this.server.post('/:path/config', (schema, req) => {
-      const json = JSON.parse(req.requestBody);
-      assert.deepEqual(json, this.expectedInferred, 'Manual config values are unset in server payload');
-      return new Response(204, {});
-    });
-
-    await render(hbs`<Page::Configure @model={{this.newModel}} @breadcrumbs={{this.breadcrumbs}} />`, {
-      owner: this.engine,
-    });
-
-    await click('[data-test-radio-card="manual"]');
-    await fillIn('[data-test-input="kubernetesHost"]', this.existingConfig.kubernetes_host);
-    await fillIn('[data-test-input="serviceAccountJwt"]', this.existingConfig.service_account_jwt);
-    await fillIn('[data-test-input="kubernetesCaCert"]', this.existingConfig.kubernetes_ca_cert);
-
-    await click('[data-test-radio-card="local"]');
-    await click('[data-test-config] button');
-    await click('[data-test-config-save]');
-  });
-});
diff --git a/ui/tests/integration/components/kubernetes/page/credentials-test.js b/ui/tests/integration/components/kubernetes/page/credentials-test.js
deleted file mode 100644
index 88169b8b08905..0000000000000
--- a/ui/tests/integration/components/kubernetes/page/credentials-test.js
+++ /dev/null
@@ -1,146 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import sinon from 'sinon';
-import { setupRenderingTest } from 'ember-qunit';
-import { setupEngine } from 'ember-engines/test-support';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import { render, click, fillIn } from '@ember/test-helpers';
-import { Response } from 'miragejs';
-import hbs from 'htmlbars-inline-precompile';
-import timestamp from 'core/utils/timestamp';
-
-module('Integration | Component | kubernetes | Page::Credentials', function (hooks) {
-  setupRenderingTest(hooks);
-  setupEngine(hooks, 'kubernetes');
-  setupMirage(hooks);
-
-  hooks.before(function () {
-    sinon.stub(timestamp, 'now').callsFake(() => new Date('2018-04-03T14:15:30'));
-  });
-  hooks.beforeEach(function () {
-    this.backend = 'kubernetes-test';
-    this.roleName = 'role-0';
-
-    this.getCreateCredentialsError = (roleName, errorType = null) => {
-      let errors;
-
-      if (errorType === 'noNamespace') {
-        errors = ["'kubernetes_namespace' is required"];
-      } else {
-        errors = [`role '${roleName}' does not exist`];
-      }
-
-      this.server.post(`/kubernetes-test/creds/${roleName}`, () => {
-        return new Response(400, {}, { errors });
-      });
-    };
-    this.breadcrumbs = [
-      { label: this.backend, route: 'overview' },
-      { label: 'roles', route: 'roles' },
-      { label: this.roleName, route: 'roles.role.details' },
-      { label: 'credentials' },
-    ];
-    this.renderComponent = () => {
-      return render(
-        hbs`<Page::Credentials @backend={{this.backend}} @roleName={{this.roleName}} @breadcrumbs={{this.breadcrumbs}}/>`,
-        {
-          owner: this.engine,
-        }
-      );
-    };
-  });
-  hooks.after(function () {
-    timestamp.now.restore();
-  });
-
-  test('it should display generate credentials form', async function (assert) {
-    await this.renderComponent();
-    assert.dom('[data-test-credentials-header]').hasText('Generate credentials');
-    assert
-      .dom('[data-test-generate-credentials] p')
-      .hasText(`This will generate credentials using the role ${this.roleName}.`);
-    assert.dom('[data-test-generate-credentials] label').hasText('Kubernetes namespace');
-    assert
-      .dom('[data-test-generate-credentials] .is-size-8')
-      .hasText('The namespace in which to generate the credentials.');
-    assert.dom('[data-test-toggle-label] .title').hasText('ClusterRoleBinding');
-    assert
-      .dom('[data-test-toggle-label] .description')
-      .hasText(
-        'Generate a ClusterRoleBinding to grant permissions across the whole cluster instead of within a namespace. This requires the Vault role to have kubernetes_role_type set to ClusterRole.'
-      );
-  });
-
-  test('it should show errors states when generating credentials', async function (assert) {
-    assert.expect(2);
-
-    this.getCreateCredentialsError(this.roleName, 'noNamespace');
-    await this.renderComponent();
-    await click('[data-test-generate-credentials-button]');
-
-    assert.dom('[data-test-error] .alert-banner-message-body').hasText("'kubernetes_namespace' is required");
-
-    this.roleName = 'role-2';
-    this.getCreateCredentialsError(this.roleName);
-
-    await this.renderComponent();
-    await click('[data-test-generate-credentials-button]');
-    assert
-      .dom('[data-test-error] .alert-banner-message-body')
-      .hasText(`role '${this.roleName}' does not exist`);
-  });
-
-  test('it should show correct credential information after generate credentials is clicked', async function (assert) {
-    assert.expect(15);
-
-    this.server.post('/kubernetes-test/creds/role-0', () => {
-      assert.ok('POST request made to generate credentials');
-      return {
-        request_id: '58fefc6c-5195-c17a-94f2-8f889f3df57c',
-        lease_id: 'kubernetes/creds/default-role/aWczfcfJ7NKUdiirJrPXIs38',
-        renewable: false,
-        lease_duration: 3600,
-        data: {
-          service_account_name: 'default',
-          service_account_namespace: 'default',
-          service_account_token: 'eyJhbGciOiJSUzI1NiIsImtpZCI6Imlr',
-        },
-      };
-    });
-
-    await this.renderComponent();
-    await fillIn('[data-test-kubernetes-namespace]', 'kubernetes-test');
-    assert.dom('[data-test-kubernetes-namespace]').hasValue('kubernetes-test', 'kubernetes-test');
-
-    await click('[data-test-toggle-input]');
-    await click('[data-test-toggle-input="Time-to-Live (TTL)"]');
-    await fillIn('[data-test-ttl-value="Time-to-Live (TTL)"]', 2);
-    await click('[data-test-generate-credentials-button]');
-
-    assert.dom('[data-test-credentials-header]').hasText('Credentials');
-    assert.dom('[data-test-alert-banner] .message-title').hasText('Warning');
-    assert
-      .dom('[data-test-alert-banner] .alert-banner-message-body')
-      .hasText("You won't be able to access these credentials later, so please copy them now.");
-    assert.dom('[data-test-row-label="Service account token"]').hasText('Service account token');
-    await click('[data-test-value-div="Service account token"] [data-test-button]');
-    assert
-      .dom('[data-test-value-div="Service account token"] .display-only')
-      .hasText('eyJhbGciOiJSUzI1NiIsImtpZCI6Imlr');
-    assert.dom('[data-test-row-label="Namespace"]').hasText('Namespace');
-    assert.dom('[data-test-value-div="Namespace"]').exists();
-    assert.dom('[data-test-row-label="Service account name"]').hasText('Service account name');
-    assert.dom('[data-test-value-div="Service account name"]').exists();
-
-    assert.dom('[data-test-row-label="Lease expiry"]').hasText('Lease expiry');
-    assert.dom('[data-test-value-div="Lease expiry"]').hasText('April 3rd 2018, 3:15:30 PM');
-    assert.dom('[data-test-row-label="lease_id"]').hasText('lease_id');
-    assert
-      .dom('[data-test-value-div="lease_id"] [data-test-row-value="lease_id"]')
-      .hasText('kubernetes/creds/default-role/aWczfcfJ7NKUdiirJrPXIs38');
-  });
-});
diff --git a/ui/tests/integration/components/kubernetes/page/overview-test.js b/ui/tests/integration/components/kubernetes/page/overview-test.js
deleted file mode 100644
index d9a7ea5d7989c..0000000000000
--- a/ui/tests/integration/components/kubernetes/page/overview-test.js
+++ /dev/null
@@ -1,112 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { setupEngine } from 'ember-engines/test-support';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import { render } from '@ember/test-helpers';
-import { typeInSearch, clickTrigger, selectChoose } from 'ember-power-select/test-support/helpers';
-import { SELECTORS } from 'vault/tests/helpers/kubernetes/overview';
-import hbs from 'htmlbars-inline-precompile';
-
-module('Integration | Component | kubernetes | Page::Overview', function (hooks) {
-  setupRenderingTest(hooks);
-  setupEngine(hooks, 'kubernetes');
-  setupMirage(hooks);
-
-  hooks.beforeEach(function () {
-    this.store = this.owner.lookup('service:store');
-    this.store.pushPayload('secret-engine', {
-      modelName: 'secret-engine',
-      data: {
-        accessor: 'kubernetes_f3400dee',
-        path: 'kubernetes-test/',
-        type: 'kubernetes',
-      },
-    });
-    this.store.pushPayload('kubernetes/role', {
-      modelName: 'kubernetes/role',
-      backend: 'kubernetes-test',
-      ...this.server.create('kubernetes-role'),
-    });
-    this.store.pushPayload('kubernetes/role', {
-      modelName: 'kubernetes/role',
-      backend: 'kubernetes-test',
-      ...this.server.create('kubernetes-role'),
-    });
-    this.backend = this.store.peekRecord('secret-engine', 'kubernetes-test');
-    this.roles = this.store.peekAll('kubernetes/role');
-    this.breadcrumbs = [
-      { label: 'secrets', route: 'secrets', linkExternal: true },
-      { label: this.backend.id },
-    ];
-    this.promptConfig = false;
-    this.renderComponent = () => {
-      return render(
-        hbs`<Page::Overview @promptConfig={{this.promptConfig}} @backend={{this.backend}} @roles={{this.roles}} @breadcrumbs={{this.breadcrumbs}} />`,
-        { owner: this.engine }
-      );
-    };
-  });
-
-  test('it should display role card', async function (assert) {
-    await this.renderComponent();
-    assert.dom(SELECTORS.rolesCardTitle).hasText('Roles');
-    assert
-      .dom(SELECTORS.rolesCardSubTitle)
-      .hasText('The number of Vault roles being used to generate Kubernetes credentials.');
-    assert.dom(SELECTORS.rolesCardLink).hasText('View Roles');
-
-    this.roles = [];
-
-    await this.renderComponent();
-    assert.dom(SELECTORS.rolesCardLink).hasText('Create Role');
-  });
-
-  test('it should display correct number of roles in role card', async function (assert) {
-    await this.renderComponent();
-    assert.dom(SELECTORS.rolesCardNumRoles).hasText('2');
-
-    this.roles = [];
-
-    await this.renderComponent();
-
-    assert.dom(SELECTORS.rolesCardNumRoles).hasText('None');
-  });
-
-  test('it should display generate credentials card', async function (assert) {
-    await this.renderComponent();
-
-    assert.dom(SELECTORS.generateCredentialsCardTitle).hasText('Generate credentials');
-    assert
-      .dom(SELECTORS.generateCredentialsCardSubTitle)
-      .hasText('Quickly generate credentials by typing the role name.');
-  });
-
-  test('it should show options for SearchSelect', async function (assert) {
-    await this.renderComponent();
-    await clickTrigger();
-    assert.strictEqual(this.element.querySelectorAll('.ember-power-select-option').length, 2);
-    await typeInSearch('role-0');
-    assert.strictEqual(this.element.querySelectorAll('.ember-power-select-option').length, 1);
-    assert.dom(SELECTORS.generateCredentialsCardButton).isDisabled();
-    await selectChoose('', '.ember-power-select-option', 2);
-    assert.dom(SELECTORS.generateCredentialsCardButton).isNotDisabled();
-  });
-
-  test('it should show ConfigCta when no config is set up', async function (assert) {
-    this.promptConfig = true;
-
-    await this.renderComponent();
-    assert.dom(SELECTORS.emptyStateTitle).hasText('Kubernetes not configured');
-    assert
-      .dom(SELECTORS.emptyStateMessage)
-      .hasText(
-        'Get started by establishing the URL of the Kubernetes API to connect to, along with some additional options.'
-      );
-    assert.dom(SELECTORS.emptyStateActionText).hasText('Configure Kubernetes');
-  });
-});
diff --git a/ui/tests/integration/components/kubernetes/page/role/create-and-edit-test.js b/ui/tests/integration/components/kubernetes/page/role/create-and-edit-test.js
deleted file mode 100644
index a3de5a95b60f3..0000000000000
--- a/ui/tests/integration/components/kubernetes/page/role/create-and-edit-test.js
+++ /dev/null
@@ -1,355 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { setupEngine } from 'ember-engines/test-support';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import { render, click, fillIn } from '@ember/test-helpers';
-import hbs from 'htmlbars-inline-precompile';
-import sinon from 'sinon';
-
-module('Integration | Component | kubernetes | Page::Role::CreateAndEdit', function (hooks) {
-  setupRenderingTest(hooks);
-  setupEngine(hooks, 'kubernetes');
-  setupMirage(hooks);
-
-  hooks.beforeEach(function () {
-    const router = this.owner.lookup('service:router');
-    const routerStub = sinon.stub(router, 'transitionTo');
-    this.transitionCalledWith = (routeName, name) => {
-      const route = `vault.cluster.secrets.backend.kubernetes.${routeName}`;
-      const args = name ? [route, name] : [route];
-      return routerStub.calledWith(...args);
-    };
-
-    const store = this.owner.lookup('service:store');
-    this.getRole = (trait) => {
-      const role = this.server.create('kubernetes-role', trait);
-      store.pushPayload('kubernetes/role', {
-        modelName: 'kubernetes/role',
-        backend: 'kubernetes-test',
-        ...role,
-      });
-      return store.peekRecord('kubernetes/role', role.name);
-    };
-
-    this.newModel = store.createRecord('kubernetes/role', { backend: 'kubernetes-test' });
-    this.breadcrumbs = [
-      { label: this.newModel.backend, route: 'overview' },
-      { label: 'roles', route: 'roles' },
-      { label: 'create' },
-    ];
-  });
-
-  test('it should display placeholder when generation preference is not selected', async function (assert) {
-    await render(
-      hbs`<Page::Role::CreateAndEdit @model={{this.newModel}} @breadcrumbs={{this.breadcrumbs}} />`,
-      { owner: this.engine }
-    );
-    assert
-      .dom('[data-test-empty-state-title]')
-      .hasText('Choose an option above', 'Empty state title renders');
-    assert
-      .dom('[data-test-empty-state-message]')
-      .hasText(
-        'To configure a Vault role, choose what should be generated in Kubernetes by Vault.',
-        'Empty state message renders'
-      );
-    assert.dom('[data-test-save]').isDisabled('Save button is disabled');
-  });
-
-  test('it should display different form fields based on generation preference selection', async function (assert) {
-    await render(
-      hbs`<Page::Role::CreateAndEdit @model={{this.newModel}} @breadcrumbs={{this.breadcrumbs}} />`,
-      { owner: this.engine }
-    );
-    const commonFields = [
-      'name',
-      'allowedKubernetesNamespaces',
-      'tokenMaxTtl',
-      'tokenDefaultTtl',
-      'annotations',
-    ];
-
-    await click('[data-test-radio-card="basic"]');
-    ['serviceAccountName', ...commonFields].forEach((field) => {
-      assert.dom(`[data-test-field="${field}"]`).exists(`${field} field renders`);
-    });
-
-    await click('[data-test-radio-card="expanded"]');
-    ['kubernetesRoleType', 'kubernetesRoleName', 'nameTemplate', ...commonFields].forEach((field) => {
-      assert.dom(`[data-test-field="${field}"]`).exists(`${field} field renders`);
-    });
-
-    await click('[data-test-radio-card="full"]');
-    ['kubernetesRoleType', 'nameTemplate', ...commonFields].forEach((field) => {
-      assert.dom(`[data-test-field="${field}"]`).exists(`${field} field renders`);
-    });
-    assert.dom('[data-test-generated-role-rules]').exists('Generated role rules section renders');
-  });
-
-  test('it should clear specific form fields when switching generation preference', async function (assert) {
-    await render(
-      hbs`<Page::Role::CreateAndEdit @model={{this.newModel}} @breadcrumbs={{this.breadcrumbs}} />`,
-      { owner: this.engine }
-    );
-
-    await click('[data-test-radio-card="basic"]');
-    await fillIn('[data-test-input="serviceAccountName"]', 'test');
-    await click('[data-test-radio-card="expanded"]');
-    assert.strictEqual(
-      this.newModel.serviceAccountName,
-      null,
-      'Service account name cleared when switching from basic to expanded'
-    );
-
-    await fillIn('[data-test-input="kubernetesRoleName"]', 'test');
-    await click('[data-test-radio-card="full"]');
-    assert.strictEqual(
-      this.newModel.kubernetesRoleName,
-      null,
-      'Kubernetes role name cleared when switching from expanded to full'
-    );
-
-    await click('[data-test-input="kubernetesRoleType"] input');
-    await click('[data-test-toggle-input="show-nameTemplate"]');
-    await fillIn('[data-test-input="nameTemplate"]', 'bar');
-    await fillIn('[data-test-select-template]', '6');
-    await click('[data-test-radio-card="expanded"]');
-    assert.strictEqual(
-      this.newModel.generatedRoleRules,
-      null,
-      'Role rules cleared when switching from full to expanded'
-    );
-
-    await click('[data-test-radio-card="basic"]');
-    assert.strictEqual(
-      this.newModel.kubernetesRoleType,
-      null,
-      'Kubernetes role type cleared when switching from expanded to basic'
-    );
-    assert.strictEqual(
-      this.newModel.kubernetesRoleName,
-      null,
-      'Kubernetes role name cleared when switching from expanded to basic'
-    );
-    assert.strictEqual(
-      this.newModel.nameTemplate,
-      null,
-      'Name template cleared when switching from expanded to basic'
-    );
-  });
-
-  test('it should create new role', async function (assert) {
-    assert.expect(3);
-
-    this.server.post('/kubernetes-test/roles/role-1', () => assert.ok('POST request made to save role'));
-
-    await render(
-      hbs`<Page::Role::CreateAndEdit @model={{this.newModel}} @breadcrumbs={{this.breadcrumbs}} />`,
-      { owner: this.engine }
-    );
-    await click('[data-test-radio-card="basic"]');
-    await click('[data-test-save]');
-    assert.dom('[data-test-inline-error-message]').hasText('Name is required', 'Validation error renders');
-    await fillIn('[data-test-input="name"]', 'role-1');
-    await fillIn('[data-test-input="serviceAccountName"]', 'default');
-    await click('[data-test-save]');
-    assert.ok(
-      this.transitionCalledWith('roles.role.details', this.newModel.name),
-      'Transitions to details route on save'
-    );
-  });
-
-  test('it should populate fields when editing role', async function (assert) {
-    assert.expect(15);
-
-    this.server.post('/kubernetes-test/roles/:name', () => assert.ok('POST request made to save role'));
-
-    for (const pref of ['basic', 'expanded', 'full']) {
-      const trait = { expanded: 'withRoleName', full: 'withRoleRules' }[pref];
-      this.role = this.getRole(trait);
-      await render(
-        hbs`<Page::Role::CreateAndEdit @model={{this.role}} @breadcrumbs={{this.breadcrumbs}} />`,
-        { owner: this.engine }
-      );
-      assert.dom(`[data-test-radio-card="${pref}"] input`).isChecked('Correct radio card is checked');
-      assert.dom('[data-test-input="name"]').hasValue(this.role.name, 'Role name is populated');
-      const selector = {
-        basic: { name: '[data-test-input="serviceAccountName"]', method: 'hasValue', value: 'default' },
-        expanded: {
-          name: '[data-test-input="kubernetesRoleName"]',
-          method: 'hasValue',
-          value: 'vault-k8s-secrets-role',
-        },
-        full: {
-          name: '[data-test-select-template]',
-          method: 'hasValue',
-          value: '5',
-        },
-      }[pref];
-      assert.dom(selector.name)[selector.method](selector.value);
-      await click('[data-test-save]');
-      assert.ok(
-        this.transitionCalledWith('roles.role.details', this.role.name),
-        'Transitions to details route on save'
-      );
-    }
-  });
-
-  test('it should show and hide annotations and labels', async function (assert) {
-    await render(
-      hbs`<Page::Role::CreateAndEdit @model={{this.newModel}} @breadcrumbs={{this.breadcrumbs}} />`,
-      { owner: this.engine }
-    );
-    await click('[data-test-radio-card="basic"]');
-    assert.dom('[data-test-annotations]').doesNotExist('Annotations and labels are hidden');
-
-    await click('[data-test-field="annotations"]');
-    await fillIn('[data-test-kv="annotations"] [data-test-kv-key]', 'foo');
-    await fillIn('[data-test-kv="annotations"] [data-test-kv-value]', 'bar');
-    await click('[data-test-kv="annotations"] [data-test-kv-add-row]');
-    assert.deepEqual(this.newModel.extraAnnotations, { foo: 'bar' }, 'Annotations set');
-
-    await fillIn('[data-test-kv="labels"] [data-test-kv-key]', 'bar');
-    await fillIn('[data-test-kv="labels"] [data-test-kv-value]', 'baz');
-    await click('[data-test-kv="labels"] [data-test-kv-add-row]');
-    assert.deepEqual(this.newModel.extraLabels, { bar: 'baz' }, 'Labels set');
-  });
-
-  test('it should expand annotations and labels when editing if they were populated', async function (assert) {
-    this.role = this.getRole();
-    await render(hbs`<Page::Role::CreateAndEdit @model={{this.role}} @breadcrumbs={{this.breadcrumbs}}/>`, {
-      owner: this.engine,
-    });
-    assert
-      .dom('[data-test-annotations]')
-      .doesNotExist('Annotations and labels are collapsed initially when not defined');
-    this.role = this.getRole('withRoleRules');
-    await render(hbs`<Page::Role::CreateAndEdit @model={{this.role}} @breadcrumbs={{this.breadcrumbs}}/>`, {
-      owner: this.engine,
-    });
-    assert
-      .dom('[data-test-annotations]')
-      .exists('Annotations and labels are expanded initially when defined');
-  });
-
-  test('it should restore role rule example', async function (assert) {
-    this.role = this.getRole('withRoleRules');
-    await render(hbs`<Page::Role::CreateAndEdit @model={{this.role}} @breadcrumbs={{this.breadcrumbs}}/>`, {
-      owner: this.engine,
-    });
-    const addedText = 'this will be add to the start of the first line in the JsonEditor';
-    await fillIn('[data-test-component="code-mirror-modifier"] textarea', addedText);
-    await click('[data-test-restore-example]');
-    assert.dom('.CodeMirror-code').doesNotContainText(addedText, 'Role rules example restored');
-  });
-
-  test('it should set generatedRoleRoles model prop on save', async function (assert) {
-    assert.expect(1);
-
-    this.server.post('/kubernetes-test/roles/role-1', (schema, req) => {
-      const payload = JSON.parse(req.requestBody);
-      const role = this.server.create('kubernetes-role', 'withRoleRules');
-      assert.strictEqual(
-        payload.generated_role_rules,
-        role.generated_role_rules,
-        'Generated roles rules are passed in save request'
-      );
-    });
-
-    await render(
-      hbs`<Page::Role::CreateAndEdit @model={{this.newModel}} @breadcrumbs={{this.breadcrumbs}}/>`,
-      { owner: this.engine }
-    );
-    await click('[data-test-radio-card="full"]');
-    await fillIn('[data-test-input="name"]', 'role-1');
-    await fillIn('[data-test-select-template]', '5');
-    await click('[data-test-save]');
-  });
-
-  test('it should unset selectedTemplateId when switching from full generation preference', async function (assert) {
-    assert.expect(1);
-
-    this.server.post('/kubernetes-test/roles/role-1', (schema, req) => {
-      const payload = JSON.parse(req.requestBody);
-      assert.strictEqual(payload.generated_role_rules, null, 'Generated roles rules are not set');
-    });
-
-    await render(
-      hbs`<Page::Role::CreateAndEdit @model={{this.newModel}} @breadcrumbs={{this.breadcrumbs}}/>`,
-      { owner: this.engine }
-    );
-    await click('[data-test-radio-card="full"]');
-    await fillIn('[data-test-input="name"]', 'role-1');
-    await fillIn('[data-test-select-template]', '5');
-    await click('[data-test-radio-card="basic"]');
-    await fillIn('[data-test-input="serviceAccountName"]', 'default');
-    await click('[data-test-save]');
-  });
-
-  test('it should go back to list route and clean up model', async function (assert) {
-    const unloadSpy = sinon.spy(this.newModel, 'unloadRecord');
-    await render(
-      hbs`<Page::Role::CreateAndEdit @model={{this.newModel}} @breadcrumbs={{this.breadcrumbs}}/>`,
-      { owner: this.engine }
-    );
-    await click('[data-test-cancel]');
-    assert.ok(unloadSpy.calledOnce, 'New model is unloaded on cancel');
-    assert.ok(this.transitionCalledWith('roles'), 'Transitions to roles list on cancel');
-
-    this.role = this.getRole();
-    const rollbackSpy = sinon.spy(this.role, 'rollbackAttributes');
-    await render(hbs`<Page::Role::CreateAndEdit @model={{this.role}} @breadcrumbs={{this.breadcrumbs}} />`, {
-      owner: this.engine,
-    });
-    await click('[data-test-cancel]');
-    assert.ok(rollbackSpy.calledOnce, 'Attributes are rolled back for existing model on cancel');
-    assert.ok(this.transitionCalledWith('roles'), 'Transitions to roles list on cancel');
-  });
-
-  test('it should check for form errors', async function (assert) {
-    await render(
-      hbs`<Page::Role::CreateAndEdit @model={{this.newModel}} @breadcrumbs={{this.breadcrumbs}}/>`,
-      { owner: this.engine }
-    );
-    await click('[data-test-radio-card="basic"]');
-    await click('[data-test-save]');
-    assert
-      .dom('[data-test-input="name"]')
-      .hasClass('has-error-border', 'shows border error on input with error');
-    assert.dom('[data-test-inline-error-message]').hasText('Name is required');
-    assert
-      .dom('[data-test-invalid-form-alert] [data-test-inline-error-message]')
-      .hasText('There is an error with this form.');
-  });
-
-  test('it should save edited role with correct properties', async function (assert) {
-    assert.expect(1);
-
-    this.role = this.getRole();
-
-    this.server.post('/kubernetes-test/roles/:name', (schema, req) => {
-      const data = JSON.parse(req.requestBody);
-      const expected = {
-        name: 'role-0',
-        service_account_name: 'demo',
-        kubernetes_role_type: 'Role',
-        allowed_kubernetes_namespaces: '*',
-        token_max_ttl: 86400,
-        token_default_ttl: 600,
-      };
-      assert.deepEqual(expected, data, 'POST request made to save role with correct properties');
-    });
-
-    await render(hbs`<Page::Role::CreateAndEdit @model={{this.role}} @breadcrumbs={{this.breadcrumbs}} />`, {
-      owner: this.engine,
-    });
-
-    await fillIn('[data-test-input="serviceAccountName"]', 'demo');
-    await click('[data-test-save]');
-  });
-});
diff --git a/ui/tests/integration/components/kubernetes/page/role/details-test.js b/ui/tests/integration/components/kubernetes/page/role/details-test.js
deleted file mode 100644
index 6644dba1e961d..0000000000000
--- a/ui/tests/integration/components/kubernetes/page/role/details-test.js
+++ /dev/null
@@ -1,145 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { setupEngine } from 'ember-engines/test-support';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import { render, click } from '@ember/test-helpers';
-import hbs from 'htmlbars-inline-precompile';
-import sinon from 'sinon';
-import { duration } from 'core/helpers/format-duration';
-
-const allFields = [
-  { label: 'Role name', key: 'name' },
-  { label: 'Kubernetes role type', key: 'kubernetesRoleType' },
-  { label: 'Kubernetes role name', key: 'kubernetesRoleName' },
-  { label: 'Service account name', key: 'serviceAccountName' },
-  { label: 'Allowed Kubernetes namespaces', key: 'allowedKubernetesNamespaces' },
-  { label: 'Max Lease TTL', key: 'tokenMaxTtl' },
-  { label: 'Default Lease TTL', key: 'tokenDefaultTtl' },
-  { label: 'Name template', key: 'nameTemplate' },
-];
-
-module('Integration | Component | kubernetes | Page::Role::Details', function (hooks) {
-  setupRenderingTest(hooks);
-  setupEngine(hooks, 'kubernetes');
-  setupMirage(hooks);
-
-  hooks.beforeEach(function () {
-    const store = this.owner.lookup('service:store');
-    this.server.post('/sys/capabilities-self', () => ({
-      data: {
-        capabilities: ['root'],
-      },
-    }));
-    this.renderComponent = (trait) => {
-      const data = this.server.create('kubernetes-role', trait);
-      store.pushPayload('kubernetes/role', {
-        modelName: 'kubernetes/role',
-        backend: 'kubernetes-test',
-        ...data,
-      });
-      this.model = store.peekRecord('kubernetes/role', data.name);
-      this.breadcrumbs = [
-        { label: this.model.backend, route: 'overview' },
-        { label: 'roles', route: 'roles' },
-        { label: this.model.name },
-      ];
-      return render(hbs`<Page::Role::Details @model={{this.model}} @breadcrumbs={{this.breadcrumbs}} />`, {
-        owner: this.engine,
-      });
-    };
-
-    this.assertFilteredFields = (hiddenIndices, assert) => {
-      const fields = allFields.filter((field, index) => !hiddenIndices.includes(index));
-      assert
-        .dom('[data-test-filtered-field]')
-        .exists({ count: fields.length }, 'Correct number of filtered fields render');
-      fields.forEach((field) => {
-        assert
-          .dom(`[data-test-row-label="${field.label}"]`)
-          .hasText(field.label, `${field.label} label renders`);
-        const modelValue = this.model[field.key];
-        const value = field.key.includes('Ttl') ? duration([modelValue]) : modelValue;
-        assert.dom(`[data-test-row-value="${field.label}"]`).hasText(value, `${field.label} value renders`);
-      });
-    };
-
-    this.assertExtraFields = (modelKeys, assert) => {
-      modelKeys.forEach((modelKey) => {
-        for (const key in this.model[modelKey]) {
-          assert.dom(`[data-test-row-label="${key}"]`).hasText(key, `${modelKey} key renders`);
-          assert
-            .dom(`[data-test-row-value="${key}"]`)
-            .hasText(this.model[modelKey][key], `${modelKey} value renders`);
-        }
-      });
-    };
-  });
-
-  test('it should render header with role name and breadcrumbs', async function (assert) {
-    await this.renderComponent();
-    assert.dom('[data-test-header-title]').hasText(this.model.name, 'Role name renders in header');
-    assert
-      .dom('[data-test-breadcrumbs] li:nth-child(1)')
-      .containsText(this.model.backend, 'Overview breadcrumb renders');
-    assert.dom('[data-test-breadcrumbs] li:nth-child(2) a').containsText('roles', 'Roles breadcrumb renders');
-    assert
-      .dom('[data-test-breadcrumbs] li:nth-child(3)')
-      .containsText(this.model.name, 'Role breadcrumb renders');
-  });
-
-  test('it should render toolbar actions', async function (assert) {
-    assert.expect(5);
-
-    const transitionStub = sinon.stub(this.owner.lookup('service:router'), 'transitionTo');
-
-    await this.renderComponent();
-
-    this.server.delete(`/${this.model.backend}/roles/${this.model.name}`, () => {
-      assert.ok(true, 'Request made to delete role');
-      return;
-    });
-
-    assert.dom('[data-test-delete] button').hasText('Delete role', 'Delete action renders');
-    assert
-      .dom('[data-test-generate-credentials]')
-      .hasText('Generate credentials', 'Generate credentials action renders');
-    assert.dom('[data-test-edit]').hasText('Edit role', 'Edit action renders');
-
-    await click('[data-test-delete] button');
-    await click('[data-test-confirm-button]');
-    assert.ok(
-      transitionStub.calledWith('vault.cluster.secrets.backend.kubernetes.roles'),
-      'Transitions to roles route on delete success'
-    );
-  });
-
-  test('it should render fields that correspond to basic creation', async function (assert) {
-    assert.expect(13);
-    await this.renderComponent();
-    this.assertFilteredFields([1, 2, 7], assert);
-    assert.dom('[data-test-generated-role-rules]').doesNotExist('Generated role rules do not render');
-    assert.dom('[data-test-extra-fields]').doesNotExist('Annotations and labels do not render');
-  });
-
-  test('it should render fields that correspond to expanded creation', async function (assert) {
-    assert.expect(21);
-    await this.renderComponent('withRoleName');
-    this.assertFilteredFields([3], assert);
-    assert.dom('[data-test-generated-role-rules]').doesNotExist('Generated role rules do not render');
-    this.assertExtraFields(['extraAnnotations'], assert);
-    assert.dom('[data-test-extra-fields="Labels"]').doesNotExist('Labels do not render');
-  });
-
-  test('it should render fields that correspond to full creation', async function (assert) {
-    assert.expect(22);
-    await this.renderComponent('withRoleRules');
-    this.assertFilteredFields([2, 3], assert);
-    assert.dom('[data-test-generated-role-rules]').exists('Generated role rules render');
-    this.assertExtraFields(['extraAnnotations', 'extraLabels'], assert);
-  });
-});
diff --git a/ui/tests/integration/components/kubernetes/page/roles-test.js b/ui/tests/integration/components/kubernetes/page/roles-test.js
deleted file mode 100644
index 642acd0c18941..0000000000000
--- a/ui/tests/integration/components/kubernetes/page/roles-test.js
+++ /dev/null
@@ -1,107 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { setupEngine } from 'ember-engines/test-support';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import { render, click } from '@ember/test-helpers';
-import hbs from 'htmlbars-inline-precompile';
-
-module('Integration | Component | kubernetes | Page::Roles', function (hooks) {
-  setupRenderingTest(hooks);
-  setupEngine(hooks, 'kubernetes');
-  setupMirage(hooks);
-
-  hooks.beforeEach(function () {
-    this.store = this.owner.lookup('service:store');
-    this.store.pushPayload('secret-engine', {
-      modelName: 'secret-engine',
-      data: {
-        accessor: 'kubernetes_f3400dee',
-        path: 'kubernetes-test/',
-        type: 'kubernetes',
-      },
-    });
-    this.store.pushPayload('kubernetes/role', {
-      modelName: 'kubernetes/role',
-      backend: 'kubernetes-test',
-      ...this.server.create('kubernetes-role'),
-    });
-    this.backend = this.store.peekRecord('secret-engine', 'kubernetes-test');
-    this.roles = this.store.peekAll('kubernetes/role');
-    this.filterValue = '';
-    this.breadcrumbs = [
-      { label: 'secrets', route: 'secrets', linkExternal: true },
-      { label: this.backend.id },
-    ];
-    this.promptConfig = false;
-
-    this.renderComponent = () => {
-      return render(
-        hbs`<Page::Roles @promptConfig={{this.promptConfig}} @backend={{this.backend}} @roles={{this.roles}} @filterValue={{this.filterValue}} @breadcrumbs={{this.breadcrumbs}} />`,
-        { owner: this.engine }
-      );
-    };
-  });
-
-  test('it should render tab page header and config cta', async function (assert) {
-    this.promptConfig = true;
-    await this.renderComponent();
-    assert.dom('.title svg').hasClass('flight-icon-kubernetes', 'Kubernetes icon renders in title');
-    assert.dom('.title').hasText('kubernetes-test', 'Mount path renders in title');
-    assert
-      .dom('[data-test-toolbar-roles-action]')
-      .doesNotExist('Create role', 'Toolbar action does not render when not configured');
-    assert
-      .dom('[data-test-nav-input]')
-      .doesNotExist('Roles filter input does not render when not configured');
-    assert.dom('[data-test-config-cta]').exists('Config cta renders');
-  });
-
-  test('it should render create roles cta', async function (assert) {
-    this.roles = null;
-    await this.renderComponent();
-    assert.dom('[data-test-toolbar-roles-action]').hasText('Create role', 'Toolbar action has correct text');
-    assert
-      .dom('[data-test-toolbar-roles-action] svg')
-      .hasClass('flight-icon-plus', 'Toolbar action has correct icon');
-    assert.dom('[data-test-nav-input]').exists('Roles filter input renders');
-    assert.dom('[data-test-empty-state-title]').hasText('No roles yet', 'Title renders');
-    assert
-      .dom('[data-test-empty-state-message]')
-      .hasText(
-        'When created, roles will be listed here. Create a role to start generating service account tokens.',
-        'Message renders'
-      );
-    assert.dom('[data-test-empty-state-actions] a').hasText('Create role', 'Action renders');
-  });
-
-  test('it should render no matches filter message', async function (assert) {
-    this.roles = [];
-    this.filterValue = 'test';
-    await this.renderComponent();
-    assert
-      .dom('[data-test-empty-state-title]')
-      .hasText('There are no roles matching "test"', 'Filter message renders');
-  });
-
-  test('it should render roles list', async function (assert) {
-    this.server.post('/sys/capabilities-self', () => ({
-      data: {
-        'kubernetes/role': ['root'],
-      },
-    }));
-    await this.renderComponent();
-    assert.dom('[data-test-list-item-content] svg').hasClass('flight-icon-user', 'List item icon renders');
-    assert
-      .dom('[data-test-list-item-content]')
-      .hasText(this.roles.firstObject.name, 'List item name renders');
-    await click('[data-test-popup-menu-trigger]');
-    assert.dom('[data-test-details]').hasText('Details', 'Details link renders in menu');
-    assert.dom('[data-test-edit]').hasText('Edit', 'Edit link renders in menu');
-    assert.dom('[data-test-delete]').hasText('Delete', 'Details link renders in menu');
-  });
-});
diff --git a/ui/tests/integration/components/kubernetes/tab-page-header-test.js b/ui/tests/integration/components/kubernetes/tab-page-header-test.js
deleted file mode 100644
index 59cee15b6f2d0..0000000000000
--- a/ui/tests/integration/components/kubernetes/tab-page-header-test.js
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { setupEngine } from 'ember-engines/test-support';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import { render } from '@ember/test-helpers';
-import hbs from 'htmlbars-inline-precompile';
-
-module('Integration | Component | kubernetes | TabPageHeader', function (hooks) {
-  setupRenderingTest(hooks);
-  setupEngine(hooks, 'kubernetes');
-  setupMirage(hooks);
-
-  hooks.beforeEach(function () {
-    this.store = this.owner.lookup('service:store');
-    this.store.pushPayload('secret-engine', {
-      modelName: 'secret-engine',
-      data: {
-        accessor: 'kubernetes_f3400dee',
-        path: 'kubernetes-test/',
-        type: 'kubernetes',
-      },
-    });
-    this.model = this.store.peekRecord('secret-engine', 'kubernetes-test');
-    this.mount = this.model.path.slice(0, -1);
-    this.breadcrumbs = [{ label: 'secrets', route: 'secrets', linkExternal: true }, { label: this.mount }];
-  });
-
-  test('it should render breadcrumbs', async function (assert) {
-    await render(hbs`<TabPageHeader @model={{this.model}} @breadcrumbs={{this.breadcrumbs}} />`, {
-      owner: this.engine,
-    });
-    assert.dom('[data-test-breadcrumbs] li:nth-child(1) a').hasText('secrets', 'Secrets breadcrumb renders');
-
-    assert
-      .dom('[data-test-breadcrumbs] li:nth-child(2)')
-      .containsText(this.mount, 'Mount path breadcrumb renders');
-  });
-
-  test('it should render title', async function (assert) {
-    await render(hbs`<TabPageHeader @model={{this.model}} @breadcrumbs={{this.breadcrumbs}} />`, {
-      owner: this.engine,
-    });
-    assert
-      .dom('[data-test-header-title] svg')
-      .hasClass('flight-icon-kubernetes', 'Correct icon renders in title');
-    assert.dom('[data-test-header-title]').hasText(this.mount, 'Mount path renders in title');
-  });
-
-  test('it should render tabs', async function (assert) {
-    await render(hbs`<TabPageHeader @model={{this.model}} @breadcrumbs={{this.breadcrumbs}} />`, {
-      owner: this.engine,
-    });
-    assert.dom('[data-test-tab="overview"]').hasText('Overview', 'Overview tab renders');
-    assert.dom('[data-test-tab="roles"]').hasText('Roles', 'Roles tab renders');
-    assert.dom('[data-test-tab="config"]').hasText('Configuration', 'Configuration tab renders');
-  });
-
-  test('it should render filter for roles', async function (assert) {
-    await render(
-      hbs`<TabPageHeader @model={{this.model}} @filterRoles={{true}} @rolesFilterValue="test" @breadcrumbs={{this.breadcrumbs}} />`,
-      { owner: this.engine }
-    );
-    assert.dom('[data-test-nav-input] input').hasValue('test', 'Filter renders with provided value');
-  });
-
-  test('it should yield block for toolbar actions', async function (assert) {
-    await render(
-      hbs`
-      <TabPageHeader @model={{this.model}} @breadcrumbs={{this.breadcrumbs}}>
-        <span data-test-yield>It yields!</span>
-      </TabPageHeader>
-    `,
-      { owner: this.engine }
-    );
-
-    assert
-      .dom('.toolbar-actions [data-test-yield]')
-      .hasText('It yields!', 'Block is yielded for toolbar actions');
-  });
-});
diff --git a/ui/tests/integration/components/kv-object-editor-test.js b/ui/tests/integration/components/kv-object-editor-test.js
index 3220acd5de91c..dc05a2721c32f 100644
--- a/ui/tests/integration/components/kv-object-editor-test.js
+++ b/ui/tests/integration/components/kv-object-editor-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
@@ -23,29 +18,29 @@ module('Integration | Component | kv-object-editor', function (hooks) {
 
   test('it renders with no initial value', async function (assert) {
     await render(hbs`{{kv-object-editor onChange=this.spy}}`);
-    assert.strictEqual(component.rows.length, 1, 'renders a single row');
+    assert.equal(component.rows.length, 1, 'renders a single row');
     await component.addRow();
-    assert.strictEqual(component.rows.length, 1, 'will only render row with a blank key');
+    assert.equal(component.rows.length, 1, 'will only render row with a blank key');
   });
 
   test('it calls onChange when the val changes', async function (assert) {
     await render(hbs`{{kv-object-editor onChange=this.spy}}`);
     await component.rows.objectAt(0).kvKey('foo').kvVal('bar');
-    assert.strictEqual(this.spy.callCount, 2, 'calls onChange each time change is triggered');
+    assert.equal(this.spy.callCount, 2, 'calls onChange each time change is triggered');
     assert.deepEqual(
       this.spy.lastCall.args[0],
       { foo: 'bar' },
       'calls onChange with the JSON respresentation of the data'
     );
     await component.addRow();
-    assert.strictEqual(component.rows.length, 2, 'adds a row when there is no blank one');
+    assert.equal(component.rows.length, 2, 'adds a row when there is no blank one');
   });
 
   test('it renders passed data', async function (assert) {
-    const metadata = { foo: 'bar', baz: 'bop' };
+    let metadata = { foo: 'bar', baz: 'bop' };
     this.set('value', metadata);
-    await render(hbs`{{kv-object-editor value=this.value}}`);
-    assert.strictEqual(
+    await render(hbs`{{kv-object-editor value=value}}`);
+    assert.equal(
       component.rows.length,
       Object.keys(metadata).length + 1,
       'renders both rows of the metadata, plus an empty one'
@@ -56,19 +51,19 @@ module('Integration | Component | kv-object-editor', function (hooks) {
     await render(hbs`{{kv-object-editor onChange=this.spy}}`);
     await component.rows.objectAt(0).kvKey('foo').kvVal('bar');
     await component.addRow();
-    assert.strictEqual(component.rows.length, 2);
-    assert.strictEqual(this.spy.callCount, 2, 'calls onChange for editing');
+    assert.equal(component.rows.length, 2);
+    assert.equal(this.spy.callCount, 2, 'calls onChange for editing');
     await component.rows.objectAt(0).deleteRow();
 
-    assert.strictEqual(component.rows.length, 1, 'only the blank row left');
-    assert.strictEqual(this.spy.callCount, 3, 'calls onChange deleting row');
+    assert.equal(component.rows.length, 1, 'only the blank row left');
+    assert.equal(this.spy.callCount, 3, 'calls onChange deleting row');
     assert.deepEqual(this.spy.lastCall.args[0], {}, 'last call to onChange is an empty object');
   });
 
   test('it shows a warning if there are duplicate keys', async function (assert) {
-    const metadata = { foo: 'bar', baz: 'bop' };
+    let metadata = { foo: 'bar', baz: 'bop' };
     this.set('value', metadata);
-    await render(hbs`{{kv-object-editor value=this.value onChange=this.spy}}`);
+    await render(hbs`{{kv-object-editor value=value onChange=this.spy}}`);
     await component.rows.objectAt(0).kvKey('foo');
 
     assert.ok(component.showsDuplicateError, 'duplicate keys are allowed but an error message is shown');
diff --git a/ui/tests/integration/components/license-banners-test.js b/ui/tests/integration/components/license-banners-test.js
index cd228f90c445c..6e562838a5e41 100644
--- a/ui/tests/integration/components/license-banners-test.js
+++ b/ui/tests/integration/components/license-banners-test.js
@@ -1,153 +1,39 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
-import sinon from 'sinon';
 import { setupRenderingTest } from 'ember-qunit';
-import { render, click } from '@ember/test-helpers';
+import { render } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
 import subDays from 'date-fns/subDays';
 import addDays from 'date-fns/addDays';
 import formatRFC3339 from 'date-fns/formatRFC3339';
-import timestamp from 'core/utils/timestamp';
 
 module('Integration | Component | license-banners', function (hooks) {
   setupRenderingTest(hooks);
 
-  hooks.before(function () {
-    sinon.stub(timestamp, 'now').callsFake(() => new Date('2018-04-03T14:15:30'));
-  });
-  hooks.beforeEach(function () {
-    const mockNow = timestamp.now();
-    this.now = mockNow;
-    this.yesterday = subDays(mockNow, 1);
-    this.nextMonth = addDays(mockNow, 30);
-    this.outside30 = addDays(mockNow, 32);
-    this.tomorrow = addDays(mockNow, 1);
-    this.version = this.owner.lookup('service:version');
-    this.version.version = '1.13.1+ent';
-  });
-  hooks.after(function () {
-    timestamp.now.restore();
-  });
-
   test('it does not render if no expiry', async function (assert) {
-    assert.expect(1);
     await render(hbs`<LicenseBanners />`);
     assert.dom('[data-test-license-banner]').doesNotExist('License banner does not render');
   });
 
   test('it renders an error if expiry is before now', async function (assert) {
-    assert.expect(2);
-    this.set('expiry', formatRFC3339(this.yesterday));
-    await render(hbs`<LicenseBanners @expiry={{this.expiry}} />`);
+    const yesterday = subDays(new Date(), 1);
+    this.set('expiry', formatRFC3339(yesterday));
+    await render(hbs`<LicenseBanners @expiry={{expiry}} />`);
     assert.dom('[data-test-license-banner-expired]').exists('Expired license banner renders');
     assert.dom('.message-title').hasText('License expired', 'Shows correct title on alert');
   });
 
   test('it renders a warning if expiry is within 30 days', async function (assert) {
-    assert.expect(2);
-    this.set('expiry', formatRFC3339(this.nextMonth));
-    await render(hbs`<LicenseBanners @expiry={{this.expiry}} />`);
+    const nextMonth = addDays(new Date(), 30);
+    this.set('expiry', formatRFC3339(nextMonth));
+    await render(hbs`<LicenseBanners @expiry={{expiry}} />`);
     assert.dom('[data-test-license-banner-warning]').exists('Warning license banner renders');
     assert.dom('.message-title').hasText('Vault license expiring', 'Shows correct title on alert');
   });
 
   test('it does not render a banner if expiry is outside 30 days', async function (assert) {
-    assert.expect(1);
-    this.set('expiry', formatRFC3339(this.outside30));
-    await render(hbs`<LicenseBanners @expiry={{this.expiry}} />`);
+    const outside30 = addDays(new Date(), 32);
+    this.set('expiry', formatRFC3339(outside30));
+    await render(hbs`<LicenseBanners @expiry={{expiry}} />`);
     assert.dom('[data-test-license-banner]').doesNotExist('License banner does not render');
   });
-
-  test('it does not render the expired banner if it has been dismissed', async function (assert) {
-    assert.expect(3);
-    this.set('expiry', formatRFC3339(this.yesterday));
-    const key = `dismiss-license-banner-${this.version.version}-${this.expiry}`;
-    await render(hbs`<LicenseBanners @expiry={{this.expiry}} />`);
-    await click('[data-test-dismiss-expired]');
-    assert.dom('[data-test-license-banner-expired]').doesNotExist('Expired license banner does not render');
-
-    await render(hbs`<LicenseBanners @expiry={{this.expiry}} />`);
-    const localStorageResult = JSON.parse(localStorage.getItem(key));
-    assert.strictEqual(localStorageResult, 'expired');
-    assert
-      .dom('[data-test-license-banner-expired]')
-      .doesNotExist('The expired banner still does not render after a re-render.');
-    localStorage.removeItem(key);
-  });
-
-  test('it does not render the warning banner if it has been dismissed', async function (assert) {
-    assert.expect(3);
-    this.set('expiry', formatRFC3339(this.nextMonth));
-    const key = `dismiss-license-banner-${this.version.version}-${this.expiry}`;
-    await render(hbs`<LicenseBanners @expiry={{this.expiry}} />`);
-    await click('[data-test-dismiss-warning]');
-    assert.dom('[data-test-license-banner-warning]').doesNotExist('Warning license banner does not render');
-
-    await render(hbs`<LicenseBanners @expiry={{this.expiry}} />`);
-    const localStorageResult = JSON.parse(localStorage.getItem(key));
-    assert.strictEqual(localStorageResult, 'warning');
-    assert
-      .dom('[data-test-license-banner-warning]')
-      .doesNotExist('The warning banner still does not render after a re-render.');
-    localStorage.removeItem(key);
-  });
-
-  test('it renders a banner if the vault license has changed', async function (assert) {
-    assert.expect(3);
-    this.version.version = '1.12.1+ent';
-    this.set('expiry', formatRFC3339(this.nextMonth));
-    const keyOldVersion = `dismiss-license-banner-${this.version.version}-${this.expiry}`;
-    await render(hbs`<LicenseBanners @expiry={{this.expiry}} />`);
-    await click('[data-test-dismiss-warning]');
-    this.version.version = '1.13.1+ent';
-    const keyNewVersion = `dismiss-license-banner-${this.version.version}-${this.expiry}`;
-    await render(hbs`<LicenseBanners @expiry={{this.expiry}} />`);
-    assert
-      .dom('[data-test-license-banner-warning]')
-      .exists('The warning banner shows even though we have dismissed it earlier.');
-
-    await click('[data-test-dismiss-warning]');
-    const localStorageResultNewVersion = JSON.parse(localStorage.getItem(keyNewVersion));
-    const localStorageResultOldVersion = JSON.parse(localStorage.getItem(keyOldVersion));
-    // Check that localStorage was cleaned and no longer contains the old version storage key.
-    assert.strictEqual(localStorageResultOldVersion, null, 'local storage was cleared for the old version');
-    assert.strictEqual(
-      localStorageResultNewVersion,
-      'warning',
-      'local storage holds the new version with a warning'
-    );
-    // If debugging this test remember to clear localStorage if the test was not run to completion.
-    localStorage.removeItem(keyNewVersion);
-  });
-
-  test('it renders a banner if the vault expiry has changed', async function (assert) {
-    assert.expect(3);
-    this.set('expiry', formatRFC3339(this.tomorrow));
-    const keyOldExpiry = `dismiss-license-banner-${this.version.version}-${this.expiry}`;
-    await render(hbs`<LicenseBanners @expiry={{this.expiry}} />`);
-    await click('[data-test-dismiss-warning]');
-    this.set('expiry', formatRFC3339(this.nextMonth));
-    const keyNewExpiry = `dismiss-license-banner-${this.version.version}-${this.expiry}`;
-    await render(hbs`<LicenseBanners @expiry={{this.expiry}} />`);
-    assert
-      .dom('[data-test-license-banner-warning]')
-      .exists('The warning banner shows even though we have dismissed it earlier.');
-
-    await click('[data-test-dismiss-warning]');
-    const localStorageResultNewExpiry = JSON.parse(localStorage.getItem(keyNewExpiry));
-    const localStorageResultOldExpiry = JSON.parse(localStorage.getItem(keyOldExpiry));
-    // Check that localStorage was cleaned and no longer contains the old version storage key.
-    assert.strictEqual(localStorageResultOldExpiry, null, 'local storage was cleared for the old expiry');
-    assert.strictEqual(
-      localStorageResultNewExpiry,
-      'warning',
-      'local storage holds the new expiry with a warning'
-    );
-    // If debugging this test remember to clear localStorage if the test was not run to completion.
-    localStorage.removeItem(keyNewExpiry);
-  });
 });
diff --git a/ui/tests/integration/components/license-info-test.js b/ui/tests/integration/components/license-info-test.js
index 737ea1024bb8b..0f5ac7640806e 100644
--- a/ui/tests/integration/components/license-info-test.js
+++ b/ui/tests/integration/components/license-info-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { addMinutes } from 'date-fns';
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
@@ -28,14 +23,10 @@ module('Integration | Component | license info', function (hooks) {
     await render(
       hbs`<LicenseInfo @licenseId={{this.licenseId}} @expirationTime={{this.expirationTime}} @startTime={{this.startTime}} @features={{this.features}}/>`
     );
-    assert.strictEqual(
-      component.detailRows.length,
-      3,
-      'Shows License ID, Valid from, and License State rows'
-    );
-    assert.strictEqual(component.featureRows.length, FEATURES.length, 'it renders all of the features');
-    const activeFeatures = component.featureRows.filter((f) => f.featureStatus === 'Active');
-    assert.strictEqual(activeFeatures.length, 2, 'Has two features listed as active');
+    assert.equal(component.detailRows.length, 3, 'Shows License ID, Valid from, and License State rows');
+    assert.equal(component.featureRows.length, FEATURES.length, 'it renders all of the features');
+    let activeFeatures = component.featureRows.filter((f) => f.featureStatus === 'Active');
+    assert.equal(activeFeatures.length, 2, 'Has two features listed as active');
   });
 
   test('it renders properly for autoloaded license', async function (assert) {
@@ -54,8 +45,8 @@ module('Integration | Component | license info', function (hooks) {
         @autoloaded={{true}}
       />`
     );
-    const row = component.detailRows.filterBy('rowName', 'License state')[0];
-    assert.strictEqual(row.rowValue, 'Autoloaded', 'Shows autoloaded status');
+    let row = component.detailRows.filterBy('rowName', 'License state')[0];
+    assert.equal(row.rowValue, 'Autoloaded', 'Shows autoloaded status');
   });
 
   test('it renders Performance Standby as inactive if count is 0', async function (assert) {
@@ -70,12 +61,8 @@ module('Integration | Component | license info', function (hooks) {
       hbs`<LicenseInfo @licenseId={{this.licenseId}} @expirationTime={{this.expirationTime}} @startTime={{this.startTime}} @features={{this.features}} @model={{this.model}}/>`
     );
 
-    const row = component.featureRows.filterBy('featureName', 'Performance Standby')[0];
-    assert.strictEqual(
-      row.featureStatus,
-      'Not Active',
-      'renders feature as inactive because when count is 0'
-    );
+    let row = component.featureRows.filterBy('featureName', 'Performance Standby')[0];
+    assert.equal(row.featureStatus, 'Not Active', 'renders feature as inactive because when count is 0');
   });
 
   test('it renders Performance Standby as active and shows count', async function (assert) {
@@ -96,11 +83,7 @@ module('Integration | Component | license info', function (hooks) {
       />`
     );
 
-    const row = component.featureRows.filterBy('featureName', 'Performance Standby')[0];
-    assert.strictEqual(
-      row.featureStatus,
-      'Active — 4 standby nodes allotted',
-      'renders active and displays count'
-    );
+    let row = component.featureRows.filterBy('featureName', 'Performance Standby')[0];
+    assert.equal(row.featureStatus, 'Active — 4 standby nodes allotted', 'renders active and displays count');
   });
 });
diff --git a/ui/tests/integration/components/link-status-test.js b/ui/tests/integration/components/link-status-test.js
index 153aa19356de7..68542bb9a5f29 100644
--- a/ui/tests/integration/components/link-status-test.js
+++ b/ui/tests/integration/components/link-status-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { click, render } from '@ember/test-helpers';
@@ -16,7 +11,7 @@ module('Integration | Component | link-status', function (hooks) {
 
   // this can be removed once feature is released for OSS
   hooks.beforeEach(function () {
-    this.owner.lookup('service:version').set('version', '1.13.0+ent');
+    this.owner.lookup('service:version').set('isEnterprise', true);
     this.statuses = statuses;
   });
 
@@ -26,18 +21,18 @@ module('Integration | Component | link-status', function (hooks) {
       <LinkStatus @status={{undefined}} />
     `);
 
-    assert.dom('.link-status').doesNotExist('Banner is hidden for missing status message');
+    assert.dom('.navbar-status').doesNotExist('Banner is hidden for missing status message');
   });
 
   test('it does not render banner in oss version', async function (assert) {
-    this.owner.lookup('service:version').set('version', '1.13.0');
+    this.owner.lookup('service:version').set('isEnterprise', false);
 
     await render(hbs`
       <div id="modal-wormhole"></div>
       <LinkStatus @status={{get this.statuses 0}} />
     `);
 
-    assert.dom('.link-status').doesNotExist('Banner is hidden in oss');
+    assert.dom('.navbar-status').doesNotExist('Banner is hidden in oss');
   });
 
   test('it renders connected status', async function (assert) {
@@ -46,7 +41,7 @@ module('Integration | Component | link-status', function (hooks) {
       <LinkStatus @status={{get this.statuses 0}} />
     `);
 
-    assert.dom('.link-status').hasClass('connected', 'Correct banner class renders for connected state');
+    assert.dom('.navbar-status').hasClass('connected', 'Correct banner class renders for connected state');
     assert
       .dom('[data-test-link-status]')
       .hasText('This self-managed Vault is linked to HCP.', 'Banner copy renders for connected state');
@@ -62,7 +57,7 @@ module('Integration | Component | link-status', function (hooks) {
       <LinkStatus @status={{get this.statuses 1}} />
     `);
 
-    assert.dom('.link-status').hasClass('warning', 'Correct banner class renders for error state');
+    assert.dom('.navbar-status').hasClass('warning', 'Correct banner class renders for error state');
     assert
       .dom('[data-test-link-status]')
       .hasText(
diff --git a/ui/tests/integration/components/linkable-item-test.js b/ui/tests/integration/components/linkable-item-test.js
new file mode 100644
index 0000000000000..9fdbabf280b5e
--- /dev/null
+++ b/ui/tests/integration/components/linkable-item-test.js
@@ -0,0 +1,83 @@
+import { module, test } from 'qunit';
+import { setupRenderingTest } from 'ember-qunit';
+import { render } from '@ember/test-helpers';
+import { hbs } from 'ember-cli-htmlbars';
+
+module('Integration | Component | linkable-item', function (hooks) {
+  setupRenderingTest(hooks);
+
+  test('it renders anything passed in', async function (assert) {
+    await render(hbs`<LinkableItem />`);
+    assert.dom(this.element).hasText('', 'No content rendered');
+
+    await render(hbs`
+      <LinkableItem as |Li|>
+        <Li.content>
+          stuff here
+        </Li.content>
+        <Li.menu>
+          menu
+        </Li.menu>
+      </LinkableItem>
+    `);
+    assert.dom('[data-test-linkable-item-content]').hasText('stuff here');
+    assert.dom('[data-test-linkable-item-menu]').hasText('menu');
+  });
+
+  test('it is not wrapped in a linked block if disabled is true', async function (assert) {
+    await render(hbs`
+      <LinkableItem @disabled={{true}} as |Li|>
+        <Li.content>
+          stuff here
+        </Li.content>
+      </LinkableItem>
+    `);
+    assert.dom('.list-item-row').exists('List item row exists');
+    assert.dom('.list-item-row.linked-block').doesNotExist('Does not render linked block');
+    assert.dom('[data-test-secret-path]').doesNotExist('Title is not rendered');
+    assert.dom('[data-test-linkable-item-accessor]').doesNotExist('Accessor is not rendered');
+    assert.dom('[data-test-linkable-item-accessor]').doesNotExist('Accessor is not rendered');
+    assert.dom('[data-test-linkable-item-glyph]').doesNotExist('Glyph is not rendered');
+  });
+
+  test('it is wrapped in a linked block if a link is passed', async function (assert) {
+    await render(hbs`
+      <LinkableItem @link={{hash route="vault" model="modelId"}} as |Li|>
+        <Li.content
+          @title={{title}}
+          @link={{hash route="vault" model="modelId"}}
+        >
+          stuff here
+        </Li.content>
+      </LinkableItem>
+    `);
+
+    assert.dom('.list-item-row.linked-block').exists('Renders linked block');
+  });
+
+  test('it renders standard attributes on content', async function (assert) {
+    this.set('title', 'A Title');
+    this.set('accessor', 'my accessor');
+    this.set('description', 'my description');
+    this.set('glyph', 'key');
+    this.set('glyphText', 'Here is some extra info');
+
+    // Template block usage:
+    await render(hbs`
+      <LinkableItem data-test-example as |Li|>
+        <Li.content
+          @accessor={{this.accessor}}
+          @description={{this.description}}
+          @glyph={{this.glyph}}
+          @glyphText={{this.glyphText}}
+          @title={{this.title}}
+        />
+      </LinkableItem>
+    `);
+    assert.dom('.list-item-row').exists('List item row exists');
+    assert.dom('[data-test-secret-path]').hasText(this.title, 'Title is rendered');
+    assert.dom('[data-test-linkable-item-accessor]').hasText(this.accessor, 'Accessor is rendered');
+    assert.dom('[data-test-linkable-item-description]').hasText(this.description, 'Description is rendered');
+    assert.dom('[data-test-linkable-item-glyph]').exists('Glyph is rendered');
+  });
+});
diff --git a/ui/tests/integration/components/masked-input-test.js b/ui/tests/integration/components/masked-input-test.js
index e6feff1f6b5c9..311caed39d9b2 100644
--- a/ui/tests/integration/components/masked-input-test.js
+++ b/ui/tests/integration/components/masked-input-test.js
@@ -1,14 +1,8 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
-import { render, focus, triggerKeyEvent, typeIn, fillIn } from '@ember/test-helpers';
+import { render, focus, triggerKeyEvent } from '@ember/test-helpers';
 import { create } from 'ember-cli-page-object';
 import hbs from 'htmlbars-inline-precompile';
-import sinon from 'sinon';
 import maskedInput from 'vault/tests/pages/components/masked-input';
 
 const component = create(maskedInput);
@@ -17,83 +11,90 @@ module('Integration | Component | masked input', function (hooks) {
   setupRenderingTest(hooks);
 
   test('it renders', async function (assert) {
-    await render(hbs`<MaskedInput />`);
-    assert.dom('[data-test-masked-input]').exists('shows masked input');
+    await render(hbs`{{masked-input}}`);
+    assert.dom('[data-test-masked-input]').exists('shows expiration beacon');
+  });
+
+  test('it renders a textarea', async function (assert) {
+    await render(hbs`{{masked-input}}`);
+
     assert.ok(component.textareaIsPresent);
-    assert.dom('[data-test-textarea]').hasClass('masked-font', 'it renders an input with obscure font');
-    assert.notOk(component.copyButtonIsPresent, 'does not render copy button by default');
-    assert.notOk(component.downloadButtonIsPresent, 'does not render download button by default');
+  });
 
-    await component.toggleMasked();
-    assert.dom('.masked-value').doesNotHaveClass('masked-font', 'it unmasks when show button is clicked');
-    await component.toggleMasked();
-    assert.dom('.masked-value').hasClass('masked-font', 'it remasks text when button is clicked');
+  test('it renders an input with obscure font', async function (assert) {
+    await render(hbs`{{masked-input}}`);
+
+    assert.dom('[data-test-textarea]').hasClass('masked-font', 'loading class with correct font');
   });
 
-  test('it renders correctly when displayOnly', async function (assert) {
+  test('it renders obscure font when displayOnly', async function (assert) {
     this.set('value', 'value');
-    await render(hbs`<MaskedInput @displayOnly={{true}} @value={{this.value}} />`);
+    await render(hbs`{{masked-input displayOnly=true value=value}}`);
 
-    assert.dom('.masked-value').hasClass('masked-font', 'value has obscured font');
-    assert.notOk(component.textareaIsPresent, 'it does not render a textarea when displayOnly is true');
+    assert.dom('.masked-value').hasClass('masked-font', 'loading class with correct font');
+  });
+
+  test('it does not render a textarea when displayOnly is true', async function (assert) {
+    await render(hbs`{{masked-input displayOnly=true}}`);
+
+    assert.notOk(component.textareaIsPresent);
   });
 
   test('it renders a copy button when allowCopy is true', async function (assert) {
-    await render(hbs`<MaskedInput @allowCopy={{true}} />`);
+    await render(hbs`{{masked-input allowCopy=true}}`);
+
     assert.ok(component.copyButtonIsPresent);
   });
 
-  test('it renders a download button when allowDownload is true', async function (assert) {
-    await render(hbs`<MaskedInput @allowDownload={{true}} />`);
-    assert.ok(component.downloadButtonIsPresent);
+  test('it does not render a copy button when allowCopy is false', async function (assert) {
+    await render(hbs`{{masked-input allowCopy=false}}`);
+
+    assert.notOk(component.copyButtonIsPresent);
+  });
+
+  test('it unmasks text when button is clicked', async function (assert) {
+    this.set('value', 'value');
+    await render(hbs`{{masked-input value=value}}`);
+    await component.toggleMasked();
+
+    assert.dom('.masked-value').doesNotHaveClass('masked-font');
+  });
+
+  test('it remasks text when button is clicked', async function (assert) {
+    this.set('value', 'value');
+    await render(hbs`{{masked-input value=value}}`);
+
+    await component.toggleMasked();
+    await component.toggleMasked();
+
+    assert.dom('.masked-value').hasClass('masked-font');
   });
 
   test('it shortens all outputs when displayOnly and masked', async function (assert) {
     this.set('value', '123456789-123456789-123456789');
-    await render(hbs`<MaskedInput @value={{this.value}} @displayOnly={{true}} />`);
-    const maskedValue = document.querySelector('.masked-value').innerText;
-    assert.strictEqual(maskedValue.length, 11);
+    await render(hbs`{{masked-input value=value displayOnly=true}}`);
+    let maskedValue = document.querySelector('.masked-value').innerText;
+    assert.equal(maskedValue.length, 11);
 
     await component.toggleMasked();
-    const unMaskedValue = document.querySelector('.masked-value').innerText;
-    assert.strictEqual(unMaskedValue.length, this.value.length);
+    let unMaskedValue = document.querySelector('.masked-value').innerText;
+    assert.equal(unMaskedValue.length, this.value.length);
   });
 
   test('it does not unmask text on focus', async function (assert) {
     this.set('value', '123456789-123456789-123456789');
-    await render(hbs`<MaskedInput @value={{this.value}} />`);
+    await render(hbs`{{masked-input value=value}}`);
     assert.dom('.masked-value').hasClass('masked-font');
     await focus('.masked-value');
     assert.dom('.masked-value').hasClass('masked-font');
   });
 
-  test('it calls onChange events with the correct values', async function (assert) {
-    const changeSpy = sinon.spy();
-    this.set('value', 'before');
-    this.set('onChange', changeSpy);
-    await render(hbs`<MaskedInput @value={{this.value}} @onChange={{this.onChange}} />`);
-    await fillIn('[data-test-textarea]', 'after');
-    assert.true(changeSpy.calledWith('after'));
-  });
-
-  test('it calls onKeyUp events with the correct values', async function (assert) {
-    const keyupSpy = sinon.spy();
-    this.set('value', '');
-    this.set('onKeyUp', keyupSpy);
-    await render(hbs`<MaskedInput @name="foo" @value={{this.value}} @onKeyUp={{this.onKeyUp}} />`);
-    await typeIn('[data-test-textarea]', 'baz');
-    assert.true(keyupSpy.calledThrice, 'calls for each letter of typing');
-    assert.true(keyupSpy.firstCall.calledWithExactly('foo', 'b'));
-    assert.true(keyupSpy.secondCall.calledWithExactly('foo', 'ba'));
-    assert.true(keyupSpy.thirdCall.calledWithExactly('foo', 'baz'));
-  });
-
   test('it does not remove value on tab', async function (assert) {
     this.set('value', 'hello');
-    await render(hbs`<MaskedInput @value={{this.value}} />`);
+    await render(hbs`{{masked-input value=value}}`);
     await triggerKeyEvent('[data-test-textarea]', 'keydown', 9);
     await component.toggleMasked();
-    const unMaskedValue = document.querySelector('.masked-value').value;
-    assert.strictEqual(unMaskedValue, this.value);
+    let unMaskedValue = document.querySelector('.masked-value').value;
+    assert.equal(unMaskedValue, this.value);
   });
 });
diff --git a/ui/tests/integration/components/mfa-form-test.js b/ui/tests/integration/components/mfa-form-test.js
index 24ef8abeac39f..ae8f4e8737241 100644
--- a/ui/tests/integration/components/mfa-form-test.js
+++ b/ui/tests/integration/components/mfa-form-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
@@ -121,7 +116,7 @@ module('Integration | Component | mfa-form', function (hooks) {
     });
 
     this.onSuccess = (resp) =>
-      assert.strictEqual(resp, 'test response', 'Response is returned in onSuccess callback');
+      assert.equal(resp, 'test response', 'Response is returned in onSuccess callback');
 
     await render(hbs`
       <Mfa::MfaForm
@@ -162,7 +157,7 @@ module('Integration | Component | mfa-form', function (hooks) {
     });
 
     this.onSuccess = (resp) =>
-      assert.strictEqual(resp, 'test response', 'Response is returned in onSuccess callback');
+      assert.equal(resp, 'test response', 'Response is returned in onSuccess callback');
 
     await render(hbs`
       <Mfa::MfaForm
@@ -182,7 +177,7 @@ module('Integration | Component | mfa-form', function (hooks) {
         'maximum TOTP validation attempts 4 exceeded the allowed attempts 3. Please try again in 15 seconds',
     };
     const codes = ['used', 'limit'];
-    for (const code of codes) {
+    for (let code of codes) {
       this.owner.lookup('service:auth').reopen({
         totpValidate() {
           throw { errors: [messages[code]] };
@@ -198,10 +193,12 @@ module('Integration | Component | mfa-form', function (hooks) {
       await fillIn('[data-test-mfa-passcode]', code);
       later(() => cancelTimers(), 50);
       await click('[data-test-mfa-validate]');
-      const expectedTime = code === 'used' ? '45' : '15';
       assert
         .dom('[data-test-mfa-countdown]')
-        .includesText(expectedTime, 'countdown renders with correct initial value from error response');
+        .hasText(
+          code === 'used' ? '45' : '15',
+          'countdown renders with correct initial value from error response'
+        );
       assert.dom('[data-test-mfa-validate]').isDisabled('Button is disabled during countdown');
       assert.dom('[data-test-mfa-passcode]').isDisabled('Input is disabled during countdown');
       assert.dom('[data-test-inline-error-message]').exists('Alert message renders');
diff --git a/ui/tests/integration/components/mfa-login-enforcement-form-test.js b/ui/tests/integration/components/mfa-login-enforcement-form-test.js
index 1836b036d2017..bd4e05330b408 100644
--- a/ui/tests/integration/components/mfa-login-enforcement-form-test.js
+++ b/ui/tests/integration/components/mfa-login-enforcement-form-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render, click, fillIn } from '@ember/test-helpers';
@@ -129,9 +124,9 @@ module('Integration | Component | mfa-login-enforcement-form', function (hooks)
     await click('[data-test-mlef-add-target]');
     await click('[data-test-mlef-save]');
     assert.true(this.didSave, 'onSave callback triggered');
-    assert.strictEqual(this.model.name, 'bar', 'Name property set on model');
-    assert.strictEqual(this.model.mfa_methods.firstObject.id, '123456', 'Mfa method added to model');
-    assert.strictEqual(
+    assert.equal(this.model.name, 'bar', 'Name property set on model');
+    assert.equal(this.model.mfa_methods.firstObject.id, '123456', 'Mfa method added to model');
+    assert.equal(
       this.model.auth_method_accessors.firstObject,
       'auth_userpass_1234',
       'Target saved to correct model property'
diff --git a/ui/tests/integration/components/mfa-login-enforcement-header-test.js b/ui/tests/integration/components/mfa-login-enforcement-header-test.js
index cb35689673f0a..6866c78024d07 100644
--- a/ui/tests/integration/components/mfa-login-enforcement-header-test.js
+++ b/ui/tests/integration/components/mfa-login-enforcement-header-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render, click } from '@ember/test-helpers';
@@ -58,13 +53,13 @@ module('Integration | Component | mfa-login-enforcement-header', function (hooks
       .includesText('An enforcement includes the authentication types', 'Description renders');
     for (const option of ['new', 'existing', 'skip']) {
       await click(`[data-test-mleh-radio="${option}"] input`);
-      assert.strictEqual(this.value, option, 'Value is updated on radio select');
+      assert.equal(this.value, option, 'Value is updated on radio select');
       if (option === 'existing') {
         await clickTrigger();
         await click('.ember-power-select-option');
       }
     }
 
-    assert.strictEqual(this.enforcement.name, 'foo', 'Existing enforcement is selected');
+    assert.equal(this.enforcement.name, 'foo', 'Existing enforcement is selected');
   });
 });
diff --git a/ui/tests/integration/components/mfa-method-list-item-test.js b/ui/tests/integration/components/mfa-method-list-item-test.js
index 14d58db61b907..7f9c6f8c1bbcd 100644
--- a/ui/tests/integration/components/mfa-method-list-item-test.js
+++ b/ui/tests/integration/components/mfa-method-list-item-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, skip } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/tests/integration/components/mfa/method-form-test.js b/ui/tests/integration/components/mfa/method-form-test.js
index b72759fdf1a1c..9ac7de5fe373b 100644
--- a/ui/tests/integration/components/mfa/method-form-test.js
+++ b/ui/tests/integration/components/mfa/method-form-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render, fillIn, click } from '@ember/test-helpers';
@@ -80,7 +75,7 @@ module('Integration | Component | mfa-method-form', function (hooks) {
     `);
     assert.dom('[data-test-input="issuer"]').hasValue('Vault', 'Issuer input is populated');
     assert.dom('[data-test-ttl-value="Period"]').hasValue('30', 'Period input ttl is populated');
-    const checkedAlgorithm = this.element.querySelector('input[name=algorithm]:checked');
+    let checkedAlgorithm = this.element.querySelector('input[name=algorithm]:checked');
     assert.dom(checkedAlgorithm).hasValue('SHA512', 'SHA512 radio input is selected');
   });
 });
diff --git a/ui/tests/integration/components/modal-test.js b/ui/tests/integration/components/modal-test.js
index fa817b8843b53..cefb22b4121c9 100644
--- a/ui/tests/integration/components/modal-test.js
+++ b/ui/tests/integration/components/modal-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import sinon from 'sinon';
diff --git a/ui/tests/integration/components/mount-accessor-select-test.js b/ui/tests/integration/components/mount-accessor-select-test.js
index 40af68fe55787..dafd77c28d916 100644
--- a/ui/tests/integration/components/mount-accessor-select-test.js
+++ b/ui/tests/integration/components/mount-accessor-select-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render, click, fillIn } from '@ember/test-helpers';
@@ -26,26 +21,26 @@ module('Integration | Component | mount-accessor-select', function (hooks) {
   });
 
   test('it renders', async function (assert) {
-    await render(hbs`<MountAccessorSelect @onChange={{this.onChange}}/>`);
+    await render(hbs`<MountAccessorSelect @onChange={{onChange}}/>`);
     assert.dom('[data-test-mount-accessor-select]').exists();
   });
 
   test('it filters token', async function (assert) {
-    await render(hbs`<MountAccessorSelect @onChange={{this.onChange}} @filterToken={{true}}/>`);
+    await render(hbs`<MountAccessorSelect @onChange={{onChange}} @filterToken={{true}}/>`);
     await click('[data-test-mount-accessor-select]');
-    const options = document.querySelector('[data-test-mount-accessor-select]').options;
-    assert.strictEqual(options.length, 1, 'only the auth option, no token');
+    let options = document.querySelector('[data-test-mount-accessor-select]').options;
+    assert.equal(options.length, 1, 'only the auth option, no token');
   });
 
   test('it shows token', async function (assert) {
-    await render(hbs`<MountAccessorSelect @onChange={{this.onChange}}/>`);
+    await render(hbs`<MountAccessorSelect @onChange={{onChange}}/>`);
     await click('[data-test-mount-accessor-select]');
-    const options = document.querySelector('[data-test-mount-accessor-select]').options;
-    assert.strictEqual(options.length, 2, 'both auth and token show');
+    let options = document.querySelector('[data-test-mount-accessor-select]').options;
+    assert.equal(options.length, 2, 'both auth and token show');
   });
 
   test('it sends value to parent onChange', async function (assert) {
-    await render(hbs`<MountAccessorSelect @onChange={{this.onChange}}/>`);
+    await render(hbs`<MountAccessorSelect @onChange={{onChange}}/>`);
     await fillIn('[data-test-mount-accessor-select]', 'auth_userpass_1234');
     assert.ok(
       this.onChange.calledWith('auth_userpass_1234'),
@@ -54,16 +49,16 @@ module('Integration | Component | mount-accessor-select', function (hooks) {
   });
 
   test('it selects the first option if no default', async function (assert) {
-    await render(hbs`<MountAccessorSelect @onChange={{this.onChange}} />`);
-    const defaultSelection = document.querySelector('[data-test-mount-accessor-select]').options[0].innerHTML;
+    await render(hbs`<MountAccessorSelect @onChange={{onChange}} />`);
+    let defaultSelection = document.querySelector('[data-test-mount-accessor-select]').options[0].innerHTML;
     // remove all non letters
-    assert.strictEqual(defaultSelection.replace(/\W/g, ''), 'userpassuserpass');
+    assert.equal(defaultSelection.replace(/\W/g, ''), 'userpassuserpass');
   });
 
   test('it shows Select one if yes default', async function (assert) {
-    await render(hbs`<MountAccessorSelect @onChange={{this.onChange}} @noDefault={{true}} />`);
-    const defaultSelection = document.querySelector('[data-test-mount-accessor-select]').options[0].innerHTML;
+    await render(hbs`<MountAccessorSelect @onChange={{onChange}} @noDefault={{true}} />`);
+    let defaultSelection = document.querySelector('[data-test-mount-accessor-select]').options[0].innerHTML;
     // remove all non letters
-    assert.strictEqual(defaultSelection.replace(/\W/g, ''), 'Selectone');
+    assert.equal(defaultSelection.replace(/\W/g, ''), 'Selectone');
   });
 });
diff --git a/ui/tests/integration/components/mount-backend-form-test.js b/ui/tests/integration/components/mount-backend-form-test.js
index f26c584bfc63c..a9018254d3d4e 100644
--- a/ui/tests/integration/components/mount-backend-form-test.js
+++ b/ui/tests/integration/components/mount-backend-form-test.js
@@ -1,14 +1,8 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { later, _cancelTimers as cancelTimers } from '@ember/runloop';
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render, settled } from '@ember/test-helpers';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import { allowAllCapabilitiesStub, noopStub } from 'vault/tests/helpers/stubs';
+import apiStub from 'vault/tests/helpers/noop-all-api-requests';
 import hbs from 'htmlbars-inline-precompile';
 
 import { create } from 'ember-cli-page-object';
@@ -20,184 +14,59 @@ const component = create(mountBackendForm);
 
 module('Integration | Component | mount backend form', function (hooks) {
   setupRenderingTest(hooks);
-  setupMirage(hooks);
 
   hooks.beforeEach(function () {
-    this.flashMessages = this.owner.lookup('service:flash-messages');
-    this.flashMessages.registerTypes(['success', 'danger']);
-    this.flashSuccessSpy = sinon.spy(this.flashMessages, 'success');
-    this.store = this.owner.lookup('service:store');
-    this.server.post('/sys/capabilities-self', allowAllCapabilitiesStub());
-    this.server.post('/sys/auth/foo', noopStub());
-    this.server.post('/sys/mounts/foo', noopStub());
-    this.onMountSuccess = sinon.spy();
+    this.owner.lookup('service:flash-messages').registerTypes(['success', 'danger']);
+    this.server = apiStub();
   });
 
   hooks.afterEach(function () {
     this.server.shutdown();
   });
 
-  module('auth method', function (hooks) {
-    hooks.beforeEach(function () {
-      this.model = this.store.createRecord('auth-method');
-      this.model.set('config', this.store.createRecord('mount-config'));
-    });
-
-    test('it renders default state', async function (assert) {
-      await render(
-        hbs`<MountBackendForm @mountModel={{this.model}} @onMountSuccess={{this.onMountSuccess}} />`
-      );
-      assert.strictEqual(
-        component.header,
-        'Enable an Authentication Method',
-        'renders auth header in default state'
-      );
-      assert.ok(component.types.length > 0, 'renders type picker');
-    });
-
-    test('it changes path when type is changed', async function (assert) {
-      await render(
-        hbs`<MountBackendForm @mountModel={{this.model}} @onMountSuccess={{this.onMountSuccess}} />`
-      );
-      await component.selectType('aws');
-      await component.next();
-      assert.strictEqual(component.pathValue, 'aws', 'sets the value of the type');
-      await component.back();
-      await component.selectType('approle');
-      await component.next();
-      assert.strictEqual(component.pathValue, 'approle', 'updates the value of the type');
-    });
-
-    test('it keeps path value if the user has changed it', async function (assert) {
-      await render(
-        hbs`<MountBackendForm @mountModel={{this.model}} @onMountSuccess={{this.onMountSuccess}} />`
-      );
-      await component.selectType('approle');
-      await component.next();
-      assert.strictEqual(this.model.type, 'approle', 'Updates type on model');
-      assert.strictEqual(component.pathValue, 'approle', 'defaults to approle (first in the list)');
-      await component.path('newpath');
-      assert.strictEqual(this.model.path, 'newpath', 'Updates path on model');
-      await component.back();
-      assert.strictEqual(this.model.type, '', 'Clears type on back');
-      assert.strictEqual(this.model.path, 'newpath', 'Path is still newPath');
-      await component.selectType('aws');
-      await component.next();
-      assert.strictEqual(this.model.type, 'aws', 'Updates type on model');
-      assert.strictEqual(component.pathValue, 'newpath', 'keeps custom path value');
-    });
-
-    test('it does not show a selected token type when first mounting an auth method', async function (assert) {
-      await render(
-        hbs`<MountBackendForm @mountModel={{this.model}} @onMountSuccess={{this.onMountSuccess}} />`
-      );
-      await component.selectType('github');
-      await component.next();
-      await component.toggleOptions();
-      assert
-        .dom('[data-test-input="config.tokenType"]')
-        .hasValue('', 'token type does not have a default value.');
-      const selectOptions = document.querySelector('[data-test-input="config.tokenType"]').options;
-      assert.strictEqual(selectOptions[1].text, 'default-service', 'first option is default-service');
-      assert.strictEqual(selectOptions[2].text, 'default-batch', 'second option is default-batch');
-      assert.strictEqual(selectOptions[3].text, 'batch', 'third option is batch');
-      assert.strictEqual(selectOptions[4].text, 'service', 'fourth option is service');
-    });
-
-    test('it calls mount success', async function (assert) {
-      assert.expect(3);
-
-      this.server.post('/sys/auth/foo', () => {
-        assert.ok(true, 'it calls enable on an auth method');
-        return [204, { 'Content-Type': 'application/json' }];
-      });
-      const spy = sinon.spy();
-      this.set('onMountSuccess', spy);
-
-      await render(
-        hbs`<MountBackendForm @mountModel={{this.model}} @onMountSuccess={{this.onMountSuccess}} />`
-      );
-      await component.mount('approle', 'foo');
-      later(() => cancelTimers(), 50);
-      await settled();
-
-      assert.ok(spy.calledOnce, 'calls the passed success method');
-      assert.ok(
-        this.flashSuccessSpy.calledWith('Successfully mounted the approle auth method at foo.'),
-        'Renders correct flash message'
-      );
-    });
+  test('it renders', async function (assert) {
+    await render(hbs`{{mount-backend-form}}`);
+    assert.equal(component.header, 'Enable an Authentication Method', 'renders auth header in default state');
+    assert.ok(component.types.length > 0, 'renders type picker');
   });
 
-  module('secrets engine', function (hooks) {
-    hooks.beforeEach(function () {
-      this.model = this.store.createRecord('secret-engine');
-      this.model.set('config', this.store.createRecord('mount-config'));
-    });
-
-    test('it renders secret specific headers', async function (assert) {
-      await render(
-        hbs`<MountBackendForm  @mountType="secret" @mountModel={{this.model}} @onMountSuccess={{this.onMountSuccess}} />`
-      );
-      assert.strictEqual(component.header, 'Enable a Secrets Engine', 'renders secrets header');
-      assert.ok(component.types.length > 0, 'renders type picker');
-    });
+  test('it changes path when type is changed', async function (assert) {
+    await render(hbs`{{mount-backend-form}}`);
+    await component.selectType('aws');
+    await component.next();
+    assert.equal(component.pathValue, 'aws', 'sets the value of the type');
+    await component.back();
+    await component.selectType('approle');
+    await component.next();
+    assert.equal(component.pathValue, 'approle', 'updates the value of the type');
+  });
 
-    test('it changes path when type is changed', async function (assert) {
-      await render(
-        hbs`<MountBackendForm @mountType="secret" @mountModel={{this.model}} @onMountSuccess={{this.onMountSuccess}} />`
-      );
-      await component.selectType('kv');
-      await component.next();
-      assert.strictEqual(component.pathValue, 'kv', 'sets the value of the type');
-      await component.back();
-      await component.selectType('ssh');
-      await component.next();
-      assert.strictEqual(component.pathValue, 'ssh', 'updates the value of the type');
-    });
+  test('it keeps path value if the user has changed it', async function (assert) {
+    await render(hbs`{{mount-backend-form}}`);
+    await component.selectType('approle');
+    await component.next();
+    assert.equal(component.pathValue, 'approle', 'defaults to approle (first in the list)');
+    await component.path('newpath');
+    await component.back();
+    await component.selectType('aws');
+    await component.next();
+    assert.equal(component.pathValue, 'newpath', 'updates to the value of the type');
+  });
 
-    test('it keeps path value if the user has changed it', async function (assert) {
-      await render(
-        hbs`<MountBackendForm @mountType="secret" @mountModel={{this.model}} @onMountSuccess={{this.onMountSuccess}} />`
-      );
-      await component.selectType('kv');
-      await component.next();
-      assert.strictEqual(this.model.type, 'kv', 'Updates type on model');
-      assert.strictEqual(component.pathValue, 'kv', 'path matches mount type');
-      await component.path('newpath');
-      assert.strictEqual(this.model.path, 'newpath', 'Updates path on model');
-      await component.back();
-      assert.strictEqual(this.model.type, '', 'Clears type on back');
-      assert.strictEqual(this.model.path, 'newpath', 'path is still newpath');
-      await component.selectType('ssh');
-      await component.next();
-      assert.strictEqual(this.model.type, 'ssh', 'Updates type on model');
-      assert.strictEqual(component.pathValue, 'newpath', 'path stays the same');
+  test('it calls mount success', async function (assert) {
+    this.server.post('/v1/sys/auth/foo', () => {
+      return [204, { 'Content-Type': 'application/json' }];
     });
+    const spy = sinon.spy();
+    this.set('onMountSuccess', spy);
+    await render(hbs`{{mount-backend-form onMountSuccess=onMountSuccess}}`);
 
-    test('it calls mount success', async function (assert) {
-      assert.expect(3);
-
-      this.server.post('/sys/mounts/foo', () => {
-        assert.ok(true, 'it calls enable on an secrets engine');
-        return [204, { 'Content-Type': 'application/json' }];
-      });
-      const spy = sinon.spy();
-      this.set('onMountSuccess', spy);
+    await component.mount('approle', 'foo');
 
-      await render(
-        hbs`<MountBackendForm @mountType="secret" @mountModel={{this.model}} @onMountSuccess={{this.onMountSuccess}} />`
-      );
-
-      await component.mount('ssh', 'foo');
-      later(() => cancelTimers(), 50);
-      await settled();
-
-      assert.ok(spy.calledOnce, 'calls the passed success method');
-      assert.ok(
-        this.flashSuccessSpy.calledWith('Successfully mounted the ssh secrets engine at foo.'),
-        'Renders correct flash message'
-      );
-    });
+    later(() => cancelTimers(), 50);
+    await settled();
+    let enableRequest = this.server.handledRequests.findBy('url', '/v1/sys/auth/foo');
+    assert.ok(enableRequest, 'it calls enable on an auth method');
+    assert.ok(spy.calledOnce, 'calls the passed success method');
   });
 });
diff --git a/ui/tests/integration/components/mount-backend/type-form-test.js b/ui/tests/integration/components/mount-backend/type-form-test.js
deleted file mode 100644
index ffccc7e6b5c62..0000000000000
--- a/ui/tests/integration/components/mount-backend/type-form-test.js
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'vault/tests/helpers';
-import { click, render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-import sinon from 'sinon';
-import { allEngines, mountableEngines } from 'vault/helpers/mountable-secret-engines';
-import { methods } from 'vault/helpers/mountable-auth-methods';
-
-const secretTypes = mountableEngines().map((engine) => engine.type);
-const allSecretTypes = allEngines().map((engine) => engine.type);
-const authTypes = methods().map((auth) => auth.type);
-
-module('Integration | Component | mount-backend/type-form', function (hooks) {
-  setupRenderingTest(hooks);
-
-  hooks.beforeEach(function () {
-    this.setType = sinon.spy();
-  });
-
-  test('it calls secrets setMountType only on next click', async function (assert) {
-    const spy = sinon.spy();
-    this.set('setType', spy);
-    await render(hbs`<MountBackend::TypeForm @mountType="secret" @setMountType={{this.setType}} />`);
-
-    assert
-      .dom('[data-test-mount-type]')
-      .exists({ count: secretTypes.length }, 'Renders all mountable engines');
-    await click(`[data-test-mount-type="nomad"]`);
-    assert.dom(`[data-test-mount-type="nomad"] input`).isChecked(`ssh is checked`);
-    assert.ok(spy.notCalled, 'callback not called');
-    await click(`[data-test-mount-type="ssh"]`);
-    assert.dom(`[data-test-mount-type="ssh"] input`).isChecked(`ssh is checked`);
-    assert.ok(spy.notCalled, 'callback not called');
-    await click('[data-test-mount-next]');
-    assert.ok(spy.calledOnceWith('ssh'));
-  });
-
-  test('it calls auth setMountType only on next click', async function (assert) {
-    const spy = sinon.spy();
-    this.set('setType', spy);
-    await render(hbs`<MountBackend::TypeForm @setMountType={{this.setType}} />`);
-
-    assert
-      .dom('[data-test-mount-type]')
-      .exists({ count: authTypes.length }, 'Renders all mountable auth methods');
-    await click(`[data-test-mount-type="okta"]`);
-    assert.dom(`[data-test-mount-type="okta"] input`).isChecked(`ssh is checked`);
-    assert.ok(spy.notCalled, 'callback not called');
-    await click(`[data-test-mount-type="github"]`);
-    assert.dom(`[data-test-mount-type="github"] input`).isChecked(`ssh is checked`);
-    assert.ok(spy.notCalled, 'callback not called');
-    await click('[data-test-mount-next]');
-    assert.ok(spy.calledOnceWith('github'));
-  });
-
-  module('Enterprise', function (hooks) {
-    hooks.beforeEach(function () {
-      this.version = this.owner.lookup('service:version');
-      this.version.version = '1.12.1+ent';
-    });
-
-    test('it renders correct items for enterprise secrets', async function (assert) {
-      await render(hbs`<MountBackend::TypeForm @mountType="secret" @setMountType={{this.setType}} />`);
-      assert
-        .dom('[data-test-mount-type]')
-        .exists({ count: allSecretTypes.length }, 'Renders all secret engines');
-    });
-  });
-});
diff --git a/ui/tests/integration/components/nav-header-test.js b/ui/tests/integration/components/nav-header-test.js
new file mode 100644
index 0000000000000..63937354f7e6f
--- /dev/null
+++ b/ui/tests/integration/components/nav-header-test.js
@@ -0,0 +1,34 @@
+import { module, test } from 'qunit';
+import { setupRenderingTest } from 'ember-qunit';
+import { render } from '@ember/test-helpers';
+import { create } from 'ember-cli-page-object';
+import hbs from 'htmlbars-inline-precompile';
+import navHeader from 'vault/tests/pages/components/nav-header';
+
+const component = create(navHeader);
+
+module('Integration | Component | nav header', function (hooks) {
+  setupRenderingTest(hooks);
+
+  test('it renders', async function (assert) {
+    await render(hbs`
+        <div id="modal-wormhole"></div>
+        {{#nav-header as |h|}}
+          {{#h.home}}
+            Home!
+          {{/h.home}}
+          {{#h.items}}
+            Some Items
+          {{/h.items}}
+          {{#h.main}}
+            Main stuff here
+          {{/h.main}}
+        {{/nav-header}}
+      `);
+
+    assert.ok(component.ele, 'renders the outer element');
+    assert.equal(component.homeText.trim(), 'Home!', 'renders home content');
+    assert.equal(component.itemsText.trim(), 'Some Items', 'renders items content');
+    assert.equal(component.mainText.trim(), 'Main stuff here', 'renders items content');
+  });
+});
diff --git a/ui/tests/integration/components/object-list-input-test.js b/ui/tests/integration/components/object-list-input-test.js
deleted file mode 100644
index 0dc29bd0c9878..0000000000000
--- a/ui/tests/integration/components/object-list-input-test.js
+++ /dev/null
@@ -1,157 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'vault/tests/helpers';
-import { click, fillIn, render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-import sinon from 'sinon';
-
-const SELECTORS = {
-  listLabel: (key) => `[data-test-object-list-label="${key}"]`,
-  listInput: (key, row) => `[data-test-object-list-input="${key}-${row}"]`,
-  addButton: '[data-test-object-list-add-button]',
-  deleteButton: (row) => `[data-test-object-list-delete-button="${row}"]`,
-};
-module('Integration | Component | object-list-input', function (hooks) {
-  setupRenderingTest(hooks);
-
-  hooks.beforeEach(function () {
-    this.keys = [
-      { label: 'Input A', key: 'inputA', placeholder: 'Input something here' },
-      { label: 'Input B', key: 'inputB', placeholder: 'Input another thing' },
-      { label: 'Input C', key: 'inputC' },
-      { label: 'Input D', key: 'inputD' },
-      { label: 'Input E', key: 'inputE' },
-    ];
-    this.inputValue = [
-      { inputA: 'foo', inputB: 'bar' },
-      { inputA: 'another', inputB: 'value' },
-    ];
-    this.onChange = sinon.spy();
-  });
-
-  test('it renders with correct number of inputs and labels', async function (assert) {
-    assert.expect(12);
-    await render(hbs`<ObjectListInput @objectKeys={{this.keys}} @onChange={{this.onChange}} />`);
-    for (let i = 0; i < this.keys.length; i++) {
-      const element = this.keys[i];
-      assert.dom(SELECTORS.listLabel(element.key)).hasText(element.label, 'it renders labels');
-      assert.dom(SELECTORS.listInput(element.key, 0)).exists('it renders input');
-    }
-    const firstKey = this.keys[0];
-    assert
-      .dom(SELECTORS.listInput(firstKey.key, 0))
-      .hasAttribute('placeholder', firstKey.placeholder, 'it renders placeholder text');
-    assert.dom(SELECTORS.addButton).isDisabled('add button is disabled with empty inputs');
-  });
-
-  test('it adds a new row', async function (assert) {
-    assert.expect(12);
-    const expectedArray = [
-      {
-        inputA: 'foo-0',
-        inputB: 'foo-1',
-        inputC: 'foo-2',
-        inputD: 'foo-3',
-        inputE: 'foo-4',
-      },
-      {
-        inputA: 'bar-0',
-        inputB: 'bar-1',
-        inputC: 'bar-2',
-        inputD: 'bar-3',
-        inputE: 'bar-4',
-      },
-    ];
-    await render(hbs`<ObjectListInput @objectKeys={{this.keys}} @onChange={{this.onChange}} />`);
-
-    assert.dom(SELECTORS.addButton).isDisabled('add button is disabled with empty inputs');
-    await fillIn(SELECTORS.listInput(this.keys[0].key, 0), 'foo');
-    assert.propEqual(
-      this.onChange.lastCall.args[0],
-      [
-        {
-          inputA: 'foo',
-          inputB: '',
-          inputC: '',
-          inputD: '',
-          inputE: '',
-        },
-      ],
-      'onChange called with single input'
-    );
-    assert.dom(SELECTORS.addButton).isDisabled('add button is still disabled with single input');
-
-    // fill in each input
-    for (let i = 0; i < this.keys.length; i++) {
-      await fillIn(SELECTORS.listInput(this.keys[i].key, 0), `foo-${i}`);
-    }
-    assert.dom(SELECTORS.addButton).isEnabled('add button enabled when all inputs are filled');
-    assert.propEqual(
-      this.onChange.lastCall.args[0],
-      expectedArray.slice(0, 1),
-      'onChange called with first row of inputs'
-    );
-
-    // add a row
-    await click(SELECTORS.addButton);
-    assert.propEqual(
-      this.onChange.lastCall.args[0],
-      expectedArray.slice(0, 1),
-      'onChange is called with only filled in row (does not include empty row)'
-    );
-
-    for (let i = 0; i < this.keys.length; i++) {
-      const element = this.keys[i];
-      assert.dom(SELECTORS.listLabel(element.key)).exists({ count: 1 }, 'label only renders for first row');
-    }
-
-    // fill in another row of inputs
-    for (let i = 0; i < this.keys.length; i++) {
-      await fillIn(SELECTORS.listInput(this.keys[i].key, 1), `bar-${i}`);
-    }
-
-    assert.propEqual(
-      this.onChange.lastCall.args[0],
-      expectedArray,
-      'onChange includes both first and second row of objects'
-    );
-  });
-
-  test('it renders with inputValues and deletes a row', async function (assert) {
-    assert.expect(12);
-    this.keys = this.keys.slice(0, 2);
-    const [firstColumn, secondColumn] = this.keys;
-    await render(hbs`
-      <ObjectListInput
-        @objectKeys={{this.keys}}
-        @onChange={{this.onChange}} 
-        @inputValue={{this.inputValue}} 
-      />`);
-
-    assert.dom(SELECTORS.listInput(firstColumn.key, 0)).hasValue('foo', 'input exists in first row');
-    assert.dom(SELECTORS.listInput(secondColumn.key, 0)).hasValue('bar', 'input exists in first row');
-    assert.dom(SELECTORS.listInput(firstColumn.key, 1)).hasValue('another', 'input exists in second row');
-    assert.dom(SELECTORS.listInput(secondColumn.key, 1)).hasValue('value', 'input exists in second row');
-    assert.dom(SELECTORS.listInput(firstColumn.key, 2)).hasNoValue('empty input renders for first key');
-    assert.dom(SELECTORS.listInput(secondColumn.key, 2)).hasNoValue('empty input renders for second key');
-
-    assert.dom(SELECTORS.deleteButton(0)).exists({ count: 1 }, 'renders delete button first row');
-    assert.dom(SELECTORS.deleteButton(1)).exists({ count: 1 }, 'renders delete button second row');
-    assert.dom(SELECTORS.addButton).exists({ count: 1 }, 'renders one add button');
-    assert.dom(SELECTORS.addButton).isDisabled('add button is disabled when inputValue exists');
-
-    assert.ok(this.onChange.notCalled, 'on change does not fire when rendering input values');
-
-    await click(SELECTORS.deleteButton(1));
-
-    assert.propEqual(
-      this.onChange.lastCall.args[0],
-      this.inputValue.slice(0, 1),
-      'onChange fires with deleted row'
-    );
-  });
-});
diff --git a/ui/tests/integration/components/oidc-consent-block-test.js b/ui/tests/integration/components/oidc-consent-block-test.js
index a12d401c33cce..7dd74b56dd844 100644
--- a/ui/tests/integration/components/oidc-consent-block-test.js
+++ b/ui/tests/integration/components/oidc-consent-block-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render, click } from '@ember/test-helpers';
@@ -17,7 +12,7 @@ module('Integration | Component | oidc-consent-block', function (hooks) {
   test('it renders', async function (assert) {
     this.set('redirect', redirectBase);
     await render(hbs`
-      <OidcConsentBlock @redirect={{this.redirect}} @code="1234" />
+      <OidcConsentBlock @redirect={{redirect}} @code="1234" />
     `);
 
     assert.dom('[data-test-consent-title]').hasText('Consent', 'Title is correct on initial render');
@@ -37,7 +32,7 @@ module('Integration | Component | oidc-consent-block', function (hooks) {
     this.set('redirect', redirectBase);
 
     await render(hbs`
-      <OidcConsentBlock @redirect={{this.redirect}} @code="1234" @testRedirect={{this.successSpy}} @foo="make sure this doesn't get passed" />
+      <OidcConsentBlock @redirect={{redirect}} @code="1234" @testRedirect={{successSpy}} @foo="make sure this doesn't get passed" />
     `);
 
     assert.dom('[data-test-consent-title]').hasText('Consent', 'Title is correct on initial render');
@@ -58,7 +53,7 @@ module('Integration | Component | oidc-consent-block', function (hooks) {
     this.set('redirect', redirectBase);
 
     await render(hbs`
-      <OidcConsentBlock @redirect={{this.redirectBase}} @code="1234" @testRedirect={{this.successSpy}} />
+      <OidcConsentBlock @redirect={{redirectBase}} @code="1234" @testRedirect={{successSpy}} />
     `);
 
     assert.dom('[data-test-consent-title]').hasText('Consent', 'Title is correct on initial render');
@@ -84,11 +79,11 @@ module('Integration | Component | oidc-consent-block', function (hooks) {
 
     await render(hbs`
       <OidcConsentBlock
-        @redirect={{this.redirect}}
-        @code={{this.code}}
+        @redirect={{redirect}}
+        @code={{code}}
         @state="foo"
         @foo="make sure this doesn't get passed"
-        @testRedirect={{this.successSpy}}
+        @testRedirect={{successSpy}}
       />
     `);
 
diff --git a/ui/tests/integration/components/oidc/assignment-form-test.js b/ui/tests/integration/components/oidc/assignment-form-test.js
index 0ea0ea0b556d1..a4709db8a76ea 100644
--- a/ui/tests/integration/components/oidc/assignment-form-test.js
+++ b/ui/tests/integration/components/oidc/assignment-form-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render, fillIn, click, findAll } from '@ember/test-helpers';
@@ -29,7 +24,7 @@ module('Integration | Component | oidc/assignment-form', function (hooks) {
   });
 
   test('it should save new assignment', async function (assert) {
-    assert.expect(5);
+    assert.expect(6);
     this.model = this.store.createRecord('oidc/assignment');
     this.server.post('/identity/oidc/assignment/test', (schema, req) => {
       assert.ok(true, 'Request made to save assignment');
@@ -45,16 +40,13 @@ module('Integration | Component | oidc/assignment-form', function (hooks) {
       />
     `);
 
+    assert.dom('[data-test-oidc-assignment-title]').hasText('Create assignment', 'Form title renders');
     assert.dom('[data-test-oidc-assignment-save]').hasText('Create', 'Save button has correct label');
     await click('[data-test-oidc-assignment-save]');
     assert
       .dom('[data-test-inline-alert]')
       .hasText('Name is required.', 'Validation message is shown for name');
-    assert.strictEqual(
-      findAll('[data-test-inline-error-message]').length,
-      2,
-      `there are two validations errors.`
-    );
+    assert.equal(findAll('[data-test-inline-error-message]').length, 2, `there are two validations errors.`);
     await fillIn('[data-test-input="name"]', 'test');
     await click('[data-test-component="search-select"]#entities .ember-basic-dropdown-trigger');
     await click('.ember-power-select-option');
@@ -62,7 +54,7 @@ module('Integration | Component | oidc/assignment-form', function (hooks) {
   });
 
   test('it should populate fields with model data on edit view and update an assignment', async function (assert) {
-    assert.expect(5);
+    assert.expect(6);
 
     this.store.pushPayload('oidc/assignment', {
       modelName: 'oidc/assignment',
@@ -80,14 +72,15 @@ module('Integration | Component | oidc/assignment-form', function (hooks) {
       />
     `);
 
+    assert.dom('[data-test-oidc-assignment-title]').hasText('Edit assignment', 'Form title renders');
     assert.dom('[data-test-oidc-assignment-save]').hasText('Update', 'Save button has correct label');
     assert.dom('[data-test-input="name"]').isDisabled('Name input is disabled when editing');
     assert.dom('[data-test-input="name"]').hasValue('test', 'Name input is populated with model value');
     assert
-      .dom('[data-test-search-select="entities"] [data-test-smaller-id]')
+      .dom('[data-test-search-select="entities"] [data-test-smaller-id="true"]')
       .hasText('1234-12345', 'entity id renders in selected option');
     assert
-      .dom('[data-test-search-select="groups"] [data-test-smaller-id]')
+      .dom('[data-test-search-select="groups"] [data-test-smaller-id="true"]')
       .hasText('abcdef-123', 'group id renders in selected option');
   });
 
diff --git a/ui/tests/integration/components/oidc/client-form-test.js b/ui/tests/integration/components/oidc/client-form-test.js
index 8723cd8fc1ed7..c37d889149d93 100644
--- a/ui/tests/integration/components/oidc/client-form-test.js
+++ b/ui/tests/integration/components/oidc/client-form-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render, fillIn, click, findAll } from '@ember/test-helpers';
@@ -85,10 +80,8 @@ module('Integration | Component | oidc/client-form', function (hooks) {
       .dom('[data-test-oidc-client-title]')
       .hasText('Create application', 'Form title renders correct text');
     assert.dom(SELECTORS.clientSaveButton).hasText('Create', 'Save button has correct text');
-    assert.strictEqual(findAll('[data-test-field]').length, 6, 'renders all attribute fields');
-    assert
-      .dom('[data-test-oidc-radio="allow-all"] input')
-      .isChecked('Allow all radio button selected by default');
+    assert.equal(findAll('[data-test-field]').length, 6, 'renders all attribute fields');
+    assert.dom('input#allow-all').isChecked('Allow all radio button selected by default');
     assert.dom('[data-test-ttl-value="ID Token TTL"]').hasValue('1', 'ttl defaults to 24h');
     assert.dom('[data-test-ttl-value="Access Token TTL"]').hasValue('1', 'ttl defaults to 24h');
     assert.dom('[data-test-selected-option]').hasText('default', 'Search select has default key selected');
@@ -98,7 +91,7 @@ module('Integration | Component | oidc/client-form', function (hooks) {
     await click('[data-test-selected-list-button="delete"]');
     await click(SELECTORS.clientSaveButton);
 
-    const validationErrors = findAll(SELECTORS.inlineAlert);
+    let validationErrors = findAll(SELECTORS.inlineAlert);
     assert
       .dom(validationErrors[0])
       .hasText('Name is required. Name cannot contain whitespace.', 'Validation messages are shown for name');
@@ -110,7 +103,7 @@ module('Integration | Component | oidc/client-form', function (hooks) {
     await fillIn('.ember-power-select-search input', 'default');
     await searchSelect.options.objectAt(0).click();
 
-    await click('[data-test-oidc-radio="limited"]');
+    await click('label[for=limited]');
     assert
       .dom('[data-test-search-select-with-modal]')
       .exists('Limited radio button shows assignments search select');
@@ -156,7 +149,7 @@ module('Integration | Component | oidc/client-form', function (hooks) {
     assert
       .dom('[data-test-input="clientType"] input#confidential')
       .isChecked('Correct radio button is selected');
-    assert.dom('[data-test-oidc-radio="allow-all"] input').isChecked('Allow all radio button is selected');
+    assert.dom('input#allow-all').isChecked('Allow all radio button is selected');
     await click(SELECTORS.clientSaveButton);
   });
 
@@ -195,11 +188,11 @@ module('Integration | Component | oidc/client-form', function (hooks) {
     await fillIn('[data-test-input="redirectUris"] [data-test-string-list-input="0"]', 'some-url.com');
     await click('[data-test-string-list-button="add"]');
     await click(SELECTORS.clientCancelButton);
-    assert.strictEqual(this.model.redirectUris, undefined, 'Model attributes rolled back on cancel');
+    assert.equal(this.model.redirectUris, undefined, 'Model attributes rolled back on cancel');
   });
 
   test('it should show create assignment modal', async function (assert) {
-    assert.expect(3);
+    assert.expect(2);
     this.model = this.store.createRecord('oidc/client');
 
     await render(hbs`
@@ -210,14 +203,13 @@ module('Integration | Component | oidc/client-form', function (hooks) {
       />
       <div id="modal-wormhole"></div>
     `);
-    await click('[data-test-oidc-radio="limited"]');
+    await click('label[for=limited]');
     await clickTrigger();
     await fillIn('.ember-power-select-search input', 'test-new');
     await searchSelect.options.objectAt(0).click();
-    assert.dom('[data-test-modal-div]').hasClass('is-active', 'modal with form opens');
     assert.dom('[data-test-modal-title]').hasText('Create new assignment', 'Create assignment modal renders');
     await click(SELECTORS.assignmentCancelButton);
-    assert.dom('[data-test-modal-div]').doesNotExist('modal disappears onCancel');
+    assert.dom('[data-test-modal-div]').doesNotExist('Modal disappears after clicking cancel');
   });
 
   test('it should render fallback for search select', async function (assert) {
@@ -232,7 +224,7 @@ module('Integration | Component | oidc/client-form', function (hooks) {
       />
     `);
 
-    await click('[data-test-oidc-radio="limited"]');
+    await click('label[for=limited]');
     assert
       .dom('[data-test-component="string-list"]')
       .exists('Radio toggle shows assignments string-list input');
diff --git a/ui/tests/integration/components/oidc/key-form-test.js b/ui/tests/integration/components/oidc/key-form-test.js
index 20d31ee37f04e..bf6945c3db15f 100644
--- a/ui/tests/integration/components/oidc/key-form-test.js
+++ b/ui/tests/integration/components/oidc/key-form-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render, fillIn, click, findAll } from '@ember/test-helpers';
@@ -53,19 +48,19 @@ module('Integration | Component | oidc/key-form', function (hooks) {
     assert.dom('[data-test-oidc-key-title]').hasText('Create key', 'Form title renders correct text');
     assert.dom(SELECTORS.keySaveButton).hasText('Create', 'Save button has correct text');
     assert.dom('[data-test-input="algorithm"]').hasValue('RS256', 'default algorithm is correct');
-    assert.strictEqual(findAll('[data-test-field]').length, 4, 'renders all input fields');
+    assert.equal(findAll('[data-test-field]').length, 4, 'renders all input fields');
 
     // check validation errors
     await fillIn('[data-test-input="name"]', ' ');
     await click(SELECTORS.keySaveButton);
 
-    const validationErrors = findAll(SELECTORS.inlineAlert);
+    let validationErrors = findAll(SELECTORS.inlineAlert);
     assert
       .dom(validationErrors[0])
       .hasText('Name is required. Name cannot contain whitespace.', 'Validation messages are shown for name');
     assert.dom(validationErrors[1]).hasText('There are 2 errors with this form.', 'Renders form error count');
 
-    assert.dom('[data-test-oidc-radio="limited"] input').isDisabled('limit radio button disabled on create');
+    assert.dom('label[for=limited] input').isDisabled('limit radio button disabled on create');
     await fillIn('[data-test-input="name"]', 'test-key');
     await click(SELECTORS.keySaveButton);
   });
@@ -99,20 +94,20 @@ module('Integration | Component | oidc/key-form', function (hooks) {
     assert.dom(SELECTORS.keySaveButton).hasText('Update', 'Save button has correct text');
     assert.dom('[data-test-input="name"]').isDisabled('Name input is disabled when editing');
     assert.dom('[data-test-input="name"]').hasValue('test-key', 'Name input is populated with model value');
-    assert.dom('[data-test-oidc-radio="allow-all"] input').isChecked('Allow all radio button is selected');
+    assert.dom('input#allow-all').isChecked('Allow all radio button is selected');
 
-    await click('[data-test-oidc-radio="limited"]');
+    await click('label[for=limited]');
     assert
       .dom('[data-test-component="search-select"]#allowedClientIds')
       .exists('Limited radio button shows clients search select');
     await click('[data-test-component="search-select"]#allowedClientIds .ember-basic-dropdown-trigger');
-    assert.strictEqual(findAll('li.ember-power-select-option').length, 1, 'dropdown only renders one option');
+    assert.equal(findAll('li.ember-power-select-option').length, 1, 'dropdown only renders one option');
     assert
       .dom('li.ember-power-select-option')
       .hasTextContaining('app-1', 'dropdown contains client that references key');
     assert.dom('[data-test-smaller-id]').exists('renders smaller client id in dropdown');
 
-    await click('[data-test-oidc-radio="allow-all"]');
+    await click('label[for=allow-all]');
     assert
       .dom('[data-test-component="search-select"]#allowedClientIds')
       .doesNotExist('Allow all radio button hides search select');
@@ -152,9 +147,9 @@ module('Integration | Component | oidc/key-form', function (hooks) {
       />
     `);
 
-    await click('[data-test-oidc-radio="limited"]');
+    await click('label[for=limited]');
     await click(SELECTORS.keyCancelButton);
-    assert.strictEqual(this.model.allowed_client_ids, undefined, 'Model attributes rolled back on cancel');
+    assert.equal(this.model.allowed_client_ids, undefined, 'Model attributes rolled back on cancel');
   });
 
   test('it should render fallback for search select', async function (assert) {
@@ -182,7 +177,7 @@ module('Integration | Component | oidc/key-form', function (hooks) {
       />
     `);
 
-    await click('[data-test-oidc-radio="limited"]');
+    await click('label[for=limited]');
     assert
       .dom('[data-test-component="search-select"]#allowedClientIds [data-test-component="string-list"]')
       .exists('Radio toggle shows client string-list input');
diff --git a/ui/tests/integration/components/oidc/provider-form-test.js b/ui/tests/integration/components/oidc/provider-form-test.js
index b2f5efd18d638..e7214dcc7baec 100644
--- a/ui/tests/integration/components/oidc/provider-form-test.js
+++ b/ui/tests/integration/components/oidc/provider-form-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render, fillIn, click, findAll } from '@ember/test-helpers';
@@ -74,7 +69,7 @@ module('Integration | Component | oidc/provider-form', function (hooks) {
     assert
       .dom('[data-test-input="issuer"]')
       .hasAttribute('placeholder', 'e.g. https://example.com:8200', 'issuer placeholder text is correct');
-    assert.strictEqual(findAll('[data-test-field]').length, 3, 'renders all input fields');
+    assert.equal(findAll('[data-test-field]').length, 3, 'renders all input fields');
     await click('[data-test-component="search-select"]#scopesSupported .ember-basic-dropdown-trigger');
     assert.dom('li.ember-power-select-option').hasText('test-scope', 'dropdown renders scopes');
 
@@ -82,13 +77,13 @@ module('Integration | Component | oidc/provider-form', function (hooks) {
     await fillIn('[data-test-input="name"]', ' ');
     await click(SELECTORS.providerSaveButton);
 
-    const validationErrors = findAll(SELECTORS.inlineAlert);
+    let validationErrors = findAll(SELECTORS.inlineAlert);
     assert
       .dom(validationErrors[0])
       .hasText('Name is required. Name cannot contain whitespace.', 'Validation messages are shown for name');
     assert.dom(validationErrors[1]).hasText('There are 2 errors with this form.', 'Renders form error count');
 
-    await click('[data-test-oidc-radio="limited"]');
+    await click('label[for=limited]');
     assert
       .dom('[data-test-component="search-select"]#allowedClientIds')
       .exists('Limited radio button shows clients search select');
@@ -96,7 +91,7 @@ module('Integration | Component | oidc/provider-form', function (hooks) {
     assert.dom('li.ember-power-select-option').hasTextContaining('test-app', 'dropdown renders client name');
     assert.dom('[data-test-smaller-id]').exists('renders smaller client id in dropdown');
 
-    await click('[data-test-oidc-radio="allow-all"]');
+    await click('label[for=allow-all]');
     assert
       .dom('[data-test-component="search-select"]#allowedClientIds')
       .doesNotExist('Allow all radio button hides search select');
@@ -143,7 +138,7 @@ module('Integration | Component | oidc/provider-form', function (hooks) {
       .hasValue(parseURL(ISSUER_URL).origin, 'issuer value is just scheme://host:port portion of full URL');
 
     assert.dom('[data-test-selected-option]').hasText('test-scope', 'model scope is selected');
-    assert.dom('[data-test-oidc-radio="allow-all"] input').isChecked('Allow all radio button is selected');
+    assert.dom('input#allow-all').isChecked('Allow all radio button is selected');
     await click(SELECTORS.providerSaveButton);
   });
 
@@ -181,9 +176,9 @@ module('Integration | Component | oidc/provider-form', function (hooks) {
       />
     `);
 
-    await click('[data-test-oidc-radio="limited"]');
+    await click('label[for=limited]');
     await click(SELECTORS.providerCancelButton);
-    assert.strictEqual(this.model.allowed_client_ids, undefined, 'Model attributes rolled back on cancel');
+    assert.equal(this.model.allowed_client_ids, undefined, 'Model attributes rolled back on cancel');
   });
 
   test('it should render fallback for search select', async function (assert) {
@@ -202,7 +197,7 @@ module('Integration | Component | oidc/provider-form', function (hooks) {
     assert
       .dom('[data-test-component="search-select"]#scopesSupported [data-test-component="string-list"]')
       .exists('renders fall back for scopes search select');
-    await click('[data-test-oidc-radio="limited"]');
+    await click('label[for=limited]');
     assert
       .dom('[data-test-component="search-select"]#allowedClientIds [data-test-component="string-list"]')
       .exists('Radio toggle shows assignments string-list input');
diff --git a/ui/tests/integration/components/oidc/scope-form-test.js b/ui/tests/integration/components/oidc/scope-form-test.js
index bdc5d27c8251a..83d0a266c55d0 100644
--- a/ui/tests/integration/components/oidc/scope-form-test.js
+++ b/ui/tests/integration/components/oidc/scope-form-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render, fillIn, click, findAll } from '@ember/test-helpers';
@@ -45,7 +40,7 @@ module('Integration | Component | oidc/scope-form', function (hooks) {
     // check validation errors
     await click(SELECTORS.scopeSaveButton);
 
-    const validationErrors = findAll(SELECTORS.inlineAlert);
+    let validationErrors = findAll(SELECTORS.inlineAlert);
     assert.dom(validationErrors[0]).hasText('Name is required.', 'Validation messages are shown for name');
     assert.dom(validationErrors[1]).hasText('There is an error with this form.', 'Renders form error count');
 
@@ -146,11 +141,7 @@ module('Integration | Component | oidc/scope-form', function (hooks) {
 
     await fillIn('[data-test-input="description"]', 'changed description attribute');
     await click(SELECTORS.scopeCancelButton);
-    assert.strictEqual(
-      this.model.description,
-      'this is a test',
-      'Model attributes are rolled back on cancel'
-    );
+    assert.equal(this.model.description, 'this is a test', 'Model attributes are rolled back on cancel');
   });
 
   test('it should show example template modal', async function (assert) {
diff --git a/ui/tests/integration/components/okta-number-challenge-test.js b/ui/tests/integration/components/okta-number-challenge-test.js
index 341f3796ad395..a115960500c4f 100644
--- a/ui/tests/integration/components/okta-number-challenge-test.js
+++ b/ui/tests/integration/components/okta-number-challenge-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render, click } from '@ember/test-helpers';
diff --git a/ui/tests/integration/components/overview-card-test.js b/ui/tests/integration/components/overview-card-test.js
deleted file mode 100644
index 09cb2b7c7df78..0000000000000
--- a/ui/tests/integration/components/overview-card-test.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { render } from '@ember/test-helpers';
-import hbs from 'htmlbars-inline-precompile';
-
-const CARD_TITLE = 'Card title';
-const ACTION_TEXT = 'View card';
-const SUBTEXT = 'This is subtext for card';
-
-module('Integration | Component overview-card', function (hooks) {
-  setupRenderingTest(hooks);
-
-  hooks.beforeEach(function () {
-    this.set('cardTitle', CARD_TITLE);
-    this.set('actionText', ACTION_TEXT);
-    this.set('subText', SUBTEXT);
-  });
-
-  test('it returns card title, ', async function (assert) {
-    await render(hbs`<OverviewCard @cardTitle={{this.cardTitle}}/>`);
-    const titleText = this.element.querySelector('.title').innerText;
-    assert.strictEqual(titleText, 'Card title');
-  });
-  test('it returns card subtext, ', async function (assert) {
-    await render(hbs`<OverviewCard @cardTitle={{this.cardTitle}}  @subText={{this.subText}} />`);
-    const titleText = this.element.querySelector('p').innerText;
-    assert.strictEqual(titleText, 'This is subtext for card');
-  });
-  test('it returns card action text', async function (assert) {
-    await render(hbs`<OverviewCard @cardTitle={{this.cardTitle}} @actionText={{this.actionText}}/>`);
-    const titleText = this.element.querySelector('a').innerText;
-    assert.strictEqual(titleText, 'View card ');
-  });
-});
diff --git a/ui/tests/integration/components/page/breadcrumbs-test.js b/ui/tests/integration/components/page/breadcrumbs-test.js
deleted file mode 100644
index 9b817bcc06a3f..0000000000000
--- a/ui/tests/integration/components/page/breadcrumbs-test.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-/* eslint-disable ember/no-private-routing-service */
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'vault/tests/helpers';
-import { findAll, render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-
-module('Integration | Component | page/breadcrumbs', function (hooks) {
-  setupRenderingTest(hooks);
-
-  test('it renders', async function (assert) {
-    this.breadcrumbs = [
-      { label: 'Home', route: 'home', linkExternal: true },
-      { label: 'Details', route: 'home.details' },
-      { label: 'Edit item' },
-    ];
-
-    await render(hbs`<Page::Breadcrumbs @breadcrumbs={{this.breadcrumbs}} />`);
-    assert.dom('[data-test-breadcrumbs]').exists('renders passed in breadcrumbs');
-    assert.strictEqual(findAll('[data-test-breadcrumbs] li').length, 3, 'it renders 3 breadcrumbs');
-    assert.strictEqual(
-      findAll('[data-test-breadcrumbs] a').length,
-      2,
-      'it does not render a link if no path'
-    );
-  });
-});
diff --git a/ui/tests/integration/components/page/error-test.js b/ui/tests/integration/components/page/error-test.js
deleted file mode 100644
index 062180948017e..0000000000000
--- a/ui/tests/integration/components/page/error-test.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'vault/tests/helpers';
-import { render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-
-module('Integration | Component | page/error', function (hooks) {
-  setupRenderingTest(hooks);
-
-  test('it should render 404 error', async function (assert) {
-    this.error = {
-      httpStatus: 404,
-      path: '/v1/kubernetes/config',
-    };
-
-    await render(hbs`<Page::Error @error={{this.error}} />`);
-
-    assert.dom('h1').hasText('404 Not Found', 'Error title renders');
-    assert
-      .dom('p')
-      .hasText(`Sorry, we were unable to find any content at ${this.error.path}.`, 'Error message renders');
-  });
-
-  test('it should render 403 error', async function (assert) {
-    this.error = {
-      httpStatus: 403,
-      path: '/v1/kubernetes/config',
-    };
-
-    await render(hbs`<Page::Error @error={{this.error}} />`);
-
-    assert.dom('h1').hasText('Not authorized', 'Error title renders');
-    assert
-      .dom('p')
-      .hasText(`You are not authorized to access content at ${this.error.path}.`, 'Error message renders');
-  });
-
-  test('it should render general error', async function (assert) {
-    this.error = {
-      message: 'An unexpected error occurred',
-      errors: ['This is one thing that went wrong', 'Unfortunately something else went wrong too'],
-    };
-
-    await render(hbs`<Page::Error @error={{this.error}} />`);
-
-    assert.dom('h1').hasText('Error', 'Error title renders');
-    assert.dom('[data-test-page-error-message]').hasText(this.error.message, 'Error message renders');
-    this.error.errors.forEach((error, index) => {
-      assert
-        .dom(`[data-test-page-error-details="${index}"]`)
-        .hasText(this.error.errors[index], 'Error detail renders');
-    });
-  });
-});
diff --git a/ui/tests/integration/components/pagination-controls-test.js b/ui/tests/integration/components/pagination-controls-test.js
index 0535b2a74bbfe..a15373edb4587 100644
--- a/ui/tests/integration/components/pagination-controls-test.js
+++ b/ui/tests/integration/components/pagination-controls-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
@@ -33,7 +28,7 @@ module('Integration | Component | pagination-controls', function (hooks) {
 
     let expectedPage = 2;
     this.onChange = (page) => {
-      assert.strictEqual(page, expectedPage, 'onChange callback is fired with correct page number');
+      assert.equal(page, expectedPage, 'onChange callback is fired with correct page number');
     };
 
     await render(hbs`<PaginationControls @total={{75}} @onChange={{this.onChange}} />`);
diff --git a/ui/tests/integration/components/path-filter-config-list-test.js b/ui/tests/integration/components/path-filter-config-list-test.js
index f3384ecd7b678..66711816cc01a 100644
--- a/ui/tests/integration/components/path-filter-config-list-test.js
+++ b/ui/tests/integration/components/path-filter-config-list-test.js
@@ -1,14 +1,9 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
-import { render, click, findAll } from '@ember/test-helpers';
+import { render, click } from '@ember/test-helpers';
 import { typeInSearch, clickTrigger } from 'ember-power-select/test-support/helpers';
 import hbs from 'htmlbars-inline-precompile';
-import { setupEngine } from 'ember-engines/test-support';
+import engineResolverFor from 'ember-engines/test-support/engine-resolver-for';
 import Service from '@ember/service';
 import sinon from 'sinon';
 import { Promise } from 'rsvp';
@@ -17,6 +12,8 @@ import ss from 'vault/tests/pages/components/search-select';
 
 const searchSelect = create(ss);
 
+const resolver = engineResolverFor('replication');
+
 const MOUNTS_RESPONSE = {
   data: {
     secret: {},
@@ -35,12 +32,9 @@ const NAMESPACE_MOUNTS_RESPONSE = {
 };
 
 module('Integration | Component | path filter config list', function (hooks) {
-  setupRenderingTest(hooks);
-  setupEngine(hooks, 'replication');
-
+  setupRenderingTest(hooks, { resolver });
   hooks.beforeEach(function () {
-    this.context = { owner: this.engine }; // this.engine set by setupEngine
-    const ajaxStub = sinon.stub().usingPromise(Promise);
+    let ajaxStub = sinon.stub().usingPromise(Promise);
     ajaxStub.withArgs('/v1/sys/internal/ui/mounts', 'GET').resolves(MOUNTS_RESPONSE);
     ajaxStub
       .withArgs('/v1/sys/internal/ui/mounts', 'GET', { namespace: 'ns1' })
@@ -60,13 +54,13 @@ module('Integration | Component | path filter config list', function (hooks) {
         };
       },
     });
-    this.engine.register('service:namespace', namespaceServiceStub);
-    this.engine.register('service:store', storeServiceStub);
+    this.owner.register('service:namespace', namespaceServiceStub);
+    this.owner.register('service:store', storeServiceStub);
   });
 
   test('it renders', async function (assert) {
     this.set('config', { mode: null, paths: [] });
-    await render(hbs`<PathFilterConfigList @config={{this.config}} @paths={{this.paths}} />`, this.context);
+    await render(hbs`<PathFilterConfigList @config={{config}} @paths={{paths}} />`);
 
     assert.dom('[data-test-component=path-filter-config]').exists();
   });
@@ -74,7 +68,7 @@ module('Integration | Component | path filter config list', function (hooks) {
   test('it sets config.paths', async function (assert) {
     this.set('config', { mode: 'allow', paths: [] });
     this.set('paths', []);
-    await render(hbs`<PathFilterConfigList @config={{this.config}} @paths={{this.paths}} />`, this.context);
+    await render(hbs`<PathFilterConfigList @config={{config}} @paths={{paths}} />`);
 
     await clickTrigger();
     await typeInSearch('auth');
@@ -82,26 +76,26 @@ module('Integration | Component | path filter config list', function (hooks) {
     assert.ok(this.config.paths.includes('auth/userpass/'), 'adds to paths');
 
     await clickTrigger();
-    await assert.strictEqual(searchSelect.options.length, 1, 'has one option left');
+    await assert.equal(searchSelect.options.length, 1, 'has one option left');
 
     await searchSelect.deleteButtons.objectAt(0).click();
-    assert.strictEqual(this.config.paths.length, 0, 'removes from paths');
+    assert.equal(this.config.paths.length, 0, 'removes from paths');
     await clickTrigger();
-    await assert.strictEqual(searchSelect.options.length, 2, 'has both options');
+    await assert.equal(searchSelect.options.length, 2, 'has both options');
   });
 
   test('it sets config.mode', async function (assert) {
     this.set('config', { mode: 'allow', paths: [] });
-    await render(hbs`<PathFilterConfigList @config={{this.config}} />`, this.context);
+    await render(hbs`<PathFilterConfigList @config={{this.config}} />`);
     await click('#deny');
-    assert.strictEqual(this.config.mode, 'deny');
+    assert.equal(this.config.mode, 'deny');
     await click('#no-filtering');
-    assert.strictEqual(this.config.mode, null);
+    assert.equal(this.config.mode, null);
   });
 
   test('it shows a warning when going from a mode to allow all', async function (assert) {
     this.set('config', { mode: 'allow', paths: [] });
-    await render(hbs`<PathFilterConfigList @config={{this.config}} />`, this.context);
+    await render(hbs`<PathFilterConfigList @config={{this.config}} />`);
     await click('#no-filtering');
     assert.dom('[data-test-remove-warning]').exists('shows removal warning');
   });
@@ -109,63 +103,14 @@ module('Integration | Component | path filter config list', function (hooks) {
   test('it fetches mounts from a namespace when namespace name is entered', async function (assert) {
     this.set('config', { mode: 'allow', paths: [] });
     this.set('paths', []);
-    await render(hbs`<PathFilterConfigList @config={{this.config}} @paths={{this.paths}} />`, this.context);
+    await render(hbs`<PathFilterConfigList @config={{config}} @paths={{paths}} />`);
 
     await clickTrigger();
-    assert.strictEqual(searchSelect.options.length, 2, 'shows userpass and namespace as an option');
+    assert.equal(searchSelect.options.length, 2, 'shows userpass and namespace as an option');
     // type the namespace to trigger an ajax request
     await typeInSearch('ns1');
-    assert.strictEqual(searchSelect.options.length, 2, 'has ns and ns mount in the list');
+    assert.equal(searchSelect.options.length, 2, 'has ns and ns mount in the list');
     await searchSelect.options.objectAt(1).click();
     assert.ok(this.config.paths.includes('ns1/namespace-kv/'), 'adds namespace mount to paths');
   });
-
-  test('it selects mounts from different groups, and puts discarded option back within group', async function (assert) {
-    this.set('config', { mode: 'allow', paths: [] });
-    this.set('paths', []);
-    await render(hbs`<PathFilterConfigList @config={{this.config}} @paths={{this.paths}} />`, this.context);
-    await clickTrigger();
-    await searchSelect.options.objectAt(1).click();
-    await clickTrigger();
-    await typeInSearch('ns1');
-    await searchSelect.options.objectAt(1).click();
-    await clickTrigger();
-    await searchSelect.options.objectAt(0).click();
-    assert.dom('[data-test-selected-option="0"]').hasText('auth/userpass/', 'renders first mount selected');
-    assert
-      .dom('[data-test-selected-option="1"]')
-      .hasText('ns1/namespace-kv/', 'renders second mount selected');
-    assert.dom('[data-test-selected-option="2"]').hasText('ns1', 'renders third mount selected');
-    assert.propEqual(
-      this.config.paths,
-      ['auth/userpass/', 'ns1/namespace-kv/', 'ns1'],
-      'adds all selections to paths'
-    );
-    await searchSelect.deleteButtons.objectAt(0).click();
-    await clickTrigger();
-    assert
-      .dom('.ember-power-select-group')
-      .hasText('Auth Methods auth/userpass/', 'puts auth method back within group');
-    await clickTrigger();
-    await searchSelect.deleteButtons.objectAt(1).click();
-    await clickTrigger();
-    assert.dom('.ember-power-select-group').hasText('Namespaces ns1', 'puts ns back within group');
-    await clickTrigger();
-  });
-
-  test('it renders previously set config.paths when editing the mount config', async function (assert) {
-    this.set('config', { mode: 'allow', paths: ['auth/userpass/'] });
-    this.set('paths', []);
-    await render(hbs`<PathFilterConfigList @config={{this.config}} @paths={{this.paths}} />`, this.context);
-    assert.strictEqual(
-      searchSelect.selectedOptions.objectAt(0).text,
-      'auth/userpass/',
-      'renders config.path as selected on init'
-    );
-    await clickTrigger();
-    assert.strictEqual(findAll('.ember-power-select-group').length, 1, 'renders only remaining group');
-    await searchSelect.deleteButtons.objectAt(0).click();
-    await clickTrigger();
-    assert.strictEqual(findAll('.ember-power-select-group').length, 2, 'renders two groups');
-  });
 });
diff --git a/ui/tests/integration/components/pgp-file-test.js b/ui/tests/integration/components/pgp-file-test.js
index f502332466a90..01fb581773c3f 100644
--- a/ui/tests/integration/components/pgp-file-test.js
+++ b/ui/tests/integration/components/pgp-file-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render, click, fillIn, triggerEvent, waitUntil } from '@ember/test-helpers';
@@ -65,13 +60,9 @@ module('Integration | Component | pgp file', function (hooks) {
     });
     assert.dom('[data-test-pgp-file-input-label]').hasText(file.name, 'the file input shows the file name');
     assert.notDeepEqual(this.lastOnChangeCall[1].value, key.value, 'onChange was called with the new key');
-    assert.strictEqual(this.lastOnChangeCall[0], 0, 'onChange is called with the index value');
+    assert.equal(this.lastOnChangeCall[0], 0, 'onChange is called with the index value');
     await click('[data-test-pgp-clear]');
-    assert.strictEqual(
-      this.lastOnChangeCall[1].value,
-      key.value,
-      'the key gets reset when the input is cleared'
-    );
+    assert.equal(this.lastOnChangeCall[1].value, key.value, 'the key gets reset when the input is cleared');
   });
 
   test('it allows for text entry', async function (assert) {
@@ -94,7 +85,7 @@ module('Integration | Component | pgp file', function (hooks) {
     await waitUntil(() => {
       return !!this.lastOnChangeCall;
     });
-    assert.strictEqual(this.lastOnChangeCall[1].value, text, 'the key value is passed to onChange');
+    assert.equal(this.lastOnChangeCall[1].value, text, 'the key value is passed to onChange');
   });
 
   test('toggling back and forth', async function (assert) {
diff --git a/ui/tests/integration/components/pgp-list-test.js b/ui/tests/integration/components/pgp-list-test.js
index 7828677e0bd81..4a649c1a70194 100644
--- a/ui/tests/integration/components/pgp-list-test.js
+++ b/ui/tests/integration/components/pgp-list-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render, triggerEvent, waitUntil } from '@ember/test-helpers';
@@ -22,7 +17,7 @@ module('Integration | Component | pgp list', function (hooks) {
 
   test('it renders', async function (assert) {
     this.set('listLength', 0);
-    await render(hbs`<PgpList @listLength={{this.listLength}} />`);
+    await render(hbs`<PgpList @listLength={{listLength}} />`);
     assert.dom('[data-test-empty-text]').exists('shows the empty state');
     this.set('listLength', 1);
     assert
@@ -36,7 +31,7 @@ module('Integration | Component | pgp list', function (hooks) {
 
   test('onDataUpdate is called properly', async function (assert) {
     this.set('spy', sinon.spy());
-    const event = fileEvent();
+    let event = fileEvent();
 
     await render(hbs`<PgpList @listLength={{1}} @onDataUpdate={{this.spy}} />`);
     triggerEvent('[data-test-pgp-file-input]', ...event);
@@ -45,7 +40,7 @@ module('Integration | Component | pgp list', function (hooks) {
     await waitUntil(() => {
       return !!this.spy.calledOnce;
     });
-    const expected = [btoa(data)];
+    let expected = [btoa(data)];
     assert.deepEqual(
       this.spy.getCall(0).args[0],
       expected,
@@ -64,7 +59,7 @@ module('Integration | Component | pgp list', function (hooks) {
     await waitUntil(() => {
       return !!this.spy.calledOnce;
     });
-    const expected = [btoa(data), '', ''];
+    let expected = [btoa(data), '', ''];
     assert.deepEqual(
       this.spy.getCall(0).args[0],
       expected,
@@ -76,7 +71,7 @@ module('Integration | Component | pgp list', function (hooks) {
     await waitUntil(() => {
       return !!this.spy.calledTwice;
     });
-    const expected2 = [btoa(data), '', btoa(data)];
+    let expected2 = [btoa(data), '', btoa(data)];
     assert.deepEqual(
       this.spy.getCall(1).args[0],
       expected2,
@@ -86,7 +81,7 @@ module('Integration | Component | pgp list', function (hooks) {
     // this will trim off the last input which was filled, so we should only have one file in the array
     // now
     this.set('listLength', 2);
-    const expected3 = [btoa(data), ''];
+    let expected3 = [btoa(data), ''];
     assert.deepEqual(
       this.spy.getCall(2).args[0],
       expected3,
@@ -105,7 +100,7 @@ module('Integration | Component | pgp list', function (hooks) {
     await waitUntil(() => {
       return !!this.spy.calledOnce;
     });
-    const expected = [btoa(data), '', ''];
+    let expected = [btoa(data), '', ''];
     assert.deepEqual(
       this.spy.getCall(0).args[0],
       expected,
@@ -117,7 +112,7 @@ module('Integration | Component | pgp list', function (hooks) {
     await waitUntil(() => {
       return !!this.spy.calledTwice;
     });
-    const expected2 = [btoa(data), '', btoa(data)];
+    let expected2 = [btoa(data), '', btoa(data)];
     assert.deepEqual(
       this.spy.getCall(1).args[0],
       expected2,
@@ -126,7 +121,7 @@ module('Integration | Component | pgp list', function (hooks) {
 
     // this will add a couple of inputs but should keep the existing 3
     this.set('listLength', 5);
-    const expected3 = [btoa(data), '', btoa(data), '', ''];
+    let expected3 = [btoa(data), '', btoa(data), '', ''];
     assert.deepEqual(
       this.spy.getCall(2).args[0],
       expected3,
diff --git a/ui/tests/integration/components/pki/config-pki-ca-test.js b/ui/tests/integration/components/pki/config-pki-ca-test.js
new file mode 100644
index 0000000000000..541ee9de0956a
--- /dev/null
+++ b/ui/tests/integration/components/pki/config-pki-ca-test.js
@@ -0,0 +1,80 @@
+import { resolve } from 'rsvp';
+import EmberObject from '@ember/object';
+import Service from '@ember/service';
+import { module, test } from 'qunit';
+import { setupRenderingTest } from 'ember-qunit';
+import { render } from '@ember/test-helpers';
+import hbs from 'htmlbars-inline-precompile';
+import { create } from 'ember-cli-page-object';
+import configPki from 'vault/tests/pages/components/pki/config-pki-ca';
+import apiStub from 'vault/tests/helpers/noop-all-api-requests';
+
+const component = create(configPki);
+
+const storeStub = Service.extend({
+  createRecord(type, args) {
+    return EmberObject.create(args, {
+      save() {
+        return resolve(this);
+      },
+      destroyRecord() {},
+      send() {},
+      unloadRecord() {},
+    });
+  },
+});
+
+module('Integration | Component | config pki ca', function (hooks) {
+  setupRenderingTest(hooks);
+
+  hooks.beforeEach(function () {
+    this.server = apiStub();
+    this.owner.lookup('service:flash-messages').registerTypes(['success']);
+    this.owner.register('service:store', storeStub);
+    this.storeService = this.owner.lookup('service:store');
+  });
+
+  hooks.afterEach(function () {
+    this.server.shutdown();
+  });
+
+  const config = function (pem) {
+    return EmberObject.create({
+      pem: pem,
+      backend: 'pki',
+      caChain: 'caChain',
+      der: new Blob(['der'], { type: 'text/plain' }),
+    });
+  };
+
+  const setupAndRender = async function (context, onRefresh) {
+    const refreshFn = onRefresh || function () {};
+    context.set('config', config());
+    context.set('onRefresh', refreshFn);
+    await context.render(hbs`<Pki::ConfigPkiCa @onRefresh={{onRefresh}} @config={{config}} />`);
+  };
+
+  test('it renders, no pem', async function (assert) {
+    await setupAndRender(this);
+
+    assert.notOk(component.hasTitle, 'no title in the default state');
+    assert.equal(component.replaceCAText, 'Configure CA');
+    assert.equal(component.downloadLinks.length, 0, 'there are no download links');
+
+    await component.replaceCA();
+    assert.equal(component.title, 'Configure CA Certificate');
+    await component.back();
+
+    await component.setSignedIntermediateBtn();
+    assert.equal(component.title, 'Set signed intermediate');
+  });
+
+  test('it renders, with pem', async function (assert) {
+    const c = config('pem');
+    this.set('config', c);
+    await render(hbs`<Pki::ConfigPkiCa @config={{config}} />`);
+    assert.notOk(component.hasTitle, 'no title in the default state');
+    assert.equal(component.replaceCAText, 'Add CA');
+    assert.equal(component.downloadLinks.length, 3, 'shows download links');
+  });
+});
diff --git a/ui/tests/integration/components/pki/config-pki-test.js b/ui/tests/integration/components/pki/config-pki-test.js
new file mode 100644
index 0000000000000..ea069ed977fcd
--- /dev/null
+++ b/ui/tests/integration/components/pki/config-pki-test.js
@@ -0,0 +1,145 @@
+import { resolve } from 'rsvp';
+import { module, test } from 'qunit';
+import { setupRenderingTest } from 'ember-qunit';
+import { click, render } from '@ember/test-helpers';
+import hbs from 'htmlbars-inline-precompile';
+import { create } from 'ember-cli-page-object';
+import configPki from 'vault/tests/pages/components/pki/config-pki';
+
+const component = create(configPki);
+
+module('Integration | Component | config pki', function (hooks) {
+  setupRenderingTest(hooks);
+
+  hooks.beforeEach(async function () {
+    this.owner.lookup('service:flash-messages').registerTypes(['success']);
+    this.store = this.owner.lookup('service:store');
+    this.config = await this.store.createRecord('pki/pki-config');
+    this.mockConfigSave = function (saveFn) {
+      const { tidyAttrs, crlAttrs, urlsAttrs } = this.config;
+      return {
+        save: saveFn,
+        rollbackAttributes: () => {},
+        tidyAttrs,
+        crlAttrs,
+        urlsAttrs,
+        set: () => {},
+      };
+    };
+  });
+
+  const setupAndRender = async function (context, config, section = 'tidy') {
+    context.set('config', config);
+    context.set('section', section);
+    await context.render(hbs`<Pki::ConfigPki @section={{section}} @config={{config}} />`);
+  };
+
+  test('it renders tidy section', async function (assert) {
+    await setupAndRender(this, this.config);
+    assert.ok(component.text.startsWith('You can tidy up the backend'));
+    assert.notOk(component.hasTitle, 'No title for tidy section');
+    assert.strictEqual(component.fields.length, 3, 'renders all three tidy fields');
+    assert.ok(component.fields.objectAt(0).labelText, 'Tidy the Certificate Store');
+    assert.ok(component.fields.objectAt(1).labelText, 'Tidy the Revocation List (CRL)');
+    assert.ok(component.fields.objectAt(1).labelText, 'Safety buffer');
+  });
+
+  test('it renders crl section', async function (assert) {
+    await setupAndRender(this, this.config, 'crl');
+    assert.false(this.config.disable, 'CRL config defaults disable=false');
+    assert.ok(component.hasTitle, 'renders form title');
+    assert.strictEqual(component.title, 'Certificate Revocation List (CRL) config');
+    assert.ok(
+      component.text.startsWith('Set the duration for which the generated CRL'),
+      'renders form subtext'
+    );
+    assert
+      .dom('[data-test-ttl-form-label="CRL building enabled"]')
+      .hasText('CRL building enabled', 'renders enabled field title');
+    assert
+      .dom('[data-test-ttl-form-subtext]')
+      .hasText('The CRL will expire after', 'renders enabled field subtext');
+    assert.dom('[data-test-input="expiry"] input').isChecked('defaults to enabling CRL build');
+    assert.dom('[data-test-ttl-value="CRL building enabled"]').hasValue('3', 'default value is 3 (72h)');
+    assert.dom('[data-test-select="ttl-unit"]').hasValue('d', 'default unit value is days');
+    await click('[data-test-input="expiry"] input');
+    assert
+      .dom('[data-test-ttl-form-subtext]')
+      .hasText('The CRL will not be built.', 'renders disabled text when toggled off');
+
+    // assert 'disable' attr on pki-config model updates with toggle
+    assert.true(this.config.disable, 'when toggled off, sets CRL config to disable=true');
+    await click('[data-test-input="expiry"] input');
+    assert
+      .dom('[data-test-ttl-form-subtext]')
+      .hasText('The CRL will expire after', 'toggles back to enabled text');
+    assert.false(this.config.disable, 'CRL config toggles back to disable=false');
+  });
+
+  test('it renders urls section', async function (assert) {
+    await setupAndRender(this, this.config, 'urls');
+    assert.notOk(component.hasTitle, 'No title for urls section');
+    assert.strictEqual(component.fields.length, 3);
+    assert.ok(component.fields.objectAt(0).labelText, 'Issuing certificates');
+    assert.ok(component.fields.objectAt(1).labelText, 'CRL Distribution Points');
+    assert.ok(component.fields.objectAt(2).labelText, 'OCSP Servers');
+  });
+
+  test('it calls save with the correct arguments for tidy', async function (assert) {
+    assert.expect(3);
+    const section = 'tidy';
+    this.set('onRefresh', () => {
+      assert.ok(true, 'refresh called');
+    });
+    this.set(
+      'config',
+      this.mockConfigSave((options) => {
+        assert.strictEqual(options.adapterOptions.method, section, 'method passed to save');
+        assert.deepEqual(
+          options.adapterOptions.fields,
+          ['tidyCertStore', 'tidyRevocationList', 'safetyBuffer'],
+          'tidy fields passed to save'
+        );
+        return resolve();
+      })
+    );
+    this.set('section', section);
+    await render(hbs`<Pki::ConfigPki @section={{section}} @config={{config}} @onRefresh={{onRefresh}} />`);
+
+    component.submit();
+  });
+
+  test('it calls save with the correct arguments for crl', async function (assert) {
+    assert.expect(3);
+    const section = 'crl';
+    this.set('onRefresh', () => {
+      assert.ok(true, 'refresh called');
+    });
+    this.set(
+      'config',
+      this.mockConfigSave((options) => {
+        assert.strictEqual(options.adapterOptions.method, section, 'method passed to save');
+        assert.deepEqual(options.adapterOptions.fields, ['expiry', 'disable'], 'CRL fields passed to save');
+        return resolve();
+      })
+    );
+    this.set('section', section);
+    await render(hbs`<Pki::ConfigPki @section={{section}} @config={{config}} @onRefresh={{onRefresh}} />`);
+    component.submit();
+  });
+
+  test('it correctly sets toggle when initial CRL config is disable=true', async function (assert) {
+    assert.expect(3);
+    // change default config attrs
+    let configDisabled = this.config;
+    configDisabled.expiry = '1m';
+    configDisabled.disable = true;
+    await setupAndRender(this, configDisabled, 'crl');
+    assert.dom('[data-test-input="expiry"] input').isNotChecked('toggle disabled when CRL config disabled');
+    await click('[data-test-input="expiry"] input');
+    assert
+      .dom('[data-test-ttl-value="CRL building enabled"]')
+      .hasValue('1', 'when toggled on shows last set expired value');
+    assert.dom('[data-test-select="ttl-unit"]').hasValue('m', 'when toggled back on shows last set unit');
+  });
+});
diff --git a/ui/tests/integration/components/pki/page/pki-certificate-details-test.js b/ui/tests/integration/components/pki/page/pki-certificate-details-test.js
deleted file mode 100644
index 482e21b816567..0000000000000
--- a/ui/tests/integration/components/pki/page/pki-certificate-details-test.js
+++ /dev/null
@@ -1,122 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { click, render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-import { setupEngine } from 'ember-engines/test-support';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import sinon from 'sinon';
-
-module('Integration | Component | pki | Page::PkiCertificateDetails', function (hooks) {
-  setupRenderingTest(hooks);
-  setupEngine(hooks, 'pki');
-  setupMirage(hooks);
-
-  hooks.beforeEach(function () {
-    const downloadService = this.owner.lookup('service:download');
-    this.downloadSpy = sinon.stub(downloadService, 'pem');
-
-    const routerService = this.owner.lookup('service:router');
-    this.routerSpy = sinon.stub(routerService, 'transitionTo');
-
-    this.owner.lookup('service:secretMountPath').update('pki');
-
-    const store = this.owner.lookup('service:store');
-    const id = '4d:b6:ed:90:d6:b0:d4:bb:8e:5d:73:6a:6f:32:dc:8c:71:7c:db:5f';
-    store.pushPayload('pki/certificate/base', {
-      modelName: 'pki/certificate/base',
-      data: {
-        certificate: '-----BEGIN CERTIFICATE-----',
-        common_name: 'example.com Intermediate Authority',
-        issue_date: 1673540867000,
-        serial_number: id,
-        parsed_certificate: {
-          not_valid_after: 1831220897000,
-          not_valid_before: 1673540867000,
-        },
-      },
-    });
-    this.model = store.peekRecord('pki/certificate/base', id);
-
-    this.server.post('/sys/capabilities-self', () => ({
-      data: {
-        capabilities: ['root'],
-        'pki/revoke': ['root'],
-      },
-    }));
-  });
-
-  test('it should render actions and fields', async function (assert) {
-    assert.expect(6);
-
-    this.server.post('/pki/revoke', (schema, req) => {
-      const data = JSON.parse(req.requestBody);
-      assert.strictEqual(
-        data.serial_number,
-        this.model.serialNumber,
-        'Revoke request made with serial number'
-      );
-      return {
-        data: {
-          revocation_time: 1673972804,
-          revocation_time_rfc3339: '2023-01-17T16:26:44.960933411Z',
-        },
-      };
-    });
-
-    await render(hbs`<Page::PkiCertificateDetails @model={{this.model}} />`, { owner: this.engine });
-    assert
-      .dom('[data-test-component="info-table-row"]')
-      .exists({ count: 5 }, 'Correct number of fields render when certificate has not been revoked');
-    assert
-      .dom('[data-test-value-div="Certificate"] [data-test-masked-input]')
-      .exists('Masked input renders for certificate');
-    assert.dom('[data-test-value-div="Serial number"] code').exists('Serial number renders as monospace');
-
-    await click('[data-test-pki-cert-download-button]');
-    const { serialNumber, certificate } = this.model;
-    assert.ok(
-      this.downloadSpy.calledWith(serialNumber.replace(/(\s|:)+/g, '-'), certificate),
-      'Download pem method called with correct args'
-    );
-
-    await click('[data-test-confirm-action-trigger]');
-    await click('[data-test-confirm-button]');
-
-    assert.dom('[data-test-value-div="Revocation time"]').exists('Revocation time is displayed');
-  });
-
-  test('it should render back button', async function (assert) {
-    assert.expect(1);
-
-    this.cancel = () => assert.ok('onBack action is triggered');
-
-    await render(hbs`<Page::PkiCertificateDetails @model={{this.model}} @onBack={{this.cancel}} />`, {
-      owner: this.engine,
-    });
-    await click('[data-test-pki-cert-details-back]');
-  });
-
-  test('it should send action on revoke if provided', async function (assert) {
-    assert.expect(1);
-
-    this.server.post('/pki/revoke', () => ({
-      data: {
-        revocation_time: 1673972804,
-        revocation_time_rfc3339: '2023-01-17T16:26:44.960933411Z',
-      },
-    }));
-
-    this.revoked = () => assert.ok('onRevoke action is triggered');
-
-    await render(hbs`<Page::PkiCertificateDetails @model={{this.model}} @onRevoke={{this.revoked}} />`, {
-      owner: this.engine,
-    });
-    await click('[data-test-confirm-action-trigger]');
-    await click('[data-test-confirm-button]');
-  });
-});
diff --git a/ui/tests/integration/components/pki/page/pki-configuration-details-test.js b/ui/tests/integration/components/pki/page/pki-configuration-details-test.js
deleted file mode 100644
index 0e0b1b490673c..0000000000000
--- a/ui/tests/integration/components/pki/page/pki-configuration-details-test.js
+++ /dev/null
@@ -1,255 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-import { setupEngine } from 'ember-engines/test-support';
-
-const SELECTORS = {
-  rowLabel: (attr) => `[data-test-row-label="${attr}"]`,
-  rowValue: (attr) => `[data-test-value-div="${attr}"]`,
-  rowIcon: (attr, icon) => `[data-test-row-value="${attr}"] [data-test-icon="${icon}"]`,
-};
-
-module('Integration | Component | Page::PkiConfigurationDetails', function (hooks) {
-  setupRenderingTest(hooks);
-  setupEngine(hooks, 'pki');
-
-  hooks.beforeEach(function () {
-    this.secretMountPath = this.owner.lookup('service:secret-mount-path');
-    this.secretMountPath.currentPath = 'pki-test';
-
-    this.store = this.owner.lookup('service:store');
-    this.cluster = this.store.createRecord('pki/config/cluster', {
-      id: 'pki-test',
-      path: 'https://pr-a.vault.example.com/v1/ns1/pki-root',
-    });
-    this.urls = this.store.createRecord('pki/config/urls', {
-      id: 'pki-test',
-      issuingCertificates: 'example.com',
-    });
-    this.crl = this.store.createRecord('pki/config/crl', {
-      id: 'pki-test',
-      expiry: '20h',
-      disable: false,
-      autoRebuild: true,
-      autoRebuildGracePeriod: '13h',
-      enableDelta: true,
-      deltaRebuildInterval: '15m',
-      ocspExpiry: '77h',
-      ocspDisable: false,
-      crossClusterRevocation: true,
-      unifiedCrl: true,
-      unifiedCrlOnExistingPaths: true,
-    });
-    this.mountConfig = {
-      id: 'pki-test',
-      engineType: 'pki',
-      path: '/pki-test',
-      accessor: 'pki_33345b0d',
-      local: false,
-      sealWrap: true,
-      config: this.store.createRecord('mount-config', {
-        defaultLease: '12h',
-        maxLeaseTtl: '400h',
-        allowedManagedKeys: true,
-      }),
-    };
-  });
-
-  test('shows the correct information on cluster config', async function (assert) {
-    await render(hbs`<Page::PkiConfigurationDetails @cluster={{this.cluster}} @hasConfig={{true}} />,`, {
-      owner: this.engine,
-    });
-
-    assert
-      .dom(SELECTORS.rowValue("Mount's API path"))
-      .hasText('https://pr-a.vault.example.com/v1/ns1/pki-root', 'mount API path row renders');
-    assert.dom(SELECTORS.rowValue('AIA path')).hasText('None', "renders 'None' when no data");
-  });
-
-  test('shows the correct information on global urls section', async function (assert) {
-    await render(
-      hbs`<Page::PkiConfigurationDetails @urls={{this.urls}} @crl={{this.crl}} @mountConfig={{this.mountConfig}} @hasConfig={{true}} />,`,
-      { owner: this.engine }
-    );
-
-    assert
-      .dom(SELECTORS.rowLabel('Issuing certificates'))
-      .hasText('Issuing certificates', 'issuing certificate row label renders');
-    assert
-      .dom(SELECTORS.rowValue('Issuing certificates'))
-      .hasText('example.com', 'issuing certificate value renders');
-    this.urls.issuingCertificates = null;
-    await render(
-      hbs`<Page::PkiConfigurationDetails @urls={{this.urls}} @crl={{this.crl}} @mountConfig={{this.mountConfig}} @hasConfig={{true}} />,`,
-      { owner: this.engine }
-    );
-    assert
-      .dom(SELECTORS.rowValue('Issuing certificates'))
-      .hasText('None', 'issuing certificate value renders None if none is configured');
-    assert
-      .dom(SELECTORS.rowLabel('CRL distribution points'))
-      .hasText('CRL distribution points', 'crl distribution points row label renders');
-    assert
-      .dom(SELECTORS.rowValue('CRL distribution points'))
-      .hasText('None', 'crl distribution points value renders None if none is configured');
-  });
-
-  test('shows the correct information on crl section', async function (assert) {
-    await render(
-      hbs`<Page::PkiConfigurationDetails @urls={{this.urls}} @crl={{this.crl}} @mountConfig={{this.mountConfig}} @hasConfig={{true}} />,`,
-      { owner: this.engine }
-    );
-
-    assert.dom(SELECTORS.rowLabel('CRL building')).hasText('CRL building', 'crl expiry row label renders');
-    assert.dom(SELECTORS.rowValue('CRL building')).hasText('Enabled', 'enabled renders');
-    assert.dom(SELECTORS.rowValue('Expiry')).hasText('20h', 'expiry value renders');
-    assert.dom(SELECTORS.rowLabel('Auto-rebuild')).hasText('Auto-rebuild', 'auto rebuild label renders');
-    assert.dom(SELECTORS.rowValue('Auto-rebuild')).hasText('On', 'it renders truthy auto build');
-    assert.dom(SELECTORS.rowIcon('Auto-rebuild', 'check-circle'));
-    assert
-      .dom(SELECTORS.rowValue('Auto-rebuild grace period'))
-      .hasText('13h', 'it renders auto build grace period');
-    assert.dom(SELECTORS.rowValue('Delta CRL building')).hasText('On', 'it renders truthy delta crl build');
-    assert.dom(SELECTORS.rowIcon('Delta CRL building', 'check-circle'));
-    assert
-      .dom(SELECTORS.rowValue('Delta rebuild interval'))
-      .hasText('15m', 'it renders delta build duration');
-    assert
-      .dom(SELECTORS.rowValue('Responder APIs'))
-      .hasText('Enabled', 'responder apis value renders Enabled if oscp_disable=false');
-    assert.dom(SELECTORS.rowValue('Interval')).hasText('77h', 'interval value renders');
-    // check falsy aut_rebuild and _enable_delta hides duration values
-    this.crl.autoRebuild = false;
-    this.crl.enableDelta = false;
-    await render(
-      hbs`<Page::PkiConfigurationDetails @urls={{this.urls}} @crl={{this.crl}} @mountConfig={{this.mountConfig}} @hasConfig={{true}} />,`,
-      { owner: this.engine }
-    );
-    assert.dom(SELECTORS.rowValue('Auto-rebuild')).hasText('Off', 'it renders falsy auto build');
-    assert.dom(SELECTORS.rowIcon('Auto-rebuild', 'x-square'));
-    assert
-      .dom(SELECTORS.rowValue('Auto-rebuild grace period'))
-      .doesNotExist('does not render auto-rebuild grace period');
-    assert.dom(SELECTORS.rowValue('Delta CRL building')).hasText('Off', 'it renders falsy delta cr build');
-    assert.dom(SELECTORS.rowIcon('Delta CRL building', 'x-square'));
-    assert
-      .dom(SELECTORS.rowValue('Delta rebuild interval'))
-      .doesNotExist('does not render delta rebuild duration');
-
-    // check falsy disable and ocsp_disable hides duration values and other params
-    this.crl.autoRebuild = true;
-    this.crl.enableDelta = true;
-    this.crl.disable = true;
-    this.crl.ocspDisable = true;
-    await render(
-      hbs`<Page::PkiConfigurationDetails @urls={{this.urls}} @crl={{this.crl}} @mountConfig={{this.mountConfig}} @hasConfig={{true}} />,`,
-      { owner: this.engine }
-    );
-    assert.dom(SELECTORS.rowValue('CRL building')).hasText('Disabled', 'disabled renders');
-    assert.dom(SELECTORS.rowValue('Expiry')).doesNotExist();
-    assert
-      .dom(SELECTORS.rowValue('Responder APIs'))
-      .hasText('Disabled', 'responder apis value renders Disabled');
-    assert.dom(SELECTORS.rowValue('Interval')).doesNotExist();
-    assert.dom(SELECTORS.rowValue('Auto-rebuild')).doesNotExist();
-    assert.dom(SELECTORS.rowValue('Auto-rebuild grace period')).doesNotExist();
-    assert.dom(SELECTORS.rowValue('Delta CRL building')).doesNotExist();
-    assert.dom(SELECTORS.rowValue('Delta rebuild interval')).doesNotExist();
-  });
-
-  test('it renders enterprise params in crl section', async function (assert) {
-    this.version = this.owner.lookup('service:version');
-    this.version.version = '1.13.1+ent';
-    await render(
-      hbs`<Page::PkiConfigurationDetails @urls={{this.urls}} @crl={{this.crl}} @mountConfig={{this.mountConfig}} @hasConfig={{true}} />,`,
-      { owner: this.engine }
-    );
-    assert.dom(SELECTORS.rowValue('Cross-cluster revocation')).hasText('Yes');
-    assert.dom(SELECTORS.rowIcon('Cross-cluster revocation', 'check-circle'));
-    assert.dom(SELECTORS.rowValue('Unified CRL')).hasText('Yes');
-    assert.dom(SELECTORS.rowIcon('Unified CRL', 'check-circle'));
-    assert.dom(SELECTORS.rowValue('Unified CRL on existing paths')).hasText('Yes');
-    assert.dom(SELECTORS.rowIcon('Unified CRL on existing paths', 'check-circle'));
-  });
-
-  test('it does not render enterprise params in crl section', async function (assert) {
-    this.version = this.owner.lookup('service:version');
-    this.version.version = '1.13.1';
-    await render(
-      hbs`<Page::PkiConfigurationDetails @urls={{this.urls}} @crl={{this.crl}} @mountConfig={{this.mountConfig}} @hasConfig={{true}} />,`,
-      { owner: this.engine }
-    );
-    assert.dom(SELECTORS.rowValue('Cross-cluster revocation')).doesNotExist();
-    assert.dom(SELECTORS.rowValue('Unified CRL')).doesNotExist();
-    assert.dom(SELECTORS.rowValue('Unified CRL on existing paths')).doesNotExist();
-  });
-
-  test('shows the correct information on mount configuration section', async function (assert) {
-    await render(
-      hbs`<Page::PkiConfigurationDetails @urls={{this.urls}} @crl={{this.crl}} @mountConfig={{this.mountConfig}} @hasConfig={{true}} />,`,
-      { owner: this.engine }
-    );
-
-    assert
-      .dom(SELECTORS.rowLabel('Secret engine type'))
-      .hasText('Secret engine type', 'engine type row label renders');
-    assert.dom(SELECTORS.rowValue('Secret engine type')).hasText('pki', 'engine type row value renders');
-    assert.dom(SELECTORS.rowLabel('Path')).hasText('Path', 'path row label renders');
-    assert.dom(SELECTORS.rowValue('Path')).hasText('/pki-test', 'path row value renders');
-    assert.dom(SELECTORS.rowLabel('Accessor')).hasText('Accessor', 'accessor row label renders');
-    assert.dom(SELECTORS.rowValue('Accessor')).hasText('pki_33345b0d', 'accessor row value renders');
-    assert.dom(SELECTORS.rowLabel('Local')).hasText('Local', 'local row label renders');
-    assert.dom(SELECTORS.rowValue('Local')).hasText('No', 'local row value renders');
-    assert.dom(SELECTORS.rowLabel('Seal wrap')).hasText('Seal wrap', 'seal wrap row label renders');
-    assert
-      .dom(SELECTORS.rowValue('Seal wrap'))
-      .hasText('Yes', 'seal wrap row value renders Yes if sealWrap is true');
-    assert.dom(SELECTORS.rowLabel('Max lease TTL')).hasText('Max lease TTL', 'max lease label renders');
-    assert.dom(SELECTORS.rowValue('Max lease TTL')).hasText('400h', 'max lease value renders');
-    assert
-      .dom(SELECTORS.rowLabel('Allowed managed keys'))
-      .hasText('Allowed managed keys', 'allowed managed keys label renders');
-    assert
-      .dom(SELECTORS.rowValue('Allowed managed keys'))
-      .hasText('Yes', 'allowed managed keys value renders');
-  });
-
-  test('shows mount configuration when hasConfig is false', async function (assert) {
-    this.urls = 403;
-    this.crl = 403;
-
-    await render(
-      hbs`<Page::PkiConfigurationDetails @mountConfig={{this.mountConfig}} @hasConfig={{false}} />,`,
-      { owner: this.engine }
-    );
-
-    assert
-      .dom(SELECTORS.rowLabel('Secret engine type'))
-      .hasText('Secret engine type', 'engine type row label renders');
-    assert.dom(SELECTORS.rowValue('Secret engine type')).hasText('pki', 'engine type row value renders');
-    assert.dom(SELECTORS.rowLabel('Path')).hasText('Path', 'path row label renders');
-    assert.dom(SELECTORS.rowValue('Path')).hasText('/pki-test', 'path row value renders');
-    assert.dom(SELECTORS.rowLabel('Accessor')).hasText('Accessor', 'accessor row label renders');
-    assert.dom(SELECTORS.rowValue('Accessor')).hasText('pki_33345b0d', 'accessor row value renders');
-    assert.dom(SELECTORS.rowLabel('Local')).hasText('Local', 'local row label renders');
-    assert.dom(SELECTORS.rowValue('Local')).hasText('No', 'local row value renders');
-    assert.dom(SELECTORS.rowLabel('Seal wrap')).hasText('Seal wrap', 'seal wrap row label renders');
-    assert
-      .dom(SELECTORS.rowValue('Seal wrap'))
-      .hasText('Yes', 'seal wrap row value renders Yes if sealWrap is true');
-    assert.dom(SELECTORS.rowLabel('Max lease TTL')).hasText('Max lease TTL', 'max lease label renders');
-    assert.dom(SELECTORS.rowValue('Max lease TTL')).hasText('400h', 'max lease value renders');
-    assert
-      .dom(SELECTORS.rowLabel('Allowed managed keys'))
-      .hasText('Allowed managed keys', 'allowed managed keys label renders');
-    assert
-      .dom(SELECTORS.rowValue('Allowed managed keys'))
-      .hasText('Yes', 'allowed managed keys value renders');
-  });
-});
diff --git a/ui/tests/integration/components/pki/page/pki-configuration-edit-test.js b/ui/tests/integration/components/pki/page/pki-configuration-edit-test.js
deleted file mode 100644
index 571021c54b071..0000000000000
--- a/ui/tests/integration/components/pki/page/pki-configuration-edit-test.js
+++ /dev/null
@@ -1,404 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'vault/tests/helpers';
-import { click, fillIn, render } from '@ember/test-helpers';
-import { setupEngine } from 'ember-engines/test-support';
-import { hbs } from 'ember-cli-htmlbars';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import { SELECTORS } from 'vault/tests/helpers/pki/page/pki-configuration-edit';
-import sinon from 'sinon';
-import { allowAllCapabilitiesStub } from 'vault/tests/helpers/stubs';
-
-module('Integration | Component | page/pki-configuration-edit', function (hooks) {
-  setupRenderingTest(hooks);
-  setupEngine(hooks, 'pki');
-  setupMirage(hooks);
-
-  hooks.beforeEach(async function () {
-    this.server.post('/sys/capabilities-self', allowAllCapabilitiesStub());
-    this.context = { owner: this.engine }; // this.engine set by setupEngine
-    this.store = this.owner.lookup('service:store');
-    this.cancelSpy = sinon.spy();
-    this.backend = 'pki-engine';
-    // both models only use findRecord. API parameters for pki/crl
-    // are set by default backend values when the engine is mounted
-    this.store.pushPayload('pki/config/cluster', {
-      modelName: 'pki/config/cluster',
-      id: this.backend,
-    });
-    this.store.pushPayload('pki/config/acme', {
-      modelName: 'pki/config/acme',
-      id: this.backend,
-    });
-    this.store.pushPayload('pki/config/crl', {
-      modelName: 'pki/config/crl',
-      id: this.backend,
-      auto_rebuild: false,
-      auto_rebuild_grace_period: '12h',
-      delta_rebuild_interval: '15m',
-      disable: false,
-      enable_delta: false,
-      expiry: '72h',
-      ocsp_disable: false,
-      ocsp_expiry: '12h',
-    });
-    this.store.pushPayload('pki/config/urls', {
-      modelName: 'pki/config/urls',
-      id: this.backend,
-      issuing_certificates: ['hashicorp.com'],
-      crl_distribution_points: ['some-crl-distribution.com'],
-      ocsp_servers: ['ocsp-stuff.com'],
-    });
-    this.acme = this.store.peekRecord('pki/config/acme', this.backend);
-    this.cluster = this.store.peekRecord('pki/config/cluster', this.backend);
-    this.crl = this.store.peekRecord('pki/config/crl', this.backend);
-    this.urls = this.store.peekRecord('pki/config/urls', this.backend);
-  });
-
-  test('it renders with config data and updates config', async function (assert) {
-    assert.expect(32);
-    this.server.post(`/${this.backend}/config/acme`, (schema, req) => {
-      assert.ok(true, 'request made to save acme config');
-      assert.propEqual(
-        JSON.parse(req.requestBody),
-        {
-          allowed_issuers: ['*'],
-          allowed_roles: ['my-role'],
-          dns_resolver: 'some-dns',
-          eab_policy: 'new-account-required',
-          enabled: true,
-        },
-        'it updates acme config model attributes'
-      );
-    });
-    this.server.post(`/${this.backend}/config/cluster`, (schema, req) => {
-      assert.ok(true, 'request made to save cluster config');
-      assert.propEqual(
-        JSON.parse(req.requestBody),
-        {
-          path: 'https://pr-a.vault.example.com/v1/ns1/pki-root',
-          aia_path: 'http://another-path.com',
-        },
-        'it updates cluster config model attributes'
-      );
-    });
-    this.server.post(`/${this.backend}/config/crl`, (schema, req) => {
-      assert.ok(true, 'request made to save crl config');
-      assert.propEqual(
-        JSON.parse(req.requestBody),
-        {
-          auto_rebuild: true,
-          auto_rebuild_grace_period: '24h',
-          delta_rebuild_interval: '45m',
-          disable: false,
-          enable_delta: true,
-          expiry: '1152h',
-          ocsp_disable: false,
-          ocsp_expiry: '24h',
-        },
-        'it updates crl config model attributes'
-      );
-    });
-    this.server.post(`/${this.backend}/config/urls`, (schema, req) => {
-      assert.ok(true, 'request made to save urls config');
-      assert.propEqual(
-        JSON.parse(req.requestBody),
-        {
-          crl_distribution_points: ['test-crl.com'],
-          issuing_certificates: ['update-hashicorp.com'],
-          ocsp_servers: ['ocsp.com'],
-        },
-        'it updates url config model attributes'
-      );
-    });
-    await render(
-      hbs`
-      <Page::PkiConfigurationEdit
-        @acme={{this.acme}}
-        @cluster={{this.cluster}}
-        @urls={{this.urls}}
-        @crl={{this.crl}}
-        @backend={{this.backend}}
-      />
-    `,
-      this.context
-    );
-
-    assert.dom(SELECTORS.configEditSection).exists('renders config section');
-    assert.dom(SELECTORS.urlsEditSection).exists('renders urls section');
-    assert.dom(SELECTORS.crlEditSection).exists('renders crl section');
-    assert.dom(SELECTORS.cancelButton).exists();
-    this.urls.eachAttribute((name) => {
-      assert.dom(SELECTORS.urlFieldInput(name)).exists(`renders ${name} input`);
-    });
-    assert.dom(SELECTORS.urlFieldInput('issuingCertificates')).hasValue('hashicorp.com');
-    assert.dom(SELECTORS.urlFieldInput('crlDistributionPoints')).hasValue('some-crl-distribution.com');
-    assert.dom(SELECTORS.urlFieldInput('ocspServers')).hasValue('ocsp-stuff.com');
-
-    // cluster config
-    await fillIn(SELECTORS.configInput('path'), 'https://pr-a.vault.example.com/v1/ns1/pki-root');
-    await fillIn(SELECTORS.configInput('aiaPath'), 'http://another-path.com');
-
-    // acme config;
-    await click(SELECTORS.configInput('enabled'));
-    await fillIn(SELECTORS.stringListInput('allowedRoles'), 'my-role');
-    await fillIn(SELECTORS.stringListInput('allowedIssuers'), '*');
-    await fillIn(SELECTORS.configInput('eabPolicy'), 'new-account-required');
-    await fillIn(SELECTORS.configInput('dnsResolver'), 'some-dns');
-
-    // urls
-    await fillIn(SELECTORS.urlFieldInput('issuingCertificates'), 'update-hashicorp.com');
-    await fillIn(SELECTORS.urlFieldInput('crlDistributionPoints'), 'test-crl.com');
-    await fillIn(SELECTORS.urlFieldInput('ocspServers'), 'ocsp.com');
-
-    // confirm default toggle state and text
-    this.crl.eachAttribute((name, { options }) => {
-      if (['expiry', 'ocspExpiry'].includes(name)) {
-        assert.dom(SELECTORS.crlToggleInput(name)).isChecked(`${name} defaults to toggled on`);
-        assert.dom(SELECTORS.crlFieldLabel(name)).hasTextContaining(options.label);
-        assert.dom(SELECTORS.crlFieldLabel(name)).hasTextContaining(options.helperTextEnabled);
-      }
-      if (['autoRebuildGracePeriod', 'deltaRebuildInterval'].includes(name)) {
-        assert.dom(SELECTORS.crlToggleInput(name)).isNotChecked(`${name} defaults off`);
-        assert.dom(SELECTORS.crlFieldLabel(name)).hasTextContaining(options.labelDisabled);
-        assert.dom(SELECTORS.crlFieldLabel(name)).hasTextContaining(options.helperTextDisabled);
-      }
-    });
-
-    // toggle everything on
-    await click(SELECTORS.crlToggleInput('autoRebuildGracePeriod'));
-    assert
-      .dom(SELECTORS.crlFieldLabel('autoRebuildGracePeriod'))
-      .hasTextContaining(
-        'Auto-rebuild on Vault will rebuild the CRL in the below grace period before expiration',
-        'it renders auto rebuild toggled on text'
-      );
-    await click(SELECTORS.crlToggleInput('deltaRebuildInterval'));
-    assert
-      .dom(SELECTORS.crlFieldLabel('deltaRebuildInterval'))
-      .hasTextContaining(
-        'Delta CRL building on Vault will rebuild the delta CRL at the interval below:',
-        'it renders delta crl build toggled on text'
-      );
-
-    // assert ttl values update model attributes
-    await fillIn(SELECTORS.crlTtlInput('Expiry'), '48');
-    await fillIn(SELECTORS.crlTtlInput('Auto-rebuild on'), '24');
-    await fillIn(SELECTORS.crlTtlInput('Delta CRL building on'), '45');
-    await fillIn(SELECTORS.crlTtlInput('OCSP responder APIs enabled'), '24');
-
-    await click(SELECTORS.saveButton);
-  });
-
-  test('it removes urls and sends false crl values', async function (assert) {
-    assert.expect(8);
-    this.server.post(`/${this.backend}/config/acme`, () => {});
-    this.server.post(`/${this.backend}/config/cluster`, () => {});
-    this.server.post(`/${this.backend}/config/crl`, (schema, req) => {
-      assert.ok(true, 'request made to save crl config');
-      assert.propEqual(
-        JSON.parse(req.requestBody),
-        {
-          auto_rebuild: false,
-          auto_rebuild_grace_period: '12h',
-          delta_rebuild_interval: '15m',
-          disable: true,
-          enable_delta: false,
-          expiry: '72h',
-          ocsp_disable: true,
-          ocsp_expiry: '12h',
-        },
-        'crl payload has correct data'
-      );
-    });
-    this.server.post(`/${this.backend}/config/urls`, (schema, req) => {
-      assert.ok(true, 'request made to save urls config');
-      assert.propEqual(
-        JSON.parse(req.requestBody),
-        {
-          crl_distribution_points: [],
-          issuing_certificates: [],
-          ocsp_servers: [],
-        },
-        'url payload has empty arrays'
-      );
-    });
-    await render(
-      hbs`
-      <Page::PkiConfigurationEdit
-        @acme={{this.acme}}
-        @cluster={{this.cluster}}
-        @urls={{this.urls}}
-        @crl={{this.crl}}
-        @backend={{this.backend}}
-      />
-    `,
-      this.context
-    );
-
-    await click(SELECTORS.deleteButton('issuingCertificates'));
-    await click(SELECTORS.deleteButton('crlDistributionPoints'));
-    await click(SELECTORS.deleteButton('ocspServers'));
-
-    // toggle everything off
-    await click(SELECTORS.crlToggleInput('expiry'));
-    assert.dom(SELECTORS.crlFieldLabel('expiry')).hasText('No expiry The CRL will not be built.');
-    assert
-      .dom(SELECTORS.crlToggleInput('autoRebuildGracePeriod'))
-      .doesNotExist('expiry off hides the auto rebuild toggle');
-    assert
-      .dom(SELECTORS.crlToggleInput('deltaRebuildInterval'))
-      .doesNotExist('expiry off hides delta crl toggle');
-    await click(SELECTORS.crlToggleInput('ocspExpiry'));
-    assert
-      .dom(SELECTORS.crlFieldLabel('ocspExpiry'))
-      .hasTextContaining(
-        'OCSP responder APIs disabled Requests cannot be made to check if an individual certificate is valid.',
-        'it renders correct toggled off text'
-      );
-
-    await click(SELECTORS.saveButton);
-  });
-
-  test('it renders enterprise only params', async function (assert) {
-    assert.expect(6);
-    this.version = this.owner.lookup('service:version');
-    this.version.version = '1.13.1+ent';
-    this.server.post(`/${this.backend}/config/acme`, () => {});
-    this.server.post(`/${this.backend}/config/cluster`, () => {});
-    this.server.post(`/${this.backend}/config/crl`, (schema, req) => {
-      assert.ok(true, 'request made to save crl config');
-      assert.propEqual(
-        JSON.parse(req.requestBody),
-        {
-          auto_rebuild: false,
-          auto_rebuild_grace_period: '12h',
-          delta_rebuild_interval: '15m',
-          disable: false,
-          enable_delta: false,
-          expiry: '72h',
-          ocsp_disable: false,
-          ocsp_expiry: '12h',
-          cross_cluster_revocation: true,
-          unified_crl: true,
-          unified_crl_on_existing_paths: true,
-        },
-        'crl payload includes enterprise params'
-      );
-    });
-    this.server.post(`/${this.backend}/config/urls`, () => {
-      assert.ok(true, 'request made to save urls config');
-    });
-    await render(
-      hbs`
-      <Page::PkiConfigurationEdit
-        @acme={{this.acme}}
-        @cluster={{this.cluster}}
-        @urls={{this.urls}}
-        @crl={{this.crl}}
-        @backend={{this.backend}}
-      />
-    `,
-      this.context
-    );
-
-    assert.dom(SELECTORS.groupHeader('Certificate Revocation List (CRL)')).exists();
-    assert.dom(SELECTORS.groupHeader('Online Certificate Status Protocol (OCSP)')).exists();
-    assert.dom(SELECTORS.groupHeader('Unified Revocation')).exists();
-    await click(SELECTORS.checkboxInput('crossClusterRevocation'));
-    await click(SELECTORS.checkboxInput('unifiedCrl'));
-    await click(SELECTORS.checkboxInput('unifiedCrlOnExistingPaths'));
-    await click(SELECTORS.saveButton);
-  });
-
-  test('it does not render enterprise only params for OSS', async function (assert) {
-    assert.expect(9);
-    this.version = this.owner.lookup('service:version');
-    this.version.version = '1.13.1';
-    this.server.post(`/${this.backend}/config/acme`, () => {});
-    this.server.post(`/${this.backend}/config/cluster`, () => {});
-    this.server.post(`/${this.backend}/config/crl`, (schema, req) => {
-      assert.ok(true, 'request made to save crl config');
-      assert.propEqual(
-        JSON.parse(req.requestBody),
-        {
-          auto_rebuild: false,
-          auto_rebuild_grace_period: '12h',
-          delta_rebuild_interval: '15m',
-          disable: false,
-          enable_delta: false,
-          expiry: '72h',
-          ocsp_disable: false,
-          ocsp_expiry: '12h',
-        },
-        'crl payload does not include enterprise params'
-      );
-    });
-    this.server.post(`/${this.backend}/config/urls`, () => {
-      assert.ok(true, 'request made to save urls config');
-    });
-    await render(
-      hbs`
-      <Page::PkiConfigurationEdit
-        @acme={{this.acme}}
-        @cluster={{this.cluster}}
-        @urls={{this.urls}}
-        @crl={{this.crl}}
-        @backend={{this.backend}}
-      />
-    `,
-      this.context
-    );
-
-    assert.dom(SELECTORS.checkboxInput('crossClusterRevocation')).doesNotExist();
-    assert.dom(SELECTORS.checkboxInput('unifiedCrl')).doesNotExist();
-    assert.dom(SELECTORS.checkboxInput('unifiedCrlOnExistingPaths')).doesNotExist();
-    assert.dom(SELECTORS.groupHeader('Certificate Revocation List (CRL)')).exists();
-    assert.dom(SELECTORS.groupHeader('Online Certificate Status Protocol (OCSP)')).exists();
-    assert.dom(SELECTORS.groupHeader('Unified Revocation')).doesNotExist();
-    await click(SELECTORS.saveButton);
-  });
-
-  test('it renders empty states if no update capabilities', async function (assert) {
-    assert.expect(4);
-    this.server.post('/sys/capabilities-self', allowAllCapabilitiesStub(['read']));
-
-    await render(
-      hbs`
-      <Page::PkiConfigurationEdit
-        @acme={{this.acme}}
-        @cluster={{this.cluster}}
-        @urls={{this.urls}}
-        @crl={{this.crl}}
-        @backend={{this.backend}}
-      />
-    `,
-      this.context
-    );
-
-    assert
-      .dom(`${SELECTORS.configEditSection} [data-test-component="empty-state"]`)
-      .hasText(
-        "You do not have permission to set this mount's the cluster config Ask your administrator if you think you should have access to: POST /pki-engine/config/cluster"
-      );
-    assert
-      .dom(`${SELECTORS.acmeEditSection} [data-test-component="empty-state"]`)
-      .hasText(
-        "You do not have permission to set this mount's ACME config Ask your administrator if you think you should have access to: POST /pki-engine/config/acme"
-      );
-    assert
-      .dom(`${SELECTORS.urlsEditSection} [data-test-component="empty-state"]`)
-      .hasText(
-        "You do not have permission to set this mount's URLs Ask your administrator if you think you should have access to: POST /pki-engine/config/urls"
-      );
-    assert
-      .dom(`${SELECTORS.crlEditSection} [data-test-component="empty-state"]`)
-      .hasText(
-        "You do not have permission to set this mount's revocation configuration Ask your administrator if you think you should have access to: POST /pki-engine/config/crl"
-      );
-  });
-});
diff --git a/ui/tests/integration/components/pki/page/pki-configure-create-test.js b/ui/tests/integration/components/pki/page/pki-configure-create-test.js
deleted file mode 100644
index cd3baef92ba21..0000000000000
--- a/ui/tests/integration/components/pki/page/pki-configure-create-test.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'vault/tests/helpers';
-import { click, render } from '@ember/test-helpers';
-import { setupEngine } from 'ember-engines/test-support';
-import { hbs } from 'ember-cli-htmlbars';
-import { SELECTORS } from 'vault/tests/helpers/pki/pki-configure-create';
-import sinon from 'sinon';
-
-module('Integration | Component | page/pki-configure-create', function (hooks) {
-  setupRenderingTest(hooks);
-  setupEngine(hooks, 'pki');
-
-  hooks.beforeEach(function () {
-    this.context = { owner: this.engine }; // this.engine set by setupEngine
-    this.store = this.owner.lookup('service:store');
-    this.cancelSpy = sinon.spy();
-    this.breadcrumbs = [
-      { label: 'secrets', route: 'secrets', linkExternal: true },
-      { label: 'pki', route: 'overview' },
-      { label: 'configure' },
-    ];
-    this.config = this.store.createRecord('pki/action');
-    this.urls = this.store.createRecord('pki/config/urls');
-  });
-
-  test('it renders', async function (assert) {
-    await render(
-      hbs`
-      <Page::PkiConfigureCreate
-        @breadcrumbs={{this.breadcrumbs}}
-        @config={{this.config}}
-        @urls={{this.urls}}
-        @onCancel={{this.cancelSpy}}
-      />
-    `,
-      this.context
-    );
-    assert.dom(SELECTORS.breadcrumbContainer).exists('breadcrumbs exist');
-    assert.dom(SELECTORS.title).hasText('Configure PKI');
-    assert.dom(SELECTORS.option).exists({ count: 3 }, 'Three configuration options are shown');
-    assert.dom(SELECTORS.cancelButton).exists('Cancel link is shown');
-    assert.dom(SELECTORS.saveButton).isDisabled('Done button is disabled');
-
-    await click(SELECTORS.optionByKey('import'));
-    assert.dom(SELECTORS.optionByKey('import')).isChecked('Selected item is checked');
-
-    await click(SELECTORS.optionByKey('generate-csr'));
-    assert.dom(SELECTORS.optionByKey('generate-csr')).isChecked('Selected item is checked');
-
-    await click(SELECTORS.optionByKey('generate-root'));
-    assert.dom(SELECTORS.optionByKey('generate-root')).isChecked('Selected item is checked');
-
-    await click(SELECTORS.generateRootCancel);
-    assert.ok(this.cancelSpy.calledOnce);
-  });
-});
diff --git a/ui/tests/integration/components/pki/page/pki-issuer-edit-test.js b/ui/tests/integration/components/pki/page/pki-issuer-edit-test.js
deleted file mode 100644
index 991b8e8b6794c..0000000000000
--- a/ui/tests/integration/components/pki/page/pki-issuer-edit-test.js
+++ /dev/null
@@ -1,150 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { click, fillIn, render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-import { setupEngine } from 'ember-engines/test-support';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import { Response } from 'miragejs';
-import sinon from 'sinon';
-
-const selectors = {
-  name: '[data-test-input="issuerName"]',
-  leaf: '[data-test-field="leafNotAfterBehavior"] select',
-  leafOption: '[data-test-field="leafNotAfterBehavior"] option',
-  usageCert: '[data-test-usage="Issuing certificates"]',
-  usageCrl: '[data-test-usage="Signing CRLs"]',
-  usageOcsp: '[data-test-usage="Signing OCSPs"]',
-  manualChain: '[data-test-input="manualChain"]',
-  certUrls: '[data-test-string-list-input]',
-  certUrl1: '[data-test-string-list-input="0"]',
-  certUrl2: '[data-test-string-list-input="1"]',
-  certUrlAdd: '[data-test-string-list-button="add"]',
-  certUrlRemove: '[data-test-string-list-button="delete"]',
-  crlDist: '[data-test-input="crlDistributionPoints"] [data-test-string-list-input="0"]',
-  ocspServers: '[data-test-input="ocspServers"]  [data-test-string-list-input="0"]',
-  save: '[data-test-save]',
-  cancel: '[data-test-cancel]',
-  error: '[data-test-error] p',
-  alert: '[data-test-inline-error-message]',
-};
-
-module('Integration | Component | pki | Page::PkiIssuerEditPage::PkiIssuerEdit', function (hooks) {
-  setupRenderingTest(hooks);
-  setupEngine(hooks, 'pki');
-  setupMirage(hooks);
-
-  hooks.beforeEach(function () {
-    const router = this.owner.lookup('service:router');
-    const transitionSpy = sinon.stub(router, 'transitionTo');
-    this.transitionCalled = () =>
-      transitionSpy.calledWith('vault.cluster.secrets.backend.pki.issuers.issuer.details');
-
-    const store = this.owner.lookup('service:store');
-    store.pushPayload('pki/issuer', {
-      modelName: 'pki/issuer',
-      data: {
-        issuer_id: 'test',
-        issuer_name: 'foo-bar',
-        leaf_not_after_behavior: 'err',
-        usage: 'read-only,issuing-certificates,ocsp-signing',
-        manual_chain: 'issuer_ref',
-        issuing_certificates: ['http://localhost', 'http://localhost:8200'],
-        crl_distribution_points: 'http://localhost',
-        ocsp_servers: 'http://localhost',
-      },
-    });
-    this.model = store.peekRecord('pki/issuer', 'test');
-    // backend value on model pulled from secretMountPath service
-    this.owner.lookup('service:secretMountPath').update('pki');
-
-    this.update = async () => {
-      await fillIn(selectors.name, 'bar-baz');
-      await click(selectors.usageCrl);
-      await click(selectors.certUrlRemove);
-    };
-  });
-
-  test('it should populate fields with model values', async function (assert) {
-    await render(hbs`<Page::PkiIssuerEdit @model={{this.model}} />`, { owner: this.engine });
-
-    assert.dom(selectors.name).hasValue(this.model.issuerName, 'Issuer name field populates');
-    assert
-      .dom(selectors.leaf)
-      .hasValue(this.model.leafNotAfterBehavior, 'Leaf not after behavior option selected');
-    assert
-      .dom(selectors.leafOption)
-      .hasText(
-        'Error if the computed NotAfter exceeds that of this issuer',
-        'Correct text renders for leaf option'
-      );
-    assert.dom(selectors.usageCert).isChecked('Usage issuing certificates is checked');
-    assert.dom(selectors.usageCrl).isNotChecked('Usage signing crls is not checked');
-    assert.dom(selectors.usageOcsp).isChecked('Usage signing ocsps is checked');
-    assert.dom(selectors.manualChain).hasValue(this.model.manualChain, 'Manual chain field populates');
-    const certUrls = this.model.issuingCertificates.split(',');
-    assert.dom(selectors.certUrl1).hasValue(certUrls[0], 'Issuing certificate populates');
-    assert.dom(selectors.certUrl2).hasValue(certUrls[1], 'Issuing certificate populates');
-    const crlDistributionPoints = this.model.crlDistributionPoints.split(',');
-    assert.dom(selectors.crlDist).hasValue(crlDistributionPoints[0], 'Crl distribution points populate');
-    const ocspServers = this.model.ocspServers.split(',');
-    assert.dom(selectors.ocspServers).hasValue(ocspServers[0], 'Ocsp servers populate');
-  });
-
-  test('it should rollback model attributes on cancel', async function (assert) {
-    await render(hbs`<Page::PkiIssuerEdit @model={{this.model}} />`, { owner: this.engine });
-
-    await this.update();
-    await click(selectors.cancel);
-
-    assert.ok(this.transitionCalled(), 'Transitions to details route on cancel');
-    assert.strictEqual(this.model.issuerName, 'foo-bar', 'Issuer name rolled back');
-    assert.strictEqual(this.model.usage, 'read-only,issuing-certificates,ocsp-signing', 'Usage rolled back');
-    assert.strictEqual(
-      this.model.issuingCertificates,
-      'http://localhost,http://localhost:8200',
-      'Issuing certificates rolled back'
-    );
-  });
-
-  test('it should update issuer', async function (assert) {
-    assert.expect(4);
-
-    this.server.post('/pki/issuer/test', (schema, req) => {
-      const data = JSON.parse(req.requestBody);
-      assert.strictEqual(data.issuer_name, 'bar-baz', 'Updated issuer name sent in POST request');
-      assert.strictEqual(
-        data.usage,
-        'read-only,issuing-certificates,ocsp-signing,crl-signing',
-        'Updated usage sent in POST request'
-      );
-      assert.strictEqual(
-        data.issuing_certificates,
-        'http://localhost:8200',
-        'Updated issuing certificates sent in POST request'
-      );
-      return { data };
-    });
-    await render(hbs`<Page::PkiIssuerEdit @model={{this.model}} />`, { owner: this.engine });
-
-    await this.update();
-    await click(selectors.save);
-    assert.ok(this.transitionCalled(), 'Transitions to details route on save success');
-  });
-
-  test('it should show error messages', async function (assert) {
-    this.server.post('/pki/issuer/test', () => new Response(404, {}, { errors: ['Some error occurred'] }));
-
-    await render(hbs`<Page::PkiIssuerEdit @model={{this.model}} />`, { owner: this.engine });
-    await click(selectors.save);
-
-    assert
-      .dom(selectors.alert)
-      .hasText('There was an error submitting this form.', 'Inline error alert renders');
-    assert.dom(selectors.error).hasText('Some error occurred', 'Error message renders');
-  });
-});
diff --git a/ui/tests/integration/components/pki/page/pki-issuer-generate-intermediate-test.js b/ui/tests/integration/components/pki/page/pki-issuer-generate-intermediate-test.js
deleted file mode 100644
index 04616593ecf14..0000000000000
--- a/ui/tests/integration/components/pki/page/pki-issuer-generate-intermediate-test.js
+++ /dev/null
@@ -1,80 +0,0 @@
-import { module, test } from 'qunit';
-import { click, fillIn, render } from '@ember/test-helpers';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import { hbs } from 'ember-cli-htmlbars';
-import { setupEngine } from 'ember-engines/test-support';
-import { Response } from 'miragejs';
-import { v4 as uuidv4 } from 'uuid';
-
-import { setupRenderingTest } from 'vault/tests/helpers';
-import { SELECTORS } from 'vault/tests/helpers/pki/pki-configure-create';
-import { allowAllCapabilitiesStub } from 'vault/tests/helpers/stubs';
-
-/**
- * this test is for the page component only. A separate test is written for the form rendered
- */
-module('Integration | Component | page/pki-issuer-generate-intermediate', function (hooks) {
-  setupRenderingTest(hooks);
-  setupEngine(hooks, 'pki');
-  setupMirage(hooks);
-
-  hooks.beforeEach(function () {
-    this.store = this.owner.lookup('service:store');
-    this.breadcrumbs = [{ label: 'something' }];
-    this.model = this.store.createRecord('pki/action', {
-      actionType: 'generate-csr',
-    });
-    this.secretMountPath = this.owner.lookup('service:secret-mount-path');
-    this.secretMountPath.currentPath = 'pki-component';
-    this.server.post('/sys/capabilities-self', allowAllCapabilitiesStub());
-  });
-
-  test('it renders correct title before and after submit', async function (assert) {
-    assert.expect(3);
-    this.server.post(`/pki-component/issuers/generate/intermediate/internal`, () => {
-      assert.true(true, 'Issuers endpoint called');
-      return {
-        request_id: uuidv4(),
-        data: {
-          csr: '------BEGIN CERTIFICATE------',
-          key_id: 'some-key-id',
-        },
-      };
-    });
-
-    await render(
-      hbs`<Page::PkiIssuerGenerateIntermediate @model={{this.model}} @breadcrumbs={{this.breadcrumbs}} />`,
-      {
-        owner: this.engine,
-      }
-    );
-    assert.dom('[data-test-pki-page-title]').hasText('Generate intermediate CSR');
-    await fillIn(SELECTORS.typeField, 'internal');
-    await fillIn(SELECTORS.inputByName('commonName'), 'foobar');
-    await click('[data-test-save]');
-    assert.dom('[data-test-pki-page-title]').hasText('View generated CSR');
-  });
-
-  test('it does not update title if API response is an error', async function (assert) {
-    assert.expect(2);
-    this.server.post(
-      '/pki-component/issuers/generate/intermediate/internal',
-      () => new Response(403, {}, { errors: ['API returns this error'] })
-    );
-
-    await render(
-      hbs`<Page::PkiIssuerGenerateIntermediate @model={{this.model}} @breadcrumbs={{this.breadcrumbs}} />`,
-      {
-        owner: this.engine,
-      }
-    );
-    assert.dom('[data-test-pki-page-title]').hasText('Generate intermediate CSR');
-    // Fill in
-    await fillIn(SELECTORS.typeField, 'internal');
-    await fillIn(SELECTORS.inputByName('commonName'), 'foobar');
-    await click('[data-test-save]');
-    assert
-      .dom('[data-test-pki-page-title]')
-      .hasText('Generate intermediate CSR', 'title does not change if response is unsuccessful');
-  });
-});
diff --git a/ui/tests/integration/components/pki/page/pki-issuer-generate-root-test.js b/ui/tests/integration/components/pki/page/pki-issuer-generate-root-test.js
deleted file mode 100644
index a23a47176fbff..0000000000000
--- a/ui/tests/integration/components/pki/page/pki-issuer-generate-root-test.js
+++ /dev/null
@@ -1,77 +0,0 @@
-import { module, test } from 'qunit';
-import { click, fillIn, render } from '@ember/test-helpers';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import { hbs } from 'ember-cli-htmlbars';
-import { setupEngine } from 'ember-engines/test-support';
-import { Response } from 'miragejs';
-import { v4 as uuidv4 } from 'uuid';
-
-import { setupRenderingTest } from 'vault/tests/helpers';
-import { SELECTORS } from 'vault/tests/helpers/pki/pki-configure-create';
-import { allowAllCapabilitiesStub } from 'vault/tests/helpers/stubs';
-
-/**
- * this test is for the page component only. A separate test is written for the form rendered
- */
-module('Integration | Component | page/pki-issuer-generate-root', function (hooks) {
-  setupRenderingTest(hooks);
-  setupEngine(hooks, 'pki');
-  setupMirage(hooks);
-
-  hooks.beforeEach(function () {
-    this.store = this.owner.lookup('service:store');
-    this.breadcrumbs = [{ label: 'something' }];
-    this.model = this.store.createRecord('pki/action', {
-      actionType: 'generate-csr',
-    });
-    this.secretMountPath = this.owner.lookup('service:secret-mount-path');
-    this.secretMountPath.currentPath = 'pki-component';
-    this.server.post('/sys/capabilities-self', allowAllCapabilitiesStub());
-  });
-
-  test('it renders correct title before and after submit', async function (assert) {
-    assert.expect(3);
-    this.server.post(`/pki-component/root/generate/internal`, () => {
-      assert.true(true, 'Root endpoint called');
-      return {
-        request_id: uuidv4(),
-        data: {
-          certificate: '------BEGIN CERTIFICATE------',
-          key_id: 'some-key-id',
-        },
-      };
-    });
-
-    await render(
-      hbs`<Page::PkiIssuerGenerateRoot @model={{this.model}} @breadcrumbs={{this.breadcrumbs}} />`,
-      {
-        owner: this.engine,
-      }
-    );
-    assert.dom('[data-test-pki-page-title]').hasText('Generate root');
-    await fillIn(SELECTORS.typeField, 'internal');
-    await fillIn(SELECTORS.inputByName('commonName'), 'foobar');
-    await click(SELECTORS.generateRootSave);
-    assert.dom('[data-test-pki-page-title]').hasText('View generated root');
-  });
-
-  test('it does not update title if API response is an error', async function (assert) {
-    assert.expect(2);
-    this.server.post(`/pki-component/root/generate/internal`, () => new Response(404, {}, { errors: [] }));
-
-    await render(
-      hbs`<Page::PkiIssuerGenerateRoot @model={{this.model}} @breadcrumbs={{this.breadcrumbs}} />`,
-      {
-        owner: this.engine,
-      }
-    );
-    assert.dom('[data-test-pki-page-title]').hasText('Generate root');
-    // Fill in
-    await fillIn(SELECTORS.typeField, 'internal');
-    await fillIn(SELECTORS.inputByName('commonName'), 'foobar');
-    await click(SELECTORS.generateRootSave);
-    assert
-      .dom('[data-test-pki-page-title]')
-      .hasText('Generate root', 'title does not change if response is unsuccessful');
-  });
-});
diff --git a/ui/tests/integration/components/pki/page/pki-issuer-import-test.js b/ui/tests/integration/components/pki/page/pki-issuer-import-test.js
deleted file mode 100644
index 9cc3ecf684975..0000000000000
--- a/ui/tests/integration/components/pki/page/pki-issuer-import-test.js
+++ /dev/null
@@ -1,67 +0,0 @@
-import { module, test } from 'qunit';
-import { click, fillIn, render } from '@ember/test-helpers';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import { hbs } from 'ember-cli-htmlbars';
-import { setupEngine } from 'ember-engines/test-support';
-import { Response } from 'miragejs';
-import { v4 as uuidv4 } from 'uuid';
-import { setupRenderingTest } from 'vault/tests/helpers';
-import { allowAllCapabilitiesStub } from 'vault/tests/helpers/stubs';
-
-/**
- * this test is for the page component only. A separate test is written for the form rendered
- */
-module('Integration | Component | page/pki-issuer-import', function (hooks) {
-  setupRenderingTest(hooks);
-  setupEngine(hooks, 'pki');
-  setupMirage(hooks);
-
-  hooks.beforeEach(function () {
-    this.store = this.owner.lookup('service:store');
-    this.breadcrumbs = [{ label: 'something' }];
-    this.model = this.store.createRecord('pki/action', {
-      actionType: 'generate-csr',
-    });
-    this.secretMountPath = this.owner.lookup('service:secret-mount-path');
-    this.secretMountPath.currentPath = 'pki-component';
-    this.server.post('/sys/capabilities-self', allowAllCapabilitiesStub());
-  });
-
-  test('it renders correct title before and after submit', async function (assert) {
-    assert.expect(3);
-    this.server.post(`/pki-component/issuers/import/bundle`, () => {
-      assert.true(true, 'Import endpoint called');
-      return {
-        request_id: uuidv4(),
-        data: {},
-      };
-    });
-
-    await render(hbs`<Page::PkiIssuerImport @model={{this.model}} @breadcrumbs={{this.breadcrumbs}} />`, {
-      owner: this.engine,
-    });
-    assert.dom('[data-test-pki-page-title]').hasText('Import a CA');
-    await click('[data-test-text-toggle]');
-    await fillIn('[data-test-text-file-textarea]', 'dummy-pem-bundle');
-    await click('[data-test-pki-import-pem-bundle]');
-    assert.dom('[data-test-pki-page-title]').hasText('View imported items');
-  });
-
-  test('it does not update title if API response is an error', async function (assert) {
-    assert.expect(2);
-    // this.server.post('/pki-component/issuers/import/bundle', () => new Response(404, {}, { errors: ['Some error occurred'] }));
-    this.server.post(`/pki-component/issuers/import/bundle`, () => new Response(404, {}, { errors: [] }));
-
-    await render(hbs`<Page::PkiIssuerImport @model={{this.model}} @breadcrumbs={{this.breadcrumbs}} />`, {
-      owner: this.engine,
-    });
-    assert.dom('[data-test-pki-page-title]').hasText('Import a CA');
-    // Fill in
-    await click('[data-test-text-toggle]');
-    await fillIn('[data-test-text-file-textarea]', 'dummy-pem-bundle');
-    await click('[data-test-pki-import-pem-bundle]');
-    assert
-      .dom('[data-test-pki-page-title]')
-      .hasText('Import a CA', 'title does not change if response is unsuccessful');
-  });
-});
diff --git a/ui/tests/integration/components/pki/page/pki-issuer-list-test.js b/ui/tests/integration/components/pki/page/pki-issuer-list-test.js
deleted file mode 100644
index e03b36afd855f..0000000000000
--- a/ui/tests/integration/components/pki/page/pki-issuer-list-test.js
+++ /dev/null
@@ -1,75 +0,0 @@
-import { module, test } from 'qunit';
-import { render } from '@ember/test-helpers';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import { hbs } from 'ember-cli-htmlbars';
-import { setupEngine } from 'ember-engines/test-support';
-import { setupRenderingTest } from 'vault/tests/helpers';
-
-/**
- * this test is for the page component only. A separate test is written for the form rendered
- */
-module('Integration | Component | page/pki-issuer-list', function (hooks) {
-  setupRenderingTest(hooks);
-  setupEngine(hooks, 'pki');
-  setupMirage(hooks);
-
-  hooks.beforeEach(function () {
-    this.store = this.owner.lookup('service:store');
-    this.secretMountPath = this.owner.lookup('service:secret-mount-path');
-    this.secretMountPath.currentPath = 'pki-test';
-    this.engineId = 'pki';
-  });
-
-  test('it renders when issuer metadata tags when info is provided', async function (assert) {
-    this.store.createRecord('pki/issuer', {
-      issuerId: 'abcd-efgh',
-      issuerName: 'issuer-0',
-      common_name: 'common-name-issuer-0',
-      isRoot: true,
-      serialNumber: '74:2d:ed:f2:c4:3b:76:5e:6e:0d:f1:6a:c0:8b:6f:e3:3c:62:f9:03',
-    });
-    this.store.createRecord('pki/issuer', {
-      issuerId: 'ijkl-mnop',
-      issuerName: 'issuer-1',
-      isRoot: false,
-      parsedCertificate: {
-        common_name: 'common-name-issuer-1',
-      },
-      serialNumber: '74:2d:ed:f2:c4:3b:76:5e:6e:0d:f1:6a:c0:8b:6f:e3:3c:62:f9:03',
-    });
-    this.issuers = this.store.peekAll('pki/issuer');
-
-    await render(hbs`<Page::PkiIssuerList @issuers={{this.issuers}} @mountPoint={{this.engineId}} />`, {
-      owner: this.engine,
-    });
-
-    this.issuers.forEach(async (issuer, idx) => {
-      assert
-        .dom(`[data-test-serial-number="${idx}"]`)
-        .hasText('74:2d:ed:f2:c4:3b:76:5e:6e:0d:f1:6a:c0:8b:6f:e3:3c:62:f9:03');
-      if (idx === 1) {
-        assert.dom(`[data-test-is-root-tag="${idx}"]`).hasText('intermediate');
-      } else {
-        assert.dom(`[data-test-is-root-tag="${idx}"]`).hasText('root');
-      }
-    });
-  });
-  test('it renders when issuer data even though issuer metadata isnt provided', async function (assert) {
-    this.store.createRecord('pki/issuer', {
-      issuerId: 'abcd-efgh',
-      issuerName: 'issuer-0',
-      isDefault: false,
-    });
-    this.store.createRecord('pki/issuer', {
-      issuerId: 'ijkl-mnop',
-      issuerName: 'issuer-1',
-      isDefault: true,
-    });
-    this.issuers = this.store.peekAll('pki/issuer');
-
-    await render(hbs`<Page::PkiIssuerList @issuers={{this.issuers}} @mountPoint={{this.engineId}} />`, {
-      owner: this.engine,
-    });
-    assert.dom(`[data-test-is-default="1"]`).hasText('default issuer');
-  });
-});
diff --git a/ui/tests/integration/components/pki/page/pki-issuer-rotate-root-test.js b/ui/tests/integration/components/pki/page/pki-issuer-rotate-root-test.js
deleted file mode 100644
index 0d20e72331e8e..0000000000000
--- a/ui/tests/integration/components/pki/page/pki-issuer-rotate-root-test.js
+++ /dev/null
@@ -1,257 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'vault/tests/helpers';
-import { click, fillIn, findAll, render } from '@ember/test-helpers';
-import { setupEngine } from 'ember-engines/test-support';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import sinon from 'sinon';
-import { hbs } from 'ember-cli-htmlbars';
-import { loadedCert } from 'vault/tests/helpers/pki/values';
-import camelizeKeys from 'vault/utils/camelize-object-keys';
-import { parseCertificate } from 'vault/utils/parse-pki-cert';
-import { SELECTORS as S } from 'vault/tests/helpers/pki/pki-generate-root';
-
-const SELECTORS = {
-  pageTitle: '[data-test-pki-page-title]',
-  alertBanner: '[data-test-alert-banner="alert"]',
-  toolbarCrossSign: '[data-test-pki-issuer-cross-sign]',
-  toolbarSignInt: '[data-test-pki-issuer-sign-int]',
-  toolbarDownload: '[data-test-issuer-download]',
-  oldRadioSelect: 'input#use-old-root-settings',
-  customRadioSelect: 'input#customize-new-root-certificate',
-  toggle: '[data-test-details-toggle]',
-  input: (attr) => `[data-test-input="${attr}"]`,
-  infoRowValue: (attr) => `[data-test-value-div="${attr}"]`,
-  validationError: '[data-test-pki-rotate-root-validation-error]',
-  rotateRootForm: '[data-test-pki-rotate-old-settings-form]',
-  rotateRootSave: '[data-test-pki-rotate-root-save]',
-  rotateRootCancel: '[data-test-pki-rotate-root-cancel]',
-  doneButton: '[data-test-done]',
-  // root form
-  generateRootForm: '[data-test-pki-config-generate-root-form]',
-  ...S,
-};
-
-module('Integration | Component | page/pki-issuer-rotate-root', function (hooks) {
-  setupRenderingTest(hooks);
-  setupEngine(hooks, 'pki');
-  setupMirage(hooks);
-
-  hooks.beforeEach(async function () {
-    this.store = this.owner.lookup('service:store');
-    this.backend = 'test-pki';
-    this.owner.lookup('service:secret-mount-path').update(this.backend);
-    this.onCancel = sinon.spy();
-    this.onComplete = sinon.spy();
-    this.breadcrumbs = [{ label: 'rotate root' }];
-    this.oldRootData = {
-      certificate: loadedCert,
-      issuer_id: 'old-issuer-id',
-      issuer_name: 'old-issuer',
-    };
-    this.parsedRootCert = camelizeKeys(parseCertificate(loadedCert));
-    this.store.pushPayload('pki/issuer', { modelName: 'pki/issuer', data: this.oldRootData });
-    this.oldRoot = this.store.peekRecord('pki/issuer', 'old-issuer-id');
-    this.newRootModel = this.store.createRecord('pki/action', {
-      actionType: 'rotate-root',
-      type: 'internal',
-      ...this.parsedRootCert, // copy old root settings over to new one
-    });
-
-    this.returnedData = {
-      id: 'response-id',
-      certificate: loadedCert,
-      expiration: 1682735724,
-      issuer_id: 'some-issuer-id',
-      issuer_name: 'my issuer',
-      issuing_ca: loadedCert,
-      key_id: 'my-key-id',
-      key_name: 'my-key',
-      serial_number: '3a:3c:17:..',
-    };
-  });
-
-  test('it renders', async function (assert) {
-    assert.expect(17);
-    await render(
-      hbs`
-      <Page::PkiIssuerRotateRoot
-        @oldRoot={{this.oldRoot}}
-        @newRootModel={{this.newRootModel}}
-        @breadcrumbs={{this.breadcrumbs}}
-        @onCancel={{this.onCancel}}
-        @onComplete={{this.onComplete}}
-      />
-    `,
-      { owner: this.engine }
-    );
-    assert.dom(SELECTORS.pageTitle).hasText('Generate new root');
-    assert.dom(SELECTORS.oldRadioSelect).isChecked('defaults to use-old-settings');
-    assert.dom(SELECTORS.rotateRootForm).exists('it renders old settings form');
-    assert
-      .dom(SELECTORS.input('commonName'))
-      .hasValue(this.parsedRootCert.commonName, 'common name prefilled with root cert cn');
-    assert.dom(SELECTORS.toggle).hasText('Old root settings', 'toggle renders correct text');
-    assert.dom(SELECTORS.input('issuerName')).exists('renders issuer name input');
-    assert.strictEqual(findAll('[data-test-row-label]').length, 0, 'it hides the old root info table rows');
-    await click(SELECTORS.toggle);
-    assert.strictEqual(findAll('[data-test-row-label]').length, 19, 'it shows the old root info table rows');
-    assert
-      .dom(SELECTORS.infoRowValue('Issuer name'))
-      .hasText(this.oldRoot.issuerName, 'renders correct issuer data');
-    await click(SELECTORS.toggle);
-    assert.strictEqual(findAll('[data-test-row-label]').length, 0, 'it hides again');
-
-    // customize form
-    await click(SELECTORS.customRadioSelect);
-    assert.dom(SELECTORS.generateRootForm).exists('it renders generate root form');
-    assert
-      .dom(SELECTORS.input('permittedDnsDomains'))
-      .hasValue(this.parsedRootCert.permittedDnsDomains, 'form is prefilled with values from old root');
-    await click(SELECTORS.generateRootCancel);
-    assert.ok(this.onCancel.calledOnce, 'custom form calls @onCancel passed from parent');
-    await click(SELECTORS.oldRadioSelect);
-    await click(SELECTORS.rotateRootCancel);
-    assert.ok(this.onCancel.calledTwice, 'old root settings form calls @onCancel from parent');
-
-    // validations
-    await fillIn(SELECTORS.input('commonName'), '');
-    await fillIn(SELECTORS.input('issuerName'), 'default');
-    await click(SELECTORS.rotateRootSave);
-    assert.dom(SELECTORS.validationError).hasText('There are 2 errors with this form.');
-    assert.dom(SELECTORS.input('commonName')).hasClass('has-error-border', 'common name has error border');
-    assert.dom(SELECTORS.input('issuerName')).hasClass('has-error-border', 'issuer name has error border');
-  });
-
-  test('it sends request to rotate/internal on save when using old root settings', async function (assert) {
-    assert.expect(1);
-    this.server.post(`/${this.backend}/root/rotate/internal`, () => {
-      assert.ok('request made to correct default endpoint type=internal');
-    });
-    await render(
-      hbs`
-      <Page::PkiIssuerRotateRoot
-        @oldRoot={{this.oldRoot}}
-        @newRootModel={{this.newRootModel}}
-        @breadcrumbs={{this.breadcrumbs}}
-        @onCancel={{this.onCancel}}
-        @onComplete={{this.onComplete}}
-      />
-    `,
-      { owner: this.engine }
-    );
-    await click(SELECTORS.rotateRootSave);
-  });
-
-  function testEndpoint(test, type) {
-    test(`it sends request to rotate/${type} endpoint on save with custom root settings`, async function (assert) {
-      assert.expect(1);
-      this.server.post(`/${this.backend}/root/rotate/${type}`, () => {
-        assert.ok('request is made to correct endpoint');
-      });
-      await render(
-        hbs`
-      <Page::PkiIssuerRotateRoot
-        @oldRoot={{this.oldRoot}}
-        @newRootModel={{this.newRootModel}}
-        @breadcrumbs={{this.breadcrumbs}}
-        @onCancel={{this.onCancel}}
-        @onComplete={{this.onComplete}}
-      />
-    `,
-        { owner: this.engine }
-      );
-      await click(SELECTORS.customRadioSelect);
-      await fillIn(SELECTORS.typeField, type);
-      await click(SELECTORS.generateRootSave);
-    });
-  }
-  testEndpoint(test, 'internal');
-  testEndpoint(test, 'exported');
-  testEndpoint(test, 'existing');
-  testEndpoint(test, 'kms');
-
-  test('it renders details after save for exported key type', async function (assert) {
-    assert.expect(10);
-    const keyData = {
-      private_key: `-----BEGIN RSA PRIVATE KEY-----\nMIIEogIBAAKCAQEAtc9yU`,
-      private_key_type: 'rsa',
-    };
-    this.store.pushPayload('pki/action', {
-      modelName: 'pki/action',
-      data: { ...this.returnedData, ...keyData },
-    });
-    this.newRootModel = this.store.peekRecord('pki/action', 'response-id');
-    await render(
-      hbs`
-        <Page::PkiIssuerRotateRoot
-          @oldRoot={{this.oldRoot}}
-          @newRootModel={{this.newRootModel}}
-          @breadcrumbs={{this.breadcrumbs}}
-          @onCancel={{this.onCancel}}
-          @onComplete={{this.onComplete}}
-        />
-      `,
-      { owner: this.engine }
-    );
-    assert.dom(SELECTORS.pageTitle).hasText('View issuer certificate');
-    assert
-      .dom(SELECTORS.alertBanner)
-      .hasText(
-        'Next steps Your new root has been generated. Make sure to copy and save the private_key as it is only available once. If you’re ready, you can begin cross-signing issuers now. If not, the option to cross-sign is available when you use this certificate. Cross-sign issuers'
-      );
-    assert.dom(SELECTORS.infoRowValue('Certificate')).exists();
-    assert.dom(SELECTORS.infoRowValue('Issuer name')).exists();
-    assert.dom(SELECTORS.infoRowValue('Issuing CA')).exists();
-    assert.dom(`${SELECTORS.infoRowValue('Private key')} .masked-input`).hasClass('allow-copy');
-    assert.dom(`${SELECTORS.infoRowValue('Private key type')} span`).hasText('rsa');
-    assert.dom(SELECTORS.infoRowValue('Serial number')).hasText(this.returnedData.serial_number);
-    assert.dom(SELECTORS.infoRowValue('Key ID')).hasText(this.returnedData.key_id);
-
-    await click(SELECTORS.doneButton);
-    assert.ok(this.onComplete.calledOnce, 'clicking done fires @onComplete from parent');
-  });
-
-  test('it renders details after save for internal key type', async function (assert) {
-    assert.expect(13);
-    this.store.pushPayload('pki/action', {
-      modelName: 'pki/action',
-      data: this.returnedData,
-    });
-    this.newRootModel = this.store.peekRecord('pki/action', 'response-id');
-    await render(
-      hbs`
-        <Page::PkiIssuerRotateRoot
-          @oldRoot={{this.oldRoot}}
-          @newRootModel={{this.newRootModel}}
-          @breadcrumbs={{this.breadcrumbs}}
-          @onCancel={{this.onCancel}}
-          @onComplete={{this.onComplete}}
-        />
-      `,
-      { owner: this.engine }
-    );
-    assert.dom(SELECTORS.pageTitle).hasText('View issuer certificate');
-    assert.dom(SELECTORS.toolbarCrossSign).exists();
-    assert.dom(SELECTORS.toolbarSignInt).exists();
-    assert.dom(SELECTORS.toolbarDownload).exists();
-    assert
-      .dom(SELECTORS.alertBanner)
-      .hasText(
-        'Next steps Your new root has been generated. If you’re ready, you can begin cross-signing issuers now. If not, the option to cross-sign is available when you use this certificate. Cross-sign issuers'
-      );
-    assert.dom(SELECTORS.infoRowValue('Certificate')).exists();
-    assert.dom(SELECTORS.infoRowValue('Issuer name')).exists();
-    assert.dom(SELECTORS.infoRowValue('Issuing CA')).exists();
-    assert.dom(`${SELECTORS.infoRowValue('Private key')} span`).hasText('internal');
-    assert.dom(`${SELECTORS.infoRowValue('Private key type')} span`).hasText('internal');
-    assert.dom(SELECTORS.infoRowValue('Serial number')).hasText(this.returnedData.serial_number);
-    assert.dom(SELECTORS.infoRowValue('Key ID')).hasText(this.returnedData.key_id);
-
-    await click(SELECTORS.doneButton);
-    assert.ok(this.onComplete.calledOnce, 'clicking done fires @onComplete from parent');
-  });
-});
diff --git a/ui/tests/integration/components/pki/page/pki-key-details-test.js b/ui/tests/integration/components/pki/page/pki-key-details-test.js
deleted file mode 100644
index f4fac85f2d627..0000000000000
--- a/ui/tests/integration/components/pki/page/pki-key-details-test.js
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { click, render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-import { setupEngine } from 'ember-engines/test-support';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import { SELECTORS } from 'vault/tests/helpers/pki/page/pki-keys';
-
-module('Integration | Component | pki key details page', function (hooks) {
-  setupRenderingTest(hooks);
-  setupEngine(hooks, 'pki');
-  setupMirage(hooks);
-
-  hooks.beforeEach(function () {
-    this.owner.lookup('service:flash-messages').registerTypes(['success', 'danger']);
-    this.store = this.owner.lookup('service:store');
-    this.secretMountPath = this.owner.lookup('service:secret-mount-path');
-    this.backend = 'pki-test';
-    this.secretMountPath.currentPath = this.backend;
-    this.store.pushPayload('pki/key', {
-      modelName: 'pki/key',
-      key_id: '724862ff-6438-bad0-b598-77a6c7f4e934',
-      key_type: 'ec',
-      key_name: 'test-key',
-    });
-    this.model = this.store.peekRecord('pki/key', '724862ff-6438-bad0-b598-77a6c7f4e934');
-  });
-
-  test('it renders the page component and deletes a key', async function (assert) {
-    assert.expect(7);
-    this.server.delete(`${this.backend}/key/${this.model.keyId}`, () => {
-      assert.ok(true, 'confirming delete fires off destroyRecord()');
-    });
-
-    await render(
-      hbs`
-        <Page::PkiKeyDetails
-          @key={{this.model}} 
-          @canDelete={{true}}
-          @canEdit={{true}} 
-        />
-      `,
-      { owner: this.engine }
-    );
-
-    assert.dom(SELECTORS.keyIdValue).hasText(' 724862ff-6438-bad0-b598-77a6c7f4e934', 'key id renders');
-    assert.dom(SELECTORS.keyNameValue).hasText('test-key', 'key name renders');
-    assert.dom(SELECTORS.keyTypeValue).hasText('ec', 'key type renders');
-    assert.dom(SELECTORS.keyBitsValue).doesNotExist('does not render empty value');
-    assert.dom(SELECTORS.keyEditLink).exists('renders edit link');
-    assert.dom(SELECTORS.keyDeleteButton).exists('renders delete button');
-    await click(SELECTORS.keyDeleteButton);
-    await click(SELECTORS.confirmDelete);
-  });
-
-  test('it does not render actions when capabilities are false', async function (assert) {
-    assert.expect(2);
-
-    await render(
-      hbs`
-        <Page::PkiKeyDetails
-          @key={{this.model}} 
-          @canDelete={{false}}
-          @canEdit={{false}} 
-        />
-      `,
-      { owner: this.engine }
-    );
-
-    assert.dom(SELECTORS.keyDeleteButton).doesNotExist('does not render delete button if no permission');
-    assert.dom(SELECTORS.keyEditLink).doesNotExist('does not render edit button if no permission');
-  });
-});
diff --git a/ui/tests/integration/components/pki/page/pki-key-list-test.js b/ui/tests/integration/components/pki/page/pki-key-list-test.js
deleted file mode 100644
index a38ca6d2f7a24..0000000000000
--- a/ui/tests/integration/components/pki/page/pki-key-list-test.js
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { click, render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-import { setupEngine } from 'ember-engines/test-support';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import { SELECTORS } from 'vault/tests/helpers/pki/page/pki-keys';
-
-module('Integration | Component | pki key list page', function (hooks) {
-  setupRenderingTest(hooks);
-  setupEngine(hooks, 'pki');
-  setupMirage(hooks);
-
-  hooks.beforeEach(function () {
-    this.store = this.owner.lookup('service:store');
-    this.secretMountPath = this.owner.lookup('service:secret-mount-path');
-    this.secretMountPath.currentPath = 'pki-test';
-    this.store.pushPayload('pki/key', {
-      modelName: 'pki/key',
-      key_id: '724862ff-6438-bad0-b598-77a6c7f4e934',
-      key_type: 'ec',
-      key_name: 'test-key',
-    });
-    this.store.pushPayload('pki/key', {
-      modelName: 'pki/key',
-      key_id: '9fdddf12-9ce3-0268-6b34-dc1553b00175',
-      key_type: 'rsa',
-      key_name: 'another-key',
-    });
-    this.keyModels = this.store.peekAll('pki/key');
-  });
-
-  test('it renders empty state when no keys exist', async function (assert) {
-    assert.expect(3);
-    this.keyModels = [];
-    await render(
-      hbs`
-        <Page::PkiKeyList
-          @keyModels={{this.keyModels}}
-          @mountPoint="vault.cluster.secrets.backend.pki"
-          @canImportKey={{true}}
-          @canGenerateKey={{true}}
-        />, 
-      `,
-      { owner: this.engine }
-    );
-    assert
-      .dom('[data-test-empty-state-title]')
-      .hasText('No keys yet', 'renders empty state that no keys exist');
-    assert.dom(SELECTORS.importKey).exists('renders toolbar with import action');
-    assert.dom(SELECTORS.generateKey).exists('renders toolbar with generate action');
-  });
-
-  test('it renders list of keys and actions when permission allowed', async function (assert) {
-    assert.expect(6);
-    await render(
-      hbs`
-        <Page::PkiKeyList
-          @keyModels={{this.keyModels}}
-          @mountPoint="vault.cluster.secrets.backend.pki"
-          @canImportKey={{true}}
-          @canGenerateKey={{true}}
-          @canRead={{true}}
-          @canEdit={{true}}
-        />, 
-      `,
-      { owner: this.engine }
-    );
-    assert.dom(SELECTORS.keyName).hasText('test-key', 'linked block renders key id');
-    assert
-      .dom(SELECTORS.keyId)
-      .hasText('724862ff-6438-bad0-b598-77a6c7f4e934', 'linked block renders key name');
-    assert.dom(SELECTORS.importKey).exists('renders import action');
-    assert.dom(SELECTORS.generateKey).exists('renders generate action');
-    await click(SELECTORS.popupMenuTrigger);
-    assert.dom(SELECTORS.popupMenuDetails).exists('details link exists');
-    assert.dom(SELECTORS.popupMenuEdit).exists('edit link exists');
-  });
-
-  test('it hides or disables actions when permission denied', async function (assert) {
-    assert.expect(4);
-    await render(
-      hbs`
-        <Page::PkiKeyList
-          @keyModels={{this.keyModels}}
-          @mountPoint="vault.cluster.secrets.backend.pki"
-          @canImportKey={{false}}
-          @canGenerateKey={{false}}
-          @canRead={{false}}
-          @canEdit={{false}}
-        />, 
-      `,
-      { owner: this.engine }
-    );
-    assert.dom(SELECTORS.importKey).doesNotExist('renders import action');
-    assert.dom(SELECTORS.generateKey).doesNotExist('renders generate action');
-    await click(SELECTORS.popupMenuTrigger);
-    assert.dom(SELECTORS.popupMenuDetails).hasClass('disabled', 'details link enabled');
-    assert.dom(SELECTORS.popupMenuEdit).hasClass('disabled', 'edit link enabled');
-  });
-});
diff --git a/ui/tests/integration/components/pki/page/pki-overview-test.js b/ui/tests/integration/components/pki/page/pki-overview-test.js
deleted file mode 100644
index 00c3d39bc72b8..0000000000000
--- a/ui/tests/integration/components/pki/page/pki-overview-test.js
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-import { setupEngine } from 'ember-engines/test-support';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import { SELECTORS } from 'vault/tests/helpers/pki/overview';
-
-module('Integration | Component | Page::PkiOverview', function (hooks) {
-  setupRenderingTest(hooks);
-  setupEngine(hooks, 'pki');
-  setupMirage(hooks);
-
-  hooks.beforeEach(function () {
-    this.store = this.owner.lookup('service:store');
-    this.secretMountPath = this.owner.lookup('service:secret-mount-path');
-    this.secretMountPath.currentPath = 'pki-test';
-
-    this.store.createRecord('pki/issuer', { issuerId: 'abcd-efgh' });
-    this.store.createRecord('pki/issuer', { issuerId: 'ijkl-mnop' });
-    this.store.createRecord('pki/role', { name: 'role-0' });
-    this.store.createRecord('pki/role', { name: 'role-1' });
-    this.store.createRecord('pki/role', { name: 'role-2' });
-    this.store.createRecord('pki/certificate/base', { serialNumber: '22:2222:22222:2222' });
-    this.store.createRecord('pki/certificate/base', { serialNumber: '33:3333:33333:3333' });
-
-    this.issuers = this.store.peekAll('pki/issuer');
-    this.roles = this.store.peekAll('pki/role');
-    this.engineId = 'pki';
-  });
-
-  test('shows the correct information on issuer card', async function (assert) {
-    await render(
-      hbs`<Page::PkiOverview @issuers={{this.issuers}} @roles={{this.roles}} @engine={{this.engineId}} />,`,
-      { owner: this.engine }
-    );
-    assert.dom(SELECTORS.issuersCardTitle).hasText('Issuers');
-    assert.dom(SELECTORS.issuersCardOverviewNum).hasText('2');
-    assert.dom(SELECTORS.issuersCardLink).hasText('View issuers');
-  });
-
-  test('shows the correct information on roles card', async function (assert) {
-    await render(
-      hbs`<Page::PkiOverview @issuers={{this.issuers}} @roles={{this.roles}} @engine={{this.engineId}} />,`,
-      { owner: this.engine }
-    );
-    assert.dom(SELECTORS.rolesCardTitle).hasText('Roles');
-    assert.dom(SELECTORS.rolesCardOverviewNum).hasText('3');
-    assert.dom(SELECTORS.rolesCardLink).hasText('View roles');
-    this.roles = 404;
-    await render(
-      hbs`<Page::PkiOverview @issuers={{this.issuers}} @roles={{this.roles}} @engine={{this.engineId}} />,`,
-      { owner: this.engine }
-    );
-    assert.dom(SELECTORS.rolesCardOverviewNum).hasText('0');
-  });
-
-  test('shows the input search fields for View Certificates card', async function (assert) {
-    await render(
-      hbs`<Page::PkiOverview @issuers={{this.issuers}} @roles={{this.roles}} @engine={{this.engineId}} />,`,
-      { owner: this.engine }
-    );
-    assert.dom(SELECTORS.issueCertificate).hasText('Issue certificate');
-    assert.dom(SELECTORS.issueCertificateInput).exists();
-    assert.dom(SELECTORS.issueCertificateButton).hasText('Issue');
-  });
-
-  test('shows the input search fields for Issue Certificates card', async function (assert) {
-    await render(
-      hbs`<Page::PkiOverview @issuers={{this.issuers}} @roles={{this.roles}} @engine={{this.engineId}} />,`,
-      { owner: this.engine }
-    );
-    assert.dom(SELECTORS.viewCertificate).hasText('View certificate');
-    assert.dom(SELECTORS.viewCertificateInput).exists();
-    assert.dom(SELECTORS.viewCertificateButton).hasText('View');
-  });
-});
diff --git a/ui/tests/integration/components/pki/page/pki-role-details-test.js b/ui/tests/integration/components/pki/page/pki-role-details-test.js
deleted file mode 100644
index 12c9cfd0beb6a..0000000000000
--- a/ui/tests/integration/components/pki/page/pki-role-details-test.js
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-import { setupEngine } from 'ember-engines/test-support';
-import { SELECTORS } from 'vault/tests/helpers/pki/page/pki-role-details';
-
-module('Integration | Component | pki role details page', function (hooks) {
-  setupRenderingTest(hooks);
-  setupEngine(hooks, 'pki');
-
-  hooks.beforeEach(function () {
-    this.store = this.owner.lookup('service:store');
-    this.model = this.store.createRecord('pki/role', {
-      name: 'Foobar',
-      backend: 'pki',
-      noStore: false,
-      keyUsage: [],
-      extKeyUsage: ['bar', 'baz'],
-      ttl: 600,
-    });
-  });
-
-  test('it should render the page component', async function (assert) {
-    assert.expect(5);
-    await render(
-      hbs`
-      <Page::PkiRoleDetails @role={{this.model}} />
-  `,
-      { owner: this.engine }
-    );
-    assert.dom(SELECTORS.issuerLabel).hasText('Issuer', 'Label is');
-    assert
-      .dom(`${SELECTORS.keyUsageValue} [data-test-icon="minus"]`)
-      .exists('Key usage shows dash when array is empty');
-    assert
-      .dom(SELECTORS.extKeyUsageValue)
-      .hasText('bar,baz', 'Key usage shows comma-joined values when array has items');
-    assert.dom(SELECTORS.noStoreValue).containsText('Yes', 'noStore shows opposite of what the value is');
-    assert.dom(SELECTORS.customTtlValue).containsText('10 minutes', 'TTL shown as duration');
-  });
-
-  test('it should render the notAfter date if present', async function (assert) {
-    assert.expect(1);
-    this.model = this.store.createRecord('pki/role', {
-      name: 'Foobar',
-      backend: 'pki',
-      noStore: false,
-      keyUsage: [],
-      extKeyUsage: ['bar', 'baz'],
-      notAfter: '2030-05-04T12:00:00.000Z',
-    });
-    await render(
-      hbs`
-      <Page::PkiRoleDetails @role={{this.model}} />
-  `,
-      { owner: this.engine }
-    );
-    assert.dom(SELECTORS.customTtlValue).containsText('May', 'Formats the notAfter date instead of TTL');
-  });
-});
diff --git a/ui/tests/integration/components/pki/page/pki-tidy-auto-settings-test.js b/ui/tests/integration/components/pki/page/pki-tidy-auto-settings-test.js
deleted file mode 100644
index be518463e3765..0000000000000
--- a/ui/tests/integration/components/pki/page/pki-tidy-auto-settings-test.js
+++ /dev/null
@@ -1,67 +0,0 @@
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'vault/tests/helpers';
-import { render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-import { setupEngine } from 'ember-engines/test-support';
-
-module('Integration | Component | page/pki-tidy-auto-settings', function (hooks) {
-  setupRenderingTest(hooks);
-  setupEngine(hooks, 'pki');
-
-  hooks.beforeEach(function () {
-    const backend = 'pki-auto-tidy';
-    this.backend = backend;
-
-    this.context = { owner: this.engine };
-    this.store = this.owner.lookup('service:store');
-
-    this.breadcrumbs = [
-      { label: 'secrets', route: 'secrets', linkExternal: true },
-      { label: backend, route: 'overview' },
-      { label: 'tidy', route: 'tidy.index' },
-      { label: 'auto' },
-    ];
-  });
-
-  test('it renders', async function (assert) {
-    const model = this.store.createRecord('pki/tidy', {
-      backend: this.backend,
-      tidyType: 'auto',
-      enabled: false,
-      intervalDuration: '2d',
-      tidyCertStore: false,
-      tidyExpiredIssuers: true,
-    });
-    this.set('model', model);
-
-    await render(
-      hbs`<Page::PkiTidyAutoSettings @breadcrumbs={{this.breadcrumbs}} @model={{this.model}} />`,
-      this.context
-    );
-
-    assert.dom('[data-test-breadcrumbs] li').exists({ count: 4 }, 'an item exists for each breadcrumb');
-    assert.dom('[data-test-header-title]').hasText('Automatic tidy configuration', 'title is correct');
-    assert
-      .dom('[data-test-pki-edit-tidy-auto-link]')
-      .hasText('Edit auto-tidy', 'toolbar edit link has correct text');
-
-    assert.dom('[data-test-row="enabled"] [data-test-label-div]').hasText('Automatic tidy enabled');
-    assert.dom('[data-test-row="intervalDuration"] [data-test-label-div]').hasText('Automatic tidy duration');
-    // Universal operations
-    assert.dom('[data-test-group-title="Universal operations"]').hasText('Universal operations');
-    assert
-      .dom('[data-test-value-div="Tidy the certificate store"]')
-      .exists('Renders universal field when value exists');
-    assert
-      .dom('[data-test-value-div="Tidy revoked certificates"]')
-      .doesNotExist('Does not render universal field when value null');
-    // Issuer operations
-    assert.dom('[data-test-group-title="Issuer operations"]').hasText('Issuer operations');
-    assert
-      .dom('[data-test-value-div="Tidy expired issuers"]')
-      .exists('Renders issuer op field when value exists');
-    assert
-      .dom('[data-test-value-div="Tidy legacy CA bundle"]')
-      .doesNotExist('Does not render issuer op field when value null');
-  });
-});
diff --git a/ui/tests/integration/components/pki/page/pki-tidy-status-test.js b/ui/tests/integration/components/pki/page/pki-tidy-status-test.js
deleted file mode 100644
index 1a05407f1cb50..0000000000000
--- a/ui/tests/integration/components/pki/page/pki-tidy-status-test.js
+++ /dev/null
@@ -1,114 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-import { setupEngine } from 'ember-engines/test-support';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import { SELECTORS } from 'vault/tests/helpers/pki/page/pki-tidy';
-
-module('Integration | Component | Page::PkiTidyStatus', function (hooks) {
-  setupRenderingTest(hooks);
-  setupEngine(hooks, 'pki');
-  setupMirage(hooks);
-
-  hooks.beforeEach(function () {
-    this.store = this.owner.lookup('service:store');
-    this.secretMountPath = this.owner.lookup('service:secret-mount-path');
-    this.secretMountPath.currentPath = 'pki-test';
-
-    this.store.createRecord('pki/issuer', { issuerId: 'abcd-efgh' });
-    this.store.createRecord('pki/tidy', { backend: this.secretMountPath.currentPath, tidyType: 'auto' });
-
-    this.autoTidyConfig = this.store.peekAll('pki/tidy');
-    this.tidyStatus = {
-      acme_account_deleted_count: 0,
-      acme_account_revoked_count: 0,
-      acme_account_safety_buffer: 2592000,
-      acme_orders_deleted_count: 0,
-      cert_store_deleted_count: 0,
-      cross_revoked_cert_deleted_count: 0,
-      current_cert_store_count: null,
-      current_revoked_cert_count: null,
-      error: null,
-      internal_backend_uuid: '9d3bd186-0fdd-9ca4-f298-2e180536b743',
-      issuer_safety_buffer: 31536000,
-      last_auto_tidy_finished: '2023-05-18T13:27:36.390785-07:00',
-      message: 'Tidying certificate store: checking entry 0 of 1',
-      missing_issuer_cert_count: 0,
-      pause_duration: '15s',
-      revocation_queue_deleted_count: 0,
-      revocation_queue_safety_buffer: 36000,
-      revoked_cert_deleted_count: 0,
-      safety_buffer: 2073600,
-      state: 'Running',
-      tidy_acme: false,
-      tidy_cert_store: true,
-      tidy_cross_cluster_revoked_certs: false,
-      tidy_expired_issuers: false,
-      tidy_move_legacy_ca_bundle: false,
-      time_started: '2023-05-18T13:27:36.390959-07:00',
-    };
-    this.engineId = 'pki';
-  });
-
-  test('shows the correct titles for the alert banner based on states', async function (assert) {
-    await render(
-      hbs`<Page::PkiTidyStatus @autoTidyConfig={{this.autoTidyConfig}} @tidyStatus={{this.tidyStatus}} /> <div id="modal-wormhole"></div>,`,
-      { owner: this.engine }
-    );
-    // running state
-    assert.dom(SELECTORS.hdsAlertTitle).hasText('Tidy in progress');
-    assert.dom(SELECTORS.cancelTidyAction).exists();
-    assert.dom(SELECTORS.hdsAlertButtonText).hasText('Cancel tidy');
-    // inactive state
-    this.tidyStatus.state = 'Inactive';
-    await render(
-      hbs`<Page::PkiTidyStatus @autoTidyConfig={{this.autoTidyConfig}} @tidyStatus={{this.tidyStatus}} /> <div id="modal-wormhole"></div>,`,
-      { owner: this.engine }
-    );
-    assert.dom(SELECTORS.hdsAlertTitle).hasText('Tidy is inactive');
-    // finished state
-    this.tidyStatus.state = 'Finished';
-    await render(
-      hbs`<Page::PkiTidyStatus @autoTidyConfig={{this.autoTidyConfig}} @tidyStatus={{this.tidyStatus}} /> <div id="modal-wormhole"></div>,`,
-      { owner: this.engine }
-    );
-    assert.dom(SELECTORS.hdsAlertTitle).hasText('Tidy operation finished');
-    // error state
-    this.tidyStatus.state = 'Error';
-    await render(
-      hbs`<Page::PkiTidyStatus @autoTidyConfig={{this.autoTidyConfig}} @tidyStatus={{this.tidyStatus}} /> <div id="modal-wormhole"></div>,`,
-      { owner: this.engine }
-    );
-    assert.dom(SELECTORS.hdsAlertTitle).hasText('Tidy operation failed');
-    // cancelling state
-    this.tidyStatus.state = 'Cancelling';
-    await render(
-      hbs`<Page::PkiTidyStatus @autoTidyConfig={{this.autoTidyConfig}} @tidyStatus={{this.tidyStatus}} /> <div id="modal-wormhole"></div>,`,
-      { owner: this.engine }
-    );
-    assert.dom(SELECTORS.hdsAlertTitle).hasText('Tidy operation cancelling');
-    // cancelled state
-    this.tidyStatus.state = 'Cancelled';
-    await render(
-      hbs`<Page::PkiTidyStatus @autoTidyConfig={{this.autoTidyConfig}} @tidyStatus={{this.tidyStatus}} /> <div id="modal-wormhole"></div>,`,
-      { owner: this.engine }
-    );
-    assert.dom(SELECTORS.hdsAlertTitle).hasText('Tidy operation cancelled');
-  });
-  test('shows the fields even if the data returns null values', async function (assert) {
-    this.tidyStatus.time_started = null;
-    this.tidyStatus.time_finished = null;
-    await render(
-      hbs`<Page::PkiTidyStatus @autoTidyConfig={{this.autoTidyConfig}} @tidyStatus={{this.tidyStatus}} /> <div id="modal-wormhole"></div>,`,
-      { owner: this.engine }
-    );
-    assert.dom(SELECTORS.timeStartedRow).exists();
-    assert.dom(SELECTORS.timeFinishedRow).exists();
-  });
-});
diff --git a/ui/tests/integration/components/pki/parsed-certificate-info-rows-test.js b/ui/tests/integration/components/pki/parsed-certificate-info-rows-test.js
deleted file mode 100644
index 0d78d4599b7f8..0000000000000
--- a/ui/tests/integration/components/pki/parsed-certificate-info-rows-test.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'vault/tests/helpers';
-import { render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-import { setupEngine } from 'ember-engines/test-support';
-
-module('Integration | Component | parsed-certificate-info-rows', function (hooks) {
-  setupRenderingTest(hooks);
-  setupEngine(hooks, 'pki');
-
-  test('it renders nothing if no valid attributes passed', async function (assert) {
-    this.set('parsedCertificate', {
-      foo: '',
-      common_name: 'not-shown',
-    });
-    await render(hbs`<ParsedCertificateInfoRows @model={{this.parsedCertificate}} />`, {
-      owner: this.engine,
-    });
-
-    assert.dom(this.element).hasText('');
-  });
-
-  test('it renders only valid attributes with values', async function (assert) {
-    this.set('parsedCertificate', {
-      common_name: 'not-shown',
-      use_pss: false,
-      alt_names: ['something', 'here'],
-      ttl: undefined,
-    });
-    await render(hbs`<ParsedCertificateInfoRows @model={{this.parsedCertificate}} />`, {
-      owner: this.engine,
-    });
-    assert.dom('[data-test-component="info-table-row"]').exists({ count: 2 }, 'renders 2 rows');
-
-    assert.dom('[data-test-value-div="Common name"]').doesNotExist('common name is never rendered');
-    assert.dom('[data-test-row-value="Subject Alternative Names (SANs)"]').hasText('something,here');
-    assert.dom('[data-test-value-div="Use PSS"]').hasText('No', 'Booleans are rendered');
-    assert.dom('[data-test-value-div="ttl"]').doesNotExist('ttl is not rendered because value undefined');
-    assert
-      .dom('[data-test-parsing-error-alert-banner]')
-      .doesNotExist('does not render parsing error info banner');
-  });
-});
diff --git a/ui/tests/integration/components/pki/pki-generate-csr-test.js b/ui/tests/integration/components/pki/pki-generate-csr-test.js
deleted file mode 100644
index 23556e211556e..0000000000000
--- a/ui/tests/integration/components/pki/pki-generate-csr-test.js
+++ /dev/null
@@ -1,157 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'vault/tests/helpers';
-import { click, fillIn, render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-import { setupEngine } from 'ember-engines/test-support';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-
-module('Integration | Component | pki-generate-csr', function (hooks) {
-  setupRenderingTest(hooks);
-  setupEngine(hooks, 'pki');
-  setupMirage(hooks);
-
-  hooks.beforeEach(async function () {
-    this.owner.lookup('service:secretMountPath').update('pki-test');
-    this.store = this.owner.lookup('service:store');
-    this.onComplete = () => {};
-    this.model = this.owner
-      .lookup('service:store')
-      .createRecord('pki/action', { actionType: 'generate-csr' });
-
-    this.server.post('/sys/capabilities-self', () => ({
-      data: {
-        capabilities: ['root'],
-        'pki-test/issuers/generate/intermediate/exported': ['root'],
-      },
-    }));
-  });
-
-  test('it should render fields and save', async function (assert) {
-    assert.expect(9);
-
-    this.server.post('/pki-test/issuers/generate/intermediate/exported', (schema, req) => {
-      const payload = JSON.parse(req.requestBody);
-      assert.strictEqual(payload.common_name, 'foo', 'Request made to correct endpoint on save');
-      return {
-        request_id: '123',
-        data: {},
-      };
-    });
-
-    await render(hbs`<PkiGenerateCsr @model={{this.model}} @onComplete={{this.onComplete}} />`, {
-      owner: this.engine,
-    });
-
-    const fields = [
-      'type',
-      'commonName',
-      'excludeCnFromSans',
-      'format',
-      'subjectSerialNumber',
-      'addBasicConstraints',
-    ];
-    fields.forEach((key) => {
-      assert.dom(`[data-test-input="${key}"]`).exists(`${key} form field renders`);
-    });
-
-    assert.dom('[data-test-toggle-group]').exists({ count: 3 }, 'Toggle groups render');
-
-    await fillIn('[data-test-input="type"]', 'exported');
-    await fillIn('[data-test-input="commonName"]', 'foo');
-    await click('[data-test-save]');
-
-    const savedRecord = this.store.peekAll('pki/action').firstObject;
-    assert.false(savedRecord.isNew, 'record is saved');
-  });
-
-  test('it should display validation errors', async function (assert) {
-    assert.expect(4);
-
-    this.onCancel = () => assert.ok(true, 'onCancel action fires');
-
-    await render(
-      hbs`<PkiGenerateCsr @model={{this.model}} @onCancel={{this.onCancel}} @onComplete={{this.onComplete}} />`,
-      {
-        owner: this.engine,
-      }
-    );
-
-    await click('[data-test-save]');
-
-    assert
-      .dom('[data-test-field-validation="type"]')
-      .hasText('Type is required.', 'Type validation error renders');
-    assert
-      .dom('[data-test-field="commonName"] [data-test-inline-alert]')
-      .hasText('Common name is required.', 'Common name validation error renders');
-    assert.dom('[data-test-alert]').hasText('There are 2 errors with this form.', 'Alert renders');
-
-    await click('[data-test-cancel]');
-  });
-
-  test('it should show generated CSR for type=exported', async function (assert) {
-    assert.expect(6);
-    this.model.id = '1235-someId';
-    this.model.csr = '-----BEGIN CERTIFICATE REQUEST-----...-----END CERTIFICATE REQUEST-----';
-    this.model.keyId = '9179de78-1275-a1cf-ebb0-a4eb2e376636';
-    this.model.privateKey = '-----BEGIN RSA PRIVATE KEY-----...-----END RSA PRIVATE KEY-----';
-    this.model.privateKeyType = 'rsa';
-    this.onComplete = () => assert.ok(true, 'onComplete action fires');
-
-    await render(hbs`<PkiGenerateCsr @model={{this.model}} @onComplete={{this.onComplete}} />`, {
-      owner: this.engine,
-    });
-    assert
-      .dom('[data-test-alert-banner="alert"]')
-      .hasText(
-        'Next steps Copy the CSR below for a parent issuer to sign and then import the signed certificate back into this mount. The private_key is only available once. Make sure you copy and save it now.',
-        'renders Next steps alert banner'
-      );
-    assert
-      .dom('[data-test-value-div="CSR"] [data-test-masked-input] button')
-      .hasAttribute('data-clipboard-text', this.model.csr, 'it renders copyable csr');
-    assert
-      .dom('[data-test-value-div="Key ID"] button')
-      .hasAttribute('data-clipboard-text', this.model.keyId, 'it renders copyable key_id');
-    assert
-      .dom('[data-test-value-div="Private key"] [data-test-masked-input] button')
-      .hasAttribute('data-clipboard-text', this.model.privateKey, 'it renders copyable private_key');
-    assert
-      .dom('[data-test-value-div="Private key type"]')
-      .hasText(this.model.privateKeyType, 'renders private_key_type');
-    await click('[data-test-done]');
-  });
-
-  test('it should show generated CSR for type=internal', async function (assert) {
-    assert.expect(5);
-    this.model.id = '1235-someId';
-    this.model.csr = '-----BEGIN CERTIFICATE REQUEST-----...-----END CERTIFICATE REQUEST-----';
-    this.model.keyId = '9179de78-1275-a1cf-ebb0-a4eb2e376636';
-    this.onComplete = () => {};
-
-    await render(hbs`<PkiGenerateCsr @model={{this.model}} @onComplete={{this.onComplete}} />`, {
-      owner: this.engine,
-    });
-    assert
-      .dom('[data-test-alert-banner="alert"]')
-      .hasText(
-        'Next steps Copy the CSR below for a parent issuer to sign and then import the signed certificate back into this mount.',
-        'renders Next steps alert banner'
-      );
-    assert
-      .dom('[data-test-value-div="CSR"] [data-test-masked-input] button')
-      .hasAttribute('data-clipboard-text', this.model.csr, 'it renders copyable csr');
-    assert
-      .dom('[data-test-value-div="Key ID"] button')
-      .hasAttribute('data-clipboard-text', this.model.keyId, 'it renders copyable key_id');
-    assert.dom('[data-test-value-div="Private key"]').hasText('internal', 'does not render private key');
-    assert
-      .dom('[data-test-value-div="Private key type"]')
-      .hasText('internal', 'does not render private key type');
-  });
-});
diff --git a/ui/tests/integration/components/pki/pki-generate-root-test.js b/ui/tests/integration/components/pki/pki-generate-root-test.js
deleted file mode 100644
index 15538c4ef3367..0000000000000
--- a/ui/tests/integration/components/pki/pki-generate-root-test.js
+++ /dev/null
@@ -1,202 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'vault/tests/helpers';
-import { click, fillIn, render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-import { setupEngine } from 'ember-engines/test-support';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import Sinon from 'sinon';
-import { allowAllCapabilitiesStub } from 'vault/tests/helpers/stubs';
-import { SELECTORS } from 'vault/tests/helpers/pki/pki-generate-root';
-
-module('Integration | Component | pki-generate-root', function (hooks) {
-  setupRenderingTest(hooks);
-  setupMirage(hooks);
-  setupEngine(hooks, 'pki');
-
-  hooks.beforeEach(async function () {
-    this.server.post('/sys/capabilities-self', allowAllCapabilitiesStub());
-    this.store = this.owner.lookup('service:store');
-    this.secretMountPath = this.owner.lookup('service:secret-mount-path');
-    this.secretMountPath.currentPath = 'pki-test';
-    this.urls = this.store.createRecord('pki/config/urls', { id: 'pki-test' });
-    this.model = this.store.createRecord('pki/action');
-    this.onSave = Sinon.spy();
-    this.onCancel = Sinon.spy();
-  });
-
-  test('it renders with correct sections', async function (assert) {
-    await render(
-      hbs`<PkiGenerateRoot @model={{this.model}} @onSave={{this.onSave}} @onCancel={{this.onCancel}} />`,
-      {
-        owner: this.engine,
-      }
-    );
-
-    assert.dom('h2').exists({ count: 1 }, 'One H2 title without @urls');
-    assert.dom(SELECTORS.mainSectionTitle).hasText('Root parameters');
-    assert.dom('[data-test-toggle-group]').exists({ count: 3 }, '3 toggle groups shown');
-  });
-
-  test('it shows the appropriate fields under the toggles', async function (assert) {
-    await render(
-      hbs`<PkiGenerateRoot @model={{this.model}} @onSave={{this.onSave}} @onCancel={{this.onCancel}} />`,
-      {
-        owner: this.engine,
-      }
-    );
-
-    await click(SELECTORS.additionalGroupToggle);
-    assert
-      .dom(SELECTORS.toggleGroupDescription)
-      .hasText('These fields provide more information about the client to which the certificate belongs.');
-    assert
-      .dom(`[data-test-group="Additional subject fields"] ${SELECTORS.formField}`)
-      .exists({ count: 7 }, '7 form fields under Additional Fields toggle');
-
-    await click(SELECTORS.sanGroupToggle);
-    assert
-      .dom(SELECTORS.toggleGroupDescription)
-      .hasText(
-        'SAN fields are an extension that allow you specify additional host names (sites, IP addresses, common names, etc.) to be protected by a single certificate.'
-      );
-    assert
-      .dom(`[data-test-group="Subject Alternative Name (SAN) Options"] ${SELECTORS.formField}`)
-      .exists({ count: 6 }, '7 form fields under SANs toggle');
-
-    await click(SELECTORS.keyParamsGroupToggle);
-    assert
-      .dom(SELECTORS.toggleGroupDescription)
-      .hasText(
-        'Please choose a type to see key parameter options.',
-        'Shows empty state description before type is selected'
-      );
-    assert
-      .dom(`[data-test-group="Key parameters"] ${SELECTORS.formField}`)
-      .exists({ count: 0 }, '0 form fields under keyParams toggle');
-  });
-
-  test('it renders the correct form fields in key params', async function (assert) {
-    this.set('type', '');
-    await render(
-      hbs`<PkiGenerateRoot @model={{this.model}} @onSave={{this.onSave}} @onCancel={{this.onCancel}} />`,
-      {
-        owner: this.engine,
-      }
-    );
-    await click(SELECTORS.keyParamsGroupToggle);
-    assert
-      .dom(`[data-test-group="Key parameters"] ${SELECTORS.formField}`)
-      .exists({ count: 0 }, '0 form fields under keyParams toggle');
-
-    this.set('type', 'exported');
-    await fillIn(SELECTORS.typeField, this.type);
-    assert
-      .dom(SELECTORS.toggleGroupDescription)
-      .hasText(
-        'This certificate type is exported. This means the private key will be returned in the response. Below, you will name the key and define its type and key bits.',
-        `has correct description for type=${this.type}`
-      );
-    assert.strictEqual(this.model.type, this.type);
-    assert
-      .dom(`[data-test-group="Key parameters"] ${SELECTORS.formField}`)
-      .exists({ count: 4 }, '4 form fields under keyParams toggle');
-    assert.dom(SELECTORS.fieldByName('keyName')).exists(`Key name field shown when type=${this.type}`);
-    assert.dom(SELECTORS.fieldByName('keyType')).exists(`Key type field shown when type=${this.type}`);
-    assert.dom(SELECTORS.fieldByName('keyBits')).exists(`Key bits field shown when type=${this.type}`);
-
-    this.set('type', 'internal');
-    await fillIn(SELECTORS.typeField, this.type);
-    assert
-      .dom(SELECTORS.toggleGroupDescription)
-      .hasText(
-        'This certificate type is internal. This means that the private key will not be returned and cannot be retrieved later. Below, you will name the key and define its type and key bits.',
-        `has correct description for type=${this.type}`
-      );
-    assert.strictEqual(this.model.type, this.type);
-    assert
-      .dom(`[data-test-group="Key parameters"] ${SELECTORS.formField}`)
-      .exists({ count: 3 }, '3 form fields under keyParams toggle');
-    assert.dom(SELECTORS.fieldByName('keyName')).exists(`Key name field shown when type=${this.type}`);
-    assert.dom(SELECTORS.fieldByName('keyType')).exists(`Key type field shown when type=${this.type}`);
-    assert.dom(SELECTORS.fieldByName('keyBits')).exists(`Key bits field shown when type=${this.type}`);
-
-    this.set('type', 'existing');
-    await fillIn(SELECTORS.typeField, this.type);
-    assert
-      .dom(SELECTORS.toggleGroupDescription)
-      .hasText(
-        'You chose to use an existing key. This means that we’ll use the key reference to create the CSR or root. Please provide the reference to the key.',
-        `has correct description for type=${this.type}`
-      );
-    assert.strictEqual(this.model.type, this.type);
-    assert
-      .dom(`[data-test-group="Key parameters"] ${SELECTORS.formField}`)
-      .exists({ count: 1 }, '1 form field under keyParams toggle');
-    assert.dom(SELECTORS.fieldByName('keyRef')).exists(`Key reference field shown when type=${this.type}`);
-
-    this.set('type', 'kms');
-    await fillIn(SELECTORS.typeField, this.type);
-    assert
-      .dom(SELECTORS.toggleGroupDescription)
-      .hasText(
-        'This certificate type is kms, meaning managed keys will be used. Below, you will name the key and tell Vault where to find it in your KMS or HSM. Learn more about managed keys.',
-        `has correct description for type=${this.type}`
-      );
-    assert.strictEqual(this.model.type, this.type);
-    assert
-      .dom(`[data-test-group="Key parameters"] ${SELECTORS.formField}`)
-      .exists({ count: 3 }, '3 form fields under keyParams toggle');
-    assert.dom(SELECTORS.fieldByName('keyName')).exists(`Key name field shown when type=${this.type}`);
-    assert
-      .dom(SELECTORS.fieldByName('managedKeyName'))
-      .exists(`Managed key name field shown when type=${this.type}`);
-    assert
-      .dom(SELECTORS.fieldByName('managedKeyId'))
-      .exists(`Managed key id field shown when type=${this.type}`);
-  });
-
-  test('it shows errors before submit if form is invalid', async function (assert) {
-    const saveSpy = Sinon.spy();
-    this.set('onSave', saveSpy);
-    await render(
-      hbs`<PkiGenerateRoot @model={{this.model}} @onSave={{this.onSave}} @onCancel={{this.onCancel}} />`,
-      {
-        owner: this.engine,
-      }
-    );
-
-    await click(SELECTORS.generateRootSave);
-    assert.dom(SELECTORS.formInvalidError).exists('Shows overall error form');
-    assert.ok(saveSpy.notCalled);
-  });
-
-  module('URLs section', function () {
-    test('it does not render when no urls passed', async function (assert) {
-      await render(
-        hbs`<PkiGenerateRoot @model={{this.model}} @onSave={{this.onSave}} @onCancel={{this.onCancel}} />`,
-        {
-          owner: this.engine,
-        }
-      );
-
-      assert.dom(SELECTORS.urlsSection).doesNotExist();
-    });
-
-    test('it renders when urls model passed', async function (assert) {
-      await render(
-        hbs`<PkiGenerateRoot @model={{this.model}} @urls={{this.urls}} @onSave={{this.onSave}} @onCancel={{this.onCancel}} />`,
-        {
-          owner: this.engine,
-        }
-      );
-      assert.dom(SELECTORS.urlsSection).exists();
-      assert.dom('h2').exists({ count: 2 }, 'two H2 titles are visible on page load');
-      assert.dom(SELECTORS.urlSectionTitle).hasText('Issuer URLs');
-    });
-  });
-});
diff --git a/ui/tests/integration/components/pki/pki-generate-toggle-groups-test.js b/ui/tests/integration/components/pki/pki-generate-toggle-groups-test.js
deleted file mode 100644
index b15930b90a063..0000000000000
--- a/ui/tests/integration/components/pki/pki-generate-toggle-groups-test.js
+++ /dev/null
@@ -1,131 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'vault/tests/helpers';
-import { click, render, settled } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-import { setupEngine } from 'ember-engines/test-support';
-
-const selectors = {
-  keys: '[data-test-toggle-group="Key parameters"]',
-  sanOptions: '[data-test-toggle-group="Subject Alternative Name (SAN) Options"]',
-  subjectFields: '[data-test-toggle-group="Additional subject fields"]',
-  toggleByName: (name) => `[data-test-toggle-group="${name}"]`,
-};
-
-module('Integration | Component | PkiGenerateToggleGroups', function (hooks) {
-  setupRenderingTest(hooks);
-  setupEngine(hooks, 'pki');
-
-  hooks.beforeEach(async function () {
-    this.model = this.owner
-      .lookup('service:store')
-      .createRecord('pki/action', { actionType: 'generate-root' });
-  });
-
-  test('it should render key parameters', async function (assert) {
-    await render(hbs`<PkiGenerateToggleGroups @model={{this.model}} />`, { owner: this.engine });
-
-    assert.dom(selectors.keys).hasText('Key parameters', 'Key parameters group renders');
-
-    await click(selectors.keys);
-
-    assert
-      .dom('[data-test-toggle-group-description]')
-      .hasText(
-        'Please choose a type to see key parameter options.',
-        'Placeholder renders for key params when type is not selected'
-      );
-    const fields = {
-      exported: ['keyName', 'keyType', 'keyBits', 'privateKeyFormat'],
-      internal: ['keyName', 'keyType', 'keyBits'],
-      existing: ['keyRef'],
-      kms: ['keyName', 'managedKeyName', 'managedKeyId'],
-    };
-    for (const type in fields) {
-      this.model.type = type;
-      await settled();
-      assert
-        .dom('[data-test-field]')
-        .exists({ count: fields[type].length }, `Correct number of fields render for ${type} type`);
-      fields[type].forEach((key) => {
-        assert.dom(`[data-test-input="${key}"]`).exists(`${key} input renders for ${type} type`);
-      });
-    }
-  });
-
-  test('it should render SAN options', async function (assert) {
-    await render(hbs`<PkiGenerateToggleGroups @model={{this.model}} />`, { owner: this.engine });
-
-    assert
-      .dom(selectors.sanOptions)
-      .hasText('Subject Alternative Name (SAN) Options', 'SAN options group renders');
-
-    await click(selectors.sanOptions);
-
-    const fields = ['excludeCnFromSans', 'subjectSerialNumber', 'altNames', 'ipSans', 'uriSans', 'otherSans'];
-    assert.dom('[data-test-field]').exists({ count: 6 }, `Correct number of fields render`);
-    fields.forEach((key) => {
-      assert.dom(`[data-test-input="${key}"]`).exists(`${key} input renders for generate-root actionType`);
-    });
-
-    this.model.actionType = 'generate-csr';
-    await settled();
-
-    assert
-      .dom('[data-test-field]')
-      .exists({ count: 4 }, 'Correct number of fields render for generate-csr actionType');
-
-    assert
-      .dom('[data-test-input="excludeCnFromSans"]')
-      .doesNotExist('excludeCnFromSans field hidden for generate-csr actionType');
-    assert
-      .dom('[data-test-input="serialNumber"]')
-      .doesNotExist('serialNumber field hidden for generate-csr actionType');
-  });
-
-  test('it should render additional subject fields', async function (assert) {
-    await render(hbs`<PkiGenerateToggleGroups @model={{this.model}} />`, { owner: this.engine });
-
-    assert.dom(selectors.subjectFields).hasText('Additional subject fields', 'SAN options group renders');
-
-    await click(selectors.subjectFields);
-
-    const fields = ['ou', 'organization', 'country', 'locality', 'province', 'streetAddress', 'postalCode'];
-    assert.dom('[data-test-field]').exists({ count: fields.length }, 'Correct number of fields render');
-    fields.forEach((key) => {
-      assert.dom(`[data-test-input="${key}"]`).exists(`${key} input renders`);
-    });
-  });
-
-  test('it should render groups according to the passed @groups', async function (assert) {
-    assert.expect(11);
-    const fieldsA = ['ou', 'organization'];
-    const fieldsZ = ['country', 'locality', 'province', 'streetAddress', 'postalCode'];
-    this.set('groups', {
-      'Group A': fieldsA,
-      'Group Z': fieldsZ,
-    });
-    await render(hbs`<PkiGenerateToggleGroups @model={{this.model}} @groups={{this.groups}} />`, {
-      owner: this.engine,
-    });
-
-    assert.dom(selectors.toggleByName('Group A')).hasText('Group A', 'First group renders');
-    assert.dom(selectors.toggleByName('Group Z')).hasText('Group Z', 'Second group renders');
-
-    await click(selectors.toggleByName('Group A'));
-    assert.dom('[data-test-field]').exists({ count: fieldsA.length }, 'Correct number of fields render');
-    fieldsA.forEach((key) => {
-      assert.dom(`[data-test-input="${key}"]`).exists(`${key} input renders`);
-    });
-
-    await click(selectors.toggleByName('Group Z'));
-    assert.dom('[data-test-field]').exists({ count: fieldsZ.length }, 'Correct number of fields render');
-    fieldsZ.forEach((key) => {
-      assert.dom(`[data-test-input="${key}"]`).exists(`${key} input renders`);
-    });
-  });
-});
diff --git a/ui/tests/integration/components/pki/pki-import-pem-bundle-test.js b/ui/tests/integration/components/pki/pki-import-pem-bundle-test.js
deleted file mode 100644
index 9a5f2078e8ba8..0000000000000
--- a/ui/tests/integration/components/pki/pki-import-pem-bundle-test.js
+++ /dev/null
@@ -1,195 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { render, click, fillIn } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-import { setupEngine } from 'ember-engines/test-support';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import { issuerPemBundle } from 'vault/tests/helpers/pki/values';
-
-module('Integration | Component | PkiImportPemBundle', function (hooks) {
-  setupRenderingTest(hooks);
-  setupMirage(hooks);
-  setupEngine(hooks, 'pki'); // https://github.com/ember-engines/ember-engines/pull/653
-
-  hooks.beforeEach(function () {
-    this.store = this.owner.lookup('service:store');
-    this.model = this.store.createRecord('pki/action');
-    this.backend = 'pki-test';
-    this.secretMountPath = this.owner.lookup('service:secret-mount-path');
-    this.secretMountPath.currentPath = this.backend;
-    this.pemBundle = issuerPemBundle;
-    this.onComplete = () => {};
-  });
-
-  test('it renders import and updates model', async function (assert) {
-    assert.expect(3);
-    await render(
-      hbs`
-      <PkiImportPemBundle
-         @model={{this.model}}
-         @onCancel={{this.onCancel}}
-         @onSave={{this.onSave}}
-         @onComplete={{this.onComplete}}
-       />
-      `,
-      { owner: this.engine }
-    );
-
-    assert.dom('[data-test-pki-import-pem-bundle-form]').exists('renders form');
-    assert.dom('[data-test-component="text-file"]').exists('renders text file input');
-    await click('[data-test-text-toggle]');
-    await fillIn('[data-test-text-file-textarea]', this.pemBundle);
-    assert.strictEqual(this.model.pemBundle, this.pemBundle);
-  });
-
-  test('it sends correct payload to import endpoint', async function (assert) {
-    assert.expect(4);
-    this.server.post(`/${this.backend}/issuers/import/bundle`, (schema, req) => {
-      assert.ok(true, 'Request made to the correct endpoint to import issuer');
-      const request = JSON.parse(req.requestBody);
-      assert.propEqual(
-        request,
-        {
-          pem_bundle: `${this.pemBundle}`,
-        },
-        'sends params in correct type'
-      );
-      return {
-        data: {
-          mapping: { 'issuer-id': 'key-id' },
-        },
-      };
-    });
-
-    this.onSave = () => assert.ok(true, 'onSave callback fires on save success');
-
-    await render(
-      hbs`
-      <PkiImportPemBundle
-         @model={{this.model}}
-         @onCancel={{this.onCancel}}
-         @onSave={{this.onSave}}
-         @onComplete={{this.onComplete}}
-         @adapterOptions={{hash actionType="import" useIssuer=true}}
-       />
-      `,
-      { owner: this.engine }
-    );
-
-    await click('[data-test-text-toggle]');
-    await fillIn('[data-test-text-file-textarea]', this.pemBundle);
-    assert.strictEqual(this.model.pemBundle, this.pemBundle, 'PEM bundle updated on model');
-    await click('[data-test-pki-import-pem-bundle]');
-  });
-
-  test('it hits correct endpoint when userIssuer=false', async function (assert) {
-    assert.expect(4);
-    this.server.post(`${this.backend}/config/ca`, (schema, req) => {
-      assert.ok(true, 'Request made to the correct endpoint to import issuer');
-      const request = JSON.parse(req.requestBody);
-      assert.propEqual(
-        request,
-        {
-          pem_bundle: `${this.pemBundle}`,
-        },
-        'sends params in correct type'
-      );
-      return {
-        data: {
-          mapping: {},
-        },
-      };
-    });
-
-    this.onSave = () => assert.ok(true, 'onSave callback fires on save success');
-
-    await render(
-      hbs`
-      <PkiImportPemBundle
-         @model={{this.model}}
-         @onCancel={{this.onCancel}}
-         @onSave={{this.onSave}}
-         @onComplete={{this.onComplete}}
-         @adapterOptions={{hash actionType="import" useIssuer=false}}
-       />
-      `,
-      { owner: this.engine }
-    );
-
-    await click('[data-test-text-toggle]');
-    await fillIn('[data-test-text-file-textarea]', this.pemBundle);
-    assert.strictEqual(this.model.pemBundle, this.pemBundle);
-    await click('[data-test-pki-import-pem-bundle]');
-  });
-
-  test('it shows the bundle mapping on success', async function (assert) {
-    assert.expect(9);
-    this.server.post(`/${this.backend}/issuers/import/bundle`, () => {
-      return {
-        data: {
-          imported_issuers: ['issuer-id', 'another-issuer'],
-          imported_keys: ['key-id', 'another-key'],
-          mapping: { 'issuer-id': 'key-id', 'another-issuer': null },
-        },
-      };
-    });
-
-    this.onSave = () => assert.ok(true, 'onSave callback fires on save success');
-    this.onComplete = () => assert.ok(true, 'onComplete callback fires on done button click');
-
-    await render(
-      hbs`
-      <PkiImportPemBundle
-         @model={{this.model}}
-         @onCancel={{this.onCancel}}
-         @onSave={{this.onSave}}
-         @onComplete={{this.onComplete}}
-         @adapterOptions={{hash actionType="import" useIssuer=true}}
-       />
-      `,
-      { owner: this.engine }
-    );
-
-    await click('[data-test-text-toggle]');
-    await fillIn('[data-test-text-file-textarea]', this.pemBundle);
-    await click('[data-test-pki-import-pem-bundle]');
-
-    assert
-      .dom('[data-test-import-pair]')
-      .exists({ count: 3 }, 'Shows correct number of rows for imported items');
-    // Check that each row has expected values
-    assert.dom('[data-test-import-pair="issuer-id_key-id"] [data-test-imported-issuer]').hasText('issuer-id');
-    assert.dom('[data-test-import-pair="issuer-id_key-id"] [data-test-imported-key]').hasText('key-id');
-    assert
-      .dom('[data-test-import-pair="another-issuer_"] [data-test-imported-issuer]')
-      .hasText('another-issuer');
-    assert.dom('[data-test-import-pair="another-issuer_"] [data-test-imported-key]').hasText('None');
-    assert.dom('[data-test-import-pair="_another-key"] [data-test-imported-issuer]').hasText('None');
-    assert.dom('[data-test-import-pair="_another-key"] [data-test-imported-key]').hasText('another-key');
-    await click('[data-test-done]');
-  });
-
-  test('it should unload record on cancel', async function (assert) {
-    assert.expect(2);
-    this.onCancel = () => assert.ok(true, 'onCancel callback fires');
-    await render(
-      hbs`
-        <PkiImportPemBundle
-          @model={{this.model}}
-          @onCancel={{this.onCancel}}
-          @onComplete={{this.onComplete}}
-          @onSave={{this.onSave}}
-        />
-      `,
-      { owner: this.engine }
-    );
-
-    await click('[data-test-pki-ca-cert-cancel]');
-    assert.true(this.model.isDestroyed, 'new model is unloaded on cancel');
-  });
-});
diff --git a/ui/tests/integration/components/pki/pki-issuer-cross-sign-test.js b/ui/tests/integration/components/pki/pki-issuer-cross-sign-test.js
deleted file mode 100644
index 454416620dd65..0000000000000
--- a/ui/tests/integration/components/pki/pki-issuer-cross-sign-test.js
+++ /dev/null
@@ -1,381 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'vault/tests/helpers';
-import { click, fillIn, render } from '@ember/test-helpers';
-import { setupEngine } from 'ember-engines/test-support';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import { Response } from 'miragejs';
-import { hbs } from 'ember-cli-htmlbars';
-import {
-  intIssuerCert,
-  newCSR,
-  newlySignedCert,
-  oldParentIssuerCert,
-  parentIssuerCert,
-  unsupportedOids,
-} from 'vault/tests/helpers/pki/values';
-import { SELECTORS } from 'vault/tests/helpers/pki/pki-issuer-cross-sign';
-
-const FIELDS = [
-  {
-    label: 'Mount path',
-    key: 'intermediateMount',
-    placeholder: 'Mount path',
-    helpText: 'The mount in which your new certificate can be found.',
-  },
-  {
-    label: "Issuer's current name",
-    key: 'intermediateIssuer',
-    placeholder: 'Current issuer name',
-    helpText: 'The API name of the previous intermediate which was cross-signed.',
-  },
-  {
-    label: 'New issuer name',
-    key: 'newCrossSignedIssuer',
-    placeholder: 'Enter a new issuer name',
-    helpText: `This is your new issuer’s name in the API.`,
-  },
-];
-module('Integration | Component | pki issuer cross sign', function (hooks) {
-  setupRenderingTest(hooks);
-  setupEngine(hooks, 'pki');
-  setupMirage(hooks);
-
-  hooks.beforeEach(async function () {
-    const store = this.owner.lookup('service:store');
-    this.backend = 'my-parent-issuer-mount';
-    this.intMountPath = 'int-mount';
-    this.owner.lookup('service:secret-mount-path').update(this.backend);
-
-    // parent issuer
-    this.parentIssuerData = {
-      ca_chain: [parentIssuerCert],
-      certificate: parentIssuerCert,
-      crl_distribution_points: [],
-      issuer_id: '0c983955-6426-22b2-1b3f-c0bdca40fd15',
-      issuer_name: 'my-parent-issuer-name',
-      issuing_certificates: [],
-      key_id: '8b8d0017-a067-ac50-c5cf-475876f9aac5',
-      leaf_not_after_behavior: 'err',
-      manual_chain: null,
-      ocsp_servers: [],
-      revocation_signature_algorithm: 'SHA256WithRSA',
-      revoked: false,
-      usage: 'crl-signing,issuing-certificates,ocsp-signing,read-only',
-    };
-    // intermediate issuer
-    this.intIssuerData = {
-      ca_chain: [intIssuerCert, oldParentIssuerCert],
-      certificate: intIssuerCert,
-      crl_distribution_points: [],
-      issuer_id: '6c286455-7904-5698-bf86-8aba81e680e6',
-      issuer_name: 'source-int-name',
-      issuing_certificates: [],
-      key_id: '2e2b8baf-4dac-c46f-cee4-8afbc7f2d8b2',
-      leaf_not_after_behavior: 'err',
-      manual_chain: null,
-      ocsp_servers: [],
-      revocation_signature_algorithm: '',
-      revoked: false,
-      usage: 'crl-signing,issuing-certificates,ocsp-signing,read-only',
-    };
-    // newly cross signed issuer
-    this.newIssuerData = {
-      ca_chain: [newlySignedCert, parentIssuerCert],
-      certificate: newlySignedCert,
-      crl_distribution_points: [],
-      issuer_id: 'bc159ba8-930c-c894-e871-2f3e889e8e02',
-      issuer_name: 'newly-cross-signed-cert',
-      issuing_certificates: [],
-      key_id: '2e2b8baf-4dac-c46f-cee4-8afbc7f2d8b2',
-      leaf_not_after_behavior: 'err',
-      manual_chain: null,
-      ocsp_servers: [],
-      revocation_signature_algorithm: '',
-      revoked: false,
-      usage: 'crl-signing,issuing-certificates,ocsp-signing,read-only',
-    };
-
-    this.testInputs = {
-      intermediateMount: this.intMountPath,
-      intermediateIssuer: this.intIssuerData.issuer_name,
-      newCrossSignedIssuer: this.newIssuerData.issuer_name,
-    };
-
-    store.pushPayload('pki/issuer', { modelName: 'pki/issuer', data: this.parentIssuerData });
-    this.parentIssuerModel = store.peekRecord('pki/issuer', this.parentIssuerData.issuer_id);
-  });
-
-  test('it makes requests to the correct endpoints', async function (assert) {
-    assert.expect(18);
-    this.server.get(`/${this.intMountPath}/issuer/${this.intIssuerData.issuer_name}`, () => {
-      assert.ok(true, 'Step 1. GET request is made to fetch existing issuer data');
-      return { data: this.intIssuerData };
-    });
-    this.server.post(`/${this.intMountPath}/intermediate/generate/existing`, (schema, req) => {
-      assert.ok(true, 'Step 2. POST request is made to generate new CSR');
-      assert.propEqual(
-        JSON.parse(req.requestBody),
-        {
-          common_name: newCSR.common_name,
-          country: null,
-          exclude_cn_from_sans: false,
-          format: 'pem',
-          locality: null,
-          organization: null,
-          ou: null,
-          province: null,
-          key_ref: this.intIssuerData.key_id,
-        },
-        'payload contains correct key ref'
-      );
-      return { data: { csr: newCSR.csr, key_id: this.intIssuerData.key_id } };
-    });
-    this.server.post(
-      `/${this.backend}/issuer/${this.parentIssuerData.issuer_name}/sign-intermediate`,
-      (schema, req) => {
-        assert.ok(true, 'Step 3. POST request is made to sign CSR with new parent issuer');
-        assert.propEqual(JSON.parse(req.requestBody), newCSR, 'payload has common name and csr');
-        return { data: { ca_chain: [newlySignedCert, parentIssuerCert] } };
-      }
-    );
-    this.server.post(`/${this.intMountPath}/issuers/import/bundle`, (schema, req) => {
-      assert.ok(true, 'Step 4. POST request made to import issuer');
-      assert.propEqual(
-        JSON.parse(req.requestBody),
-        { pem_bundle: [newlySignedCert, parentIssuerCert].join('\n') },
-        'payload contains pem bundle'
-      );
-      return {
-        data: {
-          imported_issuers: null,
-          imported_keys: null,
-          mapping: { [this.newIssuerData.issuer_id]: this.intIssuerData.key_id },
-        },
-      };
-    });
-    this.server.get(`/${this.intMountPath}/issuer/${this.newIssuerData.issuer_id}`, () => {
-      assert.ok(true, 'Step 5. GET request is made to newly imported issuer');
-      return { data: this.newIssuerData };
-    });
-
-    this.server.post(`/${this.intMountPath}/issuer/${this.newIssuerData.issuer_id}`, (schema, req) => {
-      assert.ok(true, 'Step 6. POST request is made to update issuer name');
-      assert.propEqual(
-        JSON.parse(req.requestBody),
-        {
-          issuer_name: 'newly-cross-signed-cert',
-          leaf_not_after_behavior: 'err',
-          usage: 'crl-signing,issuing-certificates,ocsp-signing,read-only',
-        },
-        'payload has correct data '
-      );
-      return { data: this.newIssuerData };
-    });
-
-    await render(hbs`<PkiIssuerCrossSign @parentIssuer={{this.parentIssuerModel}} /> `, {
-      owner: this.engine,
-    });
-    // fill out form and submit
-    for (const field of FIELDS) {
-      await fillIn(SELECTORS.objectListInput(field.key), this.testInputs[field.key]);
-    }
-    await click(SELECTORS.submitButton);
-
-    assert.dom(SELECTORS.statusCount).hasText('Cross-signing complete (1 successful, 0 errors)');
-    assert
-      .dom(`${SELECTORS.signedIssuerRow()} [data-test-icon="check-circle"]`)
-      .exists('row has success icon');
-    for (const field of FIELDS) {
-      assert
-        .dom(`${SELECTORS.signedIssuerCol(field.key)}`)
-        .hasText(this.testInputs[field.key], `${field.key} displays correct value`);
-      assert.dom(`${SELECTORS.signedIssuerCol(field.key)} a`).hasTagName('a');
-    }
-  });
-
-  test('it cross-signs multiple certs', async function (assert) {
-    assert.expect(13);
-    const nonexistentIssuer = {
-      intermediateMount: this.intMountPath,
-      intermediateIssuer: 'some-fake-issuer',
-      newCrossSignedIssuer: 'failed-cert-1',
-    };
-    const unsupportedCert = {
-      intermediateMount: this.intMountPath,
-      intermediateIssuer: 'some-fancy-issuer',
-      newCrossSignedIssuer: 'failed-cert-2',
-    };
-
-    this.server.get(`/${this.intMountPath}/issuer/${this.intIssuerData.issuer_name}`, () => {
-      assert.ok(true, 'request is made to sign first cert');
-      return { data: this.intIssuerData };
-    });
-
-    this.server.get(`/${this.intMountPath}/issuer/${nonexistentIssuer.intermediateIssuer}`, () => {
-      assert.ok(true, 'request is made to second cert');
-      return new Response(
-        500,
-        { 'Content-Type': 'application/json' },
-        JSON.stringify({
-          errors: [
-            `1 error occurred:\n\t* unable to find PKI issuer for reference: ${nonexistentIssuer.intermediateIssuer}\n\n`,
-          ],
-        })
-      );
-    });
-
-    this.server.get(`/${this.intMountPath}/issuer/${unsupportedCert.intermediateIssuer}`, () => {
-      assert.ok(true, 'request is made to third cert');
-      return { data: { isser_name: unsupportedCert.intermediateIssuer, certificate: unsupportedOids } };
-    });
-
-    await render(hbs`<PkiIssuerCrossSign @parentIssuer={{this.parentIssuerModel}} /> `, {
-      owner: this.engine,
-    });
-
-    // fill out form and submit
-    for (const field of FIELDS) {
-      await fillIn(SELECTORS.objectListInput(field.key), this.testInputs[field.key]);
-    }
-    await click(SELECTORS.addRow);
-    for (const field of FIELDS) {
-      await fillIn(SELECTORS.objectListInput(field.key, 1), nonexistentIssuer[field.key]);
-    }
-    await click(SELECTORS.addRow);
-    for (const field of FIELDS) {
-      await fillIn(SELECTORS.objectListInput(field.key, 2), unsupportedCert[field.key]);
-    }
-    await click(SELECTORS.submitButton);
-
-    assert.dom(SELECTORS.statusCount).hasText('Cross-signing complete (0 successful, 3 errors)');
-    for (const field of FIELDS) {
-      assert
-        .dom(`${SELECTORS.signedIssuerRow()} ${SELECTORS.signedIssuerCol(field.key)}`)
-        .hasText(this.testInputs[field.key], `first row has correct values`);
-    }
-    for (const field of FIELDS) {
-      assert
-        .dom(`${SELECTORS.signedIssuerRow(1)} ${SELECTORS.signedIssuerCol(field.key)}`)
-        .hasText(nonexistentIssuer[field.key], `second row has correct values`);
-    }
-    for (const field of FIELDS) {
-      assert
-        .dom(`${SELECTORS.signedIssuerRow(2)} ${SELECTORS.signedIssuerCol(field.key)}`)
-        .hasText(unsupportedCert[field.key], `third row has correct values`);
-    }
-  });
-
-  test('it returns API errors when a request fails', async function (assert) {
-    assert.expect(7);
-    this.server.get(`/${this.intMountPath}/issuer/${this.intIssuerData.issuer_name}`, () => {
-      return new Response(
-        500,
-        { 'Content-Type': 'application/json' },
-        JSON.stringify({
-          errors: ['1 error occurred:\n\t* unable to find PKI issuer for reference: nonexistent-mount\n\n'],
-        })
-      );
-    });
-
-    await render(hbs`<PkiIssuerCrossSign @parentIssuer={{this.parentIssuerModel}} /> `, {
-      owner: this.engine,
-    });
-
-    // fill out form and submit
-    for (const field of FIELDS) {
-      await fillIn(SELECTORS.objectListInput(field.key), this.testInputs[field.key]);
-    }
-    await click(SELECTORS.submitButton);
-
-    assert.dom(SELECTORS.statusCount).hasText('Cross-signing complete (0 successful, 1 error)');
-    assert
-      .dom(`${SELECTORS.signedIssuerRow()} [data-test-icon="alert-circle-fill"]`)
-      .exists('row has failure icon');
-
-    assert.dom('[data-test-alert-banner="alert"] .message-title').hasText('Cross-sign failed');
-    assert
-      .dom('[data-test-alert-banner="alert"] .alert-banner-message-body')
-      .hasText('1 error occurred: * unable to find PKI issuer for reference: nonexistent-mount');
-
-    for (const field of FIELDS) {
-      assert
-        .dom(`${SELECTORS.signedIssuerCol(field.key)}`)
-        .hasText(this.testInputs[field.key], `${field.key} displays correct value`);
-    }
-  });
-
-  test('it returns an error when a certificate contains unsupported values', async function (assert) {
-    assert.expect(7);
-    const unsupportedIssuerCert = { ...this.intIssuerData, certificate: unsupportedOids };
-    this.server.get(`/${this.intMountPath}/issuer/${this.intIssuerData.issuer_name}`, () => {
-      return { data: unsupportedIssuerCert };
-    });
-
-    await render(hbs`<PkiIssuerCrossSign @parentIssuer={{this.parentIssuerModel}} /> `, {
-      owner: this.engine,
-    });
-    // fill out form and submit
-    for (const field of FIELDS) {
-      await fillIn(SELECTORS.objectListInput(field.key), this.testInputs[field.key]);
-    }
-    await click(SELECTORS.submitButton);
-    assert.dom(SELECTORS.statusCount).hasText('Cross-signing complete (0 successful, 1 error)');
-    assert
-      .dom(`${SELECTORS.signedIssuerRow()} [data-test-icon="alert-circle-fill"]`)
-      .exists('row has failure icon');
-    assert
-      .dom('[data-test-alert-banner="alert"] .message-title')
-      .hasText('Certificate must be manually cross-signed using the CLI.');
-    assert
-      .dom('[data-test-alert-banner="alert"] .alert-banner-message-body')
-      .hasText(
-        'certificate contains unsupported subject OIDs: 1.2.840.113549.1.9.1, certificate contains unsupported extension OIDs: 2.5.29.37'
-      );
-
-    for (const field of FIELDS) {
-      assert
-        .dom(`${SELECTORS.signedIssuerCol(field.key)}`)
-        .hasText(this.testInputs[field.key], `${field.key} displays correct value`);
-    }
-  });
-
-  test('it returns an error when attempting to self-cross-sign', async function (assert) {
-    assert.expect(7);
-    this.testInputs = {
-      intermediateMount: this.backend,
-      intermediateIssuer: this.parentIssuerData.issuer_name,
-      newCrossSignedIssuer: this.newIssuerData.issuer_name,
-    };
-    this.server.get(`/${this.backend}/issuer/${this.parentIssuerData.issuer_name}`, () => {
-      return { data: this.parentIssuerData };
-    });
-
-    await render(hbs`<PkiIssuerCrossSign @parentIssuer={{this.parentIssuerModel}} /> `, {
-      owner: this.engine,
-    });
-    // fill out form and submit
-    for (const field of FIELDS) {
-      await fillIn(SELECTORS.objectListInput(field.key), this.testInputs[field.key]);
-    }
-    await click(SELECTORS.submitButton);
-    assert.dom(SELECTORS.statusCount).hasText('Cross-signing complete (0 successful, 1 error)');
-    assert
-      .dom(`${SELECTORS.signedIssuerRow()} [data-test-icon="alert-circle-fill"]`)
-      .exists('row has failure icon');
-    assert.dom('[data-test-alert-banner="alert"] .message-title').hasText('Cross-sign failed');
-    assert
-      .dom('[data-test-alert-banner="alert"] .alert-banner-message-body')
-      .hasText('Cross-signing a root issuer with itself must be performed manually using the CLI.');
-
-    for (const field of FIELDS) {
-      assert
-        .dom(`${SELECTORS.signedIssuerCol(field.key)}`)
-        .hasText(this.testInputs[field.key], `${field.key} displays correct value`);
-    }
-  });
-});
diff --git a/ui/tests/integration/components/pki/pki-issuer-details-test.js b/ui/tests/integration/components/pki/pki-issuer-details-test.js
deleted file mode 100644
index 7fb5b6a7f7bf0..0000000000000
--- a/ui/tests/integration/components/pki/pki-issuer-details-test.js
+++ /dev/null
@@ -1,170 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'vault/tests/helpers';
-import { render, settled } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-import { setupEngine } from 'ember-engines/test-support';
-import { SELECTORS } from 'vault/tests/helpers/pki/pki-issuer-details';
-
-module('Integration | Component | page/pki-issuer-details', function (hooks) {
-  setupRenderingTest(hooks);
-  setupEngine(hooks, 'pki');
-
-  hooks.beforeEach(async function () {
-    this.context = { owner: this.engine };
-    this.store = this.owner.lookup('service:store');
-    this.secretMountPath = this.owner.lookup('service:secret-mount-path');
-    this.secretMountPath.currentPath = 'pki-test';
-    this.issuer = this.store.createRecord('pki/issuer', { issuerId: 'abcd-efgh' });
-  });
-
-  test('it renders with correct toolbar by default', async function (assert) {
-    await render(
-      hbs`
-      <Page::PkiIssuerDetails @issuer={{this.issuer}} />
-      <div id="modal-wormhole"></div>
-      `,
-      this.context
-    );
-
-    assert.dom(SELECTORS.rotateRoot).doesNotExist();
-    assert.dom(SELECTORS.crossSign).doesNotExist();
-    assert.dom(SELECTORS.signIntermediate).doesNotExist();
-    assert.dom(SELECTORS.download).hasText('Download');
-    assert.dom(SELECTORS.configure).doesNotExist();
-    assert.dom(SELECTORS.parsingAlertBanner).doesNotExist();
-  });
-
-  test('it renders toolbar actions depending on passed capabilities', async function (assert) {
-    this.set('isRotatable', true);
-    this.set('canRotate', true);
-    this.set('canCrossSign', true);
-    this.set('canSignIntermediate', true);
-    this.set('canConfigure', true);
-
-    await render(
-      hbs`
-      <Page::PkiIssuerDetails
-        @issuer={{this.issuer}}
-        @isRotatable={{this.isRotatable}}
-        @canRotate={{this.canRotate}}
-        @canCrossSign={{this.canCrossSign}}
-        @canSignIntermediate={{this.canSignIntermediate}}
-        @canConfigure={{this.canConfigure}}
-      />
-      <div id="modal-wormhole"></div>
-      `,
-      this.context
-    );
-
-    assert.dom(SELECTORS.parsingAlertBanner).doesNotExist();
-    assert.dom(SELECTORS.rotateRoot).hasText('Rotate this root');
-    assert.dom(SELECTORS.crossSign).hasText('Cross-sign issuers');
-    assert.dom(SELECTORS.signIntermediate).hasText('Sign Intermediate');
-    assert.dom(SELECTORS.download).hasText('Download');
-    assert.dom(SELECTORS.configure).hasText('Configure');
-
-    this.set('canRotate', false);
-    this.set('canCrossSign', false);
-    this.set('canSignIntermediate', false);
-    this.set('canConfigure', false);
-    await settled();
-
-    assert.dom(SELECTORS.rotateRoot).doesNotExist();
-    assert.dom(SELECTORS.crossSign).doesNotExist();
-    assert.dom(SELECTORS.signIntermediate).doesNotExist();
-    assert.dom(SELECTORS.download).hasText('Download');
-    assert.dom(SELECTORS.configure).doesNotExist();
-  });
-
-  test('it renders parsing error banner if issuer certificate contains unsupported OIDs', async function (assert) {
-    this.issuer.parsedCertificate = {
-      common_name: 'fancy-cert-unsupported-subj-and-ext-oids',
-      subject_serial_number: null,
-      ou: null,
-      organization: 'Acme, Inc',
-      country: 'US',
-      locality: 'Topeka',
-      province: 'Kansas',
-      street_address: null,
-      parsing_errors: [new Error('certificate contains stuff we cannot parse')],
-      can_parse: true,
-    };
-    await render(
-      hbs`
-      <Page::PkiIssuerDetails @issuer={{this.issuer}} />
-      <div id="modal-wormhole"></div>
-      `,
-      this.context
-    );
-
-    assert.dom(SELECTORS.parsingAlertBanner).exists();
-    assert
-      .dom(SELECTORS.parsingAlertBanner)
-      .hasText(
-        "There was an error parsing certificate metadata Vault cannot display unparsed values, but this will not interfere with the certificate's functionality. However, if you wish to cross-sign this issuer it must be done manually using the CLI. Parsing error(s): certificate contains stuff we cannot parse"
-      );
-  });
-
-  test('it renders parsing error banner if can_parse=false but no parsing_errors', async function (assert) {
-    this.issuer.parsedCertificate = {
-      common_name: 'fancy-cert-unsupported-subj-and-ext-oids',
-      subject_serial_number: null,
-      ou: null,
-      organization: 'Acme, Inc',
-      country: 'US',
-      locality: 'Topeka',
-      province: 'Kansas',
-      street_address: null,
-      parsing_errors: [],
-      can_parse: false,
-    };
-    await render(
-      hbs`
-      <Page::PkiIssuerDetails @issuer={{this.issuer}} />
-      <div id="modal-wormhole"></div>
-      `,
-      this.context
-    );
-
-    assert.dom(SELECTORS.parsingAlertBanner).exists();
-    assert
-      .dom(SELECTORS.parsingAlertBanner)
-      .hasText(
-        "There was an error parsing certificate metadata Vault cannot display unparsed values, but this will not interfere with the certificate's functionality. However, if you wish to cross-sign this issuer it must be done manually using the CLI."
-      );
-  });
-
-  test('it renders parsing error banner if no key for parsing_errors', async function (assert) {
-    this.issuer.parsedCertificate = {
-      common_name: 'fancy-cert-unsupported-subj-and-ext-oids',
-      subject_serial_number: null,
-      ou: null,
-      organization: 'Acme, Inc',
-      country: 'US',
-      locality: 'Topeka',
-      province: 'Kansas',
-      street_address: null,
-      can_parse: false,
-    };
-
-    await render(
-      hbs`
-      <Page::PkiIssuerDetails @issuer={{this.issuer}} />
-      <div id="modal-wormhole"></div>
-      `,
-      this.context
-    );
-
-    assert.dom(SELECTORS.parsingAlertBanner).exists();
-    assert
-      .dom(SELECTORS.parsingAlertBanner)
-      .hasText(
-        "There was an error parsing certificate metadata Vault cannot display unparsed values, but this will not interfere with the certificate's functionality. However, if you wish to cross-sign this issuer it must be done manually using the CLI."
-      );
-  });
-});
diff --git a/ui/tests/integration/components/pki/pki-key-form-test.js b/ui/tests/integration/components/pki/pki-key-form-test.js
deleted file mode 100644
index cbf9140c7b8b0..0000000000000
--- a/ui/tests/integration/components/pki/pki-key-form-test.js
+++ /dev/null
@@ -1,130 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { render, click, fillIn } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-import { setupEngine } from 'ember-engines/test-support';
-import { SELECTORS } from 'vault/tests/helpers/pki/pki-key-form';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import sinon from 'sinon';
-
-module('Integration | Component | pki key form', function (hooks) {
-  setupRenderingTest(hooks);
-  setupMirage(hooks);
-  setupEngine(hooks, 'pki'); // https://github.com/ember-engines/ember-engines/pull/653
-
-  hooks.beforeEach(function () {
-    this.store = this.owner.lookup('service:store');
-    this.model = this.store.createRecord('pki/key');
-    this.backend = 'pki-test';
-    this.secretMountPath = this.owner.lookup('service:secret-mount-path');
-    this.secretMountPath.currentPath = this.backend;
-    this.onCancel = sinon.spy();
-  });
-
-  test('it should render fields and show validation messages', async function (assert) {
-    assert.expect(7);
-    await render(
-      hbs`
-      <PkiKeyForm
-         @model={{this.model}}
-         @onCancel={{this.onCancel}}
-         @onSave={{this.onSave}}
-       />
-      `,
-      { owner: this.engine }
-    );
-    assert.dom(SELECTORS.keyNameInput).exists('renders name input');
-    assert.dom(SELECTORS.typeInput).exists('renders type input');
-    assert.dom(SELECTORS.keyTypeInput).exists('renders key type input');
-    assert.dom(SELECTORS.keyBitsInput).exists('renders key bits input');
-
-    await click(SELECTORS.keyCreateButton);
-    assert
-      .dom(SELECTORS.fieldErrorByName('type'))
-      .hasTextContaining('Type is required.', 'renders presence validation for type of key');
-    assert
-      .dom(SELECTORS.fieldErrorByName('keyType'))
-      .hasTextContaining('Please select a key type.', 'renders selection prompt for key type');
-    assert
-      .dom(SELECTORS.validationError)
-      .hasTextContaining('There are 2 errors with this form.', 'renders correct form error count');
-  });
-
-  test('it generates a key type=exported', async function (assert) {
-    assert.expect(4);
-    this.server.post(`/${this.backend}/keys/generate/exported`, (schema, req) => {
-      assert.ok(true, 'Request made to the correct endpoint to generate exported key');
-      const request = JSON.parse(req.requestBody);
-      assert.propEqual(
-        request,
-        {
-          key_name: 'test-key',
-          key_type: 'rsa',
-          key_bits: '2048',
-        },
-        'sends params in correct type'
-      );
-      return {};
-    });
-
-    this.onSave = () => assert.ok(true, 'onSave callback fires on save success');
-
-    await render(
-      hbs`
-      <PkiKeyForm
-         @model={{this.model}}
-         @onCancel={{this.onCancel}}
-         @onSave={{this.onSave}}
-       />
-      `,
-      { owner: this.engine }
-    );
-
-    await fillIn(SELECTORS.keyNameInput, 'test-key');
-    await fillIn(SELECTORS.typeInput, 'exported');
-    assert.dom(SELECTORS.keyBitsInput).isDisabled('key bits disabled when no key type selected');
-    await fillIn(SELECTORS.keyTypeInput, 'rsa');
-    await click(SELECTORS.keyCreateButton);
-  });
-
-  test('it generates a key type=internal', async function (assert) {
-    assert.expect(4);
-    this.server.post(`/${this.backend}/keys/generate/internal`, (schema, req) => {
-      assert.ok(true, 'Request made to the correct endpoint to generate internal key');
-      const request = JSON.parse(req.requestBody);
-      assert.propEqual(
-        request,
-        {
-          key_name: 'test-key',
-          key_type: 'rsa',
-          key_bits: '2048',
-        },
-        'sends params in correct type'
-      );
-      return {};
-    });
-    this.onSave = () => assert.ok(true, 'onSave callback fires on save success');
-
-    await render(
-      hbs`
-      <PkiKeyForm
-         @model={{this.model}}
-         @onCancel={{this.onCancel}}
-         @onSave={{this.onSave}}
-       />
-      `,
-      { owner: this.engine }
-    );
-
-    await fillIn(SELECTORS.keyNameInput, 'test-key');
-    await fillIn(SELECTORS.typeInput, 'internal');
-    assert.dom(SELECTORS.keyBitsInput).isDisabled('key bits disabled when no key type selected');
-    await fillIn(SELECTORS.keyTypeInput, 'rsa');
-    await click(SELECTORS.keyCreateButton);
-  });
-});
diff --git a/ui/tests/integration/components/pki/pki-key-parameters-test.js b/ui/tests/integration/components/pki/pki-key-parameters-test.js
deleted file mode 100644
index 949dc705d5c84..0000000000000
--- a/ui/tests/integration/components/pki/pki-key-parameters-test.js
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { render, fillIn } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-import { setupEngine } from 'ember-engines/test-support';
-import { SELECTORS } from 'vault/tests/helpers/pki/pki-role-form';
-
-module('Integration | Component | pki key parameters', function (hooks) {
-  setupRenderingTest(hooks);
-  setupEngine(hooks, 'pki');
-
-  hooks.beforeEach(function () {
-    this.store = this.owner.lookup('service:store');
-    this.model = this.store.createRecord('pki/role', { backend: 'pki' });
-    [this.fields] = Object.values(this.model.formFieldGroups.find((g) => g['Key parameters']));
-  });
-
-  test('it should render the component and display the correct defaults', async function (assert) {
-    assert.expect(3);
-    await render(
-      hbs`
-      <div class="has-top-margin-xxl">
-        <PkiKeyParameters
-          @model={{this.model}}
-          @fields={{this.fields}}
-        />
-       </div>
-  `,
-      { owner: this.engine }
-    );
-    assert.dom(SELECTORS.keyType).hasValue('rsa');
-    assert.dom(SELECTORS.keyBits).hasValue('2048');
-    assert.dom(SELECTORS.signatureBits).hasValue('0');
-  });
-
-  test('it should set the model properties of key_type and key_bits when key_type changes', async function (assert) {
-    assert.expect(11);
-    await render(
-      hbs`
-      <div class="has-top-margin-xxl">
-        <PkiKeyParameters
-          @model={{this.model}}
-          @fields={{this.fields}}
-        />
-       </div>
-  `,
-      { owner: this.engine }
-    );
-    assert.strictEqual(this.model.keyType, 'rsa', 'sets the default value for key_type on the model.');
-    assert.strictEqual(this.model.keyBits, '2048', 'sets the default value for key_bits on the model.');
-    assert.strictEqual(
-      this.model.signatureBits,
-      '0',
-      'sets the default value for signature_bits on the model.'
-    );
-    await fillIn(SELECTORS.keyType, 'ec');
-    assert.strictEqual(this.model.keyType, 'ec', 'sets the new selected value for key_type on the model.');
-    assert.strictEqual(
-      this.model.keyBits,
-      '256',
-      'sets the new selected value for key_bits on the model based on the selection of key_type.'
-    );
-
-    await fillIn(SELECTORS.keyType, 'ed25519');
-    assert.strictEqual(
-      this.model.keyType,
-      'ed25519',
-      'sets the new selected value for key_type on the model.'
-    );
-    assert.strictEqual(
-      this.model.keyBits,
-      '0',
-      'sets the new selected value for key_bits on the model based on the selection of key_type.'
-    );
-
-    await fillIn(SELECTORS.keyType, 'ec');
-    await fillIn(SELECTORS.keyBits, '384');
-    assert.strictEqual(this.model.keyType, 'ec', 'sets the new selected value for key_type on the model.');
-    assert.strictEqual(
-      this.model.keyBits,
-      '384',
-      'sets the new selected value for key_bits on the model based on the selection of key_type.'
-    );
-
-    await fillIn(SELECTORS.signatureBits, '384');
-    assert.strictEqual(
-      this.model.signatureBits,
-      '384',
-      'sets the new selected value for signature_bits on the model.'
-    );
-
-    await fillIn(SELECTORS.signatureBits, '0');
-    assert.strictEqual(
-      this.model.signatureBits,
-      '0',
-      'sets the default value for signature_bits on the model.'
-    );
-  });
-});
diff --git a/ui/tests/integration/components/pki/pki-key-usage-test.js b/ui/tests/integration/components/pki/pki-key-usage-test.js
deleted file mode 100644
index 0bbe5fa6d9fd1..0000000000000
--- a/ui/tests/integration/components/pki/pki-key-usage-test.js
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { render, click, findAll } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-import { setupEngine } from 'ember-engines/test-support';
-import { SELECTORS } from 'vault/tests/helpers/pki/pki-role-form';
-
-module('Integration | Component | pki-key-usage', function (hooks) {
-  setupRenderingTest(hooks);
-  setupEngine(hooks, 'pki');
-
-  hooks.beforeEach(function () {
-    this.store = this.owner.lookup('service:store');
-    this.model = this.store.createRecord('pki/role');
-    this.model.backend = 'pki';
-  });
-
-  test('it should render the component', async function (assert) {
-    assert.expect(6);
-    await render(
-      hbs`
-      <div class="has-top-margin-xxl">
-        <PkiKeyUsage
-          @model={{this.model}}
-        />
-       </div>
-  `,
-      { owner: this.engine }
-    );
-    assert.strictEqual(findAll('.b-checkbox').length, 19, 'it render 19 checkboxes');
-    assert.dom(SELECTORS.digitalSignature).isChecked('Digital Signature is true by default');
-    assert.dom(SELECTORS.keyAgreement).isChecked('Key Agreement is true by default');
-    assert.dom(SELECTORS.keyEncipherment).isChecked('Key Encipherment is true by default');
-    assert.dom(SELECTORS.any).isNotChecked('Any is false by default');
-    assert.dom(SELECTORS.extKeyUsageOids).exists('Extended Key usage oids renders');
-  });
-
-  test('it should set the model properties of key_usage and ext_key_usage based on the checkbox selections', async function (assert) {
-    assert.expect(2);
-    await render(
-      hbs`
-      <div class="has-top-margin-xxl">
-        <PkiKeyUsage
-          @model={{this.model}}
-        />
-       </div>
-  `,
-      { owner: this.engine }
-    );
-
-    await click(SELECTORS.digitalSignature);
-    await click(SELECTORS.any);
-    await click(SELECTORS.serverAuth);
-
-    assert.deepEqual(
-      this.model.keyUsage,
-      ['KeyAgreement', 'KeyEncipherment'],
-      'removes digitalSignature from the model when unchecked.'
-    );
-    assert.deepEqual(this.model.extKeyUsage, ['Any', 'ServerAuth'], 'adds new checkboxes to when checked');
-  });
-});
diff --git a/ui/tests/integration/components/pki/pki-not-valid-after-form-test.js b/ui/tests/integration/components/pki/pki-not-valid-after-form-test.js
deleted file mode 100644
index c9a62197b2bec..0000000000000
--- a/ui/tests/integration/components/pki/pki-not-valid-after-form-test.js
+++ /dev/null
@@ -1,138 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { render, click, fillIn } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-import { setupEngine } from 'ember-engines/test-support';
-import { SELECTORS } from 'vault/tests/helpers/pki/pki-not-valid-after-form';
-
-module('Integration | Component | pki-not-valid-after-form', function (hooks) {
-  setupRenderingTest(hooks);
-  setupEngine(hooks, 'pki');
-
-  hooks.beforeEach(function () {
-    this.store = this.owner.lookup('service:store');
-    this.model = this.store.createRecord('pki/role', { backend: 'pki' });
-    this.attr = {
-      helpText: '',
-      options: {
-        helperTextEnabled: 'toggled on and shows text',
-      },
-    };
-  });
-
-  test('it should render the component with ttl selected by default', async function (assert) {
-    assert.expect(3);
-    await render(
-      hbs`
-      <div class="has-top-margin-xxl">
-        <PkiNotValidAfterForm
-          @model={{this.model}}
-          @attr={{this.attr}}
-        />
-       </div>
-  `,
-      { owner: this.engine }
-    );
-    assert.dom(SELECTORS.ttlForm).exists('shows the TTL picker');
-    assert.dom(SELECTORS.ttlTimeInput).hasValue('', 'default TTL is empty');
-    assert.dom(SELECTORS.radioTtl).isChecked('ttl is selected by default');
-  });
-
-  test('it clears and resets model properties from cache when changing radio selection', async function (assert) {
-    await render(
-      hbs`
-      <div class="has-top-margin-xxl">
-        <PkiNotValidAfterForm
-          @model={{this.model}}
-          @attr={{this.attr}}
-        />
-       </div>
-  `,
-      { owner: this.engine }
-    );
-    assert.dom(SELECTORS.radioTtl).isChecked('notBeforeDate radio is selected');
-    assert.dom(SELECTORS.ttlForm).exists({ count: 1 }, 'shows TTL form');
-    assert.dom(SELECTORS.radioDate).isNotChecked('NotAfter selection not checked');
-    assert.dom(SELECTORS.dateInput).doesNotExist('does not show date input field');
-
-    await click(SELECTORS.radioDateLabel);
-
-    assert.dom(SELECTORS.radioDate).isChecked('selects NotAfter radio when label clicked');
-    assert.dom(SELECTORS.dateInput).exists({ count: 1 }, 'shows date input field');
-    assert.dom(SELECTORS.radioTtl).isNotChecked('notBeforeDate radio is deselected');
-    assert.dom(SELECTORS.ttlForm).doesNotExist('hides TTL form');
-
-    const utcDate = '1994-11-05';
-    const notAfterExpected = '1994-11-05T00:00:00.000Z';
-    const ttlDate = 1;
-    await fillIn('[data-test-input="not_after"]', utcDate);
-    assert.strictEqual(
-      this.model.notAfter,
-      notAfterExpected,
-      'sets the model property notAfter when this value is selected and filled in.'
-    );
-    await click('[data-test-radio-button="ttl"]');
-    assert.strictEqual(
-      this.model.notAfter,
-      '',
-      'The notAfter is cleared on the model because the radio button was selected.'
-    );
-    await fillIn('[data-test-ttl-value="TTL"]', ttlDate);
-    assert.strictEqual(
-      this.model.ttl,
-      '1s',
-      'The ttl is now saved on the model because the radio button was selected.'
-    );
-
-    await click('[data-test-radio-button="not_after"]');
-    assert.strictEqual(this.model.ttl, '', 'TTL is cleared after radio select.');
-    assert.strictEqual(this.model.notAfter, notAfterExpected, 'notAfter gets populated from local cache');
-  });
-  test('Form renders properly for edit when TTL present', async function (assert) {
-    this.model = this.store.createRecord('pki/role', { backend: 'pki', ttl: 6000 });
-    await render(
-      hbs`
-      <div class="has-top-margin-xxl">
-        <PkiNotValidAfterForm
-          @model={{this.model}}
-          @attr={{this.attr}}
-        />
-       </div>
-  `,
-      { owner: this.engine }
-    );
-    assert.dom(SELECTORS.radioTtl).isChecked('notBeforeDate radio is selected');
-    assert.dom(SELECTORS.ttlForm).exists({ count: 1 }, 'shows TTL form');
-    assert.dom(SELECTORS.radioDate).isNotChecked('NotAfter selection not checked');
-    assert.dom(SELECTORS.dateInput).doesNotExist('does not show date input field');
-
-    assert.dom(SELECTORS.ttlTimeInput).hasValue('100', 'TTL value is correctly shown');
-    assert.dom(SELECTORS.ttlUnitInput).hasValue('m', 'TTL unit is correctly shown');
-  });
-  test('Form renders properly for edit when notAfter present', async function (assert) {
-    const utcDate = '1994-11-05T00:00:00.000Z';
-    this.model = this.store.createRecord('pki/role', { backend: 'pki', notAfter: utcDate });
-    await render(
-      hbs`
-      <div class="has-top-margin-xxl">
-        <PkiNotValidAfterForm
-          @model={{this.model}}
-          @attr={{this.attr}}
-        />
-       </div>
-  `,
-      { owner: this.engine }
-    );
-    assert.dom(SELECTORS.radioDate).isChecked('notAfter radio is selected');
-    assert.dom(SELECTORS.dateInput).exists({ count: 1 }, 'shows date picker');
-    assert.dom(SELECTORS.radioTtl).isNotChecked('ttl radio not selected');
-    assert.dom(SELECTORS.ttlForm).doesNotExist('does not show date TTL picker');
-    // Due to timezones, can't check specific match on input date
-    assert.dom(SELECTORS.dateInput).hasAnyValue('date input shows date');
-  });
-});
diff --git a/ui/tests/integration/components/pki/pki-role-form-test.js b/ui/tests/integration/components/pki/pki-role-form-test.js
deleted file mode 100644
index df2049413d6be..0000000000000
--- a/ui/tests/integration/components/pki/pki-role-form-test.js
+++ /dev/null
@@ -1,214 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { render, click, fillIn } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-import { setupEngine } from 'ember-engines/test-support';
-import { SELECTORS } from 'vault/tests/helpers/pki/pki-role-form';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import sinon from 'sinon';
-
-module('Integration | Component | pki-role-form', function (hooks) {
-  setupRenderingTest(hooks);
-  setupMirage(hooks);
-  setupEngine(hooks, 'pki'); // https://github.com/ember-engines/ember-engines/pull/653
-
-  hooks.beforeEach(function () {
-    this.store = this.owner.lookup('service:store');
-    this.role = this.store.createRecord('pki/role');
-    this.store.createRecord('pki/issuer', { issuerName: 'issuer-0', issuerId: 'abcd-efgh' });
-    this.store.createRecord('pki/issuer', { issuerName: 'issuer-1', issuerId: 'ijkl-mnop' });
-    this.issuers = this.store.peekAll('pki/issuer');
-    this.role.backend = 'pki';
-    this.onCancel = sinon.spy();
-  });
-
-  test('it should render default fields and toggle groups', async function (assert) {
-    assert.expect(13);
-    await render(
-      hbs`
-      <PkiRoleForm
-         @role={{this.role}}
-         @issuers={{this.issuers}}
-         @onCancel={{this.onCancel}}
-         @onSave={{this.onSave}}
-       />
-  `,
-      { owner: this.engine }
-    );
-    assert.dom(SELECTORS.issuerRefToggle).exists('shows issuer ref toggle');
-    assert.dom(SELECTORS.backdateValidity).exists('shows form-field backdate validity');
-    assert.dom(SELECTORS.customTtl).exists('shows custom yielded form field');
-    assert.dom(SELECTORS.maxTtl).exists('shows form-field max ttl');
-    assert.dom(SELECTORS.generateLease).exists('shows form-field generateLease');
-    assert.dom(SELECTORS.noStore).exists('shows form-field no store');
-    assert.dom(SELECTORS.addBasicConstraints).exists('shows form-field add basic constraints');
-    assert.dom(SELECTORS.domainHandling).exists('shows form-field group add domain handling');
-    assert.dom(SELECTORS.keyParams).exists('shows form-field group key params');
-    assert.dom(SELECTORS.keyUsage).exists('shows form-field group key usage');
-    assert.dom(SELECTORS.policyIdentifiers).exists('shows form-field group policy identifiers');
-    assert.dom(SELECTORS.san).exists('shows form-field group SAN');
-    assert.dom(SELECTORS.additionalSubjectFields).exists('shows form-field group additional subject fields');
-  });
-
-  test('it should save a new pki role with various options selected', async function (assert) {
-    // Key usage, Key params and Not valid after options are tested in their respective component tests
-    assert.expect(8);
-    this.server.post(`/${this.role.backend}/roles/test-role`, (schema, req) => {
-      assert.ok(true, 'Request made to save role');
-      const request = JSON.parse(req.requestBody);
-      const allowedDomainsTemplate = request.allowed_domains_template;
-      const policyIdentifiers = request.policy_identifiers;
-      const allowedUriSansTemplate = request.allow_uri_sans_template;
-      const allowedSerialNumbers = request.allowed_serial_numbers;
-
-      assert.true(allowedDomainsTemplate, 'correctly sends allowed_domains_template');
-      assert.strictEqual(policyIdentifiers[0], 'some-oid', 'correctly sends policy_identifiers');
-      assert.true(allowedUriSansTemplate, 'correctly sends allowed_uri_sans_template');
-      assert.strictEqual(
-        allowedSerialNumbers[0],
-        'some-serial-number',
-        'correctly sends allowed_serial_numbers'
-      );
-      return {};
-    });
-
-    this.onSave = () => assert.ok(true, 'onSave callback fires on save success');
-
-    await render(
-      hbs`
-      <PkiRoleForm
-         @role={{this.role}}
-         @issuers={{this.issuers}}
-         @onCancel={{this.onCancel}}
-         @onSave={{this.onSave}}
-       />
-  `,
-      { owner: this.engine }
-    );
-
-    await click(SELECTORS.roleCreateButton);
-
-    assert
-      .dom(SELECTORS.roleName)
-      .hasClass('has-error-border', 'shows border error on role name field when no role name is submitted');
-    assert
-      .dom('[data-test-inline-error-message]')
-      .includesText('Name is required.', 'show correct error message');
-
-    await fillIn(SELECTORS.roleName, 'test-role');
-    await click('[data-test-input="addBasicConstraints"]');
-    await click(SELECTORS.domainHandling);
-    await click('[data-test-input="allowedDomainsTemplate"]');
-    await click(SELECTORS.policyIdentifiers);
-    await fillIn('[data-test-input="policyIdentifiers"] [data-test-string-list-input="0"]', 'some-oid');
-    await click(SELECTORS.san);
-    await click('[data-test-input="allowUriSansTemplate"]');
-    await click(SELECTORS.additionalSubjectFields);
-    await fillIn(
-      '[data-test-input="allowedSerialNumbers"] [data-test-string-list-input="0"]',
-      'some-serial-number'
-    );
-
-    await click(SELECTORS.roleCreateButton);
-  });
-
-  test('it should update attributes on the model on update', async function (assert) {
-    assert.expect(1);
-
-    this.store.pushPayload('pki/role', {
-      modelName: 'pki/role',
-      name: 'test-role',
-      backend: 'pki-test',
-      id: 'role-id',
-    });
-
-    this.role = this.store.peekRecord('pki/role', 'role-id');
-
-    await render(
-      hbs`
-      <PkiRoleForm
-        @role={{this.role}}
-        @issuers={{this.issuers}}
-        @onCancel={{this.onCancel}}
-        @onSave={{this.onSave}}
-      />
-      `,
-      { owner: this.engine }
-    );
-    await click(SELECTORS.issuerRefToggle);
-    await fillIn(SELECTORS.issuerRefSelect, 'issuer-1');
-    await click(SELECTORS.roleCreateButton);
-    assert.strictEqual(this.role.issuerRef, 'issuer-1', 'Issuer Ref correctly saved on create');
-  });
-
-  test('it should edit a role', async function (assert) {
-    assert.expect(8);
-    this.server.post(`/pki-test/roles/test-role`, (schema, req) => {
-      assert.ok(true, 'Request made to correct endpoint to update role');
-      const request = JSON.parse(req.requestBody);
-      assert.propEqual(
-        request,
-        {
-          allow_ip_sans: true,
-          issuer_ref: 'issuer-1',
-          key_bits: '224',
-          key_type: 'ec',
-          key_usage: ['DigitalSignature', 'KeyAgreement', 'KeyEncipherment'],
-          not_before_duration: '30s',
-          require_cn: true,
-          signature_bits: '384',
-          use_csr_common_name: true,
-          use_csr_sans: true,
-        },
-        'sends role params in correct type'
-      );
-      return {};
-    });
-
-    this.store.pushPayload('pki/role', {
-      modelName: 'pki/role',
-      name: 'test-role',
-      backend: 'pki-test',
-      id: 'role-id',
-      key_type: 'rsa',
-      key_bits: 3072, // string type in dropdown, API returns as numbers
-      signature_bits: 512, // string type in dropdown, API returns as numbers
-    });
-
-    this.role = this.store.peekRecord('pki/role', 'role-id');
-
-    await render(
-      hbs`
-      <PkiRoleForm
-        @role={{this.role}}
-        @issuers={{this.issuers}}
-        @onCancel={{this.onCancel}}
-        @onSave={{this.onSave}}
-      />
-      `,
-      { owner: this.engine }
-    );
-
-    await click(SELECTORS.issuerRefToggle);
-    await fillIn(SELECTORS.issuerRefSelect, 'issuer-1');
-
-    await click(SELECTORS.keyParams);
-    assert.dom(SELECTORS.keyType).hasValue('rsa');
-    assert.dom(SELECTORS.keyBits).hasValue('3072', 'dropdown has model value, not default value (2048)');
-    assert.dom(SELECTORS.signatureBits).hasValue('512', 'dropdown has model value, not default value (0)');
-
-    await fillIn(SELECTORS.keyType, 'ec');
-    await fillIn(SELECTORS.keyBits, '224');
-    assert.dom(SELECTORS.keyBits).hasValue('224', 'dropdown has selected value, not default value (256)');
-    await fillIn(SELECTORS.signatureBits, '384');
-    assert.dom(SELECTORS.signatureBits).hasValue('384', 'dropdown has selected value, not default value (0)');
-
-    await click(SELECTORS.roleCreateButton);
-    assert.strictEqual(this.role.issuerRef, 'issuer-1', 'Issuer Ref correctly saved on create');
-  });
-});
diff --git a/ui/tests/integration/components/pki/pki-role-generate-test.js b/ui/tests/integration/components/pki/pki-role-generate-test.js
deleted file mode 100644
index 58ab6e30e54dd..0000000000000
--- a/ui/tests/integration/components/pki/pki-role-generate-test.js
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { render, fillIn } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import { setupEngine } from 'ember-engines/test-support';
-import Sinon from 'sinon';
-import { SELECTORS } from 'vault/tests/helpers/pki/pki-role-generate';
-import { allowAllCapabilitiesStub } from 'vault/tests/helpers/stubs';
-
-module('Integration | Component | pki-role-generate', function (hooks) {
-  setupRenderingTest(hooks);
-  setupMirage(hooks);
-  setupEngine(hooks, 'pki');
-
-  hooks.beforeEach(async function () {
-    this.server.post('/sys/capabilities-self', allowAllCapabilitiesStub());
-    this.store = this.owner.lookup('service:store');
-    this.secretMountPath = this.owner.lookup('service:secret-mount-path');
-    this.secretMountPath.currentPath = 'pki-test';
-    this.model = this.store.createRecord('pki/certificate/generate', {
-      role: 'my-role',
-    });
-    this.onSuccess = Sinon.spy();
-  });
-
-  test('it should render the component with the form by default', async function (assert) {
-    assert.expect(4);
-    await render(
-      hbs`
-      <div class="has-top-margin-xxl">
-        <PkiRoleGenerate
-          @model={{this.model}}
-          @onSuccess={{this.onSuccess}}
-        />
-       </div>
-  `,
-      { owner: this.engine }
-    );
-    assert.dom(SELECTORS.form).exists('shows the cert generate form');
-    assert.dom(SELECTORS.commonNameField).exists('shows the common name field');
-    assert.dom(SELECTORS.optionsToggle).exists('toggle exists');
-    await fillIn(SELECTORS.commonNameField, 'example.com');
-    assert.strictEqual(this.model.commonName, 'example.com', 'Filling in the form updates the model');
-  });
-
-  test('it should render the component displaying the cert', async function (assert) {
-    assert.expect(5);
-    const record = this.store.createRecord('pki/certificate/generate', {
-      role: 'my-role',
-      serialNumber: 'abcd-efgh-ijkl',
-      certificate: 'my-very-cool-certificate',
-    });
-    this.set('model', record);
-    await render(
-      hbs`
-      <div class="has-top-margin-xxl">
-        <PkiRoleGenerate
-          @model={{this.model}}
-          @onSuccess={{this.onSuccess}}
-        />
-       </div>
-  `,
-      { owner: this.engine }
-    );
-    assert.dom(SELECTORS.form).doesNotExist('Does not show the form');
-    assert.dom(SELECTORS.downloadButton).exists('shows the download button');
-    assert.dom(SELECTORS.revokeButton).exists('shows the revoke button');
-    assert.dom(SELECTORS.certificate).exists({ count: 1 }, 'shows certificate info row');
-    assert.dom(SELECTORS.serialNumber).hasText('abcd-efgh-ijkl', 'shows serial number info row');
-  });
-});
diff --git a/ui/tests/integration/components/pki/pki-sign-intermediate-form-test.js b/ui/tests/integration/components/pki/pki-sign-intermediate-form-test.js
deleted file mode 100644
index f728f2ce9a1f4..0000000000000
--- a/ui/tests/integration/components/pki/pki-sign-intermediate-form-test.js
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'vault/tests/helpers';
-import { click, fillIn, render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-import Sinon from 'sinon';
-import { setupEngine } from 'ember-engines/test-support';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-
-const selectors = {
-  form: '[data-test-sign-intermediate-form]',
-  csrInput: '[data-test-input="csr"]',
-  toggleSigningOptions: '[data-test-toggle-group="Signing options"]',
-  toggleSANOptions: '[data-test-toggle-group="Subject Alternative Name (SAN) Options"]',
-  toggleAdditionalFields: '[data-test-toggle-group="Additional subject fields"]',
-  fieldByName: (name) => `[data-test-field="${name}"]`,
-  saveButton: '[data-test-pki-sign-intermediate-save]',
-  cancelButton: '[data-test-pki-sign-intermediate-cancel]',
-  fieldError: '[data-test-inline-alert]',
-  formError: '[data-test-form-error]',
-  resultsContainer: '[data-test-sign-intermediate-result]',
-  rowByName: (name) => `[data-test-row-label="${name}"]`,
-  valueByName: (name) => `[data-test-value-div="${name}"]`,
-};
-module('Integration | Component | pki-sign-intermediate-form', function (hooks) {
-  setupRenderingTest(hooks);
-  setupEngine(hooks, 'pki');
-  setupMirage(hooks);
-
-  hooks.beforeEach(async function () {
-    this.store = this.owner.lookup('service:store');
-    this.secretMountPath = this.owner.lookup('service:secret-mount-path');
-    this.secretMountPath.currentPath = 'pki-test';
-    this.model = this.store.createRecord('pki/sign-intermediate', { issuerRef: 'some-issuer' });
-    this.onCancel = Sinon.spy();
-  });
-
-  test('renders correctly on load', async function (assert) {
-    assert.expect(9);
-    await render(hbs`<PkiSignIntermediateForm @onCancel={{this.onCancel}} @model={{this.model}} />`, {
-      owner: this.engine,
-    });
-
-    assert.dom(selectors.form).exists('Form is rendered');
-    assert.dom(selectors.resultsContainer).doesNotExist('Results display not rendered');
-    assert.dom('[data-test-field]').exists({ count: 9 }, '9 default fields shown');
-    assert.dom(selectors.toggleSigningOptions).exists();
-    assert.dom(selectors.toggleSANOptions).exists();
-    assert.dom(selectors.toggleAdditionalFields).exists();
-
-    await click(selectors.toggleSigningOptions);
-    ['usePss', 'skid', 'signatureBits'].forEach((name) => {
-      assert.dom(selectors.fieldByName(name)).exists();
-    });
-  });
-
-  test('it shows the returned values on successful save', async function (assert) {
-    assert.expect(13);
-    await render(hbs`<PkiSignIntermediateForm @onCancel={{this.onCancel}} @model={{this.model}} />`, {
-      owner: this.engine,
-    });
-
-    this.server.post(`/pki-test/issuer/some-issuer/sign-intermediate`, function (schema, req) {
-      const payload = JSON.parse(req.requestBody);
-      assert.strictEqual(payload.csr, 'example-data', 'Request made to correct endpoint on save');
-      return {
-        request_id: 'some-id',
-        data: {
-          serial_number: '31:52:b9:09:40',
-          ca_chain: ['-----root pem------'],
-          issuing_ca: '-----issuing ca------',
-          certificate: '-----certificate------',
-        },
-      };
-    });
-    await click(selectors.saveButton);
-    assert.dom(selectors.formError).hasText('There is an error with this form.', 'Shows validation errors');
-    assert.dom(selectors.csrInput).hasClass('has-error-border');
-    assert.dom(selectors.fieldError).hasText('CSR is required.');
-
-    await fillIn(selectors.csrInput, 'example-data');
-    await click(selectors.saveButton);
-    [
-      { label: 'Serial number' },
-      { label: 'CA Chain', masked: true },
-      { label: 'Certificate', masked: true },
-      { label: 'Issuing CA', masked: true },
-    ].forEach(({ label, masked }) => {
-      assert.dom(selectors.rowByName(label)).exists();
-      if (masked) {
-        assert.dom(selectors.valueByName(label)).hasText('***********', `${label} is masked`);
-      } else {
-        assert.dom(selectors.valueByName(label)).hasText('31:52:b9:09:40', `Renders ${label}`);
-        assert.dom(`${selectors.valueByName(label)} a`).exists(`${label} is a link`);
-      }
-    });
-  });
-});
diff --git a/ui/tests/integration/components/pki/pki-tidy-form-test.js b/ui/tests/integration/components/pki/pki-tidy-form-test.js
deleted file mode 100644
index 3eadc2aeb823b..0000000000000
--- a/ui/tests/integration/components/pki/pki-tidy-form-test.js
+++ /dev/null
@@ -1,315 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { click, render, fillIn } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-import { setupEngine } from 'ember-engines/test-support';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import { SELECTORS } from 'vault/tests/helpers/pki/page/pki-tidy-form';
-
-module('Integration | Component | pki tidy form', function (hooks) {
-  setupRenderingTest(hooks);
-  setupEngine(hooks, 'pki');
-  setupMirage(hooks);
-
-  hooks.beforeEach(function () {
-    this.store = this.owner.lookup('service:store');
-    this.version = this.owner.lookup('service:version');
-    this.version.version = '1.14.1+ent';
-    this.server.post('/sys/capabilities-self', () => {});
-    this.onSave = () => {};
-    this.onCancel = () => {};
-    this.manualTidy = this.store.createRecord('pki/tidy', { backend: 'pki-manual-tidy' });
-    this.store.pushPayload('pki/tidy', {
-      modelName: 'pki/tidy',
-      id: 'pki-auto-tidy',
-    });
-    this.autoTidy = this.store.peekRecord('pki/tidy', 'pki-auto-tidy');
-  });
-
-  test('it hides or shows fields depending on auto-tidy toggle', async function (assert) {
-    assert.expect(37);
-    this.version.version = '1.14.1+ent';
-    const sectionHeaders = [
-      'Universal operations',
-      'ACME operations',
-      'Issuer operations',
-      'Cross-cluster operations',
-    ];
-
-    await render(
-      hbs`
-      <PkiTidyForm
-      @tidy={{this.autoTidy}}
-      @tidyType="auto"
-      @onSave={{this.onSave}}
-      @onCancel={{this.onCancel}}
-    />
-    `,
-      { owner: this.engine }
-    );
-    assert.dom(SELECTORS.toggleInput('intervalDuration')).isNotChecked('Automatic tidy is disabled');
-    assert.dom(`[data-test-ttl-form-label="Automatic tidy disabled"]`).exists('renders disabled label text');
-
-    this.autoTidy.eachAttribute((attr) => {
-      if (attr === 'enabled' || attr === 'intervalDuration') return;
-      assert.dom(SELECTORS.inputByAttr(attr)).doesNotExist(`does not render ${attr} when auto tidy disabled`);
-    });
-
-    sectionHeaders.forEach((group) => {
-      assert.dom(SELECTORS.tidySectionHeader(group)).doesNotExist(`does not render ${group} header`);
-    });
-
-    // ENABLE AUTO TIDY
-    await click(SELECTORS.toggleInput('intervalDuration'));
-    assert.dom(SELECTORS.toggleInput('intervalDuration')).isChecked('Automatic tidy is enabled');
-    assert.dom(`[data-test-ttl-form-label="Automatic tidy enabled"]`).exists('renders enabled text');
-
-    this.autoTidy.eachAttribute((attr) => {
-      const skipFields = ['enabled', 'tidyAcme', 'intervalDuration'];
-      if (skipFields.includes(attr)) return; // combined with duration ttl or asserted elsewhere
-      assert.dom(SELECTORS.inputByAttr(attr)).exists(`renders ${attr} when auto tidy enabled`);
-    });
-
-    sectionHeaders.forEach((group) => {
-      assert.dom(SELECTORS.tidySectionHeader(group)).exists(`renders ${group} header`);
-    });
-  });
-
-  test('it renders all attribute fields, including enterprise', async function (assert) {
-    assert.expect(25);
-    this.version.version = '1.14.1+ent';
-    this.autoTidy.enabled = true;
-    const skipFields = ['enabled', 'tidyAcme', 'intervalDuration']; // combined with duration ttl or asserted separately
-    await render(
-      hbs`
-      <PkiTidyForm
-      @tidy={{this.autoTidy}}
-      @tidyType="auto"
-      @onSave={{this.onSave}}
-      @onCancel={{this.onCancel}}
-    />
-    `,
-      { owner: this.engine }
-    );
-
-    this.autoTidy.eachAttribute((attr) => {
-      if (skipFields.includes(attr)) return;
-      assert.dom(SELECTORS.inputByAttr(attr)).exists(`renders ${attr} for auto tidyType`);
-    });
-
-    await render(
-      hbs`
-      <PkiTidyForm
-      @tidy={{this.manualTidy}}
-      @tidyType="manual"
-      @onSave={{this.onSave}}
-      @onCancel={{this.onCancel}}
-    />
-    `,
-      { owner: this.engine }
-    );
-    assert.dom(SELECTORS.toggleInput('intervalDuration')).doesNotExist('hides automatic tidy toggle');
-
-    this.manualTidy.eachAttribute((attr) => {
-      if (skipFields.includes(attr)) return;
-      assert.dom(SELECTORS.inputByAttr(attr)).exists(`renders ${attr} for manual tidyType`);
-    });
-  });
-
-  test('it hides enterprise fields for OSS', async function (assert) {
-    assert.expect(7);
-    this.version.version = '1.14.1';
-    this.autoTidy.enabled = true;
-
-    const enterpriseFields = [
-      'tidyRevocationQueue',
-      'tidyCrossClusterRevokedCerts',
-      'revocationQueueSafetyBuffer',
-    ];
-
-    // tidyType = auto
-    await render(
-      hbs`
-      <PkiTidyForm
-      @tidy={{this.autoTidy}}
-      @tidyType="auto"
-      @onSave={{this.onSave}}
-      @onCancel={{this.onCancel}}
-    />
-    `,
-      { owner: this.engine }
-    );
-
-    assert
-      .dom(SELECTORS.tidySectionHeader('Cross-cluster operations'))
-      .doesNotExist(`does not render ent header`);
-
-    enterpriseFields.forEach((entAttr) => {
-      assert.dom(SELECTORS.inputByAttr(entAttr)).doesNotExist(`does not render ${entAttr} for auto tidyType`);
-    });
-
-    // tidyType = manual
-    await render(
-      hbs`
-      <PkiTidyForm
-      @tidy={{this.manualTidy}}
-      @tidyType="manual"
-      @onSave={{this.onSave}}
-      @onCancel={{this.onCancel}}
-    />
-    `,
-      { owner: this.engine }
-    );
-
-    enterpriseFields.forEach((entAttr) => {
-      assert
-        .dom(SELECTORS.inputByAttr(entAttr))
-        .doesNotExist(`does not render ${entAttr} for manual tidyType`);
-    });
-  });
-
-  test('it should change the attributes on the model', async function (assert) {
-    assert.expect(12);
-    this.server.post('/pki-auto-tidy/config/auto-tidy', (schema, req) => {
-      assert.propEqual(
-        JSON.parse(req.requestBody),
-        {
-          acme_account_safety_buffer: '60s',
-          enabled: true,
-          interval_duration: '10s',
-          issuer_safety_buffer: '20s',
-          pause_duration: '30s',
-          revocation_queue_safety_buffer: '40s',
-          safety_buffer: '50s',
-          tidy_acme: true,
-          tidy_cert_store: true,
-          tidy_cross_cluster_revoked_certs: true,
-          tidy_expired_issuers: true,
-          tidy_move_legacy_ca_bundle: true,
-          tidy_revocation_queue: true,
-          tidy_revoked_cert_issuer_associations: true,
-          tidy_revoked_certs: true,
-        },
-        'response contains updated model values'
-      );
-    });
-    await render(
-      hbs`
-      <PkiTidyForm
-      @tidy={{this.autoTidy}}
-      @tidyType="auto"
-      @onSave={{this.onSave}}
-      @onCancel={{this.onCancel}}
-    />
-    `,
-      { owner: this.engine }
-    );
-
-    assert.dom(SELECTORS.toggleInput('intervalDuration')).isNotChecked('Automatic tidy is disabled');
-    assert.dom(SELECTORS.toggleLabel('Automatic tidy disabled')).exists('auto tidy has disabled label');
-    assert.false(this.autoTidy.enabled, 'enabled is false on model');
-
-    // enable auto-tidy
-    await click(SELECTORS.toggleInput('intervalDuration'));
-    await fillIn(SELECTORS.intervalDuration, 10);
-
-    assert.dom(SELECTORS.toggleInput('intervalDuration')).isChecked('toggle enabled auto tidy');
-    assert.dom(SELECTORS.toggleLabel('Automatic tidy enabled')).exists('auto tidy has enabled label');
-
-    assert.dom(SELECTORS.toggleInput('acmeAccountSafetyBuffer')).isNotChecked('ACME tidy is disabled');
-    assert.dom(SELECTORS.toggleLabel('Tidy ACME disabled')).exists('ACME label has correct disabled text');
-    assert.false(this.autoTidy.tidyAcme, 'tidyAcme is false on model');
-
-    await click(SELECTORS.toggleInput('acmeAccountSafetyBuffer'));
-    await fillIn(SELECTORS.acmeAccountSafetyBuffer, 60);
-    assert.true(this.autoTidy.tidyAcme, 'tidyAcme toggles to true');
-
-    const fillInValues = {
-      issuerSafetyBuffer: 20,
-      pauseDuration: 30,
-      revocationQueueSafetyBuffer: 40,
-      safetyBuffer: 50,
-    };
-    this.autoTidy.eachAttribute(async (attr, { type }) => {
-      const skipFields = ['enabled', 'tidyAcme', 'intervalDuration', 'acmeAccountSafetyBuffer']; // combined with duration ttl or asserted separately
-      if (skipFields.includes(attr)) return;
-      if (type === 'boolean') {
-        await click(SELECTORS.inputByAttr(attr));
-      }
-      if (type === 'string') {
-        await fillIn(SELECTORS.toggleInput(attr), `${fillInValues[attr]}`);
-      }
-    });
-
-    assert.dom(SELECTORS.toggleInput('acmeAccountSafetyBuffer')).isChecked('ACME tidy is enabled');
-    assert.dom(SELECTORS.toggleLabel('Tidy ACME enabled')).exists('ACME label has correct enabled text');
-    await click(SELECTORS.tidySave);
-  });
-
-  test('it updates auto-tidy config', async function (assert) {
-    assert.expect(4);
-    this.server.post('/pki-auto-tidy/config/auto-tidy', (schema, req) => {
-      assert.ok(true, 'Request made to update auto-tidy');
-      assert.propEqual(
-        JSON.parse(req.requestBody),
-        {
-          enabled: false,
-          tidy_acme: false,
-        },
-        'response contains auto-tidy params'
-      );
-    });
-    this.onSave = () => assert.ok(true, 'onSave callback fires on save success');
-    this.onCancel = () => assert.ok(true, 'onCancel callback fires on save success');
-
-    await render(
-      hbs`
-      <PkiTidyForm
-        @tidy={{this.autoTidy}}
-        @tidyType="auto"
-        @onSave={{this.onSave}}
-        @onCancel={{this.onCancel}}
-      />
-    `,
-      { owner: this.engine }
-    );
-
-    await click(SELECTORS.tidySave);
-    await click(SELECTORS.tidyCancel);
-  });
-
-  test('it saves and performs manual tidy', async function (assert) {
-    assert.expect(4);
-
-    this.server.post('/pki-manual-tidy/tidy', (schema, req) => {
-      assert.ok(true, 'Request made to perform manual tidy');
-      assert.propEqual(
-        JSON.parse(req.requestBody),
-        { tidy_acme: false },
-        'response contains manual tidy params'
-      );
-    });
-    this.onSave = () => assert.ok(true, 'onSave callback fires on save success');
-    this.onCancel = () => assert.ok(true, 'onCancel callback fires on save success');
-
-    await render(
-      hbs`
-      <PkiTidyForm
-        @tidy={{this.manualTidy}}
-        @tidyType="manual"
-        @onSave={{this.onSave}}
-        @onCancel={{this.onCancel}}
-      />
-    `,
-      { owner: this.engine }
-    );
-
-    await click(SELECTORS.tidySave);
-    await click(SELECTORS.tidyCancel);
-  });
-});
diff --git a/ui/tests/integration/components/policy-form-test.js b/ui/tests/integration/components/policy-form-test.js
deleted file mode 100644
index 23cff5e933332..0000000000000
--- a/ui/tests/integration/components/policy-form-test.js
+++ /dev/null
@@ -1,206 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { click, fillIn, render, triggerEvent } from '@ember/test-helpers';
-import hbs from 'htmlbars-inline-precompile';
-import sinon from 'sinon';
-import Pretender from 'pretender';
-
-const SELECTORS = {
-  nameInput: '[data-test-policy-input="name"]',
-  uploadFileToggle: '[data-test-policy-edit-toggle]',
-  policyEditor: '[data-test-policy-editor]',
-  policyUpload: '[data-test-text-file-input]',
-  saveButton: '[data-test-policy-save]',
-  cancelButton: '[data-test-policy-cancel]',
-  error: '[data-test-error]',
-};
-
-module('Integration | Component | policy-form', function (hooks) {
-  setupRenderingTest(hooks);
-
-  hooks.beforeEach(function () {
-    this.store = this.owner.lookup('service:store');
-    this.model = this.store.createRecord('policy/acl');
-    this.onSave = sinon.spy();
-    this.onCancel = sinon.spy();
-    this.server = new Pretender(function () {
-      this.put('/v1/sys/policies/acl/bad-policy', () => {
-        return [
-          400,
-          { 'Content-Type': 'application/json' },
-          JSON.stringify({ errors: ['An error occurred'] }),
-        ];
-      });
-      this.put('/v1/sys/policies/acl/**', () => {
-        return [204, { 'Content-Type': 'application/json' }];
-      });
-      this.put('/v1/sys/policies/rgp/**', () => {
-        return [204, { 'Content-Type': 'application/json' }];
-      });
-    });
-  });
-  hooks.afterEach(function () {
-    this.server.shutdown();
-  });
-
-  test('it renders the form for new ACL policy', async function (assert) {
-    const policy = `
-    path "secret/*" {
-      capabilities = [ "create", "read", "update", "list" ]
-    }
-    `;
-    await render(hbs`
-    <PolicyForm
-      @model={{this.model}}
-      @onCancel={{this.onCancel}}
-      @onSave={{this.onSave}}
-    />
-    `);
-    assert.dom(SELECTORS.nameInput).exists({ count: 1 }, 'Name input exists');
-    assert.dom(SELECTORS.nameInput).hasNoText('Name field is not filled');
-    assert.dom(SELECTORS.uploadFileToggle).exists({ count: 1 }, 'Upload file toggle exists');
-    await fillIn(SELECTORS.nameInput, 'Foo');
-    assert.strictEqual(this.model.name, 'foo', 'Input sets name on model to lowercase input');
-    await fillIn(`${SELECTORS.policyEditor} textarea`, policy);
-    assert.strictEqual(this.model.policy, policy, 'Policy editor sets policy on model');
-    assert.ok(this.onSave.notCalled);
-    assert.dom(SELECTORS.saveButton).hasText('Create policy');
-    await click(SELECTORS.saveButton);
-    assert.ok(this.onSave.calledOnceWith(this.model));
-  });
-
-  test('it renders the form for new RGP policy', async function (assert) {
-    const model = this.store.createRecord('policy/rgp');
-    const policy = `
-    path "secret/*" {
-      capabilities = [ "create", "read", "update", "list" ]
-    }
-    `;
-    this.set('model', model);
-    await render(hbs`
-    <PolicyForm
-      @model={{this.model}}
-      @onCancel={{this.onCancel}}
-      @onSave={{this.onSave}}
-    />
-    `);
-    assert.dom(SELECTORS.nameInput).exists({ count: 1 }, 'Name input exists');
-    assert.dom(SELECTORS.nameInput).hasNoText('Name field is not filled');
-    assert.dom(SELECTORS.uploadFileToggle).exists({ count: 1 }, 'Upload file toggle exists');
-    await fillIn(SELECTORS.nameInput, 'Foo');
-    assert.strictEqual(this.model.name, 'foo', 'Input sets name on model to lowercase input');
-    await fillIn(`${SELECTORS.policyEditor} textarea`, policy);
-    assert.strictEqual(this.model.policy, policy, 'Policy editor sets policy on model');
-    assert.ok(this.onSave.notCalled);
-    assert.dom(SELECTORS.saveButton).hasText('Create policy');
-    await click(SELECTORS.saveButton);
-    assert.ok(this.onSave.calledOnceWith(this.model));
-  });
-
-  test('it toggles to upload a new policy and uploads file', async function (assert) {
-    const policy = `
-    path "auth/token/lookup-self" {
-      capabilities = ["read"]
-    }`;
-    this.file = new File([policy], 'test-policy.hcl');
-    await render(hbs`
-    <PolicyForm
-      @model={{this.model}}
-      @onCancel={{this.onCancel}}
-      @onSave={{this.onSave}}
-    />
-    `);
-    assert.dom(SELECTORS.uploadFileToggle).exists({ count: 1 }, 'Upload file toggle exists');
-    assert.dom(SELECTORS.policyEditor).exists({ count: 1 }, 'Policy editor is shown');
-    assert.dom(SELECTORS.policyUpload).doesNotExist('Policy upload is not shown');
-    await click(SELECTORS.uploadFileToggle);
-    assert.dom(SELECTORS.policyUpload).exists({ count: 1 }, 'Policy upload is shown after toggle');
-    assert.dom(SELECTORS.policyEditor).doesNotExist('Policy editor is not shown');
-    await triggerEvent(SELECTORS.policyUpload, 'change', { files: [this.file] });
-    assert.dom(SELECTORS.nameInput).hasValue('test-policy', 'it fills in policy name');
-    await click(SELECTORS.saveButton);
-    assert.propEqual(this.onSave.lastCall.args[0].policy, policy, 'policy content saves in correct format');
-  });
-
-  test('it renders the form to edit existing ACL policy', async function (assert) {
-    const model = this.store.createRecord('policy/acl', {
-      name: 'bar',
-      policy: 'some policy content',
-    });
-    model.save();
-
-    this.set('model', model);
-    await render(hbs`
-    <PolicyForm
-      @model={{this.model}}
-      @onCancel={{this.onCancel}}
-      @onSave={{this.onSave}}
-    />
-    `);
-    assert.dom(SELECTORS.nameInput).doesNotExist('Name input is not rendered');
-    assert.dom(SELECTORS.uploadFileToggle).doesNotExist('Upload file toggle does not exist');
-
-    await fillIn(`${SELECTORS.policyEditor} textarea`, 'updated-');
-    assert.strictEqual(
-      this.model.policy,
-      'updated-some policy content',
-      'Policy editor updates policy value on model'
-    );
-    assert.ok(this.onSave.notCalled);
-    assert.dom(SELECTORS.saveButton).hasText('Save', 'Save button text is correct');
-    await click(SELECTORS.saveButton);
-    assert.ok(this.onSave.calledOnceWith(this.model));
-  });
-  test('it renders the form to edit existing RGP policy', async function (assert) {
-    const model = this.store.createRecord('policy/rgp', {
-      name: 'bar',
-      policy: 'some policy content',
-    });
-    model.save();
-
-    this.set('model', model);
-    await render(hbs`
-    <PolicyForm
-      @model={{this.model}}
-      @onCancel={{this.onCancel}}
-      @onSave={{this.onSave}}
-    />
-    `);
-    assert.dom(SELECTORS.nameInput).doesNotExist('Name input is not rendered');
-    assert.dom(SELECTORS.uploadFileToggle).doesNotExist('Upload file toggle does not exist');
-
-    await fillIn(`${SELECTORS.policyEditor} textarea`, 'updated-');
-    assert.strictEqual(
-      this.model.policy,
-      'updated-some policy content',
-      'Policy editor updates policy value on model'
-    );
-    assert.ok(this.onSave.notCalled);
-    assert.dom(SELECTORS.saveButton).hasText('Save', 'Save button text is correct');
-    await click(SELECTORS.saveButton);
-    assert.ok(this.onSave.calledOnceWith(this.model));
-  });
-  test('it shows the error message on form when save fails', async function (assert) {
-    const model = this.store.createRecord('policy/acl', {
-      name: 'bad-policy',
-      policy: 'some policy content',
-    });
-
-    this.set('model', model);
-    await render(hbs`
-    <PolicyForm
-      @model={{this.model}}
-      @onCancel={{this.onCancel}}
-      @onSave={{this.onSave}}
-    />
-    `);
-    await click(SELECTORS.saveButton);
-    assert.ok(this.onSave.notCalled);
-    assert.dom(SELECTORS.error).includesText('An error occurred');
-  });
-});
diff --git a/ui/tests/integration/components/radial-progress-test.js b/ui/tests/integration/components/radial-progress-test.js
index d9fd439600012..d21ab7994fec6 100644
--- a/ui/tests/integration/components/radial-progress-test.js
+++ b/ui/tests/integration/components/radial-progress-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
@@ -18,17 +13,17 @@ module('Integration | Component | radial progress', function (hooks) {
   test('it renders', async function (assert) {
     // We have to manually round the circumference, strokeDash, and strokeDashOffset because
     // ie11 truncates decimals differently than other browsers.
-    const circumference = ((19 / 2) * Math.PI * 2).toFixed(2);
+    let circumference = ((19 / 2) * Math.PI * 2).toFixed(2);
     await render(hbs`{{radial-progress progressDecimal=0.5}}`);
 
-    assert.strictEqual(component.viewBox, '0 0 20 20');
-    assert.strictEqual(component.height, '20');
-    assert.strictEqual(component.width, '20');
-    assert.strictEqual(component.strokeWidth, '1');
-    assert.strictEqual(component.r, (19 / 2).toString());
-    assert.strictEqual(component.cx, '10');
-    assert.strictEqual(component.cy, '10');
-    assert.strictEqual(Number(component.strokeDash).toFixed(2), circumference);
-    assert.strictEqual(Number(component.strokeDashOffset).toFixed(3), (circumference * 0.5).toFixed(3));
+    assert.equal(component.viewBox, '0 0 20 20');
+    assert.equal(component.height, '20');
+    assert.equal(component.width, '20');
+    assert.equal(component.strokeWidth, '1');
+    assert.equal(component.r, 19 / 2);
+    assert.equal(component.cx, 10);
+    assert.equal(component.cy, 10);
+    assert.equal(Number(component.strokeDash).toFixed(2), circumference);
+    assert.equal(Number(component.strokeDashOffset).toFixed(3), (circumference * 0.5).toFixed(3));
   });
 });
diff --git a/ui/tests/integration/components/radio-button-test.js b/ui/tests/integration/components/radio-button-test.js
index cb181c4e1cad0..9b50f02481b8a 100644
--- a/ui/tests/integration/components/radio-button-test.js
+++ b/ui/tests/integration/components/radio-button-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { click, render } from '@ember/test-helpers';
diff --git a/ui/tests/integration/components/raft-join-test.js b/ui/tests/integration/components/raft-join-test.js
index 3d70816f7bbb2..37a29e8767d05 100644
--- a/ui/tests/integration/components/raft-join-test.js
+++ b/ui/tests/integration/components/raft-join-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { click, render } from '@ember/test-helpers';
@@ -31,9 +26,9 @@ module('Integration | Component | raft-join', function (hooks) {
   });
 
   test('it calls onDismiss when a user chooses to init', async function (assert) {
-    const spy = sinon.spy();
+    let spy = sinon.spy();
     this.set('onDismiss', spy);
-    await render(hbs`<RaftJoin @onDismiss={{this.onDismiss}} />`);
+    await render(hbs`<RaftJoin @onDismiss={{onDismiss}} />`);
 
     await click('[data-test-join-init]');
     await click('[data-test-next]');
diff --git a/ui/tests/integration/components/raft-storage-overview-test.js b/ui/tests/integration/components/raft-storage-overview-test.js
index f20a9744a7177..54b289439aaec 100644
--- a/ui/tests/integration/components/raft-storage-overview-test.js
+++ b/ui/tests/integration/components/raft-storage-overview-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/tests/integration/components/raft-storage-restore-test.js b/ui/tests/integration/components/raft-storage-restore-test.js
index dc55eb44179b6..47781b98b2ec7 100644
--- a/ui/tests/integration/components/raft-storage-restore-test.js
+++ b/ui/tests/integration/components/raft-storage-restore-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { setupMirage } from 'ember-cli-mirage/test-support';
diff --git a/ui/tests/integration/components/read-more-test.js b/ui/tests/integration/components/read-more-test.js
index 85bfd1fedfedc..563d49debb2b0 100644
--- a/ui/tests/integration/components/read-more-test.js
+++ b/ui/tests/integration/components/read-more-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render, click } from '@ember/test-helpers';
diff --git a/ui/tests/integration/components/readonly-form-field-test.js b/ui/tests/integration/components/readonly-form-field-test.js
index c23c0b3d5a6cc..e831ed2c039a5 100644
--- a/ui/tests/integration/components/readonly-form-field-test.js
+++ b/ui/tests/integration/components/readonly-form-field-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import EmberObject from '@ember/object';
 import { setupRenderingTest } from 'ember-qunit';
@@ -27,7 +22,7 @@ module('Integration | Component | readonly-form-field', function (hooks) {
 
   test('it renders', async function (assert) {
     this.set('attr', EmberObject.create(minimumAttr));
-    await render(hbs`<ReadonlyFormField @attr={{this.attr}} @value="value" />`);
+    await render(hbs`<ReadonlyFormField @attr={{attr}} @value="value" />`);
     assert
       .dom('[data-test-readonly-label]')
       .includesText('My input', 'formats the attr name when no label provided');
@@ -37,7 +32,7 @@ module('Integration | Component | readonly-form-field', function (hooks) {
 
   test('it renders with options', async function (assert) {
     this.set('attr', customLabelAttr);
-    await render(hbs`<ReadonlyFormField @attr={{this.attr}} @value="another value" />`);
+    await render(hbs`<ReadonlyFormField @attr={{attr}} @value="another value" />`);
     assert
       .dom('[data-test-readonly-label]')
       .includesText('Custom-label', 'Uses the provided label as passed');
diff --git a/ui/tests/integration/components/regex-validator-test.js b/ui/tests/integration/components/regex-validator-test.js
index 829e941238842..2769097c2881d 100644
--- a/ui/tests/integration/components/regex-validator-test.js
+++ b/ui/tests/integration/components/regex-validator-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import EmberObject from '@ember/object';
 import sinon from 'sinon';
 import { module, test } from 'qunit';
@@ -14,10 +9,10 @@ module('Integration | Component | regex-validator', function (hooks) {
   setupRenderingTest(hooks);
 
   test('it renders input and validation messages', async function (assert) {
-    const attr = EmberObject.create({
+    let attr = EmberObject.create({
       name: 'example',
     });
-    const spy = sinon.spy();
+    let spy = sinon.spy();
     this.set('onChange', spy);
     this.set('attr', attr);
     this.set('value', '(\\d{4})');
@@ -25,10 +20,10 @@ module('Integration | Component | regex-validator', function (hooks) {
 
     await render(
       hbs`<RegexValidator
-        @onChange={{this.onChange}}
-        @attr={{this.attr}}
-        @value={{this.value}}
-        @labelString={{this.labelString}}
+        @onChange={{onChange}}
+        @attr={{attr}}
+        @value={{value}}
+        @labelString={{labelString}}
       />`
     );
     assert.dom('.regex-label label').hasText('Regex Example', 'Label is correct');
diff --git a/ui/tests/integration/components/replication-action-generate-token-test.js b/ui/tests/integration/components/replication-action-generate-token-test.js
index d6af77d06049e..5df4f0755ba0a 100644
--- a/ui/tests/integration/components/replication-action-generate-token-test.js
+++ b/ui/tests/integration/components/replication-action-generate-token-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/tests/integration/components/replication-actions-test.js b/ui/tests/integration/components/replication-actions-test.js
index f7a601fa79f3a..aa53f4bb392a1 100644
--- a/ui/tests/integration/components/replication-actions-test.js
+++ b/ui/tests/integration/components/replication-actions-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { run } from '@ember/runloop';
 import { resolve } from 'rsvp';
 import Service from '@ember/service';
@@ -43,7 +38,7 @@ module('Integration | Component | replication actions', function (hooks) {
     });
   });
   const confirmInput = (confirmText) => fillIn('[data-test-confirmation-modal-input]', confirmText);
-  const testCases = [
+  let testCases = [
     [
       'dr',
       'primary',
@@ -132,7 +127,7 @@ module('Integration | Component | replication actions', function (hooks) {
     ],
   ];
 
-  for (const [
+  for (let [
     replicationMode,
     clusterMode,
     action,
@@ -181,7 +176,7 @@ module('Integration | Component | replication actions', function (hooks) {
         `
       );
 
-      const selector = oldVersion ? 'h4' : `[data-test-${action}-replication] h4`;
+      let selector = oldVersion ? 'h4' : `[data-test-${action}-replication] h4`;
       assert
         .dom(selector)
         .hasText(headerText, `${testKey}: renders the correct component header (${oldVersion})`);
diff --git a/ui/tests/integration/components/replication-dashboard-test.js b/ui/tests/integration/components/replication-dashboard-test.js
index 1480fad630ee5..6786967a07052 100644
--- a/ui/tests/integration/components/replication-dashboard-test.js
+++ b/ui/tests/integration/components/replication-dashboard-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
@@ -40,9 +35,9 @@ module('Integration | Component | replication-dashboard', function (hooks) {
 
   test('it renders', async function (assert) {
     await render(hbs`<ReplicationDashboard
-      @replicationDetails={{this.replicationDetails}}
-      @clusterMode={{this.clusterMode}}
-      @isSecondary={{this.isSecondary}}
+      @replicationDetails={{replicationDetails}}
+      @clusterMode={{clusterMode}}
+      @isSecondary={{isSecondary}}
     />`);
 
     assert.dom('[data-test-replication-dashboard]').exists();
@@ -54,9 +49,9 @@ module('Integration | Component | replication-dashboard', function (hooks) {
 
   test('it updates the dashboard when the replication mode has changed', async function (assert) {
     await render(hbs`<ReplicationDashboard
-      @replicationDetails={{this.replicationDetails}}
-      @clusterMode={{this.clusterMode}}
-      @isSecondary={{this.isSecondary}}
+      @replicationDetails={{replicationDetails}}
+      @clusterMode={{clusterMode}}
+      @isSecondary={{isSecondary}}
     />`);
 
     assert.dom('[data-test-selectable-card-container="secondary"]').exists();
@@ -73,9 +68,9 @@ module('Integration | Component | replication-dashboard', function (hooks) {
     this.set('isSecondary', false);
 
     await render(hbs`<ReplicationDashboard
-      @replicationDetails={{this.replicationDetails}}
-      @clusterMode={{this.clusterMode}}
-      @isSecondary={{this.isSecondary}}
+      @replicationDetails={{replicationDetails}}
+      @clusterMode={{clusterMode}}
+      @isSecondary={{isSecondary}}
     />`);
 
     assert.dom('[data-test-selectable-card-container="primary"]').exists();
@@ -86,9 +81,9 @@ module('Integration | Component | replication-dashboard', function (hooks) {
     this.set('replicationDetails', IS_SYNCING);
 
     await render(hbs`<ReplicationDashboard
-      @replicationDetails={{this.replicationDetails}}
-      @clusterMode={{this.clusterMode}}
-      @isSecondary={{this.isSecondary}}
+      @replicationDetails={{replicationDetails}}
+      @clusterMode={{clusterMode}}
+      @isSecondary={{isSecondary}}
       @componentToRender='replication-secondary-card'
     />`);
 
@@ -102,9 +97,9 @@ module('Integration | Component | replication-dashboard', function (hooks) {
     this.set('replicationDetails', IS_REINDEXING);
 
     await render(hbs`<ReplicationDashboard
-      @replicationDetails={{this.replicationDetails}}
-      @clusterMode={{this.clusterMode}}
-      @isSecondary={{this.isSecondary}}
+      @replicationDetails={{replicationDetails}}
+      @clusterMode={{clusterMode}}
+      @isSecondary={{isSecondary}}
       @componentToRender='replication-secondary-card'
     />`);
 
@@ -145,11 +140,11 @@ module('Integration | Component | replication-dashboard', function (hooks) {
     this.set('isSecondary', false);
 
     await render(hbs`<ReplicationDashboard
-      @replicationDetails={{this.replicationDetails}}
-      @replicationDetailsSummary={{this.replicationDetailsSummary}}
-      @isSummaryDashboard={{this.isSummaryDashboard}}
-      @clusterMode={{this.clusterMode}}
-      @isSecondary={{this.isSecondary}}
+      @replicationDetails={{replicationDetails}}
+      @replicationDetailsSummary={{replicationDetailsSummary}}
+      @isSummaryDashboard={{isSummaryDashboard}}
+      @clusterMode={{clusterMode}}
+      @isSecondary={{isSecondary}}
       @componentToRender='replication-summary-card'
     />`);
 
@@ -184,11 +179,11 @@ module('Integration | Component | replication-dashboard', function (hooks) {
     this.set('isSecondary', false);
 
     await render(hbs`<ReplicationDashboard
-      @replicationDetails={{this.replicationDetails}}
-      @replicationDetailsSummary={{this.replicationDetailsSummary}}
-      @isSummaryDashboard={{this.isSummaryDashboard}}
-      @clusterMode={{this.clusterMode}}
-      @isSecondary={{this.isSecondary}}
+      @replicationDetails={{replicationDetails}}
+      @replicationDetailsSummary={{replicationDetailsSummary}}
+      @isSummaryDashboard={{isSummaryDashboard}}
+      @clusterMode={{clusterMode}}
+      @isSecondary={{isSecondary}}
       @componentToRender='replication-summary-card'
     />`);
 
diff --git a/ui/tests/integration/components/replication-header-test.js b/ui/tests/integration/components/replication-header-test.js
index 91fdc804cac51..fadfa78ac67fb 100644
--- a/ui/tests/integration/components/replication-header-test.js
+++ b/ui/tests/integration/components/replication-header-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
@@ -35,7 +30,7 @@ module('Integration | Component | replication-header', function (hooks) {
   test('it renders', async function (assert) {
     await render(hbs`
       <div id="modal-wormhole"></div>
-      <ReplicationHeader @data={{this.data}} @isSecondary={{this.isSecondary}} @title={{this.title}}/>
+      <ReplicationHeader @data={{data}} @isSecondary={{isSecondary}} @title={{title}}/>
     `);
 
     assert.dom('[data-test-replication-header]').exists();
@@ -44,7 +39,7 @@ module('Integration | Component | replication-header', function (hooks) {
   test('it renders with mode and secondaryId when set', async function (assert) {
     await render(hbs`
       <div id="modal-wormhole"></div>
-      <ReplicationHeader @data={{this.data}} @isSecondary={{this.isSecondary}} @title={{this.title}} @secondaryId={{this.secondaryId}}/>
+      <ReplicationHeader @data={{data}} @isSecondary={{isSecondary}} @title={{title}} @secondaryId={{secondaryId}}/>
     `);
 
     assert.dom('[data-test-secondaryId]').includesText(SECONDARY_ID, `shows the correct secondaryId value`);
@@ -59,7 +54,7 @@ module('Integration | Component | replication-header', function (hooks) {
 
     await render(hbs`
       <div id="modal-wormhole"></div>
-      <ReplicationHeader @data={{this.data}} @isSecondary={{this.isSecondary}} @title={{this.title}} @secondaryId={{this.secondaryId}}/>
+      <ReplicationHeader @data={{data}} @isSecondary={{isSecondary}} @title={{title}} @secondaryId={{secondaryId}}/>
     `);
 
     assert.dom('[data-test-secondaryId]').doesNotExist();
@@ -69,7 +64,7 @@ module('Integration | Component | replication-header', function (hooks) {
   test('it does not show tabs when showTabs is not set', async function (assert) {
     await render(hbs`
       <div id="modal-wormhole"></div>
-      <ReplicationHeader @data={{this.data}} @isSecondary={{this.isSecondary}} @title={{this.title}}/>
+      <ReplicationHeader @data={{data}} @isSecondary={{isSecondary}} @title={{title}}/>
     `);
 
     assert.dom('[data-test-tabs]').doesNotExist();
diff --git a/ui/tests/integration/components/replication-page-test.js b/ui/tests/integration/components/replication-page-test.js
index 77f77ba8552a7..73f48919dadcd 100644
--- a/ui/tests/integration/components/replication-page-test.js
+++ b/ui/tests/integration/components/replication-page-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
@@ -25,19 +20,19 @@ module('Integration | Component | replication-page', function (hooks) {
   });
 
   test('it renders', async function (assert) {
-    await render(hbs`<ReplicationPage @model={{this.model}} />`);
+    await render(hbs`<ReplicationPage @model={{model}} />`);
     assert.dom('[data-test-replication-page]').exists();
     assert.dom('[data-test-layout-loading]').doesNotExist();
   });
 
   test('it renders loader when either clusterId is unknown or mode is bootstrapping', async function (assert) {
     this.set('model.replicationAttrs.clusterId', '');
-    await render(hbs`<ReplicationPage @model={{this.model}} />`);
+    await render(hbs`<ReplicationPage @model={{model}} />`);
     assert.dom('[data-test-layout-loading]').exists();
 
     this.set('model.replicationAttrs.clusterId', '123456');
     this.set('model.replicationAttrs.mode', 'bootstrapping');
-    await render(hbs`<ReplicationPage @model={{this.model}} />`);
+    await render(hbs`<ReplicationPage @model={{model}} />`);
     assert.dom('[data-test-layout-loading]').exists();
   });
 });
diff --git a/ui/tests/integration/components/replication-primary-card-test.js b/ui/tests/integration/components/replication-primary-card-test.js
index 71256de4136fd..0ccb9a937c5d7 100644
--- a/ui/tests/integration/components/replication-primary-card-test.js
+++ b/ui/tests/integration/components/replication-primary-card-test.js
@@ -1,18 +1,13 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
-import { setupEngine } from 'ember-engines/test-support';
+import engineResolverFor from 'ember-engines/test-support/engine-resolver-for';
 import { CLUSTER_STATES } from 'core/helpers/cluster-states';
 import hbs from 'htmlbars-inline-precompile';
+const resolver = engineResolverFor('replication');
 
 module('Integration | Component | replication-primary-card', function (hooks) {
-  setupRenderingTest(hooks);
-  setupEngine(hooks, 'replication');
+  setupRenderingTest(hooks, { resolver });
 
   test('it renders', async function (assert) {
     const title = 'Last WAL';
@@ -23,15 +18,11 @@ module('Integration | Component | replication-primary-card', function (hooks) {
     this.set('description', description);
     this.set('metric', metric);
 
-    await render(
-      hbs`
+    await render(hbs`
       <ReplicationPrimaryCard
-        @title={{this.title}}
-        @description={{this.description}}
-        @metric='3000'
-      />`,
-      { owner: this.engine }
-    );
+        @title={{title}}
+        @description={{description}}
+        @metric='3000' />`);
 
     assert.dom('[data-test-hasError]').doesNotExist('shows no error for non-State cards');
 
@@ -45,16 +36,12 @@ module('Integration | Component | replication-primary-card', function (hooks) {
       this.set('glyph', CLUSTER_STATES[state].glyph);
       this.set('state', state);
 
-      await render(
-        hbs`
-        <ReplicationPrimaryCard
-          @title='State'
-          @description='Updated every ten seconds.'
-          @glyph={{this.glyph}}
-          @metric={{this.state}}
-        />`,
-        { owner: this.engine }
-      );
+      await render(hbs`
+      <ReplicationPrimaryCard
+        @title='State'
+        @description='Updated every ten seconds.'
+        @glyph={{glyph}}
+        @metric={{state}} />`);
 
       if (CLUSTER_STATES[state].isOk) {
         assert.dom('[data-test-hasError]').doesNotExist();
diff --git a/ui/tests/integration/components/replication-secondary-card-test.js b/ui/tests/integration/components/replication-secondary-card-test.js
index 450c48919f802..5207fc5d3c22d 100644
--- a/ui/tests/integration/components/replication-secondary-card-test.js
+++ b/ui/tests/integration/components/replication-secondary-card-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
@@ -32,7 +27,7 @@ module('Integration | Component | replication-secondary-card', function (hooks)
 
   test('it renders', async function (assert) {
     await render(
-      hbs`<ReplicationSecondaryCard @replicationDetails={{this.replicationDetails}} @title={{this.title}} />`
+      hbs`<ReplicationSecondaryCard @replicationDetails={{replicationDetails}} @title={{title}} />`
     );
     assert.dom('[data-test-replication-secondary-card]').exists();
     assert.dom('[data-test-state]').includesText(REPLICATION_DETAILS.state, `shows the correct state value`);
@@ -43,7 +38,7 @@ module('Integration | Component | replication-secondary-card', function (hooks)
 
   test('it renders the Primary Cluster card when title is not Status', async function (assert) {
     await render(
-      hbs`<ReplicationSecondaryCard @replicationDetails={{this.replicationDetails}} @title='Primary cluster'/>`
+      hbs`<ReplicationSecondaryCard @replicationDetails={{replicationDetails}} @title='Primary cluster'/>`
     );
 
     assert.dom('[data-test-info-table]').exists('it shows the known primary cluster details');
@@ -51,13 +46,13 @@ module('Integration | Component | replication-secondary-card', function (hooks)
     const url = this.element.querySelector('[data-test-primary-link]').href;
     const expectedUrl = `${REPLICATION_DETAILS.primaries[0].api_address}/ui/`;
 
-    assert.strictEqual(url, expectedUrl, 'it renders a link to the primary cluster UI');
+    assert.equal(url, expectedUrl, 'it renders a link to the primary cluster UI');
   });
 
   test('it does not render a link to the primary cluster UI when the primary api address or known primaries are unknown', async function (assert) {
     this.set('replicationDetails', {});
     await render(
-      hbs`<ReplicationSecondaryCard @replicationDetails={{this.replicationDetails}} @title='Primary cluster'/>`
+      hbs`<ReplicationSecondaryCard @replicationDetails={{replicationDetails}} @title='Primary cluster'/>`
     );
 
     assert.dom('[data-test-primary-link]').doesNotExist();
@@ -66,14 +61,14 @@ module('Integration | Component | replication-secondary-card', function (hooks)
   test('it renders with emptyState if no knownPrimaryClusterAddrs are set', async function (assert) {
     this.set('replicationDetails', []);
     await render(
-      hbs`<ReplicationSecondaryCard @replicationDetails={{this.replicationDetails}} @title='Primary cluster'/>`
+      hbs`<ReplicationSecondaryCard @replicationDetails={{replicationDetails}} @title='Primary cluster'/>`
     );
     assert.dom('[data-test-component="empty-state"]').exists();
   });
 
   test('it renders tooltip with check-circle-outline when state is stream-wals', async function (assert) {
     await render(
-      hbs`<ReplicationSecondaryCard @replicationDetails={{this.replicationDetails}} @title={{this.title}} />`
+      hbs`<ReplicationSecondaryCard @replicationDetails={{replicationDetails}} @title={{title}} />`
     );
     assert.dom('[data-test-glyph]').hasClass('has-text-success', `shows success icon`);
   });
@@ -86,9 +81,7 @@ module('Integration | Component | replication-secondary-card', function (hooks)
     };
 
     this.set('stateError', stateError);
-    await render(
-      hbs`<ReplicationSecondaryCard @replicationDetails={{this.stateError}} @title={{this.title}} />`
-    );
+    await render(hbs`<ReplicationSecondaryCard @replicationDetails={{stateError}} @title={{title}} />`);
     assert.dom('[data-test-error]').includesText('state', 'show correct error title');
     assert
       .dom('[data-test-inline-error-message]')
@@ -103,9 +96,7 @@ module('Integration | Component | replication-secondary-card', function (hooks)
     };
 
     this.set('connectionError', connectionError);
-    await render(
-      hbs`<ReplicationSecondaryCard @replicationDetails={{this.connectionError}} @title={{this.title}} />`
-    );
+    await render(hbs`<ReplicationSecondaryCard @replicationDetails={{connectionError}} @title={{title}} />`);
     assert.dom('[data-test-error]').includesText('connection_state', 'show correct error title');
     assert
       .dom('[data-test-inline-error-message]')
diff --git a/ui/tests/integration/components/replication-summary-card-test.js b/ui/tests/integration/components/replication-summary-card-test.js
index 7ce51f901d4fe..154c7d8c308c7 100644
--- a/ui/tests/integration/components/replication-summary-card-test.js
+++ b/ui/tests/integration/components/replication-summary-card-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
@@ -32,9 +27,7 @@ module('Integration | Component | replication-summary-card', function (hooks) {
   });
 
   test('it renders', async function (assert) {
-    await render(
-      hbs`<ReplicationSummaryCard @replicationDetails={{this.replicationDetails}} @title={{this.title}} />`
-    );
+    await render(hbs`<ReplicationSummaryCard @replicationDetails={{replicationDetails}} @title={{title}} />`);
     assert.dom('[data-test-replication-summary-card]').exists();
     assert
       .dom('[data-test-lastWAL]')
@@ -48,7 +41,7 @@ module('Integration | Component | replication-summary-card', function (hooks) {
 
   test('it shows the correct lastWAL and knownSecondaries when title is Performance', async function (assert) {
     await render(
-      hbs`<ReplicationSummaryCard @replicationDetails={{this.replicationDetails}} @title="Performance" />`
+      hbs`<ReplicationSummaryCard @replicationDetails={{replicationDetails}} @title="Performance" />`
     );
     assert
       .dom('[data-test-lastWAL]')
diff --git a/ui/tests/integration/components/replication-table-rows-test.js b/ui/tests/integration/components/replication-table-rows-test.js
index 3d3fbc21d184d..5af4392545a93 100644
--- a/ui/tests/integration/components/replication-table-rows-test.js
+++ b/ui/tests/integration/components/replication-table-rows-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
@@ -25,14 +20,14 @@ module('Integration | Component | replication-table-rows', function (hooks) {
 
   test('it renders', async function (assert) {
     await render(
-      hbs`<ReplicationTableRows @replicationDetails={{this.replicationDetails}} @clusterMode={{this.clusterMode}}/>`
+      hbs`<ReplicationTableRows @replicationDetails={{replicationDetails}} @clusterMode={{clusterMode}}/>`
     );
     assert.dom('[data-test-table-rows]').exists();
   });
 
   test('it renders with merkle root, mode, replication set', async function (assert) {
     await render(
-      hbs`<ReplicationTableRows @replicationDetails={{this.replicationDetails}} @clusterMode={{this.clusterMode}}/>`
+      hbs`<ReplicationTableRows @replicationDetails={{replicationDetails}} @clusterMode={{clusterMode}}/>`
     );
     assert.dom('.empty-state').doesNotExist('does not show empty state when data is found');
 
@@ -54,7 +49,7 @@ module('Integration | Component | replication-table-rows', function (hooks) {
     this.set('replicationDetails', noAttrs);
     this.set('clusterMode', clusterMode);
     await render(
-      hbs`<ReplicationTableRows @replicationDetails={{this.replicationDetails}} @clusterMode={{this.clusterMode}}/>`
+      hbs`<ReplicationTableRows @replicationDetails={{replicationDetails}} @clusterMode={{clusterMode}}/>`
     );
 
     assert.dom('[data-test-table-rows]').includesText('unknown');
diff --git a/ui/tests/integration/components/search-select-test.js b/ui/tests/integration/components/search-select-test.js
index afd3df7e6867f..f8476886640f2 100644
--- a/ui/tests/integration/components/search-select-test.js
+++ b/ui/tests/integration/components/search-select-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { create } from 'ember-cli-page-object';
@@ -13,8 +8,8 @@ import { run } from '@ember/runloop';
 import hbs from 'htmlbars-inline-precompile';
 import sinon from 'sinon';
 import waitForError from 'vault/tests/helpers/wait-for-error';
+
 import searchSelect from '../../pages/components/search-select';
-import { isWildcardString } from 'vault/helpers/is-wildcard-string';
 
 const component = create(searchSelect);
 
@@ -58,13 +53,6 @@ const storeService = Service.extend({
             { id: 'model-c-id', name: 'model-c', uuid: 'c789', type: 'c' },
           ]);
           break;
-        case 'pki/issuer':
-          resolve([
-            { id: 'issuer-a-id', issuerName: 'my-first-issuer' },
-            { id: 'issuer-b-id' },
-            { id: 'issuer-c-id', issuerName: 'my-issuer-again' },
-          ]);
-          break;
         default:
           reject({ httpStatus: 404, message: 'not found' });
           break;
@@ -78,14 +66,6 @@ module('Integration | Component | search select', function (hooks) {
   setupRenderingTest(hooks);
 
   hooks.beforeEach(function () {
-    const mockFunctionFromParent = (selection, dropdownOptions) => {
-      const modelExists =
-        !!dropdownOptions.findBy('id', selection) ||
-        !!dropdownOptions.findBy('uuid', selection) ||
-        isWildcardString([selection]);
-      return !modelExists ? 'The model associated with this id no longer exists' : false;
-    };
-    this.set('renderInfoTooltip', mockFunctionFromParent);
     run(() => {
       this.owner.unregister('service:store');
       this.owner.register('service:store', storeService);
@@ -96,62 +76,24 @@ module('Integration | Component | search select', function (hooks) {
     const models = ['policy/acl'];
     this.set('models', models);
     this.set('onChange', sinon.spy());
-    await render(hbs`
-      <SearchSelect
-        @label="foo"
-        @models={{this.models}}
-        @onChange={{this.onChange}}
-      />
-    `);
+    await render(hbs`{{search-select label="foo" models=models onChange=onChange}}`);
 
     assert.ok(component.hasLabel, 'it renders the label');
-    assert.strictEqual(component.labelText, 'foo', 'the label text is correct');
+    assert.equal(component.labelText, 'foo', 'the label text is correct');
     assert.ok(component.hasTrigger, 'it renders the power select trigger');
-    assert.strictEqual(component.selectedOptions.length, 0, 'there are no selected options');
+    assert.equal(component.selectedOptions.length, 0, 'there are no selected options');
   });
 
   test('it shows options when trigger is clicked', async function (assert) {
     const models = ['policy/acl'];
     this.set('models', models);
     this.set('onChange', sinon.spy());
-    await render(hbs`
-      <SearchSelect
-        @label="foo"
-        @models={{this.models}}
-        @onChange={{this.onChange}}
-      />
-    `);
+    await render(hbs`{{search-select label="foo" models=models onChange=onChange}}`);
 
     await clickTrigger();
     await settled();
-    assert.strictEqual(component.options.length, 3, 'shows all options');
-    assert.strictEqual(
-      component.options.objectAt(0).text,
-      component.selectedOptionText,
-      'first object in list is focused'
-    );
-  });
-
-  test('it shows passed in options when trigger is clicked', async function (assert) {
-    const options = [
-      { name: 'namespace45', id: 'displayedName' },
-      { name: 'name24', id: '1241' },
-    ];
-    this.set('options', options);
-    this.set('onChange', sinon.spy());
-    this.set('inputValue', ['third-option']);
-    await render(hbs`
-      <SearchSelect
-        @label="foo"
-        @options={{this.options}}
-        @onChange={{this.onChange}}
-        @inputValue={{this.inputValue}}
-      />
-    `);
-    await clickTrigger();
-    await settled();
-    assert.strictEqual(component.options.length, 2, 'shows all options');
-    assert.strictEqual(
+    assert.equal(component.options.length, 3, 'shows all options');
+    assert.equal(
       component.options.objectAt(0).text,
       component.selectedOptionText,
       'first object in list is focused'
@@ -162,43 +104,24 @@ module('Integration | Component | search select', function (hooks) {
     const models = ['identity/entity'];
     this.set('models', models);
     this.set('onChange', sinon.spy());
-    await render(hbs`
-      <SearchSelect
-        @label="foo"
-        @models={{this.models}}
-        @onChange={{this.onChange}}
-      />
-    `);
+    await render(hbs`{{search-select label="foo" models=models onChange=onChange}}`);
 
     await clickTrigger();
     await settled();
-    assert.strictEqual(component.options.length, 3, 'shows all options');
-    assert.strictEqual(component.options.objectAt(0).text, 'seven 7', 'first option renders');
+    assert.equal(component.options.length, 3, 'shows all options');
     await typeInSearch('n');
-    assert.strictEqual(
-      component.options.length,
-      3,
-      'list still shows three options, including the add option'
-    );
+    assert.equal(component.options.length, 3, 'list still shows three options, including the add option');
     await typeInSearch('ni');
-    assert.strictEqual(component.options.length, 2, 'list shows two options, including the add option');
+    assert.equal(component.options.length, 2, 'list shows two options, including the add option');
     await typeInSearch('nine');
-    assert.strictEqual(component.options.length, 1, 'list shows one option');
-    assert.strictEqual(component.options.objectAt(0).text, 'nine 9', 'renders only matching option');
+    assert.equal(component.options.length, 1, 'list shows one option');
   });
 
   test('it counts options when wildcard is used and displays the count', async function (assert) {
     const models = ['transform/transformation'];
     this.set('models', models);
     this.set('onChange', sinon.spy());
-    await render(hbs`
-      <SearchSelect
-        @label="foo"
-        @models={{this.models}}
-        @onChange={{this.onChange}}
-        @wildcardLabel="role"
-      />
-    `);
+    await render(hbs`{{search-select label="foo" models=models onChange=onChange wildcardLabel="role" }}`);
 
     await clickTrigger();
     await settled();
@@ -207,31 +130,19 @@ module('Integration | Component | search select', function (hooks) {
     await component.selectOption();
     await settled();
     assert.dom('[data-test-count="2"]').exists('correctly counts with wildcard filter and shows the count');
-    assert.strictEqual(
-      component.selectedOptions.objectAt(0).text,
-      '*bar* includes 2 roles',
-      'renders correct selected text'
-    );
   });
 
   test('it behaves correctly if new items not allowed', async function (assert) {
     const models = ['identity/entity'];
     this.set('models', models);
     this.set('onChange', sinon.spy());
-    await render(hbs`
-      <SearchSelect
-        @label="foo"
-        @models={{this.models}}
-        @onChange={{this.onChange}}
-        @disallowNewItems={{true}}
-      />
-    `);
+    await render(hbs`{{search-select label="foo" models=models onChange=onChange disallowNewItems=true}}`);
 
     await clickTrigger();
-    assert.strictEqual(component.options.length, 3, 'shows all options');
+    assert.equal(component.options.length, 3, 'shows all options');
     await typeInSearch('p');
-    assert.strictEqual(component.options.length, 1, 'list shows one option');
-    assert.strictEqual(component.options[0].text, 'No results found');
+    assert.equal(component.options.length, 1, 'list shows one option');
+    assert.equal(component.options[0].text, 'No results found');
     await clickTrigger();
     assert.ok(this.onChange.notCalled, 'on change not called when empty state clicked');
   });
@@ -240,26 +151,19 @@ module('Integration | Component | search select', function (hooks) {
     const models = ['identity/entity'];
     this.set('models', models);
     this.set('onChange', sinon.spy());
-    await render(hbs`
-    <div class='box'>
-      <SearchSelect
-        @label="foo"
-        @models={{this.models}}
-        @onChange={{this.onChange}}
-      />
-    </div>
-    `);
+    await render(hbs`{{search-select label="foo" models=models onChange=onChange}}`);
+
     await clickTrigger();
     await settled();
-    assert.strictEqual(component.options.length, 3, 'shows all options');
+    assert.equal(component.options.length, 3, 'shows all options');
     await component.selectOption();
     await settled();
-    assert.strictEqual(component.selectedOptions.length, 1, 'there is 1 selected option');
+    assert.equal(component.selectedOptions.length, 1, 'there is 1 selected option');
     assert.ok(this.onChange.calledOnce);
     assert.ok(this.onChange.calledWith(['7']));
     await clickTrigger();
     await settled();
-    assert.strictEqual(component.options.length, 2, 'shows two options');
+    assert.equal(component.options.length, 2, 'shows two options');
   });
 
   test('it pre-populates list with passed in selectedOptions', async function (assert) {
@@ -267,19 +171,12 @@ module('Integration | Component | search select', function (hooks) {
     this.set('models', models);
     this.set('onChange', sinon.spy());
     this.set('inputValue', ['8']);
-    await render(hbs`
-      <SearchSelect
-        @label="foo"
-        @models={{this.models}}
-        @onChange={{this.onChange}}
-        @inputValue={{this.inputValue}}
-      />
-    `);
-    assert.strictEqual(component.selectedOptions.length, 1, 'there is 1 selected option');
-    assert.strictEqual(component.selectedOptions.objectAt(0).text, 'eight 8', 'selected option renders');
+    await render(hbs`{{search-select label="foo" inputValue=inputValue models=models onChange=onChange}}`);
+
+    assert.equal(component.selectedOptions.length, 1, 'there is 1 selected option');
     await clickTrigger();
     await settled();
-    assert.strictEqual(component.options.length, 2, 'shows two options');
+    assert.equal(component.options.length, 2, 'shows two options');
   });
 
   test('it adds discarded list items back into select', async function (assert) {
@@ -287,317 +184,140 @@ module('Integration | Component | search select', function (hooks) {
     this.set('models', models);
     this.set('onChange', sinon.spy());
     this.set('inputValue', ['8']);
-    await render(hbs`
-      <SearchSelect
-        @label="foo"
-        @models={{this.models}}
-        @onChange={{this.onChange}}
-        @inputValue={{this.inputValue}}
-      />
-    `);
+    await render(hbs`{{search-select label="foo" inputValue=inputValue models=models onChange=onChange}}`);
 
-    assert.strictEqual(component.selectedOptions.length, 1, 'there is 1 selected option');
+    assert.equal(component.selectedOptions.length, 1, 'there is 1 selected option');
     await component.deleteButtons.objectAt(0).click();
     await settled();
-    assert.strictEqual(component.selectedOptions.length, 0, 'there are no selected options');
+    assert.equal(component.selectedOptions.length, 0, 'there are no selected options');
     assert.ok(this.onChange.calledOnce);
     assert.ok(this.onChange.calledWith([]));
     await clickTrigger();
     await settled();
-    assert.strictEqual(component.options.length, 3, 'shows all options');
-    assert.strictEqual(
-      component.options.objectAt(2).text,
-      'eight 8',
-      'previously selected option returns to dropdown and renders properly'
-    );
+    assert.equal(component.options.length, 3, 'shows all options');
   });
 
   test('it adds created item to list items on create and removes without adding back to options on delete', async function (assert) {
     const models = ['identity/entity'];
     this.set('models', models);
     this.set('onChange', sinon.spy());
-    await render(hbs`
-      <SearchSelect
-        @label="foo"
-        @models={{this.models}}
-        @onChange={{this.onChange}}
-      />
-    `);
+    await render(hbs`{{search-select label="foo" models=models onChange=onChange}}`);
+
     await clickTrigger();
     await settled();
-    assert.strictEqual(component.options.length, 3, 'shows all options');
+    assert.equal(component.options.length, 3, 'shows all options');
     await typeInSearch('n');
-    assert.strictEqual(
-      component.options.length,
-      3,
-      'list still shows three options, including the add option'
-    );
+    assert.equal(component.options.length, 3, 'list still shows three options, including the add option');
     await typeInSearch('ni');
     await component.selectOption();
     await settled();
-    assert.strictEqual(component.selectedOptions.length, 1, 'there is 1 selected option');
+    assert.equal(component.selectedOptions.length, 1, 'there is 1 selected option');
     assert.ok(this.onChange.calledOnce);
     assert.ok(this.onChange.calledWith(['ni']));
     await component.deleteButtons.objectAt(0).click();
     await settled();
-    assert.strictEqual(component.selectedOptions.length, 0, 'there are no selected options');
+    assert.equal(component.selectedOptions.length, 0, 'there are no selected options');
     assert.ok(this.onChange.calledWith([]));
     await clickTrigger();
     await settled();
-    assert.strictEqual(component.options.length, 3, 'does not add deleted option back to list');
+    assert.equal(component.options.length, 3, 'does not add deleted option back to list');
   });
 
   test('it uses fallback component if endpoint 403s', async function (assert) {
     const models = ['policy/rgp'];
     this.set('models', models);
     this.set('onChange', sinon.spy());
-    await render(hbs`
-      <SearchSelect
-        @label="Policy"
-        @models={{this.models}}
-        @onChange={{this.onChange}}
-        @fallbackComponent="string-list"
-      />
-    `);
-    assert.ok(component.hasStringList);
-  });
+    await render(
+      hbs`{{search-select label="foo" inputValue=inputValue models=models fallbackComponent="string-list" onChange=onChange}}`
+    );
 
-  test('it uses pre-populates fallback component with inputValue if endpoint 403s', async function (assert) {
-    const models = ['policy/rgp'];
-    this.set('models', models);
-    this.set('inputValue', ['1']);
-    await render(hbs`
-      <SearchSelect
-        @label="Policy"
-        @models={{this.models}}
-        @onChange={{this.onChange}}
-        @inputValue={{this.inputValue}}
-        @fallbackComponent="string-list"
-      />
-    `);
-    assert.dom('[data-test-string-list-input="0"]').hasValue('1');
+    assert.ok(component.hasStringList);
   });
 
   test('it shows no results if endpoint 404s', async function (assert) {
     const models = ['test'];
     this.set('models', models);
     this.set('onChange', sinon.spy());
-    await render(hbs`
-      <SearchSelect
-        @label="foo"
-        @models={{this.models}}
-        @onChange={{this.onChange}}
-        @inputValue={{this.inputValue}}
-        @fallbackComponent="string-list"
-      />
-    `);
+    await render(
+      hbs`{{search-select label="foo" inputValue=inputValue models=models fallbackComponent="string-list" onChange=onChange}}`
+    );
 
     await clickTrigger();
     await settled();
-    assert.strictEqual(component.options.length, 1, 'prompts for search to add new options');
-    assert.strictEqual(
-      component.options.objectAt(0).text,
-      'Type to search',
-      'text of option shows Type to search'
-    );
+    assert.equal(component.options.length, 1, 'prompts for search to add new options');
+    assert.equal(component.options.objectAt(0).text, 'Type to search', 'text of option shows Type to search');
   });
 
-  test('it shows add suggestion if there are no models', async function (assert) {
+  test('it shows add suggestion if there are no options', async function (assert) {
     const models = [];
     this.set('models', models);
     this.set('onChange', sinon.spy());
-    await render(hbs`
-      <SearchSelect
-        @label="foo"
-        @models={{this.models}}
-        @onChange={{this.onChange}}
-        @inputValue={{this.inputValue}}
-        @fallbackComponent="string-list"
-      />
-    `);
+    await render(
+      hbs`{{search-select label="foo" inputValue=inputValue models=models fallbackComponent="string-list" onChange=onChange}}`
+    );
+
     await clickTrigger();
     await settled();
-    assert.strictEqual(component.options.length, 1);
-    assert.strictEqual(
-      component.options.objectAt(0).text,
-      'Type to search',
-      'no options in dropdown, just Type to search prompt'
-    );
-    await typeInSearch('new-model');
-    assert.strictEqual(
-      component.options.objectAt(0).text,
-      'Click to add new item: new-model',
-      'shows the create suggestion'
-    );
+
+    await typeInSearch('new item');
+    assert.equal(component.options.objectAt(0).text, 'Add new foo: new item', 'shows the create suggestion');
   });
 
-  test('it shows selected items not in the returned response and if one model 404s', async function (assert) {
-    const models = ['test', 'policy/acl'];
+  test('it shows items not in the returned response', async function (assert) {
+    const models = ['test'];
     this.set('models', models);
-    this.set('inputValue', ['test-1', 'test-2']);
-    this.set('onChange', sinon.spy());
-    await render(hbs`
-      <SearchSelect
-        @label="foo"
-        @models={{this.models}}
-        @onChange={{this.onChange}}
-        @inputValue={{this.inputValue}}
-        @fallbackComponent="string-list"
-      />
-    `);
-    assert.strictEqual(component.selectedOptions.objectAt(0).text, 'test-1', 'renders first selected option');
-    assert.strictEqual(
-      component.selectedOptions.objectAt(1).text,
-      'test-2',
-      'renders second selected option'
-    );
-    await clickTrigger();
-    assert.strictEqual(component.options.objectAt(0).text, '1', 'renders options from successful query');
-    await typeInSearch('new-item');
-    await component.selectOption();
-    assert.strictEqual(component.selectedOptions.objectAt(2).text, 'new-item', 'renders newly added item');
-    assert.ok(
-      this.onChange.calledWith(['test-1', 'test-2', 'new-item']),
-      'onChange called with all three items'
+    this.set('inputValue', ['test', 'two']);
+    await render(
+      hbs`{{search-select label="foo" inputValue=inputValue models=models fallbackComponent="string-list" onChange=onChange}}`
     );
+
+    assert.equal(component.selectedOptions.length, 2, 'renders inputOptions as selectedOptions');
   });
 
   test('it shows both name and smaller id for identity endpoints', async function (assert) {
     const models = ['identity/entity'];
     this.set('models', models);
     this.set('onChange', sinon.spy());
-    await render(hbs`
-      <SearchSelect
-        @label="foo"
-        @models={{this.models}}
-        @onChange={{this.onChange}}
-        @inputValue={{this.inputValue}}
-      />
-    `);
-    await clickTrigger();
-    assert.strictEqual(component.options.length, 3, 'shows three options');
-    assert.strictEqual(component.options.objectAt(0).text, 'seven 7', 'renders correct dropdown text');
-    assert.strictEqual(component.smallOptionIds.length, 3, 'shows 3 smaller id text and the name');
-  });
+    await render(hbs`{{search-select label="foo" inputValue=inputValue models=models onChange=onChange}}`);
 
-  test('it renders correctly when model keys are not standardized', async function (assert) {
-    const models = ['pki/issuer'];
-    this.set('models', models);
-    this.set('onChange', sinon.spy());
-    this.set('disallowNewItems', true);
-    await render(hbs`
-      <SearchSelect
-        @label="foo"
-        @models={{this.models}}
-        @onChange={{this.onChange}}
-        @inputValue={{this.inputValue}}
-        @shouldRenderName={{true}}
-        @nameKey="issuerName"
-        @disallowNewItems={{this.disallowNewItems}}
-      />
-    `);
     await clickTrigger();
-    assert.strictEqual(component.options.length, 3, 'shows three options');
-    assert.strictEqual(
-      component.options.objectAt(0).text,
-      'my-first-issuer issuer-a-id',
-      'first option renders custom ID and name'
-    );
-    assert.strictEqual(
-      component.options.objectAt(1).text,
-      'issuer-b-id',
-      `second option renders only id at custom key`
-    );
-    await typeInSearch('issuer-a');
-    await settled();
-    assert.strictEqual(
-      component.options.length,
-      2,
-      'shows two options after filter, filtering on both name and id keys'
-    );
-    this.set('disallowNewItems', false);
-    await typeInSearch('new-issuer');
-    await settled();
-    assert.strictEqual(component.options.length, 1, 'shows suggestion');
-    assert.strictEqual(
-      component.options.objectAt(0).text,
-      'Click to add new item: new-issuer',
-      'Prompts to add new item'
-    );
+    assert.equal(component.options.length, 3, 'shows all options');
+    assert.equal(component.smallOptionIds.length, 3, 'shows the smaller id text and the name');
   });
 
   test('it does not show name and smaller id for non-identity endpoints', async function (assert) {
     const models = ['policy/acl'];
     this.set('models', models);
     this.set('onChange', sinon.spy());
-    await render(hbs`
-    <SearchSelect
-    @label="foo"
-    @models={{this.models}}
-    @onChange={{this.onChange}}
-    @inputValue={{this.inputValue}}
-    @fallbackComponent="string-list"
-    />
-    `);
+    await render(hbs`{{search-select label="foo" inputValue=inputValue models=models onChange=onChange}}`);
+
     await clickTrigger();
-    assert.strictEqual(component.options.length, 3, 'shows all options');
-    assert.strictEqual(component.options.objectAt(0).text, '1', 'renders just id');
-    assert.strictEqual(component.smallOptionIds.length, 0, 'only shows the regular sized id');
+    assert.equal(component.options.length, 3, 'shows all options');
+    assert.equal(component.smallOptionIds.length, 0, 'only shows the regular sized id');
   });
 
   test('it throws an error if endpoint 500s', async function (assert) {
     const models = ['server/error'];
     this.set('models', models);
     this.set('onChange', sinon.spy());
-    const promise = waitForError();
-    await render(hbs`
-      <SearchSelect
-        @label="foo"
-        @models={{this.models}}
-        @onChange={{this.onChange}}
-        @inputValue={{this.inputValue}}
-      />
-    `);
-    const err = await promise;
+    let promise = waitForError();
+    render(hbs`{{search-select label="foo" inputValue=inputValue models=models onChange=onChange}}`);
+    let err = await promise;
     assert.ok(err.message.includes('internal server error'), 'it throws an internal server error');
   });
 
-  test('it queries multiple models', async function (assert) {
-    const models = ['identity/entity', 'policy/acl'];
-    this.set('models', models);
-    this.set('onChange', sinon.spy());
-
-    await render(hbs`
-      <SearchSelect
-        @label="foo"
-        @models={{this.models}}
-        @onChange={{this.onChange}}
-      />
-    `);
-    await clickTrigger();
-    assert.strictEqual(component.options.length, 6, 'shows options from both models');
-    assert.strictEqual(component.options.objectAt(0).text, 'seven 7', 'first dropdown item renders');
-    assert.strictEqual(component.options.objectAt(5).text, '3 3', 'last dropdown item renders');
-  });
-
   test('it returns array with objects instead of strings if passObject=true', async function (assert) {
     const models = ['identity/entity'];
     this.set('models', models);
     this.set('onChange', sinon.spy());
     this.set('passObject', true);
-    await render(hbs`
-      <SearchSelect
-        @label="foo"
-        @models={{this.models}}
-        @onChange={{this.onChange}}
-        @passObject={{this.passObject}}
-      />
-    `);
+    await render(hbs`{{search-select label="foo" models=models onChange=onChange passObject=passObject}}`);
+
     await clickTrigger();
     await settled();
     // First select existing option
     await component.selectOption();
-    assert.strictEqual(component.selectedOptions.length, 1, 'there is 1 selected option');
+    assert.equal(component.selectedOptions.length, 1, 'there is 1 selected option');
     assert.ok(this.onChange.calledOnce);
     assert.ok(
       this.onChange.calledWith([{ id: '7', isNew: false }]),
@@ -625,6 +345,7 @@ module('Integration | Component | search select', function (hooks) {
     this.set('onChange', spy);
     this.set('objectKeys', ['id', 'uuid']);
     await render(hbs`
+    <div class="box">
       <SearchSelect
         @label="foo"
         @models={{this.models}}
@@ -632,6 +353,7 @@ module('Integration | Component | search select', function (hooks) {
         @passObject={{true}}
         @objectKeys={{this.objectKeys}}
       />
+    </div>
     `);
 
     await clickTrigger();
@@ -639,7 +361,7 @@ module('Integration | Component | search select', function (hooks) {
 
     // First select existing option
     await component.selectOption();
-    assert.strictEqual(component.selectedOptions.length, 1, 'there is 1 selected option');
+    assert.equal(component.selectedOptions.length, 1, 'there is 1 selected option');
     assert
       .dom('[data-test-selected-option]')
       .hasText('model-a-id', 'does not render name if first objectKey is id');
@@ -679,6 +401,7 @@ module('Integration | Component | search select', function (hooks) {
     this.set('onChange', spy);
     this.set('objectKeys', objectKeys);
     await render(hbs`
+    <div class="box">
       <SearchSelect
         @label="foo"
         @models={{this.models}}
@@ -686,6 +409,7 @@ module('Integration | Component | search select', function (hooks) {
         @passObject={{true}}
         @objectKeys={{this.objectKeys}}
       />
+    </div>
     `);
 
     await clickTrigger();
@@ -693,7 +417,7 @@ module('Integration | Component | search select', function (hooks) {
 
     // First select existing option
     await component.selectOption();
-    assert.strictEqual(component.selectedOptions.length, 1, 'there is 1 selected option');
+    assert.equal(component.selectedOptions.length, 1, 'there is 1 selected option');
     assert
       .dom('[data-test-selected-option]')
       .hasText('model-a a123', `renders name and ${objectKeys[0]} if first objectKey is not id`);
@@ -720,12 +444,14 @@ module('Integration | Component | search select', function (hooks) {
     this.set('onChange', spy);
     this.set('objectKeys', objectKeys);
     await render(hbs`
+    <div class="box">
       <SearchSelect
         @label="foo"
         @models={{this.models}}
         @onChange={{this.onChange}}
         @objectKeys={{this.objectKeys}}
       />
+    </div>
     `);
 
     await clickTrigger();
@@ -733,7 +459,7 @@ module('Integration | Component | search select', function (hooks) {
 
     // First select existing option
     await component.selectOption();
-    assert.strictEqual(component.selectedOptions.length, 1, 'there is 1 selected option');
+    assert.equal(component.selectedOptions.length, 1, 'there is 1 selected option');
     assert
       .dom('[data-test-selected-option]')
       .hasText('1', 'renders model id if does not have objectKey as an attribute');
@@ -748,6 +474,7 @@ module('Integration | Component | search select', function (hooks) {
     this.set('onChange', spy);
     this.set('objectKeys', objectKeys);
     await render(hbs`
+    <div class="box">
       <SearchSelect
         @label="foo"
         @models={{this.models}}
@@ -755,13 +482,15 @@ module('Integration | Component | search select', function (hooks) {
         @passObject={{true}}
         @objectKeys={{this.objectKeys}}
       />
+    </div>
     `);
 
     await clickTrigger();
     await settled();
+
     // First select existing option
     await component.selectOption();
-    assert.strictEqual(component.selectedOptions.length, 1, 'there is 1 selected option');
+    assert.equal(component.selectedOptions.length, 1, 'there is 1 selected option');
     assert.dom('[data-test-selected-option]').hasText('1', 'renders model id if does not have objectKey');
     assert.propEqual(
       spy.args[0][0],
@@ -783,6 +512,7 @@ module('Integration | Component | search select', function (hooks) {
     this.set('onChange', spy);
     this.set('objectKeys', objectKeys);
     await render(hbs`
+    <div class="box">
       <SearchSelect
         @label="foo"
         @models={{this.models}}
@@ -790,11 +520,13 @@ module('Integration | Component | search select', function (hooks) {
         @passObject={{true}}
         @objectKeys={{this.objectKeys}}
       />
+    </div>
     `);
+
     await clickTrigger();
     await settled();
-    assert.strictEqual(component.options.objectAt(0).text, '1', 'first option renders just id as name');
-    assert.strictEqual(
+    assert.equal(component.options.objectAt(0).text, '1', 'first option renders just id as name');
+    assert.equal(
       component.options.objectAt(3).text,
       'model-a a123',
       `4 option renders both name and ${objectKeys[0]}`
@@ -820,7 +552,7 @@ module('Integration | Component | search select', function (hooks) {
       spy.args[1][0],
       expectedArray,
       `onClick is called with array of objects and correct keys.
-      first object: ${Object.keys(expectedArray[0]).join(', ')},
+      first object: ${Object.keys(expectedArray[0]).join(', ')}, 
       second object: ${Object.keys(expectedArray[1]).join(', ')}`
     );
   });
@@ -833,18 +565,20 @@ module('Integration | Component | search select', function (hooks) {
     this.set('onChange', spy);
     this.set('objectKeys', objectKeys);
     await render(hbs`
+    <div class="box">
       <SearchSelect
         @label="foo"
         @models={{this.models}}
         @onChange={{this.onChange}}
         @objectKeys={{this.objectKeys}}
       />
+    </div>
     `);
 
     await clickTrigger();
     await settled();
-    assert.strictEqual(component.options.objectAt(0).text, '1', 'first option is just id as name');
-    assert.strictEqual(
+    assert.equal(component.options.objectAt(0).text, '1', 'first option is just id as name');
+    assert.equal(
       component.options.objectAt(3).text,
       'model-a a123',
       `4th option has both name and ${objectKeys[0]}`
@@ -874,11 +608,12 @@ module('Integration | Component | search select', function (hooks) {
         @onChange={{this.onChange}}
         @objectKeys={{this.objectKeys}}
         @inputValue={{this.inputValue}}
-        @renderInfoTooltip={{this.renderInfoTooltip}}
+        @renderInfoTooltip={{true}}
       />
       `);
-    assert.strictEqual(component.selectedOptions.length, 2, 'there are two selected options');
-    assert.dom('[data-test-selected-option="0"]').hasText('model-a a123');
+
+    assert.equal(component.selectedOptions.length, 2, 'there are two selected options');
+    assert.dom('[data-test-selected-option="0"]').hasText('model-a');
     assert.dom('[data-test-selected-option="1"]').hasText('non-existent-model');
     assert
       .dom('[data-test-selected-option="0"] [data-test-component="info-tooltip"]')
@@ -906,11 +641,11 @@ module('Integration | Component | search select', function (hooks) {
         @objectKeys={{this.objectKeys}}
         @inputValue={{this.inputValue}}
         @passObject={{true}}
-        @renderInfoTooltip={{this.renderInfoTooltip}}
+        @renderInfoTooltip={{true}}
       />
     `);
 
-    assert.strictEqual(component.selectedOptions.length, 2, 'there are two selected options');
+    assert.equal(component.selectedOptions.length, 2, 'there are two selected options');
     assert.dom('[data-test-selected-option="0"]').hasText('model-a a123');
     assert.dom('[data-test-selected-option="1"]').hasText('non-existent-model');
     assert
@@ -936,11 +671,11 @@ module('Integration | Component | search select', function (hooks) {
         @onChange={{this.onChange}}
         @inputValue={{this.inputValue}}
         @passObject={{true}}
-        @renderInfoTooltip={{this.renderInfoTooltip}}
+        @renderInfoTooltip={{true}}
       />
     `);
 
-    assert.strictEqual(component.selectedOptions.length, 2, 'there are two selected options');
+    assert.equal(component.selectedOptions.length, 2, 'there are two selected options');
     assert.dom('[data-test-selected-option="0"]').hasText('model-a-id');
     assert.dom('[data-test-selected-option="1"]').hasText('non-existent-model');
     assert
@@ -966,10 +701,10 @@ module('Integration | Component | search select', function (hooks) {
         @onChange={{this.onChange}}
         @inputValue={{this.inputValue}}
         @passObject={{false}}
-        @renderInfoTooltip={{this.renderInfoTooltip}}
+        @renderInfoTooltip={{true}}
       />
     `);
-    assert.strictEqual(component.selectedOptions.length, 3, 'there are three selected options');
+    assert.equal(component.selectedOptions.length, 3, 'there are three selected options');
     assert.dom('[data-test-selected-option="0"]').hasText('model-a-id');
     assert.dom('[data-test-selected-option="1"]').hasText('non-existent-model');
     assert.dom('[data-test-selected-option="2"]').hasText('wildcard*');
@@ -984,7 +719,7 @@ module('Integration | Component | search select', function (hooks) {
       .doesNotExist('does not render info tooltip for wildcard option');
   });
 
-  test('it does not render an info tooltip beside selection if not passed @renderInfoTooltip', async function (assert) {
+  test('it does not render an info tooltip beside selection if does not match a record returned from query and not passed @renderInfoTooltip', async function (assert) {
     const models = ['some/model'];
     const spy = sinon.spy();
     const inputValue = ['model-a-id', 'non-existent-model', 'wildcard*'];
diff --git a/ui/tests/integration/components/search-select-with-modal-test.js b/ui/tests/integration/components/search-select-with-modal-test.js
index 1538f9bfd5451..11b40c556df9c 100644
--- a/ui/tests/integration/components/search-select-with-modal-test.js
+++ b/ui/tests/integration/components/search-select-with-modal-test.js
@@ -1,18 +1,12 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { create } from 'ember-cli-page-object';
 import { setupMirage } from 'ember-cli-mirage/test-support';
 import { Response } from 'miragejs';
 import { clickTrigger, typeInSearch } from 'ember-power-select/test-support/helpers';
-import { render, fillIn, click, findAll } from '@ember/test-helpers';
+import { render, fillIn, click } from '@ember/test-helpers';
 import hbs from 'htmlbars-inline-precompile';
 import ss from 'vault/tests/pages/components/search-select';
-import sinon from 'sinon';
 
 const component = create(ss);
 
@@ -20,234 +14,128 @@ module('Integration | Component | search select with modal', function (hooks) {
   setupRenderingTest(hooks);
   setupMirage(hooks);
   hooks.beforeEach(function () {
-    this.set('onChange', sinon.spy());
+    this.server.get('identity/entity/id', () => {
+      return {
+        request_id: 'entity-list-id',
+        data: {
+          key_info: {
+            'entity-1-id': {
+              name: 'entity-1',
+            },
+            'entity-2-id': {
+              name: 'entity-2',
+            },
+          },
+          keys: ['entity-1-id', 'entity-2-id'],
+        },
+      };
+    });
     this.server.get('sys/policies/acl', () => {
       return {
-        request_id: 'acl-policy-list',
+        request_id: 'acl-policy-list-id',
         data: {
-          keys: ['default', 'root', 'acl-test'],
+          keys: ['default', 'root'],
         },
       };
     });
     this.server.get('sys/policies/rgp', () => {
       return {
-        request_id: 'rgp-policy-list',
+        request_id: 'rgp-policy-list-id',
         data: {
-          keys: ['rgp-test'],
+          keys: ['default', 'root'],
         },
       };
     });
-    this.server.get('/sys/policies/acl/acl-test', () => {
+    this.server.get('/identity/entity/id/entity-1-id', () => {
       return {
-        request_id: 'policy-acl',
+        request_id: 'some-entity-id-1',
         data: {
-          name: 'acl-test',
-          policy:
-            '\n# Grant \'create\', \'read\' , \'update\', and ‘list’ permission\n# to paths prefixed by \'secret/*\'\npath "secret/*" {\n  capabilities = [ "create", "read", "update", "list" ]\n}\n\n# Even though we allowed secret/*, this line explicitly denies\n# secret/super-secret. This takes precedence.\npath "secret/super-secret" {\n  capabilities = ["deny"]\n}\n',
+          id: 'entity-1-id',
+          name: 'entity-1',
+          namespace_id: 'root',
+          policies: ['default'],
         },
       };
     });
-    this.server.get('/sys/policies/rgp/rgp-test', () => {
+    this.server.get('/identity/entity/id/entity-2-id', () => {
       return {
-        request_id: 'policy-rgp',
+        request_id: 'some-entity-id-2',
         data: {
-          name: 'rgp-test',
-          enforcement_level: 'hard-mandatory',
-          policy:
-            '\n# Import strings library that exposes common string operations\nimport "strings"\n\n# Conditional rule (precond) checks the incoming request endpoint\n# targeted to sys/policies/acl/admin\nprecond = rule {\n    strings.has_prefix(request.path, "sys/policies/admin")\n}\n\n# Vault checks to see if the request was made by an entity\n# named James Thomas or Team Lead role defined as its metadata\nmain = rule when precond {\n    identity.entity.metadata.role is "Team Lead" or\n      identity.entity.name is "James Thomas"\n}\n',
+          id: 'entity-2-id',
+          name: 'entity-2',
+          namespace_id: 'root',
+          policies: ['default'],
         },
       };
     });
   });
 
-  test('it renders passed in models', async function (assert) {
+  test('it renders passed in model', async function (assert) {
     await render(hbs`
     <SearchSelectWithModal
-      @id="policies"
-      @label="Policies"
-      @labelClass="title is-4"
-      @models={{array "policy/acl" "policy/rgp"}}
-      @inputValue={{this.policies}}
+      @id="entity"
+      @label="Entity ID"
+      @subText="Search for an existing entity, or type a new name to create it."
+      @model="identity/entity"
       @onChange={{this.onChange}}
       @fallbackComponent="string-list"
-      @modalFormTemplate="modal-form/policy-template"
-      @excludeOptions={{array "root"}}
-      @subText="Some modal subtext"
-    />
-    <div id="modal-wormhole"></div>
+      @modalFormComponent="identity/edit-form"
+      @modalSubtext="Some modal subtext"
+      />
+      <div id="modal-wormhole"></div>
   `);
+
     assert.dom('[data-test-search-select-with-modal]').exists('the component renders');
-    assert.dom('[data-test-modal-subtext]').hasText('Some modal subtext', 'renders modal text');
-    assert.strictEqual(component.labelText, 'Policies', 'label text is correct');
+    assert.equal(component.labelText, 'Entity ID', 'label text is correct');
     assert.ok(component.hasTrigger, 'it renders the power select trigger');
-    assert.strictEqual(component.selectedOptions.length, 0, 'there are no selected options');
-
-    await clickTrigger();
-    const dropdownOptions = findAll('[data-option-index]').map((o) => o.innerText);
-    assert.notOk(dropdownOptions.includes('root'), 'root policy is not listed as option');
-    assert.strictEqual(component.options.length, 3, 'dropdown renders passed in models as options');
-    assert.ok(this.onChange.notCalled, 'onChange is not called');
-  });
-
-  test('it renders input value', async function (assert) {
-    this.policies = ['acl-test'];
-    await render(hbs`
-    <SearchSelectWithModal
-      @id="policies"
-      @label="Policies"
-      @labelClass="title is-4"
-      @models={{array "policy/acl" "policy/rgp"}}
-      @inputValue={{this.policies}}
-      @onChange={{this.onChange}}
-      @fallbackComponent="string-list"
-      @modalFormTemplate="modal-form/policy-template"
-      @subText="Some modal subtext"
-    />
-  `);
-    assert.strictEqual(component.selectedOptions.length, 1, 'there is one selected option');
-    assert.strictEqual(component.selectedOptions.objectAt(0).text, 'acl-test', 'renders inputted policies');
+    assert.equal(component.selectedOptions.length, 0, 'there are no selected options');
 
     await clickTrigger();
-    assert.strictEqual(component.options.length, 3, 'does not render all options returned from query');
-    const dropdownOptions = findAll('[data-option-index]').map((o) => o.innerText);
-    assert.notOk(dropdownOptions.includes('acl-test'), 'selected option is not included in the dropdown');
-    assert.ok(this.onChange.notCalled, 'onChange is not called');
+    assert.equal(component.options.length, 2, 'dropdown renders passed in models as options');
   });
 
-  test('it filters options, shows option to create new item and opens modal on select', async function (assert) {
+  test('it filters options and adds option to create new item', async function (assert) {
     assert.expect(7);
     await render(hbs`
     <SearchSelectWithModal
-      @id="policies"
-      @label="Policies"
-      @labelClass="title is-4"
-      @models={{array "policy/acl" "policy/rgp"}}
-      @inputValue={{this.policies}}
+      @id="entity"
+      @label="entity"
+      @subText="Search for an existing entity, or type a new name to create it."
+      @model="identity/entity"
       @onChange={{this.onChange}}
       @fallbackComponent="string-list"
-      @modalFormTemplate="modal-form/policy-template"
-    />
-    <div id="modal-wormhole"></div>
+      @modalFormComponent="identity/edit-form"
+      @modalSubtext="Some modal subtext"
+      />
+      <div id="modal-wormhole"></div>
   `);
 
     await clickTrigger();
-    assert.strictEqual(component.options.length, 4, 'dropdown renders all options');
+    assert.equal(component.options.length, 2, 'dropdown renders all options');
 
-    await typeInSearch('a');
-    assert.strictEqual(component.options.length, 3, 'dropdown renders all matching options plus add option');
-    await typeInSearch('acl-test');
-    assert.strictEqual(component.options[0].text, 'acl-test', 'dropdown renders only matching option');
+    await typeInSearch('e');
+    assert.equal(component.options.length, 3, 'dropdown renders all options plus add option');
 
-    await typeInSearch('acl-test-new');
-    assert.strictEqual(
-      component.options[0].text,
-      'No results found for "acl-test-new". Click here to create it.',
-      'dropdown gives option to create new option'
-    );
-    await component.selectOption();
+    await typeInSearch('entity-1');
+    assert.equal(component.options[0].text, 'entity-1-id', 'dropdown renders only matching option');
 
-    assert.dom('[data-test-modal-div]').hasAttribute('class', 'modal is-info is-active', 'modal is active');
-    assert.dom('[data-test-empty-state-title]').hasText('No policy type selected');
-    assert.ok(this.onChange.notCalled, 'onChange is not called');
-  });
-
-  test('it renders policy template and selects policy type', async function (assert) {
-    assert.expect(9);
-    this.server.put('/sys/policies/acl/acl-test-new', async (schema, req) => {
-      const requestBody = JSON.parse(req.requestBody);
-      assert.propEqual(
-        requestBody,
-        {
-          name: 'acl-test-new',
-          policy: 'path "secret/super-secret" { capabilities = ["deny"] }',
-        },
-        'onSave sends request to endpoint with correct policy attributes'
-      );
-    });
-    await render(hbs`
-    <SearchSelectWithModal
-      @id="policies"
-      @label="Policies"
-      @labelClass="title is-4"
-      @models={{array "policy/acl" "policy/rgp"}}
-      @inputValue={{this.policies}}
-      @onChange={{this.onChange}}
-      @fallbackComponent="string-list"
-      @modalFormTemplate="modal-form/policy-template"
-    />
-    <div id="modal-wormhole"></div>
-  `);
-    await clickTrigger();
-    await typeInSearch('acl-test-new');
-    assert.strictEqual(
+    await typeInSearch('entity-1-new');
+    assert.equal(
       component.options[0].text,
-      'No results found for "acl-test-new". Click here to create it.',
+      'Create new entity: entity-1-new',
       'dropdown gives option to create new option'
     );
-    await component.selectOption();
-    assert.dom('[data-test-empty-state-title]').hasText('No policy type selected');
-    await fillIn('[data-test-select="policyType"]', 'acl');
-    assert.dom('[data-test-policy-form]').exists('policy form renders after type is selected');
-    await click('[data-test-tab-example-policy]');
-    assert.dom('[data-test-tab-example-policy]').hasClass('is-active');
-    await click('[data-test-tab-your-policy]');
-    assert.dom('[data-test-tab-your-policy]').hasClass('is-active');
-    await fillIn(
-      '[data-test-component="code-mirror-modifier"] textarea',
-      'path "secret/super-secret" { capabilities = ["deny"] }'
-    );
-    await click('[data-test-policy-save]');
-    assert.dom('[data-test-modal-div]').doesNotExist('modal closes after save');
-    assert
-      .dom('[data-test-selected-option="0"]')
-      .hasText('acl-test-new', 'adds newly created policy to selected options');
-    assert.ok(
-      this.onChange.calledWithExactly(['acl-test-new']),
-      'onChange is called only after item is created'
-    );
-  });
 
-  test('it still renders search select if only second model returns 403', async function (assert) {
-    assert.expect(4);
-    this.server.get('sys/policies/rgp', () => {
-      return new Response(
-        403,
-        { 'Content-Type': 'application/json' },
-        JSON.stringify({ errors: ['permission denied'] })
-      );
-    });
-
-    await render(hbs`
-    <SearchSelectWithModal
-      @id="policies"
-      @label="Policies"
-      @labelClass="title is-4"
-      @models={{array "policy/acl" "policy/rgp"}}
-      @inputValue={{this.policies}}
-      @onChange={{this.onChange}}
-      @fallbackComponent="string-list"
-      @modalFormTemplate="modal-form/policy-template"
-    />
-    <div id="modal-wormhole"></div>
-  `);
-
-    assert.dom('[data-test-search-select-with-modal]').exists('the component renders');
-    assert.dom('[data-test-component="string-list"]').doesNotExist('does not render fallback component');
-    await clickTrigger();
-    assert.strictEqual(component.options.length, 3, 'only options from successful query render');
-    assert.ok(this.onChange.notCalled, 'onChange is not called');
+    await component.selectOption();
+    assert.dom('[data-test-modal-div]').hasAttribute('class', 'modal is-info is-active', 'modal is active');
+    assert.dom('[data-test-modal-subtext]').hasText('Some modal subtext', 'renders modal text');
+    assert.dom('[data-test-component="identity-edit-form"]').exists('renders identity form');
   });
 
-  test('it renders fallback component if both models return 403', async function (assert) {
+  test('it renders fallback component', async function (assert) {
     assert.expect(7);
-    this.server.get('sys/policies/acl', () => {
-      return new Response(
-        403,
-        { 'Content-Type': 'application/json' },
-        JSON.stringify({ errors: ['permission denied'] })
-      );
-    });
-    this.server.get('sys/policies/rgp', () => {
+    this.onChange = () => assert.ok(true, 'onChange callback fires');
+    this.server.get('identity/entity/id', () => {
       return new Response(
         403,
         { 'Content-Type': 'application/json' },
@@ -257,24 +145,25 @@ module('Integration | Component | search select with modal', function (hooks) {
 
     await render(hbs`
     <SearchSelectWithModal
-      @id="policies"
-      @label="Policies"
-      @labelClass="title is-4"
-      @models={{array "policy/acl" "policy/rgp"}}
-      @inputValue={{this.policies}}
+      @id="entity"
+      @label="Entity ID"
+      @subText="Search for an existing entity, or type a new name to create it."
+      @model="identity/entity"
       @onChange={{this.onChange}}
       @fallbackComponent="string-list"
-      @modalFormTemplate="modal-form/policy-template"
-    />
-    <div id="modal-wormhole"></div>
+      @modalFormComponent="identity/edit-form"
+      @modalSubtext="Some modal subtext"
+      />
+      <div id="modal-wormhole"></div>
   `);
+
     assert.dom('[data-test-component="string-list"]').exists('renders fallback component');
     assert.false(component.hasTrigger, 'does not render power select trigger');
-    await fillIn('[data-test-string-list-input="0"]', 'string-list-policy');
+    await fillIn('[data-test-string-list-input="0"]', 'some-entity');
     await click('[data-test-string-list-button="add"]');
     assert
       .dom('[data-test-string-list-input="0"]')
-      .hasValue('string-list-policy', 'first row renders inputted string');
+      .hasValue('some-entity', 'first row renders inputted string');
     assert
       .dom('[data-test-string-list-row="0"] [data-test-string-list-button="delete"]')
       .exists('first row renders delete icon');
@@ -282,9 +171,5 @@ module('Integration | Component | search select with modal', function (hooks) {
     assert
       .dom('[data-test-string-list-row="1"] [data-test-string-list-button="add"]')
       .exists('second row renders add icon');
-    assert.ok(
-      this.onChange.calledWithExactly(['string-list-policy']),
-      'onChange is called only after item is created'
-    );
   });
 });
diff --git a/ui/tests/integration/components/secret-edit-test.js b/ui/tests/integration/components/secret-edit-test.js
index a8195682462ef..b35259921c0c9 100644
--- a/ui/tests/integration/components/secret-edit-test.js
+++ b/ui/tests/integration/components/secret-edit-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render, settled } from '@ember/test-helpers';
@@ -39,7 +34,7 @@ module('Integration | Component | secret edit', function (hooks) {
       },
     });
 
-    await render(hbs`{{secret-edit mode=this.mode model=this.model }}`);
+    await render(hbs`{{secret-edit mode=mode model=model }}`);
     assert.dom('[data-test-toggle-input="json"]').isDisabled();
   });
 
@@ -53,7 +48,7 @@ module('Integration | Component | secret edit', function (hooks) {
       },
     });
 
-    await render(hbs`{{secret-edit mode=this.mode model=this.model }}`);
+    await render(hbs`{{secret-edit mode=mode model=model }}`);
     assert.dom('[data-test-toggle-input="json"]').isNotDisabled();
   });
 
@@ -63,9 +58,9 @@ module('Integration | Component | secret edit', function (hooks) {
       secretData: null,
     });
 
-    await render(hbs`{{secret-edit mode=this.mode model=this.model preferAdvancedEdit=true }}`);
+    await render(hbs`{{secret-edit mode=mode model=model preferAdvancedEdit=true }}`);
 
-    const instance = document.querySelector('.CodeMirror').CodeMirror;
+    let instance = document.querySelector('.CodeMirror').CodeMirror;
     instance.setValue(JSON.stringify([{ foo: 'bar' }]));
     await settled();
     assert.dom('[data-test-error]').includesText('Vault expects data to be formatted as an JSON object');
@@ -81,7 +76,7 @@ module('Integration | Component | secret edit', function (hooks) {
         float: '1.234',
       },
     });
-    await render(hbs`<SecretEdit @mode={{this.mode}} @model={{this.model}} />`);
+    await render(hbs`<SecretEdit @mode={{mode}} @model={{model}} />`);
     assert.dom('[data-test-secret-save]').isNotDisabled();
   });
 
@@ -99,9 +94,9 @@ module('Integration | Component | secret edit', function (hooks) {
       canReadSecretData: true,
     });
 
-    await render(hbs`{{secret-edit mode=this.mode model=this.model preferAdvancedEdit=true }}`);
+    await render(hbs`{{secret-edit mode=mode model=model preferAdvancedEdit=true }}`);
 
-    const instance = document.querySelector('.CodeMirror').CodeMirror;
+    let instance = document.querySelector('.CodeMirror').CodeMirror;
     instance.setValue(JSON.stringify([{ foo: 'bar' }]));
     await settled();
     assert.dom('[data-test-error]').includesText('Vault expects data to be formatted as an JSON object');
diff --git a/ui/tests/integration/components/secret-list-header-test.js b/ui/tests/integration/components/secret-list-header-test.js
index fbf682a94a9c0..1e6b818c77610 100644
--- a/ui/tests/integration/components/secret-list-header-test.js
+++ b/ui/tests/integration/components/secret-list-header-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
@@ -21,7 +16,7 @@ module('Integration | Component | secret-list-header', function (hooks) {
 
     this.server.post('/sys/capabilities-self', () => {});
 
-    for (const type of backends) {
+    for (let type of backends) {
       const data = this.server.create('secret-engine', 2, { type });
       this.model = mirageToModels(data);
       await render(hbs`
@@ -30,12 +25,11 @@ module('Integration | Component | secret-list-header', function (hooks) {
         />
       `);
       const selector = '[data-test-kv-version-badge]';
-
       if (['kv', 'generic'].includes(type)) {
         assert
           .dom(selector)
           .hasText(
-            `Version ${this.model.version || 1}`,
+            `Version ${this.model.options.version}`,
             `Badge renders with correct version for ${type} engine type`
           );
       } else {
diff --git a/ui/tests/integration/components/select-test.js b/ui/tests/integration/components/select-test.js
index 4009b07dfe5e0..6539f4b3211c5 100644
--- a/ui/tests/integration/components/select-test.js
+++ b/ui/tests/integration/components/select-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render, fillIn } from '@ember/test-helpers';
@@ -22,16 +17,16 @@ module('Integration | Component | Select', function (hooks) {
   });
 
   test('it renders', async function (assert) {
-    await render(hbs`<Select @options={{this.options}} @label={{this.label}} @name={{this.name}}/>`);
+    await render(hbs`<Select @options={{options}} @label={{label}} @name={{name}}/>`);
     assert.dom('[data-test-select-label]').hasText('Boop');
     assert.dom('[data-test-select="foo"]').exists();
   });
 
   test('it renders when options is an array of strings', async function (assert) {
-    await render(hbs`<Select @options={{this.options}} @label={{this.label}} @name={{this.name}}/>`);
+    await render(hbs`<Select @options={{options}} @label={{label}} @name={{name}}/>`);
 
     assert.dom('[data-test-select="foo"]').hasValue('foo');
-    assert.strictEqual(this.element.querySelector('[data-test-select="foo"]').options.length, 3);
+    assert.equal(this.element.querySelector('[data-test-select="foo"]').options.length, 3);
   });
 
   test('it renders when options is an array of objects', async function (assert) {
@@ -40,10 +35,10 @@ module('Integration | Component | Select', function (hooks) {
       { value: 'cherry', label: 'Cherry' },
     ];
     this.set('options', objectOptions);
-    await render(hbs`<Select @options={{this.options}} @label={{this.label}} @name={{this.name}}/>`);
+    await render(hbs`<Select @options={{options}} @label={{label}} @name={{name}}/>`);
 
     assert.dom('[data-test-select="foo"]').hasValue('berry');
-    assert.strictEqual(this.element.querySelector('[data-test-select="foo"]').options.length, 2);
+    assert.equal(this.element.querySelector('[data-test-select="foo"]').options.length, 2);
   });
 
   test('it renders when options is an array of custom objects', async function (assert) {
@@ -62,12 +57,12 @@ module('Integration | Component | Select', function (hooks) {
     await render(
       hbs`
         <Select
-          @options={{this.options}}
-          @label={{this.label}}
-          @name={{this.name}}
-          @valueAttribute={{this.valueAttribute}}
-          @labelAttribute={{this.labelAttribute}}
-          @selectedValue={{this.selectedValue}}/>`
+          @options={{options}}
+          @label={{label}}
+          @name={{name}}
+          @valueAttribute={{valueAttribute}}
+          @labelAttribute={{labelAttribute}}
+          @selectedValue={{selectedValue}}/>`
     );
 
     assert.dom('[data-test-select="foo"]').hasValue('tues', 'sets selectedValue by default');
@@ -78,7 +73,7 @@ module('Integration | Component | Select', function (hooks) {
 
   test('it calls onChange when an item is selected', async function (assert) {
     this.set('onChange', sinon.spy());
-    await render(hbs`<Select @options={{this.options}} @name={{this.name}} @onChange={{this.onChange}}/>`);
+    await render(hbs`<Select @options={{options}} @name={{name}} @onChange={{onChange}}/>`);
     await fillIn('[data-test-select="foo"]', 'bar');
 
     assert.ok(this.onChange.calledOnce);
diff --git a/ui/tests/integration/components/selectable-card-test.js b/ui/tests/integration/components/selectable-card-test.js
index 9dab74db98aba..eeb10deea47be 100644
--- a/ui/tests/integration/components/selectable-card-test.js
+++ b/ui/tests/integration/components/selectable-card-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
@@ -20,15 +15,15 @@ module('Integration | Component selectable-card', function (hooks) {
   });
 
   test('it shows the card total', async function (assert) {
-    await render(hbs`<SelectableCard @total={{this.total}} @cardTitle={{this.cardTitle}}/>`);
-    const titleNumber = this.element.querySelector('.title-number').innerText;
+    await render(hbs`<SelectableCard @total={{total}} @cardTitle={{cardTitle}}/>`);
+    let titleNumber = this.element.querySelector('.title-number').innerText;
 
-    assert.strictEqual(titleNumber, '15');
+    assert.equal(titleNumber, 15);
   });
 
   test('it returns card title, ', async function (assert) {
-    await render(hbs`<SelectableCard @total={{1}} @cardTitle={{this.cardTitle}}/>`);
-    const titleText = this.element.querySelector('.title').innerText;
-    assert.strictEqual(titleText, 'Connections');
+    await render(hbs`<SelectableCard @total={{1}} @cardTitle={{cardTitle}}/>`);
+    let titleText = this.element.querySelector('.title').innerText;
+    assert.equal(titleText, 'Connections');
   });
 });
diff --git a/ui/tests/integration/components/shamir-flow-test.js b/ui/tests/integration/components/shamir-flow-test.js
index 9a79bf1cd9d8f..18939d49db37d 100644
--- a/ui/tests/integration/components/shamir-flow-test.js
+++ b/ui/tests/integration/components/shamir-flow-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { run } from '@ember/runloop';
 import Service from '@ember/service';
 import { resolve } from 'rsvp';
@@ -11,13 +6,13 @@ import { setupRenderingTest } from 'ember-qunit';
 import { render, click } from '@ember/test-helpers';
 import hbs from 'htmlbars-inline-precompile';
 
-const response = {
+let response = {
   progress: 1,
   required: 3,
   complete: false,
 };
 
-const adapter = {
+let adapter = {
   foo() {
     return resolve(response);
   },
diff --git a/ui/tests/integration/components/shamir-modal-flow-test.js b/ui/tests/integration/components/shamir-modal-flow-test.js
index 6b4c773101402..a5f5d56e726bd 100644
--- a/ui/tests/integration/components/shamir-modal-flow-test.js
+++ b/ui/tests/integration/components/shamir-modal-flow-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test, skip } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
@@ -29,8 +24,8 @@ module('Integration | Component | shamir-modal-flow', function (hooks) {
         @fetchOnInit=true
         @generateAction=true
         @buttonText="My CTA"
-        @onClose={{this.onClose}}
-        @isActive={{this.isActive}}
+        @onClose={{onClose}}
+        @isActive={{isActive}}
       >
         <p>Inner content goes here</p>
       </ShamirModalFlow>
@@ -52,8 +47,8 @@ module('Integration | Component | shamir-modal-flow', function (hooks) {
         @fetchOnInit=true
         @generateAction=true
         @buttonText="Crazy CTA"
-        @onClose={{this.onClose}}
-        @isActive={{this.isActive}}
+        @onClose={{onClose}}
+        @isActive={{isActive}}
       >
         <p>Inner content goes here</p>
       </ShamirModalFlow>
@@ -72,8 +67,8 @@ module('Integration | Component | shamir-modal-flow', function (hooks) {
         @fetchOnInit=true
         @generateAction=true
         @buttonText="Crazy CTA"
-        @onClose={{this.onClose}}
-        @isActive={{this.isActive}}
+        @onClose={{onClose}}
+        @isActive={{isActive}}
       >
         <p>Inner content goes here</p>
       </ShamirModalFlow>
diff --git a/ui/tests/integration/components/sidebar/frame-test.js b/ui/tests/integration/components/sidebar/frame-test.js
deleted file mode 100644
index c4a09c414a440..0000000000000
--- a/ui/tests/integration/components/sidebar/frame-test.js
+++ /dev/null
@@ -1,68 +0,0 @@
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { render, click } from '@ember/test-helpers';
-import hbs from 'htmlbars-inline-precompile';
-import sinon from 'sinon';
-
-module('Integration | Component | sidebar-frame', function (hooks) {
-  setupRenderingTest(hooks);
-
-  test('it should hide and show sidebar', async function (assert) {
-    this.set('showSidebar', true);
-    await render(hbs`
-      <Sidebar::Frame @showSidebar={{this.showSidebar}} />
-    `);
-    assert.dom('[data-test-sidebar-nav]').exists('Sidebar renders');
-
-    this.set('showSidebar', false);
-    assert.dom('[data-test-sidebar-nav]').doesNotExist('Sidebar is hidden');
-  });
-
-  test('it should render link status, console ui panel and yield block for app content', async function (assert) {
-    const currentCluster = this.owner.lookup('service:currentCluster');
-    currentCluster.setCluster({ hcpLinkStatus: 'connected' });
-    const version = this.owner.lookup('service:version');
-    version.version = '1.13.0-dev1+ent';
-
-    await render(hbs`
-      <Sidebar::Frame @showSidebar={{true}}>
-        <div class="page-container">
-          App goes here!
-        </div>
-      </Sidebar::Frame>
-    `);
-
-    assert.dom('.link-status').exists('Link status component renders');
-    assert.dom('[data-test-component="console/ui-panel"]').exists('Console UI panel renders');
-    assert.dom('.page-container').exists('Block yields for app content');
-  });
-
-  test('it should render logo and actions in sidebar header', async function (assert) {
-    this.owner.lookup('service:currentCluster').setCluster({ name: 'vault' });
-
-    await render(hbs`
-      <Sidebar::Frame @showSidebar={{true}} />
-    `);
-
-    assert.dom('[data-test-sidebar-logo]').exists('Vault logo renders in sidebar header');
-    assert.dom('[data-test-console-toggle]').exists('Console toggle button renders in sidebar header');
-    await click('[data-test-console-toggle]');
-    assert.dom('.panel-open').exists('Console ui panel opens');
-    await click('[data-test-console-toggle]');
-    assert.dom('.panel-open').doesNotExist('Console ui panel closes');
-    assert.dom('[data-test-user-menu]').exists('User menu renders');
-  });
-
-  test('it should render namespace picker in sidebar footer', async function (assert) {
-    const version = this.owner.lookup('service:version');
-    version.features = ['Namespaces'];
-    const auth = this.owner.lookup('service:auth');
-    sinon.stub(auth, 'authData').value({});
-
-    await render(hbs`
-      <Sidebar::Frame @showSidebar={{true}} />
-    `);
-
-    assert.dom('.namespace-picker').exists('Namespace picker renders in sidebar footer');
-  });
-});
diff --git a/ui/tests/integration/components/sidebar/nav/access-test.js b/ui/tests/integration/components/sidebar/nav/access-test.js
deleted file mode 100644
index 650b6887c9058..0000000000000
--- a/ui/tests/integration/components/sidebar/nav/access-test.js
+++ /dev/null
@@ -1,66 +0,0 @@
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { render } from '@ember/test-helpers';
-import hbs from 'htmlbars-inline-precompile';
-import { stubFeaturesAndPermissions } from 'vault/tests/helpers/components/sidebar-nav';
-
-const renderComponent = () => {
-  return render(hbs`
-    <Sidebar::Frame @isVisible={{true}}>
-      <Sidebar::Nav::Access />
-    </Sidebar::Frame>
-  `);
-};
-
-module('Integration | Component | sidebar-nav-access', function (hooks) {
-  setupRenderingTest(hooks);
-
-  test('it should render nav headings', async function (assert) {
-    const headings = ['Authentication', 'Access Control', 'Organization', 'Administration'];
-
-    stubFeaturesAndPermissions(this.owner);
-    await renderComponent();
-
-    assert
-      .dom('[data-test-sidebar-nav-heading]')
-      .exists({ count: headings.length }, 'Correct number of headings render');
-    headings.forEach((heading) => {
-      assert
-        .dom(`[data-test-sidebar-nav-heading="${heading}"]`)
-        .hasText(heading, `${heading} heading renders`);
-    });
-  });
-
-  test('it should hide links and headings user does not have access too', async function (assert) {
-    await renderComponent();
-    assert
-      .dom('[data-test-sidebar-nav-link]')
-      .exists({ count: 1 }, 'Nav links are hidden other than back link');
-    assert
-      .dom('[data-test-sidebar-nav-heading]')
-      .doesNotExist('Headings are hidden when user does not have access to links');
-  });
-
-  test('it should render nav links', async function (assert) {
-    const links = [
-      'Back to main navigation',
-      'Authentication methods',
-      'Multi-factor authentication',
-      'OIDC provider',
-      'Control Groups',
-      'Namespaces',
-      'Groups',
-      'Entities',
-      'Leases',
-    ];
-    stubFeaturesAndPermissions(this.owner);
-    await renderComponent();
-
-    assert
-      .dom('[data-test-sidebar-nav-link]')
-      .exists({ count: links.length }, 'Correct number of links render');
-    links.forEach((link) => {
-      assert.dom(`[data-test-sidebar-nav-link="${link}"]`).hasText(link, `${link} link renders`);
-    });
-  });
-});
diff --git a/ui/tests/integration/components/sidebar/nav/cluster-test.js b/ui/tests/integration/components/sidebar/nav/cluster-test.js
deleted file mode 100644
index 740b395b24e54..0000000000000
--- a/ui/tests/integration/components/sidebar/nav/cluster-test.js
+++ /dev/null
@@ -1,67 +0,0 @@
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { render } from '@ember/test-helpers';
-import hbs from 'htmlbars-inline-precompile';
-import { stubFeaturesAndPermissions } from 'vault/tests/helpers/components/sidebar-nav';
-
-const renderComponent = () => {
-  return render(hbs`
-    <Sidebar::Frame @isVisible={{true}}>
-      <Sidebar::Nav::Cluster />
-    </Sidebar::Frame>
-  `);
-};
-
-module('Integration | Component | sidebar-nav-cluster', function (hooks) {
-  setupRenderingTest(hooks);
-
-  test('it should render nav headings', async function (assert) {
-    const headings = ['Vault', 'Replication', 'Monitoring'];
-    stubFeaturesAndPermissions(this.owner, true, true);
-    await renderComponent();
-
-    assert
-      .dom('[data-test-sidebar-nav-heading]')
-      .exists({ count: headings.length }, 'Correct number of headings render');
-    headings.forEach((heading) => {
-      assert
-        .dom(`[data-test-sidebar-nav-heading="${heading}"]`)
-        .hasText(heading, `${heading} heading renders`);
-    });
-  });
-
-  test('it should hide links and headings user does not have access too', async function (assert) {
-    await renderComponent();
-    assert
-      .dom('[data-test-sidebar-nav-link]')
-      .exists({ count: 1 }, 'Nav links are hidden other than secrets');
-    assert
-      .dom('[data-test-sidebar-nav-heading]')
-      .exists({ count: 1 }, 'Headings are hidden other than Vault');
-  });
-
-  test('it should render nav links', async function (assert) {
-    const links = [
-      'Secrets engines',
-      'Access',
-      'Policies',
-      'Tools',
-      'Disaster Recovery',
-      'Performance',
-      'Replication',
-      'Raft Storage',
-      'Client count',
-      'License',
-      'Seal Vault',
-    ];
-    stubFeaturesAndPermissions(this.owner, true, true);
-    await renderComponent();
-
-    assert
-      .dom('[data-test-sidebar-nav-link]')
-      .exists({ count: links.length }, 'Correct number of links render');
-    links.forEach((link) => {
-      assert.dom(`[data-test-sidebar-nav-link="${link}"]`).hasText(link, `${link} link renders`);
-    });
-  });
-});
diff --git a/ui/tests/integration/components/sidebar/nav/policies-test.js b/ui/tests/integration/components/sidebar/nav/policies-test.js
deleted file mode 100644
index b97a55bcc9536..0000000000000
--- a/ui/tests/integration/components/sidebar/nav/policies-test.js
+++ /dev/null
@@ -1,45 +0,0 @@
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { render } from '@ember/test-helpers';
-import hbs from 'htmlbars-inline-precompile';
-import { stubFeaturesAndPermissions } from 'vault/tests/helpers/components/sidebar-nav';
-
-const renderComponent = () => {
-  return render(hbs`
-    <Sidebar::Frame @isVisible={{true}}>
-      <Sidebar::Nav::Policies />
-    </Sidebar::Frame>
-  `);
-};
-
-module('Integration | Component | sidebar-nav-policies', function (hooks) {
-  setupRenderingTest(hooks);
-
-  test('it should hide links user does not have access too', async function (assert) {
-    await renderComponent();
-    assert
-      .dom('[data-test-sidebar-nav-link]')
-      .exists({ count: 1 }, 'Nav links are hidden other than back link');
-  });
-
-  test('it should render nav headings and links', async function (assert) {
-    const links = [
-      'Back to main navigation',
-      'ACL Policies',
-      'Role-Governing Policies',
-      'Endpoint Governing Policies',
-    ];
-    stubFeaturesAndPermissions(this.owner);
-    await renderComponent();
-
-    assert.dom('[data-test-sidebar-nav-heading]').exists({ count: 1 }, 'Correct number of headings render');
-    assert.dom('[data-test-sidebar-nav-heading="Policies"]').hasText('Policies', 'Policies heading renders');
-
-    assert
-      .dom('[data-test-sidebar-nav-link]')
-      .exists({ count: links.length }, 'Correct number of links render');
-    links.forEach((link) => {
-      assert.dom(`[data-test-sidebar-nav-link="${link}"]`).hasText(link, `${link} link renders`);
-    });
-  });
-});
diff --git a/ui/tests/integration/components/sidebar/nav/tools-test.js b/ui/tests/integration/components/sidebar/nav/tools-test.js
deleted file mode 100644
index 46db83eb48850..0000000000000
--- a/ui/tests/integration/components/sidebar/nav/tools-test.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { render } from '@ember/test-helpers';
-import hbs from 'htmlbars-inline-precompile';
-import { stubFeaturesAndPermissions } from 'vault/tests/helpers/components/sidebar-nav';
-import { toolsActions } from 'vault/helpers/tools-actions';
-import { capitalize } from '@ember/string';
-
-const renderComponent = () => {
-  return render(hbs`
-    <Sidebar::Frame @isVisible={{true}}>
-      <div id="modal-wormhole"></div>
-      <Sidebar::Nav::Tools />
-    </Sidebar::Frame>
-  `);
-};
-
-module('Integration | Component | sidebar-nav-tools', function (hooks) {
-  setupRenderingTest(hooks);
-
-  test('it should hide links user does not have access too', async function (assert) {
-    await renderComponent();
-    assert
-      .dom('[data-test-sidebar-nav-link]')
-      .exists({ count: 1 }, 'Nav links are hidden other than back link');
-  });
-
-  test('it should render nav headings and links', async function (assert) {
-    const links = ['Back to main navigation', ...toolsActions()];
-    stubFeaturesAndPermissions(this.owner);
-    await renderComponent();
-
-    assert.dom('[data-test-sidebar-nav-heading]').exists({ count: 1 }, 'Correct number of headings render');
-    assert.dom('[data-test-sidebar-nav-heading="Tools"]').hasText('Tools', 'Tools heading renders');
-
-    assert
-      .dom('[data-test-sidebar-nav-link]')
-      .exists({ count: links.length }, 'Correct number of links render');
-    links.forEach((link) => {
-      const name = capitalize(link);
-      assert.dom(`[data-test-sidebar-nav-link="${name}"]`).hasText(name, `${name} link renders`);
-    });
-  });
-});
diff --git a/ui/tests/integration/components/sidebar/user-menu-test.js b/ui/tests/integration/components/sidebar/user-menu-test.js
deleted file mode 100644
index 52a16916625b1..0000000000000
--- a/ui/tests/integration/components/sidebar/user-menu-test.js
+++ /dev/null
@@ -1,64 +0,0 @@
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { render, click } from '@ember/test-helpers';
-import hbs from 'htmlbars-inline-precompile';
-import sinon from 'sinon';
-
-module('Integration | Component | sidebar-user-menu', function (hooks) {
-  setupRenderingTest(hooks);
-
-  hooks.beforeEach(function () {
-    this.auth = this.owner.lookup('service:auth');
-  });
-
-  test('it should render trigger and open menu', async function (assert) {
-    await render(hbs`<Sidebar::UserMenu />`);
-
-    assert
-      .dom('[data-test-user-menu-trigger] [data-test-icon="user"]')
-      .exists('Correct icon renders for menu trigger');
-    await click('[data-test-user-menu-trigger]');
-    assert.dom('[data-test-user-menu-content]').exists('User menu content renders');
-  });
-
-  test('it should render default menu items', async function (assert) {
-    sinon.stub(this.auth, 'currentToken').value('root');
-    sinon.stub(this.auth, 'authData').value({ displayName: 'token' });
-
-    await render(hbs`<Sidebar::UserMenu />`);
-    await click('[data-test-user-menu-trigger]');
-
-    assert.dom('.menu-label').hasText('Token', 'Auth data display name renders');
-    assert.dom('li').exists({ count: 2 }, 'Correct number of menu items render');
-    assert.dom('[data-clipboard-text="root"]').exists('Copy token action renders');
-    assert.dom('#logout').hasText('Log out', 'Log out action renders');
-  });
-
-  test('it should render conditional menu items', async function (assert) {
-    const router = this.owner.lookup('service:router');
-    const transitionStub = sinon.stub(router, 'transitionTo');
-    const renewStub = sinon.stub(this.auth, 'renew').resolves();
-    const revokeStub = sinon.stub(this.auth, 'revokeCurrentToken').resolves();
-    const date = new Date();
-    sinon.stub(this.auth, 'tokenExpirationDate').value(date.setDate(date.getDate() + 1));
-    sinon.stub(this.auth, 'authData').value({ displayName: 'token', renewable: true, entity_id: 'foo' });
-    this.auth.set('allowExpiration', true);
-
-    await render(hbs`<Sidebar::UserMenu />`);
-    await click('[data-test-user-menu-trigger]');
-
-    assert.dom('[data-test-user-menu-item="token alert"]').exists('Token expiration alert renders');
-    assert.dom('[data-test-user-menu-item="mfa"]').hasText('Multi-factor authentication', 'MFA link renders');
-
-    await click('[data-test-user-menu-item="revoke token"]');
-    await click('[data-test-confirm-button]');
-    assert.true(revokeStub.calledOnce, 'Auth revoke token method called on revoke confirm');
-    assert.true(
-      transitionStub.calledWith('vault.cluster.logout'),
-      'Route transitions to log out on revoke success'
-    );
-
-    await click('[data-test-user-menu-item="renew token"]');
-    assert.true(renewStub.calledOnce, 'Auth renew token method called');
-  });
-});
diff --git a/ui/tests/integration/components/stat-text-test.js b/ui/tests/integration/components/stat-text-test.js
index b6194c0d1f841..6462f7dff933b 100644
--- a/ui/tests/integration/components/stat-text-test.js
+++ b/ui/tests/integration/components/stat-text-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render, settled } from '@ember/test-helpers';
@@ -33,7 +28,7 @@ module('Integration | Component | StatText', function (hooks) {
     this.set('value', 604099);
     await settled();
 
-    const formattedNumber = '604,099';
+    let formattedNumber = '604,099';
     assert.dom('.stat-value').hasText(formattedNumber, 'renders correctly formatted integer value');
   });
 });
diff --git a/ui/tests/integration/components/string-list-test.js b/ui/tests/integration/components/string-list-test.js
index b6d84372575e3..827075f01fc39 100644
--- a/ui/tests/integration/components/string-list-test.js
+++ b/ui/tests/integration/components/string-list-test.js
@@ -1,11 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
-import { render, click, fillIn, triggerKeyEvent } from '@ember/test-helpers';
+import { render, click, fillIn, triggerKeyEvent, triggerEvent } from '@ember/test-helpers';
 import sinon from 'sinon';
 import hbs from 'htmlbars-inline-precompile';
 
@@ -64,21 +59,21 @@ module('Integration | Component | string list', function (hooks) {
   test('it renders inputValue from a blank array', async function (assert) {
     assert.expect(2);
     this.set('inputValue', []);
-    await render(hbs`<StringList @inputValue={{this.inputValue}} />`);
+    await render(hbs`<StringList @inputValue={{inputValue}} />`);
     assertBlank(assert);
   });
 
   test('it renders inputValue array with a single item', async function (assert) {
     assert.expect(3);
     this.set('inputValue', ['foo']);
-    await render(hbs`<StringList @inputValue={{this.inputValue}} />`);
+    await render(hbs`<StringList @inputValue={{inputValue}} />`);
     assertFoo(assert);
   });
 
   test('it renders inputValue array with a multiple items', async function (assert) {
     assert.expect(4);
     this.set('inputValue', ['foo', 'bar']);
-    await render(hbs`<StringList @inputValue={{this.inputValue}} />`);
+    await render(hbs`<StringList @inputValue={{inputValue}} />`);
     assertFooBar(assert);
   });
 
@@ -106,7 +101,7 @@ module('Integration | Component | string list', function (hooks) {
     this.set('onChange', function (val) {
       assert.deepEqual(val, ['foo', 'bar'], 'calls onChange with expected value');
     });
-    await render(hbs`<StringList @inputValue={{this.inputValue}} @onChange={{this.onChange}} />`);
+    await render(hbs`<StringList @inputValue={{inputValue}} @onChange={{onChange}} />`);
     await fillIn('[data-test-string-list-input="1"]', 'bar');
     await triggerKeyEvent('[data-test-string-list-input="1"]', 'keyup', 14);
   });
@@ -115,11 +110,9 @@ module('Integration | Component | string list', function (hooks) {
     assert.expect(2);
     this.set('inputValue', 'foo');
     this.set('onChange', function (val) {
-      assert.strictEqual(val, 'foo,bar', 'calls onChange with expected value');
+      assert.equal(val, 'foo,bar', 'calls onChange with expected value');
     });
-    await render(
-      hbs`<StringList @type="string" @inputValue={{this.inputValue}} @onChange={{this.onChange}}/>`
-    );
+    await render(hbs`<StringList @inputValue={{inputValue}} @onChange={{onChange}}/>`);
     await fillIn('[data-test-string-list-input="1"]', 'bar');
     await triggerKeyEvent('[data-test-string-list-input="1"]', 'keyup', 14);
   });
@@ -128,13 +121,25 @@ module('Integration | Component | string list', function (hooks) {
     assert.expect(4);
     this.set('inputValue', ['foo', 'bar']);
     this.set('onChange', function (val) {
-      assert.deepEqual(val, ['bar'], 'calls onChange with expected value');
+      assert.equal(val, 'bar', 'calls onChange with expected value');
     });
-    await render(hbs`<StringList @inputValue={{this.inputValue}} @onChange={{this.onChange}} />`);
+    await render(hbs`<StringList @inputValue={{inputValue}} @onChange={{onChange}} />`);
 
     await click('[data-test-string-list-row="0"] [data-test-string-list-button="delete"]');
     assert.dom('[data-test-string-list-input]').exists({ count: 2 }, 'renders 2 inputs');
     assert.dom('[data-test-string-list-input="0"]').hasValue('bar');
     assert.dom('[data-test-string-list-input="1"]').hasValue('');
   });
+
+  test('it replaces helpText if name is tokenBoundCidrs', async function (assert) {
+    assert.expect(1);
+    await render(hbs`<StringList @label={{'blah'}} @helpText={{'blah'}} @attrName={{'tokenBoundCidrs'}} />`);
+    let tooltipTrigger = document.querySelector('[data-test-tool-tip-trigger]');
+    await triggerEvent(tooltipTrigger, 'mouseenter');
+    assert
+      .dom('[data-test-info-tooltip-content]')
+      .hasText(
+        'Specifies the blocks of IP addresses which are allowed to use the generated token. One entry per row.'
+      );
+  });
 });
diff --git a/ui/tests/integration/components/text-file-test.js b/ui/tests/integration/components/text-file-test.js
deleted file mode 100644
index a5250cd86a12e..0000000000000
--- a/ui/tests/integration/components/text-file-test.js
+++ /dev/null
@@ -1,101 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'vault/tests/helpers';
-import { click, fillIn, render, triggerEvent } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-import sinon from 'sinon';
-import { componentPemBundle } from 'vault/tests/helpers/pki/values';
-
-const SELECTORS = {
-  label: '[data-test-text-file-label]',
-  toggle: '[data-test-text-toggle]',
-  textarea: '[data-test-text-file-textarea]',
-  fileUpload: '[data-test-text-file-input]',
-};
-module('Integration | Component | text-file', function (hooks) {
-  setupRenderingTest(hooks);
-
-  hooks.beforeEach(function () {
-    this.label = 'Some label';
-    this.onChange = sinon.spy();
-    this.owner.lookup('service:flash-messages').registerTypes(['danger']);
-  });
-
-  test('it renders with label and toggle by default', async function (assert) {
-    await render(hbs`<TextFile @onChange={{this.onChange}} />`);
-
-    assert.dom(SELECTORS.label).hasText('File', 'renders default label');
-    assert.dom(SELECTORS.toggle).exists({ count: 1 }, 'toggle exists');
-    assert.dom(SELECTORS.fileUpload).exists({ count: 1 }, 'File input shown');
-  });
-
-  test('it renders without toggle and option for text input when uploadOnly=true', async function (assert) {
-    await render(hbs`<TextFile @onChange={{this.onChange}} @uploadOnly={{true}} />`);
-
-    assert.dom(SELECTORS.label).doesNotExist('Label no longer rendered');
-    assert.dom(SELECTORS.toggle).doesNotExist('toggle no longer rendered');
-    assert.dom(SELECTORS.fileUpload).exists({ count: 1 }, 'File input shown');
-  });
-
-  test('it toggles between upload and textarea', async function (assert) {
-    await render(hbs`<TextFile @onChange={{this.onChange}} />`);
-
-    assert.dom(SELECTORS.fileUpload).exists({ count: 1 }, 'File input shown');
-    assert.dom(SELECTORS.textarea).doesNotExist('Texarea hidden');
-    await click(SELECTORS.toggle);
-    assert.dom(SELECTORS.textarea).exists({ count: 1 }, 'Textarea shown');
-    assert.dom(SELECTORS.fileUpload).doesNotExist('File upload hidden');
-  });
-
-  test('it correctly parses uploaded files', async function (assert) {
-    this.file = new File(['some content for a file'], 'filename.txt');
-    await render(hbs`<TextFile @onChange={{this.onChange}} />`);
-    await triggerEvent(SELECTORS.fileUpload, 'change', { files: [this.file] });
-    assert.propEqual(
-      this.onChange.lastCall.args[0],
-      {
-        filename: 'filename.txt',
-        value: 'some content for a file',
-      },
-      'parent callback function is called with correct arguments'
-    );
-  });
-
-  test('it correctly submits text input', async function (assert) {
-    const PEM_BUNDLE = componentPemBundle;
-
-    await render(hbs`<TextFile @onChange={{this.onChange}} />`);
-    await click(SELECTORS.toggle);
-    await fillIn(SELECTORS.textarea, PEM_BUNDLE);
-    assert.propEqual(
-      this.onChange.lastCall.args[0],
-      {
-        filename: '',
-        value: PEM_BUNDLE,
-      },
-      'parent callback function is called with correct text area input'
-    );
-  });
-
-  test('it throws an error when it cannot read the file', async function (assert) {
-    this.file = { foo: 'bar' };
-    await render(hbs`<TextFile @onChange={{this.onChange}} />`);
-
-    await triggerEvent(SELECTORS.fileUpload, 'change', { files: [this.file] });
-    assert
-      .dom('[data-test-field-validation="text-file"]')
-      .hasText('There was a problem uploading. Please try again.');
-    assert.propEqual(
-      this.onChange.lastCall.args[0],
-      {
-        filename: '',
-        value: '',
-      },
-      'parent callback function is called with cleared out values'
-    );
-  });
-});
diff --git a/ui/tests/integration/components/toggle-button-test.js b/ui/tests/integration/components/toggle-button-test.js
index 51a78d137b276..35ce585190bcd 100644
--- a/ui/tests/integration/components/toggle-button-test.js
+++ b/ui/tests/integration/components/toggle-button-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render, click } from '@ember/test-helpers';
diff --git a/ui/tests/integration/components/toggle-test.js b/ui/tests/integration/components/toggle-test.js
index 3bb9759048401..32f6d25b45703 100644
--- a/ui/tests/integration/components/toggle-test.js
+++ b/ui/tests/integration/components/toggle-test.js
@@ -1,15 +1,10 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render, findAll } from '@ember/test-helpers';
 import sinon from 'sinon';
 import hbs from 'htmlbars-inline-precompile';
 
-const handler = (data, e) => {
+let handler = (data, e) => {
   if (e && e.preventDefault) e.preventDefault();
   return;
 };
@@ -21,7 +16,7 @@ module('Integration | Component | toggle', function (hooks) {
     this.set('handler', sinon.spy(handler));
 
     await render(hbs`<Toggle
-      @onChange={{this.handler}}
+      @onChange={{handler}}
       @name="thing"
     />`);
 
@@ -29,7 +24,7 @@ module('Integration | Component | toggle', function (hooks) {
 
     await render(hbs`
       <Toggle
-        @onChange={{this.handler}}
+        @onChange={{handler}}
         @name="thing"
       >
         <span id="test-value" class="has-text-grey">template block text</span>
@@ -43,7 +38,7 @@ module('Integration | Component | toggle', function (hooks) {
     this.set('handler', sinon.spy(handler));
     await render(hbs`
       <Toggle
-        @onChange={{this.handler}}
+        @onChange={{handler}}
         @name="thing"
         @size="small"
       >
@@ -57,7 +52,7 @@ module('Integration | Component | toggle', function (hooks) {
     this.set('handler', sinon.spy(handler));
     await render(hbs`
     <Toggle
-      @onChange={{this.handler}}
+      @onChange={{handler}}
       @name="my toggle #_has we!rd chars"
     >
       Label
diff --git a/ui/tests/integration/components/token-expire-warning-test.js b/ui/tests/integration/components/token-expire-warning-test.js
index 76fa9ffbb356f..b8416b24c014c 100644
--- a/ui/tests/integration/components/token-expire-warning-test.js
+++ b/ui/tests/integration/components/token-expire-warning-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { find, render, waitUntil } from '@ember/test-helpers';
diff --git a/ui/tests/integration/components/tool-tip-test.js b/ui/tests/integration/components/tool-tip-test.js
index 66ec0d99e521c..c8d827098d8af 100644
--- a/ui/tests/integration/components/tool-tip-test.js
+++ b/ui/tests/integration/components/tool-tip-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render, triggerEvent } from '@ember/test-helpers';
diff --git a/ui/tests/integration/components/toolbar-actions-test.js b/ui/tests/integration/components/toolbar-actions-test.js
index 531f7db6384b9..b4fecd333b637 100644
--- a/ui/tests/integration/components/toolbar-actions-test.js
+++ b/ui/tests/integration/components/toolbar-actions-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/tests/integration/components/toolbar-download-button-test.js b/ui/tests/integration/components/toolbar-download-button-test.js
new file mode 100644
index 0000000000000..4a82fcadca6d0
--- /dev/null
+++ b/ui/tests/integration/components/toolbar-download-button-test.js
@@ -0,0 +1,17 @@
+import { module, test } from 'qunit';
+import { setupRenderingTest } from 'ember-qunit';
+import { render } from '@ember/test-helpers';
+import { isPresent } from 'ember-cli-page-object';
+import hbs from 'htmlbars-inline-precompile';
+
+module('Integration | Component | toolbar-download-button', function (hooks) {
+  setupRenderingTest(hooks);
+
+  test('it renders', async function (assert) {
+    await render(hbs`<ToolbarDownloadButton @actionText="Link" />`);
+
+    assert.dom(this.element).hasText('Link');
+    assert.ok(isPresent('.toolbar-link'));
+    assert.ok(isPresent('.icon'));
+  });
+});
diff --git a/ui/tests/integration/components/toolbar-filters-test.js b/ui/tests/integration/components/toolbar-filters-test.js
index 81d33b4ba3da6..0507ff9e50f25 100644
--- a/ui/tests/integration/components/toolbar-filters-test.js
+++ b/ui/tests/integration/components/toolbar-filters-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/tests/integration/components/toolbar-link-test.js b/ui/tests/integration/components/toolbar-link-test.js
index cbf879ce70a1e..96b9d0005215a 100644
--- a/ui/tests/integration/components/toolbar-link-test.js
+++ b/ui/tests/integration/components/toolbar-link-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render, triggerEvent } from '@ember/test-helpers';
@@ -13,7 +8,7 @@ module('Integration | Component | toolbar-link', function (hooks) {
   setupRenderingTest(hooks);
 
   test('it renders', async function (assert) {
-    await render(hbs`<ToolbarLink @route="/secrets">Link</ToolbarLink>`);
+    await render(hbs`<ToolbarLink @params={{array '/secrets'}}>Link</ToolbarLink>`);
 
     assert.dom(this.element).hasText('Link');
     assert.ok(isPresent('.toolbar-link'));
@@ -25,7 +20,7 @@ module('Integration | Component | toolbar-link', function (hooks) {
 
     await render(hbs`
       <ToolbarLink
-        @route="/secrets"
+        @params={{array '/secrets'}}
         @type={{this.type}}
       >
         Test Link
@@ -42,7 +37,7 @@ module('Integration | Component | toolbar-link', function (hooks) {
 
     await render(hbs`
       <ToolbarLink
-        @route="/secrets"
+        @params={{array '/secrets'}}
         @disabled={{true}}
         @disabledTooltip={{this.tooltip}}
       >
diff --git a/ui/tests/integration/components/toolbar-test.js b/ui/tests/integration/components/toolbar-test.js
index 3496e88e6abef..5527f1b27d7c4 100644
--- a/ui/tests/integration/components/toolbar-test.js
+++ b/ui/tests/integration/components/toolbar-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/tests/integration/components/transform-advanced-templating-test.js b/ui/tests/integration/components/transform-advanced-templating-test.js
index 2483e4474f7a2..1435c75079da6 100644
--- a/ui/tests/integration/components/transform-advanced-templating-test.js
+++ b/ui/tests/integration/components/transform-advanced-templating-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { click, fillIn, render, triggerEvent } from '@ember/test-helpers';
diff --git a/ui/tests/integration/components/transform-edit-base-test.js b/ui/tests/integration/components/transform-edit-base-test.js
index 3f8f8d4c6a0cc..55b3f63b4ea15 100644
--- a/ui/tests/integration/components/transform-edit-base-test.js
+++ b/ui/tests/integration/components/transform-edit-base-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/tests/integration/components/transform-list-item-test.js b/ui/tests/integration/components/transform-list-item-test.js
index 2be22dfde886c..70ab8cc9e136c 100644
--- a/ui/tests/integration/components/transform-list-item-test.js
+++ b/ui/tests/integration/components/transform-list-item-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import EmberObject from '@ember/object';
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
@@ -13,7 +8,7 @@ module('Integration | Component | transform-list-item', function (hooks) {
   setupRenderingTest(hooks);
 
   test('it renders un-clickable item if no read capability', async function (assert) {
-    const item = EmberObject.create({
+    let item = EmberObject.create({
       id: 'foo',
       updatePath: {
         canRead: false,
@@ -25,9 +20,9 @@ module('Integration | Component | transform-list-item', function (hooks) {
     this.set('itemType', 'role');
     this.set('item', item);
     await render(hbs`<SecretList::TransformListItem
-      @item={{this.item}}
-      @itemPath={{this.itemPath}}
-      @itemType={{this.itemType}}
+      @item={{item}}
+      @itemPath={{itemPath}}
+      @itemType={{itemType}}
     />`);
 
     assert.dom('[data-test-view-only-list-item]').exists('shows view only list item');
@@ -35,7 +30,7 @@ module('Integration | Component | transform-list-item', function (hooks) {
   });
 
   test('it is clickable with details menu item if read capability', async function (assert) {
-    const item = EmberObject.create({
+    let item = EmberObject.create({
       id: 'foo',
       updatePath: {
         canRead: true,
@@ -47,9 +42,9 @@ module('Integration | Component | transform-list-item', function (hooks) {
     this.set('itemType', 'template');
     this.set('item', item);
     await render(hbs`<SecretList::TransformListItem
-      @item={{this.item}}
-      @itemPath={{this.itemPath}}
-      @itemType={{this.itemType}}
+      @item={{item}}
+      @itemPath={{itemPath}}
+      @itemType={{itemType}}
     />`);
 
     assert.dom('[data-test-secret-link="template/foo"]').exists('shows clickable list item');
@@ -58,7 +53,7 @@ module('Integration | Component | transform-list-item', function (hooks) {
   });
 
   test('it has details and edit menu item if read & edit capabilities', async function (assert) {
-    const item = EmberObject.create({
+    let item = EmberObject.create({
       id: 'foo',
       updatePath: {
         canRead: true,
@@ -70,9 +65,9 @@ module('Integration | Component | transform-list-item', function (hooks) {
     this.set('itemType', 'alphabet');
     this.set('item', item);
     await render(hbs`<SecretList::TransformListItem
-      @item={{this.item}}
-      @itemPath={{this.itemPath}}
-      @itemType={{this.itemType}}
+      @item={{item}}
+      @itemPath={{itemPath}}
+      @itemType={{itemType}}
     />`);
 
     assert.dom('[data-test-secret-link="alphabet/foo"]').exists('shows clickable list item');
@@ -81,7 +76,7 @@ module('Integration | Component | transform-list-item', function (hooks) {
   });
 
   test('it is not clickable if built-in template with all capabilities', async function (assert) {
-    const item = EmberObject.create({
+    let item = EmberObject.create({
       id: 'builtin/foo',
       updatePath: {
         canRead: true,
@@ -93,9 +88,9 @@ module('Integration | Component | transform-list-item', function (hooks) {
     this.set('itemType', 'template');
     this.set('item', item);
     await render(hbs`<SecretList::TransformListItem
-      @item={{this.item}}
-      @itemPath={{this.itemPath}}
-      @itemType={{this.itemType}}
+      @item={{item}}
+      @itemPath={{itemPath}}
+      @itemType={{itemType}}
     />`);
 
     assert.dom('[data-test-view-only-list-item]').exists('shows view only list item');
@@ -103,7 +98,7 @@ module('Integration | Component | transform-list-item', function (hooks) {
   });
 
   test('it is not clickable if built-in alphabet', async function (assert) {
-    const item = EmberObject.create({
+    let item = EmberObject.create({
       id: 'builtin/foo',
       updatePath: {
         canRead: true,
@@ -115,9 +110,9 @@ module('Integration | Component | transform-list-item', function (hooks) {
     this.set('itemType', 'alphabet');
     this.set('item', item);
     await render(hbs`<SecretList::TransformListItem
-      @item={{this.item}}
-      @itemPath={{this.itemPath}}
-      @itemType={{this.itemType}}
+      @item={{item}}
+      @itemPath={{itemPath}}
+      @itemType={{itemType}}
     />`);
 
     assert.dom('[data-test-view-only-list-item]').exists('shows view only list item');
diff --git a/ui/tests/integration/components/transform-role-edit-test.js b/ui/tests/integration/components/transform-role-edit-test.js
index 875817302bb41..ba2a2ebb95b76 100644
--- a/ui/tests/integration/components/transform-role-edit-test.js
+++ b/ui/tests/integration/components/transform-role-edit-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, skip } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/tests/integration/components/transit-edit-test.js b/ui/tests/integration/components/transit-edit-test.js
deleted file mode 100644
index 7f54c53eab934..0000000000000
--- a/ui/tests/integration/components/transit-edit-test.js
+++ /dev/null
@@ -1,105 +0,0 @@
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'vault/tests/helpers';
-import { click, fillIn, render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-
-const SELECTORS = {
-  createForm: '[data-test-transit-create-form]',
-  editForm: '[data-test-transit-edit-form]',
-  ttlToggle: '[data-test-ttl-toggle="Auto-rotation period"]',
-  ttlValue: '[data-test-ttl-value="Auto-rotation period"]',
-};
-module('Integration | Component | transit-edit', function (hooks) {
-  setupRenderingTest(hooks);
-
-  hooks.beforeEach(function () {
-    this.store = this.owner.lookup('service:store');
-    this.model = this.store.createRecord('transit-key');
-    this.backendCrumb = {
-      label: 'transit',
-      text: 'transit',
-      path: 'vault.cluster.secrets.backend.list-root',
-      model: 'transit',
-    };
-  });
-
-  test('it renders in create mode and updates model', async function (assert) {
-    await render(hbs`
-    <TransitEdit 
-      @key={{this.model}}
-      @model={{this.model}}
-      @mode="create"
-      @root={{this.backendCrumb}}
-      @preferAdvancedEdit={{false}}
-    />`);
-
-    assert.dom(SELECTORS.createForm).exists();
-    assert.dom(SELECTORS.ttlToggle).isNotChecked();
-
-    // confirm model params update when ttl changes
-    assert.strictEqual(this.model.autoRotatePeriod, '0');
-    await click(SELECTORS.ttlToggle);
-
-    assert.dom(SELECTORS.ttlValue).hasValue('30'); // 30 days
-    assert.strictEqual(this.model.autoRotatePeriod, '720h');
-
-    await fillIn(SELECTORS.ttlValue, '10'); // 10 days
-    assert.strictEqual(this.model.autoRotatePeriod, '240h');
-  });
-
-  test('it renders edit form correctly when key has autoRotatePeriod=0', async function (assert) {
-    this.model.autoRotatePeriod = 0;
-    this.model.keys = {
-      1: 1684882652000,
-    };
-    await render(hbs`
-      <TransitEdit 
-        @key={{this.model}}
-        @model={{this.model}}
-        @mode="edit"
-        @root={{this.backendCrumb}}
-        @preferAdvancedEdit={{false}}
-      />`);
-
-    assert.dom(SELECTORS.editForm).exists();
-    assert.dom(SELECTORS.ttlToggle).isNotChecked();
-
-    assert.strictEqual(this.model.autoRotatePeriod, 0);
-
-    await click(SELECTORS.ttlToggle);
-    assert.dom(SELECTORS.ttlToggle).isChecked();
-    assert.dom(SELECTORS.ttlValue).hasValue('30');
-    assert.strictEqual(this.model.autoRotatePeriod, '720h', 'model value changes with toggle');
-
-    await click(SELECTORS.ttlToggle);
-    assert.strictEqual(this.model.autoRotatePeriod, 0); // reverts to original value when toggled back on
-  });
-
-  test('it renders edit form correctly when key has non-zero rotation period', async function (assert) {
-    this.model.autoRotatePeriod = '5h';
-    this.model.keys = {
-      1: 1684882652000,
-    };
-    await render(hbs`
-      <TransitEdit 
-        @key={{this.model}}
-        @model={{this.model}}
-        @mode="edit"
-        @root={{this.backendCrumb}}
-        @preferAdvancedEdit={{false}}
-      />`);
-
-    assert.dom(SELECTORS.editForm).exists();
-    assert.dom(SELECTORS.ttlToggle).isChecked();
-
-    await click(SELECTORS.ttlToggle);
-    assert.dom(SELECTORS.ttlToggle).isNotChecked();
-    assert.strictEqual(this.model.autoRotatePeriod, 0, 'model value changes back to 0 when toggled off');
-
-    await click(SELECTORS.ttlToggle);
-    assert.strictEqual(this.model.autoRotatePeriod, '5h'); // reverts to original value when toggled back on
-
-    await fillIn(SELECTORS.ttlValue, '10');
-    assert.strictEqual(this.model.autoRotatePeriod, '10h');
-  });
-});
diff --git a/ui/tests/integration/components/transit-key-actions-test.js b/ui/tests/integration/components/transit-key-actions-test.js
index 855d19559c568..99a7389249d62 100644
--- a/ui/tests/integration/components/transit-key-actions-test.js
+++ b/ui/tests/integration/components/transit-key-actions-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { run } from '@ember/runloop';
 import { resolve } from 'rsvp';
 import { assign } from '@ember/polyfills';
@@ -49,26 +44,26 @@ module('Integration | Component | transit key actions', function (hooks) {
   });
 
   test('it requires `key`', async function (assert) {
-    const promise = waitForError();
+    let promise = waitForError();
     render(hbs`
       {{transit-key-actions}}
       <div id="modal-wormhole"></div>
     `);
-    const err = await promise;
+    let err = await promise;
     assert.ok(err.message.includes('`key` is required for'), 'asserts without key');
   });
 
   test('it renders', async function (assert) {
     this.set('key', { backend: 'transit', supportedActions: ['encrypt'] });
     await render(hbs`
-      {{transit-key-actions selectedAction="encrypt" key=this.key}}
+      {{transit-key-actions selectedAction="encrypt" key=key}}
       <div id="modal-wormhole"></div>
     `);
     assert.dom('[data-test-transit-action="encrypt"]').exists({ count: 1 }, 'renders encrypt');
 
     this.set('key', { backend: 'transit', supportedActions: ['sign'] });
     await render(hbs`
-      {{transit-key-actions selectedAction="sign" key=this.key}}
+      {{transit-key-actions selectedAction="sign" key=key}}
       <div id="modal-wormhole"></div>`);
     assert.dom('[data-test-transit-action="sign"]').exists({ count: 1 }, 'renders sign');
   });
@@ -77,7 +72,7 @@ module('Integration | Component | transit key actions', function (hooks) {
     this.set('key', { backend: 'transit', supportsSigning: true, supportedActions: ['sign', 'verify'] });
     this.set('selectedAction', 'sign');
     await render(hbs`
-      {{transit-key-actions selectedAction=this.selectedAction key=this.key}}
+      {{transit-key-actions selectedAction=selectedAction key=key}}
       <div id="modal-wormhole"></div>
     `);
     assert
@@ -107,7 +102,7 @@ module('Integration | Component | transit key actions', function (hooks) {
   test('it renders: rotate', async function (assert) {
     this.set('key', { backend: 'transit', id: 'akey', supportedActions: ['rotate'] });
     await render(hbs`
-      {{transit-key-actions selectedAction="rotate" key=this.key}}
+      {{transit-key-actions selectedAction="rotate" key=key}}
       <div id="modal-wormhole"></div>
     `);
 
@@ -120,14 +115,14 @@ module('Integration | Component | transit key actions', function (hooks) {
   });
 
   async function doEncrypt(assert, actions = [], keyattrs = {}) {
-    const keyDefaults = { backend: 'transit', id: 'akey', supportedActions: ['encrypt'].concat(actions) };
+    let keyDefaults = { backend: 'transit', id: 'akey', supportedActions: ['encrypt'].concat(actions) };
 
     const key = assign({}, keyDefaults, keyattrs);
     this.set('key', key);
     this.set('selectedAction', 'encrypt');
     this.set('storeService.keyActionReturnVal', { ciphertext: 'secret' });
     await render(hbs`
-      {{transit-key-actions selectedAction=this.selectedAction key=this.key}}
+      {{transit-key-actions selectedAction=selectedAction key=key}}
       <div id="modal-wormhole"></div>
     `);
 
@@ -146,7 +141,7 @@ module('Integration | Component | transit key actions', function (hooks) {
       'passes expected args to the adapter'
     );
 
-    assert.strictEqual(find('[data-test-encrypted-value="ciphertext"]').innerText, 'secret');
+    assert.equal(find('[data-test-encrypted-value="ciphertext"]').innerText, 'secret');
 
     // exit modal
     await click('[data-test-modal-background]');
@@ -173,13 +168,13 @@ module('Integration | Component | transit key actions', function (hooks) {
   test('it encrypts', doEncrypt);
 
   test('it shows key version selection', async function (assert) {
-    const keyDefaults = { backend: 'transit', id: 'akey', supportedActions: ['encrypt'].concat([]) };
-    const keyattrs = { keysForEncryption: [3, 2, 1], latestVersion: 3 };
+    let keyDefaults = { backend: 'transit', id: 'akey', supportedActions: ['encrypt'].concat([]) };
+    let keyattrs = { keysForEncryption: [3, 2, 1], latestVersion: 3 };
     const key = assign({}, keyDefaults, keyattrs);
     this.set('key', key);
     this.set('storeService.keyActionReturnVal', { ciphertext: 'secret' });
     await render(hbs`
-      {{transit-key-actions selectedAction="encrypt" key=this.key}}
+      {{transit-key-actions selectedAction="encrypt" key=key}}
       <div id="modal-wormhole"></div>
     `);
 
@@ -204,13 +199,13 @@ module('Integration | Component | transit key actions', function (hooks) {
   });
 
   test('it hides key version selection', async function (assert) {
-    const keyDefaults = { backend: 'transit', id: 'akey', supportedActions: ['encrypt'].concat([]) };
-    const keyattrs = { keysForEncryption: [1] };
+    let keyDefaults = { backend: 'transit', id: 'akey', supportedActions: ['encrypt'].concat([]) };
+    let keyattrs = { keysForEncryption: [1] };
     const key = assign({}, keyDefaults, keyattrs);
     this.set('key', key);
     this.set('storeService.keyActionReturnVal', { ciphertext: 'secret' });
     await render(hbs`
-      {{transit-key-actions selectedAction="encrypt" key=this.key}}
+      {{transit-key-actions selectedAction="encrypt" key=key}}
       <div id="modal-wormhole"></div>
     `);
 
@@ -226,7 +221,7 @@ module('Integration | Component | transit key actions', function (hooks) {
 
     this.set('storeService.keyActionReturnVal', { plaintext });
     this.set('selectedAction', 'decrypt');
-    assert.strictEqual(
+    assert.equal(
       find('#ciphertext-control .CodeMirror').CodeMirror.getValue(),
       '',
       'does not prefill ciphertext value'
@@ -242,7 +237,7 @@ module('Integration | Component | transit key actions', function (hooks) {
       validKeyVersions: [1],
     });
     await render(hbs`
-      {{transit-key-actions key=this.key}}
+      {{transit-key-actions key=key}}
       <div id="modal-wormhole"></div>
     `);
   };
@@ -264,12 +259,8 @@ module('Integration | Component | transit key actions', function (hooks) {
       },
       'passes expected args to the adapter'
     );
-    assert.strictEqual(this.storeService.callArgsOptions.wrapTTL, '30m', 'passes value for wrapTTL');
-    assert.strictEqual(
-      find('[data-test-encrypted-value="export"]').innerText,
-      'wrapped-token',
-      'wraps by default'
-    );
+    assert.equal(this.storeService.callArgsOptions.wrapTTL, '30m', 'passes value for wrapTTL');
+    assert.equal(find('[data-test-encrypted-value="export"]').innerText, 'wrapped-token', 'wraps by default');
   });
 
   test('it can export a key:unwrapped behavior', async function (assert) {
@@ -322,7 +313,7 @@ module('Integration | Component | transit key actions', function (hooks) {
       validKeyVersions: [1],
     });
     await render(hbs`
-      {{transit-key-actions key=this.key}}
+      {{transit-key-actions key=key}}
       <div id="modal-wormhole"></div>
     `);
     await fillIn('#algorithm', 'sha2-384');
diff --git a/ui/tests/integration/components/ttl-picker-test.js b/ui/tests/integration/components/ttl-picker-test.js
index 5914e361577bb..ad3adb3ecaf90 100644
--- a/ui/tests/integration/components/ttl-picker-test.js
+++ b/ui/tests/integration/components/ttl-picker-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render, click, fillIn } from '@ember/test-helpers';
diff --git a/ui/tests/integration/components/upgrade-page-test.js b/ui/tests/integration/components/upgrade-page-test.js
index 2dbe0e243f41a..ffc7f468c4974 100644
--- a/ui/tests/integration/components/upgrade-page-test.js
+++ b/ui/tests/integration/components/upgrade-page-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
@@ -32,18 +27,18 @@ module('Integration | Component | upgrade page', function (hooks) {
 
   test('it renders with custom attributes', async function (assert) {
     await render(hbs`
-      {{upgrade-page title="Test Feature Title" minimumEdition="Vault Enterprise Premium"}}
+      {{upgrade-page title="Test Feature Title" featureName="Specific Feature Name" minimumEdition="Vault Enterprise Premium"}}
       <div id="modal-wormhole"></div>
     `);
 
     assert.dom('.page-header .title').hasText('Test Feature Title', 'renders custom page title');
     assert
       .dom('[data-test-empty-state-title]')
-      .hasText('Upgrade to use Test Feature Title', 'renders custom title');
+      .hasText('Upgrade to use Specific Feature Name', 'renders custom title');
     assert
       .dom('[data-test-empty-state-message]')
       .hasText(
-        'You will need Vault Enterprise Premium with Test Feature Title included to use this feature.',
+        'You will need Vault Enterprise Premium with Specific Feature Name included to use this feature.',
         'renders custom message'
       );
   });
diff --git a/ui/tests/integration/components/wrap-ttl-test.js b/ui/tests/integration/components/wrap-ttl-test.js
index 1af4d2fdb30cb..20bc4700df79b 100644
--- a/ui/tests/integration/components/wrap-ttl-test.js
+++ b/ui/tests/integration/components/wrap-ttl-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import Sinon from 'sinon';
 import { setupRenderingTest } from 'ember-qunit';
diff --git a/ui/tests/integration/helpers/add-to-array-test.js b/ui/tests/integration/helpers/add-to-array-test.js
index 578b3237a8174..6d172b2f31911 100644
--- a/ui/tests/integration/helpers/add-to-array-test.js
+++ b/ui/tests/integration/helpers/add-to-array-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { addToArray } from '../../../helpers/add-to-array';
@@ -24,7 +19,7 @@ module('Integration | Helper | add-to-array', function (hooks) {
     } catch (e) {
       result = e.message;
     }
-    assert.strictEqual(result, 'Assertion Failed: Value provided is not an array');
+    assert.equal(result, 'Assertion Failed: Value provided is not an array');
   });
 
   test('it works with non-string arrays', function (assert) {
diff --git a/ui/tests/integration/helpers/changelog-url-for-test.js b/ui/tests/integration/helpers/changelog-url-for-test.js
index 6c6e03fdabcae..2d85077b9c18e 100644
--- a/ui/tests/integration/helpers/changelog-url-for-test.js
+++ b/ui/tests/integration/helpers/changelog-url-for-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { changelogUrlFor } from '../../../helpers/changelog-url-for';
@@ -14,21 +9,21 @@ module('Integration | Helper | changelog-url-for', function (hooks) {
 
   test('it builds an enterprise URL', function (assert) {
     const result = changelogUrlFor(['1.5.0+prem']);
-    assert.strictEqual(result, CHANGELOG_URL.concat('150'));
+    assert.equal(result, CHANGELOG_URL.concat('150'));
   });
 
   test('it builds an OSS URL', function (assert) {
     const result = changelogUrlFor(['1.4.3']);
-    assert.strictEqual(result, CHANGELOG_URL.concat('143'));
+    assert.equal(result, CHANGELOG_URL.concat('143'));
   });
 
   test('it returns the base changelog URL if the version is less than 1.4.3', function (assert) {
     const result = changelogUrlFor(['1.4.0']);
-    assert.strictEqual(result, CHANGELOG_URL);
+    assert.equal(result, CHANGELOG_URL);
   });
 
   test('it returns the base changelog URL if version cannot be found', function (assert) {
     const result = changelogUrlFor(['']);
-    assert.strictEqual(result, CHANGELOG_URL);
+    assert.equal(result, CHANGELOG_URL);
   });
 });
diff --git a/ui/tests/integration/helpers/date-format-test.js b/ui/tests/integration/helpers/date-format-test.js
index 4cb68c4b140fb..4e0ecb91bb923 100644
--- a/ui/tests/integration/helpers/date-format-test.js
+++ b/ui/tests/integration/helpers/date-format-test.js
@@ -1,79 +1,66 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
-import sinon from 'sinon';
 import { setupRenderingTest } from 'ember-qunit';
-import { find, render, settled } from '@ember/test-helpers';
+import { render } from '@ember/test-helpers';
+import { format } from 'date-fns';
 import hbs from 'htmlbars-inline-precompile';
-import timestamp from 'core/utils/timestamp';
 
 module('Integration | Helper | date-format', function (hooks) {
   setupRenderingTest(hooks);
 
-  hooks.before(function () {
-    sinon.stub(timestamp, 'now').callsFake(() => new Date('2018-04-03T14:15:30'));
-  });
-  hooks.after(function () {
-    timestamp.now.restore();
-  });
-
   test('it is able to format a date object', async function (assert) {
-    const today = timestamp.now();
+    let today = new Date();
     this.set('today', today);
 
-    await render(hbs`{{date-format this.today "yyyy"}}`);
-    assert.dom(this.element).includesText('2018', 'it renders the date in the year format');
+    await render(hbs`<p data-test-date-format>Date: {{date-format today "yyyy"}}</p>`);
+    assert
+      .dom('[data-test-date-format]')
+      .includesText(today.getFullYear(), 'it renders the date in the year format');
   });
 
   test('it supports date timestamps', async function (assert) {
-    const today = timestamp.now().getTime();
+    let today = new Date().getTime();
     this.set('today', today);
 
-    await render(hbs`{{date-format this.today 'hh:mm:ss'}}`);
-    const formattedDate = this.element.innerText;
-    assert.strictEqual(formattedDate, '02:15:30');
+    await render(hbs`<p class="date-format">{{date-format today 'hh:mm:ss'}}</p>`);
+    let formattedDate = document.querySelector('.date-format').innerText;
+    assert.ok(formattedDate.match(/^\d{2}:\d{2}:\d{2}$/));
   });
 
   test('it supports date strings', async function (assert) {
-    const todayString = timestamp.now().getFullYear().toString();
+    let todayString = new Date().getFullYear().toString();
     this.set('todayString', todayString);
 
-    await render(hbs`{{date-format this.todayString "yyyy"}}`);
-    assert.dom(this.element).includesText(todayString, 'it renders the a date if passed in as a string');
+    await render(hbs`<p data-test-date-format>Date: {{date-format todayString "yyyy"}}</p>`);
+    assert
+      .dom('[data-test-date-format]')
+      .includesText(todayString, 'it renders the a date if passed in as a string');
   });
 
   test('it supports ten digit dates', async function (assert) {
-    const tenDigitDate = 1621785298;
+    let tenDigitDate = 1621785298;
     this.set('tenDigitDate', tenDigitDate);
 
-    await render(hbs`{{date-format this.tenDigitDate "MM/dd/yyyy"}}`);
-    assert.dom(this.element).includesText('05/23/2021');
+    await render(hbs`<p data-test-date-format>Date: {{date-format tenDigitDate "MM/dd/yyyy"}}</p>`);
+    assert.dom('[data-test-date-format]').includesText('05/23/2021');
   });
 
   test('it supports already formatted dates', async function (assert) {
-    const formattedDate = timestamp.now();
+    let formattedDate = new Date();
     this.set('formattedDate', formattedDate);
 
-    await render(hbs`{{date-format this.formattedDate 'MMMM dd, yyyy hh:mm:ss a' isFormatted=true}}`);
-    assert.dom(this.element).hasText('April 03, 2018 02:15:30 PM');
+    await render(
+      hbs`<p data-test-date-format>Date: {{date-format formattedDate 'MMMM dd, yyyy hh:mm:ss a' isFormatted=true}}</p>`
+    );
+    assert.dom('[data-test-date-format]').includesText(format(formattedDate, 'MMMM dd, yyyy hh:mm:ss a'));
   });
 
-  test('displays time zone if withTimeZone=true', async function (assert) {
-    const timestampDate = '2022-12-06T11:29:15-08:00';
-    this.set('withTimezone', false);
+  test('displays correct date when timestamp is in ISO 8601 format', async function (assert) {
+    let timestampDate = '2021-09-01T00:00:00Z';
     this.set('timestampDate', timestampDate);
 
     await render(
-      hbs`<span data-test-formatted>{{date-format this.timestampDate 'MMM d yyyy, h:mm:ss aaa' withTimeZone=this.withTimezone}}</span>`
+      hbs`<p data-test-date-format>Date: {{date-format timestampDate 'MMM dd, yyyy' dateOnly=true}}</p>`
     );
-    const result = find('[data-test-formatted]');
-    assert.strictEqual(result.innerText.length, 22);
-    // Compare to with timezone, which should add 4 characters
-    this.set('withTimezone', true);
-    await settled();
-    assert.strictEqual(result.innerText.length, 26);
+    assert.dom('[data-test-date-format]').includesText('Date: Sep 01, 2021');
   });
 });
diff --git a/ui/tests/integration/helpers/date-from-now-test.js b/ui/tests/integration/helpers/date-from-now-test.js
index 5b9362317fb82..ac83698a149c8 100644
--- a/ui/tests/integration/helpers/date-from-now-test.js
+++ b/ui/tests/integration/helpers/date-from-now-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { subMinutes } from 'date-fns';
 import { setupRenderingTest } from 'ember-qunit';
@@ -14,34 +9,34 @@ module('Integration | Helper | date-from-now', function (hooks) {
   setupRenderingTest(hooks);
 
   test('it works', function (assert) {
-    const result = dateFromNow([1481022124443]);
+    let result = dateFromNow([1481022124443]);
     assert.strictEqual(typeof result, 'string', 'it is a string');
   });
 
   test('you can include a suffix', function (assert) {
-    const result = dateFromNow([1481022124443], { addSuffix: true });
+    let result = dateFromNow([1481022124443], { addSuffix: true });
     assert.ok(result.includes(' ago'));
   });
 
   test('you can pass in UTC timestamp', function (assert) {
-    const result = dateFromNow(['Fri, 11 Oct 2019 18:56:08 GMT'], { addSuffix: true });
+    let result = dateFromNow(['Fri, 11 Oct 2019 18:56:08 GMT'], { addSuffix: true });
     assert.ok(result.includes(' ago'));
   });
 
   test('you can pass in ISO timestamp', function (assert) {
-    const result = dateFromNow(['2019-10-11T18:56:08.984Z'], { addSuffix: true });
+    let result = dateFromNow(['2019-10-11T18:56:08.984Z'], { addSuffix: true });
     assert.ok(result.includes(' ago'));
   });
 
   test('you can include a suffix using date class', function (assert) {
-    const now = Date.now();
-    const pastDate = subMinutes(now, 30);
-    const result = dateFromNow([pastDate], { addSuffix: true });
+    let now = Date.now();
+    let pastDate = subMinutes(now, 30);
+    let result = dateFromNow([pastDate], { addSuffix: true });
     assert.ok(result.includes(' ago'));
   });
 
   test('you can include a suffix using ISO 8601 format', function (assert) {
-    const result = dateFromNow(['2021-02-05T20:43:09+00:00'], { addSuffix: true });
+    let result = dateFromNow(['2021-02-05T20:43:09+00:00'], { addSuffix: true });
     assert.ok(result.includes(' ago'));
   });
 
diff --git a/ui/tests/integration/helpers/format-duration-test.js b/ui/tests/integration/helpers/format-duration-test.js
index d0adf41797407..e4704beb9f18a 100644
--- a/ui/tests/integration/helpers/format-duration-test.js
+++ b/ui/tests/integration/helpers/format-duration-test.js
@@ -1,50 +1,50 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
-import { duration } from 'core/helpers/format-duration';
 import { render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
+import hbs from 'htmlbars-inline-precompile';
 
 module('Integration | Helper | format-duration', function (hooks) {
   setupRenderingTest(hooks);
 
-  test('it formats-duration in template view', async function (assert) {
-    await render(hbs`<p data-test-format-duration>Date: {{format-duration 3606 }}</p>`);
+  test('it supports strings and formats seconds', async function (assert) {
+    await render(hbs`<p data-test-format-duration>Date: {{format-duration '3606'}}</p>`);
 
     assert
       .dom('[data-test-format-duration]')
       .includesText('1 hour 6 seconds', 'it renders the duration in hours and seconds');
   });
 
-  test('it formats seconds', async function (assert) {
-    assert.strictEqual(duration([3606]), '1 hour 6 seconds');
-  });
+  test('it is able to format seconds and days', async function (assert) {
+    await render(hbs`<p data-test-format-duration>Date: {{format-duration '93606000'}}</p>`);
 
-  test('it format seconds and days', async function (assert) {
-    assert.strictEqual(duration([93606000]), '2 years 11 months 18 days 9 hours 40 minutes');
+    assert
+      .dom('[data-test-format-duration]')
+      .includesText(
+        '2 years 11 months 18 days 9 hours 40 minutes',
+        'it renders with years months and days and hours and minutes'
+      );
   });
 
-  test('it returns the integer 0', async function (assert) {
-    assert.strictEqual(duration([0]), 0);
+  test('it is able to format numbers', async function (assert) {
+    this.set('number', 60);
+    await render(hbs`<p data-test-format-duration>Date: {{format-duration number}}</p>`);
+
+    assert
+      .dom('[data-test-format-duration]')
+      .includesText('1 minute', 'it renders duration when a number is passed in.');
   });
 
-  test('it returns plain or non-parsable string inputs', async function (assert) {
-    assert.strictEqual(duration(['0']), '0 seconds'); // assume seconds for '0' string values only
-    assert.strictEqual(duration(['arg']), 'arg');
-    assert.strictEqual(duration(['1245']), '1245');
-    assert.strictEqual(duration(['11y']), '11y');
+  test('it renders the input if time not found', async function (assert) {
+    this.set('number', 'arg');
+
+    await render(hbs`<p data-test-format-duration>Date: {{format-duration number}}</p>`);
+    assert.dom('[data-test-format-duration]').hasText('Date: arg');
   });
 
-  test('it formats duration string inputs', async function (assert) {
-    assert.strictEqual(duration(['0s']), '0 seconds');
-    assert.strictEqual(duration(['5s']), '5 seconds');
-    assert.strictEqual(duration(['545h']), '22 days 17 hours');
-    assert.strictEqual(duration(['8h']), '8 hours');
-    assert.strictEqual(duration(['3m']), '3 minutes');
-    assert.strictEqual(duration(['10d']), '10 days');
+  test('it renders no value if nullable true', async function (assert) {
+    this.set('number', 0);
+
+    await render(hbs`<p data-test-format-duration>Date: {{format-duration number nullable=true}}</p>`);
+    assert.dom('[data-test-format-duration]').hasText('Date:');
   });
 });
diff --git a/ui/tests/integration/helpers/has-feature-test.js b/ui/tests/integration/helpers/has-feature-test.js
index 2aae21d45ae2b..f19be518f25a3 100644
--- a/ui/tests/integration/helpers/has-feature-test.js
+++ b/ui/tests/integration/helpers/has-feature-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Service from '@ember/service';
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
@@ -23,9 +18,9 @@ module('helper:has-feature', function (hooks) {
   });
 
   test('it asserts on unknown features', async function (assert) {
-    const promise = waitForError();
+    let promise = waitForError();
     render(hbs`{{has-feature 'New Feature'}}`);
-    const err = await promise;
+    let err = await promise;
     assert.ok(
       err.message.includes('New Feature is not one of the available values for Vault Enterprise features.'),
       'asserts when an unknown feature is passed as an arg'
diff --git a/ui/tests/integration/helpers/has-permission-test.js b/ui/tests/integration/helpers/has-permission-test.js
index 8270874e19592..47e7e9a46aa9d 100644
--- a/ui/tests/integration/helpers/has-permission-test.js
+++ b/ui/tests/integration/helpers/has-permission-test.js
@@ -1,15 +1,9 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
 import { run } from '@ember/runloop';
 import hbs from 'htmlbars-inline-precompile';
 import Service from '@ember/service';
-import sinon from 'sinon';
 
 const Permissions = Service.extend({
   globPaths: null,
@@ -20,7 +14,6 @@ const Permissions = Service.extend({
 
 module('Integration | Helper | has-permission', function (hooks) {
   setupRenderingTest(hooks);
-
   hooks.beforeEach(function () {
     this.owner.register('service:permissions', Permissions);
     this.permissions = this.owner.lookup('service:permissions');
@@ -35,32 +28,4 @@ module('Integration | Helper | has-permission', function (hooks) {
     });
     assert.dom(this.element).hasText('Yes', 'the helper re-computes when globPaths changes');
   });
-
-  test('it should pass args from helper to service method', async function (assert) {
-    const stub = sinon.stub(this.permissions, 'hasNavPermission').returns(true);
-    this.permissions.set('exactPaths', {
-      'sys/auth': {
-        capabilities: ['read'],
-      },
-      'identity/mfa/method': {
-        capabilities: ['read'],
-      },
-    });
-    this.routeParams = ['methods', 'mfa'];
-
-    await render(hbs`
-      {{#if (has-permission "access" routeParams=this.routeParams requireAll=true)}}
-        Yes
-      {{else}}
-        No
-      {{/if}}
-    `);
-
-    assert.true(
-      stub.withArgs('access', this.routeParams, true).calledOnce,
-      'Args are passed from helper to service'
-    );
-    assert.dom(this.element).hasText('Yes', 'Helper returns value from service method');
-    stub.restore();
-  });
 });
diff --git a/ui/tests/integration/helpers/is-empty-value-test.js b/ui/tests/integration/helpers/is-empty-value-test.js
index 53dbc571ac1fe..8e258923a637a 100644
--- a/ui/tests/integration/helpers/is-empty-value-test.js
+++ b/ui/tests/integration/helpers/is-empty-value-test.js
@@ -1,15 +1,10 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
 
 const template = hbs`
-{{#if (is-empty-value this.inputValue hasDefault=this.defaultValue)}}
+{{#if (is-empty-value inputValue hasDefault=defaultValue)}}
 Empty
 {{else}}
 Full
diff --git a/ui/tests/integration/helpers/loose-equal-test.js b/ui/tests/integration/helpers/loose-equal-test.js
deleted file mode 100644
index a8068f00aa5a4..0000000000000
--- a/ui/tests/integration/helpers/loose-equal-test.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'vault/tests/helpers';
-import { render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-import { looseEqual } from 'core/helpers/loose-equal';
-
-module('Integration | Helper | loose-equal', function (hooks) {
-  setupRenderingTest(hooks);
-
-  test('it renders', async function (assert) {
-    this.inputValue = 1234;
-    await render(hbs`{{if (loose-equal "1234" 1234) "true" "false"}}`);
-    assert.dom(this.element).hasText('true');
-
-    this.inputValue = '4567';
-    await render(hbs`{{if (loose-equal "1234" "4567") "true" "false"}}`);
-    assert.dom(this.element).hasText('false');
-  });
-
-  test('it compares values as expected', async function (assert) {
-    assert.true(looseEqual([0, '0']));
-    assert.true(looseEqual([0, 0]));
-    assert.true(looseEqual(['0', '0']));
-    assert.true(looseEqual(['1234', 1234]));
-    assert.true(looseEqual(['1234', '1234']));
-    assert.true(looseEqual([1234, 1234]));
-    assert.true(looseEqual(['abc', 'abc']));
-    assert.true(looseEqual(['', '']));
-
-    // == normally returns true for this comparison, we intercept and return false
-    assert.false(looseEqual(['', 0]));
-    assert.false(looseEqual([0, '']));
-  });
-});
diff --git a/ui/tests/integration/helpers/remove-from-array-test.js b/ui/tests/integration/helpers/remove-from-array-test.js
index 5449aeb7f1d71..5207b7e630912 100644
--- a/ui/tests/integration/helpers/remove-from-array-test.js
+++ b/ui/tests/integration/helpers/remove-from-array-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { removeFromArray } from '../../../helpers/remove-from-array';
@@ -30,7 +25,7 @@ module('Integration | Helper | remove-from-array', function (hooks) {
     } catch (e) {
       result = e.message;
     }
-    assert.strictEqual(result, 'Assertion Failed: Value provided is not an array');
+    assert.equal(result, 'Assertion Failed: Value provided is not an array');
   });
 
   test('it works with non-string arrays', function (assert) {
diff --git a/ui/tests/integration/helpers/sanitized-html-test.js b/ui/tests/integration/helpers/sanitized-html-test.js
index 917964b51020c..b677f2a92dd16 100644
--- a/ui/tests/integration/helpers/sanitized-html-test.js
+++ b/ui/tests/integration/helpers/sanitized-html-test.js
@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupRenderingTest } from 'vault/tests/helpers';
+import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
 
diff --git a/ui/tests/integration/services/auth-test.js b/ui/tests/integration/services/auth-test.js
index e78ee0ee9211a..61564dbf7153c 100644
--- a/ui/tests/integration/services/auth-test.js
+++ b/ui/tests/integration/services/auth-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { run } from '@ember/runloop';
 import { copy } from 'ember-copy';
 import { module, test } from 'qunit';
@@ -32,7 +27,7 @@ function storage() {
   };
 }
 
-const ROOT_TOKEN_RESPONSE = {
+let ROOT_TOKEN_RESPONSE = {
   request_id: 'e6674d7f-c96f-d51f-4463-cc95f0ad307e',
   lease_id: '',
   renewable: false,
@@ -56,7 +51,7 @@ const ROOT_TOKEN_RESPONSE = {
   auth: null,
 };
 
-const TOKEN_NON_ROOT_RESPONSE = function () {
+let TOKEN_NON_ROOT_RESPONSE = function () {
   return {
     request_id: '3ca32cd9-fd40-891d-02d5-ea23138e8642',
     lease_id: '',
@@ -83,7 +78,7 @@ const TOKEN_NON_ROOT_RESPONSE = function () {
   };
 };
 
-const USERPASS_RESPONSE = {
+let USERPASS_RESPONSE = {
   request_id: '7e5e8d3d-599e-6ef7-7570-f7057fc7c53d',
   lease_id: '',
   renewable: false,
@@ -103,7 +98,7 @@ const USERPASS_RESPONSE = {
   },
 };
 
-const GITHUB_RESPONSE = {
+let GITHUB_RESPONSE = {
   request_id: '4913f9cd-a95f-d1f9-5746-4c3af4e15660',
   lease_id: '',
   renewable: false,
@@ -133,20 +128,20 @@ module('Integration | Service | auth', function (hooks) {
     this.memStore = storage();
     this.server = new Pretender(function () {
       this.get('/v1/auth/token/lookup-self', function (request) {
-        const resp = copy(ROOT_TOKEN_RESPONSE, true);
+        let resp = copy(ROOT_TOKEN_RESPONSE, true);
         resp.id = request.requestHeaders['X-Vault-Token'];
         resp.data.id = request.requestHeaders['X-Vault-Token'];
         return [200, {}, resp];
       });
       this.post('/v1/auth/userpass/login/:username', function (request) {
         const { username } = request.params;
-        const resp = copy(USERPASS_RESPONSE, true);
+        let resp = copy(USERPASS_RESPONSE, true);
         resp.auth.metadata.username = username;
         return [200, {}, resp];
       });
 
       this.post('/v1/auth/github/login', function () {
-        const resp = copy(GITHUB_RESPONSE, true);
+        let resp = copy(GITHUB_RESPONSE, true);
         return [200, {}, resp];
       });
     });
@@ -167,9 +162,9 @@ module('Integration | Service | auth', function (hooks) {
 
   test('token authentication: root token', function (assert) {
     assert.expect(6);
-    const done = assert.async();
-    const self = this;
-    const service = this.owner.factoryFor('service:auth').create({
+    let done = assert.async();
+    let self = this;
+    let service = this.owner.factoryFor('service:auth').create({
       storage(tokenName) {
         if (
           tokenName &&
@@ -183,41 +178,37 @@ module('Integration | Service | auth', function (hooks) {
       },
     });
     run(() => {
-      service
-        .authenticate({ clusterId: '1', backend: 'token', data: { token: 'test' } })
-        .then(() => {
-          const clusterTokenName = service.get('currentTokenName');
-          const clusterToken = service.get('currentToken');
-          const authData = service.get('authData');
+      service.authenticate({ clusterId: '1', backend: 'token', data: { token: 'test' } }).then(() => {
+        const clusterTokenName = service.get('currentTokenName');
+        const clusterToken = service.get('currentToken');
+        const authData = service.get('authData');
 
-          const expectedTokenName = `${TOKEN_PREFIX}${ROOT_PREFIX}${TOKEN_SEPARATOR}1`;
-          assert.strictEqual(clusterToken, 'test', 'token is saved properly');
-          assert.strictEqual(
-            `${TOKEN_PREFIX}${ROOT_PREFIX}${TOKEN_SEPARATOR}1`,
-            clusterTokenName,
-            'token name is saved properly'
-          );
-          assert.strictEqual(authData.backend.type, 'token', 'backend is saved properly');
-          assert.strictEqual(
-            ROOT_TOKEN_RESPONSE.data.display_name,
-            authData.displayName,
-            'displayName is saved properly'
-          );
-          assert.ok(
-            this.memStore.keys().includes(expectedTokenName),
-            'root token is stored in the memory store'
-          );
-          assert.strictEqual(this.store.keys().length, 0, 'normal storage is empty');
-        })
-        .finally(() => {
-          done();
-        });
+        const expectedTokenName = `${TOKEN_PREFIX}${ROOT_PREFIX}${TOKEN_SEPARATOR}1`;
+        assert.equal(clusterToken, 'test', 'token is saved properly');
+        assert.equal(
+          `${TOKEN_PREFIX}${ROOT_PREFIX}${TOKEN_SEPARATOR}1`,
+          clusterTokenName,
+          'token name is saved properly'
+        );
+        assert.equal(authData.backend.type, 'token', 'backend is saved properly');
+        assert.equal(
+          ROOT_TOKEN_RESPONSE.data.display_name,
+          authData.displayName,
+          'displayName is saved properly'
+        );
+        assert.ok(
+          this.memStore.keys().includes(expectedTokenName),
+          'root token is stored in the memory store'
+        );
+        assert.equal(this.store.keys().length, 0, 'normal storage is empty');
+        done();
+      });
     });
   });
 
   test('token authentication: root token in ember development environment', async function (assert) {
-    const self = this;
-    const service = this.owner.factoryFor('service:auth').create({
+    let self = this;
+    let service = this.owner.factoryFor('service:auth').create({
       storage(tokenName) {
         if (
           tokenName &&
@@ -237,26 +228,26 @@ module('Integration | Service | auth', function (hooks) {
     const authData = service.get('authData');
 
     const expectedTokenName = `${TOKEN_PREFIX}${ROOT_PREFIX}${TOKEN_SEPARATOR}1`;
-    assert.strictEqual(clusterToken, 'test', 'token is saved properly');
-    assert.strictEqual(
+    assert.equal(clusterToken, 'test', 'token is saved properly');
+    assert.equal(
       `${TOKEN_PREFIX}${ROOT_PREFIX}${TOKEN_SEPARATOR}1`,
       clusterTokenName,
       'token name is saved properly'
     );
-    assert.strictEqual(authData.backend.type, 'token', 'backend is saved properly');
-    assert.strictEqual(
+    assert.equal(authData.backend.type, 'token', 'backend is saved properly');
+    assert.equal(
       ROOT_TOKEN_RESPONSE.data.display_name,
       authData.displayName,
       'displayName is saved properly'
     );
     assert.ok(this.store.keys().includes(expectedTokenName), 'root token is stored in the store');
-    assert.strictEqual(this.memStore.keys().length, 0, 'mem storage is empty');
+    assert.equal(this.memStore.keys().length, 0, 'mem storage is empty');
   });
 
   test('github authentication', function (assert) {
     assert.expect(6);
-    const done = assert.async();
-    const service = this.owner.factoryFor('service:auth').create({
+    let done = assert.async();
+    let service = this.owner.factoryFor('service:auth').create({
       storage: (type) => (type === 'memory' ? this.memStore : this.store),
     });
 
@@ -267,15 +258,15 @@ module('Integration | Service | auth', function (hooks) {
         const authData = service.get('authData');
         const expectedTokenName = `${TOKEN_PREFIX}github${TOKEN_SEPARATOR}1`;
 
-        assert.strictEqual(GITHUB_RESPONSE.auth.client_token, clusterToken, 'token is saved properly');
-        assert.strictEqual(expectedTokenName, clusterTokenName, 'token name is saved properly');
-        assert.strictEqual(authData.backend.type, 'github', 'backend is saved properly');
-        assert.strictEqual(
+        assert.equal(GITHUB_RESPONSE.auth.client_token, clusterToken, 'token is saved properly');
+        assert.equal(expectedTokenName, clusterTokenName, 'token name is saved properly');
+        assert.equal(authData.backend.type, 'github', 'backend is saved properly');
+        assert.equal(
           GITHUB_RESPONSE.auth.metadata.org + '/' + GITHUB_RESPONSE.auth.metadata.username,
           authData.displayName,
           'displayName is saved properly'
         );
-        assert.strictEqual(this.memStore.keys().length, 0, 'mem storage is empty');
+        assert.equal(this.memStore.keys().length, 0, 'mem storage is empty');
         assert.ok(this.store.keys().includes(expectedTokenName), 'normal storage contains the token');
         done();
       });
@@ -284,8 +275,8 @@ module('Integration | Service | auth', function (hooks) {
 
   test('userpass authentication', function (assert) {
     assert.expect(4);
-    const done = assert.async();
-    const service = this.owner.factoryFor('service:auth').create({ storage: () => this.store });
+    let done = assert.async();
+    let service = this.owner.factoryFor('service:auth').create({ storage: () => this.store });
     run(() => {
       service
         .authenticate({
@@ -298,14 +289,14 @@ module('Integration | Service | auth', function (hooks) {
           const clusterToken = service.get('currentToken');
           const authData = service.get('authData');
 
-          assert.strictEqual(USERPASS_RESPONSE.auth.client_token, clusterToken, 'token is saved properly');
-          assert.strictEqual(
+          assert.equal(USERPASS_RESPONSE.auth.client_token, clusterToken, 'token is saved properly');
+          assert.equal(
             `${TOKEN_PREFIX}userpass${TOKEN_SEPARATOR}1`,
             clusterTokenName,
             'token name is saved properly'
           );
-          assert.strictEqual(authData.backend.type, 'userpass', 'backend is saved properly');
-          assert.strictEqual(
+          assert.equal(authData.backend.type, 'userpass', 'backend is saved properly');
+          assert.equal(
             USERPASS_RESPONSE.auth.metadata.username,
             authData.displayName,
             'displayName is saved properly'
@@ -320,33 +311,29 @@ module('Integration | Service | auth', function (hooks) {
     const tokenResp = TOKEN_NON_ROOT_RESPONSE();
     this.server.map(function () {
       this.get('/v1/auth/token/lookup-self', function (request) {
-        const resp = copy(tokenResp, true);
+        let resp = copy(tokenResp, true);
         resp.id = request.requestHeaders['X-Vault-Token'];
         resp.data.id = request.requestHeaders['X-Vault-Token'];
         return [200, {}, resp];
       });
     });
 
-    const done = assert.async();
-    const service = this.owner.factoryFor('service:auth').create({ storage: () => this.store });
+    let done = assert.async();
+    let service = this.owner.factoryFor('service:auth').create({ storage: () => this.store });
     run(() => {
       service.authenticate({ clusterId: '1', backend: 'token', data: { token: 'test' } }).then(() => {
         const clusterTokenName = service.get('currentTokenName');
         const clusterToken = service.get('currentToken');
         const authData = service.get('authData');
 
-        assert.strictEqual(clusterToken, 'test', 'token is saved properly');
-        assert.strictEqual(
+        assert.equal(clusterToken, 'test', 'token is saved properly');
+        assert.equal(
           `${TOKEN_PREFIX}token${TOKEN_SEPARATOR}1`,
           clusterTokenName,
           'token name is saved properly'
         );
-        assert.strictEqual(authData.backend.type, 'token', 'backend is saved properly');
-        assert.strictEqual(
-          authData.displayName,
-          tokenResp.data.display_name,
-          'displayName is saved properly'
-        );
+        assert.equal(authData.backend.type, 'token', 'backend is saved properly');
+        assert.equal(authData.displayName, tokenResp.data.display_name, 'displayName is saved properly');
         assert.false(service.get('tokenExpired'), 'token is not expired');
         done();
       });
diff --git a/ui/tests/integration/utils/client-count-utils-test.js b/ui/tests/integration/utils/client-count-utils-test.js
index f5a7237fd9762..7df4fd30af9fd 100644
--- a/ui/tests/integration/utils/client-count-utils-test.js
+++ b/ui/tests/integration/utils/client-count-utils-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import {
@@ -622,13 +617,13 @@ module('Integration | Util | client count utils', function (hooks) {
       );
     };
     const assertClientCounts = (object, originalObject) => {
-      const newObjectKeys = ['clients', 'entity_clients', 'non_entity_clients'];
-      const originalKeys = Object.keys(originalObject.counts).includes('entity_clients')
+      let newObjectKeys = ['clients', 'entity_clients', 'non_entity_clients'];
+      let originalKeys = Object.keys(originalObject.counts).includes('entity_clients')
         ? newObjectKeys
         : ['clients', 'distinct_entities', 'non_entity_tokens'];
 
       newObjectKeys.forEach((key, i) => {
-        assert.strictEqual(
+        assert.equal(
           object[key],
           originalObject.counts[originalKeys[i]],
           `${object.month} ${key} equal original counts`
@@ -659,7 +654,7 @@ module('Integration | Util | client count utils', function (hooks) {
     });
 
     // method fails gracefully
-    const expected = [
+    let expected = [
       {
         counts: null,
         month: '6/21',
@@ -668,7 +663,6 @@ module('Integration | Util | client count utils', function (hooks) {
         new_clients: {
           month: '6/21',
           namespaces: [],
-          timestamp: '2021-06-01T00:00:00Z',
         },
         timestamp: '2021-06-01T00:00:00Z',
       },
@@ -680,12 +674,11 @@ module('Integration | Util | client count utils', function (hooks) {
         new_clients: {
           month: '7/21',
           namespaces: [],
-          timestamp: '2021-07-01T00:00:00Z',
         },
         timestamp: '2021-07-01T00:00:00Z',
       },
     ];
-    assert.strictEqual(formatByMonths(SOME_OBJECT), SOME_OBJECT, 'it returns if arg is not an array');
+    assert.equal(formatByMonths(SOME_OBJECT), SOME_OBJECT, 'it returns if arg is not an array');
     assert.propEqual(expected, formatByMonths(EMPTY_MONTHS), 'it does not error with null months');
     assert.ok(formatByMonths([...EMPTY_MONTHS, ...MONTHS]), 'it does not error with combined data');
   });
@@ -705,10 +698,10 @@ module('Integration | Util | client count utils', function (hooks) {
     };
     const keyValueAssertions = (object, pathName, originalObject) => {
       const keysToAssert = ['clients', 'entity_clients', 'non_entity_clients'];
-      assert.strictEqual(object.label, originalObject[pathName], `${pathName} matches label`);
+      assert.equal(object.label, originalObject[pathName], `${pathName} matches label`);
 
       keysToAssert.forEach((key) => {
-        assert.strictEqual(object[key], originalObject.counts[key], `number of ${key} equal original`);
+        assert.equal(object[key], originalObject.counts[key], `number of ${key} equal original`);
       });
     };
 
@@ -716,12 +709,12 @@ module('Integration | Util | client count utils', function (hooks) {
     assert.notEqual(formattedNamespaces, MONTHS, 'does not modify original array');
 
     formattedNamespaces.forEach((namespace) => {
-      const origNamespace = BY_NAMESPACE.find((ns) => ns.namespace_path === namespace.label);
+      let origNamespace = BY_NAMESPACE.find((ns) => ns.namespace_path === namespace.label);
       keyNameAssertions(namespace, 'formatted namespace');
       keyValueAssertions(namespace, 'namespace_path', origNamespace);
 
       namespace.mounts.forEach((mount) => {
-        const origMount = origNamespace.mounts.find((m) => m.mount_path === mount.label);
+        let origMount = origNamespace.mounts.find((m) => m.mount_path === mount.label);
         keyNameAssertions(mount, 'formatted mount');
         keyValueAssertions(mount, 'mount_path', origMount);
       });
@@ -740,12 +733,12 @@ module('Integration | Util | client count utils', function (hooks) {
       mounts: [],
     };
 
-    const formattedNsWithoutMounts = formatByNamespace([nsWithoutMounts])[0];
+    let formattedNsWithoutMounts = formatByNamespace([nsWithoutMounts])[0];
     keyNameAssertions(formattedNsWithoutMounts, 'namespace without mounts');
     keyValueAssertions(formattedNsWithoutMounts, 'namespace_path', nsWithoutMounts);
-    assert.strictEqual(formattedNsWithoutMounts.mounts.length, 0, 'formatted namespace has no mounts');
+    assert.equal(formattedNsWithoutMounts.mounts.length, 0, 'formatted namespace has no mounts');
 
-    assert.strictEqual(formatByNamespace(SOME_OBJECT), SOME_OBJECT, 'it returns if arg is not an array');
+    assert.equal(formatByNamespace(SOME_OBJECT), SOME_OBJECT, 'it returns if arg is not an array');
   });
 
   test('homogenizeClientNaming: homogenizes key names when both old and new keys exist, or just old key names', async function (assert) {
@@ -767,7 +760,7 @@ module('Integration | Util | client count utils', function (hooks) {
       );
     };
 
-    const transformedMonths = [...MONTHS];
+    let transformedMonths = [...MONTHS];
     transformedMonths.forEach((month) => {
       month.counts = homogenizeClientNaming(month.counts);
       keyNameAssertions(month.counts, 'month counts');
@@ -821,13 +814,13 @@ module('Integration | Util | client count utils', function (hooks) {
     keyNameAssertions(flattenedMonth, 'month object');
     keyNameAssertions(flattenedNewMonthClients, 'month new_clients object');
 
-    assert.strictEqual(
+    assert.equal(
       flattenDataset(SOME_OBJECT),
       SOME_OBJECT,
       "it returns original object if counts key doesn't exist"
     );
 
-    assert.strictEqual(
+    assert.equal(
       flattenDataset(objectNullCounts),
       objectNullCounts,
       'it returns original object if counts are null'
@@ -838,8 +831,8 @@ module('Integration | Util | client count utils', function (hooks) {
       flattenDataset(['some array']),
       'it fails gracefully if an array is passed in'
     );
-    assert.strictEqual(flattenDataset(null), null, 'it fails gracefully if null is passed in');
-    assert.strictEqual(
+    assert.equal(flattenDataset(null), null, 'it fails gracefully if null is passed in');
+    assert.equal(
       flattenDataset('some string'),
       'some string',
       'it fails gracefully if a string is passed in'
@@ -863,17 +856,17 @@ module('Integration | Util | client count utils', function (hooks) {
       'third timestamp date is later second'
     );
     assert.notEqual(sortedMonths[1], MONTHS[1], 'it does not modify original array');
-    assert.strictEqual(sortedMonths[0], MONTHS[0], 'it does not modify original array');
+    assert.equal(sortedMonths[0], MONTHS[0], 'it does not modify original array');
   });
 
   test('namespaceArrayToObject: transforms data without modifying original', async function (assert) {
     assert.expect(30);
 
     const assertClientCounts = (object, originalObject) => {
-      const valuesToCheck = ['clients', 'entity_clients', 'non_entity_clients'];
+      let valuesToCheck = ['clients', 'entity_clients', 'non_entity_clients'];
 
       valuesToCheck.forEach((key) => {
-        assert.strictEqual(object[key], originalObject[key], `${key} equal original counts`);
+        assert.equal(object[key], originalObject[key], `${key} equal original counts`);
       });
     };
     const totalClientsByNamespace = formatByNamespace(MONTHS[1].namespaces);
@@ -896,27 +889,27 @@ module('Integration | Util | client count utils', function (hooks) {
       'it does not modify original array'
     );
 
-    const namespaceKeys = Object.keys(byNamespaceKeyObject);
+    let namespaceKeys = Object.keys(byNamespaceKeyObject);
     namespaceKeys.forEach((nsKey) => {
       const newNsObject = byNamespaceKeyObject[nsKey];
-      const originalNsData = totalClientsByNamespace.find((ns) => ns.label === nsKey);
+      let originalNsData = totalClientsByNamespace.find((ns) => ns.label === nsKey);
       assertClientCounts(newNsObject, originalNsData);
-      const mountKeys = Object.keys(newNsObject.mounts_by_key);
+      let mountKeys = Object.keys(newNsObject.mounts_by_key);
       mountKeys.forEach((mKey) => {
-        const mountData = originalNsData.mounts.find((m) => m.label === mKey);
+        let mountData = originalNsData.mounts.find((m) => m.label === mKey);
         assertClientCounts(newNsObject.mounts_by_key[mKey], mountData);
       });
     });
 
     namespaceKeys.forEach((nsKey) => {
       const newNsObject = byNamespaceKeyObject[nsKey];
-      const originalNsData = newClientsByNamespace.find((ns) => ns.label === nsKey);
+      let originalNsData = newClientsByNamespace.find((ns) => ns.label === nsKey);
       if (!originalNsData) return;
       assertClientCounts(newNsObject.new_clients, originalNsData);
-      const mountKeys = Object.keys(newNsObject.mounts_by_key);
+      let mountKeys = Object.keys(newNsObject.mounts_by_key);
 
       mountKeys.forEach((mKey) => {
-        const mountData = originalNsData.mounts.find((m) => m.label === mKey);
+        let mountData = originalNsData.mounts.find((m) => m.label === mKey);
         assertClientCounts(newNsObject.mounts_by_key[mKey].new_clients, mountData);
       });
     });
diff --git a/ui/tests/integration/utils/date-formatters-test.js b/ui/tests/integration/utils/date-formatters-test.js
index a2cb78f125200..97255ba56a476 100644
--- a/ui/tests/integration/utils/date-formatters-test.js
+++ b/ui/tests/integration/utils/date-formatters-test.js
@@ -1,41 +1,53 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
-import { formatRFC3339, isSameDay, isSameMonth, isSameYear } from 'date-fns';
-import { parseAPITimestamp, formatChartDate } from 'core/utils/date-formatters';
+import { format, formatRFC3339, isSameDay, isSameMonth, isSameYear } from 'date-fns';
+import {
+  ARRAY_OF_MONTHS,
+  parseAPITimestamp,
+  parseRFC3339,
+  formatChartDate,
+} from 'core/utils/date-formatters';
 
 module('Integration | Util | date formatters utils', function (hooks) {
   setupTest(hooks);
 
+  const DATE = new Date();
+  const API_TIMESTAMP = formatRFC3339(DATE).split('T')[0].concat('T00:00:00Z');
+  const UNIX_TIME = DATE.getTime();
+
   test('parseAPITimestamp: parses API timestamp string irrespective of timezone', async function (assert) {
     assert.expect(6);
-    const DATE = new Date('2012-06-10T15:30:45');
-    const API_TIMESTAMP = formatRFC3339(DATE).split('T')[0].concat('T00:00:00Z');
-    const UNIX_TIME = DATE.getTime();
-    assert.strictEqual(
-      parseAPITimestamp(UNIX_TIME),
-      undefined,
-      'it returns undefined if timestamp is not a string'
-    );
+    assert.equal(parseAPITimestamp(UNIX_TIME), undefined, 'it returns if timestamp is not a string');
 
-    const parsedTimestamp = parseAPITimestamp(API_TIMESTAMP);
+    let parsedTimestamp = parseAPITimestamp(API_TIMESTAMP);
 
     assert.true(parsedTimestamp instanceof Date, 'parsed timestamp is a date object');
     assert.true(isSameYear(parsedTimestamp, DATE), 'parsed timestamp is correct year');
     assert.true(isSameMonth(parsedTimestamp, DATE), 'parsed timestamp is correct month');
     assert.true(isSameDay(parsedTimestamp, DATE), 'parsed timestamp is correct day');
 
-    const formattedTimestamp = parseAPITimestamp(API_TIMESTAMP, 'MM yyyy');
-    assert.strictEqual(formattedTimestamp, '06 2012', 'it formats the date');
+    let formattedTimestamp = parseAPITimestamp(API_TIMESTAMP, 'MM yyyy');
+    assert.equal(formattedTimestamp, format(DATE, 'MM yyyy'), 'it formats the date');
+  });
+
+  test('parseRFC3339: convert timestamp to array for widget', async function (assert) {
+    assert.expect(4);
+    let arrayArg = ['2021', 2];
+    assert.equal(parseRFC3339(arrayArg), arrayArg, 'it returns arg if already an array');
+    assert.equal(parseRFC3339(UNIX_TIME), null, 'it returns null parsing a timestamp of the wrong format');
+
+    let parsedTimestamp = parseRFC3339(API_TIMESTAMP);
+    assert.equal(parsedTimestamp[0], format(DATE, 'yyyy'), 'first element is a string of the year');
+    assert.equal(
+      ARRAY_OF_MONTHS[parsedTimestamp[1]],
+      format(DATE, 'MMMM'),
+      'second element is an integer of the month'
+    );
   });
 
   test('formatChartDate: expand chart date to full month and year', async function (assert) {
     assert.expect(1);
-    const chartDate = '03/21';
-    assert.strictEqual(formatChartDate(chartDate), 'March 2021', 'it re-formats the date');
+    let chartDate = '03/21';
+    assert.equal(formatChartDate(chartDate), 'March 2021', 'it re-formats the date');
   });
 });
diff --git a/ui/tests/integration/utils/field-to-attrs-test.js b/ui/tests/integration/utils/field-to-attrs-test.js
index 0771abc0aaefe..5e4b94a558340 100644
--- a/ui/tests/integration/utils/field-to-attrs-test.js
+++ b/ui/tests/integration/utils/field-to-attrs-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { run } from '@ember/runloop';
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
diff --git a/ui/tests/integration/utils/parse-pki-cert-test.js b/ui/tests/integration/utils/parse-pki-cert-test.js
deleted file mode 100644
index d467cbd41ebb7..0000000000000
--- a/ui/tests/integration/utils/parse-pki-cert-test.js
+++ /dev/null
@@ -1,273 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
-import { parseCertificate, parseExtensions, parseSubject, formatValues } from 'vault/utils/parse-pki-cert';
-import * as asn1js from 'asn1js';
-import { fromBase64, stringToArrayBuffer } from 'pvutils';
-import { Certificate } from 'pkijs';
-import { addHours, fromUnixTime, isSameDay } from 'date-fns';
-import errorMessage from 'vault/utils/error-message';
-import { SAN_TYPES } from 'vault/utils/parse-pki-cert-oids';
-import {
-  certWithoutCN,
-  loadedCert,
-  pssTrueCert,
-  skeletonCert,
-  unsupportedOids,
-} from 'vault/tests/helpers/pki/values';
-
-module('Integration | Util | parse pki certificate', function (hooks) {
-  setupTest(hooks);
-
-  hooks.beforeEach(function () {
-    this.getErrorMessages = (certErrors) => certErrors.map((error) => errorMessage(error));
-    this.certSchema = (cert) => {
-      const cert_base64 = cert.replace(/(-----(BEGIN|END) CERTIFICATE-----|\n)/g, '');
-      const cert_der = fromBase64(cert_base64);
-      const cert_asn1 = asn1js.fromBER(stringToArrayBuffer(cert_der));
-      return new Certificate({ schema: cert_asn1.result });
-    };
-    this.parsableLoadedCert = this.certSchema(loadedCert);
-    this.parsableUnsupportedCert = this.certSchema(unsupportedOids);
-  });
-
-  test('it parses a certificate with supported values', async function (assert) {
-    assert.expect(2);
-    // certificate contains all allowable params
-    const parsedCert = parseCertificate(loadedCert);
-    assert.propEqual(
-      parsedCert,
-      {
-        alt_names: 'altname1, altname2',
-        can_parse: true,
-        common_name: 'common-name.com',
-        country: 'France',
-        other_sans: '1.3.1.4.1.5.9.2.6;UTF8:some-utf-string',
-        exclude_cn_from_sans: true,
-        ip_sans: '192.158.1.38, 1234:0fd2:5621:0001:0089:0000:0000:4500',
-        key_usage: 'CertSign, CRLSign',
-        locality: 'Paris',
-        max_path_length: 17,
-        not_valid_after: 1678210083,
-        not_valid_before: 1675445253,
-        organization: 'Widget',
-        ou: 'Finance',
-        parsing_errors: [],
-        permitted_dns_domains: 'dnsname1.com, dsnname2.com',
-        postal_code: '123456',
-        province: 'Champagne',
-        subject_serial_number: 'cereal1292',
-        signature_bits: '256',
-        street_address: '234 sesame',
-        ttl: '768h',
-        uri_sans: 'testuri1, testuri2',
-        use_pss: false,
-      },
-      'it contains expected attrs, cn is excluded from alt_names (exclude_cn_from_sans: true) and ipV6 is compressed correctly'
-    );
-    assert.ok(
-      isSameDay(
-        addHours(fromUnixTime(parsedCert.not_valid_before), Number(parsedCert.ttl.split('h')[0])),
-        fromUnixTime(parsedCert.not_valid_after),
-        'ttl value is correct'
-      )
-    );
-  });
-
-  test('it parses a certificate with use_pass=true and exclude_cn_from_sans=false', async function (assert) {
-    assert.expect(2);
-    const parsedPssCert = parseCertificate(pssTrueCert);
-    assert.propContains(
-      parsedPssCert,
-      { signature_bits: '256', ttl: '768h', use_pss: true },
-      'returns signature_bits value and use_pss is true'
-    );
-    assert.propContains(
-      parsedPssCert,
-      {
-        alt_names: 'common-name.com',
-        can_parse: true,
-        common_name: 'common-name.com',
-        exclude_cn_from_sans: false,
-      },
-      'common name is included in alt_names'
-    );
-  });
-
-  test('it returns parsing_errors when certificate has unsupported values', async function (assert) {
-    assert.expect(2);
-    const parsedCert = parseCertificate(unsupportedOids); // contains unsupported subject and extension OIDs
-    const parsingErrors = this.getErrorMessages(parsedCert.parsing_errors);
-    assert.propContains(
-      parsedCert,
-      {
-        alt_names: 'dns-NameSupported',
-        common_name: 'fancy-cert-unsupported-subj-and-ext-oids',
-        ip_sans: '192.158.1.38',
-        parsing_errors: [{}, {}],
-        uri_sans: 'uriSupported',
-      },
-      'supported values are present when unsupported values exist'
-    );
-    assert.propEqual(
-      parsingErrors,
-      [
-        'certificate contains unsupported subject OIDs: 1.2.840.113549.1.9.1',
-        'certificate contains unsupported extension OIDs: 2.5.29.37',
-      ],
-      'it contains expected error messages'
-    );
-  });
-
-  test('it returns attr with a null value if nonexistent', async function (assert) {
-    assert.expect(1);
-    const onlyHasCommonName = parseCertificate(skeletonCert);
-    assert.propContains(
-      onlyHasCommonName,
-      {
-        alt_names: 'common-name.com',
-        common_name: 'common-name.com',
-        country: null,
-        ip_sans: null,
-        locality: null,
-        max_path_length: undefined,
-        organization: null,
-        ou: null,
-        postal_code: null,
-        province: null,
-        subject_serial_number: null,
-        street_address: null,
-        uri_sans: null,
-      },
-      'it contains expected attrs'
-    );
-  });
-
-  test('the helper parseSubject returns object with correct key/value pairs', async function (assert) {
-    assert.expect(3);
-    const supportedSubj = parseSubject(this.parsableLoadedCert.subject.typesAndValues);
-    assert.propEqual(
-      supportedSubj,
-      {
-        subjErrors: [],
-        subjValues: {
-          common_name: 'common-name.com',
-          country: 'France',
-          locality: 'Paris',
-          organization: 'Widget',
-          ou: 'Finance',
-          postal_code: '123456',
-          province: 'Champagne',
-          subject_serial_number: 'cereal1292',
-          street_address: '234 sesame',
-        },
-      },
-      'it returns supported subject values'
-    );
-
-    const unsupportedSubj = parseSubject(this.parsableUnsupportedCert.subject.typesAndValues);
-    assert.propEqual(
-      this.getErrorMessages(unsupportedSubj.subjErrors),
-      ['certificate contains unsupported subject OIDs: 1.2.840.113549.1.9.1'],
-      'it returns subject errors'
-    );
-    assert.ok(
-      unsupportedSubj.subjErrors.every((e) => e instanceof Error),
-      'subjErrors contain error objects'
-    );
-  });
-
-  test('the helper parseExtensions returns object with correct key/value pairs', async function (assert) {
-    assert.expect(11);
-    // assert supported extensions return correct type
-    const supportedExtensions = parseExtensions(this.parsableLoadedCert.extensions);
-    let { extValues, extErrors } = supportedExtensions;
-    for (const keyName in SAN_TYPES) {
-      assert.ok(Array.isArray(extValues[keyName]), `${keyName} is an array`);
-    }
-    assert.ok(Array.isArray(extValues.permitted_dns_domains), 'permitted_dns_domains is an array');
-    assert.ok(Number.isInteger(extValues.max_path_length), 'max_path_length is an integer');
-    assert.propEqual(extValues.key_usage, ['CertSign', 'CRLSign'], 'parses key_usage');
-    assert.strictEqual(extErrors.length, 0, 'no extension errors');
-
-    // assert unsupported extensions return errors
-    const unsupportedExt = parseExtensions(this.parsableUnsupportedCert.extensions);
-    ({ extValues, extErrors } = unsupportedExt);
-    assert.propEqual(
-      this.getErrorMessages(extErrors),
-      ['certificate contains unsupported extension OIDs: 2.5.29.37'],
-      'it returns extension errors'
-    );
-    assert.ok(
-      extErrors.every((e) => e instanceof Error),
-      'subjErrors contain error objects'
-    );
-    assert.ok(Number.isInteger(extValues.max_path_length), 'max_path_length is an integer');
-  });
-
-  test('the helper formatValues returns object with correct types', async function (assert) {
-    assert.expect(1);
-    const supportedSubj = parseSubject(this.parsableLoadedCert.subject.typesAndValues);
-    const supportedExtensions = parseExtensions(this.parsableLoadedCert.extensions);
-    assert.propContains(
-      formatValues(supportedSubj, supportedExtensions),
-      {
-        alt_names: 'altname1, altname2',
-        ip_sans: '192.158.1.38, 1234:0fd2:5621:0001:0089:0000:0000:4500',
-        permitted_dns_domains: 'dnsname1.com, dsnname2.com',
-        uri_sans: 'testuri1, testuri2',
-        parsing_errors: [],
-        exclude_cn_from_sans: true,
-      },
-      `values for ${Object.keys(SAN_TYPES).join(', ')} are comma separated strings (and no longer arrays)`
-    );
-  });
-
-  test('it fails silently when passed null', async function (assert) {
-    assert.expect(3);
-    const parsedCert = parseCertificate(certWithoutCN);
-    assert.propEqual(
-      parsedCert,
-      {
-        can_parse: true,
-        common_name: null,
-        country: null,
-        exclude_cn_from_sans: false,
-        key_usage: null,
-        locality: null,
-        max_path_length: 10,
-        not_valid_after: 1989876490,
-        not_valid_before: 1674516490,
-        organization: null,
-        ou: null,
-        parsing_errors: [{}, {}],
-        postal_code: null,
-        province: null,
-        subject_serial_number: null,
-        signature_bits: '256',
-        street_address: null,
-        ttl: '87600h',
-        use_pss: false,
-      },
-      'it parses a cert without CN'
-    );
-    const parsingErrors = this.getErrorMessages(parsedCert.parsing_errors);
-    assert.propEqual(
-      parsingErrors,
-      [
-        'certificate contains unsupported subject OIDs: 1.2.840.113549.1.9.1',
-        'certificate contains unsupported extension OIDs: 2.5.29.37',
-      ],
-      'it returns correct errors'
-    );
-    assert.propEqual(
-      formatValues(null, null),
-      { parsing_errors: [Error('error parsing certificate')] },
-      'it returns error if unable to format values'
-    );
-  });
-});
diff --git a/ui/tests/pages/access/identity/aliases/add.js b/ui/tests/pages/access/identity/aliases/add.js
index c5dd0d1070a77..674bd46c18e7c 100644
--- a/ui/tests/pages/access/identity/aliases/add.js
+++ b/ui/tests/pages/access/identity/aliases/add.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { create, visitable } from 'ember-cli-page-object';
 import editForm from 'vault/tests/pages/components/identity/edit-form';
 
diff --git a/ui/tests/pages/access/identity/aliases/index.js b/ui/tests/pages/access/identity/aliases/index.js
index 601572422cc60..4cb21b1c804a5 100644
--- a/ui/tests/pages/access/identity/aliases/index.js
+++ b/ui/tests/pages/access/identity/aliases/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { create, clickable, text, visitable, collection } from 'ember-cli-page-object';
 import flashMessage from 'vault/tests/pages/components/flash-message';
 
diff --git a/ui/tests/pages/access/identity/aliases/show.js b/ui/tests/pages/access/identity/aliases/show.js
index 362614435a729..d12dc6c33add4 100644
--- a/ui/tests/pages/access/identity/aliases/show.js
+++ b/ui/tests/pages/access/identity/aliases/show.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { create, clickable, collection, contains, visitable } from 'ember-cli-page-object';
 import flashMessage from 'vault/tests/pages/components/flash-message';
 import infoTableRow from 'vault/tests/pages/components/info-table-row';
diff --git a/ui/tests/pages/access/identity/create.js b/ui/tests/pages/access/identity/create.js
index 6ff4bcc210004..eff90395b4d63 100644
--- a/ui/tests/pages/access/identity/create.js
+++ b/ui/tests/pages/access/identity/create.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { create, visitable } from 'ember-cli-page-object';
 import editForm from 'vault/tests/pages/components/identity/edit-form';
 
diff --git a/ui/tests/pages/access/identity/index.js b/ui/tests/pages/access/identity/index.js
index acc21d67904f1..8259ed384ec53 100644
--- a/ui/tests/pages/access/identity/index.js
+++ b/ui/tests/pages/access/identity/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { create, clickable, text, visitable, collection } from 'ember-cli-page-object';
 import flashMessage from 'vault/tests/pages/components/flash-message';
 
diff --git a/ui/tests/pages/access/identity/show.js b/ui/tests/pages/access/identity/show.js
index 060bf3a0314ff..12971978a53aa 100644
--- a/ui/tests/pages/access/identity/show.js
+++ b/ui/tests/pages/access/identity/show.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { create, clickable, collection, contains, visitable } from 'ember-cli-page-object';
 import flashMessage from 'vault/tests/pages/components/flash-message';
 import infoTableRow from 'vault/tests/pages/components/info-table-row';
diff --git a/ui/tests/pages/access/methods.js b/ui/tests/pages/access/methods.js
index c4066906fa2dc..d8835dae26e24 100644
--- a/ui/tests/pages/access/methods.js
+++ b/ui/tests/pages/access/methods.js
@@ -1,17 +1,12 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { create, attribute, visitable, collection, hasClass, text } from 'ember-cli-page-object';
 
 export default create({
   visit: visitable('/vault/access/'),
-  methodsLink: {
+  navLinks: collection('[data-test-link]', {
     isActive: hasClass('active'),
     text: text(),
-    scope: '[data-test-sidebar-nav-link="Authentication methods"]',
-  },
+    scope: '[data-test-sidebar]',
+  }),
 
   backendLinks: collection('[data-test-auth-backend-link]', {
     path: text('[data-test-path]'),
diff --git a/ui/tests/pages/access/namespaces/index.js b/ui/tests/pages/access/namespaces/index.js
index f67e0d12e49d5..8eb174bc4ff80 100644
--- a/ui/tests/pages/access/namespaces/index.js
+++ b/ui/tests/pages/access/namespaces/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { create, visitable } from 'ember-cli-page-object';
 
 export default create({
diff --git a/ui/tests/pages/auth.js b/ui/tests/pages/auth.js
index 04a55f6bec3dd..99515e9afb12f 100644
--- a/ui/tests/pages/auth.js
+++ b/ui/tests/pages/auth.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { create, visitable, fillable, clickable } from 'ember-cli-page-object';
 import { settled } from '@ember/test-helpers';
 import VAULT_KEYS from 'vault/tests/helpers/vault-keys';
@@ -16,11 +11,7 @@ export default create({
   tokenInput: fillable('[data-test-token]'),
   usernameInput: fillable('[data-test-username]'),
   passwordInput: fillable('[data-test-password]'),
-  namespaceInput: fillable('[data-test-auth-form-ns-input]'),
-  optionsToggle: clickable('[data-test-auth-form-options-toggle]'),
-  mountPath: fillable('[data-test-auth-form-mount-path]'),
-
-  login: async function (token = rootToken) {
+  login: async function (token) {
     // make sure we're always logged out and logged back in
     await this.logout();
     await settled();
@@ -28,34 +19,24 @@ export default create({
     window.localStorage.clear();
     await this.visit({ with: 'token' });
     await settled();
-    return this.tokenInput(token).submit();
+    if (token) {
+      await this.tokenInput(token).submit();
+      return;
+    }
+
+    await this.tokenInput(rootToken).submit();
+    return;
   },
-  loginUsername: async function (username, password, path) {
+  loginUsername: async function (username, password) {
     // make sure we're always logged out and logged back in
     await this.logout();
     await settled();
     // clear local storage to ensure we have a clean state
     window.localStorage.clear();
-    await this.visit({ with: 'userpass' });
+    await this.visit({ with: 'username' });
     await settled();
-    if (path) {
-      await this.optionsToggle();
-      await this.mountPath(path);
-    }
     await this.usernameInput(username);
-    return this.passwordInput(password).submit();
-  },
-  loginNs: async function (ns) {
-    // make sure we're always logged out and logged back in
-    await this.logout();
-    await settled();
-    // clear session storage to ensure we have a clean state
-    window.localStorage.clear();
-    await this.visit({ with: 'token' });
-    await settled();
-    await this.namespaceInput(ns);
-    await settled();
-    await this.tokenInput(rootToken).submit();
+    await this.passwordInput(password).submit();
     return;
   },
 });
diff --git a/ui/tests/pages/components/alert-banner.js b/ui/tests/pages/components/alert-banner.js
index 424d5e8ea3210..069771e56f816 100644
--- a/ui/tests/pages/components/alert-banner.js
+++ b/ui/tests/pages/components/alert-banner.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { text } from 'ember-cli-page-object';
 
 export default {
diff --git a/ui/tests/pages/components/auth-config-form/options.js b/ui/tests/pages/components/auth-config-form/options.js
index 3b5d76b54c600..0aef0cc415732 100644
--- a/ui/tests/pages/components/auth-config-form/options.js
+++ b/ui/tests/pages/components/auth-config-form/options.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { clickable, fillable } from 'ember-cli-page-object';
 
 import fields from '../form-field';
diff --git a/ui/tests/pages/components/auth-form.js b/ui/tests/pages/components/auth-form.js
index 3924dac433b56..07d5efc5f0ca6 100644
--- a/ui/tests/pages/components/auth-form.js
+++ b/ui/tests/pages/components/auth-form.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { collection, clickable, fillable, text, value, isPresent } from 'ember-cli-page-object';
 
 export default {
diff --git a/ui/tests/pages/components/auth-jwt.js b/ui/tests/pages/components/auth-jwt.js
index 6773b19f34381..166cd94c5596a 100644
--- a/ui/tests/pages/components/auth-jwt.js
+++ b/ui/tests/pages/components/auth-jwt.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { text, isPresent, clickable, fillable } from 'ember-cli-page-object';
 
 export default {
diff --git a/ui/tests/pages/components/calendar-widget.js b/ui/tests/pages/components/calendar-widget.js
index e1e1add7b37c7..09bc71c640ab6 100644
--- a/ui/tests/pages/components/calendar-widget.js
+++ b/ui/tests/pages/components/calendar-widget.js
@@ -1,18 +1,12 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { clickable, create, isPresent } from 'ember-cli-page-object';
 
 export default create({
   clickPreviousYear: clickable('[data-test-previous-year]'),
-  clickCurrentMonth: clickable('[data-test-current-month]'),
   clickCurrentBillingPeriod: clickable('[data-test-current-billing-period]'),
   customEndMonthBtn: clickable('[data-test-show-calendar]'),
-  menuToggle: clickable('[data-test-calendar-widget-trigger]'),
+  menuToggle: clickable('[data-test-popup-menu-trigger="true"]'),
   showsCalendar: isPresent('[data-test-calendar-widget-container]'),
-  dateRangeTrigger: '[data-test-show-calendar]',
+
   async openCalendar() {
     await this.menuToggle();
     await this.customEndMonthBtn();
diff --git a/ui/tests/pages/components/console/ui-panel.js b/ui/tests/pages/components/console/ui-panel.js
index 00d2cf03cc80a..9333ef4ddad2e 100644
--- a/ui/tests/pages/components/console/ui-panel.js
+++ b/ui/tests/pages/components/console/ui-panel.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { text, triggerable, clickable, collection, fillable, value, isPresent } from 'ember-cli-page-object';
 import { getter } from 'ember-cli-page-object/macros';
 import { settled } from '@ember/test-helpers';
@@ -18,22 +13,22 @@ export default {
     text: text(),
   }),
   lastLogOutput: getter(function () {
-    const count = this.logOutputItems.length;
-    const outputItemText = this.logOutputItems.objectAt(count - 1).text;
+    let count = this.logOutputItems.length;
+    let outputItemText = this.logOutputItems.objectAt(count - 1).text;
     return outputItemText;
   }),
   logTextItems: collection('[data-test-component="console/log-text"]', {
     text: text(),
   }),
   lastTextOutput: getter(function () {
-    const count = this.logTextItems.length;
+    let count = this.logTextItems.length;
     return this.logTextItems.objectAt(count - 1).text;
   }),
   logJSONItems: collection('[data-test-component="console/log-json"]', {
     text: text(),
   }),
   lastJSONOutput: getter(function () {
-    const count = this.logJSONItems.length;
+    let count = this.logJSONItems.length;
     return this.logJSONItems.objectAt(count - 1).text;
   }),
   up: triggerable('keyup', '[data-test-component="console/command-input"] input', {
@@ -47,8 +42,8 @@ export default {
   }),
   hasInput: isPresent('[data-test-component="console/command-input"] input'),
   runCommands: async function (commands) {
-    const toExecute = Array.isArray(commands) ? commands : [commands];
-    for (const command of toExecute) {
+    let toExecute = Array.isArray(commands) ? commands : [commands];
+    for (let command of toExecute) {
       await this.consoleInput(command);
       await this.enter();
       await settled();
diff --git a/ui/tests/pages/components/control-group-success.js b/ui/tests/pages/components/control-group-success.js
index ea3917313a9de..f34cc089b64bd 100644
--- a/ui/tests/pages/components/control-group-success.js
+++ b/ui/tests/pages/components/control-group-success.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { isPresent, fillable, clickable } from 'ember-cli-page-object';
 
 export default {
diff --git a/ui/tests/pages/components/control-group.js b/ui/tests/pages/components/control-group.js
index 6e304bed43e78..72ba1c8d00d7d 100644
--- a/ui/tests/pages/components/control-group.js
+++ b/ui/tests/pages/components/control-group.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { isPresent, clickable, text } from 'ember-cli-page-object';
 
 export default {
diff --git a/ui/tests/pages/components/edit-form.js b/ui/tests/pages/components/edit-form.js
index 00c3bb4e31879..259f8099d808e 100644
--- a/ui/tests/pages/components/edit-form.js
+++ b/ui/tests/pages/components/edit-form.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { clickable, isPresent, text } from 'ember-cli-page-object';
 import fields from './form-field';
 export default {
diff --git a/ui/tests/pages/components/flash-message.js b/ui/tests/pages/components/flash-message.js
index dbf3dd06c8811..74f716ffb9612 100644
--- a/ui/tests/pages/components/flash-message.js
+++ b/ui/tests/pages/components/flash-message.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { waitFor, settled } from '@ember/test-helpers';
 import { collection, text, clickable } from 'ember-cli-page-object';
 import { getter } from 'ember-cli-page-object/macros';
@@ -26,7 +21,7 @@ export default {
     return this.latestItem.click();
   },
   async clickAll() {
-    for (const message of this.messages) {
+    for (let message of this.messages) {
       message.click();
     }
     await settled();
diff --git a/ui/tests/pages/components/form-field.js b/ui/tests/pages/components/form-field.js
index 76f72499d0c4d..fba064e340bd3 100644
--- a/ui/tests/pages/components/form-field.js
+++ b/ui/tests/pages/components/form-field.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import {
   attribute,
   focusable,
diff --git a/ui/tests/pages/components/hover-copy-button.js b/ui/tests/pages/components/hover-copy-button.js
index 644086da5c39e..aec760d64ddbc 100644
--- a/ui/tests/pages/components/hover-copy-button.js
+++ b/ui/tests/pages/components/hover-copy-button.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { attribute, clickable, isVisible, focusable, text } from 'ember-cli-page-object';
 import { triggerEvent, focus } from '@ember/test-helpers';
 
diff --git a/ui/tests/pages/components/identity/edit-form.js b/ui/tests/pages/components/identity/edit-form.js
index c5f50bb7da0de..90fd8d2a9de01 100644
--- a/ui/tests/pages/components/identity/edit-form.js
+++ b/ui/tests/pages/components/identity/edit-form.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { clickable, fillable, attribute } from 'ember-cli-page-object';
 import { waitFor } from '@ember/test-helpers';
 import fields from '../form-field';
diff --git a/ui/tests/pages/components/identity/item-details.js b/ui/tests/pages/components/identity/item-details.js
index 69f3ad0ad8aea..9a10b66f732af 100644
--- a/ui/tests/pages/components/identity/item-details.js
+++ b/ui/tests/pages/components/identity/item-details.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { clickable } from 'ember-cli-page-object';
 
 export default {
diff --git a/ui/tests/pages/components/info-table-row.js b/ui/tests/pages/components/info-table-row.js
index 98fe8ff559b72..9a404f97ae0a1 100644
--- a/ui/tests/pages/components/info-table-row.js
+++ b/ui/tests/pages/components/info-table-row.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { text, isPresent } from 'ember-cli-page-object';
 
 export default {
diff --git a/ui/tests/pages/components/json-editor.js b/ui/tests/pages/components/json-editor.js
index 7b5b9c1e977d5..1208110cb0283 100644
--- a/ui/tests/pages/components/json-editor.js
+++ b/ui/tests/pages/components/json-editor.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { isPresent, notHasClass, text } from 'ember-cli-page-object';
 
 export default {
diff --git a/ui/tests/pages/components/kv-object-editor.js b/ui/tests/pages/components/kv-object-editor.js
index 9d89d32bd4be9..88ad66cde44b2 100644
--- a/ui/tests/pages/components/kv-object-editor.js
+++ b/ui/tests/pages/components/kv-object-editor.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { clickable, collection, fillable, isPresent } from 'ember-cli-page-object';
 
 export default {
diff --git a/ui/tests/pages/components/license-info.js b/ui/tests/pages/components/license-info.js
index ba4a7a6e9b9de..0cb51c578fab3 100644
--- a/ui/tests/pages/components/license-info.js
+++ b/ui/tests/pages/components/license-info.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { text, collection } from 'ember-cli-page-object';
 
 export default {
diff --git a/ui/tests/pages/components/list-view.js b/ui/tests/pages/components/list-view.js
index 3055ff6cb61c5..90ef015f4341d 100644
--- a/ui/tests/pages/components/list-view.js
+++ b/ui/tests/pages/components/list-view.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { text, isPresent, collection, clickable } from 'ember-cli-page-object';
 
 export default {
diff --git a/ui/tests/pages/components/masked-input.js b/ui/tests/pages/components/masked-input.js
index 61ec76b25be55..611073269abeb 100644
--- a/ui/tests/pages/components/masked-input.js
+++ b/ui/tests/pages/components/masked-input.js
@@ -1,13 +1,7 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { clickable, isPresent } from 'ember-cli-page-object';
 
 export default {
   textareaIsPresent: isPresent('[data-test-textarea]'),
   copyButtonIsPresent: isPresent('[data-test-copy-button]'),
-  downloadButtonIsPresent: isPresent('[data-test-download-button]'),
-  toggleMasked: clickable('[data-test-button="toggle-masked"]'),
+  toggleMasked: clickable('[data-test-button]'),
 };
diff --git a/ui/tests/pages/components/mount-backend-form.js b/ui/tests/pages/components/mount-backend-form.js
index 150363afda520..b752c7d5870cb 100644
--- a/ui/tests/pages/components/mount-backend-form.js
+++ b/ui/tests/pages/components/mount-backend-form.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { clickable, collection, fillable, text, value, attribute } from 'ember-cli-page-object';
 import fields from './form-field';
 import errorText from './alert-banner';
diff --git a/ui/tests/pages/components/nav-header.js b/ui/tests/pages/components/nav-header.js
new file mode 100644
index 0000000000000..de17c2be1826c
--- /dev/null
+++ b/ui/tests/pages/components/nav-header.js
@@ -0,0 +1,8 @@
+import { text, isPresent } from 'ember-cli-page-object';
+
+export default {
+  ele: isPresent('[data-test-navheader]'),
+  homeText: text('[data-test-navheader-home]'),
+  itemsText: text('[data-test-navheader-items]'),
+  mainText: text('[data-test-navheader-main]'),
+};
diff --git a/ui/tests/pages/components/pki/config-pki-ca.js b/ui/tests/pages/components/pki/config-pki-ca.js
new file mode 100644
index 0000000000000..eafb9fdadb557
--- /dev/null
+++ b/ui/tests/pages/components/pki/config-pki-ca.js
@@ -0,0 +1,49 @@
+import { clickable, collection, fillable, text, selectable, isPresent } from 'ember-cli-page-object';
+
+import fields from '../form-field';
+
+export default {
+  ...fields,
+  scope: '.config-pki-ca',
+  text: text('[data-test-text]'),
+  title: text('[data-test-title]'),
+
+  hasTitle: isPresent('[data-test-title]'),
+  hasError: isPresent('[data-test-error]'),
+  hasSignIntermediateForm: isPresent('[data-test-sign-intermediate-form]'),
+
+  replaceCA: clickable('[data-test-go-replace-ca]'),
+  replaceCAText: text('[data-test-go-replace-ca]'),
+  setSignedIntermediateBtn: clickable('[data-test-go-set-signed-intermediate]'),
+  signIntermediateBtn: clickable('[data-test-go-sign-intermediate]'),
+  caType: selectable('[data-test-input="caType"]'),
+  submit: clickable('[data-test-submit]'),
+  back: clickable('[data-test-back-button]'),
+
+  signedIntermediate: fillable('[data-test-signed-intermediate]'),
+  downloadLinks: collection('[data-test-ca-download-link]'),
+  rows: collection('[data-test-table-row]'),
+  rowValues: collection('[data-test-row-value]'),
+  csr: text('[data-test-row-value="CSR"]', { normalize: false }),
+  csrField: fillable('[data-test-input="csr"]'),
+  certificate: text('[data-test-row-value="Certificate"]', { normalize: false }),
+  uploadCert: clickable('[data-test-input="uploadPemBundle"]'),
+  enterCertAsText: clickable('[data-test-text-toggle]'),
+  pemBundle: fillable('[data-test-text-file-textarea]'),
+  commonName: fillable('[data-test-input="commonName"]'),
+
+  async generateCA(commonName = 'PKI CA', type = 'root') {
+    if (type === 'intermediate') {
+      return await this.replaceCA().commonName(commonName).caType('intermediate').submit();
+    }
+    return await this.replaceCA().commonName(commonName).submit();
+  },
+
+  async uploadCA(pem) {
+    return await this.replaceCA().uploadCert().enterCertAsText().pemBundle(pem).submit();
+  },
+
+  async signIntermediate(commonName) {
+    return await this.signIntermediateBtn().commonName(commonName);
+  },
+};
diff --git a/ui/tests/pages/components/pki/config-pki.js b/ui/tests/pages/components/pki/config-pki.js
new file mode 100644
index 0000000000000..b8ced04c6fb61
--- /dev/null
+++ b/ui/tests/pages/components/pki/config-pki.js
@@ -0,0 +1,15 @@
+import { clickable, fillable, text, isPresent } from 'ember-cli-page-object';
+import fields from '../form-field';
+
+export default {
+  ...fields,
+  scope: '.config-pki',
+  text: text('[data-test-text]'),
+  title: text('[data-test-title]'),
+  hasTitle: isPresent('[data-test-title]'),
+  hasError: isPresent('[data-test-error]'),
+  submit: clickable('[data-test-submit]'),
+  enableTtl: clickable('[data-test-toggle-input]'),
+  fillInValue: fillable('[data-test-ttl-value]'),
+  fillInUnit: fillable('[data-test-select="ttl-unit"]'),
+};
diff --git a/ui/tests/pages/components/radial-progress.js b/ui/tests/pages/components/radial-progress.js
index dddad3a73a655..7d1e1acda205e 100644
--- a/ui/tests/pages/components/radial-progress.js
+++ b/ui/tests/pages/components/radial-progress.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { attribute } from 'ember-cli-page-object';
 
 export default {
diff --git a/ui/tests/pages/components/search-select.js b/ui/tests/pages/components/search-select.js
index 650e2aa01c3e8..8e05a5b62a4cb 100644
--- a/ui/tests/pages/components/search-select.js
+++ b/ui/tests/pages/components/search-select.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { isPresent, collection, text, clickable } from 'ember-cli-page-object';
 
 export default {
diff --git a/ui/tests/pages/components/wizard/features-selection.js b/ui/tests/pages/components/wizard/features-selection.js
index 1f62198b1e372..caa84ad9ccc2d 100644
--- a/ui/tests/pages/components/wizard/features-selection.js
+++ b/ui/tests/pages/components/wizard/features-selection.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { collection, isPresent, property, clickable } from 'ember-cli-page-object';
 
 export default {
diff --git a/ui/tests/pages/init.js b/ui/tests/pages/init.js
index 655cb8f647b0f..86677c8c76602 100644
--- a/ui/tests/pages/init.js
+++ b/ui/tests/pages/init.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { text, create, collection, visitable, fillable, clickable } from 'ember-cli-page-object';
 
 export default create({
diff --git a/ui/tests/pages/logout.js b/ui/tests/pages/logout.js
index 024e52412ab3f..c250cdc9d3393 100644
--- a/ui/tests/pages/logout.js
+++ b/ui/tests/pages/logout.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { create, visitable } from 'ember-cli-page-object';
 
 export default create({
diff --git a/ui/tests/pages/policies/create.js b/ui/tests/pages/policies/create.js
index d9d70673fa2c1..6cad299192440 100644
--- a/ui/tests/pages/policies/create.js
+++ b/ui/tests/pages/policies/create.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { create, visitable } from 'ember-cli-page-object';
 export default create({
   visit: visitable('/vault/policies/create'),
diff --git a/ui/tests/pages/policies/index.js b/ui/tests/pages/policies/index.js
index 954a47d085360..16b99d704d77f 100644
--- a/ui/tests/pages/policies/index.js
+++ b/ui/tests/pages/policies/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { text, create, collection, clickable, visitable } from 'ember-cli-page-object';
 export default create({
   visit: visitable('/vault/policies/:type'),
diff --git a/ui/tests/pages/policy/edit.js b/ui/tests/pages/policy/edit.js
index a63aa83d5d041..8250b3d72ccb1 100644
--- a/ui/tests/pages/policy/edit.js
+++ b/ui/tests/pages/policy/edit.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { clickable, create, isPresent, visitable } from 'ember-cli-page-object';
 export default create({
   visit: visitable('/vault/policy/:type/:name/edit'),
diff --git a/ui/tests/pages/policy/show.js b/ui/tests/pages/policy/show.js
index 4e2397bd950db..ef82d4ad08ab4 100644
--- a/ui/tests/pages/policy/show.js
+++ b/ui/tests/pages/policy/show.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { clickable, create, visitable } from 'ember-cli-page-object';
 export default create({
   visit: visitable('/vault/policy/:type/:name'),
diff --git a/ui/tests/pages/secrets/backend/configuration.js b/ui/tests/pages/secrets/backend/configuration.js
index 2ea641a0d8b98..be630bc0e0688 100644
--- a/ui/tests/pages/secrets/backend/configuration.js
+++ b/ui/tests/pages/secrets/backend/configuration.js
@@ -1,12 +1,7 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { create, visitable, text } from 'ember-cli-page-object';
 
 export default create({
   visit: visitable('/vault/secrets/:backend/configuration'),
-  defaultTTL: text('[data-test-value-div="Default Lease TTL"]'),
-  maxTTL: text('[data-test-value-div="Max Lease TTL"]'),
+  defaultTTL: text('[data-test-row-value="Default Lease TTL"]'),
+  maxTTL: text('[data-test-row-value="Max Lease TTL"]'),
 });
diff --git a/ui/tests/pages/secrets/backend/create.js b/ui/tests/pages/secrets/backend/create.js
index 94536724e0022..235499247ae09 100644
--- a/ui/tests/pages/secrets/backend/create.js
+++ b/ui/tests/pages/secrets/backend/create.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { create, visitable } from 'ember-cli-page-object';
 
 export const Base = {
diff --git a/ui/tests/pages/secrets/backend/credentials.js b/ui/tests/pages/secrets/backend/credentials.js
index a303338fb1240..9383d60093e1f 100644
--- a/ui/tests/pages/secrets/backend/credentials.js
+++ b/ui/tests/pages/secrets/backend/credentials.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { create, visitable } from 'ember-cli-page-object';
 
 export const Base = {
diff --git a/ui/tests/pages/secrets/backend/database/connection.js b/ui/tests/pages/secrets/backend/database/connection.js
index 876ea22573364..ce4eab03e1c8d 100644
--- a/ui/tests/pages/secrets/backend/database/connection.js
+++ b/ui/tests/pages/secrets/backend/database/connection.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { create, clickable, fillable, visitable, selectable } from 'ember-cli-page-object';
 import ListView from 'vault/tests/pages/components/list-view';
 
diff --git a/ui/tests/pages/secrets/backend/database/role.js b/ui/tests/pages/secrets/backend/database/role.js
index 6634f11f952e6..7f7d270bd9e17 100644
--- a/ui/tests/pages/secrets/backend/database/role.js
+++ b/ui/tests/pages/secrets/backend/database/role.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { create, clickable, fillable, visitable, selectable } from 'ember-cli-page-object';
 import ListView from 'vault/tests/pages/components/list-view';
 
diff --git a/ui/tests/pages/secrets/backend/edit.js b/ui/tests/pages/secrets/backend/edit.js
index ee60f8e42b047..029e8cbcbae6e 100644
--- a/ui/tests/pages/secrets/backend/edit.js
+++ b/ui/tests/pages/secrets/backend/edit.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { create, visitable } from 'ember-cli-page-object';
 
 export default create({
diff --git a/ui/tests/pages/secrets/backend/kmip/credentials.js b/ui/tests/pages/secrets/backend/kmip/credentials.js
index 8dcb670fc2787..a1938a0f27f37 100644
--- a/ui/tests/pages/secrets/backend/kmip/credentials.js
+++ b/ui/tests/pages/secrets/backend/kmip/credentials.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { create, clickable, visitable } from 'ember-cli-page-object';
 import ListView from 'vault/tests/pages/components/list-view';
 
@@ -11,7 +6,9 @@ export default create({
   visit: visitable('/vault/secrets/:backend/kmip/scopes/:scope/roles/:role/credentials'),
   visitDetail: visitable('/vault/secrets/:backend/kmip/scopes/:scope/roles/:role/credentials/:serial'),
   create: clickable('[data-test-role-create]'),
+  credentialsLink: clickable('[data-test-kmip-link-credentials]'),
   generateCredentialsLink: clickable('[data-test-kmip-link-generate-credentials]'),
+  roleDetailsLink: clickable('[data-test-kmip-link-role-details]'),
   backToRoleLink: clickable('[data-test-kmip-link-back-to-role]'),
   submit: clickable('[data-test-edit-form-submit]'),
 });
diff --git a/ui/tests/pages/secrets/backend/kmip/roles.js b/ui/tests/pages/secrets/backend/kmip/roles.js
index 954ba19130295..7ef92ac8aeedd 100644
--- a/ui/tests/pages/secrets/backend/kmip/roles.js
+++ b/ui/tests/pages/secrets/backend/kmip/roles.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { create, clickable, fillable, visitable } from 'ember-cli-page-object';
 import ListView from 'vault/tests/pages/components/list-view';
 
diff --git a/ui/tests/pages/secrets/backend/kmip/scopes.js b/ui/tests/pages/secrets/backend/kmip/scopes.js
index 84171ff22be6c..20506780c9259 100644
--- a/ui/tests/pages/secrets/backend/kmip/scopes.js
+++ b/ui/tests/pages/secrets/backend/kmip/scopes.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { create, clickable, fillable, visitable } from 'ember-cli-page-object';
 import ListView from 'vault/tests/pages/components/list-view';
 
diff --git a/ui/tests/pages/secrets/backend/kv/edit-secret.js b/ui/tests/pages/secrets/backend/kv/edit-secret.js
index 5d5797a21f08b..de7266ad0a585 100644
--- a/ui/tests/pages/secrets/backend/kv/edit-secret.js
+++ b/ui/tests/pages/secrets/backend/kv/edit-secret.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { Base } from '../create';
 import { isPresent, clickable, visitable, create, fillable } from 'ember-cli-page-object';
 
diff --git a/ui/tests/pages/secrets/backend/kv/show.js b/ui/tests/pages/secrets/backend/kv/show.js
index 09edf0dbf257e..101d55b6ca857 100644
--- a/ui/tests/pages/secrets/backend/kv/show.js
+++ b/ui/tests/pages/secrets/backend/kv/show.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { Base } from '../show';
 import { create, clickable, collection, isPresent, text } from 'ember-cli-page-object';
 
diff --git a/ui/tests/pages/secrets/backend/list.js b/ui/tests/pages/secrets/backend/list.js
index 0d4054cb5805a..70b7c8e3e110a 100644
--- a/ui/tests/pages/secrets/backend/list.js
+++ b/ui/tests/pages/secrets/backend/list.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import {
   create,
   collection,
diff --git a/ui/tests/pages/secrets/backend/pki/edit-role.js b/ui/tests/pages/secrets/backend/pki/edit-role.js
index 6fcddcd68620d..7c0219c4675b4 100644
--- a/ui/tests/pages/secrets/backend/pki/edit-role.js
+++ b/ui/tests/pages/secrets/backend/pki/edit-role.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { Base } from '../create';
 import { settled } from '@ember/test-helpers';
 import { clickable, visitable, create, fillable } from 'ember-cli-page-object';
diff --git a/ui/tests/pages/secrets/backend/pki/generate-cert.js b/ui/tests/pages/secrets/backend/pki/generate-cert.js
index c73c026f4086a..4b77843bdc5cf 100644
--- a/ui/tests/pages/secrets/backend/pki/generate-cert.js
+++ b/ui/tests/pages/secrets/backend/pki/generate-cert.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { Base } from '../credentials';
 import { clickable, text, value, create, fillable, isPresent } from 'ember-cli-page-object';
 
diff --git a/ui/tests/pages/secrets/backend/pki/show.js b/ui/tests/pages/secrets/backend/pki/show.js
index fe607e61bfe71..901940e09b29f 100644
--- a/ui/tests/pages/secrets/backend/pki/show.js
+++ b/ui/tests/pages/secrets/backend/pki/show.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { Base } from '../show';
 import { settled } from '@ember/test-helpers';
 import { create, clickable, collection, text, isPresent } from 'ember-cli-page-object';
diff --git a/ui/tests/pages/secrets/backend/show.js b/ui/tests/pages/secrets/backend/show.js
index ab66cc0295cbf..78acd3ae6210c 100644
--- a/ui/tests/pages/secrets/backend/show.js
+++ b/ui/tests/pages/secrets/backend/show.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { create, visitable } from 'ember-cli-page-object';
 
 export const Base = {
diff --git a/ui/tests/pages/secrets/backend/ssh/edit-role.js b/ui/tests/pages/secrets/backend/ssh/edit-role.js
index c3b3dc1ed8a95..d48783ea56d14 100644
--- a/ui/tests/pages/secrets/backend/ssh/edit-role.js
+++ b/ui/tests/pages/secrets/backend/ssh/edit-role.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { Base } from '../create';
 import { clickable, visitable, create, fillable } from 'ember-cli-page-object';
 
diff --git a/ui/tests/pages/secrets/backend/ssh/generate-otp.js b/ui/tests/pages/secrets/backend/ssh/generate-otp.js
index f5d07ac0cc29b..c173f098f735f 100644
--- a/ui/tests/pages/secrets/backend/ssh/generate-otp.js
+++ b/ui/tests/pages/secrets/backend/ssh/generate-otp.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { Base } from '../credentials';
 import { clickable, value, create, fillable, isPresent } from 'ember-cli-page-object';
 
diff --git a/ui/tests/pages/secrets/backend/ssh/show.js b/ui/tests/pages/secrets/backend/ssh/show.js
index 4b362e0a0e03a..2ccc8828f5b53 100644
--- a/ui/tests/pages/secrets/backend/ssh/show.js
+++ b/ui/tests/pages/secrets/backend/ssh/show.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { Base } from '../show';
 import { create, clickable, collection, isPresent } from 'ember-cli-page-object';
 
diff --git a/ui/tests/pages/secrets/backend/transform/alphabets.js b/ui/tests/pages/secrets/backend/transform/alphabets.js
index 8d54eb9dcaa5b..51655927b85ec 100644
--- a/ui/tests/pages/secrets/backend/transform/alphabets.js
+++ b/ui/tests/pages/secrets/backend/transform/alphabets.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { create, clickable, fillable, visitable } from 'ember-cli-page-object';
 import ListView from 'vault/tests/pages/components/list-view';
 
diff --git a/ui/tests/pages/secrets/backend/transform/roles.js b/ui/tests/pages/secrets/backend/transform/roles.js
index 82b82e584122f..94f94a0467565 100644
--- a/ui/tests/pages/secrets/backend/transform/roles.js
+++ b/ui/tests/pages/secrets/backend/transform/roles.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { create, clickable, fillable, visitable } from 'ember-cli-page-object';
 import ListView from 'vault/tests/pages/components/list-view';
 
diff --git a/ui/tests/pages/secrets/backend/transform/templates.js b/ui/tests/pages/secrets/backend/transform/templates.js
index a2eac09c87ee4..54c16a52be943 100644
--- a/ui/tests/pages/secrets/backend/transform/templates.js
+++ b/ui/tests/pages/secrets/backend/transform/templates.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { create, clickable, fillable, visitable } from 'ember-cli-page-object';
 import ListView from 'vault/tests/pages/components/list-view';
 
diff --git a/ui/tests/pages/secrets/backend/transform/transformations.js b/ui/tests/pages/secrets/backend/transform/transformations.js
index 4687308758773..4a1e45bd1a2d8 100644
--- a/ui/tests/pages/secrets/backend/transform/transformations.js
+++ b/ui/tests/pages/secrets/backend/transform/transformations.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { create, clickable, fillable, visitable } from 'ember-cli-page-object';
 import ListView from 'vault/tests/pages/components/list-view';
 
diff --git a/ui/tests/pages/secrets/backends.js b/ui/tests/pages/secrets/backends.js
index 1a7d3ebbbfdfa..4f6d20a89c0de 100644
--- a/ui/tests/pages/secrets/backends.js
+++ b/ui/tests/pages/secrets/backends.js
@@ -1,15 +1,10 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { create, visitable, collection, clickable, text } from 'ember-cli-page-object';
 import uiPanel from 'vault/tests/pages/components/console/ui-panel';
 
 export default create({
   consoleToggle: clickable('[data-test-console-toggle]'),
   visit: visitable('/vault/secrets'),
-  rows: collection('[data-test-auth-backend-link]', {
+  rows: collection('[data-test-secret-backend-row]', {
     path: text('[data-test-secret-path]'),
     menu: clickable('[data-test-popup-menu-trigger]'),
   }),
diff --git a/ui/tests/pages/settings/auth/configure/index.js b/ui/tests/pages/settings/auth/configure/index.js
index cd7e6e42fff5f..9058ff08d14a7 100644
--- a/ui/tests/pages/settings/auth/configure/index.js
+++ b/ui/tests/pages/settings/auth/configure/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { create, visitable } from 'ember-cli-page-object';
 
 export default create({
diff --git a/ui/tests/pages/settings/auth/configure/section.js b/ui/tests/pages/settings/auth/configure/section.js
index cac92d674fc3e..649fe42884b8d 100644
--- a/ui/tests/pages/settings/auth/configure/section.js
+++ b/ui/tests/pages/settings/auth/configure/section.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { create, clickable, visitable, collection } from 'ember-cli-page-object';
 import fields from '../../../components/form-field';
 import flashMessage from '../../../components/flash-message';
diff --git a/ui/tests/pages/settings/auth/enable.js b/ui/tests/pages/settings/auth/enable.js
index e75e4cc54d637..98e8d9ab197ff 100644
--- a/ui/tests/pages/settings/auth/enable.js
+++ b/ui/tests/pages/settings/auth/enable.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { create, visitable } from 'ember-cli-page-object';
 import backendForm from '../../components/mount-backend-form';
 import flashMessages from '../../components/flash-message';
diff --git a/ui/tests/pages/settings/configure-secret-backends/pki/index.js b/ui/tests/pages/settings/configure-secret-backends/pki/index.js
new file mode 100644
index 0000000000000..4126da38886e5
--- /dev/null
+++ b/ui/tests/pages/settings/configure-secret-backends/pki/index.js
@@ -0,0 +1,5 @@
+import { create, visitable } from 'ember-cli-page-object';
+
+export default create({
+  visit: visitable('/vault/settings/secrets/configure/:backend/'),
+});
diff --git a/ui/tests/pages/settings/configure-secret-backends/pki/section-cert.js b/ui/tests/pages/settings/configure-secret-backends/pki/section-cert.js
new file mode 100644
index 0000000000000..d42a23d493281
--- /dev/null
+++ b/ui/tests/pages/settings/configure-secret-backends/pki/section-cert.js
@@ -0,0 +1,10 @@
+import { create, visitable } from 'ember-cli-page-object';
+
+import ConfigPKICA from 'vault/tests/pages/components/pki/config-pki-ca';
+import flashMessages from 'vault/tests/pages/components/flash-message';
+
+export default create({
+  visit: visitable('/vault/settings/secrets/configure/:backend/cert'),
+  form: ConfigPKICA,
+  flash: flashMessages,
+});
diff --git a/ui/tests/pages/settings/configure-secret-backends/pki/section.js b/ui/tests/pages/settings/configure-secret-backends/pki/section.js
new file mode 100644
index 0000000000000..f3a7a012c49dd
--- /dev/null
+++ b/ui/tests/pages/settings/configure-secret-backends/pki/section.js
@@ -0,0 +1,14 @@
+import { create, visitable, collection } from 'ember-cli-page-object';
+
+import { getter } from 'ember-cli-page-object/macros';
+import ConfigPKI from 'vault/tests/pages/components/pki/config-pki';
+
+export default create({
+  visit: visitable('/vault/settings/secrets/configure/:backend/:section'),
+  form: ConfigPKI,
+  lastMessage: getter(function () {
+    const count = this.flashMessages.length;
+    return this.flashMessages.objectAt(count - 1).text;
+  }),
+  flashMessages: collection('[data-test-flash-message-body]'),
+});
diff --git a/ui/tests/pages/settings/mount-secret-backend.js b/ui/tests/pages/settings/mount-secret-backend.js
index 4f8492be230d9..05070c7fa3155 100644
--- a/ui/tests/pages/settings/mount-secret-backend.js
+++ b/ui/tests/pages/settings/mount-secret-backend.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { create, visitable, fillable, clickable } from 'ember-cli-page-object';
 import { settled } from '@ember/test-helpers';
 import mountForm from 'vault/tests/pages/components/mount-backend-form';
@@ -10,14 +5,14 @@ import mountForm from 'vault/tests/pages/components/mount-backend-form';
 export default create({
   visit: visitable('/vault/settings/mount-secret-backend'),
   ...mountForm,
-  version: fillable('[data-test-input="version"]'),
+  version: fillable('[data-test-input="options.version"]'),
   setMaxVersion: fillable('[data-test-input="maxVersions"]'),
   enableMaxTtl: clickable('[data-test-toggle-input="Max Lease TTL"]'),
   maxTTLVal: fillable('[data-test-ttl-value="Max Lease TTL"]'),
   maxTTLUnit: fillable('[data-test-ttl-unit="Max Lease TTL"] [data-test-select="ttl-unit"]'),
   enableDefaultTtl: clickable('[data-test-toggle-input="Default Lease TTL"]'),
   enableEngine: clickable('[data-test-enable-engine]'),
-  secretList: clickable('[data-test-sidebar-nav-link="Secrets engines"]'),
+  secretList: clickable('[data-test-navbar-item="secrets"]'),
   defaultTTLVal: fillable('input[data-test-ttl-value="Default Lease TTL"]'),
   defaultTTLUnit: fillable('[data-test-ttl-unit="Default Lease TTL"] [data-test-select="ttl-unit"]'),
   enable: async function (type, path) {
diff --git a/ui/tests/test-helper.js b/ui/tests/test-helper.js
index e57fea1cb8f3f..ecd64d86ac135 100644
--- a/ui/tests/test-helper.js
+++ b/ui/tests/test-helper.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Application from 'vault/app';
 import config from 'vault/config/environment';
 import * as QUnit from 'qunit';
diff --git a/ui/tests/unit/adapters/aws-credential-test.js b/ui/tests/unit/adapters/aws-credential-test.js
index ad5c4867a0bd5..86890c48a5bd5 100644
--- a/ui/tests/unit/adapters/aws-credential-test.js
+++ b/ui/tests/unit/adapters/aws-credential-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import apiStub from 'vault/tests/helpers/noop-all-api-requests';
@@ -27,7 +22,7 @@ module('Unit | Adapter | aws credential', function (hooks) {
     },
   };
 
-  const makeSnapshot = (obj) => {
+  let makeSnapshot = (obj) => {
     obj.role = {
       backend: 'aws',
       name: 'foo',
@@ -74,16 +69,12 @@ module('Unit | Adapter | aws credential', function (hooks) {
   cases.forEach(([description, args, expectedMethod, expectedRequestBody]) => {
     test(`aws-credential: ${description}`, function (assert) {
       assert.expect(3);
-      const adapter = this.owner.lookup('adapter:aws-credential');
+      let adapter = this.owner.lookup('adapter:aws-credential');
       adapter.createRecord(...args);
-      const { method, url, requestBody } = this.server.handledRequests[0];
-      assert.strictEqual(url, '/v1/aws/creds/foo', `calls the correct url`);
-      assert.strictEqual(
-        method,
-        expectedMethod,
-        `${description} uses the correct http verb: ${expectedMethod}`
-      );
-      assert.strictEqual(requestBody, expectedRequestBody ? JSON.stringify(expectedRequestBody) : null);
+      let { method, url, requestBody } = this.server.handledRequests[0];
+      assert.equal(url, '/v1/aws/creds/foo', `calls the correct url`);
+      assert.equal(method, expectedMethod, `${description} uses the correct http verb: ${expectedMethod}`);
+      assert.equal(requestBody, JSON.stringify(expectedRequestBody));
     });
   });
 });
diff --git a/ui/tests/unit/adapters/capabilities-test.js b/ui/tests/unit/adapters/capabilities-test.js
index e64a8a12c19ec..4bf196391afcb 100644
--- a/ui/tests/unit/adapters/capabilities-test.js
+++ b/ui/tests/unit/adapters/capabilities-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { resolve } from 'rsvp';
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
@@ -12,7 +7,7 @@ module('Unit | Adapter | capabilities', function (hooks) {
 
   test('calls the correct url', function (assert) {
     let url, method, options;
-    const adapter = this.owner.factoryFor('adapter:capabilities').create({
+    let adapter = this.owner.factoryFor('adapter:capabilities').create({
       ajax: (...args) => {
         [url, method, options] = args;
         return resolve();
@@ -20,8 +15,8 @@ module('Unit | Adapter | capabilities', function (hooks) {
     });
 
     adapter.findRecord(null, 'capabilities', 'foo');
-    assert.strictEqual(url, '/v1/sys/capabilities-self', 'calls the correct URL');
+    assert.equal(url, '/v1/sys/capabilities-self', 'calls the correct URL');
     assert.deepEqual({ paths: ['foo'] }, options.data, 'data params OK');
-    assert.strictEqual(method, 'POST', 'method OK');
+    assert.equal(method, 'POST', 'method OK');
   });
 });
diff --git a/ui/tests/unit/adapters/clients-activity-test.js b/ui/tests/unit/adapters/clients-activity-test.js
deleted file mode 100644
index 4d37241124fb3..0000000000000
--- a/ui/tests/unit/adapters/clients-activity-test.js
+++ /dev/null
@@ -1,142 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import sinon from 'sinon';
-import { setupTest } from 'ember-qunit';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import { subMonths, fromUnixTime, addMonths } from 'date-fns';
-import { parseAPITimestamp } from 'core/utils/date-formatters';
-import timestamp from 'core/utils/timestamp';
-
-module('Unit | Adapter | clients activity', function (hooks) {
-  setupTest(hooks);
-  setupMirage(hooks);
-
-  hooks.before(function () {
-    sinon.stub(timestamp, 'now').callsFake(() => new Date('2023-01-13T09:30:15'));
-  });
-  hooks.beforeEach(function () {
-    this.store = this.owner.lookup('service:store');
-    this.modelName = 'clients/activity';
-    this.startDate = subMonths(timestamp.now(), 6);
-    this.endDate = timestamp.now();
-    this.readableUnix = (unix) => parseAPITimestamp(fromUnixTime(unix).toISOString(), 'MMMM dd yyyy');
-  });
-  hooks.after(function () {
-    timestamp.now.restore();
-  });
-
-  test('it does not format if both params are timestamp strings', async function (assert) {
-    assert.expect(1);
-    const queryParams = {
-      start_time: { timestamp: this.startDate.toISOString() },
-      end_time: { timestamp: this.endDate.toISOString() },
-    };
-    this.server.get('sys/internal/counters/activity', (schema, req) => {
-      assert.propEqual(req.queryParams, {
-        start_time: this.startDate.toISOString(),
-        end_time: this.endDate.toISOString(),
-      });
-    });
-
-    this.store.queryRecord(this.modelName, queryParams);
-  });
-
-  test('it formats start_time if only end_time is a timestamp string', async function (assert) {
-    assert.expect(2);
-    const twoMonthsAhead = addMonths(this.startDate, 2);
-    const month = twoMonthsAhead.getMonth();
-    const year = twoMonthsAhead.getFullYear();
-    const queryParams = {
-      start_time: {
-        monthIdx: month,
-        year,
-      },
-      end_time: {
-        timestamp: this.endDate.toISOString(),
-      },
-    };
-
-    this.server.get('sys/internal/counters/activity', (schema, req) => {
-      const { start_time, end_time } = req.queryParams;
-      const readableStart = this.readableUnix(start_time);
-      assert.strictEqual(
-        readableStart,
-        `September 01 2022`,
-        `formatted unix start time is the first of the month: ${readableStart}`
-      );
-      assert.strictEqual(end_time, this.endDate.toISOString(), 'end time is a timestamp string');
-    });
-    this.store.queryRecord(this.modelName, queryParams);
-  });
-
-  test('it formats end_time only if only start_time is a timestamp string', async function (assert) {
-    assert.expect(2);
-    const twoMothsAgo = subMonths(this.endDate, 2);
-    const endMonth = twoMothsAgo.getMonth();
-    const year = twoMothsAgo.getFullYear();
-    const queryParams = {
-      start_time: {
-        timestamp: this.startDate.toISOString(),
-      },
-      end_time: {
-        monthIdx: endMonth,
-        year,
-      },
-    };
-
-    this.server.get('sys/internal/counters/activity', (schema, req) => {
-      const { start_time, end_time } = req.queryParams;
-      const readableEnd = this.readableUnix(end_time);
-      assert.strictEqual(start_time, this.startDate.toISOString(), 'start time is a timestamp string');
-      assert.strictEqual(
-        readableEnd,
-        `November 30 2022`,
-        `formatted unix end time is the last day of the month: ${readableEnd}`
-      );
-    });
-
-    this.store.queryRecord(this.modelName, queryParams);
-  });
-
-  test('it formats both params if neither are a timestamp', async function (assert) {
-    assert.expect(2);
-    const startDate = subMonths(this.startDate, 2);
-    const endDate = addMonths(this.endDate, 2);
-    const startMonth = startDate.getMonth();
-    const startYear = startDate.getFullYear();
-    const endMonth = endDate.getMonth();
-    const endYear = endDate.getFullYear();
-    const queryParams = {
-      start_time: {
-        monthIdx: startMonth,
-        year: startYear,
-      },
-      end_time: {
-        monthIdx: endMonth,
-        year: endYear,
-      },
-    };
-
-    this.server.get('sys/internal/counters/activity', (schema, req) => {
-      const { start_time, end_time } = req.queryParams;
-      const readableEnd = this.readableUnix(end_time);
-      const readableStart = this.readableUnix(start_time);
-      assert.strictEqual(
-        readableStart,
-        `May 01 2022`,
-        `formatted unix start time is the first of the month: ${readableStart}`
-      );
-      assert.strictEqual(
-        readableEnd,
-        `March 31 2023`,
-        `formatted unix end time is the last day of the month: ${readableEnd}`
-      );
-    });
-
-    this.store.queryRecord(this.modelName, queryParams);
-  });
-});
diff --git a/ui/tests/unit/adapters/cluster-test.js b/ui/tests/unit/adapters/cluster-test.js
index 21b6b2ad99c3f..9de6d20796e40 100644
--- a/ui/tests/unit/adapters/cluster-test.js
+++ b/ui/tests/unit/adapters/cluster-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { resolve } from 'rsvp';
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
@@ -12,14 +7,14 @@ module('Unit | Adapter | cluster', function (hooks) {
 
   test('cluster api urls', function (assert) {
     let url, method, options;
-    const adapter = this.owner.factoryFor('adapter:cluster').create({
+    let adapter = this.owner.factoryFor('adapter:cluster').create({
       ajax: (...args) => {
         [url, method, options] = args;
         return resolve();
       },
     });
     adapter.health();
-    assert.strictEqual(url, '/v1/sys/health', 'health url OK');
+    assert.equal(url, '/v1/sys/health', 'health url OK');
     assert.deepEqual(
       {
         standbycode: 200,
@@ -31,28 +26,28 @@ module('Unit | Adapter | cluster', function (hooks) {
       options.data,
       'health data params OK'
     );
-    assert.strictEqual(method, 'GET', 'health method OK');
+    assert.equal(method, 'GET', 'health method OK');
 
     adapter.sealStatus();
-    assert.strictEqual(url, '/v1/sys/seal-status', 'health url OK');
-    assert.strictEqual(method, 'GET', 'seal-status method OK');
+    assert.equal(url, '/v1/sys/seal-status', 'health url OK');
+    assert.equal(method, 'GET', 'seal-status method OK');
 
     let data = { someData: 1 };
     adapter.unseal(data);
-    assert.strictEqual(url, '/v1/sys/unseal', 'unseal url OK');
-    assert.strictEqual(method, 'PUT', 'unseal method OK');
+    assert.equal(url, '/v1/sys/unseal', 'unseal url OK');
+    assert.equal(method, 'PUT', 'unseal method OK');
     assert.deepEqual({ data, unauthenticated: true }, options, 'unseal options OK');
 
     adapter.initCluster(data);
-    assert.strictEqual(url, '/v1/sys/init', 'init url OK');
-    assert.strictEqual(method, 'PUT', 'init method OK');
+    assert.equal(url, '/v1/sys/init', 'init url OK');
+    assert.equal(method, 'PUT', 'init method OK');
     assert.deepEqual({ data, unauthenticated: true }, options, 'init options OK');
 
     data = { token: 'token', password: 'password', username: 'username' };
 
     adapter.authenticate({ backend: 'token', data });
-    assert.strictEqual(url, '/v1/auth/token/lookup-self', 'auth:token url OK');
-    assert.strictEqual(method, 'GET', 'auth:token method OK');
+    assert.equal(url, '/v1/auth/token/lookup-self', 'auth:token url OK');
+    assert.equal(method, 'GET', 'auth:token method OK');
     assert.deepEqual(
       { headers: { 'X-Vault-Token': 'token' }, unauthenticated: true },
       options,
@@ -60,8 +55,8 @@ module('Unit | Adapter | cluster', function (hooks) {
     );
 
     adapter.authenticate({ backend: 'github', data });
-    assert.strictEqual(url, '/v1/auth/github/login', 'auth:github url OK');
-    assert.strictEqual(method, 'POST', 'auth:github method OK');
+    assert.equal(url, '/v1/auth/github/login', 'auth:github url OK');
+    assert.equal(method, 'POST', 'auth:github method OK');
     assert.deepEqual(
       { data: { password: 'password', token: 'token' }, unauthenticated: true },
       options,
@@ -70,8 +65,8 @@ module('Unit | Adapter | cluster', function (hooks) {
 
     data = { jwt: 'token', role: 'test' };
     adapter.authenticate({ backend: 'jwt', data });
-    assert.strictEqual(url, '/v1/auth/jwt/login', 'auth:jwt url OK');
-    assert.strictEqual(method, 'POST', 'auth:jwt method OK');
+    assert.equal(url, '/v1/auth/jwt/login', 'auth:jwt url OK');
+    assert.equal(method, 'POST', 'auth:jwt method OK');
     assert.deepEqual(
       { data: { jwt: 'token', role: 'test' }, unauthenticated: true },
       options,
@@ -80,21 +75,21 @@ module('Unit | Adapter | cluster', function (hooks) {
 
     data = { jwt: 'token', role: 'test', path: 'oidc' };
     adapter.authenticate({ backend: 'jwt', data });
-    assert.strictEqual(url, '/v1/auth/oidc/login', 'auth:jwt custom mount path, url OK');
+    assert.equal(url, '/v1/auth/oidc/login', 'auth:jwt custom mount path, url OK');
 
     data = { token: 'token', password: 'password', username: 'username', path: 'path' };
 
     adapter.authenticate({ backend: 'token', data });
-    assert.strictEqual(url, '/v1/auth/token/lookup-self', 'auth:token url with path OK');
+    assert.equal(url, '/v1/auth/token/lookup-self', 'auth:token url with path OK');
 
     adapter.authenticate({ backend: 'github', data });
-    assert.strictEqual(url, '/v1/auth/path/login', 'auth:github with path url OK');
+    assert.equal(url, '/v1/auth/path/login', 'auth:github with path url OK');
 
     data = { password: 'password', username: 'username' };
 
     adapter.authenticate({ backend: 'userpass', data });
-    assert.strictEqual(url, '/v1/auth/userpass/login/username', 'auth:userpass url OK');
-    assert.strictEqual(method, 'POST', 'auth:userpass method OK');
+    assert.equal(url, '/v1/auth/userpass/login/username', 'auth:userpass url OK');
+    assert.equal(method, 'POST', 'auth:userpass method OK');
     assert.deepEqual(
       { data: { password: 'password' }, unauthenticated: true },
       options,
@@ -102,8 +97,8 @@ module('Unit | Adapter | cluster', function (hooks) {
     );
 
     adapter.authenticate({ backend: 'radius', data });
-    assert.strictEqual(url, '/v1/auth/radius/login/username', 'auth:RADIUS url OK');
-    assert.strictEqual(method, 'POST', 'auth:RADIUS method OK');
+    assert.equal(url, '/v1/auth/radius/login/username', 'auth:RADIUS url OK');
+    assert.equal(method, 'POST', 'auth:RADIUS method OK');
     assert.deepEqual(
       { data: { password: 'password' }, unauthenticated: true },
       options,
@@ -111,8 +106,8 @@ module('Unit | Adapter | cluster', function (hooks) {
     );
 
     adapter.authenticate({ backend: 'LDAP', data });
-    assert.strictEqual(url, '/v1/auth/ldap/login/username', 'ldap:userpass url OK');
-    assert.strictEqual(method, 'POST', 'ldap:userpass method OK');
+    assert.equal(url, '/v1/auth/ldap/login/username', 'ldap:userpass url OK');
+    assert.equal(method, 'POST', 'ldap:userpass method OK');
     assert.deepEqual(
       { data: { password: 'password' }, unauthenticated: true },
       options,
@@ -121,8 +116,8 @@ module('Unit | Adapter | cluster', function (hooks) {
 
     data = { password: 'password', username: 'username', nonce: 'uuid' };
     adapter.authenticate({ backend: 'okta', data });
-    assert.strictEqual(url, '/v1/auth/okta/login/username', 'okta:userpass url OK');
-    assert.strictEqual(method, 'POST', 'ldap:userpass method OK');
+    assert.equal(url, '/v1/auth/okta/login/username', 'okta:userpass url OK');
+    assert.equal(method, 'POST', 'ldap:userpass method OK');
     assert.deepEqual(
       { data: { password: 'password', nonce: 'uuid' }, unauthenticated: true },
       options,
@@ -133,19 +128,19 @@ module('Unit | Adapter | cluster', function (hooks) {
     data = { password: 'password', username: 'username', path: 'path' };
 
     adapter.authenticate({ backend: 'userpass', data });
-    assert.strictEqual(url, '/v1/auth/path/login/username', 'auth:userpass with path url OK');
+    assert.equal(url, '/v1/auth/path/login/username', 'auth:userpass with path url OK');
 
     adapter.authenticate({ backend: 'LDAP', data });
-    assert.strictEqual(url, '/v1/auth/path/login/username', 'auth:LDAP with path url OK');
+    assert.equal(url, '/v1/auth/path/login/username', 'auth:LDAP with path url OK');
 
     data = { password: 'password', username: 'username', path: 'path', nonce: 'uuid' };
     adapter.authenticate({ backend: 'Okta', data });
-    assert.strictEqual(url, '/v1/auth/path/login/username', 'auth:Okta with path url OK');
+    assert.equal(url, '/v1/auth/path/login/username', 'auth:Okta with path url OK');
   });
 
   test('cluster replication api urls', function (assert) {
     let url, method, options;
-    const adapter = this.owner.factoryFor('adapter:cluster').create({
+    let adapter = this.owner.factoryFor('adapter:cluster').create({
       ajax: (...args) => {
         [url, method, options] = args;
         return resolve();
@@ -153,101 +148,81 @@ module('Unit | Adapter | cluster', function (hooks) {
     });
 
     adapter.replicationStatus();
-    assert.strictEqual(url, '/v1/sys/replication/status', 'replication:status url OK');
-    assert.strictEqual(method, 'GET', 'replication:status method OK');
+    assert.equal(url, '/v1/sys/replication/status', 'replication:status url OK');
+    assert.equal(method, 'GET', 'replication:status method OK');
     assert.deepEqual({ unauthenticated: true }, options, 'replication:status options OK');
 
     adapter.replicationAction('recover', 'dr');
-    assert.strictEqual(url, '/v1/sys/replication/recover', 'replication: recover url OK');
-    assert.strictEqual(method, 'POST', 'replication:recover method OK');
+    assert.equal(url, '/v1/sys/replication/recover', 'replication: recover url OK');
+    assert.equal(method, 'POST', 'replication:recover method OK');
 
     adapter.replicationAction('reindex', 'dr');
-    assert.strictEqual(url, '/v1/sys/replication/reindex', 'replication: reindex url OK');
-    assert.strictEqual(method, 'POST', 'replication:reindex method OK');
+    assert.equal(url, '/v1/sys/replication/reindex', 'replication: reindex url OK');
+    assert.equal(method, 'POST', 'replication:reindex method OK');
 
     adapter.replicationAction('enable', 'dr', 'primary');
-    assert.strictEqual(url, '/v1/sys/replication/dr/primary/enable', 'replication:dr primary:enable url OK');
-    assert.strictEqual(method, 'POST', 'replication:primary:enable method OK');
+    assert.equal(url, '/v1/sys/replication/dr/primary/enable', 'replication:dr primary:enable url OK');
+    assert.equal(method, 'POST', 'replication:primary:enable method OK');
     adapter.replicationAction('enable', 'performance', 'primary');
-    assert.strictEqual(
+    assert.equal(
       url,
       '/v1/sys/replication/performance/primary/enable',
       'replication:performance primary:enable url OK'
     );
 
     adapter.replicationAction('enable', 'dr', 'secondary');
-    assert.strictEqual(
-      url,
-      '/v1/sys/replication/dr/secondary/enable',
-      'replication:dr secondary:enable url OK'
-    );
-    assert.strictEqual(method, 'POST', 'replication:secondary:enable method OK');
+    assert.equal(url, '/v1/sys/replication/dr/secondary/enable', 'replication:dr secondary:enable url OK');
+    assert.equal(method, 'POST', 'replication:secondary:enable method OK');
     adapter.replicationAction('enable', 'performance', 'secondary');
-    assert.strictEqual(
+    assert.equal(
       url,
       '/v1/sys/replication/performance/secondary/enable',
       'replication:performance secondary:enable url OK'
     );
 
     adapter.replicationAction('disable', 'dr', 'primary');
-    assert.strictEqual(
-      url,
-      '/v1/sys/replication/dr/primary/disable',
-      'replication:dr primary:disable url OK'
-    );
-    assert.strictEqual(method, 'POST', 'replication:primary:disable method OK');
+    assert.equal(url, '/v1/sys/replication/dr/primary/disable', 'replication:dr primary:disable url OK');
+    assert.equal(method, 'POST', 'replication:primary:disable method OK');
     adapter.replicationAction('disable', 'performance', 'primary');
-    assert.strictEqual(
+    assert.equal(
       url,
       '/v1/sys/replication/performance/primary/disable',
       'replication:performance primary:disable url OK'
     );
 
     adapter.replicationAction('disable', 'dr', 'secondary');
-    assert.strictEqual(
-      url,
-      '/v1/sys/replication/dr/secondary/disable',
-      'replication: drsecondary:disable url OK'
-    );
-    assert.strictEqual(method, 'POST', 'replication:secondary:disable method OK');
+    assert.equal(url, '/v1/sys/replication/dr/secondary/disable', 'replication: drsecondary:disable url OK');
+    assert.equal(method, 'POST', 'replication:secondary:disable method OK');
     adapter.replicationAction('disable', 'performance', 'secondary');
-    assert.strictEqual(
+    assert.equal(
       url,
       '/v1/sys/replication/performance/secondary/disable',
       'replication: performance:disable url OK'
     );
 
     adapter.replicationAction('demote', 'dr', 'primary');
-    assert.strictEqual(url, '/v1/sys/replication/dr/primary/demote', 'replication: dr primary:demote url OK');
-    assert.strictEqual(method, 'POST', 'replication:primary:demote method OK');
+    assert.equal(url, '/v1/sys/replication/dr/primary/demote', 'replication: dr primary:demote url OK');
+    assert.equal(method, 'POST', 'replication:primary:demote method OK');
     adapter.replicationAction('demote', 'performance', 'primary');
-    assert.strictEqual(
+    assert.equal(
       url,
       '/v1/sys/replication/performance/primary/demote',
       'replication: performance primary:demote url OK'
     );
 
     adapter.replicationAction('promote', 'performance', 'secondary');
-    assert.strictEqual(method, 'POST', 'replication:secondary:promote method OK');
-    assert.strictEqual(
+    assert.equal(method, 'POST', 'replication:secondary:promote method OK');
+    assert.equal(
       url,
       '/v1/sys/replication/performance/secondary/promote',
       'replication:performance secondary:promote url OK'
     );
 
     adapter.replicationDrPromote();
-    assert.strictEqual(
-      url,
-      '/v1/sys/replication/dr/secondary/promote',
-      'replication:dr secondary:promote url OK'
-    );
-    assert.strictEqual(method, 'PUT', 'replication:dr secondary:promote method OK');
+    assert.equal(url, '/v1/sys/replication/dr/secondary/promote', 'replication:dr secondary:promote url OK');
+    assert.equal(method, 'PUT', 'replication:dr secondary:promote method OK');
     adapter.replicationDrPromote({}, { checkStatus: true });
-    assert.strictEqual(
-      url,
-      '/v1/sys/replication/dr/secondary/promote',
-      'replication:dr secondary:promote url OK'
-    );
-    assert.strictEqual(method, 'GET', 'replication:dr secondary:promote method OK');
+    assert.equal(url, '/v1/sys/replication/dr/secondary/promote', 'replication:dr secondary:promote url OK');
+    assert.equal(method, 'GET', 'replication:dr secondary:promote method OK');
   });
 });
diff --git a/ui/tests/unit/adapters/console-test.js b/ui/tests/unit/adapters/console-test.js
index 29b2cc842d798..749a38e57ba78 100644
--- a/ui/tests/unit/adapters/console-test.js
+++ b/ui/tests/unit/adapters/console-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
@@ -10,10 +5,10 @@ module('Unit | Adapter | console', function (hooks) {
   setupTest(hooks);
 
   test('it builds the correct URL', function (assert) {
-    const adapter = this.owner.lookup('adapter:console');
-    const sysPath = 'sys/health';
-    const awsPath = 'aws/roles/my-other-role';
-    assert.strictEqual(adapter.buildURL(sysPath), '/v1/sys/health');
-    assert.strictEqual(adapter.buildURL(awsPath), '/v1/aws/roles/my-other-role');
+    let adapter = this.owner.lookup('adapter:console');
+    let sysPath = 'sys/health';
+    let awsPath = 'aws/roles/my-other-role';
+    assert.equal(adapter.buildURL(sysPath), '/v1/sys/health');
+    assert.equal(adapter.buildURL(awsPath), '/v1/aws/roles/my-other-role');
   });
 });
diff --git a/ui/tests/unit/adapters/identity/_test-cases.js b/ui/tests/unit/adapters/identity/_test-cases.js
index 2f0cd928b3407..58f13771ea790 100644
--- a/ui/tests/unit/adapters/identity/_test-cases.js
+++ b/ui/tests/unit/adapters/identity/_test-cases.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export const storeMVP = {
   serializerFor() {
     return {
@@ -28,13 +23,13 @@ export default function (modelName) {
     },
     {
       adapterMethod: 'updateRecord',
-      args: [storeMVP, { modelName }, { id: 'foo', modelName }],
+      args: [storeMVP, { modelName }, { id: 'foo' }],
       url: `/v1/${modelName}/id/foo`,
       method: 'PUT',
     },
     {
       adapterMethod: 'deleteRecord',
-      args: [storeMVP, { modelName }, { id: 'foo', modelName }],
+      args: [storeMVP, { modelName }, { id: 'foo' }],
       url: `/v1/${modelName}/id/foo`,
       method: 'DELETE',
     },
diff --git a/ui/tests/unit/adapters/identity/entity-alias-test.js b/ui/tests/unit/adapters/identity/entity-alias-test.js
index 2fa9f4bdd0bec..8b3e2883ed964 100644
--- a/ui/tests/unit/adapters/identity/entity-alias-test.js
+++ b/ui/tests/unit/adapters/identity/entity-alias-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import testCases from './_test-cases';
@@ -19,20 +14,16 @@ module('Unit | Adapter | identity/entity-alias', function (hooks) {
     this.server.shutdown();
   });
 
-  const cases = testCases('identity/entity-alias');
+  const cases = testCases('identit/entity-alias');
 
   cases.forEach((testCase) => {
     test(`entity-alias#${testCase.adapterMethod}`, function (assert) {
       assert.expect(2);
-      const adapter = this.owner.lookup('adapter:identity/entity-alias');
+      let adapter = this.owner.lookup('adapter:identity/entity-alias');
       adapter[testCase.adapterMethod](...testCase.args);
-      const { url, method } = this.server.handledRequests[0];
-      assert.strictEqual(
-        url,
-        testCase.url,
-        `${testCase.adapterMethod} calls the correct url: ${testCase.url}`
-      );
-      assert.strictEqual(
+      let { url, method } = this.server.handledRequests[0];
+      assert.equal(url, testCase.url, `${testCase.adapterMethod} calls the correct url: ${testCase.url}`);
+      assert.equal(
         method,
         testCase.method,
         `${testCase.adapterMethod} uses the correct http verb: ${testCase.method}`
diff --git a/ui/tests/unit/adapters/identity/entity-merge-test.js b/ui/tests/unit/adapters/identity/entity-merge-test.js
index 910ab62b83be1..590701983a93f 100644
--- a/ui/tests/unit/adapters/identity/entity-merge-test.js
+++ b/ui/tests/unit/adapters/identity/entity-merge-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Pretender from 'pretender';
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
@@ -25,10 +20,10 @@ module('Unit | Adapter | identity/entity-merge', function (hooks) {
 
   test(`entity-merge#createRecord`, function (assert) {
     assert.expect(2);
-    const adapter = this.owner.lookup('adapter:identity/entity-merge');
+    let adapter = this.owner.lookup('adapter:identity/entity-merge');
     adapter.createRecord(storeMVP, { modelName: 'identity/entity-merge' }, { attr: (x) => x });
-    const { url, method } = this.server.handledRequests[0];
-    assert.strictEqual(url, `/v1/identity/entity/merge`, ` calls the correct url`);
-    assert.strictEqual(method, 'POST', `uses the correct http verb: POST`);
+    let { url, method } = this.server.handledRequests[0];
+    assert.equal(url, `/v1/identity/entity/merge`, ` calls the correct url`);
+    assert.equal(method, 'POST', `uses the correct http verb: POST`);
   });
 });
diff --git a/ui/tests/unit/adapters/identity/entity-test.js b/ui/tests/unit/adapters/identity/entity-test.js
index 25d71e049f6ce..60c12b671cbb0 100644
--- a/ui/tests/unit/adapters/identity/entity-test.js
+++ b/ui/tests/unit/adapters/identity/entity-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import testCases from './_test-cases';
@@ -24,15 +19,11 @@ module('Unit | Adapter | identity/entity', function (hooks) {
   cases.forEach((testCase) => {
     test(`entity#${testCase.adapterMethod}`, function (assert) {
       assert.expect(2);
-      const adapter = this.owner.lookup('adapter:identity/entity');
+      let adapter = this.owner.lookup('adapter:identity/entity');
       adapter[testCase.adapterMethod](...testCase.args);
-      const { url, method } = this.server.handledRequests[0];
-      assert.strictEqual(
-        url,
-        testCase.url,
-        `${testCase.adapterMethod} calls the correct url: ${testCase.url}`
-      );
-      assert.strictEqual(
+      let { url, method } = this.server.handledRequests[0];
+      assert.equal(url, testCase.url, `${testCase.adapterMethod} calls the correct url: ${testCase.url}`);
+      assert.equal(
         method,
         testCase.method,
         `${testCase.adapterMethod} uses the correct http verb: ${testCase.method}`
diff --git a/ui/tests/unit/adapters/identity/group-alias-test.js b/ui/tests/unit/adapters/identity/group-alias-test.js
index f179be912aeb9..efb4a0d955525 100644
--- a/ui/tests/unit/adapters/identity/group-alias-test.js
+++ b/ui/tests/unit/adapters/identity/group-alias-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import testCases from './_test-cases';
@@ -24,15 +19,11 @@ module('Unit | Adapter | identity/group-alias', function (hooks) {
   cases.forEach((testCase) => {
     test(`group-alias#${testCase.adapterMethod}`, function (assert) {
       assert.expect(2);
-      const adapter = this.owner.lookup('adapter:identity/group-alias');
+      let adapter = this.owner.lookup('adapter:identity/group-alias');
       adapter[testCase.adapterMethod](...testCase.args);
-      const { url, method } = this.server.handledRequests[0];
-      assert.strictEqual(
-        url,
-        testCase.url,
-        `${testCase.adapterMethod} calls the correct url: ${testCase.url}`
-      );
-      assert.strictEqual(
+      let { url, method } = this.server.handledRequests[0];
+      assert.equal(url, testCase.url, `${testCase.adapterMethod} calls the correct url: ${testCase.url}`);
+      assert.equal(
         method,
         testCase.method,
         `${testCase.adapterMethod} uses the correct http verb: ${testCase.method}`
diff --git a/ui/tests/unit/adapters/identity/group-test.js b/ui/tests/unit/adapters/identity/group-test.js
index cb631278bc4ab..7e0633d9af459 100644
--- a/ui/tests/unit/adapters/identity/group-test.js
+++ b/ui/tests/unit/adapters/identity/group-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import testCases from './_test-cases';
@@ -24,15 +19,11 @@ module('Unit | Adapter | identity/group', function (hooks) {
   cases.forEach((testCase) => {
     test(`group#${testCase.adapterMethod}`, function (assert) {
       assert.expect(2);
-      const adapter = this.owner.lookup('adapter:identity/group');
+      let adapter = this.owner.lookup('adapter:identity/group');
       adapter[testCase.adapterMethod](...testCase.args);
-      const { url, method } = this.server.handledRequests[0];
-      assert.strictEqual(
-        url,
-        testCase.url,
-        `${testCase.adapterMethod} calls the correct url: ${testCase.url}`
-      );
-      assert.strictEqual(
+      let { url, method } = this.server.handledRequests[0];
+      assert.equal(url, testCase.url, `${testCase.adapterMethod} calls the correct url: ${testCase.url}`);
+      assert.equal(
         method,
         testCase.method,
         `${testCase.adapterMethod} uses the correct http verb: ${testCase.method}`
diff --git a/ui/tests/unit/adapters/kmip/role-test.js b/ui/tests/unit/adapters/kmip/role-test.js
index 7442eebf56d1c..af196508b3623 100644
--- a/ui/tests/unit/adapters/kmip/role-test.js
+++ b/ui/tests/unit/adapters/kmip/role-test.js
@@ -1,15 +1,10 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
 module('Unit | Adapter | kmip/role', function (hooks) {
   setupTest(hooks);
 
-  const serializeTests = [
+  let serializeTests = [
     [
       'operation_all is the only operation item present after serialization',
       {
@@ -77,11 +72,11 @@ module('Unit | Adapter | kmip/role', function (hooks) {
       },
     ],
   ];
-  for (const testCase of serializeTests) {
-    const [name, snapshotStub, expected] = testCase;
+  for (let testCase of serializeTests) {
+    let [name, snapshotStub, expected] = testCase;
     test(`adapter serialize: ${name}`, function (assert) {
-      const adapter = this.owner.lookup('adapter:kmip/role');
-      const result = adapter.serialize(snapshotStub);
+      let adapter = this.owner.lookup('adapter:kmip/role');
+      let result = adapter.serialize(snapshotStub);
       assert.deepEqual(result, expected, 'output matches expected');
     });
   }
diff --git a/ui/tests/unit/adapters/kubernetes/config-test.js b/ui/tests/unit/adapters/kubernetes/config-test.js
deleted file mode 100644
index 3bbd295aeb991..0000000000000
--- a/ui/tests/unit/adapters/kubernetes/config-test.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-
-module('Unit | Adapter | kubernetes/config', function (hooks) {
-  setupTest(hooks);
-  setupMirage(hooks);
-
-  hooks.beforeEach(function () {
-    this.store = this.owner.lookup('service:store');
-    this.store.unloadAll('kubernetes/config');
-  });
-
-  test('it should make request to correct endpoint when querying record', async function (assert) {
-    assert.expect(1);
-    this.server.get('/kubernetes-test/config', () => {
-      assert.ok('GET request made to correct endpoint when querying record');
-    });
-    await this.store.queryRecord('kubernetes/config', { backend: 'kubernetes-test' });
-  });
-
-  test('it should make request to correct endpoint when creating new record', async function (assert) {
-    assert.expect(1);
-    this.server.post('/kubernetes-test/config', () => {
-      assert.ok('POST request made to correct endpoint when creating new record');
-    });
-    const record = this.store.createRecord('kubernetes/config', { backend: 'kubernetes-test' });
-    await record.save();
-  });
-
-  test('it should make request to correct endpoint when updating record', async function (assert) {
-    assert.expect(1);
-    this.server.post('/kubernetes-test/config', () => {
-      assert.ok('POST request made to correct endpoint when updating record');
-    });
-    this.store.pushPayload('kubernetes/config', {
-      modelName: 'kubernetes/config',
-      backend: 'kubernetes-test',
-    });
-    const record = this.store.peekRecord('kubernetes/config', 'kubernetes-test');
-    await record.save();
-  });
-
-  test('it should make request to correct endpoint when deleting record', async function (assert) {
-    assert.expect(1);
-    this.server.delete('/kubernetes-test/config', () => {
-      assert.ok('DELETE request made to correct endpoint when deleting record');
-    });
-    this.store.pushPayload('kubernetes/config', {
-      modelName: 'kubernetes/config',
-      backend: 'kubernetes-test',
-    });
-    const record = this.store.peekRecord('kubernetes/config', 'kubernetes-test');
-    await record.destroyRecord();
-  });
-});
diff --git a/ui/tests/unit/adapters/kubernetes/role-test.js b/ui/tests/unit/adapters/kubernetes/role-test.js
deleted file mode 100644
index e1c901129e702..0000000000000
--- a/ui/tests/unit/adapters/kubernetes/role-test.js
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-
-module('Unit | Adapter | kubernetes/role', function (hooks) {
-  setupTest(hooks);
-  setupMirage(hooks);
-
-  hooks.beforeEach(function () {
-    this.store = this.owner.lookup('service:store');
-    this.store.unloadAll('kubernetes/role');
-  });
-
-  test('it should make request to correct endpoint when listing records', async function (assert) {
-    assert.expect(1);
-    this.server.get('/kubernetes-test/roles', (schema, req) => {
-      assert.ok(req.queryParams.list, 'GET request made to correct endpoint when listing records');
-      return { data: { keys: ['test-role'] } };
-    });
-    await this.store.query('kubernetes/role', { backend: 'kubernetes-test' });
-  });
-
-  test('it should make request to correct endpoint when querying record', async function (assert) {
-    assert.expect(1);
-    this.server.get('/kubernetes-test/roles/test-role', () => {
-      assert.ok('GET request made to correct endpoint when querying record');
-      return { data: {} };
-    });
-    await this.store.queryRecord('kubernetes/role', { backend: 'kubernetes-test', name: 'test-role' });
-  });
-
-  test('it should make request to correct endpoint when creating new record', async function (assert) {
-    assert.expect(1);
-    this.server.post('/kubernetes-test/roles/test-role', () => {
-      assert.ok('POST request made to correct endpoint when creating new record');
-    });
-    const record = this.store.createRecord('kubernetes/role', {
-      backend: 'kubernetes-test',
-      name: 'test-role',
-    });
-    await record.save();
-  });
-
-  test('it should make request to correct endpoint when updating record', async function (assert) {
-    assert.expect(1);
-    this.server.post('/kubernetes-test/roles/test-role', () => {
-      assert.ok('POST request made to correct endpoint when updating record');
-    });
-    this.store.pushPayload('kubernetes/role', {
-      modelName: 'kubernetes/role',
-      backend: 'kubernetes-test',
-      name: 'test-role',
-    });
-    const record = this.store.peekRecord('kubernetes/role', 'test-role');
-    await record.save();
-  });
-
-  test('it should make request to correct endpoint when deleting record', async function (assert) {
-    assert.expect(1);
-    this.server.delete('/kubernetes-test/roles/test-role', () => {
-      assert.ok('DELETE request made to correct endpoint when deleting record');
-    });
-    this.store.pushPayload('kubernetes/role', {
-      modelName: 'kubernetes/role',
-      backend: 'kubernetes-test',
-      name: 'test-role',
-    });
-    const record = this.store.peekRecord('kubernetes/role', 'test-role');
-    await record.destroyRecord();
-  });
-});
diff --git a/ui/tests/unit/adapters/oidc/assignment-test.js b/ui/tests/unit/adapters/oidc/assignment-test.js
index adcea8499a4ad..16780eb366b9d 100644
--- a/ui/tests/unit/adapters/oidc/assignment-test.js
+++ b/ui/tests/unit/adapters/oidc/assignment-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { setupMirage } from 'ember-cli-mirage/test-support';
diff --git a/ui/tests/unit/adapters/oidc/client-test.js b/ui/tests/unit/adapters/oidc/client-test.js
index eada3affabb4c..3430985f88688 100644
--- a/ui/tests/unit/adapters/oidc/client-test.js
+++ b/ui/tests/unit/adapters/oidc/client-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { setupMirage } from 'ember-cli-mirage/test-support';
diff --git a/ui/tests/unit/adapters/oidc/key-test.js b/ui/tests/unit/adapters/oidc/key-test.js
index 489121994987a..74a913aa98209 100644
--- a/ui/tests/unit/adapters/oidc/key-test.js
+++ b/ui/tests/unit/adapters/oidc/key-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { setupMirage } from 'ember-cli-mirage/test-support';
@@ -30,7 +25,7 @@ module('Unit | Adapter | oidc/key', function (hooks) {
 
     this.server.post(`${this.path}/rotate`, (schema, req) => {
       const json = JSON.parse(req.requestBody);
-      assert.strictEqual(json.verification_ttl, '30m', 'request made to correct endpoint on rotate');
+      assert.equal(json.verification_ttl, '30m', 'request made to correct endpoint on rotate');
     });
 
     await this.store.adapterFor('oidc/key').rotate(this.data.name, '30m');
diff --git a/ui/tests/unit/adapters/oidc/provider-test.js b/ui/tests/unit/adapters/oidc/provider-test.js
index 7ad4a31d03d58..0c78b23080d94 100644
--- a/ui/tests/unit/adapters/oidc/provider-test.js
+++ b/ui/tests/unit/adapters/oidc/provider-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { setupMirage } from 'ember-cli-mirage/test-support';
diff --git a/ui/tests/unit/adapters/oidc/scope-test.js b/ui/tests/unit/adapters/oidc/scope-test.js
index f2ff52cf29146..e2d51871fc5a6 100644
--- a/ui/tests/unit/adapters/oidc/scope-test.js
+++ b/ui/tests/unit/adapters/oidc/scope-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { setupMirage } from 'ember-cli-mirage/test-support';
diff --git a/ui/tests/unit/adapters/oidc/test-helper.js b/ui/tests/unit/adapters/oidc/test-helper.js
index 754834607ab4d..9df7880accebe 100644
--- a/ui/tests/unit/adapters/oidc/test-helper.js
+++ b/ui/tests/unit/adapters/oidc/test-helper.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 export default (test) => {
   test('it should make request to correct endpoint on save', async function (assert) {
     assert.expect(1);
@@ -40,7 +35,7 @@ export default (test) => {
     const key_info = { [name]: { ...otherAttrs } };
 
     this.server.get(`/identity/${this.modelName}`, (schema, req) => {
-      assert.strictEqual(req.queryParams.list, 'true', 'request is made to correct endpoint on query');
+      assert.equal(req.queryParams.list, 'true', 'request is made to correct endpoint on query');
       if (keyInfoModels.some((model) => this.modelName.includes(model))) {
         return { data: { keys: [name], key_info } };
       } else {
@@ -88,27 +83,23 @@ export default (test) => {
       let testQuery = ['*', 'a123'];
       await this.store
         .query(this.modelName, { paramKey: 'model_id', filterFor: testQuery })
-        .then((resp) =>
-          assert.strictEqual(resp.content.length, 3, 'returns all models when ids include glob (*)')
-        );
+        .then((resp) => assert.equal(resp.content.length, 3, 'returns all models when ids include glob (*)'));
 
       testQuery = ['*'];
       await this.store
         .query(this.modelName, { paramKey: 'model_id', filterFor: testQuery })
-        .then((resp) =>
-          assert.strictEqual(resp.content.length, 3, 'returns all models when glob (*) is only id')
-        );
+        .then((resp) => assert.equal(resp.content.length, 3, 'returns all models when glob (*) is only id'));
 
       testQuery = ['b123'];
       await this.store.query(this.modelName, { paramKey: 'model_id', filterFor: testQuery }).then((resp) => {
-        assert.strictEqual(resp.content.length, 1, 'filters response and returns only matching id');
+        assert.equal(resp.content.length, 1, 'filters response and returns only matching id');
 
-        assert.strictEqual(resp.firstObject.name, 'model-2', 'response contains correct model');
+        assert.equal(resp.firstObject.name, 'model-2', 'response contains correct model');
       });
 
       testQuery = ['b123', 'c123'];
       await this.store.query(this.modelName, { paramKey: 'model_id', filterFor: testQuery }).then((resp) => {
-        assert.strictEqual(resp.content.length, 2, 'filters response when passed multiple ids');
+        assert.equal(resp.content.length, 2, 'filters response when passed multiple ids');
         resp.content.forEach((m) =>
           assert.ok(['model-2', 'model-3'].includes(m.id), `it filters correctly and included: ${m.id}`)
         );
@@ -123,7 +114,7 @@ export default (test) => {
         'throws assertion when filterFor is not an array'
       );
     } else {
-      const testQuery = ['b123', 'c123'];
+      let testQuery = ['b123', 'c123'];
       await this.store
         .query(this.modelName, { paramKey: 'model_id', filterFor: testQuery })
         .then((resp) => assert.ok(resp.isLoaded, 'does not error when key_info does not exist'));
diff --git a/ui/tests/unit/adapters/pki/action-test.js b/ui/tests/unit/adapters/pki/action-test.js
deleted file mode 100644
index 6511ebf2a8f86..0000000000000
--- a/ui/tests/unit/adapters/pki/action-test.js
+++ /dev/null
@@ -1,260 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupTest } from 'vault/tests/helpers';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import { allowAllCapabilitiesStub } from 'vault/tests/helpers/stubs';
-import { rootPem } from 'vault/tests/helpers/pki/values';
-
-module('Unit | Adapter | pki/action', function (hooks) {
-  setupTest(hooks);
-  setupMirage(hooks);
-
-  hooks.beforeEach(function () {
-    this.store = this.owner.lookup('service:store');
-    this.secretMountPath = this.owner.lookup('service:secret-mount-path');
-    this.backend = 'pki-test';
-    this.secretMountPath.currentPath = this.backend;
-    this.server.post('/sys/capabilities-self', allowAllCapabilitiesStub());
-    this.emptyResponse = {
-      // Action adapter uses request_id as ember data id for response
-      request_id: '123',
-      data: {},
-    };
-  });
-
-  test('it exists', function (assert) {
-    const adapter = this.owner.lookup('adapter:pki/action');
-    assert.ok(adapter);
-  });
-
-  module('actionType import', function (hooks) {
-    hooks.beforeEach(function () {
-      this.payload = {
-        pem_bundle: rootPem,
-      };
-    });
-
-    test('it calls the correct endpoint when useIssuer = false', async function (assert) {
-      assert.expect(1);
-
-      this.server.post(`${this.backend}/config/ca`, () => {
-        assert.ok(true, 'request made to correct endpoint on create');
-        return this.emptyResponse;
-      });
-
-      await this.store
-        .createRecord('pki/action', this.payload)
-        .save({ adapterOptions: { actionType: 'import', useIssuer: false } });
-    });
-
-    test('it calls the correct endpoint when useIssuer = true', async function (assert) {
-      assert.expect(1);
-      this.server.post(`${this.backend}/issuers/import/bundle`, () => {
-        assert.ok(true, 'request made to correct endpoint on create');
-        return this.emptyResponse;
-      });
-
-      await this.store
-        .createRecord('pki/action', this.payload)
-        .save({ adapterOptions: { actionType: 'import', useIssuer: true } });
-    });
-  });
-
-  module('actionType generate-root', function () {
-    test('it calls the correct endpoint when useIssuer = false', async function (assert) {
-      assert.expect(4);
-      const adapterOptions = { adapterOptions: { actionType: 'generate-root', useIssuer: false } };
-      this.server.post(`${this.backend}/root/generate/internal`, () => {
-        assert.ok(true, 'request made correctly when type = internal');
-        return this.emptyResponse;
-      });
-      this.server.post(`${this.backend}/root/generate/exported`, () => {
-        assert.ok(true, 'request made correctly when type = exported');
-        return this.emptyResponse;
-      });
-      this.server.post(`${this.backend}/root/generate/existing`, () => {
-        assert.ok(true, 'request made correctly when type = exising');
-        return this.emptyResponse;
-      });
-      this.server.post(`${this.backend}/root/generate/kms`, () => {
-        assert.ok(true, 'request made correctly when type = kms');
-        return this.emptyResponse;
-      });
-
-      await this.store
-        .createRecord('pki/action', {
-          type: 'internal',
-        })
-        .save(adapterOptions);
-      await this.store
-        .createRecord('pki/action', {
-          type: 'exported',
-        })
-        .save(adapterOptions);
-      await this.store
-        .createRecord('pki/action', {
-          type: 'existing',
-        })
-        .save(adapterOptions);
-      await this.store
-        .createRecord('pki/action', {
-          type: 'kms',
-        })
-        .save(adapterOptions);
-    });
-
-    test('it calls the correct endpoint when useIssuer = true', async function (assert) {
-      assert.expect(4);
-      const adapterOptions = { adapterOptions: { actionType: 'generate-root', useIssuer: true } };
-      this.server.post(`${this.backend}/issuers/generate/root/internal`, () => {
-        assert.ok(true, 'request made correctly when type = internal');
-        return this.emptyResponse;
-      });
-      this.server.post(`${this.backend}/issuers/generate/root/exported`, () => {
-        assert.ok(true, 'request made correctly when type = exported');
-        return this.emptyResponse;
-      });
-      this.server.post(`${this.backend}/issuers/generate/root/existing`, () => {
-        assert.ok(true, 'request made correctly when type = exising');
-        return this.emptyResponse;
-      });
-      this.server.post(`${this.backend}/issuers/generate/root/kms`, () => {
-        assert.ok(true, 'request made correctly when type = kms');
-        return this.emptyResponse;
-      });
-
-      await this.store
-        .createRecord('pki/action', {
-          type: 'internal',
-        })
-        .save(adapterOptions);
-      await this.store
-        .createRecord('pki/action', {
-          type: 'exported',
-        })
-        .save(adapterOptions);
-      await this.store
-        .createRecord('pki/action', {
-          type: 'existing',
-        })
-        .save(adapterOptions);
-      await this.store
-        .createRecord('pki/action', {
-          type: 'kms',
-        })
-        .save(adapterOptions);
-    });
-  });
-
-  module('actionType generate-csr', function () {
-    test('it calls the correct endpoint when useIssuer = false', async function (assert) {
-      assert.expect(4);
-      const adapterOptions = { adapterOptions: { actionType: 'generate-csr', useIssuer: false } };
-      this.server.post(`${this.backend}/intermediate/generate/internal`, () => {
-        assert.ok(true, 'request made correctly when type = internal');
-        return this.emptyResponse;
-      });
-      this.server.post(`${this.backend}/intermediate/generate/exported`, () => {
-        assert.ok(true, 'request made correctly when type = exported');
-        return this.emptyResponse;
-      });
-      this.server.post(`${this.backend}/intermediate/generate/existing`, () => {
-        assert.ok(true, 'request made correctly when type = exising');
-        return this.emptyResponse;
-      });
-      this.server.post(`${this.backend}/intermediate/generate/kms`, () => {
-        assert.ok(true, 'request made correctly when type = kms');
-        return this.emptyResponse;
-      });
-
-      await this.store
-        .createRecord('pki/action', {
-          type: 'internal',
-        })
-        .save(adapterOptions);
-      await this.store
-        .createRecord('pki/action', {
-          type: 'exported',
-        })
-        .save(adapterOptions);
-      await this.store
-        .createRecord('pki/action', {
-          type: 'existing',
-        })
-        .save(adapterOptions);
-      await this.store
-        .createRecord('pki/action', {
-          type: 'kms',
-        })
-        .save(adapterOptions);
-    });
-
-    test('it calls the correct endpoint when useIssuer = true', async function (assert) {
-      assert.expect(4);
-      const adapterOptions = { adapterOptions: { actionType: 'generate-csr', useIssuer: true } };
-      this.server.post(`${this.backend}/issuers/generate/intermediate/internal`, () => {
-        assert.ok(true, 'request made correctly when type = internal');
-        return this.emptyResponse;
-      });
-      this.server.post(`${this.backend}/issuers/generate/intermediate/exported`, () => {
-        assert.ok(true, 'request made correctly when type = exported');
-        return this.emptyResponse;
-      });
-      this.server.post(`${this.backend}/issuers/generate/intermediate/existing`, () => {
-        assert.ok(true, 'request made correctly when type = exising');
-        return this.emptyResponse;
-      });
-      this.server.post(`${this.backend}/issuers/generate/intermediate/kms`, () => {
-        assert.ok(true, 'request made correctly when type = kms');
-        return this.emptyResponse;
-      });
-
-      await this.store
-        .createRecord('pki/action', {
-          type: 'internal',
-        })
-        .save(adapterOptions);
-      await this.store
-        .createRecord('pki/action', {
-          type: 'exported',
-        })
-        .save(adapterOptions);
-      await this.store
-        .createRecord('pki/action', {
-          type: 'existing',
-        })
-        .save(adapterOptions);
-      await this.store
-        .createRecord('pki/action', {
-          type: 'kms',
-        })
-        .save(adapterOptions);
-    });
-  });
-
-  module('actionType sign-intermediate', function () {
-    test('it overrides backend when adapter options specify a mount', async function (assert) {
-      assert.expect(1);
-      const mount = 'foo';
-      const issuerRef = 'ref';
-      const adapterOptions = {
-        adapterOptions: { actionType: 'sign-intermediate', mount, issuerRef },
-      };
-
-      this.server.post(`${mount}/issuer/${issuerRef}/sign-intermediate`, () => {
-        assert.ok(true, 'request made to correct mount');
-        return this.emptyResponse;
-      });
-
-      await this.store
-        .createRecord('pki/action', {
-          csr: '---BEGIN REQUEST---',
-        })
-        .save(adapterOptions);
-    });
-  });
-});
diff --git a/ui/tests/unit/adapters/pki/certificate/base-test.js b/ui/tests/unit/adapters/pki/certificate/base-test.js
deleted file mode 100644
index 76419d9426a78..0000000000000
--- a/ui/tests/unit/adapters/pki/certificate/base-test.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupTest } from 'vault/tests/helpers';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-
-module('Unit | Adapter | pki/certificate/base', function (hooks) {
-  setupTest(hooks);
-  setupMirage(hooks);
-
-  hooks.beforeEach(function () {
-    this.store = this.owner.lookup('service:store');
-    this.owner.lookup('service:secretMountPath').update('pki-test');
-  });
-
-  test('it should make request to correct endpoint on queryRecord', async function (assert) {
-    assert.expect(1);
-
-    this.server.get('/pki-test/cert/1234', () => {
-      assert.ok(true, 'Request made to correct endpoint on queryRecord');
-      return { data: {} };
-    });
-
-    await this.store.queryRecord('pki/certificate/base', { backend: 'pki-test', id: '1234' });
-  });
-
-  test('it should make request to correct endpoint on query', async function (assert) {
-    assert.expect(1);
-
-    this.server.get('/pki-test/certs', (schema, req) => {
-      assert.strictEqual(req.queryParams.list, 'true', 'Request made to correct endpoint on query');
-      return { data: { keys: [] } };
-    });
-
-    await this.store.query('pki/certificate/base', { backend: 'pki-test' });
-  });
-
-  test('it should make request to correct endpoint on update', async function (assert) {
-    assert.expect(1);
-
-    this.store.pushPayload('pki/certificate/base', {
-      modelName: 'pki/certificate/base',
-      data: {
-        serial_number: '1234',
-      },
-    });
-
-    this.server.post('pki-test/revoke', (schema, req) => {
-      assert.deepEqual(
-        JSON.parse(req.requestBody),
-        { serial_number: '1234' },
-        'Request made to correct endpoint on update'
-      );
-      return { data: {} };
-    });
-
-    await this.store.peekRecord('pki/certificate/base', '1234').save();
-  });
-});
diff --git a/ui/tests/unit/adapters/pki/certificate/generate-test.js b/ui/tests/unit/adapters/pki/certificate/generate-test.js
deleted file mode 100644
index 59c2fc8f7f814..0000000000000
--- a/ui/tests/unit/adapters/pki/certificate/generate-test.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupTest } from 'vault/tests/helpers';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-
-module('Unit | Adapter | pki/certificate/generate', function (hooks) {
-  setupTest(hooks);
-  setupMirage(hooks);
-
-  hooks.beforeEach(function () {
-    this.store = this.owner.lookup('service:store');
-    this.secretMountPath = this.owner.lookup('service:secret-mount-path');
-    this.backend = 'pki-test';
-    this.secretMountPath.currentPath = this.backend;
-    this.data = {
-      serial_number: 'my-serial-number',
-      certificate: 'some-cert',
-    };
-  });
-
-  test('it should make request to correct endpoint on create', async function (assert) {
-    assert.expect(1);
-    const generateData = {
-      role: 'my-role',
-      common_name: 'example.com',
-    };
-    this.server.post(`${this.backend}/issue/${generateData.role}`, () => {
-      assert.ok(true, 'request made to correct endpoint on create');
-      return {
-        data: {
-          serial_number: 'this-serial-number',
-        },
-      };
-    });
-
-    const model = await this.store.createRecord('pki/certificate/generate', generateData);
-    await model.save();
-  });
-});
diff --git a/ui/tests/unit/adapters/pki/certificate/sign-test.js b/ui/tests/unit/adapters/pki/certificate/sign-test.js
deleted file mode 100644
index 8357fe207f1e8..0000000000000
--- a/ui/tests/unit/adapters/pki/certificate/sign-test.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupTest } from 'vault/tests/helpers';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import { csr2 } from 'vault/tests/helpers/pki/values';
-
-module('Unit | Adapter | pki/certificate/sign', function (hooks) {
-  setupTest(hooks);
-  setupMirage(hooks);
-
-  hooks.beforeEach(function () {
-    this.store = this.owner.lookup('service:store');
-    this.secretMountPath = this.owner.lookup('service:secret-mount-path');
-    this.backend = 'pki-test';
-    this.secretMountPath.currentPath = this.backend;
-    this.data = {
-      serial_number: 'my-serial-number',
-      certificate: 'some-cert',
-    };
-  });
-
-  test('it should make request to correct endpoint on create', async function (assert) {
-    assert.expect(1);
-    const generateData = {
-      role: 'my-role',
-      csr: csr2,
-    };
-    this.server.post(`${this.backend}/sign/${generateData.role}`, () => {
-      assert.ok(true, 'request made to correct endpoint on create');
-      return {
-        data: this.data,
-      };
-    });
-
-    await this.store.createRecord('pki/certificate/sign', generateData).save();
-  });
-});
diff --git a/ui/tests/unit/adapters/pki/config-test.js b/ui/tests/unit/adapters/pki/config-test.js
deleted file mode 100644
index 337e6529cdee9..0000000000000
--- a/ui/tests/unit/adapters/pki/config-test.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupTest } from 'vault/tests/helpers';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-
-module('Unit | Adapter | pki/config', function (hooks) {
-  setupTest(hooks);
-  setupMirage(hooks);
-
-  hooks.beforeEach(async function () {
-    this.store = this.owner.lookup('service:store');
-    this.backend = 'pki-engine';
-  });
-
-  const testHelper = (test) => {
-    test('it should make request to correct endpoint on update', async function (assert) {
-      assert.expect(1);
-
-      this.server.post(`/${this.backend}/config/${this.endpoint}`, () => {
-        assert.ok(true, `request made to POST config/${this.endpoint} endpoint on update`);
-      });
-
-      this.store.pushPayload(`pki/config/${this.endpoint}`, {
-        modelName: `pki/config/${this.endpoint}`,
-        id: this.backend,
-      });
-
-      const model = this.store.peekRecord(`pki/config/${this.endpoint}`, this.backend);
-      await model.save();
-    });
-
-    test('it should make request to correct endpoint on find', async function (assert) {
-      assert.expect(1);
-
-      this.server.get(`/${this.backend}/config/${this.endpoint}`, () => {
-        assert.ok(true, `request is made to GET /config/${this.endpoint} endpoint on find`);
-        return { data: { id: this.backend } };
-      });
-
-      this.store.findRecord(`pki/config/${this.endpoint}`, this.backend);
-    });
-  };
-
-  module('cluster', function (hooks) {
-    hooks.beforeEach(async function () {
-      this.endpoint = 'cluster';
-    });
-    testHelper(test);
-  });
-
-  module('urls', function (hooks) {
-    hooks.beforeEach(async function () {
-      this.endpoint = 'urls';
-    });
-    testHelper(test);
-  });
-
-  module('crl', function (hooks) {
-    hooks.beforeEach(async function () {
-      this.endpoint = 'crl';
-    });
-    testHelper(test);
-  });
-});
diff --git a/ui/tests/unit/adapters/pki/key-test.js b/ui/tests/unit/adapters/pki/key-test.js
deleted file mode 100644
index 70f92ca29f16b..0000000000000
--- a/ui/tests/unit/adapters/pki/key-test.js
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-
-module('Unit | Adapter | pki/key', function (hooks) {
-  setupTest(hooks);
-  setupMirage(hooks);
-
-  hooks.beforeEach(function () {
-    this.store = this.owner.lookup('service:store');
-    this.secretMountPath = this.owner.lookup('service:secret-mount-path');
-    this.backend = 'pki-test';
-    this.secretMountPath.currentPath = this.backend;
-    this.data = {
-      key_id: '724862ff-6438-bad0-b598-77a6c7f4e934',
-      key_type: 'ec',
-      key_name: 'test-key',
-      key_bits: '256',
-    };
-  });
-
-  hooks.afterEach(function () {
-    this.server.shutdown();
-  });
-
-  test('it should make request to correct endpoint on query', async function (assert) {
-    assert.expect(1);
-    const { key_id, ...otherAttrs } = this.data; // excludes key_id from key_info data
-    const key_info = { [key_id]: { ...otherAttrs } };
-    this.server.get(`${this.backend}/keys`, (schema, req) => {
-      assert.strictEqual(req.queryParams.list, 'true', 'request is made to correct endpoint on query');
-      return { data: { keys: [key_id], key_info } };
-    });
-
-    this.store.query('pki/key', { backend: this.backend });
-  });
-
-  test('it should make request to correct endpoint on queryRecord', async function (assert) {
-    assert.expect(1);
-
-    this.server.get(`${this.backend}/key/${this.data.key_id}`, () => {
-      assert.ok(true, 'request is made to correct endpoint on query record');
-      return { data: this.data };
-    });
-
-    this.store.queryRecord('pki/key', { backend: this.backend, id: this.data.key_id });
-  });
-
-  test('it should make request to correct endpoint on delete', async function (assert) {
-    assert.expect(1);
-    this.store.pushPayload('pki/key', { modelName: 'pki/key', ...this.data });
-    this.server.get(`${this.backend}/key/${this.data.key_id}`, () => ({ data: this.data }));
-    this.server.delete(`${this.backend}/key/${this.data.key_id}`, () => {
-      assert.ok(true, 'request made to correct endpoint on delete');
-    });
-
-    const model = await this.store.queryRecord('pki/key', { backend: this.backend, id: this.data.key_id });
-    await model.destroyRecord();
-  });
-});
diff --git a/ui/tests/unit/adapters/pki/role-test.js b/ui/tests/unit/adapters/pki/role-test.js
deleted file mode 100644
index 04db9c42f2fe6..0000000000000
--- a/ui/tests/unit/adapters/pki/role-test.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-
-module('Unit | Adapter | pki/role', function (hooks) {
-  setupTest(hooks);
-  setupMirage(hooks);
-
-  hooks.beforeEach(function () {
-    this.store = this.owner.lookup('service:store');
-    this.store.unloadAll('pki/role');
-  });
-
-  test('it should make request to correct endpoint when updating a record', async function (assert) {
-    assert.expect(1);
-    this.server.post('/pki-not-hardcoded/roles/pki-test', () => {
-      assert.ok(true, 'POST request made to correct endpoint when updating a record');
-    });
-
-    this.store.pushPayload('pki/role', {
-      modelName: 'pki/role',
-      backend: 'pki-not-hardcoded',
-      id: 'pki-test',
-      name: 'pki-test',
-    });
-    const record = this.store.peekRecord('pki/role', 'pki-test');
-    await record.save();
-  });
-});
diff --git a/ui/tests/unit/adapters/pki/sign-intermediate-test.js b/ui/tests/unit/adapters/pki/sign-intermediate-test.js
deleted file mode 100644
index 8d0cc969d5f9d..0000000000000
--- a/ui/tests/unit/adapters/pki/sign-intermediate-test.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupTest } from 'vault/tests/helpers';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-
-module('Unit | Adapter | pki/sign-intermediate', function (hooks) {
-  setupTest(hooks);
-  setupMirage(hooks);
-
-  hooks.beforeEach(function () {
-    this.store = this.owner.lookup('service:store');
-    this.secretMountPath = this.owner.lookup('service:secret-mount-path');
-    this.backend = 'pki-test';
-    this.secretMountPath.currentPath = this.backend;
-    this.payload = {
-      issuerRef: 'my-issuer-id',
-    };
-  });
-
-  test('it exists', function (assert) {
-    const adapter = this.owner.lookup('adapter:pki/sign-intermediate');
-    assert.ok(adapter);
-  });
-
-  test('it calls the correct endpoint on save', async function (assert) {
-    assert.expect(2);
-
-    this.server.post(`${this.backend}/issuer/my-issuer-id/sign-intermediate`, () => {
-      assert.ok(true, 'correct endpoint called');
-      return {
-        request_id: 'unique-request-id',
-        data: {
-          foo: 'bar',
-        },
-      };
-    });
-
-    const result = await this.store.createRecord('pki/sign-intermediate', this.payload).save();
-    assert.strictEqual(result.id, 'unique-request-id', 'Resulting model has ID matching request ID');
-  });
-});
diff --git a/ui/tests/unit/adapters/pki/tidy-test.js b/ui/tests/unit/adapters/pki/tidy-test.js
deleted file mode 100644
index fd27c951df39e..0000000000000
--- a/ui/tests/unit/adapters/pki/tidy-test.js
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupTest } from 'vault/tests/helpers';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import { allowAllCapabilitiesStub } from 'vault/tests/helpers/stubs';
-
-module('Unit | Adapter | pki/tidy', function (hooks) {
-  setupTest(hooks);
-  setupMirage(hooks);
-
-  hooks.beforeEach(function () {
-    this.store = this.owner.lookup('service:store');
-    this.secretMountPath = this.owner.lookup('service:secret-mount-path');
-    this.backend = 'pki-test';
-    this.secretMountPath.currentPath = this.backend;
-    this.server.post('/sys/capabilities-self', allowAllCapabilitiesStub());
-  });
-
-  test('it exists', function (assert) {
-    const adapter = this.owner.lookup('adapter:pki/tidy');
-    assert.ok(adapter);
-  });
-
-  test('it calls the correct endpoint when tidyType = manual', async function (assert) {
-    assert.expect(1);
-
-    this.server.post(`${this.backend}/tidy`, () => {
-      assert.ok(true, 'request made to correct endpoint on create');
-      return {};
-    });
-    this.payload = {
-      tidy_cert_store: true,
-      tidy_revocation_queue: false,
-      safetyBuffer: '120h',
-      backend: this.backend,
-    };
-    await this.store.createRecord('pki/tidy', this.payload).save({ adapterOptions: { tidyType: 'manual' } });
-  });
-
-  test('it should make a request to correct endpoint for findRecord', async function (assert) {
-    assert.expect(1);
-    this.server.get(`${this.backend}/config/auto-tidy`, () => {
-      assert.ok(true, 'request made to correct endpoint on create');
-      return {
-        request_id: '2a4a1f36-20df-e71c-02d6-be15a09656f9',
-        lease_id: '',
-        renewable: false,
-        lease_duration: 0,
-        data: {
-          acme_account_safety_buffer: 2592000,
-          enabled: false,
-          interval_duration: 43200,
-          issuer_safety_buffer: 31536000,
-          maintain_stored_certificate_counts: false,
-          pause_duration: '0s',
-          publish_stored_certificate_count_metrics: false,
-          revocation_queue_safety_buffer: 172800,
-          safety_buffer: 259200,
-          tidy_acme: false,
-          tidy_cert_store: false,
-          tidy_cross_cluster_revoked_certs: false,
-          tidy_expired_issuers: false,
-          tidy_move_legacy_ca_bundle: false,
-          tidy_revocation_queue: false,
-          tidy_revoked_cert_issuer_associations: false,
-          tidy_revoked_certs: false,
-        },
-        wrap_info: null,
-        warnings: null,
-        auth: null,
-      };
-    });
-
-    this.store.findRecord('pki/tidy', this.backend);
-  });
-});
diff --git a/ui/tests/unit/adapters/secret-engine-test.js b/ui/tests/unit/adapters/secret-engine-test.js
index 620425485f7bc..cc8addac582ed 100644
--- a/ui/tests/unit/adapters/secret-engine-test.js
+++ b/ui/tests/unit/adapters/secret-engine-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import apiStub from 'vault/tests/helpers/noop-all-api-requests';
@@ -56,15 +51,11 @@ module('Unit | Adapter | secret engine', function (hooks) {
   cases.forEach((testCase) => {
     test(`secret-engine: ${testCase.description}`, function (assert) {
       assert.expect(2);
-      const adapter = this.owner.lookup('adapter:secret-engine');
+      let adapter = this.owner.lookup('adapter:secret-engine');
       adapter[testCase.adapterMethod](...testCase.args);
-      const { url, method } = this.server.handledRequests[0];
-      assert.strictEqual(
-        url,
-        testCase.url,
-        `${testCase.adapterMethod} calls the correct url: ${testCase.url}`
-      );
-      assert.strictEqual(
+      let { url, method } = this.server.handledRequests[0];
+      assert.equal(url, testCase.url, `${testCase.adapterMethod} calls the correct url: ${testCase.url}`);
+      assert.equal(
         method,
         testCase.method,
         `${testCase.adapterMethod} uses the correct http verb: ${testCase.method}`
diff --git a/ui/tests/unit/adapters/secret-test.js b/ui/tests/unit/adapters/secret-test.js
index c3d7f8885b0fe..9afe1e0fa75d4 100644
--- a/ui/tests/unit/adapters/secret-test.js
+++ b/ui/tests/unit/adapters/secret-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { resolve } from 'rsvp';
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
@@ -12,7 +7,7 @@ module('Unit | Adapter | secret', function (hooks) {
 
   test('secret api urls', function (assert) {
     let url, method, options;
-    const adapter = this.owner.factoryFor('adapter:secret').create({
+    let adapter = this.owner.factoryFor('adapter:secret').create({
       ajax: (...args) => {
         [url, method, options] = args;
         return resolve({});
@@ -20,12 +15,12 @@ module('Unit | Adapter | secret', function (hooks) {
     });
 
     adapter.query({}, 'secret', { id: '', backend: 'secret' });
-    assert.strictEqual(url, '/v1/secret/', 'query generic url OK');
-    assert.strictEqual(method, 'GET', 'query generic method OK');
+    assert.equal(url, '/v1/secret/', 'query generic url OK');
+    assert.equal(method, 'GET', 'query generic method OK');
     assert.deepEqual(options, { data: { list: true } }, 'query generic url OK');
 
     adapter.queryRecord({}, 'secret', { id: 'foo', backend: 'secret' });
-    assert.strictEqual(url, '/v1/secret/foo', 'queryRecord generic url OK');
-    assert.strictEqual(method, 'GET', 'queryRecord generic method OK');
+    assert.equal(url, '/v1/secret/foo', 'queryRecord generic url OK');
+    assert.equal(method, 'GET', 'queryRecord generic method OK');
   });
 });
diff --git a/ui/tests/unit/adapters/secret-v2-test.js b/ui/tests/unit/adapters/secret-v2-test.js
index 0503bd19430b9..a695abc4024f4 100644
--- a/ui/tests/unit/adapters/secret-v2-test.js
+++ b/ui/tests/unit/adapters/secret-v2-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import apiStub from 'vault/tests/helpers/noop-all-api-requests';
@@ -61,11 +56,11 @@ module('Unit | Adapter | secret-v2', function (hooks) {
     ],
   ].forEach(([adapterMethod, store, type, queryOrSnapshot, expectedHttpVerb, expectedURL]) => {
     test(`secret-v2: ${adapterMethod}`, function (assert) {
-      const adapter = this.owner.lookup('adapter:secret-v2');
+      let adapter = this.owner.lookup('adapter:secret-v2');
       adapter[adapterMethod](store, type, queryOrSnapshot);
-      const { url, method } = this.server.handledRequests[0];
-      assert.strictEqual(url, expectedURL, `${adapterMethod} calls the correct url: ${expectedURL}`);
-      assert.strictEqual(
+      let { url, method } = this.server.handledRequests[0];
+      assert.equal(url, expectedURL, `${adapterMethod} calls the correct url: ${expectedURL}`);
+      assert.equal(
         method,
         expectedHttpVerb,
         `${adapterMethod} uses the correct http verb: ${expectedHttpVerb}`
diff --git a/ui/tests/unit/adapters/secret-v2-version-test.js b/ui/tests/unit/adapters/secret-v2-version-test.js
index 7f328828a03b6..b537304457ebf 100644
--- a/ui/tests/unit/adapters/secret-v2-version-test.js
+++ b/ui/tests/unit/adapters/secret-v2-version-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /* eslint qunit/no-conditional-assertions: "warn" */
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
@@ -19,7 +14,7 @@ module('Unit | Adapter | secret-v2-version', function (hooks) {
     this.server.shutdown();
   });
 
-  const fakeStore = {
+  let fakeStore = {
     peekRecord() {
       return {
         rollbackAttributes() {},
@@ -85,11 +80,11 @@ module('Unit | Adapter | secret-v2-version', function (hooks) {
     ([testName, adapterMethod, args, expectedHttpVerb, expectedURL, exptectedRequestBody, assertCount]) => {
       test(`${testName}`, function (assert) {
         assert.expect(assertCount);
-        const adapter = this.owner.lookup('adapter:secret-v2-version');
+        let adapter = this.owner.lookup('adapter:secret-v2-version');
         adapter[adapterMethod](...args);
-        const { url, method, requestBody } = this.server.handledRequests[0];
-        assert.strictEqual(url, expectedURL, `${adapterMethod} calls the correct url: ${expectedURL}`);
-        assert.strictEqual(
+        let { url, method, requestBody } = this.server.handledRequests[0];
+        assert.equal(url, expectedURL, `${adapterMethod} calls the correct url: ${expectedURL}`);
+        assert.equal(
           method,
           expectedHttpVerb,
           `${adapterMethod} uses the correct http verb: ${expectedHttpVerb}`
diff --git a/ui/tests/unit/adapters/tools-test.js b/ui/tests/unit/adapters/tools-test.js
index bded186a040ce..b14dff2054716 100644
--- a/ui/tests/unit/adapters/tools-test.js
+++ b/ui/tests/unit/adapters/tools-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { resolve } from 'rsvp';
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
@@ -12,7 +7,7 @@ module('Unit | Adapter | tools', function (hooks) {
 
   test('wrapping api urls', function (assert) {
     let url, method, options;
-    const adapter = this.owner.factoryFor('adapter:tools').create({
+    let adapter = this.owner.factoryFor('adapter:tools').create({
       ajax: (...args) => {
         [url, method, options] = args;
         return resolve();
@@ -22,30 +17,30 @@ module('Unit | Adapter | tools', function (hooks) {
     let clientToken;
     let data = { foo: 'bar' };
     adapter.toolAction('wrap', data, { wrapTTL: '30m' });
-    assert.strictEqual(url, '/v1/sys/wrapping/wrap', 'wrapping:wrap url OK');
-    assert.strictEqual(method, 'POST', 'wrapping:wrap method OK');
+    assert.equal(url, '/v1/sys/wrapping/wrap', 'wrapping:wrap url OK');
+    assert.equal(method, 'POST', 'wrapping:wrap method OK');
     assert.deepEqual({ data: data, wrapTTL: '30m', clientToken }, options, 'wrapping:wrap options OK');
 
     data = { token: 'token' };
     adapter.toolAction('lookup', data);
-    assert.strictEqual(url, '/v1/sys/wrapping/lookup', 'wrapping:lookup url OK');
-    assert.strictEqual(method, 'POST', 'wrapping:lookup method OK');
+    assert.equal(url, '/v1/sys/wrapping/lookup', 'wrapping:lookup url OK');
+    assert.equal(method, 'POST', 'wrapping:lookup method OK');
     assert.deepEqual({ data, clientToken }, options, 'wrapping:lookup options OK');
 
     adapter.toolAction('unwrap', data);
-    assert.strictEqual(url, '/v1/sys/wrapping/unwrap', 'wrapping:unwrap url OK');
-    assert.strictEqual(method, 'POST', 'wrapping:unwrap method OK');
+    assert.equal(url, '/v1/sys/wrapping/unwrap', 'wrapping:unwrap url OK');
+    assert.equal(method, 'POST', 'wrapping:unwrap method OK');
     assert.deepEqual({ data, clientToken }, options, 'wrapping:unwrap options OK');
 
     adapter.toolAction('rewrap', data);
-    assert.strictEqual(url, '/v1/sys/wrapping/rewrap', 'wrapping:rewrap url OK');
-    assert.strictEqual(method, 'POST', 'wrapping:rewrap method OK');
+    assert.equal(url, '/v1/sys/wrapping/rewrap', 'wrapping:rewrap url OK');
+    assert.equal(method, 'POST', 'wrapping:rewrap method OK');
     assert.deepEqual({ data, clientToken }, options, 'wrapping:rewrap options OK');
   });
 
   test('tools api urls', function (assert) {
     let url, method;
-    const adapter = this.owner.factoryFor('adapter:tools').create({
+    let adapter = this.owner.factoryFor('adapter:tools').create({
       ajax: (...args) => {
         [url, method] = args;
         return resolve();
@@ -53,11 +48,11 @@ module('Unit | Adapter | tools', function (hooks) {
     });
 
     adapter.toolAction('hash', { input: 'someBase64' });
-    assert.strictEqual(url, '/v1/sys/tools/hash', 'sys tools hash: url OK');
-    assert.strictEqual(method, 'POST', 'sys tools hash: method OK');
+    assert.equal(url, '/v1/sys/tools/hash', 'sys tools hash: url OK');
+    assert.equal(method, 'POST', 'sys tools hash: method OK');
 
     adapter.toolAction('random', { bytes: '32' });
-    assert.strictEqual(url, '/v1/sys/tools/random', 'sys tools random: url OK');
-    assert.strictEqual(method, 'POST', 'sys tools random: method OK');
+    assert.equal(url, '/v1/sys/tools/random', 'sys tools random: url OK');
+    assert.equal(method, 'POST', 'sys tools random: method OK');
   });
 });
diff --git a/ui/tests/unit/adapters/transit-key-test.js b/ui/tests/unit/adapters/transit-key-test.js
index ef7af8a501e11..e42382ba617f7 100644
--- a/ui/tests/unit/adapters/transit-key-test.js
+++ b/ui/tests/unit/adapters/transit-key-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { resolve } from 'rsvp';
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
@@ -12,7 +7,7 @@ module('Unit | Adapter | transit key', function (hooks) {
 
   test('transit api urls', function (assert) {
     let url, method, options;
-    const adapter = this.owner.factoryFor('adapter:transit-key').create({
+    let adapter = this.owner.factoryFor('adapter:transit-key').create({
       ajax: (...args) => {
         [url, method, options] = args;
         return resolve({});
@@ -20,31 +15,27 @@ module('Unit | Adapter | transit key', function (hooks) {
     });
 
     adapter.query({}, 'transit-key', { id: '', backend: 'transit' });
-    assert.strictEqual(url, '/v1/transit/keys/', 'query list url OK');
-    assert.strictEqual(method, 'GET', 'query list method OK');
+    assert.equal(url, '/v1/transit/keys/', 'query list url OK');
+    assert.equal(method, 'GET', 'query list method OK');
     assert.deepEqual(options, { data: { list: true } }, 'query generic url OK');
 
     adapter.queryRecord({}, 'transit-key', { id: 'foo', backend: 'transit' });
-    assert.strictEqual(url, '/v1/transit/keys/foo', 'queryRecord generic url OK');
-    assert.strictEqual(method, 'GET', 'queryRecord generic method OK');
+    assert.equal(url, '/v1/transit/keys/foo', 'queryRecord generic url OK');
+    assert.equal(method, 'GET', 'queryRecord generic method OK');
 
     adapter.keyAction('rotate', { backend: 'transit', id: 'foo', payload: {} });
-    assert.strictEqual(url, '/v1/transit/keys/foo/rotate', 'keyAction:rotate url OK');
+    assert.equal(url, '/v1/transit/keys/foo/rotate', 'keyAction:rotate url OK');
 
     adapter.keyAction('encrypt', { backend: 'transit', id: 'foo', payload: {} });
-    assert.strictEqual(url, '/v1/transit/encrypt/foo', 'keyAction:encrypt url OK');
+    assert.equal(url, '/v1/transit/encrypt/foo', 'keyAction:encrypt url OK');
 
     adapter.keyAction('datakey', { backend: 'transit', id: 'foo', payload: { param: 'plaintext' } });
-    assert.strictEqual(url, '/v1/transit/datakey/plaintext/foo', 'keyAction:datakey url OK');
+    assert.equal(url, '/v1/transit/datakey/plaintext/foo', 'keyAction:datakey url OK');
 
     adapter.keyAction('export', { backend: 'transit', id: 'foo', payload: { param: ['hmac'] } });
-    assert.strictEqual(url, '/v1/transit/export/hmac-key/foo', 'transitAction:export, no version url OK');
+    assert.equal(url, '/v1/transit/export/hmac-key/foo', 'transitAction:export, no version url OK');
 
     adapter.keyAction('export', { backend: 'transit', id: 'foo', payload: { param: ['hmac', 10] } });
-    assert.strictEqual(
-      url,
-      '/v1/transit/export/hmac-key/foo/10',
-      'transitAction:export, with version url OK'
-    );
+    assert.equal(url, '/v1/transit/export/hmac-key/foo/10', 'transitAction:export, with version url OK');
   });
 });
diff --git a/ui/tests/unit/components/auth-form-test.js b/ui/tests/unit/components/auth-form-test.js
index 7bd1445fd4e14..d7b07d460acd6 100644
--- a/ui/tests/unit/components/auth-form-test.js
+++ b/ui/tests/unit/components/auth-form-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { settled } from '@ember/test-helpers';
diff --git a/ui/tests/unit/components/auth-jwt-test.js b/ui/tests/unit/components/auth-jwt-test.js
index 733b0f279a78d..c62324afcf8ca 100644
--- a/ui/tests/unit/components/auth-jwt-test.js
+++ b/ui/tests/unit/components/auth-jwt-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import EmberObject from '@ember/object';
@@ -65,7 +60,7 @@ module('Unit | Component | auth-jwt', function (hooks) {
     this.component.window.trigger('message', message);
 
     assert.ok(this.errorSpy.notCalled, 'Error handler not triggered while waiting for oidc callback message');
-    assert.strictEqual(
+    assert.equal(
       this.component.exchangeOIDC.performCount,
       1,
       'exchangeOIDC method fires when oidc callback message is received'
diff --git a/ui/tests/unit/components/identity/edit-form-test.js b/ui/tests/unit/components/identity/edit-form-test.js
index 8fdd6e4ec5b25..26eb84bc538de 100644
--- a/ui/tests/unit/components/identity/edit-form-test.js
+++ b/ui/tests/unit/components/identity/edit-form-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import EmberObject from '@ember/object';
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
@@ -11,7 +6,7 @@ import sinon from 'sinon';
 module('Unit | Component | identity/edit-form', function (hooks) {
   setupTest(hooks);
 
-  const testCases = [
+  let testCases = [
     {
       identityType: 'entity',
       mode: 'create',
@@ -59,16 +54,16 @@ module('Unit | Component | identity/edit-form', function (hooks) {
     },
   ];
   testCases.forEach(function (testCase) {
-    const model = EmberObject.create({
+    let model = EmberObject.create({
       identityType: testCase.identityType,
       rollbackAttributes: sinon.spy(),
     });
     test(`it computes cancelLink properly: ${testCase.identityType} ${testCase.mode}`, function (assert) {
-      const component = this.owner.lookup('component:identity/edit-form');
+      let component = this.owner.lookup('component:identity/edit-form');
 
       component.set('mode', testCase.mode);
       component.set('model', model);
-      assert.strictEqual(component.get('cancelLink'), testCase.expected, 'cancel link is correct');
+      assert.equal(component.get('cancelLink'), testCase.expected, 'cancel link is correct');
     });
   });
 });
diff --git a/ui/tests/unit/decorators/model-expanded-attributes-test.js b/ui/tests/unit/decorators/model-expanded-attributes-test.js
deleted file mode 100644
index f7c12cffb6855..0000000000000
--- a/ui/tests/unit/decorators/model-expanded-attributes-test.js
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
-import sinon from 'sinon';
-import Model, { attr } from '@ember-data/model';
-import { withExpandedAttributes } from 'vault/decorators/model-expanded-attributes';
-
-// create class using decorator
-const createClass = () => {
-  @withExpandedAttributes()
-  class Foo extends Model {
-    @attr('string', {
-      label: 'Foo',
-      subText: 'A form field',
-    })
-    foo;
-    @attr('boolean', {
-      label: 'Bar',
-      subText: 'Maybe a checkbox',
-    })
-    bar;
-    @attr('number', {
-      label: 'Baz',
-      subText: 'A number field',
-    })
-    baz;
-
-    get fieldGroups() {
-      return [{ default: ['baz'] }, { 'Other options': ['foo', 'bar'] }];
-    }
-  }
-  return new Foo();
-};
-
-module('Unit | Decorators | model-expanded-attributes', function (hooks) {
-  setupTest(hooks);
-
-  hooks.beforeEach(function () {
-    this.spy = sinon.spy(console, 'error');
-    this.fooField = {
-      name: 'foo',
-      options: { label: 'Foo', subText: 'A form field' },
-      type: 'string',
-    };
-    this.barField = {
-      name: 'bar',
-      options: { label: 'Bar', subText: 'Maybe a checkbox' },
-      type: 'boolean',
-    };
-    this.bazField = {
-      name: 'baz',
-      options: { label: 'Baz', subText: 'A number field' },
-      type: 'number',
-    };
-  });
-  hooks.afterEach(function () {
-    this.spy.restore();
-  });
-
-  test('it should warn when applying decorator to class that does not extend Model', function (assert) {
-    @withExpandedAttributes()
-    class Foo {} // eslint-disable-line
-    const message =
-      'withExpandedAttributes decorator must be used on instance of ember-data Model class. Decorator not applied to returned class';
-    assert.ok(this.spy.calledWith(message), 'Error is printed to console');
-  });
-
-  test('it adds allByKey value to model', function (assert) {
-    assert.expect(1);
-    const model = createClass();
-    assert.deepEqual(
-      { foo: this.fooField, bar: this.barField, baz: this.bazField },
-      model.allByKey,
-      'allByKey set on Model class'
-    );
-  });
-
-  test('_expandGroups helper works correctly', function (assert) {
-    const model = createClass();
-    const result = model._expandGroups(model.fieldGroups);
-    assert.deepEqual(result, [
-      { default: [this.bazField] },
-      { 'Other options': [this.fooField, this.barField] },
-    ]);
-  });
-
-  test('_expandGroups throws assertion when incorrect inputs', function (assert) {
-    assert.expect(1);
-    const model = createClass();
-    try {
-      model._expandGroups({ foo: ['bar'] });
-    } catch (e) {
-      assert.strictEqual(e.message, '_expandGroups expects an array of objects');
-    }
-  });
-});
diff --git a/ui/tests/unit/decorators/model-form-fields-test.js b/ui/tests/unit/decorators/model-form-fields-test.js
deleted file mode 100644
index 170db03aed26e..0000000000000
--- a/ui/tests/unit/decorators/model-form-fields-test.js
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
-import { withFormFields } from 'vault/decorators/model-form-fields';
-import sinon from 'sinon';
-import Model, { attr } from '@ember-data/model';
-
-// create class using decorator
-const createClass = (propertyNames, groups) => {
-  @withFormFields(propertyNames, groups)
-  class Foo extends Model {
-    @attr('string', {
-      label: 'Foo',
-      subText: 'A form field',
-    })
-    foo;
-    @attr('boolean', {
-      label: 'Bar',
-      subText: 'Maybe a checkbox',
-    })
-    bar;
-    @attr('number', {
-      label: 'Baz',
-      subText: 'A number field',
-    })
-    baz;
-  }
-  return new Foo();
-};
-
-module('Unit | Decorators | ModelFormFields', function (hooks) {
-  setupTest(hooks);
-
-  hooks.beforeEach(function () {
-    this.spy = sinon.spy(console, 'error');
-    this.fooField = {
-      name: 'foo',
-      options: { label: 'Foo', subText: 'A form field' },
-      type: 'string',
-    };
-    this.barField = {
-      name: 'bar',
-      options: { label: 'Bar', subText: 'Maybe a checkbox' },
-      type: 'boolean',
-    };
-    this.bazField = {
-      name: 'baz',
-      options: { label: 'Baz', subText: 'A number field' },
-      type: 'number',
-    };
-  });
-  hooks.afterEach(function () {
-    this.spy.restore();
-  });
-
-  test('it should warn when applying decorator to class that does not extend Model', function (assert) {
-    @withFormFields()
-    class Foo {} // eslint-disable-line
-    const message =
-      'withFormFields decorator must be used on instance of ember-data Model class. Decorator not applied to returned class';
-    assert.ok(this.spy.calledWith(message), 'Error is printed to console');
-  });
-
-  test('it return allFields when arguments not provided', function (assert) {
-    assert.expect(1);
-    const model = createClass();
-    assert.deepEqual(
-      [this.fooField, this.barField, this.bazField],
-      model.allFields,
-      'allFields set on Model class'
-    );
-  });
-
-  test('it should set formFields prop on Model class', function (assert) {
-    const model = createClass(['foo']);
-    assert.deepEqual([this.fooField], model.formFields, 'formFields set on Model class');
-  });
-
-  test('it should set formFieldGroups on Model class', function (assert) {
-    const groups = [{ default: ['foo'] }, { subgroup: ['bar'] }];
-    const model = createClass(null, groups);
-    const fieldGroups = [{ default: [this.fooField] }, { subgroup: [this.barField] }];
-    assert.deepEqual(fieldGroups, model.formFieldGroups, 'formFieldGroups set on Model class');
-  });
-});
diff --git a/ui/tests/unit/decorators/model-validations-test.js b/ui/tests/unit/decorators/model-validations-test.js
index 4de890380288f..c34d0e313ed6d 100644
--- a/ui/tests/unit/decorators/model-validations-test.js
+++ b/ui/tests/unit/decorators/model-validations-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { withModelValidations } from 'vault/decorators/model-validations';
@@ -38,7 +33,7 @@ module('Unit | Decorators | ModelValidations', function (hooks) {
     try {
       createClass();
     } catch (e) {
-      assert.strictEqual(e.message, 'Validations object must be provided to constructor for setup');
+      assert.equal(e.message, 'Validations object must be provided to constructor for setup');
     }
   });
 
@@ -74,7 +69,7 @@ module('Unit | Decorators | ModelValidations', function (hooks) {
     assert.false(v1.isValid, 'isValid state is correct when errors exist');
     assert.deepEqual(
       v1.state,
-      { foo: { isValid: false, errors: [message], warnings: [] } },
+      { foo: { isValid: false, errors: [message] } },
       'Correct state returned when property is invalid'
     );
 
@@ -83,7 +78,7 @@ module('Unit | Decorators | ModelValidations', function (hooks) {
     assert.true(v2.isValid, 'isValid state is correct when no errors exist');
     assert.deepEqual(
       v2.state,
-      { foo: { isValid: true, errors: [], warnings: [] } },
+      { foo: { isValid: true, errors: [] } },
       'Correct state returned when property is valid'
     );
   });
@@ -97,7 +92,7 @@ module('Unit | Decorators | ModelValidations', function (hooks) {
     };
     const fooClass = createClass(validations);
     const v1 = fooClass.validate();
-    assert.strictEqual(
+    assert.equal(
       v1.invalidFormMessage,
       'There are 2 errors with this form.',
       'error message says form as 2 errors'
@@ -105,7 +100,7 @@ module('Unit | Decorators | ModelValidations', function (hooks) {
 
     fooClass.integer = 9;
     const v2 = fooClass.validate();
-    assert.strictEqual(
+    assert.equal(
       v2.invalidFormMessage,
       'There is an error with this form.',
       'error message says form has an error'
@@ -113,24 +108,6 @@ module('Unit | Decorators | ModelValidations', function (hooks) {
 
     fooClass.foo = true;
     const v3 = fooClass.validate();
-    assert.strictEqual(v3.invalidFormMessage, null, 'invalidFormMessage is null when form is valid');
-  });
-
-  test('it should validate warnings', function (assert) {
-    const message = 'Value contains whitespace.';
-    const validations = {
-      foo: [
-        {
-          type: 'containsWhiteSpace',
-          message,
-          level: 'warn',
-        },
-      ],
-    };
-    const fooClass = createClass(validations);
-    fooClass.foo = 'foo bar';
-    const { state, isValid } = fooClass.validate();
-    assert.true(isValid, 'Model is considered valid when there are only warnings');
-    assert.strictEqual(state.foo.warnings.join(' '), message, 'Warnings are returned');
+    assert.equal(v3.invalidFormMessage, null, 'invalidFormMessage is null when form is valid');
   });
 });
diff --git a/ui/tests/unit/helpers/await-test.js b/ui/tests/unit/helpers/await-test.js
index 092afcf4b8bbf..e401047791567 100644
--- a/ui/tests/unit/helpers/await-test.js
+++ b/ui/tests/unit/helpers/await-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import AwaitHelper from 'vault/helpers/await';
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
@@ -34,36 +29,36 @@ module('Unit | Helpers | await', function (hooks) {
 
   test('it returns value when input is not a promise', async function (assert) {
     this.helper.compute(['foo']);
-    assert.strictEqual(this.spy.returnValues[0], 'foo', 'Input value returned when not promise');
+    assert.equal(this.spy.returnValues[0], 'foo', 'Input value returned when not promise');
   });
 
   test('it returns null default value and then resolved value', async function (assert) {
     const promise = new Promise((resolve) => resolve('foo'));
     this.helper.compute([promise]);
     await waitUntil(() => this.spy.returnValues[1]);
-    assert.strictEqual(this.spy.returnValues[0], null, 'Default value returned while promise resolves');
-    assert.strictEqual(this.spy.returnValues[1], 'foo', 'Resolved value is returned');
+    assert.equal(this.spy.returnValues[0], null, 'Default value returned while promise resolves');
+    assert.equal(this.spy.returnValues[1], 'foo', 'Resolved value is returned');
   });
 
   test('it returns rejected value', async function (assert) {
     const promise = new Promise((resolve, reject) => reject('bar'));
     this.helper.compute([promise]);
     await waitUntil(() => this.spy.returnValues[1]);
-    assert.strictEqual(this.spy.returnValues[1], 'bar', 'Rejected value is returned');
+    assert.equal(this.spy.returnValues[1], 'bar', 'Rejected value is returned');
   });
 
   test('it returns then value', async function (assert) {
     const promise = new Promise((resolve) => resolve('foo')).then(() => 'new resolve value');
     this.helper.compute([promise]);
     await waitUntil(() => this.spy.returnValues[1]);
-    assert.strictEqual(this.spy.returnValues[1], 'new resolve value', 'Value from then is returned');
+    assert.equal(this.spy.returnValues[1], 'new resolve value', 'Value from then is returned');
   });
 
   test('it returns catch value', async function (assert) {
     const promise = new Promise((resolve, reject) => reject('bar')).catch(() => 'new reject value');
     this.helper.compute([promise]);
     await waitUntil(() => this.spy.returnValues[1]);
-    assert.strictEqual(this.spy.returnValues[1], 'new reject value', 'Value from catch is returned');
+    assert.equal(this.spy.returnValues[1], 'new reject value', 'Value from catch is returned');
   });
 
   test('it always returns value from latest promise', async function (assert) {
@@ -73,6 +68,6 @@ module('Unit | Helpers | await', function (hooks) {
     this.helper.compute([promise2]);
     // allow first promise time to resolve
     await waitUntil(() => later(() => true, 500));
-    assert.strictEqual(this.spy.returnValues[2], 'bar', 'Latest promise value is returned');
+    assert.equal(this.spy.returnValues[2], 'bar', 'Latest promise value is returned');
   });
 });
diff --git a/ui/tests/unit/helpers/filter-wildcard-test.js b/ui/tests/unit/helpers/filter-wildcard-test.js
index 17baf0201aa86..7eec3e6e9dcf4 100644
--- a/ui/tests/unit/helpers/filter-wildcard-test.js
+++ b/ui/tests/unit/helpers/filter-wildcard-test.js
@@ -1,30 +1,25 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { filterWildcard } from 'vault/helpers/filter-wildcard';
 import { module, test } from 'qunit';
 
 module('Unit | Helpers | filter-wildcard', function () {
   test('it returns a count if array contains a wildcard', function (assert) {
-    const string = { id: 'foo*' };
-    const array = ['foobar', 'foozar', 'boo', 'oof'];
-    const result = filterWildcard([string, array]);
-    assert.strictEqual(result, 2);
+    let string = { id: 'foo*' };
+    let array = ['foobar', 'foozar', 'boo', 'oof'];
+    let result = filterWildcard([string, array]);
+    assert.equal(result, 2);
   });
 
   test('it returns zero if no wildcard is string', function (assert) {
-    const string = { id: 'foo#' };
-    const array = ['foobar', 'foozar', 'boo', 'oof'];
-    const result = filterWildcard([string, array]);
-    assert.strictEqual(result, 0);
+    let string = { id: 'foo#' };
+    let array = ['foobar', 'foozar', 'boo', 'oof'];
+    let result = filterWildcard([string, array]);
+    assert.equal(result, 0);
   });
 
   test('it escapes function and does not error if no id is in string', function (assert) {
-    const string = '*bar*';
-    const array = ['foobar', 'foozar', 'boobarboo', 'oof'];
-    const result = filterWildcard([string, array]);
-    assert.strictEqual(result, 2);
+    let string = '*bar*';
+    let array = ['foobar', 'foozar', 'boobarboo', 'oof'];
+    let result = filterWildcard([string, array]);
+    assert.equal(result, 2);
   });
 });
diff --git a/ui/tests/unit/helpers/is-wildcard-string-test.js b/ui/tests/unit/helpers/is-wildcard-string-test.js
index a718579128f20..5c0c5152fbccf 100644
--- a/ui/tests/unit/helpers/is-wildcard-string-test.js
+++ b/ui/tests/unit/helpers/is-wildcard-string-test.js
@@ -1,45 +1,40 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { isWildcardString } from 'vault/helpers/is-wildcard-string';
 import { module, test } from 'qunit';
 
 module('Unit | Helpers | is-wildcard-string', function () {
   test('it returns true if regular string with wildcard', function (assert) {
-    const string = 'foom#*eep';
-    const result = isWildcardString([string]);
+    let string = 'foom#*eep';
+    let result = isWildcardString([string]);
     assert.true(result);
   });
 
   test('it returns false if no wildcard', function (assert) {
-    const string = 'foo.bar';
-    const result = isWildcardString([string]);
+    let string = 'foo.bar';
+    let result = isWildcardString([string]);
     assert.false(result);
   });
 
   test('it returns true if string with id as in searchSelect selected has wildcard', function (assert) {
-    const string = { id: 'foo.bar*baz' };
-    const result = isWildcardString([string]);
+    let string = { id: 'foo.bar*baz' };
+    let result = isWildcardString([string]);
     assert.true(result);
   });
 
   test('it returns true if string object has name and no id', function (assert) {
-    const string = { name: 'foo.bar*baz' };
-    const result = isWildcardString([string]);
+    let string = { name: 'foo.bar*baz' };
+    let result = isWildcardString([string]);
     assert.true(result);
   });
 
   test('it returns true if string object has name and id with at least one wildcard', function (assert) {
-    const string = { id: '7*', name: 'seven' };
-    const result = isWildcardString([string]);
+    let string = { id: '7*', name: 'seven' };
+    let result = isWildcardString([string]);
     assert.true(result);
   });
 
   test('it returns true if string object has name and id with wildcard in name not id', function (assert) {
-    const string = { id: '7', name: 'sev*n' };
-    const result = isWildcardString([string]);
+    let string = { id: '7', name: 'sev*n' };
+    let result = isWildcardString([string]);
     assert.true(result);
   });
 });
diff --git a/ui/tests/unit/lib/attach-capabilities-test.js b/ui/tests/unit/lib/attach-capabilities-test.js
index cef31091d3998..45033f8a91f84 100644
--- a/ui/tests/unit/lib/attach-capabilities-test.js
+++ b/ui/tests/unit/lib/attach-capabilities-test.js
@@ -1,17 +1,12 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import Model from '@ember-data/model';
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import attachCapabilities from 'vault/lib/attach-capabilities';
 import apiPath from 'vault/utils/api-path';
 
-const MODEL_TYPE = 'test-form-model';
+let MODEL_TYPE = 'test-form-model';
 
-const makeModelClass = () => {
+let makeModelClass = () => {
   return Model.extend();
 };
 
@@ -26,14 +21,14 @@ module('Unit | lib | attach capabilities', function (hooks) {
     });
     let relationship = mc.relationshipsByName.get('updatePath');
 
-    assert.strictEqual(relationship.key, 'updatePath', 'has updatePath relationship');
-    assert.strictEqual(relationship.kind, 'belongsTo', 'kind of relationship is belongsTo');
-    assert.strictEqual(relationship.type, 'capabilities', 'updatePath is a related capabilities model');
+    assert.equal(relationship.key, 'updatePath', 'has updatePath relationship');
+    assert.equal(relationship.kind, 'belongsTo', 'kind of relationship is belongsTo');
+    assert.equal(relationship.type, 'capabilities', 'updatePath is a related capabilities model');
 
     relationship = mc.relationshipsByName.get('deletePath');
-    assert.strictEqual(relationship.key, 'deletePath', 'has deletePath relationship');
-    assert.strictEqual(relationship.kind, 'belongsTo', 'kind of relationship is belongsTo');
-    assert.strictEqual(relationship.type, 'capabilities', 'deletePath is a related capabilities model');
+    assert.equal(relationship.key, 'deletePath', 'has deletePath relationship');
+    assert.equal(relationship.kind, 'belongsTo', 'kind of relationship is belongsTo');
+    assert.equal(relationship.type, 'capabilities', 'deletePath is a related capabilities model');
   });
 
   test('it adds a static method to the model class', function (assert) {
@@ -52,7 +47,7 @@ module('Unit | lib | attach capabilities', function (hooks) {
       updatePath: apiPath`update/${'id'}`,
       deletePath: apiPath`delete/${'id'}`,
     });
-    const jsonAPIDocSingle = {
+    let jsonAPIDocSingle = {
       data: {
         id: 'test',
         type: MODEL_TYPE,
@@ -62,7 +57,7 @@ module('Unit | lib | attach capabilities', function (hooks) {
       included: [],
     };
 
-    const expected = {
+    let expected = {
       data: {
         id: 'test',
         type: MODEL_TYPE,
@@ -87,7 +82,7 @@ module('Unit | lib | attach capabilities', function (hooks) {
 
     mc.relatedCapabilities(jsonAPIDocSingle);
 
-    assert.strictEqual(
+    assert.equal(
       Object.keys(jsonAPIDocSingle.data.relationships).length,
       2,
       'document now has 2 relationships'
@@ -101,7 +96,7 @@ module('Unit | lib | attach capabilities', function (hooks) {
       updatePath: apiPath`update/${'id'}`,
       deletePath: apiPath`delete/${'id'}`,
     });
-    const jsonAPIDocSingle = {
+    let jsonAPIDocSingle = {
       data: [
         {
           id: 'test',
@@ -119,7 +114,7 @@ module('Unit | lib | attach capabilities', function (hooks) {
       included: [],
     };
 
-    const expected = {
+    let expected = {
       data: [
         {
           id: 'test',
diff --git a/ui/tests/unit/lib/console-helpers-test.js b/ui/tests/unit/lib/console-helpers-test.js
index 4d4b92f932854..ff9c8b7e9c649 100644
--- a/ui/tests/unit/lib/console-helpers-test.js
+++ b/ui/tests/unit/lib/console-helpers-test.js
@@ -1,16 +1,10 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import {
   parseCommand,
+  extractDataAndFlags,
   logFromResponse,
   logFromError,
-  formattedErrorFromInput,
-  extractFlagsFromStrings,
-  extractDataFromStrings,
+  logErrorFromInput,
 } from 'vault/lib/console-helpers';
 
 module('Unit | Lib | console helpers', function () {
@@ -21,16 +15,16 @@ module('Unit | Lib | console helpers', function () {
       access_key=AKIAJWVN5Z4FOFT7NLNA \
       secret_key=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 \
       region=us-east-1`,
-      expected: {
-        method: 'write',
-        flagArray: [],
-        path: 'aws/config/root',
-        dataArray: [
+      expected: [
+        'write',
+        [],
+        'aws/config/root',
+        [
           'access_key=AKIAJWVN5Z4FOFT7NLNA',
           'secret_key=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',
           'region=us-east-1',
         ],
-      },
+      ],
     },
     {
       name: 'write with space in a value',
@@ -44,11 +38,11 @@ module('Unit | Lib | console helpers', function () {
       insecure_tls=true \
       starttls=false
       `,
-      expected: {
-        method: 'write',
-        flagArray: [],
-        path: 'auth/ldap/config',
-        dataArray: [
+      expected: [
+        'write',
+        [],
+        'auth/ldap/config',
+        [
           'url=ldap://ldap.example.com:3268',
           'binddn=CN=ServiceViewDev,OU=Service Accounts,DC=example,DC=com',
           'bindpass=xxxxxxxxxxxxxxxxxxxxxxxxxx',
@@ -57,7 +51,7 @@ module('Unit | Lib | console helpers', function () {
           'insecure_tls=true',
           'starttls=false',
         ],
-      },
+      ],
     },
     {
       name: 'write with double quotes',
@@ -65,7 +59,7 @@ module('Unit | Lib | console helpers', function () {
       auth/token/create \
       policies="foo"
       `,
-      expected: { method: 'write', flagArray: [], path: 'auth/token/create', dataArray: ['policies=foo'] },
+      expected: ['write', [], 'auth/token/create', ['policies=foo']],
     },
     {
       name: 'write with single quotes',
@@ -73,7 +67,7 @@ module('Unit | Lib | console helpers', function () {
       auth/token/create \
       policies='foo'
       `,
-      expected: { method: 'write', flagArray: [], path: 'auth/token/create', dataArray: ['policies=foo'] },
+      expected: ['write', [], 'auth/token/create', ['policies=foo']],
     },
     {
       name: 'write with unmatched quotes',
@@ -81,54 +75,51 @@ module('Unit | Lib | console helpers', function () {
       auth/token/create \
       policies="'foo"
       `,
-      expected: { method: 'write', flagArray: [], path: 'auth/token/create', dataArray: ["policies='foo"] },
+      expected: ['write', [], 'auth/token/create', ["policies='foo"]],
     },
     {
       name: 'write with shell characters',
       /* eslint-disable no-useless-escape */
       command: `vault write  database/roles/api-prod db_name=apiprod creation_statements="CREATE ROLE \"{{name}}\" WITH LOGIN PASSWORD '{{password}}' VALID UNTIL '{{expiration}}'; GRANT SELECT ON ALL TABLES IN SCHEMA public TO \"{{name}}\";" default_ttl=1h max_ttl=24h
       `,
-      expected: {
-        method: 'write',
-        flagArray: [],
-        path: 'database/roles/api-prod',
-        dataArray: [
+      expected: [
+        'write',
+        [],
+        'database/roles/api-prod',
+        [
           'db_name=apiprod',
           `creation_statements=CREATE ROLE {{name}} WITH LOGIN PASSWORD '{{password}}' VALID UNTIL '{{expiration}}'; GRANT SELECT ON ALL TABLES IN SCHEMA public TO {{name}};`,
           'default_ttl=1h',
           'max_ttl=24h',
         ],
-      },
+      ],
     },
 
     {
       name: 'read with field',
       command: `vault read -field=access_key aws/creds/my-role`,
-      expected: {
-        method: 'read',
-        flagArray: ['-field=access_key'],
-        path: 'aws/creds/my-role',
-        dataArray: [],
-      },
+      expected: ['read', ['-field=access_key'], 'aws/creds/my-role', []],
     },
   ];
 
   testCommands.forEach(function (testCase) {
     test(`#parseCommand: ${testCase.name}`, function (assert) {
-      const result = parseCommand(testCase.command);
+      let result = parseCommand(testCase.command);
       assert.deepEqual(result, testCase.expected);
     });
   });
 
   test('#parseCommand: invalid commands', function (assert) {
-    assert.expect(1);
-    const command = 'vault kv get foo';
+    let command = 'vault kv get foo';
+    let result = parseCommand(command);
+    assert.false(result, 'parseCommand returns false by default');
+
     assert.throws(
       () => {
-        parseCommand(command);
+        parseCommand(command, true);
       },
       /invalid command/,
-      'throws on invalid command'
+      'throws on invalid command when `shouldThrow` is true'
     );
   });
 
@@ -136,12 +127,14 @@ module('Unit | Lib | console helpers', function () {
     {
       method: 'read',
       name: 'data fields',
-      dataInput: [
-        'access_key=AKIAJWVN5Z4FOFT7NLNA',
-        'secret_key=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',
-        'region=us-east-1',
+      input: [
+        [
+          'access_key=AKIAJWVN5Z4FOFT7NLNA',
+          'secret_key=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',
+          'region=us-east-1',
+        ],
+        [],
       ],
-      flagInput: [],
       expected: {
         data: {
           access_key: 'AKIAJWVN5Z4FOFT7NLNA',
@@ -154,8 +147,7 @@ module('Unit | Lib | console helpers', function () {
     {
       method: 'read',
       name: 'repeated data and a flag',
-      dataInput: ['allowed_domains=example.com', 'allowed_domains=foo.example.com'],
-      flagInput: ['-wrap-ttl=2h'],
+      input: [['allowed_domains=example.com', 'allowed_domains=foo.example.com'], ['-wrap-ttl=2h']],
       expected: {
         data: {
           allowed_domains: ['example.com', 'foo.example.com'],
@@ -165,27 +157,10 @@ module('Unit | Lib | console helpers', function () {
         },
       },
     },
-    {
-      method: 'read',
-      name: 'triple data',
-      dataInput: [
-        'allowed_domains=example.com',
-        'allowed_domains=foo.example.com',
-        'allowed_domains=dev.example.com',
-      ],
-      flagInput: [],
-      expected: {
-        data: {
-          allowed_domains: ['example.com', 'foo.example.com', 'dev.example.com'],
-        },
-        flags: {},
-      },
-    },
     {
       method: 'read',
       name: 'data with more than one equals sign',
-      dataInput: ['foo=bar=baz', 'foo=baz=bop', 'some=value=val'],
-      flagInput: [],
+      input: [['foo=bar=baz', 'foo=baz=bop', 'some=value=val'], []],
       expected: {
         data: {
           foo: ['bar=baz', 'baz=bop'],
@@ -197,8 +172,7 @@ module('Unit | Lib | console helpers', function () {
     {
       method: 'read',
       name: 'data with empty values',
-      dataInput: [`foo=`, 'some=thing'],
-      flagInput: [],
+      input: [[`foo=`, 'some=thing'], []],
       expected: {
         data: {
           foo: '',
@@ -210,8 +184,7 @@ module('Unit | Lib | console helpers', function () {
     {
       method: 'write',
       name: 'write with force flag',
-      dataInput: [],
-      flagInput: ['-force'],
+      input: [[], ['-force']],
       expected: {
         data: {},
         flags: {
@@ -222,8 +195,7 @@ module('Unit | Lib | console helpers', function () {
     {
       method: 'write',
       name: 'write with force short flag',
-      dataInput: [],
-      flagInput: ['-f'],
+      input: [[], ['-f']],
       expected: {
         data: {},
         flags: {
@@ -234,8 +206,7 @@ module('Unit | Lib | console helpers', function () {
     {
       method: 'write',
       name: 'write with GNU style force flag',
-      dataInput: [],
-      flagInput: ['--force'],
+      input: [[], ['--force']],
       expected: {
         data: {},
         flags: {
@@ -246,17 +217,14 @@ module('Unit | Lib | console helpers', function () {
   ];
 
   testExtractCases.forEach(function (testCase) {
-    test(`#extractDataFromStrings: ${testCase.name}`, function (assert) {
-      const data = extractDataFromStrings(testCase.dataInput);
+    test(`#extractDataAndFlags: ${testCase.name}`, function (assert) {
+      let { data, flags } = extractDataAndFlags(testCase.method, ...testCase.input);
       assert.deepEqual(data, testCase.expected.data, 'has expected data');
-    });
-    test(`#extractFlagsFromStrings: ${testCase.name}`, function (assert) {
-      const flags = extractFlagsFromStrings(testCase.flagInput, testCase.method);
       assert.deepEqual(flags, testCase.expected.flags, 'has expected flags');
     });
   });
 
-  const testResponseCases = [
+  let testResponseCases = [
     {
       name: 'write response, no content',
       args: [null, 'foo/bar', 'write', {}],
@@ -428,12 +396,12 @@ module('Unit | Lib | console helpers', function () {
 
   testResponseCases.forEach(function (testCase) {
     test(`#logFromResponse: ${testCase.name}`, function (assert) {
-      const data = logFromResponse(...testCase.args);
+      let data = logFromResponse(...testCase.args);
       assert.deepEqual(data, testCase.expectedData);
     });
   });
 
-  const testErrorCases = [
+  let testErrorCases = [
     {
       name: 'AdapterError write',
       args: [{ httpStatus: 404, path: 'v1/sys/foo', errors: [{}] }, 'sys/foo', 'write'],
@@ -473,7 +441,7 @@ module('Unit | Lib | console helpers', function () {
 
   testErrorCases.forEach(function (testCase) {
     test(`#logFromError: ${testCase.name}`, function (assert) {
-      const data = logFromError(...testCase.args);
+      let data = logFromError(...testCase.args);
       assert.deepEqual(
         data,
         { type: 'error', content: testCase.expectedContent },
@@ -496,8 +464,8 @@ module('Unit | Lib | console helpers', function () {
   ];
 
   testCommandCases.forEach(function (testCase) {
-    test(`#formattedErrorFromInput: ${testCase.name}`, function (assert) {
-      const data = formattedErrorFromInput(...testCase.args);
+    test(`#logErrorFromInput: ${testCase.name}`, function (assert) {
+      let data = logErrorFromInput(...testCase.args);
 
       assert.deepEqual(
         data,
diff --git a/ui/tests/unit/lib/kv-object-test.js b/ui/tests/unit/lib/kv-object-test.js
index eaaab59aaa0c8..e2f94db78527e 100644
--- a/ui/tests/unit/lib/kv-object-test.js
+++ b/ui/tests/unit/lib/kv-object-test.js
@@ -1,13 +1,8 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import KVObject from 'vault/lib/kv-object';
 
 module('Unit | Lib | kv object', function () {
-  const fromJSONTests = [
+  let fromJSONTests = [
     [
       'types',
       { string: 'string', false: false, zero: 0, number: 1, null: null, true: true, object: { one: 'two' } },
@@ -36,13 +31,13 @@ module('Unit | Lib | kv object', function () {
 
   fromJSONTests.forEach(function ([name, input, content]) {
     test(`fromJSON: ${name}`, function (assert) {
-      const data = KVObject.create({ content: [] }).fromJSON(input);
+      let data = KVObject.create({ content: [] }).fromJSON(input);
       assert.deepEqual(data.get('content'), content, 'has expected content');
     });
   });
 
   test(`fromJSON: non-object input`, function (assert) {
-    const input = [{ foo: 'bar' }];
+    let input = [{ foo: 'bar' }];
     assert.throws(
       () => {
         KVObject.create({ content: [] }).fromJSON(input);
@@ -54,13 +49,13 @@ module('Unit | Lib | kv object', function () {
 
   fromJSONTests.forEach(function ([name, input, content]) {
     test(`fromJSONString: ${name}`, function (assert) {
-      const inputString = JSON.stringify(input, null, 2);
-      const data = KVObject.create({ content: [] }).fromJSONString(inputString);
+      let inputString = JSON.stringify(input, null, 2);
+      let data = KVObject.create({ content: [] }).fromJSONString(inputString);
       assert.deepEqual(data.get('content'), content, 'has expected content');
     });
   });
 
-  const toJSONTests = [
+  let toJSONTests = [
     [
       'types',
       false,
@@ -73,22 +68,22 @@ module('Unit | Lib | kv object', function () {
 
   toJSONTests.forEach(function ([name, includeBlanks, input, output]) {
     test(`toJSON: ${name}`, function (assert) {
-      const data = KVObject.create({ content: [] }).fromJSON(input);
-      const result = data.toJSON(includeBlanks);
+      let data = KVObject.create({ content: [] }).fromJSON(input);
+      let result = data.toJSON(includeBlanks);
       assert.deepEqual(result, output, 'has expected output');
     });
   });
 
   toJSONTests.forEach(function ([name, includeBlanks, input, output]) {
     test(`toJSONString: ${name}`, function (assert) {
-      const expected = JSON.stringify(output, null, 2);
-      const data = KVObject.create({ content: [] }).fromJSON(input);
-      const result = data.toJSONString(includeBlanks);
-      assert.strictEqual(result, expected, 'has expected output string');
+      let expected = JSON.stringify(output, null, 2);
+      let data = KVObject.create({ content: [] }).fromJSON(input);
+      let result = data.toJSONString(includeBlanks);
+      assert.equal(result, expected, 'has expected output string');
     });
   });
 
-  const isAdvancedTests = [
+  let isAdvancedTests = [
     [
       'advanced',
       { string: 'string', false: false, zero: 0, number: 1, null: null, true: true, object: { one: 'two' } },
@@ -99,9 +94,9 @@ module('Unit | Lib | kv object', function () {
 
   isAdvancedTests.forEach(function ([name, input, expected]) {
     test(`isAdvanced: ${name}`, function (assert) {
-      const data = KVObject.create({ content: [] }).fromJSON(input);
+      let data = KVObject.create({ content: [] }).fromJSON(input);
 
-      assert.strictEqual(data.isAdvanced(), expected, 'calculates isAdvanced correctly');
+      assert.equal(data.isAdvanced(), expected, 'calculates isAdvanced correctly');
     });
   });
 });
diff --git a/ui/tests/unit/lib/local-storage-test.js b/ui/tests/unit/lib/local-storage-test.js
deleted file mode 100644
index ce3d4292b394f..0000000000000
--- a/ui/tests/unit/lib/local-storage-test.js
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
-import LocalStorage from 'vault/lib/local-storage';
-
-module('Unit | lib | local-storage', function (hooks) {
-  setupTest(hooks);
-
-  hooks.beforeEach(function () {
-    window.localStorage.clear();
-  });
-
-  test('it does not error if nothing is in local storage', async function (assert) {
-    assert.expect(1);
-    assert.strictEqual(
-      LocalStorage.cleanupStorage('something', 'something-key'),
-      undefined,
-      'returns undefined and does not throw an error when method is called and nothing exist in localStorage.'
-    );
-  });
-
-  test('it does not remove anything in localStorage that does not start with the string or we have specified to keep.', async function (assert) {
-    assert.expect(3);
-    LocalStorage.setItem('string-key-remove', 'string-key-remove-value');
-    LocalStorage.setItem('beep-boop-bop-key', 'beep-boop-bop-value');
-    LocalStorage.setItem('string-key', 'string-key-value');
-    const storageLengthBefore = window.localStorage.length;
-    LocalStorage.cleanupStorage('string', 'string-key');
-    const storageLengthAfter = window.localStorage.length;
-    assert.strictEqual(
-      storageLengthBefore - storageLengthAfter,
-      1,
-      'the method should only remove one key from localStorage.'
-    );
-    assert.strictEqual(
-      LocalStorage.getItem('string-key'),
-      'string-key-value',
-      'the key we asked to keep still exists in localStorage.'
-    );
-    assert.strictEqual(
-      LocalStorage.getItem('string-key-remove'),
-      null,
-      'the key we did not specify to keep was removed from localStorage.'
-    );
-    // clear storage
-    window.localStorage.clear();
-  });
-});
diff --git a/ui/tests/unit/lib/path-to-tree-test.js b/ui/tests/unit/lib/path-to-tree-test.js
index 2e9bb286d1ffc..17f02411cec2c 100644
--- a/ui/tests/unit/lib/path-to-tree-test.js
+++ b/ui/tests/unit/lib/path-to-tree-test.js
@@ -1,13 +1,8 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import pathToTree from 'vault/lib/path-to-tree';
 
 module('Unit | Lib | path to tree', function () {
-  const tests = [
+  let tests = [
     [
       'basic',
       ['one', 'one/two', 'one/two/three/four/five'],
@@ -106,7 +101,7 @@ module('Unit | Lib | path to tree', function () {
 
   tests.forEach(function ([name, input, expected]) {
     test(`pathToTree: ${name}`, function (assert) {
-      const output = pathToTree(input);
+      let output = pathToTree(input);
       assert.deepEqual(output, expected, 'has expected data');
     });
   });
diff --git a/ui/tests/unit/machines/auth-machine-test.js b/ui/tests/unit/machines/auth-machine-test.js
index 3e0fdceab0b7e..0f72c0ad614c0 100644
--- a/ui/tests/unit/machines/auth-machine-test.js
+++ b/ui/tests/unit/machines/auth-machine-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { Machine } from 'xstate';
 import AuthMachineConfig from 'vault/machines/auth-machine';
@@ -82,8 +77,8 @@ module('Unit | Machine | auth-machine', function () {
 
   testCases.forEach((testCase) => {
     test(`transition: ${testCase.event} for currentState ${testCase.currentState} and componentState ${testCase.params}`, function (assert) {
-      const result = authMachine.transition(testCase.currentState, testCase.event, testCase.params);
-      assert.strictEqual(result.value, testCase.expectedResults.value);
+      let result = authMachine.transition(testCase.currentState, testCase.event, testCase.params);
+      assert.equal(result.value, testCase.expectedResults.value);
       assert.deepEqual(result.actions, testCase.expectedResults.actions);
     });
   });
diff --git a/ui/tests/unit/machines/policies-machine-test.js b/ui/tests/unit/machines/policies-machine-test.js
index afb627cf625ab..378741b6f59fb 100644
--- a/ui/tests/unit/machines/policies-machine-test.js
+++ b/ui/tests/unit/machines/policies-machine-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { Machine } from 'xstate';
 import PoliciesMachineConfig from 'vault/machines/policies-machine';
@@ -57,8 +52,8 @@ module('Unit | Machine | policies-machine', function () {
 
   testCases.forEach((testCase) => {
     test(`transition: ${testCase.event} for currentState ${testCase.currentState} and componentState ${testCase.params}`, function (assert) {
-      const result = policiesMachine.transition(testCase.currentState, testCase.event, testCase.params);
-      assert.strictEqual(result.value, testCase.expectedResults.value);
+      let result = policiesMachine.transition(testCase.currentState, testCase.event, testCase.params);
+      assert.equal(result.value, testCase.expectedResults.value);
       assert.deepEqual(result.actions, testCase.expectedResults.actions);
     });
   });
diff --git a/ui/tests/unit/machines/replication-machine-test.js b/ui/tests/unit/machines/replication-machine-test.js
index cd5a5cf7878a3..54aa0c4284d6f 100644
--- a/ui/tests/unit/machines/replication-machine-test.js
+++ b/ui/tests/unit/machines/replication-machine-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { Machine } from 'xstate';
 import ReplicationMachineConfig from 'vault/machines/replication-machine';
@@ -33,8 +28,8 @@ module('Unit | Machine | replication-machine', function () {
 
   testCases.forEach((testCase) => {
     test(`transition: ${testCase.event} for currentState ${testCase.currentState} and componentState ${testCase.params}`, function (assert) {
-      const result = replicationMachine.transition(testCase.currentState, testCase.event, testCase.params);
-      assert.strictEqual(result.value, testCase.expectedResults.value);
+      let result = replicationMachine.transition(testCase.currentState, testCase.event, testCase.params);
+      assert.equal(result.value, testCase.expectedResults.value);
       assert.deepEqual(result.actions, testCase.expectedResults.actions);
     });
   });
diff --git a/ui/tests/unit/machines/secrets-machine-test.js b/ui/tests/unit/machines/secrets-machine-test.js
index 742d6c12493b4..b4539f09bf727 100644
--- a/ui/tests/unit/machines/secrets-machine-test.js
+++ b/ui/tests/unit/machines/secrets-machine-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { Machine } from 'xstate';
 import SecretsMachineConfig from 'vault/machines/secrets-machine';
@@ -1067,8 +1062,8 @@ module('Unit | Machine | secrets-machine', function () {
 
   testCases.forEach((testCase) => {
     test(`transition: ${testCase.event} for currentState ${testCase.currentState} and componentState ${testCase.params}`, function (assert) {
-      const result = secretsMachine.transition(testCase.currentState, testCase.event, testCase.params);
-      assert.strictEqual(result.value, testCase.expectedResults.value);
+      let result = secretsMachine.transition(testCase.currentState, testCase.event, testCase.params);
+      assert.equal(result.value, testCase.expectedResults.value);
       assert.deepEqual(result.actions, testCase.expectedResults.actions);
     });
   });
diff --git a/ui/tests/unit/machines/tools-machine-test.js b/ui/tests/unit/machines/tools-machine-test.js
index c8db9fb01153b..4d4fbeca4701e 100644
--- a/ui/tests/unit/machines/tools-machine-test.js
+++ b/ui/tests/unit/machines/tools-machine-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { Machine } from 'xstate';
 import ToolsMachineConfig from 'vault/machines/tools-machine';
@@ -86,8 +81,8 @@ module('Unit | Machine | tools-machine', function () {
 
   testCases.forEach((testCase) => {
     test(`transition: ${testCase.event} for currentState ${testCase.currentState} and componentState ${testCase.params}`, function (assert) {
-      const result = toolsMachine.transition(testCase.currentState, testCase.event, testCase.params);
-      assert.strictEqual(result.value, testCase.expectedResults.value);
+      let result = toolsMachine.transition(testCase.currentState, testCase.event, testCase.params);
+      assert.equal(result.value, testCase.expectedResults.value);
       assert.deepEqual(result.actions, testCase.expectedResults.actions);
     });
   });
diff --git a/ui/tests/unit/machines/tutorial-machine-test.js b/ui/tests/unit/machines/tutorial-machine-test.js
index e7bcd5964f74e..8647cb77b3ee4 100644
--- a/ui/tests/unit/machines/tutorial-machine-test.js
+++ b/ui/tests/unit/machines/tutorial-machine-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { Machine } from 'xstate';
 import TutorialMachineConfig from 'vault/machines/tutorial-machine';
@@ -243,7 +238,7 @@ module('Unit | Machine | tutorial-machine', function () {
 
   testCases.forEach((testCase) => {
     test(`transition: ${testCase.event} for currentState ${testCase.currentState} and componentState ${testCase.params}`, function (assert) {
-      const result = tutorialMachine.transition(testCase.currentState, testCase.event, testCase.params);
+      let result = tutorialMachine.transition(testCase.currentState, testCase.event, testCase.params);
       assert.deepEqual(result.value, testCase.expectedResults.value);
       assert.deepEqual(result.actions, testCase.expectedResults.actions);
     });
diff --git a/ui/tests/unit/mixins/cluster-route-test.js b/ui/tests/unit/mixins/cluster-route-test.js
index d37b8796d9e47..46fb5289f31fb 100644
--- a/ui/tests/unit/mixins/cluster-route-test.js
+++ b/ui/tests/unit/mixins/cluster-route-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { assign } from '@ember/polyfills';
 import EmberObject from '@ember/object';
 import ClusterRouteMixin from 'vault/mixins/cluster-route';
@@ -23,7 +18,7 @@ module('Unit | Mixin | cluster route', function () {
     clusterModel = {},
     methods = { router: {}, hasKeyData: () => false, authToken: () => null, transitionTo: () => {} }
   ) {
-    const ClusterRouteObject = EmberObject.extend(
+    let ClusterRouteObject = EmberObject.extend(
       ClusterRouteMixin,
       assign(methods, { clusterModel: () => clusterModel })
     );
@@ -33,19 +28,19 @@ module('Unit | Mixin | cluster route', function () {
   test('#targetRouteName init', function (assert) {
     let subject = createClusterRoute({ needsInit: true });
     subject.routeName = CLUSTER;
-    assert.strictEqual(subject.targetRouteName(), INIT, 'forwards to INIT when cluster needs init');
+    assert.equal(subject.targetRouteName(), INIT, 'forwards to INIT when cluster needs init');
 
     subject = createClusterRoute({ needsInit: false, sealed: true });
     subject.routeName = CLUSTER;
-    assert.strictEqual(subject.targetRouteName(), UNSEAL, 'forwards to UNSEAL if sealed and initialized');
+    assert.equal(subject.targetRouteName(), UNSEAL, 'forwards to UNSEAL if sealed and initialized');
 
     subject = createClusterRoute({ needsInit: false });
     subject.routeName = CLUSTER;
-    assert.strictEqual(subject.targetRouteName(), AUTH, 'forwards to AUTH if unsealed and initialized');
+    assert.equal(subject.targetRouteName(), AUTH, 'forwards to AUTH if unsealed and initialized');
 
     subject = createClusterRoute({ dr: { isSecondary: true } });
     subject.routeName = CLUSTER;
-    assert.strictEqual(
+    assert.equal(
       subject.targetRouteName(),
       DR_REPLICATION_SECONDARY,
       'forwards to DR_REPLICATION_SECONDARY if is a dr secondary'
@@ -59,14 +54,10 @@ module('Unit | Mixin | cluster route', function () {
     );
 
     subject.routeName = CLUSTER;
-    assert.strictEqual(
-      subject.targetRouteName(),
-      INIT,
-      'still land on INIT if there are keys on the controller'
-    );
+    assert.equal(subject.targetRouteName(), INIT, 'still land on INIT if there are keys on the controller');
 
     subject.routeName = UNSEAL;
-    assert.strictEqual(subject.targetRouteName(), UNSEAL, 'allowed to proceed to unseal');
+    assert.equal(subject.targetRouteName(), UNSEAL, 'allowed to proceed to unseal');
 
     subject = createClusterRoute(
       { needsInit: false, sealed: false },
@@ -74,29 +65,25 @@ module('Unit | Mixin | cluster route', function () {
     );
 
     subject.routeName = AUTH;
-    assert.strictEqual(subject.targetRouteName(), AUTH, 'allowed to proceed to auth');
+    assert.equal(subject.targetRouteName(), AUTH, 'allowed to proceed to auth');
   });
 
   test('#targetRouteName happy path forwards to CLUSTER route', function (assert) {
-    const subject = createClusterRoute(
+    let subject = createClusterRoute(
       { needsInit: false, sealed: false, dr: { isSecondary: false } },
       { hasKeyData: () => false, authToken: () => 'a token' }
     );
     subject.routeName = INIT;
-    assert.strictEqual(subject.targetRouteName(), CLUSTER, 'forwards when inited and navigating to INIT');
+    assert.equal(subject.targetRouteName(), CLUSTER, 'forwards when inited and navigating to INIT');
 
     subject.routeName = UNSEAL;
-    assert.strictEqual(subject.targetRouteName(), CLUSTER, 'forwards when unsealed and navigating to UNSEAL');
+    assert.equal(subject.targetRouteName(), CLUSTER, 'forwards when unsealed and navigating to UNSEAL');
 
     subject.routeName = AUTH;
-    assert.strictEqual(
-      subject.targetRouteName(),
-      REDIRECT,
-      'forwards when authenticated and navigating to AUTH'
-    );
+    assert.equal(subject.targetRouteName(), REDIRECT, 'forwards when authenticated and navigating to AUTH');
 
     subject.routeName = DR_REPLICATION_SECONDARY;
-    assert.strictEqual(
+    assert.equal(
       subject.targetRouteName(),
       CLUSTER,
       'forwards when not a DR secondary and navigating to DR_REPLICATION_SECONDARY'
@@ -104,25 +91,21 @@ module('Unit | Mixin | cluster route', function () {
   });
 
   test('#targetRouteName happy path when not authed forwards to AUTH', function (assert) {
-    const subject = createClusterRoute(
+    let subject = createClusterRoute(
       { needsInit: false, sealed: false, dr: { isSecondary: false } },
       { hasKeyData: () => false, authToken: () => null }
     );
     subject.routeName = INIT;
-    assert.strictEqual(subject.targetRouteName(), AUTH, 'forwards when inited and navigating to INIT');
+    assert.equal(subject.targetRouteName(), AUTH, 'forwards when inited and navigating to INIT');
 
     subject.routeName = UNSEAL;
-    assert.strictEqual(subject.targetRouteName(), AUTH, 'forwards when unsealed and navigating to UNSEAL');
+    assert.equal(subject.targetRouteName(), AUTH, 'forwards when unsealed and navigating to UNSEAL');
 
     subject.routeName = AUTH;
-    assert.strictEqual(
-      subject.targetRouteName(),
-      AUTH,
-      'forwards when non-authenticated and navigating to AUTH'
-    );
+    assert.equal(subject.targetRouteName(), AUTH, 'forwards when non-authenticated and navigating to AUTH');
 
     subject.routeName = DR_REPLICATION_SECONDARY;
-    assert.strictEqual(
+    assert.equal(
       subject.targetRouteName(),
       AUTH,
       'forwards when not a DR secondary and navigating to DR_REPLICATION_SECONDARY'
@@ -130,10 +113,10 @@ module('Unit | Mixin | cluster route', function () {
   });
 
   test('#transitionToTargetRoute', function (assert) {
-    const redirectRouteURL = '/vault/secrets/secret/create';
-    const subject = createClusterRoute({ needsInit: false, sealed: false });
+    let redirectRouteURL = '/vault/secrets/secret/create';
+    let subject = createClusterRoute({ needsInit: false, sealed: false });
     subject.router.currentURL = redirectRouteURL;
-    const spy = sinon.spy(subject, 'transitionTo');
+    let spy = sinon.spy(subject, 'transitionTo');
     subject.transitionToTargetRoute();
     assert.ok(
       spy.calledWithExactly(AUTH, { queryParams: { redirect_to: redirectRouteURL } }),
@@ -144,8 +127,8 @@ module('Unit | Mixin | cluster route', function () {
   });
 
   test('#transitionToTargetRoute with auth as a target', function (assert) {
-    const subject = createClusterRoute({ needsInit: false, sealed: false });
-    const spy = sinon.spy(subject, 'transitionTo');
+    let subject = createClusterRoute({ needsInit: false, sealed: false });
+    let spy = sinon.spy(subject, 'transitionTo');
     // in this case it's already transitioning to the AUTH route so we don't need to call transitionTo again
     subject.transitionToTargetRoute({ targetName: AUTH });
     assert.ok(spy.notCalled, 'transitionTo is not called');
@@ -153,8 +136,8 @@ module('Unit | Mixin | cluster route', function () {
   });
 
   test('#transitionToTargetRoute with auth target, coming from cluster route', function (assert) {
-    const subject = createClusterRoute({ needsInit: false, sealed: false });
-    const spy = sinon.spy(subject, 'transitionTo');
+    let subject = createClusterRoute({ needsInit: false, sealed: false });
+    let spy = sinon.spy(subject, 'transitionTo');
     subject.transitionToTargetRoute({ targetName: CLUSTER_INDEX });
     assert.ok(spy.calledWithExactly(AUTH), 'calls transitionTo without redirect_to');
     spy.restore();
diff --git a/ui/tests/unit/models/capabilities-test.js b/ui/tests/unit/models/capabilities-test.js
index 136ed97cbddd0..f34f396855a86 100644
--- a/ui/tests/unit/models/capabilities-test.js
+++ b/ui/tests/unit/models/capabilities-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { SUDO_PATHS, SUDO_PATH_PREFIXES } from 'vault/models/capabilities';
@@ -13,12 +8,12 @@ module('Unit | Model | capabilities', function (hooks) {
   setupTest(hooks);
 
   test('it exists', function (assert) {
-    const model = run(() => this.owner.lookup('service:store').createRecord('capabilities'));
+    let model = run(() => this.owner.lookup('service:store').createRecord('capabilities'));
     assert.ok(!!model);
   });
 
   test('it reads capabilities', function (assert) {
-    const model = run(() =>
+    let model = run(() =>
       this.owner.lookup('service:store').createRecord('capabilities', {
         path: 'foo',
         capabilities: ['list', 'read'],
@@ -32,7 +27,7 @@ module('Unit | Model | capabilities', function (hooks) {
   });
 
   test('it allows everything if root is present', function (assert) {
-    const model = run(() =>
+    let model = run(() =>
       this.owner.lookup('service:store').createRecord('capabilities', {
         path: 'foo',
         capabilities: ['root', 'deny', 'read'],
@@ -46,7 +41,7 @@ module('Unit | Model | capabilities', function (hooks) {
   });
 
   test('it denies everything if deny is present', function (assert) {
-    const model = run(() =>
+    let model = run(() =>
       this.owner.lookup('service:store').createRecord('capabilities', {
         path: 'foo',
         capabilities: ['sudo', 'deny', 'read'],
@@ -60,7 +55,7 @@ module('Unit | Model | capabilities', function (hooks) {
   });
 
   test('it requires sudo on sudo paths', function (assert) {
-    const model = run(() =>
+    let model = run(() =>
       this.owner.lookup('service:store').createRecord('capabilities', {
         path: SUDO_PATHS[0],
         capabilities: ['sudo', 'read'],
@@ -74,7 +69,7 @@ module('Unit | Model | capabilities', function (hooks) {
   });
 
   test('it requires sudo on sudo paths prefixes', function (assert) {
-    const model = run(() =>
+    let model = run(() =>
       this.owner.lookup('service:store').createRecord('capabilities', {
         path: SUDO_PATH_PREFIXES[0] + '/foo',
         capabilities: ['sudo', 'read'],
@@ -88,7 +83,7 @@ module('Unit | Model | capabilities', function (hooks) {
   });
 
   test('it does not require sudo on sys/leases/revoke if update capability is present and path is not fully a sudo prefix', function (assert) {
-    const model = run(() =>
+    let model = run(() =>
       this.owner.lookup('service:store').createRecord('capabilities', {
         path: 'sys/leases/revoke',
         capabilities: ['update', 'read'],
@@ -102,7 +97,7 @@ module('Unit | Model | capabilities', function (hooks) {
   });
 
   test('it requires sudo on prefix path even if capability is present', function (assert) {
-    const model = run(() =>
+    let model = run(() =>
       this.owner.lookup('service:store').createRecord('capabilities', {
         path: SUDO_PATH_PREFIXES[0] + '/aws',
         capabilities: ['update', 'read'],
@@ -116,7 +111,7 @@ module('Unit | Model | capabilities', function (hooks) {
   });
 
   test('it does not require sudo on prefix path if both update and sudo capabilities are present', function (assert) {
-    const model = run(() =>
+    let model = run(() =>
       this.owner.lookup('service:store').createRecord('capabilities', {
         path: SUDO_PATH_PREFIXES[0] + '/aws',
         capabilities: ['sudo', 'update', 'read'],
diff --git a/ui/tests/unit/models/role-jwt-test.js b/ui/tests/unit/models/role-jwt-test.js
index 547aaf21f24e9..28ddbf0a602fb 100644
--- a/ui/tests/unit/models/role-jwt-test.js
+++ b/ui/tests/unit/models/role-jwt-test.js
@@ -1,8 +1,4 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
+/* eslint-disable qunit/no-conditional-assertions */
 /* eslint qunit/no-conditional-assertions: "warn" */
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
@@ -12,14 +8,14 @@ module('Unit | Model | role-jwt', function (hooks) {
   setupTest(hooks);
 
   test('it exists', function (assert) {
-    const model = this.owner.lookup('service:store').createRecord('role-jwt');
+    let model = this.owner.lookup('service:store').createRecord('role-jwt');
     assert.ok(!!model);
     assert.strictEqual(model.providerName, null, 'no providerName');
     assert.strictEqual(model.providerButtonComponent, null, 'no providerButtonComponent');
   });
 
   test('it computes providerName when known provider url match fails', function (assert) {
-    const model = this.owner.lookup('service:store').createRecord('role-jwt', {
+    let model = this.owner.lookup('service:store').createRecord('role-jwt', {
       authUrl: 'http://example.com',
     });
 
diff --git a/ui/tests/unit/models/secret-engine-test.js b/ui/tests/unit/models/secret-engine-test.js
index c82a77efbf3cf..1ce67c86577d7 100644
--- a/ui/tests/unit/models/secret-engine-test.js
+++ b/ui/tests/unit/models/secret-engine-test.js
@@ -1,480 +1,44 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import sinon from 'sinon';
+import { run } from '@ember/runloop';
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
 module('Unit | Model | secret-engine', function (hooks) {
   setupTest(hooks);
-  hooks.beforeEach(function () {
-    this.store = this.owner.lookup('service:store');
-  });
-
-  module('modelTypeForKV', function () {
-    test('is secret by default', function (assert) {
-      assert.expect(1);
-      const model = this.store.createRecord('secret-engine');
-      assert.strictEqual(model.get('modelTypeForKV'), 'secret');
-    });
-
-    test('is secret-v2 for kv v2', function (assert) {
-      assert.expect(1);
-      const model = this.store.createRecord('secret-engine', {
-        version: 2,
-        type: 'kv',
-      });
-      assert.strictEqual(model.get('modelTypeForKV'), 'secret-v2');
-    });
-
-    test('is secret-v2 for generic v2', function (assert) {
-      assert.expect(1);
-      const model = this.store.createRecord('secret-engine', {
-        version: 2,
-        type: 'kv',
-      });
-
-      assert.strictEqual(model.get('modelTypeForKV'), 'secret-v2');
-    });
-
-    test('is secret when v2 if not kv or generic', function (assert) {
-      assert.expect(1);
-      const model = this.store.createRecord('secret-engine', {
-        version: 2,
-        type: 'ssh',
-      });
-
-      assert.strictEqual(model.get('modelTypeForKV'), 'secret');
-    });
-  });
-
-  module('formFields', function () {
-    test('it returns correct fields by default', function (assert) {
-      assert.expect(1);
-      const model = this.store.createRecord('secret-engine', {
-        type: '',
-      });
-
-      assert.deepEqual(model.get('formFields'), [
-        'type',
-        'path',
-        'description',
-        'accessor',
-        'local',
-        'sealWrap',
-        'config.defaultLeaseTtl',
-        'config.maxLeaseTtl',
-        'config.allowedManagedKeys',
-        'config.auditNonHmacRequestKeys',
-        'config.auditNonHmacResponseKeys',
-        'config.passthroughRequestHeaders',
-        'config.allowedResponseHeaders',
-      ]);
-    });
-
-    test('it returns correct fields for KV v1', function (assert) {
-      assert.expect(1);
-      const model = this.store.createRecord('secret-engine', {
-        type: 'kv',
-      });
-
-      assert.deepEqual(model.get('formFields'), [
-        'type',
-        'path',
-        'description',
-        'accessor',
-        'local',
-        'sealWrap',
-        'config.defaultLeaseTtl',
-        'config.maxLeaseTtl',
-        'config.allowedManagedKeys',
-        'config.auditNonHmacRequestKeys',
-        'config.auditNonHmacResponseKeys',
-        'config.passthroughRequestHeaders',
-        'config.allowedResponseHeaders',
-        'version',
-      ]);
-    });
-
-    test('it returns correct fields for KV v2', function (assert) {
-      assert.expect(1);
-      const model = this.store.createRecord('secret-engine', {
-        type: 'kv',
-        version: '2',
-      });
-
-      assert.deepEqual(model.get('formFields'), [
-        'type',
-        'path',
-        'description',
-        'accessor',
-        'local',
-        'sealWrap',
-        'config.defaultLeaseTtl',
-        'config.maxLeaseTtl',
-        'config.allowedManagedKeys',
-        'config.auditNonHmacRequestKeys',
-        'config.auditNonHmacResponseKeys',
-        'config.passthroughRequestHeaders',
-        'config.allowedResponseHeaders',
-        'version',
-        'casRequired',
-        'deleteVersionAfter',
-        'maxVersions',
-      ]);
-    });
-
-    test('it returns correct fields for keymgmt', function (assert) {
-      assert.expect(1);
-      const model = this.store.createRecord('secret-engine', {
-        type: 'keymgmt',
-      });
-
-      assert.deepEqual(model.get('formFields'), [
-        'type',
-        'path',
-        'description',
-        'accessor',
-        'local',
-        'sealWrap',
-        'config.allowedManagedKeys',
-        'config.auditNonHmacRequestKeys',
-        'config.auditNonHmacResponseKeys',
-        'config.passthroughRequestHeaders',
-        'config.allowedResponseHeaders',
-      ]);
-    });
-  });
-
-  module('formFieldGroups', function () {
-    test('returns correct values by default', function (assert) {
-      assert.expect(1);
-      const model = this.store.createRecord('secret-engine', {
-        type: 'aws',
-      });
-
-      assert.deepEqual(model.get('formFieldGroups'), [
-        { default: ['path'] },
-        {
-          'Method Options': [
-            'description',
-            'config.listingVisibility',
-            'local',
-            'sealWrap',
-            'config.defaultLeaseTtl',
-            'config.maxLeaseTtl',
-            'config.allowedManagedKeys',
-            'config.auditNonHmacRequestKeys',
-            'config.auditNonHmacResponseKeys',
-            'config.passthroughRequestHeaders',
-            'config.allowedResponseHeaders',
-          ],
-        },
-      ]);
-    });
-    test('returns correct values for KV', function (assert) {
-      assert.expect(1);
-      const model = this.store.createRecord('secret-engine', {
-        type: 'kv',
-      });
-
-      assert.deepEqual(model.get('formFieldGroups'), [
-        { default: ['path', 'maxVersions', 'casRequired', 'deleteVersionAfter'] },
-        {
-          'Method Options': [
-            'version',
-            'description',
-            'config.listingVisibility',
-            'local',
-            'sealWrap',
-            'config.defaultLeaseTtl',
-            'config.maxLeaseTtl',
-            'config.allowedManagedKeys',
-            'config.auditNonHmacRequestKeys',
-            'config.auditNonHmacResponseKeys',
-            'config.passthroughRequestHeaders',
-            'config.allowedResponseHeaders',
-          ],
-        },
-      ]);
-    });
-
-    test('returns correct values for generic', function (assert) {
-      assert.expect(1);
-      const model = this.store.createRecord('secret-engine', {
-        type: 'generic',
-      });
-
-      assert.deepEqual(model.get('formFieldGroups'), [
-        { default: ['path'] },
-        {
-          'Method Options': [
-            'version',
-            'description',
-            'config.listingVisibility',
-            'local',
-            'sealWrap',
-            'config.defaultLeaseTtl',
-            'config.maxLeaseTtl',
-            'config.allowedManagedKeys',
-            'config.auditNonHmacRequestKeys',
-            'config.auditNonHmacResponseKeys',
-            'config.passthroughRequestHeaders',
-            'config.allowedResponseHeaders',
-          ],
-        },
-      ]);
-    });
-
-    test('returns correct values for database', function (assert) {
-      assert.expect(1);
-      const model = this.store.createRecord('secret-engine', {
-        type: 'database',
-      });
-
-      assert.deepEqual(model.get('formFieldGroups'), [
-        { default: ['path', 'config.defaultLeaseTtl', 'config.maxLeaseTtl'] },
-        {
-          'Method Options': [
-            'description',
-            'config.listingVisibility',
-            'local',
-            'sealWrap',
-            'config.allowedManagedKeys',
-            'config.auditNonHmacRequestKeys',
-            'config.auditNonHmacResponseKeys',
-            'config.passthroughRequestHeaders',
-            'config.allowedResponseHeaders',
-          ],
-        },
-      ]);
-    });
-
-    test('returns correct values for pki', function (assert) {
-      assert.expect(1);
-      const model = this.store.createRecord('secret-engine', {
-        type: 'pki',
-      });
-
-      assert.deepEqual(model.get('formFieldGroups'), [
-        { default: ['path', 'config.defaultLeaseTtl', 'config.maxLeaseTtl', 'config.allowedManagedKeys'] },
-        {
-          'Method Options': [
-            'description',
-            'config.listingVisibility',
-            'local',
-            'sealWrap',
-            'config.auditNonHmacRequestKeys',
-            'config.auditNonHmacResponseKeys',
-            'config.passthroughRequestHeaders',
-            'config.allowedResponseHeaders',
-          ],
-        },
-      ]);
-    });
-
-    test('returns correct values for keymgmt', function (assert) {
-      assert.expect(1);
-      const model = this.store.createRecord('secret-engine', {
-        type: 'keymgmt',
-      });
-
-      assert.deepEqual(model.get('formFieldGroups'), [
-        { default: ['path'] },
-        {
-          'Method Options': [
-            'description',
-            'config.listingVisibility',
-            'local',
-            'sealWrap',
-            'config.allowedManagedKeys',
-            'config.auditNonHmacRequestKeys',
-            'config.auditNonHmacResponseKeys',
-            'config.passthroughRequestHeaders',
-            'config.allowedResponseHeaders',
-          ],
-        },
-      ]);
-    });
-  });
-
-  module('engineType', function () {
-    test('strips leading ns_ from type', function (assert) {
-      assert.expect(1);
-      const model = this.store.createRecord('secret-engine', {
-        // eg. ns_cubbyhole, ns_identity, ns_system
-        type: 'ns_identity',
-      });
-      assert.strictEqual(model.engineType, 'identity');
-    });
-    test('returns type by default', function (assert) {
-      assert.expect(1);
-      const model = this.store.createRecord('secret-engine', {
-        type: 'zebras',
-      });
-      assert.strictEqual(model.engineType, 'zebras');
-    });
-  });
-
-  module('icon', function () {
-    test('returns secrets if no engineType', function (assert) {
-      assert.expect(1);
-      const model = this.store.createRecord('secret-engine', {
-        type: '',
-      });
-      assert.strictEqual(model.icon, 'secrets');
-    });
-    test('returns secrets if kmip', function (assert) {
-      assert.expect(1);
-      const model = this.store.createRecord('secret-engine', {
-        type: 'kmip',
-      });
-      assert.strictEqual(model.icon, 'secrets');
-    });
-    test('returns key if keymgmt', function (assert) {
-      assert.expect(1);
-      const model = this.store.createRecord('secret-engine', {
-        type: 'keymgmt',
-      });
-      assert.strictEqual(model.icon, 'key');
-    });
-    test('returns engineType by default', function (assert) {
-      assert.expect(1);
-      const model = this.store.createRecord('secret-engine', {
-        type: 'ducks',
-      });
-      assert.strictEqual(model.icon, 'ducks');
-    });
-  });
-
-  module('shouldIncludeInList', function () {
-    test('returns false if excludeList includes type', function (assert) {
-      assert.expect(1);
-      const model = this.store.createRecord('secret-engine', {
-        type: 'system',
-      });
-      assert.false(model.shouldIncludeInList);
-    });
-    test('returns true if excludeList does not include type', function (assert) {
-      assert.expect(1);
-      const model = this.store.createRecord('secret-engine', {
-        type: 'hippos',
-      });
-      assert.true(model.shouldIncludeInList);
-    });
-  });
-
-  module('localDisplay', function () {
-    test('returns local if local', function (assert) {
-      assert.expect(1);
-      const model = this.store.createRecord('secret-engine', {
-        local: true,
-      });
-      assert.strictEqual(model.localDisplay, 'local');
-    });
-    test('returns replicated if !local', function (assert) {
-      assert.expect(1);
-      const model = this.store.createRecord('secret-engine', {
-        local: false,
-      });
-      assert.strictEqual(model.localDisplay, 'replicated');
-    });
-  });
-
-  module('saveCA', function () {
-    test('does not call endpoint if type != ssh', async function (assert) {
-      assert.expect(1);
-      const model = this.store.createRecord('secret-engine', {
-        type: 'not-ssh',
-      });
-      const saveSpy = sinon.spy(model, 'save');
-      await model.saveCA({});
-      assert.ok(saveSpy.notCalled, 'save not called');
-    });
-    test('calls save with correct params', async function (assert) {
-      assert.expect(4);
-      const model = this.store.createRecord('secret-engine', {
-        type: 'ssh',
-        privateKey: 'private-key',
-        publicKey: 'public-key',
-        generateSigningKey: true,
-      });
-      const saveStub = sinon.stub(model, 'save').callsFake((params) => {
-        assert.deepEqual(
-          params,
-          {
-            adapterOptions: {
-              options: {},
-              apiPath: 'config/ca',
-              attrsToSend: ['privateKey', 'publicKey', 'generateSigningKey'],
-            },
-          },
-          'send correct params to save'
-        );
-        return;
-      });
-
-      await model.saveCA({});
-      assert.strictEqual(model.privateKey, 'private-key', 'value exists before save');
-      assert.strictEqual(model.publicKey, 'public-key', 'value exists before save');
-      assert.true(model.generateSigningKey, 'value true before save');
-
-      saveStub.restore();
-    });
-    test('sets properties when isDelete', async function (assert) {
-      assert.expect(7);
-      const model = this.store.createRecord('secret-engine', {
-        type: 'ssh',
-        privateKey: 'private-key',
-        publicKey: 'public-key',
-        generateSigningKey: true,
-      });
-      const saveStub = sinon.stub(model, 'save').callsFake((params) => {
-        assert.deepEqual(
-          params,
-          {
-            adapterOptions: {
-              options: { isDelete: true },
-              apiPath: 'config/ca',
-              attrsToSend: ['privateKey', 'publicKey', 'generateSigningKey'],
-            },
-          },
-          'send correct params to save'
-        );
-        return;
-      });
-      assert.strictEqual(model.privateKey, 'private-key', 'value exists before save');
-      assert.strictEqual(model.publicKey, 'public-key', 'value exists before save');
-      assert.true(model.generateSigningKey, 'value true before save');
-
-      await model.saveCA({ isDelete: true });
-      assert.strictEqual(model.privateKey, null, 'value null after save');
-      assert.strictEqual(model.publicKey, null, 'value null after save');
-      assert.false(model.generateSigningKey, 'value false after save');
-      saveStub.restore();
-    });
-  });
 
-  module('saveZeroAddressConfig', function () {
-    test('calls save with correct params', async function (assert) {
-      assert.expect(1);
-      const model = this.store.createRecord('secret-engine', {});
-      const saveStub = sinon.stub(model, 'save').callsFake((params) => {
-        assert.deepEqual(
-          params,
-          {
-            adapterOptions: {
-              adapterMethod: 'saveZeroAddressConfig',
-            },
-          },
-          'send correct params to save'
-        );
-        return;
-      });
-      await model.saveZeroAddressConfig();
-      saveStub.restore();
+  test('modelTypeForKV is secret by default', function (assert) {
+    assert.expect(1);
+    let model;
+    run(() => {
+      model = run(() => this.owner.lookup('service:store').createRecord('secret-engine'));
+      assert.equal(model.get('modelTypeForKV'), 'secret');
+    });
+  });
+
+  test('modelTypeForKV is secret-v2 for kv v2', function (assert) {
+    assert.expect(1);
+    let model;
+    run(() => {
+      model = run(() =>
+        this.owner.lookup('service:store').createRecord('secret-engine', {
+          options: { version: 2 },
+          type: 'kv',
+        })
+      );
+      assert.equal(model.get('modelTypeForKV'), 'secret-v2');
+    });
+  });
+
+  test('modelTypeForKV is secret-v2 for generic v2', function (assert) {
+    assert.expect(1);
+    let model;
+    run(() => {
+      model = run(() =>
+        this.owner.lookup('service:store').createRecord('secret-engine', {
+          options: { version: 2 },
+          type: 'kv',
+        })
+      );
+      assert.equal(model.get('modelTypeForKV'), 'secret-v2');
     });
   });
 });
diff --git a/ui/tests/unit/models/secret-v2-version-test.js b/ui/tests/unit/models/secret-v2-version-test.js
index e181648a8dbde..8d91a5a151e73 100644
--- a/ui/tests/unit/models/secret-v2-version-test.js
+++ b/ui/tests/unit/models/secret-v2-version-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { run } from '@ember/runloop';
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
diff --git a/ui/tests/unit/models/transit-key-test.js b/ui/tests/unit/models/transit-key-test.js
index e1f9fef78b69e..17bf45a332efc 100644
--- a/ui/tests/unit/models/transit-key-test.js
+++ b/ui/tests/unit/models/transit-key-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { run } from '@ember/runloop';
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
@@ -11,12 +6,12 @@ module('Unit | Model | transit key', function (hooks) {
   setupTest(hooks);
 
   test('it exists', function (assert) {
-    const model = run(() => this.owner.lookup('service:store').createRecord('transit-key'));
+    let model = run(() => this.owner.lookup('service:store').createRecord('transit-key'));
     assert.ok(!!model);
   });
 
   test('supported actions', function (assert) {
-    const model = run(() =>
+    let model = run(() =>
       this.owner.lookup('service:store').createRecord('transit-key', {
         supportsEncryption: true,
         supportsDecryption: true,
@@ -24,16 +19,16 @@ module('Unit | Model | transit key', function (hooks) {
       })
     );
 
-    const supportedActions = model.get('supportedActions').map((k) => k.name);
+    let supportedActions = model.get('supportedActions').map((k) => k.name);
     assert.deepEqual(['encrypt', 'decrypt', 'datakey', 'rewrap', 'hmac', 'verify'], supportedActions);
   });
 
   test('encryption key versions', function (assert) {
     assert.expect(2);
-    const done = assert.async();
-    const model = run(() =>
+    let done = assert.async();
+    let model = run(() =>
       this.owner.lookup('service:store').createRecord('transit-key', {
-        keys: { 1: 123, 2: 456, 3: 789, 4: 101112, 5: 131415 },
+        keyVersions: [1, 2, 3, 4, 5],
         minDecryptionVersion: 1,
         latestVersion: 5,
       })
@@ -52,10 +47,10 @@ module('Unit | Model | transit key', function (hooks) {
 
   test('keys for encryption', function (assert) {
     assert.expect(2);
-    const done = assert.async();
-    const model = run(() =>
+    let done = assert.async();
+    let model = run(() =>
       this.owner.lookup('service:store').createRecord('transit-key', {
-        keys: { 1: 123, 2: 456, 3: 789, 4: 101112, 5: 131415 },
+        keyVersions: [1, 2, 3, 4, 5],
         minDecryptionVersion: 1,
         latestVersion: 5,
       })
diff --git a/ui/tests/unit/routes/vault/cluster/oidc-callback-test.js b/ui/tests/unit/routes/vault/cluster/oidc-callback-test.js
index 6d9b6e903b721..3f942f2214567 100644
--- a/ui/tests/unit/routes/vault/cluster/oidc-callback-test.js
+++ b/ui/tests/unit/routes/vault/cluster/oidc-callback-test.js
@@ -3,10 +3,9 @@
  * SPDX-License-Identifier: MPL-2.0
  */
 
-import { module, test } from 'qunit';
+import { module, skip, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import sinon from 'sinon';
-import { getParamsForCallback } from 'vault/routes/vault/cluster/oidc-callback';
 
 module('Unit | Route | vault/cluster/oidc-callback', function (hooks) {
   setupTest(hooks);
@@ -53,132 +52,159 @@ module('Unit | Route | vault/cluster/oidc-callback', function (hooks) {
     assert.ok(this.route);
   });
 
-  module('getParamsForCallback helper fn', function () {
-    test('it parses params correctly with regular inputs and no namespace', function (assert) {
-      const qp = {
-        state: 'my-state',
-        code: 'my-code',
-        path: 'oidc-path',
-      };
-      const searchString = `?code=my-code&state=my-state`;
-      const results = getParamsForCallback(qp, searchString);
-      assert.deepEqual(results, { source: 'oidc-callback', ...qp });
-    });
-
-    test('it parses params correctly regular inputs and namespace param', function (assert) {
-      const params = {
-        state: 'my-state',
-        code: 'my-code',
-        path: 'oidc-path',
-        namespace: 'my-namespace',
-      };
-      const results = getParamsForCallback(params, '?code=my-code&state=my-state&namespace=my-namespace');
-      assert.deepEqual(results, { source: 'oidc-callback', ...params });
-    });
-
-    /*
-    If authenticating to a namespace, most SSO providers return a callback url
-    with a 'state' query param that includes a URI encoded namespace, example:
-    '?code=BZBDVPMz0By2JTqulEMWX5-6rflW3A20UAusJYHEeFygJ&state=sst_yOarDguU848w5YZuotLs%2Cns%3Dadmin'
-
-    Active Directory Federation Service (AD FS), instead, decodes the namespace portion:
-    '?code=BZBDVPMz0By2JTqulEMWX5-6rflW3A20UAusJYHEeFygJ&state=st_yOarDguU848w5YZuotLs,ns=admin'
-
-    'ns' isn't recognized as a separate param because there is no ampersand, so using this.paramsFor() returns
-    a namespace-less state and authentication fails
-    { state: 'st_yOarDguU848w5YZuotLs,ns' }
-    */
-    test('it parses params correctly with regular inputs and namespace in state (unencoded)', function (assert) {
-      const searchString = '?code=my-code&state=my-state,ns=foo/bar';
-      const params = {
-        state: 'my-state,ns', // Ember parses the QP incorrectly if unencoded
-        code: 'my-code',
-        path: 'oidc-path',
+  skip('it uses namespace param from state instead of cluster, with custom oidc path', function (assert) {
+    this.routeName = 'vault.cluster.oidc-callback';
+    this.callbackUrlQueryParams(encodeURIComponent(`${this.state},ns=test-ns`));
+    this.route.paramsFor = (path) => {
+      if (path === 'vault.cluster') return { namespaceQueryParam: 'admin' };
+      return {
+        auth_path: 'oidc-dev',
+        code: this.code,
       };
-      const results = getParamsForCallback(params, searchString);
-      assert.deepEqual(results, {
+    };
+    this.route.afterModel();
+    assert.propEqual(
+      this.windowStub.lastCall.args[0],
+      {
+        code: this.code,
+        path: 'oidc-dev',
+        namespace: 'test-ns',
+        state: this.state,
         source: 'oidc-callback',
-        ...params,
-        state: 'my-state',
-        namespace: 'foo/bar',
-      });
-    });
+      },
+      'ns from state not cluster'
+    );
+  });
 
-    test('it parses params correctly with regular inputs and namespace in state (encoded)', function (assert) {
-      const qp = {
-        state: 'my-state,ns=foo/bar', // Ember parses the QP correctly when encoded
-        code: 'my-code',
-        path: 'oidc-path',
+  skip('it uses namespace from cluster when state does not include ns param', function (assert) {
+    this.routeName = 'vault.cluster.oidc-callback';
+    this.callbackUrlQueryParams(encodeURIComponent(this.state));
+    this.route.paramsFor = (path) => {
+      if (path === 'vault.cluster') return { namespaceQueryParam: 'admin' };
+      return {
+        auth_path: this.path,
+        code: this.code,
       };
-      const searchString = `?code=my-code&state=${encodeURIComponent(qp.state)}`;
-      const results = getParamsForCallback(qp, searchString);
-      assert.deepEqual(results, { source: 'oidc-callback', ...qp, state: 'my-state', namespace: 'foo/bar' });
-    });
+    };
+    this.route.afterModel();
+    assert.propEqual(
+      this.windowStub.lastCall.args[0],
+      {
+        code: this.code,
+        path: this.path,
+        namespace: 'admin',
+        state: this.state,
+        source: 'oidc-callback',
+      },
+      `namespace is from cluster's namespaceQueryParam`
+    );
+  });
 
-    test('namespace in state takes precedence over namespace in route (encoded)', function (assert) {
-      const qp = {
-        state: 'my-state,ns=foo/bar',
-        code: 'my-code',
-        path: 'oidc-path',
-        namespace: 'other/ns',
-      };
-      const searchString = `?code=my-code&state=${encodeURIComponent(
-        qp.state
-      )}&namespace=${encodeURIComponent(qp.namespace)}`;
-      const results = getParamsForCallback(qp, searchString);
-      assert.deepEqual(results, {
+  skip('it correctly parses encoded, nested ns param from state', function (assert) {
+    this.callbackUrlQueryParams(encodeURIComponent(`${this.state},ns=parent-ns/child-ns`));
+    this.route.afterModel();
+    assert.propEqual(
+      this.windowStub.lastCall.args[0],
+      {
+        code: this.code,
+        path: this.path,
+        namespace: 'parent-ns/child-ns',
+        state: this.state,
         source: 'oidc-callback',
-        ...qp,
-        state: 'my-state',
-        namespace: 'foo/bar',
-      });
-    });
+      },
+      'it has correct nested ns from state and sets as namespace param'
+    );
+  });
 
-    test('namespace in state takes precedence over namespace in route (unencoded)', function (assert) {
-      const qp = {
-        state: 'my-state,ns',
-        code: 'my-code',
-        path: 'oidc-path',
-        namespace: 'other/ns',
+  skip('the afterModel hook returns when both cluster and route params are empty strings', function (assert) {
+    this.routeName = 'vault.cluster.oidc-callback';
+    this.callbackUrlQueryParams('');
+    this.route.paramsFor = (path) => {
+      if (path === 'vault.cluster') return { namespaceQueryParam: '' };
+      return {
+        auth_path: '',
+        code: '',
       };
-      const searchString = `?code=${qp.code}&state=my-state,ns=foo/bar&namespace=${qp.namespace}`;
-      const results = getParamsForCallback(qp, searchString);
-      assert.deepEqual(results, {
+    };
+    this.route.afterModel();
+    assert.propEqual(
+      this.windowStub.lastCall.args[0],
+      {
+        path: '',
+        state: '',
+        code: '',
         source: 'oidc-callback',
-        ...qp,
-        state: 'my-state',
-        namespace: 'foo/bar',
-      });
-    });
+      },
+      'model hook returns with empty params'
+    );
+  });
 
-    test('it parses params correctly when window.location.search is empty (HCP scenario)', function (assert) {
-      const params = {
-        state: 'some-state,ns=admin/child-ns',
-        code: 'my-code',
-        namespace: 'admin',
-        path: 'oidc-path',
-      };
-      const results = getParamsForCallback(params, '');
-      assert.deepEqual(results, {
+  skip('the afterModel hook returns when state param does not exist', function (assert) {
+    this.routeName = 'vault.cluster.oidc-callback';
+    this.callbackUrlQueryParams('stateless');
+    this.route.afterModel();
+    assert.propEqual(
+      this.windowStub.lastCall.args[0],
+      {
+        code: this.code,
+        path: 'oidc',
+        state: '',
         source: 'oidc-callback',
-        code: 'my-code',
-        path: 'oidc-path',
-        state: 'some-state',
-        namespace: 'admin/child-ns',
-      });
-    });
+      },
+      'model hook returns empty string when state param nonexistent'
+    );
+  });
 
-    test('it defaults to reasonable values if query params are missing', function (assert) {
-      const params = {
-        path: 'oidc-path',
+  skip('the afterModel hook returns when cluster ns exists and all route params are empty strings', function (assert) {
+    this.routeName = 'vault.cluster.oidc-callback';
+    this.callbackUrlQueryParams('');
+    this.route.paramsFor = (path) => {
+      if (path === 'vault.cluster') return { namespaceQueryParam: 'ns1' };
+      return {
+        auth_path: '',
+        code: '',
       };
-      const results = getParamsForCallback(params, '');
-      assert.deepEqual(results, {
-        source: 'oidc-callback',
+    };
+    this.route.afterModel();
+    assert.propEqual(
+      this.windowStub.lastCall.args[0],
+      {
         code: '',
-        path: 'oidc-path',
+        namespace: 'ns1',
+        path: '',
+        source: 'oidc-callback',
         state: '',
-      });
-    });
+      },
+      'model hook returns with empty parameters'
+    );
+  });
+
+  /*
+  If authenticating to a namespace, most SSO providers return a callback url
+  with a 'state' query param that includes a URI encoded namespace, example:
+  '?code=BZBDVPMz0By2JTqulEMWX5-6rflW3A20UAusJYHEeFygJ&state=sst_yOarDguU848w5YZuotLs%2Cns%3Dadmin'    
+
+  Active Directory Federation Service (AD FS), instead, decodes the namespace portion:
+  '?code=BZBDVPMz0By2JTqulEMWX5-6rflW3A20UAusJYHEeFygJ&state=st_yOarDguU848w5YZuotLs,ns=admin'
+  
+  'ns' isn't recognized as a separate param because there is no ampersand, so using this.paramsFor() returns
+  a namespace-less state and authentication fails
+  { state: 'st_yOarDguU848w5YZuotLs,ns' }
+  */
+  skip('it uses namespace when state param is not uri encoded', async function (assert) {
+    this.routeName = 'vault.cluster.oidc-callback';
+    this.callbackUrlQueryParams(`${this.state},ns=admin`);
+    this.route.afterModel();
+    assert.propEqual(
+      this.windowStub.lastCall.args[0],
+      {
+        code: this.code,
+        namespace: 'admin',
+        path: this.path,
+        source: 'oidc-callback',
+        state: this.state,
+      },
+      'namespace is parsed correctly'
+    );
   });
 });
diff --git a/ui/tests/unit/routes/vault/cluster/redirect-test.js b/ui/tests/unit/routes/vault/cluster/redirect-test.js
index f8b630bf56bf4..256330a6a77cd 100644
--- a/ui/tests/unit/routes/vault/cluster/redirect-test.js
+++ b/ui/tests/unit/routes/vault/cluster/redirect-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import sinon from 'sinon';
@@ -12,8 +7,6 @@ module('Unit | Route | vault/cluster/redirect', function (hooks) {
 
   hooks.beforeEach(function () {
     this.router = this.owner.lookup('service:router');
-    this.route = this.owner.lookup('route:vault/cluster/redirect');
-    this.auth = this.owner.lookup('service:auth');
     this.originalTransition = this.router.replaceWith;
     this.router.replaceWith = sinon.stub().returns({
       followRedirects: function () {
@@ -24,13 +17,6 @@ module('Unit | Route | vault/cluster/redirect', function (hooks) {
         };
       },
     });
-    this.setCurrentToken = (token) => {
-      this.auth.setCluster(token);
-      if (token) {
-        this.auth.setTokenData(token, { token: 'foo' });
-        this.auth.tokens = [token];
-      }
-    };
   });
 
   hooks.afterEach(function () {
@@ -38,16 +24,18 @@ module('Unit | Route | vault/cluster/redirect', function (hooks) {
   });
 
   test('it calls route', function (assert) {
-    assert.ok(this.route);
+    let route = this.owner.lookup('route:vault/cluster/redirect');
+    assert.ok(route);
   });
 
   test('it redirects to auth when unauthenticated', function (assert) {
-    const originalToken = this.auth.currentToken;
-    this.setCurrentToken(null);
+    let route = this.owner.lookup('route:vault/cluster/redirect');
+    const auth = this.owner.lookup('service:auth');
+    const originalToken = auth.currentToken;
 
-    this.route.beforeModel({
-      to: { queryParams: { redirect_to: 'vault/cluster/tools', namespace: 'admin' } },
-    });
+    auth.currentToken = null;
+
+    route.beforeModel({ to: { queryParams: { redirect_to: 'vault/cluster/tools', namespace: 'admin' } } });
 
     assert.true(
       this.router.replaceWith.calledWithExactly('vault.cluster.auth', {
@@ -55,26 +43,32 @@ module('Unit | Route | vault/cluster/redirect', function (hooks) {
       }),
       'transitions to auth when not authenticated'
     );
-    this.setCurrentToken(originalToken);
+    auth.currentToken = originalToken;
   });
 
   test('it redirects to cluster when authenticated without redirect param', function (assert) {
-    const originalToken = this.auth.currentToken;
-    this.setCurrentToken('s.xxxxxxxxx');
+    let route = this.owner.lookup('route:vault/cluster/redirect');
+    const auth = this.owner.lookup('service:auth');
+    const originalToken = auth.currentToken;
 
-    this.route.beforeModel({ to: { queryParams: { foo: 'bar' } } });
+    auth.currentToken = 's.xxxxxxxxx';
+
+    route.beforeModel({ to: { queryParams: { foo: 'bar' } } });
     assert.true(
       this.router.replaceWith.calledWithExactly('vault.cluster', { queryParams: { foo: 'bar' } }),
       'transitions to cluster when authenticated but no redirect param'
     );
-    this.setCurrentToken(originalToken);
+    auth.currentToken = originalToken;
   });
 
   test('it redirects to desired path when authenticated with redirect param', function (assert) {
-    const originalToken = this.auth.currentToken;
-    this.setCurrentToken('s.xxxxxxxxx');
+    let route = this.owner.lookup('route:vault/cluster/redirect');
+    const auth = this.owner.lookup('service:auth');
+    const originalToken = auth.currentToken;
+
+    auth.currentToken = 's.xxxxxxxxx';
 
-    this.route.beforeModel({
+    route.beforeModel({
       to: {
         queryParams: { redirect_to: 'vault/cluster/tools?namespace=admin', namespace: 'ns1', foo: 'bar' },
       },
@@ -84,6 +78,6 @@ module('Unit | Route | vault/cluster/redirect', function (hooks) {
       this.router.replaceWith.calledWithExactly('vault/cluster/tools?namespace=admin'),
       'transitions to redirect_to path when authenticated and removes other params'
     );
-    this.setCurrentToken(originalToken);
+    auth.currentToken = originalToken;
   });
 });
diff --git a/ui/tests/unit/serializers/cluster-test.js b/ui/tests/unit/serializers/cluster-test.js
deleted file mode 100644
index be256d508e4f1..0000000000000
--- a/ui/tests/unit/serializers/cluster-test.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
-import { validate } from 'uuid';
-
-module('Unit | Serializer | cluster', function (hooks) {
-  setupTest(hooks);
-
-  test('it should generate ids for replication attributes', async function (assert) {
-    const serializer = this.owner.lookup('serializer:cluster');
-    const data = {};
-    serializer.setReplicationId(data);
-    assert.true(validate(data.id), 'UUID is generated for replication attribute');
-  });
-});
diff --git a/ui/tests/unit/serializers/mfa-login-enforcement-test.js b/ui/tests/unit/serializers/mfa-login-enforcement-test.js
index 78cfb57d76ed1..248789c14621c 100644
--- a/ui/tests/unit/serializers/mfa-login-enforcement-test.js
+++ b/ui/tests/unit/serializers/mfa-login-enforcement-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/tests/unit/serializers/pki/action-test.js b/ui/tests/unit/serializers/pki/action-test.js
deleted file mode 100644
index a2d6c638c02ed..0000000000000
--- a/ui/tests/unit/serializers/pki/action-test.js
+++ /dev/null
@@ -1,179 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { module, test } from 'qunit';
-import { setupTest } from 'vault/tests/helpers';
-import { rootPem } from 'vault/tests/helpers/pki/values';
-
-module('Unit | Serializer | pki/action', function (hooks) {
-  setupTest(hooks);
-
-  test('it exists', function (assert) {
-    const store = this.owner.lookup('service:store');
-    const serializer = store.serializerFor('pki/action');
-
-    assert.ok(serializer);
-  });
-
-  module('actionType import', function (hooks) {
-    hooks.beforeEach(function () {
-      this.actionType = 'import';
-      this.pemBundle = rootPem;
-    });
-
-    test('it serializes only valid params', function (assert) {
-      const store = this.owner.lookup('service:store');
-      const record = store.createRecord('pki/action', {
-        pemBundle: this.pemBundle,
-        issuerRef: 'do-not-send',
-        keyType: 'do-not-send',
-      });
-      const expectedResult = {
-        pem_bundle: this.pemBundle,
-      };
-
-      const serializedRecord = record.serialize(this.actionType);
-      assert.deepEqual(
-        serializedRecord,
-        expectedResult,
-        'Serializes only parameters valid for import action'
-      );
-    });
-  });
-
-  module('actionType generate-root', function (hooks) {
-    hooks.beforeEach(function () {
-      this.actionType = 'generate-root';
-      this.allKeyFields = {
-        keyName: 'key name',
-        keyType: 'rsa',
-        keyBits: '0',
-        keyRef: 'key ref',
-        managedKeyName: 'managed name',
-        managedKeyId: 'managed id',
-      };
-      this.withDefaults = {
-        exclude_cn_from_sans: false,
-        format: 'pem',
-        max_path_length: -1,
-        not_before_duration: '30s',
-        private_key_format: 'der',
-      };
-    });
-
-    test('it serializes only params with values', function (assert) {
-      const store = this.owner.lookup('service:store');
-      const record = store.createRecord('pki/action', {
-        excludeCnFromSans: false,
-        format: 'pem',
-        maxPathLength: -1,
-        notBeforeDuration: '30s',
-        privateKeyFormat: 'der',
-        type: 'external', // only used for endpoint in adapter
-        customTtl: '40m', // UI-only value
-        issuerName: 'my issuer',
-        commonName: undefined,
-        foo: 'bar',
-      });
-      const expectedResult = {
-        ...this.withDefaults,
-        key_bits: '0',
-        key_ref: 'default',
-        key_type: 'rsa',
-        issuer_name: 'my issuer',
-      };
-
-      // without passing `actionType` it will not compare against an allowlist
-      const serializedRecord = record.serialize();
-      assert.deepEqual(serializedRecord, expectedResult);
-    });
-
-    test('it serializes only valid params for type = external', function (assert) {
-      const store = this.owner.lookup('service:store');
-      const record = store.createRecord('pki/action', {
-        ...this.allKeyFields,
-        type: 'external',
-        customTtl: '40m',
-        issuerName: 'my issuer',
-        commonName: 'my common name',
-      });
-      const expectedResult = {
-        ...this.withDefaults,
-        issuer_name: 'my issuer',
-        common_name: 'my common name',
-        key_name: 'key name',
-        key_type: 'rsa',
-        key_bits: '0',
-      };
-
-      const serializedRecord = record.serialize(this.actionType);
-      assert.deepEqual(serializedRecord, expectedResult);
-    });
-
-    test('it serializes only valid params for type = internal', function (assert) {
-      const store = this.owner.lookup('service:store');
-      const record = store.createRecord('pki/action', {
-        ...this.allKeyFields,
-        type: 'internal',
-        customTtl: '40m',
-        issuerName: 'my issuer',
-        commonName: 'my common name',
-      });
-      const expectedResult = {
-        ...this.withDefaults,
-        issuer_name: 'my issuer',
-        common_name: 'my common name',
-        key_name: 'key name',
-        key_type: 'rsa',
-        key_bits: '0',
-      };
-
-      const serializedRecord = record.serialize(this.actionType);
-      assert.deepEqual(serializedRecord, expectedResult);
-    });
-
-    test('it serializes only valid params for type = existing', function (assert) {
-      const store = this.owner.lookup('service:store');
-      const record = store.createRecord('pki/action', {
-        ...this.allKeyFields,
-        type: 'existing',
-        customTtl: '40m',
-        issuerName: 'my issuer',
-        commonName: 'my common name',
-      });
-      const expectedResult = {
-        ...this.withDefaults,
-        issuer_name: 'my issuer',
-        common_name: 'my common name',
-        key_ref: 'key ref',
-      };
-
-      const serializedRecord = record.serialize(this.actionType);
-      assert.deepEqual(serializedRecord, expectedResult);
-    });
-
-    test('it serializes only valid params for type = kms', function (assert) {
-      const store = this.owner.lookup('service:store');
-      const record = store.createRecord('pki/action', {
-        ...this.allKeyFields,
-        type: 'kms',
-        customTtl: '40m',
-        issuerName: 'my issuer',
-        commonName: 'my common name',
-      });
-      const expectedResult = {
-        ...this.withDefaults,
-        issuer_name: 'my issuer',
-        common_name: 'my common name',
-        key_name: 'key name',
-        managed_key_name: 'managed name',
-        managed_key_id: 'managed id',
-      };
-
-      const serializedRecord = record.serialize(this.actionType);
-      assert.deepEqual(serializedRecord, expectedResult);
-    });
-  });
-});
diff --git a/ui/tests/unit/serializers/policy-test.js b/ui/tests/unit/serializers/policy-test.js
index 2a61b62772c42..d79d9ed0c4aa0 100644
--- a/ui/tests/unit/serializers/policy-test.js
+++ b/ui/tests/unit/serializers/policy-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
@@ -52,9 +47,9 @@ module('Unit | Serializer | policy', function (hooks) {
   };
 
   test('it transforms a list request payload', function (assert) {
-    const serializer = this.owner.lookup('serializer:policy');
+    let serializer = this.owner.lookup('serializer:policy');
 
-    const transformedPayload = serializer.normalizePolicies(POLICY_LIST_RESPONSE);
+    let transformedPayload = serializer.normalizePolicies(POLICY_LIST_RESPONSE);
 
     assert.deepEqual(
       transformedPayload,
@@ -64,9 +59,9 @@ module('Unit | Serializer | policy', function (hooks) {
   });
 
   test('it transforms another list request payload', function (assert) {
-    const serializer = this.owner.lookup('serializer:policy');
+    let serializer = this.owner.lookup('serializer:policy');
 
-    const transformedPayload = serializer.normalizePolicies(POLICY_SHOW_RESPONSE);
+    let transformedPayload = serializer.normalizePolicies(POLICY_SHOW_RESPONSE);
 
     assert.deepEqual(
       transformedPayload,
diff --git a/ui/tests/unit/serializers/transit-key-test.js b/ui/tests/unit/serializers/transit-key-test.js
index df121615ef22d..2ec5d337c7320 100644
--- a/ui/tests/unit/serializers/transit-key-test.js
+++ b/ui/tests/unit/serializers/transit-key-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
@@ -69,14 +64,14 @@ const AES = {
 module('Unit | Serializer | transit-key', function (hooks) {
   setupTest(hooks);
   test('it expands the timestamp for aes and chacha-poly keys', function (assert) {
-    const serializer = this.owner.lookup('serializer:transit-key');
-    const aesExpected = AES.data.keys[1] * 1000;
-    const chachaExpected = CHACHA.data.keys[1] * 1000;
-    const aesData = serializer.normalizeSecrets({ ...AES });
-    assert.strictEqual(aesData.firstObject.keys[1], aesExpected, 'converts seconds to millis for aes keys');
+    let serializer = this.owner.lookup('serializer:transit-key');
+    let aesExpected = AES.data.keys[1] * 1000;
+    let chachaExpected = CHACHA.data.keys[1] * 1000;
+    let aesData = serializer.normalizeSecrets({ ...AES });
+    assert.equal(aesData.firstObject.keys[1], aesExpected, 'converts seconds to millis for aes keys');
 
-    const chachaData = serializer.normalizeSecrets({ ...CHACHA });
-    assert.strictEqual(
+    let chachaData = serializer.normalizeSecrets({ ...CHACHA });
+    assert.equal(
       chachaData.firstObject.keys[1],
       chachaExpected,
       'converts seconds to millis for chacha keys'
@@ -84,12 +79,8 @@ module('Unit | Serializer | transit-key', function (hooks) {
   });
 
   test('it includes backend from the payload on the normalized data', function (assert) {
-    const serializer = this.owner.lookup('serializer:transit-key');
-    const data = serializer.normalizeSecrets({ ...AES });
-    assert.strictEqual(
-      data.firstObject.backend,
-      'its-a-transit',
-      'pulls backend from the payload onto the data'
-    );
+    let serializer = this.owner.lookup('serializer:transit-key');
+    let data = serializer.normalizeSecrets({ ...AES });
+    assert.equal(data.firstObject.backend, 'its-a-transit', 'pulls backend from the payload onto the data');
   });
 });
diff --git a/ui/tests/unit/services/auth-test.js b/ui/tests/unit/services/auth-test.js
index 807ad722ade34..11447ea554f91 100644
--- a/ui/tests/unit/services/auth-test.js
+++ b/ui/tests/unit/services/auth-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
@@ -14,17 +9,17 @@ module('Unit | Service | auth', function (hooks) {
     ['#calculateExpiration w/lease_duration', { ttl: 15 }, 15],
   ].forEach(([testName, response, ttlValue]) => {
     test(testName, function (assert) {
-      const now = Date.now();
-      const service = this.owner.factoryFor('service:auth').create({
+      let now = Date.now();
+      let service = this.owner.factoryFor('service:auth').create({
         now() {
           return now;
         },
       });
 
-      const resp = service.calculateExpiration(response);
+      let resp = service.calculateExpiration(response);
 
-      assert.strictEqual(resp.ttl, ttlValue, 'returns the ttl');
-      assert.strictEqual(
+      assert.equal(resp.ttl, ttlValue, 'returns the ttl');
+      assert.equal(
         resp.tokenExpirationEpoch,
         now + ttlValue * 1e3,
         'calculates expiration from ttl as epoch timestamp'
diff --git a/ui/tests/unit/services/console-test.js b/ui/tests/unit/services/console-test.js
index 950bd0a1b65bd..cbc6cabb887c9 100644
--- a/ui/tests/unit/services/console-test.js
+++ b/ui/tests/unit/services/console-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { sanitizePath, ensureTrailingSlash } from 'vault/services/console';
@@ -14,20 +9,16 @@ module('Unit | Service | console', function (hooks) {
   hooks.afterEach(function () {});
 
   test('#sanitizePath', function (assert) {
-    assert.strictEqual(
-      sanitizePath(' /foo/bar/baz/ '),
-      'foo/bar/baz',
-      'removes spaces and slashs on either side'
-    );
-    assert.strictEqual(sanitizePath('//foo/bar/baz/'), 'foo/bar/baz', 'removes more than one slash');
+    assert.equal(sanitizePath(' /foo/bar/baz/ '), 'foo/bar/baz', 'removes spaces and slashs on either side');
+    assert.equal(sanitizePath('//foo/bar/baz/'), 'foo/bar/baz', 'removes more than one slash');
   });
 
   test('#ensureTrailingSlash', function (assert) {
-    assert.strictEqual(ensureTrailingSlash('foo/bar'), 'foo/bar/', 'adds trailing slash');
-    assert.strictEqual(ensureTrailingSlash('baz/'), 'baz/', 'keeps trailing slash if there is one');
+    assert.equal(ensureTrailingSlash('foo/bar'), 'foo/bar/', 'adds trailing slash');
+    assert.equal(ensureTrailingSlash('baz/'), 'baz/', 'keeps trailing slash if there is one');
   });
 
-  const testCases = [
+  let testCases = [
     {
       method: 'read',
       args: ['/sys/health', {}],
@@ -38,7 +29,7 @@ module('Unit | Service | console', function (hooks) {
 
     {
       method: 'read',
-      args: ['/secrets/foo/bar', {}, { wrapTTL: '30m' }],
+      args: ['/secrets/foo/bar', {}, '30m'],
       expectedURL: 'secrets/foo/bar',
       expectedVerb: 'GET',
       expectedOptions: { data: undefined, wrapTTL: '30m' },
@@ -65,7 +56,7 @@ module('Unit | Service | console', function (hooks) {
 
     {
       method: 'list',
-      args: ['secret/mounts', {}, { wrapTTL: '1h' }],
+      args: ['secret/mounts', {}, '1h'],
       expectedURL: 'secret/mounts/',
       expectedVerb: 'GET',
       expectedOptions: { data: { list: true }, wrapTTL: '1h' },
@@ -82,8 +73,8 @@ module('Unit | Service | console', function (hooks) {
 
   test('it reads, writes, lists, deletes', function (assert) {
     assert.expect(18);
-    const ajax = sinon.stub();
-    const uiConsole = this.owner.factoryFor('service:console').create({
+    let ajax = sinon.stub();
+    let uiConsole = this.owner.factoryFor('service:console').create({
       adapter() {
         return {
           buildURL(url) {
@@ -96,63 +87,9 @@ module('Unit | Service | console', function (hooks) {
 
     testCases.forEach((testCase) => {
       uiConsole[testCase.method](...testCase.args);
-      const [url, verb, options] = ajax.lastCall.args;
-      assert.strictEqual(url, testCase.expectedURL, `${testCase.method}: uses trimmed passed url`);
-      assert.strictEqual(verb, testCase.expectedVerb, `${testCase.method}: uses the correct verb`);
-      assert.deepEqual(options, testCase.expectedOptions, `${testCase.method}: uses the correct options`);
-    });
-  });
-
-  const kvTestCases = [
-    {
-      method: 'kvGet',
-      args: ['kv/foo'],
-      expectedURL: 'kv/data/foo',
-      expectedVerb: 'GET',
-      expectedOptions: { data: undefined, wrapTTL: undefined },
-    },
-    {
-      method: 'kvGet',
-      args: ['kv/foo', {}, { metadata: true }],
-      expectedURL: 'kv/metadata/foo',
-      expectedVerb: 'GET',
-      expectedOptions: { data: undefined, wrapTTL: undefined },
-    },
-    {
-      method: 'kvGet',
-      args: ['kv/foo', {}, { wrapTTL: '10m' }],
-      expectedURL: 'kv/data/foo',
-      expectedVerb: 'GET',
-      expectedOptions: { data: undefined, wrapTTL: '10m' },
-    },
-    {
-      method: 'kvGet',
-      args: ['kv/foo', {}, { metadata: true, wrapTTL: '10m' }],
-      expectedURL: 'kv/metadata/foo',
-      expectedVerb: 'GET',
-      expectedOptions: { data: undefined, wrapTTL: '10m' },
-    },
-  ];
-
-  test('it reads kv secret and metadata', function (assert) {
-    assert.expect(12);
-    const ajax = sinon.stub();
-    const uiConsole = this.owner.factoryFor('service:console').create({
-      adapter() {
-        return {
-          buildURL(url) {
-            return url;
-          },
-          ajax,
-        };
-      },
-    });
-
-    kvTestCases.forEach((testCase) => {
-      uiConsole[testCase.method](...testCase.args);
-      const [url, verb, options] = ajax.lastCall.args;
-      assert.strictEqual(url, testCase.expectedURL, `${testCase.method}: uses correct url`);
-      assert.strictEqual(verb, testCase.expectedVerb, `${testCase.method}: uses the correct verb`);
+      let [url, verb, options] = ajax.lastCall.args;
+      assert.equal(url, testCase.expectedURL, `${testCase.method}: uses trimmed passed url`);
+      assert.equal(verb, testCase.expectedVerb, `${testCase.method}: uses the correct verb`);
       assert.deepEqual(options, testCase.expectedOptions, `${testCase.method}: uses the correct options`);
     });
   });
diff --git a/ui/tests/unit/services/control-group-test.js b/ui/tests/unit/services/control-group-test.js
index dcb37cf6d1f98..b860026408173 100644
--- a/ui/tests/unit/services/control-group-test.js
+++ b/ui/tests/unit/services/control-group-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { set } from '@ember/object';
 import Service from '@ember/service';
 import { module, test } from 'qunit';
@@ -11,7 +6,7 @@ import sinon from 'sinon';
 
 import { storageKey, CONTROL_GROUP_PREFIX, TOKEN_SEPARATOR } from 'vault/services/control-group';
 
-const versionStub = Service.extend();
+let versionStub = Service.extend();
 
 function storage() {
   return {
@@ -45,15 +40,14 @@ module('Unit | Service | control group', function (hooks) {
     this.router.reopen({
       transitionTo: sinon.stub(),
       urlFor: sinon.stub().returns('/ui/vault/foo'),
-      currentURL: '/vault/secrets/kv/show/foo',
     });
   });
 
   hooks.afterEach(function () {});
 
-  const isOSS = (context) => set(context, 'version.isOSS', true);
-  const isEnt = (context) => set(context, 'version.isOSS', false);
-  const resolvesArgs = (assert, result, expectedArgs) => {
+  let isOSS = (context) => set(context, 'version.isOSS', true);
+  let isEnt = (context) => set(context, 'version.isOSS', false);
+  let resolvesArgs = (assert, result, expectedArgs) => {
     return result.then((...args) => {
       return assert.deepEqual(args, expectedArgs, 'resolves with the passed args');
     });
@@ -99,8 +93,8 @@ module('Unit | Service | control group', function (hooks) {
         return result.then(
           () => {},
           (err) => {
-            assert.strictEqual(err.token, 'secret');
-            assert.strictEqual(err.accessor, 'lookup');
+            assert.equal(err.token, 'secret');
+            assert.equal(err.accessor, 'lookup');
           }
         );
       },
@@ -112,25 +106,33 @@ module('Unit | Service | control group', function (hooks) {
       if (setup) {
         setup(this);
       }
-      const service = this.owner.lookup('service:control-group');
-      const result = service.checkForControlGroup(...args);
+      let service = this.owner.lookup('service:control-group');
+      let result = service.checkForControlGroup(...args);
       return expectation(assert, result);
     });
   });
 
-  test(`handleError: transitions to accessor and stores control group token`, function (assert) {
-    const error = {
+  test(`handleError: transitions to accessor when there is no transition passed in`, function (assert) {
+    let error = {
       accessor: '12345',
       token: 'token',
       creation_path: 'kv/',
-      creation_time: '2022-03-17T20:00:25.594Z',
+      creation_time: new Date().toISOString(),
       ttl: 400,
     };
-    const expected = { ...error, uiParams: { url: '/vault/secrets/kv/show/foo' } };
-    const service = this.owner.factoryFor('service:control-group').create({
+    let url;
+    let expected = { ...error, uiParams: { url } };
+    let transition = {
+      to: {
+        name: 'vault.cluster.foo',
+      },
+    };
+    let service = this.owner.factoryFor('service:control-group').create({
+      urlFromTransition: sinon.spy(),
       storeControlGroupToken: sinon.spy(),
     });
-    service.handleError(error);
+    service.handleError(error, transition);
+    assert.ok(service.urlFromTransition.calledWith(transition), 'calls urlFromTransition');
     assert.ok(service.storeControlGroupToken.calledWith(expected), 'calls storeControlGroupToken');
     assert.ok(
       this.router.transitionTo.calledWith('vault.cluster.access.control-group-accessor', '12345'),
@@ -139,17 +141,17 @@ module('Unit | Service | control group', function (hooks) {
   });
 
   test(`logFromError: returns correct content string`, function (assert) {
-    const error = {
+    let error = {
       accessor: '12345',
       token: 'token',
       creation_path: 'kv/',
-      creation_time: '2022-03-17T20:00:25.594Z',
+      creation_time: new Date().toISOString(),
       ttl: 400,
     };
-    const service = this.owner.factoryFor('service:control-group').create({
+    let service = this.owner.factoryFor('service:control-group').create({
       storeControlGroupToken: sinon.spy(),
     });
-    const contentString = service.logFromError(error);
+    let contentString = service.logFromError(error);
     assert.ok(
       this.router.urlFor.calledWith('vault.cluster.access.control-group-accessor', '12345'),
       'calls urlFor with accessor'
@@ -160,20 +162,45 @@ module('Unit | Service | control group', function (hooks) {
     assert.ok(contentString.content.includes('token'), 'contains token');
   });
 
+  test('urlFromTransition', function (assert) {
+    let transition = {
+      to: {
+        name: 'vault.cluster.foo',
+        params: { bar: '1' },
+        paramNames: ['bar'],
+        queryParams: {},
+        parent: {
+          name: 'vault.cluster',
+          params: { cluster_name: 'vault' },
+          paramNames: ['cluster_name'],
+          parent: {
+            name: 'vault',
+            params: {},
+            paramNames: [],
+          },
+        },
+      },
+    };
+    let expected = [transition.to.name, 'vault', '1', { queryParams: {} }];
+    let service = this.owner.lookup('service:control-group');
+    service.urlFromTransition(transition);
+    assert.ok(this.router.urlFor.calledWith(...expected), 'calls urlFor with expected args');
+  });
+
   test('storageKey', function (assert) {
-    const accessor = '12345';
-    const path = 'kv/foo/bar';
-    const expectedKey = `${CONTROL_GROUP_PREFIX}${accessor}${TOKEN_SEPARATOR}${path}`;
-    assert.strictEqual(storageKey(accessor, path), expectedKey, 'uses expected key');
+    let accessor = '12345';
+    let path = 'kv/foo/bar';
+    let expectedKey = `${CONTROL_GROUP_PREFIX}${accessor}${TOKEN_SEPARATOR}${path}`;
+    assert.equal(storageKey(accessor, path), expectedKey, 'uses expected key');
   });
 
   test('keyFromAccessor', function (assert) {
-    const store = storage();
-    const accessor = '12345';
-    const path = 'kv/foo/bar';
-    const data = { foo: 'bar' };
-    const expectedKey = `${CONTROL_GROUP_PREFIX}${accessor}${TOKEN_SEPARATOR}${path}`;
-    const subject = this.owner.factoryFor('service:control-group').create({
+    let store = storage();
+    let accessor = '12345';
+    let path = 'kv/foo/bar';
+    let data = { foo: 'bar' };
+    let expectedKey = `${CONTROL_GROUP_PREFIX}${accessor}${TOKEN_SEPARATOR}${path}`;
+    let subject = this.owner.factoryFor('service:control-group').create({
       storage() {
         return store;
       },
@@ -182,73 +209,73 @@ module('Unit | Service | control group', function (hooks) {
     store.setItem(expectedKey, data);
     store.setItem(`${CONTROL_GROUP_PREFIX}2345${TOKEN_SEPARATOR}${path}`, 'ok');
 
-    assert.strictEqual(subject.keyFromAccessor(accessor), expectedKey, 'finds key given the accessor');
-    assert.strictEqual(subject.keyFromAccessor('foo'), null, 'returns null if no key was found');
+    assert.equal(subject.keyFromAccessor(accessor), expectedKey, 'finds key given the accessor');
+    assert.equal(subject.keyFromAccessor('foo'), null, 'returns null if no key was found');
   });
 
   test('storeControlGroupToken', function (assert) {
-    const store = storage();
-    const subject = this.owner.factoryFor('service:control-group').create({
+    let store = storage();
+    let subject = this.owner.factoryFor('service:control-group').create({
       storage() {
         return store;
       },
     });
-    const info = {
+    let info = {
       accessor: '12345',
       creation_path: 'foo/',
-      creation_time: '2022-03-17T20:00:25.594Z',
+      creation_time: new Date().toISOString(),
       ttl: 300,
     };
-    const key = `${CONTROL_GROUP_PREFIX}${info.accessor}${TOKEN_SEPARATOR}${info.creation_path}`;
+    let key = `${CONTROL_GROUP_PREFIX}${info.accessor}${TOKEN_SEPARATOR}${info.creation_path}`;
 
     subject.storeControlGroupToken(info);
     assert.deepEqual(store.items[key], JSON.stringify(info), 'stores the whole info object');
   });
 
   test('deleteControlGroupToken', function (assert) {
-    const store = storage();
-    const subject = this.owner.factoryFor('service:control-group').create({
+    let store = storage();
+    let subject = this.owner.factoryFor('service:control-group').create({
       storage() {
         return store;
       },
     });
-    const accessor = 'foo';
-    const path = 'kv/one';
+    let accessor = 'foo';
+    let path = 'kv/one';
 
-    const expectedKey = `${CONTROL_GROUP_PREFIX}${accessor}${TOKEN_SEPARATOR}${path}`;
+    let expectedKey = `${CONTROL_GROUP_PREFIX}${accessor}${TOKEN_SEPARATOR}${path}`;
     store.setItem(expectedKey, { one: '2' });
     subject.deleteControlGroupToken(accessor);
-    assert.strictEqual(Object.keys(store.items).length, 0, 'there are no keys stored in storage');
+    assert.equal(Object.keys(store.items).length, 0, 'there are no keys stored in storage');
   });
 
   test('deleteTokens', function (assert) {
-    const store = storage();
-    const subject = this.owner.factoryFor('service:control-group').create({
+    let store = storage();
+    let subject = this.owner.factoryFor('service:control-group').create({
       storage() {
         return store;
       },
     });
 
-    const keyOne = `${CONTROL_GROUP_PREFIX}foo`;
-    const keyTwo = `${CONTROL_GROUP_PREFIX}bar`;
+    let keyOne = `${CONTROL_GROUP_PREFIX}foo`;
+    let keyTwo = `${CONTROL_GROUP_PREFIX}bar`;
     store.setItem(keyOne, { one: '2' });
     store.setItem(keyTwo, { two: '2' });
     store.setItem('value', 'one');
-    assert.strictEqual(Object.keys(store.items).length, 3, 'stores 3 values');
+    assert.equal(Object.keys(store.items).length, 3, 'stores 3 values');
     subject.deleteTokens();
-    assert.strictEqual(Object.keys(store.items).length, 1, 'removes tokens with control group prefix');
-    assert.strictEqual(store.getItem('value'), 'one', 'keeps the non-prefixed value');
+    assert.equal(Object.keys(store.items).length, 1, 'removes tokens with control group prefix');
+    assert.equal(store.getItem('value'), 'one', 'keeps the non-prefixed value');
   });
 
   test('wrapInfoForAccessor', function (assert) {
-    const store = storage();
-    const subject = this.owner.factoryFor('service:control-group').create({
+    let store = storage();
+    let subject = this.owner.factoryFor('service:control-group').create({
       storage() {
         return store;
       },
     });
 
-    const keyOne = `${CONTROL_GROUP_PREFIX}foo`;
+    let keyOne = `${CONTROL_GROUP_PREFIX}foo`;
     store.setItem(keyOne, { one: '2' });
     assert.deepEqual(subject.wrapInfoForAccessor('foo'), { one: '2' });
   });
diff --git a/ui/tests/unit/services/feature-flag-test.js b/ui/tests/unit/services/feature-flag-test.js
index cb27a1f3252cd..6f6f9a210d861 100644
--- a/ui/tests/unit/services/feature-flag-test.js
+++ b/ui/tests/unit/services/feature-flag-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
@@ -10,17 +5,17 @@ module('Unit | Service | feature-flag', function (hooks) {
   setupTest(hooks);
 
   test('it exists', function (assert) {
-    const service = this.owner.lookup('service:feature-flag');
+    let service = this.owner.lookup('service:feature-flag');
     assert.ok(service);
   });
 
   test('it returns the namespace root when flag is present', function (assert) {
-    const service = this.owner.lookup('service:feature-flag');
-    assert.strictEqual(service.managedNamespaceRoot, null, 'Managed namespace root is null by default');
+    let service = this.owner.lookup('service:feature-flag');
+    assert.equal(service.managedNamespaceRoot, null, 'Managed namespace root is null by default');
     service.setFeatureFlags(['VAULT_CLOUD_ADMIN_NAMESPACE']);
-    assert.strictEqual(service.managedNamespaceRoot, 'admin', 'Managed namespace is admin when flag present');
+    assert.equal(service.managedNamespaceRoot, 'admin', 'Managed namespace is admin when flag present');
     service.setFeatureFlags(['SOMETHING_ELSE']);
-    assert.strictEqual(
+    assert.equal(
       service.managedNamespaceRoot,
       null,
       'Flags were overwritten and root namespace is null again'
diff --git a/ui/tests/unit/services/path-helper-test.js b/ui/tests/unit/services/path-helper-test.js
index cda54dcf23ce0..42f339b6ebb34 100644
--- a/ui/tests/unit/services/path-helper-test.js
+++ b/ui/tests/unit/services/path-helper-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { setupMirage } from 'ember-cli-mirage/test-support';
@@ -73,6 +68,6 @@ module('Unit | Service | path-help', function (hooks) {
     const model = this.store.createRecord(modelType);
     model.set('mutableId', 'test');
     await model.save();
-    assert.strictEqual(model.get('id'), 'test', 'model id is set to mutableId value on save success');
+    assert.equal(model.get('id'), 'test', 'model id is set to mutableId value on save success');
   });
 });
diff --git a/ui/tests/unit/services/permissions-test.js b/ui/tests/unit/services/permissions-test.js
index f40ec85d5aec9..18a7d8012b303 100644
--- a/ui/tests/unit/services/permissions-test.js
+++ b/ui/tests/unit/services/permissions-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import Pretender from 'pretender';
@@ -40,7 +35,6 @@ module('Unit | Service | permissions', function (hooks) {
     this.server.get('/v1/sys/internal/ui/resultant-acl', () => {
       return [200, { 'Content-Type': 'application/json' }, JSON.stringify(PERMISSIONS_RESPONSE)];
     });
-    this.service = this.owner.lookup('service:permissions');
   });
 
   hooks.afterEach(function () {
@@ -48,80 +42,94 @@ module('Unit | Service | permissions', function (hooks) {
   });
 
   test('sets paths properly', async function (assert) {
-    await this.service.getPaths.perform();
-    assert.deepEqual(this.service.get('exactPaths'), PERMISSIONS_RESPONSE.data.exact_paths);
-    assert.deepEqual(this.service.get('globPaths'), PERMISSIONS_RESPONSE.data.glob_paths);
+    let service = this.owner.lookup('service:permissions');
+    await service.getPaths.perform();
+    assert.deepEqual(service.get('exactPaths'), PERMISSIONS_RESPONSE.data.exact_paths);
+    assert.deepEqual(service.get('globPaths'), PERMISSIONS_RESPONSE.data.glob_paths);
   });
 
   test('returns true if a policy includes access to an exact path', function (assert) {
-    this.service.set('exactPaths', PERMISSIONS_RESPONSE.data.exact_paths);
-    assert.true(this.service.hasPermission('foo'));
+    let service = this.owner.lookup('service:permissions');
+    service.set('exactPaths', PERMISSIONS_RESPONSE.data.exact_paths);
+    assert.true(service.hasPermission('foo'));
   });
 
   test('returns true if a paths prefix is included in the policys exact paths', function (assert) {
-    this.service.set('exactPaths', PERMISSIONS_RESPONSE.data.exact_paths);
-    assert.true(this.service.hasPermission('bar'));
+    let service = this.owner.lookup('service:permissions');
+    service.set('exactPaths', PERMISSIONS_RESPONSE.data.exact_paths);
+    assert.true(service.hasPermission('bar'));
   });
 
   test('it returns true if a policy includes access to a glob path', function (assert) {
-    this.service.set('globPaths', PERMISSIONS_RESPONSE.data.glob_paths);
-    assert.true(this.service.hasPermission('baz/biz/hi'));
+    let service = this.owner.lookup('service:permissions');
+    service.set('globPaths', PERMISSIONS_RESPONSE.data.glob_paths);
+    assert.true(service.hasPermission('baz/biz/hi'));
   });
 
   test('it returns true if a policy includes access to the * glob path', function (assert) {
+    let service = this.owner.lookup('service:permissions');
     const splatPath = { '': {} };
-    this.service.set('globPaths', splatPath);
-    assert.true(this.service.hasPermission('hi'));
+    service.set('globPaths', splatPath);
+    assert.true(service.hasPermission('hi'));
   });
 
   test('it returns false if the matched path includes the deny capability', function (assert) {
-    this.service.set('globPaths', PERMISSIONS_RESPONSE.data.glob_paths);
-    assert.false(this.service.hasPermission('boo'));
+    let service = this.owner.lookup('service:permissions');
+    service.set('globPaths', PERMISSIONS_RESPONSE.data.glob_paths);
+    assert.false(service.hasPermission('boo'));
   });
 
   test('it returns true if passed path does not end in a slash but globPath does', function (assert) {
-    this.service.set('globPaths', PERMISSIONS_RESPONSE.data.glob_paths);
-    assert.true(this.service.hasPermission('ends/in/slash'), 'matches without slash');
-    assert.true(this.service.hasPermission('ends/in/slash/'), 'matches with slash');
+    let service = this.owner.lookup('service:permissions');
+    service.set('globPaths', PERMISSIONS_RESPONSE.data.glob_paths);
+    assert.true(service.hasPermission('ends/in/slash'), 'matches without slash');
+    assert.true(service.hasPermission('ends/in/slash/'), 'matches with slash');
   });
 
   test('it returns false if a policy does not includes access to a path', function (assert) {
-    assert.false(this.service.hasPermission('danger'));
+    let service = this.owner.lookup('service:permissions');
+    assert.false(service.hasPermission('danger'));
   });
 
   test('sets the root token', function (assert) {
-    this.service.setPaths({ data: { root: true } });
-    assert.true(this.service.canViewAll);
+    let service = this.owner.lookup('service:permissions');
+    service.setPaths({ data: { root: true } });
+    assert.true(service.canViewAll);
   });
 
   test('returns true with the root token', function (assert) {
-    this.service.set('canViewAll', true);
-    assert.true(this.service.hasPermission('hi'));
+    let service = this.owner.lookup('service:permissions');
+    service.set('canViewAll', true);
+    assert.true(service.hasPermission('hi'));
   });
 
   test('it returns true if a policy has the specified capabilities on a path', function (assert) {
-    this.service.set('exactPaths', PERMISSIONS_RESPONSE.data.exact_paths);
-    this.service.set('globPaths', PERMISSIONS_RESPONSE.data.glob_paths);
-    assert.true(this.service.hasPermission('bar/bee', ['create', 'list']));
-    assert.true(this.service.hasPermission('baz/biz', ['read']));
+    let service = this.owner.lookup('service:permissions');
+    service.set('exactPaths', PERMISSIONS_RESPONSE.data.exact_paths);
+    service.set('globPaths', PERMISSIONS_RESPONSE.data.glob_paths);
+    assert.true(service.hasPermission('bar/bee', ['create', 'list']));
+    assert.true(service.hasPermission('baz/biz', ['read']));
   });
 
   test('it returns false if a policy does not have the specified capabilities on a path', function (assert) {
-    this.service.set('exactPaths', PERMISSIONS_RESPONSE.data.exact_paths);
-    this.service.set('globPaths', PERMISSIONS_RESPONSE.data.glob_paths);
-    assert.false(this.service.hasPermission('bar/bee', ['create', 'delete']));
-    assert.false(this.service.hasPermission('foo', ['create']));
+    let service = this.owner.lookup('service:permissions');
+    service.set('exactPaths', PERMISSIONS_RESPONSE.data.exact_paths);
+    service.set('globPaths', PERMISSIONS_RESPONSE.data.glob_paths);
+    assert.false(service.hasPermission('bar/bee', ['create', 'delete']));
+    assert.false(service.hasPermission('foo', ['create']));
   });
 
   test('defaults to show all items when policy cannot be found', async function (assert) {
+    let service = this.owner.lookup('service:permissions');
     this.server.get('/v1/sys/internal/ui/resultant-acl', () => {
       return [403, { 'Content-Type': 'application/json' }];
     });
-    await this.service.getPaths.perform();
-    assert.true(this.service.canViewAll);
+    await service.getPaths.perform();
+    assert.true(service.canViewAll);
   });
 
   test('returns the first allowed nav route for policies', function (assert) {
+    let service = this.owner.lookup('service:permissions');
     const policyPaths = {
       'sys/policies/acl': {
         capabilities: ['deny'],
@@ -130,11 +138,12 @@ module('Unit | Service | permissions', function (hooks) {
         capabilities: ['read'],
       },
     };
-    this.service.set('exactPaths', policyPaths);
-    assert.strictEqual(this.service.navPathParams('policies').models[0], 'rgp');
+    service.set('exactPaths', policyPaths);
+    assert.equal(service.navPathParams('policies').models[0], 'rgp');
   });
 
   test('returns the first allowed nav route for access', function (assert) {
+    let service = this.owner.lookup('service:permissions');
     const accessPaths = {
       'sys/auth': {
         capabilities: ['deny'],
@@ -144,11 +153,12 @@ module('Unit | Service | permissions', function (hooks) {
       },
     };
     const expected = { route: 'vault.cluster.access.identity', models: ['entities'] };
-    this.service.set('exactPaths', accessPaths);
-    assert.deepEqual(this.service.navPathParams('access'), expected);
+    service.set('exactPaths', accessPaths);
+    assert.deepEqual(service.navPathParams('access'), expected);
   });
 
   test('hasNavPermission returns true if a policy includes the required capabilities for at least one path', function (assert) {
+    let service = this.owner.lookup('service:permissions');
     const accessPaths = {
       'sys/auth': {
         capabilities: ['deny'],
@@ -157,11 +167,12 @@ module('Unit | Service | permissions', function (hooks) {
         capabilities: ['list', 'read'],
       },
     };
-    this.service.set('exactPaths', accessPaths);
-    assert.true(this.service.hasNavPermission('access', 'groups'));
+    service.set('exactPaths', accessPaths);
+    assert.true(service.hasNavPermission('access', 'groups'));
   });
 
   test('hasNavPermission returns false if a policy does not include the required capabilities for at least one path', function (assert) {
+    let service = this.owner.lookup('service:permissions');
     const accessPaths = {
       'sys/auth': {
         capabilities: ['deny'],
@@ -170,48 +181,8 @@ module('Unit | Service | permissions', function (hooks) {
         capabilities: ['read'],
       },
     };
-    this.service.set('exactPaths', accessPaths);
-    assert.false(this.service.hasNavPermission('access', 'groups'));
-  });
-
-  test('hasNavPermission should handle routeParams as array', function (assert) {
-    const getPaths = (override) => ({
-      'sys/auth': {
-        capabilities: [override || 'read'],
-      },
-      'identity/mfa/method': {
-        capabilities: [override || 'read'],
-      },
-      'identity/oidc/client': {
-        capabilities: [override || 'deny'],
-      },
-    });
-
-    this.service.set('exactPaths', getPaths());
-    assert.true(
-      this.service.hasNavPermission('access', ['methods', 'mfa', 'oidc']),
-      'hasNavPermission returns true for array of route params when any route is permitted'
-    );
-    assert.false(
-      this.service.hasNavPermission('access', ['methods', 'mfa', 'oidc'], true),
-      'hasNavPermission returns false for array of route params when any route is not permitted and requireAll is passed'
-    );
-
-    this.service.set('exactPaths', getPaths('read'));
-    assert.true(
-      this.service.hasNavPermission('access', ['methods', 'mfa', 'oidc'], true),
-      'hasNavPermission returns true for array of route params when all routes are permitted and requireAll is passed'
-    );
-
-    this.service.set('exactPaths', getPaths('deny'));
-    assert.false(
-      this.service.hasNavPermission('access', ['methods', 'mfa', 'oidc']),
-      'hasNavPermission returns false for array of route params when no routes are permitted'
-    );
-    assert.false(
-      this.service.hasNavPermission('access', ['methods', 'mfa', 'oidc'], true),
-      'hasNavPermission returns false for array of route params when no routes are permitted and requireAll is passed'
-    );
+    service.set('exactPaths', accessPaths);
+    assert.false(service.hasNavPermission('access', 'groups'));
   });
 
   test('appends the namespace to the path if there is one', function (assert) {
@@ -219,6 +190,7 @@ module('Unit | Service | permissions', function (hooks) {
       path: 'marketing',
     });
     this.owner.register('service:namespace', namespaceService);
-    assert.strictEqual(this.service.pathNameWithNamespace('sys/auth'), 'marketing/sys/auth');
+    let service = this.owner.lookup('service:permissions');
+    assert.equal(service.pathNameWithNamespace('sys/auth'), 'marketing/sys/auth');
   });
 });
diff --git a/ui/tests/unit/services/store-test.js b/ui/tests/unit/services/store-test.js
index a5d1e4facea38..a746e667318f5 100644
--- a/ui/tests/unit/services/store-test.js
+++ b/ui/tests/unit/services/store-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { resolve } from 'rsvp';
 import { run } from '@ember/runloop';
 import { module, test } from 'qunit';
@@ -17,7 +12,7 @@ module('Unit | Service | store', function (hooks) {
   setupTest(hooks);
 
   test('normalizeModelName', function (assert) {
-    assert.strictEqual(normalizeModelName('oneThing'), 'one-thing', 'dasherizes modelName');
+    assert.equal(normalizeModelName('oneThing'), 'one-thing', 'dasherizes modelName');
   });
 
   test('keyForCache', function (assert) {
@@ -28,10 +23,10 @@ module('Unit | Service | store', function (hooks) {
   });
 
   test('clamp', function (assert) {
-    assert.strictEqual(clamp('foo', 0, 100), 0, 'returns the min if passed a non-number');
-    assert.strictEqual(clamp(0, 1, 100), 1, 'returns the min when passed number is less than the min');
-    assert.strictEqual(clamp(200, 1, 100), 100, 'returns the max passed number is greater than the max');
-    assert.strictEqual(clamp(50, 1, 100), 50, 'returns the passed number when it is in range');
+    assert.equal(clamp('foo', 0, 100), 0, 'returns the min if passed a non-number');
+    assert.equal(clamp(0, 1, 100), 1, 'returns the min when passed number is less than the min');
+    assert.equal(clamp(200, 1, 100), 100, 'returns the max passed number is greater than the max');
+    assert.equal(clamp(50, 1, 100), 50, 'returns the passed number when it is in range');
   });
 
   test('store.storeDataset', function (assert) {
@@ -52,10 +47,10 @@ module('Unit | Service | store', function (hooks) {
     const arr2 = ['one', 'two', 'three', 'four'];
     store.storeDataset('data', { id: 1 }, {}, arr);
     store.storeDataset('transit-key', { id: 2 }, {}, arr2);
-    assert.strictEqual(store.get('lazyCaches').size, 2, 'it stores both keys');
+    assert.equal(store.get('lazyCaches').size, 2, 'it stores both keys');
 
     store.clearDataset('transit-key');
-    assert.strictEqual(store.get('lazyCaches').size, 1, 'deletes one key');
+    assert.equal(store.get('lazyCaches').size, 1, 'deletes one key');
     assert.notOk(store.get('lazyCaches').has(), 'cache is no longer stored');
   });
 
@@ -65,10 +60,10 @@ module('Unit | Service | store', function (hooks) {
     const arr2 = ['one', 'two', 'three', 'four'];
     store.storeDataset('data', { id: 1 }, {}, arr);
     store.storeDataset('transit-key', { id: 2 }, {}, arr2);
-    assert.strictEqual(store.get('lazyCaches').size, 2, 'it stores both keys');
+    assert.equal(store.get('lazyCaches').size, 2, 'it stores both keys');
 
     store.clearAllDatasets();
-    assert.strictEqual(store.get('lazyCaches').size, 0, 'deletes all of the keys');
+    assert.equal(store.get('lazyCaches').size, 0, 'deletes all of the keys');
     assert.notOk(store.get('lazyCaches').has('transit-key'), 'first cache key is no longer stored');
     assert.notOk(store.get('lazyCaches').has('data'), 'second cache key is no longer stored');
   });
@@ -97,7 +92,7 @@ module('Unit | Service | store', function (hooks) {
   });
 
   test('store.fetchPage', function (assert) {
-    const done = assert.async(4);
+    let done = assert.async(4);
     const keys = ['zero', 'one', 'two', 'three', 'four', 'five', 'six'];
     const data = {
       data: {
@@ -121,7 +116,7 @@ module('Unit | Service | store', function (hooks) {
       });
     });
 
-    assert.strictEqual(result.get('length'), pageSize, 'returns the correct number of items');
+    assert.equal(result.get('length'), pageSize, 'returns the correct number of items');
     assert.deepEqual(result.mapBy('id'), keys.slice(0, pageSize), 'returns the first page of items');
     assert.deepEqual(
       result.get('meta'),
@@ -196,7 +191,7 @@ module('Unit | Service | store', function (hooks) {
   });
 
   test('store.lazyPaginatedQuery', function (assert) {
-    const response = {
+    let response = {
       data: ['foo'],
     };
     let queryArgs;
@@ -225,7 +220,7 @@ module('Unit | Service | store', function (hooks) {
     run(function () {
       store.lazyPaginatedQuery('secret', { page: 1, responsePath: 'data' });
     });
-    assert.strictEqual(queryArgs.size, DEFAULT_PAGE_SIZE, 'calls query with DEFAULT_PAGE_SIZE');
+    assert.equal(queryArgs.size, DEFAULT_PAGE_SIZE, 'calls query with DEFAULT_PAGE_SIZE');
 
     assert.throws(
       () => {
diff --git a/ui/tests/unit/services/version-test.js b/ui/tests/unit/services/version-test.js
index 89de87c806e2f..d0b49bef2ee78 100644
--- a/ui/tests/unit/services/version-test.js
+++ b/ui/tests/unit/services/version-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
@@ -10,37 +5,37 @@ module('Unit | Service | version', function (hooks) {
   setupTest(hooks);
 
   test('setting version computes isOSS properly', function (assert) {
-    const service = this.owner.lookup('service:version');
-    service.version = '0.9.5';
-    assert.true(service.isOSS);
-    assert.false(service.isEnterprise);
+    let service = this.owner.lookup('service:version');
+    service.set('version', '0.9.5');
+    assert.true(service.get('isOSS'));
+    assert.false(service.get('isEnterprise'));
   });
 
   test('setting version computes isEnterprise properly', function (assert) {
-    const service = this.owner.lookup('service:version');
-    service.version = '0.9.5+ent';
-    assert.false(service.isOSS);
-    assert.true(service.isEnterprise);
+    let service = this.owner.lookup('service:version');
+    service.set('version', '0.9.5+prem');
+    assert.false(service.get('isOSS'));
+    assert.true(service.get('isEnterprise'));
   });
 
   test('setting version with hsm ending computes isEnterprise properly', function (assert) {
-    const service = this.owner.lookup('service:version');
-    service.version = '0.9.5+ent.hsm';
-    assert.false(service.isOSS);
-    assert.true(service.isEnterprise);
+    let service = this.owner.lookup('service:version');
+    service.set('version', '0.9.5+prem.hsm');
+    assert.false(service.get('isOSS'));
+    assert.true(service.get('isEnterprise'));
   });
 
   test('hasPerfReplication', function (assert) {
-    const service = this.owner.lookup('service:version');
-    assert.false(service.hasPerfReplication);
-    service.features = ['Performance Replication'];
-    assert.true(service.hasPerfReplication);
+    let service = this.owner.lookup('service:version');
+    assert.false(service.get('hasPerfReplication'));
+    service.set('_features', ['Performance Replication']);
+    assert.true(service.get('hasPerfReplication'));
   });
 
   test('hasDRReplication', function (assert) {
-    const service = this.owner.lookup('service:version');
-    assert.false(service.hasDRReplication);
-    service.features = ['DR Replication'];
-    assert.true(service.hasDRReplication);
+    let service = this.owner.lookup('service:version');
+    assert.false(service.get('hasDRReplication'));
+    service.set('_features', ['DR Replication']);
+    assert.true(service.get('hasDRReplication'));
   });
 });
diff --git a/ui/tests/unit/services/wizard-test.js b/ui/tests/unit/services/wizard-test.js
index 92ef7800739a0..9b3d641e7f643 100644
--- a/ui/tests/unit/services/wizard-test.js
+++ b/ui/tests/unit/services/wizard-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /* eslint qunit/no-conditional-assertions: "warn" */
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
@@ -50,7 +45,7 @@ module('Unit | Service | wizard', function (hooks) {
     };
   }
 
-  const testCases = [
+  let testCases = [
     {
       method: 'getExtState',
       args: [STORAGE_KEYS.TUTORIAL_STATE],
@@ -328,10 +323,10 @@ module('Unit | Service | wizard', function (hooks) {
   ];
 
   testCases.forEach((testCase) => {
-    const store = storage();
+    let store = storage();
     test(`${testCase.method}`, function (assert) {
       assert.expect(testCase.assertCount);
-      const wizard = this.owner.factoryFor('service:wizard').create({
+      let wizard = this.owner.factoryFor('service:wizard').create({
         storage() {
           return store;
         },
@@ -347,7 +342,7 @@ module('Unit | Service | wizard', function (hooks) {
         testCase.storage.forEach((item) => wizard.storage().setItem(item.key, item.value));
       }
 
-      const result = wizard[testCase.method](...testCase.args);
+      let result = wizard[testCase.method](...testCase.args);
       if (testCase.expectedResults.props) {
         testCase.expectedResults.props.forEach((property) => {
           assert.deepEqual(
@@ -367,7 +362,7 @@ module('Unit | Service | wizard', function (hooks) {
         });
       }
       if (testCase.expectedResults.value !== null && testCase.expectedResults.value !== undefined) {
-        assert.strictEqual(result, testCase.expectedResults.value, `${testCase.method} gives correct value`);
+        assert.equal(result, testCase.expectedResults.value, `${testCase.method} gives correct value`);
       }
     });
   });
diff --git a/ui/tests/unit/utils/api-path-test.js b/ui/tests/unit/utils/api-path-test.js
index 9fc7a5bd90eae..9fd7580f704e9 100644
--- a/ui/tests/unit/utils/api-path-test.js
+++ b/ui/tests/unit/utils/api-path-test.js
@@ -1,26 +1,21 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import apiPath from 'vault/utils/api-path';
 import { module, test } from 'qunit';
 
 module('Unit | Util | api path', function () {
   test('it returns a function', function (assert) {
-    const ret = apiPath`foo`;
+    let ret = apiPath`foo`;
     assert.strictEqual(typeof ret, 'function');
   });
 
   test('it iterpolates strings from passed context object', function (assert) {
-    const ret = apiPath`foo/${'one'}/${'two'}`;
-    const result = ret({ one: 1, two: 2 });
+    let ret = apiPath`foo/${'one'}/${'two'}`;
+    let result = ret({ one: 1, two: 2 });
 
-    assert.strictEqual(result, 'foo/1/2', 'returns the expected string');
+    assert.equal(result, 'foo/1/2', 'returns the expected string');
   });
 
   test('it throws when the key is not found in the context', function (assert) {
-    const ret = apiPath`foo/${'one'}/${'two'}`;
+    let ret = apiPath`foo/${'one'}/${'two'}`;
     assert.throws(() => {
       ret({ one: 1 });
     }, /Error: Assertion Failed: Expected 2 keys in apiPath context, only recieved one/);
diff --git a/ui/tests/unit/utils/chart-helpers-test.js b/ui/tests/unit/utils/chart-helpers-test.js
index 08e8bc27d3ab3..6903818dba56e 100644
--- a/ui/tests/unit/utils/chart-helpers-test.js
+++ b/ui/tests/unit/utils/chart-helpers-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { formatNumbers, formatTooltipNumber, calculateAverage } from 'vault/utils/chart-helpers';
 import { module, test } from 'qunit';
 
@@ -21,17 +16,17 @@ module('Unit | Utility | chart-helpers', function () {
     const method = formatNumbers();
     assert.ok(method);
     SMALL_NUMBERS.forEach(function (num) {
-      assert.strictEqual(formatNumbers(num), num, `Does not format small number ${num}`);
+      assert.equal(formatNumbers(num), num, `Does not format small number ${num}`);
     });
     Object.keys(LARGE_NUMBERS).forEach(function (num) {
       const expected = LARGE_NUMBERS[num];
-      assert.strictEqual(formatNumbers(num), expected, `Formats ${num} as ${expected}`);
+      assert.equal(formatNumbers(num), expected, `Formats ${num} as ${expected}`);
     });
   });
 
   test('formatTooltipNumber renders number correctly', function (assert) {
     const formatted = formatTooltipNumber(120300200100);
-    assert.strictEqual(formatted.length, 15, 'adds punctuation at proper place for large numbers');
+    assert.equal(formatted.length, 15, 'adds punctuation at proper place for large numbers');
   });
 
   test('calculateAverage is accurate', function (assert) {
@@ -43,24 +38,25 @@ module('Unit | Utility | chart-helpers', function () {
       { label: 'foo', value: undefined },
       { label: 'bar', value: 22 },
     ];
-    const testArray3 = [{ label: 'foo' }, { label: 'bar' }];
     const getAverage = (array) => array.reduce((a, b) => a + b, 0) / array.length;
-    assert.strictEqual(calculateAverage(null), null, 'returns null if dataset it null');
-    assert.strictEqual(calculateAverage([]), null, 'returns null if dataset it empty array');
-    assert.strictEqual(
+    assert.equal(calculateAverage(null), null, 'returns null if dataset it null');
+    assert.equal(calculateAverage([]), null, 'returns null if dataset it empty array');
+    assert.equal(calculateAverage([0]), getAverage([0]), `returns ${getAverage([0])} if array is just 0 0`);
+    assert.equal(calculateAverage([1]), getAverage([1]), `returns ${getAverage([1])} if array is just 1`);
+    assert.equal(
+      calculateAverage([5, 1, 41, 5]),
+      getAverage([5, 1, 41, 5]),
+      `returns correct average for array of integers`
+    );
+    assert.equal(
       calculateAverage(testArray1, 'value'),
       getAverage([10, 22]),
       `returns correct average for array of objects`
     );
-    assert.strictEqual(
+    assert.equal(
       calculateAverage(testArray2, 'value'),
       getAverage([0, 22]),
       `returns correct average for array of objects containing undefined values`
     );
-    assert.strictEqual(
-      calculateAverage(testArray3, 'value'),
-      null,
-      'returns null when object key does not exist at all'
-    );
   });
 });
diff --git a/ui/tests/unit/utils/common-prefix-test.js b/ui/tests/unit/utils/common-prefix-test.js
index f1df734edd153..4b124e3c64904 100644
--- a/ui/tests/unit/utils/common-prefix-test.js
+++ b/ui/tests/unit/utils/common-prefix-test.js
@@ -1,37 +1,32 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import commonPrefix from 'core/utils/common-prefix';
 import { module, test } from 'qunit';
 
 module('Unit | Util | common prefix', function () {
   test('it returns empty string if called with no args or an empty array', function (assert) {
     let returned = commonPrefix();
-    assert.strictEqual(returned, '', 'returns an empty string');
+    assert.equal(returned, '', 'returns an empty string');
     returned = commonPrefix([]);
-    assert.strictEqual(returned, '', 'returns an empty string for an empty array');
+    assert.equal(returned, '', 'returns an empty string for an empty array');
   });
 
   test('it returns empty string if there are no common prefixes', function (assert) {
-    const secrets = ['asecret', 'secret2', 'secret3'].map((s) => ({ id: s }));
-    const returned = commonPrefix(secrets);
-    assert.strictEqual(returned, '', 'returns an empty string');
+    let secrets = ['asecret', 'secret2', 'secret3'].map((s) => ({ id: s }));
+    let returned = commonPrefix(secrets);
+    assert.equal(returned, '', 'returns an empty string');
   });
 
   test('it returns the longest prefix', function (assert) {
-    const secrets = ['secret1', 'secret2', 'secret3'].map((s) => ({ id: s }));
+    let secrets = ['secret1', 'secret2', 'secret3'].map((s) => ({ id: s }));
     let returned = commonPrefix(secrets);
-    assert.strictEqual(returned, 'secret', 'finds secret prefix');
-    const greetings = ['hello-there', 'hello-hi', 'hello-howdy'].map((s) => ({ id: s }));
+    assert.equal(returned, 'secret', 'finds secret prefix');
+    let greetings = ['hello-there', 'hello-hi', 'hello-howdy'].map((s) => ({ id: s }));
     returned = commonPrefix(greetings);
-    assert.strictEqual(returned, 'hello-', 'finds hello- prefix');
+    assert.equal(returned, 'hello-', 'finds hello- prefix');
   });
 
   test('it can compare an attribute that is not "id" to calculate the longest prefix', function (assert) {
-    const secrets = ['secret1', 'secret2', 'secret3'].map((s) => ({ name: s }));
-    const returned = commonPrefix(secrets, 'name');
-    assert.strictEqual(returned, 'secret', 'finds secret prefix from name attribute');
+    let secrets = ['secret1', 'secret2', 'secret3'].map((s) => ({ name: s }));
+    let returned = commonPrefix(secrets, 'name');
+    assert.equal(returned, 'secret', 'finds secret prefix from name attribute');
   });
 });
diff --git a/ui/tests/unit/utils/decode-config-from-jwt-test.js b/ui/tests/unit/utils/decode-config-from-jwt-test.js
index 999991ce4dffe..adfd4218dac76 100644
--- a/ui/tests/unit/utils/decode-config-from-jwt-test.js
+++ b/ui/tests/unit/utils/decode-config-from-jwt-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import decodeConfigFromJWT from 'replication/utils/decode-config-from-jwt';
 import { module, test } from 'qunit';
 
diff --git a/ui/tests/unit/utils/openapi-to-attrs-test.js b/ui/tests/unit/utils/openapi-to-attrs-test.js
index f63307898044b..dc3c55b60c0cd 100644
--- a/ui/tests/unit/utils/openapi-to-attrs-test.js
+++ b/ui/tests/unit/utils/openapi-to-attrs-test.js
@@ -1,12 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { attr } from '@ember-data/model';
 import { expandOpenApiProps, combineAttributes, combineFieldGroups } from 'vault/utils/openapi-to-attrs';
 import { module, test } from 'qunit';
-import { camelize } from '@ember/string';
 
 module('Unit | Util | OpenAPI Data Utilities', function () {
   const OPENAPI_RESPONSE_PROPS = {
@@ -146,60 +140,10 @@ module('Unit | Util | OpenAPI Data Utilities', function () {
 
   const NEW_FIELDS = ['one', 'two', 'three'];
 
-  const OPENAPI_DESCRIPTIONS = {
-    token_bound_cidrs: {
-      type: 'array',
-      description:
-        'Comma separated string or JSON list of CIDR blocks. If set, specifies the blocks of IP addresses which are allowed to use the generated token.',
-      items: {
-        type: 'string',
-      },
-      'x-vault-displayAttrs': {
-        description:
-          'List of CIDR blocks. If set, specifies the blocks of IP addresses which are allowed to use the generated token.',
-        name: "Generated Token's Bound CIDRs",
-        group: 'Tokens',
-      },
-    },
-    blah_blah: {
-      type: 'array',
-      description: 'Comma-separated list of policies',
-      items: {
-        type: 'string',
-      },
-      'x-vault-displayAttrs': {
-        name: "Generated Token's Policies",
-        group: 'Tokens',
-      },
-    },
-    only_display_description: {
-      type: 'array',
-      items: {
-        type: 'string',
-      },
-      'x-vault-displayAttrs': {
-        description: 'Hello there, you look nice today',
-      },
-    },
-  };
-
-  const STRING_ARRAY_DESCRIPTIONS = {
-    token_bound_cidrs: {
-      helpText:
-        'List of CIDR blocks. If set, specifies the blocks of IP addresses which are allowed to use the generated token.',
-    },
-    blah_blah: {
-      helpText: 'Comma-separated list of policies',
-    },
-    only_display_description: {
-      helpText: 'Hello there, you look nice today',
-    },
-  };
-
   test('it creates objects from OpenAPI schema props', function (assert) {
     assert.expect(6);
     const generatedProps = expandOpenApiProps(OPENAPI_RESPONSE_PROPS);
-    for (const propName in EXPANDED_PROPS) {
+    for (let propName in EXPANDED_PROPS) {
       assert.deepEqual(EXPANDED_PROPS[propName], generatedProps[propName], `correctly expands ${propName}`);
     }
   });
@@ -207,14 +151,14 @@ module('Unit | Util | OpenAPI Data Utilities', function () {
   test('it combines OpenAPI props with existing model attrs', function (assert) {
     assert.expect(3);
     const combined = combineAttributes(EXISTING_MODEL_ATTRS, EXPANDED_PROPS);
-    for (const propName in EXISTING_MODEL_ATTRS) {
+    for (let propName in EXISTING_MODEL_ATTRS) {
       assert.deepEqual(COMBINED_ATTRS[propName], combined[propName]);
     }
   });
 
   test('it adds new fields from OpenAPI to fieldGroups except for exclusions', function (assert) {
     assert.expect(3);
-    const modelFieldGroups = [
+    let modelFieldGroups = [
       { default: ['name', 'awesomePeople'] },
       {
         Options: ['ttl'],
@@ -228,7 +172,7 @@ module('Unit | Util | OpenAPI Data Utilities', function () {
       },
     ];
     const newFieldGroups = combineFieldGroups(modelFieldGroups, NEW_FIELDS, excludedFields);
-    for (const groupName in modelFieldGroups) {
+    for (let groupName in modelFieldGroups) {
       assert.deepEqual(
         newFieldGroups[groupName],
         expectedGroups[groupName],
@@ -238,7 +182,7 @@ module('Unit | Util | OpenAPI Data Utilities', function () {
   });
   test('it adds all new fields from OpenAPI to fieldGroups when excludedFields is empty', function (assert) {
     assert.expect(3);
-    const modelFieldGroups = [
+    let modelFieldGroups = [
       { default: ['name', 'awesomePeople'] },
       {
         Options: ['ttl'],
@@ -252,7 +196,7 @@ module('Unit | Util | OpenAPI Data Utilities', function () {
       },
     ];
     const nonExcludedFieldGroups = combineFieldGroups(modelFieldGroups, NEW_FIELDS, excludedFields);
-    for (const groupName in modelFieldGroups) {
+    for (let groupName in modelFieldGroups) {
       assert.deepEqual(
         nonExcludedFieldGroups[groupName],
         expectedGroups[groupName],
@@ -262,7 +206,7 @@ module('Unit | Util | OpenAPI Data Utilities', function () {
   });
   test('it keeps fields the same when there are no brand new fields from OpenAPI', function (assert) {
     assert.expect(3);
-    const modelFieldGroups = [
+    let modelFieldGroups = [
       { default: ['name', 'awesomePeople', 'two', 'one', 'three'] },
       {
         Options: ['ttl'],
@@ -276,20 +220,8 @@ module('Unit | Util | OpenAPI Data Utilities', function () {
       },
     ];
     const fieldGroups = combineFieldGroups(modelFieldGroups, NEW_FIELDS, excludedFields);
-    for (const groupName in modelFieldGroups) {
+    for (let groupName in modelFieldGroups) {
       assert.deepEqual(fieldGroups[groupName], expectedGroups[groupName], 'it incorporates all new fields');
     }
   });
-
-  test('it uses the description from the display attrs block if it exists', async function (assert) {
-    assert.expect(3);
-    const generatedProps = expandOpenApiProps(OPENAPI_DESCRIPTIONS);
-    for (const propName in STRING_ARRAY_DESCRIPTIONS) {
-      assert.strictEqual(
-        generatedProps[camelize(propName)].helpText,
-        STRING_ARRAY_DESCRIPTIONS[propName].helpText,
-        `correctly updates helpText for ${propName}`
-      );
-    }
-  });
 });
diff --git a/ui/tests/unit/utils/timestamp-test.js b/ui/tests/unit/utils/timestamp-test.js
deleted file mode 100644
index da8af6c507f75..0000000000000
--- a/ui/tests/unit/utils/timestamp-test.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import timestamp from 'core/utils/timestamp';
-import sinon from 'sinon';
-import { module, test } from 'qunit';
-
-/*
-  This test coverage is more for an example than actually covering the utility
-*/
-module('Unit | Utility | timestamp', function () {
-  test('it can be overridden', function (assert) {
-    const stub = sinon.stub(timestamp, 'now').callsFake(() => new Date('2030-03-03T03:30:03'));
-    const result = timestamp.now();
-    assert.strictEqual(result.toISOString(), new Date('2030-03-03T03:30:03').toISOString());
-    // Always make sure to restore the stub
-    stub.restore(); // timestamp.now.restore(); also works
-  });
-});
diff --git a/ui/tests/unit/utils/trim-right-test.js b/ui/tests/unit/utils/trim-right-test.js
index 28550ce0623dc..4d354980d310d 100644
--- a/ui/tests/unit/utils/trim-right-test.js
+++ b/ui/tests/unit/utils/trim-right-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import trimRight from 'vault/utils/trim-right';
 import { module, test } from 'qunit';
 
@@ -10,43 +5,43 @@ module('Unit | Util | trim right', function () {
   test('it trims extension array from end of string', function (assert) {
     const trimmedName = trimRight('my-file-name-is-cool.json', ['.json', '.txt', '.hcl', '.policy']);
 
-    assert.strictEqual(trimmedName, 'my-file-name-is-cool');
+    assert.equal(trimmedName, 'my-file-name-is-cool');
   });
 
   test('it only trims extension array from the very end of string', function (assert) {
     const trimmedName = trimRight('my-file-name.json-is-cool.json', ['.json', '.txt', '.hcl', '.policy']);
 
-    assert.strictEqual(trimmedName, 'my-file-name.json-is-cool');
+    assert.equal(trimmedName, 'my-file-name.json-is-cool');
   });
 
   test('it returns string as is if trim array is empty', function (assert) {
     const trimmedName = trimRight('my-file-name-is-cool.json', []);
 
-    assert.strictEqual(trimmedName, 'my-file-name-is-cool.json');
+    assert.equal(trimmedName, 'my-file-name-is-cool.json');
   });
 
   test('it returns string as is if trim array is not passed in', function (assert) {
     const trimmedName = trimRight('my-file-name-is-cool.json');
 
-    assert.strictEqual(trimmedName, 'my-file-name-is-cool.json');
+    assert.equal(trimmedName, 'my-file-name-is-cool.json');
   });
 
   test('it allows the last extension to also be part of the file name', function (assert) {
     const trimmedName = trimRight('my-policy.hcl', ['.json', '.txt', '.hcl', '.policy']);
 
-    assert.strictEqual(trimmedName, 'my-policy');
+    assert.equal(trimmedName, 'my-policy');
   });
 
   test('it allows the last extension to also be part of the file name and the extenstion', function (assert) {
     const trimmedName = trimRight('my-policy.policy', ['.json', '.txt', '.hcl', '.policy']);
 
-    assert.strictEqual(trimmedName, 'my-policy');
+    assert.equal(trimmedName, 'my-policy');
   });
 
   test('it passes endings into the regex unescaped when passing false as the third arg', function (assert) {
     const trimmedName = trimRight('my-policypolicy', ['.json', '.txt', '.hcl', '.policy'], false);
 
     // the . gets interpreted as regex wildcard so it also trims the y character
-    assert.strictEqual(trimmedName, 'my-polic');
+    assert.equal(trimmedName, 'my-polic');
   });
 });
diff --git a/ui/tests/unit/utils/validators-test.js b/ui/tests/unit/utils/validators-test.js
index e375d1b9b7edd..40a03a41e3505 100644
--- a/ui/tests/unit/utils/validators-test.js
+++ b/ui/tests/unit/utils/validators-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import validators from 'vault/utils/validators';
diff --git a/ui/tsconfig.json b/ui/tsconfig.json
deleted file mode 100644
index 0aed4c324c85c..0000000000000
--- a/ui/tsconfig.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-  "extends": "@tsconfig/ember/tsconfig.json",
-  "compilerOptions": {
-    "experimentalDecorators": true,
-    "allowJs": true,
-    "strict": true,
-    "noUncheckedIndexedAccess": true,
-    "noFallthroughCasesInSwitch": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "noImplicitReturns": true,
-    "noPropertyAccessFromIndexSignature": true,
-    "noEmitOnError": true,
-    "skipLibCheck": true,
-    // The combination of `baseUrl` with `paths` allows Ember's classic package
-    // layout, which is not resolvable with the Node resolution algorithm, to
-    // work with TypeScript.
-    "baseUrl": ".",
-    "paths": {
-      "vault/tests/*": ["tests/*"],
-      "vault/mirage/*": ["mirage/*"],
-      "vault/*": [
-        "types/*",
-        "types/vault/*",
-        "app/*",
-        "lib/core/app/*",
-        "lib/css/app/*",
-        "lib/kmip/app/*",
-        "lib/open-api-explorer/app/*",
-        "lib/pki/app/*",
-        "lib/replication/app/*",
-        "lib/service-worker-authenticated-download/app/*"
-      ],
-      "core": ["lib/core/addon"],
-      "core/*": ["lib/core/addon/*"],
-      "core/test-support": ["lib/core/addon-test-support"],
-      "core/test-support/*": ["lib/core/addon-test-support/*"],
-      "css": ["lib/css/addon"],
-      "css/*": ["lib/css/addon/*"],
-      "css/test-support": ["lib/css/addon-test-support"],
-      "css/test-support/*": ["lib/css/addon-test-support/*"],
-      "kmip": ["lib/kmip/addon"],
-      "kmip/*": ["lib/kmip/addon/*"],
-      "kmip/test-support": ["lib/kmip/addon-test-support"],
-      "kmip/test-support/*": ["lib/kmip/addon-test-support/*"],
-      "open-api-explorer": ["lib/open-api-explorer/addon"],
-      "open-api-explorer/*": ["lib/open-api-explorer/addon/*"],
-      "open-api-explorer/test-support": ["lib/open-api-explorer/addon-test-support"],
-      "open-api-explorer/test-support/*": ["lib/open-api-explorer/addon-test-support/*"],
-      "pki": ["lib/pki/addon"],
-      "pki/*": ["lib/pki/addon/*"],
-      "pki/test-support": ["lib/pki/addon-test-support"],
-      "pki/test-support/*": ["lib/pki/addon-test-support/*"],
-      "replication": ["lib/replication/addon"],
-      "replication/*": ["lib/replication/addon/*"],
-      "replication/test-support": ["lib/replication/addon-test-support"],
-      "replication/test-support/*": ["lib/replication/addon-test-support/*"],
-      "service-worker-authenticated-download": ["lib/service-worker-authenticated-download/addon"],
-      "service-worker-authenticated-download/*": ["lib/service-worker-authenticated-download/addon/*"],
-      "service-worker-authenticated-download/test-support": [
-        "lib/service-worker-authenticated-download/addon-test-support"
-      ],
-      "service-worker-authenticated-download/test-support/*": [
-        "lib/service-worker-authenticated-download/addon-test-support/*"
-      ],
-      "*": ["types/*"]
-    }
-  },
-  "include": [
-    "app/**/*",
-    "tests/**/*",
-    "types/**/*",
-    "lib/core/**/*",
-    "lib/css/**/*",
-    "lib/kmip/**/*",
-    "lib/open-api-explorer/**/*",
-    "lib/pki/**/*",
-    "lib/replication/**/*",
-    "lib/service-worker-authenticated-download/**/*",
-    "mirage/**/*"
-  ],
-  "exclude": ["node_modules"]
-}
diff --git a/ui/types/ember-cli-flash/services/flash-messages.d.ts b/ui/types/ember-cli-flash/services/flash-messages.d.ts
deleted file mode 100644
index 409cc0ec77d59..0000000000000
--- a/ui/types/ember-cli-flash/services/flash-messages.d.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-declare module 'ember-cli-flash/services/flash-messages' {
-  import Service from '@ember/service';
-  import FlashObject from 'ember-cli-flash/flash/object';
-  import { A } from '@ember/array';
-
-  type Partial<T> = { [K in keyof T]?: T[K] };
-
-  interface MessageOptions {
-    type: string;
-    priority: number;
-    timeout: number;
-    sticky: boolean;
-    showProgress: boolean;
-    extendedTimeout: number;
-    destroyOnClick: boolean;
-    onDestroy: () => void;
-    [key: string]: unknown;
-  }
-
-  interface CustomMessageInfo extends Partial<MessageOptions> {
-    message: string;
-  }
-
-  interface FlashFunction {
-    (message: string, options?: Partial<MessageOptions>): FlashMessageService;
-  }
-
-  class FlashMessageService extends Service {
-    queue: A<FlashObject>;
-    success: FlashFunction;
-    warning: FlashFunction;
-    info: FlashFunction;
-    error: FlashFunction;
-    danger: FlashFunction;
-    alert: FlashFunction;
-    secondary: FlashFunction;
-    add(messageInfo: CustomMessageInfo): FlashMessageService;
-    clearMessages(): FlashMessageService;
-    registerTypes(types: string[]): FlashMessageService;
-    getFlashObject(): FlashObject;
-  }
-
-  export default FlashMessageService;
-}
diff --git a/ui/types/ember-data/types/registries/adapter.d.ts b/ui/types/ember-data/types/registries/adapter.d.ts
deleted file mode 100644
index abca4c3582b92..0000000000000
--- a/ui/types/ember-data/types/registries/adapter.d.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Application from 'vault/adapters/application';
-import Adapter from 'ember-data/adapter';
-import ModelRegistry from 'ember-data/types/registries/model';
-import PkiIssuerAdapter from 'vault/adapters/pki/issuer';
-import PkiTidyAdapter from 'vault/adapters/pki/tidy';
-
-/**
- * Catch-all for ember-data.
- */
-export default interface AdapterRegistry {
-  'pki/issuer': PkiIssuerAdapter;
-  'pki/tidy': PkiTidyAdapter;
-  application: Application;
-  [key: keyof ModelRegistry]: Adapter;
-}
diff --git a/ui/types/ember-data/types/registries/model.d.ts b/ui/types/ember-data/types/registries/model.d.ts
deleted file mode 100644
index 793ec77d25b69..0000000000000
--- a/ui/types/ember-data/types/registries/model.d.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Model from '@ember-data/model';
-import PkiActionModel from 'vault/models/pki/action';
-import PkiCertificateGenerateModel from 'vault/models/pki/certificate/generate';
-
-declare module 'ember-data/types/registries/model' {
-  export default interface ModelRegistry {
-    'pki/action': PkiActionModel;
-    'pki/certificate/generate': PkiCertificateGenerateModel;
-    // Catchall for any other models
-    [key: string]: any;
-  }
-}
diff --git a/ui/types/forms.ts b/ui/types/forms.ts
deleted file mode 100644
index af7532eba2915..0000000000000
--- a/ui/types/forms.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-export type HTMLElementEvent<T extends HTMLElement> = Event & {
-  target: T;
-  currentTarget: T;
-};
diff --git a/ui/types/generate-declaration.md b/ui/types/generate-declaration.md
deleted file mode 100644
index 3bdc1993fcbe1..0000000000000
--- a/ui/types/generate-declaration.md
+++ /dev/null
@@ -1,5 +0,0 @@
-To generate a declaration file run `yarn tsc <javascript file to declare>  --declaration --allowJs --emitDeclarationOnly --outDir <type file location>`
-
-For example, the following command generates a declaration file called base.d.ts for the pki certificate base.js model:
-
-`yarn tsc ./app/models/pki/certificate/base.js  --declaration --allowJs --emitDeclarationOnly --outDir types/vault/models/pki/certificate`
diff --git a/ui/types/global.d.ts b/ui/types/global.d.ts
deleted file mode 100644
index d82c0ff558e01..0000000000000
--- a/ui/types/global.d.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-// Types for compiled templates
-declare module 'vault/templates/*' {
-  import { TemplateFactory } from 'ember-cli-htmlbars';
-
-  const tmpl: TemplateFactory;
-  export default tmpl;
-}
-
-declare module '@icholy/duration' {
-  import Duration from '@icholy/duration';
-  export default Duration;
-}
diff --git a/ui/types/vault/adapters/pki/issuer.d.ts b/ui/types/vault/adapters/pki/issuer.d.ts
deleted file mode 100644
index f2da794d2604e..0000000000000
--- a/ui/types/vault/adapters/pki/issuer.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Store from '@ember-data/store';
-import { AdapterRegistry } from 'ember-data/adapter';
-
-export default interface PkiIssuerAdapter extends AdapterRegistry {
-  namespace: string;
-  deleteAllIssuers(backend: string);
-}
diff --git a/ui/types/vault/adapters/pki/role.d.ts b/ui/types/vault/adapters/pki/role.d.ts
deleted file mode 100644
index 02910f653fc3e..0000000000000
--- a/ui/types/vault/adapters/pki/role.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Store from '@ember-data/store';
-import { AdapterRegistry } from 'ember-data/adapter';
-
-export default interface PkiRoleAdapter extends AdapterRegistry {
-  namespace: string;
-  _urlForRole(backend: string, id: string): string;
-  _optionsForQuery(id: string): { data: unknown };
-}
diff --git a/ui/types/vault/adapters/pki/tidy.d.ts b/ui/types/vault/adapters/pki/tidy.d.ts
deleted file mode 100644
index ac770aa632048..0000000000000
--- a/ui/types/vault/adapters/pki/tidy.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Store from '@ember-data/store';
-import { AdapterRegistry } from 'ember-data/adapter';
-
-export default interface PkiTidyAdapter extends AdapterRegistry {
-  namespace: string;
-  cancelTidy(backend: string);
-}
diff --git a/ui/types/vault/app-types.ts b/ui/types/vault/app-types.ts
deleted file mode 100644
index d1b100a124f47..0000000000000
--- a/ui/types/vault/app-types.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-// Type that comes back from expandAttributeMeta
-export interface FormField {
-  name: string;
-  type: string;
-  options: AttributeOptions;
-}
-
-interface AttributeOptions {
-  label: string;
-  mapToBoolean: string;
-  isOppositeValue: boolean;
-}
-
-export interface FormFieldGroups {
-  [key: string]: Array<FormField>;
-}
-
-export interface FormFieldGroupOptions {
-  [key: string]: Array<string>;
-}
-
-export interface ValidationMap {
-  [key: string]: {
-    isValid: boolean;
-    errors: Array<string>;
-  };
-}
-export interface ModelValidations {
-  isValid: boolean;
-  state: {
-    [key: string]: {
-      isValid: boolean;
-      errors: Array<string>;
-    };
-  };
-  invalidFormMessage: string;
-}
-
-export interface Breadcrumb {
-  label: string;
-  route?: string;
-  linkExternal?: boolean;
-}
-
-export interface TtlEvent {
-  enabled: boolean;
-  seconds: number;
-  timeString: string;
-  goSafeTimeString: string;
-}
-
-// Generic interfaces
-export interface StringMap {
-  [key: string]: string;
-}
diff --git a/ui/types/vault/index.d.ts b/ui/types/vault/index.d.ts
deleted file mode 100644
index 2e6df6e46d45d..0000000000000
--- a/ui/types/vault/index.d.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Ember from 'ember';
-
-declare global {
-  // Prevents ESLint from "fixing" this via its auto-fix to turn it into a type
-  // alias (e.g. after running any Ember CLI generator)
-  // eslint-disable-next-line @typescript-eslint/no-empty-interface
-  interface Array<T> extends Ember.ArrayPrototypeExtensions<T> {}
-  // interface Function extends Ember.FunctionPrototypeExtensions {}
-}
-
-export {};
diff --git a/ui/types/vault/models/capabilities.d.ts b/ui/types/vault/models/capabilities.d.ts
deleted file mode 100644
index b0e5b99298ed0..0000000000000
--- a/ui/types/vault/models/capabilities.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import ComputedProperty from '@ember/object/computed';
-import Model from '@ember-data/model';
-
-interface CapabilitiesModel extends Model {
-  path: string;
-  capabilities: Array<string>;
-  canSudo: ComputedProperty<boolean | undefined>;
-  canRead: ComputedProperty<boolean | undefined>;
-  canCreate: ComputedProperty<boolean | undefined>;
-  canUpdate: ComputedProperty<boolean | undefined>;
-  canDelete: ComputedProperty<boolean | undefined>;
-  canList: ComputedProperty<boolean | undefined>;
-  // these don't seem to be used anywhere
-  // inferring type from key name
-  allowedParameters: Array<string>;
-  deniedParameters: Array<string>;
-}
-
-export default CapabilitiesModel;
-export const SUDO_PATHS: string[];
-export const SUDO_PATH_PREFIXES: string[];
diff --git a/ui/types/vault/models/pki/action.d.ts b/ui/types/vault/models/pki/action.d.ts
deleted file mode 100644
index dba6dd53c412e..0000000000000
--- a/ui/types/vault/models/pki/action.d.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Model from '@ember-data/model';
-import { FormField, ModelValidations, StringMap } from 'vault/app-types';
-import CapabilitiesModel from '../capabilities';
-
-export default class PkiActionModel extends Model {
-  secretMountPath: unknown;
-  actionType: string | null;
-  pemBundle: string;
-  importedIssuers: string[];
-  importedKeys: string[];
-  mapping: StringMap;
-  type: string;
-  issuerName: string;
-  keyName: string;
-  keyRef: string;
-  commonName: string;
-  altNames: string[];
-  ipSans: string[];
-  uriSans: string[];
-  otherSans: string[];
-  format: string;
-  privateKeyFormat: string;
-  keyType: string;
-  keyBits: string;
-  maxPathLength: number;
-  excludeCnFromSans: boolean;
-  permittedDnsDomains: string;
-  ou: string[];
-  serialNumber: string;
-  addBasicConstraints: boolean;
-  notBeforeDuration: string;
-  managedKeyName: string;
-  managedKeyId: string;
-  customTtl: string;
-  ttl: string;
-  notAfter: string;
-  issuerId: string;
-  csr: string;
-  caChain: string;
-  keyId: string;
-  privateKey: string;
-  privateKeyType: string;
-  get backend(): string;
-  // apiPaths for capabilities
-  importBundlePath: Promise<CapabilitiesModel>;
-  generateIssuerRootPath: Promise<CapabilitiesModel>;
-  generateIssuerCsrPath: Promise<CapabilitiesModel>;
-  crossSignPath: string;
-  allFields: Array<FormField>;
-  validate(): ModelValidations;
-  // Capabilities
-  get canImportBundle(): boolean;
-  get canGenerateIssuerRoot(): boolean;
-  get canGenerateIssuerIntermediate(): boolean;
-  get canCrossSign(): boolean;
-}
diff --git a/ui/types/vault/models/pki/certificate/base.d.ts b/ui/types/vault/models/pki/certificate/base.d.ts
deleted file mode 100644
index c0e158b522112..0000000000000
--- a/ui/types/vault/models/pki/certificate/base.d.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Model from '@ember-data/model';
-export default class PkiCertificateBaseModel extends Model {
-  secretMountPath: class;
-  get useOpenAPI(): boolean;
-  get backend(): string;
-  getHelpUrl(): void;
-  altNames: string;
-  commonName: string;
-  caChain: string;
-  certificate: string;
-  excludeCnFromSans: boolean;
-  expiration: number;
-  ipSans: string;
-  issuingCa: string;
-  notValidAfter: date;
-  notValidBefore: date;
-  otherSans: string;
-  privateKey: string;
-  privateKeyType: string;
-  revokePath: string;
-  revocationTime: number;
-  serialNumber: string;
-  get canRevoke(): boolean;
-}
diff --git a/ui/types/vault/models/pki/certificate/generate.d.ts b/ui/types/vault/models/pki/certificate/generate.d.ts
deleted file mode 100644
index 3a372503dfe1c..0000000000000
--- a/ui/types/vault/models/pki/certificate/generate.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import { FormField, FormFieldGroups } from 'vault/app-types';
-import PkiCertificateBaseModel from './base';
-
-export default class PkiCertificateGenerateModel extends PkiCertificateBaseModel {
-  role: string;
-  formFields: FormField[];
-  formFieldGroups: FormFieldGroups;
-}
diff --git a/ui/types/vault/models/pki/certificate/sign-intermediate.d.ts b/ui/types/vault/models/pki/certificate/sign-intermediate.d.ts
deleted file mode 100644
index 42ff35b9979fa..0000000000000
--- a/ui/types/vault/models/pki/certificate/sign-intermediate.d.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import PkiCertificateBaseModel from './base';
-import { FormField, FormFieldGroups, ModelValidations } from 'vault/app-types';
-export default class PkiCertificateSignIntermediateModel extends PkiCertificateBaseModel {
-  role: string;
-  csr: string;
-  formFields: FormField[];
-  formFieldGroups: FormFieldGroups;
-  issuerRef: string;
-  maxPathLength: string;
-  notBeforeDuration: string;
-  permittedDnsDomains: string;
-  useCsrValues: boolean;
-  usePss: boolean;
-  skid: string;
-  signatureBits: string;
-  validate(): ModelValidations;
-}
diff --git a/ui/types/vault/models/pki/certificate/sign.d.ts b/ui/types/vault/models/pki/certificate/sign.d.ts
deleted file mode 100644
index 64a64485d55e6..0000000000000
--- a/ui/types/vault/models/pki/certificate/sign.d.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import PkiCertificateBaseModel from './base';
-import { FormField, FormFieldGroups, ModelValidations } from 'vault/app-types';
-export default class PkiCertificateSignModel extends PkiCertificateBaseModel {
-  role: string;
-  csr: string;
-  formFields: FormField[];
-  formFieldGroups: FormFieldGroups;
-  removeRootsFromChain: boolean;
-  validate(): ModelValidations;
-}
diff --git a/ui/types/vault/models/pki/config/crl.d.ts b/ui/types/vault/models/pki/config/crl.d.ts
deleted file mode 100644
index 4b0ef7e49f1e1..0000000000000
--- a/ui/types/vault/models/pki/config/crl.d.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import Model from '@ember-data/model';
-import { FormField } from 'vault/app-types';
-
-export default class PkiConfigCrlModel extends Model {
-  autoRebuild: boolean;
-  autoRebuildGracePeriod: string;
-  enableDelta: boolean;
-  expiry: string;
-  deltaRebuildInterval: string;
-  disable: boolean;
-  ocspExpiry: string;
-  ocspDisable: boolean;
-  crlPath: string;
-  formFields: FormField[];
-  get canSet(): boolean;
-}
diff --git a/ui/types/vault/models/pki/config/urls.d.ts b/ui/types/vault/models/pki/config/urls.d.ts
deleted file mode 100644
index 0481507d8c22d..0000000000000
--- a/ui/types/vault/models/pki/config/urls.d.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import Model from '@ember-data/model';
-
-export default class PkiConfigUrlsModel extends Model {
-  get useOpenAPI(): boolean;
-  getHelpUrl(backendPath: string): string;
-  issuingCertificates: array;
-  crlDistributionPoints: array;
-  ocspServers: array;
-  urlsPath: string;
-  get canSet(): boolean;
-}
diff --git a/ui/types/vault/models/pki/issuer.d.ts b/ui/types/vault/models/pki/issuer.d.ts
deleted file mode 100644
index f29d56221480e..0000000000000
--- a/ui/types/vault/models/pki/issuer.d.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Model from '@ember-data/model';
-import { FormField, FormFieldGroups, ModelValidations } from 'vault/app-types';
-import { ParsedCertificateData } from 'vault/vault/utils/parse-pki-cert';
-export default class PkiIssuerModel extends Model {
-  secretMountPath: class;
-  get useOpenAPI(): boolean;
-  get backend(): string;
-  get issuerRef(): string;
-  certificate: string;
-  issuerId: string;
-  issuerName: string;
-  keyId: string;
-  uriSans: string;
-  leafNotAfterBehavior: string;
-  usage: string;
-  manualChain: string;
-  issuingCertificates: string;
-  crlDistributionPoints: string;
-  ocspServers: string;
-  parsedCertificate: ParsedCertificateData;
-  /** these are all instances of the capabilities model which should be converted to native class and typed
-  rotateExported: any;
-  rotateInternal: any;
-  rotateExisting: any;
-  crossSignPath: any;
-  signIntermediate: any;
-  -------------------- **/
-  pemBundle: string;
-  importedIssuers: string[];
-  importedKeys: string[];
-  formFields: FormField[];
-  formFieldGroups: FormFieldGroups[];
-  allFields: FormField[];
-  get canRotateIssuer(): boolean;
-  get canCrossSign(): boolean;
-  get canSignIntermediate(): boolean;
-  get canConfigure(): boolean;
-  validate(): ModelValidations;
-}
diff --git a/ui/types/vault/models/pki/key.d.ts b/ui/types/vault/models/pki/key.d.ts
deleted file mode 100644
index 15275f6246fa8..0000000000000
--- a/ui/types/vault/models/pki/key.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Model from '@ember-data/model';
-import { ModelValidations } from 'vault/app-types';
-
-export default class PkiKeyModel extends Model {
-  secretMountPath: class;
-  keyId: string;
-  keyName: string;
-  type: string;
-  keyType: string;
-  keyBits: string;
-  pemBundle: string;
-  privateKey: string;
-  isNew: boolean;
-  get backend(): string;
-  get canRead(): boolean;
-  get canEdit(): boolean;
-  get canDelete(): boolean;
-  get canGenerateKey(): boolean;
-  get canImportKey(): boolean;
-  validate(): ModelValidations;
-}
diff --git a/ui/types/vault/models/pki/role.d.ts b/ui/types/vault/models/pki/role.d.ts
deleted file mode 100644
index 31cc3d58991da..0000000000000
--- a/ui/types/vault/models/pki/role.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import Model from '@ember-data/model';
-import { ModelValidations } from 'vault/app-types';
-
-export default class PkiRoleModel extends Model {
-  get useOpenAPI(): boolean;
-  name: string;
-  issuerRef: string;
-  getHelpUrl(backendPath: string): string;
-  validate(): ModelValidations;
-  isNew: boolean;
-  keyType: string;
-  keyBits: string | undefined;
-}
diff --git a/ui/types/vault/models/pki/tidy.d.ts b/ui/types/vault/models/pki/tidy.d.ts
deleted file mode 100644
index b95d1ed6a39c0..0000000000000
--- a/ui/types/vault/models/pki/tidy.d.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import Model from '@ember-data/model';
-import { FormField, FormFieldGroups } from 'vault/vault/app-types';
-
-export default class PkiTidyModel extends Model {
-  version: string;
-  acmeAccountSafetyBuffer: string;
-  tidyAcme: boolean;
-  enabled: boolean;
-  intervalDuration: string;
-  issuerSafetyBuffer: string;
-  pauseDuration: string;
-  revocationQueueSafetyBuffer: string;
-  safetyBuffer: string;
-  tidyCertStore: boolean;
-  tidyCrossClusterRevokedCerts: boolean;
-  tidyExpiredIssuers: boolean;
-  tidyMoveLegacyCaBundle: boolean;
-  tidyRevocationQueue: boolean;
-  tidyRevokedCertIssuerAssociations: boolean;
-  tidyRevokedCerts: boolean;
-  get useOpenAPI(): boolean;
-  getHelpUrl(backend: string): string;
-  allByKey: {
-    intervalDuration: FormField[];
-  };
-  get allGroups(): FormFieldGroups[];
-  get sharedFields(): FormFieldGroups[];
-  get formFieldGroups(): FormFieldGroups[];
-}
diff --git a/ui/types/vault/utils/camelize-object-keys.d.ts b/ui/types/vault/utils/camelize-object-keys.d.ts
deleted file mode 100644
index f91e246b3e1eb..0000000000000
--- a/ui/types/vault/utils/camelize-object-keys.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-export default function camelizeKeys(object: unknown): { [key: string]: unknown };
diff --git a/ui/types/vault/utils/field-to-attrs.d.ts b/ui/types/vault/utils/field-to-attrs.d.ts
deleted file mode 100644
index 7d1bfbf08ce62..0000000000000
--- a/ui/types/vault/utils/field-to-attrs.d.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Model from '@ember-data/model';
-import { FormField, FormFieldGroups, FormFieldGroupOptions } from 'vault/app-types';
-
-export default function _default(modelClass: Model, fieldGroups: FormFieldGroupOptions): FormFieldGroups;
-
-export function expandAttributeMeta(modelClass: Model, attributeNames: Array<string>): Array<FormField>;
diff --git a/ui/types/vault/utils/parse-pki-cert.d.ts b/ui/types/vault/utils/parse-pki-cert.d.ts
deleted file mode 100644
index 4c2d6e3399ea5..0000000000000
--- a/ui/types/vault/utils/parse-pki-cert.d.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-interface ParsedCertificateData {
-  parsing_errors: Array<Error>;
-  can_parse: boolean;
-
-  // certificate values
-  common_name: string;
-  subject_serial_number: string;
-  ou: string;
-  organization: string;
-  country: string;
-  locality: string;
-  province: string;
-  street_address: string;
-  postal_code: string;
-  key_usage: string;
-  other_sans: string;
-  alt_names: string;
-  uri_sans: string;
-  ip_sans: string;
-  permitted_dns_domains: string;
-  max_path_length: number;
-  exclude_cn_from_sans: boolean;
-  signature_bits: string;
-  use_pss: boolean;
-  expiry_date: date; // remove along with old PKI work
-  issue_date: date; // remove along with old PKI work
-  not_valid_after: number;
-  not_valid_before: number;
-  ttl: Duration;
-}
-export function parseCertificate(certificateContent: string): ParsedCertificateData;
diff --git a/ui/vendor/string-includes.js b/ui/vendor/string-includes.js
index a7baa217047f0..5b9cf4b2e19a0 100644
--- a/ui/vendor/string-includes.js
+++ b/ui/vendor/string-includes.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 // By Mozilla Contributors licensed under CC-BY-SA 2.5 (http://creativecommons.org/licenses/by-sa/2.5/)
 // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/includes#Polyfill
 if (!String.prototype.includes) {
diff --git a/ui/yarn.lock b/ui/yarn.lock
index b5e3a4d601b05..83da54094c265 100644
--- a/ui/yarn.lock
+++ b/ui/yarn.lock
@@ -1,25115 +1,18016 @@
-# This file is generated by running "yarn install" inside your project.
-# Manual changes might be lost - proceed with caution!
-
-__metadata:
-  version: 6
-  cacheKey: 8
-
-"@ampproject/remapping@npm:^2.1.0":
-  version: 2.1.2
-  resolution: "@ampproject/remapping@npm:2.1.2"
-  dependencies:
-    "@jridgewell/trace-mapping": ^0.3.0
-  checksum: e023f92cdd9723f3042cde3b4d922adfeef0e198aa73486b0b6c034ad36af5f96e5c0cc72b335b30b2eb9852d907efc92af6bfcd3f4b4d286177ee32a189cf92
-  languageName: node
-  linkType: hard
-
-"@babel/code-frame@npm:7.12.11":
-  version: 7.12.11
-  resolution: "@babel/code-frame@npm:7.12.11"
-  dependencies:
-    "@babel/highlight": ^7.10.4
-  checksum: 3963eff3ebfb0e091c7e6f99596ef4b258683e4ba8a134e4e95f77afe85be5c931e184fff6435fb4885d12eba04a5e25532f7fbc292ca13b48e7da943474e2f3
-  languageName: node
-  linkType: hard
-
-"@babel/code-frame@npm:^7.0.0":
-  version: 7.12.13
-  resolution: "@babel/code-frame@npm:7.12.13"
-  dependencies:
-    "@babel/highlight": ^7.12.13
-  checksum: d0491bb59fb8d7a763cb175c5504818cfd3647321d8eedb9173336d5c47dccce248628ee68b3ed3586c5efc753d8d990ceafe956f707dcf92572a1661b92b1ef
-  languageName: node
-  linkType: hard
-
-"@babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.16.0":
-  version: 7.16.0
-  resolution: "@babel/code-frame@npm:7.16.0"
-  dependencies:
-    "@babel/highlight": ^7.16.0
-  checksum: 8961d0302ec6b8c2e9751a11e06a17617425359fd1645e4dae56a90a03464c68a0916115100fbcd030961870313f21865d0b85858360a2c68aabdda744393607
-  languageName: node
-  linkType: hard
-
-"@babel/code-frame@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/code-frame@npm:7.16.7"
-  dependencies:
-    "@babel/highlight": ^7.16.7
-  checksum: db2f7faa31bc2c9cf63197b481b30ea57147a5fc1a6fab60e5d6c02cdfbf6de8e17b5121f99917b3dabb5eeb572da078312e70697415940383efc140d4e0808b
-  languageName: node
-  linkType: hard
-
-"@babel/code-frame@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/code-frame@npm:7.18.6"
-  dependencies:
-    "@babel/highlight": ^7.18.6
-  checksum: 195e2be3172d7684bf95cff69ae3b7a15a9841ea9d27d3c843662d50cdd7d6470fd9c8e64be84d031117e4a4083486effba39f9aef6bbb2c89f7f21bcfba33ba
-  languageName: node
-  linkType: hard
-
-"@babel/compat-data@npm:^7.13.11, @babel/compat-data@npm:^7.13.8, @babel/compat-data@npm:^7.14.0, @babel/compat-data@npm:^7.16.0":
-  version: 7.16.4
-  resolution: "@babel/compat-data@npm:7.16.4"
-  checksum: 4949ce54eafc4b38d5623696a872acaaced1a523605708d81c2c483253941917d90dae0de40fc01e152ae56075dadd89c23014da5a632b09c001a716fa689cae
-  languageName: node
-  linkType: hard
-
-"@babel/compat-data@npm:^7.16.8, @babel/compat-data@npm:^7.17.0, @babel/compat-data@npm:^7.17.7":
-  version: 7.17.7
-  resolution: "@babel/compat-data@npm:7.17.7"
-  checksum: bf13476676884ce9afc199747ff82f3bcd6d42a9cfb01ce91bdb762b83ea11ec619b6ec532d1a80469ab14f191f33b5d4b9f8796fa8be3bc728d42b0c5e737e3
-  languageName: node
-  linkType: hard
-
-"@babel/compat-data@npm:^7.17.10":
-  version: 7.17.10
-  resolution: "@babel/compat-data@npm:7.17.10"
-  checksum: e85051087cd4690de5061909a2dd2d7f8b6434a3c2e30be6c119758db2027ae1845bcd75a81127423dd568b706ac6994a1a3d7d701069a23bf5cfe900728290b
-  languageName: node
-  linkType: hard
-
-"@babel/compat-data@npm:^7.19.0":
-  version: 7.19.0
-  resolution: "@babel/compat-data@npm:7.19.0"
-  checksum: f90d25a3779578c230ad0632e12ffd5ee1033614dee2786f7f1567823a78923da7185638eedd7166f31e4771a3398ae6a28ab8e680b96cc25bafb38a3b66ff11
-  languageName: node
-  linkType: hard
-
-"@babel/core@npm:^7.0.0, @babel/core@npm:^7.12.0, @babel/core@npm:^7.3.4":
-  version: 7.16.0
-  resolution: "@babel/core@npm:7.16.0"
-  dependencies:
-    "@babel/code-frame": ^7.16.0
-    "@babel/generator": ^7.16.0
-    "@babel/helper-compilation-targets": ^7.16.0
-    "@babel/helper-module-transforms": ^7.16.0
-    "@babel/helpers": ^7.16.0
-    "@babel/parser": ^7.16.0
-    "@babel/template": ^7.16.0
-    "@babel/traverse": ^7.16.0
-    "@babel/types": ^7.16.0
-    convert-source-map: ^1.7.0
-    debug: ^4.1.0
-    gensync: ^1.0.0-beta.2
-    json5: ^2.1.2
-    semver: ^6.3.0
-    source-map: ^0.5.0
-  checksum: a140f669daa90c774016a76b1f85641975333c1c219ae0a8e65d8b4c316836e918276e0dfd55613b14f8e578406a92393d4368a63bdd5d0708122976ee2ee8e3
-  languageName: node
-  linkType: hard
-
-"@babel/core@npm:^7.1.6, @babel/core@npm:^7.12.3":
-  version: 7.14.0
-  resolution: "@babel/core@npm:7.14.0"
-  dependencies:
-    "@babel/code-frame": ^7.12.13
-    "@babel/generator": ^7.14.0
-    "@babel/helper-compilation-targets": ^7.13.16
-    "@babel/helper-module-transforms": ^7.14.0
-    "@babel/helpers": ^7.14.0
-    "@babel/parser": ^7.14.0
-    "@babel/template": ^7.12.13
-    "@babel/traverse": ^7.14.0
-    "@babel/types": ^7.14.0
-    convert-source-map: ^1.7.0
-    debug: ^4.1.0
-    gensync: ^1.0.0-beta.2
-    json5: ^2.1.2
-    semver: ^6.3.0
-    source-map: ^0.5.0
-  checksum: de02309584587690b6f184d808027676b7d827a502c0ccbfc0939fd168230ec5084b727a7de437216f9f20273cf04860b902ecf5edcfabcf876b5ac108be26d1
-  languageName: node
-  linkType: hard
-
-"@babel/core@npm:^7.13.10":
-  version: 7.17.8
-  resolution: "@babel/core@npm:7.17.8"
-  dependencies:
-    "@ampproject/remapping": ^2.1.0
-    "@babel/code-frame": ^7.16.7
-    "@babel/generator": ^7.17.7
-    "@babel/helper-compilation-targets": ^7.17.7
-    "@babel/helper-module-transforms": ^7.17.7
-    "@babel/helpers": ^7.17.8
-    "@babel/parser": ^7.17.8
-    "@babel/template": ^7.16.7
-    "@babel/traverse": ^7.17.3
-    "@babel/types": ^7.17.0
-    convert-source-map: ^1.7.0
-    debug: ^4.1.0
-    gensync: ^1.0.0-beta.2
-    json5: ^2.1.2
-    semver: ^6.3.0
-  checksum: 0e686b1be444d25494424065238931f2b3df908bf072b72bab973acfd6d27a481fc280c9cd8a3c6fe2c46beee50e0d2307468d8b15b64dc4036f025e75f6609d
-  languageName: node
-  linkType: hard
-
-"@babel/core@npm:^7.16.10, @babel/core@npm:^7.17.9":
-  version: 7.19.0
-  resolution: "@babel/core@npm:7.19.0"
-  dependencies:
-    "@ampproject/remapping": ^2.1.0
-    "@babel/code-frame": ^7.18.6
-    "@babel/generator": ^7.19.0
-    "@babel/helper-compilation-targets": ^7.19.0
-    "@babel/helper-module-transforms": ^7.19.0
-    "@babel/helpers": ^7.19.0
-    "@babel/parser": ^7.19.0
-    "@babel/template": ^7.18.10
-    "@babel/traverse": ^7.19.0
-    "@babel/types": ^7.19.0
-    convert-source-map: ^1.7.0
-    debug: ^4.1.0
-    gensync: ^1.0.0-beta.2
-    json5: ^2.2.1
-    semver: ^6.3.0
-  checksum: 0d5b52b552e215802d2fd7b266611c390d90b28dece09db8a142666c32928c5d404eb72a95630b4cb726c4d80a53fcdc2d6464cd7ad28bb26087475f1b2205e2
-  languageName: node
-  linkType: hard
-
-"@babel/core@npm:^7.16.7":
-  version: 7.18.2
-  resolution: "@babel/core@npm:7.18.2"
-  dependencies:
-    "@ampproject/remapping": ^2.1.0
-    "@babel/code-frame": ^7.16.7
-    "@babel/generator": ^7.18.2
-    "@babel/helper-compilation-targets": ^7.18.2
-    "@babel/helper-module-transforms": ^7.18.0
-    "@babel/helpers": ^7.18.2
-    "@babel/parser": ^7.18.0
-    "@babel/template": ^7.16.7
-    "@babel/traverse": ^7.18.2
-    "@babel/types": ^7.18.2
-    convert-source-map: ^1.7.0
-    debug: ^4.1.0
-    gensync: ^1.0.0-beta.2
-    json5: ^2.2.1
-    semver: ^6.3.0
-  checksum: 14a4142c12e004cd2477b7610408d5788ee5dd821ee9e4de204cbb72d9c399d858d9deabc3d49914d5d7c2927548160c19bdc7524b1a9f6acc1ec96a8d9848dd
-  languageName: node
-  linkType: hard
-
-"@babel/generator@npm:^7.14.0, @babel/generator@npm:^7.16.0":
-  version: 7.16.0
-  resolution: "@babel/generator@npm:7.16.0"
-  dependencies:
-    "@babel/types": ^7.16.0
-    jsesc: ^2.5.1
-    source-map: ^0.5.0
-  checksum: 9ff53e0db72a225c8783c4a277698b4efcead750542ebb9cff31732ba62d092090715a772df10a323446924712f6928ad60c03db4e7051bed3a9701b552d51fb
-  languageName: node
-  linkType: hard
-
-"@babel/generator@npm:^7.17.3, @babel/generator@npm:^7.17.7":
-  version: 7.17.7
-  resolution: "@babel/generator@npm:7.17.7"
-  dependencies:
-    "@babel/types": ^7.17.0
-    jsesc: ^2.5.1
-    source-map: ^0.5.0
-  checksum: e7344b9b4559115f2754ecc2ae9508412ea6a8f617544cd3d3f17cabc727bd30630765f96c8a4ebc8901ded1492a3a6c23d695a4f1e8f3042f860b30c891985c
-  languageName: node
-  linkType: hard
-
-"@babel/generator@npm:^7.18.2":
-  version: 7.18.2
-  resolution: "@babel/generator@npm:7.18.2"
-  dependencies:
-    "@babel/types": ^7.18.2
-    "@jridgewell/gen-mapping": ^0.3.0
-    jsesc: ^2.5.1
-  checksum: d0661e95532ddd97566d41fec26355a7b28d1cbc4df95fe80cc084c413342935911b48db20910708db39714844ddd614f61c2ec4cca3fb10181418bdcaa2e7a3
-  languageName: node
-  linkType: hard
-
-"@babel/generator@npm:^7.19.0":
-  version: 7.19.0
-  resolution: "@babel/generator@npm:7.19.0"
-  dependencies:
-    "@babel/types": ^7.19.0
-    "@jridgewell/gen-mapping": ^0.3.2
-    jsesc: ^2.5.1
-  checksum: aa3d5785cf8f8e81672dcc61aef351188efeadb20d9f66d79113d82cbcf3bbbdeb829989fa14582108572ddbc4e4027bdceb06ccaf5ec40fa93c2dda8fbcd4aa
-  languageName: node
-  linkType: hard
-
-"@babel/helper-annotate-as-pure@npm:^7.12.13, @babel/helper-annotate-as-pure@npm:^7.16.0":
-  version: 7.16.0
-  resolution: "@babel/helper-annotate-as-pure@npm:7.16.0"
-  dependencies:
-    "@babel/types": ^7.16.0
-  checksum: 0db76106983e10ffc482c5f01e89c3b4687d2474bea69c44470b2acb6bd37f362f9057d6e69c617255390b5d0063d9932a931e83c3e130445b688ca1fcdb5bcd
-  languageName: node
-  linkType: hard
-
-"@babel/helper-annotate-as-pure@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/helper-annotate-as-pure@npm:7.16.7"
-  dependencies:
-    "@babel/types": ^7.16.7
-  checksum: d235be963fed5d48a8a4cfabc41c3f03fad6a947810dbcab9cebed7f819811457e10d99b4b2e942ad71baa7ee8e3cd3f5f38a4e4685639ddfddb7528d9a07179
-  languageName: node
-  linkType: hard
-
-"@babel/helper-annotate-as-pure@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/helper-annotate-as-pure@npm:7.18.6"
-  dependencies:
-    "@babel/types": ^7.18.6
-  checksum: 88ccd15ced475ef2243fdd3b2916a29ea54c5db3cd0cfabf9d1d29ff6e63b7f7cd1c27264137d7a40ac2e978b9b9a542c332e78f40eb72abe737a7400788fc1b
-  languageName: node
-  linkType: hard
-
-"@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.16.0":
-  version: 7.16.0
-  resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.16.0"
-  dependencies:
-    "@babel/helper-explode-assignable-expression": ^7.16.0
-    "@babel/types": ^7.16.0
-  checksum: 01beb9f3f2285b7b170cc167ec79b2fd657202cb25be9cb111951f94a04c97c5b446dd1498ede32f0052d67fc9f2f2ac2b7862351b364fe94f9b4de98488d863
-  languageName: node
-  linkType: hard
-
-"@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.16.7"
-  dependencies:
-    "@babel/helper-explode-assignable-expression": ^7.16.7
-    "@babel/types": ^7.16.7
-  checksum: 1784f19a57ecfafca8e5c2e0f3eac53451cb13a857cbe0ca0cd9670922228d099ef8c3dd8cd318e2d7bce316fdb2ece3e527c30f3ecd83706e37ab6beb0c60eb
-  languageName: node
-  linkType: hard
-
-"@babel/helper-compilation-targets@npm:^7.12.0, @babel/helper-compilation-targets@npm:^7.13.0, @babel/helper-compilation-targets@npm:^7.13.16, @babel/helper-compilation-targets@npm:^7.13.8, @babel/helper-compilation-targets@npm:^7.16.0":
-  version: 7.16.3
-  resolution: "@babel/helper-compilation-targets@npm:7.16.3"
-  dependencies:
-    "@babel/compat-data": ^7.16.0
-    "@babel/helper-validator-option": ^7.14.5
-    browserslist: ^4.17.5
-    semver: ^6.3.0
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: 038bcd43ac914371c51bf6e72b5cedcae432f0d359285d74a9133c6a839bd625a7d5412d7471d50aa78a3e1c79b0a692b50a8d6a1299ebf69733b512ff199323
-  languageName: node
-  linkType: hard
-
-"@babel/helper-compilation-targets@npm:^7.16.7, @babel/helper-compilation-targets@npm:^7.17.7":
-  version: 7.17.7
-  resolution: "@babel/helper-compilation-targets@npm:7.17.7"
-  dependencies:
-    "@babel/compat-data": ^7.17.7
-    "@babel/helper-validator-option": ^7.16.7
-    browserslist: ^4.17.5
-    semver: ^6.3.0
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: 24bf851539d5ec8e73779304b5d1ad5b0be09a74459ecc7d9baee9a0fa38ad016e9eaf4b5704504ae8da32f91ce0e31857bbbd9686854caeffd38f58226d3760
-  languageName: node
-  linkType: hard
-
-"@babel/helper-compilation-targets@npm:^7.17.10, @babel/helper-compilation-targets@npm:^7.18.2":
-  version: 7.18.2
-  resolution: "@babel/helper-compilation-targets@npm:7.18.2"
-  dependencies:
-    "@babel/compat-data": ^7.17.10
-    "@babel/helper-validator-option": ^7.16.7
-    browserslist: ^4.20.2
-    semver: ^6.3.0
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: 4f02e79f20c0b3f8db5049ba8c35027c41ccb3fc7884835d04e49886538e0f55702959db1bb75213c94a5708fec2dc81a443047559a4f184abb884c72c0059b4
-  languageName: node
-  linkType: hard
-
-"@babel/helper-compilation-targets@npm:^7.19.0":
-  version: 7.19.0
-  resolution: "@babel/helper-compilation-targets@npm:7.19.0"
-  dependencies:
-    "@babel/compat-data": ^7.19.0
-    "@babel/helper-validator-option": ^7.18.6
-    browserslist: ^4.20.2
-    semver: ^6.3.0
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: 5f1be9811d53a5e43eb4b9b402517dec79bfa3a55e9fbc131a106914a78b435bc08a4b35591e424665c36c2c1eceb864ec2ca2c2f3dcf240a1551a28530428f9
-  languageName: node
-  linkType: hard
-
-"@babel/helper-create-class-features-plugin@npm:^7.13.0, @babel/helper-create-class-features-plugin@npm:^7.16.0, @babel/helper-create-class-features-plugin@npm:^7.8.3":
-  version: 7.16.0
-  resolution: "@babel/helper-create-class-features-plugin@npm:7.16.0"
-  dependencies:
-    "@babel/helper-annotate-as-pure": ^7.16.0
-    "@babel/helper-function-name": ^7.16.0
-    "@babel/helper-member-expression-to-functions": ^7.16.0
-    "@babel/helper-optimise-call-expression": ^7.16.0
-    "@babel/helper-replace-supers": ^7.16.0
-    "@babel/helper-split-export-declaration": ^7.16.0
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: 0f7d1b8d413e5fbd719c95e22e3b59749b4c6c652f20e0fa1fa954112145a134c22709f1325574632d7262aeeeaaf4fc7c2eb8117e0d521e42b36d05c3e5a885
-  languageName: node
-  linkType: hard
-
-"@babel/helper-create-class-features-plugin@npm:^7.16.10, @babel/helper-create-class-features-plugin@npm:^7.16.7, @babel/helper-create-class-features-plugin@npm:^7.17.6":
-  version: 7.17.6
-  resolution: "@babel/helper-create-class-features-plugin@npm:7.17.6"
-  dependencies:
-    "@babel/helper-annotate-as-pure": ^7.16.7
-    "@babel/helper-environment-visitor": ^7.16.7
-    "@babel/helper-function-name": ^7.16.7
-    "@babel/helper-member-expression-to-functions": ^7.16.7
-    "@babel/helper-optimise-call-expression": ^7.16.7
-    "@babel/helper-replace-supers": ^7.16.7
-    "@babel/helper-split-export-declaration": ^7.16.7
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: d85a5b3f9a18a661372d77462e6ea2a6a03f1083f8b3055ed165284214af9ea6ad677f6bcc4b5ce215da27f95fa93064580d4b6723b578c480ecf17dd31a4307
-  languageName: node
-  linkType: hard
-
-"@babel/helper-create-class-features-plugin@npm:^7.17.12, @babel/helper-create-class-features-plugin@npm:^7.18.0":
-  version: 7.18.0
-  resolution: "@babel/helper-create-class-features-plugin@npm:7.18.0"
-  dependencies:
-    "@babel/helper-annotate-as-pure": ^7.16.7
-    "@babel/helper-environment-visitor": ^7.16.7
-    "@babel/helper-function-name": ^7.17.9
-    "@babel/helper-member-expression-to-functions": ^7.17.7
-    "@babel/helper-optimise-call-expression": ^7.16.7
-    "@babel/helper-replace-supers": ^7.16.7
-    "@babel/helper-split-export-declaration": ^7.16.7
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: 9a6ef175350f1cf87abe7a738e8c9b603da7fcdb153c74e49af509183f8705278020baddb62a12c7f9ca059487fef97d75a4adea6a1446598ad9901d010e4296
-  languageName: node
-  linkType: hard
-
-"@babel/helper-create-class-features-plugin@npm:^7.19.0":
-  version: 7.19.0
-  resolution: "@babel/helper-create-class-features-plugin@npm:7.19.0"
-  dependencies:
-    "@babel/helper-annotate-as-pure": ^7.18.6
-    "@babel/helper-environment-visitor": ^7.18.9
-    "@babel/helper-function-name": ^7.19.0
-    "@babel/helper-member-expression-to-functions": ^7.18.9
-    "@babel/helper-optimise-call-expression": ^7.18.6
-    "@babel/helper-replace-supers": ^7.18.9
-    "@babel/helper-split-export-declaration": ^7.18.6
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: f0c6fb77b6f113d70f308e7093f60dd465b697818badf5df0519d8dd12b6bfb1f4ad300b923207ce9f9c1c940ef58bff12ac4270c0863eadf9e303b7dd6d01b6
-  languageName: node
-  linkType: hard
-
-"@babel/helper-create-class-features-plugin@npm:^7.5.5":
-  version: 7.14.0
-  resolution: "@babel/helper-create-class-features-plugin@npm:7.14.0"
-  dependencies:
-    "@babel/helper-annotate-as-pure": ^7.12.13
-    "@babel/helper-function-name": ^7.12.13
-    "@babel/helper-member-expression-to-functions": ^7.13.12
-    "@babel/helper-optimise-call-expression": ^7.12.13
-    "@babel/helper-replace-supers": ^7.13.12
-    "@babel/helper-split-export-declaration": ^7.12.13
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: 8ef001212b06c4a1958249ec447f6a0993d928ace882cf509fcde8b4deb66673588a11ff53572b3ed55bf46982d012225ff8db9df65d0315af33d7ebfe21b740
-  languageName: node
-  linkType: hard
-
-"@babel/helper-create-regexp-features-plugin@npm:^7.16.0":
-  version: 7.16.0
-  resolution: "@babel/helper-create-regexp-features-plugin@npm:7.16.0"
-  dependencies:
-    "@babel/helper-annotate-as-pure": ^7.16.0
-    regexpu-core: ^4.7.1
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: d6230477e1997ed1fa0aee9ab34d3ce96400e0df25101879fdaf90ea613adec68ec06a609d8c78787c02a6275ef5a7403a38aa8fd42fef1a4d27bcfe577c81d6
-  languageName: node
-  linkType: hard
-
-"@babel/helper-create-regexp-features-plugin@npm:^7.16.7":
-  version: 7.17.0
-  resolution: "@babel/helper-create-regexp-features-plugin@npm:7.17.0"
-  dependencies:
-    "@babel/helper-annotate-as-pure": ^7.16.7
-    regexpu-core: ^5.0.1
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: eb66d9241544c705e9ce96d2d122b595ef52d926e6e031653e09af8a01050bd9d7e7fee168bf33a863342774d7d6a8cc7e8e9e5a45b955e9c01121c7a2d51708
-  languageName: node
-  linkType: hard
-
-"@babel/helper-create-regexp-features-plugin@npm:^7.17.12":
-  version: 7.17.12
-  resolution: "@babel/helper-create-regexp-features-plugin@npm:7.17.12"
-  dependencies:
-    "@babel/helper-annotate-as-pure": ^7.16.7
-    regexpu-core: ^5.0.1
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: fe49d26b0f6c58d4c1748a4d0e98b343882b428e6db43c4ba5e0aa7ff2296b3a557f0a88de9f000599bb95640a6c47c0b0c9a952b58c11f61aabb06bcc304329
-  languageName: node
-  linkType: hard
-
-"@babel/helper-define-polyfill-provider@npm:^0.2.2":
-  version: 0.2.3
-  resolution: "@babel/helper-define-polyfill-provider@npm:0.2.3"
-  dependencies:
-    "@babel/helper-compilation-targets": ^7.13.0
-    "@babel/helper-module-imports": ^7.12.13
-    "@babel/helper-plugin-utils": ^7.13.0
-    "@babel/traverse": ^7.13.0
-    debug: ^4.1.1
-    lodash.debounce: ^4.0.8
-    resolve: ^1.14.2
-    semver: ^6.1.2
-  peerDependencies:
-    "@babel/core": ^7.4.0-0
-  checksum: 797699fe870e45bdbc7c4128963427f7d6240609b700b3f2c0a2f2f187e5f848ba704bcfe58d7d91796cabc5001fae01746b3efda113beb5b5b824927cf59fdb
-  languageName: node
-  linkType: hard
-
-"@babel/helper-define-polyfill-provider@npm:^0.2.4":
-  version: 0.2.4
-  resolution: "@babel/helper-define-polyfill-provider@npm:0.2.4"
-  dependencies:
-    "@babel/helper-compilation-targets": ^7.13.0
-    "@babel/helper-module-imports": ^7.12.13
-    "@babel/helper-plugin-utils": ^7.13.0
-    "@babel/traverse": ^7.13.0
-    debug: ^4.1.1
-    lodash.debounce: ^4.0.8
-    resolve: ^1.14.2
-    semver: ^6.1.2
-  peerDependencies:
-    "@babel/core": ^7.4.0-0
-  checksum: 0b81df2fe8d4e7af1f0ed0f9c83bdb0fc1978e2cb2d4b5421dad7ee4afda79044d61de5b06026164ef52ee1afa59a15ee99bc7e532ad2b8a4bbe4341d3fa6b05
-  languageName: node
-  linkType: hard
-
-"@babel/helper-define-polyfill-provider@npm:^0.3.0":
-  version: 0.3.0
-  resolution: "@babel/helper-define-polyfill-provider@npm:0.3.0"
-  dependencies:
-    "@babel/helper-compilation-targets": ^7.13.0
-    "@babel/helper-module-imports": ^7.12.13
-    "@babel/helper-plugin-utils": ^7.13.0
-    "@babel/traverse": ^7.13.0
-    debug: ^4.1.1
-    lodash.debounce: ^4.0.8
-    resolve: ^1.14.2
-    semver: ^6.1.2
-  peerDependencies:
-    "@babel/core": ^7.4.0-0
-  checksum: 372378ac4235c4fe135f1cd6d0f63697e7cb3ef63a884eb14f4b439984846bcaec0b7a32cf8df6756a21557ae3ebb3c2ee18d9a191260705a583333e5e60df7c
-  languageName: node
-  linkType: hard
-
-"@babel/helper-define-polyfill-provider@npm:^0.3.1":
-  version: 0.3.1
-  resolution: "@babel/helper-define-polyfill-provider@npm:0.3.1"
-  dependencies:
-    "@babel/helper-compilation-targets": ^7.13.0
-    "@babel/helper-module-imports": ^7.12.13
-    "@babel/helper-plugin-utils": ^7.13.0
-    "@babel/traverse": ^7.13.0
-    debug: ^4.1.1
-    lodash.debounce: ^4.0.8
-    resolve: ^1.14.2
-    semver: ^6.1.2
-  peerDependencies:
-    "@babel/core": ^7.4.0-0
-  checksum: e3e93cb22febfc0449a210cdafb278e5e1a038af2ca2b02f5dee71c7a49e8ba26e469d631ee11a4243885961a62bb2e5b0a4deb3ec1d7918a33c953d05c3e584
-  languageName: node
-  linkType: hard
-
-"@babel/helper-environment-visitor@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/helper-environment-visitor@npm:7.16.7"
-  dependencies:
-    "@babel/types": ^7.16.7
-  checksum: c03a10105d9ebd1fe632a77356b2e6e2f3c44edba9a93b0dc3591b6a66bd7a2e323dd9502f9ce96fc6401234abff1907aa877b6674f7826b61c953f7c8204bbe
-  languageName: node
-  linkType: hard
-
-"@babel/helper-environment-visitor@npm:^7.18.2":
-  version: 7.18.2
-  resolution: "@babel/helper-environment-visitor@npm:7.18.2"
-  checksum: 1a9c8726fad454a082d077952a90f17188e92eabb3de236cb4782c49b39e3f69c327e272b965e9a20ff8abf37d30d03ffa6fd7974625a6c23946f70f7527f5e9
-  languageName: node
-  linkType: hard
-
-"@babel/helper-environment-visitor@npm:^7.18.9":
-  version: 7.18.9
-  resolution: "@babel/helper-environment-visitor@npm:7.18.9"
-  checksum: b25101f6162ddca2d12da73942c08ad203d7668e06663df685634a8fde54a98bc015f6f62938e8554457a592a024108d45b8f3e651fd6dcdb877275b73cc4420
-  languageName: node
-  linkType: hard
-
-"@babel/helper-explode-assignable-expression@npm:^7.16.0":
-  version: 7.16.0
-  resolution: "@babel/helper-explode-assignable-expression@npm:7.16.0"
-  dependencies:
-    "@babel/types": ^7.16.0
-  checksum: 563352b5e9b0b9584187176723ea65ea6ac9348d612c2bdc76701634eae445fd05d18f7b7555f5c6bbe4ec4d9d30172633a56bf4cfbb1333b798f58444057652
-  languageName: node
-  linkType: hard
-
-"@babel/helper-explode-assignable-expression@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/helper-explode-assignable-expression@npm:7.16.7"
-  dependencies:
-    "@babel/types": ^7.16.7
-  checksum: ea2135ba36da6a2be059ebc8f10fbbb291eb0e312da54c55c6f50f9cbd8601e2406ec497c5e985f7c07a97f31b3bef9b2be8df53f1d53b974043eaf74fe54bbc
-  languageName: node
-  linkType: hard
-
-"@babel/helper-function-name@npm:^7.12.13, @babel/helper-function-name@npm:^7.16.0":
-  version: 7.16.0
-  resolution: "@babel/helper-function-name@npm:7.16.0"
-  dependencies:
-    "@babel/helper-get-function-arity": ^7.16.0
-    "@babel/template": ^7.16.0
-    "@babel/types": ^7.16.0
-  checksum: 8c02371d28678f3bb492e69d4635b2fe6b1c5a93ce129bf883f1fafde2005f4dbc0e643f52103ca558b698c0774bfb84a93f188d71db1c077f754b6220629b92
-  languageName: node
-  linkType: hard
-
-"@babel/helper-function-name@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/helper-function-name@npm:7.16.7"
-  dependencies:
-    "@babel/helper-get-function-arity": ^7.16.7
-    "@babel/template": ^7.16.7
-    "@babel/types": ^7.16.7
-  checksum: fc77cbe7b10cfa2a262d7a37dca575c037f20419dfe0c5d9317f589599ca24beb5f5c1057748011159149eaec47fe32338c6c6412376fcded68200df470161e1
-  languageName: node
-  linkType: hard
-
-"@babel/helper-function-name@npm:^7.17.9":
-  version: 7.17.9
-  resolution: "@babel/helper-function-name@npm:7.17.9"
-  dependencies:
-    "@babel/template": ^7.16.7
-    "@babel/types": ^7.17.0
-  checksum: a59b2e5af56d8f43b9b0019939a43774754beb7cb01a211809ca8031c71890999d07739e955343135ec566c4d8ff725435f1f60fb0af3bb546837c1f9f84f496
-  languageName: node
-  linkType: hard
-
-"@babel/helper-function-name@npm:^7.19.0":
-  version: 7.19.0
-  resolution: "@babel/helper-function-name@npm:7.19.0"
-  dependencies:
-    "@babel/template": ^7.18.10
-    "@babel/types": ^7.19.0
-  checksum: eac1f5db428ba546270c2b8d750c24eb528b8fcfe50c81de2e0bdebf0e20f24bec688d4331533b782e4a907fad435244621ca2193cfcf80a86731299840e0f6e
-  languageName: node
-  linkType: hard
-
-"@babel/helper-get-function-arity@npm:^7.16.0":
-  version: 7.16.0
-  resolution: "@babel/helper-get-function-arity@npm:7.16.0"
-  dependencies:
-    "@babel/types": ^7.16.0
-  checksum: 1a68322c7b5fdffb1b51df32f7a53b1ff2268b5b99d698f0a1a426dcb355482a44ef3dae982a507907ba975314638dabb6d77ac1778098bdbe99707e6c29cae8
-  languageName: node
-  linkType: hard
-
-"@babel/helper-get-function-arity@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/helper-get-function-arity@npm:7.16.7"
-  dependencies:
-    "@babel/types": ^7.16.7
-  checksum: 25d969fb207ff2ad5f57a90d118f6c42d56a0171022e200aaa919ba7dc95ae7f92ec71cdea6c63ef3629a0dc962ab4c78e09ca2b437185ab44539193f796e0c3
-  languageName: node
-  linkType: hard
-
-"@babel/helper-hoist-variables@npm:^7.16.0":
-  version: 7.16.0
-  resolution: "@babel/helper-hoist-variables@npm:7.16.0"
-  dependencies:
-    "@babel/types": ^7.16.0
-  checksum: 2ee5b400c267c209a53c90eea406a8f09c30d4d7a2b13e304289d858a2e34a99272c062cfad6dad63705662943951c42ff20042ef539b2d3c4f8743183a28954
-  languageName: node
-  linkType: hard
-
-"@babel/helper-hoist-variables@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/helper-hoist-variables@npm:7.16.7"
-  dependencies:
-    "@babel/types": ^7.16.7
-  checksum: 6ae1641f4a751cd9045346e3f61c3d9ec1312fd779ab6d6fecfe2a96e59a481ad5d7e40d2a840894c13b3fd6114345b157f9e3062fc5f1580f284636e722de60
-  languageName: node
-  linkType: hard
-
-"@babel/helper-hoist-variables@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/helper-hoist-variables@npm:7.18.6"
-  dependencies:
-    "@babel/types": ^7.18.6
-  checksum: fd9c35bb435fda802bf9ff7b6f2df06308a21277c6dec2120a35b09f9de68f68a33972e2c15505c1a1a04b36ec64c9ace97d4a9e26d6097b76b4396b7c5fa20f
-  languageName: node
-  linkType: hard
-
-"@babel/helper-member-expression-to-functions@npm:^7.13.12, @babel/helper-member-expression-to-functions@npm:^7.16.0":
-  version: 7.16.0
-  resolution: "@babel/helper-member-expression-to-functions@npm:7.16.0"
-  dependencies:
-    "@babel/types": ^7.16.0
-  checksum: 58ef8e3a4af0c1dc43a2011f43f25502877ac1c5aa9a4a6586f0265ab857b65831f60560044bc9380df43c91ac21cad39a84095b91764b433d1acf18d27e38d6
-  languageName: node
-  linkType: hard
-
-"@babel/helper-member-expression-to-functions@npm:^7.16.7, @babel/helper-member-expression-to-functions@npm:^7.17.7":
-  version: 7.17.7
-  resolution: "@babel/helper-member-expression-to-functions@npm:7.17.7"
-  dependencies:
-    "@babel/types": ^7.17.0
-  checksum: 70f361bab627396c714c3938e94a569cb0da522179328477cdbc4318e4003c2666387ad4931d6bd5de103338c667c9e4bbe3e917fc8c527b3f3eb6175b888b7d
-  languageName: node
-  linkType: hard
-
-"@babel/helper-member-expression-to-functions@npm:^7.18.9":
-  version: 7.18.9
-  resolution: "@babel/helper-member-expression-to-functions@npm:7.18.9"
-  dependencies:
-    "@babel/types": ^7.18.9
-  checksum: fcf8184e3b55051c4286b2cbedf0eccc781d0f3c9b5cbaba582eca19bf0e8d87806cdb7efc8554fcb969ceaf2b187d5ea748d40022d06ec7739fbb18c1b19a7a
-  languageName: node
-  linkType: hard
-
-"@babel/helper-module-imports@npm:^7.12.13, @babel/helper-module-imports@npm:^7.13.12, @babel/helper-module-imports@npm:^7.16.0":
-  version: 7.16.0
-  resolution: "@babel/helper-module-imports@npm:7.16.0"
-  dependencies:
-    "@babel/types": ^7.16.0
-  checksum: 8e1eb9ac39440e52080b87c78d8d318e7c93658bdd0f3ce0019c908de88cbddafdc241f392898c0b0ba81fc52c8c6d2f9cc1b163ac5ed2a474d49b11646b7516
-  languageName: node
-  linkType: hard
-
-"@babel/helper-module-imports@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/helper-module-imports@npm:7.16.7"
-  dependencies:
-    "@babel/types": ^7.16.7
-  checksum: ddd2c4a600a2e9a4fee192ab92bf35a627c5461dbab4af31b903d9ba4d6b6e59e0ff3499fde4e2e9a0eebe24906f00b636f8b4d9bd72ff24d50e6618215c3212
-  languageName: node
-  linkType: hard
-
-"@babel/helper-module-imports@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/helper-module-imports@npm:7.18.6"
-  dependencies:
-    "@babel/types": ^7.18.6
-  checksum: f393f8a3b3304b1b7a288a38c10989de754f01d29caf62ce7c4e5835daf0a27b81f3ac687d9d2780d39685aae7b55267324b512150e7b2be967b0c493b6a1def
-  languageName: node
-  linkType: hard
-
-"@babel/helper-module-transforms@npm:^7.14.0, @babel/helper-module-transforms@npm:^7.16.0":
-  version: 7.16.0
-  resolution: "@babel/helper-module-transforms@npm:7.16.0"
-  dependencies:
-    "@babel/helper-module-imports": ^7.16.0
-    "@babel/helper-replace-supers": ^7.16.0
-    "@babel/helper-simple-access": ^7.16.0
-    "@babel/helper-split-export-declaration": ^7.16.0
-    "@babel/helper-validator-identifier": ^7.15.7
-    "@babel/template": ^7.16.0
-    "@babel/traverse": ^7.16.0
-    "@babel/types": ^7.16.0
-  checksum: a3d0e5556f26ebdf2ae422af3b9a1ba1848fead891f46bcd1c6a4be88ad8e9f348140f81d1843a3481574be1643a9c79b01469231f5b5801f5d5e691efdd11f3
-  languageName: node
-  linkType: hard
-
-"@babel/helper-module-transforms@npm:^7.16.7, @babel/helper-module-transforms@npm:^7.17.7":
-  version: 7.17.7
-  resolution: "@babel/helper-module-transforms@npm:7.17.7"
-  dependencies:
-    "@babel/helper-environment-visitor": ^7.16.7
-    "@babel/helper-module-imports": ^7.16.7
-    "@babel/helper-simple-access": ^7.17.7
-    "@babel/helper-split-export-declaration": ^7.16.7
-    "@babel/helper-validator-identifier": ^7.16.7
-    "@babel/template": ^7.16.7
-    "@babel/traverse": ^7.17.3
-    "@babel/types": ^7.17.0
-  checksum: 0b8f023aa7ff82dc4864349d54c4557865ad8ba54d78f6d78a86b05ca40f65c2d60acb4a54c5c309e7a4356beb9a89b876e54af4b3c4801ad25f62ec3721f0ae
-  languageName: node
-  linkType: hard
-
-"@babel/helper-module-transforms@npm:^7.18.0":
-  version: 7.18.0
-  resolution: "@babel/helper-module-transforms@npm:7.18.0"
-  dependencies:
-    "@babel/helper-environment-visitor": ^7.16.7
-    "@babel/helper-module-imports": ^7.16.7
-    "@babel/helper-simple-access": ^7.17.7
-    "@babel/helper-split-export-declaration": ^7.16.7
-    "@babel/helper-validator-identifier": ^7.16.7
-    "@babel/template": ^7.16.7
-    "@babel/traverse": ^7.18.0
-    "@babel/types": ^7.18.0
-  checksum: 824c3967c08d75bb36adc18c31dcafebcd495b75b723e2e17c6185e88daf5c6db62a6a75d9f791b5f38618a349e7cb32503e715a1b9a4e8bad4d0f43e3e6b523
-  languageName: node
-  linkType: hard
-
-"@babel/helper-module-transforms@npm:^7.19.0":
-  version: 7.19.0
-  resolution: "@babel/helper-module-transforms@npm:7.19.0"
-  dependencies:
-    "@babel/helper-environment-visitor": ^7.18.9
-    "@babel/helper-module-imports": ^7.18.6
-    "@babel/helper-simple-access": ^7.18.6
-    "@babel/helper-split-export-declaration": ^7.18.6
-    "@babel/helper-validator-identifier": ^7.18.6
-    "@babel/template": ^7.18.10
-    "@babel/traverse": ^7.19.0
-    "@babel/types": ^7.19.0
-  checksum: 4483276c66f56cf3b5b063634092ad9438c2593725de5c143ba277dda82f1501e6d73b311c1b28036f181dbe36eaeff29f24726cde37a599d4e735af294e5359
-  languageName: node
-  linkType: hard
-
-"@babel/helper-optimise-call-expression@npm:^7.12.13, @babel/helper-optimise-call-expression@npm:^7.16.0":
-  version: 7.16.0
-  resolution: "@babel/helper-optimise-call-expression@npm:7.16.0"
-  dependencies:
-    "@babel/types": ^7.16.0
-  checksum: 121ae6054fcec76ed2c4dd83f0281b901c1e3cfac1bbff79adc3667983903ad1030a0ad9a8bea58e52b225e13881cf316f371c65276976e7a6762758a98be8f6
-  languageName: node
-  linkType: hard
-
-"@babel/helper-optimise-call-expression@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/helper-optimise-call-expression@npm:7.16.7"
-  dependencies:
-    "@babel/types": ^7.16.7
-  checksum: 925feb877d5a30a71db56e2be498b3abbd513831311c0188850896c4c1ada865eea795dce5251a1539b0f883ef82493f057f84286dd01abccc4736acfafe15ea
-  languageName: node
-  linkType: hard
-
-"@babel/helper-optimise-call-expression@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/helper-optimise-call-expression@npm:7.18.6"
-  dependencies:
-    "@babel/types": ^7.18.6
-  checksum: e518fe8418571405e21644cfb39cf694f30b6c47b10b006609a92469ae8b8775cbff56f0b19732343e2ea910641091c5a2dc73b56ceba04e116a33b0f8bd2fbd
-  languageName: node
-  linkType: hard
-
-"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.13.0, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
-  version: 7.14.5
-  resolution: "@babel/helper-plugin-utils@npm:7.14.5"
-  checksum: fe20e90a24d02770a60ebe80ab9f0dfd7258503cea8006c71709ac9af1aa3e47b0de569499673f11ea6c99597f8c0e4880ae1d505986e61101b69716820972fe
-  languageName: node
-  linkType: hard
-
-"@babel/helper-plugin-utils@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/helper-plugin-utils@npm:7.16.7"
-  checksum: d08dd86554a186c2538547cd537552e4029f704994a9201d41d82015c10ed7f58f9036e8d1527c3760f042409163269d308b0b3706589039c5f1884619c6d4ce
-  languageName: node
-  linkType: hard
-
-"@babel/helper-plugin-utils@npm:^7.17.12":
-  version: 7.17.12
-  resolution: "@babel/helper-plugin-utils@npm:7.17.12"
-  checksum: 4813cf0ddb0f143de032cb88d4207024a2334951db330f8216d6fa253ea320c02c9b2667429ef1a34b5e95d4cfbd085f6cb72d418999751c31d0baf2422cc61d
-  languageName: node
-  linkType: hard
-
-"@babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.18.9, @babel/helper-plugin-utils@npm:^7.19.0":
-  version: 7.19.0
-  resolution: "@babel/helper-plugin-utils@npm:7.19.0"
-  checksum: eedc996c633c8c207921c26ec2989eae0976336ecd9b9f1ac526498f52b5d136f7cd03c32b6fdf8d46a426f907c142de28592f383c42e5fba1e904cbffa05345
-  languageName: node
-  linkType: hard
-
-"@babel/helper-remap-async-to-generator@npm:^7.16.0, @babel/helper-remap-async-to-generator@npm:^7.16.4":
-  version: 7.16.4
-  resolution: "@babel/helper-remap-async-to-generator@npm:7.16.4"
-  dependencies:
-    "@babel/helper-annotate-as-pure": ^7.16.0
-    "@babel/helper-wrap-function": ^7.16.0
-    "@babel/types": ^7.16.0
-  checksum: debe997695fe2c11813e88b2fa4afc89d4543f72457dda00c7296a728cd5eeb81d4ef8607a5fef7823da410a8579407c631a430e5bfc78290172ff6fc430355c
-  languageName: node
-  linkType: hard
-
-"@babel/helper-remap-async-to-generator@npm:^7.16.8":
-  version: 7.16.8
-  resolution: "@babel/helper-remap-async-to-generator@npm:7.16.8"
-  dependencies:
-    "@babel/helper-annotate-as-pure": ^7.16.7
-    "@babel/helper-wrap-function": ^7.16.8
-    "@babel/types": ^7.16.8
-  checksum: 29282ee36872130085ca111539725abbf20210c2a1d674bee77f338a57c093c3154108d03a275f602e471f583bd2c7ae10d05534f87cbc22b95524fe2b569488
-  languageName: node
-  linkType: hard
-
-"@babel/helper-replace-supers@npm:^7.13.12, @babel/helper-replace-supers@npm:^7.16.0":
-  version: 7.16.0
-  resolution: "@babel/helper-replace-supers@npm:7.16.0"
-  dependencies:
-    "@babel/helper-member-expression-to-functions": ^7.16.0
-    "@babel/helper-optimise-call-expression": ^7.16.0
-    "@babel/traverse": ^7.16.0
-    "@babel/types": ^7.16.0
-  checksum: 61f04bbe05ff0987d5a8d5253cb101d47004a27951d6c5cd95457e30fcb3adaca85f0bcaa7f31f4d934f22386b935ac7281398c68982d4a4768769d95c028460
-  languageName: node
-  linkType: hard
-
-"@babel/helper-replace-supers@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/helper-replace-supers@npm:7.16.7"
-  dependencies:
-    "@babel/helper-environment-visitor": ^7.16.7
-    "@babel/helper-member-expression-to-functions": ^7.16.7
-    "@babel/helper-optimise-call-expression": ^7.16.7
-    "@babel/traverse": ^7.16.7
-    "@babel/types": ^7.16.7
-  checksum: e5c0b6eb3dad8410a6255f93b580dde9b3c1564646c6ef751de59d5b2a65b5caa80cc9e568155f04bbae895ad0f54305c2e833dbd971a4f641f970c90b3d892b
-  languageName: node
-  linkType: hard
-
-"@babel/helper-replace-supers@npm:^7.18.2":
-  version: 7.18.2
-  resolution: "@babel/helper-replace-supers@npm:7.18.2"
-  dependencies:
-    "@babel/helper-environment-visitor": ^7.18.2
-    "@babel/helper-member-expression-to-functions": ^7.17.7
-    "@babel/helper-optimise-call-expression": ^7.16.7
-    "@babel/traverse": ^7.18.2
-    "@babel/types": ^7.18.2
-  checksum: c0083b7933672dd2aed50b79021c46401c83f41bc2132def19c5414cf8f944251f6d91dd959b2bedada9a7436a80fab629adb486e008566290c82293e89fec05
-  languageName: node
-  linkType: hard
-
-"@babel/helper-replace-supers@npm:^7.18.9":
-  version: 7.18.9
-  resolution: "@babel/helper-replace-supers@npm:7.18.9"
-  dependencies:
-    "@babel/helper-environment-visitor": ^7.18.9
-    "@babel/helper-member-expression-to-functions": ^7.18.9
-    "@babel/helper-optimise-call-expression": ^7.18.6
-    "@babel/traverse": ^7.18.9
-    "@babel/types": ^7.18.9
-  checksum: 2de8b29cc4bfa4e241da2de16abd5571709f6eb394206dc16e3a7816976d1691635dd4bc930881e9d798f44b48a5f1849dc7f51a62946f3e8270452be1ec5352
-  languageName: node
-  linkType: hard
-
-"@babel/helper-simple-access@npm:^7.16.0":
-  version: 7.16.0
-  resolution: "@babel/helper-simple-access@npm:7.16.0"
-  dependencies:
-    "@babel/types": ^7.16.0
-  checksum: 2d7155f318411788b42d2f4a3d406de12952ad620d0bd411a0f3b5803389692ad61d9e7fab5f93b23ad3d8a09db4a75ca9722b9873a606470f468bc301944af6
-  languageName: node
-  linkType: hard
-
-"@babel/helper-simple-access@npm:^7.17.7":
-  version: 7.17.7
-  resolution: "@babel/helper-simple-access@npm:7.17.7"
-  dependencies:
-    "@babel/types": ^7.17.0
-  checksum: 58a9bfd054720024f6ff47fbb113c96061dc2bd31a5e5285756bd3c2e83918c6926900e00150d0fb175d899494fe7d69bf2a8b278c32ef6f6bea8d032e6a3831
-  languageName: node
-  linkType: hard
-
-"@babel/helper-simple-access@npm:^7.18.2":
-  version: 7.18.2
-  resolution: "@babel/helper-simple-access@npm:7.18.2"
-  dependencies:
-    "@babel/types": ^7.18.2
-  checksum: c0862b56db7e120754d89273a039b128c27517389f6a4425ff24e49779791e8fe10061579171fb986be81fa076778acb847c709f6f5e396278d9c5e01360c375
-  languageName: node
-  linkType: hard
-
-"@babel/helper-simple-access@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/helper-simple-access@npm:7.18.6"
-  dependencies:
-    "@babel/types": ^7.18.6
-  checksum: 37cd36eef199e0517845763c1e6ff6ea5e7876d6d707a6f59c9267c547a50aa0e84260ba9285d49acfaf2cfa0a74a772d92967f32ac1024c961517d40b6c16a5
-  languageName: node
-  linkType: hard
-
-"@babel/helper-skip-transparent-expression-wrappers@npm:^7.16.0":
-  version: 7.16.0
-  resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.16.0"
-  dependencies:
-    "@babel/types": ^7.16.0
-  checksum: b9ed2896eb253e6a85f472b0d4098ed80403758ad1a4e34b02b11e8276e3083297526758b1a3e6886e292987266f10622d7dbced3508cc22b296a74903b41cfb
-  languageName: node
-  linkType: hard
-
-"@babel/helper-split-export-declaration@npm:^7.12.13, @babel/helper-split-export-declaration@npm:^7.16.0":
-  version: 7.16.0
-  resolution: "@babel/helper-split-export-declaration@npm:7.16.0"
-  dependencies:
-    "@babel/types": ^7.16.0
-  checksum: 8bd87b5ea2046b145f0f55bc75cbdb6df69eaeb32919ee3c1c758757025aebca03e567a4d48389eb4f16a55021adb6ed8fa58aa771e164b15fa5e0a0722f771d
-  languageName: node
-  linkType: hard
-
-"@babel/helper-split-export-declaration@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/helper-split-export-declaration@npm:7.16.7"
-  dependencies:
-    "@babel/types": ^7.16.7
-  checksum: e10aaf135465c55114627951b79115f24bc7af72ecbb58d541d66daf1edaee5dde7cae3ec8c3639afaf74526c03ae3ce723444e3b5b3dc77140c456cd84bcaa1
-  languageName: node
-  linkType: hard
-
-"@babel/helper-split-export-declaration@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/helper-split-export-declaration@npm:7.18.6"
-  dependencies:
-    "@babel/types": ^7.18.6
-  checksum: c6d3dede53878f6be1d869e03e9ffbbb36f4897c7cc1527dc96c56d127d834ffe4520a6f7e467f5b6f3c2843ea0e81a7819d66ae02f707f6ac057f3d57943a2b
-  languageName: node
-  linkType: hard
-
-"@babel/helper-string-parser@npm:^7.18.10":
-  version: 7.18.10
-  resolution: "@babel/helper-string-parser@npm:7.18.10"
-  checksum: d554a4393365b624916b5c00a4cc21c990c6617e7f3fe30be7d9731f107f12c33229a7a3db9d829bfa110d2eb9f04790745d421640e3bd245bb412dc0ea123c1
-  languageName: node
-  linkType: hard
-
-"@babel/helper-string-parser@npm:^7.19.4":
-  version: 7.19.4
-  resolution: "@babel/helper-string-parser@npm:7.19.4"
-  checksum: b2f8a3920b30dfac81ec282ac4ad9598ea170648f8254b10f475abe6d944808fb006aab325d3eb5a8ad3bea8dfa888cfa6ef471050dae5748497c110ec060943
-  languageName: node
-  linkType: hard
-
-"@babel/helper-validator-identifier@npm:^7.14.0, @babel/helper-validator-identifier@npm:^7.15.7":
-  version: 7.15.7
-  resolution: "@babel/helper-validator-identifier@npm:7.15.7"
-  checksum: f041c28c531d1add5cc345b25d5df3c29c62bce3205b4d4a93dcd164ccf630350acba252d374fad8f5d8ea526995a215829f27183ba7ce7ce141843bf23068a6
-  languageName: node
-  linkType: hard
-
-"@babel/helper-validator-identifier@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/helper-validator-identifier@npm:7.16.7"
-  checksum: dbb3db9d184343152520a209b5684f5e0ed416109cde82b428ca9c759c29b10c7450657785a8b5c5256aa74acc6da491c1f0cf6b784939f7931ef82982051b69
-  languageName: node
-  linkType: hard
-
-"@babel/helper-validator-identifier@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/helper-validator-identifier@npm:7.18.6"
-  checksum: e295254d616bbe26e48c196a198476ab4d42a73b90478c9842536cf910ead887f5af6b5c4df544d3052a25ccb3614866fa808dc1e3a5a4291acd444e243c0648
-  languageName: node
-  linkType: hard
-
-"@babel/helper-validator-identifier@npm:^7.19.1":
-  version: 7.19.1
-  resolution: "@babel/helper-validator-identifier@npm:7.19.1"
-  checksum: 0eca5e86a729162af569b46c6c41a63e18b43dbe09fda1d2a3c8924f7d617116af39cac5e4cd5d431bb760b4dca3c0970e0c444789b1db42bcf1fa41fbad0a3a
-  languageName: node
-  linkType: hard
-
-"@babel/helper-validator-option@npm:^7.12.17, @babel/helper-validator-option@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/helper-validator-option@npm:7.14.5"
-  checksum: 1b25c34a5cb3d8602280f33b9ab687d2a77895e3616458d0f70ddc450ada9b05e342c44f322bc741d51b252e84cff6ec44ae93d622a3354828579a643556b523
-  languageName: node
-  linkType: hard
-
-"@babel/helper-validator-option@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/helper-validator-option@npm:7.16.7"
-  checksum: c5ccc451911883cc9f12125d47be69434f28094475c1b9d2ada7c3452e6ac98a1ee8ddd364ca9e3f9855fcdee96cdeafa32543ebd9d17fee7a1062c202e80570
-  languageName: node
-  linkType: hard
-
-"@babel/helper-validator-option@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/helper-validator-option@npm:7.18.6"
-  checksum: f9cc6eb7cc5d759c5abf006402180f8d5e4251e9198197428a97e05d65eb2f8ae5a0ce73b1dfd2d35af41d0eb780627a64edf98a4e71f064eeeacef8de58f2cf
-  languageName: node
-  linkType: hard
-
-"@babel/helper-wrap-function@npm:^7.16.0":
-  version: 7.16.0
-  resolution: "@babel/helper-wrap-function@npm:7.16.0"
-  dependencies:
-    "@babel/helper-function-name": ^7.16.0
-    "@babel/template": ^7.16.0
-    "@babel/traverse": ^7.16.0
-    "@babel/types": ^7.16.0
-  checksum: 2bb4e05f49cf217cc5890581284a051245ba0ddaccbe3ddd662010d7a6969f52d2027e310d26db2e030273c5fe9341448c7845fcb4795ad8eb56bdeabec148b8
-  languageName: node
-  linkType: hard
-
-"@babel/helper-wrap-function@npm:^7.16.8":
-  version: 7.16.8
-  resolution: "@babel/helper-wrap-function@npm:7.16.8"
-  dependencies:
-    "@babel/helper-function-name": ^7.16.7
-    "@babel/template": ^7.16.7
-    "@babel/traverse": ^7.16.8
-    "@babel/types": ^7.16.8
-  checksum: d8aae4bacaf138d47dca1421ba82b41eac954cbb0ad17ab1c782825c6f2afe20076fbed926ab265967758336de5112d193a363128cd1c6967c66e0151174f797
-  languageName: node
-  linkType: hard
-
-"@babel/helpers@npm:^7.14.0, @babel/helpers@npm:^7.16.0":
-  version: 7.16.3
-  resolution: "@babel/helpers@npm:7.16.3"
-  dependencies:
-    "@babel/template": ^7.16.0
-    "@babel/traverse": ^7.16.3
-    "@babel/types": ^7.16.0
-  checksum: b725b1aab734e9e1407247ee499880583855843fa2855377a2c26277bd9fbd7080219109189bc69b18d71cc30759666bfe66d534729b41452097866d1f5a66ef
-  languageName: node
-  linkType: hard
-
-"@babel/helpers@npm:^7.17.8":
-  version: 7.17.8
-  resolution: "@babel/helpers@npm:7.17.8"
-  dependencies:
-    "@babel/template": ^7.16.7
-    "@babel/traverse": ^7.17.3
-    "@babel/types": ^7.17.0
-  checksum: 463dad58119fefebf2d0201bfa53ec9607aa00356908895640fc07589747fb3c2e0dfee4019f3e8c9781e57c9aa5dff4c72ec8d1b031c4ed8349f90b6aefe99d
-  languageName: node
-  linkType: hard
-
-"@babel/helpers@npm:^7.18.2":
-  version: 7.18.2
-  resolution: "@babel/helpers@npm:7.18.2"
-  dependencies:
-    "@babel/template": ^7.16.7
-    "@babel/traverse": ^7.18.2
-    "@babel/types": ^7.18.2
-  checksum: 94620242f23f6d5f9b83a02b1aa1632ffb05b0815e1bb53d3b46d64aa8e771066bba1db8bd267d9091fb00134cfaeda6a8d69d1d4cc2c89658631adfa077ae70
-  languageName: node
-  linkType: hard
-
-"@babel/helpers@npm:^7.19.0":
-  version: 7.19.0
-  resolution: "@babel/helpers@npm:7.19.0"
-  dependencies:
-    "@babel/template": ^7.18.10
-    "@babel/traverse": ^7.19.0
-    "@babel/types": ^7.19.0
-  checksum: e50e78e0dbb0435075fa3f85021a6bcae529589800bca0292721afd7f7c874bea54508d6dc57eca16e5b8224f8142c6b0e32e3b0140029dc09865da747da4623
-  languageName: node
-  linkType: hard
-
-"@babel/highlight@npm:^7.10.4":
-  version: 7.14.0
-  resolution: "@babel/highlight@npm:7.14.0"
-  dependencies:
-    "@babel/helper-validator-identifier": ^7.14.0
-    chalk: ^2.0.0
-    js-tokens: ^4.0.0
-  checksum: 5aae226c0d4caf66bbb2d11e961449b470eb952aa827b06da5921d845a5dc233789e2537aa1e7b0f567d1cae93feca3976d6b52c9d6d87481ed9ded0bebf13a2
-  languageName: node
-  linkType: hard
-
-"@babel/highlight@npm:^7.12.13, @babel/highlight@npm:^7.16.0":
-  version: 7.16.0
-  resolution: "@babel/highlight@npm:7.16.0"
-  dependencies:
-    "@babel/helper-validator-identifier": ^7.15.7
-    chalk: ^2.0.0
-    js-tokens: ^4.0.0
-  checksum: abf244c48fcff20ec87830e8b99c776f4dcdd9138e63decc195719a94148da35339639e0d8045eb9d1f3e67a39ab90a9c3f5ce2d579fb1a0368d911ddf29b4e5
-  languageName: node
-  linkType: hard
-
-"@babel/highlight@npm:^7.16.7":
-  version: 7.16.10
-  resolution: "@babel/highlight@npm:7.16.10"
-  dependencies:
-    "@babel/helper-validator-identifier": ^7.16.7
-    chalk: ^2.0.0
-    js-tokens: ^4.0.0
-  checksum: 1f1bdd752a90844f4efc22166a46303fb651ba0fd75a06daba3ebae2575ab3edc1da9827c279872a3aaf305f50a18473c5fa1966752726a2b253065fd4c0745e
-  languageName: node
-  linkType: hard
-
-"@babel/highlight@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/highlight@npm:7.18.6"
-  dependencies:
-    "@babel/helper-validator-identifier": ^7.18.6
-    chalk: ^2.0.0
-    js-tokens: ^4.0.0
-  checksum: 92d8ee61549de5ff5120e945e774728e5ccd57fd3b2ed6eace020ec744823d4a98e242be1453d21764a30a14769ecd62170fba28539b211799bbaf232bbb2789
-  languageName: node
-  linkType: hard
-
-"@babel/parser@npm:^7.12.3, @babel/parser@npm:^7.4.5, @babel/parser@npm:^7.7.0":
-  version: 7.14.0
-  resolution: "@babel/parser@npm:7.14.0"
-  bin:
-    parser: ./bin/babel-parser.js
-  checksum: d1d82e6c2ecd1d66d873f3ae4f070bd687ee0d4e19ecf6b63a5daa735982ea0554a2ff7afd463d6754f8f28c9bc4b83264787d5a215b729f9552745ce76130f9
-  languageName: node
-  linkType: hard
-
-"@babel/parser@npm:^7.14.0, @babel/parser@npm:^7.16.0, @babel/parser@npm:^7.16.3":
-  version: 7.16.4
-  resolution: "@babel/parser@npm:7.16.4"
-  bin:
-    parser: ./bin/babel-parser.js
-  checksum: ce0a8f92f440f2a12bc932f070a7b60c5133bf8a63f461841f9e39af0194f573707959d606c6fad1a2fd496a45148553afd9b74d3b8dd36cdb7861598d1f3e36
-  languageName: node
-  linkType: hard
-
-"@babel/parser@npm:^7.16.7, @babel/parser@npm:^7.17.3, @babel/parser@npm:^7.17.8":
-  version: 7.17.8
-  resolution: "@babel/parser@npm:7.17.8"
-  bin:
-    parser: ./bin/babel-parser.js
-  checksum: 1771808491982cc47baa888a997aef6b58308e3844c8c00f730f8fd97defe57d32cdbf46075cd49aaee310fa31f3d2c80a0d41b41a4ee0ff336ee09e2ff6c222
-  languageName: node
-  linkType: hard
-
-"@babel/parser@npm:^7.18.0":
-  version: 7.18.4
-  resolution: "@babel/parser@npm:7.18.4"
-  bin:
-    parser: ./bin/babel-parser.js
-  checksum: e05b2dc720c4b200e088258f3c2a2de5041c140444edc38181d1217b10074e881a7133162c5b62356061f26279f08df5a06ec14c5842996ee8601ad03c57a44f
-  languageName: node
-  linkType: hard
-
-"@babel/parser@npm:^7.18.10, @babel/parser@npm:^7.19.0":
-  version: 7.19.0
-  resolution: "@babel/parser@npm:7.19.0"
-  bin:
-    parser: ./bin/babel-parser.js
-  checksum: af86d829bfeb60e0dcf54a43489c2514674b6c8d9bb24cf112706772125752fcd517877ad30501d533fa85f70a439d02eebeec3be9c2e95499853367184e0da7
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.16.7"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.16.7
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: bbb0f82a4cf297bdbb9110eea570addd4b883fd1b61535558d849822b087aa340fe4e9c31f8a39b087595c8310b58d0f5548d6be0b72c410abefb23a5734b7bc
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.17.12":
-  version: 7.17.12
-  resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.17.12"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.17.12
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: 6ef739b3a2b0ac0b22b60ff472c118163ceb8d414dd08c8186cc563fddc2be62ad4d8681e02074a1c7f0056a72e7146493a85d12ded02e50904b0009ed85d8bf
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.13.12":
-  version: 7.16.0
-  resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.16.0"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/helper-skip-transparent-expression-wrappers": ^7.16.0
-    "@babel/plugin-proposal-optional-chaining": ^7.16.0
-  peerDependencies:
-    "@babel/core": ^7.13.0
-  checksum: bb115479292e2c66671a62c46a64d8dae1fc8bbf604c83f82a421216e3d40632dbe86e8ba34e66318c215eddfc4f25e6e7fe19123517f1cf5b6003b1efbd911a
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.16.7"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.16.7
-    "@babel/helper-skip-transparent-expression-wrappers": ^7.16.0
-    "@babel/plugin-proposal-optional-chaining": ^7.16.7
-  peerDependencies:
-    "@babel/core": ^7.13.0
-  checksum: 81b372651a7d886a06596b02df7fb65ea90265a8bd60c9f0d5c1777590a598e6cccbdc3239033ee0719abf904813e69577eeb0ed5960b40e07978df023b17a6a
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.17.12":
-  version: 7.17.12
-  resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.17.12"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.17.12
-    "@babel/helper-skip-transparent-expression-wrappers": ^7.16.0
-    "@babel/plugin-proposal-optional-chaining": ^7.17.12
-  peerDependencies:
-    "@babel/core": ^7.13.0
-  checksum: 68520a8f26e56bc8d90c22133537a9819e82598e3c82007f30bdaf8898b0e12a7bfa0cd3044aca35a7f362fd6bc04e4cd8052a571fc2eb40ad8f1cf24e0fc45f
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-async-generator-functions@npm:^7.13.15":
-  version: 7.16.4
-  resolution: "@babel/plugin-proposal-async-generator-functions@npm:7.16.4"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/helper-remap-async-to-generator": ^7.16.4
-    "@babel/plugin-syntax-async-generators": ^7.8.4
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: dcd5a76ee12eacee93440e021a7e4a8e53b5d13d26c8fd7d412fc83341a1633a949bef1ef94301ae753164d39d303cb01b59234e6b48205377ca1d041f670ba5
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-async-generator-functions@npm:^7.16.8":
-  version: 7.16.8
-  resolution: "@babel/plugin-proposal-async-generator-functions@npm:7.16.8"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.16.7
-    "@babel/helper-remap-async-to-generator": ^7.16.8
-    "@babel/plugin-syntax-async-generators": ^7.8.4
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: abd2c2c67de262720d37c5509dafe2ce64d6cee2dc9a8e863bbba1796b77387214442f37618373c6a4521ca624bfc7dcdbeb1376300d16f2a474405ee0ca2e69
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-async-generator-functions@npm:^7.17.12":
-  version: 7.17.12
-  resolution: "@babel/plugin-proposal-async-generator-functions@npm:7.17.12"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.17.12
-    "@babel/helper-remap-async-to-generator": ^7.16.8
-    "@babel/plugin-syntax-async-generators": ^7.8.4
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 16a3c7f68a27031b4973b7c64ca009873c91b91afd7b3a4694ec7f1c6d8e91a6ee142eafd950113810fae122faa1031de71140333b2b1bd03d5367b1a05b1d91
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-class-properties@npm:^7.1.0":
-  version: 7.13.0
-  resolution: "@babel/plugin-proposal-class-properties@npm:7.13.0"
-  dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.13.0
-    "@babel/helper-plugin-utils": ^7.13.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: e3cdfacb2d36c66204e3bf99b85feb521daed6e2c3d424f10eb3f722fe20ca0a2560fe9f5a01e5170a34a4f160e9ff02eb678bed81ee130f1c9d990ce8cd711c
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-class-properties@npm:^7.13.0":
-  version: 7.16.0
-  resolution: "@babel/plugin-proposal-class-properties@npm:7.16.0"
-  dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.16.0
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: b1665ced553e5cdb95eec2fda321cb226c5f255edd1a94b226b9d81e97e026472184b6898af26f2bb9ee64101fad1afe215b6fc469d3103dec78c55e732e49aa
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-class-properties@npm:^7.16.5, @babel/plugin-proposal-class-properties@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/plugin-proposal-class-properties@npm:7.16.7"
-  dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.16.7
-    "@babel/helper-plugin-utils": ^7.16.7
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 3977e841e17b45b47be749b9a5b67b9e8b25ff0840f9fdad3f00cbcb35db4f5ff15f074939fe19b01207a29688c432cc2c682351959350834d62920b7881f803
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-class-properties@npm:^7.17.12":
-  version: 7.17.12
-  resolution: "@babel/plugin-proposal-class-properties@npm:7.17.12"
-  dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.17.12
-    "@babel/helper-plugin-utils": ^7.17.12
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 884df6a4617a18cdc2a630096b2a10954bcc94757c893bb01abd6702fdc73343ca5c611f4884c4634e0608f5e86c3093ea6b973ce00bf21b248ba54de92c837d
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-class-static-block@npm:^7.13.11":
-  version: 7.16.0
-  resolution: "@babel/plugin-proposal-class-static-block@npm:7.16.0"
-  dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.16.0
-    "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/plugin-syntax-class-static-block": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.12.0
-  checksum: 59c4bb3d6ad4828e7773fe1c63730c68bf646c3a8d042b9ed4062fd98a26c1656b7ee108c5f144fd8b24ff567baf3b2efa644be29c6c8bcfe60e09e485e22116
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-class-static-block@npm:^7.16.7":
-  version: 7.17.6
-  resolution: "@babel/plugin-proposal-class-static-block@npm:7.17.6"
-  dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.17.6
-    "@babel/helper-plugin-utils": ^7.16.7
-    "@babel/plugin-syntax-class-static-block": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.12.0
-  checksum: 0ef00d73b4a7667059f71614669fb5ec989a0a6d5fe58118310c892507f2556a6f3ae66f0c547cd06e50bdf3ff528ef486e611079d41ef321300c967d2c26e1d
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-class-static-block@npm:^7.18.0":
-  version: 7.18.0
-  resolution: "@babel/plugin-proposal-class-static-block@npm:7.18.0"
-  dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.18.0
-    "@babel/helper-plugin-utils": ^7.17.12
-    "@babel/plugin-syntax-class-static-block": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.12.0
-  checksum: 70fd622fd7c62cca2aa99c70532766340a5c30105e35cb3f1187b450580d43adc78b3fcb1142ed339bcfccf84be95ea03407adf467331b318ce6874432736c89
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-decorators@npm:^7.13.5":
-  version: 7.16.4
-  resolution: "@babel/plugin-proposal-decorators@npm:7.16.4"
-  dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.16.0
-    "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/plugin-syntax-decorators": ^7.16.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: de4f3187c60d14fca37f4edf9d27c61b22e62609708bbaa48bd25b705ab4d5d09457b1011bf6fb55607b11c7a227310f3db5ced4802ded96a79202af7fad7101
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-decorators@npm:^7.16.7":
-  version: 7.18.2
-  resolution: "@babel/plugin-proposal-decorators@npm:7.18.2"
-  dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.18.0
-    "@babel/helper-plugin-utils": ^7.17.12
-    "@babel/helper-replace-supers": ^7.18.2
-    "@babel/helper-split-export-declaration": ^7.16.7
-    "@babel/plugin-syntax-decorators": ^7.17.12
-    charcodes: ^0.2.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: cb40e31afe5c414d748d90943910ff7e8015f89f5845046bcdc8ae9b09882b183c550a6bc32969826680d9c41866d5f39097f1cd7b0a7c2101285ec4e38dbded
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-dynamic-import@npm:^7.13.8":
-  version: 7.16.0
-  resolution: "@babel/plugin-proposal-dynamic-import@npm:7.16.0"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/plugin-syntax-dynamic-import": ^7.8.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 4027da640443d8fd4a20637d1dd67cce1c13207b8c19fa77796a08b9eec9881b95322c1a5c489128adf3a12e9bbc02b31de9ddd536c909d072577a74a2a70b67
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-dynamic-import@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/plugin-proposal-dynamic-import@npm:7.16.7"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.16.7
-    "@babel/plugin-syntax-dynamic-import": ^7.8.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 5992012484fb8bda1451369350e475091954ed414dd9ef8654a3c4daa2db0205d4f29c94f5d3dedfbc5a434996375c8304586904337d6af938ac0f27a0033e23
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-export-namespace-from@npm:^7.12.13":
-  version: 7.16.0
-  resolution: "@babel/plugin-proposal-export-namespace-from@npm:7.16.0"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/plugin-syntax-export-namespace-from": ^7.8.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 0bdc166ac44d9a0579e6d14d07ed1364932b4b7852626f4ba0c0011464097ed23bec43a3e93793d888c2854918ce9937ac251a945abbe0d283eaa1df206e0b05
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-export-namespace-from@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/plugin-proposal-export-namespace-from@npm:7.16.7"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.16.7
-    "@babel/plugin-syntax-export-namespace-from": ^7.8.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 5016079a5305c1c130fea587b42cdce501574739cfefa5b63469dbc1f32d436df0ff42fabf04089fe8b6a00f4ea7563869e944744b457e186c677995983cb166
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-export-namespace-from@npm:^7.17.12":
-  version: 7.17.12
-  resolution: "@babel/plugin-proposal-export-namespace-from@npm:7.17.12"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.17.12
-    "@babel/plugin-syntax-export-namespace-from": ^7.8.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 41c9cd4c0a5629b65725d2554867c15b199f534cea5538bd1ae379c0d13e7206d8590e23b23cb05a8b243e33e6eb88c1de3fd03a55cdbc6d4cf8634a6bebe43d
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-json-strings@npm:^7.13.8":
-  version: 7.16.0
-  resolution: "@babel/plugin-proposal-json-strings@npm:7.16.0"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/plugin-syntax-json-strings": ^7.8.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: fa93be8eff22ced96a68c9db8c0e930414a4ffb44cf68b473717309c06a4feee2bac6e41415a699c829f29928653d67b4b7d29a45861784d235264d829055a1e
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-json-strings@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/plugin-proposal-json-strings@npm:7.16.7"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.16.7
-    "@babel/plugin-syntax-json-strings": ^7.8.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: ea6487918f8d88322ac2a4e5273be6163b0d84a34330c31cee346e23525299de3b4f753bc987951300a79f55b8f4b1971b24d04c0cdfcb7ceb4d636975c215e8
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-json-strings@npm:^7.17.12":
-  version: 7.17.12
-  resolution: "@babel/plugin-proposal-json-strings@npm:7.17.12"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.17.12
-    "@babel/plugin-syntax-json-strings": ^7.8.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 8ed4ee3fbc28e44fac17c48bd95b5b8c3ffc852053a9fffd36ab498ec0b0ba069b8b2f5658edc18332748948433b9d3e1e376f564a1d65cb54592ba9943be09b
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-logical-assignment-operators@npm:^7.13.8":
-  version: 7.16.0
-  resolution: "@babel/plugin-proposal-logical-assignment-operators@npm:7.16.0"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 7e6cd10248803f0c5801805ef1a357314940c3204c3d2f00994711f272c21276f181d0e83ada5bce6185ae2c97c4417e778331505ffc2e71a2b9c4425a5dcc6d
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-logical-assignment-operators@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/plugin-proposal-logical-assignment-operators@npm:7.16.7"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.16.7
-    "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: c4cf18e10f900d40eaa471c4adce4805e67bd845f997a4b9d5653eced4e653187b9950843b2bf7eab6c0c3e753aba222b1d38888e3e14e013f87295c5b014f19
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-logical-assignment-operators@npm:^7.17.12":
-  version: 7.17.12
-  resolution: "@babel/plugin-proposal-logical-assignment-operators@npm:7.17.12"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.17.12
-    "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 0d48451836219b7beeca4be22a8aeb4a177a4944be4727afb94a4a11f201dde8b0b186dd2ad65b537d61e9af3fa1afda734f7096bec8602debd76d07aa342e21
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-nullish-coalescing-operator@npm:^7.13.8, @babel/plugin-proposal-nullish-coalescing-operator@npm:^7.4.4":
-  version: 7.16.0
-  resolution: "@babel/plugin-proposal-nullish-coalescing-operator@npm:7.16.0"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: e50f94929970cdc5c6ee22ec4c95c46ae25cdd8c391baf601f7f3d3a3cec417efc663a3fafa9ae5bca82a6815d49687b07cab9857f5a10e9ea862438ecb81e4a
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-nullish-coalescing-operator@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/plugin-proposal-nullish-coalescing-operator@npm:7.16.7"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.16.7
-    "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: bfafc2701697b5c763dbbb65dd97b56979bfb0922e35be27733699a837aeff22316313ddfdd0fb45129efa3f86617219b77110d05338bc4dca4385d8ce83dd19
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-nullish-coalescing-operator@npm:^7.17.12":
-  version: 7.17.12
-  resolution: "@babel/plugin-proposal-nullish-coalescing-operator@npm:7.17.12"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.17.12
-    "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 7881d8005d0d4e17a94f3bfbfa4a0d8af016d2f62ed90912fabb8c5f8f0cc0a15fd412f09c230984c40b5c893086987d403c73198ef388ffcb3726ff72efc009
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-numeric-separator@npm:^7.12.13":
-  version: 7.16.0
-  resolution: "@babel/plugin-proposal-numeric-separator@npm:7.16.0"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/plugin-syntax-numeric-separator": ^7.10.4
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: eb7895a4f38263df644a0ded7042991190f23bdec4b53f3e2c8b40b82d2dbc537a6ca9afbfd490d1aa5dd33244e7a51bf1ae0c4c6890d9978bc1adc325b7e795
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-numeric-separator@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/plugin-proposal-numeric-separator@npm:7.16.7"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.16.7
-    "@babel/plugin-syntax-numeric-separator": ^7.10.4
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 8e2fb0b32845908c67f80bc637a0968e28a66727d7ffb22b9c801dc355d88e865dc24aec586b00c922c23833ae5d26301b443b53609ea73d8344733cd48a1eca
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-object-rest-spread@npm:^7.12.1":
-  version: 7.13.8
-  resolution: "@babel/plugin-proposal-object-rest-spread@npm:7.13.8"
-  dependencies:
-    "@babel/compat-data": ^7.13.8
-    "@babel/helper-compilation-targets": ^7.13.8
-    "@babel/helper-plugin-utils": ^7.13.0
-    "@babel/plugin-syntax-object-rest-spread": ^7.8.3
-    "@babel/plugin-transform-parameters": ^7.13.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 7ae92617c672e1d47979c809bd90b20c4e7d269769776dd705f519634a165d113de8ef05739a557b3aad0cb6884986b82d287dcb63211c07b66dca43ac66c8bb
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-object-rest-spread@npm:^7.13.8":
-  version: 7.16.0
-  resolution: "@babel/plugin-proposal-object-rest-spread@npm:7.16.0"
-  dependencies:
-    "@babel/compat-data": ^7.16.0
-    "@babel/helper-compilation-targets": ^7.16.0
-    "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/plugin-syntax-object-rest-spread": ^7.8.3
-    "@babel/plugin-transform-parameters": ^7.16.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: c7716ba50e65aae613e553dd568d3f4b4c42fa8d9f1c3aca6cc227670fc792b600cd5a5c710451490f3d7d5916e77607cba45033e199534ca71feed451f63820
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-object-rest-spread@npm:^7.16.7":
-  version: 7.17.3
-  resolution: "@babel/plugin-proposal-object-rest-spread@npm:7.17.3"
-  dependencies:
-    "@babel/compat-data": ^7.17.0
-    "@babel/helper-compilation-targets": ^7.16.7
-    "@babel/helper-plugin-utils": ^7.16.7
-    "@babel/plugin-syntax-object-rest-spread": ^7.8.3
-    "@babel/plugin-transform-parameters": ^7.16.7
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 02810f158db4aaf6883131621b5d2c7d901ea3c034df2c2b78663f8b26813795d78a346c37e56770a720c54773732fd1d7fe40947dbf11d1d8de0e9a38e856d3
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-object-rest-spread@npm:^7.18.0":
-  version: 7.18.0
-  resolution: "@babel/plugin-proposal-object-rest-spread@npm:7.18.0"
-  dependencies:
-    "@babel/compat-data": ^7.17.10
-    "@babel/helper-compilation-targets": ^7.17.10
-    "@babel/helper-plugin-utils": ^7.17.12
-    "@babel/plugin-syntax-object-rest-spread": ^7.8.3
-    "@babel/plugin-transform-parameters": ^7.17.12
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 2b49bcf9a6b11fd8b6a1d4962a64f3c846a63f8340eca9824c907f75bfcff7422ca35b135607fc3ef2d4e7e77ce6b6d955b772dc3c1c39f7ed24a0d8a560ec78
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-optional-catch-binding@npm:^7.13.8":
-  version: 7.16.0
-  resolution: "@babel/plugin-proposal-optional-catch-binding@npm:7.16.0"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/plugin-syntax-optional-catch-binding": ^7.8.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 5003a1d48fb6bac1661b481681baf7941de518f1f773d9745e65a650e750b715cb69181a4b723e28f4e43b94143b7b0fe5d12ff1ceceda9731f073cd6bf4e195
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-optional-catch-binding@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/plugin-proposal-optional-catch-binding@npm:7.16.7"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.16.7
-    "@babel/plugin-syntax-optional-catch-binding": ^7.8.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 4a422bb19a23cf80a245c60bea7adbe5dac8ff3bc1a62f05d7155e1eb68d401b13339c94dfd1f3d272972feeb45746f30d52ca0f8d5c63edf6891340878403df
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-optional-chaining@npm:^7.13.12, @babel/plugin-proposal-optional-chaining@npm:^7.16.0, @babel/plugin-proposal-optional-chaining@npm:^7.6.0":
-  version: 7.16.0
-  resolution: "@babel/plugin-proposal-optional-chaining@npm:7.16.0"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/helper-skip-transparent-expression-wrappers": ^7.16.0
-    "@babel/plugin-syntax-optional-chaining": ^7.8.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 8301e0829220327c8b969b711c5c4ee5aef88b391e5fb7838381bd18c0fd0cf360d3a307ad5c6113414470ae920504dc2c41983af0ddf3762f5c88957e0c3a94
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-optional-chaining@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/plugin-proposal-optional-chaining@npm:7.16.7"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.16.7
-    "@babel/helper-skip-transparent-expression-wrappers": ^7.16.0
-    "@babel/plugin-syntax-optional-chaining": ^7.8.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: e4a6c1ac7e6817b92a673ea52ab0b7dc1fb39d29fb0820cd414e10ae2cd132bd186b4238dcca881a29fc38fe9d38ed24fc111ba22ca20086481682d343f4f130
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-optional-chaining@npm:^7.17.12":
-  version: 7.17.12
-  resolution: "@babel/plugin-proposal-optional-chaining@npm:7.17.12"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.17.12
-    "@babel/helper-skip-transparent-expression-wrappers": ^7.16.0
-    "@babel/plugin-syntax-optional-chaining": ^7.8.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: a27b220573441a0ad3eecf8ddcb249556a64de45add236791d76cfa164a8fd34181857528fa7d21d03d6b004e7c043bd929cce068e611ee1ac72aaf4d397aa12
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-private-methods@npm:^7.13.0":
-  version: 7.16.0
-  resolution: "@babel/plugin-proposal-private-methods@npm:7.16.0"
-  dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.16.0
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 6f648f54ea1219262b7a05f86f94de7cb466dc81ffd86e4f37ba536037762457ef13408083eb4325d44d2a5aae27c097756efe1067f5c1fbddb8078b923580f5
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-private-methods@npm:^7.16.11, @babel/plugin-proposal-private-methods@npm:^7.16.5":
-  version: 7.16.11
-  resolution: "@babel/plugin-proposal-private-methods@npm:7.16.11"
-  dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.16.10
-    "@babel/helper-plugin-utils": ^7.16.7
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: b333e5aa91c265bb394a57b5f4ae1a34fc8ee73a8d75506b12df258d8b5342107cbd9261f95e606bd3264a5b023db77f1f95be30c2e526683916c57f793f7943
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-private-methods@npm:^7.17.12":
-  version: 7.17.12
-  resolution: "@babel/plugin-proposal-private-methods@npm:7.17.12"
-  dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.17.12
-    "@babel/helper-plugin-utils": ^7.17.12
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: a1e5bd6a0a541af55d133d7bcf51ff8eb4ac7417a30f518c2f38107d7d033a3d5b7128ea5b3a910b458d7ceb296179b6ff9d972be60d1c686113d25fede8bed3
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-private-property-in-object@npm:^7.14.0":
-  version: 7.16.0
-  resolution: "@babel/plugin-proposal-private-property-in-object@npm:7.16.0"
-  dependencies:
-    "@babel/helper-annotate-as-pure": ^7.16.0
-    "@babel/helper-create-class-features-plugin": ^7.16.0
-    "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/plugin-syntax-private-property-in-object": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 9098fb34f4abac376ec5823bf6aaedacd46e6925a6fc62559a8086a110bf39310ee308bfbbed052f047ad803b7148b87e43b6d83a759be0aeab1149efd4b8eeb
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-private-property-in-object@npm:^7.16.5, @babel/plugin-proposal-private-property-in-object@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/plugin-proposal-private-property-in-object@npm:7.16.7"
-  dependencies:
-    "@babel/helper-annotate-as-pure": ^7.16.7
-    "@babel/helper-create-class-features-plugin": ^7.16.7
-    "@babel/helper-plugin-utils": ^7.16.7
-    "@babel/plugin-syntax-private-property-in-object": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 666d668f51d8c01aaf0dd87b27a83fc0392884d2c8e9d8e17b3b7011c0d348865dee94b44dc2d7070726e58e3b579728dc2588aaa8140d563f7390743ee90f0a
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-private-property-in-object@npm:^7.17.12":
-  version: 7.17.12
-  resolution: "@babel/plugin-proposal-private-property-in-object@npm:7.17.12"
-  dependencies:
-    "@babel/helper-annotate-as-pure": ^7.16.7
-    "@babel/helper-create-class-features-plugin": ^7.17.12
-    "@babel/helper-plugin-utils": ^7.17.12
-    "@babel/plugin-syntax-private-property-in-object": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 056cb77994b2ee367301cdf8c5b7ed71faf26d60859bbba1368b342977481b0884712a1b97fbd9b091750162923d0265bf901119d46002775aa66e4a9f30f411
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-unicode-property-regex@npm:^7.12.13, @babel/plugin-proposal-unicode-property-regex@npm:^7.4.4":
-  version: 7.16.0
-  resolution: "@babel/plugin-proposal-unicode-property-regex@npm:7.16.0"
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin": ^7.16.0
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: f26b76c9aa680820fe693f768a36e3a2c4d969e72d7a362059fffad7c874eed8a89bde2be5bde650283a685bd879415f8937fb37a9a1397b287a81df0c6f7c23
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-unicode-property-regex@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/plugin-proposal-unicode-property-regex@npm:7.16.7"
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin": ^7.16.7
-    "@babel/helper-plugin-utils": ^7.16.7
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 2b8a33713d456183f0b7d011011e7bd932c08cc06216399a7b2015ab39284b511993dc10a89bbb15d1d728e6a2ef42ca08c3202619aa148cbd48052422ea3995
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-unicode-property-regex@npm:^7.17.12":
-  version: 7.17.12
-  resolution: "@babel/plugin-proposal-unicode-property-regex@npm:7.17.12"
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin": ^7.17.12
-    "@babel/helper-plugin-utils": ^7.17.12
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 0e4194510415ed11849f1617fcb32d996df746ba93cd05ebbabecb63cfc02c0e97b585c97da3dcf68acdd3c8b71cfae964abe5d5baba6bd3977a475d9225ad9e
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-syntax-async-generators@npm:^7.8.4":
-  version: 7.8.4
-  resolution: "@babel/plugin-syntax-async-generators@npm:7.8.4"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.8.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 7ed1c1d9b9e5b64ef028ea5e755c0be2d4e5e4e3d6cf7df757b9a8c4cfa4193d268176d0f1f7fbecdda6fe722885c7fda681f480f3741d8a2d26854736f05367
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-syntax-class-properties@npm:^7.12.13":
-  version: 7.12.13
-  resolution: "@babel/plugin-syntax-class-properties@npm:7.12.13"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.12.13
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 24f34b196d6342f28d4bad303612d7ff566ab0a013ce89e775d98d6f832969462e7235f3e7eaf17678a533d4be0ba45d3ae34ab4e5a9dcbda5d98d49e5efa2fc
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-syntax-class-static-block@npm:^7.12.13, @babel/plugin-syntax-class-static-block@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-syntax-class-static-block@npm:7.14.5"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 3e80814b5b6d4fe17826093918680a351c2d34398a914ce6e55d8083d72a9bdde4fbaf6a2dcea0e23a03de26dc2917ae3efd603d27099e2b98380345703bf948
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-syntax-decorators@npm:^7.16.0":
-  version: 7.16.0
-  resolution: "@babel/plugin-syntax-decorators@npm:7.16.0"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: afee8cc796f4e8e7ab407420f25d6241932a988036d9b49db289f5e71346e8e7e93157d3c0305f3d95acf4c901cfd6d2ad2d951701e208457788427dc38319c2
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-syntax-decorators@npm:^7.16.7":
-  version: 7.19.0
-  resolution: "@babel/plugin-syntax-decorators@npm:7.19.0"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.19.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 105a13d581a8643ba145d4d0d31f34a492b352defa5b155e785702da6ce9c3ff0c1843ba9bee176e35f6e38afa19dc7bd12c120220af0495de4b128f1dd27f6e
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-syntax-decorators@npm:^7.17.12":
-  version: 7.17.12
-  resolution: "@babel/plugin-syntax-decorators@npm:7.17.12"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.17.12
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: cdbb7f92e43a85291845e38910aa1bed0c3e489ae2da187b2e9604d1f2769f72b712a5a8b5e45223c7f5856927557bc314e86f7f1832a47405fdf5e492baa164
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-syntax-dynamic-import@npm:^7.8.3":
-  version: 7.8.3
-  resolution: "@babel/plugin-syntax-dynamic-import@npm:7.8.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.8.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: ce307af83cf433d4ec42932329fad25fa73138ab39c7436882ea28742e1c0066626d224e0ad2988724c82644e41601cef607b36194f695cb78a1fcdc959637bd
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-syntax-export-namespace-from@npm:^7.8.3":
-  version: 7.8.3
-  resolution: "@babel/plugin-syntax-export-namespace-from@npm:7.8.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.8.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 85740478be5b0de185228e7814451d74ab8ce0a26fcca7613955262a26e99e8e15e9da58f60c754b84515d4c679b590dbd3f2148f0f58025f4ae706f1c5a5d4a
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-syntax-import-assertions@npm:^7.17.12":
-  version: 7.17.12
-  resolution: "@babel/plugin-syntax-import-assertions@npm:7.17.12"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.17.12
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: fef25c3247d18dc7b8e432ed07f4afb92d70113fcfc3db0ca52388f8083b4bd60f88fe9ec0085e8a5a6daf18a619042376e76e2b4bd9470cddb7362cd268bea5
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-syntax-json-strings@npm:^7.8.3":
-  version: 7.8.3
-  resolution: "@babel/plugin-syntax-json-strings@npm:7.8.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.8.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: bf5aea1f3188c9a507e16efe030efb996853ca3cadd6512c51db7233cc58f3ac89ff8c6bdfb01d30843b161cfe7d321e1bf28da82f7ab8d7e6bc5464666f354a
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-syntax-logical-assignment-operators@npm:^7.10.4":
-  version: 7.10.4
-  resolution: "@babel/plugin-syntax-logical-assignment-operators@npm:7.10.4"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.10.4
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: aff33577037e34e515911255cdbb1fd39efee33658aa00b8a5fd3a4b903585112d037cce1cc9e4632f0487dc554486106b79ccd5ea63a2e00df4363f6d4ff886
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-syntax-nullish-coalescing-operator@npm:^7.8.3":
-  version: 7.8.3
-  resolution: "@babel/plugin-syntax-nullish-coalescing-operator@npm:7.8.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.8.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 87aca4918916020d1fedba54c0e232de408df2644a425d153be368313fdde40d96088feed6c4e5ab72aac89be5d07fef2ddf329a15109c5eb65df006bf2580d1
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-syntax-numeric-separator@npm:^7.10.4":
-  version: 7.10.4
-  resolution: "@babel/plugin-syntax-numeric-separator@npm:7.10.4"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.10.4
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 01ec5547bd0497f76cc903ff4d6b02abc8c05f301c88d2622b6d834e33a5651aa7c7a3d80d8d57656a4588f7276eba357f6b7e006482f5b564b7a6488de493a1
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-syntax-object-rest-spread@npm:^7.8.3":
-  version: 7.8.3
-  resolution: "@babel/plugin-syntax-object-rest-spread@npm:7.8.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.8.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: fddcf581a57f77e80eb6b981b10658421bc321ba5f0a5b754118c6a92a5448f12a0c336f77b8abf734841e102e5126d69110a306eadb03ca3e1547cab31f5cbf
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-syntax-optional-catch-binding@npm:^7.8.3":
-  version: 7.8.3
-  resolution: "@babel/plugin-syntax-optional-catch-binding@npm:7.8.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.8.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 910d90e72bc90ea1ce698e89c1027fed8845212d5ab588e35ef91f13b93143845f94e2539d831dc8d8ededc14ec02f04f7bd6a8179edd43a326c784e7ed7f0b9
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-syntax-optional-chaining@npm:^7.8.3":
-  version: 7.8.3
-  resolution: "@babel/plugin-syntax-optional-chaining@npm:7.8.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.8.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: eef94d53a1453361553c1f98b68d17782861a04a392840341bc91780838dd4e695209c783631cf0de14c635758beafb6a3a65399846ffa4386bff90639347f30
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-syntax-private-property-in-object@npm:^7.14.0, @babel/plugin-syntax-private-property-in-object@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-syntax-private-property-in-object@npm:7.14.5"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: b317174783e6e96029b743ccff2a67d63d38756876e7e5d0ba53a322e38d9ca452c13354a57de1ad476b4c066dbae699e0ca157441da611117a47af88985ecda
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-syntax-top-level-await@npm:^7.12.13, @babel/plugin-syntax-top-level-await@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-syntax-top-level-await@npm:7.14.5"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: bbd1a56b095be7820029b209677b194db9b1d26691fe999856462e66b25b281f031f3dfd91b1619e9dcf95bebe336211833b854d0fb8780d618e35667c2d0d7e
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-syntax-typescript@npm:^7.16.0, @babel/plugin-syntax-typescript@npm:^7.8.3":
-  version: 7.16.0
-  resolution: "@babel/plugin-syntax-typescript@npm:7.16.0"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 2da3bdd031230e515615fe39c50d40064d04f64f1d2b60113adff2c112a27e4f9425425e604297d5c2af2b635e7980f3677e434dfeb1d7320ad2cd1ffc8e8c2a
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-syntax-typescript@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-syntax-typescript@npm:7.18.6"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.18.6
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 2cde73725ec51118ebf410bf02d78781c03fa4d3185993fcc9d253b97443381b621c44810084c5dd68b92eb8bdfae0e5b163e91b32bebbb33852383d1815c05d
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-syntax-typescript@npm:^7.2.0":
-  version: 7.12.13
-  resolution: "@babel/plugin-syntax-typescript@npm:7.12.13"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.12.13
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 3bd08315a82c6cd292e95087f4e9635a92a593112f9bd9e5581dd555d8fa102b4871ece7c54d9fa89f9b0cbd6b2829c7118eaa6fb9a09a3c8edb96868446013f
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-arrow-functions@npm:^7.13.0":
-  version: 7.16.0
-  resolution: "@babel/plugin-transform-arrow-functions@npm:7.16.0"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: ff647300424968d1cd6c6b015fd72d332042a94c7b08f3e785f32d22364bfad49258a41c53675de08573af98da1a623efa03da13a653f06988f79a9d571f7030
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-arrow-functions@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/plugin-transform-arrow-functions@npm:7.16.7"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.16.7
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 2a6aa982c6fc80f4de7ccd973507ce5464fab129987cb6661136a7b9b6a020c2b329b912cbc46a68d39b5a18451ba833dcc8d1ca8d615597fec98624ac2add54
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-arrow-functions@npm:^7.17.12":
-  version: 7.17.12
-  resolution: "@babel/plugin-transform-arrow-functions@npm:7.17.12"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.17.12
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 48f99e74f523641696d5d9fb3f5f02497eca2e97bc0e9b8230a47f388e37dc5fd84b8b29e9f5a0c82d63403f7ba5f085a28e26939678f6e917d5c01afd884b50
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-async-to-generator@npm:^7.13.0":
-  version: 7.16.0
-  resolution: "@babel/plugin-transform-async-to-generator@npm:7.16.0"
-  dependencies:
-    "@babel/helper-module-imports": ^7.16.0
-    "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/helper-remap-async-to-generator": ^7.16.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 2ebf505f43350d246007d754577477ddb0132c4ab39c9fd420d36ebb6e489b2b3eb48f27fe58f7ad0c742946a1e81e3b150666507abab03fe6bd649ff585ed45
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-async-to-generator@npm:^7.16.8":
-  version: 7.16.8
-  resolution: "@babel/plugin-transform-async-to-generator@npm:7.16.8"
-  dependencies:
-    "@babel/helper-module-imports": ^7.16.7
-    "@babel/helper-plugin-utils": ^7.16.7
-    "@babel/helper-remap-async-to-generator": ^7.16.8
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 3a2e781800e3dea1f526324ed259d1f9064c5ea3c9909c0c22b445d4c648ad489c579f358ae20ada11f7725ba67e0ddeb1e0241efadc734771e87dabd4c6820a
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-async-to-generator@npm:^7.17.12":
-  version: 7.17.12
-  resolution: "@babel/plugin-transform-async-to-generator@npm:7.17.12"
-  dependencies:
-    "@babel/helper-module-imports": ^7.16.7
-    "@babel/helper-plugin-utils": ^7.17.12
-    "@babel/helper-remap-async-to-generator": ^7.16.8
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 052dd56eb3b10bc31f5aaced0f75fc7307713f74049ccfb91cd087bebfc890a6d462b59445c5299faaca9030814172cac290c941c76b731a38dcb267377c9187
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-block-scoped-functions@npm:^7.12.13":
-  version: 7.16.0
-  resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.16.0"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: f7efc5d8ce9242e11c94c82d9c940d4c534a751ff3679839d2f7d7a300c29ac4c4a3c26c238b5f2828201cac8a848bfb6342c285460f6ce5bc267cbdc1bb070b
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-block-scoped-functions@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.16.7"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.16.7
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 591e9f75437bb32ebf9506d28d5c9659c66c0e8e0c19b12924d808d898e68309050aadb783ccd70bb4956555067326ecfa17a402bc77eb3ece3c6863d40b9016
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-block-scoping@npm:^7.12.1":
-  version: 7.13.16
-  resolution: "@babel/plugin-transform-block-scoping@npm:7.13.16"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.13.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: f84f08c95654ca33962405c60f8109095405c3c6a8e126d09e3543675d1363a2ad4712bea1f6f878aee6a9f966dc627a8a5acd4ddf159c69a41b532ab610b324
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-block-scoping@npm:^7.13.16":
-  version: 7.16.0
-  resolution: "@babel/plugin-transform-block-scoping@npm:7.16.0"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: e5bcb9eeed7974ee6dd14c360c21ad2465f81342001e5468bbec5db483fffc78bb0e7f84155be6c32588bc0b43a6ca0050c7962400b33d134f6298c31c8073d4
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-block-scoping@npm:^7.16.0, @babel/plugin-transform-block-scoping@npm:^7.18.9":
-  version: 7.18.9
-  resolution: "@babel/plugin-transform-block-scoping@npm:7.18.9"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.18.9
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: f8064ea431eb7aa349dc5b6be87a650f912b48cd65afde917e8644f6f840d7f9d2ce4795f2aa3955aa5b23a73d4ad38abd03386ae109b4b8702b746c6d35bda3
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-block-scoping@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/plugin-transform-block-scoping@npm:7.16.7"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.16.7
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: f93b5441af573fc274655f1707aeb4f67a43e926b58f56d89cc35a27877ae0bf198648603cbc19f442579489138f93c3838905895f109aa356996dbc3ed97a68
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-block-scoping@npm:^7.17.12":
-  version: 7.18.4
-  resolution: "@babel/plugin-transform-block-scoping@npm:7.18.4"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.17.12
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 5fdc8fd2f56f43e275353123fa1cda3df475daf1e9d92c03d5aa1ae50d3a0ccabf80c6168356947d8eb8e6e29098c875bc27fda8c7d4fbca6ffc6eec5d5faa8d
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-classes@npm:^7.13.0":
-  version: 7.16.0
-  resolution: "@babel/plugin-transform-classes@npm:7.16.0"
-  dependencies:
-    "@babel/helper-annotate-as-pure": ^7.16.0
-    "@babel/helper-function-name": ^7.16.0
-    "@babel/helper-optimise-call-expression": ^7.16.0
-    "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/helper-replace-supers": ^7.16.0
-    "@babel/helper-split-export-declaration": ^7.16.0
-    globals: ^11.1.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 7db47296045761b3f35a9075b4bcce99ad5aa93714cca235961fa596983ba6cfd4d84b29fa6745e4752bd2a60ac299b0dee3231ce20061b6798ae16a147e4992
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-classes@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/plugin-transform-classes@npm:7.16.7"
-  dependencies:
-    "@babel/helper-annotate-as-pure": ^7.16.7
-    "@babel/helper-environment-visitor": ^7.16.7
-    "@babel/helper-function-name": ^7.16.7
-    "@babel/helper-optimise-call-expression": ^7.16.7
-    "@babel/helper-plugin-utils": ^7.16.7
-    "@babel/helper-replace-supers": ^7.16.7
-    "@babel/helper-split-export-declaration": ^7.16.7
-    globals: ^11.1.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 791526a1bf3c4659b94d619536e3181d3ad54887d50539066628c6e695789a3bb264dc1fbc8540169d62a222f623df54defb490c1811ae63bad1e3557d6b3bb0
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-classes@npm:^7.17.12":
-  version: 7.18.4
-  resolution: "@babel/plugin-transform-classes@npm:7.18.4"
-  dependencies:
-    "@babel/helper-annotate-as-pure": ^7.16.7
-    "@babel/helper-environment-visitor": ^7.18.2
-    "@babel/helper-function-name": ^7.17.9
-    "@babel/helper-optimise-call-expression": ^7.16.7
-    "@babel/helper-plugin-utils": ^7.17.12
-    "@babel/helper-replace-supers": ^7.18.2
-    "@babel/helper-split-export-declaration": ^7.16.7
-    globals: ^11.1.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 968711024c2ed1c08ced754243edde3a663ab40c414ca6fcad1a75f27789f3f52cc78fbafe21c6337c4c6a0dfbeddd1527caff1558ed477790b600a1e6f99cda
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-computed-properties@npm:^7.13.0":
-  version: 7.16.0
-  resolution: "@babel/plugin-transform-computed-properties@npm:7.16.0"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 0f86de419cf5daf28b01c5b2feafa426e5b0ec776290e731de3d7a6ec4ec742400e13436d67292e500ecd50e21ddab9ae34da79357a85a443d30dc94f2a4f6a3
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-computed-properties@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/plugin-transform-computed-properties@npm:7.16.7"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.16.7
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 28b17f7cfe643f45920b76dc040cab40d4e54eccf5074fba2658c484feacda9b4885b3854ffaf26292189783fdecc97211519c61831b6708fcbf739cfbcbf31c
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-computed-properties@npm:^7.17.12":
-  version: 7.17.12
-  resolution: "@babel/plugin-transform-computed-properties@npm:7.17.12"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.17.12
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 5d05418617e0967bec4818556b7febb6f8c40813e32035f0bd6b7dbd7b9d63e9ab7c7c8fd7bd05bab2a599dad58e7b69957d9559b41079d112c219bbc3649aa1
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-destructuring@npm:^7.13.17":
-  version: 7.16.0
-  resolution: "@babel/plugin-transform-destructuring@npm:7.16.0"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 0a499c9abd6b50d4da6a3c8416e3cdf305f8002fddb3bd9ddd0774ba17ab1b10134f79fe8edc495c94344e5ab387626fb0ee124d31810758968a92d573ff9034
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-destructuring@npm:^7.16.7":
-  version: 7.17.7
-  resolution: "@babel/plugin-transform-destructuring@npm:7.17.7"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.16.7
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 767ecf6640fea9a06a4859f0c34daa30ac7d146a96476caa1f77081d5b6e43699f45e14acd52682078f2b7c230ff0814312b41f61b21ca2b5f9c5a2cc93c2b58
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-destructuring@npm:^7.18.0":
-  version: 7.18.0
-  resolution: "@babel/plugin-transform-destructuring@npm:7.18.0"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.17.12
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: d85d60737c3b05c4db71bc94270e952122d360bd6ebf91b5f98cf16fb8564558b615d115354fe0ef41e2aae9c4540e6e16144284d881ecaef687693736cd2a79
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-dotall-regex@npm:^7.12.13, @babel/plugin-transform-dotall-regex@npm:^7.4.4":
-  version: 7.16.0
-  resolution: "@babel/plugin-transform-dotall-regex@npm:7.16.0"
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin": ^7.16.0
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: c1f381f0d44a1b33714a68ffd60f2b9efac1be95caf3c21192cc8233afde2fae1da268e26b3cb40764736f090793b66946574c3310cfdd4906a7e72310239ff9
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-dotall-regex@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/plugin-transform-dotall-regex@npm:7.16.7"
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin": ^7.16.7
-    "@babel/helper-plugin-utils": ^7.16.7
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 554570dddfd5bfd87ab307be520f69a3d4ed2d2db677c165971b400d4c96656d0c165b318e69f1735612dcd12e04c0ee257697dc26800e8a572ca73bc05fa0f4
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-duplicate-keys@npm:^7.12.13":
-  version: 7.16.0
-  resolution: "@babel/plugin-transform-duplicate-keys@npm:7.16.0"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 66f09487fdf737aa280c780a609bafc9a771b34b5f9a8dccf69752c22110893763f6c105062776f084ed872a55d1656b3f14e2a9c2031f3dbdf31da20d9c827b
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-duplicate-keys@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/plugin-transform-duplicate-keys@npm:7.16.7"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.16.7
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: b96f6e9f7b33a91ad0eb6b793e4da58b7a0108b58269109f391d57078d26e043b3872c95429b491894ae6400e72e44d9b744c9b112b8433c99e6969b767e30ed
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-duplicate-keys@npm:^7.17.12":
-  version: 7.17.12
-  resolution: "@babel/plugin-transform-duplicate-keys@npm:7.17.12"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.17.12
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: fb6ad550538830b0dc5b1b547734359f2d782209570e9d61fe9b84a6929af570fcc38ab579a67ee7cd6a832147db91a527f4cceb1248974f006fe815980816bb
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-exponentiation-operator@npm:^7.12.13":
-  version: 7.16.0
-  resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.16.0"
-  dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor": ^7.16.0
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 22e1d4804a5fc522744a1cc13e2c35c5d81c2e303a634822fee59829477b3748dcf897a020c3083084350ab1d3b76752157b216971157763394021e2f2184094
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-exponentiation-operator@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.16.7"
-  dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor": ^7.16.7
-    "@babel/helper-plugin-utils": ^7.16.7
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 8082c79268f5b1552292bd3abbfed838a1131747e62000146e70670707b518602e907bbe3aef0fda824a2eebe995a9d897bd2336a039c5391743df01608673b0
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-for-of@npm:^7.13.0":
-  version: 7.16.0
-  resolution: "@babel/plugin-transform-for-of@npm:7.16.0"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 504d967b30b00d3e1a2784f6a215963fc0036871f8fd6ca61e41e67cdb3319511e9148164428144469416b35b0e02c896c144402ace7cd7a6c45b0d1e8746ae6
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-for-of@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/plugin-transform-for-of@npm:7.16.7"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.16.7
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 35c9264ee4bef814818123d70afe8b2f0a85753a0a9dc7b73f93a71cadc5d7de852f1a3e300a7c69a491705805704611de1e2ccceb5686f7828d6bca2e5a7306
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-for-of@npm:^7.18.1":
-  version: 7.18.1
-  resolution: "@babel/plugin-transform-for-of@npm:7.18.1"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.17.12
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: cdc6e1f1170218cc6ac5b26b4b8f011ec5c36666101e00e0061aaa5772969b093bad5b2af8ce908c184126d5bb0c26b89dd4debb96b2375aba2e20e427a623a8
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-function-name@npm:^7.12.13":
-  version: 7.16.0
-  resolution: "@babel/plugin-transform-function-name@npm:7.16.0"
-  dependencies:
-    "@babel/helper-function-name": ^7.16.0
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 289f4fce26e8b3a81fcae752cecdb78b363eb29e400aa4dc8318484156d908ddc6dd5b274b8fbcdb80ea59a362834554c4a5d3454e974957dbd2b30c3d00ad3f
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-function-name@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/plugin-transform-function-name@npm:7.16.7"
-  dependencies:
-    "@babel/helper-compilation-targets": ^7.16.7
-    "@babel/helper-function-name": ^7.16.7
-    "@babel/helper-plugin-utils": ^7.16.7
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 4d97d0b84461cdd5d5aa2d010cdaf30f1f83a92a0dedd3686cbc7e90dc1249a70246f5bac0c1f3cd3f1dbfb03f7aac437776525a0c90cafd459776ea4fcc6bde
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-literals@npm:^7.12.13":
-  version: 7.16.0
-  resolution: "@babel/plugin-transform-literals@npm:7.16.0"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 7291771c7626a27684053ceefc4e2e3e480a6ceab9f3c8abbdd9c90fcea63f035ace397e53bfc4b7311b835f7c79449be03226affa69e2e2a96c14b6da4d5db9
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-literals@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/plugin-transform-literals@npm:7.16.7"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.16.7
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: a9565d999fc7a72a391ef843cf66028c38ca858537c7014d9ea8ea587a59e5f952d9754bdcca6ca0446e84653e297d417d4faedccb9e4221af1aa30f25d918e0
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-literals@npm:^7.17.12":
-  version: 7.17.12
-  resolution: "@babel/plugin-transform-literals@npm:7.17.12"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.17.12
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 09280fc1ed23b81deafd4fcd7a35d6c0944668de2317f14c1b8b78c5c201f71a063bb8d174d2fc97d86df480ff23104c8919d3aacf19f33c2b5ada584203bf1c
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-member-expression-literals@npm:^7.12.13":
-  version: 7.16.0
-  resolution: "@babel/plugin-transform-member-expression-literals@npm:7.16.0"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: d5ed6cf840b9fd8b88f719dea46dc26a1778f10aeab6878b3eabf2350cfa813bfeff09d91c6afc93dd3536a48bc892a0afcf9f99f3bad6b54b41638f3ae80fa9
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-member-expression-literals@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/plugin-transform-member-expression-literals@npm:7.16.7"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.16.7
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: fdf5b22abab2b770e69348ce7f99796c3e0e1e7ce266afdbe995924284704930fa989323bdbda7070db8adb45a72f39eaa1dbebf18b67fc44035ec00c6ae3300
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-modules-amd@npm:^7.13.0, @babel/plugin-transform-modules-amd@npm:^7.14.0":
-  version: 7.16.0
-  resolution: "@babel/plugin-transform-modules-amd@npm:7.16.0"
-  dependencies:
-    "@babel/helper-module-transforms": ^7.16.0
-    "@babel/helper-plugin-utils": ^7.14.5
-    babel-plugin-dynamic-import-node: ^2.3.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: c37ccb8cd7a301123fb5590712d957bf9f82bb0d89a83441b570a9f9793af76b99449c93f1079ad187fb598a5eeb5571561ff4d71af9192c7d6e407a464d6aff
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-modules-amd@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/plugin-transform-modules-amd@npm:7.16.7"
-  dependencies:
-    "@babel/helper-module-transforms": ^7.16.7
-    "@babel/helper-plugin-utils": ^7.16.7
-    babel-plugin-dynamic-import-node: ^2.3.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 9ac251ee96183b10cf9b4ec8f9e8d52e14ec186a56103f6c07d0c69e99faa60391f6bac67da733412975e487bd36adb403e2fc99bae6b785bf1413e9d928bc71
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-modules-amd@npm:^7.18.0":
-  version: 7.18.0
-  resolution: "@babel/plugin-transform-modules-amd@npm:7.18.0"
-  dependencies:
-    "@babel/helper-module-transforms": ^7.18.0
-    "@babel/helper-plugin-utils": ^7.17.12
-    babel-plugin-dynamic-import-node: ^2.3.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: bed3ff5cd81f236981360fc4a6fd2262685c1202772c657ce3ab95b7930437f8fa22361021b481c977b6f47988dfcc07c7782a1c91b90d3a5552c91401f4631a
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-modules-commonjs@npm:^7.14.0":
-  version: 7.16.0
-  resolution: "@babel/plugin-transform-modules-commonjs@npm:7.16.0"
-  dependencies:
-    "@babel/helper-module-transforms": ^7.16.0
-    "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/helper-simple-access": ^7.16.0
-    babel-plugin-dynamic-import-node: ^2.3.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: a7e43670f503b31d6ad42977ddefb7bffc23f700a24252859652aa03efd666698567b0817060dd6f84a6cd23e7aac7464bc0dc7f7f929cad212263abcac9d470
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-modules-commonjs@npm:^7.16.8":
-  version: 7.17.7
-  resolution: "@babel/plugin-transform-modules-commonjs@npm:7.17.7"
-  dependencies:
-    "@babel/helper-module-transforms": ^7.17.7
-    "@babel/helper-plugin-utils": ^7.16.7
-    "@babel/helper-simple-access": ^7.17.7
-    babel-plugin-dynamic-import-node: ^2.3.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: d84385d89465f8241cbeed8069dc54fb15ee0465119a3326c65ee93ce93019b7a9953b23e22a67203aa2ebf81ac444eadf6d37912d453ec7ba2dce9872bb6490
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-modules-commonjs@npm:^7.18.2":
-  version: 7.18.2
-  resolution: "@babel/plugin-transform-modules-commonjs@npm:7.18.2"
-  dependencies:
-    "@babel/helper-module-transforms": ^7.18.0
-    "@babel/helper-plugin-utils": ^7.17.12
-    "@babel/helper-simple-access": ^7.18.2
-    babel-plugin-dynamic-import-node: ^2.3.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 99c1c5ce9c353e29eb680ebb5bdf27c076c6403e133a066999298de642423cc7f38cfbac02372d33ed73278da13be23c4be7d60169c3e27bd900a373e61a599a
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-modules-systemjs@npm:^7.13.8":
-  version: 7.16.0
-  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.16.0"
-  dependencies:
-    "@babel/helper-hoist-variables": ^7.16.0
-    "@babel/helper-module-transforms": ^7.16.0
-    "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/helper-validator-identifier": ^7.15.7
-    babel-plugin-dynamic-import-node: ^2.3.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 4aa9bd45a4c1f79a4abd92482b4f9ac6492b5e727ee34316c80a30b6524281d39959a2d556b231eae4b1031f35e0133e60270f9e4bfa5f25a8cb68ef145dfcd2
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-modules-systemjs@npm:^7.16.7":
-  version: 7.17.8
-  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.17.8"
-  dependencies:
-    "@babel/helper-hoist-variables": ^7.16.7
-    "@babel/helper-module-transforms": ^7.17.7
-    "@babel/helper-plugin-utils": ^7.16.7
-    "@babel/helper-validator-identifier": ^7.16.7
-    babel-plugin-dynamic-import-node: ^2.3.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 058c0e7987aab64c4019bc9eab3f80c5dd05bec737e230e5c60e9222dfb3d01b2dfa3aa1db6cbb75a4095c40af3bba2e3a60170b1570a158d3e781376569ce49
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-modules-systemjs@npm:^7.18.0":
-  version: 7.18.4
-  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.18.4"
-  dependencies:
-    "@babel/helper-hoist-variables": ^7.16.7
-    "@babel/helper-module-transforms": ^7.18.0
-    "@babel/helper-plugin-utils": ^7.17.12
-    "@babel/helper-validator-identifier": ^7.16.7
-    babel-plugin-dynamic-import-node: ^2.3.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: abe6948a1548b20055bf1c56ceab5b17dc283e7cdbcc0525b297b726f0785f1169333b5e685add81337fc749588adb8d96ccba9269565031db006a710e7eaf02
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-modules-umd@npm:^7.14.0":
-  version: 7.16.0
-  resolution: "@babel/plugin-transform-modules-umd@npm:7.16.0"
-  dependencies:
-    "@babel/helper-module-transforms": ^7.16.0
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: b07d41eae3a1163fdb2dca4bffb0de880981e6581163948a88b7665709e860612932f5a73e54d70057e834d3968e3b5f86222f1d302c9e1d34d95a764584af54
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-modules-umd@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/plugin-transform-modules-umd@npm:7.16.7"
-  dependencies:
-    "@babel/helper-module-transforms": ^7.16.7
-    "@babel/helper-plugin-utils": ^7.16.7
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: d1433f8b0e0b3c9f892aa530f08fe3ba653a5e51fe1ed6034ac7d45d4d6f22c3ba99186b72e41ad9ce5d8dcf964104c3da2419f15fcdcf5ba05c5fda3ea2cefc
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-modules-umd@npm:^7.18.0":
-  version: 7.18.0
-  resolution: "@babel/plugin-transform-modules-umd@npm:7.18.0"
-  dependencies:
-    "@babel/helper-module-transforms": ^7.18.0
-    "@babel/helper-plugin-utils": ^7.17.12
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 4081a79cfd4c6fda785c2137f9f2721e35c06a9d2f23c304172838d12e9317a24d3cb5b652a9db61e58319b370c57b1b44991429efe709679f98e114d98597fb
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-named-capturing-groups-regex@npm:^7.12.13":
-  version: 7.16.0
-  resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.16.0"
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin": ^7.16.0
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: 758a87aca66ea7944c5f94ed7a798220c3b2986da4c38dc3f63221065ec96534bf39b3b043dd9759dbdff4026d340bbe51082d5ad4505c19b08893663130675b
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-named-capturing-groups-regex@npm:^7.16.8":
-  version: 7.16.8
-  resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.16.8"
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin": ^7.16.7
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: 73e149f5ff690f5b8e3764a881e8e5240f12f394256e7d5217705d0cbeae074c3faff394783190fe1a41f9fc5a53b960b6021158b7e5174391b5fc38f4ba047a
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-named-capturing-groups-regex@npm:^7.17.12":
-  version: 7.17.12
-  resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.17.12"
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin": ^7.17.12
-    "@babel/helper-plugin-utils": ^7.17.12
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: cff9d91d0abd87871da6574583e79093ed75d5faecea45b6a13350ba243b1a595d349a6e7d906f5dfdf6c69c643cba9df662c3d01eaa187c5b1a01cb5838e848
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-new-target@npm:^7.12.13":
-  version: 7.16.0
-  resolution: "@babel/plugin-transform-new-target@npm:7.16.0"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: c741ba3e84c182f1af3174cb7f00c4e434080ff882e72c7b2743d1d636eebcf12c865772be051a323c823bd4ebdfbae19cb78e95218d6b14c338f27a64608e31
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-new-target@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/plugin-transform-new-target@npm:7.16.7"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.16.7
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 7410c3e68abc835f87a98d40269e65fb1a05c131decbb6721a80ed49a01bd0c53abb6b8f7f52d5055815509022790e1accca32e975c02f2231ac3cf13d8af768
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-new-target@npm:^7.17.12":
-  version: 7.17.12
-  resolution: "@babel/plugin-transform-new-target@npm:7.17.12"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.17.12
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: bec26350fa49c9a9431d23b4ff234f8eb60554b8cdffca432a94038406aae5701014f343568c0e0cc8afae6f95d492f6bae0d0e2c101c1a484fb20eec75b2c07
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-object-super@npm:^7.12.13":
-  version: 7.16.0
-  resolution: "@babel/plugin-transform-object-super@npm:7.16.0"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/helper-replace-supers": ^7.16.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: b6ed0a8f5a1231b4dadb5edb2cef8fba7957cbad943c0018002719d066fda93b805da961e42b38d625e43e7c79f5c07d5719d6d63f9cf178501882a4aa5d30da
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-object-super@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/plugin-transform-object-super@npm:7.16.7"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.16.7
-    "@babel/helper-replace-supers": ^7.16.7
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 46e3c879f4a93e904f2ecf83233d40c48c832bdbd82a67cab1f432db9aa51702e40d9e51e5800613e12299974f90f4ed3869e1273dbca8642984266320c5f341
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-parameters@npm:^7.13.0, @babel/plugin-transform-parameters@npm:^7.16.0":
-  version: 7.16.3
-  resolution: "@babel/plugin-transform-parameters@npm:7.16.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 7c0154fa66f03f69f6767adc01e72ef00d50cae8eb87c65506adccccc1cf776730ecbb96a5de0127910554cc0e86e375bc437fa085f619783d368936736a4f58
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-parameters@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/plugin-transform-parameters@npm:7.16.7"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.16.7
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 4d6904376db82d0b35f0a6cce08f630daf8608d94e903d6c7aff5bd742b251651bd1f88cdf9f16cad98aba5fc7c61da8635199364865fad6367d5ae37cf56cc1
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-parameters@npm:^7.17.12":
-  version: 7.17.12
-  resolution: "@babel/plugin-transform-parameters@npm:7.17.12"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.17.12
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: d9ed5ec61dc460835bade8fa710b42ec9f207bd448ead7e8abd46b87db0afedbb3f51284700fd2a6892fdf6544ec9b949c505c6542c5ba0a41ca4e8749af00f0
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-property-literals@npm:^7.12.13":
-  version: 7.16.0
-  resolution: "@babel/plugin-transform-property-literals@npm:7.16.0"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: e9eb9355db4cf18dc82879174fc2de6590521afea04f1c80c5805d3f759bfa25946bcac1095b5fe0e4ad3f5eb330cd7e308467626a0212f07b9f41b9f00affa8
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-property-literals@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/plugin-transform-property-literals@npm:7.16.7"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.16.7
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: b5674458991a9b0e8738989d70faa88c7f98ed3df923c119f1225069eed72fe5e0ce947b1adc91e378f5822fbdeb7a672f496fd1c75c4babcc88169e3a7c3229
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-regenerator@npm:^7.13.15":
-  version: 7.16.0
-  resolution: "@babel/plugin-transform-regenerator@npm:7.16.0"
-  dependencies:
-    regenerator-transform: ^0.14.2
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 32b1b43f8d55d9e78e87bbc6a19b0bb0ff968220e215e9a3984c0de140048c54c62cf46889bee16f987221eab112909318de391426df33cdbe3fd710480068f7
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-regenerator@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/plugin-transform-regenerator@npm:7.16.7"
-  dependencies:
-    regenerator-transform: ^0.14.2
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 12b1f9a4f324027af69f49522fbe7feea2ac53285ca5c7e27a70de09f56c74938bfda8b09ac06e57fa1207e441f00efb7adbc462afc9be5e8abd0c2a07715e01
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-regenerator@npm:^7.18.0":
-  version: 7.18.0
-  resolution: "@babel/plugin-transform-regenerator@npm:7.18.0"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.17.12
-    regenerator-transform: ^0.15.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: ebacf2bbe9e2fb6f2bd7996e19b41bfc9848628950ae06a1a832802a0b8e32a32003c6b89318da6ca521f79045c91324dcb4c97247ed56f86fa58d7401a7316f
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-reserved-words@npm:^7.12.13":
-  version: 7.16.0
-  resolution: "@babel/plugin-transform-reserved-words@npm:7.16.0"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 7a8288cfe2375e43579d3786d5f6654b36d8344b1be3df4fbafe81ae49bf634f85f68fe5a1a280f56aa7d626deaaa6ba89e586422b3d8b13f7d4b0e0617362d6
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-reserved-words@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/plugin-transform-reserved-words@npm:7.16.7"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.16.7
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 00218a646e99a97c1f10b77c41c178ca1b91d0e6cf18dd4ca3c59b8a5ad721db04ef508f49be4cd0dcca7742490dbb145307b706a2dbea1917d5e5f7ba2f31b7
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-reserved-words@npm:^7.17.12":
-  version: 7.17.12
-  resolution: "@babel/plugin-transform-reserved-words@npm:7.17.12"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.17.12
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: d8a617cb79ca5852ac2736a9f81c15a3b0760919720c3b9069a864e2288006ebcaab557dbb36a3eba936defd6699f82e3bf894915925aa9185f5d9bcbf3b29fd
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-runtime@npm:^7.12.1":
-  version: 7.13.15
-  resolution: "@babel/plugin-transform-runtime@npm:7.13.15"
-  dependencies:
-    "@babel/helper-module-imports": ^7.13.12
-    "@babel/helper-plugin-utils": ^7.13.0
-    babel-plugin-polyfill-corejs2: ^0.2.0
-    babel-plugin-polyfill-corejs3: ^0.2.0
-    babel-plugin-polyfill-regenerator: ^0.2.0
-    semver: ^6.3.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: d52bda711815a82674e390b8ef4887dbf8116eb66eca3c23b3ae4b3ed37022a09b80aed86b44d2a3399b281d8ca341329293e12d6f4aea9991459434537131ba
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-runtime@npm:^7.13.9":
-  version: 7.16.4
-  resolution: "@babel/plugin-transform-runtime@npm:7.16.4"
-  dependencies:
-    "@babel/helper-module-imports": ^7.16.0
-    "@babel/helper-plugin-utils": ^7.14.5
-    babel-plugin-polyfill-corejs2: ^0.3.0
-    babel-plugin-polyfill-corejs3: ^0.4.0
-    babel-plugin-polyfill-regenerator: ^0.3.0
-    semver: ^6.3.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 3586fb1035a8233162c0dfb28f3466c3129b430bd351d7271894dc7dc29956cc2e6e348f5e21ae91f8b59ceddce02b32140e4bb629fdbbacad2ab04f6cec2ff5
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-shorthand-properties@npm:^7.12.13":
-  version: 7.16.0
-  resolution: "@babel/plugin-transform-shorthand-properties@npm:7.16.0"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 7ae0f218aaccd2f7e8b0027c558fbbc291f7df7c83749826075776de780d1ac421f9056c760c5eb2e486b7b1983a41cd8dc00589504904b833c810fdb80b3868
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-shorthand-properties@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/plugin-transform-shorthand-properties@npm:7.16.7"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.16.7
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: ca381ecf8f48696512172deca40af46b1f64e3497186fdc2c9009286d8f06b468c4d61cdc392dc8b0c165298117dda67be9e2ff0e99d7691b0503f1240d4c62b
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-spread@npm:^7.13.0":
-  version: 7.16.0
-  resolution: "@babel/plugin-transform-spread@npm:7.16.0"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/helper-skip-transparent-expression-wrappers": ^7.16.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: c295ef5e329fc31bd78e0aac3d6d848475a26e40cffff207dfd450416a25478bedb03402a0cc569bc5b7d3e92c22bff8a7cf76f1a9d896070e3cdeae1aee0316
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-spread@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/plugin-transform-spread@npm:7.16.7"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.16.7
-    "@babel/helper-skip-transparent-expression-wrappers": ^7.16.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 6e961af1a70586bb72dd85e8296cee857c5dadd73225fccd0fe261c0d98652a82d69c65f3e9dc31ce019a12e9677262678479b96bd2d9140ddf6514618362828
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-spread@npm:^7.17.12":
-  version: 7.17.12
-  resolution: "@babel/plugin-transform-spread@npm:7.17.12"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.17.12
-    "@babel/helper-skip-transparent-expression-wrappers": ^7.16.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 3a95e4f163d598c0efc9d983e5ce3e8716998dd2af62af8102b11cb8d6383c71b74c7106adbce73cda6e48d3d3e927627847d36d76c2eb688cd0e2e07f67fb51
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-sticky-regex@npm:^7.12.13":
-  version: 7.16.0
-  resolution: "@babel/plugin-transform-sticky-regex@npm:7.16.0"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 80c7ccb797e4d31f112ace4614e8259ad0707eab3ed1c5a900ac0799dc23fded8bad57142ceb29222d6f0645f7b0d6a74fa133c945b8611d5db137b13ee68882
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-sticky-regex@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/plugin-transform-sticky-regex@npm:7.16.7"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.16.7
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: d59e20121ff0a483e29364eff8bb42cd8a0b7a3158141eea5b6f219227e5b873ea70f317f65037c0f557887a692ac993b72f99641a37ea6ec0ae8000bfab1343
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-template-literals@npm:^7.13.0":
-  version: 7.16.0
-  resolution: "@babel/plugin-transform-template-literals@npm:7.16.0"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 230638ee56bbe8c4237d2c3366d700eca1f66f93c37935f6d775f699c5d2593e3f176e81010cfb2d46f89e340c6c042649263c3b913ce269182fadfb4db01369
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-template-literals@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/plugin-transform-template-literals@npm:7.16.7"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.16.7
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: b55a519dd8b957247ebad3cab21918af5adca4f6e6c87819501cfe3d4d4bccda25bc296c7dfc8a30909b4ad905902aeb9d55ad955cb9f5cbc74b42dab32baa18
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-template-literals@npm:^7.18.2":
-  version: 7.18.2
-  resolution: "@babel/plugin-transform-template-literals@npm:7.18.2"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.17.12
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: bc0102ed8c789e5bc01053088e2de85b82cebcd4d57af9fdc32ca62f559d3dd19c33e9d26caa71c5fd8e94152e5ce4fc4da19badc2d537620e6dea83bce7eb05
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-typeof-symbol@npm:^7.12.13":
-  version: 7.16.0
-  resolution: "@babel/plugin-transform-typeof-symbol@npm:7.16.0"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 60e91d57b3e5a5ca02cebbf9f6dacd06e8a3b7c92c54fd60616f01ac1c79b3ec5fd2e8c5fa5c86ffcd9da6fa811e6de8dc7602cf1e05da17def0ea06f1e8548e
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-typeof-symbol@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/plugin-transform-typeof-symbol@npm:7.16.7"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.16.7
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 739a8c439dacbd9af62cfbfa0a7cbc3f220849e5fc774e5ef708a09186689a724c41a1d11323e7d36588d24f5481c8b702c86ff7be8da2e2fed69bed0175f625
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-typeof-symbol@npm:^7.17.12":
-  version: 7.17.12
-  resolution: "@babel/plugin-transform-typeof-symbol@npm:7.17.12"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.17.12
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: e30bd03c8abc1b095f8b2a10289df6850e3bc3cd0aea1cbc29050aa3b421cbb77d0428b0cd012333632a7a930dc8301cd888e762b2dd601e7dc5dac50f4140c9
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-typescript@npm:^7.13.0":
-  version: 7.16.1
-  resolution: "@babel/plugin-transform-typescript@npm:7.16.1"
-  dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.16.0
-    "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/plugin-syntax-typescript": ^7.16.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 1b1efe62e8de828d52b996429718663705cbefb9a7382d2849725b6318051fcbe9671e9e8f761a94fddf46ea159810c97d1b6282c644f69c98ebf5d4d2687ef6
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-typescript@npm:^7.16.8":
-  version: 7.19.0
-  resolution: "@babel/plugin-transform-typescript@npm:7.19.0"
-  dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.19.0
-    "@babel/helper-plugin-utils": ^7.19.0
-    "@babel/plugin-syntax-typescript": ^7.18.6
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: d5ed076c1cd7a41efe0da7d9afdcb6281db574b4307243b9f0f96ae255d9efdca47b4aeed5c306d1ad296e683498965c01ecaa147217559e01eceadc350ca4c2
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-typescript@npm:~7.4.0":
-  version: 7.4.5
-  resolution: "@babel/plugin-transform-typescript@npm:7.4.5"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.0.0
-    "@babel/plugin-syntax-typescript": ^7.2.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 2c3aadfba8db8726a1e0c5341578e65ab8a2d46c79844509ccc74bff1c8eaa4943e94f458e4f006a7d21a2ea93025ae3629bdeb9858c7b53967b9f7aee154543
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-typescript@npm:~7.5.0":
-  version: 7.5.5
-  resolution: "@babel/plugin-transform-typescript@npm:7.5.5"
-  dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.5.5
-    "@babel/helper-plugin-utils": ^7.0.0
-    "@babel/plugin-syntax-typescript": ^7.2.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: a7a60f461e41db07dd04728c18b1ee9d5ba889f3666f8e209437b4007c2c02fe556ea03c70550077206ca3ac3f70f8da76d0f6a62eed1a9466249a5a1a316a81
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-typescript@npm:~7.8.0":
-  version: 7.8.7
-  resolution: "@babel/plugin-transform-typescript@npm:7.8.7"
-  dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.8.3
-    "@babel/helper-plugin-utils": ^7.8.3
-    "@babel/plugin-syntax-typescript": ^7.8.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: a6a0a85e79acd154573fddaa589da053109f334413c2bcc2fcac03b77385c174070b0ddcbe4d3086676b4ad7a9e4fb3ea27a499635e9472e244ccbef43d1ea08
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-unicode-escapes@npm:^7.12.13":
-  version: 7.16.0
-  resolution: "@babel/plugin-transform-unicode-escapes@npm:7.16.0"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 63ac80d6b7592a7a038cde0b7b8fd7fc8f478de107543fb20c0ee47e00c5cd4c12be936501f55e2fd9370056603d9c4e4c57cdf335674837475865f80b4ae734
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-unicode-escapes@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/plugin-transform-unicode-escapes@npm:7.16.7"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.16.7
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: d10c3b5baa697ca2d9ecce2fd7705014d7e1ddd86ed684ccec378f7ad4d609ab970b5546d6cdbe242089ecfc7a79009d248cf4f8ee87d629485acfb20c0d9160
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-unicode-regex@npm:^7.12.13":
-  version: 7.16.0
-  resolution: "@babel/plugin-transform-unicode-regex@npm:7.16.0"
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin": ^7.16.0
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 61e498425fb44951067e1d17cd66e97777a340118c06943cee9d1032a8bfec661f262738a9b2a00a498b0ad5ba56551ea81e76f0d6afe46c0301abc3a86bee22
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-unicode-regex@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/plugin-transform-unicode-regex@npm:7.16.7"
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin": ^7.16.7
-    "@babel/helper-plugin-utils": ^7.16.7
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: ef7721cfb11b269809555b1c392732566c49f6ced58e0e990c0e81e58a934bbab3072dcbe92d3a20d60e3e41036ecf987bcc63a7cde90711a350ad774667e5e6
-  languageName: node
-  linkType: hard
-
-"@babel/polyfill@npm:^7.11.5":
-  version: 7.12.1
-  resolution: "@babel/polyfill@npm:7.12.1"
-  dependencies:
-    core-js: ^2.6.5
-    regenerator-runtime: ^0.13.4
-  checksum: 3f59a9d85a41b390b044a1be13e11ae6d8efbfcf4e07217964585c7cef337b828eecfc5e164083227189146d2b6efc1affae8f59c831438eb40b848ab6fe5f39
-  languageName: node
-  linkType: hard
-
-"@babel/preset-env@npm:^7.10.2":
-  version: 7.14.0
-  resolution: "@babel/preset-env@npm:7.14.0"
-  dependencies:
-    "@babel/compat-data": ^7.14.0
-    "@babel/helper-compilation-targets": ^7.13.16
-    "@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.15
-    "@babel/plugin-proposal-class-properties": ^7.13.0
-    "@babel/plugin-proposal-class-static-block": ^7.13.11
-    "@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-private-property-in-object": ^7.14.0
-    "@babel/plugin-proposal-unicode-property-regex": ^7.12.13
-    "@babel/plugin-syntax-async-generators": ^7.8.4
-    "@babel/plugin-syntax-class-properties": ^7.12.13
-    "@babel/plugin-syntax-class-static-block": ^7.12.13
-    "@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
-    "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4
-    "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.3
-    "@babel/plugin-syntax-numeric-separator": ^7.10.4
-    "@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-private-property-in-object": ^7.14.0
-    "@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.13.16
-    "@babel/plugin-transform-classes": ^7.13.0
-    "@babel/plugin-transform-computed-properties": ^7.13.0
-    "@babel/plugin-transform-destructuring": ^7.13.17
-    "@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.14.0
-    "@babel/plugin-transform-modules-commonjs": ^7.14.0
-    "@babel/plugin-transform-modules-systemjs": ^7.13.8
-    "@babel/plugin-transform-modules-umd": ^7.14.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.13.15
-    "@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/preset-modules": ^0.1.4
-    "@babel/types": ^7.14.0
-    babel-plugin-polyfill-corejs2: ^0.2.0
-    babel-plugin-polyfill-corejs3: ^0.2.0
-    babel-plugin-polyfill-regenerator: ^0.2.0
-    core-js-compat: ^3.9.0
-    semver: ^6.3.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: e62fa4196bed7f8fb2248b3a5309314c5411214c61e4e28a2dc00cd91fc2c83c8e5110e928e7ee55d4a5833476fe50ac4fc65b63d6e47e6bde3ca26b39b2ddbd
-  languageName: node
-  linkType: hard
-
-"@babel/preset-env@npm:^7.16.5":
-  version: 7.16.11
-  resolution: "@babel/preset-env@npm:7.16.11"
-  dependencies:
-    "@babel/compat-data": ^7.16.8
-    "@babel/helper-compilation-targets": ^7.16.7
-    "@babel/helper-plugin-utils": ^7.16.7
-    "@babel/helper-validator-option": ^7.16.7
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": ^7.16.7
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": ^7.16.7
-    "@babel/plugin-proposal-async-generator-functions": ^7.16.8
-    "@babel/plugin-proposal-class-properties": ^7.16.7
-    "@babel/plugin-proposal-class-static-block": ^7.16.7
-    "@babel/plugin-proposal-dynamic-import": ^7.16.7
-    "@babel/plugin-proposal-export-namespace-from": ^7.16.7
-    "@babel/plugin-proposal-json-strings": ^7.16.7
-    "@babel/plugin-proposal-logical-assignment-operators": ^7.16.7
-    "@babel/plugin-proposal-nullish-coalescing-operator": ^7.16.7
-    "@babel/plugin-proposal-numeric-separator": ^7.16.7
-    "@babel/plugin-proposal-object-rest-spread": ^7.16.7
-    "@babel/plugin-proposal-optional-catch-binding": ^7.16.7
-    "@babel/plugin-proposal-optional-chaining": ^7.16.7
-    "@babel/plugin-proposal-private-methods": ^7.16.11
-    "@babel/plugin-proposal-private-property-in-object": ^7.16.7
-    "@babel/plugin-proposal-unicode-property-regex": ^7.16.7
-    "@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
-    "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4
-    "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.3
-    "@babel/plugin-syntax-numeric-separator": ^7.10.4
-    "@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-private-property-in-object": ^7.14.5
-    "@babel/plugin-syntax-top-level-await": ^7.14.5
-    "@babel/plugin-transform-arrow-functions": ^7.16.7
-    "@babel/plugin-transform-async-to-generator": ^7.16.8
-    "@babel/plugin-transform-block-scoped-functions": ^7.16.7
-    "@babel/plugin-transform-block-scoping": ^7.16.7
-    "@babel/plugin-transform-classes": ^7.16.7
-    "@babel/plugin-transform-computed-properties": ^7.16.7
-    "@babel/plugin-transform-destructuring": ^7.16.7
-    "@babel/plugin-transform-dotall-regex": ^7.16.7
-    "@babel/plugin-transform-duplicate-keys": ^7.16.7
-    "@babel/plugin-transform-exponentiation-operator": ^7.16.7
-    "@babel/plugin-transform-for-of": ^7.16.7
-    "@babel/plugin-transform-function-name": ^7.16.7
-    "@babel/plugin-transform-literals": ^7.16.7
-    "@babel/plugin-transform-member-expression-literals": ^7.16.7
-    "@babel/plugin-transform-modules-amd": ^7.16.7
-    "@babel/plugin-transform-modules-commonjs": ^7.16.8
-    "@babel/plugin-transform-modules-systemjs": ^7.16.7
-    "@babel/plugin-transform-modules-umd": ^7.16.7
-    "@babel/plugin-transform-named-capturing-groups-regex": ^7.16.8
-    "@babel/plugin-transform-new-target": ^7.16.7
-    "@babel/plugin-transform-object-super": ^7.16.7
-    "@babel/plugin-transform-parameters": ^7.16.7
-    "@babel/plugin-transform-property-literals": ^7.16.7
-    "@babel/plugin-transform-regenerator": ^7.16.7
-    "@babel/plugin-transform-reserved-words": ^7.16.7
-    "@babel/plugin-transform-shorthand-properties": ^7.16.7
-    "@babel/plugin-transform-spread": ^7.16.7
-    "@babel/plugin-transform-sticky-regex": ^7.16.7
-    "@babel/plugin-transform-template-literals": ^7.16.7
-    "@babel/plugin-transform-typeof-symbol": ^7.16.7
-    "@babel/plugin-transform-unicode-escapes": ^7.16.7
-    "@babel/plugin-transform-unicode-regex": ^7.16.7
-    "@babel/preset-modules": ^0.1.5
-    "@babel/types": ^7.16.8
-    babel-plugin-polyfill-corejs2: ^0.3.0
-    babel-plugin-polyfill-corejs3: ^0.5.0
-    babel-plugin-polyfill-regenerator: ^0.3.0
-    core-js-compat: ^3.20.2
-    semver: ^6.3.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: c8029c272073df787309d983ae458dd094b57f87152b8ccad95c7c8b1e82b042c1077e169538aae5f98b7659de0632d10708d9c85acf21a5e9406d7dd3656d8c
-  languageName: node
-  linkType: hard
-
-"@babel/preset-env@npm:^7.16.7":
-  version: 7.18.2
-  resolution: "@babel/preset-env@npm:7.18.2"
-  dependencies:
-    "@babel/compat-data": ^7.17.10
-    "@babel/helper-compilation-targets": ^7.18.2
-    "@babel/helper-plugin-utils": ^7.17.12
-    "@babel/helper-validator-option": ^7.16.7
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": ^7.17.12
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": ^7.17.12
-    "@babel/plugin-proposal-async-generator-functions": ^7.17.12
-    "@babel/plugin-proposal-class-properties": ^7.17.12
-    "@babel/plugin-proposal-class-static-block": ^7.18.0
-    "@babel/plugin-proposal-dynamic-import": ^7.16.7
-    "@babel/plugin-proposal-export-namespace-from": ^7.17.12
-    "@babel/plugin-proposal-json-strings": ^7.17.12
-    "@babel/plugin-proposal-logical-assignment-operators": ^7.17.12
-    "@babel/plugin-proposal-nullish-coalescing-operator": ^7.17.12
-    "@babel/plugin-proposal-numeric-separator": ^7.16.7
-    "@babel/plugin-proposal-object-rest-spread": ^7.18.0
-    "@babel/plugin-proposal-optional-catch-binding": ^7.16.7
-    "@babel/plugin-proposal-optional-chaining": ^7.17.12
-    "@babel/plugin-proposal-private-methods": ^7.17.12
-    "@babel/plugin-proposal-private-property-in-object": ^7.17.12
-    "@babel/plugin-proposal-unicode-property-regex": ^7.17.12
-    "@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-import-assertions": ^7.17.12
-    "@babel/plugin-syntax-json-strings": ^7.8.3
-    "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4
-    "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.3
-    "@babel/plugin-syntax-numeric-separator": ^7.10.4
-    "@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-private-property-in-object": ^7.14.5
-    "@babel/plugin-syntax-top-level-await": ^7.14.5
-    "@babel/plugin-transform-arrow-functions": ^7.17.12
-    "@babel/plugin-transform-async-to-generator": ^7.17.12
-    "@babel/plugin-transform-block-scoped-functions": ^7.16.7
-    "@babel/plugin-transform-block-scoping": ^7.17.12
-    "@babel/plugin-transform-classes": ^7.17.12
-    "@babel/plugin-transform-computed-properties": ^7.17.12
-    "@babel/plugin-transform-destructuring": ^7.18.0
-    "@babel/plugin-transform-dotall-regex": ^7.16.7
-    "@babel/plugin-transform-duplicate-keys": ^7.17.12
-    "@babel/plugin-transform-exponentiation-operator": ^7.16.7
-    "@babel/plugin-transform-for-of": ^7.18.1
-    "@babel/plugin-transform-function-name": ^7.16.7
-    "@babel/plugin-transform-literals": ^7.17.12
-    "@babel/plugin-transform-member-expression-literals": ^7.16.7
-    "@babel/plugin-transform-modules-amd": ^7.18.0
-    "@babel/plugin-transform-modules-commonjs": ^7.18.2
-    "@babel/plugin-transform-modules-systemjs": ^7.18.0
-    "@babel/plugin-transform-modules-umd": ^7.18.0
-    "@babel/plugin-transform-named-capturing-groups-regex": ^7.17.12
-    "@babel/plugin-transform-new-target": ^7.17.12
-    "@babel/plugin-transform-object-super": ^7.16.7
-    "@babel/plugin-transform-parameters": ^7.17.12
-    "@babel/plugin-transform-property-literals": ^7.16.7
-    "@babel/plugin-transform-regenerator": ^7.18.0
-    "@babel/plugin-transform-reserved-words": ^7.17.12
-    "@babel/plugin-transform-shorthand-properties": ^7.16.7
-    "@babel/plugin-transform-spread": ^7.17.12
-    "@babel/plugin-transform-sticky-regex": ^7.16.7
-    "@babel/plugin-transform-template-literals": ^7.18.2
-    "@babel/plugin-transform-typeof-symbol": ^7.17.12
-    "@babel/plugin-transform-unicode-escapes": ^7.16.7
-    "@babel/plugin-transform-unicode-regex": ^7.16.7
-    "@babel/preset-modules": ^0.1.5
-    "@babel/types": ^7.18.2
-    babel-plugin-polyfill-corejs2: ^0.3.0
-    babel-plugin-polyfill-corejs3: ^0.5.0
-    babel-plugin-polyfill-regenerator: ^0.3.0
-    core-js-compat: ^3.22.1
-    semver: ^6.3.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: f81892a7970cb34643b93917cbbc9b581d5066d892639867521f4a85ec258e69362a37bbb7b899b351e71d26095a97cd2d6e35e5f9ee110715146e0ccc19e700
-  languageName: node
-  linkType: hard
-
-"@babel/preset-modules@npm:^0.1.4, @babel/preset-modules@npm:^0.1.5":
-  version: 0.1.5
-  resolution: "@babel/preset-modules@npm:0.1.5"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.0.0
-    "@babel/plugin-proposal-unicode-property-regex": ^7.4.4
-    "@babel/plugin-transform-dotall-regex": ^7.4.4
-    "@babel/types": ^7.4.4
-    esutils: ^2.0.2
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 8430e0e9e9d520b53e22e8c4c6a5a080a12b63af6eabe559c2310b187bd62ae113f3da82ba33e9d1d0f3230930ca702843aae9dd226dec51f7d7114dc1f51c10
-  languageName: node
-  linkType: hard
-
-"@babel/runtime@npm:7.12.18":
-  version: 7.12.18
-  resolution: "@babel/runtime@npm:7.12.18"
-  dependencies:
-    regenerator-runtime: ^0.13.4
-  checksum: 0ba38dc8d478584b0b5fb15fc2b7855f9f20561917bd434a66429d55d1165199d6161bc5fb087b87254712827f63561ff5196df66701e5647d67c7d0f557569a
-  languageName: node
-  linkType: hard
-
-"@babel/runtime@npm:^7.12.5":
-  version: 7.14.0
-  resolution: "@babel/runtime@npm:7.14.0"
-  dependencies:
-    regenerator-runtime: ^0.13.4
-  checksum: 257dc2594355dd8798455f25b6f2f9a00f162b427391265752933e0e3337b3b14661d09283187d5039ae3764f723890ffe767e995c73d662f1d515bdf48e5ade
-  languageName: node
-  linkType: hard
-
-"@babel/runtime@npm:^7.14.0":
-  version: 7.19.0
-  resolution: "@babel/runtime@npm:7.19.0"
-  dependencies:
-    regenerator-runtime: ^0.13.4
-  checksum: fa69c351bb05e1db3ceb9a02fdcf620c234180af68cdda02152d3561015f6d55277265d3109815992f96d910f3db709458cae4f8df1c3def66f32e0867d82294
-  languageName: node
-  linkType: hard
-
-"@babel/runtime@npm:^7.17.8":
-  version: 7.21.0
-  resolution: "@babel/runtime@npm:7.21.0"
-  dependencies:
-    regenerator-runtime: ^0.13.11
-  checksum: 7b33e25bfa9e0e1b9e8828bb61b2d32bdd46b41b07ba7cb43319ad08efc6fda8eb89445193e67d6541814627df0ca59122c0ea795e412b99c5183a0540d338ab
-  languageName: node
-  linkType: hard
-
-"@babel/runtime@npm:^7.8.4":
-  version: 7.16.3
-  resolution: "@babel/runtime@npm:7.16.3"
-  dependencies:
-    regenerator-runtime: ^0.13.4
-  checksum: ab8ac887096d76185ddbf291d28fb976cd32473696dc497ad4905b784acbd5aa462533ad83a5c5104e10ead28c2e0e119840ee28ed8eff90dcdde9d57f916eda
-  languageName: node
-  linkType: hard
-
-"@babel/template@npm:^7.12.13, @babel/template@npm:^7.16.0":
-  version: 7.16.0
-  resolution: "@babel/template@npm:7.16.0"
-  dependencies:
-    "@babel/code-frame": ^7.16.0
-    "@babel/parser": ^7.16.0
-    "@babel/types": ^7.16.0
-  checksum: 940f105cc6a6aee638cd8cfae80b8b80811e0ddd53b6a11f3a68431ebb998564815fb26511b5d9cb4cff66ea67130ba7498555ee015375d32f5f89ceaa6662ea
-  languageName: node
-  linkType: hard
-
-"@babel/template@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/template@npm:7.16.7"
-  dependencies:
-    "@babel/code-frame": ^7.16.7
-    "@babel/parser": ^7.16.7
-    "@babel/types": ^7.16.7
-  checksum: 10cd112e89276e00f8b11b55a51c8b2f1262c318283a980f4d6cdb0286dc05734b9aaeeb9f3ad3311900b09bc913e02343fcaa9d4a4f413964aaab04eb84ac4a
-  languageName: node
-  linkType: hard
-
-"@babel/template@npm:^7.18.10":
-  version: 7.18.10
-  resolution: "@babel/template@npm:7.18.10"
-  dependencies:
-    "@babel/code-frame": ^7.18.6
-    "@babel/parser": ^7.18.10
-    "@babel/types": ^7.18.10
-  checksum: 93a6aa094af5f355a72bd55f67fa1828a046c70e46f01b1606e6118fa1802b6df535ca06be83cc5a5e834022be95c7b714f0a268b5f20af984465a71e28f1473
-  languageName: node
-  linkType: hard
-
-"@babel/traverse@npm:^7.1.6, @babel/traverse@npm:^7.12.1, @babel/traverse@npm:^7.4.5, @babel/traverse@npm:^7.7.0":
-  version: 7.14.0
-  resolution: "@babel/traverse@npm:7.14.0"
-  dependencies:
-    "@babel/code-frame": ^7.12.13
-    "@babel/generator": ^7.14.0
-    "@babel/helper-function-name": ^7.12.13
-    "@babel/helper-split-export-declaration": ^7.12.13
-    "@babel/parser": ^7.14.0
-    "@babel/types": ^7.14.0
-    debug: ^4.1.0
-    globals: ^11.1.0
-  checksum: 98cfb223facc13a67031a3619285c0d71acbc57a473b1213d2c70e53c57b390e9256a93bd05d93be4d3405ea235c4758a6cac2afcbf7e79815c6c96a913d246f
-  languageName: node
-  linkType: hard
-
-"@babel/traverse@npm:^7.13.0, @babel/traverse@npm:^7.14.0, @babel/traverse@npm:^7.16.0, @babel/traverse@npm:^7.16.3":
-  version: 7.16.3
-  resolution: "@babel/traverse@npm:7.16.3"
-  dependencies:
-    "@babel/code-frame": ^7.16.0
-    "@babel/generator": ^7.16.0
-    "@babel/helper-function-name": ^7.16.0
-    "@babel/helper-hoist-variables": ^7.16.0
-    "@babel/helper-split-export-declaration": ^7.16.0
-    "@babel/parser": ^7.16.3
-    "@babel/types": ^7.16.0
-    debug: ^4.1.0
-    globals: ^11.1.0
-  checksum: abb14857b1104c73124612954865e28f95a86eb6741f35851369b4f9eabc17e394c9aa6f21fba6ce23813592353090d409772be828717cbe5154a5e981a753c1
-  languageName: node
-  linkType: hard
-
-"@babel/traverse@npm:^7.16.7, @babel/traverse@npm:^7.16.8, @babel/traverse@npm:^7.17.3":
-  version: 7.17.3
-  resolution: "@babel/traverse@npm:7.17.3"
-  dependencies:
-    "@babel/code-frame": ^7.16.7
-    "@babel/generator": ^7.17.3
-    "@babel/helper-environment-visitor": ^7.16.7
-    "@babel/helper-function-name": ^7.16.7
-    "@babel/helper-hoist-variables": ^7.16.7
-    "@babel/helper-split-export-declaration": ^7.16.7
-    "@babel/parser": ^7.17.3
-    "@babel/types": ^7.17.0
-    debug: ^4.1.0
-    globals: ^11.1.0
-  checksum: 780d7ecf711758174989794891af08d378f81febdb8932056c0d9979524bf0298e28f8e7708a872d7781151506c28f56c85c63ea3f1f654662c2fcb8a3eb9fdc
-  languageName: node
-  linkType: hard
-
-"@babel/traverse@npm:^7.18.0, @babel/traverse@npm:^7.18.2":
-  version: 7.18.2
-  resolution: "@babel/traverse@npm:7.18.2"
-  dependencies:
-    "@babel/code-frame": ^7.16.7
-    "@babel/generator": ^7.18.2
-    "@babel/helper-environment-visitor": ^7.18.2
-    "@babel/helper-function-name": ^7.17.9
-    "@babel/helper-hoist-variables": ^7.16.7
-    "@babel/helper-split-export-declaration": ^7.16.7
-    "@babel/parser": ^7.18.0
-    "@babel/types": ^7.18.2
-    debug: ^4.1.0
-    globals: ^11.1.0
-  checksum: e21c2d550bf610406cf21ef6fbec525cb1d80b9d6d71af67552478a24ee371203cb4025b23b110ae7288a62a874ad5898daad19ad23daa95dfc8ab47a47a092f
-  languageName: node
-  linkType: hard
-
-"@babel/traverse@npm:^7.18.9, @babel/traverse@npm:^7.19.0":
-  version: 7.19.0
-  resolution: "@babel/traverse@npm:7.19.0"
-  dependencies:
-    "@babel/code-frame": ^7.18.6
-    "@babel/generator": ^7.19.0
-    "@babel/helper-environment-visitor": ^7.18.9
-    "@babel/helper-function-name": ^7.19.0
-    "@babel/helper-hoist-variables": ^7.18.6
-    "@babel/helper-split-export-declaration": ^7.18.6
-    "@babel/parser": ^7.19.0
-    "@babel/types": ^7.19.0
-    debug: ^4.1.0
-    globals: ^11.1.0
-  checksum: dcbd1316c9f4bf3cefee45b6f5194590563aa5d123500a60d3c8d714bef279205014c8e599ebafc469967199a7622e1444cd0235c16d4243da437e3f1281771e
-  languageName: node
-  linkType: hard
-
-"@babel/types@npm:^7.1.6, @babel/types@npm:^7.7.0, @babel/types@npm:^7.7.2":
-  version: 7.14.0
-  resolution: "@babel/types@npm:7.14.0"
-  dependencies:
-    "@babel/helper-validator-identifier": ^7.14.0
-    to-fast-properties: ^2.0.0
-  checksum: e69829ade45feb140d5e146be5203533edff1ad41a892870e1c6e323a06cafaf5b7e4d83dcae1222deff3bff73cf095b48c2cbf8864b77140196879fafaaf859
-  languageName: node
-  linkType: hard
-
-"@babel/types@npm:^7.12.1, @babel/types@npm:^7.14.0, @babel/types@npm:^7.16.0, @babel/types@npm:^7.4.4":
-  version: 7.16.0
-  resolution: "@babel/types@npm:7.16.0"
-  dependencies:
-    "@babel/helper-validator-identifier": ^7.15.7
-    to-fast-properties: ^2.0.0
-  checksum: 5b483da5c6e6f2394fba7ee1da8787a0c9cddd33491271c4da702e49e6faf95ce41d7c8bf9a4ee47f2ef06bdb35096f4d0f6ae4b5bea35ebefe16309d22344b7
-  languageName: node
-  linkType: hard
-
-"@babel/types@npm:^7.12.13":
-  version: 7.19.3
-  resolution: "@babel/types@npm:7.19.3"
-  dependencies:
-    "@babel/helper-string-parser": ^7.18.10
-    "@babel/helper-validator-identifier": ^7.19.1
-    to-fast-properties: ^2.0.0
-  checksum: 34a5b3db3b99a1a80ec2a784c2bb0e48769a38f1526dc377a5753a3ac5e5704663c405a393117ecc7a9df9da07b01625be7c4c3fee43ae46aba23b0c40928d77
-  languageName: node
-  linkType: hard
-
-"@babel/types@npm:^7.16.7, @babel/types@npm:^7.16.8, @babel/types@npm:^7.17.0":
-  version: 7.17.0
-  resolution: "@babel/types@npm:7.17.0"
-  dependencies:
-    "@babel/helper-validator-identifier": ^7.16.7
-    to-fast-properties: ^2.0.0
-  checksum: 12e5a287986fe557188e87b2c5202223f1dc83d9239a196ab936fdb9f8c1eb0be717ff19f934b5fad4e29a75586d5798f74bed209bccea1c20376b9952056f0e
-  languageName: node
-  linkType: hard
-
-"@babel/types@npm:^7.18.0, @babel/types@npm:^7.18.2":
-  version: 7.18.4
-  resolution: "@babel/types@npm:7.18.4"
-  dependencies:
-    "@babel/helper-validator-identifier": ^7.16.7
-    to-fast-properties: ^2.0.0
-  checksum: 85df59beb99c1b95e9e41590442f2ffa1e5b1b558d025489db40c9f7c906bd03a17da26c3ec486e5800e80af27c42ca7eee9506d9212ab17766d2d68d30fbf52
-  languageName: node
-  linkType: hard
-
-"@babel/types@npm:^7.18.10, @babel/types@npm:^7.18.6, @babel/types@npm:^7.18.9, @babel/types@npm:^7.19.0":
-  version: 7.19.0
-  resolution: "@babel/types@npm:7.19.0"
-  dependencies:
-    "@babel/helper-string-parser": ^7.18.10
-    "@babel/helper-validator-identifier": ^7.18.6
-    to-fast-properties: ^2.0.0
-  checksum: 9b346715a68aeede70ba9c685a144b0b26c53bcd595d448e24c8fa8df4d5956a5712e56ebadb7c85dcc32f218ee42788e37b93d50d3295c992072224cb3ef3fe
-  languageName: node
-  linkType: hard
-
-"@babel/types@npm:^7.8.3":
-  version: 7.21.4
-  resolution: "@babel/types@npm:7.21.4"
-  dependencies:
-    "@babel/helper-string-parser": ^7.19.4
-    "@babel/helper-validator-identifier": ^7.19.1
-    to-fast-properties: ^2.0.0
-  checksum: 587bc55a91ce003b0f8aa10d70070f8006560d7dc0360dc0406d306a2cb2a10154e2f9080b9c37abec76907a90b330a536406cb75e6bdc905484f37b75c73219
-  languageName: node
-  linkType: hard
-
-"@cnakazawa/watch@npm:^1.0.3":
-  version: 1.0.4
-  resolution: "@cnakazawa/watch@npm:1.0.4"
-  dependencies:
-    exec-sh: ^0.3.2
-    minimist: ^1.2.0
-  bin:
-    watch: cli.js
-  checksum: 88f395ca0af2f3c0665b8ce7bb29e83647ec5d141e8735712aeeee4117081555436712966b6957aa1c461f6f826a4d23b0034e379c443a10e919f81c8748bf29
-  languageName: node
-  linkType: hard
-
-"@ember-data/adapter@npm:4.5.0":
-  version: 4.5.0
-  resolution: "@ember-data/adapter@npm:4.5.0"
-  dependencies:
-    "@ember-data/private-build-infra": 4.5.0
-    "@ember-data/store": 4.5.0
-    "@ember/edition-utils": ^1.2.0
-    "@ember/string": ^3.0.0
-    ember-auto-import: ^2.4.2
-    ember-cli-babel: ^7.26.11
-    ember-cli-test-info: ^1.0.0
-    ember-cli-typescript: ^5.1.0
-  checksum: a1b41a2b1b4d6cbe7451f5e31865bf424733210369bec43bebe2dfd2bbe0b92c076b05032660b8fc634bd188d235922513eb1c29649d7a90e506533b15566ccf
-  languageName: node
-  linkType: hard
-
-"@ember-data/canary-features@npm:4.5.0":
-  version: 4.5.0
-  resolution: "@ember-data/canary-features@npm:4.5.0"
-  dependencies:
-    ember-cli-babel: ^7.26.11
-    ember-cli-typescript: ^5.1.0
-  checksum: 3cd0405506979c1c446bea1c4034ab48457f2e9a6be5ec7799cd877e06661763ef691c628e84702e9cd90dca7ca3196b18ceb2910bfdf59011b64faf4f4692aa
-  languageName: node
-  linkType: hard
-
-"@ember-data/debug@npm:4.5.0":
-  version: 4.5.0
-  resolution: "@ember-data/debug@npm:4.5.0"
-  dependencies:
-    "@ember-data/private-build-infra": 4.5.0
-    "@ember/edition-utils": ^1.2.0
-    "@ember/string": ^3.0.0
-    ember-auto-import: ^2.4.2
-    ember-cli-babel: ^7.26.11
-    ember-cli-test-info: ^1.0.0
-    ember-cli-typescript: ^5.1.0
-  checksum: 7962cc54b9be53bed0e6ae69e423fd74eef64190b495bfb337f3487735ba1515d8aa2d7b11908de2666e7a6425a01981410fbfe1e6184e4ff669b9b76d44e4a8
-  languageName: node
-  linkType: hard
-
-"@ember-data/model@npm:4.5.0":
-  version: 4.5.0
-  resolution: "@ember-data/model@npm:4.5.0"
-  dependencies:
-    "@ember-data/canary-features": 4.5.0
-    "@ember-data/private-build-infra": 4.5.0
-    "@ember-data/store": 4.5.0
-    "@ember/edition-utils": ^1.2.0
-    "@ember/string": ^3.0.0
-    "@embroider/macros": ^1.8.3
-    ember-auto-import: ^2.4.2
-    ember-cached-decorator-polyfill: ^0.1.4
-    ember-cli-babel: ^7.26.11
-    ember-cli-string-utils: ^1.1.0
-    ember-cli-test-info: ^1.0.0
-    ember-cli-typescript: ^5.1.0
-    ember-compatibility-helpers: ^1.2.6
-    inflection: ~1.13.2
-  checksum: a370bdceb4f36a4e0d3dc0e1d87bc43eee30a1478eda1b26c581ef7296d728947403d12dccaa27ec8838acf815dcedb01a97b1aa8a1c390c6230b8942c769f97
-  languageName: node
-  linkType: hard
-
-"@ember-data/private-build-infra@npm:4.5.0":
-  version: 4.5.0
-  resolution: "@ember-data/private-build-infra@npm:4.5.0"
-  dependencies:
-    "@babel/plugin-transform-block-scoping": ^7.18.9
-    "@ember-data/canary-features": 4.5.0
-    "@ember/edition-utils": ^1.2.0
-    babel-plugin-debug-macros: ^0.3.4
-    babel-plugin-filter-imports: ^4.0.0
-    babel6-plugin-strip-class-callcheck: ^6.0.0
-    broccoli-debug: ^0.6.5
-    broccoli-file-creator: ^2.1.1
-    broccoli-funnel: ^3.0.8
-    broccoli-merge-trees: ^4.2.0
-    broccoli-rollup: ^5.0.0
-    calculate-cache-key-for-tree: ^2.0.0
-    chalk: ^4.1.2
-    ember-cli-babel: ^7.26.11
-    ember-cli-path-utils: ^1.0.0
-    ember-cli-string-utils: ^1.1.0
-    ember-cli-typescript: ^5.1.0
-    ember-cli-version-checker: ^5.1.2
-    git-repo-info: ^2.1.1
-    glob: ^8.0.3
-    npm-git-info: ^1.0.3
-    rimraf: ^3.0.2
-    rsvp: ^4.8.5
-    semver: ^7.3.7
-    silent-error: ^1.1.1
-  checksum: a253e3b7c76e6e9541ec7a39ff566f7af419f169380791e11b44bc445517dbfa18c930d5708d305eea09ea5ee9b39f63edf98c8192adf2e84eb9bfc45c6c0b99
-  languageName: node
-  linkType: hard
-
-"@ember-data/record-data@npm:4.5.0":
-  version: 4.5.0
-  resolution: "@ember-data/record-data@npm:4.5.0"
-  dependencies:
-    "@ember-data/canary-features": 4.5.0
-    "@ember-data/private-build-infra": 4.5.0
-    "@ember-data/store": 4.5.0
-    "@ember/edition-utils": ^1.2.0
-    ember-auto-import: ^2.4.2
-    ember-cli-babel: ^7.26.11
-    ember-cli-test-info: ^1.0.0
-    ember-cli-typescript: ^5.1.0
-  checksum: f5e02412cec38e0df2ffc25b69f6490381a40c293906a1b1449c204fa8591003e92b3092b7b6d5354d3baae91546cbc2eff0ca32ac14f0bf47dc5ac31f649963
-  languageName: node
-  linkType: hard
-
-"@ember-data/rfc395-data@npm:^0.0.4":
-  version: 0.0.4
-  resolution: "@ember-data/rfc395-data@npm:0.0.4"
-  checksum: 59760b1f7b1cf131fe4a3b817b912e7e62e69e100acd813db37d11106a40c1b22da068cd7d4cdc1bb4c69b0dbde45c96ebff848b6b2380715eae7896bb2e109c
-  languageName: node
-  linkType: hard
-
-"@ember-data/serializer@npm:4.5.0":
-  version: 4.5.0
-  resolution: "@ember-data/serializer@npm:4.5.0"
-  dependencies:
-    "@ember-data/private-build-infra": 4.5.0
-    "@ember-data/store": 4.5.0
-    ember-auto-import: ^2.4.2
-    ember-cli-babel: ^7.26.11
-    ember-cli-test-info: ^1.0.0
-    ember-cli-typescript: ^5.1.0
-  checksum: f833c812ab6c77ed88ad12922835e5ed6f1968180a861a1dd2c436bbc6631d782e7bb58ae036c96ffa17467fc184552e31180ab399a36dc93fbdd7c877c31702
-  languageName: node
-  linkType: hard
-
-"@ember-data/store@npm:4.5.0":
-  version: 4.5.0
-  resolution: "@ember-data/store@npm:4.5.0"
-  dependencies:
-    "@ember-data/canary-features": 4.5.0
-    "@ember-data/private-build-infra": 4.5.0
-    "@ember/string": ^3.0.0
-    "@embroider/macros": ^1.8.3
-    "@glimmer/tracking": ^1.1.2
-    ember-auto-import: ^2.4.2
-    ember-cached-decorator-polyfill: ^0.1.4
-    ember-cli-babel: ^7.26.11
-    ember-cli-path-utils: ^1.0.0
-    ember-cli-typescript: ^5.1.0
-  checksum: d64ec15ebde1fd81bf834c0289e6ec3c8db1b9b6aa15c166ec7663d0a32cc486a1f22fec13112cf2aa3654ed18f56e7ec74e9720407ba0b26de5d803807cdc75
-  languageName: node
-  linkType: hard
-
-"@ember-decorators/component@npm:^6.1.1":
-  version: 6.1.1
-  resolution: "@ember-decorators/component@npm:6.1.1"
-  dependencies:
-    "@ember-decorators/utils": ^6.1.1
-    ember-cli-babel: ^7.1.3
-  checksum: 0b731884ff2d84db32eae9c006179153ad1d7f93eee040260d0622101017f363caf38db98e536ffd4008312af91cc57a8dda0d0f2c71f80d3643d5456658bee6
-  languageName: node
-  linkType: hard
-
-"@ember-decorators/object@npm:^6.1.1":
-  version: 6.1.1
-  resolution: "@ember-decorators/object@npm:6.1.1"
-  dependencies:
-    "@ember-decorators/utils": ^6.1.1
-    ember-cli-babel: ^7.1.3
-  checksum: 806f753a58ecca5924da110efa614e9a33b4ed7734aa5e67ea41a8a5f555734852e50e78dadcd269407efe1cc08756e8dbc55c077183892f9dc38a0701b8641d
-  languageName: node
-  linkType: hard
-
-"@ember-decorators/utils@npm:^6.1.0, @ember-decorators/utils@npm:^6.1.1":
-  version: 6.1.1
-  resolution: "@ember-decorators/utils@npm:6.1.1"
-  dependencies:
-    ember-cli-babel: ^7.1.3
-  checksum: 979075021ce824a263859dc236285b37afee98b1583060cfab9c3583a4888612155bb66a23a4f4d24ab0ca9f459b38a458d32f825f0df073ca38a7f6e0187dc1
-  languageName: node
-  linkType: hard
-
-"@ember/edition-utils@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "@ember/edition-utils@npm:1.2.0"
-  checksum: eb1eeb08b66344054acb34a4695a80dbfaeb678d10cb11327eec4c0d03b2324ad7c05d0239a7d0298d5f8931e1698d85cba23dac37bff18ab52104f678a0e8c7
-  languageName: node
-  linkType: hard
-
-"@ember/legacy-built-in-components@npm:^0.4.1":
-  version: 0.4.1
-  resolution: "@ember/legacy-built-in-components@npm:0.4.1"
-  dependencies:
-    "@embroider/macros": ^1.0.0
-    ember-cli-babel: ^7.26.6
-    ember-cli-htmlbars: ^5.7.1
-    ember-cli-typescript: ^4.1.0
-  peerDependencies:
-    ember-source: "*"
-  checksum: e4e872eb0776f29ee066556f3ae99a65ddb75fbfe44f838c807b35d8c51927aae4a28e408529f6a4c42f1445f8addc033a010343e7884c6344aeacb9c4304614
-  languageName: node
-  linkType: hard
-
-"@ember/optional-features@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@ember/optional-features@npm:2.0.0"
-  dependencies:
-    chalk: ^4.1.0
-    ember-cli-version-checker: ^5.1.1
-    glob: ^7.1.6
-    inquirer: ^7.3.3
-    mkdirp: ^1.0.4
-    silent-error: ^1.1.1
-  checksum: 8fce4edc03b95c364770468398b5163791f36d2c305a7ed7221506558d13d114b79a5e5a58fe98d260b38cff4eece2c2fd87ccdff1bc10a7de8270ab3b3f49d1
-  languageName: node
-  linkType: hard
-
-"@ember/render-modifiers@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "@ember/render-modifiers@npm:1.0.2"
-  dependencies:
-    ember-cli-babel: ^7.10.0
-    ember-modifier-manager-polyfill: ^1.1.0
-  checksum: 74220450d3a8635f1ce6c3d9ce5d7f4d8e7336e48a20b1e28b6acf9f671f0938855dff60a06eb1ad5700fadb42e2c0ffa3adef404788966da99db8ab393e9944
-  languageName: node
-  linkType: hard
-
-"@ember/render-modifiers@npm:^1.0.2 || ^2.0.0, @ember/render-modifiers@npm:^2.0.2, @ember/render-modifiers@npm:^2.0.4":
-  version: 2.0.4
-  resolution: "@ember/render-modifiers@npm:2.0.4"
-  dependencies:
-    "@embroider/macros": ^1.0.0
-    ember-cli-babel: ^7.26.11
-    ember-modifier-manager-polyfill: ^1.2.0
-  peerDependencies:
-    ember-source: ^3.8 || 4
-  checksum: 6186a013349273f9eb0339a5b2ab7ccc7b9e6429d83b8cabba2842dfc35bd4b77b66979c2f2c25b062a7cdd359c6a500df27154880ac5f04a3ffa52ca6e343d6
-  languageName: node
-  linkType: hard
-
-"@ember/render-modifiers@npm:^2.0.0, @ember/render-modifiers@npm:^2.0.5":
-  version: 2.0.5
-  resolution: "@ember/render-modifiers@npm:2.0.5"
-  dependencies:
-    "@embroider/macros": ^1.0.0
-    ember-cli-babel: ^7.26.11
-    ember-modifier-manager-polyfill: ^1.2.0
-  peerDependencies:
-    ember-source: ^3.8 || ^4.0.0
-  checksum: ebeb4d573968f46490f8f5618b9d85f2c7ca39cee5b854bb497a3aee7dee3d710ab02b9677df30f1e2a484e712dd89171045118da563d9d9a6c316ccdccc2671
-  languageName: node
-  linkType: hard
-
-"@ember/string@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@ember/string@npm:3.0.0"
-  dependencies:
-    ember-cli-babel: ^7.26.6
-  checksum: 6694d10573243b3f37ab42e3b671ca7aeedbbc1af8cc5eaaafb025abb0efc5f8c63f76109343958d436b59d81302557d3e8d1f60e7ae9513bb1c5543fdbeb270
-  languageName: node
-  linkType: hard
-
-"@ember/test-helpers@npm:2.8.1":
-  version: 2.8.1
-  resolution: "@ember/test-helpers@npm:2.8.1"
-  dependencies:
-    "@ember/test-waiters": ^3.0.0
-    "@embroider/macros": ^1.6.0
-    "@embroider/util": ^1.6.0
-    broccoli-debug: ^0.6.5
-    broccoli-funnel: ^3.0.8
-    ember-cli-babel: ^7.26.6
-    ember-cli-htmlbars: ^5.7.1
-    ember-destroyable-polyfill: ^2.0.3
-  peerDependencies:
-    ember-source: ">=3.8.0"
-  checksum: 396c20c297f3279fad6693c7c66d9ed16de910a9cb1aff406bb128bba36d4f6a122fad99474e183d9dc2f2e2820aadc44c31431f33d3d8501a50dc58c9150f60
-  languageName: node
-  linkType: hard
-
-"@ember/test-waiters@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@ember/test-waiters@npm:3.0.0"
-  dependencies:
-    calculate-cache-key-for-tree: ^2.0.0
-    ember-cli-babel: ^7.26.6
-    ember-cli-version-checker: ^5.1.2
-    semver: ^7.3.5
-  checksum: 4998a8213b8800633485eaca342bd6e9b388d974def70ab794612d0c691b68599b2377b9a5467bdddea699099fec2897821c9127443ddac3c69c82d73ea21fa5
-  languageName: node
-  linkType: hard
-
-"@embroider/addon-shim@npm:^1.0.0, @embroider/addon-shim@npm:^1.2.0, @embroider/addon-shim@npm:^1.5.0, @embroider/addon-shim@npm:^1.8.4":
-  version: 1.8.4
-  resolution: "@embroider/addon-shim@npm:1.8.4"
-  dependencies:
-    "@embroider/shared-internals": ^2.0.0
-    broccoli-funnel: ^3.0.8
-    semver: ^7.3.8
-  checksum: 107220e97bbd46ead81dfbbfc6cf7daa61731096a6e81b989659a9a0b29b48b3c97ebdd446b6dc0636c4be369f3744e514b7f5e5c0fdc54c1c0e026f54404cc2
-  languageName: node
-  linkType: hard
-
-"@embroider/core@npm:0.33.0, @embroider/core@npm:^0.33.0":
-  version: 0.33.0
-  resolution: "@embroider/core@npm:0.33.0"
-  dependencies:
-    "@babel/core": ^7.12.3
-    "@babel/parser": ^7.12.3
-    "@babel/plugin-syntax-dynamic-import": ^7.8.3
-    "@babel/plugin-transform-runtime": ^7.12.1
-    "@babel/runtime": ^7.12.5
-    "@babel/traverse": ^7.12.1
-    "@babel/types": ^7.12.1
-    "@embroider/macros": 0.33.0
-    assert-never: ^1.1.0
-    babel-plugin-syntax-dynamic-import: ^6.18.0
-    broccoli-node-api: ^1.7.0
-    broccoli-persistent-filter: ^3.1.2
-    broccoli-plugin: ^4.0.1
-    broccoli-source: ^3.0.0
-    debug: ^3.1.0
-    escape-string-regexp: ^4.0.0
-    fast-sourcemap-concat: ^1.4.0
-    filesize: ^4.1.2
-    fs-extra: ^7.0.1
-    fs-tree-diff: ^2.0.0
-    handlebars: ^4.4.2
-    js-string-escape: ^1.0.1
-    jsdom: ^16.4.0
-    json-stable-stringify: ^1.0.1
-    lodash: ^4.17.10
-    pkg-up: ^2.0.0
-    resolve: ^1.8.1
-    resolve-package-path: ^1.2.2
-    semver: ^7.3.2
-    strip-bom: ^3.0.0
-    typescript-memoize: ^1.0.0-alpha.3
-    walk-sync: ^1.1.3
-    wrap-legacy-hbs-plugin-if-needed: ^1.0.1
-  checksum: 8abe563e909461b18f9b86a616173a436a5cdaf3c455f0a46ab51cae24129d03bd2e5a06e26a4adba7eca10a1d34388ec5a51fcf790f2ac9fabafb7950668df1
-  languageName: node
-  linkType: hard
-
-"@embroider/macros@npm:0.33.0":
-  version: 0.33.0
-  resolution: "@embroider/macros@npm:0.33.0"
-  dependencies:
-    "@babel/core": ^7.12.3
-    "@babel/traverse": ^7.12.1
-    "@babel/types": ^7.12.1
-    "@embroider/core": 0.33.0
-    assert-never: ^1.1.0
-    ember-cli-babel: ^7.23.0
-    lodash: ^4.17.10
-    resolve: ^1.8.1
-    semver: ^7.3.2
-  checksum: 25cee2f9968d23be7960425a3dc6c4c2f36f106db6ea38a69c1304fabc7d792ee4ee0c7ba17b6d4ed9410ae73cb4df5b08a1f0a728b7c042e2d86f9306119424
-  languageName: node
-  linkType: hard
-
-"@embroider/macros@npm:1.5.0, @embroider/macros@npm:^1.0.0":
-  version: 1.5.0
-  resolution: "@embroider/macros@npm:1.5.0"
-  dependencies:
-    "@embroider/shared-internals": 1.5.0
-    assert-never: ^1.2.1
-    babel-import-util: ^1.1.0
-    ember-cli-babel: ^7.26.6
-    find-up: ^5.0.0
-    lodash: ^4.17.21
-    resolve: ^1.20.0
-    semver: ^7.3.2
-  checksum: 5e0d5f8c89b0b31199b938848bb7afc5bcd8d3501cc8bfd3ad4a531d74c4e50e8648303e8adaf690c0f0f69a61025925ce55640d93aa3d1723c820efd9cecabc
-  languageName: node
-  linkType: hard
-
-"@embroider/macros@npm:1.8.3, @embroider/macros@npm:^1.3.0, @embroider/macros@npm:^1.6.0, @embroider/macros@npm:^1.8.3":
-  version: 1.8.3
-  resolution: "@embroider/macros@npm:1.8.3"
-  dependencies:
-    "@embroider/shared-internals": 1.8.3
-    assert-never: ^1.2.1
-    babel-import-util: ^1.1.0
-    ember-cli-babel: ^7.26.6
-    find-up: ^5.0.0
-    lodash: ^4.17.21
-    resolve: ^1.20.0
-    semver: ^7.3.2
-  checksum: 97bcab2724a8ae3c155089990e30b069b853e518f999ac7ba83133c10eb3700b55d5599d209751d78cf16116aa642846aa01c51f96867b94a58e0bd713d50f18
-  languageName: node
-  linkType: hard
-
-"@embroider/macros@npm:^0.41.0":
-  version: 0.41.0
-  resolution: "@embroider/macros@npm:0.41.0"
-  dependencies:
-    "@embroider/shared-internals": 0.41.0
-    assert-never: ^1.1.0
-    ember-cli-babel: ^7.23.0
-    lodash: ^4.17.10
-    resolve: ^1.8.1
-    semver: ^7.3.2
-  checksum: 91bbf00e34be3cea46c948222e423c0f74bbd2814f2f191155a7d8bf4c149af87b2d8ed8b98cc85891c6eca57bbbfa72134ed5dc70cf2342fdcbe65aca1f7c85
-  languageName: node
-  linkType: hard
-
-"@embroider/macros@npm:^0.50.0 || ^1.0.0, @embroider/macros@npm:^1.2.0, @embroider/macros@npm:^1.9.0":
-  version: 1.9.0
-  resolution: "@embroider/macros@npm:1.9.0"
-  dependencies:
-    "@embroider/shared-internals": 1.8.3
-    assert-never: ^1.2.1
-    babel-import-util: ^1.1.0
-    ember-cli-babel: ^7.26.6
-    find-up: ^5.0.0
-    lodash: ^4.17.21
-    resolve: ^1.20.0
-    semver: ^7.3.2
-  checksum: 68a036cb0b121f8a4813def6878fbdd117b34fd0011df1bc447c985fa0ae40ef82bd4902a0cb8f63129d3a52d8206c956aa85a9550aa626062d00c79422f7333
-  languageName: node
-  linkType: hard
-
-"@embroider/shared-internals@npm:0.41.0":
-  version: 0.41.0
-  resolution: "@embroider/shared-internals@npm:0.41.0"
-  dependencies:
-    ember-rfc176-data: ^0.3.17
-    fs-extra: ^7.0.1
-    lodash: ^4.17.10
-    pkg-up: ^3.1.0
-    resolve-package-path: ^1.2.2
-    semver: ^7.3.2
-    typescript-memoize: ^1.0.0-alpha.3
-  checksum: 56dc34014dd88bd5baedd5effbdba754e26761e1a5daea545845d9080a647826108a827375f5d042dd274613eab0e853e94a367c30d0c04064f0d7e9fb8885bf
-  languageName: node
-  linkType: hard
-
-"@embroider/shared-internals@npm:1.5.0, @embroider/shared-internals@npm:^1.0.0":
-  version: 1.5.0
-  resolution: "@embroider/shared-internals@npm:1.5.0"
-  dependencies:
-    babel-import-util: ^1.1.0
-    ember-rfc176-data: ^0.3.17
-    fs-extra: ^9.1.0
-    lodash: ^4.17.21
-    resolve-package-path: ^4.0.1
-    semver: ^7.3.5
-    typescript-memoize: ^1.0.1
-  checksum: 78f92e64f03f33a0d31489fe406ff58da8d5997b78156e3b8b73f6cd5ef14d8a810a7f65e3da96206a02a3c2277316ebdd5c6dae05abfe816eb9940d76e03004
-  languageName: node
-  linkType: hard
-
-"@embroider/shared-internals@npm:1.8.3":
-  version: 1.8.3
-  resolution: "@embroider/shared-internals@npm:1.8.3"
-  dependencies:
-    babel-import-util: ^1.1.0
-    ember-rfc176-data: ^0.3.17
-    fs-extra: ^9.1.0
-    js-string-escape: ^1.0.1
-    lodash: ^4.17.21
-    resolve-package-path: ^4.0.1
-    semver: ^7.3.5
-    typescript-memoize: ^1.0.1
-  checksum: de636225b3e85379caad5bf4cb3c4f8cc8d95d1c9fab05668faf55654ae2cfe1ca2632c5cc4b81f0b52781d4fc5b80879e6cd143801976de46c591430957040f
-  languageName: node
-  linkType: hard
-
-"@embroider/shared-internals@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@embroider/shared-internals@npm:2.0.0"
-  dependencies:
-    babel-import-util: ^1.1.0
-    ember-rfc176-data: ^0.3.17
-    fs-extra: ^9.1.0
-    js-string-escape: ^1.0.1
-    lodash: ^4.17.21
-    resolve-package-path: ^4.0.1
-    semver: ^7.3.5
-    typescript-memoize: ^1.0.1
-  checksum: 19d2754182b9e1373177843a354852c82b35d71af66edcdf0662597442062e5f5f51adbdf7a63a263ee0052064c222ff33ddb983ec3f17b68b7275de8de3680e
-  languageName: node
-  linkType: hard
-
-"@embroider/util@npm:^0.39.1 || ^0.40.0 || ^0.41.0 || ^1.0.0, @embroider/util@npm:^1.2.0":
-  version: 1.9.0
-  resolution: "@embroider/util@npm:1.9.0"
-  dependencies:
-    "@embroider/macros": ^1.9.0
-    broccoli-funnel: ^3.0.5
-    ember-cli-babel: ^7.23.1
-  peerDependencies:
-    ember-source: "*"
-  checksum: 0b2c45d11f633b30e36dc87b199ff9e6543597cce2e1c054c0392f9a7685e6845864ad57d404b9d67fb5dfcd4e93282ab8c3bbd7a491488b3ecdaaa7a0777d49
-  languageName: node
-  linkType: hard
-
-"@embroider/util@npm:^1.0.0":
-  version: 1.5.0
-  resolution: "@embroider/util@npm:1.5.0"
-  dependencies:
-    "@embroider/macros": 1.5.0
-    broccoli-funnel: ^3.0.5
-    ember-cli-babel: ^7.23.1
-  peerDependencies:
-    ember-source: "*"
-  checksum: f3656a8ae3df0d3b35a40c867258a621ef28311c5fbd3e8718593fd436e09816cc3331694695e40dcad384bda638986184dbe13d919314189ce31c154eebdd81
-  languageName: node
-  linkType: hard
-
-"@embroider/util@npm:^1.6.0":
-  version: 1.8.3
-  resolution: "@embroider/util@npm:1.8.3"
-  dependencies:
-    "@embroider/macros": 1.8.3
-    broccoli-funnel: ^3.0.5
-    ember-cli-babel: ^7.23.1
-  peerDependencies:
-    ember-source: "*"
-  checksum: 3d9b1d0ec0ac8b41192063d47886be7afda24cc43f7d340a6329d84ef6f8c5a11ef558ca4b8e83350592e0ce5123b9be5f9e1e7c79f2aa20cf3bf3d30cb85598
-  languageName: node
-  linkType: hard
-
-"@eslint/eslintrc@npm:^0.4.3":
-  version: 0.4.3
-  resolution: "@eslint/eslintrc@npm:0.4.3"
-  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
-  checksum: 03a7704150b868c318aab6a94d87a33d30dc2ec579d27374575014f06237ba1370ae11178db772f985ef680d469dc237e7b16a1c5d8edaaeb8c3733e7a95a6d3
-  languageName: node
-  linkType: hard
-
-"@eslint/eslintrc@npm:^1.3.3":
-  version: 1.3.3
-  resolution: "@eslint/eslintrc@npm:1.3.3"
-  dependencies:
-    ajv: ^6.12.4
-    debug: ^4.3.2
-    espree: ^9.4.0
-    globals: ^13.15.0
-    ignore: ^5.2.0
-    import-fresh: ^3.2.1
-    js-yaml: ^4.1.0
-    minimatch: ^3.1.2
-    strip-json-comments: ^3.1.1
-  checksum: f03e9d6727efd3e0719da2051ea80c0c73d20e28c171121527dbb868cd34232ca9c1d0525a66e517a404afea26624b1e47895b6a92474678418c2f50c9566694
-  languageName: node
-  linkType: hard
-
-"@gar/promisify@npm:^1.1.3":
-  version: 1.1.3
-  resolution: "@gar/promisify@npm:1.1.3"
-  checksum: 4059f790e2d07bf3c3ff3e0fec0daa8144fe35c1f6e0111c9921bd32106adaa97a4ab096ad7dab1e28ee6a9060083c4d1a4ada42a7f5f3f7a96b8812e2b757c1
-  languageName: node
-  linkType: hard
-
-"@glimmer/component@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "@glimmer/component@npm:1.0.4"
-  dependencies:
-    "@glimmer/di": ^0.1.9
-    "@glimmer/env": ^0.1.7
-    "@glimmer/util": ^0.44.0
-    broccoli-file-creator: ^2.1.1
-    broccoli-merge-trees: ^3.0.2
-    ember-cli-babel: ^7.7.3
-    ember-cli-get-component-path-option: ^1.0.0
-    ember-cli-is-package-missing: ^1.0.0
-    ember-cli-normalize-entity-name: ^1.0.0
-    ember-cli-path-utils: ^1.0.0
-    ember-cli-string-utils: ^1.1.0
-    ember-cli-typescript: 3.0.0
-    ember-cli-version-checker: ^3.1.3
-    ember-compatibility-helpers: ^1.1.2
-  checksum: 122009a24f06053647779dc79d4f5cd3ef6d2deac91c92bb3d1dd01a68dd5ef5002efaa48e4abba85287fd2a1aba711dee330cee9b82d283c05763391d10671d
-  languageName: node
-  linkType: hard
-
-"@glimmer/component@npm:^1.1.0, @glimmer/component@npm:^1.1.2":
-  version: 1.1.2
-  resolution: "@glimmer/component@npm:1.1.2"
-  dependencies:
-    "@glimmer/di": ^0.1.9
-    "@glimmer/env": ^0.1.7
-    "@glimmer/util": ^0.44.0
-    broccoli-file-creator: ^2.1.1
-    broccoli-merge-trees: ^3.0.2
-    ember-cli-babel: ^7.7.3
-    ember-cli-get-component-path-option: ^1.0.0
-    ember-cli-is-package-missing: ^1.0.0
-    ember-cli-normalize-entity-name: ^1.0.0
-    ember-cli-path-utils: ^1.0.0
-    ember-cli-string-utils: ^1.1.0
-    ember-cli-typescript: 3.0.0
-    ember-cli-version-checker: ^3.1.3
-    ember-compatibility-helpers: ^1.1.2
-  checksum: 853b998105c1f77cf382b6f6459709515d39d560f2022e948e7b7f6b298b14197e45b20c1cbfca52970c0fef1a80a1bce55aea98c4da2311330d5420291254b7
-  languageName: node
-  linkType: hard
-
-"@glimmer/di@npm:^0.1.9":
-  version: 0.1.11
-  resolution: "@glimmer/di@npm:0.1.11"
-  checksum: c93f6a511cf7f72f3a6824ce075e73952b8f451e4098eda2fc1f45b4b5b1016831459d32f3f298fdc21030cc03ebcc4561ca2780c59562e356519b2a296c5b48
-  languageName: node
-  linkType: hard
-
-"@glimmer/encoder@npm:^0.42.2":
-  version: 0.42.2
-  resolution: "@glimmer/encoder@npm:0.42.2"
-  dependencies:
-    "@glimmer/interfaces": ^0.42.2
-    "@glimmer/vm": ^0.42.2
-  checksum: 1e857e09176a6673c599a7b466b8cb20fde55df3dfd7e2d923ac2e065261ddf2ef82651a64c40c0209bb9fc684abcf6f79ea52e23b9f7463c7a244f0540bce50
-  languageName: node
-  linkType: hard
-
-"@glimmer/env@npm:0.1.7, @glimmer/env@npm:^0.1.7":
-  version: 0.1.7
-  resolution: "@glimmer/env@npm:0.1.7"
-  checksum: d46686da1b21615c177792794ed11f725fbb1c32936d69ca54a3ac40e2314638a529b81afb23759d35cdf36462a7a6b2c02604a366473cd6a8abadfe56e9c335
-  languageName: node
-  linkType: hard
-
-"@glimmer/global-context@npm:0.83.1":
-  version: 0.83.1
-  resolution: "@glimmer/global-context@npm:0.83.1"
-  dependencies:
-    "@glimmer/env": ^0.1.7
-  checksum: 90ad3cfa31a11f5937809d95595eda969c686d49d231cca4a1a1f46933cef08ef9cdd131c190bf394994d54fa3df23f40b1fe0e55f51c07cfb814499ec10443b
-  languageName: node
-  linkType: hard
-
-"@glimmer/interfaces@npm:0.83.1":
-  version: 0.83.1
-  resolution: "@glimmer/interfaces@npm:0.83.1"
-  dependencies:
-    "@simple-dom/interface": ^1.4.0
-  checksum: 092acef58f3e2fcfca56ea042b25de5a0a071bd12fdd490a331ca49d943264512f8397edc0e3a66ad98acfdc349a14225d61d5343dbead64e5ff36ef32c689b2
-  languageName: node
-  linkType: hard
-
-"@glimmer/interfaces@npm:^0.42.2":
-  version: 0.42.2
-  resolution: "@glimmer/interfaces@npm:0.42.2"
-  checksum: c9dfcba6456955d797e5e0746ba69655c0d99a4962adb0de875e8de4e826767bce1c544966468bc9da40468286572966e59ce2c19b3f3879bfd23922b7d57cc6
-  languageName: node
-  linkType: hard
-
-"@glimmer/low-level@npm:^0.42.2":
-  version: 0.42.2
-  resolution: "@glimmer/low-level@npm:0.42.2"
-  checksum: 7d7c5af8d127e588853ad590f4bfa4d06c545b27b86dfee102e036a5cf9a59971d735b8a13f7611cf8c4006c10349e93a15a7eb55e246cb2f047bf2d524b0f6d
-  languageName: node
-  linkType: hard
-
-"@glimmer/program@npm:^0.42.2":
-  version: 0.42.2
-  resolution: "@glimmer/program@npm:0.42.2"
-  dependencies:
-    "@glimmer/encoder": ^0.42.2
-    "@glimmer/interfaces": ^0.42.2
-    "@glimmer/util": ^0.42.2
-  checksum: 570c60a96b96c37c43bfae1fe9c5b29459d0c0c4eadc2da478ccfe38f1a3e3ab5d0dffa05d09ac4828899ccf610b9ff987e5cc76b5491570c16448b82db975aa
-  languageName: node
-  linkType: hard
-
-"@glimmer/reference@npm:^0.42.1, @glimmer/reference@npm:^0.42.2":
-  version: 0.42.2
-  resolution: "@glimmer/reference@npm:0.42.2"
-  dependencies:
-    "@glimmer/util": ^0.42.2
-  checksum: b5b66e2210b429d69a3287fed79b4fb4036282da2f31ea2b8c0a200e452fd21bcb4dff39b031d2cc98646d9443b2b8fb0c910aaf30cc3b0597df0f07532b361d
-  languageName: node
-  linkType: hard
-
-"@glimmer/reference@npm:^0.83.1":
-  version: 0.83.1
-  resolution: "@glimmer/reference@npm:0.83.1"
-  dependencies:
-    "@glimmer/env": ^0.1.7
-    "@glimmer/global-context": 0.83.1
-    "@glimmer/interfaces": 0.83.1
-    "@glimmer/util": 0.83.1
-    "@glimmer/validator": 0.83.1
-  checksum: ba6074ce6fb0acb12b4bff3ad077f0915187d71990e2dd77b9274215a2fab542cd48ae834e93146e31c7829fe74164b71a5d45fc89e4b5cdd8326b9acc906e98
-  languageName: node
-  linkType: hard
-
-"@glimmer/runtime@npm:^0.42.1":
-  version: 0.42.2
-  resolution: "@glimmer/runtime@npm:0.42.2"
-  dependencies:
-    "@glimmer/interfaces": ^0.42.2
-    "@glimmer/low-level": ^0.42.2
-    "@glimmer/program": ^0.42.2
-    "@glimmer/reference": ^0.42.2
-    "@glimmer/util": ^0.42.2
-    "@glimmer/vm": ^0.42.2
-    "@glimmer/wire-format": ^0.42.2
-  checksum: 45345713e44033fac3fc8356ce5ab1b1e90ff998ed25bdd0b615a45f05574b65b8fc87dbc22ed79a7c8d448f1c634228ab5aa546ea50a2ba878a45453bfe4fe2
-  languageName: node
-  linkType: hard
-
-"@glimmer/syntax@npm:^0.42.1":
-  version: 0.42.2
-  resolution: "@glimmer/syntax@npm:0.42.2"
-  dependencies:
-    "@glimmer/interfaces": ^0.42.2
-    "@glimmer/util": ^0.42.2
-    handlebars: ^4.0.13
-    simple-html-tokenizer: ^0.5.8
-  checksum: 7597a643b88a967fbb85c3c3e0a8f57a4e7a328f78b9605fb31a5ee678531ca0b7935971cab8755af33f2b3ea71836a38e10dffbec259c6ab1ca411c2f1ec80d
-  languageName: node
-  linkType: hard
-
-"@glimmer/syntax@npm:^0.83.1":
-  version: 0.83.1
-  resolution: "@glimmer/syntax@npm:0.83.1"
-  dependencies:
-    "@glimmer/interfaces": 0.83.1
-    "@glimmer/util": 0.83.1
-    "@handlebars/parser": ~2.0.0
-    simple-html-tokenizer: ^0.5.11
-  checksum: 4c932842e89fc90960a92fac6b86a801d8b3a1573ee656f92f526042e5bda225a1d32e6e41735001aa0159c06bf4226f1347181071965bb0a96a2c999e9a8176
-  languageName: node
-  linkType: hard
-
-"@glimmer/tracking@npm:^1.0.0, @glimmer/tracking@npm:^1.1.2":
-  version: 1.1.2
-  resolution: "@glimmer/tracking@npm:1.1.2"
-  dependencies:
-    "@glimmer/env": ^0.1.7
-    "@glimmer/validator": ^0.44.0
-  checksum: a36aaf70c831fbfd9fb6f6e7b9cacb7130b0dbb87206234cd8e5fcbfa42070cab48d7d9b16eb6918f266ac3ae0414d968b1903b520a69f0eac2a8f303179f8ff
-  languageName: node
-  linkType: hard
-
-"@glimmer/tracking@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "@glimmer/tracking@npm:1.0.4"
-  dependencies:
-    "@glimmer/env": ^0.1.7
-    "@glimmer/validator": ^0.44.0
-  checksum: 5e6359c92a2937f9710d21ad5e2edf2ce579c18e4fc2905940088738cda2ddf1162279bb41248047ced3c948885db346c844556e784eb70ebadb349d0ab587a3
-  languageName: node
-  linkType: hard
-
-"@glimmer/util@npm:0.83.1":
-  version: 0.83.1
-  resolution: "@glimmer/util@npm:0.83.1"
-  dependencies:
-    "@glimmer/env": 0.1.7
-    "@glimmer/interfaces": 0.83.1
-    "@simple-dom/interface": ^1.4.0
-  checksum: 2a0cc0b9c3e41098fd353692d823ae058cdf5cff7b8b0edff230fb9fa2437347bf195246985165e8bdcba9bda2066e78aeef9649c8c5427755f68c1fc957b8f1
-  languageName: node
-  linkType: hard
-
-"@glimmer/util@npm:^0.42.2":
-  version: 0.42.2
-  resolution: "@glimmer/util@npm:0.42.2"
-  checksum: 996a84c3db284e47202a7daeccce31870a413dd6817a88908ad18484f2cd4559d19c8bc98e921cc00db72db3a1efa52931725abe4c71d4a3bb1bb78a50fb739a
-  languageName: node
-  linkType: hard
-
-"@glimmer/util@npm:^0.44.0":
-  version: 0.44.0
-  resolution: "@glimmer/util@npm:0.44.0"
-  checksum: e1c5f74c265afb2ccdc10e183d6784dc29d2cb98f2aca10b068f3dce29e67a3967c760af750e88e0a2f1c80e2cfc0de5ee6e96bb90dcb97493a2e6f51d36b129
-  languageName: node
-  linkType: hard
-
-"@glimmer/validator@npm:0.83.1, @glimmer/validator@npm:^0.83.0":
-  version: 0.83.1
-  resolution: "@glimmer/validator@npm:0.83.1"
-  dependencies:
-    "@glimmer/env": ^0.1.7
-    "@glimmer/global-context": 0.83.1
-  checksum: f1af86b2e229120dd6d1699da3550b778412f05478cdb3c0d5a8c2d16e49d2fc5da7d0351c99c6a8e3e87fadfdbbe745cc2b70f4a328a850aac22341265b138e
-  languageName: node
-  linkType: hard
-
-"@glimmer/validator@npm:^0.44.0":
-  version: 0.44.0
-  resolution: "@glimmer/validator@npm:0.44.0"
-  checksum: c68a169ee196a17a142b2375928d1b5b2bad2f1f7961a9a14b6a5ef0b8d5c66af7004d678502d2ae83f6b69c1745cbcecbf71607b140924dec9da96e413fd8d4
-  languageName: node
-  linkType: hard
-
-"@glimmer/vm-babel-plugins@npm:0.83.1":
-  version: 0.83.1
-  resolution: "@glimmer/vm-babel-plugins@npm:0.83.1"
-  dependencies:
-    babel-plugin-debug-macros: ^0.3.4
-  checksum: 47249a5d29c1cb2ad7e9f8d3c12a9e9e21f41907d1e5380f6bb89848ef84329251a41856bc50b37d68992150bc77c49efaff17487a8ebe597dbf564339398ad9
-  languageName: node
-  linkType: hard
-
-"@glimmer/vm@npm:^0.42.2":
-  version: 0.42.2
-  resolution: "@glimmer/vm@npm:0.42.2"
-  dependencies:
-    "@glimmer/interfaces": ^0.42.2
-    "@glimmer/util": ^0.42.2
-  checksum: 3adb1963fb5cfe9ee795e10f144ec0ba1c5e9289525a95b3e506d05477da47247f36e01837dbfe5f728d74a6d44f4d62e1a59e7ec9ebdaabf5cbe955c643dc34
-  languageName: node
-  linkType: hard
-
-"@glimmer/wire-format@npm:^0.42.2":
-  version: 0.42.2
-  resolution: "@glimmer/wire-format@npm:0.42.2"
-  dependencies:
-    "@glimmer/interfaces": ^0.42.2
-    "@glimmer/util": ^0.42.2
-  checksum: f1778ba0ec24a41f15b55e328854d9e9dbd3371269bc6912b633b5487f52f725a8f12b0ef9ba4b9614633b89abdc2b02ee7a25a07b28ab2452ffe6b854589adb
-  languageName: node
-  linkType: hard
-
-"@handlebars/parser@npm:~2.0.0":
-  version: 2.0.0
-  resolution: "@handlebars/parser@npm:2.0.0"
-  checksum: add32d6678b18db73fb88266138bc358abf94c255f4464b936b5b66e3108205c6cc3b611a726e0a691633552b94c0f9f65aed43fd4c51ecbbfb562179c967d88
-  languageName: node
-  linkType: hard
-
-"@hashicorp/design-system-components@npm:2.3.1":
-  version: 2.3.1
-  resolution: "@hashicorp/design-system-components@npm:2.3.1"
-  dependencies:
-    "@ember/render-modifiers": ^2.0.5
-    "@hashicorp/design-system-tokens": ^1.5.0
-    "@hashicorp/ember-flight-icons": ^3.0.2
-    dialog-polyfill: ^0.5.6
-    ember-a11y-refocus: ^3.0.2
-    ember-auto-import: ^2.6.0
-    ember-cached-decorator-polyfill: ^0.1.4
-    ember-cli-babel: ^7.26.11
-    ember-cli-htmlbars: ^6.2.0
-    ember-cli-sass: ^10.0.1
-    ember-composable-helpers: ^4.5.0
-    ember-focus-trap: ^1.0.1
-    ember-keyboard: ^8.1.0
-    ember-named-blocks-polyfill: ^0.2.5
-    ember-stargate: ^0.4.3
-    ember-style-modifier: ^0.8.0
-    ember-truth-helpers: ^3.0.0
-    sass: ^1.58.3
-    tippy.js: ^6.3.7
-  checksum: 07d2ac71f8d345cde731c15ff5ef83a57a2f8ab3b56fd71bec122d50db8a8b10968c4b0344055b6314a85350b6ca1fda6dc290d31da61086c25d6d131dcc7c9b
-  languageName: node
-  linkType: hard
-
-"@hashicorp/design-system-tokens@npm:^1.5.0":
-  version: 1.5.0
-  resolution: "@hashicorp/design-system-tokens@npm:1.5.0"
-  checksum: 79b8f823953f1de7a715203291b96d0c74d9ab10ad38c1f4664cfd7c1ed014ef2f7534a8e9dc20778d1c9a29b8c9a340e2fb84070639c91f637f5348f8f694f2
-  languageName: node
-  linkType: hard
-
-"@hashicorp/ember-flight-icons@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "@hashicorp/ember-flight-icons@npm:3.0.2"
-  dependencies:
-    "@hashicorp/flight-icons": ^2.12.0
-    ember-auto-import: ^2.4.2
-    ember-cli-babel: ^7.26.11
-    ember-cli-htmlbars: ^6.1.0
-  checksum: 325982c6d2e05ed73bed183c43eaa5883a60ec02cb055f418adf26e870eaadf763233643b1ec8f2546bb564a8a3b4053ac086c4e24f8924ed94611e3e0519d1b
-  languageName: node
-  linkType: hard
-
-"@hashicorp/flight-icons@npm:^2.12.0":
-  version: 2.12.0
-  resolution: "@hashicorp/flight-icons@npm:2.12.0"
-  checksum: dbc7316ad69f8209fd196254e2ae7c47984181822e367eaea1301176083240fbbf64a7230adf787b7669d606fe329461e01ca738e514beac9742cb1ba0103f9a
-  languageName: node
-  linkType: hard
-
-"@hashicorp/structure-icons@npm:^1.3.0":
-  version: 1.8.1
-  resolution: "@hashicorp/structure-icons@npm:1.8.1"
-  checksum: 578afba4c884a32c196e87cfa22f66482faf0bd9ccf78591e8d16dedec1eff60e95d90858b0607e7a0136922c551f5649bcfc4d6557b27e2688f2c78434c12cd
-  languageName: node
-  linkType: hard
-
-"@humanwhocodes/config-array@npm:^0.11.6":
-  version: 0.11.7
-  resolution: "@humanwhocodes/config-array@npm:0.11.7"
-  dependencies:
-    "@humanwhocodes/object-schema": ^1.2.1
-    debug: ^4.1.1
-    minimatch: ^3.0.5
-  checksum: cf506dc45d9488af7fbf108ea6ac2151ba1a25e6d2b94b9b4fc36d2c1e4099b89ff560296dbfa13947e44604d4ca4a90d97a4fb167370bf8dd01a6ca2b6d83ac
-  languageName: node
-  linkType: hard
-
-"@humanwhocodes/config-array@npm:^0.5.0":
-  version: 0.5.0
-  resolution: "@humanwhocodes/config-array@npm:0.5.0"
-  dependencies:
-    "@humanwhocodes/object-schema": ^1.2.0
-    debug: ^4.1.1
-    minimatch: ^3.0.4
-  checksum: 44ee6a9f05d93dd9d5935a006b17572328ba9caff8002442f601736cbda79c580cc0f5a49ce9eb88fbacc5c3a6b62098357c2e95326cd17bb9f1a6c61d6e95e7
-  languageName: node
-  linkType: hard
-
-"@humanwhocodes/module-importer@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "@humanwhocodes/module-importer@npm:1.0.1"
-  checksum: 0fd22007db8034a2cdf2c764b140d37d9020bbfce8a49d3ec5c05290e77d4b0263b1b972b752df8c89e5eaa94073408f2b7d977aed131faf6cf396ebb5d7fb61
-  languageName: node
-  linkType: hard
-
-"@humanwhocodes/object-schema@npm:^1.2.0, @humanwhocodes/object-schema@npm:^1.2.1":
-  version: 1.2.1
-  resolution: "@humanwhocodes/object-schema@npm:1.2.1"
-  checksum: a824a1ec31591231e4bad5787641f59e9633827d0a2eaae131a288d33c9ef0290bd16fda8da6f7c0fcb014147865d12118df10db57f27f41e20da92369fcb3f1
-  languageName: node
-  linkType: hard
-
-"@icholy/duration@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "@icholy/duration@npm:5.1.0"
-  checksum: 48c7c23697a510944bfc52cf0d354eba2b65d14633f910f2dc4c2a5e10e078d3b70bed9b310c37a574f0e6863084aa6cc65518cfc4af5cb2174605c7aad33352
-  languageName: node
-  linkType: hard
-
-"@jridgewell/gen-mapping@npm:^0.3.0":
-  version: 0.3.1
-  resolution: "@jridgewell/gen-mapping@npm:0.3.1"
-  dependencies:
-    "@jridgewell/set-array": ^1.0.0
-    "@jridgewell/sourcemap-codec": ^1.4.10
-    "@jridgewell/trace-mapping": ^0.3.9
-  checksum: e9e7bb3335dea9e60872089761d4e8e089597360cdb1af90370e9d53b7d67232c1e0a3ab65fbfef4fc785745193fbc56bff9f3a6cab6c6ce3f15e12b4191f86b
-  languageName: node
-  linkType: hard
-
-"@jridgewell/gen-mapping@npm:^0.3.2":
-  version: 0.3.2
-  resolution: "@jridgewell/gen-mapping@npm:0.3.2"
-  dependencies:
-    "@jridgewell/set-array": ^1.0.1
-    "@jridgewell/sourcemap-codec": ^1.4.10
-    "@jridgewell/trace-mapping": ^0.3.9
-  checksum: 1832707a1c476afebe4d0fbbd4b9434fdb51a4c3e009ab1e9938648e21b7a97049fa6009393bdf05cab7504108413441df26d8a3c12193996e65493a4efb6882
-  languageName: node
-  linkType: hard
-
-"@jridgewell/resolve-uri@npm:^3.0.3":
-  version: 3.0.5
-  resolution: "@jridgewell/resolve-uri@npm:3.0.5"
-  checksum: 1ee652b693da7979ac4007926cc3f0a32b657ffeb913e111f44e5b67153d94a2f28a1d560101cc0cf8087625468293a69a00f634a2914e1a6d0817ba2039a913
-  languageName: node
-  linkType: hard
-
-"@jridgewell/set-array@npm:^1.0.0":
-  version: 1.1.1
-  resolution: "@jridgewell/set-array@npm:1.1.1"
-  checksum: cc5d91e0381c347e3edee4ca90b3c292df9e6e55f29acbe0dd97de8651b4730e9ab761406fd572effa79972a0edc55647b627f8c72315e276d959508853d9bf2
-  languageName: node
-  linkType: hard
-
-"@jridgewell/set-array@npm:^1.0.1":
-  version: 1.1.2
-  resolution: "@jridgewell/set-array@npm:1.1.2"
-  checksum: 69a84d5980385f396ff60a175f7177af0b8da4ddb81824cb7016a9ef914eee9806c72b6b65942003c63f7983d4f39a5c6c27185bbca88eb4690b62075602e28e
-  languageName: node
-  linkType: hard
-
-"@jridgewell/source-map@npm:^0.3.2":
-  version: 0.3.2
-  resolution: "@jridgewell/source-map@npm:0.3.2"
-  dependencies:
-    "@jridgewell/gen-mapping": ^0.3.0
-    "@jridgewell/trace-mapping": ^0.3.9
-  checksum: 1b83f0eb944e77b70559a394d5d3b3f98a81fcc186946aceb3ef42d036762b52ef71493c6c0a3b7c1d2f08785f53ba2df1277fe629a06e6109588ff4cdcf7482
-  languageName: node
-  linkType: hard
-
-"@jridgewell/sourcemap-codec@npm:^1.4.10":
-  version: 1.4.11
-  resolution: "@jridgewell/sourcemap-codec@npm:1.4.11"
-  checksum: 3b2afaf8400fb07a36db60e901fcce6a746cdec587310ee9035939d89878e57b2dec8173b0b8f63176f647efa352294049a53c49739098eb907ff81fec2547c8
-  languageName: node
-  linkType: hard
-
-"@jridgewell/trace-mapping@npm:^0.3.0":
-  version: 0.3.4
-  resolution: "@jridgewell/trace-mapping@npm:0.3.4"
-  dependencies:
-    "@jridgewell/resolve-uri": ^3.0.3
-    "@jridgewell/sourcemap-codec": ^1.4.10
-  checksum: ab8bce84bbbc8c34f3ba8325ed926f8f2d3098983c10442a80c55764c4eb6e47d5b92d8ff20a0dd868c3e76a3535651fd8a0138182c290dbfc8396195685c37b
-  languageName: node
-  linkType: hard
-
-"@jridgewell/trace-mapping@npm:^0.3.7, @jridgewell/trace-mapping@npm:^0.3.9":
-  version: 0.3.13
-  resolution: "@jridgewell/trace-mapping@npm:0.3.13"
-  dependencies:
-    "@jridgewell/resolve-uri": ^3.0.3
-    "@jridgewell/sourcemap-codec": ^1.4.10
-  checksum: e38254e830472248ca10a6ed1ae75af5e8514f0680245a5e7b53bc3c030fd8691d4d3115d80595b45d3badead68269769ed47ecbbdd67db1343a11f05700e75a
-  languageName: node
-  linkType: hard
-
-"@lint-todo/utils@npm:^13.0.3":
-  version: 13.0.3
-  resolution: "@lint-todo/utils@npm:13.0.3"
-  dependencies:
-    "@types/eslint": ^7.2.13
-    find-up: ^5.0.0
-    fs-extra: ^9.1.0
-    proper-lockfile: ^4.1.2
-    slash: ^3.0.0
-    tslib: ^2.3.1
-    upath: ^2.0.1
-  checksum: be45ba795e166160a3cfb7fc5f5054cb7c9dd6fe0f5cd39cc15eff7fe70e3c78c8e12b26e97415f1f67e34c80a5d0fafec51b56e725919fabcc7abdf5dfc6244
-  languageName: node
-  linkType: hard
-
-"@mdn/browser-compat-data@npm:^3.3.14":
-  version: 3.3.14
-  resolution: "@mdn/browser-compat-data@npm:3.3.14"
-  checksum: 0363cc9cb3cef308b78b3ba82af0542ad928bacecc95ee1e849c134c3eb866f4771df9fb064fd4da42fdb28e2d6932e0abb6e47ed47fbc42a26a9b0a5aee1e9f
-  languageName: node
-  linkType: hard
-
-"@mdn/browser-compat-data@npm:^4.1.5":
-  version: 4.2.1
-  resolution: "@mdn/browser-compat-data@npm:4.2.1"
-  checksum: 76eaa7dafed154040e769ba6d23f2dcb58e805ed3ccb376a5c4b76326c92643753c20194faed363870800dc3c1af26c107b8562710c8bb37aaee8c5ffe2a89cd
-  languageName: node
-  linkType: hard
-
-"@messageformat/core@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "@messageformat/core@npm:3.0.1"
-  dependencies:
-    "@messageformat/date-skeleton": ^1.0.0
-    "@messageformat/number-skeleton": ^1.0.0
-    "@messageformat/parser": ^5.0.0
-    "@messageformat/runtime": ^3.0.1
-    make-plural: ^7.0.0
-    safe-identifier: ^0.4.1
-  checksum: f08c982d54ef2ddf32de2a3425746e6efd37ce63154f97ff038edb1e02eb4e3e4c39f2aa42ef3d036e2f1b61eee0a2589e76158b0b91510355ef8348f2f8252f
-  languageName: node
-  linkType: hard
-
-"@messageformat/date-skeleton@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "@messageformat/date-skeleton@npm:1.0.1"
-  checksum: 0832029a18ae54c81d4473eaa764cebbabe084d1a3253a6d4975e5802bff7416a51d43522aad9292eb9663735282a7667e2818efc92905c497ca87424d822ceb
-  languageName: node
-  linkType: hard
-
-"@messageformat/number-skeleton@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "@messageformat/number-skeleton@npm:1.1.0"
-  checksum: 03cf337ef4b95782546e8e2c831f7d2f1310ee9f49635adeef1259c17256c91cb68a59fb97b76a59fddaac284ee739c0a0e0003bcec8d92f6ff156a240a6c23f
-  languageName: node
-  linkType: hard
-
-"@messageformat/parser@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "@messageformat/parser@npm:5.0.0"
-  dependencies:
-    moo: ^0.5.1
-  checksum: e595910e8801e17b1e762a1824e4fc97baf6ccc21f5f896d6eae3e537ca2eaed0f699ac20b44d03c38ad20340b57ef0f7c7cf056213d31dd156e65b4d030c8c0
-  languageName: node
-  linkType: hard
-
-"@messageformat/runtime@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "@messageformat/runtime@npm:3.0.1"
-  dependencies:
-    make-plural: ^7.0.0
-  checksum: e69c3b0b372e15af88c285f6884ac0e3ba5fc7227b8ddc7f4bef94cb5675057126dc0ae9001e2a623d7ec61727d9b5e69b8e61be8618afe0baf40081ad3b0568
-  languageName: node
-  linkType: hard
-
-"@miragejs/pretender-node-polyfill@npm:^0.1.0":
-  version: 0.1.2
-  resolution: "@miragejs/pretender-node-polyfill@npm:0.1.2"
-  checksum: bb55983a253dc0d4162acac090b062500595c9844bfbd21fe25bc1f926808d0070d710e622aa6285fa16c673a65cf3e05f4b32e888c469f1bde8888a7934ee44
-  languageName: node
-  linkType: hard
-
-"@nodelib/fs.scandir@npm:2.1.4":
-  version: 2.1.4
-  resolution: "@nodelib/fs.scandir@npm:2.1.4"
-  dependencies:
-    "@nodelib/fs.stat": 2.0.4
-    run-parallel: ^1.1.9
-  checksum: 18c2150ab52a042bd65babe5b70106e6586dc036644131c33d253ff99e5eeef2e65858ab40161530a6f22b512a65e7c7629f0f1e0f35c00ee4c606f960d375ba
-  languageName: node
-  linkType: hard
-
-"@nodelib/fs.scandir@npm:2.1.5":
-  version: 2.1.5
-  resolution: "@nodelib/fs.scandir@npm:2.1.5"
-  dependencies:
-    "@nodelib/fs.stat": 2.0.5
-    run-parallel: ^1.1.9
-  checksum: a970d595bd23c66c880e0ef1817791432dbb7acbb8d44b7e7d0e7a22f4521260d4a83f7f9fd61d44fda4610105577f8f58a60718105fb38352baed612fd79e59
-  languageName: node
-  linkType: hard
-
-"@nodelib/fs.stat@npm:2.0.4, @nodelib/fs.stat@npm:^2.0.2":
-  version: 2.0.4
-  resolution: "@nodelib/fs.stat@npm:2.0.4"
-  checksum: d0d9745f878816d041a8b36faf5797d88ba961274178f0ad1f7fe0efef8118ca9bd0e43e4d0d85a9af911bd35122ec1580e626a83d7595fc4d60f2c1c70e2665
-  languageName: node
-  linkType: hard
-
-"@nodelib/fs.stat@npm:2.0.5":
-  version: 2.0.5
-  resolution: "@nodelib/fs.stat@npm:2.0.5"
-  checksum: 012480b5ca9d97bff9261571dbbec7bbc6033f69cc92908bc1ecfad0792361a5a1994bc48674b9ef76419d056a03efadfce5a6cf6dbc0a36559571a7a483f6f0
-  languageName: node
-  linkType: hard
-
-"@nodelib/fs.walk@npm:^1.2.3":
-  version: 1.2.6
-  resolution: "@nodelib/fs.walk@npm:1.2.6"
-  dependencies:
-    "@nodelib/fs.scandir": 2.1.4
-    fastq: ^1.6.0
-  checksum: d156901823b3d3de368ad68047a964523e0ce5f796c0aa7712443b1f748d8e7fc24ce2c0f18d22a177e1f1c6092bca609ab5e4cb1792c41cdc8a6989bc391139
-  languageName: node
-  linkType: hard
-
-"@nodelib/fs.walk@npm:^1.2.8":
-  version: 1.2.8
-  resolution: "@nodelib/fs.walk@npm:1.2.8"
-  dependencies:
-    "@nodelib/fs.scandir": 2.1.5
-    fastq: ^1.6.0
-  checksum: 190c643f156d8f8f277bf2a6078af1ffde1fd43f498f187c2db24d35b4b4b5785c02c7dc52e356497b9a1b65b13edc996de08de0b961c32844364da02986dc53
-  languageName: node
-  linkType: hard
-
-"@npmcli/fs@npm:^2.1.0":
-  version: 2.1.2
-  resolution: "@npmcli/fs@npm:2.1.2"
-  dependencies:
-    "@gar/promisify": ^1.1.3
-    semver: ^7.3.5
-  checksum: 405074965e72d4c9d728931b64d2d38e6ea12066d4fad651ac253d175e413c06fe4350970c783db0d749181da8fe49c42d3880bd1cbc12cd68e3a7964d820225
-  languageName: node
-  linkType: hard
-
-"@npmcli/move-file@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "@npmcli/move-file@npm:2.0.1"
-  dependencies:
-    mkdirp: ^1.0.4
-    rimraf: ^3.0.2
-  checksum: 52dc02259d98da517fae4cb3a0a3850227bdae4939dda1980b788a7670636ca2b4a01b58df03dd5f65c1e3cb70c50fa8ce5762b582b3f499ec30ee5ce1fd9380
-  languageName: node
-  linkType: hard
-
-"@popperjs/core@npm:^2.9.0":
-  version: 2.11.7
-  resolution: "@popperjs/core@npm:2.11.7"
-  checksum: 5b6553747899683452a1d28898c1b39173a4efd780e74360bfcda8eb42f1c5e819602769c81a10920fc68c881d07fb40429604517d499567eac079cfa6470f19
-  languageName: node
-  linkType: hard
-
-"@prettier/eslint@npm:prettier-eslint@^15.0.1":
-  version: 15.0.1
-  resolution: "prettier-eslint@npm:15.0.1"
-  dependencies:
-    "@types/eslint": ^8.4.2
-    "@types/prettier": ^2.6.0
-    "@typescript-eslint/parser": ^5.10.0
-    common-tags: ^1.4.0
-    dlv: ^1.1.0
-    eslint: ^8.7.0
-    indent-string: ^4.0.0
-    lodash.merge: ^4.6.0
-    loglevel-colored-level-prefix: ^1.0.0
-    prettier: ^2.5.1
-    pretty-format: ^23.0.1
-    require-relative: ^0.8.7
-    typescript: ^4.5.4
-    vue-eslint-parser: ^8.0.1
-  checksum: fad92d666ab92f6c773faf507ee15f2c0de8c8ac2b692a57a7c0621202f90d9e577f2664d8a701ec3b96bec3ecba586e49c3d9170de9392c0ee7c3362fdddcae
-  languageName: node
-  linkType: hard
-
-"@rollup/plugin-replace@npm:2.3.0":
-  version: 2.3.0
-  resolution: "@rollup/plugin-replace@npm:2.3.0"
-  dependencies:
-    magic-string: ^0.25.2
-    rollup-pluginutils: ^2.6.0
-  peerDependencies:
-    rollup: ^1.20.0
-  checksum: 561e483398d15f594ebc87fda2760a5528da9abfa1fe1c3865280e18201fafb4e60587dc38e8b7781b15db10acc39da5f6ec700ac129fc931d31c060b304b96b
-  languageName: node
-  linkType: hard
-
-"@simple-dom/interface@npm:^1.4.0":
-  version: 1.4.0
-  resolution: "@simple-dom/interface@npm:1.4.0"
-  checksum: e0ce8b6174208c5a369c2650094d16080230bf90cb95cc8258f9fd6b93be8afedbffb9d63da7f1d295a4e8d901f5fff907a69e1d55556db9e8544f2615b2f1d7
-  languageName: node
-  linkType: hard
-
-"@sinonjs/commons@npm:^1, @sinonjs/commons@npm:^1.3.0, @sinonjs/commons@npm:^1.4.0, @sinonjs/commons@npm:^1.7.0":
-  version: 1.8.3
-  resolution: "@sinonjs/commons@npm:1.8.3"
-  dependencies:
-    type-detect: 4.0.8
-  checksum: 6159726db5ce6bf9f2297f8427f7ca5b3dff45b31e5cee23496f1fa6ef0bb4eab878b23fb2c5e6446381f6a66aba4968ef2fc255c1180d753d4b8c271636a2e5
-  languageName: node
-  linkType: hard
-
-"@sinonjs/formatio@npm:^3.2.1":
-  version: 3.2.2
-  resolution: "@sinonjs/formatio@npm:3.2.2"
-  dependencies:
-    "@sinonjs/commons": ^1
-    "@sinonjs/samsam": ^3.1.0
-  checksum: ddc30698df9b0aa59204da93ca94fd04bc5672ac03c798c0a487c35d514d7d8e0ce0e4c72386fc80e29f59cb1cc54eeea3b7f804281b3c4e3dd2394de56c6e4a
-  languageName: node
-  linkType: hard
-
-"@sinonjs/samsam@npm:^3.1.0, @sinonjs/samsam@npm:^3.3.3":
-  version: 3.3.3
-  resolution: "@sinonjs/samsam@npm:3.3.3"
-  dependencies:
-    "@sinonjs/commons": ^1.3.0
-    array-from: ^2.1.1
-    lodash: ^4.17.15
-  checksum: 340f2f62dec3fa1e5e9300a75996bd12ab9d2da4f6b453fa5d1ee101cc5e58eb218af2e2584b496d41ba31c3c0854d47a691fd9a0d8b9092f3cb6a5c7a080856
-  languageName: node
-  linkType: hard
-
-"@sinonjs/text-encoding@npm:^0.7.1":
-  version: 0.7.1
-  resolution: "@sinonjs/text-encoding@npm:0.7.1"
-  checksum: 130de0bb568c5f8a611ec21d1a4e3f80ab0c5ec333010f49cfc1adc5cba6d8808699c8a587a46b0f0b016a1f4c1389bc96141e773e8460fcbb441875b2e91ba7
-  languageName: node
-  linkType: hard
-
-"@socket.io/component-emitter@npm:~3.1.0":
-  version: 3.1.0
-  resolution: "@socket.io/component-emitter@npm:3.1.0"
-  checksum: db069d95425b419de1514dffe945cc439795f6a8ef5b9465715acf5b8b50798e2c91b8719cbf5434b3fe7de179d6cdcd503c277b7871cb3dd03febb69bdd50fa
-  languageName: node
-  linkType: hard
-
-"@textlint/ast-node-types@npm:^12.1.1":
-  version: 12.1.1
-  resolution: "@textlint/ast-node-types@npm:12.1.1"
-  checksum: 6ccae9ac7f43cb172142098a3764c490feea311a741aa3fe981d6d3a1e06041d179e690b54b920dcaa067453f3220d46e6935728e4c9d72233f735f27410e86f
-  languageName: node
-  linkType: hard
-
-"@textlint/markdown-to-ast@npm:^12.1.1":
-  version: 12.1.1
-  resolution: "@textlint/markdown-to-ast@npm:12.1.1"
-  dependencies:
-    "@textlint/ast-node-types": ^12.1.1
-    debug: ^4.3.3
-    remark-footnotes: ^3.0.0
-    remark-frontmatter: ^3.0.0
-    remark-gfm: ^1.0.0
-    remark-parse: ^9.0.0
-    traverse: ^0.6.6
-    unified: ^9.2.2
-  checksum: c857a9e3b26fd96486cf96914c15c20d68d7d1b2f201295a75acec1ccc14725a54d76e9f9311170f56dd43a1666ac3a69b85f7e794af915bc6e23953cd5921a9
-  languageName: node
-  linkType: hard
-
-"@tootallnate/once@npm:2":
-  version: 2.0.0
-  resolution: "@tootallnate/once@npm:2.0.0"
-  checksum: ad87447820dd3f24825d2d947ebc03072b20a42bfc96cbafec16bff8bbda6c1a81fcb0be56d5b21968560c5359a0af4038a68ba150c3e1694fe4c109a063bed8
-  languageName: node
-  linkType: hard
-
-"@tsconfig/ember@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "@tsconfig/ember@npm:1.0.1"
-  checksum: e53968a3ebcb099f13da1377c3216a48af7e20d5489f7dbb2e3297def30b5cc5390db7b632fa6d0fa98e52e6e3c636c5fb2a2b6b1850c2475d5e87a26739b2e6
-  languageName: node
-  linkType: hard
-
-"@types/acorn@npm:^4.0.3":
-  version: 4.0.5
-  resolution: "@types/acorn@npm:4.0.5"
-  dependencies:
-    "@types/estree": "*"
-  checksum: 2079630adff1224120ac40c2f503fe602582d9d84f732a32550c7bbd0c87741a88bc5bc4cdba7888211d04bfa9fcb09c7c211889aa6c15ddb0150a30a36955ae
-  languageName: node
-  linkType: hard
-
-"@types/body-parser@npm:*":
-  version: 1.19.0
-  resolution: "@types/body-parser@npm:1.19.0"
-  dependencies:
-    "@types/connect": "*"
-    "@types/node": "*"
-  checksum: 15043566f1909e2a08dabb0a5d2642f8988545a1369bc5995fc40ee90c95200da2aa66f9240fcb19fc6af6ff4e27ff453f311b49363c14bb308c308c0751ca9b
-  languageName: node
-  linkType: hard
-
-"@types/broccoli-plugin@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@types/broccoli-plugin@npm:3.0.0"
-  dependencies:
-    broccoli-plugin: "*"
-  checksum: c5daf3b3ff689a00fa18c90c08e2998c373b7ee11235fcd63ad5ad03ff5d9b844f2b84fca966682490853a443714db4d2f0b389208478a0c1d4e7666f85ca04f
-  languageName: node
-  linkType: hard
-
-"@types/chai-as-promised@npm:^7.1.2":
-  version: 7.1.3
-  resolution: "@types/chai-as-promised@npm:7.1.3"
-  dependencies:
-    "@types/chai": "*"
-  checksum: cf0232eb7bc450fc37c8f4688c91ef86528fb994f67036480cba4679299a99ad65a3a2dcaf34c748b30c0cf9f392761f11cee2a9f5c8e26d9ca07ae934aa4465
-  languageName: node
-  linkType: hard
-
-"@types/chai@npm:*, @types/chai@npm:^4.2.9":
-  version: 4.2.17
-  resolution: "@types/chai@npm:4.2.17"
-  checksum: a5657eea35d797d494cca1b479499ff129a051c7a74e4cbeb2a0660d9a263541c24f4bda9d827f806f36f90e0b46038069bad3eac7559c40f59f212ff09696f0
-  languageName: node
-  linkType: hard
-
-"@types/connect@npm:*":
-  version: 3.4.34
-  resolution: "@types/connect@npm:3.4.34"
-  dependencies:
-    "@types/node": "*"
-  checksum: c6e2aa299cf3979c00602f48ce9163700f0cbfec6ba2a8e1506d08f51da0279805a478ea094252fad7c369a563ee033b359c708ab34b1763397c58d7e2df07ad
-  languageName: node
-  linkType: hard
-
-"@types/cookie@npm:^0.4.1":
-  version: 0.4.1
-  resolution: "@types/cookie@npm:0.4.1"
-  checksum: 3275534ed69a76c68eb1a77d547d75f99fedc80befb75a3d1d03662fb08d697e6f8b1274e12af1a74c6896071b11510631ba891f64d30c78528d0ec45a9c1a18
-  languageName: node
-  linkType: hard
-
-"@types/cors@npm:^2.8.12":
-  version: 2.8.12
-  resolution: "@types/cors@npm:2.8.12"
-  checksum: 8c45f112c7d1d2d831b4b266f2e6ed33a1887a35dcbfe2a18b28370751fababb7cd045e745ef84a523c33a25932678097bf79afaa367c6cb3fa0daa7a6438257
-  languageName: node
-  linkType: hard
-
-"@types/ember-data@npm:*, @types/ember-data@npm:^4.4.6":
-  version: 4.4.6
-  resolution: "@types/ember-data@npm:4.4.6"
-  dependencies:
-    "@types/ember": "*"
-    "@types/ember__error": "*"
-    "@types/ember__object": "*"
-    "@types/rsvp": "*"
-  checksum: 641f43f5c82aab651ef00555ffe07cdf8c1e0ac581ade582479e48b3e89a258efbf083391b20b723c239eadac0418b1eb4c3ce14ec9a61477ac33f758379fae7
-  languageName: node
-  linkType: hard
-
-"@types/ember-data__adapter@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "@types/ember-data__adapter@npm:4.0.1"
-  dependencies:
-    "@types/ember-data": "*"
-  checksum: 5636fc85c2b7496d608af5494d1c6b82a3bf7f0d88f9037824bf203b0e4e167805544eebef63e019991a5a388e567851b211a041f4b3d12ddb1881748e5a65a9
-  languageName: node
-  linkType: hard
-
-"@types/ember-data__model@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "@types/ember-data__model@npm:4.0.0"
-  dependencies:
-    "@types/ember-data": "*"
-  checksum: 6a46583608af66018c9ce88d2d3cbe21f5526f479f9a442d3d3a0ab69f282437b8478fbcca4bafa9236c9e5cbc4ffe7ddadd2e1a6a81d6b58ebe553011970485
-  languageName: node
-  linkType: hard
-
-"@types/ember-data__serializer@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "@types/ember-data__serializer@npm:4.0.1"
-  dependencies:
-    "@types/ember-data": "*"
-  checksum: e2e14b8c99a3d33bff69aee1bdaf1b90fc5e87482fc49a22f4ff0aa9892494a0f8c72231ac600e8686d77598579c524587319f76520ce59b8a9ac3895a1de1e3
-  languageName: node
-  linkType: hard
-
-"@types/ember-data__store@npm:^4.0.2":
-  version: 4.0.2
-  resolution: "@types/ember-data__store@npm:4.0.2"
-  dependencies:
-    "@types/ember-data": "*"
-  checksum: 7b1ac271ab4fc327d495fd2abe32f780660c4daa5b2e3f720d61776dd235b7f9b8ea46d1b9b523f14975e0e2c7d3aa13990cd116a13440c8f43fa9e389393337
-  languageName: node
-  linkType: hard
-
-"@types/ember-qunit@npm:^5.0.2":
-  version: 5.0.2
-  resolution: "@types/ember-qunit@npm:5.0.2"
-  dependencies:
-    "@types/ember-resolver": "*"
-    "@types/ember__test": "*"
-    "@types/ember__test-helpers": "*"
-    "@types/qunit": "*"
-  checksum: f7c6e9e5721e0708e7290e68e2f14b55baa4dd5d27fd3bb760dc380e92aa03d3b7b93da090d40e34d47d85e6d4451a73e7a7f4398708047164bb10e46da60ad2
-  languageName: node
-  linkType: hard
-
-"@types/ember-resolver@npm:*, @types/ember-resolver@npm:^5.0.13":
-  version: 5.0.13
-  resolution: "@types/ember-resolver@npm:5.0.13"
-  dependencies:
-    "@types/ember__object": "*"
-    "@types/ember__owner": "*"
-  checksum: 3ece114d8368768d8198e3156b2df51b4be9d4f9ab8d60f2a1cb63a301b48ec485f51f5ddc8ad9b6f4d3739d252107463ff2508bec559efb7d8593e4975e3f48
-  languageName: node
-  linkType: hard
-
-"@types/ember@npm:*, @types/ember@npm:^4.0.2":
-  version: 4.0.2
-  resolution: "@types/ember@npm:4.0.2"
-  dependencies:
-    "@types/ember__application": "*"
-    "@types/ember__array": "*"
-    "@types/ember__component": "*"
-    "@types/ember__controller": "*"
-    "@types/ember__debug": "*"
-    "@types/ember__engine": "*"
-    "@types/ember__error": "*"
-    "@types/ember__object": "*"
-    "@types/ember__polyfills": "*"
-    "@types/ember__routing": "*"
-    "@types/ember__runloop": "*"
-    "@types/ember__service": "*"
-    "@types/ember__string": "*"
-    "@types/ember__template": "*"
-    "@types/ember__test": "*"
-    "@types/ember__utils": "*"
-    "@types/htmlbars-inline-precompile": "*"
-    "@types/rsvp": "*"
-  checksum: 94d3dfba4209ae66119bd1d1bd3aa00c04184d23393c1cffcaf325d984a9ddc0928956be48061d9ce4a6ab0ff371e917f0313b202aeda74c098a1528e6b8c741
-  languageName: node
-  linkType: hard
-
-"@types/ember__application@npm:*, @types/ember__application@npm:^4.0.4":
-  version: 4.0.4
-  resolution: "@types/ember__application@npm:4.0.4"
-  dependencies:
-    "@glimmer/component": ^1.1.0
-    "@types/ember": "*"
-    "@types/ember__application": "*"
-    "@types/ember__engine": "*"
-    "@types/ember__object": "*"
-    "@types/ember__owner": "*"
-    "@types/ember__routing": "*"
-  checksum: 4d5bd9793409d2814d1a068a1a9ee0db8036efb6975266703f5fcd5da21e4194602585e2343567f9f5dff47649a28e4174c7e6eb446f6285e80a2237344c391a
-  languageName: node
-  linkType: hard
-
-"@types/ember__array@npm:*, @types/ember__array@npm:^4.0.3":
-  version: 4.0.3
-  resolution: "@types/ember__array@npm:4.0.3"
-  dependencies:
-    "@types/ember": "*"
-    "@types/ember__array": "*"
-    "@types/ember__object": "*"
-  checksum: 682104300933d306be946d0d86821469800b9849a51b745b35872d3958dc9d0f6f7d1bd2e5da6d5c26bd0c3184639f94d7bde274a16bb8a6c58cef08ddb8a0a6
-  languageName: node
-  linkType: hard
-
-"@types/ember__component@npm:*, @types/ember__component@npm:^4.0.11":
-  version: 4.0.11
-  resolution: "@types/ember__component@npm:4.0.11"
-  dependencies:
-    "@types/ember": "*"
-    "@types/ember__component": "*"
-    "@types/ember__object": "*"
-  checksum: 8b3a012ab6915f43e5d756883e1a05e5a75514d03e4666702bbfeebe1dfab9d0cebbd377ff38908d097bed977ed5a4c4d0fb709d7f657d31386c1f80bbc6d51c
-  languageName: node
-  linkType: hard
-
-"@types/ember__controller@npm:*, @types/ember__controller@npm:^4.0.3":
-  version: 4.0.3
-  resolution: "@types/ember__controller@npm:4.0.3"
-  dependencies:
-    "@types/ember__object": "*"
-  checksum: 1648b656f4a0cc10a28351d893fa765234bf0d8ab123afe75ba2259b31296840ae00da0328bed19241bfa66c0a59a6d237041493440008cd0a8daf9ef8fd1fa3
-  languageName: node
-  linkType: hard
-
-"@types/ember__debug@npm:*, @types/ember__debug@npm:^4.0.3":
-  version: 4.0.3
-  resolution: "@types/ember__debug@npm:4.0.3"
-  dependencies:
-    "@types/ember__debug": "*"
-    "@types/ember__object": "*"
-    "@types/ember__owner": "*"
-  checksum: 69a31777a6ba3dba0c8733b59e06e3f5eae0350cf9665421fd7adf23b8d9e43abfdc423d615b9ac91a4208c804e59c5d5f2b3000a7ed957bb9114a381536009c
-  languageName: node
-  linkType: hard
-
-"@types/ember__destroyable@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "@types/ember__destroyable@npm:4.0.1"
-  checksum: 5cd5f22cc9f76a841a11f805444af9717d964fe72ad7020cbc211a359b9e4a0447ef08aa3b9fb7b4caed593f7aebb4025bc77338afd3fe5e55a5ae20ca6be948
-  languageName: node
-  linkType: hard
-
-"@types/ember__engine@npm:*, @types/ember__engine@npm:^4.0.4":
-  version: 4.0.4
-  resolution: "@types/ember__engine@npm:4.0.4"
-  dependencies:
-    "@types/ember__engine": "*"
-    "@types/ember__object": "*"
-    "@types/ember__owner": "*"
-  checksum: 1b387a89206263ba26dfc0cc6417e8a3aecbb12af3d16522eeb09c78273da12851c5fca614099070920ec17c51ff50ba31e487d73259ab5673d143956b97d35a
-  languageName: node
-  linkType: hard
-
-"@types/ember__error@npm:*, @types/ember__error@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "@types/ember__error@npm:4.0.1"
-  checksum: b4cd081d0efe57c584fb031c8d2b26b16c1e79e4bd115f289a0db438a134ae6a787d03dbc13fe0d80eec5a87942053e5f4d663a9a86006862a4b131f5a0ffd8e
-  languageName: node
-  linkType: hard
-
-"@types/ember__object@npm:*, @types/ember__object@npm:^4.0.5":
-  version: 4.0.5
-  resolution: "@types/ember__object@npm:4.0.5"
-  dependencies:
-    "@types/ember": "*"
-    "@types/ember__object": "*"
-    "@types/rsvp": "*"
-  checksum: 445b5eef70f37c9f06da284742758e4626a3421c1f2e425bdbc7c9952cff14d8ce539f93d1c83b2836f043d4f10c20524a0ca1c7d58dee5db8f68893c1fd9c1e
-  languageName: node
-  linkType: hard
-
-"@types/ember__owner@npm:*":
-  version: 4.0.2
-  resolution: "@types/ember__owner@npm:4.0.2"
-  checksum: fca38292256a423851231805b07f150a17ff7ab2cf74533507c016d85180d229fe75999bf8c138276c272a8ff74364a88bf77ae6ff322dc16c05598e7d71dcd9
-  languageName: node
-  linkType: hard
-
-"@types/ember__polyfills@npm:*, @types/ember__polyfills@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "@types/ember__polyfills@npm:4.0.1"
-  checksum: a2b6ed3b0637fdeb6d4c93a3a1d5b7902e57124c860bf9bf82f1ea4148264991b8f0311ea6a8a50f5b243804f93650fc2a5f97a53192e0687213b41a5499e4be
-  languageName: node
-  linkType: hard
-
-"@types/ember__routing@npm:*, @types/ember__routing@npm:^4.0.12":
-  version: 4.0.12
-  resolution: "@types/ember__routing@npm:4.0.12"
-  dependencies:
-    "@types/ember": "*"
-    "@types/ember__controller": "*"
-    "@types/ember__object": "*"
-    "@types/ember__routing": "*"
-    "@types/ember__service": "*"
-  checksum: 8c14b6de35c9b370175dc342610729dba51b315a09f538ca5ad4e95d15ae0938efec8a6fd5675b862f2ca95da46528160896a417040654c621c8dbca34d8185b
-  languageName: node
-  linkType: hard
-
-"@types/ember__runloop@npm:*, @types/ember__runloop@npm:^4.0.2":
-  version: 4.0.2
-  resolution: "@types/ember__runloop@npm:4.0.2"
-  dependencies:
-    "@types/ember": "*"
-    "@types/ember__runloop": "*"
-  checksum: c207b35187d082be1330836dd120886ca86e14b029c7d89451fe4340ca4c500264f03a42558de62aa08e3e5743f7ac8aef84b668316d8f5db031eed109267aae
-  languageName: node
-  linkType: hard
-
-"@types/ember__service@npm:*, @types/ember__service@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "@types/ember__service@npm:4.0.1"
-  dependencies:
-    "@types/ember__object": "*"
-  checksum: f4b8c161e13148d6fa3930a4fcd80e454aad1bb2688ec2c2da6cbb9b6e20a8c3b78308dfa10cb4ec5c42696ca77930d7133093d3c2cf8f41c883d456e2d444cf
-  languageName: node
-  linkType: hard
-
-"@types/ember__string@npm:*, @types/ember__string@npm:^3.0.10":
-  version: 3.0.10
-  resolution: "@types/ember__string@npm:3.0.10"
-  checksum: 1ff40f641efbd91fc65da9d1cd8206b5ff3a7627fbbe5d00e00ba4ff116eee1863cff5d556e616d4896f5dd6fd4ae3d7f7191f8c726bdac44a568bd4fec4164f
-  languageName: node
-  linkType: hard
-
-"@types/ember__template@npm:*, @types/ember__template@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "@types/ember__template@npm:4.0.1"
-  checksum: 55c1bdccc1f11d428795da20832a1e52d76139af0a2378eb2ac6c18cf2406cd0b80007de4eafa5934a5b61cdf5979d9ad3e3ce27586b5908099e7535462d0b40
-  languageName: node
-  linkType: hard
-
-"@types/ember__test-helpers@npm:*, @types/ember__test-helpers@npm:^2.8.2":
-  version: 2.8.2
-  resolution: "@types/ember__test-helpers@npm:2.8.2"
-  dependencies:
-    "@types/ember-resolver": "*"
-    "@types/ember__application": "*"
-    "@types/ember__error": "*"
-    "@types/ember__owner": "*"
-    "@types/ember__test-helpers": "*"
-    "@types/htmlbars-inline-precompile": "*"
-  checksum: 8f89692d1808133b98e225b48ca5e3d94a781d539f092529f18ff525f898e914b3de6393fe7ed97567b5a04ca1fea6325325fd3e54a03b97c14c9ae4e8ee033b
-  languageName: node
-  linkType: hard
-
-"@types/ember__test@npm:*, @types/ember__test@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "@types/ember__test@npm:4.0.1"
-  dependencies:
-    "@types/ember__application": "*"
-  checksum: e303ed97b0d63e9b2c91c8b7bd2445b8c013e485f458f0122c8a961593dafdc9428ffc055f51527032c970c2591094600f00233cda894e1775bc671bde67c570
-  languageName: node
-  linkType: hard
-
-"@types/ember__utils@npm:*, @types/ember__utils@npm:^4.0.2":
-  version: 4.0.2
-  resolution: "@types/ember__utils@npm:4.0.2"
-  dependencies:
-    "@types/ember": "*"
-  checksum: 8fc60ec9a902211502f33bba4c7cb774838f96fa21cfc798d42b8801f3654059eab96bae8b7fcb7ac60eb499363b263a97daf987bfd9f07feaf973046d1d39df
-  languageName: node
-  linkType: hard
-
-"@types/eslint-scope@npm:^3.7.3":
-  version: 3.7.3
-  resolution: "@types/eslint-scope@npm:3.7.3"
-  dependencies:
-    "@types/eslint": "*"
-    "@types/estree": "*"
-  checksum: 6772b05e1b92003d1f295e81bc847a61f4fbe8ddab77ffa49e84ed3f9552513bdde677eb53ef167753901282857dd1d604d9f82eddb34a233495932b2dc3dc17
-  languageName: node
-  linkType: hard
-
-"@types/eslint@npm:*":
-  version: 8.4.3
-  resolution: "@types/eslint@npm:8.4.3"
-  dependencies:
-    "@types/estree": "*"
-    "@types/json-schema": "*"
-  checksum: cc199be84e22754cc625b171c90852da2b563088d32f4161d310b70470eab47f9bc812774c61eab6530083a214fe634abc32d06ef38e0a5e29f68436331cfabb
-  languageName: node
-  linkType: hard
-
-"@types/eslint@npm:^7.2.13":
-  version: 7.29.0
-  resolution: "@types/eslint@npm:7.29.0"
-  dependencies:
-    "@types/estree": "*"
-    "@types/json-schema": "*"
-  checksum: df13991c554954353ce8f3bb03e19da6cc71916889443d68d178d4f858b561ba4cc4a4f291c6eb9eebb7f864b12b9b9313051b3a8dfea3e513dadf3188a77bdf
-  languageName: node
-  linkType: hard
-
-"@types/eslint@npm:^8.4.2":
-  version: 8.4.10
-  resolution: "@types/eslint@npm:8.4.10"
-  dependencies:
-    "@types/estree": "*"
-    "@types/json-schema": "*"
-  checksum: 21e009ed9ed9bc8920fdafc6e11ff321c4538b4cc18a56fdd59dc5184ea7bbf363c71638c9bdb59fc1254dddcdd567485136ed68b0ee4750948d4e32cb79c689
-  languageName: node
-  linkType: hard
-
-"@types/estree@npm:*":
-  version: 0.0.47
-  resolution: "@types/estree@npm:0.0.47"
-  checksum: aed5c940436250c25c5e140aa19e7199ba3452e72e1aecc515621507df9e5ed5076ddba84a1684c36d62be841ff3e2bafce8793f16fe6f69d10884449d4461e7
-  languageName: node
-  linkType: hard
-
-"@types/estree@npm:^0.0.51":
-  version: 0.0.51
-  resolution: "@types/estree@npm:0.0.51"
-  checksum: e56a3bcf759fd9185e992e7fdb3c6a5f81e8ff120e871641607581fb3728d16c811702a7d40fa5f869b7f7b4437ab6a87eb8d98ffafeee51e85bbe955932a189
-  languageName: node
-  linkType: hard
-
-"@types/express-serve-static-core@npm:*":
-  version: 4.17.30
-  resolution: "@types/express-serve-static-core@npm:4.17.30"
-  dependencies:
-    "@types/node": "*"
-    "@types/qs": "*"
-    "@types/range-parser": "*"
-  checksum: c40d9027884ab9e97fa29d9d41d1b75a5966109312e26594cf03c61b278b5bf8e095f53589e47899b34a2e224291a44043617695c3e8bd22284f988e48582ee6
-  languageName: node
-  linkType: hard
-
-"@types/express@npm:^4.17.2":
-  version: 4.17.2
-  resolution: "@types/express@npm:4.17.2"
-  dependencies:
-    "@types/body-parser": "*"
-    "@types/express-serve-static-core": "*"
-    "@types/serve-static": "*"
-  checksum: db8e85f84f040014a35b10f3f2e1d39b0f7b16c46cbe012ff2fa7eea7d49bc2a90e81ab81f052fd76f1790c02bf3f940571c406106d29f278f3259486ecc9ee9
-  languageName: node
-  linkType: hard
-
-"@types/fs-extra@npm:^5.0.5":
-  version: 5.1.0
-  resolution: "@types/fs-extra@npm:5.1.0"
-  dependencies:
-    "@types/node": "*"
-  checksum: 9b4abc891ad0dc3baa77b0ebcf91dff8e7a5936aa037de0bd6ded399ab38b5896be1ee02b5c0a18c0915cfc40ab590a915709e6f2beef8f6f7e16fd3759e469a
-  languageName: node
-  linkType: hard
-
-"@types/fs-extra@npm:^8.1.0":
-  version: 8.1.1
-  resolution: "@types/fs-extra@npm:8.1.1"
-  dependencies:
-    "@types/node": "*"
-  checksum: d7d564b84b86e51241984c9bec16f683056d45510e2c63e1bfe9282026685bd14e5ca406ee809453f1e2fd8c9aa76c5712a3019492eb946dd46de327ccb0e1b1
-  languageName: node
-  linkType: hard
-
-"@types/glob@npm:*":
-  version: 7.2.0
-  resolution: "@types/glob@npm:7.2.0"
-  dependencies:
-    "@types/minimatch": "*"
-    "@types/node": "*"
-  checksum: 6ae717fedfdfdad25f3d5a568323926c64f52ef35897bcac8aca8e19bc50c0bd84630bbd063e5d52078b2137d8e7d3c26eabebd1a2f03ff350fff8a91e79fc19
-  languageName: node
-  linkType: hard
-
-"@types/glob@npm:^7.1.1":
-  version: 7.1.3
-  resolution: "@types/glob@npm:7.1.3"
-  dependencies:
-    "@types/minimatch": "*"
-    "@types/node": "*"
-  checksum: e0eef12285f548f15d887145590594a04ccce7f7e645fb047cbac18cb093f25d507ffbcc725312294c224bb78cf980fce33e5807de8d6f8a868b4186253499d4
-  languageName: node
-  linkType: hard
-
-"@types/htmlbars-inline-precompile@npm:*":
-  version: 3.0.0
-  resolution: "@types/htmlbars-inline-precompile@npm:3.0.0"
-  checksum: dd7b1f0a0f9ec560c521673c436329e9edb0197b382520179008b11afe38c3d7a129dc91f303ca0509852f9e081a353b9f9aee9d7043529d70c439aafb7f9a2c
-  languageName: node
-  linkType: hard
-
-"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.5":
-  version: 7.0.9
-  resolution: "@types/json-schema@npm:7.0.9"
-  checksum: 259d0e25f11a21ba5c708f7ea47196bd396e379fddb79c76f9f4f62c945879dc21657904914313ec2754e443c5018ea8372362f323f30e0792897fdb2098a705
-  languageName: node
-  linkType: hard
-
-"@types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9":
-  version: 7.0.11
-  resolution: "@types/json-schema@npm:7.0.11"
-  checksum: 527bddfe62db9012fccd7627794bd4c71beb77601861055d87e3ee464f2217c85fca7a4b56ae677478367bbd248dbde13553312b7d4dbc702a2f2bbf60c4018d
-  languageName: node
-  linkType: hard
-
-"@types/mdast@npm:^3.0.0":
-  version: 3.0.10
-  resolution: "@types/mdast@npm:3.0.10"
-  dependencies:
-    "@types/unist": "*"
-  checksum: 3f587bfc0a9a2403ecadc220e61031b01734fedaf82e27eb4d5ba039c0eb54db8c85681ccc070ab4df3f7ec711b736a82b990e69caa14c74bf7ac0ccf2ac7313
-  languageName: node
-  linkType: hard
-
-"@types/mime@npm:^1":
-  version: 1.3.2
-  resolution: "@types/mime@npm:1.3.2"
-  checksum: 0493368244cced1a69cb791b485a260a422e6fcc857782e1178d1e6f219f1b161793e9f87f5fae1b219af0f50bee24fcbe733a18b4be8fdd07a38a8fb91146fd
-  languageName: node
-  linkType: hard
-
-"@types/minimatch@npm:*, @types/minimatch@npm:^3.0.3, @types/minimatch@npm:^3.0.4":
-  version: 3.0.5
-  resolution: "@types/minimatch@npm:3.0.5"
-  checksum: c41d136f67231c3131cf1d4ca0b06687f4a322918a3a5adddc87ce90ed9dbd175a3610adee36b106ae68c0b92c637c35e02b58c8a56c424f71d30993ea220b92
-  languageName: node
-  linkType: hard
-
-"@types/node@npm:*":
-  version: 16.11.11
-  resolution: "@types/node@npm:16.11.11"
-  checksum: 1c472bd63f23ca0e4effc96e6e0c693b83b027f613a1f41b6d1bd7791f65ce171a351e0a5c92575cb59e84ad0a930875397bfbbb91a7c925ddbbb558f7461af8
-  languageName: node
-  linkType: hard
-
-"@types/node@npm:>=10.0.0":
-  version: 18.7.16
-  resolution: "@types/node@npm:18.7.16"
-  checksum: 01a3d35c764a3f0e7370b56e1ad4203731131883c65784e020009014171b3f53c4649cde6c7aa4f1026b907ee87ef6ae6ece2bc518151dc7b81100fe8b1db3ad
-  languageName: node
-  linkType: hard
-
-"@types/node@npm:^9.6.0":
-  version: 9.6.61
-  resolution: "@types/node@npm:9.6.61"
-  checksum: c8caed1010c5eb94697024606a5cbcb9905251166daed6ec1b47d3c70a57435aba72547adf347b8d17785df89dbfc0ac20e63b9f807bc44cc0e11a3705ae5a91
-  languageName: node
-  linkType: hard
-
-"@types/parse-json@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "@types/parse-json@npm:4.0.0"
-  checksum: fd6bce2b674b6efc3db4c7c3d336bd70c90838e8439de639b909ce22f3720d21344f52427f1d9e57b265fcb7f6c018699b99e5e0c208a1a4823014269a6bf35b
-  languageName: node
-  linkType: hard
-
-"@types/prettier@npm:^2.6.0":
-  version: 2.7.1
-  resolution: "@types/prettier@npm:2.7.1"
-  checksum: 5e3f58e229d6c73b5f5cae2e8f96c1c4a5b5805f83459e17a045ba8e96152b1d38e86b63e3172fb159dac923388699660862b75b2d37e54220805f0e691e26f1
-  languageName: node
-  linkType: hard
-
-"@types/q@npm:^1.5.1":
-  version: 1.5.4
-  resolution: "@types/q@npm:1.5.4"
-  checksum: 0842d7d71b5f102dcc2d78f893d0b42c1149f8cdc194d09e7a00be3187999ee3041e535357344818f8fee1b5e216b06bb7df7754d0fe08bd8aca38d3c45f1af6
-  languageName: node
-  linkType: hard
-
-"@types/qs@npm:*":
-  version: 6.9.6
-  resolution: "@types/qs@npm:6.9.6"
-  checksum: 01871b1cf7062717ec76fcb9b29ddae1e04fcfadc1c76d86ec2571e72f27bf09ff31b094b295be8d4ca664aeec9b8965563680b31fcab7aba1ed93afac5181cd
-  languageName: node
-  linkType: hard
-
-"@types/qunit@npm:*, @types/qunit@npm:^2.19.3":
-  version: 2.19.3
-  resolution: "@types/qunit@npm:2.19.3"
-  checksum: bbcea1082a2827f81ddb43f53abf6e6698cb690fa5a1cd59649eee5e9ecf0fe04fae7fb2aaf3015681ac8036f251f4d268819a4935ec5b38832056957ccfb265
-  languageName: node
-  linkType: hard
-
-"@types/range-parser@npm:*":
-  version: 1.2.3
-  resolution: "@types/range-parser@npm:1.2.3"
-  checksum: a0a4218214d2c599e2128a8965e9183d1f0b8fc614def43a2183cf80534d10fcf86357c823c7907e779df0ab048fd1fa3818b4c8f0f6f99ba150a3f99df7d03d
-  languageName: node
-  linkType: hard
-
-"@types/rimraf@npm:^2.0.2":
-  version: 2.0.5
-  resolution: "@types/rimraf@npm:2.0.5"
-  dependencies:
-    "@types/glob": "*"
-    "@types/node": "*"
-  checksum: e388f546840704a240fb31536498921623bca4ec1230925013d6b6d7c7d2211c8ec07fcbbd2606151d7549cbbc28a01c18fb0df502107a9293860a5ff64bc147
-  languageName: node
-  linkType: hard
-
-"@types/rimraf@npm:^2.0.3":
-  version: 2.0.4
-  resolution: "@types/rimraf@npm:2.0.4"
-  dependencies:
-    "@types/glob": "*"
-    "@types/node": "*"
-  checksum: 8304d3d98f654f6c7b6256f368832436dc1d807bb899007fa823702052642166da25f37e849f0bc4ba4ec312e5a8f81e7a4d4a81de9c68f305d28f7822464c0c
-  languageName: node
-  linkType: hard
-
-"@types/rsvp@npm:*, @types/rsvp@npm:^4.0.4":
-  version: 4.0.4
-  resolution: "@types/rsvp@npm:4.0.4"
-  checksum: ed59be8246325c3676e67237c00d84830f801710af864dbf7d22e80441892e9a7beee07afcbdcd74ee8fbe3a24f37e93826dac1208199ac5601b663b7293cbed
-  languageName: node
-  linkType: hard
-
-"@types/semver@npm:^7.3.12":
-  version: 7.3.13
-  resolution: "@types/semver@npm:7.3.13"
-  checksum: 00c0724d54757c2f4bc60b5032fe91cda6410e48689633d5f35ece8a0a66445e3e57fa1d6e07eb780f792e82ac542948ec4d0b76eb3484297b79bd18b8cf1cb0
-  languageName: node
-  linkType: hard
-
-"@types/serve-static@npm:*":
-  version: 1.13.9
-  resolution: "@types/serve-static@npm:1.13.9"
-  dependencies:
-    "@types/mime": ^1
-    "@types/node": "*"
-  checksum: 5c5f3b64e9fe7c51fb428ef70f1f2365b897fc3c8400be6d6afc8db0f152639182b360361ebd3d0cbaeb607b125dee03bf0c50bf7e08642ff150028f05bb7381
-  languageName: node
-  linkType: hard
-
-"@types/shell-quote@npm:^1.7.1":
-  version: 1.7.1
-  resolution: "@types/shell-quote@npm:1.7.1"
-  checksum: 51e58326b8c6dcb72846b94cebe3dc4c84f3514469a8e52bd29c52c601e784b427b851d7477acbeef47bfcccf25d2a5768684d27e7fc95fdd003393c1bbb7bc3
-  languageName: node
-  linkType: hard
-
-"@types/symlink-or-copy@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "@types/symlink-or-copy@npm:1.2.0"
-  checksum: 18fb73094b2cf6c84544939bd6344d7a8cd1ccf8496a1cfb1320f38491c8dfbea3248bb6e91495322a51a493e04a767582a214d5261f5c5b007aa6ef65fc8b50
-  languageName: node
-  linkType: hard
-
-"@types/tmp@npm:^0.0.33":
-  version: 0.0.33
-  resolution: "@types/tmp@npm:0.0.33"
-  checksum: b6963af74092bd56a1a9a7936a1a6de45ddbd5e774f9fc904f16b7e2ada79da8a769e0c5b9df083064b8080bb260c4973ba4307640b7b7a75ed1c47bda8c4110
-  languageName: node
-  linkType: hard
-
-"@types/unist@npm:*, @types/unist@npm:^2.0.0, @types/unist@npm:^2.0.2":
-  version: 2.0.6
-  resolution: "@types/unist@npm:2.0.6"
-  checksum: 25cb860ff10dde48b54622d58b23e66214211a61c84c0f15f88d38b61aa1b53d4d46e42b557924a93178c501c166aa37e28d7f6d994aba13d24685326272d5db
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/eslint-plugin@npm:^5.19.0":
-  version: 5.44.0
-  resolution: "@typescript-eslint/eslint-plugin@npm:5.44.0"
-  dependencies:
-    "@typescript-eslint/scope-manager": 5.44.0
-    "@typescript-eslint/type-utils": 5.44.0
-    "@typescript-eslint/utils": 5.44.0
-    debug: ^4.3.4
-    ignore: ^5.2.0
-    natural-compare-lite: ^1.4.0
-    regexpp: ^3.2.0
-    semver: ^7.3.7
-    tsutils: ^3.21.0
-  peerDependencies:
-    "@typescript-eslint/parser": ^5.0.0
-    eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  checksum: 88784e77e8e35ea50ca9c49d46df94cabc3447f4b332f3ca53974d3b5370cb5dcd85cc9ee0e317b91083812012369209574725dcfc3b2b4056b60371b68ca854
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/parser@npm:^5.10.0":
-  version: 5.42.1
-  resolution: "@typescript-eslint/parser@npm:5.42.1"
-  dependencies:
-    "@typescript-eslint/scope-manager": 5.42.1
-    "@typescript-eslint/types": 5.42.1
-    "@typescript-eslint/typescript-estree": 5.42.1
-    debug: ^4.3.4
-  peerDependencies:
-    eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  checksum: 7208a085102be5c569ac2be5799d05e080a9c0b9157ed3efa5d7eadb675185bddfa05f2f27e20c235910193a2bd835e5375fb9fc13561a6e20d110e444f37caa
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/parser@npm:^5.19.0":
-  version: 5.44.0
-  resolution: "@typescript-eslint/parser@npm:5.44.0"
-  dependencies:
-    "@typescript-eslint/scope-manager": 5.44.0
-    "@typescript-eslint/types": 5.44.0
-    "@typescript-eslint/typescript-estree": 5.44.0
-    debug: ^4.3.4
-  peerDependencies:
-    eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  checksum: 2d09a1a1547a7ae3f76c9a33a54e11d79a194fbb9dbae69988e7aed3370bdf12bafde669211152769d89db822e0cdee4173affc126664fa6f17abba56daa7261
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/scope-manager@npm:5.42.1":
-  version: 5.42.1
-  resolution: "@typescript-eslint/scope-manager@npm:5.42.1"
-  dependencies:
-    "@typescript-eslint/types": 5.42.1
-    "@typescript-eslint/visitor-keys": 5.42.1
-  checksum: cfad5f04328fae4bb6d965a94c980ac2f6fa0eee6183e9bed6d7ebdb067f01a0a9a3b5500fc3638d5e287f46f4412aa462e238c610c1fb96b794b83c575c7fb4
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/scope-manager@npm:5.44.0":
-  version: 5.44.0
-  resolution: "@typescript-eslint/scope-manager@npm:5.44.0"
-  dependencies:
-    "@typescript-eslint/types": 5.44.0
-    "@typescript-eslint/visitor-keys": 5.44.0
-  checksum: 4cfe4b55eb428eda740e6b967e3a87f3e1f9c4bbd8e1d6b8d64a11666abe33ffe7a21e4e614444ccde2da6930fa85f3e0ffca43d6e339943ff7a4fbccb09c8fc
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/type-utils@npm:5.44.0":
-  version: 5.44.0
-  resolution: "@typescript-eslint/type-utils@npm:5.44.0"
-  dependencies:
-    "@typescript-eslint/typescript-estree": 5.44.0
-    "@typescript-eslint/utils": 5.44.0
-    debug: ^4.3.4
-    tsutils: ^3.21.0
-  peerDependencies:
-    eslint: "*"
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  checksum: 4c7b594f8afa52d57d0512951a874fa390eb791dcefcd0e1efff8817872293b2e4e04eff3c54d1595c1720a34d5fd315729af4e459882033d13cb6069ae9d28f
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/types@npm:5.42.1":
-  version: 5.42.1
-  resolution: "@typescript-eslint/types@npm:5.42.1"
-  checksum: b0eb3df3792dd0e447abcf2b4fd79b2eaa6f944242d00afa8ef2d9f892ea63e52f200e7cb1758ddbc46154aa6764cec8bc796ed96f7554457a20db976f9f2089
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/types@npm:5.44.0":
-  version: 5.44.0
-  resolution: "@typescript-eslint/types@npm:5.44.0"
-  checksum: ced7d32abecfc62ccb67cf27e30c0785b9c153ec7b1a05153ced58fa5a2031ab3845bc2e477b83e4cebdcc5881c5845d23053c6739c62549d41ae6208e547e85
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/typescript-estree@npm:5.42.1":
-  version: 5.42.1
-  resolution: "@typescript-eslint/typescript-estree@npm:5.42.1"
-  dependencies:
-    "@typescript-eslint/types": 5.42.1
-    "@typescript-eslint/visitor-keys": 5.42.1
-    debug: ^4.3.4
-    globby: ^11.1.0
-    is-glob: ^4.0.3
-    semver: ^7.3.7
-    tsutils: ^3.21.0
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  checksum: dfd3e20d41ba4b574a52d82cc40b38708b8c2c4277d6304a8d914fe2a4a9ce8779f4d79fdac140e77a3afd3c6a2a7e3f31620dc427cabd04e4e906bb0ca3a468
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/typescript-estree@npm:5.44.0":
-  version: 5.44.0
-  resolution: "@typescript-eslint/typescript-estree@npm:5.44.0"
-  dependencies:
-    "@typescript-eslint/types": 5.44.0
-    "@typescript-eslint/visitor-keys": 5.44.0
-    debug: ^4.3.4
-    globby: ^11.1.0
-    is-glob: ^4.0.3
-    semver: ^7.3.7
-    tsutils: ^3.21.0
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  checksum: 758731108497cca7ff81cf0a78d086b5a85757a983979d6bb25ad8252b7acbc738c642ecb5f5df82f925a45926b9846e431d5cf9fee5ed2613300b4d0c5d6c3f
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/utils@npm:5.44.0":
-  version: 5.44.0
-  resolution: "@typescript-eslint/utils@npm:5.44.0"
-  dependencies:
-    "@types/json-schema": ^7.0.9
-    "@types/semver": ^7.3.12
-    "@typescript-eslint/scope-manager": 5.44.0
-    "@typescript-eslint/types": 5.44.0
-    "@typescript-eslint/typescript-estree": 5.44.0
-    eslint-scope: ^5.1.1
-    eslint-utils: ^3.0.0
-    semver: ^7.3.7
-  peerDependencies:
-    eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-  checksum: bc5bb28e41898464d35b8eb47cc452103852541e3b6be56252c15a5a81c45e10aad3db4c749eb92d752b0c358df8074e23ec6f9e65f8089baadeda7f395c7e31
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/visitor-keys@npm:5.42.1":
-  version: 5.42.1
-  resolution: "@typescript-eslint/visitor-keys@npm:5.42.1"
-  dependencies:
-    "@typescript-eslint/types": 5.42.1
-    eslint-visitor-keys: ^3.3.0
-  checksum: d36c59da7bf3b3c150c12cbe4b0331edc15253f59599ec3d8b873b2a3d9fc7a4fea11490c1b20d972afcdc9c842deb5ada527ea9c538aa7e87555699d9a59f24
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/visitor-keys@npm:5.44.0":
-  version: 5.44.0
-  resolution: "@typescript-eslint/visitor-keys@npm:5.44.0"
-  dependencies:
-    "@typescript-eslint/types": 5.44.0
-    eslint-visitor-keys: ^3.3.0
-  checksum: a012c888209e1d6ae684b2a44fd460ae5a80f5faf07bca4bda6c9c0d8c063ad3297d4c53f7151ae86cf1a43dee09625dc3ee72183323c91089c7288fd573c6f4
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/ast@npm:1.11.1":
-  version: 1.11.1
-  resolution: "@webassemblyjs/ast@npm:1.11.1"
-  dependencies:
-    "@webassemblyjs/helper-numbers": 1.11.1
-    "@webassemblyjs/helper-wasm-bytecode": 1.11.1
-  checksum: 1eee1534adebeece635362f8e834ae03e389281972611408d64be7895fc49f48f98fddbbb5339bf8a72cb101bcb066e8bca3ca1bf1ef47dadf89def0395a8d87
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/ast@npm:1.9.0":
-  version: 1.9.0
-  resolution: "@webassemblyjs/ast@npm:1.9.0"
-  dependencies:
-    "@webassemblyjs/helper-module-context": 1.9.0
-    "@webassemblyjs/helper-wasm-bytecode": 1.9.0
-    "@webassemblyjs/wast-parser": 1.9.0
-  checksum: 8a9838dc7fdac358aee8daa75eefa35934ab18dafb594092ff7be79c467ebe9dabb2543e58313c905fd802bdcc3cb8320e4e19af7444e49853a7a24e25138f75
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/floating-point-hex-parser@npm:1.11.1":
-  version: 1.11.1
-  resolution: "@webassemblyjs/floating-point-hex-parser@npm:1.11.1"
-  checksum: b8efc6fa08e4787b7f8e682182d84dfdf8da9d9c77cae5d293818bc4a55c1f419a87fa265ab85252b3e6c1fd323d799efea68d825d341a7c365c64bc14750e97
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/floating-point-hex-parser@npm:1.9.0":
-  version: 1.9.0
-  resolution: "@webassemblyjs/floating-point-hex-parser@npm:1.9.0"
-  checksum: d3aeb19bc30da26f639698daa28e44e0c18d5aa135359ef3c54148e194eec46451a912d0506099d479a71a94bc3eef6ef52d6ec234799528a25a9744789852de
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/helper-api-error@npm:1.11.1":
-  version: 1.11.1
-  resolution: "@webassemblyjs/helper-api-error@npm:1.11.1"
-  checksum: 0792813f0ed4a0e5ee0750e8b5d0c631f08e927f4bdfdd9fe9105dc410c786850b8c61bff7f9f515fdfb149903bec3c976a1310573a4c6866a94d49bc7271959
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/helper-api-error@npm:1.9.0":
-  version: 1.9.0
-  resolution: "@webassemblyjs/helper-api-error@npm:1.9.0"
-  checksum: 9179d3148639cc202e89a118145b485cf834613260679a99af6ec487bbc15f238566ca713207394b336160a41bf8c1b75cf2e853b3e96f0cc73c1e5c735b3f64
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/helper-buffer@npm:1.11.1":
-  version: 1.11.1
-  resolution: "@webassemblyjs/helper-buffer@npm:1.11.1"
-  checksum: a337ee44b45590c3a30db5a8b7b68a717526cf967ada9f10253995294dbd70a58b2da2165222e0b9830cd4fc6e4c833bf441a721128d1fe2e9a7ab26b36003ce
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/helper-buffer@npm:1.9.0":
-  version: 1.9.0
-  resolution: "@webassemblyjs/helper-buffer@npm:1.9.0"
-  checksum: dcb85f630f8a2e22b7346ad4dd58c3237a2cad1457699423e8fd19592a0bd3eacbc2639178a1b9a873c3ac217bfc7a23a134ff440a099496b590e82c7a4968d5
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/helper-code-frame@npm:1.9.0":
-  version: 1.9.0
-  resolution: "@webassemblyjs/helper-code-frame@npm:1.9.0"
-  dependencies:
-    "@webassemblyjs/wast-printer": 1.9.0
-  checksum: a28fa057f7beff0fd14bff716561520f8edb8c9c56c7a5559451e6765acfb70aaeb8af718ea2bd2262e7baeba597545af407e28eb2eff8329235afe8605f20d1
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/helper-fsm@npm:1.9.0":
-  version: 1.9.0
-  resolution: "@webassemblyjs/helper-fsm@npm:1.9.0"
-  checksum: 374cc510c8f5a7a07d4fe9eb7036cc475a96a670b5d25c31f16757ac8295be8d03a2f29657ff53eaefa9e8315670a48824d430ed910e7c1835788ac79f93124e
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/helper-module-context@npm:1.9.0":
-  version: 1.9.0
-  resolution: "@webassemblyjs/helper-module-context@npm:1.9.0"
-  dependencies:
-    "@webassemblyjs/ast": 1.9.0
-  checksum: 55e8f89c7ea1beaa78fad88403f3753b8413b0f3b6bb32d898ce95078b3e1d1b48ade0919c00b82fc2e3813c0ab6901e415f7a4d4fa9be50944e2431adde75a5
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/helper-numbers@npm:1.11.1":
-  version: 1.11.1
-  resolution: "@webassemblyjs/helper-numbers@npm:1.11.1"
-  dependencies:
-    "@webassemblyjs/floating-point-hex-parser": 1.11.1
-    "@webassemblyjs/helper-api-error": 1.11.1
-    "@xtuc/long": 4.2.2
-  checksum: 44d2905dac2f14d1e9b5765cf1063a0fa3d57295c6d8930f6c59a36462afecc6e763e8a110b97b342a0f13376166c5d41aa928e6ced92e2f06b071fd0db59d3a
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/helper-wasm-bytecode@npm:1.11.1":
-  version: 1.11.1
-  resolution: "@webassemblyjs/helper-wasm-bytecode@npm:1.11.1"
-  checksum: eac400113127832c88f5826bcc3ad1c0db9b3dbd4c51a723cfdb16af6bfcbceb608170fdaac0ab7731a7e18b291be7af68a47fcdb41cfe0260c10857e7413d97
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/helper-wasm-bytecode@npm:1.9.0":
-  version: 1.9.0
-  resolution: "@webassemblyjs/helper-wasm-bytecode@npm:1.9.0"
-  checksum: 280da4df3c556f73a1a02053277f8a4be481de32df4aa21050b015c8f4d27c46af89f0417eb88e486df117e5df4bccffae593f78cb1e79f212d3b3d4f3ed0f04
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/helper-wasm-section@npm:1.11.1":
-  version: 1.11.1
-  resolution: "@webassemblyjs/helper-wasm-section@npm:1.11.1"
-  dependencies:
-    "@webassemblyjs/ast": 1.11.1
-    "@webassemblyjs/helper-buffer": 1.11.1
-    "@webassemblyjs/helper-wasm-bytecode": 1.11.1
-    "@webassemblyjs/wasm-gen": 1.11.1
-  checksum: 617696cfe8ecaf0532763162aaf748eb69096fb27950219bb87686c6b2e66e11cd0614d95d319d0ab1904bc14ebe4e29068b12c3e7c5e020281379741fe4bedf
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/helper-wasm-section@npm:1.9.0":
-  version: 1.9.0
-  resolution: "@webassemblyjs/helper-wasm-section@npm:1.9.0"
-  dependencies:
-    "@webassemblyjs/ast": 1.9.0
-    "@webassemblyjs/helper-buffer": 1.9.0
-    "@webassemblyjs/helper-wasm-bytecode": 1.9.0
-    "@webassemblyjs/wasm-gen": 1.9.0
-  checksum: b8f7bb45d4194074c82210211a5d3e402a5b5fa63ecae26d2c356ae3978af5a530e91192fb260f32f9d561b18e2828b3da2e2f41c59efadb5f3c6d72446807f0
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/ieee754@npm:1.11.1":
-  version: 1.11.1
-  resolution: "@webassemblyjs/ieee754@npm:1.11.1"
-  dependencies:
-    "@xtuc/ieee754": ^1.2.0
-  checksum: 23a0ac02a50f244471631802798a816524df17e56b1ef929f0c73e3cde70eaf105a24130105c60aff9d64a24ce3b640dad443d6f86e5967f922943a7115022ec
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/ieee754@npm:1.9.0":
-  version: 1.9.0
-  resolution: "@webassemblyjs/ieee754@npm:1.9.0"
-  dependencies:
-    "@xtuc/ieee754": ^1.2.0
-  checksum: 7fe4a217ba0f7051e2cfef92919d4a64fac1a63c65411763779bd50907820f33f440255231a474fe3ba03bd1d9ee0328662d1eae3fce4c59b91549d6b62b839b
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/leb128@npm:1.11.1":
-  version: 1.11.1
-  resolution: "@webassemblyjs/leb128@npm:1.11.1"
-  dependencies:
-    "@xtuc/long": 4.2.2
-  checksum: 33ccc4ade2f24de07bf31690844d0b1ad224304ee2062b0e464a610b0209c79e0b3009ac190efe0e6bd568b0d1578d7c3047fc1f9d0197c92fc061f56224ff4a
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/leb128@npm:1.9.0":
-  version: 1.9.0
-  resolution: "@webassemblyjs/leb128@npm:1.9.0"
-  dependencies:
-    "@xtuc/long": 4.2.2
-  checksum: 4ca7cbb869530d78d42a414f34ae53249364cb1ecebbfb6ed5d562c2f209fce857502f088822ee82a23876f653a262ddc34ab64e45a7962510a263d39bb3f51a
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/utf8@npm:1.11.1":
-  version: 1.11.1
-  resolution: "@webassemblyjs/utf8@npm:1.11.1"
-  checksum: 972c5cfc769d7af79313a6bfb96517253a270a4bf0c33ba486aa43cac43917184fb35e51dfc9e6b5601548cd5931479a42e42c89a13bb591ffabebf30c8a6a0b
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/utf8@npm:1.9.0":
-  version: 1.9.0
-  resolution: "@webassemblyjs/utf8@npm:1.9.0"
-  checksum: e328a30ac8a503bbd015d32e75176e0dedcb45a21d4be051c25dfe89a00035ca7a6dbd8937b442dd5b4b334de3959d4f5fe0b330037bd226a28b9814cd49e84f
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/wasm-edit@npm:1.11.1":
-  version: 1.11.1
-  resolution: "@webassemblyjs/wasm-edit@npm:1.11.1"
-  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
-  checksum: 6d7d9efaec1227e7ef7585a5d7ff0be5f329f7c1c6b6c0e906b18ed2e9a28792a5635e450aca2d136770d0207225f204eff70a4b8fd879d3ac79e1dcc26dbeb9
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/wasm-edit@npm:1.9.0":
-  version: 1.9.0
-  resolution: "@webassemblyjs/wasm-edit@npm:1.9.0"
-  dependencies:
-    "@webassemblyjs/ast": 1.9.0
-    "@webassemblyjs/helper-buffer": 1.9.0
-    "@webassemblyjs/helper-wasm-bytecode": 1.9.0
-    "@webassemblyjs/helper-wasm-section": 1.9.0
-    "@webassemblyjs/wasm-gen": 1.9.0
-    "@webassemblyjs/wasm-opt": 1.9.0
-    "@webassemblyjs/wasm-parser": 1.9.0
-    "@webassemblyjs/wast-printer": 1.9.0
-  checksum: 1997e0c2f4051c33239587fb143242919320bc861a0af03a873c7150a27d6404bd2e063c658193288b0aa88c35aadbe0c4fde601fe642bae0743a8c8eda52717
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/wasm-gen@npm:1.11.1":
-  version: 1.11.1
-  resolution: "@webassemblyjs/wasm-gen@npm:1.11.1"
-  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
-  checksum: 1f6921e640293bf99fb16b21e09acb59b340a79f986c8f979853a0ae9f0b58557534b81e02ea2b4ef11e929d946708533fd0693c7f3712924128fdafd6465f5b
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/wasm-gen@npm:1.9.0":
-  version: 1.9.0
-  resolution: "@webassemblyjs/wasm-gen@npm:1.9.0"
-  dependencies:
-    "@webassemblyjs/ast": 1.9.0
-    "@webassemblyjs/helper-wasm-bytecode": 1.9.0
-    "@webassemblyjs/ieee754": 1.9.0
-    "@webassemblyjs/leb128": 1.9.0
-    "@webassemblyjs/utf8": 1.9.0
-  checksum: 2456e84e8e6bedb7ab47f6333a0ee170f7ef62842c90862ca787c08528ca8041061f3f8bc257fc2a01bf6e8d1a76fddaddd43418c738f681066e5b50f88fe7df
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/wasm-opt@npm:1.11.1":
-  version: 1.11.1
-  resolution: "@webassemblyjs/wasm-opt@npm:1.11.1"
-  dependencies:
-    "@webassemblyjs/ast": 1.11.1
-    "@webassemblyjs/helper-buffer": 1.11.1
-    "@webassemblyjs/wasm-gen": 1.11.1
-    "@webassemblyjs/wasm-parser": 1.11.1
-  checksum: 21586883a20009e2b20feb67bdc451bbc6942252e038aae4c3a08e6f67b6bae0f5f88f20bfc7bd0452db5000bacaf5ab42b98cf9aa034a6c70e9fc616142e1db
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/wasm-opt@npm:1.9.0":
-  version: 1.9.0
-  resolution: "@webassemblyjs/wasm-opt@npm:1.9.0"
-  dependencies:
-    "@webassemblyjs/ast": 1.9.0
-    "@webassemblyjs/helper-buffer": 1.9.0
-    "@webassemblyjs/wasm-gen": 1.9.0
-    "@webassemblyjs/wasm-parser": 1.9.0
-  checksum: 91242205bdbd1aa8045364a5338bfb34880cb2c65f56db8dd19382894209673699fb31a0e5279f25c7e5bcd8f3097d6c9ca84d8969d9613ef2cf166450cc3515
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/wasm-parser@npm:1.11.1":
-  version: 1.11.1
-  resolution: "@webassemblyjs/wasm-parser@npm:1.11.1"
-  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
-  checksum: 1521644065c360e7b27fad9f4bb2df1802d134dd62937fa1f601a1975cde56bc31a57b6e26408b9ee0228626ff3ba1131ae6f74ffb7d718415b6528c5a6dbfc2
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/wasm-parser@npm:1.9.0":
-  version: 1.9.0
-  resolution: "@webassemblyjs/wasm-parser@npm:1.9.0"
-  dependencies:
-    "@webassemblyjs/ast": 1.9.0
-    "@webassemblyjs/helper-api-error": 1.9.0
-    "@webassemblyjs/helper-wasm-bytecode": 1.9.0
-    "@webassemblyjs/ieee754": 1.9.0
-    "@webassemblyjs/leb128": 1.9.0
-    "@webassemblyjs/utf8": 1.9.0
-  checksum: 493f6cfc63a5e16073056c81ff0526a9936f461327379ef3c83cc841000e03623b6352704f6bf9f7cb5b3610f0032020a61f9cca78c91b15b8e995854b29c098
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/wast-parser@npm:1.9.0":
-  version: 1.9.0
-  resolution: "@webassemblyjs/wast-parser@npm:1.9.0"
-  dependencies:
-    "@webassemblyjs/ast": 1.9.0
-    "@webassemblyjs/floating-point-hex-parser": 1.9.0
-    "@webassemblyjs/helper-api-error": 1.9.0
-    "@webassemblyjs/helper-code-frame": 1.9.0
-    "@webassemblyjs/helper-fsm": 1.9.0
-    "@xtuc/long": 4.2.2
-  checksum: 705dd48fbbceec7f6bed299b8813631b242fd9312f9594dbb2985dda86c9688048692357d684f6080fc2c5666287cefaa26b263d01abadb6a9049d4c8978b9db
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/wast-printer@npm:1.11.1":
-  version: 1.11.1
-  resolution: "@webassemblyjs/wast-printer@npm:1.11.1"
-  dependencies:
-    "@webassemblyjs/ast": 1.11.1
-    "@xtuc/long": 4.2.2
-  checksum: f15ae4c2441b979a3b4fce78f3d83472fb22350c6dc3fd34bfe7c3da108e0b2360718734d961bba20e7716cb8578e964b870da55b035e209e50ec9db0378a3f7
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/wast-printer@npm:1.9.0":
-  version: 1.9.0
-  resolution: "@webassemblyjs/wast-printer@npm:1.9.0"
-  dependencies:
-    "@webassemblyjs/ast": 1.9.0
-    "@webassemblyjs/wast-parser": 1.9.0
-    "@xtuc/long": 4.2.2
-  checksum: 3d1e1b2e84745a963f69acd1c02425b321dd2e608e11dabc467cae0c9a808962bc769ec9afc46fbcea7188cc1e47d72370da762d258f716fb367cb1a7865c54b
-  languageName: node
-  linkType: hard
-
-"@xmldom/xmldom@npm:^0.8.0":
-  version: 0.8.2
-  resolution: "@xmldom/xmldom@npm:0.8.2"
-  checksum: aeea8f670bfa52b3a1b2d355dab3bf4d58ef4969b1fd146a1ab91bf8acbb9d02953022e66e85279015a4e4027205620dfc001ed5d169b1711a09a0a079951e08
-  languageName: node
-  linkType: hard
-
-"@xtuc/ieee754@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "@xtuc/ieee754@npm:1.2.0"
-  checksum: ac56d4ca6e17790f1b1677f978c0c6808b1900a5b138885d3da21732f62e30e8f0d9120fcf8f6edfff5100ca902b46f8dd7c1e3f903728634523981e80e2885a
-  languageName: node
-  linkType: hard
-
-"@xtuc/long@npm:4.2.2":
-  version: 4.2.2
-  resolution: "@xtuc/long@npm:4.2.2"
-  checksum: 8ed0d477ce3bc9c6fe2bf6a6a2cc316bb9c4127c5a7827bae947fa8ec34c7092395c5a283cc300c05b5fa01cbbfa1f938f410a7bf75db7c7846fea41949989ec
-  languageName: node
-  linkType: hard
-
-"JSV@npm:^4.0.x":
-  version: 4.0.2
-  resolution: "JSV@npm:4.0.2"
-  checksum: 9e2e070b2149d4ffed6c135dedb5f8cebb870dc63c0ca6d3cb647067248c7ca15d1a934ee46e9d2ac0e468436d0f70bc1b63cd5f93e705ee9aa0669430e6e66f
-  languageName: node
-  linkType: hard
-
-"abab@npm:^2.0.3, abab@npm:^2.0.5":
-  version: 2.0.5
-  resolution: "abab@npm:2.0.5"
-  checksum: 0ec951b46d5418c2c2f923021ec193eaebdb4e802ffd5506286781b454be722a13a8430f98085cd3e204918401d9130ec6cc8f5ae19be315b3a0e857d83196e1
-  languageName: node
-  linkType: hard
-
-"abbrev@npm:1, abbrev@npm:^1.0.0":
-  version: 1.1.1
-  resolution: "abbrev@npm:1.1.1"
-  checksum: a4a97ec07d7ea112c517036882b2ac22f3109b7b19077dc656316d07d308438aac28e4d9746dc4d84bf6b1e75b4a7b0a5f3cb30592419f128ca9a8cee3bcfa17
-  languageName: node
-  linkType: hard
-
-"abortcontroller-polyfill@npm:^1.7.3":
-  version: 1.7.3
-  resolution: "abortcontroller-polyfill@npm:1.7.3"
-  checksum: 55739d7f0c9bd6afa2aabb3148778967c4dd4dcff91f6b9259df38da34f9882d3f7730b0954e9767a19cc16a8dd9a58915da4e8a50220300d45af3817d7557b1
-  languageName: node
-  linkType: hard
-
-"accepts@npm:~1.3.4, accepts@npm:~1.3.5, accepts@npm:~1.3.7":
-  version: 1.3.7
-  resolution: "accepts@npm:1.3.7"
-  dependencies:
-    mime-types: ~2.1.24
-    negotiator: 0.6.2
-  checksum: 27fc8060ffc69481ff6719cd3ee06387d2b88381cb0ce626f087781bbd02201a645a9febc8e7e7333558354b33b1d2f922ad13560be4ec1b7ba9e76fc1c1241d
-  languageName: node
-  linkType: hard
-
-"accepts@npm:~1.3.8":
-  version: 1.3.8
-  resolution: "accepts@npm:1.3.8"
-  dependencies:
-    mime-types: ~2.1.34
-    negotiator: 0.6.3
-  checksum: 50c43d32e7b50285ebe84b613ee4a3aa426715a7d131b65b786e2ead0fd76b6b60091b9916d3478a75f11f162628a2139991b6c03ab3f1d9ab7c86075dc8eab4
-  languageName: node
-  linkType: hard
-
-"acorn-dynamic-import@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "acorn-dynamic-import@npm:3.0.0"
-  dependencies:
-    acorn: ^5.0.0
-  checksum: 60ba19103fdaa87e048a9480238faefd451dc39e21cf079812acd5e59ca064619a8c905b274f095b7c686736605547b089c6a5b75e926202afb8a4392d012659
-  languageName: node
-  linkType: hard
-
-"acorn-globals@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "acorn-globals@npm:6.0.0"
-  dependencies:
-    acorn: ^7.1.1
-    acorn-walk: ^7.1.1
-  checksum: 72d95e5b5e585f9acd019b993ab8bbba68bb3cbc9d9b5c1ebb3c2f1fe5981f11deababfb4949f48e6262f9c57878837f5958c0cca396f81023814680ca878042
-  languageName: node
-  linkType: hard
-
-"acorn-import-assertions@npm:^1.7.6":
-  version: 1.8.0
-  resolution: "acorn-import-assertions@npm:1.8.0"
-  peerDependencies:
-    acorn: ^8
-  checksum: 5c4cf7c850102ba7ae0eeae0deb40fb3158c8ca5ff15c0bca43b5c47e307a1de3d8ef761788f881343680ea374631ae9e9615ba8876fee5268dbe068c98bcba6
-  languageName: node
-  linkType: hard
-
-"acorn-jsx@npm:^5.3.1":
-  version: 5.3.1
-  resolution: "acorn-jsx@npm:5.3.1"
-  peerDependencies:
-    acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
-  checksum: daf441a9d7b59c0ea1f7fe2934c48aca604a007455129ce35fa62ec3d4c8363e2efc2d4da636d18ce0049979260ba07d8b42bc002ae95182916d2c90901529c2
-  languageName: node
-  linkType: hard
-
-"acorn-jsx@npm:^5.3.2":
-  version: 5.3.2
-  resolution: "acorn-jsx@npm:5.3.2"
-  peerDependencies:
-    acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
-  checksum: c3d3b2a89c9a056b205b69530a37b972b404ee46ec8e5b341666f9513d3163e2a4f214a71f4dfc7370f5a9c07472d2fd1c11c91c3f03d093e37637d95da98950
-  languageName: node
-  linkType: hard
-
-"acorn-walk@npm:^7.1.1":
-  version: 7.2.0
-  resolution: "acorn-walk@npm:7.2.0"
-  checksum: 9252158a79b9d92f1bc0dd6acc0fcfb87a67339e84bcc301bb33d6078936d27e35d606b4d35626d2962cd43c256d6f27717e70cbe15c04fff999ab0b2260b21f
-  languageName: node
-  linkType: hard
-
-"acorn@npm:^5.0.0, acorn@npm:^5.1.1, acorn@npm:^5.5.3":
-  version: 5.7.4
-  resolution: "acorn@npm:5.7.4"
-  bin:
-    acorn: bin/acorn
-  checksum: f51392a4d25c7705fadb890f784c59cde4ac1c5452ccd569fa59bd2191b7951b4a6398348ab7ea08a54f0bc0a56c13776710f4e1bae9de441e4d33e2015ad1e0
-  languageName: node
-  linkType: hard
-
-"acorn@npm:^6.4.1":
-  version: 6.4.2
-  resolution: "acorn@npm:6.4.2"
-  bin:
-    acorn: bin/acorn
-  checksum: 44b07053729db7f44d28343eed32247ed56dc4a6ec6dff2b743141ecd6b861406bbc1c20bf9d4f143ea7dd08add5dc8c290582756539bc03a8db605050ce2fb4
-  languageName: node
-  linkType: hard
-
-"acorn@npm:^7.1.0, acorn@npm:^7.1.1, acorn@npm:^7.4.0":
-  version: 7.4.1
-  resolution: "acorn@npm:7.4.1"
-  bin:
-    acorn: bin/acorn
-  checksum: 1860f23c2107c910c6177b7b7be71be350db9e1080d814493fae143ae37605189504152d1ba8743ba3178d0b37269ce1ffc42b101547fdc1827078f82671e407
-  languageName: node
-  linkType: hard
-
-"acorn@npm:^8.1.0":
-  version: 8.2.2
-  resolution: "acorn@npm:8.2.2"
-  bin:
-    acorn: bin/acorn
-  checksum: 46d3205ed296fa544b3d3f57880929ca7f7207e9aed7444ff1d73c21c7964e0c24a507799c334c0ab947cec3acb6dc9b831ec3ad01853e7db3da71ccdf4337f3
-  languageName: node
-  linkType: hard
-
-"acorn@npm:^8.4.1, acorn@npm:^8.5.0":
-  version: 8.7.1
-  resolution: "acorn@npm:8.7.1"
-  bin:
-    acorn: bin/acorn
-  checksum: aca0aabf98826717920ac2583fdcad0a6fbe4e583fdb6e843af2594e907455aeafe30b1e14f1757cd83ce1776773cf8296ffc3a4acf13f0bd3dfebcf1db6ae80
-  languageName: node
-  linkType: hard
-
-"acorn@npm:^8.8.0":
-  version: 8.8.1
-  resolution: "acorn@npm:8.8.1"
-  bin:
-    acorn: bin/acorn
-  checksum: 4079b67283b94935157698831967642f24a075c52ce3feaaaafe095776dfbe15d86a1b33b1e53860fc0d062ed6c83f4284a5c87c85b9ad51853a01173da6097f
-  languageName: node
-  linkType: hard
-
-"agent-base@npm:6, agent-base@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "agent-base@npm:6.0.2"
-  dependencies:
-    debug: 4
-  checksum: f52b6872cc96fd5f622071b71ef200e01c7c4c454ee68bc9accca90c98cfb39f2810e3e9aa330435835eedc8c23f4f8a15267f67c6e245d2b33757575bdac49d
-  languageName: node
-  linkType: hard
-
-"agent-base@npm:^4.3.0":
-  version: 4.3.0
-  resolution: "agent-base@npm:4.3.0"
-  dependencies:
-    es6-promisify: ^5.0.0
-  checksum: 0c10891060e579c67efafd6b62223666c4b4129b521eac3e9ad272a137545bcedb54ce352273b7ad21a0024060e4f1360ae9a465ac87e2af18883c937d39979f
-  languageName: node
-  linkType: hard
-
-"agentkeepalive@npm:^4.2.1":
-  version: 4.3.0
-  resolution: "agentkeepalive@npm:4.3.0"
-  dependencies:
-    debug: ^4.1.0
-    depd: ^2.0.0
-    humanize-ms: ^1.2.1
-  checksum: 982453aa44c11a06826c836025e5162c846e1200adb56f2d075400da7d32d87021b3b0a58768d949d824811f5654223d5a8a3dad120921a2439625eb847c6260
-  languageName: node
-  linkType: hard
-
-"aggregate-error@npm:^3.0.0":
-  version: 3.1.0
-  resolution: "aggregate-error@npm:3.1.0"
-  dependencies:
-    clean-stack: ^2.0.0
-    indent-string: ^4.0.0
-  checksum: 1101a33f21baa27a2fa8e04b698271e64616b886795fd43c31068c07533c7b3facfcaf4e9e0cab3624bd88f729a592f1c901a1a229c9e490eafce411a8644b79
-  languageName: node
-  linkType: hard
-
-"ajv-errors@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "ajv-errors@npm:1.0.1"
-  peerDependencies:
-    ajv: ">=5.0.0"
-  checksum: 2c9fc02cf58f9aae5bace61ebd1b162e1ea372ae9db5999243ba5e32a9a78c0d635d29ae085f652c61c941a43af0b2b1acdb255e29d44dc43a6e021085716d8c
-  languageName: node
-  linkType: hard
-
-"ajv-formats@npm:^2.1.1":
-  version: 2.1.1
-  resolution: "ajv-formats@npm:2.1.1"
-  dependencies:
-    ajv: ^8.0.0
-  peerDependencies:
-    ajv: ^8.0.0
-  peerDependenciesMeta:
-    ajv:
-      optional: true
-  checksum: 4a287d937f1ebaad4683249a4c40c0fa3beed30d9ddc0adba04859026a622da0d317851316ea64b3680dc60f5c3c708105ddd5d5db8fe595d9d0207fd19f90b7
-  languageName: node
-  linkType: hard
-
-"ajv-keywords@npm:^3.1.0, ajv-keywords@npm:^3.4.1, ajv-keywords@npm:^3.5.2":
-  version: 3.5.2
-  resolution: "ajv-keywords@npm:3.5.2"
-  peerDependencies:
-    ajv: ^6.9.1
-  checksum: 7dc5e5931677a680589050f79dcbe1fefbb8fea38a955af03724229139175b433c63c68f7ae5f86cf8f65d55eb7c25f75a046723e2e58296707617ca690feae9
-  languageName: node
-  linkType: hard
-
-"ajv-keywords@npm:^5.0.0":
-  version: 5.1.0
-  resolution: "ajv-keywords@npm:5.1.0"
-  dependencies:
-    fast-deep-equal: ^3.1.3
-  peerDependencies:
-    ajv: ^8.8.2
-  checksum: c35193940b853119242c6757787f09ecf89a2c19bcd36d03ed1a615e710d19d450cb448bfda407b939aba54b002368c8bff30529cc50a0536a8e10bcce300421
-  languageName: node
-  linkType: hard
-
-"ajv@npm:^6.1.0, ajv@npm:^6.10.0, ajv@npm:^6.10.2, ajv@npm:^6.12.3, ajv@npm:^6.12.4, ajv@npm:^6.12.5":
-  version: 6.12.6
-  resolution: "ajv@npm:6.12.6"
-  dependencies:
-    fast-deep-equal: ^3.1.1
-    fast-json-stable-stringify: ^2.0.0
-    json-schema-traverse: ^0.4.1
-    uri-js: ^4.2.2
-  checksum: 874972efe5c4202ab0a68379481fbd3d1b5d0a7bd6d3cc21d40d3536ebff3352a2a1fabb632d4fd2cc7fe4cbdcd5ed6782084c9bbf7f32a1536d18f9da5007d4
-  languageName: node
-  linkType: hard
-
-"ajv@npm:^8.0.0, ajv@npm:^8.8.0":
-  version: 8.11.0
-  resolution: "ajv@npm:8.11.0"
-  dependencies:
-    fast-deep-equal: ^3.1.1
-    json-schema-traverse: ^1.0.0
-    require-from-string: ^2.0.2
-    uri-js: ^4.2.2
-  checksum: 5e0ff226806763be73e93dd7805b634f6f5921e3e90ca04acdf8db81eed9d8d3f0d4c5f1213047f45ebbf8047ffe0c840fa1ef2ec42c3a644899f69aa72b5bef
-  languageName: node
-  linkType: hard
-
-"ajv@npm:^8.0.1":
-  version: 8.2.0
-  resolution: "ajv@npm:8.2.0"
-  dependencies:
-    fast-deep-equal: ^3.1.1
-    json-schema-traverse: ^1.0.0
-    require-from-string: ^2.0.2
-    uri-js: ^4.2.2
-  checksum: 36994bc227aac4c29ff967de5d53f087449ffab62d66f782f99c6aad8ac1d58db4eb7b0f78ce7961492eae00be51c2384b38b69e099d1021d41b2353dce91417
-  languageName: node
-  linkType: hard
-
-"amd-name-resolver@npm:1.2.0":
-  version: 1.2.0
-  resolution: "amd-name-resolver@npm:1.2.0"
-  dependencies:
-    ensure-posix-path: ^1.0.1
-  checksum: f84474670f4ee5c36f78ed0fe3ff64039ff5c489e6c9a1b595fac32ede3ca33ec3c20ab58361f6ae7f191e5bff0347ac9dcff480f17824482d458bed6f7db6b9
-  languageName: node
-  linkType: hard
-
-"amd-name-resolver@npm:1.3.1, amd-name-resolver@npm:^1.2.0, amd-name-resolver@npm:^1.3.1":
-  version: 1.3.1
-  resolution: "amd-name-resolver@npm:1.3.1"
-  dependencies:
-    ensure-posix-path: ^1.0.1
-    object-hash: ^1.3.1
-  checksum: c48f68922f394078acaac97f1691a46dcb94fa3d5ee47b9a0c5b81bf66073005b75b5784f93ed6c1081b0afa92d41a5c581073960dbde9baa80b8abef4cccb2b
-  languageName: node
-  linkType: hard
-
-"amd-name-resolver@npm:^0.0.6":
-  version: 0.0.6
-  resolution: "amd-name-resolver@npm:0.0.6"
-  dependencies:
-    ensure-posix-path: ^1.0.1
-  checksum: f0e4f03654b2b523a35a3ba5ae5fc6c9f637242cea75ef6470baea5f997a9206e60e23489f7d1c5adc4c3ac88c25008ca7ec4a92cf21b23b253141e2962c990c
-  languageName: node
-  linkType: hard
-
-"amdefine@npm:>=0.0.4":
-  version: 1.0.1
-  resolution: "amdefine@npm:1.0.1"
-  checksum: 9d4e15b94641643a9385b2841b4cb2bcf4e8e2f741ea4bd475c93ad7bab261ad4ed827a32e9c549b38b98759c4526c173ae4e6dde8caeb75ee5cebedc9863762
-  languageName: node
-  linkType: hard
-
-"anchor-markdown-header@npm:^0.5.7":
-  version: 0.5.7
-  resolution: "anchor-markdown-header@npm:0.5.7"
-  dependencies:
-    emoji-regex: ~6.1.0
-  checksum: 97ed56c61ca8aacca635378de4959fd95929c4966f96e6483df06d5b22b541924e91569c819c49cbed8e8684b3b77eb5760216bc9bd11e54bb58389ce29cedaa
-  languageName: node
-  linkType: hard
-
-"ansi-colors@npm:^4.1.1":
-  version: 4.1.1
-  resolution: "ansi-colors@npm:4.1.1"
-  checksum: 138d04a51076cb085da0a7e2d000c5c0bb09f6e772ed5c65c53cb118d37f6c5f1637506d7155fb5f330f0abcf6f12fa2e489ac3f8cdab9da393bf1bb4f9a32b0
-  languageName: node
-  linkType: hard
-
-"ansi-escapes@npm:^3.2.0":
-  version: 3.2.0
-  resolution: "ansi-escapes@npm:3.2.0"
-  checksum: 0f94695b677ea742f7f1eed961f7fd8d05670f744c6ad1f8f635362f6681dcfbc1575cb05b43abc7bb6d67e25a75fb8c7ea8f2a57330eb2c76b33f18cb2cef0a
-  languageName: node
-  linkType: hard
-
-"ansi-escapes@npm:^4.2.1, ansi-escapes@npm:^4.3.0":
-  version: 4.3.2
-  resolution: "ansi-escapes@npm:4.3.2"
-  dependencies:
-    type-fest: ^0.21.3
-  checksum: 93111c42189c0a6bed9cdb4d7f2829548e943827ee8479c74d6e0b22ee127b2a21d3f8b5ca57723b8ef78ce011fbfc2784350eb2bde3ccfccf2f575fa8489815
-  languageName: node
-  linkType: hard
-
-"ansi-html@npm:^0.0.7":
-  version: 0.0.7
-  resolution: "ansi-html@npm:0.0.7"
-  bin:
-    ansi-html: ./bin/ansi-html
-  checksum: 9b839ce99650b4c2d83621d67d68622d27e7948b54f7a4386f2218a3997ee4e684e5a6e8d290880c3f3260e8d90c2613c59c7028f04992ad5c8d99d3a0fcc02c
-  languageName: node
-  linkType: hard
-
-"ansi-regex@npm:^2.0.0":
-  version: 2.1.1
-  resolution: "ansi-regex@npm:2.1.1"
-  checksum: 190abd03e4ff86794f338a31795d262c1dfe8c91f7e01d04f13f646f1dcb16c5800818f886047876f1272f065570ab86b24b99089f8b68a0e11ff19aed4ca8f1
-  languageName: node
-  linkType: hard
-
-"ansi-regex@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "ansi-regex@npm:3.0.0"
-  checksum: 2ad11c416f81c39f5c65eafc88cf1d71aa91d76a2f766e75e457c2a3c43e8a003aadbf2966b61c497aa6a6940a36412486c975b3270cdfc3f413b69826189ec3
-  languageName: node
-  linkType: hard
-
-"ansi-regex@npm:^4.1.0":
-  version: 4.1.0
-  resolution: "ansi-regex@npm:4.1.0"
-  checksum: 97aa4659538d53e5e441f5ef2949a3cffcb838e57aeaad42c4194e9d7ddb37246a6526c4ca85d3940a9d1e19b11cc2e114530b54c9d700c8baf163c31779baf8
-  languageName: node
-  linkType: hard
-
-"ansi-regex@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "ansi-regex@npm:5.0.0"
-  checksum: b1bb4e992a5d96327bb4f72eaba9f8047f1d808d273ad19d399e266bfcc7fb19a4d1a127a32f7bc61fe46f1a94a4d04ec4c424e3fbe184929aa866323d8ed4ce
-  languageName: node
-  linkType: hard
-
-"ansi-regex@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "ansi-regex@npm:5.0.1"
-  checksum: 2aa4bb54caf2d622f1afdad09441695af2a83aa3fe8b8afa581d205e57ed4261c183c4d3877cee25794443fde5876417d859c108078ab788d6af7e4fe52eb66b
-  languageName: node
-  linkType: hard
-
-"ansi-styles@npm:^2.2.1":
-  version: 2.2.1
-  resolution: "ansi-styles@npm:2.2.1"
-  checksum: ebc0e00381f2a29000d1dac8466a640ce11943cef3bda3cd0020dc042e31e1058ab59bf6169cd794a54c3a7338a61ebc404b7c91e004092dd20e028c432c9c2c
-  languageName: node
-  linkType: hard
-
-"ansi-styles@npm:^3.0.0, ansi-styles@npm:^3.2.0, ansi-styles@npm:^3.2.1":
-  version: 3.2.1
-  resolution: "ansi-styles@npm:3.2.1"
-  dependencies:
-    color-convert: ^1.9.0
-  checksum: d85ade01c10e5dd77b6c89f34ed7531da5830d2cb5882c645f330079975b716438cd7ebb81d0d6e6b4f9c577f19ae41ab55f07f19786b02f9dfd9e0377395665
-  languageName: node
-  linkType: hard
-
-"ansi-styles@npm:^4.0.0, ansi-styles@npm:^4.1.0":
-  version: 4.3.0
-  resolution: "ansi-styles@npm:4.3.0"
-  dependencies:
-    color-convert: ^2.0.1
-  checksum: 513b44c3b2105dd14cc42a19271e80f386466c4be574bccf60b627432f9198571ebf4ab1e4c3ba17347658f4ee1711c163d574248c0c1cdc2d5917a0ad582ec4
-  languageName: node
-  linkType: hard
-
-"ansi-styles@npm:~1.0.0":
-  version: 1.0.0
-  resolution: "ansi-styles@npm:1.0.0"
-  checksum: 6dd47dccb268b4cc1fd0dd6617067a7acd34ad2761f0438800fdd55c0d45f50a90787acd82806009c2bf467f4e2920166be03e19b23529038c1c4527d80f598b
-  languageName: node
-  linkType: hard
-
-"ansi-to-html@npm:^0.6.15, ansi-to-html@npm:^0.6.6":
-  version: 0.6.15
-  resolution: "ansi-to-html@npm:0.6.15"
-  dependencies:
-    entities: ^2.0.0
-  bin:
-    ansi-to-html: bin/ansi-to-html
-  checksum: c899362a29b92c8ae075b72168b826f7c233875b475719304942f80695e0ce4a6812845021192da5fb0ac80b10209b4fae5aede42620a1b1b3d3b30f3ef77a86
-  languageName: node
-  linkType: hard
-
-"ansicolors@npm:~0.2.1":
-  version: 0.2.1
-  resolution: "ansicolors@npm:0.2.1"
-  checksum: 7120ca45a780cf17d786070874776637adcc107cf2bb9b38934f92d88cb5c3d16e1e7092708ba0f64f2031e6c10844c26e8a13d9e27f7b058c36ad8950cbfd02
-  languageName: node
-  linkType: hard
-
-"anymatch@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "anymatch@npm:2.0.0"
-  dependencies:
-    micromatch: ^3.1.4
-    normalize-path: ^2.1.1
-  checksum: f7bb1929842b4585cdc28edbb385767d499ce7d673f96a8f11348d2b2904592ffffc594fe9229b9a1e9e4dccb9329b7692f9f45e6a11dcefbb76ecdc9ab740f6
-  languageName: node
-  linkType: hard
-
-"anymatch@npm:^3.1.1, anymatch@npm:~3.1.1":
-  version: 3.1.2
-  resolution: "anymatch@npm:3.1.2"
-  dependencies:
-    normalize-path: ^3.0.0
-    picomatch: ^2.0.4
-  checksum: 985163db2292fac9e5a1e072bf99f1b5baccf196e4de25a0b0b81865ebddeb3b3eb4480734ef0a2ac8c002845396b91aa89121f5b84f93981a4658164a9ec6e9
-  languageName: node
-  linkType: hard
-
-"anymatch@npm:~3.1.2":
-  version: 3.1.3
-  resolution: "anymatch@npm:3.1.3"
-  dependencies:
-    normalize-path: ^3.0.0
-    picomatch: ^2.0.4
-  checksum: 3e044fd6d1d26545f235a9fe4d7a534e2029d8e59fa7fd9f2a6eb21230f6b5380ea1eaf55136e60cbf8e613544b3b766e7a6fa2102e2a3a117505466e3025dc2
-  languageName: node
-  linkType: hard
-
-"aproba@npm:^1.0.3 || ^2.0.0":
-  version: 2.0.0
-  resolution: "aproba@npm:2.0.0"
-  checksum: 5615cadcfb45289eea63f8afd064ab656006361020e1735112e346593856f87435e02d8dcc7ff0d11928bc7d425f27bc7c2a84f6c0b35ab0ff659c814c138a24
-  languageName: node
-  linkType: hard
-
-"aproba@npm:^1.1.1":
-  version: 1.2.0
-  resolution: "aproba@npm:1.2.0"
-  checksum: 0fca141966559d195072ed047658b6e6c4fe92428c385dd38e288eacfc55807e7b4989322f030faff32c0f46bb0bc10f1e0ac32ec22d25315a1e5bbc0ebb76dc
-  languageName: node
-  linkType: hard
-
-"are-we-there-yet@npm:^3.0.0":
-  version: 3.0.1
-  resolution: "are-we-there-yet@npm:3.0.1"
-  dependencies:
-    delegates: ^1.0.0
-    readable-stream: ^3.6.0
-  checksum: 52590c24860fa7173bedeb69a4c05fb573473e860197f618b9a28432ee4379049336727ae3a1f9c4cb083114601c1140cee578376164d0e651217a9843f9fe83
-  languageName: node
-  linkType: hard
-
-"argparse@npm:^1.0.7":
-  version: 1.0.10
-  resolution: "argparse@npm:1.0.10"
-  dependencies:
-    sprintf-js: ~1.0.2
-  checksum: 7ca6e45583a28de7258e39e13d81e925cfa25d7d4aacbf806a382d3c02fcb13403a07fb8aeef949f10a7cfe4a62da0e2e807b348a5980554cc28ee573ef95945
-  languageName: node
-  linkType: hard
-
-"argparse@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "argparse@npm:2.0.1"
-  checksum: 83644b56493e89a254bae05702abf3a1101b4fa4d0ca31df1c9985275a5a5bd47b3c27b7fa0b71098d41114d8ca000e6ed90cad764b306f8a503665e4d517ced
-  languageName: node
-  linkType: hard
-
-"aria-query@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "aria-query@npm:5.0.0"
-  checksum: c41f98866c5a304561ee8cae55856711cddad6f3f85d8cb43cc5f79667078d9b8979ce32d244c1ff364e6463a4d0b6865804a33ccc717fed701b281cf7dc6296
-  languageName: node
-  linkType: hard
-
-"arr-diff@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "arr-diff@npm:4.0.0"
-  checksum: ea7c8834842ad3869297f7915689bef3494fd5b102ac678c13ffccab672d3d1f35802b79e90c4cfec2f424af3392e44112d1ccf65da34562ed75e049597276a0
-  languageName: node
-  linkType: hard
-
-"arr-flatten@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "arr-flatten@npm:1.1.0"
-  checksum: 963fe12564fca2f72c055f3f6c206b9e031f7c433a0c66ca9858b484821f248c5b1e5d53c8e4989d80d764cd776cf6d9b160ad05f47bdc63022bfd63b5455e22
-  languageName: node
-  linkType: hard
-
-"arr-union@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "arr-union@npm:3.1.0"
-  checksum: b5b0408c6eb7591143c394f3be082fee690ddd21f0fdde0a0a01106799e847f67fcae1b7e56b0a0c173290e29c6aca9562e82b300708a268bc8f88f3d6613cb9
-  languageName: node
-  linkType: hard
-
-"array-equal@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "array-equal@npm:1.0.0"
-  checksum: 3f68045806357db9b2fa1ad583e42a659de030633118a0cd35ee4975cb20db3b9a3d36bbec9b5afe70011cf989eefd215c12fe0ce08c498f770859ca6e70688a
-  languageName: node
-  linkType: hard
-
-"array-flatten@npm:1.1.1":
-  version: 1.1.1
-  resolution: "array-flatten@npm:1.1.1"
-  checksum: a9925bf3512d9dce202112965de90c222cd59a4fbfce68a0951d25d965cf44642931f40aac72309c41f12df19afa010ecadceb07cfff9ccc1621e99d89ab5f3b
-  languageName: node
-  linkType: hard
-
-"array-from@npm:^2.1.1":
-  version: 2.1.1
-  resolution: "array-from@npm:2.1.1"
-  checksum: 4cd5fa27aa6133b99a57c2881d2a8a66ec59b8e17a0c900f7e8ac9a0a2fae450ed682b67435467bfa71ac9328d025a760c5c46a95586a352180c5a79fc13015d
-  languageName: node
-  linkType: hard
-
-"array-to-error@npm:^1.0.0":
-  version: 1.1.1
-  resolution: "array-to-error@npm:1.1.1"
-  dependencies:
-    array-to-sentence: ^1.1.0
-  checksum: c476c79249b4852f4ae6e2cff1463c3343986d1324e273c6404ccea1748a5b1900d05e774fc84f3f29c964aa4d36702d5c0426034856197da73557797c947e0f
-  languageName: node
-  linkType: hard
-
-"array-to-sentence@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "array-to-sentence@npm:1.1.0"
-  checksum: 7252ed7b93c6c5f07afcc67feef34b68f9b0b744f00fc7317e6d12f2c3320dc5417cedfc0c23497cc867ebdeca0573486ca8e6b09a515c5e6a90e860c668f2b6
-  languageName: node
-  linkType: hard
-
-"array-union@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "array-union@npm:2.1.0"
-  checksum: 5bee12395cba82da674931df6d0fea23c4aa4660cb3b338ced9f828782a65caa232573e6bf3968f23e0c5eb301764a382cef2f128b170a9dc59de0e36c39f98d
-  languageName: node
-  linkType: hard
-
-"array-unique@npm:^0.3.2":
-  version: 0.3.2
-  resolution: "array-unique@npm:0.3.2"
-  checksum: da344b89cfa6b0a5c221f965c21638bfb76b57b45184a01135382186924f55973cd9b171d4dad6bf606c6d9d36b0d721d091afdc9791535ead97ccbe78f8a888
-  languageName: node
-  linkType: hard
-
-"arrify@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "arrify@npm:2.0.1"
-  checksum: 067c4c1afd182806a82e4c1cb8acee16ab8b5284fbca1ce29408e6e91281c36bb5b612f6ddfbd40a0f7a7e0c75bf2696eb94c027f6e328d6e9c52465c98e4209
-  languageName: node
-  linkType: hard
-
-"asn1.js@npm:^5.2.0":
-  version: 5.4.1
-  resolution: "asn1.js@npm:5.4.1"
-  dependencies:
-    bn.js: ^4.0.0
-    inherits: ^2.0.1
-    minimalistic-assert: ^1.0.0
-    safer-buffer: ^2.1.0
-  checksum: 3786a101ac6f304bd4e9a7df79549a7561950a13d4bcaec0c7790d44c80d147c1a94ba3d4e663673406064642a40b23fcd6c82a9952468e386c1a1376d747f9a
-  languageName: node
-  linkType: hard
-
-"asn1@npm:~0.2.3":
-  version: 0.2.4
-  resolution: "asn1@npm:0.2.4"
-  dependencies:
-    safer-buffer: ~2.1.0
-  checksum: aa5d6f77b1e0597df53824c68cfe82d1d89ce41cb3520148611f025fbb3101b2d25dd6a40ad34e4fac10f6b19ed5e8628cd4b7d212261e80e83f02b39ee5663c
-  languageName: node
-  linkType: hard
-
-"asn1js@npm:^2.1.1, asn1js@npm:^2.2.0":
-  version: 2.2.0
-  resolution: "asn1js@npm:2.2.0"
-  dependencies:
-    pvutils: latest
-  checksum: 936e233b7453d7e9805c1637f02da7145d73d5158105710f9bc79efaf51aa935a8bce87b0efed59da4c32fc304bfe28eb22fad1e1bf2f926478e110c6f3da240
-  languageName: node
-  linkType: hard
-
-"assert-never@npm:^1.1.0, assert-never@npm:^1.2.1":
-  version: 1.2.1
-  resolution: "assert-never@npm:1.2.1"
-  checksum: ea4f1756d90f55254c4dc7a20d6c5d5bc169160562aefe3d8756b598c10e695daf568f21b6d6b12245d7f3782d3ff83ef6a01ab75d487adfc6909470a813bf8c
-  languageName: node
-  linkType: hard
-
-"assert-plus@npm:1.0.0, assert-plus@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "assert-plus@npm:1.0.0"
-  checksum: 19b4340cb8f0e6a981c07225eacac0e9d52c2644c080198765d63398f0075f83bbc0c8e95474d54224e297555ad0d631c1dcd058adb1ddc2437b41a6b424ac64
-  languageName: node
-  linkType: hard
-
-"assert@npm:^1.1.1":
-  version: 1.5.0
-  resolution: "assert@npm:1.5.0"
-  dependencies:
-    object-assign: ^4.1.1
-    util: 0.10.3
-  checksum: 9be48435f726029ae7020c5888a3566bf4d617687aab280827f2e4029644b6515a9519ea10d018b342147c02faf73d9e9419e780e8937b3786ee4945a0ca71e5
-  languageName: node
-  linkType: hard
-
-"assign-symbols@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "assign-symbols@npm:1.0.0"
-  checksum: c0eb895911d05b6b2d245154f70461c5e42c107457972e5ebba38d48967870dee53bcdf6c7047990586daa80fab8dab3cc6300800fbd47b454247fdedd859a2c
-  languageName: node
-  linkType: hard
-
-"ast-metadata-inferer@npm:^0.7.0":
-  version: 0.7.0
-  resolution: "ast-metadata-inferer@npm:0.7.0"
-  dependencies:
-    "@mdn/browser-compat-data": ^3.3.14
-  checksum: 9bb633b680d537cd6d5066e48ed6ae68d7ddae663a380bdba78d4f40b53d4c03845dc3a7307d55ecf1248b447ee28d62bb20ade8b880abc2df629cda9414e32e
-  languageName: node
-  linkType: hard
-
-"ast-types@npm:0.13.3":
-  version: 0.13.3
-  resolution: "ast-types@npm:0.13.3"
-  checksum: 23d08bc589aacb787e22ac7efc086ebcc158e739c057dac74de409a97e26ec9c5bcb2d0709f5678bd5d90f67d93f62fba0e5fe98161a0a3a7534d55a155544d8
-  languageName: node
-  linkType: hard
-
-"astral-regex@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "astral-regex@npm:2.0.0"
-  checksum: 876231688c66400473ba505731df37ea436e574dd524520294cc3bbc54ea40334865e01fa0d074d74d036ee874ee7e62f486ea38bc421ee8e6a871c06f011766
-  languageName: node
-  linkType: hard
-
-"async-disk-cache@npm:^1.2.1":
-  version: 1.3.5
-  resolution: "async-disk-cache@npm:1.3.5"
-  dependencies:
-    debug: ^2.1.3
-    heimdalljs: ^0.2.3
-    istextorbinary: 2.1.0
-    mkdirp: ^0.5.0
-    rimraf: ^2.5.3
-    rsvp: ^3.0.18
-    username-sync: ^1.0.2
-  checksum: 1844554469dc4a0abc855ad3c46296ccf105923186a662c47a85e5fa6a818a2693f2f941b903f2e28ab29895bd41596a81b42f670b71772a8134374f7459f51e
-  languageName: node
-  linkType: hard
-
-"async-disk-cache@npm:^2.0.0":
-  version: 2.1.0
-  resolution: "async-disk-cache@npm:2.1.0"
-  dependencies:
-    debug: ^4.1.1
-    heimdalljs: ^0.2.3
-    istextorbinary: ^2.5.1
-    mkdirp: ^0.5.0
-    rimraf: ^3.0.0
-    rsvp: ^4.8.5
-    username-sync: ^1.0.2
-  checksum: 08dbea2062961885d646d97f46a4309d8ca5254d326a7dd119c8769d31ccab063fa24acf08bce82e38e789997933e6480bcbf97be8e015023cd6685929b93bfb
-  languageName: node
-  linkType: hard
-
-"async-each@npm:^1.0.1":
-  version: 1.0.3
-  resolution: "async-each@npm:1.0.3"
-  checksum: 868651cfeb209970b367fbb96df1e1c8dc0b22c681cda7238417005ab2a5fbd944ee524b43f2692977259a57b7cc2547e03ff68f2b5113dbdf953d48cc078dc3
-  languageName: node
-  linkType: hard
-
-"async-promise-queue@npm:^1.0.3, async-promise-queue@npm:^1.0.5":
-  version: 1.0.5
-  resolution: "async-promise-queue@npm:1.0.5"
-  dependencies:
-    async: ^2.4.1
-    debug: ^2.6.8
-  checksum: 6f18b65e4bac8c12822d66c532aba6c8a8d81ee6e7d790bc7c399e882ff55b642a86379a58df9129db8560f57f76dea0af39b065f43568fb4bec4edf40e415a9
-  languageName: node
-  linkType: hard
-
-"async@npm:^2.4.1, async@npm:^2.6.2":
-  version: 2.6.3
-  resolution: "async@npm:2.6.3"
-  dependencies:
-    lodash: ^4.17.14
-  checksum: 5e5561ff8fca807e88738533d620488ac03a5c43fce6c937451f7e35f943d33ad06c24af3f681a48cca3d2b0002b3118faff0a128dc89438a9bf0226f712c499
-  languageName: node
-  linkType: hard
-
-"async@npm:~0.2.9":
-  version: 0.2.10
-  resolution: "async@npm:0.2.10"
-  checksum: 9ea83419ba67dc4ecf42d4eb0d93ce0ac80a67cabb612f160ed096aef5d001e3184ec9e9be5d4dc39b2c51a34e2ae16f9b21d737068b0f615fccb4eea16d0138
-  languageName: node
-  linkType: hard
-
-"asynckit@npm:^0.4.0":
-  version: 0.4.0
-  resolution: "asynckit@npm:0.4.0"
-  checksum: 7b78c451df768adba04e2d02e63e2d0bf3b07adcd6e42b4cf665cb7ce899bedd344c69a1dcbce355b5f972d597b25aaa1c1742b52cffd9caccb22f348114f6be
-  languageName: node
-  linkType: hard
-
-"at-least-node@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "at-least-node@npm:1.0.0"
-  checksum: 463e2f8e43384f1afb54bc68485c436d7622acec08b6fad269b421cb1d29cebb5af751426793d0961ed243146fe4dc983402f6d5a51b720b277818dbf6f2e49e
-  languageName: node
-  linkType: hard
-
-"atob@npm:^2.1.2":
-  version: 2.1.2
-  resolution: "atob@npm:2.1.2"
-  bin:
-    atob: bin/atob.js
-  checksum: dfeeeb70090c5ebea7be4b9f787f866686c645d9f39a0d184c817252d0cf08455ed25267d79c03254d3be1f03ac399992a792edcd5ffb9c91e097ab5ef42833a
-  languageName: node
-  linkType: hard
-
-"autoprefixer@npm:^7.0.0":
-  version: 7.2.6
-  resolution: "autoprefixer@npm:7.2.6"
-  dependencies:
-    browserslist: ^2.11.3
-    caniuse-lite: ^1.0.30000805
-    normalize-range: ^0.1.2
-    num2fraction: ^1.2.2
-    postcss: ^6.0.17
-    postcss-value-parser: ^3.2.3
-  bin:
-    autoprefixer-info: ./bin/autoprefixer-info
-  checksum: 7ad12a58ca128d3e6b6dc5e4b3d83f2a12151216d30bcea1f1f2f8a91d2a019c58dd62fd039a6c1cf218f2ab557b03224703a4396c1b4f01b5c0818bc6ba4dd9
-  languageName: node
-  linkType: hard
-
-"autosize@npm:^4.0.0":
-  version: 4.0.2
-  resolution: "autosize@npm:4.0.2"
-  checksum: e19f1e64742cfd17d8dcd24b878871e36f1b295e4184ad7c5e036204b54c7a6346dd460e7c0b1562244632deb651394e79e656a144aa6fbc69803892713d550d
-  languageName: node
-  linkType: hard
-
-"aws-sign2@npm:~0.7.0":
-  version: 0.7.0
-  resolution: "aws-sign2@npm:0.7.0"
-  checksum: b148b0bb0778098ad8cf7e5fc619768bcb51236707ca1d3e5b49e41b171166d8be9fdc2ea2ae43d7decf02989d0aaa3a9c4caa6f320af95d684de9b548a71525
-  languageName: node
-  linkType: hard
-
-"aws4@npm:^1.8.0":
-  version: 1.11.0
-  resolution: "aws4@npm:1.11.0"
-  checksum: 5a00d045fd0385926d20ebebcfba5ec79d4482fe706f63c27b324d489a04c68edb0db99ed991e19eda09cb8c97dc2452059a34d97545cebf591d7a2b5a10999f
-  languageName: node
-  linkType: hard
-
-"babel-code-frame@npm:^6.26.0":
-  version: 6.26.0
-  resolution: "babel-code-frame@npm:6.26.0"
-  dependencies:
-    chalk: ^1.1.3
-    esutils: ^2.0.2
-    js-tokens: ^3.0.2
-  checksum: 9410c3d5a921eb02fa409675d1a758e493323a49e7b9dddb7a2a24d47e61d39ab1129dd29f9175836eac9ce8b1d4c0a0718fcdc57ce0b865b529fd250dbab313
-  languageName: node
-  linkType: hard
-
-"babel-core@npm:^6.26.0, babel-core@npm:^6.26.3":
-  version: 6.26.3
-  resolution: "babel-core@npm:6.26.3"
-  dependencies:
-    babel-code-frame: ^6.26.0
-    babel-generator: ^6.26.0
-    babel-helpers: ^6.24.1
-    babel-messages: ^6.23.0
-    babel-register: ^6.26.0
-    babel-runtime: ^6.26.0
-    babel-template: ^6.26.0
-    babel-traverse: ^6.26.0
-    babel-types: ^6.26.0
-    babylon: ^6.18.0
-    convert-source-map: ^1.5.1
-    debug: ^2.6.9
-    json5: ^0.5.1
-    lodash: ^4.17.4
-    minimatch: ^3.0.4
-    path-is-absolute: ^1.0.1
-    private: ^0.1.8
-    slash: ^1.0.0
-    source-map: ^0.5.7
-  checksum: 3d6a37e5c69ea7f7d66c2a261cbd7219197f2f938700e6ebbabb6d84a03f2bf86691ffa066866dcb49ba6c4bd702d347c9e0e147660847d709705cf43c964752
-  languageName: node
-  linkType: hard
-
-"babel-eslint@npm:^10.1.0":
-  version: 10.1.0
-  resolution: "babel-eslint@npm:10.1.0"
-  dependencies:
-    "@babel/code-frame": ^7.0.0
-    "@babel/parser": ^7.7.0
-    "@babel/traverse": ^7.7.0
-    "@babel/types": ^7.7.0
-    eslint-visitor-keys: ^1.0.0
-    resolve: ^1.12.0
-  peerDependencies:
-    eslint: ">= 4.12.1"
-  checksum: bdc1f62b6b0f9c4d5108c96d835dad0c0066bc45b7c020fcb2d6a08107cf69c9217a99d3438dbd701b2816896190c4283ba04270ed9a8349ee07bd8dafcdc050
-  languageName: node
-  linkType: hard
-
-"babel-generator@npm:^6.26.0":
-  version: 6.26.1
-  resolution: "babel-generator@npm:6.26.1"
-  dependencies:
-    babel-messages: ^6.23.0
-    babel-runtime: ^6.26.0
-    babel-types: ^6.26.0
-    detect-indent: ^4.0.0
-    jsesc: ^1.3.0
-    lodash: ^4.17.4
-    source-map: ^0.5.7
-    trim-right: ^1.0.1
-  checksum: 5397f4d4d1243e7157e3336be96c10fcb1f29f73bf2d9842229c71764d9a6431397d249483a38c4d8b1581459e67be4df6f32d26b1666f02d0f5bfc2c2f25193
-  languageName: node
-  linkType: hard
-
-"babel-helper-builder-binary-assignment-operator-visitor@npm:^6.24.1":
-  version: 6.24.1
-  resolution: "babel-helper-builder-binary-assignment-operator-visitor@npm:6.24.1"
-  dependencies:
-    babel-helper-explode-assignable-expression: ^6.24.1
-    babel-runtime: ^6.22.0
-    babel-types: ^6.24.1
-  checksum: 6ef49597837d042980e78284df014972daac7f1f1f2635d978bb2d13990304322f5135f27b8f2d6eb8c4c2459b496ec76e21544e26afbb5dec88f53089e17476
-  languageName: node
-  linkType: hard
-
-"babel-helper-call-delegate@npm:^6.24.1":
-  version: 6.24.1
-  resolution: "babel-helper-call-delegate@npm:6.24.1"
-  dependencies:
-    babel-helper-hoist-variables: ^6.24.1
-    babel-runtime: ^6.22.0
-    babel-traverse: ^6.24.1
-    babel-types: ^6.24.1
-  checksum: b6277d6e48c10cf416632f6dfbac77bdf6ba8ec4ac2f6359a77d6b731dae941c2a3ec7f35e1eba78aad2a7e0838197731d1ef75af529055096c4cb7d96432c88
-  languageName: node
-  linkType: hard
-
-"babel-helper-define-map@npm:^6.24.1":
-  version: 6.26.0
-  resolution: "babel-helper-define-map@npm:6.26.0"
-  dependencies:
-    babel-helper-function-name: ^6.24.1
-    babel-runtime: ^6.26.0
-    babel-types: ^6.26.0
-    lodash: ^4.17.4
-  checksum: 08e201eb009a7dbd020232fb7468ac772ebb8cfd33ec9a41113a54f4c90fd1e3474497783d635b8f87d797706323ca0c1758c516a630b0c95277112fc2fe4f13
-  languageName: node
-  linkType: hard
-
-"babel-helper-explode-assignable-expression@npm:^6.24.1":
-  version: 6.24.1
-  resolution: "babel-helper-explode-assignable-expression@npm:6.24.1"
-  dependencies:
-    babel-runtime: ^6.22.0
-    babel-traverse: ^6.24.1
-    babel-types: ^6.24.1
-  checksum: 1bafdb51ce3dd95cf25d712d24a0c3c2ae02ff58118c77462f14ede4d8161aaee42c5c759c3d3a3344a5851b8b0f8d16b395713413b8194e1c3264fc5b12b754
-  languageName: node
-  linkType: hard
-
-"babel-helper-function-name@npm:^6.24.1":
-  version: 6.24.1
-  resolution: "babel-helper-function-name@npm:6.24.1"
-  dependencies:
-    babel-helper-get-function-arity: ^6.24.1
-    babel-runtime: ^6.22.0
-    babel-template: ^6.24.1
-    babel-traverse: ^6.24.1
-    babel-types: ^6.24.1
-  checksum: d651db9e0b29e135877e90e7858405750a684220d22a6f7c78bb163305a1b322cc1c8bea1bc617625c34d92d0927fdbaa49ee46822e2f86b524eced4c88c7ff0
-  languageName: node
-  linkType: hard
-
-"babel-helper-get-function-arity@npm:^6.24.1":
-  version: 6.24.1
-  resolution: "babel-helper-get-function-arity@npm:6.24.1"
-  dependencies:
-    babel-runtime: ^6.22.0
-    babel-types: ^6.24.1
-  checksum: 37e344d6c5c00b67a3b378490a5d7ba924bab1c2ccd6ecf1b7da96ca679be12d75fbec6279366ae9772e482fb06a7b48293954dd79cbeba9b947e2db67252fbd
-  languageName: node
-  linkType: hard
-
-"babel-helper-hoist-variables@npm:^6.24.1":
-  version: 6.24.1
-  resolution: "babel-helper-hoist-variables@npm:6.24.1"
-  dependencies:
-    babel-runtime: ^6.22.0
-    babel-types: ^6.24.1
-  checksum: 6af1c165d5f0ad192df07daa194d13de77572bd914d2fc9a270d56b93b2705d98eebabf412b1211505535af131fbe95886fcfad8b3a07b4d501c24b9cb8e57fe
-  languageName: node
-  linkType: hard
-
-"babel-helper-optimise-call-expression@npm:^6.24.1":
-  version: 6.24.1
-  resolution: "babel-helper-optimise-call-expression@npm:6.24.1"
-  dependencies:
-    babel-runtime: ^6.22.0
-    babel-types: ^6.24.1
-  checksum: 16e6aba819b473dbf013391f759497df9f57bc7060bc4e5f7f6b60fb03670eb1dec65dd2227601d58f151e9d647e1f676a12466f5e6674379978820fa02c0fbb
-  languageName: node
-  linkType: hard
-
-"babel-helper-regex@npm:^6.24.1":
-  version: 6.26.0
-  resolution: "babel-helper-regex@npm:6.26.0"
-  dependencies:
-    babel-runtime: ^6.26.0
-    babel-types: ^6.26.0
-    lodash: ^4.17.4
-  checksum: ab949a4c90ab255abaafd9ec11a4a6dc77dba360875af2bb0822b699c058858773792c1e969c425c396837f61009f30c9ee5ba4b9a8ca87b0779ae1622f89fb3
-  languageName: node
-  linkType: hard
-
-"babel-helper-remap-async-to-generator@npm:^6.24.1":
-  version: 6.24.1
-  resolution: "babel-helper-remap-async-to-generator@npm:6.24.1"
-  dependencies:
-    babel-helper-function-name: ^6.24.1
-    babel-runtime: ^6.22.0
-    babel-template: ^6.24.1
-    babel-traverse: ^6.24.1
-    babel-types: ^6.24.1
-  checksum: f330943104b61e7f9248d222bd5fe5d3238904ee20643b76197571e14a724723d64a8096b292a60f64788f0efe30176882c376eeebde00657925678e304324f0
-  languageName: node
-  linkType: hard
-
-"babel-helper-replace-supers@npm:^6.24.1":
-  version: 6.24.1
-  resolution: "babel-helper-replace-supers@npm:6.24.1"
-  dependencies:
-    babel-helper-optimise-call-expression: ^6.24.1
-    babel-messages: ^6.23.0
-    babel-runtime: ^6.22.0
-    babel-template: ^6.24.1
-    babel-traverse: ^6.24.1
-    babel-types: ^6.24.1
-  checksum: ca1d216c5c6afc6af2ef55ea16777ba99e108780ea25da61d93edb09fd85f5e96c756306e2a21e737c3b0c7a16c99762b62a0e5f529d3865b14029fef7351cba
-  languageName: node
-  linkType: hard
-
-"babel-helpers@npm:^6.24.1":
-  version: 6.24.1
-  resolution: "babel-helpers@npm:6.24.1"
-  dependencies:
-    babel-runtime: ^6.22.0
-    babel-template: ^6.24.1
-  checksum: 751c6010e18648eebae422adfea5f3b5eff70d592d693bfe0f53346227d74b38e6cd2553c4c18de1e64faac585de490eccbd3ab86ba0885bdac42ed4478bc6b0
-  languageName: node
-  linkType: hard
-
-"babel-import-util@npm:^0.2.0":
-  version: 0.2.0
-  resolution: "babel-import-util@npm:0.2.0"
-  checksum: 32a71d1de47cfbf99dba552e87c11798ef6116643f24429a654b09cb7d365db0dd5bbfe318eb1b63f0c9eae3a4a0c2aefd9c1e21f2b21f1e24ad703693429f95
-  languageName: node
-  linkType: hard
-
-"babel-import-util@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "babel-import-util@npm:1.1.0"
-  checksum: d4e965a18ebeee78cd69f1735ab10b64e693b5d837cd887c7ce9f03756d55a49a9f434e29077eafc5bb1f15589dad5ceb1efece78a750d4fc2f0451d5a69da9d
-  languageName: node
-  linkType: hard
-
-"babel-import-util@npm:^1.3.0":
-  version: 1.3.0
-  resolution: "babel-import-util@npm:1.3.0"
-  checksum: 41c6b4276ceefd2263f59be97a99bf8d948899c76587b273d115e91fa9067b0d9cc80ba727a795732052e078c30a3665649c725aed966826bf7c0a258a5fcf03
-  languageName: node
-  linkType: hard
-
-"babel-loader@npm:^8.0.6":
-  version: 8.2.2
-  resolution: "babel-loader@npm:8.2.2"
-  dependencies:
-    find-cache-dir: ^3.3.1
-    loader-utils: ^1.4.0
-    make-dir: ^3.1.0
-    schema-utils: ^2.6.5
-  peerDependencies:
-    "@babel/core": ^7.0.0
-    webpack: ">=2"
-  checksum: df5092ef9886bb49aacb7c58ac40ed0681ced031c8d91e49d680cedace2aa1703390a31fbe7c0e409f739836e911c5c991119133d90d9289f681c0a8ff2447a1
-  languageName: node
-  linkType: hard
-
-"babel-messages@npm:^6.23.0":
-  version: 6.23.0
-  resolution: "babel-messages@npm:6.23.0"
-  dependencies:
-    babel-runtime: ^6.22.0
-  checksum: c8075c17587a33869e1a5bd0a5b73bbe395b68188362dacd5418debbc7c8fd784bcd3295e81ee7e410dc2c2655755add6af03698c522209f6a68334c15e6d6ca
-  languageName: node
-  linkType: hard
-
-"babel-plugin-check-es2015-constants@npm:^6.22.0":
-  version: 6.22.0
-  resolution: "babel-plugin-check-es2015-constants@npm:6.22.0"
-  dependencies:
-    babel-runtime: ^6.22.0
-  checksum: 39168cb4ff078911726bfaf9d111d1e18f3e99d8b6f6101d343249b28346c3869e415c97fe7e857e7f34b913f8a052634b2b9dcfb4c0272e5f64ed22df69c735
-  languageName: node
-  linkType: hard
-
-"babel-plugin-compact-reexports@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "babel-plugin-compact-reexports@npm:1.1.0"
-  checksum: b2e56896a53a010f96f90f3e13d8bb5485bbe8ebc7203d01d1360ec1a5e374f7bffe9c02a244d946ebff384611533e0b349c93f5da4c1a9c08b9e676fc76b22f
-  languageName: node
-  linkType: hard
-
-"babel-plugin-debug-macros@npm:^0.2.0, babel-plugin-debug-macros@npm:^0.2.0-beta.6":
-  version: 0.2.0
-  resolution: "babel-plugin-debug-macros@npm:0.2.0"
-  dependencies:
-    semver: ^5.3.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-beta.42
-  checksum: 6ea36c7893940df58f08f9d0c72d2e02cf77a763084572d6f6c1291c462108af318eaa737549f96ba332b624efe0cdab6fcb49afa6466388012dbecd749f713c
-  languageName: node
-  linkType: hard
-
-"babel-plugin-debug-macros@npm:^0.3.4":
-  version: 0.3.4
-  resolution: "babel-plugin-debug-macros@npm:0.3.4"
-  dependencies:
-    semver: ^5.3.0
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: 77762b945a4d4a24d973b659938e4ff9fe485f08c4ad5c8459f184669d946f5883870a6f05a39f09773bcd0923162dcad5fbf8773cf38b3176d71ca415e9e869
-  languageName: node
-  linkType: hard
-
-"babel-plugin-dynamic-import-node@npm:^2.3.3":
-  version: 2.3.3
-  resolution: "babel-plugin-dynamic-import-node@npm:2.3.3"
-  dependencies:
-    object.assign: ^4.1.0
-  checksum: c9d24415bcc608d0db7d4c8540d8002ac2f94e2573d2eadced137a29d9eab7e25d2cbb4bc6b9db65cf6ee7430f7dd011d19c911a9a778f0533b4a05ce8292c9b
-  languageName: node
-  linkType: hard
-
-"babel-plugin-ember-data-packages-polyfill@npm:^0.1.2":
-  version: 0.1.2
-  resolution: "babel-plugin-ember-data-packages-polyfill@npm:0.1.2"
-  dependencies:
-    "@ember-data/rfc395-data": ^0.0.4
-  checksum: c61f9d70898db94feefea7a8cc958c52015fc23b17957eac2f360324b32b4d5b36aa7c2725102b44ee592e1e16b35fd8ee6cdfa949ffc0b11686387251226190
-  languageName: node
-  linkType: hard
-
-"babel-plugin-ember-modules-api-polyfill@npm:^2.6.0":
-  version: 2.13.4
-  resolution: "babel-plugin-ember-modules-api-polyfill@npm:2.13.4"
-  dependencies:
-    ember-rfc176-data: ^0.3.13
-  checksum: 6d647183bc4ab14a7eb80361970fc0050c320af865ca88921e8e1406b2be13ccd318805e9e59c3b3485abe89f1ce34e1ef530e5a78880747103409cc48b3abc0
-  languageName: node
-  linkType: hard
-
-"babel-plugin-ember-modules-api-polyfill@npm:^3.5.0":
-  version: 3.5.0
-  resolution: "babel-plugin-ember-modules-api-polyfill@npm:3.5.0"
-  dependencies:
-    ember-rfc176-data: ^0.3.17
-  checksum: 70a4926fe9c9a6553b877ecf09cd6a077e3c73ac13b5e269fee116c7dcaceaff28b317a7b68c16a9cb6d0470079fbbb3265c2cf755061341c9ccbde28c58d684
-  languageName: node
-  linkType: hard
-
-"babel-plugin-ember-template-compilation@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "babel-plugin-ember-template-compilation@npm:1.0.1"
-  dependencies:
-    babel-import-util: ^0.2.0
-    line-column: ^1.0.2
-    magic-string: ^0.25.7
-    string.prototype.matchall: ^4.0.5
-  checksum: 4eeb31754025fb4b88413028b3d71aa1e50e10cf873c939a314b694a51f5c2771476db6270c5e4cf1863f5ae9d94b696b3c692747ff691078437170a65f2f9ea
-  languageName: node
-  linkType: hard
-
-"babel-plugin-ember-template-compilation@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "babel-plugin-ember-template-compilation@npm:2.0.0"
-  dependencies:
-    babel-import-util: ^1.3.0
-  checksum: 8abe8d6b3f20574ef824a1b6d04694892dae85055ff7aa370a183b383c9322ace64c1bbc4b9ccd54d8b8507e3bd673df10e9f1331ed2d7f23d8f719943f23660
-  languageName: node
-  linkType: hard
-
-"babel-plugin-filter-imports@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "babel-plugin-filter-imports@npm:4.0.0"
-  dependencies:
-    "@babel/types": ^7.7.2
-    lodash: ^4.17.15
-  checksum: 757522ac26c3f9f957a1c94c7eaca7abc2c493072b17f8af713589a2b56e1b8321d9c26ca5d0f1060e7be22f55c89a09bde771f8708f0f672d240eb2640fd9d1
-  languageName: node
-  linkType: hard
-
-"babel-plugin-htmlbars-inline-precompile@npm:^3.2.0":
-  version: 3.2.0
-  resolution: "babel-plugin-htmlbars-inline-precompile@npm:3.2.0"
-  checksum: 87793c975af74fd02cabc3a652a0694c15389bc24a1eecd4f2e78b6094be194a6d6e220f0a0489561ea123c052be86544ad96839bf7d78fb6867ffb16dc42ca0
-  languageName: node
-  linkType: hard
-
-"babel-plugin-htmlbars-inline-precompile@npm:^5.0.0, babel-plugin-htmlbars-inline-precompile@npm:^5.2.1, babel-plugin-htmlbars-inline-precompile@npm:^5.3.0":
-  version: 5.3.1
-  resolution: "babel-plugin-htmlbars-inline-precompile@npm:5.3.1"
-  dependencies:
-    babel-plugin-ember-modules-api-polyfill: ^3.5.0
-    line-column: ^1.0.2
-    magic-string: ^0.25.7
-    parse-static-imports: ^1.1.0
-    string.prototype.matchall: ^4.0.5
-  checksum: 8c486d44037b9d87628f15823d93fdf03bf532f9456bb7012de0d6e3791b5fdc61a339400a71acd517d30d57e9812fa6fea83a3185447aac16d05054bf669de0
-  languageName: node
-  linkType: hard
-
-"babel-plugin-inline-json-import@npm:^0.3.2":
-  version: 0.3.2
-  resolution: "babel-plugin-inline-json-import@npm:0.3.2"
-  dependencies:
-    decache: ^4.5.1
-  checksum: cf0cf9802a01e506e4aab44202ce01b8277da22503a2c0f4d60f3cf924f0900bb9e9b3782bffb90a8a25193af923484a5b115e68f6c94a5c5e4c9e058d868394
-  languageName: node
-  linkType: hard
-
-"babel-plugin-module-resolver@npm:^3.2.0":
-  version: 3.2.0
-  resolution: "babel-plugin-module-resolver@npm:3.2.0"
-  dependencies:
-    find-babel-config: ^1.1.0
-    glob: ^7.1.2
-    pkg-up: ^2.0.0
-    reselect: ^3.0.1
-    resolve: ^1.4.0
-  checksum: ef4f7fdb6db97b8c5d7f70b85f54876a1bead35ee360b85a4153d02ce32eba4571afcc71ae11d43b2b6d4c5eeae865fc2127012f9534cfab07f998e2692671e5
-  languageName: node
-  linkType: hard
-
-"babel-plugin-module-resolver@npm:^4.1.0":
-  version: 4.1.0
-  resolution: "babel-plugin-module-resolver@npm:4.1.0"
-  dependencies:
-    find-babel-config: ^1.2.0
-    glob: ^7.1.6
-    pkg-up: ^3.1.0
-    reselect: ^4.0.0
-    resolve: ^1.13.1
-  checksum: 3907fba21ca3c66a081e01fbd16bb09c84781749db16aa57805becc376bb5ee8dc373d4b209613e1453d30ea6c836d13073e9e7b6d239ff1806dd1763a9ab18f
-  languageName: node
-  linkType: hard
-
-"babel-plugin-polyfill-corejs2@npm:^0.2.0":
-  version: 0.2.3
-  resolution: "babel-plugin-polyfill-corejs2@npm:0.2.3"
-  dependencies:
-    "@babel/compat-data": ^7.13.11
-    "@babel/helper-define-polyfill-provider": ^0.2.4
-    semver: ^6.1.1
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: a379fdb5aa046fb96516796afb50888bd22de1590fbdaed15c613910f3208500e705dd2a605fb30c0bb8b3191ee9ba9c10b3f46121e0507bf396186941056090
-  languageName: node
-  linkType: hard
-
-"babel-plugin-polyfill-corejs2@npm:^0.3.0":
-  version: 0.3.0
-  resolution: "babel-plugin-polyfill-corejs2@npm:0.3.0"
-  dependencies:
-    "@babel/compat-data": ^7.13.11
-    "@babel/helper-define-polyfill-provider": ^0.3.0
-    semver: ^6.1.1
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: ffede597982066221291fe7c48ec1f1dda2b4ed3ee3e715436320697f35368223e1275bf095769d0b0c1115b90031dc525dd81b8ee9f6c8972cf1d2e10ad2b7d
-  languageName: node
-  linkType: hard
-
-"babel-plugin-polyfill-corejs3@npm:^0.2.0":
-  version: 0.2.5
-  resolution: "babel-plugin-polyfill-corejs3@npm:0.2.5"
-  dependencies:
-    "@babel/helper-define-polyfill-provider": ^0.2.2
-    core-js-compat: ^3.16.2
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 7d464001f6cecc6b85aef71307e3ef17980b15aae4b2ae75d38a3fc3166005f6354932f9c694566970a3fb428f8fbc44f94c46e055a5a85b7fe8820ca16f85b6
-  languageName: node
-  linkType: hard
-
-"babel-plugin-polyfill-corejs3@npm:^0.4.0":
-  version: 0.4.0
-  resolution: "babel-plugin-polyfill-corejs3@npm:0.4.0"
-  dependencies:
-    "@babel/helper-define-polyfill-provider": ^0.3.0
-    core-js-compat: ^3.18.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 18dce9a09a608b4844bce468a1d7b3abfc8a2a4c0df317ad6eb5951c0c95f3d1cc99699d8e67642cdd629f5074499d481481ae5e203ce85b8ed73e8295e25da8
-  languageName: node
-  linkType: hard
-
-"babel-plugin-polyfill-corejs3@npm:^0.5.0":
-  version: 0.5.2
-  resolution: "babel-plugin-polyfill-corejs3@npm:0.5.2"
-  dependencies:
-    "@babel/helper-define-polyfill-provider": ^0.3.1
-    core-js-compat: ^3.21.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 2f3184c73f80f00ac876a5ebcad945fd8d2ae70e5f85b7ab6cc3bc69bc74025f4f7070de7abbb2a7274c78e130bd34fc13f4c85342da28205930364a1ef0aa21
-  languageName: node
-  linkType: hard
-
-"babel-plugin-polyfill-regenerator@npm:^0.2.0":
-  version: 0.2.3
-  resolution: "babel-plugin-polyfill-regenerator@npm:0.2.3"
-  dependencies:
-    "@babel/helper-define-polyfill-provider": ^0.2.4
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 81be5914f241d785abdfa3b5fc9005792b1b675e3e0a48bbc12db25b49e965985a500fc2008c8026ec7625a757d6d43aa44a75369fece1a413bd9863369e5a9c
-  languageName: node
-  linkType: hard
-
-"babel-plugin-polyfill-regenerator@npm:^0.3.0":
-  version: 0.3.0
-  resolution: "babel-plugin-polyfill-regenerator@npm:0.3.0"
-  dependencies:
-    "@babel/helper-define-polyfill-provider": ^0.3.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: ecca4389fd557554efc6de834f84f7c85e83c348d5283de2032d35429bc7121ed6f336553d3d704021f9bef22fca339fbee560d3b0fb8bb1d4eca2fecaaeebcb
-  languageName: node
-  linkType: hard
-
-"babel-plugin-syntax-async-functions@npm:^6.8.0":
-  version: 6.13.0
-  resolution: "babel-plugin-syntax-async-functions@npm:6.13.0"
-  checksum: e982d9756869fa83eb6a4502490a90b0d31e8a41e2ee582045934f022ac8ff5fa6a3386366976fab3a391d5a7ab8ea5f9da623f35ed8ab328b8ab6d9b2feb1d3
-  languageName: node
-  linkType: hard
-
-"babel-plugin-syntax-dynamic-import@npm:^6.18.0":
-  version: 6.18.0
-  resolution: "babel-plugin-syntax-dynamic-import@npm:6.18.0"
-  checksum: 0a7a98ecb63878d65d4fd35e5435b0a7ad8e5c43b394389ce82298733c7a5d95c4373f1dd68566694214dad64abd0fec1e4eb7ee9ca7d1ee06d502e630d61600
-  languageName: node
-  linkType: hard
-
-"babel-plugin-syntax-exponentiation-operator@npm:^6.8.0":
-  version: 6.13.0
-  resolution: "babel-plugin-syntax-exponentiation-operator@npm:6.13.0"
-  checksum: cbcb3aeae7005240325f72d55c3c90575033123e8a1ddfa6bf9eac4ee7e246c2a23f5b5ab1144879590d947a3ed1d88838169d125e5d7c4f53678526482b020e
-  languageName: node
-  linkType: hard
-
-"babel-plugin-syntax-trailing-function-commas@npm:^6.22.0":
-  version: 6.22.0
-  resolution: "babel-plugin-syntax-trailing-function-commas@npm:6.22.0"
-  checksum: d8b9039ded835bb128e8e14eeeb6e0ac2a876b85250924bdc3a8dc2a6984d3bfade4de04d40fb15ea04a86d561ac280ae0d7306d7d4ef7a8c52c43b6a23909c6
-  languageName: node
-  linkType: hard
-
-"babel-plugin-transform-async-to-generator@npm:^6.22.0":
-  version: 6.24.1
-  resolution: "babel-plugin-transform-async-to-generator@npm:6.24.1"
-  dependencies:
-    babel-helper-remap-async-to-generator: ^6.24.1
-    babel-plugin-syntax-async-functions: ^6.8.0
-    babel-runtime: ^6.22.0
-  checksum: ffe8b4b2ed6db1f413ede385bd1a36f39e02a64ed79ce02779440049af75215c98f8debdc70eb01430bfd889f792682b0136576fe966f7f9e1b30e2a54695a8d
-  languageName: node
-  linkType: hard
-
-"babel-plugin-transform-es2015-arrow-functions@npm:^6.22.0":
-  version: 6.22.0
-  resolution: "babel-plugin-transform-es2015-arrow-functions@npm:6.22.0"
-  dependencies:
-    babel-runtime: ^6.22.0
-  checksum: 746e2be0fed20771c07f0984ba79ef0bab37d6e98434267ec96cef57272014fe53a180bfb9047bf69ed149d367a2c97baad54d6057531cd037684f371aab2333
-  languageName: node
-  linkType: hard
-
-"babel-plugin-transform-es2015-block-scoped-functions@npm:^6.22.0":
-  version: 6.22.0
-  resolution: "babel-plugin-transform-es2015-block-scoped-functions@npm:6.22.0"
-  dependencies:
-    babel-runtime: ^6.22.0
-  checksum: f251611f723d94b4068d2a873a2783e019bd81bd7144cfdbcfc31ef166f4d82fa2f1efba64342ba2630dab93a2b12284067725c0aa08315712419a2bc3b92a75
-  languageName: node
-  linkType: hard
-
-"babel-plugin-transform-es2015-block-scoping@npm:^6.23.0":
-  version: 6.26.0
-  resolution: "babel-plugin-transform-es2015-block-scoping@npm:6.26.0"
-  dependencies:
-    babel-runtime: ^6.26.0
-    babel-template: ^6.26.0
-    babel-traverse: ^6.26.0
-    babel-types: ^6.26.0
-    lodash: ^4.17.4
-  checksum: 5e4dee33bf4aab0ce7751a9ae845c25d3bf03944ffdfc8d784e1de2123a3eec19657dd59274c9969461757f5e2ab75c517e978bafe5309a821a41e278ad38a63
-  languageName: node
-  linkType: hard
-
-"babel-plugin-transform-es2015-classes@npm:^6.23.0":
-  version: 6.24.1
-  resolution: "babel-plugin-transform-es2015-classes@npm:6.24.1"
-  dependencies:
-    babel-helper-define-map: ^6.24.1
-    babel-helper-function-name: ^6.24.1
-    babel-helper-optimise-call-expression: ^6.24.1
-    babel-helper-replace-supers: ^6.24.1
-    babel-messages: ^6.23.0
-    babel-runtime: ^6.22.0
-    babel-template: ^6.24.1
-    babel-traverse: ^6.24.1
-    babel-types: ^6.24.1
-  checksum: 999392b47a83cf9297e49fbde00bc9b15fb6d71bc041f7b3d621ac45361486ec4b66f55c47f98dca6c398ceaa8bfc9f3c21257854822c4523e7475a92e6c000a
-  languageName: node
-  linkType: hard
-
-"babel-plugin-transform-es2015-computed-properties@npm:^6.22.0":
-  version: 6.24.1
-  resolution: "babel-plugin-transform-es2015-computed-properties@npm:6.24.1"
-  dependencies:
-    babel-runtime: ^6.22.0
-    babel-template: ^6.24.1
-  checksum: 34e466bfd4b021aa3861db66cf10a9093fa6a4fcedbc8c82a55f6ca1fcbd212a9967f2df6c5f9e9a20046fa43c8967633a476f2bbc15cb8d3769cbba948a5c16
-  languageName: node
-  linkType: hard
-
-"babel-plugin-transform-es2015-destructuring@npm:^6.23.0":
-  version: 6.23.0
-  resolution: "babel-plugin-transform-es2015-destructuring@npm:6.23.0"
-  dependencies:
-    babel-runtime: ^6.22.0
-  checksum: 1343d27f09846e6e1e48da7b83d0d4f2d5571559c468ad8ad4c3715b8ff3e21b2d553e90ad420dc6840de260b7f3b9f9c057606d527e3d838a52a3a7c5fffdbe
-  languageName: node
-  linkType: hard
-
-"babel-plugin-transform-es2015-duplicate-keys@npm:^6.22.0":
-  version: 6.24.1
-  resolution: "babel-plugin-transform-es2015-duplicate-keys@npm:6.24.1"
-  dependencies:
-    babel-runtime: ^6.22.0
-    babel-types: ^6.24.1
-  checksum: 756a7a13517c3e80c8312137b9872b9bc32fbfbb905e9f1e45bf321e2b464d0e6a6e6deca22c61b62377225bd8136b73580897cccb394995d6e00bc8ce882ba4
-  languageName: node
-  linkType: hard
-
-"babel-plugin-transform-es2015-for-of@npm:^6.23.0":
-  version: 6.23.0
-  resolution: "babel-plugin-transform-es2015-for-of@npm:6.23.0"
-  dependencies:
-    babel-runtime: ^6.22.0
-  checksum: 0124e320c32b25de84ddaba951a6f0ad031fa5019de54de32bd317d2a97b3f967026008f32e8c88728330c1cce7c4f1d0ecb15007020d50bd5ca1438a882e205
-  languageName: node
-  linkType: hard
-
-"babel-plugin-transform-es2015-function-name@npm:^6.22.0":
-  version: 6.24.1
-  resolution: "babel-plugin-transform-es2015-function-name@npm:6.24.1"
-  dependencies:
-    babel-helper-function-name: ^6.24.1
-    babel-runtime: ^6.22.0
-    babel-types: ^6.24.1
-  checksum: 629ecd824d53ec973a3ef85e74d9fd8c710203084ca2f7ac833879ddfa3b83a28f0270fe2ee5f3b8c078bb4b3e4b843173a646a7cd4abc49e8c1c563d31fb711
-  languageName: node
-  linkType: hard
-
-"babel-plugin-transform-es2015-literals@npm:^6.22.0":
-  version: 6.22.0
-  resolution: "babel-plugin-transform-es2015-literals@npm:6.22.0"
-  dependencies:
-    babel-runtime: ^6.22.0
-  checksum: 40e270580a0236990f2555f5dc7ae24b4db9f4709ca455ed1a6724b0078592482274be7448579b14122bd06481641a38e7b2e48d0b49b8c81c88e154a26865b4
-  languageName: node
-  linkType: hard
-
-"babel-plugin-transform-es2015-modules-amd@npm:^6.22.0, babel-plugin-transform-es2015-modules-amd@npm:^6.24.0, babel-plugin-transform-es2015-modules-amd@npm:^6.24.1":
-  version: 6.24.1
-  resolution: "babel-plugin-transform-es2015-modules-amd@npm:6.24.1"
-  dependencies:
-    babel-plugin-transform-es2015-modules-commonjs: ^6.24.1
-    babel-runtime: ^6.22.0
-    babel-template: ^6.24.1
-  checksum: 084c7a1ef3bd0b2b9f4851b27cfb65f8ea1408349af05b4d88f994c23844a0754abfa4799bbc5f3f0ec94232b3a54a2e46d7f1dff1bdd40fa66a46f645197dfa
-  languageName: node
-  linkType: hard
-
-"babel-plugin-transform-es2015-modules-commonjs@npm:^6.23.0, babel-plugin-transform-es2015-modules-commonjs@npm:^6.24.1":
-  version: 6.26.2
-  resolution: "babel-plugin-transform-es2015-modules-commonjs@npm:6.26.2"
-  dependencies:
-    babel-plugin-transform-strict-mode: ^6.24.1
-    babel-runtime: ^6.26.0
-    babel-template: ^6.26.0
-    babel-types: ^6.26.0
-  checksum: 9cd93a84037855c1879bcc100229bee25b44c4805a9a9f040e8927f772c4732fa17a0706c81ea0db77b357dd9baf84388eec03ceb36597932c48fe32fb3d4171
-  languageName: node
-  linkType: hard
-
-"babel-plugin-transform-es2015-modules-systemjs@npm:^6.23.0":
-  version: 6.24.1
-  resolution: "babel-plugin-transform-es2015-modules-systemjs@npm:6.24.1"
-  dependencies:
-    babel-helper-hoist-variables: ^6.24.1
-    babel-runtime: ^6.22.0
-    babel-template: ^6.24.1
-  checksum: b34877e201d7b4d293d87c04962a3575fe7727a9593e99ce3a7f8deea3da8883a08bd87a6a12927083ac26f47f6944a31cdbfe3d6eb4d18dd884cb2d304ee943
-  languageName: node
-  linkType: hard
-
-"babel-plugin-transform-es2015-modules-umd@npm:^6.23.0":
-  version: 6.24.1
-  resolution: "babel-plugin-transform-es2015-modules-umd@npm:6.24.1"
-  dependencies:
-    babel-plugin-transform-es2015-modules-amd: ^6.24.1
-    babel-runtime: ^6.22.0
-    babel-template: ^6.24.1
-  checksum: 735857b9f2ad0c41ceda31a1594fe2a063025f4428f9e243885a437b5bd415aca445a5e8495ff34b7120617735b1c3a2158033f0be23f1f5a90e655fff742a01
-  languageName: node
-  linkType: hard
-
-"babel-plugin-transform-es2015-object-super@npm:^6.22.0":
-  version: 6.24.1
-  resolution: "babel-plugin-transform-es2015-object-super@npm:6.24.1"
-  dependencies:
-    babel-helper-replace-supers: ^6.24.1
-    babel-runtime: ^6.22.0
-  checksum: 97b2968f699ac94cb55f4f1e7ea53dc9e4264ec99cab826f40f181da9f6db5980cd8b4985f05c7b6f1e19fbc31681e6e63894dfc5ecf4b3a673d736c4ef0f9db
-  languageName: node
-  linkType: hard
-
-"babel-plugin-transform-es2015-parameters@npm:^6.23.0":
-  version: 6.24.1
-  resolution: "babel-plugin-transform-es2015-parameters@npm:6.24.1"
-  dependencies:
-    babel-helper-call-delegate: ^6.24.1
-    babel-helper-get-function-arity: ^6.24.1
-    babel-runtime: ^6.22.0
-    babel-template: ^6.24.1
-    babel-traverse: ^6.24.1
-    babel-types: ^6.24.1
-  checksum: bb6c047dc10499be8ccebdffac22c77f14aee5d3106da8f2e96c801d2746403c809d8c6922e8ebd2eb31d8827b4bb2321ba43378fcdc9dca206417bb345c4f93
-  languageName: node
-  linkType: hard
-
-"babel-plugin-transform-es2015-shorthand-properties@npm:^6.22.0":
-  version: 6.24.1
-  resolution: "babel-plugin-transform-es2015-shorthand-properties@npm:6.24.1"
-  dependencies:
-    babel-runtime: ^6.22.0
-    babel-types: ^6.24.1
-  checksum: 9302c5de158a28432e932501a783560094c624c3659f4e0a472b6b2e9d6e8ab2634f82ef74d3e75363d46ccff6aad119267dbc34f67464c70625e24a651ad9e5
-  languageName: node
-  linkType: hard
-
-"babel-plugin-transform-es2015-spread@npm:^6.22.0":
-  version: 6.22.0
-  resolution: "babel-plugin-transform-es2015-spread@npm:6.22.0"
-  dependencies:
-    babel-runtime: ^6.22.0
-  checksum: 8694a8a7802d905503194ab81c155354b36d39fc819ad2148f83146518dd37d2c6926c8568712f5aa890169afc9353fd4bcc49397959c6dc9da3480b449c0ae9
-  languageName: node
-  linkType: hard
-
-"babel-plugin-transform-es2015-sticky-regex@npm:^6.22.0":
-  version: 6.24.1
-  resolution: "babel-plugin-transform-es2015-sticky-regex@npm:6.24.1"
-  dependencies:
-    babel-helper-regex: ^6.24.1
-    babel-runtime: ^6.22.0
-    babel-types: ^6.24.1
-  checksum: d9c45401caf0d74779a1170e886976d4c865b7de2e90dfffc7557481b9e73b6e37e9f1028aa07b813896c4df88f4d7e89968249a74547c7875e6c499c90c801d
-  languageName: node
-  linkType: hard
-
-"babel-plugin-transform-es2015-template-literals@npm:^6.22.0":
-  version: 6.22.0
-  resolution: "babel-plugin-transform-es2015-template-literals@npm:6.22.0"
-  dependencies:
-    babel-runtime: ^6.22.0
-  checksum: 4fad2b7b383a2e784858ee7bf837419ee8ff9602afe218e1472f8c33a0c008f01d06f23ff2f2322fb23e1ed17e37237a818575fe88ecc5417d85331973b0ea4d
-  languageName: node
-  linkType: hard
-
-"babel-plugin-transform-es2015-typeof-symbol@npm:^6.23.0":
-  version: 6.23.0
-  resolution: "babel-plugin-transform-es2015-typeof-symbol@npm:6.23.0"
-  dependencies:
-    babel-runtime: ^6.22.0
-  checksum: 68a1609c6abcddf5f138c56bafcd9fad7c6b3b404fe40910148ab70eb21d6c7807a343a64eb81ce45daf4b70c384c528c55fad45e0d581e4b09efa4d574a6a1b
-  languageName: node
-  linkType: hard
-
-"babel-plugin-transform-es2015-unicode-regex@npm:^6.22.0":
-  version: 6.24.1
-  resolution: "babel-plugin-transform-es2015-unicode-regex@npm:6.24.1"
-  dependencies:
-    babel-helper-regex: ^6.24.1
-    babel-runtime: ^6.22.0
-    regexpu-core: ^2.0.0
-  checksum: 739ddb02e5f77904f83ea45323c9a636e3aed34b2a49c7c68208b5f2834eecb6b655e772f870f16a7aaf09ac8219f754ad69d61741d088f5b681d13cda69265d
-  languageName: node
-  linkType: hard
-
-"babel-plugin-transform-exponentiation-operator@npm:^6.22.0":
-  version: 6.24.1
-  resolution: "babel-plugin-transform-exponentiation-operator@npm:6.24.1"
-  dependencies:
-    babel-helper-builder-binary-assignment-operator-visitor: ^6.24.1
-    babel-plugin-syntax-exponentiation-operator: ^6.8.0
-    babel-runtime: ^6.22.0
-  checksum: 533ad53ba2cd6ff3c0f751563e1beea429c620038dc2efeeb8348ab4752ebcc95d1521857abfd08047400f1921b2d4df5e0cd266e65ddbe4c3edc58b9ad6fd3c
-  languageName: node
-  linkType: hard
-
-"babel-plugin-transform-regenerator@npm:^6.22.0":
-  version: 6.26.0
-  resolution: "babel-plugin-transform-regenerator@npm:6.26.0"
-  dependencies:
-    regenerator-transform: ^0.10.0
-  checksum: 41a51d8f692bf4a5cbd705fa70f3cb6abebae66d9ba3dccfb5921da262f8c30f630e1fe9f7b132e29b96fe0d99385a801f6aa204278c5bd0af4284f7f93a665a
-  languageName: node
-  linkType: hard
-
-"babel-plugin-transform-strict-mode@npm:^6.24.1":
-  version: 6.24.1
-  resolution: "babel-plugin-transform-strict-mode@npm:6.24.1"
-  dependencies:
-    babel-runtime: ^6.22.0
-    babel-types: ^6.24.1
-  checksum: 32d70ce9d8c8918a6a840e46df03dfe1e265eb9b25df5a800fedb5065ef1b4b5f24d7c62d92fca0e374db8b0b9b6f84e68edd02ad21883d48f608583ec29f638
-  languageName: node
-  linkType: hard
-
-"babel-polyfill@npm:^6.26.0":
-  version: 6.26.0
-  resolution: "babel-polyfill@npm:6.26.0"
-  dependencies:
-    babel-runtime: ^6.26.0
-    core-js: ^2.5.0
-    regenerator-runtime: ^0.10.5
-  checksum: 6fb1a3c0bfe1b6fc56ce1afcf531878aa629b309277a05fbf3fe950589b24cb4052a6e487db21d318eb5336b68730a21f5ef62166b6cc8aea3406261054d1118
-  languageName: node
-  linkType: hard
-
-"babel-preset-env@npm:^1.7.0":
-  version: 1.7.0
-  resolution: "babel-preset-env@npm:1.7.0"
-  dependencies:
-    babel-plugin-check-es2015-constants: ^6.22.0
-    babel-plugin-syntax-trailing-function-commas: ^6.22.0
-    babel-plugin-transform-async-to-generator: ^6.22.0
-    babel-plugin-transform-es2015-arrow-functions: ^6.22.0
-    babel-plugin-transform-es2015-block-scoped-functions: ^6.22.0
-    babel-plugin-transform-es2015-block-scoping: ^6.23.0
-    babel-plugin-transform-es2015-classes: ^6.23.0
-    babel-plugin-transform-es2015-computed-properties: ^6.22.0
-    babel-plugin-transform-es2015-destructuring: ^6.23.0
-    babel-plugin-transform-es2015-duplicate-keys: ^6.22.0
-    babel-plugin-transform-es2015-for-of: ^6.23.0
-    babel-plugin-transform-es2015-function-name: ^6.22.0
-    babel-plugin-transform-es2015-literals: ^6.22.0
-    babel-plugin-transform-es2015-modules-amd: ^6.22.0
-    babel-plugin-transform-es2015-modules-commonjs: ^6.23.0
-    babel-plugin-transform-es2015-modules-systemjs: ^6.23.0
-    babel-plugin-transform-es2015-modules-umd: ^6.23.0
-    babel-plugin-transform-es2015-object-super: ^6.22.0
-    babel-plugin-transform-es2015-parameters: ^6.23.0
-    babel-plugin-transform-es2015-shorthand-properties: ^6.22.0
-    babel-plugin-transform-es2015-spread: ^6.22.0
-    babel-plugin-transform-es2015-sticky-regex: ^6.22.0
-    babel-plugin-transform-es2015-template-literals: ^6.22.0
-    babel-plugin-transform-es2015-typeof-symbol: ^6.23.0
-    babel-plugin-transform-es2015-unicode-regex: ^6.22.0
-    babel-plugin-transform-exponentiation-operator: ^6.22.0
-    babel-plugin-transform-regenerator: ^6.22.0
-    browserslist: ^3.2.6
-    invariant: ^2.2.2
-    semver: ^5.3.0
-  checksum: 6e459a6c76086a2a377707680148b94c3d0aba425b039b427ca01171ebada7f5db5d336b309548462f6ba015e13176a4724f912875c15084d4aa88d77020d185
-  languageName: node
-  linkType: hard
-
-"babel-register@npm:^6.26.0":
-  version: 6.26.0
-  resolution: "babel-register@npm:6.26.0"
-  dependencies:
-    babel-core: ^6.26.0
-    babel-runtime: ^6.26.0
-    core-js: ^2.5.0
-    home-or-tmp: ^2.0.0
-    lodash: ^4.17.4
-    mkdirp: ^0.5.1
-    source-map-support: ^0.4.15
-  checksum: 75d5fe060e4850dbdbd5f56db2928cd0b6b6c93a65ba5f2a991465af4dc3f4adf46d575138f228b2169b1e25e3b4a7cdd16515a355fea41b873321bf56467583
-  languageName: node
-  linkType: hard
-
-"babel-runtime@npm:^6.18.0, babel-runtime@npm:^6.22.0, babel-runtime@npm:^6.26.0":
-  version: 6.26.0
-  resolution: "babel-runtime@npm:6.26.0"
-  dependencies:
-    core-js: ^2.4.0
-    regenerator-runtime: ^0.11.0
-  checksum: 8aeade94665e67a73c1ccc10f6fd42ba0c689b980032b70929de7a6d9a12eb87ef51902733f8fefede35afea7a5c3ef7e916a64d503446c1eedc9e3284bd3d50
-  languageName: node
-  linkType: hard
-
-"babel-template@npm:^6.24.1, babel-template@npm:^6.26.0":
-  version: 6.26.0
-  resolution: "babel-template@npm:6.26.0"
-  dependencies:
-    babel-runtime: ^6.26.0
-    babel-traverse: ^6.26.0
-    babel-types: ^6.26.0
-    babylon: ^6.18.0
-    lodash: ^4.17.4
-  checksum: 028dd57380f09b5641b74874a19073c53c4fb3f1696e849575aae18f8c80eaf21db75209057db862f3b893ce2cd9b795d539efa591b58f4a0fb011df0a56fbed
-  languageName: node
-  linkType: hard
-
-"babel-traverse@npm:^6.24.1, babel-traverse@npm:^6.26.0":
-  version: 6.26.0
-  resolution: "babel-traverse@npm:6.26.0"
-  dependencies:
-    babel-code-frame: ^6.26.0
-    babel-messages: ^6.23.0
-    babel-runtime: ^6.26.0
-    babel-types: ^6.26.0
-    babylon: ^6.18.0
-    debug: ^2.6.8
-    globals: ^9.18.0
-    invariant: ^2.2.2
-    lodash: ^4.17.4
-  checksum: fca037588d2791ae0409f1b7aa56075b798699cccc53ea04d82dd1c0f97b9e7ab17065f7dd3ecd69101d7874c9c8fd5e0f88fa53abbae1fe94e37e6b81ebcb8d
-  languageName: node
-  linkType: hard
-
-"babel-types@npm:^6.19.0, babel-types@npm:^6.24.1, babel-types@npm:^6.26.0":
-  version: 6.26.0
-  resolution: "babel-types@npm:6.26.0"
-  dependencies:
-    babel-runtime: ^6.26.0
-    esutils: ^2.0.2
-    lodash: ^4.17.4
-    to-fast-properties: ^1.0.3
-  checksum: d16b0fa86e9b0e4c2623be81d0a35679faff24dd2e43cde4ca58baf49f3e39415a011a889e6c2259ff09e1228e4c3a3db6449a62de59e80152fe1ce7398fde76
-  languageName: node
-  linkType: hard
-
-"babel6-plugin-strip-class-callcheck@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "babel6-plugin-strip-class-callcheck@npm:6.0.0"
-  checksum: e765ff21f9aee4e488a270cd8515a456c0de4f56739c2c285a7d8c72712fcca10cd89d24eec47dec0ce8b77a7e27257ece2674c781169a01a90bcb18c825b369
-  languageName: node
-  linkType: hard
-
-"babylon@npm:^6.18.0":
-  version: 6.18.0
-  resolution: "babylon@npm:6.18.0"
-  bin:
-    babylon: ./bin/babylon.js
-  checksum: 0777ae0c735ce1cbfc856d627589ed9aae212b84fb0c03c368b55e6c5d3507841780052808d0ad46e18a2ba516e93d55eeed8cd967f3b2938822dfeccfb2a16d
-  languageName: node
-  linkType: hard
-
-"backbone@npm:^1.1.2":
-  version: 1.4.0
-  resolution: "backbone@npm:1.4.0"
-  dependencies:
-    underscore: ">=1.8.3"
-  checksum: 09abdf184c485a4cd2c68218298cf772fbefeaa166ef8eb795cdb0159b4ad1d2f6823dde089352eaf0be929e5bbef67c57555722f4d1886f969d954f77814870
-  languageName: node
-  linkType: hard
-
-"bail@npm:^1.0.0":
-  version: 1.0.5
-  resolution: "bail@npm:1.0.5"
-  checksum: 6c334940d7eaa4e656a12fb12407b6555649b6deb6df04270fa806e0da82684ebe4a4e47815b271c794b40f8d6fa286e0c248b14ddbabb324a917fab09b7301a
-  languageName: node
-  linkType: hard
-
-"balanced-match@npm:^1.0.0":
-  version: 1.0.2
-  resolution: "balanced-match@npm:1.0.2"
-  checksum: 9706c088a283058a8a99e0bf91b0a2f75497f185980d9ffa8b304de1d9e58ebda7c72c07ebf01dadedaac5b2907b2c6f566f660d62bd336c3468e960403b9d65
-  languageName: node
-  linkType: hard
-
-"base64-js@npm:^1.0.2, base64-js@npm:^1.3.1":
-  version: 1.5.1
-  resolution: "base64-js@npm:1.5.1"
-  checksum: 669632eb3745404c2f822a18fc3a0122d2f9a7a13f7fb8b5823ee19d1d2ff9ee5b52c53367176ea4ad093c332fd5ab4bd0ebae5a8e27917a4105a4cfc86b1005
-  languageName: node
-  linkType: hard
-
-"base64id@npm:2.0.0, base64id@npm:~2.0.0":
-  version: 2.0.0
-  resolution: "base64id@npm:2.0.0"
-  checksum: 581b1d37e6cf3738b7ccdd4d14fe2bfc5c238e696e2720ee6c44c183b838655842e22034e53ffd783f872a539915c51b0d4728a49c7cc678ac5a758e00d62168
-  languageName: node
-  linkType: hard
-
-"base@npm:^0.11.1":
-  version: 0.11.2
-  resolution: "base@npm:0.11.2"
-  dependencies:
-    cache-base: ^1.0.1
-    class-utils: ^0.3.5
-    component-emitter: ^1.2.1
-    define-property: ^1.0.0
-    isobject: ^3.0.1
-    mixin-deep: ^1.2.0
-    pascalcase: ^0.1.1
-  checksum: a4a146b912e27eea8f66d09cb0c9eab666f32ce27859a7dfd50f38cd069a2557b39f16dba1bc2aecb3b44bf096738dd207b7970d99b0318423285ab1b1994edd
-  languageName: node
-  linkType: hard
-
-"basic-auth@npm:~2.0.1":
-  version: 2.0.1
-  resolution: "basic-auth@npm:2.0.1"
-  dependencies:
-    safe-buffer: 5.1.2
-  checksum: 3419b805d5dfc518f3a05dcf42aa53aa9ce820e50b6df5097f9e186322e1bc733c36722b624802cd37e791035aa73b828ed814d8362333d42d7f5cd04d7a5e48
-  languageName: node
-  linkType: hard
-
-"bcrypt-pbkdf@npm:^1.0.0":
-  version: 1.0.2
-  resolution: "bcrypt-pbkdf@npm:1.0.2"
-  dependencies:
-    tweetnacl: ^0.14.3
-  checksum: 4edfc9fe7d07019609ccf797a2af28351736e9d012c8402a07120c4453a3b789a15f2ee1530dc49eee8f7eb9379331a8dd4b3766042b9e502f74a68e7f662291
-  languageName: node
-  linkType: hard
-
-"big.js@npm:^5.2.2":
-  version: 5.2.2
-  resolution: "big.js@npm:5.2.2"
-  checksum: b89b6e8419b097a8fb4ed2399a1931a68c612bce3cfd5ca8c214b2d017531191070f990598de2fc6f3f993d91c0f08aa82697717f6b3b8732c9731866d233c9e
-  languageName: node
-  linkType: hard
-
-"binary-extensions@npm:^1.0.0":
-  version: 1.13.1
-  resolution: "binary-extensions@npm:1.13.1"
-  checksum: ad7747f33c07e94ba443055de130b50c8b8b130a358bca064c580d91769ca6a69c7ac65ca008ff044ed4541d2c6ad45496e1fadbef5218a68770996b6a2194d7
-  languageName: node
-  linkType: hard
-
-"binary-extensions@npm:^2.0.0":
-  version: 2.2.0
-  resolution: "binary-extensions@npm:2.2.0"
-  checksum: ccd267956c58d2315f5d3ea6757cf09863c5fc703e50fbeb13a7dc849b812ef76e3cf9ca8f35a0c48498776a7478d7b4a0418e1e2b8cb9cb9731f2922aaad7f8
-  languageName: node
-  linkType: hard
-
-"binaryextensions@npm:1 || 2, binaryextensions@npm:^2.1.2":
-  version: 2.3.0
-  resolution: "binaryextensions@npm:2.3.0"
-  checksum: e64e4658a611a753e0320b047a0045a063c6f2dd92d7a7fc06c25f7e72fb3700dabcf328e319c79f1038e6d0ea46edb0644686603d5f36bff3350d0e7eb198a9
-  languageName: node
-  linkType: hard
-
-"bindings@npm:^1.5.0":
-  version: 1.5.0
-  resolution: "bindings@npm:1.5.0"
-  dependencies:
-    file-uri-to-path: 1.0.0
-  checksum: 65b6b48095717c2e6105a021a7da4ea435aa8d3d3cd085cb9e85bcb6e5773cf318c4745c3f7c504412855940b585bdf9b918236612a1c7a7942491de176f1ae7
-  languageName: node
-  linkType: hard
-
-"bl@npm:^4.1.0":
-  version: 4.1.0
-  resolution: "bl@npm:4.1.0"
-  dependencies:
-    buffer: ^5.5.0
-    inherits: ^2.0.4
-    readable-stream: ^3.4.0
-  checksum: 9e8521fa7e83aa9427c6f8ccdcba6e8167ef30cc9a22df26effcc5ab682ef91d2cbc23a239f945d099289e4bbcfae7a192e9c28c84c6202e710a0dfec3722662
-  languageName: node
-  linkType: hard
-
-"blank-object@npm:^1.0.1":
-  version: 1.0.2
-  resolution: "blank-object@npm:1.0.2"
-  checksum: 0d9aff57f4438c3dce6513ac77874fb74f3419e3e8384d4a520b9a3e9cfc8bee6be0f39f77c079da4e6e3fd8e347c125fb618816e730c34804c3092e5c3c5404
-  languageName: node
-  linkType: hard
-
-"bluebird@npm:^3.4.6, bluebird@npm:^3.5.5, bluebird@npm:^3.7.2":
-  version: 3.7.2
-  resolution: "bluebird@npm:3.7.2"
-  checksum: 869417503c722e7dc54ca46715f70e15f4d9c602a423a02c825570862d12935be59ed9c7ba34a9b31f186c017c23cac6b54e35446f8353059c101da73eac22ef
-  languageName: node
-  linkType: hard
-
-"bn.js@npm:^4.0.0, bn.js@npm:^4.1.0, bn.js@npm:^4.11.9":
-  version: 4.12.0
-  resolution: "bn.js@npm:4.12.0"
-  checksum: 39afb4f15f4ea537b55eaf1446c896af28ac948fdcf47171961475724d1bb65118cca49fa6e3d67706e4790955ec0e74de584e45c8f1ef89f46c812bee5b5a12
-  languageName: node
-  linkType: hard
-
-"bn.js@npm:^5.0.0, bn.js@npm:^5.1.1":
-  version: 5.2.0
-  resolution: "bn.js@npm:5.2.0"
-  checksum: 6117170393200f68b35a061ecbf55d01dd989302e7b3c798a3012354fa638d124f0b2f79e63f77be5556be80322a09c40339eda6413ba7468524c0b6d4b4cb7a
-  languageName: node
-  linkType: hard
-
-"body-parser@npm:1.19.0, body-parser@npm:^1.17.0":
-  version: 1.19.0
-  resolution: "body-parser@npm:1.19.0"
-  dependencies:
-    bytes: 3.1.0
-    content-type: ~1.0.4
-    debug: 2.6.9
-    depd: ~1.1.2
-    http-errors: 1.7.2
-    iconv-lite: 0.4.24
-    on-finished: ~2.3.0
-    qs: 6.7.0
-    raw-body: 2.4.0
-    type-is: ~1.6.17
-  checksum: 490231b4c89bbd43112762f7ba8e5342c174a6c9f64284a3b0fcabf63277e332f8316765596f1e5b15e4f3a6cf0422e005f4bb3149ed3a224bb025b7a36b9ac1
-  languageName: node
-  linkType: hard
-
-"body-parser@npm:1.20.0":
-  version: 1.20.0
-  resolution: "body-parser@npm:1.20.0"
-  dependencies:
-    bytes: 3.1.2
-    content-type: ~1.0.4
-    debug: 2.6.9
-    depd: 2.0.0
-    destroy: 1.2.0
-    http-errors: 2.0.0
-    iconv-lite: 0.4.24
-    on-finished: 2.4.1
-    qs: 6.10.3
-    raw-body: 2.5.1
-    type-is: ~1.6.18
-    unpipe: 1.0.0
-  checksum: 12fffdeac82fe20dddcab7074215d5156e7d02a69ae90cbe9fee1ca3efa2f28ef52097cbea76685ee0a1509c71d85abd0056a08e612c09077cad6277a644cf88
-  languageName: node
-  linkType: hard
-
-"body@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "body@npm:5.1.0"
-  dependencies:
-    continuable-cache: ^0.3.1
-    error: ^7.0.0
-    raw-body: ~1.1.0
-    safe-json-parse: ~1.0.1
-  checksum: 58a5a46b6de80c82ee2f6e00bdc0084be1697d50e47cfa0d53ff6daf70b0e5ec20359c134d41710d0fa8046ecd67e06128c134c821f090e40a31ed452a9b6b7f
-  languageName: node
-  linkType: hard
-
-"boolbase@npm:^1.0.0, boolbase@npm:~1.0.0":
-  version: 1.0.0
-  resolution: "boolbase@npm:1.0.0"
-  checksum: 3e25c80ef626c3a3487c73dbfc70ac322ec830666c9ad915d11b701142fab25ec1e63eff2c450c74347acfd2de854ccde865cd79ef4db1683f7c7b046ea43bb0
-  languageName: node
-  linkType: hard
-
-"boolify@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "boolify@npm:1.0.1"
-  checksum: 972bde1e4a35fad8fc18761a7fcef7358008e125ba9daee9bc5dc8f49cba3c635ea70b2f8c3b5bfd3167865e6c0662d6c338767de981a44f3e604df86f47fcc5
-  languageName: node
-  linkType: hard
-
-"bower-config@npm:^1.4.3":
-  version: 1.4.3
-  resolution: "bower-config@npm:1.4.3"
-  dependencies:
-    graceful-fs: ^4.1.3
-    minimist: ^0.2.1
-    mout: ^1.0.0
-    osenv: ^0.1.3
-    untildify: ^2.1.0
-    wordwrap: ^0.0.3
-  checksum: 195d829d32b99a6c88d58f0e77b3aad2d32c5ecb913e6a078be5a540f0fc3d34888c8c2e3d7cf268e389711a7b231ef4397ac3cd02053fdd115db58a5c8b19a3
-  languageName: node
-  linkType: hard
-
-"bower-endpoint-parser@npm:0.2.2":
-  version: 0.2.2
-  resolution: "bower-endpoint-parser@npm:0.2.2"
-  checksum: e5752ae90a7950da4aa32448105fd50e050cf47042f89db79bbaf64e0cf4342b39dae450353848ea8a766c969e7b760afb4de85d2e808eedd7d1340b4251cda0
-  languageName: node
-  linkType: hard
-
-"brace-expansion@npm:^1.1.7":
-  version: 1.1.11
-  resolution: "brace-expansion@npm:1.1.11"
-  dependencies:
-    balanced-match: ^1.0.0
-    concat-map: 0.0.1
-  checksum: faf34a7bb0c3fcf4b59c7808bc5d2a96a40988addf2e7e09dfbb67a2251800e0d14cd2bfc1aa79174f2f5095c54ff27f46fb1289fe2d77dac755b5eb3434cc07
-  languageName: node
-  linkType: hard
-
-"braces@npm:^2.3.1, braces@npm:^2.3.2":
-  version: 2.3.2
-  resolution: "braces@npm:2.3.2"
-  dependencies:
-    arr-flatten: ^1.1.0
-    array-unique: ^0.3.2
-    extend-shallow: ^2.0.1
-    fill-range: ^4.0.0
-    isobject: ^3.0.1
-    repeat-element: ^1.1.2
-    snapdragon: ^0.8.1
-    snapdragon-node: ^2.0.1
-    split-string: ^3.0.2
-    to-regex: ^3.0.1
-  checksum: e30dcb6aaf4a31c8df17d848aa283a65699782f75ad61ae93ec25c9729c66cf58e66f0000a9fec84e4add1135bb7da40f7cb9601b36bebcfa9ca58e8d5c07de0
-  languageName: node
-  linkType: hard
-
-"braces@npm:^3.0.1, braces@npm:^3.0.2, braces@npm:~3.0.2":
-  version: 3.0.2
-  resolution: "braces@npm:3.0.2"
-  dependencies:
-    fill-range: ^7.0.1
-  checksum: e2a8e769a863f3d4ee887b5fe21f63193a891c68b612ddb4b68d82d1b5f3ff9073af066c343e9867a393fe4c2555dcb33e89b937195feb9c1613d259edfcd459
-  languageName: node
-  linkType: hard
-
-"broccoli-amd-funnel@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "broccoli-amd-funnel@npm:2.0.1"
-  dependencies:
-    broccoli-plugin: ^1.3.0
-    symlink-or-copy: ^1.2.0
-  checksum: 1f9327d1291fbdd00366da710091fc3c4d1c3f5a5c697cc2eb9e1f29d8b906ba9eb93ab612c9c1367b91d64b9a2f7a446cfa8a1e6faf4ce05315ff0f2ebdadf6
-  languageName: node
-  linkType: hard
-
-"broccoli-asset-rev@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "broccoli-asset-rev@npm:3.0.0"
-  dependencies:
-    broccoli-asset-rewrite: ^2.0.0
-    broccoli-filter: ^1.2.2
-    broccoli-persistent-filter: ^1.4.3
-    json-stable-stringify: ^1.0.0
-    minimatch: ^3.0.4
-    rsvp: ^3.0.6
-  checksum: 92822588babb5d82d3a09ce6e3646f59400566138c3a3824c93cdff568cbf74a318900a41be64bb39b322ec8442099ccc11932f335e877637823c1bf0a6de0d6
-  languageName: node
-  linkType: hard
-
-"broccoli-asset-rewrite@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "broccoli-asset-rewrite@npm:2.0.0"
-  dependencies:
-    broccoli-filter: ^1.2.3
-  checksum: 05a8d882ca6e3f2fd073650acb65e0f2c0945529c09a47b1b220455a0a67099e0d5bed7a0c52b7aaee40ad5f07f8e6db20b641aceb5330256b801fe1b8e39952
-  languageName: node
-  linkType: hard
-
-"broccoli-autoprefixer@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "broccoli-autoprefixer@npm:5.0.0"
-  dependencies:
-    autoprefixer: ^7.0.0
-    broccoli-persistent-filter: ^1.1.6
-    postcss: ^6.0.1
-  checksum: 468df300b679e2afa3d14091f42313300424218d74911dba8dd61a16ce4b0888c76c517ac524f043c01304b3bb78d6e87927e931c96446f9921e4504f5361654
-  languageName: node
-  linkType: hard
-
-"broccoli-babel-transpiler@npm:^6.5.0":
-  version: 6.5.1
-  resolution: "broccoli-babel-transpiler@npm:6.5.1"
-  dependencies:
-    babel-core: ^6.26.0
-    broccoli-funnel: ^2.0.1
-    broccoli-merge-trees: ^2.0.0
-    broccoli-persistent-filter: ^1.4.3
-    clone: ^2.0.0
-    hash-for-dep: ^1.2.3
-    heimdalljs-logger: ^0.1.7
-    json-stable-stringify: ^1.0.0
-    rsvp: ^4.8.2
-    workerpool: ^2.3.0
-  checksum: 2e5273f2026dc27ca8ab984c49c00b967aa94f491b7e5059fc249e4c624a4901fd26c19c56f889b61eee1f2c1cb101944b2fd48e00156e503c7a3495cc7e270a
-  languageName: node
-  linkType: hard
-
-"broccoli-babel-transpiler@npm:^7.2.0, broccoli-babel-transpiler@npm:^7.8.0":
-  version: 7.8.0
-  resolution: "broccoli-babel-transpiler@npm:7.8.0"
-  dependencies:
-    "@babel/core": ^7.12.0
-    "@babel/polyfill": ^7.11.5
-    broccoli-funnel: ^2.0.2
-    broccoli-merge-trees: ^3.0.2
-    broccoli-persistent-filter: ^2.2.1
-    clone: ^2.1.2
-    hash-for-dep: ^1.4.7
-    heimdalljs: ^0.2.1
-    heimdalljs-logger: ^0.1.9
-    json-stable-stringify: ^1.0.1
-    rsvp: ^4.8.4
-    workerpool: ^3.1.1
-  checksum: 07fd89cc58bab2d6dd435b04b047d2bb843298761068cf7ae768819d1c8d8d4ac26746b0eb40e99ebceec6dfd1af97a25a7f1b00bd05136fa963b9c04033ca52
-  languageName: node
-  linkType: hard
-
-"broccoli-builder@npm:^0.18.14":
-  version: 0.18.14
-  resolution: "broccoli-builder@npm:0.18.14"
-  dependencies:
-    broccoli-node-info: ^1.1.0
-    heimdalljs: ^0.2.0
-    promise-map-series: ^0.2.1
-    quick-temp: ^0.1.2
-    rimraf: ^2.2.8
-    rsvp: ^3.0.17
-    silent-error: ^1.0.1
-  checksum: 06721fdc65f97ec331126d3fca329ac287c879cffd748b4c536acca16376995d3200d26af22b9a4fef464476202f83bb3a9dbdcdec8939914600ee1e8760f995
-  languageName: node
-  linkType: hard
-
-"broccoli-caching-writer@npm:^2.2.0":
-  version: 2.3.1
-  resolution: "broccoli-caching-writer@npm:2.3.1"
-  dependencies:
-    broccoli-kitchen-sink-helpers: ^0.2.5
-    broccoli-plugin: 1.1.0
-    debug: ^2.1.1
-    rimraf: ^2.2.8
-    rsvp: ^3.0.17
-    walk-sync: ^0.2.5
-  checksum: 3ee20d818f1a833c41499fd2d7abc09c75951a4ea7522d6ec1cd853351a03a5cfd283e50efd068705104e3825401165dff3438fa723e5b6760072a280c42fa61
-  languageName: node
-  linkType: hard
-
-"broccoli-caching-writer@npm:^3.0.3":
-  version: 3.0.3
-  resolution: "broccoli-caching-writer@npm:3.0.3"
-  dependencies:
-    broccoli-kitchen-sink-helpers: ^0.3.1
-    broccoli-plugin: ^1.2.1
-    debug: ^2.1.1
-    rimraf: ^2.2.8
-    rsvp: ^3.0.17
-    walk-sync: ^0.3.0
-  checksum: 30b002bb2050b0f51ece58e088b26212784779205184021acf5fc807e2619820daa95b56a390da10de3b49defa76f525f095b980c009fb4c7cb30d3d18875117
-  languageName: node
-  linkType: hard
-
-"broccoli-clean-css@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "broccoli-clean-css@npm:1.1.0"
-  dependencies:
-    broccoli-persistent-filter: ^1.1.6
-    clean-css-promise: ^0.1.0
-    inline-source-map-comment: ^1.0.5
-    json-stable-stringify: ^1.0.0
-  checksum: 7b1739c9e12ccbf9e86b0f98be97b2c2f0ef8ac831e87f7e478ca4dc8fce3e93db4e625ad53ddb48bab4efbe8d0d2304ee77bdd015aab84d71250d9fb8ff44c7
-  languageName: node
-  linkType: hard
-
-"broccoli-concat@npm:^4.2.5":
-  version: 4.2.5
-  resolution: "broccoli-concat@npm:4.2.5"
-  dependencies:
-    broccoli-debug: ^0.6.5
-    broccoli-kitchen-sink-helpers: ^0.3.1
-    broccoli-plugin: ^4.0.2
-    ensure-posix-path: ^1.0.2
-    fast-sourcemap-concat: ^2.1.0
-    find-index: ^1.1.0
-    fs-extra: ^8.1.0
-    fs-tree-diff: ^2.0.1
-    lodash.merge: ^4.6.2
-    lodash.omit: ^4.1.0
-    lodash.uniq: ^4.2.0
-  checksum: a8eb7394863d7ba3dd9b8011ef37ef746182bea42c50c61bc5cf25767bcd0edec1dac9c37dcf8ba34d24568fdc3e69ce88b414316eedbbecf9deae13f349cc7e
-  languageName: node
-  linkType: hard
-
-"broccoli-config-loader@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "broccoli-config-loader@npm:1.0.1"
-  dependencies:
-    broccoli-caching-writer: ^3.0.3
-  checksum: 92543dee0b8e3da15533262190a34287c53dad913190d14306d706ef8f2594106c240fe2c4eff026af0730e79dd77990271bf74cfd37051040b7dc177cea49e4
-  languageName: node
-  linkType: hard
-
-"broccoli-config-replace@npm:^1.1.2":
-  version: 1.1.2
-  resolution: "broccoli-config-replace@npm:1.1.2"
-  dependencies:
-    broccoli-kitchen-sink-helpers: ^0.3.1
-    broccoli-plugin: ^1.2.0
-    debug: ^2.2.0
-    fs-extra: ^0.24.0
-  checksum: 578471fb135e00d914334eaa8e1305ba2183f6be26833eff941c3c30bd002d157054a45ed16afb96784c25aa2a3f5bad73cd9c21a005acb61be7a960739b3725
-  languageName: node
-  linkType: hard
-
-"broccoli-debug@npm:^0.6.4, broccoli-debug@npm:^0.6.5":
-  version: 0.6.5
-  resolution: "broccoli-debug@npm:0.6.5"
-  dependencies:
-    broccoli-plugin: ^1.2.1
-    fs-tree-diff: ^0.5.2
-    heimdalljs: ^0.2.1
-    heimdalljs-logger: ^0.1.7
-    symlink-or-copy: ^1.1.8
-    tree-sync: ^1.2.2
-  checksum: 03cd34dea7cc6c1cb4d2b0aa564449e44bf4a0a874dc8ca28ffc22bc7ab062ccbe8bb08a7d4e44639f532f392d4a56913a372e75f1bde7763b20898da852aeba
-  languageName: node
-  linkType: hard
-
-"broccoli-dependency-funnel@npm:^2.1.2":
-  version: 2.1.2
-  resolution: "broccoli-dependency-funnel@npm:2.1.2"
-  dependencies:
-    broccoli-plugin: ^1.3.1
-    fs-tree-diff: ^0.5.9
-    heimdalljs: ^0.2.5
-    heimdalljs-logger: ^0.1.9
-    mkdirp: ^0.5.1
-    mr-dep-walk: ^1.4.0
-    path-posix: ^1.0.0
-    rimraf: ^2.6.2
-    symlink-or-copy: ^1.2.0
-  checksum: b62bdd3d8c422082d05408742be796b64d1dfcff8f8952d4a2289a95d03b2850f64d157bcb40150ae865a9850d457e0a7209b0875962f09410a28582fe242bda
-  languageName: node
-  linkType: hard
-
-"broccoli-file-creator@npm:^1.1.1":
-  version: 1.2.0
-  resolution: "broccoli-file-creator@npm:1.2.0"
-  dependencies:
-    broccoli-plugin: ^1.1.0
-    mkdirp: ^0.5.1
-  checksum: 591be2b9a9e2aadd0f5c07fb85a2125eebf29a50ca8dbed4c67f8b75d7e5a296f7740f41e1a441d3861bb2b298a76201995ca2df59c34e1c641521e4f3555d50
-  languageName: node
-  linkType: hard
-
-"broccoli-file-creator@npm:^2.1.1":
-  version: 2.1.1
-  resolution: "broccoli-file-creator@npm:2.1.1"
-  dependencies:
-    broccoli-plugin: ^1.1.0
-    mkdirp: ^0.5.1
-  checksum: aab1bd06e55f805e3c52235a7294a8f008255d178ef236e2966c59f943090a55bca44e9d26fcf176f4e0f94033af5c1fd038a85c6950bf36ff41a0c0787fe938
-  languageName: node
-  linkType: hard
-
-"broccoli-filter@npm:^1.2.2, broccoli-filter@npm:^1.2.3":
-  version: 1.3.0
-  resolution: "broccoli-filter@npm:1.3.0"
-  dependencies:
-    broccoli-kitchen-sink-helpers: ^0.3.1
-    broccoli-plugin: ^1.0.0
-    copy-dereference: ^1.0.0
-    debug: ^2.2.0
-    mkdirp: ^0.5.1
-    promise-map-series: ^0.2.1
-    rsvp: ^3.0.18
-    symlink-or-copy: ^1.0.1
-    walk-sync: ^0.3.1
-  checksum: 4908af4844c166adfd61def33c21a152870e7cc319fa16d50caa906ad68c46e5abbc6fb9c3373e3b7bc494473d4972461ef0a0fa0d2ae82c0f0d44ec0fe3cfc5
-  languageName: node
-  linkType: hard
-
-"broccoli-funnel-reducer@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "broccoli-funnel-reducer@npm:1.0.0"
-  checksum: 3a924dc63136168325ea202d05139ad238290eff649cb6a2570f3faeccbbf0d904792525100fc41da34a1fd0946d951bdb247ecd1e4d7d99f29f82583b94ce7b
-  languageName: node
-  linkType: hard
-
-"broccoli-funnel@npm:2.0.1":
-  version: 2.0.1
-  resolution: "broccoli-funnel@npm:2.0.1"
-  dependencies:
-    array-equal: ^1.0.0
-    blank-object: ^1.0.1
-    broccoli-plugin: ^1.3.0
-    debug: ^2.2.0
-    fast-ordered-set: ^1.0.0
-    fs-tree-diff: ^0.5.3
-    heimdalljs: ^0.2.0
-    minimatch: ^3.0.0
-    mkdirp: ^0.5.0
-    path-posix: ^1.0.0
-    rimraf: ^2.4.3
-    symlink-or-copy: ^1.0.0
-    walk-sync: ^0.3.1
-  checksum: 415257006360c6015835a513c7946f1bc356ea5ed6bd960382bad1f511d81758539690ccbd7cecdc740b7e91f1719088b5bb8f5c024ca4dda089efec229ce0b7
-  languageName: node
-  linkType: hard
-
-"broccoli-funnel@npm:^1.0.1, broccoli-funnel@npm:^1.1.0":
-  version: 1.2.0
-  resolution: "broccoli-funnel@npm:1.2.0"
-  dependencies:
-    array-equal: ^1.0.0
-    blank-object: ^1.0.1
-    broccoli-plugin: ^1.3.0
-    debug: ^2.2.0
-    exists-sync: 0.0.4
-    fast-ordered-set: ^1.0.0
-    fs-tree-diff: ^0.5.3
-    heimdalljs: ^0.2.0
-    minimatch: ^3.0.0
-    mkdirp: ^0.5.0
-    path-posix: ^1.0.0
-    rimraf: ^2.4.3
-    symlink-or-copy: ^1.0.0
-    walk-sync: ^0.3.1
-  checksum: dacd261a6ddbdd9ffa3bc6d6dd7653eace0896e1b7e281ed9cead4c5b5a4e04b0f1be5b9b09ccd576288d3a15a2dbace1920c7de17a9bba9e5564f7580f8f19a
-  languageName: node
-  linkType: hard
-
-"broccoli-funnel@npm:^2.0.0, broccoli-funnel@npm:^2.0.1, broccoli-funnel@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "broccoli-funnel@npm:2.0.2"
-  dependencies:
-    array-equal: ^1.0.0
-    blank-object: ^1.0.1
-    broccoli-plugin: ^1.3.0
-    debug: ^2.2.0
-    fast-ordered-set: ^1.0.0
-    fs-tree-diff: ^0.5.3
-    heimdalljs: ^0.2.0
-    minimatch: ^3.0.0
-    mkdirp: ^0.5.0
-    path-posix: ^1.0.0
-    rimraf: ^2.4.3
-    symlink-or-copy: ^1.0.0
-    walk-sync: ^0.3.1
-  checksum: e039c07f7a69d538a2a60e66167ccff8e00e14f053e6e0e5ce6d446c5a6d351e55cc9be57aad1a9e9d684b444bea81cd2eade387c5764fa9355b9f30fcc4bd48
-  languageName: node
-  linkType: hard
-
-"broccoli-funnel@npm:^3.0.3, broccoli-funnel@npm:^3.0.5, broccoli-funnel@npm:^3.0.8":
-  version: 3.0.8
-  resolution: "broccoli-funnel@npm:3.0.8"
-  dependencies:
-    array-equal: ^1.0.0
-    broccoli-plugin: ^4.0.7
-    debug: ^4.1.1
-    fs-tree-diff: ^2.0.1
-    heimdalljs: ^0.2.0
-    minimatch: ^3.0.0
-    walk-sync: ^2.0.2
-  checksum: 125b0bda1bf63779528f97d153cab2c2d47d3783e26037d0f1acaf9f528a04397f2538d66662efaedd4627bfbae7713a2f8248017c81d518319b3c8cbe3b31d9
-  languageName: node
-  linkType: hard
-
-"broccoli-kitchen-sink-helpers@npm:^0.2.5":
-  version: 0.2.9
-  resolution: "broccoli-kitchen-sink-helpers@npm:0.2.9"
-  dependencies:
-    glob: ^5.0.10
-    mkdirp: ^0.5.1
-  checksum: cf67d77f4ee028c90c4917626eda636b736a3fdd11f84ba2c9b00708222c8878909c1b30d824b4b9d946c6c975b6e3bd08cc218ed3cfbe6f9436808e9023a941
-  languageName: node
-  linkType: hard
-
-"broccoli-kitchen-sink-helpers@npm:^0.3.1":
-  version: 0.3.1
-  resolution: "broccoli-kitchen-sink-helpers@npm:0.3.1"
-  dependencies:
-    glob: ^5.0.10
-    mkdirp: ^0.5.1
-  checksum: c3af1f4a902ab69fa6e576430c2829cceaa2c34e6f6ff68eb5f6305c10835123b4644bfcb036452c7222d6853c720bf83ec1e5e125db7915d849c7968d0e652e
-  languageName: node
-  linkType: hard
-
-"broccoli-merge-trees@npm:^1.1.1":
-  version: 1.2.4
-  resolution: "broccoli-merge-trees@npm:1.2.4"
-  dependencies:
-    broccoli-plugin: ^1.3.0
-    can-symlink: ^1.0.0
-    fast-ordered-set: ^1.0.2
-    fs-tree-diff: ^0.5.4
-    heimdalljs: ^0.2.1
-    heimdalljs-logger: ^0.1.7
-    rimraf: ^2.4.3
-    symlink-or-copy: ^1.0.0
-  checksum: 7d5ae0c12582bcca4c6a697bd768b45f38b19d3b89f580ded973bf1c4ee2d581c2a50d1914eeab96d2c3502ccb792eb806298ce99bf0bcd9bf98f87c916390a5
-  languageName: node
-  linkType: hard
-
-"broccoli-merge-trees@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "broccoli-merge-trees@npm:2.0.1"
-  dependencies:
-    broccoli-plugin: ^1.3.0
-    merge-trees: ^1.0.1
-  checksum: cf58d11761a3a362d80634e0f3b1b5fdb87572c9e54740fbc24803d79b44f2246b12b76aecb2f783d92c0cef55f7a3b7eb5314bc463fd94cb6d29f1b370a4289
-  languageName: node
-  linkType: hard
-
-"broccoli-merge-trees@npm:^3.0.0, broccoli-merge-trees@npm:^3.0.1, broccoli-merge-trees@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "broccoli-merge-trees@npm:3.0.2"
-  dependencies:
-    broccoli-plugin: ^1.3.0
-    merge-trees: ^2.0.0
-  checksum: 4239955a72f9e9547d3b8af27784e7b4931d88bc83c80b48eaae5819a839e3ab3973ccd459502459fcbc9b69749bbc89e9f06e0025fe5483b1704c6dbe0dd61c
-  languageName: node
-  linkType: hard
-
-"broccoli-merge-trees@npm:^4.2.0":
-  version: 4.2.0
-  resolution: "broccoli-merge-trees@npm:4.2.0"
-  dependencies:
-    broccoli-plugin: ^4.0.2
-    merge-trees: ^2.0.0
-  checksum: 8e5371bf41d8b95dd3d600a35d159e185fe0ce0a558cb7b35cdfbb0e3cf2941ee92745dafa7452be0034929459c84acdb55bf762d8c2ca5e59fd124fb219e559
-  languageName: node
-  linkType: hard
-
-"broccoli-middleware@npm:^2.1.1":
-  version: 2.1.1
-  resolution: "broccoli-middleware@npm:2.1.1"
-  dependencies:
-    ansi-html: ^0.0.7
-    handlebars: ^4.0.4
-    has-ansi: ^3.0.0
-    mime-types: ^2.1.18
-  checksum: d32e8d871869737d554bb0913491f2cf80b975eac43f7c1cde1334468d4610830b6a4f2d75a310b3d113d0e513e3b8b966b5d58789a9d396b52a40d279587a1f
-  languageName: node
-  linkType: hard
-
-"broccoli-node-api@npm:^1.6.0, broccoli-node-api@npm:^1.7.0":
-  version: 1.7.0
-  resolution: "broccoli-node-api@npm:1.7.0"
-  checksum: 37b83c81549294d0c843bb4c07ef5330a5493f5e8204e4f7eda716c4f5175f5ccf0f10f0957a18321324b5ff3d4fe2a2cd6cd8e598d6f9e7986c45b8dd200b99
-  languageName: node
-  linkType: hard
-
-"broccoli-node-info@npm:1.1.0, broccoli-node-info@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "broccoli-node-info@npm:1.1.0"
-  checksum: f3e552f3e2ba05d9bb73f5d9ba0e27961851744e3a1a70de3f712598746e6214a7b8b8a7ceafc8235f81973a2e9dca58e022a9f150b4c5963aed5bf90d496b96
-  languageName: node
-  linkType: hard
-
-"broccoli-node-info@npm:^2.1.0":
-  version: 2.2.0
-  resolution: "broccoli-node-info@npm:2.2.0"
-  checksum: e5d68ebb35aa4406dc7dd9e90f15f68fb58c2026696bda2a67045f993261e856fbfec35b3d424c835af7873bd7de00f15630a5b2626c8c0929365035ade9cddd
-  languageName: node
-  linkType: hard
-
-"broccoli-output-wrapper@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "broccoli-output-wrapper@npm:2.0.0"
-  dependencies:
-    heimdalljs-logger: ^0.1.10
-  checksum: 9e2abb307e7d852827548fecfb2b5daa6efea70bcc23d39f1ad51494477a38d8049a3592f7a0e18aa20cb9bcad7b49389ec5052f3a368cbcdb94a4dbe0650381
-  languageName: node
-  linkType: hard
-
-"broccoli-output-wrapper@npm:^3.2.5":
-  version: 3.2.5
-  resolution: "broccoli-output-wrapper@npm:3.2.5"
-  dependencies:
-    fs-extra: ^8.1.0
-    heimdalljs-logger: ^0.1.10
-    symlink-or-copy: ^1.2.0
-  checksum: c23d875544bfdd4cf0767fb9080a6a16bf938497a1a6601fe9ea2e0e5cce26f1a4f4ab81f80e50376b0d86b622cef848d0ffba3f5fa4f2e3c4b531539383eddb
-  languageName: node
-  linkType: hard
-
-"broccoli-persistent-filter@npm:^1.1.5, broccoli-persistent-filter@npm:^1.1.6, broccoli-persistent-filter@npm:^1.4.3":
-  version: 1.4.6
-  resolution: "broccoli-persistent-filter@npm:1.4.6"
-  dependencies:
-    async-disk-cache: ^1.2.1
-    async-promise-queue: ^1.0.3
-    broccoli-plugin: ^1.0.0
-    fs-tree-diff: ^0.5.2
-    hash-for-dep: ^1.0.2
-    heimdalljs: ^0.2.1
-    heimdalljs-logger: ^0.1.7
-    mkdirp: ^0.5.1
-    promise-map-series: ^0.2.1
-    rimraf: ^2.6.1
-    rsvp: ^3.0.18
-    symlink-or-copy: ^1.0.1
-    walk-sync: ^0.3.1
-  checksum: 42adb04ba99ccbd943299d37d40fc87f5c9629ec98d0774c43695590ec7ad9392ba6c5bef5e089e1bc208d49de820d13aa46dc0d80d71444f00f9b0df9811df9
-  languageName: node
-  linkType: hard
-
-"broccoli-persistent-filter@npm:^2.2.1, broccoli-persistent-filter@npm:^2.3.0, broccoli-persistent-filter@npm:^2.3.1":
-  version: 2.3.1
-  resolution: "broccoli-persistent-filter@npm:2.3.1"
-  dependencies:
-    async-disk-cache: ^1.2.1
-    async-promise-queue: ^1.0.3
-    broccoli-plugin: ^1.0.0
-    fs-tree-diff: ^2.0.0
-    hash-for-dep: ^1.5.0
-    heimdalljs: ^0.2.1
-    heimdalljs-logger: ^0.1.7
-    mkdirp: ^0.5.1
-    promise-map-series: ^0.2.1
-    rimraf: ^2.6.1
-    rsvp: ^4.7.0
-    symlink-or-copy: ^1.0.1
-    sync-disk-cache: ^1.3.3
-    walk-sync: ^1.0.0
-  checksum: 35228d15267f6b08e7e572698c6ef2fc4623701f97604a6bce4826c0dbc3074e743cf583f56d014051d64d3cf72f26dd29f26f9ff8e79f907d762fad9481da36
-  languageName: node
-  linkType: hard
-
-"broccoli-persistent-filter@npm:^3.1.2":
-  version: 3.1.2
-  resolution: "broccoli-persistent-filter@npm:3.1.2"
-  dependencies:
-    async-disk-cache: ^2.0.0
-    async-promise-queue: ^1.0.3
-    broccoli-plugin: ^4.0.3
-    fs-tree-diff: ^2.0.0
-    hash-for-dep: ^1.5.0
-    heimdalljs: ^0.2.1
-    heimdalljs-logger: ^0.1.7
-    promise-map-series: ^0.2.1
-    rimraf: ^3.0.0
-    symlink-or-copy: ^1.0.1
-    sync-disk-cache: ^2.0.0
-  checksum: 15adca88e26cd8a105c786dc7d2ba57c2c98d4a43079c94753826c000c879fad627ec280e57f7d890be8583ea66967579db4c9e19ef73ccb2ef887a09e36fb85
-  languageName: node
-  linkType: hard
-
-"broccoli-plugin@npm:*, broccoli-plugin@npm:^4.0.1, broccoli-plugin@npm:^4.0.2, broccoli-plugin@npm:^4.0.3, broccoli-plugin@npm:^4.0.5, broccoli-plugin@npm:^4.0.7":
-  version: 4.0.7
-  resolution: "broccoli-plugin@npm:4.0.7"
-  dependencies:
-    broccoli-node-api: ^1.7.0
-    broccoli-output-wrapper: ^3.2.5
-    fs-merger: ^3.2.1
-    promise-map-series: ^0.3.0
-    quick-temp: ^0.1.8
-    rimraf: ^3.0.2
-    symlink-or-copy: ^1.3.1
-  checksum: 49d6a55ebfe1880e73956dc8bf23104ad81c1272d4a06755823e6e1eec5255583d2913de99427b3e0a620e3b56178fdd8ea03c832b7452f0440c166044aa555c
-  languageName: node
-  linkType: hard
-
-"broccoli-plugin@npm:1.1.0":
-  version: 1.1.0
-  resolution: "broccoli-plugin@npm:1.1.0"
-  dependencies:
-    promise-map-series: ^0.2.1
-    quick-temp: ^0.1.3
-    rimraf: ^2.3.4
-    symlink-or-copy: ^1.0.1
-  checksum: 3f660605a82e9661378d64cfaa079ef549e3c389e12ce8114329e0c5268e68e07c8e3c9fe1c7762c30cfd639aa7c5f484c8e134ddffb49f0b04113818a06a5d8
-  languageName: node
-  linkType: hard
-
-"broccoli-plugin@npm:^1.0.0, broccoli-plugin@npm:^1.1.0, broccoli-plugin@npm:^1.2.0, broccoli-plugin@npm:^1.2.1, broccoli-plugin@npm:^1.3.0, broccoli-plugin@npm:^1.3.1":
-  version: 1.3.1
-  resolution: "broccoli-plugin@npm:1.3.1"
-  dependencies:
-    promise-map-series: ^0.2.1
-    quick-temp: ^0.1.3
-    rimraf: ^2.3.4
-    symlink-or-copy: ^1.1.8
-  checksum: 53ddfa2f419feb1b30e2b16d29d7b0877ac56ec97a16b07075ce6ec065d4382e20e94ce992a836942f24aee12a1fbff4f93f711d470e5614a786b4b29d0e215d
-  languageName: node
-  linkType: hard
-
-"broccoli-plugin@npm:^2.0.0, broccoli-plugin@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "broccoli-plugin@npm:2.1.0"
-  dependencies:
-    promise-map-series: ^0.2.1
-    quick-temp: ^0.1.3
-    rimraf: ^2.3.4
-    symlink-or-copy: ^1.1.8
-  checksum: c5481d7d3a0d2f481bdaa7d18cbf7f88edc40ae363eb28c97856955991f0c44671433bb925f841efcce7e32a5eebc26c48f8ca361e8ce2725aae2bc86ba5b948
-  languageName: node
-  linkType: hard
-
-"broccoli-plugin@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "broccoli-plugin@npm:3.1.0"
-  dependencies:
-    broccoli-node-api: ^1.6.0
-    broccoli-output-wrapper: ^2.0.0
-    fs-merger: ^3.0.1
-    promise-map-series: ^0.2.1
-    quick-temp: ^0.1.3
-    rimraf: ^2.3.4
-    symlink-or-copy: ^1.1.8
-  checksum: 6ae0eecb8f894de66445a8d7000a5f7fc6f0c07250ee788706ef7a6f9846c10e473be120999353b0ed89a0e60f96332586da01f40325d5df7d79e02a9f01d154
-  languageName: node
-  linkType: hard
-
-"broccoli-plugin@npm:^4.0.0":
-  version: 4.0.5
-  resolution: "broccoli-plugin@npm:4.0.5"
-  dependencies:
-    broccoli-node-api: ^1.7.0
-    broccoli-output-wrapper: ^3.2.5
-    fs-merger: ^3.1.0
-    promise-map-series: ^0.3.0
-    quick-temp: ^0.1.8
-    rimraf: ^3.0.2
-    symlink-or-copy: ^1.3.1
-  checksum: 1e459b3f03929fc9515f905d2bc033ac23ab869d837fa4ca68fc47062aea61fb3c11f2e3604ad1c4bef38b22cb1e0c4d5d0d88715ae1cdc7f064f30fc11093c9
-  languageName: node
-  linkType: hard
-
-"broccoli-rollup@npm:4.0.0":
-  version: 4.0.0
-  resolution: "broccoli-rollup@npm:4.0.0"
-  dependencies:
-    "@types/node": "*"
-    broccoli-plugin: ^2.0.0
-    fs-tree-diff: ^2.0.1
-    heimdalljs: ^0.2.6
-    heimdalljs-logger: ^0.1.10
-    magic-string: ^0.25.2
-    node-modules-path: ^1.0.1
-    rollup: ^1.12.0
-    symlink-or-copy: ^1.2.0
-    walk-sync: ^1.1.3
-  checksum: 89ac42aaf952674b0b81500551b4eccd96a51a1485d9b0cb89c690cc8cfbda9b82860147e810ec3012fceaf79af12cdf35e08c57ee1bac69d805072fdd87220d
-  languageName: node
-  linkType: hard
-
-"broccoli-rollup@npm:^2.1.1":
-  version: 2.1.1
-  resolution: "broccoli-rollup@npm:2.1.1"
-  dependencies:
-    "@types/node": ^9.6.0
-    amd-name-resolver: ^1.2.0
-    broccoli-plugin: ^1.2.1
-    fs-tree-diff: ^0.5.2
-    heimdalljs: ^0.2.1
-    heimdalljs-logger: ^0.1.7
-    magic-string: ^0.24.0
-    node-modules-path: ^1.0.1
-    rollup: ^0.57.1
-    symlink-or-copy: ^1.1.8
-    walk-sync: ^0.3.1
-  checksum: 6ddce6266854494da4875f6a1bd274c690b14fd7a82b47735118daaf5081304ef79fb781270ed6c09f312896c872fdbdf5619a77d50eb769bf977745242284d2
-  languageName: node
-  linkType: hard
-
-"broccoli-rollup@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "broccoli-rollup@npm:5.0.0"
-  dependencies:
-    "@types/broccoli-plugin": ^3.0.0
-    broccoli-plugin: ^4.0.7
-    fs-tree-diff: ^2.0.1
-    heimdalljs: ^0.2.6
-    node-modules-path: ^1.0.1
-    rollup: ^2.50.0
-    rollup-pluginutils: ^2.8.1
-    symlink-or-copy: ^1.2.0
-    walk-sync: ^2.2.0
-  checksum: 752725e1b78b8dc6b228b0156b44e293feb948c00bf3b505254ba1f9a706a14334727eb1505c8e01ee22500387cc3059f8cb0ecf7857935346768bdcf1939b1e
-  languageName: node
-  linkType: hard
-
-"broccoli-sass-source-maps@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "broccoli-sass-source-maps@npm:4.0.0"
-  dependencies:
-    broccoli-caching-writer: ^3.0.3
-    include-path-searcher: ^0.1.0
-    mkdirp: ^0.3.5
-    object-assign: ^2.0.0
-    rsvp: ^3.0.6
-  checksum: a90b04901782d4a903b491b0eb0660d6dde7ce6d39479675e61a7a98ec93172d3bc6960b21f3540d41209fe8eeddd25c52fc1bae5012c22bdcfaf54097131c0a
-  languageName: node
-  linkType: hard
-
-"broccoli-slow-trees@npm:^3.0.1, broccoli-slow-trees@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "broccoli-slow-trees@npm:3.1.0"
-  dependencies:
-    heimdalljs: ^0.2.1
-  checksum: 13c03939279e547484ee404a01a2f026eb518ddfdf7bc5376b5b7fa1c22be6fea2a1bb5aaa4d1d7bbc4fc0d3cab1083ae419d230bde90553e424957197cf9296
-  languageName: node
-  linkType: hard
-
-"broccoli-source@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "broccoli-source@npm:1.1.0"
-  checksum: 6c9421e44033df4ebd5ad7a3329599e40377f1b36629637d904ca7593ab721c99e6e4cc46b774bf4c2c6b24bcec0a0a3b327c7af42e768c1855378589ac3d796
-  languageName: node
-  linkType: hard
-
-"broccoli-source@npm:^2.1.2":
-  version: 2.1.2
-  resolution: "broccoli-source@npm:2.1.2"
-  checksum: b8dfacce8a442a7a6af6f127663830387c88e4584be02854815959422598610557d3d8fc1f01c93f3f1b0afa7ffd8f151fead4377fb3e711adecd0d0c0e39e67
-  languageName: node
-  linkType: hard
-
-"broccoli-source@npm:^3.0.0, broccoli-source@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "broccoli-source@npm:3.0.1"
-  dependencies:
-    broccoli-node-api: ^1.6.0
-  checksum: e47d16d269b616f12d525629d85e71e2d91b2daaf2e59a367c81f8db8cc324d7c9259de43dfa5130358ba6333fd0b620016895947dbc969c92d2ea94c2b755ea
-  languageName: node
-  linkType: hard
-
-"broccoli-sri-hash@meirish/broccoli-sri-hash#rooturl, broccoli-sri-hash@npm:^2.1.0":
-  version: 2.1.2
-  resolution: "broccoli-sri-hash@https://github.com/meirish/broccoli-sri-hash.git#commit=5ebad6f345c38d45461676c7a298a0b61be4a39d"
-  dependencies:
-    broccoli-caching-writer: ^2.2.0
-    mkdirp: ^0.5.1
-    rsvp: ^3.1.0
-    sri-toolbox: ^0.2.0
-    symlink-or-copy: ^1.0.1
-  checksum: bcf5fc1096d4c3c862bfc2ec3248edd5ee3bb13edcdc07a5f357587a9ea4ff48d8b97b73f11da3794a122ef1a0c1e2ef1181e59c03a955f9f24dfeb9adecef7e
-  languageName: node
-  linkType: hard
-
-"broccoli-stew@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "broccoli-stew@npm:3.0.0"
-  dependencies:
-    broccoli-debug: ^0.6.5
-    broccoli-funnel: ^2.0.0
-    broccoli-merge-trees: ^3.0.1
-    broccoli-persistent-filter: ^2.3.0
-    broccoli-plugin: ^2.1.0
-    chalk: ^2.4.1
-    debug: ^4.1.1
-    ensure-posix-path: ^1.0.1
-    fs-extra: ^8.0.1
-    minimatch: ^3.0.4
-    resolve: ^1.11.1
-    rsvp: ^4.8.5
-    symlink-or-copy: ^1.2.0
-    walk-sync: ^1.1.3
-  checksum: c5fc1f024d0ccc9a31b4fd9a70e34c0320b487ec86cfeaf66b6d7a06936b352fd65be59dccc200b9ffc17e528e6f9a5b2525b59169d17cd3e36daf8ce5f1deed
-  languageName: node
-  linkType: hard
-
-"broccoli-string-replace@npm:^0.1.2":
-  version: 0.1.2
-  resolution: "broccoli-string-replace@npm:0.1.2"
-  dependencies:
-    broccoli-persistent-filter: ^1.1.5
-    minimatch: ^3.0.3
-  checksum: 853c89a2e764d4577a5f28b71a63cf47f23c226d57a7521b07617758d5d69bdf4d8667a46abeceee53b39bbcfd1f61edf365e678665577d3d0b08b25fceceaf1
-  languageName: node
-  linkType: hard
-
-"broccoli-svg-optimizer@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "broccoli-svg-optimizer@npm:2.1.0"
-  dependencies:
-    broccoli-persistent-filter: ^3.1.2
-    safe-stable-stringify: ^2.2.0
-    svgo: 1.3.0
-  checksum: a39f487a5eb5b3af2bed055d0da494f1cdc5670e20892901b702e7bbe60407f76e96f2ebd3c73bf1effb4d8411097628552ce628dc5c529a9660898811cf4d74
-  languageName: node
-  linkType: hard
-
-"broccoli-templater@npm:^2.0.1":
-  version: 2.0.2
-  resolution: "broccoli-templater@npm:2.0.2"
-  dependencies:
-    broccoli-plugin: ^1.3.1
-    fs-tree-diff: ^0.5.9
-    lodash.template: ^4.4.0
-    rimraf: ^2.6.2
-    walk-sync: ^0.3.3
-  checksum: 802e1e357dc4522b5f157dff2ab3b9b132b07639fffd3249f2ad22792f1eb225e86b7624c3a45af5b1063628049d16a53d6bf37358fe4c4b54bad6a776b503c3
-  languageName: node
-  linkType: hard
-
-"broccoli-terser-sourcemap@npm:^4.1.0":
-  version: 4.1.0
-  resolution: "broccoli-terser-sourcemap@npm:4.1.0"
-  dependencies:
-    async-promise-queue: ^1.0.5
-    broccoli-plugin: ^4.0.3
-    debug: ^4.1.0
-    lodash.defaultsdeep: ^4.6.1
-    matcher-collection: ^2.0.1
-    source-map-url: ^0.4.0
-    symlink-or-copy: ^1.3.1
-    terser: ^5.3.0
-    walk-sync: ^2.2.0
-    workerpool: ^6.0.0
-  checksum: 5251dd242487d92164f0453e618d67e92700892b282c99e6b7944295edce338b005edcb46e8da4e95d8d5771637c1e289c5c22abb979c2460bc4f9a1179944fe
-  languageName: node
-  linkType: hard
-
-"broccoli-test-helper@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "broccoli-test-helper@npm:2.0.0"
-  dependencies:
-    "@types/tmp": ^0.0.33
-    broccoli: ^2.0.0
-    fixturify: ^0.3.2
-    fs-tree-diff: ^0.5.9
-    tmp: ^0.0.33
-    walk-sync: ^0.3.3
-  checksum: 1f3806c458f653b09936e901405b1393497f6112c0a1b5e8d150c810edfc75a8aa46ba463ec68a70033d225e497b1dbfe8f4b26d948276c9a1f12304fea99571
-  languageName: node
-  linkType: hard
-
-"broccoli-uglify-sourcemap@npm:^3.2.0":
-  version: 3.2.0
-  resolution: "broccoli-uglify-sourcemap@npm:3.2.0"
-  dependencies:
-    async-promise-queue: ^1.0.5
-    broccoli-plugin: ^1.2.1
-    debug: ^4.1.0
-    lodash.defaultsdeep: ^4.6.1
-    matcher-collection: ^2.0.0
-    mkdirp: ^0.5.0
-    source-map-url: ^0.4.0
-    symlink-or-copy: ^1.0.1
-    terser: ^4.3.9
-    walk-sync: ^1.1.3
-    workerpool: ^5.0.1
-  checksum: be2c06a4ee14a78c8fbb0afea00ede69c63933b34d38c855454e27b344fa02b03888cb5e2a15ddd344d3dec420145cfec94ddab3d4a3c957d6f67e5ebee8577d
-  languageName: node
-  linkType: hard
-
-"broccoli@npm:^2.0.0":
-  version: 2.3.0
-  resolution: "broccoli@npm:2.3.0"
-  dependencies:
-    broccoli-node-info: 1.1.0
-    broccoli-slow-trees: ^3.0.1
-    broccoli-source: ^1.1.0
-    commander: ^2.15.1
-    connect: ^3.6.6
-    esm: ^3.2.4
-    findup-sync: ^2.0.0
-    handlebars: ^4.0.11
-    heimdalljs: ^0.2.6
-    heimdalljs-logger: ^0.1.9
-    mime-types: ^2.1.19
-    promise.prototype.finally: ^3.1.0
-    resolve-path: ^1.4.0
-    rimraf: ^2.6.2
-    sane: ^4.0.0
-    tmp: 0.0.33
-    tree-sync: ^1.2.2
-    underscore.string: ^3.2.2
-    watch-detector: ^0.1.0
-  checksum: 34117904ae15bacd9780960b972f3549bad821aca9dc649cbc8e98bf3a89073d55c39f24d27a00303ce0be0e834315113667d7e117315a473b2fee4449b35634
-  languageName: node
-  linkType: hard
-
-"broccoli@npm:^3.5.2":
-  version: 3.5.2
-  resolution: "broccoli@npm:3.5.2"
-  dependencies:
-    "@types/chai": ^4.2.9
-    "@types/chai-as-promised": ^7.1.2
-    "@types/express": ^4.17.2
-    ansi-html: ^0.0.7
-    broccoli-node-info: ^2.1.0
-    broccoli-slow-trees: ^3.0.1
-    broccoli-source: ^3.0.0
-    commander: ^4.1.1
-    connect: ^3.6.6
-    console-ui: ^3.0.4
-    esm: ^3.2.4
-    findup-sync: ^4.0.0
-    handlebars: ^4.7.3
-    heimdalljs: ^0.2.6
-    heimdalljs-logger: ^0.1.9
-    https: ^1.0.0
-    mime-types: ^2.1.26
-    resolve-path: ^1.4.0
-    rimraf: ^3.0.2
-    sane: ^4.0.0
-    tmp: ^0.0.33
-    tree-sync: ^2.0.0
-    underscore.string: ^3.2.2
-    watch-detector: ^1.0.0
-  checksum: 765fa5c409d0d14a7429472989f311b51c46fb15b0fa0a8eb8b9be8cb3b957bf253172d61fd3c202597db573d40f8b5c7557e8416a93b6c99ce0b46962d46ccd
-  languageName: node
-  linkType: hard
-
-"brorand@npm:^1.0.1, brorand@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "brorand@npm:1.1.0"
-  checksum: 8a05c9f3c4b46572dec6ef71012b1946db6cae8c7bb60ccd4b7dd5a84655db49fe043ecc6272e7ef1f69dc53d6730b9e2a3a03a8310509a3d797a618cbee52be
-  languageName: node
-  linkType: hard
-
-"browser-process-hrtime@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "browser-process-hrtime@npm:1.0.0"
-  checksum: e30f868cdb770b1201afb714ad1575dd86366b6e861900884665fb627109b3cc757c40067d3bfee1ff2a29c835257ea30725a8018a9afd02ac1c24b408b1e45f
-  languageName: node
-  linkType: hard
-
-"browserify-aes@npm:^1.0.0, browserify-aes@npm:^1.0.4":
-  version: 1.2.0
-  resolution: "browserify-aes@npm:1.2.0"
-  dependencies:
-    buffer-xor: ^1.0.3
-    cipher-base: ^1.0.0
-    create-hash: ^1.1.0
-    evp_bytestokey: ^1.0.3
-    inherits: ^2.0.1
-    safe-buffer: ^5.0.1
-  checksum: 4a17c3eb55a2aa61c934c286f34921933086bf6d67f02d4adb09fcc6f2fc93977b47d9d884c25619144fccd47b3b3a399e1ad8b3ff5a346be47270114bcf7104
-  languageName: node
-  linkType: hard
-
-"browserify-cipher@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "browserify-cipher@npm:1.0.1"
-  dependencies:
-    browserify-aes: ^1.0.4
-    browserify-des: ^1.0.0
-    evp_bytestokey: ^1.0.0
-  checksum: 2d8500acf1ee535e6bebe808f7a20e4c3a9e2ed1a6885fff1facbfd201ac013ef030422bec65ca9ece8ffe82b03ca580421463f9c45af6c8415fd629f4118c13
-  languageName: node
-  linkType: hard
-
-"browserify-des@npm:^1.0.0":
-  version: 1.0.2
-  resolution: "browserify-des@npm:1.0.2"
-  dependencies:
-    cipher-base: ^1.0.1
-    des.js: ^1.0.0
-    inherits: ^2.0.1
-    safe-buffer: ^5.1.2
-  checksum: b15a3e358a1d78a3b62ddc06c845d02afde6fc826dab23f1b9c016e643e7b1fda41de628d2110b712f6a44fb10cbc1800bc6872a03ddd363fb50768e010395b7
-  languageName: node
-  linkType: hard
-
-"browserify-rsa@npm:^4.0.0, browserify-rsa@npm:^4.0.1":
-  version: 4.1.0
-  resolution: "browserify-rsa@npm:4.1.0"
-  dependencies:
-    bn.js: ^5.0.0
-    randombytes: ^2.0.1
-  checksum: 155f0c135873efc85620571a33d884aa8810e40176125ad424ec9d85016ff105a07f6231650914a760cca66f29af0494087947b7be34880dd4599a0cd3c38e54
-  languageName: node
-  linkType: hard
-
-"browserify-sign@npm:^4.0.0":
-  version: 4.2.1
-  resolution: "browserify-sign@npm:4.2.1"
-  dependencies:
-    bn.js: ^5.1.1
-    browserify-rsa: ^4.0.1
-    create-hash: ^1.2.0
-    create-hmac: ^1.1.7
-    elliptic: ^6.5.3
-    inherits: ^2.0.4
-    parse-asn1: ^5.1.5
-    readable-stream: ^3.6.0
-    safe-buffer: ^5.2.0
-  checksum: 0221f190e3f5b2d40183fa51621be7e838d9caa329fe1ba773406b7637855f37b30f5d83e52ff8f244ed12ffe6278dd9983638609ed88c841ce547e603855707
-  languageName: node
-  linkType: hard
-
-"browserify-zlib@npm:^0.2.0":
-  version: 0.2.0
-  resolution: "browserify-zlib@npm:0.2.0"
-  dependencies:
-    pako: ~1.0.5
-  checksum: 5cd9d6a665190fedb4a97dfbad8dabc8698d8a507298a03f42c734e96d58ca35d3c7d4085e283440bbca1cd1938cff85031728079bedb3345310c58ab1ec92d6
-  languageName: node
-  linkType: hard
-
-"browserslist@npm:^2.11.3":
-  version: 2.11.3
-  resolution: "browserslist@npm:2.11.3"
-  dependencies:
-    caniuse-lite: ^1.0.30000792
-    electron-to-chromium: ^1.3.30
-  bin:
-    browserslist: ./cli.js
-  checksum: 2ff908162669461e881bad516885b703fd594a0b7a139bf150c1952a74fe4ed8668ac46367a0d136d39a717de65e51c867316951e9fe0f92664c65b205eb9d93
-  languageName: node
-  linkType: hard
-
-"browserslist@npm:^3.2.6":
-  version: 3.2.8
-  resolution: "browserslist@npm:3.2.8"
-  dependencies:
-    caniuse-lite: ^1.0.30000844
-    electron-to-chromium: ^1.3.47
-  bin:
-    browserslist: ./cli.js
-  checksum: 74d9ab1089a3813f54a7c4f9f6612faa6256799c8e42c7e00e4aae626c17f199049a01707a525a05b1673cd1493936583e51aad295e25249166e7e8fbd0273ba
-  languageName: node
-  linkType: hard
-
-"browserslist@npm:^4.0.0":
-  version: 4.16.6
-  resolution: "browserslist@npm:4.16.6"
-  dependencies:
-    caniuse-lite: ^1.0.30001219
-    colorette: ^1.2.2
-    electron-to-chromium: ^1.3.723
-    escalade: ^3.1.1
-    node-releases: ^1.1.71
-  bin:
-    browserslist: cli.js
-  checksum: 3dffc86892d2dcfcfc66b52519b7e5698ae070b4fc92ab047e760efc4cae0474e9e70bbe10d769c8d3491b655ef3a2a885b88e7196c83cc5dc0a46dfdba8b70c
-  languageName: node
-  linkType: hard
-
-"browserslist@npm:^4.14.5, browserslist@npm:^4.16.8, browserslist@npm:^4.20.2, browserslist@npm:^4.20.3":
-  version: 4.20.4
-  resolution: "browserslist@npm:4.20.4"
-  dependencies:
-    caniuse-lite: ^1.0.30001349
-    electron-to-chromium: ^1.4.147
-    escalade: ^3.1.1
-    node-releases: ^2.0.5
-    picocolors: ^1.0.0
-  bin:
-    browserslist: cli.js
-  checksum: 0e56c42da765524e5c31bc9a1f08afaa8d5dba085071137cf21e56dc78d0cf0283764143df4c7d1c0cd18c3187fc9494e1d93fa0255004f0be493251a28635f9
-  languageName: node
-  linkType: hard
-
-"browserslist@npm:^4.17.3":
-  version: 4.17.3
-  resolution: "browserslist@npm:4.17.3"
-  dependencies:
-    caniuse-lite: ^1.0.30001264
-    electron-to-chromium: ^1.3.857
-    escalade: ^3.1.1
-    node-releases: ^1.1.77
-    picocolors: ^0.2.1
-  bin:
-    browserslist: cli.js
-  checksum: 9295bdff6e054fdbb131275f88d282dddda7e8d54ddc1571b24374d6ba85e6d1f7cb72280543ea44a9726bb5076ded644d943b38cdc5610249699254ca951f46
-  languageName: node
-  linkType: hard
-
-"browserslist@npm:^4.17.5, browserslist@npm:^4.17.6, browserslist@npm:^4.18.1":
-  version: 4.18.1
-  resolution: "browserslist@npm:4.18.1"
-  dependencies:
-    caniuse-lite: ^1.0.30001280
-    electron-to-chromium: ^1.3.896
-    escalade: ^3.1.1
-    node-releases: ^2.0.1
-    picocolors: ^1.0.0
-  bin:
-    browserslist: cli.js
-  checksum: ae58322deef15960fc2e601d71bc081b571cfab6705999a3d24db5325b9cfadf5f676615f4460207a93e600549c33d60d37b4502007fe9e737b3cc19e20575d5
-  languageName: node
-  linkType: hard
-
-"browserslist@npm:^4.19.1":
-  version: 4.20.2
-  resolution: "browserslist@npm:4.20.2"
-  dependencies:
-    caniuse-lite: ^1.0.30001317
-    electron-to-chromium: ^1.4.84
-    escalade: ^3.1.1
-    node-releases: ^2.0.2
-    picocolors: ^1.0.0
-  bin:
-    browserslist: cli.js
-  checksum: 18e09beeae32e69fea45fc3642240fb63027b1460d90e24da86377177dca3d82c80f8fa44469d95109e3962f08eb2a23e03037bd5e1f1ec38e4866e2a8572435
-  languageName: node
-  linkType: hard
-
-"bser@npm:2.1.1":
-  version: 2.1.1
-  resolution: "bser@npm:2.1.1"
-  dependencies:
-    node-int64: ^0.4.0
-  checksum: 9ba4dc58ce86300c862bffc3ae91f00b2a03b01ee07f3564beeeaf82aa243b8b03ba53f123b0b842c190d4399b94697970c8e7cf7b1ea44b61aa28c3526a4449
-  languageName: node
-  linkType: hard
-
-"buffer-from@npm:^1.0.0":
-  version: 1.1.1
-  resolution: "buffer-from@npm:1.1.1"
-  checksum: ccc53b69736008bff764497367c4d24879ba7122bc619ee499ff47eef3a5b885ca496e87272e7ebffa0bec3804c83f84041c616f6e3318f40624e27c1d80f045
-  languageName: node
-  linkType: hard
-
-"buffer-xor@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "buffer-xor@npm:1.0.3"
-  checksum: 10c520df29d62fa6e785e2800e586a20fc4f6dfad84bcdbd12e1e8a83856de1cb75c7ebd7abe6d036bbfab738a6cf18a3ae9c8e5a2e2eb3167ca7399ce65373a
-  languageName: node
-  linkType: hard
-
-"buffer@npm:^4.3.0":
-  version: 4.9.2
-  resolution: "buffer@npm:4.9.2"
-  dependencies:
-    base64-js: ^1.0.2
-    ieee754: ^1.1.4
-    isarray: ^1.0.0
-  checksum: 8801bc1ba08539f3be70eee307a8b9db3d40f6afbfd3cf623ab7ef41dffff1d0a31de0addbe1e66e0ca5f7193eeb667bfb1ecad3647f8f1b0750de07c13295c3
-  languageName: node
-  linkType: hard
-
-"buffer@npm:^5.5.0":
-  version: 5.7.1
-  resolution: "buffer@npm:5.7.1"
-  dependencies:
-    base64-js: ^1.3.1
-    ieee754: ^1.1.13
-  checksum: e2cf8429e1c4c7b8cbd30834ac09bd61da46ce35f5c22a78e6c2f04497d6d25541b16881e30a019c6fd3154150650ccee27a308eff3e26229d788bbdeb08ab84
-  languageName: node
-  linkType: hard
-
-"builtin-status-codes@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "builtin-status-codes@npm:3.0.0"
-  checksum: 1119429cf4b0d57bf76b248ad6f529167d343156ebbcc4d4e4ad600484f6bc63002595cbb61b67ad03ce55cd1d3c4711c03bbf198bf24653b8392420482f3773
-  languageName: node
-  linkType: hard
-
-"builtins@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "builtins@npm:1.0.3"
-  checksum: 47ce94f7eee0e644969da1f1a28e5f29bd2e48b25b2bbb61164c345881086e29464ccb1fb88dbc155ea26e8b1f5fc8a923b26c8c1ed0935b67b644d410674513
-  languageName: node
-  linkType: hard
-
-"bytes@npm:1":
-  version: 1.0.0
-  resolution: "bytes@npm:1.0.0"
-  checksum: 6e475440d7e32971611d2bc592695fee484ee91ca1cd49f99c855560131f71670d3d185210f6cdd1704f12281f0cfcee5cb1c1f6788cb2f676b410464b7d6885
-  languageName: node
-  linkType: hard
-
-"bytes@npm:3.0.0":
-  version: 3.0.0
-  resolution: "bytes@npm:3.0.0"
-  checksum: a2b386dd8188849a5325f58eef69c3b73c51801c08ffc6963eddc9be244089ba32d19347caf6d145c86f315ae1b1fc7061a32b0c1aa6379e6a719090287ed101
-  languageName: node
-  linkType: hard
-
-"bytes@npm:3.1.0":
-  version: 3.1.0
-  resolution: "bytes@npm:3.1.0"
-  checksum: 7c3b21c5d9d44ed455460d5d36a31abc6fa2ce3807964ba60a4b03fd44454c8cf07bb0585af83bfde1c5cc2ea4bbe5897bc3d18cd15e0acf25a3615a35aba2df
-  languageName: node
-  linkType: hard
-
-"bytes@npm:3.1.2":
-  version: 3.1.2
-  resolution: "bytes@npm:3.1.2"
-  checksum: e4bcd3948d289c5127591fbedf10c0b639ccbf00243504e4e127374a15c3bc8eed0d28d4aaab08ff6f1cf2abc0cce6ba3085ed32f4f90e82a5683ce0014e1b6e
-  languageName: node
-  linkType: hard
-
-"bytestreamjs@npm:^1.0.29":
-  version: 1.0.29
-  resolution: "bytestreamjs@npm:1.0.29"
-  checksum: 0fd5e74ad0c6694e53f5fcf303f2124c128e4f837249e4361be8c3e022208558a27c353b03b3157a9d1ff15455e09041faa1134e03bcc914bbe6816eafc0362b
-  languageName: node
-  linkType: hard
-
-"cacache@npm:^12.0.2":
-  version: 12.0.4
-  resolution: "cacache@npm:12.0.4"
-  dependencies:
-    bluebird: ^3.5.5
-    chownr: ^1.1.1
-    figgy-pudding: ^3.5.1
-    glob: ^7.1.4
-    graceful-fs: ^4.1.15
-    infer-owner: ^1.0.3
-    lru-cache: ^5.1.1
-    mississippi: ^3.0.0
-    mkdirp: ^0.5.1
-    move-concurrently: ^1.0.1
-    promise-inflight: ^1.0.1
-    rimraf: ^2.6.3
-    ssri: ^6.0.1
-    unique-filename: ^1.1.1
-    y18n: ^4.0.0
-  checksum: c88a72f36939b2523533946ffb27828443db5bf5995d761b35ae17af1eb6c8e20ac55b00b74c2ca900b2e1e917f0afba6847bf8cc16bee05ccca6aa150e0830c
-  languageName: node
-  linkType: hard
-
-"cacache@npm:^16.1.0":
-  version: 16.1.3
-  resolution: "cacache@npm:16.1.3"
-  dependencies:
-    "@npmcli/fs": ^2.1.0
-    "@npmcli/move-file": ^2.0.0
-    chownr: ^2.0.0
-    fs-minipass: ^2.1.0
-    glob: ^8.0.1
-    infer-owner: ^1.0.4
-    lru-cache: ^7.7.1
-    minipass: ^3.1.6
-    minipass-collect: ^1.0.2
-    minipass-flush: ^1.0.5
-    minipass-pipeline: ^1.2.4
-    mkdirp: ^1.0.4
-    p-map: ^4.0.0
-    promise-inflight: ^1.0.1
-    rimraf: ^3.0.2
-    ssri: ^9.0.0
-    tar: ^6.1.11
-    unique-filename: ^2.0.0
-  checksum: d91409e6e57d7d9a3a25e5dcc589c84e75b178ae8ea7de05cbf6b783f77a5fae938f6e8fda6f5257ed70000be27a681e1e44829251bfffe4c10216002f8f14e6
-  languageName: node
-  linkType: hard
-
-"cache-base@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "cache-base@npm:1.0.1"
-  dependencies:
-    collection-visit: ^1.0.0
-    component-emitter: ^1.2.1
-    get-value: ^2.0.6
-    has-value: ^1.0.0
-    isobject: ^3.0.1
-    set-value: ^2.0.0
-    to-object-path: ^0.3.0
-    union-value: ^1.0.0
-    unset-value: ^1.0.0
-  checksum: 9114b8654fe2366eedc390bad0bcf534e2f01b239a888894e2928cb58cdc1e6ea23a73c6f3450dcfd2058aa73a8a981e723cd1e7c670c047bf11afdc65880107
-  languageName: node
-  linkType: hard
-
-"calculate-cache-key-for-tree@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "calculate-cache-key-for-tree@npm:2.0.0"
-  dependencies:
-    json-stable-stringify: ^1.0.1
-  checksum: 8b7434417be8ba7efad7b783d0e31d757ff26e1edb7586ccd829347cc7860b738c1595194f7cc63b1b23975c07845d53023ded6a160d22e27898f695d2cf3c63
-  languageName: node
-  linkType: hard
-
-"call-bind@npm:^1.0.0, call-bind@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "call-bind@npm:1.0.2"
-  dependencies:
-    function-bind: ^1.1.1
-    get-intrinsic: ^1.0.2
-  checksum: f8e31de9d19988a4b80f3e704788c4a2d6b6f3d17cfec4f57dc29ced450c53a49270dc66bf0fbd693329ee948dd33e6c90a329519aef17474a4d961e8d6426b0
-  languageName: node
-  linkType: hard
-
-"callsite@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "callsite@npm:1.0.0"
-  checksum: 569686d622a288a4f0a827466c2f967b6d7a98f2ee1e6ada9dcf5a6802267a5e2a995d40f07113b5f95c7b2b2d5cbff4fdde590195f2a8bed24b829d048688f8
-  languageName: node
-  linkType: hard
-
-"callsites@npm:^3.0.0, callsites@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "callsites@npm:3.1.0"
-  checksum: 072d17b6abb459c2ba96598918b55868af677154bec7e73d222ef95a8fdb9bbf7dae96a8421085cdad8cd190d86653b5b6dc55a4484f2e5b2e27d5e0c3fc15b3
-  languageName: node
-  linkType: hard
-
-"camelcase-keys@npm:^7.0.2":
-  version: 7.0.2
-  resolution: "camelcase-keys@npm:7.0.2"
-  dependencies:
-    camelcase: ^6.3.0
-    map-obj: ^4.1.0
-    quick-lru: ^5.1.1
-    type-fest: ^1.2.1
-  checksum: b5821cc48dd00e8398a30c5d6547f06837ab44de123f1b3a603d0a03399722b2fc67a485a7e47106eb02ef543c3b50c5ebaabc1242cde4b63a267c3258d2365b
-  languageName: node
-  linkType: hard
-
-"camelcase@npm:^5.0.0":
-  version: 5.3.1
-  resolution: "camelcase@npm:5.3.1"
-  checksum: e6effce26b9404e3c0f301498184f243811c30dfe6d0b9051863bd8e4034d09c8c2923794f280d6827e5aa055f6c434115ff97864a16a963366fb35fd673024b
-  languageName: node
-  linkType: hard
-
-"camelcase@npm:^6.3.0":
-  version: 6.3.0
-  resolution: "camelcase@npm:6.3.0"
-  checksum: 8c96818a9076434998511251dcb2761a94817ea17dbdc37f47ac080bd088fc62c7369429a19e2178b993497132c8cbcf5cc1f44ba963e76782ba469c0474938d
-  languageName: node
-  linkType: hard
-
-"can-symlink@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "can-symlink@npm:1.0.0"
-  dependencies:
-    tmp: 0.0.28
-  bin:
-    can-symlink: ./can-symlink.js
-  checksum: 02bc43799685ab0fe42af8a7b697ef3918baaf77b1fff0417392b933cfb6bddb8cf93b3afd83983bea21922c9312c6047a58718f5a30d1232ce09540b52f78a4
-  languageName: node
-  linkType: hard
-
-"caniuse-api@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "caniuse-api@npm:3.0.0"
-  dependencies:
-    browserslist: ^4.0.0
-    caniuse-lite: ^1.0.0
-    lodash.memoize: ^4.1.2
-    lodash.uniq: ^4.5.0
-  checksum: db2a229383b20d0529b6b589dde99d7b6cb56ba371366f58cbbfa2929c9f42c01f873e2b6ef641d4eda9f0b4118de77dbb2805814670bdad4234bf08e720b0b4
-  languageName: node
-  linkType: hard
-
-"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30000792, caniuse-lite@npm:^1.0.30000805, caniuse-lite@npm:^1.0.30000844, caniuse-lite@npm:^1.0.30001219, caniuse-lite@npm:^1.0.30001264, caniuse-lite@npm:^1.0.30001280, caniuse-lite@npm:^1.0.30001304, caniuse-lite@npm:^1.0.30001317, caniuse-lite@npm:^1.0.30001349":
-  version: 1.0.30001487
-  resolution: "caniuse-lite@npm:1.0.30001487"
-  checksum: b5a9e72ec165765fb3e07913cc389685ce8a30ac48967f99baec773a4353d2037fb534241e87b3c95d40a5081079be2263710b784883183bb2998b73f7202233
-  languageName: node
-  linkType: hard
-
-"capture-exit@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "capture-exit@npm:2.0.0"
-  dependencies:
-    rsvp: ^4.8.4
-  checksum: 0b9f10daca09e521da9599f34c8e7af14ad879c336e2bdeb19955b375398ae1c5bcc91ac9f2429944343057ee9ed028b1b2fb28816c384e0e55d70c439b226f4
-  languageName: node
-  linkType: hard
-
-"cardinal@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "cardinal@npm:1.0.0"
-  dependencies:
-    ansicolors: ~0.2.1
-    redeyed: ~1.0.0
-  bin:
-    cdl: ./bin/cdl.js
-  checksum: c77852b228c2be38cfa66b43ec3bfaee021954f621328def00e2fba364160bbbafadbad560485da29d6deb87042268d7a23f91a460058308a14c5d18a329ab57
-  languageName: node
-  linkType: hard
-
-"caseless@npm:~0.12.0":
-  version: 0.12.0
-  resolution: "caseless@npm:0.12.0"
-  checksum: b43bd4c440aa1e8ee6baefee8063b4850fd0d7b378f6aabc796c9ec8cb26d27fb30b46885350777d9bd079c5256c0e1329ad0dc7c2817e0bb466810ebb353751
-  languageName: node
-  linkType: hard
-
-"ccount@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "ccount@npm:1.1.0"
-  checksum: b335a79d0aa4308919cf7507babcfa04ac63d389ebed49dbf26990d4607c8a4713cde93cc83e707d84571ddfe1e7615dad248be9bc422ae4c188210f71b08b78
-  languageName: node
-  linkType: hard
-
-"ceibo@npm:~2.0.0":
-  version: 2.0.0
-  resolution: "ceibo@npm:2.0.0"
-  checksum: 5b61580221b8b145442b5076fe2d9389104899e712dce21bfabe907276e86cfc36f8aae68a4af592300db6eeedc53e885019475f0ffb41cf9c9217f500d9c9cf
-  languageName: node
-  linkType: hard
-
-"chalk@npm:^1.0.0, chalk@npm:^1.1.3":
-  version: 1.1.3
-  resolution: "chalk@npm:1.1.3"
-  dependencies:
-    ansi-styles: ^2.2.1
-    escape-string-regexp: ^1.0.2
-    has-ansi: ^2.0.0
-    strip-ansi: ^3.0.0
-    supports-color: ^2.0.0
-  checksum: 9d2ea6b98fc2b7878829eec223abcf404622db6c48396a9b9257f6d0ead2acf18231ae368d6a664a83f272b0679158da12e97b5229f794939e555cc574478acd
-  languageName: node
-  linkType: hard
-
-"chalk@npm:^2.0.0, chalk@npm:^2.0.1, chalk@npm:^2.1.0, chalk@npm:^2.3.0, chalk@npm:^2.4.1, chalk@npm:^2.4.2":
-  version: 2.4.2
-  resolution: "chalk@npm:2.4.2"
-  dependencies:
-    ansi-styles: ^3.2.1
-    escape-string-regexp: ^1.0.5
-    supports-color: ^5.3.0
-  checksum: ec3661d38fe77f681200f878edbd9448821924e0f93a9cefc0e26a33b145f1027a2084bf19967160d11e1f03bfe4eaffcabf5493b89098b2782c3fe0b03d80c2
-  languageName: node
-  linkType: hard
-
-"chalk@npm:^4.0.0, chalk@npm:^4.1.0, chalk@npm:^4.1.1":
-  version: 4.1.1
-  resolution: "chalk@npm:4.1.1"
-  dependencies:
-    ansi-styles: ^4.1.0
-    supports-color: ^7.1.0
-  checksum: 036e973e665ba1a32c975e291d5f3d549bceeb7b1b983320d4598fb75d70fe20c5db5d62971ec0fe76cdbce83985a00ee42372416abfc3a5584465005a7855ed
-  languageName: node
-  linkType: hard
-
-"chalk@npm:^4.1.2":
-  version: 4.1.2
-  resolution: "chalk@npm:4.1.2"
-  dependencies:
-    ansi-styles: ^4.1.0
-    supports-color: ^7.1.0
-  checksum: fe75c9d5c76a7a98d45495b91b2172fa3b7a09e0cc9370e5c8feb1c567b85c4288e2b3fded7cfdd7359ac28d6b3844feb8b82b8686842e93d23c827c417e83fc
-  languageName: node
-  linkType: hard
-
-"chalk@npm:~0.4.0":
-  version: 0.4.0
-  resolution: "chalk@npm:0.4.0"
-  dependencies:
-    ansi-styles: ~1.0.0
-    has-color: ~0.1.0
-    strip-ansi: ~0.1.0
-  checksum: e8f04f387b9fbf746fdce4b61a633f8a0d28224d8b022603db0f2d137471a18c5bc0bc33b243df09c361688f12bd3ab8a9dd1f8b4450d5a361bfe83aadbde739
-  languageName: node
-  linkType: hard
-
-"character-entities-legacy@npm:^1.0.0":
-  version: 1.1.4
-  resolution: "character-entities-legacy@npm:1.1.4"
-  checksum: fe03a82c154414da3a0c8ab3188e4237ec68006cbcd681cf23c7cfb9502a0e76cd30ab69a2e50857ca10d984d57de3b307680fff5328ccd427f400e559c3a811
-  languageName: node
-  linkType: hard
-
-"character-entities@npm:^1.0.0":
-  version: 1.2.4
-  resolution: "character-entities@npm:1.2.4"
-  checksum: e1545716571ead57beac008433c1ff69517cd8ca5b336889321c5b8ff4a99c29b65589a701e9c086cda8a5e346a67295e2684f6c7ea96819fe85cbf49bf8686d
-  languageName: node
-  linkType: hard
-
-"character-reference-invalid@npm:^1.0.0":
-  version: 1.1.4
-  resolution: "character-reference-invalid@npm:1.1.4"
-  checksum: 20274574c70e05e2f81135f3b93285536bc8ff70f37f0809b0d17791a832838f1e49938382899ed4cb444e5bbd4314ca1415231344ba29f4222ce2ccf24fea0b
-  languageName: node
-  linkType: hard
-
-"charcodes@npm:^0.2.0":
-  version: 0.2.0
-  resolution: "charcodes@npm:0.2.0"
-  checksum: 972443ed359d54382e721b9db0a298eb95c4c454386f7e98886586f433e1e6686225416114e6f6bb2e6ef3facc9ba3b4ab9946a56a180fe64ef67816a05d4fe4
-  languageName: node
-  linkType: hard
-
-"chardet@npm:^0.7.0":
-  version: 0.7.0
-  resolution: "chardet@npm:0.7.0"
-  checksum: 6fd5da1f5d18ff5712c1e0aed41da200d7c51c28f11b36ee3c7b483f3696dabc08927fc6b227735eb8f0e1215c9a8abd8154637f3eff8cada5959df7f58b024d
-  languageName: node
-  linkType: hard
-
-"charm@npm:^1.0.0":
-  version: 1.0.2
-  resolution: "charm@npm:1.0.2"
-  dependencies:
-    inherits: ^2.0.1
-  checksum: 767e4ea65014c3a93ed6943d230150b80bea8842b3a19890a30a477f47c8dfb68687d754f5a538bd628fc3a0a6b84c4986c9c3f9c541c4956239d8d280472614
-  languageName: node
-  linkType: hard
-
-"cheerio-select@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "cheerio-select@npm:2.1.0"
-  dependencies:
-    boolbase: ^1.0.0
-    css-select: ^5.1.0
-    css-what: ^6.1.0
-    domelementtype: ^2.3.0
-    domhandler: ^5.0.3
-    domutils: ^3.0.1
-  checksum: 843d6d479922f28a6c5342c935aff1347491156814de63c585a6eb73baf7bb4185c1b4383a1195dca0f12e3946d737c7763bcef0b9544c515d905c5c44c5308b
-  languageName: node
-  linkType: hard
-
-"cheerio@npm:^1.0.0-rc.12":
-  version: 1.0.0-rc.12
-  resolution: "cheerio@npm:1.0.0-rc.12"
-  dependencies:
-    cheerio-select: ^2.1.0
-    dom-serializer: ^2.0.0
-    domhandler: ^5.0.3
-    domutils: ^3.0.1
-    htmlparser2: ^8.0.1
-    parse5: ^7.0.0
-    parse5-htmlparser2-tree-adapter: ^7.0.0
-  checksum: 5d4c1b7a53cf22d3a2eddc0aff70cf23cbb30d01a4c79013e703a012475c02461aa1fcd99127e8d83a02216386ed6942b2c8103845fd0812300dd199e6e7e054
-  languageName: node
-  linkType: hard
-
-"chokidar@npm:>=3.0.0 <4.0.0":
-  version: 3.5.3
-  resolution: "chokidar@npm:3.5.3"
-  dependencies:
-    anymatch: ~3.1.2
-    braces: ~3.0.2
-    fsevents: ~2.3.2
-    glob-parent: ~5.1.2
-    is-binary-path: ~2.1.0
-    is-glob: ~4.0.1
-    normalize-path: ~3.0.0
-    readdirp: ~3.6.0
-  dependenciesMeta:
-    fsevents:
-      optional: true
-  checksum: b49fcde40176ba007ff361b198a2d35df60d9bb2a5aab228279eb810feae9294a6b4649ab15981304447afe1e6ffbf4788ad5db77235dc770ab777c6e771980c
-  languageName: node
-  linkType: hard
-
-"chokidar@npm:^2.1.8":
-  version: 2.1.8
-  resolution: "chokidar@npm:2.1.8"
-  dependencies:
-    anymatch: ^2.0.0
-    async-each: ^1.0.1
-    braces: ^2.3.2
-    fsevents: ^1.2.7
-    glob-parent: ^3.1.0
-    inherits: ^2.0.3
-    is-binary-path: ^1.0.0
-    is-glob: ^4.0.0
-    normalize-path: ^3.0.0
-    path-is-absolute: ^1.0.0
-    readdirp: ^2.2.1
-    upath: ^1.1.1
-  dependenciesMeta:
-    fsevents:
-      optional: true
-  checksum: 0c43e89cbf0268ef1e1f41ce8ec5233c7ba022c6f3282c2ef6530e351d42396d389a1148c5a040f291cf1f4083a4c6b2f51dad3f31c726442ea9a337de316bcf
-  languageName: node
-  linkType: hard
-
-"chokidar@npm:^3.4.1":
-  version: 3.5.1
-  resolution: "chokidar@npm:3.5.1"
-  dependencies:
-    anymatch: ~3.1.1
-    braces: ~3.0.2
-    fsevents: ~2.3.1
-    glob-parent: ~5.1.0
-    is-binary-path: ~2.1.0
-    is-glob: ~4.0.1
-    normalize-path: ~3.0.0
-    readdirp: ~3.5.0
-  dependenciesMeta:
-    fsevents:
-      optional: true
-  checksum: b7774e6e3aeca084d39e8542041555a11452414c744122436101243f89580fad97154ae11525e46bfa816313ae32533e2a88e8587e4d50b14ea716a9e6538978
-  languageName: node
-  linkType: hard
-
-"chownr@npm:^1.1.1":
-  version: 1.1.4
-  resolution: "chownr@npm:1.1.4"
-  checksum: 115648f8eb38bac5e41c3857f3e663f9c39ed6480d1349977c4d96c95a47266fcacc5a5aabf3cb6c481e22d72f41992827db47301851766c4fd77ac21a4f081d
-  languageName: node
-  linkType: hard
-
-"chownr@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "chownr@npm:2.0.0"
-  checksum: c57cf9dd0791e2f18a5ee9c1a299ae6e801ff58fee96dc8bfd0dcb4738a6ce58dd252a3605b1c93c6418fe4f9d5093b28ffbf4d66648cb2a9c67eaef9679be2f
-  languageName: node
-  linkType: hard
-
-"chrome-trace-event@npm:^1.0.2":
-  version: 1.0.3
-  resolution: "chrome-trace-event@npm:1.0.3"
-  checksum: cb8b1fc7e881aaef973bd0c4a43cd353c2ad8323fb471a041e64f7c2dd849cde4aad15f8b753331a32dda45c973f032c8a03b8177fc85d60eaa75e91e08bfb97
-  languageName: node
-  linkType: hard
-
-"ci-info@npm:^3.3.0":
-  version: 3.3.0
-  resolution: "ci-info@npm:3.3.0"
-  checksum: c3d86fe374938ecda5093b1ba39acb535d8309185ba3f23587747c6a057e63f45419b406d880304dbc0e1d72392c9a33e42fe9a1e299209bc0ded5efaa232b66
-  languageName: node
-  linkType: hard
-
-"cipher-base@npm:^1.0.0, cipher-base@npm:^1.0.1, cipher-base@npm:^1.0.3":
-  version: 1.0.4
-  resolution: "cipher-base@npm:1.0.4"
-  dependencies:
-    inherits: ^2.0.1
-    safe-buffer: ^5.0.1
-  checksum: 47d3568dbc17431a339bad1fe7dff83ac0891be8206911ace3d3b818fc695f376df809bea406e759cdea07fff4b454fa25f1013e648851bec790c1d75763032e
-  languageName: node
-  linkType: hard
-
-"class-utils@npm:^0.3.5":
-  version: 0.3.6
-  resolution: "class-utils@npm:0.3.6"
-  dependencies:
-    arr-union: ^3.1.0
-    define-property: ^0.2.5
-    isobject: ^3.0.0
-    static-extend: ^0.1.1
-  checksum: be108900801e639e50f96a7e4bfa8867c753a7750a7603879f3981f8b0a89cba657497a2d5f40cd4ea557ff15d535a100818bb486baf6e26fe5d7872e75f1078
-  languageName: node
-  linkType: hard
-
-"clean-base-url@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "clean-base-url@npm:1.0.0"
-  checksum: df819e54595b0c04cadfd1a5485216591d4b68d80a3603b657e7e50ac6b34539ef8a6e2100531131d67da325603b26a96a80cfd7c2fc24702ce1db0e1e39dde0
-  languageName: node
-  linkType: hard
-
-"clean-css-promise@npm:^0.1.0":
-  version: 0.1.1
-  resolution: "clean-css-promise@npm:0.1.1"
-  dependencies:
-    array-to-error: ^1.0.0
-    clean-css: ^3.4.5
-    pinkie-promise: ^2.0.0
-  checksum: 5d2a4ad633453c4e6f3d865f7f19f1a821d20985309f914307a87c36c0ef79674ccb24f61195ff45506b50c12b49ec0448581b0f60c31472925d77fc923129ea
-  languageName: node
-  linkType: hard
-
-"clean-css@npm:^3.4.5":
-  version: 3.4.28
-  resolution: "clean-css@npm:3.4.28"
-  dependencies:
-    commander: 2.8.x
-    source-map: 0.4.x
-  bin:
-    cleancss: ./bin/cleancss
-  checksum: eacc573e5ba118aa59bb44a3d188e54d390b7482cad7941559b3865e4946c677afb2deab50bcf8e97592532935f684a53b3abff1d5c55e95e21ded1e93b69132
-  languageName: node
-  linkType: hard
-
-"clean-stack@npm:^2.0.0, clean-stack@npm:^2.2.0":
-  version: 2.2.0
-  resolution: "clean-stack@npm:2.2.0"
-  checksum: 2ac8cd2b2f5ec986a3c743935ec85b07bc174d5421a5efc8017e1f146a1cf5f781ae962618f416352103b32c9cd7e203276e8c28241bbe946160cab16149fb68
-  languageName: node
-  linkType: hard
-
-"clean-up-path@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "clean-up-path@npm:1.0.0"
-  checksum: a4182d6126d897b326b4918e9931c359ae64c7a8fcf2eab4554f9eabf7820c78e3d917b8e0ddb6589837f905ff1b4158a10504664727b0ade67f55815020b41f
-  languageName: node
-  linkType: hard
-
-"cli-cursor@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "cli-cursor@npm:2.1.0"
-  dependencies:
-    restore-cursor: ^2.0.0
-  checksum: d88e97bfdac01046a3ffe7d49f06757b3126559d7e44aa2122637eb179284dc6cd49fca2fac4f67c19faaf7e6dab716b6fe1dfcd309977407d8c7578ec2d044d
-  languageName: node
-  linkType: hard
-
-"cli-cursor@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "cli-cursor@npm:3.1.0"
-  dependencies:
-    restore-cursor: ^3.1.0
-  checksum: 2692784c6cd2fd85cfdbd11f53aea73a463a6d64a77c3e098b2b4697a20443f430c220629e1ca3b195ea5ac4a97a74c2ee411f3807abf6df2b66211fec0c0a29
-  languageName: node
-  linkType: hard
-
-"cli-spinners@npm:^2.0.0, cli-spinners@npm:^2.5.0":
-  version: 2.6.0
-  resolution: "cli-spinners@npm:2.6.0"
-  checksum: bc5d06af9f896e95d0c277e2a5ee0adc5876767decca6b3c22e212934b96033453268cb59be904eccb6d59119e57dbb3fc8ca9bdf5f8476506283b3dd8728748
-  languageName: node
-  linkType: hard
-
-"cli-table@npm:^0.3.1":
-  version: 0.3.6
-  resolution: "cli-table@npm:0.3.6"
-  dependencies:
-    colors: 1.0.3
-  checksum: b0cd08578c810240920438cc2b3ffb4b4f5106b29f3362707f1d8cfc0c0440ad2afb70b96e30ce37f72f0ffe1e844ae7341dde4df17d51ad345eb186a5903af2
-  languageName: node
-  linkType: hard
-
-"cli-truncate@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "cli-truncate@npm:2.1.0"
-  dependencies:
-    slice-ansi: ^3.0.0
-    string-width: ^4.2.0
-  checksum: bf1e4e6195392dc718bf9cd71f317b6300dc4a9191d052f31046b8773230ece4fa09458813bf0e3455a5e68c0690d2ea2c197d14a8b85a7b5e01c97f4b5feb5d
-  languageName: node
-  linkType: hard
-
-"cli-width@npm:^2.0.0":
-  version: 2.2.1
-  resolution: "cli-width@npm:2.2.1"
-  checksum: 3c21b897a2ff551ae5b3c3ab32c866ed2965dcf7fb442f81adf0e27f4a397925c8f84619af7bcc6354821303f6ee9b2aa31d248306174f32c287986158cf4eed
-  languageName: node
-  linkType: hard
-
-"cli-width@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "cli-width@npm:3.0.0"
-  checksum: 4c94af3769367a70e11ed69aa6095f1c600c0ff510f3921ab4045af961820d57c0233acfa8b6396037391f31b4c397e1f614d234294f979ff61430a6c166c3f6
-  languageName: node
-  linkType: hard
-
-"clipboard@npm:^2.0.6":
-  version: 2.0.11
-  resolution: "clipboard@npm:2.0.11"
-  dependencies:
-    good-listener: ^1.2.2
-    select: ^1.1.2
-    tiny-emitter: ^2.0.0
-  checksum: 413055a6038e43898e0e895216b58ed54fbf386f091cb00188875ef35b186cefbd258acdf4cb4b0ac87cbc00de936f41b45dde9fe1fd1a57f7babb28363b8748
-  languageName: node
-  linkType: hard
-
-"cliui@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "cliui@npm:5.0.0"
-  dependencies:
-    string-width: ^3.1.0
-    strip-ansi: ^5.2.0
-    wrap-ansi: ^5.1.0
-  checksum: 0bb8779efe299b8f3002a73619eaa8add4081eb8d1c17bc4fedc6240557fb4eacdc08fe87c39b002eacb6cfc117ce736b362dbfd8bf28d90da800e010ee97df4
-  languageName: node
-  linkType: hard
-
-"cliui@npm:^7.0.2":
-  version: 7.0.4
-  resolution: "cliui@npm:7.0.4"
-  dependencies:
-    string-width: ^4.2.0
-    strip-ansi: ^6.0.0
-    wrap-ansi: ^7.0.0
-  checksum: ce2e8f578a4813806788ac399b9e866297740eecd4ad1823c27fd344d78b22c5f8597d548adbcc46f0573e43e21e751f39446c5a5e804a12aace402b7a315d7f
-  languageName: node
-  linkType: hard
-
-"clone@npm:^1.0.2":
-  version: 1.0.4
-  resolution: "clone@npm:1.0.4"
-  checksum: d06418b7335897209e77bdd430d04f882189582e67bd1f75a04565f3f07f5b3f119a9d670c943b6697d0afb100f03b866b3b8a1f91d4d02d72c4ecf2bb64b5dd
-  languageName: node
-  linkType: hard
-
-"clone@npm:^2.0.0, clone@npm:^2.1.2":
-  version: 2.1.2
-  resolution: "clone@npm:2.1.2"
-  checksum: aaf106e9bc025b21333e2f4c12da539b568db4925c0501a1bf4070836c9e848c892fa22c35548ce0d1132b08bbbfa17a00144fe58fccdab6fa900fec4250f67d
-  languageName: node
-  linkType: hard
-
-"coa@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "coa@npm:2.0.2"
-  dependencies:
-    "@types/q": ^1.5.1
-    chalk: ^2.4.1
-    q: ^1.1.2
-  checksum: 44736914aac2160d3d840ed64432a90a3bb72285a0cd6a688eb5cabdf15d15a85eee0915b3f6f2a4659d5075817b1cb577340d3c9cbb47d636d59ab69f819552
-  languageName: node
-  linkType: hard
-
-"codemirror@npm:^5.58.2":
-  version: 5.61.0
-  resolution: "codemirror@npm:5.61.0"
-  checksum: d9081d4937fc237c972e12538721b47817a08557a30d692b32e09849977e5d91ca6c8984cdea417cf11a163fdbc3c7139fd66cefc6fcf32047c8cbecd21d2715
-  languageName: node
-  linkType: hard
-
-"collection-visit@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "collection-visit@npm:1.0.0"
-  dependencies:
-    map-visit: ^1.0.0
-    object-visit: ^1.0.0
-  checksum: 15d9658fe6eb23594728346adad5433b86bb7a04fd51bbab337755158722f9313a5376ef479de5b35fbc54140764d0d39de89c339f5d25b959ed221466981da9
-  languageName: node
-  linkType: hard
-
-"color-convert@npm:^1.9.0":
-  version: 1.9.3
-  resolution: "color-convert@npm:1.9.3"
-  dependencies:
-    color-name: 1.1.3
-  checksum: fd7a64a17cde98fb923b1dd05c5f2e6f7aefda1b60d67e8d449f9328b4e53b228a428fd38bfeaeb2db2ff6b6503a776a996150b80cdf224062af08a5c8a3a203
-  languageName: node
-  linkType: hard
-
-"color-convert@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "color-convert@npm:2.0.1"
-  dependencies:
-    color-name: ~1.1.4
-  checksum: 79e6bdb9fd479a205c71d89574fccfb22bd9053bd98c6c4d870d65c132e5e904e6034978e55b43d69fcaa7433af2016ee203ce76eeba9cfa554b373e7f7db336
-  languageName: node
-  linkType: hard
-
-"color-name@npm:1.1.3":
-  version: 1.1.3
-  resolution: "color-name@npm:1.1.3"
-  checksum: 09c5d3e33d2105850153b14466501f2bfb30324a2f76568a408763a3b7433b0e50e5b4ab1947868e65cb101bb7cb75029553f2c333b6d4b8138a73fcc133d69d
-  languageName: node
-  linkType: hard
-
-"color-name@npm:~1.1.4":
-  version: 1.1.4
-  resolution: "color-name@npm:1.1.4"
-  checksum: b0445859521eb4021cd0fb0cc1a75cecf67fceecae89b63f62b201cca8d345baf8b952c966862a9d9a2632987d4f6581f0ec8d957dfacece86f0a7919316f610
-  languageName: node
-  linkType: hard
-
-"color-support@npm:^1.1.3":
-  version: 1.1.3
-  resolution: "color-support@npm:1.1.3"
-  bin:
-    color-support: bin.js
-  checksum: 9b7356817670b9a13a26ca5af1c21615463b500783b739b7634a0c2047c16cef4b2865d7576875c31c3cddf9dd621fa19285e628f20198b233a5cfdda6d0793b
-  languageName: node
-  linkType: hard
-
-"colorette@npm:^1.2.2":
-  version: 1.4.0
-  resolution: "colorette@npm:1.4.0"
-  checksum: 01c3c16058b182a4ab4c126a65a75faa4d38a20fa7c845090b25453acec6c371bb2c5dceb0a2338511f17902b9d1a9af0cadd8509c9403894b79311032c256c3
-  languageName: node
-  linkType: hard
-
-"colors@npm:1.0.3":
-  version: 1.0.3
-  resolution: "colors@npm:1.0.3"
-  checksum: 234e8d3ab7e4003851cdd6a1f02eaa16dabc502ee5f4dc576ad7959c64b7477b15bd21177bab4055a4c0a66aa3d919753958030445f87c39a253d73b7a3637f5
-  languageName: node
-  linkType: hard
-
-"colors@npm:^1.4.0":
-  version: 1.4.0
-  resolution: "colors@npm:1.4.0"
-  checksum: 98aa2c2418ad87dedf25d781be69dc5fc5908e279d9d30c34d8b702e586a0474605b3a189511482b9d5ed0d20c867515d22749537f7bc546256c6014f3ebdcec
-  languageName: node
-  linkType: hard
-
-"columnify@npm:^1.5.4":
-  version: 1.5.4
-  resolution: "columnify@npm:1.5.4"
-  dependencies:
-    strip-ansi: ^3.0.0
-    wcwidth: ^1.0.0
-  checksum: f0693937412ec41d387f8ae89ff8cd5811a07ad636f753f0276ba8394fd76c0f610621ebeb379d6adcb30d98696919546dbbf93a28bd4e546efc7e30d905edc2
-  languageName: node
-  linkType: hard
-
-"combined-stream@npm:^1.0.6, combined-stream@npm:~1.0.6":
-  version: 1.0.8
-  resolution: "combined-stream@npm:1.0.8"
-  dependencies:
-    delayed-stream: ~1.0.0
-  checksum: 49fa4aeb4916567e33ea81d088f6584749fc90c7abec76fd516bf1c5aa5c79f3584b5ba3de6b86d26ddd64bae5329c4c7479343250cfe71c75bb366eae53bb7c
-  languageName: node
-  linkType: hard
-
-"commander@npm:2, commander@npm:^2.15.1, commander@npm:^2.20.0, commander@npm:^2.6.0":
-  version: 2.20.3
-  resolution: "commander@npm:2.20.3"
-  checksum: ab8c07884e42c3a8dbc5dd9592c606176c7eb5c1ca5ff274bcf907039b2c41de3626f684ea75ccf4d361ba004bbaff1f577d5384c155f3871e456bdf27becf9e
-  languageName: node
-  linkType: hard
-
-"commander@npm:2.8.x":
-  version: 2.8.1
-  resolution: "commander@npm:2.8.1"
-  dependencies:
-    graceful-readlink: ">= 1.0.0"
-  checksum: 9552028af84683cf2b20397c54fa4dd5b18fb69555e201a8edc3880b344f5aadd8857f777da97ce0c99e50fc133adf356f0299e9958b9b4e95b96c45f0696dfd
-  languageName: node
-  linkType: hard
-
-"commander@npm:7.2.0":
-  version: 7.2.0
-  resolution: "commander@npm:7.2.0"
-  checksum: 53501cbeee61d5157546c0bef0fedb6cdfc763a882136284bed9a07225f09a14b82d2a84e7637edfd1a679fb35ed9502fd58ef1d091e6287f60d790147f68ddc
-  languageName: node
-  linkType: hard
-
-"commander@npm:^4.1.1":
-  version: 4.1.1
-  resolution: "commander@npm:4.1.1"
-  checksum: d7b9913ff92cae20cb577a4ac6fcc121bd6223319e54a40f51a14740a681ad5c574fd29a57da478a5f234a6fa6c52cbf0b7c641353e03c648b1ae85ba670b977
-  languageName: node
-  linkType: hard
-
-"commander@npm:^6.2.0":
-  version: 6.2.1
-  resolution: "commander@npm:6.2.1"
-  checksum: d7090410c0de6bc5c67d3ca41c41760d6d268f3c799e530aafb73b7437d1826bbf0d2a3edac33f8b57cc9887b4a986dce307fa5557e109be40eadb7c43b21742
-  languageName: node
-  linkType: hard
-
-"commander@npm:^8.3.0":
-  version: 8.3.0
-  resolution: "commander@npm:8.3.0"
-  checksum: 0f82321821fc27b83bd409510bb9deeebcfa799ff0bf5d102128b500b7af22872c0c92cb6a0ebc5a4cf19c6b550fba9cedfa7329d18c6442a625f851377bacf0
-  languageName: node
-  linkType: hard
-
-"common-tags@npm:^1.4.0":
-  version: 1.8.0
-  resolution: "common-tags@npm:1.8.0"
-  checksum: fb0cc9420d149176f2bd2b1fc9e6df622cd34eccaca60b276aa3253a7c9241e8a8ed1ec0702b2679eba7e47aeef721869c686bbd7257b75b5c44993c8462cd7f
-  languageName: node
-  linkType: hard
-
-"common-tags@npm:^1.8.0, common-tags@npm:^1.8.2":
-  version: 1.8.2
-  resolution: "common-tags@npm:1.8.2"
-  checksum: 767a6255a84bbc47df49a60ab583053bb29a7d9687066a18500a516188a062c4e4cd52de341f22de0b07062e699b1b8fe3cfa1cb55b241cb9301aeb4f45b4dff
-  languageName: node
-  linkType: hard
-
-"commondir@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "commondir@npm:1.0.1"
-  checksum: 59715f2fc456a73f68826285718503340b9f0dd89bfffc42749906c5cf3d4277ef11ef1cca0350d0e79204f00f1f6d83851ececc9095dc88512a697ac0b9bdcb
-  languageName: node
-  linkType: hard
-
-"component-emitter@npm:^1.2.1":
-  version: 1.3.0
-  resolution: "component-emitter@npm:1.3.0"
-  checksum: b3c46de38ffd35c57d1c02488355be9f218e582aec72d72d1b8bbec95a3ac1b38c96cd6e03ff015577e68f550fbb361a3bfdbd9bb248be9390b7b3745691be6b
-  languageName: node
-  linkType: hard
-
-"compressible@npm:~2.0.16":
-  version: 2.0.18
-  resolution: "compressible@npm:2.0.18"
-  dependencies:
-    mime-db: ">= 1.43.0 < 2"
-  checksum: 58321a85b375d39230405654721353f709d0c1442129e9a17081771b816302a012471a9b8f4864c7dbe02eef7f2aaac3c614795197092262e94b409c9be108f0
-  languageName: node
-  linkType: hard
-
-"compression@npm:^1.7.4":
-  version: 1.7.4
-  resolution: "compression@npm:1.7.4"
-  dependencies:
-    accepts: ~1.3.5
-    bytes: 3.0.0
-    compressible: ~2.0.16
-    debug: 2.6.9
-    on-headers: ~1.0.2
-    safe-buffer: 5.1.2
-    vary: ~1.1.2
-  checksum: 35c0f2eb1f28418978615dc1bc02075b34b1568f7f56c62d60f4214d4b7cc00d0f6d282b5f8a954f59872396bd770b6b15ffd8aa94c67d4bce9b8887b906999b
-  languageName: node
-  linkType: hard
-
-"concat-map@npm:0.0.1":
-  version: 0.0.1
-  resolution: "concat-map@npm:0.0.1"
-  checksum: 902a9f5d8967a3e2faf138d5cb784b9979bad2e6db5357c5b21c568df4ebe62bcb15108af1b2253744844eb964fc023fbd9afbbbb6ddd0bcc204c6fb5b7bf3af
-  languageName: node
-  linkType: hard
-
-"concat-stream@npm:^1.5.0":
-  version: 1.6.2
-  resolution: "concat-stream@npm:1.6.2"
-  dependencies:
-    buffer-from: ^1.0.0
-    inherits: ^2.0.3
-    readable-stream: ^2.2.2
-    typedarray: ^0.0.6
-  checksum: 1ef77032cb4459dcd5187bd710d6fc962b067b64ec6a505810de3d2b8cc0605638551b42f8ec91edf6fcd26141b32ef19ad749239b58fae3aba99187adc32285
-  languageName: node
-  linkType: hard
-
-"configstore@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "configstore@npm:5.0.1"
-  dependencies:
-    dot-prop: ^5.2.0
-    graceful-fs: ^4.1.2
-    make-dir: ^3.0.0
-    unique-string: ^2.0.0
-    write-file-atomic: ^3.0.0
-    xdg-basedir: ^4.0.0
-  checksum: 60ef65d493b63f96e14b11ba7ec072fdbf3d40110a94fb7199d1c287761bdea5c5244e76b2596325f30c1b652213aa75de96ea20afd4a5f82065e61ea090988e
-  languageName: node
-  linkType: hard
-
-"connect@npm:^3.6.6":
-  version: 3.7.0
-  resolution: "connect@npm:3.7.0"
-  dependencies:
-    debug: 2.6.9
-    finalhandler: 1.1.2
-    parseurl: ~1.3.3
-    utils-merge: 1.0.1
-  checksum: 96e1c4effcf219b065c7823e57351c94366d2e2a6952fa95e8212bffb35c86f1d5a3f9f6c5796d4cd3a5fdda628368b1c3cc44bf19c66cfd68fe9f9cab9177e2
-  languageName: node
-  linkType: hard
-
-"console-browserify@npm:^1.1.0":
-  version: 1.2.0
-  resolution: "console-browserify@npm:1.2.0"
-  checksum: 226591eeff8ed68e451dffb924c1fb750c654d54b9059b3b261d360f369d1f8f70650adecf2c7136656236a4bfeb55c39281b5d8a55d792ebbb99efd3d848d52
-  languageName: node
-  linkType: hard
-
-"console-control-strings@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "console-control-strings@npm:1.1.0"
-  checksum: 8755d76787f94e6cf79ce4666f0c5519906d7f5b02d4b884cf41e11dcd759ed69c57da0670afd9236d229a46e0f9cf519db0cd829c6dca820bb5a5c3def584ed
-  languageName: node
-  linkType: hard
-
-"console-ui@npm:^3.0.4, console-ui@npm:^3.1.1, console-ui@npm:^3.1.2":
-  version: 3.1.2
-  resolution: "console-ui@npm:3.1.2"
-  dependencies:
-    chalk: ^2.1.0
-    inquirer: ^6
-    json-stable-stringify: ^1.0.1
-    ora: ^3.4.0
-    through2: ^3.0.1
-  checksum: f475401147c5f1205a39dcd0ca9e196e053285a357fe10d4233947e7288f8412bca1ac5666446cced5aab0bd6309ff6715efd395cd285225836c72d27c821008
-  languageName: node
-  linkType: hard
-
-"consolidate@npm:^0.16.0":
-  version: 0.16.0
-  resolution: "consolidate@npm:0.16.0"
-  dependencies:
-    bluebird: ^3.7.2
-  checksum: f17164ffb2c4f79b4cbf685f1c76a49f59d329a40954b436425498861dc137b46fe821b2aadafa2dcfeb7eebd46846f35bd2c36b4a704d38521b4210a22a7515
-  languageName: node
-  linkType: hard
-
-"constants-browserify@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "constants-browserify@npm:1.0.0"
-  checksum: f7ac8c6d0b6e4e0c77340a1d47a3574e25abd580bfd99ad707b26ff7618596cf1a5e5ce9caf44715e9e01d4a5d12cb3b4edaf1176f34c19adb2874815a56e64f
-  languageName: node
-  linkType: hard
-
-"content-disposition@npm:0.5.3":
-  version: 0.5.3
-  resolution: "content-disposition@npm:0.5.3"
-  dependencies:
-    safe-buffer: 5.1.2
-  checksum: 95bf164c0b0b8199d3f44b7631e51b37f683c6a90b9baa4315bd3d405a6d1bc81b7346f0981046aa004331fb3d7a28b629514d01fc209a5251573fc7e4d33380
-  languageName: node
-  linkType: hard
-
-"content-disposition@npm:0.5.4":
-  version: 0.5.4
-  resolution: "content-disposition@npm:0.5.4"
-  dependencies:
-    safe-buffer: 5.2.1
-  checksum: afb9d545e296a5171d7574fcad634b2fdf698875f4006a9dd04a3e1333880c5c0c98d47b560d01216fb6505a54a2ba6a843ee3a02ec86d7e911e8315255f56c3
-  languageName: node
-  linkType: hard
-
-"content-type@npm:~1.0.4":
-  version: 1.0.4
-  resolution: "content-type@npm:1.0.4"
-  checksum: 3d93585fda985d1554eca5ebd251994327608d2e200978fdbfba21c0c679914d5faf266d17027de44b34a72c7b0745b18584ecccaa7e1fdfb6a68ac7114f12e0
-  languageName: node
-  linkType: hard
-
-"continuable-cache@npm:^0.3.1":
-  version: 0.3.1
-  resolution: "continuable-cache@npm:0.3.1"
-  checksum: d88b9891cdc76533bf018613ec80c7f8f3ce7159fa8c1402dae7be546c4b0566ef0c18e488b08da66b8a8f5aab7c91ce9910e4c32d965d902ffe34e095ccc2cb
-  languageName: node
-  linkType: hard
-
-"convert-source-map@npm:^1.5.1, convert-source-map@npm:^1.7.0":
-  version: 1.8.0
-  resolution: "convert-source-map@npm:1.8.0"
-  dependencies:
-    safe-buffer: ~5.1.1
-  checksum: 985d974a2d33e1a2543ada51c93e1ba2f73eaed608dc39f229afc78f71dcc4c8b7d7c684aa647e3c6a3a204027444d69e53e169ce94e8d1fa8d7dee80c9c8fed
-  languageName: node
-  linkType: hard
-
-"cookie-signature@npm:1.0.6":
-  version: 1.0.6
-  resolution: "cookie-signature@npm:1.0.6"
-  checksum: f4e1b0a98a27a0e6e66fd7ea4e4e9d8e038f624058371bf4499cfcd8f3980be9a121486995202ba3fca74fbed93a407d6d54d43a43f96fd28d0bd7a06761591a
-  languageName: node
-  linkType: hard
-
-"cookie@npm:0.4.0":
-  version: 0.4.0
-  resolution: "cookie@npm:0.4.0"
-  checksum: 760384ba0aef329c52523747e36a452b5e51bc49b34160363a6934e7b7df3f93fcc88b35e33450361535d40a92a96412da870e1816aba9aa6cc556a9fedd8492
-  languageName: node
-  linkType: hard
-
-"cookie@npm:0.5.0":
-  version: 0.5.0
-  resolution: "cookie@npm:0.5.0"
-  checksum: 1f4bd2ca5765f8c9689a7e8954183f5332139eb72b6ff783d8947032ec1fdf43109852c178e21a953a30c0dd42257828185be01b49d1eb1a67fd054ca588a180
-  languageName: node
-  linkType: hard
-
-"cookie@npm:~0.4.1":
-  version: 0.4.1
-  resolution: "cookie@npm:0.4.1"
-  checksum: bd7c47f5d94ab70ccdfe8210cde7d725880d2fcda06d8e375afbdd82de0c8d3b73541996e9ce57d35f67f672c4ee6d60208adec06b3c5fc94cebb85196084cf8
-  languageName: node
-  linkType: hard
-
-"copy-concurrently@npm:^1.0.0":
-  version: 1.0.5
-  resolution: "copy-concurrently@npm:1.0.5"
-  dependencies:
-    aproba: ^1.1.1
-    fs-write-stream-atomic: ^1.0.8
-    iferr: ^0.1.5
-    mkdirp: ^0.5.1
-    rimraf: ^2.5.4
-    run-queue: ^1.0.0
-  checksum: 63c169f582e09445260988f697b2d07793d439dfc31e97c8999707bd188dd94d1c7f2ca3533c7786fb75f03a3f2f54ad1ee08055f95f61bb8d2e862498c1d460
-  languageName: node
-  linkType: hard
-
-"copy-dereference@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "copy-dereference@npm:1.0.0"
-  checksum: ffa946e4d3ab77e53e7543fb58b89ffffebc29cc1560adcfd09ad521e2c5b8f087a4639ac98a2d3945a173f0defad444ce1873f3d1104c1978d83c54dd888caf
-  languageName: node
-  linkType: hard
-
-"copy-descriptor@npm:^0.1.0":
-  version: 0.1.1
-  resolution: "copy-descriptor@npm:0.1.1"
-  checksum: d4b7b57b14f1d256bb9aa0b479241048afd7f5bcf22035fc7b94e8af757adeae247ea23c1a774fe44869fd5694efba4a969b88d966766c5245fdee59837fe45b
-  languageName: node
-  linkType: hard
-
-"core-js-compat@npm:^3.16.2":
-  version: 3.18.2
-  resolution: "core-js-compat@npm:3.18.2"
-  dependencies:
-    browserslist: ^4.17.3
-    semver: 7.0.0
-  checksum: 8358d4a14725b68ccb5fcdd590e603f08933c1f89b0fc5415054048771d6ae9182dca89d0280ed44535ce7a5f6f2f6280774aa0b0410842c940a9a2149ab83d2
-  languageName: node
-  linkType: hard
-
-"core-js-compat@npm:^3.18.0":
-  version: 3.19.2
-  resolution: "core-js-compat@npm:3.19.2"
-  dependencies:
-    browserslist: ^4.18.1
-    semver: 7.0.0
-  checksum: 6b9cca0dc341512c3494955ab87cf7e091dd98503af2b432979c6467385804d03cec9598691c0560c5ede992c0b8ee2ce3fc1af4062c31f5731da70211b61544
-  languageName: node
-  linkType: hard
-
-"core-js-compat@npm:^3.20.2, core-js-compat@npm:^3.21.0":
-  version: 3.21.1
-  resolution: "core-js-compat@npm:3.21.1"
-  dependencies:
-    browserslist: ^4.19.1
-    semver: 7.0.0
-  checksum: 6af1bcbc94ede50b109e54bf3f5a9ca28b8a303124e07c2bf76c2257a8a94a0b550cf4a318f6ec0594b351b6f9a5453fd4516e3681560b6d984b95d1988baf13
-  languageName: node
-  linkType: hard
-
-"core-js-compat@npm:^3.22.1":
-  version: 3.22.8
-  resolution: "core-js-compat@npm:3.22.8"
-  dependencies:
-    browserslist: ^4.20.3
-    semver: 7.0.0
-  checksum: 0c82d9110dcb267c2f5547c61b62f8043793d203523048169176b8badf0b73f3792624342b85d9c923df8eb8971b4aa468b160abb81a023d183c5951e4f05a66
-  languageName: node
-  linkType: hard
-
-"core-js-compat@npm:^3.9.0":
-  version: 3.19.1
-  resolution: "core-js-compat@npm:3.19.1"
-  dependencies:
-    browserslist: ^4.17.6
-    semver: 7.0.0
-  checksum: ed302c99814bd7227b549f639fe5f1a3b9d885c0f878c1203f10be0a33c7d0b199931cb904074cc988ab48411132d4f41adf1603e4eebe5c5d42bdc62a3f5c5d
-  languageName: node
-  linkType: hard
-
-"core-js@npm:^2.4.0, core-js@npm:^2.5.0, core-js@npm:^2.6.5":
-  version: 2.6.12
-  resolution: "core-js@npm:2.6.12"
-  checksum: 44fa9934a85f8c78d61e0c8b7b22436330471ffe59ec5076fe7f324d6e8cf7f824b14b1c81ca73608b13bdb0fef035bd820989bf059767ad6fa13123bb8bd016
-  languageName: node
-  linkType: hard
-
-"core-js@npm:^3.16.2":
-  version: 3.22.8
-  resolution: "core-js@npm:3.22.8"
-  checksum: c79bcfea37920a5da880ad1fc8336355e833c83998bb28cd45cc59eef4d9824dd8d59ccd24d6b18ff88f284d53d9eef021ddbd2b5ab1c6305b01e98c1402e510
-  languageName: node
-  linkType: hard
-
-"core-js@npm:^3.24.1":
-  version: 3.26.0
-  resolution: "core-js@npm:3.26.0"
-  checksum: 0149eb9d3909fde9c17626af3a6e625c326e8598d0bb5e6c5b48a18e5fcd4eaf48d4964d873667d8148542ff590fb98eb3f93618da114ca54999d6bc0349734b
-  languageName: node
-  linkType: hard
-
-"core-object@npm:^3.1.5":
-  version: 3.1.5
-  resolution: "core-object@npm:3.1.5"
-  dependencies:
-    chalk: ^2.0.0
-  checksum: d53022008fa9da9db3ac5d2636750300da114b58432a28bcde4cbb099e60208e3b0ae2b8a05cec2d2ec70bdcad72bfac18134ab60e435aec3117b3edad00235d
-  languageName: node
-  linkType: hard
-
-"core-util-is@npm:1.0.2":
-  version: 1.0.2
-  resolution: "core-util-is@npm:1.0.2"
-  checksum: 7a4c925b497a2c91421e25bf76d6d8190f0b2359a9200dbeed136e63b2931d6294d3b1893eda378883ed363cd950f44a12a401384c609839ea616befb7927dab
-  languageName: node
-  linkType: hard
-
-"core-util-is@npm:~1.0.0":
-  version: 1.0.3
-  resolution: "core-util-is@npm:1.0.3"
-  checksum: 9de8597363a8e9b9952491ebe18167e3b36e7707569eed0ebf14f8bba773611376466ae34575bca8cfe3c767890c859c74056084738f09d4e4a6f902b2ad7d99
-  languageName: node
-  linkType: hard
-
-"cors@npm:~2.8.5":
-  version: 2.8.5
-  resolution: "cors@npm:2.8.5"
-  dependencies:
-    object-assign: ^4
-    vary: ^1
-  checksum: ced838404ccd184f61ab4fdc5847035b681c90db7ac17e428f3d81d69e2989d2b680cc254da0e2554f5ed4f8a341820a1ce3d1c16b499f6e2f47a1b9b07b5006
-  languageName: node
-  linkType: hard
-
-"cosmiconfig@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "cosmiconfig@npm:7.0.0"
-  dependencies:
-    "@types/parse-json": ^4.0.0
-    import-fresh: ^3.2.1
-    parse-json: ^5.0.0
-    path-type: ^4.0.0
-    yaml: ^1.10.0
-  checksum: 6801feaa0249e9b9fdde5b3d70dc33b4f9c69095bec94d67e3fe08b66eac24dc7e2099f053597cfbc94b743de269aa5d2cfa7da3fde765433423b06bd122941a
-  languageName: node
-  linkType: hard
-
-"create-ecdh@npm:^4.0.0":
-  version: 4.0.4
-  resolution: "create-ecdh@npm:4.0.4"
-  dependencies:
-    bn.js: ^4.1.0
-    elliptic: ^6.5.3
-  checksum: 0dd7fca9711d09e152375b79acf1e3f306d1a25ba87b8ff14c2fd8e68b83aafe0a7dd6c4e540c9ffbdd227a5fa1ad9b81eca1f233c38bb47770597ba247e614b
-  languageName: node
-  linkType: hard
-
-"create-hash@npm:^1.1.0, create-hash@npm:^1.1.2, create-hash@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "create-hash@npm:1.2.0"
-  dependencies:
-    cipher-base: ^1.0.1
-    inherits: ^2.0.1
-    md5.js: ^1.3.4
-    ripemd160: ^2.0.1
-    sha.js: ^2.4.0
-  checksum: 02a6ae3bb9cd4afee3fabd846c1d8426a0e6b495560a977ba46120c473cb283be6aa1cace76b5f927cf4e499c6146fb798253e48e83d522feba807d6b722eaa9
-  languageName: node
-  linkType: hard
-
-"create-hmac@npm:^1.1.0, create-hmac@npm:^1.1.4, create-hmac@npm:^1.1.7":
-  version: 1.1.7
-  resolution: "create-hmac@npm:1.1.7"
-  dependencies:
-    cipher-base: ^1.0.3
-    create-hash: ^1.1.0
-    inherits: ^2.0.1
-    ripemd160: ^2.0.0
-    safe-buffer: ^5.0.1
-    sha.js: ^2.4.8
-  checksum: ba12bb2257b585a0396108c72830e85f882ab659c3320c83584b1037f8ab72415095167ced80dc4ce8e446a8ecc4b2acf36d87befe0707d73b26cf9dc77440ed
-  languageName: node
-  linkType: hard
-
-"cross-spawn@npm:^6.0.0, cross-spawn@npm:^6.0.5":
-  version: 6.0.5
-  resolution: "cross-spawn@npm:6.0.5"
-  dependencies:
-    nice-try: ^1.0.4
-    path-key: ^2.0.1
-    semver: ^5.5.0
-    shebang-command: ^1.2.0
-    which: ^1.2.9
-  checksum: f893bb0d96cd3d5751d04e67145bdddf25f99449531a72e82dcbbd42796bbc8268c1076c6b3ea51d4d455839902804b94bc45dfb37ecbb32ea8e54a6741c3ab9
-  languageName: node
-  linkType: hard
-
-"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3":
-  version: 7.0.3
-  resolution: "cross-spawn@npm:7.0.3"
-  dependencies:
-    path-key: ^3.1.0
-    shebang-command: ^2.0.0
-    which: ^2.0.1
-  checksum: 671cc7c7288c3a8406f3c69a3ae2fc85555c04169e9d611def9a675635472614f1c0ed0ef80955d5b6d4e724f6ced67f0ad1bb006c2ea643488fcfef994d7f52
-  languageName: node
-  linkType: hard
-
-"crypto-browserify@npm:^3.11.0":
-  version: 3.12.0
-  resolution: "crypto-browserify@npm:3.12.0"
-  dependencies:
-    browserify-cipher: ^1.0.0
-    browserify-sign: ^4.0.0
-    create-ecdh: ^4.0.0
-    create-hash: ^1.1.0
-    create-hmac: ^1.1.0
-    diffie-hellman: ^5.0.0
-    inherits: ^2.0.1
-    pbkdf2: ^3.0.3
-    public-encrypt: ^4.0.0
-    randombytes: ^2.0.0
-    randomfill: ^1.0.3
-  checksum: c1609af82605474262f3eaa07daa0b2140026bd264ab316d4bf1170272570dbe02f0c49e29407fe0d3634f96c507c27a19a6765fb856fed854a625f9d15618e2
-  languageName: node
-  linkType: hard
-
-"crypto-random-string@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "crypto-random-string@npm:2.0.0"
-  checksum: 0283879f55e7c16fdceacc181f87a0a65c53bc16ffe1d58b9d19a6277adcd71900d02bb2c4843dd55e78c51e30e89b0fec618a7f170ebcc95b33182c28f05fd6
-  languageName: node
-  linkType: hard
-
-"css-loader@npm:^5.2.0":
-  version: 5.2.7
-  resolution: "css-loader@npm:5.2.7"
-  dependencies:
-    icss-utils: ^5.1.0
-    loader-utils: ^2.0.0
-    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
-    schema-utils: ^3.0.0
-    semver: ^7.3.5
-  peerDependencies:
-    webpack: ^4.27.0 || ^5.0.0
-  checksum: fb0742b30ac0919f94b99a323bdefe6d48ae46d66c7d966aae59031350532f368f8bba5951fcd268f2e053c5e6e4655551076268e9073ccb58e453f98ae58f8e
-  languageName: node
-  linkType: hard
-
-"css-select-base-adapter@npm:^0.1.1":
-  version: 0.1.1
-  resolution: "css-select-base-adapter@npm:0.1.1"
-  checksum: c107e9cfa53a23427e4537451a67358375e656baa3322345a982d3c2751fb3904002aae7e5d72386c59f766fe6b109d1ffb43eeab1c16f069f7a3828eb17851c
-  languageName: node
-  linkType: hard
-
-"css-select@npm:^2.0.0":
-  version: 2.1.0
-  resolution: "css-select@npm:2.1.0"
-  dependencies:
-    boolbase: ^1.0.0
-    css-what: ^3.2.1
-    domutils: ^1.7.0
-    nth-check: ^1.0.2
-  checksum: 0c4099910f2411e2a9103cf92ea6a4ad738b57da75bcf73d39ef2c14a00ef36e5f16cb863211c901320618b24ace74da6333442d82995cafd5040077307de462
-  languageName: node
-  linkType: hard
-
-"css-select@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "css-select@npm:5.1.0"
-  dependencies:
-    boolbase: ^1.0.0
-    css-what: ^6.1.0
-    domhandler: ^5.0.2
-    domutils: ^3.0.1
-    nth-check: ^2.0.1
-  checksum: 2772c049b188d3b8a8159907192e926e11824aea525b8282981f72ba3f349cf9ecd523fdf7734875ee2cb772246c22117fc062da105b6d59afe8dcd5c99c9bda
-  languageName: node
-  linkType: hard
-
-"css-tree@npm:1.0.0-alpha.29":
-  version: 1.0.0-alpha.29
-  resolution: "css-tree@npm:1.0.0-alpha.29"
-  dependencies:
-    mdn-data: ~1.1.0
-    source-map: ^0.5.3
-  checksum: 1693a0ddb85fe6f94c5d1b4c79a5dbc67d0c4a10e9992d9c6685bfc84b9d40380799e30b22bca42e15e60d927ac54ac500dec785e8c9245ee782c89eb4d924f4
-  languageName: node
-  linkType: hard
-
-"css-tree@npm:1.0.0-alpha.33":
-  version: 1.0.0-alpha.33
-  resolution: "css-tree@npm:1.0.0-alpha.33"
-  dependencies:
-    mdn-data: 2.0.4
-    source-map: ^0.5.3
-  checksum: b7d1584d855ac01dd2fd7898869f8de90b6cd5b284ffc3d538cbf40891f65f82011964ab360314175bcec3d08838976f4a68823df51d74a456879f62cdf63026
-  languageName: node
-  linkType: hard
-
-"css-tree@npm:^2.0.4":
-  version: 2.1.0
-  resolution: "css-tree@npm:2.1.0"
-  dependencies:
-    mdn-data: 2.0.27
-    source-map-js: ^1.0.1
-  checksum: 254c66a76f6a01d5161605162b17c1792fb3f96966d1cabec3435c551372707c02f6ca6c15f967bee7699f0b254437037c3fdb5eea0cd76ac2377cc8ac1f1d1d
-  languageName: node
-  linkType: hard
-
-"css-what@npm:^3.2.1":
-  version: 3.4.2
-  resolution: "css-what@npm:3.4.2"
-  checksum: 26bb5ec3ae718393d418016365c849fa14bd0de408c735dea3ddf58146b6cc54f3b336fb4afd31d95c06ca79583acbcdfec7ee93d31ff5c1a697df135b38dfeb
-  languageName: node
-  linkType: hard
-
-"css-what@npm:^6.1.0":
-  version: 6.1.0
-  resolution: "css-what@npm:6.1.0"
-  checksum: b975e547e1e90b79625918f84e67db5d33d896e6de846c9b584094e529f0c63e2ab85ee33b9daffd05bff3a146a1916bec664e18bb76dd5f66cbff9fc13b2bbe
-  languageName: node
-  linkType: hard
-
-"cssesc@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "cssesc@npm:3.0.0"
-  bin:
-    cssesc: bin/cssesc
-  checksum: f8c4ababffbc5e2ddf2fa9957dda1ee4af6048e22aeda1869d0d00843223c1b13ad3f5d88b51caa46c994225eacb636b764eb807a8883e2fb6f99b4f4e8c48b2
-  languageName: node
-  linkType: hard
-
-"csso@npm:^3.5.1":
-  version: 3.5.1
-  resolution: "csso@npm:3.5.1"
-  dependencies:
-    css-tree: 1.0.0-alpha.29
-  checksum: f5cca58d7b0a50cdab52c634d967f822c18aaa5f50dd1e145bb755f7ca4b32a029b72269a8a7e253e338e59833e6a934beca187172fb00efc6d096dba0d635b1
-  languageName: node
-  linkType: hard
-
-"cssom@npm:^0.4.4":
-  version: 0.4.4
-  resolution: "cssom@npm:0.4.4"
-  checksum: e3bc1076e7ee4213d4fef05e7ae03bfa83dc05f32611d8edc341f4ecc3d9647b89c8245474c7dd2cdcdb797a27c462e99da7ad00a34399694559f763478ff53f
-  languageName: node
-  linkType: hard
-
-"cssom@npm:~0.3.6":
-  version: 0.3.8
-  resolution: "cssom@npm:0.3.8"
-  checksum: 24beb3087c76c0d52dd458be9ee1fbc80ac771478a9baef35dd258cdeb527c68eb43204dd439692bb2b1ae5272fa5f2946d10946edab0d04f1078f85e06bc7f6
-  languageName: node
-  linkType: hard
-
-"cssstyle@npm:^2.3.0":
-  version: 2.3.0
-  resolution: "cssstyle@npm:2.3.0"
-  dependencies:
-    cssom: ~0.3.6
-  checksum: 5f05e6fd2e3df0b44695c2f08b9ef38b011862b274e320665176467c0725e44a53e341bc4959a41176e83b66064ab786262e7380fd1cabeae6efee0d255bb4e3
-  languageName: node
-  linkType: hard
-
-"cyclist@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "cyclist@npm:1.0.1"
-  checksum: 3cc2fdeb358599ca0ea96f5ecf2fc530ccab7ed1f8aa1a894aebfacd2009281bd7380cb9b30db02a18cdd00b3ed1d7ce81a3b11fe56e33a6a0fe4424dc592fbe
-  languageName: node
-  linkType: hard
-
-"d3-array@npm:1, d3-array@npm:^1.1.1, d3-array@npm:^1.2.0":
-  version: 1.2.4
-  resolution: "d3-array@npm:1.2.4"
-  checksum: d0be1fa7d72dbfac8a3bcffbb669d42bcb9128d8818d84d2b1df0c60bbe4c8e54a798be0457c55a219b399e2c2fabcbd581cbb130eb638b5436b0618d7e56000
-  languageName: node
-  linkType: hard
-
-"d3-axis@npm:1, d3-axis@npm:^1.0.8":
-  version: 1.0.12
-  resolution: "d3-axis@npm:1.0.12"
-  checksum: b1cf820fb6e95cc3371b340353b05272dba16ce6ad4fe9a0992d075ab48a08810f87f5e6c7cbb6c63fca1ee1e9b7c822307a1590187daa7627f45728a747c746
-  languageName: node
-  linkType: hard
-
-"d3-brush@npm:1":
-  version: 1.1.6
-  resolution: "d3-brush@npm:1.1.6"
-  dependencies:
-    d3-dispatch: 1
-    d3-drag: 1
-    d3-interpolate: 1
-    d3-selection: 1
-    d3-transition: 1
-  checksum: ffa23a5543699cc1199f45ac87d4e1293167c4bab0833657d77172d84d910448893569393290dba3689af1e5a1fc77503d94a2dec3976de8a7bc68ed0e32413a
-  languageName: node
-  linkType: hard
-
-"d3-chord@npm:1":
-  version: 1.0.6
-  resolution: "d3-chord@npm:1.0.6"
-  dependencies:
-    d3-array: 1
-    d3-path: 1
-  checksum: e4ca95ffff089f0eccf796d16a5574121e0ecbe658dcd9d5fa760af3573c3349264ce325c0adf1f32bcad67038d3938edd109712166cfb5b3bbe068e27c012e9
-  languageName: node
-  linkType: hard
-
-"d3-collection@npm:1, d3-collection@npm:^1.0.4":
-  version: 1.0.7
-  resolution: "d3-collection@npm:1.0.7"
-  checksum: 9c6b910a9da0efb021e294509f98263ca4f62d10b997bb30ccfb6edd582b703da36e176b968b5bac815fbb0f328e49643c38cf93b5edf8572a179ba55cf4a09d
-  languageName: node
-  linkType: hard
-
-"d3-color@npm:1":
-  version: 1.4.1
-  resolution: "d3-color@npm:1.4.1"
-  checksum: a214b61458b5fcb7ad1a84faed0e02918037bab6be37f2d437bf0e2915cbd854d89fbf93754f17b0781c89e39d46704633d05a2bfae77e6209f0f4b140f9894b
-  languageName: node
-  linkType: hard
-
-"d3-contour@npm:1":
-  version: 1.3.2
-  resolution: "d3-contour@npm:1.3.2"
-  dependencies:
-    d3-array: ^1.1.1
-  checksum: c18a099a7f4af2adf788e96d07bfc7236661a6e40c017ef8e172fe0142561f3722f71263075c565a17b72e6cd6a2a05de3868fcc5420eb77b00d3a0179a69a0d
-  languageName: node
-  linkType: hard
-
-"d3-dispatch@npm:1":
-  version: 1.0.6
-  resolution: "d3-dispatch@npm:1.0.6"
-  checksum: b4ecb016b6dda8b99aa4263b2d0a0c7b12e7dea93e4b0ce3013c94dca4d360d9ba00f5bdc15dc944cc4543af8e341067bd628f061f7b8deb642257e2ac90d06c
-  languageName: node
-  linkType: hard
-
-"d3-drag@npm:1":
-  version: 1.2.5
-  resolution: "d3-drag@npm:1.2.5"
-  dependencies:
-    d3-dispatch: 1
-    d3-selection: 1
-  checksum: 6e86e89aa8d511979eea1b5326709c05c2a3c2d43a93a82ed6b6f98528b2ab03b2f58f5e4f66582f2f1c0ae44f9c19f6f4f857249eb66aabc46e4942295fa0a7
-  languageName: node
-  linkType: hard
-
-"d3-dsv@npm:1":
-  version: 1.2.0
-  resolution: "d3-dsv@npm:1.2.0"
-  dependencies:
-    commander: 2
-    iconv-lite: 0.4
-    rw: 1
-  bin:
-    csv2json: bin/dsv2json
-    csv2tsv: bin/dsv2dsv
-    dsv2dsv: bin/dsv2dsv
-    dsv2json: bin/dsv2json
-    json2csv: bin/json2dsv
-    json2dsv: bin/json2dsv
-    json2tsv: bin/json2dsv
-    tsv2csv: bin/dsv2dsv
-    tsv2json: bin/dsv2json
-  checksum: 96c6e3d5ca1566624ca613b5941bc6fa916082cbe4b2b71cb6c5978c471db58c489b17206e3e31fbe30719dbd75e9c8ed8ab12a9d353cff90a35102690de7823
-  languageName: node
-  linkType: hard
-
-"d3-ease@npm:1, d3-ease@npm:^1.0.5":
-  version: 1.0.7
-  resolution: "d3-ease@npm:1.0.7"
-  checksum: 117811d51dfc4a126e8d23d249252df792fbbe30a93615e1d67158c482eff69b900e45a4cc92746fe65b1143287455406a89aae04eb4ca1ba5b1dc2a42af5b85
-  languageName: node
-  linkType: hard
-
-"d3-fetch@npm:1":
-  version: 1.2.0
-  resolution: "d3-fetch@npm:1.2.0"
-  dependencies:
-    d3-dsv: 1
-  checksum: 00f091945bff4afbd06e6ce9ad762f0e91b7aac912c1ae7fe0efdbcce3a997d4fa2a93c254a3ba9b3f53f2134d606b20fb13791adbf5c6ed5c0be329a775945f
-  languageName: node
-  linkType: hard
-
-"d3-force@npm:1":
-  version: 1.2.1
-  resolution: "d3-force@npm:1.2.1"
-  dependencies:
-    d3-collection: 1
-    d3-dispatch: 1
-    d3-quadtree: 1
-    d3-timer: 1
-  checksum: b73fe29d6c9a9c432ae65166d71238d14578a3a9537df095bebff87b7814161cd2822aff54a38d2400edb98b7f6d9221a810dcad7a53c6e8ddff0973f44ab3fa
-  languageName: node
-  linkType: hard
-
-"d3-format@npm:1":
-  version: 1.4.5
-  resolution: "d3-format@npm:1.4.5"
-  checksum: 1b8b2c0bca182173bccd290a43e8b635a83fc8cfe52ec878c7bdabb997d47daac11f2b175cebbe73f807f782ad655f542bdfe18180ca5eb3498a3a82da1e06ab
-  languageName: node
-  linkType: hard
-
-"d3-geo@npm:1":
-  version: 1.12.1
-  resolution: "d3-geo@npm:1.12.1"
-  dependencies:
-    d3-array: 1
-  checksum: 8ede498e5fce65c127403646f5cc6181a858a1e401e23e2856ce50ad27e6fdf8b49aeb88d2fad02696879d5825a45420ca1b5db9fa9c935ee413fe15b5bc37c4
-  languageName: node
-  linkType: hard
-
-"d3-hierarchy@npm:1":
-  version: 1.1.9
-  resolution: "d3-hierarchy@npm:1.1.9"
-  checksum: 5fd8761c302252cb9abe9ce2a0934fc97104dd0df8d1b5de6472532903416f40e13b4b58d03ce215a0b816d7129c4ed4503bd4fdbc00a130fdcf46a63d734a52
-  languageName: node
-  linkType: hard
-
-"d3-interpolate@npm:1":
-  version: 1.4.0
-  resolution: "d3-interpolate@npm:1.4.0"
-  dependencies:
-    d3-color: 1
-  checksum: d98988bd1e2f59d01f100d0a19315ad8f82ef022aa09a65aff76f747a44f9b52f2d64c6578b8f47e01f2b14a8f0ef88f5460d11173c0dd2d58238c217ac0ec03
-  languageName: node
-  linkType: hard
-
-"d3-path@npm:1":
-  version: 1.0.9
-  resolution: "d3-path@npm:1.0.9"
-  checksum: d4382573baf9509a143f40944baeff9fead136926aed6872f7ead5b3555d68925f8a37935841dd51f1d70b65a294fe35c065b0906fb6e42109295f6598fc16d0
-  languageName: node
-  linkType: hard
-
-"d3-polygon@npm:1":
-  version: 1.0.6
-  resolution: "d3-polygon@npm:1.0.6"
-  checksum: 4a9764c2064d15e9f4fc9018c975f127540f6e701c18442e2a2e9339e743726f40e017d5213982d983cac3c23802321c257f2a10e686c803ec5533c6ff42bb7a
-  languageName: node
-  linkType: hard
-
-"d3-quadtree@npm:1":
-  version: 1.0.7
-  resolution: "d3-quadtree@npm:1.0.7"
-  checksum: 32181f578cbd69eed6b240073fed7f977f8039a121a3b9fc58ea1eea0c3c14d1237ef48cb4f80abb833063f8b0e7b885ef6de734e7bcc4e5b37e53ec444830f8
-  languageName: node
-  linkType: hard
-
-"d3-random@npm:1":
-  version: 1.1.2
-  resolution: "d3-random@npm:1.1.2"
-  checksum: a27326319fa61d59b6ce8d5ce7547cc823dee1bc6dda35e9c233d709f43f76488c09353862463c9c5da99081482b0f7ea4177d78721b67bb677bb12354bffe42
-  languageName: node
-  linkType: hard
-
-"d3-scale-chromatic@npm:1":
-  version: 1.5.0
-  resolution: "d3-scale-chromatic@npm:1.5.0"
-  dependencies:
-    d3-color: 1
-    d3-interpolate: 1
-  checksum: 3bff7717f6e6b309b3347d48d6532e2295037a280bc5174f908ce5fc0e17a9470f6b202e49499b01a17a1f28cb76a61aae870a6c13c57195a362847f33747501
-  languageName: node
-  linkType: hard
-
-"d3-scale@npm:2":
-  version: 2.2.2
-  resolution: "d3-scale@npm:2.2.2"
-  dependencies:
-    d3-array: ^1.2.0
-    d3-collection: 1
-    d3-format: 1
-    d3-interpolate: 1
-    d3-time: 1
-    d3-time-format: 2
-  checksum: 42086d4b9db9f8492a99dbbdacf546983faef1bb6260fe875c0c1884f1ca9cf5fd233de3702c2f9e24145b1c5383945e929c8682d80fa57ab515ef2c4f2c61f6
-  languageName: node
-  linkType: hard
-
-"d3-scale@npm:^1.0.7":
-  version: 1.0.7
-  resolution: "d3-scale@npm:1.0.7"
-  dependencies:
-    d3-array: ^1.2.0
-    d3-collection: 1
-    d3-color: 1
-    d3-format: 1
-    d3-interpolate: 1
-    d3-time: 1
-    d3-time-format: 2
-  checksum: c889c510aa0380b23e3a595be6b143b7053351ab6fe212918aa1ae80353a9ccde81064c2afa95dbdcd936fbb0c69dd560de291cbbea80d068a4390a3f67596aa
-  languageName: node
-  linkType: hard
-
-"d3-selection-multi@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "d3-selection-multi@npm:1.0.1"
-  dependencies:
-    d3-selection: 1
-    d3-transition: 1
-  checksum: 16d94d1dc5fc9a86302c613ad4f4e008beaae92bb22d6d1cee066c02efa35ba9795f9544c7465e129467e34611417fc3a082d5d7cc6ab1fd7c8404b83378555e
-  languageName: node
-  linkType: hard
-
-"d3-selection@npm:1, d3-selection@npm:^1.1.0, d3-selection@npm:^1.3.0":
-  version: 1.4.2
-  resolution: "d3-selection@npm:1.4.2"
-  checksum: 2484b392259b087a98f546f2610e6a11c90f38dae6b6b20a3fc85171038fcab4c72e702788b1960a4fece88bed2e36f268096358b5b48d3c7f0d35cfbe305da6
-  languageName: node
-  linkType: hard
-
-"d3-shape@npm:1":
-  version: 1.3.7
-  resolution: "d3-shape@npm:1.3.7"
-  dependencies:
-    d3-path: 1
-  checksum: 46566a3ab64a25023653bf59d64e81e9e6c987e95be985d81c5cedabae5838bd55f4a201a6b69069ca862eb63594cd263cac9034afc2b0e5664dfe286c866129
-  languageName: node
-  linkType: hard
-
-"d3-time-format@npm:2, d3-time-format@npm:^2.1.1":
-  version: 2.3.0
-  resolution: "d3-time-format@npm:2.3.0"
-  dependencies:
-    d3-time: 1
-  checksum: 5445eaaf2b3b2095cdc1fa75dfd2f361a61c39b677dcc1c2ba4cb6bc0442953de0fbaaa397d7d7a9325ad99c63d869f162a713e150e826ff8af482615664cb3f
-  languageName: node
-  linkType: hard
-
-"d3-time@npm:1":
-  version: 1.1.0
-  resolution: "d3-time@npm:1.1.0"
-  checksum: 33fcfff94ff093dde2048c190ecca8b39fe0ec8b3c61e9fc39c5f6072ce5b86dd2b91823f086366995422bbbac7f74fd9abdb7efe4f292a73b1c6197c699cc78
-  languageName: node
-  linkType: hard
-
-"d3-timer@npm:1":
-  version: 1.0.10
-  resolution: "d3-timer@npm:1.0.10"
-  checksum: f7040953672deb2dfa03830ace80dbbcb212f80890218eba15dcca6f33f74102d943023ccc2a563295195cd8c63639bb2410ef1691c8fecff4a114fdf5c666f4
-  languageName: node
-  linkType: hard
-
-"d3-tip@npm:^0.9.1":
-  version: 0.9.1
-  resolution: "d3-tip@npm:0.9.1"
-  dependencies:
-    d3-collection: ^1.0.4
-    d3-selection: ^1.3.0
-  checksum: 876711ec01a049c6864dcdeab095d4c6d55554a862d426446ec03bf707a0d65dcc2e8cfee87bb0f922cdea33a350fb0be471afdeef5363accf7ac6cf61f02f31
-  languageName: node
-  linkType: hard
-
-"d3-transition@npm:1, d3-transition@npm:^1.2.0":
-  version: 1.3.2
-  resolution: "d3-transition@npm:1.3.2"
-  dependencies:
-    d3-color: 1
-    d3-dispatch: 1
-    d3-ease: 1
-    d3-interpolate: 1
-    d3-selection: ^1.1.0
-    d3-timer: 1
-  checksum: 1b4a0cfa7aeb4033ab20e26a310488cfac989de44c6c2bf10e9f0808af915a33add6dca23fbafcefe8c08613fd0d6a933e48b4de24c0779163c2852a1c7c16f4
-  languageName: node
-  linkType: hard
-
-"d3-voronoi@npm:1":
-  version: 1.1.4
-  resolution: "d3-voronoi@npm:1.1.4"
-  checksum: d28a74bc62f2b936b0d3b51d5be8d2366afca4fd7026d7ee8f655600650bf0c985da38a8c3ae46bfa315b5f524f3ca1c5211437cf1c8c737cc1da681e015baee
-  languageName: node
-  linkType: hard
-
-"d3-zoom@npm:1":
-  version: 1.8.3
-  resolution: "d3-zoom@npm:1.8.3"
-  dependencies:
-    d3-dispatch: 1
-    d3-drag: 1
-    d3-interpolate: 1
-    d3-selection: 1
-    d3-transition: 1
-  checksum: de408e5dc6df1481ef6854a3d495f8e963dbf5b0de41bcbd35def0602abda55b3f2c1fa751c75c2f0a9bafd3b278f30795c27503fe609b3dbe06a0720d01d5be
-  languageName: node
-  linkType: hard
-
-"d3@npm:^5.0.0":
-  version: 5.16.0
-  resolution: "d3@npm:5.16.0"
-  dependencies:
-    d3-array: 1
-    d3-axis: 1
-    d3-brush: 1
-    d3-chord: 1
-    d3-collection: 1
-    d3-color: 1
-    d3-contour: 1
-    d3-dispatch: 1
-    d3-drag: 1
-    d3-dsv: 1
-    d3-ease: 1
-    d3-fetch: 1
-    d3-force: 1
-    d3-format: 1
-    d3-geo: 1
-    d3-hierarchy: 1
-    d3-interpolate: 1
-    d3-path: 1
-    d3-polygon: 1
-    d3-quadtree: 1
-    d3-random: 1
-    d3-scale: 2
-    d3-scale-chromatic: 1
-    d3-selection: 1
-    d3-shape: 1
-    d3-time: 1
-    d3-time-format: 2
-    d3-timer: 1
-    d3-transition: 1
-    d3-voronoi: 1
-    d3-zoom: 1
-  checksum: 1462789c421c3ea3930a18b91be6c02c7b976fa4d714200ee2a042c62cbfb349448c79f1ae3dbaf186f79edb734b7aa7b734ee6ad61d81ab4305e6663623ab8e
-  languageName: node
-  linkType: hard
-
-"dag-map@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "dag-map@npm:2.0.2"
-  checksum: c15b70127c32b5f674ce43d17ee2268d757777df88883468550b946fdd29cee59c3faff1ec6d3ce05a4cb220a708426ac33b2f0a3bb6654541e7295e2d3a654a
-  languageName: node
-  linkType: hard
-
-"dashdash@npm:^1.12.0":
-  version: 1.14.1
-  resolution: "dashdash@npm:1.14.1"
-  dependencies:
-    assert-plus: ^1.0.0
-  checksum: 3634c249570f7f34e3d34f866c93f866c5b417f0dd616275decae08147dcdf8fccfaa5947380ccfb0473998ea3a8057c0b4cd90c875740ee685d0624b2983598
-  languageName: node
-  linkType: hard
-
-"data-urls@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "data-urls@npm:2.0.0"
-  dependencies:
-    abab: ^2.0.3
-    whatwg-mimetype: ^2.3.0
-    whatwg-url: ^8.0.0
-  checksum: 97caf828aac25e25e04ba6869db0f99c75e6859bb5b424ada28d3e7841941ebf08ddff3c1b1bb4585986bd507a5d54c2a716853ea6cb98af877400e637393e71
-  languageName: node
-  linkType: hard
-
-"date-fns-tz@npm:^1.2.2":
-  version: 1.2.2
-  resolution: "date-fns-tz@npm:1.2.2"
-  peerDependencies:
-    date-fns: ">=2.0.0"
-  checksum: 90c5145499570736cd004cfb13f8a9bbc9de514ceb92224ccd6fd2e0d88e0d55ab1d4e279500653d2df7cca0002c88a1ce0768c8531cbf6063cce91a1e4e78d4
-  languageName: node
-  linkType: hard
-
-"date-fns@npm:^2.16.1":
-  version: 2.21.1
-  resolution: "date-fns@npm:2.21.1"
-  checksum: 4ff90f6ab6b9e92d4605530704303aa269f40a4a2fe3624628e2a0310b06bd36d8a18867c2ddf88844afa54bc71a33b5b93c97c927da8989e9d05d32471dbd75
-  languageName: node
-  linkType: hard
-
-"date-fns@npm:^2.28.0":
-  version: 2.28.0
-  resolution: "date-fns@npm:2.28.0"
-  checksum: a0516b2e4f99b8bffc6cc5193349f185f195398385bdcaf07f17c2c4a24473c99d933eb0018be4142a86a6d46cb0b06be6440ad874f15e795acbedd6fd727a1f
-  languageName: node
-  linkType: hard
-
-"date-time@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "date-time@npm:2.1.0"
-  dependencies:
-    time-zone: ^1.0.0
-  checksum: 3eefeb2954b8a5a8a01f7935ef4b53f948eeecd6105f652cbeafec384cf80924247797e51eb517af1e18b356d2c94561ac0a29a60d8ba56c88376bd5b5a08c3c
-  languageName: node
-  linkType: hard
-
-"debug@npm:2.6.9, debug@npm:^2.1.0, debug@npm:^2.1.1, debug@npm:^2.1.3, debug@npm:^2.2.0, debug@npm:^2.3.3, debug@npm:^2.6.8, debug@npm:^2.6.9":
-  version: 2.6.9
-  resolution: "debug@npm:2.6.9"
-  dependencies:
-    ms: 2.0.0
-  checksum: d2f51589ca66df60bf36e1fa6e4386b318c3f1e06772280eea5b1ae9fd3d05e9c2b7fd8a7d862457d00853c75b00451aa2d7459b924629ee385287a650f58fe6
-  languageName: node
-  linkType: hard
-
-"debug@npm:4, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4, debug@npm:~4.3.1, debug@npm:~4.3.2":
-  version: 4.3.4
-  resolution: "debug@npm:4.3.4"
-  dependencies:
-    ms: 2.1.2
-  peerDependenciesMeta:
-    supports-color:
-      optional: true
-  checksum: 3dbad3f94ea64f34431a9cbf0bafb61853eda57bff2880036153438f50fb5a84f27683ba0d8e5426bf41a8c6ff03879488120cf5b3a761e77953169c0600a708
-  languageName: node
-  linkType: hard
-
-"debug@npm:^3.0.1, debug@npm:^3.1.0, debug@npm:^3.1.1":
-  version: 3.2.7
-  resolution: "debug@npm:3.2.7"
-  dependencies:
-    ms: ^2.1.1
-  checksum: b3d8c5940799914d30314b7c3304a43305fd0715581a919dacb8b3176d024a782062368405b47491516d2091d6462d4d11f2f4974a405048094f8bfebfa3071c
-  languageName: node
-  linkType: hard
-
-"debug@npm:^4.0.0, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1":
-  version: 4.3.3
-  resolution: "debug@npm:4.3.3"
-  dependencies:
-    ms: 2.1.2
-  peerDependenciesMeta:
-    supports-color:
-      optional: true
-  checksum: 14472d56fe4a94dbcfaa6dbed2dd3849f1d72ba78104a1a328047bb564643ca49df0224c3a17fa63533fd11dd3d4c8636cd861191232a2c6735af00cc2d4de16
-  languageName: node
-  linkType: hard
-
-"debug@npm:^4.0.1, debug@npm:^4.2.0":
-  version: 4.3.1
-  resolution: "debug@npm:4.3.1"
-  dependencies:
-    ms: 2.1.2
-  peerDependenciesMeta:
-    supports-color:
-      optional: true
-  checksum: 2c3352e37d5c46b0d203317cd45ea0e26b2c99f2d9dfec8b128e6ceba90dfb65425f5331bf3020fe9929d7da8c16758e737f4f3bfc0fce6b8b3d503bae03298b
-  languageName: node
-  linkType: hard
-
-"decache@npm:^4.5.1":
-  version: 4.6.0
-  resolution: "decache@npm:4.6.0"
-  dependencies:
-    callsite: ^1.0.0
-  checksum: 65bd86440a84aeb7cf76a8dbd22d207e561eac621bc73500347a9a0802f14e72222fd794b4b778a419e3d736a01ec263124e1ba39db6778c3b86a42f487a279c
-  languageName: node
-  linkType: hard
-
-"decamelize@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "decamelize@npm:1.2.0"
-  checksum: ad8c51a7e7e0720c70ec2eeb1163b66da03e7616d7b98c9ef43cce2416395e84c1e9548dd94f5f6ffecfee9f8b94251fc57121a8b021f2ff2469b2bae247b8aa
-  languageName: node
-  linkType: hard
-
-"decimal.js@npm:^10.2.1":
-  version: 10.2.1
-  resolution: "decimal.js@npm:10.2.1"
-  checksum: d2421adf209422d520c8f1a4d1fceffc2ccd0c041aa179f8d18a315ebda6a7be918f2634ac850df299dccccae6a3567c5761301a1c3693461fdef3d1de23b000
-  languageName: node
-  linkType: hard
-
-"decode-uri-component@npm:^0.2.0":
-  version: 0.2.0
-  resolution: "decode-uri-component@npm:0.2.0"
-  checksum: f3749344ab9305ffcfe4bfe300e2dbb61fc6359e2b736812100a3b1b6db0a5668cba31a05e4b45d4d63dbf1a18dfa354cd3ca5bb3ededddabb8cd293f4404f94
-  languageName: node
-  linkType: hard
-
-"dedent@npm:^0.7.0":
-  version: 0.7.0
-  resolution: "dedent@npm:0.7.0"
-  checksum: 87de191050d9a40dd70cad01159a0bcf05ecb59750951242070b6abf9569088684880d00ba92a955b4058804f16eeaf91d604f283929b4f614d181cd7ae633d2
-  languageName: node
-  linkType: hard
-
-"deep-is@npm:^0.1.3, deep-is@npm:~0.1.3":
-  version: 0.1.3
-  resolution: "deep-is@npm:0.1.3"
-  checksum: c15b04c3848a89880c94e25b077c19b47d9a30dd99048e70e5f95d943e7b246bee1da0c1376b56b01bc045be2cae7d9b1c856e68e47e9805634327de7c6cb6d5
-  languageName: node
-  linkType: hard
-
-"deepmerge@npm:^4.0.0":
-  version: 4.2.2
-  resolution: "deepmerge@npm:4.2.2"
-  checksum: a8c43a1ed8d6d1ed2b5bf569fa4c8eb9f0924034baf75d5d406e47e157a451075c4db353efea7b6bcc56ec48116a8ce72fccf867b6e078e7c561904b5897530b
-  languageName: node
-  linkType: hard
-
-"defaults@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "defaults@npm:1.0.3"
-  dependencies:
-    clone: ^1.0.2
-  checksum: 96e2112da6553d376afd5265ea7cbdb2a3b45535965d71ab8bb1da10c8126d168fdd5268799625324b368356d21ba2a7b3d4ec50961f11a47b7feb9de3d4413e
-  languageName: node
-  linkType: hard
-
-"define-properties@npm:^1.1.3":
-  version: 1.1.3
-  resolution: "define-properties@npm:1.1.3"
-  dependencies:
-    object-keys: ^1.0.12
-  checksum: da80dba55d0cd76a5a7ab71ef6ea0ebcb7b941f803793e4e0257b384cb772038faa0c31659d244e82c4342edef841c1a1212580006a05a5068ee48223d787317
-  languageName: node
-  linkType: hard
-
-"define-property@npm:^0.2.5":
-  version: 0.2.5
-  resolution: "define-property@npm:0.2.5"
-  dependencies:
-    is-descriptor: ^0.1.0
-  checksum: 85af107072b04973b13f9e4128ab74ddfda48ec7ad2e54b193c0ffb57067c4ce5b7786a7b4ae1f24bd03e87c5d18766b094571810b314d7540f86d4354dbd394
-  languageName: node
-  linkType: hard
-
-"define-property@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "define-property@npm:1.0.0"
-  dependencies:
-    is-descriptor: ^1.0.0
-  checksum: 5fbed11dace44dd22914035ba9ae83ad06008532ca814d7936a53a09e897838acdad5b108dd0688cc8d2a7cf0681acbe00ee4136cf36743f680d10517379350a
-  languageName: node
-  linkType: hard
-
-"define-property@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "define-property@npm:2.0.2"
-  dependencies:
-    is-descriptor: ^1.0.2
-    isobject: ^3.0.1
-  checksum: 3217ed53fc9eed06ba8da6f4d33e28c68a82e2f2a8ab4d562c4920d8169a166fe7271453675e6c69301466f36a65d7f47edf0cf7f474b9aa52a5ead9c1b13c99
-  languageName: node
-  linkType: hard
-
-"delayed-stream@npm:~1.0.0":
-  version: 1.0.0
-  resolution: "delayed-stream@npm:1.0.0"
-  checksum: 46fe6e83e2cb1d85ba50bd52803c68be9bd953282fa7096f51fc29edd5d67ff84ff753c51966061e5ba7cb5e47ef6d36a91924eddb7f3f3483b1c560f77a0020
-  languageName: node
-  linkType: hard
-
-"delegate@npm:^3.1.2":
-  version: 3.2.0
-  resolution: "delegate@npm:3.2.0"
-  checksum: d943058fe05897228b158cbd1bab05164df28c8f54127873231d6b03b0a5acc1b3ee1f98ac70ccc9b79cd84aa47118a7de111fee2923753491583905069da27d
-  languageName: node
-  linkType: hard
-
-"delegates@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "delegates@npm:1.0.0"
-  checksum: a51744d9b53c164ba9c0492471a1a2ffa0b6727451bdc89e31627fdf4adda9d51277cfcbfb20f0a6f08ccb3c436f341df3e92631a3440226d93a8971724771fd
-  languageName: node
-  linkType: hard
-
-"depd@npm:2.0.0, depd@npm:^2.0.0, depd@npm:~2.0.0":
-  version: 2.0.0
-  resolution: "depd@npm:2.0.0"
-  checksum: abbe19c768c97ee2eed6282d8ce3031126662252c58d711f646921c9623f9052e3e1906443066beec1095832f534e57c523b7333f8e7e0d93051ab6baef5ab3a
-  languageName: node
-  linkType: hard
-
-"depd@npm:~1.1.2":
-  version: 1.1.2
-  resolution: "depd@npm:1.1.2"
-  checksum: 6b406620d269619852885ce15965272b829df6f409724415e0002c8632ab6a8c0a08ec1f0bd2add05dc7bd7507606f7e2cc034fa24224ab829580040b835ecd9
-  languageName: node
-  linkType: hard
-
-"des.js@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "des.js@npm:1.0.1"
-  dependencies:
-    inherits: ^2.0.1
-    minimalistic-assert: ^1.0.0
-  checksum: 1ec2eedd7ed6bd61dd5e0519fd4c96124e93bb22de8a9d211b02d63e5dd152824853d919bb2090f965cc0e3eb9c515950a9836b332020d810f9c71feb0fd7df4
-  languageName: node
-  linkType: hard
-
-"destroy@npm:1.2.0":
-  version: 1.2.0
-  resolution: "destroy@npm:1.2.0"
-  checksum: 0acb300b7478a08b92d810ab229d5afe0d2f4399272045ab22affa0d99dbaf12637659411530a6fcd597a9bdac718fc94373a61a95b4651bbc7b83684a565e38
-  languageName: node
-  linkType: hard
-
-"destroy@npm:~1.0.4":
-  version: 1.0.4
-  resolution: "destroy@npm:1.0.4"
-  checksum: da9ab4961dc61677c709da0c25ef01733042614453924d65636a7db37308fef8a24cd1e07172e61173d471ca175371295fbc984b0af5b2b4ff47cd57bd784c03
-  languageName: node
-  linkType: hard
-
-"detect-file@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "detect-file@npm:1.0.0"
-  checksum: 1861e4146128622e847abe0e1ed80fef01e78532665858a792267adf89032b7a9c698436137707fcc6f02956c2a6a0052d6a0cef5be3d4b76b1ff0da88e2158a
-  languageName: node
-  linkType: hard
-
-"detect-indent@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "detect-indent@npm:4.0.0"
-  dependencies:
-    repeating: ^2.0.0
-  checksum: 328f273915c1610899bc7d4784ce874413d0a698346364cd3ee5d79afba1c5cf4dbc97b85a801e20f4d903c0598bd5096af32b800dfb8696b81464ccb3dfda2c
-  languageName: node
-  linkType: hard
-
-"detect-indent@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "detect-indent@npm:6.0.0"
-  checksum: 0c38f362016e2d07af1c65b1ecd6ad8a91f06bfdd11383887c867a495ad286d04be2ab44027ac42444704d523982013115bd748c1541df7c9396ad76b22aaf5d
-  languageName: node
-  linkType: hard
-
-"detect-newline@npm:3.1.0":
-  version: 3.1.0
-  resolution: "detect-newline@npm:3.1.0"
-  checksum: ae6cd429c41ad01b164c59ea36f264a2c479598e61cba7c99da24175a7ab80ddf066420f2bec9a1c57a6bead411b4655ff15ad7d281c000a89791f48cbe939e7
-  languageName: node
-  linkType: hard
-
-"dialog-polyfill@npm:^0.5.6":
-  version: 0.5.6
-  resolution: "dialog-polyfill@npm:0.5.6"
-  checksum: dde8d4b6a62b63b710e0d0d70b615d92ff08f3cb2b521e1f99b17e8220d9d55d0fdf9fc17fbe77b0ff1be817094e14b60c4c4bacd5456fba427ede48d2d90230
-  languageName: node
-  linkType: hard
-
-"diff-match-patch@npm:^1.0.0":
-  version: 1.0.5
-  resolution: "diff-match-patch@npm:1.0.5"
-  checksum: 841522d01b09cccbc4e4402cf61514a81b906349a7d97b67222390f2d35cf5df277cb23959eeed212d5e46afb5629cebab41b87918672c5a05c11c73688630e3
-  languageName: node
-  linkType: hard
-
-"diff@npm:^3.5.0":
-  version: 3.5.0
-  resolution: "diff@npm:3.5.0"
-  checksum: 00842950a6551e26ce495bdbce11047e31667deea546527902661f25cc2e73358967ebc78cf86b1a9736ec3e14286433225f9970678155753a6291c3bca5227b
-  languageName: node
-  linkType: hard
-
-"diff@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "diff@npm:5.0.0"
-  checksum: f19fe29284b633afdb2725c2a8bb7d25761ea54d321d8e67987ac851c5294be4afeab532bd84531e02583a3fe7f4014aa314a3eda84f5590e7a9e6b371ef3b46
-  languageName: node
-  linkType: hard
-
-"diffie-hellman@npm:^5.0.0":
-  version: 5.0.3
-  resolution: "diffie-hellman@npm:5.0.3"
-  dependencies:
-    bn.js: ^4.1.0
-    miller-rabin: ^4.0.0
-    randombytes: ^2.0.0
-  checksum: 0e620f322170c41076e70181dd1c24e23b08b47dbb92a22a644f3b89b6d3834b0f8ee19e37916164e5eb1ee26d2aa836d6129f92723995267250a0b541811065
-  languageName: node
-  linkType: hard
-
-"dir-glob@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "dir-glob@npm:3.0.1"
-  dependencies:
-    path-type: ^4.0.0
-  checksum: fa05e18324510d7283f55862f3161c6759a3f2f8dbce491a2fc14c8324c498286c54282c1f0e933cb930da8419b30679389499b919122952a4f8592362ef4615
-  languageName: node
-  linkType: hard
-
-"dlv@npm:^1.1.0":
-  version: 1.1.3
-  resolution: "dlv@npm:1.1.3"
-  checksum: d7381bca22ed11933a1ccf376db7a94bee2c57aa61e490f680124fa2d1cd27e94eba641d9f45be57caab4f9a6579de0983466f620a2cd6230d7ec93312105ae7
-  languageName: node
-  linkType: hard
-
-"doctoc@npm:^2.2.0":
-  version: 2.2.0
-  resolution: "doctoc@npm:2.2.0"
-  dependencies:
-    "@textlint/markdown-to-ast": ^12.1.1
-    anchor-markdown-header: ^0.5.7
-    htmlparser2: ^7.2.0
-    minimist: ^1.2.6
-    underscore: ^1.13.2
-    update-section: ^0.3.3
-  bin:
-    doctoc: doctoc.js
-  checksum: 78973a1275f056c044263d60546cf518beb15b79bd95a93dc5875d6dd46fa0873568661d74830b68e908c8a4465e9fd602eb49468e4d686e43ce4471d34012c3
-  languageName: node
-  linkType: hard
-
-"doctrine@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "doctrine@npm:3.0.0"
-  dependencies:
-    esutils: ^2.0.2
-  checksum: fd7673ca77fe26cd5cba38d816bc72d641f500f1f9b25b83e8ce28827fe2da7ad583a8da26ab6af85f834138cf8dae9f69b0cd6ab925f52ddab1754db44d99ce
-  languageName: node
-  linkType: hard
-
-"dom-serializer@npm:0":
-  version: 0.2.2
-  resolution: "dom-serializer@npm:0.2.2"
-  dependencies:
-    domelementtype: ^2.0.1
-    entities: ^2.0.0
-  checksum: 376344893e4feccab649a14ca1a46473e9961f40fe62479ea692d4fee4d9df1c00ca8654811a79c1ca7b020096987e1ca4fb4d7f8bae32c1db800a680a0e5d5e
-  languageName: node
-  linkType: hard
-
-"dom-serializer@npm:^1.0.1":
-  version: 1.4.1
-  resolution: "dom-serializer@npm:1.4.1"
-  dependencies:
-    domelementtype: ^2.0.1
-    domhandler: ^4.2.0
-    entities: ^2.0.0
-  checksum: fbb0b01f87a8a2d18e6e5a388ad0f7ec4a5c05c06d219377da1abc7bb0f674d804f4a8a94e3f71ff15f6cb7dcfc75704a54b261db672b9b3ab03da6b758b0b22
-  languageName: node
-  linkType: hard
-
-"dom-serializer@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "dom-serializer@npm:2.0.0"
-  dependencies:
-    domelementtype: ^2.3.0
-    domhandler: ^5.0.2
-    entities: ^4.2.0
-  checksum: cd1810544fd8cdfbd51fa2c0c1128ec3a13ba92f14e61b7650b5de421b88205fd2e3f0cc6ace82f13334114addb90ed1c2f23074a51770a8e9c1273acbc7f3e6
-  languageName: node
-  linkType: hard
-
-"domain-browser@npm:^1.1.1":
-  version: 1.2.0
-  resolution: "domain-browser@npm:1.2.0"
-  checksum: 8f1235c7f49326fb762f4675795246a6295e7dd566b4697abec24afdba2460daa7dfbd1a73d31efbf5606b3b7deadb06ce47cf06f0a476e706153d62a4ff2b90
-  languageName: node
-  linkType: hard
-
-"domelementtype@npm:1":
-  version: 1.3.1
-  resolution: "domelementtype@npm:1.3.1"
-  checksum: 7893da40218ae2106ec6ffc146b17f203487a52f5228b032ea7aa470e41dfe03e1bd762d0ee0139e792195efda765434b04b43cddcf63207b098f6ae44b36ad6
-  languageName: node
-  linkType: hard
-
-"domelementtype@npm:^2.0.1, domelementtype@npm:^2.2.0, domelementtype@npm:^2.3.0":
-  version: 2.3.0
-  resolution: "domelementtype@npm:2.3.0"
-  checksum: ee837a318ff702622f383409d1f5b25dd1024b692ef64d3096ff702e26339f8e345820f29a68bcdcea8cfee3531776b3382651232fbeae95612d6f0a75efb4f6
-  languageName: node
-  linkType: hard
-
-"domexception@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "domexception@npm:2.0.1"
-  dependencies:
-    webidl-conversions: ^5.0.0
-  checksum: d638e9cb05c52999f1b2eb87c374b03311ea5b1d69c2f875bc92da73e17db60c12142b45c950228642ff7f845c536b65305483350d080df59003a653da80b691
-  languageName: node
-  linkType: hard
-
-"domhandler@npm:^4.2.0, domhandler@npm:^4.2.2":
-  version: 4.3.1
-  resolution: "domhandler@npm:4.3.1"
-  dependencies:
-    domelementtype: ^2.2.0
-  checksum: 4c665ceed016e1911bf7d1dadc09dc888090b64dee7851cccd2fcf5442747ec39c647bb1cb8c8919f8bbdd0f0c625a6bafeeed4b2d656bbecdbae893f43ffaaa
-  languageName: node
-  linkType: hard
-
-"domhandler@npm:^5.0.1, domhandler@npm:^5.0.2, domhandler@npm:^5.0.3":
-  version: 5.0.3
-  resolution: "domhandler@npm:5.0.3"
-  dependencies:
-    domelementtype: ^2.3.0
-  checksum: 0f58f4a6af63e6f3a4320aa446d28b5790a009018707bce2859dcb1d21144c7876482b5188395a188dfa974238c019e0a1e610d2fc269a12b2c192ea2b0b131c
-  languageName: node
-  linkType: hard
-
-"dompurify@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "dompurify@npm:3.0.2"
-  checksum: 768c3bb2f139ce1e1a53faf81aae6abe03e24d0b043e2fda0b70e91ef15bb1df854a35e82d8c519adfe5b81c24bfdad3e0b1085534bfbf427137cb742406c47f
-  languageName: node
-  linkType: hard
-
-"domutils@npm:^1.7.0":
-  version: 1.7.0
-  resolution: "domutils@npm:1.7.0"
-  dependencies:
-    dom-serializer: 0
-    domelementtype: 1
-  checksum: f60a725b1f73c1ae82f4894b691601ecc6ecb68320d87923ac3633137627c7865725af813ae5d188ad3954283853bcf46779eb50304ec5d5354044569fcefd2b
-  languageName: node
-  linkType: hard
-
-"domutils@npm:^2.8.0":
-  version: 2.8.0
-  resolution: "domutils@npm:2.8.0"
-  dependencies:
-    dom-serializer: ^1.0.1
-    domelementtype: ^2.2.0
-    domhandler: ^4.2.0
-  checksum: abf7434315283e9aadc2a24bac0e00eab07ae4313b40cc239f89d84d7315ebdfd2fb1b5bf750a96bc1b4403d7237c7b2ebf60459be394d625ead4ca89b934391
-  languageName: node
-  linkType: hard
-
-"domutils@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "domutils@npm:3.0.1"
-  dependencies:
-    dom-serializer: ^2.0.0
-    domelementtype: ^2.3.0
-    domhandler: ^5.0.1
-  checksum: 23aa7a840572d395220e173cb6263b0d028596e3950100520870a125af33ff819e6f609e1606d6f7d73bd9e7feb03bb404286e57a39063b5384c62b724d987b3
-  languageName: node
-  linkType: hard
-
-"dot-case@npm:^3.0.4":
-  version: 3.0.4
-  resolution: "dot-case@npm:3.0.4"
-  dependencies:
-    no-case: ^3.0.4
-    tslib: ^2.0.3
-  checksum: a65e3519414856df0228b9f645332f974f2bf5433370f544a681122eab59e66038fc3349b4be1cdc47152779dac71a5864f1ccda2f745e767c46e9c6543b1169
-  languageName: node
-  linkType: hard
-
-"dot-prop@npm:^5.2.0":
-  version: 5.3.0
-  resolution: "dot-prop@npm:5.3.0"
-  dependencies:
-    is-obj: ^2.0.0
-  checksum: d5775790093c234ef4bfd5fbe40884ff7e6c87573e5339432870616331189f7f5d86575c5b5af2dcf0f61172990f4f734d07844b1f23482fff09e3c4bead05ea
-  languageName: node
-  linkType: hard
-
-"duplexify@npm:^3.4.2, duplexify@npm:^3.6.0":
-  version: 3.7.1
-  resolution: "duplexify@npm:3.7.1"
-  dependencies:
-    end-of-stream: ^1.0.0
-    inherits: ^2.0.1
-    readable-stream: ^2.0.0
-    stream-shift: ^1.0.0
-  checksum: 3c2ed2223d956a5da713dae12ba8295acb61d9acd966ccbba938090d04f4574ca4dca75cca089b5077c2d7e66101f32e6ea9b36a78ca213eff574e7a8b8accf2
-  languageName: node
-  linkType: hard
-
-"ecc-jsbn@npm:~0.1.1":
-  version: 0.1.2
-  resolution: "ecc-jsbn@npm:0.1.2"
-  dependencies:
-    jsbn: ~0.1.0
-    safer-buffer: ^2.1.0
-  checksum: 22fef4b6203e5f31d425f5b711eb389e4c6c2723402e389af394f8411b76a488fa414d309d866e2b577ce3e8462d344205545c88a8143cc21752a5172818888a
-  languageName: node
-  linkType: hard
-
-"editions@npm:^1.1.1":
-  version: 1.3.4
-  resolution: "editions@npm:1.3.4"
-  checksum: 8c2041459816db2cacac53598a9bca7928a7de2c5eb0dae532c2273a60ef83acbd807ce33ff1cd5cf7aa547737c55f7f4b52436752df0f13f5936efa329c13f7
-  languageName: node
-  linkType: hard
-
-"editions@npm:^2.2.0":
-  version: 2.3.1
-  resolution: "editions@npm:2.3.1"
-  dependencies:
-    errlop: ^2.0.0
-    semver: ^6.3.0
-  checksum: 0b08a2b50c30e7b046a3096ee66ea326158a147daac5f8c134b4bdfe4d2fe02f9916c8b92d8e86887f2379c3528df2150cc9eb3d5bc25c442b4b380d6d7a754e
-  languageName: node
-  linkType: hard
-
-"ee-first@npm:1.1.1":
-  version: 1.1.1
-  resolution: "ee-first@npm:1.1.1"
-  checksum: 1b4cac778d64ce3b582a7e26b218afe07e207a0f9bfe13cc7395a6d307849cfe361e65033c3251e00c27dd060cab43014c2d6b2647676135e18b77d2d05b3f4f
-  languageName: node
-  linkType: hard
-
-"electron-to-chromium@npm:^1.3.30":
-  version: 1.3.725
-  resolution: "electron-to-chromium@npm:1.3.725"
-  checksum: 90801f5cc30f76495412ce86cef141cd22924ec75c88c276eaa42435d09370d9df5d8127060dae4fdb96a3ea0b0a726ee228788affb997e7f4172f4e54001c5d
-  languageName: node
-  linkType: hard
-
-"electron-to-chromium@npm:^1.3.47, electron-to-chromium@npm:^1.3.723":
-  version: 1.3.906
-  resolution: "electron-to-chromium@npm:1.3.906"
-  checksum: 087330249a424066cbdb882890164b3cb944f0ea293838a1445274428549e5b6c5edd25c353fed733d20d055ba276d4e3b069554b5e06ebfe511134c4f68cf87
-  languageName: node
-  linkType: hard
-
-"electron-to-chromium@npm:^1.3.857":
-  version: 1.3.866
-  resolution: "electron-to-chromium@npm:1.3.866"
-  checksum: 03b4cf46baf631d9022d7d2f1c058899152941a7d3b3e9df02c2fc48d2eb52362637337b3e2e793a533fa30ed9ec844b4a1d56a55c421d64e39cf8080b980d52
-  languageName: node
-  linkType: hard
-
-"electron-to-chromium@npm:^1.3.896":
-  version: 1.4.10
-  resolution: "electron-to-chromium@npm:1.4.10"
-  checksum: 00b9ca97267fc3c865f9888a490e2c1bc2eef80805d8b4337661901d498bf4c771a237f5f7beec294dc847f9096b3a58910da431e4e8cc8dc08871d4630a5860
-  languageName: node
-  linkType: hard
-
-"electron-to-chromium@npm:^1.4.147":
-  version: 1.4.148
-  resolution: "electron-to-chromium@npm:1.4.148"
-  checksum: 3730c2eb46c7d0602b418a5a80e8d37e673c61d7cdc6a431a0d23bf08b6db6375c5f842d9e4285549ef2c5bad9189da34f05f28993fdb43920df5befc72db87a
-  languageName: node
-  linkType: hard
-
-"electron-to-chromium@npm:^1.4.84":
-  version: 1.4.99
-  resolution: "electron-to-chromium@npm:1.4.99"
-  checksum: 7efb73368db78b55bc1c9563364f69f2715f085ac2a0e9b8dab0f319025fbd6464e0eaf47eb5e447f1d4e76f9de919bec5e338bf87443ad8dcb34b2829fc82b7
-  languageName: node
-  linkType: hard
-
-"elliptic@npm:^6.5.3":
-  version: 6.5.4
-  resolution: "elliptic@npm:6.5.4"
-  dependencies:
-    bn.js: ^4.11.9
-    brorand: ^1.1.0
-    hash.js: ^1.0.0
-    hmac-drbg: ^1.0.1
-    inherits: ^2.0.4
-    minimalistic-assert: ^1.0.1
-    minimalistic-crypto-utils: ^1.0.1
-  checksum: d56d21fd04e97869f7ffcc92e18903b9f67f2d4637a23c860492fbbff5a3155fd9ca0184ce0c865dd6eb2487d234ce9551335c021c376cd2d3b7cb749c7d10f4
-  languageName: node
-  linkType: hard
-
-"ember-a11y-refocus@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "ember-a11y-refocus@npm:3.0.2"
-  dependencies:
-    ember-cli-babel: ^7.26.11
-    ember-cli-htmlbars: ^6.0.1
-  checksum: c192e80514adad4928207f4025975f225fde0b135a9156f257999dc49a8eb16b84d6f7a8c489b33a87a17c5b6325e48fc152055e6d4ecee45cdddfd2cd4d2c0a
-  languageName: node
-  linkType: hard
-
-"ember-asset-loader@npm:^0.6.1":
-  version: 0.6.1
-  resolution: "ember-asset-loader@npm:0.6.1"
-  dependencies:
-    broccoli-caching-writer: ^3.0.3
-    broccoli-funnel: ^2.0.2
-    broccoli-merge-trees: ^3.0.2
-    ember-cli-babel: ^7.5.0
-    fs-extra: ^7.0.1
-    object-assign: ^4.1.0
-    walk-sync: ^1.1.3
-  checksum: 1854fb6499e52f59752e8636c21c92105beb2d77b332c30ce310b5f9d51c9239e79f77959fd61aeea53d04c02334cd1d00806ee2d7c3bd27b37a8e6fcff667fc
-  languageName: node
-  linkType: hard
-
-"ember-assign-helper@npm:^0.4.0":
-  version: 0.4.0
-  resolution: "ember-assign-helper@npm:0.4.0"
-  dependencies:
-    ember-cli-babel: ^7.26.0
-    ember-cli-htmlbars: ^6.0.0
-  checksum: 32bbec384c8f78c919d7a6e24cc36c7a48bd0244d3b38c4aa8a17fc1f1b68822f4805a838fec7e1fe35dfcd2832eb9afa146606f625e737ea258127254a5b9d4
-  languageName: node
-  linkType: hard
-
-"ember-auto-import@npm:2.4.2, ember-auto-import@npm:^2.4.0, ember-auto-import@npm:^2.4.1, ember-auto-import@npm:^2.4.2":
-  version: 2.4.2
-  resolution: "ember-auto-import@npm:2.4.2"
-  dependencies:
-    "@babel/core": ^7.16.7
-    "@babel/plugin-proposal-class-properties": ^7.16.7
-    "@babel/plugin-proposal-decorators": ^7.16.7
-    "@babel/preset-env": ^7.16.7
-    "@embroider/macros": ^1.0.0
-    "@embroider/shared-internals": ^1.0.0
-    babel-loader: ^8.0.6
-    babel-plugin-ember-modules-api-polyfill: ^3.5.0
-    babel-plugin-htmlbars-inline-precompile: ^5.2.1
-    babel-plugin-syntax-dynamic-import: ^6.18.0
-    broccoli-debug: ^0.6.4
-    broccoli-funnel: ^3.0.8
-    broccoli-merge-trees: ^4.2.0
-    broccoli-plugin: ^4.0.0
-    broccoli-source: ^3.0.0
-    css-loader: ^5.2.0
-    debug: ^4.3.1
-    fs-extra: ^10.0.0
-    fs-tree-diff: ^2.0.0
-    handlebars: ^4.3.1
-    js-string-escape: ^1.0.1
-    lodash: ^4.17.19
-    mini-css-extract-plugin: ^2.5.2
-    parse5: ^6.0.1
-    resolve: ^1.20.0
-    resolve-package-path: ^4.0.3
-    semver: ^7.3.4
-    style-loader: ^2.0.0
-    typescript-memoize: ^1.0.0-alpha.3
-    walk-sync: ^3.0.0
-  checksum: f7c4e4bab62b124c03955b8b382d6bf9c170c1ad5605bb019cbb1baf63065b482b8767a2e4922682fbc54c701f0296601e7ed50965bd4c741dab6cfff43c6de5
-  languageName: node
-  linkType: hard
-
-"ember-auto-import@npm:^1.11.3":
-  version: 1.12.0
-  resolution: "ember-auto-import@npm:1.12.0"
-  dependencies:
-    "@babel/core": ^7.1.6
-    "@babel/preset-env": ^7.10.2
-    "@babel/traverse": ^7.1.6
-    "@babel/types": ^7.1.6
-    "@embroider/core": ^0.33.0
-    babel-core: ^6.26.3
-    babel-loader: ^8.0.6
-    babel-plugin-syntax-dynamic-import: ^6.18.0
-    babylon: ^6.18.0
-    broccoli-debug: ^0.6.4
-    broccoli-node-api: ^1.7.0
-    broccoli-plugin: ^4.0.0
-    broccoli-source: ^3.0.0
-    debug: ^3.1.0
-    ember-cli-babel: ^7.0.0
-    enhanced-resolve: ^4.0.0
-    fs-extra: ^6.0.1
-    fs-tree-diff: ^2.0.0
-    handlebars: ^4.3.1
-    js-string-escape: ^1.0.1
-    lodash: ^4.17.19
-    mkdirp: ^0.5.1
-    resolve-package-path: ^3.1.0
-    rimraf: ^2.6.2
-    semver: ^7.3.4
-    symlink-or-copy: ^1.2.0
-    typescript-memoize: ^1.0.0-alpha.3
-    walk-sync: ^0.3.3
-    webpack: ^4.43.0
-  checksum: 689de6088854855c7eb50d882a81fc9ee3efd1671ddd8aea35a7d6ef0db8e08d211d156b63390da4fd98518d32ad2a3f9ed9be6f25810311a9011604f10b3c85
-  languageName: node
-  linkType: hard
-
-"ember-auto-import@npm:^1.12.0":
-  version: 1.12.1
-  resolution: "ember-auto-import@npm:1.12.1"
-  dependencies:
-    "@babel/core": ^7.1.6
-    "@babel/preset-env": ^7.10.2
-    "@babel/traverse": ^7.1.6
-    "@babel/types": ^7.1.6
-    "@embroider/shared-internals": ^1.0.0
-    babel-core: ^6.26.3
-    babel-loader: ^8.0.6
-    babel-plugin-syntax-dynamic-import: ^6.18.0
-    babylon: ^6.18.0
-    broccoli-debug: ^0.6.4
-    broccoli-node-api: ^1.7.0
-    broccoli-plugin: ^4.0.0
-    broccoli-source: ^3.0.0
-    debug: ^3.1.0
-    ember-cli-babel: ^7.0.0
-    enhanced-resolve: ^4.0.0
-    fs-extra: ^6.0.1
-    fs-tree-diff: ^2.0.0
-    handlebars: ^4.3.1
-    js-string-escape: ^1.0.1
-    lodash: ^4.17.19
-    mkdirp: ^0.5.1
-    resolve-package-path: ^3.1.0
-    rimraf: ^2.6.2
-    semver: ^7.3.4
-    symlink-or-copy: ^1.2.0
-    typescript-memoize: ^1.0.0-alpha.3
-    walk-sync: ^0.3.3
-    webpack: ^4.43.0
-  checksum: 8230c3ff6fd222eee7179e0e5c2ea0268702b66400a4b51de4dbc608bdfa8d2236125999b7bfa25dc36acb51d9eb93bcc45aea5783bdf95ad74f7e898014013d
-  languageName: node
-  linkType: hard
-
-"ember-auto-import@npm:^1.2.19":
-  version: 1.11.3
-  resolution: "ember-auto-import@npm:1.11.3"
-  dependencies:
-    "@babel/core": ^7.1.6
-    "@babel/preset-env": ^7.10.2
-    "@babel/traverse": ^7.1.6
-    "@babel/types": ^7.1.6
-    "@embroider/core": ^0.33.0
-    babel-core: ^6.26.3
-    babel-loader: ^8.0.6
-    babel-plugin-syntax-dynamic-import: ^6.18.0
-    babylon: ^6.18.0
-    broccoli-debug: ^0.6.4
-    broccoli-node-api: ^1.7.0
-    broccoli-plugin: ^4.0.0
-    broccoli-source: ^3.0.0
-    debug: ^3.1.0
-    ember-cli-babel: ^7.0.0
-    enhanced-resolve: ^4.0.0
-    fs-extra: ^6.0.1
-    fs-tree-diff: ^2.0.0
-    handlebars: ^4.3.1
-    js-string-escape: ^1.0.1
-    lodash: ^4.17.19
-    mkdirp: ^0.5.1
-    resolve-package-path: ^3.1.0
-    rimraf: ^2.6.2
-    semver: ^7.3.4
-    symlink-or-copy: ^1.2.0
-    typescript-memoize: ^1.0.0-alpha.3
-    walk-sync: ^0.3.3
-    webpack: ^4.43.0
-  checksum: 2ac4e08696f46b4e9e1ada49c068d5ca7a338e063ea47e332f81e72613ae287479504b1246e97b31bed7ca6a84ec7928d250e0de6f5bc7c6412a7e537532684b
-  languageName: node
-  linkType: hard
-
-"ember-auto-import@npm:^2.6.0":
-  version: 2.6.1
-  resolution: "ember-auto-import@npm:2.6.1"
-  dependencies:
-    "@babel/core": ^7.16.7
-    "@babel/plugin-proposal-class-properties": ^7.16.7
-    "@babel/plugin-proposal-decorators": ^7.16.7
-    "@babel/preset-env": ^7.16.7
-    "@embroider/macros": ^1.0.0
-    "@embroider/shared-internals": ^2.0.0
-    babel-loader: ^8.0.6
-    babel-plugin-ember-modules-api-polyfill: ^3.5.0
-    babel-plugin-htmlbars-inline-precompile: ^5.2.1
-    babel-plugin-syntax-dynamic-import: ^6.18.0
-    broccoli-debug: ^0.6.4
-    broccoli-funnel: ^3.0.8
-    broccoli-merge-trees: ^4.2.0
-    broccoli-plugin: ^4.0.0
-    broccoli-source: ^3.0.0
-    css-loader: ^5.2.0
-    debug: ^4.3.1
-    fs-extra: ^10.0.0
-    fs-tree-diff: ^2.0.0
-    handlebars: ^4.3.1
-    js-string-escape: ^1.0.1
-    lodash: ^4.17.19
-    mini-css-extract-plugin: ^2.5.2
-    parse5: ^6.0.1
-    resolve: ^1.20.0
-    resolve-package-path: ^4.0.3
-    semver: ^7.3.4
-    style-loader: ^2.0.0
-    typescript-memoize: ^1.0.0-alpha.3
-    walk-sync: ^3.0.0
-  checksum: 46c55add57a58aecd772c8a7f038afd458e362011301c99766d9a11e83121d96b5170fe48af8e12460b64aaebf4242f0a6f8d21ff152925b62f8e595f034c1b1
-  languageName: node
-  linkType: hard
-
-"ember-basic-dropdown@npm:6.0.1":
-  version: 6.0.1
-  resolution: "ember-basic-dropdown@npm:6.0.1"
-  dependencies:
-    "@ember/render-modifiers": ^2.0.4
-    "@embroider/macros": ^1.2.0
-    "@embroider/util": ^1.2.0
-    "@glimmer/component": ^1.0.4
-    "@glimmer/tracking": ^1.0.4
-    ember-cli-babel: ^7.26.11
-    ember-cli-htmlbars: ^6.0.1
-    ember-cli-typescript: ^4.2.1
-    ember-element-helper: ^0.6.0
-    ember-get-config: ^1.0.2 || ^2.0.0
-    ember-maybe-in-element: ^2.0.3
-    ember-modifier: ^3.2.7
-    ember-style-modifier: ^0.8.0
-    ember-truth-helpers: ^2.1.0 || ^3.0.0
-  checksum: d6f00f202140d09a0c3d62d9104c5f63eb6b0f7228a17a3f2f9e37da66c82d6ba01503261ed886190ebb0afc3d737f6bc6ad609115528176bd81f72e5930508f
-  languageName: node
-  linkType: hard
-
-"ember-cache-primitive-polyfill@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "ember-cache-primitive-polyfill@npm:1.0.1"
-  dependencies:
-    ember-cli-babel: ^7.22.1
-    ember-cli-version-checker: ^5.1.1
-    ember-compatibility-helpers: ^1.2.1
-    silent-error: ^1.1.1
-  checksum: d0b091e940837e276364d14758d7149fb7b9e5eb99e271f97012f9b92952cf6854132195dc9c36b9fcd40d8495608e7044f9d6179f2f9e15003d9a4cbcf73b49
-  languageName: node
-  linkType: hard
-
-"ember-cached-decorator-polyfill@npm:^0.1.4":
-  version: 0.1.4
-  resolution: "ember-cached-decorator-polyfill@npm:0.1.4"
-  dependencies:
-    "@glimmer/tracking": ^1.0.4
-    ember-cache-primitive-polyfill: ^1.0.1
-    ember-cli-babel: ^7.21.0
-    ember-cli-babel-plugin-helpers: ^1.1.1
-  checksum: 8f8228e8fe578a78045c00cfd9ffc124dd287e45908e912dba9823ba48a14c1cb7e15fce64f4a034b68edcf6987c51c0500fbab7825e982ea4708672b019780a
-  languageName: node
-  linkType: hard
-
-"ember-cli-autoprefixer@npm:^0.8.1":
-  version: 0.8.1
-  resolution: "ember-cli-autoprefixer@npm:0.8.1"
-  dependencies:
-    broccoli-autoprefixer: ^5.0.0
-    lodash: ^4.0.0
-  checksum: b756a311abe4d3e91cd170fa801d0cb5601f7e6d2b9d7406018719636479ee80e1ec3ca633ca1419971ec56bf5417bc6000fc2a128bd3e3f2ddbe4e22d8ea8da
-  languageName: node
-  linkType: hard
-
-"ember-cli-babel-plugin-helpers@npm:^1.0.0, ember-cli-babel-plugin-helpers@npm:^1.1.0, ember-cli-babel-plugin-helpers@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "ember-cli-babel-plugin-helpers@npm:1.1.1"
-  checksum: 3dc684317dbc4728d41a61de13d2fb1de5227105c1ba9194005647d2724b469d43aba3b1fa73622f2b5cd04c8283a15568b3a0044ec7a5036c17f336ac098ff5
-  languageName: node
-  linkType: hard
-
-"ember-cli-babel@npm:^6.6.0":
-  version: 6.18.0
-  resolution: "ember-cli-babel@npm:6.18.0"
-  dependencies:
-    amd-name-resolver: 1.2.0
-    babel-plugin-debug-macros: ^0.2.0-beta.6
-    babel-plugin-ember-modules-api-polyfill: ^2.6.0
-    babel-plugin-transform-es2015-modules-amd: ^6.24.0
-    babel-polyfill: ^6.26.0
-    babel-preset-env: ^1.7.0
-    broccoli-babel-transpiler: ^6.5.0
-    broccoli-debug: ^0.6.4
-    broccoli-funnel: ^2.0.0
-    broccoli-source: ^1.1.0
-    clone: ^2.0.0
-    ember-cli-version-checker: ^2.1.2
-    semver: ^5.5.0
-  checksum: 01f216a964f03660ee1d95ef73a7c07b315d7407b553d01410854f9421638fee084cec50fb7464c7bace72a7cf07053f95b377fd8399f69c7e0bbcba77e9655d
-  languageName: node
-  linkType: hard
-
-"ember-cli-babel@npm:^7.0.0, ember-cli-babel@npm:^7.1.2, ember-cli-babel@npm:^7.1.3, ember-cli-babel@npm:^7.10.0, ember-cli-babel@npm:^7.13.0, ember-cli-babel@npm:^7.13.2, ember-cli-babel@npm:^7.18.0, ember-cli-babel@npm:^7.19.0, ember-cli-babel@npm:^7.20.0, ember-cli-babel@npm:^7.21.0, ember-cli-babel@npm:^7.22.1, ember-cli-babel@npm:^7.23.0, ember-cli-babel@npm:^7.23.1, ember-cli-babel@npm:^7.26.0, ember-cli-babel@npm:^7.26.1, ember-cli-babel@npm:^7.26.11, ember-cli-babel@npm:^7.26.3, ember-cli-babel@npm:^7.26.4, ember-cli-babel@npm:^7.26.5, ember-cli-babel@npm:^7.26.6, ember-cli-babel@npm:^7.26.8, ember-cli-babel@npm:^7.5.0, ember-cli-babel@npm:^7.7.3":
-  version: 7.26.11
-  resolution: "ember-cli-babel@npm:7.26.11"
-  dependencies:
-    "@babel/core": ^7.12.0
-    "@babel/helper-compilation-targets": ^7.12.0
-    "@babel/plugin-proposal-class-properties": ^7.16.5
-    "@babel/plugin-proposal-decorators": ^7.13.5
-    "@babel/plugin-proposal-private-methods": ^7.16.5
-    "@babel/plugin-proposal-private-property-in-object": ^7.16.5
-    "@babel/plugin-transform-modules-amd": ^7.13.0
-    "@babel/plugin-transform-runtime": ^7.13.9
-    "@babel/plugin-transform-typescript": ^7.13.0
-    "@babel/polyfill": ^7.11.5
-    "@babel/preset-env": ^7.16.5
-    "@babel/runtime": 7.12.18
-    amd-name-resolver: ^1.3.1
-    babel-plugin-debug-macros: ^0.3.4
-    babel-plugin-ember-data-packages-polyfill: ^0.1.2
-    babel-plugin-ember-modules-api-polyfill: ^3.5.0
-    babel-plugin-module-resolver: ^3.2.0
-    broccoli-babel-transpiler: ^7.8.0
-    broccoli-debug: ^0.6.4
-    broccoli-funnel: ^2.0.2
-    broccoli-source: ^2.1.2
-    calculate-cache-key-for-tree: ^2.0.0
-    clone: ^2.1.2
-    ember-cli-babel-plugin-helpers: ^1.1.1
-    ember-cli-version-checker: ^4.1.0
-    ensure-posix-path: ^1.0.2
-    fixturify-project: ^1.10.0
-    resolve-package-path: ^3.1.0
-    rimraf: ^3.0.1
-    semver: ^5.5.0
-  checksum: 72b2819018d4d29b5250284cab5fa992a7fd6b0cf958a1fc4abed4a4f6394c0aca4ee32d4c8981d8643fef7280763fadf70ebd807f262967899f4898679bcb90
-  languageName: node
-  linkType: hard
-
-"ember-cli-clipboard@npm:0.16.0":
-  version: 0.16.0
-  resolution: "ember-cli-clipboard@npm:0.16.0"
-  dependencies:
-    "@ember/render-modifiers": ^1.0.2 || ^2.0.0
-    clipboard: ^2.0.6
-    ember-auto-import: ^1.11.3
-    ember-cli-babel: ^7.26.6
-    ember-cli-htmlbars: ^5.7.1
-  checksum: dea292fb8116d657cc2ac00695c7cdfc6fd71db3ff444b8418a3bdb641165d632e4281e06eb6fabfb82a58eb3a3ed5ea3e861539961501bb141725df7dc75604
-  languageName: node
-  linkType: hard
-
-"ember-cli-content-security-policy@npm:2.0.3":
-  version: 2.0.3
-  resolution: "ember-cli-content-security-policy@npm:2.0.3"
-  dependencies:
-    body-parser: ^1.17.0
-    chalk: ^4.1.1
-    debug: ^4.3.1
-    ember-cli-babel: ^7.26.3
-    ember-cli-version-checker: ^5.0.2
-  checksum: d628b8e4ee603471182118b5cde23928f5d13f3d93c031625f960de133391e121d1022706dbf3682ace52187f5df9c6aebdd228104a220a11669d34989ac5f63
-  languageName: node
-  linkType: hard
-
-"ember-cli-dependency-checker@npm:^3.3.1":
-  version: 3.3.1
-  resolution: "ember-cli-dependency-checker@npm:3.3.1"
-  dependencies:
-    chalk: ^2.3.0
-    find-yarn-workspace-root: ^1.1.0
-    is-git-url: ^1.0.0
-    resolve: ^1.5.0
-    semver: ^5.3.0
-  peerDependencies:
-    ember-cli: ^3.2.0 || ^4.0.0
-  checksum: 41d27cb4ccd056b9013ef00fa0f4e9133a5769b82bef8427ceaca3d9b773f901a4fbea6ad87748a6ae456d0051ed12f4e664212ca3c290d14704c3a2d710ad72
-  languageName: node
-  linkType: hard
-
-"ember-cli-deprecation-workflow@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "ember-cli-deprecation-workflow@npm:2.1.0"
-  dependencies:
-    broccoli-funnel: ^3.0.3
-    broccoli-merge-trees: ^4.2.0
-    broccoli-plugin: ^4.0.5
-    ember-cli-htmlbars: ^5.3.2
-  checksum: 3382d34001db61fa04069d0f5f143b39fbeeac124d961dbef932c5a15b67669b8124c504018c7333b2716e2d7a5b299eae53591d8e55bafe447fda7aefaa2deb
-  languageName: node
-  linkType: hard
-
-"ember-cli-flash@npm:4.0.0":
-  version: 4.0.0
-  resolution: "ember-cli-flash@npm:4.0.0"
-  dependencies:
-    "@ember/render-modifiers": ^2.0.2
-    "@glimmer/component": ^1.1.2
-    "@glimmer/tracking": ^1.1.2
-    ember-auto-import: ^2.4.1
-    ember-cli-babel: ^7.26.11
-    ember-cli-htmlbars: ^6.0.1
-  checksum: 30cc3c18bae61332688eafe6af4d1ee8e6cd545b08ce276cf1ab761ed6dc1a172265ab01648bbf11d087d7896e3245a6679037a51a0c7eff4e44b942c125ecbd
-  languageName: node
-  linkType: hard
-
-"ember-cli-get-component-path-option@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "ember-cli-get-component-path-option@npm:1.0.0"
-  checksum: 4a4d9b2b0cb05c69fad962b1787b65d9bca0c64aa161c2f12d172b9af6ef951d33dd1ac38bfa7468a4a11a08a17dda2912fd47cb92cbfd8795fe2e8008e155e4
-  languageName: node
-  linkType: hard
-
-"ember-cli-htmlbars@npm:^4.3.1":
-  version: 4.5.0
-  resolution: "ember-cli-htmlbars@npm:4.5.0"
-  dependencies:
-    "@ember/edition-utils": ^1.2.0
-    babel-plugin-htmlbars-inline-precompile: ^3.2.0
-    broccoli-debug: ^0.6.5
-    broccoli-persistent-filter: ^2.3.1
-    broccoli-plugin: ^3.1.0
-    common-tags: ^1.8.0
-    ember-cli-babel-plugin-helpers: ^1.1.0
-    fs-tree-diff: ^2.0.1
-    hash-for-dep: ^1.5.1
-    heimdalljs-logger: ^0.1.10
-    json-stable-stringify: ^1.0.1
-    semver: ^6.3.0
-    strip-bom: ^4.0.0
-    walk-sync: ^2.0.2
-  checksum: 4cecd9e5df64fc9df22ea944b2ab86dd88d3bd105b22b46e810856a050d617f73610645c1e91ff018836e73f4b488a14217a3d767557c1fa663494b54de93af6
-  languageName: node
-  linkType: hard
-
-"ember-cli-htmlbars@npm:^5.2.0, ember-cli-htmlbars@npm:^5.3.2":
-  version: 5.7.2
-  resolution: "ember-cli-htmlbars@npm:5.7.2"
-  dependencies:
-    "@ember/edition-utils": ^1.2.0
-    babel-plugin-htmlbars-inline-precompile: ^5.0.0
-    broccoli-debug: ^0.6.5
-    broccoli-persistent-filter: ^3.1.2
-    broccoli-plugin: ^4.0.3
-    common-tags: ^1.8.0
-    ember-cli-babel-plugin-helpers: ^1.1.1
-    ember-cli-version-checker: ^5.1.2
-    fs-tree-diff: ^2.0.1
-    hash-for-dep: ^1.5.1
-    heimdalljs-logger: ^0.1.10
-    json-stable-stringify: ^1.0.1
-    semver: ^7.3.4
-    silent-error: ^1.1.1
-    strip-bom: ^4.0.0
-    walk-sync: ^2.2.0
-  checksum: 57cfba7311969f2f6ae463cb7be153b10d1384469e7e61fc645bf6eca5c8bb7dbdf42cab757adf05299971b426a19ad6cc3f045d2cbf72304405eb93cc1af998
-  languageName: node
-  linkType: hard
-
-"ember-cli-htmlbars@npm:^5.3.1, ember-cli-htmlbars@npm:^5.7.1":
-  version: 5.7.1
-  resolution: "ember-cli-htmlbars@npm:5.7.1"
-  dependencies:
-    "@ember/edition-utils": ^1.2.0
-    babel-plugin-htmlbars-inline-precompile: ^5.0.0
-    broccoli-debug: ^0.6.5
-    broccoli-persistent-filter: ^3.1.2
-    broccoli-plugin: ^4.0.3
-    common-tags: ^1.8.0
-    ember-cli-babel-plugin-helpers: ^1.1.1
-    ember-cli-version-checker: ^5.1.2
-    fs-tree-diff: ^2.0.1
-    hash-for-dep: ^1.5.1
-    heimdalljs-logger: ^0.1.10
-    json-stable-stringify: ^1.0.1
-    semver: ^7.3.4
-    silent-error: ^1.1.1
-    strip-bom: ^4.0.0
-    walk-sync: ^2.2.0
-  checksum: 6212c33dfc5c99fdac8bbd5381a9fd8cd855eb2f3e9c03e3cf3f9466bbc0163c7d4472593611de221e785eb19124330c01ba1f16224bd94a3804527b2a5d2efb
-  languageName: node
-  linkType: hard
-
-"ember-cli-htmlbars@npm:^6.0.0, ember-cli-htmlbars@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "ember-cli-htmlbars@npm:6.0.1"
-  dependencies:
-    "@ember/edition-utils": ^1.2.0
-    babel-plugin-ember-template-compilation: ^1.0.0
-    babel-plugin-htmlbars-inline-precompile: ^5.3.0
-    broccoli-debug: ^0.6.5
-    broccoli-persistent-filter: ^3.1.2
-    broccoli-plugin: ^4.0.3
-    ember-cli-version-checker: ^5.1.2
-    fs-tree-diff: ^2.0.1
-    hash-for-dep: ^1.5.1
-    heimdalljs-logger: ^0.1.10
-    json-stable-stringify: ^1.0.1
-    semver: ^7.3.4
-    silent-error: ^1.1.1
-    strip-bom: ^4.0.0
-    walk-sync: ^2.2.0
-  checksum: ba5593c7ce2db52ac7171a6e7a9ebbcf5b9d3dc0f4e357acbb59f1eca1a6b4d16c00be7f8370c6fa95f364f4f3863b81d9477cfd461e0fd9ba56abbc527b6a14
-  languageName: node
-  linkType: hard
-
-"ember-cli-htmlbars@npm:^6.1.0":
-  version: 6.1.1
-  resolution: "ember-cli-htmlbars@npm:6.1.1"
-  dependencies:
-    "@ember/edition-utils": ^1.2.0
-    babel-plugin-ember-template-compilation: ^1.0.0
-    babel-plugin-htmlbars-inline-precompile: ^5.3.0
-    broccoli-debug: ^0.6.5
-    broccoli-persistent-filter: ^3.1.2
-    broccoli-plugin: ^4.0.3
-    ember-cli-version-checker: ^5.1.2
-    fs-tree-diff: ^2.0.1
-    hash-for-dep: ^1.5.1
-    heimdalljs-logger: ^0.1.10
-    js-string-escape: ^1.0.1
-    semver: ^7.3.4
-    silent-error: ^1.1.1
-    walk-sync: ^2.2.0
-  checksum: d75fbe973196bdc1df6a04a11310064125108eb105e903a842698f0dd6c133d2e1699860ea1c8237d0c62f92b01da4ebc7b672e862b2e572922f0f86f243a9a1
-  languageName: node
-  linkType: hard
-
-"ember-cli-htmlbars@npm:^6.2.0":
-  version: 6.2.0
-  resolution: "ember-cli-htmlbars@npm:6.2.0"
-  dependencies:
-    "@ember/edition-utils": ^1.2.0
-    babel-plugin-ember-template-compilation: ^2.0.0
-    babel-plugin-htmlbars-inline-precompile: ^5.3.0
-    broccoli-debug: ^0.6.5
-    broccoli-persistent-filter: ^3.1.2
-    broccoli-plugin: ^4.0.3
-    ember-cli-version-checker: ^5.1.2
-    fs-tree-diff: ^2.0.1
-    hash-for-dep: ^1.5.1
-    heimdalljs-logger: ^0.1.10
-    js-string-escape: ^1.0.1
-    semver: ^7.3.4
-    silent-error: ^1.1.1
-    walk-sync: ^2.2.0
-  checksum: 1a0f94152ae381aed4c0300f4d8e756d60bfc4dfd1357fd49a0d36d420d65d6dc3f5761e604976f63edd11bc264959dddbd1b4c8401e9922711eafc748f4df92
-  languageName: node
-  linkType: hard
-
-"ember-cli-inject-live-reload@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "ember-cli-inject-live-reload@npm:2.1.0"
-  dependencies:
-    clean-base-url: ^1.0.0
-    ember-cli-version-checker: ^3.1.3
-  checksum: 423bd479d29e58c19d3d8232b1d025fdd070006b2a59b2b14fc252372aa227da7ac56fdea7fbf4c518b37705b328190c58e4ffacb8f6ce81f6cfb42c1262c591
-  languageName: node
-  linkType: hard
-
-"ember-cli-is-package-missing@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "ember-cli-is-package-missing@npm:1.0.0"
-  checksum: a2c4950a644827ae9236c39cf27d6e79d3cb06ee50154f64a1bd72f4abda8dcd542759a45ed47f77731baea9edb7d672145d1faf38b29aab287b281713e14760
-  languageName: node
-  linkType: hard
-
-"ember-cli-lodash-subset@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "ember-cli-lodash-subset@npm:2.0.1"
-  checksum: 2667cd59443a67a04cf6f9cc402ffd7f6dac1c987b4908e3178481fd6ea0d492706f7999f8e6a2d4b97b136fe42e62457b569e96e91af78a1b096aa69d14984e
-  languageName: node
-  linkType: hard
-
-"ember-cli-mirage@npm:2.4.0":
-  version: 2.4.0
-  resolution: "ember-cli-mirage@npm:2.4.0"
-  dependencies:
-    "@embroider/macros": ^0.41.0
-    broccoli-file-creator: ^2.1.1
-    broccoli-funnel: ^3.0.3
-    broccoli-merge-trees: ^4.2.0
-    ember-auto-import: ^1.12.0
-    ember-cli-babel: ^7.26.6
-    ember-destroyable-polyfill: ^2.0.3
-    ember-get-config: 0.2.4 - 0.5.0
-    ember-inflector: ^2.0.0 || ^3.0.0 || ^4.0.2
-    lodash-es: ^4.17.11
-    miragejs: ^0.1.43
-  peerDependencies:
-    "@ember/test-helpers": "*"
-    ember-data: "*"
-    ember-qunit: "*"
-  peerDependenciesMeta:
-    "@ember/test-helpers":
-      optional: true
-    ember-data:
-      optional: true
-    ember-qunit:
-      optional: true
-  checksum: 459aed2d946ebb9d378e30b3b902157df4378ffc2f1686fa7179ee031240a1733d0b516c5813855ef701c2cc7359b2dccc7a60ddad87f7a5140a4057b5645b5a
-  languageName: node
-  linkType: hard
-
-"ember-cli-node-assets@npm:^0.2.2":
-  version: 0.2.2
-  resolution: "ember-cli-node-assets@npm:0.2.2"
-  dependencies:
-    broccoli-funnel: ^1.0.1
-    broccoli-merge-trees: ^1.1.1
-    broccoli-source: ^1.1.0
-    debug: ^2.2.0
-    lodash: ^4.5.1
-    resolve: ^1.1.7
-  checksum: 860abfe536ad951286b86f04d1700529b371396d4e742ba6cbdd371144ff018b91907e2997e8486423bbe1e086f2ab97169e648c5360cd0949d70050e84919be
-  languageName: node
-  linkType: hard
-
-"ember-cli-normalize-entity-name@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "ember-cli-normalize-entity-name@npm:1.0.0"
-  dependencies:
-    silent-error: ^1.0.0
-  checksum: 0f56d4714e59f7b2f40b9e070f5ad69be1171c48e614348d4e15bcb43e3495e7c5dc91b51b7a59fb88683b8a599010716fc2ca3ded3d7e201290efbae91a1bc5
-  languageName: node
-  linkType: hard
-
-"ember-cli-page-object@npm:1.17.10":
-  version: 1.17.10
-  resolution: "ember-cli-page-object@npm:1.17.10"
-  dependencies:
-    broccoli-file-creator: ^2.1.1
-    broccoli-merge-trees: ^2.0.0
-    ceibo: ~2.0.0
-    ember-cli-babel: ^7.26.1
-    ember-cli-node-assets: ^0.2.2
-    ember-native-dom-helpers: ^0.7.0
-    jquery: ^3.4.1
-    rsvp: ^4.7.0
-  checksum: 214e8358b92d04875ce6f5c90d3f4fbf9aaddabcf096f1c4380a03259c4c8c62b043cb49748b4c29acf1295731ba27a270a2e01f16993c086f0166e8dbff34cd
-  languageName: node
-  linkType: hard
-
-"ember-cli-path-utils@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "ember-cli-path-utils@npm:1.0.0"
-  checksum: 15652e41e040bb1c204705d6502f2f499686fba068ccddb7871fd4db7c0e71a93768480f1fe2cdef62470bdd1ce41c49c99699f5fff1c6b5abc3c875368cadae
-  languageName: node
-  linkType: hard
-
-"ember-cli-preprocess-registry@npm:^3.3.0":
-  version: 3.3.0
-  resolution: "ember-cli-preprocess-registry@npm:3.3.0"
-  dependencies:
-    broccoli-clean-css: ^1.1.0
-    broccoli-funnel: ^2.0.1
-    debug: ^3.0.1
-    process-relative-require: ^1.0.0
-  checksum: 7b0a19b0842b6283a3ce7b0ccb77aa08ea3134bb8ada5952b4fb43e0a46a583c178e815e6573869fcaeccb4530fb975986b80d8a9d365811c471bcbf9cd98c95
-  languageName: node
-  linkType: hard
-
-"ember-cli-sass@npm:11.0.1":
-  version: 11.0.1
-  resolution: "ember-cli-sass@npm:11.0.1"
-  dependencies:
-    broccoli-funnel: ^2.0.1
-    broccoli-merge-trees: ^3.0.1
-    broccoli-sass-source-maps: ^4.0.0
-    ember-cli-version-checker: ^2.1.0
-  checksum: 5f690b60be6b0d49b542c89c4ee51d17798c2ddee1dfa0d28fd3e92bc5ebf16df522f5c799abf247f1bf6190f0c75cf6cc0560400db0f004606c2b6e5631f0de
-  languageName: node
-  linkType: hard
-
-"ember-cli-sass@npm:^10.0.1":
-  version: 10.0.1
-  resolution: "ember-cli-sass@npm:10.0.1"
-  dependencies:
-    broccoli-funnel: ^2.0.1
-    broccoli-merge-trees: ^3.0.1
-    broccoli-sass-source-maps: ^4.0.0
-    ember-cli-version-checker: ^2.1.0
-  checksum: 99eb9045b19c82851a90435df14b4ab4108ee0fd57a9e78d085c225a9d3dfb72bae8118707cf2f1a2d4d37abc2c40ad0dd95c0079f43d051ec90526448189ac3
-  languageName: node
-  linkType: hard
-
-"ember-cli-sri@meirish/ember-cli-sri#rooturl":
-  version: 2.1.0
-  resolution: "ember-cli-sri@https://github.com/meirish/ember-cli-sri.git#commit=1c0ff776a61f09121d1ea69ce16e4653da5e1efa"
-  dependencies:
-    broccoli-sri-hash: ^2.1.0
-  checksum: cc1b5544c653db43a92c0b1a2b2b0cc17fb7d67e17e90efef0f1b069b9ae39a3154d8c63bea0aacc8d02202935719dc3ecd3123bf0007c068a18ed52972badd1
-  languageName: node
-  linkType: hard
-
-"ember-cli-string-helpers@npm:6.1.0":
-  version: 6.1.0
-  resolution: "ember-cli-string-helpers@npm:6.1.0"
-  dependencies:
-    "@babel/core": ^7.13.10
-    broccoli-funnel: ^3.0.3
-    ember-cli-babel: ^7.7.3
-    resolve: ^1.20.0
-  checksum: 13ccce5297232ce801ddc88e83d7327b5e17ae6359f658b633d09d1595d9241d3e1f3fc1240f515ac2bf01e732e59d2b29ba004f218fc18227fa9f0ab3fd8964
-  languageName: node
-  linkType: hard
-
-"ember-cli-string-utils@npm:^1.0.0, ember-cli-string-utils@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "ember-cli-string-utils@npm:1.1.0"
-  checksum: cb833925596b1fedc5e8ad0d05d1dcb3db7305d4a73f1a3332ba3eb2bfa7a4f0e7674afc8dd5ac474cc526ee3129158b0e26c49d6392e5ea579a927b2af7f3e9
-  languageName: node
-  linkType: hard
-
-"ember-cli-terser@npm:^4.0.2":
-  version: 4.0.2
-  resolution: "ember-cli-terser@npm:4.0.2"
-  dependencies:
-    broccoli-terser-sourcemap: ^4.1.0
-  checksum: ab2209731ae8f5d85c4c85e0496309d4f8fbb44157e6164bbc6a5edc9a5a2754441fbd383c4856e1c3df9462215fa2708cdd77b62b85b52243af4ba4882564ae
-  languageName: node
-  linkType: hard
-
-"ember-cli-test-info@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "ember-cli-test-info@npm:1.0.0"
-  dependencies:
-    ember-cli-string-utils: ^1.0.0
-  checksum: 4a1de83a847c050037b485b2a2e3d0c4b24281f4d3fd14a10f593f793f38b9ad6d8f9cf4bf15e10c6d850ae1a89e9734f7f3e91afacdb1b03dfa8b785e4b296c
-  languageName: node
-  linkType: hard
-
-"ember-cli-test-loader@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "ember-cli-test-loader@npm:3.0.0"
-  dependencies:
-    ember-cli-babel: ^7.13.2
-  checksum: 1de13e06af31b3543e779f69b7d06cda0e1683cdfce7923e313d9cffcb33f4e979af75baf12f3988f8a2186db5d063d204e294f522ef517d845b19ce25cb9cdc
-  languageName: node
-  linkType: hard
-
-"ember-cli-typescript-blueprint-polyfill@npm:^0.1.0":
-  version: 0.1.0
-  resolution: "ember-cli-typescript-blueprint-polyfill@npm:0.1.0"
-  dependencies:
-    chalk: ^4.0.0
-    remove-types: ^1.0.0
-  checksum: e631d97836512565c04ca5693656e810d3d6992914c60bc671aca0c6ad62f06b80d6a671cc337c347e968cd6b29ca38ee4dea98e79250800bbc0ed12b0911eb5
-  languageName: node
-  linkType: hard
-
-"ember-cli-typescript@npm:3.0.0":
-  version: 3.0.0
-  resolution: "ember-cli-typescript@npm:3.0.0"
-  dependencies:
-    "@babel/plugin-transform-typescript": ~7.5.0
-    ansi-to-html: ^0.6.6
-    debug: ^4.0.0
-    ember-cli-babel-plugin-helpers: ^1.0.0
-    execa: ^2.0.0
-    fs-extra: ^8.0.0
-    resolve: ^1.5.0
-    rsvp: ^4.8.1
-    semver: ^6.0.0
-    stagehand: ^1.0.0
-    walk-sync: ^2.0.0
-  checksum: 4ef2732a0743113aa0167365afb972239e51ca227ca0858b1e240f8e449a34c02462973e1669eb7cd1982b0c1db225f1537f1d41360dc3945b6c2b54e566f96a
-  languageName: node
-  linkType: hard
-
-"ember-cli-typescript@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "ember-cli-typescript@npm:2.0.2"
-  dependencies:
-    "@babel/plugin-proposal-class-properties": ^7.1.0
-    "@babel/plugin-transform-typescript": ~7.4.0
-    ansi-to-html: ^0.6.6
-    debug: ^4.0.0
-    ember-cli-babel-plugin-helpers: ^1.0.0
-    execa: ^1.0.0
-    fs-extra: ^7.0.0
-    resolve: ^1.5.0
-    rsvp: ^4.8.1
-    semver: ^6.0.0
-    stagehand: ^1.0.0
-    walk-sync: ^1.0.0
-  checksum: a1eecb5733df78de96eee3d75f1d0425c8e2638fddcdfb4b2fa46b70131df78216fc341419ccdcf4c32ca480c2bc3d91c0390b81b5ad738a409335ae5ff7f993
-  languageName: node
-  linkType: hard
-
-"ember-cli-typescript@npm:^3.1.4":
-  version: 3.1.4
-  resolution: "ember-cli-typescript@npm:3.1.4"
-  dependencies:
-    "@babel/plugin-proposal-nullish-coalescing-operator": ^7.4.4
-    "@babel/plugin-proposal-optional-chaining": ^7.6.0
-    "@babel/plugin-transform-typescript": ~7.8.0
-    ansi-to-html: ^0.6.6
-    broccoli-stew: ^3.0.0
-    debug: ^4.0.0
-    ember-cli-babel-plugin-helpers: ^1.0.0
-    execa: ^3.0.0
-    fs-extra: ^8.0.0
-    resolve: ^1.5.0
-    rsvp: ^4.8.1
-    semver: ^6.3.0
-    stagehand: ^1.0.0
-    walk-sync: ^2.0.0
-  checksum: 775c20caadcca5a071728bad1a388297e3c9acfea342b654901c334a2d158fc2d78ebac7b785e718051f1ed8de584741545d2c6c35c4a72b4ddb3fbc1618666f
-  languageName: node
-  linkType: hard
-
-"ember-cli-typescript@npm:^4.1.0, ember-cli-typescript@npm:^4.2.0, ember-cli-typescript@npm:^4.2.1":
-  version: 4.2.1
-  resolution: "ember-cli-typescript@npm:4.2.1"
-  dependencies:
-    ansi-to-html: ^0.6.15
-    broccoli-stew: ^3.0.0
-    debug: ^4.0.0
-    execa: ^4.0.0
-    fs-extra: ^9.0.1
-    resolve: ^1.5.0
-    rsvp: ^4.8.1
-    semver: ^7.3.2
-    stagehand: ^1.0.0
-    walk-sync: ^2.2.0
-  checksum: bd31698536c0df7fc03b47aa1c7d3f9c6f7e34fae1500c88bdbbc4c0b98b2a7e69230dd71a01d7cd7f563484cf895333f559af68f91527d95e198924e3cb2c24
-  languageName: node
-  linkType: hard
-
-"ember-cli-typescript@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "ember-cli-typescript@npm:5.0.0"
-  dependencies:
-    ansi-to-html: ^0.6.15
-    broccoli-stew: ^3.0.0
-    debug: ^4.0.0
-    execa: ^4.0.0
-    fs-extra: ^9.0.1
-    resolve: ^1.5.0
-    rsvp: ^4.8.1
-    semver: ^7.3.2
-    stagehand: ^1.0.0
-    walk-sync: ^2.2.0
-  checksum: ac0d6088cd7e5bb17792e0db44e05f198eaea1484fd45f725b8caac8322b072d9d3dcf4d0d7a88fe66699ca88fe3ab564cc6dde98b63be92129c7acdb73c3da4
-  languageName: node
-  linkType: hard
-
-"ember-cli-typescript@npm:^5.1.0":
-  version: 5.1.1
-  resolution: "ember-cli-typescript@npm:5.1.1"
-  dependencies:
-    ansi-to-html: ^0.6.15
-    broccoli-stew: ^3.0.0
-    debug: ^4.0.0
-    execa: ^4.0.0
-    fs-extra: ^9.0.1
-    resolve: ^1.5.0
-    rsvp: ^4.8.1
-    semver: ^7.3.2
-    stagehand: ^1.0.0
-    walk-sync: ^2.2.0
-  checksum: 8f259f2893d26c173a6f94b4cf62840e4e7e2ab0ec633ddf1cd65894bef928b3c426dda9dab0a04f04a6702560271d4f0f0091370e64695e84a64b6f6fbc26c1
-  languageName: node
-  linkType: hard
-
-"ember-cli-typescript@npm:^5.2.1":
-  version: 5.2.1
-  resolution: "ember-cli-typescript@npm:5.2.1"
-  dependencies:
-    ansi-to-html: ^0.6.15
-    broccoli-stew: ^3.0.0
-    debug: ^4.0.0
-    execa: ^4.0.0
-    fs-extra: ^9.0.1
-    resolve: ^1.5.0
-    rsvp: ^4.8.1
-    semver: ^7.3.2
-    stagehand: ^1.0.0
-    walk-sync: ^2.2.0
-  checksum: b4306b37e9a9e070cc61a67acf404b30636ad2681379589fbc349c7e83158a7b634d792ab5af4cd4dd0770eecb8a901fa84d29a15167826db9c97b664a115df0
-  languageName: node
-  linkType: hard
-
-"ember-cli-version-checker@npm:^2.1.0, ember-cli-version-checker@npm:^2.1.2":
-  version: 2.2.0
-  resolution: "ember-cli-version-checker@npm:2.2.0"
-  dependencies:
-    resolve: ^1.3.3
-    semver: ^5.3.0
-  checksum: 2e2db30c0276df207e5921ff57574299ff027a528d52932ba42d9ddc6078da62dc3f34e6dc2ac647f5e07245d64c6acf4a395d453acccd819756f137fc4ec529
-  languageName: node
-  linkType: hard
-
-"ember-cli-version-checker@npm:^3.1.3":
-  version: 3.1.3
-  resolution: "ember-cli-version-checker@npm:3.1.3"
-  dependencies:
-    resolve-package-path: ^1.2.6
-    semver: ^5.6.0
-  checksum: 07a8b579272d4bd489b658b7dce3f6eefb0c9358a06b064fd59d2faf82defe60ade662fcc22bd009e3de6ac7ff602d88cdeb3b4e29c3669a09adb9a751d987a5
-  languageName: node
-  linkType: hard
-
-"ember-cli-version-checker@npm:^4.1.0":
-  version: 4.1.1
-  resolution: "ember-cli-version-checker@npm:4.1.1"
-  dependencies:
-    resolve-package-path: ^2.0.0
-    semver: ^6.3.0
-    silent-error: ^1.1.1
-  checksum: 43beddcef0e26c159721e61cea0bc606c901a5f1b4ce21c83418d7ee30d3c7b0f073310e5db03bde3ca76c082309358766d7bacd3655bad1745fc458f5ffe4a1
-  languageName: node
-  linkType: hard
-
-"ember-cli-version-checker@npm:^5.0.2, ember-cli-version-checker@npm:^5.1.1, ember-cli-version-checker@npm:^5.1.2":
-  version: 5.1.2
-  resolution: "ember-cli-version-checker@npm:5.1.2"
-  dependencies:
-    resolve-package-path: ^3.1.0
-    semver: ^7.3.4
-    silent-error: ^1.1.1
-  checksum: 95e98e11c5fdd31659d67b67abc7c781f3463e1da7a3642d5cae4717262e6382ba0d3487fe29e1bef1d5c3d03a2687fca9cd169445845abe2e486397ff92feef
-  languageName: node
-  linkType: hard
-
-"ember-cli@npm:~4.4.0":
-  version: 4.4.1
-  resolution: "ember-cli@npm:4.4.1"
-  dependencies:
-    "@babel/core": ^7.17.9
-    "@babel/plugin-transform-modules-amd": ^7.16.7
-    amd-name-resolver: ^1.3.1
-    babel-plugin-module-resolver: ^4.1.0
-    bower-config: ^1.4.3
-    bower-endpoint-parser: 0.2.2
-    broccoli: ^3.5.2
-    broccoli-amd-funnel: ^2.0.1
-    broccoli-babel-transpiler: ^7.8.0
-    broccoli-builder: ^0.18.14
-    broccoli-concat: ^4.2.5
-    broccoli-config-loader: ^1.0.1
-    broccoli-config-replace: ^1.1.2
-    broccoli-debug: ^0.6.5
-    broccoli-funnel: ^3.0.8
-    broccoli-funnel-reducer: ^1.0.0
-    broccoli-merge-trees: ^4.2.0
-    broccoli-middleware: ^2.1.1
-    broccoli-slow-trees: ^3.1.0
-    broccoli-source: ^3.0.1
-    broccoli-stew: ^3.0.0
-    calculate-cache-key-for-tree: ^2.0.0
-    capture-exit: ^2.0.0
-    chalk: ^4.1.2
-    ci-info: ^3.3.0
-    clean-base-url: ^1.0.0
-    compression: ^1.7.4
-    configstore: ^5.0.1
-    console-ui: ^3.1.2
-    core-object: ^3.1.5
-    dag-map: ^2.0.2
-    diff: ^5.0.0
-    ember-cli-is-package-missing: ^1.0.0
-    ember-cli-lodash-subset: ^2.0.1
-    ember-cli-normalize-entity-name: ^1.0.0
-    ember-cli-preprocess-registry: ^3.3.0
-    ember-cli-string-utils: ^1.1.0
-    ember-source-channel-url: ^3.0.0
-    ensure-posix-path: ^1.1.1
-    execa: ^5.1.1
-    exit: ^0.1.2
-    express: ^4.17.2
-    filesize: ^8.0.6
-    find-up: ^5.0.0
-    find-yarn-workspace-root: ^2.0.0
-    fixturify-project: ^2.1.1
-    fs-extra: ^9.1.0
-    fs-tree-diff: ^2.0.1
-    get-caller-file: ^2.0.5
-    git-repo-info: ^2.1.1
-    glob: ^7.2.0
-    heimdalljs: ^0.2.6
-    heimdalljs-fs-monitor: ^1.1.1
-    heimdalljs-graph: ^1.0.0
-    heimdalljs-logger: ^0.1.10
-    http-proxy: ^1.18.1
-    inflection: ^1.13.1
-    is-git-url: ^1.0.0
-    is-language-code: ^3.1.0
-    isbinaryfile: ^4.0.8
-    js-yaml: ^3.14.0
-    leek: 0.0.24
-    lodash.template: ^4.5.0
-    markdown-it: ^12.2.0
-    markdown-it-terminal: 0.2.1
-    minimatch: ^5.0.1
-    morgan: ^1.10.0
-    nopt: ^3.0.6
-    npm-package-arg: ^8.1.5
-    p-defer: ^3.0.0
-    portfinder: ^1.0.28
-    promise-map-series: ^0.3.0
-    promise.hash.helper: ^1.0.8
-    quick-temp: ^0.1.8
-    remove-types: ^1.0.0
-    resolve: ^1.20.0
-    resolve-package-path: ^3.1.0
-    safe-stable-stringify: ^2.3.1
-    sane: ^5.0.1
-    semver: ^7.3.5
-    silent-error: ^1.1.1
-    sort-package-json: ^1.55.0
-    symlink-or-copy: ^1.3.1
-    temp: 0.9.4
-    testem: ^3.6.0
-    tiny-lr: ^2.0.0
-    tree-sync: ^2.1.0
-    uuid: ^8.3.2
-    walk-sync: ^2.2.0
-    watch-detector: ^1.0.1
-    workerpool: ^6.2.0
-    yam: ^1.0.0
-  bin:
-    ember: bin/ember
-  checksum: 99ce6e21588cf3a21056813fee0bb0fc309aeb1e2fa60fc96d868bcee8b78989f994b14e96509f2336dd656eb443087a73c5937796b98f0ced0f656324712422
-  languageName: node
-  linkType: hard
-
-"ember-compatibility-helpers@npm:^1.1.2":
-  version: 1.2.4
-  resolution: "ember-compatibility-helpers@npm:1.2.4"
-  dependencies:
-    babel-plugin-debug-macros: ^0.2.0
-    ember-cli-version-checker: ^5.1.1
-    fs-extra: ^9.1.0
-    semver: ^5.4.1
-  checksum: f220953b2357173486e6d76f76253bce2d8b420d64f2517be41db39612c1becd9e0d078603d5c4445b73df7ff4bf039e777f0bcac8c67e7015abd2409417c819
-  languageName: node
-  linkType: hard
-
-"ember-compatibility-helpers@npm:^1.2.0, ember-compatibility-helpers@npm:^1.2.1":
-  version: 1.2.5
-  resolution: "ember-compatibility-helpers@npm:1.2.5"
-  dependencies:
-    babel-plugin-debug-macros: ^0.2.0
-    ember-cli-version-checker: ^5.1.1
-    fs-extra: ^9.1.0
-    semver: ^5.4.1
-  checksum: ee8625d240daa2ef6c6d14048d38808cb4c7054547c73715130817e3e226300fdf3489be9112205022543fc1d713bcbdea17b03b29480481e04d964e31fb3e86
-  languageName: node
-  linkType: hard
-
-"ember-compatibility-helpers@npm:^1.2.5, ember-compatibility-helpers@npm:^1.2.6":
-  version: 1.2.6
-  resolution: "ember-compatibility-helpers@npm:1.2.6"
-  dependencies:
-    babel-plugin-debug-macros: ^0.2.0
-    ember-cli-version-checker: ^5.1.1
-    find-up: ^5.0.0
-    fs-extra: ^9.1.0
-    semver: ^5.4.1
-  checksum: 1ab8ea51c8d010e02f06668820f1a5ee572ffc0d0ca8eb8b740641e736c8ed67f294d3321876eb9d5dc994c789cd9432632dd748b040c256eabe87e3b941fafc
-  languageName: node
-  linkType: hard
-
-"ember-composable-helpers@npm:5.0.0":
-  version: 5.0.0
-  resolution: "ember-composable-helpers@npm:5.0.0"
-  dependencies:
-    "@babel/core": ^7.0.0
-    broccoli-funnel: 2.0.1
-    ember-cli-babel: ^7.26.3
-    resolve: ^1.10.0
-  checksum: 8fdceade42f025cb75cb3718de4a6f3836b1a74eca8d30ca7a8c0313fccdce6663ce6fa5e5bd14fd905ecac2a330d55c169f21f559f092a5900d08ddc290fff6
-  languageName: node
-  linkType: hard
-
-"ember-composable-helpers@npm:^4.5.0":
-  version: 4.5.0
-  resolution: "ember-composable-helpers@npm:4.5.0"
-  dependencies:
-    "@babel/core": ^7.0.0
-    broccoli-funnel: 2.0.1
-    ember-cli-babel: ^7.26.3
-    resolve: ^1.10.0
-  checksum: 39bc86701eee2c8afde0cd912b757fd7f26b06c25df182fc6bc833722bea86a2c4cc4e51659c489dfdcea5630ed87794010584e68b4c52e6049aee8a8c87808b
-  languageName: node
-  linkType: hard
-
-"ember-concurrency-decorators@npm:^2.0.0":
-  version: 2.0.3
-  resolution: "ember-concurrency-decorators@npm:2.0.3"
-  dependencies:
-    "@ember-decorators/utils": ^6.1.0
-    ember-cli-babel: ^7.19.0
-    ember-cli-htmlbars: ^4.3.1
-    ember-cli-typescript: ^3.1.4
-  checksum: c231097d74208759ee4e60fd10828693b41b3ab4dd77f280bd7559cd20c607fe518dcd49f347e91e9a5052126abb2414efa405dc54619a330b1b832b39871c95
-  languageName: node
-  linkType: hard
-
-"ember-concurrency@npm:2.3.4":
-  version: 2.3.4
-  resolution: "ember-concurrency@npm:2.3.4"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.12.13
-    "@babel/types": ^7.12.13
-    "@glimmer/tracking": ^1.0.4
-    ember-cli-babel: ^7.26.11
-    ember-cli-babel-plugin-helpers: ^1.1.1
-    ember-cli-htmlbars: ^5.7.1
-    ember-compatibility-helpers: ^1.2.0
-    ember-destroyable-polyfill: ^2.0.2
-  checksum: 14b68d1da5575b14dc038af8146b8de29f5b0b961ca57275d1930cf77f8b0d8ba20105d40a5755b79c3f8ad65449195beb94029a687c72a07486c5024ab98154
-  languageName: node
-  linkType: hard
-
-"ember-concurrency@npm:>=1.0.0 <3":
-  version: 2.2.0
-  resolution: "ember-concurrency@npm:2.2.0"
-  dependencies:
-    "@glimmer/tracking": ^1.0.4
-    ember-cli-babel: ^7.26.6
-    ember-cli-htmlbars: ^5.7.1
-    ember-compatibility-helpers: ^1.2.0
-    ember-destroyable-polyfill: ^2.0.2
-  checksum: 3a9bb4c098b4407125e63bd1e25b598c0fae491db240dea2332e7116e5b6538ca2fb71e124b6da31a5f953a78fe7ebe03a7881c53e950203e808456997c7d187
-  languageName: node
-  linkType: hard
-
-"ember-copy@npm:2.0.1":
-  version: 2.0.1
-  resolution: "ember-copy@npm:2.0.1"
-  dependencies:
-    ember-cli-babel: ^7.22.1
-  checksum: addeba5ce864c1dcea4ec475bab51c4996dcd575adab28fb3a5fb082fa1db1f8530236ccfbb2c66fd594d8b11410f17eece6651957bd6b0804eaa870915e84ba
-  languageName: node
-  linkType: hard
-
-"ember-d3@npm:^0.5.1":
-  version: 0.5.1
-  resolution: "ember-d3@npm:0.5.1"
-  dependencies:
-    broccoli-funnel: ^2.0.0
-    broccoli-merge-trees: ^3.0.0
-    d3: ^5.0.0
-    d3-selection-multi: ^1.0.1
-    ember-cli-babel: ^7.1.2
-  checksum: 81256d9a3f7647c5b9689a2e9973fdbcc29fe03ff795a66a3fc6202fd978c6207d1655b44f9a1379f8d4c997283813f25acaf310a1005cc90b74344bf5ef04b5
-  languageName: node
-  linkType: hard
-
-"ember-data@npm:~4.5.0":
-  version: 4.5.0
-  resolution: "ember-data@npm:4.5.0"
-  dependencies:
-    "@ember-data/adapter": 4.5.0
-    "@ember-data/debug": 4.5.0
-    "@ember-data/model": 4.5.0
-    "@ember-data/private-build-infra": 4.5.0
-    "@ember-data/record-data": 4.5.0
-    "@ember-data/serializer": 4.5.0
-    "@ember-data/store": 4.5.0
-    "@ember/edition-utils": ^1.2.0
-    "@ember/string": ^3.0.0
-    "@embroider/macros": ^1.8.3
-    "@glimmer/env": ^0.1.7
-    broccoli-merge-trees: ^4.2.0
-    ember-auto-import: ^2.4.2
-    ember-cli-babel: ^7.26.11
-    ember-cli-typescript: ^5.1.0
-    ember-inflector: ^4.0.2
-  checksum: 9c949c4fbd57747984e0b8fe373c0d5e05faad83e1d8c26e2501cc108ca1f06a236e3070cca37f70a888266df57ffc3898d0ac18c53e5cbdc9fb32fe30e36c1a
-  languageName: node
-  linkType: hard
-
-"ember-decorators@npm:^6.1.1":
-  version: 6.1.1
-  resolution: "ember-decorators@npm:6.1.1"
-  dependencies:
-    "@ember-decorators/component": ^6.1.1
-    "@ember-decorators/object": ^6.1.1
-    ember-cli-babel: ^7.7.3
-  checksum: ffe95d41dae393586190340c0e65d772c2132ff50269ef21a408d999e10fff79214ac9e14a49e1a94bf3fdd18c660759bc23c79de9ca41375f0e9ba8204b5168
-  languageName: node
-  linkType: hard
-
-"ember-destroyable-polyfill@npm:^2.0.2, ember-destroyable-polyfill@npm:^2.0.3":
-  version: 2.0.3
-  resolution: "ember-destroyable-polyfill@npm:2.0.3"
-  dependencies:
-    ember-cli-babel: ^7.22.1
-    ember-cli-version-checker: ^5.1.1
-    ember-compatibility-helpers: ^1.2.1
-  checksum: 1c96c453a7be71a76a117421a5571a073cd85c56525a2de146728091f2c639fff93216eedae2baf437576d62906e885adce996619104bcc28c3af66bdf720099
-  languageName: node
-  linkType: hard
-
-"ember-element-helper@npm:^0.6.0":
-  version: 0.6.1
-  resolution: "ember-element-helper@npm:0.6.1"
-  dependencies:
-    "@embroider/util": ^0.39.1 || ^0.40.0 || ^0.41.0 || ^1.0.0
-    ember-cli-babel: ^7.26.11
-    ember-cli-htmlbars: ^6.0.1
-  peerDependencies:
-    ember-source: ^3.8 || 4
-  checksum: 36110a5b5a504169abe80d004f8ad9eba56c0d8b602211606ad6ab88d541b93f7621a740c0a4a972036d5b390e42f59d638575dd4748b184e1d6f33586851e03
-  languageName: node
-  linkType: hard
-
-"ember-engines@npm:0.8.23":
-  version: 0.8.23
-  resolution: "ember-engines@npm:0.8.23"
-  dependencies:
-    "@embroider/macros": ^1.3.0
-    amd-name-resolver: 1.3.1
-    babel-plugin-compact-reexports: ^1.1.0
-    broccoli-babel-transpiler: ^7.2.0
-    broccoli-concat: ^4.2.5
-    broccoli-debug: ^0.6.5
-    broccoli-dependency-funnel: ^2.1.2
-    broccoli-file-creator: ^2.1.1
-    broccoli-funnel: ^2.0.2
-    broccoli-merge-trees: ^3.0.2
-    broccoli-test-helper: ^2.0.0
-    calculate-cache-key-for-tree: ^2.0.0
-    ember-asset-loader: ^0.6.1
-    ember-cli-babel: ^7.18.0
-    ember-cli-preprocess-registry: ^3.3.0
-    ember-cli-string-utils: ^1.1.0
-    ember-cli-version-checker: ^5.1.2
-    lodash: ^4.17.11
-  peerDependencies:
-    "@ember/legacy-built-in-components": "*"
-    ember-source: ^3.12 || 4
-  checksum: 167b8101b1254c8bc5d5c88623f3d34e95284003674dccefadf006db4a3c42172a2512b198489a7b50be233b09b3617e67bfde3c6f2daf56acbd2ceda416808e
-  languageName: node
-  linkType: hard
-
-"ember-export-application-global@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "ember-export-application-global@npm:2.0.1"
-  checksum: 0dadf284bb06173132e49f18a4a894d1df56b2cc64d61149443d01dd7572aad70c44d2b86ae40274c9144255bf9f01caa46f1c8013004333a538a6d9b34c3aa4
-  languageName: node
-  linkType: hard
-
-"ember-fetch@npm:^8.1.1":
-  version: 8.1.1
-  resolution: "ember-fetch@npm:8.1.1"
-  dependencies:
-    abortcontroller-polyfill: ^1.7.3
-    broccoli-concat: ^4.2.5
-    broccoli-debug: ^0.6.5
-    broccoli-merge-trees: ^4.2.0
-    broccoli-rollup: ^2.1.1
-    broccoli-stew: ^3.0.0
-    broccoli-templater: ^2.0.1
-    calculate-cache-key-for-tree: ^2.0.0
-    caniuse-api: ^3.0.0
-    ember-cli-babel: ^7.23.1
-    ember-cli-typescript: ^4.1.0
-    ember-cli-version-checker: ^5.1.2
-    node-fetch: ^2.6.1
-    whatwg-fetch: ^3.6.2
-  checksum: 208486312d87d13137ff79eb3fd3cf00c5f370824273a51bed90d814fb81c9a1ce037ed7b0174703440566c100dc3a2ca9a0625085ce377e7bd6f4b09c7f6b62
-  languageName: node
-  linkType: hard
-
-"ember-focus-trap@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "ember-focus-trap@npm:1.0.1"
-  dependencies:
-    "@embroider/addon-shim": ^1.0.0
-    focus-trap: ^6.7.1
-  checksum: 1c4b218b0991b3c90411733cf578aa59cc1b7b08ba7654d2ac9540218c07f8c2879ed98c6472c9dea813863500e9dc3279d517ac422d4861a4e4442a1b651e0e
-  languageName: node
-  linkType: hard
-
-"ember-get-config@npm:0.2.4 - 0.5.0":
-  version: 0.5.0
-  resolution: "ember-get-config@npm:0.5.0"
-  dependencies:
-    broccoli-file-creator: ^1.1.1
-    ember-cli-babel: ^7.26.6
-    ember-cli-htmlbars: ^5.7.1
-  checksum: c9ca75a44764705ea62324dba90770ae608d8614c1222ddc9f22ede506f056e65d0e2e518fbc3aa2665ea32e2d4c2735fff9fe4e031d1827c3ebaad3b03bfea2
-  languageName: node
-  linkType: hard
-
-"ember-get-config@npm:^1.0.2 || ^2.0.0":
-  version: 2.1.1
-  resolution: "ember-get-config@npm:2.1.1"
-  dependencies:
-    "@embroider/macros": ^0.50.0 || ^1.0.0
-    ember-cli-babel: ^7.26.6
-  checksum: 850bc718ad2df98ab08e566f14b857fcad3aa5f31aac2a114bcbde27000dfd727a7af3c428c73a383d1f7243819486c28f0a69a31b44027e50c4f51d8602ef19
-  languageName: node
-  linkType: hard
-
-"ember-in-element-polyfill@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "ember-in-element-polyfill@npm:1.0.1"
-  dependencies:
-    debug: ^4.3.1
-    ember-cli-babel: ^7.23.1
-    ember-cli-htmlbars: ^5.3.1
-    ember-cli-version-checker: ^5.1.2
-  checksum: fda95b1bd56dd2eefea014e9131eb03d5e3f34aa08c4f7b2fd4e717d001aa3a029c7a9d1725975085641924be7924c43f12ecade5642677d405f9566776c1507
-  languageName: node
-  linkType: hard
-
-"ember-inflector@npm:4.0.2, ember-inflector@npm:^2.0.0 || ^3.0.0 || ^4.0.2, ember-inflector@npm:^4.0.2":
-  version: 4.0.2
-  resolution: "ember-inflector@npm:4.0.2"
-  dependencies:
-    ember-cli-babel: ^7.26.5
-  checksum: 0433146a7a093cf0f5e1454f3820c773d5f4ee7ca069df0eddc712f39d45a52bb699f8e44cd163815fb0c5abe75480b8511a947647b0f3cb38768147f457adae
-  languageName: node
-  linkType: hard
-
-"ember-keyboard@npm:^8.1.0":
-  version: 8.2.0
-  resolution: "ember-keyboard@npm:8.2.0"
-  dependencies:
-    "@embroider/addon-shim": ^1.5.0
-    ember-destroyable-polyfill: ^2.0.3
-    ember-modifier: ^2.1.2 || ^3.1.0 || ^4.0.0
-    ember-modifier-manager-polyfill: ^1.2.0
-  peerDependencies:
-    "@ember/test-helpers": ^2.6.0
-  peerDependenciesMeta:
-    "@ember/test-helpers":
-      optional: true
-  checksum: d8e9c8d78175b411c40b88288ef91902278011d242ed0775e64df492089210e0b3dfc0eee7de4fe11a33d918d40639fc5aee7ba26ba9695b507cabb5e52fa844
-  languageName: node
-  linkType: hard
-
-"ember-load-initializers@npm:^2.1.2":
-  version: 2.1.2
-  resolution: "ember-load-initializers@npm:2.1.2"
-  dependencies:
-    ember-cli-babel: ^7.13.0
-    ember-cli-typescript: ^2.0.2
-  checksum: 104b38cb4b755894b65d39ab94f316bdb1b571884b8e52118ced0bfeb06de8e3e7685dcc4579fd8dae57fc6c62e2e50df042e782e960565e05a4cf4eaf6db337
-  languageName: node
-  linkType: hard
-
-"ember-maybe-in-element@npm:^2.0.3":
-  version: 2.0.3
-  resolution: "ember-maybe-in-element@npm:2.0.3"
-  dependencies:
-    ember-cli-babel: ^7.21.0
-    ember-cli-htmlbars: ^5.2.0
-    ember-cli-version-checker: ^5.1.1
-    ember-in-element-polyfill: ^1.0.1
-  checksum: 4bd0e66f748eac053dc2fed2b19a227bd159eb84cb1084bea2941af454a1135969a6efb36c298a9c06c36a7697e34819e9ff0ef1dcb18fa64d11dce09b75b523
-  languageName: node
-  linkType: hard
-
-"ember-modal-dialog@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "ember-modal-dialog@npm:4.0.1"
-  dependencies:
-    "@embroider/macros": ^1.0.0
-    "@embroider/util": ^1.0.0
-    ember-cli-babel: ^7.26.8
-    ember-cli-htmlbars: ^6.0.1
-    ember-cli-version-checker: ^2.1.0
-    ember-decorators: ^6.1.1
-    ember-wormhole: ^0.6.0
-  peerDependencies:
-    ember-tether: ^2.0.1
-  peerDependenciesMeta:
-    ember-tether:
-      optional: true
-  checksum: d8005d3f9e0aab6fc4ce3f16a8bfb5ff9308e8ab9292b7e1be84e657f179f749414c9b0c029bf5c060526de0058fcb0acb38c3d19c80ad67e9ceb034de4b4e0c
-  languageName: node
-  linkType: hard
-
-"ember-modifier-manager-polyfill@npm:^1.1.0, ember-modifier-manager-polyfill@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "ember-modifier-manager-polyfill@npm:1.2.0"
-  dependencies:
-    ember-cli-babel: ^7.10.0
-    ember-cli-version-checker: ^2.1.2
-    ember-compatibility-helpers: ^1.2.0
-  checksum: 70b0d1c8601766e2d8356bd61b1ebd9ffbdec180eb42e7d0ed9dccd79513a84aedde9f9c13357ea3b063733a63d9ea1996de73b2d09d3f6a0bce3674a92fde18
-  languageName: node
-  linkType: hard
-
-"ember-modifier@npm:^2.1.2 || ^3.1.0 || ^4.0.0":
-  version: 4.0.0
-  resolution: "ember-modifier@npm:4.0.0"
-  dependencies:
-    "@embroider/addon-shim": ^1.8.4
-    ember-cli-normalize-entity-name: ^1.0.0
-    ember-cli-string-utils: ^1.1.0
-  peerDependencies:
-    ember-source: "*"
-  peerDependenciesMeta:
-    ember-source:
-      optional: true
-  checksum: 8970eee22666426abed22414fc12f1547b4c02618297648ace0c22ec3db5299afe522ac2130148e6daeded0c70ad7005418c21888b8e4198e0c6b04c5f751312
-  languageName: node
-  linkType: hard
-
-"ember-modifier@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "ember-modifier@npm:3.1.0"
-  dependencies:
-    ember-cli-babel: ^7.26.6
-    ember-cli-normalize-entity-name: ^1.0.0
-    ember-cli-string-utils: ^1.1.0
-    ember-cli-typescript: ^4.2.1
-    ember-compatibility-helpers: ^1.2.5
-  checksum: 9e70f3def1f9270711723483cd1a0f3498a35af6db70f440fbe57fbed09c3e721f722d50ff3d48ba49627529d1d5965e6f6409a3570efa285d985435588a0d54
-  languageName: node
-  linkType: hard
-
-"ember-modifier@npm:^3.2.7":
-  version: 3.2.7
-  resolution: "ember-modifier@npm:3.2.7"
-  dependencies:
-    ember-cli-babel: ^7.26.6
-    ember-cli-normalize-entity-name: ^1.0.0
-    ember-cli-string-utils: ^1.1.0
-    ember-cli-typescript: ^5.0.0
-    ember-compatibility-helpers: ^1.2.5
-  checksum: 2e96d9ec3939de178a9ce704d5a9360fd73f0276ffa4a9cce9f100a4087fdc8fae4a8b28bf1be22b05a4d1c61e1bb1ab93ca60576810c6556bc4d9323864c66a
-  languageName: node
-  linkType: hard
-
-"ember-named-blocks-polyfill@npm:^0.2.5":
-  version: 0.2.5
-  resolution: "ember-named-blocks-polyfill@npm:0.2.5"
-  dependencies:
-    ember-cli-babel: ^7.19.0
-    ember-cli-version-checker: ^5.1.1
-  checksum: f3ca8eeb61a208bf4690d423806b35371b5f01c58028404c9065d7d6e289d2220f40232756718a784fe0d0a65ed9c5a66a3df76f4abd222d07fca35886f5c583
-  languageName: node
-  linkType: hard
-
-"ember-native-dom-helpers@npm:^0.7.0":
-  version: 0.7.0
-  resolution: "ember-native-dom-helpers@npm:0.7.0"
-  dependencies:
-    broccoli-funnel: ^1.1.0
-    ember-cli-babel: ^6.6.0
-  checksum: 958ed8ff1b1d31c598ba73dfb53d551448fcb377a02ed224e93360d39369c0937063fce1da72f1c2329d85b77701fc84646b248fb2bee83e0b8535566a9fa436
-  languageName: node
-  linkType: hard
-
-"ember-page-title@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "ember-page-title@npm:7.0.0"
-  dependencies:
-    ember-cli-babel: ^7.26.6
-  checksum: 2533d6fa3aaeb37950f44dc8e50ce2e30008106fbded78136fb4bbfc8bc3240b24ccf0cfadb71154744b0483ae06a9d9b557edfbdbe397c0e8096448c76095ed
-  languageName: node
-  linkType: hard
-
-"ember-power-select@npm:6.0.1":
-  version: 6.0.1
-  resolution: "ember-power-select@npm:6.0.1"
-  dependencies:
-    "@embroider/util": ^1.0.0
-    "@glimmer/component": ^1.1.2
-    "@glimmer/tracking": ^1.1.2
-    ember-assign-helper: ^0.4.0
-    ember-basic-dropdown: ^6.0.0
-    ember-cli-babel: ^7.26.11
-    ember-cli-htmlbars: ^6.1.0
-    ember-cli-typescript: ^4.2.0
-    ember-concurrency: ">=1.0.0 <3"
-    ember-concurrency-decorators: ^2.0.0
-    ember-text-measurer: ^0.6.0
-    ember-truth-helpers: ^3.0.0
-  checksum: 3cefce209966a3d419796275f89252216e66c265186f22572962be961d071cfa46548ba067ec9af9c0e100c1979f845d71d2d86bfde46796ce56840e0d8eeedf
-  languageName: node
-  linkType: hard
-
-"ember-qrcode-shim@npm:^0.4.0":
-  version: 0.4.0
-  resolution: "ember-qrcode-shim@npm:0.4.0"
-  dependencies:
-    ember-cli-babel: ^7.1.2
-  checksum: eb25f33c4559d3810a6473a98a4d4fa73e209d59e1d2a05837f7538aa6451f06954dcbae1a9ebedd379d837ab36a7f677909c1fe264a9361be72a89b3b7a5e23
-  languageName: node
-  linkType: hard
-
-"ember-qunit@npm:6.0.0":
-  version: 6.0.0
-  resolution: "ember-qunit@npm:6.0.0"
-  dependencies:
-    broccoli-funnel: ^3.0.8
-    broccoli-merge-trees: ^3.0.2
-    common-tags: ^1.8.0
-    ember-auto-import: ^2.4.2
-    ember-cli-babel: ^7.26.6
-    ember-cli-test-loader: ^3.0.0
-    resolve-package-path: ^4.0.3
-    silent-error: ^1.1.1
-    validate-peer-dependencies: ^2.1.0
-  peerDependencies:
-    "@ember/test-helpers": ^2.4.0
-    qunit: ^2.13.0
-  checksum: 74c4c9316ff509a195e7961bae9aa1da6e6260d1a5e0ce153dff76302d23f974fa652dfc9d484fbe78d64623ba0d837b68d437d56745531118b88b950c6a5608
-  languageName: node
-  linkType: hard
-
-"ember-resolver@npm:^8.0.3":
-  version: 8.0.3
-  resolution: "ember-resolver@npm:8.0.3"
-  dependencies:
-    babel-plugin-debug-macros: ^0.3.4
-    broccoli-funnel: ^3.0.8
-    broccoli-merge-trees: ^4.2.0
-    ember-cli-babel: ^7.26.6
-    ember-cli-version-checker: ^5.1.2
-    resolve: ^1.20.0
-  checksum: 510c48a3318b5b2884bfc4322767dfe66980ffd50f4e44e90d4228e91bd34a04876367c78dc987857d645eec6252e86c91e1050237c112ed27a3a4914e452fd2
-  languageName: node
-  linkType: hard
-
-"ember-resources@npm:^5.0.1":
-  version: 5.6.3
-  resolution: "ember-resources@npm:5.6.3"
-  dependencies:
-    "@babel/runtime": ^7.17.8
-    "@embroider/addon-shim": ^1.2.0
-    "@embroider/macros": ^1.2.0
-  peerDependencies:
-    "@ember/test-waiters": ^3.0.0
-    "@glimmer/component": ^1.1.2
-    "@glimmer/tracking": ^1.1.2
-    "@glint/template": ">= 0.8.3"
-    ember-concurrency: ^2.0.0
-    ember-source: ">= 3.28.0"
-  peerDependenciesMeta:
-    "@ember/test-waiters":
-      optional: true
-    "@glimmer/component":
-      optional: true
-    ember-concurrency:
-      optional: true
-  checksum: e548c00336ad970b77a7da016798061f648f7105848d508a66dbed9c70c3939c921772df59a14656e8974559c86148ed550407722e20b1d8bb18ae3dba95e881
-  languageName: node
-  linkType: hard
-
-"ember-responsive@npm:5.0.0":
-  version: 5.0.0
-  resolution: "ember-responsive@npm:5.0.0"
-  dependencies:
-    ember-cli-babel: ^7.26.11
-  checksum: 6d36a773e3a682ab8252a4f6416a95eb4c7fa76b72ac0cdc8ca6cd17adb764f59f39cba98f8227f52f42044a1c1073763e2689d34948b6207a0ca17f398b0a55
-  languageName: node
-  linkType: hard
-
-"ember-rfc176-data@npm:^0.3.13, ember-rfc176-data@npm:^0.3.15, ember-rfc176-data@npm:^0.3.17":
-  version: 0.3.17
-  resolution: "ember-rfc176-data@npm:0.3.17"
-  checksum: bc35da90149178d4c0e67097446d46ab69910571fcd02308dead097ca21c6d86767c4031d2bba4df267213ce6c43d1fe5660ded9e061051c1d84ba171fd02366
-  languageName: node
-  linkType: hard
-
-"ember-router-generator@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "ember-router-generator@npm:2.0.0"
-  dependencies:
-    "@babel/parser": ^7.4.5
-    "@babel/traverse": ^7.4.5
-    recast: ^0.18.1
-  checksum: e163e0d68e49a942658aee7c05638dd5c2db939753b51efc9c6d9f0e582953be185daf4cdd569c1b8a35ed47f35f4cb18067a6a1db68e135d7464bbad6ef9d93
-  languageName: node
-  linkType: hard
-
-"ember-router-helpers@npm:^0.4.0":
-  version: 0.4.0
-  resolution: "ember-router-helpers@npm:0.4.0"
-  dependencies:
-    ember-cli-babel: ^7.20.0
-  checksum: e847ceb1061f87416d6bb5d72ef539fda738a24086051bc94d740117c6353b3406c65247ac8190b8572df008a70d9f801e224d38489170129c5ca6c4ec7f206e
-  languageName: node
-  linkType: hard
-
-"ember-service-worker@meirish/ember-service-worker#configurable-scope":
-  version: 9.0.1
-  resolution: "ember-service-worker@https://github.com/meirish/ember-service-worker.git#commit=dda14187aace0d73ecdb6a55beac2194a3aec01b"
-  dependencies:
-    "@rollup/plugin-replace": 2.3.0
-    broccoli-caching-writer: ^3.0.3
-    broccoli-file-creator: ^2.1.1
-    broccoli-funnel: ^2.0.2
-    broccoli-merge-trees: ^3.0.1
-    broccoli-rollup: 4.0.0
-    broccoli-uglify-sourcemap: ^3.2.0
-    clone: ^2.1.2
-    ember-cli-babel: ^7.22.1
-    glob: ^7.1.6
-    hash-for-dep: ^1.5.1
-  checksum: 17e2f2a03cdf0ae9c5f4b0bd25a1b631849392b31e7bc4d376253511d1d6bc7338253fb36a4d7323ceb6b0eb319399a7e964a50ad9df381e64c4ac0d5b07a0b6
-  languageName: node
-  linkType: hard
-
-"ember-sinon@npm:^4.0.0":
-  version: 4.1.1
-  resolution: "ember-sinon@npm:4.1.1"
-  dependencies:
-    broccoli-funnel: ^2.0.0
-    broccoli-merge-trees: ^3.0.0
-    ember-cli-babel: ^7.7.3
-    sinon: ^7.4.2
-  checksum: 8781e420e1495728264599a770d786290a46eceb841ea6a0b86cf196efd9155e78931ea3c88bfd546bd4b9c1627c0bd0edb6cdd957abbe6faa71247de8184443
-  languageName: node
-  linkType: hard
-
-"ember-source-channel-url@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "ember-source-channel-url@npm:3.0.0"
-  dependencies:
-    node-fetch: ^2.6.0
-  bin:
-    ember-source-channel-url: bin/ember-source-channel-url
-  checksum: 17f24d48b7264be0a17336a2efcdd8ef26a61683858bd398de2de32fc611e6ff13d22873924dfa97b67da0e4da2dd41444f9cb0408052f0faf31aa6dceb96dd1
-  languageName: node
-  linkType: hard
-
-"ember-source@npm:4.4.4":
-  version: 4.4.4
-  resolution: "ember-source@npm:4.4.4"
-  dependencies:
-    "@babel/helper-module-imports": ^7.16.7
-    "@babel/plugin-transform-block-scoping": ^7.16.0
-    "@ember/edition-utils": ^1.2.0
-    "@glimmer/vm-babel-plugins": 0.83.1
-    babel-plugin-debug-macros: ^0.3.4
-    babel-plugin-filter-imports: ^4.0.0
-    broccoli-concat: ^4.2.5
-    broccoli-debug: ^0.6.4
-    broccoli-file-creator: ^2.1.1
-    broccoli-funnel: ^3.0.8
-    broccoli-merge-trees: ^4.2.0
-    chalk: ^4.0.0
-    ember-auto-import: ^2.4.0
-    ember-cli-babel: ^7.26.11
-    ember-cli-get-component-path-option: ^1.0.0
-    ember-cli-is-package-missing: ^1.0.0
-    ember-cli-normalize-entity-name: ^1.0.0
-    ember-cli-path-utils: ^1.0.0
-    ember-cli-string-utils: ^1.1.0
-    ember-cli-typescript-blueprint-polyfill: ^0.1.0
-    ember-cli-version-checker: ^5.1.2
-    ember-router-generator: ^2.0.0
-    inflection: ^1.13.2
-    resolve: ^1.22.0
-    semver: ^7.3.4
-    silent-error: ^1.1.1
-  checksum: e14dc1e7524b5ad209b109bf2d147c95c903ab11aabfcd0d6ff4dd4976ffb185c4332675b56cf366e4c025a5f8cfa3758bc3ba5d6ad557b66573c3d9d48df438
-  languageName: node
-  linkType: hard
-
-"ember-stargate@npm:^0.4.3":
-  version: 0.4.3
-  resolution: "ember-stargate@npm:0.4.3"
-  dependencies:
-    "@ember/render-modifiers": ^2.0.0
-    "@embroider/addon-shim": ^1.0.0
-    "@glimmer/component": ^1.1.2
-    ember-resources: ^5.0.1
-    tracked-maps-and-sets: ^3.0.1
-  checksum: b41c0dd65c59e298d0a9f9b31fd5035b7824d8ebc0a92b47d52dc559b553ade3e9126bc4f647521138f09b34f80ed297300b6d428583b9a294de5071d5890bf6
-  languageName: node
-  linkType: hard
-
-"ember-style-modifier@npm:^0.8.0":
-  version: 0.8.0
-  resolution: "ember-style-modifier@npm:0.8.0"
-  dependencies:
-    ember-cli-babel: ^7.26.6
-    ember-modifier: ^3.2.7
-  checksum: ae105c24d05be275d47eff3563f0df9d59c4047c4b6afcc2903dbbfa87d5833ccd66bf5e6bee6244505cba404289f5f302112bb4d83f4edf9400507bb4ffe877
-  languageName: node
-  linkType: hard
-
-"ember-svg-jar@npm:2.4.0":
-  version: 2.4.0
-  resolution: "ember-svg-jar@npm:2.4.0"
-  dependencies:
-    broccoli-caching-writer: ^3.0.3
-    broccoli-concat: ^4.2.5
-    broccoli-funnel: ^3.0.8
-    broccoli-merge-trees: ^4.2.0
-    broccoli-persistent-filter: ^3.1.2
-    broccoli-plugin: ^4.0.7
-    broccoli-string-replace: ^0.1.2
-    broccoli-svg-optimizer: ^2.1.0
-    cheerio: ^1.0.0-rc.12
-    console-ui: ^3.1.1
-    ember-cli-babel: ^7.26.6
-    ember-cli-htmlbars: ^5.7.1
-    lodash: ^4.17.15
-    safe-stable-stringify: ^2.2.0
-  checksum: d2c7eb54c3aab45fe80775470e52d5db93e4fe60c9ecd95d614897cb2275bce92a0b5389914b40ad84509dcf400e1ec384ea192a25a325f30f6b848d8637d145
-  languageName: node
-  linkType: hard
-
-"ember-template-lint-plugin-prettier@npm:4.0.0":
-  version: 4.0.0
-  resolution: "ember-template-lint-plugin-prettier@npm:4.0.0"
-  dependencies:
-    prettier-linter-helpers: ^1.0.0
-  peerDependencies:
-    ember-template-lint: ^4.0.0
-    prettier: ">=1.18.1"
-  checksum: 1b6d94803a51991f952a7a426578a677cbd04402c8236073b6b4bc0fd27871b07088463566e77ddd2ed381b4368dd8a1258af8d17f2cf4102e429d946448e3c1
-  languageName: node
-  linkType: hard
-
-"ember-template-lint@npm:4.8.0":
-  version: 4.8.0
-  resolution: "ember-template-lint@npm:4.8.0"
-  dependencies:
-    "@lint-todo/utils": ^13.0.3
-    aria-query: ^5.0.0
-    chalk: ^4.1.2
-    ci-info: ^3.3.0
-    date-fns: ^2.28.0
-    ember-template-recast: ^6.1.3
-    find-up: ^6.3.0
-    fuse.js: ^6.5.3
-    get-stdin: ^9.0.0
-    globby: ^13.1.1
-    is-glob: ^4.0.3
-    language-tags: ^1.0.5
-    micromatch: ^4.0.5
-    resolve: ^1.22.0
-    v8-compile-cache: ^2.3.0
-    yargs: ^17.4.1
-  bin:
-    ember-template-lint: bin/ember-template-lint.js
-  checksum: cd656d4f12de31b05e99e7fc964d1b8bcd9871c5c07acd00e7d8229e15bc06c673cac03dbf7109e704693471ed165398b4605b6ed5aafea89ba757ba00728ba8
-  languageName: node
-  linkType: hard
-
-"ember-template-recast@npm:^6.1.3":
-  version: 6.1.3
-  resolution: "ember-template-recast@npm:6.1.3"
-  dependencies:
-    "@glimmer/reference": ^0.83.1
-    "@glimmer/syntax": ^0.83.1
-    "@glimmer/validator": ^0.83.0
-    async-promise-queue: ^1.0.5
-    colors: ^1.4.0
-    commander: ^8.3.0
-    globby: ^11.0.3
-    ora: ^5.4.0
-    slash: ^3.0.0
-    tmp: ^0.2.1
-    workerpool: ^6.1.5
-  bin:
-    ember-template-recast: lib/bin.js
-  checksum: 8f53c14411abcc084fc38e9ad7ccebf71480ac778b43a6b1d08778425669a4f51ff2108e71c201d50b262b0fd52f3a331e119f0e4be58ae3ba2e8b3cff5e7f31
-  languageName: node
-  linkType: hard
-
-"ember-test-selectors@npm:6.0.0":
-  version: 6.0.0
-  resolution: "ember-test-selectors@npm:6.0.0"
-  dependencies:
-    calculate-cache-key-for-tree: ^2.0.0
-    ember-cli-babel: ^7.26.4
-    ember-cli-version-checker: ^5.1.2
-  checksum: f03bd35caca4390613f68192b257b8edb836cec847ed966e75cd19ce58e5cf62c6a6107575feea0da9b6885cbf4141842b4de05a14edbf3e4164bd93d0c05601
-  languageName: node
-  linkType: hard
-
-"ember-tether@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "ember-tether@npm:2.0.1"
-  dependencies:
-    ember-auto-import: ^1.2.19
-    ember-cli-babel: ^7.1.2
-    tether: ^1.4.0
-  checksum: bfe7d52129b67a6dda79e67cf82d49e3fe5039b9bb8694c1c8f1ba48a7993b2355c4b624d0d95a2497263b8c1ab37d75a1bf650b72e1336c663c43ede9ddf7b0
-  languageName: node
-  linkType: hard
-
-"ember-text-measurer@npm:^0.6.0":
-  version: 0.6.0
-  resolution: "ember-text-measurer@npm:0.6.0"
-  dependencies:
-    ember-cli-babel: ^7.19.0
-    ember-cli-htmlbars: ^4.3.1
-  checksum: 27991766045bba77515ecf6e9609f580ee38b2e53026206d18155cbeac87e57979e613a73ca2fae51ed79e00ab6bf71aff7ce07e1e7a15851e2f013ff8c06c97
-  languageName: node
-  linkType: hard
-
-"ember-tracked-storage-polyfill@npm:1.0.0":
-  version: 1.0.0
-  resolution: "ember-tracked-storage-polyfill@npm:1.0.0"
-  dependencies:
-    ember-cli-babel: ^7.26.3
-    ember-cli-htmlbars: ^5.7.1
-  checksum: f0e1df126b17cd58a78e81cf73e6a3fa8b7052e3e7058537cce9f658463b0e7f5c3fa1baebff85e19617f5eab1fa762a9dd1f17738b7baca50ef5481dc20d672
-  languageName: node
-  linkType: hard
-
-"ember-truth-helpers@npm:3.0.0, ember-truth-helpers@npm:^2.1.0 || ^3.0.0":
-  version: 3.0.0
-  resolution: "ember-truth-helpers@npm:3.0.0"
-  dependencies:
-    ember-cli-babel: ^7.22.1
-  checksum: 2848f30eb35046be4d5c4ae6ab36aa374d860ba37dbd6f529467182ead80166e2fc881f615f3fa0b25fd2ecf73e237c6f61e67bd182149776240d9ee3852a343
-  languageName: node
-  linkType: hard
-
-"ember-truth-helpers@npm:^3.0.0":
-  version: 3.1.1
-  resolution: "ember-truth-helpers@npm:3.1.1"
-  dependencies:
-    ember-cli-babel: ^7.22.1
-  checksum: 6f3a779ae714cec543b39ca93caa98121e65046e48929e1890aa24b2592c4e90a703148694bae9d7ca9bfc68d9ae1f7e00392f0f288158ee962aefbae1f3c0b0
-  languageName: node
-  linkType: hard
-
-"ember-wormhole@npm:0.6.0, ember-wormhole@npm:^0.6.0":
-  version: 0.6.0
-  resolution: "ember-wormhole@npm:0.6.0"
-  dependencies:
-    ember-cli-babel: ^7.22.1
-    ember-cli-htmlbars: ^5.3.1
-  checksum: e49975babc0d9b79b18bca00916fe2bbb77253948e1074c291e0a2f22b97f049c68a6d5e4ddef703a69e7a390c56fa6e52c128848c75da7507af3f022debb3db
-  languageName: node
-  linkType: hard
-
-"emoji-regex@npm:^7.0.1":
-  version: 7.0.3
-  resolution: "emoji-regex@npm:7.0.3"
-  checksum: 9159b2228b1511f2870ac5920f394c7e041715429a68459ebe531601555f11ea782a8e1718f969df2711d38c66268174407cbca57ce36485544f695c2dfdc96e
-  languageName: node
-  linkType: hard
-
-"emoji-regex@npm:^8.0.0":
-  version: 8.0.0
-  resolution: "emoji-regex@npm:8.0.0"
-  checksum: d4c5c39d5a9868b5fa152f00cada8a936868fd3367f33f71be515ecee4c803132d11b31a6222b2571b1e5f7e13890156a94880345594d0ce7e3c9895f560f192
-  languageName: node
-  linkType: hard
-
-"emoji-regex@npm:~6.1.0":
-  version: 6.1.3
-  resolution: "emoji-regex@npm:6.1.3"
-  checksum: 348c4808cdc614e5522023c1f102eb06093ca24c693c7aa074fac93d3880c51948e9468bf91554d2e77ce47f0053411767aae21dd58fed12fdc54c2352a07976
-  languageName: node
-  linkType: hard
-
-"emojis-list@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "emojis-list@npm:3.0.0"
-  checksum: ddaaa02542e1e9436c03970eeed445f4ed29a5337dfba0fe0c38dfdd2af5da2429c2a0821304e8a8d1cadf27fdd5b22ff793571fa803ae16852a6975c65e8e70
-  languageName: node
-  linkType: hard
-
-"encodeurl@npm:~1.0.2":
-  version: 1.0.2
-  resolution: "encodeurl@npm:1.0.2"
-  checksum: e50e3d508cdd9c4565ba72d2012e65038e5d71bdc9198cb125beb6237b5b1ade6c0d343998da9e170fb2eae52c1bed37d4d6d98a46ea423a0cddbed5ac3f780c
-  languageName: node
-  linkType: hard
-
-"encoding@npm:^0.1.13":
-  version: 0.1.13
-  resolution: "encoding@npm:0.1.13"
-  dependencies:
-    iconv-lite: ^0.6.2
-  checksum: bb98632f8ffa823996e508ce6a58ffcf5856330fde839ae42c9e1f436cc3b5cc651d4aeae72222916545428e54fd0f6aa8862fd8d25bdbcc4589f1e3f3715e7f
-  languageName: node
-  linkType: hard
-
-"end-of-stream@npm:^1.0.0, end-of-stream@npm:^1.1.0":
-  version: 1.4.4
-  resolution: "end-of-stream@npm:1.4.4"
-  dependencies:
-    once: ^1.4.0
-  checksum: 530a5a5a1e517e962854a31693dbb5c0b2fc40b46dad2a56a2deec656ca040631124f4795823acc68238147805f8b021abbe221f4afed5ef3c8e8efc2024908b
-  languageName: node
-  linkType: hard
-
-"engine.io-parser@npm:~5.0.3":
-  version: 5.0.4
-  resolution: "engine.io-parser@npm:5.0.4"
-  checksum: d4ad0cef6ff63c350e35696da9bb3dbd180f67b56e93e90375010cc40393e6c0639b780d5680807e1d93a7e2e3d7b4a1c3b27cf75db28eb8cbf605bc1497da03
-  languageName: node
-  linkType: hard
-
-"engine.io@npm:~6.2.0":
-  version: 6.2.0
-  resolution: "engine.io@npm:6.2.0"
-  dependencies:
-    "@types/cookie": ^0.4.1
-    "@types/cors": ^2.8.12
-    "@types/node": ">=10.0.0"
-    accepts: ~1.3.4
-    base64id: 2.0.0
-    cookie: ~0.4.1
-    cors: ~2.8.5
-    debug: ~4.3.1
-    engine.io-parser: ~5.0.3
-    ws: ~8.2.3
-  checksum: cc485c5ba2e0c4f6ca02dcafd192b22f9dad89d01dc815005298780d3fb910db4cebab4696e8615290c473c2eeb259e8bee2a1fb7ab594d9c80f9f3485771911
-  languageName: node
-  linkType: hard
-
-"enhanced-resolve@npm:^4.0.0, enhanced-resolve@npm:^4.5.0":
-  version: 4.5.0
-  resolution: "enhanced-resolve@npm:4.5.0"
-  dependencies:
-    graceful-fs: ^4.1.2
-    memory-fs: ^0.5.0
-    tapable: ^1.0.0
-  checksum: 4d87488584c4d67d356ef4ba04978af4b2d4d18190cb859efac8e8475a34d5d6c069df33faa5a0a22920b0586dbf330f6a08d52bb15a8771a9ce4d70a2da74ba
-  languageName: node
-  linkType: hard
-
-"enhanced-resolve@npm:^5.9.3":
-  version: 5.9.3
-  resolution: "enhanced-resolve@npm:5.9.3"
-  dependencies:
-    graceful-fs: ^4.2.4
-    tapable: ^2.2.0
-  checksum: 64c2dbbdd608d1a4df93b6e60786c603a1faf3b2e66dfd051d62cf4cfaeeb5e800166183685587208d62e9f7afff3f78f3d5978e32cd80125ba0c83b59a79d78
-  languageName: node
-  linkType: hard
-
-"enquirer@npm:^2.3.5, enquirer@npm:^2.3.6":
-  version: 2.3.6
-  resolution: "enquirer@npm:2.3.6"
-  dependencies:
-    ansi-colors: ^4.1.1
-  checksum: 1c0911e14a6f8d26721c91e01db06092a5f7675159f0261d69c403396a385afd13dd76825e7678f66daffa930cfaa8d45f506fb35f818a2788463d022af1b884
-  languageName: node
-  linkType: hard
-
-"ensure-posix-path@npm:^1.0.0, ensure-posix-path@npm:^1.0.1, ensure-posix-path@npm:^1.0.2, ensure-posix-path@npm:^1.1.0, ensure-posix-path@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "ensure-posix-path@npm:1.1.1"
-  checksum: 90ac69f48a08003abe6f194b75bad78c3320762bd193a063eb76cd8f696be6a34e1524f16435eeee09ccbe3a719a7fb76409dead3ccedd10e32d906ff050457b
-  languageName: node
-  linkType: hard
-
-"entities@npm:^2.0.0":
-  version: 2.2.0
-  resolution: "entities@npm:2.2.0"
-  checksum: 19010dacaf0912c895ea262b4f6128574f9ccf8d4b3b65c7e8334ad0079b3706376360e28d8843ff50a78aabcb8f08f0a32dbfacdc77e47ed77ca08b713669b3
-  languageName: node
-  linkType: hard
-
-"entities@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "entities@npm:3.0.1"
-  checksum: aaf7f12033f0939be91f5161593f853f2da55866db55ccbf72f45430b8977e2b79dbd58c53d0fdd2d00bd7d313b75b0968d09f038df88e308aa97e39f9456572
-  languageName: node
-  linkType: hard
-
-"entities@npm:^4.2.0, entities@npm:^4.3.0, entities@npm:^4.4.0":
-  version: 4.4.0
-  resolution: "entities@npm:4.4.0"
-  checksum: 84d250329f4b56b40fa93ed067b194db21e8815e4eb9b59f43a086f0ecd342814f6bc483de8a77da5d64e0f626033192b1b4f1792232a7ea6b970ebe0f3187c2
-  languageName: node
-  linkType: hard
-
-"entities@npm:~1.1.1":
-  version: 1.1.2
-  resolution: "entities@npm:1.1.2"
-  checksum: d537b02799bdd4784ffd714d000597ed168727bddf4885da887c5a491d735739029a00794f1998abbf35f3f6aeda32ef5c15010dca1817d401903a501b6d3e05
-  languageName: node
-  linkType: hard
-
-"entities@npm:~2.1.0":
-  version: 2.1.0
-  resolution: "entities@npm:2.1.0"
-  checksum: a10a877e489586a3f6a691fe49bf3fc4e58f06c8e80522f08214a5150ba457e7017b447d4913a3fa041bda06ee4c92517baa4d8d75373eaa79369e9639225ffd
-  languageName: node
-  linkType: hard
-
-"env-paths@npm:^2.2.0":
-  version: 2.2.1
-  resolution: "env-paths@npm:2.2.1"
-  checksum: 65b5df55a8bab92229ab2b40dad3b387fad24613263d103a97f91c9fe43ceb21965cd3392b1ccb5d77088021e525c4e0481adb309625d0cb94ade1d1fb8dc17e
-  languageName: node
-  linkType: hard
-
-"err-code@npm:^2.0.2":
-  version: 2.0.3
-  resolution: "err-code@npm:2.0.3"
-  checksum: 8b7b1be20d2de12d2255c0bc2ca638b7af5171142693299416e6a9339bd7d88fc8d7707d913d78e0993176005405a236b066b45666b27b797252c771156ace54
-  languageName: node
-  linkType: hard
-
-"errlop@npm:^2.0.0":
-  version: 2.2.0
-  resolution: "errlop@npm:2.2.0"
-  checksum: 9bce5eba67866b168cfbc98de46df4d7ad7a8e75fb12a40ade886d801dbe4c9d5d640a0bb6a41552a47aeda00c26db97182732213d7d523439e10dc6a853bd7d
-  languageName: node
-  linkType: hard
-
-"errno@npm:^0.1.3, errno@npm:~0.1.7":
-  version: 0.1.8
-  resolution: "errno@npm:0.1.8"
-  dependencies:
-    prr: ~1.0.1
-  bin:
-    errno: cli.js
-  checksum: 1271f7b9fbb3bcbec76ffde932485d1e3561856d21d847ec613a9722ee924cdd4e523a62dc71a44174d91e898fe21fdc8d5b50823f4b5e0ce8c35c8271e6ef4a
-  languageName: node
-  linkType: hard
-
-"error-ex@npm:^1.3.1":
-  version: 1.3.2
-  resolution: "error-ex@npm:1.3.2"
-  dependencies:
-    is-arrayish: ^0.2.1
-  checksum: c1c2b8b65f9c91b0f9d75f0debaa7ec5b35c266c2cac5de412c1a6de86d4cbae04ae44e510378cb14d032d0645a36925d0186f8bb7367bcc629db256b743a001
-  languageName: node
-  linkType: hard
-
-"error@npm:^7.0.0":
-  version: 7.2.1
-  resolution: "error@npm:7.2.1"
-  dependencies:
-    string-template: ~0.2.1
-  checksum: 9c790d20a386947acfeabb0d1c39173efe8e5a38cb732b5f06c11a25c23ce8ac4dafbb7aa240565e034580a49aba0703e743d0274c6228500ddf947a1b998568
-  languageName: node
-  linkType: hard
-
-"es-abstract@npm:^1.17.2":
-  version: 1.18.0
-  resolution: "es-abstract@npm:1.18.0"
-  dependencies:
-    call-bind: ^1.0.2
-    es-to-primitive: ^1.2.1
-    function-bind: ^1.1.1
-    get-intrinsic: ^1.1.1
-    has: ^1.0.3
-    has-symbols: ^1.0.2
-    is-callable: ^1.2.3
-    is-negative-zero: ^2.0.1
-    is-regex: ^1.1.2
-    is-string: ^1.0.5
-    object-inspect: ^1.9.0
-    object-keys: ^1.1.1
-    object.assign: ^4.1.2
-    string.prototype.trimend: ^1.0.4
-    string.prototype.trimstart: ^1.0.4
-    unbox-primitive: ^1.0.0
-  checksum: 6783bea97f372fd4f1fc77e4e294d024b9f40559a83b40c46b69565511cf13d462a6189b822228c6bb818bd09d2f23b33500206d39bbdc69f7cc7ffebf6640a1
-  languageName: node
-  linkType: hard
-
-"es-abstract@npm:^1.18.0-next.2, es-abstract@npm:^1.19.1":
-  version: 1.19.1
-  resolution: "es-abstract@npm:1.19.1"
-  dependencies:
-    call-bind: ^1.0.2
-    es-to-primitive: ^1.2.1
-    function-bind: ^1.1.1
-    get-intrinsic: ^1.1.1
-    get-symbol-description: ^1.0.0
-    has: ^1.0.3
-    has-symbols: ^1.0.2
-    internal-slot: ^1.0.3
-    is-callable: ^1.2.4
-    is-negative-zero: ^2.0.1
-    is-regex: ^1.1.4
-    is-shared-array-buffer: ^1.0.1
-    is-string: ^1.0.7
-    is-weakref: ^1.0.1
-    object-inspect: ^1.11.0
-    object-keys: ^1.1.1
-    object.assign: ^4.1.2
-    string.prototype.trimend: ^1.0.4
-    string.prototype.trimstart: ^1.0.4
-    unbox-primitive: ^1.0.1
-  checksum: b6be8410672c5364db3fb01eb786e30c7b4bb32b4af63d381c08840f4382c4a168e7855cd338bf59d4f1a1a1138f4d748d1fd40ec65aaa071876f9e9fbfed949
-  languageName: node
-  linkType: hard
-
-"es-module-lexer@npm:^0.9.0":
-  version: 0.9.3
-  resolution: "es-module-lexer@npm:0.9.3"
-  checksum: 84bbab23c396281db2c906c766af58b1ae2a1a2599844a504df10b9e8dc77ec800b3211fdaa133ff700f5703d791198807bba25d9667392d27a5e9feda344da8
-  languageName: node
-  linkType: hard
-
-"es-to-primitive@npm:^1.2.1":
-  version: 1.2.1
-  resolution: "es-to-primitive@npm:1.2.1"
-  dependencies:
-    is-callable: ^1.1.4
-    is-date-object: ^1.0.1
-    is-symbol: ^1.0.2
-  checksum: 4ead6671a2c1402619bdd77f3503991232ca15e17e46222b0a41a5d81aebc8740a77822f5b3c965008e631153e9ef0580540007744521e72de8e33599fca2eed
-  languageName: node
-  linkType: hard
-
-"es6-promise@npm:^4.0.3":
-  version: 4.2.8
-  resolution: "es6-promise@npm:4.2.8"
-  checksum: 95614a88873611cb9165a85d36afa7268af5c03a378b35ca7bda9508e1d4f1f6f19a788d4bc755b3fd37c8ebba40782018e02034564ff24c9d6fa37e959ad57d
-  languageName: node
-  linkType: hard
-
-"es6-promisify@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "es6-promisify@npm:5.0.0"
-  dependencies:
-    es6-promise: ^4.0.3
-  checksum: fbed9d791598831413be84a5374eca8c24800ec71a16c1c528c43a98e2dadfb99331483d83ae6094ddb9b87e6f799a15d1553cebf756047e0865c753bc346b92
-  languageName: node
-  linkType: hard
-
-"escalade@npm:^3.1.1":
-  version: 3.1.1
-  resolution: "escalade@npm:3.1.1"
-  checksum: a3e2a99f07acb74b3ad4989c48ca0c3140f69f923e56d0cba0526240ee470b91010f9d39001f2a4a313841d237ede70a729e92125191ba5d21e74b106800b133
-  languageName: node
-  linkType: hard
-
-"escape-html@npm:~1.0.3":
-  version: 1.0.3
-  resolution: "escape-html@npm:1.0.3"
-  checksum: 6213ca9ae00d0ab8bccb6d8d4e0a98e76237b2410302cf7df70aaa6591d509a2a37ce8998008cbecae8fc8ffaadf3fb0229535e6a145f3ce0b211d060decbb24
-  languageName: node
-  linkType: hard
-
-"escape-string-regexp@npm:^1.0.2, escape-string-regexp@npm:^1.0.5":
-  version: 1.0.5
-  resolution: "escape-string-regexp@npm:1.0.5"
-  checksum: 6092fda75c63b110c706b6a9bfde8a612ad595b628f0bd2147eea1d3406723020810e591effc7db1da91d80a71a737a313567c5abb3813e8d9c71f4aa595b410
-  languageName: node
-  linkType: hard
-
-"escape-string-regexp@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "escape-string-regexp@npm:2.0.0"
-  checksum: 9f8a2d5743677c16e85c810e3024d54f0c8dea6424fad3c79ef6666e81dd0846f7437f5e729dfcdac8981bc9e5294c39b4580814d114076b8d36318f46ae4395
-  languageName: node
-  linkType: hard
-
-"escape-string-regexp@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "escape-string-regexp@npm:4.0.0"
-  checksum: 98b48897d93060f2322108bf29db0feba7dd774be96cd069458d1453347b25ce8682ecc39859d4bca2203cc0ab19c237bcc71755eff49a0f8d90beadeeba5cc5
-  languageName: node
-  linkType: hard
-
-"escodegen@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "escodegen@npm:2.0.0"
-  dependencies:
-    esprima: ^4.0.1
-    estraverse: ^5.2.0
-    esutils: ^2.0.2
-    optionator: ^0.8.1
-    source-map: ~0.6.1
-  dependenciesMeta:
-    source-map:
-      optional: true
-  bin:
-    escodegen: bin/escodegen.js
-    esgenerate: bin/esgenerate.js
-  checksum: 5aa6b2966fafe0545e4e77936300cc94ad57cfe4dc4ebff9950492eaba83eef634503f12d7e3cbd644ecc1bab388ad0e92b06fd32222c9281a75d1cf02ec6cef
-  languageName: node
-  linkType: hard
-
-"eslint-config-prettier@npm:^8.5.0":
-  version: 8.5.0
-  resolution: "eslint-config-prettier@npm:8.5.0"
-  peerDependencies:
-    eslint: ">=7.0.0"
-  bin:
-    eslint-config-prettier: bin/cli.js
-  checksum: 0d0f5c32e7a0ad91249467ce71ca92394ccd343178277d318baf32063b79ea90216f4c81d1065d60f96366fdc60f151d4d68ae7811a58bd37228b84c2083f893
-  languageName: node
-  linkType: hard
-
-"eslint-plugin-compat@npm:4.0.2":
-  version: 4.0.2
-  resolution: "eslint-plugin-compat@npm:4.0.2"
-  dependencies:
-    "@mdn/browser-compat-data": ^4.1.5
-    ast-metadata-inferer: ^0.7.0
-    browserslist: ^4.16.8
-    caniuse-lite: ^1.0.30001304
-    core-js: ^3.16.2
-    find-up: ^5.0.0
-    lodash.memoize: 4.1.2
-    semver: 7.3.5
-  peerDependencies:
-    eslint: ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0
-  checksum: 2a1c1ebfd2d9a0e94064417f0f582b183d95bad08014e1f39dd1b4b599c1e909872ea344e016ec8fb297fcf8ab5d0c0b10032f1c2d6d4f9fb57a8a9fad67130e
-  languageName: node
-  linkType: hard
-
-"eslint-plugin-ember@npm:^10.6.1":
-  version: 10.6.1
-  resolution: "eslint-plugin-ember@npm:10.6.1"
-  dependencies:
-    "@ember-data/rfc395-data": ^0.0.4
-    css-tree: ^2.0.4
-    ember-rfc176-data: ^0.3.15
-    eslint-utils: ^3.0.0
-    estraverse: ^5.2.0
-    lodash.kebabcase: ^4.1.1
-    requireindex: ^1.2.0
-    snake-case: ^3.0.3
-  peerDependencies:
-    eslint: ">= 6"
-  checksum: 806ddd3c874a3fdac3dd718df16203e6b8e65c7aabb568cb797763ba68c14ab4ac30cce4059151d42a9ee3df0e4b383f28b5b121c6c756f5ad051f4726b84908
-  languageName: node
-  linkType: hard
-
-"eslint-plugin-es@npm:^3.0.0":
-  version: 3.0.1
-  resolution: "eslint-plugin-es@npm:3.0.1"
-  dependencies:
-    eslint-utils: ^2.0.0
-    regexpp: ^3.0.0
-  peerDependencies:
-    eslint: ">=4.19.1"
-  checksum: e57592c52301ee8ddc296ae44216df007f3a870bcb3be8d1fbdb909a1d3a3efe3fa3785de02066f9eba1d6466b722d3eb3cc3f8b75b3cf6a1cbded31ac6298e4
-  languageName: node
-  linkType: hard
-
-"eslint-plugin-node@npm:^11.1.0":
-  version: 11.1.0
-  resolution: "eslint-plugin-node@npm:11.1.0"
-  dependencies:
-    eslint-plugin-es: ^3.0.0
-    eslint-utils: ^2.0.0
-    ignore: ^5.1.1
-    minimatch: ^3.0.4
-    resolve: ^1.10.1
-    semver: ^6.1.0
-  peerDependencies:
-    eslint: ">=5.16.0"
-  checksum: 5804c4f8a6e721f183ef31d46fbe3b4e1265832f352810060e0502aeac7de034df83352fc88643b19641bb2163f2587f1bd4119aff0fd21e8d98c57c450e013b
-  languageName: node
-  linkType: hard
-
-"eslint-plugin-prettier@npm:^4.0.0":
-  version: 4.2.1
-  resolution: "eslint-plugin-prettier@npm:4.2.1"
-  dependencies:
-    prettier-linter-helpers: ^1.0.0
-  peerDependencies:
-    eslint: ">=7.28.0"
-    prettier: ">=2.0.0"
-  peerDependenciesMeta:
-    eslint-config-prettier:
-      optional: true
-  checksum: b9e839d2334ad8ec7a5589c5cb0f219bded260839a857d7a486997f9870e95106aa59b8756ff3f37202085ebab658de382b0267cae44c3a7f0eb0bcc03a4f6d6
-  languageName: node
-  linkType: hard
-
-"eslint-plugin-qunit@npm:^7.2.0":
-  version: 7.3.1
-  resolution: "eslint-plugin-qunit@npm:7.3.1"
-  dependencies:
-    eslint-utils: ^3.0.0
-    requireindex: ^1.2.0
-  checksum: 3c223751b62c365d8a4ceb57986731da2e0e5149b721efe0591a580ba3cd495bc3c42c5951c5b294fdf0cfbbdb03c2f8afd43c42d4c14c3f7e74d30fc280af09
-  languageName: node
-  linkType: hard
-
-"eslint-scope@npm:5.1.1, eslint-scope@npm:^5.1.1":
-  version: 5.1.1
-  resolution: "eslint-scope@npm:5.1.1"
-  dependencies:
-    esrecurse: ^4.3.0
-    estraverse: ^4.1.1
-  checksum: 47e4b6a3f0cc29c7feedee6c67b225a2da7e155802c6ea13bbef4ac6b9e10c66cd2dcb987867ef176292bf4e64eccc680a49e35e9e9c669f4a02bac17e86abdb
-  languageName: node
-  linkType: hard
-
-"eslint-scope@npm:^4.0.3":
-  version: 4.0.3
-  resolution: "eslint-scope@npm:4.0.3"
-  dependencies:
-    esrecurse: ^4.1.0
-    estraverse: ^4.1.1
-  checksum: c5f835f681884469991fe58d76a554688d9c9e50811299ccd4a8f79993a039f5bcb0ee6e8de2b0017d97c794b5832ef3b21c9aac66228e3aa0f7a0485bcfb65b
-  languageName: node
-  linkType: hard
-
-"eslint-scope@npm:^7.0.0, eslint-scope@npm:^7.1.1":
-  version: 7.1.1
-  resolution: "eslint-scope@npm:7.1.1"
-  dependencies:
-    esrecurse: ^4.3.0
-    estraverse: ^5.2.0
-  checksum: 9f6e974ab2db641ca8ab13508c405b7b859e72afe9f254e8131ff154d2f40c99ad4545ce326fd9fde3212ff29707102562a4834f1c48617b35d98c71a97fbf3e
-  languageName: node
-  linkType: hard
-
-"eslint-utils@npm:^1.4.1":
-  version: 1.4.3
-  resolution: "eslint-utils@npm:1.4.3"
-  dependencies:
-    eslint-visitor-keys: ^1.1.0
-  checksum: a20630e686034107138272f245c460f6d77705d1f4bb0628c1a1faf59fc800f441188916b3ec3b957394dc405aa200a3017dfa2b0fff0976e307a4e645a18d1e
-  languageName: node
-  linkType: hard
-
-"eslint-visitor-keys@npm:^1.0.0, eslint-visitor-keys@npm:^1.1.0, eslint-visitor-keys@npm:^1.3.0":
-  version: 1.3.0
-  resolution: "eslint-visitor-keys@npm:1.3.0"
-  checksum: 37a19b712f42f4c9027e8ba98c2b06031c17e0c0a4c696cd429bd9ee04eb43889c446f2cd545e1ff51bef9593fcec94ecd2c2ef89129fcbbf3adadbef520376a
-  languageName: node
-  linkType: hard
-
-"eslint-visitor-keys@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "eslint-visitor-keys@npm:2.0.0"
-  checksum: e07e9863fb8c9b1453f5ad1a26f3cc8dd6b349b26605cc06bc0c61215ac5b6f13a4d08c875218e6c0f8ac8fc06ca6e090df769e32c569f0fd2e6a848b8a76c75
-  languageName: node
-  linkType: hard
-
-"eslint-visitor-keys@npm:^3.1.0, eslint-visitor-keys@npm:^3.3.0":
-  version: 3.3.0
-  resolution: "eslint-visitor-keys@npm:3.3.0"
-  checksum: d59e68a7c5a6d0146526b0eec16ce87fbf97fe46b8281e0d41384224375c4e52f5ffb9e16d48f4ea50785cde93f766b0c898e31ab89978d88b0e1720fbfb7808
-  languageName: node
-  linkType: hard
-
-"eslint@npm:^7.32.0":
-  version: 7.32.0
-  resolution: "eslint@npm:7.32.0"
-  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
-  bin:
-    eslint: bin/eslint.js
-  checksum: cc85af9985a3a11085c011f3d27abe8111006d34cc274291b3c4d7bea51a4e2ff6135780249becd919ba7f6d6d1ecc38a6b73dacb6a7be08d38453b344dc8d37
-  languageName: node
-  linkType: hard
-
-"eslint@npm:^8.21.0, eslint@npm:^8.7.0":
-  version: 8.27.0
-  resolution: "eslint@npm:8.27.0"
-  dependencies:
-    "@eslint/eslintrc": ^1.3.3
-    "@humanwhocodes/config-array": ^0.11.6
-    "@humanwhocodes/module-importer": ^1.0.1
-    "@nodelib/fs.walk": ^1.2.8
-    ajv: ^6.10.0
-    chalk: ^4.0.0
-    cross-spawn: ^7.0.2
-    debug: ^4.3.2
-    doctrine: ^3.0.0
-    escape-string-regexp: ^4.0.0
-    eslint-scope: ^7.1.1
-    eslint-utils: ^3.0.0
-    eslint-visitor-keys: ^3.3.0
-    espree: ^9.4.0
-    esquery: ^1.4.0
-    esutils: ^2.0.2
-    fast-deep-equal: ^3.1.3
-    file-entry-cache: ^6.0.1
-    find-up: ^5.0.0
-    glob-parent: ^6.0.2
-    globals: ^13.15.0
-    grapheme-splitter: ^1.0.4
-    ignore: ^5.2.0
-    import-fresh: ^3.0.0
-    imurmurhash: ^0.1.4
-    is-glob: ^4.0.0
-    is-path-inside: ^3.0.3
-    js-sdsl: ^4.1.4
-    js-yaml: ^4.1.0
-    json-stable-stringify-without-jsonify: ^1.0.1
-    levn: ^0.4.1
-    lodash.merge: ^4.6.2
-    minimatch: ^3.1.2
-    natural-compare: ^1.4.0
-    optionator: ^0.9.1
-    regexpp: ^3.2.0
-    strip-ansi: ^6.0.1
-    strip-json-comments: ^3.1.0
-    text-table: ^0.2.0
-  bin:
-    eslint: bin/eslint.js
-  checksum: 153b022d309e1b647a73b1bb0fa98912add699b06e279084155f23c6f2b5fc5abd05411fc1ba81608a24bbfaf044ca079544c16fffa6fc987b8f676c9960a2c4
-  languageName: node
-  linkType: hard
-
-"esm@npm:^3.2.4":
-  version: 3.2.25
-  resolution: "esm@npm:3.2.25"
-  checksum: 978aabe2de83541c105605a6d60a26ed8e627ef6bb0a7605fe15a95bbdea6b8348bd045255cb22219c054dd09a81a94823df00843d9e97f42419c92015ce3a64
-  languageName: node
-  linkType: hard
-
-"espree@npm:^7.3.0, espree@npm:^7.3.1":
-  version: 7.3.1
-  resolution: "espree@npm:7.3.1"
-  dependencies:
-    acorn: ^7.4.0
-    acorn-jsx: ^5.3.1
-    eslint-visitor-keys: ^1.3.0
-  checksum: aa9b50dcce883449af2e23bc2b8d9abb77118f96f4cb313935d6b220f77137eaef7724a83c3f6243b96bc0e4ab14766198e60818caad99f9519ae5a336a39b45
-  languageName: node
-  linkType: hard
-
-"espree@npm:^9.0.0, espree@npm:^9.4.0":
-  version: 9.4.1
-  resolution: "espree@npm:9.4.1"
-  dependencies:
-    acorn: ^8.8.0
-    acorn-jsx: ^5.3.2
-    eslint-visitor-keys: ^3.3.0
-  checksum: 4d266b0cf81c7dfe69e542c7df0f246e78d29f5b04dda36e514eb4c7af117ee6cfbd3280e560571ed82ff6c9c3f0003c05b82583fc7a94006db7497c4fe4270e
-  languageName: node
-  linkType: hard
-
-"esprima@npm:^4.0.0, esprima@npm:^4.0.1, esprima@npm:~4.0.0":
-  version: 4.0.1
-  resolution: "esprima@npm:4.0.1"
-  bin:
-    esparse: ./bin/esparse.js
-    esvalidate: ./bin/esvalidate.js
-  checksum: b45bc805a613dbea2835278c306b91aff6173c8d034223fa81498c77dcbce3b2931bf6006db816f62eacd9fd4ea975dfd85a5b7f3c6402cfd050d4ca3c13a628
-  languageName: node
-  linkType: hard
-
-"esprima@npm:~3.0.0":
-  version: 3.0.0
-  resolution: "esprima@npm:3.0.0"
-  bin:
-    esparse: ./bin/esparse.js
-    esvalidate: ./bin/esvalidate.js
-  checksum: d6d65bc4ec29f1278357013117f944742e06905989d4fd023c4378d11e631c1a990ecea9c3dc394091ab183d8f23b5e9b3ab7f7816643d8dffb35b1bcef9d334
-  languageName: node
-  linkType: hard
-
-"esquery@npm:^1.4.0":
-  version: 1.4.0
-  resolution: "esquery@npm:1.4.0"
-  dependencies:
-    estraverse: ^5.1.0
-  checksum: a0807e17abd7fbe5fbd4fab673038d6d8a50675cdae6b04fbaa520c34581be0c5fa24582990e8acd8854f671dd291c78bb2efb9e0ed5b62f33bac4f9cf820210
-  languageName: node
-  linkType: hard
-
-"esrecurse@npm:^4.1.0, esrecurse@npm:^4.3.0":
-  version: 4.3.0
-  resolution: "esrecurse@npm:4.3.0"
-  dependencies:
-    estraverse: ^5.2.0
-  checksum: ebc17b1a33c51cef46fdc28b958994b1dc43cd2e86237515cbc3b4e5d2be6a811b2315d0a1a4d9d340b6d2308b15322f5c8291059521cc5f4802f65e7ec32837
-  languageName: node
-  linkType: hard
-
-"estraverse@npm:^4.1.1":
-  version: 4.3.0
-  resolution: "estraverse@npm:4.3.0"
-  checksum: a6299491f9940bb246124a8d44b7b7a413a8336f5436f9837aaa9330209bd9ee8af7e91a654a3545aee9c54b3308e78ee360cef1d777d37cfef77d2fa33b5827
-  languageName: node
-  linkType: hard
-
-"estraverse@npm:^5.1.0, estraverse@npm:^5.2.0":
-  version: 5.2.0
-  resolution: "estraverse@npm:5.2.0"
-  checksum: ec11b70d946bf5d7f76f91db38ef6f08109ac1b36cda293a26e678e58df4719f57f67b9ec87042afdd1f0267cee91865be3aa48d2161765a93defab5431be7b8
-  languageName: node
-  linkType: hard
-
-"estree-walker@npm:^0.6.1":
-  version: 0.6.1
-  resolution: "estree-walker@npm:0.6.1"
-  checksum: 9d6f82a4921f11eec18f8089fb3cce6e53bcf45a8e545c42a2674d02d055fb30f25f90495f8be60803df6c39680c80dcee7f944526867eb7aa1fc9254883b23d
-  languageName: node
-  linkType: hard
-
-"esutils@npm:^2.0.2":
-  version: 2.0.3
-  resolution: "esutils@npm:2.0.3"
-  checksum: 22b5b08f74737379a840b8ed2036a5fb35826c709ab000683b092d9054e5c2a82c27818f12604bfc2a9a76b90b6834ef081edbc1c7ae30d1627012e067c6ec87
-  languageName: node
-  linkType: hard
-
-"etag@npm:~1.8.1":
-  version: 1.8.1
-  resolution: "etag@npm:1.8.1"
-  checksum: 571aeb3dbe0f2bbd4e4fadbdb44f325fc75335cd5f6f6b6a091e6a06a9f25ed5392f0863c5442acb0646787446e816f13cbfc6edce5b07658541dff573cab1ff
-  languageName: node
-  linkType: hard
-
-"eventemitter3@npm:^4.0.0":
-  version: 4.0.7
-  resolution: "eventemitter3@npm:4.0.7"
-  checksum: 1875311c42fcfe9c707b2712c32664a245629b42bb0a5a84439762dd0fd637fc54d078155ea83c2af9e0323c9ac13687e03cfba79b03af9f40c89b4960099374
-  languageName: node
-  linkType: hard
-
-"events-to-array@npm:^1.0.1":
-  version: 1.1.2
-  resolution: "events-to-array@npm:1.1.2"
-  checksum: c4f5f0f6d0c8658b96f940f703ac9c8c99effca1dd7b1f8eb030be7a940725b42a72fa5eb405961c171c2e9e1d5b7efa9a75be5cdaba88f3fc0fcce59d0e6a0f
-  languageName: node
-  linkType: hard
-
-"events@npm:^3.0.0, events@npm:^3.2.0":
-  version: 3.3.0
-  resolution: "events@npm:3.3.0"
-  checksum: f6f487ad2198aa41d878fa31452f1a3c00958f46e9019286ff4787c84aac329332ab45c9cdc8c445928fc6d7ded294b9e005a7fce9426488518017831b272780
-  languageName: node
-  linkType: hard
-
-"evp_bytestokey@npm:^1.0.0, evp_bytestokey@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "evp_bytestokey@npm:1.0.3"
-  dependencies:
-    md5.js: ^1.3.4
-    node-gyp: latest
-    safe-buffer: ^5.1.1
-  checksum: ad4e1577f1a6b721c7800dcc7c733fe01f6c310732bb5bf2240245c2a5b45a38518b91d8be2c610611623160b9d1c0e91f1ce96d639f8b53e8894625cf20fa45
-  languageName: node
-  linkType: hard
-
-"exec-sh@npm:^0.3.2, exec-sh@npm:^0.3.4":
-  version: 0.3.6
-  resolution: "exec-sh@npm:0.3.6"
-  checksum: 0be4f06929c8e4834ea4812f29fe59e2dfcc1bc3fc4b4bb71acb38a500c3b394628a05ef7ba432520bc6c5ec4fadab00cc9c513c4ff6a32104965af302e998e0
-  languageName: node
-  linkType: hard
-
-"execa@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "execa@npm:1.0.0"
-  dependencies:
-    cross-spawn: ^6.0.0
-    get-stream: ^4.0.0
-    is-stream: ^1.1.0
-    npm-run-path: ^2.0.0
-    p-finally: ^1.0.0
-    signal-exit: ^3.0.0
-    strip-eof: ^1.0.0
-  checksum: ddf1342c1c7d02dd93b41364cd847640f6163350d9439071abf70bf4ceb1b9b2b2e37f54babb1d8dc1df8e0d8def32d0e81e74a2e62c3e1d70c303eb4c306bc4
-  languageName: node
-  linkType: hard
-
-"execa@npm:^2.0.0":
-  version: 2.1.0
-  resolution: "execa@npm:2.1.0"
-  dependencies:
-    cross-spawn: ^7.0.0
-    get-stream: ^5.0.0
-    is-stream: ^2.0.0
-    merge-stream: ^2.0.0
-    npm-run-path: ^3.0.0
-    onetime: ^5.1.0
-    p-finally: ^2.0.0
-    signal-exit: ^3.0.2
-    strip-final-newline: ^2.0.0
-  checksum: 93af9b816a555d0944e0876f4ccd97e0f4593d2049e713518fd5458a7699836449c516c6bb7e6357e11431ec40cce3150625b86d1b1254180faaa0d744265eca
-  languageName: node
-  linkType: hard
-
-"execa@npm:^3.0.0":
-  version: 3.4.0
-  resolution: "execa@npm:3.4.0"
-  dependencies:
-    cross-spawn: ^7.0.0
-    get-stream: ^5.0.0
-    human-signals: ^1.1.1
-    is-stream: ^2.0.0
-    merge-stream: ^2.0.0
-    npm-run-path: ^4.0.0
-    onetime: ^5.1.0
-    p-finally: ^2.0.0
-    signal-exit: ^3.0.2
-    strip-final-newline: ^2.0.0
-  checksum: 72832ff72f79f9082dc3567775cbb52f4682452f7d8015714d924e476a37c36a98183fd669317327ed2e7800ffe7ec2a7be4bfe704a2173ef22ae00109fe9123
-  languageName: node
-  linkType: hard
-
-"execa@npm:^4.0.0, execa@npm:^4.1.0":
-  version: 4.1.0
-  resolution: "execa@npm:4.1.0"
-  dependencies:
-    cross-spawn: ^7.0.0
-    get-stream: ^5.0.0
-    human-signals: ^1.1.1
-    is-stream: ^2.0.0
-    merge-stream: ^2.0.0
-    npm-run-path: ^4.0.0
-    onetime: ^5.1.0
-    signal-exit: ^3.0.2
-    strip-final-newline: ^2.0.0
-  checksum: e30d298934d9c52f90f3847704fd8224e849a081ab2b517bbc02f5f7732c24e56a21f14cb96a08256deffeb2d12b2b7cb7e2b014a12fb36f8d3357e06417ed55
-  languageName: node
-  linkType: hard
-
-"execa@npm:^5.1.1":
-  version: 5.1.1
-  resolution: "execa@npm:5.1.1"
-  dependencies:
-    cross-spawn: ^7.0.3
-    get-stream: ^6.0.0
-    human-signals: ^2.1.0
-    is-stream: ^2.0.0
-    merge-stream: ^2.0.0
-    npm-run-path: ^4.0.1
-    onetime: ^5.1.2
-    signal-exit: ^3.0.3
-    strip-final-newline: ^2.0.0
-  checksum: fba9022c8c8c15ed862847e94c252b3d946036d7547af310e344a527e59021fd8b6bb0723883ea87044dc4f0201f949046993124a42ccb0855cae5bf8c786343
-  languageName: node
-  linkType: hard
-
-"exists-sync@npm:0.0.4":
-  version: 0.0.4
-  resolution: "exists-sync@npm:0.0.4"
-  checksum: bb80d4570253bd1f932f3d62adada3acd7df9dddeba1c19181ed2f77111cad48e02913c341cac5079ad97e03b718f92a69b8e427946d7939c9487299a62035b4
-  languageName: node
-  linkType: hard
-
-"exit@npm:^0.1.2":
-  version: 0.1.2
-  resolution: "exit@npm:0.1.2"
-  checksum: abc407f07a875c3961e4781dfcb743b58d6c93de9ab263f4f8c9d23bb6da5f9b7764fc773f86b43dd88030444d5ab8abcb611cb680fba8ca075362b77114bba3
-  languageName: node
-  linkType: hard
-
-"expand-brackets@npm:^2.1.4":
-  version: 2.1.4
-  resolution: "expand-brackets@npm:2.1.4"
-  dependencies:
-    debug: ^2.3.3
-    define-property: ^0.2.5
-    extend-shallow: ^2.0.1
-    posix-character-classes: ^0.1.0
-    regex-not: ^1.0.0
-    snapdragon: ^0.8.1
-    to-regex: ^3.0.1
-  checksum: 1781d422e7edfa20009e2abda673cadb040a6037f0bd30fcd7357304f4f0c284afd420d7622722ca4a016f39b6d091841ab57b401c1f7e2e5131ac65b9f14fa1
-  languageName: node
-  linkType: hard
-
-"expand-tilde@npm:^2.0.0, expand-tilde@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "expand-tilde@npm:2.0.2"
-  dependencies:
-    homedir-polyfill: ^1.0.1
-  checksum: 2efe6ed407d229981b1b6ceb552438fbc9e5c7d6a6751ad6ced3e0aa5cf12f0b299da695e90d6c2ac79191b5c53c613e508f7149e4573abfbb540698ddb7301a
-  languageName: node
-  linkType: hard
-
-"express@npm:^4.10.7":
-  version: 4.17.1
-  resolution: "express@npm:4.17.1"
-  dependencies:
-    accepts: ~1.3.7
-    array-flatten: 1.1.1
-    body-parser: 1.19.0
-    content-disposition: 0.5.3
-    content-type: ~1.0.4
-    cookie: 0.4.0
-    cookie-signature: 1.0.6
-    debug: 2.6.9
-    depd: ~1.1.2
-    encodeurl: ~1.0.2
-    escape-html: ~1.0.3
-    etag: ~1.8.1
-    finalhandler: ~1.1.2
-    fresh: 0.5.2
-    merge-descriptors: 1.0.1
-    methods: ~1.1.2
-    on-finished: ~2.3.0
-    parseurl: ~1.3.3
-    path-to-regexp: 0.1.7
-    proxy-addr: ~2.0.5
-    qs: 6.7.0
-    range-parser: ~1.2.1
-    safe-buffer: 5.1.2
-    send: 0.17.1
-    serve-static: 1.14.1
-    setprototypeof: 1.1.1
-    statuses: ~1.5.0
-    type-is: ~1.6.18
-    utils-merge: 1.0.1
-    vary: ~1.1.2
-  checksum: d964e9e17af331ea6fa2f84999b063bc47189dd71b4a735df83f9126d3bb2b92e830f1cb1d7c2742530eb625e2689d7a9a9c71f0c3cc4dd6015c3cd32a01abd5
-  languageName: node
-  linkType: hard
-
-"express@npm:^4.17.2":
-  version: 4.18.1
-  resolution: "express@npm:4.18.1"
-  dependencies:
-    accepts: ~1.3.8
-    array-flatten: 1.1.1
-    body-parser: 1.20.0
-    content-disposition: 0.5.4
-    content-type: ~1.0.4
-    cookie: 0.5.0
-    cookie-signature: 1.0.6
-    debug: 2.6.9
-    depd: 2.0.0
-    encodeurl: ~1.0.2
-    escape-html: ~1.0.3
-    etag: ~1.8.1
-    finalhandler: 1.2.0
-    fresh: 0.5.2
-    http-errors: 2.0.0
-    merge-descriptors: 1.0.1
-    methods: ~1.1.2
-    on-finished: 2.4.1
-    parseurl: ~1.3.3
-    path-to-regexp: 0.1.7
-    proxy-addr: ~2.0.7
-    qs: 6.10.3
-    range-parser: ~1.2.1
-    safe-buffer: 5.2.1
-    send: 0.18.0
-    serve-static: 1.15.0
-    setprototypeof: 1.2.0
-    statuses: 2.0.1
-    type-is: ~1.6.18
-    utils-merge: 1.0.1
-    vary: ~1.1.2
-  checksum: c3d44c92e48226ef32ec978becfedb0ecf0ca21316bfd33674b3c5d20459840584f2325726a4f17f33d9c99f769636f728982d1c5433a5b6fe6eb95b8cf0c854
-  languageName: node
-  linkType: hard
-
-"extend-shallow@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "extend-shallow@npm:2.0.1"
-  dependencies:
-    is-extendable: ^0.1.0
-  checksum: 8fb58d9d7a511f4baf78d383e637bd7d2e80843bd9cd0853649108ea835208fb614da502a553acc30208e1325240bb7cc4a68473021612496bb89725483656d8
-  languageName: node
-  linkType: hard
-
-"extend-shallow@npm:^3.0.0, extend-shallow@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "extend-shallow@npm:3.0.2"
-  dependencies:
-    assign-symbols: ^1.0.0
-    is-extendable: ^1.0.1
-  checksum: a920b0cd5838a9995ace31dfd11ab5e79bf6e295aa566910ce53dff19f4b1c0fda2ef21f26b28586c7a2450ca2b42d97bd8c0f5cec9351a819222bf861e02461
-  languageName: node
-  linkType: hard
-
-"extend@npm:^3.0.0, extend@npm:~3.0.2":
-  version: 3.0.2
-  resolution: "extend@npm:3.0.2"
-  checksum: a50a8309ca65ea5d426382ff09f33586527882cf532931cb08ca786ea3146c0553310bda688710ff61d7668eba9f96b923fe1420cdf56a2c3eaf30fcab87b515
-  languageName: node
-  linkType: hard
-
-"external-editor@npm:^3.0.3":
-  version: 3.1.0
-  resolution: "external-editor@npm:3.1.0"
-  dependencies:
-    chardet: ^0.7.0
-    iconv-lite: ^0.4.24
-    tmp: ^0.0.33
-  checksum: 1c2a616a73f1b3435ce04030261bed0e22d4737e14b090bb48e58865da92529c9f2b05b893de650738d55e692d071819b45e1669259b2b354bc3154d27a698c7
-  languageName: node
-  linkType: hard
-
-"extglob@npm:^2.0.4":
-  version: 2.0.4
-  resolution: "extglob@npm:2.0.4"
-  dependencies:
-    array-unique: ^0.3.2
-    define-property: ^1.0.0
-    expand-brackets: ^2.1.4
-    extend-shallow: ^2.0.1
-    fragment-cache: ^0.2.1
-    regex-not: ^1.0.0
-    snapdragon: ^0.8.1
-    to-regex: ^3.0.1
-  checksum: a41531b8934735b684cef5e8c5a01d0f298d7d384500ceca38793a9ce098125aab04ee73e2d75d5b2901bc5dddd2b64e1b5e3bf19139ea48bac52af4a92f1d00
-  languageName: node
-  linkType: hard
-
-"extract-stack@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "extract-stack@npm:2.0.0"
-  checksum: 16a45ae6cfe7fe105061f192124cb7d98653728d81827426c4f900763f9fda56c13dd9048de6838107898536b969d1c6f98028fcf4092e542fa2616d4dacb34d
-  languageName: node
-  linkType: hard
-
-"extsprintf@npm:1.3.0":
-  version: 1.3.0
-  resolution: "extsprintf@npm:1.3.0"
-  checksum: cee7a4a1e34cffeeec18559109de92c27517e5641991ec6bab849aa64e3081022903dd53084f2080d0d2530803aa5ee84f1e9de642c365452f9e67be8f958ce2
-  languageName: node
-  linkType: hard
-
-"extsprintf@npm:^1.2.0":
-  version: 1.4.0
-  resolution: "extsprintf@npm:1.4.0"
-  checksum: 184dc8a413eb4b1ff16bdce797340e7ded4d28511d56a1c9afa5a95bcff6ace154063823eaf0206dbbb0d14059d74f382a15c34b7c0636fa74a7e681295eb67e
-  languageName: node
-  linkType: hard
-
-"fake-xml-http-request@npm:^2.1.1, fake-xml-http-request@npm:^2.1.2":
-  version: 2.1.2
-  resolution: "fake-xml-http-request@npm:2.1.2"
-  checksum: 7b1ebea1955c46cbda0e0c3308716cc82beca7bb6c549f1d1c2a8134203c9d6c5a21194e2c1e17650ff073ecbcd3e56cf1e21f248a86cbcb3567fd7a9ca4850e
-  languageName: node
-  linkType: hard
-
-"fast-deep-equal@npm:^3.1.1, fast-deep-equal@npm:^3.1.3":
-  version: 3.1.3
-  resolution: "fast-deep-equal@npm:3.1.3"
-  checksum: e21a9d8d84f53493b6aa15efc9cfd53dd5b714a1f23f67fb5dc8f574af80df889b3bce25dc081887c6d25457cce704e636395333abad896ccdec03abaf1f3f9d
-  languageName: node
-  linkType: hard
-
-"fast-diff@npm:^1.1.2":
-  version: 1.2.0
-  resolution: "fast-diff@npm:1.2.0"
-  checksum: 1b5306eaa9e826564d9e5ffcd6ebd881eb5f770b3f977fcbf38f05c824e42172b53c79920e8429c54eb742ce15a0caf268b0fdd5b38f6de52234c4a8368131ae
-  languageName: node
-  linkType: hard
-
-"fast-glob@npm:^3.0.3, fast-glob@npm:^3.1.1":
-  version: 3.2.5
-  resolution: "fast-glob@npm:3.2.5"
-  dependencies:
-    "@nodelib/fs.stat": ^2.0.2
-    "@nodelib/fs.walk": ^1.2.3
-    glob-parent: ^5.1.0
-    merge2: ^1.3.0
-    micromatch: ^4.0.2
-    picomatch: ^2.2.1
-  checksum: 5d6772c9b63dbb739d60b5630851e1f2cbf9744119e0968eac44c9f8cbc2d3d5cb4f2f0c74715ccb23daa336c87bea42186ed367e6c991afee61cd3d967320eb
-  languageName: node
-  linkType: hard
-
-"fast-glob@npm:^3.2.11":
-  version: 3.2.11
-  resolution: "fast-glob@npm:3.2.11"
-  dependencies:
-    "@nodelib/fs.stat": ^2.0.2
-    "@nodelib/fs.walk": ^1.2.3
-    glob-parent: ^5.1.2
-    merge2: ^1.3.0
-    micromatch: ^4.0.4
-  checksum: f473105324a7780a20c06de842e15ddbb41d3cb7e71d1e4fe6e8373204f22245d54f5ab9e2061e6a1c613047345954d29b022e0e76f5c28b1df9858179a0e6d7
-  languageName: node
-  linkType: hard
-
-"fast-glob@npm:^3.2.9":
-  version: 3.2.12
-  resolution: "fast-glob@npm:3.2.12"
-  dependencies:
-    "@nodelib/fs.stat": ^2.0.2
-    "@nodelib/fs.walk": ^1.2.3
-    glob-parent: ^5.1.2
-    merge2: ^1.3.0
-    micromatch: ^4.0.4
-  checksum: 0b1990f6ce831c7e28c4d505edcdaad8e27e88ab9fa65eedadb730438cfc7cde4910d6c975d6b7b8dc8a73da4773702ebcfcd6e3518e73938bb1383badfe01c2
-  languageName: node
-  linkType: hard
-
-"fast-json-stable-stringify@npm:^2.0.0":
-  version: 2.1.0
-  resolution: "fast-json-stable-stringify@npm:2.1.0"
-  checksum: b191531e36c607977e5b1c47811158733c34ccb3bfde92c44798929e9b4154884378536d26ad90dfecd32e1ffc09c545d23535ad91b3161a27ddbb8ebe0cbecb
-  languageName: node
-  linkType: hard
-
-"fast-levenshtein@npm:^2.0.6, fast-levenshtein@npm:~2.0.6":
-  version: 2.0.6
-  resolution: "fast-levenshtein@npm:2.0.6"
-  checksum: 92cfec0a8dfafd9c7a15fba8f2cc29cd0b62b85f056d99ce448bbcd9f708e18ab2764bda4dd5158364f4145a7c72788538994f0d1787b956ef0d1062b0f7c24c
-  languageName: node
-  linkType: hard
-
-"fast-ordered-set@npm:^1.0.0, fast-ordered-set@npm:^1.0.2":
-  version: 1.0.3
-  resolution: "fast-ordered-set@npm:1.0.3"
-  dependencies:
-    blank-object: ^1.0.1
-  checksum: c94a229e1c005746cd5cc920ff48003afade14210c0b7453d1d35542b46ed6e4111b94ae3673a664ff2a46835f75d73fa577a98a44e6a4624387735990454f6e
-  languageName: node
-  linkType: hard
-
-"fast-sourcemap-concat@npm:^1.4.0":
-  version: 1.4.0
-  resolution: "fast-sourcemap-concat@npm:1.4.0"
-  dependencies:
-    chalk: ^2.0.0
-    fs-extra: ^5.0.0
-    heimdalljs-logger: ^0.1.9
-    memory-streams: ^0.1.3
-    mkdirp: ^0.5.0
-    source-map: ^0.4.2
-    source-map-url: ^0.3.0
-    sourcemap-validator: ^1.1.0
-  checksum: d657d8cf5bf23a41a77014e795babfbca77a025ec3840437c42efa882f23f6fad023fdf6108672adc0f7e183c1b619b8dc28de7e297beebebb28aee3bb43be75
-  languageName: node
-  linkType: hard
-
-"fast-sourcemap-concat@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "fast-sourcemap-concat@npm:2.1.0"
-  dependencies:
-    chalk: ^2.0.0
-    fs-extra: ^5.0.0
-    heimdalljs-logger: ^0.1.9
-    memory-streams: ^0.1.3
-    mkdirp: ^0.5.0
-    source-map: ^0.4.2
-    source-map-url: ^0.3.0
-    sourcemap-validator: ^1.1.0
-  checksum: d8ee2f37ec483f4ff30988186497652e065df81f2286c3f11e2934209736d3662d9f8140d8d1d41cfb9529aff9f1a9a7960d08ac2d92f6fb2ffba3358f32f4d4
-  languageName: node
-  linkType: hard
-
-"fastq@npm:^1.6.0":
-  version: 1.11.0
-  resolution: "fastq@npm:1.11.0"
-  dependencies:
-    reusify: ^1.0.4
-  checksum: 9db0ceea9280c5f207da40c562a4e574913c18933cd74b880b01bf8e81a9a6e368ec71e89c9c1b9f4066d0275cc22600efd6dde87f713217acbf67076481734b
-  languageName: node
-  linkType: hard
-
-"fault@npm:^1.0.0":
-  version: 1.0.4
-  resolution: "fault@npm:1.0.4"
-  dependencies:
-    format: ^0.2.0
-  checksum: 5ac610d8b09424e0f2fa8cf913064372f2ee7140a203a79957f73ed557c0e79b1a3d096064d7f40bde8132a69204c1fe25ec23634c05c6da2da2039cff26c4e7
-  languageName: node
-  linkType: hard
-
-"faye-websocket@npm:^0.11.3":
-  version: 0.11.3
-  resolution: "faye-websocket@npm:0.11.3"
-  dependencies:
-    websocket-driver: ">=0.5.1"
-  checksum: d7b2d68546812ea24e3079bd1e08bf1d79cd6d6137bfcea565d1cb1f6a5fc8fc29b689df2c1aff8b8b291d60fc808e1b27aa2896b86ba77ded10f1d9734c8e9f
-  languageName: node
-  linkType: hard
-
-"fb-watchman@npm:^2.0.0, fb-watchman@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "fb-watchman@npm:2.0.1"
-  dependencies:
-    bser: 2.1.1
-  checksum: 8510230778ab3a51c27dffb1b76ef2c24fab672a42742d3c0a45c2e9d1e5f20210b1fbca33486088da4a9a3958bde96b5aec0a63aac9894b4e9df65c88b2cbd6
-  languageName: node
-  linkType: hard
-
-"figgy-pudding@npm:^3.5.1":
-  version: 3.5.2
-  resolution: "figgy-pudding@npm:3.5.2"
-  checksum: 4090bd66193693dcda605e44d6b8715d8fb5c92a67acd57826e55cf816a342f550d57e5638f822b39366e1b2fdb244e99b3068a37213aa1d6c1bf602b8fde5ae
-  languageName: node
-  linkType: hard
-
-"figures@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "figures@npm:2.0.0"
-  dependencies:
-    escape-string-regexp: ^1.0.5
-  checksum: 081beb16ea57d1716f8447c694f637668322398b57017b20929376aaf5def9823b35245b734cdd87e4832dc96e9c6f46274833cada77bfe15e5f980fea1fd21f
-  languageName: node
-  linkType: hard
-
-"figures@npm:^3.0.0, figures@npm:^3.2.0":
-  version: 3.2.0
-  resolution: "figures@npm:3.2.0"
-  dependencies:
-    escape-string-regexp: ^1.0.5
-  checksum: 85a6ad29e9aca80b49b817e7c89ecc4716ff14e3779d9835af554db91bac41c0f289c418923519392a1e582b4d10482ad282021330cd045bb7b80c84152f2a2b
-  languageName: node
-  linkType: hard
-
-"file-entry-cache@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "file-entry-cache@npm:6.0.1"
-  dependencies:
-    flat-cache: ^3.0.4
-  checksum: f49701feaa6314c8127c3c2f6173cfefff17612f5ed2daaafc6da13b5c91fd43e3b2a58fd0d63f9f94478a501b167615931e7200e31485e320f74a33885a9c74
-  languageName: node
-  linkType: hard
-
-"file-uri-to-path@npm:1.0.0":
-  version: 1.0.0
-  resolution: "file-uri-to-path@npm:1.0.0"
-  checksum: b648580bdd893a008c92c7ecc96c3ee57a5e7b6c4c18a9a09b44fb5d36d79146f8e442578bc0e173dc027adf3987e254ba1dfd6e3ec998b7c282873010502144
-  languageName: node
-  linkType: hard
-
-"filesize@npm:^4.1.2, filesize@npm:^4.2.1":
-  version: 4.2.1
-  resolution: "filesize@npm:4.2.1"
-  checksum: 3179f5852519cfe140bdd1e35852d552654e1e232f45b76d5a0df7cefa810b66b4808650cd1705ab00821c5709520bf01fbf7bf74872bd2652a420bfdcbb1a82
-  languageName: node
-  linkType: hard
-
-"filesize@npm:^8.0.6":
-  version: 8.0.7
-  resolution: "filesize@npm:8.0.7"
-  checksum: 8603d27c5287b984cb100733640645e078f5f5ad65c6d913173e01fb99e09b0747828498fd86647685ccecb69be31f3587b9739ab1e50732116b2374aff4cbf9
-  languageName: node
-  linkType: hard
-
-"fill-range@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "fill-range@npm:4.0.0"
-  dependencies:
-    extend-shallow: ^2.0.1
-    is-number: ^3.0.0
-    repeat-string: ^1.6.1
-    to-regex-range: ^2.1.0
-  checksum: dbb5102467786ab42bc7a3ec7380ae5d6bfd1b5177b2216de89e4a541193f8ba599a6db84651bd2c58c8921db41b8cc3d699ea83b477342d3ce404020f73c298
-  languageName: node
-  linkType: hard
-
-"fill-range@npm:^7.0.1":
-  version: 7.0.1
-  resolution: "fill-range@npm:7.0.1"
-  dependencies:
-    to-regex-range: ^5.0.1
-  checksum: cc283f4e65b504259e64fd969bcf4def4eb08d85565e906b7d36516e87819db52029a76b6363d0f02d0d532f0033c9603b9e2d943d56ee3b0d4f7ad3328ff917
-  languageName: node
-  linkType: hard
-
-"finalhandler@npm:1.1.2, finalhandler@npm:~1.1.2":
-  version: 1.1.2
-  resolution: "finalhandler@npm:1.1.2"
-  dependencies:
-    debug: 2.6.9
-    encodeurl: ~1.0.2
-    escape-html: ~1.0.3
-    on-finished: ~2.3.0
-    parseurl: ~1.3.3
-    statuses: ~1.5.0
-    unpipe: ~1.0.0
-  checksum: 617880460c5138dd7ccfd555cb5dde4d8f170f4b31b8bd51e4b646bb2946c30f7db716428a1f2882d730d2b72afb47d1f67cc487b874cb15426f95753a88965e
-  languageName: node
-  linkType: hard
-
-"finalhandler@npm:1.2.0":
-  version: 1.2.0
-  resolution: "finalhandler@npm:1.2.0"
-  dependencies:
-    debug: 2.6.9
-    encodeurl: ~1.0.2
-    escape-html: ~1.0.3
-    on-finished: 2.4.1
-    parseurl: ~1.3.3
-    statuses: 2.0.1
-    unpipe: ~1.0.0
-  checksum: 92effbfd32e22a7dff2994acedbd9bcc3aa646a3e919ea6a53238090e87097f8ef07cced90aa2cc421abdf993aefbdd5b00104d55c7c5479a8d00ed105b45716
-  languageName: node
-  linkType: hard
-
-"find-babel-config@npm:^1.1.0, find-babel-config@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "find-babel-config@npm:1.2.0"
-  dependencies:
-    json5: ^0.5.1
-    path-exists: ^3.0.0
-  checksum: 0a1785d3da9f38637885d9d65f183aaa072f51a834f733035e9694e4d0f6983ae8c8e75cd4e08b92af6f595b3b490ee813a1c5a9b14740685aa836fa1e878583
-  languageName: node
-  linkType: hard
-
-"find-cache-dir@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "find-cache-dir@npm:2.1.0"
-  dependencies:
-    commondir: ^1.0.1
-    make-dir: ^2.0.0
-    pkg-dir: ^3.0.0
-  checksum: 60ad475a6da9f257df4e81900f78986ab367d4f65d33cf802c5b91e969c28a8762f098693d7a571b6e4dd4c15166c2da32ae2d18b6766a18e2071079448fdce4
-  languageName: node
-  linkType: hard
-
-"find-cache-dir@npm:^3.3.1":
-  version: 3.3.2
-  resolution: "find-cache-dir@npm:3.3.2"
-  dependencies:
-    commondir: ^1.0.1
-    make-dir: ^3.0.2
-    pkg-dir: ^4.1.0
-  checksum: 1e61c2e64f5c0b1c535bd85939ae73b0e5773142713273818cc0b393ee3555fb0fd44e1a5b161b8b6c3e03e98c2fcc9c227d784850a13a90a8ab576869576817
-  languageName: node
-  linkType: hard
-
-"find-index@npm:^1.1.0":
-  version: 1.1.1
-  resolution: "find-index@npm:1.1.1"
-  checksum: 02bb296389021b6126198f87bf5306450359cac8a1332140091ae6968a9b0859d6da7257d2b06012780ea269a0673f2c2945b57fdf0342da339fb48cebea7fd1
-  languageName: node
-  linkType: hard
-
-"find-up@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "find-up@npm:2.1.0"
-  dependencies:
-    locate-path: ^2.0.0
-  checksum: 43284fe4da09f89011f08e3c32cd38401e786b19226ea440b75386c1b12a4cb738c94969808d53a84f564ede22f732c8409e3cfc3f7fb5b5c32378ad0bbf28bd
-  languageName: node
-  linkType: hard
-
-"find-up@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "find-up@npm:3.0.0"
-  dependencies:
-    locate-path: ^3.0.0
-  checksum: 38eba3fe7a66e4bc7f0f5a1366dc25508b7cfc349f852640e3678d26ad9a6d7e2c43eff0a472287de4a9753ef58f066a0ea892a256fa3636ad51b3fe1e17fae9
-  languageName: node
-  linkType: hard
-
-"find-up@npm:^4.0.0":
-  version: 4.1.0
-  resolution: "find-up@npm:4.1.0"
-  dependencies:
-    locate-path: ^5.0.0
-    path-exists: ^4.0.0
-  checksum: 4c172680e8f8c1f78839486e14a43ef82e9decd0e74145f40707cc42e7420506d5ec92d9a11c22bd2c48fb0c384ea05dd30e10dd152fefeec6f2f75282a8b844
-  languageName: node
-  linkType: hard
-
-"find-up@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "find-up@npm:5.0.0"
-  dependencies:
-    locate-path: ^6.0.0
-    path-exists: ^4.0.0
-  checksum: 07955e357348f34660bde7920783204ff5a26ac2cafcaa28bace494027158a97b9f56faaf2d89a6106211a8174db650dd9f503f9c0d526b1202d5554a00b9095
-  languageName: node
-  linkType: hard
-
-"find-up@npm:^6.3.0":
-  version: 6.3.0
-  resolution: "find-up@npm:6.3.0"
-  dependencies:
-    locate-path: ^7.1.0
-    path-exists: ^5.0.0
-  checksum: 9a21b7f9244a420e54c6df95b4f6fc3941efd3c3e5476f8274eb452f6a85706e7a6a90de71353ee4f091fcb4593271a6f92810a324ec542650398f928783c280
-  languageName: node
-  linkType: hard
-
-"find-yarn-workspace-root@npm:^1.1.0":
-  version: 1.2.1
-  resolution: "find-yarn-workspace-root@npm:1.2.1"
-  dependencies:
-    fs-extra: ^4.0.3
-    micromatch: ^3.1.4
-  checksum: a8f4565fb1ead6122acc0d324fa3257c20f7b0c91b7b266dab9eee7251fb5558fcff5b35dbfd301bfd1cbb91c1cdd1799b28ffa5b9a92efd8c7ded3663652bbe
-  languageName: node
-  linkType: hard
-
-"find-yarn-workspace-root@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "find-yarn-workspace-root@npm:2.0.0"
-  dependencies:
-    micromatch: ^4.0.2
-  checksum: fa5ca8f9d08fe7a54ce7c0a5931ff9b7e36f9ee7b9475fb13752bcea80ec6b5f180fa5102d60b376d5526ce924ea3fc6b19301262efa0a5d248dd710f3644242
-  languageName: node
-  linkType: hard
-
-"findup-sync@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "findup-sync@npm:2.0.0"
-  dependencies:
-    detect-file: ^1.0.0
-    is-glob: ^3.1.0
-    micromatch: ^3.0.4
-    resolve-dir: ^1.0.1
-  checksum: af2849f4006208c7c0940ab87a5f816187becf30c430a735377f6163cff8e95f405db504f5435728663099878f2e8002da1bf1976132458c23f5d73f540b1fcc
-  languageName: node
-  linkType: hard
-
-"findup-sync@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "findup-sync@npm:4.0.0"
-  dependencies:
-    detect-file: ^1.0.0
-    is-glob: ^4.0.0
-    micromatch: ^4.0.2
-    resolve-dir: ^1.0.1
-  checksum: 94131e1107ad63790ed00c4c39ca131a93ea602607bd97afeffd92b69a9a63cf2c6f57d6db88cb753fe748ac7fde79e1e76768ff784247026b7c5ebf23ede3a0
-  languageName: node
-  linkType: hard
-
-"fireworm@npm:^0.7.0":
-  version: 0.7.1
-  resolution: "fireworm@npm:0.7.1"
-  dependencies:
-    async: ~0.2.9
-    is-type: 0.0.1
-    lodash.debounce: ^3.1.1
-    lodash.flatten: ^3.0.2
-    minimatch: ^3.0.2
-  checksum: 118ac822c5594f832db082475ac40e3d5532a84ed1aa74c04aee6827e3940b62cde5551308643afdead594f07aa5fb24a140eec51d4fa63945729d4c0fa6c401
-  languageName: node
-  linkType: hard
-
-"fixturify-project@npm:^1.10.0":
-  version: 1.10.0
-  resolution: "fixturify-project@npm:1.10.0"
-  dependencies:
-    fixturify: ^1.2.0
-    tmp: ^0.0.33
-  checksum: e92bd6c565005dbdd91ddda2f27f5278587e85601603697960066e8e436828535638f522691db3d640e7bf38e2ae9eb382df243f3eb9a3bc552926da6c8ef5fb
-  languageName: node
-  linkType: hard
-
-"fixturify-project@npm:^2.1.1":
-  version: 2.1.1
-  resolution: "fixturify-project@npm:2.1.1"
-  dependencies:
-    fixturify: ^2.1.0
-    tmp: ^0.0.33
-    type-fest: ^0.11.0
-  checksum: 60a435eeba234fa1332f8eb9d6384229a37883b6a175153b8ee0c723a17fad3577cd72777aac21085dd94b6d264ff3e2a77c33675dc75b3dd65c5ea7ec31867f
-  languageName: node
-  linkType: hard
-
-"fixturify@npm:^0.3.2":
-  version: 0.3.4
-  resolution: "fixturify@npm:0.3.4"
-  dependencies:
-    fs-extra: ^0.30.0
-    matcher-collection: ^1.0.4
-  checksum: ba73d10c82fc7686904ccab45a0d1fd4b0f184a9f877c8789f3dc7cdc176ee58283cc89b43f398f21bff8b449fb4b9ac6c6b1e4b05fab2603db6430c9ac8de64
-  languageName: node
-  linkType: hard
-
-"fixturify@npm:^1.2.0":
-  version: 1.3.0
-  resolution: "fixturify@npm:1.3.0"
-  dependencies:
-    "@types/fs-extra": ^5.0.5
-    "@types/minimatch": ^3.0.3
-    "@types/rimraf": ^2.0.2
-    fs-extra: ^7.0.1
-    matcher-collection: ^2.0.0
-  checksum: e0fd2bcd3c27c40ba080243847f8941b27c377bee9ac24275784ac5612c87dfa0bcb897d661cef3c401c965c7e8d754b63f3c46d10320eaa0a61d539ef450fd6
-  languageName: node
-  linkType: hard
-
-"fixturify@npm:^2.1.0":
-  version: 2.1.1
-  resolution: "fixturify@npm:2.1.1"
-  dependencies:
-    "@types/fs-extra": ^8.1.0
-    "@types/minimatch": ^3.0.3
-    "@types/rimraf": ^2.0.3
-    fs-extra: ^8.1.0
-    matcher-collection: ^2.0.1
-    walk-sync: ^2.0.2
-  checksum: ac66ae40302bc6beed1dfb81eab009ba6aee23ddddc0c043a1b01b65c07a7eada8b6edc3e76beb6ea01e6083c8b6e5686459286137e9c9bca7a7dfcd650eb125
-  languageName: node
-  linkType: hard
-
-"flat-cache@npm:^3.0.4":
-  version: 3.0.4
-  resolution: "flat-cache@npm:3.0.4"
-  dependencies:
-    flatted: ^3.1.0
-    rimraf: ^3.0.2
-  checksum: 4fdd10ecbcbf7d520f9040dd1340eb5dfe951e6f0ecf2252edeec03ee68d989ec8b9a20f4434270e71bcfd57800dc09b3344fca3966b2eb8f613072c7d9a2365
-  languageName: node
-  linkType: hard
-
-"flat@npm:^4.1.0":
-  version: 4.1.1
-  resolution: "flat@npm:4.1.1"
-  dependencies:
-    is-buffer: ~2.0.3
-  bin:
-    flat: cli.js
-  checksum: 398be12185eb0f3c59797c3670a8c35d07020b673363175676afbaf53d6b213660e060488554cf82c25504986e1a6059bdbcc5d562e87ca3e972e8a33148e3ae
-  languageName: node
-  linkType: hard
-
-"flatted@npm:^3.1.0":
-  version: 3.1.1
-  resolution: "flatted@npm:3.1.1"
-  checksum: 508935e3366d95444131f0aaa801a4301f24ea5bcb900d12764e7335b46b910730cc1b5bcfcfb8eccb7c8db261ba0671c6a7ca30d10870ff7a7756dc7e731a7a
-  languageName: node
-  linkType: hard
-
-"flush-write-stream@npm:^1.0.0":
-  version: 1.1.1
-  resolution: "flush-write-stream@npm:1.1.1"
-  dependencies:
-    inherits: ^2.0.3
-    readable-stream: ^2.3.6
-  checksum: 42e07747f83bcd4e799da802e621d6039787749ffd41f5517f8c4f786ee967e31ba32b09f8b28a9c6f67bd4f5346772e604202df350e8d99f4141771bae31279
-  languageName: node
-  linkType: hard
-
-"focus-trap@npm:^6.7.1":
-  version: 6.9.4
-  resolution: "focus-trap@npm:6.9.4"
-  dependencies:
-    tabbable: ^5.3.3
-  checksum: 0b4cebcc11010bd9397731092bd59a981e838c710c6497374ba70571875a14ab27c0db7d60f36005ec01bdabc3b9cfeda11d30ddf5b8874596dcc95e18913b3b
-  languageName: node
-  linkType: hard
-
-"follow-redirects@npm:^1.0.0":
-  version: 1.14.0
-  resolution: "follow-redirects@npm:1.14.0"
-  peerDependenciesMeta:
-    debug:
-      optional: true
-  checksum: a6568930fb97f6f4c12eac52acc109e8677d4b26fcae463bab7de50c43e44886b94784be6608dd8f2ab4b015328377fb4be2e83abd2c8d6bc39ffe1cf11f7b5a
-  languageName: node
-  linkType: hard
-
-"for-in@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "for-in@npm:1.0.2"
-  checksum: 09f4ae93ce785d253ac963d94c7f3432d89398bf25ac7a24ed034ca393bf74380bdeccc40e0f2d721a895e54211b07c8fad7132e8157827f6f7f059b70b4043d
-  languageName: node
-  linkType: hard
-
-"forever-agent@npm:~0.6.1":
-  version: 0.6.1
-  resolution: "forever-agent@npm:0.6.1"
-  checksum: 766ae6e220f5fe23676bb4c6a99387cec5b7b62ceb99e10923376e27bfea72f3c3aeec2ba5f45f3f7ba65d6616965aa7c20b15002b6860833bb6e394dea546a8
-  languageName: node
-  linkType: hard
-
-"form-data@npm:~2.3.2":
-  version: 2.3.3
-  resolution: "form-data@npm:2.3.3"
-  dependencies:
-    asynckit: ^0.4.0
-    combined-stream: ^1.0.6
-    mime-types: ^2.1.12
-  checksum: 10c1780fa13dbe1ff3100114c2ce1f9307f8be10b14bf16e103815356ff567b6be39d70fc4a40f8990b9660012dc24b0f5e1dde1b6426166eb23a445ba068ca3
-  languageName: node
-  linkType: hard
-
-"format@npm:^0.2.0":
-  version: 0.2.2
-  resolution: "format@npm:0.2.2"
-  checksum: 646a60e1336250d802509cf24fb801e43bd4a70a07510c816fa133aa42cdbc9c21e66e9cc0801bb183c5b031c9d68be62e7fbb6877756e52357850f92aa28799
-  languageName: node
-  linkType: hard
-
-"forwarded@npm:0.2.0":
-  version: 0.2.0
-  resolution: "forwarded@npm:0.2.0"
-  checksum: fd27e2394d8887ebd16a66ffc889dc983fbbd797d5d3f01087c020283c0f019a7d05ee85669383d8e0d216b116d720fc0cef2f6e9b7eb9f4c90c6e0bc7fd28e6
-  languageName: node
-  linkType: hard
-
-"forwarded@npm:~0.1.2":
-  version: 0.1.2
-  resolution: "forwarded@npm:0.1.2"
-  checksum: 54695c574292f9bc6bfa52111844337bc2e61cfcc5ec82f16b816d721a67a0c76b4849a34b57e38e51d64ddbb81aef974f393579f610ed1b990470e75abad2e0
-  languageName: node
-  linkType: hard
-
-"fragment-cache@npm:^0.2.1":
-  version: 0.2.1
-  resolution: "fragment-cache@npm:0.2.1"
-  dependencies:
-    map-cache: ^0.2.2
-  checksum: 1cbbd0b0116b67d5790175de0038a11df23c1cd2e8dcdbade58ebba5594c2d641dade6b4f126d82a7b4a6ffc2ea12e3d387dbb64ea2ae97cf02847d436f60fdc
-  languageName: node
-  linkType: hard
-
-"fresh@npm:0.5.2":
-  version: 0.5.2
-  resolution: "fresh@npm:0.5.2"
-  checksum: 13ea8b08f91e669a64e3ba3a20eb79d7ca5379a81f1ff7f4310d54e2320645503cc0c78daedc93dfb6191287295f6479544a649c64d8e41a1c0fb0c221552346
-  languageName: node
-  linkType: hard
-
-"from2@npm:^2.1.0":
-  version: 2.3.0
-  resolution: "from2@npm:2.3.0"
-  dependencies:
-    inherits: ^2.0.1
-    readable-stream: ^2.0.0
-  checksum: 6080eba0793dce32f475141fb3d54cc15f84ee52e420ee22ac3ab0ad639dc95a1875bc6eb9c0e1140e94972a36a89dc5542491b85f1ab8df0c126241e0f1a61b
-  languageName: node
-  linkType: hard
-
-"fs-extra@npm:^0.24.0":
-  version: 0.24.0
-  resolution: "fs-extra@npm:0.24.0"
-  dependencies:
-    graceful-fs: ^4.1.2
-    jsonfile: ^2.1.0
-    path-is-absolute: ^1.0.0
-    rimraf: ^2.2.8
-  checksum: 7addd3f7f1df95f0c7d61d87c16531db96e683a8f3ef693a21ba45af4d0fdaf7a6c9799248a4f63ae47f31d631672a05c3178aad2247139a6d2b9363de09c63d
-  languageName: node
-  linkType: hard
-
-"fs-extra@npm:^0.30.0":
-  version: 0.30.0
-  resolution: "fs-extra@npm:0.30.0"
-  dependencies:
-    graceful-fs: ^4.1.2
-    jsonfile: ^2.1.0
-    klaw: ^1.0.0
-    path-is-absolute: ^1.0.0
-    rimraf: ^2.2.8
-  checksum: 6edfd65fc813baa27f1603778c0f5ec11f8c5006a20b920437813ee2023eba18aeec8bef1c89b2e6c84f9fc90fdc7c916f4a700466c8c69d22a35d018f2570f0
-  languageName: node
-  linkType: hard
-
-"fs-extra@npm:^10.0.0":
-  version: 10.1.0
-  resolution: "fs-extra@npm:10.1.0"
-  dependencies:
-    graceful-fs: ^4.2.0
-    jsonfile: ^6.0.1
-    universalify: ^2.0.0
-  checksum: dc94ab37096f813cc3ca12f0f1b5ad6744dfed9ed21e953d72530d103cea193c2f81584a39e9dee1bea36de5ee66805678c0dddc048e8af1427ac19c00fffc50
-  languageName: node
-  linkType: hard
-
-"fs-extra@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "fs-extra@npm:3.0.1"
-  dependencies:
-    graceful-fs: ^4.1.2
-    jsonfile: ^3.0.0
-    universalify: ^0.1.0
-  checksum: 8957f9ee33a032b12f786158077dbd2a6b3b843449b36ce37bb3922200bbf12f0412aaebe10e3ce3e46e1f0dd37904e4053b4cfa2a717c80eca3af6dc840ba8b
-  languageName: node
-  linkType: hard
-
-"fs-extra@npm:^4.0.2, fs-extra@npm:^4.0.3":
-  version: 4.0.3
-  resolution: "fs-extra@npm:4.0.3"
-  dependencies:
-    graceful-fs: ^4.1.2
-    jsonfile: ^4.0.0
-    universalify: ^0.1.0
-  checksum: c5ae3c7043ad7187128e619c0371da01b58694c1ffa02c36fb3f5b459925d9c27c3cb1e095d9df0a34a85ca993d8b8ff6f6ecef868fd5ebb243548afa7fc0936
-  languageName: node
-  linkType: hard
-
-"fs-extra@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "fs-extra@npm:5.0.0"
-  dependencies:
-    graceful-fs: ^4.1.2
-    jsonfile: ^4.0.0
-    universalify: ^0.1.0
-  checksum: b3dcaf1d545097013c4fa649951c85cad1b845316ab473cc3440254a45e9b0b17d8ca9355af477e982c7d126f1a30417bcf78b1f744593ce77a0f43165f2d5e5
-  languageName: node
-  linkType: hard
-
-"fs-extra@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "fs-extra@npm:6.0.1"
-  dependencies:
-    graceful-fs: ^4.1.2
-    jsonfile: ^4.0.0
-    universalify: ^0.1.0
-  checksum: 133dbd765e05c1cdaaf723308e00ffbe746da5ad516ad890ae2da2a538982c1175371055c778fbe68d1fca1da9ed4003ba55c4a14e070372eabf6a7c48062759
-  languageName: node
-  linkType: hard
-
-"fs-extra@npm:^7.0.0, fs-extra@npm:^7.0.1":
-  version: 7.0.1
-  resolution: "fs-extra@npm:7.0.1"
-  dependencies:
-    graceful-fs: ^4.1.2
-    jsonfile: ^4.0.0
-    universalify: ^0.1.0
-  checksum: 141b9dccb23b66a66cefdd81f4cda959ff89282b1d721b98cea19ba08db3dcbe6f862f28841f3cf24bb299e0b7e6c42303908f65093cb7e201708e86ea5a8dcf
-  languageName: node
-  linkType: hard
-
-"fs-extra@npm:^8.0.0, fs-extra@npm:^8.0.1, fs-extra@npm:^8.1.0":
-  version: 8.1.0
-  resolution: "fs-extra@npm:8.1.0"
-  dependencies:
-    graceful-fs: ^4.2.0
-    jsonfile: ^4.0.0
-    universalify: ^0.1.0
-  checksum: bf44f0e6cea59d5ce071bba4c43ca76d216f89e402dc6285c128abc0902e9b8525135aa808adad72c9d5d218e9f4bcc63962815529ff2f684ad532172a284880
-  languageName: node
-  linkType: hard
-
-"fs-extra@npm:^9.0.1, fs-extra@npm:^9.1.0":
-  version: 9.1.0
-  resolution: "fs-extra@npm:9.1.0"
-  dependencies:
-    at-least-node: ^1.0.0
-    graceful-fs: ^4.2.0
-    jsonfile: ^6.0.1
-    universalify: ^2.0.0
-  checksum: ba71ba32e0faa74ab931b7a0031d1523c66a73e225de7426e275e238e312d07313d2da2d33e34a52aa406c8763ade5712eb3ec9ba4d9edce652bcacdc29e6b20
-  languageName: node
-  linkType: hard
-
-"fs-merger@npm:^3.0.1, fs-merger@npm:^3.1.0, fs-merger@npm:^3.2.1":
-  version: 3.2.1
-  resolution: "fs-merger@npm:3.2.1"
-  dependencies:
-    broccoli-node-api: ^1.7.0
-    broccoli-node-info: ^2.1.0
-    fs-extra: ^8.0.1
-    fs-tree-diff: ^2.0.1
-    walk-sync: ^2.2.0
-  checksum: bfb93b537919407d947ab89c44f6d85f7cb58d1337aaa9115de0bd38178165b158809ad83c4f5d610d42ce0ee2f81ac7ad0ae5b573a69784b676a8a6ce506500
-  languageName: node
-  linkType: hard
-
-"fs-minipass@npm:^2.0.0, fs-minipass@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "fs-minipass@npm:2.1.0"
-  dependencies:
-    minipass: ^3.0.0
-  checksum: 1b8d128dae2ac6cc94230cc5ead341ba3e0efaef82dab46a33d171c044caaa6ca001364178d42069b2809c35a1c3c35079a32107c770e9ffab3901b59af8c8b1
-  languageName: node
-  linkType: hard
-
-"fs-tree-diff@npm:^0.5.2, fs-tree-diff@npm:^0.5.3, fs-tree-diff@npm:^0.5.4, fs-tree-diff@npm:^0.5.6, fs-tree-diff@npm:^0.5.9":
-  version: 0.5.9
-  resolution: "fs-tree-diff@npm:0.5.9"
-  dependencies:
-    heimdalljs-logger: ^0.1.7
-    object-assign: ^4.1.0
-    path-posix: ^1.0.0
-    symlink-or-copy: ^1.1.8
-  checksum: 5221dee3baa76d597c471aa8786d552452ee2a58de63f0fcc38dd618cafd5d776760f8afcd19ab796c2a8cc584191c46431464096ea347b4158e1a14cb690ed1
-  languageName: node
-  linkType: hard
-
-"fs-tree-diff@npm:^2.0.0, fs-tree-diff@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "fs-tree-diff@npm:2.0.1"
-  dependencies:
-    "@types/symlink-or-copy": ^1.2.0
-    heimdalljs-logger: ^0.1.7
-    object-assign: ^4.1.0
-    path-posix: ^1.0.0
-    symlink-or-copy: ^1.1.8
-  checksum: ea7927af283b1db3994b98e4c636ed7f8ecfcfb39dc205b57841b22f8ebf39e97649dca07b16ae2e421b000d81b6d96449f32d4dc78742ccb22dfd19db160a45
-  languageName: node
-  linkType: hard
-
-"fs-updater@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "fs-updater@npm:1.0.4"
-  dependencies:
-    can-symlink: ^1.0.0
-    clean-up-path: ^1.0.0
-    heimdalljs: ^0.2.5
-    heimdalljs-logger: ^0.1.9
-    rimraf: ^2.6.2
-  checksum: 8c46798de408fbb1c7da339de2a82334261c120aef235bc30ef66e617fd1a735d0279654fc27373597d4826c325fb08a299e3b05252e0289d8d9e749c67dd96d
-  languageName: node
-  linkType: hard
-
-"fs-write-stream-atomic@npm:^1.0.8":
-  version: 1.0.10
-  resolution: "fs-write-stream-atomic@npm:1.0.10"
-  dependencies:
-    graceful-fs: ^4.1.2
-    iferr: ^0.1.5
-    imurmurhash: ^0.1.4
-    readable-stream: 1 || 2
-  checksum: 43c2d6817b72127793abc811ebf87a135b03ac7cbe41cdea9eeacf59b23e6e29b595739b083e9461303d525687499a1aaefcec3e5ff9bc82b170edd3dc467ccc
-  languageName: node
-  linkType: hard
-
-"fs.realpath@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "fs.realpath@npm:1.0.0"
-  checksum: 99ddea01a7e75aa276c250a04eedeffe5662bce66c65c07164ad6264f9de18fb21be9433ead460e54cff20e31721c811f4fb5d70591799df5f85dce6d6746fd0
-  languageName: node
-  linkType: hard
-
-"fsevents@npm:^1.2.7":
-  version: 1.2.13
-  resolution: "fsevents@npm:1.2.13"
-  dependencies:
-    bindings: ^1.5.0
-    nan: ^2.12.1
-  checksum: ae855aa737aaa2f9167e9f70417cf6e45a5cd11918e1fee9923709a0149be52416d765433b4aeff56c789b1152e718cd1b13ddec6043b78cdda68260d86383c1
-  conditions: os=darwin
-  languageName: node
-  linkType: hard
-
-"fsevents@npm:~2.3.1, fsevents@npm:~2.3.2":
-  version: 2.3.2
-  resolution: "fsevents@npm:2.3.2"
-  dependencies:
-    node-gyp: latest
-  checksum: 97ade64e75091afee5265e6956cb72ba34db7819b4c3e94c431d4be2b19b8bb7a2d4116da417950c3425f17c8fe693d25e20212cac583ac1521ad066b77ae31f
-  conditions: os=darwin
-  languageName: node
-  linkType: hard
-
-"fsevents@patch:fsevents@^1.2.7#~builtin<compat/fsevents>":
-  version: 1.2.13
-  resolution: "fsevents@patch:fsevents@npm%3A1.2.13#~builtin<compat/fsevents>::version=1.2.13&hash=d11327"
-  dependencies:
-    bindings: ^1.5.0
-    nan: ^2.12.1
-  conditions: os=darwin
-  languageName: node
-  linkType: hard
-
-"fsevents@patch:fsevents@~2.3.1#~builtin<compat/fsevents>, fsevents@patch:fsevents@~2.3.2#~builtin<compat/fsevents>":
-  version: 2.3.2
-  resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin<compat/fsevents>::version=2.3.2&hash=df0bf1"
-  dependencies:
-    node-gyp: latest
-  conditions: os=darwin
-  languageName: node
-  linkType: hard
-
-"function-bind@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "function-bind@npm:1.1.1"
-  checksum: b32fbaebb3f8ec4969f033073b43f5c8befbb58f1a79e12f1d7490358150359ebd92f49e72ff0144f65f2c48ea2a605bff2d07965f548f6474fd8efd95bf361a
-  languageName: node
-  linkType: hard
-
-"functional-red-black-tree@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "functional-red-black-tree@npm:1.0.1"
-  checksum: ca6c170f37640e2d94297da8bb4bf27a1d12bea3e00e6a3e007fd7aa32e37e000f5772acf941b4e4f3cf1c95c3752033d0c509af157ad8f526e7f00723b9eb9f
-  languageName: node
-  linkType: hard
-
-"fuse.js@npm:^6.5.3":
-  version: 6.5.3
-  resolution: "fuse.js@npm:6.5.3"
-  checksum: f7c14f4422000e7f7e3515c66f7cefdfc38adec4cf380097f4146a201ea438af60b67dc5849b3c0de0115ce3f9bc5afad6fc6570c08dcfcef5bf6e95eb8e6d6f
-  languageName: node
-  linkType: hard
-
-"gauge@npm:^4.0.3":
-  version: 4.0.4
-  resolution: "gauge@npm:4.0.4"
-  dependencies:
-    aproba: ^1.0.3 || ^2.0.0
-    color-support: ^1.1.3
-    console-control-strings: ^1.1.0
-    has-unicode: ^2.0.1
-    signal-exit: ^3.0.7
-    string-width: ^4.2.3
-    strip-ansi: ^6.0.1
-    wide-align: ^1.1.5
-  checksum: 788b6bfe52f1dd8e263cda800c26ac0ca2ff6de0b6eee2fe0d9e3abf15e149b651bd27bf5226be10e6e3edb5c4e5d5985a5a1a98137e7a892f75eff76467ad2d
-  languageName: node
-  linkType: hard
-
-"gensync@npm:^1.0.0-beta.2":
-  version: 1.0.0-beta.2
-  resolution: "gensync@npm:1.0.0-beta.2"
-  checksum: a7437e58c6be12aa6c90f7730eac7fa9833dc78872b4ad2963d2031b00a3367a93f98aec75f9aaac7220848e4026d67a8655e870b24f20a543d103c0d65952ec
-  languageName: node
-  linkType: hard
-
-"get-caller-file@npm:^2.0.1, get-caller-file@npm:^2.0.5":
-  version: 2.0.5
-  resolution: "get-caller-file@npm:2.0.5"
-  checksum: b9769a836d2a98c3ee734a88ba712e62703f1df31b94b784762c433c27a386dd6029ff55c2a920c392e33657d80191edbf18c61487e198844844516f843496b9
-  languageName: node
-  linkType: hard
-
-"get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.0, get-intrinsic@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "get-intrinsic@npm:1.1.1"
-  dependencies:
-    function-bind: ^1.1.1
-    has: ^1.0.3
-    has-symbols: ^1.0.1
-  checksum: a9fe2ca8fa3f07f9b0d30fb202bcd01f3d9b9b6b732452e79c48e79f7d6d8d003af3f9e38514250e3553fdc83c61650851cb6870832ac89deaaceb08e3721a17
-  languageName: node
-  linkType: hard
-
-"get-own-enumerable-property-symbols@npm:^3.0.0":
-  version: 3.0.2
-  resolution: "get-own-enumerable-property-symbols@npm:3.0.2"
-  checksum: 8f0331f14159f939830884799f937343c8c0a2c330506094bc12cbee3665d88337fe97a4ea35c002cc2bdba0f5d9975ad7ec3abb925015cdf2a93e76d4759ede
-  languageName: node
-  linkType: hard
-
-"get-stdin@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "get-stdin@npm:4.0.1"
-  checksum: 4f73d3fe0516bc1f3dc7764466a68ad7c2ba809397a02f56c2a598120e028430fcff137a648a01876b2adfb486b4bc164119f98f1f7d7c0abd63385bdaa0113f
-  languageName: node
-  linkType: hard
-
-"get-stdin@npm:^8.0.0":
-  version: 8.0.0
-  resolution: "get-stdin@npm:8.0.0"
-  checksum: 40128b6cd25781ddbd233344f1a1e4006d4284906191ed0a7d55ec2c1a3e44d650f280b2c9eeab79c03ac3037da80257476c0e4e5af38ddfb902d6ff06282d77
-  languageName: node
-  linkType: hard
-
-"get-stdin@npm:^9.0.0":
-  version: 9.0.0
-  resolution: "get-stdin@npm:9.0.0"
-  checksum: 5972bc34d05932b45512c8e2d67b040f1c1ca8afb95c56cbc480985f2d761b7e37fe90dc8abd22527f062cc5639a6930ff346e9952ae4c11a2d4275869459594
-  languageName: node
-  linkType: hard
-
-"get-stream@npm:^4.0.0":
-  version: 4.1.0
-  resolution: "get-stream@npm:4.1.0"
-  dependencies:
-    pump: ^3.0.0
-  checksum: 443e1914170c15bd52ff8ea6eff6dfc6d712b031303e36302d2778e3de2506af9ee964d6124010f7818736dcfde05c04ba7ca6cc26883106e084357a17ae7d73
-  languageName: node
-  linkType: hard
-
-"get-stream@npm:^5.0.0":
-  version: 5.2.0
-  resolution: "get-stream@npm:5.2.0"
-  dependencies:
-    pump: ^3.0.0
-  checksum: 8bc1a23174a06b2b4ce600df38d6c98d2ef6d84e020c1ddad632ad75bac4e092eeb40e4c09e0761c35fc2dbc5e7fff5dab5e763a383582c4a167dd69a905bd12
-  languageName: node
-  linkType: hard
-
-"get-stream@npm:^6.0.0":
-  version: 6.0.1
-  resolution: "get-stream@npm:6.0.1"
-  checksum: e04ecece32c92eebf5b8c940f51468cd53554dcbb0ea725b2748be583c9523d00128137966afce410b9b051eb2ef16d657cd2b120ca8edafcf5a65e81af63cad
-  languageName: node
-  linkType: hard
-
-"get-symbol-description@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "get-symbol-description@npm:1.0.0"
-  dependencies:
-    call-bind: ^1.0.2
-    get-intrinsic: ^1.1.1
-  checksum: 9ceff8fe968f9270a37a1f73bf3f1f7bda69ca80f4f80850670e0e7b9444ff99323f7ac52f96567f8b5f5fbe7ac717a0d81d3407c7313e82810c6199446a5247
-  languageName: node
-  linkType: hard
-
-"get-value@npm:^2.0.3, get-value@npm:^2.0.6":
-  version: 2.0.6
-  resolution: "get-value@npm:2.0.6"
-  checksum: 5c3b99cb5398ea8016bf46ff17afc5d1d286874d2ad38ca5edb6e87d75c0965b0094cb9a9dddef2c59c23d250702323539a7fbdd870620db38c7e7d7ec87c1eb
-  languageName: node
-  linkType: hard
-
-"getpass@npm:^0.1.1":
-  version: 0.1.7
-  resolution: "getpass@npm:0.1.7"
-  dependencies:
-    assert-plus: ^1.0.0
-  checksum: ab18d55661db264e3eac6012c2d3daeafaab7a501c035ae0ccb193c3c23e9849c6e29b6ac762b9c2adae460266f925d55a3a2a3a3c8b94be2f222df94d70c046
-  languageName: node
-  linkType: hard
-
-"git-hooks-list@npm:1.0.3":
-  version: 1.0.3
-  resolution: "git-hooks-list@npm:1.0.3"
-  checksum: a1dd03d39c1d727ba08a35dbdbdcc6e96de8c4170c942dc95bf787ca6e34998d39fb5295a00242b58a3d265de0b69a0686d0cf583baa6b7830f268542c4576b9
-  languageName: node
-  linkType: hard
-
-"git-repo-info@npm:^2.1.1":
-  version: 2.1.1
-  resolution: "git-repo-info@npm:2.1.1"
-  checksum: 58cedacae81bbe8fedc81d226346c472d11357d1758140ab0ee5d0c3360ad5b7a9d8613ca6e8b50d089d073e5b3f2e2893536d0cb57bced5f558dc913d5e21c6
-  languageName: node
-  linkType: hard
-
-"glob-parent@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "glob-parent@npm:3.1.0"
-  dependencies:
-    is-glob: ^3.1.0
-    path-dirname: ^1.0.0
-  checksum: 653d559237e89a11b9934bef3f392ec42335602034c928590544d383ff5ef449f7b12f3cfa539708e74bc0a6c28ab1fe51d663cc07463cdf899ba92afd85a855
-  languageName: node
-  linkType: hard
-
-"glob-parent@npm:^5.1.0, glob-parent@npm:^5.1.2, glob-parent@npm:~5.1.0, glob-parent@npm:~5.1.2":
-  version: 5.1.2
-  resolution: "glob-parent@npm:5.1.2"
-  dependencies:
-    is-glob: ^4.0.1
-  checksum: f4f2bfe2425296e8a47e36864e4f42be38a996db40420fe434565e4480e3322f18eb37589617a98640c5dc8fdec1a387007ee18dbb1f3f5553409c34d17f425e
-  languageName: node
-  linkType: hard
-
-"glob-parent@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "glob-parent@npm:6.0.2"
-  dependencies:
-    is-glob: ^4.0.3
-  checksum: c13ee97978bef4f55106b71e66428eb1512e71a7466ba49025fc2aec59a5bfb0954d5abd58fc5ee6c9b076eef4e1f6d3375c2e964b88466ca390da4419a786a8
-  languageName: node
-  linkType: hard
-
-"glob-to-regexp@npm:^0.4.1":
-  version: 0.4.1
-  resolution: "glob-to-regexp@npm:0.4.1"
-  checksum: e795f4e8f06d2a15e86f76e4d92751cf8bbfcf0157cea5c2f0f35678a8195a750b34096b1256e436f0cebc1883b5ff0888c47348443e69546a5a87f9e1eb1167
-  languageName: node
-  linkType: hard
-
-"glob@npm:^5.0.10":
-  version: 5.0.15
-  resolution: "glob@npm:5.0.15"
-  dependencies:
-    inflight: ^1.0.4
-    inherits: 2
-    minimatch: 2 || 3
-    once: ^1.3.0
-    path-is-absolute: ^1.0.0
-  checksum: f9742448303460672607e569457f1b57e486a79a985e269b69465834d2075b243378225f65dc54c09fcd4b75e4fb34442aec88f33f8c65fa4abccc8ee2dc2f5d
-  languageName: node
-  linkType: hard
-
-"glob@npm:^7.0.4, glob@npm:^7.1.4, glob@npm:^7.1.6":
-  version: 7.1.6
-  resolution: "glob@npm:7.1.6"
-  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
-  checksum: 351d549dd90553b87c2d3f90ce11aed9e1093c74130440e7ae0592e11bbcd2ce7f0ebb8ba6bfe63aaf9b62166a7f4c80cb84490ae5d78408bb2572bf7d4ee0a6
-  languageName: node
-  linkType: hard
-
-"glob@npm:^7.1.2, glob@npm:^7.1.3":
-  version: 7.2.0
-  resolution: "glob@npm:7.2.0"
-  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
-  checksum: 78a8ea942331f08ed2e055cb5b9e40fe6f46f579d7fd3d694f3412fe5db23223d29b7fee1575440202e9a7ff9a72ab106a39fee39934c7bedafe5e5f8ae20134
-  languageName: node
-  linkType: hard
-
-"glob@npm:^7.2.0, glob@npm:^7.2.3":
-  version: 7.2.3
-  resolution: "glob@npm:7.2.3"
-  dependencies:
-    fs.realpath: ^1.0.0
-    inflight: ^1.0.4
-    inherits: 2
-    minimatch: ^3.1.1
-    once: ^1.3.0
-    path-is-absolute: ^1.0.0
-  checksum: 29452e97b38fa704dabb1d1045350fb2467cf0277e155aa9ff7077e90ad81d1ea9d53d3ee63bd37c05b09a065e90f16aec4a65f5b8de401d1dac40bc5605d133
-  languageName: node
-  linkType: hard
-
-"glob@npm:^8.0.1":
-  version: 8.1.0
-  resolution: "glob@npm:8.1.0"
-  dependencies:
-    fs.realpath: ^1.0.0
-    inflight: ^1.0.4
-    inherits: 2
-    minimatch: ^5.0.1
-    once: ^1.3.0
-  checksum: 92fbea3221a7d12075f26f0227abac435de868dd0736a17170663783296d0dd8d3d532a5672b4488a439bf5d7fb85cdd07c11185d6cd39184f0385cbdfb86a47
-  languageName: node
-  linkType: hard
-
-"glob@npm:^8.0.3":
-  version: 8.0.3
-  resolution: "glob@npm:8.0.3"
-  dependencies:
-    fs.realpath: ^1.0.0
-    inflight: ^1.0.4
-    inherits: 2
-    minimatch: ^5.0.1
-    once: ^1.3.0
-  checksum: 50bcdea19d8e79d8de5f460b1939ffc2b3299eac28deb502093fdca22a78efebc03e66bf54f0abc3d3d07d8134d19a32850288b7440d77e072aa55f9d33b18c5
-  languageName: node
-  linkType: hard
-
-"global-modules@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "global-modules@npm:1.0.0"
-  dependencies:
-    global-prefix: ^1.0.1
-    is-windows: ^1.0.1
-    resolve-dir: ^1.0.0
-  checksum: 10be68796c1e1abc1e2ba87ec4ea507f5629873b119ab0cd29c07284ef2b930f1402d10df01beccb7391dedd9cd479611dd6a24311c71be58937beaf18edf85e
-  languageName: node
-  linkType: hard
-
-"global-prefix@npm:^1.0.1":
-  version: 1.0.2
-  resolution: "global-prefix@npm:1.0.2"
-  dependencies:
-    expand-tilde: ^2.0.2
-    homedir-polyfill: ^1.0.1
-    ini: ^1.3.4
-    is-windows: ^1.0.1
-    which: ^1.2.14
-  checksum: 061b43470fe498271bcd514e7746e8a8535032b17ab9570517014ae27d700ff0dca749f76bbde13ba384d185be4310d8ba5712cb0e74f7d54d59390db63dd9a0
-  languageName: node
-  linkType: hard
-
-"globals@npm:^11.1.0":
-  version: 11.12.0
-  resolution: "globals@npm:11.12.0"
-  checksum: 67051a45eca3db904aee189dfc7cd53c20c7d881679c93f6146ddd4c9f4ab2268e68a919df740d39c71f4445d2b38ee360fc234428baea1dbdfe68bbcb46979e
-  languageName: node
-  linkType: hard
-
-"globals@npm:^13.15.0":
-  version: 13.17.0
-  resolution: "globals@npm:13.17.0"
-  dependencies:
-    type-fest: ^0.20.2
-  checksum: fbaf4112e59b92c9f5575e85ce65e9e17c0b82711196ec5f58beb08599bbd92fd72703d6dfc9b080381fd35b644e1b11dcf25b38cc2341ec21df942594cbc8ce
-  languageName: node
-  linkType: hard
-
-"globals@npm:^13.6.0":
-  version: 13.8.0
-  resolution: "globals@npm:13.8.0"
-  dependencies:
-    type-fest: ^0.20.2
-  checksum: acbfcad2b8aeff34d977a2df62bda863d7537e19f5b30cc3452493ce636b5193be9f68da46a53f41875f49052ddd7d550cd2568ecc818ddde3603e30def1fef3
-  languageName: node
-  linkType: hard
-
-"globals@npm:^13.9.0":
-  version: 13.12.0
-  resolution: "globals@npm:13.12.0"
-  dependencies:
-    type-fest: ^0.20.2
-  checksum: 1f959abb11117916468a1afcba527eead152900cad652c8383c4e8976daea7ec55e1ee30c086f48d1b8655719f214e9d92eca083c3a43b5543bc4056e7e5fccf
-  languageName: node
-  linkType: hard
-
-"globals@npm:^9.18.0":
-  version: 9.18.0
-  resolution: "globals@npm:9.18.0"
-  checksum: e9c066aecfdc5ea6f727344a4246ecc243aaf66ede3bffee10ddc0c73351794c25e727dd046090dcecd821199a63b9de6af299a6e3ba292c8b22f0a80ea32073
-  languageName: node
-  linkType: hard
-
-"globalyzer@npm:0.1.0":
-  version: 0.1.0
-  resolution: "globalyzer@npm:0.1.0"
-  checksum: 419a0f95ba542534fac0842964d31b3dc2936a479b2b1a8a62bad7e8b61054faa9b0a06ad9f2e12593396b9b2621cac93358d9b3071d33723fb1778608d358a1
-  languageName: node
-  linkType: hard
-
-"globby@npm:10.0.0":
-  version: 10.0.0
-  resolution: "globby@npm:10.0.0"
-  dependencies:
-    "@types/glob": ^7.1.1
-    array-union: ^2.1.0
-    dir-glob: ^3.0.1
-    fast-glob: ^3.0.3
-    glob: ^7.1.3
-    ignore: ^5.1.1
-    merge2: ^1.2.3
-    slash: ^3.0.0
-  checksum: fbff58d2fcaedd9207901f6e3b5341ff885b6d499c3a095f7befde0fd03ec1ea634452a82f81e894e46f6a5d704da44b842ba93066f90dced52adf84d4b8d1cc
-  languageName: node
-  linkType: hard
-
-"globby@npm:^11.0.3":
-  version: 11.0.4
-  resolution: "globby@npm:11.0.4"
-  dependencies:
-    array-union: ^2.1.0
-    dir-glob: ^3.0.1
-    fast-glob: ^3.1.1
-    ignore: ^5.1.4
-    merge2: ^1.3.0
-    slash: ^3.0.0
-  checksum: d3e02d5e459e02ffa578b45f040381c33e3c0538ed99b958f0809230c423337999867d7b0dbf752ce93c46157d3bbf154d3fff988a93ccaeb627df8e1841775b
-  languageName: node
-  linkType: hard
-
-"globby@npm:^11.1.0":
-  version: 11.1.0
-  resolution: "globby@npm:11.1.0"
-  dependencies:
-    array-union: ^2.1.0
-    dir-glob: ^3.0.1
-    fast-glob: ^3.2.9
-    ignore: ^5.2.0
-    merge2: ^1.4.1
-    slash: ^3.0.0
-  checksum: b4be8885e0cfa018fc783792942d53926c35c50b3aefd3fdcfb9d22c627639dc26bd2327a40a0b74b074100ce95bb7187bfeae2f236856aa3de183af7a02aea6
-  languageName: node
-  linkType: hard
-
-"globby@npm:^13.1.1":
-  version: 13.1.1
-  resolution: "globby@npm:13.1.1"
-  dependencies:
-    dir-glob: ^3.0.1
-    fast-glob: ^3.2.11
-    ignore: ^5.2.0
-    merge2: ^1.4.1
-    slash: ^4.0.0
-  checksum: e6c43409c6c31b374fbd1c01a8c1811de52336928be9c697e472d2a89a156c9cbf1fb33863755c0447b4db16485858aa57f16628d66a6b7c7131669c9fbe76cd
-  languageName: node
-  linkType: hard
-
-"globrex@npm:^0.1.2":
-  version: 0.1.2
-  resolution: "globrex@npm:0.1.2"
-  checksum: adca162494a176ce9ecf4dd232f7b802956bb1966b37f60c15e49d2e7d961b66c60826366dc2649093cad5a0d69970cfa8875bd1695b5a1a2f33dcd2aa88da3c
-  languageName: node
-  linkType: hard
-
-"good-listener@npm:^1.2.2":
-  version: 1.2.2
-  resolution: "good-listener@npm:1.2.2"
-  dependencies:
-    delegate: ^3.1.2
-  checksum: f39fb82c4e41524f56104cfd2d7aef1a88e72f3f75139115fbdf98cc7d844e0c1b39218b2e83438c6188727bf904ed78c7f0f2feff67b32833bc3af7f0202b33
-  languageName: node
-  linkType: hard
-
-"graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.15, graceful-fs@npm:^4.1.3":
-  version: 4.2.6
-  resolution: "graceful-fs@npm:4.2.6"
-  checksum: 792e64aafda05a151289f83eaa16aff34ef259658cefd65393883d959409f5a2389b0ec9ebf28f3d21f1b0ddc8f594a1162ae9b18e2b507a6799a70706ec573d
-  languageName: node
-  linkType: hard
-
-"graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.1.9, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.4":
-  version: 4.2.8
-  resolution: "graceful-fs@npm:4.2.8"
-  checksum: 5d224c8969ad0581d551dfabdb06882706b31af2561bd5e2034b4097e67cc27d05232849b8643866585fd0a41c7af152950f8776f4dd5579e9853733f31461c6
-  languageName: node
-  linkType: hard
-
-"graceful-fs@npm:^4.2.6":
-  version: 4.2.11
-  resolution: "graceful-fs@npm:4.2.11"
-  checksum: ac85f94da92d8eb6b7f5a8b20ce65e43d66761c55ce85ac96df6865308390da45a8d3f0296dd3a663de65d30ba497bd46c696cc1e248c72b13d6d567138a4fc7
-  languageName: node
-  linkType: hard
-
-"graceful-fs@npm:^4.2.9":
-  version: 4.2.10
-  resolution: "graceful-fs@npm:4.2.10"
-  checksum: 3f109d70ae123951905d85032ebeae3c2a5a7a997430df00ea30df0e3a6c60cf6689b109654d6fdacd28810a053348c4d14642da1d075049e6be1ba5216218da
-  languageName: node
-  linkType: hard
-
-"graceful-readlink@npm:>= 1.0.0":
-  version: 1.0.1
-  resolution: "graceful-readlink@npm:1.0.1"
-  checksum: 4c1889ca0a6fc0bb9585b55c26a99719be132cbc4b7d84036193b70608059b9783e52e2a866d5a8e39821b16a69e899644ca75c6206563f1319b6720836b9ab2
-  languageName: node
-  linkType: hard
-
-"grapheme-splitter@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "grapheme-splitter@npm:1.0.4"
-  checksum: 0c22ec54dee1b05cd480f78cf14f732cb5b108edc073572c4ec205df4cd63f30f8db8025afc5debc8835a8ddeacf648a1c7992fe3dcd6ad38f9a476d84906620
-  languageName: node
-  linkType: hard
-
-"growly@npm:^1.3.0":
-  version: 1.3.0
-  resolution: "growly@npm:1.3.0"
-  checksum: 53cdecd4c16d7d9154a9061a9ccb87d602e957502ca69b529d7d1b2436c2c0b700ec544fc6b3e4cd115d59b81e62e44ce86bd0521403b579d3a2a97d7ce72a44
-  languageName: node
-  linkType: hard
-
-"handlebars@npm:4.7.7, handlebars@npm:^4.0.11, handlebars@npm:^4.0.13, handlebars@npm:^4.0.4, handlebars@npm:^4.3.1, handlebars@npm:^4.4.2, handlebars@npm:^4.7.3":
-  version: 4.7.7
-  resolution: "handlebars@npm:4.7.7"
-  dependencies:
-    minimist: ^1.2.5
-    neo-async: ^2.6.0
-    source-map: ^0.6.1
-    uglify-js: ^3.1.4
-    wordwrap: ^1.0.0
-  dependenciesMeta:
-    uglify-js:
-      optional: true
-  bin:
-    handlebars: bin/handlebars
-  checksum: 1e79a43f5e18d15742977cb987923eab3e2a8f44f2d9d340982bcb69e1735ed049226e534d7c1074eaddaf37e4fb4f471a8adb71cddd5bc8cf3f894241df5cee
-  languageName: node
-  linkType: hard
-
-"har-schema@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "har-schema@npm:2.0.0"
-  checksum: d8946348f333fb09e2bf24cc4c67eabb47c8e1d1aa1c14184c7ffec1140a49ec8aa78aa93677ae452d71d5fc0fdeec20f0c8c1237291fc2bcb3f502a5d204f9b
-  languageName: node
-  linkType: hard
-
-"har-validator@npm:~5.1.3":
-  version: 5.1.5
-  resolution: "har-validator@npm:5.1.5"
-  dependencies:
-    ajv: ^6.12.3
-    har-schema: ^2.0.0
-  checksum: b998a7269ca560d7f219eedc53e2c664cd87d487e428ae854a6af4573fc94f182fe9d2e3b92ab968249baec7ebaf9ead69cf975c931dc2ab282ec182ee988280
-  languageName: node
-  linkType: hard
-
-"has-ansi@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "has-ansi@npm:2.0.0"
-  dependencies:
-    ansi-regex: ^2.0.0
-  checksum: 1b51daa0214440db171ff359d0a2d17bc20061164c57e76234f614c91dbd2a79ddd68dfc8ee73629366f7be45a6df5f2ea9de83f52e1ca24433f2cc78c35d8ec
-  languageName: node
-  linkType: hard
-
-"has-ansi@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "has-ansi@npm:3.0.0"
-  dependencies:
-    ansi-regex: ^3.0.0
-  checksum: d52ff546c982fb8646e6aa6a4e3741c123a29dcd0342db0e98cd17561356fc47fb03cc0cab9ad2000887facc39b8e7ce385089bdce548e6ff5463858ed5c12c1
-  languageName: node
-  linkType: hard
-
-"has-bigints@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "has-bigints@npm:1.0.1"
-  checksum: 44ab55868174470065d2e0f8f6def1c990d12b82162a8803c679699fa8a39f966e336f2a33c185092fe8aea7e8bf2e85f1c26add5f29d98f2318bd270096b183
-  languageName: node
-  linkType: hard
-
-"has-color@npm:~0.1.0":
-  version: 0.1.7
-  resolution: "has-color@npm:0.1.7"
-  checksum: 5753d76b1330bc1f5a07171f222ed0718f5ec2d64d5677800e434f183a99f7042f5cda43c9625a2d0f0204063aa03499a66f1c15283d789773b3544f18f93f58
-  languageName: node
-  linkType: hard
-
-"has-flag@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "has-flag@npm:3.0.0"
-  checksum: 4a15638b454bf086c8148979aae044dd6e39d63904cd452d970374fa6a87623423da485dfb814e7be882e05c096a7ccf1ebd48e7e7501d0208d8384ff4dea73b
-  languageName: node
-  linkType: hard
-
-"has-flag@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "has-flag@npm:4.0.0"
-  checksum: 261a1357037ead75e338156b1f9452c016a37dcd3283a972a30d9e4a87441ba372c8b81f818cd0fbcd9c0354b4ae7e18b9e1afa1971164aef6d18c2b6095a8ad
-  languageName: node
-  linkType: hard
-
-"has-symbols@npm:^1.0.1, has-symbols@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "has-symbols@npm:1.0.2"
-  checksum: 2309c426071731be792b5be43b3da6fb4ed7cbe8a9a6bcfca1862587709f01b33d575ce8f5c264c1eaad09fca2f9a8208c0a2be156232629daa2dd0c0740976b
-  languageName: node
-  linkType: hard
-
-"has-tostringtag@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "has-tostringtag@npm:1.0.0"
-  dependencies:
-    has-symbols: ^1.0.2
-  checksum: cc12eb28cb6ae22369ebaad3a8ab0799ed61270991be88f208d508076a1e99abe4198c965935ce85ea90b60c94ddda73693b0920b58e7ead048b4a391b502c1c
-  languageName: node
-  linkType: hard
-
-"has-unicode@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "has-unicode@npm:2.0.1"
-  checksum: 1eab07a7436512db0be40a710b29b5dc21fa04880b7f63c9980b706683127e3c1b57cb80ea96d47991bdae2dfe479604f6a1ba410106ee1046a41d1bd0814400
-  languageName: node
-  linkType: hard
-
-"has-value@npm:^0.3.1":
-  version: 0.3.1
-  resolution: "has-value@npm:0.3.1"
-  dependencies:
-    get-value: ^2.0.3
-    has-values: ^0.1.4
-    isobject: ^2.0.0
-  checksum: 29e2a1e6571dad83451b769c7ce032fce6009f65bccace07c2962d3ad4d5530b6743d8f3229e4ecf3ea8e905d23a752c5f7089100c1f3162039fa6dc3976558f
-  languageName: node
-  linkType: hard
-
-"has-value@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "has-value@npm:1.0.0"
-  dependencies:
-    get-value: ^2.0.6
-    has-values: ^1.0.0
-    isobject: ^3.0.0
-  checksum: b9421d354e44f03d3272ac39fd49f804f19bc1e4fa3ceef7745df43d6b402053f828445c03226b21d7d934a21ac9cf4bc569396dc312f496ddff873197bbd847
-  languageName: node
-  linkType: hard
-
-"has-values@npm:^0.1.4":
-  version: 0.1.4
-  resolution: "has-values@npm:0.1.4"
-  checksum: ab1c4bcaf811ccd1856c11cfe90e62fca9e2b026ebe474233a3d282d8d67e3b59ed85b622c7673bac3db198cb98bd1da2b39300a2f98e453729b115350af49bc
-  languageName: node
-  linkType: hard
-
-"has-values@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "has-values@npm:1.0.0"
-  dependencies:
-    is-number: ^3.0.0
-    kind-of: ^4.0.0
-  checksum: 77e6693f732b5e4cf6c38dfe85fdcefad0fab011af74995c3e83863fabf5e3a836f406d83565816baa0bc0a523c9410db8b990fe977074d61aeb6d8f4fcffa11
-  languageName: node
-  linkType: hard
-
-"has@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "has@npm:1.0.3"
-  dependencies:
-    function-bind: ^1.1.1
-  checksum: b9ad53d53be4af90ce5d1c38331e712522417d017d5ef1ebd0507e07c2fbad8686fffb8e12ddecd4c39ca9b9b47431afbb975b8abf7f3c3b82c98e9aad052792
-  languageName: node
-  linkType: hard
-
-"hash-base@npm:^3.0.0":
-  version: 3.1.0
-  resolution: "hash-base@npm:3.1.0"
-  dependencies:
-    inherits: ^2.0.4
-    readable-stream: ^3.6.0
-    safe-buffer: ^5.2.0
-  checksum: 26b7e97ac3de13cb23fc3145e7e3450b0530274a9562144fc2bf5c1e2983afd0e09ed7cc3b20974ba66039fad316db463da80eb452e7373e780cbee9a0d2f2dc
-  languageName: node
-  linkType: hard
-
-"hash-for-dep@npm:^1.0.2, hash-for-dep@npm:^1.2.3, hash-for-dep@npm:^1.4.7, hash-for-dep@npm:^1.5.0, hash-for-dep@npm:^1.5.1":
-  version: 1.5.1
-  resolution: "hash-for-dep@npm:1.5.1"
-  dependencies:
-    broccoli-kitchen-sink-helpers: ^0.3.1
-    heimdalljs: ^0.2.3
-    heimdalljs-logger: ^0.1.7
-    path-root: ^0.1.1
-    resolve: ^1.10.0
-    resolve-package-path: ^1.0.11
-  checksum: ea9854cfeaedc5e3b7ba38f902a9173919f3f1abef13ee27ddc15b5ec8768be340762ed502e9d16b3ffbeb8e8af0f099cb0348215f9de39c31bb722af52895d9
-  languageName: node
-  linkType: hard
-
-"hash.js@npm:^1.0.0, hash.js@npm:^1.0.3":
-  version: 1.1.7
-  resolution: "hash.js@npm:1.1.7"
-  dependencies:
-    inherits: ^2.0.3
-    minimalistic-assert: ^1.0.1
-  checksum: e350096e659c62422b85fa508e4b3669017311aa4c49b74f19f8e1bc7f3a54a584fdfd45326d4964d6011f2b2d882e38bea775a96046f2a61b7779a979629d8f
-  languageName: node
-  linkType: hard
-
-"heimdalljs-fs-monitor@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "heimdalljs-fs-monitor@npm:1.1.1"
-  dependencies:
-    callsites: ^3.1.0
-    clean-stack: ^2.2.0
-    extract-stack: ^2.0.0
-    heimdalljs: ^0.2.3
-    heimdalljs-logger: ^0.1.7
-  checksum: 0932adf032888bcc22c9ff8b5d832c708f1303b04e5a8c34b88dac09948bf6a45e4ea7d34bfdf30a3aaa41eabb0311d0e00e0fad1da862e16cc0950db50101cd
-  languageName: node
-  linkType: hard
-
-"heimdalljs-graph@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "heimdalljs-graph@npm:1.0.0"
-  checksum: eef4a3de227fa4b3e6b20f634b7c1bbb3c7ae9a83639444ce7f5f8ffbc979e205021538452ecd92804d49013245ed9a989075c8c9147cca8666f4d7a1983da93
-  languageName: node
-  linkType: hard
-
-"heimdalljs-logger@npm:^0.1.10, heimdalljs-logger@npm:^0.1.7, heimdalljs-logger@npm:^0.1.9":
-  version: 0.1.10
-  resolution: "heimdalljs-logger@npm:0.1.10"
-  dependencies:
-    debug: ^2.2.0
-    heimdalljs: ^0.2.6
-  checksum: 40a698843aa4773e3376f4e000c87599460971f4411b402985526a8f82563f5486fc85bfde90ce3e63d25381cf417289e870242321ce92ade32ea3b91585cfad
-  languageName: node
-  linkType: hard
-
-"heimdalljs@npm:^0.2.0, heimdalljs@npm:^0.2.1, heimdalljs@npm:^0.2.3, heimdalljs@npm:^0.2.5, heimdalljs@npm:^0.2.6":
-  version: 0.2.6
-  resolution: "heimdalljs@npm:0.2.6"
-  dependencies:
-    rsvp: ~3.2.1
-  checksum: 5b28d3df4e77ea94293b43c29f0a358381aa811079817f780a1dafc9d244c891a0a713691a3c53d0d2dc31a76484fb36d998e7ae5040ef4b52e8c4a00d2173ae
-  languageName: node
-  linkType: hard
-
-"highlight.js@npm:^10.4.1":
-  version: 10.7.2
-  resolution: "highlight.js@npm:10.7.2"
-  checksum: af09b434070c81ed154b4c990bee61a8c1295887554abc7884eb2544c48bff208e237e7ce1b324ebe94abe0f942e15e2c11dff1b1ed22a79a3c4a0d8a900a921
-  languageName: node
-  linkType: hard
-
-"hmac-drbg@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "hmac-drbg@npm:1.0.1"
-  dependencies:
-    hash.js: ^1.0.3
-    minimalistic-assert: ^1.0.0
-    minimalistic-crypto-utils: ^1.0.1
-  checksum: bd30b6a68d7f22d63f10e1888aee497d7c2c5c0bb469e66bbdac99f143904d1dfe95f8131f95b3e86c86dd239963c9d972fcbe147e7cffa00e55d18585c43fe0
-  languageName: node
-  linkType: hard
-
-"home-or-tmp@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "home-or-tmp@npm:2.0.0"
-  dependencies:
-    os-homedir: ^1.0.0
-    os-tmpdir: ^1.0.1
-  checksum: b783c6ffd22f716d82f53e8c781cbe49bc9f4109a89ea86a27951e54c0bd335caf06bd828be2958cd9f4681986df1739558ae786abda6298cdd6d3edc2c362f1
-  languageName: node
-  linkType: hard
-
-"homedir-polyfill@npm:^1.0.1":
-  version: 1.0.3
-  resolution: "homedir-polyfill@npm:1.0.3"
-  dependencies:
-    parse-passwd: ^1.0.0
-  checksum: 18dd4db87052c6a2179d1813adea0c4bfcfa4f9996f0e226fefb29eb3d548e564350fa28ec46b0bf1fbc0a1d2d6922ceceb80093115ea45ff8842a4990139250
-  languageName: node
-  linkType: hard
-
-"hosted-git-info@npm:^2.1.4":
-  version: 2.8.9
-  resolution: "hosted-git-info@npm:2.8.9"
-  checksum: c955394bdab888a1e9bb10eb33029e0f7ce5a2ac7b3f158099dc8c486c99e73809dca609f5694b223920ca2174db33d32b12f9a2a47141dc59607c29da5a62dd
-  languageName: node
-  linkType: hard
-
-"hosted-git-info@npm:^4.0.1":
-  version: 4.0.2
-  resolution: "hosted-git-info@npm:4.0.2"
-  dependencies:
-    lru-cache: ^6.0.0
-  checksum: d1b2d7720398ce96a788bd38d198fbddce089a2381f63cfb01743e6c7e5aed656e5547fe74090fb9fe53b2cb785b0e8c9ebdddadff48ed26bb471dd23cd25458
-  languageName: node
-  linkType: hard
-
-"html-encoding-sniffer@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "html-encoding-sniffer@npm:2.0.1"
-  dependencies:
-    whatwg-encoding: ^1.0.5
-  checksum: bf30cce461015ed7e365736fcd6a3063c7bc016a91f74398ef6158886970a96333938f7c02417ab3c12aa82e3e53b40822145facccb9ddfbcdc15a879ae4d7ba
-  languageName: node
-  linkType: hard
-
-"htmlparser2@npm:^7.2.0":
-  version: 7.2.0
-  resolution: "htmlparser2@npm:7.2.0"
-  dependencies:
-    domelementtype: ^2.0.1
-    domhandler: ^4.2.2
-    domutils: ^2.8.0
-    entities: ^3.0.1
-  checksum: 96563d9965729cfcb3f5f19c26d013c6831b4cb38d79d8c185e9cd669ea6a9ffe8fb9ccc74d29a068c9078aa0e2767053ed6b19aa32723c41550340d0094bea0
-  languageName: node
-  linkType: hard
-
-"htmlparser2@npm:^8.0.1":
-  version: 8.0.1
-  resolution: "htmlparser2@npm:8.0.1"
-  dependencies:
-    domelementtype: ^2.3.0
-    domhandler: ^5.0.2
-    domutils: ^3.0.1
-    entities: ^4.3.0
-  checksum: 06d5c71e8313597722bc429ae2a7a8333d77bd3ab07ccb916628384b37332027b047f8619448d8f4a3312b6609c6ea3302a4e77435d859e9e686999e6699ca39
-  languageName: node
-  linkType: hard
-
-"http-cache-semantics@npm:^4.1.0":
-  version: 4.1.1
-  resolution: "http-cache-semantics@npm:4.1.1"
-  checksum: 83ac0bc60b17a3a36f9953e7be55e5c8f41acc61b22583060e8dedc9dd5e3607c823a88d0926f9150e571f90946835c7fe150732801010845c72cd8bbff1a236
-  languageName: node
-  linkType: hard
-
-"http-errors@npm:1.7.2":
-  version: 1.7.2
-  resolution: "http-errors@npm:1.7.2"
-  dependencies:
-    depd: ~1.1.2
-    inherits: 2.0.3
-    setprototypeof: 1.1.1
-    statuses: ">= 1.5.0 < 2"
-    toidentifier: 1.0.0
-  checksum: 5534b0ae08e77f5a45a2380f500e781f6580c4ff75b816cb1f09f99a290b57e78a518be6d866db1b48cca6b052c09da2c75fc91fb16a2fe3da3c44d9acbb9972
-  languageName: node
-  linkType: hard
-
-"http-errors@npm:2.0.0":
-  version: 2.0.0
-  resolution: "http-errors@npm:2.0.0"
-  dependencies:
-    depd: 2.0.0
-    inherits: 2.0.4
-    setprototypeof: 1.2.0
-    statuses: 2.0.1
-    toidentifier: 1.0.1
-  checksum: 9b0a3782665c52ce9dc658a0d1560bcb0214ba5699e4ea15aefb2a496e2ca83db03ebc42e1cce4ac1f413e4e0d2d736a3fd755772c556a9a06853ba2a0b7d920
-  languageName: node
-  linkType: hard
-
-"http-errors@npm:~1.6.2":
-  version: 1.6.3
-  resolution: "http-errors@npm:1.6.3"
-  dependencies:
-    depd: ~1.1.2
-    inherits: 2.0.3
-    setprototypeof: 1.1.0
-    statuses: ">= 1.4.0 < 2"
-  checksum: a9654ee027e3d5de305a56db1d1461f25709ac23267c6dc28cdab8323e3f96caa58a9a6a5e93ac15d7285cee0c2f019378c3ada9026e7fe19c872d695f27de7c
-  languageName: node
-  linkType: hard
-
-"http-errors@npm:~1.7.2":
-  version: 1.7.3
-  resolution: "http-errors@npm:1.7.3"
-  dependencies:
-    depd: ~1.1.2
-    inherits: 2.0.4
-    setprototypeof: 1.1.1
-    statuses: ">= 1.5.0 < 2"
-    toidentifier: 1.0.0
-  checksum: a59f359473f4b3ea78305beee90d186268d6075432622a46fb7483059068a2dd4c854a20ac8cd438883127e06afb78c1309168bde6cdfeed1e3700eb42487d99
-  languageName: node
-  linkType: hard
-
-"http-parser-js@npm:>=0.5.1":
-  version: 0.5.3
-  resolution: "http-parser-js@npm:0.5.3"
-  checksum: 6f3142c5f60ad995a6895a1dc4f70f8cef0910745366e97cbcb99caa604590dbcc11006b00989ad306837d6b820e9bfc6e801c4060ed19a0e4df83caa8577cb5
-  languageName: node
-  linkType: hard
-
-"http-proxy-agent@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "http-proxy-agent@npm:5.0.0"
-  dependencies:
-    "@tootallnate/once": 2
-    agent-base: 6
-    debug: 4
-  checksum: e2ee1ff1656a131953839b2a19cd1f3a52d97c25ba87bd2559af6ae87114abf60971e498021f9b73f9fd78aea8876d1fb0d4656aac8a03c6caa9fc175f22b786
-  languageName: node
-  linkType: hard
-
-"http-proxy@npm:^1.13.1, http-proxy@npm:^1.18.1":
-  version: 1.18.1
-  resolution: "http-proxy@npm:1.18.1"
-  dependencies:
-    eventemitter3: ^4.0.0
-    follow-redirects: ^1.0.0
-    requires-port: ^1.0.0
-  checksum: f5bd96bf83e0b1e4226633dbb51f8b056c3e6321917df402deacec31dd7fe433914fc7a2c1831cf7ae21e69c90b3a669b8f434723e9e8b71fd68afe30737b6a5
-  languageName: node
-  linkType: hard
-
-"http-signature@npm:~1.2.0":
-  version: 1.2.0
-  resolution: "http-signature@npm:1.2.0"
-  dependencies:
-    assert-plus: ^1.0.0
-    jsprim: ^1.2.2
-    sshpk: ^1.7.0
-  checksum: 3324598712266a9683585bb84a75dec4fd550567d5e0dd4a0fff6ff3f74348793404d3eeac4918fa0902c810eeee1a86419e4a2e92a164132dfe6b26743fb47c
-  languageName: node
-  linkType: hard
-
-"https-browserify@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "https-browserify@npm:1.0.0"
-  checksum: 09b35353e42069fde2435760d13f8a3fb7dd9105e358270e2e225b8a94f811b461edd17cb57594e5f36ec1218f121c160ddceeec6e8be2d55e01dcbbbed8cbae
-  languageName: node
-  linkType: hard
-
-"https-proxy-agent@npm:^2.2.3":
-  version: 2.2.4
-  resolution: "https-proxy-agent@npm:2.2.4"
-  dependencies:
-    agent-base: ^4.3.0
-    debug: ^3.1.0
-  checksum: 5fa8eab256b117a8badb5747bedf8b3a9de1fbabdccb26ff3132385426fdc3ad3c8b092ce52a1b74c70229b971df623f4f5a0c17f78e6a8fe5d10fc65d6ed8b8
-  languageName: node
-  linkType: hard
-
-"https@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "https@npm:1.0.0"
-  checksum: ccea8a8363a018d4b241db7748cff3a85c9f5b71bf80639e9c37dc6823f590f35dda098b80b726930e9f945387c8bfd6b1461df25cab5bf65a31903d81875b5d
-  languageName: node
-  linkType: hard
-
-"human-signals@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "human-signals@npm:1.1.1"
-  checksum: d587647c9e8ec24e02821b6be7de5a0fc37f591f6c4e319b3054b43fd4c35a70a94c46fc74d8c1a43c47fde157d23acd7421f375e1c1365b09a16835b8300205
-  languageName: node
-  linkType: hard
-
-"human-signals@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "human-signals@npm:2.1.0"
-  checksum: b87fd89fce72391625271454e70f67fe405277415b48bcc0117ca73d31fa23a4241787afdc8d67f5a116cf37258c052f59ea82daffa72364d61351423848e3b8
-  languageName: node
-  linkType: hard
-
-"humanize-ms@npm:^1.2.1":
-  version: 1.2.1
-  resolution: "humanize-ms@npm:1.2.1"
-  dependencies:
-    ms: ^2.0.0
-  checksum: 9c7a74a2827f9294c009266c82031030eae811ca87b0da3dceb8d6071b9bde22c9f3daef0469c3c533cc67a97d8a167cd9fc0389350e5f415f61a79b171ded16
-  languageName: node
-  linkType: hard
-
-"iconv-lite@npm:0.4, iconv-lite@npm:0.4.24, iconv-lite@npm:^0.4.24":
-  version: 0.4.24
-  resolution: "iconv-lite@npm:0.4.24"
-  dependencies:
-    safer-buffer: ">= 2.1.2 < 3"
-  checksum: bd9f120f5a5b306f0bc0b9ae1edeb1577161503f5f8252a20f1a9e56ef8775c9959fd01c55f2d3a39d9a8abaf3e30c1abeb1895f367dcbbe0a8fd1c9ca01c4f6
-  languageName: node
-  linkType: hard
-
-"iconv-lite@npm:^0.6.2":
-  version: 0.6.3
-  resolution: "iconv-lite@npm:0.6.3"
-  dependencies:
-    safer-buffer: ">= 2.1.2 < 3.0.0"
-  checksum: 3f60d47a5c8fc3313317edfd29a00a692cc87a19cac0159e2ce711d0ebc9019064108323b5e493625e25594f11c6236647d8e256fbe7a58f4a3b33b89e6d30bf
-  languageName: node
-  linkType: hard
-
-"icss-utils@npm:^5.0.0, icss-utils@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "icss-utils@npm:5.1.0"
-  peerDependencies:
-    postcss: ^8.1.0
-  checksum: 5c324d283552b1269cfc13a503aaaa172a280f914e5b81544f3803bc6f06a3b585fb79f66f7c771a2c052db7982c18bf92d001e3b47282e3abbbb4c4cc488d68
-  languageName: node
-  linkType: hard
-
-"ieee754@npm:^1.1.13, ieee754@npm:^1.1.4":
-  version: 1.2.1
-  resolution: "ieee754@npm:1.2.1"
-  checksum: 5144c0c9815e54ada181d80a0b810221a253562422e7c6c3a60b1901154184f49326ec239d618c416c1c5945a2e197107aee8d986a3dd836b53dffefd99b5e7e
-  languageName: node
-  linkType: hard
-
-"iferr@npm:^0.1.5":
-  version: 0.1.5
-  resolution: "iferr@npm:0.1.5"
-  checksum: a18d19b6ad06a2d5412c0d37f6364869393ef6d1688d59d00082c1f35c92399094c031798340612458cd832f4f2e8b13bc9615934a7d8b0c53061307a3816aa1
-  languageName: node
-  linkType: hard
-
-"ignore@npm:^4.0.6":
-  version: 4.0.6
-  resolution: "ignore@npm:4.0.6"
-  checksum: 248f82e50a430906f9ee7f35e1158e3ec4c3971451dd9f99c9bc1548261b4db2b99709f60ac6c6cac9333494384176cc4cc9b07acbe42d52ac6a09cad734d800
-  languageName: node
-  linkType: hard
-
-"ignore@npm:^5.1.1, ignore@npm:^5.1.4":
-  version: 5.1.8
-  resolution: "ignore@npm:5.1.8"
-  checksum: 967abadb61e2cb0e5c5e8c4e1686ab926f91bc1a4680d994b91947d3c65d04c3ae126dcdf67f08e0feeb8ff8407d453e641aeeddcc47a3a3cca359f283cf6121
-  languageName: node
-  linkType: hard
-
-"ignore@npm:^5.2.0":
-  version: 5.2.0
-  resolution: "ignore@npm:5.2.0"
-  checksum: 6b1f926792d614f64c6c83da3a1f9c83f6196c2839aa41e1e32dd7b8d174cef2e329d75caabb62cb61ce9dc432f75e67d07d122a037312db7caa73166a1bdb77
-  languageName: node
-  linkType: hard
-
-"immutable@npm:^4.0.0":
-  version: 4.2.4
-  resolution: "immutable@npm:4.2.4"
-  checksum: 3be84eded37b05e65cad57bfba630bc1bf170c498b7472144bc02d2650cc9baef79daf03574a9c2e41d195ebb55a1c12c9b312f41ee324b653927b24ad8bcaa7
-  languageName: node
-  linkType: hard
-
-"import-fresh@npm:^3.0.0, import-fresh@npm:^3.2.1":
-  version: 3.3.0
-  resolution: "import-fresh@npm:3.3.0"
-  dependencies:
-    parent-module: ^1.0.0
-    resolve-from: ^4.0.0
-  checksum: 2cacfad06e652b1edc50be650f7ec3be08c5e5a6f6d12d035c440a42a8cc028e60a5b99ca08a77ab4d6b1346da7d971915828f33cdab730d3d42f08242d09baa
-  languageName: node
-  linkType: hard
-
-"imurmurhash@npm:^0.1.4":
-  version: 0.1.4
-  resolution: "imurmurhash@npm:0.1.4"
-  checksum: 7cae75c8cd9a50f57dadd77482359f659eaebac0319dd9368bcd1714f55e65badd6929ca58569da2b6494ef13fdd5598cd700b1eba23f8b79c5f19d195a3ecf7
-  languageName: node
-  linkType: hard
-
-"include-path-searcher@npm:^0.1.0":
-  version: 0.1.0
-  resolution: "include-path-searcher@npm:0.1.0"
-  checksum: c391eea6047851c926bfc4231b104d33a3b6b465c2c55fff2e8af964a1a1c1aa1d20e77fdb2f288df6ffa3b9bbbda2cfb5cbf01cda2394c856a4988ce05b7bb7
-  languageName: node
-  linkType: hard
-
-"indent-string@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "indent-string@npm:4.0.0"
-  checksum: 824cfb9929d031dabf059bebfe08cf3137365e112019086ed3dcff6a0a7b698cb80cf67ccccde0e25b9e2d7527aa6cc1fed1ac490c752162496caba3e6699612
-  languageName: node
-  linkType: hard
-
-"infer-owner@npm:^1.0.3, infer-owner@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "infer-owner@npm:1.0.4"
-  checksum: 181e732764e4a0611576466b4b87dac338972b839920b2a8cde43642e4ed6bd54dc1fb0b40874728f2a2df9a1b097b8ff83b56d5f8f8e3927f837fdcb47d8a89
-  languageName: node
-  linkType: hard
-
-"inflected@npm:^2.0.4":
-  version: 2.1.0
-  resolution: "inflected@npm:2.1.0"
-  checksum: 1e3fb2d24ec6c774977dd5ed884c6097b6525f66edecfdca0845ab4023d35f02af1057de50cd69cdc5829d0bd5ba69fd7fb41d4d8abdf85ee243bf2bbf65995d
-  languageName: node
-  linkType: hard
-
-"inflection@npm:^1.13.1, inflection@npm:^1.13.2":
-  version: 1.13.2
-  resolution: "inflection@npm:1.13.2"
-  checksum: e7ad0559384ed7c526813404bde843f8f17941d47625ad60fc3b09e46efde873dd9840818007c6bd4dbe388e6248fa033d5a8c405c5fc62738c51b118a0e940f
-  languageName: node
-  linkType: hard
-
-"inflection@npm:~1.13.2":
-  version: 1.13.4
-  resolution: "inflection@npm:1.13.4"
-  checksum: 6744feede9998ad8abd2b1db4af79f494a166e656a0aa949d90c8f4a945c1d07038a3756bf7af78c8f6fce368ba213a7ebf35da3edeffd39f1da0ff465eed6eb
-  languageName: node
-  linkType: hard
-
-"inflight@npm:^1.0.4":
-  version: 1.0.6
-  resolution: "inflight@npm:1.0.6"
-  dependencies:
-    once: ^1.3.0
-    wrappy: 1
-  checksum: f4f76aa072ce19fae87ce1ef7d221e709afb59d445e05d47fba710e85470923a75de35bfae47da6de1b18afc3ce83d70facf44cfb0aff89f0a3f45c0a0244dfd
-  languageName: node
-  linkType: hard
-
-"inherits@npm:2, inherits@npm:2.0.4, inherits@npm:^2.0.1, inherits@npm:^2.0.3, inherits@npm:^2.0.4, inherits@npm:~2.0.1, inherits@npm:~2.0.3":
-  version: 2.0.4
-  resolution: "inherits@npm:2.0.4"
-  checksum: 4a48a733847879d6cf6691860a6b1e3f0f4754176e4d71494c41f3475553768b10f84b5ce1d40fbd0e34e6bfbb864ee35858ad4dd2cf31e02fc4a154b724d7f1
-  languageName: node
-  linkType: hard
-
-"inherits@npm:2.0.1":
-  version: 2.0.1
-  resolution: "inherits@npm:2.0.1"
-  checksum: 6536b9377296d4ce8ee89c5c543cb75030934e61af42dba98a428e7d026938c5985ea4d1e3b87743a5b834f40ed1187f89c2d7479e9d59e41d2d1051aefba07b
-  languageName: node
-  linkType: hard
-
-"inherits@npm:2.0.3":
-  version: 2.0.3
-  resolution: "inherits@npm:2.0.3"
-  checksum: 78cb8d7d850d20a5e9a7f3620db31483aa00ad5f722ce03a55b110e5a723539b3716a3b463e2b96ce3fe286f33afc7c131fa2f91407528ba80cea98a7545d4c0
-  languageName: node
-  linkType: hard
-
-"ini@npm:^1.3.6":
-  version: 1.3.8
-  resolution: "ini@npm:1.3.8"
-  checksum: dfd98b0ca3a4fc1e323e38a6c8eb8936e31a97a918d3b377649ea15bdb15d481207a0dda1021efbd86b464cae29a0d33c1d7dcaf6c5672bee17fa849bc50a1b3
-  languageName: node
-  linkType: hard
-
-"inline-source-map-comment@npm:^1.0.5":
-  version: 1.0.5
-  resolution: "inline-source-map-comment@npm:1.0.5"
-  dependencies:
-    chalk: ^1.0.0
-    get-stdin: ^4.0.1
-    minimist: ^1.1.1
-    sum-up: ^1.0.1
-    xtend: ^4.0.0
-  bin:
-    inline-source-map-comment: cli.js
-  checksum: 0eedf1c77d35cddc89e17d5b738c273471a50521c2103dde056e36460a1bcb747bc2eb5a7de052ded5e26f23154064232d1a29f5116dd273610ed6ab03179ede
-  languageName: node
-  linkType: hard
-
-"inquirer@npm:^6":
-  version: 6.5.2
-  resolution: "inquirer@npm:6.5.2"
-  dependencies:
-    ansi-escapes: ^3.2.0
-    chalk: ^2.4.2
-    cli-cursor: ^2.1.0
-    cli-width: ^2.0.0
-    external-editor: ^3.0.3
-    figures: ^2.0.0
-    lodash: ^4.17.12
-    mute-stream: 0.0.7
-    run-async: ^2.2.0
-    rxjs: ^6.4.0
-    string-width: ^2.1.0
-    strip-ansi: ^5.1.0
-    through: ^2.3.6
-  checksum: 175ad4cd1ebed493b231b240185f1da5afeace5f4e8811dfa83cf55dcae59c3255eaed990aa71871b0fd31aa9dc212f43c44c50ed04fb529364405e72f484d28
-  languageName: node
-  linkType: hard
-
-"inquirer@npm:^7.3.3":
-  version: 7.3.3
-  resolution: "inquirer@npm:7.3.3"
-  dependencies:
-    ansi-escapes: ^4.2.1
-    chalk: ^4.1.0
-    cli-cursor: ^3.1.0
-    cli-width: ^3.0.0
-    external-editor: ^3.0.3
-    figures: ^3.0.0
-    lodash: ^4.17.19
-    mute-stream: 0.0.8
-    run-async: ^2.4.0
-    rxjs: ^6.6.0
-    string-width: ^4.1.0
-    strip-ansi: ^6.0.0
-    through: ^2.3.6
-  checksum: 4d387fc1eb6126acbd58cbdb9ad99d2887d181df86ab0c2b9abdf734e751093e2d5882c2b6dc7144d9ab16b7ab30a78a1d7f01fb6a2850a44aeb175d1e3f8778
-  languageName: node
-  linkType: hard
-
-"internal-slot@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "internal-slot@npm:1.0.3"
-  dependencies:
-    get-intrinsic: ^1.1.0
-    has: ^1.0.3
-    side-channel: ^1.0.4
-  checksum: 1944f92e981e47aebc98a88ff0db579fd90543d937806104d0b96557b10c1f170c51fb777b97740a8b6ddeec585fca8c39ae99fd08a8e058dfc8ab70937238bf
-  languageName: node
-  linkType: hard
-
-"invariant@npm:^2.2.2":
-  version: 2.2.4
-  resolution: "invariant@npm:2.2.4"
-  dependencies:
-    loose-envify: ^1.0.0
-  checksum: cc3182d793aad82a8d1f0af697b462939cb46066ec48bbf1707c150ad5fad6406137e91a262022c269702e01621f35ef60269f6c0d7fd178487959809acdfb14
-  languageName: node
-  linkType: hard
-
-"ip@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "ip@npm:2.0.0"
-  checksum: cfcfac6b873b701996d71ec82a7dd27ba92450afdb421e356f44044ed688df04567344c36cbacea7d01b1c39a4c732dc012570ebe9bebfb06f27314bca625349
-  languageName: node
-  linkType: hard
-
-"ipaddr.js@npm:1.9.1":
-  version: 1.9.1
-  resolution: "ipaddr.js@npm:1.9.1"
-  checksum: f88d3825981486f5a1942414c8d77dd6674dd71c065adcfa46f578d677edcb99fda25af42675cb59db492fdf427b34a5abfcde3982da11a8fd83a500b41cfe77
-  languageName: node
-  linkType: hard
-
-"is-accessor-descriptor@npm:^0.1.6":
-  version: 0.1.6
-  resolution: "is-accessor-descriptor@npm:0.1.6"
-  dependencies:
-    kind-of: ^3.0.2
-  checksum: 3d629a086a9585bc16a83a8e8a3416f400023301855cafb7ccc9a1d63145b7480f0ad28877dcc2cce09492c4ec1c39ef4c071996f24ee6ac626be4217b8ffc8a
-  languageName: node
-  linkType: hard
-
-"is-accessor-descriptor@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "is-accessor-descriptor@npm:1.0.0"
-  dependencies:
-    kind-of: ^6.0.0
-  checksum: 8e475968e9b22f9849343c25854fa24492dbe8ba0dea1a818978f9f1b887339190b022c9300d08c47fe36f1b913d70ce8cbaca00369c55a56705fdb7caed37fe
-  languageName: node
-  linkType: hard
-
-"is-alphabetical@npm:^1.0.0":
-  version: 1.0.4
-  resolution: "is-alphabetical@npm:1.0.4"
-  checksum: 6508cce44fd348f06705d377b260974f4ce68c74000e7da4045f0d919e568226dc3ce9685c5a2af272195384df6930f748ce9213fc9f399b5d31b362c66312cb
-  languageName: node
-  linkType: hard
-
-"is-alphanumerical@npm:^1.0.0":
-  version: 1.0.4
-  resolution: "is-alphanumerical@npm:1.0.4"
-  dependencies:
-    is-alphabetical: ^1.0.0
-    is-decimal: ^1.0.0
-  checksum: e2e491acc16fcf5b363f7c726f666a9538dba0a043665740feb45bba1652457a73441e7c5179c6768a638ed396db3437e9905f403644ec7c468fb41f4813d03f
-  languageName: node
-  linkType: hard
-
-"is-arrayish@npm:^0.2.1":
-  version: 0.2.1
-  resolution: "is-arrayish@npm:0.2.1"
-  checksum: eef4417e3c10e60e2c810b6084942b3ead455af16c4509959a27e490e7aee87cfb3f38e01bbde92220b528a0ee1a18d52b787e1458ee86174d8c7f0e58cd488f
-  languageName: node
-  linkType: hard
-
-"is-bigint@npm:^1.0.1":
-  version: 1.0.4
-  resolution: "is-bigint@npm:1.0.4"
-  dependencies:
-    has-bigints: ^1.0.1
-  checksum: c56edfe09b1154f8668e53ebe8252b6f185ee852a50f9b41e8d921cb2bed425652049fbe438723f6cb48a63ca1aa051e948e7e401e093477c99c84eba244f666
-  languageName: node
-  linkType: hard
-
-"is-binary-path@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "is-binary-path@npm:1.0.1"
-  dependencies:
-    binary-extensions: ^1.0.0
-  checksum: a803c99e9d898170c3b44a86fbdc0736d3d7fcbe737345433fb78e810b9fe30c982657782ad0e676644ba4693ddf05601a7423b5611423218663d6b533341ac9
-  languageName: node
-  linkType: hard
-
-"is-binary-path@npm:~2.1.0":
-  version: 2.1.0
-  resolution: "is-binary-path@npm:2.1.0"
-  dependencies:
-    binary-extensions: ^2.0.0
-  checksum: 84192eb88cff70d320426f35ecd63c3d6d495da9d805b19bc65b518984b7c0760280e57dbf119b7e9be6b161784a5a673ab2c6abe83abb5198a432232ad5b35c
-  languageName: node
-  linkType: hard
-
-"is-boolean-object@npm:^1.1.0":
-  version: 1.1.2
-  resolution: "is-boolean-object@npm:1.1.2"
-  dependencies:
-    call-bind: ^1.0.2
-    has-tostringtag: ^1.0.0
-  checksum: c03b23dbaacadc18940defb12c1c0e3aaece7553ef58b162a0f6bba0c2a7e1551b59f365b91e00d2dbac0522392d576ef322628cb1d036a0fe51eb466db67222
-  languageName: node
-  linkType: hard
-
-"is-buffer@npm:^2.0.0, is-buffer@npm:~2.0.3":
-  version: 2.0.5
-  resolution: "is-buffer@npm:2.0.5"
-  checksum: 764c9ad8b523a9f5a32af29bdf772b08eb48c04d2ad0a7240916ac2688c983bf5f8504bf25b35e66240edeb9d9085461f9b5dae1f3d2861c6b06a65fe983de42
-  languageName: node
-  linkType: hard
-
-"is-callable@npm:^1.1.4, is-callable@npm:^1.2.3, is-callable@npm:^1.2.4":
-  version: 1.2.4
-  resolution: "is-callable@npm:1.2.4"
-  checksum: 1a28d57dc435797dae04b173b65d6d1e77d4f16276e9eff973f994eadcfdc30a017e6a597f092752a083c1103cceb56c91e3dadc6692fedb9898dfaba701575f
-  languageName: node
-  linkType: hard
-
-"is-core-module@npm:^2.2.0":
-  version: 2.8.0
-  resolution: "is-core-module@npm:2.8.0"
-  dependencies:
-    has: ^1.0.3
-  checksum: f8b52714891e1a6c6577fcb8d5e057bab064a7a30954aab6beb5092e311473eb8da57afd334de4981dc32409ffca998412efc3a2edceb9e397cef6098d21dd91
-  languageName: node
-  linkType: hard
-
-"is-core-module@npm:^2.8.1":
-  version: 2.8.1
-  resolution: "is-core-module@npm:2.8.1"
-  dependencies:
-    has: ^1.0.3
-  checksum: 418b7bc10768a73c41c7ef497e293719604007f88934a6ffc5f7c78702791b8528102fb4c9e56d006d69361549b3d9519440214a74aefc7e0b79e5e4411d377f
-  languageName: node
-  linkType: hard
-
-"is-data-descriptor@npm:^0.1.4":
-  version: 0.1.4
-  resolution: "is-data-descriptor@npm:0.1.4"
-  dependencies:
-    kind-of: ^3.0.2
-  checksum: 5c622e078ba933a78338ae398a3d1fc5c23332b395312daf4f74bab4afb10d061cea74821add726cb4db8b946ba36217ee71a24fe71dd5bca4632edb7f6aad87
-  languageName: node
-  linkType: hard
-
-"is-data-descriptor@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "is-data-descriptor@npm:1.0.0"
-  dependencies:
-    kind-of: ^6.0.0
-  checksum: e705e6816241c013b05a65dc452244ee378d1c3e3842bd140beabe6e12c0d700ef23c91803f971aa7b091fb0573c5da8963af34a2b573337d87bc3e1f53a4e6d
-  languageName: node
-  linkType: hard
-
-"is-date-object@npm:^1.0.1":
-  version: 1.0.5
-  resolution: "is-date-object@npm:1.0.5"
-  dependencies:
-    has-tostringtag: ^1.0.0
-  checksum: baa9077cdf15eb7b58c79398604ca57379b2fc4cf9aa7a9b9e295278648f628c9b201400c01c5e0f7afae56507d741185730307cbe7cad3b9f90a77e5ee342fc
-  languageName: node
-  linkType: hard
-
-"is-decimal@npm:^1.0.0":
-  version: 1.0.4
-  resolution: "is-decimal@npm:1.0.4"
-  checksum: ed483a387517856dc395c68403a10201fddcc1b63dc56513fbe2fe86ab38766120090ecdbfed89223d84ca8b1cd28b0641b93cb6597b6e8f4c097a7c24e3fb96
-  languageName: node
-  linkType: hard
-
-"is-descriptor@npm:^0.1.0":
-  version: 0.1.6
-  resolution: "is-descriptor@npm:0.1.6"
-  dependencies:
-    is-accessor-descriptor: ^0.1.6
-    is-data-descriptor: ^0.1.4
-    kind-of: ^5.0.0
-  checksum: 0f780c1b46b465f71d970fd7754096ffdb7b69fd8797ca1f5069c163eaedcd6a20ec4a50af669075c9ebcfb5266d2e53c8b227e485eefdb0d1fee09aa1dd8ab6
-  languageName: node
-  linkType: hard
-
-"is-descriptor@npm:^1.0.0, is-descriptor@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "is-descriptor@npm:1.0.2"
-  dependencies:
-    is-accessor-descriptor: ^1.0.0
-    is-data-descriptor: ^1.0.0
-    kind-of: ^6.0.2
-  checksum: 2ed623560bee035fb67b23e32ce885700bef8abe3fbf8c909907d86507b91a2c89a9d3a4d835a4d7334dd5db0237a0aeae9ca109c1e4ef1c0e7b577c0846ab5a
-  languageName: node
-  linkType: hard
-
-"is-docker@npm:^2.0.0":
-  version: 2.2.1
-  resolution: "is-docker@npm:2.2.1"
-  bin:
-    is-docker: cli.js
-  checksum: 3fef7ddbf0be25958e8991ad941901bf5922ab2753c46980b60b05c1bf9c9c2402d35e6dc32e4380b980ef5e1970a5d9d5e5aa2e02d77727c3b6b5e918474c56
-  languageName: node
-  linkType: hard
-
-"is-extendable@npm:^0.1.0, is-extendable@npm:^0.1.1":
-  version: 0.1.1
-  resolution: "is-extendable@npm:0.1.1"
-  checksum: 3875571d20a7563772ecc7a5f36cb03167e9be31ad259041b4a8f73f33f885441f778cee1f1fe0085eb4bc71679b9d8c923690003a36a6a5fdf8023e6e3f0672
-  languageName: node
-  linkType: hard
-
-"is-extendable@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "is-extendable@npm:1.0.1"
-  dependencies:
-    is-plain-object: ^2.0.4
-  checksum: db07bc1e9de6170de70eff7001943691f05b9d1547730b11be01c0ebfe67362912ba743cf4be6fd20a5e03b4180c685dad80b7c509fe717037e3eee30ad8e84f
-  languageName: node
-  linkType: hard
-
-"is-extglob@npm:^2.1.0, is-extglob@npm:^2.1.1":
-  version: 2.1.1
-  resolution: "is-extglob@npm:2.1.1"
-  checksum: df033653d06d0eb567461e58a7a8c9f940bd8c22274b94bf7671ab36df5719791aae15eef6d83bbb5e23283967f2f984b8914559d4449efda578c775c4be6f85
-  languageName: node
-  linkType: hard
-
-"is-finite@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "is-finite@npm:1.1.0"
-  checksum: 532b97ed3d03e04c6bd203984d9e4ba3c0c390efee492bad5d1d1cd1802a68ab27adbd3ef6382f6312bed6c8bb1bd3e325ea79a8dc8fe080ed7a06f5f97b93e7
-  languageName: node
-  linkType: hard
-
-"is-fullwidth-code-point@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "is-fullwidth-code-point@npm:2.0.0"
-  checksum: eef9c6e15f68085fec19ff6a978a6f1b8f48018fd1265035552078ee945573594933b09bbd6f562553e2a241561439f1ef5339276eba68d272001343084cfab8
-  languageName: node
-  linkType: hard
-
-"is-fullwidth-code-point@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "is-fullwidth-code-point@npm:3.0.0"
-  checksum: 44a30c29457c7fb8f00297bce733f0a64cd22eca270f83e58c105e0d015e45c019491a4ab2faef91ab51d4738c670daff901c799f6a700e27f7314029e99e348
-  languageName: node
-  linkType: hard
-
-"is-git-url@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "is-git-url@npm:1.0.0"
-  checksum: 77d8a147ca57cca1544e3a363400bece8e1d765d3da245e38262654281aeb4c97a3c798868cf8931a2ed51bb413611f98c113d3ce5d4f8eb9e98139e2fb435c1
-  languageName: node
-  linkType: hard
-
-"is-glob@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "is-glob@npm:3.1.0"
-  dependencies:
-    is-extglob: ^2.1.0
-  checksum: 9d483bca84f16f01230f7c7c8c63735248fe1064346f292e0f6f8c76475fd20c6f50fc19941af5bec35f85d6bf26f4b7768f39a48a5f5fdc72b408dc74e07afc
-  languageName: node
-  linkType: hard
-
-"is-glob@npm:^4.0.0, is-glob@npm:^4.0.1, is-glob@npm:~4.0.1":
-  version: 4.0.1
-  resolution: "is-glob@npm:4.0.1"
-  dependencies:
-    is-extglob: ^2.1.1
-  checksum: 84627cad11b4e745f5db5a163f32c47b711585a5ff6e14f8f8d026db87f4cdd3e2c95f6fa1f94ad22e469f36d819ae2814f03f9c668b164422ac3354a94672d3
-  languageName: node
-  linkType: hard
-
-"is-glob@npm:^4.0.3":
-  version: 4.0.3
-  resolution: "is-glob@npm:4.0.3"
-  dependencies:
-    is-extglob: ^2.1.1
-  checksum: d381c1319fcb69d341cc6e6c7cd588e17cd94722d9a32dbd60660b993c4fb7d0f19438674e68dfec686d09b7c73139c9166b47597f846af387450224a8101ab4
-  languageName: node
-  linkType: hard
-
-"is-hexadecimal@npm:^1.0.0":
-  version: 1.0.4
-  resolution: "is-hexadecimal@npm:1.0.4"
-  checksum: a452e047587b6069332d83130f54d30da4faf2f2ebaa2ce6d073c27b5703d030d58ed9e0b729c8e4e5b52c6f1dab26781bb77b7bc6c7805f14f320e328ff8cd5
-  languageName: node
-  linkType: hard
-
-"is-interactive@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "is-interactive@npm:1.0.0"
-  checksum: 824808776e2d468b2916cdd6c16acacebce060d844c35ca6d82267da692e92c3a16fdba624c50b54a63f38bdc4016055b6f443ce57d7147240de4f8cdabaf6f9
-  languageName: node
-  linkType: hard
-
-"is-lambda@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "is-lambda@npm:1.0.1"
-  checksum: 93a32f01940220532e5948538699ad610d5924ac86093fcee83022252b363eb0cc99ba53ab084a04e4fb62bf7b5731f55496257a4c38adf87af9c4d352c71c35
-  languageName: node
-  linkType: hard
-
-"is-language-code@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "is-language-code@npm:3.1.0"
-  dependencies:
-    "@babel/runtime": ^7.14.0
-  checksum: 97d2cd7ce00c32721bd1c6b4dccbe775c145612f70f57f384400ee18c49697ab810893a64daf73a9baf07f5f373f241c90fad0e7c8e99c104add114ae5604ee5
-  languageName: node
-  linkType: hard
-
-"is-negative-zero@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "is-negative-zero@npm:2.0.1"
-  checksum: a46f2e0cb5e16fdb8f2011ed488979386d7e68d381966682e3f4c98fc126efe47f26827912baca2d06a02a644aee458b9cba307fb389f6b161e759125db7a3b8
-  languageName: node
-  linkType: hard
-
-"is-number-object@npm:^1.0.4":
-  version: 1.0.6
-  resolution: "is-number-object@npm:1.0.6"
-  dependencies:
-    has-tostringtag: ^1.0.0
-  checksum: c697704e8fc2027fc41cb81d29805de4e8b6dc9c3efee93741dbf126a8ecc8443fef85adbc581415ae7e55d325e51d0a942324ae35c829131748cce39cba55f3
-  languageName: node
-  linkType: hard
-
-"is-number@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "is-number@npm:3.0.0"
-  dependencies:
-    kind-of: ^3.0.2
-  checksum: 0c62bf8e9d72c4dd203a74d8cfc751c746e75513380fef420cda8237e619a988ee43e678ddb23c87ac24d91ac0fe9f22e4ffb1301a50310c697e9d73ca3994e9
-  languageName: node
-  linkType: hard
-
-"is-number@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "is-number@npm:7.0.0"
-  checksum: 456ac6f8e0f3111ed34668a624e45315201dff921e5ac181f8ec24923b99e9f32ca1a194912dc79d539c97d33dba17dc635202ff0b2cf98326f608323276d27a
-  languageName: node
-  linkType: hard
-
-"is-obj@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "is-obj@npm:1.0.1"
-  checksum: 3ccf0efdea12951e0b9c784e2b00e77e87b2f8bd30b42a498548a8afcc11b3287342a2030c308e473e93a7a19c9ea7854c99a8832a476591c727df2a9c79796c
-  languageName: node
-  linkType: hard
-
-"is-obj@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "is-obj@npm:2.0.0"
-  checksum: c9916ac8f4621962a42f5e80e7ffdb1d79a3fab7456ceaeea394cd9e0858d04f985a9ace45be44433bf605673c8be8810540fe4cc7f4266fc7526ced95af5a08
-  languageName: node
-  linkType: hard
-
-"is-path-inside@npm:^3.0.3":
-  version: 3.0.3
-  resolution: "is-path-inside@npm:3.0.3"
-  checksum: abd50f06186a052b349c15e55b182326f1936c89a78bf6c8f2b707412517c097ce04bc49a0ca221787bc44e1049f51f09a2ffb63d22899051988d3a618ba13e9
-  languageName: node
-  linkType: hard
-
-"is-plain-obj@npm:2.1.0, is-plain-obj@npm:^2.0.0":
-  version: 2.1.0
-  resolution: "is-plain-obj@npm:2.1.0"
-  checksum: cec9100678b0a9fe0248a81743041ed990c2d4c99f893d935545cfbc42876cbe86d207f3b895700c690ad2fa520e568c44afc1605044b535a7820c1d40e38daa
-  languageName: node
-  linkType: hard
-
-"is-plain-object@npm:^2.0.3, is-plain-object@npm:^2.0.4":
-  version: 2.0.4
-  resolution: "is-plain-object@npm:2.0.4"
-  dependencies:
-    isobject: ^3.0.1
-  checksum: 2a401140cfd86cabe25214956ae2cfee6fbd8186809555cd0e84574f88de7b17abacb2e477a6a658fa54c6083ecbda1e6ae404c7720244cd198903848fca70ca
-  languageName: node
-  linkType: hard
-
-"is-potential-custom-element-name@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "is-potential-custom-element-name@npm:1.0.1"
-  checksum: ced7bbbb6433a5b684af581872afe0e1767e2d1146b2207ca0068a648fb5cab9d898495d1ac0583524faaf24ca98176a7d9876363097c2d14fee6dd324f3a1ab
-  languageName: node
-  linkType: hard
-
-"is-reference@npm:^1.1.0":
-  version: 1.2.1
-  resolution: "is-reference@npm:1.2.1"
-  dependencies:
-    "@types/estree": "*"
-  checksum: e7b48149f8abda2c10849ea51965904d6a714193d68942ad74e30522231045acf06cbfae5a4be2702fede5d232e61bf50b3183acdc056e6e3afe07fcf4f4b2bc
-  languageName: node
-  linkType: hard
-
-"is-regex@npm:^1.1.2, is-regex@npm:^1.1.4":
-  version: 1.1.4
-  resolution: "is-regex@npm:1.1.4"
-  dependencies:
-    call-bind: ^1.0.2
-    has-tostringtag: ^1.0.0
-  checksum: 362399b33535bc8f386d96c45c9feb04cf7f8b41c182f54174c1a45c9abbbe5e31290bbad09a458583ff6bf3b2048672cdb1881b13289569a7c548370856a652
-  languageName: node
-  linkType: hard
-
-"is-regexp@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "is-regexp@npm:1.0.0"
-  checksum: be692828e24cba479ec33644326fa98959ec68ba77965e0291088c1a741feaea4919d79f8031708f85fd25e39de002b4520622b55460660b9c369e6f7187faef
-  languageName: node
-  linkType: hard
-
-"is-shared-array-buffer@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "is-shared-array-buffer@npm:1.0.1"
-  checksum: 2ffb92533e64e2876e6cfe6906871d28400b6f1a53130fe652ec8007bc0e5044d05e7af8e31bdc992fbba520bd92938cfbeedd0f286be92f250c7c76191c4d90
-  languageName: node
-  linkType: hard
-
-"is-stream@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "is-stream@npm:1.1.0"
-  checksum: 063c6bec9d5647aa6d42108d4c59723d2bd4ae42135a2d4db6eadbd49b7ea05b750fd69d279e5c7c45cf9da753ad2c00d8978be354d65aa9f6bb434969c6a2ae
-  languageName: node
-  linkType: hard
-
-"is-stream@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "is-stream@npm:2.0.1"
-  checksum: b8e05ccdf96ac330ea83c12450304d4a591f9958c11fd17bed240af8d5ffe08aedafa4c0f4cfccd4d28dc9d4d129daca1023633d5c11601a6cbc77521f6fae66
-  languageName: node
-  linkType: hard
-
-"is-string@npm:^1.0.5, is-string@npm:^1.0.7":
-  version: 1.0.7
-  resolution: "is-string@npm:1.0.7"
-  dependencies:
-    has-tostringtag: ^1.0.0
-  checksum: 323b3d04622f78d45077cf89aab783b2f49d24dc641aa89b5ad1a72114cfeff2585efc8c12ef42466dff32bde93d839ad321b26884cf75e5a7892a938b089989
-  languageName: node
-  linkType: hard
-
-"is-symbol@npm:^1.0.2, is-symbol@npm:^1.0.3":
-  version: 1.0.4
-  resolution: "is-symbol@npm:1.0.4"
-  dependencies:
-    has-symbols: ^1.0.2
-  checksum: 92805812ef590738d9de49d677cd17dfd486794773fb6fa0032d16452af46e9b91bb43ffe82c983570f015b37136f4b53b28b8523bfb10b0ece7a66c31a54510
-  languageName: node
-  linkType: hard
-
-"is-type@npm:0.0.1":
-  version: 0.0.1
-  resolution: "is-type@npm:0.0.1"
-  dependencies:
-    core-util-is: ~1.0.0
-  checksum: c0ea697d42775270b0eefbe31f01f40e4ab1c86c31580d846b7f3b5a46f744b89248c7bcbb9e2e51325592bdf5d24e0dd265e1cdabd052241a5f3f0c72fd58e1
-  languageName: node
-  linkType: hard
-
-"is-typedarray@npm:^1.0.0, is-typedarray@npm:~1.0.0":
-  version: 1.0.0
-  resolution: "is-typedarray@npm:1.0.0"
-  checksum: 3508c6cd0a9ee2e0df2fa2e9baabcdc89e911c7bd5cf64604586697212feec525aa21050e48affb5ffc3df20f0f5d2e2cf79b08caa64e1ccc9578e251763aef7
-  languageName: node
-  linkType: hard
-
-"is-unicode-supported@npm:^0.1.0":
-  version: 0.1.0
-  resolution: "is-unicode-supported@npm:0.1.0"
-  checksum: a2aab86ee7712f5c2f999180daaba5f361bdad1efadc9610ff5b8ab5495b86e4f627839d085c6530363c6d6d4ecbde340fb8e54bdb83da4ba8e0865ed5513c52
-  languageName: node
-  linkType: hard
-
-"is-weakref@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "is-weakref@npm:1.0.1"
-  dependencies:
-    call-bind: ^1.0.0
-  checksum: fdafb7b955671dd2f9658ff47c86e4025c0650fc68a3542a40e5a75898a763b1abd6b1e1f9f13207eed49541cdd76af67d73c44989ea358b201b70274cf8f6c1
-  languageName: node
-  linkType: hard
-
-"is-windows@npm:^1.0.1, is-windows@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "is-windows@npm:1.0.2"
-  checksum: 438b7e52656fe3b9b293b180defb4e448088e7023a523ec21a91a80b9ff8cdb3377ddb5b6e60f7c7de4fa8b63ab56e121b6705fe081b3cf1b828b0a380009ad7
-  languageName: node
-  linkType: hard
-
-"is-wsl@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "is-wsl@npm:1.1.0"
-  checksum: ea157d232351e68c92bd62fc541771096942fe72f69dff452dd26dcc31466258c570a3b04b8cda2e01cd2968255b02951b8670d08ea4ed76d6b1a646061ac4fe
-  languageName: node
-  linkType: hard
-
-"is-wsl@npm:^2.2.0":
-  version: 2.2.0
-  resolution: "is-wsl@npm:2.2.0"
-  dependencies:
-    is-docker: ^2.0.0
-  checksum: 20849846ae414997d290b75e16868e5261e86ff5047f104027026fd61d8b5a9b0b3ade16239f35e1a067b3c7cc02f70183cb661010ed16f4b6c7c93dad1b19d8
-  languageName: node
-  linkType: hard
-
-"isarray@npm:0.0.1":
-  version: 0.0.1
-  resolution: "isarray@npm:0.0.1"
-  checksum: 49191f1425681df4a18c2f0f93db3adb85573bcdd6a4482539d98eac9e705d8961317b01175627e860516a2fc45f8f9302db26e5a380a97a520e272e2a40a8d4
-  languageName: node
-  linkType: hard
-
-"isarray@npm:1.0.0, isarray@npm:^1.0.0, isarray@npm:~1.0.0":
-  version: 1.0.0
-  resolution: "isarray@npm:1.0.0"
-  checksum: f032df8e02dce8ec565cf2eb605ea939bdccea528dbcf565cdf92bfa2da9110461159d86a537388ef1acef8815a330642d7885b29010e8f7eac967c9993b65ab
-  languageName: node
-  linkType: hard
-
-"isbinaryfile@npm:^4.0.8":
-  version: 4.0.10
-  resolution: "isbinaryfile@npm:4.0.10"
-  checksum: a6b28db7e23ac7a77d3707567cac81356ea18bd602a4f21f424f862a31d0e7ab4f250759c98a559ece35ffe4d99f0d339f1ab884ffa9795172f632ab8f88e686
-  languageName: node
-  linkType: hard
-
-"isexe@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "isexe@npm:2.0.0"
-  checksum: 26bf6c5480dda5161c820c5b5c751ae1e766c587b1f951ea3fcfc973bafb7831ae5b54a31a69bd670220e42e99ec154475025a468eae58ea262f813fdc8d1c62
-  languageName: node
-  linkType: hard
-
-"isobject@npm:^2.0.0":
-  version: 2.1.0
-  resolution: "isobject@npm:2.1.0"
-  dependencies:
-    isarray: 1.0.0
-  checksum: 811c6f5a866877d31f0606a88af4a45f282544de886bf29f6a34c46616a1ae2ed17076cc6bf34c0128f33eecf7e1fcaa2c82cf3770560d3e26810894e96ae79f
-  languageName: node
-  linkType: hard
-
-"isobject@npm:^3.0.0, isobject@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "isobject@npm:3.0.1"
-  checksum: db85c4c970ce30693676487cca0e61da2ca34e8d4967c2e1309143ff910c207133a969f9e4ddb2dc6aba670aabce4e0e307146c310350b298e74a31f7d464703
-  languageName: node
-  linkType: hard
-
-"isstream@npm:~0.1.2":
-  version: 0.1.2
-  resolution: "isstream@npm:0.1.2"
-  checksum: 1eb2fe63a729f7bdd8a559ab552c69055f4f48eb5c2f03724430587c6f450783c8f1cd936c1c952d0a927925180fcc892ebd5b174236cf1065d4bd5bdb37e963
-  languageName: node
-  linkType: hard
-
-"istextorbinary@npm:2.1.0":
-  version: 2.1.0
-  resolution: "istextorbinary@npm:2.1.0"
-  dependencies:
-    binaryextensions: 1 || 2
-    editions: ^1.1.1
-    textextensions: 1 || 2
-  checksum: f07e2c8648663ffa609ee89fa6a50157bcd4d99b8fee3c99c5d5114c068d733e3b5ba16f0c9b704cbf7fd8a1cab0836b1451b40de56c790a283fbabf34d52167
-  languageName: node
-  linkType: hard
-
-"istextorbinary@npm:^2.5.1":
-  version: 2.6.0
-  resolution: "istextorbinary@npm:2.6.0"
-  dependencies:
-    binaryextensions: ^2.1.2
-    editions: ^2.2.0
-    textextensions: ^2.5.0
-  checksum: 964915aa9533df46a7142d36263e9e1a0940d63b58e2ee1ca1ecc9088239a2499b8153d9746225cfe71b9a7a0ab40565bf23c0a8cfed3a4bce7465303b9fb237
-  languageName: node
-  linkType: hard
-
-"jest-worker@npm:^27.4.5":
-  version: 27.5.1
-  resolution: "jest-worker@npm:27.5.1"
-  dependencies:
-    "@types/node": "*"
-    merge-stream: ^2.0.0
-    supports-color: ^8.0.0
-  checksum: 98cd68b696781caed61c983a3ee30bf880b5bd021c01d98f47b143d4362b85d0737f8523761e2713d45e18b4f9a2b98af1eaee77afade4111bb65c77d6f7c980
-  languageName: node
-  linkType: hard
-
-"jquery@npm:^3.4.1":
-  version: 3.6.0
-  resolution: "jquery@npm:3.6.0"
-  checksum: 8fd5fef4aa48fd374ec716dd1c1df1af407814a228e15c1260ca140de3a697c2a77c30c54ff1d238b6a3ab4ddc445ddeef9adce6c6d28e4869d85eb9d3951c0e
-  languageName: node
-  linkType: hard
-
-"js-sdsl@npm:^4.1.4":
-  version: 4.1.5
-  resolution: "js-sdsl@npm:4.1.5"
-  checksum: 695f657ddc5be462b97cac4e8e60f37de28d628ee0e23016baecff0bb584a18dddb5caeac537a775030f180b5afd62133ac4481e7024c8d03a62d73e4da0713e
-  languageName: node
-  linkType: hard
-
-"js-string-escape@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "js-string-escape@npm:1.0.1"
-  checksum: f11e0991bf57e0c183b55c547acec85bd2445f043efc9ea5aa68b41bd2a3e7d3ce94636cb233ae0d84064ba4c1a505d32e969813c5b13f81e7d4be12c59256fe
-  languageName: node
-  linkType: hard
-
-"js-tokens@npm:^3.0.0 || ^4.0.0, js-tokens@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "js-tokens@npm:4.0.0"
-  checksum: 8a95213a5a77deb6cbe94d86340e8d9ace2b93bc367790b260101d2f36a2eaf4e4e22d9fa9cf459b38af3a32fb4190e638024cf82ec95ef708680e405ea7cc78
-  languageName: node
-  linkType: hard
-
-"js-tokens@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "js-tokens@npm:3.0.2"
-  checksum: ff24cf90e6e4ac446eba56e604781c1aaf3bdaf9b13a00596a0ebd972fa3b25dc83c0f0f67289c33252abb4111e0d14e952a5d9ffb61f5c22532d555ebd8d8a9
-  languageName: node
-  linkType: hard
-
-"js-yaml@npm:^3.13.1, js-yaml@npm:^3.14.0, js-yaml@npm:^3.2.5, js-yaml@npm:^3.2.7":
-  version: 3.14.1
-  resolution: "js-yaml@npm:3.14.1"
-  dependencies:
-    argparse: ^1.0.7
-    esprima: ^4.0.0
-  bin:
-    js-yaml: bin/js-yaml.js
-  checksum: bef146085f472d44dee30ec34e5cf36bf89164f5d585435a3d3da89e52622dff0b188a580e4ad091c3341889e14cb88cac6e4deb16dc5b1e9623bb0601fc255c
-  languageName: node
-  linkType: hard
-
-"js-yaml@npm:^4.1.0":
-  version: 4.1.0
-  resolution: "js-yaml@npm:4.1.0"
-  dependencies:
-    argparse: ^2.0.1
-  bin:
-    js-yaml: bin/js-yaml.js
-  checksum: c7830dfd456c3ef2c6e355cc5a92e6700ceafa1d14bba54497b34a99f0376cecbb3e9ac14d3e5849b426d5a5140709a66237a8c991c675431271c4ce5504151a
-  languageName: node
-  linkType: hard
-
-"jsbn@npm:~0.1.0":
-  version: 0.1.1
-  resolution: "jsbn@npm:0.1.1"
-  checksum: e5ff29c1b8d965017ef3f9c219dacd6e40ad355c664e277d31246c90545a02e6047018c16c60a00f36d561b3647215c41894f5d869ada6908a2e0ce4200c88f2
-  languageName: node
-  linkType: hard
-
-"jsdom@npm:^16.4.0":
-  version: 16.5.3
-  resolution: "jsdom@npm:16.5.3"
-  dependencies:
-    abab: ^2.0.5
-    acorn: ^8.1.0
-    acorn-globals: ^6.0.0
-    cssom: ^0.4.4
-    cssstyle: ^2.3.0
-    data-urls: ^2.0.0
-    decimal.js: ^10.2.1
-    domexception: ^2.0.1
-    escodegen: ^2.0.0
-    html-encoding-sniffer: ^2.0.1
-    is-potential-custom-element-name: ^1.0.0
-    nwsapi: ^2.2.0
-    parse5: 6.0.1
-    request: ^2.88.2
-    request-promise-native: ^1.0.9
-    saxes: ^5.0.1
-    symbol-tree: ^3.2.4
-    tough-cookie: ^4.0.0
-    w3c-hr-time: ^1.0.2
-    w3c-xmlserializer: ^2.0.0
-    webidl-conversions: ^6.1.0
-    whatwg-encoding: ^1.0.5
-    whatwg-mimetype: ^2.3.0
-    whatwg-url: ^8.5.0
-    ws: ^7.4.4
-    xml-name-validator: ^3.0.0
-  peerDependencies:
-    canvas: ^2.5.0
-  peerDependenciesMeta:
-    canvas:
-      optional: true
-  checksum: 19d107eeaa2b67cb9288b313d12af9df4c633526bbbaf222b0d97c1cfd4b9f23294f168dd80c39ee6bd344dde336b9a57ed24136639fea7dc5e24e88f4d5f79f
-  languageName: node
-  linkType: hard
-
-"jsesc@npm:^1.3.0":
-  version: 1.3.0
-  resolution: "jsesc@npm:1.3.0"
-  bin:
-    jsesc: bin/jsesc
-  checksum: 9384cc72bf8ef7f2eb75fea64176b8b0c1c5e77604854c72cb4670b7072e112e3baaa69ef134be98cb078834a7812b0bfe676ad441ccd749a59427f5ed2127f1
-  languageName: node
-  linkType: hard
-
-"jsesc@npm:^2.5.1":
-  version: 2.5.2
-  resolution: "jsesc@npm:2.5.2"
-  bin:
-    jsesc: bin/jsesc
-  checksum: 4dc190771129e12023f729ce20e1e0bfceac84d73a85bc3119f7f938843fe25a4aeccb54b6494dce26fcf263d815f5f31acdefac7cc9329efb8422a4f4d9fa9d
-  languageName: node
-  linkType: hard
-
-"jsesc@npm:~0.3.x":
-  version: 0.3.0
-  resolution: "jsesc@npm:0.3.0"
-  bin:
-    jsesc: bin/jsesc
-  checksum: a5222fb2a599e874461ca384b59ecdc6449d52b6dd9d6ce0e878917e49ac6eb304e549cd69cb80bcf710d65aba130b31c795d1f1cd59f490d78e93d743bb6a4b
-  languageName: node
-  linkType: hard
-
-"jsesc@npm:~0.5.0":
-  version: 0.5.0
-  resolution: "jsesc@npm:0.5.0"
-  bin:
-    jsesc: bin/jsesc
-  checksum: b8b44cbfc92f198ad972fba706ee6a1dfa7485321ee8c0b25f5cedd538dcb20cde3197de16a7265430fce8277a12db066219369e3d51055038946039f6e20e17
-  languageName: node
-  linkType: hard
-
-"json-parse-better-errors@npm:^1.0.1, json-parse-better-errors@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "json-parse-better-errors@npm:1.0.2"
-  checksum: ff2b5ba2a70e88fd97a3cb28c1840144c5ce8fae9cbeeddba15afa333a5c407cf0e42300cd0a2885dbb055227fe68d405070faad941beeffbfde9cf3b2c78c5d
-  languageName: node
-  linkType: hard
-
-"json-parse-even-better-errors@npm:^2.3.0, json-parse-even-better-errors@npm:^2.3.1":
-  version: 2.3.1
-  resolution: "json-parse-even-better-errors@npm:2.3.1"
-  checksum: 798ed4cf3354a2d9ccd78e86d2169515a0097a5c133337807cdf7f1fc32e1391d207ccfc276518cc1d7d8d4db93288b8a50ba4293d212ad1336e52a8ec0a941f
-  languageName: node
-  linkType: hard
-
-"json-schema-traverse@npm:^0.4.1":
-  version: 0.4.1
-  resolution: "json-schema-traverse@npm:0.4.1"
-  checksum: 7486074d3ba247769fda17d5181b345c9fb7d12e0da98b22d1d71a5db9698d8b4bd900a3ec1a4ffdd60846fc2556274a5c894d0c48795f14cb03aeae7b55260b
-  languageName: node
-  linkType: hard
-
-"json-schema-traverse@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "json-schema-traverse@npm:1.0.0"
-  checksum: 02f2f466cdb0362558b2f1fd5e15cce82ef55d60cd7f8fa828cf35ba74330f8d767fcae5c5c2adb7851fa811766c694b9405810879bc4e1ddd78a7c0e03658ad
-  languageName: node
-  linkType: hard
-
-"json-schema@npm:0.2.3":
-  version: 0.2.3
-  resolution: "json-schema@npm:0.2.3"
-  checksum: bbc2070988fb5f2a2266a31b956f1b5660e03ea7eaa95b33402901274f625feb586ae0c485e1df854fde40a7f0dc679f3b3ca8e5b8d31f8ea07a0d834de785c7
-  languageName: node
-  linkType: hard
-
-"json-stable-stringify-without-jsonify@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "json-stable-stringify-without-jsonify@npm:1.0.1"
-  checksum: cff44156ddce9c67c44386ad5cddf91925fe06b1d217f2da9c4910d01f358c6e3989c4d5a02683c7a5667f9727ff05831f7aa8ae66c8ff691c556f0884d49215
-  languageName: node
-  linkType: hard
-
-"json-stable-stringify@npm:^1.0.0, json-stable-stringify@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "json-stable-stringify@npm:1.0.1"
-  dependencies:
-    jsonify: ~0.0.0
-  checksum: 65d6cbf0fca72a4136999f65f4401cf39a129f7aeff0fdd987ac3d3423a2113659294045fb8377e6e20d865cac32b1b8d70f3d87346c9786adcee60661d96ca5
-  languageName: node
-  linkType: hard
-
-"json-stringify-safe@npm:~5.0.1":
-  version: 5.0.1
-  resolution: "json-stringify-safe@npm:5.0.1"
-  checksum: 48ec0adad5280b8a96bb93f4563aa1667fd7a36334f79149abd42446d0989f2ddc58274b479f4819f1f00617957e6344c886c55d05a4e15ebb4ab931e4a6a8ee
-  languageName: node
-  linkType: hard
-
-"json5@npm:^0.5.1":
-  version: 0.5.1
-  resolution: "json5@npm:0.5.1"
-  bin:
-    json5: lib/cli.js
-  checksum: 9b85bf06955b23eaa4b7328aa8892e3887e81ca731dd27af04a5f5f1458fbc5e1de57a24442e3272f8a888dd1abe1cb68eb693324035f6b3aeba4fcab7667d62
-  languageName: node
-  linkType: hard
-
-"json5@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "json5@npm:1.0.1"
-  dependencies:
-    minimist: ^1.2.0
-  bin:
-    json5: lib/cli.js
-  checksum: e76ea23dbb8fc1348c143da628134a98adf4c5a4e8ea2adaa74a80c455fc2cdf0e2e13e6398ef819bfe92306b610ebb2002668ed9fc1af386d593691ef346fc3
-  languageName: node
-  linkType: hard
-
-"json5@npm:^2.1.2":
-  version: 2.2.0
-  resolution: "json5@npm:2.2.0"
-  dependencies:
-    minimist: ^1.2.5
-  bin:
-    json5: lib/cli.js
-  checksum: e88fc5274bb58fc99547baa777886b069d2dd96d9cfc4490b305fd16d711dabd5979e35a4f90873cefbeb552e216b041a304fe56702bedba76e19bc7845f208d
-  languageName: node
-  linkType: hard
-
-"json5@npm:^2.2.1":
-  version: 2.2.1
-  resolution: "json5@npm:2.2.1"
-  bin:
-    json5: lib/cli.js
-  checksum: 74b8a23b102a6f2bf2d224797ae553a75488b5adbaee9c9b6e5ab8b510a2fc6e38f876d4c77dea672d4014a44b2399e15f2051ac2b37b87f74c0c7602003543b
-  languageName: node
-  linkType: hard
-
-"jsondiffpatch@npm:^0.4.1":
-  version: 0.4.1
-  resolution: "jsondiffpatch@npm:0.4.1"
-  dependencies:
-    chalk: ^2.3.0
-    diff-match-patch: ^1.0.0
-  bin:
-    jsondiffpatch: ./bin/jsondiffpatch
-  checksum: 2062d188cc7f60f9d84e7bf497a7d89233d2f8ec21d085c26cdb24c2b7c5f4f7231ad9b978355e319c00820de0863499ba881c6c6b1bd92313db1a7d16d6ab1d
-  languageName: node
-  linkType: hard
-
-"jsonfile@npm:^2.1.0":
-  version: 2.4.0
-  resolution: "jsonfile@npm:2.4.0"
-  dependencies:
-    graceful-fs: ^4.1.6
-  dependenciesMeta:
-    graceful-fs:
-      optional: true
-  checksum: f5064aabbc9e35530dc471d8b203ae1f40dbe949ddde4391c6f6a6d310619a15f0efdae5587df594d1d70c555193aaeee9d2ed4aec9ffd5767bd5e4e62d49c3d
-  languageName: node
-  linkType: hard
-
-"jsonfile@npm:^3.0.0":
-  version: 3.0.1
-  resolution: "jsonfile@npm:3.0.1"
-  dependencies:
-    graceful-fs: ^4.1.6
-  dependenciesMeta:
-    graceful-fs:
-      optional: true
-  checksum: f2935da339462fe6489c3b8961b637e4eeebd42bcbbe1c8d88f4e937fe19d2d9bc222167281ada2e2f6ddc0324edb43b18107a9b12c743b350326d83ba4db5ef
-  languageName: node
-  linkType: hard
-
-"jsonfile@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "jsonfile@npm:4.0.0"
-  dependencies:
-    graceful-fs: ^4.1.6
-  dependenciesMeta:
-    graceful-fs:
-      optional: true
-  checksum: 6447d6224f0d31623eef9b51185af03ac328a7553efcee30fa423d98a9e276ca08db87d71e17f2310b0263fd3ffa6c2a90a6308367f661dc21580f9469897c9e
-  languageName: node
-  linkType: hard
-
-"jsonfile@npm:^6.0.1":
-  version: 6.1.0
-  resolution: "jsonfile@npm:6.1.0"
-  dependencies:
-    graceful-fs: ^4.1.6
-    universalify: ^2.0.0
-  dependenciesMeta:
-    graceful-fs:
-      optional: true
-  checksum: 7af3b8e1ac8fe7f1eccc6263c6ca14e1966fcbc74b618d3c78a0a2075579487547b94f72b7a1114e844a1e15bb00d440e5d1720bfc4612d790a6f285d5ea8354
-  languageName: node
-  linkType: hard
-
-"jsonify@npm:~0.0.0":
-  version: 0.0.0
-  resolution: "jsonify@npm:0.0.0"
-  checksum: d8d4ed476c116e6987a460dcb82f22284686caae9f498ac87b0502c1765ac1522f4f450a4cad4cc368d202fd3b27a3860735140a82867fc6d558f5f199c38bce
-  languageName: node
-  linkType: hard
-
-"jsonlint@npm:^1.6.3":
-  version: 1.6.3
-  resolution: "jsonlint@npm:1.6.3"
-  dependencies:
-    JSV: ^4.0.x
-    nomnom: ^1.5.x
-  bin:
-    jsonlint: lib/cli.js
-  checksum: be0972cf552ff1ec589db5d7b20ff31064561fbe4605708f5a260e2dcc18e26acd5bf842ba10dd157706232aca6d6c9116d21005cb3e8fb5ec9d9b01c8869677
-  languageName: node
-  linkType: hard
-
-"jsprim@npm:^1.2.2":
-  version: 1.4.1
-  resolution: "jsprim@npm:1.4.1"
-  dependencies:
-    assert-plus: 1.0.0
-    extsprintf: 1.3.0
-    json-schema: 0.2.3
-    verror: 1.10.0
-  checksum: 6bcb20ec265ae18bb48e540a6da2c65f9c844f7522712d6dfcb01039527a49414816f4869000493363f1e1ea96cbad00e46188d5ecc78257a19f152467587373
-  languageName: node
-  linkType: hard
-
-"just-extend@npm:^4.0.2":
-  version: 4.2.1
-  resolution: "just-extend@npm:4.2.1"
-  checksum: ff9fdede240fad313efeeeb68a660b942e5586d99c0058064c78884894a2690dc09bba44c994ad4e077e45d913fef01a9240c14a72c657b53687ac58de53b39c
-  languageName: node
-  linkType: hard
-
-"kind-of@npm:^6.0.3":
-  version: 6.0.3
-  resolution: "kind-of@npm:6.0.3"
-  checksum: 3ab01e7b1d440b22fe4c31f23d8d38b4d9b91d9f291df683476576493d5dfd2e03848a8b05813dd0c3f0e835bc63f433007ddeceb71f05cb25c45ae1b19c6d3b
-  languageName: node
-  linkType: hard
-
-"klaw@npm:^1.0.0":
-  version: 1.3.1
-  resolution: "klaw@npm:1.3.1"
-  dependencies:
-    graceful-fs: ^4.1.9
-  dependenciesMeta:
-    graceful-fs:
-      optional: true
-  checksum: 8f69e4797c26e7c3f2426bfa85f38a3da3c2cb1b4c6bd850d2377aed440d41ce9d806f2885c2e2e224372c56af4b1d43b8a499adecf9a05e7373dc6b8b7c52e4
-  languageName: node
-  linkType: hard
-
-"language-subtag-registry@npm:~0.3.2":
-  version: 0.3.22
-  resolution: "language-subtag-registry@npm:0.3.22"
-  checksum: 8ab70a7e0e055fe977ac16ea4c261faec7205ac43db5e806f72e5b59606939a3b972c4bd1e10e323b35d6ffa97c3e1c4c99f6553069dad2dfdd22020fa3eb56a
-  languageName: node
-  linkType: hard
-
-"language-tags@npm:^1.0.5":
-  version: 1.0.5
-  resolution: "language-tags@npm:1.0.5"
-  dependencies:
-    language-subtag-registry: ~0.3.2
-  checksum: c81b5d8b9f5f9cfd06ee71ada6ddfe1cf83044dd5eeefcd1e420ad491944da8957688db4a0a9bc562df4afdc2783425cbbdfd152c01d93179cf86888903123cf
-  languageName: node
-  linkType: hard
-
-"leek@npm:0.0.24":
-  version: 0.0.24
-  resolution: "leek@npm:0.0.24"
-  dependencies:
-    debug: ^2.1.0
-    lodash.assign: ^3.2.0
-    rsvp: ^3.0.21
-  checksum: da2c554c7ea37c6e5ef680ce1940f7be2c2eef5661dc7f74e1bc86ac65136525fdb11e1d1f8f5c582ea8b9e4c8a31ba61d82e1192495a8f91bf1ca702b8d19f2
-  languageName: node
-  linkType: hard
-
-"levn@npm:^0.4.1":
-  version: 0.4.1
-  resolution: "levn@npm:0.4.1"
-  dependencies:
-    prelude-ls: ^1.2.1
-    type-check: ~0.4.0
-  checksum: 12c5021c859bd0f5248561bf139121f0358285ec545ebf48bb3d346820d5c61a4309535c7f387ed7d84361cf821e124ce346c6b7cef8ee09a67c1473b46d0fc4
-  languageName: node
-  linkType: hard
-
-"levn@npm:~0.3.0":
-  version: 0.3.0
-  resolution: "levn@npm:0.3.0"
-  dependencies:
-    prelude-ls: ~1.1.2
-    type-check: ~0.3.2
-  checksum: 0d084a524231a8246bb10fec48cdbb35282099f6954838604f3c7fc66f2e16fa66fd9cc2f3f20a541a113c4dafdf181e822c887c8a319c9195444e6c64ac395e
-  languageName: node
-  linkType: hard
-
-"line-column@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "line-column@npm:1.0.2"
-  dependencies:
-    isarray: ^1.0.0
-    isobject: ^2.0.0
-  checksum: 7b71b3aaebf629cf79bea9b8356d5c3d3cc36129619f8248a95409206f26cd1cad9d758ea873cbf262fce780e31c1aa50ec85ee48dbd539bd3356523d535c8f5
-  languageName: node
-  linkType: hard
-
-"lines-and-columns@npm:^1.1.6":
-  version: 1.1.6
-  resolution: "lines-and-columns@npm:1.1.6"
-  checksum: 198a5436b1fa5cf703bae719c01c686b076f0ad7e1aafd95a58d626cabff302dc0414822126f2f80b58a8c3d66cda8a7b6da064f27130f87e1d3506d6dfd0d68
-  languageName: node
-  linkType: hard
-
-"linkify-it@npm:^2.0.0":
-  version: 2.2.0
-  resolution: "linkify-it@npm:2.2.0"
-  dependencies:
-    uc.micro: ^1.0.1
-  checksum: d198871d0b3f3cfdb745dae564bfd6743474f20cd0ef1057e6ca29451834749e7f3da52b59b4de44e98f31a1e5c71bdad160490d4ae54de251cbcde57e4d7837
-  languageName: node
-  linkType: hard
-
-"linkify-it@npm:^3.0.1":
-  version: 3.0.2
-  resolution: "linkify-it@npm:3.0.2"
-  dependencies:
-    uc.micro: ^1.0.1
-  checksum: 08e14854ec3c29e3578311b1cd95e469952a27f191633189a23890628939fc45c6d84fa4495abb9f7f06e60f73a31b8881d834214864d46db914a09ffc7889ae
-  languageName: node
-  linkType: hard
-
-"lint-staged@npm:^10.5.1":
-  version: 10.5.4
-  resolution: "lint-staged@npm:10.5.4"
-  dependencies:
-    chalk: ^4.1.0
-    cli-truncate: ^2.1.0
-    commander: ^6.2.0
-    cosmiconfig: ^7.0.0
-    debug: ^4.2.0
-    dedent: ^0.7.0
-    enquirer: ^2.3.6
-    execa: ^4.1.0
-    listr2: ^3.2.2
-    log-symbols: ^4.0.0
-    micromatch: ^4.0.2
-    normalize-path: ^3.0.0
-    please-upgrade-node: ^3.2.0
-    string-argv: 0.3.1
-    stringify-object: ^3.3.0
-  bin:
-    lint-staged: bin/lint-staged.js
-  checksum: 4cc65f6c0a22dc091d0bbdfa6c15cd6e9b7d0d1e7603f5441bf9ac62f3a760fa36b0bda2db4c31b4084f28ba47cd4d0a176c3c3b314a97de8326e050d20b1635
-  languageName: node
-  linkType: hard
-
-"listr2@npm:^3.2.2":
-  version: 3.8.2
-  resolution: "listr2@npm:3.8.2"
-  dependencies:
-    chalk: ^4.1.1
-    cli-truncate: ^2.1.0
-    figures: ^3.2.0
-    indent-string: ^4.0.0
-    log-update: ^4.0.0
-    p-map: ^4.0.0
-    rxjs: ^6.6.7
-    through: ^2.3.8
-    wrap-ansi: ^7.0.0
-  peerDependencies:
-    enquirer: ">= 2.3.0 < 3"
-  checksum: f0930780daf525015fb6e0568c69b36e23a1b5c74c00b802ed911e2d9b2eacc6fb9f498e90669b1a0f51c987fab5dfe7d95f5bbddddf5f3d9d42d99d373ea700
-  languageName: node
-  linkType: hard
-
-"livereload-js@npm:^3.3.1":
-  version: 3.3.2
-  resolution: "livereload-js@npm:3.3.2"
-  checksum: 72121395b54f338f0aaf33542a062b7ecfd886f472cb8acb174635011bf29ccc689e5861427431c115d445239498dbbcd070a37c0c8b9561606ebc90c579afbd
-  languageName: node
-  linkType: hard
-
-"load-json-file@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "load-json-file@npm:4.0.0"
-  dependencies:
-    graceful-fs: ^4.1.2
-    parse-json: ^4.0.0
-    pify: ^3.0.0
-    strip-bom: ^3.0.0
-  checksum: 8f5d6d93ba64a9620445ee9bde4d98b1eac32cf6c8c2d20d44abfa41a6945e7969456ab5f1ca2fb06ee32e206c9769a20eec7002fe290de462e8c884b6b8b356
-  languageName: node
-  linkType: hard
-
-"loader-runner@npm:^2.4.0":
-  version: 2.4.0
-  resolution: "loader-runner@npm:2.4.0"
-  checksum: e27eebbca5347a03f6b1d1bce5b2736a4984fb742f872c0a4d68e62de10f7637613e79a464d3bcd77c246d9c70fcac112bb4a3123010eb527e8b203a614647db
-  languageName: node
-  linkType: hard
-
-"loader-runner@npm:^4.2.0":
-  version: 4.3.0
-  resolution: "loader-runner@npm:4.3.0"
-  checksum: a90e00dee9a16be118ea43fec3192d0b491fe03a32ed48a4132eb61d498f5536a03a1315531c19d284392a8726a4ecad71d82044c28d7f22ef62e029bf761569
-  languageName: node
-  linkType: hard
-
-"loader-utils@npm:^1.2.3, loader-utils@npm:^1.4.0":
-  version: 1.4.0
-  resolution: "loader-utils@npm:1.4.0"
-  dependencies:
-    big.js: ^5.2.2
-    emojis-list: ^3.0.0
-    json5: ^1.0.1
-  checksum: d150b15e7a42ac47d935c8b484b79e44ff6ab4c75df7cc4cb9093350cf014ec0b17bdb60c5d6f91a37b8b218bd63b973e263c65944f58ca2573e402b9a27e717
-  languageName: node
-  linkType: hard
-
-"loader-utils@npm:^2.0.0":
-  version: 2.0.2
-  resolution: "loader-utils@npm:2.0.2"
-  dependencies:
-    big.js: ^5.2.2
-    emojis-list: ^3.0.0
-    json5: ^2.1.2
-  checksum: 9078d1ed47cadc57f4c6ddbdb2add324ee7da544cea41de3b7f1128e8108fcd41cd3443a85b7ee8d7d8ac439148aa221922774efe4cf87506d4fb054d5889303
-  languageName: node
-  linkType: hard
-
-"loader.js@npm:^4.7.0":
-  version: 4.7.0
-  resolution: "loader.js@npm:4.7.0"
-  checksum: 947412e7665e47ed1fefcd5c07b8fbcfd9991ccc4f39aa3ad631fc0be301c4410f57a2ed762e710450643210072fbbb54ea00128f9c449d76ee79fe5b8481ec6
-  languageName: node
-  linkType: hard
-
-"locate-character@npm:^2.0.5":
-  version: 2.0.5
-  resolution: "locate-character@npm:2.0.5"
-  checksum: dbc4c62bb98ba95626d5533c6d45d480b2536bb500d1453efdd19d0797e75ba92abf8d0432966990a1567a3b591b0fa6067f0ce93808cbf8b55beedd7bd28a78
-  languageName: node
-  linkType: hard
-
-"locate-path@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "locate-path@npm:2.0.0"
-  dependencies:
-    p-locate: ^2.0.0
-    path-exists: ^3.0.0
-  checksum: 02d581edbbbb0fa292e28d96b7de36b5b62c2fa8b5a7e82638ebb33afa74284acf022d3b1e9ae10e3ffb7658fbc49163fcd5e76e7d1baaa7801c3e05a81da755
-  languageName: node
-  linkType: hard
-
-"locate-path@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "locate-path@npm:3.0.0"
-  dependencies:
-    p-locate: ^3.0.0
-    path-exists: ^3.0.0
-  checksum: 53db3996672f21f8b0bf2a2c645ae2c13ffdae1eeecfcd399a583bce8516c0b88dcb4222ca6efbbbeb6949df7e46860895be2c02e8d3219abd373ace3bfb4e11
-  languageName: node
-  linkType: hard
-
-"locate-path@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "locate-path@npm:5.0.0"
-  dependencies:
-    p-locate: ^4.1.0
-  checksum: 83e51725e67517287d73e1ded92b28602e3ae5580b301fe54bfb76c0c723e3f285b19252e375712316774cf52006cb236aed5704692c32db0d5d089b69696e30
-  languageName: node
-  linkType: hard
-
-"locate-path@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "locate-path@npm:6.0.0"
-  dependencies:
-    p-locate: ^5.0.0
-  checksum: 72eb661788a0368c099a184c59d2fee760b3831c9c1c33955e8a19ae4a21b4116e53fa736dc086cdeb9fce9f7cc508f2f92d2d3aae516f133e16a2bb59a39f5a
-  languageName: node
-  linkType: hard
-
-"locate-path@npm:^7.1.0":
-  version: 7.1.0
-  resolution: "locate-path@npm:7.1.0"
-  dependencies:
-    p-locate: ^6.0.0
-  checksum: 17d5eb6c04ff31856f8a6ae4ee3e3091d41485657428d1a91bd5f66aa1fcd7a90db3de6e8ffb905c2ff1a0014b77509b98dd6410424505efc08b1726d50bcbfc
-  languageName: node
-  linkType: hard
-
-"lodash-es@npm:^4.17.11":
-  version: 4.17.21
-  resolution: "lodash-es@npm:4.17.21"
-  checksum: 05cbffad6e2adbb331a4e16fbd826e7faee403a1a04873b82b42c0f22090f280839f85b95393f487c1303c8a3d2a010048bf06151a6cbe03eee4d388fb0a12d2
-  languageName: node
-  linkType: hard
-
-"lodash._baseassign@npm:^3.0.0":
-  version: 3.2.0
-  resolution: "lodash._baseassign@npm:3.2.0"
-  dependencies:
-    lodash._basecopy: ^3.0.0
-    lodash.keys: ^3.0.0
-  checksum: 27155048736d02dc384f97af303ba66bb5f768aedd5191dddf25acbd13a0733c530d4258df2136440fce7e28c8240561ecd94e769ce4cbb0115dbfd9ab5c4203
-  languageName: node
-  linkType: hard
-
-"lodash._basecopy@npm:^3.0.0":
-  version: 3.0.1
-  resolution: "lodash._basecopy@npm:3.0.1"
-  checksum: 4ccbeef09f53cb1a0cdf1cafeaea2d445ec2184337e1389eb3b81649a3e30f33c377d79027fbce06dae199a6f8ffb4fbd32f1ce07bddbdfae14f51f8340ae68c
-  languageName: node
-  linkType: hard
-
-"lodash._baseflatten@npm:^3.0.0":
-  version: 3.1.4
-  resolution: "lodash._baseflatten@npm:3.1.4"
-  dependencies:
-    lodash.isarguments: ^3.0.0
-    lodash.isarray: ^3.0.0
-  checksum: 7637d1105ce272c5df5c552879dccdbae48da8b8e613d303c3bc1bbee9e1443fd1c934f7c8c0049b96e54df14d9cfd1bab5522412ad6952bb13cbdff1b37a20c
-  languageName: node
-  linkType: hard
-
-"lodash._bindcallback@npm:^3.0.0":
-  version: 3.0.1
-  resolution: "lodash._bindcallback@npm:3.0.1"
-  checksum: 3916fd72bc02de3643a52d46cf5aaeab4c0b21cd7cb2fb801a8bf9dacdc8532e89b30a4ebafdf65da5fe09d8b0bf898a7416402704fd7262a976703e1c59e549
-  languageName: node
-  linkType: hard
-
-"lodash._createassigner@npm:^3.0.0":
-  version: 3.1.1
-  resolution: "lodash._createassigner@npm:3.1.1"
-  dependencies:
-    lodash._bindcallback: ^3.0.0
-    lodash._isiterateecall: ^3.0.0
-    lodash.restparam: ^3.0.0
-  checksum: ca9e08350914c279560b8930a3f7aa065b061a7e2b0bf13b33af1f782be8b5356f623ce01e89248212cc6099b1bc6c39e03ed9ffc9e0c2fd7169b1b7c447c01e
-  languageName: node
-  linkType: hard
-
-"lodash._getnative@npm:^3.0.0":
-  version: 3.9.1
-  resolution: "lodash._getnative@npm:3.9.1"
-  checksum: ba2152bb10bf44beb54fcd273598197972c989c2181b54e533cec1ff1ebebdf8bb02d4ffc3d5a648480a48beb3026db191f5de99adecd7eac36bbd6025c9b048
-  languageName: node
-  linkType: hard
-
-"lodash._isiterateecall@npm:^3.0.0":
-  version: 3.0.9
-  resolution: "lodash._isiterateecall@npm:3.0.9"
-  checksum: 95ace291d07f2930d9f038ec3c662f88cef48ccebd508665ce08a3251f126b2a645234ab734a6dff0987e1ae9ef74dad706e0d9a2bf26828e50d19c7a6238cab
-  languageName: node
-  linkType: hard
-
-"lodash._reinterpolate@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "lodash._reinterpolate@npm:3.0.0"
-  checksum: 06d2d5f33169604fa5e9f27b6067ed9fb85d51a84202a656901e5ffb63b426781a601508466f039c720af111b0c685d12f1a5c14ff8df5d5f27e491e562784b2
-  languageName: node
-  linkType: hard
-
-"lodash.assign@npm:^3.2.0":
-  version: 3.2.0
-  resolution: "lodash.assign@npm:3.2.0"
-  dependencies:
-    lodash._baseassign: ^3.0.0
-    lodash._createassigner: ^3.0.0
-    lodash.keys: ^3.0.0
-  checksum: 135351c0e376e2963ec785d4ad4efce55cd7f1d5e3d34387e940c1de6c5f92d6f91d3e415218bc37657f34aae823bc9ecf2fb38bd4734dc69f7d659582cc4178
-  languageName: node
-  linkType: hard
-
-"lodash.assign@npm:^4.2.0":
-  version: 4.2.0
-  resolution: "lodash.assign@npm:4.2.0"
-  checksum: 75bbc6733c9f577c448031b4051f990f068802708891f94be9d4c2faffd6a9ec67a2c49671dafc908a068d35687765464853282842b4560b662e6c903d11cc90
-  languageName: node
-  linkType: hard
-
-"lodash.assignin@npm:^4.1.0":
-  version: 4.2.0
-  resolution: "lodash.assignin@npm:4.2.0"
-  checksum: 4b55bc1d65ccd7648fdba8a4316d10546929bf0beb5950830d86c559948cf170f0e65b77c95e66b45b511b85a31161714de8b2008d2537627ef3c7759afe36a6
-  languageName: node
-  linkType: hard
-
-"lodash.camelcase@npm:^4.3.0":
-  version: 4.3.0
-  resolution: "lodash.camelcase@npm:4.3.0"
-  checksum: cb9227612f71b83e42de93eccf1232feeb25e705bdb19ba26c04f91e885bfd3dd5c517c4a97137658190581d3493ea3973072ca010aab7e301046d90740393d1
-  languageName: node
-  linkType: hard
-
-"lodash.castarray@npm:^4.4.0":
-  version: 4.4.0
-  resolution: "lodash.castarray@npm:4.4.0"
-  checksum: fca8c7047e0ae2738b0b2503fb00157ae0ff6d8a1b716f87ed715b22560e09de438c75b65e01a7e44ceb41c5b31dce2eb576e46db04beb9c699c498e03cbd00f
-  languageName: node
-  linkType: hard
-
-"lodash.clonedeep@npm:^4.4.1, lodash.clonedeep@npm:^4.5.0":
-  version: 4.5.0
-  resolution: "lodash.clonedeep@npm:4.5.0"
-  checksum: 92c46f094b064e876a23c97f57f81fbffd5d760bf2d8a1c61d85db6d1e488c66b0384c943abee4f6af7debf5ad4e4282e74ff83177c9e63d8ff081a4837c3489
-  languageName: node
-  linkType: hard
-
-"lodash.compact@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "lodash.compact@npm:3.0.1"
-  checksum: 75039eddfa5ef2ea0da1fc3d36515e92227241f94258b3dcf771196e741c878698ce5b79c0cb7fe758841c9dfd0e6fa222888985aadc0384fd79bbc9680dd829
-  languageName: node
-  linkType: hard
-
-"lodash.debounce@npm:^3.1.1":
-  version: 3.1.1
-  resolution: "lodash.debounce@npm:3.1.1"
-  dependencies:
-    lodash._getnative: ^3.0.0
-  checksum: 8d9dcd6f66246c3e92a25420881714b68f6d7a794db9ffcedb4a2c0f9005f4c6fd59c80ff801eca3ef8aa7fc227d62ae301f37854a73db6d064bd8dcaa93355d
-  languageName: node
-  linkType: hard
-
-"lodash.debounce@npm:^4.0.8":
-  version: 4.0.8
-  resolution: "lodash.debounce@npm:4.0.8"
-  checksum: a3f527d22c548f43ae31c861ada88b2637eb48ac6aa3eb56e82d44917971b8aa96fbb37aa60efea674dc4ee8c42074f90f7b1f772e9db375435f6c83a19b3bc6
-  languageName: node
-  linkType: hard
-
-"lodash.defaultsdeep@npm:^4.6.1":
-  version: 4.6.1
-  resolution: "lodash.defaultsdeep@npm:4.6.1"
-  checksum: 1f346f16158b760545ca99553cb13e907a28b281425751af6bfe681387b9e5685438a7ddbfd36a8d5cc8bda066867a134aa31416f17e318db8c461c377810a76
-  languageName: node
-  linkType: hard
-
-"lodash.find@npm:^4.5.1, lodash.find@npm:^4.6.0":
-  version: 4.6.0
-  resolution: "lodash.find@npm:4.6.0"
-  checksum: b737f849a4fe36f5c3664ea636780dda2fde18335021faf80cdfdcb300ed75441da6f55cfd6de119092d8bb2ddbc4433f4a8de4b99c0b9c8640465b0901c717c
-  languageName: node
-  linkType: hard
-
-"lodash.flatten@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "lodash.flatten@npm:3.0.2"
-  dependencies:
-    lodash._baseflatten: ^3.0.0
-    lodash._isiterateecall: ^3.0.0
-  checksum: 7d2dc97c02ad305cf8d4d8761fbc41f3bde6a8f7f1c4d720d5b234c4e81f6a00c1f0afd8f84d7fb7330fdd799a734f1fab4191a806f3629e28e3ba00eb4b9e26
-  languageName: node
-  linkType: hard
-
-"lodash.flatten@npm:^4.4.0":
-  version: 4.4.0
-  resolution: "lodash.flatten@npm:4.4.0"
-  checksum: 0ac34a393d4b795d4b7421153d27c13ae67e08786c9cbb60ff5b732210d46f833598eee3fb3844bb10070e8488efe390ea53bb567377e0cb47e9e630bf0811cb
-  languageName: node
-  linkType: hard
-
-"lodash.foreach@npm:^4.5.0":
-  version: 4.5.0
-  resolution: "lodash.foreach@npm:4.5.0"
-  checksum: a940386b158ca0d62994db41fc16529eb8ae67138f29ced38e91f912cb5435d1b0ed34b18e6f7b9ddfc32ab676afc6dfec60d1e22633d8e3e4b33413402ab4ad
-  languageName: node
-  linkType: hard
-
-"lodash.forin@npm:^4.4.0":
-  version: 4.4.0
-  resolution: "lodash.forin@npm:4.4.0"
-  checksum: c9c8e6c3204029fe0610efb8c74113b00a3d5a92b1d8defbf3f5cbc2d0f7663c680dff62e2950ed9406bb6d06e882fa39568c607bc44229d53fd93a9fd6c07b7
-  languageName: node
-  linkType: hard
-
-"lodash.get@npm:^4.4.2":
-  version: 4.4.2
-  resolution: "lodash.get@npm:4.4.2"
-  checksum: e403047ddb03181c9d0e92df9556570e2b67e0f0a930fcbbbd779370972368f5568e914f913e93f3b08f6d492abc71e14d4e9b7a18916c31fa04bd2306efe545
-  languageName: node
-  linkType: hard
-
-"lodash.has@npm:^4.5.2":
-  version: 4.5.2
-  resolution: "lodash.has@npm:4.5.2"
-  checksum: b3ec829a86852331d48b3730ff06088a283d128a3965aa521ffd942bcf5c82e06bed3164ff7a7751d11e768d88f0d7bab316192091489caf20f452d42f7055d5
-  languageName: node
-  linkType: hard
-
-"lodash.invokemap@npm:^4.6.0":
-  version: 4.6.0
-  resolution: "lodash.invokemap@npm:4.6.0"
-  checksum: 646ceebbefbcb6da301f8c2868254680fd0bcdc6ada470495d9ae49c9c32938829c1b38a38c95d0258409a9655f85db404b16e648381c7450b7ed3d9c52d8808
-  languageName: node
-  linkType: hard
-
-"lodash.isarguments@npm:^3.0.0":
-  version: 3.1.0
-  resolution: "lodash.isarguments@npm:3.1.0"
-  checksum: ae1526f3eb5c61c77944b101b1f655f846ecbedcb9e6b073526eba6890dc0f13f09f72e11ffbf6540b602caee319af9ac363d6cdd6be41f4ee453436f04f13b5
-  languageName: node
-  linkType: hard
-
-"lodash.isarray@npm:^3.0.0":
-  version: 3.0.4
-  resolution: "lodash.isarray@npm:3.0.4"
-  checksum: 3b298fb76ff16981353f7d0695d8680be9451b74d2e76714ddbd903a90fbaa8e1d84979d0ae99325f5a9033776771154b19e05027ab23de83202251c8abe81b5
-  languageName: node
-  linkType: hard
-
-"lodash.isempty@npm:^4.4.0":
-  version: 4.4.0
-  resolution: "lodash.isempty@npm:4.4.0"
-  checksum: a8118f23f7ed72a1dbd176bf27f297d1e71aa1926288449cb8f7cef99ba1bc7527eab52fe7899ab080fa1dc150aba6e4a6367bf49fa4e0b78da1ecc095f8d8c5
-  languageName: node
-  linkType: hard
-
-"lodash.isequal@npm:^4.5.0":
-  version: 4.5.0
-  resolution: "lodash.isequal@npm:4.5.0"
-  checksum: da27515dc5230eb1140ba65ff8de3613649620e8656b19a6270afe4866b7bd461d9ba2ac8a48dcc57f7adac4ee80e1de9f965d89d4d81a0ad52bb3eec2609644
-  languageName: node
-  linkType: hard
-
-"lodash.isfunction@npm:^3.0.9":
-  version: 3.0.9
-  resolution: "lodash.isfunction@npm:3.0.9"
-  checksum: 99e54c34b1e8a9ba75c034deb39cedbd2aca7af685815e67a2a8ec4f73ec9748cda6ebee5a07d7de4b938e90d421fd280e9c385cc190f903ac217ac8aff30314
-  languageName: node
-  linkType: hard
-
-"lodash.isinteger@npm:^4.0.4":
-  version: 4.0.4
-  resolution: "lodash.isinteger@npm:4.0.4"
-  checksum: 6034821b3fc61a2ffc34e7d5644bb50c5fd8f1c0121c554c21ac271911ee0c0502274852845005f8651d51e199ee2e0cfebfe40aaa49c7fe617f603a8a0b1691
-  languageName: node
-  linkType: hard
-
-"lodash.isplainobject@npm:^4.0.6":
-  version: 4.0.6
-  resolution: "lodash.isplainobject@npm:4.0.6"
-  checksum: 29c6351f281e0d9a1d58f1a4c8f4400924b4c79f18dfc4613624d7d54784df07efaff97c1ff2659f3e085ecf4fff493300adc4837553104cef2634110b0d5337
-  languageName: node
-  linkType: hard
-
-"lodash.kebabcase@npm:^4.1.1":
-  version: 4.1.1
-  resolution: "lodash.kebabcase@npm:4.1.1"
-  checksum: 5a6c59161914e1bae23438a298c7433e83d935e0f59853fa862e691164696bc07f6dfa4c313d499fbf41ba8d53314e9850416502376705a357d24ee6ca33af78
-  languageName: node
-  linkType: hard
-
-"lodash.keys@npm:^3.0.0":
-  version: 3.1.2
-  resolution: "lodash.keys@npm:3.1.2"
-  dependencies:
-    lodash._getnative: ^3.0.0
-    lodash.isarguments: ^3.0.0
-    lodash.isarray: ^3.0.0
-  checksum: ac7c02c793334c48161a8e8a1f12576c73ee50d1371e75680afc6c2d3740d5e9bdc899517e6c0034014eaa2512c5f433a2e6985c9e16cf28b5c9013ec81bd35e
-  languageName: node
-  linkType: hard
-
-"lodash.lowerfirst@npm:^4.3.1":
-  version: 4.3.1
-  resolution: "lodash.lowerfirst@npm:4.3.1"
-  checksum: e1688e18873777d394db4994d150dfc14cf01bf450169cf8296af4d84ecd7c3c4ae4dab3746f77f8719a093e4fff58bee3ae73ae7e23ef508b7d970b189d9952
-  languageName: node
-  linkType: hard
-
-"lodash.map@npm:^4.6.0":
-  version: 4.6.0
-  resolution: "lodash.map@npm:4.6.0"
-  checksum: 7369a41d7d24d15ce3bbd02a7faa3a90f6266c38184e64932571b9b21b758bd10c04ffd117d1859be1a44156f29b94df5045eff172bf8a97fddf68bf1002d12f
-  languageName: node
-  linkType: hard
-
-"lodash.mapvalues@npm:^4.6.0":
-  version: 4.6.0
-  resolution: "lodash.mapvalues@npm:4.6.0"
-  checksum: 0ff1b252fda318fc36e47c296984925e98fbb0fc5a2ecc4ef458f3c739a9476d47e40c95ac653e8314d132aa59c746d4276527b99d6e271940555c6e12d2babd
-  languageName: node
-  linkType: hard
-
-"lodash.memoize@npm:4.1.2, lodash.memoize@npm:^4.1.2":
-  version: 4.1.2
-  resolution: "lodash.memoize@npm:4.1.2"
-  checksum: 9ff3942feeccffa4f1fafa88d32f0d24fdc62fd15ded5a74a5f950ff5f0c6f61916157246744c620173dddf38d37095a92327d5fd3861e2063e736a5c207d089
-  languageName: node
-  linkType: hard
-
-"lodash.merge@npm:^4.6.0, lodash.merge@npm:^4.6.2":
-  version: 4.6.2
-  resolution: "lodash.merge@npm:4.6.2"
-  checksum: ad580b4bdbb7ca1f7abf7e1bce63a9a0b98e370cf40194b03380a46b4ed799c9573029599caebc1b14e3f24b111aef72b96674a56cfa105e0f5ac70546cdc005
-  languageName: node
-  linkType: hard
-
-"lodash.omit@npm:^4.1.0":
-  version: 4.5.0
-  resolution: "lodash.omit@npm:4.5.0"
-  checksum: 434645e49fe84ab315719bd5a9a3a585a0f624aa4160bc09157dd041a414bcc287c15840365c1379476a3f3eda41fbe838976c3f7bdecbbf4c5478e86c471a30
-  languageName: node
-  linkType: hard
-
-"lodash.pick@npm:^4.4.0":
-  version: 4.4.0
-  resolution: "lodash.pick@npm:4.4.0"
-  checksum: 2c36cab7da6b999a20bd3373b40e31a3ef81fa264f34a6979c852c5bc8ac039379686b27380f0cb8e3781610844fafec6949c6fbbebc059c98f8fa8570e3675f
-  languageName: node
-  linkType: hard
-
-"lodash.restparam@npm:^3.0.0":
-  version: 3.6.1
-  resolution: "lodash.restparam@npm:3.6.1"
-  checksum: 8bda0c7aaeac93da2b7e856bfeec8e6fdefb4d7eadfe6fd84775312a729fc1cb985636d922fe33b49f41aba135204962f4b853d7946105b7704102edb2bf6082
-  languageName: node
-  linkType: hard
-
-"lodash.snakecase@npm:^4.1.1":
-  version: 4.1.1
-  resolution: "lodash.snakecase@npm:4.1.1"
-  checksum: 1685ed3e83dda6eae5a4dcaee161a51cd210aabb3e1c09c57150e7dd8feda19e4ca0d27d0631eabe8d0f4eaa51e376da64e8c018ae5415417c5890d42feb72a8
-  languageName: node
-  linkType: hard
-
-"lodash.template@npm:^4.4.0, lodash.template@npm:^4.5.0":
-  version: 4.5.0
-  resolution: "lodash.template@npm:4.5.0"
-  dependencies:
-    lodash._reinterpolate: ^3.0.0
-    lodash.templatesettings: ^4.0.0
-  checksum: ca64e5f07b6646c9d3dbc0fe3aaa995cb227c4918abd1cef7a9024cd9c924f2fa389a0ec4296aa6634667e029bc81d4bbdb8efbfde11df76d66085e6c529b450
-  languageName: node
-  linkType: hard
-
-"lodash.templatesettings@npm:^4.0.0":
-  version: 4.2.0
-  resolution: "lodash.templatesettings@npm:4.2.0"
-  dependencies:
-    lodash._reinterpolate: ^3.0.0
-  checksum: 863e025478b092997e11a04e9d9e735875eeff1ffcd6c61742aa8272e3c2cddc89ce795eb9726c4e74cef5991f722897ff37df7738a125895f23fc7d12a7bb59
-  languageName: node
-  linkType: hard
-
-"lodash.truncate@npm:^4.4.2":
-  version: 4.4.2
-  resolution: "lodash.truncate@npm:4.4.2"
-  checksum: b463d8a382cfb5f0e71c504dcb6f807a7bd379ff1ea216669aa42c52fc28c54e404bfbd96791aa09e6df0de2c1d7b8f1b7f4b1a61f324d38fe98bc535aeee4f5
-  languageName: node
-  linkType: hard
-
-"lodash.uniq@npm:^4.2.0, lodash.uniq@npm:^4.5.0":
-  version: 4.5.0
-  resolution: "lodash.uniq@npm:4.5.0"
-  checksum: a4779b57a8d0f3c441af13d9afe7ecff22dd1b8ce1129849f71d9bbc8e8ee4e46dfb4b7c28f7ad3d67481edd6e51126e4e2a6ee276e25906d10f7140187c392d
-  languageName: node
-  linkType: hard
-
-"lodash.uniqby@npm:^4.7.0":
-  version: 4.7.0
-  resolution: "lodash.uniqby@npm:4.7.0"
-  checksum: 659264545a95726d1493123345aad8cbf56e17810fa9a0b029852c6d42bc80517696af09d99b23bef1845d10d95e01b8b4a1da578f22aeba7a30d3e0022a4938
-  languageName: node
-  linkType: hard
-
-"lodash.values@npm:^4.3.0":
-  version: 4.3.0
-  resolution: "lodash.values@npm:4.3.0"
-  checksum: 857e122ddf6edb50137887f0b834d471f96d66692ebb5de8b048ed277c8a3dd1bc8f85d82cf31b0f5c6dbc5b72c036a591205f76eec86bb11818a1a6f7e5a28c
-  languageName: node
-  linkType: hard
-
-"lodash@npm:^4.0.0, lodash@npm:^4.17.10, lodash@npm:^4.17.11, lodash@npm:^4.17.12, lodash@npm:^4.17.14, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.17.21, lodash@npm:^4.17.4, lodash@npm:^4.5.1, lodash@npm:^4.7.0":
-  version: 4.17.21
-  resolution: "lodash@npm:4.17.21"
-  checksum: eb835a2e51d381e561e508ce932ea50a8e5a68f4ebdd771ea240d3048244a8d13658acbd502cd4829768c56f2e16bdd4340b9ea141297d472517b83868e677f7
-  languageName: node
-  linkType: hard
-
-"log-symbols@npm:^2.2.0":
-  version: 2.2.0
-  resolution: "log-symbols@npm:2.2.0"
-  dependencies:
-    chalk: ^2.0.1
-  checksum: 4c95e3b65f0352dbe91dc4989c10baf7a44e2ef5b0db7e6721e1476268e2b6f7090c3aa880d4f833a05c5c3ff18f4ec5215a09bd0099986d64a8186cfeb48ac8
-  languageName: node
-  linkType: hard
-
-"log-symbols@npm:^4.0.0, log-symbols@npm:^4.1.0":
-  version: 4.1.0
-  resolution: "log-symbols@npm:4.1.0"
-  dependencies:
-    chalk: ^4.1.0
-    is-unicode-supported: ^0.1.0
-  checksum: fce1497b3135a0198803f9f07464165e9eb83ed02ceb2273930a6f8a508951178d8cf4f0378e9d28300a2ed2bc49050995d2bd5f53ab716bb15ac84d58c6ef74
-  languageName: node
-  linkType: hard
-
-"log-update@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "log-update@npm:4.0.0"
-  dependencies:
-    ansi-escapes: ^4.3.0
-    cli-cursor: ^3.1.0
-    slice-ansi: ^4.0.0
-    wrap-ansi: ^6.2.0
-  checksum: ae2f85bbabc1906034154fb7d4c4477c79b3e703d22d78adee8b3862fa913942772e7fa11713e3d96fb46de4e3cabefbf5d0a544344f03b58d3c4bff52aa9eb2
-  languageName: node
-  linkType: hard
-
-"loglevel-colored-level-prefix@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "loglevel-colored-level-prefix@npm:1.0.0"
-  dependencies:
-    chalk: ^1.1.3
-    loglevel: ^1.4.1
-  checksum: 146aa7d0ea900d6d8523e945b2265be240e4c7c4752dae678983764dd756c44194684af1ee8ea721feff4c4f8c5771544a02a6cd8b269a663cffe9b4fcf955f1
-  languageName: node
-  linkType: hard
-
-"loglevel@npm:^1.4.1":
-  version: 1.7.1
-  resolution: "loglevel@npm:1.7.1"
-  checksum: 715a4ae69ad75d4d3bd04e4f6e9edbc4cae4db34d1e7f54f426d8cebe2dd9fef891ca3789e839d927cdbc5fad73d789e998db0af2f11f4c40219c272bc923823
-  languageName: node
-  linkType: hard
-
-"lolex@npm:^4.2.0":
-  version: 4.2.0
-  resolution: "lolex@npm:4.2.0"
-  checksum: 0a83bfe1748fc745515dff9b3f722422918f5f6975104d7e576fc32c06b5398ee0c58525684068d4de49cdd49874e00b5e2b2d72ce8c5d829dab86c8c08ca31f
-  languageName: node
-  linkType: hard
-
-"lolex@npm:^5.0.1":
-  version: 5.1.2
-  resolution: "lolex@npm:5.1.2"
-  dependencies:
-    "@sinonjs/commons": ^1.7.0
-  checksum: 7eb468d4ef4746c024d23cb2b75f679f79449a9d5cbe11abadf2f3b147c1d7ffe28816438bedfb8a75c58357a625c2f9ba197b050c226d2b3f0c4a956cf556fb
-  languageName: node
-  linkType: hard
-
-"longest-streak@npm:^2.0.0":
-  version: 2.0.4
-  resolution: "longest-streak@npm:2.0.4"
-  checksum: 28b8234a14963002c5c71035dee13a0a11e9e9d18ffa320fdc8796ed7437399204495702ed69cd2a7087b0af041a2a8b562829b7c1e2042e73a3374d1ecf6580
-  languageName: node
-  linkType: hard
-
-"loose-envify@npm:^1.0.0":
-  version: 1.4.0
-  resolution: "loose-envify@npm:1.4.0"
-  dependencies:
-    js-tokens: ^3.0.0 || ^4.0.0
-  bin:
-    loose-envify: cli.js
-  checksum: 6517e24e0cad87ec9888f500c5b5947032cdfe6ef65e1c1936a0c48a524b81e65542c9c3edc91c97d5bddc806ee2a985dbc79be89215d613b1de5db6d1cfe6f4
-  languageName: node
-  linkType: hard
-
-"lower-case@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "lower-case@npm:2.0.2"
-  dependencies:
-    tslib: ^2.0.3
-  checksum: 83a0a5f159ad7614bee8bf976b96275f3954335a84fad2696927f609ddae902802c4f3312d86668722e668bef41400254807e1d3a7f2e8c3eede79691aa1f010
-  languageName: node
-  linkType: hard
-
-"lru-cache@npm:^5.1.1":
-  version: 5.1.1
-  resolution: "lru-cache@npm:5.1.1"
-  dependencies:
-    yallist: ^3.0.2
-  checksum: c154ae1cbb0c2206d1501a0e94df349653c92c8cbb25236d7e85190bcaf4567a03ac6eb43166fabfa36fd35623694da7233e88d9601fbf411a9a481d85dbd2cb
-  languageName: node
-  linkType: hard
-
-"lru-cache@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "lru-cache@npm:6.0.0"
-  dependencies:
-    yallist: ^4.0.0
-  checksum: f97f499f898f23e4585742138a22f22526254fdba6d75d41a1c2526b3b6cc5747ef59c5612ba7375f42aca4f8461950e925ba08c991ead0651b4918b7c978297
-  languageName: node
-  linkType: hard
-
-"lru-cache@npm:^7.7.1":
-  version: 7.18.3
-  resolution: "lru-cache@npm:7.18.3"
-  checksum: e550d772384709deea3f141af34b6d4fa392e2e418c1498c078de0ee63670f1f46f5eee746e8ef7e69e1c895af0d4224e62ee33e66a543a14763b0f2e74c1356
-  languageName: node
-  linkType: hard
-
-"magic-string@npm:^0.24.0":
-  version: 0.24.1
-  resolution: "magic-string@npm:0.24.1"
-  dependencies:
-    sourcemap-codec: ^1.4.1
-  checksum: 335a4992a75b5869acf054216acf430bc587986500c495cb2f0d42d47364c7677c5a2db5a8465fac380ce5e87d33225e7f2e1cd8f586e7e5ceaf34d366650606
-  languageName: node
-  linkType: hard
-
-"magic-string@npm:^0.25.2, magic-string@npm:^0.25.7":
-  version: 0.25.7
-  resolution: "magic-string@npm:0.25.7"
-  dependencies:
-    sourcemap-codec: ^1.4.4
-  checksum: 727a1fb70f9610304fe384f1df0251eb7d1d9dd779c07ef1225690361b71b216f26f5d934bfb11c919b5b0e7ba50f6240c823a6f2e44cfd33d4a07d7747ca829
-  languageName: node
-  linkType: hard
-
-"make-dir@npm:^2.0.0":
-  version: 2.1.0
-  resolution: "make-dir@npm:2.1.0"
-  dependencies:
-    pify: ^4.0.1
-    semver: ^5.6.0
-  checksum: 043548886bfaf1820323c6a2997e6d2fa51ccc2586ac14e6f14634f7458b4db2daf15f8c310e2a0abd3e0cddc64df1890d8fc7263033602c47bb12cbfcf86aab
-  languageName: node
-  linkType: hard
-
-"make-dir@npm:^3.0.0, make-dir@npm:^3.0.2, make-dir@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "make-dir@npm:3.1.0"
-  dependencies:
-    semver: ^6.0.0
-  checksum: 484200020ab5a1fdf12f393fe5f385fc8e4378824c940fba1729dcd198ae4ff24867bc7a5646331e50cead8abff5d9270c456314386e629acec6dff4b8016b78
-  languageName: node
-  linkType: hard
-
-"make-fetch-happen@npm:^10.0.3":
-  version: 10.2.1
-  resolution: "make-fetch-happen@npm:10.2.1"
-  dependencies:
-    agentkeepalive: ^4.2.1
-    cacache: ^16.1.0
-    http-cache-semantics: ^4.1.0
-    http-proxy-agent: ^5.0.0
-    https-proxy-agent: ^5.0.0
-    is-lambda: ^1.0.1
-    lru-cache: ^7.7.1
-    minipass: ^3.1.6
-    minipass-collect: ^1.0.2
-    minipass-fetch: ^2.0.3
-    minipass-flush: ^1.0.5
-    minipass-pipeline: ^1.2.4
-    negotiator: ^0.6.3
-    promise-retry: ^2.0.1
-    socks-proxy-agent: ^7.0.0
-    ssri: ^9.0.0
-  checksum: 2332eb9a8ec96f1ffeeea56ccefabcb4193693597b132cd110734d50f2928842e22b84cfa1508e921b8385cdfd06dda9ad68645fed62b50fff629a580f5fb72c
-  languageName: node
-  linkType: hard
-
-"make-plural@npm:^7.0.0":
-  version: 7.1.0
-  resolution: "make-plural@npm:7.1.0"
-  checksum: d0ef253e508c8cdbddcc37288d25e0944eb2bf800008bf178a1c37b101c3202d89609ddb577a10515bd2499c7665159594704682cc9c159cc20491da6b7ac09e
-  languageName: node
-  linkType: hard
-
-"makeerror@npm:1.0.12":
-  version: 1.0.12
-  resolution: "makeerror@npm:1.0.12"
-  dependencies:
-    tmpl: 1.0.5
-  checksum: b38a025a12c8146d6eeea5a7f2bf27d51d8ad6064da8ca9405fcf7bf9b54acd43e3b30ddd7abb9b1bfa4ddb266019133313482570ddb207de568f71ecfcf6060
-  languageName: node
-  linkType: hard
-
-"map-cache@npm:^0.2.2":
-  version: 0.2.2
-  resolution: "map-cache@npm:0.2.2"
-  checksum: 3067cea54285c43848bb4539f978a15dedc63c03022abeec6ef05c8cb6829f920f13b94bcaf04142fc6a088318e564c4785704072910d120d55dbc2e0c421969
-  languageName: node
-  linkType: hard
-
-"map-obj@npm:^4.1.0":
-  version: 4.3.0
-  resolution: "map-obj@npm:4.3.0"
-  checksum: fbc554934d1a27a1910e842bc87b177b1a556609dd803747c85ece420692380827c6ae94a95cce4407c054fa0964be3bf8226f7f2cb2e9eeee432c7c1985684e
-  languageName: node
-  linkType: hard
-
-"map-visit@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "map-visit@npm:1.0.0"
-  dependencies:
-    object-visit: ^1.0.0
-  checksum: c27045a5021c344fc19b9132eb30313e441863b2951029f8f8b66f79d3d8c1e7e5091578075a996f74e417479506fe9ede28c44ca7bc351a61c9d8073daec36a
-  languageName: node
-  linkType: hard
-
-"markdown-it-terminal@npm:0.2.1":
-  version: 0.2.1
-  resolution: "markdown-it-terminal@npm:0.2.1"
-  dependencies:
-    ansi-styles: ^3.0.0
-    cardinal: ^1.0.0
-    cli-table: ^0.3.1
-    lodash.merge: ^4.6.2
-    markdown-it: ^8.3.1
-  checksum: ecd8ebc2b0558070ce1c5943a131aaabc627689cf916227148b1acce5eb97e3cccd30d90b319fd8d7d9cfe2f7d4bf01dd09811402c9e2212b9903eb73a86da61
-  languageName: node
-  linkType: hard
-
-"markdown-it@npm:^12.2.0":
-  version: 12.3.2
-  resolution: "markdown-it@npm:12.3.2"
-  dependencies:
-    argparse: ^2.0.1
-    entities: ~2.1.0
-    linkify-it: ^3.0.1
-    mdurl: ^1.0.1
-    uc.micro: ^1.0.5
-  bin:
-    markdown-it: bin/markdown-it.js
-  checksum: 890555711c1c00fa03b936ca2b213001a3b9b37dea140d8445ae4130ce16628392aad24b12e2a0a9935336ca5951f2957a38f4e5309a2e38eab44e25ff32a41e
-  languageName: node
-  linkType: hard
-
-"markdown-it@npm:^8.3.1":
-  version: 8.4.2
-  resolution: "markdown-it@npm:8.4.2"
-  dependencies:
-    argparse: ^1.0.7
-    entities: ~1.1.1
-    linkify-it: ^2.0.0
-    mdurl: ^1.0.1
-    uc.micro: ^1.0.5
-  bin:
-    markdown-it: bin/markdown-it.js
-  checksum: ad171466933d6ce33fcdddf32f641fc7ff238820a11397f07d45ab293e3fd6d83de14eaa59bfdc67dc4a715e73aa08bae9b2a38e44b119d7340d8ae691ca4b2d
-  languageName: node
-  linkType: hard
-
-"markdown-table@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "markdown-table@npm:2.0.0"
-  dependencies:
-    repeat-string: ^1.0.0
-  checksum: 9bb634a9300016cbb41216c1eab44c74b6b7083ac07872e296f900a29449cf0e260ece03fa10c3e9784ab94c61664d1d147da0315f95e1336e2bdcc025615c90
-  languageName: node
-  linkType: hard
-
-"matcher-collection@npm:^1.0.0, matcher-collection@npm:^1.0.4, matcher-collection@npm:^1.1.1":
-  version: 1.1.2
-  resolution: "matcher-collection@npm:1.1.2"
-  dependencies:
-    minimatch: ^3.0.2
-  checksum: 9aaf90944fa185187a099000b5df9542b85c4fd330c66f1747578c945b78242376066d1a1bc74fcd6d48375ab11dd2dbb5619c6f1c00e7720cf1f4f5df9d291b
-  languageName: node
-  linkType: hard
-
-"matcher-collection@npm:^2.0.0, matcher-collection@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "matcher-collection@npm:2.0.1"
-  dependencies:
-    "@types/minimatch": ^3.0.3
-    minimatch: ^3.0.2
-  checksum: f6d4f94bdcf773f9cbd4b7b10199a7632c434833a4c01bfb29c373e118647bb3b748aa3f20c70d6c3a715915fcc44ad4a77a9f8d5f059f3a0d15c984c0acc83d
-  languageName: node
-  linkType: hard
-
-"md5.js@npm:^1.3.4":
-  version: 1.3.5
-  resolution: "md5.js@npm:1.3.5"
-  dependencies:
-    hash-base: ^3.0.0
-    inherits: ^2.0.1
-    safe-buffer: ^5.1.2
-  checksum: 098494d885684bcc4f92294b18ba61b7bd353c23147fbc4688c75b45cb8590f5a95fd4584d742415dcc52487f7a1ef6ea611cfa1543b0dc4492fe026357f3f0c
-  languageName: node
-  linkType: hard
-
-"mdast-util-find-and-replace@npm:^1.1.0":
-  version: 1.1.1
-  resolution: "mdast-util-find-and-replace@npm:1.1.1"
-  dependencies:
-    escape-string-regexp: ^4.0.0
-    unist-util-is: ^4.0.0
-    unist-util-visit-parents: ^3.0.0
-  checksum: e4c9e50d9bce5ae4c728a925bd60080b94d16aaa312c27e2b70b16ddc29a5d0a0844d6e18efaef08aeb22c68303ec528f20183d1b0420504a0c2c1710cebd76f
-  languageName: node
-  linkType: hard
-
-"mdast-util-footnote@npm:^0.1.0":
-  version: 0.1.7
-  resolution: "mdast-util-footnote@npm:0.1.7"
-  dependencies:
-    mdast-util-to-markdown: ^0.6.0
-    micromark: ~2.11.0
-  checksum: 6d05396a9497c289fecf844d68d3210968750b215cf1df3fd1962c77d73560d8598cc4d79cef36a750d5b43f30b71fec079e0563f267b65072cfc38548d39eda
-  languageName: node
-  linkType: hard
-
-"mdast-util-from-markdown@npm:^0.8.0":
-  version: 0.8.5
-  resolution: "mdast-util-from-markdown@npm:0.8.5"
-  dependencies:
-    "@types/mdast": ^3.0.0
-    mdast-util-to-string: ^2.0.0
-    micromark: ~2.11.0
-    parse-entities: ^2.0.0
-    unist-util-stringify-position: ^2.0.0
-  checksum: 5a9d0d753a42db763761e874c22365d0c7c9934a5a18b5ff76a0643610108a208a041ffdb2f3d3dd1863d3d915225a4020a0aade282af0facfd0df110601eee6
-  languageName: node
-  linkType: hard
-
-"mdast-util-frontmatter@npm:^0.2.0":
-  version: 0.2.0
-  resolution: "mdast-util-frontmatter@npm:0.2.0"
-  dependencies:
-    micromark-extension-frontmatter: ^0.2.0
-  checksum: 6dbed31233b34b41dd09da4756bbe3bd674fa3033c58f771f419e56675b8c7a601a18838d027fdb9cbef3b958346c661f7926ca401e154e63c071ecb2a3596a2
-  languageName: node
-  linkType: hard
-
-"mdast-util-gfm-autolink-literal@npm:^0.1.0":
-  version: 0.1.3
-  resolution: "mdast-util-gfm-autolink-literal@npm:0.1.3"
-  dependencies:
-    ccount: ^1.0.0
-    mdast-util-find-and-replace: ^1.1.0
-    micromark: ^2.11.3
-  checksum: 9f7b888678631fd8c0a522b0689a750aead2b05d57361dbdf02c10381557f1ce874f746226141f3ace1e0e7952495e8d5ce8f9af423a7a66bb300d4635a918eb
-  languageName: node
-  linkType: hard
-
-"mdast-util-gfm-strikethrough@npm:^0.2.0":
-  version: 0.2.3
-  resolution: "mdast-util-gfm-strikethrough@npm:0.2.3"
-  dependencies:
-    mdast-util-to-markdown: ^0.6.0
-  checksum: 51aa11ca8f1a5745f1eb9ccddb0eca797b3ede6f0c7bf355d594ad57c02c98d95260f00b1c4b07504018e0b22708531eabb76037841f09ce8465444706a06522
-  languageName: node
-  linkType: hard
-
-"mdast-util-gfm-table@npm:^0.1.0":
-  version: 0.1.6
-  resolution: "mdast-util-gfm-table@npm:0.1.6"
-  dependencies:
-    markdown-table: ^2.0.0
-    mdast-util-to-markdown: ~0.6.0
-  checksum: eeb43faf833753315b4ccf8d7bc8a6845b31562b2d2dd12a92aa40f9cee1b1954643c7515399a98f9b2e143c95cf6b5c0aac5941a4f609d6a57335587cee99ac
-  languageName: node
-  linkType: hard
-
-"mdast-util-gfm-task-list-item@npm:^0.1.0":
-  version: 0.1.6
-  resolution: "mdast-util-gfm-task-list-item@npm:0.1.6"
-  dependencies:
-    mdast-util-to-markdown: ~0.6.0
-  checksum: c10480c0ae86547980b38b49fba2ecd36a50bf1f3478d3f12810a0d8e8f821585c2bd7d805dd735518e84493b5eef314afdb8d59807021e2d9aa22d077eb7588
-  languageName: node
-  linkType: hard
-
-"mdast-util-gfm@npm:^0.1.0":
-  version: 0.1.2
-  resolution: "mdast-util-gfm@npm:0.1.2"
-  dependencies:
-    mdast-util-gfm-autolink-literal: ^0.1.0
-    mdast-util-gfm-strikethrough: ^0.2.0
-    mdast-util-gfm-table: ^0.1.0
-    mdast-util-gfm-task-list-item: ^0.1.0
-    mdast-util-to-markdown: ^0.6.1
-  checksum: 368ed535b2c2e0f33d0225a9e9c985468bf4825a06896815369aea585f6defaccb555ac40ba911e02c8e8c47e79f7efb4348de532de50bca2638a1e568f2d3c9
-  languageName: node
-  linkType: hard
-
-"mdast-util-to-markdown@npm:^0.6.0, mdast-util-to-markdown@npm:^0.6.1, mdast-util-to-markdown@npm:~0.6.0":
-  version: 0.6.5
-  resolution: "mdast-util-to-markdown@npm:0.6.5"
-  dependencies:
-    "@types/unist": ^2.0.0
-    longest-streak: ^2.0.0
-    mdast-util-to-string: ^2.0.0
-    parse-entities: ^2.0.0
-    repeat-string: ^1.0.0
-    zwitch: ^1.0.0
-  checksum: 7ebc47533bff6e8669f85ae124dc521ea570e9df41c0d9e4f0f43c19ef4a8c9928d741f3e4afa62fcca1927479b714582ff5fd684ef240d84ee5b75ab9d863cf
-  languageName: node
-  linkType: hard
-
-"mdast-util-to-string@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "mdast-util-to-string@npm:2.0.0"
-  checksum: 0b2113ada10e002fbccb014170506dabe2f2ddacaacbe4bc1045c33f986652c5a162732a2c057c5335cdb58419e2ad23e368e5be226855d4d4e280b81c4e9ec2
-  languageName: node
-  linkType: hard
-
-"mdn-data@npm:2.0.27":
-  version: 2.0.27
-  resolution: "mdn-data@npm:2.0.27"
-  checksum: df94012b7b50d5ac7b862dd603c0cd2712c47e5a7b8a1d914054989d6d798320459319dd99d17ba6d0ff39a9fb50b117c9e8bf88a767635849719ff44912614e
-  languageName: node
-  linkType: hard
-
-"mdn-data@npm:2.0.4":
-  version: 2.0.4
-  resolution: "mdn-data@npm:2.0.4"
-  checksum: add3c95e6d03d301b8a8bcfee3de33f4d07e4c5eee5b79f18d6d737de717e22472deadf67c1a8563983c0b603e10d7df40aa8e5fddf18884dfe118ccec7ae329
-  languageName: node
-  linkType: hard
-
-"mdn-data@npm:~1.1.0":
-  version: 1.1.4
-  resolution: "mdn-data@npm:1.1.4"
-  checksum: 146dbea4c8bd68547f6ffec22868f099f82cead2a7a55eb70f80cf1a4958e3504c2d9bf17f3f0675f76f2b5a396b4ef2a5e9998af6c070625e9650771101c139
-  languageName: node
-  linkType: hard
-
-"mdurl@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "mdurl@npm:1.0.1"
-  checksum: 71731ecba943926bfbf9f9b51e28b5945f9411c4eda80894221b47cc105afa43ba2da820732b436f0798fd3edbbffcd1fc1415843c41a87fea08a41cc1e3d02b
-  languageName: node
-  linkType: hard
-
-"media-typer@npm:0.3.0":
-  version: 0.3.0
-  resolution: "media-typer@npm:0.3.0"
-  checksum: af1b38516c28ec95d6b0826f6c8f276c58aec391f76be42aa07646b4e39d317723e869700933ca6995b056db4b09a78c92d5440dc23657e6764be5d28874bba1
-  languageName: node
-  linkType: hard
-
-"memory-fs@npm:^0.4.1":
-  version: 0.4.1
-  resolution: "memory-fs@npm:0.4.1"
-  dependencies:
-    errno: ^0.1.3
-    readable-stream: ^2.0.1
-  checksum: 6db6c8682eff836664ca9b5b6052ae38d21713dda9d0ef4700fa5c0599a8bc16b2093bee75ac3dedbe59fb2222d368f25bafaa62ba143c41051359cbcb005044
-  languageName: node
-  linkType: hard
-
-"memory-fs@npm:^0.5.0":
-  version: 0.5.0
-  resolution: "memory-fs@npm:0.5.0"
-  dependencies:
-    errno: ^0.1.3
-    readable-stream: ^2.0.1
-  checksum: a9f25b0a8ecfb7324277393f19ef68e6ba53b9e6e4b526bbf2ba23055c5440fbf61acc7bf66bfd980e9eb4951a4790f6f777a9a3abd36603f22c87e8a64d3d6b
-  languageName: node
-  linkType: hard
-
-"memory-streams@npm:^0.1.3":
-  version: 0.1.3
-  resolution: "memory-streams@npm:0.1.3"
-  dependencies:
-    readable-stream: ~1.0.2
-  checksum: aebb6dc54c35ff8e7fcbbffc736ae95938d9bb7ed66735b693ed18743fcc6268f64eaa80b2580a49c3c73ddc00cd880d5847f318997affe6d2a46b75365715f8
-  languageName: node
-  linkType: hard
-
-"memorystream@npm:^0.3.1":
-  version: 0.3.1
-  resolution: "memorystream@npm:0.3.1"
-  checksum: f18b42440d24d09516d01466c06adf797df7873f0d40aa7db02e5fb9ed83074e5e65412d0720901d7069363465f82dc4f8bcb44f0cde271567a61426ce6ca2e9
-  languageName: node
-  linkType: hard
-
-"merge-descriptors@npm:1.0.1":
-  version: 1.0.1
-  resolution: "merge-descriptors@npm:1.0.1"
-  checksum: 5abc259d2ae25bb06d19ce2b94a21632583c74e2a9109ee1ba7fd147aa7362b380d971e0251069f8b3eb7d48c21ac839e21fa177b335e82c76ec172e30c31a26
-  languageName: node
-  linkType: hard
-
-"merge-stream@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "merge-stream@npm:2.0.0"
-  checksum: 6fa4dcc8d86629705cea944a4b88ef4cb0e07656ebf223fa287443256414283dd25d91c1cd84c77987f2aec5927af1a9db6085757cb43d90eb170ebf4b47f4f4
-  languageName: node
-  linkType: hard
-
-"merge-trees@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "merge-trees@npm:1.0.1"
-  dependencies:
-    can-symlink: ^1.0.0
-    fs-tree-diff: ^0.5.4
-    heimdalljs: ^0.2.1
-    heimdalljs-logger: ^0.1.7
-    rimraf: ^2.4.3
-    symlink-or-copy: ^1.0.0
-  checksum: d32b06a9b18ab6963718c99b38fbe010e91f54a16f6f5555b32d48be0938c7f33ea81b8f0411846c43e6a5cfdbbf9aa2817fccc0186c2aa071944fe76bdc0372
-  languageName: node
-  linkType: hard
-
-"merge-trees@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "merge-trees@npm:2.0.0"
-  dependencies:
-    fs-updater: ^1.0.4
-    heimdalljs: ^0.2.5
-  checksum: 8e315ac6838192a7e61fecd003cca465b135b60d9d74e37501eef01e29a6f403850359b28a7b8696f369127caf28a5ff6d22493f11dc9cf5f7bbdfa11836cd7e
-  languageName: node
-  linkType: hard
-
-"merge2@npm:^1.2.3, merge2@npm:^1.3.0, merge2@npm:^1.4.1":
-  version: 1.4.1
-  resolution: "merge2@npm:1.4.1"
-  checksum: 7268db63ed5169466540b6fb947aec313200bcf6d40c5ab722c22e242f651994619bcd85601602972d3c85bd2cc45a358a4c61937e9f11a061919a1da569b0c2
-  languageName: node
-  linkType: hard
-
-"methods@npm:~1.1.2":
-  version: 1.1.2
-  resolution: "methods@npm:1.1.2"
-  checksum: 0917ff4041fa8e2f2fda5425a955fe16ca411591fbd123c0d722fcf02b73971ed6f764d85f0a6f547ce49ee0221ce2c19a5fa692157931cecb422984f1dcd13a
-  languageName: node
-  linkType: hard
-
-"micromark-extension-footnote@npm:^0.3.0":
-  version: 0.3.2
-  resolution: "micromark-extension-footnote@npm:0.3.2"
-  dependencies:
-    micromark: ~2.11.0
-  checksum: 476c7f7ae86d7b3c33a07cbf7286d2cce06aa9b348eed79867fd6abc98c37519464c335c522e85208c99e573c1abbbcb72a0a27897f2a0b505d993c76df7bd1d
-  languageName: node
-  linkType: hard
-
-"micromark-extension-frontmatter@npm:^0.2.0":
-  version: 0.2.2
-  resolution: "micromark-extension-frontmatter@npm:0.2.2"
-  dependencies:
-    fault: ^1.0.0
-  checksum: b591494c2910162a47b4413b43d80b1e3f148c0d92955576737ff36525f34deb6cc784cdbede76c4ce6a9d06c75586c7198ffb84f97efee894cafabcc86716e4
-  languageName: node
-  linkType: hard
-
-"micromark-extension-gfm-autolink-literal@npm:~0.5.0":
-  version: 0.5.7
-  resolution: "micromark-extension-gfm-autolink-literal@npm:0.5.7"
-  dependencies:
-    micromark: ~2.11.3
-  checksum: 319ec793c2e374e4cc0cbbb07326c1affb78819e507c7c1577f9d14b972852a6bb55e664332ec51f7cca24bdddd43429c5dd55f11e9200b1a00bab1bf494fb2d
-  languageName: node
-  linkType: hard
-
-"micromark-extension-gfm-strikethrough@npm:~0.6.5":
-  version: 0.6.5
-  resolution: "micromark-extension-gfm-strikethrough@npm:0.6.5"
-  dependencies:
-    micromark: ~2.11.0
-  checksum: 67711633590d3e688759a46aaed9f9d04bcaf29b6615eec17af082eabe1059fbca4beb41ba13db418ae7be3ac90198742fbabe519a70f9b6bb615598c5d6ef1a
-  languageName: node
-  linkType: hard
-
-"micromark-extension-gfm-table@npm:~0.4.0":
-  version: 0.4.3
-  resolution: "micromark-extension-gfm-table@npm:0.4.3"
-  dependencies:
-    micromark: ~2.11.0
-  checksum: 12c78de985944dd66aae409871c45d801cc65704f55ea5cc8afac422042c6d3b5e777b154c079ae81298b30b83434b257b54981bda51c220a102042dd2524a63
-  languageName: node
-  linkType: hard
-
-"micromark-extension-gfm-tagfilter@npm:~0.3.0":
-  version: 0.3.0
-  resolution: "micromark-extension-gfm-tagfilter@npm:0.3.0"
-  checksum: 9369736a203836b2933dfdeacab863e7a4976139b9dd46fa5bd6c2feeef50c7dbbcdd641ae95f0481f577d8aa22396bfa7ed9c38515647d4cf3f2c727cc094a3
-  languageName: node
-  linkType: hard
-
-"micromark-extension-gfm-task-list-item@npm:~0.3.0":
-  version: 0.3.3
-  resolution: "micromark-extension-gfm-task-list-item@npm:0.3.3"
-  dependencies:
-    micromark: ~2.11.0
-  checksum: e4ccbe6b440234c8ee05d89315e1204c78773724241af31ac328194470a8a61bc6606eab3ce2d9a83da4401b06e07936038654493da715d40522133d1556dda4
-  languageName: node
-  linkType: hard
-
-"micromark-extension-gfm@npm:^0.3.0":
-  version: 0.3.3
-  resolution: "micromark-extension-gfm@npm:0.3.3"
-  dependencies:
-    micromark: ~2.11.0
-    micromark-extension-gfm-autolink-literal: ~0.5.0
-    micromark-extension-gfm-strikethrough: ~0.6.5
-    micromark-extension-gfm-table: ~0.4.0
-    micromark-extension-gfm-tagfilter: ~0.3.0
-    micromark-extension-gfm-task-list-item: ~0.3.0
-  checksum: 7957a1afd8c92daa0fc165342902729334b22d59feacd85b20a0d9cc453c90bbdd5b5ba85a3d177c01802060aeb3326daf05d3e6d95932fcbc8371827c98336e
-  languageName: node
-  linkType: hard
-
-"micromark@npm:^2.11.3, micromark@npm:~2.11.0, micromark@npm:~2.11.3":
-  version: 2.11.4
-  resolution: "micromark@npm:2.11.4"
-  dependencies:
-    debug: ^4.0.0
-    parse-entities: ^2.0.0
-  checksum: f8a5477d394908a5d770227aea71657a76423d420227c67ea0699e659a5f62eb39d504c1f7d69ec525a6af5aaeb6a7bffcdba95614968c03d41d3851edecb0d6
-  languageName: node
-  linkType: hard
-
-"micromatch@npm:^3.0.4, micromatch@npm:^3.1.10, micromatch@npm:^3.1.4":
-  version: 3.1.10
-  resolution: "micromatch@npm:3.1.10"
-  dependencies:
-    arr-diff: ^4.0.0
-    array-unique: ^0.3.2
-    braces: ^2.3.1
-    define-property: ^2.0.2
-    extend-shallow: ^3.0.2
-    extglob: ^2.0.4
-    fragment-cache: ^0.2.1
-    kind-of: ^6.0.2
-    nanomatch: ^1.2.9
-    object.pick: ^1.3.0
-    regex-not: ^1.0.0
-    snapdragon: ^0.8.1
-    to-regex: ^3.0.2
-  checksum: ad226cba4daa95b4eaf47b2ca331c8d2e038d7b41ae7ed0697cde27f3f1d6142881ab03d4da51b65d9d315eceb5e4cdddb3fbb55f5f72cfa19cf3ea469d054dc
-  languageName: node
-  linkType: hard
-
-"micromatch@npm:^4.0.2, micromatch@npm:^4.0.4":
-  version: 4.0.4
-  resolution: "micromatch@npm:4.0.4"
-  dependencies:
-    braces: ^3.0.1
-    picomatch: ^2.2.3
-  checksum: ef3d1c88e79e0a68b0e94a03137676f3324ac18a908c245a9e5936f838079fcc108ac7170a5fadc265a9c2596963462e402841406bda1a4bb7b68805601d631c
-  languageName: node
-  linkType: hard
-
-"micromatch@npm:^4.0.5":
-  version: 4.0.5
-  resolution: "micromatch@npm:4.0.5"
-  dependencies:
-    braces: ^3.0.2
-    picomatch: ^2.3.1
-  checksum: 02a17b671c06e8fefeeb6ef996119c1e597c942e632a21ef589154f23898c9c6a9858526246abb14f8bca6e77734aa9dcf65476fca47cedfb80d9577d52843fc
-  languageName: node
-  linkType: hard
-
-"miller-rabin@npm:^4.0.0":
-  version: 4.0.1
-  resolution: "miller-rabin@npm:4.0.1"
-  dependencies:
-    bn.js: ^4.0.0
-    brorand: ^1.0.1
-  bin:
-    miller-rabin: bin/miller-rabin
-  checksum: 00cd1ab838ac49b03f236cc32a14d29d7d28637a53096bf5c6246a032a37749c9bd9ce7360cbf55b41b89b7d649824949ff12bc8eee29ac77c6b38eada619ece
-  languageName: node
-  linkType: hard
-
-"mime-db@npm:1.47.0, mime-db@npm:>= 1.43.0 < 2":
-  version: 1.47.0
-  resolution: "mime-db@npm:1.47.0"
-  checksum: 6808235243c39b3142e677af86972cf32de8ebbec81178491475a79aa07caf67646cd9b559972d22c3c372ddca4a093e58bb0ba10376d75a1efbd0e07be82de2
-  languageName: node
-  linkType: hard
-
-"mime-db@npm:1.51.0":
-  version: 1.51.0
-  resolution: "mime-db@npm:1.51.0"
-  checksum: 613b1ac9d6e725cc24444600b124a7f1ce6c60b1baa654f39a3e260d0995a6dffc5693190217e271af7e2a5612dae19f2a73f3e316707d797a7391165f7ef423
-  languageName: node
-  linkType: hard
-
-"mime-db@npm:1.52.0":
-  version: 1.52.0
-  resolution: "mime-db@npm:1.52.0"
-  checksum: 0d99a03585f8b39d68182803b12ac601d9c01abfa28ec56204fa330bc9f3d1c5e14beb049bafadb3dbdf646dfb94b87e24d4ec7b31b7279ef906a8ea9b6a513f
-  languageName: node
-  linkType: hard
-
-"mime-types@npm:^2.1.12, mime-types@npm:^2.1.18, mime-types@npm:^2.1.26, mime-types@npm:~2.1.19, mime-types@npm:~2.1.24":
-  version: 2.1.30
-  resolution: "mime-types@npm:2.1.30"
-  dependencies:
-    mime-db: 1.47.0
-  checksum: 53c36729b1c4f6029fd5957d5859e62eff4b86311a6e1dce87937583dc8971fec9f359ffcff4be93d26bb5ddd03f1b5ffc7626912031ce0a63510d7896521b2e
-  languageName: node
-  linkType: hard
-
-"mime-types@npm:^2.1.19":
-  version: 2.1.34
-  resolution: "mime-types@npm:2.1.34"
-  dependencies:
-    mime-db: 1.51.0
-  checksum: 67013de9e9d6799bde6d669d18785b7e18bcd212e710d3e04a4727f92f67a8ad4e74aee24be28b685adb794944814bde649119b58ee3282ffdbee58f9278d9f3
-  languageName: node
-  linkType: hard
-
-"mime-types@npm:^2.1.27, mime-types@npm:~2.1.34":
-  version: 2.1.35
-  resolution: "mime-types@npm:2.1.35"
-  dependencies:
-    mime-db: 1.52.0
-  checksum: 89a5b7f1def9f3af5dad6496c5ed50191ae4331cc5389d7c521c8ad28d5fdad2d06fd81baf38fed813dc4e46bb55c8145bb0ff406330818c9cf712fb2e9b3836
-  languageName: node
-  linkType: hard
-
-"mime@npm:1.6.0":
-  version: 1.6.0
-  resolution: "mime@npm:1.6.0"
-  bin:
-    mime: cli.js
-  checksum: fef25e39263e6d207580bdc629f8872a3f9772c923c7f8c7e793175cee22777bbe8bba95e5d509a40aaa292d8974514ce634ae35769faa45f22d17edda5e8557
-  languageName: node
-  linkType: hard
-
-"mimic-fn@npm:^1.0.0":
-  version: 1.2.0
-  resolution: "mimic-fn@npm:1.2.0"
-  checksum: 69c08205156a1f4906d9c46f9b4dc08d18a50176352e77fdeb645cedfe9f20c0b19865d465bd2dec27a5c432347f24dc07fc3695e11159d193f892834233e939
-  languageName: node
-  linkType: hard
-
-"mimic-fn@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "mimic-fn@npm:2.1.0"
-  checksum: d2421a3444848ce7f84bd49115ddacff29c15745db73f54041edc906c14b131a38d05298dae3081667627a59b2eb1ca4b436ff2e1b80f69679522410418b478a
-  languageName: node
-  linkType: hard
-
-"mini-css-extract-plugin@npm:^2.5.2":
-  version: 2.6.0
-  resolution: "mini-css-extract-plugin@npm:2.6.0"
-  dependencies:
-    schema-utils: ^4.0.0
-  peerDependencies:
-    webpack: ^5.0.0
-  checksum: ea73bd66558de7a37db094fe68fa130e7a725ab15f880ff8467a75d9c4c2f1576d20720088ea22af9922a94b8600bbfef0c6acaf10d12a32a9bd20a90ba3c35f
-  languageName: node
-  linkType: hard
-
-"minimalistic-assert@npm:^1.0.0, minimalistic-assert@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "minimalistic-assert@npm:1.0.1"
-  checksum: cc7974a9268fbf130fb055aff76700d7e2d8be5f761fb5c60318d0ed010d839ab3661a533ad29a5d37653133385204c503bfac995aaa4236f4e847461ea32ba7
-  languageName: node
-  linkType: hard
-
-"minimalistic-crypto-utils@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "minimalistic-crypto-utils@npm:1.0.1"
-  checksum: 6e8a0422b30039406efd4c440829ea8f988845db02a3299f372fceba56ffa94994a9c0f2fd70c17f9969eedfbd72f34b5070ead9656a34d3f71c0bd72583a0ed
-  languageName: node
-  linkType: hard
-
-"minimatch@npm:^3.0.2":
-  version: 3.0.4
-  resolution: "minimatch@npm:3.0.4"
-  dependencies:
-    brace-expansion: ^1.1.7
-  checksum: 66ac295f8a7b59788000ea3749938b0970344c841750abd96694f80269b926ebcafad3deeb3f1da2522978b119e6ae3a5869b63b13a7859a456b3408bd18a078
-  languageName: node
-  linkType: hard
-
-"minimist@npm:^0.2.1":
-  version: 0.2.4
-  resolution: "minimist@npm:0.2.4"
-  checksum: 52ab5922f5fd4f2d17410619c5e8c2df79327e7d94a59a9d1e7c567c5ef991c5385f7adb5c090d213fe5701e1fa1b6bb3d89a319e3b1b656b5a17308c87e2513
-  languageName: node
-  linkType: hard
-
-"minimist@npm:^1.1.1, minimist@npm:^1.2.0, minimist@npm:^1.2.5, minimist@npm:^1.2.6":
-  version: 1.2.6
-  resolution: "minimist@npm:1.2.6"
-  checksum: d15428cd1e11eb14e1233bcfb88ae07ed7a147de251441d61158619dfb32c4d7e9061d09cab4825fdee18ecd6fce323228c8c47b5ba7cd20af378ca4048fb3fb
-  languageName: node
-  linkType: hard
-
-"minipass-collect@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "minipass-collect@npm:1.0.2"
-  dependencies:
-    minipass: ^3.0.0
-  checksum: 14df761028f3e47293aee72888f2657695ec66bd7d09cae7ad558da30415fdc4752bbfee66287dcc6fd5e6a2fa3466d6c484dc1cbd986525d9393b9523d97f10
-  languageName: node
-  linkType: hard
-
-"minipass-fetch@npm:^2.0.3":
-  version: 2.1.2
-  resolution: "minipass-fetch@npm:2.1.2"
-  dependencies:
-    encoding: ^0.1.13
-    minipass: ^3.1.6
-    minipass-sized: ^1.0.3
-    minizlib: ^2.1.2
-  dependenciesMeta:
-    encoding:
-      optional: true
-  checksum: 3f216be79164e915fc91210cea1850e488793c740534985da017a4cbc7a5ff50506956d0f73bb0cb60e4fe91be08b6b61ef35101706d3ef5da2c8709b5f08f91
-  languageName: node
-  linkType: hard
-
-"minipass-flush@npm:^1.0.5":
-  version: 1.0.5
-  resolution: "minipass-flush@npm:1.0.5"
-  dependencies:
-    minipass: ^3.0.0
-  checksum: 56269a0b22bad756a08a94b1ffc36b7c9c5de0735a4dd1ab2b06c066d795cfd1f0ac44a0fcae13eece5589b908ecddc867f04c745c7009be0b566421ea0944cf
-  languageName: node
-  linkType: hard
-
-"minipass-pipeline@npm:^1.2.4":
-  version: 1.2.4
-  resolution: "minipass-pipeline@npm:1.2.4"
-  dependencies:
-    minipass: ^3.0.0
-  checksum: b14240dac0d29823c3d5911c286069e36d0b81173d7bdf07a7e4a91ecdef92cdff4baaf31ea3746f1c61e0957f652e641223970870e2353593f382112257971b
-  languageName: node
-  linkType: hard
-
-"minipass-sized@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "minipass-sized@npm:1.0.3"
-  dependencies:
-    minipass: ^3.0.0
-  checksum: 79076749fcacf21b5d16dd596d32c3b6bf4d6e62abb43868fac21674078505c8b15eaca4e47ed844985a4514854f917d78f588fcd029693709417d8f98b2bd60
-  languageName: node
-  linkType: hard
-
-"minipass@npm:^2.2.0":
-  version: 2.9.0
-  resolution: "minipass@npm:2.9.0"
-  dependencies:
-    safe-buffer: ^5.1.2
-    yallist: ^3.0.0
-  checksum: 077b66f31ba44fd5a0d27d12a9e6a86bff8f97a4978dedb0373167156b5599fadb6920fdde0d9f803374164d810e05e8462ce28e86abbf7f0bea293a93711fc6
-  languageName: node
-  linkType: hard
-
-"minipass@npm:^3.0.0, minipass@npm:^3.1.1, minipass@npm:^3.1.6":
-  version: 3.3.6
-  resolution: "minipass@npm:3.3.6"
-  dependencies:
-    yallist: ^4.0.0
-  checksum: a30d083c8054cee83cdcdc97f97e4641a3f58ae743970457b1489ce38ee1167b3aaf7d815cd39ec7a99b9c40397fd4f686e83750e73e652b21cb516f6d845e48
-  languageName: node
-  linkType: hard
-
-"minipass@npm:^4.0.0":
-  version: 4.2.8
-  resolution: "minipass@npm:4.2.8"
-  checksum: 7f4914d5295a9a30807cae5227a37a926e6d910c03f315930fde52332cf0575dfbc20295318f91f0baf0e6bb11a6f668e30cde8027dea7a11b9d159867a3c830
-  languageName: node
-  linkType: hard
-
-"minizlib@npm:^2.1.1, minizlib@npm:^2.1.2":
-  version: 2.1.2
-  resolution: "minizlib@npm:2.1.2"
-  dependencies:
-    minipass: ^3.0.0
-    yallist: ^4.0.0
-  checksum: f1fdeac0b07cf8f30fcf12f4b586795b97be856edea22b5e9072707be51fc95d41487faec3f265b42973a304fe3a64acd91a44a3826a963e37b37bafde0212c3
-  languageName: node
-  linkType: hard
-
-"miragejs@npm:^0.1.43":
-  version: 0.1.43
-  resolution: "miragejs@npm:0.1.43"
-  dependencies:
-    "@miragejs/pretender-node-polyfill": ^0.1.0
-    inflected: ^2.0.4
-    lodash.assign: ^4.2.0
-    lodash.camelcase: ^4.3.0
-    lodash.clonedeep: ^4.5.0
-    lodash.compact: ^3.0.1
-    lodash.find: ^4.6.0
-    lodash.flatten: ^4.4.0
-    lodash.forin: ^4.4.0
-    lodash.get: ^4.4.2
-    lodash.has: ^4.5.2
-    lodash.invokemap: ^4.6.0
-    lodash.isempty: ^4.4.0
-    lodash.isequal: ^4.5.0
-    lodash.isfunction: ^3.0.9
-    lodash.isinteger: ^4.0.4
-    lodash.isplainobject: ^4.0.6
-    lodash.lowerfirst: ^4.3.1
-    lodash.map: ^4.6.0
-    lodash.mapvalues: ^4.6.0
-    lodash.pick: ^4.4.0
-    lodash.snakecase: ^4.1.1
-    lodash.uniq: ^4.5.0
-    lodash.uniqby: ^4.7.0
-    lodash.values: ^4.3.0
-    pretender: ^3.4.7
-  checksum: 11da61a83fc816748f635b4a4792a56a82dc6a0b7f5049c5337864948697b76eec421f3ca459fbbd35d8bb8e373e59bff9a773d20ae700977088a1f29857360d
-  languageName: node
-  linkType: hard
-
-"mississippi@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "mississippi@npm:3.0.0"
-  dependencies:
-    concat-stream: ^1.5.0
-    duplexify: ^3.4.2
-    end-of-stream: ^1.1.0
-    flush-write-stream: ^1.0.0
-    from2: ^2.1.0
-    parallel-transform: ^1.1.0
-    pump: ^3.0.0
-    pumpify: ^1.3.3
-    stream-each: ^1.1.0
-    through2: ^2.0.0
-  checksum: 84b3d9889621d293f9a596bafe60df863b330c88fc19215ced8f603c605fc7e1bf06f8e036edf301bd630a03fd5d9d7d23d5d6b9a4802c30ca864d800f0bd9f8
-  languageName: node
-  linkType: hard
-
-"mixin-deep@npm:^1.2.0":
-  version: 1.3.2
-  resolution: "mixin-deep@npm:1.3.2"
-  dependencies:
-    for-in: ^1.0.2
-    is-extendable: ^1.0.1
-  checksum: 820d5a51fcb7479f2926b97f2c3bb223546bc915e6b3a3eb5d906dda871bba569863595424a76682f2b15718252954644f3891437cb7e3f220949bed54b1750d
-  languageName: node
-  linkType: hard
-
-"mkdirp@npm:^0.3.5":
-  version: 0.3.5
-  resolution: "mkdirp@npm:0.3.5"
-  checksum: 5b7db0f7db199b87f5b0e563b919ad214d1a2c55c3896db332ef1e66c2192b2077112a4733b2c6ff99c833a6f85ba5686f05a768c411fe461b667a17421d37a8
-  languageName: node
-  linkType: hard
-
-"mkdirp@npm:^0.5.0, mkdirp@npm:^0.5.1, mkdirp@npm:^0.5.3, mkdirp@npm:^0.5.5, mkdirp@npm:~0.5.1":
-  version: 0.5.5
-  resolution: "mkdirp@npm:0.5.5"
-  dependencies:
-    minimist: ^1.2.5
-  bin:
-    mkdirp: bin/cmd.js
-  checksum: 3bce20ea525f9477befe458ab85284b0b66c8dc3812f94155af07c827175948cdd8114852ac6c6d82009b13c1048c37f6d98743eb019651ee25c39acc8aabe7d
-  languageName: node
-  linkType: hard
-
-"mkdirp@npm:^1.0.3, mkdirp@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "mkdirp@npm:1.0.4"
-  bin:
-    mkdirp: bin/cmd.js
-  checksum: a96865108c6c3b1b8e1d5e9f11843de1e077e57737602de1b82030815f311be11f96f09cce59bd5b903d0b29834733e5313f9301e3ed6d6f6fba2eae0df4298f
-  languageName: node
-  linkType: hard
-
-"mktemp@npm:~0.4.0":
-  version: 0.4.0
-  resolution: "mktemp@npm:0.4.0"
-  checksum: f67d8b1ed599807a4ec154efc6a50d61b28f4183fa740c4fe3bd75ce8442d84a3b8fca382fb3cb4e20bb883cb14478a7fe549c4eab6135cd213163ca5083f0fe
-  languageName: node
-  linkType: hard
-
-"moo@npm:^0.5.1":
-  version: 0.5.2
-  resolution: "moo@npm:0.5.2"
-  checksum: 5a41ddf1059fd0feb674d917c4774e41c877f1ca980253be4d3aae1a37f4bc513f88815041243f36f5cf67a62fb39324f3f997cf7fb17b6cb00767c165e7c499
-  languageName: node
-  linkType: hard
-
-"morgan@npm:^1.10.0":
-  version: 1.10.0
-  resolution: "morgan@npm:1.10.0"
-  dependencies:
-    basic-auth: ~2.0.1
-    debug: 2.6.9
-    depd: ~2.0.0
-    on-finished: ~2.3.0
-    on-headers: ~1.0.2
-  checksum: fb41e226ab5a1abf7e8909e486b387076534716d60207e361acfb5df78b84d703a7b7ea58f3046a9fd0b83d3c94bfabde32323341a1f1b26ce50680abd2ea5dd
-  languageName: node
-  linkType: hard
-
-"mout@npm:^1.0.0":
-  version: 1.2.2
-  resolution: "mout@npm:1.2.2"
-  checksum: e6c4249e9a5e603af8b4ae7172572e266f7cbd2edbf27824e2e06dd288adc66e67170f4a061ecc388429046aa93a7e3946e35139fd0767f76dd10d075fbca74f
-  languageName: node
-  linkType: hard
-
-"move-concurrently@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "move-concurrently@npm:1.0.1"
-  dependencies:
-    aproba: ^1.1.1
-    copy-concurrently: ^1.0.0
-    fs-write-stream-atomic: ^1.0.8
-    mkdirp: ^0.5.1
-    rimraf: ^2.5.4
-    run-queue: ^1.0.3
-  checksum: 4ea3296c150b09e798177847f673eb5783f8ca417ba806668d2c631739f653e1a735f19fb9b6e2f5e25ee2e4c0a6224732237a8e4f84c764e99d7462d258209e
-  languageName: node
-  linkType: hard
-
-"mr-dep-walk@npm:^1.4.0":
-  version: 1.4.0
-  resolution: "mr-dep-walk@npm:1.4.0"
-  dependencies:
-    acorn: ^5.1.1
-    amd-name-resolver: ^0.0.6
-    fs-extra: ^3.0.1
-  checksum: f8146a1a7280ef1b2792efb842846e504303944a3ff82e7fecaefc04aa124834f0e4a596fbad6077de4272c1d6836a4d8d39bf3d46530ae7a7d70fa0baf50f2a
-  languageName: node
-  linkType: hard
-
-"ms@npm:2.0.0":
-  version: 2.0.0
-  resolution: "ms@npm:2.0.0"
-  checksum: 0e6a22b8b746d2e0b65a430519934fefd41b6db0682e3477c10f60c76e947c4c0ad06f63ffdf1d78d335f83edee8c0aa928aa66a36c7cd95b69b26f468d527f4
-  languageName: node
-  linkType: hard
-
-"ms@npm:2.1.1":
-  version: 2.1.1
-  resolution: "ms@npm:2.1.1"
-  checksum: 0078a23cd916a9a7435c413caa14c57d4b4f6e2470e0ab554b6964163c8a4436448ac7ae020e883685475da6b6796cc396b670f579cb275db288a21e3e57721e
-  languageName: node
-  linkType: hard
-
-"ms@npm:2.1.2":
-  version: 2.1.2
-  resolution: "ms@npm:2.1.2"
-  checksum: 673cdb2c3133eb050c745908d8ce632ed2c02d85640e2edb3ace856a2266a813b30c613569bf3354fdf4ea7d1a1494add3bfa95e2713baa27d0c2c71fc44f58f
-  languageName: node
-  linkType: hard
-
-"ms@npm:2.1.3, ms@npm:^2.0.0, ms@npm:^2.1.1":
-  version: 2.1.3
-  resolution: "ms@npm:2.1.3"
-  checksum: aa92de608021b242401676e35cfa5aa42dd70cbdc082b916da7fb925c542173e36bce97ea3e804923fe92c0ad991434e4a38327e15a1b5b5f945d66df615ae6d
-  languageName: node
-  linkType: hard
-
-"mustache@npm:^4.2.0":
-  version: 4.2.0
-  resolution: "mustache@npm:4.2.0"
-  bin:
-    mustache: bin/mustache
-  checksum: 928fcb63e3aa44a562bfe9b59ba202cccbe40a46da50be6f0dd831b495be1dd7e38ca4657f0ecab2c1a89dc7bccba0885eab7ee7c1b215830da765758c7e0506
-  languageName: node
-  linkType: hard
-
-"mute-stream@npm:0.0.7":
-  version: 0.0.7
-  resolution: "mute-stream@npm:0.0.7"
-  checksum: a9d4772c1c84206aa37c218ed4751cd060239bf1d678893124f51e037f6f22f4a159b2918c030236c93252638a74beb29c9b1fd3267c9f24d4b3253cf1eaa86f
-  languageName: node
-  linkType: hard
-
-"mute-stream@npm:0.0.8":
-  version: 0.0.8
-  resolution: "mute-stream@npm:0.0.8"
-  checksum: ff48d251fc3f827e5b1206cda0ffdaec885e56057ee86a3155e1951bc940fd5f33531774b1cc8414d7668c10a8907f863f6561875ee6e8768931a62121a531a1
-  languageName: node
-  linkType: hard
-
-"nan@npm:^2.12.1":
-  version: 2.14.2
-  resolution: "nan@npm:2.14.2"
-  dependencies:
-    node-gyp: latest
-  checksum: 7a269139b66a7d37470effb7fb36a8de8cc3b5ffba6e40bb8e0545307911fe5ebf94797ec62f655ecde79c237d169899f8bd28256c66a32cbc8284faaf94c3f4
-  languageName: node
-  linkType: hard
-
-"nanoid@npm:^3.3.4":
-  version: 3.3.4
-  resolution: "nanoid@npm:3.3.4"
-  bin:
-    nanoid: bin/nanoid.cjs
-  checksum: 2fddd6dee994b7676f008d3ffa4ab16035a754f4bb586c61df5a22cf8c8c94017aadd360368f47d653829e0569a92b129979152ff97af23a558331e47e37cd9c
-  languageName: node
-  linkType: hard
-
-"nanomatch@npm:^1.2.9":
-  version: 1.2.13
-  resolution: "nanomatch@npm:1.2.13"
-  dependencies:
-    arr-diff: ^4.0.0
-    array-unique: ^0.3.2
-    define-property: ^2.0.2
-    extend-shallow: ^3.0.2
-    fragment-cache: ^0.2.1
-    is-windows: ^1.0.2
-    kind-of: ^6.0.2
-    object.pick: ^1.3.0
-    regex-not: ^1.0.0
-    snapdragon: ^0.8.1
-    to-regex: ^3.0.1
-  checksum: 54d4166d6ef08db41252eb4e96d4109ebcb8029f0374f9db873bd91a1f896c32ec780d2a2ea65c0b2d7caf1f28d5e1ea33746a470f32146ac8bba821d80d38d8
-  languageName: node
-  linkType: hard
-
-"natural-compare-lite@npm:^1.4.0":
-  version: 1.4.0
-  resolution: "natural-compare-lite@npm:1.4.0"
-  checksum: 5222ac3986a2b78dd6069ac62cbb52a7bf8ffc90d972ab76dfe7b01892485d229530ed20d0c62e79a6b363a663b273db3bde195a1358ce9e5f779d4453887225
-  languageName: node
-  linkType: hard
-
-"natural-compare@npm:^1.4.0":
-  version: 1.4.0
-  resolution: "natural-compare@npm:1.4.0"
-  checksum: 23ad088b08f898fc9b53011d7bb78ec48e79de7627e01ab5518e806033861bef68d5b0cd0e2205c2f36690ac9571ff6bcb05eb777ced2eeda8d4ac5b44592c3d
-  languageName: node
-  linkType: hard
-
-"negotiator@npm:0.6.2":
-  version: 0.6.2
-  resolution: "negotiator@npm:0.6.2"
-  checksum: dfddaff6c06792f1c4c3809e29a427b8daef8cd437c83b08dd51d7ee11bbd1c29d9512d66b801144d6c98e910ffd8723f2432e0cbf8b18d41d2a09599c975ab3
-  languageName: node
-  linkType: hard
-
-"negotiator@npm:0.6.3, negotiator@npm:^0.6.3":
-  version: 0.6.3
-  resolution: "negotiator@npm:0.6.3"
-  checksum: b8ffeb1e262eff7968fc90a2b6767b04cfd9842582a9d0ece0af7049537266e7b2506dfb1d107a32f06dd849ab2aea834d5830f7f4d0e5cb7d36e1ae55d021d9
-  languageName: node
-  linkType: hard
-
-"neo-async@npm:^2.5.0, neo-async@npm:^2.6.0, neo-async@npm:^2.6.1, neo-async@npm:^2.6.2":
-  version: 2.6.2
-  resolution: "neo-async@npm:2.6.2"
-  checksum: deac9f8d00eda7b2e5cd1b2549e26e10a0faa70adaa6fdadca701cc55f49ee9018e427f424bac0c790b7c7e2d3068db97f3093f1093975f2acb8f8818b936ed9
-  languageName: node
-  linkType: hard
-
-"nice-try@npm:^1.0.4":
-  version: 1.0.5
-  resolution: "nice-try@npm:1.0.5"
-  checksum: 0b4af3b5bb5d86c289f7a026303d192a7eb4417231fe47245c460baeabae7277bcd8fd9c728fb6bd62c30b3e15cd6620373e2cf33353b095d8b403d3e8a15aff
-  languageName: node
-  linkType: hard
-
-"nise@npm:^1.5.2":
-  version: 1.5.3
-  resolution: "nise@npm:1.5.3"
-  dependencies:
-    "@sinonjs/formatio": ^3.2.1
-    "@sinonjs/text-encoding": ^0.7.1
-    just-extend: ^4.0.2
-    lolex: ^5.0.1
-    path-to-regexp: ^1.7.0
-  checksum: ec3af21345dcaf34650a6f5420a11e0fd21a836ac5960f5e8523c301ee98465abf88b958f7b3084ecc6e0a7133e5cf7963f4df176b90b423c4da4984f1ebd75e
-  languageName: node
-  linkType: hard
-
-"no-case@npm:^3.0.4":
-  version: 3.0.4
-  resolution: "no-case@npm:3.0.4"
-  dependencies:
-    lower-case: ^2.0.2
-    tslib: ^2.0.3
-  checksum: 0b2ebc113dfcf737d48dde49cfebf3ad2d82a8c3188e7100c6f375e30eafbef9e9124aadc3becef237b042fd5eb0aad2fd78669c20972d045bbe7fea8ba0be5c
-  languageName: node
-  linkType: hard
-
-"node-fetch@npm:^2.6.0":
-  version: 2.6.6
-  resolution: "node-fetch@npm:2.6.6"
-  dependencies:
-    whatwg-url: ^5.0.0
-  checksum: ee8290626bdb73629c59722b75dcf4b9b6a67c1ed7eb9102e368479c4a13b56a48c2bb3ad71571e378e98c8b2c64c820e11f9cd39e4b8557dd138ad571ef9a42
-  languageName: node
-  linkType: hard
-
-"node-fetch@npm:^2.6.1":
-  version: 2.6.1
-  resolution: "node-fetch@npm:2.6.1"
-  checksum: 91075bedd57879117e310fbcc36983ad5d699e522edb1ebcdc4ee5294c982843982652925c3532729fdc86b2d64a8a827797a745f332040d91823c8752ee4d7c
-  languageName: node
-  linkType: hard
-
-"node-gyp@npm:latest":
-  version: 9.3.1
-  resolution: "node-gyp@npm:9.3.1"
-  dependencies:
-    env-paths: ^2.2.0
-    glob: ^7.1.4
-    graceful-fs: ^4.2.6
-    make-fetch-happen: ^10.0.3
-    nopt: ^6.0.0
-    npmlog: ^6.0.0
-    rimraf: ^3.0.2
-    semver: ^7.3.5
-    tar: ^6.1.2
-    which: ^2.0.2
-  bin:
-    node-gyp: bin/node-gyp.js
-  checksum: b860e9976fa645ca0789c69e25387401b4396b93c8375489b5151a6c55cf2640a3b6183c212b38625ef7c508994930b72198338e3d09b9d7ade5acc4aaf51ea7
-  languageName: node
-  linkType: hard
-
-"node-int64@npm:^0.4.0":
-  version: 0.4.0
-  resolution: "node-int64@npm:0.4.0"
-  checksum: d0b30b1ee6d961851c60d5eaa745d30b5c95d94bc0e74b81e5292f7c42a49e3af87f1eb9e89f59456f80645d679202537de751b7d72e9e40ceea40c5e449057e
-  languageName: node
-  linkType: hard
-
-"node-libs-browser@npm:^2.2.1":
-  version: 2.2.1
-  resolution: "node-libs-browser@npm:2.2.1"
-  dependencies:
-    assert: ^1.1.1
-    browserify-zlib: ^0.2.0
-    buffer: ^4.3.0
-    console-browserify: ^1.1.0
-    constants-browserify: ^1.0.0
-    crypto-browserify: ^3.11.0
-    domain-browser: ^1.1.1
-    events: ^3.0.0
-    https-browserify: ^1.0.0
-    os-browserify: ^0.3.0
-    path-browserify: 0.0.1
-    process: ^0.11.10
-    punycode: ^1.2.4
-    querystring-es3: ^0.2.0
-    readable-stream: ^2.3.3
-    stream-browserify: ^2.0.1
-    stream-http: ^2.7.2
-    string_decoder: ^1.0.0
-    timers-browserify: ^2.0.4
-    tty-browserify: 0.0.0
-    url: ^0.11.0
-    util: ^0.11.0
-    vm-browserify: ^1.0.1
-  checksum: 41fa7927378edc0cb98a8cc784d3f4a47e43378d3b42ec57a23f81125baa7287c4b54d6d26d062072226160a3ce4d8b7a62e873d2fb637aceaddf71f5a26eca0
-  languageName: node
-  linkType: hard
-
-"node-modules-path@npm:^1.0.0, node-modules-path@npm:^1.0.1":
-  version: 1.0.2
-  resolution: "node-modules-path@npm:1.0.2"
-  checksum: 1cee65591a65a71e420b72d011e313bd938ffced368c6b6ca2bfd5a741cea9af5200417afb49272bbdac1cee1350c0f56e0a80b611d6694de914959c1ddfc9f3
-  languageName: node
-  linkType: hard
-
-"node-notifier@npm:^8.0.1":
-  version: 8.0.2
-  resolution: "node-notifier@npm:8.0.2"
-  dependencies:
-    growly: ^1.3.0
-    is-wsl: ^2.2.0
-    semver: ^7.3.2
-    shellwords: ^0.1.1
-    uuid: ^8.3.0
-    which: ^2.0.2
-  checksum: 7db1683003f6aaa4324959dfa663cd56e301ccc0165977a9e7737989ffe3b4763297f9fc85f44d0662b63a4fd85516eda43411b492a4d2fae207afb23773f912
-  languageName: node
-  linkType: hard
-
-"node-releases@npm:^1.1.71, node-releases@npm:^1.1.77":
-  version: 1.1.77
-  resolution: "node-releases@npm:1.1.77"
-  checksum: eb2fcb45310e7d77f82bfdadeca546a698d258e011f15d88ad9a452a5e838a672ec532906581096ca19c66284a788330c3b09227ffc540e67228730f41b9c2e2
-  languageName: node
-  linkType: hard
-
-"node-releases@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "node-releases@npm:2.0.1"
-  checksum: b20dd8d4bced11f75060f0387e05e76b9dc4a0451f7bb3516eade6f50499ea7768ba95d8a60d520c193402df1e58cb3fe301510cc1c1ad68949c3d57b5149866
-  languageName: node
-  linkType: hard
-
-"node-releases@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "node-releases@npm:2.0.2"
-  checksum: da858bf86b4d512842379749f5a5e4196ddab05ba18ffcf29f05bf460beceaca927f070f4430bb5046efec18941ddbc85e4c5fdbb83afc28a38dd6069a2f255e
-  languageName: node
-  linkType: hard
-
-"node-releases@npm:^2.0.5":
-  version: 2.0.5
-  resolution: "node-releases@npm:2.0.5"
-  checksum: e85d949addd19f8827f32569d2be5751e7812ccf6cc47879d49f79b5234ff4982225e39a3929315f96370823b070640fb04d79fc0ddec8b515a969a03493a42f
-  languageName: node
-  linkType: hard
-
-"node-watch@npm:0.7.3":
-  version: 0.7.3
-  resolution: "node-watch@npm:0.7.3"
-  checksum: c745482f720613415153b9065383b77d21f2ef60ceabf64f779c1452b1dcbb8d08c71f650b93f3c1d84524371321f92a15fda468745872cacffec8289741d51a
-  languageName: node
-  linkType: hard
-
-"nomnom@npm:^1.5.x":
-  version: 1.8.1
-  resolution: "nomnom@npm:1.8.1"
-  dependencies:
-    chalk: ~0.4.0
-    underscore: ~1.6.0
-  checksum: cc6f538062741e8914b65352499c444a754d18a95f8c4b336b9183367c44335f00a9d3beb54648f6a76d5434702a3d71bf37c23ef4c960d39595ed72d376c6fd
-  languageName: node
-  linkType: hard
-
-"nopt@npm:^3.0.6":
-  version: 3.0.6
-  resolution: "nopt@npm:3.0.6"
-  dependencies:
-    abbrev: 1
-  bin:
-    nopt: ./bin/nopt.js
-  checksum: 7f8579029a0d7cb3341c6b1610b31e363f708b7aaaaf3580e3ec5ae8528d1f3a79d350d8bfa331776e6c6703a5a148b72edd9b9b4c1dd55874d8e70e963d1e20
-  languageName: node
-  linkType: hard
-
-"nopt@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "nopt@npm:6.0.0"
-  dependencies:
-    abbrev: ^1.0.0
-  bin:
-    nopt: bin/nopt.js
-  checksum: 82149371f8be0c4b9ec2f863cc6509a7fd0fa729929c009f3a58e4eb0c9e4cae9920e8f1f8eb46e7d032fec8fb01bede7f0f41a67eb3553b7b8e14fa53de1dac
-  languageName: node
-  linkType: hard
-
-"normalize-package-data@npm:^2.3.2":
-  version: 2.5.0
-  resolution: "normalize-package-data@npm:2.5.0"
-  dependencies:
-    hosted-git-info: ^2.1.4
-    resolve: ^1.10.0
-    semver: 2 || 3 || 4 || 5
-    validate-npm-package-license: ^3.0.1
-  checksum: 7999112efc35a6259bc22db460540cae06564aa65d0271e3bdfa86876d08b0e578b7b5b0028ee61b23f1cae9fc0e7847e4edc0948d3068a39a2a82853efc8499
-  languageName: node
-  linkType: hard
-
-"normalize-path@npm:^2.1.1":
-  version: 2.1.1
-  resolution: "normalize-path@npm:2.1.1"
-  dependencies:
-    remove-trailing-separator: ^1.0.1
-  checksum: 7e9cbdcf7f5b8da7aa191fbfe33daf290cdcd8c038f422faf1b8a83c972bf7a6d94c5be34c4326cb00fb63bc0fd97d9fbcfaf2e5d6142332c2cd36d2e1b86cea
-  languageName: node
-  linkType: hard
-
-"normalize-path@npm:^3.0.0, normalize-path@npm:~3.0.0":
-  version: 3.0.0
-  resolution: "normalize-path@npm:3.0.0"
-  checksum: 88eeb4da891e10b1318c4b2476b6e2ecbeb5ff97d946815ffea7794c31a89017c70d7f34b3c2ebf23ef4e9fc9fb99f7dffe36da22011b5b5c6ffa34f4873ec20
-  languageName: node
-  linkType: hard
-
-"normalize-range@npm:^0.1.2":
-  version: 0.1.2
-  resolution: "normalize-range@npm:0.1.2"
-  checksum: 9b2f14f093593f367a7a0834267c24f3cb3e887a2d9809c77d8a7e5fd08738bcd15af46f0ab01cc3a3d660386f015816b5c922cea8bf2ee79777f40874063184
-  languageName: node
-  linkType: hard
-
-"normalize.css@npm:4.1.1":
-  version: 4.1.1
-  resolution: "normalize.css@npm:4.1.1"
-  checksum: 48500b12c63141286b637a0ed771d23e95872469eb9726171aea4fa90c9e9fe97870ee52c81dc42ef391733423bf0887dc0fdadae0e5f6020b6eb04e60ffcd68
-  languageName: node
-  linkType: hard
-
-"npm-git-info@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "npm-git-info@npm:1.0.3"
-  checksum: 1f2218004e109db649580f023ae2b6eb690efae0e47ec26216a01751325b45788430428b12478d91583e18bd8f4bc933d02a1f42984b8d4977f1c35ddef1bad2
-  languageName: node
-  linkType: hard
-
-"npm-package-arg@npm:^8.1.5":
-  version: 8.1.5
-  resolution: "npm-package-arg@npm:8.1.5"
-  dependencies:
-    hosted-git-info: ^4.0.1
-    semver: ^7.3.4
-    validate-npm-package-name: ^3.0.0
-  checksum: ae76afbcebb4ea8d0b849b8b18ed1b0491030fb04a0af5d75f1b8390cc50bec186ced9fbe60f47d939eab630c7c0db0919d879ac56a87d3782267dfe8eec60d3
-  languageName: node
-  linkType: hard
-
-"npm-run-all@npm:^4.1.5":
-  version: 4.1.5
-  resolution: "npm-run-all@npm:4.1.5"
-  dependencies:
-    ansi-styles: ^3.2.1
-    chalk: ^2.4.1
-    cross-spawn: ^6.0.5
-    memorystream: ^0.3.1
-    minimatch: ^3.0.4
-    pidtree: ^0.3.0
-    read-pkg: ^3.0.0
-    shell-quote: ^1.6.1
-    string.prototype.padend: ^3.0.0
-  bin:
-    npm-run-all: bin/npm-run-all/index.js
-    run-p: bin/run-p/index.js
-    run-s: bin/run-s/index.js
-  checksum: 373b72c6a36564da13c1642c1fd9bb4dcc756bce7a3648f883772f02661095319820834ff813762d2fee403e9b40c1cd27c8685807c107440f10eb19c006d4a0
-  languageName: node
-  linkType: hard
-
-"npm-run-path@npm:^2.0.0":
-  version: 2.0.2
-  resolution: "npm-run-path@npm:2.0.2"
-  dependencies:
-    path-key: ^2.0.0
-  checksum: acd5ad81648ba4588ba5a8effb1d98d2b339d31be16826a118d50f182a134ac523172101b82eab1d01cb4c2ba358e857d54cfafd8163a1ffe7bd52100b741125
-  languageName: node
-  linkType: hard
-
-"npm-run-path@npm:^3.0.0":
-  version: 3.1.0
-  resolution: "npm-run-path@npm:3.1.0"
-  dependencies:
-    path-key: ^3.0.0
-  checksum: 141e0b8f0e3b137347a2896572c9a84701754dda0670d3ceb8c56a87702ee03c26227e4517ab93f2904acfc836547315e740b8289bb24ca0cd8ba2b198043b0f
-  languageName: node
-  linkType: hard
-
-"npm-run-path@npm:^4.0.0, npm-run-path@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "npm-run-path@npm:4.0.1"
-  dependencies:
-    path-key: ^3.0.0
-  checksum: 5374c0cea4b0bbfdfae62da7bbdf1e1558d338335f4cacf2515c282ff358ff27b2ecb91ffa5330a8b14390ac66a1e146e10700440c1ab868208430f56b5f4d23
-  languageName: node
-  linkType: hard
-
-"npmlog@npm:^6.0.0":
-  version: 6.0.2
-  resolution: "npmlog@npm:6.0.2"
-  dependencies:
-    are-we-there-yet: ^3.0.0
-    console-control-strings: ^1.1.0
-    gauge: ^4.0.3
-    set-blocking: ^2.0.0
-  checksum: ae238cd264a1c3f22091cdd9e2b106f684297d3c184f1146984ecbe18aaa86343953f26b9520dedd1b1372bc0316905b736c1932d778dbeb1fcf5a1001390e2a
-  languageName: node
-  linkType: hard
-
-"nth-check@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "nth-check@npm:1.0.2"
-  dependencies:
-    boolbase: ~1.0.0
-  checksum: 59e115fdd75b971d0030f42ada3aac23898d4c03aa13371fa8b3339d23461d1badf3fde5aad251fb956aaa75c0a3b9bfcd07c08a34a83b4f9dadfdce1d19337c
-  languageName: node
-  linkType: hard
-
-"nth-check@npm:^2.0.1":
-  version: 2.1.1
-  resolution: "nth-check@npm:2.1.1"
-  dependencies:
-    boolbase: ^1.0.0
-  checksum: 5afc3dafcd1573b08877ca8e6148c52abd565f1d06b1eb08caf982e3fa289a82f2cae697ffb55b5021e146d60443f1590a5d6b944844e944714a5b549675bcd3
-  languageName: node
-  linkType: hard
-
-"num2fraction@npm:^1.2.2":
-  version: 1.2.2
-  resolution: "num2fraction@npm:1.2.2"
-  checksum: 1da9c6797b505d3f5b17c7f694c4fa31565bdd5c0e5d669553253aed848a580804cd285280e8a73148bd9628839267daee4967f24b53d4e893e44b563e412635
-  languageName: node
-  linkType: hard
-
-"nwsapi@npm:^2.2.0":
-  version: 2.2.0
-  resolution: "nwsapi@npm:2.2.0"
-  checksum: 5ef4a9bc0c1a5b7f2e014aa6a4b359a257503b796618ed1ef0eb852098f77e772305bb0e92856e4bbfa3e6c75da48c0113505c76f144555ff38867229c2400a7
-  languageName: node
-  linkType: hard
-
-"oauth-sign@npm:~0.9.0":
-  version: 0.9.0
-  resolution: "oauth-sign@npm:0.9.0"
-  checksum: 8f5497a127967866a3c67094c21efd295e46013a94e6e828573c62220e9af568cc1d2d04b16865ba583e430510fa168baf821ea78f355146d8ed7e350fc44c64
-  languageName: node
-  linkType: hard
-
-"object-assign@npm:4.1.1, object-assign@npm:^4, object-assign@npm:^4.1.0, object-assign@npm:^4.1.1":
-  version: 4.1.1
-  resolution: "object-assign@npm:4.1.1"
-  checksum: fcc6e4ea8c7fe48abfbb552578b1c53e0d194086e2e6bbbf59e0a536381a292f39943c6e9628af05b5528aa5e3318bb30d6b2e53cadaf5b8fe9e12c4b69af23f
-  languageName: node
-  linkType: hard
-
-"object-assign@npm:^2.0.0":
-  version: 2.1.1
-  resolution: "object-assign@npm:2.1.1"
-  checksum: d37a7d7173408e07ee225116437592d92b584b2a5f38cafe608400b43efd9b78878dbd545b524aff5b4118d88e39466b9038b2d3de8885e212adad497d656c46
-  languageName: node
-  linkType: hard
-
-"object-copy@npm:^0.1.0":
-  version: 0.1.0
-  resolution: "object-copy@npm:0.1.0"
-  dependencies:
-    copy-descriptor: ^0.1.0
-    define-property: ^0.2.5
-    kind-of: ^3.0.3
-  checksum: a9e35f07e3a2c882a7e979090360d1a20ab51d1fa19dfdac3aa8873b328a7c4c7683946ee97c824ae40079d848d6740a3788fa14f2185155dab7ed970a72c783
-  languageName: node
-  linkType: hard
-
-"object-hash@npm:^1.3.1":
-  version: 1.3.1
-  resolution: "object-hash@npm:1.3.1"
-  checksum: fdcb957a2f15a9060e30655a9f683ba1fc25dfb8809a73d32e9634bec385a2f1d686c707ac1e5f69fb773bc12df03fb64c77ce3faeed83e35f4eb1946cb1989e
-  languageName: node
-  linkType: hard
-
-"object-inspect@npm:^1.11.0, object-inspect@npm:^1.9.0":
-  version: 1.11.0
-  resolution: "object-inspect@npm:1.11.0"
-  checksum: 8c64f89ce3a7b96b6925879ad5f6af71d498abc217e136660efecd97452991216f375a7eb47cb1cb50643df939bf0c7cc391567b7abc6a924d04679705e58e27
-  languageName: node
-  linkType: hard
-
-"object-keys@npm:^1.0.12, object-keys@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "object-keys@npm:1.1.1"
-  checksum: b363c5e7644b1e1b04aa507e88dcb8e3a2f52b6ffd0ea801e4c7a62d5aa559affe21c55a07fd4b1fd55fc03a33c610d73426664b20032405d7b92a1414c34d6a
-  languageName: node
-  linkType: hard
-
-"object-visit@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "object-visit@npm:1.0.1"
-  dependencies:
-    isobject: ^3.0.0
-  checksum: b0ee07f5bf3bb881b881ff53b467ebbde2b37ebb38649d6944a6cd7681b32eedd99da9bd1e01c55facf81f54ed06b13af61aba6ad87f0052982995e09333f790
-  languageName: node
-  linkType: hard
-
-"object.assign@npm:^4.1.0, object.assign@npm:^4.1.2":
-  version: 4.1.2
-  resolution: "object.assign@npm:4.1.2"
-  dependencies:
-    call-bind: ^1.0.0
-    define-properties: ^1.1.3
-    has-symbols: ^1.0.1
-    object-keys: ^1.1.1
-  checksum: d621d832ed7b16ac74027adb87196804a500d80d9aca536fccb7ba48d33a7e9306a75f94c1d29cbfa324bc091bfc530bc24789568efdaee6a47fcfa298993814
-  languageName: node
-  linkType: hard
-
-"object.getownpropertydescriptors@npm:^2.1.0":
-  version: 2.1.2
-  resolution: "object.getownpropertydescriptors@npm:2.1.2"
-  dependencies:
-    call-bind: ^1.0.2
-    define-properties: ^1.1.3
-    es-abstract: ^1.18.0-next.2
-  checksum: 6c1c0162a2bea912f092dbf48699998d6f4b788a9884ee99ba41ddf25c3f0924ec56c6a55738c4ae3bd91d1203813a9a8e18e6fff1f477e2626cdbcd1a5f3ca8
-  languageName: node
-  linkType: hard
-
-"object.pick@npm:^1.3.0":
-  version: 1.3.0
-  resolution: "object.pick@npm:1.3.0"
-  dependencies:
-    isobject: ^3.0.1
-  checksum: 77fb6eed57c67adf75e9901187e37af39f052ef601cb4480386436561357eb9e459e820762f01fd02c5c1b42ece839ad393717a6d1850d848ee11fbabb3e580a
-  languageName: node
-  linkType: hard
-
-"object.values@npm:^1.1.0":
-  version: 1.1.3
-  resolution: "object.values@npm:1.1.3"
-  dependencies:
-    call-bind: ^1.0.2
-    define-properties: ^1.1.3
-    es-abstract: ^1.18.0-next.2
-    has: ^1.0.3
-  checksum: 8b29bd0936a32c2c5dfeb39389f65c7c3f32253a2ad3e4605726cac6bda8f642b4f8ab1ef58279851b86b7ae7322b3cf9a464c346498a7deb8f0c3a0554015f0
-  languageName: node
-  linkType: hard
-
-"on-finished@npm:2.4.1":
-  version: 2.4.1
-  resolution: "on-finished@npm:2.4.1"
-  dependencies:
-    ee-first: 1.1.1
-  checksum: d20929a25e7f0bb62f937a425b5edeb4e4cde0540d77ba146ec9357f00b0d497cdb3b9b05b9c8e46222407d1548d08166bff69cc56dfa55ba0e4469228920ff0
-  languageName: node
-  linkType: hard
-
-"on-finished@npm:~2.3.0":
-  version: 2.3.0
-  resolution: "on-finished@npm:2.3.0"
-  dependencies:
-    ee-first: 1.1.1
-  checksum: 1db595bd963b0124d6fa261d18320422407b8f01dc65863840f3ddaaf7bcad5b28ff6847286703ca53f4ec19595bd67a2f1253db79fc4094911ec6aa8df1671b
-  languageName: node
-  linkType: hard
-
-"on-headers@npm:~1.0.2":
-  version: 1.0.2
-  resolution: "on-headers@npm:1.0.2"
-  checksum: 2bf13467215d1e540a62a75021e8b318a6cfc5d4fc53af8e8f84ad98dbcea02d506c6d24180cd62e1d769c44721ba542f3154effc1f7579a8288c9f7873ed8e5
-  languageName: node
-  linkType: hard
-
-"once@npm:^1.3.0, once@npm:^1.3.1, once@npm:^1.4.0":
-  version: 1.4.0
-  resolution: "once@npm:1.4.0"
-  dependencies:
-    wrappy: 1
-  checksum: cd0a88501333edd640d95f0d2700fbde6bff20b3d4d9bdc521bdd31af0656b5706570d6c6afe532045a20bb8dc0849f8332d6f2a416e0ba6d3d3b98806c7db68
-  languageName: node
-  linkType: hard
-
-"onetime@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "onetime@npm:2.0.1"
-  dependencies:
-    mimic-fn: ^1.0.0
-  checksum: bb44015ac7a525d0fb43b029a583d4ad359834632b4424ca209b438aacf6d669dda81b5edfbdb42c22636e607b276ba5589f46694a729e3bc27948ce26f4cc1a
-  languageName: node
-  linkType: hard
-
-"onetime@npm:^5.1.0, onetime@npm:^5.1.2":
-  version: 5.1.2
-  resolution: "onetime@npm:5.1.2"
-  dependencies:
-    mimic-fn: ^2.1.0
-  checksum: 2478859ef817fc5d4e9c2f9e5728512ddd1dbc9fb7829ad263765bb6d3b91ce699d6e2332eef6b7dff183c2f490bd3349f1666427eaba4469fba0ac38dfd0d34
-  languageName: node
-  linkType: hard
-
-"optionator@npm:^0.8.1":
-  version: 0.8.3
-  resolution: "optionator@npm:0.8.3"
-  dependencies:
-    deep-is: ~0.1.3
-    fast-levenshtein: ~2.0.6
-    levn: ~0.3.0
-    prelude-ls: ~1.1.2
-    type-check: ~0.3.2
-    word-wrap: ~1.2.3
-  checksum: b8695ddf3d593203e25ab0900e265d860038486c943ff8b774f596a310f8ceebdb30c6832407a8198ba3ec9debe1abe1f51d4aad94843612db3b76d690c61d34
-  languageName: node
-  linkType: hard
-
-"optionator@npm:^0.9.1":
-  version: 0.9.1
-  resolution: "optionator@npm:0.9.1"
-  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
-  checksum: dbc6fa065604b24ea57d734261914e697bd73b69eff7f18e967e8912aa2a40a19a9f599a507fa805be6c13c24c4eae8c71306c239d517d42d4c041c942f508a0
-  languageName: node
-  linkType: hard
-
-"ora@npm:^3.4.0":
-  version: 3.4.0
-  resolution: "ora@npm:3.4.0"
-  dependencies:
-    chalk: ^2.4.2
-    cli-cursor: ^2.1.0
-    cli-spinners: ^2.0.0
-    log-symbols: ^2.2.0
-    strip-ansi: ^5.2.0
-    wcwidth: ^1.0.1
-  checksum: f1f8e7f290b766276dcd19ddf2159a1971b1ec37eec4a5556b8f5e4afbe513a965ed65c183d38956724263b6a20989b3d8fb71b95ac4a2d6a01db2f1ed8899e4
-  languageName: node
-  linkType: hard
-
-"ora@npm:^5.4.0":
-  version: 5.4.1
-  resolution: "ora@npm:5.4.1"
-  dependencies:
-    bl: ^4.1.0
-    chalk: ^4.1.0
-    cli-cursor: ^3.1.0
-    cli-spinners: ^2.5.0
-    is-interactive: ^1.0.0
-    is-unicode-supported: ^0.1.0
-    log-symbols: ^4.1.0
-    strip-ansi: ^6.0.0
-    wcwidth: ^1.0.1
-  checksum: 28d476ee6c1049d68368c0dc922e7225e3b5600c3ede88fade8052837f9ed342625fdaa84a6209302587c8ddd9b664f71f0759833cbdb3a4cf81344057e63c63
-  languageName: node
-  linkType: hard
-
-"os-browserify@npm:^0.3.0":
-  version: 0.3.0
-  resolution: "os-browserify@npm:0.3.0"
-  checksum: 16e37ba3c0e6a4c63443c7b55799ce4066d59104143cb637ecb9fce586d5da319cdca786ba1c867abbe3890d2cbf37953f2d51eea85e20dd6c4570d6c54bfebf
-  languageName: node
-  linkType: hard
-
-"os-homedir@npm:^1.0.0":
-  version: 1.0.2
-  resolution: "os-homedir@npm:1.0.2"
-  checksum: af609f5a7ab72de2f6ca9be6d6b91a599777afc122ac5cad47e126c1f67c176fe9b52516b9eeca1ff6ca0ab8587fe66208bc85e40a3940125f03cdb91408e9d2
-  languageName: node
-  linkType: hard
-
-"os-tmpdir@npm:^1.0.0, os-tmpdir@npm:^1.0.1, os-tmpdir@npm:~1.0.1, os-tmpdir@npm:~1.0.2":
-  version: 1.0.2
-  resolution: "os-tmpdir@npm:1.0.2"
-  checksum: 5666560f7b9f10182548bf7013883265be33620b1c1b4a4d405c25be2636f970c5488ff3e6c48de75b55d02bde037249fe5dbfbb4c0fb7714953d56aed062e6d
-  languageName: node
-  linkType: hard
-
-"osenv@npm:^0.1.3":
-  version: 0.1.5
-  resolution: "osenv@npm:0.1.5"
-  dependencies:
-    os-homedir: ^1.0.0
-    os-tmpdir: ^1.0.0
-  checksum: 779d261920f2a13e5e18cf02446484f12747d3f2ff82280912f52b213162d43d312647a40c332373cbccd5e3fb8126915d3bfea8dde4827f70f82da76e52d359
-  languageName: node
-  linkType: hard
-
-"p-defer@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "p-defer@npm:3.0.0"
-  checksum: ac3b0976a1c76b67cca1a34e00f7299b0cc230891f820749686aa84f8947326bbe0f8e3b7d9ca511578ee06f0c1a6e0ff68c8e9c325eac455f09d99f91697161
-  languageName: node
-  linkType: hard
-
-"p-finally@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "p-finally@npm:1.0.0"
-  checksum: 93a654c53dc805dd5b5891bab16eb0ea46db8f66c4bfd99336ae929323b1af2b70a8b0654f8f1eae924b2b73d037031366d645f1fd18b3d30cbd15950cc4b1d4
-  languageName: node
-  linkType: hard
-
-"p-finally@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "p-finally@npm:2.0.1"
-  checksum: 6306a2851c3b28f8b603624f395ae84dce76970498fed8aa6aae2d930595053746edf1e4ee0c4b78a97410d84aa4504d63179f5310d555511ecd226f53ed1e8e
-  languageName: node
-  linkType: hard
-
-"p-limit@npm:^1.1.0":
-  version: 1.3.0
-  resolution: "p-limit@npm:1.3.0"
-  dependencies:
-    p-try: ^1.0.0
-  checksum: 281c1c0b8c82e1ac9f81acd72a2e35d402bf572e09721ce5520164e9de07d8274451378a3470707179ad13240535558f4b277f02405ad752e08c7d5b0d54fbfd
-  languageName: node
-  linkType: hard
-
-"p-limit@npm:^2.0.0, p-limit@npm:^2.2.0":
-  version: 2.3.0
-  resolution: "p-limit@npm:2.3.0"
-  dependencies:
-    p-try: ^2.0.0
-  checksum: 84ff17f1a38126c3314e91ecfe56aecbf36430940e2873dadaa773ffe072dc23b7af8e46d4b6485d302a11673fe94c6b67ca2cfbb60c989848b02100d0594ac1
-  languageName: node
-  linkType: hard
-
-"p-limit@npm:^3.0.2":
-  version: 3.1.0
-  resolution: "p-limit@npm:3.1.0"
-  dependencies:
-    yocto-queue: ^0.1.0
-  checksum: 7c3690c4dbf62ef625671e20b7bdf1cbc9534e83352a2780f165b0d3ceba21907e77ad63401708145ca4e25bfc51636588d89a8c0aeb715e6c37d1c066430360
-  languageName: node
-  linkType: hard
-
-"p-limit@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "p-limit@npm:4.0.0"
-  dependencies:
-    yocto-queue: ^1.0.0
-  checksum: 01d9d70695187788f984226e16c903475ec6a947ee7b21948d6f597bed788e3112cc7ec2e171c1d37125057a5f45f3da21d8653e04a3a793589e12e9e80e756b
-  languageName: node
-  linkType: hard
-
-"p-locate@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "p-locate@npm:2.0.0"
-  dependencies:
-    p-limit: ^1.1.0
-  checksum: e2dceb9b49b96d5513d90f715780f6f4972f46987dc32a0e18bc6c3fc74a1a5d73ec5f81b1398af5e58b99ea1ad03fd41e9181c01fa81b4af2833958696e3081
-  languageName: node
-  linkType: hard
-
-"p-locate@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "p-locate@npm:3.0.0"
-  dependencies:
-    p-limit: ^2.0.0
-  checksum: 83991734a9854a05fe9dbb29f707ea8a0599391f52daac32b86f08e21415e857ffa60f0e120bfe7ce0cc4faf9274a50239c7895fc0d0579d08411e513b83a4ae
-  languageName: node
-  linkType: hard
-
-"p-locate@npm:^4.1.0":
-  version: 4.1.0
-  resolution: "p-locate@npm:4.1.0"
-  dependencies:
-    p-limit: ^2.2.0
-  checksum: 513bd14a455f5da4ebfcb819ef706c54adb09097703de6aeaa5d26fe5ea16df92b48d1ac45e01e3944ce1e6aa2a66f7f8894742b8c9d6e276e16cd2049a2b870
-  languageName: node
-  linkType: hard
-
-"p-locate@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "p-locate@npm:5.0.0"
-  dependencies:
-    p-limit: ^3.0.2
-  checksum: 1623088f36cf1cbca58e9b61c4e62bf0c60a07af5ae1ca99a720837356b5b6c5ba3eb1b2127e47a06865fee59dd0453cad7cc844cda9d5a62ac1a5a51b7c86d3
-  languageName: node
-  linkType: hard
-
-"p-locate@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "p-locate@npm:6.0.0"
-  dependencies:
-    p-limit: ^4.0.0
-  checksum: 2bfe5234efa5e7a4e74b30a5479a193fdd9236f8f6b4d2f3f69e3d286d9a7d7ab0c118a2a50142efcf4e41625def635bd9332d6cbf9cc65d85eb0718c579ab38
-  languageName: node
-  linkType: hard
-
-"p-map@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "p-map@npm:4.0.0"
-  dependencies:
-    aggregate-error: ^3.0.0
-  checksum: cb0ab21ec0f32ddffd31dfc250e3afa61e103ef43d957cc45497afe37513634589316de4eb88abdfd969fe6410c22c0b93ab24328833b8eb1ccc087fc0442a1c
-  languageName: node
-  linkType: hard
-
-"p-try@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "p-try@npm:1.0.0"
-  checksum: 3b5303f77eb7722144154288bfd96f799f8ff3e2b2b39330efe38db5dd359e4fb27012464cd85cb0a76e9b7edd1b443568cb3192c22e7cffc34989df0bafd605
-  languageName: node
-  linkType: hard
-
-"p-try@npm:^2.0.0":
-  version: 2.2.0
-  resolution: "p-try@npm:2.2.0"
-  checksum: f8a8e9a7693659383f06aec604ad5ead237c7a261c18048a6e1b5b85a5f8a067e469aa24f5bc009b991ea3b058a87f5065ef4176793a200d4917349881216cae
-  languageName: node
-  linkType: hard
-
-"pako@npm:~1.0.5":
-  version: 1.0.11
-  resolution: "pako@npm:1.0.11"
-  checksum: 1be2bfa1f807608c7538afa15d6f25baa523c30ec870a3228a89579e474a4d992f4293859524e46d5d87fd30fa17c5edf34dbef0671251d9749820b488660b16
-  languageName: node
-  linkType: hard
-
-"parallel-transform@npm:^1.1.0":
-  version: 1.2.0
-  resolution: "parallel-transform@npm:1.2.0"
-  dependencies:
-    cyclist: ^1.0.1
-    inherits: ^2.0.3
-    readable-stream: ^2.1.5
-  checksum: ab6ddc1a662cefcfb3d8d546a111763d3b223f484f2e9194e33aefd8f6760c319d0821fd22a00a3adfbd45929b50d2c84cc121389732f013c2ae01c226269c27
-  languageName: node
-  linkType: hard
-
-"parent-module@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "parent-module@npm:1.0.1"
-  dependencies:
-    callsites: ^3.0.0
-  checksum: 6ba8b255145cae9470cf5551eb74be2d22281587af787a2626683a6c20fbb464978784661478dd2a3f1dad74d1e802d403e1b03c1a31fab310259eec8ac560ff
-  languageName: node
-  linkType: hard
-
-"parse-asn1@npm:^5.0.0, parse-asn1@npm:^5.1.5":
-  version: 5.1.6
-  resolution: "parse-asn1@npm:5.1.6"
-  dependencies:
-    asn1.js: ^5.2.0
-    browserify-aes: ^1.0.0
-    evp_bytestokey: ^1.0.0
-    pbkdf2: ^3.0.3
-    safe-buffer: ^5.1.1
-  checksum: 9243311d1f88089bc9f2158972aa38d1abd5452f7b7cabf84954ed766048fe574d434d82c6f5a39b988683e96fb84cd933071dda38927e03469dc8c8d14463c7
-  languageName: node
-  linkType: hard
-
-"parse-entities@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "parse-entities@npm:2.0.0"
-  dependencies:
-    character-entities: ^1.0.0
-    character-entities-legacy: ^1.0.0
-    character-reference-invalid: ^1.0.0
-    is-alphanumerical: ^1.0.0
-    is-decimal: ^1.0.0
-    is-hexadecimal: ^1.0.0
-  checksum: 7addfd3e7d747521afac33c8121a5f23043c6973809756920d37e806639b4898385d386fcf4b3c8e2ecf1bc28aac5ae97df0b112d5042034efbe80f44081ebce
-  languageName: node
-  linkType: hard
-
-"parse-json@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "parse-json@npm:4.0.0"
-  dependencies:
-    error-ex: ^1.3.1
-    json-parse-better-errors: ^1.0.1
-  checksum: 0fe227d410a61090c247e34fa210552b834613c006c2c64d9a05cfe9e89cf8b4246d1246b1a99524b53b313e9ac024438d0680f67e33eaed7e6f38db64cfe7b5
-  languageName: node
-  linkType: hard
-
-"parse-json@npm:^5.0.0":
-  version: 5.2.0
-  resolution: "parse-json@npm:5.2.0"
-  dependencies:
-    "@babel/code-frame": ^7.0.0
-    error-ex: ^1.3.1
-    json-parse-even-better-errors: ^2.3.0
-    lines-and-columns: ^1.1.6
-  checksum: 62085b17d64da57f40f6afc2ac1f4d95def18c4323577e1eced571db75d9ab59b297d1d10582920f84b15985cbfc6b6d450ccbf317644cfa176f3ed982ad87e2
-  languageName: node
-  linkType: hard
-
-"parse-ms@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "parse-ms@npm:1.0.1"
-  checksum: 93fa7921554fe16bc73272a94bf812d1db6a144964fb57692f6de4fccf14bd771a232e8dcdcd4bbaa4aa477796cd3f35374d65596cca12323f2664bc023b4b4c
-  languageName: node
-  linkType: hard
-
-"parse-passwd@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "parse-passwd@npm:1.0.0"
-  checksum: 4e55e0231d58f828a41d0f1da2bf2ff7bcef8f4cb6146e69d16ce499190de58b06199e6bd9b17fbf0d4d8aef9052099cdf8c4f13a6294b1a522e8e958073066e
-  languageName: node
-  linkType: hard
-
-"parse-static-imports@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "parse-static-imports@npm:1.1.0"
-  checksum: 8af1fc58ae27837715735aa471cc0559bf4cfdab59d4c4ae5c41e218fd841aaa702d18fef62659ff03ed1b42ae936db94d8d2bc0ad07430d19ca9727f721d55c
-  languageName: node
-  linkType: hard
-
-"parse5-htmlparser2-tree-adapter@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "parse5-htmlparser2-tree-adapter@npm:7.0.0"
-  dependencies:
-    domhandler: ^5.0.2
-    parse5: ^7.0.0
-  checksum: fc5d01e07733142a1baf81de5c2a9c41426c04b7ab29dd218acb80cd34a63177c90aff4a4aee66cf9f1d0aeecff1389adb7452ad6f8af0a5888e3e9ad6ef733d
-  languageName: node
-  linkType: hard
-
-"parse5@npm:6.0.1, parse5@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "parse5@npm:6.0.1"
-  checksum: 7d569a176c5460897f7c8f3377eff640d54132b9be51ae8a8fa4979af940830b2b0c296ce75e5bd8f4041520aadde13170dbdec44889975f906098ea0002f4bd
-  languageName: node
-  linkType: hard
-
-"parse5@npm:^7.0.0":
-  version: 7.1.1
-  resolution: "parse5@npm:7.1.1"
-  dependencies:
-    entities: ^4.4.0
-  checksum: 8f72fbfa6df83a3f29f58e1818f7bd46b47ff3e26d79c74e10b8fc7ef7ee76163f205113f1b2f6a5b8dc4e31e726f490444f04890cead6e974dbcbe8172b1321
-  languageName: node
-  linkType: hard
-
-"parseurl@npm:~1.3.3":
-  version: 1.3.3
-  resolution: "parseurl@npm:1.3.3"
-  checksum: 407cee8e0a3a4c5cd472559bca8b6a45b82c124e9a4703302326e9ab60fc1081442ada4e02628efef1eb16197ddc7f8822f5a91fd7d7c86b51f530aedb17dfa2
-  languageName: node
-  linkType: hard
-
-"pascalcase@npm:^0.1.1":
-  version: 0.1.1
-  resolution: "pascalcase@npm:0.1.1"
-  checksum: f83681c3c8ff75fa473a2bb2b113289952f802ff895d435edd717e7cb898b0408cbdb247117a938edcbc5d141020909846cc2b92c47213d764e2a94d2ad2b925
-  languageName: node
-  linkType: hard
-
-"path-browserify@npm:0.0.1":
-  version: 0.0.1
-  resolution: "path-browserify@npm:0.0.1"
-  checksum: ae8dcd45d0d3cfbaf595af4f206bf3ed82d77f72b4877ae7e77328079e1468c84f9386754bb417d994d5a19bf47882fd253565c18441cd5c5c90ae5187599e35
-  languageName: node
-  linkType: hard
-
-"path-dirname@npm:^1.0.0":
-  version: 1.0.2
-  resolution: "path-dirname@npm:1.0.2"
-  checksum: 0d2f6604ae05a252a0025318685f290e2764ecf9c5436f203cdacfc8c0b17c24cdedaa449d766beb94ab88cc7fc70a09ec21e7933f31abc2b719180883e5e33f
-  languageName: node
-  linkType: hard
-
-"path-exists@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "path-exists@npm:3.0.0"
-  checksum: 96e92643aa34b4b28d0de1cd2eba52a1c5313a90c6542d03f62750d82480e20bfa62bc865d5cfc6165f5fcd5aeb0851043c40a39be5989646f223300021bae0a
-  languageName: node
-  linkType: hard
-
-"path-exists@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "path-exists@npm:4.0.0"
-  checksum: 505807199dfb7c50737b057dd8d351b82c033029ab94cb10a657609e00c1bc53b951cfdbccab8de04c5584d5eff31128ce6afd3db79281874a5ef2adbba55ed1
-  languageName: node
-  linkType: hard
-
-"path-exists@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "path-exists@npm:5.0.0"
-  checksum: 8ca842868cab09423994596eb2c5ec2a971c17d1a3cb36dbf060592c730c725cd524b9067d7d2a1e031fef9ba7bd2ac6dc5ec9fb92aa693265f7be3987045254
-  languageName: node
-  linkType: hard
-
-"path-is-absolute@npm:1.0.1, path-is-absolute@npm:^1.0.0, path-is-absolute@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "path-is-absolute@npm:1.0.1"
-  checksum: 060840f92cf8effa293bcc1bea81281bd7d363731d214cbe5c227df207c34cd727430f70c6037b5159c8a870b9157cba65e775446b0ab06fd5ecc7e54615a3b8
-  languageName: node
-  linkType: hard
-
-"path-key@npm:^2.0.0, path-key@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "path-key@npm:2.0.1"
-  checksum: f7ab0ad42fe3fb8c7f11d0c4f849871e28fbd8e1add65c370e422512fc5887097b9cf34d09c1747d45c942a8c1e26468d6356e2df3f740bf177ab8ca7301ebfd
-  languageName: node
-  linkType: hard
-
-"path-key@npm:^3.0.0, path-key@npm:^3.1.0":
-  version: 3.1.1
-  resolution: "path-key@npm:3.1.1"
-  checksum: 55cd7a9dd4b343412a8386a743f9c746ef196e57c823d90ca3ab917f90ab9f13dd0ded27252ba49dbdfcab2b091d998bc446f6220cd3cea65db407502a740020
-  languageName: node
-  linkType: hard
-
-"path-parse@npm:^1.0.6, path-parse@npm:^1.0.7":
-  version: 1.0.7
-  resolution: "path-parse@npm:1.0.7"
-  checksum: 49abf3d81115642938a8700ec580da6e830dde670be21893c62f4e10bd7dd4c3742ddc603fe24f898cba7eb0c6bc1777f8d9ac14185d34540c6d4d80cd9cae8a
-  languageName: node
-  linkType: hard
-
-"path-posix@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "path-posix@npm:1.0.0"
-  checksum: 4f64ad212de6ad8d0dbfa440cac8b924303c25c30301769ad0501e29e83a5b9d469e8133753f999ad37482c9c8d3511129e4d83db55d2e4b1555b183c9749ae8
-  languageName: node
-  linkType: hard
-
-"path-root-regex@npm:^0.1.0":
-  version: 0.1.2
-  resolution: "path-root-regex@npm:0.1.2"
-  checksum: dcd75d1f8e93faabe35a58e875b0f636839b3658ff2ad8c289463c40bc1a844debe0dab73c3398ef9dc8f6ec6c319720aff390cf4633763ddcf3cf4b1bbf7e8b
-  languageName: node
-  linkType: hard
-
-"path-root@npm:^0.1.1":
-  version: 0.1.1
-  resolution: "path-root@npm:0.1.1"
-  dependencies:
-    path-root-regex: ^0.1.0
-  checksum: ff88aebfc1c59ace510cc06703d67692a11530989920427625e52b66a303ca9b3d4059b0b7d0b2a73248d1ad29bcb342b8b786ec00592f3101d38a45fd3b2e08
-  languageName: node
-  linkType: hard
-
-"path-to-regexp@npm:0.1.7":
-  version: 0.1.7
-  resolution: "path-to-regexp@npm:0.1.7"
-  checksum: 69a14ea24db543e8b0f4353305c5eac6907917031340e5a8b37df688e52accd09e3cebfe1660b70d76b6bd89152f52183f28c74813dbf454ba1a01c82a38abce
-  languageName: node
-  linkType: hard
-
-"path-to-regexp@npm:^1.7.0":
-  version: 1.8.0
-  resolution: "path-to-regexp@npm:1.8.0"
-  dependencies:
-    isarray: 0.0.1
-  checksum: 709f6f083c0552514ef4780cb2e7e4cf49b0cc89a97439f2b7cc69a608982b7690fb5d1720a7473a59806508fc2dae0be751ba49f495ecf89fd8fbc62abccbcd
-  languageName: node
-  linkType: hard
-
-"path-type@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "path-type@npm:3.0.0"
-  dependencies:
-    pify: ^3.0.0
-  checksum: 735b35e256bad181f38fa021033b1c33cfbe62ead42bb2222b56c210e42938eecb272ae1949f3b6db4ac39597a61b44edd8384623ec4d79bfdc9a9c0f12537a6
-  languageName: node
-  linkType: hard
-
-"path-type@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "path-type@npm:4.0.0"
-  checksum: 5b1e2daa247062061325b8fdbfd1fb56dde0a448fb1455453276ea18c60685bdad23a445dc148cf87bc216be1573357509b7d4060494a6fd768c7efad833ee45
-  languageName: node
-  linkType: hard
-
-"pbkdf2@npm:^3.0.3":
-  version: 3.1.2
-  resolution: "pbkdf2@npm:3.1.2"
-  dependencies:
-    create-hash: ^1.1.2
-    create-hmac: ^1.1.4
-    ripemd160: ^2.0.1
-    safe-buffer: ^5.0.1
-    sha.js: ^2.4.8
-  checksum: 2c950a100b1da72123449208e231afc188d980177d021d7121e96a2de7f2abbc96ead2b87d03d8fe5c318face097f203270d7e27908af9f471c165a4e8e69c92
-  languageName: node
-  linkType: hard
-
-"performance-now@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "performance-now@npm:2.1.0"
-  checksum: 534e641aa8f7cba160f0afec0599b6cecefbb516a2e837b512be0adbe6c1da5550e89c78059c7fabc5c9ffdf6627edabe23eb7c518c4500067a898fa65c2b550
-  languageName: node
-  linkType: hard
-
-"picocolors@npm:^0.2.1":
-  version: 0.2.1
-  resolution: "picocolors@npm:0.2.1"
-  checksum: 3b0f441f0062def0c0f39e87b898ae7461c3a16ffc9f974f320b44c799418cabff17780ee647fda42b856a1dc45897e2c62047e1b546d94d6d5c6962f45427b2
-  languageName: node
-  linkType: hard
-
-"picocolors@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "picocolors@npm:1.0.0"
-  checksum: a2e8092dd86c8396bdba9f2b5481032848525b3dc295ce9b57896f931e63fc16f79805144321f72976383fc249584672a75cc18d6777c6b757603f372f745981
-  languageName: node
-  linkType: hard
-
-"picomatch@npm:^2.0.4, picomatch@npm:^2.2.1, picomatch@npm:^2.2.3":
-  version: 2.2.3
-  resolution: "picomatch@npm:2.2.3"
-  checksum: 45e2b882b5265d3a322c6b7b854c1fdc33d5083011b9730296e9ad26332824ac356529f1ce1b0c1111f08a84c02e8525ea121d17c4bbe2970ca6665e587921fa
-  languageName: node
-  linkType: hard
-
-"picomatch@npm:^2.3.1":
-  version: 2.3.1
-  resolution: "picomatch@npm:2.3.1"
-  checksum: 050c865ce81119c4822c45d3c84f1ced46f93a0126febae20737bd05ca20589c564d6e9226977df859ed5e03dc73f02584a2b0faad36e896936238238b0446cf
-  languageName: node
-  linkType: hard
-
-"pidtree@npm:^0.3.0":
-  version: 0.3.1
-  resolution: "pidtree@npm:0.3.1"
-  bin:
-    pidtree: bin/pidtree.js
-  checksum: eb49025099f1af89a4696f7673351421f13420f3397b963c901fe23a1c9c2ff50f4750321970d4472c0ffbb065e4a6c3c27f75e226cc62284b19e21d32ce7012
-  languageName: node
-  linkType: hard
-
-"pify@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "pify@npm:3.0.0"
-  checksum: 6cdcbc3567d5c412450c53261a3f10991665d660961e06605decf4544a61a97a54fefe70a68d5c37080ff9d6f4cf51444c90198d1ba9f9309a6c0d6e9f5c4fde
-  languageName: node
-  linkType: hard
-
-"pify@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "pify@npm:4.0.1"
-  checksum: 9c4e34278cb09987685fa5ef81499c82546c033713518f6441778fbec623fc708777fe8ac633097c72d88470d5963094076c7305cafc7ad340aae27cfacd856b
-  languageName: node
-  linkType: hard
-
-"pinkie-promise@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "pinkie-promise@npm:2.0.1"
-  dependencies:
-    pinkie: ^2.0.0
-  checksum: b53a4a2e73bf56b6f421eef711e7bdcb693d6abb474d57c5c413b809f654ba5ee750c6a96dd7225052d4b96c4d053cdcb34b708a86fceed4663303abee52fcca
-  languageName: node
-  linkType: hard
-
-"pinkie@npm:^2.0.0":
-  version: 2.0.4
-  resolution: "pinkie@npm:2.0.4"
-  checksum: b12b10afea1177595aab036fc220785488f67b4b0fc49e7a27979472592e971614fa1c728e63ad3e7eb748b4ec3c3dbd780819331dad6f7d635c77c10537b9db
-  languageName: node
-  linkType: hard
-
-"pkg-dir@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "pkg-dir@npm:3.0.0"
-  dependencies:
-    find-up: ^3.0.0
-  checksum: 70c9476ffefc77552cc6b1880176b71ad70bfac4f367604b2b04efd19337309a4eec985e94823271c7c0e83946fa5aeb18cd360d15d10a5d7533e19344bfa808
-  languageName: node
-  linkType: hard
-
-"pkg-dir@npm:^4.1.0":
-  version: 4.2.0
-  resolution: "pkg-dir@npm:4.2.0"
-  dependencies:
-    find-up: ^4.0.0
-  checksum: 9863e3f35132bf99ae1636d31ff1e1e3501251d480336edb1c211133c8d58906bed80f154a1d723652df1fda91e01c7442c2eeaf9dc83157c7ae89087e43c8d6
-  languageName: node
-  linkType: hard
-
-"pkg-up@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "pkg-up@npm:2.0.0"
-  dependencies:
-    find-up: ^2.1.0
-  checksum: de4b418175281a082e366ce1a919f032520ee53cf421578b35173f03816f6ec4c19e1552066840bb0988c3e1215859653948efd6ca3507a23f4f44229269500d
-  languageName: node
-  linkType: hard
-
-"pkg-up@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "pkg-up@npm:3.1.0"
-  dependencies:
-    find-up: ^3.0.0
-  checksum: 5bac346b7c7c903613c057ae3ab722f320716199d753f4a7d053d38f2b5955460f3e6ab73b4762c62fd3e947f58e04f1343e92089e7bb6091c90877406fcd8c8
-  languageName: node
-  linkType: hard
-
-"pkijs@npm:^2.2.2":
-  version: 2.2.2
-  resolution: "pkijs@npm:2.2.2"
-  dependencies:
-    asn1js: ^2.1.1
-    bytestreamjs: ^1.0.29
-    pvutils: ^1.0.17
-  checksum: 92664bc4b7378200f74d7faf32a80365058d79f22b27f9a83b10e1e7684892a17657ff65c106e7c48be6d79b76545149e949229ae42a6456d0e447b9872a26e5
-  languageName: node
-  linkType: hard
-
-"please-upgrade-node@npm:^3.2.0":
-  version: 3.2.0
-  resolution: "please-upgrade-node@npm:3.2.0"
-  dependencies:
-    semver-compare: ^1.0.0
-  checksum: d87c41581a2a022fbe25965a97006238cd9b8cbbf49b39f78d262548149a9d30bd2bdf35fec3d810e0001e630cd46ef13c7e19c389dea8de7e64db271a2381bb
-  languageName: node
-  linkType: hard
-
-"portfinder@npm:^1.0.28":
-  version: 1.0.28
-  resolution: "portfinder@npm:1.0.28"
-  dependencies:
-    async: ^2.6.2
-    debug: ^3.1.1
-    mkdirp: ^0.5.5
-  checksum: 91fef602f13f8f4c64385d0ad2a36cc9dc6be0b8d10a2628ee2c3c7b9917ab4fefb458815b82cea2abf4b785cd11c9b4e2d917ac6fa06f14b6fa880ca8f8928c
-  languageName: node
-  linkType: hard
-
-"posix-character-classes@npm:^0.1.0":
-  version: 0.1.1
-  resolution: "posix-character-classes@npm:0.1.1"
-  checksum: dedb99913c60625a16050cfed2fb5c017648fc075be41ac18474e1c6c3549ef4ada201c8bd9bd006d36827e289c571b6092e1ef6e756cdbab2fd7046b25c6442
-  languageName: node
-  linkType: hard
-
-"postcss-modules-extract-imports@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "postcss-modules-extract-imports@npm:3.0.0"
-  peerDependencies:
-    postcss: ^8.1.0
-  checksum: 4b65f2f1382d89c4bc3c0a1bdc5942f52f3cb19c110c57bd591ffab3a5fee03fcf831604168205b0c1b631a3dce2255c70b61aaae3ef39d69cd7eb450c2552d2
-  languageName: node
-  linkType: hard
-
-"postcss-modules-local-by-default@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "postcss-modules-local-by-default@npm:4.0.0"
-  dependencies:
-    icss-utils: ^5.0.0
-    postcss-selector-parser: ^6.0.2
-    postcss-value-parser: ^4.1.0
-  peerDependencies:
-    postcss: ^8.1.0
-  checksum: 6cf570badc7bc26c265e073f3ff9596b69bb954bc6ac9c5c1b8cba2995b80834226b60e0a3cbb87d5f399dbb52e6466bba8aa1d244f6218f99d834aec431a69d
-  languageName: node
-  linkType: hard
-
-"postcss-modules-scope@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "postcss-modules-scope@npm:3.0.0"
-  dependencies:
-    postcss-selector-parser: ^6.0.4
-  peerDependencies:
-    postcss: ^8.1.0
-  checksum: 330b9398dbd44c992c92b0dc612c0626135e2cc840fee41841eb61247a6cfed95af2bd6f67ead9dd9d0bb41f5b0367129d93c6e434fa3e9c58ade391d9a5a138
-  languageName: node
-  linkType: hard
-
-"postcss-modules-values@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "postcss-modules-values@npm:4.0.0"
-  dependencies:
-    icss-utils: ^5.0.0
-  peerDependencies:
-    postcss: ^8.1.0
-  checksum: f7f2cdf14a575b60e919ad5ea52fed48da46fe80db2733318d71d523fc87db66c835814940d7d05b5746b0426e44661c707f09bdb83592c16aea06e859409db6
-  languageName: node
-  linkType: hard
-
-"postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4":
-  version: 6.0.10
-  resolution: "postcss-selector-parser@npm:6.0.10"
-  dependencies:
-    cssesc: ^3.0.0
-    util-deprecate: ^1.0.2
-  checksum: 46afaa60e3d1998bd7adf6caa374baf857cc58d3ff944e29459c9a9e4680a7fe41597bd5b755fc81d7c388357e9bf67c0251d047c640a09f148e13606b8a8608
-  languageName: node
-  linkType: hard
-
-"postcss-value-parser@npm:^3.2.3":
-  version: 3.3.1
-  resolution: "postcss-value-parser@npm:3.3.1"
-  checksum: 62cd26e1cdbcf2dcc6bcedf3d9b409c9027bc57a367ae20d31dd99da4e206f730689471fd70a2abe866332af83f54dc1fa444c589e2381bf7f8054c46209ce16
-  languageName: node
-  linkType: hard
-
-"postcss-value-parser@npm:^4.1.0":
-  version: 4.2.0
-  resolution: "postcss-value-parser@npm:4.2.0"
-  checksum: 819ffab0c9d51cf0acbabf8996dffbfafbafa57afc0e4c98db88b67f2094cb44488758f06e5da95d7036f19556a4a732525e84289a425f4f6fd8e412a9d7442f
-  languageName: node
-  linkType: hard
-
-"postcss@npm:^6.0.1, postcss@npm:^6.0.17":
-  version: 6.0.23
-  resolution: "postcss@npm:6.0.23"
-  dependencies:
-    chalk: ^2.4.1
-    source-map: ^0.6.1
-    supports-color: ^5.4.0
-  checksum: cc6cb2c1dbcdefa6f57a71d67fe535c9e96543298bbe28f9a6a64c4f1e21b6127113890dd4cda8873d3f4e6613a0566b7b4bbb230204f3a9a309190bda065d81
-  languageName: node
-  linkType: hard
-
-"postcss@npm:^8.2.15":
-  version: 8.4.14
-  resolution: "postcss@npm:8.4.14"
-  dependencies:
-    nanoid: ^3.3.4
-    picocolors: ^1.0.0
-    source-map-js: ^1.0.2
-  checksum: fe58766ff32e4becf65a7d57678995cfd239df6deed2fe0557f038b47c94e4132e7e5f68b5aa820c13adfec32e523b693efaeb65798efb995ce49ccd83953816
-  languageName: node
-  linkType: hard
-
-"prelude-ls@npm:^1.2.1":
-  version: 1.2.1
-  resolution: "prelude-ls@npm:1.2.1"
-  checksum: cd192ec0d0a8e4c6da3bb80e4f62afe336df3f76271ac6deb0e6a36187133b6073a19e9727a1ff108cd8b9982e4768850d413baa71214dd80c7979617dca827a
-  languageName: node
-  linkType: hard
-
-"prelude-ls@npm:~1.1.2":
-  version: 1.1.2
-  resolution: "prelude-ls@npm:1.1.2"
-  checksum: c4867c87488e4a0c233e158e4d0d5565b609b105d75e4c05dc760840475f06b731332eb93cc8c9cecb840aa8ec323ca3c9a56ad7820ad2e63f0261dadcb154e4
-  languageName: node
-  linkType: hard
-
-"pretender@npm:^3.4.3":
-  version: 3.4.3
-  resolution: "pretender@npm:3.4.3"
-  dependencies:
-    fake-xml-http-request: ^2.1.1
-    route-recognizer: ^0.3.3
-  checksum: 2ac03977f489eb79882f1fd4bcfb949f6ca6226fd95f366ec35a73590bd76b52fc283e7d8e5a8e649982619097849a4240dce138afad9089b407b1feba5df4a3
-  languageName: node
-  linkType: hard
-
-"pretender@npm:^3.4.7":
-  version: 3.4.7
-  resolution: "pretender@npm:3.4.7"
-  dependencies:
-    fake-xml-http-request: ^2.1.2
-    route-recognizer: ^0.3.3
-  checksum: ca767dfa3fdb5e49cec8f272de1c7d489f53986a9f58dd0caf379b6365b1f1241bbb03bea6fe4421ce3e2aaa894d6c7349a5ef603283710be2babca49f1ad6fb
-  languageName: node
-  linkType: hard
-
-"prettier-eslint-cli@npm:^7.1.0":
-  version: 7.1.0
-  resolution: "prettier-eslint-cli@npm:7.1.0"
-  dependencies:
-    "@messageformat/core": ^3.0.1
-    "@prettier/eslint": "npm:prettier-eslint@^15.0.1"
-    arrify: ^2.0.1
-    boolify: ^1.0.1
-    camelcase-keys: ^7.0.2
-    chalk: ^4.1.2
-    common-tags: ^1.8.2
-    core-js: ^3.24.1
-    eslint: ^8.21.0
-    find-up: ^5.0.0
-    get-stdin: ^8.0.0
-    glob: ^7.2.3
-    ignore: ^5.2.0
-    indent-string: ^4.0.0
-    lodash.memoize: ^4.1.2
-    loglevel-colored-level-prefix: ^1.0.0
-    rxjs: ^7.5.6
-    yargs: ^13.1.1
-  peerDependencies:
-    prettier-eslint: "*"
-  peerDependenciesMeta:
-    prettier-eslint:
-      optional: true
-  bin:
-    prettier-eslint: dist/index.js
-  checksum: 7c948d748ec5c34c1d1fb3d47cffe55629141a2383a099af15b2887db87908fe8edd6f1328b922521b531c9403d6a3924b4484b36622ca8889c90351e47d4ec5
-  languageName: node
-  linkType: hard
-
-"prettier-linter-helpers@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "prettier-linter-helpers@npm:1.0.0"
-  dependencies:
-    fast-diff: ^1.1.2
-  checksum: 00ce8011cf6430158d27f9c92cfea0a7699405633f7f1d4a45f07e21bf78e99895911cbcdc3853db3a824201a7c745bd49bfea8abd5fb9883e765a90f74f8392
-  languageName: node
-  linkType: hard
-
-"prettier@npm:2.6.2":
-  version: 2.6.2
-  resolution: "prettier@npm:2.6.2"
-  bin:
-    prettier: bin-prettier.js
-  checksum: 48d08dde8e9fb1f5bccdd205baa7f192e9fc8bc98f86e1b97d919de804e28c806b0e6cc685e4a88211aa7987fa9668f30baae19580d87ced3ed0f2ec6572106f
-  languageName: node
-  linkType: hard
-
-"prettier@npm:^2.5.1":
-  version: 2.7.1
-  resolution: "prettier@npm:2.7.1"
-  bin:
-    prettier: bin-prettier.js
-  checksum: 55a4409182260866ab31284d929b3cb961e5fdb91fe0d2e099dac92eaecec890f36e524b4c19e6ceae839c99c6d7195817579cdffc8e2c80da0cb794463a748b
-  languageName: node
-  linkType: hard
-
-"pretty-format@npm:^23.0.1":
-  version: 23.6.0
-  resolution: "pretty-format@npm:23.6.0"
-  dependencies:
-    ansi-regex: ^3.0.0
-    ansi-styles: ^3.2.0
-  checksum: b668eac9fb19d12cf27098206d587b0be8da9f7fdc56998ace9bad9b6b6f5a5be5004d9fec3c2dc215d4128ef3db901e7329e0e8e081b0732a781bddfa9e2b66
-  languageName: node
-  linkType: hard
-
-"pretty-ms@npm:^3.1.0":
-  version: 3.2.0
-  resolution: "pretty-ms@npm:3.2.0"
-  dependencies:
-    parse-ms: ^1.0.0
-  checksum: 705030a262353abfeda1c765bd1f5269c06dc7777536bdd5f8cebc84f0d012aaca679ca6fc5ea4a84c915e967dce4ab4b6489693abb05dd58e7a9802747736a3
-  languageName: node
-  linkType: hard
-
-"printf@npm:^0.6.1":
-  version: 0.6.1
-  resolution: "printf@npm:0.6.1"
-  checksum: 7643279e5e4e2032b86b61babb21e60b99eac71491556a0fc3f01a443f61f90f1701f9912be41a1e44e1164a69fa349b907719716b983e3a222ad9a978ba06f9
-  languageName: node
-  linkType: hard
-
-"private@npm:^0.1.6, private@npm:^0.1.8":
-  version: 0.1.8
-  resolution: "private@npm:0.1.8"
-  checksum: a00abd713d25389f6de7294f0e7879b8a5d09a9ec5fd81cc2f21b29d4f9a80ec53bc4222927d3a281d4aadd4cd373d9a28726fca3935921950dc75fd71d1fdbb
-  languageName: node
-  linkType: hard
-
-"process-nextick-args@npm:~2.0.0":
-  version: 2.0.1
-  resolution: "process-nextick-args@npm:2.0.1"
-  checksum: 1d38588e520dab7cea67cbbe2efdd86a10cc7a074c09657635e34f035277b59fbb57d09d8638346bf7090f8e8ebc070c96fa5fd183b777fff4f5edff5e9466cf
-  languageName: node
-  linkType: hard
-
-"process-relative-require@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "process-relative-require@npm:1.0.0"
-  dependencies:
-    node-modules-path: ^1.0.0
-  checksum: 659265a7dad2329edd0483d36b7e25f61f8663901b74dd672ebd0bb5248494156b2892f0860ef0574049a235423183996656bee052ce2212fef2fbc61034df7e
-  languageName: node
-  linkType: hard
-
-"process@npm:^0.11.10":
-  version: 0.11.10
-  resolution: "process@npm:0.11.10"
-  checksum: bfcce49814f7d172a6e6a14d5fa3ac92cc3d0c3b9feb1279774708a719e19acd673995226351a082a9ae99978254e320ccda4240ddc474ba31a76c79491ca7c3
-  languageName: node
-  linkType: hard
-
-"progress@npm:^2.0.0":
-  version: 2.0.3
-  resolution: "progress@npm:2.0.3"
-  checksum: f67403fe7b34912148d9252cb7481266a354bd99ce82c835f79070643bb3c6583d10dbcfda4d41e04bbc1d8437e9af0fb1e1f2135727878f5308682a579429b7
-  languageName: node
-  linkType: hard
-
-"promise-inflight@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "promise-inflight@npm:1.0.1"
-  checksum: 22749483091d2c594261517f4f80e05226d4d5ecc1fc917e1886929da56e22b5718b7f2a75f3807e7a7d471bc3be2907fe92e6e8f373ddf5c64bae35b5af3981
-  languageName: node
-  linkType: hard
-
-"promise-map-series@npm:^0.2.1":
-  version: 0.2.3
-  resolution: "promise-map-series@npm:0.2.3"
-  dependencies:
-    rsvp: ^3.0.14
-  checksum: 3f63265f596580388c025742492e379b54470fb94a1b05626723092e412f722ec8fe8e2be78cbf1c788887a307bf6cd0fedd071bec1d409a2972aec5238ea35a
-  languageName: node
-  linkType: hard
-
-"promise-map-series@npm:^0.3.0":
-  version: 0.3.0
-  resolution: "promise-map-series@npm:0.3.0"
-  checksum: a1c992562e68a3e14c39d010bd6335166e4a0469763fd161a8b1e15f972033fce5207722edb9c16ecc9324b44ef45e42674f7015e6a8922972f45a85849bbeef
-  languageName: node
-  linkType: hard
-
-"promise-retry@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "promise-retry@npm:2.0.1"
-  dependencies:
-    err-code: ^2.0.2
-    retry: ^0.12.0
-  checksum: f96a3f6d90b92b568a26f71e966cbbc0f63ab85ea6ff6c81284dc869b41510e6cdef99b6b65f9030f0db422bf7c96652a3fff9f2e8fb4a0f069d8f4430359429
-  languageName: node
-  linkType: hard
-
-"promise.hash.helper@npm:^1.0.8":
-  version: 1.0.8
-  resolution: "promise.hash.helper@npm:1.0.8"
-  checksum: 88844dd1dd9d95a3d3b9c27f092dee938da02f9c9f3bd62a6b7b20e16c51c64a0db33edf09d25615055a1cb7ad96b5edcc837680cde88de09a12c466adfaf435
-  languageName: node
-  linkType: hard
-
-"promise.prototype.finally@npm:^3.1.0":
-  version: 3.1.3
-  resolution: "promise.prototype.finally@npm:3.1.3"
-  dependencies:
-    call-bind: ^1.0.2
-    define-properties: ^1.1.3
-    es-abstract: ^1.19.1
-  checksum: aba8af6ae8d076e2c344d2674409b44c8f98b3aba98b78619739aeb4a74ebac80dbba5f9338da7cf0108a34384799d3996c46697d2e21c6e998c04d68041213c
-  languageName: node
-  linkType: hard
-
-"proper-lockfile@npm:^4.1.2":
-  version: 4.1.2
-  resolution: "proper-lockfile@npm:4.1.2"
-  dependencies:
-    graceful-fs: ^4.2.4
-    retry: ^0.12.0
-    signal-exit: ^3.0.2
-  checksum: 00078ee6a61c216a56a6140c7d2a98c6c733b3678503002dc073ab8beca5d50ca271de4c85fca13b9b8ee2ff546c36674d1850509b84a04a5d0363bcb8638939
-  languageName: node
-  linkType: hard
-
-"proxy-addr@npm:~2.0.5":
-  version: 2.0.6
-  resolution: "proxy-addr@npm:2.0.6"
-  dependencies:
-    forwarded: ~0.1.2
-    ipaddr.js: 1.9.1
-  checksum: 2bad9b7a56b847faf606a19328aaaf5fca3e561ebb4e933969a580d94a20f77e74fb21196028a6e417851b3d9d95a0c704732a3362e3ef515d45d96859ac7eb9
-  languageName: node
-  linkType: hard
-
-"proxy-addr@npm:~2.0.7":
-  version: 2.0.7
-  resolution: "proxy-addr@npm:2.0.7"
-  dependencies:
-    forwarded: 0.2.0
-    ipaddr.js: 1.9.1
-  checksum: 29c6990ce9364648255454842f06f8c46fcd124d3e6d7c5066df44662de63cdc0bad032e9bf5a3d653ff72141cc7b6019873d685708ac8210c30458ad99f2b74
-  languageName: node
-  linkType: hard
-
-"prr@npm:~1.0.1":
-  version: 1.0.1
-  resolution: "prr@npm:1.0.1"
-  checksum: 3bca2db0479fd38f8c4c9439139b0c42dcaadcc2fbb7bb8e0e6afaa1383457f1d19aea9e5f961d5b080f1cfc05bfa1fe9e45c97a1d3fd6d421950a73d3108381
-  languageName: node
-  linkType: hard
-
-"psl@npm:^1.1.28, psl@npm:^1.1.33":
-  version: 1.8.0
-  resolution: "psl@npm:1.8.0"
-  checksum: 6150048ed2da3f919478bee8a82f3828303bc0fc730fb015a48f83c9977682c7b28c60ab01425a72d82a2891a1681627aa530a991d50c086b48a3be27744bde7
-  languageName: node
-  linkType: hard
-
-"public-encrypt@npm:^4.0.0":
-  version: 4.0.3
-  resolution: "public-encrypt@npm:4.0.3"
-  dependencies:
-    bn.js: ^4.1.0
-    browserify-rsa: ^4.0.0
-    create-hash: ^1.1.0
-    parse-asn1: ^5.0.0
-    randombytes: ^2.0.1
-    safe-buffer: ^5.1.2
-  checksum: 215d446e43cef021a20b67c1df455e5eea134af0b1f9b8a35f9e850abf32991b0c307327bc5b9bc07162c288d5cdb3d4a783ea6c6640979ed7b5017e3e0c9935
-  languageName: node
-  linkType: hard
-
-"pump@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "pump@npm:2.0.1"
-  dependencies:
-    end-of-stream: ^1.1.0
-    once: ^1.3.1
-  checksum: e9f26a17be00810bff37ad0171edb35f58b242487b0444f92fb7d78bc7d61442fa9b9c5bd93a43fd8fd8ddd3cc75f1221f5e04c790f42907e5baab7cf5e2b931
-  languageName: node
-  linkType: hard
-
-"pump@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "pump@npm:3.0.0"
-  dependencies:
-    end-of-stream: ^1.1.0
-    once: ^1.3.1
-  checksum: e42e9229fba14732593a718b04cb5e1cfef8254544870997e0ecd9732b189a48e1256e4e5478148ecb47c8511dca2b09eae56b4d0aad8009e6fac8072923cfc9
-  languageName: node
-  linkType: hard
-
-"pumpify@npm:^1.3.3":
-  version: 1.5.1
-  resolution: "pumpify@npm:1.5.1"
-  dependencies:
-    duplexify: ^3.6.0
-    inherits: ^2.0.3
-    pump: ^2.0.0
-  checksum: 26ca412ec8d665bd0d5e185c1b8f627728eff603440d75d22a58e421e3c66eaf86ec6fc6a6efc54808ecef65979279fa8e99b109a23ec1fa8d79f37e6978c9bd
-  languageName: node
-  linkType: hard
-
-"punycode@npm:1.3.2":
-  version: 1.3.2
-  resolution: "punycode@npm:1.3.2"
-  checksum: b8807fd594b1db33335692d1f03e8beeddde6fda7fbb4a2e32925d88d20a3aa4cd8dcc0c109ccaccbd2ba761c208dfaaada83007087ea8bfb0129c9ef1b99ed6
-  languageName: node
-  linkType: hard
-
-"punycode@npm:^1.2.4":
-  version: 1.4.1
-  resolution: "punycode@npm:1.4.1"
-  checksum: fa6e698cb53db45e4628559e557ddaf554103d2a96a1d62892c8f4032cd3bc8871796cae9eabc1bc700e2b6677611521ce5bb1d9a27700086039965d0cf34518
-  languageName: node
-  linkType: hard
-
-"punycode@npm:^2.1.0, punycode@npm:^2.1.1":
-  version: 2.1.1
-  resolution: "punycode@npm:2.1.1"
-  checksum: 823bf443c6dd14f669984dea25757b37993f67e8d94698996064035edd43bed8a5a17a9f12e439c2b35df1078c6bec05a6c86e336209eb1061e8025c481168e8
-  languageName: node
-  linkType: hard
-
-"pvutils@latest, pvutils@npm:^1.0.17":
-  version: 1.0.17
-  resolution: "pvutils@npm:1.0.17"
-  checksum: 370cc6c7ed2cddeb97e85339f4cac06cc07e3195774b0b8707a7994db0acd73451745cc57209a2bc6d4138b9b14d5ab0335e3614743a91010a74db597428dfe8
-  languageName: node
-  linkType: hard
-
-"q@npm:^1.1.2":
-  version: 1.5.1
-  resolution: "q@npm:1.5.1"
-  checksum: 147baa93c805bc1200ed698bdf9c72e9e42c05f96d007e33a558b5fdfd63e5ea130e99313f28efc1783e90e6bdb4e48b67a36fcc026b7b09202437ae88a1fb12
-  languageName: node
-  linkType: hard
-
-"qs@npm:^6.3.0":
-  version: 6.10.1
-  resolution: "qs@npm:6.10.1"
-  dependencies:
-    side-channel: ^1.0.4
-  checksum: 00e390dbf98eff4d8ff121b61ab2fe32106852290de99ecd0e40fc76651c4101f43fc6cc8313cb69423563876fc532951b11dda55d2917def05f292258263480
-  languageName: node
-  linkType: hard
-
-"querystring-es3@npm:^0.2.0":
-  version: 0.2.1
-  resolution: "querystring-es3@npm:0.2.1"
-  checksum: 691e8d6b8b157e7cd49ae8e83fcf86de39ab3ba948c25abaa94fba84c0986c641aa2f597770848c64abce290ed17a39c9df6df737dfa7e87c3b63acc7d225d61
-  languageName: node
-  linkType: hard
-
-"querystring@npm:0.2.0":
-  version: 0.2.0
-  resolution: "querystring@npm:0.2.0"
-  checksum: 8258d6734f19be27e93f601758858c299bdebe71147909e367101ba459b95446fbe5b975bf9beb76390156a592b6f4ac3a68b6087cea165c259705b8b4e56a69
-  languageName: node
-  linkType: hard
-
-"queue-microtask@npm:^1.2.2":
-  version: 1.2.3
-  resolution: "queue-microtask@npm:1.2.3"
-  checksum: b676f8c040cdc5b12723ad2f91414d267605b26419d5c821ff03befa817ddd10e238d22b25d604920340fd73efd8ba795465a0377c4adf45a4a41e4234e42dc4
-  languageName: node
-  linkType: hard
-
-"quick-lru@npm:^5.1.1":
-  version: 5.1.1
-  resolution: "quick-lru@npm:5.1.1"
-  checksum: a516faa25574be7947969883e6068dbe4aa19e8ef8e8e0fd96cddd6d36485e9106d85c0041a27153286b0770b381328f4072aa40d3b18a19f5f7d2b78b94b5ed
-  languageName: node
-  linkType: hard
-
-"quick-temp@npm:^0.1.2, quick-temp@npm:^0.1.3, quick-temp@npm:^0.1.5, quick-temp@npm:^0.1.8":
-  version: 0.1.8
-  resolution: "quick-temp@npm:0.1.8"
-  dependencies:
-    mktemp: ~0.4.0
-    rimraf: ^2.5.4
-    underscore.string: ~3.3.4
-  checksum: b9a60934301afd5cb67a10946f8124e63ccb0cd305d35e2d8e5fe7be80df4d29b8414605ee1e55a714c3b87468856fa92526737569fc5e4a11e056ee192b72c8
-  languageName: node
-  linkType: hard
-
-"qunit-dom@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "qunit-dom@npm:2.0.0"
-  dependencies:
-    broccoli-funnel: ^3.0.3
-    broccoli-merge-trees: ^4.2.0
-    ember-cli-babel: ^7.23.0
-    ember-cli-version-checker: ^5.1.1
-  checksum: f9f06ad19adaaa4f8f107f28fd3feacd65b26d4de647d08b11a844b750ebbed2adbeabab52edc9d8cda2b0b7a0e08812425a5d4698b34f1b2a9af7b6f53b8413
-  languageName: node
-  linkType: hard
-
-"qunit@npm:^2.19.1":
-  version: 2.19.1
-  resolution: "qunit@npm:2.19.1"
-  dependencies:
-    commander: 7.2.0
-    node-watch: 0.7.3
-    tiny-glob: 0.2.9
-  bin:
-    qunit: bin/qunit.js
-  checksum: 12ff673549770d2a51c74ee5fae33260610bd98178fae536490063af61d21f50c302033b65a765e43fc65f2ceb8337912bf3b5ecb2e663731b0728ad6ab6e192
-  languageName: node
-  linkType: hard
-
-"randombytes@npm:^2.0.0, randombytes@npm:^2.0.1, randombytes@npm:^2.0.5, randombytes@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "randombytes@npm:2.1.0"
-  dependencies:
-    safe-buffer: ^5.1.0
-  checksum: d779499376bd4cbb435ef3ab9a957006c8682f343f14089ed5f27764e4645114196e75b7f6abf1cbd84fd247c0cb0651698444df8c9bf30e62120fbbc52269d6
-  languageName: node
-  linkType: hard
-
-"randomfill@npm:^1.0.3":
-  version: 1.0.4
-  resolution: "randomfill@npm:1.0.4"
-  dependencies:
-    randombytes: ^2.0.5
-    safe-buffer: ^5.1.0
-  checksum: 33734bb578a868d29ee1b8555e21a36711db084065d94e019a6d03caa67debef8d6a1bfd06a2b597e32901ddc761ab483a85393f0d9a75838f1912461d4dbfc7
-  languageName: node
-  linkType: hard
-
-"range-parser@npm:~1.2.1":
-  version: 1.2.1
-  resolution: "range-parser@npm:1.2.1"
-  checksum: 0a268d4fea508661cf5743dfe3d5f47ce214fd6b7dec1de0da4d669dd4ef3d2144468ebe4179049eff253d9d27e719c88dae55be64f954e80135a0cada804ec9
-  languageName: node
-  linkType: hard
-
-"raw-body@npm:2.4.0":
-  version: 2.4.0
-  resolution: "raw-body@npm:2.4.0"
-  dependencies:
-    bytes: 3.1.0
-    http-errors: 1.7.2
-    iconv-lite: 0.4.24
-    unpipe: 1.0.0
-  checksum: 6343906939e018c6e633a34a938a5d6d1e93ffcfa48646e00207d53b418e941953b521473950c079347220944dc75ba10e7b3c08bf97e3ac72c7624882db09bb
-  languageName: node
-  linkType: hard
-
-"raw-body@npm:2.5.1":
-  version: 2.5.1
-  resolution: "raw-body@npm:2.5.1"
-  dependencies:
-    bytes: 3.1.2
-    http-errors: 2.0.0
-    iconv-lite: 0.4.24
-    unpipe: 1.0.0
-  checksum: 5362adff1575d691bb3f75998803a0ffed8c64eabeaa06e54b4ada25a0cd1b2ae7f4f5ec46565d1bec337e08b5ac90c76eaa0758de6f72a633f025d754dec29e
-  languageName: node
-  linkType: hard
-
-"raw-body@npm:~1.1.0":
-  version: 1.1.7
-  resolution: "raw-body@npm:1.1.7"
-  dependencies:
-    bytes: 1
-    string_decoder: 0.10
-  checksum: 75ab1815ac54992abccccdffb27bd9ad9f5b6f5fb66e740474ad0d1bd3c1425e407b2be5eb34e0bef3da2c66bfa6a2c2b77498596f5b9999ead2d449fff0226f
-  languageName: node
-  linkType: hard
-
-"read-pkg@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "read-pkg@npm:3.0.0"
-  dependencies:
-    load-json-file: ^4.0.0
-    normalize-package-data: ^2.3.2
-    path-type: ^3.0.0
-  checksum: 398903ebae6c7e9965419a1062924436cc0b6f516c42c4679a90290d2f87448ed8f977e7aa2dbba4aa1ac09248628c43e493ac25b2bc76640e946035200e34c6
-  languageName: node
-  linkType: hard
-
-"readable-stream@npm:1 || 2, readable-stream@npm:^2.0.0, readable-stream@npm:^2.0.1, readable-stream@npm:^2.0.2, readable-stream@npm:^2.1.5, readable-stream@npm:^2.2.2, readable-stream@npm:^2.3.3, readable-stream@npm:^2.3.6, readable-stream@npm:~2.3.6":
-  version: 2.3.7
-  resolution: "readable-stream@npm:2.3.7"
-  dependencies:
-    core-util-is: ~1.0.0
-    inherits: ~2.0.3
-    isarray: ~1.0.0
-    process-nextick-args: ~2.0.0
-    safe-buffer: ~5.1.1
-    string_decoder: ~1.1.1
-    util-deprecate: ~1.0.1
-  checksum: e4920cf7549a60f8aaf694d483a0e61b2a878b969d224f89b3bc788b8d920075132c4b55a7494ee944c7b6a9a0eada28a7f6220d80b0312ece70bbf08eeca755
-  languageName: node
-  linkType: hard
-
-"readable-stream@npm:2 || 3, readable-stream@npm:^3.4.0, readable-stream@npm:^3.6.0":
-  version: 3.6.0
-  resolution: "readable-stream@npm:3.6.0"
-  dependencies:
-    inherits: ^2.0.3
-    string_decoder: ^1.1.1
-    util-deprecate: ^1.0.1
-  checksum: d4ea81502d3799439bb955a3a5d1d808592cf3133350ed352aeaa499647858b27b1c4013984900238b0873ec8d0d8defce72469fb7a83e61d53f5ad61cb80dc8
-  languageName: node
-  linkType: hard
-
-"readable-stream@npm:~1.0.2":
-  version: 1.0.34
-  resolution: "readable-stream@npm:1.0.34"
-  dependencies:
-    core-util-is: ~1.0.0
-    inherits: ~2.0.1
-    isarray: 0.0.1
-    string_decoder: ~0.10.x
-  checksum: 85042c537e4f067daa1448a7e257a201070bfec3dd2706abdbd8ebc7f3418eb4d3ed4b8e5af63e2544d69f88ab09c28d5da3c0b77dc76185fddd189a59863b60
-  languageName: node
-  linkType: hard
-
-"readdirp@npm:^2.2.1":
-  version: 2.2.1
-  resolution: "readdirp@npm:2.2.1"
-  dependencies:
-    graceful-fs: ^4.1.11
-    micromatch: ^3.1.10
-    readable-stream: ^2.0.2
-  checksum: 3879b20f1a871e0e004a14fbf1776e65ee0b746a62f5a416010808b37c272ac49b023c47042c7b1e281cba75a449696635bc64c397ed221ea81d853a8f2ed79a
-  languageName: node
-  linkType: hard
-
-"readdirp@npm:~3.5.0":
-  version: 3.5.0
-  resolution: "readdirp@npm:3.5.0"
-  dependencies:
-    picomatch: ^2.2.1
-  checksum: 6b1a9341e295e15d4fb40c010216cbcb6266587cd0b3ce7defabd66fa1b4e35f9fba3d64c2187fd38fadd01ccbfc5f1b33fdfb1da63b3cbf66224b7c6d75ce5a
-  languageName: node
-  linkType: hard
-
-"readdirp@npm:~3.6.0":
-  version: 3.6.0
-  resolution: "readdirp@npm:3.6.0"
-  dependencies:
-    picomatch: ^2.2.1
-  checksum: 1ced032e6e45670b6d7352d71d21ce7edf7b9b928494dcaba6f11fba63180d9da6cd7061ebc34175ffda6ff529f481818c962952004d273178acd70f7059b320
-  languageName: node
-  linkType: hard
-
-"recast@npm:^0.18.1":
-  version: 0.18.10
-  resolution: "recast@npm:0.18.10"
-  dependencies:
-    ast-types: 0.13.3
-    esprima: ~4.0.0
-    private: ^0.1.8
-    source-map: ~0.6.1
-  checksum: bb6b3083153301985511ed2ae1dd244a6b8e6a1b799ce1e0db49e57162247eec98f38dc7322d13a3680e5ab85be7cdff7edc28b0be11a689f2cb5fd925d6adbb
-  languageName: node
-  linkType: hard
-
-"redeyed@npm:~1.0.0":
-  version: 1.0.1
-  resolution: "redeyed@npm:1.0.1"
-  dependencies:
-    esprima: ~3.0.0
-  checksum: fb189829954ce9dfa1647b38e2fdcbe53857dd6d37d2c66feea3a3f7cf22dafa74b66cef5f3d3d3deb5fe1614aa6966d21372374af5685c0a0e437ee68370d64
-  languageName: node
-  linkType: hard
-
-"regenerate-unicode-properties@npm:^10.0.1":
-  version: 10.0.1
-  resolution: "regenerate-unicode-properties@npm:10.0.1"
-  dependencies:
-    regenerate: ^1.4.2
-  checksum: 1b638b7087d8143e5be3e20e2cda197ea0440fa0bc2cc49646b2f50c5a2b1acdc54b21e4215805a5a2dd487c686b2291accd5ad00619534098d2667e76247754
-  languageName: node
-  linkType: hard
-
-"regenerate-unicode-properties@npm:^9.0.0":
-  version: 9.0.0
-  resolution: "regenerate-unicode-properties@npm:9.0.0"
-  dependencies:
-    regenerate: ^1.4.2
-  checksum: 62df21c274259a68c6fa1373e5ddb4d6f6374ad72c08dd488b7802880bc1c3b6de716303ec56c9f793a73d01815e9d81f03a8fbe3f32bc0f7fdf8d70d4841b64
-  languageName: node
-  linkType: hard
-
-"regenerate@npm:^1.2.1, regenerate@npm:^1.4.2":
-  version: 1.4.2
-  resolution: "regenerate@npm:1.4.2"
-  checksum: 3317a09b2f802da8db09aa276e469b57a6c0dd818347e05b8862959c6193408242f150db5de83c12c3fa99091ad95fb42a6db2c3329bfaa12a0ea4cbbeb30cb0
-  languageName: node
-  linkType: hard
-
-"regenerator-runtime@npm:^0.10.5":
-  version: 0.10.5
-  resolution: "regenerator-runtime@npm:0.10.5"
-  checksum: 35b33dbe5381d268b2be98f4ee4b028702acb38b012bff90723df067f915a337e5c979cce4dab4ed23febb223bbebb8820d46902f897742c55818c22c14e2a7c
-  languageName: node
-  linkType: hard
-
-"regenerator-runtime@npm:^0.11.0":
-  version: 0.11.1
-  resolution: "regenerator-runtime@npm:0.11.1"
-  checksum: 3c97bd2c7b2b3247e6f8e2147a002eb78c995323732dad5dc70fac8d8d0b758d0295e7015b90d3d444446ae77cbd24b9f9123ec3a77018e81d8999818301b4f4
-  languageName: node
-  linkType: hard
-
-"regenerator-runtime@npm:^0.13.11":
-  version: 0.13.11
-  resolution: "regenerator-runtime@npm:0.13.11"
-  checksum: 27481628d22a1c4e3ff551096a683b424242a216fee44685467307f14d58020af1e19660bf2e26064de946bad7eff28950eae9f8209d55723e2d9351e632bbb4
-  languageName: node
-  linkType: hard
-
-"regenerator-runtime@npm:^0.13.4":
-  version: 0.13.9
-  resolution: "regenerator-runtime@npm:0.13.9"
-  checksum: 65ed455fe5afd799e2897baf691ca21c2772e1a969d19bb0c4695757c2d96249eb74ee3553ea34a91062b2a676beedf630b4c1551cc6299afb937be1426ec55e
-  languageName: node
-  linkType: hard
-
-"regenerator-transform@npm:^0.10.0":
-  version: 0.10.1
-  resolution: "regenerator-transform@npm:0.10.1"
-  dependencies:
-    babel-runtime: ^6.18.0
-    babel-types: ^6.19.0
-    private: ^0.1.6
-  checksum: bd366a3b0fa0d0975c48fb9eff250363a9ab28c25b472ecdc397bb19a836746640a30d8f641718a895f9178564bd8a01a0179a9c8e5813f76fc29e62a115d9d7
-  languageName: node
-  linkType: hard
-
-"regenerator-transform@npm:^0.14.2":
-  version: 0.14.5
-  resolution: "regenerator-transform@npm:0.14.5"
-  dependencies:
-    "@babel/runtime": ^7.8.4
-  checksum: a467a3b652b4ec26ff964e9c5f1817523a73fc44cb928b8d21ff11aebeac5d10a84d297fe02cea9f282bcec81a0b0d562237da69ef0f40a0160b30a4fa98bc94
-  languageName: node
-  linkType: hard
-
-"regenerator-transform@npm:^0.15.0":
-  version: 0.15.0
-  resolution: "regenerator-transform@npm:0.15.0"
-  dependencies:
-    "@babel/runtime": ^7.8.4
-  checksum: 86e54849ab1167618d28bb56d214c52a983daf29b0d115c976d79840511420049b6b42c9ebdf187defa8e7129bdd74b6dd266420d0d3868c9fa7f793b5d15d49
-  languageName: node
-  linkType: hard
-
-"regex-not@npm:^1.0.0, regex-not@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "regex-not@npm:1.0.2"
-  dependencies:
-    extend-shallow: ^3.0.2
-    safe-regex: ^1.1.0
-  checksum: 3081403de79559387a35ef9d033740e41818a559512668cef3d12da4e8a29ef34ee13c8ed1256b07e27ae392790172e8a15c8a06b72962fd4550476cde3d8f77
-  languageName: node
-  linkType: hard
-
-"regexp.prototype.flags@npm:^1.3.1":
-  version: 1.3.1
-  resolution: "regexp.prototype.flags@npm:1.3.1"
-  dependencies:
-    call-bind: ^1.0.2
-    define-properties: ^1.1.3
-  checksum: 343595db5a6bbbb3bfbda881f9c74832cfa9fc0039e64a43843f6bb9158b78b921055266510800ed69d4997638890b17a46d55fd9f32961f53ae56ac3ec4dd05
-  languageName: node
-  linkType: hard
-
-"regexpp@npm:^3.0.0, regexpp@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "regexpp@npm:3.1.0"
-  checksum: 63bcb2c98d63274774c79bef256e03f716d25f1fa8427267d0302d1436a83fa0d905f4e8a172fdfa99fb4d84833df2fb3bf7da2a1a868f156e913174c32b1139
-  languageName: node
-  linkType: hard
-
-"regexpp@npm:^3.2.0":
-  version: 3.2.0
-  resolution: "regexpp@npm:3.2.0"
-  checksum: a78dc5c7158ad9ddcfe01aa9144f46e192ddbfa7b263895a70a5c6c73edd9ce85faf7c0430e59ac38839e1734e275b9c3de5c57ee3ab6edc0e0b1bdebefccef8
-  languageName: node
-  linkType: hard
-
-"regexpu-core@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "regexpu-core@npm:2.0.0"
-  dependencies:
-    regenerate: ^1.2.1
-    regjsgen: ^0.2.0
-    regjsparser: ^0.1.4
-  checksum: 14a78eb4608fa991ded6a1433ee6a570f95a4cfb7fe312145a44d6ecbb3dc8c707016a099494c741aa0ac75a1329b40814d30ff134c0d67679c80187029c7d2d
-  languageName: node
-  linkType: hard
-
-"regexpu-core@npm:^4.7.1":
-  version: 4.8.0
-  resolution: "regexpu-core@npm:4.8.0"
-  dependencies:
-    regenerate: ^1.4.2
-    regenerate-unicode-properties: ^9.0.0
-    regjsgen: ^0.5.2
-    regjsparser: ^0.7.0
-    unicode-match-property-ecmascript: ^2.0.0
-    unicode-match-property-value-ecmascript: ^2.0.0
-  checksum: df92e3e6482409f0a0de162ca1b4e17897e9b0b0687caead6804f04e9b89847e47abbfd0bfc62f52a0b833acf764ea5bdb7b707bb088034824a675ee95d31dec
-  languageName: node
-  linkType: hard
-
-"regexpu-core@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "regexpu-core@npm:5.0.1"
-  dependencies:
-    regenerate: ^1.4.2
-    regenerate-unicode-properties: ^10.0.1
-    regjsgen: ^0.6.0
-    regjsparser: ^0.8.2
-    unicode-match-property-ecmascript: ^2.0.0
-    unicode-match-property-value-ecmascript: ^2.0.0
-  checksum: 6151a9700dad512fadb5564ad23246d54c880eb9417efa5e5c3658b910c1ff894d622dfd159af2ed527ffd44751bfe98682ae06c717155c254d8e2b4bab62785
-  languageName: node
-  linkType: hard
-
-"regjsgen@npm:^0.2.0":
-  version: 0.2.0
-  resolution: "regjsgen@npm:0.2.0"
-  checksum: 1f3ae570151e2c29193cdc5a5890c0b83cd8c5029ed69315b0ea303bc2644f9ab5d536d2288fd9b70293fd351d7dd7fc1fc99ebe24554015c894dbce883bcf2b
-  languageName: node
-  linkType: hard
-
-"regjsgen@npm:^0.5.2":
-  version: 0.5.2
-  resolution: "regjsgen@npm:0.5.2"
-  checksum: 87c83d8488affae2493a823904de1a29a1867a07433c5e1142ad749b5606c5589b305fe35bfcc0972cf5a3b0d66b1f7999009e541be39a5d42c6041c59e2fb52
-  languageName: node
-  linkType: hard
-
-"regjsgen@npm:^0.6.0":
-  version: 0.6.0
-  resolution: "regjsgen@npm:0.6.0"
-  checksum: c5158ebd735e75074e41292ade1ff05d85566d205426cc61501e360c450a63baced8512ee3ae238e5c0a0e42969563c7875b08fa69d6f0402daf36bcb3e4d348
-  languageName: node
-  linkType: hard
-
-"regjsparser@npm:^0.1.4":
-  version: 0.1.5
-  resolution: "regjsparser@npm:0.1.5"
-  dependencies:
-    jsesc: ~0.5.0
-  bin:
-    regjsparser: bin/parser
-  checksum: 1feba2f3f2d4f1ef9f5f4e0f20c827cf866d4f65c51502eb64db4d4dd9c656f8c70f6c79537c892bf0fc9592c96f732519f7d8ad4a82f3b622756118ac737970
-  languageName: node
-  linkType: hard
-
-"regjsparser@npm:^0.7.0":
-  version: 0.7.0
-  resolution: "regjsparser@npm:0.7.0"
-  dependencies:
-    jsesc: ~0.5.0
-  bin:
-    regjsparser: bin/parser
-  checksum: fefff9adcab47650817d2c492aac774f11a44b824a4a814e466ebc76313e03e79c50d2babde7e04888296f6ec0fd094e3eeeafa8122c60184de92cdb30636a57
-  languageName: node
-  linkType: hard
-
-"regjsparser@npm:^0.8.2":
-  version: 0.8.4
-  resolution: "regjsparser@npm:0.8.4"
-  dependencies:
-    jsesc: ~0.5.0
-  bin:
-    regjsparser: bin/parser
-  checksum: d069b932491761cda127ce11f6bd2729c3b1b394a35200ec33f1199e937423db28ceb86cf33f0a97c76ecd7c0f8db996476579eaf0d80a1f74c1934f4ca8b27a
-  languageName: node
-  linkType: hard
-
-"remark-footnotes@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "remark-footnotes@npm:3.0.0"
-  dependencies:
-    mdast-util-footnote: ^0.1.0
-    micromark-extension-footnote: ^0.3.0
-  checksum: 5e84afb47b57e512171f8af5146e8ba49817faff761c6cdd14abf26c9f018b497e69e79378d94b3ba529e491d3f0615c60851d3db86de785aa37641bf5bf7f8a
-  languageName: node
-  linkType: hard
-
-"remark-frontmatter@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "remark-frontmatter@npm:3.0.0"
-  dependencies:
-    mdast-util-frontmatter: ^0.2.0
-    micromark-extension-frontmatter: ^0.2.0
-  checksum: 33bbcf36a51ee4c3813106b933766e0dc4b2b50f8eb4da3a4c577ea0278335589b36b182fb2722c9857d0ea9932ac75368a5dff70c8cf2b74f4747c244068976
-  languageName: node
-  linkType: hard
-
-"remark-gfm@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "remark-gfm@npm:1.0.0"
-  dependencies:
-    mdast-util-gfm: ^0.1.0
-    micromark-extension-gfm: ^0.3.0
-  checksum: 877b0f6472a90a490b5d5a1393f46d22c4ab7451b1e83ebd7362e5be9c661b6ed03e76c28f76894f460bedf23345c589d3f412c273ce0d4d442c6a4d65b0eae4
-  languageName: node
-  linkType: hard
-
-"remark-parse@npm:^9.0.0":
-  version: 9.0.0
-  resolution: "remark-parse@npm:9.0.0"
-  dependencies:
-    mdast-util-from-markdown: ^0.8.0
-  checksum: 50104880549639b7dd7ae6f1e23c214915fe9c054f02f3328abdaee3f6de6d7282bf4357c3c5b106958fe75e644a3c248c2197755df34f9955e8e028fc74868f
-  languageName: node
-  linkType: hard
-
-"remove-trailing-separator@npm:^1.0.1":
-  version: 1.1.0
-  resolution: "remove-trailing-separator@npm:1.1.0"
-  checksum: d3c20b5a2d987db13e1cca9385d56ecfa1641bae143b620835ac02a6b70ab88f68f117a0021838db826c57b31373d609d52e4f31aca75fc490c862732d595419
-  languageName: node
-  linkType: hard
-
-"remove-types@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "remove-types@npm:1.0.0"
-  dependencies:
-    "@babel/core": ^7.16.10
-    "@babel/plugin-syntax-decorators": ^7.16.7
-    "@babel/plugin-transform-typescript": ^7.16.8
-    prettier: ^2.5.1
-  checksum: 7665e649c762b4880a4e67a982a8bab0db7d4538c18470736854baf9d8fd0fd22273dccf7263b4d6bf9c3d5145cfa085cb15f700e99c51081891c8eaeee2d137
-  languageName: node
-  linkType: hard
-
-"repeat-element@npm:^1.1.2":
-  version: 1.1.4
-  resolution: "repeat-element@npm:1.1.4"
-  checksum: 1edd0301b7edad71808baad226f0890ba709443f03a698224c9ee4f2494c317892dc5211b2ba8cbea7194a9ddbcac01e283bd66de0467ab24ee1fc1a3711d8a9
-  languageName: node
-  linkType: hard
-
-"repeat-string@npm:^1.0.0, repeat-string@npm:^1.6.1":
-  version: 1.6.1
-  resolution: "repeat-string@npm:1.6.1"
-  checksum: 1b809fc6db97decdc68f5b12c4d1a671c8e3f65ec4a40c238bc5200e44e85bcc52a54f78268ab9c29fcf5fe4f1343e805420056d1f30fa9a9ee4c2d93e3cc6c0
-  languageName: node
-  linkType: hard
-
-"repeating@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "repeating@npm:2.0.1"
-  dependencies:
-    is-finite: ^1.0.0
-  checksum: d2db0b69c5cb0c14dd750036e0abcd6b3c3f7b2da3ee179786b755cf737ca15fa0fff417ca72de33d6966056f4695440e680a352401fc02c95ade59899afbdd0
-  languageName: node
-  linkType: hard
-
-"request-promise-core@npm:1.1.4":
-  version: 1.1.4
-  resolution: "request-promise-core@npm:1.1.4"
-  dependencies:
-    lodash: ^4.17.19
-  peerDependencies:
-    request: ^2.34
-  checksum: c798bafd552961e36fbf5023b1d081e81c3995ab390f1bc8ef38a711ba3fe4312eb94dbd61887073d7356c3499b9380947d7f62faa805797c0dc50f039425699
-  languageName: node
-  linkType: hard
-
-"request-promise-native@npm:^1.0.9":
-  version: 1.0.9
-  resolution: "request-promise-native@npm:1.0.9"
-  dependencies:
-    request-promise-core: 1.1.4
-    stealthy-require: ^1.1.1
-    tough-cookie: ^2.3.3
-  peerDependencies:
-    request: ^2.34
-  checksum: 3e2c694eefac88cb20beef8911ad57a275ab3ccbae0c4ca6c679fffb09d5fd502458aab08791f0814ca914b157adab2d4e472597c97a73be702918e41725ed69
-  languageName: node
-  linkType: hard
-
-"request@npm:^2.88.2":
-  version: 2.88.2
-  resolution: "request@npm:2.88.2"
-  dependencies:
-    aws-sign2: ~0.7.0
-    aws4: ^1.8.0
-    caseless: ~0.12.0
-    combined-stream: ~1.0.6
-    extend: ~3.0.2
-    forever-agent: ~0.6.1
-    form-data: ~2.3.2
-    har-validator: ~5.1.3
-    http-signature: ~1.2.0
-    is-typedarray: ~1.0.0
-    isstream: ~0.1.2
-    json-stringify-safe: ~5.0.1
-    mime-types: ~2.1.19
-    oauth-sign: ~0.9.0
-    performance-now: ^2.1.0
-    qs: ~6.5.2
-    safe-buffer: ^5.1.2
-    tough-cookie: ~2.5.0
-    tunnel-agent: ^0.6.0
-    uuid: ^3.3.2
-  checksum: 4e112c087f6eabe7327869da2417e9d28fcd0910419edd2eb17b6acfc4bfa1dad61954525949c228705805882d8a98a86a0ea12d7f739c01ee92af7062996983
-  languageName: node
-  linkType: hard
-
-"require-directory@npm:^2.1.1":
-  version: 2.1.1
-  resolution: "require-directory@npm:2.1.1"
-  checksum: fb47e70bf0001fdeabdc0429d431863e9475e7e43ea5f94ad86503d918423c1543361cc5166d713eaa7029dd7a3d34775af04764bebff99ef413111a5af18c80
-  languageName: node
-  linkType: hard
-
-"require-from-string@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "require-from-string@npm:2.0.2"
-  checksum: a03ef6895445f33a4015300c426699bc66b2b044ba7b670aa238610381b56d3f07c686251740d575e22f4c87531ba662d06937508f0f3c0f1ddc04db3130560b
-  languageName: node
-  linkType: hard
-
-"require-main-filename@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "require-main-filename@npm:2.0.0"
-  checksum: e9e294695fea08b076457e9ddff854e81bffbe248ed34c1eec348b7abbd22a0d02e8d75506559e2265e96978f3c4720bd77a6dad84755de8162b357eb6c778c7
-  languageName: node
-  linkType: hard
-
-"require-relative@npm:^0.8.7":
-  version: 0.8.7
-  resolution: "require-relative@npm:0.8.7"
-  checksum: f1c3be06977823bba43600344d9ea6fbf8a55bdb81ec76533126849ab4024e6c31c6666f37fa4b5cfeda9c41dee89b8e19597cac02bdefaab42255c6708661ab
-  languageName: node
-  linkType: hard
-
-"requireindex@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "requireindex@npm:1.2.0"
-  checksum: 50d8b10a1ff1fdf6aea7a1870bc7bd238b0fb1917d8d7ca17fd03afc38a65dcd7a8a4eddd031f89128b5f0065833d5c92c4fef67f2c04e8624057fe626c9cf94
-  languageName: node
-  linkType: hard
-
-"requires-port@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "requires-port@npm:1.0.0"
-  checksum: eee0e303adffb69be55d1a214e415cf42b7441ae858c76dfc5353148644f6fd6e698926fc4643f510d5c126d12a705e7c8ed7e38061113bdf37547ab356797ff
-  languageName: node
-  linkType: hard
-
-"reselect@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "reselect@npm:3.0.1"
-  checksum: c7ce544bae92db2dc6e768bc2dcc1248f9a21ada22ab5906c5e3c472e1dbc5f080889e5a715b8a2535e652d74c599dd090f5a68bcbe7e6f88053b7599ef4e8d3
-  languageName: node
-  linkType: hard
-
-"reselect@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "reselect@npm:4.0.0"
-  checksum: ac7dfc9ef2cdb42b6fc87a856f3ce904c2e4363a2bc1e6fb7eea5f78902a6f506e4388e6509752984877c6dbfe501100c076671d334799eb5a1bfe9936cb2c12
-  languageName: node
-  linkType: hard
-
-"resolve-dir@npm:^1.0.0, resolve-dir@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "resolve-dir@npm:1.0.1"
-  dependencies:
-    expand-tilde: ^2.0.0
-    global-modules: ^1.0.0
-  checksum: ef736b8ed60d6645c3b573da17d329bfb50ec4e1d6c5ffd6df49e3497acef9226f9810ea6823b8ece1560e01dcb13f77a9f6180d4f242d00cc9a8f4de909c65c
-  languageName: node
-  linkType: hard
-
-"resolve-from@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "resolve-from@npm:4.0.0"
-  checksum: f4ba0b8494846a5066328ad33ef8ac173801a51739eb4d63408c847da9a2e1c1de1e6cbbf72699211f3d13f8fc1325648b169bd15eb7da35688e30a5fb0e4a7f
-  languageName: node
-  linkType: hard
-
-"resolve-package-path@npm:^1.0.11, resolve-package-path@npm:^1.2.2, resolve-package-path@npm:^1.2.6":
-  version: 1.2.7
-  resolution: "resolve-package-path@npm:1.2.7"
-  dependencies:
-    path-root: ^0.1.1
-    resolve: ^1.10.0
-  checksum: 554855963c8599ef7ce4c29629356891f36652834d0ba39555459009918474fa28bd75332139223e3fb297455f103ae0c880233fa51603c1bc1ba3e2e280b7ec
-  languageName: node
-  linkType: hard
-
-"resolve-package-path@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "resolve-package-path@npm:2.0.0"
-  dependencies:
-    path-root: ^0.1.1
-    resolve: ^1.13.1
-  checksum: 606fab28e752d863bdeef9cef1e67e92830d8e7e0f038f40fbff94f9808a57cb2a810bd70c387c5b438bee626c1753cd11a0d953a7fd28e9dba190910cd6783a
-  languageName: node
-  linkType: hard
-
-"resolve-package-path@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "resolve-package-path@npm:3.1.0"
-  dependencies:
-    path-root: ^0.1.1
-    resolve: ^1.17.0
-  checksum: 9d1d170db3b01e5439bc0918344e7b539c4dece53f68ff2b6c13e3c941bb10c2553b7ea837fef8aee25ce3dd5f404d83eac91a5f5b651a42578bd2df5a301a7e
-  languageName: node
-  linkType: hard
-
-"resolve-package-path@npm:^4.0.0, resolve-package-path@npm:^4.0.1, resolve-package-path@npm:^4.0.3":
-  version: 4.0.3
-  resolution: "resolve-package-path@npm:4.0.3"
-  dependencies:
-    path-root: ^0.1.1
-  checksum: ac68180c66036c8d8b75a747592f7aeb5fd1efbbec10256b535f53e8bbc95e242145338d7d309cd665f509435662b530ece0afbc3a10a13ed2d4ce9d24905a20
-  languageName: node
-  linkType: hard
-
-"resolve-path@npm:^1.4.0":
-  version: 1.4.0
-  resolution: "resolve-path@npm:1.4.0"
-  dependencies:
-    http-errors: ~1.6.2
-    path-is-absolute: 1.0.1
-  checksum: 1a39f569ee54dd5f8ee8576ef8671c9724bea65d9f9982fbb5352af9fb4e500e1e459c1bfb1ae3ebfd8d43a709c3a01dfa4f46cf5b831e45e2caed4f1a208300
-  languageName: node
-  linkType: hard
-
-"resolve-url@npm:^0.2.1":
-  version: 0.2.1
-  resolution: "resolve-url@npm:0.2.1"
-  checksum: 7b7035b9ed6e7bc7d289e90aef1eab5a43834539695dac6416ca6e91f1a94132ae4796bbd173cdacfdc2ade90b5f38a3fb6186bebc1b221cd157777a23b9ad14
-  languageName: node
-  linkType: hard
-
-"resolve@npm:^1.1.7, resolve@npm:^1.10.0, resolve@npm:^1.10.1, resolve@npm:^1.11.1, resolve@npm:^1.12.0, resolve@npm:^1.13.1, resolve@npm:^1.14.2, resolve@npm:^1.17.0, resolve@npm:^1.20.0, resolve@npm:^1.3.3, resolve@npm:^1.4.0, resolve@npm:^1.5.0, resolve@npm:^1.8.1":
-  version: 1.20.0
-  resolution: "resolve@npm:1.20.0"
-  dependencies:
-    is-core-module: ^2.2.0
-    path-parse: ^1.0.6
-  checksum: 40cf70b2cde00ef57f99daf2dc63c6a56d6c14a1b7fc51735d06a6f0a3b97cb67b4fb7ef6c747b4e13a7baba83b0ef625d7c4ce92a483cd5af923c3b65fd16fe
-  languageName: node
-  linkType: hard
-
-"resolve@npm:^1.22.0":
-  version: 1.22.0
-  resolution: "resolve@npm:1.22.0"
-  dependencies:
-    is-core-module: ^2.8.1
-    path-parse: ^1.0.7
-    supports-preserve-symlinks-flag: ^1.0.0
-  bin:
-    resolve: bin/resolve
-  checksum: a2d14cc437b3a23996f8c7367eee5c7cf8149c586b07ca2ae00e96581ce59455555a1190be9aa92154785cf9f2042646c200d0e00e0bbd2b8a995a93a0ed3e4e
-  languageName: node
-  linkType: hard
-
-"resolve@patch:resolve@^1.1.7#~builtin<compat/resolve>, resolve@patch:resolve@^1.10.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.10.1#~builtin<compat/resolve>, resolve@patch:resolve@^1.11.1#~builtin<compat/resolve>, resolve@patch:resolve@^1.12.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.13.1#~builtin<compat/resolve>, resolve@patch:resolve@^1.14.2#~builtin<compat/resolve>, resolve@patch:resolve@^1.17.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.20.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.3.3#~builtin<compat/resolve>, resolve@patch:resolve@^1.4.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.5.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.8.1#~builtin<compat/resolve>":
-  version: 1.20.0
-  resolution: "resolve@patch:resolve@npm%3A1.20.0#~builtin<compat/resolve>::version=1.20.0&hash=c3c19d"
-  dependencies:
-    is-core-module: ^2.2.0
-    path-parse: ^1.0.6
-  checksum: a0dd7d16a8e47af23afa9386df2dff10e3e0debb2c7299a42e581d9d9b04d7ad5d2c53f24f1e043f7b3c250cbdc71150063e53d0b6559683d37f790b7c8c3cd5
-  languageName: node
-  linkType: hard
-
-"resolve@patch:resolve@^1.22.0#~builtin<compat/resolve>":
-  version: 1.22.0
-  resolution: "resolve@patch:resolve@npm%3A1.22.0#~builtin<compat/resolve>::version=1.22.0&hash=c3c19d"
-  dependencies:
-    is-core-module: ^2.8.1
-    path-parse: ^1.0.7
-    supports-preserve-symlinks-flag: ^1.0.0
-  bin:
-    resolve: bin/resolve
-  checksum: c79ecaea36c872ee4a79e3db0d3d4160b593f2ca16e031d8283735acd01715a203607e9ded3f91f68899c2937fa0d49390cddbe0fb2852629212f3cda283f4a7
-  languageName: node
-  linkType: hard
-
-"restore-cursor@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "restore-cursor@npm:2.0.0"
-  dependencies:
-    onetime: ^2.0.0
-    signal-exit: ^3.0.2
-  checksum: 482e13d02d834b6e5e3aa90304a8b5e840775d6f06916cc92a50038adf9f098dcc72405b567da8a37e137ae40ad3e31896fa3136ae62f7a426c2fbf53d036536
-  languageName: node
-  linkType: hard
-
-"restore-cursor@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "restore-cursor@npm:3.1.0"
-  dependencies:
-    onetime: ^5.1.0
-    signal-exit: ^3.0.2
-  checksum: f877dd8741796b909f2a82454ec111afb84eb45890eb49ac947d87991379406b3b83ff9673a46012fca0d7844bb989f45cc5b788254cf1a39b6b5a9659de0630
-  languageName: node
-  linkType: hard
-
-"ret@npm:~0.1.10":
-  version: 0.1.15
-  resolution: "ret@npm:0.1.15"
-  checksum: d76a9159eb8c946586567bd934358dfc08a36367b3257f7a3d7255fdd7b56597235af23c6afa0d7f0254159e8051f93c918809962ebd6df24ca2a83dbe4d4151
-  languageName: node
-  linkType: hard
-
-"retry@npm:^0.12.0":
-  version: 0.12.0
-  resolution: "retry@npm:0.12.0"
-  checksum: 623bd7d2e5119467ba66202d733ec3c2e2e26568074923bc0585b6b99db14f357e79bdedb63cab56cec47491c4a0da7e6021a7465ca6dc4f481d3898fdd3158c
-  languageName: node
-  linkType: hard
-
-"reusify@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "reusify@npm:1.0.4"
-  checksum: c3076ebcc22a6bc252cb0b9c77561795256c22b757f40c0d8110b1300723f15ec0fc8685e8d4ea6d7666f36c79ccc793b1939c748bf36f18f542744a4e379fcc
-  languageName: node
-  linkType: hard
-
-"rimraf@npm:^2.2.8, rimraf@npm:^2.3.4, rimraf@npm:^2.4.3, rimraf@npm:^2.5.3, rimraf@npm:^2.5.4, rimraf@npm:^2.6.1, rimraf@npm:^2.6.2, rimraf@npm:^2.6.3":
-  version: 2.7.1
-  resolution: "rimraf@npm:2.7.1"
-  dependencies:
-    glob: ^7.1.3
-  bin:
-    rimraf: ./bin.js
-  checksum: cdc7f6eacb17927f2a075117a823e1c5951792c6498ebcce81ca8203454a811d4cf8900314154d3259bb8f0b42ab17f67396a8694a54cae3283326e57ad250cd
-  languageName: node
-  linkType: hard
-
-"rimraf@npm:^3.0.0, rimraf@npm:^3.0.1, rimraf@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "rimraf@npm:3.0.2"
-  dependencies:
-    glob: ^7.1.3
-  bin:
-    rimraf: bin.js
-  checksum: 87f4164e396f0171b0a3386cc1877a817f572148ee13a7e113b238e48e8a9f2f31d009a92ec38a591ff1567d9662c6b67fd8818a2dbbaed74bc26a87a2a4a9a0
-  languageName: node
-  linkType: hard
-
-"rimraf@npm:~2.6.2":
-  version: 2.6.3
-  resolution: "rimraf@npm:2.6.3"
-  dependencies:
-    glob: ^7.1.3
-  bin:
-    rimraf: ./bin.js
-  checksum: 3ea587b981a19016297edb96d1ffe48af7e6af69660e3b371dbfc73722a73a0b0e9be5c88089fbeeb866c389c1098e07f64929c7414290504b855f54f901ab10
-  languageName: node
-  linkType: hard
-
-"ripemd160@npm:^2.0.0, ripemd160@npm:^2.0.1":
-  version: 2.0.2
-  resolution: "ripemd160@npm:2.0.2"
-  dependencies:
-    hash-base: ^3.0.0
-    inherits: ^2.0.1
-  checksum: 006accc40578ee2beae382757c4ce2908a826b27e2b079efdcd2959ee544ddf210b7b5d7d5e80467807604244e7388427330f5c6d4cd61e6edaddc5773ccc393
-  languageName: node
-  linkType: hard
-
-"rollup-pluginutils@npm:^2.0.1, rollup-pluginutils@npm:^2.6.0, rollup-pluginutils@npm:^2.8.1":
-  version: 2.8.2
-  resolution: "rollup-pluginutils@npm:2.8.2"
-  dependencies:
-    estree-walker: ^0.6.1
-  checksum: 339fdf866d8f4ff6e408fa274c0525412f7edb01dc46b5ccda51f575b7e0d20ad72965773376fb5db95a77a7fcfcab97bf841ec08dbadf5d6b08af02b7a2cf5e
-  languageName: node
-  linkType: hard
-
-"rollup@npm:^0.57.1":
-  version: 0.57.1
-  resolution: "rollup@npm:0.57.1"
-  dependencies:
-    "@types/acorn": ^4.0.3
-    acorn: ^5.5.3
-    acorn-dynamic-import: ^3.0.0
-    date-time: ^2.1.0
-    is-reference: ^1.1.0
-    locate-character: ^2.0.5
-    pretty-ms: ^3.1.0
-    require-relative: ^0.8.7
-    rollup-pluginutils: ^2.0.1
-    signal-exit: ^3.0.2
-    sourcemap-codec: ^1.4.1
-  bin:
-    rollup: ./bin/rollup
-  checksum: 602691dfa734baec73a1988f34287e802a5498555a7fbe607135de4489cdb6ec49eea5902a850a25b96bf3a862e8cadbbffbd6ddf9986663d3f5ce4a0cb38519
-  languageName: node
-  linkType: hard
-
-"rollup@npm:^1.12.0":
-  version: 1.32.1
-  resolution: "rollup@npm:1.32.1"
-  dependencies:
-    "@types/estree": "*"
-    "@types/node": "*"
-    acorn: ^7.1.0
-  bin:
-    rollup: dist/bin/rollup
-  checksum: 3a02731c20c71321fae647c9c9cab0febee0580c6af029fdcd5dd6f424b8c85119d92c8554c6837327fd323c2458e92d955bbebc90ca6bed87cc626695e7c31f
-  languageName: node
-  linkType: hard
-
-"rollup@npm:^2.50.0":
-  version: 2.70.1
-  resolution: "rollup@npm:2.70.1"
-  dependencies:
-    fsevents: ~2.3.2
-  dependenciesMeta:
-    fsevents:
-      optional: true
-  bin:
-    rollup: dist/bin/rollup
-  checksum: 06c62933e6e81a1c8c684d7d576e507081aabdb63cc0c91bca86b7348b66df03b77827068e4990b8b6c738bd3ef66dcc8c7ed7e0ea40b736068e7618f693133e
-  languageName: node
-  linkType: hard
-
-"route-recognizer@npm:^0.3.3":
-  version: 0.3.4
-  resolution: "route-recognizer@npm:0.3.4"
-  checksum: 9586704491b26716eba1bdbb4a386893ecaab80c6dbf34e394957063b941ebf336ca09222f0892c9d118c609fa9b972d6e73e454abd4382acdc34dbb878e87f2
-  languageName: node
-  linkType: hard
-
-"rsvp@npm:^3.0.14, rsvp@npm:^3.0.17, rsvp@npm:^3.0.18, rsvp@npm:^3.0.21, rsvp@npm:^3.0.6, rsvp@npm:^3.1.0":
-  version: 3.6.2
-  resolution: "rsvp@npm:3.6.2"
-  checksum: 08504ea7ab3dba0349ff820011a460da69de08edf7149ee672f4511310ee4bd3767bfa83b6db019fa99b144125e1e93e6fba122d75a702a005360393f4352864
-  languageName: node
-  linkType: hard
-
-"rsvp@npm:^4.7.0, rsvp@npm:^4.8.1, rsvp@npm:^4.8.2, rsvp@npm:^4.8.4, rsvp@npm:^4.8.5":
-  version: 4.8.5
-  resolution: "rsvp@npm:4.8.5"
-  checksum: 2d8ef30d8febdf05bdf856ccca38001ae3647e41835ca196bc1225333f79b94ae44def733121ca549ccc36209c9b689f6586905e2a043873262609744da8efc1
-  languageName: node
-  linkType: hard
-
-"rsvp@npm:~3.2.1":
-  version: 3.2.1
-  resolution: "rsvp@npm:3.2.1"
-  checksum: e2ac49cbe35b8c2701b07698066d7cd8004115b070f3352d45759dfcd820fa57e687230331ba41f5a40e1871789cbf122de6e73559598777a0b18b66953dc09b
-  languageName: node
-  linkType: hard
-
-"run-async@npm:^2.2.0, run-async@npm:^2.4.0":
-  version: 2.4.1
-  resolution: "run-async@npm:2.4.1"
-  checksum: a2c88aa15df176f091a2878eb840e68d0bdee319d8d97bbb89112223259cebecb94bc0defd735662b83c2f7a30bed8cddb7d1674eb48ae7322dc602b22d03797
-  languageName: node
-  linkType: hard
-
-"run-parallel@npm:^1.1.9":
-  version: 1.2.0
-  resolution: "run-parallel@npm:1.2.0"
-  dependencies:
-    queue-microtask: ^1.2.2
-  checksum: cb4f97ad25a75ebc11a8ef4e33bb962f8af8516bb2001082ceabd8902e15b98f4b84b4f8a9b222e5d57fc3bd1379c483886ed4619367a7680dad65316993021d
-  languageName: node
-  linkType: hard
-
-"run-queue@npm:^1.0.0, run-queue@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "run-queue@npm:1.0.3"
-  dependencies:
-    aproba: ^1.1.1
-  checksum: c4541e18b5e056af60f398f2f1b3d89aae5c093d1524bf817c5ee68bcfa4851ad9976f457a9aea135b1d0d72ee9a91c386e3d136bcd95b699c367cd09c70be53
-  languageName: node
-  linkType: hard
-
-"rw@npm:1":
-  version: 1.3.3
-  resolution: "rw@npm:1.3.3"
-  checksum: c20d82421f5a71c86a13f76121b751553a99cd4a70ea27db86f9b23f33db941f3f06019c30f60d50c356d0bd674c8e74764ac146ea55e217c091bde6fba82aa3
-  languageName: node
-  linkType: hard
-
-"rxjs@npm:^6.4.0, rxjs@npm:^6.6.0, rxjs@npm:^6.6.7":
-  version: 6.6.7
-  resolution: "rxjs@npm:6.6.7"
-  dependencies:
-    tslib: ^1.9.0
-  checksum: bc334edef1bb8bbf56590b0b25734ba0deaf8825b703256a93714308ea36dff8a11d25533671adf8e104e5e8f256aa6fdfe39b2e248cdbd7a5f90c260acbbd1b
-  languageName: node
-  linkType: hard
-
-"rxjs@npm:^7.5.6":
-  version: 7.5.7
-  resolution: "rxjs@npm:7.5.7"
-  dependencies:
-    tslib: ^2.1.0
-  checksum: edabcdb73b0f7e0f5f6e05c2077aff8c52222ac939069729704357d6406438acca831c24210db320aba269e86dbe1a400f3769c89101791885121a342fb15d9c
-  languageName: node
-  linkType: hard
-
-"safe-buffer@npm:5.1.2, safe-buffer@npm:~5.1.0, safe-buffer@npm:~5.1.1":
-  version: 5.1.2
-  resolution: "safe-buffer@npm:5.1.2"
-  checksum: f2f1f7943ca44a594893a852894055cf619c1fbcb611237fc39e461ae751187e7baf4dc391a72125e0ac4fb2d8c5c0b3c71529622e6a58f46b960211e704903c
-  languageName: node
-  linkType: hard
-
-"safe-buffer@npm:5.2.1, safe-buffer@npm:>=5.1.0, safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.0, safe-buffer@npm:^5.1.1, safe-buffer@npm:^5.1.2, safe-buffer@npm:^5.2.0, safe-buffer@npm:~5.2.0":
-  version: 5.2.1
-  resolution: "safe-buffer@npm:5.2.1"
-  checksum: b99c4b41fdd67a6aaf280fcd05e9ffb0813654894223afb78a31f14a19ad220bba8aba1cb14eddce1fcfb037155fe6de4e861784eb434f7d11ed58d1e70dd491
-  languageName: node
-  linkType: hard
-
-"safe-identifier@npm:^0.4.1":
-  version: 0.4.2
-  resolution: "safe-identifier@npm:0.4.2"
-  checksum: 67e28ed89a74cf20b827419003d3cb60a0ebaec0771c2c818f4b2239bf4f96e01ad90aa8db6dc57ee90c0c438b6f46323e4b5a3d955d18d8c4e158ea035cabdd
-  languageName: node
-  linkType: hard
-
-"safe-json-parse@npm:~1.0.1":
-  version: 1.0.1
-  resolution: "safe-json-parse@npm:1.0.1"
-  checksum: aea585d967fb373903aae99e6e31157a68ebebdc9d0011bc86732b6c700994768349e30d4fb6dfdc346106004a85104187d0b48964fe1caff90b0886df5827eb
-  languageName: node
-  linkType: hard
-
-"safe-regex@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "safe-regex@npm:1.1.0"
-  dependencies:
-    ret: ~0.1.10
-  checksum: 9a8bba57c87a841f7997b3b951e8e403b1128c1a4fd1182f40cc1a20e2d490593d7c2a21030fadfea320c8e859219019e136f678c6689ed5960b391b822f01d5
-  languageName: node
-  linkType: hard
-
-"safe-stable-stringify@npm:^2.2.0":
-  version: 2.4.0
-  resolution: "safe-stable-stringify@npm:2.4.0"
-  checksum: 5c9e4b2b2423470becafe232244948e7ce9545baaa65d67965e8c36536c93d2f7b4c1ddeb4bba8a912d0325e02c7691f24dd4de6935a9c1221402c17582ae1c1
-  languageName: node
-  linkType: hard
-
-"safe-stable-stringify@npm:^2.3.1":
-  version: 2.3.1
-  resolution: "safe-stable-stringify@npm:2.3.1"
-  checksum: a0a0bad0294c3e2a9d1bf3cf2b1096dfb83c162d09a5e4891e488cce082120bd69161d2a92aae7fc48255290f17700decae9c89a07fe139794e61b5c8b411377
-  languageName: node
-  linkType: hard
-
-"safer-buffer@npm:>= 2.1.2 < 3, safer-buffer@npm:>= 2.1.2 < 3.0.0, safer-buffer@npm:^2.0.2, safer-buffer@npm:^2.1.0, safer-buffer@npm:~2.1.0":
-  version: 2.1.2
-  resolution: "safer-buffer@npm:2.1.2"
-  checksum: cab8f25ae6f1434abee8d80023d7e72b598cf1327164ddab31003c51215526801e40b66c5e65d658a0af1e9d6478cadcb4c745f4bd6751f97d8644786c0978b0
-  languageName: node
-  linkType: hard
-
-"sane@npm:^4.0.0":
-  version: 4.1.0
-  resolution: "sane@npm:4.1.0"
-  dependencies:
-    "@cnakazawa/watch": ^1.0.3
-    anymatch: ^2.0.0
-    capture-exit: ^2.0.0
-    exec-sh: ^0.3.2
-    execa: ^1.0.0
-    fb-watchman: ^2.0.0
-    micromatch: ^3.1.4
-    minimist: ^1.1.1
-    walker: ~1.0.5
-  bin:
-    sane: ./src/cli.js
-  checksum: 97716502d456c0d38670a902a4ea943d196dcdf998d1e40532d8f3e24e25d7eddfd4c3579025a1eee8eac09a48dfd05fba61a2156c56704e7feaa450eb249f7c
-  languageName: node
-  linkType: hard
-
-"sane@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "sane@npm:5.0.1"
-  dependencies:
-    "@cnakazawa/watch": ^1.0.3
-    anymatch: ^3.1.1
-    capture-exit: ^2.0.0
-    exec-sh: ^0.3.4
-    execa: ^4.0.0
-    fb-watchman: ^2.0.1
-    micromatch: ^4.0.2
-    minimist: ^1.1.1
-    walker: ~1.0.5
-  bin:
-    sane: src/cli.js
-  checksum: 137c419e28dea9f8fc31c1817012d335d511dd8d5a1527f87742b7a4e904e009f62d52fab933d565c10c2fcf6113aa5c30a99d2eb651b63e835ea73de6267615
-  languageName: node
-  linkType: hard
-
-"sass-svg-uri@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "sass-svg-uri@npm:1.0.0"
-  checksum: 75a2af6cc4ac44c262309f51c290a1a5120ab5cd45cabafd0faabd9ad3bb6898417d3993fdfdf65efbf0ff9878d105d2bb8e1502db29f13c41974fb4adaa3f1a
-  languageName: node
-  linkType: hard
-
-"sass@npm:^1.58.3":
-  version: 1.58.3
-  resolution: "sass@npm:1.58.3"
-  dependencies:
-    chokidar: ">=3.0.0 <4.0.0"
-    immutable: ^4.0.0
-    source-map-js: ">=0.6.2 <2.0.0"
-  bin:
-    sass: sass.js
-  checksum: 35a2b98c037ef80fdc93c9b0be846e6ccc7d75596351a37ee79c397e66666d0a754c52c4696e746c0aff32327471e185343ca349e998a58340411adc9d0489a5
-  languageName: node
-  linkType: hard
-
-"sax@npm:~1.2.4":
-  version: 1.2.4
-  resolution: "sax@npm:1.2.4"
-  checksum: d3df7d32b897a2c2f28e941f732c71ba90e27c24f62ee918bd4d9a8cfb3553f2f81e5493c7f0be94a11c1911b643a9108f231dd6f60df3fa9586b5d2e3e9e1fe
-  languageName: node
-  linkType: hard
-
-"saxes@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "saxes@npm:5.0.1"
-  dependencies:
-    xmlchars: ^2.2.0
-  checksum: 5636b55cf15f7cf0baa73f2797bf992bdcf75d1b39d82c0aa4608555c774368f6ac321cb641fd5f3d3ceb87805122cd47540da6a7b5960fe0dbdb8f8c263f000
-  languageName: node
-  linkType: hard
-
-"schema-utils@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "schema-utils@npm:1.0.0"
-  dependencies:
-    ajv: ^6.1.0
-    ajv-errors: ^1.0.0
-    ajv-keywords: ^3.1.0
-  checksum: e8273b4f6eff9ddf4a4f4c11daf7b96b900237bf8859c86fa1e9b4fab416b72d7ea92468f8db89c18a3499a1070206e1c8a750c83b42d5325fc659cbb55eee88
-  languageName: node
-  linkType: hard
-
-"schema-utils@npm:^2.6.5":
-  version: 2.7.1
-  resolution: "schema-utils@npm:2.7.1"
-  dependencies:
-    "@types/json-schema": ^7.0.5
-    ajv: ^6.12.4
-    ajv-keywords: ^3.5.2
-  checksum: 32c62fc9e28edd101e1bd83453a4216eb9bd875cc4d3775e4452b541908fa8f61a7bbac8ffde57484f01d7096279d3ba0337078e85a918ecbeb72872fb09fb2b
-  languageName: node
-  linkType: hard
-
-"schema-utils@npm:^3.0.0, schema-utils@npm:^3.1.0, schema-utils@npm:^3.1.1":
-  version: 3.1.1
-  resolution: "schema-utils@npm:3.1.1"
-  dependencies:
-    "@types/json-schema": ^7.0.8
-    ajv: ^6.12.5
-    ajv-keywords: ^3.5.2
-  checksum: fb73f3d759d43ba033c877628fe9751620a26879f6301d3dbeeb48cf2a65baec5cdf99da65d1bf3b4ff5444b2e59cbe4f81c2456b5e0d2ba7d7fd4aed5da29ce
-  languageName: node
-  linkType: hard
-
-"schema-utils@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "schema-utils@npm:4.0.0"
-  dependencies:
-    "@types/json-schema": ^7.0.9
-    ajv: ^8.8.0
-    ajv-formats: ^2.1.1
-    ajv-keywords: ^5.0.0
-  checksum: c843e92fdd1a5c145dbb6ffdae33e501867f9703afac67bdf35a685e49f85b1dcc10ea250033175a64bd9d31f0555bc6785b8359da0c90bcea30cf6dfbb55a8f
-  languageName: node
-  linkType: hard
-
-"select@npm:^1.1.2":
-  version: 1.1.2
-  resolution: "select@npm:1.1.2"
-  checksum: 4346151e94f226ea6131e44e68e6d837f3fdee64831b756dd657cc0b02f4cb5107f867cb34a1d1216ab7737d0bf0645d44546afb030bbd8d64e891f5e4c4814e
-  languageName: node
-  linkType: hard
-
-"semver-compare@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "semver-compare@npm:1.0.0"
-  checksum: dd1d7e2909744cf2cf71864ac718efc990297f9de2913b68e41a214319e70174b1d1793ac16e31183b128c2b9812541300cb324db8168e6cf6b570703b171c68
-  languageName: node
-  linkType: hard
-
-"semver@npm:2 || 3 || 4 || 5, semver@npm:^5.3.0, semver@npm:^5.4.1, semver@npm:^5.5.0, semver@npm:^5.6.0":
-  version: 5.7.1
-  resolution: "semver@npm:5.7.1"
-  bin:
-    semver: ./bin/semver
-  checksum: 57fd0acfd0bac382ee87cd52cd0aaa5af086a7dc8d60379dfe65fea491fb2489b6016400813930ecd61fd0952dae75c115287a1b16c234b1550887117744dfaf
-  languageName: node
-  linkType: hard
-
-"semver@npm:7.0.0":
-  version: 7.0.0
-  resolution: "semver@npm:7.0.0"
-  bin:
-    semver: bin/semver.js
-  checksum: 272c11bf8d083274ef79fe40a81c55c184dff84dd58e3c325299d0927ba48cece1f020793d138382b85f89bab5002a35a5ba59a3a68a7eebbb597eb733838778
-  languageName: node
-  linkType: hard
-
-"semver@npm:7.3.5, semver@npm:^7.2.1, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5":
-  version: 7.3.5
-  resolution: "semver@npm:7.3.5"
-  dependencies:
-    lru-cache: ^6.0.0
-  bin:
-    semver: bin/semver.js
-  checksum: 5eafe6102bea2a7439897c1856362e31cc348ccf96efd455c8b5bc2c61e6f7e7b8250dc26b8828c1d76a56f818a7ee907a36ae9fb37a599d3d24609207001d60
-  languageName: node
-  linkType: hard
-
-"semver@npm:^6.0.0, semver@npm:^6.1.0, semver@npm:^6.1.1, semver@npm:^6.1.2, semver@npm:^6.3.0":
-  version: 6.3.0
-  resolution: "semver@npm:6.3.0"
-  bin:
-    semver: ./bin/semver.js
-  checksum: 1b26ecf6db9e8292dd90df4e781d91875c0dcc1b1909e70f5d12959a23c7eebb8f01ea581c00783bbee72ceeaad9505797c381756326073850dc36ed284b21b9
-  languageName: node
-  linkType: hard
-
-"semver@npm:^7.3.7":
-  version: 7.3.7
-  resolution: "semver@npm:7.3.7"
-  dependencies:
-    lru-cache: ^6.0.0
-  bin:
-    semver: bin/semver.js
-  checksum: 2fa3e877568cd6ce769c75c211beaed1f9fce80b28338cadd9d0b6c40f2e2862bafd62c19a6cff42f3d54292b7c623277bcab8816a2b5521cf15210d43e75232
-  languageName: node
-  linkType: hard
-
-"semver@npm:^7.3.8":
-  version: 7.3.8
-  resolution: "semver@npm:7.3.8"
-  dependencies:
-    lru-cache: ^6.0.0
-  bin:
-    semver: bin/semver.js
-  checksum: ba9c7cbbf2b7884696523450a61fee1a09930d888b7a8d7579025ad93d459b2d1949ee5bbfeb188b2be5f4ac163544c5e98491ad6152df34154feebc2cc337c1
-  languageName: node
-  linkType: hard
-
-"send@npm:0.17.1":
-  version: 0.17.1
-  resolution: "send@npm:0.17.1"
-  dependencies:
-    debug: 2.6.9
-    depd: ~1.1.2
-    destroy: ~1.0.4
-    encodeurl: ~1.0.2
-    escape-html: ~1.0.3
-    etag: ~1.8.1
-    fresh: 0.5.2
-    http-errors: ~1.7.2
-    mime: 1.6.0
-    ms: 2.1.1
-    on-finished: ~2.3.0
-    range-parser: ~1.2.1
-    statuses: ~1.5.0
-  checksum: d214c2fa42e7fae3f8fc1aa3931eeb3e6b78c2cf141574e09dbe159915c1e3a337269fc6b7512e7dfddcd7d6ff5974cb62f7c3637ba86a55bde20a92c18bdca0
-  languageName: node
-  linkType: hard
-
-"send@npm:0.18.0":
-  version: 0.18.0
-  resolution: "send@npm:0.18.0"
-  dependencies:
-    debug: 2.6.9
-    depd: 2.0.0
-    destroy: 1.2.0
-    encodeurl: ~1.0.2
-    escape-html: ~1.0.3
-    etag: ~1.8.1
-    fresh: 0.5.2
-    http-errors: 2.0.0
-    mime: 1.6.0
-    ms: 2.1.3
-    on-finished: 2.4.1
-    range-parser: ~1.2.1
-    statuses: 2.0.1
-  checksum: 74fc07ebb58566b87b078ec63e5a3e41ecd987e4272ba67b7467e86c6ad51bc6b0b0154133b6d8b08a2ddda360464f71382f7ef864700f34844a76c8027817a8
-  languageName: node
-  linkType: hard
-
-"serialize-javascript@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "serialize-javascript@npm:3.1.0"
-  dependencies:
-    randombytes: ^2.1.0
-  checksum: 0fc0131a78168d6237cfe1b21564f20a3b9b72e8ceebb21935baacf026631ed636912c20c7e9fa721a8f27a247e6f9849e705f27032d19863333c2cfab16d1c9
-  languageName: node
-  linkType: hard
-
-"serve-static@npm:1.14.1":
-  version: 1.14.1
-  resolution: "serve-static@npm:1.14.1"
-  dependencies:
-    encodeurl: ~1.0.2
-    escape-html: ~1.0.3
-    parseurl: ~1.3.3
-    send: 0.17.1
-  checksum: c6b268e8486d39ecd54b86c7f2d0ee4a38cd7514ddd9c92c8d5793bb005afde5e908b12395898ae206782306ccc848193d93daa15b86afb3cbe5a8414806abe8
-  languageName: node
-  linkType: hard
-
-"serve-static@npm:1.15.0":
-  version: 1.15.0
-  resolution: "serve-static@npm:1.15.0"
-  dependencies:
-    encodeurl: ~1.0.2
-    escape-html: ~1.0.3
-    parseurl: ~1.3.3
-    send: 0.18.0
-  checksum: af57fc13be40d90a12562e98c0b7855cf6e8bd4c107fe9a45c212bf023058d54a1871b1c89511c3958f70626fff47faeb795f5d83f8cf88514dbaeb2b724464d
-  languageName: node
-  linkType: hard
-
-"set-blocking@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "set-blocking@npm:2.0.0"
-  checksum: 6e65a05f7cf7ebdf8b7c75b101e18c0b7e3dff4940d480efed8aad3a36a4005140b660fa1d804cb8bce911cac290441dc728084a30504d3516ac2ff7ad607b02
-  languageName: node
-  linkType: hard
-
-"set-value@npm:^2.0.0, set-value@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "set-value@npm:2.0.1"
-  dependencies:
-    extend-shallow: ^2.0.1
-    is-extendable: ^0.1.1
-    is-plain-object: ^2.0.3
-    split-string: ^3.0.1
-  checksum: 09a4bc72c94641aeae950eb60dc2755943b863780fcc32e441eda964b64df5e3f50603d5ebdd33394ede722528bd55ed43aae26e9df469b4d32e2292b427b601
-  languageName: node
-  linkType: hard
-
-"setimmediate@npm:^1.0.4":
-  version: 1.0.5
-  resolution: "setimmediate@npm:1.0.5"
-  checksum: c9a6f2c5b51a2dabdc0247db9c46460152ffc62ee139f3157440bd48e7c59425093f42719ac1d7931f054f153e2d26cf37dfeb8da17a794a58198a2705e527fd
-  languageName: node
-  linkType: hard
-
-"setprototypeof@npm:1.1.0":
-  version: 1.1.0
-  resolution: "setprototypeof@npm:1.1.0"
-  checksum: 27cb44304d6c9e1a23bc6c706af4acaae1a7aa1054d4ec13c05f01a99fd4887109a83a8042b67ad90dbfcd100d43efc171ee036eb080667172079213242ca36e
-  languageName: node
-  linkType: hard
-
-"setprototypeof@npm:1.1.1":
-  version: 1.1.1
-  resolution: "setprototypeof@npm:1.1.1"
-  checksum: a8bee29c1c64c245d460ce53f7460af8cbd0aceac68d66e5215153992cc8b3a7a123416353e0c642060e85cc5fd4241c92d1190eec97eda0dcb97436e8fcca3b
-  languageName: node
-  linkType: hard
-
-"setprototypeof@npm:1.2.0":
-  version: 1.2.0
-  resolution: "setprototypeof@npm:1.2.0"
-  checksum: be18cbbf70e7d8097c97f713a2e76edf84e87299b40d085c6bf8b65314e994cc15e2e317727342fa6996e38e1f52c59720b53fe621e2eb593a6847bf0356db89
-  languageName: node
-  linkType: hard
-
-"sha.js@npm:^2.4.0, sha.js@npm:^2.4.8":
-  version: 2.4.11
-  resolution: "sha.js@npm:2.4.11"
-  dependencies:
-    inherits: ^2.0.1
-    safe-buffer: ^5.0.1
-  bin:
-    sha.js: ./bin.js
-  checksum: ebd3f59d4b799000699097dadb831c8e3da3eb579144fd7eb7a19484cbcbb7aca3c68ba2bb362242eb09e33217de3b4ea56e4678184c334323eca24a58e3ad07
-  languageName: node
-  linkType: hard
-
-"shebang-command@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "shebang-command@npm:1.2.0"
-  dependencies:
-    shebang-regex: ^1.0.0
-  checksum: 9eed1750301e622961ba5d588af2212505e96770ec376a37ab678f965795e995ade7ed44910f5d3d3cb5e10165a1847f52d3348c64e146b8be922f7707958908
-  languageName: node
-  linkType: hard
-
-"shebang-command@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "shebang-command@npm:2.0.0"
-  dependencies:
-    shebang-regex: ^3.0.0
-  checksum: 6b52fe87271c12968f6a054e60f6bde5f0f3d2db483a1e5c3e12d657c488a15474121a1d55cd958f6df026a54374ec38a4a963988c213b7570e1d51575cea7fa
-  languageName: node
-  linkType: hard
-
-"shebang-regex@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "shebang-regex@npm:1.0.0"
-  checksum: 404c5a752cd40f94591dfd9346da40a735a05139dac890ffc229afba610854d8799aaa52f87f7e0c94c5007f2c6af55bdcaeb584b56691926c5eaf41dc8f1372
-  languageName: node
-  linkType: hard
-
-"shebang-regex@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "shebang-regex@npm:3.0.0"
-  checksum: 1a2bcae50de99034fcd92ad4212d8e01eedf52c7ec7830eedcf886622804fe36884278f2be8be0ea5fde3fd1c23911643a4e0f726c8685b61871c8908af01222
-  languageName: node
-  linkType: hard
-
-"shell-quote@npm:^1.6.1":
-  version: 1.7.2
-  resolution: "shell-quote@npm:1.7.2"
-  checksum: efad426fb25d8a54d06363f1f45774aa9e195f62f14fa696d542b44bfe418ab41206448b63af18d726c62e099e66d9a3f4f44858b9ea2ce4b794b41b802672d1
-  languageName: node
-  linkType: hard
-
-"shellwords@npm:^0.1.1":
-  version: 0.1.1
-  resolution: "shellwords@npm:0.1.1"
-  checksum: 8d73a5e9861f5e5f1068e2cfc39bc0002400fe58558ab5e5fa75630d2c3adf44ca1fac81957609c8320d5533e093802fcafc72904bf1a32b95de3c19a0b1c0d4
-  languageName: node
-  linkType: hard
-
-"side-channel@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "side-channel@npm:1.0.4"
-  dependencies:
-    call-bind: ^1.0.0
-    get-intrinsic: ^1.0.2
-    object-inspect: ^1.9.0
-  checksum: 351e41b947079c10bd0858364f32bb3a7379514c399edb64ab3dce683933483fc63fb5e4efe0a15a2e8a7e3c436b6a91736ddb8d8c6591b0460a24bb4a1ee245
-  languageName: node
-  linkType: hard
-
-"signal-exit@npm:^3.0.0, signal-exit@npm:^3.0.2":
-  version: 3.0.6
-  resolution: "signal-exit@npm:3.0.6"
-  checksum: b819ac81ba757af559dad0804233ae31bf6f054591cd8a671e9cbcf09f21c72ec3076fe87d1e04861f5b33b47d63f0694b568de99c99cd733ee2060515beb6d5
-  languageName: node
-  linkType: hard
-
-"signal-exit@npm:^3.0.3, signal-exit@npm:^3.0.7":
-  version: 3.0.7
-  resolution: "signal-exit@npm:3.0.7"
-  checksum: a2f098f247adc367dffc27845853e9959b9e88b01cb301658cfe4194352d8d2bb32e18467c786a7fe15f1d44b233ea35633d076d5e737870b7139949d1ab6318
-  languageName: node
-  linkType: hard
-
-"silent-error@npm:^1.0.0, silent-error@npm:^1.0.1, silent-error@npm:^1.1.0, silent-error@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "silent-error@npm:1.1.1"
-  dependencies:
-    debug: ^2.2.0
-  checksum: 4b35a081351acf5610bca231f8788fde72de17e0ab35b6d54a3090dac16ecec56becdbc619da756eee84b134f2030f806a105c70f8fcc6544738654b8aceefd7
-  languageName: node
-  linkType: hard
-
-"simple-html-tokenizer@npm:^0.5.11, simple-html-tokenizer@npm:^0.5.8":
-  version: 0.5.11
-  resolution: "simple-html-tokenizer@npm:0.5.11"
-  checksum: f834a5a0b169ffe10f74bd479a071a7161e0186669e28a1cd662efacdaedd27667469e2b965d5a8538d9d8e7373cb741ea8d748259221f40fa3e4bda2efbdbfc
-  languageName: node
-  linkType: hard
-
-"sinon@npm:^7.4.2":
-  version: 7.5.0
-  resolution: "sinon@npm:7.5.0"
-  dependencies:
-    "@sinonjs/commons": ^1.4.0
-    "@sinonjs/formatio": ^3.2.1
-    "@sinonjs/samsam": ^3.3.3
-    diff: ^3.5.0
-    lolex: ^4.2.0
-    nise: ^1.5.2
-    supports-color: ^5.5.0
-  checksum: e8cf6b3dd16e9c1ed1a2b9560c396a2d6205a4f32293b1762cb6ebb8f88cfa47db6aba45b0c1709ec396efb41d171d88c9b1ab8f32f35512eb9e5d0d0d15d307
-  languageName: node
-  linkType: hard
-
-"slash@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "slash@npm:1.0.0"
-  checksum: 4b6e21b1fba6184a7e2efb1dd173f692d8a845584c1bbf9dc818ff86f5a52fc91b413008223d17cc684604ee8bb9263a420b1182027ad9762e35388434918860
-  languageName: node
-  linkType: hard
-
-"slash@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "slash@npm:3.0.0"
-  checksum: 94a93fff615f25a999ad4b83c9d5e257a7280c90a32a7cb8b4a87996e4babf322e469c42b7f649fd5796edd8687652f3fb452a86dc97a816f01113183393f11c
-  languageName: node
-  linkType: hard
-
-"slash@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "slash@npm:4.0.0"
-  checksum: da8e4af73712253acd21b7853b7e0dbba776b786e82b010a5bfc8b5051a1db38ed8aba8e1e8f400dd2c9f373be91eb1c42b66e91abb407ff42b10feece5e1d2d
-  languageName: node
-  linkType: hard
-
-"slice-ansi@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "slice-ansi@npm:3.0.0"
-  dependencies:
-    ansi-styles: ^4.0.0
-    astral-regex: ^2.0.0
-    is-fullwidth-code-point: ^3.0.0
-  checksum: 5ec6d022d12e016347e9e3e98a7eb2a592213a43a65f1b61b74d2c78288da0aded781f665807a9f3876b9daa9ad94f64f77d7633a0458876c3a4fdc4eb223f24
-  languageName: node
-  linkType: hard
-
-"slice-ansi@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "slice-ansi@npm:4.0.0"
-  dependencies:
-    ansi-styles: ^4.0.0
-    astral-regex: ^2.0.0
-    is-fullwidth-code-point: ^3.0.0
-  checksum: 4a82d7f085b0e1b070e004941ada3c40d3818563ac44766cca4ceadd2080427d337554f9f99a13aaeb3b4a94d9964d9466c807b3d7b7541d1ec37ee32d308756
-  languageName: node
-  linkType: hard
-
-"smart-buffer@npm:^4.2.0":
-  version: 4.2.0
-  resolution: "smart-buffer@npm:4.2.0"
-  checksum: b5167a7142c1da704c0e3af85c402002b597081dd9575031a90b4f229ca5678e9a36e8a374f1814c8156a725d17008ae3bde63b92f9cfd132526379e580bec8b
-  languageName: node
-  linkType: hard
-
-"snake-case@npm:^3.0.3":
-  version: 3.0.4
-  resolution: "snake-case@npm:3.0.4"
-  dependencies:
-    dot-case: ^3.0.4
-    tslib: ^2.0.3
-  checksum: 0a7a79900bbb36f8aaa922cf111702a3647ac6165736d5dc96d3ef367efc50465cac70c53cd172c382b022dac72ec91710608e5393de71f76d7142e6fd80e8a3
-  languageName: node
-  linkType: hard
-
-"snapdragon-node@npm:^2.0.1":
-  version: 2.1.1
-  resolution: "snapdragon-node@npm:2.1.1"
-  dependencies:
-    define-property: ^1.0.0
-    isobject: ^3.0.0
-    snapdragon-util: ^3.0.1
-  checksum: 9bb57d759f9e2a27935dbab0e4a790137adebace832b393e350a8bf5db461ee9206bb642d4fe47568ee0b44080479c8b4a9ad0ebe3712422d77edf9992a672fd
-  languageName: node
-  linkType: hard
-
-"snapdragon-util@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "snapdragon-util@npm:3.0.1"
-  dependencies:
-    kind-of: ^3.2.0
-  checksum: 684997dbe37ec995c03fd3f412fba2b711fc34cb4010452b7eb668be72e8811a86a12938b511e8b19baf853b325178c56d8b78d655305e5cfb0bb8b21677e7b7
-  languageName: node
-  linkType: hard
-
-"snapdragon@npm:^0.8.1":
-  version: 0.8.2
-  resolution: "snapdragon@npm:0.8.2"
-  dependencies:
-    base: ^0.11.1
-    debug: ^2.2.0
-    define-property: ^0.2.5
-    extend-shallow: ^2.0.1
-    map-cache: ^0.2.2
-    source-map: ^0.5.6
-    source-map-resolve: ^0.5.0
-    use: ^3.1.0
-  checksum: a197f242a8f48b11036563065b2487e9b7068f50a20dd81d9161eca6af422174fc158b8beeadbe59ce5ef172aa5718143312b3aebaae551c124b7824387c8312
-  languageName: node
-  linkType: hard
-
-"socket.io-adapter@npm:~2.4.0":
-  version: 2.4.0
-  resolution: "socket.io-adapter@npm:2.4.0"
-  checksum: a84639946dce13547b95f6e09fe167cdcd5d80941afc2e46790cc23384e0fd3c901e690ecc9bdd600939ce6292261ee15094a0b486f797ed621cfc8783d87a0c
-  languageName: node
-  linkType: hard
-
-"socket.io-parser@npm:~4.2.0":
-  version: 4.2.1
-  resolution: "socket.io-parser@npm:4.2.1"
-  dependencies:
-    "@socket.io/component-emitter": ~3.1.0
-    debug: ~4.3.1
-  checksum: 2582202f22538d7e6b4436991378cb4cea3b2f8219cda24923ae35afd291ab5ad6120e7d093e41738256b6c6ad10c667dd25753c2d9a2340fead04e9286f152d
-  languageName: node
-  linkType: hard
-
-"socket.io@npm:^4.1.2":
-  version: 4.5.2
-  resolution: "socket.io@npm:4.5.2"
-  dependencies:
-    accepts: ~1.3.4
-    base64id: ~2.0.0
-    debug: ~4.3.2
-    engine.io: ~6.2.0
-    socket.io-adapter: ~2.4.0
-    socket.io-parser: ~4.2.0
-  checksum: 8527dd78fa3cf483a2cf0f09f64c4591186931b6765e5d8456dd3022b8786407952e3b931a83a86513c9f56852442e12f3497c761a113113e32b0c867c5ad5a7
-  languageName: node
-  linkType: hard
-
-"socks-proxy-agent@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "socks-proxy-agent@npm:7.0.0"
-  dependencies:
-    agent-base: ^6.0.2
-    debug: ^4.3.3
-    socks: ^2.6.2
-  checksum: 720554370154cbc979e2e9ce6a6ec6ced205d02757d8f5d93fe95adae454fc187a5cbfc6b022afab850a5ce9b4c7d73e0f98e381879cf45f66317a4895953846
-  languageName: node
-  linkType: hard
-
-"socks@npm:^2.6.2":
-  version: 2.7.1
-  resolution: "socks@npm:2.7.1"
-  dependencies:
-    ip: ^2.0.0
-    smart-buffer: ^4.2.0
-  checksum: 259d9e3e8e1c9809a7f5c32238c3d4d2a36b39b83851d0f573bfde5f21c4b1288417ce1af06af1452569cd1eb0841169afd4998f0e04ba04656f6b7f0e46d748
-  languageName: node
-  linkType: hard
-
-"sort-object-keys@npm:^1.1.3":
-  version: 1.1.3
-  resolution: "sort-object-keys@npm:1.1.3"
-  checksum: abea944d6722a1710a1aa6e4f9509da085d93d5fc0db23947cb411eedc7731f80022ce8fa68ed83a53dd2ac7441fcf72a3f38c09b3d9bbc4ff80546aa2e151ad
-  languageName: node
-  linkType: hard
-
-"sort-package-json@npm:^1.55.0":
-  version: 1.57.0
-  resolution: "sort-package-json@npm:1.57.0"
-  dependencies:
-    detect-indent: ^6.0.0
-    detect-newline: 3.1.0
-    git-hooks-list: 1.0.3
-    globby: 10.0.0
-    is-plain-obj: 2.1.0
-    sort-object-keys: ^1.1.3
-  bin:
-    sort-package-json: cli.js
-  checksum: 15758ba6b1033ae136863eabd4b8c8a28e79dd68b71327f6803c2ea740dc149dc9ad708b006d07ee9de56b6dc7cadb7c697801ad50c01348aa91022c6ff6e21d
-  languageName: node
-  linkType: hard
-
-"source-list-map@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "source-list-map@npm:2.0.1"
-  checksum: 806efc6f75e7cd31e4815e7a3aaf75a45c704871ea4075cb2eb49882c6fca28998f44fc5ac91adb6de03b2882ee6fb02f951fdc85e6a22b338c32bfe19557938
-  languageName: node
-  linkType: hard
-
-"source-map-js@npm:>=0.6.2 <2.0.0, source-map-js@npm:^1.0.1, source-map-js@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "source-map-js@npm:1.0.2"
-  checksum: c049a7fc4deb9a7e9b481ae3d424cc793cb4845daa690bc5a05d428bf41bf231ced49b4cf0c9e77f9d42fdb3d20d6187619fc586605f5eabe995a316da8d377c
-  languageName: node
-  linkType: hard
-
-"source-map-resolve@npm:^0.5.0":
-  version: 0.5.3
-  resolution: "source-map-resolve@npm:0.5.3"
-  dependencies:
-    atob: ^2.1.2
-    decode-uri-component: ^0.2.0
-    resolve-url: ^0.2.1
-    source-map-url: ^0.4.0
-    urix: ^0.1.0
-  checksum: c73fa44ac00783f025f6ad9e038ab1a2e007cd6a6b86f47fe717c3d0765b4a08d264f6966f3bd7cd9dbcd69e4832783d5472e43247775b2a550d6f2155d24bae
-  languageName: node
-  linkType: hard
-
-"source-map-support@npm:^0.4.15":
-  version: 0.4.18
-  resolution: "source-map-support@npm:0.4.18"
-  dependencies:
-    source-map: ^0.5.6
-  checksum: 669aa7e992fec586fac0ba9a8dea8ce81b7328f92806335f018ffac5709afb2920e3870b4e56c68164282607229f04b8bbcf5d0e5c845eb1b5119b092e7585c0
-  languageName: node
-  linkType: hard
-
-"source-map-support@npm:~0.5.12, source-map-support@npm:~0.5.19":
-  version: 0.5.19
-  resolution: "source-map-support@npm:0.5.19"
-  dependencies:
-    buffer-from: ^1.0.0
-    source-map: ^0.6.0
-  checksum: c72802fdba9cb62b92baef18cc14cc4047608b77f0353e6c36dd993444149a466a2845332c5540d4a6630957254f0f68f4ef5a0120c33d2e83974c51a05afbac
-  languageName: node
-  linkType: hard
-
-"source-map-support@npm:~0.5.20":
-  version: 0.5.21
-  resolution: "source-map-support@npm:0.5.21"
-  dependencies:
-    buffer-from: ^1.0.0
-    source-map: ^0.6.0
-  checksum: 43e98d700d79af1d36f859bdb7318e601dfc918c7ba2e98456118ebc4c4872b327773e5a1df09b0524e9e5063bb18f0934538eace60cca2710d1fa687645d137
-  languageName: node
-  linkType: hard
-
-"source-map-url@npm:^0.3.0":
-  version: 0.3.0
-  resolution: "source-map-url@npm:0.3.0"
-  checksum: 9ed12e3fd1b09cd6506c6197129c062e02451f474dcd7ef6419f20fe86ba969c74ba10c37fb4ea5e1f2265e62fde8d31946596d7971e3251a0c75fbf411c5f1b
-  languageName: node
-  linkType: hard
-
-"source-map-url@npm:^0.4.0":
-  version: 0.4.1
-  resolution: "source-map-url@npm:0.4.1"
-  checksum: 64c5c2c77aff815a6e61a4120c309ae4cac01298d9bcbb3deb1b46a4dd4c46d4a1eaeda79ec9f684766ae80e8dc86367b89326ce9dd2b89947bd9291fc1ac08c
-  languageName: node
-  linkType: hard
-
-"source-map@npm:0.4.x, source-map@npm:^0.4.2":
-  version: 0.4.4
-  resolution: "source-map@npm:0.4.4"
-  dependencies:
-    amdefine: ">=0.0.4"
-  checksum: b31992fcb4a2a6c335617f187bd36f392896dfcc111830ebdb8b716923cf6554b665833b975fc998bdf3a63881b2c8b4c5c34fda0280357b8c18fe6aa5d148ea
-  languageName: node
-  linkType: hard
-
-"source-map@npm:^0.5.0, source-map@npm:^0.5.3, source-map@npm:^0.5.6, source-map@npm:^0.5.7":
-  version: 0.5.7
-  resolution: "source-map@npm:0.5.7"
-  checksum: 5dc2043b93d2f194142c7f38f74a24670cd7a0063acdaf4bf01d2964b402257ae843c2a8fa822ad5b71013b5fcafa55af7421383da919752f22ff488bc553f4d
-  languageName: node
-  linkType: hard
-
-"source-map@npm:^0.6.0, source-map@npm:^0.6.1, source-map@npm:~0.6.1":
-  version: 0.6.1
-  resolution: "source-map@npm:0.6.1"
-  checksum: 59ce8640cf3f3124f64ac289012c2b8bd377c238e316fb323ea22fbfe83da07d81e000071d7242cad7a23cd91c7de98e4df8830ec3f133cb6133a5f6e9f67bc2
-  languageName: node
-  linkType: hard
-
-"source-map@npm:~0.1.x":
-  version: 0.1.43
-  resolution: "source-map@npm:0.1.43"
-  dependencies:
-    amdefine: ">=0.0.4"
-  checksum: 0a230f8cae8a8ea70bd36701c33d01fb0c437b798508a561c896a99b42f5af81a206176a250fc654c7c57a736b8081c4b4a6c9887455f7d2724f847451f1d7d9
-  languageName: node
-  linkType: hard
-
-"source-map@npm:~0.7.2":
-  version: 0.7.3
-  resolution: "source-map@npm:0.7.3"
-  checksum: cd24efb3b8fa69b64bf28e3c1b1a500de77e84260c5b7f2b873f88284df17974157cc88d386ee9b6d081f08fdd8242f3fc05c953685a6ad81aad94c7393dedea
-  languageName: node
-  linkType: hard
-
-"sourcemap-codec@npm:^1.4.1, sourcemap-codec@npm:^1.4.4":
-  version: 1.4.8
-  resolution: "sourcemap-codec@npm:1.4.8"
-  checksum: b57981c05611afef31605732b598ccf65124a9fcb03b833532659ac4d29ac0f7bfacbc0d6c5a28a03e84c7510e7e556d758d0bb57786e214660016fb94279316
-  languageName: node
-  linkType: hard
-
-"sourcemap-validator@npm:^1.1.0":
-  version: 1.1.1
-  resolution: "sourcemap-validator@npm:1.1.1"
-  dependencies:
-    jsesc: ~0.3.x
-    lodash.foreach: ^4.5.0
-    lodash.template: ^4.5.0
-    source-map: ~0.1.x
-  checksum: 51b704c08d6899dcb3abbf42cdcf39ccc2199a4c1be201935dd366f15ee8c2e43f684b1eef3c84e08f209280616943fd17feef2542873ca37471205288f13467
-  languageName: node
-  linkType: hard
-
-"spawn-args@npm:^0.2.0":
-  version: 0.2.0
-  resolution: "spawn-args@npm:0.2.0"
-  checksum: bfae0a52166bf4b0b18388220532aa48c436413e970f8c404ca249e541ad63b5e5371f54f1db9b0fd57517ea333a1356d71209783a7686f08c883338e75ae0ac
-  languageName: node
-  linkType: hard
-
-"spdx-correct@npm:^3.0.0":
-  version: 3.1.1
-  resolution: "spdx-correct@npm:3.1.1"
-  dependencies:
-    spdx-expression-parse: ^3.0.0
-    spdx-license-ids: ^3.0.0
-  checksum: 77ce438344a34f9930feffa61be0eddcda5b55fc592906ef75621d4b52c07400a97084d8701557b13f7d2aae0cb64f808431f469e566ef3fe0a3a131dcb775a6
-  languageName: node
-  linkType: hard
-
-"spdx-exceptions@npm:^2.1.0":
-  version: 2.3.0
-  resolution: "spdx-exceptions@npm:2.3.0"
-  checksum: cb69a26fa3b46305637123cd37c85f75610e8c477b6476fa7354eb67c08128d159f1d36715f19be6f9daf4b680337deb8c65acdcae7f2608ba51931540687ac0
-  languageName: node
-  linkType: hard
-
-"spdx-expression-parse@npm:^3.0.0":
-  version: 3.0.1
-  resolution: "spdx-expression-parse@npm:3.0.1"
-  dependencies:
-    spdx-exceptions: ^2.1.0
-    spdx-license-ids: ^3.0.0
-  checksum: a1c6e104a2cbada7a593eaa9f430bd5e148ef5290d4c0409899855ce8b1c39652bcc88a725259491a82601159d6dc790bedefc9016c7472f7de8de7361f8ccde
-  languageName: node
-  linkType: hard
-
-"spdx-license-ids@npm:^3.0.0":
-  version: 3.0.7
-  resolution: "spdx-license-ids@npm:3.0.7"
-  checksum: b52a88aebc19b4c69049349939e1948014c4d10f52a11870431fc1cc6551de411d19e4570f5f1df2d8b7089bec921df9017a3d5199ae2468b2b432171945278e
-  languageName: node
-  linkType: hard
-
-"split-string@npm:^3.0.1, split-string@npm:^3.0.2":
-  version: 3.1.0
-  resolution: "split-string@npm:3.1.0"
-  dependencies:
-    extend-shallow: ^3.0.0
-  checksum: ae5af5c91bdc3633628821bde92fdf9492fa0e8a63cf6a0376ed6afde93c701422a1610916f59be61972717070119e848d10dfbbd5024b7729d6a71972d2a84c
-  languageName: node
-  linkType: hard
-
-"sprintf-js@npm:^1.0.3":
-  version: 1.1.2
-  resolution: "sprintf-js@npm:1.1.2"
-  checksum: d4bb46464632b335e5faed381bd331157e0af64915a98ede833452663bc672823db49d7531c32d58798e85236581fb7342fd0270531ffc8f914e186187bf1c90
-  languageName: node
-  linkType: hard
-
-"sprintf-js@npm:~1.0.2":
-  version: 1.0.3
-  resolution: "sprintf-js@npm:1.0.3"
-  checksum: 19d79aec211f09b99ec3099b5b2ae2f6e9cdefe50bc91ac4c69144b6d3928a640bb6ae5b3def70c2e85a2c3d9f5ec2719921e3a59d3ca3ef4b2fd1a4656a0df3
-  languageName: node
-  linkType: hard
-
-"sri-toolbox@npm:^0.2.0":
-  version: 0.2.0
-  resolution: "sri-toolbox@npm:0.2.0"
-  checksum: 945af49e38f8481e28d02e71e9c23ac1eea008da4328f9c98610cb44eeed83c74e4fa64de7f7264b1385dccb8acabc25ac0a9bb6dbe67ef6261cf18f9e308d01
-  languageName: node
-  linkType: hard
-
-"sshpk@npm:^1.7.0":
-  version: 1.16.1
-  resolution: "sshpk@npm:1.16.1"
-  dependencies:
-    asn1: ~0.2.3
-    assert-plus: ^1.0.0
-    bcrypt-pbkdf: ^1.0.0
-    dashdash: ^1.12.0
-    ecc-jsbn: ~0.1.1
-    getpass: ^0.1.1
-    jsbn: ~0.1.0
-    safer-buffer: ^2.0.2
-    tweetnacl: ~0.14.0
-  bin:
-    sshpk-conv: bin/sshpk-conv
-    sshpk-sign: bin/sshpk-sign
-    sshpk-verify: bin/sshpk-verify
-  checksum: 5e76afd1cedc780256f688b7c09327a8a650902d18e284dfeac97489a735299b03c3e72c6e8d22af03dbbe4d6f123fdfd5f3c4ed6bedbec72b9529a55051b857
-  languageName: node
-  linkType: hard
-
-"ssri@npm:^6.0.1":
-  version: 6.0.2
-  resolution: "ssri@npm:6.0.2"
-  dependencies:
-    figgy-pudding: ^3.5.1
-  checksum: 7c2e5d442f6252559c8987b7114bcf389fe5614bf65de09ba3e6f9a57b9b65b2967de348fcc3acccff9c069adb168140dd2c5fc2f6f4a779e604a27ef1f7d551
-  languageName: node
-  linkType: hard
-
-"ssri@npm:^9.0.0":
-  version: 9.0.1
-  resolution: "ssri@npm:9.0.1"
-  dependencies:
-    minipass: ^3.1.1
-  checksum: fb58f5e46b6923ae67b87ad5ef1c5ab6d427a17db0bead84570c2df3cd50b4ceb880ebdba2d60726588272890bae842a744e1ecce5bd2a2a582fccd5068309eb
-  languageName: node
-  linkType: hard
-
-"stable@npm:^0.1.8":
-  version: 0.1.8
-  resolution: "stable@npm:0.1.8"
-  checksum: 2ff482bb100285d16dd75cd8f7c60ab652570e8952c0bfa91828a2b5f646a0ff533f14596ea4eabd48bb7f4aeea408dce8f8515812b975d958a4cc4fa6b9dfeb
-  languageName: node
-  linkType: hard
-
-"stagehand@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "stagehand@npm:1.0.0"
-  dependencies:
-    debug: ^4.1.0
-  checksum: 262ca2bfff9e505588a7595a24792814d9df27e54f8703aa5f2aa451df7f499b23a6860d42d9cd7462e37f45421365d430680705edca1ffe04d1cce481ed782a
-  languageName: node
-  linkType: hard
-
-"static-extend@npm:^0.1.1":
-  version: 0.1.2
-  resolution: "static-extend@npm:0.1.2"
-  dependencies:
-    define-property: ^0.2.5
-    object-copy: ^0.1.0
-  checksum: 8657485b831f79e388a437260baf22784540417a9b29e11572c87735df24c22b84eda42107403a64b30861b2faf13df9f7fc5525d51f9d1d2303aba5cbf4e12c
-  languageName: node
-  linkType: hard
-
-"statuses@npm:2.0.1":
-  version: 2.0.1
-  resolution: "statuses@npm:2.0.1"
-  checksum: 18c7623fdb8f646fb213ca4051be4df7efb3484d4ab662937ca6fbef7ced9b9e12842709872eb3020cc3504b93bde88935c9f6417489627a7786f24f8031cbcb
-  languageName: node
-  linkType: hard
-
-"statuses@npm:>= 1.4.0 < 2, statuses@npm:>= 1.5.0 < 2, statuses@npm:~1.5.0":
-  version: 1.5.0
-  resolution: "statuses@npm:1.5.0"
-  checksum: c469b9519de16a4bb19600205cffb39ee471a5f17b82589757ca7bd40a8d92ebb6ed9f98b5a540c5d302ccbc78f15dc03cc0280dd6e00df1335568a5d5758a5c
-  languageName: node
-  linkType: hard
-
-"stealthy-require@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "stealthy-require@npm:1.1.1"
-  checksum: 6805b857a9f3a6a1079fc6652278038b81011f2a5b22cbd559f71a6c02087e6f1df941eb10163e3fdc5391ab5807aa46758d4258547c1f5ede31e6d9bfda8dd3
-  languageName: node
-  linkType: hard
-
-"stream-browserify@npm:^2.0.1":
-  version: 2.0.2
-  resolution: "stream-browserify@npm:2.0.2"
-  dependencies:
-    inherits: ~2.0.1
-    readable-stream: ^2.0.2
-  checksum: 8de7bcab5582e9a931ae1a4768be7efe8fa4b0b95fd368d16d8cf3e494b897d6b0a7238626de5d71686e53bddf417fd59d106cfa3af0ec055f61a8d1f8fc77b3
-  languageName: node
-  linkType: hard
-
-"stream-each@npm:^1.1.0":
-  version: 1.2.3
-  resolution: "stream-each@npm:1.2.3"
-  dependencies:
-    end-of-stream: ^1.1.0
-    stream-shift: ^1.0.0
-  checksum: f243de78e9fcc60757994efc4e8ecae9f01a4b2c6a505d786b11fcaa68b1a75ca54afc1669eac9e08f19ff0230792fc40d0f3e3e2935d76971b4903af18b76ab
-  languageName: node
-  linkType: hard
-
-"stream-http@npm:^2.7.2":
-  version: 2.8.3
-  resolution: "stream-http@npm:2.8.3"
-  dependencies:
-    builtin-status-codes: ^3.0.0
-    inherits: ^2.0.1
-    readable-stream: ^2.3.6
-    to-arraybuffer: ^1.0.0
-    xtend: ^4.0.0
-  checksum: f57dfaa21a015f72e6ce6b199cf1762074cfe8acf0047bba8f005593754f1743ad0a91788f95308d9f3829ad55742399ad27b4624432f2752a08e62ef4346e05
-  languageName: node
-  linkType: hard
-
-"stream-shift@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "stream-shift@npm:1.0.1"
-  checksum: 59b82b44b29ec3699b5519a49b3cedcc6db58c72fb40c04e005525dfdcab1c75c4e0c180b923c380f204bed78211b9bad8faecc7b93dece4d004c3f6ec75737b
-  languageName: node
-  linkType: hard
-
-"string-argv@npm:0.3.1":
-  version: 0.3.1
-  resolution: "string-argv@npm:0.3.1"
-  checksum: efbd0289b599bee808ce80820dfe49c9635610715429c6b7cc50750f0437e3c2f697c81e5c390208c13b5d5d12d904a1546172a88579f6ee5cbaaaa4dc9ec5cf
-  languageName: node
-  linkType: hard
-
-"string-template@npm:~0.2.1":
-  version: 0.2.1
-  resolution: "string-template@npm:0.2.1"
-  checksum: 042cdcf4d4832378f12fbf45b42f479990f330cc409e6dc184838801efbc8352ccf9428fe169f8f8cfff2b864879d4ba1ef8b5f41d63d1d71844c48005a1683f
-  languageName: node
-  linkType: hard
-
-"string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.2.3":
-  version: 4.2.3
-  resolution: "string-width@npm:4.2.3"
-  dependencies:
-    emoji-regex: ^8.0.0
-    is-fullwidth-code-point: ^3.0.0
-    strip-ansi: ^6.0.1
-  checksum: e52c10dc3fbfcd6c3a15f159f54a90024241d0f149cf8aed2982a2d801d2e64df0bf1dc351cf8e95c3319323f9f220c16e740b06faecd53e2462df1d2b5443fb
-  languageName: node
-  linkType: hard
-
-"string-width@npm:^2.1.0":
-  version: 2.1.1
-  resolution: "string-width@npm:2.1.1"
-  dependencies:
-    is-fullwidth-code-point: ^2.0.0
-    strip-ansi: ^4.0.0
-  checksum: d6173abe088c615c8dffaf3861dc5d5906ed3dc2d6fd67ff2bd2e2b5dce7fd683c5240699cf0b1b8aa679a3b3bd6b28b5053c824cb89b813d7f6541d8f89064a
-  languageName: node
-  linkType: hard
-
-"string-width@npm:^3.0.0, string-width@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "string-width@npm:3.1.0"
-  dependencies:
-    emoji-regex: ^7.0.1
-    is-fullwidth-code-point: ^2.0.0
-    strip-ansi: ^5.1.0
-  checksum: 57f7ca73d201682816d573dc68bd4bb8e1dff8dc9fcf10470fdfc3474135c97175fec12ea6a159e67339b41e86963112355b64529489af6e7e70f94a7caf08b2
-  languageName: node
-  linkType: hard
-
-"string-width@npm:^4.1.0, string-width@npm:^4.2.0":
-  version: 4.2.2
-  resolution: "string-width@npm:4.2.2"
-  dependencies:
-    emoji-regex: ^8.0.0
-    is-fullwidth-code-point: ^3.0.0
-    strip-ansi: ^6.0.0
-  checksum: 343e089b0e66e0f72aab4ad1d9b6f2c9cc5255844b0c83fd9b53f2a3b3fd0421bdd6cb05be96a73117eb012db0887a6c1d64ca95aaa50c518e48980483fea0ab
-  languageName: node
-  linkType: hard
-
-"string.prototype.endswith@npm:^0.2.0":
-  version: 0.2.0
-  resolution: "string.prototype.endswith@npm:0.2.0"
-  checksum: ee0d1619878a7525a6613da16b3a1d7f6d84a8d4414f78a8a1d24aef9789d4bd774d9e93eeb922a78e7f67d804e60f4cba314beb8f55327bff6e83ba39b91f24
-  languageName: node
-  linkType: hard
-
-"string.prototype.matchall@npm:^4.0.5":
-  version: 4.0.6
-  resolution: "string.prototype.matchall@npm:4.0.6"
-  dependencies:
-    call-bind: ^1.0.2
-    define-properties: ^1.1.3
-    es-abstract: ^1.19.1
-    get-intrinsic: ^1.1.1
-    has-symbols: ^1.0.2
-    internal-slot: ^1.0.3
-    regexp.prototype.flags: ^1.3.1
-    side-channel: ^1.0.4
-  checksum: 07aca53ddd8a096a8bd0560eb8574386c6b3887a6a06b40a98abd42c94dadeed3296261fca22fec59a1ed970d199bdeb450fcb6a7390193588d9c6b5f48fe842
-  languageName: node
-  linkType: hard
-
-"string.prototype.padend@npm:^3.0.0":
-  version: 3.1.2
-  resolution: "string.prototype.padend@npm:3.1.2"
-  dependencies:
-    call-bind: ^1.0.2
-    define-properties: ^1.1.3
-    es-abstract: ^1.18.0-next.2
-  checksum: be5ff9ac8d9c5443fc39fe92654e8e816d064f8b615703de475590b7d82c72aab97641c0a57543ca1c20e318fcc7b3692fcda24eb2c0ee5444653c1c25a61de2
-  languageName: node
-  linkType: hard
-
-"string.prototype.startswith@npm:^0.2.0":
-  version: 0.2.0
-  resolution: "string.prototype.startswith@npm:0.2.0"
-  checksum: b4224e2454c276baf0609c76f5db0ee6355a89a649041df9a2e49b4cdf4b424dbebbe2c070a3b5f6f00594f8f8fa98415799c7211e873e13f6ee007daae73516
-  languageName: node
-  linkType: hard
-
-"string.prototype.trimend@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "string.prototype.trimend@npm:1.0.4"
-  dependencies:
-    call-bind: ^1.0.2
-    define-properties: ^1.1.3
-  checksum: 17e5aa45c3983f582693161f972c1c1fa4bbbdf22e70e582b00c91b6575f01680dc34e83005b98e31abe4d5d29e0b21fcc24690239c106c7b2315aade6a898ac
-  languageName: node
-  linkType: hard
-
-"string.prototype.trimstart@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "string.prototype.trimstart@npm:1.0.4"
-  dependencies:
-    call-bind: ^1.0.2
-    define-properties: ^1.1.3
-  checksum: 3fb06818d3cccac5fa3f5f9873d984794ca0e9f6616fae6fcc745885d9efed4e17fe15f832515d9af5e16c279857fdbffdfc489ca4ed577811b017721b30302f
-  languageName: node
-  linkType: hard
-
-"string_decoder@npm:0.10, string_decoder@npm:~0.10.x":
-  version: 0.10.31
-  resolution: "string_decoder@npm:0.10.31"
-  checksum: fe00f8e303647e5db919948ccb5ce0da7dea209ab54702894dd0c664edd98e5d4df4b80d6fabf7b9e92b237359d21136c95bf068b2f7760b772ca974ba970202
-  languageName: node
-  linkType: hard
-
-"string_decoder@npm:^1.0.0, string_decoder@npm:^1.1.1":
-  version: 1.3.0
-  resolution: "string_decoder@npm:1.3.0"
-  dependencies:
-    safe-buffer: ~5.2.0
-  checksum: 8417646695a66e73aefc4420eb3b84cc9ffd89572861fe004e6aeb13c7bc00e2f616247505d2dbbef24247c372f70268f594af7126f43548565c68c117bdeb56
-  languageName: node
-  linkType: hard
-
-"string_decoder@npm:~1.1.1":
-  version: 1.1.1
-  resolution: "string_decoder@npm:1.1.1"
-  dependencies:
-    safe-buffer: ~5.1.0
-  checksum: 9ab7e56f9d60a28f2be697419917c50cac19f3e8e6c28ef26ed5f4852289fe0de5d6997d29becf59028556f2c62983790c1d9ba1e2a3cc401768ca12d5183a5b
-  languageName: node
-  linkType: hard
-
-"stringify-object@npm:^3.3.0":
-  version: 3.3.0
-  resolution: "stringify-object@npm:3.3.0"
-  dependencies:
-    get-own-enumerable-property-symbols: ^3.0.0
-    is-obj: ^1.0.1
-    is-regexp: ^1.0.0
-  checksum: 6827a3f35975cfa8572e8cd3ed4f7b262def260af18655c6fde549334acdac49ddba69f3c861ea5a6e9c5a4990fe4ae870b9c0e6c31019430504c94a83b7a154
-  languageName: node
-  linkType: hard
-
-"strip-ansi@npm:^3.0.0":
-  version: 3.0.1
-  resolution: "strip-ansi@npm:3.0.1"
-  dependencies:
-    ansi-regex: ^2.0.0
-  checksum: 9b974de611ce5075c70629c00fa98c46144043db92ae17748fb780f706f7a789e9989fd10597b7c2053ae8d1513fd707816a91f1879b2f71e6ac0b6a863db465
-  languageName: node
-  linkType: hard
-
-"strip-ansi@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "strip-ansi@npm:4.0.0"
-  dependencies:
-    ansi-regex: ^3.0.0
-  checksum: d9186e6c0cf78f25274f6750ee5e4a5725fb91b70fdd79aa5fe648eab092a0ec5b9621b22d69d4534a56319f75d8944efbd84e3afa8d4ad1b9a9491f12c84eca
-  languageName: node
-  linkType: hard
-
-"strip-ansi@npm:^5.0.0, strip-ansi@npm:^5.1.0, strip-ansi@npm:^5.2.0":
-  version: 5.2.0
-  resolution: "strip-ansi@npm:5.2.0"
-  dependencies:
-    ansi-regex: ^4.1.0
-  checksum: bdb5f76ade97062bd88e7723aa019adbfacdcba42223b19ccb528ffb9fb0b89a5be442c663c4a3fb25268eaa3f6ea19c7c3fbae830bd1562d55adccae1fcec46
-  languageName: node
-  linkType: hard
-
-"strip-ansi@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "strip-ansi@npm:6.0.0"
-  dependencies:
-    ansi-regex: ^5.0.0
-  checksum: 04c3239ede44c4d195b0e66c0ad58b932f08bec7d05290416d361ff908ad282ecdaf5d9731e322c84f151d427436bde01f05b7422c3ec26dd927586736b0e5d0
-  languageName: node
-  linkType: hard
-
-"strip-ansi@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "strip-ansi@npm:6.0.1"
-  dependencies:
-    ansi-regex: ^5.0.1
-  checksum: f3cd25890aef3ba6e1a74e20896c21a46f482e93df4a06567cebf2b57edabb15133f1f94e57434e0a958d61186087b1008e89c94875d019910a213181a14fc8c
-  languageName: node
-  linkType: hard
-
-"strip-ansi@npm:~0.1.0":
-  version: 0.1.1
-  resolution: "strip-ansi@npm:0.1.1"
-  bin:
-    strip-ansi: cli.js
-  checksum: 31f1d4d3b86e6d968aa568bf47d712626dd748aff7d576a98ba2ed378dd60dfb1475898254b62479779231e50a38f0b7ea0b66d3b22d14cde38b769c1c747d33
-  languageName: node
-  linkType: hard
-
-"strip-bom@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "strip-bom@npm:3.0.0"
-  checksum: 8d50ff27b7ebe5ecc78f1fe1e00fcdff7af014e73cf724b46fb81ef889eeb1015fc5184b64e81a2efe002180f3ba431bdd77e300da5c6685d702780fbf0c8d5b
-  languageName: node
-  linkType: hard
-
-"strip-bom@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "strip-bom@npm:4.0.0"
-  checksum: 9dbcfbaf503c57c06af15fe2c8176fb1bf3af5ff65003851a102749f875a6dbe0ab3b30115eccf6e805e9d756830d3e40ec508b62b3f1ddf3761a20ebe29d3f3
-  languageName: node
-  linkType: hard
-
-"strip-eof@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "strip-eof@npm:1.0.0"
-  checksum: 40bc8ddd7e072f8ba0c2d6d05267b4e0a4800898c3435b5fb5f5a21e6e47dfaff18467e7aa0d1844bb5d6274c3097246595841fbfeb317e541974ee992cac506
-  languageName: node
-  linkType: hard
-
-"strip-final-newline@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "strip-final-newline@npm:2.0.0"
-  checksum: 69412b5e25731e1938184b5d489c32e340605bb611d6140344abc3421b7f3c6f9984b21dff296dfcf056681b82caa3bb4cc996a965ce37bcfad663e92eae9c64
-  languageName: node
-  linkType: hard
-
-"strip-json-comments@npm:^3.1.0, strip-json-comments@npm:^3.1.1":
-  version: 3.1.1
-  resolution: "strip-json-comments@npm:3.1.1"
-  checksum: 492f73e27268f9b1c122733f28ecb0e7e8d8a531a6662efbd08e22cccb3f9475e90a1b82cab06a392f6afae6d2de636f977e231296400d0ec5304ba70f166443
-  languageName: node
-  linkType: hard
-
-"style-loader@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "style-loader@npm:2.0.0"
-  dependencies:
-    loader-utils: ^2.0.0
-    schema-utils: ^3.0.0
-  peerDependencies:
-    webpack: ^4.0.0 || ^5.0.0
-  checksum: 21425246a5a8f14d1625a657a3a56f8a323193fa341a71af818a2ed2a429efa2385a328b4381cf2f12c2d0e6380801eb9e0427ed9c3a10ff95c86e383184d632
-  languageName: node
-  linkType: hard
-
-"styled_string@npm:0.0.1":
-  version: 0.0.1
-  resolution: "styled_string@npm:0.0.1"
-  checksum: cc01e28ec5b7559e66cfb88b2a712beb3af91dc932df2bbe09e32d9bd5ae915bfe9dc1c1d3f5f9fcfe80acbe1ec2d741fa300a1a9032859c0f20856f5ef0e32a
-  languageName: node
-  linkType: hard
-
-"sum-up@npm:^1.0.1":
-  version: 1.0.3
-  resolution: "sum-up@npm:1.0.3"
-  dependencies:
-    chalk: ^1.0.0
-  checksum: bd08f404c83464f4e7a880340e84ad4aeb271a1b0a5ee8d084dd511988f96f7e321fb64442c7ca21249990c7562476f929ec8bd1cf6f4514ca25e6aae5281ee6
-  languageName: node
-  linkType: hard
-
-"supports-color@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "supports-color@npm:2.0.0"
-  checksum: 602538c5812b9006404370b5a4b885d3e2a1f6567d314f8b4a41974ffe7d08e525bf92ae0f9c7030e3b4c78e4e34ace55d6a67a74f1571bc205959f5972f88f0
-  languageName: node
-  linkType: hard
-
-"supports-color@npm:^5.3.0, supports-color@npm:^5.4.0, supports-color@npm:^5.5.0":
-  version: 5.5.0
-  resolution: "supports-color@npm:5.5.0"
-  dependencies:
-    has-flag: ^3.0.0
-  checksum: 95f6f4ba5afdf92f495b5a912d4abee8dcba766ae719b975c56c084f5004845f6f5a5f7769f52d53f40e21952a6d87411bafe34af4a01e65f9926002e38e1dac
-  languageName: node
-  linkType: hard
-
-"supports-color@npm:^7.1.0":
-  version: 7.2.0
-  resolution: "supports-color@npm:7.2.0"
-  dependencies:
-    has-flag: ^4.0.0
-  checksum: 3dda818de06ebbe5b9653e07842d9479f3555ebc77e9a0280caf5a14fb877ffee9ed57007c3b78f5a6324b8dbeec648d9e97a24e2ed9fdb81ddc69ea07100f4a
-  languageName: node
-  linkType: hard
-
-"supports-color@npm:^8.0.0":
-  version: 8.1.1
-  resolution: "supports-color@npm:8.1.1"
-  dependencies:
-    has-flag: ^4.0.0
-  checksum: c052193a7e43c6cdc741eb7f378df605636e01ad434badf7324f17fb60c69a880d8d8fcdcb562cf94c2350e57b937d7425ab5b8326c67c2adc48f7c87c1db406
-  languageName: node
-  linkType: hard
-
-"supports-preserve-symlinks-flag@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "supports-preserve-symlinks-flag@npm:1.0.0"
-  checksum: 53b1e247e68e05db7b3808b99b892bd36fb096e6fba213a06da7fab22045e97597db425c724f2bbd6c99a3c295e1e73f3e4de78592289f38431049e1277ca0ae
-  languageName: node
-  linkType: hard
-
-"svgo@npm:1.3.0":
-  version: 1.3.0
-  resolution: "svgo@npm:1.3.0"
-  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.33
-    csso: ^3.5.1
-    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
-  bin:
-    svgo: ./bin/svgo
-  checksum: 813880c96af74a90d5f52c477c71b5dda62b2a215807eab05757d6a0e0886d4e3fda564241d985d856dba225dad0b5d7409208e681fccfaa48ac90c53441238e
-  languageName: node
-  linkType: hard
-
-"swagger-ui-dist@npm:^3.36.2":
-  version: 3.48.0
-  resolution: "swagger-ui-dist@npm:3.48.0"
-  checksum: e059bb91589158abc7338a31494264bff8c4f46c847895888265e03947c5236ff4a48fdd0d2c6db0c71035d5224f5ffb111fe439b23461597e1c5b8313f6a833
-  languageName: node
-  linkType: hard
-
-"symbol-tree@npm:^3.2.4":
-  version: 3.2.4
-  resolution: "symbol-tree@npm:3.2.4"
-  checksum: 6e8fc7e1486b8b54bea91199d9535bb72f10842e40c79e882fc94fb7b14b89866adf2fd79efa5ebb5b658bc07fb459ccce5ac0e99ef3d72f474e74aaf284029d
-  languageName: node
-  linkType: hard
-
-"symlink-or-copy@npm:^1.0.0, symlink-or-copy@npm:^1.0.1, symlink-or-copy@npm:^1.1.8, symlink-or-copy@npm:^1.2.0, symlink-or-copy@npm:^1.3.1":
-  version: 1.3.1
-  resolution: "symlink-or-copy@npm:1.3.1"
-  checksum: 430c32ab5606f7b7c946a5a29ea17ce6cb0b34d8cb8394234b7abe710c8c029bf41030df79406cf49c4fc1e49aa979ca950b836767e3b8702acf9efe922a2f74
-  languageName: node
-  linkType: hard
-
-"sync-disk-cache@npm:^1.3.3":
-  version: 1.3.4
-  resolution: "sync-disk-cache@npm:1.3.4"
-  dependencies:
-    debug: ^2.1.3
-    heimdalljs: ^0.2.3
-    mkdirp: ^0.5.0
-    rimraf: ^2.2.8
-    username-sync: ^1.0.2
-  checksum: b828cf52b43500d83f4d98b626463227a773743cb14a5a1b5fc4f437ef85170e2a5259c6a1686e569cc231557a9a7b4278fa0cf16cef976329b18154d88215bd
-  languageName: node
-  linkType: hard
-
-"sync-disk-cache@npm:^2.0.0":
-  version: 2.1.0
-  resolution: "sync-disk-cache@npm:2.1.0"
-  dependencies:
-    debug: ^4.1.1
-    heimdalljs: ^0.2.6
-    mkdirp: ^0.5.0
-    rimraf: ^3.0.0
-    username-sync: ^1.0.2
-  checksum: 02f02d2842c69da088c28f5c6e39df7f22b68b06fd309a91eee9266a561d1a50759a8ba058df51017b89f3e70608dc884ec086b572fc9ae51165de0585029abb
-  languageName: node
-  linkType: hard
-
-"tabbable@npm:^5.3.3":
-  version: 5.3.3
-  resolution: "tabbable@npm:5.3.3"
-  checksum: 1aa56e1bb617cc10616c407f4e756f0607f3e2d30f9803664d70b85db037ca27e75918ed1c71443f3dc902e21dc9f991ce4b52d63a538c9b69b3218d3babcd70
-  languageName: node
-  linkType: hard
-
-"table@npm:^6.0.9":
-  version: 6.7.3
-  resolution: "table@npm:6.7.3"
-  dependencies:
-    ajv: ^8.0.1
-    lodash.truncate: ^4.4.2
-    slice-ansi: ^4.0.0
-    string-width: ^4.2.3
-    strip-ansi: ^6.0.1
-  checksum: 61d732f51108222d158eca2a91bfaae41c14e0cba6eb04c702ec5a1b136219d4925940d5c4d9aff5720bc4e2385dcbe2ed52dcf37bbbd8b2be48c01c1cf2ed1d
-  languageName: node
-  linkType: hard
-
-"tap-parser@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "tap-parser@npm:7.0.0"
-  dependencies:
-    events-to-array: ^1.0.1
-    js-yaml: ^3.2.7
-    minipass: ^2.2.0
-  bin:
-    tap-parser: bin/cmd.js
-  checksum: 9970c8e797b97bcdb91d92eb0847e8d550e64b914800c4485bea0a28756f9c4e4cbbfe429e7d05c2140b1a83ae092b5636e191360c8fc3f817e60acb96658147
-  languageName: node
-  linkType: hard
-
-"tapable@npm:^1.0.0, tapable@npm:^1.1.3":
-  version: 1.1.3
-  resolution: "tapable@npm:1.1.3"
-  checksum: 53ff4e7c3900051c38cc4faab428ebfd7e6ad0841af5a7ac6d5f3045c5b50e88497bfa8295b4b3fbcadd94993c9e358868b78b9fb249a76cb8b018ac8dccafd7
-  languageName: node
-  linkType: hard
-
-"tapable@npm:^2.1.1, tapable@npm:^2.2.0":
-  version: 2.2.1
-  resolution: "tapable@npm:2.2.1"
-  checksum: 3b7a1b4d86fa940aad46d9e73d1e8739335efd4c48322cb37d073eb6f80f5281889bf0320c6d8ffcfa1a0dd5bfdbd0f9d037e252ef972aca595330538aac4d51
-  languageName: node
-  linkType: hard
-
-"tar@npm:^6.1.11, tar@npm:^6.1.2":
-  version: 6.1.13
-  resolution: "tar@npm:6.1.13"
-  dependencies:
-    chownr: ^2.0.0
-    fs-minipass: ^2.0.0
-    minipass: ^4.0.0
-    minizlib: ^2.1.1
-    mkdirp: ^1.0.3
-    yallist: ^4.0.0
-  checksum: 8a278bed123aa9f53549b256a36b719e317c8b96fe86a63406f3c62887f78267cea9b22dc6f7007009738509800d4a4dccc444abd71d762287c90f35b002eb1c
-  languageName: node
-  linkType: hard
-
-"temp@npm:0.9.4":
-  version: 0.9.4
-  resolution: "temp@npm:0.9.4"
-  dependencies:
-    mkdirp: ^0.5.1
-    rimraf: ~2.6.2
-  checksum: 8709d4d63278bd309ca0e49e80a268308dea543a949e71acd427b3314cd9417da9a2cc73425dd9c21c6780334dbffd67e05e7be5aaa73e9affe8479afc6f20e3
-  languageName: node
-  linkType: hard
-
-"terser-webpack-plugin@npm:^1.4.3":
-  version: 1.4.5
-  resolution: "terser-webpack-plugin@npm:1.4.5"
-  dependencies:
-    cacache: ^12.0.2
-    find-cache-dir: ^2.1.0
-    is-wsl: ^1.1.0
-    schema-utils: ^1.0.0
-    serialize-javascript: ^4.0.0
-    source-map: ^0.6.1
-    terser: ^4.1.2
-    webpack-sources: ^1.4.0
-    worker-farm: ^1.7.0
-  peerDependencies:
-    webpack: ^4.0.0
-  checksum: 02aada80927d3c8105d69cb00384d307b73aed67d180db5d20023a8d649149f3803ad50f9cd2ef9eb2622005de87e677198ecc5088f51422bfac5d4d57472d0e
-  languageName: node
-  linkType: hard
-
-"terser-webpack-plugin@npm:^5.1.3":
-  version: 5.3.3
-  resolution: "terser-webpack-plugin@npm:5.3.3"
-  dependencies:
-    "@jridgewell/trace-mapping": ^0.3.7
-    jest-worker: ^27.4.5
-    schema-utils: ^3.1.1
-    serialize-javascript: ^6.0.0
-    terser: ^5.7.2
-  peerDependencies:
-    webpack: ^5.1.0
-  peerDependenciesMeta:
-    "@swc/core":
-      optional: true
-    esbuild:
-      optional: true
-    uglify-js:
-      optional: true
-  checksum: 4b8d508d8a0f6e604addb286975f1fa670f8c3964a67abc03a7cfcfd4cdeca4b07dda6655e1c4425427fb62e4d2b0ca59d84f1b2cd83262ff73616d5d3ccdeb5
-  languageName: node
-  linkType: hard
-
-"terser@npm:^4.1.2, terser@npm:^4.3.9":
-  version: 4.8.0
-  resolution: "terser@npm:4.8.0"
-  dependencies:
-    commander: ^2.20.0
-    source-map: ~0.6.1
-    source-map-support: ~0.5.12
-  bin:
-    terser: bin/terser
-  checksum: f980789097d4f856c1ef4b9a7ada37beb0bb022fb8aa3057968862b5864ad7c244253b3e269c9eb0ab7d0caf97b9521273f2d1cf1e0e942ff0016e0583859c71
-  languageName: node
-  linkType: hard
-
-"terser@npm:^5.3.0":
-  version: 5.7.0
-  resolution: "terser@npm:5.7.0"
-  dependencies:
-    commander: ^2.20.0
-    source-map: ~0.7.2
-    source-map-support: ~0.5.19
-  bin:
-    terser: bin/terser
-  checksum: 3abeb551865079b27e2890dbec866054967d1963fc80a81e5e14e414c43db88ff53a5e88844c145df11bed01b28040aa96afd82113c6d1a6ad28409b6cae4fde
-  languageName: node
-  linkType: hard
-
-"terser@npm:^5.7.2":
-  version: 5.14.0
-  resolution: "terser@npm:5.14.0"
-  dependencies:
-    "@jridgewell/source-map": ^0.3.2
-    acorn: ^8.5.0
-    commander: ^2.20.0
-    source-map-support: ~0.5.20
-  bin:
-    terser: bin/terser
-  checksum: 9bce919c17cf028b1b41a3aca9f7e05354ff46701de39e733d6d7a43ebd9c6042d33cfa3e7ef84e5f4c17f1c429c7f40381a38c6e6d6ab1cdc46a1bf8f4e8985
-  languageName: node
-  linkType: hard
-
-"testem@npm:^3.6.0":
-  version: 3.9.0
-  resolution: "testem@npm:3.9.0"
-  dependencies:
-    "@xmldom/xmldom": ^0.8.0
-    backbone: ^1.1.2
-    bluebird: ^3.4.6
-    charm: ^1.0.0
-    commander: ^2.6.0
-    compression: ^1.7.4
-    consolidate: ^0.16.0
-    execa: ^1.0.0
-    express: ^4.10.7
-    fireworm: ^0.7.0
-    glob: ^7.0.4
-    http-proxy: ^1.13.1
-    js-yaml: ^3.2.5
-    lodash.assignin: ^4.1.0
-    lodash.castarray: ^4.4.0
-    lodash.clonedeep: ^4.4.1
-    lodash.find: ^4.5.1
-    lodash.uniqby: ^4.7.0
-    mkdirp: ^1.0.4
-    mustache: ^4.2.0
-    node-notifier: ^10.0.0
-    npmlog: ^6.0.0
-    printf: ^0.6.1
-    rimraf: ^3.0.2
-    socket.io: ^4.1.2
-    spawn-args: ^0.2.0
-    styled_string: 0.0.1
-    tap-parser: ^7.0.0
-    tmp: 0.0.33
-  bin:
-    testem: testem.js
-  checksum: c2c0668dfeed4b5327391eee8a8fe92b735acab82d921b8b975dc56220b6c4c1ac9d6a8a4fc15dd9f1cb50d7054885060e3b9b86990453d71f183b83c6b74adb
-  languageName: node
-  linkType: hard
-
-"tether@npm:^1.4.0":
-  version: 1.4.7
-  resolution: "tether@npm:1.4.7"
-  checksum: 766ac802654064b05e5785584a109101fc184266a0df99581a3ac45d33706c39d9fed314bd28daddf3532bfa0c41f81ebc133ce2c51995101ac922d3fb0477b8
-  languageName: node
-  linkType: hard
-
-"text-encoder-lite@npm:2.0.0":
-  version: 2.0.0
-  resolution: "text-encoder-lite@npm:2.0.0"
-  checksum: 25c3cb8b894c84ec3c2b8c66bcf6267e207d502e16385ca2c4ddca9b59194b5c36aa536a82923d3026be96f5c31121fb8f089cdf6e83768650a74c55416295af
-  languageName: node
-  linkType: hard
-
-"text-table@npm:^0.2.0":
-  version: 0.2.0
-  resolution: "text-table@npm:0.2.0"
-  checksum: b6937a38c80c7f84d9c11dd75e49d5c44f71d95e810a3250bd1f1797fc7117c57698204adf676b71497acc205d769d65c16ae8fa10afad832ae1322630aef10a
-  languageName: node
-  linkType: hard
-
-"textextensions@npm:1 || 2, textextensions@npm:^2.5.0":
-  version: 2.6.0
-  resolution: "textextensions@npm:2.6.0"
-  checksum: e28781f092d0172b78974fd22d5c007cc43ac50be666b36bbf10125d961775faf309a70b51697a2debc074c8f23cc923f1386b1e4661e11b128cee292060034c
-  languageName: node
-  linkType: hard
-
-"through2@npm:^2.0.0":
-  version: 2.0.5
-  resolution: "through2@npm:2.0.5"
-  dependencies:
-    readable-stream: ~2.3.6
-    xtend: ~4.0.1
-  checksum: beb0f338aa2931e5660ec7bf3ad949e6d2e068c31f4737b9525e5201b824ac40cac6a337224856b56bd1ddd866334bbfb92a9f57cd6f66bc3f18d3d86fc0fe50
-  languageName: node
-  linkType: hard
-
-"through2@npm:^3.0.1":
-  version: 3.0.2
-  resolution: "through2@npm:3.0.2"
-  dependencies:
-    inherits: ^2.0.4
-    readable-stream: 2 || 3
-  checksum: 47c9586c735e7d9cbbc1029f3ff422108212f7cc42e06d5cc9fff7901e659c948143c790e0d0d41b1b5f89f1d1200bdd200c7b72ad34f42f9edbeb32ea49e8b7
-  languageName: node
-  linkType: hard
-
-"through@npm:^2.3.6, through@npm:^2.3.8":
-  version: 2.3.8
-  resolution: "through@npm:2.3.8"
-  checksum: a38c3e059853c494af95d50c072b83f8b676a9ba2818dcc5b108ef252230735c54e0185437618596c790bbba8fcdaef5b290405981ffa09dce67b1f1bf190cbd
-  languageName: node
-  linkType: hard
-
-"time-zone@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "time-zone@npm:1.0.0"
-  checksum: e46f5a69b8c236dcd8e91e29d40d4e7a3495ed4f59888c3f84ce1d9678e20461421a6ba41233509d47dd94bc18f1a4377764838b21b584663f942b3426dcbce8
-  languageName: node
-  linkType: hard
-
-"timers-browserify@npm:^2.0.4":
-  version: 2.0.12
-  resolution: "timers-browserify@npm:2.0.12"
-  dependencies:
-    setimmediate: ^1.0.4
-  checksum: ec37ae299066bef6c464dcac29c7adafba1999e7227a9bdc4e105a459bee0f0b27234a46bfd7ab4041da79619e06a58433472867a913d01c26f8a203f87cee70
-  languageName: node
-  linkType: hard
-
-"tiny-emitter@npm:^2.0.0":
-  version: 2.1.0
-  resolution: "tiny-emitter@npm:2.1.0"
-  checksum: fbcfb5145751a0e3b109507a828eb6d6d4501352ab7bb33eccef46e22e9d9ad3953158870a6966a59e57ab7c3f9cfac7cab8521db4de6a5e757012f4677df2dd
-  languageName: node
-  linkType: hard
-
-"tiny-glob@npm:0.2.9":
-  version: 0.2.9
-  resolution: "tiny-glob@npm:0.2.9"
-  dependencies:
-    globalyzer: 0.1.0
-    globrex: ^0.1.2
-  checksum: aea5801eb6663ddf77ebb74900b8f8bd9dfcfc9b6a1cc8018cb7421590c00bf446109ff45e4b64a98e6c95ddb1255a337a5d488fb6311930e2a95334151ec9c6
-  languageName: node
-  linkType: hard
-
-"tiny-lr@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "tiny-lr@npm:2.0.0"
-  dependencies:
-    body: ^5.1.0
-    debug: ^3.1.0
-    faye-websocket: ^0.11.3
-    livereload-js: ^3.3.1
-    object-assign: ^4.1.0
-    qs: ^6.4.0
-  checksum: d1804c15727e741aa6eccdee6171548fce8d2865b0f18b3e1b6ac9f80048c2e099eeec2540a49380a1fd6f3eb6cafe1cb5adc76dfec2c9dceee3e014a4f25991
-  languageName: node
-  linkType: hard
-
-"tippy.js@npm:^6.3.7":
-  version: 6.3.7
-  resolution: "tippy.js@npm:6.3.7"
-  dependencies:
-    "@popperjs/core": ^2.9.0
-  checksum: cac955318a65288e8d2dca05059878b003c6e66f92c94f7810f5bc5448eb6646abdf7dacc9bd00020e2611592598d0aae3a28ec9a45349a159603c3fdddce5fb
-  languageName: node
-  linkType: hard
-
-"tmp@npm:0.0.28":
-  version: 0.0.28
-  resolution: "tmp@npm:0.0.28"
-  dependencies:
-    os-tmpdir: ~1.0.1
-  checksum: 8167d2471b650f88fde1515bbf6c62d2adef07972d06531569f789863a2436c32027b6d5fbe3102ed2c430b86043dffd337db12494f1f982534862d9487e4eff
-  languageName: node
-  linkType: hard
-
-"tmp@npm:0.0.33, tmp@npm:^0.0.33":
-  version: 0.0.33
-  resolution: "tmp@npm:0.0.33"
-  dependencies:
-    os-tmpdir: ~1.0.2
-  checksum: 902d7aceb74453ea02abbf58c203f4a8fc1cead89b60b31e354f74ed5b3fb09ea817f94fb310f884a5d16987dd9fa5a735412a7c2dd088dd3d415aa819ae3a28
-  languageName: node
-  linkType: hard
-
-"tmp@npm:^0.1.0":
-  version: 0.1.0
-  resolution: "tmp@npm:0.1.0"
-  dependencies:
-    rimraf: ^2.6.3
-  checksum: 6bab8431de9d245d4264bd8cd6bb216f9d22f179f935dada92a11d1315572c8eb7c3334201e00594b4708608bd536fad3a63bfb037e7804d827d66aa53a1afcd
-  languageName: node
-  linkType: hard
-
-"tmp@npm:^0.2.1":
-  version: 0.2.1
-  resolution: "tmp@npm:0.2.1"
-  dependencies:
-    rimraf: ^3.0.0
-  checksum: 8b1214654182575124498c87ca986ac53dc76ff36e8f0e0b67139a8d221eaecfdec108c0e6ec54d76f49f1f72ab9325500b246f562b926f85bcdfca8bf35df9e
-  languageName: node
-  linkType: hard
-
-"tmpl@npm:1.0.5":
-  version: 1.0.5
-  resolution: "tmpl@npm:1.0.5"
-  checksum: cd922d9b853c00fe414c5a774817be65b058d54a2d01ebb415840960406c669a0fc632f66df885e24cb022ec812739199ccbdb8d1164c3e513f85bfca5ab2873
-  languageName: node
-  linkType: hard
-
-"to-arraybuffer@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "to-arraybuffer@npm:1.0.1"
-  checksum: 31433c10b388722729f5da04c6b2a06f40dc84f797bb802a5a171ced1e599454099c6c5bc5118f4b9105e7d049d3ad9d0f71182b77650e4fdb04539695489941
-  languageName: node
-  linkType: hard
-
-"to-fast-properties@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "to-fast-properties@npm:1.0.3"
-  checksum: bd0abb58c4722851df63419de3f6d901d5118f0440d3f71293ed776dd363f2657edaaf2dc470e3f6b7b48eb84aa411193b60db8a4a552adac30de9516c5cc580
-  languageName: node
-  linkType: hard
-
-"to-fast-properties@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "to-fast-properties@npm:2.0.0"
-  checksum: be2de62fe58ead94e3e592680052683b1ec986c72d589e7b21e5697f8744cdbf48c266fa72f6c15932894c10187b5f54573a3bcf7da0bfd964d5caf23d436168
-  languageName: node
-  linkType: hard
-
-"to-object-path@npm:^0.3.0":
-  version: 0.3.0
-  resolution: "to-object-path@npm:0.3.0"
-  dependencies:
-    kind-of: ^3.0.2
-  checksum: 9425effee5b43e61d720940fa2b889623f77473d459c2ce3d4a580a4405df4403eec7be6b857455908070566352f9e2417304641ed158dda6f6a365fe3e66d70
-  languageName: node
-  linkType: hard
-
-"to-regex-range@npm:^2.1.0":
-  version: 2.1.1
-  resolution: "to-regex-range@npm:2.1.1"
-  dependencies:
-    is-number: ^3.0.0
-    repeat-string: ^1.6.1
-  checksum: 46093cc14be2da905cc931e442d280b2e544e2bfdb9a24b3cf821be8d342f804785e5736c108d5be026021a05d7b38144980a61917eee3c88de0a5e710e10320
-  languageName: node
-  linkType: hard
-
-"to-regex-range@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "to-regex-range@npm:5.0.1"
-  dependencies:
-    is-number: ^7.0.0
-  checksum: f76fa01b3d5be85db6a2a143e24df9f60dd047d151062d0ba3df62953f2f697b16fe5dad9b0ac6191c7efc7b1d9dcaa4b768174b7b29da89d4428e64bc0a20ed
-  languageName: node
-  linkType: hard
-
-"to-regex@npm:^3.0.1, to-regex@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "to-regex@npm:3.0.2"
-  dependencies:
-    define-property: ^2.0.2
-    extend-shallow: ^3.0.2
-    regex-not: ^1.0.2
-    safe-regex: ^1.1.0
-  checksum: 4ed4a619059b64e204aad84e4e5f3ea82d97410988bcece7cf6cbfdbf193d11bff48cf53842d88b8bb00b1bfc0d048f61f20f0709e6f393fd8fe0122662d9db4
-  languageName: node
-  linkType: hard
-
-"toidentifier@npm:1.0.0":
-  version: 1.0.0
-  resolution: "toidentifier@npm:1.0.0"
-  checksum: 199e6bfca1531d49b3506cff02353d53ec987c9ee10ee272ca6484ed97f1fc10fb77c6c009079ca16d5c5be4a10378178c3cacdb41ce9ec954c3297c74c6053e
-  languageName: node
-  linkType: hard
-
-"toidentifier@npm:1.0.1":
-  version: 1.0.1
-  resolution: "toidentifier@npm:1.0.1"
-  checksum: 952c29e2a85d7123239b5cfdd889a0dde47ab0497f0913d70588f19c53f7e0b5327c95f4651e413c74b785147f9637b17410ac8c846d5d4a20a5a33eb6dc3a45
-  languageName: node
-  linkType: hard
-
-"tough-cookie@npm:^2.3.3, tough-cookie@npm:~2.5.0":
-  version: 2.5.0
-  resolution: "tough-cookie@npm:2.5.0"
-  dependencies:
-    psl: ^1.1.28
-    punycode: ^2.1.1
-  checksum: 16a8cd090224dd176eee23837cbe7573ca0fa297d7e468ab5e1c02d49a4e9a97bb05fef11320605eac516f91d54c57838a25864e8680e27b069a5231d8264977
-  languageName: node
-  linkType: hard
-
-"tough-cookie@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "tough-cookie@npm:4.0.0"
-  dependencies:
-    psl: ^1.1.33
-    punycode: ^2.1.1
-    universalify: ^0.1.2
-  checksum: 0891b37eb7d17faa3479d47f0dce2e3007f2583094ad272f2670d120fbcc3df3b0b0a631ba96ecad49f9e2297d93ff8995ce0d3292d08dd7eabe162f5b224d69
-  languageName: node
-  linkType: hard
-
-"tr46@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "tr46@npm:2.0.2"
-  dependencies:
-    punycode: ^2.1.1
-  checksum: 2b2b3dfa6bc65d027b2fac729fba0fb5b9d98af7b69ad6876c0f088ebf127f2d53e5a4d4464e5de40380cf721f392262c9183d2a05cea4967a890e8801c842f6
-  languageName: node
-  linkType: hard
-
-"tr46@npm:~0.0.3":
-  version: 0.0.3
-  resolution: "tr46@npm:0.0.3"
-  checksum: 726321c5eaf41b5002e17ffbd1fb7245999a073e8979085dacd47c4b4e8068ff5777142fc6726d6ca1fd2ff16921b48788b87225cbc57c72636f6efa8efbffe3
-  languageName: node
-  linkType: hard
-
-"tracked-maps-and-sets@npm:^3.0.1":
-  version: 3.0.2
-  resolution: "tracked-maps-and-sets@npm:3.0.2"
-  dependencies:
-    "@glimmer/tracking": ^1.0.0
-    ember-cli-babel: ^7.26.6
-    ember-cli-typescript: ^4.2.1
-    ember-tracked-storage-polyfill: 1.0.0
-  checksum: 3bcd53d27c751d4d7355457d7639fb6c9cf93f8d3b9a955b04805809b628b2fdb62b1899313c2bc7a92b64817a26d2fc648452d5f662de967767351439b70f11
-  languageName: node
-  linkType: hard
-
-"traverse@npm:^0.6.6":
-  version: 0.6.6
-  resolution: "traverse@npm:0.6.6"
-  checksum: e2afa72f11efa9ba31ed763d2d9d2aa244612f22015d16c0ea3ba5f6ca8bf071de87f8108b721885cce06ea4a36ef4605d9228c67e431d9015ea4685cb364420
-  languageName: node
-  linkType: hard
-
-"tree-sync@npm:^1.2.2":
-  version: 1.4.0
-  resolution: "tree-sync@npm:1.4.0"
-  dependencies:
-    debug: ^2.2.0
-    fs-tree-diff: ^0.5.6
-    mkdirp: ^0.5.1
-    quick-temp: ^0.1.5
-    walk-sync: ^0.3.3
-  checksum: af76c496653dea16c125cf16a7313814d453ce51d7d9ac3aafc9b4d60150c25477c7228a9821b8479951ef70d7bf2f7950c206cbc2e9843e57692d69c2221503
-  languageName: node
-  linkType: hard
-
-"tree-sync@npm:^2.0.0, tree-sync@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "tree-sync@npm:2.1.0"
-  dependencies:
-    debug: ^4.1.1
-    fs-tree-diff: ^2.0.1
-    mkdirp: ^0.5.5
-    quick-temp: ^0.1.5
-    walk-sync: ^0.3.3
-  checksum: 6454ca6021cf7ab9220764b7577370af4601d4172085b55f45ab6f414639281f95deb2e10cb46007b6f04dba5189cb11e48fb43be908f78369a93a6b680c9342
-  languageName: node
-  linkType: hard
-
-"trim-right@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "trim-right@npm:1.0.1"
-  checksum: 9120af534e006a7424a4f9358710e6e707887b6ccf7ea69e50d6ac6464db1fe22268400def01752f09769025d480395159778153fb98d4a2f6f40d4cf5d4f3b6
-  languageName: node
-  linkType: hard
-
-"trough@npm:^1.0.0":
-  version: 1.0.5
-  resolution: "trough@npm:1.0.5"
-  checksum: d6c8564903ed00e5258bab92134b020724dbbe83148dc72e4bf6306c03ed8843efa1bcc773fa62410dd89161ecb067432dd5916501793508a9506cacbc408e25
-  languageName: node
-  linkType: hard
-
-"tslib@npm:^1.8.1, tslib@npm:^1.9.0":
-  version: 1.14.1
-  resolution: "tslib@npm:1.14.1"
-  checksum: dbe628ef87f66691d5d2959b3e41b9ca0045c3ee3c7c7b906cc1e328b39f199bb1ad9e671c39025bd56122ac57dfbf7385a94843b1cc07c60a4db74795829acd
-  languageName: node
-  linkType: hard
-
-"tslib@npm:^2.0.3":
-  version: 2.2.0
-  resolution: "tslib@npm:2.2.0"
-  checksum: a48c9639f7496fa701ea8ffe0561070fcb44c104a59632f7f845c0af00825c99b6373575ec59b2b5cdbfd7505875086dbe5dc83312304d8979f22ce571218ca3
-  languageName: node
-  linkType: hard
-
-"tslib@npm:^2.1.0":
-  version: 2.4.1
-  resolution: "tslib@npm:2.4.1"
-  checksum: 19480d6e0313292bd6505d4efe096a6b31c70e21cf08b5febf4da62e95c265c8f571f7b36fcc3d1a17e068032f59c269fab3459d6cd3ed6949eafecf64315fca
-  languageName: node
-  linkType: hard
-
-"tslib@npm:^2.3.1":
-  version: 2.3.1
-  resolution: "tslib@npm:2.3.1"
-  checksum: de17a98d4614481f7fcb5cd53ffc1aaf8654313be0291e1bfaee4b4bb31a20494b7d218ff2e15017883e8ea9626599b3b0e0229c18383ba9dce89da2adf15cb9
-  languageName: node
-  linkType: hard
-
-"tsutils@npm:^3.21.0":
-  version: 3.21.0
-  resolution: "tsutils@npm:3.21.0"
-  dependencies:
-    tslib: ^1.8.1
-  peerDependencies:
-    typescript: ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
-  checksum: 1843f4c1b2e0f975e08c4c21caa4af4f7f65a12ac1b81b3b8489366826259323feb3fc7a243123453d2d1a02314205a7634e048d4a8009921da19f99755cdc48
-  languageName: node
-  linkType: hard
-
-"tty-browserify@npm:0.0.0":
-  version: 0.0.0
-  resolution: "tty-browserify@npm:0.0.0"
-  checksum: a06f746acc419cb2527ba19b6f3bd97b4a208c03823bfb37b2982629d2effe30ebd17eaed0d7e2fc741f3c4f2a0c43455bd5fb4194354b378e78cfb7ca687f59
-  languageName: node
-  linkType: hard
-
-"tunnel-agent@npm:^0.6.0":
-  version: 0.6.0
-  resolution: "tunnel-agent@npm:0.6.0"
-  dependencies:
-    safe-buffer: ^5.0.1
-  checksum: 05f6510358f8afc62a057b8b692f05d70c1782b70db86d6a1e0d5e28a32389e52fa6e7707b6c5ecccacc031462e4bc35af85ecfe4bbc341767917b7cf6965711
-  languageName: node
-  linkType: hard
-
-"tweetnacl@npm:^0.14.3, tweetnacl@npm:~0.14.0":
-  version: 0.14.5
-  resolution: "tweetnacl@npm:0.14.5"
-  checksum: 6061daba1724f59473d99a7bb82e13f211cdf6e31315510ae9656fefd4779851cb927adad90f3b488c8ed77c106adc0421ea8055f6f976ff21b27c5c4e918487
-  languageName: node
-  linkType: hard
-
-"type-check@npm:^0.4.0, type-check@npm:~0.4.0":
-  version: 0.4.0
-  resolution: "type-check@npm:0.4.0"
-  dependencies:
-    prelude-ls: ^1.2.1
-  checksum: ec688ebfc9c45d0c30412e41ca9c0cdbd704580eb3a9ccf07b9b576094d7b86a012baebc95681999dd38f4f444afd28504cb3a89f2ef16b31d4ab61a0739025a
-  languageName: node
-  linkType: hard
-
-"type-check@npm:~0.3.2":
-  version: 0.3.2
-  resolution: "type-check@npm:0.3.2"
-  dependencies:
-    prelude-ls: ~1.1.2
-  checksum: dd3b1495642731bc0e1fc40abe5e977e0263005551ac83342ecb6f4f89551d106b368ec32ad3fb2da19b3bd7b2d1f64330da2ea9176d8ddbfe389fb286eb5124
-  languageName: node
-  linkType: hard
-
-"type-detect@npm:4.0.8":
-  version: 4.0.8
-  resolution: "type-detect@npm:4.0.8"
-  checksum: 62b5628bff67c0eb0b66afa371bd73e230399a8d2ad30d852716efcc4656a7516904570cd8631a49a3ce57c10225adf5d0cbdcb47f6b0255fe6557c453925a15
-  languageName: node
-  linkType: hard
-
-"type-fest@npm:^0.11.0":
-  version: 0.11.0
-  resolution: "type-fest@npm:0.11.0"
-  checksum: 8e7589e1eb5ced6c8e1d3051553b59b9f525c41e58baa898229915781c7bf55db8cb2f74e56d8031f6af5af2eecc7cb8da9ca3af7e5b80b49d8ca5a81891f3f9
-  languageName: node
-  linkType: hard
-
-"type-fest@npm:^0.20.2":
-  version: 0.20.2
-  resolution: "type-fest@npm:0.20.2"
-  checksum: 4fb3272df21ad1c552486f8a2f8e115c09a521ad7a8db3d56d53718d0c907b62c6e9141ba5f584af3f6830d0872c521357e512381f24f7c44acae583ad517d73
-  languageName: node
-  linkType: hard
-
-"type-fest@npm:^0.21.3":
-  version: 0.21.3
-  resolution: "type-fest@npm:0.21.3"
-  checksum: e6b32a3b3877f04339bae01c193b273c62ba7bfc9e325b8703c4ee1b32dc8fe4ef5dfa54bf78265e069f7667d058e360ae0f37be5af9f153b22382cd55a9afe0
-  languageName: node
-  linkType: hard
-
-"type-fest@npm:^1.2.1":
-  version: 1.4.0
-  resolution: "type-fest@npm:1.4.0"
-  checksum: b011c3388665b097ae6a109a437a04d6f61d81b7357f74cbcb02246f2f5bd72b888ae33631b99871388122ba0a87f4ff1c94078e7119ff22c70e52c0ff828201
-  languageName: node
-  linkType: hard
-
-"type-is@npm:~1.6.17, type-is@npm:~1.6.18":
-  version: 1.6.18
-  resolution: "type-is@npm:1.6.18"
-  dependencies:
-    media-typer: 0.3.0
-    mime-types: ~2.1.24
-  checksum: 2c8e47675d55f8b4e404bcf529abdf5036c537a04c2b20177bcf78c9e3c1da69da3942b1346e6edb09e823228c0ee656ef0e033765ec39a70d496ef601a0c657
-  languageName: node
-  linkType: hard
-
-"typedarray-to-buffer@npm:^3.1.5":
-  version: 3.1.5
-  resolution: "typedarray-to-buffer@npm:3.1.5"
-  dependencies:
-    is-typedarray: ^1.0.0
-  checksum: 99c11aaa8f45189fcfba6b8a4825fd684a321caa9bd7a76a27cf0c7732c174d198b99f449c52c3818107430b5f41c0ccbbfb75cb2ee3ca4a9451710986d61a60
-  languageName: node
-  linkType: hard
-
-"typedarray@npm:^0.0.6":
-  version: 0.0.6
-  resolution: "typedarray@npm:0.0.6"
-  checksum: 33b39f3d0e8463985eeaeeacc3cb2e28bc3dfaf2a5ed219628c0b629d5d7b810b0eb2165f9f607c34871d5daa92ba1dc69f49051cf7d578b4cbd26c340b9d1b1
-  languageName: node
-  linkType: hard
-
-"typescript-memoize@npm:^1.0.0-alpha.3, typescript-memoize@npm:^1.0.1":
-  version: 1.1.0
-  resolution: "typescript-memoize@npm:1.1.0"
-  checksum: a7d3357adbf421972619397c5db562664f3d440629a5afbb510c09e23e3a176424f600c3c853addc2234a9b7be3e61dae984771c057a76980fab67fb30c70d64
-  languageName: node
-  linkType: hard
-
-"typescript@npm:^4.5.4, typescript@npm:^4.8.4":
-  version: 4.8.4
-  resolution: "typescript@npm:4.8.4"
-  bin:
-    tsc: bin/tsc
-    tsserver: bin/tsserver
-  checksum: 3e4f061658e0c8f36c820802fa809e0fd812b85687a9a2f5430bc3d0368e37d1c9605c3ce9b39df9a05af2ece67b1d844f9f6ea8ff42819f13bcb80f85629af0
-  languageName: node
-  linkType: hard
-
-"typescript@patch:typescript@^4.5.4#~builtin<compat/typescript>, typescript@patch:typescript@^4.8.4#~builtin<compat/typescript>":
-  version: 4.8.4
-  resolution: "typescript@patch:typescript@npm%3A4.8.4#~builtin<compat/typescript>::version=4.8.4&hash=1a91c8"
-  bin:
-    tsc: bin/tsc
-    tsserver: bin/tsserver
-  checksum: c981e82b77a5acdcc4e69af9c56cdecf5b934a87a08e7b52120596701e389a878b8e3f860e73ffb287bf649cc47a8c741262ce058148f71de4cdd88bb9c75153
-  languageName: node
-  linkType: hard
-
-"uc.micro@npm:^1.0.1, uc.micro@npm:^1.0.5":
-  version: 1.0.6
-  resolution: "uc.micro@npm:1.0.6"
-  checksum: 6898bb556319a38e9cf175e3628689347bd26fec15fc6b29fa38e0045af63075ff3fea4cf1fdba9db46c9f0cbf07f2348cd8844889dd31ebd288c29fe0d27e7a
-  languageName: node
-  linkType: hard
-
-"uglify-js@npm:^3.1.4":
-  version: 3.14.3
-  resolution: "uglify-js@npm:3.14.3"
-  bin:
-    uglifyjs: bin/uglifyjs
-  checksum: eef57b4fec031f687bef46182c33de5eff6bc40fec8d46152f3b92bb044602dd524a04e33ca5f7391f82db969b92ef6aded860f8a4ee5f4bf796d7420b030236
-  languageName: node
-  linkType: hard
-
-"unbox-primitive@npm:^1.0.0, unbox-primitive@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "unbox-primitive@npm:1.0.1"
-  dependencies:
-    function-bind: ^1.1.1
-    has-bigints: ^1.0.1
-    has-symbols: ^1.0.2
-    which-boxed-primitive: ^1.0.2
-  checksum: 89d950e18fb45672bc6b3c961f1e72c07beb9640c7ceed847b571ba6f7d2af570ae1a2584cfee268b9d9ea1e3293f7e33e0bc29eaeb9f8e8a0bab057ff9e6bba
-  languageName: node
-  linkType: hard
-
-"underscore.string@npm:^3.2.2, underscore.string@npm:~3.3.4":
-  version: 3.3.5
-  resolution: "underscore.string@npm:3.3.5"
-  dependencies:
-    sprintf-js: ^1.0.3
-    util-deprecate: ^1.0.2
-  checksum: 86c60f4e9c3176ae77a548ec2ac659cc3cf48b93c7cff7d548f7c91569fc15885c90816245bf4d6925241f64b54508fc60aac562246ea2de2e50d0411e82a702
-  languageName: node
-  linkType: hard
-
-"underscore@npm:^1.12.1":
-  version: 1.13.1
-  resolution: "underscore@npm:1.13.1"
-  checksum: 69bb4e6dd92c387ad322dd5b105f496fa64896d92ff1eea987610920d452667a12bca0938def4c4d60acd12da62410540fd268e7ca4f2480d89324498382fcac
-  languageName: node
-  linkType: hard
-
-"unicode-canonical-property-names-ecmascript@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "unicode-canonical-property-names-ecmascript@npm:2.0.0"
-  checksum: 39be078afd014c14dcd957a7a46a60061bc37c4508ba146517f85f60361acf4c7539552645ece25de840e17e293baa5556268d091ca6762747fdd0c705001a45
-  languageName: node
-  linkType: hard
-
-"unicode-match-property-ecmascript@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "unicode-match-property-ecmascript@npm:2.0.0"
-  dependencies:
-    unicode-canonical-property-names-ecmascript: ^2.0.0
-    unicode-property-aliases-ecmascript: ^2.0.0
-  checksum: 1f34a7434a23df4885b5890ac36c5b2161a809887000be560f56ad4b11126d433c0c1c39baf1016bdabed4ec54829a6190ee37aa24919aa116dc1a5a8a62965a
-  languageName: node
-  linkType: hard
-
-"unicode-match-property-value-ecmascript@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "unicode-match-property-value-ecmascript@npm:2.0.0"
-  checksum: 8fe6a09d9085a625cabcead5d95bdbc1a2d5d481712856092ce0347231e81a60b93a68f1b69e82b3076a07e415a72c708044efa2aa40ae23e2e7b5c99ed4a9ea
-  languageName: node
-  linkType: hard
-
-"unicode-property-aliases-ecmascript@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "unicode-property-aliases-ecmascript@npm:2.0.0"
-  checksum: dda4d39128cbbede2ac60fbb85493d979ec65913b8a486bf7cb7a375a2346fa48cbf9dc6f1ae23376e7e8e684c2b411434891e151e865a661b40a85407db51d0
-  languageName: node
-  linkType: hard
-
-"unified@npm:^9.2.2":
-  version: 9.2.2
-  resolution: "unified@npm:9.2.2"
-  dependencies:
-    bail: ^1.0.0
-    extend: ^3.0.0
-    is-buffer: ^2.0.0
-    is-plain-obj: ^2.0.0
-    trough: ^1.0.0
-    vfile: ^4.0.0
-  checksum: 7c24461be7de4145939739ce50d18227c5fbdf9b3bc5a29dabb1ce26dd3e8bd4a1c385865f6f825f3b49230953ee8b591f23beab3bb3643e3e9dc37aa8a089d5
-  languageName: node
-  linkType: hard
-
-"union-value@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "union-value@npm:1.0.1"
-  dependencies:
-    arr-union: ^3.1.0
-    get-value: ^2.0.6
-    is-extendable: ^0.1.1
-    set-value: ^2.0.1
-  checksum: a3464097d3f27f6aa90cf103ed9387541bccfc006517559381a10e0dffa62f465a9d9a09c9b9c3d26d0f4cbe61d4d010e2fbd710fd4bf1267a768ba8a774b0ba
-  languageName: node
-  linkType: hard
-
-"unique-filename@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "unique-filename@npm:1.1.1"
-  dependencies:
-    unique-slug: ^2.0.0
-  checksum: cf4998c9228cc7647ba7814e255dec51be43673903897b1786eff2ac2d670f54d4d733357eb08dea969aa5e6875d0e1bd391d668fbdb5a179744e7c7551a6f80
-  languageName: node
-  linkType: hard
-
-"unique-filename@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "unique-filename@npm:2.0.1"
-  dependencies:
-    unique-slug: ^3.0.0
-  checksum: 807acf3381aff319086b64dc7125a9a37c09c44af7620bd4f7f3247fcd5565660ac12d8b80534dcbfd067e6fe88a67e621386dd796a8af828d1337a8420a255f
-  languageName: node
-  linkType: hard
-
-"unique-slug@npm:^2.0.0":
-  version: 2.0.2
-  resolution: "unique-slug@npm:2.0.2"
-  dependencies:
-    imurmurhash: ^0.1.4
-  checksum: 5b6876a645da08d505dedb970d1571f6cebdf87044cb6b740c8dbb24f0d6e1dc8bdbf46825fd09f994d7cf50760e6f6e063cfa197d51c5902c00a861702eb75a
-  languageName: node
-  linkType: hard
-
-"unique-slug@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "unique-slug@npm:3.0.0"
-  dependencies:
-    imurmurhash: ^0.1.4
-  checksum: 49f8d915ba7f0101801b922062ee46b7953256c93ceca74303bd8e6413ae10aa7e8216556b54dc5382895e8221d04f1efaf75f945c2e4a515b4139f77aa6640c
-  languageName: node
-  linkType: hard
-
-"unique-string@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "unique-string@npm:2.0.0"
-  dependencies:
-    crypto-random-string: ^2.0.0
-  checksum: ef68f639136bcfe040cf7e3cd7a8dff076a665288122855148a6f7134092e6ed33bf83a7f3a9185e46c98dddc445a0da6ac25612afa1a7c38b8b654d6c02498e
-  languageName: node
-  linkType: hard
-
-"unist-util-is@npm:^4.0.0":
-  version: 4.1.0
-  resolution: "unist-util-is@npm:4.1.0"
-  checksum: 726484cd2adc9be75a939aeedd48720f88294899c2e4a3143da413ae593f2b28037570730d5cf5fd910ff41f3bc1501e3d636b6814c478d71126581ef695f7ea
-  languageName: node
-  linkType: hard
-
-"unist-util-stringify-position@npm:^2.0.0":
-  version: 2.0.3
-  resolution: "unist-util-stringify-position@npm:2.0.3"
-  dependencies:
-    "@types/unist": ^2.0.2
-  checksum: f755cadc959f9074fe999578a1a242761296705a7fe87f333a37c00044de74ab4b184b3812989a57d4cd12211f0b14ad397b327c3a594c7af84361b1c25a7f09
-  languageName: node
-  linkType: hard
-
-"unist-util-visit-parents@npm:^3.0.0":
-  version: 3.1.1
-  resolution: "unist-util-visit-parents@npm:3.1.1"
-  dependencies:
-    "@types/unist": ^2.0.0
-    unist-util-is: ^4.0.0
-  checksum: 1170e397dff88fab01e76d5154981666eb0291019d2462cff7a2961a3e76d3533b42eaa16b5b7e2d41ad42a5ea7d112301458283d255993e660511387bf67bc3
-  languageName: node
-  linkType: hard
-
-"universalify@npm:^0.1.0, universalify@npm:^0.1.2":
-  version: 0.1.2
-  resolution: "universalify@npm:0.1.2"
-  checksum: 40cdc60f6e61070fe658ca36016a8f4ec216b29bf04a55dce14e3710cc84c7448538ef4dad3728d0bfe29975ccd7bfb5f414c45e7b78883567fb31b246f02dff
-  languageName: node
-  linkType: hard
-
-"universalify@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "universalify@npm:2.0.0"
-  checksum: 2406a4edf4a8830aa6813278bab1f953a8e40f2f63a37873ffa9a3bc8f9745d06cc8e88f3572cb899b7e509013f7f6fcc3e37e8a6d914167a5381d8440518c44
-  languageName: node
-  linkType: hard
-
-"unpipe@npm:1.0.0, unpipe@npm:~1.0.0":
-  version: 1.0.0
-  resolution: "unpipe@npm:1.0.0"
-  checksum: 4fa18d8d8d977c55cb09715385c203197105e10a6d220087ec819f50cb68870f02942244f1017565484237f1f8c5d3cd413631b1ae104d3096f24fdfde1b4aa2
-  languageName: node
-  linkType: hard
-
-"unquote@npm:~1.1.1":
-  version: 1.1.1
-  resolution: "unquote@npm:1.1.1"
-  checksum: 71745867d09cba44ba2d26cb71d6dda7045a98b14f7405df4faaf2b0c90d24703ad027a9d90ba9a6e0d096de2c8d56f864fd03f1c0498c0b7a3990f73b4c8f5f
-  languageName: node
-  linkType: hard
-
-"unset-value@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "unset-value@npm:1.0.0"
-  dependencies:
-    has-value: ^0.3.1
-    isobject: ^3.0.0
-  checksum: 5990ecf660672be2781fc9fb322543c4aa592b68ed9a3312fa4df0e9ba709d42e823af090fc8f95775b4cd2c9a5169f7388f0cec39238b6d0d55a69fc2ab6b29
-  languageName: node
-  linkType: hard
-
-"untildify@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "untildify@npm:2.1.0"
-  dependencies:
-    os-homedir: ^1.0.0
-  checksum: 071b394053fc94747d9df8c7f7ca50af41355c1207c8a0bf9f35f52b0d9ad5142a1920b018bc2b6ff04340a4f9c599ad50c9b8f4ff2c689ae52b1463ebbda94e
-  languageName: node
-  linkType: hard
-
-"upath@npm:^1.1.1":
-  version: 1.2.0
-  resolution: "upath@npm:1.2.0"
-  checksum: 4c05c094797cb733193a0784774dbea5b1889d502fc9f0572164177e185e4a59ba7099bf0b0adf945b232e2ac60363f9bf18aac9b2206fb99cbef971a8455445
-  languageName: node
-  linkType: hard
-
-"upath@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "upath@npm:2.0.1"
-  checksum: 2db04f24a03ef72204c7b969d6991abec9e2cb06fb4c13a1fd1c59bc33b46526b16c3325e55930a11ff86a77a8cbbcda8f6399bf914087028c5beae21ecdb33c
-  languageName: node
-  linkType: hard
-
-"update-section@npm:^0.3.3":
-  version: 0.3.3
-  resolution: "update-section@npm:0.3.3"
-  checksum: 77176459493af2565eccdff16f126a7cec1636ec16a458554bac128631129e734884a0f889d9579cd59739c04c047d46ca19dbe5550e0894736e5bc524fceb18
-  languageName: node
-  linkType: hard
-
-"uri-js@npm:^4.2.2":
-  version: 4.4.1
-  resolution: "uri-js@npm:4.4.1"
-  dependencies:
-    punycode: ^2.1.0
-  checksum: 7167432de6817fe8e9e0c9684f1d2de2bb688c94388f7569f7dbdb1587c9f4ca2a77962f134ec90be0cc4d004c939ff0d05acc9f34a0db39a3c797dada262633
-  languageName: node
-  linkType: hard
-
-"urix@npm:^0.1.0":
-  version: 0.1.0
-  resolution: "urix@npm:0.1.0"
-  checksum: 4c076ecfbf3411e888547fe844e52378ab5ada2d2f27625139011eada79925e77f7fbf0e4016d45e6a9e9adb6b7e64981bd49b22700c7c401c5fc15f423303b3
-  languageName: node
-  linkType: hard
-
-"url@npm:^0.11.0":
-  version: 0.11.0
-  resolution: "url@npm:0.11.0"
-  dependencies:
-    punycode: 1.3.2
-    querystring: 0.2.0
-  checksum: 50d100d3dd2d98b9fe3ada48cadb0b08aa6be6d3ac64112b867b56b19be4bfcba03c2a9a0d7922bfd7ac17d4834e88537749fe182430dfd9b68e520175900d90
-  languageName: node
-  linkType: hard
-
-"use@npm:^3.1.0":
-  version: 3.1.1
-  resolution: "use@npm:3.1.1"
-  checksum: 08a130289f5238fcbf8f59a18951286a6e660d17acccc9d58d9b69dfa0ee19aa038e8f95721b00b432c36d1629a9e32a464bf2e7e0ae6a244c42ddb30bdd8b33
-  languageName: node
-  linkType: hard
-
-"username-sync@npm:^1.0.2":
-  version: 1.0.3
-  resolution: "username-sync@npm:1.0.3"
-  checksum: 1a2aaa8629d018daebd8500272a3064041e18ed157eb32d098dab6ea7dc111b2904222c61bb50f25340d378f003aacbefb3fd6313dd42586137532bc38befe8e
-  languageName: node
-  linkType: hard
-
-"util-deprecate@npm:^1.0.1, util-deprecate@npm:^1.0.2, util-deprecate@npm:~1.0.1":
-  version: 1.0.2
-  resolution: "util-deprecate@npm:1.0.2"
-  checksum: 474acf1146cb2701fe3b074892217553dfcf9a031280919ba1b8d651a068c9b15d863b7303cb15bd00a862b498e6cf4ad7b4a08fb134edd5a6f7641681cb54a2
-  languageName: node
-  linkType: hard
-
-"util.promisify@npm:~1.0.0":
-  version: 1.0.1
-  resolution: "util.promisify@npm:1.0.1"
-  dependencies:
-    define-properties: ^1.1.3
-    es-abstract: ^1.17.2
-    has-symbols: ^1.0.1
-    object.getownpropertydescriptors: ^2.1.0
-  checksum: d823c75b3fc66510018596f128a6592c98991df38bc0464a633bdf9134e2de0a1a33199c5c21cc261048a3982d7a19e032ecff8835b3c587f843deba96063e37
-  languageName: node
-  linkType: hard
-
-"util@npm:0.10.3":
-  version: 0.10.3
-  resolution: "util@npm:0.10.3"
-  dependencies:
-    inherits: 2.0.1
-  checksum: bd800f5d237a82caddb61723a6cbe45297d25dd258651a31335a4d5d981fd033cb4771f82db3d5d59b582b187cb69cfe727dc6f4d8d7826f686ee6c07ce611e0
-  languageName: node
-  linkType: hard
-
-"util@npm:^0.11.0":
-  version: 0.11.1
-  resolution: "util@npm:0.11.1"
-  dependencies:
-    inherits: 2.0.3
-  checksum: 80bee6a2edf5ab08dcb97bfe55ca62289b4e66f762ada201f2c5104cb5e46474c8b334f6504d055c0e6a8fda10999add9bcbd81ba765e7f37b17dc767331aa55
-  languageName: node
-  linkType: hard
-
-"utils-merge@npm:1.0.1":
-  version: 1.0.1
-  resolution: "utils-merge@npm:1.0.1"
-  checksum: c81095493225ecfc28add49c106ca4f09cdf56bc66731aa8dabc2edbbccb1e1bfe2de6a115e5c6a380d3ea166d1636410b62ef216bb07b3feb1cfde1d95d5080
-  languageName: node
-  linkType: hard
-
-"uuid@npm:^3.3.2":
-  version: 3.4.0
-  resolution: "uuid@npm:3.4.0"
-  bin:
-    uuid: ./bin/uuid
-  checksum: 58de2feed61c59060b40f8203c0e4ed7fd6f99d42534a499f1741218a1dd0c129f4aa1de797bcf822c8ea5da7e4137aa3673431a96dae729047f7aca7b27866f
-  languageName: node
-  linkType: hard
-
-"uuid@npm:^8.3.0, uuid@npm:^8.3.2":
-  version: 8.3.2
-  resolution: "uuid@npm:8.3.2"
-  bin:
-    uuid: dist/bin/uuid
-  checksum: 5575a8a75c13120e2f10e6ddc801b2c7ed7d8f3c8ac22c7ed0c7b2ba6383ec0abda88c905085d630e251719e0777045ae3236f04c812184b7c765f63a70e58df
-  languageName: node
-  linkType: hard
-
-"uuid@npm:^9.0.0":
-  version: 9.0.0
-  resolution: "uuid@npm:9.0.0"
-  bin:
-    uuid: dist/bin/uuid
-  checksum: 8dd2c83c43ddc7e1c71e36b60aea40030a6505139af6bee0f382ebcd1a56f6cd3028f7f06ffb07f8cf6ced320b76aea275284b224b002b289f89fe89c389b028
-  languageName: node
-  linkType: hard
-
-"v8-compile-cache@npm:^2.0.3, v8-compile-cache@npm:^2.3.0":
-  version: 2.3.0
-  resolution: "v8-compile-cache@npm:2.3.0"
-  checksum: adb0a271eaa2297f2f4c536acbfee872d0dd26ec2d76f66921aa7fc437319132773483344207bdbeee169225f4739016d8d2dbf0553913a52bb34da6d0334f8e
-  languageName: node
-  linkType: hard
-
-"validate-npm-package-license@npm:^3.0.1":
-  version: 3.0.4
-  resolution: "validate-npm-package-license@npm:3.0.4"
-  dependencies:
-    spdx-correct: ^3.0.0
-    spdx-expression-parse: ^3.0.0
-  checksum: 35703ac889d419cf2aceef63daeadbe4e77227c39ab6287eeb6c1b36a746b364f50ba22e88591f5d017bc54685d8137bc2d328d0a896e4d3fd22093c0f32a9ad
-  languageName: node
-  linkType: hard
-
-"validate-npm-package-name@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "validate-npm-package-name@npm:3.0.0"
-  dependencies:
-    builtins: ^1.0.3
-  checksum: ce4c68207abfb22c05eedb09ff97adbcedc80304a235a0844f5344f1fd5086aa80e4dbec5684d6094e26e35065277b765c1caef68bcea66b9056761eddb22967
-  languageName: node
-  linkType: hard
-
-"validate-peer-dependencies@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "validate-peer-dependencies@npm:2.1.0"
-  dependencies:
-    resolve-package-path: ^4.0.0
-    semver: ^7.3.2
-  checksum: 72b2cde7f0b4b968c71cadb0b2b0fd5fc8bf5936de61bc7fc28949f2563dcc7ff839067be4c6fac5e4dbad707e98d07a685f89937e92df61ae3d74dadbaac1a8
-  languageName: node
-  linkType: hard
-
-"vary@npm:^1, vary@npm:~1.1.2":
-  version: 1.1.2
-  resolution: "vary@npm:1.1.2"
-  checksum: ae0123222c6df65b437669d63dfa8c36cee20a504101b2fcd97b8bf76f91259c17f9f2b4d70a1e3c6bbcee7f51b28392833adb6b2770b23b01abec84e369660b
-  languageName: node
-  linkType: hard
-
-"vault@workspace:.":
-  version: 0.0.0-use.local
-  resolution: "vault@workspace:."
-  dependencies:
-    "@babel/plugin-proposal-object-rest-spread": ^7.12.1
-    "@babel/plugin-transform-block-scoping": ^7.12.1
-    "@ember/legacy-built-in-components": ^0.4.1
-    "@ember/optional-features": ^2.0.0
-    "@ember/render-modifiers": ^1.0.2
-    "@ember/test-helpers": 2.8.1
-    "@ember/test-waiters": ^3.0.0
-    "@glimmer/component": ^1.1.2
-    "@glimmer/tracking": ^1.1.2
-    "@hashicorp/design-system-components": 2.3.1
-    "@hashicorp/ember-flight-icons": ^3.0.2
-    "@hashicorp/structure-icons": ^1.3.0
-    "@icholy/duration": ^5.1.0
-    "@tsconfig/ember": ^1.0.1
-    "@types/ember": ^4.0.2
-    "@types/ember-data": ^4.4.6
-    "@types/ember-data__adapter": ^4.0.1
-    "@types/ember-data__model": ^4.0.0
-    "@types/ember-data__serializer": ^4.0.1
-    "@types/ember-data__store": ^4.0.2
-    "@types/ember-qunit": ^5.0.2
-    "@types/ember-resolver": ^5.0.13
-    "@types/ember__application": ^4.0.4
-    "@types/ember__array": ^4.0.3
-    "@types/ember__component": ^4.0.11
-    "@types/ember__controller": ^4.0.3
-    "@types/ember__debug": ^4.0.3
-    "@types/ember__destroyable": ^4.0.1
-    "@types/ember__engine": ^4.0.4
-    "@types/ember__error": ^4.0.1
-    "@types/ember__object": ^4.0.5
-    "@types/ember__polyfills": ^4.0.1
-    "@types/ember__routing": ^4.0.12
-    "@types/ember__runloop": ^4.0.2
-    "@types/ember__service": ^4.0.1
-    "@types/ember__string": ^3.0.10
-    "@types/ember__template": ^4.0.1
-    "@types/ember__test": ^4.0.1
-    "@types/ember__test-helpers": ^2.8.2
-    "@types/ember__utils": ^4.0.2
-    "@types/qunit": ^2.19.3
-    "@types/rsvp": ^4.0.4
-    "@types/shell-quote": ^1.7.1
-    "@typescript-eslint/eslint-plugin": ^5.19.0
-    "@typescript-eslint/parser": ^5.19.0
-    asn1js: ^2.2.0
-    autosize: ^4.0.0
-    babel-eslint: ^10.1.0
-    babel-plugin-inline-json-import: ^0.3.2
-    base64-js: ^1.3.1
-    broccoli-asset-rev: ^3.0.0
-    broccoli-sri-hash: "meirish/broccoli-sri-hash#rooturl"
-    codemirror: ^5.58.2
-    columnify: ^1.5.4
-    d3-axis: ^1.0.8
-    d3-ease: ^1.0.5
-    d3-scale: ^1.0.7
-    d3-selection: ^1.3.0
-    d3-time-format: ^2.1.1
-    d3-tip: ^0.9.1
-    d3-transition: ^1.2.0
-    date-fns: ^2.16.1
-    date-fns-tz: ^1.2.2
-    deepmerge: ^4.0.0
-    doctoc: ^2.2.0
-    dompurify: ^3.0.2
-    ember-auto-import: 2.4.2
-    ember-basic-dropdown: 6.0.1
-    ember-cli: ~4.4.0
-    ember-cli-autoprefixer: ^0.8.1
-    ember-cli-babel: ^7.26.11
-    ember-cli-clipboard: 0.16.0
-    ember-cli-content-security-policy: 2.0.3
-    ember-cli-dependency-checker: ^3.3.1
-    ember-cli-deprecation-workflow: ^2.1.0
-    ember-cli-flash: 4.0.0
-    ember-cli-htmlbars: ^6.0.1
-    ember-cli-inject-live-reload: ^2.1.0
-    ember-cli-mirage: 2.4.0
-    ember-cli-page-object: 1.17.10
-    ember-cli-sass: 11.0.1
-    ember-cli-sri: "meirish/ember-cli-sri#rooturl"
-    ember-cli-string-helpers: 6.1.0
-    ember-cli-terser: ^4.0.2
-    ember-cli-typescript: ^5.2.1
-    ember-composable-helpers: 5.0.0
-    ember-concurrency: 2.3.4
-    ember-copy: 2.0.1
-    ember-d3: ^0.5.1
-    ember-data: ~4.5.0
-    ember-engines: 0.8.23
-    ember-export-application-global: ^2.0.1
-    ember-fetch: ^8.1.1
-    ember-inflector: 4.0.2
-    ember-load-initializers: ^2.1.2
-    ember-maybe-in-element: ^2.0.3
-    ember-modal-dialog: ^4.0.1
-    ember-modifier: ^3.1.0
-    ember-page-title: ^7.0.0
-    ember-power-select: 6.0.1
-    ember-qrcode-shim: ^0.4.0
-    ember-qunit: 6.0.0
-    ember-resolver: ^8.0.3
-    ember-responsive: 5.0.0
-    ember-router-helpers: ^0.4.0
-    ember-service-worker: "meirish/ember-service-worker#configurable-scope"
-    ember-sinon: ^4.0.0
-    ember-source: 4.4.4
-    ember-svg-jar: 2.4.0
-    ember-template-lint: 4.8.0
-    ember-template-lint-plugin-prettier: 4.0.0
-    ember-test-selectors: 6.0.0
-    ember-tether: ^2.0.1
-    ember-truth-helpers: 3.0.0
-    ember-wormhole: 0.6.0
-    escape-string-regexp: ^2.0.0
-    eslint: ^7.32.0
-    eslint-config-prettier: ^8.5.0
-    eslint-plugin-compat: 4.0.2
-    eslint-plugin-ember: ^10.6.1
-    eslint-plugin-node: ^11.1.0
-    eslint-plugin-prettier: ^4.0.0
-    eslint-plugin-qunit: ^7.2.0
-    filesize: ^4.2.1
-    flat: ^4.1.0
-    handlebars: 4.7.7
-    highlight.js: ^10.4.1
-    jsondiffpatch: ^0.4.1
-    jsonlint: ^1.6.3
-    lint-staged: ^10.5.1
-    loader.js: ^4.7.0
-    node-notifier: ^8.0.1
-    normalize.css: 4.1.1
-    npm-run-all: ^4.1.5
-    pkijs: ^2.2.2
-    pretender: ^3.4.3
-    prettier: 2.6.2
-    prettier-eslint-cli: ^7.1.0
-    pvutils: ^1.0.17
-    qunit: ^2.19.1
-    qunit-dom: ^2.0.0
-    sass: ^1.58.3
-    sass-svg-uri: ^1.0.0
-    shell-quote: ^1.6.1
-    string.prototype.endswith: ^0.2.0
-    string.prototype.startswith: ^0.2.0
-    swagger-ui-dist: ^3.36.2
-    text-encoder-lite: 2.0.0
-    typescript: ^4.8.4
-    uuid: ^9.0.0
-    walk-sync: ^2.0.2
-    webpack: 5.73.0
-    xstate: ^3.3.3
-  languageName: unknown
-  linkType: soft
-
-"verror@npm:1.10.0":
-  version: 1.10.0
-  resolution: "verror@npm:1.10.0"
-  dependencies:
-    assert-plus: ^1.0.0
-    core-util-is: 1.0.2
-    extsprintf: ^1.2.0
-  checksum: c431df0bedf2088b227a4e051e0ff4ca54df2c114096b0c01e1cbaadb021c30a04d7dd5b41ab277bcd51246ca135bf931d4c4c796ecae7a4fef6d744ecef36ea
-  languageName: node
-  linkType: hard
-
-"vfile-message@npm:^2.0.0":
-  version: 2.0.4
-  resolution: "vfile-message@npm:2.0.4"
-  dependencies:
-    "@types/unist": ^2.0.0
-    unist-util-stringify-position: ^2.0.0
-  checksum: 1bade499790f46ca5aba04bdce07a1e37c2636a8872e05cf32c26becc912826710b7eb063d30c5754fdfaeedc8a7658e78df10b3bc535c844890ec8a184f5643
-  languageName: node
-  linkType: hard
-
-"vfile@npm:^4.0.0":
-  version: 4.2.1
-  resolution: "vfile@npm:4.2.1"
-  dependencies:
-    "@types/unist": ^2.0.0
-    is-buffer: ^2.0.0
-    unist-util-stringify-position: ^2.0.0
-    vfile-message: ^2.0.0
-  checksum: ee5726e10d170472cde778fc22e0f7499caa096eb85babea5d0ce0941455b721037ee1c9e6ae506ca2803250acd313d0f464328ead0b55cfe7cb6315f1b462d6
-  languageName: node
-  linkType: hard
-
-"vm-browserify@npm:^1.0.1":
-  version: 1.1.2
-  resolution: "vm-browserify@npm:1.1.2"
-  checksum: 10a1c50aab54ff8b4c9042c15fc64aefccce8d2fb90c0640403242db0ee7fb269f9b102bdb69cfb435d7ef3180d61fd4fb004a043a12709abaf9056cfd7e039d
-  languageName: node
-  linkType: hard
-
-"vue-eslint-parser@npm:^8.0.1":
-  version: 8.3.0
-  resolution: "vue-eslint-parser@npm:8.3.0"
-  dependencies:
-    debug: ^4.3.2
-    eslint-scope: ^7.0.0
-    eslint-visitor-keys: ^3.1.0
-    espree: ^9.0.0
-    esquery: ^1.4.0
-    lodash: ^4.17.21
-    semver: ^7.3.5
-  peerDependencies:
-    eslint: ">=6.0.0"
-  checksum: 8cc751e9fc2bfba93664ad8945732ab1c97791f9123e703de8669b65670d1e01906d80436bf4932d7ee6fa6174ed4545e8abb059206c88f4bd71957ca6cf7ba8
-  languageName: node
-  linkType: hard
-
-"w3c-hr-time@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "w3c-hr-time@npm:1.0.2"
-  dependencies:
-    browser-process-hrtime: ^1.0.0
-  checksum: ec3c2dacbf8050d917bbf89537a101a08c2e333b4c19155f7d3bedde43529d4339db6b3d049d9610789cb915f9515f8be037e0c54c079e9d4735c50b37ed52b9
-  languageName: node
-  linkType: hard
-
-"w3c-xmlserializer@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "w3c-xmlserializer@npm:2.0.0"
-  dependencies:
-    xml-name-validator: ^3.0.0
-  checksum: ae25c51cf71f1fb2516df1ab33a481f83461a117565b95e3d0927432522323f93b1b2846cbb60196d337970c421adb604fc2d0d180c6a47a839da01db5b9973b
-  languageName: node
-  linkType: hard
-
-"walk-sync@npm:^0.2.5":
-  version: 0.2.7
-  resolution: "walk-sync@npm:0.2.7"
-  dependencies:
-    ensure-posix-path: ^1.0.0
-    matcher-collection: ^1.0.0
-  checksum: dd5ee5de5504a4e45f86ee6c3ba6af02728a788e43b929a14fc13f19d06faaddc39692a23fba61ace4ff552b5d98b6c56fe207770bb09d87caa85a7e64bf384e
-  languageName: node
-  linkType: hard
-
-"walk-sync@npm:^0.3.0, walk-sync@npm:^0.3.1, walk-sync@npm:^0.3.3":
-  version: 0.3.4
-  resolution: "walk-sync@npm:0.3.4"
-  dependencies:
-    ensure-posix-path: ^1.0.0
-    matcher-collection: ^1.0.0
-  checksum: 07e45a065421d504d305c70d385e37f192600dfd714ba35bb5c2664682e87bfb8be9640212df160b58ae78b506479aa437267f36d6c2f54f1dd800a84d229d86
-  languageName: node
-  linkType: hard
-
-"walk-sync@npm:^1.0.0, walk-sync@npm:^1.1.3":
-  version: 1.1.4
-  resolution: "walk-sync@npm:1.1.4"
-  dependencies:
-    "@types/minimatch": ^3.0.3
-    ensure-posix-path: ^1.1.0
-    matcher-collection: ^1.1.1
-  checksum: 21ce5bfdca01b8ccf3a088e22b7634f1d045f70aac7577728d9797cbdabd4a4cdb1341145a1d5a7fe07c4a15ae106ae2625a319cb6aab3e260fdbf48719e3cc5
-  languageName: node
-  linkType: hard
-
-"walk-sync@npm:^2.0.0, walk-sync@npm:^2.0.2, walk-sync@npm:^2.2.0":
-  version: 2.2.0
-  resolution: "walk-sync@npm:2.2.0"
-  dependencies:
-    "@types/minimatch": ^3.0.3
-    ensure-posix-path: ^1.1.0
-    matcher-collection: ^2.0.0
-    minimatch: ^3.0.4
-  checksum: e579b574f769977a739607d4feba40ded8931ff641f26964ea5a10a280d648d1c1aca260e9ab60288f16d69500ff33687d3ba5fa4dbd427090123189f0f0c9b6
-  languageName: node
-  linkType: hard
-
-"walk-sync@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "walk-sync@npm:3.0.0"
-  dependencies:
-    "@types/minimatch": ^3.0.4
-    ensure-posix-path: ^1.1.0
-    matcher-collection: ^2.0.1
-    minimatch: ^3.0.4
-  checksum: b8701fc893003e4dac62d4fae8e7f411081fb18a9350632e078e9b61880e9a0c7b532385162c8e0b0fb3070f022cf70ac64518bde709b0dec58c13a833182cbc
-  languageName: node
-  linkType: hard
-
-"walker@npm:~1.0.5":
-  version: 1.0.8
-  resolution: "walker@npm:1.0.8"
-  dependencies:
-    makeerror: 1.0.12
-  checksum: ad7a257ea1e662e57ef2e018f97b3c02a7240ad5093c392186ce0bcf1f1a60bbadd520d073b9beb921ed99f64f065efb63dfc8eec689a80e569f93c1c5d5e16c
-  languageName: node
-  linkType: hard
-
-"watch-detector@npm:^0.1.0":
-  version: 0.1.0
-  resolution: "watch-detector@npm:0.1.0"
-  dependencies:
-    heimdalljs-logger: ^0.1.9
-    quick-temp: ^0.1.8
-    rsvp: ^4.7.0
-    semver: ^5.4.1
-    silent-error: ^1.1.0
-  checksum: 024a8eeeeca18fcd8e907f6687508773304b47feb751ac97fa5a4068f6213e7d4cdb8207ee8b688055c20f794fa047d4adba884a3fcf32a965e0ed2cbac0fa18
-  languageName: node
-  linkType: hard
-
-"watch-detector@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "watch-detector@npm:1.0.0"
-  dependencies:
-    heimdalljs-logger: ^0.1.10
-    semver: ^6.3.0
-    silent-error: ^1.1.1
-    tmp: ^0.1.0
-  checksum: da3ab7804890663a07b36c53c27a15bad086021f195941141c0b7153f5b3e269e925a2fb3b65377bd0f5606891e67213a10d31fedd3feed21aef604a30053b26
-  languageName: node
-  linkType: hard
-
-"watch-detector@npm:^1.0.1":
-  version: 1.0.2
-  resolution: "watch-detector@npm:1.0.2"
-  dependencies:
-    heimdalljs-logger: ^0.1.10
-    silent-error: ^1.1.1
-    tmp: ^0.1.0
-  checksum: 1c3bb68ba4ad5e0cdec1daf4d9dc3ff80cacebcc598ad162e2436be06adf5ce5626d4c0bcec84bff9c9ee27add9ff98d6ed4e29cdff2c86a7c4d8120b5f50c1d
-  languageName: node
-  linkType: hard
-
-"watchpack-chokidar2@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "watchpack-chokidar2@npm:2.0.1"
-  dependencies:
-    chokidar: ^2.1.8
-  checksum: acf0f9ebca0c0b2fd1fe87ba557670477a6c0410bf1a653a726e68eb0620aa94fd9a43027a160a76bc793a21ea12e215e1e87dafe762682c13ef92ad4daf7b58
-  languageName: node
-  linkType: hard
-
-"watchpack@npm:^1.7.4":
-  version: 1.7.5
-  resolution: "watchpack@npm:1.7.5"
-  dependencies:
-    chokidar: ^3.4.1
-    graceful-fs: ^4.1.2
-    neo-async: ^2.5.0
-    watchpack-chokidar2: ^2.0.1
-  dependenciesMeta:
-    chokidar:
-      optional: true
-    watchpack-chokidar2:
-      optional: true
-  checksum: 8b7cb8c8df8f4dd0e8ac47693c0141c4f020a4b031411247d600eca31522fde6f1f9a3a6f6518b46e71f7971b0ed5734c08c60d7fdd2530e7262776286f69236
-  languageName: node
-  linkType: hard
-
-"watchpack@npm:^2.3.1":
-  version: 2.4.0
-  resolution: "watchpack@npm:2.4.0"
-  dependencies:
-    glob-to-regexp: ^0.4.1
-    graceful-fs: ^4.1.2
-  checksum: 23d4bc58634dbe13b86093e01c6a68d8096028b664ab7139d58f0c37d962d549a940e98f2f201cecdabd6f9c340338dc73ef8bf094a2249ef582f35183d1a131
-  languageName: node
-  linkType: hard
-
-"wcwidth@npm:^1.0.0, wcwidth@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "wcwidth@npm:1.0.1"
-  dependencies:
-    defaults: ^1.0.3
-  checksum: 814e9d1ddcc9798f7377ffa448a5a3892232b9275ebb30a41b529607691c0491de47cba426e917a4d08ded3ee7e9ba2f3fe32e62ee3cd9c7d3bafb7754bd553c
-  languageName: node
-  linkType: hard
-
-"webidl-conversions@npm:^3.0.0":
-  version: 3.0.1
-  resolution: "webidl-conversions@npm:3.0.1"
-  checksum: c92a0a6ab95314bde9c32e1d0a6dfac83b578f8fa5f21e675bc2706ed6981bc26b7eb7e6a1fab158e5ce4adf9caa4a0aee49a52505d4d13c7be545f15021b17c
-  languageName: node
-  linkType: hard
-
-"webidl-conversions@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "webidl-conversions@npm:5.0.0"
-  checksum: ccf1ec2ca7c0b5671e5440ace4a66806ae09c49016ab821481bec0c05b1b82695082dc0a27d1fe9d804d475a408ba0c691e6803fd21be608e710955d4589cd69
-  languageName: node
-  linkType: hard
-
-"webidl-conversions@npm:^6.1.0":
-  version: 6.1.0
-  resolution: "webidl-conversions@npm:6.1.0"
-  checksum: 1f526507aa491f972a0c1409d07f8444e1d28778dfa269a9971f2e157182f3d496dc33296e4ed45b157fdb3bf535bb90c90bf10c50dcf1dd6caacb2a34cc84fb
-  languageName: node
-  linkType: hard
-
-"webpack-sources@npm:^1.4.0, webpack-sources@npm:^1.4.1":
-  version: 1.4.3
-  resolution: "webpack-sources@npm:1.4.3"
-  dependencies:
-    source-list-map: ^2.0.0
-    source-map: ~0.6.1
-  checksum: 37463dad8d08114930f4bc4882a9602941f07c9f0efa9b6bc78738cd936275b990a596d801ef450d022bb005b109b9f451dd087db2f3c9baf53e8e22cf388f79
-  languageName: node
-  linkType: hard
-
-"webpack-sources@npm:^3.2.3":
-  version: 3.2.3
-  resolution: "webpack-sources@npm:3.2.3"
-  checksum: 989e401b9fe3536529e2a99dac8c1bdc50e3a0a2c8669cbafad31271eadd994bc9405f88a3039cd2e29db5e6d9d0926ceb7a1a4e7409ece021fe79c37d9c4607
-  languageName: node
-  linkType: hard
-
-"webpack@npm:5.73.0":
-  version: 5.73.0
-  resolution: "webpack@npm:5.73.0"
-  dependencies:
-    "@types/eslint-scope": ^3.7.3
-    "@types/estree": ^0.0.51
-    "@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.9.3
-    es-module-lexer: ^0.9.0
-    eslint-scope: 5.1.1
-    events: ^3.2.0
-    glob-to-regexp: ^0.4.1
-    graceful-fs: ^4.2.9
-    json-parse-even-better-errors: ^2.3.1
-    loader-runner: ^4.2.0
-    mime-types: ^2.1.27
-    neo-async: ^2.6.2
-    schema-utils: ^3.1.0
-    tapable: ^2.1.1
-    terser-webpack-plugin: ^5.1.3
-    watchpack: ^2.3.1
-    webpack-sources: ^3.2.3
-  peerDependenciesMeta:
-    webpack-cli:
-      optional: true
-  bin:
-    webpack: bin/webpack.js
-  checksum: aa434a241bad6176b68e1bf0feb1972da4dcbf27cb3d94ae24f6eb31acc37dceb9c4aae55e068edca75817bfe91f13cd20b023ac55d9b1b2f8b66a4037c9468f
-  languageName: node
-  linkType: hard
-
-"webpack@npm:^4.43.0":
-  version: 4.46.0
-  resolution: "webpack@npm:4.46.0"
-  dependencies:
-    "@webassemblyjs/ast": 1.9.0
-    "@webassemblyjs/helper-module-context": 1.9.0
-    "@webassemblyjs/wasm-edit": 1.9.0
-    "@webassemblyjs/wasm-parser": 1.9.0
-    acorn: ^6.4.1
-    ajv: ^6.10.2
-    ajv-keywords: ^3.4.1
-    chrome-trace-event: ^1.0.2
-    enhanced-resolve: ^4.5.0
-    eslint-scope: ^4.0.3
-    json-parse-better-errors: ^1.0.2
-    loader-runner: ^2.4.0
-    loader-utils: ^1.2.3
-    memory-fs: ^0.4.1
-    micromatch: ^3.1.10
-    mkdirp: ^0.5.3
-    neo-async: ^2.6.1
-    node-libs-browser: ^2.2.1
-    schema-utils: ^1.0.0
-    tapable: ^1.1.3
-    terser-webpack-plugin: ^1.4.3
-    watchpack: ^1.7.4
-    webpack-sources: ^1.4.1
-  peerDependenciesMeta:
-    webpack-cli:
-      optional: true
-    webpack-command:
-      optional: true
-  bin:
-    webpack: bin/webpack.js
-  checksum: 013fa24c00d4261e16ebca60353fa6f848e417b5a44bdf28c16ebebd67fa61e960420bb314c8df05cfe2dad9b90efabcf38fd6875f2361922769a0384085ef1e
-  languageName: node
-  linkType: hard
-
-"websocket-driver@npm:>=0.5.1":
-  version: 0.7.4
-  resolution: "websocket-driver@npm:0.7.4"
-  dependencies:
-    http-parser-js: ">=0.5.1"
-    safe-buffer: ">=5.1.0"
-    websocket-extensions: ">=0.1.1"
-  checksum: fffe5a33fe8eceafd21d2a065661d09e38b93877eae1de6ab5d7d2734c6ed243973beae10ae48c6613cfd675f200e5a058d1e3531bc9e6c5d4f1396ff1f0bfb9
-  languageName: node
-  linkType: hard
-
-"websocket-extensions@npm:>=0.1.1":
-  version: 0.1.4
-  resolution: "websocket-extensions@npm:0.1.4"
-  checksum: 5976835e68a86afcd64c7a9762ed85f2f27d48c488c707e67ba85e717b90fa066b98ab33c744d64255c9622d349eedecf728e65a5f921da71b58d0e9591b9038
-  languageName: node
-  linkType: hard
-
-"whatwg-encoding@npm:^1.0.5":
-  version: 1.0.5
-  resolution: "whatwg-encoding@npm:1.0.5"
-  dependencies:
-    iconv-lite: 0.4.24
-  checksum: 5be4efe111dce29ddee3448d3915477fcc3b28f991d9cf1300b4e50d6d189010d47bca2f51140a844cf9b726e8f066f4aee72a04d687bfe4f2ee2767b2f5b1e6
-  languageName: node
-  linkType: hard
-
-"whatwg-fetch@npm:^3.6.2":
-  version: 3.6.2
-  resolution: "whatwg-fetch@npm:3.6.2"
-  checksum: ee976b7249e7791edb0d0a62cd806b29006ad7ec3a3d89145921ad8c00a3a67e4be8f3fb3ec6bc7b58498724fd568d11aeeeea1f7827e7e1e5eae6c8a275afed
-  languageName: node
-  linkType: hard
-
-"whatwg-mimetype@npm:^2.3.0":
-  version: 2.3.0
-  resolution: "whatwg-mimetype@npm:2.3.0"
-  checksum: 23eb885940bcbcca4ff841c40a78e9cbb893ec42743993a42bf7aed16085b048b44b06f3402018931687153550f9a32d259dfa524e4f03577ab898b6965e5383
-  languageName: node
-  linkType: hard
-
-"whatwg-url@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "whatwg-url@npm:5.0.0"
-  dependencies:
-    tr46: ~0.0.3
-    webidl-conversions: ^3.0.0
-  checksum: b8daed4ad3356cc4899048a15b2c143a9aed0dfae1f611ebd55073310c7b910f522ad75d727346ad64203d7e6c79ef25eafd465f4d12775ca44b90fa82ed9e2c
-  languageName: node
-  linkType: hard
-
-"whatwg-url@npm:^8.0.0, whatwg-url@npm:^8.5.0":
-  version: 8.5.0
-  resolution: "whatwg-url@npm:8.5.0"
-  dependencies:
-    lodash: ^4.7.0
-    tr46: ^2.0.2
-    webidl-conversions: ^6.1.0
-  checksum: 3bda9bfd98be7a86761bc629d848526ae246b34bce6b1037254752bade6fb610fc696c1d4ba477d0fdd57c86b6fad0128f68203527d94cee13997cc91ecf2bb7
-  languageName: node
-  linkType: hard
-
-"which-boxed-primitive@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "which-boxed-primitive@npm:1.0.2"
-  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
-  checksum: 53ce774c7379071729533922adcca47220228405e1895f26673bbd71bdf7fb09bee38c1d6399395927c6289476b5ae0629863427fd151491b71c4b6cb04f3a5e
-  languageName: node
-  linkType: hard
-
-"which-module@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "which-module@npm:2.0.0"
-  checksum: 809f7fd3dfcb2cdbe0180b60d68100c88785084f8f9492b0998c051d7a8efe56784492609d3f09ac161635b78ea29219eb1418a98c15ce87d085bce905705c9c
-  languageName: node
-  linkType: hard
-
-"which@npm:^1.2.14, which@npm:^1.2.9":
-  version: 1.3.1
-  resolution: "which@npm:1.3.1"
-  dependencies:
-    isexe: ^2.0.0
-  bin:
-    which: ./bin/which
-  checksum: f2e185c6242244b8426c9df1510e86629192d93c1a986a7d2a591f2c24869e7ffd03d6dac07ca863b2e4c06f59a4cc9916c585b72ee9fa1aa609d0124df15e04
-  languageName: node
-  linkType: hard
-
-"which@npm:^2.0.1, which@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "which@npm:2.0.2"
-  dependencies:
-    isexe: ^2.0.0
-  bin:
-    node-which: ./bin/node-which
-  checksum: 1a5c563d3c1b52d5f893c8b61afe11abc3bab4afac492e8da5bde69d550de701cf9806235f20a47b5c8fa8a1d6a9135841de2596535e998027a54589000e66d1
-  languageName: node
-  linkType: hard
-
-"wide-align@npm:^1.1.5":
-  version: 1.1.5
-  resolution: "wide-align@npm:1.1.5"
-  dependencies:
-    string-width: ^1.0.2 || 2 || 3 || 4
-  checksum: d5fc37cd561f9daee3c80e03b92ed3e84d80dde3365a8767263d03dacfc8fa06b065ffe1df00d8c2a09f731482fcacae745abfbb478d4af36d0a891fad4834d3
-  languageName: node
-  linkType: hard
-
-"word-wrap@npm:^1.2.3, word-wrap@npm:~1.2.3":
-  version: 1.2.3
-  resolution: "word-wrap@npm:1.2.3"
-  checksum: 30b48f91fcf12106ed3186ae4fa86a6a1842416df425be7b60485de14bec665a54a68e4b5156647dec3a70f25e84d270ca8bc8cd23182ed095f5c7206a938c1f
-  languageName: node
-  linkType: hard
-
-"wordwrap@npm:^0.0.3":
-  version: 0.0.3
-  resolution: "wordwrap@npm:0.0.3"
-  checksum: dfc2d3512e857ae4b3bc2e8d4e5d2c285c28a4b87cd1d81c977ce9a1a99152d355807e046851a3d61148f39d877fbb889352e07b65a9cbdd2256aa928e159026
-  languageName: node
-  linkType: hard
-
-"wordwrap@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "wordwrap@npm:1.0.0"
-  checksum: 2a44b2788165d0a3de71fd517d4880a8e20ea3a82c080ce46e294f0b68b69a2e49cff5f99c600e275c698a90d12c5ea32aff06c311f0db2eb3f1201f3e7b2a04
-  languageName: node
-  linkType: hard
-
-"worker-farm@npm:^1.7.0":
-  version: 1.7.0
-  resolution: "worker-farm@npm:1.7.0"
-  dependencies:
-    errno: ~0.1.7
-  checksum: eab917530e1feddf157ec749e9c91b73a886142daa7fdf3490bccbf7b548b2576c43ab8d0a98e72ac755cbc101ca8647a7b1ff2485fddb9e8f53c40c77f5a719
-  languageName: node
-  linkType: hard
-
-"workerpool@npm:^2.3.0":
-  version: 2.3.4
-  resolution: "workerpool@npm:2.3.4"
-  dependencies:
-    object-assign: 4.1.1
-  checksum: 34793e88505ca6638372791d401a27d17674efdd34d5535b76ce6579b35a0cb1780156b113a3790405eefc447160d6e255e4887bfbf0c42edbae8fdf475ccc93
-  languageName: node
-  linkType: hard
-
-"workerpool@npm:^3.1.1":
-  version: 3.1.2
-  resolution: "workerpool@npm:3.1.2"
-  dependencies:
-    "@babel/core": ^7.3.4
-    object-assign: 4.1.1
-    rsvp: ^4.8.4
-  checksum: 7b382021ca70310926662b40c489ce78d391fb15a3aa7cf1d03eb7578e49eec777b1f332155b5f654118c03b53367ef96f66a42b128e5ca48b25164de9ef2a99
-  languageName: node
-  linkType: hard
-
-"workerpool@npm:^5.0.1":
-  version: 5.0.4
-  resolution: "workerpool@npm:5.0.4"
-  checksum: 735a9b19a3dce3c6391c88ee85ca7a952d48d1e1e4c32ec208adb9f29920eb052755737e04d1c44f32614d5a81c26387f3a2cfb7e96f15c87cfa01c7b1218958
-  languageName: node
-  linkType: hard
-
-"workerpool@npm:^6.0.0":
-  version: 6.1.4
-  resolution: "workerpool@npm:6.1.4"
-  checksum: 0927dd4302fc39be132e829f6bdca1c675a50d285858d3f0b233b75724030d7c10a618a5e8f5623c991121073306c10af73e750ec9ea366e1d2d76d8b5d3422c
-  languageName: node
-  linkType: hard
-
-"workerpool@npm:^6.1.5":
-  version: 6.2.0
-  resolution: "workerpool@npm:6.2.0"
-  checksum: 3493b4f0ef979a23d2c1583d7ef85f62fc9463cc02f82829d3e7e663b517f8ae9707da0249b382e46ac58986deb0ca2232ee1081713741211bda9254b429c9bb
-  languageName: node
-  linkType: hard
-
-"workerpool@npm:^6.2.0":
-  version: 6.2.1
-  resolution: "workerpool@npm:6.2.1"
-  checksum: c2c6eebbc5225f10f758d599a5c016fa04798bcc44e4c1dffb34050cd361d7be2e97891aa44419e7afe647b1f767b1dc0b85a5e046c409d890163f655028b09d
-  languageName: node
-  linkType: hard
-
-"wrap-ansi@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "wrap-ansi@npm:5.1.0"
-  dependencies:
-    ansi-styles: ^3.2.0
-    string-width: ^3.0.0
-    strip-ansi: ^5.0.0
-  checksum: 9b48c862220e541eb0daa22661b38b947973fc57054e91be5b0f2dcc77741a6875ccab4ebe970a394b4682c8dfc17e888266a105fb8b0a9b23c19245e781ceae
-  languageName: node
-  linkType: hard
-
-"wrap-ansi@npm:^6.2.0":
-  version: 6.2.0
-  resolution: "wrap-ansi@npm:6.2.0"
-  dependencies:
-    ansi-styles: ^4.0.0
-    string-width: ^4.1.0
-    strip-ansi: ^6.0.0
-  checksum: 6cd96a410161ff617b63581a08376f0cb9162375adeb7956e10c8cd397821f7eb2a6de24eb22a0b28401300bf228c86e50617cd568209b5f6775b93c97d2fe3a
-  languageName: node
-  linkType: hard
-
-"wrap-ansi@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "wrap-ansi@npm:7.0.0"
-  dependencies:
-    ansi-styles: ^4.0.0
-    string-width: ^4.1.0
-    strip-ansi: ^6.0.0
-  checksum: a790b846fd4505de962ba728a21aaeda189b8ee1c7568ca5e817d85930e06ef8d1689d49dbf0e881e8ef84436af3a88bc49115c2e2788d841ff1b8b5b51a608b
-  languageName: node
-  linkType: hard
-
-"wrap-legacy-hbs-plugin-if-needed@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "wrap-legacy-hbs-plugin-if-needed@npm:1.0.1"
-  dependencies:
-    "@glimmer/reference": ^0.42.1
-    "@glimmer/runtime": ^0.42.1
-    "@glimmer/syntax": ^0.42.1
-    "@simple-dom/interface": ^1.4.0
-  checksum: b273f53b92fa26041e6cf8f3b712a0267a3cc75c8def3370e556428e72ef38deea605897c8d42b2a3b90f04d810c432b1de470db983b0c131030b29dc46aa1bd
-  languageName: node
-  linkType: hard
-
-"wrappy@npm:1":
-  version: 1.0.2
-  resolution: "wrappy@npm:1.0.2"
-  checksum: 159da4805f7e84a3d003d8841557196034155008f817172d4e986bd591f74aa82aa7db55929a54222309e01079a65a92a9e6414da5a6aa4b01ee44a511ac3ee5
-  languageName: node
-  linkType: hard
-
-"write-file-atomic@npm:^3.0.0":
-  version: 3.0.3
-  resolution: "write-file-atomic@npm:3.0.3"
-  dependencies:
-    imurmurhash: ^0.1.4
-    is-typedarray: ^1.0.0
-    signal-exit: ^3.0.2
-    typedarray-to-buffer: ^3.1.5
-  checksum: c55b24617cc61c3a4379f425fc62a386cc51916a9b9d993f39734d005a09d5a4bb748bc251f1304e7abd71d0a26d339996c275955f527a131b1dcded67878280
-  languageName: node
-  linkType: hard
-
-"ws@npm:^7.4.4":
-  version: 7.4.5
-  resolution: "ws@npm:7.4.5"
-  peerDependencies:
-    bufferutil: ^4.0.1
-    utf-8-validate: ^5.0.2
-  peerDependenciesMeta:
-    bufferutil:
-      optional: true
-    utf-8-validate:
-      optional: true
-  checksum: 5c7d1527f93ef27f9306aaf52db76315e8ff84174d1df717196527c50334c80bc10307dcaf6674a9aca4bb73aac3f77c23d3d9b1800e8aa810a5ee7f52d67cfb
-  languageName: node
-  linkType: hard
-
-"ws@npm:~8.2.3":
-  version: 8.2.3
-  resolution: "ws@npm:8.2.3"
-  peerDependencies:
-    bufferutil: ^4.0.1
-    utf-8-validate: ^5.0.2
-  peerDependenciesMeta:
-    bufferutil:
-      optional: true
-    utf-8-validate:
-      optional: true
-  checksum: c869296ccb45f218ac6d32f8f614cd85b50a21fd434caf11646008eef92173be53490810c5c23aea31bc527902261fbfd7b062197eea341b26128d4be56a85e4
-  languageName: node
-  linkType: hard
-
-"xdg-basedir@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "xdg-basedir@npm:4.0.0"
-  checksum: 0073d5b59a37224ed3a5ac0dd2ec1d36f09c49f0afd769008a6e9cd3cd666bd6317bd1c7ce2eab47e1de285a286bad11a9b038196413cd753b79770361855f3c
-  languageName: node
-  linkType: hard
-
-"xml-name-validator@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "xml-name-validator@npm:3.0.0"
-  checksum: b3ac459afed783c285bb98e4960bd1f3ba12754fd4f2320efa0f9181ca28928c53cc75ca660d15d205e81f92304419afe94c531c7cfb3e0649aa6d140d53ecb0
-  languageName: node
-  linkType: hard
-
-"xmlchars@npm:^2.2.0":
-  version: 2.2.0
-  resolution: "xmlchars@npm:2.2.0"
-  checksum: 8c70ac94070ccca03f47a81fcce3b271bd1f37a591bf5424e787ae313fcb9c212f5f6786e1fa82076a2c632c0141552babcd85698c437506dfa6ae2d58723062
-  languageName: node
-  linkType: hard
-
-"xstate@npm:^3.3.3":
-  version: 3.3.3
-  resolution: "xstate@npm:3.3.3"
-  checksum: b659cf8c7ac5f48ef68bd55d8b5a60fb3b34686222c8d4e8966b9e8d7fd59569cf02e135fba5969d1f7b96cd3f617b1131b38970b90930371e668af7f6b4d2f6
-  languageName: node
-  linkType: hard
-
-"xtend@npm:^4.0.0, xtend@npm:~4.0.1":
-  version: 4.0.2
-  resolution: "xtend@npm:4.0.2"
-  checksum: ac5dfa738b21f6e7f0dd6e65e1b3155036d68104e67e5d5d1bde74892e327d7e5636a076f625599dc394330a731861e87343ff184b0047fef1360a7ec0a5a36a
-  languageName: node
-  linkType: hard
-
-"y18n@npm:^4.0.0":
-  version: 4.0.3
-  resolution: "y18n@npm:4.0.3"
-  checksum: 014dfcd9b5f4105c3bb397c1c8c6429a9df004aa560964fb36732bfb999bfe83d45ae40aeda5b55d21b1ee53d8291580a32a756a443e064317953f08025b1aa4
-  languageName: node
-  linkType: hard
-
-"y18n@npm:^5.0.5":
-  version: 5.0.8
-  resolution: "y18n@npm:5.0.8"
-  checksum: 54f0fb95621ee60898a38c572c515659e51cc9d9f787fb109cef6fde4befbe1c4602dc999d30110feee37456ad0f1660fa2edcfde6a9a740f86a290999550d30
-  languageName: node
-  linkType: hard
-
-"yallist@npm:^3.0.0, yallist@npm:^3.0.2":
-  version: 3.1.1
-  resolution: "yallist@npm:3.1.1"
-  checksum: 48f7bb00dc19fc635a13a39fe547f527b10c9290e7b3e836b9a8f1ca04d4d342e85714416b3c2ab74949c9c66f9cebb0473e6bc353b79035356103b47641285d
-  languageName: node
-  linkType: hard
-
-"yallist@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "yallist@npm:4.0.0"
-  checksum: 343617202af32df2a15a3be36a5a8c0c8545208f3d3dfbc6bb7c3e3b7e8c6f8e7485432e4f3b88da3031a6e20afa7c711eded32ddfb122896ac5d914e75848d5
-  languageName: node
-  linkType: hard
-
-"yam@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "yam@npm:1.0.0"
-  dependencies:
-    fs-extra: ^4.0.2
-    lodash.merge: ^4.6.0
-  checksum: b954d6fedeb19525ff559e25ce8bd38033ffe75f11a13a71fa960b3c36055c0e4a57910aac441ffd8ae9513ef3461ed1a9f91c767825546f3ea3831b39bdb5c9
-  languageName: node
-  linkType: hard
-
-"yaml@npm:^1.10.0":
-  version: 1.10.2
-  resolution: "yaml@npm:1.10.2"
-  checksum: ce4ada136e8a78a0b08dc10b4b900936912d15de59905b2bf415b4d33c63df1d555d23acb2a41b23cf9fb5da41c256441afca3d6509de7247daa062fd2c5ea5f
-  languageName: node
-  linkType: hard
-
-"yargs-parser@npm:^13.1.2":
-  version: 13.1.2
-  resolution: "yargs-parser@npm:13.1.2"
-  dependencies:
-    camelcase: ^5.0.0
-    decamelize: ^1.2.0
-  checksum: c8bb6f44d39a4acd94462e96d4e85469df865de6f4326e0ab1ac23ae4a835e5dd2ddfe588317ebf80c3a7e37e741bd5cb0dc8d92bcc5812baefb7df7c885e86b
-  languageName: node
-  linkType: hard
-
-"yargs-parser@npm:^21.0.0":
-  version: 21.0.1
-  resolution: "yargs-parser@npm:21.0.1"
-  checksum: c3ea2ed12cad0377ce3096b3f138df8267edf7b1aa7d710cd502fe16af417bafe4443dd71b28158c22fcd1be5dfd0e86319597e47badf42ff83815485887323a
-  languageName: node
-  linkType: hard
-
-"yargs@npm:^13.1.1":
-  version: 13.3.2
-  resolution: "yargs@npm:13.3.2"
-  dependencies:
-    cliui: ^5.0.0
-    find-up: ^3.0.0
-    get-caller-file: ^2.0.1
-    require-directory: ^2.1.1
-    require-main-filename: ^2.0.0
-    set-blocking: ^2.0.0
-    string-width: ^3.0.0
-    which-module: ^2.0.0
-    y18n: ^4.0.0
-    yargs-parser: ^13.1.2
-  checksum: 75c13e837eb2bb25717957ba58d277e864efc0cca7f945c98bdf6477e6ec2f9be6afa9ed8a876b251a21423500c148d7b91e88dee7adea6029bdec97af1ef3e8
-  languageName: node
-  linkType: hard
-
-"yargs@npm:^17.4.1":
-  version: 17.5.1
-  resolution: "yargs@npm:17.5.1"
-  dependencies:
-    cliui: ^7.0.2
-    escalade: ^3.1.1
-    get-caller-file: ^2.0.5
-    require-directory: ^2.1.1
-    string-width: ^4.2.3
-    y18n: ^5.0.5
-    yargs-parser: ^21.0.0
-  checksum: 00d58a2c052937fa044834313f07910fd0a115dec5ee35919e857eeee3736b21a4eafa8264535800ba8bac312991ce785ecb8a51f4d2cc8c4676d865af1cfbde
-  languageName: node
-  linkType: hard
-
-"yocto-queue@npm:^0.1.0":
-  version: 0.1.0
-  resolution: "yocto-queue@npm:0.1.0"
-  checksum: f77b3d8d00310def622123df93d4ee654fc6a0096182af8bd60679ddcdfb3474c56c6c7190817c84a2785648cdee9d721c0154eb45698c62176c322fb46fc700
-  languageName: node
-  linkType: hard
-
-"yocto-queue@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "yocto-queue@npm:1.0.0"
-  checksum: 2cac84540f65c64ccc1683c267edce396b26b1e931aa429660aefac8fbe0188167b7aee815a3c22fa59a28a58d898d1a2b1825048f834d8d629f4c2a5d443801
-  languageName: node
-  linkType: hard
-
-"zwitch@npm:^1.0.0":
-  version: 1.0.5
-  resolution: "zwitch@npm:1.0.5"
-  checksum: 28a1bebacab3bc60150b6b0a2ba1db2ad033f068e81f05e4892ec0ea13ae63f5d140a1d692062ac0657840c8da076f35b94433b5f1c329d7803b247de80f064a
-  languageName: node
-  linkType: hard
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@ampproject/remapping@^2.1.0":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.1.2.tgz#4edca94973ded9630d20101cd8559cedb8d8bd34"
+  integrity sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg==
+  dependencies:
+    "@jridgewell/trace-mapping" "^0.3.0"
+
+"@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":
+  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/code-frame@^7.12.13", "@babel/code-frame@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.0.tgz#0dfc80309beec8411e65e706461c408b0bb9b431"
+  integrity sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA==
+  dependencies:
+    "@babel/highlight" "^7.16.0"
+
+"@babel/code-frame@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789"
+  integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==
+  dependencies:
+    "@babel/highlight" "^7.16.7"
+
+"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.13.8", "@babel/compat-data@^7.14.0", "@babel/compat-data@^7.16.0":
+  version "7.16.4"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.16.4.tgz#081d6bbc336ec5c2435c6346b2ae1fb98b5ac68e"
+  integrity sha512-1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q==
+
+"@babel/compat-data@^7.16.8", "@babel/compat-data@^7.17.0", "@babel/compat-data@^7.17.7":
+  version "7.17.7"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.7.tgz#078d8b833fbbcc95286613be8c716cef2b519fa2"
+  integrity sha512-p8pdE6j0a29TNGebNm7NzYZWB3xVZJBZ7XGs42uAKzQo8VQ3F0By/cQCtUEABwIqw5zo6WA4NbmxsfzADzMKnQ==
+
+"@babel/compat-data@^7.17.10":
+  version "7.17.10"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.10.tgz#711dc726a492dfc8be8220028b1b92482362baab"
+  integrity sha512-GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw==
+
+"@babel/core@^7.0.0", "@babel/core@^7.12.0", "@babel/core@^7.3.4":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.16.0.tgz#c4ff44046f5fe310525cc9eb4ef5147f0c5374d4"
+  integrity sha512-mYZEvshBRHGsIAiyH5PzCFTCfbWfoYbO/jcSdXQSUQu1/pW0xDZAUP7KEc32heqWTAfAHhV9j1vH8Sav7l+JNQ==
+  dependencies:
+    "@babel/code-frame" "^7.16.0"
+    "@babel/generator" "^7.16.0"
+    "@babel/helper-compilation-targets" "^7.16.0"
+    "@babel/helper-module-transforms" "^7.16.0"
+    "@babel/helpers" "^7.16.0"
+    "@babel/parser" "^7.16.0"
+    "@babel/template" "^7.16.0"
+    "@babel/traverse" "^7.16.0"
+    "@babel/types" "^7.16.0"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.1.2"
+    semver "^6.3.0"
+    source-map "^0.5.0"
+
+"@babel/core@^7.1.6", "@babel/core@^7.12.3":
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.0.tgz#47299ff3ec8d111b493f1a9d04bf88c04e728d88"
+  integrity sha512-8YqpRig5NmIHlMLw09zMlPTvUVMILjqCOtVgu+TVNWEBvy9b5I3RRyhqnrV4hjgEK7n8P9OqvkWJAFmEL6Wwfw==
+  dependencies:
+    "@babel/code-frame" "^7.12.13"
+    "@babel/generator" "^7.14.0"
+    "@babel/helper-compilation-targets" "^7.13.16"
+    "@babel/helper-module-transforms" "^7.14.0"
+    "@babel/helpers" "^7.14.0"
+    "@babel/parser" "^7.14.0"
+    "@babel/template" "^7.12.13"
+    "@babel/traverse" "^7.14.0"
+    "@babel/types" "^7.14.0"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.1.2"
+    semver "^6.3.0"
+    source-map "^0.5.0"
+
+"@babel/core@^7.13.10", "@babel/core@^7.13.8":
+  version "7.17.8"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.8.tgz#3dac27c190ebc3a4381110d46c80e77efe172e1a"
+  integrity sha512-OdQDV/7cRBtJHLSOBqqbYNkOcydOgnX59TZx4puf41fzcVtN3e/4yqY8lMQsK+5X2lJtAdmA+6OHqsj1hBJ4IQ==
+  dependencies:
+    "@ampproject/remapping" "^2.1.0"
+    "@babel/code-frame" "^7.16.7"
+    "@babel/generator" "^7.17.7"
+    "@babel/helper-compilation-targets" "^7.17.7"
+    "@babel/helper-module-transforms" "^7.17.7"
+    "@babel/helpers" "^7.17.8"
+    "@babel/parser" "^7.17.8"
+    "@babel/template" "^7.16.7"
+    "@babel/traverse" "^7.17.3"
+    "@babel/types" "^7.17.0"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.1.2"
+    semver "^6.3.0"
+
+"@babel/core@^7.16.7":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.18.2.tgz#87b2fcd7cce9becaa7f5acebdc4f09f3dd19d876"
+  integrity sha512-A8pri1YJiC5UnkdrWcmfZTJTV85b4UXTAfImGmCfYmax4TR9Cw8sDS0MOk++Gp2mE/BefVJ5nwy5yzqNJbP/DQ==
+  dependencies:
+    "@ampproject/remapping" "^2.1.0"
+    "@babel/code-frame" "^7.16.7"
+    "@babel/generator" "^7.18.2"
+    "@babel/helper-compilation-targets" "^7.18.2"
+    "@babel/helper-module-transforms" "^7.18.0"
+    "@babel/helpers" "^7.18.2"
+    "@babel/parser" "^7.18.0"
+    "@babel/template" "^7.16.7"
+    "@babel/traverse" "^7.18.2"
+    "@babel/types" "^7.18.2"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.2.1"
+    semver "^6.3.0"
+
+"@babel/generator@^7.14.0", "@babel/generator@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.0.tgz#d40f3d1d5075e62d3500bccb67f3daa8a95265b2"
+  integrity sha512-RR8hUCfRQn9j9RPKEVXo9LiwoxLPYn6hNZlvUOR8tSnaxlD0p0+la00ZP9/SnRt6HchKr+X0fO2r8vrETiJGew==
+  dependencies:
+    "@babel/types" "^7.16.0"
+    jsesc "^2.5.1"
+    source-map "^0.5.0"
+
+"@babel/generator@^7.17.3", "@babel/generator@^7.17.7":
+  version "7.17.7"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.7.tgz#8da2599beb4a86194a3b24df6c085931d9ee45ad"
+  integrity sha512-oLcVCTeIFadUoArDTwpluncplrYBmTCCZZgXCbgNGvOBBiSDDK3eWO4b/+eOTli5tKv1lg+a5/NAXg+nTcei1w==
+  dependencies:
+    "@babel/types" "^7.17.0"
+    jsesc "^2.5.1"
+    source-map "^0.5.0"
+
+"@babel/generator@^7.18.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.2.tgz#33873d6f89b21efe2da63fe554460f3df1c5880d"
+  integrity sha512-W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw==
+  dependencies:
+    "@babel/types" "^7.18.2"
+    "@jridgewell/gen-mapping" "^0.3.0"
+    jsesc "^2.5.1"
+
+"@babel/helper-annotate-as-pure@^7.12.13", "@babel/helper-annotate-as-pure@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.0.tgz#9a1f0ebcda53d9a2d00108c4ceace6a5d5f1f08d"
+  integrity sha512-ItmYF9vR4zA8cByDocY05o0LGUkp1zhbTQOH1NFyl5xXEqlTJQCEJjieriw+aFpxo16swMxUnUiKS7a/r4vtHg==
+  dependencies:
+    "@babel/types" "^7.16.0"
+
+"@babel/helper-annotate-as-pure@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862"
+  integrity sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.0.tgz#f1a686b92da794020c26582eb852e9accd0d7882"
+  integrity sha512-9KuleLT0e77wFUku6TUkqZzCEymBdtuQQ27MhEKzf9UOOJu3cYj98kyaDAzxpC7lV6DGiZFuC8XqDsq8/Kl6aQ==
+  dependencies:
+    "@babel/helper-explode-assignable-expression" "^7.16.0"
+    "@babel/types" "^7.16.0"
+
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz#38d138561ea207f0f69eb1626a418e4f7e6a580b"
+  integrity sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==
+  dependencies:
+    "@babel/helper-explode-assignable-expression" "^7.16.7"
+    "@babel/types" "^7.16.7"
+
+"@babel/helper-compilation-targets@^7.12.0", "@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.13.16", "@babel/helper-compilation-targets@^7.13.8", "@babel/helper-compilation-targets@^7.16.0":
+  version "7.16.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.3.tgz#5b480cd13f68363df6ec4dc8ac8e2da11363cbf0"
+  integrity sha512-vKsoSQAyBmxS35JUOOt+07cLc6Nk/2ljLIHwmq2/NM6hdioUaqEXq/S+nXvbvXbZkNDlWOymPanJGOc4CBjSJA==
+  dependencies:
+    "@babel/compat-data" "^7.16.0"
+    "@babel/helper-validator-option" "^7.14.5"
+    browserslist "^4.17.5"
+    semver "^6.3.0"
+
+"@babel/helper-compilation-targets@^7.16.7", "@babel/helper-compilation-targets@^7.17.7":
+  version "7.17.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.7.tgz#a3c2924f5e5f0379b356d4cfb313d1414dc30e46"
+  integrity sha512-UFzlz2jjd8kroj0hmCFV5zr+tQPi1dpC2cRsDV/3IEW8bJfCPrPpmcSN6ZS8RqIq4LXcmpipCQFPddyFA5Yc7w==
+  dependencies:
+    "@babel/compat-data" "^7.17.7"
+    "@babel/helper-validator-option" "^7.16.7"
+    browserslist "^4.17.5"
+    semver "^6.3.0"
+
+"@babel/helper-compilation-targets@^7.17.10", "@babel/helper-compilation-targets@^7.18.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.2.tgz#67a85a10cbd5fc7f1457fec2e7f45441dc6c754b"
+  integrity sha512-s1jnPotJS9uQnzFtiZVBUxe67CuBa679oWFHpxYYnTpRL/1ffhyX44R9uYiXoa/pLXcY9H2moJta0iaanlk/rQ==
+  dependencies:
+    "@babel/compat-data" "^7.17.10"
+    "@babel/helper-validator-option" "^7.16.7"
+    browserslist "^4.20.2"
+    semver "^6.3.0"
+
+"@babel/helper-create-class-features-plugin@^7.13.0", "@babel/helper-create-class-features-plugin@^7.16.0", "@babel/helper-create-class-features-plugin@^7.8.3":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.0.tgz#090d4d166b342a03a9fec37ef4fd5aeb9c7c6a4b"
+  integrity sha512-XLwWvqEaq19zFlF5PTgOod4bUA+XbkR4WLQBct1bkzmxJGB0ZEJaoKF4c8cgH9oBtCDuYJ8BP5NB9uFiEgO5QA==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.16.0"
+    "@babel/helper-function-name" "^7.16.0"
+    "@babel/helper-member-expression-to-functions" "^7.16.0"
+    "@babel/helper-optimise-call-expression" "^7.16.0"
+    "@babel/helper-replace-supers" "^7.16.0"
+    "@babel/helper-split-export-declaration" "^7.16.0"
+
+"@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.17.6":
+  version "7.17.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.6.tgz#3778c1ed09a7f3e65e6d6e0f6fbfcc53809d92c9"
+  integrity sha512-SogLLSxXm2OkBbSsHZMM4tUi8fUzjs63AT/d0YQIzr6GSd8Hxsbk2KYDX0k0DweAzGMj/YWeiCsorIdtdcW8Eg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.16.7"
+    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/helper-function-name" "^7.16.7"
+    "@babel/helper-member-expression-to-functions" "^7.16.7"
+    "@babel/helper-optimise-call-expression" "^7.16.7"
+    "@babel/helper-replace-supers" "^7.16.7"
+    "@babel/helper-split-export-declaration" "^7.16.7"
+
+"@babel/helper-create-class-features-plugin@^7.17.12", "@babel/helper-create-class-features-plugin@^7.18.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.0.tgz#fac430912606331cb075ea8d82f9a4c145a4da19"
+  integrity sha512-Kh8zTGR9de3J63e5nS0rQUdRs/kbtwoeQQ0sriS0lItjC96u8XXZN6lKpuyWd2coKSU13py/y+LTmThLuVX0Pg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.16.7"
+    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/helper-function-name" "^7.17.9"
+    "@babel/helper-member-expression-to-functions" "^7.17.7"
+    "@babel/helper-optimise-call-expression" "^7.16.7"
+    "@babel/helper-replace-supers" "^7.16.7"
+    "@babel/helper-split-export-declaration" "^7.16.7"
+
+"@babel/helper-create-class-features-plugin@^7.5.5":
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.0.tgz#38367d3dab125b12f94273de418f4df23a11a15e"
+  integrity sha512-6pXDPguA5zC40Y8oI5mqr+jEUpjMJonKvknvA+vD8CYDz5uuXEwWBK8sRAsE/t3gfb1k15AQb9RhwpscC4nUJQ==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.12.13"
+    "@babel/helper-function-name" "^7.12.13"
+    "@babel/helper-member-expression-to-functions" "^7.13.12"
+    "@babel/helper-optimise-call-expression" "^7.12.13"
+    "@babel/helper-replace-supers" "^7.13.12"
+    "@babel/helper-split-export-declaration" "^7.12.13"
+
+"@babel/helper-create-regexp-features-plugin@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.16.0.tgz#06b2348ce37fccc4f5e18dcd8d75053f2a7c44ff"
+  integrity sha512-3DyG0zAFAZKcOp7aVr33ddwkxJ0Z0Jr5V99y3I690eYLpukJsJvAbzTy1ewoCqsML8SbIrjH14Jc/nSQ4TvNPA==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.16.0"
+    regexpu-core "^4.7.1"
+
+"@babel/helper-create-regexp-features-plugin@^7.16.7":
+  version "7.17.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.0.tgz#1dcc7d40ba0c6b6b25618997c5dbfd310f186fe1"
+  integrity sha512-awO2So99wG6KnlE+TPs6rn83gCz5WlEePJDTnLEqbchMVrBeAujURVphRdigsk094VhvZehFoNOihSlcBjwsXA==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.16.7"
+    regexpu-core "^5.0.1"
+
+"@babel/helper-create-regexp-features-plugin@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.12.tgz#bb37ca467f9694bbe55b884ae7a5cc1e0084e4fd"
+  integrity sha512-b2aZrV4zvutr9AIa6/gA3wsZKRwTKYoDxYiFKcESS3Ug2GTXzwBEvMuuFLhCQpEnRXs1zng4ISAXSUxxKBIcxw==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.16.7"
+    regexpu-core "^5.0.1"
+
+"@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"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/traverse" "^7.13.0"
+    debug "^4.1.1"
+    lodash.debounce "^4.0.8"
+    resolve "^1.14.2"
+    semver "^6.1.2"
+
+"@babel/helper-define-polyfill-provider@^0.2.4":
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.4.tgz#8867aed79d3ea6cade40f801efb7ac5c66916b10"
+  integrity sha512-OrpPZ97s+aPi6h2n1OXzdhVis1SGSsMU2aMHgLcOKfsp4/v1NWpx3CWT3lBj5eeBq9cDkPkh+YCfdF7O12uNDQ==
+  dependencies:
+    "@babel/helper-compilation-targets" "^7.13.0"
+    "@babel/helper-module-imports" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/traverse" "^7.13.0"
+    debug "^4.1.1"
+    lodash.debounce "^4.0.8"
+    resolve "^1.14.2"
+    semver "^6.1.2"
+
+"@babel/helper-define-polyfill-provider@^0.3.0":
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.0.tgz#c5b10cf4b324ff840140bb07e05b8564af2ae971"
+  integrity sha512-7hfT8lUljl/tM3h+izTX/pO3W3frz2ok6Pk+gzys8iJqDfZrZy2pXjRTZAvG2YmfHun1X4q8/UZRLatMfqc5Tg==
+  dependencies:
+    "@babel/helper-compilation-targets" "^7.13.0"
+    "@babel/helper-module-imports" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/traverse" "^7.13.0"
+    debug "^4.1.1"
+    lodash.debounce "^4.0.8"
+    resolve "^1.14.2"
+    semver "^6.1.2"
+
+"@babel/helper-define-polyfill-provider@^0.3.1":
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz#52411b445bdb2e676869e5a74960d2d3826d2665"
+  integrity sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==
+  dependencies:
+    "@babel/helper-compilation-targets" "^7.13.0"
+    "@babel/helper-module-imports" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/traverse" "^7.13.0"
+    debug "^4.1.1"
+    lodash.debounce "^4.0.8"
+    resolve "^1.14.2"
+    semver "^6.1.2"
+
+"@babel/helper-environment-visitor@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz#ff484094a839bde9d89cd63cba017d7aae80ecd7"
+  integrity sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
+"@babel/helper-environment-visitor@^7.18.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.2.tgz#8a6d2dedb53f6bf248e31b4baf38739ee4a637bd"
+  integrity sha512-14GQKWkX9oJzPiQQ7/J36FTXcD4kSp8egKjO9nINlSKiHITRA9q/R74qu8S9xlc/b/yjsJItQUeeh3xnGN0voQ==
+
+"@babel/helper-explode-assignable-expression@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.0.tgz#753017337a15f46f9c09f674cff10cee9b9d7778"
+  integrity sha512-Hk2SLxC9ZbcOhLpg/yMznzJ11W++lg5GMbxt1ev6TXUiJB0N42KPC+7w8a+eWGuqDnUYuwStJoZHM7RgmIOaGQ==
+  dependencies:
+    "@babel/types" "^7.16.0"
+
+"@babel/helper-explode-assignable-expression@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz#12a6d8522fdd834f194e868af6354e8650242b7a"
+  integrity sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
+"@babel/helper-function-name@^7.12.13", "@babel/helper-function-name@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.0.tgz#b7dd0797d00bbfee4f07e9c4ea5b0e30c8bb1481"
+  integrity sha512-BZh4mEk1xi2h4HFjWUXRQX5AEx4rvaZxHgax9gcjdLWdkjsY7MKt5p0otjsg5noXw+pB+clMCjw+aEVYADMjog==
+  dependencies:
+    "@babel/helper-get-function-arity" "^7.16.0"
+    "@babel/template" "^7.16.0"
+    "@babel/types" "^7.16.0"
+
+"@babel/helper-function-name@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz#f1ec51551fb1c8956bc8dd95f38523b6cf375f8f"
+  integrity sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==
+  dependencies:
+    "@babel/helper-get-function-arity" "^7.16.7"
+    "@babel/template" "^7.16.7"
+    "@babel/types" "^7.16.7"
+
+"@babel/helper-function-name@^7.17.9":
+  version "7.17.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz#136fcd54bc1da82fcb47565cf16fd8e444b1ff12"
+  integrity sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==
+  dependencies:
+    "@babel/template" "^7.16.7"
+    "@babel/types" "^7.17.0"
+
+"@babel/helper-get-function-arity@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.0.tgz#0088c7486b29a9cb5d948b1a1de46db66e089cfa"
+  integrity sha512-ASCquNcywC1NkYh/z7Cgp3w31YW8aojjYIlNg4VeJiHkqyP4AzIvr4qx7pYDb4/s8YcsZWqqOSxgkvjUz1kpDQ==
+  dependencies:
+    "@babel/types" "^7.16.0"
+
+"@babel/helper-get-function-arity@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz#ea08ac753117a669f1508ba06ebcc49156387419"
+  integrity sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
+"@babel/helper-hoist-variables@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.0.tgz#4c9023c2f1def7e28ff46fc1dbcd36a39beaa81a"
+  integrity sha512-1AZlpazjUR0EQZQv3sgRNfM9mEVWPK3M6vlalczA+EECcPz3XPh6VplbErL5UoMpChhSck5wAJHthlj1bYpcmg==
+  dependencies:
+    "@babel/types" "^7.16.0"
+
+"@babel/helper-hoist-variables@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz#86bcb19a77a509c7b77d0e22323ef588fa58c246"
+  integrity sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
+"@babel/helper-member-expression-to-functions@^7.13.12", "@babel/helper-member-expression-to-functions@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.0.tgz#29287040efd197c77636ef75188e81da8bccd5a4"
+  integrity sha512-bsjlBFPuWT6IWhl28EdrQ+gTvSvj5tqVP5Xeftp07SEuz5pLnsXZuDkDD3Rfcxy0IsHmbZ+7B2/9SHzxO0T+sQ==
+  dependencies:
+    "@babel/types" "^7.16.0"
+
+"@babel/helper-member-expression-to-functions@^7.16.7", "@babel/helper-member-expression-to-functions@^7.17.7":
+  version "7.17.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz#a34013b57d8542a8c4ff8ba3f747c02452a4d8c4"
+  integrity sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw==
+  dependencies:
+    "@babel/types" "^7.17.0"
+
+"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.13.12", "@babel/helper-module-imports@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.0.tgz#90538e60b672ecf1b448f5f4f5433d37e79a3ec3"
+  integrity sha512-kkH7sWzKPq0xt3H1n+ghb4xEMP8k0U7XV3kkB+ZGy69kDk2ySFW1qPi06sjKzFY3t1j6XbJSqr4mF9L7CYVyhg==
+  dependencies:
+    "@babel/types" "^7.16.0"
+
+"@babel/helper-module-imports@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz#25612a8091a999704461c8a222d0efec5d091437"
+  integrity sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
+"@babel/helper-module-imports@^7.8.3":
+  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.14.0", "@babel/helper-module-transforms@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.16.0.tgz#1c82a8dd4cb34577502ebd2909699b194c3e9bb5"
+  integrity sha512-My4cr9ATcaBbmaEa8M0dZNA74cfI6gitvUAskgDtAFmAqyFKDSHQo5YstxPbN+lzHl2D9l/YOEFqb2mtUh4gfA==
+  dependencies:
+    "@babel/helper-module-imports" "^7.16.0"
+    "@babel/helper-replace-supers" "^7.16.0"
+    "@babel/helper-simple-access" "^7.16.0"
+    "@babel/helper-split-export-declaration" "^7.16.0"
+    "@babel/helper-validator-identifier" "^7.15.7"
+    "@babel/template" "^7.16.0"
+    "@babel/traverse" "^7.16.0"
+    "@babel/types" "^7.16.0"
+
+"@babel/helper-module-transforms@^7.16.7", "@babel/helper-module-transforms@^7.17.7":
+  version "7.17.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz#3943c7f777139e7954a5355c815263741a9c1cbd"
+  integrity sha512-VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/helper-module-imports" "^7.16.7"
+    "@babel/helper-simple-access" "^7.17.7"
+    "@babel/helper-split-export-declaration" "^7.16.7"
+    "@babel/helper-validator-identifier" "^7.16.7"
+    "@babel/template" "^7.16.7"
+    "@babel/traverse" "^7.17.3"
+    "@babel/types" "^7.17.0"
+
+"@babel/helper-module-transforms@^7.18.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.18.0.tgz#baf05dec7a5875fb9235bd34ca18bad4e21221cd"
+  integrity sha512-kclUYSUBIjlvnzN2++K9f2qzYKFgjmnmjwL4zlmU5f8ZtzgWe8s0rUPSTGy2HmK4P8T52MQsS+HTQAgZd3dMEA==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/helper-module-imports" "^7.16.7"
+    "@babel/helper-simple-access" "^7.17.7"
+    "@babel/helper-split-export-declaration" "^7.16.7"
+    "@babel/helper-validator-identifier" "^7.16.7"
+    "@babel/template" "^7.16.7"
+    "@babel/traverse" "^7.18.0"
+    "@babel/types" "^7.18.0"
+
+"@babel/helper-optimise-call-expression@^7.12.13", "@babel/helper-optimise-call-expression@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.0.tgz#cecdb145d70c54096b1564f8e9f10cd7d193b338"
+  integrity sha512-SuI467Gi2V8fkofm2JPnZzB/SUuXoJA5zXe/xzyPP2M04686RzFKFHPK6HDVN6JvWBIEW8tt9hPR7fXdn2Lgpw==
+  dependencies:
+    "@babel/types" "^7.16.0"
+
+"@babel/helper-optimise-call-expression@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz#a34e3560605abbd31a18546bd2aad3e6d9a174f2"
+  integrity sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
+"@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-plugin-utils@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz#aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5"
+  integrity sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==
+
+"@babel/helper-plugin-utils@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.17.12.tgz#86c2347da5acbf5583ba0a10aed4c9bf9da9cf96"
+  integrity sha512-JDkf04mqtN3y4iAbO1hv9U2ARpPyPL1zqyWs/2WG1pgSq9llHFjStX5jdxb84himgJm+8Ng+x0oiWF/nw/XQKA==
+
+"@babel/helper-remap-async-to-generator@^7.16.0", "@babel/helper-remap-async-to-generator@^7.16.4":
+  version "7.16.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.4.tgz#5d7902f61349ff6b963e07f06a389ce139fbfe6e"
+  integrity sha512-vGERmmhR+s7eH5Y/cp8PCVzj4XEjerq8jooMfxFdA5xVtAk9Sh4AQsrWgiErUEBjtGrBtOFKDUcWQFW4/dFwMA==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.16.0"
+    "@babel/helper-wrap-function" "^7.16.0"
+    "@babel/types" "^7.16.0"
+
+"@babel/helper-remap-async-to-generator@^7.16.8":
+  version "7.16.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz#29ffaade68a367e2ed09c90901986918d25e57e3"
+  integrity sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.16.7"
+    "@babel/helper-wrap-function" "^7.16.8"
+    "@babel/types" "^7.16.8"
+
+"@babel/helper-replace-supers@^7.13.12", "@babel/helper-replace-supers@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.0.tgz#73055e8d3cf9bcba8ddb55cad93fedc860f68f17"
+  integrity sha512-TQxuQfSCdoha7cpRNJvfaYxxxzmbxXw/+6cS7V02eeDYyhxderSoMVALvwupA54/pZcOTtVeJ0xccp1nGWladA==
+  dependencies:
+    "@babel/helper-member-expression-to-functions" "^7.16.0"
+    "@babel/helper-optimise-call-expression" "^7.16.0"
+    "@babel/traverse" "^7.16.0"
+    "@babel/types" "^7.16.0"
+
+"@babel/helper-replace-supers@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz#e9f5f5f32ac90429c1a4bdec0f231ef0c2838ab1"
+  integrity sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/helper-member-expression-to-functions" "^7.16.7"
+    "@babel/helper-optimise-call-expression" "^7.16.7"
+    "@babel/traverse" "^7.16.7"
+    "@babel/types" "^7.16.7"
+
+"@babel/helper-replace-supers@^7.18.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.18.2.tgz#41fdfcc9abaf900e18ba6e5931816d9062a7b2e0"
+  integrity sha512-XzAIyxx+vFnrOxiQrToSUOzUOn0e1J2Li40ntddek1Y69AXUTXoDJ40/D5RdjFu7s7qHiaeoTiempZcbuVXh2Q==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.18.2"
+    "@babel/helper-member-expression-to-functions" "^7.17.7"
+    "@babel/helper-optimise-call-expression" "^7.16.7"
+    "@babel/traverse" "^7.18.2"
+    "@babel/types" "^7.18.2"
+
+"@babel/helper-simple-access@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.16.0.tgz#21d6a27620e383e37534cf6c10bba019a6f90517"
+  integrity sha512-o1rjBT/gppAqKsYfUdfHq5Rk03lMQrkPHG1OWzHWpLgVXRH4HnMM9Et9CVdIqwkCQlobnGHEJMsgWP/jE1zUiw==
+  dependencies:
+    "@babel/types" "^7.16.0"
+
+"@babel/helper-simple-access@^7.17.7":
+  version "7.17.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz#aaa473de92b7987c6dfa7ce9a7d9674724823367"
+  integrity sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA==
+  dependencies:
+    "@babel/types" "^7.17.0"
+
+"@babel/helper-simple-access@^7.18.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.18.2.tgz#4dc473c2169ac3a1c9f4a51cfcd091d1c36fcff9"
+  integrity sha512-7LIrjYzndorDY88MycupkpQLKS1AFfsVRm2k/9PtKScSy5tZq0McZTj+DiMRynboZfIqOKvo03pmhTaUgiD6fQ==
+  dependencies:
+    "@babel/types" "^7.18.2"
+
+"@babel/helper-skip-transparent-expression-wrappers@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09"
+  integrity sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==
+  dependencies:
+    "@babel/types" "^7.16.0"
+
+"@babel/helper-split-export-declaration@^7.12.13", "@babel/helper-split-export-declaration@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.0.tgz#29672f43663e936df370aaeb22beddb3baec7438"
+  integrity sha512-0YMMRpuDFNGTHNRiiqJX19GjNXA4H0E8jZ2ibccfSxaCogbm3am5WN/2nQNj0YnQwGWM1J06GOcQ2qnh3+0paw==
+  dependencies:
+    "@babel/types" "^7.16.0"
+
+"@babel/helper-split-export-declaration@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz#0b648c0c42da9d3920d85ad585f2778620b8726b"
+  integrity sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
+"@babel/helper-validator-identifier@^7.14.0", "@babel/helper-validator-identifier@^7.15.7":
+  version "7.15.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389"
+  integrity sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==
+
+"@babel/helper-validator-identifier@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad"
+  integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==
+
+"@babel/helper-validator-option@^7.12.17", "@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-validator-option@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23"
+  integrity sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==
+
+"@babel/helper-wrap-function@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.16.0.tgz#b3cf318afce774dfe75b86767cd6d68f3482e57c"
+  integrity sha512-VVMGzYY3vkWgCJML+qVLvGIam902mJW0FvT7Avj1zEe0Gn7D93aWdLblYARTxEw+6DhZmtzhBM2zv0ekE5zg1g==
+  dependencies:
+    "@babel/helper-function-name" "^7.16.0"
+    "@babel/template" "^7.16.0"
+    "@babel/traverse" "^7.16.0"
+    "@babel/types" "^7.16.0"
+
+"@babel/helper-wrap-function@^7.16.8":
+  version "7.16.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz#58afda087c4cd235de92f7ceedebca2c41274200"
+  integrity sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==
+  dependencies:
+    "@babel/helper-function-name" "^7.16.7"
+    "@babel/template" "^7.16.7"
+    "@babel/traverse" "^7.16.8"
+    "@babel/types" "^7.16.8"
+
+"@babel/helpers@^7.14.0", "@babel/helpers@^7.16.0":
+  version "7.16.3"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.16.3.tgz#27fc64f40b996e7074dc73128c3e5c3e7f55c43c"
+  integrity sha512-Xn8IhDlBPhvYTvgewPKawhADichOsbkZuzN7qz2BusOM0brChsyXMDJvldWaYMMUNiCQdQzNEioXTp3sC8Nt8w==
+  dependencies:
+    "@babel/template" "^7.16.0"
+    "@babel/traverse" "^7.16.3"
+    "@babel/types" "^7.16.0"
+
+"@babel/helpers@^7.17.8":
+  version "7.17.8"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.8.tgz#288450be8c6ac7e4e44df37bcc53d345e07bc106"
+  integrity sha512-QcL86FGxpfSJwGtAvv4iG93UL6bmqBdmoVY0CMCU2g+oD2ezQse3PT5Pa+jiD6LJndBQi0EDlpzOWNlLuhz5gw==
+  dependencies:
+    "@babel/template" "^7.16.7"
+    "@babel/traverse" "^7.17.3"
+    "@babel/types" "^7.17.0"
+
+"@babel/helpers@^7.18.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.18.2.tgz#970d74f0deadc3f5a938bfa250738eb4ac889384"
+  integrity sha512-j+d+u5xT5utcQSzrh9p+PaJX94h++KN+ng9b9WEJq7pkUPAd61FGqhjuUEdfknb3E/uDBb7ruwEeKkIxNJPIrg==
+  dependencies:
+    "@babel/template" "^7.16.7"
+    "@babel/traverse" "^7.18.2"
+    "@babel/types" "^7.18.2"
+
+"@babel/highlight@^7.10.4":
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.0.tgz#3197e375711ef6bf834e67d0daec88e4f46113cf"
+  integrity sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.14.0"
+    chalk "^2.0.0"
+    js-tokens "^4.0.0"
+
+"@babel/highlight@^7.12.13", "@babel/highlight@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.0.tgz#6ceb32b2ca4b8f5f361fb7fd821e3fddf4a1725a"
+  integrity sha512-t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.15.7"
+    chalk "^2.0.0"
+    js-tokens "^4.0.0"
+
+"@babel/highlight@^7.16.7":
+  version "7.16.10"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.10.tgz#744f2eb81579d6eea753c227b0f570ad785aba88"
+  integrity sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.16.7"
+    chalk "^2.0.0"
+    js-tokens "^4.0.0"
+
+"@babel/parser@^7.12.3", "@babel/parser@^7.4.5", "@babel/parser@^7.7.0":
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.0.tgz#2f0ebfed92bcddcc8395b91f1895191ce2760380"
+  integrity sha512-AHbfoxesfBALg33idaTBVUkLnfXtsgvJREf93p4p0Lwsz4ppfE7g1tpEXVm4vrxUcH4DVhAa9Z1m1zqf9WUC7Q==
+
+"@babel/parser@^7.14.0", "@babel/parser@^7.16.0", "@babel/parser@^7.16.3":
+  version "7.16.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.4.tgz#d5f92f57cf2c74ffe9b37981c0e72fee7311372e"
+  integrity sha512-6V0qdPUaiVHH3RtZeLIsc+6pDhbYzHR8ogA8w+f+Wc77DuXto19g2QUwveINoS34Uw+W8/hQDGJCx+i4n7xcng==
+
+"@babel/parser@^7.16.7", "@babel/parser@^7.17.3", "@babel/parser@^7.17.8":
+  version "7.17.8"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.8.tgz#2817fb9d885dd8132ea0f8eb615a6388cca1c240"
+  integrity sha512-BoHhDJrJXqcg+ZL16Xv39H9n+AqJ4pcDrQBGZN+wHxIysrLZ3/ECwCBUch/1zUNhnsXULcONU3Ei5Hmkfk6kiQ==
+
+"@babel/parser@^7.18.0":
+  version "7.18.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.4.tgz#6774231779dd700e0af29f6ad8d479582d7ce5ef"
+  integrity sha512-FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow==
+
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz#4eda6d6c2a0aa79c70fa7b6da67763dfe2141050"
+  integrity sha512-anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12.tgz#1dca338caaefca368639c9ffb095afbd4d420b1e"
+  integrity sha512-xCJQXl4EeQ3J9C4yOmpTrtVGmzpm2iSzyxbkZHw7UCnZBftHpF/hpII80uWVyVrc40ytIClHjgWGTG1g/yB+aw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.17.12"
+
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.13.12":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.0.tgz#358972eaab006f5eb0826183b0c93cbcaf13e1e2"
+  integrity sha512-4tcFwwicpWTrpl9qjf7UsoosaArgImF85AxqCRZlgc3IQDvkUHjJpruXAL58Wmj+T6fypWTC/BakfEkwIL/pwA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
+    "@babel/plugin-proposal-optional-chaining" "^7.16.0"
+
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7.tgz#cc001234dfc139ac45f6bcf801866198c8c72ff9"
+  integrity sha512-di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
+    "@babel/plugin-proposal-optional-chaining" "^7.16.7"
+
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.17.12.tgz#0d498ec8f0374b1e2eb54b9cb2c4c78714c77753"
+  integrity sha512-/vt0hpIw0x4b6BLKUkwlvEoiGZYYLNZ96CzyHYPbtG2jZGz6LBe7/V+drYrc/d+ovrF9NBi0pmtvmNb/FsWtRQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
+    "@babel/plugin-proposal-optional-chaining" "^7.17.12"
+
+"@babel/plugin-proposal-async-generator-functions@^7.13.15":
+  version "7.16.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.4.tgz#e606eb6015fec6fa5978c940f315eae4e300b081"
+  integrity sha512-/CUekqaAaZCQHleSK/9HajvcD/zdnJiKRiuUFq8ITE+0HsPzquf53cpFiqAwl/UfmJbR6n5uGPQSPdrmKOvHHg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-remap-async-to-generator" "^7.16.4"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
+
+"@babel/plugin-proposal-async-generator-functions@^7.16.8":
+  version "7.16.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz#3bdd1ebbe620804ea9416706cd67d60787504bc8"
+  integrity sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-remap-async-to-generator" "^7.16.8"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
+
+"@babel/plugin-proposal-async-generator-functions@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.17.12.tgz#094a417e31ce7e692d84bab06c8e2a607cbeef03"
+  integrity sha512-RWVvqD1ooLKP6IqWTA5GyFVX2isGEgC5iFxKzfYOIy/QEFdxYyCybBDtIGjipHpb9bDWHzcqGqFakf+mVmBTdQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-remap-async-to-generator" "^7.16.8"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
+
+"@babel/plugin-proposal-class-properties@^7.1.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==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+
+"@babel/plugin-proposal-class-properties@^7.13.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.0.tgz#c029618267ddebc7280fa286e0f8ca2a278a2d1a"
+  integrity sha512-mCF3HcuZSY9Fcx56Lbn+CGdT44ioBMMvjNVldpKtj8tpniETdLjnxdHI1+sDWXIM1nNt+EanJOZ3IG9lzVjs7A==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-proposal-class-properties@^7.16.5", "@babel/plugin-proposal-class-properties@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz#925cad7b3b1a2fcea7e59ecc8eb5954f961f91b0"
+  integrity sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+
+"@babel/plugin-proposal-class-properties@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.17.12.tgz#84f65c0cc247d46f40a6da99aadd6438315d80a4"
+  integrity sha512-U0mI9q8pW5Q9EaTHFPwSVusPMV/DV9Mm8p7csqROFLtIE9rBF5piLqyrBGigftALrBcsBGu4m38JneAe7ZDLXw==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.17.12"
+
+"@babel/plugin-proposal-class-static-block@^7.13.11":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.0.tgz#5296942c564d8144c83eea347d0aa8a0b89170e7"
+  integrity sha512-mAy3sdcY9sKAkf3lQbDiv3olOfiLqI51c9DR9b19uMoR2Z6r5pmGl7dfNFqEvqOyqbf1ta4lknK4gc5PJn3mfA==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-class-static-block" "^7.14.5"
+
+"@babel/plugin-proposal-class-static-block@^7.16.7":
+  version "7.17.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.17.6.tgz#164e8fd25f0d80fa48c5a4d1438a6629325ad83c"
+  integrity sha512-X/tididvL2zbs7jZCeeRJ8167U/+Ac135AM6jCAx6gYXDUviZV5Ku9UDvWS2NCuWlFjIRXklYhwo6HhAC7ETnA==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.17.6"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/plugin-syntax-class-static-block" "^7.14.5"
+
+"@babel/plugin-proposal-class-static-block@^7.18.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.0.tgz#7d02253156e3c3793bdb9f2faac3a1c05f0ba710"
+  integrity sha512-t+8LsRMMDE74c6sV7KShIw13sqbqd58tlqNrsWoWBTIMw7SVQ0cZ905wLNS/FBCy/3PyooRHLFFlfrUNyyz5lA==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.18.0"
+    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/plugin-syntax-class-static-block" "^7.14.5"
+
+"@babel/plugin-proposal-decorators@^7.13.5":
+  version "7.16.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.16.4.tgz#9b35ce0716425a93b978e79099e5f7ba217c1364"
+  integrity sha512-RESBNX16eNqnBeEVR5sCJpnW0mHiNLNNvGA8PrRuK/4ZJ4TO+6bHleRUuGQYDERVySOKtOhSya/C4MIhwAMAgg==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-decorators" "^7.16.0"
+
+"@babel/plugin-proposal-decorators@^7.16.7":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.18.2.tgz#dbe4086d2d42db489399783c3aa9272e9700afd4"
+  integrity sha512-kbDISufFOxeczi0v4NQP3p5kIeW6izn/6klfWBrIIdGZZe4UpHR+QU03FAoWjGGd9SUXAwbw2pup1kaL4OQsJQ==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.18.0"
+    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-replace-supers" "^7.18.2"
+    "@babel/helper-split-export-declaration" "^7.16.7"
+    "@babel/plugin-syntax-decorators" "^7.17.12"
+    charcodes "^0.2.0"
+
+"@babel/plugin-proposal-dynamic-import@^7.13.8":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.0.tgz#783eca61d50526202f9b296095453977e88659f1"
+  integrity sha512-QGSA6ExWk95jFQgwz5GQ2Dr95cf7eI7TKutIXXTb7B1gCLTCz5hTjFTQGfLFBBiC5WSNi7udNwWsqbbMh1c4yQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
+
+"@babel/plugin-proposal-dynamic-import@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz#c19c897eaa46b27634a00fee9fb7d829158704b2"
+  integrity sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
+
+"@babel/plugin-proposal-export-namespace-from@^7.12.13":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.0.tgz#9c01dee40b9d6b847b656aaf4a3976a71740f222"
+  integrity sha512-CjI4nxM/D+5wCnhD11MHB1AwRSAYeDT+h8gCdcVJZ/OK7+wRzFsf7PFPWVpVpNRkHMmMkQWAHpTq+15IXQ1diA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+
+"@babel/plugin-proposal-export-namespace-from@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz#09de09df18445a5786a305681423ae63507a6163"
+  integrity sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+
+"@babel/plugin-proposal-export-namespace-from@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.17.12.tgz#b22864ccd662db9606edb2287ea5fd1709f05378"
+  integrity sha512-j7Ye5EWdwoXOpRmo5QmRyHPsDIe6+u70ZYZrd7uz+ebPYFKfRcLcNu3Ro0vOlJ5zuv8rU7xa+GttNiRzX56snQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+
+"@babel/plugin-proposal-json-strings@^7.13.8":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.0.tgz#cae35a95ed1d2a7fa29c4dc41540b84a72e9ab25"
+  integrity sha512-kouIPuiv8mSi5JkEhzApg5Gn6hFyKPnlkO0a9YSzqRurH8wYzSlf6RJdzluAsbqecdW5pBvDJDfyDIUR/vLxvg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
+
+"@babel/plugin-proposal-json-strings@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz#9732cb1d17d9a2626a08c5be25186c195b6fa6e8"
+  integrity sha512-lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
+
+"@babel/plugin-proposal-json-strings@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.17.12.tgz#f4642951792437233216d8c1af370bb0fbff4664"
+  integrity sha512-rKJ+rKBoXwLnIn7n6o6fulViHMrOThz99ybH+hKHcOZbnN14VuMnH9fo2eHE69C8pO4uX1Q7t2HYYIDmv8VYkg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
+
+"@babel/plugin-proposal-logical-assignment-operators@^7.13.8":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.0.tgz#a711b8ceb3ffddd3ef88d3a49e86dbd3cc7db3fd"
+  integrity sha512-pbW0fE30sVTYXXm9lpVQQ/Vc+iTeQKiXlaNRZPPN2A2VdlWyAtsUrsQ3xydSlDW00TFMK7a8m3cDTkBF5WnV3Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+
+"@babel/plugin-proposal-logical-assignment-operators@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz#be23c0ba74deec1922e639832904be0bea73cdea"
+  integrity sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+
+"@babel/plugin-proposal-logical-assignment-operators@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.17.12.tgz#c64a1bcb2b0a6d0ed2ff674fd120f90ee4b88a23"
+  integrity sha512-EqFo2s1Z5yy+JeJu7SFfbIUtToJTVlC61/C7WLKDntSw4Sz6JNAIfL7zQ74VvirxpjB5kz/kIx0gCcb+5OEo2Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.13.8", "@babel/plugin-proposal-nullish-coalescing-operator@^7.4.4":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.0.tgz#44e1cce08fe2427482cf446a91bb451528ed0596"
+  integrity sha512-3bnHA8CAFm7cG93v8loghDYyQ8r97Qydf63BeYiGgYbjKKB/XP53W15wfRC7dvKfoiJ34f6Rbyyx2btExc8XsQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz#141fc20b6857e59459d430c850a0011e36561d99"
+  integrity sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.17.12.tgz#1e93079bbc2cbc756f6db6a1925157c4a92b94be"
+  integrity sha512-ws/g3FSGVzv+VH86+QvgtuJL/kR67xaEIF2x0iPqdDfYW6ra6JF3lKVBkWynRLcNtIC1oCTfDRVxmm2mKzy+ag==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+
+"@babel/plugin-proposal-numeric-separator@^7.12.13":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.0.tgz#5d418e4fbbf8b9b7d03125d3a52730433a373734"
+  integrity sha512-FAhE2I6mjispy+vwwd6xWPyEx3NYFS13pikDBWUAFGZvq6POGs5eNchw8+1CYoEgBl9n11I3NkzD7ghn25PQ9Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
+
+"@babel/plugin-proposal-numeric-separator@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz#d6b69f4af63fb38b6ca2558442a7fb191236eba9"
+  integrity sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
+
+"@babel/plugin-proposal-object-rest-spread@^7.12.1":
+  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==
+  dependencies:
+    "@babel/compat-data" "^7.13.8"
+    "@babel/helper-compilation-targets" "^7.13.8"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-transform-parameters" "^7.13.0"
+
+"@babel/plugin-proposal-object-rest-spread@^7.13.8":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.16.0.tgz#5fb32f6d924d6e6712810362a60e12a2609872e6"
+  integrity sha512-LU/+jp89efe5HuWJLmMmFG0+xbz+I2rSI7iLc1AlaeSMDMOGzWlc5yJrMN1d04osXN4sSfpo4O+azkBNBes0jg==
+  dependencies:
+    "@babel/compat-data" "^7.16.0"
+    "@babel/helper-compilation-targets" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-transform-parameters" "^7.16.0"
+
+"@babel/plugin-proposal-object-rest-spread@^7.16.7":
+  version "7.17.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.17.3.tgz#d9eb649a54628a51701aef7e0ea3d17e2b9dd390"
+  integrity sha512-yuL5iQA/TbZn+RGAfxQXfi7CNLmKi1f8zInn4IgobuCWcAb7i+zj4TYzQ9l8cEzVyJ89PDGuqxK1xZpUDISesw==
+  dependencies:
+    "@babel/compat-data" "^7.17.0"
+    "@babel/helper-compilation-targets" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-transform-parameters" "^7.16.7"
+
+"@babel/plugin-proposal-object-rest-spread@^7.18.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.0.tgz#79f2390c892ba2a68ec112eb0d895cfbd11155e8"
+  integrity sha512-nbTv371eTrFabDfHLElkn9oyf9VG+VKK6WMzhY2o4eHKaG19BToD9947zzGMO6I/Irstx9d8CwX6njPNIAR/yw==
+  dependencies:
+    "@babel/compat-data" "^7.17.10"
+    "@babel/helper-compilation-targets" "^7.17.10"
+    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-transform-parameters" "^7.17.12"
+
+"@babel/plugin-proposal-optional-catch-binding@^7.13.8":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.0.tgz#5910085811ab4c28b00d6ebffa4ab0274d1e5f16"
+  integrity sha512-kicDo0A/5J0nrsCPbn89mTG3Bm4XgYi0CZtvex9Oyw7gGZE3HXGD0zpQNH+mo+tEfbo8wbmMvJftOwpmPy7aVw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
+
+"@babel/plugin-proposal-optional-catch-binding@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz#c623a430674ffc4ab732fd0a0ae7722b67cb74cf"
+  integrity sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
+
+"@babel/plugin-proposal-optional-chaining@^7.13.12", "@babel/plugin-proposal-optional-chaining@^7.16.0", "@babel/plugin-proposal-optional-chaining@^7.6.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.0.tgz#56dbc3970825683608e9efb55ea82c2a2d6c8dc0"
+  integrity sha512-Y4rFpkZODfHrVo70Uaj6cC1JJOt3Pp0MdWSwIKtb8z1/lsjl9AmnB7ErRFV+QNGIfcY1Eruc2UMx5KaRnXjMyg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+
+"@babel/plugin-proposal-optional-chaining@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz#7cd629564724816c0e8a969535551f943c64c39a"
+  integrity sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+
+"@babel/plugin-proposal-optional-chaining@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.17.12.tgz#f96949e9bacace3a9066323a5cf90cfb9de67174"
+  integrity sha512-7wigcOs/Z4YWlK7xxjkvaIw84vGhDv/P1dFGQap0nHkc8gFKY/r+hXc8Qzf5k1gY7CvGIcHqAnOagVKJJ1wVOQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+
+"@babel/plugin-proposal-private-methods@^7.13.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.0.tgz#b4dafb9c717e4301c5776b30d080d6383c89aff6"
+  integrity sha512-IvHmcTHDFztQGnn6aWq4t12QaBXTKr1whF/dgp9kz84X6GUcwq9utj7z2wFCUfeOup/QKnOlt2k0zxkGFx9ubg==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-proposal-private-methods@^7.16.11", "@babel/plugin-proposal-private-methods@^7.16.5":
+  version "7.16.11"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz#e8df108288555ff259f4527dbe84813aac3a1c50"
+  integrity sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.16.10"
+    "@babel/helper-plugin-utils" "^7.16.7"
+
+"@babel/plugin-proposal-private-methods@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.17.12.tgz#c2ca3a80beb7539289938da005ad525a038a819c"
+  integrity sha512-SllXoxo19HmxhDWm3luPz+cPhtoTSKLJE9PXshsfrOzBqs60QP0r8OaJItrPhAj0d7mZMnNF0Y1UUggCDgMz1A==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.17.12"
+
+"@babel/plugin-proposal-private-property-in-object@^7.14.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.0.tgz#69e935b2c5c79d2488112d886f0c4e2790fee76f"
+  integrity sha512-3jQUr/HBbMVZmi72LpjQwlZ55i1queL8KcDTQEkAHihttJnAPrcvG9ZNXIfsd2ugpizZo595egYV6xy+pv4Ofw==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.16.0"
+    "@babel/helper-create-class-features-plugin" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
+
+"@babel/plugin-proposal-private-property-in-object@^7.16.5", "@babel/plugin-proposal-private-property-in-object@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz#b0b8cef543c2c3d57e59e2c611994861d46a3fce"
+  integrity sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.16.7"
+    "@babel/helper-create-class-features-plugin" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
+
+"@babel/plugin-proposal-private-property-in-object@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.17.12.tgz#b02efb7f106d544667d91ae97405a9fd8c93952d"
+  integrity sha512-/6BtVi57CJfrtDNKfK5b66ydK2J5pXUKBKSPD2G1whamMuEnZWgoOIfO8Vf9F/DoD4izBLD/Au4NMQfruzzykg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.16.7"
+    "@babel/helper-create-class-features-plugin" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
+
+"@babel/plugin-proposal-unicode-property-regex@^7.12.13", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.0.tgz#890482dfc5ea378e42e19a71e709728cabf18612"
+  integrity sha512-ti7IdM54NXv29cA4+bNNKEMS4jLMCbJgl+Drv+FgYy0erJLAxNAIXcNjNjrRZEcWq0xJHsNVwQezskMFpF8N9g==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-proposal-unicode-property-regex@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz#635d18eb10c6214210ffc5ff4932552de08188a2"
+  integrity sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+
+"@babel/plugin-proposal-unicode-property-regex@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.17.12.tgz#3dbd7a67bd7f94c8238b394da112d86aaf32ad4d"
+  integrity sha512-Wb9qLjXf3ZazqXA7IvI7ozqRIXIGPtSo+L5coFmEkhTQK18ao4UDDD0zdTGAarmbLj2urpRwrc6893cu5Bfh0A==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.17.12"
+
+"@babel/plugin-syntax-async-generators@^7.8.4":
+  version "7.8.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
+  integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-class-properties@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10"
+  integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-syntax-class-static-block@^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-decorators@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.16.0.tgz#eb8d811cdd1060f6ac3c00956bf3f6335505a32f"
+  integrity sha512-nxnnngZClvlY13nHJAIDow0S7Qzhq64fQ/NlqS+VER3kjW/4F0jLhXjeL8jcwSwz6Ca3rotT5NJD2T9I7lcv7g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-syntax-decorators@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.17.12.tgz#02e8f678602f0af8222235271efea945cfdb018a"
+  integrity sha512-D1Hz0qtGTza8K2xGyEdVNCYLdVHukAcbQr4K3/s6r/esadyEriZovpJimQOpu8ju4/jV8dW/1xdaE0UpDroidw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.17.12"
+
+"@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"
+  integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-export-namespace-from@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a"
+  integrity sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-syntax-import-assertions@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.17.12.tgz#58096a92b11b2e4e54b24c6a0cc0e5e607abcedd"
+  integrity sha512-n/loy2zkq9ZEM8tEOwON9wTQSTNDTDEz6NujPtJGLU7qObzT1N4c4YZZf8E6ATB2AjNQg/Ib2AIpO03EZaCehw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.17.12"
+
+"@babel/plugin-syntax-json-strings@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
+  integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-logical-assignment-operators@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
+  integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
+  integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-numeric-separator@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"
+  integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/plugin-syntax-object-rest-spread@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
+  integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-optional-catch-binding@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
+  integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-optional-chaining@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
+  integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-private-property-in-object@^7.14.0", "@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.14.5"
+
+"@babel/plugin-syntax-top-level-await@^7.12.13", "@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.14.5"
+
+"@babel/plugin-syntax-typescript@^7.16.0", "@babel/plugin-syntax-typescript@^7.8.3":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.16.0.tgz#2feeb13d9334cc582ea9111d3506f773174179bb"
+  integrity sha512-Xv6mEXqVdaqCBfJFyeab0fH2DnUoMsDmhamxsSi4j8nLd4Vtw213WMJr55xxqipC/YVWyPY3K0blJncPYji+dQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-syntax-typescript@^7.2.0":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.13.tgz#9dff111ca64154cef0f4dc52cf843d9f12ce4474"
+  integrity sha512-cHP3u1JiUiG2LFDKbXnwVad81GvfyIOmCD6HIEId6ojrY0Drfy2q1jw7BwN7dE84+kTnBjLkXoL3IEy/3JPu2w==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-arrow-functions@^7.13.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.0.tgz#951706f8b449c834ed07bd474c0924c944b95a8e"
+  integrity sha512-vIFb5250Rbh7roWARvCLvIJ/PtAU5Lhv7BtZ1u24COwpI9Ypjsh+bZcKk6rlIyalK+r0jOc1XQ8I4ovNxNrWrA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-transform-arrow-functions@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz#44125e653d94b98db76369de9c396dc14bef4154"
+  integrity sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+
+"@babel/plugin-transform-arrow-functions@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.17.12.tgz#dddd783b473b1b1537ef46423e3944ff24898c45"
+  integrity sha512-PHln3CNi/49V+mza4xMwrg+WGYevSF1oaiXaC2EQfdp4HWlSjRsrDXWJiQBKpP7749u6vQ9mcry2uuFOv5CXvA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.17.12"
+
+"@babel/plugin-transform-async-to-generator@^7.13.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.0.tgz#df12637f9630ddfa0ef9d7a11bc414d629d38604"
+  integrity sha512-PbIr7G9kR8tdH6g8Wouir5uVjklETk91GMVSUq+VaOgiinbCkBP6Q7NN/suM/QutZkMJMvcyAriogcYAdhg8Gw==
+  dependencies:
+    "@babel/helper-module-imports" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-remap-async-to-generator" "^7.16.0"
+
+"@babel/plugin-transform-async-to-generator@^7.16.8":
+  version "7.16.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz#b83dff4b970cf41f1b819f8b49cc0cfbaa53a808"
+  integrity sha512-MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg==
+  dependencies:
+    "@babel/helper-module-imports" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-remap-async-to-generator" "^7.16.8"
+
+"@babel/plugin-transform-async-to-generator@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.17.12.tgz#dbe5511e6b01eee1496c944e35cdfe3f58050832"
+  integrity sha512-J8dbrWIOO3orDzir57NRsjg4uxucvhby0L/KZuGsWDj0g7twWK3g7JhJhOrXtuXiw8MeiSdJ3E0OW9H8LYEzLQ==
+  dependencies:
+    "@babel/helper-module-imports" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-remap-async-to-generator" "^7.16.8"
+
+"@babel/plugin-transform-block-scoped-functions@^7.12.13":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.0.tgz#c618763233ad02847805abcac4c345ce9de7145d"
+  integrity sha512-V14As3haUOP4ZWrLJ3VVx5rCnrYhMSHN/jX7z6FAt5hjRkLsb0snPCmJwSOML5oxkKO4FNoNv7V5hw/y2bjuvg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-transform-block-scoped-functions@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz#4d0d57d9632ef6062cdf354bb717102ee042a620"
+  integrity sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+
+"@babel/plugin-transform-block-scoping@^7.12.1", "@babel/plugin-transform-block-scoping@^7.8.3":
+  version "7.13.16"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.13.16.tgz#a9c0f10794855c63b1d629914c7dcfeddd185892"
+  integrity sha512-ad3PHUxGnfWF4Efd3qFuznEtZKoBp0spS+DgqzVzRPV7urEBvPLue3y2j80w4Jf2YLzZHj8TOv/Lmvdmh3b2xg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+
+"@babel/plugin-transform-block-scoping@^7.13.16":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.0.tgz#bcf433fb482fe8c3d3b4e8a66b1c4a8e77d37c16"
+  integrity sha512-27n3l67/R3UrXfizlvHGuTwsRIFyce3D/6a37GRxn28iyTPvNXaW4XvznexRh1zUNLPjbLL22Id0XQElV94ruw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-transform-block-scoping@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz#f50664ab99ddeaee5bc681b8f3a6ea9d72ab4f87"
+  integrity sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+
+"@babel/plugin-transform-block-scoping@^7.17.12":
+  version "7.18.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.4.tgz#7988627b3e9186a13e4d7735dc9c34a056613fb9"
+  integrity sha512-+Hq10ye+jlvLEogSOtq4mKvtk7qwcUQ1f0Mrueai866C82f844Yom2cttfJdMdqRLTxWpsbfbkIkOIfovyUQXw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.17.12"
+
+"@babel/plugin-transform-classes@^7.13.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.0.tgz#54cf5ff0b2242c6573d753cd4bfc7077a8b282f5"
+  integrity sha512-HUxMvy6GtAdd+GKBNYDWCIA776byUQH8zjnfjxwT1P1ARv/wFu8eBDpmXQcLS/IwRtrxIReGiplOwMeyO7nsDQ==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.16.0"
+    "@babel/helper-function-name" "^7.16.0"
+    "@babel/helper-optimise-call-expression" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-replace-supers" "^7.16.0"
+    "@babel/helper-split-export-declaration" "^7.16.0"
+    globals "^11.1.0"
+
+"@babel/plugin-transform-classes@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz#8f4b9562850cd973de3b498f1218796eb181ce00"
+  integrity sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.16.7"
+    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/helper-function-name" "^7.16.7"
+    "@babel/helper-optimise-call-expression" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-replace-supers" "^7.16.7"
+    "@babel/helper-split-export-declaration" "^7.16.7"
+    globals "^11.1.0"
+
+"@babel/plugin-transform-classes@^7.17.12":
+  version "7.18.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.4.tgz#51310b812a090b846c784e47087fa6457baef814"
+  integrity sha512-e42NSG2mlKWgxKUAD9EJJSkZxR67+wZqzNxLSpc51T8tRU5SLFHsPmgYR5yr7sdgX4u+iHA1C5VafJ6AyImV3A==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.16.7"
+    "@babel/helper-environment-visitor" "^7.18.2"
+    "@babel/helper-function-name" "^7.17.9"
+    "@babel/helper-optimise-call-expression" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-replace-supers" "^7.18.2"
+    "@babel/helper-split-export-declaration" "^7.16.7"
+    globals "^11.1.0"
+
+"@babel/plugin-transform-computed-properties@^7.13.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.0.tgz#e0c385507d21e1b0b076d66bed6d5231b85110b7"
+  integrity sha512-63l1dRXday6S8V3WFY5mXJwcRAnPYxvFfTlt67bwV1rTyVTM5zrp0DBBb13Kl7+ehkCVwIZPumPpFP/4u70+Tw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-transform-computed-properties@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz#66dee12e46f61d2aae7a73710f591eb3df616470"
+  integrity sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+
+"@babel/plugin-transform-computed-properties@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.17.12.tgz#bca616a83679698f3258e892ed422546e531387f"
+  integrity sha512-a7XINeplB5cQUWMg1E/GI1tFz3LfK021IjV1rj1ypE+R7jHm+pIHmHl25VNkZxtx9uuYp7ThGk8fur1HHG7PgQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.17.12"
+
+"@babel/plugin-transform-destructuring@^7.13.17":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.16.0.tgz#ad3d7e74584ad5ea4eadb1e6642146c590dee33c"
+  integrity sha512-Q7tBUwjxLTsHEoqktemHBMtb3NYwyJPTJdM+wDwb0g8PZ3kQUIzNvwD5lPaqW/p54TXBc/MXZu9Jr7tbUEUM8Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-transform-destructuring@^7.16.7":
+  version "7.17.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.7.tgz#49dc2675a7afa9a5e4c6bdee636061136c3408d1"
+  integrity sha512-XVh0r5yq9sLR4vZ6eVZe8FKfIcSgaTBxVBRSYokRj2qksf6QerYnTxz9/GTuKTH/n/HwLP7t6gtlybHetJ/6hQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+
+"@babel/plugin-transform-destructuring@^7.18.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.0.tgz#dc4f92587e291b4daa78aa20cc2d7a63aa11e858"
+  integrity sha512-Mo69klS79z6KEfrLg/1WkmVnB8javh75HX4pi2btjvlIoasuxilEyjtsQW6XPrubNd7AQy0MMaNIaQE4e7+PQw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.17.12"
+
+"@babel/plugin-transform-dotall-regex@^7.12.13", "@babel/plugin-transform-dotall-regex@^7.4.4":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.0.tgz#50bab00c1084b6162d0a58a818031cf57798e06f"
+  integrity sha512-FXlDZfQeLILfJlC6I1qyEwcHK5UpRCFkaoVyA1nk9A1L1Yu583YO4un2KsLBsu3IJb4CUbctZks8tD9xPQubLw==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-transform-dotall-regex@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz#6b2d67686fab15fb6a7fd4bd895d5982cfc81241"
+  integrity sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+
+"@babel/plugin-transform-duplicate-keys@^7.12.13":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.0.tgz#8bc2e21813e3e89e5e5bf3b60aa5fc458575a176"
+  integrity sha512-LIe2kcHKAZOJDNxujvmp6z3mfN6V9lJxubU4fJIGoQCkKe3Ec2OcbdlYP+vW++4MpxwG0d1wSDOJtQW5kLnkZQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-transform-duplicate-keys@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz#2207e9ca8f82a0d36a5a67b6536e7ef8b08823c9"
+  integrity sha512-03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+
+"@babel/plugin-transform-duplicate-keys@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.17.12.tgz#a09aa709a3310013f8e48e0e23bc7ace0f21477c"
+  integrity sha512-EA5eYFUG6xeerdabina/xIoB95jJ17mAkR8ivx6ZSu9frKShBjpOGZPn511MTDTkiCO+zXnzNczvUM69YSf3Zw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.17.12"
+
+"@babel/plugin-transform-exponentiation-operator@^7.12.13":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.0.tgz#a180cd2881e3533cef9d3901e48dad0fbeff4be4"
+  integrity sha512-OwYEvzFI38hXklsrbNivzpO3fh87skzx8Pnqi4LoSYeav0xHlueSoCJrSgTPfnbyzopo5b3YVAJkFIcUpK2wsw==
+  dependencies:
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-transform-exponentiation-operator@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz#efa9862ef97e9e9e5f653f6ddc7b665e8536fe9b"
+  integrity sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==
+  dependencies:
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+
+"@babel/plugin-transform-for-of@^7.13.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.0.tgz#f7abaced155260e2461359bbc7c7248aca5e6bd2"
+  integrity sha512-5QKUw2kO+GVmKr2wMYSATCTTnHyscl6sxFRAY+rvN7h7WB0lcG0o4NoV6ZQU32OZGVsYUsfLGgPQpDFdkfjlJQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-transform-for-of@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz#649d639d4617dff502a9a158c479b3b556728d8c"
+  integrity sha512-/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+
+"@babel/plugin-transform-for-of@^7.18.1":
+  version "7.18.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.1.tgz#ed14b657e162b72afbbb2b4cdad277bf2bb32036"
+  integrity sha512-+TTB5XwvJ5hZbO8xvl2H4XaMDOAK57zF4miuC9qQJgysPNEAZZ9Z69rdF5LJkozGdZrjBIUAIyKUWRMmebI7vg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.17.12"
+
+"@babel/plugin-transform-function-name@^7.12.13":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.0.tgz#02e3699c284c6262236599f751065c5d5f1f400e"
+  integrity sha512-lBzMle9jcOXtSOXUpc7tvvTpENu/NuekNJVova5lCCWCV9/U1ho2HH2y0p6mBg8fPm/syEAbfaaemYGOHCY3mg==
+  dependencies:
+    "@babel/helper-function-name" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-transform-function-name@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz#5ab34375c64d61d083d7d2f05c38d90b97ec65cf"
+  integrity sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==
+  dependencies:
+    "@babel/helper-compilation-targets" "^7.16.7"
+    "@babel/helper-function-name" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+
+"@babel/plugin-transform-literals@^7.12.13":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.0.tgz#79711e670ffceb31bd298229d50f3621f7980cac"
+  integrity sha512-gQDlsSF1iv9RU04clgXqRjrPyyoJMTclFt3K1cjLmTKikc0s/6vE3hlDeEVC71wLTRu72Fq7650kABrdTc2wMQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-transform-literals@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz#254c9618c5ff749e87cb0c0cef1a0a050c0bdab1"
+  integrity sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+
+"@babel/plugin-transform-literals@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.17.12.tgz#97131fbc6bbb261487105b4b3edbf9ebf9c830ae"
+  integrity sha512-8iRkvaTjJciWycPIZ9k9duu663FT7VrBdNqNgxnVXEFwOIp55JWcZd23VBRySYbnS3PwQ3rGiabJBBBGj5APmQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.17.12"
+
+"@babel/plugin-transform-member-expression-literals@^7.12.13":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.0.tgz#5251b4cce01eaf8314403d21aedb269d79f5e64b"
+  integrity sha512-WRpw5HL4Jhnxw8QARzRvwojp9MIE7Tdk3ez6vRyUk1MwgjJN0aNpRoXainLR5SgxmoXx/vsXGZ6OthP6t/RbUg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-transform-member-expression-literals@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz#6e5dcf906ef8a098e630149d14c867dd28f92384"
+  integrity sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+
+"@babel/plugin-transform-modules-amd@^7.12.1", "@babel/plugin-transform-modules-amd@^7.13.0", "@babel/plugin-transform-modules-amd@^7.14.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.0.tgz#09abd41e18dcf4fd479c598c1cef7bd39eb1337e"
+  integrity sha512-rWFhWbCJ9Wdmzln1NmSCqn7P0RAD+ogXG/bd9Kg5c7PKWkJtkiXmYsMBeXjDlzHpVTJ4I/hnjs45zX4dEv81xw==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    babel-plugin-dynamic-import-node "^2.3.3"
+
+"@babel/plugin-transform-modules-amd@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz#b28d323016a7daaae8609781d1f8c9da42b13186"
+  integrity sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    babel-plugin-dynamic-import-node "^2.3.3"
+
+"@babel/plugin-transform-modules-amd@^7.18.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.0.tgz#7ef1002e67e36da3155edc8bf1ac9398064c02ed"
+  integrity sha512-h8FjOlYmdZwl7Xm2Ug4iX2j7Qy63NANI+NQVWQzv6r25fqgg7k2dZl03p95kvqNclglHs4FZ+isv4p1uXMA+QA==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.18.0"
+    "@babel/helper-plugin-utils" "^7.17.12"
+    babel-plugin-dynamic-import-node "^2.3.3"
+
+"@babel/plugin-transform-modules-commonjs@^7.14.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.0.tgz#add58e638c8ddc4875bd9a9ecb5c594613f6c922"
+  integrity sha512-Dzi+NWqyEotgzk/sb7kgQPJQf7AJkQBWsVp1N6JWc1lBVo0vkElUnGdr1PzUBmfsCCN5OOFya3RtpeHk15oLKQ==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-simple-access" "^7.16.0"
+    babel-plugin-dynamic-import-node "^2.3.3"
+
+"@babel/plugin-transform-modules-commonjs@^7.16.8":
+  version "7.17.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.7.tgz#d86b217c8e45bb5f2dbc11eefc8eab62cf980d19"
+  integrity sha512-ITPmR2V7MqioMJyrxUo2onHNC3e+MvfFiFIR0RP21d3PtlVb6sfzoxNKiphSZUOM9hEIdzCcZe83ieX3yoqjUA==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.17.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-simple-access" "^7.17.7"
+    babel-plugin-dynamic-import-node "^2.3.3"
+
+"@babel/plugin-transform-modules-commonjs@^7.18.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.2.tgz#1aa8efa2e2a6e818b6a7f2235fceaf09bdb31e9e"
+  integrity sha512-f5A865gFPAJAEE0K7F/+nm5CmAE3y8AWlMBG9unu5j9+tk50UQVK0QS8RNxSp7MJf0wh97uYyLWt3Zvu71zyOQ==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.18.0"
+    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-simple-access" "^7.18.2"
+    babel-plugin-dynamic-import-node "^2.3.3"
+
+"@babel/plugin-transform-modules-systemjs@^7.13.8":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.0.tgz#a92cf240afeb605f4ca16670453024425e421ea4"
+  integrity sha512-yuGBaHS3lF1m/5R+6fjIke64ii5luRUg97N2wr+z1sF0V+sNSXPxXDdEEL/iYLszsN5VKxVB1IPfEqhzVpiqvg==
+  dependencies:
+    "@babel/helper-hoist-variables" "^7.16.0"
+    "@babel/helper-module-transforms" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-validator-identifier" "^7.15.7"
+    babel-plugin-dynamic-import-node "^2.3.3"
+
+"@babel/plugin-transform-modules-systemjs@^7.16.7":
+  version "7.17.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.17.8.tgz#81fd834024fae14ea78fbe34168b042f38703859"
+  integrity sha512-39reIkMTUVagzgA5x88zDYXPCMT6lcaRKs1+S9K6NKBPErbgO/w/kP8GlNQTC87b412ZTlmNgr3k2JrWgHH+Bw==
+  dependencies:
+    "@babel/helper-hoist-variables" "^7.16.7"
+    "@babel/helper-module-transforms" "^7.17.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-validator-identifier" "^7.16.7"
+    babel-plugin-dynamic-import-node "^2.3.3"
+
+"@babel/plugin-transform-modules-systemjs@^7.18.0":
+  version "7.18.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.4.tgz#3d6fd9868c735cce8f38d6ae3a407fb7e61e6d46"
+  integrity sha512-lH2UaQaHVOAeYrUUuZ8i38o76J/FnO8vu21OE+tD1MyP9lxdZoSfz+pDbWkq46GogUrdrMz3tiz/FYGB+bVThg==
+  dependencies:
+    "@babel/helper-hoist-variables" "^7.16.7"
+    "@babel/helper-module-transforms" "^7.18.0"
+    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-validator-identifier" "^7.16.7"
+    babel-plugin-dynamic-import-node "^2.3.3"
+
+"@babel/plugin-transform-modules-umd@^7.14.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.0.tgz#195f26c2ad6d6a391b70880effce18ce625e06a7"
+  integrity sha512-nx4f6no57himWiHhxDM5pjwhae5vLpTK2zCnDH8+wNLJy0TVER/LJRHl2bkt6w9Aad2sPD5iNNoUpY3X9sTGDg==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-transform-modules-umd@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz#23dad479fa585283dbd22215bff12719171e7618"
+  integrity sha512-EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+
+"@babel/plugin-transform-modules-umd@^7.18.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.0.tgz#56aac64a2c2a1922341129a4597d1fd5c3ff020f"
+  integrity sha512-d/zZ8I3BWli1tmROLxXLc9A6YXvGK8egMxHp+E/rRwMh1Kip0AP77VwZae3snEJ33iiWwvNv2+UIIhfalqhzZA==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.18.0"
+    "@babel/helper-plugin-utils" "^7.17.12"
+
+"@babel/plugin-transform-named-capturing-groups-regex@^7.12.13":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.0.tgz#d3db61cc5d5b97986559967cd5ea83e5c32096ca"
+  integrity sha512-LogN88uO+7EhxWc8WZuQ8vxdSyVGxhkh8WTC3tzlT8LccMuQdA81e9SGV6zY7kY2LjDhhDOFdQVxdGwPyBCnvg==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.16.0"
+
+"@babel/plugin-transform-named-capturing-groups-regex@^7.16.8":
+  version "7.16.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.8.tgz#7f860e0e40d844a02c9dcf9d84965e7dfd666252"
+  integrity sha512-j3Jw+n5PvpmhRR+mrgIh04puSANCk/T/UA3m3P1MjJkhlK906+ApHhDIqBQDdOgL/r1UYpz4GNclTXxyZrYGSw==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
+
+"@babel/plugin-transform-named-capturing-groups-regex@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.17.12.tgz#9c4a5a5966e0434d515f2675c227fd8cc8606931"
+  integrity sha512-vWoWFM5CKaTeHrdUJ/3SIOTRV+MBVGybOC9mhJkaprGNt5demMymDW24yC74avb915/mIRe3TgNb/d8idvnCRA==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.17.12"
+
+"@babel/plugin-transform-new-target@^7.12.13":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.0.tgz#af823ab576f752215a49937779a41ca65825ab35"
+  integrity sha512-fhjrDEYv2DBsGN/P6rlqakwRwIp7rBGLPbrKxwh7oVt5NNkIhZVOY2GRV+ULLsQri1bDqwDWnU3vhlmx5B2aCw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-transform-new-target@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz#9967d89a5c243818e0800fdad89db22c5f514244"
+  integrity sha512-xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+
+"@babel/plugin-transform-new-target@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.17.12.tgz#10842cd605a620944e81ea6060e9e65c265742e3"
+  integrity sha512-CaOtzk2fDYisbjAD4Sd1MTKGVIpRtx9bWLyj24Y/k6p4s4gQ3CqDGJauFJxt8M/LEx003d0i3klVqnN73qvK3w==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.17.12"
+
+"@babel/plugin-transform-object-assign@^7.8.3":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.12.13.tgz#d9b9200a69e03403a813e44a933ad9f4bddfd050"
+  integrity sha512-4QxDMc0lAOkIBSfCrnSGbAJ+4epDBF2XXwcLXuBcG1xl9u7LrktNVD4+LwhL47XuKVPQ7R25e/WdcV+h97HyZA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-object-super@^7.12.13":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.0.tgz#fb20d5806dc6491a06296ac14ea8e8d6fedda72b"
+  integrity sha512-fds+puedQHn4cPLshoHcR1DTMN0q1V9ou0mUjm8whx9pGcNvDrVVrgw+KJzzCaiTdaYhldtrUps8DWVMgrSEyg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-replace-supers" "^7.16.0"
+
+"@babel/plugin-transform-object-super@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz#ac359cf8d32cf4354d27a46867999490b6c32a94"
+  integrity sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-replace-supers" "^7.16.7"
+
+"@babel/plugin-transform-parameters@^7.13.0", "@babel/plugin-transform-parameters@^7.16.0":
+  version "7.16.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.3.tgz#fa9e4c874ee5223f891ee6fa8d737f4766d31d15"
+  integrity sha512-3MaDpJrOXT1MZ/WCmkOFo7EtmVVC8H4EUZVrHvFOsmwkk4lOjQj8rzv8JKUZV4YoQKeoIgk07GO+acPU9IMu/w==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-transform-parameters@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz#a1721f55b99b736511cb7e0152f61f17688f331f"
+  integrity sha512-AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+
+"@babel/plugin-transform-parameters@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.17.12.tgz#eb467cd9586ff5ff115a9880d6fdbd4a846b7766"
+  integrity sha512-6qW4rWo1cyCdq1FkYri7AHpauchbGLXpdwnYsfxFb+KtddHENfsY5JZb35xUwkK5opOLcJ3BNd2l7PhRYGlwIA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.17.12"
+
+"@babel/plugin-transform-property-literals@^7.12.13":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.0.tgz#a95c552189a96a00059f6776dc4e00e3690c78d1"
+  integrity sha512-XLldD4V8+pOqX2hwfWhgwXzGdnDOThxaNTgqagOcpBgIxbUvpgU2FMvo5E1RyHbk756WYgdbS0T8y0Cj9FKkWQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-transform-property-literals@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz#2dadac85155436f22c696c4827730e0fe1057a55"
+  integrity sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+
+"@babel/plugin-transform-regenerator@^7.13.15":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.0.tgz#eaee422c84b0232d03aea7db99c97deeaf6125a4"
+  integrity sha512-JAvGxgKuwS2PihiSFaDrp94XOzzTUeDeOQlcKzVAyaPap7BnZXK/lvMDiubkPTdotPKOIZq9xWXWnggUMYiExg==
+  dependencies:
+    regenerator-transform "^0.14.2"
+
+"@babel/plugin-transform-regenerator@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.7.tgz#9e7576dc476cb89ccc5096fff7af659243b4adeb"
+  integrity sha512-mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q==
+  dependencies:
+    regenerator-transform "^0.14.2"
+
+"@babel/plugin-transform-regenerator@^7.18.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.0.tgz#44274d655eb3f1af3f3a574ba819d3f48caf99d5"
+  integrity sha512-C8YdRw9uzx25HSIzwA7EM7YP0FhCe5wNvJbZzjVNHHPGVcDJ3Aie+qGYYdS1oVQgn+B3eAIJbWFLrJ4Jipv7nw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.17.12"
+    regenerator-transform "^0.15.0"
+
+"@babel/plugin-transform-reserved-words@^7.12.13":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.0.tgz#fff4b9dcb19e12619394bda172d14f2d04c0379c"
+  integrity sha512-Dgs8NNCehHSvXdhEhln8u/TtJxfVwGYCgP2OOr5Z3Ar+B+zXicEOKNTyc+eca2cuEOMtjW6m9P9ijOt8QdqWkg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-transform-reserved-words@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz#1d798e078f7c5958eec952059c460b220a63f586"
+  integrity sha512-KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+
+"@babel/plugin-transform-reserved-words@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.17.12.tgz#7dbd349f3cdffba751e817cf40ca1386732f652f"
+  integrity sha512-1KYqwbJV3Co03NIi14uEHW8P50Md6KqFgt0FfpHdK6oyAHQVTosgPuPSiWud1HX0oYJ1hGRRlk0fP87jFpqXZA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.17.12"
+
+"@babel/plugin-transform-runtime@^7.12.1":
+  version "7.13.15"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.13.15.tgz#2eddf585dd066b84102517e10a577f24f76a9cd7"
+  integrity sha512-d+ezl76gx6Jal08XngJUkXM4lFXK/5Ikl9Mh4HKDxSfGJXmZ9xG64XT2oivBzfxb/eQ62VfvoMkaCZUKJMVrBA==
+  dependencies:
+    "@babel/helper-module-imports" "^7.13.12"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    babel-plugin-polyfill-corejs2 "^0.2.0"
+    babel-plugin-polyfill-corejs3 "^0.2.0"
+    babel-plugin-polyfill-regenerator "^0.2.0"
+    semver "^6.3.0"
+
+"@babel/plugin-transform-runtime@^7.13.9":
+  version "7.16.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.16.4.tgz#f9ba3c7034d429c581e1bd41b4952f3db3c2c7e8"
+  integrity sha512-pru6+yHANMTukMtEZGC4fs7XPwg35v8sj5CIEmE+gEkFljFiVJxEWxx/7ZDkTK+iZRYo1bFXBtfIN95+K3cJ5A==
+  dependencies:
+    "@babel/helper-module-imports" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    babel-plugin-polyfill-corejs2 "^0.3.0"
+    babel-plugin-polyfill-corejs3 "^0.4.0"
+    babel-plugin-polyfill-regenerator "^0.3.0"
+    semver "^6.3.0"
+
+"@babel/plugin-transform-shorthand-properties@^7.12.13":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.0.tgz#090372e3141f7cc324ed70b3daf5379df2fa384d"
+  integrity sha512-iVb1mTcD8fuhSv3k99+5tlXu5N0v8/DPm2mO3WACLG6al1CGZH7v09HJyUb1TtYl/Z+KrM6pHSIJdZxP5A+xow==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-transform-shorthand-properties@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz#e8549ae4afcf8382f711794c0c7b6b934c5fbd2a"
+  integrity sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+
+"@babel/plugin-transform-spread@^7.13.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.0.tgz#d21ca099bbd53ab307a8621e019a7bd0f40cdcfb"
+  integrity sha512-Ao4MSYRaLAQczZVp9/7E7QHsCuK92yHRrmVNRe/SlEJjhzivq0BSn8mEraimL8wizHZ3fuaHxKH0iwzI13GyGg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
+
+"@babel/plugin-transform-spread@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz#a303e2122f9f12e0105daeedd0f30fb197d8ff44"
+  integrity sha512-+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
+
+"@babel/plugin-transform-spread@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.17.12.tgz#c112cad3064299f03ea32afed1d659223935d1f5"
+  integrity sha512-9pgmuQAtFi3lpNUstvG9nGfk9DkrdmWNp9KeKPFmuZCpEnxRzYlS8JgwPjYj+1AWDOSvoGN0H30p1cBOmT/Svg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
+
+"@babel/plugin-transform-sticky-regex@^7.12.13":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.0.tgz#c35ea31a02d86be485f6aa510184b677a91738fd"
+  integrity sha512-/ntT2NljR9foobKk4E/YyOSwcGUXtYWv5tinMK/3RkypyNBNdhHUaq6Orw5DWq9ZcNlS03BIlEALFeQgeVAo4Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-transform-sticky-regex@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz#c84741d4f4a38072b9a1e2e3fd56d359552e8660"
+  integrity sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+
+"@babel/plugin-transform-template-literals@^7.13.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.0.tgz#a8eced3a8e7b8e2d40ec4ec4548a45912630d302"
+  integrity sha512-Rd4Ic89hA/f7xUSJQk5PnC+4so50vBoBfxjdQAdvngwidM8jYIBVxBZ/sARxD4e0yMXRbJVDrYf7dyRtIIKT6Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-transform-template-literals@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz#f3d1c45d28967c8e80f53666fc9c3e50618217ab"
+  integrity sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+
+"@babel/plugin-transform-template-literals@^7.18.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.2.tgz#31ed6915721864847c48b656281d0098ea1add28"
+  integrity sha512-/cmuBVw9sZBGZVOMkpAEaVLwm4JmK2GZ1dFKOGGpMzEHWFmyZZ59lUU0PdRr8YNYeQdNzTDwuxP2X2gzydTc9g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.17.12"
+
+"@babel/plugin-transform-typeof-symbol@^7.12.13":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.0.tgz#8b19a244c6f8c9d668dca6a6f754ad6ead1128f2"
+  integrity sha512-++V2L8Bdf4vcaHi2raILnptTBjGEFxn5315YU+e8+EqXIucA+q349qWngCLpUYqqv233suJ6NOienIVUpS9cqg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-transform-typeof-symbol@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz#9cdbe622582c21368bd482b660ba87d5545d4f7e"
+  integrity sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+
+"@babel/plugin-transform-typeof-symbol@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.17.12.tgz#0f12f57ac35e98b35b4ed34829948d42bd0e6889"
+  integrity sha512-Q8y+Jp7ZdtSPXCThB6zjQ74N3lj0f6TDh1Hnf5B+sYlzQ8i5Pjp8gW0My79iekSpT4WnI06blqP6DT0OmaXXmw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.17.12"
+
+"@babel/plugin-transform-typescript@^7.13.0":
+  version "7.16.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.16.1.tgz#cc0670b2822b0338355bc1b3d2246a42b8166409"
+  integrity sha512-NO4XoryBng06jjw/qWEU2LhcLJr1tWkhpMam/H4eas/CDKMX/b2/Ylb6EI256Y7+FVPCawwSM1rrJNOpDiz+Lg==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-typescript" "^7.16.0"
+
+"@babel/plugin-transform-typescript@~7.4.0":
+  version "7.4.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.4.5.tgz#ab3351ba35307b79981993536c93ff8be050ba28"
+  integrity sha512-RPB/YeGr4ZrFKNwfuQRlMf2lxoCUaU01MTw39/OFE/RiL8HDjtn68BwEPft1P7JN4akyEmjGWAMNldOV7o9V2g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-typescript" "^7.2.0"
+
+"@babel/plugin-transform-typescript@~7.5.0":
+  version "7.5.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.5.5.tgz#6d862766f09b2da1cb1f7d505fe2aedab6b7d4b8"
+  integrity sha512-pehKf4m640myZu5B2ZviLaiBlxMCjSZ1qTEO459AXKX5GnPueyulJeCqZFs1nz/Ya2dDzXQ1NxZ/kKNWyD4h6w==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.5.5"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-typescript" "^7.2.0"
+
+"@babel/plugin-transform-typescript@~7.8.0":
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.8.7.tgz#48bccff331108a7b3a28c3a4adc89e036dc3efda"
+  integrity sha512-7O0UsPQVNKqpHeHLpfvOG4uXmlw+MOxYvUv6Otc9uH5SYMIxvF6eBdjkWvC3f9G+VXe0RsNExyAQBeTRug/wqQ==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-typescript" "^7.8.3"
+
+"@babel/plugin-transform-unicode-escapes@^7.12.13":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.0.tgz#1a354064b4c45663a32334f46fa0cf6100b5b1f3"
+  integrity sha512-VFi4dhgJM7Bpk8lRc5CMaRGlKZ29W9C3geZjt9beuzSUrlJxsNwX7ReLwaL6WEvsOf2EQkyIJEPtF8EXjB/g2A==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-transform-unicode-escapes@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz#da8717de7b3287a2c6d659750c964f302b31ece3"
+  integrity sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+
+"@babel/plugin-transform-unicode-regex@^7.12.13":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.0.tgz#293b80950177c8c85aede87cef280259fb995402"
+  integrity sha512-jHLK4LxhHjvCeZDWyA9c+P9XH1sOxRd1RO9xMtDVRAOND/PczPqizEtVdx4TQF/wyPaewqpT+tgQFYMnN/P94A==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-transform-unicode-regex@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz#0f7aa4a501198976e25e82702574c34cfebe9ef2"
+  integrity sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+
+"@babel/polyfill@^7.11.5":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.12.1.tgz#1f2d6371d1261bbd961f3c5d5909150e12d0bd96"
+  integrity sha512-X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g==
+  dependencies:
+    core-js "^2.6.5"
+    regenerator-runtime "^0.13.4"
+
+"@babel/preset-env@^7.10.2":
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.14.0.tgz#236f88cd5da625e625dd40500d4824523f50e6c5"
+  integrity sha512-GWRCdBv2whxqqaSi7bo/BEXf070G/fWFMEdCnmoRg2CZJy4GK06ovFuEjJrZhDRXYgBsYtxVbG8GUHvw+UWBkQ==
+  dependencies:
+    "@babel/compat-data" "^7.14.0"
+    "@babel/helper-compilation-targets" "^7.13.16"
+    "@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.15"
+    "@babel/plugin-proposal-class-properties" "^7.13.0"
+    "@babel/plugin-proposal-class-static-block" "^7.13.11"
+    "@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-private-property-in-object" "^7.14.0"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.12.13"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
+    "@babel/plugin-syntax-class-properties" "^7.12.13"
+    "@babel/plugin-syntax-class-static-block" "^7.12.13"
+    "@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"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
+    "@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-private-property-in-object" "^7.14.0"
+    "@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.13.16"
+    "@babel/plugin-transform-classes" "^7.13.0"
+    "@babel/plugin-transform-computed-properties" "^7.13.0"
+    "@babel/plugin-transform-destructuring" "^7.13.17"
+    "@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.14.0"
+    "@babel/plugin-transform-modules-commonjs" "^7.14.0"
+    "@babel/plugin-transform-modules-systemjs" "^7.13.8"
+    "@babel/plugin-transform-modules-umd" "^7.14.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.13.15"
+    "@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/preset-modules" "^0.1.4"
+    "@babel/types" "^7.14.0"
+    babel-plugin-polyfill-corejs2 "^0.2.0"
+    babel-plugin-polyfill-corejs3 "^0.2.0"
+    babel-plugin-polyfill-regenerator "^0.2.0"
+    core-js-compat "^3.9.0"
+    semver "^6.3.0"
+
+"@babel/preset-env@^7.16.5":
+  version "7.16.11"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.16.11.tgz#5dd88fd885fae36f88fd7c8342475c9f0abe2982"
+  integrity sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g==
+  dependencies:
+    "@babel/compat-data" "^7.16.8"
+    "@babel/helper-compilation-targets" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-validator-option" "^7.16.7"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.16.7"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.16.7"
+    "@babel/plugin-proposal-async-generator-functions" "^7.16.8"
+    "@babel/plugin-proposal-class-properties" "^7.16.7"
+    "@babel/plugin-proposal-class-static-block" "^7.16.7"
+    "@babel/plugin-proposal-dynamic-import" "^7.16.7"
+    "@babel/plugin-proposal-export-namespace-from" "^7.16.7"
+    "@babel/plugin-proposal-json-strings" "^7.16.7"
+    "@babel/plugin-proposal-logical-assignment-operators" "^7.16.7"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.16.7"
+    "@babel/plugin-proposal-numeric-separator" "^7.16.7"
+    "@babel/plugin-proposal-object-rest-spread" "^7.16.7"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.16.7"
+    "@babel/plugin-proposal-optional-chaining" "^7.16.7"
+    "@babel/plugin-proposal-private-methods" "^7.16.11"
+    "@babel/plugin-proposal-private-property-in-object" "^7.16.7"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.16.7"
+    "@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"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
+    "@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-private-property-in-object" "^7.14.5"
+    "@babel/plugin-syntax-top-level-await" "^7.14.5"
+    "@babel/plugin-transform-arrow-functions" "^7.16.7"
+    "@babel/plugin-transform-async-to-generator" "^7.16.8"
+    "@babel/plugin-transform-block-scoped-functions" "^7.16.7"
+    "@babel/plugin-transform-block-scoping" "^7.16.7"
+    "@babel/plugin-transform-classes" "^7.16.7"
+    "@babel/plugin-transform-computed-properties" "^7.16.7"
+    "@babel/plugin-transform-destructuring" "^7.16.7"
+    "@babel/plugin-transform-dotall-regex" "^7.16.7"
+    "@babel/plugin-transform-duplicate-keys" "^7.16.7"
+    "@babel/plugin-transform-exponentiation-operator" "^7.16.7"
+    "@babel/plugin-transform-for-of" "^7.16.7"
+    "@babel/plugin-transform-function-name" "^7.16.7"
+    "@babel/plugin-transform-literals" "^7.16.7"
+    "@babel/plugin-transform-member-expression-literals" "^7.16.7"
+    "@babel/plugin-transform-modules-amd" "^7.16.7"
+    "@babel/plugin-transform-modules-commonjs" "^7.16.8"
+    "@babel/plugin-transform-modules-systemjs" "^7.16.7"
+    "@babel/plugin-transform-modules-umd" "^7.16.7"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.16.8"
+    "@babel/plugin-transform-new-target" "^7.16.7"
+    "@babel/plugin-transform-object-super" "^7.16.7"
+    "@babel/plugin-transform-parameters" "^7.16.7"
+    "@babel/plugin-transform-property-literals" "^7.16.7"
+    "@babel/plugin-transform-regenerator" "^7.16.7"
+    "@babel/plugin-transform-reserved-words" "^7.16.7"
+    "@babel/plugin-transform-shorthand-properties" "^7.16.7"
+    "@babel/plugin-transform-spread" "^7.16.7"
+    "@babel/plugin-transform-sticky-regex" "^7.16.7"
+    "@babel/plugin-transform-template-literals" "^7.16.7"
+    "@babel/plugin-transform-typeof-symbol" "^7.16.7"
+    "@babel/plugin-transform-unicode-escapes" "^7.16.7"
+    "@babel/plugin-transform-unicode-regex" "^7.16.7"
+    "@babel/preset-modules" "^0.1.5"
+    "@babel/types" "^7.16.8"
+    babel-plugin-polyfill-corejs2 "^0.3.0"
+    babel-plugin-polyfill-corejs3 "^0.5.0"
+    babel-plugin-polyfill-regenerator "^0.3.0"
+    core-js-compat "^3.20.2"
+    semver "^6.3.0"
+
+"@babel/preset-env@^7.16.7":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.18.2.tgz#f47d3000a098617926e674c945d95a28cb90977a"
+  integrity sha512-PfpdxotV6afmXMU47S08F9ZKIm2bJIQ0YbAAtDfIENX7G1NUAXigLREh69CWDjtgUy7dYn7bsMzkgdtAlmS68Q==
+  dependencies:
+    "@babel/compat-data" "^7.17.10"
+    "@babel/helper-compilation-targets" "^7.18.2"
+    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-validator-option" "^7.16.7"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.17.12"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.17.12"
+    "@babel/plugin-proposal-async-generator-functions" "^7.17.12"
+    "@babel/plugin-proposal-class-properties" "^7.17.12"
+    "@babel/plugin-proposal-class-static-block" "^7.18.0"
+    "@babel/plugin-proposal-dynamic-import" "^7.16.7"
+    "@babel/plugin-proposal-export-namespace-from" "^7.17.12"
+    "@babel/plugin-proposal-json-strings" "^7.17.12"
+    "@babel/plugin-proposal-logical-assignment-operators" "^7.17.12"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.17.12"
+    "@babel/plugin-proposal-numeric-separator" "^7.16.7"
+    "@babel/plugin-proposal-object-rest-spread" "^7.18.0"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.16.7"
+    "@babel/plugin-proposal-optional-chaining" "^7.17.12"
+    "@babel/plugin-proposal-private-methods" "^7.17.12"
+    "@babel/plugin-proposal-private-property-in-object" "^7.17.12"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.17.12"
+    "@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-import-assertions" "^7.17.12"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
+    "@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-private-property-in-object" "^7.14.5"
+    "@babel/plugin-syntax-top-level-await" "^7.14.5"
+    "@babel/plugin-transform-arrow-functions" "^7.17.12"
+    "@babel/plugin-transform-async-to-generator" "^7.17.12"
+    "@babel/plugin-transform-block-scoped-functions" "^7.16.7"
+    "@babel/plugin-transform-block-scoping" "^7.17.12"
+    "@babel/plugin-transform-classes" "^7.17.12"
+    "@babel/plugin-transform-computed-properties" "^7.17.12"
+    "@babel/plugin-transform-destructuring" "^7.18.0"
+    "@babel/plugin-transform-dotall-regex" "^7.16.7"
+    "@babel/plugin-transform-duplicate-keys" "^7.17.12"
+    "@babel/plugin-transform-exponentiation-operator" "^7.16.7"
+    "@babel/plugin-transform-for-of" "^7.18.1"
+    "@babel/plugin-transform-function-name" "^7.16.7"
+    "@babel/plugin-transform-literals" "^7.17.12"
+    "@babel/plugin-transform-member-expression-literals" "^7.16.7"
+    "@babel/plugin-transform-modules-amd" "^7.18.0"
+    "@babel/plugin-transform-modules-commonjs" "^7.18.2"
+    "@babel/plugin-transform-modules-systemjs" "^7.18.0"
+    "@babel/plugin-transform-modules-umd" "^7.18.0"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.17.12"
+    "@babel/plugin-transform-new-target" "^7.17.12"
+    "@babel/plugin-transform-object-super" "^7.16.7"
+    "@babel/plugin-transform-parameters" "^7.17.12"
+    "@babel/plugin-transform-property-literals" "^7.16.7"
+    "@babel/plugin-transform-regenerator" "^7.18.0"
+    "@babel/plugin-transform-reserved-words" "^7.17.12"
+    "@babel/plugin-transform-shorthand-properties" "^7.16.7"
+    "@babel/plugin-transform-spread" "^7.17.12"
+    "@babel/plugin-transform-sticky-regex" "^7.16.7"
+    "@babel/plugin-transform-template-literals" "^7.18.2"
+    "@babel/plugin-transform-typeof-symbol" "^7.17.12"
+    "@babel/plugin-transform-unicode-escapes" "^7.16.7"
+    "@babel/plugin-transform-unicode-regex" "^7.16.7"
+    "@babel/preset-modules" "^0.1.5"
+    "@babel/types" "^7.18.2"
+    babel-plugin-polyfill-corejs2 "^0.3.0"
+    babel-plugin-polyfill-corejs3 "^0.5.0"
+    babel-plugin-polyfill-regenerator "^0.3.0"
+    core-js-compat "^3.22.1"
+    semver "^6.3.0"
+
+"@babel/preset-modules@^0.1.4", "@babel/preset-modules@^0.1.5":
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9"
+  integrity sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
+    "@babel/plugin-transform-dotall-regex" "^7.4.4"
+    "@babel/types" "^7.4.4"
+    esutils "^2.0.2"
+
+"@babel/runtime@7.12.18":
+  version "7.12.18"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.18.tgz#af137bd7e7d9705a412b3caaf991fe6aaa97831b"
+  integrity sha512-BogPQ7ciE6SYAUPtlm9tWbgI9+2AgqSam6QivMgXgAT+fKbgppaj4ZX15MHeLC1PVF5sNk70huBu20XxWOs8Cg==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
+"@babel/runtime@^7.12.5":
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.0.tgz#46794bc20b612c5f75e62dd071e24dfd95f1cbe6"
+  integrity sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
+"@babel/runtime@^7.8.4":
+  version "7.16.3"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.16.3.tgz#b86f0db02a04187a3c17caa77de69840165d42d5"
+  integrity sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
+"@babel/template@^7.12.13", "@babel/template@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.0.tgz#d16a35ebf4cd74e202083356fab21dd89363ddd6"
+  integrity sha512-MnZdpFD/ZdYhXwiunMqqgyZyucaYsbL0IrjoGjaVhGilz+x8YB++kRfygSOIj1yOtWKPlx7NBp+9I1RQSgsd5A==
+  dependencies:
+    "@babel/code-frame" "^7.16.0"
+    "@babel/parser" "^7.16.0"
+    "@babel/types" "^7.16.0"
+
+"@babel/template@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155"
+  integrity sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==
+  dependencies:
+    "@babel/code-frame" "^7.16.7"
+    "@babel/parser" "^7.16.7"
+    "@babel/types" "^7.16.7"
+
+"@babel/traverse@^7.1.6", "@babel/traverse@^7.12.1", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0":
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.0.tgz#cea0dc8ae7e2b1dec65f512f39f3483e8cc95aef"
+  integrity sha512-dZ/a371EE5XNhTHomvtuLTUyx6UEoJmYX+DT5zBCQN3McHemsuIaKKYqsc/fs26BEkHs/lBZy0J571LP5z9kQA==
+  dependencies:
+    "@babel/code-frame" "^7.12.13"
+    "@babel/generator" "^7.14.0"
+    "@babel/helper-function-name" "^7.12.13"
+    "@babel/helper-split-export-declaration" "^7.12.13"
+    "@babel/parser" "^7.14.0"
+    "@babel/types" "^7.14.0"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
+"@babel/traverse@^7.13.0", "@babel/traverse@^7.14.0", "@babel/traverse@^7.16.0", "@babel/traverse@^7.16.3":
+  version "7.16.3"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.3.tgz#f63e8a938cc1b780f66d9ed3c54f532ca2d14787"
+  integrity sha512-eolumr1vVMjqevCpwVO99yN/LoGL0EyHiLO5I043aYQvwOJ9eR5UsZSClHVCzfhBduMAsSzgA/6AyqPjNayJag==
+  dependencies:
+    "@babel/code-frame" "^7.16.0"
+    "@babel/generator" "^7.16.0"
+    "@babel/helper-function-name" "^7.16.0"
+    "@babel/helper-hoist-variables" "^7.16.0"
+    "@babel/helper-split-export-declaration" "^7.16.0"
+    "@babel/parser" "^7.16.3"
+    "@babel/types" "^7.16.0"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
+"@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.3":
+  version "7.17.3"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz#0ae0f15b27d9a92ba1f2263358ea7c4e7db47b57"
+  integrity sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==
+  dependencies:
+    "@babel/code-frame" "^7.16.7"
+    "@babel/generator" "^7.17.3"
+    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/helper-function-name" "^7.16.7"
+    "@babel/helper-hoist-variables" "^7.16.7"
+    "@babel/helper-split-export-declaration" "^7.16.7"
+    "@babel/parser" "^7.17.3"
+    "@babel/types" "^7.17.0"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
+"@babel/traverse@^7.18.0", "@babel/traverse@^7.18.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.2.tgz#b77a52604b5cc836a9e1e08dca01cba67a12d2e8"
+  integrity sha512-9eNwoeovJ6KH9zcCNnENY7DMFwTU9JdGCFtqNLfUAqtUHRCOsTOqWoffosP8vKmNYeSBUv3yVJXjfd8ucwOjUA==
+  dependencies:
+    "@babel/code-frame" "^7.16.7"
+    "@babel/generator" "^7.18.2"
+    "@babel/helper-environment-visitor" "^7.18.2"
+    "@babel/helper-function-name" "^7.17.9"
+    "@babel/helper-hoist-variables" "^7.16.7"
+    "@babel/helper-split-export-declaration" "^7.16.7"
+    "@babel/parser" "^7.18.0"
+    "@babel/types" "^7.18.2"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
+"@babel/types@^7.1.6", "@babel/types@^7.7.0", "@babel/types@^7.7.2":
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.0.tgz#3fc3fc74e0cdad878182e5f66cc6bcab1915a802"
+  integrity sha512-O2LVLdcnWplaGxiPBz12d0HcdN8QdxdsWYhz5LSeuukV/5mn2xUUc3gBeU4QBYPJ18g/UToe8F532XJ608prmg==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.14.0"
+    to-fast-properties "^2.0.0"
+
+"@babel/types@^7.12.1", "@babel/types@^7.13.12", "@babel/types@^7.14.0", "@babel/types@^7.16.0", "@babel/types@^7.4.4":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.0.tgz#db3b313804f96aadd0b776c4823e127ad67289ba"
+  integrity sha512-PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.15.7"
+    to-fast-properties "^2.0.0"
+
+"@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0":
+  version "7.17.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz#a826e368bccb6b3d84acd76acad5c0d87342390b"
+  integrity sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.16.7"
+    to-fast-properties "^2.0.0"
+
+"@babel/types@^7.18.0", "@babel/types@^7.18.2":
+  version "7.18.4"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.4.tgz#27eae9b9fd18e9dccc3f9d6ad051336f307be354"
+  integrity sha512-ThN1mBcMq5pG/Vm2IcBmPPfyPXbd8S02rS+OBIDENdufvqC7Z/jHPCv9IcP01277aKtDI8g/2XysBN4hA8niiw==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.16.7"
+    to-fast-properties "^2.0.0"
+
+"@cnakazawa/watch@^1.0.3":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a"
+  integrity sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==
+  dependencies:
+    exec-sh "^0.3.2"
+    minimist "^1.2.0"
+
+"@ember-data/adapter@3.28.9":
+  version "3.28.9"
+  resolved "https://registry.yarnpkg.com/@ember-data/adapter/-/adapter-3.28.9.tgz#5d8121b7ed36a875ff2fa06f84d0ce6b6aa7b0d7"
+  integrity sha512-qcqTXfHq/TZjNyyCBCE11zQHbR6pc7FaMXKxhwgNyk1FYIFMe07IZgX2B9A2Y+famjxoOv780dn0dBQtWFihBg==
+  dependencies:
+    "@ember-data/private-build-infra" "3.28.9"
+    "@ember-data/store" "3.28.9"
+    "@ember/edition-utils" "^1.2.0"
+    "@ember/string" "^3.0.0"
+    ember-cli-babel "^7.26.6"
+    ember-cli-test-info "^1.0.0"
+    ember-cli-typescript "^4.1.0"
+
+"@ember-data/canary-features@3.28.9":
+  version "3.28.9"
+  resolved "https://registry.yarnpkg.com/@ember-data/canary-features/-/canary-features-3.28.9.tgz#08a302e2062fd02647432b49775edabfc55e2e9a"
+  integrity sha512-xvkZcdm2/jk0NjAIfBZMAMLwaCInJtZoIF2WjiIe4Q9So/deeTR7uhF+K7UlYQiVnyZWrTl5duvcGBrjzeNnnQ==
+  dependencies:
+    ember-cli-babel "^7.26.6"
+    ember-cli-typescript "^4.1.0"
+
+"@ember-data/debug@3.28.9":
+  version "3.28.9"
+  resolved "https://registry.yarnpkg.com/@ember-data/debug/-/debug-3.28.9.tgz#8d4d2eff29a86b3380684deceaf0dcf3cb422687"
+  integrity sha512-OoyAVjv/bv6CVrzuHpNFvYN1GEio42kq3NdaHwobqhQlD7ERP6KbkJj3XBI9SEgAjQIM4hFul+nO8BKNGF+tnw==
+  dependencies:
+    "@ember-data/private-build-infra" "3.28.9"
+    "@ember/edition-utils" "^1.2.0"
+    "@ember/string" "^3.0.0"
+    ember-cli-babel "^7.26.6"
+    ember-cli-test-info "^1.0.0"
+    ember-cli-typescript "^4.1.0"
+
+"@ember-data/model@3.28.9":
+  version "3.28.9"
+  resolved "https://registry.yarnpkg.com/@ember-data/model/-/model-3.28.9.tgz#7cc05f7c53677076299362dbf2fc1abde9aae28d"
+  integrity sha512-B4yHxfcD8XWT1SCBBXHXJxNYauXvSFCO3K41m+QZlxzSzK+hrctsESgzCYE08MAG1t8qA3XlKDSxA+VNokovGA==
+  dependencies:
+    "@ember-data/canary-features" "3.28.9"
+    "@ember-data/private-build-infra" "3.28.9"
+    "@ember-data/store" "3.28.9"
+    "@ember/edition-utils" "^1.2.0"
+    "@ember/string" "^3.0.0"
+    ember-cached-decorator-polyfill "^0.1.4"
+    ember-cli-babel "^7.26.6"
+    ember-cli-string-utils "^1.1.0"
+    ember-cli-test-info "^1.0.0"
+    ember-cli-typescript "^4.1.0"
+    ember-compatibility-helpers "^1.2.0"
+    inflection "~1.13.1"
+
+"@ember-data/private-build-infra@3.28.9":
+  version "3.28.9"
+  resolved "https://registry.yarnpkg.com/@ember-data/private-build-infra/-/private-build-infra-3.28.9.tgz#b556d3620dcd8d2999db2b22a6b006ccac5dd64d"
+  integrity sha512-QfwiNSAolXrIReNjqZZCyO3lG9d0cA+9WxR4jKU89aJy2++V1fpmCU/o33tmWKmpMdJ2TwO4nbRR4yLb6EtygA==
+  dependencies:
+    "@babel/plugin-transform-block-scoping" "^7.8.3"
+    "@ember-data/canary-features" "3.28.9"
+    "@ember/edition-utils" "^1.2.0"
+    babel-plugin-debug-macros "^0.3.3"
+    babel-plugin-filter-imports "^4.0.0"
+    babel6-plugin-strip-class-callcheck "^6.0.0"
+    broccoli-debug "^0.6.5"
+    broccoli-file-creator "^2.1.1"
+    broccoli-funnel "^3.0.3"
+    broccoli-merge-trees "^4.2.0"
+    broccoli-rollup "^5.0.0"
+    calculate-cache-key-for-tree "^2.0.0"
+    chalk "^4.0.0"
+    ember-cli-babel "^7.26.6"
+    ember-cli-path-utils "^1.0.0"
+    ember-cli-string-utils "^1.1.0"
+    ember-cli-typescript "^4.1.0"
+    ember-cli-version-checker "^5.1.1"
+    esm "^3.2.25"
+    git-repo-info "^2.1.1"
+    glob "^7.1.6"
+    npm-git-info "^1.0.3"
+    rimraf "^3.0.2"
+    rsvp "^4.8.5"
+    semver "^7.1.3"
+    silent-error "^1.1.1"
+
+"@ember-data/record-data@3.28.9":
+  version "3.28.9"
+  resolved "https://registry.yarnpkg.com/@ember-data/record-data/-/record-data-3.28.9.tgz#ac93b49c9096f6dd2825a38534c71d01e036f195"
+  integrity sha512-PZwR0FVjy7uSJpBtsfSJHJqApNagcytjbO+22XmegnQt/e6BZKBimDry4WfJTqg8qlhCS0v2Wsk2FCvpvO0bCQ==
+  dependencies:
+    "@ember-data/canary-features" "3.28.9"
+    "@ember-data/private-build-infra" "3.28.9"
+    "@ember-data/store" "3.28.9"
+    "@ember/edition-utils" "^1.2.0"
+    ember-cli-babel "^7.26.6"
+    ember-cli-test-info "^1.0.0"
+    ember-cli-typescript "^4.1.0"
+
+"@ember-data/rfc395-data@^0.0.4":
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/@ember-data/rfc395-data/-/rfc395-data-0.0.4.tgz#ecb86efdf5d7733a76ff14ea651a1b0ed1f8a843"
+  integrity sha512-tGRdvgC9/QMQSuSuJV45xoyhI0Pzjm7A9o/MVVA3HakXIImJbbzx/k/6dO9CUEQXIyS2y0fW6C1XaYOG7rY0FQ==
+
+"@ember-data/serializer@3.28.9":
+  version "3.28.9"
+  resolved "https://registry.yarnpkg.com/@ember-data/serializer/-/serializer-3.28.9.tgz#003e19cc1e0d44c6890de84b65b9a3f2a667d1cc"
+  integrity sha512-IoA6N1kh6yCq5cPUxnxW5WgedbEF6dPf1CGq7WWHVPfUI3+rpfAAyr5/EIxXqeHvQ5a5J4MOTyio+8xPn16KPQ==
+  dependencies:
+    "@ember-data/private-build-infra" "3.28.9"
+    "@ember-data/store" "3.28.9"
+    ember-cli-babel "^7.26.6"
+    ember-cli-test-info "^1.0.0"
+    ember-cli-typescript "^4.1.0"
+
+"@ember-data/store@3.28.9":
+  version "3.28.9"
+  resolved "https://registry.yarnpkg.com/@ember-data/store/-/store-3.28.9.tgz#3467815bc94107698a1808a294f7360519ac6aa1"
+  integrity sha512-5yg/VdrhCcz+cOTsW38FGlW5kzf6Wm1Q8jsdUAEaDTVf716xjl3E7QkcOQxZbaFr5mEO2TvG53x8CUm/VseKbw==
+  dependencies:
+    "@ember-data/canary-features" "3.28.9"
+    "@ember-data/private-build-infra" "3.28.9"
+    "@ember/string" "^3.0.0"
+    "@glimmer/tracking" "^1.0.4"
+    ember-cli-babel "^7.26.6"
+    ember-cli-path-utils "^1.0.0"
+    ember-cli-typescript "^4.1.0"
+
+"@ember-decorators/component@^6.1.1":
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/@ember-decorators/component/-/component-6.1.1.tgz#b360dc4fa8e576ee1c840879399ef1745fd96e06"
+  integrity sha512-Cj8tY/c0MC/rsipqsiWLh3YVN72DK92edPYamD/HzvftwzC6oDwawWk8RmStiBnG9PG/vntAt41l3S7HSSA+1Q==
+  dependencies:
+    "@ember-decorators/utils" "^6.1.1"
+    ember-cli-babel "^7.1.3"
+
+"@ember-decorators/object@^6.1.1":
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/@ember-decorators/object/-/object-6.1.1.tgz#50c922f5ac9af3ddd381cb6a43a031dfd9a70c7a"
+  integrity sha512-cb4CNR9sRoA31J3FCOFLDuR9ztM4wO9w1WlS4JeNRS7Z69SlB/XSXB/vplA3i9OOaXEy/zKWbu5ndZrHz0gvLw==
+  dependencies:
+    "@ember-decorators/utils" "^6.1.1"
+    ember-cli-babel "^7.1.3"
+
+"@ember-decorators/utils@^6.1.0", "@ember-decorators/utils@^6.1.1":
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/@ember-decorators/utils/-/utils-6.1.1.tgz#6b619814942b4fb3747cfa9f540c9f05283d7c5e"
+  integrity sha512-0KqnoeoLKb6AyoSU65TRF5T85wmS4uDn06oARddwNPxxf/lt5jQlh41uX3W7V/fWL9tPu8x1L1Vvpc80MN1+YA==
+  dependencies:
+    ember-cli-babel "^7.1.3"
+
+"@ember/edition-utils@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@ember/edition-utils/-/edition-utils-1.2.0.tgz#a039f542dc14c8e8299c81cd5abba95e2459cfa6"
+  integrity sha512-VmVq/8saCaPdesQmftPqbFtxJWrzxNGSQ+e8x8LLe3Hjm36pJ04Q8LeORGZkAeOhldoUX9seLGmSaHeXkIqoog==
+
+"@ember/optional-features@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@ember/optional-features/-/optional-features-2.0.0.tgz#c809abd5a27d5b0ef3c6de3941334ab6153313f0"
+  integrity sha512-4gkvuGRYfpAh1nwAz306cmMeC1mG7wxZnbsBZ09mMaMX/W7IyKOKc/38JwrDPUFUalmNEM7q7JEPcmew2M3Dog==
+  dependencies:
+    chalk "^4.1.0"
+    ember-cli-version-checker "^5.1.1"
+    glob "^7.1.6"
+    inquirer "^7.3.3"
+    mkdirp "^1.0.4"
+    silent-error "^1.1.1"
+
+"@ember/render-modifiers@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@ember/render-modifiers/-/render-modifiers-1.0.2.tgz#2e87c48db49d922ce4850d707215caaac60d8444"
+  integrity sha512-6tEnHl5+62NTSAG2mwhGMFPhUrJQjoVqV+slsn+rlTknm2Zik+iwxBQEbwaiQOU1FUYxkS8RWcieovRNMR8inQ==
+  dependencies:
+    ember-cli-babel "^7.10.0"
+    ember-modifier-manager-polyfill "^1.1.0"
+
+"@ember/render-modifiers@^2.0.3":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@ember/render-modifiers/-/render-modifiers-2.0.4.tgz#0ac7af647cb736076dbfcd54ca71e090cd329d71"
+  integrity sha512-Zh/fo5VUmVzYHkHVvzWVjJ1RjFUxA2jH0zCp2+DQa80Bf3DUXauiEByxU22UkN4LFT55DBFttC0xCQSJG3WTsg==
+  dependencies:
+    "@embroider/macros" "^1.0.0"
+    ember-cli-babel "^7.26.11"
+    ember-modifier-manager-polyfill "^1.2.0"
+
+"@ember/string@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@ember/string/-/string-3.0.0.tgz#e3a3cc7874c9f64eadfdac644d8b1238721ce289"
+  integrity sha512-T+7QYDp8ItlQseNveK2lL6OsOO5wg7aNQ/M2RpO8cGwM80oZOnr/Y35HmMfu4ejFEc+F1LPegvu7LGfeJOicWA==
+  dependencies:
+    ember-cli-babel "^7.26.6"
+
+"@ember/test-helpers@^2.6.0":
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-2.6.0.tgz#d687515c6ab49ba72717fc62046970ef4a72ea9c"
+  integrity sha512-N5sr3layWk60wB3maCy+/5hFHQRcTh8aqxcZTSs3Od9QkuHdWBtRgMGLP/35mXpJlgWuu3xqLpt6u3dGHc8gCg==
+  dependencies:
+    "@ember/test-waiters" "^3.0.0"
+    broccoli-debug "^0.6.5"
+    broccoli-funnel "^3.0.8"
+    ember-cli-babel "^7.26.6"
+    ember-cli-htmlbars "^5.7.1"
+    ember-destroyable-polyfill "^2.0.3"
+
+"@ember/test-waiters@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@ember/test-waiters/-/test-waiters-3.0.0.tgz#b66a35cd5b78ec3c296a6f5f5fb3852780a5d3c8"
+  integrity sha512-z6+gIlq/rXLKroWv2wxAoiiLtgSOGQFCw6nUufERausV+jLnA7CYbWwzEo5R7XaOejSDpgA5d6haXIBsD5j0oQ==
+  dependencies:
+    calculate-cache-key-for-tree "^2.0.0"
+    ember-cli-babel "^7.26.6"
+    ember-cli-version-checker "^5.1.2"
+    semver "^7.3.5"
+
+"@embroider/core@0.33.0", "@embroider/core@^0.33.0":
+  version "0.33.0"
+  resolved "https://registry.yarnpkg.com/@embroider/core/-/core-0.33.0.tgz#0fb1752d6e34ea45368e65c42e13220a57ffae76"
+  integrity sha512-Kd3W4vBJCSwskVislwldhuoe1RtdA04lRr2r2ccnPI4msCXxLn292WBaS7/x0LdEu2EMO5ffRDeQva2/xoS4Yg==
+  dependencies:
+    "@babel/core" "^7.12.3"
+    "@babel/parser" "^7.12.3"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
+    "@babel/plugin-transform-runtime" "^7.12.1"
+    "@babel/runtime" "^7.12.5"
+    "@babel/traverse" "^7.12.1"
+    "@babel/types" "^7.12.1"
+    "@embroider/macros" "0.33.0"
+    assert-never "^1.1.0"
+    babel-plugin-syntax-dynamic-import "^6.18.0"
+    broccoli-node-api "^1.7.0"
+    broccoli-persistent-filter "^3.1.2"
+    broccoli-plugin "^4.0.1"
+    broccoli-source "^3.0.0"
+    debug "^3.1.0"
+    escape-string-regexp "^4.0.0"
+    fast-sourcemap-concat "^1.4.0"
+    filesize "^4.1.2"
+    fs-extra "^7.0.1"
+    fs-tree-diff "^2.0.0"
+    handlebars "^4.4.2"
+    js-string-escape "^1.0.1"
+    jsdom "^16.4.0"
+    json-stable-stringify "^1.0.1"
+    lodash "^4.17.10"
+    pkg-up "^2.0.0"
+    resolve "^1.8.1"
+    resolve-package-path "^1.2.2"
+    semver "^7.3.2"
+    strip-bom "^3.0.0"
+    typescript-memoize "^1.0.0-alpha.3"
+    walk-sync "^1.1.3"
+    wrap-legacy-hbs-plugin-if-needed "^1.0.1"
+
+"@embroider/macros@0.33.0":
+  version "0.33.0"
+  resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.33.0.tgz#d5826ea7565bb69b57ba81ed528315fe77acbf9d"
+  integrity sha512-nl/1zRn+Wd3MO8Bb+YPqHmFl/2vwQLTsEB6Zt+K9bWXsM/kA+dPCeeCReLN6PbkMP16xxqtNSIrQ8Y49hnWjpg==
+  dependencies:
+    "@babel/core" "^7.12.3"
+    "@babel/traverse" "^7.12.1"
+    "@babel/types" "^7.12.1"
+    "@embroider/core" "0.33.0"
+    assert-never "^1.1.0"
+    ember-cli-babel "^7.23.0"
+    lodash "^4.17.10"
+    resolve "^1.8.1"
+    semver "^7.3.2"
+
+"@embroider/macros@0.41.0", "@embroider/macros@^0.41.0":
+  version "0.41.0"
+  resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.41.0.tgz#3e78b6f388d7229906abf4c75edfff8bb0208aca"
+  integrity sha512-QISzwEEfLsskZeL0jyZDs1RoQSotwBWj+4upTogNHuxQP5j/9H3IMG/3QB1gh8GEpbudATb/cS4NDYK3UBxufw==
+  dependencies:
+    "@embroider/shared-internals" "0.41.0"
+    assert-never "^1.1.0"
+    ember-cli-babel "^7.23.0"
+    lodash "^4.17.10"
+    resolve "^1.8.1"
+    semver "^7.3.2"
+
+"@embroider/macros@0.47.2":
+  version "0.47.2"
+  resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.47.2.tgz#23cbe92cac3c24747f054e1eea2a22538bf7ebd0"
+  integrity sha512-ViNWluJCeM5OPlM3rs8kdOz3RV5rpfXX5D2rDnc/q86xRS0xf4NFEjYRV7W6fBcD0b3v5jSHDTwrjq9Kee4rHg==
+  dependencies:
+    "@embroider/shared-internals" "0.47.2"
+    assert-never "^1.2.1"
+    ember-cli-babel "^7.26.6"
+    find-up "^5.0.0"
+    lodash "^4.17.21"
+    resolve "^1.20.0"
+    semver "^7.3.2"
+
+"@embroider/macros@1.5.0", "@embroider/macros@^1.0.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.5.0.tgz#8c67666359e7814d91cdeac2fd96c896080473b3"
+  integrity sha512-QqNsWmIJ8LvwWg+YAfB+nfcRZ49hAJNTJAKt2IDpgZDKa/FYj/Mp75UWfJ1BJvB3KUq50OQCOv4TZ3ZcU9h/TQ==
+  dependencies:
+    "@embroider/shared-internals" "1.5.0"
+    assert-never "^1.2.1"
+    babel-import-util "^1.1.0"
+    ember-cli-babel "^7.26.6"
+    find-up "^5.0.0"
+    lodash "^4.17.21"
+    resolve "^1.20.0"
+    semver "^7.3.2"
+
+"@embroider/macros@^0.43.5":
+  version "0.43.5"
+  resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.43.5.tgz#f846bb883482436611a58a3512c687d4f9fddfad"
+  integrity sha512-WmLa0T3dyG2XyN5Gr7k1RINDirFzAzh6CRvykRMcuahq1rCrav8ADrWgQzKpPWxdR6DgQCuoyimopJhLbYOpgQ==
+  dependencies:
+    "@embroider/shared-internals" "0.43.5"
+    assert-never "^1.2.1"
+    ember-cli-babel "^7.26.6"
+    find-up "^5.0.0"
+    lodash "^4.17.21"
+    resolve "^1.20.0"
+    semver "^7.3.2"
+
+"@embroider/shared-internals@0.41.0":
+  version "0.41.0"
+  resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-0.41.0.tgz#2553f026d4f48ea1fd11235501feb63bf49fa306"
+  integrity sha512-fiqUVB6cfh2UBEFE4yhT5EzagkZ1Q26+OhBV0nJszFEJZx4DqVIb3pxSSZ8P+HhpxuJsQ2XpMA/j02ZPFZfbdQ==
+  dependencies:
+    ember-rfc176-data "^0.3.17"
+    fs-extra "^7.0.1"
+    lodash "^4.17.10"
+    pkg-up "^3.1.0"
+    resolve-package-path "^1.2.2"
+    semver "^7.3.2"
+    typescript-memoize "^1.0.0-alpha.3"
+
+"@embroider/shared-internals@0.43.5":
+  version "0.43.5"
+  resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-0.43.5.tgz#4269208095452c23bfa4f08554fd8f7ed7b83a83"
+  integrity sha512-vydU3kRS5hH/hWOBHiHP06427d0C5t2p+UTPtbH09+Jlyj0WvvtgUfiNltEneY6jjpLXlqOfgs4LjsRdmBFksw==
+  dependencies:
+    ember-rfc176-data "^0.3.17"
+    fs-extra "^9.1.0"
+    lodash "^4.17.21"
+    resolve-package-path "^4.0.1"
+    semver "^7.3.5"
+    typescript-memoize "^1.0.1"
+
+"@embroider/shared-internals@0.47.2":
+  version "0.47.2"
+  resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-0.47.2.tgz#24e9fa0dd9c529d5c996ee1325729ea08d1fa19f"
+  integrity sha512-SxdZYjAE0fiM5zGDz+12euWIsQZ1tsfR1k+NKmiWMyLhA5T3pNgbR2/Djvx/cVIxOtEavGGSllYbzRKBtV4xMg==
+  dependencies:
+    babel-import-util "^0.2.0"
+    ember-rfc176-data "^0.3.17"
+    fs-extra "^9.1.0"
+    lodash "^4.17.21"
+    resolve-package-path "^4.0.1"
+    semver "^7.3.5"
+    typescript-memoize "^1.0.1"
+
+"@embroider/shared-internals@1.5.0", "@embroider/shared-internals@^1.0.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-1.5.0.tgz#d3883f13571be36fcdbc59c65c785db7b6d8186e"
+  integrity sha512-kdR7Fh2YdzsNofJO+DJxLfrlMbW4/NNf78aMXgE21z/tg9GO5W2mKlI1DzsO2JlO5yfZdiYfqb9C9vSLJEx14A==
+  dependencies:
+    babel-import-util "^1.1.0"
+    ember-rfc176-data "^0.3.17"
+    fs-extra "^9.1.0"
+    lodash "^4.17.21"
+    resolve-package-path "^4.0.1"
+    semver "^7.3.5"
+    typescript-memoize "^1.0.1"
+
+"@embroider/util@^0.39.1 || ^0.40.0 || ^0.41.0":
+  version "0.41.0"
+  resolved "https://registry.yarnpkg.com/@embroider/util/-/util-0.41.0.tgz#5324cb4742aa4ed8d613c4f88a466f73e4e6acc1"
+  integrity sha512-ytA3J/YfQh7FEUEBwz3ezTqQNm/S5et5rZw3INBIy4Ak4x0NXV/VXLjyL8mv3txL8fGknZTBdXEhDsHUKIq8SQ==
+  dependencies:
+    "@embroider/macros" "0.41.0"
+    broccoli-funnel "^3.0.5"
+    ember-cli-babel "^7.23.1"
+
+"@embroider/util@^0.47.2":
+  version "0.47.2"
+  resolved "https://registry.yarnpkg.com/@embroider/util/-/util-0.47.2.tgz#d06497b4b84c07ed9c7b628293bb019c533f4556"
+  integrity sha512-g9OqnFJPktGu9NS0Ug3Pxz1JE3jeDceeVE4IrlxDrVmBXMA/GrBvpwjolWgl6jh97cMJyExdz62jIvPHV4256Q==
+  dependencies:
+    "@embroider/macros" "0.47.2"
+    broccoli-funnel "^3.0.5"
+    ember-cli-babel "^7.23.1"
+
+"@embroider/util@^1.0.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@embroider/util/-/util-1.5.0.tgz#0c7da82a75052daca7c709d6888b72a1da19822e"
+  integrity sha512-CoE98WDnRtXPn8x8SJkWHGw7frikRIetpImwwC9qyse/AvSoOsS4B5U0G8omZLMvwm2IEc9NemlDrS4ZyUlJ/A==
+  dependencies:
+    "@embroider/macros" "1.5.0"
+    broccoli-funnel "^3.0.5"
+    ember-cli-babel "^7.23.1"
+
+"@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"
+
+"@glimmer/component@^1.0.3", "@glimmer/component@^1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/component/-/component-1.0.4.tgz#1c85a5181615a6647f6acfaaed68e28ad7e9626e"
+  integrity sha512-sS4N8wtcKfYdUJ6O3m8nbTut6NjErdz94Ap8VB1ekcg4WSD+7sI7Nmv6kt2rdPoe363nUdjUbRBzHNWhLzraBw==
+  dependencies:
+    "@glimmer/di" "^0.1.9"
+    "@glimmer/env" "^0.1.7"
+    "@glimmer/util" "^0.44.0"
+    broccoli-file-creator "^2.1.1"
+    broccoli-merge-trees "^3.0.2"
+    ember-cli-babel "^7.7.3"
+    ember-cli-get-component-path-option "^1.0.0"
+    ember-cli-is-package-missing "^1.0.0"
+    ember-cli-normalize-entity-name "^1.0.0"
+    ember-cli-path-utils "^1.0.0"
+    ember-cli-string-utils "^1.1.0"
+    ember-cli-typescript "3.0.0"
+    ember-cli-version-checker "^3.1.3"
+    ember-compatibility-helpers "^1.1.2"
+
+"@glimmer/di@^0.1.9":
+  version "0.1.11"
+  resolved "https://registry.yarnpkg.com/@glimmer/di/-/di-0.1.11.tgz#a6878c07a13a2c2c76fcde598a5c97637bfc4280"
+  integrity sha1-poeMB6E6LCx2/N5ZilyXY3v8QoA=
+
+"@glimmer/encoder@^0.42.2":
+  version "0.42.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.42.2.tgz#d3ba3dc9f1d4fa582d1d18b63da100fc5c664057"
+  integrity sha512-8xkdly0i0BP5HMI0suPB9ly0AnEq8x9Z8j3Gee1HYIovM5VLNtmh7a8HsaHYRs/xHmBEZcqtr8JV89w6F59YMQ==
+  dependencies:
+    "@glimmer/interfaces" "^0.42.2"
+    "@glimmer/vm" "^0.42.2"
+
+"@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
+  integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
+
+"@glimmer/global-context@0.83.1":
+  version "0.83.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.83.1.tgz#3e2d97f10ff623bcfb5b7dc29a858d546a6c6d66"
+  integrity sha512-OwlgqpbOJU73EjZOZdftab0fKbtdJ4x/QQeJseL9cvaAUiK3+w52M5ONFxD1T/yPBp2Mf7NCYqA/uL8tRbzY2A==
+  dependencies:
+    "@glimmer/env" "^0.1.7"
+
+"@glimmer/interfaces@0.83.1":
+  version "0.83.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.83.1.tgz#fb16f5f683ddc55f130887b6141f58c0751350fe"
+  integrity sha512-rjAztghzX97v8I4rk3+NguM3XGYcFjc/GbJ8qrEj19KF2lUDoDBW1sB7f0tov3BD5HlrGXei/vOh4+DHfjeB5w==
+  dependencies:
+    "@simple-dom/interface" "^1.4.0"
+
+"@glimmer/interfaces@^0.42.2":
+  version "0.42.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.42.2.tgz#9cf8d6f8f5eee6bfcfa36919ca68ae716e1f78db"
+  integrity sha512-7LOuQd02cxxNNHChzdHMAU8/qOeQvTro141CU5tXITP7z6aOv2D2gkFdau97lLQiVxezGrh8J7h8GCuF7TEqtg==
+
+"@glimmer/low-level@^0.42.2":
+  version "0.42.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.42.2.tgz#52c745414d1d04c4245c369bd132c0e786c816ef"
+  integrity sha512-s+Q44SnKdTBTnkgX0deBlVNnNPVas+Pg8xEnwky9VrUqOHKsIZRrPgfVULeC6bIdFXtXOKm5CjTajhb9qnQbXQ==
+
+"@glimmer/program@^0.42.2":
+  version "0.42.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.42.2.tgz#fe504679ca4df6251dd5fcf3003699bb51fa41fa"
+  integrity sha512-XpQ6EYzA1VL9ESKoih5XW5JftFmlRvwy3bF/I1ABOa3yLIh8mApEwrRI/sIHK0Nv5s1j0uW4itVF196WxnJXgw==
+  dependencies:
+    "@glimmer/encoder" "^0.42.2"
+    "@glimmer/interfaces" "^0.42.2"
+    "@glimmer/util" "^0.42.2"
+
+"@glimmer/reference@^0.42.1", "@glimmer/reference@^0.42.2":
+  version "0.42.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.42.2.tgz#57874e27c825fb7041b5295b5eb153f3f3f92f8f"
+  integrity sha512-XuhbRjr3M9Q/DP892jGxVfPE6jaGGHu5w9ppGMnuTY7Vm/x+A+68MCiaREhDcEwJlzGg4UkfVjU3fdgmUIrc5Q==
+  dependencies:
+    "@glimmer/util" "^0.42.2"
+
+"@glimmer/reference@^0.83.1":
+  version "0.83.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.83.1.tgz#0345b95431b5bb19843b308e6311d1ef81e36192"
+  integrity sha512-BThEwDlMkJB1WBPWDrww+VxgGyDbwxh5FFPvGhkovvCZnCb7fAMUCt9pi6CUZtviugkWOBFtE9P4eZZbOLkXeg==
+  dependencies:
+    "@glimmer/env" "^0.1.7"
+    "@glimmer/global-context" "0.83.1"
+    "@glimmer/interfaces" "0.83.1"
+    "@glimmer/util" "0.83.1"
+    "@glimmer/validator" "0.83.1"
+
+"@glimmer/runtime@^0.42.1":
+  version "0.42.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.42.2.tgz#50e7da5d3cf9144248048a7478be3c489784a4bb"
+  integrity sha512-52LVZJsLKM3GzI3TEmYcw2LdI9Uk0jotISc3w2ozQBWvkKoYxjDNvI/gsjyMpenj4s7FcG2ggOq0x4tNFqm1GA==
+  dependencies:
+    "@glimmer/interfaces" "^0.42.2"
+    "@glimmer/low-level" "^0.42.2"
+    "@glimmer/program" "^0.42.2"
+    "@glimmer/reference" "^0.42.2"
+    "@glimmer/util" "^0.42.2"
+    "@glimmer/vm" "^0.42.2"
+    "@glimmer/wire-format" "^0.42.2"
+
+"@glimmer/syntax@^0.42.1":
+  version "0.42.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.42.2.tgz#89bb3cb787285b84665dc0d8907d94b008e5be9a"
+  integrity sha512-SR26SmF/Mb5o2cc4eLHpOyoX5kwwXP4KRhq4fbWfrvan74xVWA38PLspPCzwGhyVH/JsE7tUEPMjSo2DcJge/Q==
+  dependencies:
+    "@glimmer/interfaces" "^0.42.2"
+    "@glimmer/util" "^0.42.2"
+    handlebars "^4.0.13"
+    simple-html-tokenizer "^0.5.8"
+
+"@glimmer/syntax@^0.83.1":
+  version "0.83.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.83.1.tgz#7e18dd445871c157ba0281f12a4fbf316fa49b41"
+  integrity sha512-n3vEd0GtjtgkOsd2gqkSimp8ecqq5KrHyana/s1XJZvVAPD5rMWT9WvAVWG8XAktns8BxjwLIUoj/vkOfA+eHg==
+  dependencies:
+    "@glimmer/interfaces" "0.83.1"
+    "@glimmer/util" "0.83.1"
+    "@handlebars/parser" "~2.0.0"
+    simple-html-tokenizer "^0.5.11"
+
+"@glimmer/tracking@^1.0.3", "@glimmer/tracking@^1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/tracking/-/tracking-1.0.4.tgz#f1bc1412fe5e2236d0f8d502994a8f88af1bbb21"
+  integrity sha512-F+oT8I55ba2puSGIzInmVrv/8QA2PcK1VD+GWgFMhF6WC97D+uZX7BFg+a3s/2N4FVBq5KHE+QxZzgazM151Yw==
+  dependencies:
+    "@glimmer/env" "^0.1.7"
+    "@glimmer/validator" "^0.44.0"
+
+"@glimmer/util@0.83.1":
+  version "0.83.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.83.1.tgz#cc7511b03164d658cf6e3262fce5a0fcb82edceb"
+  integrity sha512-amvjtl9dvrkxsoitXAly9W5NUaLIE3A2J2tWhBWIL1Z6DOFotfX7ytIosOIcPhJLZCtiXPHzMutQRv0G/MSMsA==
+  dependencies:
+    "@glimmer/env" "0.1.7"
+    "@glimmer/interfaces" "0.83.1"
+    "@simple-dom/interface" "^1.4.0"
+
+"@glimmer/util@^0.42.2":
+  version "0.42.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.42.2.tgz#9ca1631e42766ea6059f4b49d0bdfb6095aad2c4"
+  integrity sha512-Heck0baFSaWDanCYtmOcLeaz7v+rSqI8ovS7twrp2/FWEteb3Ze5sWQ2BEuSAG23L/k/lzVwYM/MY7ZugxBpaA==
+
+"@glimmer/util@^0.44.0":
+  version "0.44.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.44.0.tgz#45df98d73812440206ae7bda87cfe04aaae21ed9"
+  integrity sha512-duAsm30uVK9jSysElCbLyU6QQYO2X9iLDLBIBUcCqck9qN1o3tK2qWiHbGK5d6g8E2AJ4H88UrfElkyaJlGrwg==
+
+"@glimmer/validator@0.83.1", "@glimmer/validator@^0.83.0":
+  version "0.83.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.83.1.tgz#7578cb2284f728c8e9302c51fc6e7660b570ac54"
+  integrity sha512-LaILSNnQgDHZpaUsfjVndbS1JfVn0xdTlJdFJblPbhoVklOBSReZVekens3EQ6xOr3BC612sRm1hBnEPixOY6A==
+  dependencies:
+    "@glimmer/env" "^0.1.7"
+    "@glimmer/global-context" "0.83.1"
+
+"@glimmer/validator@^0.44.0":
+  version "0.44.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.44.0.tgz#03d127097dc9cb23052cdb7fcae59d0a9dca53e1"
+  integrity sha512-i01plR0EgFVz69GDrEuFgq1NheIjZcyTy3c7q+w7d096ddPVeVcRzU3LKaqCfovvLJ+6lJx40j45ecycASUUyw==
+
+"@glimmer/vm-babel-plugins@0.80.3":
+  version "0.80.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.80.3.tgz#434b62172318cac43830d3ac29818cf2c5f111c1"
+  integrity sha512-9ej6xlm5MzHBJ5am2l0dbbn8Z0wJoYoMpM8FcrGMlUP6SPMLWxvxpMsApgQo8u6dvZRCjR3/bw3fdf7GOy0AFw==
+  dependencies:
+    babel-plugin-debug-macros "^0.3.4"
+
+"@glimmer/vm@^0.42.2":
+  version "0.42.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.42.2.tgz#492a4f05eac587c3a37371b3c62593f20bef553d"
+  integrity sha512-D2MNU5glICLqvet5SfVPrv+l6JNK2TR+CdQhch1Ew+btOoqlW+2LIJIF/5wLb1POjIMEkt+78t/7RN0mDFXGzw==
+  dependencies:
+    "@glimmer/interfaces" "^0.42.2"
+    "@glimmer/util" "^0.42.2"
+
+"@glimmer/wire-format@^0.42.2":
+  version "0.42.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.42.2.tgz#b95062b594dddeb8bd11cba3a6a0accbfabc9930"
+  integrity sha512-IqUo6mdJ7GRsK7KCyZxrc17ioSg9RBniEnb418ZMQxsV/WBv9NQ359MuClUck2M24z1AOXo4TerUw0U7+pb1/A==
+  dependencies:
+    "@glimmer/interfaces" "^0.42.2"
+    "@glimmer/util" "^0.42.2"
+
+"@handlebars/parser@~2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@handlebars/parser/-/parser-2.0.0.tgz#5e8b7298f31ff8f7b260e6b7363c7e9ceed7d9c5"
+  integrity sha512-EP9uEDZv/L5Qh9IWuMUGJRfwhXJ4h1dqKTT4/3+tY0eu7sPis7xh23j61SYUnNF4vqCQvvUXpDo9Bh/+q1zASA==
+
+"@hashicorp/ember-flight-icons@2.0.3":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@hashicorp/ember-flight-icons/-/ember-flight-icons-2.0.3.tgz#a1c70faa4b75838aef280cd032489daf6a6f9954"
+  integrity sha512-S1W8Yecu2zN9sN+HmIITV39/js8JgB/2WRTs0uw0HGMf5dHcRmJc7/5PMkWHQTW71GU7hs5Dna32klwWKkLEFw==
+  dependencies:
+    "@hashicorp/flight-icons" "^2.2.0"
+    ember-cli-babel "^7.26.11"
+    ember-cli-htmlbars "^6.0.1"
+
+"@hashicorp/flight-icons@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@hashicorp/flight-icons/-/flight-icons-2.2.0.tgz#32a9766ed108e01d27167f228ccf589e7afdf30d"
+  integrity sha512-PDGJa4CrF1bmVde049ffoxm5E/sdmBC0tQqVWZGSokQq4YMr4m9ZYW2BEM00JX0gouZBiXBlw3+npWDb0JGXhQ==
+
+"@hashicorp/structure-icons@^1.3.0":
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/@hashicorp/structure-icons/-/structure-icons-1.8.1.tgz#d29945df2b41dcb317b141e51a26bd4be796a164"
+  integrity sha512-XFYdCIshmaR3Igc8eWpOZ2Gr3IR/0TogXZ4PQ9bz1E9cLzF3njBcs3tCpJUOwRwe/wMI5YTlL/sOGvcZ77AB/Q==
+
+"@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.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
+  integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
+
+"@icholy/duration@^5.1.0":
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/@icholy/duration/-/duration-5.1.0.tgz#da193379e3a1b3107984c8bf22b4aa4ee7af1ef8"
+  integrity sha512-I/zdjC6qYdwWJ2H1/PZbI3g58pPIiI/eOe5XDTtQ/v36d0ogcvAylqwOIWj/teY1rBnIMzUyWfX7PMm9I67WWg==
+
+"@jridgewell/gen-mapping@^0.3.0":
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz#cf92a983c83466b8c0ce9124fadeaf09f7c66ea9"
+  integrity sha512-GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg==
+  dependencies:
+    "@jridgewell/set-array" "^1.0.0"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+    "@jridgewell/trace-mapping" "^0.3.9"
+
+"@jridgewell/resolve-uri@^3.0.3":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz#68eb521368db76d040a6315cdb24bf2483037b9c"
+  integrity sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew==
+
+"@jridgewell/set-array@^1.0.0":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.1.tgz#36a6acc93987adcf0ba50c66908bd0b70de8afea"
+  integrity sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ==
+
+"@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.11"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz#771a1d8d744eeb71b6adb35808e1a6c7b9b8c8ec"
+  integrity sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg==
+
+"@jridgewell/trace-mapping@^0.3.0":
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz#f6a0832dffd5b8a6aaa633b7d9f8e8e94c83a0c3"
+  integrity sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.0.3"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+
+"@jridgewell/trace-mapping@^0.3.7", "@jridgewell/trace-mapping@^0.3.9":
+  version "0.3.13"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz#dcfe3e95f224c8fe97a87a5235defec999aa92ea"
+  integrity sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.0.3"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+
+"@lint-todo/utils@^12.0.1":
+  version "12.0.1"
+  resolved "https://registry.yarnpkg.com/@lint-todo/utils/-/utils-12.0.1.tgz#d61ef329f9f6c7332adee7b1f68651f190d53a7f"
+  integrity sha512-Xiy5wN+ns95gEHepJ55TXEBAZrkZlzrF9wTjqoTgv+RYOYL3+qQ+v0RtPH2n/UwPJEFuXJ6QKiT99RnUOt1pzw==
+  dependencies:
+    "@types/eslint" "^7.2.13"
+    fs-extra "^9.1.0"
+    proper-lockfile "^4.1.2"
+    slash "^3.0.0"
+    tslib "^2.3.1"
+    upath "^2.0.1"
+
+"@mdn/browser-compat-data@^3.3.14":
+  version "3.3.14"
+  resolved "https://registry.yarnpkg.com/@mdn/browser-compat-data/-/browser-compat-data-3.3.14.tgz#b72a37c654e598f9ae6f8335faaee182bebc6b28"
+  integrity sha512-n2RC9d6XatVbWFdHLimzzUJxJ1KY8LdjqrW6YvGPiRmsHkhOUx74/Ct10x5Yo7bC/Jvqx7cDEW8IMPv/+vwEzA==
+
+"@mdn/browser-compat-data@^4.1.5":
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/@mdn/browser-compat-data/-/browser-compat-data-4.2.1.tgz#1fead437f3957ceebe2e8c3f46beccdb9bc575b8"
+  integrity sha512-EWUguj2kd7ldmrF9F+vI5hUOralPd+sdsUnYbRy33vZTuZkduC1shE9TtEMEjAQwyfyMb4ole5KtjF8MsnQOlA==
+
+"@miragejs/pretender-node-polyfill@^0.1.0":
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/@miragejs/pretender-node-polyfill/-/pretender-node-polyfill-0.1.2.tgz#d26b6b7483fb70cd62189d05c95d2f67153e43f2"
+  integrity sha512-M/BexG/p05C5lFfMunxo/QcgIJnMT2vDVCd00wNqK2ImZONIlEETZwWJu1QtLxtmYlSHlCFl3JNzp0tLe7OJ5g==
+
+"@nodelib/fs.scandir@2.1.4":
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69"
+  integrity sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==
+  dependencies:
+    "@nodelib/fs.stat" "2.0.4"
+    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.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==
+  dependencies:
+    "@nodelib/fs.scandir" "2.1.4"
+    fastq "^1.6.0"
+
+"@rollup/plugin-replace@2.3.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-2.3.0.tgz#86d88746383e40dd81cffb5216449cc51a734eb9"
+  integrity sha512-rzWAMqXAHC1w3eKpK6LxRqiF4f3qVFaa1sGii6Bp3rluKcwHNOpPt+hWRCmAH6SDEPtbPiLFf0pfNQyHs6Btlg==
+  dependencies:
+    magic-string "^0.25.2"
+    rollup-pluginutils "^2.6.0"
+
+"@simple-dom/interface@^1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@simple-dom/interface/-/interface-1.4.0.tgz#e8feea579232017f89b0138e2726facda6fbb71f"
+  integrity sha512-l5qumKFWU0S+4ZzMaLXFU8tQZsicHEMEyAxI5kDFGhJsRqDwe0a7/iPA/GdxlGyDKseQQAgIz5kzU7eXTrlSpA==
+
+"@sinonjs/commons@^1", "@sinonjs/commons@^1.3.0", "@sinonjs/commons@^1.4.0", "@sinonjs/commons@^1.7.0":
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d"
+  integrity sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==
+  dependencies:
+    type-detect "4.0.8"
+
+"@sinonjs/formatio@^3.2.1":
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/@sinonjs/formatio/-/formatio-3.2.2.tgz#771c60dfa75ea7f2d68e3b94c7e888a78781372c"
+  integrity sha512-B8SEsgd8gArBLMD6zpRw3juQ2FVSsmdd7qlevyDqzS9WTCtvF55/gAL+h6gue8ZvPYcdiPdvueM/qm//9XzyTQ==
+  dependencies:
+    "@sinonjs/commons" "^1"
+    "@sinonjs/samsam" "^3.1.0"
+
+"@sinonjs/samsam@^3.1.0", "@sinonjs/samsam@^3.3.3":
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-3.3.3.tgz#46682efd9967b259b81136b9f120fd54585feb4a"
+  integrity sha512-bKCMKZvWIjYD0BLGnNrxVuw4dkWCYsLqFOUWw8VgKF/+5Y+mE7LfHWPIYoDXowH+3a9LsWDMo0uAP8YDosPvHQ==
+  dependencies:
+    "@sinonjs/commons" "^1.3.0"
+    array-from "^2.1.1"
+    lodash "^4.17.15"
+
+"@sinonjs/text-encoding@^0.7.1":
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz#8da5c6530915653f3a1f38fd5f101d8c3f8079c5"
+  integrity sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==
+
+"@textlint/ast-node-types@^12.1.1":
+  version "12.1.1"
+  resolved "https://registry.yarnpkg.com/@textlint/ast-node-types/-/ast-node-types-12.1.1.tgz#189cdc932a50b9dd14b6829848408c22bb72f976"
+  integrity sha512-5/XK9S1177UYetOY6407o1RDuNVndaYfuzsZwhmo52V367s4ZuUD2064WhbmCd6TPyKD4dVr2zoWjfNDfzUZQg==
+
+"@textlint/markdown-to-ast@^12.1.1":
+  version "12.1.1"
+  resolved "https://registry.yarnpkg.com/@textlint/markdown-to-ast/-/markdown-to-ast-12.1.1.tgz#08f67f48e5d9fba34dec4c5102df2674dc94afc2"
+  integrity sha512-TmqFyNqi68YpkqKabrkMlPzeSJMfY/+Wsv1/r43uDFgSYyM9GiD0eIpP12uKyL8xLW+rgfbqXxeFwSo26Conqw==
+  dependencies:
+    "@textlint/ast-node-types" "^12.1.1"
+    debug "^4.3.3"
+    remark-footnotes "^3.0.0"
+    remark-frontmatter "^3.0.0"
+    remark-gfm "^1.0.0"
+    remark-parse "^9.0.0"
+    traverse "^0.6.6"
+    unified "^9.2.2"
+
+"@types/acorn@^4.0.3":
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/@types/acorn/-/acorn-4.0.5.tgz#e29fdf884695e77be4e99e67d748f5147255752d"
+  integrity sha512-603sPiZ4GVRHPvn6vNgEAvJewKsy+zwRWYS2MeIMemgoAtcjlw2G3lALxrb9OPA17J28bkB71R33yXlQbUatCA==
+  dependencies:
+    "@types/estree" "*"
+
+"@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==
+  dependencies:
+    "@types/connect" "*"
+    "@types/node" "*"
+
+"@types/broccoli-plugin@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/broccoli-plugin/-/broccoli-plugin-3.0.0.tgz#290fda2270c47a568edfd0cefab8bb840d8bb7b2"
+  integrity sha512-f+TcsARR2PovfFRKFdCX0kfH/QoM3ZVD2h1rl2mNvrKO0fq2uBNCBsTU3JanfU4COCt5cXpTfARyUsERlC8vIw==
+  dependencies:
+    broccoli-plugin "*"
+
+"@types/chai-as-promised@^7.1.2":
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/@types/chai-as-promised/-/chai-as-promised-7.1.3.tgz#779166b90fda611963a3adbfd00b339d03b747bd"
+  integrity sha512-FQnh1ohPXJELpKhzjuDkPLR2BZCAqed+a6xV4MI/T3XzHfd2FlarfUGUdZYgqYe8oxkYn0fchHEeHfHqdZ96sg==
+  dependencies:
+    "@types/chai" "*"
+
+"@types/chai@*", "@types/chai@^4.2.9":
+  version "4.2.17"
+  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.2.17.tgz#85f9f0610f514b22a94125d441f73eef65bde5cc"
+  integrity sha512-LaiwWNnYuL8xJlQcE91QB2JoswWZckq9A4b+nMPq8dt8AP96727Nb3X4e74u+E3tm4NLTILNI9MYFsyVc30wSA==
+
+"@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==
+  dependencies:
+    "@types/node" "*"
+
+"@types/eslint-scope@^3.7.3":
+  version "3.7.3"
+  resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.3.tgz#125b88504b61e3c8bc6f870882003253005c3224"
+  integrity sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==
+  dependencies:
+    "@types/eslint" "*"
+    "@types/estree" "*"
+
+"@types/eslint-visitor-keys@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#1ee30d79544ca84d68d4b3cdb0af4f205663dd2d"
+  integrity sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==
+
+"@types/eslint@*":
+  version "8.4.3"
+  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.3.tgz#5c92815a3838b1985c90034cd85f26f59d9d0ece"
+  integrity sha512-YP1S7YJRMPs+7KZKDb9G63n8YejIwW9BALq7a5j2+H4yl6iOv9CB29edho+cuFRrvmJbbaH2yiVChKLJVysDGw==
+  dependencies:
+    "@types/estree" "*"
+    "@types/json-schema" "*"
+
+"@types/eslint@^7.2.13":
+  version "7.29.0"
+  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.29.0.tgz#e56ddc8e542815272720bb0b4ccc2aff9c3e1c78"
+  integrity sha512-VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng==
+  dependencies:
+    "@types/estree" "*"
+    "@types/json-schema" "*"
+
+"@types/estree@*":
+  version "0.0.47"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.47.tgz#d7a51db20f0650efec24cd04994f523d93172ed4"
+  integrity sha512-c5ciR06jK8u9BstrmJyO97m+klJrrhCf9u3rLu3DEAJBirxRqSCvDQoYKmxuYwQI5SZChAWu+tq9oVlGRuzPAg==
+
+"@types/estree@^0.0.51":
+  version "0.0.51"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40"
+  integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==
+
+"@types/express-serve-static-core@^4.17.18":
+  version "4.17.19"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.19.tgz#00acfc1632e729acac4f1530e9e16f6dd1508a1d"
+  integrity sha512-DJOSHzX7pCiSElWaGR8kCprwibCB/3yW6vcT8VG3P0SJjnv19gnWG/AZMfM60Xj/YJIp/YCaDHyvzsFVeniARA==
+  dependencies:
+    "@types/node" "*"
+    "@types/qs" "*"
+    "@types/range-parser" "*"
+
+"@types/express@^4.17.2":
+  version "4.17.11"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.11.tgz#debe3caa6f8e5fcda96b47bd54e2f40c4ee59545"
+  integrity sha512-no+R6rW60JEc59977wIxreQVsIEOAYwgCqldrA/vkpCnbD7MqTefO97lmoBe4WE0F156bC4uLSP1XHDOySnChg==
+  dependencies:
+    "@types/body-parser" "*"
+    "@types/express-serve-static-core" "^4.17.18"
+    "@types/qs" "*"
+    "@types/serve-static" "*"
+
+"@types/fs-extra@^5.0.5":
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-5.1.0.tgz#2a325ef97901504a3828718c390d34b8426a10a1"
+  integrity sha512-AInn5+UBFIK9FK5xc9yP5e3TQSPNNgjHByqYcj9g5elVBnDQcQL7PlO1CIRy2gWlbwK7UPYqi7vRvFA44dCmYQ==
+  dependencies:
+    "@types/node" "*"
+
+"@types/fs-extra@^8.1.0":
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-8.1.1.tgz#1e49f22d09aa46e19b51c0b013cb63d0d923a068"
+  integrity sha512-TcUlBem321DFQzBNuz8p0CLLKp0VvF/XH9E4KHNmgwyp4E3AfgI5cjiIVZWlbfThBop2qxFIh4+LeY6hVWWZ2w==
+  dependencies:
+    "@types/node" "*"
+
+"@types/glob@*":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb"
+  integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==
+  dependencies:
+    "@types/minimatch" "*"
+    "@types/node" "*"
+
+"@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==
+  dependencies:
+    "@types/minimatch" "*"
+    "@types/node" "*"
+
+"@types/json-schema@*", "@types/json-schema@^7.0.5":
+  version "7.0.9"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d"
+  integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==
+
+"@types/json-schema@^7.0.3":
+  version "7.0.7"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad"
+  integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==
+
+"@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
+  version "7.0.11"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
+  integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
+
+"@types/mdast@^3.0.0":
+  version "3.0.10"
+  resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.10.tgz#4724244a82a4598884cbbe9bcfd73dff927ee8af"
+  integrity sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA==
+  dependencies:
+    "@types/unist" "*"
+
+"@types/mime@^1":
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
+  integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==
+
+"@types/minimatch@*", "@types/minimatch@^3.0.3", "@types/minimatch@^3.0.4":
+  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.2"
+  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
+  integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
+
+"@types/node@*":
+  version "16.11.11"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.11.tgz#6ea7342dfb379ea1210835bada87b3c512120234"
+  integrity sha512-KB0sixD67CeecHC33MYn+eYARkqTheIRNuu97y2XMjR7Wu3XibO1vaY6VBV6O/a89SPI81cEUIYT87UqUWlZNw==
+
+"@types/node@^12.0.2":
+  version "12.20.11"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.11.tgz#980832cd56efafff8c18aa148c4085eb02a483f4"
+  integrity sha512-gema+apZ6qLQK7k7F0dGkGCWQYsL0qqKORWOQO6tq46q+x+1C0vbOiOqOwRVlh4RAdbQwV/j/ryr3u5NOG1fPQ==
+
+"@types/node@^9.6.0":
+  version "9.6.61"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.61.tgz#29f124eddd41c4c74281bd0b455d689109fc2a2d"
+  integrity sha512-/aKAdg5c8n468cYLy2eQrcR5k6chlbNwZNGUj3TboyPa2hcO2QAJcfymlqPzMiRj8B6nYKXjzQz36minFE0RwQ==
+
+"@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==
+
+"@types/parse-json@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
+  integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
+
+"@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.6"
+  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.6.tgz#df9c3c8b31a247ec315e6996566be3171df4b3b1"
+  integrity sha512-0/HnwIfW4ki2D8L8c9GVcG5I72s9jP5GSLVF0VIXDW00kmIpA6O33G7a8n59Tmh7Nz0WUC3rSb7PTY/sdW2JzA==
+
+"@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==
+
+"@types/rimraf@^2.0.2":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-2.0.5.tgz#368fb04d59630b727fc05a74d2ca557f64a8ef98"
+  integrity sha512-YyP+VfeaqAyFmXoTh3HChxOQMyjByRMsHU7kc5KOJkSlXudhMhQIALbYV7rHh/l8d2lX3VUQzprrcAgWdRuU8g==
+  dependencies:
+    "@types/glob" "*"
+    "@types/node" "*"
+
+"@types/rimraf@^2.0.3":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-2.0.4.tgz#403887b0b53c6100a6c35d2ab24f6ccc042fec46"
+  integrity sha512-8gBudvllD2A/c0CcEX/BivIDorHFt5UI5m46TsNj8DjWCCTTZT74kEe4g+QsY7P/B9WdO98d82zZgXO/RQzu2Q==
+  dependencies:
+    "@types/glob" "*"
+    "@types/node" "*"
+
+"@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==
+  dependencies:
+    "@types/mime" "^1"
+    "@types/node" "*"
+
+"@types/symlink-or-copy@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@types/symlink-or-copy/-/symlink-or-copy-1.2.0.tgz#4151a81b4052c80bc2becbae09f3a9ec010a9c7a"
+  integrity sha512-Lja2xYuuf2B3knEsga8ShbOdsfNOtzT73GyJmZyY7eGl2+ajOqrs8yM5ze0fsSoYwvA6bw7/Qr7OZ7PEEmYwWg==
+
+"@types/tmp@^0.0.33":
+  version "0.0.33"
+  resolved "https://registry.yarnpkg.com/@types/tmp/-/tmp-0.0.33.tgz#1073c4bc824754ae3d10cfab88ab0237ba964e4d"
+  integrity sha1-EHPEvIJHVK49EM+riKsCN7qWTk0=
+
+"@types/unist@*", "@types/unist@^2.0.0", "@types/unist@^2.0.2":
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.6.tgz#250a7b16c3b91f672a24552ec64678eeb1d3a08d"
+  integrity sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==
+
+"@typescript-eslint/experimental-utils@1.13.0":
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-1.13.0.tgz#b08c60d780c0067de2fb44b04b432f540138301e"
+  integrity sha512-zmpS6SyqG4ZF64ffaJ6uah6tWWWgZ8m+c54XXgwFtUv0jNz8aJAVx8chMCvnk7yl6xwn8d+d96+tWp7fXzTuDg==
+  dependencies:
+    "@types/json-schema" "^7.0.3"
+    "@typescript-eslint/typescript-estree" "1.13.0"
+    eslint-scope "^4.0.0"
+
+"@typescript-eslint/parser@^1.10.2":
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-1.13.0.tgz#61ac7811ea52791c47dc9fd4dd4a184fae9ac355"
+  integrity sha512-ITMBs52PCPgLb2nGPoeT4iU3HdQZHcPaZVw+7CsFagRJHUhyeTgorEwHXhFf3e7Evzi8oujKNpHc8TONth8AdQ==
+  dependencies:
+    "@types/eslint-visitor-keys" "^1.0.0"
+    "@typescript-eslint/experimental-utils" "1.13.0"
+    "@typescript-eslint/typescript-estree" "1.13.0"
+    eslint-visitor-keys "^1.0.0"
+
+"@typescript-eslint/typescript-estree@1.13.0":
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-1.13.0.tgz#8140f17d0f60c03619798f1d628b8434913dc32e"
+  integrity sha512-b5rCmd2e6DCC6tCTN9GSUAuxdYwCM/k/2wdjHGrIRGPSJotWMCe/dGpi66u42bhuh8q3QBzqM4TMA1GUUCJvdw==
+  dependencies:
+    lodash.unescape "4.0.1"
+    semver "5.5.0"
+
+"@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/ast@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964"
+  integrity sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==
+  dependencies:
+    "@webassemblyjs/helper-module-context" "1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+    "@webassemblyjs/wast-parser" "1.9.0"
+
+"@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/floating-point-hex-parser@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz#3c3d3b271bddfc84deb00f71344438311d52ffb4"
+  integrity sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==
+
+"@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-api-error@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz#203f676e333b96c9da2eeab3ccef33c45928b6a2"
+  integrity sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==
+
+"@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-buffer@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz#a1442d269c5feb23fcbc9ef759dac3547f29de00"
+  integrity sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==
+
+"@webassemblyjs/helper-code-frame@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz#647f8892cd2043a82ac0c8c5e75c36f1d9159f27"
+  integrity sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==
+  dependencies:
+    "@webassemblyjs/wast-printer" "1.9.0"
+
+"@webassemblyjs/helper-fsm@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz#c05256b71244214671f4b08ec108ad63b70eddb8"
+  integrity sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==
+
+"@webassemblyjs/helper-module-context@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz#25d8884b76839871a08a6c6f806c3979ef712f07"
+  integrity sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==
+  dependencies:
+    "@webassemblyjs/ast" "1.9.0"
+
+"@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.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-bytecode@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz#4fed8beac9b8c14f8c58b70d124d549dd1fe5790"
+  integrity sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==
+
+"@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.1"
+    "@webassemblyjs/helper-buffer" "1.11.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
+    "@webassemblyjs/wasm-gen" "1.11.1"
+
+"@webassemblyjs/helper-wasm-section@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz#5a4138d5a6292ba18b04c5ae49717e4167965346"
+  integrity sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==
+  dependencies:
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-buffer" "1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+    "@webassemblyjs/wasm-gen" "1.9.0"
+
+"@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/ieee754@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz#15c7a0fbaae83fb26143bbacf6d6df1702ad39e4"
+  integrity sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==
+  dependencies:
+    "@xtuc/ieee754" "^1.2.0"
+
+"@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/leb128@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.9.0.tgz#f19ca0b76a6dc55623a09cffa769e838fa1e1c95"
+  integrity sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==
+  dependencies:
+    "@xtuc/long" "4.2.2"
+
+"@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/utf8@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.9.0.tgz#04d33b636f78e6a6813227e82402f7637b6229ab"
+  integrity sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==
+
+"@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-edit@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz#3fe6d79d3f0f922183aa86002c42dd256cfee9cf"
+  integrity sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==
+  dependencies:
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-buffer" "1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+    "@webassemblyjs/helper-wasm-section" "1.9.0"
+    "@webassemblyjs/wasm-gen" "1.9.0"
+    "@webassemblyjs/wasm-opt" "1.9.0"
+    "@webassemblyjs/wasm-parser" "1.9.0"
+    "@webassemblyjs/wast-printer" "1.9.0"
+
+"@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-gen@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz#50bc70ec68ded8e2763b01a1418bf43491a7a49c"
+  integrity sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==
+  dependencies:
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+    "@webassemblyjs/ieee754" "1.9.0"
+    "@webassemblyjs/leb128" "1.9.0"
+    "@webassemblyjs/utf8" "1.9.0"
+
+"@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-opt@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz#2211181e5b31326443cc8112eb9f0b9028721a61"
+  integrity sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==
+  dependencies:
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-buffer" "1.9.0"
+    "@webassemblyjs/wasm-gen" "1.9.0"
+    "@webassemblyjs/wasm-parser" "1.9.0"
+
+"@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/wasm-parser@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz#9d48e44826df4a6598294aa6c87469d642fff65e"
+  integrity sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==
+  dependencies:
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-api-error" "1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+    "@webassemblyjs/ieee754" "1.9.0"
+    "@webassemblyjs/leb128" "1.9.0"
+    "@webassemblyjs/utf8" "1.9.0"
+
+"@webassemblyjs/wast-parser@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz#3031115d79ac5bd261556cecc3fa90a3ef451914"
+  integrity sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==
+  dependencies:
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/floating-point-hex-parser" "1.9.0"
+    "@webassemblyjs/helper-api-error" "1.9.0"
+    "@webassemblyjs/helper-code-frame" "1.9.0"
+    "@webassemblyjs/helper-fsm" "1.9.0"
+    "@xtuc/long" "4.2.2"
+
+"@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"
+
+"@webassemblyjs/wast-printer@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz#4935d54c85fef637b00ce9f52377451d00d47899"
+  integrity sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==
+  dependencies:
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/wast-parser" "1.9.0"
+    "@xtuc/long" "4.2.2"
+
+"@xtuc/ieee754@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
+  integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
+
+"@xtuc/long@4.2.2":
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
+  integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
+
+JSV@^4.0.x:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/JSV/-/JSV-4.0.2.tgz#d077f6825571f82132f9dffaed587b4029feff57"
+  integrity sha1-0Hf2glVx+CEy+d/67Vh7QCn+/1c=
+
+abab@^2.0.3, abab@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a"
+  integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==
+
+abbrev@1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
+
+abortcontroller-polyfill@^1.7.3:
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/abortcontroller-polyfill/-/abortcontroller-polyfill-1.7.3.tgz#1b5b487bd6436b5b764fd52a612509702c3144b5"
+  integrity sha512-zetDJxd89y3X99Kvo4qFx8GKlt6GsvN3UcRZHwU6iFA/0KiOmhkTVhe8oRoTBiTVPZu09x3vCra47+w8Yz1+2Q==
+
+accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
+  integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
+  dependencies:
+    mime-types "~2.1.24"
+    negotiator "0.6.2"
+
+acorn-dynamic-import@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz#901ceee4c7faaef7e07ad2a47e890675da50a278"
+  integrity sha512-zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg==
+  dependencies:
+    acorn "^5.0.0"
+
+acorn-globals@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45"
+  integrity sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==
+  dependencies:
+    acorn "^7.1.1"
+    acorn-walk "^7.1.1"
+
+acorn-import-assertions@^1.7.6:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9"
+  integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==
+
+acorn-jsx@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"
+  integrity sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=
+  dependencies:
+    acorn "^3.0.4"
+
+acorn-jsx@^5.0.0, acorn-jsx@^5.3.1:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b"
+  integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==
+
+acorn-walk@^7.1.1:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
+  integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
+
+acorn@^3.0.4:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
+  integrity sha1-ReN/s56No/JbruP/U2niu18iAXo=
+
+acorn@^5.0.0, acorn@^5.1.1, acorn@^5.5.0, acorn@^5.5.3:
+  version "5.7.4"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e"
+  integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==
+
+acorn@^6.0.7, acorn@^6.4.1:
+  version "6.4.2"
+  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.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.1.0:
+  version "8.2.2"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.2.2.tgz#c4574e4fea298d6e6ed4b85ab844b06dd59f26d6"
+  integrity sha512-VrMS8kxT0e7J1EX0p6rI/E0FbfOVcvBpbIqHThFv+f8YrZIlMfVotYcXKVPmTvPW8sW5miJzfUFrrvthUZg8VQ==
+
+acorn@^8.4.1, 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==
+
+after@0.8.2:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
+  integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=
+
+agent-base@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
+  integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==
+  dependencies:
+    es6-promisify "^5.0.0"
+
+aggregate-error@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
+  integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
+  dependencies:
+    clean-stack "^2.0.0"
+    indent-string "^4.0.0"
+
+ajv-errors@^1.0.0:
+  version "1.0.1"
+  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.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520"
+  integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==
+  dependencies:
+    ajv "^8.0.0"
+
+ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
+  integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
+
+ajv-keywords@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16"
+  integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==
+  dependencies:
+    fast-deep-equal "^3.1.3"
+
+ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5, ajv@^6.9.1:
+  version "6.12.6"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
+  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
+ajv@^8.0.0, ajv@^8.8.0:
+  version "8.11.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.0.tgz#977e91dd96ca669f54a11e23e378e33b884a565f"
+  integrity sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==
+  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@^8.0.1:
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.2.0.tgz#c89d3380a784ce81b2085f48811c4c101df4c602"
+  integrity sha512-WSNGFuyWd//XO8n/m/EaOlNLtO0yL8EXT/74LqT4khdhpZjP7lkj/kT5uwRmGitKEVp/Oj7ZUHeGfPtgHhQ5CA==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    json-schema-traverse "^1.0.0"
+    require-from-string "^2.0.2"
+    uri-js "^4.2.2"
+
+amd-name-resolver@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/amd-name-resolver/-/amd-name-resolver-1.2.0.tgz#fc41b3848824b557313897d71f8d5a0184fbe679"
+  integrity sha512-hlSTWGS1t6/xq5YCed7YALg7tKZL3rkl7UwEZ/eCIkn8JxmM6fU6Qs/1hwtjQqfuYxlffuUcgYEm0f5xP4YKaA==
+  dependencies:
+    ensure-posix-path "^1.0.1"
+
+amd-name-resolver@1.3.1, amd-name-resolver@^1.2.0, amd-name-resolver@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/amd-name-resolver/-/amd-name-resolver-1.3.1.tgz#ffe71c683c6e7191fc4ae1bb3aaed15abea135d9"
+  integrity sha512-26qTEWqZQ+cxSYygZ4Cf8tsjDBLceJahhtewxtKZA3SRa4PluuqYCuheemDQD+7Mf5B7sr+zhTDWAHDh02a1Dw==
+  dependencies:
+    ensure-posix-path "^1.0.1"
+    object-hash "^1.3.1"
+
+amd-name-resolver@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/amd-name-resolver/-/amd-name-resolver-0.0.6.tgz#d3e4ba2dfcaab1d820c1be9de947c67828cfe595"
+  integrity sha1-0+S6Lfyqsdggwb6d6UfGeCjP5ZU=
+  dependencies:
+    ensure-posix-path "^1.0.1"
+
+amdefine@>=0.0.4:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
+  integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
+
+anchor-markdown-header@^0.5.7:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/anchor-markdown-header/-/anchor-markdown-header-0.5.7.tgz#045063d76e6a1f9cd327a57a0126aa0fdec371a7"
+  integrity sha512-AmikqcK15r3q99hPvTa1na9n3eLkW0uE+RL9BZMSgwYalQeDnNXbYrN06BIcBPfGlmsGIE2jvkuvl/x0hyPF5Q==
+  dependencies:
+    emoji-regex "~6.1.0"
+
+ansi-colors@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
+  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
+
+ansi-escapes@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
+  integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
+
+ansi-escapes@^4.2.1, ansi-escapes@^4.3.0:
+  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.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-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"
+  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
+
+ansi-regex@^5.0.0:
+  version "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"
+  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
+
+ansi-styles@^3.0.0, ansi-styles@^3.2.0, ansi-styles@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
+  dependencies:
+    color-convert "^1.9.0"
+
+ansi-styles@^4.0.0, ansi-styles@^4.1.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
+  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
+  dependencies:
+    color-convert "^2.0.1"
+
+ansi-styles@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.0.0.tgz#cb102df1c56f5123eab8b67cd7b98027a0279178"
+  integrity sha1-yxAt8cVvUSPquLZ817mAJ6AnkXg=
+
+ansi-to-html@^0.6.15, ansi-to-html@^0.6.6:
+  version "0.6.15"
+  resolved "https://registry.yarnpkg.com/ansi-to-html/-/ansi-to-html-0.6.15.tgz#ac6ad4798a00f6aa045535d7f6a9cb9294eebea7"
+  integrity sha512-28ijx2aHJGdzbs+O5SNQF65r6rrKYnkuwTYm8lZlChuoJ9P1vVzIpWO20sQTqTPDXYp6NFwk326vApTtLVFXpQ==
+  dependencies:
+    entities "^2.0.0"
+
+ansicolors@~0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.2.1.tgz#be089599097b74a5c9c4a84a0cdbcdb62bd87aef"
+  integrity sha1-vgiVmQl7dKXJxKhKDNvNtivYeu8=
+
+anymatch@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
+  integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==
+  dependencies:
+    micromatch "^3.1.4"
+    normalize-path "^2.1.1"
+
+anymatch@~3.1.1:
+  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"
+
+aproba@^1.0.3, aproba@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
+  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
+
+are-we-there-yet@~1.1.2:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
+  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
+  dependencies:
+    delegates "^1.0.0"
+    readable-stream "^2.0.6"
+
+argparse@^1.0.7:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
+  dependencies:
+    sprintf-js "~1.0.2"
+
+argparse@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
+  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
+
+aria-query@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.0.0.tgz#210c21aaf469613ee8c9a62c7f86525e058db52c"
+  integrity sha512-V+SM7AbUwJ+EBnB8+DXs0hPZHO0W6pqBcc0dW90OwtVG02PswOu/teuARoLQjdDOH+t9pJgGnW5/Qmouf3gPJg==
+
+arr-diff@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
+
+arr-flatten@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
+
+arr-union@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
+
+array-equal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
+  integrity sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=
+
+array-flatten@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
+  integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
+
+array-from@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/array-from/-/array-from-2.1.1.tgz#cfe9d8c26628b9dc5aecc62a9f5d8f1f352c1195"
+  integrity sha1-z+nYwmYoudxa7MYqn12PHzUsEZU=
+
+array-to-error@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/array-to-error/-/array-to-error-1.1.1.tgz#d68812926d14097a205579a667eeaf1856a44c07"
+  integrity sha1-1ogSkm0UCXogVXmmZ+6vGFakTAc=
+  dependencies:
+    array-to-sentence "^1.1.0"
+
+array-to-sentence@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/array-to-sentence/-/array-to-sentence-1.1.0.tgz#c804956dafa53232495b205a9452753a258d39fc"
+  integrity sha1-yASVba+lMjJJWyBalFJ1OiWNOfw=
+
+array-union@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
+  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
+
+array-unique@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
+  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
+
+arraybuffer.slice@~0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
+  integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==
+
+arrify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+  integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
+
+arrify@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa"
+  integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==
+
+asn1.js@^5.2.0:
+  version "5.4.1"
+  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07"
+  integrity sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==
+  dependencies:
+    bn.js "^4.0.0"
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+    safer-buffer "^2.1.0"
+
+asn1@~0.2.3:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
+  integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
+  dependencies:
+    safer-buffer "~2.1.0"
+
+asn1js@^2.1.1, asn1js@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/asn1js/-/asn1js-2.2.0.tgz#d890fcdda86b8a005693df14a986bfb2c2069c57"
+  integrity sha512-oagLNqpfNv7CvmyMoexMDNyVDSiq1rya0AEUgcLlNHdHgNl6U/hi8xY370n5y+ZIFEXOx0J4B1qF2NDjMRxklA==
+  dependencies:
+    pvutils latest
+
+assert-never@^1.1.0, assert-never@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/assert-never/-/assert-never-1.2.1.tgz#11f0e363bf146205fb08193b5c7b90f4d1cf44fe"
+  integrity sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw==
+
+assert-plus@1.0.0, assert-plus@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
+
+assert@^1.1.1:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb"
+  integrity sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==
+  dependencies:
+    object-assign "^4.1.1"
+    util "0.10.3"
+
+assign-symbols@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
+
+ast-metadata-inferer@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/ast-metadata-inferer/-/ast-metadata-inferer-0.7.0.tgz#c45d874cbdecabea26dc5de11fc6fa1919807c66"
+  integrity sha512-OkMLzd8xelb3gmnp6ToFvvsHLtS6CbagTkFQvQ+ZYFe3/AIl9iKikNR9G7pY3GfOR/2Xc222hwBjzI7HLkE76Q==
+  dependencies:
+    "@mdn/browser-compat-data" "^3.3.14"
+
+ast-types@0.13.3:
+  version "0.13.3"
+  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.13.3.tgz#50da3f28d17bdbc7969a3a2d83a0e4a72ae755a7"
+  integrity sha512-XTZ7xGML849LkQP86sWdQzfhwbt3YwIO6MqbX9mUNYY98VKaaVZP7YNNm70IpwecbkkxmfC5IYAzOQ/2p29zRA==
+
+astral-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
+  integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
+
+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-disk-cache@^1.2.1:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/async-disk-cache/-/async-disk-cache-1.3.5.tgz#cc6206ed79bb6982b878fc52e0505e4f52b62a02"
+  integrity sha512-VZpqfR0R7CEOJZ/0FOTgWq70lCrZyS1rkI8PXugDUkTKyyAUgZ2zQ09gLhMkEn+wN8LYeUTPxZdXtlX/kmbXKQ==
+  dependencies:
+    debug "^2.1.3"
+    heimdalljs "^0.2.3"
+    istextorbinary "2.1.0"
+    mkdirp "^0.5.0"
+    rimraf "^2.5.3"
+    rsvp "^3.0.18"
+    username-sync "^1.0.2"
+
+async-disk-cache@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/async-disk-cache/-/async-disk-cache-2.1.0.tgz#e0f37b187ed8c41a5991518a9556d206ae2843a2"
+  integrity sha512-iH+boep2xivfD9wMaZWkywYIURSmsL96d6MoqrC94BnGSvXE4Quf8hnJiHGFYhw/nLeIa1XyRaf4vvcvkwAefg==
+  dependencies:
+    debug "^4.1.1"
+    heimdalljs "^0.2.3"
+    istextorbinary "^2.5.1"
+    mkdirp "^0.5.0"
+    rimraf "^3.0.0"
+    rsvp "^4.8.5"
+    username-sync "^1.0.2"
+
+async-each@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
+  integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
+
+async-foreach@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
+  integrity sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=
+
+async-promise-queue@^1.0.3, async-promise-queue@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/async-promise-queue/-/async-promise-queue-1.0.5.tgz#cb23bce9fce903a133946a700cc85f27f09ea49d"
+  integrity sha512-xi0aQ1rrjPWYmqbwr18rrSKbSaXIeIwSd1J4KAgVfkq8utNbdZoht7GfvfY6swFUAMJ9obkc4WPJmtGwl+B8dw==
+  dependencies:
+    async "^2.4.1"
+    debug "^2.6.8"
+
+async@^2.4.1, async@^2.6.2:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
+  integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
+  dependencies:
+    lodash "^4.17.14"
+
+async@~0.2.9:
+  version "0.2.10"
+  resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
+  integrity sha1-trvgsGdLnXGXCMo43owjfLUmw9E=
+
+asynckit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
+
+at-least-node@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
+  integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
+
+atob@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
+  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
+
+autoprefixer@^7.0.0:
+  version "7.2.6"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.2.6.tgz#256672f86f7c735da849c4f07d008abb056067dc"
+  integrity sha512-Iq8TRIB+/9eQ8rbGhcP7ct5cYb/3qjNYAR2SnzLCEcwF6rvVOax8+9+fccgXk4bEhQGjOZd5TLhsksmAdsbGqQ==
+  dependencies:
+    browserslist "^2.11.3"
+    caniuse-lite "^1.0.30000805"
+    normalize-range "^0.1.2"
+    num2fraction "^1.2.2"
+    postcss "^6.0.17"
+    postcss-value-parser "^3.2.3"
+
+autosize@^4.0.0:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/autosize/-/autosize-4.0.2.tgz#073cfd07c8bf45da4b9fd153437f5bafbba1e4c9"
+  integrity sha512-jnSyH2d+qdfPGpWlcuhGiHmqBJ6g3X+8T+iRwFrHPLVcdoGJE/x6Qicm6aDHfTsbgZKxyV8UU/YB2p4cjKDRRA==
+
+aws-sign2@~0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
+
+aws4@^1.8.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
+  integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
+
+babel-code-frame@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
+  integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=
+  dependencies:
+    chalk "^1.1.3"
+    esutils "^2.0.2"
+    js-tokens "^3.0.2"
+
+babel-core@^6.26.0, babel-core@^6.26.3:
+  version "6.26.3"
+  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207"
+  integrity sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==
+  dependencies:
+    babel-code-frame "^6.26.0"
+    babel-generator "^6.26.0"
+    babel-helpers "^6.24.1"
+    babel-messages "^6.23.0"
+    babel-register "^6.26.0"
+    babel-runtime "^6.26.0"
+    babel-template "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    convert-source-map "^1.5.1"
+    debug "^2.6.9"
+    json5 "^0.5.1"
+    lodash "^4.17.4"
+    minimatch "^3.0.4"
+    path-is-absolute "^1.0.1"
+    private "^0.1.8"
+    slash "^1.0.0"
+    source-map "^0.5.7"
+
+babel-eslint@^10.1.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz#6968e568a910b78fb3779cdd8b6ac2f479943232"
+  integrity sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    "@babel/parser" "^7.7.0"
+    "@babel/traverse" "^7.7.0"
+    "@babel/types" "^7.7.0"
+    eslint-visitor-keys "^1.0.0"
+    resolve "^1.12.0"
+
+babel-generator@^6.26.0:
+  version "6.26.1"
+  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90"
+  integrity sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==
+  dependencies:
+    babel-messages "^6.23.0"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    detect-indent "^4.0.0"
+    jsesc "^1.3.0"
+    lodash "^4.17.4"
+    source-map "^0.5.7"
+    trim-right "^1.0.1"
+
+babel-helper-builder-binary-assignment-operator-visitor@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz#cce4517ada356f4220bcae8a02c2b346f9a56664"
+  integrity sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=
+  dependencies:
+    babel-helper-explode-assignable-expression "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-call-delegate@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d"
+  integrity sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=
+  dependencies:
+    babel-helper-hoist-variables "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-define-map@^6.24.1:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz#a5f56dab41a25f97ecb498c7ebaca9819f95be5f"
+  integrity sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    lodash "^4.17.4"
+
+babel-helper-explode-assignable-expression@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz#f25b82cf7dc10433c55f70592d5746400ac22caa"
+  integrity sha1-8luCz33BBDPFX3BZLVdGQArCLKo=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-function-name@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9"
+  integrity sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=
+  dependencies:
+    babel-helper-get-function-arity "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-get-function-arity@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d"
+  integrity sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-hoist-variables@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz#1ecb27689c9d25513eadbc9914a73f5408be7a76"
+  integrity sha1-HssnaJydJVE+rbyZFKc/VAi+enY=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-optimise-call-expression@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257"
+  integrity sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-regex@^6.24.1:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz#325c59f902f82f24b74faceed0363954f6495e72"
+  integrity sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=
+  dependencies:
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    lodash "^4.17.4"
+
+babel-helper-remap-async-to-generator@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz#5ec581827ad723fecdd381f1c928390676e4551b"
+  integrity sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-replace-supers@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a"
+  integrity sha1-v22/5Dk40XNpohPKiov3S2qQqxo=
+  dependencies:
+    babel-helper-optimise-call-expression "^6.24.1"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helpers@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2"
+  integrity sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-import-util@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-0.2.0.tgz#b468bb679919601a3570f9e317536c54f2862e23"
+  integrity sha512-CtWYYHU/MgK88rxMrLfkD356dApswtR/kWZ/c6JifG1m10e7tBBrs/366dFzWMAoqYmG5/JSh+94tUSpIwh+ag==
+
+babel-import-util@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-1.1.0.tgz#4156b16ef090c4f0d3cdb869ff799202f24aeb93"
+  integrity sha512-sfzgAiJsUT1es9yrHAuJZuJfBkkOE7Og6rovAIwK/gNJX6MjDfWTprbPngdJZTd5ye4F3FvpvpQmvKXObRzVYA==
+
+babel-loader@^8.0.6:
+  version "8.2.2"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.2.tgz#9363ce84c10c9a40e6c753748e1441b60c8a0b81"
+  integrity sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g==
+  dependencies:
+    find-cache-dir "^3.3.1"
+    loader-utils "^1.4.0"
+    make-dir "^3.1.0"
+    schema-utils "^2.6.5"
+
+babel-loader@^8.1.0:
+  version "8.2.3"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.3.tgz#8986b40f1a64cacfcb4b8429320085ef68b1342d"
+  integrity sha512-n4Zeta8NC3QAsuyiizu0GkmRcQ6clkV9WFUnUf1iXP//IeSKbWjofW3UHyZVwlOB4y039YQKefawyTn64Zwbuw==
+  dependencies:
+    find-cache-dir "^3.3.1"
+    loader-utils "^1.4.0"
+    make-dir "^3.1.0"
+    schema-utils "^2.6.5"
+
+babel-messages@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
+  integrity sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-check-es2015-constants@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a"
+  integrity sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-compact-reexports@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-compact-reexports/-/babel-plugin-compact-reexports-1.1.0.tgz#d329cf70ff882e1b3c916da15b312338caf29490"
+  integrity sha512-+KgjNJ5yMeZzJxYZdLEy9m82m92aL7FLvNJcK6dYJbW06t+UTpFJ2FVSs35zMfURcPnrQELYhLG4VC+kt/4gvw==
+
+babel-plugin-debug-macros@^0.2.0, babel-plugin-debug-macros@^0.2.0-beta.6:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.2.0.tgz#0120ac20ce06ccc57bf493b667cf24b85c28da7a"
+  integrity sha512-Wpmw4TbhR3Eq2t3W51eBAQSdKlr+uAyF0GI4GtPfMCD12Y4cIdpKC9l0RjNTH/P9isFypSqqewMPm7//fnZlNA==
+  dependencies:
+    semver "^5.3.0"
+
+babel-plugin-debug-macros@^0.3.3, babel-plugin-debug-macros@^0.3.4:
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.3.4.tgz#22961d0cb851a80654cece807a8b4b73d85c6075"
+  integrity sha512-wfel/vb3pXfwIDZUrkoDrn5FHmlWI96PCJ3UCDv2a86poJ3EQrnArNW5KfHSVJ9IOgxHbo748cQt7sDU+0KCEw==
+  dependencies:
+    semver "^5.3.0"
+
+babel-plugin-dynamic-import-node@^2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3"
+  integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==
+  dependencies:
+    object.assign "^4.1.0"
+
+babel-plugin-ember-data-packages-polyfill@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-ember-data-packages-polyfill/-/babel-plugin-ember-data-packages-polyfill-0.1.2.tgz#21154c095ddc703722b1fb8bb06c126c0b6d77dc"
+  integrity sha512-kTHnOwoOXfPXi00Z8yAgyD64+jdSXk3pknnS7NlqnCKAU6YDkXZ4Y7irl66kaZjZn0FBBt0P4YOZFZk85jYOww==
+  dependencies:
+    "@ember-data/rfc395-data" "^0.0.4"
+
+babel-plugin-ember-modules-api-polyfill@^2.6.0:
+  version "2.13.4"
+  resolved "https://registry.yarnpkg.com/babel-plugin-ember-modules-api-polyfill/-/babel-plugin-ember-modules-api-polyfill-2.13.4.tgz#cf62bc9bfd808c48d810d5194f4329e9453bd603"
+  integrity sha512-uxQPkEQAzCYdwhZk16O9m1R4xtCRNy4oEUTBrccOPfzlIahRZJic/JeP/ZEL0BC6Mfq6r55eOg6gMF/zdFoCvA==
+  dependencies:
+    ember-rfc176-data "^0.3.13"
+
+babel-plugin-ember-modules-api-polyfill@^3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-ember-modules-api-polyfill/-/babel-plugin-ember-modules-api-polyfill-3.5.0.tgz#27b6087fac75661f779f32e60f94b14d0e9f6965"
+  integrity sha512-pJajN/DkQUnStw0Az8c6khVcMQHgzqWr61lLNtVeu0g61LRW0k9jyK7vaedrHDWGe/Qe8sxG5wpiyW9NsMqFzA==
+  dependencies:
+    ember-rfc176-data "^0.3.17"
+
+babel-plugin-ember-template-compilation@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-ember-template-compilation/-/babel-plugin-ember-template-compilation-1.0.1.tgz#64baf434ff1b751c6292936f8b9eb75a2f8149dc"
+  integrity sha512-V/kY6CDyUNrl5Kx6UPKUPhzSKNfdrxNii+S5zK4dgJvVyoxFv7Ykg06Ct/yskY0LkA4wUPdYN7JOBtYJwHk2sg==
+  dependencies:
+    babel-import-util "^0.2.0"
+    line-column "^1.0.2"
+    magic-string "^0.25.7"
+    string.prototype.matchall "^4.0.5"
+
+babel-plugin-filter-imports@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-filter-imports/-/babel-plugin-filter-imports-4.0.0.tgz#068f8da15236a96a9602c36dc6f4a6eeca70a4f4"
+  integrity sha512-jDLlxI8QnfKd7PtieH6pl4tZJzymzfCDCPGdTq/grgbiYAikwDPp/oL0IlFJn0HQjLpcLkyYhPKkUVneRESw5w==
+  dependencies:
+    "@babel/types" "^7.7.2"
+    lodash "^4.17.15"
+
+babel-plugin-htmlbars-inline-precompile@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-3.2.0.tgz#c4882ea875d0f5683f0d91c1f72e29a4f14b5606"
+  integrity sha512-IUeZmgs9tMUGXYu1vfke5I18yYJFldFGdNFQOWslXTnDWXzpwPih7QFduUqvT+awDpDuNtXpdt5JAf43Q1Hhzg==
+
+babel-plugin-htmlbars-inline-precompile@^5.0.0, babel-plugin-htmlbars-inline-precompile@^5.2.1, babel-plugin-htmlbars-inline-precompile@^5.3.0:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-5.3.1.tgz#5ba272e2e4b6221522401f5f1d98a73b1de38787"
+  integrity sha512-QWjjFgSKtSRIcsBhJmEwS2laIdrA6na8HAlc/pEAhjHgQsah/gMiBFRZvbQTy//hWxR4BMwV7/Mya7q5H8uHeA==
+  dependencies:
+    babel-plugin-ember-modules-api-polyfill "^3.5.0"
+    line-column "^1.0.2"
+    magic-string "^0.25.7"
+    parse-static-imports "^1.1.0"
+    string.prototype.matchall "^4.0.5"
+
+babel-plugin-inline-json-import@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-inline-json-import/-/babel-plugin-inline-json-import-0.3.2.tgz#fdec1a59364d632895d421aec4c9435ccbbcadd3"
+  integrity sha512-QNNJx08KjmMT25Cw7rAPQ6dlREDPiZGDyApHL8KQ9vrQHbrr4PTi7W8g1tMMZPz0jEMd39nx/eH7xjnDNxq5sA==
+  dependencies:
+    decache "^4.5.1"
+
+babel-plugin-module-resolver@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-3.2.0.tgz#ddfa5e301e3b9aa12d852a9979f18b37881ff5a7"
+  integrity sha512-tjR0GvSndzPew/Iayf4uICWZqjBwnlMWjSx6brryfQ81F9rxBVqwDJtFCV8oOs0+vJeefK9TmdZtkIFdFe1UnA==
+  dependencies:
+    find-babel-config "^1.1.0"
+    glob "^7.1.2"
+    pkg-up "^2.0.0"
+    reselect "^3.0.1"
+    resolve "^1.4.0"
+
+babel-plugin-module-resolver@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-4.1.0.tgz#22a4f32f7441727ec1fbf4967b863e1e3e9f33e2"
+  integrity sha512-MlX10UDheRr3lb3P0WcaIdtCSRlxdQsB1sBqL7W0raF070bGl1HQQq5K3T2vf2XAYie+ww+5AKC/WrkjRO2knA==
+  dependencies:
+    find-babel-config "^1.2.0"
+    glob "^7.1.6"
+    pkg-up "^3.1.0"
+    reselect "^4.0.0"
+    resolve "^1.13.1"
+
+babel-plugin-polyfill-corejs2@^0.2.0:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.3.tgz#6ed8e30981b062f8fe6aca8873a37ebcc8cc1c0f"
+  integrity sha512-NDZ0auNRzmAfE1oDDPW2JhzIMXUk+FFe2ICejmt5T4ocKgiQx3e0VCRx9NCAidcMtL2RUZaWtXnmjTCkx0tcbA==
+  dependencies:
+    "@babel/compat-data" "^7.13.11"
+    "@babel/helper-define-polyfill-provider" "^0.2.4"
+    semver "^6.1.1"
+
+babel-plugin-polyfill-corejs2@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.0.tgz#407082d0d355ba565af24126fb6cb8e9115251fd"
+  integrity sha512-wMDoBJ6uG4u4PNFh72Ty6t3EgfA91puCuAwKIazbQlci+ENb/UU9A3xG5lutjUIiXCIn1CY5L15r9LimiJyrSA==
+  dependencies:
+    "@babel/compat-data" "^7.13.11"
+    "@babel/helper-define-polyfill-provider" "^0.3.0"
+    semver "^6.1.1"
+
+babel-plugin-polyfill-corejs3@^0.2.0:
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.5.tgz#2779846a16a1652244ae268b1e906ada107faf92"
+  integrity sha512-ninF5MQNwAX9Z7c9ED+H2pGt1mXdP4TqzlHKyPIYmJIYz0N+++uwdM7RnJukklhzJ54Q84vA4ZJkgs7lu5vqcw==
+  dependencies:
+    "@babel/helper-define-polyfill-provider" "^0.2.2"
+    core-js-compat "^3.16.2"
+
+babel-plugin-polyfill-corejs3@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.4.0.tgz#0b571f4cf3d67f911512f5c04842a7b8e8263087"
+  integrity sha512-YxFreYwUfglYKdLUGvIF2nJEsGwj+RhWSX/ije3D2vQPOXuyMLMtg/cCGMDpOA7Nd+MwlNdnGODbd2EwUZPlsw==
+  dependencies:
+    "@babel/helper-define-polyfill-provider" "^0.3.0"
+    core-js-compat "^3.18.0"
+
+babel-plugin-polyfill-corejs3@^0.5.0:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz#aabe4b2fa04a6e038b688c5e55d44e78cd3a5f72"
+  integrity sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ==
+  dependencies:
+    "@babel/helper-define-polyfill-provider" "^0.3.1"
+    core-js-compat "^3.21.0"
+
+babel-plugin-polyfill-regenerator@^0.2.0:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.3.tgz#2e9808f5027c4336c994992b48a4262580cb8d6d"
+  integrity sha512-JVE78oRZPKFIeUqFGrSORNzQnrDwZR16oiWeGM8ZyjBn2XAT5OjP+wXx5ESuo33nUsFUEJYjtklnsKbxW5L+7g==
+  dependencies:
+    "@babel/helper-define-polyfill-provider" "^0.2.4"
+
+babel-plugin-polyfill-regenerator@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.0.tgz#9ebbcd7186e1a33e21c5e20cae4e7983949533be"
+  integrity sha512-dhAPTDLGoMW5/84wkgwiLRwMnio2i1fUe53EuvtKMv0pn2p3S8OCoV1xAzfJPl0KOX7IB89s2ib85vbYiea3jg==
+  dependencies:
+    "@babel/helper-define-polyfill-provider" "^0.3.0"
+
+babel-plugin-syntax-async-functions@^6.8.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
+  integrity sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=
+
+babel-plugin-syntax-dynamic-import@^6.18.0:
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz#8d6a26229c83745a9982a441051572caa179b1da"
+  integrity sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=
+
+babel-plugin-syntax-exponentiation-operator@^6.8.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de"
+  integrity sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=
+
+babel-plugin-syntax-trailing-function-commas@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3"
+  integrity sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=
+
+babel-plugin-transform-async-to-generator@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761"
+  integrity sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=
+  dependencies:
+    babel-helper-remap-async-to-generator "^6.24.1"
+    babel-plugin-syntax-async-functions "^6.8.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-arrow-functions@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221"
+  integrity sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-block-scoped-functions@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz#bbc51b49f964d70cb8d8e0b94e820246ce3a6141"
+  integrity sha1-u8UbSflk1wy42OC5ToICRs46YUE=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-block-scoping@^6.23.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f"
+  integrity sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=
+  dependencies:
+    babel-runtime "^6.26.0"
+    babel-template "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    lodash "^4.17.4"
+
+babel-plugin-transform-es2015-classes@^6.23.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db"
+  integrity sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=
+  dependencies:
+    babel-helper-define-map "^6.24.1"
+    babel-helper-function-name "^6.24.1"
+    babel-helper-optimise-call-expression "^6.24.1"
+    babel-helper-replace-supers "^6.24.1"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-computed-properties@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3"
+  integrity sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-destructuring@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d"
+  integrity sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-duplicate-keys@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz#73eb3d310ca969e3ef9ec91c53741a6f1576423e"
+  integrity sha1-c+s9MQypaePvnskcU3QabxV2Qj4=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-for-of@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691"
+  integrity sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-function-name@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b"
+  integrity sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-literals@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz#4f54a02d6cd66cf915280019a31d31925377ca2e"
+  integrity sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015-modules-amd@^6.24.0, babel-plugin-transform-es2015-modules-amd@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz#3b3e54017239842d6d19c3011c4bd2f00a00d154"
+  integrity sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=
+  dependencies:
+    babel-plugin-transform-es2015-modules-commonjs "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.1:
+  version "6.26.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz#58a793863a9e7ca870bdc5a881117ffac27db6f3"
+  integrity sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==
+  dependencies:
+    babel-plugin-transform-strict-mode "^6.24.1"
+    babel-runtime "^6.26.0"
+    babel-template "^6.26.0"
+    babel-types "^6.26.0"
+
+babel-plugin-transform-es2015-modules-systemjs@^6.23.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23"
+  integrity sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=
+  dependencies:
+    babel-helper-hoist-variables "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-modules-umd@^6.23.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz#ac997e6285cd18ed6176adb607d602344ad38468"
+  integrity sha1-rJl+YoXNGO1hdq22B9YCNErThGg=
+  dependencies:
+    babel-plugin-transform-es2015-modules-amd "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-object-super@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d"
+  integrity sha1-JM72muIcuDp/hgPa0CH1cusnj40=
+  dependencies:
+    babel-helper-replace-supers "^6.24.1"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-parameters@^6.23.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b"
+  integrity sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=
+  dependencies:
+    babel-helper-call-delegate "^6.24.1"
+    babel-helper-get-function-arity "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-shorthand-properties@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0"
+  integrity sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-spread@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1"
+  integrity sha1-1taKmfia7cRTbIGlQujdnxdG+NE=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-sticky-regex@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc"
+  integrity sha1-AMHNsaynERLN8M9hJsLta0V8zbw=
+  dependencies:
+    babel-helper-regex "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-template-literals@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz#a84b3450f7e9f8f1f6839d6d687da84bb1236d8d"
+  integrity sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-typeof-symbol@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz#dec09f1cddff94b52ac73d505c84df59dcceb372"
+  integrity sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-unicode-regex@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9"
+  integrity sha1-04sS9C6nMj9yk4fxinxa4frrNek=
+  dependencies:
+    babel-helper-regex "^6.24.1"
+    babel-runtime "^6.22.0"
+    regexpu-core "^2.0.0"
+
+babel-plugin-transform-exponentiation-operator@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz#2ab0c9c7f3098fa48907772bb813fe41e8de3a0e"
+  integrity sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=
+  dependencies:
+    babel-helper-builder-binary-assignment-operator-visitor "^6.24.1"
+    babel-plugin-syntax-exponentiation-operator "^6.8.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-regenerator@^6.22.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f"
+  integrity sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=
+  dependencies:
+    regenerator-transform "^0.10.0"
+
+babel-plugin-transform-strict-mode@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758"
+  integrity sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-polyfill@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153"
+  integrity sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=
+  dependencies:
+    babel-runtime "^6.26.0"
+    core-js "^2.5.0"
+    regenerator-runtime "^0.10.5"
+
+babel-preset-env@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.7.0.tgz#dea79fa4ebeb883cd35dab07e260c1c9c04df77a"
+  integrity sha512-9OR2afuKDneX2/q2EurSftUYM0xGu4O2D9adAhVfADDhrYDaxXV0rBbevVYoY9n6nyX1PmQW/0jtpJvUNr9CHg==
+  dependencies:
+    babel-plugin-check-es2015-constants "^6.22.0"
+    babel-plugin-syntax-trailing-function-commas "^6.22.0"
+    babel-plugin-transform-async-to-generator "^6.22.0"
+    babel-plugin-transform-es2015-arrow-functions "^6.22.0"
+    babel-plugin-transform-es2015-block-scoped-functions "^6.22.0"
+    babel-plugin-transform-es2015-block-scoping "^6.23.0"
+    babel-plugin-transform-es2015-classes "^6.23.0"
+    babel-plugin-transform-es2015-computed-properties "^6.22.0"
+    babel-plugin-transform-es2015-destructuring "^6.23.0"
+    babel-plugin-transform-es2015-duplicate-keys "^6.22.0"
+    babel-plugin-transform-es2015-for-of "^6.23.0"
+    babel-plugin-transform-es2015-function-name "^6.22.0"
+    babel-plugin-transform-es2015-literals "^6.22.0"
+    babel-plugin-transform-es2015-modules-amd "^6.22.0"
+    babel-plugin-transform-es2015-modules-commonjs "^6.23.0"
+    babel-plugin-transform-es2015-modules-systemjs "^6.23.0"
+    babel-plugin-transform-es2015-modules-umd "^6.23.0"
+    babel-plugin-transform-es2015-object-super "^6.22.0"
+    babel-plugin-transform-es2015-parameters "^6.23.0"
+    babel-plugin-transform-es2015-shorthand-properties "^6.22.0"
+    babel-plugin-transform-es2015-spread "^6.22.0"
+    babel-plugin-transform-es2015-sticky-regex "^6.22.0"
+    babel-plugin-transform-es2015-template-literals "^6.22.0"
+    babel-plugin-transform-es2015-typeof-symbol "^6.23.0"
+    babel-plugin-transform-es2015-unicode-regex "^6.22.0"
+    babel-plugin-transform-exponentiation-operator "^6.22.0"
+    babel-plugin-transform-regenerator "^6.22.0"
+    browserslist "^3.2.6"
+    invariant "^2.2.2"
+    semver "^5.3.0"
+
+babel-register@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071"
+  integrity sha1-btAhFz4vy0htestFxgCahW9kcHE=
+  dependencies:
+    babel-core "^6.26.0"
+    babel-runtime "^6.26.0"
+    core-js "^2.5.0"
+    home-or-tmp "^2.0.0"
+    lodash "^4.17.4"
+    mkdirp "^0.5.1"
+    source-map-support "^0.4.15"
+
+babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
+  integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4=
+  dependencies:
+    core-js "^2.4.0"
+    regenerator-runtime "^0.11.0"
+
+babel-template@^6.24.1, babel-template@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
+  integrity sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=
+  dependencies:
+    babel-runtime "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    lodash "^4.17.4"
+
+babel-traverse@^6.24.1, babel-traverse@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
+  integrity sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=
+  dependencies:
+    babel-code-frame "^6.26.0"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    debug "^2.6.8"
+    globals "^9.18.0"
+    invariant "^2.2.2"
+    lodash "^4.17.4"
+
+babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
+  integrity sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=
+  dependencies:
+    babel-runtime "^6.26.0"
+    esutils "^2.0.2"
+    lodash "^4.17.4"
+    to-fast-properties "^1.0.3"
+
+babel6-plugin-strip-class-callcheck@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/babel6-plugin-strip-class-callcheck/-/babel6-plugin-strip-class-callcheck-6.0.0.tgz#de841c1abebbd39f78de0affb2c9a52ee228fddf"
+  integrity sha1-3oQcGr6705943gr/ssmlLuIo/d8=
+
+babylon@^6.18.0:
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
+  integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==
+
+backbone@^1.1.2:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/backbone/-/backbone-1.4.0.tgz#54db4de9df7c3811c3f032f34749a4cd27f3bd12"
+  integrity sha512-RLmDrRXkVdouTg38jcgHhyQ/2zjg7a8E6sz2zxfz21Hh17xDJYUHBZimVIt5fUyS8vbfpeSmTL3gUjTEvUV3qQ==
+  dependencies:
+    underscore ">=1.8.3"
+
+backo2@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
+  integrity sha1-MasayLEpNjRj41s+u2n038+6eUc=
+
+bail@^1.0.0:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.5.tgz#b6fa133404a392cbc1f8c4bf63f5953351e7a776"
+  integrity sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==
+
+balanced-match@^1.0.0:
+  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.0.2, base64-js@^1.3.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
+  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
+
+base64id@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6"
+  integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==
+
+base@^0.11.1:
+  version "0.11.2"
+  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
+  dependencies:
+    cache-base "^1.0.1"
+    class-utils "^0.3.5"
+    component-emitter "^1.2.1"
+    define-property "^1.0.0"
+    isobject "^3.0.1"
+    mixin-deep "^1.2.0"
+    pascalcase "^0.1.1"
+
+basic-auth@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz#b998279bf47ce38344b4f3cf916d4679bbf51e3a"
+  integrity sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==
+  dependencies:
+    safe-buffer "5.1.2"
+
+bcrypt-pbkdf@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
+  dependencies:
+    tweetnacl "^0.14.3"
+
+big.js@^5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
+  integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
+
+binary-extensions@^1.0.0:
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
+  integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
+
+binary-extensions@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
+  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
+
+"binaryextensions@1 || 2", binaryextensions@^2.1.2:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-2.3.0.tgz#1d269cbf7e6243ea886aa41453c3651ccbe13c22"
+  integrity sha512-nAihlQsYGyc5Bwq6+EsubvANYGExeJKHDO3RjnvwU042fawQTQfM3Kxn7IHUXQOz4bzfwsGYYHGSvXyW4zOGLg==
+
+bindings@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
+  integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==
+  dependencies:
+    file-uri-to-path "1.0.0"
+
+bl@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
+  integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==
+  dependencies:
+    buffer "^5.5.0"
+    inherits "^2.0.4"
+    readable-stream "^3.4.0"
+
+blank-object@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/blank-object/-/blank-object-1.0.2.tgz#f990793fbe9a8c8dd013fb3219420bec81d5f4b9"
+  integrity sha1-+ZB5P76ajI3QE/syGUIL7IHV9Lk=
+
+blob@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683"
+  integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==
+
+bluebird@^3.1.1, bluebird@^3.4.6, bluebird@^3.5.5:
+  version "3.7.2"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
+  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
+
+bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9:
+  version "4.12.0"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88"
+  integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==
+
+bn.js@^5.0.0, bn.js@^5.1.1:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz#358860674396c6997771a9d051fcc1b57d4ae002"
+  integrity sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==
+
+body-parser@1.19.0, body-parser@^1.17.0:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
+  integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==
+  dependencies:
+    bytes "3.1.0"
+    content-type "~1.0.4"
+    debug "2.6.9"
+    depd "~1.1.2"
+    http-errors "1.7.2"
+    iconv-lite "0.4.24"
+    on-finished "~2.3.0"
+    qs "6.7.0"
+    raw-body "2.4.0"
+    type-is "~1.6.17"
+
+body@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/body/-/body-5.1.0.tgz#e4ba0ce410a46936323367609ecb4e6553125069"
+  integrity sha1-5LoM5BCkaTYyM2dgnstOZVMSUGk=
+  dependencies:
+    continuable-cache "^0.3.1"
+    error "^7.0.0"
+    raw-body "~1.1.0"
+    safe-json-parse "~1.0.1"
+
+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=
+
+boolify@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/boolify/-/boolify-1.0.1.tgz#b5c09e17cacd113d11b7bb3ed384cc012994d86b"
+  integrity sha1-tcCeF8rNET0Rt7s+04TMASmU2Gs=
+
+boom@7.x.x:
+  version "7.3.0"
+  resolved "https://registry.yarnpkg.com/boom/-/boom-7.3.0.tgz#733a6d956d33b0b1999da3fe6c12996950d017b9"
+  integrity sha512-Swpoyi2t5+GhOEGw8rEsKvTxFLIDiiKoUc2gsoV6Lyr43LHBIzch3k2MvYUs8RTROrIkVJ3Al0TkaOGjnb+B6A==
+  dependencies:
+    hoek "6.x.x"
+
+bower-config@^1.4.3:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/bower-config/-/bower-config-1.4.3.tgz#3454fecdc5f08e7aa9cc6d556e492be0669689ae"
+  integrity sha512-MVyyUk3d1S7d2cl6YISViwJBc2VXCkxF5AUFykvN0PQj5FsUiMNSgAYTso18oRFfyZ6XEtjrgg9MAaufHbOwNw==
+  dependencies:
+    graceful-fs "^4.1.3"
+    minimist "^0.2.1"
+    mout "^1.0.0"
+    osenv "^0.1.3"
+    untildify "^2.1.0"
+    wordwrap "^0.0.3"
+
+bower-endpoint-parser@0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/bower-endpoint-parser/-/bower-endpoint-parser-0.2.2.tgz#00b565adbfab6f2d35addde977e97962acbcb3f6"
+  integrity sha1-ALVlrb+rby01rd3pd+l5Yqy8s/Y=
+
+brace-expansion@^1.1.7:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+  dependencies:
+    balanced-match "^1.0.0"
+    concat-map "0.0.1"
+
+braces@^2.3.1, braces@^2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
+  dependencies:
+    arr-flatten "^1.1.0"
+    array-unique "^0.3.2"
+    extend-shallow "^2.0.1"
+    fill-range "^4.0.0"
+    isobject "^3.0.1"
+    repeat-element "^1.1.2"
+    snapdragon "^0.8.1"
+    snapdragon-node "^2.0.1"
+    split-string "^3.0.2"
+    to-regex "^3.0.1"
+
+braces@^3.0.1, braces@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  dependencies:
+    fill-range "^7.0.1"
+
+broccoli-amd-funnel@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/broccoli-amd-funnel/-/broccoli-amd-funnel-2.0.1.tgz#dbdbfd28841731342d538126567c25bea3f15310"
+  integrity sha512-VRE+0PYAN4jQfkIq3GKRj4U/4UV9rVpLan5ll6fVYV4ziVg4OEfR5GUnILEg++QtR4xSaugRxCPU5XJLDy3bNQ==
+  dependencies:
+    broccoli-plugin "^1.3.0"
+    symlink-or-copy "^1.2.0"
+
+broccoli-asset-rev@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-asset-rev/-/broccoli-asset-rev-3.0.0.tgz#65a28c8a062d6ee2cffd91ed2a8309e0f8253ac6"
+  integrity sha512-gAHQZnwvtl74tGevUqGuWoyOdJUdMMv0TjGSMzbdyGImr9fZcnM6xmggDA8bUawrMto9NFi00ZtNUgA4dQiUBw==
+  dependencies:
+    broccoli-asset-rewrite "^2.0.0"
+    broccoli-filter "^1.2.2"
+    broccoli-persistent-filter "^1.4.3"
+    json-stable-stringify "^1.0.0"
+    minimatch "^3.0.4"
+    rsvp "^3.0.6"
+
+broccoli-asset-rewrite@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-asset-rewrite/-/broccoli-asset-rewrite-2.0.0.tgz#603c4a52d4c8987a2f681254436923ac0a9c94ab"
+  integrity sha512-dqhxdQpooNi7LHe8J9Jdxp6o3YPFWl4vQmint6zrsn2sVbOo+wpyiX3erUSt0IBtjNkAxqJjuvS375o2cLBHTA==
+  dependencies:
+    broccoli-filter "^1.2.3"
+
+broccoli-autoprefixer@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-autoprefixer/-/broccoli-autoprefixer-5.0.0.tgz#68c9f3bfdfff9df2d39e46545b9cf9d4443d6a16"
+  integrity sha1-aMnzv9//nfLTnkZUW5z51EQ9ahY=
+  dependencies:
+    autoprefixer "^7.0.0"
+    broccoli-persistent-filter "^1.1.6"
+    postcss "^6.0.1"
+
+broccoli-babel-transpiler@^6.5.0:
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-6.5.1.tgz#a4afc8d3b59b441518eb9a07bd44149476e30738"
+  integrity sha512-w6GcnkxvHcNCte5FcLGEG1hUdQvlfvSN/6PtGWU/otg69Ugk8rUk51h41R0Ugoc+TNxyeFG1opRt2RlA87XzNw==
+  dependencies:
+    babel-core "^6.26.0"
+    broccoli-funnel "^2.0.1"
+    broccoli-merge-trees "^2.0.0"
+    broccoli-persistent-filter "^1.4.3"
+    clone "^2.0.0"
+    hash-for-dep "^1.2.3"
+    heimdalljs-logger "^0.1.7"
+    json-stable-stringify "^1.0.0"
+    rsvp "^4.8.2"
+    workerpool "^2.3.0"
+
+broccoli-babel-transpiler@^7.2.0, broccoli-babel-transpiler@^7.8.0:
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-7.8.0.tgz#7e0f01fce5739f49bbadeee7f1e625ca51cad66e"
+  integrity sha512-dv30Td5uL7dO3NzQUqQKQs+Iq7JGKnCNtvc6GBO76uVPqGnRlsQZcYqdBVr33JrctR+ZrpTUf7TjsFKeDRFA8Q==
+  dependencies:
+    "@babel/core" "^7.12.0"
+    "@babel/polyfill" "^7.11.5"
+    broccoli-funnel "^2.0.2"
+    broccoli-merge-trees "^3.0.2"
+    broccoli-persistent-filter "^2.2.1"
+    clone "^2.1.2"
+    hash-for-dep "^1.4.7"
+    heimdalljs "^0.2.1"
+    heimdalljs-logger "^0.1.9"
+    json-stable-stringify "^1.0.1"
+    rsvp "^4.8.4"
+    workerpool "^3.1.1"
+
+broccoli-builder@^0.18.14:
+  version "0.18.14"
+  resolved "https://registry.yarnpkg.com/broccoli-builder/-/broccoli-builder-0.18.14.tgz#4b79e2f844de11a4e1b816c3f49c6df4776c312d"
+  integrity sha1-S3ni+ETeEaThuBbD9Jxt9HdsMS0=
+  dependencies:
+    broccoli-node-info "^1.1.0"
+    heimdalljs "^0.2.0"
+    promise-map-series "^0.2.1"
+    quick-temp "^0.1.2"
+    rimraf "^2.2.8"
+    rsvp "^3.0.17"
+    silent-error "^1.0.1"
+
+broccoli-caching-writer@^2.2.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/broccoli-caching-writer/-/broccoli-caching-writer-2.3.1.tgz#b93cf58f9264f003075868db05774f4e7f25bd07"
+  integrity sha1-uTz1j5Jk8AMHWGjbBXdPTn8lvQc=
+  dependencies:
+    broccoli-kitchen-sink-helpers "^0.2.5"
+    broccoli-plugin "1.1.0"
+    debug "^2.1.1"
+    rimraf "^2.2.8"
+    rsvp "^3.0.17"
+    walk-sync "^0.2.5"
+
+broccoli-caching-writer@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/broccoli-caching-writer/-/broccoli-caching-writer-3.0.3.tgz#0bd2c96a9738d6a6ab590f07ba35c5157d7db476"
+  integrity sha1-C9LJapc41qarWQ8HujXFFX19tHY=
+  dependencies:
+    broccoli-kitchen-sink-helpers "^0.3.1"
+    broccoli-plugin "^1.2.1"
+    debug "^2.1.1"
+    rimraf "^2.2.8"
+    rsvp "^3.0.17"
+    walk-sync "^0.3.0"
+
+broccoli-clean-css@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/broccoli-clean-css/-/broccoli-clean-css-1.1.0.tgz#9db143d9af7e0ae79c26e3ac5a9bb2d720ea19fa"
+  integrity sha1-nbFD2a9+CuecJuOsWpuy1yDqGfo=
+  dependencies:
+    broccoli-persistent-filter "^1.1.6"
+    clean-css-promise "^0.1.0"
+    inline-source-map-comment "^1.0.5"
+    json-stable-stringify "^1.0.0"
+
+broccoli-concat@^3.7.4:
+  version "3.7.5"
+  resolved "https://registry.yarnpkg.com/broccoli-concat/-/broccoli-concat-3.7.5.tgz#223beda8c1184252cf08ae020a3d45ffa6a48218"
+  integrity sha512-rDs1Mej3Ej0Cy5yIO9oIQq5+BCv0opAwS2NW7M0BeCsAMeFM42Z/zacDUC6jKc5OV5wiHvGTyCPLnZkMe0h6kQ==
+  dependencies:
+    broccoli-debug "^0.6.5"
+    broccoli-kitchen-sink-helpers "^0.3.1"
+    broccoli-plugin "^1.3.0"
+    ensure-posix-path "^1.0.2"
+    fast-sourcemap-concat "^1.4.0"
+    find-index "^1.1.0"
+    fs-extra "^4.0.3"
+    fs-tree-diff "^0.5.7"
+    lodash.merge "^4.6.2"
+    lodash.omit "^4.1.0"
+    lodash.uniq "^4.2.0"
+    walk-sync "^0.3.2"
+
+broccoli-concat@^4.2.4, broccoli-concat@^4.2.5:
+  version "4.2.5"
+  resolved "https://registry.yarnpkg.com/broccoli-concat/-/broccoli-concat-4.2.5.tgz#d578f00094048b5fc87195e82fbdbde20d838d29"
+  integrity sha512-dFB5ATPwOyV8S2I7a07HxCoutoq23oY//LhM6Mou86cWUTB174rND5aQLR7Fu8FjFFLxoTbkk7y0VPITJ1IQrw==
+  dependencies:
+    broccoli-debug "^0.6.5"
+    broccoli-kitchen-sink-helpers "^0.3.1"
+    broccoli-plugin "^4.0.2"
+    ensure-posix-path "^1.0.2"
+    fast-sourcemap-concat "^2.1.0"
+    find-index "^1.1.0"
+    fs-extra "^8.1.0"
+    fs-tree-diff "^2.0.1"
+    lodash.merge "^4.6.2"
+    lodash.omit "^4.1.0"
+    lodash.uniq "^4.2.0"
+
+broccoli-config-loader@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/broccoli-config-loader/-/broccoli-config-loader-1.0.1.tgz#d10aaf8ebc0cb45c1da5baa82720e1d88d28c80a"
+  integrity sha512-MDKYQ50rxhn+g17DYdfzfEM9DjTuSGu42Db37A8TQHQe8geYEcUZ4SQqZRgzdAI3aRQNlA1yBHJfOeGmOjhLIg==
+  dependencies:
+    broccoli-caching-writer "^3.0.3"
+
+broccoli-config-replace@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/broccoli-config-replace/-/broccoli-config-replace-1.1.2.tgz#6ea879d92a5bad634d11329b51fc5f4aafda9c00"
+  integrity sha1-bqh52SpbrWNNETKbUfxfSq/anAA=
+  dependencies:
+    broccoli-kitchen-sink-helpers "^0.3.1"
+    broccoli-plugin "^1.2.0"
+    debug "^2.2.0"
+    fs-extra "^0.24.0"
+
+broccoli-debug@^0.6.1, broccoli-debug@^0.6.4, broccoli-debug@^0.6.5:
+  version "0.6.5"
+  resolved "https://registry.yarnpkg.com/broccoli-debug/-/broccoli-debug-0.6.5.tgz#164a5cdafd8936e525e702bf8f91f39d758e2e78"
+  integrity sha512-RIVjHvNar9EMCLDW/FggxFRXqpjhncM/3qq87bn/y+/zR9tqEkHvTqbyOc4QnB97NO2m6342w4wGkemkaeOuWg==
+  dependencies:
+    broccoli-plugin "^1.2.1"
+    fs-tree-diff "^0.5.2"
+    heimdalljs "^0.2.1"
+    heimdalljs-logger "^0.1.7"
+    symlink-or-copy "^1.1.8"
+    tree-sync "^1.2.2"
+
+broccoli-dependency-funnel@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/broccoli-dependency-funnel/-/broccoli-dependency-funnel-2.1.2.tgz#44126dd67ef2c68c4e78edeb0315e78fae9ab0ff"
+  integrity sha512-k6b0OnNuRcUnJ9TXA0o6RvqXOkTQ6APKoLsZeMJHAe/YjLjE1uTlfw4Z88GfGmi8gwtLHdnkrhBoJ7YdIkcVZA==
+  dependencies:
+    broccoli-plugin "^1.3.1"
+    fs-tree-diff "^0.5.9"
+    heimdalljs "^0.2.5"
+    heimdalljs-logger "^0.1.9"
+    mkdirp "^0.5.1"
+    mr-dep-walk "^1.4.0"
+    path-posix "^1.0.0"
+    rimraf "^2.6.2"
+    symlink-or-copy "^1.2.0"
+
+broccoli-file-creator@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/broccoli-file-creator/-/broccoli-file-creator-1.2.0.tgz#27f1b25b1b00e7bb7bf3d5d7abed5f4d5388df4d"
+  integrity sha512-l9zthHg6bAtnOfRr/ieZ1srRQEsufMZID7xGYRW3aBDv3u/3Eux+Iawl10tAGYE5pL9YB4n5X4vxkp6iNOoZ9g==
+  dependencies:
+    broccoli-plugin "^1.1.0"
+    mkdirp "^0.5.1"
+
+broccoli-file-creator@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/broccoli-file-creator/-/broccoli-file-creator-2.1.1.tgz#7351dd2496c762cfce7736ce9b49e3fce0c7b7db"
+  integrity sha512-YpjOExWr92C5vhnK0kmD81kM7U09kdIRZk9w4ZDCDHuHXW+VE/x6AGEOQQW3loBQQ6Jk+k+TSm8dESy4uZsnjw==
+  dependencies:
+    broccoli-plugin "^1.1.0"
+    mkdirp "^0.5.1"
+
+broccoli-filter@^1.2.2, broccoli-filter@^1.2.3:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/broccoli-filter/-/broccoli-filter-1.3.0.tgz#71e3a8e32a17f309e12261919c5b1006d6766de6"
+  integrity sha512-VXJXw7eBfG82CFxaBDjYmyN7V72D4In2zwLVQJd/h3mBfF3CMdRTsv2L20lmRTtCv1sAHcB+LgMso90e/KYiLw==
+  dependencies:
+    broccoli-kitchen-sink-helpers "^0.3.1"
+    broccoli-plugin "^1.0.0"
+    copy-dereference "^1.0.0"
+    debug "^2.2.0"
+    mkdirp "^0.5.1"
+    promise-map-series "^0.2.1"
+    rsvp "^3.0.18"
+    symlink-or-copy "^1.0.1"
+    walk-sync "^0.3.1"
+
+broccoli-funnel-reducer@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-funnel-reducer/-/broccoli-funnel-reducer-1.0.0.tgz#11365b2a785aec9b17972a36df87eef24c5cc0ea"
+  integrity sha1-ETZbKnha7JsXlyo234fu8kxcwOo=
+
+broccoli-funnel@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-2.0.1.tgz#6823c73b675ef78fffa7ab800f083e768b51d449"
+  integrity sha512-C8Lnp9TVsSSiZMGEF16C0dCiNg2oJqUKwuZ1K4kVC6qRPG/2Cj/rtB5kRCC9qEbwqhX71bDbfHROx0L3J7zXQg==
+  dependencies:
+    array-equal "^1.0.0"
+    blank-object "^1.0.1"
+    broccoli-plugin "^1.3.0"
+    debug "^2.2.0"
+    fast-ordered-set "^1.0.0"
+    fs-tree-diff "^0.5.3"
+    heimdalljs "^0.2.0"
+    minimatch "^3.0.0"
+    mkdirp "^0.5.0"
+    path-posix "^1.0.0"
+    rimraf "^2.4.3"
+    symlink-or-copy "^1.0.0"
+    walk-sync "^0.3.1"
+
+broccoli-funnel@^1.0.1, broccoli-funnel@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-1.2.0.tgz#cddc3afc5ff1685a8023488fff74ce6fb5a51296"
+  integrity sha1-zdw6/F/xaFqAI0iP/3TOb7WlEpY=
+  dependencies:
+    array-equal "^1.0.0"
+    blank-object "^1.0.1"
+    broccoli-plugin "^1.3.0"
+    debug "^2.2.0"
+    exists-sync "0.0.4"
+    fast-ordered-set "^1.0.0"
+    fs-tree-diff "^0.5.3"
+    heimdalljs "^0.2.0"
+    minimatch "^3.0.0"
+    mkdirp "^0.5.0"
+    path-posix "^1.0.0"
+    rimraf "^2.4.3"
+    symlink-or-copy "^1.0.0"
+    walk-sync "^0.3.1"
+
+broccoli-funnel@^2.0.0, broccoli-funnel@^2.0.1, broccoli-funnel@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-2.0.2.tgz#0edf629569bc10bd02cc525f74b9a38e71366a75"
+  integrity sha512-/vDTqtv7ipjEZQOVqO4vGDVAOZyuYzQ/EgGoyewfOgh1M7IQAToBKZI0oAQPgMBeFPPlIbfMuAngk+ohPBuaHQ==
+  dependencies:
+    array-equal "^1.0.0"
+    blank-object "^1.0.1"
+    broccoli-plugin "^1.3.0"
+    debug "^2.2.0"
+    fast-ordered-set "^1.0.0"
+    fs-tree-diff "^0.5.3"
+    heimdalljs "^0.2.0"
+    minimatch "^3.0.0"
+    mkdirp "^0.5.0"
+    path-posix "^1.0.0"
+    rimraf "^2.4.3"
+    symlink-or-copy "^1.0.0"
+    walk-sync "^0.3.1"
+
+broccoli-funnel@^3.0.3, broccoli-funnel@^3.0.5, broccoli-funnel@^3.0.8:
+  version "3.0.8"
+  resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-3.0.8.tgz#f5b62e2763c3918026a15a3c833edc889971279b"
+  integrity sha512-ng4eIhPYiXqMw6SyGoxPHR3YAwEd2lr9FgBI1CyTbspl4txZovOsmzFkMkGAlu88xyvYXJqHiM2crfLa65T1BQ==
+  dependencies:
+    array-equal "^1.0.0"
+    broccoli-plugin "^4.0.7"
+    debug "^4.1.1"
+    fs-tree-diff "^2.0.1"
+    heimdalljs "^0.2.0"
+    minimatch "^3.0.0"
+    walk-sync "^2.0.2"
+
+broccoli-kitchen-sink-helpers@^0.2.5:
+  version "0.2.9"
+  resolved "https://registry.yarnpkg.com/broccoli-kitchen-sink-helpers/-/broccoli-kitchen-sink-helpers-0.2.9.tgz#a5e0986ed8d76fb5984b68c3f0450d3a96e36ecc"
+  integrity sha1-peCYbtjXb7WYS2jD8EUNOpbjbsw=
+  dependencies:
+    glob "^5.0.10"
+    mkdirp "^0.5.1"
+
+broccoli-kitchen-sink-helpers@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/broccoli-kitchen-sink-helpers/-/broccoli-kitchen-sink-helpers-0.3.1.tgz#77c7c18194b9664163ec4fcee2793444926e0c06"
+  integrity sha1-d8fBgZS5ZkFj7E/O4nk0RJJuDAY=
+  dependencies:
+    glob "^5.0.10"
+    mkdirp "^0.5.1"
+
+broccoli-merge-trees@^1.1.1:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-1.2.4.tgz#a001519bb5067f06589d91afa2942445a2d0fdb5"
+  integrity sha1-oAFRm7UGfwZYnZGvopQkRaLQ/bU=
+  dependencies:
+    broccoli-plugin "^1.3.0"
+    can-symlink "^1.0.0"
+    fast-ordered-set "^1.0.2"
+    fs-tree-diff "^0.5.4"
+    heimdalljs "^0.2.1"
+    heimdalljs-logger "^0.1.7"
+    rimraf "^2.4.3"
+    symlink-or-copy "^1.0.0"
+
+broccoli-merge-trees@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-2.0.1.tgz#14d4b7fc1a90318c12b16f843e6ba2693808100c"
+  integrity sha512-WjaexJ+I8BxP5V5RNn6um/qDRSmKoiBC/QkRi79FT9ClHfldxRyCDs9mcV7mmoaPlsshmmPaUz5jdtcKA6DClQ==
+  dependencies:
+    broccoli-plugin "^1.3.0"
+    merge-trees "^1.0.1"
+
+broccoli-merge-trees@^3.0.0, broccoli-merge-trees@^3.0.1, broccoli-merge-trees@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-3.0.2.tgz#f33b451994225522b5c9bcf27d59decfd8ba537d"
+  integrity sha512-ZyPAwrOdlCddduFbsMyyFzJUrvW6b04pMvDiAQZrCwghlvgowJDY+EfoXn+eR1RRA5nmGHJ+B68T63VnpRiT1A==
+  dependencies:
+    broccoli-plugin "^1.3.0"
+    merge-trees "^2.0.0"
+
+broccoli-merge-trees@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-4.2.0.tgz#692d3c163ecea08c5714a9434d664e628919f47c"
+  integrity sha512-nTrQe5AQtCrW4enLRvbD/vTLHqyW2tz+vsLXQe4IEaUhepuMGVKJJr+I8n34Vu6fPjmPLwTjzNC8izMIDMtHPw==
+  dependencies:
+    broccoli-plugin "^4.0.2"
+    merge-trees "^2.0.0"
+
+broccoli-middleware@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/broccoli-middleware/-/broccoli-middleware-2.1.1.tgz#183635bbef4dc1241533ee001a162f013d776cb9"
+  integrity sha512-BK8aPhQpOLsHWiftrqXQr84XsvzUqeaN4PlCQOYg5yM0M+WKAHtX2WFXmicSQZOVgKDyh5aeoNTFkHjBAEBzwQ==
+  dependencies:
+    ansi-html "^0.0.7"
+    handlebars "^4.0.4"
+    has-ansi "^3.0.0"
+    mime-types "^2.1.18"
+
+broccoli-node-api@^1.6.0, broccoli-node-api@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/broccoli-node-api/-/broccoli-node-api-1.7.0.tgz#391aa6edecd2a42c63c111b4162956b2fa288cb6"
+  integrity sha512-QIqLSVJWJUVOhclmkmypJJH9u9s/aWH4+FH6Q6Ju5l+Io4dtwqdPUNmDfw40o6sxhbZHhqGujDJuHTML1wG8Yw==
+
+broccoli-node-info@1.1.0, broccoli-node-info@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/broccoli-node-info/-/broccoli-node-info-1.1.0.tgz#3aa2e31e07e5bdb516dd25214f7c45ba1c459412"
+  integrity sha1-OqLjHgflvbUW3SUhT3xFuhxFlBI=
+
+broccoli-node-info@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/broccoli-node-info/-/broccoli-node-info-2.2.0.tgz#feb01c13020792f429e01d7f7845dc5b3a7932b3"
+  integrity sha512-VabSGRpKIzpmC+r+tJueCE5h8k6vON7EIMMWu6d/FyPdtijwLQ7QvzShEw+m3mHoDzUaj/kiZsDYrS8X2adsBg==
+
+broccoli-output-wrapper@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-output-wrapper/-/broccoli-output-wrapper-2.0.0.tgz#f1e0b9b2f259a67fd41a380141c3c20b096828e6"
+  integrity sha512-V/ozejo+snzNf75i/a6iTmp71k+rlvqjE3+jYfimuMwR1tjNNRdtfno+NGNQB2An9bIAeqZnKhMDurAznHAdtA==
+  dependencies:
+    heimdalljs-logger "^0.1.10"
+
+broccoli-output-wrapper@^3.2.5:
+  version "3.2.5"
+  resolved "https://registry.yarnpkg.com/broccoli-output-wrapper/-/broccoli-output-wrapper-3.2.5.tgz#514b17801c92922a2c2f87fd145df2a25a11bc5f"
+  integrity sha512-bQAtwjSrF4Nu0CK0JOy5OZqw9t5U0zzv2555EA/cF8/a8SLDTIetk9UgrtMVw7qKLKdSpOZ2liZNeZZDaKgayw==
+  dependencies:
+    fs-extra "^8.1.0"
+    heimdalljs-logger "^0.1.10"
+    symlink-or-copy "^1.2.0"
+
+broccoli-persistent-filter@^1.1.5, broccoli-persistent-filter@^1.1.6, broccoli-persistent-filter@^1.4.3:
+  version "1.4.6"
+  resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-1.4.6.tgz#80762d19000880a77da33c34373299c0f6a3e615"
+  integrity sha512-0RejLwoC95kv4kta8KAa+FmECJCK78Qgm8SRDEK7YyU0N9Cx6KpY3UCDy9WELl3mCXLN8TokNxc7/hp3lL4lfw==
+  dependencies:
+    async-disk-cache "^1.2.1"
+    async-promise-queue "^1.0.3"
+    broccoli-plugin "^1.0.0"
+    fs-tree-diff "^0.5.2"
+    hash-for-dep "^1.0.2"
+    heimdalljs "^0.2.1"
+    heimdalljs-logger "^0.1.7"
+    mkdirp "^0.5.1"
+    promise-map-series "^0.2.1"
+    rimraf "^2.6.1"
+    rsvp "^3.0.18"
+    symlink-or-copy "^1.0.1"
+    walk-sync "^0.3.1"
+
+broccoli-persistent-filter@^2.2.1, broccoli-persistent-filter@^2.3.0, broccoli-persistent-filter@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-2.3.1.tgz#4a052e0e0868b344c3a2977e35a3d497aa9eca72"
+  integrity sha512-hVsmIgCDrl2NFM+3Gs4Cr2TA6UPaIZip99hN8mtkaUPgM8UeVnCbxelCvBjUBHo0oaaqP5jzqqnRVvb568Yu5g==
+  dependencies:
+    async-disk-cache "^1.2.1"
+    async-promise-queue "^1.0.3"
+    broccoli-plugin "^1.0.0"
+    fs-tree-diff "^2.0.0"
+    hash-for-dep "^1.5.0"
+    heimdalljs "^0.2.1"
+    heimdalljs-logger "^0.1.7"
+    mkdirp "^0.5.1"
+    promise-map-series "^0.2.1"
+    rimraf "^2.6.1"
+    rsvp "^4.7.0"
+    symlink-or-copy "^1.0.1"
+    sync-disk-cache "^1.3.3"
+    walk-sync "^1.0.0"
+
+broccoli-persistent-filter@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-3.1.2.tgz#41da6b9577be09a170ecde185f2c5a6099f99c4e"
+  integrity sha512-CbU95RXXVyy+eJV9XTiHUC7NnsY3EvdVrGzp3YgyvO2bzXZFE5/GzDp4X/VQqX+jsk4qyT1HvMOF0sD1DX68TQ==
+  dependencies:
+    async-disk-cache "^2.0.0"
+    async-promise-queue "^1.0.3"
+    broccoli-plugin "^4.0.3"
+    fs-tree-diff "^2.0.0"
+    hash-for-dep "^1.5.0"
+    heimdalljs "^0.2.1"
+    heimdalljs-logger "^0.1.7"
+    promise-map-series "^0.2.1"
+    rimraf "^3.0.0"
+    symlink-or-copy "^1.0.1"
+    sync-disk-cache "^2.0.0"
+
+broccoli-plugin@*, broccoli-plugin@^4.0.1, broccoli-plugin@^4.0.2, broccoli-plugin@^4.0.3, broccoli-plugin@^4.0.5, broccoli-plugin@^4.0.7:
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-4.0.7.tgz#dd176a85efe915ed557d913744b181abe05047db"
+  integrity sha512-a4zUsWtA1uns1K7p9rExYVYG99rdKeGRymW0qOCNkvDPHQxVi3yVyJHhQbM3EZwdt2E0mnhr5e0c/bPpJ7p3Wg==
+  dependencies:
+    broccoli-node-api "^1.7.0"
+    broccoli-output-wrapper "^3.2.5"
+    fs-merger "^3.2.1"
+    promise-map-series "^0.3.0"
+    quick-temp "^0.1.8"
+    rimraf "^3.0.2"
+    symlink-or-copy "^1.3.1"
+
+broccoli-plugin@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-1.1.0.tgz#73e2cfa05f8ea1e3fc1420c40c3d9e7dc724bf02"
+  integrity sha1-c+LPoF+OoeP8FCDEDD2efcckvwI=
+  dependencies:
+    promise-map-series "^0.2.1"
+    quick-temp "^0.1.3"
+    rimraf "^2.3.4"
+    symlink-or-copy "^1.0.1"
+
+broccoli-plugin@^1.0.0, broccoli-plugin@^1.1.0, broccoli-plugin@^1.2.0, broccoli-plugin@^1.2.1, broccoli-plugin@^1.3.0, broccoli-plugin@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-1.3.1.tgz#a26315732fb99ed2d9fb58f12a1e14e986b4fabd"
+  integrity sha512-DW8XASZkmorp+q7J4EeDEZz+LoyKLAd2XZULXyD9l4m9/hAKV3vjHmB1kiUshcWAYMgTP1m2i4NnqCE/23h6AQ==
+  dependencies:
+    promise-map-series "^0.2.1"
+    quick-temp "^0.1.3"
+    rimraf "^2.3.4"
+    symlink-or-copy "^1.1.8"
+
+broccoli-plugin@^2.0.0, broccoli-plugin@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-2.1.0.tgz#2fab6c578219cfcc64f773e9616073313fc8b334"
+  integrity sha512-ElE4caljW4slapyEhSD9jU9Uayc8SoSABWdmY9SqbV8DHNxU6xg1jJsPcMm+cXOvggR3+G+OXAYQeFjWVnznaw==
+  dependencies:
+    promise-map-series "^0.2.1"
+    quick-temp "^0.1.3"
+    rimraf "^2.3.4"
+    symlink-or-copy "^1.1.8"
+
+broccoli-plugin@^3.0.0, broccoli-plugin@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-3.1.0.tgz#54ba6dd90a42ec3db5624063292610e326b1e542"
+  integrity sha512-7w7FP8WJYjLvb0eaw27LO678TGGaom++49O1VYIuzjhXjK5kn2+AMlDm7CaUFw4F7CLGoVQeZ84d8gICMJa4lA==
+  dependencies:
+    broccoli-node-api "^1.6.0"
+    broccoli-output-wrapper "^2.0.0"
+    fs-merger "^3.0.1"
+    promise-map-series "^0.2.1"
+    quick-temp "^0.1.3"
+    rimraf "^2.3.4"
+    symlink-or-copy "^1.1.8"
+
+broccoli-plugin@^4.0.0:
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-4.0.5.tgz#71e5597f31a652c0e0a6bcb7bbdb50142cc5c959"
+  integrity sha512-WA8FQP2EQCBOd1Z6RhXlyTyt/F+sJEwWGTCUrIIBDxHhSURibPW/n0NfwgLdEZSD8/3Ec4B9L3PUqaWxVuVC2A==
+  dependencies:
+    broccoli-node-api "^1.7.0"
+    broccoli-output-wrapper "^3.2.5"
+    fs-merger "^3.1.0"
+    promise-map-series "^0.3.0"
+    quick-temp "^0.1.8"
+    rimraf "^3.0.2"
+    symlink-or-copy "^1.3.1"
+
+broccoli-rollup@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-rollup/-/broccoli-rollup-4.0.0.tgz#52cb89b8927ffd08342e995e7cd885ff4578fa52"
+  integrity sha512-bxbWGFtlxICS5To3loKKX+Ov6G84WFdPIZH2of6EJjYyXr4Tm0sG0x1jsa871SFaLX/l9Ki5k2yFggr2E71Hhw==
+  dependencies:
+    "@types/node" "^12.0.2"
+    broccoli-plugin "^2.0.0"
+    fs-tree-diff "^2.0.1"
+    heimdalljs "^0.2.6"
+    heimdalljs-logger "^0.1.10"
+    magic-string "^0.25.2"
+    node-modules-path "^1.0.1"
+    rollup "^1.12.0"
+    symlink-or-copy "^1.2.0"
+    walk-sync "^1.1.3"
+
+broccoli-rollup@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/broccoli-rollup/-/broccoli-rollup-2.1.1.tgz#0b77dc4b7560a53e998ea85f3b56772612d4988d"
+  integrity sha512-aky/Ovg5DbsrsJEx2QCXxHLA6ZR+9u1TNVTf85soP4gL8CjGGKQ/JU8R3BZ2ntkWzo6/83RCKzX6O+nlNKR5MQ==
+  dependencies:
+    "@types/node" "^9.6.0"
+    amd-name-resolver "^1.2.0"
+    broccoli-plugin "^1.2.1"
+    fs-tree-diff "^0.5.2"
+    heimdalljs "^0.2.1"
+    heimdalljs-logger "^0.1.7"
+    magic-string "^0.24.0"
+    node-modules-path "^1.0.1"
+    rollup "^0.57.1"
+    symlink-or-copy "^1.1.8"
+    walk-sync "^0.3.1"
+
+broccoli-rollup@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-rollup/-/broccoli-rollup-5.0.0.tgz#a77b53bcef1b70e988913fee82265c0a4ca530da"
+  integrity sha512-QdMuXHwsdz/LOS8zu4HP91Sfi4ofimrOXoYP/lrPdRh7lJYD87Lfq4WzzUhGHsxMfzANIEvl/7qVHKD3cFJ4tA==
+  dependencies:
+    "@types/broccoli-plugin" "^3.0.0"
+    broccoli-plugin "^4.0.7"
+    fs-tree-diff "^2.0.1"
+    heimdalljs "^0.2.6"
+    node-modules-path "^1.0.1"
+    rollup "^2.50.0"
+    rollup-pluginutils "^2.8.1"
+    symlink-or-copy "^1.2.0"
+    walk-sync "^2.2.0"
+
+broccoli-sass-source-maps@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-sass-source-maps/-/broccoli-sass-source-maps-4.0.0.tgz#1ee4c10a810b10955b0502e28f85ab672f5961a2"
+  integrity sha512-Bjgg0Q626pPwiPU+Sk7jJNjblPEwhceuTzMPw2F5XY+FzdTBMYQKuJYlJ4x2DdsubE95e3rVQeSZ68jA13Nhzg==
+  dependencies:
+    broccoli-caching-writer "^3.0.3"
+    include-path-searcher "^0.1.0"
+    mkdirp "^0.3.5"
+    object-assign "^2.0.0"
+    rsvp "^3.0.6"
+
+broccoli-slow-trees@^3.0.1, broccoli-slow-trees@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/broccoli-slow-trees/-/broccoli-slow-trees-3.1.0.tgz#8e48903f59e061bf1213963733b9e61dec2ee5d7"
+  integrity sha512-FRI7mRTk2wjIDrdNJd6znS7Kmmne4VkAkl8Ix1R/VoePFMD0g0tEl671xswzFqaRjpT9Qu+CC4hdXDLDJBuzMw==
+  dependencies:
+    heimdalljs "^0.2.1"
+
+broccoli-source@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/broccoli-source/-/broccoli-source-1.1.0.tgz#54f0e82c8b73f46580cbbc4f578f0b32fca8f809"
+  integrity sha1-VPDoLItz9GWAy7xPV48LMvyo+Ak=
+
+broccoli-source@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/broccoli-source/-/broccoli-source-2.1.2.tgz#e9ae834f143b607e9ec114ade66731500c38b90b"
+  integrity sha512-1lLayO4wfS0c0Sj50VfHJXNWf94FYY0WUhxj0R77thbs6uWI7USiOWFqQV5dRmhAJnoKaGN4WyLGQbgjgiYFwQ==
+
+broccoli-source@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/broccoli-source/-/broccoli-source-3.0.1.tgz#fd581b2f3877ca1338f724f6ef70acec8c7e1444"
+  integrity sha512-ZbGVQjivWi0k220fEeIUioN6Y68xjMy0xiLAc0LdieHI99gw+tafU8w0CggBDYVNsJMKUr006AZaM7gNEwCxEg==
+  dependencies:
+    broccoli-node-api "^1.6.0"
+
+broccoli-sri-hash@^2.1.0, broccoli-sri-hash@meirish/broccoli-sri-hash#rooturl:
+  version "2.1.2"
+  resolved "https://codeload.github.com/meirish/broccoli-sri-hash/tar.gz/5ebad6f345c38d45461676c7a298a0b61be4a39d"
+  dependencies:
+    broccoli-caching-writer "^2.2.0"
+    mkdirp "^0.5.1"
+    rsvp "^3.1.0"
+    sri-toolbox "^0.2.0"
+    symlink-or-copy "^1.0.1"
+
+broccoli-stew@^1.5.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/broccoli-stew/-/broccoli-stew-1.6.0.tgz#01f6d92806ed6679ddbe48d405066a0e164dfbef"
+  integrity sha512-sUwCJNnYH4Na690By5xcEMAZqKgquUQnMAEuIiL3Z2k63mSw9Xg+7Ew4wCrFrMmXMcLpWjZDOm6Yqnq268N+ZQ==
+  dependencies:
+    broccoli-debug "^0.6.1"
+    broccoli-funnel "^2.0.0"
+    broccoli-merge-trees "^2.0.0"
+    broccoli-persistent-filter "^1.1.6"
+    broccoli-plugin "^1.3.0"
+    chalk "^2.4.1"
+    debug "^3.1.0"
+    ensure-posix-path "^1.0.1"
+    fs-extra "^5.0.0"
+    minimatch "^3.0.4"
+    resolve "^1.8.1"
+    rsvp "^4.8.3"
+    symlink-or-copy "^1.2.0"
+    walk-sync "^0.3.0"
+
+broccoli-stew@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-stew/-/broccoli-stew-3.0.0.tgz#fd1d19d162ad9490b42e5c563b78c26eb1e80b95"
+  integrity sha512-NXfi+Vas24n3Ivo21GvENTI55qxKu7OwKRnCLWXld8MiLiQKQlWIq28eoARaFj0lTUFwUa4jKZeA7fW9PiWQeg==
+  dependencies:
+    broccoli-debug "^0.6.5"
+    broccoli-funnel "^2.0.0"
+    broccoli-merge-trees "^3.0.1"
+    broccoli-persistent-filter "^2.3.0"
+    broccoli-plugin "^2.1.0"
+    chalk "^2.4.1"
+    debug "^4.1.1"
+    ensure-posix-path "^1.0.1"
+    fs-extra "^8.0.1"
+    minimatch "^3.0.4"
+    resolve "^1.11.1"
+    rsvp "^4.8.5"
+    symlink-or-copy "^1.2.0"
+    walk-sync "^1.1.3"
+
+broccoli-string-replace@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/broccoli-string-replace/-/broccoli-string-replace-0.1.2.tgz#1ed92f85680af8d503023925e754e4e33676b91f"
+  integrity sha1-HtkvhWgK+NUDAjkl51Tk4zZ2uR8=
+  dependencies:
+    broccoli-persistent-filter "^1.1.5"
+    minimatch "^3.0.3"
+
+broccoli-svg-optimizer@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-svg-optimizer/-/broccoli-svg-optimizer-2.0.0.tgz#22b6920bee5e126e86b95ae0cdf8ad6cc4be3735"
+  integrity sha512-zIbUmBeSxl9r18Mqjl0OArvXyAKuSDd4FFVcH5HmiX2/1SFUofL4JN5g5qhP/GqQnLTEVdwr61LawSGDZHcqOg==
+  dependencies:
+    broccoli-persistent-filter "^2.3.1"
+    json-stable-stringify "^1.0.1"
+    lodash "^4.17.15"
+    rsvp "^4.8.5"
+    svgo "1.3.0"
+
+broccoli-templater@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/broccoli-templater/-/broccoli-templater-2.0.2.tgz#285a892071c0b3ad5ebc275d9e8b3465e2d120d6"
+  integrity sha512-71KpNkc7WmbEokTQpGcbGzZjUIY1NSVa3GB++KFKAfx5SZPUozCOsBlSTwxcv8TLoCAqbBnsX5AQPgg6vJ2l9g==
+  dependencies:
+    broccoli-plugin "^1.3.1"
+    fs-tree-diff "^0.5.9"
+    lodash.template "^4.4.0"
+    rimraf "^2.6.2"
+    walk-sync "^0.3.3"
+
+broccoli-terser-sourcemap@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/broccoli-terser-sourcemap/-/broccoli-terser-sourcemap-4.1.0.tgz#5f37441b64a3b6bfb0c67e9af232259c9576f115"
+  integrity sha512-zkNnjsAbP+M5rG2aMM1EE4BmXPUSxFKmtLUkUs2D1DLTOJQoF1xlOjGWjjKYCFy5tw8t4+tgGJ+HVa2ucJZ8sw==
+  dependencies:
+    async-promise-queue "^1.0.5"
+    broccoli-plugin "^4.0.3"
+    debug "^4.1.0"
+    lodash.defaultsdeep "^4.6.1"
+    matcher-collection "^2.0.1"
+    source-map-url "^0.4.0"
+    symlink-or-copy "^1.3.1"
+    terser "^5.3.0"
+    walk-sync "^2.2.0"
+    workerpool "^6.0.0"
+
+broccoli-test-helper@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-test-helper/-/broccoli-test-helper-2.0.0.tgz#1cfbb76f7e856ad8df96d55ee2f5e0dddddf5d4f"
+  integrity sha512-TKwh8dBT+RcxKEG+vAoaRRhZsCMwZIHPZbCzBNCA0nUi1aoFB/LVosqwMC6H9Ipe06FxY5hpQxDLFbnBMdUPsA==
+  dependencies:
+    "@types/tmp" "^0.0.33"
+    broccoli "^2.0.0"
+    fixturify "^0.3.2"
+    fs-tree-diff "^0.5.9"
+    tmp "^0.0.33"
+    walk-sync "^0.3.3"
+
+broccoli-uglify-sourcemap@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/broccoli-uglify-sourcemap/-/broccoli-uglify-sourcemap-3.2.0.tgz#d96f1d41f6c18e9a5d49af1a5ab9489cdcac1c6c"
+  integrity sha512-kkkn8v7kXdWwnZNekq+3ILuTAGkZoaoEMUYCKoER5/uokuoyTjtdYLHaE7UxHkuPEuLfjvJYv21sCCePZ74/2g==
+  dependencies:
+    async-promise-queue "^1.0.5"
+    broccoli-plugin "^1.2.1"
+    debug "^4.1.0"
+    lodash.defaultsdeep "^4.6.1"
+    matcher-collection "^2.0.0"
+    mkdirp "^0.5.0"
+    source-map-url "^0.4.0"
+    symlink-or-copy "^1.0.1"
+    terser "^4.3.9"
+    walk-sync "^1.1.3"
+    workerpool "^5.0.1"
+
+broccoli@^2.0.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/broccoli/-/broccoli-2.3.0.tgz#b3f71b2c3d02fc042988e208827a09c75dd7b350"
+  integrity sha512-TeYMYlCGFK8EGk4Wce1G1uU3i52+YxRqP3WPOVDojC1zUk+Gi40wHBzUT2fncQZDl26dmCQMNugtHKjvUpcGQg==
+  dependencies:
+    broccoli-node-info "1.1.0"
+    broccoli-slow-trees "^3.0.1"
+    broccoli-source "^1.1.0"
+    commander "^2.15.1"
+    connect "^3.6.6"
+    esm "^3.2.4"
+    findup-sync "^2.0.0"
+    handlebars "^4.0.11"
+    heimdalljs "^0.2.6"
+    heimdalljs-logger "^0.1.9"
+    mime-types "^2.1.19"
+    promise.prototype.finally "^3.1.0"
+    resolve-path "^1.4.0"
+    rimraf "^2.6.2"
+    sane "^4.0.0"
+    tmp "0.0.33"
+    tree-sync "^1.2.2"
+    underscore.string "^3.2.2"
+    watch-detector "^0.1.0"
+
+broccoli@^3.5.1:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/broccoli/-/broccoli-3.5.2.tgz#60921167d57b43fb5bad527420d62fe532595ef4"
+  integrity sha512-sWi3b3fTUSVPDsz5KsQ5eCQNVAtLgkIE/HYFkEZXR/07clqmd4E/gFiuwSaqa9b+QTXc1Uemfb7TVWbEIURWDg==
+  dependencies:
+    "@types/chai" "^4.2.9"
+    "@types/chai-as-promised" "^7.1.2"
+    "@types/express" "^4.17.2"
+    ansi-html "^0.0.7"
+    broccoli-node-info "^2.1.0"
+    broccoli-slow-trees "^3.0.1"
+    broccoli-source "^3.0.0"
+    commander "^4.1.1"
+    connect "^3.6.6"
+    console-ui "^3.0.4"
+    esm "^3.2.4"
+    findup-sync "^4.0.0"
+    handlebars "^4.7.3"
+    heimdalljs "^0.2.6"
+    heimdalljs-logger "^0.1.9"
+    https "^1.0.0"
+    mime-types "^2.1.26"
+    resolve-path "^1.4.0"
+    rimraf "^3.0.2"
+    sane "^4.0.0"
+    tmp "^0.0.33"
+    tree-sync "^2.0.0"
+    underscore.string "^3.2.2"
+    watch-detector "^1.0.0"
+
+brorand@^1.0.1, brorand@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
+  integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
+
+browser-process-hrtime@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
+  integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
+
+browserify-aes@^1.0.0, browserify-aes@^1.0.4:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
+  integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==
+  dependencies:
+    buffer-xor "^1.0.3"
+    cipher-base "^1.0.0"
+    create-hash "^1.1.0"
+    evp_bytestokey "^1.0.3"
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+browserify-cipher@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"
+  integrity sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==
+  dependencies:
+    browserify-aes "^1.0.4"
+    browserify-des "^1.0.0"
+    evp_bytestokey "^1.0.0"
+
+browserify-des@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c"
+  integrity sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==
+  dependencies:
+    cipher-base "^1.0.1"
+    des.js "^1.0.0"
+    inherits "^2.0.1"
+    safe-buffer "^5.1.2"
+
+browserify-rsa@^4.0.0, browserify-rsa@^4.0.1:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz#b2fd06b5b75ae297f7ce2dc651f918f5be158c8d"
+  integrity sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==
+  dependencies:
+    bn.js "^5.0.0"
+    randombytes "^2.0.1"
+
+browserify-sign@^4.0.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz#eaf4add46dd54be3bb3b36c0cf15abbeba7956c3"
+  integrity sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==
+  dependencies:
+    bn.js "^5.1.1"
+    browserify-rsa "^4.0.1"
+    create-hash "^1.2.0"
+    create-hmac "^1.1.7"
+    elliptic "^6.5.3"
+    inherits "^2.0.4"
+    parse-asn1 "^5.1.5"
+    readable-stream "^3.6.0"
+    safe-buffer "^5.2.0"
+
+browserify-zlib@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
+  integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==
+  dependencies:
+    pako "~1.0.5"
+
+browserslist@^2.11.3:
+  version "2.11.3"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.3.tgz#fe36167aed1bbcde4827ebfe71347a2cc70b99b2"
+  integrity sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==
+  dependencies:
+    caniuse-lite "^1.0.30000792"
+    electron-to-chromium "^1.3.30"
+
+browserslist@^3.2.6:
+  version "3.2.8"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-3.2.8.tgz#b0005361d6471f0f5952797a76fc985f1f978fc6"
+  integrity sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==
+  dependencies:
+    caniuse-lite "^1.0.30000844"
+    electron-to-chromium "^1.3.47"
+
+browserslist@^4.0.0:
+  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.30001219"
+    colorette "^1.2.2"
+    electron-to-chromium "^1.3.723"
+    escalade "^3.1.1"
+    node-releases "^1.1.71"
+
+browserslist@^4.14.5, browserslist@^4.16.8, browserslist@^4.20.2, browserslist@^4.20.3:
+  version "4.20.4"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.4.tgz#98096c9042af689ee1e0271333dbc564b8ce4477"
+  integrity sha512-ok1d+1WpnU24XYN7oC3QWgTyMhY/avPJ/r9T00xxvUOIparA/gc+UPUMaod3i+G6s+nI2nUb9xZ5k794uIwShw==
+  dependencies:
+    caniuse-lite "^1.0.30001349"
+    electron-to-chromium "^1.4.147"
+    escalade "^3.1.1"
+    node-releases "^2.0.5"
+    picocolors "^1.0.0"
+
+browserslist@^4.17.3:
+  version "4.17.3"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.17.3.tgz#2844cd6eebe14d12384b0122d217550160d2d624"
+  integrity sha512-59IqHJV5VGdcJZ+GZ2hU5n4Kv3YiASzW6Xk5g9tf5a/MAzGeFwgGWU39fVzNIOVcgB3+Gp+kiQu0HEfTVU/3VQ==
+  dependencies:
+    caniuse-lite "^1.0.30001264"
+    electron-to-chromium "^1.3.857"
+    escalade "^3.1.1"
+    node-releases "^1.1.77"
+    picocolors "^0.2.1"
+
+browserslist@^4.17.5, browserslist@^4.17.6, browserslist@^4.18.1:
+  version "4.18.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.18.1.tgz#60d3920f25b6860eb917c6c7b185576f4d8b017f"
+  integrity sha512-8ScCzdpPwR2wQh8IT82CA2VgDwjHyqMovPBZSNH54+tm4Jk2pCuv90gmAdH6J84OCRWi0b4gMe6O6XPXuJnjgQ==
+  dependencies:
+    caniuse-lite "^1.0.30001280"
+    electron-to-chromium "^1.3.896"
+    escalade "^3.1.1"
+    node-releases "^2.0.1"
+    picocolors "^1.0.0"
+
+browserslist@^4.19.1:
+  version "4.20.2"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.2.tgz#567b41508757ecd904dab4d1c646c612cd3d4f88"
+  integrity sha512-CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA==
+  dependencies:
+    caniuse-lite "^1.0.30001317"
+    electron-to-chromium "^1.4.84"
+    escalade "^3.1.1"
+    node-releases "^2.0.2"
+    picocolors "^1.0.0"
+
+bser@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
+  integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==
+  dependencies:
+    node-int64 "^0.4.0"
+
+buffer-from@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
+  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
+
+buffer-xor@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
+  integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=
+
+buffer@^4.3.0:
+  version "4.9.2"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8"
+  integrity sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==
+  dependencies:
+    base64-js "^1.0.2"
+    ieee754 "^1.1.4"
+    isarray "^1.0.0"
+
+buffer@^5.5.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
+  integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
+  dependencies:
+    base64-js "^1.3.1"
+    ieee754 "^1.1.13"
+
+builtin-status-codes@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
+  integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
+
+builtins@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
+  integrity sha1-y5T662HIaWRR2zZTThQi+U8K7og=
+
+bulma-switch@^0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/bulma-switch/-/bulma-switch-0.0.1.tgz#2de6eb7c602244de7c5efa880b3b19b8464012a9"
+  integrity sha1-LebrfGAiRN58XvqICzsZuEZAEqk=
+
+bulma@^0.5.2:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/bulma/-/bulma-0.5.3.tgz#be93afb6246192505c30df3f9c1c29a97d319a13"
+  integrity sha1-vpOvtiRhklBcMN8/nBwpqX0xmhM=
+
+bytes@1:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-1.0.0.tgz#3569ede8ba34315fab99c3e92cb04c7220de1fa8"
+  integrity sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g=
+
+bytes@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
+  integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
+
+bytes@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
+  integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
+
+bytestreamjs@^1.0.29:
+  version "1.0.29"
+  resolved "https://registry.yarnpkg.com/bytestreamjs/-/bytestreamjs-1.0.29.tgz#691f8ee8e5a150c61b925993a3eec0911ed17f1d"
+  integrity sha512-Mri3yqoo9YvdaSvD5OYl4Rdu9zCBJInW/Ez31sdlNY4ikMy//EvTTmidfLcs0e+NBvKVEpPzYvJAesjgMdjnZg==
+
+cacache@^12.0.2:
+  version "12.0.4"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c"
+  integrity sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==
+  dependencies:
+    bluebird "^3.5.5"
+    chownr "^1.1.1"
+    figgy-pudding "^3.5.1"
+    glob "^7.1.4"
+    graceful-fs "^4.1.15"
+    infer-owner "^1.0.3"
+    lru-cache "^5.1.1"
+    mississippi "^3.0.0"
+    mkdirp "^0.5.1"
+    move-concurrently "^1.0.1"
+    promise-inflight "^1.0.1"
+    rimraf "^2.6.3"
+    ssri "^6.0.1"
+    unique-filename "^1.1.1"
+    y18n "^4.0.0"
+
+cache-base@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
+  dependencies:
+    collection-visit "^1.0.0"
+    component-emitter "^1.2.1"
+    get-value "^2.0.6"
+    has-value "^1.0.0"
+    isobject "^3.0.1"
+    set-value "^2.0.0"
+    to-object-path "^0.3.0"
+    union-value "^1.0.0"
+    unset-value "^1.0.0"
+
+calculate-cache-key-for-tree@^1.1.0:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/calculate-cache-key-for-tree/-/calculate-cache-key-for-tree-1.2.3.tgz#5a5e4fcfa2d374a63e47fe967593f179e8282825"
+  integrity sha512-PPQorvdNw8K8k7UftCeradwOmKDSDJs8wcqYTtJPEt3fHbZyK8QsorybJA+lOmk0dgE61vX6R+5Kd3W9h4EMGg==
+  dependencies:
+    json-stable-stringify "^1.0.1"
+
+calculate-cache-key-for-tree@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/calculate-cache-key-for-tree/-/calculate-cache-key-for-tree-2.0.0.tgz#7ac57f149a4188eacb0a45b210689215d3fef8d6"
+  integrity sha512-Quw8a6y8CPmRd6eU+mwypktYCwUcf8yVFIRbNZ6tPQEckX9yd+EBVEPC/GSZZrMWH9e7Vz4pT7XhpmyApRByLQ==
+  dependencies:
+    json-stable-stringify "^1.0.1"
+
+call-bind@^1.0.0, call-bind@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
+  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
+  dependencies:
+    function-bind "^1.1.1"
+    get-intrinsic "^1.0.2"
+
+callsite@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20"
+  integrity sha1-KAOY5dZkvXQDi28JBRU+borxvCA=
+
+callsites@^3.0.0, callsites@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
+  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
+
+camelcase-keys@^6.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"
+  integrity sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==
+  dependencies:
+    camelcase "^5.3.1"
+    map-obj "^4.0.0"
+    quick-lru "^4.0.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==
+
+can-symlink@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/can-symlink/-/can-symlink-1.0.0.tgz#97b607d8a84bb6c6e228b902d864ecb594b9d219"
+  integrity sha1-l7YH2KhLtsbiKLkC2GTstZS50hk=
+  dependencies:
+    tmp "0.0.28"
+
+caniuse-api@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0"
+  integrity sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==
+  dependencies:
+    browserslist "^4.0.0"
+    caniuse-lite "^1.0.0"
+    lodash.memoize "^4.1.2"
+    lodash.uniq "^4.5.0"
+
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000805, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001219, caniuse-lite@^1.0.30001264:
+  version "1.0.30001282"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001282.tgz#38c781ee0a90ccfe1fe7fefd00e43f5ffdcb96fd"
+  integrity sha512-YhF/hG6nqBEllymSIjLtR2iWDDnChvhnVJqp+vloyt2tEHFG1yBR+ac2B/rOw0qOK0m0lEXU2dv4E/sMk5P9Kg==
+
+caniuse-lite@^1.0.30001280:
+  version "1.0.30001284"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001284.tgz#d3653929ded898cd0c1f09a56fd8ca6952df4fca"
+  integrity sha512-t28SKa7g6kiIQi6NHeOcKrOrGMzCRrXvlasPwWC26TH2QNdglgzQIRUuJ0cR3NeQPH+5jpuveeeSFDLm2zbkEw==
+
+caniuse-lite@^1.0.30001304, caniuse-lite@^1.0.30001349:
+  version "1.0.30001350"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001350.tgz#f0acc6472469d066a4357765eb73be5973eda918"
+  integrity sha512-NZBql38Pzd+rAu5SPXv+qmTWGQuFsRiemHCJCAPvkoDxWV19/xqL2YHF32fDJ9SDLdLqfax8+S0CO3ncDCp9Iw==
+
+caniuse-lite@^1.0.30001317:
+  version "1.0.30001322"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001322.tgz#2e4c09d11e1e8f852767dab287069a8d0c29d623"
+  integrity sha512-neRmrmIrCGuMnxGSoh+x7zYtQFFgnSY2jaomjU56sCkTA6JINqQrxutF459JpWcWRajvoyn95sOXq4Pqrnyjew==
+
+capture-exit@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
+  integrity sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==
+  dependencies:
+    rsvp "^4.8.4"
+
+cardinal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/cardinal/-/cardinal-1.0.0.tgz#50e21c1b0aa37729f9377def196b5a9cec932ee9"
+  integrity sha1-UOIcGwqjdyn5N33vGWtanOyTLuk=
+  dependencies:
+    ansicolors "~0.2.1"
+    redeyed "~1.0.0"
+
+caseless@~0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
+
+ccount@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.1.0.tgz#246687debb6014735131be8abab2d93898f8d043"
+  integrity sha512-vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg==
+
+ceibo@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ceibo/-/ceibo-2.0.0.tgz#9a61eb054a91c09934588d4e45d9dd2c3bf04eee"
+  integrity sha1-mmHrBUqRwJk0WI1ORdndLDvwTu4=
+
+chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
+  dependencies:
+    ansi-styles "^2.2.1"
+    escape-string-regexp "^1.0.2"
+    has-ansi "^2.0.0"
+    strip-ansi "^3.0.0"
+    supports-color "^2.0.0"
+
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.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==
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
+chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad"
+  integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
+chalk@^4.1.2:
+  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"
+
+chalk@~0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.4.0.tgz#5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"
+  integrity sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8=
+  dependencies:
+    ansi-styles "~1.0.0"
+    has-color "~0.1.0"
+    strip-ansi "~0.1.0"
+
+character-entities-legacy@^1.0.0:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz#94bc1845dce70a5bb9d2ecc748725661293d8fc1"
+  integrity sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==
+
+character-entities@^1.0.0:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.4.tgz#e12c3939b7eaf4e5b15e7ad4c5e28e1d48c5b16b"
+  integrity sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==
+
+character-reference-invalid@^1.0.0:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560"
+  integrity sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==
+
+charcodes@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/charcodes/-/charcodes-0.2.0.tgz#5208d327e6cc05f99eb80ffc814707572d1f14e4"
+  integrity sha512-Y4kiDb+AM4Ecy58YkuZrrSRJBDQdQ2L+NyS1vHHFtNtUjgutcZfx3yp1dAONI/oPaPmyGfCLx5CxL+zauIMyKQ==
+
+chardet@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
+  integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
+
+charm@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/charm/-/charm-1.0.2.tgz#8add367153a6d9a581331052c4090991da995e35"
+  integrity sha1-it02cVOm2aWBMxBSxAkJkdqZXjU=
+  dependencies:
+    inherits "^2.0.1"
+
+cheerio@^0.22.0:
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-0.22.0.tgz#a9baa860a3f9b595a6b81b1a86873121ed3a269e"
+  integrity sha1-qbqoYKP5tZWmuBsahocxIe06Jp4=
+  dependencies:
+    css-select "~1.2.0"
+    dom-serializer "~0.1.0"
+    entities "~1.1.1"
+    htmlparser2 "^3.9.1"
+    lodash.assignin "^4.0.9"
+    lodash.bind "^4.1.4"
+    lodash.defaults "^4.0.1"
+    lodash.filter "^4.4.0"
+    lodash.flatten "^4.2.0"
+    lodash.foreach "^4.3.0"
+    lodash.map "^4.4.0"
+    lodash.merge "^4.4.0"
+    lodash.pick "^4.2.1"
+    lodash.reduce "^4.4.0"
+    lodash.reject "^4.4.0"
+    lodash.some "^4.4.0"
+
+"chokidar@>=3.0.0 <4.0.0", chokidar@^3.4.1:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a"
+  integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==
+  dependencies:
+    anymatch "~3.1.1"
+    braces "~3.0.2"
+    glob-parent "~5.1.0"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.5.0"
+  optionalDependencies:
+    fsevents "~2.3.1"
+
+chokidar@^2.1.8:
+  version "2.1.8"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
+  integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==
+  dependencies:
+    anymatch "^2.0.0"
+    async-each "^1.0.1"
+    braces "^2.3.2"
+    glob-parent "^3.1.0"
+    inherits "^2.0.3"
+    is-binary-path "^1.0.0"
+    is-glob "^4.0.0"
+    normalize-path "^3.0.0"
+    path-is-absolute "^1.0.0"
+    readdirp "^2.2.1"
+    upath "^1.1.1"
+  optionalDependencies:
+    fsevents "^1.2.7"
+
+chownr@^1.1.1:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
+  integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
+
+chownr@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
+  integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
+
+chrome-trace-event@^1.0.2:
+  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==
+
+ci-info@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
+  integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
+
+ci-info@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.0.tgz#b4ed1fb6818dea4803a55c623041f9165d2066b2"
+  integrity sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw==
+
+cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
+  integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==
+  dependencies:
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+class-utils@^0.3.5:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+  integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
+  dependencies:
+    arr-union "^3.1.0"
+    define-property "^0.2.5"
+    isobject "^3.0.0"
+    static-extend "^0.1.1"
+
+clean-base-url@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/clean-base-url/-/clean-base-url-1.0.0.tgz#c901cf0a20b972435b0eccd52d056824a4351b7b"
+  integrity sha1-yQHPCiC5ckNbDszVLQVoJKQ1G3s=
+
+clean-css-promise@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/clean-css-promise/-/clean-css-promise-0.1.1.tgz#43f3d2c8dfcb2bf071481252cd9b76433c08eecb"
+  integrity sha1-Q/PSyN/LK/BxSBJSzZt2QzwI7ss=
+  dependencies:
+    array-to-error "^1.0.0"
+    clean-css "^3.4.5"
+    pinkie-promise "^2.0.0"
+
+clean-css@^3.4.5:
+  version "3.4.28"
+  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-3.4.28.tgz#bf1945e82fc808f55695e6ddeaec01400efd03ff"
+  integrity sha1-vxlF6C/ICPVWlebd6uwBQA79A/8=
+  dependencies:
+    commander "2.8.x"
+    source-map "0.4.x"
+
+clean-stack@^2.0.0, clean-stack@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
+  integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
+
+clean-up-path@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/clean-up-path/-/clean-up-path-1.0.0.tgz#de9e8196519912e749c9eaf67c13d64fac72a3e5"
+  integrity sha512-PHGlEF0Z6976qQyN6gM7kKH6EH0RdfZcc8V+QhFe36eRxV0SMH5OUBZG7Bxa9YcreNzyNbK63cGiZxdSZgosRw==
+
+cli-cursor@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
+  integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
+  dependencies:
+    restore-cursor "^2.0.0"
+
+cli-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
+  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
+  dependencies:
+    restore-cursor "^3.1.0"
+
+cli-spinners@^2.0.0, cli-spinners@^2.5.0:
+  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-table@^0.3.1:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/cli-table/-/cli-table-0.3.6.tgz#e9d6aa859c7fe636981fd3787378c2a20bce92fc"
+  integrity sha512-ZkNZbnZjKERTY5NwC2SeMeLeifSPq/pubeRoTpdr3WchLlnZg6hEgvHkK5zL7KNFdd9PmHN8lxrENUwI3cE8vQ==
+  dependencies:
+    colors "1.0.3"
+
+cli-truncate@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7"
+  integrity sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==
+  dependencies:
+    slice-ansi "^3.0.0"
+    string-width "^4.2.0"
+
+cli-width@^2.0.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"
+  integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==
+
+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==
+
+clipboard@^2.0.0:
+  version "2.0.8"
+  resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.8.tgz#ffc6c103dd2967a83005f3f61976aa4655a4cdba"
+  integrity sha512-Y6WO0unAIQp5bLmk1zdThRhgJt/x3ks6f30s3oE3H1mgIEU33XyQjEf8gsf6DxC7NPX8Y1SsNWjUjL/ywLnnbQ==
+  dependencies:
+    good-listener "^1.2.2"
+    select "^1.1.2"
+    tiny-emitter "^2.0.0"
+
+cliui@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
+  integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==
+  dependencies:
+    string-width "^3.1.0"
+    strip-ansi "^5.2.0"
+    wrap-ansi "^5.1.0"
+
+cliui@^7.0.2:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
+  integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+    wrap-ansi "^7.0.0"
+
+clone@^1.0.2:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
+  integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
+
+clone@^2.0.0, clone@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
+  integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
+
+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=
+
+codemirror@^5.47.0:
+  version "5.65.2"
+  resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.65.2.tgz#5799a70cb3d706e10f60e267245e3a75205d3dd9"
+  integrity sha512-SZM4Zq7XEC8Fhroqe3LxbEEX1zUPWH1wMr5zxiBuiUF64iYOUH/JI88v4tBag8MiBS8B8gRv8O1pPXGYXQ4ErA==
+
+codemirror@^5.58.2:
+  version "5.61.0"
+  resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.61.0.tgz#318e5b034a707207948b92ffc2862195e8fdb08e"
+  integrity sha512-D3wYH90tYY1BsKlUe0oNj2JAhQ9TepkD51auk3N7q+4uz7A/cgJ5JsWHreT0PqieW1QhOuqxQ2reCXV1YXzecg==
+
+collection-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
+  dependencies:
+    map-visit "^1.0.0"
+    object-visit "^1.0.0"
+
+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==
+  dependencies:
+    color-name "1.1.3"
+
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+  dependencies:
+    color-name "~1.1.4"
+
+color-name@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
+
+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==
+
+colorette@^1.2.2:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.4.0.tgz#5190fbb87276259a86ad700bff2c6d6faa3fca40"
+  integrity sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==
+
+colors@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
+  integrity sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=
+
+colors@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
+  integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
+
+columnify@^1.5.4:
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.5.4.tgz#4737ddf1c7b69a8a7c340570782e947eec8e78bb"
+  integrity sha1-Rzfd8ce2mop8NAVweC6UfuyOeLs=
+  dependencies:
+    strip-ansi "^3.0.0"
+    wcwidth "^1.0.0"
+
+combined-stream@^1.0.6, combined-stream@~1.0.6:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
+  dependencies:
+    delayed-stream "~1.0.0"
+
+commander@2, commander@^2.15.1, commander@^2.20.0, commander@^2.6.0:
+  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@2.8.x:
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
+  integrity sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=
+  dependencies:
+    graceful-readlink ">= 1.0.0"
+
+commander@7.2.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@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
+  integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
+
+commander@^6.2.0:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c"
+  integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==
+
+commander@^8.3.0:
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
+  integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
+
+common-tags@^1.4.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937"
+  integrity sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw==
+
+common-tags@^1.8.0:
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.2.tgz#94ebb3c076d26032745fd54face7f688ef5ac9c6"
+  integrity sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==
+
+commondir@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
+  integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
+
+component-bind@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
+  integrity sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=
+
+component-emitter@1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
+  integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
+
+component-emitter@^1.2.1, component-emitter@~1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
+  integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
+
+component-inherit@0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
+  integrity sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=
+
+compressible@~2.0.16:
+  version "2.0.18"
+  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba"
+  integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==
+  dependencies:
+    mime-db ">= 1.43.0 < 2"
+
+compression@^1.7.4:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
+  integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
+  dependencies:
+    accepts "~1.3.5"
+    bytes "3.0.0"
+    compressible "~2.0.16"
+    debug "2.6.9"
+    on-headers "~1.0.2"
+    safe-buffer "5.1.2"
+    vary "~1.1.2"
+
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+
+concat-stream@^1.5.0:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
+  dependencies:
+    buffer-from "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^2.2.2"
+    typedarray "^0.0.6"
+
+configstore@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96"
+  integrity sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==
+  dependencies:
+    dot-prop "^5.2.0"
+    graceful-fs "^4.1.2"
+    make-dir "^3.0.0"
+    unique-string "^2.0.0"
+    write-file-atomic "^3.0.0"
+    xdg-basedir "^4.0.0"
+
+connect@^3.6.6:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz#5d49348910caa5e07a01800b030d0c35f20484f8"
+  integrity sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==
+  dependencies:
+    debug "2.6.9"
+    finalhandler "1.1.2"
+    parseurl "~1.3.3"
+    utils-merge "1.0.1"
+
+console-browserify@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
+  integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==
+
+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=
+
+console-ui@^3.0.4, console-ui@^3.1.1, console-ui@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/console-ui/-/console-ui-3.1.2.tgz#51aef616ff02013c85ccee6a6d77ef7a94202e7a"
+  integrity sha512-+5j3R4wZJcEYZeXk30whc4ZU/+fWW9JMTNntVuMYpjZJ9n26Cxr0tUBXco1NRjVZRpRVvZ4DDKKKIHNYeUG9Dw==
+  dependencies:
+    chalk "^2.1.0"
+    inquirer "^6"
+    json-stable-stringify "^1.0.1"
+    ora "^3.4.0"
+    through2 "^3.0.1"
+
+consolidate@^0.15.1:
+  version "0.15.1"
+  resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.15.1.tgz#21ab043235c71a07d45d9aad98593b0dba56bab7"
+  integrity sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==
+  dependencies:
+    bluebird "^3.1.1"
+
+constants-browserify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
+  integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
+
+content-disposition@0.5.3:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd"
+  integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==
+  dependencies:
+    safe-buffer "5.1.2"
+
+content-type@~1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
+  integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
+
+continuable-cache@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/continuable-cache/-/continuable-cache-0.3.1.tgz#bd727a7faed77e71ff3985ac93351a912733ad0f"
+  integrity sha1-vXJ6f67XfnH/OYWskzUakSczrQ8=
+
+convert-source-map@^1.5.1, 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"
+
+cookie-signature@1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
+  integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
+
+cookie@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
+  integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
+
+cookie@~0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1"
+  integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==
+
+cool-checkboxes-for-bulma.io@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/cool-checkboxes-for-bulma.io/-/cool-checkboxes-for-bulma.io-1.1.0.tgz#4715f5144b952b9c9d19eab5315d738359fae833"
+  integrity sha512-RDEXOeS9COGTbQjlwRQzPRwOA8ycP4azc/GDVF5qYSOs4tYk6dc9SWNOj7Bb/NvhVUsb+H95pNtGgOBwCENBQg==
+
+copy-concurrently@^1.0.0:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
+  integrity sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==
+  dependencies:
+    aproba "^1.1.1"
+    fs-write-stream-atomic "^1.0.8"
+    iferr "^0.1.5"
+    mkdirp "^0.5.1"
+    rimraf "^2.5.4"
+    run-queue "^1.0.0"
+
+copy-dereference@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/copy-dereference/-/copy-dereference-1.0.0.tgz#6b131865420fd81b413ba994b44d3655311152b6"
+  integrity sha1-axMYZUIP2BtBO6mUtE02VTERUrY=
+
+copy-descriptor@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
+
+core-js-compat@^3.16.2:
+  version "3.18.2"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.18.2.tgz#e40c266fbd613948dd8d2d2156345da8ac03c142"
+  integrity sha512-25VJYCJtGjZwLguj7d66oiHfmnVw3TMOZ0zV8DyMJp/aeQ3OjR519iOOeck08HMyVVRAqXxafc2Hl+5QstJrsQ==
+  dependencies:
+    browserslist "^4.17.3"
+    semver "7.0.0"
+
+core-js-compat@^3.18.0:
+  version "3.19.2"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.19.2.tgz#18066a3404a302433cb0aa8be82dd3d75c76e5c4"
+  integrity sha512-ObBY1W5vx/LFFMaL1P5Udo4Npib6fu+cMokeziWkA8Tns4FcDemKF5j9JvaI5JhdkW8EQJQGJN1EcrzmEwuAqQ==
+  dependencies:
+    browserslist "^4.18.1"
+    semver "7.0.0"
+
+core-js-compat@^3.20.2, core-js-compat@^3.21.0:
+  version "3.21.1"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.21.1.tgz#cac369f67c8d134ff8f9bd1623e3bc2c42068c82"
+  integrity sha512-gbgX5AUvMb8gwxC7FLVWYT7Kkgu/y7+h/h1X43yJkNqhlK2fuYyQimqvKGNZFAY6CKii/GFKJ2cp/1/42TN36g==
+  dependencies:
+    browserslist "^4.19.1"
+    semver "7.0.0"
+
+core-js-compat@^3.22.1:
+  version "3.22.8"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.22.8.tgz#46fa34ce1ddf742acd7f95f575f66bbb21e05d62"
+  integrity sha512-pQnwg4xtuvc2Bs/5zYQPaEYYSuTxsF7LBWF0SvnVhthZo/Qe+rJpcEekrdNK5DWwDJ0gv0oI9NNX5Mppdy0ctg==
+  dependencies:
+    browserslist "^4.20.3"
+    semver "7.0.0"
+
+core-js-compat@^3.9.0:
+  version "3.19.1"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.19.1.tgz#fe598f1a9bf37310d77c3813968e9f7c7bb99476"
+  integrity sha512-Q/VJ7jAF/y68+aUsQJ/afPOewdsGkDtcMb40J8MbuWKlK3Y+wtHq8bTHKPj2WKWLIqmS5JhHs4CzHtz6pT2W6g==
+  dependencies:
+    browserslist "^4.17.6"
+    semver "7.0.0"
+
+core-js@^2.4.0, core-js@^2.5.0, core-js@^2.6.5:
+  version "2.6.12"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
+  integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
+
+core-js@^3.1.4:
+  version "3.11.2"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.11.2.tgz#af087a43373fc6e72942917c4a4c3de43ed574d6"
+  integrity sha512-3tfrrO1JpJSYGKnd9LKTBPqgUES/UYiCzMKeqwR1+jF16q4kD1BY2NvqkfuzXwQ6+CIWm55V9cjD7PQd+hijdw==
+
+core-js@^3.16.2:
+  version "3.22.8"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.22.8.tgz#23f860b1fe60797cc4f704d76c93fea8a2f60631"
+  integrity sha512-UoGQ/cfzGYIuiq6Z7vWL1HfkE9U9IZ4Ub+0XSiJTCzvbZzgPA69oDF2f+lgJ6dFFLEdjW5O6svvoKzXX23xFkA==
+
+core-object@^3.1.5:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/core-object/-/core-object-3.1.5.tgz#fa627b87502adc98045e44678e9a8ec3b9c0d2a9"
+  integrity sha512-sA2/4+/PZ/KV6CKgjrVrrUVBKCkdDO02CUlQ0YKTQoYUwPYNOtOAcWlbYhd5v/1JqYaA6oZ4sDlOU4ppVw6Wbg==
+  dependencies:
+    chalk "^2.0.0"
+
+core-util-is@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+
+core-util-is@~1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
+  integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
+
+cosmiconfig@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.0.tgz#ef9b44d773959cae63ddecd122de23853b60f8d3"
+  integrity sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==
+  dependencies:
+    "@types/parse-json" "^4.0.0"
+    import-fresh "^3.2.1"
+    parse-json "^5.0.0"
+    path-type "^4.0.0"
+    yaml "^1.10.0"
+
+create-ecdh@^4.0.0:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz#d6e7f4bffa66736085a0762fd3a632684dabcc4e"
+  integrity sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==
+  dependencies:
+    bn.js "^4.1.0"
+    elliptic "^6.5.3"
+
+create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
+  integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
+  dependencies:
+    cipher-base "^1.0.1"
+    inherits "^2.0.1"
+    md5.js "^1.3.4"
+    ripemd160 "^2.0.1"
+    sha.js "^2.4.0"
+
+create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
+  integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==
+  dependencies:
+    cipher-base "^1.0.3"
+    create-hash "^1.1.0"
+    inherits "^2.0.1"
+    ripemd160 "^2.0.0"
+    safe-buffer "^5.0.1"
+    sha.js "^2.4.8"
+
+cross-spawn@^6.0.0, cross-spawn@^6.0.5:
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
+  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
+  dependencies:
+    nice-try "^1.0.4"
+    path-key "^2.0.1"
+    semver "^5.5.0"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
+
+cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
+  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  dependencies:
+    path-key "^3.1.0"
+    shebang-command "^2.0.0"
+    which "^2.0.1"
+
+cryptiles@^4.1.2:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-4.1.3.tgz#2461d3390ea0b82c643a6ba79f0ed491b0934c25"
+  integrity sha512-gT9nyTMSUC1JnziQpPbxKGBbUg8VL7Zn2NB4E1cJYvuXdElHrwxrV9bmltZGDzet45zSDGyYceueke1TjynGzw==
+  dependencies:
+    boom "7.x.x"
+
+crypto-browserify@^3.11.0:
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
+  integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==
+  dependencies:
+    browserify-cipher "^1.0.0"
+    browserify-sign "^4.0.0"
+    create-ecdh "^4.0.0"
+    create-hash "^1.1.0"
+    create-hmac "^1.1.0"
+    diffie-hellman "^5.0.0"
+    inherits "^2.0.1"
+    pbkdf2 "^3.0.3"
+    public-encrypt "^4.0.0"
+    randombytes "^2.0.0"
+    randomfill "^1.0.3"
+
+crypto-random-string@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5"
+  integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==
+
+css-loader@^5.2.0:
+  version "5.2.7"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-5.2.7.tgz#9b9f111edf6fb2be5dc62525644cbc9c232064ae"
+  integrity sha512-Q7mOvpBNBG7YrVGMxRxcBJZFL75o+cH2abNASdibkj/fffYD8qWbInZrD0S9ccI6vZclF3DsHE7njGlLtaHbhg==
+  dependencies:
+    icss-utils "^5.1.0"
+    loader-utils "^2.0.0"
+    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"
+    schema-utils "^3.0.0"
+    semver "^7.3.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@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
+  integrity sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=
+  dependencies:
+    boolbase "~1.0.0"
+    css-what "2.1"
+    domutils "1.5.1"
+    nth-check "~1.0.1"
+
+css-tree@1.0.0-alpha.29:
+  version "1.0.0-alpha.29"
+  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.29.tgz#3fa9d4ef3142cbd1c301e7664c1f352bd82f5a39"
+  integrity sha512-sRNb1XydwkW9IOci6iB2xmy8IGCj6r/fr+JWitvJ2JxQRPzN3T4AGGVWCMlVmVwM1gtgALJRmGIlWv5ppnGGkg==
+  dependencies:
+    mdn-data "~1.1.0"
+    source-map "^0.5.3"
+
+css-tree@1.0.0-alpha.33:
+  version "1.0.0-alpha.33"
+  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.33.tgz#970e20e5a91f7a378ddd0fc58d0b6c8d4f3be93e"
+  integrity sha512-SPt57bh5nQnpsTBsx/IXbO14sRc9xXu5MtMAVuo0BaQQmyf0NupNPPSoMaqiAF5tDFafYsTkfeH4Q/HCKXkg4w==
+  dependencies:
+    mdn-data "2.0.4"
+    source-map "^0.5.3"
+
+css-tree@^2.0.4:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-2.1.0.tgz#170e27ccf94e7c5facb183765c25898be843d1d2"
+  integrity sha512-PcysZRzToBbrpoUrZ9qfblRIRf8zbEAkU0AIpQFtgkFK0vSbzOmBCvdSAx2Zg7Xx5wiYJKUKk0NMP7kxevie/A==
+  dependencies:
+    mdn-data "2.0.27"
+    source-map-js "^1.0.1"
+
+css-what@2.1:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2"
+  integrity sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==
+
+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==
+
+cssesc@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
+  integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
+
+csso@^3.5.1:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/csso/-/csso-3.5.1.tgz#7b9eb8be61628973c1b261e169d2f024008e758b"
+  integrity sha512-vrqULLffYU1Q2tLdJvaCYbONStnfkfimRxXNaGjxMldI0C7JPBC4rB1RyjhfdZ4m1frm8pM9uRPKH3d2knZ8gg==
+  dependencies:
+    css-tree "1.0.0-alpha.29"
+
+cssom@^0.4.4:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10"
+  integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==
+
+cssom@~0.3.6:
+  version "0.3.8"
+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
+  integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==
+
+cssstyle@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852"
+  integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==
+  dependencies:
+    cssom "~0.3.6"
+
+cyclist@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
+  integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=
+
+d3-array@1, d3-array@^1.1.1, d3-array@^1.2.0:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-1.2.4.tgz#635ce4d5eea759f6f605863dbcfc30edc737f71f"
+  integrity sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw==
+
+d3-axis@1, d3-axis@^1.0.8:
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/d3-axis/-/d3-axis-1.0.12.tgz#cdf20ba210cfbb43795af33756886fb3638daac9"
+  integrity sha512-ejINPfPSNdGFKEOAtnBtdkpr24c4d4jsei6Lg98mxf424ivoDP2956/5HDpIAtmHo85lqT4pruy+zEgvRUBqaQ==
+
+d3-brush@1:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/d3-brush/-/d3-brush-1.1.6.tgz#b0a22c7372cabec128bdddf9bddc058592f89e9b"
+  integrity sha512-7RW+w7HfMCPyZLifTz/UnJmI5kdkXtpCbombUSs8xniAyo0vIbrDzDwUJB6eJOgl9u5DQOt2TQlYumxzD1SvYA==
+  dependencies:
+    d3-dispatch "1"
+    d3-drag "1"
+    d3-interpolate "1"
+    d3-selection "1"
+    d3-transition "1"
+
+d3-chord@1:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/d3-chord/-/d3-chord-1.0.6.tgz#309157e3f2db2c752f0280fedd35f2067ccbb15f"
+  integrity sha512-JXA2Dro1Fxw9rJe33Uv+Ckr5IrAa74TlfDEhE/jfLOaXegMQFQTAgAw9WnZL8+HxVBRXaRGCkrNU7pJeylRIuA==
+  dependencies:
+    d3-array "1"
+    d3-path "1"
+
+d3-collection@1, d3-collection@^1.0.4:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/d3-collection/-/d3-collection-1.0.7.tgz#349bd2aa9977db071091c13144d5e4f16b5b310e"
+  integrity sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A==
+
+d3-color@1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-1.4.1.tgz#c52002bf8846ada4424d55d97982fef26eb3bc8a"
+  integrity sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q==
+
+d3-contour@1:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/d3-contour/-/d3-contour-1.3.2.tgz#652aacd500d2264cb3423cee10db69f6f59bead3"
+  integrity sha512-hoPp4K/rJCu0ladiH6zmJUEz6+u3lgR+GSm/QdM2BBvDraU39Vr7YdDCicJcxP1z8i9B/2dJLgDC1NcvlF8WCg==
+  dependencies:
+    d3-array "^1.1.1"
+
+d3-dispatch@1:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/d3-dispatch/-/d3-dispatch-1.0.6.tgz#00d37bcee4dd8cd97729dd893a0ac29caaba5d58"
+  integrity sha512-fVjoElzjhCEy+Hbn8KygnmMS7Or0a9sI2UzGwoB7cCtvI1XpVN9GpoYlnb3xt2YV66oXYb1fLJ8GMvP4hdU1RA==
+
+d3-drag@1:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/d3-drag/-/d3-drag-1.2.5.tgz#2537f451acd39d31406677b7dc77c82f7d988f70"
+  integrity sha512-rD1ohlkKQwMZYkQlYVCrSFxsWPzI97+W+PaEIBNTMxRuxz9RF0Hi5nJWHGVJ3Om9d2fRTe1yOBINJyy/ahV95w==
+  dependencies:
+    d3-dispatch "1"
+    d3-selection "1"
+
+d3-dsv@1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/d3-dsv/-/d3-dsv-1.2.0.tgz#9d5f75c3a5f8abd611f74d3f5847b0d4338b885c"
+  integrity sha512-9yVlqvZcSOMhCYzniHE7EVUws7Fa1zgw+/EAV2BxJoG3ME19V6BQFBwI855XQDsxyOuG7NibqRMTtiF/Qup46g==
+  dependencies:
+    commander "2"
+    iconv-lite "0.4"
+    rw "1"
+
+d3-ease@1, d3-ease@^1.0.5:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-1.0.7.tgz#9a834890ef8b8ae8c558b2fe55bd57f5993b85e2"
+  integrity sha512-lx14ZPYkhNx0s/2HX5sLFUI3mbasHjSSpwO/KaaNACweVwxUruKyWVcb293wMv1RqTPZyZ8kSZ2NogUZNcLOFQ==
+
+d3-fetch@1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/d3-fetch/-/d3-fetch-1.2.0.tgz#15ce2ecfc41b092b1db50abd2c552c2316cf7fc7"
+  integrity sha512-yC78NBVcd2zFAyR/HnUiBS7Lf6inSCoWcSxFfw8FYL7ydiqe80SazNwoffcqOfs95XaLo7yebsmQqDKSsXUtvA==
+  dependencies:
+    d3-dsv "1"
+
+d3-force@1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/d3-force/-/d3-force-1.2.1.tgz#fd29a5d1ff181c9e7f0669e4bd72bdb0e914ec0b"
+  integrity sha512-HHvehyaiUlVo5CxBJ0yF/xny4xoaxFxDnBXNvNcfW9adORGZfyNF1dj6DGLKyk4Yh3brP/1h3rnDzdIAwL08zg==
+  dependencies:
+    d3-collection "1"
+    d3-dispatch "1"
+    d3-quadtree "1"
+    d3-timer "1"
+
+d3-format@1:
+  version "1.4.5"
+  resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.4.5.tgz#374f2ba1320e3717eb74a9356c67daee17a7edb4"
+  integrity sha512-J0piedu6Z8iB6TbIGfZgDzfXxUFN3qQRMofy2oPdXzQibYGqPB/9iMcxr/TGalU+2RsyDO+U4f33id8tbnSRMQ==
+
+d3-geo@1:
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-1.12.1.tgz#7fc2ab7414b72e59fbcbd603e80d9adc029b035f"
+  integrity sha512-XG4d1c/UJSEX9NfU02KwBL6BYPj8YKHxgBEw5om2ZnTRSbIcego6dhHwcxuSR3clxh0EpE38os1DVPOmnYtTPg==
+  dependencies:
+    d3-array "1"
+
+d3-hierarchy@1:
+  version "1.1.9"
+  resolved "https://registry.yarnpkg.com/d3-hierarchy/-/d3-hierarchy-1.1.9.tgz#2f6bee24caaea43f8dc37545fa01628559647a83"
+  integrity sha512-j8tPxlqh1srJHAtxfvOUwKNYJkQuBFdM1+JAUfq6xqH5eAqf93L7oG1NVqDa4CpFZNvnNKtCYEUC8KY9yEn9lQ==
+
+d3-interpolate@1:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-1.4.0.tgz#526e79e2d80daa383f9e0c1c1c7dcc0f0583e987"
+  integrity sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==
+  dependencies:
+    d3-color "1"
+
+d3-path@1:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/d3-path/-/d3-path-1.0.9.tgz#48c050bb1fe8c262493a8caf5524e3e9591701cf"
+  integrity sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg==
+
+d3-polygon@1:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/d3-polygon/-/d3-polygon-1.0.6.tgz#0bf8cb8180a6dc107f518ddf7975e12abbfbd38e"
+  integrity sha512-k+RF7WvI08PC8reEoXa/w2nSg5AUMTi+peBD9cmFc+0ixHfbs4QmxxkarVal1IkVkgxVuk9JSHhJURHiyHKAuQ==
+
+d3-quadtree@1:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/d3-quadtree/-/d3-quadtree-1.0.7.tgz#ca8b84df7bb53763fe3c2f24bd435137f4e53135"
+  integrity sha512-RKPAeXnkC59IDGD0Wu5mANy0Q2V28L+fNe65pOCXVdVuTJS3WPKaJlFHer32Rbh9gIo9qMuJXio8ra4+YmIymA==
+
+d3-random@1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/d3-random/-/d3-random-1.1.2.tgz#2833be7c124360bf9e2d3fd4f33847cfe6cab291"
+  integrity sha512-6AK5BNpIFqP+cx/sreKzNjWbwZQCSUatxq+pPRmFIQaWuoD+NrbVWw7YWpHiXpCQ/NanKdtGDuB+VQcZDaEmYQ==
+
+d3-scale-chromatic@1:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/d3-scale-chromatic/-/d3-scale-chromatic-1.5.0.tgz#54e333fc78212f439b14641fb55801dd81135a98"
+  integrity sha512-ACcL46DYImpRFMBcpk9HhtIyC7bTBR4fNOPxwVSl0LfulDAwyiHyPOTqcDG1+t5d4P9W7t/2NAuWu59aKko/cg==
+  dependencies:
+    d3-color "1"
+    d3-interpolate "1"
+
+d3-scale@2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-2.2.2.tgz#4e880e0b2745acaaddd3ede26a9e908a9e17b81f"
+  integrity sha512-LbeEvGgIb8UMcAa0EATLNX0lelKWGYDQiPdHj+gLblGVhGLyNbaCn3EvrJf0A3Y/uOOU5aD6MTh5ZFCdEwGiCw==
+  dependencies:
+    d3-array "^1.2.0"
+    d3-collection "1"
+    d3-format "1"
+    d3-interpolate "1"
+    d3-time "1"
+    d3-time-format "2"
+
+d3-scale@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-1.0.7.tgz#fa90324b3ea8a776422bd0472afab0b252a0945d"
+  integrity sha512-KvU92czp2/qse5tUfGms6Kjig0AhHOwkzXG0+PqIJB3ke0WUv088AHMZI0OssO9NCkXt4RP8yju9rpH8aGB7Lw==
+  dependencies:
+    d3-array "^1.2.0"
+    d3-collection "1"
+    d3-color "1"
+    d3-format "1"
+    d3-interpolate "1"
+    d3-time "1"
+    d3-time-format "2"
+
+d3-selection-multi@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/d3-selection-multi/-/d3-selection-multi-1.0.1.tgz#cd6c25413d04a2cb97470e786f2cd877f3e34f58"
+  integrity sha1-zWwlQT0EosuXRw54byzYd/PjT1g=
+  dependencies:
+    d3-selection "1"
+    d3-transition "1"
+
+d3-selection@1, d3-selection@^1.1.0, d3-selection@^1.3.0:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.4.2.tgz#dcaa49522c0dbf32d6c1858afc26b6094555bc5c"
+  integrity sha512-SJ0BqYihzOjDnnlfyeHT0e30k0K1+5sR3d5fNueCNeuhZTnGw4M4o8mqJchSwgKMXCNFo+e2VTChiSJ0vYtXkg==
+
+d3-shape@1:
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.3.7.tgz#df63801be07bc986bc54f63789b4fe502992b5d7"
+  integrity sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw==
+  dependencies:
+    d3-path "1"
+
+d3-time-format@2, d3-time-format@^2.1.1:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.3.0.tgz#107bdc028667788a8924ba040faf1fbccd5a7850"
+  integrity sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==
+  dependencies:
+    d3-time "1"
+
+d3-time@1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-1.1.0.tgz#b1e19d307dae9c900b7e5b25ffc5dcc249a8a0f1"
+  integrity sha512-Xh0isrZ5rPYYdqhAVk8VLnMEidhz5aP7htAADH6MfzgmmicPkTo8LhkLxci61/lCB7n7UmE3bN0leRt+qvkLxA==
+
+d3-timer@1:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-1.0.10.tgz#dfe76b8a91748831b13b6d9c793ffbd508dd9de5"
+  integrity sha512-B1JDm0XDaQC+uvo4DT79H0XmBskgS3l6Ve+1SBCfxgmtIb1AVrPIoqd+nPSv+loMX8szQ0sVUhGngL7D5QPiXw==
+
+d3-tip@^0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/d3-tip/-/d3-tip-0.9.1.tgz#84e6d331c4e6650d80c5228a07e41820609ab64b"
+  integrity sha512-EVBfG9d+HnjIoyVXfhpytWxlF59JaobwizqMX9EBXtsFmJytjwHeYiUs74ldHQjE7S9vzfKTx2LCtvUrIbuFYg==
+  dependencies:
+    d3-collection "^1.0.4"
+    d3-selection "^1.3.0"
+
+d3-transition@1, d3-transition@^1.2.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/d3-transition/-/d3-transition-1.3.2.tgz#a98ef2151be8d8600543434c1ca80140ae23b398"
+  integrity sha512-sc0gRU4PFqZ47lPVHloMn9tlPcv8jxgOQg+0zjhfZXMQuvppjG6YuwdMBE0TuqCZjeJkLecku/l9R0JPcRhaDA==
+  dependencies:
+    d3-color "1"
+    d3-dispatch "1"
+    d3-ease "1"
+    d3-interpolate "1"
+    d3-selection "^1.1.0"
+    d3-timer "1"
+
+d3-voronoi@1:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/d3-voronoi/-/d3-voronoi-1.1.4.tgz#dd3c78d7653d2bb359284ae478645d95944c8297"
+  integrity sha512-dArJ32hchFsrQ8uMiTBLq256MpnZjeuBtdHpaDlYuQyjU0CVzCJl/BVW+SkszaAeH95D/8gxqAhgx0ouAWAfRg==
+
+d3-zoom@1:
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/d3-zoom/-/d3-zoom-1.8.3.tgz#b6a3dbe738c7763121cd05b8a7795ffe17f4fc0a"
+  integrity sha512-VoLXTK4wvy1a0JpH2Il+F2CiOhVu7VRXWF5M/LroMIh3/zBAC3WAt7QoIvPibOavVo20hN6/37vwAsdBejLyKQ==
+  dependencies:
+    d3-dispatch "1"
+    d3-drag "1"
+    d3-interpolate "1"
+    d3-selection "1"
+    d3-transition "1"
+
+d3@^5.0.0:
+  version "5.16.0"
+  resolved "https://registry.yarnpkg.com/d3/-/d3-5.16.0.tgz#9c5e8d3b56403c79d4ed42fbd62f6113f199c877"
+  integrity sha512-4PL5hHaHwX4m7Zr1UapXW23apo6pexCgdetdJ5kTmADpG/7T9Gkxw0M0tf/pjoB63ezCCm0u5UaFYy2aMt0Mcw==
+  dependencies:
+    d3-array "1"
+    d3-axis "1"
+    d3-brush "1"
+    d3-chord "1"
+    d3-collection "1"
+    d3-color "1"
+    d3-contour "1"
+    d3-dispatch "1"
+    d3-drag "1"
+    d3-dsv "1"
+    d3-ease "1"
+    d3-fetch "1"
+    d3-force "1"
+    d3-format "1"
+    d3-geo "1"
+    d3-hierarchy "1"
+    d3-interpolate "1"
+    d3-path "1"
+    d3-polygon "1"
+    d3-quadtree "1"
+    d3-random "1"
+    d3-scale "2"
+    d3-scale-chromatic "1"
+    d3-selection "1"
+    d3-shape "1"
+    d3-time "1"
+    d3-time-format "2"
+    d3-timer "1"
+    d3-transition "1"
+    d3-voronoi "1"
+    d3-zoom "1"
+
+dag-map@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/dag-map/-/dag-map-2.0.2.tgz#9714b472de82a1843de2fba9b6876938cab44c68"
+  integrity sha1-lxS0ct6CoYQ94vuptodpOMq0TGg=
+
+dashdash@^1.12.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
+  dependencies:
+    assert-plus "^1.0.0"
+
+data-urls@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b"
+  integrity sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==
+  dependencies:
+    abab "^2.0.3"
+    whatwg-mimetype "^2.3.0"
+    whatwg-url "^8.0.0"
+
+date-fns-tz@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/date-fns-tz/-/date-fns-tz-1.2.2.tgz#89432b54ce3fa7d050a2039e997e5b6a96df35dd"
+  integrity sha512-vWtn44eEqnLbkACb7T5G5gPgKR4nY8NkNMOCyoY49NsRGHrcDmY2aysCyzDeA+u+vcDBn/w6nQqEDyouRs4m8w==
+
+date-fns@^2.16.1:
+  version "2.21.1"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.21.1.tgz#679a4ccaa584c0706ea70b3fa92262ac3009d2b0"
+  integrity sha512-m1WR0xGiC6j6jNFAyW4Nvh4WxAi4JF4w9jRJwSI8nBmNcyZXPcP9VUQG+6gHQXAmqaGEKDKhOqAtENDC941UkA==
+
+date-fns@^2.28.0:
+  version "2.28.0"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.28.0.tgz#9570d656f5fc13143e50c975a3b6bbeb46cd08b2"
+  integrity sha512-8d35hViGYx/QH0icHYCeLmsLmMUheMmTyV9Fcm6gvNwdw31yXXH+O85sOBJ+OLnLQMKZowvpKb6FgMIQjcpvQw==
+
+date-time@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/date-time/-/date-time-2.1.0.tgz#0286d1b4c769633b3ca13e1e62558d2dbdc2eba2"
+  integrity sha512-/9+C44X7lot0IeiyfgJmETtRMhBidBYM2QFFIkGa0U1k+hSyY87Nw7PY3eDqpvCBm7I3WCSfPeZskW/YYq6m4g==
+  dependencies:
+    time-zone "^1.0.0"
+
+debug@2.6.9, debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, 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@^3.0.1, debug@^3.1.0, debug@^3.1.1:
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
+  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
+  dependencies:
+    ms "^2.1.1"
+
+debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1:
+  version "4.3.3"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664"
+  integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==
+  dependencies:
+    ms "2.1.2"
+
+debug@^4.0.1, debug@^4.2.0:
+  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@^4.3.3:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
+  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+  dependencies:
+    ms "2.1.2"
+
+debug@~3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
+  dependencies:
+    ms "2.0.0"
+
+debug@~4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
+  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
+  dependencies:
+    ms "^2.1.1"
+
+decache@^4.5.1:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/decache/-/decache-4.6.0.tgz#87026bc6e696759e82d57a3841c4e251a30356e8"
+  integrity sha512-PppOuLiz+DFeaUvFXEYZjLxAkKiMYH/do/b/MxpDe/8AgKBi5GhZxridoVIbBq72GDbL36e4p0Ce2jTGUwwU+w==
+  dependencies:
+    callsite "^1.0.0"
+
+decamelize-keys@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
+  integrity sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=
+  dependencies:
+    decamelize "^1.1.0"
+    map-obj "^1.0.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=
+
+decimal.js@^10.2.1:
+  version "10.2.1"
+  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.1.tgz#238ae7b0f0c793d3e3cea410108b35a2c01426a3"
+  integrity sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw==
+
+decode-uri-component@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
+
+dedent@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
+  integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=
+
+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=
+
+deepmerge@^4.0.0:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
+  integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
+
+defaults@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
+  integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=
+  dependencies:
+    clone "^1.0.2"
+
+define-properties@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
+  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
+  dependencies:
+    object-keys "^1.0.12"
+
+define-property@^0.2.5:
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
+  dependencies:
+    is-descriptor "^0.1.0"
+
+define-property@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
+  dependencies:
+    is-descriptor "^1.0.0"
+
+define-property@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
+  dependencies:
+    is-descriptor "^1.0.2"
+    isobject "^3.0.1"
+
+delayed-stream@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
+
+delegate@^3.1.2:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/delegate/-/delegate-3.2.0.tgz#b66b71c3158522e8ab5744f720d8ca0c2af59166"
+  integrity sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==
+
+delegates@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
+
+depd@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
+  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
+
+depd@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
+  integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
+
+des.js@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843"
+  integrity sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==
+  dependencies:
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+
+destroy@~1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
+  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
+
+detect-file@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
+  integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=
+
+detect-indent@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
+  integrity sha1-920GQ1LN9Docts5hnE7jqUdd4gg=
+  dependencies:
+    repeating "^2.0.0"
+
+detect-indent@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.0.0.tgz#0abd0f549f69fc6659a254fe96786186b6f528fd"
+  integrity sha512-oSyFlqaTHCItVRGK5RmrmjB+CmaMOW7IaNA/kdxqhoa6d17j/5ce9O9eWXmV/KEdRwqpQA+Vqe8a8Bsybu4YnA==
+
+detect-newline@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
+  integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
+
+diff-match-patch@^1.0.0:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.5.tgz#abb584d5f10cd1196dfc55aa03701592ae3f7b37"
+  integrity sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw==
+
+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@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b"
+  integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==
+
+diffie-hellman@^5.0.0:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
+  integrity sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==
+  dependencies:
+    bn.js "^4.1.0"
+    miller-rabin "^4.0.0"
+    randombytes "^2.0.0"
+
+dir-glob@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
+  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
+  dependencies:
+    path-type "^4.0.0"
+
+dlv@^1.1.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/dlv/-/dlv-1.1.3.tgz#5c198a8a11453596e751494d49874bc7732f2e79"
+  integrity sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==
+
+doctoc@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/doctoc/-/doctoc-2.2.0.tgz#27f23eb75d109d29722d449efbcde3854cb0eabf"
+  integrity sha512-PtiyaS+S3kcMbpx6x2V0S+PeDKisxmjEFnZsuYkkj4Lh3ObozJuuYh9dM4+sX02Ouuty8RF2LOCnIbpu/hWy/A==
+  dependencies:
+    "@textlint/markdown-to-ast" "^12.1.1"
+    anchor-markdown-header "^0.5.7"
+    htmlparser2 "^7.2.0"
+    minimist "^1.2.6"
+    underscore "^1.13.2"
+    update-section "^0.3.3"
+
+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-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.4.1"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.4.1.tgz#de5d41b1aea290215dc45a6dae8adcf1d32e2d30"
+  integrity sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==
+  dependencies:
+    domelementtype "^2.0.1"
+    domhandler "^4.2.0"
+    entities "^2.0.0"
+
+dom-serializer@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0"
+  integrity sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==
+  dependencies:
+    domelementtype "^1.3.0"
+    entities "^1.1.1"
+
+domain-browser@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
+  integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
+
+domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.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, domelementtype@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d"
+  integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
+
+domexception@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304"
+  integrity sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==
+  dependencies:
+    webidl-conversions "^5.0.0"
+
+domhandler@^2.3.0:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803"
+  integrity sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==
+  dependencies:
+    domelementtype "1"
+
+domhandler@^4.2.0, domhandler@^4.2.2:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.1.tgz#8d792033416f59d68bc03a5aa7b018c1ca89279c"
+  integrity sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==
+  dependencies:
+    domelementtype "^2.2.0"
+
+dompurify@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.0.2.tgz#bc4c7c011c825e7704341a285461d8d407d9429a"
+  integrity sha512-B8c6JdiEpxAKnd8Dm++QQxJL4lfuc757scZtcapj6qjTjrQzyq5iAyznLKVvK+77eYNiFblHBlt7MM0fOeqoKw==
+
+domutils@1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
+  integrity sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=
+  dependencies:
+    dom-serializer "0"
+    domelementtype "1"
+
+domutils@^1.5.1, 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"
+
+domutils@^2.8.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135"
+  integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==
+  dependencies:
+    dom-serializer "^1.0.1"
+    domelementtype "^2.2.0"
+    domhandler "^4.2.0"
+
+dot-case@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751"
+  integrity sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==
+  dependencies:
+    no-case "^3.0.4"
+    tslib "^2.0.3"
+
+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"
+
+duplexify@^3.4.2, duplexify@^3.6.0:
+  version "3.7.1"
+  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"
+  integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==
+  dependencies:
+    end-of-stream "^1.0.0"
+    inherits "^2.0.1"
+    readable-stream "^2.0.0"
+    stream-shift "^1.0.0"
+
+ecc-jsbn@~0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
+  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
+  dependencies:
+    jsbn "~0.1.0"
+    safer-buffer "^2.1.0"
+
+editions@^1.1.1:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/editions/-/editions-1.3.4.tgz#3662cb592347c3168eb8e498a0ff73271d67f50b"
+  integrity sha512-gzao+mxnYDzIysXKMQi/+M1mjy/rjestjg6OPoYTtI+3Izp23oiGZitsl9lPDPiTGXbcSIk1iJWhliSaglxnUg==
+
+editions@^2.2.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/editions/-/editions-2.3.1.tgz#3bc9962f1978e801312fbd0aebfed63b49bfe698"
+  integrity sha512-ptGvkwTvGdGfC0hfhKg0MT+TRLRKGtUiWGBInxOm5pz7ssADezahjCUaYuZ8Dr+C05FW0AECIIPt4WBxVINEhA==
+  dependencies:
+    errlop "^2.0.0"
+    semver "^6.3.0"
+
+ee-first@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
+  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
+
+electron-to-chromium@^1.3.30:
+  version "1.3.725"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.725.tgz#04fc83f9189169aff50f0a00c6b4090b910cba85"
+  integrity sha512-2BbeAESz7kc6KBzs7WVrMc1BY5waUphk4D4DX5dSQXJhsc3tP5ZFaiyuL0AB7vUKzDYpIeYwTYlEfxyjsGUrhw==
+
+electron-to-chromium@^1.3.47, electron-to-chromium@^1.3.723:
+  version "1.3.906"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.906.tgz#144e212691e35fa8c294431e2ecb51e4b03f7577"
+  integrity sha512-UjoECdcOYIVzWmrbtNnYpPrDuu+RtiO5W08Vdbid9ydGQMSdnqtJUtvOqQEAVQqpoXN9kSW9YnQufvzLQMYQOw==
+
+electron-to-chromium@^1.3.857:
+  version "1.3.866"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.866.tgz#d446338f5ad6948b27a50739760e7b0b5cc5032f"
+  integrity sha512-iYze6TpDXWxk+sfcpUUdTs6Pv/3kG45Pnjer2DxEeFw0N08bZeNLuz97s2lMgy8yObon48o0WHY2Bkg3xuAPOA==
+
+electron-to-chromium@^1.3.896:
+  version "1.4.10"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.10.tgz#5f44ae6f6725b1949d6e8d34352f80d4c1880734"
+  integrity sha512-tFgA40Iq2oy4k2PnZrLJowbgpij+lD6ZLxkw8Ht1NKTYyN8dvSvC5xlo8X0WW2jqhKSzITrbr5mpB4/AZ/8OUA==
+
+electron-to-chromium@^1.4.147:
+  version "1.4.148"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.148.tgz#437430e03c58ccd1d05701f66980afe54d2253ec"
+  integrity sha512-8MJk1bcQUAYkuvCyWZxaldiwoDG0E0AMzBGA6cv3WfuvJySiPgfidEPBFCRRH3cZm6SVZwo/oRlK1ehi1QNEIQ==
+
+electron-to-chromium@^1.4.84:
+  version "1.4.99"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.99.tgz#da97e2c116dc6de2f91a81b4ff8d1b19bf54dc1f"
+  integrity sha512-YXMzbvlo6pW12KWw0bj6cIGCJi1Moy8PLCuuzgRzg6WYIcHILK3szU+HHnHFx2b373qRv+cfmHhbmRbatyAbPA==
+
+elliptic@^6.5.3:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"
+  integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==
+  dependencies:
+    bn.js "^4.11.9"
+    brorand "^1.1.0"
+    hash.js "^1.0.0"
+    hmac-drbg "^1.0.1"
+    inherits "^2.0.4"
+    minimalistic-assert "^1.0.1"
+    minimalistic-crypto-utils "^1.0.1"
+
+ember-api-actions@^0.2.8:
+  version "0.2.9"
+  resolved "https://registry.yarnpkg.com/ember-api-actions/-/ember-api-actions-0.2.9.tgz#5352ea23bbd84f1a402d70a6bfe28d63b7dcb17a"
+  integrity sha512-RDyGOL+CkpzpovOB3W2acawCfoDB/P3cevR+QDA+VqOeFDz9sd9bOkDvx0Vn1qeapGC/1yGx6cTpQkQhmuNLmg==
+  dependencies:
+    ember-cli-babel "^7.1.3"
+    ember-cli-typescript "^3.0.0"
+
+ember-asset-loader@^0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/ember-asset-loader/-/ember-asset-loader-0.6.1.tgz#2eb81221406164d19127eba5b3d10f908df89a17"
+  integrity sha512-e2zafQJBMLhzl69caTG/+mQMH20uMHYrm7KcmdbmnX0oY2dZ48bhm0Wh1SPLXS/6G2T9NsNMWX6J2pVSnI+xyA==
+  dependencies:
+    broccoli-caching-writer "^3.0.3"
+    broccoli-funnel "^2.0.2"
+    broccoli-merge-trees "^3.0.2"
+    ember-cli-babel "^7.5.0"
+    fs-extra "^7.0.1"
+    object-assign "^4.1.0"
+    walk-sync "^1.1.3"
+
+ember-assign-helper@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/ember-assign-helper/-/ember-assign-helper-0.4.0.tgz#f0a313033656c0d2cbbcb29d55b9cd13f04bc7c1"
+  integrity sha512-GKHhT4HD2fhtDnuBk6eCdCA8XGew9hY7TVs8zjrykegiI7weC0CGtpJscmIG3O0gEEb0d07UTkF2pjfNGLx4Nw==
+  dependencies:
+    ember-cli-babel "^7.26.0"
+    ember-cli-htmlbars "^6.0.0"
+
+ember-auto-import@2.4.2:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.4.2.tgz#d4d3bc6885a11cf124f606f5c37169bdf76e37ae"
+  integrity sha512-REh+1aJWpTkvN42a/ga41OuRpUsSW7UQfPr2wPtYx56o/xoSNhVBXejy7yV9ObrkN7gogz6fs2xZwih5cOwpYg==
+  dependencies:
+    "@babel/core" "^7.16.7"
+    "@babel/plugin-proposal-class-properties" "^7.16.7"
+    "@babel/plugin-proposal-decorators" "^7.16.7"
+    "@babel/preset-env" "^7.16.7"
+    "@embroider/macros" "^1.0.0"
+    "@embroider/shared-internals" "^1.0.0"
+    babel-loader "^8.0.6"
+    babel-plugin-ember-modules-api-polyfill "^3.5.0"
+    babel-plugin-htmlbars-inline-precompile "^5.2.1"
+    babel-plugin-syntax-dynamic-import "^6.18.0"
+    broccoli-debug "^0.6.4"
+    broccoli-funnel "^3.0.8"
+    broccoli-merge-trees "^4.2.0"
+    broccoli-plugin "^4.0.0"
+    broccoli-source "^3.0.0"
+    css-loader "^5.2.0"
+    debug "^4.3.1"
+    fs-extra "^10.0.0"
+    fs-tree-diff "^2.0.0"
+    handlebars "^4.3.1"
+    js-string-escape "^1.0.1"
+    lodash "^4.17.19"
+    mini-css-extract-plugin "^2.5.2"
+    parse5 "^6.0.1"
+    resolve "^1.20.0"
+    resolve-package-path "^4.0.3"
+    semver "^7.3.4"
+    style-loader "^2.0.0"
+    typescript-memoize "^1.0.0-alpha.3"
+    walk-sync "^3.0.0"
+
+ember-auto-import@^1.11.3:
+  version "1.12.0"
+  resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-1.12.0.tgz#52246b04891090e2608244e65c4c6af7710df12b"
+  integrity sha512-fzMGnyHGfUNFHchpLbJ98Vs/c5H2wZBMR9r/XwW+WOWPisZDGLUPPyhJQsSREPoUQ+o8GvyLaD/rkrKqW8bmgw==
+  dependencies:
+    "@babel/core" "^7.1.6"
+    "@babel/preset-env" "^7.10.2"
+    "@babel/traverse" "^7.1.6"
+    "@babel/types" "^7.1.6"
+    "@embroider/core" "^0.33.0"
+    babel-core "^6.26.3"
+    babel-loader "^8.0.6"
+    babel-plugin-syntax-dynamic-import "^6.18.0"
+    babylon "^6.18.0"
+    broccoli-debug "^0.6.4"
+    broccoli-node-api "^1.7.0"
+    broccoli-plugin "^4.0.0"
+    broccoli-source "^3.0.0"
+    debug "^3.1.0"
+    ember-cli-babel "^7.0.0"
+    enhanced-resolve "^4.0.0"
+    fs-extra "^6.0.1"
+    fs-tree-diff "^2.0.0"
+    handlebars "^4.3.1"
+    js-string-escape "^1.0.1"
+    lodash "^4.17.19"
+    mkdirp "^0.5.1"
+    resolve-package-path "^3.1.0"
+    rimraf "^2.6.2"
+    semver "^7.3.4"
+    symlink-or-copy "^1.2.0"
+    typescript-memoize "^1.0.0-alpha.3"
+    walk-sync "^0.3.3"
+    webpack "^4.43.0"
+
+ember-auto-import@^1.12.0:
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-1.12.1.tgz#09967bd35cd56ac45f413c48deabf7cfb3a785f6"
+  integrity sha512-Jm0vWKNAy/wYMrdSQIrG8sRsvarIRHZ2sS/CGhMdMqVKJR48AhGU7NgPJ5SIlO/+seL2VSO+dtv7aEOEIaT6BA==
+  dependencies:
+    "@babel/core" "^7.1.6"
+    "@babel/preset-env" "^7.10.2"
+    "@babel/traverse" "^7.1.6"
+    "@babel/types" "^7.1.6"
+    "@embroider/shared-internals" "^1.0.0"
+    babel-core "^6.26.3"
+    babel-loader "^8.0.6"
+    babel-plugin-syntax-dynamic-import "^6.18.0"
+    babylon "^6.18.0"
+    broccoli-debug "^0.6.4"
+    broccoli-node-api "^1.7.0"
+    broccoli-plugin "^4.0.0"
+    broccoli-source "^3.0.0"
+    debug "^3.1.0"
+    ember-cli-babel "^7.0.0"
+    enhanced-resolve "^4.0.0"
+    fs-extra "^6.0.1"
+    fs-tree-diff "^2.0.0"
+    handlebars "^4.3.1"
+    js-string-escape "^1.0.1"
+    lodash "^4.17.19"
+    mkdirp "^0.5.1"
+    resolve-package-path "^3.1.0"
+    rimraf "^2.6.2"
+    semver "^7.3.4"
+    symlink-or-copy "^1.2.0"
+    typescript-memoize "^1.0.0-alpha.3"
+    walk-sync "^0.3.3"
+    webpack "^4.43.0"
+
+ember-auto-import@^1.2.19:
+  version "1.11.3"
+  resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-1.11.3.tgz#6e3384a7fbb163384a34546f2e902cd297b0e683"
+  integrity sha512-ekq/XCvsonESobFU30zjZ0I4XMy2E/2ZILCYWuQ1JdhcCSTYhnXDZcqRW8itUG7kbsPqAHT/XZ1LEZYm3seVwQ==
+  dependencies:
+    "@babel/core" "^7.1.6"
+    "@babel/preset-env" "^7.10.2"
+    "@babel/traverse" "^7.1.6"
+    "@babel/types" "^7.1.6"
+    "@embroider/core" "^0.33.0"
+    babel-core "^6.26.3"
+    babel-loader "^8.0.6"
+    babel-plugin-syntax-dynamic-import "^6.18.0"
+    babylon "^6.18.0"
+    broccoli-debug "^0.6.4"
+    broccoli-node-api "^1.7.0"
+    broccoli-plugin "^4.0.0"
+    broccoli-source "^3.0.0"
+    debug "^3.1.0"
+    ember-cli-babel "^7.0.0"
+    enhanced-resolve "^4.0.0"
+    fs-extra "^6.0.1"
+    fs-tree-diff "^2.0.0"
+    handlebars "^4.3.1"
+    js-string-escape "^1.0.1"
+    lodash "^4.17.19"
+    mkdirp "^0.5.1"
+    resolve-package-path "^3.1.0"
+    rimraf "^2.6.2"
+    semver "^7.3.4"
+    symlink-or-copy "^1.2.0"
+    typescript-memoize "^1.0.0-alpha.3"
+    walk-sync "^0.3.3"
+    webpack "^4.43.0"
+
+ember-basic-dropdown@4.0.3, "ember-basic-dropdown@^3.1.0 || ^4.0.2":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/ember-basic-dropdown/-/ember-basic-dropdown-4.0.3.tgz#69eed0f4ccb3fcc72bd8379c151504602949ac12"
+  integrity sha512-WND4LLGS6a3x6j7ZZVs6jmv22xm0HeMELgW4cTDhnNE7L9zJY/kxgAaqSAg19EJ81GzOHI+Ub+SqJ5QjSDtXaA==
+  dependencies:
+    "@ember/render-modifiers" "^2.0.3"
+    "@embroider/macros" "^1.0.0"
+    "@embroider/util" "^1.0.0"
+    "@glimmer/component" "^1.0.4"
+    "@glimmer/tracking" "^1.0.4"
+    ember-cli-babel "^7.26.6"
+    ember-cli-htmlbars "^6.0.0"
+    ember-cli-typescript "^4.2.1"
+    ember-element-helper "^0.5.5"
+    ember-maybe-in-element "^2.0.3"
+    ember-style-modifier "^0.7.0"
+    ember-truth-helpers "^2.1.0 || ^3.0.0"
+
+ember-cache-primitive-polyfill@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/ember-cache-primitive-polyfill/-/ember-cache-primitive-polyfill-1.0.1.tgz#a27075443bd87e5af286c1cd8a7df24e3b9f6715"
+  integrity sha512-hSPcvIKarA8wad2/b6jDd/eU+OtKmi6uP+iYQbzi5TQpjsqV6b4QdRqrLk7ClSRRKBAtdTuutx+m+X+WlEd2lw==
+  dependencies:
+    ember-cli-babel "^7.22.1"
+    ember-cli-version-checker "^5.1.1"
+    ember-compatibility-helpers "^1.2.1"
+    silent-error "^1.1.1"
+
+ember-cached-decorator-polyfill@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/ember-cached-decorator-polyfill/-/ember-cached-decorator-polyfill-0.1.4.tgz#f1e2c65cc78d0d9c4ac0e047e643af477eb85ace"
+  integrity sha512-JOK7kBCWsTVCzmCefK4nr9BACDJk0owt9oIUaVt6Q0UtQ4XeAHmoK5kQ/YtDcxQF1ZevHQFdGhsTR3JLaHNJgA==
+  dependencies:
+    "@glimmer/tracking" "^1.0.4"
+    ember-cache-primitive-polyfill "^1.0.1"
+    ember-cli-babel "^7.21.0"
+    ember-cli-babel-plugin-helpers "^1.1.1"
+
+ember-cli-autoprefixer@^0.8.1:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-autoprefixer/-/ember-cli-autoprefixer-0.8.1.tgz#071dd9574451057b03dcc03b71f5bd9cb07ef332"
+  integrity sha1-Bx3ZV0RRBXsD3MA7cfW9nLB+8zI=
+  dependencies:
+    broccoli-autoprefixer "^5.0.0"
+    lodash "^4.0.0"
+
+ember-cli-babel-plugin-helpers@^1.0.0, ember-cli-babel-plugin-helpers@^1.1.0, ember-cli-babel-plugin-helpers@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.1.tgz#5016b80cdef37036c4282eef2d863e1d73576879"
+  integrity sha512-sKvOiPNHr5F/60NLd7SFzMpYPte/nnGkq/tMIfXejfKHIhaiIkYFqX8Z9UFTKWLLn+V7NOaby6niNPZUdvKCRw==
+
+ember-cli-babel@^6.16.0, ember-cli-babel@^6.6.0, ember-cli-babel@^6.9.0:
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.18.0.tgz#3f6435fd275172edeff2b634ee7b29ce74318957"
+  integrity sha512-7ceC8joNYxY2wES16iIBlbPSxwKDBhYwC8drU3ZEvuPDMwVv1KzxCNu1fvxyFEBWhwaRNTUxSCsEVoTd9nosGA==
+  dependencies:
+    amd-name-resolver "1.2.0"
+    babel-plugin-debug-macros "^0.2.0-beta.6"
+    babel-plugin-ember-modules-api-polyfill "^2.6.0"
+    babel-plugin-transform-es2015-modules-amd "^6.24.0"
+    babel-polyfill "^6.26.0"
+    babel-preset-env "^1.7.0"
+    broccoli-babel-transpiler "^6.5.0"
+    broccoli-debug "^0.6.4"
+    broccoli-funnel "^2.0.0"
+    broccoli-source "^1.1.0"
+    clone "^2.0.0"
+    ember-cli-version-checker "^2.1.2"
+    semver "^5.5.0"
+
+ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.2, ember-cli-babel@^7.1.3, ember-cli-babel@^7.10.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.17.2, ember-cli-babel@^7.18.0, ember-cli-babel@^7.19.0, ember-cli-babel@^7.20.0, ember-cli-babel@^7.21.0, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.23.1, ember-cli-babel@^7.26.0, ember-cli-babel@^7.26.10, ember-cli-babel@^7.26.11, ember-cli-babel@^7.26.3, ember-cli-babel@^7.26.4, ember-cli-babel@^7.26.5, ember-cli-babel@^7.26.6, ember-cli-babel@^7.26.8, ember-cli-babel@^7.5.0, ember-cli-babel@^7.7.3:
+  version "7.26.11"
+  resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.26.11.tgz#50da0fe4dcd99aada499843940fec75076249a9f"
+  integrity sha512-JJYeYjiz/JTn34q7F5DSOjkkZqy8qwFOOxXfE6pe9yEJqWGu4qErKxlz8I22JoVEQ/aBUO+OcKTpmctvykM9YA==
+  dependencies:
+    "@babel/core" "^7.12.0"
+    "@babel/helper-compilation-targets" "^7.12.0"
+    "@babel/plugin-proposal-class-properties" "^7.16.5"
+    "@babel/plugin-proposal-decorators" "^7.13.5"
+    "@babel/plugin-proposal-private-methods" "^7.16.5"
+    "@babel/plugin-proposal-private-property-in-object" "^7.16.5"
+    "@babel/plugin-transform-modules-amd" "^7.13.0"
+    "@babel/plugin-transform-runtime" "^7.13.9"
+    "@babel/plugin-transform-typescript" "^7.13.0"
+    "@babel/polyfill" "^7.11.5"
+    "@babel/preset-env" "^7.16.5"
+    "@babel/runtime" "7.12.18"
+    amd-name-resolver "^1.3.1"
+    babel-plugin-debug-macros "^0.3.4"
+    babel-plugin-ember-data-packages-polyfill "^0.1.2"
+    babel-plugin-ember-modules-api-polyfill "^3.5.0"
+    babel-plugin-module-resolver "^3.2.0"
+    broccoli-babel-transpiler "^7.8.0"
+    broccoli-debug "^0.6.4"
+    broccoli-funnel "^2.0.2"
+    broccoli-source "^2.1.2"
+    calculate-cache-key-for-tree "^2.0.0"
+    clone "^2.1.2"
+    ember-cli-babel-plugin-helpers "^1.1.1"
+    ember-cli-version-checker "^4.1.0"
+    ensure-posix-path "^1.0.2"
+    fixturify-project "^1.10.0"
+    resolve-package-path "^3.1.0"
+    rimraf "^3.0.1"
+    semver "^5.5.0"
+
+ember-cli-clipboard@^0.13.0:
+  version "0.13.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-clipboard/-/ember-cli-clipboard-0.13.0.tgz#47d3de3aec09987409c162cbff36f966a2c138b7"
+  integrity sha512-AA2J5lliP/DXUFKnQ+r/D3e4xiN3ttlmN8W+8WfZg7K8VeOYlWpMyGcUjmuLa7inLUCMjLbtG6nXc20AQ5OjDg==
+  dependencies:
+    broccoli-funnel "^1.1.0"
+    clipboard "^2.0.0"
+    ember-cli-babel "^7.7.3"
+    ember-cli-htmlbars "^3.0.1"
+    fastboot-transform "^0.1.3"
+
+ember-cli-content-security-policy@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-content-security-policy/-/ember-cli-content-security-policy-1.1.1.tgz#7d91a695319d8f99c317f3a594fba77bbfedf6c7"
+  integrity sha512-QgGAFt1nmsb0qF2YXI5iSM7jJVb09R2hrfX7uR+kkXMb5VyNQXdo2ZlX/DuIbePQVY4q9THpRh8Yf0UHJNbvDQ==
+  dependencies:
+    body-parser "^1.17.0"
+    chalk "^2.0.0"
+
+ember-cli-dependency-checker@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-dependency-checker/-/ember-cli-dependency-checker-3.2.0.tgz#9202ad9e14d6fda33cffc22a11c343c2a8885330"
+  integrity sha512-dkSmcJ/jY/2ms/S6ph2jXSfOW5VfOpLfg5DFEbra0SaMNgYkNDFF1o0U4OdTsG37L5h/AXWNuVtnOa4TMabz9Q==
+  dependencies:
+    chalk "^2.3.0"
+    find-yarn-workspace-root "^1.1.0"
+    is-git-url "^1.0.0"
+    resolve "^1.5.0"
+    semver "^5.3.0"
+
+ember-cli-deprecation-workflow@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-deprecation-workflow/-/ember-cli-deprecation-workflow-2.1.0.tgz#f0d38ece7ac0ab7b3f83790a3a092e3472f58cff"
+  integrity sha512-Ay9P9iKMJdY4Gq5XPowh3HqqeAzLfwBRj1oB1ZKkDW1fryZQWBN4pZuRnjnB+3VWZjBnZif5e7Pacc7YNW9hWg==
+  dependencies:
+    broccoli-funnel "^3.0.3"
+    broccoli-merge-trees "^4.2.0"
+    broccoli-plugin "^4.0.5"
+    ember-cli-htmlbars "^5.3.2"
+
+ember-cli-flash@^1.7.2:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-flash/-/ember-cli-flash-1.9.1.tgz#fda9f7b92fdb4bb85688e4df554beb514c1749e7"
+  integrity sha512-9AN0BD27owvnNpFBELy5zSNIbJBUP8xW6mFV98L0qHnfJk2gG7bXbXOzt6VtRqWC+Pm5rCRqUoCz+NiwsPvObw==
+  dependencies:
+    ember-cli-babel "^7.1.2"
+    ember-cli-htmlbars "^3.0.0"
+    ember-runtime-enumerable-includes-polyfill "^2.0.0"
+
+ember-cli-get-component-path-option@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-get-component-path-option/-/ember-cli-get-component-path-option-1.0.0.tgz#0d7b595559e2f9050abed804f1d8eff1b08bc771"
+  integrity sha1-DXtZVVni+QUKvtgE8djv8bCLx3E=
+
+ember-cli-htmlbars@^3.0.0, ember-cli-htmlbars@^3.0.1:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-3.1.0.tgz#87806c2a0bca2ab52d4fb8af8e2215c1ca718a99"
+  integrity sha512-cgvRJM73IT0aePUG7oQ/afB7vSRBV3N0wu9BrWhHX2zkR7A7cUBI7KC9VPk6tbctCXoM7BRGsCC4aIjF7yrfXA==
+  dependencies:
+    broccoli-persistent-filter "^2.3.1"
+    hash-for-dep "^1.5.1"
+    json-stable-stringify "^1.0.1"
+    strip-bom "^3.0.0"
+
+ember-cli-htmlbars@^4.3.1:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-4.5.0.tgz#d299e4f7eba6f30dc723ee086906cc550beb252e"
+  integrity sha512-bYJpK1pqFu9AadDAGTw05g2LMNzY8xTCIqQm7dMJmKEoUpLRFbPf4SfHXrktzDh7Q5iggl6Skzf1M0bPlIxARw==
+  dependencies:
+    "@ember/edition-utils" "^1.2.0"
+    babel-plugin-htmlbars-inline-precompile "^3.2.0"
+    broccoli-debug "^0.6.5"
+    broccoli-persistent-filter "^2.3.1"
+    broccoli-plugin "^3.1.0"
+    common-tags "^1.8.0"
+    ember-cli-babel-plugin-helpers "^1.1.0"
+    fs-tree-diff "^2.0.1"
+    hash-for-dep "^1.5.1"
+    heimdalljs-logger "^0.1.10"
+    json-stable-stringify "^1.0.1"
+    semver "^6.3.0"
+    strip-bom "^4.0.0"
+    walk-sync "^2.0.2"
+
+ember-cli-htmlbars@^5.1.0, ember-cli-htmlbars@^5.2.0, ember-cli-htmlbars@^5.3.2, ember-cli-htmlbars@^5.7.2:
+  version "5.7.2"
+  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-5.7.2.tgz#e0cd2fb3c20d85fe4c3e228e6f0590ee1c645ba8"
+  integrity sha512-Uj6R+3TtBV5RZoJY14oZn/sNPnc+UgmC8nb5rI4P3fR/gYoyTFIZSXiIM7zl++IpMoIrocxOrgt+mhonKphgGg==
+  dependencies:
+    "@ember/edition-utils" "^1.2.0"
+    babel-plugin-htmlbars-inline-precompile "^5.0.0"
+    broccoli-debug "^0.6.5"
+    broccoli-persistent-filter "^3.1.2"
+    broccoli-plugin "^4.0.3"
+    common-tags "^1.8.0"
+    ember-cli-babel-plugin-helpers "^1.1.1"
+    ember-cli-version-checker "^5.1.2"
+    fs-tree-diff "^2.0.1"
+    hash-for-dep "^1.5.1"
+    heimdalljs-logger "^0.1.10"
+    json-stable-stringify "^1.0.1"
+    semver "^7.3.4"
+    silent-error "^1.1.1"
+    strip-bom "^4.0.0"
+    walk-sync "^2.2.0"
+
+ember-cli-htmlbars@^5.3.1, ember-cli-htmlbars@^5.7.1:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-5.7.1.tgz#eb5b88c7d9083bc27665fb5447a9b7503b32ce4f"
+  integrity sha512-9laCgL4tSy48orNoQgQKEHp93MaqAs9ZOl7or5q+8iyGGJHW6sVXIYrVv5/5O9HfV6Ts8/pW1rSoaeKyLUE+oA==
+  dependencies:
+    "@ember/edition-utils" "^1.2.0"
+    babel-plugin-htmlbars-inline-precompile "^5.0.0"
+    broccoli-debug "^0.6.5"
+    broccoli-persistent-filter "^3.1.2"
+    broccoli-plugin "^4.0.3"
+    common-tags "^1.8.0"
+    ember-cli-babel-plugin-helpers "^1.1.1"
+    ember-cli-version-checker "^5.1.2"
+    fs-tree-diff "^2.0.1"
+    hash-for-dep "^1.5.1"
+    heimdalljs-logger "^0.1.10"
+    json-stable-stringify "^1.0.1"
+    semver "^7.3.4"
+    silent-error "^1.1.1"
+    strip-bom "^4.0.0"
+    walk-sync "^2.2.0"
+
+ember-cli-htmlbars@^6.0.0, ember-cli-htmlbars@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-6.0.1.tgz#5487831d477e61682bc867fd138808269e5d2152"
+  integrity sha512-IDsl9uty+MXtMfp/BUTEc/Q36EmlHYj8ZdPekcoRa8hmdsigHnK4iokfaB7dJFktlf6luruei+imv7JrJrBQPQ==
+  dependencies:
+    "@ember/edition-utils" "^1.2.0"
+    babel-plugin-ember-template-compilation "^1.0.0"
+    babel-plugin-htmlbars-inline-precompile "^5.3.0"
+    broccoli-debug "^0.6.5"
+    broccoli-persistent-filter "^3.1.2"
+    broccoli-plugin "^4.0.3"
+    ember-cli-version-checker "^5.1.2"
+    fs-tree-diff "^2.0.1"
+    hash-for-dep "^1.5.1"
+    heimdalljs-logger "^0.1.10"
+    json-stable-stringify "^1.0.1"
+    semver "^7.3.4"
+    silent-error "^1.1.1"
+    strip-bom "^4.0.0"
+    walk-sync "^2.2.0"
+
+ember-cli-inject-live-reload@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-inject-live-reload/-/ember-cli-inject-live-reload-2.1.0.tgz#ef63c733c133024d5726405a3c247fa12e88a385"
+  integrity sha512-YV5wYRD5PJHmxaxaJt18u6LE6Y+wo455BnmcpN+hGNlChy2piM9/GMvYgTAz/8Vin8RJ5KekqP/w/NEaRndc/A==
+  dependencies:
+    clean-base-url "^1.0.0"
+    ember-cli-version-checker "^3.1.3"
+
+ember-cli-is-package-missing@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-is-package-missing/-/ember-cli-is-package-missing-1.0.0.tgz#6e6184cafb92635dd93ca6c946b104292d4e3390"
+  integrity sha1-bmGEyvuSY13ZPKbJRrEEKS1OM5A=
+
+ember-cli-lodash-subset@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-lodash-subset/-/ember-cli-lodash-subset-2.0.1.tgz#20cb68a790fe0fde2488ddfd8efbb7df6fe766f2"
+  integrity sha1-IMtop5D+D94kiN39jvu332/nZvI=
+
+ember-cli-mirage@2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-mirage/-/ember-cli-mirage-2.4.0.tgz#7414573c3f9c5d40cefa44835858103691af95f6"
+  integrity sha512-cy8B+IZV07V6xgnFzktKUsntTQvIqPSS3u4+XaLdNW91yOowLsN2BsuQldN3eCnwswgE3a9eGNGS4I0BD4llNA==
+  dependencies:
+    "@embroider/macros" "^0.41.0"
+    broccoli-file-creator "^2.1.1"
+    broccoli-funnel "^3.0.3"
+    broccoli-merge-trees "^4.2.0"
+    ember-auto-import "^1.12.0"
+    ember-cli-babel "^7.26.6"
+    ember-destroyable-polyfill "^2.0.3"
+    ember-get-config "0.2.4 - 0.5.0"
+    ember-inflector "^2.0.0 || ^3.0.0 || ^4.0.2"
+    lodash-es "^4.17.11"
+    miragejs "^0.1.43"
+
+ember-cli-node-assets@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/ember-cli-node-assets/-/ember-cli-node-assets-0.2.2.tgz#d2d55626e7cc6619f882d7fe55751f9266022708"
+  integrity sha1-0tVWJufMZhn4gtf+VXUfkmYCJwg=
+  dependencies:
+    broccoli-funnel "^1.0.1"
+    broccoli-merge-trees "^1.1.1"
+    broccoli-source "^1.1.0"
+    debug "^2.2.0"
+    lodash "^4.5.1"
+    resolve "^1.1.7"
+
+ember-cli-normalize-entity-name@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-normalize-entity-name/-/ember-cli-normalize-entity-name-1.0.0.tgz#0b14f7bcbc599aa117b5fddc81e4fd03c4bad5b7"
+  integrity sha1-CxT3vLxZmqEXtf3cgeT9A8S61bc=
+  dependencies:
+    silent-error "^1.0.0"
+
+ember-cli-page-object@1.17.9:
+  version "1.17.9"
+  resolved "https://registry.yarnpkg.com/ember-cli-page-object/-/ember-cli-page-object-1.17.9.tgz#d5d730661755083987db599732d24145b9f25521"
+  integrity sha512-c2pMCuPRM0x/eO8Ot3NDesebdJGlNPwwOWAtXsXH339j/TDeh2DIz2sGJNnmZkFqEsdTqgVq2rkmGzmd7i1xeg==
+  dependencies:
+    broccoli-file-creator "^2.1.1"
+    broccoli-merge-trees "^2.0.0"
+    ceibo "~2.0.0"
+    ember-cli-babel "^6.16.0"
+    ember-cli-node-assets "^0.2.2"
+    ember-native-dom-helpers "^0.7.0"
+    jquery "^3.4.1"
+    rsvp "^4.7.0"
+
+ember-cli-path-utils@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-path-utils/-/ember-cli-path-utils-1.0.0.tgz#4e39af8b55301cddc5017739b77a804fba2071ed"
+  integrity sha1-Tjmvi1UwHN3FAXc5t3qAT7ogce0=
+
+ember-cli-preprocess-registry@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-preprocess-registry/-/ember-cli-preprocess-registry-3.3.0.tgz#685837a314fbe57224bd54b189f4b9c23907a2de"
+  integrity sha512-60GYpw7VPeB7TvzTLZTuLTlHdOXvayxjAQ+IxM2T04Xkfyu75O2ItbWlftQW7NZVGkaCsXSRAmn22PG03VpLMA==
+  dependencies:
+    broccoli-clean-css "^1.1.0"
+    broccoli-funnel "^2.0.1"
+    debug "^3.0.1"
+    process-relative-require "^1.0.0"
+
+ember-cli-sass@^10.0.1:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-sass/-/ember-cli-sass-10.0.1.tgz#afa91eb7dfe3890be0390639d66976512e7d8edc"
+  integrity sha512-dWVoX03O2Mot1dEB1AN3ofC8DDZb6iU4Kfkbr3WYi9S9bGVHrpR/ngsR7tuVBuTugTyG53FPtLLqYdqx7XjXdA==
+  dependencies:
+    broccoli-funnel "^2.0.1"
+    broccoli-merge-trees "^3.0.1"
+    broccoli-sass-source-maps "^4.0.0"
+    ember-cli-version-checker "^2.1.0"
+
+ember-cli-sri@meirish/ember-cli-sri#rooturl:
+  version "2.1.0"
+  resolved "https://codeload.github.com/meirish/ember-cli-sri/tar.gz/1c0ff776a61f09121d1ea69ce16e4653da5e1efa"
+  dependencies:
+    broccoli-sri-hash "^2.1.0"
+
+ember-cli-string-helpers@6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-string-helpers/-/ember-cli-string-helpers-6.1.0.tgz#aeb96112bb91c540b869ed8b9c680f7fd5859cb6"
+  integrity sha512-Lw8B6MJx2n8CNF2TSIKs+hWLw0FqSYjr2/NRPyquyYA05qsl137WJSYW3ZqTsLgoinHat0DGF2qaCXocLhLmyA==
+  dependencies:
+    "@babel/core" "^7.13.10"
+    broccoli-funnel "^3.0.3"
+    ember-cli-babel "^7.7.3"
+    resolve "^1.20.0"
+
+ember-cli-string-utils@^1.0.0, ember-cli-string-utils@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-string-utils/-/ember-cli-string-utils-1.1.0.tgz#39b677fc2805f55173735376fcef278eaa4452a1"
+  integrity sha1-ObZ3/CgF9VFzc1N2/O8njqpEUqE=
+
+ember-cli-terser@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/ember-cli-terser/-/ember-cli-terser-4.0.2.tgz#c436a9e4159f76a615b051cba0584844652b7dcd"
+  integrity sha512-Ej77K+YhCZImotoi/CU2cfsoZaswoPlGaM5TB3LvjvPDlVPRhxUHO2RsaUVC5lsGeRLRiHCOxVtoJ6GyqexzFA==
+  dependencies:
+    broccoli-terser-sourcemap "^4.1.0"
+
+ember-cli-test-info@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-test-info/-/ember-cli-test-info-1.0.0.tgz#ed4e960f249e97523cf891e4aed2072ce84577b4"
+  integrity sha1-7U6WDySel1I8+JHkrtIHLOhFd7Q=
+  dependencies:
+    ember-cli-string-utils "^1.0.0"
+
+ember-cli-test-loader@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-test-loader/-/ember-cli-test-loader-3.0.0.tgz#1c036fc48de36155355fcda3266af63f977826f1"
+  integrity sha512-wfFRBrfO9gaKScYcdQxTfklx9yp1lWK6zv1rZRpkas9z2SHyJojF7NOQRWQgSB3ypm7vfpiF8VsFFVVr7VBzAQ==
+  dependencies:
+    ember-cli-babel "^7.13.2"
+
+ember-cli-typescript@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-typescript/-/ember-cli-typescript-3.0.0.tgz#3b838d1ce9e4d22a98e68da22ceac6dc0cfd9bfc"
+  integrity sha512-lo5YArbJzJi5ssvaGqTt6+FnhTALnSvYVuxM7lfyL1UCMudyNJ94ovH5C7n5il7ATd6WsNiAPRUO/v+s5Jq/aA==
+  dependencies:
+    "@babel/plugin-transform-typescript" "~7.5.0"
+    ansi-to-html "^0.6.6"
+    debug "^4.0.0"
+    ember-cli-babel-plugin-helpers "^1.0.0"
+    execa "^2.0.0"
+    fs-extra "^8.0.0"
+    resolve "^1.5.0"
+    rsvp "^4.8.1"
+    semver "^6.0.0"
+    stagehand "^1.0.0"
+    walk-sync "^2.0.0"
+
+ember-cli-typescript@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/ember-cli-typescript/-/ember-cli-typescript-2.0.2.tgz#464984131fbdc05655eb61d1c3cdd911d3137f0d"
+  integrity sha512-7I5azCTxOgRDN8aSSnJZIKSqr+MGnT+jLTUbBYqF8wu6ojs2DUnTePxUcQMcvNh3Q3B1ySv7Q/uZFSjdU9gSjA==
+  dependencies:
+    "@babel/plugin-proposal-class-properties" "^7.1.0"
+    "@babel/plugin-transform-typescript" "~7.4.0"
+    ansi-to-html "^0.6.6"
+    debug "^4.0.0"
+    ember-cli-babel-plugin-helpers "^1.0.0"
+    execa "^1.0.0"
+    fs-extra "^7.0.0"
+    resolve "^1.5.0"
+    rsvp "^4.8.1"
+    semver "^6.0.0"
+    stagehand "^1.0.0"
+    walk-sync "^1.0.0"
+
+ember-cli-typescript@^3.0.0, ember-cli-typescript@^3.1.4:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/ember-cli-typescript/-/ember-cli-typescript-3.1.4.tgz#21d6ccd670d1f2e34c9cce68c6e32c442f46806b"
+  integrity sha512-HJ73kL45OGRmIkPhBNFt31I1SGUvdZND+LCH21+qpq3pPlFpJG8GORyXpP+2ze8PbnITNLzwe5AwUrpyuRswdQ==
+  dependencies:
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.4.4"
+    "@babel/plugin-proposal-optional-chaining" "^7.6.0"
+    "@babel/plugin-transform-typescript" "~7.8.0"
+    ansi-to-html "^0.6.6"
+    broccoli-stew "^3.0.0"
+    debug "^4.0.0"
+    ember-cli-babel-plugin-helpers "^1.0.0"
+    execa "^3.0.0"
+    fs-extra "^8.0.0"
+    resolve "^1.5.0"
+    rsvp "^4.8.1"
+    semver "^6.3.0"
+    stagehand "^1.0.0"
+    walk-sync "^2.0.0"
+
+ember-cli-typescript@^4.1.0, ember-cli-typescript@^4.2.0, ember-cli-typescript@^4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-typescript/-/ember-cli-typescript-4.2.1.tgz#54d08fc90318cc986f3ea562f93ce58a6cc4c24d"
+  integrity sha512-0iKTZ+/wH6UB/VTWKvGuXlmwiE8HSIGcxHamwNhEC5x1mN3z8RfvsFZdQWYUzIWFN2Tek0gmepGRPTwWdBYl/A==
+  dependencies:
+    ansi-to-html "^0.6.15"
+    broccoli-stew "^3.0.0"
+    debug "^4.0.0"
+    execa "^4.0.0"
+    fs-extra "^9.0.1"
+    resolve "^1.5.0"
+    rsvp "^4.8.1"
+    semver "^7.3.2"
+    stagehand "^1.0.0"
+    walk-sync "^2.2.0"
+
+ember-cli-typescript@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-typescript/-/ember-cli-typescript-5.0.0.tgz#52f53843082d0a0128f318809dadabf83a76bbff"
+  integrity sha512-UDKZlG7bInRo7eDsF3jvPz1Dxh1YvRhMw9wyj5rj2K3brw0xEh1IMTqPgWRbPESqjcWuwa8s0FCNuYWDc4PTfg==
+  dependencies:
+    ansi-to-html "^0.6.15"
+    broccoli-stew "^3.0.0"
+    debug "^4.0.0"
+    execa "^4.0.0"
+    fs-extra "^9.0.1"
+    resolve "^1.5.0"
+    rsvp "^4.8.1"
+    semver "^7.3.2"
+    stagehand "^1.0.0"
+    walk-sync "^2.2.0"
+
+ember-cli-version-checker@^2.1.0, ember-cli-version-checker@^2.1.2:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-2.2.0.tgz#47771b731fe0962705e27c8199a9e3825709f3b3"
+  integrity sha512-G+KtYIVlSOWGcNaTFHk76xR4GdzDLzAS4uxZUKdASuFX0KJE43C6DaqL+y3VTpUFLI2FIkAS6HZ4I1YBi+S3hg==
+  dependencies:
+    resolve "^1.3.3"
+    semver "^5.3.0"
+
+ember-cli-version-checker@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-3.1.3.tgz#7c9b4f5ff30fdebcd480b1c06c4de43bb51c522c"
+  integrity sha512-PZNSvpzwWgv68hcXxyjREpj3WWb81A7rtYNQq1lLEgrWIchF8ApKJjWP3NBpHjaatwILkZAV8klair5WFlXAKg==
+  dependencies:
+    resolve-package-path "^1.2.6"
+    semver "^5.6.0"
+
+ember-cli-version-checker@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-4.1.1.tgz#27b938228306cb0dbc4f74e95c536cdd6448e499"
+  integrity sha512-bzEWsTMXUGEJfxcAGWPe6kI7oHEGD3jaxUWDYPTqzqGhNkgPwXTBgoWs9zG1RaSMaOPFnloWuxRcoHi4TrYS3Q==
+  dependencies:
+    resolve-package-path "^2.0.0"
+    semver "^6.3.0"
+    silent-error "^1.1.1"
+
+ember-cli-version-checker@^5.1.1, ember-cli-version-checker@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-5.1.2.tgz#649c7b6404902e3b3d69c396e054cea964911ab0"
+  integrity sha512-rk7GY+FmLn/2e22HsZs0Ycrz8HQ1W3Fv+2TFOuEFW9optnDXDgkntPBIl6gact/LHsfBM5RKbM3dHsIIeLgl0Q==
+  dependencies:
+    resolve-package-path "^3.1.0"
+    semver "^7.3.4"
+    silent-error "^1.1.1"
+
+ember-cli@~3.28.5:
+  version "3.28.5"
+  resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.28.5.tgz#9c91266e412f6d537b47a88e4b63a2b56db35483"
+  integrity sha512-Y/UdbUOTeKHGMCP3XtE5g14JUTYyeQTdjPvHuv11FFx5HQBtHqqWLY6U1ivMDukDkQ4i2v6TyaUcKVo4e8PtyQ==
+  dependencies:
+    "@babel/core" "^7.13.8"
+    "@babel/plugin-transform-modules-amd" "^7.12.1"
+    amd-name-resolver "^1.3.1"
+    babel-plugin-module-resolver "^4.1.0"
+    bower-config "^1.4.3"
+    bower-endpoint-parser "0.2.2"
+    broccoli "^3.5.1"
+    broccoli-amd-funnel "^2.0.1"
+    broccoli-babel-transpiler "^7.8.0"
+    broccoli-builder "^0.18.14"
+    broccoli-concat "^4.2.5"
+    broccoli-config-loader "^1.0.1"
+    broccoli-config-replace "^1.1.2"
+    broccoli-debug "^0.6.5"
+    broccoli-funnel "^3.0.5"
+    broccoli-funnel-reducer "^1.0.0"
+    broccoli-merge-trees "^3.0.2"
+    broccoli-middleware "^2.1.1"
+    broccoli-slow-trees "^3.1.0"
+    broccoli-source "^3.0.0"
+    broccoli-stew "^3.0.0"
+    calculate-cache-key-for-tree "^2.0.0"
+    capture-exit "^2.0.0"
+    chalk "^4.1.0"
+    ci-info "^2.0.0"
+    clean-base-url "^1.0.0"
+    compression "^1.7.4"
+    configstore "^5.0.1"
+    console-ui "^3.1.2"
+    core-object "^3.1.5"
+    dag-map "^2.0.2"
+    diff "^5.0.0"
+    ember-cli-is-package-missing "^1.0.0"
+    ember-cli-lodash-subset "^2.0.1"
+    ember-cli-normalize-entity-name "^1.0.0"
+    ember-cli-preprocess-registry "^3.3.0"
+    ember-cli-string-utils "^1.1.0"
+    ember-source-channel-url "^3.0.0"
+    ensure-posix-path "^1.1.1"
+    execa "^5.0.0"
+    exit "^0.1.2"
+    express "^4.17.1"
+    filesize "^6.1.0"
+    find-up "^5.0.0"
+    find-yarn-workspace-root "^2.0.0"
+    fixturify-project "^2.1.1"
+    fs-extra "^9.1.0"
+    fs-tree-diff "^2.0.1"
+    get-caller-file "^2.0.5"
+    git-repo-info "^2.1.1"
+    glob "^7.1.6"
+    heimdalljs "^0.2.6"
+    heimdalljs-fs-monitor "^1.1.0"
+    heimdalljs-graph "^1.0.0"
+    heimdalljs-logger "^0.1.10"
+    http-proxy "^1.18.1"
+    inflection "^1.12.0"
+    is-git-url "^1.0.0"
+    is-language-code "^2.0.0"
+    isbinaryfile "^4.0.6"
+    js-yaml "^3.14.0"
+    json-stable-stringify "^1.0.1"
+    leek "0.0.24"
+    lodash.template "^4.5.0"
+    markdown-it "^12.0.4"
+    markdown-it-terminal "0.2.1"
+    minimatch "^3.0.4"
+    morgan "^1.10.0"
+    nopt "^3.0.6"
+    npm-package-arg "^8.1.1"
+    p-defer "^3.0.0"
+    portfinder "^1.0.28"
+    promise-map-series "^0.3.0"
+    promise.hash.helper "^1.0.7"
+    quick-temp "^0.1.8"
+    resolve "^1.20.0"
+    resolve-package-path "^3.1.0"
+    sane "^4.1.0"
+    semver "^7.3.4"
+    silent-error "^1.1.1"
+    sort-package-json "^1.49.0"
+    symlink-or-copy "^1.3.1"
+    temp "0.9.4"
+    testem "^3.2.0"
+    tiny-lr "^2.0.0"
+    tree-sync "^2.1.0"
+    uuid "^8.3.2"
+    walk-sync "^2.2.0"
+    watch-detector "^1.0.0"
+    workerpool "^6.1.4"
+    yam "^1.0.0"
+
+ember-compatibility-helpers@^1.1.2:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/ember-compatibility-helpers/-/ember-compatibility-helpers-1.2.4.tgz#70e0fef7048969141626eed6006f3880df612cd1"
+  integrity sha512-qjzQVtogyYJrSs6I4DuyCDwDCaj5JWBVNPoZDZBk8pt7caNoN0eBYRYJdin95QKaNMQODxTLPWaI4UUDQ1YWhg==
+  dependencies:
+    babel-plugin-debug-macros "^0.2.0"
+    ember-cli-version-checker "^5.1.1"
+    fs-extra "^9.1.0"
+    semver "^5.4.1"
+
+ember-compatibility-helpers@^1.2.0, ember-compatibility-helpers@^1.2.1:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/ember-compatibility-helpers/-/ember-compatibility-helpers-1.2.5.tgz#b8363b1d5b8725afa9a4fe2b2986ac28626c6f23"
+  integrity sha512-7cddkQQp8Rs2Mqrj0xqZ0uO7eC9tBCKyZNcP2iE1RxQqOGPv8fiPkj1TUeidUB/Qe80lstoVXWMEuqqhW7Yy9A==
+  dependencies:
+    babel-plugin-debug-macros "^0.2.0"
+    ember-cli-version-checker "^5.1.1"
+    fs-extra "^9.1.0"
+    semver "^5.4.1"
+
+ember-compatibility-helpers@^1.2.5:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/ember-compatibility-helpers/-/ember-compatibility-helpers-1.2.6.tgz#603579ab2fb14be567ef944da3fc2d355f779cd8"
+  integrity sha512-2UBUa5SAuPg8/kRVaiOfTwlXdeVweal1zdNPibwItrhR0IvPrXpaqwJDlEZnWKEoB+h33V0JIfiWleSG6hGkkA==
+  dependencies:
+    babel-plugin-debug-macros "^0.2.0"
+    ember-cli-version-checker "^5.1.1"
+    find-up "^5.0.0"
+    fs-extra "^9.1.0"
+    semver "^5.4.1"
+
+ember-composable-helpers@^4.3.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/ember-composable-helpers/-/ember-composable-helpers-4.5.0.tgz#94febbdf4348e64f45f7a6f993f326e32540a61e"
+  integrity sha512-XjpDLyVPsLCy6kd5dIxZonOECCO6AA5sY5Hr6tYUbJg3s5ghFAiFWaNcYraYC+fL2yPJQAswwpfwGlQORUJZkw==
+  dependencies:
+    "@babel/core" "^7.0.0"
+    broccoli-funnel "2.0.1"
+    ember-cli-babel "^7.26.3"
+    resolve "^1.10.0"
+
+ember-concurrency-decorators@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/ember-concurrency-decorators/-/ember-concurrency-decorators-2.0.3.tgz#2816c9a0283b90ba5340fc5b4e0b92ea91f7d6e3"
+  integrity sha512-r6O34YKI/slyYapVsuOPnmaKC4AsmBSwvgcadbdy+jHNj+mnryXPkm+3hhhRnFdlsKUKdEuXvl43lhjhYRLhhA==
+  dependencies:
+    "@ember-decorators/utils" "^6.1.0"
+    ember-cli-babel "^7.19.0"
+    ember-cli-htmlbars "^4.3.1"
+    ember-cli-typescript "^3.1.4"
+
+"ember-concurrency@>=1.0.0 <3", ember-concurrency@^2.1.2:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/ember-concurrency/-/ember-concurrency-2.2.0.tgz#0acfb8ca855e0fdfa4c543be150028299a89ba32"
+  integrity sha512-Ns1MH6t08oJqfeWQ4EMxyf6bLsXM87SbUPwGNUsg7idpikvkGr1PWqtvU6qxDTv1mA4Vrwdhv0I9yxN0ShH9Bg==
+  dependencies:
+    "@glimmer/tracking" "^1.0.4"
+    ember-cli-babel "^7.26.6"
+    ember-cli-htmlbars "^5.7.1"
+    ember-compatibility-helpers "^1.2.0"
+    ember-destroyable-polyfill "^2.0.2"
+
+ember-copy@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ember-copy/-/ember-copy-2.0.1.tgz#13192b12a250324bb4a8b4547a680b113f4e3041"
+  integrity sha512-N/XFvZszrzyyX4IcNoeK4mJvIItNuONumhPLqi64T8NDjJkxBj4Pq61rvMkJx/9eZ8alzE4I8vYKOLxT0FvRuQ==
+  dependencies:
+    ember-cli-babel "^7.22.1"
+
+ember-d3@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/ember-d3/-/ember-d3-0.5.1.tgz#b23ce145863f082b5e73d25d9a43a0f1d9e9f412"
+  integrity sha512-NyjTUuIOxGxZdyrxLasNwwjqyFgay1pVHGRAWFj7mriwTI44muKsM9ZMl6YeepqixceuFig2fDxHmLLrkQV+QQ==
+  dependencies:
+    broccoli-funnel "^2.0.0"
+    broccoli-merge-trees "^3.0.0"
+    d3 "^5.0.0"
+    d3-selection-multi "^1.0.1"
+    ember-cli-babel "^7.1.2"
+
+ember-data-model-fragments@5.0.0-beta.5:
+  version "5.0.0-beta.5"
+  resolved "https://registry.yarnpkg.com/ember-data-model-fragments/-/ember-data-model-fragments-5.0.0-beta.5.tgz#f80e6fd72b3812e203acda2213847082b218329b"
+  integrity sha512-B4YB8UJDtxJ1cAspz1m75XqZgmHKIPPnQjeQfwtnincudf+Hsxb3EEgYKPpVz05QyaXwPx4InpiGWIlw+1m1wQ==
+  dependencies:
+    broccoli-file-creator "^2.1.1"
+    broccoli-merge-trees "^3.0.0"
+    calculate-cache-key-for-tree "^1.1.0"
+    ember-cli-babel "^7.23.0"
+    ember-compatibility-helpers "^1.2.1"
+    ember-copy "2.0.1"
+    git-repo-info "^2.1.1"
+    npm-git-info "^1.0.3"
+
+ember-data@~3.28.6:
+  version "3.28.9"
+  resolved "https://registry.yarnpkg.com/ember-data/-/ember-data-3.28.9.tgz#7b7812082d40047905946e99cef05847c650833c"
+  integrity sha512-J4ANZ49xu+fp10EH/9P00OtvBA6qdomk16MAZYFyp3NNTTMpEXFXa4AKCdN80l+Jl8LcR9YHzh16zOZLl9k/zw==
+  dependencies:
+    "@ember-data/adapter" "3.28.9"
+    "@ember-data/debug" "3.28.9"
+    "@ember-data/model" "3.28.9"
+    "@ember-data/private-build-infra" "3.28.9"
+    "@ember-data/record-data" "3.28.9"
+    "@ember-data/serializer" "3.28.9"
+    "@ember-data/store" "3.28.9"
+    "@ember/edition-utils" "^1.2.0"
+    "@ember/string" "^3.0.0"
+    "@glimmer/env" "^0.1.7"
+    broccoli-merge-trees "^4.2.0"
+    ember-cli-babel "^7.26.6"
+    ember-cli-typescript "^4.1.0"
+    ember-inflector "^4.0.1"
+
+ember-decorators@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/ember-decorators/-/ember-decorators-6.1.1.tgz#6d770f8999cf5a413a1ee459afd520838c0fc470"
+  integrity sha512-63vZPntPn1aqMyeNRLoYjJD+8A8obd+c2iZkJflswpDRNVIsp2m7aQdSCtPt4G0U/TEq2251g+N10maHX3rnJQ==
+  dependencies:
+    "@ember-decorators/component" "^6.1.1"
+    "@ember-decorators/object" "^6.1.1"
+    ember-cli-babel "^7.7.3"
+
+ember-destroyable-polyfill@^2.0.2, ember-destroyable-polyfill@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/ember-destroyable-polyfill/-/ember-destroyable-polyfill-2.0.3.tgz#1673ed66609a82268ef270a7d917ebd3647f11e1"
+  integrity sha512-TovtNqCumzyAiW0/OisSkkVK93xnVF4NRU6+FN0ubpfwEOpRrmM2RqDwXI6YAChCgSHON1cz0DfQStpA1Gjuuw==
+  dependencies:
+    ember-cli-babel "^7.22.1"
+    ember-cli-version-checker "^5.1.1"
+    ember-compatibility-helpers "^1.2.1"
+
+ember-element-helper@^0.5.5:
+  version "0.5.5"
+  resolved "https://registry.yarnpkg.com/ember-element-helper/-/ember-element-helper-0.5.5.tgz#4a9ecb4dce57ee7f5ceb868a53c7b498c729f056"
+  integrity sha512-Tu3hsI+/mjHBUvw62Qi+YDZtKkn59V66CjwbgfNTZZ7aHf4gFm1ow4zJ4WLnpnie8p9FvOmIUxwl5HvgPJIcFA==
+  dependencies:
+    "@embroider/util" "^0.39.1 || ^0.40.0 || ^0.41.0"
+    ember-cli-babel "^7.17.2"
+    ember-cli-htmlbars "^5.1.0"
+
+ember-engines@^0.8.3:
+  version "0.8.20"
+  resolved "https://registry.yarnpkg.com/ember-engines/-/ember-engines-0.8.20.tgz#4e8ea4f7e709355a561a247351a9a5f25e7ec51f"
+  integrity sha512-U7j9yHlUTkvNEV35pJe3c/MFkdyrtxsrXCy12crFwO6E3aV76gdu6lZs6HFLjBmA9bUwrXIr2nwEhitiWefU9w==
+  dependencies:
+    "@embroider/macros" "^0.43.5"
+    amd-name-resolver "1.3.1"
+    babel-plugin-compact-reexports "^1.1.0"
+    broccoli-babel-transpiler "^7.2.0"
+    broccoli-concat "^4.2.5"
+    broccoli-debug "^0.6.5"
+    broccoli-dependency-funnel "^2.1.2"
+    broccoli-file-creator "^2.1.1"
+    broccoli-funnel "^2.0.2"
+    broccoli-merge-trees "^3.0.2"
+    broccoli-test-helper "^2.0.0"
+    calculate-cache-key-for-tree "^2.0.0"
+    ember-asset-loader "^0.6.1"
+    ember-cli-babel "^7.18.0"
+    ember-cli-preprocess-registry "^3.3.0"
+    ember-cli-string-utils "^1.1.0"
+    ember-cli-version-checker "^5.1.2"
+    lodash "^4.17.11"
+
+ember-export-application-global@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ember-export-application-global/-/ember-export-application-global-2.0.1.tgz#b120a70e322ab208defc9e2daebe8d0dfc2dcd46"
+  integrity sha512-B7wiurPgsxsSGzJuPFkpBWnaeuCu2PGpG2BjyrfA1VcL7//o+5RSnZqiCEY326y7qmxb2GoCgo0ft03KBU0rRw==
+
+ember-fetch@^8.1.1:
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/ember-fetch/-/ember-fetch-8.1.1.tgz#d68d4a58529121a572ec09c39c6a3ad174c83a2e"
+  integrity sha512-Xi1wNmPtVmfIoFH675AA0ELIdYUcoZ2p+6j9c8eDFjiGJiFesyp01bDtl5ryBI/1VPOByJLsDkT+4C11HixsJw==
+  dependencies:
+    abortcontroller-polyfill "^1.7.3"
+    broccoli-concat "^4.2.5"
+    broccoli-debug "^0.6.5"
+    broccoli-merge-trees "^4.2.0"
+    broccoli-rollup "^2.1.1"
+    broccoli-stew "^3.0.0"
+    broccoli-templater "^2.0.1"
+    calculate-cache-key-for-tree "^2.0.0"
+    caniuse-api "^3.0.0"
+    ember-cli-babel "^7.23.1"
+    ember-cli-typescript "^4.1.0"
+    ember-cli-version-checker "^5.1.2"
+    node-fetch "^2.6.1"
+    whatwg-fetch "^3.6.2"
+
+"ember-get-config@0.2.4 - 0.5.0":
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/ember-get-config/-/ember-get-config-0.5.0.tgz#8195f3e4c0ff0742182c81ae54aad78d07a24bcf"
+  integrity sha512-y1osD6g8wV/BlDjuaN6OG5MT0iHY2X/yE38gUj/05uUIMIRfpcwOdWnFQHBiXIhDojvAJQTEF1VOYFIETQMkeQ==
+  dependencies:
+    broccoli-file-creator "^1.1.1"
+    ember-cli-babel "^7.26.6"
+    ember-cli-htmlbars "^5.7.1"
+
+ember-in-element-polyfill@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/ember-in-element-polyfill/-/ember-in-element-polyfill-1.0.1.tgz#143504445bb4301656a2eaad42644d684f5164dd"
+  integrity sha512-eHs+7D7PuQr8a1DPqsJTsEyo3FZ1XuH6WEZaEBPDa9s0xLlwByCNKl8hi1EbXOgvgEZNHHi9Rh0vjxyfakrlgg==
+  dependencies:
+    debug "^4.3.1"
+    ember-cli-babel "^7.23.1"
+    ember-cli-htmlbars "^5.3.1"
+    ember-cli-version-checker "^5.1.2"
+
+ember-inflector@4.0.2, "ember-inflector@^2.0.0 || ^3.0.0 || ^4.0.2", ember-inflector@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/ember-inflector/-/ember-inflector-4.0.2.tgz#4494f1a5f61c1aca7702d59d54024cc92211d8ec"
+  integrity sha512-+oRstEa52mm0jAFzhr51/xtEWpCEykB3SEBr7vUg8YnXUZJ5hKNBppP938q8Zzr9XfJEbzrtDSGjhKwJCJv6FQ==
+  dependencies:
+    ember-cli-babel "^7.26.5"
+
+ember-load-initializers@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ember-load-initializers/-/ember-load-initializers-2.1.2.tgz#8a47a656c1f64f9b10cecdb4e22a9d52ad9c7efa"
+  integrity sha512-CYR+U/wRxLbrfYN3dh+0Tb6mFaxJKfdyz+wNql6cqTrA0BBi9k6J3AaKXj273TqvEpyyXegQFFkZEiuZdYtgJw==
+  dependencies:
+    ember-cli-babel "^7.13.0"
+    ember-cli-typescript "^2.0.2"
+
+ember-maybe-in-element@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/ember-maybe-in-element/-/ember-maybe-in-element-2.0.3.tgz#640ea56b492bdacd1c41c128c2163d933c18c3ec"
+  integrity sha512-XKuBYPYELwsEmDnJXI7aNSZtt/SKGgRZNMFhASODLz7j0OHSNrcJtjo5Wam/alxIjUIYVjEnMnOzqBLMfJnQkQ==
+  dependencies:
+    ember-cli-babel "^7.21.0"
+    ember-cli-htmlbars "^5.2.0"
+    ember-cli-version-checker "^5.1.1"
+    ember-in-element-polyfill "^1.0.1"
+
+ember-modal-dialog@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/ember-modal-dialog/-/ember-modal-dialog-4.0.0.tgz#ab599ad14055550706800bd9aac3a2cbb7799748"
+  integrity sha512-ofh+xG8v6Lg60R3JXaG9pW683OWCexDQT/JT7S0TOgywSHzdC9WYE4/kIbvxZ6T9Ka87CosP+cz2A2iJ/jvZNQ==
+  dependencies:
+    "@embroider/macros" "^1.0.0"
+    "@embroider/util" "^1.0.0"
+    ember-cli-babel "^7.26.8"
+    ember-cli-htmlbars "^6.0.1"
+    ember-cli-version-checker "^2.1.0"
+    ember-decorators "^6.1.1"
+    ember-wormhole "^0.6.0"
+
+ember-modifier-manager-polyfill@^1.1.0, ember-modifier-manager-polyfill@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/ember-modifier-manager-polyfill/-/ember-modifier-manager-polyfill-1.2.0.tgz#cf4444e11a42ac84f5c8badd85e635df57565dda"
+  integrity sha512-bnaKF1LLKMkBNeDoetvIJ4vhwRPKIIumWr6dbVuW6W6p4QV8ZiO+GdF8J7mxDNlog9CeL9Z/7wam4YS86G8BYA==
+  dependencies:
+    ember-cli-babel "^7.10.0"
+    ember-cli-version-checker "^2.1.2"
+    ember-compatibility-helpers "^1.2.0"
+
+ember-modifier@^3.0.0:
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/ember-modifier/-/ember-modifier-3.2.7.tgz#f2d35b7c867cbfc549e1acd8d8903c5ecd02ea4b"
+  integrity sha512-ezcPQhH8jUfcJQbbHji4/ZG/h0yyj1jRDknfYue/ypQS8fM8LrGcCMo0rjDZLzL1Vd11InjNs3BD7BdxFlzGoA==
+  dependencies:
+    ember-cli-babel "^7.26.6"
+    ember-cli-normalize-entity-name "^1.0.0"
+    ember-cli-string-utils "^1.1.0"
+    ember-cli-typescript "^5.0.0"
+    ember-compatibility-helpers "^1.2.5"
+
+ember-modifier@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/ember-modifier/-/ember-modifier-3.1.0.tgz#ba5b0941302accd787ed3dcfc8d20400b77ffc41"
+  integrity sha512-G5Lj9jVFsD2sVJcRNQfaGKG1p81wT4LGfClBhCuB4TgwP1NGJKdqI+Q8BW2MptONxQt/71UjjUH0YK7Gm9eahg==
+  dependencies:
+    ember-cli-babel "^7.26.6"
+    ember-cli-normalize-entity-name "^1.0.0"
+    ember-cli-string-utils "^1.1.0"
+    ember-cli-typescript "^4.2.1"
+    ember-compatibility-helpers "^1.2.5"
+
+ember-native-dom-helpers@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/ember-native-dom-helpers/-/ember-native-dom-helpers-0.7.0.tgz#98a87c11a391cec5c12382a4857e59ea2fb4b00a"
+  integrity sha512-ySJRGRhwYIWUAZKilB8xEcIatP9wKfEBX6JFG8bG4Ck7GvA0eau265hTGZz/+ntZuwcY4HrzSNkwimlHx4cM/A==
+  dependencies:
+    broccoli-funnel "^1.1.0"
+    ember-cli-babel "^6.6.0"
+
+ember-page-title@^6.2.2:
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/ember-page-title/-/ember-page-title-6.2.2.tgz#980838c44e96cba1d00f42435d707936af627324"
+  integrity sha512-YTXA+cylZrh9zO0zwjlaAGReT2MVOxAMnVO1OOygFrs1JBs4D6CKV3tImoilg3AvIXFBeJfFNNUbJOdRd9IGGg==
+  dependencies:
+    ember-cli-babel "^7.23.1"
+
+ember-power-select@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/ember-power-select/-/ember-power-select-5.0.3.tgz#615da0742a222a8c090590dd2cbb2db3a6147ac5"
+  integrity sha512-V72DxohhuPdsF6Rcxu1cVL2faHSk83RdTCkxeDT71NeQQNpHKbslhc0c+MMU52wm0mzch+oWmti/2McpL/vIvQ==
+  dependencies:
+    "@embroider/util" "^0.47.2"
+    "@glimmer/component" "^1.0.4"
+    "@glimmer/tracking" "^1.0.4"
+    ember-assign-helper "^0.4.0"
+    ember-basic-dropdown "^3.1.0 || ^4.0.2"
+    ember-cli-babel "^7.26.0"
+    ember-cli-htmlbars "^6.0.0"
+    ember-cli-typescript "^4.2.0"
+    ember-concurrency ">=1.0.0 <3"
+    ember-concurrency-decorators "^2.0.0"
+    ember-text-measurer "^0.6.0"
+    ember-truth-helpers "^2.1.0 || ^3.0.0"
+
+ember-qrcode-shim@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/ember-qrcode-shim/-/ember-qrcode-shim-0.4.0.tgz#bc4c61e8c33c7e731e98d68780a772d59eec4fc6"
+  integrity sha512-tmdxr7mqfeG5vK6Lb553qmFlhnZipZyGBPQIBh5TbRQozPH5ATVS7zq77eV//d9y3997R7hGIYTNbsGZ718lOw==
+  dependencies:
+    ember-cli-babel "^7.1.2"
+
+ember-qunit@^5.1.5:
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/ember-qunit/-/ember-qunit-5.1.5.tgz#24a7850f052be24189ff597dfc31b923e684c444"
+  integrity sha512-2cFA4oMygh43RtVcMaBrr086Tpdhgbn3fVZ2awLkzF/rnSN0D0PSRpd7hAD7OdBPerC/ZYRwzVyGXLoW/Zes4A==
+  dependencies:
+    broccoli-funnel "^3.0.8"
+    broccoli-merge-trees "^3.0.2"
+    common-tags "^1.8.0"
+    ember-auto-import "^1.11.3"
+    ember-cli-babel "^7.26.6"
+    ember-cli-test-loader "^3.0.0"
+    resolve-package-path "^3.1.0"
+    silent-error "^1.1.1"
+    validate-peer-dependencies "^1.2.0"
+
+ember-resolver@^8.0.3:
+  version "8.0.3"
+  resolved "https://registry.yarnpkg.com/ember-resolver/-/ember-resolver-8.0.3.tgz#40f243aa58281bf195c695fe84a6b291e204690a"
+  integrity sha512-fA53fxfG821BRqNiB9mQDuzZpzSRcSAYZTYBlRQOHsJwoYdjyE7idz4YcytbSsa409G5J2kP6B+PiKOBh0odlw==
+  dependencies:
+    babel-plugin-debug-macros "^0.3.4"
+    broccoli-funnel "^3.0.8"
+    broccoli-merge-trees "^4.2.0"
+    ember-cli-babel "^7.26.6"
+    ember-cli-version-checker "^5.1.2"
+    resolve "^1.20.0"
+
+ember-responsive@^3.0.0-beta.3:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/ember-responsive/-/ember-responsive-3.0.6.tgz#4413c1475d08229791d0133f8bfd44f744a81ca7"
+  integrity sha512-TSFOB5FnlsMoAQrIe8EhM+cV0kJSLefTyXdb/rAi5zAqVoPC5qreQeHUQG7JKHR8K73azNZM64mXADX1IrIVUw==
+  dependencies:
+    ember-cli-babel "^7.19.0"
+
+ember-rfc176-data@^0.3.13, ember-rfc176-data@^0.3.15, ember-rfc176-data@^0.3.17:
+  version "0.3.17"
+  resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.17.tgz#d4fc6c33abd6ef7b3440c107a28e04417b49860a"
+  integrity sha512-EVzTTKqxv9FZbEh6Ktw56YyWRAA0MijKvl7H8C06wVF+8f/cRRz3dXxa4nkwjzyVwx4rzKGuIGq77hxJAQhWWw==
+
+ember-router-generator@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ember-router-generator/-/ember-router-generator-2.0.0.tgz#d04abfed4ba8b42d166477bbce47fccc672dbde0"
+  integrity sha512-89oVHVJwmLDvGvAUWgS87KpBoRhy3aZ6U0Ql6HOmU4TrPkyaa8pM0W81wj9cIwjYprcQtN9EwzZMHnq46+oUyw==
+  dependencies:
+    "@babel/parser" "^7.4.5"
+    "@babel/traverse" "^7.4.5"
+    recast "^0.18.1"
+
+ember-router-helpers@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/ember-router-helpers/-/ember-router-helpers-0.4.0.tgz#6ef86cc75e38c3455ab916c78d5a38293e94c12f"
+  integrity sha512-DiPyncEAACKV/XcmYqUwh0iHBPvGW75Fw1uerDudblofXTtAH/+QzeE/0wK2G6MUBWKyn0HyIuLXE3pJm0zKFg==
+  dependencies:
+    ember-cli-babel "^7.20.0"
+
+ember-runtime-enumerable-includes-polyfill@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/ember-runtime-enumerable-includes-polyfill/-/ember-runtime-enumerable-includes-polyfill-2.1.0.tgz#dc6d4a028471e4acc350dfd2a149874fb20913f5"
+  integrity sha512-au18iI8VbEDYn3jLFZzETnKN5ciPgCUxMRucEP3jkq7qZ6sE0FVKpWMPY/h9tTND3VOBJt6fgPpEBJoJVCUudg==
+  dependencies:
+    ember-cli-babel "^6.9.0"
+    ember-cli-version-checker "^2.1.0"
+
+ember-service-worker@meirish/ember-service-worker#configurable-scope:
+  version "9.0.1"
+  resolved "https://codeload.github.com/meirish/ember-service-worker/tar.gz/dda14187aace0d73ecdb6a55beac2194a3aec01b"
+  dependencies:
+    "@rollup/plugin-replace" "2.3.0"
+    broccoli-caching-writer "^3.0.3"
+    broccoli-file-creator "^2.1.1"
+    broccoli-funnel "^2.0.2"
+    broccoli-merge-trees "^3.0.1"
+    broccoli-rollup "4.0.0"
+    broccoli-uglify-sourcemap "^3.2.0"
+    clone "^2.1.2"
+    ember-cli-babel "^7.22.1"
+    glob "^7.1.6"
+    hash-for-dep "^1.5.1"
+
+ember-sinon@^4.0.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ember-sinon/-/ember-sinon-4.1.1.tgz#ff6db9e3b9548e269386d9efe1c381e165f03ba5"
+  integrity sha512-CmLjy7LGcTw2uP0WdFSPuXYbI7rwB4U/5EOtVU5h2jXtItrnspLIXBL50kigDzwv+lgE8XhfDVPbJ1QMrIXWXg==
+  dependencies:
+    broccoli-funnel "^2.0.0"
+    broccoli-merge-trees "^3.0.0"
+    ember-cli-babel "^7.7.3"
+    sinon "^7.4.2"
+
+ember-source-channel-url@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ember-source-channel-url/-/ember-source-channel-url-3.0.0.tgz#bcd5be72c63fa0b8c390b3121783b462063e2a1b"
+  integrity sha512-vF/8BraOc66ZxIDo3VuNP7iiDrnXEINclJgSJmqwAAEpg84Zb1DHPI22XTXSDA+E8fW5btPUxu65c3ZXi8AQFA==
+  dependencies:
+    node-fetch "^2.6.0"
+
+ember-source@3.28.10:
+  version "3.28.10"
+  resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.28.10.tgz#f4be7e2852d421a558f686505748f4c88f6d6ae6"
+  integrity sha512-TH8ug2rRUq6pLwqjciwvnuF8GDKBXNW2v5mvDkkf+k5S84XVHPjn3K0q2uGaR2W/mCDYg+mGmqu/PIGy0STx9Q==
+  dependencies:
+    "@babel/helper-module-imports" "^7.8.3"
+    "@babel/plugin-transform-block-scoping" "^7.8.3"
+    "@babel/plugin-transform-object-assign" "^7.8.3"
+    "@ember/edition-utils" "^1.2.0"
+    "@glimmer/vm-babel-plugins" "0.80.3"
+    babel-plugin-debug-macros "^0.3.4"
+    babel-plugin-filter-imports "^4.0.0"
+    broccoli-concat "^4.2.4"
+    broccoli-debug "^0.6.4"
+    broccoli-file-creator "^2.1.1"
+    broccoli-funnel "^2.0.2"
+    broccoli-merge-trees "^4.2.0"
+    chalk "^4.0.0"
+    ember-cli-babel "^7.23.0"
+    ember-cli-get-component-path-option "^1.0.0"
+    ember-cli-is-package-missing "^1.0.0"
+    ember-cli-normalize-entity-name "^1.0.0"
+    ember-cli-path-utils "^1.0.0"
+    ember-cli-string-utils "^1.1.0"
+    ember-cli-version-checker "^5.1.1"
+    ember-router-generator "^2.0.0"
+    inflection "^1.12.0"
+    jquery "^3.5.1"
+    resolve "^1.17.0"
+    semver "^7.3.4"
+    silent-error "^1.1.1"
+
+ember-style-modifier@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/ember-style-modifier/-/ember-style-modifier-0.7.0.tgz#85b3dfd7e4bc2bd546df595f2dab4fb141cf7d87"
+  integrity sha512-iDzffiwJcb9j6gu3g8CxzZOTvRZ0BmLMEFl+uyqjiaj72VVND9+HbLyQRw1/ewPAtinhSktxxTTdwU/JO+stLw==
+  dependencies:
+    ember-cli-babel "^7.26.6"
+    ember-modifier "^3.0.0"
+
+ember-svg-jar@^2.1.0:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/ember-svg-jar/-/ember-svg-jar-2.3.3.tgz#aede3f23e58bdcacc0e59a297c1ebad71a472e31"
+  integrity sha512-Obs8vEMKPfS2R48bKBAfNSLphFsDwUMRqi8TVKtlLE6okTXC8NebGg7pA/IutIGnakqJRAz4/dWAZyI74duDuQ==
+  dependencies:
+    broccoli-caching-writer "^3.0.3"
+    broccoli-concat "^3.7.4"
+    broccoli-funnel "^2.0.2"
+    broccoli-merge-trees "^3.0.2"
+    broccoli-persistent-filter "^2.3.1"
+    broccoli-plugin "^3.0.0"
+    broccoli-string-replace "^0.1.2"
+    broccoli-svg-optimizer "2.0.0"
+    cheerio "^0.22.0"
+    console-ui "^3.1.1"
+    ember-cli-babel "^7.7.3"
+    json-stable-stringify "^1.0.1"
+    lodash "^4.17.15"
+    mkdirp "^0.5.1"
+    path-posix "^1.0.0"
+
+ember-template-lint-plugin-prettier@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/ember-template-lint-plugin-prettier/-/ember-template-lint-plugin-prettier-4.0.0.tgz#37b49529232cf3b484b138a30e637d93c4e4044a"
+  integrity sha512-tQTiS60SAIHp49a++oRO9Hh1YzXvjIw8LM8PjOYyHv5WrNA3ATiTpJjHjcvQUog8Bw8TT+u0G16VmKkYHtSUQg==
+  dependencies:
+    prettier-linter-helpers "^1.0.0"
+
+ember-template-lint@4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/ember-template-lint/-/ember-template-lint-4.3.0.tgz#4bb6050db57eeeaa8f944151c9fef9cf582e7217"
+  integrity sha512-a+UFZDTGMUStY8wnzFQyD3BmA/UKdegQ4WDikS0TbhVTx9tK6aOnVh5lV33Xr4Fbf3Pee1N1//XdCulWpUajMg==
+  dependencies:
+    "@lint-todo/utils" "^12.0.1"
+    aria-query "^5.0.0"
+    chalk "^4.1.2"
+    ci-info "^3.3.0"
+    date-fns "^2.28.0"
+    ember-template-recast "^6.1.3"
+    find-up "^6.3.0"
+    fuse.js "^6.5.3"
+    get-stdin "^9.0.0"
+    globby "^13.1.1"
+    is-glob "^4.0.3"
+    micromatch "^4.0.4"
+    resolve "^1.22.0"
+    v8-compile-cache "^2.3.0"
+    yargs "^17.3.1"
+
+ember-template-recast@^6.1.3:
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/ember-template-recast/-/ember-template-recast-6.1.3.tgz#1e9b256ee9da24bcaa7c213088d01f32afc88001"
+  integrity sha512-45lkfjrWlrMPlOd5rLFeQeePZwAvcS//x1x15kaiQTlqQdYWiYNXwbpWHqV+p9fXY6bEjl6EbyPhG/zBkgh8MA==
+  dependencies:
+    "@glimmer/reference" "^0.83.1"
+    "@glimmer/syntax" "^0.83.1"
+    "@glimmer/validator" "^0.83.0"
+    async-promise-queue "^1.0.5"
+    colors "^1.4.0"
+    commander "^8.3.0"
+    globby "^11.0.3"
+    ora "^5.4.0"
+    slash "^3.0.0"
+    tmp "^0.2.1"
+    workerpool "^6.1.5"
+
+ember-test-selectors@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/ember-test-selectors/-/ember-test-selectors-6.0.0.tgz#ba9bb19550d9dec6e4037d86d2b13c2cfd329341"
+  integrity sha512-PgYcI9PeNvtKaF0QncxfbS68olMYM1idwuI8v/WxsjOGqUx5bmsu6V17vy/d9hX4mwmjgsBhEghrVasGSuaIgw==
+  dependencies:
+    calculate-cache-key-for-tree "^2.0.0"
+    ember-cli-babel "^7.26.4"
+    ember-cli-version-checker "^5.1.2"
+
+ember-tether@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ember-tether/-/ember-tether-2.0.1.tgz#29cab1463c43ebc22c836887b25d9b5106231366"
+  integrity sha512-ECjmFVqo58YK6SmrBW77hmp1wE76n9azl3H6oMvYOXLA4FraOB4xhuk/VCV/XPbG0p1bArKepGjxM8Qbu8g0Lw==
+  dependencies:
+    ember-auto-import "^1.2.19"
+    ember-cli-babel "^7.1.2"
+    tether "^1.4.0"
+
+ember-text-measurer@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/ember-text-measurer/-/ember-text-measurer-0.6.0.tgz#140eda044fd7d4d7f60f654dd30da79c06922b2e"
+  integrity sha512-/aZs2x2i6kT4a5tAW+zenH2wg8AbRK9jKxLkbVsKl/1ublNl27idVRdov1gJ+zgWu3DNK7whcfVycXtlaybYQw==
+  dependencies:
+    ember-cli-babel "^7.19.0"
+    ember-cli-htmlbars "^4.3.1"
+
+ember-truth-helpers@3.0.0, "ember-truth-helpers@^2.1.0 || ^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ember-truth-helpers/-/ember-truth-helpers-3.0.0.tgz#86766bdca4ac9b86bce3d262dff2aabc4a0ea384"
+  integrity sha512-hPKG9QqruAELh0li5xaiLZtr88ioWYxWCXisAWHWE0qCP4a2hgtuMzKUPpiTCkltvKjuqpzTZCU4VhQ+IlRmew==
+  dependencies:
+    ember-cli-babel "^7.22.1"
+
+ember-wormhole@0.6.0, ember-wormhole@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/ember-wormhole/-/ember-wormhole-0.6.0.tgz#1f9143aa05c0f0abdf14a97ff22520ebaf85eca0"
+  integrity sha512-b7RrRxkwCBEJxM2zR34dEzIET81BOZWTcYNJtkidLycLQvdbxPys5QJEjJ/IfDikT/z5HuQBdZRKBhXI0vZNXQ==
+  dependencies:
+    ember-cli-babel "^7.22.1"
+    ember-cli-htmlbars "^5.3.1"
+
+emoji-regex@^7.0.1:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
+  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
+
+emoji-regex@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
+
+emoji-regex@~6.1.0:
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-6.1.3.tgz#ec79a3969b02d2ecf2b72254279bf99bc7a83932"
+  integrity sha512-73/zxHTjP2N2FQf0J5ngNjxP9LqG2krUshxYaowI8HxZQsiL2pYJc3k9/O93fc5/lCSkZv+bQ5Esk6k6msiSvg==
+
+emojis-list@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
+  integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
+
+encodeurl@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
+  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
+
+end-of-stream@^1.0.0, end-of-stream@^1.1.0:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
+  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
+  dependencies:
+    once "^1.4.0"
+
+engine.io-client@~3.5.0:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.5.1.tgz#b500458a39c0cd197a921e0e759721a746d0bdb9"
+  integrity sha512-oVu9kBkGbcggulyVF0kz6BV3ganqUeqXvD79WOFKa+11oK692w1NyFkuEj4xrkFRpZhn92QOqTk4RQq5LiBXbQ==
+  dependencies:
+    component-emitter "~1.3.0"
+    component-inherit "0.0.3"
+    debug "~3.1.0"
+    engine.io-parser "~2.2.0"
+    has-cors "1.1.0"
+    indexof "0.0.1"
+    parseqs "0.0.6"
+    parseuri "0.0.6"
+    ws "~7.4.2"
+    xmlhttprequest-ssl "~1.5.4"
+    yeast "0.1.2"
+
+engine.io-parser@~2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.2.1.tgz#57ce5611d9370ee94f99641b589f94c97e4f5da7"
+  integrity sha512-x+dN/fBH8Ro8TFwJ+rkB2AmuVw9Yu2mockR/p3W8f8YtExwFgDvBDi0GWyb4ZLkpahtDGZgtr3zLovanJghPqg==
+  dependencies:
+    after "0.8.2"
+    arraybuffer.slice "~0.0.7"
+    base64-arraybuffer "0.1.4"
+    blob "0.0.5"
+    has-binary2 "~1.0.2"
+
+engine.io@~3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.5.0.tgz#9d6b985c8a39b1fe87cd91eb014de0552259821b"
+  integrity sha512-21HlvPUKaitDGE4GXNtQ7PLP0Sz4aWLddMPw2VTyFz1FVZqu/kZsJUO8WNpKuE/OCL7nkfRaOui2ZCJloGznGA==
+  dependencies:
+    accepts "~1.3.4"
+    base64id "2.0.0"
+    cookie "~0.4.1"
+    debug "~4.1.0"
+    engine.io-parser "~2.2.0"
+    ws "~7.4.2"
+
+enhanced-resolve@^4.0.0, enhanced-resolve@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz#2f3cfd84dbe3b487f18f2db2ef1e064a571ca5ec"
+  integrity sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==
+  dependencies:
+    graceful-fs "^4.1.2"
+    memory-fs "^0.5.0"
+    tapable "^1.0.0"
+
+enhanced-resolve@^5.9.3:
+  version "5.9.3"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.9.3.tgz#44a342c012cbc473254af5cc6ae20ebd0aae5d88"
+  integrity sha512-Bq9VSor+kjvW3f9/MiiR4eE3XYgOl7/rS8lnSxbRbF3kS0B2r+Y9w5krBWxZgDxASVZbdYrn5wT4j/Wb0J9qow==
+  dependencies:
+    graceful-fs "^4.2.4"
+    tapable "^2.2.0"
+
+enquirer@^2.3.5, enquirer@^2.3.6:
+  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"
+
+ensure-posix-path@^1.0.0, ensure-posix-path@^1.0.1, ensure-posix-path@^1.0.2, ensure-posix-path@^1.1.0, ensure-posix-path@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ensure-posix-path/-/ensure-posix-path-1.1.1.tgz#3c62bdb19fa4681544289edb2b382adc029179ce"
+  integrity sha512-VWU0/zXzVbeJNXvME/5EmLuEj2TauvoaTz6aFYK1Z92JCBlDlZ3Gu0tuGR42kpW1754ywTs+QB0g5TP0oj9Zaw==
+
+entities@^1.1.1, entities@~1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
+  integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
+
+entities@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
+  integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
+
+entities@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-3.0.1.tgz#2b887ca62585e96db3903482d336c1006c3001d4"
+  integrity sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==
+
+entities@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
+  integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==
+
+env-paths@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
+  integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==
+
+errlop@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/errlop/-/errlop-2.2.0.tgz#1ff383f8f917ae328bebb802d6ca69666a42d21b"
+  integrity sha512-e64Qj9+4aZzjzzFpZC7p5kmm/ccCrbLhAJplhsDXQFs87XTsXwOpH4s1Io2s90Tau/8r2j9f4l/thhDevRjzxw==
+
+errno@^0.1.3, errno@~0.1.7:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f"
+  integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==
+  dependencies:
+    prr "~1.0.1"
+
+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"
+
+error@^7.0.0:
+  version "7.2.1"
+  resolved "https://registry.yarnpkg.com/error/-/error-7.2.1.tgz#eab21a4689b5f684fc83da84a0e390de82d94894"
+  integrity sha512-fo9HBvWnx3NGUKMvMwB/CBCMMrfEJgbDTVDEkPygA3Bdd3lM1OyCd+rbQ8BwnpF6GdVeOLDNmyL4N5Bg80ZvdA==
+  dependencies:
+    string-template "~0.2.1"
+
+es-abstract@^1.17.2:
+  version "1.18.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0.tgz#ab80b359eecb7ede4c298000390bc5ac3ec7b5a4"
+  integrity sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==
+  dependencies:
+    call-bind "^1.0.2"
+    es-to-primitive "^1.2.1"
+    function-bind "^1.1.1"
+    get-intrinsic "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.2"
+    is-callable "^1.2.3"
+    is-negative-zero "^2.0.1"
+    is-regex "^1.1.2"
+    is-string "^1.0.5"
+    object-inspect "^1.9.0"
+    object-keys "^1.1.1"
+    object.assign "^4.1.2"
+    string.prototype.trimend "^1.0.4"
+    string.prototype.trimstart "^1.0.4"
+    unbox-primitive "^1.0.0"
+
+es-abstract@^1.18.0-next.2, es-abstract@^1.19.1:
+  version "1.19.1"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3"
+  integrity sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==
+  dependencies:
+    call-bind "^1.0.2"
+    es-to-primitive "^1.2.1"
+    function-bind "^1.1.1"
+    get-intrinsic "^1.1.1"
+    get-symbol-description "^1.0.0"
+    has "^1.0.3"
+    has-symbols "^1.0.2"
+    internal-slot "^1.0.3"
+    is-callable "^1.2.4"
+    is-negative-zero "^2.0.1"
+    is-regex "^1.1.4"
+    is-shared-array-buffer "^1.0.1"
+    is-string "^1.0.7"
+    is-weakref "^1.0.1"
+    object-inspect "^1.11.0"
+    object-keys "^1.1.1"
+    object.assign "^4.1.2"
+    string.prototype.trimend "^1.0.4"
+    string.prototype.trimstart "^1.0.4"
+    unbox-primitive "^1.0.1"
+
+es-module-lexer@^0.9.0:
+  version "0.9.3"
+  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19"
+  integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==
+
+es-to-primitive@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
+  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
+  dependencies:
+    is-callable "^1.1.4"
+    is-date-object "^1.0.1"
+    is-symbol "^1.0.2"
+
+es6-promise@^4.0.3:
+  version "4.2.8"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
+  integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
+
+es6-promisify@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
+  integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=
+  dependencies:
+    es6-promise "^4.0.3"
+
+escalade@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
+
+escape-html@~1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
+  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
+
+escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+
+escape-string-regexp@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
+  integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
+
+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@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd"
+  integrity sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==
+  dependencies:
+    esprima "^4.0.1"
+    estraverse "^5.2.0"
+    esutils "^2.0.2"
+    optionator "^0.8.1"
+  optionalDependencies:
+    source-map "~0.6.1"
+
+eslint-config-prettier@^8.3.0:
+  version "8.5.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz#5a81680ec934beca02c7b1a61cf8ca34b66feab1"
+  integrity sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==
+
+eslint-plugin-compat@4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-compat/-/eslint-plugin-compat-4.0.2.tgz#b058627a7d25d352adf0ec16dca8fcf92d9c7af7"
+  integrity sha512-xqvoO54CLTVaEYGMzhu35Wzwk/As7rCvz/2dqwnFiWi0OJccEtGIn+5qq3zqIu9nboXlpdBN579fZcItC73Ycg==
+  dependencies:
+    "@mdn/browser-compat-data" "^4.1.5"
+    ast-metadata-inferer "^0.7.0"
+    browserslist "^4.16.8"
+    caniuse-lite "^1.0.30001304"
+    core-js "^3.16.2"
+    find-up "^5.0.0"
+    lodash.memoize "4.1.2"
+    semver "7.3.5"
+
+eslint-plugin-ember@^10.5.8:
+  version "10.5.9"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-ember/-/eslint-plugin-ember-10.5.9.tgz#4071ac135c7207c7d4942e9fa75b710214885469"
+  integrity sha512-kJsdAaKNcfRvZBZ+YZ67pxxUgl+aPLFAnoFJNwTo+BsaptiOCsHUEc4xUKXiInH2BJOC6mg0FQcZKn1a6gwKrA==
+  dependencies:
+    "@ember-data/rfc395-data" "^0.0.4"
+    css-tree "^2.0.4"
+    ember-rfc176-data "^0.3.15"
+    eslint-utils "^3.0.0"
+    estraverse "^5.2.0"
+    lodash.kebabcase "^4.1.1"
+    requireindex "^1.2.0"
+    snake-case "^3.0.3"
+
+eslint-plugin-es@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz#75a7cdfdccddc0589934aeeb384175f221c57893"
+  integrity sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==
+  dependencies:
+    eslint-utils "^2.0.0"
+    regexpp "^3.0.0"
+
+eslint-plugin-node@^11.1.0:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz#c95544416ee4ada26740a30474eefc5402dc671d"
+  integrity sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==
+  dependencies:
+    eslint-plugin-es "^3.0.0"
+    eslint-utils "^2.0.0"
+    ignore "^5.1.1"
+    minimatch "^3.0.4"
+    resolve "^1.10.1"
+    semver "^6.1.0"
+
+eslint-plugin-prettier@^3.4.1:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.1.tgz#e9ddb200efb6f3d05ffe83b1665a716af4a387e5"
+  integrity sha512-htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g==
+  dependencies:
+    prettier-linter-helpers "^1.0.0"
+
+eslint-plugin-qunit@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-qunit/-/eslint-plugin-qunit-6.2.0.tgz#f4efda29da99523e560848d9592c39c0590c308d"
+  integrity sha512-KvPmkIC2MHpfRxs/r8WUeeGkG6y+3qwSi2AZIBtjcM/YG6Z3k0GxW5Hbu3l7X0TDhljVCeBb9Q5puUkHzl83Mw==
+  dependencies:
+    eslint-utils "^3.0.0"
+    requireindex "^1.2.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==
+  dependencies:
+    esrecurse "^4.3.0"
+    estraverse "^4.1.1"
+
+eslint-scope@^3.7.1:
+  version "3.7.3"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.3.tgz#bb507200d3d17f60247636160b4826284b108535"
+  integrity sha512-W+B0SvF4gamyCTmUc+uITPY0989iXVfKvhwtmJocTaYoc/3khEHmEmvfY/Gn9HA9VV75jrQECsHizkNw1b68FA==
+  dependencies:
+    esrecurse "^4.1.0"
+    estraverse "^4.1.1"
+
+eslint-scope@^4.0.0, eslint-scope@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848"
+  integrity sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==
+  dependencies:
+    esrecurse "^4.1.0"
+    estraverse "^4.1.1"
+
+eslint-utils@^1.3.1, eslint-utils@^1.4.1, eslint-utils@^2.0.0, eslint-utils@^2.1.0, eslint-utils@^3.0.0:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f"
+  integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==
+  dependencies:
+    eslint-visitor-keys "^1.1.0"
+
+eslint-visitor-keys@^1.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.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
+  integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
+
+eslint@^5.0.0:
+  version "5.16.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.16.0.tgz#a1e3ac1aae4a3fbd8296fcf8f7ab7314cbb6abea"
+  integrity sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    ajv "^6.9.1"
+    chalk "^2.1.0"
+    cross-spawn "^6.0.5"
+    debug "^4.0.1"
+    doctrine "^3.0.0"
+    eslint-scope "^4.0.3"
+    eslint-utils "^1.3.1"
+    eslint-visitor-keys "^1.0.0"
+    espree "^5.0.1"
+    esquery "^1.0.1"
+    esutils "^2.0.2"
+    file-entry-cache "^5.0.1"
+    functional-red-black-tree "^1.0.1"
+    glob "^7.1.2"
+    globals "^11.7.0"
+    ignore "^4.0.6"
+    import-fresh "^3.0.0"
+    imurmurhash "^0.1.4"
+    inquirer "^6.2.2"
+    js-yaml "^3.13.0"
+    json-stable-stringify-without-jsonify "^1.0.1"
+    levn "^0.3.0"
+    lodash "^4.17.11"
+    minimatch "^3.0.4"
+    mkdirp "^0.5.1"
+    natural-compare "^1.4.0"
+    optionator "^0.8.2"
+    path-is-inside "^1.0.2"
+    progress "^2.0.0"
+    regexpp "^2.0.1"
+    semver "^5.5.1"
+    strip-ansi "^4.0.0"
+    strip-json-comments "^2.0.1"
+    table "^5.2.3"
+    text-table "^0.2.0"
+
+eslint@^7.32.0:
+  version "7.32.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d"
+  integrity sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==
+  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"
+
+esm@^3.2.25, esm@^3.2.4:
+  version "3.2.25"
+  resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.25.tgz#342c18c29d56157688ba5ce31f8431fbb795cc10"
+  integrity sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==
+
+espree@^3.5.2:
+  version "3.5.4"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz#b0f447187c8a8bed944b815a660bddf5deb5d1a7"
+  integrity sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==
+  dependencies:
+    acorn "^5.5.0"
+    acorn-jsx "^3.0.0"
+
+espree@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-5.0.1.tgz#5d6526fa4fc7f0788a5cf75b15f30323e2f81f7a"
+  integrity sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==
+  dependencies:
+    acorn "^6.0.7"
+    acorn-jsx "^5.0.0"
+    eslint-visitor-keys "^1.0.0"
+
+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@^4.0.0, esprima@^4.0.1, esprima@~4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
+
+esprima@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.0.0.tgz#53cf247acda77313e551c3aa2e73342d3fb4f7d9"
+  integrity sha1-U88kes2ncxPlUcOqLnM0LT+099k=
+
+esquery@^1.0.0, esquery@^1.0.1, 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.1.0, esrecurse@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
+  integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
+  dependencies:
+    estraverse "^5.2.0"
+
+estraverse@^4.1.1:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
+  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
+
+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==
+
+esutils@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
+  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
+
+etag@~1.8.1:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
+  integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
+
+eventemitter3@^4.0.0:
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
+  integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
+
+events-to-array@^1.0.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/events-to-array/-/events-to-array-1.1.2.tgz#2d41f563e1fe400ed4962fe1a4d5c6a7539df7f6"
+  integrity sha1-LUH1Y+H+QA7Uli/hpNXGp1Od9/Y=
+
+events@^3.0.0, events@^3.2.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
+  integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
+
+evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
+  integrity sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==
+  dependencies:
+    md5.js "^1.3.4"
+    safe-buffer "^5.1.1"
+
+exec-sh@^0.3.2:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.6.tgz#ff264f9e325519a60cb5e273692943483cca63bc"
+  integrity sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==
+
+execa@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
+  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
+  dependencies:
+    cross-spawn "^6.0.0"
+    get-stream "^4.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
+
+execa@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-2.1.0.tgz#e5d3ecd837d2a60ec50f3da78fd39767747bbe99"
+  integrity sha512-Y/URAVapfbYy2Xp/gb6A0E7iR8xeqOCXsuuaoMn7A5PzrXUK84E1gyiEfq0wQd/GHA6GsoHWwhNq8anb0mleIw==
+  dependencies:
+    cross-spawn "^7.0.0"
+    get-stream "^5.0.0"
+    is-stream "^2.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^3.0.0"
+    onetime "^5.1.0"
+    p-finally "^2.0.0"
+    signal-exit "^3.0.2"
+    strip-final-newline "^2.0.0"
+
+execa@^3.0.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-3.4.0.tgz#c08ed4550ef65d858fac269ffc8572446f37eb89"
+  integrity sha512-r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g==
+  dependencies:
+    cross-spawn "^7.0.0"
+    get-stream "^5.0.0"
+    human-signals "^1.1.1"
+    is-stream "^2.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^4.0.0"
+    onetime "^5.1.0"
+    p-finally "^2.0.0"
+    signal-exit "^3.0.2"
+    strip-final-newline "^2.0.0"
+
+execa@^4.0.0, execa@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a"
+  integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==
+  dependencies:
+    cross-spawn "^7.0.0"
+    get-stream "^5.0.0"
+    human-signals "^1.1.1"
+    is-stream "^2.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^4.0.0"
+    onetime "^5.1.0"
+    signal-exit "^3.0.2"
+    strip-final-newline "^2.0.0"
+
+execa@^5.0.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
+  integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
+  dependencies:
+    cross-spawn "^7.0.3"
+    get-stream "^6.0.0"
+    human-signals "^2.1.0"
+    is-stream "^2.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^4.0.1"
+    onetime "^5.1.2"
+    signal-exit "^3.0.3"
+    strip-final-newline "^2.0.0"
+
+exists-sync@0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/exists-sync/-/exists-sync-0.0.4.tgz#9744c2c428cc03b01060db454d4b12f0ef3c8879"
+  integrity sha1-l0TCxCjMA7AQYNtFTUsS8O88iHk=
+
+exit@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
+  integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
+
+expand-brackets@^2.1.4:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
+  dependencies:
+    debug "^2.3.3"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    posix-character-classes "^0.1.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+expand-tilde@^2.0.0, expand-tilde@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
+  integrity sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=
+  dependencies:
+    homedir-polyfill "^1.0.1"
+
+express@^4.10.7, express@^4.17.1:
+  version "4.17.1"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
+  integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==
+  dependencies:
+    accepts "~1.3.7"
+    array-flatten "1.1.1"
+    body-parser "1.19.0"
+    content-disposition "0.5.3"
+    content-type "~1.0.4"
+    cookie "0.4.0"
+    cookie-signature "1.0.6"
+    debug "2.6.9"
+    depd "~1.1.2"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    finalhandler "~1.1.2"
+    fresh "0.5.2"
+    merge-descriptors "1.0.1"
+    methods "~1.1.2"
+    on-finished "~2.3.0"
+    parseurl "~1.3.3"
+    path-to-regexp "0.1.7"
+    proxy-addr "~2.0.5"
+    qs "6.7.0"
+    range-parser "~1.2.1"
+    safe-buffer "5.1.2"
+    send "0.17.1"
+    serve-static "1.14.1"
+    setprototypeof "1.1.1"
+    statuses "~1.5.0"
+    type-is "~1.6.18"
+    utils-merge "1.0.1"
+    vary "~1.1.2"
+
+extend-shallow@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
+  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
+  dependencies:
+    is-extendable "^0.1.0"
+
+extend-shallow@^3.0.0, extend-shallow@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
+  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
+  dependencies:
+    assign-symbols "^1.0.0"
+    is-extendable "^1.0.1"
+
+extend@^3.0.0, extend@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
+
+external-editor@^3.0.3:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
+  integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==
+  dependencies:
+    chardet "^0.7.0"
+    iconv-lite "^0.4.24"
+    tmp "^0.0.33"
+
+extglob@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
+  dependencies:
+    array-unique "^0.3.2"
+    define-property "^1.0.0"
+    expand-brackets "^2.1.4"
+    extend-shallow "^2.0.1"
+    fragment-cache "^0.2.1"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+extract-stack@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/extract-stack/-/extract-stack-2.0.0.tgz#11367bc865bfcd9bc0db3123e5edb57786f11f9b"
+  integrity sha512-AEo4zm+TenK7zQorGK1f9mJ8L14hnTDi2ZQPR+Mub1NX8zimka1mXpV5LpH8x9HoUmFSHZCfLHqWvp0Y4FxxzQ==
+
+extsprintf@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
+
+extsprintf@^1.2.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
+
+fake-xml-http-request@^2.1.1, fake-xml-http-request@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/fake-xml-http-request/-/fake-xml-http-request-2.1.2.tgz#f1786720cae50bbb46273035a0173414f3e85e74"
+  integrity sha512-HaFMBi7r+oEC9iJNpc3bvcW7Z7iLmM26hPDmlb0mFwyANSsOQAtJxbdWsXITKOzZUyMYK0zYCv3h5yDj9TsiXg==
+
+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-diff@^1.1.2:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
+  integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
+
+fast-glob@^3.0.3, fast-glob@^3.1.1:
+  version "3.2.5"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz#7939af2a656de79a4f1901903ee8adcaa7cb9661"
+  integrity sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==
+  dependencies:
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.0"
+    merge2 "^1.3.0"
+    micromatch "^4.0.2"
+    picomatch "^2.2.1"
+
+fast-glob@^3.2.11:
+  version "3.2.11"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9"
+  integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==
+  dependencies:
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.2"
+    merge2 "^1.3.0"
+    micromatch "^4.0.4"
+
+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:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
+
+fast-ordered-set@^1.0.0, fast-ordered-set@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/fast-ordered-set/-/fast-ordered-set-1.0.3.tgz#3fbb36634f7be79e4f7edbdb4a357dee25d184eb"
+  integrity sha1-P7s2Y097555PftvbSjV97iXRhOs=
+  dependencies:
+    blank-object "^1.0.1"
+
+fast-sourcemap-concat@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/fast-sourcemap-concat/-/fast-sourcemap-concat-1.4.0.tgz#122c330d4a2afaff16ad143bc9674b87cd76c8ad"
+  integrity sha512-x90Wlx/2C83lfyg7h4oguTZN4MyaVfaiUSJQNpU+YEA0Odf9u659Opo44b0LfoVg9G/bOE++GdID/dkyja+XcA==
+  dependencies:
+    chalk "^2.0.0"
+    fs-extra "^5.0.0"
+    heimdalljs-logger "^0.1.9"
+    memory-streams "^0.1.3"
+    mkdirp "^0.5.0"
+    source-map "^0.4.2"
+    source-map-url "^0.3.0"
+    sourcemap-validator "^1.1.0"
+
+fast-sourcemap-concat@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fast-sourcemap-concat/-/fast-sourcemap-concat-2.1.0.tgz#12dd36bfc38c804093e4bd1de61dd6216f574211"
+  integrity sha512-L9uADEnnHOeF4U5Kc3gzEs3oFpNCFkiTJXvT+nKmR0zcFqHZJJbszWT7dv4t9558FJRGpCj8UxUpTgz2zwiIZA==
+  dependencies:
+    chalk "^2.0.0"
+    fs-extra "^5.0.0"
+    heimdalljs-logger "^0.1.9"
+    memory-streams "^0.1.3"
+    mkdirp "^0.5.0"
+    source-map "^0.4.2"
+    source-map-url "^0.3.0"
+    sourcemap-validator "^1.1.0"
+
+fastboot-transform@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/fastboot-transform/-/fastboot-transform-0.1.3.tgz#7dea0b117594afd8772baa6c9b0919644e7f7dcd"
+  integrity sha512-6otygPIJw1ARp1jJb+6KVO56iKBjhO+5x59RSC9qiZTbZRrv+HZAuP00KD3s+nWMvcFDemtdkugki9DNFTTwCQ==
+  dependencies:
+    broccoli-stew "^1.5.0"
+    convert-source-map "^1.5.1"
+
+fastq@^1.6.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.11.0.tgz#bb9fb955a07130a918eb63c1f5161cc32a5d0858"
+  integrity sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==
+  dependencies:
+    reusify "^1.0.4"
+
+fault@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/fault/-/fault-1.0.4.tgz#eafcfc0a6d214fc94601e170df29954a4f842f13"
+  integrity sha512-CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA==
+  dependencies:
+    format "^0.2.0"
+
+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==
+  dependencies:
+    websocket-driver ">=0.5.1"
+
+fb-watchman@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85"
+  integrity sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==
+  dependencies:
+    bser "2.1.1"
+
+figgy-pudding@^3.5.1:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"
+  integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==
+
+figures@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
+  integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=
+  dependencies:
+    escape-string-regexp "^1.0.5"
+
+figures@^3.0.0, figures@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
+  integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
+  dependencies:
+    escape-string-regexp "^1.0.5"
+
+file-entry-cache@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
+  integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==
+  dependencies:
+    flat-cache "^2.0.1"
+
+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"
+  integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
+
+filesize@^4.1.2, filesize@^4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/filesize/-/filesize-4.2.1.tgz#ab1cb2069db5d415911c1a13e144c0e743bc89bc"
+  integrity sha512-bP82Hi8VRZX/TUBKfE24iiUGsB/sfm2WUrwTQyAzQrhO3V9IhcBBNBXMyzLY5orACxRyYJ3d2HeRVX+eFv4lmA==
+
+filesize@^6.1.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/filesize/-/filesize-6.3.0.tgz#dff53cfb3f104c9e422f346d53be8dbcc971bf11"
+  integrity sha512-ytx0ruGpDHKWVoiui6+BY/QMNngtDQ/pJaFwfBpQif0J63+E8DLdFyqS3NkKQn7vIruUEpoGD9JUJSg7Kp+I0g==
+
+fill-range@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+    to-regex-range "^2.1.0"
+
+fill-range@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+  dependencies:
+    to-regex-range "^5.0.1"
+
+finalhandler@1.1.2, finalhandler@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
+  integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
+  dependencies:
+    debug "2.6.9"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    on-finished "~2.3.0"
+    parseurl "~1.3.3"
+    statuses "~1.5.0"
+    unpipe "~1.0.0"
+
+find-babel-config@^1.1.0, find-babel-config@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/find-babel-config/-/find-babel-config-1.2.0.tgz#a9b7b317eb5b9860cda9d54740a8c8337a2283a2"
+  integrity sha512-jB2CHJeqy6a820ssiqwrKMeyC6nNdmrcgkKWJWmpoxpE8RKciYJXCcXRq1h2AzCo5I5BJeN2tkGEO3hLTuePRA==
+  dependencies:
+    json5 "^0.5.1"
+    path-exists "^3.0.0"
+
+find-cache-dir@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
+  integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==
+  dependencies:
+    commondir "^1.0.1"
+    make-dir "^2.0.0"
+    pkg-dir "^3.0.0"
+
+find-cache-dir@^3.3.1:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b"
+  integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==
+  dependencies:
+    commondir "^1.0.1"
+    make-dir "^3.0.2"
+    pkg-dir "^4.1.0"
+
+find-index@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/find-index/-/find-index-1.1.1.tgz#4b221f8d46b7f8bea33d8faed953f3ca7a081cbc"
+  integrity sha512-XYKutXMrIK99YMUPf91KX5QVJoG31/OsgftD6YoTPAObfQIxM4ziA9f0J1AsqKhJmo+IeaIPP0CFopTD4bdUBw==
+
+find-up@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
+  integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
+  dependencies:
+    locate-path "^2.0.0"
+
+find-up@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
+  dependencies:
+    locate-path "^3.0.0"
+
+find-up@^4.0.0, find-up@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
+  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
+  dependencies:
+    locate-path "^5.0.0"
+    path-exists "^4.0.0"
+
+find-up@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
+  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
+  dependencies:
+    locate-path "^6.0.0"
+    path-exists "^4.0.0"
+
+find-up@^6.3.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-6.3.0.tgz#2abab3d3280b2dc7ac10199ef324c4e002c8c790"
+  integrity sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==
+  dependencies:
+    locate-path "^7.1.0"
+    path-exists "^5.0.0"
+
+find-yarn-workspace-root@^1.1.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-1.2.1.tgz#40eb8e6e7c2502ddfaa2577c176f221422f860db"
+  integrity sha512-dVtfb0WuQG+8Ag2uWkbG79hOUzEsRrhBzgfn86g2sJPkzmcpGdghbNTfUKGTxymFrY/tLIodDzLoW9nOJ4FY8Q==
+  dependencies:
+    fs-extra "^4.0.3"
+    micromatch "^3.1.4"
+
+find-yarn-workspace-root@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz#f47fb8d239c900eb78179aa81b66673eac88f7bd"
+  integrity sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==
+  dependencies:
+    micromatch "^4.0.2"
+
+findup-sync@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc"
+  integrity sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=
+  dependencies:
+    detect-file "^1.0.0"
+    is-glob "^3.1.0"
+    micromatch "^3.0.4"
+    resolve-dir "^1.0.1"
+
+findup-sync@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-4.0.0.tgz#956c9cdde804052b881b428512905c4a5f2cdef0"
+  integrity sha512-6jvvn/12IC4quLBL1KNokxC7wWTvYncaVUYSoxWw7YykPLuRrnv4qdHcSOywOI5RpkOVGeQRtWM8/q+G6W6qfQ==
+  dependencies:
+    detect-file "^1.0.0"
+    is-glob "^4.0.0"
+    micromatch "^4.0.2"
+    resolve-dir "^1.0.1"
+
+fireworm@^0.7.0:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/fireworm/-/fireworm-0.7.1.tgz#ccf20f7941f108883fcddb99383dbe6e1861c758"
+  integrity sha1-zPIPeUHxCIg/zduZOD2+bhhhx1g=
+  dependencies:
+    async "~0.2.9"
+    is-type "0.0.1"
+    lodash.debounce "^3.1.1"
+    lodash.flatten "^3.0.2"
+    minimatch "^3.0.2"
+
+fixturify-project@^1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/fixturify-project/-/fixturify-project-1.10.0.tgz#091c452a9bb15f09b6b9cc7cf5c0ad559f1d9aad"
+  integrity sha512-L1k9uiBQuN0Yr8tA9Noy2VSQ0dfg0B8qMdvT7Wb5WQKc7f3dn3bzCbSrqlb+etLW+KDV4cBC7R1OvcMg3kcxmA==
+  dependencies:
+    fixturify "^1.2.0"
+    tmp "^0.0.33"
+
+fixturify-project@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/fixturify-project/-/fixturify-project-2.1.1.tgz#a511dd26700c6b64ac271ef4393e7124f153c81f"
+  integrity sha512-sP0gGMTr4iQ8Kdq5Ez0CVJOZOGWqzP5dv/veOTdFNywioKjkNWCHBi1q65DMpcNGUGeoOUWehyji274Q2wRgxA==
+  dependencies:
+    fixturify "^2.1.0"
+    tmp "^0.0.33"
+    type-fest "^0.11.0"
+
+fixturify@^0.3.2:
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/fixturify/-/fixturify-0.3.4.tgz#c676de404a7f8ee8e64d0b76118e62ec95ab7b25"
+  integrity sha512-Gx+KSB25b6gMc4bf7UFRTA85uE0iZR+RYur0JHh6dg4AGBh0EksOv4FCHyM7XpGmiJO7Bc7oV7vxENQBT+2WEQ==
+  dependencies:
+    fs-extra "^0.30.0"
+    matcher-collection "^1.0.4"
+
+fixturify@^1.2.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/fixturify/-/fixturify-1.3.0.tgz#163c468093c7c4d90b70cde39fd6325f6528b25d"
+  integrity sha512-tL0svlOy56pIMMUQ4bU1xRe6NZbFSa/ABTWMxW2mH38lFGc9TrNAKWcMBQ7eIjo3wqSS8f2ICabFaatFyFmrVQ==
+  dependencies:
+    "@types/fs-extra" "^5.0.5"
+    "@types/minimatch" "^3.0.3"
+    "@types/rimraf" "^2.0.2"
+    fs-extra "^7.0.1"
+    matcher-collection "^2.0.0"
+
+fixturify@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/fixturify/-/fixturify-2.1.1.tgz#e962d72f062600cb81a9651086f60d822c72d998"
+  integrity sha512-SRgwIMXlxkb6AUgaVjIX+jCEqdhyXu9hah7mcK+lWynjKtX73Ux1TDv71B7XyaQ+LJxkYRHl5yCL8IycAvQRUw==
+  dependencies:
+    "@types/fs-extra" "^8.1.0"
+    "@types/minimatch" "^3.0.3"
+    "@types/rimraf" "^2.0.3"
+    fs-extra "^8.1.0"
+    matcher-collection "^2.0.1"
+    walk-sync "^2.0.2"
+
+flat-cache@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
+  integrity sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==
+  dependencies:
+    flatted "^2.0.0"
+    rimraf "2.6.3"
+    write "1.0.3"
+
+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"
+
+flat@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/flat/-/flat-4.1.1.tgz#a392059cc382881ff98642f5da4dde0a959f309b"
+  integrity sha512-FmTtBsHskrU6FJ2VxCnsDb84wu9zhmO3cUX2kGFb5tuwhfXxGciiT0oRY+cck35QmG+NmGh5eLz6lLCpWTqwpA==
+  dependencies:
+    is-buffer "~2.0.3"
+
+flatted@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
+  integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
+
+flatted@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz#c4b489e80096d9df1dfc97c79871aea7c617c469"
+  integrity sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==
+
+flush-write-stream@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"
+  integrity sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==
+  dependencies:
+    inherits "^2.0.3"
+    readable-stream "^2.3.6"
+
+follow-redirects@^1.0.0:
+  version "1.14.0"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.0.tgz#f5d260f95c5f8c105894491feee5dc8993b402fe"
+  integrity sha512-0vRwd7RKQBTt+mgu87mtYeofLFZpTas2S9zY+jIeuLJMNvudIgF52nr19q40HOwH5RrhWIPuj9puybzSJiRrVg==
+
+for-in@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
+
+forever-agent@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
+
+form-data@~2.3.2:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.6"
+    mime-types "^2.1.12"
+
+format@^0.2.0:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/format/-/format-0.2.2.tgz#d6170107e9efdc4ed30c9dc39016df942b5cb58b"
+  integrity sha512-wzsgA6WOq+09wrU1tsJ09udeR/YZRaeArL9e1wPbFg3GG2yDnC2ldKpxs4xunpFF9DgqCqOIra3bc1HWrJ37Ww==
+
+forwarded@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
+  integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
+
+fragment-cache@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
+  dependencies:
+    map-cache "^0.2.2"
+
+fresh@0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
+  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
+
+from2@^2.1.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
+  integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=
+  dependencies:
+    inherits "^2.0.1"
+    readable-stream "^2.0.0"
+
+fs-extra@^0.24.0:
+  version "0.24.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.24.0.tgz#d4e4342a96675cb7846633a6099249332b539952"
+  integrity sha1-1OQ0KpZnXLeEZjOmCZJJMytTmVI=
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^2.1.0"
+    path-is-absolute "^1.0.0"
+    rimraf "^2.2.8"
+
+fs-extra@^0.30.0:
+  version "0.30.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.30.0.tgz#f233ffcc08d4da7d432daa449776989db1df93f0"
+  integrity sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^2.1.0"
+    klaw "^1.0.0"
+    path-is-absolute "^1.0.0"
+    rimraf "^2.2.8"
+
+fs-extra@^10.0.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf"
+  integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==
+  dependencies:
+    graceful-fs "^4.2.0"
+    jsonfile "^6.0.1"
+    universalify "^2.0.0"
+
+fs-extra@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-3.0.1.tgz#3794f378c58b342ea7dbbb23095109c4b3b62291"
+  integrity sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^3.0.0"
+    universalify "^0.1.0"
+
+fs-extra@^4.0.2, fs-extra@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"
+  integrity sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
+fs-extra@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-5.0.0.tgz#414d0110cdd06705734d055652c5411260c31abd"
+  integrity sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
+fs-extra@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-6.0.1.tgz#8abc128f7946e310135ddc93b98bddb410e7a34b"
+  integrity sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
+fs-extra@^7.0.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-extra@^8.0.0, fs-extra@^8.0.1, fs-extra@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
+  integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
+  dependencies:
+    graceful-fs "^4.2.0"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
+fs-extra@^9.0.1, fs-extra@^9.1.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
+  integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
+  dependencies:
+    at-least-node "^1.0.0"
+    graceful-fs "^4.2.0"
+    jsonfile "^6.0.1"
+    universalify "^2.0.0"
+
+fs-merger@^3.0.1, fs-merger@^3.1.0, fs-merger@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/fs-merger/-/fs-merger-3.2.1.tgz#a225b11ae530426138294b8fbb19e82e3d4e0b3b"
+  integrity sha512-AN6sX12liy0JE7C2evclwoo0aCG3PFulLjrTLsJpWh/2mM+DinhpSGqYLbHBBbIW1PLRNcFhJG8Axtz8mQW3ug==
+  dependencies:
+    broccoli-node-api "^1.7.0"
+    broccoli-node-info "^2.1.0"
+    fs-extra "^8.0.1"
+    fs-tree-diff "^2.0.1"
+    walk-sync "^2.2.0"
+
+fs-minipass@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
+  integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
+  dependencies:
+    minipass "^3.0.0"
+
+fs-tree-diff@^0.5.2, fs-tree-diff@^0.5.3, fs-tree-diff@^0.5.4, fs-tree-diff@^0.5.6, fs-tree-diff@^0.5.7, fs-tree-diff@^0.5.9:
+  version "0.5.9"
+  resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-0.5.9.tgz#a4ec6182c2f5bd80b9b83c8e23e4522e6f5fd946"
+  integrity sha512-872G8ax0kHh01m9n/2KDzgYwouKza0Ad9iFltBpNykvROvf2AGtoOzPJgGx125aolGPER3JuC7uZFrQ7bG1AZw==
+  dependencies:
+    heimdalljs-logger "^0.1.7"
+    object-assign "^4.1.0"
+    path-posix "^1.0.0"
+    symlink-or-copy "^1.1.8"
+
+fs-tree-diff@^2.0.0, fs-tree-diff@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-2.0.1.tgz#343e4745ab435ec39ebac5f9059ad919cd034afa"
+  integrity sha512-x+CfAZ/lJHQqwlD64pYM5QxWjzWhSjroaVsr8PW831zOApL55qPibed0c+xebaLWVr2BnHFoHdrwOv8pzt8R5A==
+  dependencies:
+    "@types/symlink-or-copy" "^1.2.0"
+    heimdalljs-logger "^0.1.7"
+    object-assign "^4.1.0"
+    path-posix "^1.0.0"
+    symlink-or-copy "^1.1.8"
+
+fs-updater@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/fs-updater/-/fs-updater-1.0.4.tgz#2329980f99ae9176e9a0e84f7637538a182ce63b"
+  integrity sha512-0pJX4mJF/qLsNEwTct8CdnnRdagfb+LmjRPJ8sO+nCnAZLW0cTmz4rTgU25n+RvTuWSITiLKrGVJceJPBIPlKg==
+  dependencies:
+    can-symlink "^1.0.0"
+    clean-up-path "^1.0.0"
+    heimdalljs "^0.2.5"
+    heimdalljs-logger "^0.1.9"
+    rimraf "^2.6.2"
+
+fs-write-stream-atomic@^1.0.8:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
+  integrity sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=
+  dependencies:
+    graceful-fs "^4.1.2"
+    iferr "^0.1.5"
+    imurmurhash "^0.1.4"
+    readable-stream "1 || 2"
+
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
+
+fsevents@^1.2.7:
+  version "1.2.13"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38"
+  integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==
+  dependencies:
+    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==
+
+function-bind@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
+
+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=
+
+fuse.js@^6.5.3:
+  version "6.5.3"
+  resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-6.5.3.tgz#7446c0acbc4ab0ab36fa602e97499bdb69452b93"
+  integrity sha512-sA5etGE7yD/pOqivZRBvUBd/NaL2sjAu6QuSaFoe1H2BrJSkH/T/UXAJ8CdXdw7DvY3Hs8CXKYkDWX7RiP5KOg==
+
+gauge@~2.7.3:
+  version "2.7.4"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
+  dependencies:
+    aproba "^1.0.3"
+    console-control-strings "^1.0.0"
+    has-unicode "^2.0.0"
+    object-assign "^4.1.0"
+    signal-exit "^3.0.0"
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wide-align "^1.1.0"
+
+gaze@^1.0.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a"
+  integrity sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==
+  dependencies:
+    globule "^1.0.0"
+
+gensync@^1.0.0-beta.2:
+  version "1.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
+  integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
+
+get-caller-file@^2.0.1, get-caller-file@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
+
+get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, 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==
+  dependencies:
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+
+get-own-enumerable-property-symbols@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664"
+  integrity sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==
+
+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-stdin@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-7.0.0.tgz#8d5de98f15171a125c5e516643c7a6d0ea8a96f6"
+  integrity sha512-zRKcywvrXlXsA0v0i9Io4KDRaAw7+a1ZpjRwl9Wox8PFlVCCHra7E9c4kqXCoCM9nR5tBkaTTZRBoCm60bFqTQ==
+
+get-stdin@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-9.0.0.tgz#3983ff82e03d56f1b2ea0d3e60325f39d703a575"
+  integrity sha512-dVKBjfWisLAicarI2Sf+JuBE/DghV4UzNAVe9yhEJuzeREd3JhOTE9cUaJTeSa77fsbQUK3pcOpJfM59+VKZaA==
+
+get-stream@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
+  integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
+  dependencies:
+    pump "^3.0.0"
+
+get-stream@^5.0.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
+  integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
+  dependencies:
+    pump "^3.0.0"
+
+get-stream@^6.0.0:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
+  integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
+
+get-symbol-description@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6"
+  integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.1.1"
+
+get-value@^2.0.3, get-value@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
+  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
+
+getpass@^0.1.1:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
+  dependencies:
+    assert-plus "^1.0.0"
+
+git-hooks-list@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/git-hooks-list/-/git-hooks-list-1.0.3.tgz#be5baaf78203ce342f2f844a9d2b03dba1b45156"
+  integrity sha512-Y7wLWcrLUXwk2noSka166byGCvhMtDRpgHdzCno1UQv/n/Hegp++a2xBWJL1lJarnKD3SWaljD+0z1ztqxuKyQ==
+
+git-repo-info@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/git-repo-info/-/git-repo-info-2.1.1.tgz#220ffed8cbae74ef8a80e3052f2ccb5179aed058"
+  integrity sha512-8aCohiDo4jwjOwma4FmYFd3i97urZulL8XL24nIPxuE+GZnfsAyy/g2Shqx6OjUiFKUXZM+Yy+KHnOmmA3FVcg==
+
+glob-parent@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
+  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
+  dependencies:
+    is-glob "^3.1.0"
+    path-dirname "^1.0.0"
+
+glob-parent@^5.1.0, glob-parent@^5.1.2, glob-parent@~5.1.0:
+  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-to-regexp@^0.4.1:
+  version "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@^5.0.10:
+  version "5.0.15"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
+  integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=
+  dependencies:
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "2 || 3"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+glob@^7.0.0, glob@^7.0.3, glob@^7.0.4, glob@^7.1.4, glob@^7.1.6, glob@~7.1.1:
+  version "7.1.6"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
+  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
+  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.2, glob@^7.1.3:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
+  integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+global-modules@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
+  integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==
+  dependencies:
+    global-prefix "^1.0.1"
+    is-windows "^1.0.1"
+    resolve-dir "^1.0.0"
+
+global-prefix@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
+  integrity sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=
+  dependencies:
+    expand-tilde "^2.0.2"
+    homedir-polyfill "^1.0.1"
+    ini "^1.3.4"
+    is-windows "^1.0.1"
+    which "^1.2.14"
+
+globals@^11.1.0, globals@^11.7.0:
+  version "11.12.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:
+  version "13.8.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.8.0.tgz#3e20f504810ce87a8d72e55aecf8435b50f4c1b3"
+  integrity sha512-rHtdA6+PDBIjeEvA91rpqzEvk/k3/i7EeNQiryiWuJH0Hw9cpyJMAt2jtbAwUaRdhD+573X4vWw6IcjKPasi9Q==
+  dependencies:
+    type-fest "^0.20.2"
+
+globals@^13.9.0:
+  version "13.12.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.12.0.tgz#4d733760304230a0082ed96e21e5c565f898089e"
+  integrity sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==
+  dependencies:
+    type-fest "^0.20.2"
+
+globals@^9.18.0:
+  version "9.18.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
+  integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==
+
+globalyzer@0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/globalyzer/-/globalyzer-0.1.0.tgz#cb76da79555669a1519d5a8edf093afaa0bf1465"
+  integrity sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==
+
+globby@10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-10.0.0.tgz#abfcd0630037ae174a88590132c2f6804e291072"
+  integrity sha512-3LifW9M4joGZasyYPz2A1U74zbC/45fvpXUvO/9KbSa+VV0aGZarWkfdgKyR9sExNP0t0x0ss/UMJpNpcaTspw==
+  dependencies:
+    "@types/glob" "^7.1.1"
+    array-union "^2.1.0"
+    dir-glob "^3.0.1"
+    fast-glob "^3.0.3"
+    glob "^7.1.3"
+    ignore "^5.1.1"
+    merge2 "^1.2.3"
+    slash "^3.0.0"
+
+globby@^11.0.3:
+  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"
+    fast-glob "^3.1.1"
+    ignore "^5.1.4"
+    merge2 "^1.3.0"
+    slash "^3.0.0"
+
+globby@^13.1.1:
+  version "13.1.1"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-13.1.1.tgz#7c44a93869b0b7612e38f22ed532bfe37b25ea6f"
+  integrity sha512-XMzoDZbGZ37tufiv7g0N4F/zp3zkwdFtVbV3EHsVl1KQr4RPLfNoT068/97RPshz2J5xYNEjLKKBKaGHifBd3Q==
+  dependencies:
+    dir-glob "^3.0.1"
+    fast-glob "^3.2.11"
+    ignore "^5.2.0"
+    merge2 "^1.4.1"
+    slash "^4.0.0"
+
+globrex@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/globrex/-/globrex-0.1.2.tgz#dd5d9ec826232730cd6793a5e33a9302985e6098"
+  integrity sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==
+
+globule@^1.0.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/globule/-/globule-1.3.2.tgz#d8bdd9e9e4eef8f96e245999a5dee7eb5d8529c4"
+  integrity sha512-7IDTQTIu2xzXkT+6mlluidnWo+BypnbSoEVVQCGfzqnl5Ik8d3e1d4wycb8Rj9tWW+Z39uPWsdlquqiqPCd/pA==
+  dependencies:
+    glob "~7.1.1"
+    lodash "~4.17.10"
+    minimatch "~3.0.2"
+
+good-listener@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/good-listener/-/good-listener-1.2.2.tgz#d53b30cdf9313dffb7dc9a0d477096aa6d145c50"
+  integrity sha1-1TswzfkxPf+33JoNR3CWqm0UXFA=
+  dependencies:
+    delegate "^3.1.2"
+
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.3:
+  version "4.2.6"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee"
+  integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==
+
+graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.4:
+  version "4.2.8"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a"
+  integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==
+
+graceful-fs@^4.2.3:
+  version "4.2.9"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96"
+  integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==
+
+graceful-fs@^4.2.9:
+  version "4.2.10"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
+  integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
+
+"graceful-readlink@>= 1.0.0":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
+  integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=
+
+growl@^1.10.0:
+  version "1.10.5"
+  resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
+  integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==
+
+growly@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
+  integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=
+
+handlebars@^4.0.11, handlebars@^4.0.13, handlebars@^4.0.4, handlebars@^4.3.0, handlebars@^4.3.1, handlebars@^4.4.2, handlebars@^4.7.3:
+  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==
+  dependencies:
+    minimist "^1.2.5"
+    neo-async "^2.6.0"
+    source-map "^0.6.1"
+    wordwrap "^1.0.0"
+  optionalDependencies:
+    uglify-js "^3.1.4"
+
+har-schema@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
+
+har-validator@~5.1.3:
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
+  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
+  dependencies:
+    ajv "^6.12.3"
+    har-schema "^2.0.0"
+
+hard-rejection@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883"
+  integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==
+
+has-ansi@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
+  dependencies:
+    ansi-regex "^2.0.0"
+
+has-ansi@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-3.0.0.tgz#36077ef1d15f333484aa7fa77a28606f1c655b37"
+  integrity sha1-Ngd+8dFfMzSEqn+neihgbxxlWzc=
+  dependencies:
+    ansi-regex "^3.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-binary2@~1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.3.tgz#7776ac627f3ea77250cfc332dab7ddf5e4f5d11d"
+  integrity sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==
+  dependencies:
+    isarray "2.0.1"
+
+has-color@~0.1.0:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/has-color/-/has-color-0.1.7.tgz#67144a5260c34fc3cca677d041daf52fe7b78b2f"
+  integrity sha1-ZxRKUmDDT8PMpnfQQdr1L+e3iy8=
+
+has-cors@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
+  integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=
+
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+
+has-flag@^4.0.0:
+  version "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, 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-tostringtag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25"
+  integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==
+  dependencies:
+    has-symbols "^1.0.2"
+
+has-unicode@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
+
+has-value@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
+  dependencies:
+    get-value "^2.0.3"
+    has-values "^0.1.4"
+    isobject "^2.0.0"
+
+has-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
+  dependencies:
+    get-value "^2.0.6"
+    has-values "^1.0.0"
+    isobject "^3.0.0"
+
+has-values@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
+
+has-values@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
+  dependencies:
+    is-number "^3.0.0"
+    kind-of "^4.0.0"
+
+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"
+
+hash-base@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33"
+  integrity sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==
+  dependencies:
+    inherits "^2.0.4"
+    readable-stream "^3.6.0"
+    safe-buffer "^5.2.0"
+
+hash-for-dep@^1.0.2, hash-for-dep@^1.2.3, hash-for-dep@^1.4.7, hash-for-dep@^1.5.0, hash-for-dep@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/hash-for-dep/-/hash-for-dep-1.5.1.tgz#497754b39bee2f1c4ade4521bfd2af0a7c1196e3"
+  integrity sha512-/dQ/A2cl7FBPI2pO0CANkvuuVi/IFS5oTyJ0PsOb6jW6WbVW1js5qJXMJTNbWHXBIPdFTWFbabjB+mE0d+gelw==
+  dependencies:
+    broccoli-kitchen-sink-helpers "^0.3.1"
+    heimdalljs "^0.2.3"
+    heimdalljs-logger "^0.1.7"
+    path-root "^0.1.1"
+    resolve "^1.10.0"
+    resolve-package-path "^1.0.11"
+
+hash.js@^1.0.0, hash.js@^1.0.3:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42"
+  integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==
+  dependencies:
+    inherits "^2.0.3"
+    minimalistic-assert "^1.0.1"
+
+heimdalljs-fs-monitor@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/heimdalljs-fs-monitor/-/heimdalljs-fs-monitor-1.1.0.tgz#0ad5aa1dac0a30d5940a74edeea3d515e70225e4"
+  integrity sha512-OH1LgPeqRo5kOzN5XhU/I4lUbqDqj0jx4+6vn33RTKcZTFmp/63KWbVrDDlk9iDlQ5j6FxmOeuoWJ2cjLjvNcQ==
+  dependencies:
+    callsites "^3.1.0"
+    clean-stack "^2.2.0"
+    extract-stack "^2.0.0"
+    heimdalljs "^0.2.3"
+    heimdalljs-logger "^0.1.7"
+
+heimdalljs-graph@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/heimdalljs-graph/-/heimdalljs-graph-1.0.0.tgz#0059857952988e54f3a74bb23edaf669f8eaf6af"
+  integrity sha512-v2AsTERBss0ukm/Qv4BmXrkwsT5x6M1V5Om6E8NcDQ/ruGkERsfsuLi5T8jx8qWzKMGYlwzAd7c/idymxRaPzA==
+
+heimdalljs-logger@^0.1.10, heimdalljs-logger@^0.1.7, heimdalljs-logger@^0.1.9:
+  version "0.1.10"
+  resolved "https://registry.yarnpkg.com/heimdalljs-logger/-/heimdalljs-logger-0.1.10.tgz#90cad58aabb1590a3c7e640ddc6a4cd3a43faaf7"
+  integrity sha512-pO++cJbhIufVI/fmB/u2Yty3KJD0TqNPecehFae0/eps0hkZ3b4Zc/PezUMOpYuHFQbA7FxHZxa305EhmjLj4g==
+  dependencies:
+    debug "^2.2.0"
+    heimdalljs "^0.2.6"
+
+heimdalljs@^0.2.0, heimdalljs@^0.2.1, heimdalljs@^0.2.3, heimdalljs@^0.2.5, heimdalljs@^0.2.6:
+  version "0.2.6"
+  resolved "https://registry.yarnpkg.com/heimdalljs/-/heimdalljs-0.2.6.tgz#b0eebabc412813aeb9542f9cc622cb58dbdcd9fe"
+  integrity sha512-o9bd30+5vLBvBtzCPwwGqpry2+n0Hi6H1+qwt6y+0kwRHGGF8TFIhJPmnuM0xO97zaKrDZMwO/V56fAnn8m/tA==
+  dependencies:
+    rsvp "~3.2.1"
+
+highlight.js@^10.4.1:
+  version "10.7.2"
+  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.7.2.tgz#89319b861edc66c48854ed1e6da21ea89f847360"
+  integrity sha512-oFLl873u4usRM9K63j4ME9u3etNF0PLiJhSQ8rdfuL51Wn3zkD6drf9ZW0dOzjnZI22YYG24z30JcmfCZjMgYg==
+
+hmac-drbg@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
+  integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
+  dependencies:
+    hash.js "^1.0.3"
+    minimalistic-assert "^1.0.0"
+    minimalistic-crypto-utils "^1.0.1"
+
+hoek@6.x.x:
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/hoek/-/hoek-6.1.3.tgz#73b7d33952e01fe27a38b0457294b79dd8da242c"
+  integrity sha512-YXXAAhmF9zpQbC7LEcREFtXfGq5K1fmd+4PHkBq8NUqmzW3G+Dq10bI/i0KucLRwss3YYFQ0fSfoxBZYiGUqtQ==
+
+home-or-tmp@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
+  integrity sha1-42w/LSyufXRqhX440Y1fMqeILbg=
+  dependencies:
+    os-homedir "^1.0.0"
+    os-tmpdir "^1.0.1"
+
+homedir-polyfill@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
+  integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==
+  dependencies:
+    parse-passwd "^1.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.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"
+
+html-encoding-sniffer@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3"
+  integrity sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==
+  dependencies:
+    whatwg-encoding "^1.0.5"
+
+htmlparser2@^3.9.1:
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f"
+  integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==
+  dependencies:
+    domelementtype "^1.3.1"
+    domhandler "^2.3.0"
+    domutils "^1.5.1"
+    entities "^1.1.1"
+    inherits "^2.0.1"
+    readable-stream "^3.1.1"
+
+htmlparser2@^7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-7.2.0.tgz#8817cdea38bbc324392a90b1990908e81a65f5a5"
+  integrity sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog==
+  dependencies:
+    domelementtype "^2.0.1"
+    domhandler "^4.2.2"
+    domutils "^2.8.0"
+    entities "^3.0.1"
+
+http-errors@1.7.2:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f"
+  integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.3"
+    setprototypeof "1.1.1"
+    statuses ">= 1.5.0 < 2"
+    toidentifier "1.0.0"
+
+http-errors@~1.6.2:
+  version "1.6.3"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
+  integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.3"
+    setprototypeof "1.1.0"
+    statuses ">= 1.4.0 < 2"
+
+http-errors@~1.7.2:
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06"
+  integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.4"
+    setprototypeof "1.1.1"
+    statuses ">= 1.5.0 < 2"
+    toidentifier "1.0.0"
+
+http-parser-js@>=0.5.1:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.3.tgz#01d2709c79d41698bb01d4decc5e9da4e4a033d9"
+  integrity sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==
+
+http-proxy@^1.13.1, http-proxy@^1.18.1:
+  version "1.18.1"
+  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549"
+  integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==
+  dependencies:
+    eventemitter3 "^4.0.0"
+    follow-redirects "^1.0.0"
+    requires-port "^1.0.0"
+
+http-signature@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
+  dependencies:
+    assert-plus "^1.0.0"
+    jsprim "^1.2.2"
+    sshpk "^1.7.0"
+
+https-browserify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
+  integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
+
+https-proxy-agent@^2.2.3:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b"
+  integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==
+  dependencies:
+    agent-base "^4.3.0"
+    debug "^3.1.0"
+
+https@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/https/-/https-1.0.0.tgz#3c37c7ae1a8eeb966904a2ad1e975a194b7ed3a4"
+  integrity sha1-PDfHrhqO65ZpBKKtHpdaGUt+06Q=
+
+human-signals@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
+  integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
+
+human-signals@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
+  integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
+
+iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.24:
+  version "0.4.24"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3"
+
+icss-utils@^5.0.0, icss-utils@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae"
+  integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==
+
+ieee754@^1.1.13, ieee754@^1.1.4:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
+  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
+
+iferr@^0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
+  integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
+
+ignore@^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.1, ignore@^5.1.2, ignore@^5.1.4:
+  version "5.1.8"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
+  integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
+
+ignore@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
+  integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
+
+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==
+  dependencies:
+    parent-module "^1.0.0"
+    resolve-from "^4.0.0"
+
+imurmurhash@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
+
+include-path-searcher@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/include-path-searcher/-/include-path-searcher-0.1.0.tgz#c0cf2ddfa164fb2eae07bc7ca43a7f191cb4d7bd"
+  integrity sha1-wM8t36Fk+y6uB7x8pDp/GRy0170=
+
+indent-string@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
+  integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
+
+indexof@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
+  integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
+
+infer-owner@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
+  integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
+
+inflected@^2.0.4:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/inflected/-/inflected-2.1.0.tgz#2816ac17a570bbbc8303ca05bca8bf9b3f959687"
+  integrity sha512-hAEKNxvHf2Iq3H60oMBHkB4wl5jn3TPF3+fXek/sRwAB5gP9xWs4r7aweSF95f99HFoz69pnZTcu8f0SIHV18w==
+
+inflection@^1.12.0:
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.13.1.tgz#c5cadd80888a90cf84c2e96e340d7edc85d5f0cb"
+  integrity sha512-dldYtl2WlN0QDkIDtg8+xFwOS2Tbmp12t1cHa5/YClU6ZQjTFm7B66UcVbh9NQB+HvT5BAd2t5+yKsBkw5pcqA==
+
+inflection@~1.13.1:
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.13.2.tgz#15e8c797c6c3dadf31aa658f8df8a4ea024798b0"
+  integrity sha512-cmZlljCRTBFouT8UzMzrGcVEvkv6D/wBdcdKG7J1QH5cXjtU75Dm+P27v9EKu/Y43UYyCJd1WC4zLebRrC8NBw==
+
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+
+inherits@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
+  integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
+
+inherits@2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
+
+ini@^1.3.4, ini@^1.3.6:
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
+  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
+
+inline-source-map-comment@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/inline-source-map-comment/-/inline-source-map-comment-1.0.5.tgz#50a8a44c2a790dfac441b5c94eccd5462635faf6"
+  integrity sha1-UKikTCp5DfrEQbXJTszVRiY1+vY=
+  dependencies:
+    chalk "^1.0.0"
+    get-stdin "^4.0.1"
+    minimist "^1.1.1"
+    sum-up "^1.0.1"
+    xtend "^4.0.0"
+
+inquirer@^6, inquirer@^6.2.2:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca"
+  integrity sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==
+  dependencies:
+    ansi-escapes "^3.2.0"
+    chalk "^2.4.2"
+    cli-cursor "^2.1.0"
+    cli-width "^2.0.0"
+    external-editor "^3.0.3"
+    figures "^2.0.0"
+    lodash "^4.17.12"
+    mute-stream "0.0.7"
+    run-async "^2.2.0"
+    rxjs "^6.4.0"
+    string-width "^2.1.0"
+    strip-ansi "^5.1.0"
+    through "^2.3.6"
+
+inquirer@^7.3.3:
+  version "7.3.3"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003"
+  integrity sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==
+  dependencies:
+    ansi-escapes "^4.2.1"
+    chalk "^4.1.0"
+    cli-cursor "^3.1.0"
+    cli-width "^3.0.0"
+    external-editor "^3.0.3"
+    figures "^3.0.0"
+    lodash "^4.17.19"
+    mute-stream "0.0.8"
+    run-async "^2.4.0"
+    rxjs "^6.6.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+    through "^2.3.6"
+
+internal-slot@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c"
+  integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==
+  dependencies:
+    get-intrinsic "^1.1.0"
+    has "^1.0.3"
+    side-channel "^1.0.4"
+
+invariant@^2.2.2:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
+  integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
+  dependencies:
+    loose-envify "^1.0.0"
+
+ipaddr.js@1.9.1:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
+  integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
+
+is-accessor-descriptor@^0.1.6:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
+  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
+  dependencies:
+    kind-of "^3.0.2"
+
+is-accessor-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
+  dependencies:
+    kind-of "^6.0.0"
+
+is-alphabetical@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.4.tgz#9e7d6b94916be22153745d184c298cbf986a686d"
+  integrity sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==
+
+is-alphanumerical@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz#7eb9a2431f855f6b1ef1a78e326df515696c4dbf"
+  integrity sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==
+  dependencies:
+    is-alphabetical "^1.0.0"
+    is-decimal "^1.0.0"
+
+is-arrayish@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
+
+is-bigint@^1.0.1:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3"
+  integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==
+  dependencies:
+    has-bigints "^1.0.1"
+
+is-binary-path@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
+  integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=
+  dependencies:
+    binary-extensions "^1.0.0"
+
+is-binary-path@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
+  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
+  dependencies:
+    binary-extensions "^2.0.0"
+
+is-boolean-object@^1.1.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719"
+  integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==
+  dependencies:
+    call-bind "^1.0.2"
+    has-tostringtag "^1.0.0"
+
+is-buffer@^2.0.0, is-buffer@~2.0.3:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191"
+  integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==
+
+is-callable@^1.1.4, is-callable@^1.2.3, is-callable@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
+  integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
+
+is-core-module@^2.2.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548"
+  integrity sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==
+  dependencies:
+    has "^1.0.3"
+
+is-core-module@^2.5.0, is-core-module@^2.8.1:
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211"
+  integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==
+  dependencies:
+    has "^1.0.3"
+
+is-data-descriptor@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
+  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
+  dependencies:
+    kind-of "^3.0.2"
+
+is-data-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
+  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
+  dependencies:
+    kind-of "^6.0.0"
+
+is-date-object@^1.0.1:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f"
+  integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==
+  dependencies:
+    has-tostringtag "^1.0.0"
+
+is-decimal@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.4.tgz#65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5"
+  integrity sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==
+
+is-descriptor@^0.1.0:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
+  dependencies:
+    is-accessor-descriptor "^0.1.6"
+    is-data-descriptor "^0.1.4"
+    kind-of "^5.0.0"
+
+is-descriptor@^1.0.0, is-descriptor@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
+  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
+  dependencies:
+    is-accessor-descriptor "^1.0.0"
+    is-data-descriptor "^1.0.0"
+    kind-of "^6.0.2"
+
+is-docker@^2.0.0:
+  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"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
+
+is-extendable@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
+  dependencies:
+    is-plain-object "^2.0.4"
+
+is-extglob@^2.1.0, is-extglob@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
+
+is-finite@^1.0.0:
+  version "1.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"
+  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
+
+is-fullwidth-code-point@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+
+is-git-url@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-git-url/-/is-git-url-1.0.0.tgz#53f684cd143285b52c3244b4e6f28253527af66b"
+  integrity sha1-U/aEzRQyhbUsMkS05vKCU1J69ms=
+
+is-glob@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
+  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
+  dependencies:
+    is-extglob "^2.1.0"
+
+is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
+  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
+  dependencies:
+    is-extglob "^2.1.1"
+
+is-glob@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
+  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
+  dependencies:
+    is-extglob "^2.1.1"
+
+is-hexadecimal@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7"
+  integrity sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==
+
+is-interactive@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e"
+  integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==
+
+is-language-code@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-language-code/-/is-language-code-2.0.0.tgz#6f4d59c551d73b98c45cf9f1d3ce65cee060e65b"
+  integrity sha512-6xKmRRcP2YdmMBZMVS3uiJRPQgcMYolkD6hFw2Y4KjqyIyaJlCGxUt56tuu0iIV8q9r8kMEo0Gjd/GFwKrgjbw==
+
+is-negative-zero@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24"
+  integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==
+
+is-number-object@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.6.tgz#6a7aaf838c7f0686a50b4553f7e54a96494e89f0"
+  integrity sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==
+  dependencies:
+    has-tostringtag "^1.0.0"
+
+is-number@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
+  dependencies:
+    kind-of "^3.0.2"
+
+is-number@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+
+is-obj@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
+  integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
+
+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-plain-obj@2.1.0, is-plain-obj@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
+  integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==
+
+is-plain-obj@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
+  integrity sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==
+
+is-plain-object@^2.0.3, is-plain-object@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
+  dependencies:
+    isobject "^3.0.1"
+
+is-potential-custom-element-name@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
+  integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
+
+is-reference@^1.1.0:
+  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.1.2, is-regex@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
+  integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==
+  dependencies:
+    call-bind "^1.0.2"
+    has-tostringtag "^1.0.0"
+
+is-regexp@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
+  integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk=
+
+is-shared-array-buffer@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6"
+  integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==
+
+is-stream@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
+
+is-stream@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
+  integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
+
+is-string@^1.0.5, is-string@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
+  integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==
+  dependencies:
+    has-tostringtag "^1.0.0"
+
+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.2"
+
+is-type@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/is-type/-/is-type-0.0.1.tgz#f651d85c365d44955d14a51d8d7061f3f6b4779c"
+  integrity sha1-9lHYXDZdRJVdFKUdjXBh8/a0d5w=
+  dependencies:
+    core-util-is "~1.0.0"
+
+is-typedarray@^1.0.0, is-typedarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
+
+is-unicode-supported@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
+  integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
+
+is-weakref@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.1.tgz#842dba4ec17fa9ac9850df2d6efbc1737274f2a2"
+  integrity sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ==
+  dependencies:
+    call-bind "^1.0.0"
+
+is-windows@^1.0.1, is-windows@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
+
+is-wsl@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
+  integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
+
+is-wsl@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
+  integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
+  dependencies:
+    is-docker "^2.0.0"
+
+isarray@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
+  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
+
+isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
+
+isarray@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e"
+  integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=
+
+isbinaryfile@^4.0.6:
+  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"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+
+isobject@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
+  dependencies:
+    isarray "1.0.0"
+
+isobject@^3.0.0, isobject@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
+
+isstream@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
+
+istextorbinary@2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/istextorbinary/-/istextorbinary-2.1.0.tgz#dbed2a6f51be2f7475b68f89465811141b758874"
+  integrity sha1-2+0qb1G+L3R1to+JRlgRFBt1iHQ=
+  dependencies:
+    binaryextensions "1 || 2"
+    editions "^1.1.1"
+    textextensions "1 || 2"
+
+istextorbinary@^2.5.1:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/istextorbinary/-/istextorbinary-2.6.0.tgz#60776315fb0fa3999add276c02c69557b9ca28ab"
+  integrity sha512-+XRlFseT8B3L9KyjxxLjfXSLMuErKDsd8DBNrsaxoViABMEZlOSCstwmw0qpoFX3+U6yWU1yhLudAe6/lETGGA==
+  dependencies:
+    binaryextensions "^2.1.2"
+    editions "^2.2.0"
+    textextensions "^2.5.0"
+
+ivy-codemirror@IvyApp/ivy-codemirror#fb09333c5144da47e14a9e6260f80577d5408374:
+  version "2.1.0"
+  resolved "https://codeload.github.com/IvyApp/ivy-codemirror/tar.gz/fb09333c5144da47e14a9e6260f80577d5408374"
+  dependencies:
+    codemirror "^5.47.0"
+    ember-cli-babel "^7.7.3"
+    ember-cli-node-assets "^0.2.2"
+
+jest-worker@^27.4.5:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0"
+  integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==
+  dependencies:
+    "@types/node" "*"
+    merge-stream "^2.0.0"
+    supports-color "^8.0.0"
+
+jquery@^3.4.1, jquery@^3.5.1:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
+  integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==
+
+js-base64@^2.1.8:
+  version "2.6.4"
+  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz#f4e686c5de1ea1f867dbcad3d46d969428df98c4"
+  integrity sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==
+
+js-string-escape@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef"
+  integrity sha1-4mJbrbwNZ8dTPp7cEGjFh65BN+8=
+
+"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
+
+js-tokens@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
+  integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
+
+js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.14.0, js-yaml@^3.2.5, js-yaml@^3.2.7:
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
+  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
+jsbn@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
+
+jsdom@^16.4.0:
+  version "16.5.3"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.5.3.tgz#13a755b3950eb938b4482c407238ddf16f0d2136"
+  integrity sha512-Qj1H+PEvUsOtdPJ056ewXM4UJPCi4hhLA8wpiz9F2YvsRBhuFsXxtrIFAgGBDynQA9isAMGE91PfUYbdMPXuTA==
+  dependencies:
+    abab "^2.0.5"
+    acorn "^8.1.0"
+    acorn-globals "^6.0.0"
+    cssom "^0.4.4"
+    cssstyle "^2.3.0"
+    data-urls "^2.0.0"
+    decimal.js "^10.2.1"
+    domexception "^2.0.1"
+    escodegen "^2.0.0"
+    html-encoding-sniffer "^2.0.1"
+    is-potential-custom-element-name "^1.0.0"
+    nwsapi "^2.2.0"
+    parse5 "6.0.1"
+    request "^2.88.2"
+    request-promise-native "^1.0.9"
+    saxes "^5.0.1"
+    symbol-tree "^3.2.4"
+    tough-cookie "^4.0.0"
+    w3c-hr-time "^1.0.2"
+    w3c-xmlserializer "^2.0.0"
+    webidl-conversions "^6.1.0"
+    whatwg-encoding "^1.0.5"
+    whatwg-mimetype "^2.3.0"
+    whatwg-url "^8.5.0"
+    ws "^7.4.4"
+    xml-name-validator "^3.0.0"
+
+jsesc@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
+  integrity sha1-RsP+yMGJKxKwgz25vHYiF226s0s=
+
+jsesc@^2.5.1:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
+  integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
+
+jsesc@~0.3.x:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.3.0.tgz#1bf5ee63b4539fe2e26d0c1e99c240b97a457972"
+  integrity sha1-G/XuY7RTn+LibQwemcJAuXpFeXI=
+
+jsesc@~0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
+  integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
+
+json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
+  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
+
+json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
+  integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
+
+json-schema-traverse@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
+
+json-schema-traverse@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
+  integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
+
+json-schema@0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+  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-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
+  integrity sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=
+  dependencies:
+    jsonify "~0.0.0"
+
+json-stringify-safe@~5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
+
+json5@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
+  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
+
+json5@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
+  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
+  dependencies:
+    minimist "^1.2.0"
+
+json5@^2.1.2:
+  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"
+
+json5@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
+  integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
+
+jsondiffpatch@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/jsondiffpatch/-/jsondiffpatch-0.4.1.tgz#9fb085036767f03534ebd46dcd841df6070c5773"
+  integrity sha512-t0etAxTUk1w5MYdNOkZBZ8rvYYN5iL+2dHCCx/DpkFm/bW28M6y5nUS83D4XdZiHy35Fpaw6LBb+F88fHZnVCw==
+  dependencies:
+    chalk "^2.3.0"
+    diff-match-patch "^1.0.0"
+
+jsonfile@^2.1.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
+  integrity sha1-NzaitCi4e72gzIO1P6PWM6NcKug=
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
+jsonfile@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.1.tgz#a5ecc6f65f53f662c4415c7675a0331d0992ec66"
+  integrity sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
+jsonfile@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
+  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
+jsonfile@^6.0.1:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
+  integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
+  dependencies:
+    universalify "^2.0.0"
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
+jsonify@~0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
+  integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=
+
+jsonlint@^1.6.3:
+  version "1.6.3"
+  resolved "https://registry.yarnpkg.com/jsonlint/-/jsonlint-1.6.3.tgz#cb5e31efc0b78291d0d862fbef05900adf212988"
+  integrity sha512-jMVTMzP+7gU/IyC6hvKyWpUU8tmTkK5b3BPNuMI9U8Sit+YAWLlZwB6Y6YrdCxfg2kNz05p3XY3Bmm4m26Nv3A==
+  dependencies:
+    JSV "^4.0.x"
+    nomnom "^1.5.x"
+
+jsprim@^1.2.2:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
+  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
+  dependencies:
+    assert-plus "1.0.0"
+    extsprintf "1.3.0"
+    json-schema "0.2.3"
+    verror "1.10.0"
+
+just-extend@^4.0.2:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-4.2.1.tgz#ef5e589afb61e5d66b24eca749409a8939a8c744"
+  integrity sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg==
+
+kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0, kind-of@^4.0.0, kind-of@^5.0.0, kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
+  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
+
+klaw@^1.0.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
+  integrity sha1-QIhDO0azsbolnXh4XY6W9zugJDk=
+  optionalDependencies:
+    graceful-fs "^4.1.9"
+
+leek@0.0.24:
+  version "0.0.24"
+  resolved "https://registry.yarnpkg.com/leek/-/leek-0.0.24.tgz#e400e57f0e60d8ef2bd4d068dc428a54345dbcda"
+  integrity sha1-5ADlfw5g2O8r1NBo3EKKVDRdvNo=
+  dependencies:
+    debug "^2.1.0"
+    lodash.assign "^3.2.0"
+    rsvp "^3.0.21"
+
+levn@^0.3.0, levn@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
+  dependencies:
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+
+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"
+
+line-column@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/line-column/-/line-column-1.0.2.tgz#d25af2936b6f4849172b312e4792d1d987bc34a2"
+  integrity sha1-0lryk2tvSEkXKzEuR5LR2Ye8NKI=
+  dependencies:
+    isarray "^1.0.0"
+    isobject "^2.0.0"
+
+lines-and-columns@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
+  integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=
+
+linkify-it@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.2.0.tgz#e3b54697e78bf915c70a38acd78fd09e0058b1cf"
+  integrity sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==
+  dependencies:
+    uc.micro "^1.0.1"
+
+linkify-it@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-3.0.2.tgz#f55eeb8bc1d3ae754049e124ab3bb56d97797fb8"
+  integrity sha512-gDBO4aHNZS6coiZCKVhSNh43F9ioIL4JwRjLZPkoLIY4yZFwg264Y5lu2x6rb1Js42Gh6Yqm2f6L2AJcnkzinQ==
+  dependencies:
+    uc.micro "^1.0.1"
+
+lint-staged@^10.5.1:
+  version "10.5.4"
+  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-10.5.4.tgz#cd153b5f0987d2371fc1d2847a409a2fe705b665"
+  integrity sha512-EechC3DdFic/TdOPgj/RB3FicqE6932LTHCUm0Y2fsD9KGlLB+RwJl2q1IYBIvEsKzDOgn0D4gll+YxG5RsrKg==
+  dependencies:
+    chalk "^4.1.0"
+    cli-truncate "^2.1.0"
+    commander "^6.2.0"
+    cosmiconfig "^7.0.0"
+    debug "^4.2.0"
+    dedent "^0.7.0"
+    enquirer "^2.3.6"
+    execa "^4.1.0"
+    listr2 "^3.2.2"
+    log-symbols "^4.0.0"
+    micromatch "^4.0.2"
+    normalize-path "^3.0.0"
+    please-upgrade-node "^3.2.0"
+    string-argv "0.3.1"
+    stringify-object "^3.3.0"
+
+listr2@^3.2.2:
+  version "3.8.2"
+  resolved "https://registry.yarnpkg.com/listr2/-/listr2-3.8.2.tgz#99b138ad1cfb08f1b0aacd422972e49b2d814b99"
+  integrity sha512-E28Fw7Zd3HQlCJKzb9a8C8M0HtFWQeucE+S8YrSrqZObuCLPRHMRrR8gNmYt65cU9orXYHwvN5agXC36lYt7VQ==
+  dependencies:
+    chalk "^4.1.1"
+    cli-truncate "^2.1.0"
+    figures "^3.2.0"
+    indent-string "^4.0.0"
+    log-update "^4.0.0"
+    p-map "^4.0.0"
+    rxjs "^6.6.7"
+    through "^2.3.8"
+    wrap-ansi "^7.0.0"
+
+livereload-js@^3.3.1:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/livereload-js/-/livereload-js-3.3.2.tgz#c88b009c6e466b15b91faa26fd7c99d620e12651"
+  integrity sha512-w677WnINxFkuixAoUEXOStewzLYGI76XVag+0JWMMEyjJQKs0ibWZMxkTlB96Lm3EjZ7IeOxVziBEbtxVQqQZA==
+
+load-json-file@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
+  integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs=
+  dependencies:
+    graceful-fs "^4.1.2"
+    parse-json "^4.0.0"
+    pify "^3.0.0"
+    strip-bom "^3.0.0"
+
+loader-runner@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
+  integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==
+
+loader-runner@^4.2.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1"
+  integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==
+
+loader-utils@^1.2.3, loader-utils@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
+  integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
+  dependencies:
+    big.js "^5.2.2"
+    emojis-list "^3.0.0"
+    json5 "^1.0.1"
+
+loader-utils@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129"
+  integrity sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==
+  dependencies:
+    big.js "^5.2.2"
+    emojis-list "^3.0.0"
+    json5 "^2.1.2"
+
+loader.js@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/loader.js/-/loader.js-4.7.0.tgz#a1a52902001c83631efde9688b8ab3799325ef1f"
+  integrity sha512-9M2KvGT6duzGMgkOcTkWb+PR/Q2Oe54df/tLgHGVmFpAmtqJ553xJh6N63iFYI2yjo2PeJXbS5skHi/QpJq4vA==
+
+locate-character@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/locate-character/-/locate-character-2.0.5.tgz#f2d2614d49820ecb3c92d80d193b8db755f74c0f"
+  integrity sha512-n2GmejDXtOPBAZdIiEFy5dJ5N38xBCXLNOtw2WpB9kGh6pnrEuKlwYI+Tkpofc4wDtVXHtoAOJaMRlYG/oYaxg==
+
+locate-path@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
+  integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=
+  dependencies:
+    p-locate "^2.0.0"
+    path-exists "^3.0.0"
+
+locate-path@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
+  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
+  dependencies:
+    p-locate "^3.0.0"
+    path-exists "^3.0.0"
+
+locate-path@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
+  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
+  dependencies:
+    p-locate "^4.1.0"
+
+locate-path@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
+  integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
+  dependencies:
+    p-locate "^5.0.0"
+
+locate-path@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-7.1.0.tgz#241d62af60739f6097c055efe10329c88b798425"
+  integrity sha512-HNx5uOnYeK4SxEoid5qnhRfprlJeGMzFRKPLCf/15N3/B4AiofNwC/yq7VBKdVk9dx7m+PiYCJOGg55JYTAqoQ==
+  dependencies:
+    p-locate "^6.0.0"
+
+lodash-es@^4.17.11:
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee"
+  integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==
+
+lodash._baseassign@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e"
+  integrity sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=
+  dependencies:
+    lodash._basecopy "^3.0.0"
+    lodash.keys "^3.0.0"
+
+lodash._basecopy@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
+  integrity sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=
+
+lodash._baseflatten@^3.0.0:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/lodash._baseflatten/-/lodash._baseflatten-3.1.4.tgz#0770ff80131af6e34f3b511796a7ba5214e65ff7"
+  integrity sha1-B3D/gBMa9uNPO1EXlqe6UhTmX/c=
+  dependencies:
+    lodash.isarguments "^3.0.0"
+    lodash.isarray "^3.0.0"
+
+lodash._bindcallback@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"
+  integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4=
+
+lodash._createassigner@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz#838a5bae2fdaca63ac22dee8e19fa4e6d6970b11"
+  integrity sha1-g4pbri/aymOsIt7o4Z+k5taXCxE=
+  dependencies:
+    lodash._bindcallback "^3.0.0"
+    lodash._isiterateecall "^3.0.0"
+    lodash.restparam "^3.0.0"
+
+lodash._getnative@^3.0.0:
+  version "3.9.1"
+  resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
+  integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=
+
+lodash._isiterateecall@^3.0.0:
+  version "3.0.9"
+  resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c"
+  integrity sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=
+
+lodash._reinterpolate@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
+  integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
+
+lodash.assign@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-3.2.0.tgz#3ce9f0234b4b2223e296b8fa0ac1fee8ebca64fa"
+  integrity sha1-POnwI0tLIiPilrj6CsH+6OvKZPo=
+  dependencies:
+    lodash._baseassign "^3.0.0"
+    lodash._createassigner "^3.0.0"
+    lodash.keys "^3.0.0"
+
+lodash.assign@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
+  integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=
+
+lodash.assignin@^4.0.9, lodash.assignin@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2"
+  integrity sha1-uo31+4QesKPoBEIysOJjqNxqKKI=
+
+lodash.bind@^4.1.4:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/lodash.bind/-/lodash.bind-4.2.1.tgz#7ae3017e939622ac31b7d7d7dcb1b34db1690d35"
+  integrity sha1-euMBfpOWIqwxt9fX3LGzTbFpDTU=
+
+lodash.camelcase@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
+  integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY=
+
+lodash.castarray@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.castarray/-/lodash.castarray-4.4.0.tgz#c02513515e309daddd4c24c60cfddcf5976d9115"
+  integrity sha1-wCUTUV4wna3dTCTGDP3c9ZdtkRU=
+
+lodash.clonedeep@^4.4.1, 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.compact@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/lodash.compact/-/lodash.compact-3.0.1.tgz#540ce3837745975807471e16b4a2ba21e7256ca5"
+  integrity sha1-VAzjg3dFl1gHRx4WtKK6IeclbKU=
+
+lodash.debounce@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-3.1.1.tgz#812211c378a94cc29d5aa4e3346cf0bfce3a7df5"
+  integrity sha1-gSIRw3ipTMKdWqTjNGzwv846ffU=
+  dependencies:
+    lodash._getnative "^3.0.0"
+
+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.defaults@^4.0.1:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
+  integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=
+
+lodash.defaultsdeep@^4.6.1:
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz#512e9bd721d272d94e3d3a63653fa17516741ca6"
+  integrity sha512-3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA==
+
+lodash.filter@^4.4.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.filter/-/lodash.filter-4.6.0.tgz#668b1d4981603ae1cc5a6fa760143e480b4c4ace"
+  integrity sha1-ZosdSYFgOuHMWm+nYBQ+SAtMSs4=
+
+lodash.find@^4.5.1, lodash.find@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.find/-/lodash.find-4.6.0.tgz#cb0704d47ab71789ffa0de8b97dd926fb88b13b1"
+  integrity sha1-ywcE1Hq3F4n/oN6Ll92Sb7iLE7E=
+
+lodash.flatten@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-3.0.2.tgz#de1cf57758f8f4479319d35c3e9cc60c4501938c"
+  integrity sha1-3hz1d1j49EeTGdNcPpzGDEUBk4w=
+  dependencies:
+    lodash._baseflatten "^3.0.0"
+    lodash._isiterateecall "^3.0.0"
+
+lodash.flatten@^4.2.0, lodash.flatten@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
+  integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=
+
+lodash.foreach@^4.3.0, lodash.foreach@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53"
+  integrity sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM=
+
+lodash.forin@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.forin/-/lodash.forin-4.4.0.tgz#5d3f20ae564011fbe88381f7d98949c9c9519731"
+  integrity sha1-XT8grlZAEfvog4H32YlJyclRlzE=
+
+lodash.get@^4.4.2:
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
+  integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
+
+lodash.has@^4.5.2:
+  version "4.5.2"
+  resolved "https://registry.yarnpkg.com/lodash.has/-/lodash.has-4.5.2.tgz#d19f4dc1095058cccbe2b0cdf4ee0fe4aa37c862"
+  integrity sha1-0Z9NwQlQWMzL4rDN9O4P5Ko3yGI=
+
+lodash.invokemap@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.invokemap/-/lodash.invokemap-4.6.0.tgz#1748cda5d8b0ef8369c4eb3ec54c21feba1f2d62"
+  integrity sha1-F0jNpdiw74NpxOs+xUwh/rofLWI=
+
+lodash.isarguments@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
+  integrity sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=
+
+lodash.isarray@^3.0.0:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
+  integrity sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=
+
+lodash.isempty@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.isempty/-/lodash.isempty-4.4.0.tgz#6f86cbedd8be4ec987be9aaf33c9684db1b31e7e"
+  integrity sha1-b4bL7di+TsmHvpqvM8loTbGzHn4=
+
+lodash.isequal@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
+  integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
+
+lodash.isfunction@^3.0.9:
+  version "3.0.9"
+  resolved "https://registry.yarnpkg.com/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz#06de25df4db327ac931981d1bdb067e5af68d051"
+  integrity sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw==
+
+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.isplainobject@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
+  integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=
+
+lodash.kebabcase@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36"
+  integrity sha1-hImxyw0p/4gZXM7KRI/21swpXDY=
+
+lodash.keys@^3.0.0:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
+  integrity sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=
+  dependencies:
+    lodash._getnative "^3.0.0"
+    lodash.isarguments "^3.0.0"
+    lodash.isarray "^3.0.0"
+
+lodash.lowerfirst@^4.3.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/lodash.lowerfirst/-/lodash.lowerfirst-4.3.1.tgz#de3c7b12e02c6524a0059c2f6cb7c5c52655a13d"
+  integrity sha1-3jx7EuAsZSSgBZwvbLfFxSZVoT0=
+
+lodash.map@^4.4.0, lodash.map@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3"
+  integrity sha1-dx7Hg540c9nEzeKLGTlMNWL09tM=
+
+lodash.mapvalues@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz#1bafa5005de9dd6f4f26668c30ca37230cc9689c"
+  integrity sha1-G6+lAF3p3W9PJmaMMMo3IwzJaJw=
+
+lodash.memoize@4.1.2, lodash.memoize@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
+  integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
+
+lodash.merge@^4.4.0, lodash.merge@^4.6.0, 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.omit@^4.1.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.omit/-/lodash.omit-4.5.0.tgz#6eb19ae5a1ee1dd9df0b969e66ce0b7fa30b5e60"
+  integrity sha1-brGa5aHuHdnfC5aeZs4Lf6MLXmA=
+
+lodash.pick@^4.2.1, lodash.pick@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3"
+  integrity sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=
+
+lodash.reduce@^4.4.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.reduce/-/lodash.reduce-4.6.0.tgz#f1ab6b839299ad48f784abbf476596f03b914d3b"
+  integrity sha1-8atrg5KZrUj3hKu/R2WW8DuRTTs=
+
+lodash.reject@^4.4.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.reject/-/lodash.reject-4.6.0.tgz#80d6492dc1470864bbf583533b651f42a9f52415"
+  integrity sha1-gNZJLcFHCGS79YNTO2UfQqn1JBU=
+
+lodash.restparam@^3.0.0:
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
+  integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=
+
+lodash.snakecase@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz#39d714a35357147837aefd64b5dcbb16becd8f8d"
+  integrity sha1-OdcUo1NXFHg3rv1ktdy7Fr7Nj40=
+
+lodash.some@^4.4.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d"
+  integrity sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=
+
+lodash.template@^4.4.0, lodash.template@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab"
+  integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==
+  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.unescape@4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/lodash.unescape/-/lodash.unescape-4.0.1.tgz#bf2249886ce514cda112fae9218cdc065211fc9c"
+  integrity sha1-vyJJiGzlFM2hEvrpIYzcBlIR/Jw=
+
+lodash.uniq@^4.2.0, lodash.uniq@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
+  integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
+
+lodash.uniqby@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz#d99c07a669e9e6d24e1362dfe266c67616af1302"
+  integrity sha1-2ZwHpmnp5tJOE2Lf4mbGdhavEwI=
+
+lodash.values@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/lodash.values/-/lodash.values-4.3.0.tgz#a3a6c2b0ebecc5c2cba1c17e6e620fe81b53d347"
+  integrity sha1-o6bCsOvsxcLLocF+bmIP6BtT00c=
+
+lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.5.1, lodash@^4.7.0, lodash@~4.17.10:
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
+
+log-symbols@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
+  integrity sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==
+  dependencies:
+    chalk "^2.0.1"
+
+log-symbols@^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"
+  integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==
+  dependencies:
+    chalk "^4.1.0"
+    is-unicode-supported "^0.1.0"
+
+log-update@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/log-update/-/log-update-4.0.0.tgz#589ecd352471f2a1c0c570287543a64dfd20e0a1"
+  integrity sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==
+  dependencies:
+    ansi-escapes "^4.3.0"
+    cli-cursor "^3.1.0"
+    slice-ansi "^4.0.0"
+    wrap-ansi "^6.2.0"
+
+loglevel-colored-level-prefix@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/loglevel-colored-level-prefix/-/loglevel-colored-level-prefix-1.0.0.tgz#6a40218fdc7ae15fc76c3d0f3e676c465388603e"
+  integrity sha1-akAhj9x64V/HbD0PPmdsRlOIYD4=
+  dependencies:
+    chalk "^1.1.3"
+    loglevel "^1.4.1"
+
+loglevel@^1.4.1:
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz#005fde2f5e6e47068f935ff28573e125ef72f197"
+  integrity sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==
+
+lolex@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lolex/-/lolex-4.2.0.tgz#ddbd7f6213ca1ea5826901ab1222b65d714b3cd7"
+  integrity sha512-gKO5uExCXvSm6zbF562EvM+rd1kQDnB9AZBbiQVzf1ZmdDpxUSvpnAaVOP83N/31mRK8Ml8/VE8DMvsAZQ+7wg==
+
+lolex@^5.0.1:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/lolex/-/lolex-5.1.2.tgz#953694d098ce7c07bc5ed6d0e42bc6c0c6d5a367"
+  integrity sha512-h4hmjAvHTmd+25JSwrtTIuwbKdwg5NzZVRMLn9saij4SZaepCrTCxPr35H/3bjwfMJtN+t3CX8672UIkglz28A==
+  dependencies:
+    "@sinonjs/commons" "^1.7.0"
+
+longest-streak@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.4.tgz#b8599957da5b5dab64dee3fe316fa774597d90e4"
+  integrity sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==
+
+loose-envify@^1.0.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
+  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
+  dependencies:
+    js-tokens "^3.0.0 || ^4.0.0"
+
+lower-case@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28"
+  integrity sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==
+  dependencies:
+    tslib "^2.0.3"
+
+lru-cache@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
+  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
+  dependencies:
+    yallist "^3.0.2"
+
+lru-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
+  dependencies:
+    yallist "^4.0.0"
+
+magic-string@^0.24.0:
+  version "0.24.1"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.24.1.tgz#7e38e5f126cae9f15e71f0cf8e450818ca7d5a8f"
+  integrity sha512-YBfNxbJiixMzxW40XqJEIldzHyh5f7CZKalo1uZffevyrPEX8Qgo9s0dmcORLHdV47UyvJg8/zD+6hQG3qvJrA==
+  dependencies:
+    sourcemap-codec "^1.4.1"
+
+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==
+  dependencies:
+    sourcemap-codec "^1.4.4"
+
+make-dir@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
+  integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
+  dependencies:
+    pify "^4.0.1"
+    semver "^5.6.0"
+
+make-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-plural@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/make-plural/-/make-plural-4.3.0.tgz#f23de08efdb0cac2e0c9ba9f315b0dff6b4c2735"
+  integrity sha512-xTYd4JVHpSCW+aqDof6w/MebaMVNTVYBZhbB/vi513xXdiPT92JMVCo0Jq8W2UZnzYRFeVbQiQ+I25l13JuKvA==
+  optionalDependencies:
+    minimist "^1.2.0"
+
+makeerror@1.0.12:
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a"
+  integrity sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==
+  dependencies:
+    tmpl "1.0.5"
+
+map-cache@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
+
+map-obj@^1.0.0:
+  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.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"
+  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
+  dependencies:
+    object-visit "^1.0.0"
+
+markdown-it-terminal@0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/markdown-it-terminal/-/markdown-it-terminal-0.2.1.tgz#670fd5ea824a7dcaa1591dcbeef28bf70aff1705"
+  integrity sha512-e8hbK9L+IyFac2qY05R7paP+Fqw1T4pSQW3miK3VeG9QmpqBjg5Qzjv/v6C7YNxSNRS2Kp8hUFtm5lWU9eK4lw==
+  dependencies:
+    ansi-styles "^3.0.0"
+    cardinal "^1.0.0"
+    cli-table "^0.3.1"
+    lodash.merge "^4.6.2"
+    markdown-it "^8.3.1"
+
+markdown-it@^12.0.4:
+  version "12.3.2"
+  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.3.2.tgz#bf92ac92283fe983fe4de8ff8abfb5ad72cd0c90"
+  integrity sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==
+  dependencies:
+    argparse "^2.0.1"
+    entities "~2.1.0"
+    linkify-it "^3.0.1"
+    mdurl "^1.0.1"
+    uc.micro "^1.0.5"
+
+markdown-it@^8.3.1:
+  version "8.4.2"
+  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.4.2.tgz#386f98998dc15a37722aa7722084f4020bdd9b54"
+  integrity sha512-GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ==
+  dependencies:
+    argparse "^1.0.7"
+    entities "~1.1.1"
+    linkify-it "^2.0.0"
+    mdurl "^1.0.1"
+    uc.micro "^1.0.5"
+
+markdown-table@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-2.0.0.tgz#194a90ced26d31fe753d8b9434430214c011865b"
+  integrity sha512-Ezda85ToJUBhM6WGaG6veasyym+Tbs3cMAw/ZhOPqXiYsr0jgocBV3j3nx+4lk47plLlIqjwuTm/ywVI+zjJ/A==
+  dependencies:
+    repeat-string "^1.0.0"
+
+matcher-collection@^1.0.0, matcher-collection@^1.0.4, matcher-collection@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/matcher-collection/-/matcher-collection-1.1.2.tgz#1076f506f10ca85897b53d14ef54f90a5c426838"
+  integrity sha512-YQ/teqaOIIfUHedRam08PB3NK7Mjct6BvzRnJmpGDm8uFXpNr1sbY4yuflI5JcEs6COpYA0FpRQhSDBf1tT95g==
+  dependencies:
+    minimatch "^3.0.2"
+
+matcher-collection@^2.0.0, matcher-collection@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/matcher-collection/-/matcher-collection-2.0.1.tgz#90be1a4cf58d6f2949864f65bb3b0f3e41303b29"
+  integrity sha512-daE62nS2ZQsDg9raM0IlZzLmI2u+7ZapXBwdoeBUKAYERPDDIc0qNqA8E0Rp2D+gspKR7BgIFP52GeujaGXWeQ==
+  dependencies:
+    "@types/minimatch" "^3.0.3"
+    minimatch "^3.0.2"
+
+md5.js@^1.3.4:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
+  integrity sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==
+  dependencies:
+    hash-base "^3.0.0"
+    inherits "^2.0.1"
+    safe-buffer "^5.1.2"
+
+mdast-util-find-and-replace@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/mdast-util-find-and-replace/-/mdast-util-find-and-replace-1.1.1.tgz#b7db1e873f96f66588c321f1363069abf607d1b5"
+  integrity sha512-9cKl33Y21lyckGzpSmEQnIDjEfeeWelN5s1kUW1LwdB0Fkuq2u+4GdqcGEygYxJE8GVqCl0741bYXHgamfWAZA==
+  dependencies:
+    escape-string-regexp "^4.0.0"
+    unist-util-is "^4.0.0"
+    unist-util-visit-parents "^3.0.0"
+
+mdast-util-footnote@^0.1.0:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/mdast-util-footnote/-/mdast-util-footnote-0.1.7.tgz#4b226caeab4613a3362c144c94af0fdd6f7e0ef0"
+  integrity sha512-QxNdO8qSxqbO2e3m09KwDKfWiLgqyCurdWTQ198NpbZ2hxntdc+VKS4fDJCmNWbAroUdYnSthu+XbZ8ovh8C3w==
+  dependencies:
+    mdast-util-to-markdown "^0.6.0"
+    micromark "~2.11.0"
+
+mdast-util-from-markdown@^0.8.0:
+  version "0.8.5"
+  resolved "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz#d1ef2ca42bc377ecb0463a987910dae89bd9a28c"
+  integrity sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==
+  dependencies:
+    "@types/mdast" "^3.0.0"
+    mdast-util-to-string "^2.0.0"
+    micromark "~2.11.0"
+    parse-entities "^2.0.0"
+    unist-util-stringify-position "^2.0.0"
+
+mdast-util-frontmatter@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-frontmatter/-/mdast-util-frontmatter-0.2.0.tgz#8bd5cd55e236c03e204a036f7372ebe9e6748240"
+  integrity sha512-FHKL4w4S5fdt1KjJCwB0178WJ0evnyyQr5kXTM3wrOVpytD0hrkvd+AOOjU9Td8onOejCkmZ+HQRT3CZ3coHHQ==
+  dependencies:
+    micromark-extension-frontmatter "^0.2.0"
+
+mdast-util-gfm-autolink-literal@^0.1.0:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/mdast-util-gfm-autolink-literal/-/mdast-util-gfm-autolink-literal-0.1.3.tgz#9c4ff399c5ddd2ece40bd3b13e5447d84e385fb7"
+  integrity sha512-GjmLjWrXg1wqMIO9+ZsRik/s7PLwTaeCHVB7vRxUwLntZc8mzmTsLVr6HW1yLokcnhfURsn5zmSVdi3/xWWu1A==
+  dependencies:
+    ccount "^1.0.0"
+    mdast-util-find-and-replace "^1.1.0"
+    micromark "^2.11.3"
+
+mdast-util-gfm-strikethrough@^0.2.0:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-0.2.3.tgz#45eea337b7fff0755a291844fbea79996c322890"
+  integrity sha512-5OQLXpt6qdbttcDG/UxYY7Yjj3e8P7X16LzvpX8pIQPYJ/C2Z1qFGMmcw+1PZMUM3Z8wt8NRfYTvCni93mgsgA==
+  dependencies:
+    mdast-util-to-markdown "^0.6.0"
+
+mdast-util-gfm-table@^0.1.0:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/mdast-util-gfm-table/-/mdast-util-gfm-table-0.1.6.tgz#af05aeadc8e5ee004eeddfb324b2ad8c029b6ecf"
+  integrity sha512-j4yDxQ66AJSBwGkbpFEp9uG/LS1tZV3P33fN1gkyRB2LoRL+RR3f76m0HPHaby6F4Z5xr9Fv1URmATlRRUIpRQ==
+  dependencies:
+    markdown-table "^2.0.0"
+    mdast-util-to-markdown "~0.6.0"
+
+mdast-util-gfm-task-list-item@^0.1.0:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/mdast-util-gfm-task-list-item/-/mdast-util-gfm-task-list-item-0.1.6.tgz#70c885e6b9f543ddd7e6b41f9703ee55b084af10"
+  integrity sha512-/d51FFIfPsSmCIRNp7E6pozM9z1GYPIkSy1urQ8s/o4TC22BZ7DqfHFWiqBD23bc7J3vV1Fc9O4QIHBlfuit8A==
+  dependencies:
+    mdast-util-to-markdown "~0.6.0"
+
+mdast-util-gfm@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/mdast-util-gfm/-/mdast-util-gfm-0.1.2.tgz#8ecddafe57d266540f6881f5c57ff19725bd351c"
+  integrity sha512-NNkhDx/qYcuOWB7xHUGWZYVXvjPFFd6afg6/e2g+SV4r9q5XUcCbV4Wfa3DLYIiD+xAEZc6K4MGaE/m0KDcPwQ==
+  dependencies:
+    mdast-util-gfm-autolink-literal "^0.1.0"
+    mdast-util-gfm-strikethrough "^0.2.0"
+    mdast-util-gfm-table "^0.1.0"
+    mdast-util-gfm-task-list-item "^0.1.0"
+    mdast-util-to-markdown "^0.6.1"
+
+mdast-util-to-markdown@^0.6.0, mdast-util-to-markdown@^0.6.1, mdast-util-to-markdown@~0.6.0:
+  version "0.6.5"
+  resolved "https://registry.yarnpkg.com/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.5.tgz#b33f67ca820d69e6cc527a93d4039249b504bebe"
+  integrity sha512-XeV9sDE7ZlOQvs45C9UKMtfTcctcaj/pGwH8YLbMHoMOXNNCn2LsqVQOqrF1+/NU8lKDAqozme9SCXWyo9oAcQ==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    longest-streak "^2.0.0"
+    mdast-util-to-string "^2.0.0"
+    parse-entities "^2.0.0"
+    repeat-string "^1.0.0"
+    zwitch "^1.0.0"
+
+mdast-util-to-string@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz#b8cfe6a713e1091cb5b728fc48885a4767f8b97b"
+  integrity sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==
+
+mdn-data@2.0.27:
+  version "2.0.27"
+  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.27.tgz#1710baa7b0db8176d3b3d565ccb7915fc69525ab"
+  integrity sha512-kwqO0I0jtWr25KcfLm9pia8vLZ8qoAKhWZuZMbneJq3jjBD3gl5nZs8l8Tu3ZBlBAHVQtDur9rdDGyvtfVraHQ==
+
+mdn-data@2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz#699b3c38ac6f1d728091a64650b65d388502fd5b"
+  integrity sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==
+
+mdn-data@~1.1.0:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-1.1.4.tgz#50b5d4ffc4575276573c4eedb8780812a8419f01"
+  integrity sha512-FSYbp3lyKjyj3E7fMl6rYvUdX0FBXaluGqlFoYESWQlyUTq8R+wp0rkFxoYFqZlHCvsUXGjyJmLQSnXToYhOSA==
+
+mdurl@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
+  integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=
+
+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=
+
+memory-fs@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
+  integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
+  dependencies:
+    errno "^0.1.3"
+    readable-stream "^2.0.1"
+
+memory-fs@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz#324c01288b88652966d161db77838720845a8e3c"
+  integrity sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==
+  dependencies:
+    errno "^0.1.3"
+    readable-stream "^2.0.1"
+
+memory-streams@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/memory-streams/-/memory-streams-0.1.3.tgz#d9b0017b4b87f1d92f55f2745c9caacb1dc93ceb"
+  integrity sha512-qVQ/CjkMyMInPaaRMrwWNDvf6boRZXaT/DbQeMYcCWuXPEBf1v8qChOc9OlEVQp2uOvRXa1Qu30fLmKhY6NipA==
+  dependencies:
+    readable-stream "~1.0.2"
+
+memorystream@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2"
+  integrity sha1-htcJCzDORV1j+64S3aUaR93K+bI=
+
+meow@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/meow/-/meow-9.0.0.tgz#cd9510bc5cac9dee7d03c73ee1f9ad959f4ea364"
+  integrity sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==
+  dependencies:
+    "@types/minimist" "^1.2.0"
+    camelcase-keys "^6.2.2"
+    decamelize "^1.2.0"
+    decamelize-keys "^1.1.0"
+    hard-rejection "^2.1.0"
+    minimist-options "4.1.0"
+    normalize-package-data "^3.0.0"
+    read-pkg-up "^7.0.1"
+    redent "^3.0.0"
+    trim-newlines "^3.0.0"
+    type-fest "^0.18.0"
+    yargs-parser "^20.2.3"
+
+merge-descriptors@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
+  integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
+
+merge-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
+  integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
+
+merge-trees@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/merge-trees/-/merge-trees-1.0.1.tgz#ccbe674569787f9def17fd46e6525f5700bbd23e"
+  integrity sha1-zL5nRWl4f53vF/1G5lJfVwC70j4=
+  dependencies:
+    can-symlink "^1.0.0"
+    fs-tree-diff "^0.5.4"
+    heimdalljs "^0.2.1"
+    heimdalljs-logger "^0.1.7"
+    rimraf "^2.4.3"
+    symlink-or-copy "^1.0.0"
+
+merge-trees@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/merge-trees/-/merge-trees-2.0.0.tgz#a560d796e566c5d9b2c40472a2967cca48d85161"
+  integrity sha512-5xBbmqYBalWqmhYm51XlohhkmVOua3VAUrrWh8t9iOkaLpS6ifqm/UVuUjQCeDVJ9Vx3g2l6ihfkbLSTeKsHbw==
+  dependencies:
+    fs-updater "^1.0.4"
+    heimdalljs "^0.2.5"
+
+merge2@^1.2.3, merge2@^1.3.0, merge2@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
+  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
+
+messageformat-formatters@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/messageformat-formatters/-/messageformat-formatters-2.0.1.tgz#0492c1402a48775f751c9b17c0354e92be012b08"
+  integrity sha512-E/lQRXhtHwGuiQjI7qxkLp8AHbMD5r2217XNe/SREbBlSawe0lOqsFb7rflZJmlQFSULNLIqlcjjsCPlB3m3Mg==
+
+messageformat-parser@^4.1.2:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/messageformat-parser/-/messageformat-parser-4.1.3.tgz#b824787f57fcda7d50769f5b63e8d4fda68f5b9e"
+  integrity sha512-2fU3XDCanRqeOCkn7R5zW5VQHWf+T3hH65SzuqRvjatBK7r4uyFa5mEX+k6F9Bd04LVM5G4/BHBTUJsOdW7uyg==
+
+messageformat@^2.2.1:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/messageformat/-/messageformat-2.3.0.tgz#de263c49029d5eae65d7ee25e0754f57f425ad91"
+  integrity sha512-uTzvsv0lTeQxYI2y1NPa1lItL5VRI8Gb93Y2K2ue5gBPyrbJxfDi/EYWxh2PKv5yO42AJeeqblS9MJSh/IEk4w==
+  dependencies:
+    make-plural "^4.3.0"
+    messageformat-formatters "^2.0.1"
+    messageformat-parser "^4.1.2"
+
+methods@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
+  integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
+
+micromark-extension-footnote@^0.3.0:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/micromark-extension-footnote/-/micromark-extension-footnote-0.3.2.tgz#129b74ef4920ce96719b2c06102ee7abb2b88a20"
+  integrity sha512-gr/BeIxbIWQoUm02cIfK7mdMZ/fbroRpLsck4kvFtjbzP4yi+OPVbnukTc/zy0i7spC2xYE/dbX1Sur8BEDJsQ==
+  dependencies:
+    micromark "~2.11.0"
+
+micromark-extension-frontmatter@^0.2.0:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/micromark-extension-frontmatter/-/micromark-extension-frontmatter-0.2.2.tgz#61b8e92e9213e1d3c13f5a59e7862f5ca98dfa53"
+  integrity sha512-q6nPLFCMTLtfsctAuS0Xh4vaolxSFUWUWR6PZSrXXiRy+SANGllpcqdXFv2z07l0Xz/6Hl40hK0ffNCJPH2n1A==
+  dependencies:
+    fault "^1.0.0"
+
+micromark-extension-gfm-autolink-literal@~0.5.0:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/micromark-extension-gfm-autolink-literal/-/micromark-extension-gfm-autolink-literal-0.5.7.tgz#53866c1f0c7ef940ae7ca1f72c6faef8fed9f204"
+  integrity sha512-ePiDGH0/lhcngCe8FtH4ARFoxKTUelMp4L7Gg2pujYD5CSMb9PbblnyL+AAMud/SNMyusbS2XDSiPIRcQoNFAw==
+  dependencies:
+    micromark "~2.11.3"
+
+micromark-extension-gfm-strikethrough@~0.6.5:
+  version "0.6.5"
+  resolved "https://registry.yarnpkg.com/micromark-extension-gfm-strikethrough/-/micromark-extension-gfm-strikethrough-0.6.5.tgz#96cb83356ff87bf31670eefb7ad7bba73e6514d1"
+  integrity sha512-PpOKlgokpQRwUesRwWEp+fHjGGkZEejj83k9gU5iXCbDG+XBA92BqnRKYJdfqfkrRcZRgGuPuXb7DaK/DmxOhw==
+  dependencies:
+    micromark "~2.11.0"
+
+micromark-extension-gfm-table@~0.4.0:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/micromark-extension-gfm-table/-/micromark-extension-gfm-table-0.4.3.tgz#4d49f1ce0ca84996c853880b9446698947f1802b"
+  integrity sha512-hVGvESPq0fk6ALWtomcwmgLvH8ZSVpcPjzi0AjPclB9FsVRgMtGZkUcpE0zgjOCFAznKepF4z3hX8z6e3HODdA==
+  dependencies:
+    micromark "~2.11.0"
+
+micromark-extension-gfm-tagfilter@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/micromark-extension-gfm-tagfilter/-/micromark-extension-gfm-tagfilter-0.3.0.tgz#d9f26a65adee984c9ccdd7e182220493562841ad"
+  integrity sha512-9GU0xBatryXifL//FJH+tAZ6i240xQuFrSL7mYi8f4oZSbc+NvXjkrHemeYP0+L4ZUT+Ptz3b95zhUZnMtoi/Q==
+
+micromark-extension-gfm-task-list-item@~0.3.0:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/micromark-extension-gfm-task-list-item/-/micromark-extension-gfm-task-list-item-0.3.3.tgz#d90c755f2533ed55a718129cee11257f136283b8"
+  integrity sha512-0zvM5iSLKrc/NQl84pZSjGo66aTGd57C1idmlWmE87lkMcXrTxg1uXa/nXomxJytoje9trP0NDLvw4bZ/Z/XCQ==
+  dependencies:
+    micromark "~2.11.0"
+
+micromark-extension-gfm@^0.3.0:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/micromark-extension-gfm/-/micromark-extension-gfm-0.3.3.tgz#36d1a4c089ca8bdfd978c9bd2bf1a0cb24e2acfe"
+  integrity sha512-oVN4zv5/tAIA+l3GbMi7lWeYpJ14oQyJ3uEim20ktYFAcfX1x3LNlFGGlmrZHt7u9YlKExmyJdDGaTt6cMSR/A==
+  dependencies:
+    micromark "~2.11.0"
+    micromark-extension-gfm-autolink-literal "~0.5.0"
+    micromark-extension-gfm-strikethrough "~0.6.5"
+    micromark-extension-gfm-table "~0.4.0"
+    micromark-extension-gfm-tagfilter "~0.3.0"
+    micromark-extension-gfm-task-list-item "~0.3.0"
+
+micromark@^2.11.3, micromark@~2.11.0, micromark@~2.11.3:
+  version "2.11.4"
+  resolved "https://registry.yarnpkg.com/micromark/-/micromark-2.11.4.tgz#d13436138eea826383e822449c9a5c50ee44665a"
+  integrity sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==
+  dependencies:
+    debug "^4.0.0"
+    parse-entities "^2.0.0"
+
+micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
+  version "3.1.10"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    braces "^2.3.1"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    extglob "^2.0.4"
+    fragment-cache "^0.2.1"
+    kind-of "^6.0.2"
+    nanomatch "^1.2.9"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.2"
+
+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.2.3"
+
+miller-rabin@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
+  integrity sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==
+  dependencies:
+    bn.js "^4.0.0"
+    brorand "^1.0.1"
+
+mime-db@1.47.0, "mime-db@>= 1.43.0 < 2":
+  version "1.47.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.47.0.tgz#8cb313e59965d3c05cfbf898915a267af46a335c"
+  integrity sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw==
+
+mime-db@1.51.0:
+  version "1.51.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c"
+  integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==
+
+mime-db@1.52.0:
+  version "1.52.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
+  integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
+
+mime-types@^2.1.12, mime-types@^2.1.18, mime-types@^2.1.26, mime-types@~2.1.19, mime-types@~2.1.24:
+  version "2.1.30"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.30.tgz#6e7be8b4c479825f85ed6326695db73f9305d62d"
+  integrity sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg==
+  dependencies:
+    mime-db "1.47.0"
+
+mime-types@^2.1.19:
+  version "2.1.34"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24"
+  integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==
+  dependencies:
+    mime-db "1.51.0"
+
+mime-types@^2.1.27:
+  version "2.1.35"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
+  integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
+  dependencies:
+    mime-db "1.52.0"
+
+mime@1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
+
+mimic-fn@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
+  integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
+
+mimic-fn@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
+  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
+
+min-indent@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
+  integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
+
+mini-css-extract-plugin@^2.5.2:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.6.0.tgz#578aebc7fc14d32c0ad304c2c34f08af44673f5e"
+  integrity sha512-ndG8nxCEnAemsg4FSgS+yNyHKgkTB4nPKqCOgh65j3/30qqC5RaSQQXMm++Y6sb6E1zRSxPkztj9fqxhS1Eo6w==
+  dependencies:
+    schema-utils "^4.0.0"
+
+minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
+  integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
+
+minimalistic-crypto-utils@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
+  integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
+
+"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
+  dependencies:
+    brace-expansion "^1.1.7"
+
+minimist-options@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619"
+  integrity sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==
+  dependencies:
+    arrify "^1.0.1"
+    is-plain-obj "^1.1.0"
+    kind-of "^6.0.3"
+
+minimist@^0.2.1, minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.2, minimist@^1.2.5, minimist@^1.2.6:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+
+minipass@^2.2.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
+  integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
+  dependencies:
+    safe-buffer "^5.1.2"
+    yallist "^3.0.0"
+
+minipass@^3.0.0:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd"
+  integrity sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==
+  dependencies:
+    yallist "^4.0.0"
+
+minizlib@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
+  integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
+  dependencies:
+    minipass "^3.0.0"
+    yallist "^4.0.0"
+
+miragejs@^0.1.43:
+  version "0.1.43"
+  resolved "https://registry.yarnpkg.com/miragejs/-/miragejs-0.1.43.tgz#47a8546b9e3489f806073e681f380ccfe13d757d"
+  integrity sha512-BhkyxssOZ2i4JqRjWpRnUQu9AFAKHyft8dJbqsg/N64+gCn2vw6vRteMpTKXllLjCPOA9Os8PhGRVXlXs4Ojhw==
+  dependencies:
+    "@miragejs/pretender-node-polyfill" "^0.1.0"
+    inflected "^2.0.4"
+    lodash.assign "^4.2.0"
+    lodash.camelcase "^4.3.0"
+    lodash.clonedeep "^4.5.0"
+    lodash.compact "^3.0.1"
+    lodash.find "^4.6.0"
+    lodash.flatten "^4.4.0"
+    lodash.forin "^4.4.0"
+    lodash.get "^4.4.2"
+    lodash.has "^4.5.2"
+    lodash.invokemap "^4.6.0"
+    lodash.isempty "^4.4.0"
+    lodash.isequal "^4.5.0"
+    lodash.isfunction "^3.0.9"
+    lodash.isinteger "^4.0.4"
+    lodash.isplainobject "^4.0.6"
+    lodash.lowerfirst "^4.3.1"
+    lodash.map "^4.6.0"
+    lodash.mapvalues "^4.6.0"
+    lodash.pick "^4.4.0"
+    lodash.snakecase "^4.1.1"
+    lodash.uniq "^4.5.0"
+    lodash.uniqby "^4.7.0"
+    lodash.values "^4.3.0"
+    pretender "^3.4.7"
+
+mississippi@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
+  integrity sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==
+  dependencies:
+    concat-stream "^1.5.0"
+    duplexify "^3.4.2"
+    end-of-stream "^1.1.0"
+    flush-write-stream "^1.0.0"
+    from2 "^2.1.0"
+    parallel-transform "^1.1.0"
+    pump "^3.0.0"
+    pumpify "^1.3.3"
+    stream-each "^1.1.0"
+    through2 "^2.0.0"
+
+mixin-deep@^1.2.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
+  integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
+  dependencies:
+    for-in "^1.0.2"
+    is-extendable "^1.0.1"
+
+mkdirp@^0.3.5:
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.5.tgz#de3e5f8961c88c787ee1368df849ac4413eca8d7"
+  integrity sha1-3j5fiWHIjHh+4TaN+EmsRBPsqNc=
+
+mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@~0.5.1:
+  version "0.5.5"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
+  integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
+  dependencies:
+    minimist "^1.2.5"
+
+mkdirp@^1.0.3, mkdirp@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
+  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
+
+mktemp@~0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/mktemp/-/mktemp-0.4.0.tgz#6d0515611c8a8c84e484aa2000129b98e981ff0b"
+  integrity sha1-bQUVYRyKjITkhKogABKbmOmB/ws=
+
+morgan@^1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.10.0.tgz#091778abc1fc47cd3509824653dae1faab6b17d7"
+  integrity sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==
+  dependencies:
+    basic-auth "~2.0.1"
+    debug "2.6.9"
+    depd "~2.0.0"
+    on-finished "~2.3.0"
+    on-headers "~1.0.2"
+
+mout@^1.0.0:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/mout/-/mout-1.2.2.tgz#c9b718a499806a0632cede178e80f436259e777d"
+  integrity sha512-w0OUxFEla6z3d7sVpMZGBCpQvYh8PHS1wZ6Wu9GNKHMpAHWJ0if0LsQZh3DlOqw55HlhJEOMLpFnwtxp99Y5GA==
+
+move-concurrently@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
+  integrity sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=
+  dependencies:
+    aproba "^1.1.1"
+    copy-concurrently "^1.0.0"
+    fs-write-stream-atomic "^1.0.8"
+    mkdirp "^0.5.1"
+    rimraf "^2.5.4"
+    run-queue "^1.0.3"
+
+mr-dep-walk@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/mr-dep-walk/-/mr-dep-walk-1.4.0.tgz#c8cd4223ceb10544ac7a4dd405c08451a328e054"
+  integrity sha512-UaDUqkLsd0ep3jAx2+A7BIpfw8wKxhthDj3yPNLBnevipK1CUFJJiz24jRVLw18q7R2aEiRq13WwUBlnwfbQqQ==
+  dependencies:
+    acorn "^5.1.1"
+    amd-name-resolver "^0.0.6"
+    fs-extra "^3.0.1"
+
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
+
+ms@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
+  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
+
+ms@2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
+ms@^2.1.1:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
+
+mustache@^3.0.0:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/mustache/-/mustache-3.2.1.tgz#89e78a9d207d78f2799b1e95764a25bf71a28322"
+  integrity sha512-RERvMFdLpaFfSRIEe632yDm5nsd0SDKn8hGmcUwswnyiE5mtdZLDybtHAz6hjJhawokF0hXvGLtx9mrQfm6FkA==
+
+mute-stream@0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
+  integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
+
+mute-stream@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
+  integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
+
+nan@^2.12.1, nan@^2.13.2:
+  version "2.14.2"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19"
+  integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==
+
+nanoid@^3.3.4:
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab"
+  integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==
+
+nanomatch@^1.2.9:
+  version "1.2.13"
+  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
+  integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    fragment-cache "^0.2.1"
+    is-windows "^1.0.2"
+    kind-of "^6.0.2"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+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=
+
+negotiator@0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
+  integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
+
+neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1, neo-async@^2.6.2:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
+  integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
+
+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==
+
+nise@^1.5.2:
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/nise/-/nise-1.5.3.tgz#9d2cfe37d44f57317766c6e9408a359c5d3ac1f7"
+  integrity sha512-Ymbac/94xeIrMf59REBPOv0thr+CJVFMhrlAkW/gjCIE58BGQdCj0x7KRCb3yz+Ga2Rz3E9XXSvUyyxqqhjQAQ==
+  dependencies:
+    "@sinonjs/formatio" "^3.2.1"
+    "@sinonjs/text-encoding" "^0.7.1"
+    just-extend "^4.0.2"
+    lolex "^5.0.1"
+    path-to-regexp "^1.7.0"
+
+no-case@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d"
+  integrity sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==
+  dependencies:
+    lower-case "^2.0.2"
+    tslib "^2.0.3"
+
+node-fetch@^2.6.0:
+  version "2.6.6"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.6.tgz#1751a7c01834e8e1697758732e9efb6eeadfaf89"
+  integrity sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA==
+  dependencies:
+    whatwg-url "^5.0.0"
+
+node-fetch@^2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
+  integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
+
+node-gyp@^7.1.0:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-7.1.2.tgz#21a810aebb187120251c3bcec979af1587b188ae"
+  integrity sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==
+  dependencies:
+    env-paths "^2.2.0"
+    glob "^7.1.4"
+    graceful-fs "^4.2.3"
+    nopt "^5.0.0"
+    npmlog "^4.1.2"
+    request "^2.88.2"
+    rimraf "^3.0.2"
+    semver "^7.3.2"
+    tar "^6.0.2"
+    which "^2.0.2"
+
+node-int64@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
+  integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=
+
+node-libs-browser@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425"
+  integrity sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==
+  dependencies:
+    assert "^1.1.1"
+    browserify-zlib "^0.2.0"
+    buffer "^4.3.0"
+    console-browserify "^1.1.0"
+    constants-browserify "^1.0.0"
+    crypto-browserify "^3.11.0"
+    domain-browser "^1.1.1"
+    events "^3.0.0"
+    https-browserify "^1.0.0"
+    os-browserify "^0.3.0"
+    path-browserify "0.0.1"
+    process "^0.11.10"
+    punycode "^1.2.4"
+    querystring-es3 "^0.2.0"
+    readable-stream "^2.3.3"
+    stream-browserify "^2.0.1"
+    stream-http "^2.7.2"
+    string_decoder "^1.0.0"
+    timers-browserify "^2.0.4"
+    tty-browserify "0.0.0"
+    url "^0.11.0"
+    util "^0.11.0"
+    vm-browserify "^1.0.1"
+
+node-modules-path@^1.0.0, node-modules-path@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/node-modules-path/-/node-modules-path-1.0.2.tgz#e3acede9b7baf4bc336e3496b58e5b40d517056e"
+  integrity sha512-6Gbjq+d7uhkO7epaKi5DNgUJn7H0gEyA4Jg0Mo1uQOi3Rk50G83LtmhhFyw0LxnAFhtlspkiiw52ISP13qzcBg==
+
+node-notifier@^8.0.1, node-notifier@^9.0.1:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.2.tgz#f3167a38ef0d2c8a866a83e318c1ba0efeb702c5"
+  integrity sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg==
+  dependencies:
+    growly "^1.3.0"
+    is-wsl "^2.2.0"
+    semver "^7.3.2"
+    shellwords "^0.1.1"
+    uuid "^8.3.0"
+    which "^2.0.2"
+
+node-releases@^1.1.71, node-releases@^1.1.77:
+  version "1.1.77"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.77.tgz#50b0cfede855dd374e7585bf228ff34e57c1c32e"
+  integrity sha512-rB1DUFUNAN4Gn9keO2K1efO35IDK7yKHCdCaIMvFO7yUYmmZYeDjnGKle26G4rwj+LKRQpjyUUvMkPglwGCYNQ==
+
+node-releases@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5"
+  integrity sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==
+
+node-releases@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.2.tgz#7139fe71e2f4f11b47d4d2986aaf8c48699e0c01"
+  integrity sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg==
+
+node-releases@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.5.tgz#280ed5bc3eba0d96ce44897d8aee478bfb3d9666"
+  integrity sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q==
+
+node-sass@6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-6.0.1.tgz#cad1ccd0ce63e35c7181f545d8b986f3a9a887fe"
+  integrity sha512-f+Rbqt92Ful9gX0cGtdYwjTrWAaGURgaK5rZCWOgCNyGWusFYHhbqCCBoFBeat+HKETOU02AyTxNhJV0YZf2jQ==
+  dependencies:
+    async-foreach "^0.1.3"
+    chalk "^1.1.1"
+    cross-spawn "^7.0.3"
+    gaze "^1.0.0"
+    get-stdin "^4.0.1"
+    glob "^7.0.3"
+    lodash "^4.17.15"
+    meow "^9.0.0"
+    nan "^2.13.2"
+    node-gyp "^7.1.0"
+    npmlog "^4.0.0"
+    request "^2.88.0"
+    sass-graph "2.2.5"
+    stdout-stream "^1.4.0"
+    "true-case-path" "^1.0.2"
+
+node-watch@0.7.3:
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/node-watch/-/node-watch-0.7.3.tgz#6d4db88e39c8d09d3ea61d6568d80e5975abc7ab"
+  integrity sha512-3l4E8uMPY1HdMMryPRUAl+oIHtXtyiTlIiESNSVSNxcPfzAFzeTbXFQkZfAwBbo0B1qMSG8nUABx+Gd+YrbKrQ==
+
+nomnom@^1.5.x:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/nomnom/-/nomnom-1.8.1.tgz#2151f722472ba79e50a76fc125bb8c8f2e4dc2a7"
+  integrity sha1-IVH3Ikcrp55Qp2/BJbuMjy5Nwqc=
+  dependencies:
+    chalk "~0.4.0"
+    underscore "~1.6.0"
+
+nopt@^3.0.6:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
+  integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k=
+  dependencies:
+    abbrev "1"
+
+nopt@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88"
+  integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==
+  dependencies:
+    abbrev "1"
+
+normalize-package-data@^2.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==
+  dependencies:
+    hosted-git-info "^2.1.4"
+    resolve "^1.10.0"
+    semver "2 || 3 || 4 || 5"
+    validate-npm-package-license "^3.0.1"
+
+normalize-package-data@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e"
+  integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==
+  dependencies:
+    hosted-git-info "^4.0.1"
+    is-core-module "^2.5.0"
+    semver "^7.3.4"
+    validate-npm-package-license "^3.0.1"
+
+normalize-path@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
+  dependencies:
+    remove-trailing-separator "^1.0.1"
+
+normalize-path@^3.0.0, normalize-path@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
+  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
+
+normalize-range@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
+  integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=
+
+normalize.css@4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-4.1.1.tgz#4f0b1d5a235383252b04d8566b866cc5fcad9f0c"
+  integrity sha1-TwsdWiNTgyUrBNhWa4Zsxfytnww=
+
+npm-git-info@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/npm-git-info/-/npm-git-info-1.0.3.tgz#a933c42ec321e80d3646e0d6e844afe94630e1d5"
+  integrity sha1-qTPELsMh6A02RuDW6ESv6UYw4dU=
+
+npm-package-arg@^8.1.1:
+  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-run-all@^4.1.5:
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.1.5.tgz#04476202a15ee0e2e214080861bff12a51d98fba"
+  integrity sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==
+  dependencies:
+    ansi-styles "^3.2.1"
+    chalk "^2.4.1"
+    cross-spawn "^6.0.5"
+    memorystream "^0.3.1"
+    minimatch "^3.0.4"
+    pidtree "^0.3.0"
+    read-pkg "^3.0.0"
+    shell-quote "^1.6.1"
+    string.prototype.padend "^3.0.0"
+
+npm-run-path@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
+  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
+  dependencies:
+    path-key "^2.0.0"
+
+npm-run-path@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-3.1.0.tgz#7f91be317f6a466efed3c9f2980ad8a4ee8b0fa5"
+  integrity sha512-Dbl4A/VfiVGLgQv29URL9xshU8XDY1GeLy+fsaZ1AA8JDSfjvr5P5+pzRbWqRSBxk6/DW7MIh8lTM/PaGnP2kg==
+  dependencies:
+    path-key "^3.0.0"
+
+npm-run-path@^4.0.0, npm-run-path@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
+  integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
+  dependencies:
+    path-key "^3.0.0"
+
+npmlog@^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, nth-check@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
+  integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==
+  dependencies:
+    boolbase "~1.0.0"
+
+num2fraction@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
+  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"
+  integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==
+
+oauth-sign@~0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
+  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
+
+object-assign@4.1.1, object-assign@^4.1.0, object-assign@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
+
+object-assign@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-2.1.1.tgz#43c36e5d569ff8e4816c4efa8be02d26967c18aa"
+  integrity sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=
+
+object-copy@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
+  dependencies:
+    copy-descriptor "^0.1.0"
+    define-property "^0.2.5"
+    kind-of "^3.0.3"
+
+object-hash@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.3.1.tgz#fde452098a951cb145f039bb7d455449ddc126df"
+  integrity sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==
+
+object-inspect@^1.11.0, object-inspect@^1.9.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1"
+  integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==
+
+object-keys@^1.0.12, object-keys@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
+  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
+
+object-visit@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
+  dependencies:
+    isobject "^3.0.0"
+
+object.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==
+  dependencies:
+    call-bind "^1.0.0"
+    define-properties "^1.1.3"
+    has-symbols "^1.0.1"
+    object-keys "^1.1.1"
+
+object.getownpropertydescriptors@^2.1.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz#1bd63aeacf0d5d2d2f31b5e393b03a7c601a23f7"
+  integrity sha512-WtxeKSzfBjlzL+F9b7M7hewDzMwy+C8NRssHd1YrNlzHzIDrXcXiNOMrezdAEM4UXixgV+vvnyBeN7Rygl2ttQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.18.0-next.2"
+
+object.pick@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
+  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
+  dependencies:
+    isobject "^3.0.1"
+
+object.values@^1.1.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.3.tgz#eaa8b1e17589f02f698db093f7c62ee1699742ee"
+  integrity sha512-nkF6PfDB9alkOUxpf1HNm/QlkeW3SReqL5WXeBLpEJJnlPSvRaDQpW3gQTksTN3fgJX4hL42RzKyOin6ff3tyw==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.18.0-next.2"
+    has "^1.0.3"
+
+on-finished@~2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
+  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
+  dependencies:
+    ee-first "1.1.1"
+
+on-headers@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
+  integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
+
+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=
+  dependencies:
+    wrappy "1"
+
+onetime@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
+  integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=
+  dependencies:
+    mimic-fn "^1.0.0"
+
+onetime@^5.1.0, onetime@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
+  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
+  dependencies:
+    mimic-fn "^2.1.0"
+
+optionator@^0.8.1, optionator@^0.8.2:
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
+  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
+  dependencies:
+    deep-is "~0.1.3"
+    fast-levenshtein "~2.0.6"
+    levn "~0.3.0"
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+    word-wrap "~1.2.3"
+
+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@^3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/ora/-/ora-3.4.0.tgz#bf0752491059a3ef3ed4c85097531de9fdbcd318"
+  integrity sha512-eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg==
+  dependencies:
+    chalk "^2.4.2"
+    cli-cursor "^2.1.0"
+    cli-spinners "^2.0.0"
+    log-symbols "^2.2.0"
+    strip-ansi "^5.2.0"
+    wcwidth "^1.0.1"
+
+ora@^5.4.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"
+    cli-cursor "^3.1.0"
+    cli-spinners "^2.5.0"
+    is-interactive "^1.0.0"
+    is-unicode-supported "^0.1.0"
+    log-symbols "^4.1.0"
+    strip-ansi "^6.0.0"
+    wcwidth "^1.0.1"
+
+os-browserify@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
+  integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
+
+os-homedir@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
+
+os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, 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.3:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
+  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
+  dependencies:
+    os-homedir "^1.0.0"
+    os-tmpdir "^1.0.0"
+
+p-defer@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-3.0.0.tgz#d1dceb4ee9b2b604b1d94ffec83760175d4e6f83"
+  integrity sha512-ugZxsxmtTln604yeYd29EGrNhazN2lywetzpKhfmQjW/VJmhpDmWbiX+h0zL8V91R0UXkhb3KtPmyq9PZw3aYw==
+
+p-finally@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
+
+p-finally@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-2.0.1.tgz#bd6fcaa9c559a096b680806f4d657b3f0f240561"
+  integrity sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==
+
+p-limit@^1.1.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
+  integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
+  dependencies:
+    p-try "^1.0.0"
+
+p-limit@^2.0.0, p-limit@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
+  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
+  dependencies:
+    p-try "^2.0.0"
+
+p-limit@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
+  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
+  dependencies:
+    yocto-queue "^0.1.0"
+
+p-limit@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-4.0.0.tgz#914af6544ed32bfa54670b061cafcbd04984b644"
+  integrity sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==
+  dependencies:
+    yocto-queue "^1.0.0"
+
+p-locate@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
+  integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=
+  dependencies:
+    p-limit "^1.1.0"
+
+p-locate@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
+  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
+  dependencies:
+    p-limit "^2.0.0"
+
+p-locate@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
+  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
+  dependencies:
+    p-limit "^2.2.0"
+
+p-locate@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
+  integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
+  dependencies:
+    p-limit "^3.0.2"
+
+p-locate@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-6.0.0.tgz#3da9a49d4934b901089dca3302fa65dc5a05c04f"
+  integrity sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==
+  dependencies:
+    p-limit "^4.0.0"
+
+p-map@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
+  integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
+  dependencies:
+    aggregate-error "^3.0.0"
+
+p-try@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
+  integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
+
+p-try@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
+
+pako@~1.0.5:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
+  integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==
+
+parallel-transform@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz#9049ca37d6cb2182c3b1d2c720be94d14a5814fc"
+  integrity sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==
+  dependencies:
+    cyclist "^1.0.1"
+    inherits "^2.0.3"
+    readable-stream "^2.1.5"
+
+parent-module@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
+  integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
+  dependencies:
+    callsites "^3.0.0"
+
+parse-asn1@^5.0.0, parse-asn1@^5.1.5:
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz#385080a3ec13cb62a62d39409cb3e88844cdaed4"
+  integrity sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==
+  dependencies:
+    asn1.js "^5.2.0"
+    browserify-aes "^1.0.0"
+    evp_bytestokey "^1.0.0"
+    pbkdf2 "^3.0.3"
+    safe-buffer "^5.1.1"
+
+parse-entities@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-2.0.0.tgz#53c6eb5b9314a1f4ec99fa0fdf7ce01ecda0cbe8"
+  integrity sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==
+  dependencies:
+    character-entities "^1.0.0"
+    character-entities-legacy "^1.0.0"
+    character-reference-invalid "^1.0.0"
+    is-alphanumerical "^1.0.0"
+    is-decimal "^1.0.0"
+    is-hexadecimal "^1.0.0"
+
+parse-json@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
+  integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=
+  dependencies:
+    error-ex "^1.3.1"
+    json-parse-better-errors "^1.0.1"
+
+parse-json@^5.0.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
+  integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    error-ex "^1.3.1"
+    json-parse-even-better-errors "^2.3.0"
+    lines-and-columns "^1.1.6"
+
+parse-ms@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/parse-ms/-/parse-ms-1.0.1.tgz#56346d4749d78f23430ca0c713850aef91aa361d"
+  integrity sha1-VjRtR0nXjyNDDKDHE4UK75GqNh0=
+
+parse-passwd@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
+  integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
+
+parse-static-imports@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/parse-static-imports/-/parse-static-imports-1.1.0.tgz#ae2f18f18da1a993080ae406a5219455c0bbad5d"
+  integrity sha512-HlxrZcISCblEV0lzXmAHheH/8qEkKgmqkdxyHTPbSqsTUV8GzqmN1L+SSti+VbNPfbBO3bYLPHDiUs2avbAdbA==
+
+parse5@6.0.1, parse5@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
+  integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
+
+parseqs@0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.6.tgz#8e4bb5a19d1cdc844a08ac974d34e273afa670d5"
+  integrity sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w==
+
+parseuri@0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.6.tgz#e1496e829e3ac2ff47f39a4dd044b32823c4a25a"
+  integrity sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow==
+
+parseurl@~1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
+  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
+
+pascalcase@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
+
+path-browserify@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a"
+  integrity sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==
+
+path-dirname@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
+  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
+
+path-exists@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
+
+path-exists@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
+  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
+
+path-exists@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-5.0.0.tgz#a6aad9489200b21fab31e49cf09277e5116fb9e7"
+  integrity sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==
+
+path-is-absolute@1.0.1, path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+
+path-is-inside@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
+  integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
+
+path-key@^2.0.0, path-key@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
+
+path-key@^3.0.0, path-key@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
+  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
+
+path-parse@^1.0.6, path-parse@^1.0.7:
+  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-posix@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/path-posix/-/path-posix-1.0.0.tgz#06b26113f56beab042545a23bfa88003ccac260f"
+  integrity sha1-BrJhE/Vr6rBCVFojv6iAA8ysJg8=
+
+path-root-regex@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"
+  integrity sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=
+
+path-root@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7"
+  integrity sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=
+  dependencies:
+    path-root-regex "^0.1.0"
+
+path-to-regexp@0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
+  integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
+
+path-to-regexp@^1.7.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a"
+  integrity sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==
+  dependencies:
+    isarray "0.0.1"
+
+path-type@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
+  integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
+  dependencies:
+    pify "^3.0.0"
+
+path-type@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
+  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
+
+pbkdf2@^3.0.3:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz#dd822aa0887580e52f1a039dc3eda108efae3075"
+  integrity sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==
+  dependencies:
+    create-hash "^1.1.2"
+    create-hmac "^1.1.4"
+    ripemd160 "^2.0.1"
+    safe-buffer "^5.0.1"
+    sha.js "^2.4.8"
+
+performance-now@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
+
+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==
+
+picocolors@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
+  integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
+
+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.3.tgz#465547f359ccc206d3c48e46a1bcb89bf7ee619d"
+  integrity sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==
+
+pidtree@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.3.1.tgz#ef09ac2cc0533df1f3250ccf2c4d366b0d12114a"
+  integrity sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==
+
+pify@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
+
+pify@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
+  integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
+
+pinkie-promise@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
+  dependencies:
+    pinkie "^2.0.0"
+
+pinkie@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
+
+pkg-dir@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
+  integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==
+  dependencies:
+    find-up "^3.0.0"
+
+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-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 "^2.1.0"
+
+pkg-up@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5"
+  integrity sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==
+  dependencies:
+    find-up "^3.0.0"
+
+pkijs@^2.2.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/pkijs/-/pkijs-2.2.2.tgz#d0780379a2fb80c892c3ead4bcfb42675b67a982"
+  integrity sha512-xRTEW9LgUeHBe5hRCC4EHvLbO6o3L/t8uEk8cTaSMVEjEcy2G5qJ/bY2ndvrGgZlKDThnTrM4Xlwu8Qpyr6mOg==
+  dependencies:
+    asn1js "^2.1.1"
+    bytestreamjs "^1.0.29"
+    pvutils "^1.0.17"
+
+please-upgrade-node@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942"
+  integrity sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==
+  dependencies:
+    semver-compare "^1.0.0"
+
+portfinder@^1.0.28:
+  version "1.0.28"
+  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778"
+  integrity sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==
+  dependencies:
+    async "^2.6.2"
+    debug "^3.1.1"
+    mkdirp "^0.5.5"
+
+posix-character-classes@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
+
+postcss-modules-extract-imports@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d"
+  integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==
+
+postcss-modules-local-by-default@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c"
+  integrity sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==
+  dependencies:
+    icss-utils "^5.0.0"
+    postcss-selector-parser "^6.0.2"
+    postcss-value-parser "^4.1.0"
+
+postcss-modules-scope@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz#9ef3151456d3bbfa120ca44898dfca6f2fa01f06"
+  integrity sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==
+  dependencies:
+    postcss-selector-parser "^6.0.4"
+
+postcss-modules-values@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c"
+  integrity sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==
+  dependencies:
+    icss-utils "^5.0.0"
+
+postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4:
+  version "6.0.10"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz#79b61e2c0d1bfc2602d549e11d0876256f8df88d"
+  integrity sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==
+  dependencies:
+    cssesc "^3.0.0"
+    util-deprecate "^1.0.2"
+
+postcss-value-parser@^3.2.3:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
+  integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
+
+postcss-value-parser@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
+  integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
+
+postcss@^6.0.1, postcss@^6.0.17:
+  version "6.0.23"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324"
+  integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==
+  dependencies:
+    chalk "^2.4.1"
+    source-map "^0.6.1"
+    supports-color "^5.4.0"
+
+postcss@^8.2.15:
+  version "8.4.14"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.14.tgz#ee9274d5622b4858c1007a74d76e42e56fd21caf"
+  integrity sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==
+  dependencies:
+    nanoid "^3.3.4"
+    picocolors "^1.0.0"
+    source-map-js "^1.0.2"
+
+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=
+
+pretender@^3.4.3:
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/pretender/-/pretender-3.4.3.tgz#a3b4160516007075d29127262f3a0063d19896e9"
+  integrity sha512-AlbkBly9R8KR+R0sTCJ/ToOeEoUMtt52QVCetui5zoSmeLOU3S8oobFsyPLm1O2txR6t58qDNysqPnA1vVi8Hg==
+  dependencies:
+    fake-xml-http-request "^2.1.1"
+    route-recognizer "^0.3.3"
+
+pretender@^3.4.7:
+  version "3.4.7"
+  resolved "https://registry.yarnpkg.com/pretender/-/pretender-3.4.7.tgz#34a2ae2d1fc9db440a990d50e6c0f5481d8755fc"
+  integrity sha512-jkPAvt1BfRi0RKamweJdEcnjkeu7Es8yix3bJ+KgBC5VpG/Ln4JE3hYN6vJym4qprm8Xo5adhWpm3HCoft1dOw==
+  dependencies:
+    fake-xml-http-request "^2.1.2"
+    route-recognizer "^0.3.3"
+
+prettier-eslint-cli@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/prettier-eslint-cli/-/prettier-eslint-cli-5.0.1.tgz#8478e08f9b4c51c3751dd3ae76f630658329af64"
+  integrity sha512-fzX26Q6654RN3SD4c8XDBiJyNWOFQKsMLsMiXIGgSN2xNQLmiqjXW3wnR33qMVJOo+wq86a+WjA6wov0krTvCA==
+  dependencies:
+    arrify "^2.0.1"
+    boolify "^1.0.0"
+    camelcase-keys "^6.0.0"
+    chalk "^2.4.2"
+    common-tags "^1.8.0"
+    core-js "^3.1.4"
+    eslint "^5.0.0"
+    find-up "^4.1.0"
+    get-stdin "^7.0.0"
+    glob "^7.1.4"
+    ignore "^5.1.2"
+    lodash.memoize "^4.1.2"
+    loglevel-colored-level-prefix "^1.0.0"
+    messageformat "^2.2.1"
+    prettier-eslint "^9.0.0"
+    rxjs "^6.5.2"
+    yargs "^13.2.4"
+
+prettier-eslint@^9.0.0:
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/prettier-eslint/-/prettier-eslint-9.0.2.tgz#66c7b5d2a35712a104f6b7ce31f470ea9f8cb6a6"
+  integrity sha512-u6EQqxUhaGfra9gy9shcR7MT7r/2twwEfRGy1tfzyaJvLQwSg34M9IU5HuF7FsLW2QUgr5VIUc56EPWibw1pdw==
+  dependencies:
+    "@typescript-eslint/parser" "^1.10.2"
+    common-tags "^1.4.0"
+    core-js "^3.1.4"
+    dlv "^1.1.0"
+    eslint "^5.0.0"
+    indent-string "^4.0.0"
+    lodash.merge "^4.6.0"
+    loglevel-colored-level-prefix "^1.0.0"
+    prettier "^1.7.0"
+    pretty-format "^23.0.1"
+    require-relative "^0.8.7"
+    typescript "^3.2.1"
+    vue-eslint-parser "^2.0.2"
+
+prettier-linter-helpers@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b"
+  integrity sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==
+  dependencies:
+    fast-diff "^1.1.2"
+
+prettier@2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.6.1.tgz#d472797e0d7461605c1609808e27b80c0f9cfe17"
+  integrity sha512-8UVbTBYGwN37Bs9LERmxCPjdvPxlEowx2urIL6urHzdb3SDq4B/Z6xLFCblrSnE4iKWcS6ziJ3aOYrc1kz/E2A==
+
+prettier@^1.7.0:
+  version "1.19.1"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
+  integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
+
+pretty-format@^23.0.1:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-23.6.0.tgz#5eaac8eeb6b33b987b7fe6097ea6a8a146ab5760"
+  integrity sha512-zf9NV1NSlDLDjycnwm6hpFATCGl/K1lt0R/GdkAK2O5LN/rwJoB+Mh93gGJjut4YbmecbfgLWVGSTCr0Ewvvbw==
+  dependencies:
+    ansi-regex "^3.0.0"
+    ansi-styles "^3.2.0"
+
+pretty-ms@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/pretty-ms/-/pretty-ms-3.2.0.tgz#87a8feaf27fc18414d75441467d411d6e6098a25"
+  integrity sha512-ZypexbfVUGTFxb0v+m1bUyy92DHe5SyYlnyY0msyms5zd3RwyvNgyxZZsXXgoyzlxjx5MiqtXUdhUfvQbe0A2Q==
+  dependencies:
+    parse-ms "^1.0.0"
+
+printf@^0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/printf/-/printf-0.6.1.tgz#b9afa3d3b55b7f2e8b1715272479fc756ed88650"
+  integrity sha512-is0ctgGdPJ5951KulgfzvHGwJtZ5ck8l042vRkV6jrkpBzTmb/lueTqguWHy2JfVA+RY6gFVlaZgUS0j7S/dsw==
+
+prismjs@^1.21.0:
+  version "1.23.0"
+  resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.23.0.tgz#d3b3967f7d72440690497652a9d40ff046067f33"
+  integrity sha512-c29LVsqOaLbBHuIbsTxaKENh1N2EQBOHaWv7gkHN4dgRbxSREqDnDbtFJYdpPauS4YCplMSNCABQ6Eeor69bAA==
+  optionalDependencies:
+    clipboard "^2.0.0"
+
+private@^0.1.6, private@^0.1.8:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
+  integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
+
+process-nextick-args@~2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
+  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
+
+process-relative-require@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/process-relative-require/-/process-relative-require-1.0.0.tgz#1590dfcf5b8f2983ba53e398446b68240b4cc68a"
+  integrity sha1-FZDfz1uPKYO6U+OYRGtoJAtMxoo=
+  dependencies:
+    node-modules-path "^1.0.0"
+
+process@^0.11.10:
+  version "0.11.10"
+  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
+
+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==
+
+promise-inflight@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
+  integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
+
+promise-map-series@^0.2.1:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/promise-map-series/-/promise-map-series-0.2.3.tgz#c2d377afc93253f6bd03dbb77755eb88ab20a847"
+  integrity sha1-wtN3r8kyU/a9A9u3d1XriKsgqEc=
+  dependencies:
+    rsvp "^3.0.14"
+
+promise-map-series@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/promise-map-series/-/promise-map-series-0.3.0.tgz#41873ca3652bb7a042b387d538552da9b576f8a1"
+  integrity sha512-3npG2NGhTc8BWBolLLf8l/92OxMGaRLbqvIh9wjCHhDXNvk4zsxaTaCpiCunW09qWPrN2zeNSNwRLVBrQQtutA==
+
+promise.hash.helper@^1.0.7:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/promise.hash.helper/-/promise.hash.helper-1.0.8.tgz#8c5fa0570f6f96821f52364fd72292b2c5a114f7"
+  integrity sha512-KYcnXctWUWyVD3W3Ye0ZDuA1N8Szrh85cVCxpG6xYrOk/0CttRtYCmU30nWsUch0NuExQQ63QXvzRE6FLimZmg==
+
+promise.prototype.finally@^3.1.0:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/promise.prototype.finally/-/promise.prototype.finally-3.1.3.tgz#d3186e58fcf4df1682a150f934ccc27b7893389c"
+  integrity sha512-EXRF3fC9/0gz4qkt/f5EP5iW4kj9oFpBICNpCNOb/52+8nlHIX07FPLbi/q4qYBQ1xZqivMzTpNQSnArVASolQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.19.1"
+
+proper-lockfile@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/proper-lockfile/-/proper-lockfile-4.1.2.tgz#c8b9de2af6b2f1601067f98e01ac66baa223141f"
+  integrity sha512-TjNPblN4BwAWMXU8s9AEz4JmQxnD1NNL7bNOY/AKUzyamc379FWASUhc/K1pL2noVb+XmZKLL68cjzLsiOAMaA==
+  dependencies:
+    graceful-fs "^4.2.4"
+    retry "^0.12.0"
+    signal-exit "^3.0.2"
+
+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==
+  dependencies:
+    forwarded "~0.1.2"
+    ipaddr.js "1.9.1"
+
+prr@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
+  integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
+
+psl@^1.1.28, psl@^1.1.33:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
+  integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
+
+public-encrypt@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
+  integrity sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==
+  dependencies:
+    bn.js "^4.1.0"
+    browserify-rsa "^4.0.0"
+    create-hash "^1.1.0"
+    parse-asn1 "^5.0.0"
+    randombytes "^2.0.1"
+    safe-buffer "^5.1.2"
+
+pump@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
+  integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
+pump@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
+  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
+pumpify@^1.3.3:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
+  integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==
+  dependencies:
+    duplexify "^3.6.0"
+    inherits "^2.0.3"
+    pump "^2.0.0"
+
+punycode@1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
+  integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
+
+punycode@^1.2.4:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
+
+punycode@^2.1.0, punycode@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
+
+pvutils@^1.0.17, pvutils@latest:
+  version "1.0.17"
+  resolved "https://registry.yarnpkg.com/pvutils/-/pvutils-1.0.17.tgz#ade3c74dfe7178944fe44806626bd2e249d996bf"
+  integrity sha512-wLHYUQxWaXVQvKnwIDWFVKDJku9XDCvyhhxoq8dc5MFdIlRenyPI9eSfEtcvgHgD7FlvCyGAlWgOzRnZD99GZQ==
+
+q@^1.1.2:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
+  integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
+
+qs@6.7.0, qs@^6.3.0, qs@^6.4.0, qs@~6.5.2:
+  version "6.10.1"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.1.tgz#4931482fa8d647a5aab799c5271d2133b981fb6a"
+  integrity sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==
+  dependencies:
+    side-channel "^1.0.4"
+
+querystring-es3@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
+  integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=
+
+querystring@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
+  integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
+
+queue-microtask@^1.2.2:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
+  integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
+
+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==
+
+quick-temp@^0.1.2, quick-temp@^0.1.3, quick-temp@^0.1.5, quick-temp@^0.1.8:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/quick-temp/-/quick-temp-0.1.8.tgz#bab02a242ab8fb0dd758a3c9776b32f9a5d94408"
+  integrity sha1-urAqJCq4+w3XWKPJd2sy+aXZRAg=
+  dependencies:
+    mktemp "~0.4.0"
+    rimraf "^2.5.4"
+    underscore.string "~3.3.4"
+
+qunit-dom@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/qunit-dom/-/qunit-dom-1.6.0.tgz#a4bea6a46329d221e4a317d712cb40709107b977"
+  integrity sha512-YwSqcLjQcRI0fUFpaSWwU10KIJPFW5Qh+d3cT5DOgx81dypRuUSiPkKFmBY/CDs/R1KdHRadthkcXg2rqAon8Q==
+  dependencies:
+    broccoli-funnel "^3.0.3"
+    broccoli-merge-trees "^4.2.0"
+    ember-cli-babel "^7.23.0"
+    ember-cli-version-checker "^5.1.1"
+
+qunit@^2.17.2:
+  version "2.18.0"
+  resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.18.0.tgz#5a3efc8ee609e9d8f207a1ad317a9b02bb14bc6b"
+  integrity sha512-Xw/zUm5t1JY8SNErki/qtw4fCuaaOZL+bPloZU+0kto+fO8j1JV9MQWqXO4kATfhEyJohlsKZpfg1HF7GOkpXw==
+  dependencies:
+    commander "7.2.0"
+    node-watch "0.7.3"
+    tiny-glob "0.2.9"
+
+randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
+  integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
+  dependencies:
+    safe-buffer "^5.1.0"
+
+randomfill@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
+  integrity sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==
+  dependencies:
+    randombytes "^2.0.5"
+    safe-buffer "^5.1.0"
+
+range-parser@~1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
+  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
+
+raw-body@2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332"
+  integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==
+  dependencies:
+    bytes "3.1.0"
+    http-errors "1.7.2"
+    iconv-lite "0.4.24"
+    unpipe "1.0.0"
+
+raw-body@~1.1.0:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-1.1.7.tgz#1d027c2bfa116acc6623bca8f00016572a87d425"
+  integrity sha1-HQJ8K/oRasxmI7yo8AAWVyqH1CU=
+  dependencies:
+    bytes "1"
+    string_decoder "0.10"
+
+read-pkg-up@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507"
+  integrity sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==
+  dependencies:
+    find-up "^4.1.0"
+    read-pkg "^5.2.0"
+    type-fest "^0.8.1"
+
+read-pkg@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
+  integrity sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=
+  dependencies:
+    load-json-file "^4.0.0"
+    normalize-package-data "^2.3.2"
+    path-type "^3.0.0"
+
+read-pkg@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc"
+  integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==
+  dependencies:
+    "@types/normalize-package-data" "^2.4.0"
+    normalize-package-data "^2.5.0"
+    parse-json "^5.0.0"
+    type-fest "^0.6.0"
+
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, 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==
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.3"
+    isarray "~1.0.0"
+    process-nextick-args "~2.0.0"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.1.1"
+    util-deprecate "~1.0.1"
+
+"readable-stream@2 || 3", readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
+  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
+  dependencies:
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
+
+readable-stream@~1.0.2:
+  version "1.0.34"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
+  integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "0.0.1"
+    string_decoder "~0.10.x"
+
+readdirp@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
+  integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==
+  dependencies:
+    graceful-fs "^4.1.11"
+    micromatch "^3.1.10"
+    readable-stream "^2.0.2"
+
+readdirp@~3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e"
+  integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==
+  dependencies:
+    picomatch "^2.2.1"
+
+recast@^0.18.1:
+  version "0.18.10"
+  resolved "https://registry.yarnpkg.com/recast/-/recast-0.18.10.tgz#605ebbe621511eb89b6356a7e224bff66ed91478"
+  integrity sha512-XNvYvkfdAN9QewbrxeTOjgINkdY/odTgTS56ZNEWL9Ml0weT4T3sFtvnTuF+Gxyu46ANcRm1ntrF6F5LAJPAaQ==
+  dependencies:
+    ast-types "0.13.3"
+    esprima "~4.0.0"
+    private "^0.1.8"
+    source-map "~0.6.1"
+
+redent@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f"
+  integrity sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==
+  dependencies:
+    indent-string "^4.0.0"
+    strip-indent "^3.0.0"
+
+redeyed@~1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/redeyed/-/redeyed-1.0.1.tgz#e96c193b40c0816b00aec842698e61185e55498a"
+  integrity sha1-6WwZO0DAgWsArshCaY5hGF5VSYo=
+  dependencies:
+    esprima "~3.0.0"
+
+regenerate-unicode-properties@^10.0.1:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz#7f442732aa7934a3740c779bb9b3340dccc1fb56"
+  integrity sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw==
+  dependencies:
+    regenerate "^1.4.2"
+
+regenerate-unicode-properties@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-9.0.0.tgz#54d09c7115e1f53dc2314a974b32c1c344efe326"
+  integrity sha512-3E12UeNSPfjrgwjkR81m5J7Aw/T55Tu7nUyZVQYCKEOs+2dkxEY+DpPtZzO4YruuiPb7NkYLVcyJC4+zCbk5pA==
+  dependencies:
+    regenerate "^1.4.2"
+
+regenerate@^1.2.1, regenerate@^1.4.2:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
+  integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
+
+regenerator-runtime@^0.10.5:
+  version "0.10.5"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658"
+  integrity sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=
+
+regenerator-runtime@^0.11.0:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
+  integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
+
+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.10.0:
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.10.1.tgz#1e4996837231da8b7f3cf4114d71b5691a0680dd"
+  integrity sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==
+  dependencies:
+    babel-runtime "^6.18.0"
+    babel-types "^6.19.0"
+    private "^0.1.6"
+
+regenerator-transform@^0.14.2:
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz#c98da154683671c9c4dcb16ece736517e1b7feb4"
+  integrity sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==
+  dependencies:
+    "@babel/runtime" "^7.8.4"
+
+regenerator-transform@^0.15.0:
+  version "0.15.0"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.0.tgz#cbd9ead5d77fae1a48d957cf889ad0586adb6537"
+  integrity sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==
+  dependencies:
+    "@babel/runtime" "^7.8.4"
+
+regex-not@^1.0.0, regex-not@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
+  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
+  dependencies:
+    extend-shallow "^3.0.2"
+    safe-regex "^1.1.0"
+
+regexp.prototype.flags@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26"
+  integrity sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+
+regexpp@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
+  integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
+
+regexpp@^3.0.0, regexpp@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"
+  integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==
+
+regexpu-core@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240"
+  integrity sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=
+  dependencies:
+    regenerate "^1.2.1"
+    regjsgen "^0.2.0"
+    regjsparser "^0.1.4"
+
+regexpu-core@^4.7.1:
+  version "4.8.0"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.8.0.tgz#e5605ba361b67b1718478501327502f4479a98f0"
+  integrity sha512-1F6bYsoYiz6is+oz70NWur2Vlh9KWtswuRuzJOfeYUrfPX2o8n74AnUVaOGDbUqVGO9fNHu48/pjJO4sNVwsOg==
+  dependencies:
+    regenerate "^1.4.2"
+    regenerate-unicode-properties "^9.0.0"
+    regjsgen "^0.5.2"
+    regjsparser "^0.7.0"
+    unicode-match-property-ecmascript "^2.0.0"
+    unicode-match-property-value-ecmascript "^2.0.0"
+
+regexpu-core@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.0.1.tgz#c531122a7840de743dcf9c83e923b5560323ced3"
+  integrity sha512-CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw==
+  dependencies:
+    regenerate "^1.4.2"
+    regenerate-unicode-properties "^10.0.1"
+    regjsgen "^0.6.0"
+    regjsparser "^0.8.2"
+    unicode-match-property-ecmascript "^2.0.0"
+    unicode-match-property-value-ecmascript "^2.0.0"
+
+regjsgen@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
+  integrity sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=
+
+regjsgen@^0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733"
+  integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==
+
+regjsgen@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.6.0.tgz#83414c5354afd7d6627b16af5f10f41c4e71808d"
+  integrity sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA==
+
+regjsparser@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"
+  integrity sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=
+  dependencies:
+    jsesc "~0.5.0"
+
+regjsparser@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.7.0.tgz#a6b667b54c885e18b52554cb4960ef71187e9968"
+  integrity sha512-A4pcaORqmNMDVwUjWoTzuhwMGpP+NykpfqAsEgI1FSH/EzC7lrN5TMd+kN8YCovX+jMpu8eaqXgXPCa0g8FQNQ==
+  dependencies:
+    jsesc "~0.5.0"
+
+regjsparser@^0.8.2:
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.8.4.tgz#8a14285ffcc5de78c5b95d62bbf413b6bc132d5f"
+  integrity sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA==
+  dependencies:
+    jsesc "~0.5.0"
+
+remark-footnotes@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/remark-footnotes/-/remark-footnotes-3.0.0.tgz#5756b56f8464fa7ed80dbba0c966136305d8cb8d"
+  integrity sha512-ZssAvH9FjGYlJ/PBVKdSmfyPc3Cz4rTWgZLI4iE/SX8Nt5l3o3oEjv3wwG5VD7xOjktzdwp5coac+kJV9l4jgg==
+  dependencies:
+    mdast-util-footnote "^0.1.0"
+    micromark-extension-footnote "^0.3.0"
+
+remark-frontmatter@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/remark-frontmatter/-/remark-frontmatter-3.0.0.tgz#ca5d996361765c859bd944505f377d6b186a6ec6"
+  integrity sha512-mSuDd3svCHs+2PyO29h7iijIZx4plX0fheacJcAoYAASfgzgVIcXGYSq9GFyYocFLftQs8IOmmkgtOovs6d4oA==
+  dependencies:
+    mdast-util-frontmatter "^0.2.0"
+    micromark-extension-frontmatter "^0.2.0"
+
+remark-gfm@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/remark-gfm/-/remark-gfm-1.0.0.tgz#9213643001be3f277da6256464d56fd28c3b3c0d"
+  integrity sha512-KfexHJCiqvrdBZVbQ6RopMZGwaXz6wFJEfByIuEwGf0arvITHjiKKZ1dpXujjH9KZdm1//XJQwgfnJ3lmXaDPA==
+  dependencies:
+    mdast-util-gfm "^0.1.0"
+    micromark-extension-gfm "^0.3.0"
+
+remark-parse@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-9.0.0.tgz#4d20a299665880e4f4af5d90b7c7b8a935853640"
+  integrity sha512-geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw==
+  dependencies:
+    mdast-util-from-markdown "^0.8.0"
+
+remove-trailing-separator@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
+  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
+
+repeat-element@^1.1.2:
+  version "1.1.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.0.0, 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"
+  integrity sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==
+  dependencies:
+    lodash "^4.17.19"
+
+request-promise-native@^1.0.9:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz#e407120526a5efdc9a39b28a5679bf47b9d9dc28"
+  integrity sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==
+  dependencies:
+    request-promise-core "1.1.4"
+    stealthy-require "^1.1.1"
+    tough-cookie "^2.3.3"
+
+request@^2.88.0, request@^2.88.2:
+  version "2.88.2"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
+  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.8.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.6"
+    extend "~3.0.2"
+    forever-agent "~0.6.1"
+    form-data "~2.3.2"
+    har-validator "~5.1.3"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.19"
+    oauth-sign "~0.9.0"
+    performance-now "^2.1.0"
+    qs "~6.5.2"
+    safe-buffer "^5.1.2"
+    tough-cookie "~2.5.0"
+    tunnel-agent "^0.6.0"
+    uuid "^3.3.2"
+
+require-directory@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
+
+require-from-string@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
+  integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
+
+require-main-filename@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
+  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
+
+require-relative@^0.8.7:
+  version "0.8.7"
+  resolved "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz#7999539fc9e047a37928fa196f8e1563dabd36de"
+  integrity sha1-eZlTn8ngR6N5KPoZb44VY9q9Nt4=
+
+requireindex@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/requireindex/-/requireindex-1.2.0.tgz#3463cdb22ee151902635aa6c9535d4de9c2ef1ef"
+  integrity sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww==
+
+requires-port@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
+  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
+
+reselect@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/reselect/-/reselect-3.0.1.tgz#efdaa98ea7451324d092b2b2163a6a1d7a9a2147"
+  integrity sha1-79qpjqdFEyTQkrKyFjpqHXqaIUc=
+
+reselect@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.0.0.tgz#f2529830e5d3d0e021408b246a206ef4ea4437f7"
+  integrity sha512-qUgANli03jjAyGlnbYVAV5vvnOmJnODyABz51RdBN7M4WaVu8mecZWgyQNkG8Yqe3KRGRt0l4K4B3XVEULC4CA==
+
+resolve-dir@^1.0.0, resolve-dir@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
+  integrity sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=
+  dependencies:
+    expand-tilde "^2.0.0"
+    global-modules "^1.0.0"
+
+resolve-from@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
+  integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
+
+resolve-package-path@^1.0.11, resolve-package-path@^1.2.2, resolve-package-path@^1.2.6:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/resolve-package-path/-/resolve-package-path-1.2.7.tgz#2a7bc37ad96865e239330e3102c31322847e652e"
+  integrity sha512-fVEKHGeK85bGbVFuwO9o1aU0n3vqQGrezPc51JGu9UTXpFQfWq5qCeKxyaRUSvephs+06c5j5rPq/dzHGEo8+Q==
+  dependencies:
+    path-root "^0.1.1"
+    resolve "^1.10.0"
+
+resolve-package-path@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-package-path/-/resolve-package-path-2.0.0.tgz#7f258ab86ff074fff4ff8027a28f94d17d6fb1df"
+  integrity sha512-/CLuzodHO2wyyHTzls5Qr+EFeG6RcW4u6//gjYvUfcfyuplIX1SSccU+A5A9A78Gmezkl3NBkFAMxLbzTY9TJA==
+  dependencies:
+    path-root "^0.1.1"
+    resolve "^1.13.1"
+
+resolve-package-path@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/resolve-package-path/-/resolve-package-path-3.1.0.tgz#35faaa5d54a9c7dd481eb7c4b2a44410c9c763d8"
+  integrity sha512-2oC2EjWbMJwvSN6Z7DbDfJMnD8MYEouaLn5eIX0j8XwPsYCVIyY9bbnX88YHVkbr8XHqvZrYbxaLPibfTYKZMA==
+  dependencies:
+    path-root "^0.1.1"
+    resolve "^1.17.0"
+
+resolve-package-path@^4.0.1, resolve-package-path@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/resolve-package-path/-/resolve-package-path-4.0.3.tgz#31dab6897236ea6613c72b83658d88898a9040aa"
+  integrity sha512-SRpNAPW4kewOaNUt8VPqhJ0UMxawMwzJD8V7m1cJfdSTK9ieZwS6K7Dabsm4bmLFM96Z5Y/UznrpG5kt1im8yA==
+  dependencies:
+    path-root "^0.1.1"
+
+resolve-path@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/resolve-path/-/resolve-path-1.4.0.tgz#c4bda9f5efb2fce65247873ab36bb4d834fe16f7"
+  integrity sha1-xL2p9e+y/OZSR4c6s2u02DT+Fvc=
+  dependencies:
+    http-errors "~1.6.2"
+    path-is-absolute "1.0.1"
+
+resolve-url@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
+
+resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.20.0, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1:
+  version "1.20.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
+  integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
+  dependencies:
+    is-core-module "^2.2.0"
+    path-parse "^1.0.6"
+
+resolve@^1.22.0:
+  version "1.22.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198"
+  integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==
+  dependencies:
+    is-core-module "^2.8.1"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
+
+restore-cursor@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
+  integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368=
+  dependencies:
+    onetime "^2.0.0"
+    signal-exit "^3.0.2"
+
+restore-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
+  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
+  dependencies:
+    onetime "^5.1.0"
+    signal-exit "^3.0.2"
+
+ret@~0.1.10:
+  version "0.1.15"
+  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
+
+retry@^0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
+  integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=
+
+reusify@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
+  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
+
+rimraf@2.6.3, rimraf@~2.6.2:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
+  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
+  dependencies:
+    glob "^7.1.3"
+
+rimraf@^2.2.8, rimraf@^2.3.4, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@^2.5.3, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
+  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
+  dependencies:
+    glob "^7.1.3"
+
+rimraf@^3.0.0, rimraf@^3.0.1, rimraf@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+  dependencies:
+    glob "^7.1.3"
+
+ripemd160@^2.0.0, ripemd160@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
+  integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==
+  dependencies:
+    hash-base "^3.0.0"
+    inherits "^2.0.1"
+
+rollup-pluginutils@^2.0.1, rollup-pluginutils@^2.6.0, 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@^0.57.1:
+  version "0.57.1"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.57.1.tgz#0bb28be6151d253f67cf4a00fea48fb823c74027"
+  integrity sha512-I18GBqP0qJoJC1K1osYjreqA8VAKovxuI3I81RSk0Dmr4TgloI0tAULjZaox8OsJ+n7XRrhH6i0G2By/pj1LCA==
+  dependencies:
+    "@types/acorn" "^4.0.3"
+    acorn "^5.5.3"
+    acorn-dynamic-import "^3.0.0"
+    date-time "^2.1.0"
+    is-reference "^1.1.0"
+    locate-character "^2.0.5"
+    pretty-ms "^3.1.0"
+    require-relative "^0.8.7"
+    rollup-pluginutils "^2.0.1"
+    signal-exit "^3.0.2"
+    sourcemap-codec "^1.4.1"
+
+rollup@^1.12.0:
+  version "1.32.1"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.32.1.tgz#4480e52d9d9e2ae4b46ba0d9ddeaf3163940f9c4"
+  integrity sha512-/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A==
+  dependencies:
+    "@types/estree" "*"
+    "@types/node" "*"
+    acorn "^7.1.0"
+
+rollup@^2.50.0:
+  version "2.70.1"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.70.1.tgz#824b1f1f879ea396db30b0fc3ae8d2fead93523e"
+  integrity sha512-CRYsI5EuzLbXdxC6RnYhOuRdtz4bhejPMSWjsFLfVM/7w/85n2szZv6yExqUXsBdz5KT8eoubeyDUDjhLHEslA==
+  optionalDependencies:
+    fsevents "~2.3.2"
+
+route-recognizer@^0.3.3, route-recognizer@^0.3.4:
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/route-recognizer/-/route-recognizer-0.3.4.tgz#39ab1ffbce1c59e6d2bdca416f0932611e4f3ca3"
+  integrity sha512-2+MhsfPhvauN1O8KaXpXAOfR/fwe8dnUXVM+xw7yt40lJRfPVQxV6yryZm0cgRvAj5fMF/mdRZbL2ptwbs5i2g==
+
+rsvp@^3.0.14, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.21, rsvp@^3.0.6, rsvp@^3.1.0:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a"
+  integrity sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==
+
+rsvp@^4.7.0, rsvp@^4.8.1, rsvp@^4.8.2, rsvp@^4.8.3, rsvp@^4.8.4, rsvp@^4.8.5:
+  version "4.8.5"
+  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
+  integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==
+
+rsvp@~3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.2.1.tgz#07cb4a5df25add9e826ebc67dcc9fd89db27d84a"
+  integrity sha1-B8tKXfJa3Z6Cbrxn3Mn9idsn2Eo=
+
+run-async@^2.2.0, run-async@^2.4.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
+  integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
+
+run-parallel@^1.1.9:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
+  integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==
+  dependencies:
+    queue-microtask "^1.2.2"
+
+run-queue@^1.0.0, run-queue@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
+  integrity sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=
+  dependencies:
+    aproba "^1.1.1"
+
+rw@1:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4"
+  integrity sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q=
+
+rxjs@^6.4.0, rxjs@^6.5.2, rxjs@^6.6.0, rxjs@^6.6.7:
+  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"
+
+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.0, 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==
+
+safe-json-parse@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/safe-json-parse/-/safe-json-parse-1.0.1.tgz#3e76723e38dfdda13c9b1d29a1e07ffee4b30b57"
+  integrity sha1-PnZyPjjf3aE8mx0poeB//uSzC1c=
+
+safe-regex@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
+  dependencies:
+    ret "~0.1.10"
+
+"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
+
+sane@^4.0.0, sane@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/sane/-/sane-4.1.0.tgz#ed881fd922733a6c461bc189dc2b6c006f3ffded"
+  integrity sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==
+  dependencies:
+    "@cnakazawa/watch" "^1.0.3"
+    anymatch "^2.0.0"
+    capture-exit "^2.0.0"
+    exec-sh "^0.3.2"
+    execa "^1.0.0"
+    fb-watchman "^2.0.0"
+    micromatch "^3.1.4"
+    minimist "^1.1.1"
+    walker "~1.0.5"
+
+sass-graph@2.2.5:
+  version "2.2.5"
+  resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.5.tgz#a981c87446b8319d96dce0671e487879bd24c2e8"
+  integrity sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==
+  dependencies:
+    glob "^7.0.0"
+    lodash "^4.0.0"
+    scss-tokenizer "^0.2.3"
+    yargs "^13.3.2"
+
+sass-svg-uri@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/sass-svg-uri/-/sass-svg-uri-1.0.0.tgz#01e992e4e3ce8d1ec4eac4c8280c0f2ef45c6be8"
+  integrity sha1-AemS5OPOjR7E6sTIKAwPLvRca+g=
+
+sass@^1.29.0:
+  version "1.32.12"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.12.tgz#a2a47ad0f1c168222db5206444a30c12457abb9f"
+  integrity sha512-zmXn03k3hN0KaiVTjohgkg98C3UowhL1/VSGdj4/VAAiMKGQOE80PFPxFP2Kyq0OUskPKcY5lImkhBKEHlypJA==
+  dependencies:
+    chokidar ">=3.0.0 <4.0.0"
+
+sax@~1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
+
+saxes@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d"
+  integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==
+  dependencies:
+    xmlchars "^2.2.0"
+
+schema-utils@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
+  integrity sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==
+  dependencies:
+    ajv "^6.1.0"
+    ajv-errors "^1.0.0"
+    ajv-keywords "^3.1.0"
+
+schema-utils@^2.6.5:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"
+  integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==
+  dependencies:
+    "@types/json-schema" "^7.0.5"
+    ajv "^6.12.4"
+    ajv-keywords "^3.5.2"
+
+schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1:
+  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.8"
+    ajv "^6.12.5"
+    ajv-keywords "^3.5.2"
+
+schema-utils@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7"
+  integrity sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==
+  dependencies:
+    "@types/json-schema" "^7.0.9"
+    ajv "^8.8.0"
+    ajv-formats "^2.1.1"
+    ajv-keywords "^5.0.0"
+
+scss-tokenizer@^0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"
+  integrity sha1-jrBtualyMzOCTT9VMGQRSYR85dE=
+  dependencies:
+    js-base64 "^2.1.8"
+    source-map "^0.4.2"
+
+select@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d"
+  integrity sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0=
+
+semver-compare@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
+  integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w=
+
+"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+
+semver@5.5.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
+  integrity sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==
+
+semver@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
+  integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
+
+semver@7.3.5, semver@^7.1.3, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
+  version "7.3.5"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
+  integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
+  dependencies:
+    lru-cache "^6.0.0"
+
+semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+
+send@0.17.1:
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
+  integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==
+  dependencies:
+    debug "2.6.9"
+    depd "~1.1.2"
+    destroy "~1.0.4"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    fresh "0.5.2"
+    http-errors "~1.7.2"
+    mime "1.6.0"
+    ms "2.1.1"
+    on-finished "~2.3.0"
+    range-parser "~1.2.1"
+    statuses "~1.5.0"
+
+serialize-javascript@^3.1.0, serialize-javascript@^4.0.0, serialize-javascript@^6.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-3.1.0.tgz#8bf3a9170712664ef2561b44b691eafe399214ea"
+  integrity sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==
+  dependencies:
+    randombytes "^2.1.0"
+
+serve-static@1.14.1:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
+  integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==
+  dependencies:
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    parseurl "~1.3.3"
+    send "0.17.1"
+
+set-blocking@^2.0.0, set-blocking@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
+
+set-value@^2.0.0, set-value@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
+  integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-extendable "^0.1.1"
+    is-plain-object "^2.0.3"
+    split-string "^3.0.1"
+
+setimmediate@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
+  integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
+
+setprototypeof@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
+  integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
+
+setprototypeof@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
+  integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
+
+sha.js@^2.4.0, sha.js@^2.4.8:
+  version "2.4.11"
+  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
+  integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
+  dependencies:
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+shebang-command@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
+  dependencies:
+    shebang-regex "^1.0.0"
+
+shebang-command@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
+  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
+  dependencies:
+    shebang-regex "^3.0.0"
+
+shebang-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
+
+shebang-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
+  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
+
+shell-quote@^1.6.1:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.2.tgz#67a7d02c76c9da24f99d20808fcaded0e0e04be2"
+  integrity sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==
+
+shellwords@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
+  integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
+
+side-channel@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
+  integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==
+  dependencies:
+    call-bind "^1.0.0"
+    get-intrinsic "^1.0.2"
+    object-inspect "^1.9.0"
+
+signal-exit@^3.0.0, signal-exit@^3.0.2:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af"
+  integrity sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==
+
+signal-exit@^3.0.3:
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
+  integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
+
+silent-error@^1.0.0, silent-error@^1.0.1, silent-error@^1.1.0, silent-error@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/silent-error/-/silent-error-1.1.1.tgz#f72af5b0d73682a2ba1778b7e32cd8aa7c2d8662"
+  integrity sha512-n4iEKyNcg4v6/jpb3c0/iyH2G1nzUNl7Gpqtn/mHIJK9S/q/7MCfoO4rwVOoO59qPFIc0hVHvMbiOJ0NdtxKKw==
+  dependencies:
+    debug "^2.2.0"
+
+simple-html-tokenizer@^0.5.11, simple-html-tokenizer@^0.5.8:
+  version "0.5.11"
+  resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.5.11.tgz#4c5186083c164ba22a7b477b7687ac056ad6b1d9"
+  integrity sha512-C2WEK/Z3HoSFbYq8tI7ni3eOo/NneSPRoPpcM7WdLjFOArFuyXEjAoCdOC3DgMfRyziZQ1hCNR4mrNdWEvD0og==
+
+sinon@^7.4.2:
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/sinon/-/sinon-7.5.0.tgz#e9488ea466070ea908fd44a3d6478fd4923c67ec"
+  integrity sha512-AoD0oJWerp0/rY9czP/D6hDTTUYGpObhZjMpd7Cl/A6+j0xBE+ayL/ldfggkBXUs0IkvIiM1ljM8+WkOc5k78Q==
+  dependencies:
+    "@sinonjs/commons" "^1.4.0"
+    "@sinonjs/formatio" "^3.2.1"
+    "@sinonjs/samsam" "^3.3.3"
+    diff "^3.5.0"
+    lolex "^4.2.0"
+    nise "^1.5.2"
+    supports-color "^5.5.0"
+
+slash@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
+  integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
+
+slash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
+
+slash@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7"
+  integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==
+
+slice-ansi@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
+  integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==
+  dependencies:
+    ansi-styles "^3.2.0"
+    astral-regex "^1.0.0"
+    is-fullwidth-code-point "^2.0.0"
+
+slice-ansi@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787"
+  integrity sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==
+  dependencies:
+    ansi-styles "^4.0.0"
+    astral-regex "^2.0.0"
+    is-fullwidth-code-point "^3.0.0"
+
+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"
+
+snake-case@^3.0.3:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-3.0.4.tgz#4f2bbd568e9935abdfd593f34c691dadb49c452c"
+  integrity sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==
+  dependencies:
+    dot-case "^3.0.4"
+    tslib "^2.0.3"
+
+snapdragon-node@^2.0.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
+  dependencies:
+    define-property "^1.0.0"
+    isobject "^3.0.0"
+    snapdragon-util "^3.0.1"
+
+snapdragon-util@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
+  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
+  dependencies:
+    kind-of "^3.2.0"
+
+snapdragon@^0.8.1:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
+  integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
+  dependencies:
+    base "^0.11.1"
+    debug "^2.2.0"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    map-cache "^0.2.2"
+    source-map "^0.5.6"
+    source-map-resolve "^0.5.0"
+    use "^3.1.0"
+
+socket.io-adapter@~1.1.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz#ab3f0d6f66b8fc7fca3959ab5991f82221789be9"
+  integrity sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g==
+
+socket.io-client@2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.4.0.tgz#aafb5d594a3c55a34355562fc8aea22ed9119a35"
+  integrity sha512-M6xhnKQHuuZd4Ba9vltCLT9oa+YvTsP8j9NcEiLElfIg8KeYPyhWOes6x4t+LTAC8enQbE/995AdTem2uNyKKQ==
+  dependencies:
+    backo2 "1.0.2"
+    component-bind "1.0.0"
+    component-emitter "~1.3.0"
+    debug "~3.1.0"
+    engine.io-client "~3.5.0"
+    has-binary2 "~1.0.2"
+    indexof "0.0.1"
+    parseqs "0.0.6"
+    parseuri "0.0.6"
+    socket.io-parser "~3.3.0"
+    to-array "0.1.4"
+
+socket.io-parser@~3.3.0:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.3.2.tgz#ef872009d0adcf704f2fbe830191a14752ad50b6"
+  integrity sha512-FJvDBuOALxdCI9qwRrO/Rfp9yfndRtc1jSgVgV8FDraihmSP/MLGD5PEuJrNfjALvcQ+vMDM/33AWOYP/JSjDg==
+  dependencies:
+    component-emitter "~1.3.0"
+    debug "~3.1.0"
+    isarray "2.0.1"
+
+socket.io-parser@~3.4.0:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.4.1.tgz#b06af838302975837eab2dc980037da24054d64a"
+  integrity sha512-11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A==
+  dependencies:
+    component-emitter "1.2.1"
+    debug "~4.1.0"
+    isarray "2.0.1"
+
+socket.io@^2.1.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.4.1.tgz#95ad861c9a52369d7f1a68acf0d4a1b16da451d2"
+  integrity sha512-Si18v0mMXGAqLqCVpTxBa8MGqriHGQh8ccEOhmsmNS3thNCGBwO8WGrwMibANsWtQQ5NStdZwHqZR3naJVFc3w==
+  dependencies:
+    debug "~4.1.0"
+    engine.io "~3.5.0"
+    has-binary2 "~1.0.2"
+    socket.io-adapter "~1.1.0"
+    socket.io-client "2.4.0"
+    socket.io-parser "~3.4.0"
+
+sort-object-keys@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/sort-object-keys/-/sort-object-keys-1.1.3.tgz#bff833fe85cab147b34742e45863453c1e190b45"
+  integrity sha512-855pvK+VkU7PaKYPc+Jjnmt4EzejQHyhhF33q31qG8x7maDzkeFhAAThdCYay11CISO+qAMwjOBP+fPZe0IPyg==
+
+sort-package-json@^1.49.0:
+  version "1.55.0"
+  resolved "https://registry.yarnpkg.com/sort-package-json/-/sort-package-json-1.55.0.tgz#150328328a9ac8b417b43d5a1fae74e5f27254e9"
+  integrity sha512-xhKvRD8WGbALjXQkVuk4/93Z/2NIO+5IzKamdMjN5kn3L+N+M9YWQssmM6GXlQr9v1F7PGWsOJEo1gvXOhM7Mg==
+  dependencies:
+    detect-indent "^6.0.0"
+    detect-newline "3.1.0"
+    git-hooks-list "1.0.3"
+    globby "10.0.0"
+    is-plain-obj "2.1.0"
+    sort-object-keys "^1.1.3"
+
+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-js@^1.0.1, source-map-js@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
+  integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
+
+source-map-resolve@^0.5.0:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
+  integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==
+  dependencies:
+    atob "^2.1.2"
+    decode-uri-component "^0.2.0"
+    resolve-url "^0.2.1"
+    source-map-url "^0.4.0"
+    urix "^0.1.0"
+
+source-map-support@^0.4.15:
+  version "0.4.18"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
+  integrity sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==
+  dependencies:
+    source-map "^0.5.6"
+
+source-map-support@~0.5.12, source-map-support@~0.5.19:
+  version "0.5.19"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
+  integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
+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.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.3.0.tgz#7ecaf13b57bcd09da8a40c5d269db33799d4aaf9"
+  integrity sha1-fsrxO1e80J2opAxdJp2zN5nUqvk=
+
+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"
+  integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==
+
+source-map@0.4.x, source-map@^0.4.2:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
+  integrity sha1-66T12pwNyZneaAMti092FzZSA2s=
+  dependencies:
+    amdefine ">=0.0.4"
+
+source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
+
+source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
+
+source-map@~0.1.x:
+  version "0.1.43"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
+  integrity sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=
+  dependencies:
+    amdefine ">=0.0.4"
+
+source-map@~0.7.2:
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
+  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
+
+sourcemap-codec@^1.4.1, sourcemap-codec@^1.4.4:
+  version "1.4.8"
+  resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
+  integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
+
+sourcemap-validator@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/sourcemap-validator/-/sourcemap-validator-1.1.1.tgz#3d7d8a399ccab09c1fedc510d65436e25b1c386b"
+  integrity sha512-pq6y03Vs6HUaKo9bE0aLoksAcpeOo9HZd7I8pI6O480W/zxNZ9U32GfzgtPP0Pgc/K1JHna569nAbOk3X8/Qtw==
+  dependencies:
+    jsesc "~0.3.x"
+    lodash.foreach "^4.5.0"
+    lodash.template "^4.5.0"
+    source-map "~0.1.x"
+
+spawn-args@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/spawn-args/-/spawn-args-0.2.0.tgz#fb7d0bd1d70fd4316bd9e3dec389e65f9d6361bb"
+  integrity sha1-+30L0dcP1DFr2ePew4nmX51jYbs=
+
+spdx-correct@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
+  integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==
+  dependencies:
+    spdx-expression-parse "^3.0.0"
+    spdx-license-ids "^3.0.0"
+
+spdx-exceptions@^2.1.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d"
+  integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==
+
+spdx-expression-parse@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
+  integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
+  dependencies:
+    spdx-exceptions "^2.1.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==
+
+split-string@^3.0.1, split-string@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
+  dependencies:
+    extend-shallow "^3.0.0"
+
+sprintf-js@^1.0.3:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
+  integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==
+
+sprintf-js@~1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
+
+sri-toolbox@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/sri-toolbox/-/sri-toolbox-0.2.0.tgz#a7fea5c3fde55e675cf1c8c06f3ebb5c2935835e"
+  integrity sha1-p/6lw/3lXmdc8cjAbz67XCk1g14=
+
+sshpk@^1.7.0:
+  version "1.16.1"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
+  integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
+  dependencies:
+    asn1 "~0.2.3"
+    assert-plus "^1.0.0"
+    bcrypt-pbkdf "^1.0.0"
+    dashdash "^1.12.0"
+    ecc-jsbn "~0.1.1"
+    getpass "^0.1.1"
+    jsbn "~0.1.0"
+    safer-buffer "^2.0.2"
+    tweetnacl "~0.14.0"
+
+ssri@^6.0.1:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5"
+  integrity sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==
+  dependencies:
+    figgy-pudding "^3.5.1"
+
+stable@^0.1.8:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
+  integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==
+
+stagehand@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/stagehand/-/stagehand-1.0.0.tgz#79515e2ad3a02c63f8720c7df9b6077ae14276d9"
+  integrity sha512-zrXl0QixAtSHFyN1iv04xOBgplbT4HgC8T7g+q8ESZbDNi5uZbMtxLukFVXPJ5Nl7zCYvYcrT3Mj24WYCH93hw==
+  dependencies:
+    debug "^4.1.0"
+
+static-extend@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
+  dependencies:
+    define-property "^0.2.5"
+    object-copy "^0.1.0"
+
+"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
+  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
+
+stdout-stream@^1.4.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.1.tgz#5ac174cdd5cd726104aa0c0b2bd83815d8d535de"
+  integrity sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==
+  dependencies:
+    readable-stream "^2.0.1"
+
+stealthy-require@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
+  integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
+
+stream-browserify@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"
+  integrity sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==
+  dependencies:
+    inherits "~2.0.1"
+    readable-stream "^2.0.2"
+
+stream-each@^1.1.0:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae"
+  integrity sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==
+  dependencies:
+    end-of-stream "^1.1.0"
+    stream-shift "^1.0.0"
+
+stream-http@^2.7.2:
+  version "2.8.3"
+  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc"
+  integrity sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==
+  dependencies:
+    builtin-status-codes "^3.0.0"
+    inherits "^2.0.1"
+    readable-stream "^2.3.6"
+    to-arraybuffer "^1.0.0"
+    xtend "^4.0.0"
+
+stream-shift@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
+  integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
+
+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-template@~0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
+  integrity sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=
+
+string-width@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
+  dependencies:
+    code-point-at "^1.0.0"
+    is-fullwidth-code-point "^1.0.0"
+    strip-ansi "^3.0.0"
+
+"string-width@^1.0.2 || 2", string-width@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
+  dependencies:
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^4.0.0"
+
+string-width@^3.0.0, string-width@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
+  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
+  dependencies:
+    emoji-regex "^7.0.1"
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^5.1.0"
+
+string-width@^4.1.0, string-width@^4.2.0:
+  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-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:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+string.prototype.endswith@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/string.prototype.endswith/-/string.prototype.endswith-0.2.0.tgz#a19c20dee51a98777e9a47e10f09be393b9bba75"
+  integrity sha1-oZwg3uUamHd+mkfhDwm+OTubunU=
+
+string.prototype.matchall@^4.0.5:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.6.tgz#5abb5dabc94c7b0ea2380f65ba610b3a544b15fa"
+  integrity sha512-6WgDX8HmQqvEd7J+G6VtAahhsQIssiZ8zl7zKh1VDMFyL3hRTJP4FTNA3RbIp2TOQ9AYNDcc7e3fH0Qbup+DBg==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.19.1"
+    get-intrinsic "^1.1.1"
+    has-symbols "^1.0.2"
+    internal-slot "^1.0.3"
+    regexp.prototype.flags "^1.3.1"
+    side-channel "^1.0.4"
+
+string.prototype.padend@^3.0.0:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.1.2.tgz#6858ca4f35c5268ebd5e8615e1327d55f59ee311"
+  integrity sha512-/AQFLdYvePENU3W5rgurfWSMU6n+Ww8n/3cUt7E+vPBB/D7YDG8x+qjoFs4M/alR2bW7Qg6xMjVwWUOvuQ0XpQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.18.0-next.2"
+
+string.prototype.startswith@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/string.prototype.startswith/-/string.prototype.startswith-0.2.0.tgz#da68982e353a4e9ac4a43b450a2045d1c445ae7b"
+  integrity sha1-2miYLjU6TprEpDtFCiBF0cRFrns=
+
+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.2"
+    define-properties "^1.1.3"
+
+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.2"
+    define-properties "^1.1.3"
+
+string_decoder@0.10, string_decoder@~0.10.x:
+  version "0.10.31"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+  integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
+
+string_decoder@^1.0.0, string_decoder@^1.1.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
+  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
+  dependencies:
+    safe-buffer "~5.2.0"
+
+string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+  dependencies:
+    safe-buffer "~5.1.0"
+
+stringify-object@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629"
+  integrity sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==
+  dependencies:
+    get-own-enumerable-property-symbols "^3.0.0"
+    is-obj "^1.0.1"
+    is-regexp "^1.0.0"
+
+strip-ansi@^3.0.0, strip-ansi@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
+  dependencies:
+    ansi-regex "^2.0.0"
+
+strip-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
+  dependencies:
+    ansi-regex "^3.0.0"
+
+strip-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"
+  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
+  dependencies:
+    ansi-regex "^4.1.0"
+
+strip-ansi@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
+  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
+  dependencies:
+    ansi-regex "^5.0.0"
+
+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:
+    ansi-regex "^5.0.1"
+
+strip-ansi@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.1.1.tgz#39e8a98d044d150660abe4a6808acf70bb7bc991"
+  integrity sha1-OeipjQRNFQZgq+SmgIrPcLt7yZE=
+
+strip-bom@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
+
+strip-bom@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"
+  integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==
+
+strip-eof@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
+  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
+
+strip-final-newline@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
+  integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
+
+strip-indent@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001"
+  integrity sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==
+  dependencies:
+    min-indent "^1.0.0"
+
+strip-json-comments@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
+
+strip-json-comments@^3.1.0, 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==
+
+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"
+
+styled_string@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/styled_string/-/styled_string-0.0.1.tgz#d22782bd81295459bc4f1df18c4bad8e94dd124a"
+  integrity sha1-0ieCvYEpVFm8Tx3xjEutjpTdEko=
+
+sum-up@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/sum-up/-/sum-up-1.0.3.tgz#1c661f667057f63bcb7875aa1438bc162525156e"
+  integrity sha1-HGYfZnBX9jvLeHWqFDi8FiUlFW4=
+  dependencies:
+    chalk "^1.0.0"
+
+supports-color@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
+
+supports-color@^5.3.0, supports-color@^5.4.0, supports-color@^5.5.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
+  dependencies:
+    has-flag "^3.0.0"
+
+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"
+
+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:
+    has-flag "^4.0.0"
+
+supports-preserve-symlinks-flag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
+  integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
+
+svgo@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.3.0.tgz#bae51ba95ded9a33a36b7c46ce9c359ae9154313"
+  integrity sha512-MLfUA6O+qauLDbym+mMZgtXCGRfIxyQoeH6IKVcFslyODEe/ElJNwr0FohQ3xG4C6HK6bk3KYPPXwHVJk3V5NQ==
+  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.33"
+    csso "^3.5.1"
+    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"
+
+swagger-ui-dist@^3.36.2:
+  version "3.48.0"
+  resolved "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-3.48.0.tgz#3d23194d86ec1e76b926a345578c290ef3fc6e98"
+  integrity sha512-UgpKIQW5RAb4nYRG8B615blmQzct0DNuvtX4904Fe2aMWAVfWeKHKl4kwzFXuBJgr2WYWTwM1PnhZ+qqkLrpPg==
+
+symbol-tree@^3.2.4:
+  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==
+
+symlink-or-copy@^1.0.0, symlink-or-copy@^1.0.1, symlink-or-copy@^1.1.8, symlink-or-copy@^1.2.0, symlink-or-copy@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/symlink-or-copy/-/symlink-or-copy-1.3.1.tgz#9506dd64d8e98fa21dcbf4018d1eab23e77f71fe"
+  integrity sha512-0K91MEXFpBUaywiwSSkmKjnGcasG/rVBXFLJz5DrgGabpYD6N+3yZrfD6uUIfpuTu65DZLHi7N8CizHc07BPZA==
+
+sync-disk-cache@^1.3.3:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/sync-disk-cache/-/sync-disk-cache-1.3.4.tgz#53a2c5a09d8f4bb53160bce182a456ad71574024"
+  integrity sha512-GlkGeM81GPPEKz/lH7QUTbvqLq7K/IUTuaKDSMulP9XQ42glqNJIN/RKgSOw4y8vxL1gOVvj+W7ruEO4s36eCw==
+  dependencies:
+    debug "^2.1.3"
+    heimdalljs "^0.2.3"
+    mkdirp "^0.5.0"
+    rimraf "^2.2.8"
+    username-sync "^1.0.2"
+
+sync-disk-cache@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/sync-disk-cache/-/sync-disk-cache-2.1.0.tgz#01e879edc41c34a01fcdda5b39d47dd496e154a6"
+  integrity sha512-vngT2JmkSapgq0z7uIoYtB9kWOOzMihAAYq/D3Pjm/ODOGMgS4r++B+OZ09U4hWR6EaOdy9eqQ7/8ygbH3wehA==
+  dependencies:
+    debug "^4.1.1"
+    heimdalljs "^0.2.6"
+    mkdirp "^0.5.0"
+    rimraf "^3.0.0"
+    username-sync "^1.0.2"
+
+table@^5.2.3:
+  version "5.4.6"
+  resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e"
+  integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==
+  dependencies:
+    ajv "^6.10.2"
+    lodash "^4.17.14"
+    slice-ansi "^2.1.0"
+    string-width "^3.0.0"
+
+table@^6.0.9:
+  version "6.7.3"
+  resolved "https://registry.yarnpkg.com/table/-/table-6.7.3.tgz#255388439715a738391bd2ee4cbca89a4d05a9b7"
+  integrity sha512-5DkIxeA7XERBqMwJq0aHZOdMadBx4e6eDoFRuyT5VR82J0Ycg2DwM6GfA/EQAhJ+toRTaS1lIdSQCqgrmhPnlw==
+  dependencies:
+    ajv "^8.0.1"
+    lodash.truncate "^4.4.2"
+    slice-ansi "^4.0.0"
+    string-width "^4.2.3"
+    strip-ansi "^6.0.1"
+
+tap-parser@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/tap-parser/-/tap-parser-7.0.0.tgz#54db35302fda2c2ccc21954ad3be22b2cba42721"
+  integrity sha512-05G8/LrzqOOFvZhhAk32wsGiPZ1lfUrl+iV7+OkKgfofZxiceZWMHkKmow71YsyVQ8IvGBP2EjcIjE5gL4l5lA==
+  dependencies:
+    events-to-array "^1.0.1"
+    js-yaml "^3.2.7"
+    minipass "^2.2.0"
+
+tapable@^1.0.0, tapable@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
+  integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
+
+tapable@^2.1.1, tapable@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
+  integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
+
+tar@^6.0.2:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.0.tgz#d1724e9bcc04b977b18d5c573b333a2207229a83"
+  integrity sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==
+  dependencies:
+    chownr "^2.0.0"
+    fs-minipass "^2.0.0"
+    minipass "^3.0.0"
+    minizlib "^2.1.1"
+    mkdirp "^1.0.3"
+    yallist "^4.0.0"
+
+temp@0.9.4:
+  version "0.9.4"
+  resolved "https://registry.yarnpkg.com/temp/-/temp-0.9.4.tgz#cd20a8580cb63635d0e4e9d4bd989d44286e7620"
+  integrity sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA==
+  dependencies:
+    mkdirp "^0.5.1"
+    rimraf "~2.6.2"
+
+terser-webpack-plugin@^1.4.3:
+  version "1.4.5"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz#a217aefaea330e734ffacb6120ec1fa312d6040b"
+  integrity sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==
+  dependencies:
+    cacache "^12.0.2"
+    find-cache-dir "^2.1.0"
+    is-wsl "^1.1.0"
+    schema-utils "^1.0.0"
+    serialize-javascript "^4.0.0"
+    source-map "^0.6.1"
+    terser "^4.1.2"
+    webpack-sources "^1.4.0"
+    worker-farm "^1.7.0"
+
+terser-webpack-plugin@^5.1.3:
+  version "5.3.3"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.3.tgz#8033db876dd5875487213e87c627bca323e5ed90"
+  integrity sha512-Fx60G5HNYknNTNQnzQ1VePRuu89ZVYWfjRAeT5rITuCY/1b08s49e5kSQwHDirKZWuoKOBRFS98EUUoZ9kLEwQ==
+  dependencies:
+    "@jridgewell/trace-mapping" "^0.3.7"
+    jest-worker "^27.4.5"
+    schema-utils "^3.1.1"
+    serialize-javascript "^6.0.0"
+    terser "^5.7.2"
+
+terser@^4.1.2, terser@^4.3.9:
+  version "4.8.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
+  integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==
+  dependencies:
+    commander "^2.20.0"
+    source-map "~0.6.1"
+    source-map-support "~0.5.12"
+
+terser@^5.3.0:
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.7.0.tgz#a761eeec206bc87b605ab13029876ead938ae693"
+  integrity sha512-HP5/9hp2UaZt5fYkuhNBR8YyRcT8juw8+uFbAme53iN9hblvKnLUTKkmwJG6ocWpIKf8UK4DoeWG4ty0J6S6/g==
+  dependencies:
+    commander "^2.20.0"
+    source-map "~0.7.2"
+    source-map-support "~0.5.19"
+
+terser@^5.7.2:
+  version "5.14.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.14.0.tgz#eefeec9af5153f55798180ee2617f390bdd285e2"
+  integrity sha512-JC6qfIEkPBd9j1SMO3Pfn+A6w2kQV54tv+ABQLgZr7dA3k/DL/OBoYSWxzVpZev3J+bUHXfr55L8Mox7AaNo6g==
+  dependencies:
+    "@jridgewell/source-map" "^0.3.2"
+    acorn "^8.5.0"
+    commander "^2.20.0"
+    source-map-support "~0.5.20"
+
+testem@^3.2.0:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/testem/-/testem-3.4.1.tgz#9b30c96001d08e590827a96fec1adb5df81792f8"
+  integrity sha512-UhKbTAb8JF6xRoDXd0AL0wl+Rpmio6KN7q+Xv7O9fcuioAqOQQVCNyxkYrJaihUPRKGr/r8ZKtSGe/Gdkm3uGQ==
+  dependencies:
+    backbone "^1.1.2"
+    bluebird "^3.4.6"
+    charm "^1.0.0"
+    commander "^2.6.0"
+    compression "^1.7.4"
+    consolidate "^0.15.1"
+    execa "^1.0.0"
+    express "^4.10.7"
+    fireworm "^0.7.0"
+    glob "^7.0.4"
+    http-proxy "^1.13.1"
+    js-yaml "^3.2.5"
+    lodash.assignin "^4.1.0"
+    lodash.castarray "^4.4.0"
+    lodash.clonedeep "^4.4.1"
+    lodash.find "^4.5.1"
+    lodash.uniqby "^4.7.0"
+    mkdirp "^0.5.1"
+    mustache "^3.0.0"
+    node-notifier "^9.0.1"
+    npmlog "^4.0.0"
+    printf "^0.6.1"
+    rimraf "^2.4.4"
+    socket.io "^2.1.0"
+    spawn-args "^0.2.0"
+    styled_string "0.0.1"
+    tap-parser "^7.0.0"
+    tmp "0.0.33"
+    xmldom "^0.6.0"
+
+tether@^1.4.0:
+  version "1.4.7"
+  resolved "https://registry.yarnpkg.com/tether/-/tether-1.4.7.tgz#d56a818590d8fe72e387f77a67f93ab96d8e1fb2"
+  integrity sha512-Z0J1aExjoFU8pybVkQAo/vD2wfSO63r+XOPfWQMC5qtf1bI7IWqNk4MiyBcgvvnY8kqnY06dVdvwTK2S3PU/Fw==
+
+text-encoder-lite@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/text-encoder-lite/-/text-encoder-lite-2.0.0.tgz#3c865dd6f3720b279c9e370f8f36c831d2cee175"
+  integrity sha512-bo08ND8LlBwPeU23EluRUcO3p2Rsb/eN5EIfOVqfRmblNDEVKK5IzM9Qfidvo+odT0hhV8mpXQcP/M5MMzABXw==
+
+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=
+
+"textextensions@1 || 2", textextensions@^2.5.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/textextensions/-/textextensions-2.6.0.tgz#d7e4ab13fe54e32e08873be40d51b74229b00fc4"
+  integrity sha512-49WtAWS+tcsy93dRt6P0P3AMD2m5PvXRhuEA0kaXos5ZLlujtYmpmFsB+QvWUSxE1ZsstmYXfQ7L40+EcQgpAQ==
+
+through2@^2.0.0:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
+  integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
+  dependencies:
+    readable-stream "~2.3.6"
+    xtend "~4.0.1"
+
+through2@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.2.tgz#99f88931cfc761ec7678b41d5d7336b5b6a07bf4"
+  integrity sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==
+  dependencies:
+    inherits "^2.0.4"
+    readable-stream "2 || 3"
+
+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=
+
+time-zone@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/time-zone/-/time-zone-1.0.0.tgz#99c5bf55958966af6d06d83bdf3800dc82faec5d"
+  integrity sha1-mcW/VZWJZq9tBtg73zgA3IL67F0=
+
+timers-browserify@^2.0.4:
+  version "2.0.12"
+  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.12.tgz#44a45c11fbf407f34f97bccd1577c652361b00ee"
+  integrity sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==
+  dependencies:
+    setimmediate "^1.0.4"
+
+tiny-emitter@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423"
+  integrity sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==
+
+tiny-glob@0.2.9:
+  version "0.2.9"
+  resolved "https://registry.yarnpkg.com/tiny-glob/-/tiny-glob-0.2.9.tgz#2212d441ac17928033b110f8b3640683129d31e2"
+  integrity sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg==
+  dependencies:
+    globalyzer "0.1.0"
+    globrex "^0.1.2"
+
+tiny-lr@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/tiny-lr/-/tiny-lr-2.0.0.tgz#863659d7ce1ed201a117d8197d7f8b9a27bdc085"
+  integrity sha512-f6nh0VMRvhGx4KCeK1lQ/jaL0Zdb5WdR+Jk8q9OSUQnaSDxAEGH1fgqLZ+cMl5EW3F2MGnCsalBO1IsnnogW1Q==
+  dependencies:
+    body "^5.1.0"
+    debug "^3.1.0"
+    faye-websocket "^0.11.3"
+    livereload-js "^3.3.1"
+    object-assign "^4.1.0"
+    qs "^6.4.0"
+
+tmp@0.0.28:
+  version "0.0.28"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.28.tgz#172735b7f614ea7af39664fa84cf0de4e515d120"
+  integrity sha1-Fyc1t/YU6nrzlmT6hM8N5OUV0SA=
+  dependencies:
+    os-tmpdir "~1.0.1"
+
+tmp@0.0.33, tmp@^0.0.33:
+  version "0.0.33"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
+  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
+  dependencies:
+    os-tmpdir "~1.0.2"
+
+tmp@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.1.0.tgz#ee434a4e22543082e294ba6201dcc6eafefa2877"
+  integrity sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==
+  dependencies:
+    rimraf "^2.6.3"
+
+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"
+
+tmpl@1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
+  integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==
+
+to-array@0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"
+  integrity sha1-F+bBH3PdTz10zaek/zI46a2b+JA=
+
+to-arraybuffer@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
+  integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
+
+to-fast-properties@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
+  integrity sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=
+
+to-fast-properties@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
+  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
+
+to-object-path@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
+  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
+  dependencies:
+    kind-of "^3.0.2"
+
+to-regex-range@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
+  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
+  dependencies:
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+
+to-regex-range@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+  dependencies:
+    is-number "^7.0.0"
+
+to-regex@^3.0.1, to-regex@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
+  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
+  dependencies:
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    regex-not "^1.0.2"
+    safe-regex "^1.1.0"
+
+toidentifier@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
+  integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
+
+tough-cookie@^2.3.3, tough-cookie@~2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
+  dependencies:
+    psl "^1.1.28"
+    punycode "^2.1.1"
+
+tough-cookie@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4"
+  integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==
+  dependencies:
+    psl "^1.1.33"
+    punycode "^2.1.1"
+    universalify "^0.1.2"
+
+tr46@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.0.2.tgz#03273586def1595ae08fedb38d7733cee91d2479"
+  integrity sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==
+  dependencies:
+    punycode "^2.1.1"
+
+tr46@~0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
+  integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
+
+traverse@^0.6.6:
+  version "0.6.6"
+  resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.6.6.tgz#cbdf560fd7b9af632502fed40f918c157ea97137"
+  integrity sha512-kdf4JKs8lbARxWdp7RKdNzoJBhGUcIalSYibuGyHJbmk40pOysQ0+QPvlkCOICOivDWU2IJo2rkrxyTK2AH4fw==
+
+tree-sync@^1.2.2:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/tree-sync/-/tree-sync-1.4.0.tgz#314598d13abaf752547d9335b8f95d9a137100d6"
+  integrity sha512-YvYllqh3qrR5TAYZZTXdspnIhlKAYezPYw11ntmweoceu4VK+keN356phHRIIo1d+RDmLpHZrUlmxga2gc9kSQ==
+  dependencies:
+    debug "^2.2.0"
+    fs-tree-diff "^0.5.6"
+    mkdirp "^0.5.1"
+    quick-temp "^0.1.5"
+    walk-sync "^0.3.3"
+
+tree-sync@^2.0.0, tree-sync@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/tree-sync/-/tree-sync-2.1.0.tgz#31cbbd41f2936f5390b61e8c9d7cb27e75a212fe"
+  integrity sha512-OLWW+Nd99NOM53aZ8ilT/YpEiOo6mXD3F4/wLbARqybSZ3Jb8IxHK5UGVbZaae0wtXAyQshVV+SeqVBik+Fbmw==
+  dependencies:
+    debug "^4.1.1"
+    fs-tree-diff "^2.0.1"
+    mkdirp "^0.5.5"
+    quick-temp "^0.1.5"
+    walk-sync "^0.3.3"
+
+trim-newlines@^3.0.0:
+  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-right@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
+  integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
+
+trim@^0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/trim/-/trim-0.0.3.tgz#05243a47a3a4113e6b49367880a9cca59697a20b"
+  integrity sha512-h82ywcYhHK7veeelXrCScdH7HkWfbIT1D/CgYO+nmDarz3SGNssVBMws6jU16Ga60AJCRAvPV6w6RLuNerQqjg==
+
+trough@^1.0.0:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406"
+  integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==
+
+"true-case-path@^1.0.2":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.3.tgz#f813b5a8c86b40da59606722b144e3225799f47d"
+  integrity sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==
+  dependencies:
+    glob "^7.1.2"
+
+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.3:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz#fb2c475977e35e241311ede2693cee1ec6698f5c"
+  integrity sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==
+
+tslib@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
+  integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
+
+tty-browserify@0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
+  integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=
+
+tunnel-agent@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
+  dependencies:
+    safe-buffer "^5.0.1"
+
+tweetnacl@^0.14.3, tweetnacl@~0.14.0:
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
+
+type-check@^0.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"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
+  dependencies:
+    prelude-ls "~1.1.2"
+
+type-detect@4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
+  integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
+
+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"
+  integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==
+
+type-fest@^0.8.1:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
+  integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
+
+type-is@~1.6.17, type-is@~1.6.18:
+  version "1.6.18"
+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
+  integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
+  dependencies:
+    media-typer "0.3.0"
+    mime-types "~2.1.24"
+
+typedarray-to-buffer@^3.1.5:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
+  integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==
+  dependencies:
+    is-typedarray "^1.0.0"
+
+typedarray@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
+
+typescript-memoize@^1.0.0-alpha.3, typescript-memoize@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/typescript-memoize/-/typescript-memoize-1.1.0.tgz#4a8f512d06fc995167c703a3592219901db8bc79"
+  integrity sha512-LQPKVXK8QrBBkL/zclE6YgSWn0I8ew5m0Lf+XL00IwMhlotqRLlzHV+BRrljVQIc+NohUAuQP7mg4HQwrx5Xbg==
+
+typescript@^3.2.1:
+  version "3.9.9"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.9.tgz#e69905c54bc0681d0518bd4d587cc6f2d0b1a674"
+  integrity sha512-kdMjTiekY+z/ubJCATUPlRDl39vXYiMV9iyeMuEuXZh2we6zz80uovNN2WlAxmmdE/Z/YQe+EbOEXB5RHEED3w==
+
+uc.micro@^1.0.1, uc.micro@^1.0.5:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
+  integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==
+
+uglify-js@^3.1.4:
+  version "3.14.3"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.14.3.tgz#c0f25dfea1e8e5323eccf59610be08b6043c15cf"
+  integrity sha512-mic3aOdiq01DuSVx0TseaEzMIVqebMZ0Z3vaeDhFEh9bsc24hV1TFvN74reA2vs08D0ZWfNjAcJ3UbVLaBss+g==
+
+unbox-primitive@^1.0.0, 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"
+
+underscore.string@^3.2.2, underscore.string@~3.3.4:
+  version "3.3.5"
+  resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.3.5.tgz#fc2ad255b8bd309e239cbc5816fd23a9b7ea4023"
+  integrity sha512-g+dpmgn+XBneLmXXo+sGlW5xQEt4ErkS3mgeN2GFbremYeMBSJKr9Wf2KJplQVaiPY/f7FN6atosWYNm9ovrYg==
+  dependencies:
+    sprintf-js "^1.0.3"
+    util-deprecate "^1.0.2"
+
+underscore@>=1.8.3, underscore@^1.12.1, underscore@^1.13.2, underscore@~1.6.0:
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.1.tgz#0c1c6bd2df54b6b69f2314066d65b6cde6fcf9d1"
+  integrity sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==
+
+unicode-canonical-property-names-ecmascript@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"
+  integrity sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==
+
+unicode-match-property-ecmascript@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3"
+  integrity sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==
+  dependencies:
+    unicode-canonical-property-names-ecmascript "^2.0.0"
+    unicode-property-aliases-ecmascript "^2.0.0"
+
+unicode-match-property-value-ecmascript@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz#1a01aa57247c14c568b89775a54938788189a714"
+  integrity sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==
+
+unicode-property-aliases-ecmascript@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz#0a36cb9a585c4f6abd51ad1deddb285c165297c8"
+  integrity sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==
+
+unified@^9.2.2:
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/unified/-/unified-9.2.2.tgz#67649a1abfc3ab85d2969502902775eb03146975"
+  integrity sha512-Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ==
+  dependencies:
+    bail "^1.0.0"
+    extend "^3.0.0"
+    is-buffer "^2.0.0"
+    is-plain-obj "^2.0.0"
+    trough "^1.0.0"
+    vfile "^4.0.0"
+
+union-value@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
+  integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==
+  dependencies:
+    arr-union "^3.1.0"
+    get-value "^2.0.6"
+    is-extendable "^0.1.1"
+    set-value "^2.0.1"
+
+unique-filename@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
+  integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
+  dependencies:
+    unique-slug "^2.0.0"
+
+unique-slug@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c"
+  integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==
+  dependencies:
+    imurmurhash "^0.1.4"
+
+unique-string@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d"
+  integrity sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==
+  dependencies:
+    crypto-random-string "^2.0.0"
+
+unist-util-is@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-4.1.0.tgz#976e5f462a7a5de73d94b706bac1b90671b57797"
+  integrity sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==
+
+unist-util-stringify-position@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz#cce3bfa1cdf85ba7375d1d5b17bdc4cada9bd9da"
+  integrity sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==
+  dependencies:
+    "@types/unist" "^2.0.2"
+
+unist-util-visit-parents@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz#65a6ce698f78a6b0f56aa0e88f13801886cdaef6"
+  integrity sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    unist-util-is "^4.0.0"
+
+universalify@^0.1.0, universalify@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
+
+universalify@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
+  integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
+
+unpipe@1.0.0, unpipe@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
+  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
+
+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"
+  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
+  dependencies:
+    has-value "^0.3.1"
+    isobject "^3.0.0"
+
+untildify@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/untildify/-/untildify-2.1.0.tgz#17eb2807987f76952e9c0485fc311d06a826a2e0"
+  integrity sha1-F+soB5h/dpUunASF/DEdBqgmouA=
+  dependencies:
+    os-homedir "^1.0.0"
+
+upath@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
+  integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
+
+upath@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/upath/-/upath-2.0.1.tgz#50c73dea68d6f6b990f51d279ce6081665d61a8b"
+  integrity sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w==
+
+update-section@^0.3.3:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/update-section/-/update-section-0.3.3.tgz#458f17820d37820dc60e20b86d94391b00123158"
+  integrity sha512-BpRZMZpgXLuTiKeiu7kK0nIPwGdyrqrs6EDSaXtjD/aQ2T+qVo9a5hRC3HN3iJjCMxNT/VxoLGQ7E/OzE5ucnw==
+
+uri-js@^4.2.2:
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
+  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
+  dependencies:
+    punycode "^2.1.0"
+
+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@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
+  integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=
+  dependencies:
+    punycode "1.3.2"
+    querystring "0.2.0"
+
+use@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
+  integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
+
+username-sync@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/username-sync/-/username-sync-1.0.3.tgz#ae41c5c8a4c8c2ecc1443a7d0742742bd7e36732"
+  integrity sha512-m/7/FSqjJNAzF2La448c/aEom0gJy7HY7Y509h6l0ePvEkFictAGptwWaj1msWJ38JbfEDOUoE8kqFee9EHKdA==
+
+util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+
+util.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"
+
+util@0.10.3:
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
+  integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk=
+  dependencies:
+    inherits "2.0.1"
+
+util@^0.11.0:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz#3236733720ec64bb27f6e26f421aaa2e1b588d61"
+  integrity sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==
+  dependencies:
+    inherits "2.0.3"
+
+utils-merge@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
+  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
+
+uuid@^3.3.2:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
+
+uuid@^8.3.0, uuid@^8.3.2:
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
+  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
+
+uuid@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5"
+  integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==
+
+v8-compile-cache@^2.0.3, v8-compile-cache@^2.3.0:
+  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==
+
+validate-npm-package-license@^3.0.1:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
+  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
+  dependencies:
+    spdx-correct "^3.0.0"
+    spdx-expression-parse "^3.0.0"
+
+validate-npm-package-name@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e"
+  integrity sha1-X6kS2B630MdK/BQN5zF/DKffQ34=
+  dependencies:
+    builtins "^1.0.3"
+
+validate-peer-dependencies@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/validate-peer-dependencies/-/validate-peer-dependencies-1.2.0.tgz#22aab93c514f4fda457d36c80685e8b1160d2036"
+  integrity sha512-nd2HUpKc6RWblPZQ2GDuI65sxJ2n/UqZwSBVtj64xlWjMx0m7ZB2m9b2JS3v1f+n9VWH/dd1CMhkHfP6pIdckA==
+  dependencies:
+    resolve-package-path "^3.1.0"
+    semver "^7.3.2"
+
+vary@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
+  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
+
+verror@1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
+  dependencies:
+    assert-plus "^1.0.0"
+    core-util-is "1.0.2"
+    extsprintf "^1.2.0"
+
+vfile-message@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.4.tgz#5b43b88171d409eae58477d13f23dd41d52c371a"
+  integrity sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    unist-util-stringify-position "^2.0.0"
+
+vfile@^4.0.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/vfile/-/vfile-4.2.1.tgz#03f1dce28fc625c625bc6514350fbdb00fa9e624"
+  integrity sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    is-buffer "^2.0.0"
+    unist-util-stringify-position "^2.0.0"
+    vfile-message "^2.0.0"
+
+vm-browserify@^1.0.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
+  integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
+
+vue-eslint-parser@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-2.0.3.tgz#c268c96c6d94cfe3d938a5f7593959b0ca3360d1"
+  integrity sha512-ZezcU71Owm84xVF6gfurBQUGg8WQ+WZGxgDEQu1IHFBZNx7BFZg3L1yHxrCBNNwbwFtE1GuvfJKMtb6Xuwc/Bw==
+  dependencies:
+    debug "^3.1.0"
+    eslint-scope "^3.7.1"
+    eslint-visitor-keys "^1.0.0"
+    espree "^3.5.2"
+    esquery "^1.0.0"
+    lodash "^4.17.4"
+
+w3c-hr-time@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd"
+  integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==
+  dependencies:
+    browser-process-hrtime "^1.0.0"
+
+w3c-xmlserializer@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz#3e7104a05b75146cc60f564380b7f683acf1020a"
+  integrity sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==
+  dependencies:
+    xml-name-validator "^3.0.0"
+
+walk-sync@^0.2.5:
+  version "0.2.7"
+  resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-0.2.7.tgz#b49be4ee6867657aeb736978b56a29d10fa39969"
+  integrity sha1-tJvk7mhnZXrrc2l4tWop0Q+jmWk=
+  dependencies:
+    ensure-posix-path "^1.0.0"
+    matcher-collection "^1.0.0"
+
+walk-sync@^0.3.0, walk-sync@^0.3.1, walk-sync@^0.3.2, walk-sync@^0.3.3:
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-0.3.4.tgz#cf78486cc567d3a96b5b2237c6108017a5ffb9a4"
+  integrity sha512-ttGcuHA/OBnN2pcM6johpYlEms7XpO5/fyKIr48541xXedan4roO8cS1Q2S/zbbjGH/BarYDAMeS2Mi9HE5Tig==
+  dependencies:
+    ensure-posix-path "^1.0.0"
+    matcher-collection "^1.0.0"
+
+walk-sync@^1.0.0, walk-sync@^1.1.3:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-1.1.4.tgz#81049f3d8095479b49574cfa5f558d7a252b127d"
+  integrity sha512-nowc9thB/Jg0KW4TgxoRjLLYRPvl3DB/98S89r4ZcJqq2B0alNcKDh6pzLkBSkPMzRSMsJghJHQi79qw0YWEkA==
+  dependencies:
+    "@types/minimatch" "^3.0.3"
+    ensure-posix-path "^1.1.0"
+    matcher-collection "^1.1.1"
+
+walk-sync@^2.0.0, walk-sync@^2.0.2, walk-sync@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-2.2.0.tgz#80786b0657fcc8c0e1c0b1a042a09eae2966387a"
+  integrity sha512-IC8sL7aB4/ZgFcGI2T1LczZeFWZ06b3zoHH7jBPyHxOtIIz1jppWHjjEXkOFvFojBVAK9pV7g47xOZ4LW3QLfg==
+  dependencies:
+    "@types/minimatch" "^3.0.3"
+    ensure-posix-path "^1.1.0"
+    matcher-collection "^2.0.0"
+    minimatch "^3.0.4"
+
+walk-sync@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-3.0.0.tgz#67f882925021e20569a1edd560b8da31da8d171c"
+  integrity sha512-41TvKmDGVpm2iuH7o+DAOt06yyu/cSHpX3uzAwetzASvlNtVddgIjXIb2DfB/Wa20B1Jo86+1Dv1CraSU7hWdw==
+  dependencies:
+    "@types/minimatch" "^3.0.4"
+    ensure-posix-path "^1.1.0"
+    matcher-collection "^2.0.1"
+    minimatch "^3.0.4"
+
+walker@~1.0.5:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f"
+  integrity sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==
+  dependencies:
+    makeerror "1.0.12"
+
+watch-detector@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/watch-detector/-/watch-detector-0.1.0.tgz#e37b410d149e2a8bf263a4f8b71e2f667633dbf8"
+  integrity sha512-vfzMMfpjQc88xjETwl2HuE6PjEuxCBeyC4bQmqrHrofdfYWi/4mEJklYbNgSzpqM9PxubsiPIrE5SZ1FDyiQ2w==
+  dependencies:
+    heimdalljs-logger "^0.1.9"
+    quick-temp "^0.1.8"
+    rsvp "^4.7.0"
+    semver "^5.4.1"
+    silent-error "^1.1.0"
+
+watch-detector@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/watch-detector/-/watch-detector-1.0.0.tgz#c7b722d8695fee9ab6071e0f38f258e6adb22609"
+  integrity sha512-siywMl3fXK30Tlpu/dUBHhlpxhQmHdguZ8OIb813eU9lrVmmsJa9k0+n1HtJ+7p3SzFCPq2XbmR3GUYpPC3TBA==
+  dependencies:
+    heimdalljs-logger "^0.1.10"
+    semver "^6.3.0"
+    silent-error "^1.1.1"
+    tmp "^0.1.0"
+
+watchpack-chokidar2@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz#38500072ee6ece66f3769936950ea1771be1c957"
+  integrity sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==
+  dependencies:
+    chokidar "^2.1.8"
+
+watchpack@^1.7.4:
+  version "1.7.5"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.5.tgz#1267e6c55e0b9b5be44c2023aed5437a2c26c453"
+  integrity sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==
+  dependencies:
+    graceful-fs "^4.1.2"
+    neo-async "^2.5.0"
+  optionalDependencies:
+    chokidar "^3.4.1"
+    watchpack-chokidar2 "^2.0.1"
+
+watchpack@^2.3.1:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d"
+  integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==
+  dependencies:
+    glob-to-regexp "^0.4.1"
+    graceful-fs "^4.1.2"
+
+wcwidth@^1.0.0, wcwidth@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
+  integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=
+  dependencies:
+    defaults "^1.0.3"
+
+webidl-conversions@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
+  integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=
+
+webidl-conversions@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff"
+  integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==
+
+webidl-conversions@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
+  integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
+
+webpack-sources@^1.4.0, webpack-sources@^1.4.1:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933"
+  integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==
+  dependencies:
+    source-list-map "^2.0.0"
+    source-map "~0.6.1"
+
+webpack-sources@^3.2.3:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
+  integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
+
+webpack@5.73.0:
+  version "5.73.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.73.0.tgz#bbd17738f8a53ee5760ea2f59dce7f3431d35d38"
+  integrity sha512-svjudQRPPa0YiOYa2lM/Gacw0r6PvxptHj4FuEKQ2kX05ZLkjbVc5MnPs6its5j7IZljnIqSVo/OsY2X0IpHGA==
+  dependencies:
+    "@types/eslint-scope" "^3.7.3"
+    "@types/estree" "^0.0.51"
+    "@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.9.3"
+    es-module-lexer "^0.9.0"
+    eslint-scope "5.1.1"
+    events "^3.2.0"
+    glob-to-regexp "^0.4.1"
+    graceful-fs "^4.2.9"
+    json-parse-even-better-errors "^2.3.1"
+    loader-runner "^4.2.0"
+    mime-types "^2.1.27"
+    neo-async "^2.6.2"
+    schema-utils "^3.1.0"
+    tapable "^2.1.1"
+    terser-webpack-plugin "^5.1.3"
+    watchpack "^2.3.1"
+    webpack-sources "^3.2.3"
+
+webpack@^4.43.0:
+  version "4.46.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.46.0.tgz#bf9b4404ea20a073605e0a011d188d77cb6ad542"
+  integrity sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==
+  dependencies:
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-module-context" "1.9.0"
+    "@webassemblyjs/wasm-edit" "1.9.0"
+    "@webassemblyjs/wasm-parser" "1.9.0"
+    acorn "^6.4.1"
+    ajv "^6.10.2"
+    ajv-keywords "^3.4.1"
+    chrome-trace-event "^1.0.2"
+    enhanced-resolve "^4.5.0"
+    eslint-scope "^4.0.3"
+    json-parse-better-errors "^1.0.2"
+    loader-runner "^2.4.0"
+    loader-utils "^1.2.3"
+    memory-fs "^0.4.1"
+    micromatch "^3.1.10"
+    mkdirp "^0.5.3"
+    neo-async "^2.6.1"
+    node-libs-browser "^2.2.1"
+    schema-utils "^1.0.0"
+    tapable "^1.1.3"
+    terser-webpack-plugin "^1.4.3"
+    watchpack "^1.7.4"
+    webpack-sources "^1.4.1"
+
+websocket-driver@>=0.5.1:
+  version "0.7.4"
+  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760"
+  integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==
+  dependencies:
+    http-parser-js ">=0.5.1"
+    safe-buffer ">=5.1.0"
+    websocket-extensions ">=0.1.1"
+
+websocket-extensions@>=0.1.1:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
+  integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
+
+whatwg-encoding@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0"
+  integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==
+  dependencies:
+    iconv-lite "0.4.24"
+
+whatwg-fetch@^3.6.2:
+  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.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
+  integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
+
+whatwg-url@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
+  integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0=
+  dependencies:
+    tr46 "~0.0.3"
+    webidl-conversions "^3.0.0"
+
+whatwg-url@^8.0.0, whatwg-url@^8.5.0:
+  version "8.5.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.5.0.tgz#7752b8464fc0903fec89aa9846fc9efe07351fd3"
+  integrity sha512-fy+R77xWv0AiqfLl4nuGUlQ3/6b5uNfQ4WAbGQVMYshCTCCPK9psC1nWh3XHuxGVCtlcDDQPQW1csmmIQo+fwg==
+  dependencies:
+    lodash "^4.7.0"
+    tr46 "^2.0.2"
+    webidl-conversions "^6.1.0"
+
+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"
+  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
+
+which@^1.2.14, which@^1.2.9:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
+  dependencies:
+    isexe "^2.0.0"
+
+which@^2.0.1, which@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
+  dependencies:
+    isexe "^2.0.0"
+
+wide-align@^1.1.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
+  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
+  dependencies:
+    string-width "^1.0.2 || 2"
+
+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==
+
+wordwrap@^0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
+  integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
+
+wordwrap@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+  integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
+
+worker-farm@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8"
+  integrity sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==
+  dependencies:
+    errno "~0.1.7"
+
+workerpool@^2.3.0:
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-2.3.4.tgz#661335ded59a08c01ca009e30cc96929a7b4b0aa"
+  integrity sha512-c2EWrgB9IKHi1jbf4LG9sxKgHYOY+Ej5li6siEGtFecCXWG7eQOqATPEJ0rg1KFETXROEkErc1t5XiNrLG666Q==
+  dependencies:
+    object-assign "4.1.1"
+
+workerpool@^3.1.1:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-3.1.2.tgz#b34e79243647decb174b7481ab5b351dc565c426"
+  integrity sha512-WJFA0dGqIK7qj7xPTqciWBH5DlJQzoPjsANvc3Y4hNB0SScT+Emjvt0jPPkDBUjBNngX1q9hHgt1Gfwytu6pug==
+  dependencies:
+    "@babel/core" "^7.3.4"
+    object-assign "4.1.1"
+    rsvp "^4.8.4"
+
+workerpool@^5.0.1:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-5.0.4.tgz#4f67cb70ff7550a27ab94de25b0b843cd92059a2"
+  integrity sha512-Sywova24Ow2NQ24JPB68bI89EdqMDjUXo4OpofK/QMD7C2ZVMloYBgQ5J3PChcBJHj2vspsmGx1/3nBKXtUkXQ==
+
+workerpool@^6.0.0:
+  version "6.1.4"
+  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.1.4.tgz#6a972b6df82e38d50248ee2820aa98e2d0ad3090"
+  integrity sha512-jGWPzsUqzkow8HoAvqaPWTUPCrlPJaJ5tY8Iz7n1uCz3tTp6s3CDG0FF1NsX42WNlkRSW6Mr+CDZGnNoSsKa7g==
+
+workerpool@^6.1.4:
+  version "6.1.5"
+  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.1.5.tgz#0f7cf076b6215fd7e1da903ff6f22ddd1886b581"
+  integrity sha512-XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw==
+
+workerpool@^6.1.5:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.0.tgz#827d93c9ba23ee2019c3ffaff5c27fccea289e8b"
+  integrity sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A==
+
+wrap-ansi@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
+  integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==
+  dependencies:
+    ansi-styles "^3.2.0"
+    string-width "^3.0.0"
+    strip-ansi "^5.0.0"
+
+wrap-ansi@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
+  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
+wrap-legacy-hbs-plugin-if-needed@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/wrap-legacy-hbs-plugin-if-needed/-/wrap-legacy-hbs-plugin-if-needed-1.0.1.tgz#6683eb74747f33e7caea54bb2ed85106ef9006b4"
+  integrity sha512-aJjXe5WwrY0u0dcUgKW3m2SGnxosJ66LLm/QaG0YMHqgA6+J2xwAFZfhSLsQ2BmO5x8PTH+OIxoAXuGz3qBA7A==
+  dependencies:
+    "@glimmer/reference" "^0.42.1"
+    "@glimmer/runtime" "^0.42.1"
+    "@glimmer/syntax" "^0.42.1"
+    "@simple-dom/interface" "^1.4.0"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+
+write-file-atomic@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
+  integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==
+  dependencies:
+    imurmurhash "^0.1.4"
+    is-typedarray "^1.0.0"
+    signal-exit "^3.0.2"
+    typedarray-to-buffer "^3.1.5"
+
+write@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3"
+  integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==
+  dependencies:
+    mkdirp "^0.5.1"
+
+ws@^7.4.4, ws@~7.4.2:
+  version "7.4.5"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz#a484dd851e9beb6fdb420027e3885e8ce48986c1"
+  integrity sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==
+
+xdg-basedir@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13"
+  integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==
+
+xml-name-validator@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
+  integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
+
+xmlchars@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
+  integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
+
+xmldom@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.6.0.tgz#43a96ecb8beece991cef382c08397d82d4d0c46f"
+  integrity sha512-iAcin401y58LckRZ0TkI4k0VSM1Qg0KGSc3i8rU+xrxe19A/BN1zHyVSJY7uoutVlaTSzYyk/v5AmkewAP7jtg==
+
+xmlhttprequest-ssl@^1.6.2, xmlhttprequest-ssl@~1.5.4:
+  version "1.6.3"
+  resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.6.3.tgz#03b713873b01659dfa2c1c5d056065b27ddc2de6"
+  integrity sha512-3XfeQE/wNkvrIktn2Kf0869fC0BN6UpydVasGIeSm2B1Llihf7/0UfZM+eCkOw3P7bP4+qPgqhm7ZoxuJtFU0Q==
+
+xstate@^3.3.3:
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/xstate/-/xstate-3.3.3.tgz#64177cd4473d4c2424b3df7d2434d835404b09a9"
+  integrity sha512-p0ZYDPWxZZZRAJyD3jaGO9/MYioHuxZp6sjcLhPfBZHAprl4EDrZRGDqRVH9VvK8oa6Nrbpf+U5eNmn8KFwO3g==
+
+xtend@^4.0.0, 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==
+
+y18n@^4.0.0:
+  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.8"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
+  integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
+
+yallist@^3.0.0, yallist@^3.0.2:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
+  integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
+
+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==
+
+yam@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/yam/-/yam-1.0.0.tgz#7f6c91dc0f5de75a031e6da6b3907c3d25ab0de5"
+  integrity sha512-Hv9xxHtsJ9228wNhk03xnlDReUuWVvHwM4rIbjdAXYvHLs17xjuyF50N6XXFMN6N0omBaqgOok/MCK3At9fTAg==
+  dependencies:
+    fs-extra "^4.0.2"
+    lodash.merge "^4.6.0"
+
+yaml@^1.10.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"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
+  integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
+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-parser@^21.0.0:
+  version "21.0.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.1.tgz#0267f286c877a4f0f728fceb6f8a3e4cb95c6e35"
+  integrity sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==
+
+yargs@^13.2.4, yargs@^13.3.2:
+  version "13.3.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
+  integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==
+  dependencies:
+    cliui "^5.0.0"
+    find-up "^3.0.0"
+    get-caller-file "^2.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^3.0.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^13.1.2"
+
+yargs@^17.3.1:
+  version "17.4.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.4.0.tgz#9fc9efc96bd3aa2c1240446af28499f0e7593d00"
+  integrity sha512-WJudfrk81yWFSOkZYpAZx4Nt7V4xp7S/uJkX0CnxovMCt1wCE8LNftPpNuF9X/u9gN5nsD7ycYtRcDf2pL3UiA==
+  dependencies:
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.3"
+    y18n "^5.0.5"
+    yargs-parser "^21.0.0"
+
+yeast@0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
+  integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk=
+
+yocto-queue@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
+  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
+
+yocto-queue@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.0.0.tgz#7f816433fb2cbc511ec8bf7d263c3b58a1a3c251"
+  integrity sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==
+
+zwitch@^1.0.0:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-1.0.5.tgz#d11d7381ffed16b742f6af7b3f223d5cd9fe9920"
+  integrity sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==
diff --git a/vault/acl.go b/vault/acl.go
index 87685ba6d3d69..e5694c29bce2a 100644
--- a/vault/acl.go
+++ b/vault/acl.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -723,9 +720,7 @@ func (c *Core) performPolicyChecks(ctx context.Context, acl *ACL, te *logical.To
 		if !ret.ACLResults.Allowed {
 			return ret
 		}
-		// Since HelpOperation was fast-pathed inside AllowOperation, RootPrivs will not have been populated in this
-		// case, so we need to special-case that here as well, or we'll block HelpOperation on all sudo-protected paths.
-		if !ret.RootPrivs && opts.RootPrivsRequired && req.Operation != logical.HelpOperation {
+		if !ret.RootPrivs && opts.RootPrivsRequired {
 			return ret
 		}
 	}
diff --git a/vault/acl_test.go b/vault/acl_test.go
index bf61f0501bafa..2466a1bd9aca7 100644
--- a/vault/acl_test.go
+++ b/vault/acl_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/acl_util.go b/vault/acl_util.go
index 4ae90fc5e09d5..e05b15018b2ae 100644
--- a/vault/acl_util.go
+++ b/vault/acl_util.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !enterprise
 
 package vault
diff --git a/vault/acme_billing_system_view.go b/vault/acme_billing_system_view.go
deleted file mode 100644
index 9b8658c2d3c38..0000000000000
--- a/vault/acme_billing_system_view.go
+++ /dev/null
@@ -1,143 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package vault
-
-import (
-	"context"
-	"crypto/sha256"
-	"encoding/base64"
-	"fmt"
-	"sort"
-	"strings"
-	"time"
-
-	"github.com/hashicorp/vault/sdk/logical"
-
-	"github.com/hashicorp/go-kms-wrapping/entropy/v2"
-)
-
-// See comment in command/format.go
-const hopeDelim = "♨"
-
-// Modifying this constant will result in previous activities not being
-// associated with future activities of this same type. A storage
-// migration would need to occur to fix this.
-//
-// Suggested naming precedence: <plugin name>-<client type>. Since this
-// comes from the builtin PKI plugin, and we're counting ACME certificates,
-// this becomes pki-acme.
-const ACMEActivityType = "pki-acme"
-
-// acmeBillingImpl is the (single) implementation of the actual client
-// counting interface. It needs a reference to core (as per discussions
-// with Mike, in the future the activityLog reference will no longer be
-// static but may be replaced throughout the lifecycle of a core instance)
-// and a reference to the mount that is being counted.
-type acmeBillingImpl struct {
-	core  *Core
-	entry *MountEntry
-}
-
-var _ logical.ACMEBillingSystemView = (*acmeBillingImpl)(nil)
-
-// Due to unfortunate layering of system view interfaces, there are three
-// possible sets of interfaces we need to layer with this ACME interface:
-//
-// 1. Everything: a managed key system view, an entropy sourcer, and an
-//    extended system view.
-// 2. Managed keys without an entropy sourcer.
-// 3. Just extended system view.
-//
-// Unfortunately, just using acmeBillingSystemViewImpl is not sufficient:
-// because of the embedded interfaces, even when these are nil, the
-// implementation will claim to support these interfaces, (thus, their cast
-// being accepted by the toolchain), but when the caller goes to use the new
-// value, they are hit with a nil panic.
-//
-// This is unfortunate.
-//
-// To avoid this, we create three possible implementations and use the lowest
-// common denominator of the caller of NewAcmeBillingSystemView(...) to assume
-// it is _just_ an extendedSystemView implementation.
-
-// Scenario 1 above.
-type acmeBillingSystemViewImpl struct {
-	extendedSystemView
-	logical.ManagedKeySystemView
-	entropy.Sourcer
-	acmeBillingImpl
-}
-
-var (
-	_ logical.ACMEBillingSystemView = (*acmeBillingSystemViewImpl)(nil)
-	_ extendedSystemView            = (*acmeBillingSystemViewImpl)(nil)
-	_ logical.ManagedKeySystemView  = (*acmeBillingSystemViewImpl)(nil)
-	_ entropy.Sourcer               = (*acmeBillingSystemViewImpl)(nil)
-)
-
-// Scenario 2 above.
-type acmeBillingSystemViewImplNoSourcer struct {
-	extendedSystemView
-	logical.ManagedKeySystemView
-	acmeBillingImpl
-}
-
-var (
-	_ logical.ACMEBillingSystemView = (*acmeBillingSystemViewImplNoSourcer)(nil)
-	_ extendedSystemView            = (*acmeBillingSystemViewImplNoSourcer)(nil)
-	_ logical.ManagedKeySystemView  = (*acmeBillingSystemViewImplNoSourcer)(nil)
-)
-
-// Scenario 3 above.
-type acmeBillingSystemViewImplNoManagedKeys struct {
-	extendedSystemView
-	acmeBillingImpl
-}
-
-var (
-	_ logical.ACMEBillingSystemView = (*acmeBillingSystemViewImplNoManagedKeys)(nil)
-	_ extendedSystemView            = (*acmeBillingSystemViewImplNoManagedKeys)(nil)
-)
-
-// NewAcmeBillingSystemView creates the appropriate implementation based on
-// the passed arguments, mapping them to the above scenarios. We further
-// restrict sysView to have a dynamicSystemView implementation, to get the
-// mount entry out of.
-func (c *Core) NewAcmeBillingSystemView(sysView interface{}) extendedSystemView {
-	es := sysView.(extendedSystemViewImpl)
-	des := es.dynamicSystemView
-
-	// Scenario 3.
-	return &acmeBillingSystemViewImplNoManagedKeys{
-		extendedSystemView: es,
-		acmeBillingImpl: acmeBillingImpl{
-			core:  c,
-			entry: des.mountEntry,
-		},
-	}
-}
-
-func (a *acmeBillingImpl) CreateActivityCountEventForIdentifiers(ctx context.Context, identifiers []string) error {
-	// Fake our clientID from the identifiers, but ensure it is
-	// independent of ordering.
-	//
-	// TODO: Because of prefixing currently handled by AddActivityToFragment,
-	// we do not need to ensure it is globally unique.
-	sort.Strings(identifiers)
-	joinedIdentifiers := "[" + strings.Join(identifiers, "]"+hopeDelim+"[") + "]"
-	identifiersHash := sha256.Sum256([]byte(joinedIdentifiers))
-	clientID := base64.RawURLEncoding.EncodeToString(identifiersHash[:])
-
-	// Log so users can correlate ACME requests to client count tokens.
-	a.core.activityLogLock.RLock()
-	activityLog := a.core.activityLog
-	a.core.activityLogLock.RUnlock()
-	if activityLog == nil {
-		return nil
-	}
-	activityLog.logger.Debug(fmt.Sprintf("Handling ACME client count event for [%v] -> %v", identifiers, clientID))
-	activityLog.AddActivityToFragment(clientID, a.entry.NamespaceID, time.Now().Unix(), ACMEActivityType, a.entry.Accessor)
-
-	return nil
-}
diff --git a/vault/activity/activity_log.pb.go b/vault/activity/activity_log.pb.go
index 9e0e01b3568fc..3fe3f2facacd0 100644
--- a/vault/activity/activity_log.pb.go
+++ b/vault/activity/activity_log.pb.go
@@ -1,10 +1,7 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc        v3.21.5
 // source: vault/activity/activity_log.proto
 
 package activity
@@ -42,9 +39,6 @@ type EntityRecord struct {
 	// MountAccessor is the auth mount accessor of the token used to perform the
 	// activity.
 	MountAccessor string `protobuf:"bytes,5,opt,name=mount_accessor,json=mountAccessor,proto3" json:"mount_accessor,omitempty"`
-	// client_type identifies the source of the entity record (entity,
-	// non-entity, acme, etc.)
-	ClientType string `protobuf:"bytes,6,opt,name=client_type,json=clientType,proto3" json:"client_type,omitempty"`
 }
 
 func (x *EntityRecord) Reset() {
@@ -114,13 +108,6 @@ func (x *EntityRecord) GetMountAccessor() string {
 	return ""
 }
 
-func (x *EntityRecord) GetClientType() string {
-	if x != nil {
-		return x.ClientType
-	}
-	return ""
-}
-
 type LogFragment struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -328,7 +315,7 @@ var File_vault_activity_activity_log_proto protoreflect.FileDescriptor
 var file_vault_activity_activity_log_proto_rawDesc = []byte{
 	0x0a, 0x21, 0x76, 0x61, 0x75, 0x6c, 0x74, 0x2f, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79,
 	0x2f, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x5f, 0x6c, 0x6f, 0x67, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x12, 0x08, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x22, 0xd3, 0x01,
+	0x6f, 0x74, 0x6f, 0x12, 0x08, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x22, 0xb2, 0x01,
 	0x0a, 0x0c, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x1b,
 	0x0a, 0x09, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
 	0x09, 0x52, 0x08, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x21, 0x0a, 0x0c, 0x6e,
@@ -340,46 +327,44 @@ var file_vault_activity_activity_log_proto_rawDesc = []byte{
 	0x52, 0x09, 0x6e, 0x6f, 0x6e, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x12, 0x25, 0x0a, 0x0e, 0x6d,
 	0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6f, 0x72, 0x18, 0x05, 0x20,
 	0x01, 0x28, 0x09, 0x52, 0x0d, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73,
-	0x6f, 0x72, 0x12, 0x1f, 0x0a, 0x0b, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x79, 0x70,
-	0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x54,
-	0x79, 0x70, 0x65, 0x22, 0x86, 0x02, 0x0a, 0x0b, 0x4c, 0x6f, 0x67, 0x46, 0x72, 0x61, 0x67, 0x6d,
-	0x65, 0x6e, 0x74, 0x12, 0x29, 0x0a, 0x10, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69,
-	0x6e, 0x67, 0x5f, 0x6e, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x6f,
-	0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x4e, 0x6f, 0x64, 0x65, 0x12, 0x30,
-	0x0a, 0x07, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x16, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x45, 0x6e, 0x74, 0x69, 0x74,
-	0x79, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x07, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x73,
-	0x12, 0x56, 0x0a, 0x11, 0x6e, 0x6f, 0x6e, 0x5f, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x5f, 0x74,
-	0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x61, 0x63,
-	0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x4c, 0x6f, 0x67, 0x46, 0x72, 0x61, 0x67, 0x6d, 0x65,
-	0x6e, 0x74, 0x2e, 0x4e, 0x6f, 0x6e, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x54, 0x6f, 0x6b, 0x65,
-	0x6e, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0f, 0x6e, 0x6f, 0x6e, 0x45, 0x6e, 0x74, 0x69,
-	0x74, 0x79, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x1a, 0x42, 0x0a, 0x14, 0x4e, 0x6f, 0x6e, 0x45,
-	0x6e, 0x74, 0x69, 0x74, 0x79, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79,
-	0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b,
-	0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x04, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x45, 0x0a, 0x11,
-	0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x4c, 0x6f,
-	0x67, 0x12, 0x30, 0x0a, 0x07, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x16, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x45, 0x6e,
-	0x74, 0x69, 0x74, 0x79, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x07, 0x63, 0x6c, 0x69, 0x65,
-	0x6e, 0x74, 0x73, 0x22, 0xb4, 0x01, 0x0a, 0x0a, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x43, 0x6f, 0x75,
-	0x6e, 0x74, 0x12, 0x5f, 0x0a, 0x15, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x62, 0x79, 0x5f, 0x6e,
-	0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x2c, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x54, 0x6f, 0x6b,
-	0x65, 0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x2e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x79, 0x4e,
-	0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x49, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
-	0x12, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63,
-	0x65, 0x49, 0x64, 0x1a, 0x45, 0x0a, 0x17, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x79, 0x4e, 0x61,
-	0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x49, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10,
-	0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79,
-	0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52,
-	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x15, 0x0a, 0x13, 0x4c, 0x6f,
-	0x67, 0x46, 0x72, 0x61, 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x42, 0x2b, 0x5a, 0x29, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x76, 0x61, 0x75, 0x6c, 0x74, 0x2f,
-	0x76, 0x61, 0x75, 0x6c, 0x74, 0x2f, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x62, 0x06,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x6f, 0x72, 0x22, 0x86, 0x02, 0x0a, 0x0b, 0x4c, 0x6f, 0x67, 0x46, 0x72, 0x61, 0x67, 0x6d, 0x65,
+	0x6e, 0x74, 0x12, 0x29, 0x0a, 0x10, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6e,
+	0x67, 0x5f, 0x6e, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x6f, 0x72,
+	0x69, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x4e, 0x6f, 0x64, 0x65, 0x12, 0x30, 0x0a,
+	0x07, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16,
+	0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79,
+	0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x07, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x73, 0x12,
+	0x56, 0x0a, 0x11, 0x6e, 0x6f, 0x6e, 0x5f, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x5f, 0x74, 0x6f,
+	0x6b, 0x65, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x61, 0x63, 0x74,
+	0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x4c, 0x6f, 0x67, 0x46, 0x72, 0x61, 0x67, 0x6d, 0x65, 0x6e,
+	0x74, 0x2e, 0x4e, 0x6f, 0x6e, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x54, 0x6f, 0x6b, 0x65, 0x6e,
+	0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0f, 0x6e, 0x6f, 0x6e, 0x45, 0x6e, 0x74, 0x69, 0x74,
+	0x79, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x1a, 0x42, 0x0a, 0x14, 0x4e, 0x6f, 0x6e, 0x45, 0x6e,
+	0x74, 0x69, 0x74, 0x79, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
+	0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65,
+	0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04,
+	0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x45, 0x0a, 0x11, 0x45,
+	0x6e, 0x74, 0x69, 0x74, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x4c, 0x6f, 0x67,
+	0x12, 0x30, 0x0a, 0x07, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x16, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x45, 0x6e, 0x74,
+	0x69, 0x74, 0x79, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x07, 0x63, 0x6c, 0x69, 0x65, 0x6e,
+	0x74, 0x73, 0x22, 0xb4, 0x01, 0x0a, 0x0a, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x43, 0x6f, 0x75, 0x6e,
+	0x74, 0x12, 0x5f, 0x0a, 0x15, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x62, 0x79, 0x5f, 0x6e, 0x61,
+	0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x2c, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x54, 0x6f, 0x6b, 0x65,
+	0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x2e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x79, 0x4e, 0x61,
+	0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x49, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x12,
+	0x63, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65,
+	0x49, 0x64, 0x1a, 0x45, 0x0a, 0x17, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x79, 0x4e, 0x61, 0x6d,
+	0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x49, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
+	0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
+	0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x15, 0x0a, 0x13, 0x4c, 0x6f, 0x67,
+	0x46, 0x72, 0x61, 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x42, 0x2b, 0x5a, 0x29, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68,
+	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x76, 0x61, 0x75, 0x6c, 0x74, 0x2f, 0x76,
+	0x61, 0x75, 0x6c, 0x74, 0x2f, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x62, 0x06, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vault/activity/activity_log.proto b/vault/activity/activity_log.proto
index 42a61bb4eb8c1..70f7e918cef03 100644
--- a/vault/activity/activity_log.proto
+++ b/vault/activity/activity_log.proto
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 syntax = "proto3";
 
 option go_package = "github.com/hashicorp/vault/vault/activity";
@@ -22,9 +19,6 @@ message EntityRecord {
 	// MountAccessor is the auth mount accessor of the token used to perform the
 	// activity.
 	string mount_accessor = 5;
-	// client_type identifies the source of the entity record (entity,
-	// non-entity, acme, etc.)
-	string client_type = 6;
 }
 
 message LogFragment {
diff --git a/vault/activity/generation/generate_data.pb.go b/vault/activity/generation/generate_data.pb.go
index 522a5e3609e7b..404ed373a9e79 100644
--- a/vault/activity/generation/generate_data.pb.go
+++ b/vault/activity/generation/generate_data.pb.go
@@ -439,11 +439,12 @@ type Client struct {
 
 	Id                string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
 	Count             int32  `protobuf:"varint,2,opt,name=count,proto3" json:"count,omitempty"`
-	Repeated          bool   `protobuf:"varint,3,opt,name=repeated,proto3" json:"repeated,omitempty"`
-	RepeatedFromMonth int32  `protobuf:"varint,4,opt,name=repeated_from_month,json=repeatedFromMonth,proto3" json:"repeated_from_month,omitempty"`
-	Namespace         string `protobuf:"bytes,5,opt,name=namespace,proto3" json:"namespace,omitempty"`
-	Mount             string `protobuf:"bytes,6,opt,name=mount,proto3" json:"mount,omitempty"`
-	NonEntity         bool   `protobuf:"varint,7,opt,name=non_entity,json=nonEntity,proto3" json:"non_entity,omitempty"`
+	TimesSeen         int32  `protobuf:"varint,3,opt,name=times_seen,json=timesSeen,proto3" json:"times_seen,omitempty"`
+	Repeated          bool   `protobuf:"varint,4,opt,name=repeated,proto3" json:"repeated,omitempty"`
+	RepeatedFromMonth int32  `protobuf:"varint,5,opt,name=repeated_from_month,json=repeatedFromMonth,proto3" json:"repeated_from_month,omitempty"`
+	Namespace         string `protobuf:"bytes,6,opt,name=namespace,proto3" json:"namespace,omitempty"`
+	Mount             string `protobuf:"bytes,7,opt,name=mount,proto3" json:"mount,omitempty"`
+	NonEntity         bool   `protobuf:"varint,8,opt,name=non_entity,json=nonEntity,proto3" json:"non_entity,omitempty"`
 }
 
 func (x *Client) Reset() {
@@ -492,6 +493,13 @@ func (x *Client) GetCount() int32 {
 	return 0
 }
 
+func (x *Client) GetTimesSeen() int32 {
+	if x != nil {
+		return x.TimesSeen
+	}
+	return 0
+}
+
 func (x *Client) GetRepeated() bool {
 	if x != nil {
 		return x.Repeated
@@ -576,34 +584,36 @@ var file_vault_activity_generation_generate_data_proto_rawDesc = []byte{
 	0x74, 0x73, 0x12, 0x2c, 0x0a, 0x07, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x01, 0x20,
 	0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
 	0x2e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x52, 0x07, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x73,
-	0x22, 0xcd, 0x01, 0x0a, 0x06, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69,
+	0x22, 0xec, 0x01, 0x0a, 0x06, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69,
 	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x63,
 	0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e,
-	0x74, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x08, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x12, 0x2e, 0x0a,
-	0x13, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x66, 0x72, 0x6f, 0x6d, 0x5f, 0x6d,
-	0x6f, 0x6e, 0x74, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x11, 0x72, 0x65, 0x70, 0x65,
-	0x61, 0x74, 0x65, 0x64, 0x46, 0x72, 0x6f, 0x6d, 0x4d, 0x6f, 0x6e, 0x74, 0x68, 0x12, 0x1c, 0x0a,
-	0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x6d,
-	0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6d, 0x6f, 0x75, 0x6e,
-	0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x6e, 0x6f, 0x6e, 0x5f, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x18,
-	0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x6e, 0x6f, 0x6e, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79,
-	0x2a, 0xa0, 0x01, 0x0a, 0x0c, 0x57, 0x72, 0x69, 0x74, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x12, 0x11, 0x0a, 0x0d, 0x57, 0x52, 0x49, 0x54, 0x45, 0x5f, 0x55, 0x4e, 0x4b, 0x4e, 0x4f,
-	0x57, 0x4e, 0x10, 0x00, 0x12, 0x1d, 0x0a, 0x19, 0x57, 0x52, 0x49, 0x54, 0x45, 0x5f, 0x50, 0x52,
-	0x45, 0x43, 0x4f, 0x4d, 0x50, 0x55, 0x54, 0x45, 0x44, 0x5f, 0x51, 0x55, 0x45, 0x52, 0x49, 0x45,
-	0x53, 0x10, 0x01, 0x12, 0x1a, 0x0a, 0x16, 0x57, 0x52, 0x49, 0x54, 0x45, 0x5f, 0x44, 0x49, 0x53,
-	0x54, 0x49, 0x4e, 0x43, 0x54, 0x5f, 0x43, 0x4c, 0x49, 0x45, 0x4e, 0x54, 0x53, 0x10, 0x02, 0x12,
-	0x12, 0x0a, 0x0e, 0x57, 0x52, 0x49, 0x54, 0x45, 0x5f, 0x45, 0x4e, 0x54, 0x49, 0x54, 0x49, 0x45,
-	0x53, 0x10, 0x03, 0x12, 0x17, 0x0a, 0x13, 0x57, 0x52, 0x49, 0x54, 0x45, 0x5f, 0x44, 0x49, 0x52,
-	0x45, 0x43, 0x54, 0x5f, 0x54, 0x4f, 0x4b, 0x45, 0x4e, 0x53, 0x10, 0x04, 0x12, 0x15, 0x0a, 0x11,
-	0x57, 0x52, 0x49, 0x54, 0x45, 0x5f, 0x49, 0x4e, 0x54, 0x45, 0x4e, 0x54, 0x5f, 0x4c, 0x4f, 0x47,
-	0x53, 0x10, 0x05, 0x42, 0x36, 0x5a, 0x34, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
-	0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x76, 0x61, 0x75, 0x6c,
-	0x74, 0x2f, 0x76, 0x61, 0x75, 0x6c, 0x74, 0x2f, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79,
-	0x2f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x33,
+	0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x5f, 0x73, 0x65, 0x65, 0x6e, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x53, 0x65, 0x65, 0x6e,
+	0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x18, 0x04, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x08, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x12, 0x2e, 0x0a, 0x13,
+	0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x66, 0x72, 0x6f, 0x6d, 0x5f, 0x6d, 0x6f,
+	0x6e, 0x74, 0x68, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x11, 0x72, 0x65, 0x70, 0x65, 0x61,
+	0x74, 0x65, 0x64, 0x46, 0x72, 0x6f, 0x6d, 0x4d, 0x6f, 0x6e, 0x74, 0x68, 0x12, 0x1c, 0x0a, 0x09,
+	0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x6f,
+	0x75, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6d, 0x6f, 0x75, 0x6e, 0x74,
+	0x12, 0x1d, 0x0a, 0x0a, 0x6e, 0x6f, 0x6e, 0x5f, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x18, 0x08,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x6e, 0x6f, 0x6e, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2a,
+	0xa0, 0x01, 0x0a, 0x0c, 0x57, 0x72, 0x69, 0x74, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73,
+	0x12, 0x11, 0x0a, 0x0d, 0x57, 0x52, 0x49, 0x54, 0x45, 0x5f, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57,
+	0x4e, 0x10, 0x00, 0x12, 0x1d, 0x0a, 0x19, 0x57, 0x52, 0x49, 0x54, 0x45, 0x5f, 0x50, 0x52, 0x45,
+	0x43, 0x4f, 0x4d, 0x50, 0x55, 0x54, 0x45, 0x44, 0x5f, 0x51, 0x55, 0x45, 0x52, 0x49, 0x45, 0x53,
+	0x10, 0x01, 0x12, 0x1a, 0x0a, 0x16, 0x57, 0x52, 0x49, 0x54, 0x45, 0x5f, 0x44, 0x49, 0x53, 0x54,
+	0x49, 0x4e, 0x43, 0x54, 0x5f, 0x43, 0x4c, 0x49, 0x45, 0x4e, 0x54, 0x53, 0x10, 0x02, 0x12, 0x12,
+	0x0a, 0x0e, 0x57, 0x52, 0x49, 0x54, 0x45, 0x5f, 0x45, 0x4e, 0x54, 0x49, 0x54, 0x49, 0x45, 0x53,
+	0x10, 0x03, 0x12, 0x17, 0x0a, 0x13, 0x57, 0x52, 0x49, 0x54, 0x45, 0x5f, 0x44, 0x49, 0x52, 0x45,
+	0x43, 0x54, 0x5f, 0x54, 0x4f, 0x4b, 0x45, 0x4e, 0x53, 0x10, 0x04, 0x12, 0x15, 0x0a, 0x11, 0x57,
+	0x52, 0x49, 0x54, 0x45, 0x5f, 0x49, 0x4e, 0x54, 0x45, 0x4e, 0x54, 0x5f, 0x4c, 0x4f, 0x47, 0x53,
+	0x10, 0x05, 0x42, 0x36, 0x5a, 0x34, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
+	0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x76, 0x61, 0x75, 0x6c, 0x74,
+	0x2f, 0x76, 0x61, 0x75, 0x6c, 0x74, 0x2f, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2f,
+	0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x33,
 }
 
 var (
diff --git a/vault/activity/generation/generate_data.proto b/vault/activity/generation/generate_data.proto
index c23a4141d054c..b62209a21bac2 100644
--- a/vault/activity/generation/generate_data.proto
+++ b/vault/activity/generation/generate_data.proto
@@ -48,9 +48,10 @@ message Clients {
 message Client {
   string id = 1;
   int32 count = 2;
-  bool repeated = 3;
-  int32 repeated_from_month = 4;
-  string namespace = 5;
-  string mount = 6;
-  bool non_entity = 7;
+  int32 times_seen = 3;
+  bool repeated = 4;
+  int32 repeated_from_month = 5;
+  string namespace = 6;
+  string mount = 7;
+  bool non_entity = 8;
 }
diff --git a/vault/activity/query.go b/vault/activity/query.go
index 5541cea12a346..98ec4aad85c84 100644
--- a/vault/activity/query.go
+++ b/vault/activity/query.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package activity
 
 import (
diff --git a/vault/activity/query_test.go b/vault/activity/query_test.go
index c10ab1bd1852c..3c81ef568f7d9 100644
--- a/vault/activity/query_test.go
+++ b/vault/activity/query_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package activity
 
 import (
diff --git a/vault/activity_log.go b/vault/activity_log.go
index f003b9460b735..865fd24bed247 100644
--- a/vault/activity_log.go
+++ b/vault/activity_log.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -78,12 +75,6 @@ const (
 	// all fragments and segments no longer storing token counts in the directtokens
 	// storage path.
 	trackedTWESegmentPeriod = 35 * 24
-
-	// Known types of activity events; there's presently two internal event
-	// types (tokens/clients with and without entities), but we're beginning
-	// to support additional buckets for e.g., ACME requests.
-	nonEntityTokenActivityType = "non-entity-token"
-	entityActivityType         = "entity"
 )
 
 type segmentInfo struct {
@@ -148,6 +139,9 @@ type ActivityLog struct {
 	// Channel for sending fragment immediately
 	sendCh chan struct{}
 
+	// Channel for writing fragment immediately
+	writeCh chan struct{}
+
 	// Channel to stop background processing
 	doneCh chan struct{}
 
@@ -177,20 +171,6 @@ type ActivityLog struct {
 	partialMonthClientTracker map[string]*activity.EntityRecord
 
 	inprocessExport *atomic.Bool
-
-	// CensusReportDone is a channel used to signal tests upon successful calls
-	// to (CensusReporter).Write() in CensusReport.
-	CensusReportDone chan bool
-
-	// CensusReportInterval is the testing configuration for time between
-	// Write() calls initiated in CensusReport.
-	CensusReportInterval time.Duration
-
-	// clock is used to support manipulating time in unit and integration tests
-	clock timeutil.Clock
-	// precomputedQueryWritten receives an element whenever a precomputed query
-	// is written. It's used for unit testing
-	precomputedQueryWritten chan struct{}
 }
 
 // These non-persistent configuration options allow us to disable
@@ -200,20 +180,8 @@ type ActivityLogCoreConfig struct {
 	// Enable activity log even if the feature flag not set
 	ForceEnable bool
 
-	DisableFragmentWorker bool
-
 	// Do not start timers to send or persist fragments.
 	DisableTimers bool
-
-	// CensusReportInterval is the testing configuration for time
-	CensusReportInterval time.Duration
-
-	// MinimumRetentionMonths defines the minimum value for retention
-	MinimumRetentionMonths int
-
-	// Clock holds a custom clock to modify time.Now, time.Ticker, time.Timer.
-	// If nil, the default functions from the time package are used
-	Clock timeutil.Clock
 }
 
 // NewActivityLog creates an activity log.
@@ -223,10 +191,6 @@ func NewActivityLog(core *Core, logger log.Logger, view *BarrierView, metrics me
 		return nil, err
 	}
 
-	clock := core.activityLogConfig.Clock
-	if clock == nil {
-		clock = timeutil.DefaultClock{}
-	}
 	a := &ActivityLog{
 		core:                      core,
 		configOverrides:           &core.activityLogConfig,
@@ -236,10 +200,10 @@ func NewActivityLog(core *Core, logger log.Logger, view *BarrierView, metrics me
 		nodeID:                    hostname,
 		newFragmentCh:             make(chan struct{}, 1),
 		sendCh:                    make(chan struct{}, 1), // buffered so it can be triggered by fragment size
+		writeCh:                   make(chan struct{}, 1), // same for full segment
 		doneCh:                    make(chan struct{}, 1),
 		partialMonthClientTracker: make(map[string]*activity.EntityRecord),
-		CensusReportInterval:      time.Hour * 1,
-		clock:                     clock,
+
 		currentSegment: segmentInfo{
 			startTimestamp: 0,
 			currentClients: &activity.EntityActivityLog{
@@ -255,7 +219,6 @@ func NewActivityLog(core *Core, logger log.Logger, view *BarrierView, metrics me
 		},
 		standbyFragmentsReceived: make([]*activity.LogFragment, 0),
 		inprocessExport:          atomic.NewBool(false),
-		precomputedQueryWritten:  make(chan struct{}),
 	}
 
 	config, err := a.loadConfigOrDefault(core.activeContext)
@@ -287,7 +250,7 @@ func (a *ActivityLog) saveCurrentSegmentToStorage(ctx context.Context, force boo
 // :force: forces a save of tokens/entities even if the in-memory log is empty
 func (a *ActivityLog) saveCurrentSegmentToStorageLocked(ctx context.Context, force bool) error {
 	defer a.metrics.MeasureSinceWithLabels([]string{"core", "activity", "segment_write"},
-		a.clock.Now(), []metricsutil.Label{})
+		time.Now(), []metricsutil.Label{})
 
 	// Swap out the pending fragments
 	a.fragmentLock.Lock()
@@ -407,82 +370,67 @@ func (a *ActivityLog) saveCurrentSegmentToStorageLocked(ctx context.Context, for
 
 // :force: forces a save of tokens/entities even if the in-memory log is empty
 func (a *ActivityLog) saveCurrentSegmentInternal(ctx context.Context, force bool) error {
-	_, err := a.saveSegmentEntitiesInternal(ctx, a.currentSegment, force)
-	if err != nil {
-		return err
-	}
-	_, err = a.saveSegmentTokensInternal(ctx, a.currentSegment, force)
-	return err
-}
-
-func (a *ActivityLog) saveSegmentTokensInternal(ctx context.Context, currentSegment segmentInfo, force bool) (string, error) {
-	if len(currentSegment.tokenCount.CountByNamespaceID) == 0 && !force {
-		return "", nil
-	}
+	entityPath := fmt.Sprintf("%s%d/%d", activityEntityBasePath, a.currentSegment.startTimestamp, a.currentSegment.clientSequenceNumber)
 	// RFC (VLT-120) defines this as 1-indexed, but it should be 0-indexed
-	tokenPath := fmt.Sprintf("%s%d/0", activityTokenBasePath, currentSegment.startTimestamp)
-	// We must still allow for the tokenCount of the current segment to
-	// be written to storage, since if we remove this code we will incur
-	// data loss for one segment's worth of TWEs.
-	// We can get away with simply using the oldest version stored because
-	// the storing of versions was introduced at the same time as this code.
-	oldestVersion, oldestUpgradeTime, err := a.core.FindOldestVersionTimestamp()
-	switch {
-	case err != nil:
-		a.logger.Error(fmt.Sprintf("unable to retrieve oldest version timestamp: %s", err.Error()))
-	case len(a.currentSegment.tokenCount.CountByNamespaceID) > 0 &&
-		(oldestUpgradeTime.Add(time.Duration(trackedTWESegmentPeriod * time.Hour)).Before(time.Now())):
-		a.logger.Error(fmt.Sprintf("storing nonzero token count over a month after vault was upgraded to %s", oldestVersion))
-	default:
-		if len(a.currentSegment.tokenCount.CountByNamespaceID) > 0 {
-			a.logger.Info("storing nonzero token count")
-		}
-	}
-	tokenCount, err := proto.Marshal(a.currentSegment.tokenCount)
-	if err != nil {
-		return "", err
-	}
-
-	a.logger.Trace("writing segment", "path", tokenPath)
-	err = a.view.Put(ctx, &logical.StorageEntry{
-		Key:   tokenPath,
-		Value: tokenCount,
-	})
-	if err != nil {
-		return "", err
-	}
-
-	return tokenPath, nil
-}
-
-func (a *ActivityLog) saveSegmentEntitiesInternal(ctx context.Context, currentSegment segmentInfo, force bool) (string, error) {
-	entityPath := fmt.Sprintf("%s%d/%d", activityEntityBasePath, currentSegment.startTimestamp, currentSegment.clientSequenceNumber)
+	tokenPath := fmt.Sprintf("%s%d/0", activityTokenBasePath, a.currentSegment.startTimestamp)
 
 	for _, client := range a.currentSegment.currentClients.Clients {
 		// Explicitly catch and throw clear error message if client ID creation and storage
 		// results in a []byte that doesn't assert into a valid string.
 		if !utf8.ValidString(client.ClientID) {
-			return "", fmt.Errorf("client ID %q is not a valid string:", client.ClientID)
+			return fmt.Errorf("client ID %q is not a valid string:", client.ClientID)
 		}
 	}
 
-	if len(currentSegment.currentClients.Clients) == 0 && !force {
-		return "", nil
-	}
-	clients, err := proto.Marshal(currentSegment.currentClients)
-	if err != nil {
-		return entityPath, err
+	if len(a.currentSegment.currentClients.Clients) > 0 || force {
+		clients, err := proto.Marshal(a.currentSegment.currentClients)
+		if err != nil {
+			return err
+		}
+
+		a.logger.Trace("writing segment", "path", entityPath)
+		err = a.view.Put(ctx, &logical.StorageEntry{
+			Key:   entityPath,
+			Value: clients,
+		})
+		if err != nil {
+			return err
+		}
 	}
 
-	a.logger.Trace("writing segment", "path", entityPath)
-	err = a.view.Put(ctx, &logical.StorageEntry{
-		Key:   entityPath,
-		Value: clients,
-	})
-	if err != nil {
-		return "", err
+	// We must still allow for the tokenCount of the current segment to
+	// be written to storage, since if we remove this code we will incur
+	// data loss for one segment's worth of TWEs.
+	if len(a.currentSegment.tokenCount.CountByNamespaceID) > 0 || force {
+		// We can get away with simply using the oldest version stored because
+		// the storing of versions was introduced at the same time as this code.
+		oldestVersion, oldestUpgradeTime, err := a.core.FindOldestVersionTimestamp()
+		switch {
+		case err != nil:
+			a.logger.Error(fmt.Sprintf("unable to retrieve oldest version timestamp: %s", err.Error()))
+		case len(a.currentSegment.tokenCount.CountByNamespaceID) > 0 &&
+			(oldestUpgradeTime.Add(time.Duration(trackedTWESegmentPeriod * time.Hour)).Before(time.Now())):
+			a.logger.Error(fmt.Sprintf("storing nonzero token count over a month after vault was upgraded to %s", oldestVersion))
+		default:
+			if len(a.currentSegment.tokenCount.CountByNamespaceID) > 0 {
+				a.logger.Info("storing nonzero token count")
+			}
+		}
+		tokenCount, err := proto.Marshal(a.currentSegment.tokenCount)
+		if err != nil {
+			return err
+		}
+
+		a.logger.Trace("writing segment", "path", tokenPath)
+		err = a.view.Put(ctx, &logical.StorageEntry{
+			Key:   tokenPath,
+			Value: tokenCount,
+		})
+		if err != nil {
+			return err
+		}
 	}
-	return entityPath, err
+	return nil
 }
 
 // parseSegmentNumberFromPath returns the segment number from a path
@@ -992,14 +940,6 @@ func (a *ActivityLog) SetConfigInit(config activityConfig) {
 
 	a.defaultReportMonths = config.DefaultReportMonths
 	a.retentionMonths = config.RetentionMonths
-
-	if a.retentionMonths < a.configOverrides.MinimumRetentionMonths {
-		a.retentionMonths = a.configOverrides.MinimumRetentionMonths
-	}
-
-	if a.configOverrides.CensusReportInterval > 0 {
-		a.CensusReportInterval = a.configOverrides.CensusReportInterval
-	}
 }
 
 // This version reacts to user changes
@@ -1033,7 +973,7 @@ func (a *ActivityLog) SetConfig(ctx context.Context, config activityConfig) {
 
 	forceSave := false
 	if a.enabled && a.currentSegment.startTimestamp == 0 {
-		a.startNewCurrentLogLocked(a.clock.Now().UTC())
+		a.startNewCurrentLogLocked(time.Now().UTC())
 		// Force a save so we can distinguish between
 		//
 		// Month N-1: present
@@ -1054,12 +994,9 @@ func (a *ActivityLog) SetConfig(ctx context.Context, config activityConfig) {
 
 	a.defaultReportMonths = config.DefaultReportMonths
 	a.retentionMonths = config.RetentionMonths
-	if a.retentionMonths < a.configOverrides.MinimumRetentionMonths {
-		a.retentionMonths = a.configOverrides.MinimumRetentionMonths
-	}
 
 	// check for segments out of retention period, if it has changed
-	go a.retentionWorker(ctx, a.clock.Now(), a.retentionMonths)
+	go a.retentionWorker(ctx, time.Now(), a.retentionMonths)
 }
 
 // update the enable flag and reset the current log
@@ -1095,25 +1032,12 @@ func (a *ActivityLog) queriesAvailable(ctx context.Context) (bool, error) {
 
 // setupActivityLog hooks up the singleton ActivityLog into Core.
 func (c *Core) setupActivityLog(ctx context.Context, wg *sync.WaitGroup) error {
-	c.activityLogLock.Lock()
-	defer c.activityLogLock.Unlock()
-	return c.setupActivityLogLocked(ctx, wg)
-}
-
-// setupActivityLogLocked hooks up the singleton ActivityLog into Core.
-// this function should be called with activityLogLock.
-func (c *Core) setupActivityLogLocked(ctx context.Context, wg *sync.WaitGroup) error {
 	logger := c.baseLogger.Named("activity")
 	c.AddLogger(logger)
 
 	if os.Getenv("VAULT_DISABLE_ACTIVITY_LOG") != "" {
-		if c.CensusLicensingEnabled() {
-			logger.Warn("activity log disabled via environment variable while reporting is enabled. " +
-				"Reporting will override, and the activity log will be enabled")
-		} else {
-			logger.Info("activity log disabled via environment variable")
-			return nil
-		}
+		logger.Info("activity log disabled via environment variable")
+		return nil
 	}
 
 	view := c.systemBarrierView.SubView(activitySubPath)
@@ -1125,7 +1049,7 @@ func (c *Core) setupActivityLogLocked(ctx context.Context, wg *sync.WaitGroup) e
 	c.activityLog = manager
 
 	// load activity log for "this month" into memory
-	err = manager.refreshFromStoredLog(manager.core.activeContext, wg, manager.clock.Now().UTC())
+	err = manager.refreshFromStoredLog(manager.core.activeContext, wg, time.Now().UTC())
 	if err != nil {
 		return err
 	}
@@ -1134,13 +1058,9 @@ func (c *Core) setupActivityLogLocked(ctx context.Context, wg *sync.WaitGroup) e
 	// Lock already held here, can't use .PerfStandby()
 	// The workers need to know the current segment time.
 	if c.perfStandby {
-		if !c.activityLogConfig.DisableFragmentWorker {
-			go manager.perfStandbyFragmentWorker(ctx)
-		}
+		go manager.perfStandbyFragmentWorker(ctx)
 	} else {
-		if !c.activityLogConfig.DisableFragmentWorker {
-			go manager.activeFragmentWorker(ctx)
-		}
+		go manager.activeFragmentWorker(ctx)
 
 		// Check for any intent log, in the background
 		manager.computationWorkerDone = make(chan struct{})
@@ -1153,21 +1073,17 @@ func (c *Core) setupActivityLogLocked(ctx context.Context, wg *sync.WaitGroup) e
 		// Signal when this is done so that unit tests can proceed.
 		manager.retentionDone = make(chan struct{})
 		go func(months int) {
-			manager.retentionWorker(ctx, manager.clock.Now(), months)
+			manager.retentionWorker(ctx, time.Now(), months)
 			close(manager.retentionDone)
 		}(manager.retentionMonths)
-
-		manager.CensusReportDone = make(chan bool)
-		go c.activityLog.CensusReport(ctx, c.CensusAgent(), c.BillingStart())
 	}
 
 	return nil
 }
 
-// stopActivityLogLocked removes the ActivityLog from Core
+// stopActivityLog removes the ActivityLog from Core
 // and frees any resources.
-// this function should be called with activityLogLock
-func (c *Core) stopActivityLogLocked() {
+func (c *Core) stopActivityLog() {
 	// preSeal may run before startActivityLog got a chance to complete.
 	if c.activityLog != nil {
 		// Shut down background worker
@@ -1177,20 +1093,12 @@ func (c *Core) stopActivityLogLocked() {
 	c.activityLog = nil
 }
 
-// stopActivityLog removes the ActivityLog from Core
-// and frees any resources.
-func (c *Core) stopActivityLog() {
-	c.activityLogLock.Lock()
-	defer c.activityLogLock.Unlock()
-	c.stopActivityLogLocked()
-}
-
 func (a *ActivityLog) StartOfNextMonth() time.Time {
 	a.l.RLock()
 	defer a.l.RUnlock()
 	var segmentStart time.Time
 	if a.currentSegment.startTimestamp == 0 {
-		segmentStart = a.clock.Now().UTC()
+		segmentStart = time.Now().UTC()
 	} else {
 		segmentStart = time.Unix(a.currentSegment.startTimestamp, 0).UTC()
 	}
@@ -1202,12 +1110,12 @@ func (a *ActivityLog) StartOfNextMonth() time.Time {
 // perfStandbyFragmentWorker handles scheduling fragments
 // to send via RPC; it runs on perf standby nodes only.
 func (a *ActivityLog) perfStandbyFragmentWorker(ctx context.Context) {
-	timer := a.clock.NewTimer(time.Duration(0))
+	timer := time.NewTimer(time.Duration(0))
 	fragmentWaiting := false
 	// Eat first event, so timer is stopped
 	<-timer.C
 
-	endOfMonth := a.clock.NewTimer(a.StartOfNextMonth().Sub(a.clock.Now()))
+	endOfMonth := time.NewTimer(a.StartOfNextMonth().Sub(time.Now()))
 	if a.configOverrides.DisableTimers {
 		endOfMonth.Stop()
 	}
@@ -1279,8 +1187,8 @@ func (a *ActivityLog) perfStandbyFragmentWorker(ctx context.Context) {
 			// Set timer for next month.
 			// The current segment *probably* hasn't been set yet (via invalidation),
 			// so don't rely on it.
-			target := timeutil.StartOfNextMonth(a.clock.Now().UTC())
-			endOfMonth.Reset(target.Sub(a.clock.Now()))
+			target := timeutil.StartOfNextMonth(time.Now().UTC())
+			endOfMonth.Reset(target.Sub(time.Now()))
 		}
 	}
 }
@@ -1288,9 +1196,9 @@ func (a *ActivityLog) perfStandbyFragmentWorker(ctx context.Context) {
 // activeFragmentWorker handles scheduling the write of the next
 // segment.  It runs on active nodes only.
 func (a *ActivityLog) activeFragmentWorker(ctx context.Context) {
-	ticker := a.clock.NewTicker(activitySegmentInterval)
+	ticker := time.NewTicker(activitySegmentInterval)
 
-	endOfMonth := a.clock.NewTimer(a.StartOfNextMonth().Sub(a.clock.Now()))
+	endOfMonth := time.NewTimer(a.StartOfNextMonth().Sub(time.Now()))
 	if a.configOverrides.DisableTimers {
 		endOfMonth.Stop()
 	}
@@ -1334,6 +1242,16 @@ func (a *ActivityLog) activeFragmentWorker(ctx context.Context) {
 			}
 			a.logger.Trace("writing segment on timer expiration")
 			writeFunc()
+		case <-a.writeCh:
+			a.logger.Trace("writing segment on request")
+			writeFunc()
+
+			// Reset the schedule to wait 10 minutes from this forced write.
+			ticker.Stop()
+			ticker = time.NewTicker(activitySegmentInterval)
+
+			// Simpler, but ticker.Reset was introduced in go 1.15:
+			// ticker.Reset(activitySegmentInterval)
 		case currentTime := <-endOfMonthChannel:
 			err := a.HandleEndOfMonth(ctx, currentTime.UTC())
 			if err != nil {
@@ -1346,7 +1264,7 @@ func (a *ActivityLog) activeFragmentWorker(ctx context.Context) {
 			go a.retentionWorker(ctx, currentTime.UTC(), a.retentionMonths)
 			a.l.RUnlock()
 
-			delta := a.StartOfNextMonth().Sub(a.clock.Now())
+			delta := a.StartOfNextMonth().Sub(time.Now())
 			if delta < 20*time.Minute {
 				delta = 20 * time.Minute
 			}
@@ -1451,36 +1369,12 @@ func (a *ActivityLog) AddEntityToFragment(entityID string, namespaceID string, t
 
 // AddClientToFragment checks a client ID for uniqueness and
 // if not already present, adds it to the current fragment.
-//
-// See note below about AddActivityToFragment.
+// The timestamp is a Unix timestamp *without* nanoseconds, as that
+// is what token.CreationTime uses.
 func (a *ActivityLog) AddClientToFragment(clientID string, namespaceID string, timestamp int64, isTWE bool, mountAccessor string) {
-	// TWE == token without entity
-	if isTWE {
-		a.AddActivityToFragment(clientID, namespaceID, timestamp, nonEntityTokenActivityType, mountAccessor)
-		return
-	}
-
-	a.AddActivityToFragment(clientID, namespaceID, timestamp, entityActivityType, mountAccessor)
-}
-
-// AddActivityToFragment adds a client count event of any type to
-// add to the current fragment. ClientIDs must be unique across
-// all types; if not already present, we will add it to the current
-// fragment. The timestamp is a Unix timestamp *without* nanoseconds,
-// as that is what token.CreationTime uses.
-func (a *ActivityLog) AddActivityToFragment(clientID string, namespaceID string, timestamp int64, activityType string, mountAccessor string) {
 	// Check whether entity ID already recorded
 	var present bool
 
-	// TODO: This hack enables separate tracking of events without handling
-	// separate storage buckets for counting these event types. Consider
-	// removing if the event type is otherwise clear; notably though, this
-	// does help ensure clientID uniqueness across different types of tokens,
-	// assuming it does not break any other downstream systems.
-	if activityType != nonEntityTokenActivityType && activityType != entityActivityType {
-		clientID = activityType + "." + clientID
-	}
-
 	a.fragmentLock.RLock()
 	if a.enabled {
 		_, present = a.partialMonthClientTracker[clientID]
@@ -1509,16 +1403,12 @@ func (a *ActivityLog) AddActivityToFragment(clientID string, namespaceID string,
 		NamespaceID:   namespaceID,
 		Timestamp:     timestamp,
 		MountAccessor: mountAccessor,
-		ClientType:    activityType,
 	}
 
 	// Track whether the clientID corresponds to a token without an entity or not.
 	// This field is backward compatible, as the default is 0, so records created
 	// from pre-1.9 activityLog code will automatically be marked as having an entity.
-	if activityType != entityActivityType {
-		// TODO: This part needs to be modified potentially for separate
-		// storage buckets of custom event types. Consider setting the above
-		// condition to activityType == nonEntityTokenEventType in the future.
+	if isTWE {
 		clientRecord.NonEntity = true
 	}
 
@@ -1535,7 +1425,7 @@ func (a *ActivityLog) createCurrentFragment() {
 			Clients:         make([]*activity.EntityRecord, 0, 120),
 			NonEntityTokens: make(map[string]uint64),
 		}
-		a.fragmentCreation = a.clock.Now().UTC()
+		a.fragmentCreation = time.Now().UTC()
 
 		// Signal that a new segment is available, start
 		// the timer to send it.
@@ -1635,13 +1525,13 @@ func (a *ActivityLog) handleQuery(ctx context.Context, startTime, endTime time.T
 	// with the endTime equal to the end of the last month, and add in the current month
 	// data.
 	precomputedQueryEndTime := endTime
-	if timeutil.IsCurrentMonth(endTime, a.clock.Now().UTC()) {
+	if timeutil.IsCurrentMonth(endTime, time.Now().UTC()) {
 		precomputedQueryEndTime = timeutil.EndOfMonth(timeutil.MonthsPreviousTo(1, timeutil.StartOfMonth(endTime)))
 		computePartial = true
 	}
 
 	pq := &activity.PrecomputedQuery{}
-	if startTime.After(precomputedQueryEndTime) && timeutil.IsCurrentMonth(startTime, a.clock.Now().UTC()) {
+	if startTime.After(precomputedQueryEndTime) && timeutil.IsCurrentMonth(startTime, time.Now().UTC()) {
 		// We're only calculating the partial month client count. Skip the precomputation
 		// get call.
 		pq = &activity.PrecomputedQuery{
@@ -1656,19 +1546,10 @@ func (a *ActivityLog) handleQuery(ctx context.Context, startTime, endTime time.T
 			return nil, err
 		}
 		if storedQuery == nil {
-			// If the storedQuery is nil, that means there's no historical data to process. But, it's possible there's
-			// still current month data to process, so rather than returning a 204, let's proceed along like we're
-			// just querying the current month.
-			storedQuery = &activity.PrecomputedQuery{
-				StartTime:  startTime,
-				EndTime:    endTime,
-				Namespaces: make([]*activity.NamespaceRecord, 0),
-				Months:     make([]*activity.MonthRecord, 0),
-			}
+			return nil, nil
 		}
 		pq = storedQuery
 	}
-
 	// Calculate the namespace response breakdowns and totals for entities and tokens from the initial
 	// namespace data.
 	totalEntities, totalTokens, byNamespaceResponse, err := a.calculateByNamespaceResponseForQuery(ctx, pq.Namespaces)
@@ -1686,9 +1567,7 @@ func (a *ActivityLog) handleQuery(ctx context.Context, startTime, endTime time.T
 	if computePartial {
 		// Traverse through current month's activitylog data and group clients
 		// into months and namespaces
-		a.fragmentLock.RLock()
 		partialByMonth, partialByNamespace = a.populateNamespaceAndMonthlyBreakdowns()
-		a.fragmentLock.RUnlock()
 
 		// Convert the byNamespace breakdowns into structs that are
 		// consumable by the /activity endpoint, so as to reuse code between these two
@@ -1702,51 +1581,9 @@ func (a *ActivityLog) handleQuery(ctx context.Context, startTime, endTime time.T
 			return nil, err
 		}
 
-		// Create a mapping of namespace id to slice index, so that we can efficiently update our results without
-		// having to traverse the entire namespace response slice every time.
-		nsrMap := make(map[string]int)
-		for i, nr := range byNamespaceResponse {
-			nsrMap[nr.NamespaceID] = i
-		}
-
-		// Rather than blindly appending, which will create duplicates, check our existing counts against the current
-		// month counts, and append or update as necessary. We also want to account for mounts and their counts.
-		for _, nrc := range byNamespaceResponseCurrent {
-			if ndx, ok := nsrMap[nrc.NamespaceID]; ok {
-				existingRecord := byNamespaceResponse[ndx]
-
-				// Create a map of the existing mounts, so we don't duplicate them
-				mountMap := make(map[string]*ResponseCounts)
-				for _, erm := range existingRecord.Mounts {
-					mountMap[erm.MountPath] = erm.Counts
-				}
-
-				existingRecord.Counts.EntityClients += nrc.Counts.EntityClients
-				existingRecord.Counts.Clients += nrc.Counts.Clients
-				existingRecord.Counts.DistinctEntities += nrc.Counts.DistinctEntities
-				existingRecord.Counts.NonEntityClients += nrc.Counts.NonEntityClients
-				existingRecord.Counts.NonEntityTokens += nrc.Counts.NonEntityTokens
-
-				// Check the current month mounts against the existing mounts and if there are matches, update counts
-				// accordingly. If there is no match, append the new mount to the existing mounts, so it will be counted
-				// later.
-				for _, nrcMount := range nrc.Mounts {
-					if existingRecordMountCounts, ook := mountMap[nrcMount.MountPath]; ook {
-						existingRecordMountCounts.EntityClients += nrcMount.Counts.EntityClients
-						existingRecordMountCounts.Clients += nrcMount.Counts.Clients
-						existingRecordMountCounts.DistinctEntities += nrcMount.Counts.DistinctEntities
-						existingRecordMountCounts.NonEntityClients += nrcMount.Counts.NonEntityClients
-						existingRecordMountCounts.NonEntityTokens += nrcMount.Counts.NonEntityTokens
-					} else {
-						existingRecord.Mounts = append(existingRecord.Mounts, nrcMount)
-					}
-				}
-			} else {
-				byNamespaceResponse = append(byNamespaceResponse, nrc)
-			}
-		}
+		// Add the current month's namespace data the precomputed query namespaces
+		byNamespaceResponse = append(byNamespaceResponse, byNamespaceResponseCurrent...)
 	}
-
 	// Sort clients within each namespace
 	a.sortALResponseNamespaces(byNamespaceResponse)
 
@@ -1760,13 +1597,11 @@ func (a *ActivityLog) handleQuery(ctx context.Context, startTime, endTime time.T
 		if err != nil {
 			return nil, err
 		}
-
 		// Add the namespace attribution for the current month to the newly computed current month value. Note
 		// that transformMonthBreakdowns calculates a superstruct of the required namespace struct due to its
 		// primary use-case being for precomputedQueryWorker, but we will reuse this code for brevity and extract
 		// the namespaces from it.
 		currentMonthNamespaceAttribution := a.transformMonthBreakdowns(partialByMonth)
-
 		// Ensure that there is only one element in this list -- if not, warn.
 		if len(currentMonthNamespaceAttribution) > 1 {
 			a.logger.Warn("more than one month worth of namespace and mount attribution calculated for "+
@@ -1776,7 +1611,6 @@ func (a *ActivityLog) handleQuery(ctx context.Context, startTime, endTime time.T
 			a.logger.Warn("no month data found, returning query with no namespace attribution for current month")
 		} else {
 			currentMonth.Namespaces = currentMonthNamespaceAttribution[0].Namespaces
-			currentMonth.NewClients.Namespaces = currentMonthNamespaceAttribution[0].NewClients.Namespaces
 		}
 		pq.Months = append(pq.Months, currentMonth)
 		distinctEntitiesResponse += pq.Months[len(pq.Months)-1].NewClients.Counts.EntityClients
@@ -1785,18 +1619,7 @@ func (a *ActivityLog) handleQuery(ctx context.Context, startTime, endTime time.T
 	// Now populate the response based on breakdowns.
 	responseData := make(map[string]interface{})
 	responseData["start_time"] = pq.StartTime.Format(time.RFC3339)
-
-	// If we computed partial counts, we should return the actual end time we computed counts for, not the pre-computed
-	// query end time. If we don't do this, the end_time in the response doesn't match the actual data in the response,
-	// which is confusing. Note that regardless of what end time is given, if it falls within the current month, it will
-	// be set to the end of the current month. This is definitely suboptimal, and possibly confusing, but still an
-	// improvement over using the pre-computed query end time.
-	if computePartial {
-		responseData["end_time"] = endTime.Format(time.RFC3339)
-	} else {
-		responseData["end_time"] = pq.EndTime.Format(time.RFC3339)
-	}
-
+	responseData["end_time"] = pq.EndTime.Format(time.RFC3339)
 	responseData["by_namespace"] = byNamespaceResponse
 	responseData["total"] = &ResponseCounts{
 		DistinctEntities: distinctEntitiesResponse,
@@ -1816,7 +1639,7 @@ func (a *ActivityLog) handleQuery(ctx context.Context, startTime, endTime time.T
 	a.sortActivityLogMonthsResponse(months)
 
 	// Modify the final month output to make response more consumable based on API request
-	months = a.modifyResponseMonths(months, startTime, endTime)
+	months = modifyResponseMonths(months, startTime, endTime)
 	responseData["months"] = months
 
 	return responseData, nil
@@ -1824,13 +1647,13 @@ func (a *ActivityLog) handleQuery(ctx context.Context, startTime, endTime time.T
 
 // modifyResponseMonths fills out various parts of the query structure to help
 // activity log clients parse the returned query.
-func (a *ActivityLog) modifyResponseMonths(months []*ResponseMonth, start time.Time, end time.Time) []*ResponseMonth {
+func modifyResponseMonths(months []*ResponseMonth, start time.Time, end time.Time) []*ResponseMonth {
 	if len(months) == 0 {
 		return months
 	}
 	start = timeutil.StartOfMonth(start)
 	end = timeutil.EndOfMonth(end)
-	if timeutil.IsCurrentMonth(end, a.clock.Now().UTC()) {
+	if timeutil.IsCurrentMonth(end, time.Now().UTC()) {
 		end = timeutil.EndOfMonth(timeutil.StartOfMonth(end).AddDate(0, -1, 0))
 	}
 	modifiedResponseMonths := make([]*ResponseMonth, 0)
@@ -1872,8 +1695,6 @@ type activityConfig struct {
 
 	// Enabled is one of enable, disable, default.
 	Enabled string `json:"enabled"`
-
-	CensusReportInterval time.Duration `json:"census_report_interval"`
 }
 
 func defaultActivityConfig() activityConfig {
@@ -1950,12 +1771,6 @@ func (a *ActivityLog) namespaceToLabel(ctx context.Context, nsID string) string
 	return ns.Path
 }
 
-type (
-	summaryByNamespace map[string]*processByNamespace
-	summaryByMount     map[string]*processMount
-	summaryByMonth     map[int64]*processMonth
-)
-
 type processCounts struct {
 	// entityID -> present
 	Entities map[string]struct{}
@@ -1973,34 +1788,6 @@ func newProcessCounts() *processCounts {
 	}
 }
 
-func (p *processCounts) delete(client *activity.EntityRecord) {
-	if !p.contains(client) {
-		return
-	}
-	if client.NonEntity {
-		delete(p.NonEntities, client.ClientID)
-	} else {
-		delete(p.Entities, client.ClientID)
-	}
-}
-
-func (p *processCounts) add(client *activity.EntityRecord) {
-	if client.NonEntity {
-		p.NonEntities[client.ClientID] = struct{}{}
-	} else {
-		p.Entities[client.ClientID] = struct{}{}
-	}
-}
-
-func (p *processCounts) contains(client *activity.EntityRecord) bool {
-	if client.NonEntity {
-		_, ok := p.NonEntities[client.ClientID]
-		return ok
-	}
-	_, ok := p.Entities[client.ClientID]
-	return ok
-}
-
 type processMount struct {
 	Counts *processCounts
 }
@@ -2011,296 +1798,105 @@ func newProcessMount() *processMount {
 	}
 }
 
-func (p *processMount) add(client *activity.EntityRecord) {
-	p.Counts.add(client)
-}
-
-func (p *processMount) delete(client *activity.EntityRecord) {
-	p.Counts.delete(client)
-}
-
-func (s summaryByMount) add(client *activity.EntityRecord) {
-	if _, present := s[client.MountAccessor]; !present {
-		s[client.MountAccessor] = newProcessMount()
-	}
-	s[client.MountAccessor].add(client)
-}
-
-func (s summaryByMount) delete(client *activity.EntityRecord) {
-	if m, present := s[client.MountAccessor]; present {
-		m.delete(client)
-	}
-}
-
 type processByNamespace struct {
 	Counts *processCounts
-	Mounts summaryByMount
+	Mounts map[string]*processMount
 }
 
 func newByNamespace() *processByNamespace {
 	return &processByNamespace{
 		Counts: newProcessCounts(),
-		Mounts: make(summaryByMount),
-	}
-}
-
-func (p *processByNamespace) add(client *activity.EntityRecord) {
-	p.Counts.add(client)
-	p.Mounts.add(client)
-}
-
-func (p *processByNamespace) delete(client *activity.EntityRecord) {
-	p.Counts.delete(client)
-	p.Mounts.delete(client)
-}
-
-func (s summaryByNamespace) add(client *activity.EntityRecord) {
-	if _, present := s[client.NamespaceID]; !present {
-		s[client.NamespaceID] = newByNamespace()
-	}
-	s[client.NamespaceID].add(client)
-}
-
-func (s summaryByNamespace) delete(client *activity.EntityRecord) {
-	if n, present := s[client.NamespaceID]; present {
-		n.delete(client)
+		Mounts: make(map[string]*processMount),
 	}
 }
 
 type processNewClients struct {
 	Counts     *processCounts
-	Namespaces summaryByNamespace
+	Namespaces map[string]*processByNamespace
 }
 
 func newProcessNewClients() *processNewClients {
 	return &processNewClients{
 		Counts:     newProcessCounts(),
-		Namespaces: make(summaryByNamespace),
+		Namespaces: make(map[string]*processByNamespace),
 	}
 }
 
-func (p *processNewClients) add(client *activity.EntityRecord) {
-	p.Counts.add(client)
-	p.Namespaces.add(client)
-}
-
-func (p *processNewClients) delete(client *activity.EntityRecord) {
-	p.Counts.delete(client)
-	p.Namespaces.delete(client)
-}
-
 type processMonth struct {
 	Counts     *processCounts
-	Namespaces summaryByNamespace
+	Namespaces map[string]*processByNamespace
 	NewClients *processNewClients
 }
 
 func newProcessMonth() *processMonth {
 	return &processMonth{
 		Counts:     newProcessCounts(),
-		Namespaces: make(summaryByNamespace),
+		Namespaces: make(map[string]*processByNamespace),
 		NewClients: newProcessNewClients(),
 	}
 }
 
-func (p *processMonth) add(client *activity.EntityRecord) {
-	p.Counts.add(client)
-	p.NewClients.add(client)
-	p.Namespaces.add(client)
-}
-
-func (s summaryByMonth) add(client *activity.EntityRecord, startTime time.Time) {
-	monthTimestamp := timeutil.StartOfMonth(startTime).UTC().Unix()
-	if _, present := s[monthTimestamp]; !present {
-		s[monthTimestamp] = newProcessMonth()
-	}
-	s[monthTimestamp].add(client)
-}
-
 // processClientRecord parses the client record e and stores the breakdowns in
 // the maps provided.
-func processClientRecord(e *activity.EntityRecord, byNamespace summaryByNamespace, byMonth summaryByMonth, startTime time.Time) {
-	byNamespace.add(e)
-	byMonth.add(e, startTime)
-}
-
-// handleEntitySegment processes the record and adds it to the correct month/
-// namespace breakdown maps, as well as to the hyperloglog for the month. New
-// clients are deduplicated in opts.byMonth so that clients will only appear in
-// the first month in which they are seen.
-// This method must be called in reverse chronological order of the months (with
-// the most recent month being called before previous months)
-func (a *ActivityLog) handleEntitySegment(l *activity.EntityActivityLog, segmentTime time.Time, hll *hyperloglog.Sketch, opts pqOptions) error {
-	for _, e := range l.Clients {
-
-		processClientRecord(e, opts.byNamespace, opts.byMonth, segmentTime)
-		hll.Insert([]byte(e.ClientID))
-
-		// step forward in time through the months to check if the client is
-		// present. If it is, delete it. This is because the client should only
-		// be reported as new in the earliest month that it was seen
-		finalMonth := timeutil.StartOfMonth(opts.activePeriodEnd).UTC()
-		for currMonth := timeutil.StartOfMonth(segmentTime).UTC(); currMonth.Before(finalMonth); currMonth = timeutil.StartOfNextMonth(currMonth).UTC() {
-			// Invalidate the client from being a new client in the next month
-			next := timeutil.StartOfNextMonth(currMonth).UTC().Unix()
-			if _, present := opts.byMonth[next]; present {
-				// delete from the new clients map for the next month
-				// this will handle deleting from the per-namespace and per-mount maps of NewClients
-				opts.byMonth[next].NewClients.delete(e)
-			}
-		}
+func processClientRecord(e *activity.EntityRecord, byNamespace map[string]*processByNamespace, byMonth map[int64]*processMonth, startTime time.Time) {
+	if _, present := byNamespace[e.NamespaceID]; !present {
+		byNamespace[e.NamespaceID] = newByNamespace()
 	}
 
-	return nil
-}
-
-// breakdownTokenSegment handles a TokenCount record, adding it to the namespace breakdown
-func (a *ActivityLog) breakdownTokenSegment(l *activity.TokenCount, byNamespace map[string]*processByNamespace) {
-	for nsID, v := range l.CountByNamespaceID {
-		if _, present := byNamespace[nsID]; !present {
-			byNamespace[nsID] = newByNamespace()
-		}
-		byNamespace[nsID].Counts.Tokens += v
+	if _, present := byNamespace[e.NamespaceID].Mounts[e.MountAccessor]; !present {
+		byNamespace[e.NamespaceID].Mounts[e.MountAccessor] = newProcessMount()
 	}
-}
 
-func (a *ActivityLog) writePrecomputedQuery(ctx context.Context, segmentTime time.Time, opts pqOptions) error {
-	pq := &activity.PrecomputedQuery{
-		StartTime:  segmentTime,
-		EndTime:    opts.endTime,
-		Namespaces: make([]*activity.NamespaceRecord, 0, len(opts.byNamespace)),
-		Months:     make([]*activity.MonthRecord, 0, len(opts.byMonth)),
+	if e.NonEntity {
+		byNamespace[e.NamespaceID].Counts.NonEntities[e.ClientID] = struct{}{}
+		byNamespace[e.NamespaceID].Mounts[e.MountAccessor].Counts.NonEntities[e.ClientID] = struct{}{}
+	} else {
+		byNamespace[e.NamespaceID].Counts.Entities[e.ClientID] = struct{}{}
+		byNamespace[e.NamespaceID].Mounts[e.MountAccessor].Counts.Entities[e.ClientID] = struct{}{}
 	}
-	// this will transform the byMonth map into the correctly formatted protobuf
-	pq.Months = a.transformMonthBreakdowns(opts.byMonth)
 
-	// the byNamespace map also needs to be transformed into a protobuf
-	for nsID, entry := range opts.byNamespace {
-		mountRecord := make([]*activity.MountRecord, 0, len(entry.Mounts))
-		for mountAccessor, mountData := range entry.Mounts {
-			mountRecord = append(mountRecord, &activity.MountRecord{
-				MountPath: a.mountAccessorToMountPath(mountAccessor),
-				Counts: &activity.CountsRecord{
-					EntityClients:    len(mountData.Counts.Entities),
-					NonEntityClients: int(mountData.Counts.Tokens) + len(mountData.Counts.NonEntities),
-				},
-			})
-		}
-
-		pq.Namespaces = append(pq.Namespaces, &activity.NamespaceRecord{
-			NamespaceID:     nsID,
-			Entities:        uint64(len(entry.Counts.Entities)),
-			NonEntityTokens: entry.Counts.Tokens + uint64(len(entry.Counts.NonEntities)),
-			Mounts:          mountRecord,
-		})
-	}
-	err := a.queryStore.Put(ctx, pq)
-	if err != nil {
-		a.logger.Warn("failed to store precomputed query", "error", err)
+	monthTimestamp := timeutil.StartOfMonth(startTime).UTC().Unix()
+	if _, present := byMonth[monthTimestamp]; !present {
+		byMonth[monthTimestamp] = newProcessMonth()
 	}
-	return nil
-}
 
-// pqOptions holds fields that will be used when creating precomputed queries
-// These fields will remain the same for every segment that a precomputed query worker is handling
-type pqOptions struct {
-	byNamespace map[string]*processByNamespace
-	byMonth     map[int64]*processMonth
-	// endTime sets the end time of the precomputed query.
-	// When invoked on schedule by the precomputedQueryWorker, this is the end of the month that just finished.
-	endTime time.Time
-	// activePeriodStart is the earliest date in our retention window
-	activePeriodStart time.Time
-	// activePeriodEnd is the latest date in our retention window.
-	// When invoked on schedule by the precomputedQueryWorker, this will be the timestamp of the most recent segment
-	// that's present in storage
-	activePeriodEnd time.Time
-}
-
-// segmentToPrecomputedQuery processes a single segment
-func (a *ActivityLog) segmentToPrecomputedQuery(ctx context.Context, segmentTime time.Time, reader SegmentReader, opts pqOptions) error {
-	hyperloglog, err := a.CreateOrFetchHyperlogLog(ctx, segmentTime)
-	if err != nil {
-		// We were unable to create or fetch the hll, but we should still
-		// continue with our precomputation
-		a.logger.Warn("unable to create or fetch hyperloglog", "start time", segmentTime, "error", err)
+	if _, present := byMonth[monthTimestamp].Namespaces[e.NamespaceID]; !present {
+		byMonth[monthTimestamp].Namespaces[e.NamespaceID] = newByNamespace()
 	}
 
-	// Iterate through entities, adding them to the hyperloglog and the summary maps in opts
-	for {
-		entity, err := reader.ReadEntity(ctx)
-		if errors.Is(err, io.EOF) {
-			break
-		}
-		if err != nil {
-			a.logger.Warn("failed to read segment", "error", err)
-			return err
-		}
-		err = a.handleEntitySegment(entity, segmentTime, hyperloglog, opts)
-		if err != nil {
-			a.logger.Warn("failed to handle entity segment", "error", err)
-			return err
-		}
+	if _, present := byMonth[monthTimestamp].Namespaces[e.NamespaceID].Mounts[e.MountAccessor]; !present {
+		byMonth[monthTimestamp].Namespaces[e.NamespaceID].Mounts[e.MountAccessor] = newProcessMount()
 	}
 
-	// Store the hyperloglog
-	err = a.StoreHyperlogLog(ctx, segmentTime, hyperloglog)
-	if err != nil {
-		a.logger.Warn("failed to store hyperloglog for month", "start time", segmentTime, "error", err)
+	if _, present := byMonth[monthTimestamp].NewClients.Namespaces[e.NamespaceID]; !present {
+		byMonth[monthTimestamp].NewClients.Namespaces[e.NamespaceID] = newByNamespace()
 	}
 
-	// Iterate through any tokens and add them to per namespace map
-	for {
-		token, err := reader.ReadToken(ctx)
-		if errors.Is(err, io.EOF) {
-			break
-		}
-		if err != nil {
-			a.logger.Warn("failed to load token counts", "error", err)
-			return err
-		}
-		a.breakdownTokenSegment(token, opts.byNamespace)
+	if _, present := byMonth[monthTimestamp].NewClients.Namespaces[e.NamespaceID].Mounts[e.MountAccessor]; !present {
+		byMonth[monthTimestamp].NewClients.Namespaces[e.NamespaceID].Mounts[e.MountAccessor] = newProcessMount()
 	}
 
-	// write metrics
-	for nsID, entry := range opts.byNamespace {
-		// If this is the most recent month, or the start of the reporting period, output
-		// a metric for each namespace.
-		if segmentTime == opts.activePeriodEnd {
-			a.metrics.SetGaugeWithLabels(
-				[]string{"identity", "entity", "active", "monthly"},
-				float32(len(entry.Counts.Entities)),
-				[]metricsutil.Label{
-					{Name: "namespace", Value: a.namespaceToLabel(ctx, nsID)},
-				},
-			)
-			a.metrics.SetGaugeWithLabels(
-				[]string{"identity", "nonentity", "active", "monthly"},
-				float32(len(entry.Counts.NonEntities))+float32(entry.Counts.Tokens),
-				[]metricsutil.Label{
-					{Name: "namespace", Value: a.namespaceToLabel(ctx, nsID)},
-				},
-			)
-		} else if segmentTime == opts.activePeriodStart {
-			a.metrics.SetGaugeWithLabels(
-				[]string{"identity", "entity", "active", "reporting_period"},
-				float32(len(entry.Counts.Entities)),
-				[]metricsutil.Label{
-					{Name: "namespace", Value: a.namespaceToLabel(ctx, nsID)},
-				},
-			)
-			a.metrics.SetGaugeWithLabels(
-				[]string{"identity", "nonentity", "active", "reporting_period"},
-				float32(len(entry.Counts.NonEntities))+float32(entry.Counts.Tokens),
-				[]metricsutil.Label{
-					{Name: "namespace", Value: a.namespaceToLabel(ctx, nsID)},
-				},
-			)
-		}
-	}
+	// At first assume all the clients in the given month, as new.
+	// Before persisting this information to disk, clients that have
+	// activity in the previous months of a given billing cycle will be
+	// deleted.
+	if e.NonEntity == true {
+		byMonth[monthTimestamp].Counts.NonEntities[e.ClientID] = struct{}{}
+		byMonth[monthTimestamp].Namespaces[e.NamespaceID].Counts.NonEntities[e.ClientID] = struct{}{}
+		byMonth[monthTimestamp].Namespaces[e.NamespaceID].Mounts[e.MountAccessor].Counts.NonEntities[e.ClientID] = struct{}{}
+
+		byMonth[monthTimestamp].NewClients.Counts.NonEntities[e.ClientID] = struct{}{}
+		byMonth[monthTimestamp].NewClients.Namespaces[e.NamespaceID].Counts.NonEntities[e.ClientID] = struct{}{}
+		byMonth[monthTimestamp].NewClients.Namespaces[e.NamespaceID].Mounts[e.MountAccessor].Counts.NonEntities[e.ClientID] = struct{}{}
+	} else {
+		byMonth[monthTimestamp].Counts.Entities[e.ClientID] = struct{}{}
+		byMonth[monthTimestamp].Namespaces[e.NamespaceID].Counts.Entities[e.ClientID] = struct{}{}
+		byMonth[monthTimestamp].Namespaces[e.NamespaceID].Mounts[e.MountAccessor].Counts.Entities[e.ClientID] = struct{}{}
 
-	// convert the maps to the proper format and write them as precomputed queries
-	return a.writePrecomputedQuery(ctx, segmentTime, opts)
+		byMonth[monthTimestamp].NewClients.Counts.Entities[e.ClientID] = struct{}{}
+		byMonth[monthTimestamp].NewClients.Namespaces[e.NamespaceID].Counts.Entities[e.ClientID] = struct{}{}
+		byMonth[monthTimestamp].NewClients.Namespaces[e.NamespaceID].Mounts[e.MountAccessor].Counts.Entities[e.ClientID] = struct{}{}
+	}
 }
 
 // goroutine to process the request in the intent log, creating precomputed queries.
@@ -2350,7 +1946,7 @@ func (a *ActivityLog) precomputedQueryWorker(ctx context.Context) error {
 	// If there's an intent log, finish it even if the feature is currently disabled.
 	a.l.RLock()
 	currentMonth := a.currentSegment.startTimestamp
-	// Base retention period on the month we are generating (even in the past)--- a.clock.Now()
+	// Base retention period on the month we are generating (even in the past)--- time.Now()
 	// would work but this will be easier to control in tests.
 	retentionWindow := timeutil.MonthsPreviousTo(a.retentionMonths, time.Unix(intent.NextMonth, 0).UTC())
 	a.l.RUnlock()
@@ -2379,38 +1975,192 @@ func (a *ActivityLog) precomputedQueryWorker(ctx context.Context) error {
 		return errors.New("previous month not found")
 	}
 
+	// "times" is already in reverse order, start building the per-namespace maps
+	// from the last month backward
+
 	byNamespace := make(map[string]*processByNamespace)
 	byMonth := make(map[int64]*processMonth)
 
+	walkEntities := func(l *activity.EntityActivityLog, startTime time.Time, hll *hyperloglog.Sketch) error {
+		for _, e := range l.Clients {
+
+			processClientRecord(e, byNamespace, byMonth, startTime)
+
+			// We maintain an hyperloglog for each month
+			// hyperloglog is a sketch (hyperloglog data-structure) containing client ID's in a given month
+			// hyperloglog is used in activity log to get the approximate number new clients in the current billing month
+			// by counting the number of distinct clients in all the months including current month
+			// (this can be done by merging the hyperloglog all months with current month hyperloglog)
+			// and subtracting the number of distinct clients in the current month
+			// NOTE: current month here is not the month of startTime but the time period from the start of the current month,
+			// up until the time that this request was made.
+			hll.Insert([]byte(e.ClientID))
+
+			// The byMonth map will be filled in the reverse order of time. For
+			// example, if the billing period is from Jan to June, the byMonth
+			// will be filled for June first, May next and so on till Jan. When
+			// processing a client for the current month, it has been added as a
+			// new client above. Now, we check if that client is also used in
+			// the subsequent months (on any given month, byMonth map has
+			// already been processed for all the subsequent months due to the
+			// reverse ordering). If yes, we remove those references. This way a
+			// client is considered new only in the earliest month of its use in
+			// the billing period.
+			for currMonth := timeutil.StartOfMonth(startTime).UTC(); currMonth != timeutil.StartOfMonth(times[0]).UTC(); currMonth = timeutil.StartOfNextMonth(currMonth).UTC() {
+				// Invalidate the client from being a new client in the next month
+				next := timeutil.StartOfNextMonth(currMonth).UTC().Unix()
+				if _, present := byMonth[next]; !present {
+					continue
+				}
+
+				newClients := byMonth[next].NewClients
+
+				// Remove the client from the top level counts within the month.
+				if e.NonEntity {
+					delete(newClients.Counts.NonEntities, e.ClientID)
+				} else {
+					delete(newClients.Counts.Entities, e.ClientID)
+				}
+
+				if _, present := newClients.Namespaces[e.NamespaceID]; present {
+					// Remove the client from the namespace within the month.
+					if e.NonEntity {
+						delete(newClients.Namespaces[e.NamespaceID].Counts.NonEntities, e.ClientID)
+					} else {
+						delete(newClients.Namespaces[e.NamespaceID].Counts.Entities, e.ClientID)
+					}
+					if _, present := newClients.Namespaces[e.NamespaceID].Mounts[e.MountAccessor]; present {
+						// Remove the client from the mount within the namespace within the month.
+						if e.NonEntity {
+							delete(newClients.Namespaces[e.NamespaceID].Mounts[e.MountAccessor].Counts.NonEntities, e.ClientID)
+						} else {
+							delete(newClients.Namespaces[e.NamespaceID].Mounts[e.MountAccessor].Counts.Entities, e.ClientID)
+						}
+					}
+				}
+			}
+		}
+
+		return nil
+	}
+
+	walkTokens := func(l *activity.TokenCount) {
+		for nsID, v := range l.CountByNamespaceID {
+			if _, present := byNamespace[nsID]; !present {
+				byNamespace[nsID] = newByNamespace()
+			}
+			byNamespace[nsID].Counts.Tokens += v
+		}
+	}
+
 	endTime := timeutil.EndOfMonth(time.Unix(lastMonth, 0).UTC())
 	activePeriodStart := timeutil.MonthsPreviousTo(a.defaultReportMonths, endTime)
 	// If not enough data, report as much as we have in the window
 	if activePeriodStart.Before(times[len(times)-1]) {
 		activePeriodStart = times[len(times)-1]
 	}
-	opts := pqOptions{
-		byNamespace:       byNamespace,
-		byMonth:           byMonth,
-		endTime:           endTime,
-		activePeriodStart: activePeriodStart,
-		activePeriodEnd:   times[0],
-	}
-	// "times" is already in reverse order, start building the per-namespace maps
-	// from the last month backward
+
 	for _, startTime := range times {
 		// Do not work back further than the current retention window,
 		// which will just get deleted anyway.
 		if startTime.Before(retentionWindow) {
 			break
 		}
-		reader, err := a.NewSegmentFileReader(ctx, startTime)
+
+		hyperloglog, err := a.CreateOrFetchHyperlogLog(ctx, startTime)
+		if err != nil {
+			// We were unable to create or fetch the hll, but we should still
+			// continue with our precomputation
+			a.logger.Warn("unable to create or fetch hyperloglog", "start time", startTime, "error", err)
+		}
+		err = a.WalkEntitySegments(ctx, startTime, hyperloglog, walkEntities)
 		if err != nil {
+			a.logger.Warn("failed to load previous segments", "error", err)
 			return err
 		}
-		err = a.segmentToPrecomputedQuery(ctx, startTime, reader, opts)
+		// Store the hyperloglog
+		err = a.StoreHyperlogLog(ctx, startTime, hyperloglog)
 		if err != nil {
+			a.logger.Warn("failed to store hyperloglog for month", "start time", startTime, "error", err)
+		}
+		err = a.WalkTokenSegments(ctx, startTime, walkTokens)
+		if err != nil {
+			a.logger.Warn("failed to load previous token counts", "error", err)
 			return err
 		}
+
+		// Save the work to date in a record
+		pq := &activity.PrecomputedQuery{
+			StartTime:  startTime,
+			EndTime:    endTime,
+			Namespaces: make([]*activity.NamespaceRecord, 0, len(byNamespace)),
+			Months:     make([]*activity.MonthRecord, 0, len(byMonth)),
+		}
+		pq.Months = a.transformMonthBreakdowns(byMonth)
+
+		for nsID, entry := range byNamespace {
+			mountRecord := make([]*activity.MountRecord, 0, len(entry.Mounts))
+			for mountAccessor, mountData := range entry.Mounts {
+				valResp := a.core.router.ValidateMountByAccessor(mountAccessor)
+				if valResp == nil {
+					// Only persist valid mounts
+					continue
+				}
+				mountRecord = append(mountRecord, &activity.MountRecord{
+					MountPath: valResp.MountPath,
+					Counts: &activity.CountsRecord{
+						EntityClients:    len(mountData.Counts.Entities),
+						NonEntityClients: int(mountData.Counts.Tokens) + len(mountData.Counts.NonEntities),
+					},
+				})
+			}
+
+			pq.Namespaces = append(pq.Namespaces, &activity.NamespaceRecord{
+				NamespaceID:     nsID,
+				Entities:        uint64(len(entry.Counts.Entities)),
+				NonEntityTokens: entry.Counts.Tokens + uint64(len(entry.Counts.NonEntities)),
+				Mounts:          mountRecord,
+			})
+
+			// If this is the most recent month, or the start of the reporting period, output
+			// a metric for each namespace.
+			if startTime == times[0] {
+				a.metrics.SetGaugeWithLabels(
+					[]string{"identity", "entity", "active", "monthly"},
+					float32(len(entry.Counts.Entities)),
+					[]metricsutil.Label{
+						{Name: "namespace", Value: a.namespaceToLabel(ctx, nsID)},
+					},
+				)
+				a.metrics.SetGaugeWithLabels(
+					[]string{"identity", "nonentity", "active", "monthly"},
+					float32(len(entry.Counts.NonEntities))+float32(entry.Counts.Tokens),
+					[]metricsutil.Label{
+						{Name: "namespace", Value: a.namespaceToLabel(ctx, nsID)},
+					},
+				)
+			} else if startTime == activePeriodStart {
+				a.metrics.SetGaugeWithLabels(
+					[]string{"identity", "entity", "active", "reporting_period"},
+					float32(len(entry.Counts.Entities)),
+					[]metricsutil.Label{
+						{Name: "namespace", Value: a.namespaceToLabel(ctx, nsID)},
+					},
+				)
+				a.metrics.SetGaugeWithLabels(
+					[]string{"identity", "nonentity", "active", "reporting_period"},
+					float32(len(entry.Counts.NonEntities))+float32(entry.Counts.Tokens),
+					[]metricsutil.Label{
+						{Name: "namespace", Value: a.namespaceToLabel(ctx, nsID)},
+					},
+				)
+			}
+		}
+
+		err = a.queryStore.Put(ctx, pq)
+		if err != nil {
+			a.logger.Warn("failed to store precomputed query", "error", err)
+		}
 	}
 
 	// delete the intent log
@@ -2418,10 +2168,6 @@ func (a *ActivityLog) precomputedQueryWorker(ctx context.Context) error {
 
 	a.logger.Info("finished computing queries", "month", endTime)
 
-	select {
-	case a.precomputedQueryWritten <- struct{}{}:
-	default:
-	}
 	return nil
 }
 
@@ -2515,13 +2261,11 @@ func (a *ActivityLog) populateNamespaceAndMonthlyBreakdowns() (map[int64]*proces
 	byNamespace := make(map[string]*processByNamespace)
 	byMonth := make(map[int64]*processMonth)
 	for _, e := range a.partialMonthClientTracker {
-		processClientRecord(e, byNamespace, byMonth, a.clock.Now())
+		processClientRecord(e, byNamespace, byMonth, time.Now())
 	}
 	return byMonth, byNamespace
 }
 
-// transformMonthBreakdowns converts a map of unix timestamp -> processMonth to
-// a slice of MonthRecord
 func (a *ActivityLog) transformMonthBreakdowns(byMonth map[int64]*processMonth) []*activity.MonthRecord {
 	monthly := make([]*activity.MonthRecord, 0)
 	processByNamespaces := func(nsMap map[string]*processByNamespace) []*activity.MonthlyNamespaceRecord {
@@ -2530,8 +2274,20 @@ func (a *ActivityLog) transformMonthBreakdowns(byMonth map[int64]*processMonth)
 			// Process mount specific data within a namespace within a given month
 			mountRecord := make([]*activity.MountRecord, 0, len(nsMap[nsID].Mounts))
 			for mountAccessor, mountData := range nsMap[nsID].Mounts {
+				var displayPath string
+				if mountAccessor == "" {
+					displayPath = "no mount accessor (pre-1.10 upgrade?)"
+				} else {
+					valResp := a.core.router.ValidateMountByAccessor(mountAccessor)
+					if valResp == nil {
+						displayPath = fmt.Sprintf("deleted mount; accessor %q", mountAccessor)
+					} else {
+						displayPath = valResp.MountPath
+					}
+				}
+
 				mountRecord = append(mountRecord, &activity.MountRecord{
-					MountPath: a.mountAccessorToMountPath(mountAccessor),
+					MountPath: displayPath,
 					Counts: &activity.CountsRecord{
 						EntityClients:    len(mountData.Counts.Entities),
 						NonEntityClients: int(mountData.Counts.Tokens) + len(mountData.Counts.NonEntities),
diff --git a/vault/activity_log_test.go b/vault/activity_log_test.go
index 839bf26b31ed1..40373a1313ab5 100644
--- a/vault/activity_log_test.go
+++ b/vault/activity_log_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -20,10 +17,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/go-uuid"
-
 	"github.com/axiomhq/hyperloglog"
 	"github.com/go-test/deep"
 	"github.com/golang/protobuf/proto"
@@ -35,7 +28,6 @@ import (
 	"github.com/mitchellh/mapstructure"
 )
 
-// TestActivityLog_Creation calls AddEntityToFragment and verifies that it appears correctly in a.fragment.
 func TestActivityLog_Creation(t *testing.T) {
 	core, _, _ := TestCoreUnsealed(t)
 
@@ -106,8 +98,6 @@ func TestActivityLog_Creation(t *testing.T) {
 	}
 }
 
-// TestActivityLog_Creation_WrappingTokens calls HandleTokenUsage for two wrapping tokens, and verifies that this
-// doesn't create a fragment.
 func TestActivityLog_Creation_WrappingTokens(t *testing.T) {
 	core, _, _ := TestCoreUnsealed(t)
 
@@ -176,8 +166,6 @@ func checkExpectedEntitiesInMap(t *testing.T, a *ActivityLog, entityIDs []string
 	}
 }
 
-// TestActivityLog_UniqueEntities calls AddEntityToFragment 4 times with 2 different clients, then verifies that there
-// are only 2 clients in the fragment and that they have the earlier timestamps.
 func TestActivityLog_UniqueEntities(t *testing.T) {
 	core, _, _ := TestCoreUnsealed(t)
 	a := core.activityLog
@@ -282,9 +270,6 @@ func expectedEntityIDs(t *testing.T, out *activity.EntityActivityLog, ids []stri
 	}
 }
 
-// TestActivityLog_SaveTokensToStorage calls AddTokenToFragment with duplicate namespaces and then saves the segment to
-// storage. The test then reads and unmarshals the segment, and verifies that the results have the correct counts by
-// namespace.
 func TestActivityLog_SaveTokensToStorage(t *testing.T) {
 	core, _, _ := TestCoreUnsealed(t)
 	ctx := context.Background()
@@ -437,8 +422,6 @@ func TestActivityLog_SaveTokensToStorageDoesNotUpdateTokenCount(t *testing.T) {
 	}
 }
 
-// TestActivityLog_SaveEntitiesToStorage calls AddEntityToFragment with clients with different namespaces and then
-// writes the segment to storage. Read back from storage, and verify that client IDs exist in storage.
 func TestActivityLog_SaveEntitiesToStorage(t *testing.T) {
 	core, _, _ := TestCoreUnsealed(t)
 	ctx := context.Background()
@@ -490,8 +473,7 @@ func TestActivityLog_SaveEntitiesToStorage(t *testing.T) {
 	expectedEntityIDs(t, out, ids)
 }
 
-// TestActivityLog_StoreAndReadHyperloglog inserts into a hyperloglog, stores it and then reads it back. The test
-// verifies the estimate count is correct.
+// Test to check store hyperloglog and fetch hyperloglog from storage
 func TestActivityLog_StoreAndReadHyperloglog(t *testing.T) {
 	core, _, _ := TestCoreUnsealed(t)
 	ctx := context.Background()
@@ -519,16 +501,12 @@ func TestActivityLog_StoreAndReadHyperloglog(t *testing.T) {
 	}
 }
 
-// TestModifyResponseMonthsNilAppend calls modifyResponseMonths for a range of 5 months ago to now. It verifies that the
-// 5 months in the range are correct.
 func TestModifyResponseMonthsNilAppend(t *testing.T) {
-	core, _, _ := TestCoreUnsealed(t)
-	a := core.activityLog
 	end := time.Now().UTC()
 	start := timeutil.StartOfMonth(end).AddDate(0, -5, 0)
 	responseMonthTimestamp := timeutil.StartOfMonth(end).AddDate(0, -3, 0).Format(time.RFC3339)
 	responseMonths := []*ResponseMonth{{Timestamp: responseMonthTimestamp}}
-	months := a.modifyResponseMonths(responseMonths, start, end)
+	months := modifyResponseMonths(responseMonths, start, end)
 	if len(months) != 5 {
 		t.Fatal("wrong number of months padded")
 	}
@@ -553,9 +531,6 @@ func TestModifyResponseMonthsNilAppend(t *testing.T) {
 	}
 }
 
-// TestActivityLog_ReceivedFragment calls receivedFragment with a fragment and verifies it gets added to
-// standbyFragmentsReceived. Send the same fragment again and then verify that it doesn't change the entity map but does
-// get added to standbyFragmentsReceived.
 func TestActivityLog_ReceivedFragment(t *testing.T) {
 	core, _, _ := TestCoreUnsealed(t)
 	a := core.activityLog
@@ -607,8 +582,6 @@ func TestActivityLog_ReceivedFragment(t *testing.T) {
 	}
 }
 
-// TestActivityLog_availableLogsEmptyDirectory verifies that availableLogs returns an empty slice when the log directory
-// is empty.
 func TestActivityLog_availableLogsEmptyDirectory(t *testing.T) {
 	// verify that directory is empty, and nothing goes wrong
 	core, _, _ := TestCoreUnsealed(t)
@@ -622,8 +595,6 @@ func TestActivityLog_availableLogsEmptyDirectory(t *testing.T) {
 	}
 }
 
-// TestActivityLog_availableLogs writes to the direct token paths and entity paths and verifies that the correct start
-// times are returned.
 func TestActivityLog_availableLogs(t *testing.T) {
 	// set up a few files in storage
 	core, _, _ := TestCoreUnsealed(t)
@@ -651,24 +622,22 @@ func TestActivityLog_availableLogs(t *testing.T) {
 	}
 }
 
-// TestActivityLog_MultipleFragmentsAndSegments adds 4000 clients to a fragment
-// and saves it and reads it. The test then adds 4000 more clients and calls
-// receivedFragment with 200 more entities. The current segment is saved to
-// storage and read back. The test verifies that there are 5000 clients in the
-// first segment index, then the rest in the second index.
 func TestActivityLog_MultipleFragmentsAndSegments(t *testing.T) {
-	core, _, _ := TestCoreUnsealedWithConfig(t, &CoreConfig{
-		ActivityLogConfig: ActivityLogCoreConfig{
-			DisableFragmentWorker: true,
-			DisableTimers:         true,
-		},
-	})
+	core, _, _ := TestCoreUnsealed(t)
 	a := core.activityLog
 
 	// enabled check is now inside AddClientToFragment
 	a.SetEnable(true)
 	a.SetStartTimestamp(time.Now().Unix()) // set a nonzero segment
 
+	// Stop timers for test purposes
+	close(a.doneCh)
+	defer func() {
+		a.l.Lock()
+		a.doneCh = make(chan struct{}, 1)
+		a.l.Unlock()
+	}()
+
 	startTimestamp := a.GetStartTimestamp()
 	path0 := fmt.Sprintf("sys/counters/activity/log/entity/%d/0", startTimestamp)
 	path1 := fmt.Sprintf("sys/counters/activity/log/entity/%d/1", startTimestamp)
@@ -821,7 +790,6 @@ func TestActivityLog_MultipleFragmentsAndSegments(t *testing.T) {
 	}
 }
 
-// TestActivityLog_API_ConfigCRUD performs various CRUD operations on internal/counters/config.
 func TestActivityLog_API_ConfigCRUD(t *testing.T) {
 	core, b, _ := testCoreSystemBackend(t)
 	view := core.systemBarrierView
@@ -835,13 +803,10 @@ func TestActivityLog_API_ConfigCRUD(t *testing.T) {
 			t.Fatalf("err: %v", err)
 		}
 		defaults := map[string]interface{}{
-			"default_report_months":    12,
-			"retention_months":         24,
-			"enabled":                  activityLogEnabledDefaultValue,
-			"queries_available":        false,
-			"reporting_enabled":        core.CensusLicensingEnabled(),
-			"billing_start_timestamp":  core.BillingStart(),
-			"minimum_retention_months": core.activityLog.configOverrides.MinimumRetentionMonths,
+			"default_report_months": 12,
+			"retention_months":      24,
+			"enabled":               activityLogEnabledDefaultValue,
+			"queries_available":     false,
 		}
 
 		if diff := deep.Equal(resp.Data, defaults); len(diff) > 0 {
@@ -919,13 +884,10 @@ func TestActivityLog_API_ConfigCRUD(t *testing.T) {
 			t.Fatalf("err: %v", err)
 		}
 		expected := map[string]interface{}{
-			"default_report_months":    1,
-			"retention_months":         2,
-			"enabled":                  "enable",
-			"queries_available":        false,
-			"reporting_enabled":        core.CensusLicensingEnabled(),
-			"billing_start_timestamp":  core.BillingStart(),
-			"minimum_retention_months": core.activityLog.configOverrides.MinimumRetentionMonths,
+			"default_report_months": 1,
+			"retention_months":      2,
+			"enabled":               "enable",
+			"queries_available":     false,
 		}
 
 		if diff := deep.Equal(resp.Data, expected); len(diff) > 0 {
@@ -958,13 +920,10 @@ func TestActivityLog_API_ConfigCRUD(t *testing.T) {
 		}
 
 		defaults := map[string]interface{}{
-			"default_report_months":    12,
-			"retention_months":         24,
-			"enabled":                  activityLogEnabledDefaultValue,
-			"queries_available":        false,
-			"reporting_enabled":        core.CensusLicensingEnabled(),
-			"billing_start_timestamp":  core.BillingStart(),
-			"minimum_retention_months": core.activityLog.configOverrides.MinimumRetentionMonths,
+			"default_report_months": 12,
+			"retention_months":      24,
+			"enabled":               activityLogEnabledDefaultValue,
+			"queries_available":     false,
 		}
 
 		if diff := deep.Equal(resp.Data, defaults); len(diff) > 0 {
@@ -973,7 +932,6 @@ func TestActivityLog_API_ConfigCRUD(t *testing.T) {
 	}
 }
 
-// TestActivityLog_parseSegmentNumberFromPath verifies that the segment number is extracted correctly from a path.
 func TestActivityLog_parseSegmentNumberFromPath(t *testing.T) {
 	testCases := []struct {
 		input        string
@@ -1023,7 +981,6 @@ func TestActivityLog_parseSegmentNumberFromPath(t *testing.T) {
 	}
 }
 
-// TestActivityLog_getLastEntitySegmentNumber verifies that the last segment number is correctly returned.
 func TestActivityLog_getLastEntitySegmentNumber(t *testing.T) {
 	core, _, _ := TestCoreUnsealed(t)
 	a := core.activityLog
@@ -1079,8 +1036,6 @@ func TestActivityLog_getLastEntitySegmentNumber(t *testing.T) {
 	}
 }
 
-// TestActivityLog_tokenCountExists writes to the direct tokens segment path and verifies that segment count exists
-// returns true for the segments at these paths.
 func TestActivityLog_tokenCountExists(t *testing.T) {
 	core, _, _ := TestCoreUnsealed(t)
 	a := core.activityLog
@@ -1205,8 +1160,6 @@ func (a *ActivityLog) resetEntitiesInMemory(t *testing.T) {
 	a.partialMonthClientTracker = make(map[string]*activity.EntityRecord)
 }
 
-// TestActivityLog_loadCurrentClientSegment writes entity segments and calls loadCurrentClientSegment, then verifies
-// that the correct values are returned when querying the current segment.
 func TestActivityLog_loadCurrentClientSegment(t *testing.T) {
 	core, _, _ := TestCoreUnsealed(t)
 	a := core.activityLog
@@ -1323,8 +1276,6 @@ func TestActivityLog_loadCurrentClientSegment(t *testing.T) {
 	}
 }
 
-// TestActivityLog_loadPriorEntitySegment writes entities to two months and calls loadPriorEntitySegment for each month,
-// verifying that the active clients are correct.
 func TestActivityLog_loadPriorEntitySegment(t *testing.T) {
 	core, _, _ := TestCoreUnsealed(t)
 	a := core.activityLog
@@ -1469,9 +1420,6 @@ func TestActivityLog_loadTokenCount(t *testing.T) {
 	}
 }
 
-// TestActivityLog_StopAndRestart disables the activity log, waits for deletes to complete, and then enables the
-// activity log. The activity log is then stopped and started again, to simulate a seal and unseal. The test then
-// verifies that there's no error adding an entity, direct token, and when writing a segment to storage.
 func TestActivityLog_StopAndRestart(t *testing.T) {
 	core, b, _ := testCoreSystemBackend(t)
 	sysView := core.systemBarrierView
@@ -1603,8 +1551,6 @@ func setupActivityRecordsInStorage(t *testing.T, base time.Time, includeEntities
 	return a, entityRecords, tokenRecords
 }
 
-// TestActivityLog_refreshFromStoredLog writes records for 3 months ago and this month, then calls refreshFromStoredLog.
-// The test verifies that current entities and current tokens are correct.
 func TestActivityLog_refreshFromStoredLog(t *testing.T) {
 	a, expectedClientRecords, expectedTokenCounts := setupActivityRecordsInStorage(t, time.Now().UTC(), true, true)
 	a.SetEnable(true)
@@ -1642,9 +1588,6 @@ func TestActivityLog_refreshFromStoredLog(t *testing.T) {
 	}
 }
 
-// TestActivityLog_refreshFromStoredLogWithBackgroundLoadingCancelled writes data from 3 months ago to this month. The
-// test closes a.doneCh and calls refreshFromStoredLog, which will not do any processing because the doneCh is closed.
-// The test verifies that the current data is not loaded.
 func TestActivityLog_refreshFromStoredLogWithBackgroundLoadingCancelled(t *testing.T) {
 	a, expectedClientRecords, expectedTokenCounts := setupActivityRecordsInStorage(t, time.Now().UTC(), true, true)
 	a.SetEnable(true)
@@ -1686,8 +1629,6 @@ func TestActivityLog_refreshFromStoredLogWithBackgroundLoadingCancelled(t *testi
 	}
 }
 
-// TestActivityLog_refreshFromStoredLogContextCancelled writes data from 3 months ago to this month and calls
-// refreshFromStoredLog with a canceled context, verifying that the function errors because of the canceled context.
 func TestActivityLog_refreshFromStoredLogContextCancelled(t *testing.T) {
 	a, _, _ := setupActivityRecordsInStorage(t, time.Now().UTC(), true, true)
 
@@ -1701,8 +1642,6 @@ func TestActivityLog_refreshFromStoredLogContextCancelled(t *testing.T) {
 	}
 }
 
-// TestActivityLog_refreshFromStoredLogNoTokens writes only entities from 3 months ago to today, then calls
-// refreshFromStoredLog. It verifies that there are no tokens loaded.
 func TestActivityLog_refreshFromStoredLogNoTokens(t *testing.T) {
 	a, expectedClientRecords, _ := setupActivityRecordsInStorage(t, time.Now().UTC(), true, false)
 	a.SetEnable(true)
@@ -1738,8 +1677,6 @@ func TestActivityLog_refreshFromStoredLogNoTokens(t *testing.T) {
 	}
 }
 
-// TestActivityLog_refreshFromStoredLogNoEntities writes only direct tokens from 3 months ago to today, and runs
-// refreshFromStoredLog. It verifies that there are no entities or clients loaded.
 func TestActivityLog_refreshFromStoredLogNoEntities(t *testing.T) {
 	a, _, expectedTokenCounts := setupActivityRecordsInStorage(t, time.Now().UTC(), false, true)
 	a.SetEnable(true)
@@ -1767,8 +1704,6 @@ func TestActivityLog_refreshFromStoredLogNoEntities(t *testing.T) {
 	}
 }
 
-// TestActivityLog_refreshFromStoredLogNoData writes nothing and calls refreshFromStoredLog, and verifies that the
-// current segment counts are zero.
 func TestActivityLog_refreshFromStoredLogNoData(t *testing.T) {
 	now := time.Now().UTC()
 	a, _, _ := setupActivityRecordsInStorage(t, now, false, false)
@@ -1784,8 +1719,6 @@ func TestActivityLog_refreshFromStoredLogNoData(t *testing.T) {
 	a.ExpectCurrentSegmentRefreshed(t, now.Unix(), false)
 }
 
-// TestActivityLog_refreshFromStoredLogTwoMonthsPrevious creates segment data from 5 months ago to 2 months ago and
-// calls refreshFromStoredLog, then verifies that the current segment counts are zero.
 func TestActivityLog_refreshFromStoredLogTwoMonthsPrevious(t *testing.T) {
 	// test what happens when the most recent data is from month M-2 (or earlier - same effect)
 	now := time.Now().UTC()
@@ -1803,8 +1736,6 @@ func TestActivityLog_refreshFromStoredLogTwoMonthsPrevious(t *testing.T) {
 	a.ExpectCurrentSegmentRefreshed(t, now.Unix(), false)
 }
 
-// TestActivityLog_refreshFromStoredLogPreviousMonth creates segment data from 4 months ago to 1 month ago, then calls
-// refreshFromStoredLog, then verifies that these clients are included in the current segment.
 func TestActivityLog_refreshFromStoredLogPreviousMonth(t *testing.T) {
 	// test what happens when most recent data is from month M-1
 	// we expect to load the data from the previous month so that the activeFragmentWorker
@@ -1847,8 +1778,6 @@ func TestActivityLog_refreshFromStoredLogPreviousMonth(t *testing.T) {
 	}
 }
 
-// TestActivityLog_Export writes overlapping client for 5 months with various mounts and namespaces. It performs an
-// export for various month ranges in the range, and verifies that the outputs are correct.
 func TestActivityLog_Export(t *testing.T) {
 	timeutil.SkipAtEndOfMonth(t)
 
@@ -2040,8 +1969,6 @@ func (f *fakeResponseWriter) WriteHeader(statusCode int) {
 	panic("unimplmeneted")
 }
 
-// TestActivityLog_IncludeNamespace verifies that includeInResponse returns true for namespaces that are children of
-// their parents.
 func TestActivityLog_IncludeNamespace(t *testing.T) {
 	root := namespace.RootNamespace
 	a := &ActivityLog{}
@@ -2089,8 +2016,6 @@ func TestActivityLog_IncludeNamespace(t *testing.T) {
 	}
 }
 
-// TestActivityLog_DeleteWorker writes segments for entities and direct tokens for 2 different timestamps, then runs the
-// deleteLogWorker for one of the timestamps. The test verifies that the correct segment is deleted, and the other remains.
 func TestActivityLog_DeleteWorker(t *testing.T) {
 	core, _, _ := TestCoreUnsealed(t)
 	a := core.activityLog
@@ -2146,9 +2071,6 @@ func checkAPIWarnings(t *testing.T, originalEnabled, newEnabled bool, resp *logi
 	}
 }
 
-// TestActivityLog_EnableDisable writes a segment, adds an entity to the in-memory fragment, then disables the activity
-// log. The test verifies that the segment doesn't exist. The activity log is enabled, then verified that an empty
-// segment is written and new clients can be added and written to segments.
 func TestActivityLog_EnableDisable(t *testing.T) {
 	timeutil.SkipAtEndOfMonth(t)
 
@@ -2786,9 +2708,6 @@ func TestActivityLog_SaveAfterDisable(t *testing.T) {
 	expectMissingSegment(t, core, path)
 }
 
-// TestActivityLog_Precompute creates segments over a range of 11 months, with overlapping clients and namespaces.
-// Create intent logs and run precomputedQueryWorker for various month ranges. Verify that the precomputed queries have
-// the correct counts, including per namespace.
 func TestActivityLog_Precompute(t *testing.T) {
 	timeutil.SkipAtEndOfMonth(t)
 
@@ -3676,8 +3595,6 @@ func (b *BlockingInmemStorage) Delete(ctx context.Context, key string) error {
 	return errors.New("fake implementation")
 }
 
-// TestActivityLog_PrecomputeCancel stops the activity log before running the precomputedQueryWorker, and verifies that
-// the context used to query storage has been canceled.
 func TestActivityLog_PrecomputeCancel(t *testing.T) {
 	core, _, _ := TestCoreUnsealed(t)
 	a := core.activityLog
@@ -3706,8 +3623,6 @@ func TestActivityLog_PrecomputeCancel(t *testing.T) {
 	}
 }
 
-// TestActivityLog_NextMonthStart sets the activity log start timestamp, then verifies that StartOfNextMonth returns the
-// correct value.
 func TestActivityLog_NextMonthStart(t *testing.T) {
 	timeutil.SkipAtEndOfMonth(t)
 
@@ -3760,8 +3675,6 @@ func waitForRetentionWorkerToFinish(t *testing.T, a *ActivityLog) {
 	}
 }
 
-// TestActivityLog_Deletion writes entity, direct tokens, and queries for dates ranging over 20 months. Then the test
-// calls the retentionWorker with decreasing retention values, and verifies that the correct paths are being deleted.
 func TestActivityLog_Deletion(t *testing.T) {
 	timeutil.SkipAtEndOfMonth(t)
 
@@ -3877,8 +3790,6 @@ func TestActivityLog_Deletion(t *testing.T) {
 	checkPresent(21)
 }
 
-// TestActivityLog_partialMonthClientCount writes segment data for the curren month and runs refreshFromStoredLog and
-// then partialMonthClientCount. The test verifies that the values returned by partialMonthClientCount are correct.
 func TestActivityLog_partialMonthClientCount(t *testing.T) {
 	timeutil.SkipAtEndOfMonth(t)
 
@@ -3948,8 +3859,6 @@ func TestActivityLog_partialMonthClientCount(t *testing.T) {
 	}
 }
 
-// TestActivityLog_partialMonthClientCountUsingHandleQuery writes segments for the current month and calls
-// refreshFromStoredLog, then handleQuery. The test verifies that the results from handleQuery are correct.
 func TestActivityLog_partialMonthClientCountUsingHandleQuery(t *testing.T) {
 	timeutil.SkipAtEndOfMonth(t)
 
@@ -4075,675 +3984,3 @@ func TestActivityLog_partialMonthClientCountUsingHandleQuery(t *testing.T) {
 		}
 	}
 }
-
-// TestActivityLog_handleQuery_normalizedMountPaths ensures that the mount paths returned by the activity log always have a trailing slash and client accounting is done correctly when there's no trailing slash.
-// Two clients that have the same mount path, but one has a trailing slash, should be considered part of the same mount path.
-func TestActivityLog_handleQuery_normalizedMountPaths(t *testing.T) {
-	timeutil.SkipAtEndOfMonth(t)
-
-	core, _, _ := TestCoreUnsealed(t)
-	_, barrier, _ := mockBarrier(t)
-	view := NewBarrierView(barrier, "auth/")
-	ctx := namespace.RootContext(nil)
-	now := time.Now().UTC()
-	a := core.activityLog
-	a.SetEnable(true)
-
-	uuid1, err := uuid.GenerateUUID()
-	require.NoError(t, err)
-	uuid2, err := uuid.GenerateUUID()
-	require.NoError(t, err)
-	accessor1 := "accessor1"
-	accessor2 := "accessor2"
-	pathWithSlash := "auth/foo/"
-	pathWithoutSlash := "auth/foo"
-
-	// create two mounts of the same name. One has a trailing slash, the other doesn't
-	err = core.router.Mount(&NoopBackend{}, "auth/foo", &MountEntry{UUID: uuid1, Accessor: accessor1, NamespaceID: namespace.RootNamespaceID, namespace: namespace.RootNamespace, Path: pathWithSlash}, view)
-	require.NoError(t, err)
-	err = core.router.Mount(&NoopBackend{}, "auth/bar", &MountEntry{UUID: uuid2, Accessor: accessor2, NamespaceID: namespace.RootNamespaceID, namespace: namespace.RootNamespace, Path: pathWithoutSlash}, view)
-	require.NoError(t, err)
-
-	// handle token usage for each of the mount paths
-	a.HandleTokenUsage(ctx, &logical.TokenEntry{Path: pathWithSlash, NamespaceID: namespace.RootNamespaceID}, "id1", false)
-	a.HandleTokenUsage(ctx, &logical.TokenEntry{Path: pathWithoutSlash, NamespaceID: namespace.RootNamespaceID}, "id2", false)
-	// and have client 2 use both mount paths
-	a.HandleTokenUsage(ctx, &logical.TokenEntry{Path: pathWithSlash, NamespaceID: namespace.RootNamespaceID}, "id2", false)
-
-	// query the data for the month
-	results, err := a.handleQuery(ctx, timeutil.StartOfMonth(now), timeutil.EndOfMonth(now), 0)
-	require.NoError(t, err)
-
-	byNamespace := results["by_namespace"].([]*ResponseNamespace)
-	require.Len(t, byNamespace, 1)
-	byMount := byNamespace[0].Mounts
-	require.Len(t, byMount, 1)
-	mountPath := byMount[0].MountPath
-
-	// verify that both clients are recorded for the mount path with the slash
-	require.Equal(t, mountPath, pathWithSlash)
-	require.Equal(t, byMount[0].Counts.Clients, 2)
-}
-
-// TestActivityLog_partialMonthClientCountWithMultipleMountPaths verifies that logic in refreshFromStoredLog includes all mount paths
-// in its mount data. In this test we create 3 entity records with different mount accessors: one is empty, one is
-// valid, one can't be found (so it's assumed the mount is deleted). These records are written to storage, then this data is
-// refreshed in refreshFromStoredLog, and finally we verify the results returned with partialMonthClientCount.
-func TestActivityLog_partialMonthClientCountWithMultipleMountPaths(t *testing.T) {
-	timeutil.SkipAtEndOfMonth(t)
-
-	core, _, _ := TestCoreUnsealed(t)
-	_, barrier, _ := mockBarrier(t)
-	view := NewBarrierView(barrier, "auth/")
-
-	ctx := namespace.RootContext(nil)
-	now := time.Now().UTC()
-	meUUID, err := uuid.GenerateUUID()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	a := core.activityLog
-	path := "auth/foo/bar/"
-	accessor := "authfooaccessor"
-
-	// we mount a path using the accessor 'authfooaccessor' which has mount path "auth/foo/bar"
-	// when an entity record references this accessor, activity log will be able to find it on its mounts and translate the mount accessor
-	// into a mount path
-	err = core.router.Mount(&NoopBackend{}, "auth/foo/", &MountEntry{UUID: meUUID, Accessor: accessor, NamespaceID: namespace.RootNamespaceID, namespace: namespace.RootNamespace, Path: path}, view)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	entityRecords := []*activity.EntityRecord{
-		{
-			// this record has no mount accessor, so it'll get recorded as a pre-1.10 upgrade
-			ClientID:    "11111111-1111-1111-1111-111111111111",
-			NamespaceID: namespace.RootNamespaceID,
-			Timestamp:   time.Now().Unix(),
-		},
-		{
-			// this record's mount path won't be able to be found, because there's no mount with the accessor 'deleted'
-			// the code in mountAccessorToMountPath assumes that if the mount accessor isn't empty but the mount path
-			// can't be found, then the mount must have been deleted
-			ClientID:      "22222222-2222-2222-2222-222222222222",
-			NamespaceID:   namespace.RootNamespaceID,
-			Timestamp:     time.Now().Unix(),
-			MountAccessor: "deleted",
-		},
-		{
-			// this record will have mount path 'auth/foo/bar', because we set up the mount above
-			ClientID:      "33333333-2222-2222-2222-222222222222",
-			NamespaceID:   namespace.RootNamespaceID,
-			Timestamp:     time.Now().Unix(),
-			MountAccessor: "authfooaccessor",
-		},
-	}
-	for i, entityRecord := range entityRecords {
-		entityData, err := proto.Marshal(&activity.EntityActivityLog{
-			Clients: []*activity.EntityRecord{entityRecord},
-		})
-		if err != nil {
-			t.Fatalf(err.Error())
-		}
-		storagePath := fmt.Sprintf("%sentity/%d/%d", ActivityLogPrefix, timeutil.StartOfMonth(now).Unix(), i)
-		WriteToStorage(t, core, storagePath, entityData)
-	}
-
-	a.SetEnable(true)
-	var wg sync.WaitGroup
-	err = a.refreshFromStoredLog(ctx, &wg, now)
-	if err != nil {
-		t.Fatalf("error loading clients: %v", err)
-	}
-	wg.Wait()
-
-	results, err := a.partialMonthClientCount(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if results == nil {
-		t.Fatal("no results to test")
-	}
-
-	byNamespace, ok := results["by_namespace"]
-	if !ok {
-		t.Fatalf("malformed results. got %v", results)
-	}
-
-	clientCountResponse := make([]*ResponseNamespace, 0)
-	err = mapstructure.Decode(byNamespace, &clientCountResponse)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(clientCountResponse) != 1 {
-		t.Fatalf("incorrect client count responses, expected 1 but got %d", len(clientCountResponse))
-	}
-	if len(clientCountResponse[0].Mounts) != len(entityRecords) {
-		t.Fatalf("incorrect client mounts, expected %d but got %d", len(entityRecords), len(clientCountResponse[0].Mounts))
-	}
-	byPath := make(map[string]int, len(clientCountResponse[0].Mounts))
-	for _, mount := range clientCountResponse[0].Mounts {
-		byPath[mount.MountPath] = byPath[mount.MountPath] + mount.Counts.Clients
-	}
-
-	// these are the paths that are expected and correspond with the entity records created above
-	expectedPaths := []string{
-		noMountAccessor,
-		fmt.Sprintf(deletedMountFmt, "deleted"),
-		path,
-	}
-	for _, expectedPath := range expectedPaths {
-		count, ok := byPath[expectedPath]
-		if !ok {
-			t.Fatalf("path %s not found", expectedPath)
-		}
-		if count != 1 {
-			t.Fatalf("incorrect count value %d for path %s", count, expectedPath)
-		}
-	}
-}
-
-// TestActivityLog_processNewClients_delete ensures that the correct clients are deleted from a processNewClients struct
-func TestActivityLog_processNewClients_delete(t *testing.T) {
-	mount := "mount"
-	namespace := "namespace"
-	clientID := "client-id"
-	run := func(t *testing.T, isNonEntity bool) {
-		t.Helper()
-		record := &activity.EntityRecord{
-			MountAccessor: mount,
-			NamespaceID:   namespace,
-			ClientID:      clientID,
-			NonEntity:     isNonEntity,
-		}
-		newClients := newProcessNewClients()
-		newClients.add(record)
-
-		require.True(t, newClients.Counts.contains(record))
-		require.True(t, newClients.Namespaces[namespace].Counts.contains(record))
-		require.True(t, newClients.Namespaces[namespace].Mounts[mount].Counts.contains(record))
-
-		newClients.delete(record)
-
-		byNS := newClients.Namespaces
-		counts := newClients.Counts
-		require.NotContains(t, counts.NonEntities, clientID)
-		require.NotContains(t, counts.Entities, clientID)
-
-		require.NotContains(t, counts.NonEntities, clientID)
-		require.NotContains(t, counts.Entities, clientID)
-
-		require.NotContains(t, byNS[namespace].Mounts[mount].Counts.NonEntities, clientID)
-		require.NotContains(t, byNS[namespace].Counts.NonEntities, clientID)
-
-		require.NotContains(t, byNS[namespace].Mounts[mount].Counts.Entities, clientID)
-		require.NotContains(t, byNS[namespace].Counts.Entities, clientID)
-	}
-	t.Run("entity", func(t *testing.T) {
-		run(t, false)
-	})
-	t.Run("non-entity", func(t *testing.T) {
-		run(t, true)
-	})
-}
-
-// TestActivityLog_processClientRecord calls processClientRecord for an entity and a non-entity record and verifies that
-// the record is present in the namespace and month maps
-func TestActivityLog_processClientRecord(t *testing.T) {
-	startTime := time.Now()
-	mount := "mount"
-	namespace := "namespace"
-	clientID := "client-id"
-	run := func(t *testing.T, isNonEntity bool) {
-		t.Helper()
-		record := &activity.EntityRecord{
-			MountAccessor: mount,
-			NamespaceID:   namespace,
-			ClientID:      clientID,
-			NonEntity:     isNonEntity,
-		}
-		byNS := make(summaryByNamespace)
-		byMonth := make(summaryByMonth)
-		processClientRecord(record, byNS, byMonth, startTime)
-		require.Contains(t, byNS, namespace)
-		require.Contains(t, byNS[namespace].Mounts, mount)
-		monthIndex := timeutil.StartOfMonth(startTime).UTC().Unix()
-		require.Contains(t, byMonth, monthIndex)
-		require.Equal(t, byMonth[monthIndex].Namespaces, byNS)
-		require.Equal(t, byMonth[monthIndex].NewClients.Namespaces, byNS)
-
-		if isNonEntity {
-			require.Contains(t, byMonth[monthIndex].Counts.NonEntities, clientID)
-			require.NotContains(t, byMonth[monthIndex].Counts.Entities, clientID)
-
-			require.Contains(t, byMonth[monthIndex].NewClients.Counts.NonEntities, clientID)
-			require.NotContains(t, byMonth[monthIndex].NewClients.Counts.Entities, clientID)
-
-			require.Contains(t, byNS[namespace].Mounts[mount].Counts.NonEntities, clientID)
-			require.Contains(t, byNS[namespace].Counts.NonEntities, clientID)
-
-			require.NotContains(t, byNS[namespace].Mounts[mount].Counts.Entities, clientID)
-			require.NotContains(t, byNS[namespace].Counts.Entities, clientID)
-		} else {
-			require.Contains(t, byMonth[monthIndex].Counts.Entities, clientID)
-			require.NotContains(t, byMonth[monthIndex].Counts.NonEntities, clientID)
-
-			require.Contains(t, byMonth[monthIndex].NewClients.Counts.Entities, clientID)
-			require.NotContains(t, byMonth[monthIndex].NewClients.Counts.NonEntities, clientID)
-
-			require.Contains(t, byNS[namespace].Mounts[mount].Counts.Entities, clientID)
-			require.Contains(t, byNS[namespace].Counts.Entities, clientID)
-
-			require.NotContains(t, byNS[namespace].Mounts[mount].Counts.NonEntities, clientID)
-			require.NotContains(t, byNS[namespace].Counts.NonEntities, clientID)
-		}
-	}
-	t.Run("non entity", func(t *testing.T) {
-		run(t, true)
-	})
-	t.Run("entity", func(t *testing.T) {
-		run(t, false)
-	})
-}
-
-func verifyByNamespaceContains(t *testing.T, s summaryByNamespace, clients ...*activity.EntityRecord) {
-	t.Helper()
-	for _, c := range clients {
-		require.Contains(t, s, c.NamespaceID)
-		counts := s[c.NamespaceID].Counts
-		require.True(t, counts.contains(c))
-		mounts := s[c.NamespaceID].Mounts
-		require.Contains(t, mounts, c.MountAccessor)
-		require.True(t, mounts[c.MountAccessor].Counts.contains(c))
-	}
-}
-
-func (s summaryByMonth) firstSeen(t *testing.T, client *activity.EntityRecord) time.Time {
-	t.Helper()
-	var seen int64
-	for month, data := range s {
-		present := data.NewClients.Counts.contains(client)
-		if present {
-			if seen != 0 {
-				require.Fail(t, "client seen more than once", client.ClientID, s)
-			}
-			seen = month
-		}
-	}
-	return time.Unix(seen, 0).UTC()
-}
-
-// TestActivityLog_handleEntitySegment verifies that the by namespace and by month summaries are correctly filled in a
-// variety of scenarios
-func TestActivityLog_handleEntitySegment(t *testing.T) {
-	finalTime := timeutil.StartOfMonth(time.Date(2022, 12, 1, 0, 0, 0, 0, time.UTC))
-	addMonths := func(i int) time.Time {
-		return timeutil.StartOfMonth(finalTime.AddDate(0, i, 0))
-	}
-	currentSegmentClients := make([]*activity.EntityRecord, 0, 3)
-	for i := 0; i < 3; i++ {
-		currentSegmentClients = append(currentSegmentClients, &activity.EntityRecord{
-			ClientID:      fmt.Sprintf("id-%d", i),
-			NamespaceID:   fmt.Sprintf("ns-%d", i),
-			MountAccessor: fmt.Sprintf("mnt-%d", i),
-			NonEntity:     i == 0,
-		})
-	}
-	a := &ActivityLog{}
-	t.Run("older segment empty", func(t *testing.T) {
-		hll := hyperloglog.New()
-		byNS := make(summaryByNamespace)
-		byMonth := make(summaryByMonth)
-		segmentTime := addMonths(-3)
-		// our 3 clients were seen 3 months ago, with no other clients having been seen
-		err := a.handleEntitySegment(&activity.EntityActivityLog{Clients: currentSegmentClients}, segmentTime, hll, pqOptions{
-			byNamespace:       byNS,
-			byMonth:           byMonth,
-			endTime:           timeutil.EndOfMonth(segmentTime),
-			activePeriodStart: addMonths(-12),
-			activePeriodEnd:   addMonths(12),
-		})
-		require.NoError(t, err)
-		require.Len(t, byNS, 3)
-		verifyByNamespaceContains(t, byNS, currentSegmentClients...)
-		require.Len(t, byMonth, 1)
-		// they should all be registered as having first been seen 3 months ago
-		require.Equal(t, byMonth.firstSeen(t, currentSegmentClients[0]), segmentTime)
-		require.Equal(t, byMonth.firstSeen(t, currentSegmentClients[1]), segmentTime)
-		require.Equal(t, byMonth.firstSeen(t, currentSegmentClients[2]), segmentTime)
-		// and all 3 should be in the hyperloglog
-		require.Equal(t, hll.Estimate(), uint64(3))
-	})
-	t.Run("older segment clients seen earlier", func(t *testing.T) {
-		hll := hyperloglog.New()
-		byNS := make(summaryByNamespace)
-		byNS.add(currentSegmentClients[0])
-		byNS.add(currentSegmentClients[1])
-		byMonth := make(summaryByMonth)
-		segmentTime := addMonths(-3)
-		seenBefore2Months := addMonths(-2)
-		seenBefore1Month := addMonths(-1)
-
-		// client 0 was seen 2 months ago
-		byMonth.add(currentSegmentClients[0], seenBefore2Months)
-		// client 1 was seen 1 month ago
-		byMonth.add(currentSegmentClients[1], seenBefore1Month)
-
-		// handle clients 0, 1, and 2 as having been seen 3 months ago
-		err := a.handleEntitySegment(&activity.EntityActivityLog{Clients: currentSegmentClients}, segmentTime, hll, pqOptions{
-			byNamespace:       byNS,
-			byMonth:           byMonth,
-			endTime:           timeutil.EndOfMonth(segmentTime),
-			activePeriodStart: addMonths(-12),
-			activePeriodEnd:   addMonths(12),
-		})
-		require.NoError(t, err)
-		require.Len(t, byNS, 3)
-		verifyByNamespaceContains(t, byNS, currentSegmentClients...)
-		// we expect that they will only be registered as new 3 months ago, because that's when they were first seen
-		require.Equal(t, byMonth.firstSeen(t, currentSegmentClients[0]), segmentTime)
-		require.Equal(t, byMonth.firstSeen(t, currentSegmentClients[1]), segmentTime)
-		require.Equal(t, byMonth.firstSeen(t, currentSegmentClients[2]), segmentTime)
-
-		require.Equal(t, hll.Estimate(), uint64(3))
-	})
-	t.Run("disjoint set of clients", func(t *testing.T) {
-		hll := hyperloglog.New()
-		byNS := make(summaryByNamespace)
-		byNS.add(currentSegmentClients[0])
-		byNS.add(currentSegmentClients[1])
-		byMonth := make(summaryByMonth)
-		segmentTime := addMonths(-3)
-		seenBefore2Months := addMonths(-2)
-		seenBefore1Month := addMonths(-1)
-
-		// client 0 was seen 2 months ago
-		byMonth.add(currentSegmentClients[0], seenBefore2Months)
-		// client 1 was seen 1 month ago
-		byMonth.add(currentSegmentClients[1], seenBefore1Month)
-
-		// handle client 2 as having been seen 3 months ago
-		err := a.handleEntitySegment(&activity.EntityActivityLog{Clients: currentSegmentClients[2:]}, segmentTime, hll, pqOptions{
-			byNamespace:       byNS,
-			byMonth:           byMonth,
-			endTime:           timeutil.EndOfMonth(segmentTime),
-			activePeriodStart: addMonths(-12),
-			activePeriodEnd:   addMonths(12),
-		})
-		require.NoError(t, err)
-		require.Len(t, byNS, 3)
-		verifyByNamespaceContains(t, byNS, currentSegmentClients...)
-		// client 2 should be added to the map, and the other clients should stay where they were
-		require.Equal(t, byMonth.firstSeen(t, currentSegmentClients[0]), seenBefore2Months)
-		require.Equal(t, byMonth.firstSeen(t, currentSegmentClients[1]), seenBefore1Month)
-		require.Equal(t, byMonth.firstSeen(t, currentSegmentClients[2]), segmentTime)
-		// the hyperloglog will have 1 element, because there was only 1 client in the segment
-		require.Equal(t, hll.Estimate(), uint64(1))
-	})
-	t.Run("new clients same namespaces", func(t *testing.T) {
-		hll := hyperloglog.New()
-		byNS := make(summaryByNamespace)
-		byNS.add(currentSegmentClients[0])
-		byNS.add(currentSegmentClients[1])
-		byNS.add(currentSegmentClients[2])
-		byMonth := make(summaryByMonth)
-		segmentTime := addMonths(-3)
-		seenBefore2Months := addMonths(-2)
-		seenBefore1Month := addMonths(-1)
-
-		// client 0 and 2 were seen 2 months ago
-		byMonth.add(currentSegmentClients[0], seenBefore2Months)
-		byMonth.add(currentSegmentClients[2], seenBefore2Months)
-		// client 1 was seen 1 month ago
-		byMonth.add(currentSegmentClients[1], seenBefore1Month)
-
-		// create 3 additional clients
-		// these have ns-1, ns-2, ns-3 and mnt-1, mnt-2, mnt-3
-		moreSegmentClients := make([]*activity.EntityRecord, 0, 3)
-		for i := 0; i < 3; i++ {
-			moreSegmentClients = append(moreSegmentClients, &activity.EntityRecord{
-				ClientID:      fmt.Sprintf("id-%d", i+3),
-				NamespaceID:   fmt.Sprintf("ns-%d", i),
-				MountAccessor: fmt.Sprintf("ns-%d", i),
-				NonEntity:     i == 1,
-			})
-		}
-		// 3 new clients have been seen 3 months ago
-		err := a.handleEntitySegment(&activity.EntityActivityLog{Clients: moreSegmentClients}, segmentTime, hll, pqOptions{
-			byNamespace:       byNS,
-			byMonth:           byMonth,
-			endTime:           timeutil.EndOfMonth(segmentTime),
-			activePeriodStart: addMonths(-12),
-			activePeriodEnd:   addMonths(12),
-		})
-		require.NoError(t, err)
-		// there are only 3 namespaces, since both currentSegmentClients and moreSegmentClients use the same namespaces
-		require.Len(t, byNS, 3)
-		verifyByNamespaceContains(t, byNS, currentSegmentClients...)
-		verifyByNamespaceContains(t, byNS, moreSegmentClients...)
-		// The segment clients that have already been seen have their same first seen dates
-		require.Equal(t, byMonth.firstSeen(t, currentSegmentClients[0]), seenBefore2Months)
-		require.Equal(t, byMonth.firstSeen(t, currentSegmentClients[1]), seenBefore1Month)
-		require.Equal(t, byMonth.firstSeen(t, currentSegmentClients[2]), seenBefore2Months)
-		// and the new clients should be first seen at segmentTime
-		require.Equal(t, byMonth.firstSeen(t, moreSegmentClients[0]), segmentTime)
-		require.Equal(t, byMonth.firstSeen(t, moreSegmentClients[1]), segmentTime)
-		require.Equal(t, byMonth.firstSeen(t, moreSegmentClients[2]), segmentTime)
-		// the hyperloglog will have 3 elements, because there were the 3 new elements in moreSegmentClients seen
-		require.Equal(t, hll.Estimate(), uint64(3))
-	})
-}
-
-// TestActivityLog_breakdownTokenSegment verifies that tokens are correctly added to a map that tracks counts per namespace
-func TestActivityLog_breakdownTokenSegment(t *testing.T) {
-	toAdd := map[string]uint64{
-		"a": 1,
-		"b": 2,
-		"c": 3,
-	}
-	a := &ActivityLog{}
-	testCases := []struct {
-		name                    string
-		existingNamespaceCounts map[string]uint64
-		wantCounts              map[string]uint64
-	}{
-		{
-			name:       "empty",
-			wantCounts: toAdd,
-		},
-		{
-			name: "some overlap",
-			existingNamespaceCounts: map[string]uint64{
-				"a": 2,
-				"z": 1,
-			},
-			wantCounts: map[string]uint64{
-				"a": 3,
-				"b": 2,
-				"c": 3,
-				"z": 1,
-			},
-		},
-		{
-			name: "disjoint sets",
-			existingNamespaceCounts: map[string]uint64{
-				"z": 5,
-				"y": 3,
-				"x": 2,
-			},
-			wantCounts: map[string]uint64{
-				"a": 1,
-				"b": 2,
-				"c": 3,
-				"z": 5,
-				"y": 3,
-				"x": 2,
-			},
-		},
-	}
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			byNamespace := make(map[string]*processByNamespace)
-			for k, v := range tc.existingNamespaceCounts {
-				byNamespace[k] = newByNamespace()
-				byNamespace[k].Counts.Tokens = v
-			}
-			a.breakdownTokenSegment(&activity.TokenCount{CountByNamespaceID: toAdd}, byNamespace)
-			got := make(map[string]uint64)
-			for k, v := range byNamespace {
-				got[k] = v.Counts.Tokens
-			}
-			require.Equal(t, tc.wantCounts, got)
-		})
-	}
-}
-
-// TestActivityLog_writePrecomputedQuery calls writePrecomputedQuery for a segment with 1 non entity and 1 entity client,
-// which have different namespaces and mounts. The precomputed query is then retrieved from storage and we verify that
-// the data structure is filled correctly
-func TestActivityLog_writePrecomputedQuery(t *testing.T) {
-	core, _, _ := TestCoreUnsealed(t)
-
-	a := core.activityLog
-	a.SetEnable(true)
-
-	byMonth := make(summaryByMonth)
-	byNS := make(summaryByNamespace)
-	clientEntity := &activity.EntityRecord{
-		ClientID:      "id-1",
-		NamespaceID:   "ns-1",
-		MountAccessor: "mnt-1",
-	}
-	clientNonEntity := &activity.EntityRecord{
-		ClientID:      "id-2",
-		NamespaceID:   "ns-2",
-		MountAccessor: "mnt-2",
-		NonEntity:     true,
-	}
-	now := time.Now()
-
-	// add the 2 clients to the namespace and month summaries
-	processClientRecord(clientEntity, byNS, byMonth, now)
-	processClientRecord(clientNonEntity, byNS, byMonth, now)
-
-	endTime := timeutil.EndOfMonth(now)
-	opts := pqOptions{
-		byNamespace: byNS,
-		byMonth:     byMonth,
-		endTime:     endTime,
-	}
-
-	err := a.writePrecomputedQuery(context.Background(), now, opts)
-	require.NoError(t, err)
-
-	// read the query back from storage
-	val, err := a.queryStore.Get(context.Background(), now, endTime)
-	require.NoError(t, err)
-	require.Equal(t, now.UTC().Unix(), val.StartTime.UTC().Unix())
-	require.Equal(t, endTime.UTC().Unix(), val.EndTime.UTC().Unix())
-
-	// ns-1 and ns-2 should both be present in the results
-	require.Len(t, val.Namespaces, 2)
-	require.Len(t, val.Months, 1)
-	resultByNS := make(map[string]*activity.NamespaceRecord)
-	for _, ns := range val.Namespaces {
-		resultByNS[ns.NamespaceID] = ns
-	}
-	ns1 := resultByNS["ns-1"]
-	ns2 := resultByNS["ns-2"]
-
-	require.Equal(t, ns1.Entities, uint64(1))
-	require.Equal(t, ns1.NonEntityTokens, uint64(0))
-	require.Equal(t, ns2.Entities, uint64(0))
-	require.Equal(t, ns2.NonEntityTokens, uint64(1))
-
-	require.Len(t, ns1.Mounts, 1)
-	require.Len(t, ns2.Mounts, 1)
-	// ns-1 needs to have mnt-1
-	require.Contains(t, ns1.Mounts[0].MountPath, "mnt-1")
-	// ns-2 needs to have mnt-2
-	require.Contains(t, ns2.Mounts[0].MountPath, "mnt-2")
-
-	require.Equal(t, 1, ns1.Mounts[0].Counts.EntityClients)
-	require.Equal(t, 0, ns1.Mounts[0].Counts.NonEntityClients)
-	require.Equal(t, 0, ns2.Mounts[0].Counts.EntityClients)
-	require.Equal(t, 1, ns2.Mounts[0].Counts.NonEntityClients)
-
-	monthRecord := val.Months[0]
-	// there should only be one month present, since the clients were added with the same timestamp
-	require.Equal(t, monthRecord.Timestamp, timeutil.StartOfMonth(now).UTC().Unix())
-	require.Equal(t, 1, monthRecord.Counts.NonEntityClients)
-	require.Equal(t, 1, monthRecord.Counts.EntityClients)
-	require.Len(t, monthRecord.Namespaces, 2)
-	require.Len(t, monthRecord.NewClients.Namespaces, 2)
-	require.Equal(t, 1, monthRecord.NewClients.Counts.EntityClients)
-	require.Equal(t, 1, monthRecord.NewClients.Counts.NonEntityClients)
-}
-
-type mockTimeNowClock struct {
-	timeutil.DefaultClock
-	start   time.Time
-	created time.Time
-}
-
-func newMockTimeNowClock(startAt time.Time) timeutil.Clock {
-	return &mockTimeNowClock{start: startAt, created: time.Now()}
-}
-
-// NewTimer returns a timer with a channel that will return the correct time,
-// relative to the starting time. This is used when testing the
-// activeFragmentWorker, as that function uses the returned value from timer.C
-// to perform additional functionality
-func (m mockTimeNowClock) NewTimer(d time.Duration) *time.Timer {
-	timerStarted := m.Now()
-	t := time.NewTimer(d)
-	readCh := t.C
-	writeCh := make(chan time.Time, 1)
-	go func() {
-		<-readCh
-		writeCh <- timerStarted.Add(d)
-	}()
-	t.C = writeCh
-	return t
-}
-
-func (m mockTimeNowClock) Now() time.Time {
-	return m.start.Add(time.Since(m.created))
-}
-
-// TestActivityLog_HandleEndOfMonth runs the activity log with a mock clock.
-// The current time is set to be 3 seconds before the end of a month. The test
-// verifies that the precomputedQueryWorker runs and writes precomputed queries
-// with the proper start and end times when the end of the month is triggered
-func TestActivityLog_HandleEndOfMonth(t *testing.T) {
-	// 3 seconds until a new month
-	now := time.Date(2021, 1, 31, 23, 59, 57, 0, time.UTC)
-	core, _, _ := TestCoreUnsealedWithConfig(t, &CoreConfig{ActivityLogConfig: ActivityLogCoreConfig{Clock: newMockTimeNowClock(now)}})
-	done := make(chan struct{})
-	go func() {
-		defer close(done)
-		<-core.activityLog.precomputedQueryWritten
-	}()
-	core.activityLog.SetEnable(true)
-	core.activityLog.SetStartTimestamp(now.Unix())
-	core.activityLog.AddClientToFragment("id", "ns", now.Unix(), false, "mount")
-
-	// wait for the end of month to be triggered
-	select {
-	case <-done:
-	case <-time.After(10 * time.Second):
-		t.Fatal("timeout waiting for precomputed query")
-	}
-
-	// verify that a precomputed query was written
-	exists, err := core.activityLog.queryStore.QueriesAvailable(context.Background())
-	require.NoError(t, err)
-	require.True(t, exists)
-
-	// verify that the timestamp is correct
-	pq, err := core.activityLog.queryStore.Get(context.Background(), now, now.Add(24*time.Hour))
-	require.NoError(t, err)
-	require.Equal(t, now, pq.StartTime)
-	require.Equal(t, timeutil.EndOfMonth(now), pq.EndTime)
-}
diff --git a/vault/activity_log_testing_util.go b/vault/activity_log_testing_util.go
index 25e0c900c1a7c..14fe56c88cf94 100644
--- a/vault/activity_log_testing_util.go
+++ b/vault/activity_log_testing_util.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -8,8 +5,10 @@ import (
 	"fmt"
 	"math/rand"
 	"testing"
+	"time"
 
 	"github.com/hashicorp/vault/helper/constants"
+
 	"github.com/hashicorp/vault/sdk/logical"
 	"github.com/hashicorp/vault/vault/activity"
 )
@@ -30,7 +29,7 @@ func (c *Core) InjectActivityLogDataThisMonth(t *testing.T) map[string]*activity
 			ClientID:      fmt.Sprintf("testclientid-%d", i),
 			NamespaceID:   "root",
 			MountAccessor: fmt.Sprintf("testmountaccessor-%d", i),
-			Timestamp:     c.activityLog.clock.Now().Unix(),
+			Timestamp:     time.Now().Unix(),
 			NonEntity:     i%2 == 0,
 		}
 		c.activityLog.partialMonthClientTracker[er.ClientID] = er
@@ -43,7 +42,7 @@ func (c *Core) InjectActivityLogDataThisMonth(t *testing.T) map[string]*activity
 					ClientID:      fmt.Sprintf("ns-%d-testclientid-%d", j, i),
 					NamespaceID:   fmt.Sprintf("ns-%d", j),
 					MountAccessor: fmt.Sprintf("ns-%d-testmountaccessor-%d", j, i),
-					Timestamp:     c.activityLog.clock.Now().Unix(),
+					Timestamp:     time.Now().Unix(),
 					NonEntity:     i%2 == 0,
 				}
 				c.activityLog.partialMonthClientTracker[er.ClientID] = er
diff --git a/vault/activity_log_util.go b/vault/activity_log_util.go
index 4c1b7eda36360..8cfa76a0f0935 100644
--- a/vault/activity_log_util.go
+++ b/vault/activity_log_util.go
@@ -1,19 +1,10 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !enterprise
 
 package vault
 
-import (
-	"context"
-	"time"
-)
+import "context"
 
 // sendCurrentFragment is a no-op on OSS
 func (a *ActivityLog) sendCurrentFragment(ctx context.Context) error {
 	return nil
 }
-
-// CensusReport is a no-op on OSS
-func (a *ActivityLog) CensusReport(context.Context, CensusReporter, time.Time) {}
diff --git a/vault/activity_log_util_common.go b/vault/activity_log_util_common.go
index 10a3735e6f503..a83736fcd6e56 100644
--- a/vault/activity_log_util_common.go
+++ b/vault/activity_log_util_common.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -9,7 +6,6 @@ import (
 	"fmt"
 	"io"
 	"sort"
-	"strings"
 	"time"
 
 	"github.com/axiomhq/hyperloglog"
@@ -75,7 +71,7 @@ func (a *ActivityLog) StoreHyperlogLog(ctx context.Context, startTime time.Time,
 }
 
 func (a *ActivityLog) computeCurrentMonthForBillingPeriodInternal(ctx context.Context, byMonth map[int64]*processMonth, hllGetFunc HLLGetter, startTime time.Time, endTime time.Time) (*activity.MonthRecord, error) {
-	if timeutil.IsCurrentMonth(startTime, a.clock.Now().UTC()) {
+	if timeutil.IsCurrentMonth(startTime, time.Now().UTC()) {
 		monthlyComputation := a.transformMonthBreakdowns(byMonth)
 		if len(monthlyComputation) > 1 {
 			a.logger.Warn("monthly in-memory activitylog computation returned multiple months of data", "months returned", len(byMonth))
@@ -213,9 +209,9 @@ func (a *ActivityLog) limitNamespacesInALResponse(byNamespaceResponse []*Respons
 // For more details, please see the function comment for transformMonthlyNamespaceBreakdowns
 func (a *ActivityLog) transformActivityLogMounts(mts map[string]*processMount) []*activity.MountRecord {
 	mounts := make([]*activity.MountRecord, 0)
-	for mountAccessor, mountCounts := range mts {
+	for mountpath, mountCounts := range mts {
 		mount := activity.MountRecord{
-			MountPath: a.mountAccessorToMountPath(mountAccessor),
+			MountPath: mountpath,
 			Counts: &activity.CountsRecord{
 				EntityClients:    len(mountCounts.Counts.Entities),
 				NonEntityClients: len(mountCounts.Counts.NonEntities) + int(mountCounts.Counts.Tokens),
@@ -266,31 +262,6 @@ func (a *ActivityLog) sortActivityLogMonthsResponse(months []*ResponseMonth) {
 	}
 }
 
-const (
-	noMountAccessor = "no mount accessor (pre-1.10 upgrade?)"
-	deletedMountFmt = "deleted mount; accessor %q"
-)
-
-// mountAccessorToMountPath transforms the mount accessor to the mount path
-// returns a placeholder string if the mount accessor is empty or deleted
-func (a *ActivityLog) mountAccessorToMountPath(mountAccessor string) string {
-	var displayPath string
-	if mountAccessor == "" {
-		displayPath = noMountAccessor
-	} else {
-		valResp := a.core.router.ValidateMountByAccessor(mountAccessor)
-		if valResp == nil {
-			displayPath = fmt.Sprintf(deletedMountFmt, mountAccessor)
-		} else {
-			displayPath = valResp.MountPath
-			if !strings.HasSuffix(displayPath, "/") {
-				displayPath += "/"
-			}
-		}
-	}
-	return displayPath
-}
-
 type singleTypeSegmentReader struct {
 	basePath         string
 	startTime        time.Time
@@ -298,6 +269,7 @@ type singleTypeSegmentReader struct {
 	currentPathIndex int
 	a                *ActivityLog
 }
+
 type segmentReader struct {
 	tokens   *singleTypeSegmentReader
 	entities *singleTypeSegmentReader
diff --git a/vault/activity_log_util_common_test.go b/vault/activity_log_util_common_test.go
index 817dbf398a883..bd2dcd2a3e7ef 100644
--- a/vault/activity_log_util_common_test.go
+++ b/vault/activity_log_util_common_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -18,11 +15,6 @@ import (
 	"google.golang.org/protobuf/proto"
 )
 
-// Test_ActivityLog_ComputeCurrentMonthForBillingPeriodInternal creates 3 months of hyperloglogs and fills them with
-// overlapping clients. The test calls computeCurrentMonthForBillingPeriodInternal with the current month map having
-// some overlap with the previous months. The test then verifies that the results have the correct number of entity and
-// non-entity clients. The test also calls computeCurrentMonthForBillingPeriodInternal with an empty current month map,
-// and verifies that the results are all 0.
 func Test_ActivityLog_ComputeCurrentMonthForBillingPeriodInternal(t *testing.T) {
 	// populate the first month with clients 1-10
 	monthOneHLL := hyperloglog.New()
diff --git a/vault/audit.go b/vault/audit.go
index 3f80b96549294..5b30bc4d4ad02 100644
--- a/vault/audit.go
+++ b/vault/audit.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -155,7 +152,7 @@ func (c *Core) enableAudit(ctx context.Context, entry *MountEntry, updateStorage
 	c.audit = newTable
 
 	// Register the backend
-	c.auditBroker.Register(entry.Path, backend, entry.Local)
+	c.auditBroker.Register(entry.Path, backend, view, entry.Local)
 	if c.logger.IsInfo() {
 		c.logger.Info("enabled audit backend", "path", entry.Path, "type", entry.Type)
 	}
@@ -315,6 +312,13 @@ func (c *Core) persistAudit(ctx context.Context, table *MountTable, localOnly bo
 		return fmt.Errorf("invalid table type given, not persisting")
 	}
 
+	for _, entry := range table.Entries {
+		if entry.Table != table.Type {
+			c.logger.Error("given entry to persist in audit table has wrong table value", "path", entry.Path, "entry_table_type", entry.Table, "actual_type", table.Type)
+			return fmt.Errorf("invalid audit entry found, not persisting")
+		}
+	}
+
 	nonLocalAudit := &MountTable{
 		Type: auditTableType,
 	}
@@ -324,11 +328,6 @@ func (c *Core) persistAudit(ctx context.Context, table *MountTable, localOnly bo
 	}
 
 	for _, entry := range table.Entries {
-		if entry.Table != table.Type {
-			c.logger.Error("given entry to persist in audit table has wrong table value", "path", entry.Path, "entry_table_type", entry.Table, "actual_type", table.Type)
-			return fmt.Errorf("invalid audit entry found, not persisting")
-		}
-
 		if entry.Local {
 			localAudit.Entries = append(localAudit.Entries, entry)
 		} else {
@@ -416,7 +415,7 @@ func (c *Core) setupAudits(ctx context.Context) error {
 		}
 
 		// Mount the backend
-		broker.Register(entry.Path, backend, entry.Local)
+		broker.Register(entry.Path, backend, view, entry.Local)
 
 		successCount++
 	}
diff --git a/vault/audit_broker.go b/vault/audit_broker.go
index faa9a001e7e6f..7559a5e680e30 100644
--- a/vault/audit_broker.go
+++ b/vault/audit_broker.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -19,6 +16,7 @@ import (
 
 type backendEntry struct {
 	backend audit.Backend
+	view    *BarrierView
 	local   bool
 }
 
@@ -40,11 +38,12 @@ func NewAuditBroker(log log.Logger) *AuditBroker {
 }
 
 // Register is used to add new audit backend to the broker
-func (a *AuditBroker) Register(name string, b audit.Backend, local bool) {
+func (a *AuditBroker) Register(name string, b audit.Backend, v *BarrierView, local bool) {
 	a.Lock()
 	defer a.Unlock()
 	a.backends[name] = backendEntry{
 		backend: b,
+		view:    v,
 		local:   local,
 	}
 }
diff --git a/vault/audit_test.go b/vault/audit_test.go
index a5b68be5dcfec..ebd7de504da00 100644
--- a/vault/audit_test.go
+++ b/vault/audit_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -12,8 +9,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/vault/helper/testhelpers/corehelpers"
-
 	"github.com/hashicorp/errwrap"
 	log "github.com/hashicorp/go-hclog"
 	uuid "github.com/hashicorp/go-uuid"
@@ -35,8 +30,7 @@ func TestAudit_ReadOnlyViewDuringMount(t *testing.T) {
 		if err == nil || !strings.Contains(err.Error(), logical.ErrSetupReadOnly.Error()) {
 			t.Fatalf("expected a read-only error")
 		}
-		factory := corehelpers.NoopAuditFactory(nil)
-		return factory(ctx, config)
+		return &NoopAudit{}, nil
 	}
 
 	me := &MountEntry{
@@ -44,7 +38,7 @@ func TestAudit_ReadOnlyViewDuringMount(t *testing.T) {
 		Path:  "foo",
 		Type:  "noop",
 	}
-	err := c.enableAudit(namespace.RootContext(context.Background()), me, true)
+	err := c.enableAudit(namespace.RootContext(nil), me, true)
 	if err != nil {
 		t.Fatalf("err: %v", err)
 	}
@@ -52,14 +46,18 @@ func TestAudit_ReadOnlyViewDuringMount(t *testing.T) {
 
 func TestCore_EnableAudit(t *testing.T) {
 	c, keys, _ := TestCoreUnsealed(t)
-	c.auditBackends["noop"] = corehelpers.NoopAuditFactory(nil)
+	c.auditBackends["noop"] = func(ctx context.Context, config *audit.BackendConfig) (audit.Backend, error) {
+		return &NoopAudit{
+			Config: config,
+		}, nil
+	}
 
 	me := &MountEntry{
 		Table: auditTableType,
 		Path:  "foo",
 		Type:  "noop",
 	}
-	err := c.enableAudit(namespace.RootContext(context.Background()), me, true)
+	err := c.enableAudit(namespace.RootContext(nil), me, true)
 	if err != nil {
 		t.Fatalf("err: %v", err)
 	}
@@ -73,7 +71,11 @@ func TestCore_EnableAudit(t *testing.T) {
 		AuditBackends: make(map[string]audit.Factory),
 		DisableMlock:  true,
 	}
-	conf.AuditBackends["noop"] = corehelpers.NoopAuditFactory(nil)
+	conf.AuditBackends["noop"] = func(ctx context.Context, config *audit.BackendConfig) (audit.Backend, error) {
+		return &NoopAudit{
+			Config: config,
+		}, nil
+	}
 	c2, err := NewCore(conf)
 	if err != nil {
 		t.Fatalf("err: %v", err)
@@ -102,7 +104,12 @@ func TestCore_EnableAudit(t *testing.T) {
 
 func TestCore_EnableAudit_MixedFailures(t *testing.T) {
 	c, _, _ := TestCoreUnsealed(t)
-	c.auditBackends["noop"] = corehelpers.NoopAuditFactory(nil)
+	c.auditBackends["noop"] = func(ctx context.Context, config *audit.BackendConfig) (audit.Backend, error) {
+		return &NoopAudit{
+			Config: config,
+		}, nil
+	}
+
 	c.auditBackends["fail"] = func(ctx context.Context, config *audit.BackendConfig) (audit.Backend, error) {
 		return nil, fmt.Errorf("failing enabling")
 	}
@@ -151,7 +158,12 @@ func TestCore_EnableAudit_MixedFailures(t *testing.T) {
 // correctly
 func TestCore_EnableAudit_Local(t *testing.T) {
 	c, _, _ := TestCoreUnsealed(t)
-	c.auditBackends["noop"] = corehelpers.NoopAuditFactory(nil)
+	c.auditBackends["noop"] = func(ctx context.Context, config *audit.BackendConfig) (audit.Backend, error) {
+		return &NoopAudit{
+			Config: config,
+		}, nil
+	}
+
 	c.auditBackends["fail"] = func(ctx context.Context, config *audit.BackendConfig) (audit.Backend, error) {
 		return nil, fmt.Errorf("failing enabling")
 	}
@@ -237,9 +249,13 @@ func TestCore_EnableAudit_Local(t *testing.T) {
 
 func TestCore_DisableAudit(t *testing.T) {
 	c, keys, _ := TestCoreUnsealed(t)
-	c.auditBackends["noop"] = corehelpers.NoopAuditFactory(nil)
+	c.auditBackends["noop"] = func(ctx context.Context, config *audit.BackendConfig) (audit.Backend, error) {
+		return &NoopAudit{
+			Config: config,
+		}, nil
+	}
 
-	existed, err := c.disableAudit(namespace.RootContext(context.Background()), "foo", true)
+	existed, err := c.disableAudit(namespace.RootContext(nil), "foo", true)
 	if existed && err != nil {
 		t.Fatalf("existed: %v; err: %v", existed, err)
 	}
@@ -249,12 +265,12 @@ func TestCore_DisableAudit(t *testing.T) {
 		Path:  "foo",
 		Type:  "noop",
 	}
-	err = c.enableAudit(namespace.RootContext(context.Background()), me, true)
+	err = c.enableAudit(namespace.RootContext(nil), me, true)
 	if err != nil {
 		t.Fatalf("err: %v", err)
 	}
 
-	existed, err = c.disableAudit(namespace.RootContext(context.Background()), "foo", true)
+	existed, err = c.disableAudit(namespace.RootContext(nil), "foo", true)
 	if !existed || err != nil {
 		t.Fatalf("existed: %v; err: %v", existed, err)
 	}
@@ -341,10 +357,10 @@ func verifyDefaultAuditTable(t *testing.T, table *MountTable) {
 func TestAuditBroker_LogRequest(t *testing.T) {
 	l := logging.NewVaultLogger(log.Trace)
 	b := NewAuditBroker(l)
-	a1 := corehelpers.TestNoopAudit(t, nil)
-	a2 := corehelpers.TestNoopAudit(t, nil)
-	b.Register("foo", a1, false)
-	b.Register("bar", a2, false)
+	a1 := &NoopAudit{}
+	a2 := &NoopAudit{}
+	b.Register("foo", a1, nil, false)
+	b.Register("bar", a2, nil, false)
 
 	auth := &logical.Auth{
 		ClientToken: "foo",
@@ -390,21 +406,20 @@ func TestAuditBroker_LogRequest(t *testing.T) {
 		Request:  reqCopy,
 		OuterErr: reqErrs,
 	}
-	ctx := namespace.RootContext(context.Background())
-	err = b.LogRequest(ctx, logInput, headersConf)
+	err = b.LogRequest(context.Background(), logInput, headersConf)
 	if err != nil {
 		t.Fatalf("err: %v", err)
 	}
 
-	for _, a := range []*corehelpers.NoopAudit{a1, a2} {
+	for _, a := range []*NoopAudit{a1, a2} {
 		if !reflect.DeepEqual(a.ReqAuth[0], auth) {
 			t.Fatalf("Bad: %#v", a.ReqAuth[0])
 		}
 		if !reflect.DeepEqual(a.Req[0], req) {
 			t.Fatalf("Bad: %#v\n wanted %#v", a.Req[0], req)
 		}
-		if a.ReqErrs[0].Error() != reqErrs.Error() {
-			t.Fatalf("expected %v, got %v", a.ReqErrs[0].Error(), reqErrs.Error())
+		if !reflect.DeepEqual(a.ReqErrs[0], reqErrs) {
+			t.Fatalf("Bad: %#v", a.ReqErrs[0])
 		}
 	}
 
@@ -414,13 +429,13 @@ func TestAuditBroker_LogRequest(t *testing.T) {
 		Auth:    auth,
 		Request: req,
 	}
-	if err := b.LogRequest(ctx, logInput, headersConf); err != nil {
+	if err := b.LogRequest(context.Background(), logInput, headersConf); err != nil {
 		t.Fatalf("err: %v", err)
 	}
 
 	// Should FAIL work with both failing backends
 	a2.ReqErr = fmt.Errorf("failed")
-	if err := b.LogRequest(ctx, logInput, headersConf); !errwrap.Contains(err, "no audit backend succeeded in logging the request") {
+	if err := b.LogRequest(context.Background(), logInput, headersConf); !errwrap.Contains(err, "no audit backend succeeded in logging the request") {
 		t.Fatalf("err: %v", err)
 	}
 }
@@ -428,10 +443,10 @@ func TestAuditBroker_LogRequest(t *testing.T) {
 func TestAuditBroker_LogResponse(t *testing.T) {
 	l := logging.NewVaultLogger(log.Trace)
 	b := NewAuditBroker(l)
-	a1 := corehelpers.TestNoopAudit(t, nil)
-	a2 := corehelpers.TestNoopAudit(t, nil)
-	b.Register("foo", a1, false)
-	b.Register("bar", a2, false)
+	a1 := &NoopAudit{}
+	a2 := &NoopAudit{}
+	b.Register("foo", a1, nil, false)
+	b.Register("bar", a2, nil, false)
 
 	auth := &logical.Auth{
 		NumUses:     10,
@@ -488,13 +503,12 @@ func TestAuditBroker_LogResponse(t *testing.T) {
 		Response: respCopy,
 		OuterErr: respErr,
 	}
-	ctx := namespace.RootContext(context.Background())
-	err = b.LogResponse(ctx, logInput, headersConf)
+	err = b.LogResponse(context.Background(), logInput, headersConf)
 	if err != nil {
 		t.Fatalf("err: %v", err)
 	}
 
-	for _, a := range []*corehelpers.NoopAudit{a1, a2} {
+	for _, a := range []*NoopAudit{a1, a2} {
 		if !reflect.DeepEqual(a.RespAuth[0], auth) {
 			t.Fatalf("Bad: %#v", a.ReqAuth[0])
 		}
@@ -504,8 +518,8 @@ func TestAuditBroker_LogResponse(t *testing.T) {
 		if !reflect.DeepEqual(a.Resp[0], resp) {
 			t.Fatalf("Bad: %#v", a.Resp[0])
 		}
-		if a.RespErrs[0].Error() != respErr.Error() {
-			t.Fatalf("expected %v, got %v", respErr, a.RespErrs[0])
+		if !reflect.DeepEqual(a.RespErrs[0], respErr) {
+			t.Fatalf("Expected\n%v\nGot\n%#v", respErr, a.RespErrs[0])
 		}
 	}
 
@@ -517,14 +531,14 @@ func TestAuditBroker_LogResponse(t *testing.T) {
 		Response: resp,
 		OuterErr: respErr,
 	}
-	err = b.LogResponse(ctx, logInput, headersConf)
+	err = b.LogResponse(context.Background(), logInput, headersConf)
 	if err != nil {
 		t.Fatalf("err: %v", err)
 	}
 
 	// Should FAIL work with both failing backends
 	a2.RespErr = fmt.Errorf("failed")
-	err = b.LogResponse(ctx, logInput, headersConf)
+	err = b.LogResponse(context.Background(), logInput, headersConf)
 	if !strings.Contains(err.Error(), "no audit backend succeeded in logging the response") {
 		t.Fatalf("err: %v", err)
 	}
@@ -535,10 +549,10 @@ func TestAuditBroker_AuditHeaders(t *testing.T) {
 	b := NewAuditBroker(logger)
 	_, barrier, _ := mockBarrier(t)
 	view := NewBarrierView(barrier, "headers/")
-	a1 := corehelpers.TestNoopAudit(t, nil)
-	a2 := corehelpers.TestNoopAudit(t, nil)
-	b.Register("foo", a1, false)
-	b.Register("bar", a2, false)
+	a1 := &NoopAudit{}
+	a2 := &NoopAudit{}
+	b.Register("foo", a1, nil, false)
+	b.Register("bar", a2, nil, false)
 
 	auth := &logical.Auth{
 		ClientToken: "foo",
@@ -577,8 +591,7 @@ func TestAuditBroker_AuditHeaders(t *testing.T) {
 		Request:  reqCopy,
 		OuterErr: respErr,
 	}
-	ctx := namespace.RootContext(context.Background())
-	err = b.LogRequest(ctx, logInput, headersConf)
+	err = b.LogRequest(context.Background(), logInput, headersConf)
 	if err != nil {
 		t.Fatalf("err: %v", err)
 	}
@@ -588,7 +601,7 @@ func TestAuditBroker_AuditHeaders(t *testing.T) {
 		"x-vault-header": {"bar"},
 	}
 
-	for _, a := range []*corehelpers.NoopAudit{a1, a2} {
+	for _, a := range []*NoopAudit{a1, a2} {
 		if !reflect.DeepEqual(a.ReqHeaders[0], expected) {
 			t.Fatalf("Bad audited headers: %#v", a.Req[0].Headers)
 		}
@@ -601,14 +614,14 @@ func TestAuditBroker_AuditHeaders(t *testing.T) {
 		Request:  req,
 		OuterErr: respErr,
 	}
-	err = b.LogRequest(ctx, logInput, headersConf)
+	err = b.LogRequest(context.Background(), logInput, headersConf)
 	if err != nil {
 		t.Fatalf("err: %v", err)
 	}
 
 	// Should FAIL work with both failing backends
 	a2.ReqErr = fmt.Errorf("failed")
-	err = b.LogRequest(ctx, logInput, headersConf)
+	err = b.LogRequest(context.Background(), logInput, headersConf)
 	if !errwrap.Contains(err, "no audit backend succeeded in logging the request") {
 		t.Fatalf("err: %v", err)
 	}
diff --git a/vault/audited_headers.go b/vault/audited_headers.go
index 70c9f467ee779..4e83d9bff4451 100644
--- a/vault/audited_headers.go
+++ b/vault/audited_headers.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/audited_headers_test.go b/vault/audited_headers_test.go
index 940197e9972b5..b1f59f1f5e352 100644
--- a/vault/audited_headers_test.go
+++ b/vault/audited_headers_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/auth.go b/vault/auth.go
index 6047c041090e8..22f2e6a635b2a 100644
--- a/vault/auth.go
+++ b/vault/auth.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -13,7 +10,6 @@ import (
 	"github.com/hashicorp/go-secure-stdlib/strutil"
 	"github.com/hashicorp/go-uuid"
 	"github.com/hashicorp/vault/builtin/plugin"
-	"github.com/hashicorp/vault/helper/experiments"
 	"github.com/hashicorp/vault/helper/namespace"
 	"github.com/hashicorp/vault/helper/versions"
 	"github.com/hashicorp/vault/sdk/helper/consts"
@@ -192,7 +188,7 @@ func (c *Core) enableCredentialInternal(ctx context.Context, entry *MountEntry,
 	entry.RunningVersion = entry.Version
 	if entry.RunningVersion == "" {
 		// don't set the running version to a builtin if it is running as an external plugin
-		if entry.RunningSha256 == "" {
+		if externaler, ok := backend.(logical.Externaler); !ok || !externaler.IsExternal() {
 			entry.RunningVersion = versions.GetBuiltinVersion(consts.PluginTypeCredential, entry.Type)
 		}
 	}
@@ -682,6 +678,13 @@ func (c *Core) persistAuth(ctx context.Context, table *MountTable, local *bool)
 		return fmt.Errorf("invalid table type given, not persisting")
 	}
 
+	for _, entry := range table.Entries {
+		if entry.Table != table.Type {
+			c.logger.Error("given entry to persist in auth table has wrong table value", "path", entry.Path, "entry_table_type", entry.Table, "actual_type", table.Type)
+			return fmt.Errorf("invalid auth entry found, not persisting")
+		}
+	}
+
 	nonLocalAuth := &MountTable{
 		Type: credentialTableType,
 	}
@@ -691,11 +694,6 @@ func (c *Core) persistAuth(ctx context.Context, table *MountTable, local *bool)
 	}
 
 	for _, entry := range table.Entries {
-		if entry.Table != table.Type {
-			c.logger.Error("given entry to persist in auth table has wrong table value", "path", entry.Path, "entry_table_type", entry.Table, "actual_type", table.Type)
-			return fmt.Errorf("invalid auth entry found, not persisting")
-		}
-
 		if entry.Local {
 			localAuth.Entries = append(localAuth.Entries, entry)
 		} else {
@@ -819,7 +817,7 @@ func (c *Core) setupCredentials(ctx context.Context) error {
 		entry.RunningVersion = entry.Version
 		if entry.RunningVersion == "" {
 			// don't set the running version to a builtin if it is running as an external plugin
-			if entry.RunningSha256 == "" {
+			if externaler, ok := backend.(logical.Externaler); !ok || !externaler.IsExternal() {
 				entry.RunningVersion = versions.GetBuiltinVersion(consts.PluginTypeCredential, entry.Type)
 			}
 		}
@@ -992,18 +990,6 @@ func (c *Core) newCredentialBackend(ctx context.Context, entry *MountEntry, sysV
 
 	authLogger := c.baseLogger.Named(fmt.Sprintf("auth.%s.%s", t, entry.Accessor))
 	c.AddLogger(authLogger)
-	pluginEventSender, err := c.events.WithPlugin(entry.namespace, &logical.EventPluginInfo{
-		MountClass:    consts.PluginTypeCredential.String(),
-		MountAccessor: entry.Accessor,
-		MountPath:     entry.Path,
-		Plugin:        entry.Type,
-		PluginVersion: entry.RunningVersion,
-		Version:       entry.Version,
-	})
-	if err != nil {
-		return nil, "", err
-	}
-
 	config := &logical.BackendConfig{
 		StorageView: view,
 		Logger:      authLogger,
@@ -1011,9 +997,6 @@ func (c *Core) newCredentialBackend(ctx context.Context, entry *MountEntry, sysV
 		System:      sysView,
 		BackendUUID: entry.BackendAwareUUID,
 	}
-	if c.IsExperimentEnabled(experiments.VaultExperimentEventsAlpha1) {
-		config.EventsSender = pluginEventSender
-	}
 
 	b, err := f(ctx, config)
 	if err != nil {
diff --git a/vault/auth_test.go b/vault/auth_test.go
index c942b30b4ace4..408fe66cd7893 100644
--- a/vault/auth_test.go
+++ b/vault/auth_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -10,8 +7,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/vault/helper/testhelpers/corehelpers"
-
 	"github.com/armon/go-metrics"
 	"github.com/hashicorp/vault/helper/metricsutil"
 	"github.com/hashicorp/vault/helper/namespace"
@@ -123,7 +118,7 @@ func TestCore_DefaultAuthTable(t *testing.T) {
 	conf := &CoreConfig{
 		Physical:        c.physical,
 		DisableMlock:    true,
-		BuiltinRegistry: corehelpers.NewMockBuiltinRegistry(),
+		BuiltinRegistry: NewMockBuiltinRegistry(),
 		MetricSink:      metricsutil.NewClusterMetricSink("test-cluster", inmemSink),
 		MetricsHelper:   metricsutil.NewMetricsHelper(inmemSink, false),
 	}
@@ -155,7 +150,7 @@ func TestCore_BuiltinRegistry(t *testing.T) {
 		PluginDirectory: "/Users/foo",
 
 		DisableMlock:    true,
-		BuiltinRegistry: corehelpers.NewMockBuiltinRegistry(),
+		BuiltinRegistry: NewMockBuiltinRegistry(),
 	}
 	c, _, _ := TestCoreUnsealedWithConfig(t, conf)
 
@@ -206,7 +201,7 @@ func TestCore_EnableCredential(t *testing.T) {
 	conf := &CoreConfig{
 		Physical:        c.physical,
 		DisableMlock:    true,
-		BuiltinRegistry: corehelpers.NewMockBuiltinRegistry(),
+		BuiltinRegistry: NewMockBuiltinRegistry(),
 		MetricSink:      metricsutil.NewClusterMetricSink("test-cluster", inmemSink),
 		MetricsHelper:   metricsutil.NewMetricsHelper(inmemSink, false),
 	}
@@ -265,7 +260,7 @@ func TestCore_EnableCredential_aws_ec2(t *testing.T) {
 	conf := &CoreConfig{
 		Physical:        c.physical,
 		DisableMlock:    true,
-		BuiltinRegistry: corehelpers.NewMockBuiltinRegistry(),
+		BuiltinRegistry: NewMockBuiltinRegistry(),
 		MetricSink:      metricsutil.NewClusterMetricSink("test-cluster", inmemSink),
 		MetricsHelper:   metricsutil.NewMetricsHelper(inmemSink, false),
 	}
@@ -467,7 +462,7 @@ func TestCore_DisableCredential(t *testing.T) {
 	conf := &CoreConfig{
 		Physical:        c.physical,
 		DisableMlock:    true,
-		BuiltinRegistry: corehelpers.NewMockBuiltinRegistry(),
+		BuiltinRegistry: NewMockBuiltinRegistry(),
 		MetricSink:      metricsutil.NewClusterMetricSink("test-cluster", inmemSink),
 		MetricsHelper:   metricsutil.NewMetricsHelper(inmemSink, false),
 	}
diff --git a/vault/barrier.go b/vault/barrier.go
index 6048bf6a19664..a9b4ab9ae4df0 100644
--- a/vault/barrier.go
+++ b/vault/barrier.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/barrier_access.go b/vault/barrier_access.go
index 3b53468b59c5b..84e6e747598e1 100644
--- a/vault/barrier_access.go
+++ b/vault/barrier_access.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import "context"
diff --git a/vault/barrier_aes_gcm.go b/vault/barrier_aes_gcm.go
index 2d7cbef4260cf..b6f6d96df97f8 100644
--- a/vault/barrier_aes_gcm.go
+++ b/vault/barrier_aes_gcm.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/barrier_aes_gcm_test.go b/vault/barrier_aes_gcm_test.go
index bdc9250ffb116..92c287291e966 100644
--- a/vault/barrier_aes_gcm_test.go
+++ b/vault/barrier_aes_gcm_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/barrier_test.go b/vault/barrier_test.go
index 6e2519d3894fc..2c66fe748f874 100644
--- a/vault/barrier_test.go
+++ b/vault/barrier_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/barrier_view.go b/vault/barrier_view.go
index d6bb4b004ccc3..7fa0e7fcf24dd 100644
--- a/vault/barrier_view.go
+++ b/vault/barrier_view.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/barrier_view_test.go b/vault/barrier_view_test.go
index fc55c91653ea0..5179048f8f59a 100644
--- a/vault/barrier_view_test.go
+++ b/vault/barrier_view_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/barrier_view_util.go b/vault/barrier_view_util.go
index 829d4e089eea3..b96a4af7b8709 100644
--- a/vault/barrier_view_util.go
+++ b/vault/barrier_view_util.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !enterprise
 
 package vault
diff --git a/vault/capabilities.go b/vault/capabilities.go
index 1e023dd9e2b4b..b070ec7d50421 100644
--- a/vault/capabilities.go
+++ b/vault/capabilities.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/capabilities_test.go b/vault/capabilities_test.go
index 9c15702907f55..e3498dc52eed8 100644
--- a/vault/capabilities_test.go
+++ b/vault/capabilities_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/census.go b/vault/census.go
deleted file mode 100644
index bb1f4bc61f3d6..0000000000000
--- a/vault/census.go
+++ /dev/null
@@ -1,16 +0,0 @@
-//go:build !enterprise
-
-package vault
-
-import "time"
-
-// CensusAgent is a stub for OSS
-type CensusReporter interface{}
-
-// setupCensusAgent is a stub for OSS.
-func (c *Core) setupCensusAgent() error      { return nil }
-func (c *Core) BillingStart() time.Time      { return time.Time{} }
-func (c *Core) CensusLicensingEnabled() bool { return false }
-func (c *Core) CensusAgent() CensusReporter  { return nil }
-func (c *Core) ReloadCensus() error          { return nil }
-func (c *Core) teardownCensusAgent() error   { return nil }
diff --git a/vault/cluster.go b/vault/cluster.go
index f80d74f5243d2..bc1d352e5337b 100644
--- a/vault/cluster.go
+++ b/vault/cluster.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -391,7 +388,3 @@ func (c *Core) SetClusterListenerAddrs(addrs []*net.TCPAddr) {
 func (c *Core) SetClusterHandler(handler http.Handler) {
 	c.clusterHandler = handler
 }
-
-func (c *Core) ClusterID() string {
-	return c.clusterID.Load()
-}
diff --git a/vault/cluster/cluster.go b/vault/cluster/cluster.go
index e83d046e77899..fca8ca8967ea0 100644
--- a/vault/cluster/cluster.go
+++ b/vault/cluster/cluster.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package cluster
 
 import (
diff --git a/vault/cluster/inmem_layer.go b/vault/cluster/inmem_layer.go
index 677a306bab504..66b1e412b57b2 100644
--- a/vault/cluster/inmem_layer.go
+++ b/vault/cluster/inmem_layer.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package cluster
 
 import (
diff --git a/vault/cluster/inmem_layer_test.go b/vault/cluster/inmem_layer_test.go
index 3a0a52f6c4b1e..a1484865a6807 100644
--- a/vault/cluster/inmem_layer_test.go
+++ b/vault/cluster/inmem_layer_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package cluster
 
 import (
diff --git a/vault/cluster/simulations.go b/vault/cluster/simulations.go
index d30df178c551c..9411bf362a67a 100644
--- a/vault/cluster/simulations.go
+++ b/vault/cluster/simulations.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package cluster
 
 import (
diff --git a/vault/cluster/tcp_layer.go b/vault/cluster/tcp_layer.go
index de0fc8025e7d8..475f7726cef7d 100644
--- a/vault/cluster/tcp_layer.go
+++ b/vault/cluster/tcp_layer.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package cluster
 
 import (
diff --git a/vault/cluster_test.go b/vault/cluster_test.go
index c146adbfc1a59..c98f70df94090 100644
--- a/vault/cluster_test.go
+++ b/vault/cluster_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -14,7 +11,6 @@ import (
 	"time"
 
 	log "github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/vault/helper/testhelpers/corehelpers"
 	"github.com/hashicorp/vault/sdk/helper/consts"
 	"github.com/hashicorp/vault/sdk/helper/logging"
 	"github.com/hashicorp/vault/sdk/logical"
@@ -324,7 +320,7 @@ func testCluster_ForwardRequests(t *testing.T, c *TestClusterCore, rootToken, re
 	if isLeader {
 		t.Fatal("core should not be leader")
 	}
-	corehelpers.RetryUntil(t, 5*time.Second, func() error {
+	RetryUntil(t, 5*time.Second, func() error {
 		state := c.ActiveNodeReplicationState()
 		if state == 0 {
 			return fmt.Errorf("heartbeats have not yet returned a valid active node replication state: %d", state)
diff --git a/vault/core.go b/vault/core.go
index 511e5e3f91053..a9e9ac95f6c47 100644
--- a/vault/core.go
+++ b/vault/core.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -19,7 +16,6 @@ import (
 	"net/url"
 	"os"
 	"path/filepath"
-	"runtime"
 	"strconv"
 	"strings"
 	"sync"
@@ -41,9 +37,7 @@ import (
 	"github.com/hashicorp/vault/api"
 	"github.com/hashicorp/vault/audit"
 	"github.com/hashicorp/vault/command/server"
-	"github.com/hashicorp/vault/helper/experiments"
 	"github.com/hashicorp/vault/helper/identity/mfa"
-	"github.com/hashicorp/vault/helper/locking"
 	"github.com/hashicorp/vault/helper/metricsutil"
 	"github.com/hashicorp/vault/helper/namespace"
 	"github.com/hashicorp/vault/helper/osutil"
@@ -52,16 +46,14 @@ import (
 	"github.com/hashicorp/vault/sdk/helper/consts"
 	"github.com/hashicorp/vault/sdk/helper/jsonutil"
 	"github.com/hashicorp/vault/sdk/helper/logging"
-	"github.com/hashicorp/vault/sdk/helper/pathmanager"
 	"github.com/hashicorp/vault/sdk/logical"
 	"github.com/hashicorp/vault/sdk/physical"
+	"github.com/hashicorp/vault/sdk/version"
 	sr "github.com/hashicorp/vault/serviceregistration"
 	"github.com/hashicorp/vault/shamir"
 	"github.com/hashicorp/vault/vault/cluster"
-	"github.com/hashicorp/vault/vault/eventbus"
 	"github.com/hashicorp/vault/vault/quotas"
 	vaultseal "github.com/hashicorp/vault/vault/seal"
-	"github.com/hashicorp/vault/version"
 	"github.com/patrickmn/go-cache"
 	uberAtomic "go.uber.org/atomic"
 	"google.golang.org/grpc"
@@ -86,18 +78,6 @@ const (
 	// isn't keyring-canary to avoid ignoring it when ignoring core/keyring
 	coreKeyringCanaryPath = "core/canary-keyring"
 
-	// coreGroupPolicyApplicationPath is used to store the behaviour for
-	// how policies should be applied
-	coreGroupPolicyApplicationPath = "core/group-policy-application-mode"
-
-	// groupPolicyApplicationModeWithinNamespaceHierarchy is a configuration option for group
-	// policy application modes, which allows only in-namespace-hierarchy policy application
-	groupPolicyApplicationModeWithinNamespaceHierarchy = "within_namespace_hierarchy"
-
-	// groupPolicyApplicationModeAny is a configuration option for group
-	// policy application modes, which allows policy application irrespective of namespaces
-	groupPolicyApplicationModeAny = "any"
-
 	indexHeaderHMACKeyPath = "core/index-header-hmac-key"
 
 	// defaultMFAAuthResponseTTL is the default duration that Vault caches the
@@ -139,10 +119,6 @@ var (
 	// in an HA setting
 	ErrHANotEnabled = errors.New("Vault is not configured for highly-available mode")
 
-	// ErrIntrospectionNotEnabled is returned if "introspection_endpoint" is not
-	// enabled in the configuration file
-	ErrIntrospectionNotEnabled = errors.New("The Vault configuration must set \"introspection_endpoint\" to true to enable this endpoint")
-
 	// manualStepDownSleepPeriod is how long to sleep after a user-initiated
 	// step down of the active node, to prevent instantly regrabbing the lock.
 	// It's var not const so that tests can manipulate it.
@@ -322,7 +298,7 @@ type Core struct {
 	auditBackends map[string]audit.Factory
 
 	// stateLock protects mutable state
-	stateLock locking.RWMutex
+	stateLock DeadlockRWMutex
 	sealed    *uint32
 
 	standby              bool
@@ -419,8 +395,6 @@ type Core struct {
 
 	// activityLog is used to track active client count
 	activityLog *ActivityLog
-	// activityLogLock protects the activityLog and activityLogConfig
-	activityLogLock sync.RWMutex
 
 	// metricsCh is used to stop the metrics streaming
 	metricsCh chan struct{}
@@ -519,6 +493,12 @@ type Core struct {
 	// CORS Information
 	corsConfig *CORSConfig
 
+	// The active set of upstream cluster addresses; stored via the Echo
+	// mechanism, loaded by the balancer
+	atomicPrimaryClusterAddrs *atomic.Value
+
+	atomicPrimaryFailoverAddrs *atomic.Value
+
 	// replicationState keeps the current replication state cached for quick
 	// lookup; activeNodeReplicationState stores the active value on standbys
 	replicationState           *uint32
@@ -530,10 +510,6 @@ type Core struct {
 	// rawEnabled indicates whether the Raw endpoint is enabled
 	rawEnabled bool
 
-	// inspectableEnabled indicates whether the Inspect endpoint is enabled
-	introspectionEnabled     bool
-	introspectionEnabledLock sync.Mutex
-
 	// pluginDirectory is the location vault will look for plugin binaries
 	pluginDirectory string
 
@@ -546,14 +522,6 @@ type Core struct {
 	// pluginCatalog is used to manage plugin configurations
 	pluginCatalog *PluginCatalog
 
-	// The userFailedLoginInfo map has user failed login information.
-	// It has user information (alias-name and mount accessor) as a key
-	// and login counter, last failed login time as value
-	userFailedLoginInfo map[FailedLoginUser]*FailedLoginInfo
-
-	// userFailedLoginInfoLock controls access to the userFailedLoginInfoMap
-	userFailedLoginInfoLock sync.RWMutex
-
 	enableMlock bool
 
 	// This can be used to trigger operations to stop running when Vault is
@@ -635,12 +603,8 @@ type Core struct {
 
 	clusterHeartbeatInterval time.Duration
 
-	// activityLogConfig contains override values for the activity log
-	// it is protected by activityLogLock
 	activityLogConfig ActivityLogCoreConfig
 
-	censusConfig atomic.Value
-
 	// activeTime is set on active nodes indicating the time at which this node
 	// became active.
 	activeTime time.Time
@@ -679,25 +643,10 @@ type Core struct {
 
 	rollbackPeriod time.Duration
 
-	experiments []string
-
 	pendingRemovalMountsAllowed bool
 	expirationRevokeRetryBase   time.Duration
-
-	events *eventbus.EventBus
-
-	// writeForwardedPaths are a set of storage paths which are GRPC forwarded
-	// to the active node of the primary cluster, when present. This PathManager
-	// contains absolute paths that we intend to forward (and template) when
-	// we're on a secondary cluster.
-	writeForwardedPaths *pathmanager.PathManager
-
-	// if populated, the callback is called for every request
-	// for testing purposes
-	requestResponseCallback func(logical.Backend, *logical.Request, *logical.Response)
 }
 
-// c.stateLock needs to be held in read mode before calling this function.
 func (c *Core) HAState() consts.HAState {
 	switch {
 	case c.perfStandby:
@@ -709,13 +658,6 @@ func (c *Core) HAState() consts.HAState {
 	}
 }
 
-func (c *Core) HAStateWithLock() consts.HAState {
-	c.stateLock.RLock()
-	c.stateLock.RUnlock()
-
-	return c.HAState()
-}
-
 // CoreConfig is used to parameterize a core
 type CoreConfig struct {
 	entCoreConfig
@@ -753,9 +695,6 @@ type CoreConfig struct {
 
 	Logger log.Logger
 
-	// Use the deadlocks library to detect deadlocks
-	DetectDeadlocks string
-
 	// Disables the trace display for Sentinel checks
 	DisableSentinelTrace bool
 
@@ -787,9 +726,6 @@ type CoreConfig struct {
 	// Enable the raw endpoint
 	EnableRaw bool
 
-	// Enable the introspection endpoint
-	EnableIntrospection bool
-
 	PluginDirectory string
 
 	PluginFileUid int
@@ -808,9 +744,6 @@ type CoreConfig struct {
 	LicensePath     string
 	LicensingConfig *LicensingConfig
 
-	// Configured Census Agent
-	CensusAgent CensusReporter
-
 	DisablePerformanceStandby bool
 	DisableIndexing           bool
 	DisableKeyEncodingChecks  bool
@@ -847,8 +780,6 @@ type CoreConfig struct {
 
 	RollbackPeriod time.Duration
 
-	Experiments []string
-
 	PendingRemovalMountsAllowed bool
 
 	ExpirationRevokeRetryBase time.Duration
@@ -933,14 +864,6 @@ func CreateCore(conf *CoreConfig) (*Core, error) {
 		conf.NumExpirationWorkers = numExpirationWorkersDefault
 	}
 
-	// Use imported logging deadlock if requested
-	var stateLock locking.RWMutex
-	if strings.Contains(conf.DetectDeadlocks, "statelock") {
-		stateLock = &locking.DeadlockRWMutex{}
-	} else {
-		stateLock = &locking.SyncRWMutex{}
-	}
-
 	effectiveSDKVersion := conf.EffectiveSDKVersion
 	if effectiveSDKVersion == "" {
 		effectiveSDKVersion = version.GetVersion().Version
@@ -959,7 +882,6 @@ func CreateCore(conf *CoreConfig) (*Core, error) {
 		clusterListener:      new(atomic.Value),
 		customListenerHeader: new(atomic.Value),
 		seal:                 conf.Seal,
-		stateLock:            stateLock,
 		router:               NewRouter(),
 		sealed:               new(uint32),
 		sealMigrationDone:    new(uint32),
@@ -978,9 +900,10 @@ func CreateCore(conf *CoreConfig) (*Core, error) {
 		clusterPeerClusterAddrsCache:   cache.New(3*clusterHeartbeatInterval, time.Second),
 		enableMlock:                    !conf.DisableMlock,
 		rawEnabled:                     conf.EnableRaw,
-		introspectionEnabled:           conf.EnableIntrospection,
 		shutdownDoneCh:                 new(atomic.Value),
 		replicationState:               new(uint32),
+		atomicPrimaryClusterAddrs:      new(atomic.Value),
+		atomicPrimaryFailoverAddrs:     new(atomic.Value),
 		localClusterPrivateKey:         new(atomic.Value),
 		localClusterCert:               new(atomic.Value),
 		localClusterParsedCert:         new(atomic.Value),
@@ -1012,8 +935,6 @@ func CreateCore(conf *CoreConfig) (*Core, error) {
 		mountMigrationTracker:          &sync.Map{},
 		disableSSCTokens:               conf.DisableSSCTokens,
 		effectiveSDKVersion:            effectiveSDKVersion,
-		userFailedLoginInfo:            make(map[FailedLoginUser]*FailedLoginInfo),
-		experiments:                    conf.Experiments,
 		pendingRemovalMountsAllowed:    conf.PendingRemovalMountsAllowed,
 		expirationRevokeRetryBase:      conf.ExpirationRevokeRetryBase,
 	}
@@ -1084,15 +1005,13 @@ func CreateCore(conf *CoreConfig) (*Core, error) {
 		Enabled: new(uint32),
 	}
 
-	// Load write-forwarded path manager.
-	c.writeForwardedPaths = pathmanager.New()
-
-	// Load seal information.
 	if c.seal == nil {
 		wrapper := aeadwrapper.NewShamirWrapper()
 		wrapper.SetConfig(context.Background(), awskms.WithLogger(c.logger.Named("shamir")))
 
-		c.seal = NewDefaultSeal(vaultseal.NewAccess(wrapper))
+		c.seal = NewDefaultSeal(&vaultseal.Access{
+			Wrapper: wrapper,
+		})
 	}
 	c.seal.SetCore(c)
 	return c, nil
@@ -1267,18 +1186,6 @@ func NewCore(conf *CoreConfig) (*Core, error) {
 		c.versionHistory = make(map[string]VaultVersion)
 	}
 
-	// start the event system
-	eventsLogger := conf.Logger.Named("events")
-	c.allLoggers = append(c.allLoggers, eventsLogger)
-	events, err := eventbus.NewEventBus(eventsLogger)
-	if err != nil {
-		return nil, err
-	}
-	c.events = events
-	if c.IsExperimentEnabled(experiments.VaultExperimentEventsAlpha1) {
-		c.events.Start()
-	}
-
 	return c, nil
 }
 
@@ -1417,13 +1324,13 @@ func (c *Core) Unseal(key []byte) (bool, error) {
 }
 
 // unseal takes a key fragment and attempts to use it to unseal Vault.
-// Vault may remain sealed afterwards even when no error is returned,
+// Vault may remain unsealed afterwards even when no error is returned,
 // depending on whether enough key fragments were provided to meet the
 // target threshold.
 //
 // The provided key should be a recovery key fragment if the seal
 // is an autoseal, or a regular seal key fragment for shamir.  In
-// migration scenarios "seal" in the preceding sentence refers to
+// migration scenarios "seal" in the preceding sentance refers to
 // the migration seal in c.migrationInfo.seal.
 //
 // We use getUnsealKey to work out if we have enough fragments,
@@ -1526,10 +1433,7 @@ func (c *Core) unsealWithRaft(combinedKey []byte) error {
 	if c.seal.BarrierType() == wrapping.WrapperTypeShamir {
 		// If this is a legacy shamir seal this serves no purpose but it
 		// doesn't hurt.
-		shamirWrapper, err := c.seal.GetShamirWrapper()
-		if err == nil {
-			err = shamirWrapper.SetAesGcmKeyBytes(combinedKey)
-		}
+		err := c.seal.GetAccess().Wrapper.(*aeadwrapper.ShamirWrapper).SetAesGcmKeyBytes(combinedKey)
 		if err != nil {
 			return err
 		}
@@ -1670,13 +1574,13 @@ func (c *Core) getUnsealKey(ctx context.Context, seal Seal) ([]byte, error) {
 	} else {
 		unsealKey, err = shamir.Combine(c.unlockInfo.Parts)
 		if err != nil {
-			return nil, &ErrInvalidKey{fmt.Sprintf("failed to compute combined key: %v", err)}
+			return nil, fmt.Errorf("failed to compute combined key: %w", err)
 		}
 	}
 
 	if seal.RecoveryKeySupported() {
 		if err := seal.VerifyRecoveryKey(ctx, unsealKey); err != nil {
-			return nil, &ErrInvalidKey{fmt.Sprintf("failed to verify recovery key: %v", err)}
+			return nil, err
 		}
 	}
 
@@ -1780,11 +1684,7 @@ func (c *Core) migrateSeal(ctx context.Context) error {
 		}
 
 		// We have recovery keys; we're going to use them as the new shamir KeK.
-		shamirWrapper, err := c.seal.GetShamirWrapper()
-		if err != nil {
-			return err
-		}
-		err = shamirWrapper.SetAesGcmKeyBytes(recoveryKey)
+		err = c.seal.GetAccess().Wrapper.(*aeadwrapper.ShamirWrapper).SetAesGcmKeyBytes(recoveryKey)
 		if err != nil {
 			return fmt.Errorf("failed to set master key in seal: %w", err)
 		}
@@ -2322,10 +2222,6 @@ func (s standardUnsealStrategy) unseal(ctx context.Context, logger log.Logger, c
 	if err := c.setupHeaderHMACKey(ctx, false); err != nil {
 		return err
 	}
-	if err := c.runLockedUserEntryUpdates(ctx); err != nil {
-		return err
-	}
-	c.updateLockedUserEntries()
 
 	if !c.IsDRSecondary() {
 		if err := c.startRollback(); err != nil {
@@ -2354,11 +2250,6 @@ func (s standardUnsealStrategy) unseal(ctx context.Context, logger log.Logger, c
 		if err := c.setupAuditedHeadersConfig(ctx); err != nil {
 			return err
 		}
-
-		if err := c.setupCensusAgent(); err != nil {
-			c.logger.Error("skipping reporting for nil agent", "error", err)
-		}
-
 		// not waiting on wg to avoid changing existing behavior
 		var wg sync.WaitGroup
 		if err := c.setupActivityLog(ctx, &wg); err != nil {
@@ -2469,7 +2360,7 @@ func (c *Core) postUnseal(ctx context.Context, ctxCancelFunc context.CancelFunc,
 	// been set up properly before any writes can have happened.
 	//
 	// Use a small temporary worker pool to run postUnsealFuncs in parallel
-	postUnsealFuncConcurrency := runtime.NumCPU() * 2
+	postUnsealFuncConcurrency := 1 // Disabled in backports
 	if v := os.Getenv("VAULT_POSTUNSEAL_FUNC_CONCURRENCY"); v != "" {
 		pv, err := strconv.Atoi(v)
 		if err != nil || pv < 1 {
@@ -2559,10 +2450,6 @@ func (c *Core) preSeal() error {
 		result = multierror.Append(result, fmt.Errorf("error stopping expiration: %w", err))
 	}
 	c.stopActivityLog()
-	// Clean up the censusAgent on seal
-	if err := c.teardownCensusAgent(); err != nil {
-		result = multierror.Append(result, fmt.Errorf("error tearing down reporting agent: %w", err))
-	}
 
 	if err := c.teardownCredentials(context.Background()); err != nil {
 		result = multierror.Append(result, fmt.Errorf("error tearing down credentials: %w", err))
@@ -2786,7 +2673,9 @@ func (c *Core) adjustForSealMigration(unwrapSeal Seal) error {
 		case existBarrierSealConfig.Type == wrapping.WrapperTypeShamir.String():
 			// The configured seal is not Shamir, the stored seal config is Shamir.
 			// This is a migration away from Shamir.
-			unwrapSeal = NewDefaultSeal(vaultseal.NewAccess(aeadwrapper.NewShamirWrapper()))
+			unwrapSeal = NewDefaultSeal(&vaultseal.Access{
+				Wrapper: aeadwrapper.NewShamirWrapper(),
+			})
 		default:
 			// We know at this point that there is a configured non-Shamir seal,
 			// that it does not match the stored non-Shamir seal config, and that
@@ -2949,7 +2838,9 @@ func (c *Core) unsealKeyToMasterKey(ctx context.Context, seal Seal, combinedKey
 
 	case vaultseal.StoredKeysSupportedShamirRoot:
 		if useTestSeal {
-			testseal := NewDefaultSeal(vaultseal.NewAccess(aeadwrapper.NewShamirWrapper()))
+			testseal := NewDefaultSeal(&vaultseal.Access{
+				Wrapper: aeadwrapper.NewShamirWrapper(),
+			})
 			testseal.SetCore(c)
 			cfg, err := seal.BarrierConfig(ctx)
 			if err != nil {
@@ -2959,13 +2850,9 @@ func (c *Core) unsealKeyToMasterKey(ctx context.Context, seal Seal, combinedKey
 			seal = testseal
 		}
 
-		shamirWrapper, err := seal.GetShamirWrapper()
-		if err != nil {
-			return nil, err
-		}
-		err = shamirWrapper.SetAesGcmKeyBytes(combinedKey)
+		err := seal.GetAccess().Wrapper.(*aeadwrapper.ShamirWrapper).SetAesGcmKeyBytes(combinedKey)
 		if err != nil {
-			return nil, &ErrInvalidKey{fmt.Sprintf("failed to setup unseal key: %v", err)}
+			return nil, fmt.Errorf("failed to setup unseal key: %w", err)
 		}
 		storedKeys, err := seal.GetStoredKeys(ctx)
 		if storedKeys == nil && err == nil && allowMissing {
@@ -3153,11 +3040,6 @@ func (c *Core) LogFormat() string {
 	return conf.(*server.Config).LogFormat
 }
 
-// LogLevel returns the log level provided by level provided by config, CLI flag, or env
-func (c *Core) LogLevel() string {
-	return c.logLevel
-}
-
 // MetricsHelper returns the global metrics helper which allows external
 // packages to access Vault's internal metrics.
 func (c *Core) MetricsHelper() *metricsutil.MetricsHelper {
@@ -3430,159 +3312,6 @@ func (c *Core) setupCachedMFAResponseAuth() {
 	return
 }
 
-// updateLockedUserEntries runs every 15 mins to remove stale user entries from storage
-// it also updates the userFailedLoginInfo map with correct information for locked users if incorrect
-func (c *Core) updateLockedUserEntries() {
-	ctx := c.activeContext
-	go func() {
-		ticker := time.NewTicker(15 * time.Minute)
-		for {
-			select {
-			case <-ctx.Done():
-				ticker.Stop()
-				return
-			case <-ticker.C:
-				if err := c.runLockedUserEntryUpdates(ctx); err != nil {
-					c.Logger().Error("failed to run locked user entry updates", "error", err)
-				}
-			}
-		}
-	}()
-	return
-}
-
-// runLockedUserEntryUpdates runs updates for locked user storage entries and userFailedLoginInfo map
-func (c *Core) runLockedUserEntryUpdates(ctx context.Context) error {
-	// check environment variable to see if user lockout workflow is disabled
-	var disableUserLockout bool
-	if disableUserLockoutEnv := os.Getenv(consts.VaultDisableUserLockout); disableUserLockoutEnv != "" {
-		var err error
-		disableUserLockout, err = strconv.ParseBool(disableUserLockoutEnv)
-		if err != nil {
-			c.Logger().Error("Error parsing the environment variable VAULT_DISABLE_USER_LOCKOUT", "error", err)
-		}
-	}
-	if disableUserLockout {
-		return nil
-	}
-
-	// get the list of namespaces of locked users from locked users path in storage
-	nsIDs, err := c.barrier.List(ctx, coreLockedUsersPath)
-	if err != nil {
-		return err
-	}
-
-	totalLockedUsersCount := 0
-	for _, nsID := range nsIDs {
-		// get the list of mount accessors of locked users for each namespace
-		mountAccessors, err := c.barrier.List(ctx, coreLockedUsersPath+nsID)
-		if err != nil {
-			return err
-		}
-
-		// update the entries for locked users for each mount accessor
-		// if storage entry is stale i.e; the lockout duration has passed
-		// remove this entry from storage and userFailedLoginInfo map
-		// else check if the userFailedLoginInfo map has correct failed login information
-		// if incorrect, update the entry in userFailedLoginInfo map
-		for _, mountAccessorPath := range mountAccessors {
-			mountAccessor := strings.TrimSuffix(mountAccessorPath, "/")
-			lockedAliasesCount, err := c.runLockedUserEntryUpdatesForMountAccessor(ctx, mountAccessor, coreLockedUsersPath+nsID+mountAccessorPath)
-			if err != nil {
-				return err
-			}
-			totalLockedUsersCount = totalLockedUsersCount + lockedAliasesCount
-		}
-	}
-
-	// emit locked user count metrics
-	metrics.SetGaugeWithLabels([]string{"core", "locked_users"}, float32(totalLockedUsersCount), nil)
-	return nil
-}
-
-// runLockedUserEntryUpdatesForMountAccessor updates the storage entry for each locked user (alias name)
-// if the entry is stale, it removes it from storage and userFailedLoginInfo map if present
-// if the entry is not stale, it updates the userFailedLoginInfo map with correct values for entry if incorrect
-func (c *Core) runLockedUserEntryUpdatesForMountAccessor(ctx context.Context, mountAccessor string, path string) (int, error) {
-	// get mount entry for mountAccessor
-	mountEntry := c.router.MatchingMountByAccessor(mountAccessor)
-	if mountEntry == nil {
-		mountEntry = &MountEntry{}
-	}
-	// get configuration for mount entry
-	userLockoutConfiguration := c.getUserLockoutConfiguration(mountEntry)
-
-	// get the list of aliases for mount accessor
-	aliases, err := c.barrier.List(ctx, path)
-	if err != nil {
-		return 0, err
-	}
-
-	lockedAliasesCount := len(aliases)
-
-	// check storage entry for each alias to update
-	for _, alias := range aliases {
-		loginUserInfoKey := FailedLoginUser{
-			aliasName:     alias,
-			mountAccessor: mountAccessor,
-		}
-
-		existingEntry, err := c.barrier.Get(ctx, path+alias)
-		if err != nil {
-			return 0, err
-		}
-
-		if existingEntry == nil {
-			continue
-		}
-
-		var lastLoginTime int
-		err = jsonutil.DecodeJSON(existingEntry.Value, &lastLoginTime)
-		if err != nil {
-			return 0, err
-		}
-
-		lastFailedLoginTimeFromStorageEntry := time.Unix(int64(lastLoginTime), 0)
-		lockoutDurationFromConfiguration := userLockoutConfiguration.LockoutDuration
-
-		// get the entry for the locked user from userFailedLoginInfo map
-		failedLoginInfoFromMap := c.LocalGetUserFailedLoginInfo(ctx, loginUserInfoKey)
-
-		// check if the storage entry for locked user is stale
-		if time.Now().After(lastFailedLoginTimeFromStorageEntry.Add(lockoutDurationFromConfiguration)) {
-			// stale entry, remove from storage
-			// leaving this as it is as this happens on the active node
-			// also handles case where namespace is deleted
-			if err := c.barrier.Delete(ctx, path+alias); err != nil {
-				return 0, err
-			}
-			// remove entry for this user from userFailedLoginInfo map if present as the user is not locked
-			if failedLoginInfoFromMap != nil {
-				if err = updateUserFailedLoginInfo(ctx, c, loginUserInfoKey, nil, true); err != nil {
-					return 0, err
-				}
-			}
-			lockedAliasesCount -= 1
-			continue
-		}
-
-		// this is not a stale entry
-		// update the map with actual failed login information
-		actualFailedLoginInfo := FailedLoginInfo{
-			lastFailedLoginTime: lastLoginTime,
-			count:               uint(userLockoutConfiguration.LockoutThreshold),
-		}
-
-		if failedLoginInfoFromMap != &actualFailedLoginInfo {
-			// entry is invalid, updating the entry in userFailedLoginMap with correct information
-			if err = updateUserFailedLoginInfo(ctx, c, loginUserInfoKey, &actualFailedLoginInfo, false); err != nil {
-				return 0, err
-			}
-		}
-	}
-	return lockedAliasesCount, nil
-}
-
 // PopMFAResponseAuthByID pops an item from the mfaResponseAuthQueue by ID
 // it returns the cached auth response or an error
 func (c *Core) PopMFAResponseAuthByID(reqID string) (*MFACachedAuthResponse, error) {
@@ -3693,16 +3422,6 @@ func (c *Core) ReloadLogRequestsLevel() {
 	}
 }
 
-func (c *Core) ReloadIntrospectionEndpointEnabled() {
-	conf := c.rawConfig.Load()
-	if conf == nil {
-		return
-	}
-	c.introspectionEnabledLock.Lock()
-	defer c.introspectionEnabledLock.Unlock()
-	c.introspectionEnabled = conf.(*server.Config).EnableIntrospectionEndpoint
-}
-
 type PeerNode struct {
 	Hostname       string    `json:"hostname"`
 	APIAddress     string    `json:"api_address"`
@@ -3804,39 +3523,6 @@ func (c *Core) DetermineRoleFromLoginRequest(mountPoint string, data map[string]
 	return resp.Data["role"].(string)
 }
 
-// aliasNameFromLoginRequest will determine the aliasName from the login Request
-func (c *Core) aliasNameFromLoginRequest(ctx context.Context, req *logical.Request) (string, error) {
-	c.authLock.RLock()
-	defer c.authLock.RUnlock()
-	ns, err := namespace.FromContext(ctx)
-	if err != nil {
-		return "", err
-	}
-
-	// ns path is added while checking matching backend
-	mountPath := strings.TrimPrefix(req.MountPoint, ns.Path)
-
-	matchingBackend := c.router.MatchingBackend(ctx, mountPath)
-	if matchingBackend == nil || matchingBackend.Type() != logical.TypeCredential {
-		// pathLoginAliasLookAhead operation does not apply to this request
-		return "", nil
-	}
-
-	path := strings.ReplaceAll(req.Path, mountPath, "")
-
-	resp, err := matchingBackend.HandleRequest(ctx, &logical.Request{
-		MountPoint: req.MountPoint,
-		Path:       path,
-		Operation:  logical.AliasLookaheadOperation,
-		Data:       req.Data,
-		Storage:    c.router.MatchingStorageByAPIPath(ctx, req.Path),
-	})
-	if err != nil || resp.Auth.Alias == nil {
-		return "", nil
-	}
-	return resp.Auth.Alias.Name, nil
-}
-
 // ListMounts will provide a slice containing a deep copy each mount entry
 func (c *Core) ListMounts() ([]*MountEntry, error) {
 	if c.Sealed() {
@@ -3883,44 +3569,6 @@ func (c *Core) ListAuths() ([]*MountEntry, error) {
 	return entries, nil
 }
 
-type GroupPolicyApplicationMode struct {
-	GroupPolicyApplicationMode string `json:"group_policy_application_mode"`
-}
-
-func (c *Core) GetGroupPolicyApplicationMode(ctx context.Context) (string, error) {
-	se, err := c.barrier.Get(ctx, coreGroupPolicyApplicationPath)
-	if err != nil {
-		return "", err
-	}
-	if se == nil {
-		return groupPolicyApplicationModeWithinNamespaceHierarchy, nil
-	}
-
-	var modeStruct GroupPolicyApplicationMode
-
-	err = jsonutil.DecodeJSON(se.Value, &modeStruct)
-	if err != nil {
-		return "", err
-	}
-	mode := modeStruct.GroupPolicyApplicationMode
-	if mode == "" {
-		mode = groupPolicyApplicationModeWithinNamespaceHierarchy
-	}
-
-	return mode, nil
-}
-
-func (c *Core) SetGroupPolicyApplicationMode(ctx context.Context, mode string) error {
-	json, err := jsonutil.EncodeJSON(&GroupPolicyApplicationMode{GroupPolicyApplicationMode: mode})
-	if err != nil {
-		return err
-	}
-	return c.barrier.Put(ctx, &logical.StorageEntry{
-		Key:   coreGroupPolicyApplicationPath,
-		Value: json,
-	})
-}
-
 type HCPLinkStatus struct {
 	lock             sync.RWMutex
 	ConnectionStatus string `json:"hcp_link_status,omitempty"`
@@ -3943,69 +3591,3 @@ func (c *Core) GetHCPLinkStatus() (string, string) {
 
 	return status, resourceID
 }
-
-// IsExperimentEnabled is true if the experiment is enabled in the core.
-func (c *Core) IsExperimentEnabled(experiment string) bool {
-	return strutil.StrListContains(c.experiments, experiment)
-}
-
-// ListenerAddresses provides a slice of configured listener addresses
-func (c *Core) ListenerAddresses() ([]string, error) {
-	addresses := make([]string, 0)
-
-	conf := c.rawConfig.Load()
-	if conf == nil {
-		return nil, fmt.Errorf("failed to load core raw config")
-	}
-
-	listeners := conf.(*server.Config).Listeners
-	if listeners == nil {
-		return nil, fmt.Errorf("no listener configured")
-	}
-
-	for _, listener := range listeners {
-		addresses = append(addresses, listener.Address)
-	}
-
-	return addresses, nil
-}
-
-// IsRaftVoter specifies whether the node is a raft voter which is
-// always false if raft storage is not in use.
-func (c *Core) IsRaftVoter() bool {
-	raftInfo := c.raftInfo.Load().(*raftInformation)
-
-	if raftInfo == nil {
-		return false
-	}
-
-	return !raftInfo.nonVoter
-}
-
-func (c *Core) HAEnabled() bool {
-	return c.ha != nil && c.ha.HAEnabled()
-}
-
-func (c *Core) GetRaftConfiguration(ctx context.Context) (*raft.RaftConfigurationResponse, error) {
-	raftBackend := c.getRaftBackend()
-
-	if raftBackend == nil {
-		return nil, nil
-	}
-
-	return raftBackend.GetConfiguration(ctx)
-}
-
-func (c *Core) GetRaftAutopilotState(ctx context.Context) (*raft.AutopilotState, error) {
-	raftBackend := c.getRaftBackend()
-	if raftBackend == nil {
-		return nil, nil
-	}
-
-	return raftBackend.GetAutopilotServerState(ctx)
-}
-
-// Events returns a reference to the common event bus for sending and subscribint to events.
-func (c *Core) Events() *eventbus.EventBus {
-	return c.events
-}
diff --git a/vault/core_metrics.go b/vault/core_metrics.go
index 18086bc3b254f..beeb113f7a299 100644
--- a/vault/core_metrics.go
+++ b/vault/core_metrics.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -22,9 +19,8 @@ func (c *Core) metricsLoop(stopCh chan struct{}) {
 	emitTimer := time.Tick(time.Second)
 
 	stopOrHAState := func() (bool, consts.HAState) {
-		l := newLockGrabber(c.stateLock.RLock, c.stateLock.RUnlock, stopCh)
-		go l.grab()
-		if stopped := l.lockOrStop(); stopped {
+		stopped := grabLockOrStop(c.stateLock.RLock, c.stateLock.RUnlock, stopCh)
+		if stopped {
 			return true, 0
 		}
 		defer c.stateLock.RUnlock()
@@ -127,9 +123,7 @@ func (c *Core) metricsLoop(stopCh chan struct{}) {
 			// Refresh gauge metrics that are looped
 			c.cachedGaugeMetricsEmitter()
 		case <-writeTimer:
-			l := newLockGrabber(c.stateLock.RLock, c.stateLock.RUnlock, stopCh)
-			go l.grab()
-			if stopped := l.lockOrStop(); stopped {
+			if stopped := grabLockOrStop(c.stateLock.RLock, c.stateLock.RUnlock, stopCh); stopped {
 				return
 			}
 			// Ship barrier encryption counts if a perf standby or the active node
@@ -301,12 +295,6 @@ func (c *Core) emitMetricsActiveNode(stopCh chan struct{}) {
 			c.activeEntityGaugeCollector,
 			"",
 		},
-		{
-			[]string{"policy", "configured", "count"},
-			[]metrics.Label{{"gauge", "number_policies_by_type"}},
-			c.configuredPoliciesGaugeCollector,
-			"",
-		},
 	}
 
 	// Disable collection if configured, or if we're a performance standby
@@ -571,41 +559,3 @@ func (c *Core) inFlightReqGaugeMetric() {
 	// Adding a gauge metric to capture total number of inflight requests
 	c.metricSink.SetGaugeWithLabels([]string{"core", "in_flight_requests"}, float32(totalInFlightReq), nil)
 }
-
-// configuredPoliciesGaugeCollector is used to collect gauge label values for the `vault.policy.configured.count` metric
-func (c *Core) configuredPoliciesGaugeCollector(ctx context.Context) ([]metricsutil.GaugeLabelValues, error) {
-	if c.policyStore == nil {
-		return []metricsutil.GaugeLabelValues{}, nil
-	}
-
-	c.stateLock.RLock()
-	policyStore := c.policyStore
-	c.stateLock.RUnlock()
-
-	ctx = namespace.RootContext(ctx)
-	namespaces := c.collectNamespaces()
-
-	policyTypes := []PolicyType{
-		PolicyTypeACL,
-		PolicyTypeRGP,
-		PolicyTypeEGP,
-	}
-	var values []metricsutil.GaugeLabelValues
-
-	for _, pt := range policyTypes {
-		policies, err := policyStore.policiesByNamespaces(ctx, pt, namespaces)
-		if err != nil {
-			return []metricsutil.GaugeLabelValues{}, err
-		}
-
-		v := metricsutil.GaugeLabelValues{}
-		v.Labels = []metricsutil.Label{{
-			"policy_type",
-			pt.String(),
-		}}
-		v.Value = float32(len(policies))
-		values = append(values, v)
-	}
-
-	return values, nil
-}
diff --git a/vault/core_metrics_test.go b/vault/core_metrics_test.go
index 7e31ab9d0baf3..6fb3b179f6f74 100644
--- a/vault/core_metrics_test.go
+++ b/vault/core_metrics_test.go
@@ -1,19 +1,12 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
-	"context"
-	"encoding/base64"
 	"errors"
 	"sort"
 	"strings"
 	"testing"
 	"time"
 
-	"github.com/stretchr/testify/assert"
-
 	"github.com/armon/go-metrics"
 	logicalKv "github.com/hashicorp/vault-plugin-secrets-kv"
 	"github.com/hashicorp/vault/helper/namespace"
@@ -354,90 +347,3 @@ func TestCoreMetrics_EntityGauges(t *testing.T) {
 			"mount_point": "auth/userpass/",
 		})
 }
-
-// TestCoreMetrics_AvailablePolicies tests the that available metrics are getting correctly collected when the availablePoliciesGaugeCollector function is invoked
-func TestCoreMetrics_AvailablePolicies(t *testing.T) {
-	aclPolicy := map[string]interface{}{
-		"policy": base64.StdEncoding.EncodeToString([]byte(`path "ns1/secret/foo/*" {
-    capabilities = ["create", "read", "update", "delete", "list"]
-}`)),
-		"name": "secret",
-	}
-
-	type pathPolicy struct {
-		Path   string
-		Policy map[string]interface{}
-	}
-
-	tests := map[string]struct {
-		Policies       []pathPolicy
-		ExpectedValues map[string]float32
-	}{
-		"single acl": {
-			Policies: []pathPolicy{
-				{
-					"sys/policy/secret", aclPolicy,
-				},
-			},
-			ExpectedValues: map[string]float32{
-				// The "default" policy will always be included
-				"acl": 2,
-				"egp": 0,
-				"rgp": 0,
-			},
-		},
-		"multiple acl": {
-			Policies: []pathPolicy{
-				{
-					"sys/policy/secret", aclPolicy,
-				},
-				{
-					"sys/policy/secret2", aclPolicy,
-				},
-			},
-			ExpectedValues: map[string]float32{
-				// The "default" policy will always be included
-				"acl": 3,
-				"egp": 0,
-				"rgp": 0,
-			},
-		},
-	}
-
-	for name, tst := range tests {
-		t.Run(name, func(t *testing.T) {
-			core, _, root := TestCoreUnsealed(t)
-
-			ctxRoot := namespace.RootContext(context.Background())
-
-			// Create policies
-			for _, p := range tst.Policies {
-				req := logical.TestRequest(t, logical.UpdateOperation, p.Path)
-				req.Data = p.Policy
-				req.ClientToken = root
-
-				resp, err := core.HandleRequest(ctxRoot, req)
-				if err != nil {
-					t.Fatalf("err: %v", err)
-				}
-				if resp != nil {
-					logger.Info("expected nil response", resp)
-					t.Fatalf("expected nil response")
-				}
-			}
-
-			gValues, err := core.configuredPoliciesGaugeCollector(ctxRoot)
-			if err != nil {
-				t.Fatalf("err: %v", err)
-			}
-
-			// Check the metrics values match the expected values
-			mgValues := make(map[string]float32, len(gValues))
-			for _, v := range gValues {
-				mgValues[v.Labels[0].Value] = v.Value
-			}
-
-			assert.EqualValues(t, tst.ExpectedValues, mgValues)
-		})
-	}
-}
diff --git a/vault/core_test.go b/vault/core_test.go
index 59e0706f1d9d2..1dc93c031ed8f 100644
--- a/vault/core_test.go
+++ b/vault/core_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -9,27 +6,21 @@ import (
 	"reflect"
 	"strings"
 	"sync"
-	"sync/atomic"
 	"testing"
 	"time"
 
 	"github.com/go-test/deep"
 	"github.com/hashicorp/errwrap"
 	log "github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/go-secure-stdlib/strutil"
 	"github.com/hashicorp/go-uuid"
 	"github.com/hashicorp/vault/audit"
 	"github.com/hashicorp/vault/helper/namespace"
-	"github.com/hashicorp/vault/helper/testhelpers/corehelpers"
-	"github.com/hashicorp/vault/internalshared/configutil"
 	"github.com/hashicorp/vault/sdk/helper/consts"
-	"github.com/hashicorp/vault/sdk/helper/jsonutil"
 	"github.com/hashicorp/vault/sdk/helper/logging"
 	"github.com/hashicorp/vault/sdk/logical"
 	"github.com/hashicorp/vault/sdk/physical"
 	"github.com/hashicorp/vault/sdk/physical/inmem"
-	"github.com/hashicorp/vault/version"
-	"github.com/sasha-s/go-deadlock"
+	"github.com/hashicorp/vault/sdk/version"
 )
 
 // invalidKey is used to test Unseal
@@ -369,131 +360,6 @@ func TestCore_SealUnseal(t *testing.T) {
 	}
 }
 
-// TestCore_RunLockedUserUpdatesForStaleEntry tests that stale locked user entries
-// get deleted upon unseal
-func TestCore_RunLockedUserUpdatesForStaleEntry(t *testing.T) {
-	core, keys, root := TestCoreUnsealed(t)
-	storageUserLockoutPath := fmt.Sprintf(coreLockedUsersPath + "ns1/mountAccessor1/aliasName1")
-
-	// cleanup
-	defer core.barrier.Delete(context.Background(), storageUserLockoutPath)
-
-	// create invalid entry in storage to test stale entries get deleted on unseal
-	// last failed login time for this path is 1970-01-01 00:00:00 +0000 UTC
-	// since user lockout configurations are not configured, lockout duration will
-	// be set to default (15m) internally
-	compressedBytes, err := jsonutil.EncodeJSONAndCompress(int(time.Unix(0, 0).Unix()), nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Create an entry
-	entry := &logical.StorageEntry{
-		Key:   storageUserLockoutPath,
-		Value: compressedBytes,
-	}
-
-	// Write to the physical backend
-	err = core.barrier.Put(context.Background(), entry)
-	if err != nil {
-		t.Fatalf("failed to write invalid locked user entry, err: %v", err)
-	}
-
-	// seal and unseal vault
-	if err := core.Seal(root); err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	for i, key := range keys {
-		unseal, err := TestCoreUnseal(core, key)
-		if err != nil {
-			t.Fatalf("err: %v", err)
-		}
-		if i+1 == len(keys) && !unseal {
-			t.Fatalf("err: should be unsealed")
-		}
-	}
-
-	// locked user entry must be deleted upon unseal as it is stale
-	lastFailedLoginRaw, err := core.barrier.Get(context.Background(), storageUserLockoutPath)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if lastFailedLoginRaw != nil {
-		t.Fatal("err: stale locked user entry exists")
-	}
-}
-
-// TestCore_RunLockedUserUpdatesForValidEntry tests that valid locked user entries
-// do not get removed on unseal
-// Also tests that the userFailedLoginInfo map gets updated with correct information
-func TestCore_RunLockedUserUpdatesForValidEntry(t *testing.T) {
-	core, keys, root := TestCoreUnsealed(t)
-	storageUserLockoutPath := fmt.Sprintf(coreLockedUsersPath + "ns1/mountAccessor1/aliasName1")
-
-	// cleanup
-	defer core.barrier.Delete(context.Background(), storageUserLockoutPath)
-
-	// create valid storage entry for locked user
-	lastFailedLoginTime := int(time.Now().Unix())
-
-	compressedBytes, err := jsonutil.EncodeJSONAndCompress(lastFailedLoginTime, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Create an entry
-	entry := &logical.StorageEntry{
-		Key:   storageUserLockoutPath,
-		Value: compressedBytes,
-	}
-
-	// Write to the physical backend
-	err = core.barrier.Put(context.Background(), entry)
-	if err != nil {
-		t.Fatalf("failed to write invalid locked user entry, err: %v", err)
-	}
-
-	// seal and unseal vault
-	if err := core.Seal(root); err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	for i, key := range keys {
-		unseal, err := TestCoreUnseal(core, key)
-		if err != nil {
-			t.Fatalf("err: %v", err)
-		}
-		if i+1 == len(keys) && !unseal {
-			t.Fatalf("err: should be unsealed")
-		}
-	}
-
-	// locked user entry must exist as it is still valid
-	existingEntry, err := core.barrier.Get(context.Background(), storageUserLockoutPath)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if existingEntry == nil {
-		t.Fatalf("err: entry must exist for locked user in storage")
-	}
-
-	// userFailedLoginInfo map should have the correct information for locked user
-	loginUserInfoKey := FailedLoginUser{
-		aliasName:     "aliasName1",
-		mountAccessor: "mountAccessor1",
-	}
-
-	failedLoginInfoFromMap := core.LocalGetUserFailedLoginInfo(context.Background(), loginUserInfoKey)
-	if failedLoginInfoFromMap == nil {
-		t.Fatalf("err: entry must exist for locked user in userFailedLoginInfo map")
-	}
-	if failedLoginInfoFromMap.lastFailedLoginTime != lastFailedLoginTime {
-		t.Fatalf("err: incorrect failed login time information for locked user updated in userFailedLoginInfo map")
-	}
-	if int(failedLoginInfoFromMap.count) != configutil.UserLockoutThresholdDefault {
-		t.Fatalf("err: incorrect failed login count information for locked user updated in userFailedLoginInfo map")
-	}
-}
-
 // Attempt to shutdown after unseal
 func TestCore_Shutdown(t *testing.T) {
 	c, _, _ := TestCoreUnsealed(t)
@@ -1135,10 +1001,10 @@ func TestCore_HandleLogin_Token(t *testing.T) {
 
 func TestCore_HandleRequest_AuditTrail(t *testing.T) {
 	// Create a noop audit backend
-	noop := &corehelpers.NoopAudit{}
+	noop := &NoopAudit{}
 	c, _, root := TestCoreUnsealed(t)
 	c.auditBackends["noop"] = func(ctx context.Context, config *audit.BackendConfig) (audit.Backend, error) {
-		noop = &corehelpers.NoopAudit{
+		noop = &NoopAudit{
 			Config: config,
 		}
 		return noop, nil
@@ -1199,10 +1065,10 @@ func TestCore_HandleRequest_AuditTrail(t *testing.T) {
 
 func TestCore_HandleRequest_AuditTrail_noHMACKeys(t *testing.T) {
 	// Create a noop audit backend
-	var noop *corehelpers.NoopAudit
+	var noop *NoopAudit
 	c, _, root := TestCoreUnsealed(t)
 	c.auditBackends["noop"] = func(ctx context.Context, config *audit.BackendConfig) (audit.Backend, error) {
-		noop = &corehelpers.NoopAudit{
+		noop = &NoopAudit{
 			Config: config,
 		}
 		return noop, nil
@@ -1293,17 +1159,17 @@ func TestCore_HandleRequest_AuditTrail_noHMACKeys(t *testing.T) {
 	if _, err := c.HandleRequest(namespace.RootContext(nil), req); err != nil {
 		t.Fatalf("err: %v", err)
 	}
-	if len(noop.RespNonHMACKeys) != 1 || !strutil.EquivalentSlices(noop.RespNonHMACKeys[0], []string{"baz"}) {
+	if len(noop.RespNonHMACKeys) != 1 || noop.RespNonHMACKeys[0] != "baz" {
 		t.Fatalf("Bad: %#v", noop.RespNonHMACKeys)
 	}
-	if len(noop.RespReqNonHMACKeys) != 1 || !strutil.EquivalentSlices(noop.RespReqNonHMACKeys[0], []string{"foo"}) {
+	if len(noop.RespReqNonHMACKeys) != 1 || noop.RespReqNonHMACKeys[0] != "foo" {
 		t.Fatalf("Bad: %#v", noop.RespReqNonHMACKeys)
 	}
 }
 
 func TestCore_HandleLogin_AuditTrail(t *testing.T) {
 	// Create a badass credential backend that always logs in as armon
-	noop := &corehelpers.NoopAudit{}
+	noop := &NoopAudit{}
 	noopBack := &NoopBackend{
 		Login: []string{"login"},
 		Response: &logical.Response{
@@ -1324,7 +1190,7 @@ func TestCore_HandleLogin_AuditTrail(t *testing.T) {
 		return noopBack, nil
 	}
 	c.auditBackends["noop"] = func(ctx context.Context, config *audit.BackendConfig) (audit.Backend, error) {
-		noop = &corehelpers.NoopAudit{
+		noop = &NoopAudit{
 			Config: config,
 		}
 		return noop, nil
@@ -2027,7 +1893,7 @@ func testCore_Standby_Common(t *testing.T, inm physical.Backend, inmha physical.
 		HAPhysical:      inmha,
 		RedirectAddr:    redirectOriginal,
 		DisableMlock:    true,
-		BuiltinRegistry: corehelpers.NewMockBuiltinRegistry(),
+		BuiltinRegistry: NewMockBuiltinRegistry(),
 	})
 	if err != nil {
 		t.Fatalf("err: %v", err)
@@ -2970,51 +2836,3 @@ func TestCore_ServiceRegistration(t *testing.T) {
 		t.Fatal(diff)
 	}
 }
-
-func TestDetectedDeadlock(t *testing.T) {
-	testCore, _, _ := TestCoreUnsealedWithConfig(t, &CoreConfig{DetectDeadlocks: "statelock"})
-	InduceDeadlock(t, testCore, 1)
-}
-
-func TestDefaultDeadlock(t *testing.T) {
-	testCore, _, _ := TestCoreUnsealed(t)
-	InduceDeadlock(t, testCore, 0)
-}
-
-func RestoreDeadlockOpts() func() {
-	opts := deadlock.Opts
-	return func() {
-		deadlock.Opts = opts
-	}
-}
-
-func InduceDeadlock(t *testing.T, vaultcore *Core, expected uint32) {
-	defer RestoreDeadlockOpts()()
-	var deadlocks uint32
-	deadlock.Opts.OnPotentialDeadlock = func() {
-		atomic.AddUint32(&deadlocks, 1)
-	}
-	var mtx deadlock.Mutex
-	var wg sync.WaitGroup
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-		vaultcore.expiration.coreStateLock.Lock()
-		mtx.Lock()
-		mtx.Unlock()
-		vaultcore.expiration.coreStateLock.Unlock()
-	}()
-	wg.Wait()
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-		mtx.Lock()
-		vaultcore.expiration.coreStateLock.RLock()
-		vaultcore.expiration.coreStateLock.RUnlock()
-		mtx.Unlock()
-	}()
-	wg.Wait()
-	if atomic.LoadUint32(&deadlocks) != expected {
-		t.Fatalf("expected 1 deadlock, detected %d", deadlocks)
-	}
-}
diff --git a/vault/core_util.go b/vault/core_util.go
index 7cf66075a508e..0faeee1b002d5 100644
--- a/vault/core_util.go
+++ b/vault/core_util.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !enterprise
 
 package vault
diff --git a/vault/core_util_common.go b/vault/core_util_common.go
index 2b7d4b38510d5..b934901dc4fcc 100644
--- a/vault/core_util_common.go
+++ b/vault/core_util_common.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/cors.go b/vault/cors.go
index 1e6d795a27bcc..57c0c36980526 100644
--- a/vault/cors.go
+++ b/vault/cors.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/counters.go b/vault/counters.go
index bfcdadbed0c94..aeff6eda800ea 100644
--- a/vault/counters.go
+++ b/vault/counters.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/counters_test.go b/vault/counters_test.go
index a8aa758d7c7a0..30f3f1a24472a 100644
--- a/vault/counters_test.go
+++ b/vault/counters_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -9,7 +6,6 @@ import (
 
 	"github.com/go-test/deep"
 	"github.com/hashicorp/vault/helper/namespace"
-	"github.com/hashicorp/vault/sdk/helper/testhelpers/schema"
 	"github.com/hashicorp/vault/sdk/logical"
 )
 
@@ -27,22 +23,14 @@ func testCountActiveTokens(t *testing.T, c *Core, root string) int {
 	t.Helper()
 
 	rootCtx := namespace.RootContext(nil)
-	req := &logical.Request{
+	resp, err := c.HandleRequest(rootCtx, &logical.Request{
 		ClientToken: root,
 		Operation:   logical.ReadOperation,
 		Path:        "sys/internal/counters/tokens",
-	}
-	resp, err := c.HandleRequest(rootCtx, req)
+	})
 	if err != nil || (resp != nil && resp.IsError()) {
 		t.Fatalf("bad: resp: %#v\n err: %v", resp, err)
 	}
-	schema.ValidateResponse(
-		t,
-		// we remove the `sys/` prefix b/c Core removes it before routing to the 'sys' backend
-		schema.GetResponseSchema(t, c.systemBackend.Route("internal/counters/tokens"), req.Operation),
-		resp,
-		true,
-	)
 
 	activeTokens := resp.Data["counters"].(*ActiveTokens)
 	return activeTokens.ServiceTokens.Total
diff --git a/vault/custom_response_headers.go b/vault/custom_response_headers.go
index f3f51930450fb..671b2a73f3b6f 100644
--- a/vault/custom_response_headers.go
+++ b/vault/custom_response_headers.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/custom_response_headers_test.go b/vault/custom_response_headers_test.go
index 4671f12518147..e5844ae190feb 100644
--- a/vault/custom_response_headers_test.go
+++ b/vault/custom_response_headers_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -14,7 +11,6 @@ import (
 	"github.com/hashicorp/vault/helper/namespace"
 	"github.com/hashicorp/vault/internalshared/configutil"
 	"github.com/hashicorp/vault/sdk/helper/logging"
-	"github.com/hashicorp/vault/sdk/helper/testhelpers/schema"
 	"github.com/hashicorp/vault/sdk/logical"
 	"github.com/hashicorp/vault/sdk/physical/inmem"
 )
@@ -102,7 +98,6 @@ func TestConfigCustomHeaders(t *testing.T) {
 
 func TestCustomResponseHeadersConfigInteractUiConfig(t *testing.T) {
 	b := testSystemBackend(t)
-	paths := b.(*SystemBackend).configPaths()
 	_, barrier, _ := mockBarrier(t)
 	view := NewBarrierView(barrier, "")
 	b.(*SystemBackend).Core.systemBarrierView = view
@@ -148,13 +143,6 @@ func TestCustomResponseHeadersConfigInteractUiConfig(t *testing.T) {
 	if err == nil {
 		t.Fatal("request did not fail on setting a header that is present in custom response headers")
 	}
-	schema.ValidateResponse(
-		t,
-		schema.FindResponseSchema(t, paths, 3, req.Operation),
-		resp,
-		true,
-	)
-
 	if !strings.Contains(resp.Data["error"].(string), fmt.Sprintf("This header already exists in the server configuration and cannot be set in the UI.")) {
 		t.Fatalf("failed to get the expected error")
 	}
@@ -164,17 +152,10 @@ func TestCustomResponseHeadersConfigInteractUiConfig(t *testing.T) {
 	req.Data["values"] = []string{"400"}
 	req.ResponseWriter = hw
 
-	resp, err = b.HandleRequest(namespace.RootContext(nil), req)
+	_, err = b.HandleRequest(namespace.RootContext(nil), req)
 	if err == nil {
 		t.Fatal("request did not fail on setting a header that is present in custom response headers")
 	}
-	schema.ValidateResponse(
-		t,
-		schema.FindResponseSchema(t, paths, 3, req.Operation),
-		resp,
-		true,
-	)
-
 	h, err := b.(*SystemBackend).Core.uiConfig.Headers(context.Background())
 	if err != nil {
 		t.Fatal(err)
@@ -188,16 +169,10 @@ func TestCustomResponseHeadersConfigInteractUiConfig(t *testing.T) {
 	req.Data["values"] = []string{"Ui header value"}
 	req.ResponseWriter = hw
 
-	resp, err = b.HandleRequest(namespace.RootContext(nil), req)
+	_, err = b.HandleRequest(namespace.RootContext(nil), req)
 	if err != nil {
 		t.Fatal("request failed on setting a header that is not present in custom response headers.", "error:", err)
 	}
-	schema.ValidateResponse(
-		t,
-		schema.FindResponseSchema(t, paths, 3, req.Operation),
-		resp,
-		true,
-	)
 
 	h, err = b.(*SystemBackend).Core.uiConfig.Headers(context.Background())
 	if err != nil {
diff --git a/vault/deadlock.go b/vault/deadlock.go
new file mode 100644
index 0000000000000..534f18492f379
--- /dev/null
+++ b/vault/deadlock.go
@@ -0,0 +1,21 @@
+//go:build deadlock
+
+package vault
+
+import (
+	"github.com/sasha-s/go-deadlock"
+)
+
+// DeadlockMutex, when the build tag `deadlock` is present, behaves like a
+// sync.Mutex but does periodic checking to see if outstanding locks and requests
+// look like a deadlock.  If it finds a deadlock candidate it will output it
+// prefixed with "POTENTIAL DEADLOCK", as described at
+// https://github.com/sasha-s/go-deadlock
+type DeadlockMutex struct {
+	deadlock.Mutex
+}
+
+// DeadlockRWMutex is the RW version of DeadlockMutex.
+type DeadlockRWMutex struct {
+	deadlock.RWMutex
+}
diff --git a/vault/diagnose/constants.go b/vault/diagnose/constants.go
index b1bfa0b0646e3..38071abdc8d3a 100644
--- a/vault/diagnose/constants.go
+++ b/vault/diagnose/constants.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package diagnose
 
 const (
diff --git a/vault/diagnose/file_checks.go b/vault/diagnose/file_checks.go
index acca5f5b44237..a38f5164f6093 100644
--- a/vault/diagnose/file_checks.go
+++ b/vault/diagnose/file_checks.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package diagnose
 
 import (
diff --git a/vault/diagnose/file_checks_test.go b/vault/diagnose/file_checks_test.go
index aca46718504f4..1afd40dfe8175 100644
--- a/vault/diagnose/file_checks_test.go
+++ b/vault/diagnose/file_checks_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package diagnose
 
 import (
diff --git a/vault/diagnose/file_checks_unix.go b/vault/diagnose/file_checks_unix.go
index f6e7279de7831..bb78398bc1601 100644
--- a/vault/diagnose/file_checks_unix.go
+++ b/vault/diagnose/file_checks_unix.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !windows
 
 package diagnose
diff --git a/vault/diagnose/file_checks_windows.go b/vault/diagnose/file_checks_windows.go
index 6ac795dbd1b99..dd41353fd8753 100644
--- a/vault/diagnose/file_checks_windows.go
+++ b/vault/diagnose/file_checks_windows.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build windows
 
 package diagnose
diff --git a/vault/diagnose/helpers.go b/vault/diagnose/helpers.go
index a881f03622912..08f004a2b1e75 100644
--- a/vault/diagnose/helpers.go
+++ b/vault/diagnose/helpers.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package diagnose
 
 import (
@@ -96,7 +93,7 @@ func (s *Session) Finalize(ctx context.Context) *Result {
 }
 
 // StartSpan starts a "diagnose" span, which is really just an OpenTelemetry Tracing span.
-func StartSpan(ctx context.Context, spanName string, options ...trace.SpanStartOption) (context.Context, trace.Span) {
+func StartSpan(ctx context.Context, spanName string, options ...trace.SpanOption) (context.Context, trace.Span) {
 	session := CurrentSession(ctx)
 	if session != nil {
 		return session.tracer.Start(ctx, spanName, options...)
@@ -204,7 +201,7 @@ func SpotCheck(ctx context.Context, checkName string, f func() error) error {
 
 // Test creates a new named span, and executes the provided function within it.  If the function returns an error,
 // the span is considered to have failed.
-func Test(ctx context.Context, spanName string, function testFunction, options ...trace.SpanStartOption) error {
+func Test(ctx context.Context, spanName string, function testFunction, options ...trace.SpanOption) error {
 	ctx, span := StartSpan(ctx, spanName, options...)
 	defer span.End()
 	sess := CurrentSession(ctx)
diff --git a/vault/diagnose/helpers_test.go b/vault/diagnose/helpers_test.go
index 92f71151d368f..8d83e9df2c198 100644
--- a/vault/diagnose/helpers_test.go
+++ b/vault/diagnose/helpers_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package diagnose
 
 import (
diff --git a/vault/diagnose/mock_storage_backend.go b/vault/diagnose/mock_storage_backend.go
index 3bfad97dd0b92..8999d9f956ac5 100644
--- a/vault/diagnose/mock_storage_backend.go
+++ b/vault/diagnose/mock_storage_backend.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package diagnose
 
 import (
diff --git a/vault/diagnose/os_common.go b/vault/diagnose/os_common.go
index d5c4de392a914..258c874e1c3ed 100644
--- a/vault/diagnose/os_common.go
+++ b/vault/diagnose/os_common.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !openbsd || !arm
 
 package diagnose
diff --git a/vault/diagnose/os_openbsd_arm.go b/vault/diagnose/os_openbsd_arm.go
index 6bb4a990f9064..da2aee831c434 100644
--- a/vault/diagnose/os_openbsd_arm.go
+++ b/vault/diagnose/os_openbsd_arm.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build openbsd && arm
 
 package diagnose
diff --git a/vault/diagnose/os_unix.go b/vault/diagnose/os_unix.go
index 4dad013d8d958..2334a95fc7f15 100644
--- a/vault/diagnose/os_unix.go
+++ b/vault/diagnose/os_unix.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !windows
 
 package diagnose
diff --git a/vault/diagnose/os_windows.go b/vault/diagnose/os_windows.go
index 6a1a3e98c923d..f863bb13182a2 100644
--- a/vault/diagnose/os_windows.go
+++ b/vault/diagnose/os_windows.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build windows
 
 package diagnose
diff --git a/vault/diagnose/output.go b/vault/diagnose/output.go
index 719914297ac6a..22d36b9873700 100644
--- a/vault/diagnose/output.go
+++ b/vault/diagnose/output.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package diagnose
 
 import (
@@ -181,7 +178,7 @@ func (t *TelemetryCollector) getOrBuildResult(id trace.SpanID) *Result {
 	if !ok {
 		r = &Result{
 			Name:    s.Name(),
-			Message: s.Status().Description,
+			Message: s.StatusMessage(),
 			Time:    s.StartTime(),
 		}
 		for _, e := range s.Events() {
@@ -258,7 +255,7 @@ func (t *TelemetryCollector) getOrBuildResult(id trace.SpanID) *Result {
 				}
 			}
 		}
-		switch s.Status().Code {
+		switch s.StatusCode() {
 		case codes.Unset:
 			if len(r.Warnings) > 0 {
 				r.Status = WarningStatus
@@ -279,7 +276,7 @@ func (t *TelemetryCollector) getOrBuildResult(id trace.SpanID) *Result {
 	return r
 }
 
-func findAttribute(e sdktrace.Event, attr attribute.Key) string {
+func findAttribute(e trace.Event, attr attribute.Key) string {
 	for _, a := range e.Attributes {
 		if a.Key == attr {
 			return a.Value.AsString()
@@ -288,7 +285,7 @@ func findAttribute(e sdktrace.Event, attr attribute.Key) string {
 	return ""
 }
 
-func findAttributes(e sdktrace.Event, attr1, attr2 attribute.Key) (string, string) {
+func findAttributes(e trace.Event, attr1, attr2 attribute.Key) (string, string) {
 	var av1, av2 string
 	for _, a := range e.Attributes {
 		switch a.Key {
diff --git a/vault/diagnose/raft_checks.go b/vault/diagnose/raft_checks.go
index 73a101a6bc7fe..6d95bf37fa2a8 100644
--- a/vault/diagnose/raft_checks.go
+++ b/vault/diagnose/raft_checks.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package diagnose
 
 import (
diff --git a/vault/diagnose/storage_checks.go b/vault/diagnose/storage_checks.go
index 915cefa3f959f..3c975106abf90 100644
--- a/vault/diagnose/storage_checks.go
+++ b/vault/diagnose/storage_checks.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package diagnose
 
 import (
diff --git a/vault/diagnose/storage_checks_test.go b/vault/diagnose/storage_checks_test.go
index c10b81542ad92..39d9352cd7c67 100644
--- a/vault/diagnose/storage_checks_test.go
+++ b/vault/diagnose/storage_checks_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package diagnose
 
 import (
diff --git a/vault/diagnose/tls_verification.go b/vault/diagnose/tls_verification.go
index 0e4493e532960..84bed3b218958 100644
--- a/vault/diagnose/tls_verification.go
+++ b/vault/diagnose/tls_verification.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package diagnose
 
 import (
diff --git a/vault/diagnose/tls_verification_test.go b/vault/diagnose/tls_verification_test.go
index 632d05aeba4a4..a3463aacd341f 100644
--- a/vault/diagnose/tls_verification_test.go
+++ b/vault/diagnose/tls_verification_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package diagnose
 
 import (
diff --git a/vault/dynamic_system_view.go b/vault/dynamic_system_view.go
index 8c547b6712af7..77eccf0876275 100644
--- a/vault/dynamic_system_view.go
+++ b/vault/dynamic_system_view.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -16,7 +13,7 @@ import (
 	"github.com/hashicorp/vault/sdk/helper/pluginutil"
 	"github.com/hashicorp/vault/sdk/helper/wrapping"
 	"github.com/hashicorp/vault/sdk/logical"
-	"github.com/hashicorp/vault/version"
+	"github.com/hashicorp/vault/sdk/version"
 )
 
 type ctxKeyForwardedRequestMountAccessor struct{}
@@ -26,9 +23,8 @@ func (c ctxKeyForwardedRequestMountAccessor) String() string {
 }
 
 type dynamicSystemView struct {
-	core        *Core
-	mountEntry  *MountEntry
-	perfStandby bool
+	core       *Core
+	mountEntry *MountEntry
 }
 
 type extendedSystemView interface {
@@ -182,7 +178,7 @@ func (d dynamicSystemView) LocalMount() bool {
 // in read mode.
 func (d dynamicSystemView) ReplicationState() consts.ReplicationState {
 	state := d.core.ReplicationState()
-	if d.perfStandby {
+	if d.core.perfStandby {
 		state |= consts.ReplicationPerformanceStandby
 	}
 	return state
@@ -384,10 +380,6 @@ func (d dynamicSystemView) PluginEnv(_ context.Context) (*logical.PluginEnvironm
 	}, nil
 }
 
-func (d dynamicSystemView) VaultVersion(_ context.Context) (string, error) {
-	return version.GetVersion().Version, nil
-}
-
 func (d dynamicSystemView) GeneratePasswordFromPolicy(ctx context.Context, policyName string) (password string, err error) {
 	if policyName == "" {
 		return "", fmt.Errorf("missing password policy name")
@@ -418,12 +410,3 @@ func (d dynamicSystemView) GeneratePasswordFromPolicy(ctx context.Context, polic
 
 	return passPolicy.Generate(ctx, nil)
 }
-
-func (d dynamicSystemView) ClusterID(ctx context.Context) (string, error) {
-	clusterInfo, err := d.core.Cluster(ctx)
-	if err != nil || clusterInfo.ID == "" {
-		return "", fmt.Errorf("unable to retrieve cluster info or empty ID: %w", err)
-	}
-
-	return clusterInfo.ID, nil
-}
diff --git a/vault/dynamic_system_view_test.go b/vault/dynamic_system_view_test.go
index d7e252e295c23..1091f33e3149e 100644
--- a/vault/dynamic_system_view_test.go
+++ b/vault/dynamic_system_view_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/eventbus/bus.go b/vault/eventbus/bus.go
deleted file mode 100644
index 6f66d423bc4c0..0000000000000
--- a/vault/eventbus/bus.go
+++ /dev/null
@@ -1,302 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package eventbus
-
-import (
-	"context"
-	"errors"
-	"net/url"
-	"strings"
-	"sync"
-	"sync/atomic"
-	"time"
-
-	"github.com/armon/go-metrics"
-	"github.com/hashicorp/eventlogger"
-	"github.com/hashicorp/eventlogger/formatter_filters/cloudevents"
-	"github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/go-uuid"
-	"github.com/hashicorp/vault/helper/namespace"
-	"github.com/hashicorp/vault/sdk/logical"
-	"github.com/ryanuber/go-glob"
-)
-
-const (
-	// eventTypeAll is purely internal to the event bus. We use it to send all
-	// events down one big firehose, and pipelines define their own filtering
-	// based on what each subscriber is interested in.
-	eventTypeAll   = "*"
-	defaultTimeout = 60 * time.Second
-)
-
-var (
-	ErrNotStarted              = errors.New("event broker has not been started")
-	cloudEventsFormatterFilter *cloudevents.FormatterFilter
-	subscriptions              atomic.Int64 // keeps track of event subscription count in all event buses
-)
-
-// EventBus contains the main logic of running an event broker for Vault.
-// Start() must be called before the EventBus will accept events for sending.
-type EventBus struct {
-	logger          hclog.Logger
-	broker          *eventlogger.Broker
-	started         atomic.Bool
-	formatterNodeID eventlogger.NodeID
-	timeout         time.Duration
-}
-
-type pluginEventBus struct {
-	bus        *EventBus
-	namespace  *namespace.Namespace
-	pluginInfo *logical.EventPluginInfo
-}
-
-type asyncChanNode struct {
-	// TODO: add bounded deque buffer of *EventReceived
-	ctx    context.Context
-	ch     chan *eventlogger.Event
-	logger hclog.Logger
-
-	// used to close the connection
-	closeOnce  sync.Once
-	cancelFunc context.CancelFunc
-	pipelineID eventlogger.PipelineID
-	broker     *eventlogger.Broker
-}
-
-var (
-	_ eventlogger.Node    = (*asyncChanNode)(nil)
-	_ logical.EventSender = (*pluginEventBus)(nil)
-)
-
-// Start starts the event bus, allowing events to be written.
-// It is not possible to stop or restart the event bus.
-// It is safe to call Start() multiple times.
-func (bus *EventBus) Start() {
-	wasStarted := bus.started.Swap(true)
-	if !wasStarted {
-		bus.logger.Info("Starting event system")
-	}
-}
-
-// SendInternal sends an event to the event bus and routes it to all relevant subscribers.
-// This function does *not* wait for all subscribers to acknowledge before returning.
-// This function is meant to be used by trusted internal code, so it can specify details like the namespace
-// and plugin info. Events from plugins should be routed through WithPlugin(), which will populate
-// the namespace and plugin info automatically.
-func (bus *EventBus) SendInternal(ctx context.Context, ns *namespace.Namespace, pluginInfo *logical.EventPluginInfo, eventType logical.EventType, data *logical.EventData) error {
-	if ns == nil {
-		return namespace.ErrNoNamespace
-	}
-	if !bus.started.Load() {
-		return ErrNotStarted
-	}
-	eventReceived := &logical.EventReceived{
-		Event:      data,
-		Namespace:  ns.Path,
-		EventType:  string(eventType),
-		PluginInfo: pluginInfo,
-	}
-	bus.logger.Info("Sending event", "event", eventReceived)
-
-	// We can't easily know when the Send is complete, so we can't call the cancel function.
-	// But, it is called automatically after bus.timeout, so there won't be any leak as long as bus.timeout is not too long.
-	ctx, _ = context.WithTimeout(ctx, bus.timeout)
-	_, err := bus.broker.Send(ctx, eventTypeAll, eventReceived)
-	if err != nil {
-		// if no listeners for this event type are registered, that's okay, the event
-		// will just not be sent anywhere
-		if strings.Contains(strings.ToLower(err.Error()), "no graph for eventtype") {
-			return nil
-		}
-	}
-	return err
-}
-
-func (bus *EventBus) WithPlugin(ns *namespace.Namespace, eventPluginInfo *logical.EventPluginInfo) (*pluginEventBus, error) {
-	if ns == nil {
-		return nil, namespace.ErrNoNamespace
-	}
-	return &pluginEventBus{
-		bus:        bus,
-		namespace:  ns,
-		pluginInfo: eventPluginInfo,
-	}, nil
-}
-
-// Send sends an event to the event bus and routes it to all relevant subscribers.
-// This function does *not* wait for all subscribers to acknowledge before returning.
-func (bus *pluginEventBus) Send(ctx context.Context, eventType logical.EventType, data *logical.EventData) error {
-	return bus.bus.SendInternal(ctx, bus.namespace, bus.pluginInfo, eventType, data)
-}
-
-func init() {
-	// TODO: maybe this should relate to the Vault core somehow?
-	sourceUrl, err := url.Parse("https://vaultproject.io/")
-	if err != nil {
-		panic(err)
-	}
-	cloudEventsFormatterFilter = &cloudevents.FormatterFilter{
-		Source: sourceUrl,
-		Predicate: func(_ context.Context, e interface{}) (bool, error) {
-			return true, nil
-		},
-	}
-}
-
-func NewEventBus(logger hclog.Logger) (*EventBus, error) {
-	broker := eventlogger.NewBroker()
-
-	formatterID, err := uuid.GenerateUUID()
-	if err != nil {
-		return nil, err
-	}
-	formatterNodeID := eventlogger.NodeID(formatterID)
-	err = broker.RegisterNode(formatterNodeID, cloudEventsFormatterFilter)
-	if err != nil {
-		return nil, err
-	}
-
-	if logger == nil {
-		logger = hclog.Default().Named("events")
-	}
-
-	return &EventBus{
-		logger:          logger,
-		broker:          broker,
-		formatterNodeID: formatterNodeID,
-		timeout:         defaultTimeout,
-	}, nil
-}
-
-func (bus *EventBus) Subscribe(ctx context.Context, ns *namespace.Namespace, pattern string) (<-chan *eventlogger.Event, context.CancelFunc, error) {
-	// subscriptions are still stored even if the bus has not been started
-	pipelineID, err := uuid.GenerateUUID()
-	if err != nil {
-		return nil, nil, err
-	}
-
-	filterNodeID, err := uuid.GenerateUUID()
-	if err != nil {
-		return nil, nil, err
-	}
-
-	filterNode := newFilterNode(ns, pattern)
-	err = bus.broker.RegisterNode(eventlogger.NodeID(filterNodeID), filterNode)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	sinkNodeID, err := uuid.GenerateUUID()
-	if err != nil {
-		return nil, nil, err
-	}
-
-	ctx, cancel := context.WithCancel(ctx)
-	asyncNode := newAsyncNode(ctx, bus.logger)
-	err = bus.broker.RegisterNode(eventlogger.NodeID(sinkNodeID), asyncNode)
-	if err != nil {
-		defer cancel()
-		return nil, nil, err
-	}
-
-	nodes := []eventlogger.NodeID{eventlogger.NodeID(filterNodeID), bus.formatterNodeID, eventlogger.NodeID(sinkNodeID)}
-
-	pipeline := eventlogger.Pipeline{
-		PipelineID: eventlogger.PipelineID(pipelineID),
-		EventType:  eventTypeAll,
-		NodeIDs:    nodes,
-	}
-	err = bus.broker.RegisterPipeline(pipeline)
-	if err != nil {
-		defer cancel()
-		return nil, nil, err
-	}
-
-	addSubscriptions(1)
-	// add info needed to cancel the subscription
-	asyncNode.pipelineID = eventlogger.PipelineID(pipelineID)
-	asyncNode.cancelFunc = cancel
-	return asyncNode.ch, asyncNode.Close, nil
-}
-
-// SetSendTimeout sets the timeout of sending events. If the events are not accepted by the
-// underlying channel before this timeout, then the channel closed.
-func (bus *EventBus) SetSendTimeout(timeout time.Duration) {
-	bus.timeout = timeout
-}
-
-func newFilterNode(ns *namespace.Namespace, pattern string) *eventlogger.Filter {
-	return &eventlogger.Filter{
-		Predicate: func(e *eventlogger.Event) (bool, error) {
-			eventRecv := e.Payload.(*logical.EventReceived)
-
-			// Drop if event is not in our namespace.
-			// TODO: add wildcard/child namespace processing here in some cases?
-			if eventRecv.Namespace != ns.Path {
-				return false, nil
-			}
-
-			// Filter for correct event type, including wildcards.
-			if !glob.Glob(pattern, eventRecv.EventType) {
-				return false, nil
-			}
-
-			return true, nil
-		},
-	}
-}
-
-func newAsyncNode(ctx context.Context, logger hclog.Logger) *asyncChanNode {
-	return &asyncChanNode{
-		ctx:    ctx,
-		ch:     make(chan *eventlogger.Event),
-		logger: logger,
-	}
-}
-
-// Close tells the bus to stop sending us events.
-func (node *asyncChanNode) Close() {
-	node.closeOnce.Do(func() {
-		defer node.cancelFunc()
-		if node.broker != nil {
-			err := node.broker.RemovePipeline(eventTypeAll, node.pipelineID)
-			if err != nil {
-				node.logger.Warn("Error removing pipeline for closing node", "error", err)
-			}
-		}
-		addSubscriptions(-1)
-	})
-}
-
-func (node *asyncChanNode) Process(ctx context.Context, e *eventlogger.Event) (*eventlogger.Event, error) {
-	// sends to the channel async in another goroutine
-	go func() {
-		var timeout bool
-		select {
-		case node.ch <- e:
-		case <-ctx.Done():
-			timeout = errors.Is(ctx.Err(), context.DeadlineExceeded)
-		case <-node.ctx.Done():
-			timeout = errors.Is(node.ctx.Err(), context.DeadlineExceeded)
-		}
-		if timeout {
-			node.logger.Info("Subscriber took too long to process event, closing", "ID", e.Payload.(*logical.EventReceived).Event.Id)
-			node.Close()
-		}
-	}()
-	return e, nil
-}
-
-func (node *asyncChanNode) Reopen() error {
-	return nil
-}
-
-func (node *asyncChanNode) Type() eventlogger.NodeType {
-	return eventlogger.NodeTypeSink
-}
-
-func addSubscriptions(delta int64) {
-	metrics.SetGauge([]string{"events", "subscriptions"}, float32(subscriptions.Add(delta)))
-}
diff --git a/vault/eventbus/bus_test.go b/vault/eventbus/bus_test.go
deleted file mode 100644
index 396de6801711e..0000000000000
--- a/vault/eventbus/bus_test.go
+++ /dev/null
@@ -1,379 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package eventbus
-
-import (
-	"context"
-	"fmt"
-	"sync/atomic"
-	"testing"
-	"time"
-
-	"github.com/hashicorp/eventlogger"
-	"github.com/hashicorp/go-secure-stdlib/strutil"
-	"github.com/hashicorp/vault/helper/namespace"
-	"github.com/hashicorp/vault/sdk/logical"
-)
-
-// TestBusBasics tests that basic event sending and subscribing function.
-func TestBusBasics(t *testing.T) {
-	bus, err := NewEventBus(nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	ctx := context.Background()
-
-	eventType := logical.EventType("someType")
-
-	event, err := logical.NewEvent()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = bus.SendInternal(ctx, namespace.RootNamespace, nil, eventType, event)
-	if err != ErrNotStarted {
-		t.Errorf("Expected not started error but got: %v", err)
-	}
-
-	bus.Start()
-
-	err = bus.SendInternal(ctx, namespace.RootNamespace, nil, eventType, event)
-	if err != nil {
-		t.Errorf("Expected no error sending: %v", err)
-	}
-
-	ch, cancel, err := bus.Subscribe(ctx, namespace.RootNamespace, string(eventType))
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer cancel()
-
-	event, err = logical.NewEvent()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = bus.SendInternal(ctx, namespace.RootNamespace, nil, eventType, event)
-	if err != nil {
-		t.Error(err)
-	}
-
-	timeout := time.After(1 * time.Second)
-	select {
-	case message := <-ch:
-		if message.Payload.(*logical.EventReceived).Event.Id != event.Id {
-			t.Errorf("Got unexpected message: %+v", message)
-		}
-	case <-timeout:
-		t.Error("Timeout waiting for message")
-	}
-}
-
-// TestNamespaceFiltering verifies that events for other namespaces are filtered out by the bus.
-func TestNamespaceFiltering(t *testing.T) {
-	bus, err := NewEventBus(nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	bus.Start()
-	ctx := context.Background()
-
-	eventType := logical.EventType("someType")
-
-	event, err := logical.NewEvent()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	ch, cancel, err := bus.Subscribe(ctx, namespace.RootNamespace, string(eventType))
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer cancel()
-
-	event, err = logical.NewEvent()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = bus.SendInternal(ctx, &namespace.Namespace{
-		ID:   "abc",
-		Path: "/abc",
-	}, nil, eventType, event)
-	if err != nil {
-		t.Error(err)
-	}
-
-	timeout := time.After(100 * time.Millisecond)
-	select {
-	case <-ch:
-		t.Errorf("Got abc namespace message when root namespace was specified")
-	case <-timeout:
-		// okay
-	}
-
-	err = bus.SendInternal(ctx, namespace.RootNamespace, nil, eventType, event)
-	if err != nil {
-		t.Error(err)
-	}
-
-	timeout = time.After(1 * time.Second)
-	select {
-	case message := <-ch:
-		if message.Payload.(*logical.EventReceived).Event.Id != event.Id {
-			t.Errorf("Got unexpected message %+v but was waiting for %+v", message, event)
-		}
-
-	case <-timeout:
-		t.Error("Timed out waiting for message")
-	}
-}
-
-// TestBus2Subscriptions verifies that events of different types are successfully routed to the correct subscribers.
-func TestBus2Subscriptions(t *testing.T) {
-	bus, err := NewEventBus(nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	ctx := context.Background()
-
-	eventType1 := logical.EventType("someType1")
-	eventType2 := logical.EventType("someType2")
-	bus.Start()
-
-	ch1, cancel1, err := bus.Subscribe(ctx, namespace.RootNamespace, string(eventType1))
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer cancel1()
-
-	ch2, cancel2, err := bus.Subscribe(ctx, namespace.RootNamespace, string(eventType2))
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer cancel2()
-
-	event1, err := logical.NewEvent()
-	if err != nil {
-		t.Fatal(err)
-	}
-	event2, err := logical.NewEvent()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = bus.SendInternal(ctx, namespace.RootNamespace, nil, eventType2, event2)
-	if err != nil {
-		t.Error(err)
-	}
-	err = bus.SendInternal(ctx, namespace.RootNamespace, nil, eventType1, event1)
-	if err != nil {
-		t.Error(err)
-	}
-
-	timeout := time.After(1 * time.Second)
-	select {
-	case message := <-ch1:
-		if message.Payload.(*logical.EventReceived).Event.Id != event1.Id {
-			t.Errorf("Got unexpected message: %v", message)
-		}
-	case <-timeout:
-		t.Error("Timeout waiting for event1")
-	}
-	select {
-	case message := <-ch2:
-		if message.Payload.(*logical.EventReceived).Event.Id != event2.Id {
-			t.Errorf("Got unexpected message: %v", message)
-		}
-	case <-timeout:
-		t.Error("Timeout waiting for event2")
-	}
-}
-
-// TestBusSubscriptionsCancel verifies that canceled subscriptions are cleaned up.
-func TestBusSubscriptionsCancel(t *testing.T) {
-	testCases := []struct {
-		cancel bool
-	}{
-		{cancel: true},
-		{cancel: false},
-	}
-
-	for _, tc := range testCases {
-		t.Run(fmt.Sprintf("cancel=%v", tc.cancel), func(t *testing.T) {
-			subscriptions.Store(0)
-			bus, err := NewEventBus(nil)
-			if err != nil {
-				t.Fatal(err)
-			}
-			ctx := context.Background()
-			if !tc.cancel {
-				// set the timeout very short to make the test faster if we aren't canceling explicitly
-				bus.SetSendTimeout(100 * time.Millisecond)
-			}
-			bus.Start()
-
-			// create and stop a bunch of subscriptions
-			const create = 100
-			const stop = 50
-
-			eventType := logical.EventType("someType")
-
-			var channels []<-chan *eventlogger.Event
-			var cancels []context.CancelFunc
-			stopped := atomic.Int32{}
-
-			received := atomic.Int32{}
-
-			for i := 0; i < create; i++ {
-				ch, cancelFunc, err := bus.Subscribe(ctx, namespace.RootNamespace, string(eventType))
-				if err != nil {
-					t.Fatal(err)
-				}
-				t.Cleanup(cancelFunc)
-				channels = append(channels, ch)
-				cancels = append(cancels, cancelFunc)
-
-				go func(i int32) {
-					<-ch // always receive one message
-					received.Add(1)
-					// continue receiving messages as long as are not stopped
-					for i < int32(stop) {
-						<-ch
-						received.Add(1)
-					}
-					if tc.cancel {
-						cancelFunc() // stop explicitly to unsubscribe
-					}
-					stopped.Add(1)
-				}(int32(i))
-			}
-
-			// check that all channels receive a message
-			event, err := logical.NewEvent()
-			if err != nil {
-				t.Fatal(err)
-			}
-			err = bus.SendInternal(ctx, namespace.RootNamespace, nil, eventType, event)
-			if err != nil {
-				t.Error(err)
-			}
-			waitFor(t, 1*time.Second, func() bool { return received.Load() == int32(create) })
-			waitFor(t, 1*time.Second, func() bool { return stopped.Load() == int32(stop) })
-
-			// send another message, but half should stop receiving
-			event, err = logical.NewEvent()
-			if err != nil {
-				t.Fatal(err)
-			}
-			err = bus.SendInternal(ctx, namespace.RootNamespace, nil, eventType, event)
-			if err != nil {
-				t.Error(err)
-			}
-			waitFor(t, 1*time.Second, func() bool { return received.Load() == int32(create*2-stop) })
-			// the sends should time out and the subscriptions should drop when cancelFunc is called or the context cancels
-			waitFor(t, 1*time.Second, func() bool { return subscriptions.Load() == int64(create-stop) })
-		})
-	}
-}
-
-// waitFor waits for a condition to be true, up to the maximum timeout.
-// It waits with a capped exponential backoff starting at 1ms.
-// It is guaranteed to try f() at least once.
-func waitFor(t *testing.T, maxWait time.Duration, f func() bool) {
-	t.Helper()
-	start := time.Now()
-
-	if f() {
-		return
-	}
-	sleepAmount := 1 * time.Millisecond
-	for time.Now().Sub(start) <= maxWait {
-		left := time.Now().Sub(start)
-		sleepAmount = sleepAmount * 2
-		if sleepAmount > left {
-			sleepAmount = left
-		}
-		time.Sleep(sleepAmount)
-		if f() {
-			return
-		}
-	}
-	t.Error("Timeout waiting for condition")
-}
-
-// TestBusWildcardSubscriptions tests that a single subscription can receive
-// multiple event types using * for glob patterns.
-func TestBusWildcardSubscriptions(t *testing.T) {
-	bus, err := NewEventBus(nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	ctx := context.Background()
-
-	fooEventType := logical.EventType("kv/foo")
-	barEventType := logical.EventType("kv/bar")
-	bus.Start()
-
-	ch1, cancel1, err := bus.Subscribe(ctx, namespace.RootNamespace, "kv/*")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer cancel1()
-
-	ch2, cancel2, err := bus.Subscribe(ctx, namespace.RootNamespace, "*/bar")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer cancel2()
-
-	event1, err := logical.NewEvent()
-	if err != nil {
-		t.Fatal(err)
-	}
-	event2, err := logical.NewEvent()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = bus.SendInternal(ctx, namespace.RootNamespace, nil, barEventType, event2)
-	if err != nil {
-		t.Error(err)
-	}
-	err = bus.SendInternal(ctx, namespace.RootNamespace, nil, fooEventType, event1)
-	if err != nil {
-		t.Error(err)
-	}
-
-	timeout := time.After(1 * time.Second)
-	// Expect to receive both events on ch1, which subscribed to kv/*
-	var ch1Seen []string
-	for i := 0; i < 2; i++ {
-		select {
-		case message := <-ch1:
-			ch1Seen = append(ch1Seen, message.Payload.(*logical.EventReceived).Event.Id)
-		case <-timeout:
-			t.Error("Timeout waiting for event1")
-		}
-	}
-	if len(ch1Seen) != 2 {
-		t.Errorf("Expected 2 events but got: %v", ch1Seen)
-	} else {
-		if !strutil.StrListContains(ch1Seen, event1.Id) {
-			t.Errorf("Did not find %s event1 ID in ch1seen", event1.Id)
-		}
-		if !strutil.StrListContains(ch1Seen, event2.Id) {
-			t.Errorf("Did not find %s event2 ID in ch1seen", event2.Id)
-		}
-	}
-	// Expect to receive just kv/bar on ch2, which subscribed to */bar
-	select {
-	case message := <-ch2:
-		if message.Payload.(*logical.EventReceived).Event.Id != event2.Id {
-			t.Errorf("Got unexpected message: %v", message)
-		}
-	case <-timeout:
-		t.Error("Timeout waiting for event2")
-	}
-}
diff --git a/vault/events_test.go b/vault/events_test.go
deleted file mode 100644
index 986326f94bb2b..0000000000000
--- a/vault/events_test.go
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package vault
-
-import (
-	"testing"
-	"time"
-
-	"github.com/hashicorp/go-uuid"
-	"github.com/hashicorp/vault/helper/namespace"
-	"github.com/hashicorp/vault/sdk/logical"
-)
-
-func TestCanSendEventsFromBuiltinPlugin(t *testing.T) {
-	c, _, _ := TestCoreUnsealed(t)
-
-	ctx := namespace.RootContext(nil)
-
-	// subscribe to an event type
-	eventType, err := uuid.GenerateUUID()
-	if err != nil {
-		t.Fatal(err)
-	}
-	ch, cancel, err := c.events.Subscribe(ctx, namespace.RootNamespace, eventType)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer cancel()
-
-	// generate the event in a plugin
-	event, err := logical.NewEvent()
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = c.cubbyholeBackend.SendEvent(ctx, logical.EventType(eventType), event)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// check that the event is routed to the subscription
-	select {
-	case receivedEvent := <-ch:
-		received := receivedEvent.Payload.(*logical.EventReceived)
-		if event.Id != received.Event.Id {
-			t.Errorf("Got wrong event: %+v, expected %+v", received, event)
-		}
-		if received.PluginInfo == nil {
-			t.Error("Expected plugin info but got nil")
-		} else {
-			if received.PluginInfo.Plugin != "cubbyhole" {
-				t.Errorf("Expected cubbyhole plugin but got %s", received.PluginInfo.Plugin)
-			}
-		}
-
-	case <-time.After(1 * time.Second):
-		t.Error("timeout waiting for event")
-	}
-}
diff --git a/vault/expiration.go b/vault/expiration.go
index 59f7738951a37..1232274859186 100644
--- a/vault/expiration.go
+++ b/vault/expiration.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -24,7 +21,6 @@ import (
 	multierror "github.com/hashicorp/go-multierror"
 	"github.com/hashicorp/go-secure-stdlib/base62"
 	"github.com/hashicorp/vault/helper/fairshare"
-	"github.com/hashicorp/vault/helper/locking"
 	"github.com/hashicorp/vault/helper/metricsutil"
 	"github.com/hashicorp/vault/helper/namespace"
 	"github.com/hashicorp/vault/sdk/framework"
@@ -114,7 +110,7 @@ type ExpirationManager struct {
 	pending     sync.Map
 	nonexpiring sync.Map
 	leaseCount  int
-	pendingLock locking.DeadlockRWMutex
+	pendingLock sync.RWMutex
 
 	// A sync.Lock for every active leaseID
 	lockPerLease sync.Map
@@ -142,7 +138,7 @@ type ExpirationManager struct {
 	quitCh             chan struct{}
 
 	// do not hold coreStateLock in any API handler code - it is already held
-	coreStateLock     locking.RWMutex
+	coreStateLock     *DeadlockRWMutex
 	quitContext       context.Context
 	leaseCheckCounter *uint32
 
@@ -353,7 +349,7 @@ func NewExpirationManager(c *Core, view *BarrierView, e ExpireLeaseStrategy, log
 		restoreLocks: locksutil.CreateLocks(),
 		quitCh:       make(chan struct{}),
 
-		coreStateLock:     c.stateLock,
+		coreStateLock:     &c.stateLock,
 		quitContext:       c.activeContext,
 		leaseCheckCounter: new(uint32),
 
diff --git a/vault/expiration_integ_test.go b/vault/expiration_integ_test.go
index 96d8dd30f646b..2e2d54fcc9003 100644
--- a/vault/expiration_integ_test.go
+++ b/vault/expiration_integ_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault_test
 
 import (
@@ -9,12 +6,27 @@ import (
 	"time"
 
 	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/helper/testhelpers/minimal"
+	"github.com/hashicorp/vault/builtin/credential/approle"
+	vaulthttp "github.com/hashicorp/vault/http"
+	"github.com/hashicorp/vault/sdk/logical"
+	"github.com/hashicorp/vault/vault"
 )
 
 func TestExpiration_RenewToken_TestCluster(t *testing.T) {
-	t.Parallel()
-	cluster := minimal.NewTestSoloCluster(t, nil)
+	// Use a TestCluster and the approle backend to test renewal
+	coreConfig := &vault.CoreConfig{
+		CredentialBackends: map[string]logical.Factory{
+			"approle": approle.Factory,
+		},
+	}
+	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+	})
+	cluster.Start()
+	defer cluster.Cleanup()
+
+	core := cluster.Cores[0].Core
+	vault.TestWaitActive(t, core)
 	client := cluster.Cores[0].Client
 
 	// Mount the auth backend
diff --git a/vault/expiration_test.go b/vault/expiration_test.go
index eda7e9ccc7b94..32276749fafe6 100644
--- a/vault/expiration_test.go
+++ b/vault/expiration_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/expiration_testing_util_common.go b/vault/expiration_testing_util_common.go
index 4ef0a743ddec7..7bd47e71da969 100644
--- a/vault/expiration_testing_util_common.go
+++ b/vault/expiration_testing_util_common.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/expiration_util.go b/vault/expiration_util.go
index c97a43697122d..2170c5c82eb70 100644
--- a/vault/expiration_util.go
+++ b/vault/expiration_util.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !enterprise
 
 package vault
diff --git a/vault/external_plugin_test.go b/vault/external_plugin_test.go
index 756d99ac84d68..a500fa83de57f 100644
--- a/vault/external_plugin_test.go
+++ b/vault/external_plugin_test.go
@@ -1,46 +1,56 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
 	"context"
+	"crypto/sha256"
 	"encoding/hex"
 	"errors"
 	"fmt"
 	"os"
+	"os/exec"
 	"path"
 	"path/filepath"
 	"strings"
+	"sync"
 	"testing"
 
-	log "github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/vault/helper/namespace"
-	"github.com/hashicorp/vault/helper/testhelpers/corehelpers"
-	"github.com/hashicorp/vault/helper/testhelpers/pluginhelpers"
 	"github.com/hashicorp/vault/sdk/framework"
 	"github.com/hashicorp/vault/sdk/helper/consts"
 	"github.com/hashicorp/vault/sdk/helper/pluginutil"
 	"github.com/hashicorp/vault/sdk/logical"
 	"github.com/hashicorp/vault/sdk/plugin"
 	"github.com/hashicorp/vault/sdk/plugin/mock"
-	"github.com/hashicorp/vault/version"
+	"github.com/hashicorp/vault/sdk/version"
 )
 
 const vaultTestingMockPluginEnv = "VAULT_TESTING_MOCK_PLUGIN"
 
+var (
+	pluginCacheLock sync.Mutex
+	pluginCache     = map[string][]byte{}
+)
+
+type testPlugin struct {
+	name     string
+	typ      consts.PluginType
+	version  string
+	fileName string
+	sha256   string
+}
+
 // version is used to override the plugin's self-reported version
-func testCoreWithPlugins(t *testing.T, typ consts.PluginType, versions ...string) (*Core, []pluginhelpers.TestPlugin) {
+func testCoreWithPlugins(t *testing.T, typ consts.PluginType, versions ...string) (*Core, []testPlugin) {
 	t.Helper()
-	pluginDir, cleanup := corehelpers.MakeTestPluginDir(t)
+	pluginDir, cleanup := MakeTestPluginDir(t)
 	t.Cleanup(func() { cleanup(t) })
 
-	var plugins []pluginhelpers.TestPlugin
+	var plugins []testPlugin
 	for _, version := range versions {
-		plugins = append(plugins, pluginhelpers.CompilePlugin(t, typ, version, pluginDir))
+		plugins = append(plugins, compilePlugin(t, typ, version, pluginDir))
 	}
 	conf := &CoreConfig{
-		BuiltinRegistry: corehelpers.NewMockBuiltinRegistry(),
+		BuiltinRegistry: NewMockBuiltinRegistry(),
 		PluginDirectory: pluginDir,
 	}
 	core := TestCoreWithSealAndUI(t, conf)
@@ -48,6 +58,109 @@ func testCoreWithPlugins(t *testing.T, typ consts.PluginType, versions ...string
 	return core, plugins
 }
 
+func getPlugin(t *testing.T, typ consts.PluginType) (string, string, string, string) {
+	t.Helper()
+	var pluginName string
+	var pluginType string
+	var pluginMain string
+	var pluginVersionLocation string
+
+	switch typ {
+	case consts.PluginTypeCredential:
+		pluginType = "approle"
+		pluginName = "vault-plugin-auth-" + pluginType
+		pluginMain = filepath.Join("builtin", "credential", pluginType, "cmd", pluginType, "main.go")
+		pluginVersionLocation = fmt.Sprintf("github.com/hashicorp/vault/builtin/credential/%s.ReportedVersion", pluginType)
+	case consts.PluginTypeSecrets:
+		pluginType = "consul"
+		pluginName = "vault-plugin-secrets-" + pluginType
+		pluginMain = filepath.Join("builtin", "logical", pluginType, "cmd", pluginType, "main.go")
+		pluginVersionLocation = fmt.Sprintf("github.com/hashicorp/vault/builtin/logical/%s.ReportedVersion", pluginType)
+	case consts.PluginTypeDatabase:
+		pluginType = "postgresql"
+		pluginName = "vault-plugin-database-" + pluginType
+		pluginMain = filepath.Join("plugins", "database", pluginType, fmt.Sprintf("%s-database-plugin", pluginType), "main.go")
+		pluginVersionLocation = fmt.Sprintf("github.com/hashicorp/vault/plugins/database/%s.ReportedVersion", pluginType)
+	default:
+		t.Fatal(typ.String())
+	}
+	return pluginName, pluginType, pluginMain, pluginVersionLocation
+}
+
+// to mount a plugin, we need a working binary plugin, so we compile one here.
+// pluginVersion is used to override the plugin's self-reported version
+func compilePlugin(t *testing.T, typ consts.PluginType, pluginVersion string, pluginDir string) testPlugin {
+	t.Helper()
+
+	pluginName, pluginType, pluginMain, pluginVersionLocation := getPlugin(t, typ)
+
+	pluginCacheLock.Lock()
+	defer pluginCacheLock.Unlock()
+
+	var pluginBytes []byte
+
+	dir := ""
+	// detect if we are in the "vault/" or the root directory and compensate
+	if _, err := os.Stat("builtin"); os.IsNotExist(err) {
+		wd, err := os.Getwd()
+		if err != nil {
+			t.Fatal(err)
+		}
+		dir = filepath.Dir(wd)
+	}
+
+	pluginPath := path.Join(pluginDir, pluginName)
+	if pluginVersion != "" {
+		pluginPath += "-" + pluginVersion
+	}
+
+	key := fmt.Sprintf("%s %s %s", pluginName, pluginType, pluginVersion)
+	// cache the compilation to only run once
+	var ok bool
+	pluginBytes, ok = pluginCache[key]
+	if !ok {
+		// we need to compile
+		line := []string{"build"}
+		if pluginVersion != "" {
+			line = append(line, "-ldflags", fmt.Sprintf("-X %s=%s", pluginVersionLocation, pluginVersion))
+		}
+		line = append(line, "-o", pluginPath, pluginMain)
+		cmd := exec.Command("go", line...)
+		cmd.Dir = dir
+		output, err := cmd.CombinedOutput()
+		if err != nil {
+			t.Fatal(fmt.Errorf("error running go build %v output: %s", err, output))
+		}
+		pluginCache[key], err = os.ReadFile(pluginPath)
+		if err != nil {
+			t.Fatal(err)
+		}
+		pluginBytes = pluginCache[key]
+	}
+
+	// write the cached plugin if necessary
+	var err error
+	if _, err := os.Stat(pluginPath); os.IsNotExist(err) {
+		err = os.WriteFile(pluginPath, pluginBytes, 0o755)
+	}
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	sha := sha256.New()
+	_, err = sha.Write(pluginBytes)
+	if err != nil {
+		t.Fatal(err)
+	}
+	return testPlugin{
+		name:     pluginName,
+		typ:      typ,
+		version:  pluginVersion,
+		fileName: path.Base(pluginPath),
+		sha256:   fmt.Sprintf("%x", sha.Sum(nil)),
+	}
+}
+
 func TestCore_EnableExternalPlugin(t *testing.T) {
 	for name, tc := range map[string]struct {
 		pluginType    consts.PluginType
@@ -66,31 +179,10 @@ func TestCore_EnableExternalPlugin(t *testing.T) {
 		},
 	} {
 		t.Run(name, func(t *testing.T) {
-			coreConfig := &CoreConfig{
-				DisableMlock:       true,
-				DisableCache:       true,
-				Logger:             log.NewNullLogger(),
-				CredentialBackends: map[string]logical.Factory{},
-			}
-
-			cluster := NewTestCluster(t, coreConfig, &TestClusterOptions{
-				Plugins: &TestPluginConfig{
-					Typ:      tc.pluginType,
-					Versions: []string{""},
-				},
-			})
-
-			cluster.Start()
-			defer cluster.Cleanup()
-
-			c := cluster.Cores[0].Core
-			TestWaitActive(t, c)
-
-			plugins := cluster.Plugins
-
-			registerPlugin(t, c.systemBackend, plugins[0].Name, tc.pluginType.String(), "1.0.0", plugins[0].Sha256, plugins[0].FileName)
+			c, plugins := testCoreWithPlugins(t, tc.pluginType, "")
+			registerPlugin(t, c.systemBackend, plugins[0].name, tc.pluginType.String(), "1.0.0", plugins[0].sha256, plugins[0].fileName)
 
-			mountPlugin(t, c.systemBackend, plugins[0].Name, tc.pluginType, "v1.0.0", "")
+			mountPlugin(t, c.systemBackend, plugins[0].name, tc.pluginType, "v1.0.0", "")
 
 			match := c.router.MatchingMount(namespace.RootContext(nil), tc.routerPath)
 			if match != tc.expectedMatch {
@@ -161,10 +253,10 @@ func TestCore_EnableExternalPlugin_MultipleVersions(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			c, plugins := testCoreWithPlugins(t, tc.pluginType, "")
 			for _, version := range tc.registerVersions {
-				registerPlugin(t, c.systemBackend, plugins[0].Name, tc.pluginType.String(), version, plugins[0].Sha256, plugins[0].FileName)
+				registerPlugin(t, c.systemBackend, plugins[0].name, tc.pluginType.String(), version, plugins[0].sha256, plugins[0].fileName)
 			}
 
-			mountPlugin(t, c.systemBackend, plugins[0].Name, tc.pluginType, tc.mountVersion, "")
+			mountPlugin(t, c.systemBackend, plugins[0].name, tc.pluginType, tc.mountVersion, "")
 
 			match := c.router.MatchingMount(namespace.RootContext(nil), tc.routerPath)
 			if match != tc.expectedMatch {
@@ -188,18 +280,18 @@ func TestCore_EnableExternalPlugin_MultipleVersions(t *testing.T) {
 }
 
 func TestCore_EnableExternalPlugin_Deregister_SealUnseal(t *testing.T) {
-	pluginDir, cleanup := corehelpers.MakeTestPluginDir(t)
+	pluginDir, cleanup := MakeTestPluginDir(t)
 	t.Cleanup(func() { cleanup(t) })
 
 	// create an external plugin to shadow the builtin "pending-removal-test-plugin"
 	pluginName := "therug"
-	plugin := pluginhelpers.CompilePlugin(t, consts.PluginTypeCredential, "", pluginDir)
-	err := os.Link(path.Join(pluginDir, plugin.FileName), path.Join(pluginDir, pluginName))
+	plugin := compilePlugin(t, consts.PluginTypeCredential, "", pluginDir)
+	err := os.Link(path.Join(pluginDir, plugin.fileName), path.Join(pluginDir, pluginName))
 	if err != nil {
 		t.Fatal(err)
 	}
 	conf := &CoreConfig{
-		BuiltinRegistry: corehelpers.NewMockBuiltinRegistry(),
+		BuiltinRegistry: NewMockBuiltinRegistry(),
 		PluginDirectory: pluginDir,
 	}
 
@@ -207,7 +299,7 @@ func TestCore_EnableExternalPlugin_Deregister_SealUnseal(t *testing.T) {
 	c, keys, root := testCoreUnsealed(t, c)
 
 	// Register a plugin
-	registerPlugin(t, c.systemBackend, pluginName, consts.PluginTypeCredential.String(), "", plugin.Sha256, plugin.FileName)
+	registerPlugin(t, c.systemBackend, pluginName, consts.PluginTypeCredential.String(), "", plugin.sha256, plugin.fileName)
 	mountPlugin(t, c.systemBackend, pluginName, consts.PluginTypeCredential, "", "")
 	plugct := len(c.pluginCatalog.externalPlugins)
 	if plugct != 1 {
@@ -260,29 +352,29 @@ func TestCore_EnableExternalPlugin_Deregister_SealUnseal(t *testing.T) {
 // version store is cleared.  Vault sees the next unseal as a major upgrade and
 // should immediately shut down.
 func TestCore_Unseal_isMajorVersionFirstMount_PendingRemoval_Plugin(t *testing.T) {
-	pluginDir, cleanup := corehelpers.MakeTestPluginDir(t)
+	pluginDir, cleanup := MakeTestPluginDir(t)
 	t.Cleanup(func() { cleanup(t) })
 
 	// create an external plugin to shadow the builtin "pending-removal-test-plugin"
 	pluginName := "pending-removal-test-plugin"
-	plugin := pluginhelpers.CompilePlugin(t, consts.PluginTypeCredential, "", pluginDir)
-	err := os.Link(path.Join(pluginDir, plugin.FileName), path.Join(pluginDir, pluginName))
+	plugin := compilePlugin(t, consts.PluginTypeCredential, "", pluginDir)
+	err := os.Link(path.Join(pluginDir, plugin.fileName), path.Join(pluginDir, pluginName))
 	if err != nil {
 		t.Fatal(err)
 	}
 	conf := &CoreConfig{
-		BuiltinRegistry: corehelpers.NewMockBuiltinRegistry(),
+		BuiltinRegistry: NewMockBuiltinRegistry(),
 		PluginDirectory: pluginDir,
 	}
 	c := TestCoreWithSealAndUI(t, conf)
 	c, keys, root := testCoreUnsealed(t, c)
 
 	// Register a shadow plugin
-	registerPlugin(t, c.systemBackend, pluginName, consts.PluginTypeCredential.String(), "", plugin.Sha256, plugin.FileName)
+	registerPlugin(t, c.systemBackend, pluginName, consts.PluginTypeCredential.String(), "", plugin.sha256, plugin.fileName)
 	mountPlugin(t, c.systemBackend, pluginName, consts.PluginTypeCredential, "", "")
 
 	// Deregister shadow plugin
-	deregisterPlugin(t, c.systemBackend, pluginName, consts.PluginTypeCredential.String(), "", plugin.Sha256, plugin.FileName)
+	deregisterPlugin(t, c.systemBackend, pluginName, consts.PluginTypeCredential.String(), "", plugin.sha256, plugin.fileName)
 
 	// Make sure this isn't the first mount for the current major version.
 	if c.isMajorVersionFirstMount(context.Background()) {
@@ -339,18 +431,18 @@ func TestCore_Unseal_isMajorVersionFirstMount_PendingRemoval_Plugin(t *testing.T
 }
 
 func TestCore_EnableExternalPlugin_PendingRemoval(t *testing.T) {
-	pluginDir, cleanup := corehelpers.MakeTestPluginDir(t)
+	pluginDir, cleanup := MakeTestPluginDir(t)
 	t.Cleanup(func() { cleanup(t) })
 
 	// create an external plugin to shadow the builtin "pending-removal-test-plugin"
 	pluginName := "pending-removal-test-plugin"
-	plugin := pluginhelpers.CompilePlugin(t, consts.PluginTypeCredential, "v1.2.3", pluginDir)
-	err := os.Link(path.Join(pluginDir, plugin.FileName), path.Join(pluginDir, pluginName))
+	plugin := compilePlugin(t, consts.PluginTypeCredential, "v1.2.3", pluginDir)
+	err := os.Link(path.Join(pluginDir, plugin.fileName), path.Join(pluginDir, pluginName))
 	if err != nil {
 		t.Fatal(err)
 	}
 	conf := &CoreConfig{
-		BuiltinRegistry: corehelpers.NewMockBuiltinRegistry(),
+		BuiltinRegistry: NewMockBuiltinRegistry(),
 		PluginDirectory: pluginDir,
 	}
 
@@ -369,23 +461,23 @@ func TestCore_EnableExternalPlugin_PendingRemoval(t *testing.T) {
 	}
 
 	// Register a shadow plugin
-	registerPlugin(t, c.systemBackend, pluginName, consts.PluginTypeCredential.String(), "v1.2.3", plugin.Sha256, plugin.FileName)
+	registerPlugin(t, c.systemBackend, pluginName, consts.PluginTypeCredential.String(), "v1.2.3", plugin.sha256, plugin.fileName)
 	mountPlugin(t, c.systemBackend, pluginName, consts.PluginTypeCredential, "", "")
 }
 
 func TestCore_EnableExternalPlugin_ShadowBuiltin(t *testing.T) {
-	pluginDir, cleanup := corehelpers.MakeTestPluginDir(t)
+	pluginDir, cleanup := MakeTestPluginDir(t)
 	t.Cleanup(func() { cleanup(t) })
 
 	// create an external plugin to shadow the builtin "approle"
-	plugin := pluginhelpers.CompilePlugin(t, consts.PluginTypeCredential, "v1.2.3", pluginDir)
-	err := os.Link(path.Join(pluginDir, plugin.FileName), path.Join(pluginDir, "approle"))
+	plugin := compilePlugin(t, consts.PluginTypeCredential, "v1.2.3", pluginDir)
+	err := os.Link(path.Join(pluginDir, plugin.fileName), path.Join(pluginDir, "approle"))
 	if err != nil {
 		t.Fatal(err)
 	}
 	pluginName := "approle"
 	conf := &CoreConfig{
-		BuiltinRegistry: corehelpers.NewMockBuiltinRegistry(),
+		BuiltinRegistry: NewMockBuiltinRegistry(),
 		PluginDirectory: pluginDir,
 	}
 	c := TestCoreWithSealAndUI(t, conf)
@@ -418,7 +510,7 @@ func TestCore_EnableExternalPlugin_ShadowBuiltin(t *testing.T) {
 	}
 
 	// Register a shadow plugin
-	registerPlugin(t, c.systemBackend, pluginName, consts.PluginTypeCredential.String(), "v1.2.3", plugin.Sha256, plugin.FileName)
+	registerPlugin(t, c.systemBackend, pluginName, consts.PluginTypeCredential.String(), "v1.2.3", plugin.sha256, plugin.fileName)
 
 	// Verify auth table hasn't changed
 	if err := verifyAuthListDeprecationStatus(pluginName, true); err != nil {
@@ -435,7 +527,7 @@ func TestCore_EnableExternalPlugin_ShadowBuiltin(t *testing.T) {
 	}
 
 	// Deregister shadow plugin
-	deregisterPlugin(t, c.systemBackend, pluginName, consts.PluginTypeSecrets.String(), "v1.2.3", plugin.Sha256, plugin.FileName)
+	deregisterPlugin(t, c.systemBackend, pluginName, consts.PluginTypeSecrets.String(), "v1.2.3", plugin.sha256, plugin.fileName)
 
 	// Verify auth table hasn't changed
 	if err := verifyAuthListDeprecationStatus(pluginName, false); err != nil {
@@ -453,24 +545,24 @@ func TestCore_EnableExternalPlugin_ShadowBuiltin(t *testing.T) {
 }
 
 func TestCore_EnableExternalKv_MultipleVersions(t *testing.T) {
-	pluginDir, cleanup := corehelpers.MakeTestPluginDir(t)
+	pluginDir, cleanup := MakeTestPluginDir(t)
 	t.Cleanup(func() { cleanup(t) })
 
 	// new kv plugin can be registered but not mounted
-	plugin := pluginhelpers.CompilePlugin(t, consts.PluginTypeSecrets, "v1.2.3", pluginDir)
-	err := os.Link(path.Join(pluginDir, plugin.FileName), path.Join(pluginDir, "kv"))
+	plugin := compilePlugin(t, consts.PluginTypeSecrets, "v1.2.3", pluginDir)
+	err := os.Link(path.Join(pluginDir, plugin.fileName), path.Join(pluginDir, "kv"))
 	if err != nil {
 		t.Fatal(err)
 	}
 	pluginName := "kv"
 	conf := &CoreConfig{
-		BuiltinRegistry: corehelpers.NewMockBuiltinRegistry(),
+		BuiltinRegistry: NewMockBuiltinRegistry(),
 		PluginDirectory: pluginDir,
 	}
 	c := TestCoreWithSealAndUI(t, conf)
 	c, _, _ = testCoreUnsealed(t, c)
 
-	registerPlugin(t, c.systemBackend, pluginName, consts.PluginTypeSecrets.String(), "v1.2.3", plugin.Sha256, plugin.FileName)
+	registerPlugin(t, c.systemBackend, pluginName, consts.PluginTypeSecrets.String(), "v1.2.3", plugin.sha256, plugin.fileName)
 	req := logical.TestRequest(t, logical.ReadOperation, "plugins/catalog")
 	resp, err := c.systemBackend.HandleRequest(namespace.RootContext(nil), req)
 	if err != nil {
@@ -506,24 +598,24 @@ func TestCore_EnableExternalKv_MultipleVersions(t *testing.T) {
 }
 
 func TestCore_EnableExternalNoop_MultipleVersions(t *testing.T) {
-	pluginDir, cleanup := corehelpers.MakeTestPluginDir(t)
+	pluginDir, cleanup := MakeTestPluginDir(t)
 	t.Cleanup(func() { cleanup(t) })
 
 	// new noop plugin can be registered but not mounted
-	plugin := pluginhelpers.CompilePlugin(t, consts.PluginTypeCredential, "v1.2.3", pluginDir)
-	err := os.Link(path.Join(pluginDir, plugin.FileName), path.Join(pluginDir, "noop"))
+	plugin := compilePlugin(t, consts.PluginTypeCredential, "v1.2.3", pluginDir)
+	err := os.Link(path.Join(pluginDir, plugin.fileName), path.Join(pluginDir, "noop"))
 	if err != nil {
 		t.Fatal(err)
 	}
 	pluginName := "noop"
 	conf := &CoreConfig{
-		BuiltinRegistry: corehelpers.NewMockBuiltinRegistry(),
+		BuiltinRegistry: NewMockBuiltinRegistry(),
 		PluginDirectory: pluginDir,
 	}
 	c := TestCoreWithSealAndUI(t, conf)
 	c, _, _ = testCoreUnsealed(t, c)
 
-	registerPlugin(t, c.systemBackend, pluginName, consts.PluginTypeCredential.String(), "v1.2.3", plugin.Sha256, plugin.FileName)
+	registerPlugin(t, c.systemBackend, pluginName, consts.PluginTypeCredential.String(), "v1.2.3", plugin.sha256, plugin.fileName)
 	req := logical.TestRequest(t, logical.ReadOperation, "plugins/catalog")
 	resp, err := c.systemBackend.HandleRequest(namespace.RootContext(nil), req)
 	if err != nil {
@@ -581,10 +673,10 @@ func TestCore_EnableExternalPlugin_NoVersionsOkay(t *testing.T) {
 			// version specified should mount the unversioned plugin even if there
 			// are versioned plugins available.
 			for _, version := range []string{"", "v1.0.0"} {
-				registerPlugin(t, c.systemBackend, plugins[0].Name, tc.pluginType.String(), version, plugins[0].Sha256, plugins[0].FileName)
+				registerPlugin(t, c.systemBackend, plugins[0].name, tc.pluginType.String(), version, plugins[0].sha256, plugins[0].fileName)
 			}
 
-			mountPlugin(t, c.systemBackend, plugins[0].Name, tc.pluginType, "", "")
+			mountPlugin(t, c.systemBackend, plugins[0].name, tc.pluginType, "", "")
 
 			match := c.router.MatchingMount(namespace.RootContext(nil), tc.routerPath)
 			if match != tc.expectedMatch {
@@ -618,11 +710,11 @@ func TestCore_EnableExternalCredentialPlugin_NoVersionOnRegister(t *testing.T) {
 	} {
 		t.Run(name, func(t *testing.T) {
 			c, plugins := testCoreWithPlugins(t, tc.pluginType, "")
-			registerPlugin(t, c.systemBackend, plugins[0].Name, tc.pluginType.String(), "", plugins[0].Sha256, plugins[0].FileName)
+			registerPlugin(t, c.systemBackend, plugins[0].name, tc.pluginType.String(), "", plugins[0].sha256, plugins[0].fileName)
 
 			req := logical.TestRequest(t, logical.UpdateOperation, mountTable(tc.pluginType))
 			req.Data = map[string]interface{}{
-				"type": plugins[0].Name,
+				"type": plugins[0].name,
 				"config": map[string]interface{}{
 					"plugin_version": "v1.0.0",
 				},
@@ -650,10 +742,10 @@ func TestCore_EnableExternalCredentialPlugin_InvalidName(t *testing.T) {
 			c, plugins := testCoreWithPlugins(t, tc.pluginType, "")
 			d := &framework.FieldData{
 				Raw: map[string]interface{}{
-					"name":    plugins[0].Name,
-					"sha256":  plugins[0].Sha256,
+					"name":    plugins[0].name,
+					"sha256":  plugins[0].sha256,
 					"version": "v1.0.0",
-					"command": plugins[0].Name + "xyz",
+					"command": plugins[0].name + "xyz",
 				},
 				Schema: c.systemBackend.pluginsCatalogCRUDPath().Fields,
 			}
@@ -685,12 +777,12 @@ func TestExternalPlugin_getBackendTypeVersion(t *testing.T) {
 	} {
 		t.Run(name, func(t *testing.T) {
 			c, plugins := testCoreWithPlugins(t, tc.pluginType, tc.setRunningVersion)
-			registerPlugin(t, c.systemBackend, plugins[0].Name, tc.pluginType.String(), tc.setRunningVersion, plugins[0].Sha256, plugins[0].FileName)
+			registerPlugin(t, c.systemBackend, plugins[0].name, tc.pluginType.String(), tc.setRunningVersion, plugins[0].sha256, plugins[0].fileName)
 
-			shaBytes, _ := hex.DecodeString(plugins[0].Sha256)
-			commandFull := filepath.Join(c.pluginCatalog.directory, plugins[0].FileName)
+			shaBytes, _ := hex.DecodeString(plugins[0].sha256)
+			commandFull := filepath.Join(c.pluginCatalog.directory, plugins[0].fileName)
 			entry := &pluginutil.PluginRunner{
-				Name:    plugins[0].Name,
+				Name:    plugins[0].name,
 				Command: commandFull,
 				Args:    nil,
 				Sha256:  shaBytes,
@@ -750,13 +842,13 @@ func TestExternalPlugin_CheckFilePermissions(t *testing.T) {
 	} {
 		t.Run(name, func(t *testing.T) {
 			c, plugins := testCoreWithPlugins(t, tc.pluginType, tc.pluginVersion)
-			registeredPluginName := fmt.Sprintf(tc.pluginNameFmt, plugins[0].Name)
+			registeredPluginName := fmt.Sprintf(tc.pluginNameFmt, plugins[0].name)
 
 			// Permissions will be checked once during registration.
 			req := logical.TestRequest(t, logical.UpdateOperation, fmt.Sprintf("plugins/catalog/%s/%s", tc.pluginType.String(), registeredPluginName))
 			req.Data = map[string]interface{}{
-				"command": plugins[0].FileName,
-				"sha256":  plugins[0].Sha256,
+				"command": plugins[0].fileName,
+				"sha256":  plugins[0].sha256,
 				"version": tc.pluginVersion,
 			}
 			resp, err := c.systemBackend.HandleRequest(namespace.RootContext(nil), req)
diff --git a/vault/external_tests/api/api_integration_test.go b/vault/external_tests/api/api_integration_test.go
index 4aaba28092c61..f0760fc74fe5a 100644
--- a/vault/external_tests/api/api_integration_test.go
+++ b/vault/external_tests/api/api_integration_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/vault/external_tests/api/feature_flag_ext_test.go b/vault/external_tests/api/feature_flag_ext_test.go
index d7ff8e0570862..8b72b1e6ee4f2 100644
--- a/vault/external_tests/api/feature_flag_ext_test.go
+++ b/vault/external_tests/api/feature_flag_ext_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
@@ -12,15 +9,13 @@ import (
 
 	"github.com/hashicorp/go-cleanhttp"
 	vaulthttp "github.com/hashicorp/vault/http"
-	"github.com/hashicorp/vault/sdk/helper/testhelpers/schema"
 	"github.com/hashicorp/vault/vault"
 	"golang.org/x/net/http2"
 )
 
 func TestFeatureFlags(t *testing.T) {
 	cluster := vault.NewTestCluster(t, nil, &vault.TestClusterOptions{
-		HandlerFunc:             vaulthttp.Handler,
-		RequestResponseCallback: schema.ResponseValidatingCallback(t),
+		HandlerFunc: vaulthttp.Handler,
 	})
 	cluster.Start()
 	defer cluster.Cleanup()
@@ -33,7 +28,7 @@ func TestFeatureFlags(t *testing.T) {
 	// Create a raw http connection copying the configuration
 	// created by NewTestCluster
 	transport := cleanhttp.DefaultPooledTransport()
-	transport.TLSClientConfig = cluster.Cores[0].TLSConfig()
+	transport.TLSClientConfig = cluster.Cores[0].TLSConfig.Clone()
 	if err := http2.ConfigureTransport(transport); err != nil {
 		t.Fatal(err)
 	}
diff --git a/vault/external_tests/api/kv_helpers_test.go b/vault/external_tests/api/kv_helpers_test.go
index fdc465e8f1747..f005a35d97ad2 100644
--- a/vault/external_tests/api/kv_helpers_test.go
+++ b/vault/external_tests/api/kv_helpers_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/vault/external_tests/api/renewer_integration_test.go b/vault/external_tests/api/renewer_integration_test.go
index eb9e8f0732350..6413eb18e087d 100644
--- a/vault/external_tests/api/renewer_integration_test.go
+++ b/vault/external_tests/api/renewer_integration_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/vault/external_tests/api/secret_test.go b/vault/external_tests/api/secret_test.go
index a75e78d79433d..c904c0a59932b 100644
--- a/vault/external_tests/api/secret_test.go
+++ b/vault/external_tests/api/secret_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/vault/external_tests/api/sudo_paths_test.go b/vault/external_tests/api/sudo_paths_test.go
index 0ca470f1d87c5..3aa32449919ea 100644
--- a/vault/external_tests/api/sudo_paths_test.go
+++ b/vault/external_tests/api/sudo_paths_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
@@ -28,11 +25,10 @@ func TestSudoPaths(t *testing.T) {
 	t.Parallel()
 
 	coreConfig := &vault.CoreConfig{
-		DisableMlock:        true,
-		DisableCache:        true,
-		EnableRaw:           true,
-		EnableIntrospection: true,
-		Logger:              log.NewNullLogger(),
+		DisableMlock: true,
+		DisableCache: true,
+		EnableRaw:    true,
+		Logger:       log.NewNullLogger(),
 		CredentialBackends: map[string]logical.Factory{
 			"userpass": credUserpass.Factory,
 		},
diff --git a/vault/external_tests/api/sys_rekey_ext_test.go b/vault/external_tests/api/sys_rekey_ext_test.go
index 5ab1281662554..8f60eab9b0c17 100644
--- a/vault/external_tests/api/sys_rekey_ext_test.go
+++ b/vault/external_tests/api/sys_rekey_ext_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/vault/external_tests/approle/wrapped_secretid_test.go b/vault/external_tests/approle/wrapped_secretid_test.go
index bd9f8ef15e1e4..6a90d5c7b1020 100644
--- a/vault/external_tests/approle/wrapped_secretid_test.go
+++ b/vault/external_tests/approle/wrapped_secretid_test.go
@@ -1,22 +1,43 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package approle
 
 import (
 	"testing"
 
+	log "github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/helper/testhelpers/minimal"
+	credAppRole "github.com/hashicorp/vault/builtin/credential/approle"
+	vaulthttp "github.com/hashicorp/vault/http"
+	"github.com/hashicorp/vault/sdk/logical"
+	"github.com/hashicorp/vault/vault"
 	"github.com/stretchr/testify/require"
 )
 
 func TestApproleSecretId_Wrapped(t *testing.T) {
-	t.Parallel()
-	cluster := minimal.NewTestSoloCluster(t, nil)
-	client := cluster.Cores[0].Client
+	var err error
+	coreConfig := &vault.CoreConfig{
+		DisableMlock: true,
+		DisableCache: true,
+		Logger:       log.NewNullLogger(),
+		CredentialBackends: map[string]logical.Factory{
+			"approle": credAppRole.Factory,
+		},
+	}
+
+	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+	})
+
+	cluster.Start()
+	defer cluster.Cleanup()
+
+	cores := cluster.Cores
+
+	vault.TestWaitActive(t, cores[0].Core)
+
+	client := cores[0].Client
+	client.SetToken(cluster.RootToken)
 
-	err := client.Sys().EnableAuthWithOptions("approle", &api.EnableAuthOptions{
+	err = client.Sys().EnableAuthWithOptions("approle", &api.EnableAuthOptions{
 		Type: "approle",
 	})
 	if err != nil {
@@ -52,11 +73,31 @@ func TestApproleSecretId_Wrapped(t *testing.T) {
 }
 
 func TestApproleSecretId_NotWrapped(t *testing.T) {
-	t.Parallel()
-	cluster := minimal.NewTestSoloCluster(t, nil)
-	client := cluster.Cores[0].Client
+	var err error
+	coreConfig := &vault.CoreConfig{
+		DisableMlock: true,
+		DisableCache: true,
+		Logger:       log.NewNullLogger(),
+		CredentialBackends: map[string]logical.Factory{
+			"approle": credAppRole.Factory,
+		},
+	}
+
+	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+	})
+
+	cluster.Start()
+	defer cluster.Cleanup()
+
+	cores := cluster.Cores
+
+	vault.TestWaitActive(t, cores[0].Core)
+
+	client := cores[0].Client
+	client.SetToken(cluster.RootToken)
 
-	err := client.Sys().EnableAuthWithOptions("approle", &api.EnableAuthOptions{
+	err = client.Sys().EnableAuthWithOptions("approle", &api.EnableAuthOptions{
 		Type: "approle",
 	})
 	if err != nil {
diff --git a/vault/external_tests/expiration/expiration_test.go b/vault/external_tests/expiration/expiration_test.go
index c77b84c01b83e..122e11f18ae0e 100644
--- a/vault/external_tests/expiration/expiration_test.go
+++ b/vault/external_tests/expiration/expiration_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package expiration
 
 import (
@@ -9,13 +6,18 @@ import (
 	"testing"
 
 	"github.com/hashicorp/vault/helper/namespace"
-	"github.com/hashicorp/vault/helper/testhelpers/minimal"
+	vaulthttp "github.com/hashicorp/vault/http"
 	"github.com/hashicorp/vault/vault"
 )
 
 func TestExpiration_irrevocableLeaseCountsAPI(t *testing.T) {
-	t.Parallel()
-	cluster := minimal.NewTestSoloCluster(t, nil)
+	cluster := vault.NewTestCluster(t, nil, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+		NumCores:    1,
+	})
+	cluster.Start()
+	defer cluster.Cleanup()
+
 	client := cluster.Cores[0].Client
 	core := cluster.Cores[0].Core
 
@@ -115,8 +117,13 @@ func TestExpiration_irrevocableLeaseCountsAPI(t *testing.T) {
 }
 
 func TestExpiration_irrevocableLeaseListAPI(t *testing.T) {
-	t.Parallel()
-	cluster := minimal.NewTestSoloCluster(t, nil)
+	cluster := vault.NewTestCluster(t, nil, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+		NumCores:    1,
+	})
+	cluster.Start()
+	defer cluster.Cleanup()
+
 	client := cluster.Cores[0].Client
 	core := cluster.Cores[0].Core
 
@@ -212,8 +219,13 @@ func TestExpiration_irrevocableLeaseListAPI(t *testing.T) {
 }
 
 func TestExpiration_irrevocableLeaseListAPI_includeAll(t *testing.T) {
-	t.Parallel()
-	cluster := minimal.NewTestSoloCluster(t, nil)
+	cluster := vault.NewTestCluster(t, nil, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+		NumCores:    1,
+	})
+	cluster.Start()
+	defer cluster.Cleanup()
+
 	client := cluster.Cores[0].Client
 	core := cluster.Cores[0].Core
 
diff --git a/vault/external_tests/hcp_link/hcp_link_test.go b/vault/external_tests/hcp_link/hcp_link_test.go
deleted file mode 100644
index 0a32c32464b86..0000000000000
--- a/vault/external_tests/hcp_link/hcp_link_test.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package hcp_link
-
-import (
-	"testing"
-
-	scada "github.com/hashicorp/hcp-scada-provider"
-	"github.com/hashicorp/vault/vault"
-)
-
-func TestHCPLinkConnected(t *testing.T) {
-	cluster := getTestCluster(t, 2)
-	defer cluster.Cleanup()
-
-	vaultHCPLink, _ := TestClusterWithHCPLinkEnabled(t, cluster, false, false)
-	defer vaultHCPLink.Cleanup()
-
-	for _, core := range cluster.Cores {
-		checkLinkStatus(core.Client, scada.SessionStatusConnected, t)
-	}
-}
-
-func TestHCPLinkNotConfigured(t *testing.T) {
-	t.Parallel()
-	cluster := getTestCluster(t, 2)
-	defer cluster.Cleanup()
-
-	cluster.Start()
-	core := cluster.Cores[0].Core
-	vault.TestWaitActive(t, core)
-
-	for _, core := range cluster.Cores {
-		checkLinkStatus(core.Client, "", t)
-	}
-}
diff --git a/vault/external_tests/hcp_link/test_helpers.go b/vault/external_tests/hcp_link/test_helpers.go
deleted file mode 100644
index b3713428e693a..0000000000000
--- a/vault/external_tests/hcp_link/test_helpers.go
+++ /dev/null
@@ -1,141 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package hcp_link
-
-import (
-	"os"
-	"testing"
-	"time"
-
-	sdkResource "github.com/hashicorp/hcp-sdk-go/resource"
-	"github.com/hashicorp/vault/api"
-	credUserpass "github.com/hashicorp/vault/builtin/credential/userpass"
-	vaulthttp "github.com/hashicorp/vault/http"
-	"github.com/hashicorp/vault/internalshared/configutil"
-	"github.com/hashicorp/vault/sdk/logical"
-	"github.com/hashicorp/vault/vault"
-	"github.com/hashicorp/vault/vault/hcp_link"
-)
-
-type VaultHCPLinkInstances struct {
-	instances []*hcp_link.HCPLinkVault
-}
-
-func NewVaultHCPLinkInstances() *VaultHCPLinkInstances {
-	i := &VaultHCPLinkInstances{
-		instances: make([]*hcp_link.HCPLinkVault, 0),
-	}
-
-	return i
-}
-
-func (v *VaultHCPLinkInstances) Cleanup() {
-	for _, inst := range v.instances {
-		inst.Shutdown()
-	}
-}
-
-func getHCPConfig(t *testing.T, clientID, clientSecret string) *configutil.HCPLinkConfig {
-	resourceIDRaw, ok := os.LookupEnv("HCP_RESOURCE_ID")
-	if !ok {
-		t.Skip("failed to find the HCP resource ID")
-	}
-	res, err := sdkResource.FromString(resourceIDRaw)
-	if err != nil {
-		t.Fatalf("failed to parse the resource ID, %v", err.Error())
-	}
-	return &configutil.HCPLinkConfig{
-		ResourceIDRaw: resourceIDRaw,
-		Resource:      &res,
-		ClientID:      clientID,
-		ClientSecret:  clientSecret,
-	}
-}
-
-func getTestCluster(t *testing.T, numCores int) *vault.TestCluster {
-	t.Helper()
-	coreConfig := &vault.CoreConfig{
-		CredentialBackends: map[string]logical.Factory{
-			"userpass": credUserpass.Factory,
-		},
-	}
-
-	if numCores <= 0 {
-		numCores = 1
-	}
-
-	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
-		HandlerFunc: vaulthttp.Handler,
-		NumCores:    numCores,
-	})
-
-	return cluster
-}
-
-func TestClusterWithHCPLinkEnabled(t *testing.T, cluster *vault.TestCluster, enableAPICap, enablePassthroughCap bool) (*VaultHCPLinkInstances, *configutil.HCPLinkConfig) {
-	t.Helper()
-	clientID, ok := os.LookupEnv("HCP_CLIENT_ID")
-	if !ok {
-		t.Skip("HCP client ID not found in env")
-	}
-	clientSecret, ok := os.LookupEnv("HCP_CLIENT_SECRET")
-	if !ok {
-		t.Skip("HCP client secret not found in env")
-	}
-
-	if _, ok := os.LookupEnv("HCP_API_ADDRESS"); !ok {
-		t.Skip("failed to find HCP_API_ADDRESS in the environment")
-	}
-	if _, ok := os.LookupEnv("HCP_SCADA_ADDRESS"); !ok {
-		t.Skip("failed to find HCP_SCADA_ADDRESS in the environment")
-	}
-	if _, ok := os.LookupEnv("HCP_AUTH_URL"); !ok {
-		t.Skip("failed to find HCP_AUTH_URL in the environment")
-	}
-
-	hcpConfig := getHCPConfig(t, clientID, clientSecret)
-	if enableAPICap {
-		hcpConfig.EnableAPICapability = true
-	}
-	if enablePassthroughCap {
-		hcpConfig.EnablePassThroughCapability = true
-	}
-	hcpLinkIns := NewVaultHCPLinkInstances()
-
-	cluster.Start()
-
-	core := cluster.Cores[0].Core
-	vault.TestWaitActive(t, core)
-
-	for _, c := range cluster.Cores {
-		logger := c.Logger().Named("hcpLink")
-		vaultHCPLink, err := hcp_link.NewHCPLink(hcpConfig, c.Core, logger)
-		if err != nil {
-			t.Fatalf("failed to start HCP link, %v", err)
-		}
-		hcpLinkIns.instances = append(hcpLinkIns.instances, vaultHCPLink)
-	}
-
-	return hcpLinkIns, hcpConfig
-}
-
-func checkLinkStatus(client *api.Client, expectedStatus string, t *testing.T) {
-	deadline := time.Now().Add(10 * time.Second)
-	var status *api.SealStatusResponse
-	var err error
-	for time.Now().Before(deadline) {
-		status, err = client.Sys().SealStatus()
-		if err != nil {
-			t.Fatal(err)
-		}
-		if status.HCPLinkStatus == expectedStatus {
-			break
-		}
-		time.Sleep(500 * time.Millisecond)
-	}
-
-	if status.HCPLinkStatus != expectedStatus {
-		t.Fatalf("HCP link did not behave as expected. expected status %v, actual status %v", expectedStatus, status.HCPLinkStatus)
-	}
-}
diff --git a/vault/external_tests/identity/aliases_test.go b/vault/external_tests/identity/aliases_test.go
index 2c79e25e339ec..53ae46fbff6a6 100644
--- a/vault/external_tests/identity/aliases_test.go
+++ b/vault/external_tests/identity/aliases_test.go
@@ -1,25 +1,35 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package identity
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
-	"io"
 	"strings"
 	"testing"
 
 	"github.com/hashicorp/vault/api"
 	auth "github.com/hashicorp/vault/api/auth/userpass"
+	"github.com/hashicorp/vault/builtin/credential/github"
+	"github.com/hashicorp/vault/builtin/credential/userpass"
 	"github.com/hashicorp/vault/helper/testhelpers"
-	"github.com/hashicorp/vault/helper/testhelpers/minimal"
+	vaulthttp "github.com/hashicorp/vault/http"
+	"github.com/hashicorp/vault/sdk/logical"
+	"github.com/hashicorp/vault/vault"
 )
 
 func TestIdentityStore_ListAlias(t *testing.T) {
-	t.Parallel()
-	cluster := minimal.NewTestSoloCluster(t, nil)
+	coreConfig := &vault.CoreConfig{
+		CredentialBackends: map[string]logical.Factory{
+			"github": github.Factory,
+		},
+	}
+	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+	})
+	cluster.Start()
+	defer cluster.Cleanup()
+
+	core := cluster.Cores[0].Core
+	vault.TestWaitActive(t, core)
 	client := cluster.Cores[0].Client
 
 	err := client.Sys().EnableAuthWithOptions("github", &api.EnableAuthOptions{
@@ -168,8 +178,17 @@ func TestIdentityStore_ListAlias(t *testing.T) {
 // returned on an attempt to rename an alias to match another alias with the
 // same mount accessor.  This used to result in a merge entity.
 func TestIdentityStore_RenameAlias_CannotMergeEntity(t *testing.T) {
-	t.Parallel()
-	cluster := minimal.NewTestSoloCluster(t, nil)
+	coreConfig := &vault.CoreConfig{
+		CredentialBackends: map[string]logical.Factory{
+			"userpass": userpass.Factory,
+		},
+	}
+	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+	})
+	cluster.Start()
+	defer cluster.Cleanup()
+
 	client := cluster.Cores[0].Client
 
 	err := client.Sys().EnableAuthWithOptions("userpass", &api.EnableAuthOptions{
@@ -238,8 +257,17 @@ func TestIdentityStore_RenameAlias_CannotMergeEntity(t *testing.T) {
 }
 
 func TestIdentityStore_MergeEntities_FailsDueToClash(t *testing.T) {
-	t.Parallel()
-	cluster := minimal.NewTestSoloCluster(t, nil)
+	coreConfig := &vault.CoreConfig{
+		CredentialBackends: map[string]logical.Factory{
+			"userpass": userpass.Factory,
+		},
+	}
+	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+	})
+	cluster.Start()
+	defer cluster.Cleanup()
+
 	client := cluster.Cores[0].Client
 
 	err := client.Sys().EnableAuthWithOptions("userpass", &api.EnableAuthOptions{
@@ -313,8 +341,18 @@ func TestIdentityStore_MergeEntities_FailsDueToClash(t *testing.T) {
 }
 
 func TestIdentityStore_MergeEntities_FailsDueToClashInFromEntities(t *testing.T) {
-	t.Parallel()
-	cluster := minimal.NewTestSoloCluster(t, nil)
+	coreConfig := &vault.CoreConfig{
+		CredentialBackends: map[string]logical.Factory{
+			"userpass": userpass.Factory,
+			"github":   github.Factory,
+		},
+	}
+	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+	})
+	cluster.Start()
+	defer cluster.Cleanup()
+
 	client := cluster.Cores[0].Client
 
 	err := client.Sys().EnableAuthWithOptions("userpass", &api.EnableAuthOptions{
@@ -383,8 +421,18 @@ func TestIdentityStore_MergeEntities_FailsDueToClashInFromEntities(t *testing.T)
 }
 
 func TestIdentityStore_MergeEntities_FailsDueToDoubleClash(t *testing.T) {
-	t.Parallel()
-	cluster := minimal.NewTestSoloCluster(t, nil)
+	coreConfig := &vault.CoreConfig{
+		CredentialBackends: map[string]logical.Factory{
+			"userpass": userpass.Factory,
+			"github":   github.Factory,
+		},
+	}
+	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+	})
+	cluster.Start()
+	defer cluster.Cleanup()
+
 	client := cluster.Cores[0].Client
 
 	err := client.Sys().EnableAuthWithOptions("userpass", &api.EnableAuthOptions{
@@ -477,9 +525,6 @@ func TestIdentityStore_MergeEntities_FailsDueToDoubleClash(t *testing.T) {
 	if err == nil {
 		t.Fatalf("Expected error upon merge. Resp:%#v", mergeResp)
 	}
-	if mergeResp != nil {
-		t.Fatalf("Response was non-nil. Resp:%#v", mergeResp)
-	}
 	if !strings.Contains(err.Error(), "toEntity and at least one fromEntity have aliases with the same mount accessor") {
 		t.Fatalf("Error was not due to conflicting alias mount accessors. Error: %v", err)
 	}
@@ -509,164 +554,18 @@ func TestIdentityStore_MergeEntities_FailsDueToDoubleClash(t *testing.T) {
 	}
 }
 
-func TestIdentityStore_MergeEntities_FailsDueToClashInFromEntities_CheckRawRequest(t *testing.T) {
-	t.Parallel()
-	cluster := minimal.NewTestSoloCluster(t, nil)
-	client := cluster.Cores[0].Client
-
-	err := client.Sys().EnableAuthWithOptions("userpass", &api.EnableAuthOptions{
-		Type: "userpass",
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = client.Logical().Write("auth/userpass/users/bob", map[string]interface{}{
-		"password": "training",
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	mounts, err := client.Sys().ListAuth()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	var mountAccessor string
-	for k, v := range mounts {
-		if k == "userpass/" {
-			mountAccessor = v.Accessor
-			break
-		}
-	}
-	if mountAccessor == "" {
-		t.Fatal("did not find userpass accessor")
-	}
-
-	_, entityIdBob, _ := testhelpers.CreateEntityAndAlias(t, client, mountAccessor, "bob-smith", "bob")
-
-	// Create userpass login for alice
-	_, err = client.Logical().Write("auth/userpass/users/alice", map[string]interface{}{
-		"password": "training",
-	})
-	if err != nil {
-		t.Fatal(err)
+func TestIdentityStore_MergeEntities_SameMountAccessor_ThenUseAlias(t *testing.T) {
+	coreConfig := &vault.CoreConfig{
+		CredentialBackends: map[string]logical.Factory{
+			"userpass": userpass.Factory,
+		},
 	}
-
-	_, entityIdAlice, _ := testhelpers.CreateEntityAndAlias(t, client, mountAccessor, "alice-smith", "alice")
-
-	// Perform entity merge as a Raw Request so we can investigate the response body
-	req := client.NewRequest("POST", "/v1/identity/entity/merge")
-	req.SetJSONBody(map[string]interface{}{
-		"to_entity_id":    entityIdBob,
-		"from_entity_ids": []string{entityIdAlice},
+	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
 	})
+	cluster.Start()
+	defer cluster.Cleanup()
 
-	resp, err := client.RawRequest(req)
-	if err == nil {
-		t.Fatalf("Expected error but did not get one. Response: %v", resp)
-	}
-
-	bodyBytes, err := io.ReadAll(resp.Body)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	bodyString := string(bodyBytes)
-
-	if resp.StatusCode != 400 {
-		t.Fatal("Incorrect status code for response")
-	}
-
-	var mapOutput map[string]interface{}
-	if err = json.Unmarshal([]byte(bodyString), &mapOutput); err != nil {
-		t.Fatal(err)
-	}
-
-	errorStrings, ok := mapOutput["errors"].([]interface{})
-	if !ok {
-		t.Fatalf("error not present in response - full response: %s", bodyString)
-	}
-
-	if len(errorStrings) != 1 {
-		t.Fatalf("Incorrect number of errors in response - full response: %s", bodyString)
-	}
-
-	errorString, ok := errorStrings[0].(string)
-	if !ok {
-		t.Fatalf("error not present in response - full response: %s", bodyString)
-	}
-
-	if !strings.Contains(errorString, "toEntity and at least one fromEntity have aliases with the same mount accessor") {
-		t.Fatalf("Error was not due to conflicting alias mount accessors. Error: %s", errorString)
-	}
-
-	dataArray, ok := mapOutput["data"].([]interface{})
-	if !ok {
-		t.Fatalf("data not present in response - full response: %s", bodyString)
-	}
-
-	if len(dataArray) != 2 {
-		t.Fatalf("Incorrect amount of clash data in response - full response: %s", bodyString)
-	}
-
-	for _, data := range dataArray {
-		dataMap, ok := data.(map[string]interface{})
-		if !ok {
-			t.Fatalf("data could not be understood - full response: %s", bodyString)
-		}
-
-		entityId, ok := dataMap["entity_id"].(string)
-		if !ok {
-			t.Fatalf("entity_id not present in data - full response: %s", bodyString)
-		}
-
-		if entityId != entityIdBob && entityId != entityIdAlice {
-			t.Fatalf("entityId not bob or alice - full response: %s", bodyString)
-		}
-
-		entity, ok := dataMap["entity"].(string)
-		if !ok {
-			t.Fatalf("entity not present in data - full response: %s", bodyString)
-		}
-
-		if entity != "bob-smith" && entity != "alice-smith" {
-			t.Fatalf("entity not bob or alice - full response: %s", bodyString)
-		}
-
-		alias, ok := dataMap["alias"].(string)
-		if !ok {
-			t.Fatalf("alias not present in data - full response: %s", bodyString)
-		}
-
-		if alias != "bob" && alias != "alice" {
-			t.Fatalf("alias not bob or alice - full response: %s", bodyString)
-		}
-
-		mountPath, ok := dataMap["mount_path"].(string)
-		if !ok {
-			t.Fatalf("mountPath not present in data - full response: %s", bodyString)
-		}
-
-		if mountPath != "auth/userpass/" {
-			t.Fatalf("mountPath not auth/userpass/ - full response: %s", bodyString)
-		}
-
-		mount, ok := dataMap["mount"].(string)
-		if !ok {
-			t.Fatalf("mount not present in data - full response: %s", bodyString)
-		}
-
-		if mount != "userpass" {
-			t.Fatalf("mount not userpass - full response: %s", bodyString)
-		}
-	}
-}
-
-func TestIdentityStore_MergeEntities_SameMountAccessor_ThenUseAlias(t *testing.T) {
-	t.Parallel()
-	cluster := minimal.NewTestSoloCluster(t, nil)
 	client := cluster.Cores[0].Client
 
 	err := client.Sys().EnableAuthWithOptions("userpass", &api.EnableAuthOptions{
@@ -773,8 +672,18 @@ func TestIdentityStore_MergeEntities_SameMountAccessor_ThenUseAlias(t *testing.T
 }
 
 func TestIdentityStore_MergeEntities_FailsDueToMultipleClashMergesAttempted(t *testing.T) {
-	t.Parallel()
-	cluster := minimal.NewTestSoloCluster(t, nil)
+	coreConfig := &vault.CoreConfig{
+		CredentialBackends: map[string]logical.Factory{
+			"userpass": userpass.Factory,
+			"github":   github.Factory,
+		},
+	}
+	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+	})
+	cluster.Start()
+	defer cluster.Cleanup()
+
 	client := cluster.Cores[0].Client
 
 	err := client.Sys().EnableAuthWithOptions("userpass", &api.EnableAuthOptions{
diff --git a/vault/external_tests/identity/entities_test.go b/vault/external_tests/identity/entities_test.go
index a8ee4cfd0a4f4..3e92ae34eb6a4 100644
--- a/vault/external_tests/identity/entities_test.go
+++ b/vault/external_tests/identity/entities_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package identity
 
 import (
@@ -9,13 +6,27 @@ import (
 
 	"github.com/hashicorp/go-secure-stdlib/strutil"
 	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/helper/testhelpers/minimal"
+	"github.com/hashicorp/vault/builtin/credential/approle"
+	vaulthttp "github.com/hashicorp/vault/http"
 	"github.com/hashicorp/vault/sdk/logical"
+	"github.com/hashicorp/vault/vault"
 )
 
 func TestIdentityStore_EntityDisabled(t *testing.T) {
-	t.Parallel()
-	cluster := minimal.NewTestSoloCluster(t, nil)
+	// Use a TestCluster and the approle backend to get a token and entity for testing
+	coreConfig := &vault.CoreConfig{
+		CredentialBackends: map[string]logical.Factory{
+			"approle": approle.Factory,
+		},
+	}
+	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+	})
+	cluster.Start()
+	defer cluster.Cleanup()
+
+	core := cluster.Cores[0].Core
+	vault.TestWaitActive(t, core)
 	client := cluster.Cores[0].Client
 
 	// Mount the auth backend
@@ -166,8 +177,20 @@ func TestIdentityStore_EntityDisabled(t *testing.T) {
 }
 
 func TestIdentityStore_EntityPoliciesInInitialAuth(t *testing.T) {
-	t.Parallel()
-	cluster := minimal.NewTestSoloCluster(t, nil)
+	// Use a TestCluster and the approle backend to get a token and entity for testing
+	coreConfig := &vault.CoreConfig{
+		CredentialBackends: map[string]logical.Factory{
+			"approle": approle.Factory,
+		},
+	}
+	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+	})
+	cluster.Start()
+	defer cluster.Cleanup()
+
+	core := cluster.Cores[0].Core
+	vault.TestWaitActive(t, core)
 	client := cluster.Cores[0].Client
 
 	// Mount the auth backend
diff --git a/vault/external_tests/identity/group_aliases_test.go b/vault/external_tests/identity/group_aliases_test.go
index 9bdce1fc52118..b75533b56613d 100644
--- a/vault/external_tests/identity/group_aliases_test.go
+++ b/vault/external_tests/identity/group_aliases_test.go
@@ -1,18 +1,30 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package identity
 
 import (
 	"testing"
 
 	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/helper/testhelpers/minimal"
+	vaulthttp "github.com/hashicorp/vault/http"
+	"github.com/hashicorp/vault/sdk/logical"
+	"github.com/hashicorp/vault/vault"
+
+	credLdap "github.com/hashicorp/vault/builtin/credential/ldap"
 )
 
 func TestIdentityStore_GroupAliasLocalMount(t *testing.T) {
-	t.Parallel()
-	cluster := minimal.NewTestSoloCluster(t, nil)
+	coreConfig := &vault.CoreConfig{
+		CredentialBackends: map[string]logical.Factory{
+			"ldap": credLdap.Factory,
+		},
+	}
+	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+	})
+	cluster.Start()
+	defer cluster.Cleanup()
+
+	core := cluster.Cores[0].Core
+	vault.TestWaitActive(t, core)
 	client := cluster.Cores[0].Client
 
 	// Create a local auth mount
diff --git a/vault/external_tests/identity/groups_test.go b/vault/external_tests/identity/groups_test.go
index a5baeebe64aa3..12dd29a51f55c 100644
--- a/vault/external_tests/identity/groups_test.go
+++ b/vault/external_tests/identity/groups_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package identity
 
 import (
@@ -8,11 +5,28 @@ import (
 
 	"github.com/hashicorp/vault/api"
 	ldaphelper "github.com/hashicorp/vault/helper/testhelpers/ldap"
-	"github.com/hashicorp/vault/helper/testhelpers/minimal"
+	vaulthttp "github.com/hashicorp/vault/http"
+	"github.com/hashicorp/vault/sdk/logical"
+	"github.com/hashicorp/vault/vault"
+
+	"github.com/hashicorp/vault/builtin/credential/github"
+	credLdap "github.com/hashicorp/vault/builtin/credential/ldap"
 )
 
 func TestIdentityStore_ListGroupAlias(t *testing.T) {
-	cluster := minimal.NewTestSoloCluster(t, nil)
+	coreConfig := &vault.CoreConfig{
+		CredentialBackends: map[string]logical.Factory{
+			"github": github.Factory,
+		},
+	}
+	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+	})
+	cluster.Start()
+	defer cluster.Cleanup()
+
+	core := cluster.Cores[0].Core
+	vault.TestWaitActive(t, core)
 	client := cluster.Cores[0].Client
 
 	err := client.Sys().EnableAuthWithOptions("github", &api.EnableAuthOptions{
@@ -135,7 +149,19 @@ func TestIdentityStore_ListGroupAlias(t *testing.T) {
 
 // Testing the fix for GH-4351
 func TestIdentityStore_ExternalGroupMembershipsAcrossMounts(t *testing.T) {
-	cluster := minimal.NewTestSoloCluster(t, nil)
+	coreConfig := &vault.CoreConfig{
+		CredentialBackends: map[string]logical.Factory{
+			"ldap": credLdap.Factory,
+		},
+	}
+	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+	})
+	cluster.Start()
+	defer cluster.Cleanup()
+
+	core := cluster.Cores[0].Core
+	vault.TestWaitActive(t, core)
 	client := cluster.Cores[0].Client
 
 	// Enable the first LDAP auth
diff --git a/vault/external_tests/identity/identity_test.go b/vault/external_tests/identity/identity_test.go
index 71bed83d0dd64..0b97d72e90b54 100644
--- a/vault/external_tests/identity/identity_test.go
+++ b/vault/external_tests/identity/identity_test.go
@@ -1,27 +1,41 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package identity
 
 import (
 	"fmt"
 	"testing"
 
-	"github.com/go-ldap/ldap/v3"
-	log "github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/go-secure-stdlib/strutil"
 	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/helper/namespace"
-	ldaphelper "github.com/hashicorp/vault/helper/testhelpers/ldap"
-	"github.com/hashicorp/vault/helper/testhelpers/minimal"
 	"github.com/hashicorp/vault/sdk/helper/ldaputil"
+	"github.com/hashicorp/vault/sdk/logical"
+
 	"github.com/stretchr/testify/require"
+
+	"github.com/hashicorp/vault/helper/testhelpers/teststorage"
+
+	"github.com/go-ldap/ldap/v3"
+	log "github.com/hashicorp/go-hclog"
+	ldapcred "github.com/hashicorp/vault/builtin/credential/ldap"
+	"github.com/hashicorp/vault/helper/namespace"
+	ldaphelper "github.com/hashicorp/vault/helper/testhelpers/ldap"
+	vaulthttp "github.com/hashicorp/vault/http"
+	"github.com/hashicorp/vault/vault"
 )
 
 func TestIdentityStore_ExternalGroupMemberships_DifferentMounts(t *testing.T) {
-	t.Parallel()
-	cluster := minimal.NewTestSoloCluster(t, nil)
+	coreConfig := &vault.CoreConfig{
+		CredentialBackends: map[string]logical.Factory{
+			"ldap": ldapcred.Factory,
+		},
+	}
+	conf, opts := teststorage.ClusterSetup(coreConfig, nil, nil)
+	cluster := vault.NewTestCluster(t, conf, opts)
+	cluster.Start()
+	defer cluster.Cleanup()
+
+	core := cluster.Cores[0].Core
 	client := cluster.Cores[0].Client
+	vault.TestWaitActive(t, core)
 
 	// Create a entity
 	secret, err := client.Logical().Write("identity/entity", map[string]interface{}{
@@ -129,10 +143,31 @@ func TestIdentityStore_ExternalGroupMemberships_DifferentMounts(t *testing.T) {
 
 func TestIdentityStore_Integ_GroupAliases(t *testing.T) {
 	t.Parallel()
-	cluster := minimal.NewTestSoloCluster(t, nil)
-	client := cluster.Cores[0].Client
 
-	err := client.Sys().EnableAuthWithOptions("ldap", &api.EnableAuthOptions{
+	var err error
+	coreConfig := &vault.CoreConfig{
+		DisableMlock: true,
+		DisableCache: true,
+		Logger:       log.NewNullLogger(),
+		CredentialBackends: map[string]logical.Factory{
+			"ldap": ldapcred.Factory,
+		},
+	}
+
+	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+	})
+
+	cluster.Start()
+	defer cluster.Cleanup()
+
+	cores := cluster.Cores
+
+	vault.TestWaitActive(t, cores[0].Core)
+
+	client := cores[0].Client
+
+	err = client.Sys().EnableAuthWithOptions("ldap", &api.EnableAuthOptions{
 		Type: "ldap",
 	})
 	if err != nil {
@@ -304,7 +339,7 @@ func TestIdentityStore_Integ_GroupAliases(t *testing.T) {
 	assertMember(t, client, entityID, "devops", devopsGroupID, true)
 	assertMember(t, client, entityID, "engineer", devopsGroupID, true)
 
-	identityStore := cluster.Cores[0].IdentityStore()
+	identityStore := cores[0].IdentityStore()
 
 	group, err := identityStore.MemDBGroupByID(shipCrewGroupID, true)
 	if err != nil {
@@ -408,10 +443,27 @@ func TestIdentityStore_Integ_GroupAliases(t *testing.T) {
 
 func TestIdentityStore_Integ_RemoveFromExternalGroup(t *testing.T) {
 	t.Parallel()
-	cluster := minimal.NewTestSoloCluster(t, nil)
-	client := cluster.Cores[0].Client
+	var err error
+	coreConfig := &vault.CoreConfig{
+		DisableMlock: true,
+		DisableCache: true,
+		Logger:       log.NewNullLogger(),
+		CredentialBackends: map[string]logical.Factory{
+			"ldap": ldapcred.Factory,
+		},
+	}
+
+	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+	})
+
+	cluster.Start()
+	defer cluster.Cleanup()
+
+	cores := cluster.Cores
+	client := cores[0].Client
 
-	err := client.Sys().EnableAuthWithOptions("ldap", &api.EnableAuthOptions{
+	err = client.Sys().EnableAuthWithOptions("ldap", &api.EnableAuthOptions{
 		Type: "ldap",
 	})
 	if err != nil {
diff --git a/vault/external_tests/identity/login_mfa_duo_test.go b/vault/external_tests/identity/login_mfa_duo_test.go
index 79f2a0388413e..e5fb328cd0474 100644
--- a/vault/external_tests/identity/login_mfa_duo_test.go
+++ b/vault/external_tests/identity/login_mfa_duo_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package identity
 
 import (
@@ -11,9 +8,18 @@ import (
 	"testing"
 
 	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/helper/testhelpers/minimal"
+	"github.com/hashicorp/vault/builtin/credential/userpass"
+	vaulthttp "github.com/hashicorp/vault/http"
+	"github.com/hashicorp/vault/sdk/logical"
+	"github.com/hashicorp/vault/vault"
 )
 
+var identityMFACoreConfigDUO = &vault.CoreConfig{
+	CredentialBackends: map[string]logical.Factory{
+		"userpass": userpass.Factory,
+	},
+}
+
 var (
 	secret_key      = "<secret key for DUO>"
 	integration_key = "<integration key>"
@@ -22,7 +28,12 @@ var (
 
 func TestInteg_PolicyMFADUO(t *testing.T) {
 	t.Skip("This test requires manual intervention and DUO verify on cellphone is needed")
-	cluster := minimal.NewTestSoloCluster(t, nil)
+	cluster := vault.NewTestCluster(t, identityMFACoreConfigDUO, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+	})
+	cluster.Start()
+	defer cluster.Cleanup()
+
 	client := cluster.Cores[0].Client
 
 	// Enable Userpass authentication
@@ -144,7 +155,12 @@ path "secret/foo" {
 
 func TestInteg_LoginMFADUO(t *testing.T) {
 	t.Skip("This test requires manual intervention and DUO verify on cellphone is needed")
-	cluster := minimal.NewTestSoloCluster(t, nil)
+	cluster := vault.NewTestCluster(t, identityMFACoreConfigDUO, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+	})
+	cluster.Start()
+	defer cluster.Cleanup()
+
 	client := cluster.Cores[0].Client
 
 	// Enable Userpass authentication
diff --git a/vault/external_tests/identity/login_mfa_okta_test.go b/vault/external_tests/identity/login_mfa_okta_test.go
index d0eff183e2f13..7c5ce3b6346bc 100644
--- a/vault/external_tests/identity/login_mfa_okta_test.go
+++ b/vault/external_tests/identity/login_mfa_okta_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package identity
 
 import (
@@ -10,7 +7,11 @@ import (
 	"testing"
 
 	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/helper/testhelpers/minimal"
+	"github.com/hashicorp/vault/builtin/credential/okta"
+	"github.com/hashicorp/vault/builtin/credential/userpass"
+	vaulthttp "github.com/hashicorp/vault/http"
+	"github.com/hashicorp/vault/sdk/logical"
+	"github.com/hashicorp/vault/vault"
 )
 
 var (
@@ -18,9 +19,21 @@ var (
 	api_token = "<okta api token>"
 )
 
+var identityOktaMFACoreConfig = &vault.CoreConfig{
+	CredentialBackends: map[string]logical.Factory{
+		"userpass": userpass.Factory,
+		"okta":     okta.Factory,
+	},
+}
+
 func TestOktaEngineMFA(t *testing.T) {
 	t.Skip("This test requires manual intervention and OKTA verify on cellphone is needed")
-	cluster := minimal.NewTestSoloCluster(t, nil)
+	cluster := vault.NewTestCluster(t, identityOktaMFACoreConfig, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+	})
+	cluster.Start()
+	defer cluster.Cleanup()
+
 	client := cluster.Cores[0].Client
 
 	// Enable Okta engine
@@ -57,7 +70,12 @@ func TestOktaEngineMFA(t *testing.T) {
 
 func TestInteg_PolicyMFAOkta(t *testing.T) {
 	t.Skip("This test requires manual intervention and OKTA verify on cellphone is needed")
-	cluster := minimal.NewTestSoloCluster(t, nil)
+	cluster := vault.NewTestCluster(t, identityOktaMFACoreConfig, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+	})
+	cluster.Start()
+	defer cluster.Cleanup()
+
 	client := cluster.Cores[0].Client
 
 	// Enable Userpass authentication
@@ -182,7 +200,12 @@ path "secret/foo" {
 
 func TestInteg_LoginMFAOkta(t *testing.T) {
 	t.Skip("This test requires manual intervention and OKTA verify on cellphone is needed")
-	cluster := minimal.NewTestSoloCluster(t, nil)
+	cluster := vault.NewTestCluster(t, identityOktaMFACoreConfig, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+	})
+	cluster.Start()
+	defer cluster.Cleanup()
+
 	client := cluster.Cores[0].Client
 
 	// Enable Userpass authentication
diff --git a/vault/external_tests/identity/login_mfa_totp_test.go b/vault/external_tests/identity/login_mfa_totp_test.go
index 3244d92595687..c2a2bd884fe82 100644
--- a/vault/external_tests/identity/login_mfa_totp_test.go
+++ b/vault/external_tests/identity/login_mfa_totp_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package identity
 
 import (
@@ -11,13 +8,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/vault/api"
 	upAuth "github.com/hashicorp/vault/api/auth/userpass"
+	"github.com/hashicorp/vault/helper/testhelpers"
+
+	"github.com/hashicorp/vault/api"
 	"github.com/hashicorp/vault/audit"
 	"github.com/hashicorp/vault/builtin/credential/userpass"
 	"github.com/hashicorp/vault/builtin/logical/totp"
-	"github.com/hashicorp/vault/helper/testhelpers"
-	"github.com/hashicorp/vault/helper/testhelpers/corehelpers"
 	vaulthttp "github.com/hashicorp/vault/http"
 	"github.com/hashicorp/vault/sdk/logical"
 	"github.com/hashicorp/vault/vault"
@@ -51,7 +48,7 @@ func doTwoPhaseLogin(t *testing.T, client *api.Client, totpCodePath, methodID, u
 }
 
 func TestLoginMfaGenerateTOTPTestAuditIncluded(t *testing.T) {
-	noop := corehelpers.TestNoopAudit(t, nil)
+	var noop *vault.NoopAudit
 
 	cluster := vault.NewTestCluster(t, &vault.CoreConfig{
 		CredentialBackends: map[string]logical.Factory{
@@ -62,6 +59,9 @@ func TestLoginMfaGenerateTOTPTestAuditIncluded(t *testing.T) {
 		},
 		AuditBackends: map[string]audit.Factory{
 			"noop": func(ctx context.Context, config *audit.BackendConfig) (audit.Backend, error) {
+				noop = &vault.NoopAudit{
+					Config: config,
+				}
 				return noop, nil
 			},
 		},
@@ -93,17 +93,16 @@ func TestLoginMfaGenerateTOTPTestAuditIncluded(t *testing.T) {
 	// Creating two users in the userpass auth mount
 	userClient1, entityID1, _ := testhelpers.CreateEntityAndAlias(t, client, mountAccessor, entity1, testuser1)
 	userClient2, entityID2, _ := testhelpers.CreateEntityAndAlias(t, client, mountAccessor, entity2, testuser2)
-	waitPeriod := 5
+
 	totpConfig := map[string]interface{}{
 		"issuer":                  "yCorp",
-		"period":                  waitPeriod,
+		"period":                  5,
 		"algorithm":               "SHA1",
 		"digits":                  6,
 		"skew":                    1,
 		"key_size":                10,
 		"qr_size":                 100,
 		"max_validation_attempts": 3,
-		"method_name":             "foo",
 	}
 
 	methodID := testhelpers.SetupTOTPMethod(t, client, totpConfig)
@@ -124,58 +123,40 @@ func TestLoginMfaGenerateTOTPTestAuditIncluded(t *testing.T) {
 	userpassPath := fmt.Sprintf("auth/userpass/login/%s", testuser1)
 
 	// MFA single-phase login
-	verifyLoginRequest := func(secret *api.Secret) {
-		userpassToken := secret.Auth.ClientToken
-		userClient1.SetToken(client.Token())
-		secret, err := userClient1.Logical().WriteWithContext(context.Background(), "auth/token/lookup", map[string]interface{}{
-			"token": userpassToken,
-		})
-		if err != nil {
-			t.Fatalf("failed to lookup userpass authenticated token: %v", err)
-		}
-
-		entityIDCheck := secret.Data["entity_id"].(string)
-		if entityIDCheck != entityID1 {
-			t.Fatalf("different entityID assigned")
-		}
-	}
-
-	// helper function to clear the MFA request header
-	clearMFARequestHeaders := func(c *api.Client) {
-		headers := c.Headers()
-		headers.Del("X-Vault-MFA")
-		c.SetHeaders(headers)
-	}
-
+	time.Sleep(5 * time.Second)
 	var secret *api.Secret
-	var err error
-	var methodIdentifier string
-
-	singlePhaseLoginFunc := func() error {
+	testhelpers.RetryUntil(t, 20*time.Second, func() error {
+		var err error
 		totpPasscode := testhelpers.GetTOTPCodeFromEngine(t, client, enginePath1)
-		userClient1.AddHeader("X-Vault-MFA", fmt.Sprintf("%s:%s", methodIdentifier, totpPasscode))
-		defer clearMFARequestHeaders(userClient1)
+
+		userClient1.AddHeader("X-Vault-MFA", fmt.Sprintf("%s:%s", methodID, totpPasscode))
 		secret, err = userClient1.Logical().WriteWithContext(context.Background(), userpassPath, map[string]interface{}{
 			"password": "testpassword",
 		})
 		if err != nil {
-			return fmt.Errorf("MFA failed for identifier %s: %v", methodIdentifier, err)
+			return fmt.Errorf("MFA failed: %w", err)
 		}
 		return nil
-	}
+	})
 
-	// single phase login for both method name and method ID
-	methodIdentifier = totpConfig["method_name"].(string)
-	testhelpers.RetryUntilAtCadence(t, 20*time.Second, 100*time.Millisecond, singlePhaseLoginFunc)
-	verifyLoginRequest(secret)
+	userpassToken := secret.Auth.ClientToken
+	userClient1.SetToken(client.Token())
+	secret, err := userClient1.Logical().WriteWithContext(context.Background(), "auth/token/lookup", map[string]interface{}{
+		"token": userpassToken,
+	})
+	if err != nil {
+		t.Fatalf("failed to lookup userpass authenticated token: %v", err)
+	}
 
-	methodIdentifier = methodID
-	// Need to wait a bit longer to avoid hitting maximum allowed consecutive
-	// failed TOTP validation
-	testhelpers.RetryUntilAtCadence(t, 20*time.Second, time.Duration(waitPeriod)*time.Second, singlePhaseLoginFunc)
-	verifyLoginRequest(secret)
+	entityIDCheck := secret.Data["entity_id"].(string)
+	if entityIDCheck != entityID1 {
+		t.Fatalf("different entityID assigned")
+	}
 
 	// Two-phase login
+	headers := userClient1.Headers()
+	headers.Del("X-Vault-MFA")
+	userClient1.SetHeaders(headers)
 	secret, err = userClient1.Logical().WriteWithContext(context.Background(), userpassPath, map[string]interface{}{
 		"password": "testpassword",
 	})
@@ -210,43 +191,26 @@ func TestLoginMfaGenerateTOTPTestAuditIncluded(t *testing.T) {
 	}
 
 	// validation
-	var mfaReqID string
+	time.Sleep(5 * time.Second)
 	var totpPasscode1 string
-	mfaValidateFunc := func() error {
+	testhelpers.RetryUntil(t, 20*time.Second, func() error {
 		totpPasscode1 = testhelpers.GetTOTPCodeFromEngine(t, client, enginePath1)
+
 		secret, err = userClient1.Logical().WriteWithContext(context.Background(), "sys/mfa/validate", map[string]interface{}{
-			"mfa_request_id": mfaReqID,
+			"mfa_request_id": secret.Auth.MFARequirement.MFARequestID,
 			"mfa_payload": map[string][]string{
-				methodIdentifier: {totpPasscode1},
+				methodID: {totpPasscode1},
 			},
 		})
 		if err != nil {
-			return fmt.Errorf("MFA failed: %v", err)
-		}
-		if secret.Auth == nil || secret.Auth.ClientToken == "" {
-			t.Fatalf("successful mfa validation did not return a client token")
+			return fmt.Errorf("MFA failed: %w", err)
 		}
 
 		return nil
-	}
-
-	methodIdentifier = methodID
-	mfaReqID = secret.Auth.MFARequirement.MFARequestID
-	testhelpers.RetryUntilAtCadence(t, 20*time.Second, time.Duration(waitPeriod)*time.Second, mfaValidateFunc)
-
-	// two phase login with method name
-	secret, err = userClient1.Logical().WriteWithContext(context.Background(), userpassPath, map[string]interface{}{
-		"password": "testpassword",
 	})
-	if err != nil {
-		t.Fatalf("MFA failed: %v", err)
+	if secret.Auth == nil || secret.Auth.ClientToken == "" {
+		t.Fatalf("successful mfa validation did not return a client token")
 	}
-
-	methodIdentifier = totpConfig["method_name"].(string)
-	mfaReqID = secret.Auth.MFARequirement.MFARequestID
-	testhelpers.RetryUntilAtCadence(t, 20*time.Second, time.Duration(waitPeriod)*time.Second, mfaValidateFunc)
-
-	// checking audit log
 	if noop.Req == nil {
 		t.Fatalf("no request was logged in audit log")
 	}
diff --git a/vault/external_tests/identity/oidc_provider_test.go b/vault/external_tests/identity/oidc_provider_test.go
index d8624641501c8..3b849566097b0 100644
--- a/vault/external_tests/identity/oidc_provider_test.go
+++ b/vault/external_tests/identity/oidc_provider_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package identity
 
 import (
diff --git a/vault/external_tests/identity/userlockouts_test.go b/vault/external_tests/identity/userlockouts_test.go
deleted file mode 100644
index 21c31712b3087..0000000000000
--- a/vault/external_tests/identity/userlockouts_test.go
+++ /dev/null
@@ -1,178 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package identity
-
-import (
-	"os"
-	"strings"
-	"testing"
-
-	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/builtin/credential/userpass"
-	vaulthttp "github.com/hashicorp/vault/http"
-	"github.com/hashicorp/vault/sdk/logical"
-	"github.com/hashicorp/vault/vault"
-)
-
-const (
-	UserLockoutThresholdDefault = 5
-)
-
-// TestIdentityStore_DisableUserLockoutTest tests that user login will
-// fail when supplied with wrong credentials. If the user is locked,
-// it returns permission denied. Otherwise, it returns invalid user
-// credentials error if the user lockout feature is disabled.
-// It tests disabling the feature using env variable VAULT_DISABLE_USER_LOCKOUT
-// and also using auth tune. Also, tests that env var has more precedence over
-// settings in auth tune.
-func TestIdentityStore_DisableUserLockoutTest(t *testing.T) {
-	// reset to false before exiting
-	defer os.Unsetenv("VAULT_DISABLE_USER_LOCKOUT")
-
-	coreConfig := &vault.CoreConfig{
-		CredentialBackends: map[string]logical.Factory{
-			"userpass": userpass.Factory,
-		},
-	}
-	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
-		HandlerFunc: vaulthttp.Handler,
-	})
-	cluster.Start()
-	defer cluster.Cleanup()
-
-	// standby client
-	client := cluster.Cores[1].Client
-
-	// enable userpass
-	err := client.Sys().EnableAuthWithOptions("userpass", &api.EnableAuthOptions{
-		Type: "userpass",
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// create a userpass user
-	_, err = client.Logical().Write("auth/userpass/users/bsmith", map[string]interface{}{
-		"password": "training",
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// get mount accessor for userpass mount
-	secret, err := client.Logical().Read("sys/auth/userpass")
-	if err != nil || secret == nil {
-		t.Fatal(err)
-	}
-	mountAccessor := secret.Data["accessor"].(string)
-
-	// variables for auth tune
-	disableLockout := true
-	enableLockout := false
-
-	tests := []struct {
-		name                        string
-		setDisableUserLockoutEnvVar string
-		// default is false
-		setDisableLockoutAuthTune bool
-		expectedUserLocked        bool
-	}{
-		{
-			name:                        "Both unset, uses default behaviour i.e; user lockout feature enabled",
-			setDisableUserLockoutEnvVar: "",
-			setDisableLockoutAuthTune:   false,
-			expectedUserLocked:          true,
-		},
-		{
-			name:                        "User lockout feature is disabled using auth tune",
-			setDisableUserLockoutEnvVar: "",
-			setDisableLockoutAuthTune:   true,
-			expectedUserLocked:          false,
-		},
-		{
-			name:                        "User Lockout feature is disabled using env var VAULT_DISABLE_USER_LOCKOUT",
-			setDisableUserLockoutEnvVar: "true",
-			setDisableLockoutAuthTune:   false,
-			expectedUserLocked:          false,
-		},
-		{
-			name:                        "User lockout feature is enabled using env variable, disabled using auth tune",
-			setDisableUserLockoutEnvVar: "false",
-			setDisableLockoutAuthTune:   true,
-			expectedUserLocked:          true,
-		},
-		{
-			name:                        "User lockout feature is disabled using auth tune and env variable",
-			setDisableUserLockoutEnvVar: "true",
-			setDisableLockoutAuthTune:   true,
-			expectedUserLocked:          false,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if tt.setDisableUserLockoutEnvVar != "" {
-				os.Setenv("VAULT_DISABLE_USER_LOCKOUT", tt.setDisableUserLockoutEnvVar)
-			} else {
-				os.Unsetenv("VAULT_DISABLE_USER_LOCKOUT")
-			}
-
-			var disableLockoutAuthTune *bool
-
-			// default for disable lockout is false
-			disableLockoutAuthTune = &enableLockout
-
-			if tt.setDisableLockoutAuthTune == true {
-				disableLockoutAuthTune = &disableLockout
-			}
-
-			// tune auth mount
-			userlockoutConfig := &api.UserLockoutConfigInput{
-				DisableLockout: disableLockoutAuthTune,
-			}
-			err := client.Sys().TuneMount("auth/userpass", api.MountConfigInput{
-				UserLockoutConfig: userlockoutConfig,
-			})
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			// login for default lockout threshold times with wrong credentials
-			for i := 0; i < UserLockoutThresholdDefault; i++ {
-				_, err = client.Logical().Write("auth/userpass/login/bsmith", map[string]interface{}{
-					"password": "wrongPassword",
-				})
-				if err == nil {
-					t.Fatal("expected login to fail due to wrong credentials")
-				}
-				if !strings.Contains(err.Error(), "invalid username or password") {
-					t.Fatal(err)
-				}
-			}
-
-			// login to check if user locked
-			_, err = client.Logical().Write("auth/userpass/login/bsmith", map[string]interface{}{
-				"password": "wrongPassword",
-			})
-			if err == nil {
-				t.Fatal("expected login to fail due to wrong credentials")
-			}
-
-			switch tt.expectedUserLocked {
-			case true:
-				if !strings.Contains(err.Error(), logical.ErrPermissionDenied.Error()) {
-					t.Fatalf("expected user to get locked but got %v", err)
-				}
-				// user locked, unlock user to perform next test iteration
-				if _, err = client.Logical().Write("sys/locked-users/"+mountAccessor+"/unlock/bsmith", nil); err != nil {
-					t.Fatal(err)
-				}
-
-			default:
-				if !strings.Contains(err.Error(), "invalid username or password") {
-					t.Fatalf("expected user to be unlocked but locked, got  %v", err)
-				}
-			}
-		})
-	}
-}
diff --git a/vault/external_tests/kv/kv_patch_test.go b/vault/external_tests/kv/kv_patch_test.go
index 61611f9012e44..52e60215dd74d 100644
--- a/vault/external_tests/kv/kv_patch_test.go
+++ b/vault/external_tests/kv/kv_patch_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package kv
 
 import (
@@ -12,14 +9,34 @@ import (
 	"testing"
 	"time"
 
+	logicalKv "github.com/hashicorp/vault-plugin-secrets-kv"
 	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/helper/testhelpers/minimal"
+	"github.com/hashicorp/vault/audit"
+	auditFile "github.com/hashicorp/vault/builtin/audit/file"
+	vaulthttp "github.com/hashicorp/vault/http"
+	"github.com/hashicorp/vault/sdk/logical"
+	"github.com/hashicorp/vault/vault"
 )
 
 func TestKV_Patch_BadContentTypeHeader(t *testing.T) {
-	t.Parallel()
-	cluster := minimal.NewTestSoloCluster(t, nil)
+	coreConfig := &vault.CoreConfig{
+		LogicalBackends: map[string]logical.Factory{
+			"kv": logicalKv.VersionedKVFactory,
+		},
+	}
+
+	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+	})
+
+	cluster.Start()
+	defer cluster.Cleanup()
+
+	cores := cluster.Cores
+
+	core := cores[0].Core
 	c := cluster.Cores[0].Client
+	vault.TestWaitActive(t, core)
 
 	// Mount a KVv2 backend
 	err := c.Sys().Mount("kv", &api.MountInput{
@@ -102,9 +119,27 @@ func kvRequestWithRetry(t *testing.T, req func() (interface{}, error)) (interfac
 }
 
 func TestKV_Patch_Audit(t *testing.T) {
-	t.Parallel()
-	cluster := minimal.NewTestSoloCluster(t, nil)
+	coreConfig := &vault.CoreConfig{
+		LogicalBackends: map[string]logical.Factory{
+			"kv": logicalKv.VersionedKVFactory,
+		},
+		AuditBackends: map[string]audit.Factory{
+			"file": auditFile.Factory,
+		},
+	}
+
+	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+	})
+
+	cluster.Start()
+	defer cluster.Cleanup()
+
+	cores := cluster.Cores
+
+	core := cores[0].Core
 	c := cluster.Cores[0].Client
+	vault.TestWaitActive(t, core)
 
 	if err := c.Sys().Mount("kv/", &api.MountInput{
 		Type: "kv-v2",
@@ -184,9 +219,19 @@ func TestKV_Patch_Audit(t *testing.T) {
 
 // Verifies that patching works by default with the root token
 func TestKV_Patch_RootToken(t *testing.T) {
-	t.Parallel()
-	cluster := minimal.NewTestSoloCluster(t, nil)
-	client := cluster.Cores[0].Client
+	coreConfig := &vault.CoreConfig{
+		LogicalBackends: map[string]logical.Factory{
+			"kv": logicalKv.Factory,
+		},
+	}
+	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+	})
+	cluster.Start()
+	defer cluster.Cleanup()
+
+	core := cluster.Cores[0]
+	client := core.Client
 
 	// make sure this client is using the root token
 	client.SetToken(cluster.RootToken)
@@ -204,7 +249,6 @@ func TestKV_Patch_RootToken(t *testing.T) {
 		data := map[string]interface{}{
 			"data": map[string]interface{}{
 				"bar": "baz",
-				"foo": "qux",
 			},
 		}
 
@@ -219,7 +263,6 @@ func TestKV_Patch_RootToken(t *testing.T) {
 		data := map[string]interface{}{
 			"data": map[string]interface{}{
 				"bar": "quux",
-				"foo": nil,
 			},
 		}
 		return client.Logical().JSONMergePatch(context.Background(), "kv/data/foo", data)
@@ -245,8 +288,4 @@ func TestKV_Patch_RootToken(t *testing.T) {
 	if bar != "quux" {
 		t.Fatalf("expected bar to be quux but it was %q", bar)
 	}
-
-	if _, ok := secret.Data["data"].(map[string]interface{})["foo"]; ok {
-		t.Fatalf("expected data not to include foo")
-	}
 }
diff --git a/vault/external_tests/kv/kv_subkeys_test.go b/vault/external_tests/kv/kv_subkeys_test.go
index f5cc5a7e4dbf6..116d41a7a62aa 100644
--- a/vault/external_tests/kv/kv_subkeys_test.go
+++ b/vault/external_tests/kv/kv_subkeys_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package kv
 
 import (
@@ -9,16 +6,34 @@ import (
 	"testing"
 
 	"github.com/go-test/deep"
+	logicalKv "github.com/hashicorp/vault-plugin-secrets-kv"
 	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/helper/testhelpers/minimal"
+	vaulthttp "github.com/hashicorp/vault/http"
+	"github.com/hashicorp/vault/sdk/logical"
+	"github.com/hashicorp/vault/vault"
 )
 
 // TestKV_Subkeys_NotFound issues a read to the subkeys endpoint for a path
 // that does not exist. A 400 status should be returned.
 func TestKV_Subkeys_NotFound(t *testing.T) {
-	t.Parallel()
-	cluster := minimal.NewTestSoloCluster(t, nil)
+	coreConfig := &vault.CoreConfig{
+		LogicalBackends: map[string]logical.Factory{
+			"kv": logicalKv.VersionedKVFactory,
+		},
+	}
+
+	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+	})
+
+	cluster.Start()
+	defer cluster.Cleanup()
+
+	cores := cluster.Cores
+
+	core := cores[0].Core
 	c := cluster.Cores[0].Client
+	vault.TestWaitActive(t, core)
 
 	// Mount a KVv2 backend
 	err := c.Sys().Mount("kv", &api.MountInput{
@@ -52,9 +67,24 @@ func TestKV_Subkeys_NotFound(t *testing.T) {
 // endpoint should return a 400 status with a nil "subkeys" value and the
 // "deletion_time" key in the "metadata" key should be not be empty.
 func TestKV_Subkeys_Deleted(t *testing.T) {
-	t.Parallel()
-	cluster := minimal.NewTestSoloCluster(t, nil)
+	coreConfig := &vault.CoreConfig{
+		LogicalBackends: map[string]logical.Factory{
+			"kv": logicalKv.VersionedKVFactory,
+		},
+	}
+
+	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+	})
+
+	cluster.Start()
+	defer cluster.Cleanup()
+
+	cores := cluster.Cores
+
+	core := cores[0].Core
 	c := cluster.Cores[0].Client
+	vault.TestWaitActive(t, core)
 
 	// Mount a KVv2 backend
 	err := c.Sys().Mount("kv", &api.MountInput{
@@ -136,9 +166,24 @@ func TestKV_Subkeys_Deleted(t *testing.T) {
 // endpoint should return a 400 status with a nil "subkeys" value and the
 // "destroyed" key in the "metadata" key should be set to true.
 func TestKV_Subkeys_Destroyed(t *testing.T) {
-	t.Parallel()
-	cluster := minimal.NewTestSoloCluster(t, nil)
+	coreConfig := &vault.CoreConfig{
+		LogicalBackends: map[string]logical.Factory{
+			"kv": logicalKv.VersionedKVFactory,
+		},
+	}
+
+	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+	})
+
+	cluster.Start()
+	defer cluster.Cleanup()
+
+	cores := cluster.Cores
+
+	core := cores[0].Core
 	c := cluster.Cores[0].Client
+	vault.TestWaitActive(t, core)
 
 	// Mount a KVv2 backend
 	err := c.Sys().Mount("kv", &api.MountInput{
@@ -228,9 +273,24 @@ func TestKV_Subkeys_Destroyed(t *testing.T) {
 // KVv2 secret engine. It ensures that the subkeys endpoint returns a 200 status
 // and current version of the secret.
 func TestKV_Subkeys_CurrentVersion(t *testing.T) {
-	t.Parallel()
-	cluster := minimal.NewTestSoloCluster(t, nil)
+	coreConfig := &vault.CoreConfig{
+		LogicalBackends: map[string]logical.Factory{
+			"kv": logicalKv.VersionedKVFactory,
+		},
+	}
+
+	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+	})
+
+	cluster.Start()
+	defer cluster.Cleanup()
+
+	cores := cluster.Cores
+
+	core := cores[0].Core
 	c := cluster.Cores[0].Client
+	vault.TestWaitActive(t, core)
 
 	// Mount a KVv2 backend
 	err := c.Sys().Mount("kv", &api.MountInput{
diff --git a/vault/external_tests/kv/kvv2_upgrade_test.go b/vault/external_tests/kv/kvv2_upgrade_test.go
index 387590f47197a..3d3eb486f2071 100644
--- a/vault/external_tests/kv/kvv2_upgrade_test.go
+++ b/vault/external_tests/kv/kvv2_upgrade_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package kv
 
 import (
@@ -19,6 +16,7 @@ import (
 	"github.com/hashicorp/vault/sdk/logical"
 	"github.com/hashicorp/vault/sdk/physical"
 	"github.com/hashicorp/vault/vault"
+	"github.com/kr/pretty"
 )
 
 // Tests the regression in
@@ -74,6 +72,12 @@ func TestKVv2_UpgradePaths(t *testing.T) {
 	}
 	basePath := basePaths[0]
 
+	beforeList, err := core.UnderlyingStorage.List(ctx, "logical/"+kvMount+basePath)
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log(pretty.Sprint(beforeList))
+
 	// Delete policy/archive
 	if err = logical.ClearView(ctx, physical.NewView(core.UnderlyingStorage, "logical/"+kvMount+basePath+"policy/")); err != nil {
 		t.Fatal(err)
@@ -82,6 +86,12 @@ func TestKVv2_UpgradePaths(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	afterList, err := core.UnderlyingStorage.List(ctx, "logical/"+kvMount+basePath)
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log(pretty.Sprint(afterList))
+
 	testhelpers.EnsureCoresUnsealed(t, cluster)
 
 	// Need to give it time to actually set up
diff --git a/vault/external_tests/metrics/core_metrics_int_test.go b/vault/external_tests/metrics/core_metrics_int_test.go
index 0f57156e602f0..cc19ae0a7b485 100644
--- a/vault/external_tests/metrics/core_metrics_int_test.go
+++ b/vault/external_tests/metrics/core_metrics_int_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package metrics
 
 import (
@@ -11,8 +8,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/vault/helper/testhelpers/corehelpers"
-
 	"github.com/hashicorp/vault/api"
 	"github.com/hashicorp/vault/helper/testhelpers"
 	vaulthttp "github.com/hashicorp/vault/http"
@@ -22,7 +17,7 @@ import (
 func TestMountTableMetrics(t *testing.T) {
 	clusterName := "mycluster"
 	conf := &vault.CoreConfig{
-		BuiltinRegistry: corehelpers.NewMockBuiltinRegistry(),
+		BuiltinRegistry: vault.NewMockBuiltinRegistry(),
 		ClusterName:     clusterName,
 	}
 	cluster := vault.NewTestCluster(t, conf, &vault.TestClusterOptions{
@@ -112,7 +107,7 @@ func gaugeConditionCheck(comparator string, compareVal int, compareToVal int) er
 func TestLeaderReElectionMetrics(t *testing.T) {
 	clusterName := "mycluster"
 	conf := &vault.CoreConfig{
-		BuiltinRegistry: corehelpers.NewMockBuiltinRegistry(),
+		BuiltinRegistry: vault.NewMockBuiltinRegistry(),
 		ClusterName:     clusterName,
 	}
 	cluster := vault.NewTestCluster(t, conf, &vault.TestClusterOptions{
diff --git a/vault/external_tests/mfa/login_mfa_test.go b/vault/external_tests/mfa/login_mfa_test.go
index 2fa226cb81673..0ae821f105f7c 100644
--- a/vault/external_tests/mfa/login_mfa_test.go
+++ b/vault/external_tests/mfa/login_mfa_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package mfa
 
 import (
@@ -8,8 +5,6 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/hashicorp/vault/helper/testhelpers/minimal"
-
 	"github.com/hashicorp/go-secure-stdlib/strutil"
 	"github.com/hashicorp/vault/api"
 	"github.com/hashicorp/vault/builtin/credential/userpass"
@@ -18,9 +13,20 @@ import (
 	"github.com/hashicorp/vault/vault"
 )
 
-// TestLoginMFA_Method_CRUD tests creating/reading/updating/deleting a method config for all the MFA providers
+// TestLoginMFA_Method_CRUD tests creating/reading/updating/deleting a method config for all of the MFA providers
 func TestLoginMFA_Method_CRUD(t *testing.T) {
-	cluster := minimal.NewTestSoloCluster(t, nil)
+	cluster := vault.NewTestCluster(t, &vault.CoreConfig{
+		CredentialBackends: map[string]logical.Factory{
+			"userpass": userpass.Factory,
+		},
+	}, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+	})
+	cluster.Start()
+	defer cluster.Cleanup()
+
+	core := cluster.Cores[0].Core
+	vault.TestWaitActive(t, core)
 	client := cluster.Cores[0].Client
 
 	// Enable userpass authentication
@@ -210,115 +216,6 @@ func TestLoginMFA_Method_CRUD(t *testing.T) {
 	}
 }
 
-func TestLoginMFAMethodName(t *testing.T) {
-	cluster := minimal.NewTestSoloCluster(t, nil)
-	client := cluster.Cores[0].Client
-
-	// Enable userpass authentication
-	err := client.Sys().EnableAuthWithOptions("userpass", &api.EnableAuthOptions{
-		Type: "userpass",
-	})
-	if err != nil {
-		t.Fatalf("failed to enable userpass auth: %v", err)
-	}
-
-	auths, err := client.Sys().ListAuth()
-	if err != nil {
-		t.Fatal(err)
-	}
-	mountAccessor := auths["userpass/"].Accessor
-
-	testCases := []struct {
-		methodType string
-		configData map[string]interface{}
-	}{
-		{
-			"totp",
-			map[string]interface{}{
-				"issuer":      "yCorp",
-				"method_name": "totp-method",
-			},
-		},
-		{
-			"duo",
-			map[string]interface{}{
-				"mount_accessor":  mountAccessor,
-				"secret_key":      "lol-secret",
-				"integration_key": "integration-key",
-				"api_hostname":    "some-hostname",
-				"method_name":     "duo-method",
-			},
-		},
-		{
-			"okta",
-			map[string]interface{}{
-				"mount_accessor": mountAccessor,
-				"base_url":       "example.com",
-				"org_name":       "my-org",
-				"api_token":      "lol-token",
-				"method_name":    "okta-method",
-			},
-		},
-		{
-			"pingid",
-			map[string]interface{}{
-				"mount_accessor":       mountAccessor,
-				"settings_file_base64": "I0F1dG8tR2VuZXJhdGVkIGZyb20gUGluZ09uZSwgZG93bmxvYWRlZCBieSBpZD1bU1NPXSBlbWFpbD1baGFtaWRAaGFzaGljb3JwLmNvbV0KI1dlZCBEZWMgMTUgMTM6MDg6NDQgTVNUIDIwMjEKdXNlX2Jhc2U2NF9rZXk9YlhrdGMyVmpjbVYwTFd0bGVRPT0KdXNlX3NpZ25hdHVyZT10cnVlCnRva2VuPWxvbC10b2tlbgppZHBfdXJsPWh0dHBzOi8vaWRweG55bDNtLnBpbmdpZGVudGl0eS5jb20vcGluZ2lkCm9yZ19hbGlhcz1sb2wtb3JnLWFsaWFzCmFkbWluX3VybD1odHRwczovL2lkcHhueWwzbS5waW5naWRlbnRpdHkuY29tL3BpbmdpZAphdXRoZW50aWNhdG9yX3VybD1odHRwczovL2F1dGhlbnRpY2F0b3IucGluZ29uZS5jb20vcGluZ2lkL3BwbQ==",
-				"method_name":          "pingid-method",
-			},
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.methodType, func(t *testing.T) {
-			// create a new method config
-			myPath := fmt.Sprintf("identity/mfa/method/%s", tc.methodType)
-			resp, err := client.Logical().Write(myPath, tc.configData)
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			methodId := resp.Data["method_id"]
-			if methodId == "" {
-				t.Fatal("method id is empty")
-			}
-
-			// creating an MFA config with the same name should not return a new method ID
-			resp, err = client.Logical().Write(myPath, tc.configData)
-			if err != nil {
-				t.Fatal(err)
-			}
-			if methodId != resp.Data["method_id"] {
-				t.Fatal("trying to create a new MFA config with the same name should not result in a new MFA config")
-			}
-
-			originalName := tc.configData["method_name"]
-
-			// create a new MFA config name
-			tc.configData["method_name"] = "newName"
-			resp, err = client.Logical().Write(myPath, tc.configData)
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			myNewPath := fmt.Sprintf("%s/%s", myPath, methodId)
-
-			// Updating an existing MFA config with another config's name
-			resp, err = client.Logical().Write(myNewPath, tc.configData)
-			if err == nil {
-				t.Fatalf("expected a failure for configuring an MFA method with an existing MFA method name, %v", err)
-			}
-
-			// Create a method with a / in the name
-			tc.configData["method_name"] = fmt.Sprintf("ns1/%s", originalName)
-			_, err = client.Logical().Write(myNewPath, tc.configData)
-			if err != nil {
-				t.Fatal(err)
-			}
-		})
-	}
-}
-
 // TestLoginMFA_ListAllMFAConfigs tests listing all configs globally
 func TestLoginMFA_ListAllMFAConfigsGlobally(t *testing.T) {
 	cluster := vault.NewTestCluster(t, &vault.CoreConfig{
@@ -424,7 +321,18 @@ func TestLoginMFA_ListAllMFAConfigsGlobally(t *testing.T) {
 
 // TestLoginMFA_LoginEnforcement_CRUD tests creating/reading/updating/deleting a login enforcement config
 func TestLoginMFA_LoginEnforcement_CRUD(t *testing.T) {
-	cluster := minimal.NewTestSoloCluster(t, nil)
+	cluster := vault.NewTestCluster(t, &vault.CoreConfig{
+		CredentialBackends: map[string]logical.Factory{
+			"userpass": userpass.Factory,
+		},
+	}, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+	})
+	cluster.Start()
+	defer cluster.Cleanup()
+
+	core := cluster.Cores[0].Core
+	vault.TestWaitActive(t, core)
 	client := cluster.Cores[0].Client
 
 	// first create a few configs
@@ -572,7 +480,14 @@ func TestLoginMFA_LoginEnforcement_CRUD(t *testing.T) {
 
 // TestLoginMFA_LoginEnforcement_MethodIdsIsRequired ensures that login enforcements have method ids attached
 func TestLoginMFA_LoginEnforcement_MethodIdsIsRequired(t *testing.T) {
-	cluster := minimal.NewTestSoloCluster(t, nil)
+	cluster := vault.NewTestCluster(t, nil, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+	})
+	cluster.Start()
+	defer cluster.Cleanup()
+
+	core := cluster.Cores[0].Core
+	vault.TestWaitActive(t, core)
 	client := cluster.Cores[0].Client
 
 	// create a login enforcement config, which should fail
@@ -588,7 +503,14 @@ func TestLoginMFA_LoginEnforcement_MethodIdsIsRequired(t *testing.T) {
 
 // TestLoginMFA_LoginEnforcement_RequiredParameters validates that all of the required fields must be present
 func TestLoginMFA_LoginEnforcement_RequiredParameters(t *testing.T) {
-	cluster := minimal.NewTestSoloCluster(t, nil)
+	cluster := vault.NewTestCluster(t, nil, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+	})
+	cluster.Start()
+	defer cluster.Cleanup()
+
+	core := cluster.Cores[0].Core
+	vault.TestWaitActive(t, core)
 	client := cluster.Cores[0].Client
 
 	// first create a few configs
@@ -624,7 +546,14 @@ func TestLoginMFA_LoginEnforcement_RequiredParameters(t *testing.T) {
 }
 
 func TestLoginMFA_UpdateNonExistentConfig(t *testing.T) {
-	cluster := minimal.NewTestSoloCluster(t, nil)
+	cluster := vault.NewTestCluster(t, nil, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+	})
+	cluster.Start()
+	defer cluster.Cleanup()
+
+	core := cluster.Cores[0].Core
+	vault.TestWaitActive(t, core)
 	client := cluster.Cores[0].Client
 
 	_, err := client.Logical().Write("mfa/method/totp/a51884c6-51f2-bdc3-f4c5-0da64fe4d061", map[string]interface{}{
diff --git a/vault/external_tests/misc/misc_binary/recovery_test.go b/vault/external_tests/misc/misc_binary/recovery_test.go
deleted file mode 100644
index 05c3946b6eaa4..0000000000000
--- a/vault/external_tests/misc/misc_binary/recovery_test.go
+++ /dev/null
@@ -1,175 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package misc
-
-import (
-	"context"
-	"os"
-	"path"
-	"testing"
-
-	"github.com/mitchellh/mapstructure"
-
-	"github.com/go-test/deep"
-	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/sdk/helper/testcluster"
-	"github.com/hashicorp/vault/sdk/helper/testcluster/docker"
-)
-
-// TestRecovery_Docker exercises recovery mode.  It starts a single node raft
-// cluster, writes some data, then restarts it and makes sure that we can read
-// the data (that's mostly to make sure that our framework is properly handling
-// a volume that persists across runs.)  It then starts the node in recovery mode
-// and deletes the data via sys/raw, and finally restarts it in normal mode and
-// makes sure the data has been deleted.
-func TestRecovery_Docker(t *testing.T) {
-	ctx := context.TODO()
-
-	t.Parallel()
-	binary := os.Getenv("VAULT_BINARY")
-	if binary == "" {
-		t.Skip("only running docker test when $VAULT_BINARY present")
-	}
-	opts := &docker.DockerClusterOptions{
-		ImageRepo: "hashicorp/vault",
-		// We're replacing the binary anyway, so we're not too particular about
-		// the docker image version tag.
-		ImageTag:    "latest",
-		VaultBinary: binary,
-		ClusterOptions: testcluster.ClusterOptions{
-			NumCores: 1,
-			VaultNodeConfig: &testcluster.VaultNodeConfig{
-				LogLevel: "TRACE",
-				// If you want the test to run faster locally, you could
-				// uncomment this performance_multiplier change.
-				//StorageOptions: map[string]string{
-				//	"performance_multiplier": "1",
-				//},
-			},
-		},
-	}
-
-	cluster := docker.NewTestDockerCluster(t, opts)
-	defer cluster.Cleanup()
-
-	var secretUUID string
-	{
-		client := cluster.Nodes()[0].APIClient()
-		if err := client.Sys().Mount("secret/", &api.MountInput{
-			Type: "kv-v1",
-		}); err != nil {
-			t.Fatal(err)
-		}
-
-		fooVal := map[string]interface{}{"bar": 1.0}
-		_, err := client.Logical().Write("secret/foo", fooVal)
-		if err != nil {
-			t.Fatal(err)
-		}
-		secret, err := client.Logical().List("secret/")
-		if err != nil {
-			t.Fatal(err)
-		}
-		if diff := deep.Equal(secret.Data["keys"], []interface{}{"foo"}); len(diff) > 0 {
-			t.Fatalf("got=%v, want=%v, diff: %v", secret.Data["keys"], []string{"foo"}, diff)
-		}
-		mounts, err := client.Sys().ListMounts()
-		if err != nil {
-			t.Fatal(err)
-		}
-		secretMount := mounts["secret/"]
-		if secretMount == nil {
-			t.Fatalf("secret mount not found, mounts: %v", mounts)
-		}
-		secretUUID = secretMount.UUID
-	}
-
-	listSecrets := func() []string {
-		client := cluster.Nodes()[0].APIClient()
-		secret, err := client.Logical().List("secret/")
-		if err != nil {
-			t.Fatal(err)
-		}
-		if secret == nil {
-			return nil
-		}
-		var result []string
-		err = mapstructure.Decode(secret.Data["keys"], &result)
-		return result
-	}
-
-	restart := func() {
-		cluster.Nodes()[0].(*docker.DockerClusterNode).Stop()
-
-		err := cluster.Nodes()[0].(*docker.DockerClusterNode).Start(ctx, opts)
-		if err != nil {
-			t.Fatalf("node restart post-recovery failed: %v", err)
-		}
-
-		err = testcluster.UnsealAllNodes(ctx, cluster)
-		if err != nil {
-			t.Fatalf("node unseal post-recovery failed: %v", err)
-		}
-
-		_, err = testcluster.WaitForActiveNode(ctx, cluster)
-		if err != nil {
-			t.Fatalf("node didn't become active: %v", err)
-		}
-	}
-
-	restart()
-	if len(listSecrets()) == 0 {
-		t.Fatal("expected secret to still be there")
-	}
-
-	// Now bring it up in recovery mode.
-	{
-		cluster.Nodes()[0].(*docker.DockerClusterNode).Stop()
-
-		newOpts := *opts
-		opts := &newOpts
-		opts.Args = []string{"-recovery"}
-		opts.StartProbe = func(client *api.Client) error {
-			// In recovery mode almost no paths are supported, and pretty much
-			// the only ones that don't require a recovery token are the ones used
-			// to generate a recovery token.
-			_, err := client.Sys().GenerateRecoveryOperationTokenStatusWithContext(ctx)
-			return err
-		}
-		err := cluster.Nodes()[0].(*docker.DockerClusterNode).Start(ctx, opts)
-		if err != nil {
-			t.Fatalf("node restart with -recovery failed: %v", err)
-		}
-		client := cluster.Nodes()[0].APIClient()
-
-		recoveryToken, err := testcluster.GenerateRoot(cluster, testcluster.GenerateRecovery)
-		if err != nil {
-			t.Fatalf("recovery token generation failed: %v", err)
-		}
-		_, err = testcluster.GenerateRoot(cluster, testcluster.GenerateRecovery)
-		if err == nil {
-			t.Fatal("expected second generate-root to fail")
-		}
-		client.SetToken(recoveryToken)
-
-		secret, err := client.Logical().List(path.Join("sys/raw/logical", secretUUID))
-		if err != nil {
-			t.Fatal(err)
-		}
-		if diff := deep.Equal(secret.Data["keys"], []interface{}{"foo"}); len(diff) > 0 {
-			t.Fatalf("got=%v, want=%v, diff: %v", secret.Data, []string{"foo"}, diff)
-		}
-
-		_, err = client.Logical().Delete(path.Join("sys/raw/logical", secretUUID, "foo"))
-		if err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	// Now go back to regular mode and verify that our changes are present
-	restart()
-	if len(listSecrets()) != 0 {
-		t.Fatal("expected secret to still be gone")
-	}
-}
diff --git a/vault/external_tests/misc/recover_from_panic_test.go b/vault/external_tests/misc/recover_from_panic_test.go
index ae3b82cb948e8..403b589e29740 100644
--- a/vault/external_tests/misc/recover_from_panic_test.go
+++ b/vault/external_tests/misc/recover_from_panic_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package misc
 
 import (
diff --git a/vault/external_tests/misc/recovery_test.go b/vault/external_tests/misc/recovery_test.go
index 8aaa6df7282d0..f43fff8d125e4 100644
--- a/vault/external_tests/misc/recovery_test.go
+++ b/vault/external_tests/misc/recovery_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package misc
 
 import (
diff --git a/vault/external_tests/plugin/external_plugin_test.go b/vault/external_tests/plugin/external_plugin_test.go
deleted file mode 100644
index cf8a7b9769674..0000000000000
--- a/vault/external_tests/plugin/external_plugin_test.go
+++ /dev/null
@@ -1,1022 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package plugin_test
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"os"
-	"path/filepath"
-	"testing"
-	"time"
-
-	"github.com/hashicorp/vault/audit"
-	auditFile "github.com/hashicorp/vault/builtin/audit/file"
-
-	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/api/auth/approle"
-	"github.com/hashicorp/vault/builtin/logical/database"
-	"github.com/hashicorp/vault/helper/namespace"
-	"github.com/hashicorp/vault/helper/testhelpers/consul"
-	"github.com/hashicorp/vault/helper/testhelpers/corehelpers"
-	"github.com/hashicorp/vault/helper/testhelpers/pluginhelpers"
-	postgreshelper "github.com/hashicorp/vault/helper/testhelpers/postgresql"
-	vaulthttp "github.com/hashicorp/vault/http"
-	"github.com/hashicorp/vault/sdk/helper/consts"
-	"github.com/hashicorp/vault/sdk/logical"
-	"github.com/hashicorp/vault/vault"
-
-	_ "github.com/jackc/pgx/v4/stdlib"
-)
-
-func getClusterWithFileAuditBackend(t *testing.T, typ consts.PluginType, numCores int) *vault.TestCluster {
-	pluginDir, cleanup := corehelpers.MakeTestPluginDir(t)
-	t.Cleanup(func() { cleanup(t) })
-	coreConfig := &vault.CoreConfig{
-		PluginDirectory: pluginDir,
-		LogicalBackends: map[string]logical.Factory{
-			"database": database.Factory,
-		},
-		AuditBackends: map[string]audit.Factory{
-			"file": auditFile.Factory,
-		},
-	}
-
-	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
-		TempDir:  pluginDir,
-		NumCores: numCores,
-		Plugins: &vault.TestPluginConfig{
-			Typ:      typ,
-			Versions: []string{""},
-		},
-		HandlerFunc: vaulthttp.Handler,
-	})
-
-	cluster.Start()
-	vault.TestWaitActive(t, cluster.Cores[0].Core)
-
-	return cluster
-}
-
-func getCluster(t *testing.T, typ consts.PluginType, numCores int) *vault.TestCluster {
-	pluginDir, cleanup := corehelpers.MakeTestPluginDir(t)
-	t.Cleanup(func() { cleanup(t) })
-	coreConfig := &vault.CoreConfig{
-		PluginDirectory: pluginDir,
-		LogicalBackends: map[string]logical.Factory{
-			"database": database.Factory,
-		},
-	}
-
-	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
-		TempDir:  pluginDir,
-		NumCores: numCores,
-		Plugins: &vault.TestPluginConfig{
-			Typ:      typ,
-			Versions: []string{""},
-		},
-		HandlerFunc: vaulthttp.Handler,
-	})
-
-	cluster.Start()
-	vault.TestWaitActive(t, cluster.Cores[0].Core)
-
-	return cluster
-}
-
-// TestExternalPlugin_RollbackAndReload ensures that we can successfully
-// rollback and reload a plugin without triggering race conditions by the go
-// race detector
-func TestExternalPlugin_RollbackAndReload(t *testing.T) {
-	pluginDir, cleanup := corehelpers.MakeTestPluginDir(t)
-	t.Cleanup(func() { cleanup(t) })
-	coreConfig := &vault.CoreConfig{
-		// set rollback period to a short interval to make conditions more "racy"
-		RollbackPeriod:  1 * time.Second,
-		PluginDirectory: pluginDir,
-	}
-
-	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
-		TempDir:  pluginDir,
-		NumCores: 1,
-		Plugins: &vault.TestPluginConfig{
-			Typ:      consts.PluginTypeSecrets,
-			Versions: []string{""},
-		},
-		HandlerFunc: vaulthttp.Handler,
-	})
-
-	cluster.Start()
-	vault.TestWaitActive(t, cluster.Cores[0].Core)
-
-	core := cluster.Cores[0]
-	plugin := cluster.Plugins[0]
-	client := core.Client
-	client.SetToken(cluster.RootToken)
-
-	testRegisterAndEnable(t, client, plugin)
-	if _, err := client.Sys().ReloadPlugin(&api.ReloadPluginInput{
-		Plugin: plugin.Name,
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func testRegisterAndEnable(t *testing.T, client *api.Client, plugin pluginhelpers.TestPlugin) {
-	t.Helper()
-	if err := client.Sys().RegisterPlugin(&api.RegisterPluginInput{
-		Name:    plugin.Name,
-		Type:    api.PluginType(plugin.Typ),
-		Command: plugin.Name,
-		SHA256:  plugin.Sha256,
-		Version: plugin.Version,
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	switch plugin.Typ {
-	case consts.PluginTypeSecrets:
-		if err := client.Sys().Mount(plugin.Name, &api.MountInput{
-			Type: plugin.Name,
-		}); err != nil {
-			t.Fatal(err)
-		}
-	case consts.PluginTypeCredential:
-		if err := client.Sys().EnableAuthWithOptions(plugin.Name, &api.EnableAuthOptions{
-			Type: plugin.Name,
-		}); err != nil {
-			t.Fatal(err)
-		}
-	}
-}
-
-// TestExternalPlugin_ContinueOnError tests that vault can recover from a
-// sha256 mismatch or missing plugin binary scenario
-func TestExternalPlugin_ContinueOnError(t *testing.T) {
-	t.Run("secret", func(t *testing.T) {
-		t.Parallel()
-		t.Run("sha256_mismatch", func(t *testing.T) {
-			t.Parallel()
-			testExternalPlugin_ContinueOnError(t, true, consts.PluginTypeSecrets)
-		})
-
-		t.Run("missing_plugin", func(t *testing.T) {
-			t.Parallel()
-			testExternalPlugin_ContinueOnError(t, false, consts.PluginTypeSecrets)
-		})
-	})
-
-	t.Run("auth", func(t *testing.T) {
-		t.Parallel()
-		t.Run("sha256_mismatch", func(t *testing.T) {
-			t.Parallel()
-			testExternalPlugin_ContinueOnError(t, true, consts.PluginTypeCredential)
-		})
-
-		t.Run("missing_plugin", func(t *testing.T) {
-			t.Parallel()
-			testExternalPlugin_ContinueOnError(t, false, consts.PluginTypeCredential)
-		})
-	})
-}
-
-func testExternalPlugin_ContinueOnError(t *testing.T, mismatch bool, pluginType consts.PluginType) {
-	cluster := getCluster(t, pluginType, 1)
-	defer cluster.Cleanup()
-
-	core := cluster.Cores[0]
-	plugin := cluster.Plugins[0]
-	client := core.Client
-	client.SetToken(cluster.RootToken)
-
-	testRegisterAndEnable(t, client, plugin)
-	pluginPath := fmt.Sprintf("sys/plugins/catalog/%s/%s", pluginType, plugin.Name)
-	// Get the registered plugin
-	req := logical.TestRequest(t, logical.ReadOperation, pluginPath)
-	req.ClientToken = core.Client.Token()
-	resp, err := core.HandleRequest(namespace.RootContext(testCtx), req)
-	if err != nil || resp == nil || (resp != nil && resp.IsError()) {
-		t.Fatalf("err:%v resp:%#v", err, resp)
-	}
-
-	command, ok := resp.Data["command"].(string)
-	if !ok || command == "" {
-		t.Fatal("invalid command")
-	}
-
-	// Trigger a sha256 mismatch or missing plugin error
-	if mismatch {
-		req = logical.TestRequest(t, logical.UpdateOperation, pluginPath)
-		req.Data = map[string]interface{}{
-			"sha256":  "d17bd7334758e53e6fbab15745d2520765c06e296f2ce8e25b7919effa0ac216",
-			"command": filepath.Base(command),
-		}
-		req.ClientToken = core.Client.Token()
-		resp, err = core.HandleRequest(namespace.RootContext(testCtx), req)
-		if err != nil || (resp != nil && resp.IsError()) {
-			t.Fatalf("err:%v resp:%#v", err, resp)
-		}
-	} else {
-		err := os.Remove(filepath.Join(cluster.TempDir, filepath.Base(command)))
-		if err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	// Seal the cluster
-	cluster.EnsureCoresSealed(t)
-
-	// Unseal the cluster
-	barrierKeys := cluster.BarrierKeys
-	for _, core := range cluster.Cores {
-		for _, key := range barrierKeys {
-			_, err := core.Unseal(vault.TestKeyCopy(key))
-			if err != nil {
-				t.Fatal(err)
-			}
-		}
-		if core.Sealed() {
-			t.Fatal("should not be sealed")
-		}
-	}
-
-	// Wait for active so post-unseal takes place
-	// If it fails, it means unseal process failed
-	vault.TestWaitActive(t, core.Core)
-
-	// unmount
-	switch pluginType {
-	case consts.PluginTypeSecrets:
-		if err := client.Sys().Unmount(plugin.Name); err != nil {
-			t.Fatal(err)
-		}
-	case consts.PluginTypeCredential:
-		if err := client.Sys().DisableAuth(plugin.Name); err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	// Re-compile plugin
-	var plugins []pluginhelpers.TestPlugin
-	plugins = append(plugins, pluginhelpers.CompilePlugin(t, pluginType, "", core.CoreConfig.PluginDirectory))
-	cluster.Plugins = plugins
-
-	// Re-add the plugin to the catalog
-	testRegisterAndEnable(t, client, plugin)
-
-	// Reload the plugin
-	req = logical.TestRequest(t, logical.UpdateOperation, "sys/plugins/reload/backend")
-	req.Data = map[string]interface{}{
-		"plugin": plugin.Name,
-	}
-	req.ClientToken = core.Client.Token()
-	resp, err = core.HandleRequest(namespace.RootContext(testCtx), req)
-	if err != nil || (resp != nil && resp.IsError()) {
-		t.Fatalf("err:%v resp:%#v", err, resp)
-	}
-
-	req = logical.TestRequest(t, logical.ReadOperation, pluginPath)
-	req.ClientToken = core.Client.Token()
-	resp, err = core.HandleRequest(namespace.RootContext(testCtx), req)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	if resp == nil {
-		t.Fatalf("bad: response should not be nil")
-	}
-}
-
-// TestExternalPlugin_AuthMethod tests that we can build, register and use an
-// external auth method
-func TestExternalPlugin_AuthMethod(t *testing.T) {
-	cluster := getCluster(t, consts.PluginTypeCredential, 5)
-	defer cluster.Cleanup()
-
-	plugin := cluster.Plugins[0]
-	client := cluster.Cores[0].Client
-	client.SetToken(cluster.RootToken)
-
-	// Register
-	if err := client.Sys().RegisterPlugin(&api.RegisterPluginInput{
-		Name:    plugin.Name,
-		Type:    api.PluginType(plugin.Typ),
-		Command: plugin.Name,
-		SHA256:  plugin.Sha256,
-		Version: plugin.Version,
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	// define a group of parallel tests so we wait for their execution before
-	// continuing on to cleanup
-	// see: https://go.dev/blog/subtests
-	t.Run("parallel execution group", func(t *testing.T) {
-		// loop to mount 5 auth methods that will each share a single
-		// plugin process
-		for i := 0; i < 5; i++ {
-			i := i
-			pluginPath := fmt.Sprintf("%s-%d", plugin.Name, i)
-			client := cluster.Cores[i].Client
-			t.Run(pluginPath, func(t *testing.T) {
-				t.Parallel()
-				client.SetToken(cluster.RootToken)
-				// Enable
-				if err := client.Sys().EnableAuthWithOptions(pluginPath, &api.EnableAuthOptions{
-					Type: plugin.Name,
-				}); err != nil {
-					t.Fatal(err)
-				}
-
-				// Configure
-				_, err := client.Logical().Write("auth/"+pluginPath+"/role/role1", map[string]interface{}{
-					"bind_secret_id": "true",
-					"period":         "300",
-				})
-				if err != nil {
-					t.Fatal(err)
-				}
-
-				secret, err := client.Logical().Write("auth/"+pluginPath+"/role/role1/secret-id", nil)
-				if err != nil {
-					t.Fatal(err)
-				}
-				secretID := secret.Data["secret_id"].(string)
-
-				secret, err = client.Logical().Read("auth/" + pluginPath + "/role/role1/role-id")
-				if err != nil {
-					t.Fatal(err)
-				}
-				roleID := secret.Data["role_id"].(string)
-
-				// Login - expect SUCCESS
-				authMethod, err := approle.NewAppRoleAuth(
-					roleID,
-					&approle.SecretID{FromString: secretID},
-					approle.WithMountPath(pluginPath),
-				)
-				if err != nil {
-					t.Fatal(err)
-				}
-				_, err = client.Auth().Login(context.Background(), authMethod)
-				if err != nil {
-					t.Fatal(err)
-				}
-
-				// Renew
-				resp, err := client.Auth().Token().RenewSelf(30)
-				if err != nil {
-					t.Fatal(err)
-				}
-
-				// Login - expect SUCCESS
-				resp, err = client.Auth().Login(context.Background(), authMethod)
-				if err != nil {
-					t.Fatal(err)
-				}
-
-				revokeToken := resp.Auth.ClientToken
-				// Revoke
-				if err = client.Auth().Token().RevokeSelf(revokeToken); err != nil {
-					t.Fatal(err)
-				}
-
-				// Reset root token
-				client.SetToken(cluster.RootToken)
-
-				// Lookup - expect FAILURE
-				resp, err = client.Auth().Token().Lookup(revokeToken)
-				if err == nil {
-					t.Fatalf("expected error, got nil")
-				}
-
-				// Reset root token
-				client.SetToken(cluster.RootToken)
-			})
-		}
-	})
-
-	// Deregister
-	if err := client.Sys().DeregisterPlugin(&api.DeregisterPluginInput{
-		Name:    plugin.Name,
-		Type:    api.PluginType(plugin.Typ),
-		Version: plugin.Version,
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// TestExternalPlugin_AuthMethodReload tests that we can use an external auth
-// method after reload
-func TestExternalPlugin_AuthMethodReload(t *testing.T) {
-	cluster := getCluster(t, consts.PluginTypeCredential, 1)
-	defer cluster.Cleanup()
-
-	plugin := cluster.Plugins[0]
-	client := cluster.Cores[0].Client
-	client.SetToken(cluster.RootToken)
-
-	testRegisterAndEnable(t, client, plugin)
-
-	// Configure
-	_, err := client.Logical().Write("auth/"+plugin.Name+"/role/role1", map[string]interface{}{
-		"bind_secret_id": "true",
-		"period":         "300",
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	secret, err := client.Logical().Write("auth/"+plugin.Name+"/role/role1/secret-id", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	secretID := secret.Data["secret_id"].(string)
-
-	secret, err = client.Logical().Read("auth/" + plugin.Name + "/role/role1/role-id")
-	if err != nil {
-		t.Fatal(err)
-	}
-	roleID := secret.Data["role_id"].(string)
-
-	// Login - expect SUCCESS
-	authMethod, err := approle.NewAppRoleAuth(
-		roleID,
-		&approle.SecretID{FromString: secretID},
-		approle.WithMountPath(plugin.Name),
-	)
-	if err != nil {
-		t.Fatal(err)
-	}
-	_, err = client.Auth().Login(context.Background(), authMethod)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Reset root token
-	client.SetToken(cluster.RootToken)
-
-	// Reload plugin
-	if _, err := client.Sys().ReloadPlugin(&api.ReloadPluginInput{
-		Plugin: plugin.Name,
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = client.Auth().Login(context.Background(), authMethod)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Reset root token
-	client.SetToken(cluster.RootToken)
-
-	// Deregister
-	if err := client.Sys().DeregisterPlugin(&api.DeregisterPluginInput{
-		Name:    plugin.Name,
-		Type:    api.PluginType(plugin.Typ),
-		Version: plugin.Version,
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// TestExternalPlugin_SecretsEngine tests that we can build, register and use an
-// external secrets engine
-func TestExternalPlugin_SecretsEngine(t *testing.T) {
-	cluster := getCluster(t, consts.PluginTypeSecrets, 1)
-	defer cluster.Cleanup()
-
-	plugin := cluster.Plugins[0]
-	client := cluster.Cores[0].Client
-	client.SetToken(cluster.RootToken)
-
-	// Register
-	if err := client.Sys().RegisterPlugin(&api.RegisterPluginInput{
-		Name:    plugin.Name,
-		Type:    api.PluginType(plugin.Typ),
-		Command: plugin.Name,
-		SHA256:  plugin.Sha256,
-		Version: plugin.Version,
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	// define a group of parallel tests so we wait for their execution before
-	// continuing on to cleanup
-	// see: https://go.dev/blog/subtests
-	t.Run("parallel execution group", func(t *testing.T) {
-		// loop to mount 5 secrets engines that will each share a single
-		// plugin process
-		for i := 0; i < 5; i++ {
-			pluginPath := fmt.Sprintf("%s-%d", plugin.Name, i)
-			t.Run(pluginPath, func(t *testing.T) {
-				t.Parallel()
-				// Enable
-				if err := client.Sys().Mount(pluginPath, &api.MountInput{
-					Type: plugin.Name,
-				}); err != nil {
-					t.Fatal(err)
-				}
-
-				// Configure
-				cleanupConsul, consulConfig := consul.PrepareTestContainer(t, "", false, true)
-				defer cleanupConsul()
-
-				_, err := client.Logical().Write(pluginPath+"/config/access", map[string]interface{}{
-					"address": consulConfig.Address(),
-					"token":   consulConfig.Token,
-				})
-				if err != nil {
-					t.Fatal(err)
-				}
-
-				_, err = client.Logical().Write(pluginPath+"/roles/test", map[string]interface{}{
-					"consul_policies": []string{"test"},
-					"ttl":             "6h",
-					"local":           false,
-				})
-				if err != nil {
-					t.Fatal(err)
-				}
-
-				resp, err := client.Logical().Read(pluginPath + "/creds/test")
-				if err != nil {
-					t.Fatal(err)
-				}
-				if resp == nil {
-					t.Fatal("read creds response is nil")
-				}
-			})
-		}
-	})
-
-	// Deregister
-	if err := client.Sys().DeregisterPlugin(&api.DeregisterPluginInput{
-		Name:    plugin.Name,
-		Type:    api.PluginType(plugin.Typ),
-		Version: plugin.Version,
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// TestExternalPlugin_SecretsEngineReload tests that we can use an external
-// secrets engine after reload
-func TestExternalPlugin_SecretsEngineReload(t *testing.T) {
-	cluster := getCluster(t, consts.PluginTypeSecrets, 1)
-	defer cluster.Cleanup()
-
-	plugin := cluster.Plugins[0]
-	client := cluster.Cores[0].Client
-	client.SetToken(cluster.RootToken)
-
-	testRegisterAndEnable(t, client, plugin)
-
-	// Configure
-	cleanupConsul, consulConfig := consul.PrepareTestContainer(t, "", false, true)
-	defer cleanupConsul()
-
-	_, err := client.Logical().Write(plugin.Name+"/config/access", map[string]interface{}{
-		"address": consulConfig.Address(),
-		"token":   consulConfig.Token,
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = client.Logical().Write(plugin.Name+"/roles/test", map[string]interface{}{
-		"consul_policies": []string{"test"},
-		"ttl":             "6h",
-		"local":           false,
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	resp, err := client.Logical().Read(plugin.Name + "/creds/test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if resp == nil {
-		t.Fatal("read creds response is nil")
-	}
-
-	// Reload plugin
-	if _, err := client.Sys().ReloadPlugin(&api.ReloadPluginInput{
-		Plugin: plugin.Name,
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	resp, err = client.Logical().Read(plugin.Name + "/creds/test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if resp == nil {
-		t.Fatal("read creds response is nil")
-	}
-
-	// Deregister
-	if err := client.Sys().DeregisterPlugin(&api.DeregisterPluginInput{
-		Name:    plugin.Name,
-		Type:    api.PluginType(plugin.Typ),
-		Version: plugin.Version,
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// TestExternalPlugin_Database tests that we can build, register and use an
-// external database secrets engine
-func TestExternalPlugin_Database(t *testing.T) {
-	cluster := getCluster(t, consts.PluginTypeDatabase, 1)
-	defer cluster.Cleanup()
-
-	plugin := cluster.Plugins[0]
-	client := cluster.Cores[0].Client
-	client.SetToken(cluster.RootToken)
-
-	// Register
-	if err := client.Sys().RegisterPlugin(&api.RegisterPluginInput{
-		Name:    plugin.Name,
-		Type:    api.PluginType(consts.PluginTypeDatabase),
-		Command: plugin.Name,
-		SHA256:  plugin.Sha256,
-		Version: plugin.Version,
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	// Enable
-	if err := client.Sys().Mount(consts.PluginTypeDatabase.String(), &api.MountInput{
-		Type: consts.PluginTypeDatabase.String(),
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	// define a group of parallel tests so we wait for their execution before
-	// continuing on to cleanup
-	// see: https://go.dev/blog/subtests
-	t.Run("parallel execution group", func(t *testing.T) {
-		// loop to mount 5 database connections that will each share a single
-		// plugin process
-		for i := 0; i < 5; i++ {
-			dbName := fmt.Sprintf("%s-%d", plugin.Name, i)
-			t.Run(dbName, func(t *testing.T) {
-				t.Parallel()
-				roleName := "test-role-" + dbName
-
-				cleanupContainer, connURL := postgreshelper.PrepareTestContainerWithVaultUser(t, context.Background(), "13.4-buster")
-				defer cleanupContainer()
-
-				_, err := client.Logical().Write("database/config/"+dbName, map[string]interface{}{
-					"connection_url": connURL,
-					"plugin_name":    plugin.Name,
-					"allowed_roles":  []string{roleName},
-					"username":       "vaultadmin",
-					"password":       "vaultpass",
-				})
-				if err != nil {
-					t.Fatal(err)
-				}
-
-				_, err = client.Logical().Write("database/rotate-root/"+dbName, map[string]interface{}{})
-				if err != nil {
-					t.Fatal(err)
-				}
-
-				_, err = client.Logical().Write("database/roles/"+roleName, map[string]interface{}{
-					"db_name":             dbName,
-					"creation_statements": testRole,
-					"max_ttl":             "10m",
-				})
-				if err != nil {
-					t.Fatal(err)
-				}
-
-				// Generate credentials
-				resp, err := client.Logical().Read("database/creds/" + roleName)
-				if err != nil {
-					t.Fatal(err)
-				}
-				if resp == nil {
-					t.Fatal("read creds response is nil")
-				}
-
-				_, err = client.Logical().Write("database/reset/"+dbName, map[string]interface{}{})
-				if err != nil {
-					t.Fatal(err)
-				}
-
-				// Generate credentials
-				resp, err = client.Logical().Read("database/creds/" + roleName)
-				if err != nil {
-					t.Fatal(err)
-				}
-				if resp == nil {
-					t.Fatal("read creds response is nil")
-				}
-
-				resp, err = client.Logical().Read("database/creds/" + roleName)
-				if err != nil {
-					t.Fatal(err)
-				}
-				if resp == nil {
-					t.Fatal("read creds response is nil")
-				}
-
-				revokeLease := resp.LeaseID
-				// Lookup - expect SUCCESS
-				resp, err = client.Sys().Lookup(revokeLease)
-				if err != nil {
-					t.Fatal(err)
-				}
-				if resp == nil {
-					t.Fatalf("lease lookup response is nil")
-				}
-
-				// Revoke
-				if err = client.Sys().Revoke(revokeLease); err != nil {
-					t.Fatal(err)
-				}
-
-				// Reset root token
-				client.SetToken(cluster.RootToken)
-
-				// Lookup - expect FAILURE
-				resp, err = client.Sys().Lookup(revokeLease)
-				if err == nil {
-					t.Fatalf("expected error, got nil")
-				}
-			})
-		}
-	})
-
-	// Deregister
-	if err := client.Sys().DeregisterPlugin(&api.DeregisterPluginInput{
-		Name:    plugin.Name,
-		Type:    api.PluginType(plugin.Typ),
-		Version: plugin.Version,
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// TestExternalPlugin_DatabaseReload tests that we can use an external database
-// secrets engine after reload
-func TestExternalPlugin_DatabaseReload(t *testing.T) {
-	cluster := getCluster(t, consts.PluginTypeDatabase, 1)
-	defer cluster.Cleanup()
-
-	plugin := cluster.Plugins[0]
-	client := cluster.Cores[0].Client
-	client.SetToken(cluster.RootToken)
-
-	// Register
-	if err := client.Sys().RegisterPlugin(&api.RegisterPluginInput{
-		Name:    plugin.Name,
-		Type:    api.PluginType(consts.PluginTypeDatabase),
-		Command: plugin.Name,
-		SHA256:  plugin.Sha256,
-		Version: plugin.Version,
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	// Enable
-	if err := client.Sys().Mount(consts.PluginTypeDatabase.String(), &api.MountInput{
-		Type: consts.PluginTypeDatabase.String(),
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	dbName := fmt.Sprintf("%s-%d", plugin.Name, 0)
-	roleName := "test-role-" + dbName
-
-	cleanupContainer, connURL := postgreshelper.PrepareTestContainerWithVaultUser(t, context.Background(), "13.4-buster")
-	defer cleanupContainer()
-
-	_, err := client.Logical().Write("database/config/"+dbName, map[string]interface{}{
-		"connection_url": connURL,
-		"plugin_name":    plugin.Name,
-		"allowed_roles":  []string{roleName},
-		"username":       "vaultadmin",
-		"password":       "vaultpass",
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = client.Logical().Write("database/roles/"+roleName, map[string]interface{}{
-		"db_name":             dbName,
-		"creation_statements": testRole,
-		"max_ttl":             "10m",
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	resp, err := client.Logical().Read("database/creds/" + roleName)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if resp == nil {
-		t.Fatal("read creds response is nil")
-	}
-
-	// Reload plugin
-	if _, err := client.Sys().ReloadPlugin(&api.ReloadPluginInput{
-		Plugin: plugin.Name,
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	// Generate credentials after reload
-	resp, err = client.Logical().Read("database/creds/" + roleName)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if resp == nil {
-		t.Fatal("read creds response is nil")
-	}
-
-	// Deregister
-	if err := client.Sys().DeregisterPlugin(&api.DeregisterPluginInput{
-		Name:    plugin.Name,
-		Type:    api.PluginType(plugin.Typ),
-		Version: plugin.Version,
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-const testRole = `
-CREATE ROLE "{{name}}" WITH
-  LOGIN
-  PASSWORD '{{password}}'
-  VALID UNTIL '{{expiration}}';
-GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO "{{name}}";
-`
-
-func testExternalPluginMetadataAuditLog(t *testing.T, log map[string]interface{}, expectedMountClass string) {
-	if mountClass, ok := log["mount_class"].(string); !ok {
-		t.Fatalf("mount_class should be a string, not %T", log["mount_class"])
-	} else if mountClass != expectedMountClass {
-		t.Fatalf("bad: mount_class should be %s, not %s", expectedMountClass, mountClass)
-	}
-
-	if mountIsExternalPlugin, ok := log["mount_is_external_plugin"].(bool); !ok {
-		t.Fatalf("mount_is_external_plugin should be a bool, not %T", log["mount_is_external_plugin"])
-	} else if !mountIsExternalPlugin {
-		t.Fatalf("bad: mount_is_external_plugin should be true, not %t", mountIsExternalPlugin)
-	}
-
-	if _, ok := log["mount_running_sha256"].(string); !ok {
-		t.Fatalf("mount_running_sha256 should be a string, not %T", log["mount_running_sha256"])
-	}
-}
-
-// TestExternalPlugin_AuditEnabled_ShouldLogPluginMetadata_Auth tests that we have plugin metadata of an auth plugin
-// in audit log when it is enabled
-func TestExternalPlugin_AuditEnabled_ShouldLogPluginMetadata_Auth(t *testing.T) {
-	cluster := getClusterWithFileAuditBackend(t, consts.PluginTypeCredential, 1)
-	defer cluster.Cleanup()
-
-	plugin := cluster.Plugins[0]
-	client := cluster.Cores[0].Client
-	client.SetToken(cluster.RootToken)
-
-	testRegisterAndEnable(t, client, plugin)
-
-	// Enable the audit backend
-	tempDir := t.TempDir()
-	auditLogFile, err := os.CreateTemp(tempDir, "")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = client.Sys().EnableAuditWithOptions("file", &api.EnableAuditOptions{
-		Type: "file",
-		Options: map[string]string{
-			"file_path": auditLogFile.Name(),
-		},
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = client.Logical().Write("auth/"+plugin.Name+"/role/role1", map[string]interface{}{
-		"bind_secret_id": "true",
-		"period":         "300",
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Check the audit trail on request and response
-	decoder := json.NewDecoder(auditLogFile)
-	var auditRecord map[string]interface{}
-	for decoder.Decode(&auditRecord) == nil {
-		auditRequest := map[string]interface{}{}
-		if req, ok := auditRecord["request"]; ok {
-			auditRequest = req.(map[string]interface{})
-			if auditRequest["path"] != "auth/"+plugin.Name+"/role/role1" {
-				continue
-			}
-		}
-		testExternalPluginMetadataAuditLog(t, auditRequest, consts.PluginTypeCredential.String())
-
-		auditResponse := map[string]interface{}{}
-		if req, ok := auditRecord["response"]; ok {
-			auditRequest = req.(map[string]interface{})
-			if auditResponse["path"] != "auth/"+plugin.Name+"/role/role1" {
-				continue
-			}
-		}
-		testExternalPluginMetadataAuditLog(t, auditResponse, consts.PluginTypeCredential.String())
-	}
-
-	// Deregister
-	if err := client.Sys().DeregisterPlugin(&api.DeregisterPluginInput{
-		Name:    plugin.Name,
-		Type:    api.PluginType(plugin.Typ),
-		Version: plugin.Version,
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// TestExternalPlugin_AuditEnabled_ShouldLogPluginMetadata_Secret tests that we have plugin metadata of a secret plugin
-// in audit log when it is enabled
-func TestExternalPlugin_AuditEnabled_ShouldLogPluginMetadata_Secret(t *testing.T) {
-	cluster := getClusterWithFileAuditBackend(t, consts.PluginTypeSecrets, 1)
-	defer cluster.Cleanup()
-
-	plugin := cluster.Plugins[0]
-	client := cluster.Cores[0].Client
-	client.SetToken(cluster.RootToken)
-
-	testRegisterAndEnable(t, client, plugin)
-
-	// Enable the audit backend
-	tempDir := t.TempDir()
-	auditLogFile, err := os.CreateTemp(tempDir, "")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = client.Sys().EnableAuditWithOptions("file", &api.EnableAuditOptions{
-		Type: "file",
-		Options: map[string]string{
-			"file_path": auditLogFile.Name(),
-		},
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Configure
-	cleanupConsul, consulConfig := consul.PrepareTestContainer(t, "", false, true)
-	defer cleanupConsul()
-	_, err = client.Logical().Write(plugin.Name+"/config/access", map[string]interface{}{
-		"address": consulConfig.Address(),
-		"token":   consulConfig.Token,
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Check the audit trail on request and response
-	decoder := json.NewDecoder(auditLogFile)
-	var auditRecord map[string]interface{}
-	for decoder.Decode(&auditRecord) == nil {
-		auditRequest := map[string]interface{}{}
-		if req, ok := auditRecord["request"]; ok {
-			auditRequest = req.(map[string]interface{})
-			if auditRequest["path"] != plugin.Name+"/config/access" {
-				continue
-			}
-		}
-		testExternalPluginMetadataAuditLog(t, auditRequest, consts.PluginTypeSecrets.String())
-
-		auditResponse := map[string]interface{}{}
-		if req, ok := auditRecord["response"]; ok {
-			auditRequest = req.(map[string]interface{})
-			if auditResponse["path"] != plugin.Name+"/config/access" {
-				continue
-			}
-		}
-		testExternalPluginMetadataAuditLog(t, auditResponse, consts.PluginTypeSecrets.String())
-	}
-
-	// Deregister
-	if err := client.Sys().DeregisterPlugin(&api.DeregisterPluginInput{
-		Name:    plugin.Name,
-		Type:    api.PluginType(plugin.Typ),
-		Version: plugin.Version,
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/vault/external_tests/plugin/plugin_test.go b/vault/external_tests/plugin/plugin_test.go
index e9d1f72f84a3c..c0380bf56d621 100644
--- a/vault/external_tests/plugin/plugin_test.go
+++ b/vault/external_tests/plugin/plugin_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package plugin_test
 
 import (
@@ -363,6 +360,166 @@ func testPlugin_CatalogRemoved(t *testing.T, btype logical.BackendType, testMoun
 	}
 }
 
+func TestSystemBackend_Plugin_continueOnError(t *testing.T) {
+	t.Run("secret", func(t *testing.T) {
+		t.Parallel()
+		t.Run("sha256_mismatch", func(t *testing.T) {
+			t.Parallel()
+			testPlugin_continueOnError(t, logical.TypeLogical, true, "mock-plugin", consts.PluginTypeSecrets)
+		})
+
+		t.Run("missing_plugin", func(t *testing.T) {
+			t.Parallel()
+			testPlugin_continueOnError(t, logical.TypeLogical, false, "mock-plugin", consts.PluginTypeSecrets)
+		})
+	})
+
+	t.Run("auth", func(t *testing.T) {
+		t.Parallel()
+		t.Run("sha256_mismatch", func(t *testing.T) {
+			t.Parallel()
+			testPlugin_continueOnError(t, logical.TypeCredential, true, "mock-plugin", consts.PluginTypeCredential)
+		})
+
+		t.Run("missing_plugin", func(t *testing.T) {
+			t.Parallel()
+			testPlugin_continueOnError(t, logical.TypeCredential, false, "mock-plugin", consts.PluginTypeCredential)
+		})
+
+		t.Run("sha256_mismatch", func(t *testing.T) {
+			t.Parallel()
+			testPlugin_continueOnError(t, logical.TypeCredential, true, "oidc", consts.PluginTypeCredential)
+		})
+
+		t.Run("missing_plugin", func(t *testing.T) {
+			t.Parallel()
+			testPlugin_continueOnError(t, logical.TypeCredential, false, "oidc", consts.PluginTypeCredential)
+		})
+	})
+}
+
+func testPlugin_continueOnError(t *testing.T, btype logical.BackendType, mismatch bool, mountPoint string, pluginType consts.PluginType) {
+	testCases := []struct {
+		pluginVersion string
+	}{
+		{
+			pluginVersion: "v5_multiplexed",
+		},
+		{
+			pluginVersion: "v5",
+		},
+		{
+			pluginVersion: "v4",
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.pluginVersion, func(t *testing.T) {
+			t.Parallel()
+			cluster := testSystemBackendMock(t, 1, 1, btype, tc.pluginVersion)
+			defer cluster.Cleanup()
+
+			core := cluster.Cores[0]
+
+			// Get the registered plugin
+			req := logical.TestRequest(t, logical.ReadOperation, fmt.Sprintf("sys/plugins/catalog/%s/mock-plugin", pluginType))
+			// We are using the mock backend from vault/sdk/plugin/mock/backend.go which sets the plugin version.
+			req.Data["version"] = "v0.0.0+mock"
+			req.ClientToken = core.Client.Token()
+			resp, err := core.HandleRequest(namespace.RootContext(testCtx), req)
+			if err != nil || resp == nil || (resp != nil && resp.IsError()) {
+				t.Fatalf("err:%v resp:%#v", err, resp)
+			}
+
+			command, ok := resp.Data["command"].(string)
+			if !ok || command == "" {
+				t.Fatal("invalid command")
+			}
+
+			// Trigger a sha256 mismatch or missing plugin error
+			if mismatch {
+				req = logical.TestRequest(t, logical.UpdateOperation, fmt.Sprintf("sys/plugins/catalog/%s/mock-plugin", pluginType))
+				req.Data = map[string]interface{}{
+					"sha256":  "d17bd7334758e53e6fbab15745d2520765c06e296f2ce8e25b7919effa0ac216",
+					"command": filepath.Base(command),
+				}
+				req.ClientToken = core.Client.Token()
+				resp, err = core.HandleRequest(namespace.RootContext(testCtx), req)
+				if err != nil || (resp != nil && resp.IsError()) {
+					t.Fatalf("err:%v resp:%#v", err, resp)
+				}
+			} else {
+				err := os.Remove(filepath.Join(cluster.TempDir, filepath.Base(command)))
+				if err != nil {
+					t.Fatal(err)
+				}
+			}
+
+			// Seal the cluster
+			cluster.EnsureCoresSealed(t)
+
+			// Unseal the cluster
+			barrierKeys := cluster.BarrierKeys
+			for _, core := range cluster.Cores {
+				for _, key := range barrierKeys {
+					_, err := core.Unseal(vault.TestKeyCopy(key))
+					if err != nil {
+						t.Fatal(err)
+					}
+				}
+				if core.Sealed() {
+					t.Fatal("should not be sealed")
+				}
+			}
+
+			// Wait for active so post-unseal takes place
+			// If it fails, it means unseal process failed
+			vault.TestWaitActive(t, core.Core)
+
+			env := []string{pluginutil.PluginCACertPEMEnv + "=" + cluster.CACertPEMFile}
+			// Re-add the plugin to the catalog
+			switch btype {
+			case logical.TypeLogical:
+				plugin := logicalVersionMap[tc.pluginVersion]
+				vault.TestAddTestPlugin(t, core.Core, "mock-plugin", consts.PluginTypeSecrets, "", plugin, env, cluster.TempDir)
+			case logical.TypeCredential:
+				plugin := credentialVersionMap[tc.pluginVersion]
+				vault.TestAddTestPlugin(t, core.Core, "mock-plugin", consts.PluginTypeCredential, "", plugin, env, cluster.TempDir)
+			}
+
+			// Reload the plugin
+			req = logical.TestRequest(t, logical.UpdateOperation, "sys/plugins/reload/backend")
+			req.Data = map[string]interface{}{
+				"plugin": "mock-plugin",
+			}
+			req.ClientToken = core.Client.Token()
+			resp, err = core.HandleRequest(namespace.RootContext(testCtx), req)
+			if err != nil || (resp != nil && resp.IsError()) {
+				t.Fatalf("err:%v resp:%#v", err, resp)
+			}
+
+			// Make a request to lazy load the plugin
+			var reqPath string
+			switch btype {
+			case logical.TypeLogical:
+				reqPath = "mock-0/internal"
+			case logical.TypeCredential:
+				reqPath = "auth/mock-0/internal"
+			}
+
+			req = logical.TestRequest(t, logical.ReadOperation, reqPath)
+			req.ClientToken = core.Client.Token()
+			resp, err = core.HandleRequest(namespace.RootContext(testCtx), req)
+			if err != nil {
+				t.Fatalf("err: %v", err)
+			}
+			if resp == nil {
+				t.Fatalf("bad: response should not be nil")
+			}
+		})
+	}
+}
+
 func TestSystemBackend_Plugin_autoReload(t *testing.T) {
 	t.Parallel()
 	testCases := []struct {
diff --git a/vault/external_tests/policy/acl_templating_test.go b/vault/external_tests/policy/acl_templating_test.go
index b423fbf688ef7..396222363f714 100644
--- a/vault/external_tests/policy/acl_templating_test.go
+++ b/vault/external_tests/policy/acl_templating_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package policy
 
 import (
@@ -8,7 +5,10 @@ import (
 	"testing"
 
 	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/helper/testhelpers/minimal"
+	credUserpass "github.com/hashicorp/vault/builtin/credential/userpass"
+	vaulthttp "github.com/hashicorp/vault/http"
+	"github.com/hashicorp/vault/sdk/logical"
+	"github.com/hashicorp/vault/vault"
 )
 
 func TestPolicyTemplating(t *testing.T) {
@@ -43,7 +43,19 @@ path "secret/{{ identity.groups.names.foobar.name}}/*" {
 }
 `
 
-	cluster := minimal.NewTestSoloCluster(t, nil)
+	coreConfig := &vault.CoreConfig{
+		CredentialBackends: map[string]logical.Factory{
+			"userpass": credUserpass.Factory,
+		},
+	}
+	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+	})
+	cluster.Start()
+	defer cluster.Cleanup()
+
+	core := cluster.Cores[0].Core
+	vault.TestWaitActive(t, core)
 	client := cluster.Cores[0].Client
 
 	resp, err := client.Logical().Write("identity/entity", map[string]interface{}{
diff --git a/vault/external_tests/policy/policy_test.go b/vault/external_tests/policy/policy_test.go
index fea085f6e370c..9e9af07fbf207 100644
--- a/vault/external_tests/policy/policy_test.go
+++ b/vault/external_tests/policy/policy_test.go
@@ -1,14 +1,9 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package policy
 
 import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/vault/helper/testhelpers/minimal"
-
 	"github.com/go-test/deep"
 	"github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/go-secure-stdlib/strutil"
@@ -100,8 +95,27 @@ func TestPolicy_NoDefaultPolicy(t *testing.T) {
 
 func TestPolicy_NoConfiguredPolicy(t *testing.T) {
 	var err error
-	cluster := minimal.NewTestSoloCluster(t, nil)
-	client := cluster.Cores[0].Client
+	coreConfig := &vault.CoreConfig{
+		DisableMlock: true,
+		DisableCache: true,
+		Logger:       hclog.NewNullLogger(),
+		CredentialBackends: map[string]logical.Factory{
+			"ldap": ldap.Factory,
+		},
+	}
+
+	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+	})
+
+	cluster.Start()
+	defer cluster.Cleanup()
+
+	cores := cluster.Cores
+
+	vault.TestWaitActive(t, cores[0].Core)
+
+	client := cores[0].Client
 
 	err = client.Sys().EnableAuthWithOptions("ldap", &api.EnableAuthOptions{
 		Type: "ldap",
diff --git a/vault/external_tests/pprof/pprof.go b/vault/external_tests/pprof/pprof.go
deleted file mode 100644
index 9f13fbcfb95aa..0000000000000
--- a/vault/external_tests/pprof/pprof.go
+++ /dev/null
@@ -1,140 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package pprof
-
-import (
-	"context"
-	"encoding/json"
-	"io/ioutil"
-	"net/http"
-	"testing"
-
-	"github.com/hashicorp/go-cleanhttp"
-	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/sdk/helper/testcluster"
-	"github.com/stretchr/testify/require"
-	"golang.org/x/net/http2"
-)
-
-func SysPprof_Test(t *testing.T, cluster testcluster.VaultCluster) {
-	nodes := cluster.Nodes()
-	client := nodes[0].APIClient()
-
-	transport := cleanhttp.DefaultPooledTransport()
-	transport.TLSClientConfig = nodes[0].TLSConfig()
-	if err := http2.ConfigureTransport(transport); err != nil {
-		t.Fatal(err)
-	}
-	httpClient := &http.Client{
-		Transport: transport,
-	}
-
-	cases := []struct {
-		name    string
-		path    string
-		seconds string
-	}{
-		{
-			"index",
-			"/v1/sys/pprof/",
-			"",
-		},
-		{
-			"cmdline",
-			"/v1/sys/pprof/cmdline",
-			"",
-		},
-		{
-			"goroutine",
-			"/v1/sys/pprof/goroutine",
-			"",
-		},
-		{
-			"heap",
-			"/v1/sys/pprof/heap",
-			"",
-		},
-		{
-			"profile",
-			"/v1/sys/pprof/profile",
-			"1",
-		},
-		{
-			"symbol",
-			"/v1/sys/pprof/symbol",
-			"",
-		},
-		{
-			"trace",
-			"/v1/sys/pprof/trace",
-			"1",
-		},
-	}
-
-	pprofRequest := func(t *testing.T, path string, seconds string) {
-		req := client.NewRequest("GET", path)
-		if seconds != "" {
-			req.Params.Set("seconds", seconds)
-		}
-		httpReq, err := req.ToHTTP()
-		if err != nil {
-			t.Fatal(err)
-		}
-		resp, err := httpClient.Do(httpReq)
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer resp.Body.Close()
-
-		httpRespBody, err := ioutil.ReadAll(resp.Body)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		httpResp := make(map[string]interface{})
-
-		// Skip this error check since some endpoints return binary blobs, we
-		// only care about the ok check right after as an existence check.
-		_ = json.Unmarshal(httpRespBody, &httpResp)
-
-		// Make sure that we don't get a error response
-		if _, ok := httpResp["errors"]; ok {
-			t.Fatalf("unexpected error response: %v", httpResp["errors"])
-		}
-
-		if len(httpRespBody) == 0 {
-			t.Fatal("no pprof index returned")
-		}
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			pprofRequest(t, tc.path, tc.seconds)
-		})
-	}
-}
-
-func SysPprof_Standby_Test(t *testing.T, cluster testcluster.VaultCluster) {
-	pprof := func(client *api.Client) (string, error) {
-		req := client.NewRequest("GET", "/v1/sys/pprof/cmdline")
-		resp, err := client.RawRequestWithContext(context.Background(), req)
-		if err != nil {
-			return "", err
-		}
-		defer resp.Body.Close()
-
-		data, err := ioutil.ReadAll(resp.Body)
-		return string(data), err
-	}
-
-	cmdline, err := pprof(cluster.Nodes()[0].APIClient())
-	require.Nil(t, err)
-	require.NotEmpty(t, cmdline)
-	t.Log(cmdline)
-
-	cmdline, err = pprof(cluster.Nodes()[1].APIClient())
-	require.Nil(t, err)
-	require.NotEmpty(t, cmdline)
-	t.Log(cmdline)
-}
diff --git a/vault/external_tests/pprof/pprof_binary/pprof_test.go b/vault/external_tests/pprof/pprof_binary/pprof_test.go
deleted file mode 100644
index a85f0367a0d3b..0000000000000
--- a/vault/external_tests/pprof/pprof_binary/pprof_test.go
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package pprof_binary
-
-import (
-	"os"
-	"testing"
-
-	"github.com/hashicorp/vault/sdk/helper/testcluster"
-	"github.com/hashicorp/vault/vault/external_tests/pprof"
-)
-
-// TestSysPprof_Exec is the same as TestSysPprof, but using a Vault binary
-// running as -dev instead of a fake single node TestCluster.  There's no
-// particular reason why TestSysPprof was chosen to validate that mechanism,
-// other than that it was fast and simple.
-func TestSysPprof_Exec(t *testing.T) {
-	t.Parallel()
-	binary := os.Getenv("VAULT_BINARY")
-	if binary == "" {
-		t.Skip("only running exec test when $VAULT_BINARY present")
-	}
-	cluster := testcluster.NewTestExecDevCluster(t, &testcluster.ExecDevClusterOptions{
-		ClusterOptions: testcluster.ClusterOptions{
-			NumCores: 1,
-		},
-		BinaryPath:        binary,
-		BaseListenAddress: "127.0.0.1:8208",
-	})
-	defer cluster.Cleanup()
-
-	pprof.SysPprof_Test(t, cluster)
-}
-
-// TestSysPprof_Standby_Exec is the same as TestSysPprof_Standby, but using a Vault binary
-// running as -dev-three-node instead of a fake single node TestCluster.  There's
-// no particular reason why TestSysPprof was chosen to validate that mechanism,
-// other than that it was fast and simple.
-func TestSysPprof_Standby_Exec(t *testing.T) {
-	t.Parallel()
-	binary := os.Getenv("VAULT_BINARY")
-	if binary == "" {
-		t.Skip("only running exec test when $VAULT_BINARY present")
-	}
-	cluster := testcluster.NewTestExecDevCluster(t, &testcluster.ExecDevClusterOptions{
-		ClusterOptions: testcluster.ClusterOptions{
-			VaultNodeConfig: &testcluster.VaultNodeConfig{
-				DisablePerformanceStandby: true,
-			},
-		},
-		BinaryPath:        binary,
-		BaseListenAddress: "127.0.0.1:8210",
-	})
-	defer cluster.Cleanup()
-
-	pprof.SysPprof_Standby_Test(t, cluster)
-}
diff --git a/vault/external_tests/pprof/pprof_test.go b/vault/external_tests/pprof/pprof_test.go
index a66766e1bb3b4..32df691cce564 100644
--- a/vault/external_tests/pprof/pprof_test.go
+++ b/vault/external_tests/pprof/pprof_test.go
@@ -1,9 +1,7 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package pprof
 
 import (
+	"context"
 	"encoding/json"
 	"io/ioutil"
 	"net/http"
@@ -12,29 +10,120 @@ import (
 	"testing"
 
 	"github.com/hashicorp/go-cleanhttp"
+	"github.com/hashicorp/vault/api"
 	vaulthttp "github.com/hashicorp/vault/http"
 	"github.com/hashicorp/vault/internalshared/configutil"
-	"github.com/hashicorp/vault/sdk/helper/testhelpers/schema"
 	"github.com/hashicorp/vault/vault"
+	"github.com/stretchr/testify/require"
 	"golang.org/x/net/http2"
 )
 
 func TestSysPprof(t *testing.T) {
-	t.Parallel()
 	cluster := vault.NewTestCluster(t, nil, &vault.TestClusterOptions{
-		HandlerFunc:             vaulthttp.Handler,
-		RequestResponseCallback: schema.ResponseValidatingCallback(t),
+		HandlerFunc: vaulthttp.Handler,
 	})
 	cluster.Start()
 	defer cluster.Cleanup()
 
 	core := cluster.Cores[0].Core
 	vault.TestWaitActive(t, core)
-	SysPprof_Test(t, cluster)
+	client := cluster.Cores[0].Client
+
+	transport := cleanhttp.DefaultPooledTransport()
+	transport.TLSClientConfig = cluster.Cores[0].TLSConfig.Clone()
+	if err := http2.ConfigureTransport(transport); err != nil {
+		t.Fatal(err)
+	}
+	httpClient := &http.Client{
+		Transport: transport,
+	}
+
+	cases := []struct {
+		name    string
+		path    string
+		seconds string
+	}{
+		{
+			"index",
+			"/v1/sys/pprof/",
+			"",
+		},
+		{
+			"cmdline",
+			"/v1/sys/pprof/cmdline",
+			"",
+		},
+		{
+			"goroutine",
+			"/v1/sys/pprof/goroutine",
+			"",
+		},
+		{
+			"heap",
+			"/v1/sys/pprof/heap",
+			"",
+		},
+		{
+			"profile",
+			"/v1/sys/pprof/profile",
+			"1",
+		},
+		{
+			"symbol",
+			"/v1/sys/pprof/symbol",
+			"",
+		},
+		{
+			"trace",
+			"/v1/sys/pprof/trace",
+			"1",
+		},
+	}
+
+	pprofRequest := func(path string, seconds string) {
+		req := client.NewRequest("GET", path)
+		if seconds != "" {
+			req.Params.Set("seconds", seconds)
+		}
+		httpReq, err := req.ToHTTP()
+		if err != nil {
+			t.Fatal(err)
+		}
+		resp, err := httpClient.Do(httpReq)
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer resp.Body.Close()
+
+		httpRespBody, err := ioutil.ReadAll(resp.Body)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		httpResp := make(map[string]interface{})
+
+		// Skip this error check since some endpoints return binary blobs, we
+		// only care about the ok check right after as an existence check.
+		_ = json.Unmarshal(httpRespBody, &httpResp)
+
+		// Make sure that we don't get a error response
+		if _, ok := httpResp["errors"]; ok {
+			t.Fatalf("unexpected error response: %v", httpResp["errors"])
+		}
+
+		if len(httpRespBody) == 0 {
+			t.Fatal("no pprof index returned")
+		}
+	}
+
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			pprofRequest(tc.path, tc.seconds)
+		})
+	}
 }
 
 func TestSysPprof_MaxRequestDuration(t *testing.T) {
-	t.Parallel()
 	cluster := vault.NewTestCluster(t, nil, &vault.TestClusterOptions{
 		HandlerFunc: vaulthttp.Handler,
 	})
@@ -43,7 +132,7 @@ func TestSysPprof_MaxRequestDuration(t *testing.T) {
 	client := cluster.Cores[0].Client
 
 	transport := cleanhttp.DefaultPooledTransport()
-	transport.TLSClientConfig = cluster.Cores[0].TLSConfig()
+	transport.TLSClientConfig = cluster.Cores[0].TLSConfig.Clone()
 	if err := http2.ConfigureTransport(transport); err != nil {
 		t.Fatal(err)
 	}
@@ -88,7 +177,6 @@ func TestSysPprof_MaxRequestDuration(t *testing.T) {
 }
 
 func TestSysPprof_Standby(t *testing.T) {
-	t.Parallel()
 	cluster := vault.NewTestCluster(t, &vault.CoreConfig{
 		DisablePerformanceStandby: true,
 	}, &vault.TestClusterOptions{
@@ -101,7 +189,28 @@ func TestSysPprof_Standby(t *testing.T) {
 			},
 		},
 	})
+	cluster.Start()
 	defer cluster.Cleanup()
 
-	SysPprof_Standby_Test(t, cluster)
+	pprof := func(client *api.Client) (string, error) {
+		req := client.NewRequest("GET", "/v1/sys/pprof/cmdline")
+		resp, err := client.RawRequestWithContext(context.Background(), req)
+		if err != nil {
+			return "", err
+		}
+		defer resp.Body.Close()
+
+		data, err := ioutil.ReadAll(resp.Body)
+		return string(data), err
+	}
+
+	cmdline, err := pprof(cluster.Cores[0].Client)
+	require.Nil(t, err)
+	require.NotEmpty(t, cmdline)
+	t.Log(cmdline)
+
+	cmdline, err = pprof(cluster.Cores[1].Client)
+	require.Nil(t, err)
+	require.NotEmpty(t, cmdline)
+	t.Log(cmdline)
 }
diff --git a/vault/external_tests/quotas/quotas_test.go b/vault/external_tests/quotas/quotas_test.go
index c06f2440a3057..e9865b4316e4a 100644
--- a/vault/external_tests/quotas/quotas_test.go
+++ b/vault/external_tests/quotas/quotas_test.go
@@ -1,15 +1,12 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package quotas
 
 import (
+	"context"
 	"fmt"
 	"testing"
 	"time"
 
 	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/sdk/helper/testhelpers/schema"
 	"github.com/hashicorp/vault/sdk/logical"
 	"github.com/stretchr/testify/require"
 
@@ -133,8 +130,6 @@ func waitForRemovalOrTimeout(c *api.Client, path string, tick, to time.Duration)
 
 func TestQuotas_RateLimit_DupName(t *testing.T) {
 	conf, opts := teststorage.ClusterSetup(coreConfig, nil, nil)
-	opts.NoDefaultQuotas = true
-	opts.RequestResponseCallback = schema.ResponseValidatingCallback(t)
 	cluster := vault.NewTestCluster(t, conf, opts)
 	cluster.Start()
 	defer cluster.Cleanup()
@@ -169,8 +164,6 @@ func TestQuotas_RateLimit_DupName(t *testing.T) {
 
 func TestQuotas_RateLimit_DupPath(t *testing.T) {
 	conf, opts := teststorage.ClusterSetup(coreConfig, nil, nil)
-	opts.NoDefaultQuotas = true
-	opts.RequestResponseCallback = schema.ResponseValidatingCallback(t)
 	cluster := vault.NewTestCluster(t, conf, opts)
 	cluster.Start()
 	defer cluster.Cleanup()
@@ -209,8 +202,7 @@ func TestQuotas_RateLimit_DupPath(t *testing.T) {
 
 func TestQuotas_RateLimitQuota_ExemptPaths(t *testing.T) {
 	conf, opts := teststorage.ClusterSetup(coreConfig, nil, nil)
-	opts.NoDefaultQuotas = true
-	opts.RequestResponseCallback = schema.ResponseValidatingCallback(t)
+
 	cluster := vault.NewTestCluster(t, conf, opts)
 	cluster.Start()
 	defer cluster.Cleanup()
@@ -261,8 +253,7 @@ func TestQuotas_RateLimitQuota_ExemptPaths(t *testing.T) {
 
 func TestQuotas_RateLimitQuota_DefaultExemptPaths(t *testing.T) {
 	conf, opts := teststorage.ClusterSetup(coreConfig, nil, nil)
-	opts.NoDefaultQuotas = true
-	opts.RequestResponseCallback = schema.ResponseValidatingCallback(t)
+
 	cluster := vault.NewTestCluster(t, conf, opts)
 	cluster.Start()
 	defer cluster.Cleanup()
@@ -276,18 +267,22 @@ func TestQuotas_RateLimitQuota_DefaultExemptPaths(t *testing.T) {
 	})
 	require.NoError(t, err)
 
-	resp, err := client.Logical().Read("sys/health")
+	req := client.NewRequest("GET", "/v1/sys/health")
+	resp, err := client.RawRequestWithContext(context.Background(), req)
 	require.NoError(t, err)
 	require.NotNil(t, resp)
-	require.NotNil(t, resp.Data)
+	require.NotNil(t, resp.Body)
+	require.Equal(t, 200, resp.StatusCode)
 
 	// The second sys/health call should not fail as /v1/sys/health is
 	// part of the default exempt paths
-	resp, err = client.Logical().Read("sys/health")
+	req = client.NewRequest("GET", "/v1/sys/health")
+	resp, err = client.RawRequestWithContext(context.Background(), req)
 	require.NoError(t, err)
-	// If the response is nil, then we are being rate limited
 	require.NotNil(t, resp)
-	require.NotNil(t, resp.Data)
+	require.NotNil(t, resp.Body)
+	// If the response is not 200, then we are being rate limited
+	require.Equal(t, 200, resp.StatusCode)
 }
 
 func TestQuotas_RateLimitQuota_Mount(t *testing.T) {
@@ -380,7 +375,6 @@ func TestQuotas_RateLimitQuota_Mount(t *testing.T) {
 
 func TestQuotas_RateLimitQuota_MountPrecedence(t *testing.T) {
 	conf, opts := teststorage.ClusterSetup(coreConfig, nil, nil)
-	opts.NoDefaultQuotas = true
 	cluster := vault.NewTestCluster(t, conf, opts)
 	cluster.Start()
 	defer cluster.Cleanup()
@@ -467,7 +461,6 @@ func TestQuotas_RateLimitQuota_MountPrecedence(t *testing.T) {
 
 func TestQuotas_RateLimitQuota(t *testing.T) {
 	conf, opts := teststorage.ClusterSetup(coreConfig, nil, nil)
-	opts.NoDefaultQuotas = true
 	cluster := vault.NewTestCluster(t, conf, opts)
 	cluster.Start()
 	defer cluster.Cleanup()
diff --git a/vault/external_tests/raft/raft.go b/vault/external_tests/raft/raft.go
deleted file mode 100644
index 9b58b07dcfaff..0000000000000
--- a/vault/external_tests/raft/raft.go
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package rafttests
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/go-test/deep"
-	"github.com/hashicorp/vault/sdk/helper/testcluster"
-)
-
-func Raft_Configuration_Test(t *testing.T, cluster testcluster.VaultCluster) {
-	client := cluster.Nodes()[0].APIClient()
-	secret, err := client.Logical().Read("sys/storage/raft/configuration")
-	if err != nil {
-		t.Fatal(err)
-	}
-	servers := secret.Data["config"].(map[string]interface{})["servers"].([]interface{})
-	found := make(map[string]struct{})
-	for _, s := range servers {
-		server := s.(map[string]interface{})
-		nodeID := server["node_id"].(string)
-		leader := server["leader"].(bool)
-		switch nodeID {
-		case "core-0":
-			if !leader {
-				t.Fatalf("expected server to be leader: %#v", server)
-			}
-		default:
-			if leader {
-				t.Fatalf("expected server to not be leader: %#v", server)
-			}
-		}
-
-		found[nodeID] = struct{}{}
-	}
-	expected := map[string]struct{}{}
-	for i := range cluster.Nodes() {
-		expected[fmt.Sprintf("core-%d", i)] = struct{}{}
-	}
-	if diff := deep.Equal(expected, found); len(diff) > 0 {
-		t.Fatalf("configuration mismatch, diff: %v", diff)
-	}
-}
diff --git a/vault/external_tests/raft/raft_autopilot_test.go b/vault/external_tests/raft/raft_autopilot_test.go
index 5b324876b85e3..5c2de69f961fa 100644
--- a/vault/external_tests/raft/raft_autopilot_test.go
+++ b/vault/external_tests/raft/raft_autopilot_test.go
@@ -1,15 +1,10 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package rafttests
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"math"
 	"reflect"
-	"sync/atomic"
 	"testing"
 	"time"
 
@@ -17,20 +12,18 @@ import (
 	"github.com/hashicorp/go-secure-stdlib/strutil"
 	autopilot "github.com/hashicorp/raft-autopilot"
 	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/helper/constants"
 	"github.com/hashicorp/vault/helper/namespace"
 	"github.com/hashicorp/vault/helper/testhelpers"
 	"github.com/hashicorp/vault/helper/testhelpers/teststorage"
 	"github.com/hashicorp/vault/physical/raft"
+	"github.com/hashicorp/vault/sdk/version"
 	"github.com/hashicorp/vault/vault"
-	"github.com/hashicorp/vault/version"
 	"github.com/kr/pretty"
 	testingintf "github.com/mitchellh/go-testing-interface"
 	"github.com/stretchr/testify/require"
 )
 
 func TestRaft_Autopilot_Disable(t *testing.T) {
-	t.Parallel()
 	cluster, _ := raftCluster(t, &RaftClusterOpts{
 		DisableFollowerJoins: true,
 		InmemCluster:         true,
@@ -45,7 +38,6 @@ func TestRaft_Autopilot_Disable(t *testing.T) {
 }
 
 func TestRaft_Autopilot_Stabilization_And_State(t *testing.T) {
-	t.Parallel()
 	cluster, _ := raftCluster(t, &RaftClusterOpts{
 		DisableFollowerJoins: true,
 		InmemCluster:         true,
@@ -117,7 +109,6 @@ func TestRaft_Autopilot_Stabilization_And_State(t *testing.T) {
 }
 
 func TestRaft_Autopilot_Configuration(t *testing.T) {
-	t.Parallel()
 	cluster, _ := raftCluster(t, &RaftClusterOpts{
 		DisableFollowerJoins: true,
 		InmemCluster:         true,
@@ -205,7 +196,6 @@ func TestRaft_Autopilot_Configuration(t *testing.T) {
 // TestRaft_Autopilot_Stabilization_Delay verifies that if a node takes a long
 // time to become ready, it doesn't get promoted to voter until then.
 func TestRaft_Autopilot_Stabilization_Delay(t *testing.T) {
-	t.Parallel()
 	conf, opts := teststorage.ClusterSetup(nil, nil, teststorage.RaftBackendSetup)
 	conf.DisableAutopilot = false
 	opts.InmemClusterLayers = true
@@ -265,8 +255,8 @@ func TestRaft_Autopilot_Stabilization_Delay(t *testing.T) {
 		}
 	}
 
-	joinAndUnseal(t, cluster.Cores[1], cluster, false, false)
-	joinAndUnseal(t, cluster.Cores[2], cluster, false, false)
+	join(t, cluster.Cores[1], client, cluster)
+	join(t, cluster.Cores[2], client, cluster)
 
 	core2shouldBeHealthyAt := time.Now().Add(timeToHealthyCore2)
 
@@ -311,7 +301,6 @@ func TestRaft_Autopilot_Stabilization_Delay(t *testing.T) {
 }
 
 func TestRaft_AutoPilot_Peersets_Equivalent(t *testing.T) {
-	t.Parallel()
 	cluster, _ := raftCluster(t, &RaftClusterOpts{
 		InmemCluster:         true,
 		EnableAutopilot:      true,
@@ -328,8 +317,8 @@ func TestRaft_AutoPilot_Peersets_Equivalent(t *testing.T) {
 	})
 	require.NoError(t, err)
 
-	joinAsVoterAndUnseal(t, cluster.Cores[1], cluster)
-	joinAsVoterAndUnseal(t, cluster.Cores[2], cluster)
+	join(t, cluster.Cores[1], client, cluster)
+	join(t, cluster.Cores[2], client, cluster)
 
 	deadline := time.Now().Add(10 * time.Second)
 	var core0Peers, core1Peers, core2Peers []raft.Peer
@@ -357,152 +346,7 @@ func TestRaft_AutoPilot_Peersets_Equivalent(t *testing.T) {
 	require.Equal(t, core1Peers, core2Peers)
 }
 
-// TestRaft_VotersStayVoters ensures that autopilot doesn't demote a node just
-// because it hasn't been heard from in some time.
-func TestRaft_VotersStayVoters(t *testing.T) {
-	t.Parallel()
-	cluster, _ := raftCluster(t, &RaftClusterOpts{
-		DisableFollowerJoins: true,
-		InmemCluster:         true,
-		EnableAutopilot:      true,
-		PhysicalFactoryConfig: map[string]interface{}{
-			"performance_multiplier":       "5",
-			"autopilot_reconcile_interval": "300ms",
-			"autopilot_update_interval":    "100ms",
-		},
-		VersionMap: map[int]string{
-			0: version.Version,
-			1: version.Version,
-			2: version.Version,
-		},
-	})
-	defer cluster.Cleanup()
-	testhelpers.WaitForActiveNode(t, cluster)
-
-	client := cluster.Cores[0].Client
-
-	config, err := client.Sys().RaftAutopilotConfiguration()
-	require.NoError(t, err)
-	joinAndStabilizeAndPromote(t, cluster.Cores[1], client, cluster, config, "core-1", 2)
-	joinAndStabilizeAndPromote(t, cluster.Cores[2], client, cluster, config, "core-2", 3)
-
-	errIfNonVotersExist := func() error {
-		t.Helper()
-		resp, err := client.Sys().RaftAutopilotState()
-		if err != nil {
-			t.Fatal(err)
-		}
-		for k, v := range resp.Servers {
-			if v.Status == "non-voter" {
-				return fmt.Errorf("node %q is a non-voter", k)
-			}
-		}
-		return nil
-	}
-	testhelpers.RetryUntil(t, 10*time.Second, errIfNonVotersExist)
-
-	// Core0 is the leader, sealing it will both cause an election - and the
-	// new leader won't have seen any heartbeats initially - and create a "down"
-	// node that won't be sending heartbeats.
-	testhelpers.EnsureCoreSealed(t, cluster.Cores[0])
-	time.Sleep(config.ServerStabilizationTime + 2*time.Second)
-	client = cluster.Cores[1].Client
-	err = errIfNonVotersExist()
-	require.NoError(t, err)
-}
-
-// TestRaft_Autopilot_DeadServerCleanup tests that dead servers are correctly
-// removed by Vault and autopilot when a node stops and a replacement node joins.
-// The expected behavior is that removing a node from a 3 node cluster wouldn't
-// remove it from Raft until a replacement voter had joined and stabilized/been promoted.
-func TestRaft_Autopilot_DeadServerCleanup(t *testing.T) {
-	t.Parallel()
-	conf, opts := teststorage.ClusterSetup(nil, nil, teststorage.RaftBackendSetup)
-	conf.DisableAutopilot = false
-	opts.NumCores = 4
-	opts.SetupFunc = nil
-	opts.PhysicalFactoryConfig = map[string]interface{}{
-		"autopilot_reconcile_interval": "300ms",
-		"autopilot_update_interval":    "100ms",
-	}
-
-	cluster := vault.NewTestCluster(t, conf, opts)
-	cluster.Start()
-	defer cluster.Cleanup()
-	leader, addressProvider := setupLeaderAndUnseal(t, cluster)
-
-	// Join 2 extra nodes manually, store the 3rd for later
-	core1 := cluster.Cores[1]
-	core2 := cluster.Cores[2]
-	core3 := cluster.Cores[3]
-	core1.UnderlyingRawStorage.(*raft.RaftBackend).SetServerAddressProvider(addressProvider)
-	core2.UnderlyingRawStorage.(*raft.RaftBackend).SetServerAddressProvider(addressProvider)
-	core3.UnderlyingRawStorage.(*raft.RaftBackend).SetServerAddressProvider(addressProvider)
-	joinAsVoterAndUnseal(t, core1, cluster)
-	joinAsVoterAndUnseal(t, core2, cluster)
-	// Do not join node 3
-	testhelpers.WaitForNodesExcludingSelectedStandbys(t, cluster, 3)
-
-	config, err := leader.Client.Sys().RaftAutopilotConfiguration()
-	require.NoError(t, err)
-	require.True(t, isHealthyAfterStabilization(t, leader, config.ServerStabilizationTime))
-
-	// Ensure Autopilot has the aggressive settings
-	config.CleanupDeadServers = true
-	config.ServerStabilizationTime = 5 * time.Second
-	config.DeadServerLastContactThreshold = 10 * time.Second
-	config.MaxTrailingLogs = 10
-	config.LastContactThreshold = 10 * time.Second
-	config.MinQuorum = 3
-	config.DisableUpgradeMigration = true
-
-	// We can't use Client.Sys().PutRaftAutopilotConfiguration(config) in OSS as disable_upgrade_migration isn't in OSS
-	b, err := json.Marshal(&config)
-	require.NoError(t, err)
-	var m map[string]interface{}
-	err = json.Unmarshal(b, &m)
-	require.NoError(t, err)
-	if !constants.IsEnterprise {
-		delete(m, "disable_upgrade_migration")
-	}
-	_, err = leader.Client.Logical().Write("sys/storage/raft/autopilot/configuration", m)
-	require.NoError(t, err)
-
-	// Observe for healthy state
-	state, err := leader.Client.Sys().RaftAutopilotState()
-	require.NoError(t, err)
-	require.True(t, state.Healthy)
-
-	// Kill a node (core-2)
-	cluster.StopCore(t, 2)
-	// Wait for just over the dead server threshold to ensure the core is classed as 'dead'
-	time.Sleep(config.DeadServerLastContactThreshold + 2*time.Second)
-
-	// Observe for an unhealthy state (but we still have 3 voters according to Raft)
-	state, err = leader.Client.Sys().RaftAutopilotState()
-	require.NoError(t, err)
-	require.False(t, state.Healthy)
-	require.Len(t, state.Voters, 3)
-
-	// Join node 3 now
-	joinAsVoterAndUnseal(t, core3, cluster)
-
-	// Stabilization time
-	require.True(t, isHealthyAfterStabilization(t, leader, config.ServerStabilizationTime))
-
-	// Observe for healthy and contains 3 correct voters
-	state, err = leader.Client.Sys().RaftAutopilotState()
-	require.NoError(t, err)
-	require.True(t, state.Healthy)
-	require.Len(t, state.Voters, 3)
-	require.Contains(t, state.Voters, "core-0")
-	require.Contains(t, state.Voters, "core-1")
-	require.NotContains(t, state.Voters, "core-2")
-	require.Contains(t, state.Voters, "core-3")
-}
-
 func joinAndStabilizeAndPromote(t *testing.T, core *vault.TestClusterCore, client *api.Client, cluster *vault.TestCluster, config *api.AutopilotConfig, nodeID string, numServers int) {
-	t.Helper()
 	joinAndStabilize(t, core, client, cluster, config, nodeID, numServers)
 
 	// Now that the server is stable, wait for autopilot to reconcile and
@@ -529,7 +373,7 @@ func joinAndStabilizeAndPromote(t *testing.T, core *vault.TestClusterCore, clien
 
 func joinAndStabilize(t *testing.T, core *vault.TestClusterCore, client *api.Client, cluster *vault.TestCluster, config *api.AutopilotConfig, nodeID string, numServers int) {
 	t.Helper()
-	joinAndUnseal(t, core, cluster, false, false)
+	join(t, core, client, cluster)
 	time.Sleep(2 * time.Second)
 
 	state, err := client.Sys().RaftAutopilotState()
@@ -556,90 +400,68 @@ func joinAndStabilize(t *testing.T, core *vault.TestClusterCore, client *api.Cli
 	}
 }
 
-// joinAsVoterAndUnseal joins the specified core to the specified cluster as a voter and unseals it.
-// It will wait (up to a timeout) for the core to be fully unsealed before returning
-func joinAsVoterAndUnseal(t *testing.T, core *vault.TestClusterCore, cluster *vault.TestCluster) {
-	t.Helper()
-	joinAndUnseal(t, core, cluster, false, true)
-}
-
-// joinAndUnseal joins the specified core to the specified cluster and unseals it.
-// You can specify if the core should be joined as a voter/non-voter,
-// and whether to wait (up to a timeout) for the core to be unsealed before returning.
-func joinAndUnseal(t *testing.T, core *vault.TestClusterCore, cluster *vault.TestCluster, nonVoter bool, waitForUnseal bool) {
+func join(t *testing.T, core *vault.TestClusterCore, client *api.Client, cluster *vault.TestCluster) {
 	t.Helper()
-	leader, leaderAddr := clusterLeader(t, cluster)
 	_, err := core.JoinRaftCluster(namespace.RootContext(context.Background()), []*raft.LeaderJoinInfo{
 		{
-			LeaderAPIAddr: leaderAddr,
-			TLSConfig:     leader.TLSConfig(),
+			LeaderAPIAddr: client.Address(),
+			TLSConfig:     cluster.Cores[0].TLSConfig,
 			Retry:         true,
 		},
-	}, nonVoter)
+	}, false)
 	require.NoError(t, err)
-
 	time.Sleep(1 * time.Second)
 	cluster.UnsealCore(t, core)
-	if waitForUnseal {
-		waitForCoreUnseal(t, core)
-	}
-}
-
-// clusterLeader gets the leader node and its address from the specified cluster
-func clusterLeader(t *testing.T, cluster *vault.TestCluster) (*vault.TestClusterCore, string) {
-	t.Helper()
-	for _, core := range cluster.Cores {
-		isLeader, addr, _, err := core.Leader()
-		require.NoError(t, err)
-		if isLeader {
-			return core, addr
-		}
-	}
-
-	t.Fatal("unable to find leader")
-	return nil, ""
 }
 
-// setupLeaderAndUnseal configures and unseals the leader node.
-// It will wait until the node is active before returning the core and the address of the leader.
-func setupLeaderAndUnseal(t *testing.T, cluster *vault.TestCluster) (*vault.TestClusterCore, *testhelpers.TestRaftServerAddressProvider) {
-	t.Helper()
-	leader, _ := clusterLeader(t, cluster)
-
-	// Lots of tests seem to do this when they deal with a TestRaftServerAddressProvider, it makes the test work rather than error out.
-	atomic.StoreUint32(&vault.TestingUpdateClusterAddr, 1)
+// TestRaft_VotersStayVoters ensures that autopilot doesn't demote a node just
+// because it hasn't been heard from in some time.
+func TestRaft_VotersStayVoters(t *testing.T) {
+	cluster, _ := raftCluster(t, &RaftClusterOpts{
+		DisableFollowerJoins: true,
+		InmemCluster:         true,
+		EnableAutopilot:      true,
+		PhysicalFactoryConfig: map[string]interface{}{
+			"performance_multiplier":       "5",
+			"autopilot_reconcile_interval": "300ms",
+			"autopilot_update_interval":    "100ms",
+		},
+		VersionMap: map[int]string{
+			0: version.Version,
+			1: version.Version,
+			2: version.Version,
+		},
+	})
+	defer cluster.Cleanup()
+	testhelpers.WaitForActiveNode(t, cluster)
 
-	addressProvider := &testhelpers.TestRaftServerAddressProvider{Cluster: cluster}
-	testhelpers.EnsureCoreSealed(t, leader)
-	leader.UnderlyingRawStorage.(*raft.RaftBackend).SetServerAddressProvider(addressProvider)
-	cluster.UnsealCore(t, leader)
-	vault.TestWaitActive(t, leader.Core)
+	client := cluster.Cores[0].Client
 
-	return leader, addressProvider
-}
+	config, err := client.Sys().RaftAutopilotConfiguration()
+	require.NoError(t, err)
+	joinAndStabilizeAndPromote(t, cluster.Cores[1], client, cluster, config, "core-1", 2)
+	joinAndStabilizeAndPromote(t, cluster.Cores[2], client, cluster, config, "core-2", 3)
 
-// waitForCoreUnseal waits until the specified core is unsealed.
-// It fails the calling test if the deadline has elapsed and the core is still sealed.
-func waitForCoreUnseal(t *testing.T, core *vault.TestClusterCore) {
-	t.Helper()
-	deadline := time.Now().Add(30 * time.Second)
-	for time.Now().Before(deadline) {
-		if !core.Sealed() {
-			return
+	errIfNonVotersExist := func() error {
+		t.Helper()
+		resp, err := client.Sys().RaftAutopilotState()
+		if err != nil {
+			t.Fatal(err)
 		}
-		time.Sleep(time.Second)
+		for k, v := range resp.Servers {
+			if v.Status == "non-voter" {
+				return fmt.Errorf("node %q is a non-voter", k)
+			}
+		}
+		return nil
 	}
-	t.Fatalf("expected core %v to unseal before deadline but it has not", core.NodeID)
-}
+	testhelpers.RetryUntil(t, 10*time.Second, errIfNonVotersExist)
 
-// isHealthyAfterStabilization will use the supplied leader core to query the
-// health of Raft Autopilot just after the specified deadline.
-func isHealthyAfterStabilization(t *testing.T, leaderCore *vault.TestClusterCore, stabilizationTime time.Duration) bool {
-	t.Helper()
-	timeoutGrace := 2 * time.Second
-	time.Sleep(stabilizationTime + timeoutGrace)
-	state, err := leaderCore.Client.Sys().RaftAutopilotState()
-	require.NoError(t, err)
-	require.NotNil(t, state)
-	return state.Healthy
+	// Core0 is the leader, sealing it will both cause an election - and the
+	// new leader won't have seen any heartbeats initially - and create a "down"
+	// node that won't be sending heartbeats.
+	testhelpers.EnsureCoreSealed(t, cluster.Cores[0])
+	time.Sleep(30 * time.Second)
+	client = cluster.Cores[1].Client
+	errIfNonVotersExist()
 }
diff --git a/vault/external_tests/raft/raft_binary/raft_test.go b/vault/external_tests/raft/raft_binary/raft_test.go
deleted file mode 100644
index 53f2313ed01f1..0000000000000
--- a/vault/external_tests/raft/raft_binary/raft_test.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package raft_binary
-
-import (
-	"context"
-	"os"
-	"testing"
-
-	"github.com/hashicorp/vault/sdk/helper/testcluster"
-	"github.com/hashicorp/vault/sdk/helper/testcluster/docker"
-	rafttest "github.com/hashicorp/vault/vault/external_tests/raft"
-)
-
-// TestRaft_Configuration_Docker is a variant of TestRaft_Configuration that
-// uses docker containers for the vault nodes.
-func TestRaft_Configuration_Docker(t *testing.T) {
-	t.Parallel()
-	binary := os.Getenv("VAULT_BINARY")
-	if binary == "" {
-		t.Skip("only running docker test when $VAULT_BINARY present")
-	}
-	opts := &docker.DockerClusterOptions{
-		ImageRepo: "hashicorp/vault",
-		// We're replacing the binary anyway, so we're not too particular about
-		// the docker image version tag.
-		ImageTag:    "latest",
-		VaultBinary: binary,
-		ClusterOptions: testcluster.ClusterOptions{
-			VaultNodeConfig: &testcluster.VaultNodeConfig{
-				LogLevel: "TRACE",
-				// If you want the test to run faster locally, you could
-				// uncomment this performance_multiplier change.
-				//StorageOptions: map[string]string{
-				//	"performance_multiplier": "1",
-				//},
-			},
-		},
-	}
-	cluster := docker.NewTestDockerCluster(t, opts)
-	defer cluster.Cleanup()
-	rafttest.Raft_Configuration_Test(t, cluster)
-
-	if err := cluster.AddNode(context.TODO(), opts); err != nil {
-		t.Fatal(err)
-	}
-	rafttest.Raft_Configuration_Test(t, cluster)
-}
diff --git a/vault/external_tests/raft/raft_test.go b/vault/external_tests/raft/raft_test.go
index be4cd0f5cc62a..0f89377f41c60 100644
--- a/vault/external_tests/raft/raft_test.go
+++ b/vault/external_tests/raft/raft_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package rafttests
 
 import (
@@ -26,7 +23,6 @@ import (
 	"github.com/hashicorp/vault/helper/constants"
 	"github.com/hashicorp/vault/helper/namespace"
 	"github.com/hashicorp/vault/helper/testhelpers"
-	"github.com/hashicorp/vault/helper/testhelpers/corehelpers"
 	"github.com/hashicorp/vault/helper/testhelpers/teststorage"
 	vaulthttp "github.com/hashicorp/vault/http"
 	"github.com/hashicorp/vault/internalshared/configutil"
@@ -176,7 +172,7 @@ func TestRaft_RetryAutoJoin(t *testing.T) {
 	leaderInfos := []*raft.LeaderJoinInfo{
 		{
 			AutoJoin:  "provider=aws region=eu-west-1 tag_key=consul tag_value=tag access_key_id=a secret_access_key=a",
-			TLSConfig: leaderCore.TLSConfig(),
+			TLSConfig: leaderCore.TLSConfig,
 			Retry:     true,
 		},
 	}
@@ -222,7 +218,7 @@ func TestRaft_Retry_Join(t *testing.T) {
 	leaderInfos := []*raft.LeaderJoinInfo{
 		{
 			LeaderAPIAddr: leaderAPI,
-			TLSConfig:     leaderCore.TLSConfig(),
+			TLSConfig:     leaderCore.TLSConfig,
 			Retry:         true,
 		},
 	}
@@ -240,7 +236,7 @@ func TestRaft_Retry_Join(t *testing.T) {
 			}
 
 			// Handle potential racy behavior with unseals. Retry the unseal until it succeeds.
-			corehelpers.RetryUntil(t, 10*time.Second, func() error {
+			vault.RetryUntil(t, 10*time.Second, func() error {
 				return cluster.AttemptUnsealCore(core)
 			})
 		}(t, clusterCore)
@@ -252,7 +248,7 @@ func TestRaft_Retry_Join(t *testing.T) {
 
 	vault.TestWaitActive(t, leaderCore.Core)
 
-	corehelpers.RetryUntil(t, 10*time.Second, func() error {
+	vault.RetryUntil(t, 10*time.Second, func() error {
 		return testhelpers.VerifyRaftPeers(t, cluster.Cores[0].Client, map[string]bool{
 			"core-0": true,
 			"core-1": true,
@@ -438,7 +434,47 @@ func TestRaft_Configuration(t *testing.T) {
 	t.Parallel()
 	cluster, _ := raftCluster(t, nil)
 	defer cluster.Cleanup()
-	Raft_Configuration_Test(t, cluster)
+
+	for i, c := range cluster.Cores {
+		if c.Core.Sealed() {
+			t.Fatalf("failed to unseal core %d", i)
+		}
+	}
+
+	client := cluster.Cores[0].Client
+	secret, err := client.Logical().Read("sys/storage/raft/configuration")
+	if err != nil {
+		t.Fatal(err)
+	}
+	servers := secret.Data["config"].(map[string]interface{})["servers"].([]interface{})
+	expected := map[string]bool{
+		"core-0": true,
+		"core-1": true,
+		"core-2": true,
+	}
+	if len(servers) != 3 {
+		t.Fatalf("incorrect number of servers in the configuration")
+	}
+	for _, s := range servers {
+		server := s.(map[string]interface{})
+		nodeID := server["node_id"].(string)
+		leader := server["leader"].(bool)
+		switch nodeID {
+		case "core-0":
+			if !leader {
+				t.Fatalf("expected server to be leader: %#v", server)
+			}
+		default:
+			if leader {
+				t.Fatalf("expected server to not be leader: %#v", server)
+			}
+		}
+
+		delete(expected, nodeID)
+	}
+	if len(expected) != 0 {
+		t.Fatalf("failed to read configuration successfully")
+	}
 }
 
 func TestRaft_ShamirUnseal(t *testing.T) {
@@ -567,7 +603,6 @@ func TestRaft_SnapshotAPI_MidstreamFailure(t *testing.T) {
 }
 
 func TestRaft_SnapshotAPI_RekeyRotate_Backward(t *testing.T) {
-	t.Parallel()
 	type testCase struct {
 		Name               string
 		Rekey              bool
@@ -641,7 +676,7 @@ func TestRaft_SnapshotAPI_RekeyRotate_Backward(t *testing.T) {
 			}
 
 			transport := cleanhttp.DefaultPooledTransport()
-			transport.TLSClientConfig = cluster.Cores[0].TLSConfig()
+			transport.TLSClientConfig = cluster.Cores[0].TLSConfig.Clone()
 			if err := http2.ConfigureTransport(transport); err != nil {
 				t.Fatal(err)
 			}
@@ -754,7 +789,6 @@ func TestRaft_SnapshotAPI_RekeyRotate_Backward(t *testing.T) {
 }
 
 func TestRaft_SnapshotAPI_RekeyRotate_Forward(t *testing.T) {
-	t.Parallel()
 	type testCase struct {
 		Name               string
 		Rekey              bool
@@ -843,7 +877,7 @@ func TestRaft_SnapshotAPI_RekeyRotate_Forward(t *testing.T) {
 			}
 
 			transport := cleanhttp.DefaultPooledTransport()
-			transport.TLSClientConfig = cluster.Cores[0].TLSConfig()
+			transport.TLSClientConfig = cluster.Cores[0].TLSConfig.Clone()
 			if err := http2.ConfigureTransport(transport); err != nil {
 				t.Fatal(err)
 			}
@@ -1030,7 +1064,7 @@ func TestRaft_SnapshotAPI_DifferentCluster(t *testing.T) {
 	}
 
 	transport := cleanhttp.DefaultPooledTransport()
-	transport.TLSClientConfig = cluster.Cores[0].TLSConfig()
+	transport.TLSClientConfig = cluster.Cores[0].TLSConfig.Clone()
 	if err := http2.ConfigureTransport(transport); err != nil {
 		t.Fatal(err)
 	}
@@ -1066,7 +1100,7 @@ func TestRaft_SnapshotAPI_DifferentCluster(t *testing.T) {
 		leaderClient := cluster2.Cores[0].Client
 
 		transport := cleanhttp.DefaultPooledTransport()
-		transport.TLSClientConfig = cluster2.Cores[0].TLSConfig()
+		transport.TLSClientConfig = cluster2.Cores[0].TLSConfig.Clone()
 		if err := http2.ConfigureTransport(transport); err != nil {
 			t.Fatal(err)
 		}
diff --git a/vault/external_tests/raftha/raft_ha_test.go b/vault/external_tests/raftha/raft_ha_test.go
index 92bbfea7b364b..0b33b0f8960c7 100644
--- a/vault/external_tests/raftha/raft_ha_test.go
+++ b/vault/external_tests/raftha/raft_ha_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package raftha
 
 import (
diff --git a/vault/external_tests/replication_binary/replication_test.go b/vault/external_tests/replication_binary/replication_test.go
deleted file mode 100644
index f5464f4f6a70a..0000000000000
--- a/vault/external_tests/replication_binary/replication_test.go
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package replication_binary
-
-/*
-Example of how to use docker.NewReplicationSetDocker(t), assuming
-you point VAULT_BINARY to an Enterprise Vault binary:
-
-import (
-	"context"
-	"testing"
-	"time"
-
-	"github.com/hashicorp/vault/sdk/helper/testcluster/docker"
-)
-
-// TestStandardPerfReplication_Docker tests that we can create two 3-node
-// clusters of docker containers and connect them using perf replication.
-func TestStandardPerfReplication_Docker(t *testing.T) {
-	r, err := docker.NewReplicationSetDocker(t)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer r.Cleanup()
-
-	ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
-	defer cancel()
-	err = r.StandardPerfReplication(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-*/
diff --git a/vault/external_tests/response/allowed_response_headers_test.go b/vault/external_tests/response/allowed_response_headers_test.go
index 379c3f86d0b41..3232b27bf0951 100644
--- a/vault/external_tests/response/allowed_response_headers_test.go
+++ b/vault/external_tests/response/allowed_response_headers_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package identity
 
 import (
diff --git a/vault/external_tests/router/router_ext_test.go b/vault/external_tests/router/router_ext_test.go
index 86c282e94dc63..bf4018c2861b7 100644
--- a/vault/external_tests/router/router_ext_test.go
+++ b/vault/external_tests/router/router_ext_test.go
@@ -1,13 +1,14 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package router
 
 import (
 	"testing"
 
 	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/helper/testhelpers/minimal"
+	"github.com/hashicorp/vault/builtin/credential/userpass"
+	"github.com/hashicorp/vault/builtin/logical/pki"
+	vaulthttp "github.com/hashicorp/vault/http"
+	"github.com/hashicorp/vault/sdk/logical"
+	"github.com/hashicorp/vault/vault"
 )
 
 func TestRouter_MountSubpath_Checks(t *testing.T) {
@@ -17,7 +18,21 @@ func TestRouter_MountSubpath_Checks(t *testing.T) {
 }
 
 func testRouter_MountSubpath(t *testing.T, mountPoints []string) {
-	cluster := minimal.NewTestSoloCluster(t, nil)
+	coreConfig := &vault.CoreConfig{
+		LogicalBackends: map[string]logical.Factory{
+			"pki": pki.Factory,
+		},
+		CredentialBackends: map[string]logical.Factory{
+			"userpass": userpass.Factory,
+		},
+	}
+	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+	})
+	cluster.Start()
+	defer cluster.Cleanup()
+
+	vault.TestWaitActive(t, cluster.Cores[0].Core)
 	client := cluster.Cores[0].Client
 
 	// Test auth
diff --git a/vault/external_tests/sealmigration/seal_migration_pre14_test.go b/vault/external_tests/sealmigration/seal_migration_pre14_test.go
index ff42b940d334a..b62ff45cdc47d 100644
--- a/vault/external_tests/sealmigration/seal_migration_pre14_test.go
+++ b/vault/external_tests/sealmigration/seal_migration_pre14_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package sealmigration
 
 import (
diff --git a/vault/external_tests/sealmigration/seal_migration_test.go b/vault/external_tests/sealmigration/seal_migration_test.go
index a67b0351f354a..8edec949e5ab1 100644
--- a/vault/external_tests/sealmigration/seal_migration_test.go
+++ b/vault/external_tests/sealmigration/seal_migration_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package sealmigration
 
 import (
diff --git a/vault/external_tests/sealmigration/testshared.go b/vault/external_tests/sealmigration/testshared.go
index 5981c966b5080..527566aebfad0 100644
--- a/vault/external_tests/sealmigration/testshared.go
+++ b/vault/external_tests/sealmigration/testshared.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package sealmigration
 
 import (
@@ -844,7 +841,7 @@ func joinRaftFollowers(t *testing.T, cluster *vault.TestCluster, useStoredKeys b
 	leaderInfos := []*raft.LeaderJoinInfo{
 		{
 			LeaderAPIAddr: leader.Client.Address(),
-			TLSConfig:     leader.TLSConfig(),
+			TLSConfig:     leader.TLSConfig,
 		},
 	}
 
diff --git a/vault/external_tests/sealmigrationext/seal_migration_pre14_test.go b/vault/external_tests/sealmigrationext/seal_migration_pre14_test.go
index 8f2ab4236ac9d..664998120502a 100644
--- a/vault/external_tests/sealmigrationext/seal_migration_pre14_test.go
+++ b/vault/external_tests/sealmigrationext/seal_migration_pre14_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package sealmigrationext
 
 import (
diff --git a/vault/external_tests/token/batch_token_test.go b/vault/external_tests/token/batch_token_test.go
index 5bf0a504cb2cd..a344b5eed9441 100644
--- a/vault/external_tests/token/batch_token_test.go
+++ b/vault/external_tests/token/batch_token_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package token
 
 import (
@@ -9,19 +6,30 @@ import (
 	"time"
 
 	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/helper/testhelpers/minimal"
+	"github.com/hashicorp/vault/builtin/credential/approle"
+	vaulthttp "github.com/hashicorp/vault/http"
 	"github.com/hashicorp/vault/sdk/helper/consts"
 	"github.com/hashicorp/vault/sdk/logical"
 	"github.com/hashicorp/vault/vault"
 )
 
 func TestBatchTokens(t *testing.T) {
-	t.Parallel()
-	cluster := minimal.NewTestSoloCluster(t, &vault.CoreConfig{
+	coreConfig := &vault.CoreConfig{
 		LogicalBackends: map[string]logical.Factory{
 			"kv": vault.LeasedPassthroughBackendFactory,
 		},
+		CredentialBackends: map[string]logical.Factory{
+			"approle": approle.Factory,
+		},
+	}
+	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
 	})
+	cluster.Start()
+	defer cluster.Cleanup()
+
+	core := cluster.Cores[0].Core
+	vault.TestWaitActive(t, core)
 	client := cluster.Cores[0].Client
 	rootToken := client.Token()
 	var err error
@@ -192,12 +200,22 @@ path "kv/*" {
 }
 
 func TestBatchToken_ParentLeaseRevoke(t *testing.T) {
-	t.Parallel()
-	cluster := minimal.NewTestSoloCluster(t, &vault.CoreConfig{
+	coreConfig := &vault.CoreConfig{
 		LogicalBackends: map[string]logical.Factory{
 			"kv": vault.LeasedPassthroughBackendFactory,
 		},
+		CredentialBackends: map[string]logical.Factory{
+			"approle": approle.Factory,
+		},
+	}
+	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
 	})
+	cluster.Start()
+	defer cluster.Cleanup()
+
+	core := cluster.Cores[0].Core
+	vault.TestWaitActive(t, core)
 	client := cluster.Cores[0].Client
 	rootToken := client.Token()
 	var err error
@@ -302,8 +320,14 @@ path "kv/*" {
 }
 
 func TestTokenStore_Roles_Batch(t *testing.T) {
-	t.Parallel()
-	cluster := minimal.NewTestSoloCluster(t, nil)
+	cluster := vault.NewTestCluster(t, nil, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+	})
+	cluster.Start()
+	defer cluster.Cleanup()
+
+	core := cluster.Cores[0].Core
+	vault.TestWaitActive(t, core)
 	client := cluster.Cores[0].Client
 	rootToken := client.Token()
 
diff --git a/vault/external_tests/token/token_test.go b/vault/external_tests/token/token_test.go
index d3d4e66b08a53..16cac188c6d3f 100644
--- a/vault/external_tests/token/token_test.go
+++ b/vault/external_tests/token/token_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package token
 
 import (
@@ -13,16 +10,24 @@ import (
 
 	"github.com/go-test/deep"
 	"github.com/hashicorp/vault/api"
+	credLdap "github.com/hashicorp/vault/builtin/credential/ldap"
+	credUserpass "github.com/hashicorp/vault/builtin/credential/userpass"
 	"github.com/hashicorp/vault/helper/testhelpers/ldap"
-	"github.com/hashicorp/vault/helper/testhelpers/minimal"
+	vaulthttp "github.com/hashicorp/vault/http"
 	"github.com/hashicorp/vault/sdk/helper/jsonutil"
 	"github.com/hashicorp/vault/sdk/logical"
 	"github.com/hashicorp/vault/vault"
 )
 
 func TestTokenStore_CreateOrphanResponse(t *testing.T) {
-	t.Parallel()
-	cluster := minimal.NewTestSoloCluster(t, nil)
+	cluster := vault.NewTestCluster(t, nil, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+	})
+	cluster.Start()
+	defer cluster.Cleanup()
+
+	core := cluster.Cores[0].Core
+	vault.TestWaitActive(t, core)
 	client := cluster.Cores[0].Client
 
 	secret, err := client.Auth().Token().CreateOrphan(&api.TokenCreateRequest{
@@ -37,8 +42,19 @@ func TestTokenStore_CreateOrphanResponse(t *testing.T) {
 }
 
 func TestTokenStore_TokenInvalidEntityID(t *testing.T) {
-	t.Parallel()
-	cluster := minimal.NewTestSoloCluster(t, nil)
+	coreConfig := &vault.CoreConfig{
+		CredentialBackends: map[string]logical.Factory{
+			"userpass": credUserpass.Factory,
+		},
+	}
+	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+	})
+	cluster.Start()
+	defer cluster.Cleanup()
+
+	core := cluster.Cores[0].Core
+	vault.TestWaitActive(t, core)
 	client := cluster.Cores[0].Client
 
 	// Enable userpass auth
@@ -88,10 +104,20 @@ func TestTokenStore_TokenInvalidEntityID(t *testing.T) {
 }
 
 func TestTokenStore_IdentityPolicies(t *testing.T) {
-	t.Parallel()
-	cluster := minimal.NewTestSoloCluster(t, &vault.CoreConfig{
+	coreConfig := &vault.CoreConfig{
+		CredentialBackends: map[string]logical.Factory{
+			"ldap": credLdap.Factory,
+		},
 		EnableRaw: true,
+	}
+	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
 	})
+	cluster.Start()
+	defer cluster.Cleanup()
+
+	core := cluster.Cores[0].Core
+	vault.TestWaitActive(t, core)
 	client := cluster.Cores[0].Client
 
 	// Enable LDAP auth
@@ -344,13 +370,20 @@ func TestTokenStore_IdentityPolicies(t *testing.T) {
 }
 
 func TestTokenStore_CIDRBlocks(t *testing.T) {
-	t.Parallel()
 	testPolicy := `
 path "auth/token/create" {
 	capabilities = ["update"]
 }
 `
-	cluster := minimal.NewTestSoloCluster(t, nil)
+
+	cluster := vault.NewTestCluster(t, nil, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+	})
+	cluster.Start()
+	defer cluster.Cleanup()
+
+	core := cluster.Cores[0].Core
+	vault.TestWaitActive(t, core)
 	client := cluster.Cores[0].Client
 	rootToken := client.Token()
 
@@ -491,10 +524,15 @@ path "auth/token/create" {
 }
 
 func TestTokenStore_RevocationOnStartup(t *testing.T) {
-	t.Parallel()
-	cluster := minimal.NewTestSoloCluster(t, &vault.CoreConfig{
-		EnableRaw: true,
+	cluster := vault.NewTestCluster(t, nil, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+		NumCores:    1,
 	})
+	cluster.Start()
+	defer cluster.Cleanup()
+
+	core := cluster.Cores[0].Core
+	vault.TestWaitActive(t, core)
 	client := cluster.Cores[0].Client
 	rootToken := client.Token()
 
diff --git a/vault/forwarded_writer_oss.go b/vault/forwarded_writer_oss.go
deleted file mode 100644
index 6779a4d5894c5..0000000000000
--- a/vault/forwarded_writer_oss.go
+++ /dev/null
@@ -1,120 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-//go:build !enterprise
-
-package vault
-
-import (
-	"context"
-	"fmt"
-	"strings"
-
-	"github.com/hashicorp/vault/sdk/logical"
-)
-
-// Our forwarded writer has two components: a reference to Core, allowing
-// us to tap into the GRPC client and resolved paths, and lower storage
-// layer to call upon when we don't wish to forward our writes.
-//
-// This implementation lives in OSS: while the GRPC connection isn't present
-// on OSS, we need to ensure paths written to these forwarded nodes correctly
-// template {{clusterId}} if they are later upgraded to Enterprise, and don't
-// just write with the template sentinel still there.
-//
-// XXX: In the future, we'll need to support wrapping transactional storage.
-type ForwardedWriter struct {
-	core      *Core
-	lower     logical.Storage
-	clusterID string
-}
-
-func (c *Core) NewForwardedWriter(ctx context.Context, wrapped logical.Storage, _ bool /* local */) (logical.Storage, error) {
-	// local is unused above on this OSS implementation: local mounts only
-	// exist on Vault Enterprise.
-
-	// Cache the cluster id; we assume we'll be recreated when plugins reload
-	// if this changes, and should not change without reloading plugins.
-	cluster, err := c.Cluster(ctx)
-	if err != nil || cluster.ID == "" {
-		return nil, fmt.Errorf("failed to fetch local cluster info: %v", err)
-	}
-
-	return &ForwardedWriter{
-		core:      c,
-		lower:     wrapped,
-		clusterID: cluster.ID,
-	}, nil
-}
-
-func (w *ForwardedWriter) List(ctx context.Context, path string) ([]string, error) {
-	// storage.List(...) operations are always handled locally. However, we
-	// may need to resolve any {{clusterId}} template sentinels if given to us
-	// and we'd otherwise consider this a forwarded write operation.
-	var err error
-	path, err = w.resolvePathIfNecessary(path)
-	if err != nil {
-		return nil, fmt.Errorf("failed to do local cross-cluster list: failed to resolve path: %w", err)
-	}
-
-	return w.lower.List(ctx, path)
-}
-
-func (w *ForwardedWriter) Get(ctx context.Context, path string) (*logical.StorageEntry, error) {
-	// See note in List(...)above.
-	var err error
-	path, err = w.resolvePathIfNecessary(path)
-	if err != nil {
-		return nil, fmt.Errorf("failed to do local cross-cluster read: failed to resolve path: %w", err)
-	}
-
-	return w.lower.Get(ctx, path)
-}
-
-func (w *ForwardedWriter) Put(ctx context.Context, entry *logical.StorageEntry) error {
-	// See note above about List(...).
-	var err error
-	entry.Key, err = w.resolvePathIfNecessary(entry.Key)
-	if err != nil {
-		return fmt.Errorf("failed to do local cross-cluster write: failed to resolve path: %w", err)
-	}
-
-	return w.lower.Put(ctx, entry)
-}
-
-func (w *ForwardedWriter) Delete(ctx context.Context, path string) error {
-	// See note above about List(...).
-	var err error
-	path, err = w.resolvePathIfNecessary(path)
-	if err != nil {
-		return fmt.Errorf("failed to do local cross-cluster delete: failed to resolve path: %w", err)
-	}
-	return w.lower.Delete(ctx, path)
-}
-
-func (w *ForwardedWriter) resolvePathIfNecessary(path string) (string, error) {
-	// We should only resolve this path when we're going to be servicing
-	// it locally.
-	//
-	// We don't bother checking if we're a perf primary or not, as even
-	// perf secondaries could use locally serviced operations on these paths
-	// (e.g., a storage.List(...)).
-	forwardablePath := w.core.writeForwardedPaths.HasPath(path)
-
-	if forwardablePath {
-		return w.resolvePath(path)
-	}
-
-	return path, nil
-}
-
-func (w *ForwardedWriter) resolvePath(path string) (string, error) {
-	// This is the source-agnostic path resolution helper. Here we ensure
-	// we've got a forwarded path (one that contains the proper UUID
-	// sentinel) and we fetch this cluster's UUID and update the path.
-	if !strings.Contains(path, logical.PBPWFClusterSentinel) {
-		return "", fmt.Errorf("invalid path: lacks '%v' sentinel for expansion", logical.PBPWFClusterSentinel)
-	}
-
-	return strings.Replace(path, logical.PBPWFClusterSentinel, w.clusterID, 1), nil
-}
diff --git a/vault/generate_root.go b/vault/generate_root.go
index aab4421da1dbb..ec530ff96a562 100644
--- a/vault/generate_root.go
+++ b/vault/generate_root.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/generate_root_recovery.go b/vault/generate_root_recovery.go
index 236ec976eb40f..9757c42e5ff96 100644
--- a/vault/generate_root_recovery.go
+++ b/vault/generate_root_recovery.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/generate_root_test.go b/vault/generate_root_test.go
index 5c554b9d72c2e..7b80d3a447763 100644
--- a/vault/generate_root_test.go
+++ b/vault/generate_root_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/ha.go b/vault/ha.go
index 816ce2309e1c7..b56fc324cd8ad 100644
--- a/vault/ha.go
+++ b/vault/ha.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -18,6 +15,7 @@ import (
 
 	"github.com/armon/go-metrics"
 	"github.com/hashicorp/errwrap"
+	aeadwrapper "github.com/hashicorp/go-kms-wrapping/wrappers/aead/v2"
 	"github.com/hashicorp/go-multierror"
 	"github.com/hashicorp/go-uuid"
 	"github.com/hashicorp/vault/helper/namespace"
@@ -135,10 +133,7 @@ func (c *Core) getHAMembers() ([]HAStatusNode, error) {
 	return nodes, nil
 }
 
-// Leader is used to get information about the current active leader in relation to the current node (core).
-// It utilizes a state lock on the Core by attempting to acquire a read lock. Care should be taken not to
-// call this method if a read lock on this Core's state lock is currently held, as this can cause deadlock.
-// e.g. if called from within request handling.
+// Leader is used to get the current active leader
 func (c *Core) Leader() (isLeader bool, leaderAddr, clusterAddr string, err error) {
 	// Check if HA enabled. We don't need the lock for this check as it's set
 	// on startup and never modified
@@ -529,9 +524,7 @@ func (c *Core) waitForLeadership(newLeaderCh chan func(), manualStepDownCh, stop
 		continueCh := interruptPerfStandby(newLeaderCh, stopCh)
 
 		// Grab the statelock or stop
-		l := newLockGrabber(c.stateLock.Lock, c.stateLock.Unlock, stopCh)
-		go l.grab()
-		if stopped := l.lockOrStop(); stopped {
+		if stopped := grabLockOrStop(c.stateLock.Lock, c.stateLock.Unlock, stopCh); stopped {
 			lock.Unlock()
 			close(continueCh)
 			metrics.MeasureSince([]string{"core", "leadership_setup_failed"}, activeTime)
@@ -668,20 +661,16 @@ func (c *Core) waitForLeadership(newLeaderCh chan func(), manualStepDownCh, stop
 			// Spawn this in a go routine so we can cancel the context and
 			// unblock any inflight requests that are holding the statelock.
 			go func() {
-				timer := time.NewTimer(DefaultMaxRequestDuration)
 				select {
 				case <-activeCtx.Done():
-					timer.Stop()
-					// Attempt to drain any inflight requests
-				case <-timer.C:
+				// Attempt to drain any inflight requests
+				case <-time.After(DefaultMaxRequestDuration):
 					activeCtxCancel()
 				}
 			}()
 
 			// Grab lock if we are not stopped
-			l := newLockGrabber(c.stateLock.Lock, c.stateLock.Unlock, stopCh)
-			go l.grab()
-			stopped := l.lockOrStop()
+			stopped := grabLockOrStop(c.stateLock.Lock, c.stateLock.Unlock, stopCh)
 
 			// Cancel the context incase the above go routine hasn't done it
 			// yet
@@ -724,76 +713,48 @@ func (c *Core) waitForLeadership(newLeaderCh chan func(), manualStepDownCh, stop
 // lock was acquired (stopped=false) then it's up to the caller to unlock. If
 // the lock was not acquired (stopped=true), the caller does not hold the lock and
 // should not call unlock.
-// It's probably better to inline the body of grabLockOrStop into your function
-// instead of calling it. If multiple functions call grabLockOrStop, when a deadlock
-// occurs, we have no way of knowing who launched the grab goroutine, complicating
-// investigation.
 func grabLockOrStop(lockFunc, unlockFunc func(), stopCh chan struct{}) (stopped bool) {
-	l := newLockGrabber(lockFunc, unlockFunc, stopCh)
-	go l.grab()
-	return l.lockOrStop()
-}
-
-type lockGrabber struct {
-	// stopCh provides a way to interrupt the grab-or-stop
-	stopCh chan struct{}
-	// doneCh is closed when the child goroutine is done.
-	doneCh     chan struct{}
-	lockFunc   func()
-	unlockFunc func()
 	// lock protects these variables which are shared by parent and child.
-	lock          sync.Mutex
-	parentWaiting bool
-	locked        bool
-}
+	var lock sync.Mutex
+	parentWaiting := true
+	locked := false
 
-func newLockGrabber(lockFunc, unlockFunc func(), stopCh chan struct{}) *lockGrabber {
-	return &lockGrabber{
-		doneCh:        make(chan struct{}),
-		lockFunc:      lockFunc,
-		unlockFunc:    unlockFunc,
-		parentWaiting: true,
-		stopCh:        stopCh,
-	}
-}
+	// doneCh is closed when the child goroutine is done.
+	doneCh := make(chan struct{})
+	go func() {
+		defer close(doneCh)
+		lockFunc()
+
+		// The parent goroutine may or may not be waiting.
+		lock.Lock()
+		defer lock.Unlock()
+		if !parentWaiting {
+			unlockFunc()
+		} else {
+			locked = true
+		}
+	}()
 
-// lockOrStop waits for grab to get a lock or give up, see grabLockOrStop for how to use it.
-func (l *lockGrabber) lockOrStop() (stopped bool) {
 	stop := false
 	select {
-	case <-l.stopCh:
+	case <-stopCh:
 		stop = true
-	case <-l.doneCh:
+	case <-doneCh:
 	}
 
 	// The child goroutine may not have acquired the lock yet.
-	l.lock.Lock()
-	defer l.lock.Unlock()
-	l.parentWaiting = false
+	lock.Lock()
+	defer lock.Unlock()
+	parentWaiting = false
 	if stop {
-		if l.locked {
-			l.unlockFunc()
+		if locked {
+			unlockFunc()
 		}
 		return true
 	}
 	return false
 }
 
-// grab tries to get a lock, see grabLockOrStop for how to use it.
-func (l *lockGrabber) grab() {
-	defer close(l.doneCh)
-	l.lockFunc()
-
-	// The parent goroutine may or may not be waiting.
-	l.lock.Lock()
-	defer l.lock.Unlock()
-	if !l.parentWaiting {
-		l.unlockFunc()
-	} else {
-		l.locked = true
-	}
-}
-
 // This checks the leader periodically to ensure that we switch RPC to a new
 // leader pretty quickly. There is logic in Leader() already to not make this
 // onerous and avoid more traffic than needed, so we just call that and ignore
@@ -803,9 +764,8 @@ func (c *Core) periodicLeaderRefresh(newLeaderCh chan func(), stopCh chan struct
 
 	clusterAddr := ""
 	for {
-		timer := time.NewTimer(leaderCheckInterval)
 		select {
-		case <-timer.C:
+		case <-time.After(leaderCheckInterval):
 			count := atomic.AddInt32(opCount, 1)
 			if count > 1 {
 				atomic.AddInt32(opCount, -1)
@@ -838,7 +798,6 @@ func (c *Core) periodicLeaderRefresh(newLeaderCh chan func(), stopCh chan struct
 				atomic.AddInt32(lopCount, -1)
 			}()
 		case <-stopCh:
-			timer.Stop()
 			return
 		}
 	}
@@ -851,9 +810,8 @@ func (c *Core) periodicCheckKeyUpgrades(ctx context.Context, stopCh chan struct{
 
 	opCount := new(int32)
 	for {
-		timer := time.NewTimer(keyRotateCheckInterval)
 		select {
-		case <-timer.C:
+		case <-time.After(keyRotateCheckInterval):
 			count := atomic.AddInt32(opCount, 1)
 			if count > 1 {
 				atomic.AddInt32(opCount, -1)
@@ -909,7 +867,6 @@ func (c *Core) periodicCheckKeyUpgrades(ctx context.Context, stopCh chan struct{
 				return
 			}()
 		case <-stopCh:
-			timer.Stop()
 			return
 		}
 	}
@@ -968,11 +925,7 @@ func (c *Core) reloadShamirKey(ctx context.Context) error {
 		}
 		shamirKey = keyring.rootKey
 	}
-	shamirWrapper, err := c.seal.GetShamirWrapper()
-	if err != nil {
-		return err
-	}
-	return shamirWrapper.SetAesGcmKeyBytes(shamirKey)
+	return c.seal.GetAccess().Wrapper.(*aeadwrapper.ShamirWrapper).SetAesGcmKeyBytes(shamirKey)
 }
 
 func (c *Core) performKeyUpgrades(ctx context.Context) error {
@@ -1045,11 +998,9 @@ func (c *Core) acquireLock(lock physical.Lock, stopCh <-chan struct{}) <-chan st
 
 		// Retry the acquisition
 		c.logger.Error("failed to acquire lock", "error", err)
-		timer := time.NewTimer(lockRetryInterval)
 		select {
-		case <-timer.C:
+		case <-time.After(lockRetryInterval):
 		case <-stopCh:
-			timer.Stop()
 			return nil
 		}
 	}
@@ -1116,15 +1067,13 @@ func (c *Core) cleanLeaderPrefix(ctx context.Context, uuid string, leaderLostCh
 		return
 	}
 	for len(keys) > 0 {
-		timer := time.NewTimer(leaderPrefixCleanDelay)
 		select {
-		case <-timer.C:
+		case <-time.After(leaderPrefixCleanDelay):
 			if keys[0] != uuid {
 				c.barrier.Delete(ctx, coreLeaderPrefix+keys[0])
 			}
 			keys = keys[1:]
 		case <-leaderLostCh:
-			timer.Stop()
 			return
 		}
 	}
diff --git a/vault/ha_test.go b/vault/ha_test.go
index ca2e3801bcc6d..03208b80d1d53 100644
--- a/vault/ha_test.go
+++ b/vault/ha_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/hcp_link/capabilities/api_capability/api_capability.go b/vault/hcp_link/capabilities/api_capability/api_capability.go
deleted file mode 100644
index 3bf9b993b1ae5..0000000000000
--- a/vault/hcp_link/capabilities/api_capability/api_capability.go
+++ /dev/null
@@ -1,143 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package api_capability
-
-import (
-	"context"
-	"fmt"
-	"net/http"
-	"sync"
-	"time"
-
-	"github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/go-multierror"
-	scada "github.com/hashicorp/hcp-scada-provider"
-	vaulthttp "github.com/hashicorp/vault/http"
-	"github.com/hashicorp/vault/sdk/helper/consts"
-	"github.com/hashicorp/vault/sdk/logical"
-	"github.com/hashicorp/vault/vault"
-	"github.com/hashicorp/vault/vault/hcp_link/capabilities"
-)
-
-type APICapability struct {
-	l             sync.Mutex
-	logger        hclog.Logger
-	scadaProvider scada.SCADAProvider
-	scadaServer   *http.Server
-	tokenManager  *HCPLinkTokenManager
-	running       bool
-}
-
-var _ capabilities.Capability = &APICapability{}
-
-func NewAPICapability(scadaConfig *scada.Config, scadaProvider scada.SCADAProvider, core *vault.Core, logger hclog.Logger) (*APICapability, error) {
-	apiLogger := logger.Named(capabilities.APICapability)
-	tokenManager, err := NewHCPLinkTokenManager(scadaConfig, core, apiLogger)
-	if err != nil {
-		return nil, fmt.Errorf("failed to start HCP Link token manager")
-	}
-
-	linkHandler := injectBatchTokenHandler(vaulthttp.Handler.Handler(&vault.HandlerProperties{Core: core}), tokenManager)
-
-	apiLogger.Trace("initializing HCP Link API capability")
-
-	// server defaults
-	server := &http.Server{
-		Handler:           linkHandler,
-		ReadHeaderTimeout: 10 * time.Second,
-		ReadTimeout:       30 * time.Second,
-		IdleTimeout:       5 * time.Minute,
-		ErrorLog:          apiLogger.StandardLogger(nil),
-	}
-	return &APICapability{
-		logger:        apiLogger,
-		scadaProvider: scadaProvider,
-		scadaServer:   server,
-		tokenManager:  tokenManager,
-	}, nil
-}
-
-func (c *APICapability) Start() error {
-	c.l.Lock()
-	defer c.l.Unlock()
-
-	if c.running {
-		return nil
-	}
-
-	// Start listening on a SCADA capability
-	listener, err := c.scadaProvider.Listen(capabilities.APICapability)
-	if err != nil {
-		return fmt.Errorf("failed to start listening on a capability: %w", err)
-	}
-
-	go func() {
-		err = c.scadaServer.Serve(listener)
-		c.logger.Error("server closed", "error", err)
-	}()
-
-	c.running = true
-	c.logger.Info("started HCP Link API capability")
-
-	return nil
-}
-
-func (c *APICapability) Stop() error {
-	c.l.Lock()
-	defer c.l.Unlock()
-
-	if !c.running {
-		return nil
-	}
-
-	var retErr *multierror.Error
-
-	c.logger.Info("Tearing down HCP Link API capability")
-
-	err := c.scadaServer.Shutdown(context.Background())
-	if err != nil {
-		retErr = multierror.Append(err, fmt.Errorf("failed to shutdown scada provider HTTP server %w", err))
-	}
-	c.scadaServer = nil
-
-	c.tokenManager.Shutdown()
-	c.tokenManager = nil
-
-	c.running = false
-
-	return retErr.ErrorOrNil()
-}
-
-func (c *APICapability) PurgePolicy() {
-	if c.tokenManager == nil {
-		return
-	}
-	c.tokenManager.ForgetTokenPolicy()
-
-	return
-}
-
-func injectBatchTokenHandler(handler http.Handler, tokenManager *HCPLinkTokenManager) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		tokenManager.logger.Debug("received request", "method", r.Method, "path", r.URL.Path)
-
-		// Only the hcp link token should be used
-		r.Header.Del(consts.AuthHeaderName)
-
-		// for Standby or perfStandby return 412
-		standby, perfStandby := tokenManager.wrappedCore.StandbyStates()
-
-		hcpLinkToken := tokenManager.HandleTokenPolicy(r.Context(), !standby && !perfStandby)
-
-		if standby || perfStandby {
-			logical.RespondError(w, http.StatusPreconditionFailed, fmt.Errorf("API capability is inactive in non-Active nodes"))
-			return
-		}
-
-		r.Header.Set(consts.AuthHeaderName, hcpLinkToken)
-
-		handler.ServeHTTP(w, r)
-		return
-	})
-}
diff --git a/vault/hcp_link/capabilities/api_capability/api_passthrough.go b/vault/hcp_link/capabilities/api_capability/api_passthrough.go
deleted file mode 100644
index 2384f79035e36..0000000000000
--- a/vault/hcp_link/capabilities/api_capability/api_passthrough.go
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package api_capability
-
-import (
-	"context"
-	"fmt"
-	"net/http"
-	"sync"
-	"time"
-
-	"github.com/hashicorp/go-hclog"
-	scada "github.com/hashicorp/hcp-scada-provider"
-	vaulthttp "github.com/hashicorp/vault/http"
-	"github.com/hashicorp/vault/vault"
-	"github.com/hashicorp/vault/vault/hcp_link/capabilities"
-	"github.com/hashicorp/vault/vault/hcp_link/internal"
-)
-
-type APIPassThroughCapability struct {
-	l             sync.Mutex
-	logger        hclog.Logger
-	scadaProvider scada.SCADAProvider
-	scadaServer   *http.Server
-	running       bool
-}
-
-var _ capabilities.Capability = &APIPassThroughCapability{}
-
-func NewAPIPassThroughCapability(scadaProvider scada.SCADAProvider, core *vault.Core, logger hclog.Logger) (*APIPassThroughCapability, error) {
-	apiLogger := logger.Named(capabilities.APIPassThroughCapability)
-
-	linkHandler := requestHandler(vaulthttp.Handler.Handler(&vault.HandlerProperties{Core: core}), core, apiLogger)
-
-	apiLogger.Trace("initializing HCP Link API PassThrough capability")
-
-	// server defaults
-	server := &http.Server{
-		Handler:           linkHandler,
-		ReadHeaderTimeout: 10 * time.Second,
-		ReadTimeout:       30 * time.Second,
-		IdleTimeout:       5 * time.Minute,
-		ErrorLog:          apiLogger.StandardLogger(nil),
-	}
-	return &APIPassThroughCapability{
-		logger:        apiLogger,
-		scadaProvider: scadaProvider,
-		scadaServer:   server,
-	}, nil
-}
-
-func (p *APIPassThroughCapability) Start() error {
-	p.l.Lock()
-	defer p.l.Unlock()
-
-	if p.running {
-		return nil
-	}
-
-	// Start listening on a SCADA capability
-	listener, err := p.scadaProvider.Listen(capabilities.APIPassThroughCapability)
-	if err != nil {
-		return fmt.Errorf("failed to start listening on a capability: %w", err)
-	}
-
-	go func() {
-		err = p.scadaServer.Serve(listener)
-		p.logger.Error("server closed", "error", err)
-	}()
-
-	p.running = true
-	p.logger.Info("started HCP Link API PassThrough capability")
-
-	return nil
-}
-
-func (p *APIPassThroughCapability) Stop() error {
-	p.l.Lock()
-	defer p.l.Unlock()
-
-	if !p.running {
-		return nil
-	}
-
-	p.logger.Info("Tearing down HCP Link API passthrough capability")
-
-	var retErr error
-	err := p.scadaServer.Shutdown(context.Background())
-	if err != nil {
-		retErr = fmt.Errorf("failed to shutdown scada provider HTTP server %w", err)
-	}
-	p.scadaServer = nil
-	p.running = false
-
-	return retErr
-}
-
-func requestHandler(handler http.Handler, wrappedCore internal.WrappedCoreStandbyStates, logger hclog.Logger) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		logger.Debug("received a request in HCP link API passthrough", "method", r.Method, "path", r.URL.Path)
-
-		handler.ServeHTTP(w, r)
-		return
-	})
-}
diff --git a/vault/hcp_link/capabilities/api_capability/token_manager.go b/vault/hcp_link/capabilities/api_capability/token_manager.go
deleted file mode 100644
index f5acb7a515827..0000000000000
--- a/vault/hcp_link/capabilities/api_capability/token_manager.go
+++ /dev/null
@@ -1,269 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package api_capability
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"fmt"
-	"net/http"
-	"sync"
-	"time"
-
-	"github.com/hashicorp/go-cleanhttp"
-	"github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/go-retryablehttp"
-	scada "github.com/hashicorp/hcp-scada-provider"
-	"github.com/hashicorp/vault/helper/namespace"
-	"github.com/hashicorp/vault/sdk/logical"
-	"github.com/hashicorp/vault/vault"
-	"github.com/hashicorp/vault/vault/hcp_link/internal"
-)
-
-const (
-	// HCP policy fetch retry limits
-	policyRetryWaitMin = 500 * time.Millisecond
-	policyRetryWaitMax = 30 * time.Second
-	policyRetryMax     = 3
-
-	// batchTokenDefaultTTL default TTL of a batch token
-	batchTokenDefaultTTL = 5 * time.Minute
-
-	// tokenExpiryOffset is deducted from token expiry to make sure a new token
-	// is generated before an old one is expired.
-	// This is used when Vault is unsealed.
-	tokenExpiryOffset = 5 * time.Second
-)
-
-type HCPLinkTokenManager struct {
-	lock            sync.RWMutex
-	wrappedCore     internal.WrappedCoreHCPToken
-	logger          hclog.Logger
-	scadaConfig     *scada.Config
-	policyUrl       string
-	latestToken     string
-	tokenTTL        time.Duration
-	policy          string
-	lastTokenExpiry time.Time
-}
-
-func (t *HCPLinkTokenManager) SetTokenTTL(ttl time.Duration) error {
-	if ttl < tokenExpiryOffset {
-		return fmt.Errorf("ttl cannot be less than 5 seconds")
-	}
-
-	t.lock.Lock()
-	defer t.lock.Unlock()
-	t.tokenTTL = ttl
-
-	return nil
-}
-
-func (t *HCPLinkTokenManager) GetLatestToken() string {
-	t.lock.RLock()
-	latestToken := t.latestToken
-	t.lock.RUnlock()
-
-	return latestToken
-}
-
-func (t *HCPLinkTokenManager) GetLastTokenExpiry() time.Time {
-	t.lock.RLock()
-	te := t.lastTokenExpiry
-	t.lock.RUnlock()
-
-	return te
-}
-
-func (t *HCPLinkTokenManager) GetPolicy() string {
-	t.lock.RLock()
-	policy := t.policy
-	t.lock.RUnlock()
-
-	return policy
-}
-
-func (t *HCPLinkTokenManager) fetchPolicy() (string, error) {
-	req, err := http.NewRequest(http.MethodGet, t.policyUrl, nil)
-	if err != nil {
-		return "", fmt.Errorf("error creating HTTP request: %w", err)
-	}
-
-	retryableReq, err := retryablehttp.FromRequest(req)
-	if err != nil {
-		return "", fmt.Errorf("error adding HTTP request retry wrapping: %w", err)
-	}
-
-	token, err := t.scadaConfig.HCPConfig.Token()
-	if err != nil {
-		return "", fmt.Errorf("unable to retrieve HCP bearer token: %w", err)
-	}
-
-	retryableReq.Header.Add("Authorization", "Bearer "+token.AccessToken)
-
-	client := &retryablehttp.Client{
-		HTTPClient:   cleanhttp.DefaultClient(),
-		RetryWaitMin: policyRetryWaitMin,
-		RetryWaitMax: policyRetryWaitMax,
-		RetryMax:     policyRetryMax,
-		CheckRetry:   retryablehttp.DefaultRetryPolicy,
-		Backoff:      retryablehttp.DefaultBackoff,
-	}
-
-	resp, err := client.Do(retryableReq)
-	if err != nil {
-		return "", fmt.Errorf("error retrieving policy from HCP: %w", err)
-	}
-
-	if resp.Body == nil {
-		return "", fmt.Errorf("invalid HCP policy response: %w", err)
-	}
-
-	bodyBytes := bytes.NewBuffer(nil)
-	_, err = bodyBytes.ReadFrom(resp.Body)
-	if err != nil {
-		return "", fmt.Errorf("error reading HCP policy response: %w", err)
-	}
-
-	if err := resp.Body.Close(); err != nil {
-		return "", fmt.Errorf("error closing response body: %w", err)
-	}
-
-	body := make(map[string]interface{})
-	err = json.Unmarshal(bodyBytes.Bytes(), &body)
-	if err != nil {
-		return "", fmt.Errorf("error parsing response body: %w", err)
-	}
-
-	policy, ok := body["policy"].(string)
-	if !ok {
-		return "", fmt.Errorf("formatting for policy fetched from HCP is invalid, expected string received %T", body["policy"])
-	}
-
-	return policy, nil
-}
-
-func (t *HCPLinkTokenManager) updateInLinePolicy() {
-	policy, err := t.fetchPolicy()
-	if err != nil {
-		t.logger.Error("failed to fetch policy from HCP", "error", err)
-		return
-	}
-
-	t.logger.Info("new policy fetched from HCP")
-
-	t.lock.Lock()
-	t.policy = policy
-	t.lock.Unlock()
-
-	return
-}
-
-func NewHCPLinkTokenManager(scadaConfig *scada.Config, core *vault.Core, logger hclog.Logger) (*HCPLinkTokenManager, error) {
-	tokenLogger := logger.Named("token_manager")
-
-	policyURL := fmt.Sprintf("https://%s/vault-link/2022-11-07/organizations/%s/projects/%s/link/policy/%s",
-		scadaConfig.HCPConfig.APIAddress(),
-		scadaConfig.Resource.Location.OrganizationID,
-		scadaConfig.Resource.Location.ProjectID,
-		scadaConfig.Resource.ID,
-	)
-
-	m := &HCPLinkTokenManager{
-		wrappedCore:     core,
-		logger:          tokenLogger,
-		scadaConfig:     scadaConfig,
-		policyUrl:       policyURL,
-		tokenTTL:        batchTokenDefaultTTL,
-		lastTokenExpiry: time.Time{},
-	}
-
-	m.logger.Info("initialized HCP Link token manager")
-
-	return m, nil
-}
-
-func (m *HCPLinkTokenManager) Shutdown() {
-	m.ForgetTokenPolicy()
-}
-
-// HandleTokenPolicy checks if Vault is sealed or not an active node,
-// then it removes both token and policy. And, if Vault is not sealed,
-// and token needs to be refreshed it refreshes both policy and token
-func (m *HCPLinkTokenManager) HandleTokenPolicy(ctx context.Context, activeNode bool) string {
-	switch {
-	case m.wrappedCore.Sealed(), !activeNode:
-		m.logger.Debug("failed to create a token as Vault is either sealed or a non-active node. Setting the token to an empty string")
-		m.ForgetTokenPolicy()
-	case m.GetLatestToken() == "", m.GetLastTokenExpiry().Before(time.Now()):
-		m.createToken(ctx)
-	}
-
-	return m.GetLatestToken()
-}
-
-// ForgetTokenPolicy Forgets the current Batch token, its associated policy,
-// and sets the lastTokenExpiry to Now such that the policy is forced to be
-// refreshed by the next valid request.
-func (m *HCPLinkTokenManager) ForgetTokenPolicy() {
-	m.lock.Lock()
-	defer m.lock.Unlock()
-
-	// purging the latest token and policy
-	m.latestToken = ""
-	m.policy = ""
-
-	// setting the token expiry to now as a cleanup step
-	m.lastTokenExpiry = time.Now()
-	m.logger.Info("purged token and inline policy")
-}
-
-func (m *HCPLinkTokenManager) createToken(ctx context.Context) {
-	// updating the policy first
-	m.updateInLinePolicy()
-	policy := m.GetPolicy()
-
-	m.lock.Lock()
-	defer m.lock.Unlock()
-
-	// an orphan batch token is required.
-	// For an orphan token, we need to not set the parent
-	// Also setting the time of creation, and metadata for auditing
-	te := &logical.TokenEntry{
-		Type:               logical.TokenTypeBatch,
-		TTL:                m.tokenTTL,
-		CreationTime:       time.Now().Unix(),
-		NamespaceID:        namespace.RootNamespaceID,
-		NoIdentityPolicies: true,
-		Meta: map[string]string{
-			"hcp_link_token": "HCP Link Access Token",
-		},
-		InlinePolicy: policy,
-		InternalMeta: map[string]string{vault.IgnoreForBilling: "true"},
-	}
-	// try creating the token, if the trial fails, let's set the latestToken
-	// to an empty string, and reset token expiry with a backoff strategy
-	err := m.wrappedCore.CreateToken(ctx, te)
-	if err != nil {
-		m.logger.Error("failed to create a token, setting the token to an empty string", "error", err)
-		m.latestToken = ""
-		m.lastTokenExpiry = time.Now()
-		return
-	}
-
-	if te == nil || len(te.ID) == 0 {
-		m.logger.Error("token creation returned an empty token entry")
-		m.latestToken = ""
-		m.lastTokenExpiry = time.Now()
-		return
-	}
-
-	m.latestToken = te.ID
-	// storing the new token and setting lastTokenExpiry to be 5 seconds before
-	// the TTL
-	m.lastTokenExpiry = time.Now().Add(m.tokenTTL - tokenExpiryOffset)
-
-	m.logger.Info("successfully generated a new token for HCP link")
-}
diff --git a/vault/hcp_link/capabilities/api_capability/token_manager_test.go b/vault/hcp_link/capabilities/api_capability/token_manager_test.go
deleted file mode 100644
index 05a8547d5e920..0000000000000
--- a/vault/hcp_link/capabilities/api_capability/token_manager_test.go
+++ /dev/null
@@ -1,318 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package api_capability
-
-import (
-	"context"
-	"os"
-	"testing"
-	"time"
-
-	"github.com/hashicorp/go-hclog"
-	scada "github.com/hashicorp/hcp-scada-provider"
-	sdkResource "github.com/hashicorp/hcp-sdk-go/resource"
-	"github.com/hashicorp/vault/helper/namespace"
-	"github.com/hashicorp/vault/internalshared/configutil"
-	"github.com/hashicorp/vault/vault"
-	"github.com/hashicorp/vault/vault/hcp_link/internal"
-)
-
-func getHCPConfig(t *testing.T, clientID, clientSecret string) *configutil.HCPLinkConfig {
-	resourceIDRaw, ok := os.LookupEnv("HCP_RESOURCE_ID")
-	if !ok {
-		t.Skip("failed to find the HCP resource ID")
-	}
-	res, err := sdkResource.FromString(resourceIDRaw)
-	if err != nil {
-		t.Fatalf("failed to parse the resource ID, %v", err.Error())
-	}
-	return &configutil.HCPLinkConfig{
-		ResourceIDRaw: resourceIDRaw,
-		Resource:      &res,
-		ClientID:      clientID,
-		ClientSecret:  clientSecret,
-	}
-}
-
-func getTestScadaConfig(t *testing.T) *scada.Config {
-	clientID, ok := os.LookupEnv("HCP_CLIENT_ID")
-	if !ok {
-		t.Skip("HCP client ID not found in env")
-	}
-	clientSecret, ok := os.LookupEnv("HCP_CLIENT_SECRET")
-	if !ok {
-		t.Skip("HCP client secret not found in env")
-	}
-
-	if _, ok := os.LookupEnv("HCP_API_ADDRESS"); !ok {
-		t.Skip("failed to find HCP_API_ADDRESS in the environment")
-	}
-	if _, ok := os.LookupEnv("HCP_SCADA_ADDRESS"); !ok {
-		t.Skip("failed to find HCP_SCADA_ADDRESS in the environment")
-	}
-	if _, ok := os.LookupEnv("HCP_AUTH_URL"); !ok {
-		t.Skip("failed to find HCP_AUTH_URL in the environment")
-	}
-
-	hcpConfig := getHCPConfig(t, clientID, clientSecret)
-
-	scadaConfig, err := internal.NewScadaConfig(hcpConfig, hclog.New(nil))
-	if err != nil {
-		t.Fatalf("failed to initialize Scada config")
-	}
-	return scadaConfig
-}
-
-func TestCreateTokenCoreSealedUnSealed(t *testing.T) {
-	t.Parallel()
-	core := vault.TestCore(t)
-	logger := hclog.New(nil)
-
-	scadaConfig := getTestScadaConfig(t)
-
-	tm, err := NewHCPLinkTokenManager(scadaConfig, core, logger)
-	if err != nil {
-		t.Fatalf("failed to instantiate token manager")
-	}
-
-	if tm.latestToken != "" {
-		t.Fatalf("unexpected latest token")
-	}
-
-	ctx := context.Background()
-	tm.createToken(ctx)
-
-	if tm.latestToken != "" {
-		t.Fatalf("unexpected latest token while core is sealed")
-	}
-
-	// unsealing core
-	vault.TestInitUnsealCore(t, core)
-
-	tm.createToken(ctx)
-	if tm.latestToken == "" {
-		t.Fatalf("latestToken should not be empty")
-	}
-	latestTokenOld := tm.latestToken
-
-	// running update token again should not change the token
-	tm.createToken(ctx)
-
-	if tm.latestToken == latestTokenOld {
-		t.Fatalf("latestToken should have been refreshed")
-	}
-}
-
-func TestShutdownTokenManagerForgetsTokenPolicy(t *testing.T) {
-	t.Parallel()
-	core := vault.TestCore(t)
-	logger := hclog.New(nil)
-
-	scadaConfig := getTestScadaConfig(t)
-
-	tm, err := NewHCPLinkTokenManager(scadaConfig, core, logger)
-	if err != nil {
-		t.Fatalf("failed to instantiate token manager")
-	}
-
-	// unsealing core
-	vault.TestInitUnsealCore(t, core)
-
-	tm.HandleTokenPolicy(context.Background(), true)
-	if tm.GetLatestToken() == "" {
-		t.Fatalf("token manager did not update both token and policy")
-	}
-
-	tm.Shutdown()
-
-	if tm.GetLatestToken() != "" || tm.policy != "" {
-		t.Fatalf("shutting down TM did not forget both token and policy")
-	}
-}
-
-func TestSealVaultTokenManagerForgetsTokenPolicy(t *testing.T) {
-	t.Parallel()
-	core := vault.TestCore(t)
-	logger := hclog.New(nil)
-
-	scadaConfig := getTestScadaConfig(t)
-
-	tm, err := NewHCPLinkTokenManager(scadaConfig, core, logger)
-	if err != nil {
-		t.Fatalf("failed to instantiate token manager")
-	}
-
-	// unsealing core
-	vault.TestInitUnsealCore(t, core)
-
-	ctx := context.Background()
-	tm.HandleTokenPolicy(ctx, true)
-
-	if tm.GetLatestToken() == "" {
-		t.Fatalf("token manager did not update both token and policy")
-	}
-
-	// seal core
-	err = vault.TestCoreSeal(core)
-	if err != nil {
-		t.Fatalf("failed to seal core")
-	}
-
-	tm.HandleTokenPolicy(ctx, true)
-	if tm.GetLatestToken() != "" || tm.GetPolicy() != "" {
-		t.Fatalf("vault is seal, TM did not forget both token and policy")
-	}
-}
-
-func TestCreateTokenWithTTL(t *testing.T) {
-	t.Parallel()
-	core := vault.TestCore(t)
-	logger := hclog.New(nil)
-
-	scadaConfig := getTestScadaConfig(t)
-
-	tm, err := NewHCPLinkTokenManager(scadaConfig, core, logger)
-	if err != nil {
-		t.Fatalf("failed to instantiate token manager")
-	}
-
-	// unsealing core
-	vault.TestInitUnsealCore(t, core)
-
-	ttl := 7 * time.Second
-	err = tm.SetTokenTTL(ttl)
-	if err != nil {
-		t.Fatalf("failed to set token TTL")
-	}
-
-	ctx := context.Background()
-	tm.createToken(ctx)
-
-	latestToken := tm.GetLatestToken()
-	if latestToken == "" {
-		t.Fatalf("latestToken should not be empty")
-	}
-
-	te, err := core.LookupToken(namespace.RootContext(nil), latestToken)
-	if err != nil {
-		t.Fatalf("failed to look up token")
-	}
-	if te.TTL != ttl {
-		t.Fatalf("ttl is not as expected")
-	}
-
-	// sleep until the token is expired
-	deadline := time.Now().Add(8 * time.Second)
-	for time.Now().Before(deadline) {
-		te, err = core.LookupToken(namespace.RootContext(nil), latestToken)
-		if err == nil && te == nil {
-			break
-		}
-		time.Sleep(500 * time.Millisecond)
-	}
-	if err != nil && te != nil {
-		t.Fatalf("token did not expire as expected")
-	}
-}
-
-func TestHandleTokenPolicyWithTokenTTL(t *testing.T) {
-	t.Parallel()
-	core := vault.TestCore(t)
-	logger := hclog.New(nil)
-
-	scadaConfig := getTestScadaConfig(t)
-
-	tm, err := NewHCPLinkTokenManager(scadaConfig, core, logger)
-	if err != nil {
-		t.Fatalf("failed to instantiate token manager")
-	}
-
-	// unsealing core
-	vault.TestInitUnsealCore(t, core)
-
-	ttl := 7 * time.Second
-	err = tm.SetTokenTTL(ttl)
-	if err != nil {
-		t.Fatalf("failed to set token TTL")
-	}
-
-	ctx := context.Background()
-	tm.createToken(ctx)
-
-	latestToken := tm.GetLatestToken()
-	if latestToken == "" {
-		t.Fatalf("latestToken should not be empty")
-	}
-
-	// waiting until TTL - 5 seconds is past
-	time.Sleep(ttl - tokenExpiryOffset + 1)
-
-	newToken := tm.HandleTokenPolicy(ctx, true)
-	if newToken == "" || newToken == latestToken {
-		t.Fatalf("token did not refreshed after expiry")
-	}
-}
-
-func TestHandleTokenPolicySealedUnsealed(t *testing.T) {
-	t.Parallel()
-	core := vault.TestCore(t)
-	logger := hclog.New(nil)
-
-	scadaConfig := getTestScadaConfig(t)
-
-	tm, err := NewHCPLinkTokenManager(scadaConfig, core, logger)
-	if err != nil {
-		t.Fatalf("failed to instantiate token manager")
-	}
-
-	tm.latestToken = "non empty"
-	tm.policy = "non empty"
-
-	ctx := context.Background()
-	tm.HandleTokenPolicy(ctx, true)
-	if tm.GetLatestToken() != "" || tm.GetPolicy() != "" {
-		t.Fatalf("on sealed Vault, token and policy was not deleted")
-	}
-
-	tm.latestToken = "non empty"
-	tm.policy = "non empty"
-
-	// unsealing core
-	vault.TestInitUnsealCore(t, core)
-
-	tm.HandleTokenPolicy(ctx, true)
-
-	if tm.GetLatestToken() == "non empty" {
-		t.Fatalf("latestToken and policy should have been updated")
-	}
-}
-
-func TestForgetTokenPolicySealedUnsealed(t *testing.T) {
-	t.Parallel()
-	core := vault.TestCore(t)
-	logger := hclog.New(nil)
-
-	scadaConfig := getTestScadaConfig(t)
-
-	tm, err := NewHCPLinkTokenManager(scadaConfig, core, logger)
-	if err != nil {
-		t.Fatalf("failed to instantiate token manager")
-	}
-
-	// unsealing core
-	vault.TestInitUnsealCore(t, core)
-
-	ctx := context.Background()
-	tm.HandleTokenPolicy(ctx, true)
-
-	if tm.GetLatestToken() == "" {
-		t.Fatalf("on sealed Vault, token and policy was not refreshed")
-	}
-
-	tm.ForgetTokenPolicy()
-
-	if tm.GetLatestToken() != "" || tm.GetPolicy() != "" {
-		t.Fatalf("on sealed Vault, token and policy was not deleted")
-	}
-}
diff --git a/vault/hcp_link/capabilities/capability.go b/vault/hcp_link/capabilities/capability.go
index a4e5d704a894d..3e6791affe594 100644
--- a/vault/hcp_link/capabilities/capability.go
+++ b/vault/hcp_link/capabilities/capability.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package capabilities
 
 const (
diff --git a/vault/hcp_link/capabilities/link_control/link_control.go b/vault/hcp_link/capabilities/link_control/link_control.go
deleted file mode 100644
index e7fc909e06c89..0000000000000
--- a/vault/hcp_link/capabilities/link_control/link_control.go
+++ /dev/null
@@ -1,136 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package link_control
-
-import (
-	"context"
-	"fmt"
-	"math"
-	"runtime/debug"
-	"sync"
-	"time"
-
-	"github.com/hashicorp/go-hclog"
-	scada "github.com/hashicorp/hcp-scada-provider"
-	"github.com/hashicorp/vault/vault"
-	"github.com/hashicorp/vault/vault/cluster"
-	"github.com/hashicorp/vault/vault/hcp_link/capabilities"
-	"github.com/hashicorp/vault/vault/hcp_link/internal"
-	"github.com/hashicorp/vault/vault/hcp_link/proto/link_control"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/keepalive"
-	"google.golang.org/grpc/reflection"
-)
-
-type purgePolicyFunc func()
-
-type hcpLinkControlHandler struct {
-	link_control.UnimplementedHCPLinkControlServer
-
-	purgeFunc     purgePolicyFunc
-	wrappedCore   internal.WrappedCoreStandbyStates
-	scadaProvider scada.SCADAProvider
-	logger        hclog.Logger
-
-	l          sync.Mutex
-	grpcServer *grpc.Server
-	running    bool
-}
-
-func NewHCPLinkControlService(scadaProvider scada.SCADAProvider, core *vault.Core, policyPurger purgePolicyFunc, baseLogger hclog.Logger) *hcpLinkControlHandler {
-	logger := baseLogger.Named(capabilities.LinkControlCapability)
-	logger.Trace("initializing HCP Link Control capability")
-
-	grpcServer := grpc.NewServer(
-		grpc.KeepaliveParams(keepalive.ServerParameters{
-			Time: 2 * time.Second,
-		}),
-		grpc.MaxSendMsgSize(math.MaxInt32),
-		grpc.MaxRecvMsgSize(math.MaxInt32),
-	)
-
-	handler := &hcpLinkControlHandler{
-		purgeFunc:     policyPurger,
-		logger:        logger,
-		grpcServer:    grpcServer,
-		scadaProvider: scadaProvider,
-		wrappedCore:   core,
-	}
-
-	link_control.RegisterHCPLinkControlServer(grpcServer, handler)
-	reflection.Register(grpcServer)
-
-	return handler
-}
-
-func (h *hcpLinkControlHandler) Start() error {
-	h.l.Lock()
-	defer h.l.Unlock()
-
-	if h.running {
-		return nil
-	}
-
-	// Starting link-control service
-	linkControlListener, err := h.scadaProvider.Listen(capabilities.LinkControlCapability)
-	if err != nil {
-		return fmt.Errorf("failed to initialize link-control capability listener: %w", err)
-	}
-
-	if linkControlListener == nil {
-		return fmt.Errorf("no listener found for link-control capability")
-	}
-
-	// Start the gRPC server
-	go func() {
-		err = h.grpcServer.Serve(linkControlListener)
-		h.logger.Error("server closed", "error", err)
-	}()
-
-	h.running = true
-
-	h.logger.Trace("started HCP Link Control capability")
-	return nil
-}
-
-func (h *hcpLinkControlHandler) Stop() error {
-	h.l.Lock()
-	defer h.l.Unlock()
-
-	if !h.running {
-		return nil
-	}
-
-	// Give some time for existing RPCs to drain.
-	time.Sleep(cluster.ListenerAcceptDeadline)
-
-	h.logger.Info("Tearing down HCP Link Control")
-
-	h.grpcServer.Stop()
-
-	h.running = false
-
-	return nil
-}
-
-func (h *hcpLinkControlHandler) PurgePolicy(ctx context.Context, req *link_control.PurgePolicyRequest) (retResp *link_control.PurgePolicyResponse, retErr error) {
-	defer func() {
-		if r := recover(); r != nil {
-			h.logger.Error("panic serving purge policy request", "error", r, "stacktrace", string(debug.Stack()))
-			retErr = vault.ErrInternalError
-		}
-	}()
-
-	standby, perfStandby := h.wrappedCore.StandbyStates()
-	// only purging an active node, perf/standby nodes should purge
-	// automatically
-	if standby || perfStandby {
-		h.logger.Debug("cannot purge the policy on a non-active node")
-	} else {
-		h.purgeFunc()
-		h.logger.Debug("Purged token and policy")
-	}
-
-	return &link_control.PurgePolicyResponse{}, nil
-}
diff --git a/vault/hcp_link/capabilities/meta/meta.go b/vault/hcp_link/capabilities/meta/meta.go
deleted file mode 100644
index c3ad46a3f9213..0000000000000
--- a/vault/hcp_link/capabilities/meta/meta.go
+++ /dev/null
@@ -1,340 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package meta
-
-import (
-	"context"
-	"fmt"
-	"math"
-	"os"
-	"runtime/debug"
-	"sync"
-	"time"
-
-	"github.com/hashicorp/go-hclog"
-	scada "github.com/hashicorp/hcp-scada-provider"
-	"github.com/hashicorp/vault/helper/namespace"
-	"github.com/hashicorp/vault/sdk/helper/consts"
-	"github.com/hashicorp/vault/vault"
-	"github.com/hashicorp/vault/vault/cluster"
-	"github.com/hashicorp/vault/vault/hcp_link/capabilities"
-	"github.com/hashicorp/vault/vault/hcp_link/internal"
-	"github.com/hashicorp/vault/vault/hcp_link/proto/meta"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/keepalive"
-	"google.golang.org/grpc/reflection"
-)
-
-type hcpLinkMetaHandler struct {
-	meta.UnimplementedHCPLinkMetaServer
-
-	wrappedCore   internal.WrappedCoreMeta
-	scadaProvider scada.SCADAProvider
-	logger        hclog.Logger
-
-	l          sync.Mutex
-	grpcServer *grpc.Server
-	stopCh     chan struct{}
-	running    bool
-}
-
-func NewHCPLinkMetaService(scadaProvider scada.SCADAProvider, c *vault.Core, baseLogger hclog.Logger) *hcpLinkMetaHandler {
-	logger := baseLogger.Named(capabilities.MetaCapability)
-
-	grpcServer := grpc.NewServer(
-		grpc.KeepaliveParams(keepalive.ServerParameters{
-			Time: 2 * time.Second,
-		}),
-		grpc.MaxSendMsgSize(math.MaxInt32),
-		grpc.MaxRecvMsgSize(math.MaxInt32),
-	)
-
-	handler := &hcpLinkMetaHandler{
-		wrappedCore:   c,
-		logger:        logger,
-		grpcServer:    grpcServer,
-		scadaProvider: scadaProvider,
-	}
-
-	meta.RegisterHCPLinkMetaServer(grpcServer, handler)
-	reflection.Register(grpcServer)
-
-	return handler
-}
-
-func (h *hcpLinkMetaHandler) Start() error {
-	h.l.Lock()
-	defer h.l.Unlock()
-
-	if h.running {
-		return nil
-	}
-
-	// Starting meta service
-	metaListener, err := h.scadaProvider.Listen(capabilities.MetaCapability)
-	if err != nil {
-		return fmt.Errorf("failed to initialize meta capability listener: %w", err)
-	}
-
-	if metaListener == nil {
-		return fmt.Errorf("no listener found for meta capability")
-	}
-
-	h.logger.Info("starting HCP meta capability")
-	// Start the gRPC server
-	go func() {
-		err = h.grpcServer.Serve(metaListener)
-		h.logger.Error("server closed", "error", err)
-	}()
-
-	h.running = true
-
-	return nil
-}
-
-func (h *hcpLinkMetaHandler) Stop() error {
-	h.l.Lock()
-	defer h.l.Unlock()
-
-	if !h.running {
-		return nil
-	}
-
-	// Give some time for existing RPCs to drain.
-	time.Sleep(cluster.ListenerAcceptDeadline)
-
-	h.logger.Info("tearing down HCP meta capability")
-
-	if h.stopCh != nil {
-		close(h.stopCh)
-		h.stopCh = nil
-	}
-
-	h.grpcServer.Stop()
-
-	h.running = false
-
-	return nil
-}
-
-func (h *hcpLinkMetaHandler) ListNamespaces(ctx context.Context, req *meta.ListNamespacesRequest) (retResp *meta.ListNamespacesResponse, retErr error) {
-	defer func() {
-		if r := recover(); r != nil {
-			h.logger.Error("panic serving list namespaces request", "error", r, "stacktrace", string(debug.Stack()))
-			retErr = vault.ErrInternalError
-		}
-	}()
-
-	children := h.wrappedCore.ListNamespaces(true)
-
-	var namespaces []string
-	for _, child := range children {
-		namespaces = append(namespaces, child.Path)
-	}
-
-	return &meta.ListNamespacesResponse{
-		Paths: namespaces,
-	}, nil
-}
-
-func (h *hcpLinkMetaHandler) ListMounts(ctx context.Context, req *meta.ListMountsRequest) (retResp *meta.ListMountsResponse, retErr error) {
-	defer func() {
-		if r := recover(); r != nil {
-			h.logger.Error("panic serving list mounts request", "error", r, "stacktrace", string(debug.Stack()))
-			retErr = vault.ErrInternalError
-		}
-	}()
-
-	mountEntries, err := h.wrappedCore.ListMounts()
-	if err != nil {
-		return nil, fmt.Errorf("unable to list secret mounts: %w", err)
-	}
-
-	var mounts []*meta.Mount
-	for _, entry := range mountEntries {
-		nsID := entry.NamespaceID
-		path := entry.Path
-
-		if nsID != namespace.RootNamespaceID {
-			ns, err := h.wrappedCore.NamespaceByID(ctx, entry.NamespaceID)
-			if err != nil {
-				return nil, fmt.Errorf("unable to get namespace associated with secret mount: %w", err)
-			}
-
-			path = ns.Path + path
-		}
-
-		mounts = append(mounts, &meta.Mount{
-			Path:        path,
-			Type:        entry.Type,
-			Description: entry.Description,
-		})
-	}
-
-	return &meta.ListMountsResponse{
-		Mounts: mounts,
-	}, nil
-}
-
-func (h *hcpLinkMetaHandler) ListAuths(ctx context.Context, req *meta.ListAuthsRequest) (retResp *meta.ListAuthResponse, retErr error) {
-	defer func() {
-		if r := recover(); r != nil {
-			h.logger.Error("panic serving list auths request", "error", r, "stacktrace", string(debug.Stack()))
-			retErr = vault.ErrInternalError
-		}
-	}()
-
-	authEntries, err := h.wrappedCore.ListAuths()
-	if err != nil {
-		return nil, fmt.Errorf("unable to list auth mounts: %w", err)
-	}
-
-	var auths []*meta.Auth
-	for _, entry := range authEntries {
-		nsID := entry.NamespaceID
-		path := entry.Path
-
-		if nsID != namespace.RootNamespaceID {
-			ns, err := h.wrappedCore.NamespaceByID(ctx, entry.NamespaceID)
-			if err != nil {
-				return nil, fmt.Errorf("unable to get namespace associated with auth mount: %w", err)
-			}
-
-			path = ns.Path + path
-		}
-
-		auths = append(auths, &meta.Auth{
-			Path:        path,
-			Type:        entry.Type,
-			Description: entry.Description,
-		})
-	}
-
-	return &meta.ListAuthResponse{
-		Auths: auths,
-	}, nil
-}
-
-func (h *hcpLinkMetaHandler) GetClusterStatus(ctx context.Context, req *meta.GetClusterStatusRequest) (retResp *meta.GetClusterStatusResponse, retErr error) {
-	defer func() {
-		if r := recover(); r != nil {
-			h.logger.Error("panic serving cluster status request", "error", r, "stacktrace", string(debug.Stack()))
-			retErr = vault.ErrInternalError
-		}
-	}()
-
-	if h.wrappedCore.HAStateWithLock() != consts.Active {
-		return nil, fmt.Errorf("node not active")
-	}
-
-	hostname, err := os.Hostname()
-	if err != nil {
-		return nil, fmt.Errorf("unable to fetch hostname: %w", err)
-	}
-
-	haEnabled := h.wrappedCore.HAEnabled()
-	haStatus := &meta.HAStatus{
-		Enabled: haEnabled,
-	}
-
-	if haEnabled {
-		leader := &meta.HANode{
-			Hostname: hostname,
-		}
-
-		peers := h.wrappedCore.GetHAPeerNodesCached()
-
-		haNodes := make([]*meta.HANode, len(peers)+1)
-		haNodes[0] = leader
-
-		for i, peerNode := range peers {
-			haNodes[i+1] = &meta.HANode{
-				Hostname: peerNode.Hostname,
-			}
-		}
-
-		haStatus.Nodes = haNodes
-	}
-
-	raftStatus := &meta.RaftStatus{}
-	raftConfig, err := h.wrappedCore.GetRaftConfiguration(ctx)
-	if err != nil {
-		return nil, fmt.Errorf("unable to get Raft configuration: %w", err)
-	}
-
-	if raftConfig != nil {
-		raftServers := make([]*meta.RaftServer, len(raftConfig.Servers))
-
-		var voterCount uint32
-		for i, srv := range raftConfig.Servers {
-			raftServers[i] = &meta.RaftServer{
-				NodeID:          srv.NodeID,
-				Address:         srv.Address,
-				Voter:           srv.Voter,
-				Leader:          srv.Leader,
-				ProtocolVersion: srv.ProtocolVersion,
-			}
-
-			if srv.Voter {
-				voterCount++
-			}
-		}
-
-		raftStatus.RaftConfiguration = &meta.RaftConfiguration{
-			Servers: raftServers,
-		}
-
-		evenVoterMessage := "Vault should have access to an odd number of voter nodes."
-		largeClusterMessage := "Very large cluster detected."
-		var quorumWarning string
-
-		if voterCount == 1 {
-			quorumWarning = "Only one server node found. Vault is not running in high availability mode."
-		} else if voterCount%2 == 0 && voterCount > 7 {
-			quorumWarning = evenVoterMessage + " " + largeClusterMessage
-		} else if voterCount%2 == 0 {
-			quorumWarning = evenVoterMessage
-		} else if voterCount > 7 {
-			quorumWarning = largeClusterMessage
-		}
-
-		raftStatus.QuorumWarning = quorumWarning
-	}
-
-	raftAutopilotState, err := h.wrappedCore.GetRaftAutopilotState(ctx)
-	if err != nil {
-		return nil, fmt.Errorf("unable to get Raft Autopilot state: %w", err)
-	}
-
-	if raftAutopilotState != nil {
-		autopilotStatus := &meta.AutopilotStatus{
-			Healthy: raftAutopilotState.Healthy,
-		}
-
-		autopilotServers := make([]*meta.AutopilotServer, 0)
-		for _, srv := range raftAutopilotState.Servers {
-			autopilotServers = append(autopilotServers, &meta.AutopilotServer{
-				ID:      srv.ID,
-				Healthy: srv.Healthy,
-			})
-		}
-
-		raftStatus.AutopilotStatus = autopilotStatus
-	}
-
-	clusterInfo, err := h.wrappedCore.Cluster(ctx)
-	if err != nil {
-		return nil, fmt.Errorf("unable to get cluster information: %w", err)
-	}
-
-	resp := &meta.GetClusterStatusResponse{
-		ClusterID:   clusterInfo.ID,
-		ClusterName: clusterInfo.Name,
-		HAStatus:    haStatus,
-		RaftStatus:  raftStatus,
-		StorageType: h.wrappedCore.StorageType(),
-	}
-
-	return resp, nil
-}
diff --git a/vault/hcp_link/capabilities/node_status/node_status.go b/vault/hcp_link/capabilities/node_status/node_status.go
deleted file mode 100644
index d86f041d19c50..0000000000000
--- a/vault/hcp_link/capabilities/node_status/node_status.go
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package node_status
-
-import (
-	"context"
-
-	"github.com/hashicorp/hcp-link/pkg/nodestatus"
-	"github.com/hashicorp/vault/helper/logging"
-	"github.com/hashicorp/vault/vault"
-	"github.com/hashicorp/vault/vault/hcp_link/internal"
-	"github.com/hashicorp/vault/vault/hcp_link/proto/node_status"
-	"github.com/shirou/gopsutil/v3/host"
-	"google.golang.org/protobuf/types/known/timestamppb"
-)
-
-var (
-	_       nodestatus.Reporter = &NodeStatusReporter{}
-	Version                     = 1
-)
-
-type NodeStatusReporter struct {
-	NodeStatusGetter internal.WrappedCoreNodeStatus
-}
-
-func (c *NodeStatusReporter) GetNodeStatus(ctx context.Context) (retStatus nodestatus.NodeStatus, retErr error) {
-	defer func() {
-		if r := recover(); r != nil {
-			retErr = vault.ErrInternalError
-		}
-	}()
-
-	var status nodestatus.NodeStatus
-
-	sealStatus, err := c.NodeStatusGetter.GetSealStatus(ctx)
-	if err != nil {
-		return status, err
-	}
-
-	replState := c.NodeStatusGetter.ReplicationState()
-	hostInfo, err := host.InfoWithContext(ctx)
-	if err != nil {
-		return status, err
-	}
-
-	listenerAddresses, err := c.NodeStatusGetter.ListenerAddresses()
-	if err != nil {
-		return status, err
-	}
-
-	logLevel, err := logging.ParseLogLevel(c.NodeStatusGetter.LogLevel())
-	if err != nil {
-		return status, err
-	}
-
-	raftStatus := &node_status.RaftStatus{}
-	if sealStatus.StorageType == "raft" {
-		raftStatus.IsVoter = c.NodeStatusGetter.IsRaftVoter()
-	}
-
-	protoRes := &node_status.LinkedClusterNodeStatusResponse{
-		Type:                   sealStatus.Type,
-		Initialized:            sealStatus.Initialized,
-		Sealed:                 sealStatus.Sealed,
-		T:                      int64(sealStatus.T),
-		N:                      int64(sealStatus.N),
-		Progress:               int64(sealStatus.Progress),
-		Nonce:                  sealStatus.Nonce,
-		Version:                sealStatus.Version,
-		BuildDate:              sealStatus.BuildDate,
-		Migration:              sealStatus.Migration,
-		ClusterID:              sealStatus.ClusterID,
-		ClusterName:            sealStatus.ClusterName,
-		RecoverySeal:           sealStatus.RecoverySeal,
-		StorageType:            sealStatus.StorageType,
-		ReplicationState:       replState.StateStrings(),
-		Hostname:               hostInfo.Hostname,
-		ListenerAddresses:      listenerAddresses,
-		OperatingSystem:        hostInfo.Platform,
-		OperatingSystemVersion: hostInfo.PlatformVersion,
-		LogLevel:               node_status.LogLevel(logLevel),
-		ActiveTime:             timestamppb.New(c.NodeStatusGetter.ActiveTime()),
-		RaftStatus:             raftStatus,
-	}
-
-	status.StatusVersion = uint32(Version)
-	status.Status = protoRes
-
-	return status, nil
-}
diff --git a/vault/hcp_link/internal/config.go b/vault/hcp_link/internal/config.go
deleted file mode 100644
index 8357eca344672..0000000000000
--- a/vault/hcp_link/internal/config.go
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package internal
-
-import (
-	"fmt"
-
-	"github.com/hashicorp/go-hclog"
-	linkConfig "github.com/hashicorp/hcp-link/pkg/config"
-	"github.com/hashicorp/hcp-link/pkg/nodestatus"
-	scada "github.com/hashicorp/hcp-scada-provider"
-	cloud "github.com/hashicorp/hcp-sdk-go/clients/cloud-shared/v1/models"
-	sdkConfig "github.com/hashicorp/hcp-sdk-go/config"
-	"github.com/hashicorp/vault/internalshared/configutil"
-)
-
-const ServiceName = "vault-link"
-
-func NewScadaConfig(linkConf *configutil.HCPLinkConfig, logger hclog.Logger) (*scada.Config, error) {
-	// getting models.HashicorpCloudLocationLink to be passed in the
-	// scada.config
-	res := linkConf.Resource.Link()
-
-	// creating a base from the env allows for overriding the following for dev purposes:
-	// - auth URL:      HCP_AUTH_URL
-	// - SCADA address: HCP_SCADA_ADDRESS
-	// - API address:   HCP_API_ADDRESS
-	opts := []sdkConfig.HCPConfigOption{sdkConfig.FromEnv()}
-
-	// client ID and client secret from config takes precedence despite
-	// sdkConfig.FromEnv allowing to set from env
-	opts = append(opts, sdkConfig.WithClientCredentials(linkConf.ClientID, linkConf.ClientSecret))
-
-	hcpConfig, err := sdkConfig.NewHCPConfig(opts...)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create HCP config: %w", err)
-	}
-
-	// Compile SCADA config
-	scadaConfig := &scada.Config{
-		Service:   ServiceName,
-		HCPConfig: hcpConfig,
-		Resource:  *res,
-		Logger:    logger,
-	}
-	return scadaConfig, nil
-}
-
-// NewLinkConfig validates the provided values and constructs an instance of a Config.
-func NewLinkConfig(nodeID string, nodeVersion string, resource cloud.HashicorpCloudLocationLink, scadaProvider scada.SCADAProvider, hcpConfig sdkConfig.HCPConfig, nodeStatusReporter nodestatus.Reporter, logger hclog.Logger) (*linkConfig.Config, error) {
-	config := &linkConfig.Config{
-		NodeID:             nodeID,
-		NodeVersion:        nodeVersion,
-		HCPConfig:          hcpConfig,
-		Resource:           resource,
-		NodeStatusReporter: nodeStatusReporter,
-		SCADAProvider:      scadaProvider,
-		Logger:             logger,
-	}
-
-	err := config.Validate()
-	if err != nil {
-		return nil, fmt.Errorf("failed to create the link config: %w", err)
-	}
-
-	return config, nil
-}
diff --git a/vault/hcp_link/internal/wrapped_hcpLink.go b/vault/hcp_link/internal/wrapped_hcpLink.go
index ea9941f017768..0bc9717bc8dd6 100644
--- a/vault/hcp_link/internal/wrapped_hcpLink.go
+++ b/vault/hcp_link/internal/wrapped_hcpLink.go
@@ -1,25 +1,16 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package internal
 
 import (
 	"context"
-	"time"
 
 	"github.com/hashicorp/vault/helper/namespace"
-	"github.com/hashicorp/vault/physical/raft"
 	"github.com/hashicorp/vault/sdk/helper/consts"
 	"github.com/hashicorp/vault/sdk/logical"
 	"github.com/hashicorp/vault/vault"
 )
 
 type WrappedCoreNodeStatus interface {
-	ActiveTime() time.Time
 	GetSealStatus(ctx context.Context) (*vault.SealStatusResponse, error)
-	IsRaftVoter() bool
-	ListenerAddresses() ([]string, error)
-	LogLevel() string
 	ReplicationState() consts.ReplicationState
 }
 
@@ -39,21 +30,14 @@ type WrappedCoreHCPToken interface {
 
 var _ WrappedCoreHCPToken = &vault.Core{}
 
-type WrappedCoreMeta interface {
+type WrappedCoreListNamespacesMounts interface {
 	NamespaceByID(ctx context.Context, nsID string) (*namespace.Namespace, error)
 	ListNamespaces(includePath bool) []*namespace.Namespace
 	ListMounts() ([]*vault.MountEntry, error)
 	ListAuths() ([]*vault.MountEntry, error)
-	HAEnabled() bool
-	HAStateWithLock() consts.HAState
-	GetHAPeerNodesCached() []vault.PeerNode
-	GetRaftConfiguration(ctx context.Context) (*raft.RaftConfigurationResponse, error)
-	GetRaftAutopilotState(ctx context.Context) (*raft.AutopilotState, error)
-	StorageType() string
-	Cluster(ctx context.Context) (*vault.Cluster, error)
 }
 
-var _ WrappedCoreMeta = &vault.Core{}
+var _ WrappedCoreListNamespacesMounts = &vault.Core{}
 
 type WrappedCoreHCPLinkStatus interface {
 	WrappedCoreStandbyStates
diff --git a/vault/hcp_link/link.go b/vault/hcp_link/link.go
deleted file mode 100644
index 834ae666532ad..0000000000000
--- a/vault/hcp_link/link.go
+++ /dev/null
@@ -1,385 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package hcp_link
-
-import (
-	"errors"
-	"fmt"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/go-multierror"
-	link "github.com/hashicorp/hcp-link"
-	linkConfig "github.com/hashicorp/hcp-link/pkg/config"
-	scada "github.com/hashicorp/hcp-scada-provider"
-	"github.com/hashicorp/vault/internalshared/configutil"
-	"github.com/hashicorp/vault/vault"
-	"github.com/hashicorp/vault/vault/hcp_link/capabilities"
-	"github.com/hashicorp/vault/vault/hcp_link/capabilities/api_capability"
-	"github.com/hashicorp/vault/vault/hcp_link/capabilities/link_control"
-	"github.com/hashicorp/vault/vault/hcp_link/capabilities/meta"
-	"github.com/hashicorp/vault/vault/hcp_link/capabilities/node_status"
-	"github.com/hashicorp/vault/vault/hcp_link/internal"
-	vaultVersion "github.com/hashicorp/vault/version"
-)
-
-const (
-	SetLinkStatusCadence = 5 * time.Second
-
-	// metaDataNodeStatus is used to set the Scada provider metadata status
-	// to indicate if Vault is in active or standby status
-	metaDataNodeStatus = "link.node_status"
-
-	standbyStatus     = "STANDBY"
-	activeStatus      = "ACTIVE"
-	perfStandbyStatus = "PERF-STANDBY"
-)
-
-var (
-	// genericScadaConnectionError is used when Vault fails to fetch
-	// last connection error from Scada Provider
-	genericScadaConnectionError = errors.New("unable to establish a connection with HCP")
-	invalidClientCredentials    = errors.New("failed to get access token: oauth2: cannot fetch token: 401 Unauthorized")
-)
-
-type HCPLinkVault struct {
-	l            sync.RWMutex
-	LinkStatus   internal.WrappedCoreHCPLinkStatus
-	scadaConfig  *scada.Config
-	linkConfig   *linkConfig.Config
-	link         link.Link
-	logger       hclog.Logger
-	capabilities map[string]capabilities.Capability
-	stopCh       chan struct{}
-	running      bool
-}
-
-func NewHCPLink(linkConf *configutil.HCPLinkConfig, core *vault.Core, logger hclog.Logger) (*HCPLinkVault, error) {
-	if linkConf == nil {
-		return nil, nil
-	}
-
-	scadaLogger := logger.Named("scada")
-	scadaConfig, err := internal.NewScadaConfig(linkConf, scadaLogger)
-	if err != nil {
-		return nil, fmt.Errorf("failed to instantiate SCADA config, %w", err)
-	}
-
-	// setting the link status in core, as link config is not nil
-	// At this point scada provider has not been started yet
-	// After starting scada provider, we need to use
-	// scadaProvider.SessionStatus() to get the status of the connection
-	core.SetHCPLinkStatus(
-		buildConnectionErrorMessage(scada.SessionStatusDisconnected, scada.ErrProviderNotStarted.Error(), time.Now()),
-		scadaConfig.Resource.Location.ProjectID,
-	)
-
-	// Creating SCADA provider
-	scadaProvider, err := scada.New(scadaConfig)
-	if err != nil {
-		return nil, fmt.Errorf("failed to instantiate SCADA provider: %w", err)
-	}
-
-	resource := scadaConfig.Resource
-	hcpConfig := scadaConfig.HCPConfig
-	version := vaultVersion.Version
-
-	// initializing node status reporter. This capability is configured by link lib.
-	statusReporter := &node_status.NodeStatusReporter{
-		NodeStatusGetter: core,
-	}
-	nodeID, err := core.LoadNodeID()
-	if err != nil {
-		return nil, fmt.Errorf("failed to get nodeID, %w", err)
-	}
-
-	// Compile the Link config
-	var conf *linkConfig.Config
-	conf, err = internal.NewLinkConfig(
-		nodeID,
-		version,
-		resource,
-		scadaProvider,
-		hcpConfig,
-		statusReporter,
-		logger,
-	)
-	if err != nil {
-		return nil, fmt.Errorf("failed to instantiate Link library config: %w", err)
-	}
-
-	// Create a Link library instance
-	hcpLink, err := link.New(conf)
-	if err != nil {
-		return nil, fmt.Errorf("failed to instantiate Link library: %w", err)
-	}
-
-	hcpLinkCaps, err := initializeCapabilities(linkConf, scadaConfig, scadaProvider, core, logger)
-	if err != nil {
-		return nil, fmt.Errorf("failed to initialize capabilities: %w", err)
-	}
-
-	hcpLinkVault := &HCPLinkVault{
-		LinkStatus:   core,
-		scadaConfig:  scadaConfig,
-		linkConfig:   conf,
-		link:         hcpLink,
-		capabilities: hcpLinkCaps,
-		stopCh:       make(chan struct{}),
-		logger:       logger,
-	}
-
-	// Start hcpLink and ScadaProvider
-	err = hcpLinkVault.start()
-	if err != nil {
-		return nil, fmt.Errorf("failed to start hcp link, %w", err)
-	}
-
-	return hcpLinkVault, nil
-}
-
-func initializeCapabilities(linkConf *configutil.HCPLinkConfig, scadaConfig *scada.Config, scadaProvider scada.SCADAProvider, core *vault.Core, logger hclog.Logger) (map[string]capabilities.Capability, error) {
-	hcpLinkCaps := make(map[string]capabilities.Capability, 0)
-
-	metaCap := meta.NewHCPLinkMetaService(scadaProvider, core, logger)
-	hcpLinkCaps[capabilities.MetaCapability] = metaCap
-
-	// Initializing API and link-control capabilities
-	var retErr *multierror.Error
-	if linkConf.EnableAPICapability {
-		apiCap, err := api_capability.NewAPICapability(scadaConfig, scadaProvider, core, logger)
-		if err != nil {
-			retErr = multierror.Append(retErr, fmt.Errorf("failed to instantiate API capability, %w", err))
-		}
-		hcpLinkCaps[capabilities.APICapability] = apiCap
-
-		// link control capability is tied to api capability
-		linkControlCap := link_control.NewHCPLinkControlService(scadaProvider, core, apiCap.PurgePolicy, logger)
-		hcpLinkCaps[capabilities.LinkControlCapability] = linkControlCap
-
-	}
-
-	// Initializing Passthrough capability
-	if linkConf.EnablePassThroughCapability {
-		apiPassCap, err := api_capability.NewAPIPassThroughCapability(scadaProvider, core, logger)
-		if err != nil {
-			retErr = multierror.Append(retErr, fmt.Errorf("failed to instantiate PassThrough capability, %w", err))
-		}
-		hcpLinkCaps[capabilities.APIPassThroughCapability] = apiPassCap
-	}
-
-	return hcpLinkCaps, retErr.ErrorOrNil()
-}
-
-// Start the connection regardless if the node is in seal mode or not
-func (h *HCPLinkVault) start() error {
-	h.l.Lock()
-	defer h.l.Unlock()
-
-	if h.running {
-		return nil
-	}
-
-	if h.linkConfig == nil {
-		return fmt.Errorf("hcpLink config has not been provided")
-	}
-
-	scadaProvider := h.linkConfig.SCADAProvider
-	if scadaProvider == nil {
-		return fmt.Errorf("the reference to Scada provider in hcp link config is nil")
-	}
-
-	// Start both the Link functionality and the provider
-	if err := h.link.Start(); err != nil {
-		return fmt.Errorf("failed to start Link functionality, %w", err)
-	}
-
-	if err := scadaProvider.Start(); err != nil {
-		return fmt.Errorf("failed to start SCADA provider, %w", err)
-	}
-
-	// The connection should have been established between Vault and HCP
-	// Update core with the status
-	h.LinkStatus.SetHCPLinkStatus(h.GetConnectionStatusMessage(h.GetScadaSessionStatus()), h.getResourceID())
-
-	// Running capabilities
-	err := h.RunCapabilities()
-	if err != nil {
-		h.logger.Error("failed to start HCP link capabilities", "error", err.Error())
-	}
-
-	go h.reportStatus()
-
-	h.running = true
-
-	h.logger.Info("established connection to HCP")
-
-	return nil
-}
-
-// runs in a goroutine and in every 5 seconds, it sets the link status in Core
-// such that a user could query the health of the connection via seal-status
-// API. In addition, it checks replication status of Vault and sets that in
-// Scada provider metadata status
-func (h *HCPLinkVault) reportStatus() {
-	h.l.RLock()
-	stopCh := h.stopCh
-	h.l.RUnlock()
-
-	var currentNodeStatus string
-
-	ticker := time.NewTicker(SetLinkStatusCadence)
-	defer ticker.Stop()
-	for {
-		// Check for a shutdown
-		select {
-		case <-stopCh:
-			h.logger.Trace("returning from reporting link/node status")
-			return
-		case <-ticker.C:
-			// setting the HCP link status in core in this cadence
-			h.LinkStatus.SetHCPLinkStatus(
-				h.GetConnectionStatusMessage(h.GetScadaSessionStatus()),
-				h.getResourceID(),
-			)
-
-			// if node is in standby mode, set Scada metadata to indicate that
-			var nodeStatus string
-			standby, perfStandby := h.LinkStatus.StandbyStates()
-			switch {
-			case perfStandby:
-				nodeStatus = perfStandbyStatus
-			case standby:
-				nodeStatus = standbyStatus
-			default:
-				nodeStatus = activeStatus
-			}
-
-			// Only update SCADA session metadata if status has changed
-			if currentNodeStatus != nodeStatus {
-				currentNodeStatus = nodeStatus
-				h.linkConfig.SCADAProvider.UpdateMeta(map[string]string{metaDataNodeStatus: currentNodeStatus})
-			}
-		}
-	}
-}
-
-func buildConnectionErrorMessage(scadaStatus, errMsg string, errTime time.Time) string {
-	return fmt.Sprintf("%s since %s; error: %v", scadaStatus, errTime.Format(time.RFC3339Nano), errMsg)
-}
-
-// GetConnectionStatusMessage returns a meaningful message about connection
-// status. If Scada connection is anything other than "connected", it will
-// get the LastError from ScadaProvider, and builds a message with the
-// scada session status, error time and error message, and returns the message.
-func (h *HCPLinkVault) GetConnectionStatusMessage(scadaStatus string) string {
-	if scadaStatus == scada.SessionStatusConnected {
-		return scadaStatus
-	}
-
-	// HCP connectivity team is going to unify "connecting" with "waiting"
-	// statuses later. For simplicity, we unify the two until Scada
-	// provider unifies them
-	if scadaStatus == scada.SessionStatusWaiting {
-		scadaStatus = scada.SessionStatusConnecting
-	}
-
-	// There are two other states "connecting" and "disconnected"
-	// For those, there could have been an error with the connection
-	var errToReturn string
-	errTime, err := h.linkConfig.SCADAProvider.LastError()
-	if err == nil {
-		err = genericScadaConnectionError
-		errTime = time.Now()
-	}
-
-	switch {
-	case strings.Contains(err.Error(), scada.ErrPermissionDenied.Error()):
-		errToReturn = scada.ErrPermissionDenied.Error()
-	case strings.Contains(err.Error(), invalidClientCredentials.Error()), strings.Contains(err.Error(), scada.ErrInvalidCredentials.Error()):
-		errToReturn = scada.ErrInvalidCredentials.Error()
-	default:
-		errToReturn = genericScadaConnectionError.Error()
-	}
-
-	return buildConnectionErrorMessage(scadaStatus, errToReturn, errTime)
-}
-
-func (h *HCPLinkVault) getResourceID() string {
-	if h.scadaConfig != nil {
-		return h.scadaConfig.Resource.ID
-	}
-
-	return ""
-}
-
-func (h *HCPLinkVault) GetScadaSessionStatus() string {
-	if h.linkConfig != nil && h.linkConfig.SCADAProvider != nil {
-		return h.linkConfig.SCADAProvider.SessionStatus()
-	}
-	return scada.SessionStatusDisconnected
-}
-
-func (h *HCPLinkVault) Shutdown() error {
-	h.l.Lock()
-	defer h.l.Unlock()
-
-	if !h.running {
-		return nil
-	}
-
-	if h.stopCh != nil {
-		close(h.stopCh)
-		h.stopCh = nil
-	}
-
-	h.logger.Info("tearing down connection to HCP")
-
-	var retErr *multierror.Error
-
-	// stopping capabilities
-	for capName, capability := range h.capabilities {
-		err := capability.Stop()
-		if err != nil {
-			retErr = multierror.Append(retErr, fmt.Errorf("failed to close capability %s, %w", capName, err))
-		}
-	}
-
-	// updating metaDataNodeStatus before stopping link
-	h.linkConfig.SCADAProvider.UpdateMeta(map[string]string{metaDataNodeStatus: ""})
-
-	// stopping hcp link
-	err := h.link.Stop()
-	if err != nil {
-		retErr = multierror.Append(err, fmt.Errorf("failed to stop link %w", err))
-	}
-	h.link = nil
-
-	// stopping scada provider
-	err = h.linkConfig.SCADAProvider.Stop()
-	if err != nil {
-		retErr = multierror.Append(err, fmt.Errorf("failed to stop scada provider %w", err))
-	}
-
-	// setting the link status in Vault
-	h.LinkStatus.SetHCPLinkStatus(h.GetConnectionStatusMessage(h.GetScadaSessionStatus()), h.getResourceID())
-
-	h.running = false
-
-	return retErr.ErrorOrNil()
-}
-
-func (h *HCPLinkVault) RunCapabilities() error {
-	var retErr *multierror.Error
-	for capName, capability := range h.capabilities {
-		err := capability.Start()
-		if err != nil {
-			retErr = multierror.Append(retErr, fmt.Errorf("failed to start capability %s, %v", capName, err))
-		}
-	}
-
-	return retErr.ErrorOrNil()
-}
diff --git a/vault/hcp_link/link_oss.go b/vault/hcp_link/link_oss.go
new file mode 100644
index 0000000000000..badc7d7761b10
--- /dev/null
+++ b/vault/hcp_link/link_oss.go
@@ -0,0 +1,23 @@
+//go:build !enterprise
+
+package hcp_link
+
+import (
+	"github.com/hashicorp/go-hclog"
+	"github.com/hashicorp/vault/internalshared/configutil"
+	"github.com/hashicorp/vault/vault"
+)
+
+func NewHCPLink(linkConf *configutil.HCPLinkConfig, core *vault.Core, logger hclog.Logger) (*WrappedHCPLinkVault, error) {
+	return nil, nil
+}
+
+func (h *WrappedHCPLinkVault) Shutdown() error {
+	return nil
+}
+
+func (h *WrappedHCPLinkVault) GetScadaSessionStatus() string { return Disconnected }
+
+func (h *WrappedHCPLinkVault) GetConnectionStatusMessage(scadaStatus string) string {
+	return scadaStatus
+}
diff --git a/vault/hcp_link/proto/go.mod b/vault/hcp_link/proto/go.mod
index fbcb89246572c..7b0c7b2724285 100644
--- a/vault/hcp_link/proto/go.mod
+++ b/vault/hcp_link/proto/go.mod
@@ -1,5 +1,5 @@
 module github.com/hashicorp/vault/vault/hcp_link/proto
 
-go 1.19
+go 1.18
 
 require google.golang.org/protobuf v1.28.1
diff --git a/vault/hcp_link/proto/link_control/link_control.pb.go b/vault/hcp_link/proto/link_control/link_control.pb.go
deleted file mode 100644
index d6cb866cae8c6..0000000000000
--- a/vault/hcp_link/proto/link_control/link_control.pb.go
+++ /dev/null
@@ -1,201 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
-// source: vault/hcp_link/proto/link_control/link_control.proto
-
-package link_control
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type PurgePolicyRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *PurgePolicyRequest) Reset() {
-	*x = PurgePolicyRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_vault_hcp_link_proto_link_control_link_control_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PurgePolicyRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PurgePolicyRequest) ProtoMessage() {}
-
-func (x *PurgePolicyRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_vault_hcp_link_proto_link_control_link_control_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use PurgePolicyRequest.ProtoReflect.Descriptor instead.
-func (*PurgePolicyRequest) Descriptor() ([]byte, []int) {
-	return file_vault_hcp_link_proto_link_control_link_control_proto_rawDescGZIP(), []int{0}
-}
-
-type PurgePolicyResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *PurgePolicyResponse) Reset() {
-	*x = PurgePolicyResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_vault_hcp_link_proto_link_control_link_control_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PurgePolicyResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PurgePolicyResponse) ProtoMessage() {}
-
-func (x *PurgePolicyResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_vault_hcp_link_proto_link_control_link_control_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use PurgePolicyResponse.ProtoReflect.Descriptor instead.
-func (*PurgePolicyResponse) Descriptor() ([]byte, []int) {
-	return file_vault_hcp_link_proto_link_control_link_control_proto_rawDescGZIP(), []int{1}
-}
-
-var File_vault_hcp_link_proto_link_control_link_control_proto protoreflect.FileDescriptor
-
-var file_vault_hcp_link_proto_link_control_link_control_proto_rawDesc = []byte{
-	0x0a, 0x34, 0x76, 0x61, 0x75, 0x6c, 0x74, 0x2f, 0x68, 0x63, 0x70, 0x5f, 0x6c, 0x69, 0x6e, 0x6b,
-	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6c, 0x69, 0x6e, 0x6b, 0x5f, 0x63, 0x6f, 0x6e, 0x74,
-	0x72, 0x6f, 0x6c, 0x2f, 0x6c, 0x69, 0x6e, 0x6b, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0c, 0x6c, 0x69, 0x6e, 0x6b, 0x5f, 0x63, 0x6f, 0x6e,
-	0x74, 0x72, 0x6f, 0x6c, 0x22, 0x14, 0x0a, 0x12, 0x50, 0x75, 0x72, 0x67, 0x65, 0x50, 0x6f, 0x6c,
-	0x69, 0x63, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x15, 0x0a, 0x13, 0x50, 0x75,
-	0x72, 0x67, 0x65, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x32, 0x64, 0x0a, 0x0e, 0x48, 0x43, 0x50, 0x4c, 0x69, 0x6e, 0x6b, 0x43, 0x6f, 0x6e, 0x74,
-	0x72, 0x6f, 0x6c, 0x12, 0x52, 0x0a, 0x0b, 0x50, 0x75, 0x72, 0x67, 0x65, 0x50, 0x6f, 0x6c, 0x69,
-	0x63, 0x79, 0x12, 0x20, 0x2e, 0x6c, 0x69, 0x6e, 0x6b, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f,
-	0x6c, 0x2e, 0x50, 0x75, 0x72, 0x67, 0x65, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x6c, 0x69, 0x6e, 0x6b, 0x5f, 0x63, 0x6f, 0x6e, 0x74,
-	0x72, 0x6f, 0x6c, 0x2e, 0x50, 0x75, 0x72, 0x67, 0x65, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x3e, 0x5a, 0x3c, 0x67, 0x69, 0x74, 0x68, 0x75,
-	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f,
-	0x76, 0x61, 0x75, 0x6c, 0x74, 0x2f, 0x76, 0x61, 0x75, 0x6c, 0x74, 0x2f, 0x68, 0x63, 0x70, 0x5f,
-	0x6c, 0x69, 0x6e, 0x6b, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6c, 0x69, 0x6e, 0x6b, 0x5f,
-	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_vault_hcp_link_proto_link_control_link_control_proto_rawDescOnce sync.Once
-	file_vault_hcp_link_proto_link_control_link_control_proto_rawDescData = file_vault_hcp_link_proto_link_control_link_control_proto_rawDesc
-)
-
-func file_vault_hcp_link_proto_link_control_link_control_proto_rawDescGZIP() []byte {
-	file_vault_hcp_link_proto_link_control_link_control_proto_rawDescOnce.Do(func() {
-		file_vault_hcp_link_proto_link_control_link_control_proto_rawDescData = protoimpl.X.CompressGZIP(file_vault_hcp_link_proto_link_control_link_control_proto_rawDescData)
-	})
-	return file_vault_hcp_link_proto_link_control_link_control_proto_rawDescData
-}
-
-var file_vault_hcp_link_proto_link_control_link_control_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_vault_hcp_link_proto_link_control_link_control_proto_goTypes = []interface{}{
-	(*PurgePolicyRequest)(nil),  // 0: link_control.PurgePolicyRequest
-	(*PurgePolicyResponse)(nil), // 1: link_control.PurgePolicyResponse
-}
-var file_vault_hcp_link_proto_link_control_link_control_proto_depIdxs = []int32{
-	0, // 0: link_control.HCPLinkControl.PurgePolicy:input_type -> link_control.PurgePolicyRequest
-	1, // 1: link_control.HCPLinkControl.PurgePolicy:output_type -> link_control.PurgePolicyResponse
-	1, // [1:2] is the sub-list for method output_type
-	0, // [0:1] is the sub-list for method input_type
-	0, // [0:0] is the sub-list for extension type_name
-	0, // [0:0] is the sub-list for extension extendee
-	0, // [0:0] is the sub-list for field type_name
-}
-
-func init() { file_vault_hcp_link_proto_link_control_link_control_proto_init() }
-func file_vault_hcp_link_proto_link_control_link_control_proto_init() {
-	if File_vault_hcp_link_proto_link_control_link_control_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_vault_hcp_link_proto_link_control_link_control_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PurgePolicyRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_vault_hcp_link_proto_link_control_link_control_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PurgePolicyResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_vault_hcp_link_proto_link_control_link_control_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   2,
-			NumExtensions: 0,
-			NumServices:   1,
-		},
-		GoTypes:           file_vault_hcp_link_proto_link_control_link_control_proto_goTypes,
-		DependencyIndexes: file_vault_hcp_link_proto_link_control_link_control_proto_depIdxs,
-		MessageInfos:      file_vault_hcp_link_proto_link_control_link_control_proto_msgTypes,
-	}.Build()
-	File_vault_hcp_link_proto_link_control_link_control_proto = out.File
-	file_vault_hcp_link_proto_link_control_link_control_proto_rawDesc = nil
-	file_vault_hcp_link_proto_link_control_link_control_proto_goTypes = nil
-	file_vault_hcp_link_proto_link_control_link_control_proto_depIdxs = nil
-}
diff --git a/vault/hcp_link/proto/link_control/link_control.proto b/vault/hcp_link/proto/link_control/link_control.proto
deleted file mode 100644
index 08431edfccc71..0000000000000
--- a/vault/hcp_link/proto/link_control/link_control.proto
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-syntax = "proto3";
-
-option go_package = "github.com/hashicorp/vault/vault/hcp_link/proto/link_control";
-
-package link_control;
-
-message PurgePolicyRequest {}
-
-message PurgePolicyResponse {}
-
-service HCPLinkControl {
-  // PurgePolicy Forgets the current Batch token, and its associated policy,
-  // such that the policy is forced to be refreshed.
-  rpc PurgePolicy(PurgePolicyRequest) returns (PurgePolicyResponse);
-}
\ No newline at end of file
diff --git a/vault/hcp_link/proto/link_control/link_control_grpc.pb.go b/vault/hcp_link/proto/link_control/link_control_grpc.pb.go
deleted file mode 100644
index e071bb7186e8b..0000000000000
--- a/vault/hcp_link/proto/link_control/link_control_grpc.pb.go
+++ /dev/null
@@ -1,105 +0,0 @@
-// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
-
-package link_control
-
-import (
-	context "context"
-	grpc "google.golang.org/grpc"
-	codes "google.golang.org/grpc/codes"
-	status "google.golang.org/grpc/status"
-)
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-// Requires gRPC-Go v1.32.0 or later.
-const _ = grpc.SupportPackageIsVersion7
-
-// HCPLinkControlClient is the client API for HCPLinkControl service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
-type HCPLinkControlClient interface {
-	// PurgePolicy Forgets the current Batch token, and its associated policy,
-	// such that the policy is forced to be refreshed.
-	PurgePolicy(ctx context.Context, in *PurgePolicyRequest, opts ...grpc.CallOption) (*PurgePolicyResponse, error)
-}
-
-type hCPLinkControlClient struct {
-	cc grpc.ClientConnInterface
-}
-
-func NewHCPLinkControlClient(cc grpc.ClientConnInterface) HCPLinkControlClient {
-	return &hCPLinkControlClient{cc}
-}
-
-func (c *hCPLinkControlClient) PurgePolicy(ctx context.Context, in *PurgePolicyRequest, opts ...grpc.CallOption) (*PurgePolicyResponse, error) {
-	out := new(PurgePolicyResponse)
-	err := c.cc.Invoke(ctx, "/link_control.HCPLinkControl/PurgePolicy", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// HCPLinkControlServer is the server API for HCPLinkControl service.
-// All implementations must embed UnimplementedHCPLinkControlServer
-// for forward compatibility
-type HCPLinkControlServer interface {
-	// PurgePolicy Forgets the current Batch token, and its associated policy,
-	// such that the policy is forced to be refreshed.
-	PurgePolicy(context.Context, *PurgePolicyRequest) (*PurgePolicyResponse, error)
-	mustEmbedUnimplementedHCPLinkControlServer()
-}
-
-// UnimplementedHCPLinkControlServer must be embedded to have forward compatible implementations.
-type UnimplementedHCPLinkControlServer struct {
-}
-
-func (UnimplementedHCPLinkControlServer) PurgePolicy(context.Context, *PurgePolicyRequest) (*PurgePolicyResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method PurgePolicy not implemented")
-}
-func (UnimplementedHCPLinkControlServer) mustEmbedUnimplementedHCPLinkControlServer() {}
-
-// UnsafeHCPLinkControlServer may be embedded to opt out of forward compatibility for this service.
-// Use of this interface is not recommended, as added methods to HCPLinkControlServer will
-// result in compilation errors.
-type UnsafeHCPLinkControlServer interface {
-	mustEmbedUnimplementedHCPLinkControlServer()
-}
-
-func RegisterHCPLinkControlServer(s grpc.ServiceRegistrar, srv HCPLinkControlServer) {
-	s.RegisterService(&HCPLinkControl_ServiceDesc, srv)
-}
-
-func _HCPLinkControl_PurgePolicy_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(PurgePolicyRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(HCPLinkControlServer).PurgePolicy(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/link_control.HCPLinkControl/PurgePolicy",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(HCPLinkControlServer).PurgePolicy(ctx, req.(*PurgePolicyRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-// HCPLinkControl_ServiceDesc is the grpc.ServiceDesc for HCPLinkControl service.
-// It's only intended for direct use with grpc.RegisterService,
-// and not to be introspected or modified (even as a copy)
-var HCPLinkControl_ServiceDesc = grpc.ServiceDesc{
-	ServiceName: "link_control.HCPLinkControl",
-	HandlerType: (*HCPLinkControlServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "PurgePolicy",
-			Handler:    _HCPLinkControl_PurgePolicy_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "vault/hcp_link/proto/link_control/link_control.proto",
-}
diff --git a/vault/hcp_link/proto/meta/meta.pb.go b/vault/hcp_link/proto/meta/meta.pb.go
deleted file mode 100644
index 4f251a08b8d90..0000000000000
--- a/vault/hcp_link/proto/meta/meta.pb.go
+++ /dev/null
@@ -1,1330 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
-// source: vault/hcp_link/proto/meta/meta.proto
-
-package meta
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type ListNamespacesRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *ListNamespacesRequest) Reset() {
-	*x = ListNamespacesRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_vault_hcp_link_proto_meta_meta_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ListNamespacesRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ListNamespacesRequest) ProtoMessage() {}
-
-func (x *ListNamespacesRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_vault_hcp_link_proto_meta_meta_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ListNamespacesRequest.ProtoReflect.Descriptor instead.
-func (*ListNamespacesRequest) Descriptor() ([]byte, []int) {
-	return file_vault_hcp_link_proto_meta_meta_proto_rawDescGZIP(), []int{0}
-}
-
-type ListNamespacesResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Paths []string `protobuf:"bytes,1,rep,name=Paths,proto3" json:"Paths,omitempty"`
-}
-
-func (x *ListNamespacesResponse) Reset() {
-	*x = ListNamespacesResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_vault_hcp_link_proto_meta_meta_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ListNamespacesResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ListNamespacesResponse) ProtoMessage() {}
-
-func (x *ListNamespacesResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_vault_hcp_link_proto_meta_meta_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ListNamespacesResponse.ProtoReflect.Descriptor instead.
-func (*ListNamespacesResponse) Descriptor() ([]byte, []int) {
-	return file_vault_hcp_link_proto_meta_meta_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *ListNamespacesResponse) GetPaths() []string {
-	if x != nil {
-		return x.Paths
-	}
-	return nil
-}
-
-type ListMountsRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *ListMountsRequest) Reset() {
-	*x = ListMountsRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_vault_hcp_link_proto_meta_meta_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ListMountsRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ListMountsRequest) ProtoMessage() {}
-
-func (x *ListMountsRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_vault_hcp_link_proto_meta_meta_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ListMountsRequest.ProtoReflect.Descriptor instead.
-func (*ListMountsRequest) Descriptor() ([]byte, []int) {
-	return file_vault_hcp_link_proto_meta_meta_proto_rawDescGZIP(), []int{2}
-}
-
-type Mount struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Path        string `protobuf:"bytes,1,opt,name=Path,proto3" json:"Path,omitempty"`
-	Type        string `protobuf:"bytes,2,opt,name=Type,proto3" json:"Type,omitempty"`
-	Description string `protobuf:"bytes,3,opt,name=Description,proto3" json:"Description,omitempty"`
-}
-
-func (x *Mount) Reset() {
-	*x = Mount{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_vault_hcp_link_proto_meta_meta_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Mount) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Mount) ProtoMessage() {}
-
-func (x *Mount) ProtoReflect() protoreflect.Message {
-	mi := &file_vault_hcp_link_proto_meta_meta_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Mount.ProtoReflect.Descriptor instead.
-func (*Mount) Descriptor() ([]byte, []int) {
-	return file_vault_hcp_link_proto_meta_meta_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *Mount) GetPath() string {
-	if x != nil {
-		return x.Path
-	}
-	return ""
-}
-
-func (x *Mount) GetType() string {
-	if x != nil {
-		return x.Type
-	}
-	return ""
-}
-
-func (x *Mount) GetDescription() string {
-	if x != nil {
-		return x.Description
-	}
-	return ""
-}
-
-type ListMountsResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Mounts []*Mount `protobuf:"bytes,1,rep,name=Mounts,proto3" json:"Mounts,omitempty"`
-}
-
-func (x *ListMountsResponse) Reset() {
-	*x = ListMountsResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_vault_hcp_link_proto_meta_meta_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ListMountsResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ListMountsResponse) ProtoMessage() {}
-
-func (x *ListMountsResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_vault_hcp_link_proto_meta_meta_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ListMountsResponse.ProtoReflect.Descriptor instead.
-func (*ListMountsResponse) Descriptor() ([]byte, []int) {
-	return file_vault_hcp_link_proto_meta_meta_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *ListMountsResponse) GetMounts() []*Mount {
-	if x != nil {
-		return x.Mounts
-	}
-	return nil
-}
-
-type ListAuthsRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *ListAuthsRequest) Reset() {
-	*x = ListAuthsRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_vault_hcp_link_proto_meta_meta_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ListAuthsRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ListAuthsRequest) ProtoMessage() {}
-
-func (x *ListAuthsRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_vault_hcp_link_proto_meta_meta_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ListAuthsRequest.ProtoReflect.Descriptor instead.
-func (*ListAuthsRequest) Descriptor() ([]byte, []int) {
-	return file_vault_hcp_link_proto_meta_meta_proto_rawDescGZIP(), []int{5}
-}
-
-type Auth struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Path        string `protobuf:"bytes,1,opt,name=Path,proto3" json:"Path,omitempty"`
-	Type        string `protobuf:"bytes,2,opt,name=Type,proto3" json:"Type,omitempty"`
-	Description string `protobuf:"bytes,3,opt,name=Description,proto3" json:"Description,omitempty"`
-}
-
-func (x *Auth) Reset() {
-	*x = Auth{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_vault_hcp_link_proto_meta_meta_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Auth) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Auth) ProtoMessage() {}
-
-func (x *Auth) ProtoReflect() protoreflect.Message {
-	mi := &file_vault_hcp_link_proto_meta_meta_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Auth.ProtoReflect.Descriptor instead.
-func (*Auth) Descriptor() ([]byte, []int) {
-	return file_vault_hcp_link_proto_meta_meta_proto_rawDescGZIP(), []int{6}
-}
-
-func (x *Auth) GetPath() string {
-	if x != nil {
-		return x.Path
-	}
-	return ""
-}
-
-func (x *Auth) GetType() string {
-	if x != nil {
-		return x.Type
-	}
-	return ""
-}
-
-func (x *Auth) GetDescription() string {
-	if x != nil {
-		return x.Description
-	}
-	return ""
-}
-
-type ListAuthResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Auths []*Auth `protobuf:"bytes,1,rep,name=Auths,proto3" json:"Auths,omitempty"`
-}
-
-func (x *ListAuthResponse) Reset() {
-	*x = ListAuthResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_vault_hcp_link_proto_meta_meta_proto_msgTypes[7]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ListAuthResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ListAuthResponse) ProtoMessage() {}
-
-func (x *ListAuthResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_vault_hcp_link_proto_meta_meta_proto_msgTypes[7]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ListAuthResponse.ProtoReflect.Descriptor instead.
-func (*ListAuthResponse) Descriptor() ([]byte, []int) {
-	return file_vault_hcp_link_proto_meta_meta_proto_rawDescGZIP(), []int{7}
-}
-
-func (x *ListAuthResponse) GetAuths() []*Auth {
-	if x != nil {
-		return x.Auths
-	}
-	return nil
-}
-
-type GetClusterStatusRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *GetClusterStatusRequest) Reset() {
-	*x = GetClusterStatusRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_vault_hcp_link_proto_meta_meta_proto_msgTypes[8]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *GetClusterStatusRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GetClusterStatusRequest) ProtoMessage() {}
-
-func (x *GetClusterStatusRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_vault_hcp_link_proto_meta_meta_proto_msgTypes[8]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use GetClusterStatusRequest.ProtoReflect.Descriptor instead.
-func (*GetClusterStatusRequest) Descriptor() ([]byte, []int) {
-	return file_vault_hcp_link_proto_meta_meta_proto_rawDescGZIP(), []int{8}
-}
-
-type HANode struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Hostname string `protobuf:"bytes,1,opt,name=Hostname,proto3" json:"Hostname,omitempty"`
-}
-
-func (x *HANode) Reset() {
-	*x = HANode{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_vault_hcp_link_proto_meta_meta_proto_msgTypes[9]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *HANode) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*HANode) ProtoMessage() {}
-
-func (x *HANode) ProtoReflect() protoreflect.Message {
-	mi := &file_vault_hcp_link_proto_meta_meta_proto_msgTypes[9]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use HANode.ProtoReflect.Descriptor instead.
-func (*HANode) Descriptor() ([]byte, []int) {
-	return file_vault_hcp_link_proto_meta_meta_proto_rawDescGZIP(), []int{9}
-}
-
-func (x *HANode) GetHostname() string {
-	if x != nil {
-		return x.Hostname
-	}
-	return ""
-}
-
-type HAStatus struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Enabled bool      `protobuf:"varint,1,opt,name=Enabled,proto3" json:"Enabled,omitempty"`
-	Nodes   []*HANode `protobuf:"bytes,2,rep,name=Nodes,proto3" json:"Nodes,omitempty"`
-}
-
-func (x *HAStatus) Reset() {
-	*x = HAStatus{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_vault_hcp_link_proto_meta_meta_proto_msgTypes[10]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *HAStatus) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*HAStatus) ProtoMessage() {}
-
-func (x *HAStatus) ProtoReflect() protoreflect.Message {
-	mi := &file_vault_hcp_link_proto_meta_meta_proto_msgTypes[10]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use HAStatus.ProtoReflect.Descriptor instead.
-func (*HAStatus) Descriptor() ([]byte, []int) {
-	return file_vault_hcp_link_proto_meta_meta_proto_rawDescGZIP(), []int{10}
-}
-
-func (x *HAStatus) GetEnabled() bool {
-	if x != nil {
-		return x.Enabled
-	}
-	return false
-}
-
-func (x *HAStatus) GetNodes() []*HANode {
-	if x != nil {
-		return x.Nodes
-	}
-	return nil
-}
-
-type RaftServer struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// NodeID is the name of the server
-	NodeID string `protobuf:"bytes,1,opt,name=NodeID,proto3" json:"NodeID,omitempty"`
-	// Address is the IP:port of the server, used for Raft communications
-	Address string `protobuf:"bytes,2,opt,name=Address,proto3" json:"Address,omitempty"`
-	// Leader is true if this server is the current cluster leader
-	Leader bool `protobuf:"varint,3,opt,name=Leader,proto3" json:"Leader,omitempty"`
-	// Protocol version is the raft protocol version used by the server
-	ProtocolVersion string `protobuf:"bytes,4,opt,name=ProtocolVersion,proto3" json:"ProtocolVersion,omitempty"`
-	// Voter is true if this server has a vote in the cluster. This might
-	// be false if the server is staging and still coming online.
-	Voter bool `protobuf:"varint,5,opt,name=Voter,proto3" json:"Voter,omitempty"`
-}
-
-func (x *RaftServer) Reset() {
-	*x = RaftServer{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_vault_hcp_link_proto_meta_meta_proto_msgTypes[11]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *RaftServer) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RaftServer) ProtoMessage() {}
-
-func (x *RaftServer) ProtoReflect() protoreflect.Message {
-	mi := &file_vault_hcp_link_proto_meta_meta_proto_msgTypes[11]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use RaftServer.ProtoReflect.Descriptor instead.
-func (*RaftServer) Descriptor() ([]byte, []int) {
-	return file_vault_hcp_link_proto_meta_meta_proto_rawDescGZIP(), []int{11}
-}
-
-func (x *RaftServer) GetNodeID() string {
-	if x != nil {
-		return x.NodeID
-	}
-	return ""
-}
-
-func (x *RaftServer) GetAddress() string {
-	if x != nil {
-		return x.Address
-	}
-	return ""
-}
-
-func (x *RaftServer) GetLeader() bool {
-	if x != nil {
-		return x.Leader
-	}
-	return false
-}
-
-func (x *RaftServer) GetProtocolVersion() string {
-	if x != nil {
-		return x.ProtocolVersion
-	}
-	return ""
-}
-
-func (x *RaftServer) GetVoter() bool {
-	if x != nil {
-		return x.Voter
-	}
-	return false
-}
-
-type RaftConfiguration struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Servers []*RaftServer `protobuf:"bytes,1,rep,name=Servers,proto3" json:"Servers,omitempty"`
-}
-
-func (x *RaftConfiguration) Reset() {
-	*x = RaftConfiguration{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_vault_hcp_link_proto_meta_meta_proto_msgTypes[12]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *RaftConfiguration) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RaftConfiguration) ProtoMessage() {}
-
-func (x *RaftConfiguration) ProtoReflect() protoreflect.Message {
-	mi := &file_vault_hcp_link_proto_meta_meta_proto_msgTypes[12]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use RaftConfiguration.ProtoReflect.Descriptor instead.
-func (*RaftConfiguration) Descriptor() ([]byte, []int) {
-	return file_vault_hcp_link_proto_meta_meta_proto_rawDescGZIP(), []int{12}
-}
-
-func (x *RaftConfiguration) GetServers() []*RaftServer {
-	if x != nil {
-		return x.Servers
-	}
-	return nil
-}
-
-type AutopilotServer struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	ID      string `protobuf:"bytes,1,opt,name=ID,proto3" json:"ID,omitempty"`
-	Healthy bool   `protobuf:"varint,2,opt,name=Healthy,proto3" json:"Healthy,omitempty"`
-}
-
-func (x *AutopilotServer) Reset() {
-	*x = AutopilotServer{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_vault_hcp_link_proto_meta_meta_proto_msgTypes[13]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *AutopilotServer) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*AutopilotServer) ProtoMessage() {}
-
-func (x *AutopilotServer) ProtoReflect() protoreflect.Message {
-	mi := &file_vault_hcp_link_proto_meta_meta_proto_msgTypes[13]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use AutopilotServer.ProtoReflect.Descriptor instead.
-func (*AutopilotServer) Descriptor() ([]byte, []int) {
-	return file_vault_hcp_link_proto_meta_meta_proto_rawDescGZIP(), []int{13}
-}
-
-func (x *AutopilotServer) GetID() string {
-	if x != nil {
-		return x.ID
-	}
-	return ""
-}
-
-func (x *AutopilotServer) GetHealthy() bool {
-	if x != nil {
-		return x.Healthy
-	}
-	return false
-}
-
-type AutopilotStatus struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Healthy bool               `protobuf:"varint,1,opt,name=Healthy,proto3" json:"Healthy,omitempty"`
-	Servers []*AutopilotServer `protobuf:"bytes,2,rep,name=Servers,proto3" json:"Servers,omitempty"`
-}
-
-func (x *AutopilotStatus) Reset() {
-	*x = AutopilotStatus{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_vault_hcp_link_proto_meta_meta_proto_msgTypes[14]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *AutopilotStatus) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*AutopilotStatus) ProtoMessage() {}
-
-func (x *AutopilotStatus) ProtoReflect() protoreflect.Message {
-	mi := &file_vault_hcp_link_proto_meta_meta_proto_msgTypes[14]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use AutopilotStatus.ProtoReflect.Descriptor instead.
-func (*AutopilotStatus) Descriptor() ([]byte, []int) {
-	return file_vault_hcp_link_proto_meta_meta_proto_rawDescGZIP(), []int{14}
-}
-
-func (x *AutopilotStatus) GetHealthy() bool {
-	if x != nil {
-		return x.Healthy
-	}
-	return false
-}
-
-func (x *AutopilotStatus) GetServers() []*AutopilotServer {
-	if x != nil {
-		return x.Servers
-	}
-	return nil
-}
-
-type RaftStatus struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	RaftConfiguration *RaftConfiguration `protobuf:"bytes,1,opt,name=RaftConfiguration,proto3" json:"RaftConfiguration,omitempty"`
-	AutopilotStatus   *AutopilotStatus   `protobuf:"bytes,2,opt,name=AutopilotStatus,proto3" json:"AutopilotStatus,omitempty"`
-	QuorumWarning     string             `protobuf:"bytes,3,opt,name=QuorumWarning,proto3" json:"QuorumWarning,omitempty"`
-}
-
-func (x *RaftStatus) Reset() {
-	*x = RaftStatus{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_vault_hcp_link_proto_meta_meta_proto_msgTypes[15]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *RaftStatus) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RaftStatus) ProtoMessage() {}
-
-func (x *RaftStatus) ProtoReflect() protoreflect.Message {
-	mi := &file_vault_hcp_link_proto_meta_meta_proto_msgTypes[15]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use RaftStatus.ProtoReflect.Descriptor instead.
-func (*RaftStatus) Descriptor() ([]byte, []int) {
-	return file_vault_hcp_link_proto_meta_meta_proto_rawDescGZIP(), []int{15}
-}
-
-func (x *RaftStatus) GetRaftConfiguration() *RaftConfiguration {
-	if x != nil {
-		return x.RaftConfiguration
-	}
-	return nil
-}
-
-func (x *RaftStatus) GetAutopilotStatus() *AutopilotStatus {
-	if x != nil {
-		return x.AutopilotStatus
-	}
-	return nil
-}
-
-func (x *RaftStatus) GetQuorumWarning() string {
-	if x != nil {
-		return x.QuorumWarning
-	}
-	return ""
-}
-
-type GetClusterStatusResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	ClusterID   string      `protobuf:"bytes,1,opt,name=ClusterID,proto3" json:"ClusterID,omitempty"`
-	HAStatus    *HAStatus   `protobuf:"bytes,2,opt,name=HAStatus,proto3" json:"HAStatus,omitempty"`
-	RaftStatus  *RaftStatus `protobuf:"bytes,3,opt,name=RaftStatus,proto3" json:"RaftStatus,omitempty"`
-	StorageType string      `protobuf:"bytes,4,opt,name=StorageType,proto3" json:"StorageType,omitempty"`
-	ClusterName string      `protobuf:"bytes,5,opt,name=ClusterName,proto3" json:"ClusterName,omitempty"`
-}
-
-func (x *GetClusterStatusResponse) Reset() {
-	*x = GetClusterStatusResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_vault_hcp_link_proto_meta_meta_proto_msgTypes[16]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *GetClusterStatusResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GetClusterStatusResponse) ProtoMessage() {}
-
-func (x *GetClusterStatusResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_vault_hcp_link_proto_meta_meta_proto_msgTypes[16]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use GetClusterStatusResponse.ProtoReflect.Descriptor instead.
-func (*GetClusterStatusResponse) Descriptor() ([]byte, []int) {
-	return file_vault_hcp_link_proto_meta_meta_proto_rawDescGZIP(), []int{16}
-}
-
-func (x *GetClusterStatusResponse) GetClusterID() string {
-	if x != nil {
-		return x.ClusterID
-	}
-	return ""
-}
-
-func (x *GetClusterStatusResponse) GetHAStatus() *HAStatus {
-	if x != nil {
-		return x.HAStatus
-	}
-	return nil
-}
-
-func (x *GetClusterStatusResponse) GetRaftStatus() *RaftStatus {
-	if x != nil {
-		return x.RaftStatus
-	}
-	return nil
-}
-
-func (x *GetClusterStatusResponse) GetStorageType() string {
-	if x != nil {
-		return x.StorageType
-	}
-	return ""
-}
-
-func (x *GetClusterStatusResponse) GetClusterName() string {
-	if x != nil {
-		return x.ClusterName
-	}
-	return ""
-}
-
-var File_vault_hcp_link_proto_meta_meta_proto protoreflect.FileDescriptor
-
-var file_vault_hcp_link_proto_meta_meta_proto_rawDesc = []byte{
-	0x0a, 0x24, 0x76, 0x61, 0x75, 0x6c, 0x74, 0x2f, 0x68, 0x63, 0x70, 0x5f, 0x6c, 0x69, 0x6e, 0x6b,
-	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6d, 0x65, 0x74, 0x61, 0x2f, 0x6d, 0x65, 0x74, 0x61,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x04, 0x6d, 0x65, 0x74, 0x61, 0x22, 0x17, 0x0a, 0x15,
-	0x4c, 0x69, 0x73, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x2e, 0x0a, 0x16, 0x4c, 0x69, 0x73, 0x74, 0x4e, 0x61, 0x6d,
-	0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
-	0x14, 0x0a, 0x05, 0x50, 0x61, 0x74, 0x68, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05,
-	0x50, 0x61, 0x74, 0x68, 0x73, 0x22, 0x13, 0x0a, 0x11, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x6f, 0x75,
-	0x6e, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x51, 0x0a, 0x05, 0x4d, 0x6f,
-	0x75, 0x6e, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x50, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x04, 0x50, 0x61, 0x74, 0x68, 0x12, 0x12, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x44,
-	0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x0b, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x39, 0x0a,
-	0x12, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x12, 0x23, 0x0a, 0x06, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x18, 0x01, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x6d, 0x65, 0x74, 0x61, 0x2e, 0x4d, 0x6f, 0x75, 0x6e, 0x74,
-	0x52, 0x06, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x22, 0x12, 0x0a, 0x10, 0x4c, 0x69, 0x73, 0x74,
-	0x41, 0x75, 0x74, 0x68, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x50, 0x0a, 0x04,
-	0x41, 0x75, 0x74, 0x68, 0x12, 0x12, 0x0a, 0x04, 0x50, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x04, 0x50, 0x61, 0x74, 0x68, 0x12, 0x12, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x20, 0x0a, 0x0b,
-	0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x0b, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x34,
-	0x0a, 0x10, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x75, 0x74, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x12, 0x20, 0x0a, 0x05, 0x41, 0x75, 0x74, 0x68, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x0a, 0x2e, 0x6d, 0x65, 0x74, 0x61, 0x2e, 0x41, 0x75, 0x74, 0x68, 0x52, 0x05, 0x41,
-	0x75, 0x74, 0x68, 0x73, 0x22, 0x19, 0x0a, 0x17, 0x47, 0x65, 0x74, 0x43, 0x6c, 0x75, 0x73, 0x74,
-	0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22,
-	0x24, 0x0a, 0x06, 0x48, 0x41, 0x4e, 0x6f, 0x64, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x48, 0x6f, 0x73,
-	0x74, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x48, 0x6f, 0x73,
-	0x74, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x48, 0x0a, 0x08, 0x48, 0x41, 0x53, 0x74, 0x61, 0x74, 0x75,
-	0x73, 0x12, 0x18, 0x0a, 0x07, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x07, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x12, 0x22, 0x0a, 0x05, 0x4e,
-	0x6f, 0x64, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6d, 0x65, 0x74,
-	0x61, 0x2e, 0x48, 0x41, 0x4e, 0x6f, 0x64, 0x65, 0x52, 0x05, 0x4e, 0x6f, 0x64, 0x65, 0x73, 0x22,
-	0x96, 0x01, 0x0a, 0x0a, 0x52, 0x61, 0x66, 0x74, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x12, 0x16,
-	0x0a, 0x06, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
-	0x4e, 0x6f, 0x64, 0x65, 0x49, 0x44, 0x12, 0x18, 0x0a, 0x07, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73,
-	0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73,
-	0x12, 0x16, 0x0a, 0x06, 0x4c, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x06, 0x4c, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x28, 0x0a, 0x0f, 0x50, 0x72, 0x6f, 0x74,
-	0x6f, 0x63, 0x6f, 0x6c, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x0f, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x56, 0x65, 0x72, 0x73, 0x69,
-	0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x56, 0x6f, 0x74, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28,
-	0x08, 0x52, 0x05, 0x56, 0x6f, 0x74, 0x65, 0x72, 0x22, 0x3f, 0x0a, 0x11, 0x52, 0x61, 0x66, 0x74,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2a, 0x0a,
-	0x07, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10,
-	0x2e, 0x6d, 0x65, 0x74, 0x61, 0x2e, 0x52, 0x61, 0x66, 0x74, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72,
-	0x52, 0x07, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x73, 0x22, 0x3b, 0x0a, 0x0f, 0x41, 0x75, 0x74,
-	0x6f, 0x70, 0x69, 0x6c, 0x6f, 0x74, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02,
-	0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x44, 0x12, 0x18, 0x0a, 0x07,
-	0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x48,
-	0x65, 0x61, 0x6c, 0x74, 0x68, 0x79, 0x22, 0x5c, 0x0a, 0x0f, 0x41, 0x75, 0x74, 0x6f, 0x70, 0x69,
-	0x6c, 0x6f, 0x74, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x48, 0x65, 0x61,
-	0x6c, 0x74, 0x68, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x48, 0x65, 0x61, 0x6c,
-	0x74, 0x68, 0x79, 0x12, 0x2f, 0x0a, 0x07, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x73, 0x18, 0x02,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x6d, 0x65, 0x74, 0x61, 0x2e, 0x41, 0x75, 0x74, 0x6f,
-	0x70, 0x69, 0x6c, 0x6f, 0x74, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x52, 0x07, 0x53, 0x65, 0x72,
-	0x76, 0x65, 0x72, 0x73, 0x22, 0xba, 0x01, 0x0a, 0x0a, 0x52, 0x61, 0x66, 0x74, 0x53, 0x74, 0x61,
-	0x74, 0x75, 0x73, 0x12, 0x45, 0x0a, 0x11, 0x52, 0x61, 0x66, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17,
-	0x2e, 0x6d, 0x65, 0x74, 0x61, 0x2e, 0x52, 0x61, 0x66, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x11, 0x52, 0x61, 0x66, 0x74, 0x43, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3f, 0x0a, 0x0f, 0x41, 0x75,
-	0x74, 0x6f, 0x70, 0x69, 0x6c, 0x6f, 0x74, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x6d, 0x65, 0x74, 0x61, 0x2e, 0x41, 0x75, 0x74, 0x6f, 0x70,
-	0x69, 0x6c, 0x6f, 0x74, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x0f, 0x41, 0x75, 0x74, 0x6f,
-	0x70, 0x69, 0x6c, 0x6f, 0x74, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x24, 0x0a, 0x0d, 0x51,
-	0x75, 0x6f, 0x72, 0x75, 0x6d, 0x57, 0x61, 0x72, 0x6e, 0x69, 0x6e, 0x67, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x0d, 0x51, 0x75, 0x6f, 0x72, 0x75, 0x6d, 0x57, 0x61, 0x72, 0x6e, 0x69, 0x6e,
-	0x67, 0x22, 0xda, 0x01, 0x0a, 0x18, 0x47, 0x65, 0x74, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
-	0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1c,
-	0x0a, 0x09, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x09, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x44, 0x12, 0x2a, 0x0a, 0x08,
-	0x48, 0x41, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e,
-	0x2e, 0x6d, 0x65, 0x74, 0x61, 0x2e, 0x48, 0x41, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x08,
-	0x48, 0x41, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x30, 0x0a, 0x0a, 0x52, 0x61, 0x66, 0x74,
-	0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x6d,
-	0x65, 0x74, 0x61, 0x2e, 0x52, 0x61, 0x66, 0x74, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x0a,
-	0x52, 0x61, 0x66, 0x74, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x53, 0x74,
-	0x6f, 0x72, 0x61, 0x67, 0x65, 0x54, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0b, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x20, 0x0a, 0x0b,
-	0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x0b, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x32, 0xab,
-	0x02, 0x0a, 0x0b, 0x48, 0x43, 0x50, 0x4c, 0x69, 0x6e, 0x6b, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x4b,
-	0x0a, 0x0e, 0x4c, 0x69, 0x73, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73,
-	0x12, 0x1b, 0x2e, 0x6d, 0x65, 0x74, 0x61, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4e, 0x61, 0x6d, 0x65,
-	0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e,
-	0x6d, 0x65, 0x74, 0x61, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61,
-	0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3f, 0x0a, 0x0a, 0x4c,
-	0x69, 0x73, 0x74, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x12, 0x17, 0x2e, 0x6d, 0x65, 0x74, 0x61,
-	0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x1a, 0x18, 0x2e, 0x6d, 0x65, 0x74, 0x61, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x6f,
-	0x75, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3b, 0x0a, 0x09,
-	0x4c, 0x69, 0x73, 0x74, 0x41, 0x75, 0x74, 0x68, 0x73, 0x12, 0x16, 0x2e, 0x6d, 0x65, 0x74, 0x61,
-	0x2e, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x75, 0x74, 0x68, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x1a, 0x16, 0x2e, 0x6d, 0x65, 0x74, 0x61, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x75, 0x74,
-	0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x51, 0x0a, 0x10, 0x47, 0x65, 0x74,
-	0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1d, 0x2e,
-	0x6d, 0x65, 0x74, 0x61, 0x2e, 0x47, 0x65, 0x74, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x53,
-	0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x6d,
-	0x65, 0x74, 0x61, 0x2e, 0x47, 0x65, 0x74, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x53, 0x74,
-	0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x36, 0x5a, 0x34,
-	0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2f, 0x76, 0x61, 0x75, 0x6c, 0x74, 0x2f, 0x76, 0x61, 0x75, 0x6c, 0x74,
-	0x2f, 0x68, 0x63, 0x70, 0x5f, 0x6c, 0x69, 0x6e, 0x6b, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f,
-	0x6d, 0x65, 0x74, 0x61, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_vault_hcp_link_proto_meta_meta_proto_rawDescOnce sync.Once
-	file_vault_hcp_link_proto_meta_meta_proto_rawDescData = file_vault_hcp_link_proto_meta_meta_proto_rawDesc
-)
-
-func file_vault_hcp_link_proto_meta_meta_proto_rawDescGZIP() []byte {
-	file_vault_hcp_link_proto_meta_meta_proto_rawDescOnce.Do(func() {
-		file_vault_hcp_link_proto_meta_meta_proto_rawDescData = protoimpl.X.CompressGZIP(file_vault_hcp_link_proto_meta_meta_proto_rawDescData)
-	})
-	return file_vault_hcp_link_proto_meta_meta_proto_rawDescData
-}
-
-var file_vault_hcp_link_proto_meta_meta_proto_msgTypes = make([]protoimpl.MessageInfo, 17)
-var file_vault_hcp_link_proto_meta_meta_proto_goTypes = []interface{}{
-	(*ListNamespacesRequest)(nil),    // 0: meta.ListNamespacesRequest
-	(*ListNamespacesResponse)(nil),   // 1: meta.ListNamespacesResponse
-	(*ListMountsRequest)(nil),        // 2: meta.ListMountsRequest
-	(*Mount)(nil),                    // 3: meta.Mount
-	(*ListMountsResponse)(nil),       // 4: meta.ListMountsResponse
-	(*ListAuthsRequest)(nil),         // 5: meta.ListAuthsRequest
-	(*Auth)(nil),                     // 6: meta.Auth
-	(*ListAuthResponse)(nil),         // 7: meta.ListAuthResponse
-	(*GetClusterStatusRequest)(nil),  // 8: meta.GetClusterStatusRequest
-	(*HANode)(nil),                   // 9: meta.HANode
-	(*HAStatus)(nil),                 // 10: meta.HAStatus
-	(*RaftServer)(nil),               // 11: meta.RaftServer
-	(*RaftConfiguration)(nil),        // 12: meta.RaftConfiguration
-	(*AutopilotServer)(nil),          // 13: meta.AutopilotServer
-	(*AutopilotStatus)(nil),          // 14: meta.AutopilotStatus
-	(*RaftStatus)(nil),               // 15: meta.RaftStatus
-	(*GetClusterStatusResponse)(nil), // 16: meta.GetClusterStatusResponse
-}
-var file_vault_hcp_link_proto_meta_meta_proto_depIdxs = []int32{
-	3,  // 0: meta.ListMountsResponse.Mounts:type_name -> meta.Mount
-	6,  // 1: meta.ListAuthResponse.Auths:type_name -> meta.Auth
-	9,  // 2: meta.HAStatus.Nodes:type_name -> meta.HANode
-	11, // 3: meta.RaftConfiguration.Servers:type_name -> meta.RaftServer
-	13, // 4: meta.AutopilotStatus.Servers:type_name -> meta.AutopilotServer
-	12, // 5: meta.RaftStatus.RaftConfiguration:type_name -> meta.RaftConfiguration
-	14, // 6: meta.RaftStatus.AutopilotStatus:type_name -> meta.AutopilotStatus
-	10, // 7: meta.GetClusterStatusResponse.HAStatus:type_name -> meta.HAStatus
-	15, // 8: meta.GetClusterStatusResponse.RaftStatus:type_name -> meta.RaftStatus
-	0,  // 9: meta.HCPLinkMeta.ListNamespaces:input_type -> meta.ListNamespacesRequest
-	2,  // 10: meta.HCPLinkMeta.ListMounts:input_type -> meta.ListMountsRequest
-	5,  // 11: meta.HCPLinkMeta.ListAuths:input_type -> meta.ListAuthsRequest
-	8,  // 12: meta.HCPLinkMeta.GetClusterStatus:input_type -> meta.GetClusterStatusRequest
-	1,  // 13: meta.HCPLinkMeta.ListNamespaces:output_type -> meta.ListNamespacesResponse
-	4,  // 14: meta.HCPLinkMeta.ListMounts:output_type -> meta.ListMountsResponse
-	7,  // 15: meta.HCPLinkMeta.ListAuths:output_type -> meta.ListAuthResponse
-	16, // 16: meta.HCPLinkMeta.GetClusterStatus:output_type -> meta.GetClusterStatusResponse
-	13, // [13:17] is the sub-list for method output_type
-	9,  // [9:13] is the sub-list for method input_type
-	9,  // [9:9] is the sub-list for extension type_name
-	9,  // [9:9] is the sub-list for extension extendee
-	0,  // [0:9] is the sub-list for field type_name
-}
-
-func init() { file_vault_hcp_link_proto_meta_meta_proto_init() }
-func file_vault_hcp_link_proto_meta_meta_proto_init() {
-	if File_vault_hcp_link_proto_meta_meta_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_vault_hcp_link_proto_meta_meta_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ListNamespacesRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_vault_hcp_link_proto_meta_meta_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ListNamespacesResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_vault_hcp_link_proto_meta_meta_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ListMountsRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_vault_hcp_link_proto_meta_meta_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Mount); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_vault_hcp_link_proto_meta_meta_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ListMountsResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_vault_hcp_link_proto_meta_meta_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ListAuthsRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_vault_hcp_link_proto_meta_meta_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Auth); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_vault_hcp_link_proto_meta_meta_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ListAuthResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_vault_hcp_link_proto_meta_meta_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetClusterStatusRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_vault_hcp_link_proto_meta_meta_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HANode); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_vault_hcp_link_proto_meta_meta_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HAStatus); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_vault_hcp_link_proto_meta_meta_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RaftServer); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_vault_hcp_link_proto_meta_meta_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RaftConfiguration); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_vault_hcp_link_proto_meta_meta_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*AutopilotServer); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_vault_hcp_link_proto_meta_meta_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*AutopilotStatus); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_vault_hcp_link_proto_meta_meta_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RaftStatus); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_vault_hcp_link_proto_meta_meta_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetClusterStatusResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_vault_hcp_link_proto_meta_meta_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   17,
-			NumExtensions: 0,
-			NumServices:   1,
-		},
-		GoTypes:           file_vault_hcp_link_proto_meta_meta_proto_goTypes,
-		DependencyIndexes: file_vault_hcp_link_proto_meta_meta_proto_depIdxs,
-		MessageInfos:      file_vault_hcp_link_proto_meta_meta_proto_msgTypes,
-	}.Build()
-	File_vault_hcp_link_proto_meta_meta_proto = out.File
-	file_vault_hcp_link_proto_meta_meta_proto_rawDesc = nil
-	file_vault_hcp_link_proto_meta_meta_proto_goTypes = nil
-	file_vault_hcp_link_proto_meta_meta_proto_depIdxs = nil
-}
diff --git a/vault/hcp_link/proto/meta/meta.proto b/vault/hcp_link/proto/meta/meta.proto
deleted file mode 100644
index 4e06138126dd2..0000000000000
--- a/vault/hcp_link/proto/meta/meta.proto
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-syntax = "proto3";
-
-option go_package = "github.com/hashicorp/vault/vault/hcp_link/proto/meta";
-
-package meta;
-
-message ListNamespacesRequest {}
-
-message ListNamespacesResponse {
-  repeated string Paths = 1;
-}
-
-message ListMountsRequest {}
-
-message Mount {
-  string Path = 1;
-  string Type = 2;
-  string Description = 3;
-}
-
-message ListMountsResponse {
-  repeated Mount Mounts = 1;
-}
-
-message ListAuthsRequest {}
-
-message Auth {
-  string Path = 1;
-  string Type = 2;
-  string Description = 3;
-}
-
-message ListAuthResponse {
-  repeated Auth Auths = 1;
-}
-
-message GetClusterStatusRequest {}
-
-message HANode {
-  string Hostname = 1;
-}
-
-message HAStatus {
-  bool Enabled = 1;
-  repeated HANode Nodes = 2;
-}
-
-message RaftServer {
-  // NodeID is the name of the server
-  string NodeID = 1;
-
-  // Address is the IP:port of the server, used for Raft communications
-  string Address = 2;
-
-  // Leader is true if this server is the current cluster leader
-  bool Leader = 3;
-
-  // Protocol version is the raft protocol version used by the server
-  string ProtocolVersion = 4;
-
-  // Voter is true if this server has a vote in the cluster. This might
-  // be false if the server is staging and still coming online.
-  bool Voter = 5;
-}
-
-message RaftConfiguration {
-  repeated RaftServer Servers = 1;
-}
-
-message AutopilotServer {
-  string ID = 1;
-  bool Healthy = 2;
-}
-
-message AutopilotStatus {
-  bool Healthy = 1;
-  repeated AutopilotServer Servers = 2;
-}
-
-message RaftStatus {
-  RaftConfiguration RaftConfiguration = 1;
-  AutopilotStatus AutopilotStatus = 2;
-  string QuorumWarning = 3;
-}
-
-message GetClusterStatusResponse {
-  string ClusterID = 1;
-  HAStatus HAStatus = 2;
-  RaftStatus RaftStatus = 3;
-  string StorageType = 4;
-  string ClusterName = 5;
-}
-
-service HCPLinkMeta {
-  // ListNamespaces will be used to recursively list all namespaces
-  rpc ListNamespaces(ListNamespacesRequest) returns (ListNamespacesResponse);
-
-  // ListMounts will be used to recursively list all mounts in all namespaces
-  rpc ListMounts(ListMountsRequest) returns (ListMountsResponse);
-
-  // ListAuths will be used to recursively list all auths in all namespaces
-  rpc ListAuths(ListAuthsRequest) returns (ListAuthResponse);
-
-  // GetClusterStatus will provide various cluster-level information
-  rpc GetClusterStatus(GetClusterStatusRequest) returns (GetClusterStatusResponse);
-}
diff --git a/vault/hcp_link/proto/meta/meta_grpc.pb.go b/vault/hcp_link/proto/meta/meta_grpc.pb.go
deleted file mode 100644
index 742e8b5013c3d..0000000000000
--- a/vault/hcp_link/proto/meta/meta_grpc.pb.go
+++ /dev/null
@@ -1,217 +0,0 @@
-// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
-
-package meta
-
-import (
-	context "context"
-	grpc "google.golang.org/grpc"
-	codes "google.golang.org/grpc/codes"
-	status "google.golang.org/grpc/status"
-)
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-// Requires gRPC-Go v1.32.0 or later.
-const _ = grpc.SupportPackageIsVersion7
-
-// HCPLinkMetaClient is the client API for HCPLinkMeta service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
-type HCPLinkMetaClient interface {
-	// ListNamespaces will be used to recursively list all namespaces
-	ListNamespaces(ctx context.Context, in *ListNamespacesRequest, opts ...grpc.CallOption) (*ListNamespacesResponse, error)
-	// ListMounts will be used to recursively list all mounts in all namespaces
-	ListMounts(ctx context.Context, in *ListMountsRequest, opts ...grpc.CallOption) (*ListMountsResponse, error)
-	// ListAuths will be used to recursively list all auths in all namespaces
-	ListAuths(ctx context.Context, in *ListAuthsRequest, opts ...grpc.CallOption) (*ListAuthResponse, error)
-	// GetClusterStatus will provide various cluster-level information
-	GetClusterStatus(ctx context.Context, in *GetClusterStatusRequest, opts ...grpc.CallOption) (*GetClusterStatusResponse, error)
-}
-
-type hCPLinkMetaClient struct {
-	cc grpc.ClientConnInterface
-}
-
-func NewHCPLinkMetaClient(cc grpc.ClientConnInterface) HCPLinkMetaClient {
-	return &hCPLinkMetaClient{cc}
-}
-
-func (c *hCPLinkMetaClient) ListNamespaces(ctx context.Context, in *ListNamespacesRequest, opts ...grpc.CallOption) (*ListNamespacesResponse, error) {
-	out := new(ListNamespacesResponse)
-	err := c.cc.Invoke(ctx, "/meta.HCPLinkMeta/ListNamespaces", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *hCPLinkMetaClient) ListMounts(ctx context.Context, in *ListMountsRequest, opts ...grpc.CallOption) (*ListMountsResponse, error) {
-	out := new(ListMountsResponse)
-	err := c.cc.Invoke(ctx, "/meta.HCPLinkMeta/ListMounts", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *hCPLinkMetaClient) ListAuths(ctx context.Context, in *ListAuthsRequest, opts ...grpc.CallOption) (*ListAuthResponse, error) {
-	out := new(ListAuthResponse)
-	err := c.cc.Invoke(ctx, "/meta.HCPLinkMeta/ListAuths", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *hCPLinkMetaClient) GetClusterStatus(ctx context.Context, in *GetClusterStatusRequest, opts ...grpc.CallOption) (*GetClusterStatusResponse, error) {
-	out := new(GetClusterStatusResponse)
-	err := c.cc.Invoke(ctx, "/meta.HCPLinkMeta/GetClusterStatus", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// HCPLinkMetaServer is the server API for HCPLinkMeta service.
-// All implementations must embed UnimplementedHCPLinkMetaServer
-// for forward compatibility
-type HCPLinkMetaServer interface {
-	// ListNamespaces will be used to recursively list all namespaces
-	ListNamespaces(context.Context, *ListNamespacesRequest) (*ListNamespacesResponse, error)
-	// ListMounts will be used to recursively list all mounts in all namespaces
-	ListMounts(context.Context, *ListMountsRequest) (*ListMountsResponse, error)
-	// ListAuths will be used to recursively list all auths in all namespaces
-	ListAuths(context.Context, *ListAuthsRequest) (*ListAuthResponse, error)
-	// GetClusterStatus will provide various cluster-level information
-	GetClusterStatus(context.Context, *GetClusterStatusRequest) (*GetClusterStatusResponse, error)
-	mustEmbedUnimplementedHCPLinkMetaServer()
-}
-
-// UnimplementedHCPLinkMetaServer must be embedded to have forward compatible implementations.
-type UnimplementedHCPLinkMetaServer struct {
-}
-
-func (UnimplementedHCPLinkMetaServer) ListNamespaces(context.Context, *ListNamespacesRequest) (*ListNamespacesResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method ListNamespaces not implemented")
-}
-func (UnimplementedHCPLinkMetaServer) ListMounts(context.Context, *ListMountsRequest) (*ListMountsResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method ListMounts not implemented")
-}
-func (UnimplementedHCPLinkMetaServer) ListAuths(context.Context, *ListAuthsRequest) (*ListAuthResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method ListAuths not implemented")
-}
-func (UnimplementedHCPLinkMetaServer) GetClusterStatus(context.Context, *GetClusterStatusRequest) (*GetClusterStatusResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetClusterStatus not implemented")
-}
-func (UnimplementedHCPLinkMetaServer) mustEmbedUnimplementedHCPLinkMetaServer() {}
-
-// UnsafeHCPLinkMetaServer may be embedded to opt out of forward compatibility for this service.
-// Use of this interface is not recommended, as added methods to HCPLinkMetaServer will
-// result in compilation errors.
-type UnsafeHCPLinkMetaServer interface {
-	mustEmbedUnimplementedHCPLinkMetaServer()
-}
-
-func RegisterHCPLinkMetaServer(s grpc.ServiceRegistrar, srv HCPLinkMetaServer) {
-	s.RegisterService(&HCPLinkMeta_ServiceDesc, srv)
-}
-
-func _HCPLinkMeta_ListNamespaces_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ListNamespacesRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(HCPLinkMetaServer).ListNamespaces(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/meta.HCPLinkMeta/ListNamespaces",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(HCPLinkMetaServer).ListNamespaces(ctx, req.(*ListNamespacesRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _HCPLinkMeta_ListMounts_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ListMountsRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(HCPLinkMetaServer).ListMounts(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/meta.HCPLinkMeta/ListMounts",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(HCPLinkMetaServer).ListMounts(ctx, req.(*ListMountsRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _HCPLinkMeta_ListAuths_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ListAuthsRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(HCPLinkMetaServer).ListAuths(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/meta.HCPLinkMeta/ListAuths",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(HCPLinkMetaServer).ListAuths(ctx, req.(*ListAuthsRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _HCPLinkMeta_GetClusterStatus_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetClusterStatusRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(HCPLinkMetaServer).GetClusterStatus(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/meta.HCPLinkMeta/GetClusterStatus",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(HCPLinkMetaServer).GetClusterStatus(ctx, req.(*GetClusterStatusRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-// HCPLinkMeta_ServiceDesc is the grpc.ServiceDesc for HCPLinkMeta service.
-// It's only intended for direct use with grpc.RegisterService,
-// and not to be introspected or modified (even as a copy)
-var HCPLinkMeta_ServiceDesc = grpc.ServiceDesc{
-	ServiceName: "meta.HCPLinkMeta",
-	HandlerType: (*HCPLinkMetaServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "ListNamespaces",
-			Handler:    _HCPLinkMeta_ListNamespaces_Handler,
-		},
-		{
-			MethodName: "ListMounts",
-			Handler:    _HCPLinkMeta_ListMounts_Handler,
-		},
-		{
-			MethodName: "ListAuths",
-			Handler:    _HCPLinkMeta_ListAuths_Handler,
-		},
-		{
-			MethodName: "GetClusterStatus",
-			Handler:    _HCPLinkMeta_GetClusterStatus_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "vault/hcp_link/proto/meta/meta.proto",
-}
diff --git a/vault/hcp_link/proto/node_status/status.pb.go b/vault/hcp_link/proto/node_status/status.pb.go
index 1436e465f3447..7e85b3a6d73ae 100644
--- a/vault/hcp_link/proto/node_status/status.pb.go
+++ b/vault/hcp_link/proto/node_status/status.pb.go
@@ -1,10 +1,7 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc        v3.21.5
 // source: vault/hcp_link/proto/node_status/status.proto
 
 package node_status
@@ -13,7 +10,7 @@ import (
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	_ "google.golang.org/protobuf/types/known/emptypb"
-	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
+	_ "google.golang.org/protobuf/types/known/timestamppb"
 	reflect "reflect"
 	sync "sync"
 )
@@ -25,144 +22,32 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-type LogLevel int32
-
-const (
-	LogLevel_NO_LEVEL LogLevel = 0
-	LogLevel_TRACE    LogLevel = 1
-	LogLevel_DEBUG    LogLevel = 2
-	LogLevel_INFO     LogLevel = 3
-	LogLevel_WARN     LogLevel = 4
-	LogLevel_ERROR    LogLevel = 5
-)
-
-// Enum value maps for LogLevel.
-var (
-	LogLevel_name = map[int32]string{
-		0: "NO_LEVEL",
-		1: "TRACE",
-		2: "DEBUG",
-		3: "INFO",
-		4: "WARN",
-		5: "ERROR",
-	}
-	LogLevel_value = map[string]int32{
-		"NO_LEVEL": 0,
-		"TRACE":    1,
-		"DEBUG":    2,
-		"INFO":     3,
-		"WARN":     4,
-		"ERROR":    5,
-	}
-)
-
-func (x LogLevel) Enum() *LogLevel {
-	p := new(LogLevel)
-	*p = x
-	return p
-}
-
-func (x LogLevel) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (LogLevel) Descriptor() protoreflect.EnumDescriptor {
-	return file_vault_hcp_link_proto_node_status_status_proto_enumTypes[0].Descriptor()
-}
-
-func (LogLevel) Type() protoreflect.EnumType {
-	return &file_vault_hcp_link_proto_node_status_status_proto_enumTypes[0]
-}
-
-func (x LogLevel) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use LogLevel.Descriptor instead.
-func (LogLevel) EnumDescriptor() ([]byte, []int) {
-	return file_vault_hcp_link_proto_node_status_status_proto_rawDescGZIP(), []int{0}
-}
-
-type RaftStatus struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	IsVoter bool `protobuf:"varint,1,opt,name=IsVoter,proto3" json:"IsVoter,omitempty"`
-}
-
-func (x *RaftStatus) Reset() {
-	*x = RaftStatus{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_vault_hcp_link_proto_node_status_status_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *RaftStatus) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RaftStatus) ProtoMessage() {}
-
-func (x *RaftStatus) ProtoReflect() protoreflect.Message {
-	mi := &file_vault_hcp_link_proto_node_status_status_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use RaftStatus.ProtoReflect.Descriptor instead.
-func (*RaftStatus) Descriptor() ([]byte, []int) {
-	return file_vault_hcp_link_proto_node_status_status_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *RaftStatus) GetIsVoter() bool {
-	if x != nil {
-		return x.IsVoter
-	}
-	return false
-}
-
 type LinkedClusterNodeStatusResponse struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Type                   string                 `protobuf:"bytes,1,opt,name=Type,proto3" json:"Type,omitempty"`
-	Initialized            bool                   `protobuf:"varint,2,opt,name=Initialized,proto3" json:"Initialized,omitempty"`
-	Sealed                 bool                   `protobuf:"varint,3,opt,name=Sealed,proto3" json:"Sealed,omitempty"`
-	T                      int64                  `protobuf:"varint,4,opt,name=T,proto3" json:"T,omitempty"`
-	N                      int64                  `protobuf:"varint,5,opt,name=N,proto3" json:"N,omitempty"`
-	Progress               int64                  `protobuf:"varint,6,opt,name=Progress,proto3" json:"Progress,omitempty"`
-	Nonce                  string                 `protobuf:"bytes,7,opt,name=Nonce,proto3" json:"Nonce,omitempty"`
-	Version                string                 `protobuf:"bytes,8,opt,name=Version,proto3" json:"Version,omitempty"`
-	BuildDate              string                 `protobuf:"bytes,9,opt,name=BuildDate,proto3" json:"BuildDate,omitempty"`
-	Migration              bool                   `protobuf:"varint,10,opt,name=Migration,proto3" json:"Migration,omitempty"`
-	ClusterName            string                 `protobuf:"bytes,11,opt,name=ClusterName,proto3" json:"ClusterName,omitempty"`
-	ClusterID              string                 `protobuf:"bytes,12,opt,name=ClusterID,proto3" json:"ClusterID,omitempty"`
-	RecoverySeal           bool                   `protobuf:"varint,13,opt,name=RecoverySeal,proto3" json:"RecoverySeal,omitempty"`
-	StorageType            string                 `protobuf:"bytes,14,opt,name=StorageType,proto3" json:"StorageType,omitempty"`
-	ReplicationState       []string               `protobuf:"bytes,15,rep,name=ReplicationState,proto3" json:"ReplicationState,omitempty"`
-	Hostname               string                 `protobuf:"bytes,16,opt,name=Hostname,proto3" json:"Hostname,omitempty"`
-	ListenerAddresses      []string               `protobuf:"bytes,17,rep,name=ListenerAddresses,proto3" json:"ListenerAddresses,omitempty"`
-	OperatingSystem        string                 `protobuf:"bytes,18,opt,name=OperatingSystem,proto3" json:"OperatingSystem,omitempty"`
-	OperatingSystemVersion string                 `protobuf:"bytes,19,opt,name=OperatingSystemVersion,proto3" json:"OperatingSystemVersion,omitempty"`
-	LogLevel               LogLevel               `protobuf:"varint,20,opt,name=LogLevel,proto3,enum=hashicorp.vault.hcp_link.node_status.LogLevel" json:"LogLevel,omitempty"`
-	ActiveTime             *timestamppb.Timestamp `protobuf:"bytes,21,opt,name=ActiveTime,proto3" json:"ActiveTime,omitempty"`
-	RaftStatus             *RaftStatus            `protobuf:"bytes,22,opt,name=RaftStatus,proto3" json:"RaftStatus,omitempty"`
+	Type             string   `protobuf:"bytes,1,opt,name=Type,proto3" json:"Type,omitempty"`
+	Initialized      bool     `protobuf:"varint,2,opt,name=Initialized,proto3" json:"Initialized,omitempty"`
+	Sealed           bool     `protobuf:"varint,3,opt,name=Sealed,proto3" json:"Sealed,omitempty"`
+	T                int64    `protobuf:"varint,4,opt,name=T,proto3" json:"T,omitempty"`
+	N                int64    `protobuf:"varint,5,opt,name=N,proto3" json:"N,omitempty"`
+	Progress         int64    `protobuf:"varint,6,opt,name=Progress,proto3" json:"Progress,omitempty"`
+	Nonce            string   `protobuf:"bytes,7,opt,name=Nonce,proto3" json:"Nonce,omitempty"`
+	Version          string   `protobuf:"bytes,8,opt,name=Version,proto3" json:"Version,omitempty"`
+	BuildDate        string   `protobuf:"bytes,9,opt,name=BuildDate,proto3" json:"BuildDate,omitempty"`
+	Migration        bool     `protobuf:"varint,10,opt,name=Migration,proto3" json:"Migration,omitempty"`
+	ClusterName      string   `protobuf:"bytes,11,opt,name=ClusterName,proto3" json:"ClusterName,omitempty"`
+	ClusterID        string   `protobuf:"bytes,12,opt,name=ClusterID,proto3" json:"ClusterID,omitempty"`
+	RecoverySeal     bool     `protobuf:"varint,13,opt,name=RecoverySeal,proto3" json:"RecoverySeal,omitempty"`
+	StorageType      string   `protobuf:"bytes,14,opt,name=StorageType,proto3" json:"StorageType,omitempty"`
+	ReplicationState []string `protobuf:"bytes,15,rep,name=ReplicationState,proto3" json:"ReplicationState,omitempty"`
 }
 
 func (x *LinkedClusterNodeStatusResponse) Reset() {
 	*x = LinkedClusterNodeStatusResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_vault_hcp_link_proto_node_status_status_proto_msgTypes[1]
+		mi := &file_vault_hcp_link_proto_node_status_status_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -175,7 +60,7 @@ func (x *LinkedClusterNodeStatusResponse) String() string {
 func (*LinkedClusterNodeStatusResponse) ProtoMessage() {}
 
 func (x *LinkedClusterNodeStatusResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_vault_hcp_link_proto_node_status_status_proto_msgTypes[1]
+	mi := &file_vault_hcp_link_proto_node_status_status_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -188,7 +73,7 @@ func (x *LinkedClusterNodeStatusResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use LinkedClusterNodeStatusResponse.ProtoReflect.Descriptor instead.
 func (*LinkedClusterNodeStatusResponse) Descriptor() ([]byte, []int) {
-	return file_vault_hcp_link_proto_node_status_status_proto_rawDescGZIP(), []int{1}
+	return file_vault_hcp_link_proto_node_status_status_proto_rawDescGZIP(), []int{0}
 }
 
 func (x *LinkedClusterNodeStatusResponse) GetType() string {
@@ -296,55 +181,6 @@ func (x *LinkedClusterNodeStatusResponse) GetReplicationState() []string {
 	return nil
 }
 
-func (x *LinkedClusterNodeStatusResponse) GetHostname() string {
-	if x != nil {
-		return x.Hostname
-	}
-	return ""
-}
-
-func (x *LinkedClusterNodeStatusResponse) GetListenerAddresses() []string {
-	if x != nil {
-		return x.ListenerAddresses
-	}
-	return nil
-}
-
-func (x *LinkedClusterNodeStatusResponse) GetOperatingSystem() string {
-	if x != nil {
-		return x.OperatingSystem
-	}
-	return ""
-}
-
-func (x *LinkedClusterNodeStatusResponse) GetOperatingSystemVersion() string {
-	if x != nil {
-		return x.OperatingSystemVersion
-	}
-	return ""
-}
-
-func (x *LinkedClusterNodeStatusResponse) GetLogLevel() LogLevel {
-	if x != nil {
-		return x.LogLevel
-	}
-	return LogLevel_NO_LEVEL
-}
-
-func (x *LinkedClusterNodeStatusResponse) GetActiveTime() *timestamppb.Timestamp {
-	if x != nil {
-		return x.ActiveTime
-	}
-	return nil
-}
-
-func (x *LinkedClusterNodeStatusResponse) GetRaftStatus() *RaftStatus {
-	if x != nil {
-		return x.RaftStatus
-	}
-	return nil
-}
-
 var File_vault_hcp_link_proto_node_status_status_proto protoreflect.FileDescriptor
 
 var file_vault_hcp_link_proto_node_status_status_proto_rawDesc = []byte{
@@ -357,71 +193,40 @@ var file_vault_hcp_link_proto_node_status_status_proto_rawDesc = []byte{
 	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70,
 	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70,
 	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x22, 0x26, 0x0a, 0x0a, 0x52, 0x61, 0x66, 0x74, 0x53, 0x74, 0x61, 0x74, 0x75,
-	0x73, 0x12, 0x18, 0x0a, 0x07, 0x49, 0x73, 0x56, 0x6f, 0x74, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x07, 0x49, 0x73, 0x56, 0x6f, 0x74, 0x65, 0x72, 0x22, 0xcb, 0x06, 0x0a, 0x1f,
-	0x4c, 0x69, 0x6e, 0x6b, 0x65, 0x64, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x6f, 0x64,
-	0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
-	0x12, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x54,
-	0x79, 0x70, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x49, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x69, 0x7a,
-	0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x49, 0x6e, 0x69, 0x74, 0x69, 0x61,
-	0x6c, 0x69, 0x7a, 0x65, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x53, 0x65, 0x61, 0x6c, 0x65, 0x64, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x53, 0x65, 0x61, 0x6c, 0x65, 0x64, 0x12, 0x0c, 0x0a,
-	0x01, 0x54, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x01, 0x54, 0x12, 0x0c, 0x0a, 0x01, 0x4e,
-	0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x01, 0x4e, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x72, 0x6f,
-	0x67, 0x72, 0x65, 0x73, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x50, 0x72, 0x6f,
-	0x67, 0x72, 0x65, 0x73, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x4e, 0x6f, 0x6e, 0x63, 0x65, 0x18, 0x07,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x4e, 0x6f, 0x6e, 0x63, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x56,
-	0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x56, 0x65,
-	0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x44, 0x61,
-	0x74, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x44,
-	0x61, 0x74, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x4d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x4d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x12, 0x20, 0x0a, 0x0b, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65,
-	0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4e,
-	0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x44,
-	0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49,
-	0x44, 0x12, 0x22, 0x0a, 0x0c, 0x52, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x53, 0x65, 0x61,
-	0x6c, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x52, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72,
-	0x79, 0x53, 0x65, 0x61, 0x6c, 0x12, 0x20, 0x0a, 0x0b, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65,
-	0x54, 0x79, 0x70, 0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x53, 0x74, 0x6f, 0x72,
-	0x61, 0x67, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x2a, 0x0a, 0x10, 0x52, 0x65, 0x70, 0x6c, 0x69,
-	0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x0f, 0x20, 0x03, 0x28,
-	0x09, 0x52, 0x10, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74,
-	0x61, 0x74, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x48, 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x18,
-	0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x48, 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x12,
-	0x2c, 0x0a, 0x11, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65,
-	0x73, 0x73, 0x65, 0x73, 0x18, 0x11, 0x20, 0x03, 0x28, 0x09, 0x52, 0x11, 0x4c, 0x69, 0x73, 0x74,
-	0x65, 0x6e, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x12, 0x28, 0x0a,
-	0x0f, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d,
-	0x18, 0x12, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6e,
-	0x67, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x12, 0x36, 0x0a, 0x16, 0x4f, 0x70, 0x65, 0x72, 0x61,
-	0x74, 0x69, 0x6e, 0x67, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f,
-	0x6e, 0x18, 0x13, 0x20, 0x01, 0x28, 0x09, 0x52, 0x16, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69,
-	0x6e, 0x67, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12,
-	0x4a, 0x0a, 0x08, 0x4c, 0x6f, 0x67, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x14, 0x20, 0x01, 0x28,
-	0x0e, 0x32, 0x2e, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x76, 0x61,
-	0x75, 0x6c, 0x74, 0x2e, 0x68, 0x63, 0x70, 0x5f, 0x6c, 0x69, 0x6e, 0x6b, 0x2e, 0x6e, 0x6f, 0x64,
-	0x65, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x4c, 0x6f, 0x67, 0x4c, 0x65, 0x76, 0x65,
-	0x6c, 0x52, 0x08, 0x4c, 0x6f, 0x67, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x3a, 0x0a, 0x0a, 0x41,
-	0x63, 0x74, 0x69, 0x76, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x15, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0a, 0x41, 0x63, 0x74,
-	0x69, 0x76, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x50, 0x0a, 0x0a, 0x52, 0x61, 0x66, 0x74, 0x53,
-	0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x16, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x68, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x76, 0x61, 0x75, 0x6c, 0x74, 0x2e, 0x68, 0x63,
-	0x70, 0x5f, 0x6c, 0x69, 0x6e, 0x6b, 0x2e, 0x6e, 0x6f, 0x64, 0x65, 0x5f, 0x73, 0x74, 0x61, 0x74,
-	0x75, 0x73, 0x2e, 0x52, 0x61, 0x66, 0x74, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x0a, 0x52,
-	0x61, 0x66, 0x74, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2a, 0x4d, 0x0a, 0x08, 0x4c, 0x6f, 0x67,
-	0x4c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x0c, 0x0a, 0x08, 0x4e, 0x4f, 0x5f, 0x4c, 0x45, 0x56, 0x45,
-	0x4c, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x54, 0x52, 0x41, 0x43, 0x45, 0x10, 0x01, 0x12, 0x09,
-	0x0a, 0x05, 0x44, 0x45, 0x42, 0x55, 0x47, 0x10, 0x02, 0x12, 0x08, 0x0a, 0x04, 0x49, 0x4e, 0x46,
-	0x4f, 0x10, 0x03, 0x12, 0x08, 0x0a, 0x04, 0x57, 0x41, 0x52, 0x4e, 0x10, 0x04, 0x12, 0x09, 0x0a,
-	0x05, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x10, 0x05, 0x42, 0x3d, 0x5a, 0x3b, 0x67, 0x69, 0x74, 0x68,
-	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2f, 0x76, 0x61, 0x75, 0x6c, 0x74, 0x2f, 0x76, 0x61, 0x75, 0x6c, 0x74, 0x2f, 0x68, 0x63, 0x70,
-	0x5f, 0x6c, 0x69, 0x6e, 0x6b, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x6f, 0x64, 0x65,
-	0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x6f, 0x74, 0x6f, 0x22, 0xc5, 0x03, 0x0a, 0x1f, 0x4c, 0x69, 0x6e, 0x6b, 0x65, 0x64, 0x43, 0x6c,
+	0x75, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x6f, 0x64, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x49,
+	0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x0b, 0x49, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x12, 0x16, 0x0a,
+	0x06, 0x53, 0x65, 0x61, 0x6c, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x53,
+	0x65, 0x61, 0x6c, 0x65, 0x64, 0x12, 0x0c, 0x0a, 0x01, 0x54, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03,
+	0x52, 0x01, 0x54, 0x12, 0x0c, 0x0a, 0x01, 0x4e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x01,
+	0x4e, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x18, 0x06, 0x20,
+	0x01, 0x28, 0x03, 0x52, 0x08, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x12, 0x14, 0x0a,
+	0x05, 0x4e, 0x6f, 0x6e, 0x63, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x4e, 0x6f,
+	0x6e, 0x63, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x08,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x1c, 0x0a,
+	0x09, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x44, 0x61, 0x74, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x09, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x44, 0x61, 0x74, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x4d,
+	0x69, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09,
+	0x4d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x20, 0x0a, 0x0b, 0x43, 0x6c, 0x75,
+	0x73, 0x74, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b,
+	0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x43,
+	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x44, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
+	0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x44, 0x12, 0x22, 0x0a, 0x0c, 0x52, 0x65, 0x63,
+	0x6f, 0x76, 0x65, 0x72, 0x79, 0x53, 0x65, 0x61, 0x6c, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x0c, 0x52, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x53, 0x65, 0x61, 0x6c, 0x12, 0x20, 0x0a,
+	0x0b, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x54, 0x79, 0x70, 0x65, 0x18, 0x0e, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x0b, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12,
+	0x2a, 0x0a, 0x10, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74,
+	0x61, 0x74, 0x65, 0x18, 0x0f, 0x20, 0x03, 0x28, 0x09, 0x52, 0x10, 0x52, 0x65, 0x70, 0x6c, 0x69,
+	0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x42, 0x3d, 0x5a, 0x3b, 0x67,
+	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
+	0x6f, 0x72, 0x70, 0x2f, 0x76, 0x61, 0x75, 0x6c, 0x74, 0x2f, 0x76, 0x61, 0x75, 0x6c, 0x74, 0x2f,
+	0x68, 0x63, 0x70, 0x5f, 0x6c, 0x69, 0x6e, 0x6b, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e,
+	0x6f, 0x64, 0x65, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x33,
 }
 
 var (
@@ -436,23 +241,16 @@ func file_vault_hcp_link_proto_node_status_status_proto_rawDescGZIP() []byte {
 	return file_vault_hcp_link_proto_node_status_status_proto_rawDescData
 }
 
-var file_vault_hcp_link_proto_node_status_status_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_vault_hcp_link_proto_node_status_status_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+var file_vault_hcp_link_proto_node_status_status_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
 var file_vault_hcp_link_proto_node_status_status_proto_goTypes = []interface{}{
-	(LogLevel)(0),                           // 0: hashicorp.vault.hcp_link.node_status.LogLevel
-	(*RaftStatus)(nil),                      // 1: hashicorp.vault.hcp_link.node_status.RaftStatus
-	(*LinkedClusterNodeStatusResponse)(nil), // 2: hashicorp.vault.hcp_link.node_status.LinkedClusterNodeStatusResponse
-	(*timestamppb.Timestamp)(nil),           // 3: google.protobuf.Timestamp
+	(*LinkedClusterNodeStatusResponse)(nil), // 0: hashicorp.vault.hcp_link.node_status.LinkedClusterNodeStatusResponse
 }
 var file_vault_hcp_link_proto_node_status_status_proto_depIdxs = []int32{
-	0, // 0: hashicorp.vault.hcp_link.node_status.LinkedClusterNodeStatusResponse.LogLevel:type_name -> hashicorp.vault.hcp_link.node_status.LogLevel
-	3, // 1: hashicorp.vault.hcp_link.node_status.LinkedClusterNodeStatusResponse.ActiveTime:type_name -> google.protobuf.Timestamp
-	1, // 2: hashicorp.vault.hcp_link.node_status.LinkedClusterNodeStatusResponse.RaftStatus:type_name -> hashicorp.vault.hcp_link.node_status.RaftStatus
-	3, // [3:3] is the sub-list for method output_type
-	3, // [3:3] is the sub-list for method input_type
-	3, // [3:3] is the sub-list for extension type_name
-	3, // [3:3] is the sub-list for extension extendee
-	0, // [0:3] is the sub-list for field type_name
+	0, // [0:0] is the sub-list for method output_type
+	0, // [0:0] is the sub-list for method input_type
+	0, // [0:0] is the sub-list for extension type_name
+	0, // [0:0] is the sub-list for extension extendee
+	0, // [0:0] is the sub-list for field type_name
 }
 
 func init() { file_vault_hcp_link_proto_node_status_status_proto_init() }
@@ -462,18 +260,6 @@ func file_vault_hcp_link_proto_node_status_status_proto_init() {
 	}
 	if !protoimpl.UnsafeEnabled {
 		file_vault_hcp_link_proto_node_status_status_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RaftStatus); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_vault_hcp_link_proto_node_status_status_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*LinkedClusterNodeStatusResponse); i {
 			case 0:
 				return &v.state
@@ -491,14 +277,13 @@ func file_vault_hcp_link_proto_node_status_status_proto_init() {
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_vault_hcp_link_proto_node_status_status_proto_rawDesc,
-			NumEnums:      1,
-			NumMessages:   2,
+			NumEnums:      0,
+			NumMessages:   1,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
 		GoTypes:           file_vault_hcp_link_proto_node_status_status_proto_goTypes,
 		DependencyIndexes: file_vault_hcp_link_proto_node_status_status_proto_depIdxs,
-		EnumInfos:         file_vault_hcp_link_proto_node_status_status_proto_enumTypes,
 		MessageInfos:      file_vault_hcp_link_proto_node_status_status_proto_msgTypes,
 	}.Build()
 	File_vault_hcp_link_proto_node_status_status_proto = out.File
diff --git a/vault/hcp_link/proto/node_status/status.proto b/vault/hcp_link/proto/node_status/status.proto
index 618a93bebf048..206fe4143233f 100644
--- a/vault/hcp_link/proto/node_status/status.proto
+++ b/vault/hcp_link/proto/node_status/status.proto
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 syntax = "proto3";
 
 option go_package = "github.com/hashicorp/vault/vault/hcp_link/proto/node_status";
@@ -10,19 +7,6 @@ package hashicorp.vault.hcp_link.node_status;
 import "google/protobuf/timestamp.proto";
 import "google/protobuf/empty.proto";
 
-message RaftStatus {
-  bool IsVoter = 1;
-}
-
-enum LogLevel {
-  NO_LEVEL = 0;
-  TRACE = 1;
-  DEBUG = 2;
-  INFO = 3;
-  WARN = 4;
-  ERROR = 5;
-}
-
 message LinkedClusterNodeStatusResponse {
   string Type = 1;
   bool Initialized = 2;
@@ -39,11 +23,4 @@ message LinkedClusterNodeStatusResponse {
   bool RecoverySeal = 13;
   string StorageType = 14;
   repeated string ReplicationState = 15;
-  string Hostname = 16;
-  repeated string ListenerAddresses = 17;
-  string OperatingSystem = 18;
-  string OperatingSystemVersion = 19;
-  LogLevel LogLevel = 20;
-  google.protobuf.Timestamp ActiveTime = 21;
-  RaftStatus RaftStatus = 22;
 }
diff --git a/vault/hcp_link/structs.go b/vault/hcp_link/structs.go
new file mode 100644
index 0000000000000..9ca057168f328
--- /dev/null
+++ b/vault/hcp_link/structs.go
@@ -0,0 +1,21 @@
+package hcp_link
+
+// SessionStatus is used to express the current status of the SCADA session.
+type SessionStatus = string
+
+const (
+	// Connected HCP link connection status when it is connected
+	Connected = SessionStatus("connected")
+	// Disconnected HCP link connection status when it is disconnected
+	Disconnected = SessionStatus("disconnected")
+)
+
+type WrappedHCPLinkVault struct {
+	HCPLinkVaultInterface
+}
+
+type HCPLinkVaultInterface interface {
+	Shutdown() error
+	GetScadaSessionStatus() string
+	GetConnectionStatusMessage(string) string
+}
diff --git a/vault/identity_lookup.go b/vault/identity_lookup.go
index ad4903ad960ec..a85577a7b9cdd 100644
--- a/vault/identity_lookup.go
+++ b/vault/identity_lookup.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -17,12 +14,6 @@ func lookupPaths(i *IdentityStore) []*framework.Path {
 	return []*framework.Path{
 		{
 			Pattern: "lookup/entity$",
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "entity",
-				OperationVerb:   "look-up",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"name": {
 					Type:        framework.TypeString,
@@ -54,12 +45,6 @@ func lookupPaths(i *IdentityStore) []*framework.Path {
 		},
 		{
 			Pattern: "lookup/group$",
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "group",
-				OperationVerb:   "look-up",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"name": {
 					Type:        framework.TypeString,
diff --git a/vault/identity_lookup_test.go b/vault/identity_lookup_test.go
index 80d6bef07f31d..c1cbc19dd4fda 100644
--- a/vault/identity_lookup_test.go
+++ b/vault/identity_lookup_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/identity_store.go b/vault/identity_store.go
index e6beec3b23791..5dc32e30653cf 100644
--- a/vault/identity_store.go
+++ b/vault/identity_store.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -148,11 +145,6 @@ func mfaPaths(i *IdentityStore) []*framework.Path {
 	return []*framework.Path{
 		{
 			Pattern: "mfa/method" + genericOptionalUUIDRegex("method_id"),
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "mfa",
-				OperationVerb:   "read",
-				OperationSuffix: "method-configuration|method-configuration",
-			},
 			Fields: map[string]*framework.FieldSchema{
 				"method_id": {
 					Type:        framework.TypeString,
@@ -168,11 +160,6 @@ func mfaPaths(i *IdentityStore) []*framework.Path {
 		},
 		{
 			Pattern: "mfa/method/?$",
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "mfa",
-				OperationVerb:   "list",
-				OperationSuffix: "methods",
-			},
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ListOperation: &framework.PathOperation{
 					Callback: i.handleMFAMethodListGlobal,
@@ -182,14 +169,7 @@ func mfaPaths(i *IdentityStore) []*framework.Path {
 		},
 		{
 			Pattern: "mfa/method/totp" + genericOptionalUUIDRegex("method_id"),
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "mfa",
-			},
 			Fields: map[string]*framework.FieldSchema{
-				"method_name": {
-					Type:        framework.TypeString,
-					Description: `The unique name identifier for this MFA method.`,
-				},
 				"method_id": {
 					Type:        framework.TypeString,
 					Description: `The unique identifier for this MFA method.`,
@@ -236,37 +216,20 @@ func mfaPaths(i *IdentityStore) []*framework.Path {
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
 					Callback: i.handleMFAMethodTOTPRead,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "read",
-						OperationSuffix: "totp-method-configuration|totp-method-configuration",
-					},
-					Summary: "Read the current configuration for the given MFA method",
+					Summary:  "Read the current configuration for the given MFA method",
 				},
 				logical.UpdateOperation: &framework.PathOperation{
 					Callback: i.handleMFAMethodTOTPUpdate,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "configure",
-						OperationSuffix: "totp-method|totp-method",
-					},
-					Summary: "Update or create a configuration for the given MFA method",
+					Summary:  "Update or create a configuration for the given MFA method",
 				},
 				logical.DeleteOperation: &framework.PathOperation{
 					Callback: i.handleMFAMethodTOTPDelete,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "delete",
-						OperationSuffix: "totp-method|totp-method",
-					},
-					Summary: "Delete a configuration for the given MFA method",
+					Summary:  "Delete a configuration for the given MFA method",
 				},
 			},
 		},
 		{
 			Pattern: "mfa/method/totp/?$",
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "mfa",
-				OperationVerb:   "list",
-				OperationSuffix: "totp-methods",
-			},
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ListOperation: &framework.PathOperation{
 					Callback: i.handleMFAMethodListTOTP,
@@ -276,11 +239,6 @@ func mfaPaths(i *IdentityStore) []*framework.Path {
 		},
 		{
 			Pattern: "mfa/method/totp/generate$",
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "mfa",
-				OperationVerb:   "generate",
-				OperationSuffix: "totp-secret",
-			},
 			Fields: map[string]*framework.FieldSchema{
 				"method_id": {
 					Type:        framework.TypeString,
@@ -297,11 +255,6 @@ func mfaPaths(i *IdentityStore) []*framework.Path {
 		},
 		{
 			Pattern: "mfa/method/totp/admin-generate$",
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "mfa",
-				OperationVerb:   "admin-generate",
-				OperationSuffix: "totp-secret",
-			},
 			Fields: map[string]*framework.FieldSchema{
 				"method_id": {
 					Type:        framework.TypeString,
@@ -323,11 +276,6 @@ func mfaPaths(i *IdentityStore) []*framework.Path {
 		},
 		{
 			Pattern: "mfa/method/totp/admin-destroy$",
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "mfa",
-				OperationVerb:   "admin-destroy",
-				OperationSuffix: "totp-secret",
-			},
 			Fields: map[string]*framework.FieldSchema{
 				"method_id": {
 					Type:        framework.TypeString,
@@ -349,14 +297,7 @@ func mfaPaths(i *IdentityStore) []*framework.Path {
 		},
 		{
 			Pattern: "mfa/method/okta" + genericOptionalUUIDRegex("method_id"),
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "mfa",
-			},
 			Fields: map[string]*framework.FieldSchema{
-				"method_name": {
-					Type:        framework.TypeString,
-					Description: `The unique name identifier for this MFA method.`,
-				},
 				"method_id": {
 					Type:        framework.TypeString,
 					Description: `The unique identifier for this MFA method.`,
@@ -389,27 +330,15 @@ func mfaPaths(i *IdentityStore) []*framework.Path {
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
 					Callback: i.handleMFAMethodOKTARead,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "read",
-						OperationSuffix: "okta-method-configuration|okta-method-configuration",
-					},
-					Summary: "Read the current configuration for the given MFA method",
+					Summary:  "Read the current configuration for the given MFA method",
 				},
 				logical.UpdateOperation: &framework.PathOperation{
 					Callback: i.handleMFAMethodOKTAUpdate,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "configure",
-						OperationSuffix: "okta-method|okta-method",
-					},
-					Summary: "Update or create a configuration for the given MFA method",
+					Summary:  "Update or create a configuration for the given MFA method",
 				},
 				logical.DeleteOperation: &framework.PathOperation{
 					Callback: i.handleMFAMethodOKTADelete,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "delete",
-						OperationSuffix: "okta-method|okta-method",
-					},
-					Summary: "Delete a configuration for the given MFA method",
+					Summary:  "Delete a configuration for the given MFA method",
 				},
 			},
 		},
@@ -418,25 +347,13 @@ func mfaPaths(i *IdentityStore) []*framework.Path {
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ListOperation: &framework.PathOperation{
 					Callback: i.handleMFAMethodListOkta,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationPrefix: "mfa",
-						OperationVerb:   "list",
-						OperationSuffix: "okta-methods",
-					},
-					Summary: "List MFA method configurations for the given MFA method",
+					Summary:  "List MFA method configurations for the given MFA method",
 				},
 			},
 		},
 		{
 			Pattern: "mfa/method/duo" + genericOptionalUUIDRegex("method_id"),
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "mfa",
-			},
 			Fields: map[string]*framework.FieldSchema{
-				"method_name": {
-					Type:        framework.TypeString,
-					Description: `The unique name identifier for this MFA method.`,
-				},
 				"method_id": {
 					Type:        framework.TypeString,
 					Description: `The unique identifier for this MFA method.`,
@@ -469,27 +386,15 @@ func mfaPaths(i *IdentityStore) []*framework.Path {
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
 					Callback: i.handleMFAMethodDuoRead,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "read",
-						OperationSuffix: "duo-method-configuration|duo-method-configuration",
-					},
-					Summary: "Read the current configuration for the given MFA method",
+					Summary:  "Read the current configuration for the given MFA method",
 				},
 				logical.UpdateOperation: &framework.PathOperation{
 					Callback: i.handleMFAMethodDuoUpdate,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "configure",
-						OperationSuffix: "duo-method|duo-method",
-					},
-					Summary: "Update or create a configuration for the given MFA method",
+					Summary:  "Update or create a configuration for the given MFA method",
 				},
 				logical.DeleteOperation: &framework.PathOperation{
 					Callback: i.handleMFAMethodDUODelete,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "delete",
-						OperationSuffix: "duo-method|duo-method",
-					},
-					Summary: "Delete a configuration for the given MFA method",
+					Summary:  "Delete a configuration for the given MFA method",
 				},
 			},
 		},
@@ -498,25 +403,13 @@ func mfaPaths(i *IdentityStore) []*framework.Path {
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ListOperation: &framework.PathOperation{
 					Callback: i.handleMFAMethodListDuo,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationPrefix: "mfa",
-						OperationVerb:   "list",
-						OperationSuffix: "duo-methods",
-					},
-					Summary: "List MFA method configurations for the given MFA method",
+					Summary:  "List MFA method configurations for the given MFA method",
 				},
 			},
 		},
 		{
 			Pattern: "mfa/method/pingid" + genericOptionalUUIDRegex("method_id"),
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "mfa",
-			},
 			Fields: map[string]*framework.FieldSchema{
-				"method_name": {
-					Type:        framework.TypeString,
-					Description: `The unique name identifier for this MFA method.`,
-				},
 				"method_id": {
 					Type:        framework.TypeString,
 					Description: `The unique identifier for this MFA method.`,
@@ -533,27 +426,15 @@ func mfaPaths(i *IdentityStore) []*framework.Path {
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
 					Callback: i.handleMFAMethodPingIDRead,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "read",
-						OperationSuffix: "ping-id-method-configuration|ping-id-method-configuration",
-					},
-					Summary: "Read the current configuration for the given MFA method",
+					Summary:  "Read the current configuration for the given MFA method",
 				},
 				logical.UpdateOperation: &framework.PathOperation{
 					Callback: i.handleMFAMethodPingIDUpdate,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "configure",
-						OperationSuffix: "ping-id-method|ping-id-method",
-					},
-					Summary: "Update or create a configuration for the given MFA method",
+					Summary:  "Update or create a configuration for the given MFA method",
 				},
 				logical.DeleteOperation: &framework.PathOperation{
 					Callback: i.handleMFAMethodPingIDDelete,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "delete",
-						OperationSuffix: "ping-id-method|ping-id-method",
-					},
-					Summary: "Delete a configuration for the given MFA method",
+					Summary:  "Delete a configuration for the given MFA method",
 				},
 			},
 		},
@@ -562,21 +443,12 @@ func mfaPaths(i *IdentityStore) []*framework.Path {
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ListOperation: &framework.PathOperation{
 					Callback: i.handleMFAMethodListPingID,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationPrefix: "mfa",
-						OperationVerb:   "list",
-						OperationSuffix: "ping-id-methods",
-					},
-					Summary: "List MFA method configurations for the given MFA method",
+					Summary:  "List MFA method configurations for the given MFA method",
 				},
 			},
 		},
 		{
 			Pattern: "mfa/login-enforcement/" + framework.GenericNameRegex("name"),
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "mfa",
-				OperationSuffix: "login-enforcement",
-			},
 			Fields: map[string]*framework.FieldSchema{
 				"name": {
 					Type:        framework.TypeString,
@@ -622,10 +494,6 @@ func mfaPaths(i *IdentityStore) []*framework.Path {
 		},
 		{
 			Pattern: "mfa/login-enforcement/?$",
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "mfa",
-				OperationSuffix: "login-enforcements",
-			},
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ListOperation: &framework.PathOperation{
 					Callback: i.handleMFALoginEnforcementList,
diff --git a/vault/identity_store_aliases.go b/vault/identity_store_aliases.go
index 893105ad5b01d..1fe3c3126e392 100644
--- a/vault/identity_store_aliases.go
+++ b/vault/identity_store_aliases.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -26,13 +23,6 @@ func aliasPaths(i *IdentityStore) []*framework.Path {
 	return []*framework.Path{
 		{
 			Pattern: "entity-alias$",
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "entity",
-				OperationVerb:   "create",
-				OperationSuffix: "alias",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"id": {
 					Type:        framework.TypeString,
@@ -70,12 +60,6 @@ This field is deprecated, use canonical_id.`,
 		},
 		{
 			Pattern: "entity-alias/id/" + framework.GenericNameRegex("id"),
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "entity",
-				OperationSuffix: "alias-by-id",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"id": {
 					Type:        framework.TypeString,
@@ -104,26 +88,10 @@ This field is deprecated, use canonical_id.`,
 					Description: "User provided key-value pairs",
 				},
 			},
-
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.UpdateOperation: &framework.PathOperation{
-					Callback: i.handleAliasCreateUpdate(),
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb: "update",
-					},
-				},
-				logical.ReadOperation: &framework.PathOperation{
-					Callback: i.pathAliasIDRead(),
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb: "read",
-					},
-				},
-				logical.DeleteOperation: &framework.PathOperation{
-					Callback: i.pathAliasIDDelete(),
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb: "delete",
-					},
-				},
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.UpdateOperation: i.handleAliasCreateUpdate(),
+				logical.ReadOperation:   i.pathAliasIDRead(),
+				logical.DeleteOperation: i.pathAliasIDDelete(),
 			},
 
 			HelpSynopsis:    strings.TrimSpace(aliasHelp["alias-id"][0]),
@@ -131,13 +99,6 @@ This field is deprecated, use canonical_id.`,
 		},
 		{
 			Pattern: "entity-alias/id/?$",
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "entity",
-				OperationVerb:   "list",
-				OperationSuffix: "aliases-by-id",
-			},
-
 			Callbacks: map[logical.Operation]framework.OperationFunc{
 				logical.ListOperation: i.pathAliasIDList(),
 			},
@@ -211,9 +172,8 @@ func (i *IdentityStore) handleAliasCreateUpdate() framework.OperationFunc {
 				}
 				switch {
 				case mountAccessor == "" && name == "":
-					// Check if the canonicalID or the customMetadata are being
-					// updated
-					if canonicalID == "" && !customMetadataExists {
+					// Just a canonical ID update, maybe
+					if canonicalID == "" {
 						// Nothing to do, so be idempotent
 						return nil, nil
 					}
diff --git a/vault/identity_store_aliases_test.go b/vault/identity_store_aliases_test.go
index 08724f5fce744..6c0f7a0f06cd5 100644
--- a/vault/identity_store_aliases_test.go
+++ b/vault/identity_store_aliases_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -461,46 +458,6 @@ func TestIdentityStore_AliasUpdate(t *testing.T) {
 				"custom_metadata": map[string]string{},
 			},
 		},
-		{
-			name: "only-metadata",
-			createData: map[string]interface{}{
-				"name":           "only",
-				"mount_accessor": githubAccessor,
-				"custom_metadata": map[string]string{
-					"foo": "bar",
-				},
-			},
-			updateData: map[string]interface{}{
-				"custom_metadata": map[string]string{
-					"bar": "baz",
-				},
-			},
-		},
-		{
-			name: "only-metadata-clear",
-			createData: map[string]interface{}{
-				"name":           "only-clear",
-				"mount_accessor": githubAccessor,
-				"custom_metadata": map[string]string{
-					"foo": "bar",
-				},
-			},
-			updateData: map[string]interface{}{
-				"custom_metadata": map[string]string{},
-			},
-		},
-		{
-			name: "only-metadata-none-before",
-			createData: map[string]interface{}{
-				"name":           "no-metadata",
-				"mount_accessor": githubAccessor,
-			},
-			updateData: map[string]interface{}{
-				"custom_metadata": map[string]string{
-					"foo": "bar",
-				},
-			},
-		},
 	}
 
 	handleRequest := func(t *testing.T, req *logical.Request) *logical.Response {
diff --git a/vault/identity_store_entities.go b/vault/identity_store_entities.go
index 869f205a0ef7a..11db95d8b1108 100644
--- a/vault/identity_store_entities.go
+++ b/vault/identity_store_entities.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -61,13 +58,7 @@ func entityPaths(i *IdentityStore) []*framework.Path {
 	return []*framework.Path{
 		{
 			Pattern: "entity$",
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "entity",
-				OperationVerb:   "create",
-			},
-
-			Fields: entityPathFields(),
+			Fields:  entityPathFields(),
 			Callbacks: map[logical.Operation]framework.OperationFunc{
 				logical.UpdateOperation: i.handleEntityUpdateCommon(),
 			},
@@ -77,33 +68,11 @@ func entityPaths(i *IdentityStore) []*framework.Path {
 		},
 		{
 			Pattern: "entity/name/(?P<name>.+)",
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "entity",
-				OperationSuffix: "by-name",
-			},
-
-			Fields: entityPathFields(),
-
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.UpdateOperation: &framework.PathOperation{
-					Callback: i.handleEntityUpdateCommon(),
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb: "update",
-					},
-				},
-				logical.ReadOperation: &framework.PathOperation{
-					Callback: i.pathEntityNameRead(),
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb: "read",
-					},
-				},
-				logical.DeleteOperation: &framework.PathOperation{
-					Callback: i.pathEntityNameDelete(),
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb: "delete",
-					},
-				},
+			Fields:  entityPathFields(),
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.UpdateOperation: i.handleEntityUpdateCommon(),
+				logical.ReadOperation:   i.pathEntityNameRead(),
+				logical.DeleteOperation: i.pathEntityNameDelete(),
 			},
 
 			HelpSynopsis:    strings.TrimSpace(entityHelp["entity-name"][0]),
@@ -111,33 +80,11 @@ func entityPaths(i *IdentityStore) []*framework.Path {
 		},
 		{
 			Pattern: "entity/id/" + framework.GenericNameRegex("id"),
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "entity",
-				OperationSuffix: "by-id",
-			},
-
-			Fields: entityPathFields(),
-
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.UpdateOperation: &framework.PathOperation{
-					Callback: i.handleEntityUpdateCommon(),
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb: "update",
-					},
-				},
-				logical.ReadOperation: &framework.PathOperation{
-					Callback: i.pathEntityIDRead(),
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb: "read",
-					},
-				},
-				logical.DeleteOperation: &framework.PathOperation{
-					Callback: i.pathEntityIDDelete(),
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb: "delete",
-					},
-				},
+			Fields:  entityPathFields(),
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.UpdateOperation: i.handleEntityUpdateCommon(),
+				logical.ReadOperation:   i.pathEntityIDRead(),
+				logical.DeleteOperation: i.pathEntityIDDelete(),
 			},
 
 			HelpSynopsis:    strings.TrimSpace(entityHelp["entity-id"][0]),
@@ -145,19 +92,12 @@ func entityPaths(i *IdentityStore) []*framework.Path {
 		},
 		{
 			Pattern: "entity/batch-delete",
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "entity",
-				OperationVerb:   "batch-delete",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"entity_ids": {
 					Type:        framework.TypeCommaStringSlice,
 					Description: "Entity IDs to delete",
 				},
 			},
-
 			Callbacks: map[logical.Operation]framework.OperationFunc{
 				logical.UpdateOperation: i.handleEntityBatchDelete(),
 			},
@@ -167,12 +107,6 @@ func entityPaths(i *IdentityStore) []*framework.Path {
 		},
 		{
 			Pattern: "entity/name/?$",
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "entity",
-				OperationSuffix: "by-name",
-			},
-
 			Callbacks: map[logical.Operation]framework.OperationFunc{
 				logical.ListOperation: i.pathEntityNameList(),
 			},
@@ -182,12 +116,6 @@ func entityPaths(i *IdentityStore) []*framework.Path {
 		},
 		{
 			Pattern: "entity/id/?$",
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "entity",
-				OperationSuffix: "by-id",
-			},
-
 			Callbacks: map[logical.Operation]framework.OperationFunc{
 				logical.ListOperation: i.pathEntityIDList(),
 			},
@@ -197,12 +125,6 @@ func entityPaths(i *IdentityStore) []*framework.Path {
 		},
 		{
 			Pattern: "entity/merge/?$",
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "entity",
-				OperationVerb:   "merge",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"from_entity_ids": {
 					Type:        framework.TypeCommaStringSlice,
@@ -268,21 +190,9 @@ func (i *IdentityStore) pathEntityMergeID() framework.OperationFunc {
 			return nil, err
 		}
 
-		userErr, intErr, aliases := i.mergeEntity(ctx, txn, toEntity, fromEntityIDs, conflictingAliasIDsToKeep, force, false, false, true, false)
+		userErr, intErr := i.mergeEntity(ctx, txn, toEntity, fromEntityIDs, conflictingAliasIDsToKeep, force, false, false, true, false)
 		if userErr != nil {
-			// Not an error due to alias clash, return like normal
-			if len(aliases) == 0 {
-				return logical.ErrorResponse(userErr.Error()), nil
-			}
-			// Alias clash error, so include additional details
-			resp := &logical.Response{
-				Data: map[string]interface{}{
-					"error": userErr.Error(),
-					"data":  aliases,
-				},
-			}
-
-			return resp, nil
+			return logical.ErrorResponse(userErr.Error()), nil
 		}
 		if intErr != nil {
 			return nil, intErr
@@ -824,40 +734,29 @@ func (i *IdentityStore) handlePathEntityListCommon(ctx context.Context, req *log
 }
 
 func (i *IdentityStore) mergeEntityAsPartOfUpsert(ctx context.Context, txn *memdb.Txn, toEntity *identity.Entity, fromEntityID string, persist bool) (error, error) {
-	err1, err2, _ := i.mergeEntity(ctx, txn, toEntity, []string{fromEntityID}, []string{}, true, false, true, persist, true)
-	return err1, err2
-}
-
-// A small type to return useful information to the UI after an entity clash
-// Every alias involved in a clash will be returned.
-type aliasClashInformation struct {
-	Alias     string `json:"alias"`
-	Entity    string `json:"entity"`
-	EntityId  string `json:"entity_id"`
-	Mount     string `json:"mount"`
-	MountPath string `json:"mount_path"`
+	return i.mergeEntity(ctx, txn, toEntity, []string{fromEntityID}, []string{}, true, false, true, persist, true)
 }
 
-func (i *IdentityStore) mergeEntity(ctx context.Context, txn *memdb.Txn, toEntity *identity.Entity, fromEntityIDs, conflictingAliasIDsToKeep []string, force, grabLock, mergePolicies, persist, forceMergeAliases bool) (error, error, []aliasClashInformation) {
+func (i *IdentityStore) mergeEntity(ctx context.Context, txn *memdb.Txn, toEntity *identity.Entity, fromEntityIDs, conflictingAliasIDsToKeep []string, force, grabLock, mergePolicies, persist, forceMergeAliases bool) (error, error) {
 	if grabLock {
 		i.lock.Lock()
 		defer i.lock.Unlock()
 	}
 
 	if toEntity == nil {
-		return errors.New("entity id to merge to is invalid"), nil, nil
+		return errors.New("entity id to merge to is invalid"), nil
 	}
 
 	ns, err := namespace.FromContext(ctx)
 	if err != nil {
-		return nil, err, nil
+		return nil, err
 	}
 	if toEntity.NamespaceID != ns.ID {
-		return errors.New("entity id to merge into does not belong to the request's namespace"), nil, nil
+		return errors.New("entity id to merge into does not belong to the request's namespace"), nil
 	}
 
 	if len(fromEntityIDs) > 1 && len(conflictingAliasIDsToKeep) > 1 {
-		return errors.New("aliases conflicts cannot be resolved with multiple from entity ids - merge one entity at a time"), nil, nil
+		return errors.New("aliases conflicts cannot be resolved with multiple from entity ids - merge one entity at a time"), nil
 	}
 
 	sanitizedFromEntityIDs := strutil.RemoveDuplicates(fromEntityIDs, false)
@@ -865,29 +764,25 @@ func (i *IdentityStore) mergeEntity(ctx context.Context, txn *memdb.Txn, toEntit
 	// A map to check if there are any clashes between mount accessors for any of the sanitizedFromEntityIDs
 	fromEntityAccessors := make(map[string]string)
 
-	// A list detailing all aliases where a clash has occurred, so that the error
-	// can be understood by the UI
-	aliasesInvolvedInClashes := make([]aliasClashInformation, 0)
-
 	// An error detailing if any alias clashes happen (shared mount accessor)
 	var aliasClashError error
 
 	for _, fromEntityID := range sanitizedFromEntityIDs {
 		if fromEntityID == toEntity.ID {
-			return errors.New("to_entity_id should not be present in from_entity_ids"), nil, nil
+			return errors.New("to_entity_id should not be present in from_entity_ids"), nil
 		}
 
 		fromEntity, err := i.MemDBEntityByID(fromEntityID, false)
 		if err != nil {
-			return nil, err, nil
+			return nil, err
 		}
 
 		if fromEntity == nil {
-			return errors.New("entity id to merge from is invalid"), nil, nil
+			return errors.New("entity id to merge from is invalid"), nil
 		}
 
 		if fromEntity.NamespaceID != toEntity.NamespaceID {
-			return errors.New("entity id to merge from does not belong to this namespace"), nil, nil
+			return errors.New("entity id to merge from does not belong to this namespace"), nil
 		}
 
 		// If we're not resolving a conflict, we check to see if
@@ -898,7 +793,7 @@ func (i *IdentityStore) mergeEntity(ctx context.Context, txn *memdb.Txn, toEntit
 					// First, check to see if this alias clashes with an alias from any of the other fromEntities:
 					id, mountAccessorInAnotherFromEntity := fromEntityAccessors[fromAlias.MountAccessor]
 					if mountAccessorInAnotherFromEntity && (id != fromEntityID) {
-						return fmt.Errorf("mount accessor %s found in multiple fromEntities, merge should be done with one fromEntity at a time", fromAlias.MountAccessor), nil, nil
+						return fmt.Errorf("mount accessor %s found in multiple fromEntities, merge should be done with one fromEntity at a time", fromAlias.MountAccessor), nil
 					}
 
 					fromEntityAccessors[fromAlias.MountAccessor] = fromEntityID
@@ -911,38 +806,6 @@ func (i *IdentityStore) mergeEntity(ctx context.Context, txn *memdb.Txn, toEntit
 						aliasClashError = multierror.Append(aliasClashError,
 							fmt.Errorf("mountAccessor: %s, toEntity ID: %s, fromEntity ID: %s, conflicting toEntity alias ID: %s, conflicting fromEntity alias ID: %s",
 								toAlias.MountAccessor, toEntity.ID, fromEntityID, toAlias.ID, fromAlias.ID))
-
-						var toAliasMountType string
-						var toAliasMountPath string
-						mountValidationRespToAlias := i.router.ValidateMountByAccessor(toAlias.MountAccessor)
-						if mountValidationRespToAlias != nil {
-							toAliasMountType = mountValidationRespToAlias.MountType
-							toAliasMountPath = mountValidationRespToAlias.MountPath
-						}
-
-						var fromAliasMountType string
-						var fromAliasMountPath string
-						mountValidationRespFromAlias := i.router.ValidateMountByAccessor(fromAlias.MountAccessor)
-						if mountValidationRespFromAlias != nil {
-							fromAliasMountType = mountValidationRespFromAlias.MountType
-							fromAliasMountPath = mountValidationRespFromAlias.MountPath
-						}
-
-						// Also add both to our summary of all clashes:
-						aliasesInvolvedInClashes = append(aliasesInvolvedInClashes, aliasClashInformation{
-							Entity:    toEntity.Name,
-							EntityId:  toEntity.ID,
-							Alias:     toAlias.Name,
-							Mount:     toAliasMountType,
-							MountPath: toAliasMountPath,
-						})
-						aliasesInvolvedInClashes = append(aliasesInvolvedInClashes, aliasClashInformation{
-							Entity:    fromEntity.Name,
-							EntityId:  fromEntityID,
-							Alias:     fromAlias.Name,
-							Mount:     fromAliasMountType,
-							MountPath: fromAliasMountPath,
-						})
 					}
 				}
 			}
@@ -951,7 +814,7 @@ func (i *IdentityStore) mergeEntity(ctx context.Context, txn *memdb.Txn, toEntit
 		for configID, configSecret := range fromEntity.MFASecrets {
 			_, ok := toEntity.MFASecrets[configID]
 			if ok && !force {
-				return nil, fmt.Errorf("conflicting MFA config ID %q in entity ID %q", configID, fromEntity.ID), nil
+				return nil, fmt.Errorf("conflicting MFA config ID %q in entity ID %q", configID, fromEntity.ID)
 			} else {
 				if toEntity.MFASecrets == nil {
 					toEntity.MFASecrets = make(map[string]*mfa.Secret)
@@ -963,7 +826,7 @@ func (i *IdentityStore) mergeEntity(ctx context.Context, txn *memdb.Txn, toEntit
 
 	// Check alias clashes after validating every fromEntity, so that we have a full list of errors
 	if aliasClashError != nil {
-		return aliasClashError, nil, aliasesInvolvedInClashes
+		return aliasClashError, nil
 	}
 
 	isPerfSecondaryOrStandby := i.localNode.ReplicationState().HasState(consts.ReplicationPerformanceSecondary) ||
@@ -986,20 +849,20 @@ func (i *IdentityStore) mergeEntity(ctx context.Context, txn *memdb.Txn, toEntit
 
 	for _, fromEntityID := range sanitizedFromEntityIDs {
 		if fromEntityID == toEntity.ID {
-			return errors.New("to_entity_id should not be present in from_entity_ids"), nil, nil
+			return errors.New("to_entity_id should not be present in from_entity_ids"), nil
 		}
 
 		fromEntity, err := i.MemDBEntityByID(fromEntityID, true)
 		if err != nil {
-			return nil, err, nil
+			return nil, err
 		}
 
 		if fromEntity == nil {
-			return errors.New("entity id to merge from is invalid"), nil, nil
+			return errors.New("entity id to merge from is invalid"), nil
 		}
 
 		if fromEntity.NamespaceID != toEntity.NamespaceID {
-			return errors.New("entity id to merge from does not belong to this namespace"), nil, nil
+			return errors.New("entity id to merge from does not belong to this namespace"), nil
 		}
 
 		for _, fromAlias := range fromEntity.Aliases {
@@ -1014,13 +877,13 @@ func (i *IdentityStore) mergeEntity(ctx context.Context, txn *memdb.Txn, toEntit
 						i.logger.Info("Deleting to_entity alias during entity merge", "to_entity", toEntity.ID, "deleted_alias", toAliasId)
 						err := i.MemDBDeleteAliasByIDInTxn(txn, toAliasId, false)
 						if err != nil {
-							return nil, fmt.Errorf("failed to delete orphaned alias during merge: %w", err), nil
+							return nil, fmt.Errorf("failed to delete orphaned alias during merge: %w", err)
 						}
 					} else if strutil.StrListContains(conflictingAliasIDsToKeep, toAliasId) {
 						i.logger.Info("Deleting from_entity alias during entity merge", "from_entity", fromEntityID, "deleted_alias", fromAlias.ID)
 						err := i.MemDBDeleteAliasByIDInTxn(txn, fromAlias.ID, false)
 						if err != nil {
-							return nil, fmt.Errorf("failed to delete orphaned alias during merge: %w", err), nil
+							return nil, fmt.Errorf("failed to delete orphaned alias during merge: %w", err)
 						}
 
 						// Continue to next alias, as there's no alias to merge left in the from_entity
@@ -1029,10 +892,10 @@ func (i *IdentityStore) mergeEntity(ctx context.Context, txn *memdb.Txn, toEntit
 						i.logger.Info("Deleting to_entity alias during entity merge", "to_entity", toEntity.ID, "deleted_alias", toAliasId)
 						err := i.MemDBDeleteAliasByIDInTxn(txn, toAliasId, false)
 						if err != nil {
-							return nil, fmt.Errorf("failed to delete orphaned alias during merge: %w", err), nil
+							return nil, fmt.Errorf("failed to delete orphaned alias during merge: %w", err)
 						}
 					} else {
-						return fmt.Errorf("conflicting mount accessors in following alias IDs and neither were present in conflicting_alias_ids_to_keep: %s, %s", fromAlias.ID, toAliasId), nil, nil
+						return fmt.Errorf("conflicting mount accessors in following alias IDs and neither were present in conflicting_alias_ids_to_keep: %s, %s", fromAlias.ID, toAliasId), nil
 					}
 				}
 			}
@@ -1044,7 +907,7 @@ func (i *IdentityStore) mergeEntity(ctx context.Context, txn *memdb.Txn, toEntit
 
 			err = i.MemDBUpsertAliasInTxn(txn, fromAlias, false)
 			if err != nil {
-				return nil, fmt.Errorf("failed to update alias during merge: %w", err), nil
+				return nil, fmt.Errorf("failed to update alias during merge: %w", err)
 			}
 
 			// Add the alias to the desired entity
@@ -1069,13 +932,13 @@ func (i *IdentityStore) mergeEntity(ctx context.Context, txn *memdb.Txn, toEntit
 		// internal and external
 		groups, err := i.MemDBGroupsByMemberEntityIDInTxn(txn, fromEntity.ID, true, false)
 		if err != nil {
-			return nil, err, nil
+			return nil, err
 		}
 		for _, group := range groups {
 			group.MemberEntityIDs = strutil.StrListDelete(group.MemberEntityIDs, fromEntity.ID)
 			err = i.UpsertGroupInTxn(ctx, txn, group, persist && !isPerfSecondaryOrStandby)
 			if err != nil {
-				return nil, err, nil
+				return nil, err
 			}
 
 			fromEntityGroups = append(fromEntityGroups, group)
@@ -1084,14 +947,14 @@ func (i *IdentityStore) mergeEntity(ctx context.Context, txn *memdb.Txn, toEntit
 		// Delete the entity which we are merging from in MemDB using the same transaction
 		err = i.MemDBDeleteEntityByIDInTxn(txn, fromEntity.ID)
 		if err != nil {
-			return nil, err, nil
+			return nil, err
 		}
 
 		if persist && !isPerfSecondaryOrStandby {
 			// Delete the entity which we are merging from in storage
 			err = i.entityPacker.DeleteItem(ctx, fromEntity.ID)
 			if err != nil {
-				return nil, err, nil
+				return nil, err
 			}
 		}
 	}
@@ -1099,14 +962,14 @@ func (i *IdentityStore) mergeEntity(ctx context.Context, txn *memdb.Txn, toEntit
 	// Update MemDB with changes to the entity we are merging to
 	err = i.MemDBUpsertEntityInTxn(txn, toEntity)
 	if err != nil {
-		return nil, err, nil
+		return nil, err
 	}
 
 	for _, group := range fromEntityGroups {
 		group.MemberEntityIDs = append(group.MemberEntityIDs, toEntity.ID)
 		err = i.UpsertGroupInTxn(ctx, txn, group, persist && !isPerfSecondaryOrStandby)
 		if err != nil {
-			return nil, err, nil
+			return nil, err
 		}
 	}
 
@@ -1114,7 +977,7 @@ func (i *IdentityStore) mergeEntity(ctx context.Context, txn *memdb.Txn, toEntit
 		// Persist the entity which we are merging to
 		toEntityAsAny, err := ptypes.MarshalAny(toEntity)
 		if err != nil {
-			return nil, err, nil
+			return nil, err
 		}
 		item := &storagepacker.Item{
 			ID:      toEntity.ID,
@@ -1123,11 +986,11 @@ func (i *IdentityStore) mergeEntity(ctx context.Context, txn *memdb.Txn, toEntit
 
 		err = i.entityPacker.PutItem(ctx, item)
 		if err != nil {
-			return nil, err, nil
+			return nil, err
 		}
 	}
 
-	return nil, nil, nil
+	return nil, nil
 }
 
 var entityHelp = map[string][2]string{
diff --git a/vault/identity_store_entities_test.go b/vault/identity_store_entities_test.go
index 179680ccd6bff..aefaadcad3b6c 100644
--- a/vault/identity_store_entities_test.go
+++ b/vault/identity_store_entities_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/identity_store_group_aliases.go b/vault/identity_store_group_aliases.go
index 4a003a84d8d56..90effd2b181b2 100644
--- a/vault/identity_store_group_aliases.go
+++ b/vault/identity_store_group_aliases.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -19,13 +16,6 @@ func groupAliasPaths(i *IdentityStore) []*framework.Path {
 	return []*framework.Path{
 		{
 			Pattern: "group-alias$",
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "group",
-				OperationVerb:   "create",
-				OperationSuffix: "alias",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"id": {
 					Type:        framework.TypeString,
@@ -44,7 +34,6 @@ func groupAliasPaths(i *IdentityStore) []*framework.Path {
 					Description: "ID of the group to which this is an alias.",
 				},
 			},
-
 			Callbacks: map[logical.Operation]framework.OperationFunc{
 				logical.UpdateOperation: i.pathGroupAliasRegister(),
 			},
@@ -54,12 +43,6 @@ func groupAliasPaths(i *IdentityStore) []*framework.Path {
 		},
 		{
 			Pattern: "group-alias/id/" + framework.GenericNameRegex("id"),
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "group",
-				OperationSuffix: "alias-by-id",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"id": {
 					Type:        framework.TypeString,
@@ -78,26 +61,10 @@ func groupAliasPaths(i *IdentityStore) []*framework.Path {
 					Description: "ID of the group to which this is an alias.",
 				},
 			},
-
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.UpdateOperation: &framework.PathOperation{
-					Callback: i.pathGroupAliasIDUpdate(),
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb: "update",
-					},
-				},
-				logical.ReadOperation: &framework.PathOperation{
-					Callback: i.pathGroupAliasIDRead(),
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb: "read",
-					},
-				},
-				logical.DeleteOperation: &framework.PathOperation{
-					Callback: i.pathGroupAliasIDDelete(),
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb: "delete",
-					},
-				},
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.UpdateOperation: i.pathGroupAliasIDUpdate(),
+				logical.ReadOperation:   i.pathGroupAliasIDRead(),
+				logical.DeleteOperation: i.pathGroupAliasIDDelete(),
 			},
 
 			HelpSynopsis:    strings.TrimSpace(groupAliasHelp["group-alias-by-id"][0]),
@@ -105,12 +72,6 @@ func groupAliasPaths(i *IdentityStore) []*framework.Path {
 		},
 		{
 			Pattern: "group-alias/id/?$",
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "group",
-				OperationSuffix: "aliases-by-id",
-			},
-
 			Callbacks: map[logical.Operation]framework.OperationFunc{
 				logical.ListOperation: i.pathGroupAliasIDList(),
 			},
diff --git a/vault/identity_store_group_aliases_test.go b/vault/identity_store_group_aliases_test.go
index 7abd4b90dd156..cb6d01df37b08 100644
--- a/vault/identity_store_group_aliases_test.go
+++ b/vault/identity_store_group_aliases_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/identity_store_groups.go b/vault/identity_store_groups.go
index 5355a5d13197d..a5abe0016d21b 100644
--- a/vault/identity_store_groups.go
+++ b/vault/identity_store_groups.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -62,13 +59,7 @@ func groupPaths(i *IdentityStore) []*framework.Path {
 	return []*framework.Path{
 		{
 			Pattern: "group$",
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "group",
-				OperationVerb:   "create",
-			},
-
-			Fields: groupPathFields(),
+			Fields:  groupPathFields(),
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.UpdateOperation: &framework.PathOperation{
 					Callback:                  i.pathGroupRegister(),
@@ -81,33 +72,11 @@ func groupPaths(i *IdentityStore) []*framework.Path {
 		},
 		{
 			Pattern: "group/id/" + framework.GenericNameRegex("id"),
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "group",
-				OperationSuffix: "by-id",
-			},
-
-			Fields: groupPathFields(),
-
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.UpdateOperation: &framework.PathOperation{
-					Callback: i.pathGroupIDUpdate(),
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb: "update",
-					},
-				},
-				logical.ReadOperation: &framework.PathOperation{
-					Callback: i.pathGroupIDRead(),
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb: "read",
-					},
-				},
-				logical.DeleteOperation: &framework.PathOperation{
-					Callback: i.pathGroupIDDelete(),
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb: "delete",
-					},
-				},
+			Fields:  groupPathFields(),
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.UpdateOperation: i.pathGroupIDUpdate(),
+				logical.ReadOperation:   i.pathGroupIDRead(),
+				logical.DeleteOperation: i.pathGroupIDDelete(),
 			},
 
 			HelpSynopsis:    strings.TrimSpace(groupHelp["group-by-id"][0]),
@@ -115,12 +84,6 @@ func groupPaths(i *IdentityStore) []*framework.Path {
 		},
 		{
 			Pattern: "group/id/?$",
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "group",
-				OperationSuffix: "by-id",
-			},
-
 			Callbacks: map[logical.Operation]framework.OperationFunc{
 				logical.ListOperation: i.pathGroupIDList(),
 			},
@@ -130,33 +93,11 @@ func groupPaths(i *IdentityStore) []*framework.Path {
 		},
 		{
 			Pattern: "group/name/(?P<name>.+)",
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "group",
-				OperationSuffix: "by-name",
-			},
-
-			Fields: groupPathFields(),
-
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.UpdateOperation: &framework.PathOperation{
-					Callback: i.pathGroupNameUpdate(),
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb: "update",
-					},
-				},
-				logical.ReadOperation: &framework.PathOperation{
-					Callback: i.pathGroupNameRead(),
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb: "read",
-					},
-				},
-				logical.DeleteOperation: &framework.PathOperation{
-					Callback: i.pathGroupNameDelete(),
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb: "delete",
-					},
-				},
+			Fields:  groupPathFields(),
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.UpdateOperation: i.pathGroupNameUpdate(),
+				logical.ReadOperation:   i.pathGroupNameRead(),
+				logical.DeleteOperation: i.pathGroupNameDelete(),
 			},
 
 			HelpSynopsis:    strings.TrimSpace(groupHelp["group-by-name"][0]),
@@ -164,12 +105,6 @@ func groupPaths(i *IdentityStore) []*framework.Path {
 		},
 		{
 			Pattern: "group/name/?$",
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "group",
-				OperationSuffix: "by-name",
-			},
-
 			Callbacks: map[logical.Operation]framework.OperationFunc{
 				logical.ListOperation: i.pathGroupNameList(),
 			},
diff --git a/vault/identity_store_groups_test.go b/vault/identity_store_groups_test.go
index 96c6011b40fac..3407e3a5eb14c 100644
--- a/vault/identity_store_groups_test.go
+++ b/vault/identity_store_groups_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/identity_store_oidc.go b/vault/identity_store_oidc.go
index 5531d717a18eb..377af0fd5e322 100644
--- a/vault/identity_store_oidc.go
+++ b/vault/identity_store_oidc.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -20,8 +17,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/go-jose/go-jose/v3"
-	"github.com/go-jose/go-jose/v3/jwt"
 	"github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/go-secure-stdlib/base62"
 	"github.com/hashicorp/go-secure-stdlib/strutil"
@@ -34,6 +29,8 @@ import (
 	"github.com/hashicorp/vault/sdk/logical"
 	"github.com/patrickmn/go-cache"
 	"golang.org/x/crypto/ed25519"
+	"gopkg.in/square/go-jose.v2"
+	"gopkg.in/square/go-jose.v2/jwt"
 )
 
 type oidcConfig struct {
@@ -138,44 +135,21 @@ func oidcPaths(i *IdentityStore) []*framework.Path {
 	return []*framework.Path{
 		{
 			Pattern: "oidc/config/?$",
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "oidc",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"issuer": {
 					Type:        framework.TypeString,
 					Description: "Issuer URL to be used in the iss claim of the token. If not set, Vault's app_addr will be used.",
 				},
 			},
-
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.ReadOperation: &framework.PathOperation{
-					Callback: i.pathOIDCReadConfig,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationSuffix: "configuration",
-					},
-				},
-				logical.UpdateOperation: &framework.PathOperation{
-					Callback: i.pathOIDCUpdateConfig,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb: "configure",
-					},
-				},
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.ReadOperation:   i.pathOIDCReadConfig,
+				logical.UpdateOperation: i.pathOIDCUpdateConfig,
 			},
-
 			HelpSynopsis:    "OIDC configuration",
 			HelpDescription: "Update OIDC configuration in the identity backend",
 		},
 		{
 			Pattern: "oidc/key/" + framework.GenericNameRegex("name"),
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "oidc",
-				OperationSuffix: "key",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"name": {
 					Type:        framework.TypeString,
@@ -217,11 +191,6 @@ func oidcPaths(i *IdentityStore) []*framework.Path {
 		},
 		{
 			Pattern: "oidc/key/" + framework.GenericNameRegex("name") + "/rotate/?$",
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "oidc",
-				OperationVerb:   "rotate",
-				OperationSuffix: "key",
-			},
 			Fields: map[string]*framework.FieldSchema{
 				"name": {
 					Type:        framework.TypeString,
@@ -240,10 +209,6 @@ func oidcPaths(i *IdentityStore) []*framework.Path {
 		},
 		{
 			Pattern: "oidc/key/?$",
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "oidc",
-				OperationSuffix: "keys",
-			},
 			Callbacks: map[logical.Operation]framework.OperationFunc{
 				logical.ListOperation: i.pathOIDCListKey,
 			},
@@ -252,10 +217,6 @@ func oidcPaths(i *IdentityStore) []*framework.Path {
 		},
 		{
 			Pattern: "oidc/\\.well-known/openid-configuration/?$",
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "oidc",
-				OperationSuffix: "open-id-configuration",
-			},
 			Callbacks: map[logical.Operation]framework.OperationFunc{
 				logical.ReadOperation: i.pathOIDCDiscovery,
 			},
@@ -264,10 +225,6 @@ func oidcPaths(i *IdentityStore) []*framework.Path {
 		},
 		{
 			Pattern: "oidc/\\.well-known/keys/?$",
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "oidc",
-				OperationSuffix: "public-keys",
-			},
 			Callbacks: map[logical.Operation]framework.OperationFunc{
 				logical.ReadOperation: i.pathOIDCReadPublicKeys,
 			},
@@ -276,11 +233,6 @@ func oidcPaths(i *IdentityStore) []*framework.Path {
 		},
 		{
 			Pattern: "oidc/token/" + framework.GenericNameRegex("name"),
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "oidc",
-				OperationVerb:   "generate",
-				OperationSuffix: "token",
-			},
 			Fields: map[string]*framework.FieldSchema{
 				"name": {
 					Type:        framework.TypeString,
@@ -295,10 +247,6 @@ func oidcPaths(i *IdentityStore) []*framework.Path {
 		},
 		{
 			Pattern: "oidc/role/" + framework.GenericNameRegex("name"),
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "oidc",
-				OperationSuffix: "role",
-			},
 			Fields: map[string]*framework.FieldSchema{
 				"name": {
 					Type:        framework.TypeString,
@@ -335,10 +283,6 @@ func oidcPaths(i *IdentityStore) []*framework.Path {
 		},
 		{
 			Pattern: "oidc/role/?$",
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "oidc",
-				OperationSuffix: "roles",
-			},
 			Callbacks: map[logical.Operation]framework.OperationFunc{
 				logical.ListOperation: i.pathOIDCListRole,
 			},
@@ -347,10 +291,6 @@ func oidcPaths(i *IdentityStore) []*framework.Path {
 		},
 		{
 			Pattern: "oidc/introspect/?$",
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "oidc",
-				OperationVerb:   "introspect",
-			},
 			Fields: map[string]*framework.FieldSchema{
 				"token": {
 					Type:        framework.TypeString,
diff --git a/vault/identity_store_oidc_provider.go b/vault/identity_store_oidc_provider.go
index 612b166052669..39107f6a510aa 100644
--- a/vault/identity_store_oidc_provider.go
+++ b/vault/identity_store_oidc_provider.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -16,7 +13,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/go-jose/go-jose/v3"
 	"github.com/hashicorp/go-memdb"
 	"github.com/hashicorp/go-secure-stdlib/base62"
 	"github.com/hashicorp/go-secure-stdlib/strutil"
@@ -25,6 +21,7 @@ import (
 	"github.com/hashicorp/vault/sdk/framework"
 	"github.com/hashicorp/vault/sdk/helper/identitytpl"
 	"github.com/hashicorp/vault/sdk/logical"
+	"gopkg.in/square/go-jose.v2"
 )
 
 const (
@@ -184,10 +181,6 @@ func oidcProviderPaths(i *IdentityStore) []*framework.Path {
 	return []*framework.Path{
 		{
 			Pattern: "oidc/assignment/" + framework.GenericNameRegex("name"),
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "oidc",
-				OperationSuffix: "assignment",
-			},
 			Fields: map[string]*framework.FieldSchema{
 				"name": {
 					Type:        framework.TypeString,
@@ -222,10 +215,6 @@ func oidcProviderPaths(i *IdentityStore) []*framework.Path {
 		},
 		{
 			Pattern: "oidc/assignment/?$",
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "oidc",
-				OperationSuffix: "assignments",
-			},
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ListOperation: &framework.PathOperation{
 					Callback: i.pathOIDCListAssignment,
@@ -236,10 +225,6 @@ func oidcProviderPaths(i *IdentityStore) []*framework.Path {
 		},
 		{
 			Pattern: "oidc/scope/" + framework.GenericNameRegex("name"),
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "oidc",
-				OperationSuffix: "scope",
-			},
 			Fields: map[string]*framework.FieldSchema{
 				"name": {
 					Type:        framework.TypeString,
@@ -274,10 +259,6 @@ func oidcProviderPaths(i *IdentityStore) []*framework.Path {
 		},
 		{
 			Pattern: "oidc/scope/?$",
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "oidc",
-				OperationSuffix: "scopes",
-			},
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ListOperation: &framework.PathOperation{
 					Callback: i.pathOIDCListScope,
@@ -288,10 +269,6 @@ func oidcProviderPaths(i *IdentityStore) []*framework.Path {
 		},
 		{
 			Pattern: "oidc/client/" + framework.GenericNameRegex("name"),
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "oidc",
-				OperationSuffix: "client",
-			},
 			Fields: map[string]*framework.FieldSchema{
 				"name": {
 					Type:        framework.TypeString,
@@ -346,10 +323,6 @@ func oidcProviderPaths(i *IdentityStore) []*framework.Path {
 		},
 		{
 			Pattern: "oidc/client/?$",
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "oidc",
-				OperationSuffix: "clients",
-			},
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ListOperation: &framework.PathOperation{
 					Callback: i.pathOIDCListClient,
@@ -360,10 +333,6 @@ func oidcProviderPaths(i *IdentityStore) []*framework.Path {
 		},
 		{
 			Pattern: "oidc/provider/" + framework.GenericNameRegex("name"),
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "oidc",
-				OperationSuffix: "provider",
-			},
 			Fields: map[string]*framework.FieldSchema{
 				"name": {
 					Type:        framework.TypeString,
@@ -402,10 +371,6 @@ func oidcProviderPaths(i *IdentityStore) []*framework.Path {
 		},
 		{
 			Pattern: "oidc/provider/?$",
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "oidc",
-				OperationSuffix: "providers",
-			},
 			Fields: map[string]*framework.FieldSchema{
 				"allowed_client_id": {
 					Type: framework.TypeString,
@@ -425,10 +390,6 @@ func oidcProviderPaths(i *IdentityStore) []*framework.Path {
 		},
 		{
 			Pattern: "oidc/provider/" + framework.GenericNameRegex("name") + "/\\.well-known/openid-configuration",
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "oidc",
-				OperationSuffix: "provider-open-id-configuration",
-			},
 			Fields: map[string]*framework.FieldSchema{
 				"name": {
 					Type:        framework.TypeString,
@@ -445,10 +406,6 @@ func oidcProviderPaths(i *IdentityStore) []*framework.Path {
 		},
 		{
 			Pattern: "oidc/provider/" + framework.GenericNameRegex("name") + "/\\.well-known/keys",
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "oidc",
-				OperationSuffix: "provider-public-keys",
-			},
 			Fields: map[string]*framework.FieldSchema{
 				"name": {
 					Type:        framework.TypeString,
@@ -465,9 +422,6 @@ func oidcProviderPaths(i *IdentityStore) []*framework.Path {
 		},
 		{
 			Pattern: "oidc/provider/" + framework.GenericNameRegex("name") + "/authorize",
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "oidc-provider",
-			},
 			Fields: map[string]*framework.FieldSchema{
 				"name": {
 					Type:        framework.TypeString,
@@ -517,19 +471,12 @@ func oidcProviderPaths(i *IdentityStore) []*framework.Path {
 			},
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
-					Callback: i.pathOIDCAuthorize,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb: "authorize",
-					},
+					Callback:                    i.pathOIDCAuthorize,
 					ForwardPerformanceStandby:   true,
 					ForwardPerformanceSecondary: false,
 				},
 				logical.UpdateOperation: &framework.PathOperation{
-					Callback: i.pathOIDCAuthorize,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "authorize",
-						OperationSuffix: "with-parameters",
-					},
+					Callback:                    i.pathOIDCAuthorize,
 					ForwardPerformanceStandby:   true,
 					ForwardPerformanceSecondary: false,
 				},
@@ -539,10 +486,6 @@ func oidcProviderPaths(i *IdentityStore) []*framework.Path {
 		},
 		{
 			Pattern: "oidc/provider/" + framework.GenericNameRegex("name") + "/token",
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "oidc-provider",
-				OperationVerb:   "token",
-			},
 			Fields: map[string]*framework.FieldSchema{
 				"name": {
 					Type:        framework.TypeString,
@@ -597,9 +540,6 @@ func oidcProviderPaths(i *IdentityStore) []*framework.Path {
 		},
 		{
 			Pattern: "oidc/provider/" + framework.GenericNameRegex("name") + "/userinfo",
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "oidc-provider",
-			},
 			Fields: map[string]*framework.FieldSchema{
 				"name": {
 					Type:        framework.TypeString,
@@ -609,15 +549,9 @@ func oidcProviderPaths(i *IdentityStore) []*framework.Path {
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
 					Callback: i.pathOIDCUserInfo,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb: "user-info",
-					},
 				},
 				logical.UpdateOperation: &framework.PathOperation{
 					Callback: i.pathOIDCUserInfo,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb: "user-info2",
-					},
 				},
 			},
 			HelpSynopsis:    "Provides the OIDC UserInfo Endpoint.",
diff --git a/vault/identity_store_oidc_provider_test.go b/vault/identity_store_oidc_provider_test.go
index b8163083d72f2..a0f3e06e133a5 100644
--- a/vault/identity_store_oidc_provider_test.go
+++ b/vault/identity_store_oidc_provider_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/identity_store_oidc_provider_util.go b/vault/identity_store_oidc_provider_util.go
index 813b25f5eae75..8f5f99b165696 100644
--- a/vault/identity_store_oidc_provider_util.go
+++ b/vault/identity_store_oidc_provider_util.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -12,9 +9,9 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/go-jose/go-jose/v3"
 	"github.com/hashicorp/go-secure-stdlib/strutil"
 	"github.com/hashicorp/vault/sdk/logical"
+	"gopkg.in/square/go-jose.v2"
 )
 
 // validRedirect checks whether uri is in allowed using special handling for loopback uris.
diff --git a/vault/identity_store_oidc_test.go b/vault/identity_store_oidc_test.go
index 5dd33ab8a2444..f7be0e99123a7 100644
--- a/vault/identity_store_oidc_test.go
+++ b/vault/identity_store_oidc_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -11,8 +8,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/go-jose/go-jose/v3"
-	"github.com/go-jose/go-jose/v3/jwt"
 	"github.com/go-test/deep"
 	"github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/vault/helper/identity"
@@ -20,6 +15,8 @@ import (
 	"github.com/hashicorp/vault/sdk/framework"
 	"github.com/hashicorp/vault/sdk/logical"
 	gocache "github.com/patrickmn/go-cache"
+	"gopkg.in/square/go-jose.v2"
+	"gopkg.in/square/go-jose.v2/jwt"
 )
 
 // TestOIDC_Path_OIDC_RoleNoKeyParameter tests that a role cannot be created
diff --git a/vault/identity_store_oidc_util.go b/vault/identity_store_oidc_util.go
index 54ab4f1db64f8..8a959e4157f8b 100644
--- a/vault/identity_store_oidc_util.go
+++ b/vault/identity_store_oidc_util.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !enterprise
 
 package vault
diff --git a/vault/identity_store_oss.go b/vault/identity_store_oss.go
index 100e39d412170..bae17ff49385f 100644
--- a/vault/identity_store_oss.go
+++ b/vault/identity_store_oss.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !enterprise
 
 package vault
diff --git a/vault/identity_store_schema.go b/vault/identity_store_schema.go
index 937e0d20ed1a8..186f99c5aebbf 100644
--- a/vault/identity_store_schema.go
+++ b/vault/identity_store_schema.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/identity_store_structs.go b/vault/identity_store_structs.go
index e7c9fb9ac9d19..bade5f40db274 100644
--- a/vault/identity_store_structs.go
+++ b/vault/identity_store_structs.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/identity_store_test.go b/vault/identity_store_test.go
index f9dc7cac1dc5b..8cc6e4eaeedd3 100644
--- a/vault/identity_store_test.go
+++ b/vault/identity_store_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/identity_store_upgrade.go b/vault/identity_store_upgrade.go
index 56b82e1a6bba7..2c28925d7bac5 100644
--- a/vault/identity_store_upgrade.go
+++ b/vault/identity_store_upgrade.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -14,12 +11,6 @@ func upgradePaths(i *IdentityStore) []*framework.Path {
 	return []*framework.Path{
 		{
 			Pattern: "persona$",
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "persona",
-				OperationVerb:   "create",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"id": {
 					Type:        framework.TypeString,
@@ -55,12 +46,6 @@ vault <command> <path> metadata=key1=value1 metadata=key2=value2
 		},
 		{
 			Pattern: "persona/id/" + framework.GenericNameRegex("id"),
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "persona",
-				OperationSuffix: "by-id",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"id": {
 					Type:        framework.TypeString,
@@ -87,26 +72,10 @@ vault <command> <path> metadata=key1=value1 metadata=key2=value2
 `,
 				},
 			},
-
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.UpdateOperation: &framework.PathOperation{
-					Callback: i.handleEntityUpdateCommon(),
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb: "update",
-					},
-				},
-				logical.ReadOperation: &framework.PathOperation{
-					Callback: i.pathAliasIDRead(),
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb: "read",
-					},
-				},
-				logical.DeleteOperation: &framework.PathOperation{
-					Callback: i.pathAliasIDDelete(),
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb: "delete",
-					},
-				},
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.UpdateOperation: i.handleEntityUpdateCommon(),
+				logical.ReadOperation:   i.pathAliasIDRead(),
+				logical.DeleteOperation: i.pathAliasIDDelete(),
 			},
 
 			HelpSynopsis:    strings.TrimSpace(aliasHelp["alias-id"][0]),
@@ -114,12 +83,6 @@ vault <command> <path> metadata=key1=value1 metadata=key2=value2
 		},
 		{
 			Pattern: "persona/id/?$",
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "persona",
-				OperationSuffix: "by-id",
-			},
-
 			Callbacks: map[logical.Operation]framework.OperationFunc{
 				logical.ListOperation: i.pathAliasIDList(),
 			},
@@ -129,12 +92,6 @@ vault <command> <path> metadata=key1=value1 metadata=key2=value2
 		},
 		{
 			Pattern: "alias$",
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "alias",
-				OperationVerb:   "create",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"id": {
 					Type:        framework.TypeString,
@@ -167,12 +124,6 @@ vault <command> <path> metadata=key1=value1 metadata=key2=value2
 
 		{
 			Pattern: "alias/id/" + framework.GenericNameRegex("id"),
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "alias",
-				OperationSuffix: "by-id",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"id": {
 					Type:        framework.TypeString,
@@ -195,26 +146,10 @@ vault <command> <path> metadata=key1=value1 metadata=key2=value2
 					Description: "Name of the alias",
 				},
 			},
-
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.UpdateOperation: &framework.PathOperation{
-					Callback: i.handleAliasCreateUpdate(),
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb: "update",
-					},
-				},
-				logical.ReadOperation: &framework.PathOperation{
-					Callback: i.pathAliasIDRead(),
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb: "read",
-					},
-				},
-				logical.DeleteOperation: &framework.PathOperation{
-					Callback: i.pathAliasIDDelete(),
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb: "delete",
-					},
-				},
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.UpdateOperation: i.handleAliasCreateUpdate(),
+				logical.ReadOperation:   i.pathAliasIDRead(),
+				logical.DeleteOperation: i.pathAliasIDDelete(),
 			},
 
 			HelpSynopsis:    strings.TrimSpace(aliasHelp["alias-id"][0]),
@@ -222,12 +157,6 @@ vault <command> <path> metadata=key1=value1 metadata=key2=value2
 		},
 		{
 			Pattern: "alias/id/?$",
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "alias",
-				OperationSuffix: "by-id",
-			},
-
 			Callbacks: map[logical.Operation]framework.OperationFunc{
 				logical.ListOperation: i.pathAliasIDList(),
 			},
diff --git a/vault/identity_store_util.go b/vault/identity_store_util.go
index 4310fdf6a0f48..2eeef336f1b63 100644
--- a/vault/identity_store_util.go
+++ b/vault/identity_store_util.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/init.go b/vault/init.go
index ba537c202e9b5..e148ef36578b6 100644
--- a/vault/init.go
+++ b/vault/init.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -16,6 +13,7 @@ import (
 	"github.com/hashicorp/vault/physical/raft"
 	"github.com/hashicorp/vault/vault/seal"
 
+	aeadwrapper "github.com/hashicorp/go-kms-wrapping/wrappers/aead/v2"
 	"github.com/hashicorp/vault/helper/namespace"
 	"github.com/hashicorp/vault/helper/pgpkeys"
 	"github.com/hashicorp/vault/shamir"
@@ -327,11 +325,7 @@ func (c *Core) Initialize(ctx context.Context, initParams *InitParams) (*InitRes
 	switch c.seal.StoredKeysSupported() {
 	case seal.StoredKeysSupportedShamirRoot:
 		keysToStore := [][]byte{barrierKey}
-		shamirWrapper, err := c.seal.GetShamirWrapper()
-		if err != nil {
-			return nil, err
-		}
-		if err := shamirWrapper.SetAesGcmKeyBytes(sealKey); err != nil {
+		if err := c.seal.GetAccess().Wrapper.(*aeadwrapper.ShamirWrapper).SetAesGcmKeyBytes(sealKey); err != nil {
 			c.logger.Error("failed to set seal key", "error", err)
 			return nil, fmt.Errorf("failed to set seal key: %w", err)
 		}
diff --git a/vault/init_test.go b/vault/init_test.go
index 4b7e62cf98680..079693cffc164 100644
--- a/vault/init_test.go
+++ b/vault/init_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/inspectable.go b/vault/inspectable.go
deleted file mode 100644
index 238af581403fc..0000000000000
--- a/vault/inspectable.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package vault
-
-type Inspectable interface {
-	// Returns a record view of a particular subsystem
-	GetRecords(tag string) ([]map[string]interface{}, error)
-}
-
-type Deserializable interface {
-	// Converts a structure into a consummable map
-	Deserialize() map[string]interface{}
-}
diff --git a/vault/inspectable_test.go b/vault/inspectable_test.go
deleted file mode 100644
index bb09cfcffb8f5..0000000000000
--- a/vault/inspectable_test.go
+++ /dev/null
@@ -1,143 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package vault
-
-import (
-	"strings"
-	"testing"
-
-	"github.com/hashicorp/vault/command/server"
-	"github.com/hashicorp/vault/helper/namespace"
-	"github.com/hashicorp/vault/sdk/logical"
-)
-
-func TestInspectRouter(t *testing.T) {
-	// Verify that all the expected tables exist when we inspect the router
-	coreConfig := &CoreConfig{
-		EnableIntrospection: true,
-	}
-	c, _, root := TestCoreUnsealedWithConfig(t, coreConfig)
-
-	rootCtx := namespace.RootContext(nil)
-	subTrees := map[string][]string{
-		"routeEntry": {"root", "storage"},
-		"mountEntry": {"uuid", "accessor"},
-	}
-	subTreeFields := map[string][]string{
-		"routeEntry": {"tainted", "storage_prefix", "accessor", "mount_namespace", "mount_path", "mount_type", "uuid"},
-		"mountEntry": {"accessor", "mount_namespace", "mount_path", "mount_type", "uuid"},
-	}
-	for subTreeType, subTreeArray := range subTrees {
-		for _, tag := range subTreeArray {
-			resp, err := c.HandleRequest(rootCtx, &logical.Request{
-				ClientToken: root,
-				Operation:   logical.ReadOperation,
-				Path:        "sys/internal/inspect/router/" + tag,
-			})
-			if err != nil || (resp != nil && resp.IsError()) {
-				t.Fatalf("bad: resp: %#v\n err: %v", resp, err)
-			}
-			// Verify that data exists
-			data, ok := resp.Data[tag].([]map[string]interface{})
-			if !ok {
-				t.Fatalf("Router data is malformed")
-			}
-			for _, entry := range data {
-				for _, field := range subTreeFields[subTreeType] {
-					if _, ok := entry[field]; !ok {
-						t.Fatalf("Field %s not found in %s", field, tag)
-					}
-				}
-			}
-
-		}
-	}
-}
-
-func TestInvalidInspectRouterPath(t *testing.T) {
-	// Verify that attempting to inspect an invalid tree in the router fails
-	coreConfig := &CoreConfig{
-		EnableIntrospection: true,
-	}
-	core, _, rootToken := TestCoreUnsealedWithConfig(t, coreConfig)
-	rootCtx := namespace.RootContext(nil)
-	_, err := core.HandleRequest(rootCtx, &logical.Request{
-		ClientToken: rootToken,
-		Operation:   logical.ReadOperation,
-		Path:        "sys/internal/inspect/router/random",
-	})
-	if !strings.Contains(err.Error(), logical.ErrUnsupportedPath.Error()) {
-		t.Fatal("expected unsupported path error")
-	}
-}
-
-func TestInspectAPIDisabled(t *testing.T) {
-	// Verify that the Inspect API is turned off by default
-	core, _, rootToken := testCoreSystemBackend(t)
-	rootCtx := namespace.RootContext(nil)
-	resp, err := core.HandleRequest(rootCtx, &logical.Request{
-		ClientToken: rootToken,
-		Operation:   logical.ReadOperation,
-		Path:        "sys/internal/inspect/router/root",
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !resp.IsError() || !strings.Contains(resp.Error().Error(), ErrIntrospectionNotEnabled.Error()) {
-		t.Fatal("expected invalid configuration error")
-	}
-}
-
-func TestInspectAPISudoProtect(t *testing.T) {
-	// Verify that the Inspect API path is sudo protected
-	core, _, rootToken := testCoreSystemBackend(t)
-	testMakeServiceTokenViaBackend(t, core.tokenStore, rootToken, "tokenid", "", []string{"secret"})
-	rootCtx := namespace.RootContext(nil)
-	_, err := core.HandleRequest(rootCtx, &logical.Request{
-		ClientToken: "tokenid",
-		Operation:   logical.ReadOperation,
-		Path:        "sys/internal/inspect/router/root",
-	})
-	if !strings.Contains(err.Error(), logical.ErrPermissionDenied.Error()) {
-		t.Fatal("expected permission denied error")
-	}
-}
-
-func TestInspectAPIReload(t *testing.T) {
-	// Verify that the Inspect API is turned off by default
-	core, _, rootToken := testCoreSystemBackend(t)
-	rootCtx := namespace.RootContext(nil)
-	resp, err := core.HandleRequest(rootCtx, &logical.Request{
-		ClientToken: rootToken,
-		Operation:   logical.ReadOperation,
-		Path:        "sys/internal/inspect/router/root",
-	})
-	if err != nil {
-		t.Fatal("Unexpected error")
-	}
-	if !resp.IsError() {
-		t.Fatal("expected invalid configuration error")
-	}
-	if !strings.Contains(resp.Error().Error(), ErrIntrospectionNotEnabled.Error()) {
-		t.Fatalf("expected invalid configuration error but recieved: %s", resp.Error())
-	}
-
-	originalConfig := core.rawConfig.Load().(*server.Config)
-	newConfig := originalConfig
-	newConfig.EnableIntrospectionEndpointRaw = true
-	newConfig.EnableIntrospectionEndpoint = true
-
-	// Reload Endpoint
-	core.SetConfig(newConfig)
-	core.ReloadIntrospectionEndpointEnabled()
-
-	resp, err = core.HandleRequest(rootCtx, &logical.Request{
-		ClientToken: rootToken,
-		Operation:   logical.ReadOperation,
-		Path:        "sys/internal/inspect/router/root",
-	})
-	if err != nil || resp.IsError() {
-		t.Fatal("Unexpected error after reload")
-	}
-}
diff --git a/vault/keyring.go b/vault/keyring.go
index 858ce2082d071..1add9fbc034bd 100644
--- a/vault/keyring.go
+++ b/vault/keyring.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/keyring_test.go b/vault/keyring_test.go
index fcbff531cc658..bb6a5047598dc 100644
--- a/vault/keyring_test.go
+++ b/vault/keyring_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/lock.go b/vault/lock.go
new file mode 100644
index 0000000000000..e7014d3973d0e
--- /dev/null
+++ b/vault/lock.go
@@ -0,0 +1,19 @@
+//go:build !deadlock
+
+package vault
+
+import (
+	"sync"
+)
+
+// DeadlockMutex is just a sync.Mutex when the build tag `deadlock` is absent.
+// See its other definition in the corresponding deadlock-build-tag-constrained
+// file for more details.
+type DeadlockMutex struct {
+	sync.Mutex
+}
+
+// DeadlockRWMutex is the RW version of DeadlockMutex.
+type DeadlockRWMutex struct {
+	sync.RWMutex
+}
diff --git a/vault/logical_cubbyhole.go b/vault/logical_cubbyhole.go
index f2d884dba9c6d..4f869747c4dfc 100644
--- a/vault/logical_cubbyhole.go
+++ b/vault/logical_cubbyhole.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -50,10 +47,6 @@ func (b *CubbyholeBackend) paths() []*framework.Path {
 		{
 			Pattern: framework.MatchAllRegex("path"),
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "cubbyhole",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"path": {
 					Type:        framework.TypeString,
@@ -64,36 +57,21 @@ func (b *CubbyholeBackend) paths() []*framework.Path {
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
 					Callback: b.handleRead,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb: "read",
-					},
-					Summary: "Retrieve the secret at the specified location.",
+					Summary:  "Retrieve the secret at the specified location.",
 				},
 				logical.UpdateOperation: &framework.PathOperation{
 					Callback: b.handleWrite,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb: "write",
-					},
-					Summary: "Store a secret at the specified location.",
+					Summary:  "Store a secret at the specified location.",
 				},
 				logical.CreateOperation: &framework.PathOperation{
 					Callback: b.handleWrite,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb: "write",
-					},
 				},
 				logical.DeleteOperation: &framework.PathOperation{
 					Callback: b.handleDelete,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb: "delete",
-					},
-					Summary: "Deletes the secret at the specified location.",
+					Summary:  "Deletes the secret at the specified location.",
 				},
 				logical.ListOperation: &framework.PathOperation{
-					Callback: b.handleList,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb: "list",
-					},
+					Callback:    b.handleList,
 					Summary:     "List secret entries at the specified location.",
 					Description: "Folders are suffixed with /. The input must be a folder; list on a file will not return a value. The values themselves are not accessible via this command.",
 				},
diff --git a/vault/logical_cubbyhole_test.go b/vault/logical_cubbyhole_test.go
index 108319fe06f5f..d6df986a2df7b 100644
--- a/vault/logical_cubbyhole_test.go
+++ b/vault/logical_cubbyhole_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/logical_passthrough.go b/vault/logical_passthrough.go
index 566b7aa9f9177..d67307f361fc0 100644
--- a/vault/logical_passthrough.go
+++ b/vault/logical_passthrough.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/logical_passthrough_test.go b/vault/logical_passthrough_test.go
index 019db5e1b3d7a..6baba86b415fe 100644
--- a/vault/logical_passthrough_test.go
+++ b/vault/logical_passthrough_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/logical_raw.go b/vault/logical_raw.go
index ba4822d95b1f3..0d51db2f55a51 100644
--- a/vault/logical_raw.go
+++ b/vault/logical_raw.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -8,7 +5,6 @@ import (
 	"context"
 	"encoding/base64"
 	"fmt"
-	"net/http"
 	"strings"
 
 	log "github.com/hashicorp/go-hclog"
@@ -319,85 +315,23 @@ func rawPaths(prefix string, r *RawBackend) []*framework.Path {
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
 					Callback: r.handleRawRead,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationPrefix: "raw",
-						OperationVerb:   "read",
-						OperationSuffix: "|path",
-					},
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"value": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-							},
-						}},
-					},
-					Summary: "Read the value of the key at the given path.",
+					Summary:  "Read the value of the key at the given path.",
 				},
 				logical.UpdateOperation: &framework.PathOperation{
 					Callback: r.handleRawWrite,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationPrefix: "raw",
-						OperationVerb:   "write",
-						OperationSuffix: "|path",
-					},
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-						}},
-					},
-					Summary: "Update the value of the key at the given path.",
+					Summary:  "Update the value of the key at the given path.",
 				},
 				logical.CreateOperation: &framework.PathOperation{
 					Callback: r.handleRawWrite,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationPrefix: "raw",
-						OperationVerb:   "write",
-						OperationSuffix: "|path",
-					},
-					Responses: map[int][]framework.Response{
-						http.StatusNoContent: {{
-							Description: "OK",
-						}},
-					},
-					Summary: "Create a key with value at the given path.",
+					Summary:  "Create a key with value at the given path.",
 				},
 				logical.DeleteOperation: &framework.PathOperation{
 					Callback: r.handleRawDelete,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationPrefix: "raw",
-						OperationVerb:   "delete",
-						OperationSuffix: "|path",
-					},
-					Responses: map[int][]framework.Response{
-						http.StatusNoContent: {{
-							Description: "OK",
-						}},
-					},
-					Summary: "Delete the key with given path.",
+					Summary:  "Delete the key with given path.",
 				},
 				logical.ListOperation: &framework.PathOperation{
 					Callback: r.handleRawList,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationPrefix: "raw",
-						OperationVerb:   "list",
-						OperationSuffix: "|path",
-					},
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"keys": {
-									Type:     framework.TypeStringSlice,
-									Required: true,
-								},
-							},
-						}},
-					},
-					Summary: "Return a list keys for a given path prefix.",
+					Summary:  "Return a list keys for a given path prefix.",
 				},
 			},
 
diff --git a/vault/logical_system.go b/vault/logical_system.go
index 35707f6804ad6..c3b6aec4b5bfb 100644
--- a/vault/logical_system.go
+++ b/vault/logical_system.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -13,7 +10,6 @@ import (
 	"errors"
 	"fmt"
 	"hash"
-	"math/rand"
 	"net/http"
 	"path"
 	"path/filepath"
@@ -31,7 +27,6 @@ import (
 	"github.com/hashicorp/go-secure-stdlib/parseutil"
 	"github.com/hashicorp/go-secure-stdlib/strutil"
 	semver "github.com/hashicorp/go-version"
-	"github.com/hashicorp/vault/helper/experiments"
 	"github.com/hashicorp/vault/helper/hostutil"
 	"github.com/hashicorp/vault/helper/identity"
 	"github.com/hashicorp/vault/helper/logging"
@@ -44,10 +39,9 @@ import (
 	"github.com/hashicorp/vault/sdk/helper/consts"
 	"github.com/hashicorp/vault/sdk/helper/jsonutil"
 	"github.com/hashicorp/vault/sdk/helper/pluginutil"
-	"github.com/hashicorp/vault/sdk/helper/roottoken"
 	"github.com/hashicorp/vault/sdk/helper/wrapping"
 	"github.com/hashicorp/vault/sdk/logical"
-	"github.com/hashicorp/vault/version"
+	"github.com/hashicorp/vault/sdk/version"
 	"github.com/mitchellh/mapstructure"
 	"golang.org/x/crypto/sha3"
 )
@@ -119,7 +113,6 @@ func NewSystemBackend(core *Core, logger log.Logger) *SystemBackend {
 				"leases/lookup/*",
 				"storage/raft/snapshot-auto/config/*",
 				"leases",
-				"internal/inspect/*",
 			},
 
 			Unauthenticated: []string{
@@ -151,7 +144,6 @@ func NewSystemBackend(core *Core, logger log.Logger) *SystemBackend {
 				"health",
 				"generate-root/attempt",
 				"generate-root/update",
-				"decode-token",
 				"rekey/init",
 				"rekey/update",
 				"rekey/verify",
@@ -183,7 +175,6 @@ func NewSystemBackend(core *Core, logger log.Logger) *SystemBackend {
 	b.Backend.Paths = append(b.Backend.Paths, b.auditPaths()...)
 	b.Backend.Paths = append(b.Backend.Paths, b.mountPaths()...)
 	b.Backend.Paths = append(b.Backend.Paths, b.authPaths()...)
-	b.Backend.Paths = append(b.Backend.Paths, b.lockedUserPaths()...)
 	b.Backend.Paths = append(b.Backend.Paths, b.leasePaths()...)
 	b.Backend.Paths = append(b.Backend.Paths, b.policyPaths()...)
 	b.Backend.Paths = append(b.Backend.Paths, b.wrappingPaths()...)
@@ -199,12 +190,11 @@ func NewSystemBackend(core *Core, logger log.Logger) *SystemBackend {
 	b.Backend.Paths = append(b.Backend.Paths, b.quotasPaths()...)
 	b.Backend.Paths = append(b.Backend.Paths, b.rootActivityPaths()...)
 	b.Backend.Paths = append(b.Backend.Paths, b.loginMFAPaths()...)
-	b.Backend.Paths = append(b.Backend.Paths, b.experimentPaths()...)
-	b.Backend.Paths = append(b.Backend.Paths, b.introspectionPaths()...)
 
 	if core.rawEnabled {
 		b.Backend.Paths = append(b.Backend.Paths, b.rawPaths()...)
 	}
+
 	if backend := core.getRaftBackend(); backend != nil {
 		b.Backend.Paths = append(b.Backend.Paths, b.raftStoragePaths()...)
 	}
@@ -925,24 +915,6 @@ func (b *SystemBackend) handleRekeyDeleteRecovery(ctx context.Context, req *logi
 	return b.handleRekeyDelete(ctx, req, data, true)
 }
 
-func (b *SystemBackend) handleGenerateRootDecodeTokenUpdate(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
-	encodedToken := data.Get("encoded_token").(string)
-	otp := data.Get("otp").(string)
-
-	token, err := roottoken.DecodeToken(encodedToken, otp, len(otp))
-	if err != nil {
-		return nil, err
-	}
-
-	// Generate the response
-	resp := &logical.Response{
-		Data: map[string]interface{}{
-			"token": token,
-		},
-	}
-	return resp, nil
-}
-
 func (b *SystemBackend) mountInfo(ctx context.Context, entry *MountEntry) map[string]interface{} {
 	info := map[string]interface{}{
 		"type":                    entry.Type,
@@ -985,15 +957,6 @@ func (b *SystemBackend) mountInfo(ctx context.Context, entry *MountEntry) map[st
 	if entry.Table == credentialTableType {
 		entryConfig["token_type"] = entry.Config.TokenType.String()
 	}
-	if entry.Config.UserLockoutConfig != nil {
-		userLockoutConfig := map[string]interface{}{
-			"user_lockout_counter_reset_duration": int64(entry.Config.UserLockoutConfig.LockoutCounterReset.Seconds()),
-			"user_lockout_threshold":              entry.Config.UserLockoutConfig.LockoutThreshold,
-			"user_lockout_duration":               int64(entry.Config.UserLockoutConfig.LockoutDuration.Seconds()),
-			"user_lockout_disable":                entry.Config.UserLockoutConfig.DisableLockout,
-		}
-		entryConfig["user_lockout_config"] = userLockoutConfig
-	}
 
 	// Add deprecation status only if it exists
 	builtinType := b.Core.builtinTypeFromMountEntry(ctx, entry)
@@ -1656,13 +1619,6 @@ func (b *SystemBackend) handleTuneReadCommon(ctx context.Context, path string) (
 		resp.Data["allowed_managed_keys"] = rawVal.([]string)
 	}
 
-	if mountEntry.Config.UserLockoutConfig != nil {
-		resp.Data["user_lockout_counter_reset_duration"] = int64(mountEntry.Config.UserLockoutConfig.LockoutCounterReset.Seconds())
-		resp.Data["user_lockout_threshold"] = mountEntry.Config.UserLockoutConfig.LockoutThreshold
-		resp.Data["user_lockout_duration"] = int64(mountEntry.Config.UserLockoutConfig.LockoutDuration.Seconds())
-		resp.Data["user_lockout_disable"] = mountEntry.Config.UserLockoutConfig.DisableLockout
-	}
-
 	if len(mountEntry.Options) > 0 {
 		resp.Data["options"] = mountEntry.Options
 	}
@@ -1782,111 +1738,6 @@ func (b *SystemBackend) handleTuneWriteCommon(ctx context.Context, path string,
 		}
 	}
 
-	// user-lockout config
-	{
-		var apiuserLockoutConfig APIUserLockoutConfig
-
-		userLockoutConfigMap := data.Get("user_lockout_config").(map[string]interface{})
-		var err error
-		if userLockoutConfigMap != nil && len(userLockoutConfigMap) != 0 {
-			err := mapstructure.Decode(userLockoutConfigMap, &apiuserLockoutConfig)
-			if err != nil {
-				return logical.ErrorResponse(
-						"unable to convert given user lockout config information"),
-					logical.ErrInvalidRequest
-			}
-
-			// Supported auth methods for user lockout configuration: ldap, approle, userpass
-			switch strings.ToLower(mountEntry.Type) {
-			case "ldap", "approle", "userpass":
-			default:
-				return logical.ErrorResponse("tuning of user lockout configuration for auth type %q not allowed", mountEntry.Type),
-					logical.ErrInvalidRequest
-
-			}
-		}
-
-		if len(userLockoutConfigMap) > 0 && mountEntry.Config.UserLockoutConfig == nil {
-			mountEntry.Config.UserLockoutConfig = &UserLockoutConfig{}
-		}
-
-		var oldUserLockoutThreshold uint64
-		var newUserLockoutDuration, oldUserLockoutDuration time.Duration
-		var newUserLockoutCounterReset, oldUserLockoutCounterReset time.Duration
-		var oldUserLockoutDisable bool
-
-		if apiuserLockoutConfig.LockoutThreshold != "" {
-			userLockoutThreshold, err := strconv.ParseUint(apiuserLockoutConfig.LockoutThreshold, 10, 64)
-			if err != nil {
-				return nil, fmt.Errorf("unable to parse user lockout threshold: %w", err)
-			}
-			oldUserLockoutThreshold = mountEntry.Config.UserLockoutConfig.LockoutThreshold
-			mountEntry.Config.UserLockoutConfig.LockoutThreshold = userLockoutThreshold
-		}
-
-		if apiuserLockoutConfig.LockoutDuration != "" {
-			oldUserLockoutDuration = mountEntry.Config.UserLockoutConfig.LockoutDuration
-			switch apiuserLockoutConfig.LockoutDuration {
-			case "":
-				newUserLockoutDuration = oldUserLockoutDuration
-			case "system":
-				newUserLockoutDuration = time.Duration(0)
-			default:
-				tmpUserLockoutDuration, err := parseutil.ParseDurationSecond(apiuserLockoutConfig.LockoutDuration)
-				if err != nil {
-					return handleError(err)
-				}
-				newUserLockoutDuration = tmpUserLockoutDuration
-
-			}
-			mountEntry.Config.UserLockoutConfig.LockoutDuration = newUserLockoutDuration
-		}
-
-		if apiuserLockoutConfig.LockoutCounterResetDuration != "" {
-			oldUserLockoutCounterReset = mountEntry.Config.UserLockoutConfig.LockoutCounterReset
-			switch apiuserLockoutConfig.LockoutCounterResetDuration {
-			case "":
-				newUserLockoutCounterReset = oldUserLockoutCounterReset
-			case "system":
-				newUserLockoutCounterReset = time.Duration(0)
-			default:
-				tmpUserLockoutCounterReset, err := parseutil.ParseDurationSecond(apiuserLockoutConfig.LockoutCounterResetDuration)
-				if err != nil {
-					return handleError(err)
-				}
-				newUserLockoutCounterReset = tmpUserLockoutCounterReset
-			}
-
-			mountEntry.Config.UserLockoutConfig.LockoutCounterReset = newUserLockoutCounterReset
-		}
-
-		if apiuserLockoutConfig.DisableLockout != nil {
-			oldUserLockoutDisable = mountEntry.Config.UserLockoutConfig.DisableLockout
-			userLockoutDisable := apiuserLockoutConfig.DisableLockout
-			mountEntry.Config.UserLockoutConfig.DisableLockout = *userLockoutDisable
-		}
-
-		// Update the mount table
-		if len(userLockoutConfigMap) > 0 {
-			switch {
-			case strings.HasPrefix(path, "auth/"):
-				err = b.Core.persistAuth(ctx, b.Core.auth, &mountEntry.Local)
-			default:
-				err = b.Core.persistMounts(ctx, b.Core.mounts, &mountEntry.Local)
-			}
-			if err != nil {
-				mountEntry.Config.UserLockoutConfig.LockoutCounterReset = oldUserLockoutCounterReset
-				mountEntry.Config.UserLockoutConfig.LockoutThreshold = oldUserLockoutThreshold
-				mountEntry.Config.UserLockoutConfig.LockoutDuration = oldUserLockoutDuration
-				mountEntry.Config.UserLockoutConfig.DisableLockout = oldUserLockoutDisable
-				return handleError(err)
-			}
-			if b.Core.logger.IsInfo() {
-				b.Core.logger.Info("tuning of user_lockout_config successful", "path", path)
-			}
-		}
-
-	}
 	if rawVal, ok := data.GetOk("description"); ok {
 		description := rawVal.(string)
 
@@ -2231,51 +2082,6 @@ func (b *SystemBackend) handleTuneWriteCommon(ctx context.Context, path string,
 	return resp, nil
 }
 
-// handleLockedUsersMetricQuery reports the locked user count metrics for this namespace and all child namespaces
-// if mount_accessor in request, returns the locked user metrics for that mount accessor for namespace in ctx
-func (b *SystemBackend) handleLockedUsersMetricQuery(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
-	var mountAccessor string
-	if mountAccessorRaw, ok := d.GetOk("mount_accessor"); ok {
-		mountAccessor = mountAccessorRaw.(string)
-	}
-
-	results, err := b.handleLockedUsersQuery(ctx, mountAccessor)
-	if err != nil {
-		return nil, err
-	}
-	if results == nil {
-		return logical.RespondWithStatusCode(nil, req, http.StatusNoContent)
-	}
-
-	return &logical.Response{
-		Data: results,
-	}, nil
-}
-
-// handleUnlockUser is used to unlock user with given mount_accessor and alias_identifier if locked
-func (b *SystemBackend) handleUnlockUser(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
-	mountAccessor := data.Get("mount_accessor").(string)
-	if mountAccessor == "" {
-		return logical.ErrorResponse(
-				"missing mount_accessor"),
-			logical.ErrInvalidRequest
-	}
-
-	aliasName := data.Get("alias_identifier").(string)
-	if aliasName == "" {
-		return logical.ErrorResponse(
-				"missing alias_identifier"),
-			logical.ErrInvalidRequest
-	}
-
-	if err := unlockUser(ctx, b.Core, mountAccessor, aliasName); err != nil {
-		b.Backend.Logger().Error("unlock user failed", "mount accessor", mountAccessor, "alias identifier", aliasName, "error", err)
-		return handleError(err)
-	}
-
-	return nil, nil
-}
-
 // handleLease is use to view the metadata for a given LeaseID
 func (b *SystemBackend) handleLeaseLookup(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
 	leaseID := data.Get("lease_id").(string)
@@ -3040,44 +2846,28 @@ func (*SystemBackend) handlePoliciesPasswordSet(ctx context.Context, req *logica
 			fmt.Sprintf("passwords must be between %d and %d characters", minPasswordLength, maxPasswordLength))
 	}
 
-	// Attempt to construct a test password from the rules to ensure that the policy isn't impossible
-	var testPassword []rune
-
-	for _, rule := range policy.Rules {
-		charsetRule, ok := rule.(random.CharsetRule)
-		if !ok {
-			return nil, logical.CodedError(http.StatusBadRequest, fmt.Sprintf("unexpected rule type %T", charsetRule))
-		}
+	// Generate some passwords to ensure that we're confident that the policy isn't impossible
+	timeout := 1 * time.Second
+	genCtx, cancel := context.WithTimeout(ctx, timeout)
+	defer cancel()
 
-		for j := 0; j < charsetRule.MinLength(); j++ {
-			charIndex := rand.Intn(len(charsetRule.Chars()))
-			testPassword = append(testPassword, charsetRule.Chars()[charIndex])
+	attempts := 10
+	failed := 0
+	for i := 0; i < attempts; i++ {
+		_, err = policy.Generate(genCtx, nil)
+		if err != nil {
+			failed++
 		}
 	}
 
-	for i := len(testPassword); i < policy.Length; i++ {
-		for _, rule := range policy.Rules {
-			if len(testPassword) >= policy.Length {
-				break
-			}
-			charsetRule, ok := rule.(random.CharsetRule)
-			if !ok {
-				return nil, logical.CodedError(http.StatusBadRequest, fmt.Sprintf("unexpected rule type %T", charsetRule))
-			}
-
-			charIndex := rand.Intn(len(charsetRule.Chars()))
-			testPassword = append(testPassword, charsetRule.Chars()[charIndex])
-		}
+	if failed == attempts {
+		return nil, logical.CodedError(http.StatusBadRequest,
+			fmt.Sprintf("unable to generate password from provided policy in %s: are the rules impossible?", timeout))
 	}
 
-	rand.Shuffle(policy.Length, func(i, j int) {
-		testPassword[i], testPassword[j] = testPassword[j], testPassword[i]
-	})
-
-	for _, rule := range policy.Rules {
-		if !rule.Pass(testPassword) {
-			return nil, logical.CodedError(http.StatusBadRequest, "unable to construct test password from provided policy: are the rules impossible?")
-		}
+	if failed > 0 {
+		return nil, logical.CodedError(http.StatusBadRequest,
+			fmt.Sprintf("failed to generate passwords %d times out of %d attempts in %s - is the policy too restrictive?", failed, attempts, timeout))
 	}
 
 	cfg := passwordPolicyConfig{
@@ -4395,25 +4185,6 @@ func (b *SystemBackend) pathInternalCountersEntities(ctx context.Context, req *l
 	return resp, nil
 }
 
-func (b *SystemBackend) pathInternalInspectRouter(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
-	b.Core.introspectionEnabledLock.Lock()
-	defer b.Core.introspectionEnabledLock.Unlock()
-	if b.Core.introspectionEnabled {
-		tag := d.Get("tag").(string)
-		inspectableRouter, err := b.Core.router.GetRecords(tag)
-		if err != nil {
-			return nil, err
-		}
-		resp := &logical.Response{
-			Data: map[string]interface{}{
-				tag: inspectableRouter,
-			},
-		}
-		return resp, nil
-	}
-	return logical.ErrorResponse(ErrIntrospectionNotEnabled.Error()), nil
-}
-
 func (b *SystemBackend) pathInternalUIResultantACL(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
 	if req.ClientToken == "" {
 		// 204 -- no ACL
@@ -4535,20 +4306,10 @@ func (b *SystemBackend) pathInternalOpenAPI(ctx context.Context, req *logical.Re
 
 	context := d.Get("context").(string)
 
-	// Set up target document
-	doc := framework.NewOASDocument(version.Version)
+	// Set up target document and convert to map[string]interface{} which is what will
+	// be received from plugin backends.
+	doc := framework.NewOASDocument()
 
-	// Generic mount paths will primarily be used for code generation purposes.
-	// This will result in parameterized mount paths being returned instead of
-	// hardcoded actual paths. For example /auth/my-auth-method/login would be
-	// replaced with /auth/{my-auth-method_mount_path}/login.
-	//
-	// Note that for this to actually be useful, you have to be using it with
-	// a Vault instance in which you have mounted one of each secrets engine
-	// and auth method of types you are interested in, at paths which identify
-	// their type, and for the KV secrets engine you will probably want to
-	// mount separate kv-v1 and kv-v2 mounts to include the documentation for
-	// each of those APIs.
 	genericMountPaths, _ := d.Get("generic_mount_paths").(bool)
 
 	procMountGroup := func(group, mountPrefix string) error {
@@ -4568,7 +4329,7 @@ func (b *SystemBackend) pathInternalOpenAPI(ctx context.Context, req *logical.Re
 			req := &logical.Request{
 				Operation: logical.HelpOperation,
 				Storage:   req.Storage,
-				Data:      map[string]interface{}{"requestResponsePrefix": pluginType},
+				Data:      map[string]interface{}{"requestResponsePrefix": pluginType, "genericMountPaths": genericMountPaths},
 			}
 
 			resp, err := backend.HandleRequest(ctx, req)
@@ -4606,19 +4367,6 @@ func (b *SystemBackend) pathInternalOpenAPI(ctx context.Context, req *logical.Re
 				tag = "identity"
 			}
 
-			// When set to the empty string, mountPathParameterName means not to use a parameter at all;
-			// the one variable combines both boolean, and value-to-use-if-true semantics.
-			mountPathParameterName := ""
-			if genericMountPaths {
-				isSingletonMount := (group == "auth" && pluginType == "token") ||
-					(group == "secret" &&
-						(pluginType == "system" || pluginType == "identity" || pluginType == "cubbyhole"))
-
-				if !isSingletonMount {
-					mountPathParameterName = strings.TrimRight(mount, "/") + "_mount_path"
-				}
-			}
-
 			// Merge backend paths with existing document
 			for path, obj := range backendDoc.Paths {
 				path := strings.TrimPrefix(path, "/")
@@ -4635,24 +4383,12 @@ func (b *SystemBackend) pathInternalOpenAPI(ctx context.Context, req *logical.Re
 					}
 				}
 
-				mountForOpenAPI := mount
-
-				if mountPathParameterName != "" {
-					mountForOpenAPI = "{" + mountPathParameterName + "}/"
-
-					obj.Parameters = append(obj.Parameters, framework.OASParameter{
-						Name:        mountPathParameterName,
-						Description: "Path that the backend was mounted at",
-						In:          "path",
-						Schema: &framework.OASSchema{
-							Type:    "string",
-							Default: strings.TrimRight(mount, "/"),
-						},
-						Required: true,
-					})
+				if genericMountPaths && mount != "sys/" && mount != "identity/" {
+					s := fmt.Sprintf("/%s{mountPath}/%s", mountPrefix, path)
+					doc.Paths[s] = obj
+				} else {
+					doc.Paths["/"+mountPrefix+mount+path] = obj
 				}
-
-				doc.Paths["/"+mountPrefix+mountForOpenAPI+path] = obj
 			}
 
 			// Merge backend schema components
@@ -4689,23 +4425,22 @@ func (b *SystemBackend) pathInternalOpenAPI(ctx context.Context, req *logical.Re
 }
 
 type SealStatusResponse struct {
-	Type              string   `json:"type"`
-	Initialized       bool     `json:"initialized"`
-	Sealed            bool     `json:"sealed"`
-	T                 int      `json:"t"`
-	N                 int      `json:"n"`
-	Progress          int      `json:"progress"`
-	Nonce             string   `json:"nonce"`
-	Version           string   `json:"version"`
-	BuildDate         string   `json:"build_date"`
-	Migration         bool     `json:"migration"`
-	ClusterName       string   `json:"cluster_name,omitempty"`
-	ClusterID         string   `json:"cluster_id,omitempty"`
-	RecoverySeal      bool     `json:"recovery_seal"`
-	StorageType       string   `json:"storage_type,omitempty"`
-	HCPLinkStatus     string   `json:"hcp_link_status,omitempty"`
-	HCPLinkResourceID string   `json:"hcp_link_resource_ID,omitempty"`
-	Warnings          []string `json:"warnings,omitempty"`
+	Type              string `json:"type"`
+	Initialized       bool   `json:"initialized"`
+	Sealed            bool   `json:"sealed"`
+	T                 int    `json:"t"`
+	N                 int    `json:"n"`
+	Progress          int    `json:"progress"`
+	Nonce             string `json:"nonce"`
+	Version           string `json:"version"`
+	BuildDate         string `json:"build_date"`
+	Migration         bool   `json:"migration"`
+	ClusterName       string `json:"cluster_name,omitempty"`
+	ClusterID         string `json:"cluster_id,omitempty"`
+	RecoverySeal      bool   `json:"recovery_seal"`
+	StorageType       string `json:"storage_type,omitempty"`
+	HCPLinkStatus     string `json:"hcp_link_status,omitempty"`
+	HCPLinkResourceID string `json:"hcp_link_resource_ID,omitempty"`
 }
 
 func (core *Core) GetSealStatus(ctx context.Context) (*SealStatusResponse, error) {
@@ -5143,24 +4878,6 @@ func (b *SystemBackend) handleLoggersByNameDelete(ctx context.Context, req *logi
 	return nil, nil
 }
 
-// handleReadExperiments returns the available and enabled experiments on this node.
-// Each node within a cluster could have different values for each, but it's not
-// recommended.
-func (b *SystemBackend) handleReadExperiments(ctx context.Context, _ *logical.Request, _ *framework.FieldData) (*logical.Response, error) {
-	enabled := b.Core.experiments
-	if len(enabled) == 0 {
-		// Return empty slice instead of nil, so the JSON shows [] instead of null
-		enabled = []string{}
-	}
-
-	return &logical.Response{
-		Data: map[string]interface{}{
-			"available": experiments.ValidExperiments(),
-			"enabled":   enabled,
-		},
-	}, nil
-}
-
 func sanitizePath(path string) string {
 	if !strings.HasSuffix(path, "/") {
 		path += "/"
@@ -5220,17 +4937,6 @@ This path responds to the following HTTP methods.
         Clears the CORS configuration and disables acceptance of CORS requests.
 		`,
 	},
-	"config/group-policy-application": {
-		"Configures how policies in groups should be applied, accepting 'within_namespace_hierarchy' (default) and 'any'," +
-			"which will allow policies to grant permissions in groups outside of those sharing a namespace hierarchy.",
-		`
-This path responds to the following HTTP methods.
-    GET /
-        Returns the current group policy application mode.
-    POST /
-        Sets the current group_policy_application_mode to either 'within_namespace_hierarchy' or 'any'.
-        `,
-	},
 	"config/ui/headers": {
 		"Configures response headers that should be returned from the UI.",
 		`
@@ -5410,10 +5116,6 @@ in the plugin catalog.`,
 		`The options to pass into the backend. Should be a json object with string keys and values.`,
 	},
 
-	"tune_user_lockout_config": {
-		`The user lockout configuration to pass into the backend. Should be a json object with string keys and values.`,
-	},
-
 	"remount": {
 		"Move the mount point of an already-mounted backend, within or across namespaces",
 		`
@@ -5445,35 +5147,6 @@ the auth path.`,
 the mount.`,
 	},
 
-	"unlock_user": {
-		"Unlock the locked user with given mount_accessor and alias_identifier.",
-		`
-This path responds to the following HTTP methods.
-    POST sys/locked-users/:mount_accessor/unlock/:alias_identifier
-		Unlocks the user with given mount_accessor and alias_identifier
-		if locked.`,
-	},
-
-	"mount_accessor": {
-		"MountAccessor is the identifier of the mount entry to which the user belongs",
-		"",
-	},
-
-	"locked_users": {
-		"Report the locked user count metrics",
-		`
-This path responds to the following HTTP methods.
-    GET sys/locked-users
-	Report the locked user count metrics, for current namespace and all child namespaces.`,
-	},
-
-	"alias_identifier": {
-		`It is the name of the alias (user). For example, if the alias belongs to userpass backend, 
-	   the name should be a valid username within userpass auth method. If the alias belongs
-	    to an approle auth method, the name should be a valid RoleID`,
-		"",
-	},
-
 	"renew": {
 		"Renew a lease on a secret",
 		`
@@ -5983,14 +5656,6 @@ This path responds to the following HTTP methods.
 		"Count of active entities in this Vault cluster.",
 		"Count of active entities in this Vault cluster.",
 	},
-	"internal-inspect-router": {
-		"Information on the entries in each of the trees in the router. Inspectable trees are uuid, accessor, storage, and root.",
-		`
-This path responds to the following HTTP methods.
-		GET /
-			Returns a list of entries in specified table
-		`,
-	},
 	"host-info": {
 		"Information about the host instance that this Vault server is running on.",
 		`Information about the host instance that this Vault server is running on.
@@ -6030,12 +5695,4 @@ This path responds to the following HTTP methods.
         Returns a list historical version changes sorted by installation time in ascending order.
 		`,
 	},
-	"experiments": {
-		"Returns information about Vault's experimental features. Should NOT be used in production.",
-		`
-This path responds to the following HTTP methods.
-		GET /
-			Returns the available and enabled experiments.
-		`,
-	},
 }
diff --git a/vault/logical_system_activity.go b/vault/logical_system_activity.go
index 9ad930b5dff37..1d34a8e22bfc5 100644
--- a/vault/logical_system_activity.go
+++ b/vault/logical_system_activity.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -21,18 +18,7 @@ import (
 func (b *SystemBackend) activityQueryPath() *framework.Path {
 	return &framework.Path{
 		Pattern: "internal/counters/activity$",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: "internal-client-activity",
-			OperationVerb:   "report",
-			OperationSuffix: "counts",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
-			"current_billing_period": {
-				Type:        framework.TypeBool,
-				Description: "Query utilization for configured billing period",
-			},
 			"start_time": {
 				Type:        framework.TypeTime,
 				Description: "Start of query interval",
@@ -62,14 +48,7 @@ func (b *SystemBackend) activityQueryPath() *framework.Path {
 // monthlyActivityCountPath is available in every namespace
 func (b *SystemBackend) monthlyActivityCountPath() *framework.Path {
 	return &framework.Path{
-		Pattern: "internal/counters/activity/monthly$",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: "internal-client-activity",
-			OperationVerb:   "report",
-			OperationSuffix: "counts-this-month",
-		},
-
+		Pattern:         "internal/counters/activity/monthly$",
 		HelpSynopsis:    strings.TrimSpace(sysHelp["activity-monthly"][0]),
 		HelpDescription: strings.TrimSpace(sysHelp["activity-monthly"][1]),
 		Operations: map[logical.Operation]framework.OperationHandler{
@@ -95,11 +74,6 @@ func (b *SystemBackend) rootActivityPaths() []*framework.Path {
 		b.monthlyActivityCountPath(),
 		{
 			Pattern: "internal/counters/config$",
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "internal-client-activity",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"default_report_months": {
 					Type:        framework.TypeInt,
@@ -122,29 +96,16 @@ func (b *SystemBackend) rootActivityPaths() []*framework.Path {
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
 					Callback: b.handleActivityConfigRead,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "read",
-						OperationSuffix: "configuration",
-					},
-					Summary: "Read the client count tracking configuration.",
+					Summary:  "Read the client count tracking configuration.",
 				},
 				logical.UpdateOperation: &framework.PathOperation{
 					Callback: b.handleActivityConfigUpdate,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb: "configure",
-					},
-					Summary: "Enable or disable collection of client count, set retention period, or set default reporting period.",
+					Summary:  "Enable or disable collection of client count, set retention period, or set default reporting period.",
 				},
 			},
 		},
 		{
 			Pattern: "internal/counters/activity/export$",
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "internal-client-activity",
-				OperationVerb:   "export",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"start_time": {
 					Type:        framework.TypeTime,
@@ -160,7 +121,6 @@ func (b *SystemBackend) rootActivityPaths() []*framework.Path {
 					Default:     "json",
 				},
 			},
-
 			HelpSynopsis:    strings.TrimSpace(sysHelp["activity-export"][0]),
 			HelpDescription: strings.TrimSpace(sysHelp["activity-export"][1]),
 
@@ -205,11 +165,8 @@ func parseStartEndTimes(a *ActivityLog, d *framework.FieldData) (time.Time, time
 	return startTime, endTime, nil
 }
 
-// This endpoint is not used by the UI. The UI's "export" feature is entirely client-side.
 func (b *SystemBackend) handleClientExport(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
-	b.Core.activityLogLock.RLock()
 	a := b.Core.activityLog
-	b.Core.activityLogLock.RUnlock()
 	if a == nil {
 		return logical.ErrorResponse("no activity log present"), nil
 	}
@@ -240,23 +197,14 @@ func (b *SystemBackend) handleClientExport(ctx context.Context, req *logical.Req
 }
 
 func (b *SystemBackend) handleClientMetricQuery(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
-	var startTime, endTime time.Time
-	b.Core.activityLogLock.RLock()
 	a := b.Core.activityLog
-	b.Core.activityLogLock.RUnlock()
 	if a == nil {
 		return logical.ErrorResponse("no activity log present"), nil
 	}
 
-	if d.Get("current_billing_period").(bool) {
-		startTime = b.Core.BillingStart()
-		endTime = time.Now().UTC()
-	} else {
-		var err error
-		startTime, endTime, err = parseStartEndTimes(a, d)
-		if err != nil {
-			return logical.ErrorResponse(err.Error()), nil
-		}
+	startTime, endTime, err := parseStartEndTimes(a, d)
+	if err != nil {
+		return logical.ErrorResponse(err.Error()), nil
 	}
 
 	var limitNamespaces int
@@ -279,9 +227,7 @@ func (b *SystemBackend) handleClientMetricQuery(ctx context.Context, req *logica
 }
 
 func (b *SystemBackend) handleMonthlyActivityCount(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
-	b.Core.activityLogLock.RLock()
 	a := b.Core.activityLog
-	b.Core.activityLogLock.RUnlock()
 	if a == nil {
 		return logical.ErrorResponse("no activity log present"), nil
 	}
@@ -300,9 +246,7 @@ func (b *SystemBackend) handleMonthlyActivityCount(ctx context.Context, req *log
 }
 
 func (b *SystemBackend) handleActivityConfigRead(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
-	b.Core.activityLogLock.RLock()
 	a := b.Core.activityLog
-	b.Core.activityLogLock.RUnlock()
 	if a == nil {
 		return logical.ErrorResponse("no activity log present"), nil
 	}
@@ -323,21 +267,16 @@ func (b *SystemBackend) handleActivityConfigRead(ctx context.Context, req *logic
 
 	return &logical.Response{
 		Data: map[string]interface{}{
-			"default_report_months":    config.DefaultReportMonths,
-			"retention_months":         config.RetentionMonths,
-			"enabled":                  config.Enabled,
-			"queries_available":        qa,
-			"reporting_enabled":        b.Core.CensusLicensingEnabled(),
-			"billing_start_timestamp":  b.Core.BillingStart(),
-			"minimum_retention_months": a.configOverrides.MinimumRetentionMonths,
+			"default_report_months": config.DefaultReportMonths,
+			"retention_months":      config.RetentionMonths,
+			"enabled":               config.Enabled,
+			"queries_available":     qa,
 		},
 	}, nil
 }
 
 func (b *SystemBackend) handleActivityConfigUpdate(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
-	b.Core.activityLogLock.RLock()
 	a := b.Core.activityLog
-	b.Core.activityLogLock.RUnlock()
 	if a == nil {
 		return logical.ErrorResponse("no activity log present"), nil
 	}
@@ -386,11 +325,6 @@ func (b *SystemBackend) handleActivityConfigUpdate(ctx context.Context, req *log
 			if config.Enabled == "enable" && enabledStr == "disable" ||
 				!activityLogEnabledDefault && config.Enabled == "enable" && enabledStr == "default" ||
 				activityLogEnabledDefault && config.Enabled == "default" && enabledStr == "disable" {
-
-				// if census is enabled, the activity log cannot be disabled
-				if a.core.CensusLicensingEnabled() {
-					return logical.ErrorResponse("cannot disable the activity log while Reporting is enabled"), logical.ErrInvalidRequest
-				}
 				warnings = append(warnings, "the current monthly segment will be deleted because the activity log was disabled")
 			}
 
@@ -403,9 +337,6 @@ func (b *SystemBackend) handleActivityConfigUpdate(ctx context.Context, req *log
 		}
 	}
 
-	a.core.activityLogLock.RLock()
-	minimumRetentionMonths := a.configOverrides.MinimumRetentionMonths
-	a.core.activityLogLock.RUnlock()
 	enabled := config.Enabled == "enable"
 	if !enabled && config.Enabled == "default" {
 		enabled = activityLogEnabledDefault
@@ -415,10 +346,6 @@ func (b *SystemBackend) handleActivityConfigUpdate(ctx context.Context, req *log
 		return logical.ErrorResponse("retention_months cannot be 0 while enabled"), logical.ErrInvalidRequest
 	}
 
-	if a.core.CensusLicensingEnabled() && config.RetentionMonths < minimumRetentionMonths {
-		return logical.ErrorResponse("retention_months must be at least %d while Reporting is enabled", minimumRetentionMonths), logical.ErrInvalidRequest
-	}
-
 	// Store the config
 	entry, err := logical.StorageEntryJSON(path.Join(activitySubPath, activityConfigKey), config)
 	if err != nil {
diff --git a/vault/logical_system_activity_write_testonly.go b/vault/logical_system_activity_write_testonly.go
index aa89770928a6a..5d289793df56d 100644
--- a/vault/logical_system_activity_write_testonly.go
+++ b/vault/logical_system_activity_write_testonly.go
@@ -7,17 +7,9 @@ package vault
 
 import (
 	"context"
-	"fmt"
-	"io"
-	"sync"
-	"time"
 
-	"github.com/hashicorp/go-uuid"
-	"github.com/hashicorp/vault/helper/namespace"
-	"github.com/hashicorp/vault/helper/timeutil"
 	"github.com/hashicorp/vault/sdk/framework"
 	"github.com/hashicorp/vault/sdk/logical"
-	"github.com/hashicorp/vault/vault/activity"
 	"github.com/hashicorp/vault/vault/activity/generation"
 	"google.golang.org/protobuf/encoding/protojson"
 )
@@ -57,390 +49,5 @@ func (b *SystemBackend) handleActivityWriteData(ctx context.Context, request *lo
 	if len(input.Data) == 0 {
 		return logical.ErrorResponse("Missing required \"data\" values"), logical.ErrInvalidRequest
 	}
-
-	numMonths := 0
-	for _, month := range input.Data {
-		if int(month.GetMonthsAgo()) > numMonths {
-			numMonths = int(month.GetMonthsAgo())
-		}
-	}
-	generated := newMultipleMonthsActivityClients(numMonths + 1)
-	for _, month := range input.Data {
-		err := generated.processMonth(ctx, b.Core, month)
-		if err != nil {
-			return logical.ErrorResponse("failed to process data for month %d", month.GetMonthsAgo()), err
-		}
-	}
-
-	opts := make(map[generation.WriteOptions]struct{}, len(input.Write))
-	for _, opt := range input.Write {
-		opts[opt] = struct{}{}
-	}
-	paths, err := generated.write(ctx, opts, b.Core.activityLog)
-	if err != nil {
-		return logical.ErrorResponse("failed to write data"), err
-	}
-	return &logical.Response{
-		Data: map[string]interface{}{
-			"paths": paths,
-		},
-	}, nil
-}
-
-// singleMonthActivityClients holds a single month's client IDs, in the order they were seen
-type singleMonthActivityClients struct {
-	// clients are indexed by ID
-	clients []*activity.EntityRecord
-	// predefinedSegments map from the segment number to the client's index in
-	// the clients slice
-	predefinedSegments map[int][]int
-	// generationParameters holds the generation request
-	generationParameters *generation.Data
-}
-
-// multipleMonthsActivityClients holds multiple month's data
-type multipleMonthsActivityClients struct {
-	// months are in order, with month 0 being the current month and index 1 being 1 month ago
-	months []*singleMonthActivityClients
-}
-
-func (s *singleMonthActivityClients) addEntityRecord(record *activity.EntityRecord, segmentIndex *int) {
-	s.clients = append(s.clients, record)
-	if segmentIndex != nil {
-		index := len(s.clients) - 1
-		s.predefinedSegments[*segmentIndex] = append(s.predefinedSegments[*segmentIndex], index)
-	}
-}
-
-// populateSegments converts a month of clients into a segmented map. The map's
-// keys are the segment index, and the value are the clients that were seen in
-// that index. If the value is an empty slice, then it's an empty index. If the
-// value is nil, then it's a skipped index
-func (s *singleMonthActivityClients) populateSegments() (map[int][]*activity.EntityRecord, error) {
-	segments := make(map[int][]*activity.EntityRecord)
-	ignoreIndexes := make(map[int]struct{})
-	skipIndexes := s.generationParameters.SkipSegmentIndexes
-	emptyIndexes := s.generationParameters.EmptySegmentIndexes
-
-	for _, i := range skipIndexes {
-		segments[int(i)] = nil
-		ignoreIndexes[int(i)] = struct{}{}
-	}
-	for _, i := range emptyIndexes {
-		segments[int(i)] = make([]*activity.EntityRecord, 0, 0)
-		ignoreIndexes[int(i)] = struct{}{}
-	}
-
-	// if we have predefined segments, then we can construct the map using those
-	if len(s.predefinedSegments) > 0 {
-		for segment, clientIndexes := range s.predefinedSegments {
-			clientsInSegment := make([]*activity.EntityRecord, 0, len(clientIndexes))
-			for _, idx := range clientIndexes {
-				clientsInSegment = append(clientsInSegment, s.clients[idx])
-			}
-			segments[segment] = clientsInSegment
-		}
-		return segments, nil
-	}
-
-	totalSegmentCount := 1
-	if s.generationParameters.GetNumSegments() > 0 {
-		totalSegmentCount = int(s.generationParameters.GetNumSegments())
-	}
-	numNonUsable := len(skipIndexes) + len(emptyIndexes)
-	usableSegmentCount := totalSegmentCount - numNonUsable
-	if usableSegmentCount <= 0 {
-		return nil, fmt.Errorf("num segments %d is too low, it must be greater than %d (%d skipped indexes + %d empty indexes)", totalSegmentCount, numNonUsable, len(skipIndexes), len(emptyIndexes))
-	}
-
-	// determine how many clients should be in each segment
-	segmentSizes := len(s.clients) / usableSegmentCount
-	if len(s.clients)%usableSegmentCount != 0 {
-		segmentSizes++
-	}
-
-	clientIndex := 0
-	for i := 0; i < totalSegmentCount; i++ {
-		if clientIndex >= len(s.clients) {
-			break
-		}
-		if _, ok := ignoreIndexes[i]; ok {
-			continue
-		}
-		for len(segments[i]) < segmentSizes && clientIndex < len(s.clients) {
-			segments[i] = append(segments[i], s.clients[clientIndex])
-			clientIndex++
-		}
-	}
-	return segments, nil
-}
-
-// addNewClients generates clients according to the given parameters, and adds them to the month
-// the client will always have the mountAccessor as its mount accessor
-func (s *singleMonthActivityClients) addNewClients(c *generation.Client, mountAccessor string, segmentIndex *int) error {
-	count := 1
-	if c.Count > 1 {
-		count = int(c.Count)
-	}
-	clientType := entityActivityType
-	if c.NonEntity {
-		clientType = nonEntityTokenActivityType
-	}
-	for i := 0; i < count; i++ {
-		record := &activity.EntityRecord{
-			ClientID:      c.Id,
-			NamespaceID:   c.Namespace,
-			NonEntity:     c.NonEntity,
-			MountAccessor: mountAccessor,
-			ClientType:    clientType,
-		}
-		if record.ClientID == "" {
-			var err error
-			record.ClientID, err = uuid.GenerateUUID()
-			if err != nil {
-				return err
-			}
-		}
-		s.addEntityRecord(record, segmentIndex)
-	}
-	return nil
-}
-
-// processMonth populates a month of client data
-func (m *multipleMonthsActivityClients) processMonth(ctx context.Context, core *Core, month *generation.Data) error {
-	// default to using the root namespace and the first mount on the root namespace
-	mounts, err := core.ListMounts()
-	if err != nil {
-		return err
-	}
-	defaultMountAccessorRootNS := ""
-	for _, mount := range mounts {
-		if mount.NamespaceID == namespace.RootNamespaceID {
-			defaultMountAccessorRootNS = mount.Accessor
-			break
-		}
-	}
-	m.months[month.GetMonthsAgo()].generationParameters = month
-	add := func(c []*generation.Client, segmentIndex *int) error {
-		for _, clients := range c {
-
-			if clients.Namespace == "" {
-				clients.Namespace = namespace.RootNamespaceID
-			}
-
-			// verify that the namespace exists
-			ns, err := core.NamespaceByID(ctx, clients.Namespace)
-			if err != nil {
-				return err
-			}
-
-			// verify that the mount exists
-			if clients.Mount != "" {
-				nctx := namespace.ContextWithNamespace(ctx, ns)
-				mountEntry := core.router.MatchingMountEntry(nctx, clients.Mount)
-				if mountEntry == nil {
-					return fmt.Errorf("unable to find matching mount in namespace %s", clients.Namespace)
-				}
-			}
-
-			mountAccessor := defaultMountAccessorRootNS
-			if clients.Namespace != namespace.RootNamespaceID && clients.Mount == "" {
-				// if we're not using the root namespace, find a mount on the namespace that we are using
-				found := false
-				for _, mount := range mounts {
-					if mount.NamespaceID == clients.Namespace {
-						mountAccessor = mount.Accessor
-						found = true
-						break
-					}
-				}
-				if !found {
-					return fmt.Errorf("unable to find matching mount in namespace %s", clients.Namespace)
-				}
-			}
-
-			err = m.addClientToMonth(month.GetMonthsAgo(), clients, mountAccessor, segmentIndex)
-			if err != nil {
-				return err
-			}
-		}
-		return nil
-	}
-
-	if month.GetAll() != nil {
-		return add(month.GetAll().GetClients(), nil)
-	}
-	predefinedSegments := month.GetSegments()
-	for i, segment := range predefinedSegments.GetSegments() {
-		index := i
-		if segment.SegmentIndex != nil {
-			index = int(*segment.SegmentIndex)
-		}
-		err = add(segment.GetClients().GetClients(), &index)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (m *multipleMonthsActivityClients) addClientToMonth(monthsAgo int32, c *generation.Client, mountAccessor string, segmentIndex *int) error {
-	if c.Repeated || c.RepeatedFromMonth > 0 {
-		return m.addRepeatedClients(monthsAgo, c, mountAccessor, segmentIndex)
-	}
-	return m.months[monthsAgo].addNewClients(c, mountAccessor, segmentIndex)
-}
-
-func (m *multipleMonthsActivityClients) addRepeatedClients(monthsAgo int32, c *generation.Client, mountAccessor string, segmentIndex *int) error {
-	addingTo := m.months[monthsAgo]
-	repeatedFromMonth := monthsAgo + 1
-	if c.RepeatedFromMonth > 0 {
-		repeatedFromMonth = c.RepeatedFromMonth
-	}
-	repeatedFrom := m.months[repeatedFromMonth]
-	numClients := 1
-	if c.Count > 0 {
-		numClients = int(c.Count)
-	}
-	for _, client := range repeatedFrom.clients {
-		if c.NonEntity == client.NonEntity && mountAccessor == client.MountAccessor && c.Namespace == client.NamespaceID {
-			addingTo.addEntityRecord(client, segmentIndex)
-			numClients--
-			if numClients == 0 {
-				break
-			}
-		}
-	}
-	if numClients > 0 {
-		return fmt.Errorf("missing repeated %d clients matching given parameters", numClients)
-	}
-	return nil
-}
-
-func (m *multipleMonthsActivityClients) write(ctx context.Context, opts map[generation.WriteOptions]struct{}, activityLog *ActivityLog) ([]string, error) {
-	now := timeutil.StartOfMonth(time.Now().UTC())
-	paths := []string{}
-
-	_, writePQ := opts[generation.WriteOptions_WRITE_PRECOMPUTED_QUERIES]
-	_, writeDistinctClients := opts[generation.WriteOptions_WRITE_DISTINCT_CLIENTS]
-
-	pqOpts := pqOptions{}
-	if writePQ || writeDistinctClients {
-		pqOpts.byNamespace = make(map[string]*processByNamespace)
-		pqOpts.byMonth = make(map[int64]*processMonth)
-		pqOpts.activePeriodEnd = m.latestTimestamp(now)
-		pqOpts.endTime = timeutil.EndOfMonth(pqOpts.activePeriodEnd)
-		pqOpts.activePeriodStart = m.earliestTimestamp(now)
-	}
-
-	for i, month := range m.months {
-		if month.generationParameters == nil {
-			continue
-		}
-		var timestamp time.Time
-		if i > 0 {
-			timestamp = timeutil.StartOfMonth(timeutil.MonthsPreviousTo(i, now))
-		} else {
-			timestamp = now
-		}
-		segments, err := month.populateSegments()
-		if err != nil {
-			return nil, err
-		}
-		for segmentIndex, segment := range segments {
-			if _, ok := opts[generation.WriteOptions_WRITE_ENTITIES]; ok {
-				if segment == nil {
-					// skip the index
-					continue
-				}
-				entityPath, err := activityLog.saveSegmentEntitiesInternal(ctx, segmentInfo{
-					startTimestamp:       timestamp.Unix(),
-					currentClients:       &activity.EntityActivityLog{Clients: segment},
-					clientSequenceNumber: uint64(segmentIndex),
-					tokenCount:           &activity.TokenCount{},
-				}, true)
-				if err != nil {
-					return nil, err
-				}
-				paths = append(paths, entityPath)
-			}
-		}
-
-		if writePQ || writeDistinctClients {
-			reader := newProtoSegmentReader(segments)
-			err = activityLog.segmentToPrecomputedQuery(ctx, timestamp, reader, pqOpts)
-			if err != nil {
-				return nil, err
-			}
-		}
-	}
-	wg := sync.WaitGroup{}
-	err := activityLog.refreshFromStoredLog(ctx, &wg, now)
-	if err != nil {
-		return nil, err
-	}
-	return paths, nil
-}
-
-func (m *multipleMonthsActivityClients) latestTimestamp(now time.Time) time.Time {
-	for i, month := range m.months {
-		if month.generationParameters != nil {
-			return timeutil.StartOfMonth(timeutil.MonthsPreviousTo(i, now))
-		}
-	}
-	return time.Time{}
-}
-
-func (m *multipleMonthsActivityClients) earliestTimestamp(now time.Time) time.Time {
-	for i := len(m.months) - 1; i >= 0; i-- {
-		month := m.months[i]
-		if month.generationParameters != nil {
-			return timeutil.StartOfMonth(timeutil.MonthsPreviousTo(i, now))
-		}
-	}
-	return time.Time{}
-}
-
-func newMultipleMonthsActivityClients(numberOfMonths int) *multipleMonthsActivityClients {
-	m := &multipleMonthsActivityClients{
-		months: make([]*singleMonthActivityClients, numberOfMonths),
-	}
-	for i := 0; i < numberOfMonths; i++ {
-		m.months[i] = &singleMonthActivityClients{
-			predefinedSegments: make(map[int][]int),
-		}
-	}
-	return m
-}
-
-func newProtoSegmentReader(segments map[int][]*activity.EntityRecord) SegmentReader {
-	allRecords := make([][]*activity.EntityRecord, 0, len(segments))
-	for _, records := range segments {
-		if segments == nil {
-			continue
-		}
-		allRecords = append(allRecords, records)
-	}
-	return &sliceSegmentReader{
-		records: allRecords,
-	}
-}
-
-type sliceSegmentReader struct {
-	records [][]*activity.EntityRecord
-	i       int
-}
-
-func (p *sliceSegmentReader) ReadToken(ctx context.Context) (*activity.TokenCount, error) {
-	return nil, io.EOF
-}
-
-func (p *sliceSegmentReader) ReadEntity(ctx context.Context) (*activity.EntityActivityLog, error) {
-	if p.i == len(p.records) {
-		return nil, io.EOF
-	}
-	record := p.records[p.i]
-	p.i++
-	return &activity.EntityActivityLog{Clients: record}, nil
+	return nil, nil
 }
diff --git a/vault/logical_system_activity_write_testonly_test.go b/vault/logical_system_activity_write_testonly_test.go
index f104d82ad7004..57a4b8d410dbc 100644
--- a/vault/logical_system_activity_write_testonly_test.go
+++ b/vault/logical_system_activity_write_testonly_test.go
@@ -6,19 +6,11 @@
 package vault
 
 import (
-	"context"
-	"sort"
 	"testing"
-	"time"
 
 	"github.com/hashicorp/vault/helper/namespace"
-	"github.com/hashicorp/vault/helper/timeutil"
 	"github.com/hashicorp/vault/sdk/logical"
-	"github.com/hashicorp/vault/vault/activity"
-	"github.com/hashicorp/vault/vault/activity/generation"
 	"github.com/stretchr/testify/require"
-	"google.golang.org/protobuf/encoding/protojson"
-	"google.golang.org/protobuf/proto"
 )
 
 // TestSystemBackend_handleActivityWriteData calls the activity log write endpoint and confirms that the inputs are
@@ -29,7 +21,6 @@ func TestSystemBackend_handleActivityWriteData(t *testing.T) {
 		operation logical.Operation
 		input     map[string]interface{}
 		wantError error
-		wantPaths int
 	}{
 		{
 			name:      "read fails",
@@ -76,12 +67,6 @@ func TestSystemBackend_handleActivityWriteData(t *testing.T) {
 			operation: logical.CreateOperation,
 			input:     map[string]interface{}{"input": `{"write":["WRITE_PRECOMPUTED_QUERIES"],"data":[{"current_month":true,"all":{"clients":[{"count":5}]}}]}`},
 		},
-		{
-			name:      "entities with multiple segments",
-			operation: logical.CreateOperation,
-			input:     map[string]interface{}{"input": `{"write":["WRITE_ENTITIES"],"data":[{"current_month":true,"num_segments":3,"all":{"clients":[{"count":5}]}}]}`},
-			wantPaths: 3,
-		},
 	}
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
@@ -93,515 +78,7 @@ func TestSystemBackend_handleActivityWriteData(t *testing.T) {
 				require.Equal(t, tc.wantError, err, resp.Error())
 			} else {
 				require.NoError(t, err)
-				paths := resp.Data["paths"].([]string)
-				require.Len(t, paths, tc.wantPaths)
 			}
 		})
 	}
 }
-
-// Test_singleMonthActivityClients_addNewClients verifies that new clients are
-// created correctly, adhering to the requested parameters. The clients should
-// use the inputted mount and a generated ID if one is not supplied. The new
-// client should be added to the month's `clients` slice and segment map, if
-// a segment index is supplied
-func Test_singleMonthActivityClients_addNewClients(t *testing.T) {
-	segmentIndex := 0
-	tests := []struct {
-		name          string
-		mount         string
-		clients       *generation.Client
-		wantNamespace string
-		wantMount     string
-		wantID        string
-		segmentIndex  *int
-	}{
-		{
-			name:      "default mount is used",
-			mount:     "default_mount",
-			wantMount: "default_mount",
-			clients:   &generation.Client{},
-		},
-		{
-			name:          "record namespace is used, default mount is used",
-			mount:         "default_mount",
-			wantNamespace: "ns",
-			wantMount:     "default_mount",
-			clients: &generation.Client{
-				Namespace: "ns",
-				Mount:     "mount",
-			},
-		},
-		{
-			name: "predefined ID is used",
-			clients: &generation.Client{
-				Id: "client_id",
-			},
-			wantID: "client_id",
-		},
-		{
-			name: "non zero count",
-			clients: &generation.Client{
-				Count: 5,
-			},
-		},
-		{
-			name: "non entity client",
-			clients: &generation.Client{
-				NonEntity: true,
-			},
-		},
-		{
-			name:         "added to segment",
-			clients:      &generation.Client{},
-			segmentIndex: &segmentIndex,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			m := &singleMonthActivityClients{
-				predefinedSegments: make(map[int][]int),
-			}
-			err := m.addNewClients(tt.clients, tt.mount, tt.segmentIndex)
-			require.NoError(t, err)
-			numNew := tt.clients.Count
-			if numNew == 0 {
-				numNew = 1
-			}
-			require.Len(t, m.clients, int(numNew))
-			for i, rec := range m.clients {
-				require.NotNil(t, rec)
-				require.Equal(t, tt.wantNamespace, rec.NamespaceID)
-				require.Equal(t, tt.wantMount, rec.MountAccessor)
-				require.Equal(t, tt.clients.NonEntity, rec.NonEntity)
-				if tt.wantID != "" {
-					require.Equal(t, tt.wantID, rec.ClientID)
-				} else {
-					require.NotEqual(t, "", rec.ClientID)
-				}
-				if tt.segmentIndex != nil {
-					require.Contains(t, m.predefinedSegments[*tt.segmentIndex], i)
-				}
-			}
-		})
-	}
-}
-
-// Test_multipleMonthsActivityClients_processMonth verifies that a month of data
-// is added correctly. The test checks that default values are handled correctly
-// for mounts and namespaces.
-func Test_multipleMonthsActivityClients_processMonth(t *testing.T) {
-	core, _, _ := TestCoreUnsealed(t)
-	tests := []struct {
-		name      string
-		clients   *generation.Data
-		wantError bool
-		numMonths int
-	}{
-		{
-			name: "specified namespace and mount exist",
-			clients: &generation.Data{
-				Clients: &generation.Data_All{All: &generation.Clients{Clients: []*generation.Client{{
-					Namespace: namespace.RootNamespaceID,
-					Mount:     "identity/",
-				}}}},
-			},
-			numMonths: 1,
-		},
-		{
-			name: "specified namespace exists, mount empty",
-			clients: &generation.Data{
-				Clients: &generation.Data_All{All: &generation.Clients{Clients: []*generation.Client{{
-					Namespace: namespace.RootNamespaceID,
-				}}}},
-			},
-			numMonths: 1,
-		},
-		{
-			name: "empty namespace and mount",
-			clients: &generation.Data{
-				Clients: &generation.Data_All{All: &generation.Clients{Clients: []*generation.Client{{}}}},
-			},
-			numMonths: 1,
-		},
-		{
-			name: "namespace doesn't exist",
-			clients: &generation.Data{
-				Clients: &generation.Data_All{All: &generation.Clients{Clients: []*generation.Client{{
-					Namespace: "abcd",
-				}}}},
-			},
-			wantError: true,
-			numMonths: 1,
-		},
-		{
-			name: "namespace exists, mount doesn't exist",
-			clients: &generation.Data{
-				Clients: &generation.Data_All{All: &generation.Clients{Clients: []*generation.Client{{
-					Namespace: namespace.RootNamespaceID,
-					Mount:     "mount",
-				}}}},
-			},
-			wantError: true,
-			numMonths: 1,
-		},
-		{
-			name: "older month",
-			clients: &generation.Data{
-				Month:   &generation.Data_MonthsAgo{MonthsAgo: 4},
-				Clients: &generation.Data_All{All: &generation.Clients{Clients: []*generation.Client{{}}}},
-			},
-			numMonths: 5,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			m := newMultipleMonthsActivityClients(tt.numMonths)
-			err := m.processMonth(context.Background(), core, tt.clients)
-			if tt.wantError {
-				require.Error(t, err)
-			} else {
-				require.NoError(t, err)
-				require.Len(t, m.months[tt.clients.GetMonthsAgo()].clients, len(tt.clients.GetAll().Clients))
-				for _, month := range m.months {
-					for _, c := range month.clients {
-						require.NotEmpty(t, c.NamespaceID)
-						require.NotEmpty(t, c.MountAccessor)
-					}
-				}
-			}
-		})
-	}
-}
-
-// Test_multipleMonthsActivityClients_processMonth_segmented verifies that segments
-// are filled correctly when a month is processed with segmented data. The clients
-// should be in the clients array, and should also be in the predefinedSegments map
-// at the correct segment index
-func Test_multipleMonthsActivityClients_processMonth_segmented(t *testing.T) {
-	index7 := int32(7)
-	data := &generation.Data{
-		Clients: &generation.Data_Segments{
-			Segments: &generation.Segments{
-				Segments: []*generation.Segment{
-					{
-						Clients: &generation.Clients{Clients: []*generation.Client{
-							{},
-						}},
-					},
-					{
-						Clients: &generation.Clients{Clients: []*generation.Client{{}}},
-					},
-					{
-						SegmentIndex: &index7,
-						Clients:      &generation.Clients{Clients: []*generation.Client{{}}},
-					},
-				},
-			},
-		},
-	}
-	m := newMultipleMonthsActivityClients(1)
-	core, _, _ := TestCoreUnsealed(t)
-	require.NoError(t, m.processMonth(context.Background(), core, data))
-	require.Len(t, m.months[0].predefinedSegments, 3)
-	require.Len(t, m.months[0].clients, 3)
-
-	// segment indexes are correct
-	require.Contains(t, m.months[0].predefinedSegments, 0)
-	require.Contains(t, m.months[0].predefinedSegments, 1)
-	require.Contains(t, m.months[0].predefinedSegments, 7)
-
-	// the data in each segment is correct
-	require.Contains(t, m.months[0].predefinedSegments[0], 0)
-	require.Contains(t, m.months[0].predefinedSegments[1], 1)
-	require.Contains(t, m.months[0].predefinedSegments[7], 2)
-}
-
-// Test_multipleMonthsActivityClients_addRepeatedClients adds repeated clients
-// from 1 month ago and 2 months ago, and verifies that the correct clients are
-// added based on namespace, mount, and non-entity attributes
-func Test_multipleMonthsActivityClients_addRepeatedClients(t *testing.T) {
-	m := newMultipleMonthsActivityClients(3)
-	defaultMount := "default"
-
-	require.NoError(t, m.addClientToMonth(2, &generation.Client{Count: 2}, "identity", nil))
-	require.NoError(t, m.addClientToMonth(2, &generation.Client{Count: 2, Namespace: "other_ns"}, defaultMount, nil))
-	require.NoError(t, m.addClientToMonth(1, &generation.Client{Count: 2}, defaultMount, nil))
-	require.NoError(t, m.addClientToMonth(1, &generation.Client{Count: 2, NonEntity: true}, defaultMount, nil))
-
-	month2Clients := m.months[2].clients
-	month1Clients := m.months[1].clients
-
-	thisMonth := m.months[0]
-	// this will match the first client in month 1
-	require.NoError(t, m.addRepeatedClients(0, &generation.Client{Count: 1, Repeated: true}, defaultMount, nil))
-	require.Contains(t, month1Clients, thisMonth.clients[0])
-
-	// this will match the 3rd client in month 1
-	require.NoError(t, m.addRepeatedClients(0, &generation.Client{Count: 1, Repeated: true, NonEntity: true}, defaultMount, nil))
-	require.Equal(t, month1Clients[2], thisMonth.clients[1])
-
-	// this will match the first two clients in month 1
-	require.NoError(t, m.addRepeatedClients(0, &generation.Client{Count: 2, Repeated: true}, defaultMount, nil))
-	require.Equal(t, month1Clients[0:2], thisMonth.clients[2:4])
-
-	// this will match the first client in month 2
-	require.NoError(t, m.addRepeatedClients(0, &generation.Client{Count: 1, RepeatedFromMonth: 2}, "identity", nil))
-	require.Equal(t, month2Clients[0], thisMonth.clients[4])
-
-	// this will match the 3rd client in month 2
-	require.NoError(t, m.addRepeatedClients(0, &generation.Client{Count: 1, RepeatedFromMonth: 2, Namespace: "other_ns"}, defaultMount, nil))
-	require.Equal(t, month2Clients[2], thisMonth.clients[5])
-
-	require.Error(t, m.addRepeatedClients(0, &generation.Client{Count: 1, RepeatedFromMonth: 2, Namespace: "other_ns"}, "other_mount", nil))
-}
-
-// Test_singleMonthActivityClients_populateSegments calls populateSegments for a
-// collection of 5 clients, segmented in various ways. The test ensures that the
-// resulting map has the correct clients for each segment index
-func Test_singleMonthActivityClients_populateSegments(t *testing.T) {
-	clients := []*activity.EntityRecord{
-		{ClientID: "a"},
-		{ClientID: "b"},
-		{ClientID: "c"},
-		{ClientID: "d"},
-		{ClientID: "e"},
-	}
-	cases := []struct {
-		name         string
-		segments     map[int][]int
-		numSegments  int
-		emptyIndexes []int32
-		skipIndexes  []int32
-		wantSegments map[int][]*activity.EntityRecord
-	}{
-		{
-			name: "segmented",
-			segments: map[int][]int{
-				0: {0, 1},
-				1: {2, 3},
-				2: {4},
-			},
-			wantSegments: map[int][]*activity.EntityRecord{
-				0: {{ClientID: "a"}, {ClientID: "b"}},
-				1: {{ClientID: "c"}, {ClientID: "d"}},
-				2: {{ClientID: "e"}},
-			},
-		},
-		{
-			name: "segmented with skip and empty",
-			segments: map[int][]int{
-				0: {0, 1},
-				2: {0, 1},
-			},
-			emptyIndexes: []int32{1, 4},
-			skipIndexes:  []int32{3},
-			wantSegments: map[int][]*activity.EntityRecord{
-				0: {{ClientID: "a"}, {ClientID: "b"}},
-				1: {},
-				2: {{ClientID: "a"}, {ClientID: "b"}},
-				3: nil,
-				4: {},
-			},
-		},
-		{
-			name:        "all clients",
-			numSegments: 0,
-			wantSegments: map[int][]*activity.EntityRecord{
-				0: {{ClientID: "a"}, {ClientID: "b"}, {ClientID: "c"}, {ClientID: "d"}, {ClientID: "e"}},
-			},
-		},
-		{
-			name:        "all clients split",
-			numSegments: 2,
-			wantSegments: map[int][]*activity.EntityRecord{
-				0: {{ClientID: "a"}, {ClientID: "b"}, {ClientID: "c"}},
-				1: {{ClientID: "d"}, {ClientID: "e"}},
-			},
-		},
-		{
-			name:         "all clients with skip and empty",
-			numSegments:  5,
-			skipIndexes:  []int32{0, 3},
-			emptyIndexes: []int32{2},
-			wantSegments: map[int][]*activity.EntityRecord{
-				0: nil,
-				1: {{ClientID: "a"}, {ClientID: "b"}, {ClientID: "c"}},
-				2: {},
-				3: nil,
-				4: {{ClientID: "d"}, {ClientID: "e"}},
-			},
-		},
-	}
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			s := singleMonthActivityClients{predefinedSegments: tc.segments, clients: clients, generationParameters: &generation.Data{EmptySegmentIndexes: tc.emptyIndexes, SkipSegmentIndexes: tc.skipIndexes, NumSegments: int32(tc.numSegments)}}
-			gotSegments, err := s.populateSegments()
-			require.NoError(t, err)
-			require.Equal(t, tc.wantSegments, gotSegments)
-		})
-	}
-}
-
-// Test_handleActivityWriteData writes 4 months of data splitting some months
-// across segments and using empty segments and skipped segments. Entities and
-// precomputed queries are written. written and then storage is queried. The
-// test verifies that the correct timestamps are present in the activity log and
-// that the correct segment numbers for each month contain the correct number of
-// clients
-func Test_handleActivityWriteData(t *testing.T) {
-	index5 := int32(5)
-	index4 := int32(4)
-	data := []*generation.Data{
-		{
-			// segments: 0:[x,y], 1:[z]
-			Month:       &generation.Data_MonthsAgo{MonthsAgo: 3},
-			Clients:     &generation.Data_All{All: &generation.Clients{Clients: []*generation.Client{{Count: 3}}}},
-			NumSegments: 2,
-		},
-		{
-			// segments: 1:[a,b,c], 2:[d,e]
-			Month:              &generation.Data_MonthsAgo{MonthsAgo: 2},
-			Clients:            &generation.Data_All{All: &generation.Clients{Clients: []*generation.Client{{Count: 5}}}},
-			NumSegments:        3,
-			SkipSegmentIndexes: []int32{0},
-		},
-		{
-			// segments: 5:[f,g]
-			Month: &generation.Data_MonthsAgo{MonthsAgo: 1},
-			Clients: &generation.Data_Segments{
-				Segments: &generation.Segments{Segments: []*generation.Segment{{
-					SegmentIndex: &index5,
-					Clients:      &generation.Clients{Clients: []*generation.Client{{Count: 2}}},
-				}}},
-			},
-		},
-		{
-			// segments: 1:[], 2:[], 4:[n], 5:[o]
-			Month:               &generation.Data_CurrentMonth{},
-			EmptySegmentIndexes: []int32{1, 2},
-			Clients: &generation.Data_Segments{
-				Segments: &generation.Segments{Segments: []*generation.Segment{
-					{
-						SegmentIndex: &index5,
-						Clients:      &generation.Clients{Clients: []*generation.Client{{Count: 1}}},
-					},
-					{
-						SegmentIndex: &index4,
-						Clients:      &generation.Clients{Clients: []*generation.Client{{Count: 1}}},
-					},
-				}},
-			},
-		},
-	}
-
-	t.Run("write entitites", func(t *testing.T) {
-		core, _, _ := TestCoreUnsealed(t)
-		marshaled, err := protojson.Marshal(&generation.ActivityLogMockInput{
-			Data:  data,
-			Write: []generation.WriteOptions{generation.WriteOptions_WRITE_ENTITIES},
-		})
-		require.NoError(t, err)
-		req := logical.TestRequest(t, logical.CreateOperation, "internal/counters/activity/write")
-		req.Data = map[string]interface{}{"input": string(marshaled)}
-		resp, err := core.systemBackend.HandleRequest(namespace.RootContext(nil), req)
-		require.NoError(t, err)
-		paths := resp.Data["paths"].([]string)
-		require.Len(t, paths, 9)
-
-		times, err := core.activityLog.availableLogs(context.Background())
-		require.NoError(t, err)
-		require.Len(t, times, 4)
-
-		sortPaths := func(monthPaths []string) {
-			sort.Slice(monthPaths, func(i, j int) bool {
-				iVal, _ := parseSegmentNumberFromPath(monthPaths[i])
-				jVal, _ := parseSegmentNumberFromPath(monthPaths[j])
-				return iVal < jVal
-			})
-		}
-
-		month0Paths := paths[0:4]
-		month1Paths := paths[4:5]
-		month2Paths := paths[5:7]
-		month3Paths := paths[7:9]
-		sortPaths(month0Paths)
-		sortPaths(month1Paths)
-		sortPaths(month2Paths)
-		sortPaths(month3Paths)
-		entities := func(paths []string) map[int][]*activity.EntityRecord {
-			segments := make(map[int][]*activity.EntityRecord)
-			for _, path := range paths {
-				segmentNum, _ := parseSegmentNumberFromPath(path)
-				entry, err := core.activityLog.view.Get(context.Background(), path)
-				require.NoError(t, err)
-				if entry == nil {
-					segments[segmentNum] = []*activity.EntityRecord{}
-					continue
-				}
-				activities := &activity.EntityActivityLog{}
-				err = proto.Unmarshal(entry.Value, activities)
-				require.NoError(t, err)
-				segments[segmentNum] = activities.Clients
-			}
-			return segments
-		}
-		month0Entities := entities(month0Paths)
-		require.Len(t, month0Entities, 4)
-		require.Contains(t, month0Entities, 1)
-		require.Contains(t, month0Entities, 2)
-		require.Contains(t, month0Entities, 4)
-		require.Contains(t, month0Entities, 5)
-		require.Len(t, month0Entities[1], 0)
-		require.Len(t, month0Entities[2], 0)
-		require.Len(t, month0Entities[4], 1)
-		require.Len(t, month0Entities[5], 1)
-
-		month1Entities := entities(month1Paths)
-		require.Len(t, month1Entities, 1)
-		require.Contains(t, month1Entities, 5)
-		require.Len(t, month1Entities[5], 2)
-
-		month2Entities := entities(month2Paths)
-		require.Len(t, month2Entities, 2)
-		require.Contains(t, month2Entities, 1)
-		require.Contains(t, month2Entities, 2)
-		require.Len(t, month2Entities[1], 3)
-		require.Len(t, month2Entities[2], 2)
-
-		month3Entities := entities(month3Paths)
-		require.Len(t, month3Entities, 2)
-		require.Contains(t, month3Entities, 0)
-		require.Contains(t, month3Entities, 1)
-		require.Len(t, month3Entities[0], 2)
-		require.Len(t, month3Entities[1], 1)
-	})
-	t.Run("write precomputed queries", func(t *testing.T) {
-		core, _, _ := TestCoreUnsealed(t)
-		marshaled, err := protojson.Marshal(&generation.ActivityLogMockInput{
-			Data:  data,
-			Write: []generation.WriteOptions{generation.WriteOptions_WRITE_PRECOMPUTED_QUERIES},
-		})
-		require.NoError(t, err)
-		req := logical.TestRequest(t, logical.CreateOperation, "internal/counters/activity/write")
-		req.Data = map[string]interface{}{"input": string(marshaled)}
-		_, err = core.systemBackend.HandleRequest(namespace.RootContext(nil), req)
-		require.NoError(t, err)
-
-		queries, err := core.activityLog.queryStore.QueriesAvailable(context.Background())
-		require.NoError(t, err)
-		require.True(t, queries)
-
-		now := time.Now().UTC()
-		start := timeutil.StartOfMonth(timeutil.MonthsPreviousTo(3, now))
-		end := timeutil.EndOfMonth(now)
-		pq, err := core.activityLog.queryStore.Get(context.Background(), start, end)
-		require.NoError(t, err)
-		require.NotNil(t, pq)
-		require.Equal(t, end, pq.EndTime)
-		require.Equal(t, start, pq.StartTime)
-		require.Len(t, pq.Namespaces, 1)
-		require.Equal(t, uint64(12), pq.Namespaces[0].Entities)
-		require.Len(t, pq.Months, 4)
-	})
-}
diff --git a/vault/logical_system_helpers.go b/vault/logical_system_helpers.go
index c702b39ae000c..c9f03e5679845 100644
--- a/vault/logical_system_helpers.go
+++ b/vault/logical_system_helpers.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -16,11 +13,6 @@ import (
 	"github.com/hashicorp/vault/sdk/logical"
 )
 
-type enterprisePathStub struct {
-	parameters []string
-	operations []logical.Operation
-}
-
 var (
 	invalidateMFAConfig                      = func(context.Context, *SystemBackend, string) {}
 	invalidateLoginMFAConfig                 = func(context.Context, *SystemBackend, string) {}
@@ -65,174 +57,22 @@ var (
 		}
 	}
 
-	entPaths     = entStubPaths
-	entStubPaths = func(b *SystemBackend) []*framework.Path {
-		buildEnterpriseOnlyPaths := func(paths map[string]enterprisePathStub) []*framework.Path {
-			var results []*framework.Path
-			for pattern, pathSpec := range paths {
-				path := &framework.Path{
-					Pattern:    pattern,
-					Operations: make(map[logical.Operation]framework.OperationHandler),
-					Fields:     make(map[string]*framework.FieldSchema),
-				}
-
-				for _, parameter := range pathSpec.parameters {
-					path.Fields[parameter] = &framework.FieldSchema{
-						Type:     framework.TypeString,
-						Required: true,
-					}
-				}
-
-				for _, operation := range pathSpec.operations {
-					path.Operations[operation] = &framework.PathOperation{
-						Callback: func(context.Context, *logical.Request, *framework.FieldData) (*logical.Response, error) {
-							return logical.ErrorResponse("enterprise-only feature"), logical.ErrUnsupportedPath
-						},
-					}
-				}
-
-				results = append(results, path)
-			}
-
-			return results
-		}
-
-		var paths []*framework.Path
-
-		// license paths
-		paths = append(paths, buildEnterpriseOnlyPaths(map[string]enterprisePathStub{
-			"license/status$": {operations: []logical.Operation{logical.ReadOperation}},
-		})...)
-
-		// group-policy-application paths
-		paths = append(paths, buildEnterpriseOnlyPaths(map[string]enterprisePathStub{
-			"config/group-policy-application$": {operations: []logical.Operation{logical.ReadOperation, logical.UpdateOperation}},
-		})...)
-
-		// namespaces paths
-		paths = append(paths, buildEnterpriseOnlyPaths(map[string]enterprisePathStub{
-			"namespaces/?$": {operations: []logical.Operation{logical.ListOperation}},
-			"namespaces/api-lock/lock" + framework.OptionalParamRegex("path"):   {parameters: []string{"path"}, operations: []logical.Operation{logical.UpdateOperation}},
-			"namespaces/api-lock/unlock" + framework.OptionalParamRegex("path"): {parameters: []string{"path"}, operations: []logical.Operation{logical.UpdateOperation}},
-			"namespaces/(?P<path>.+?)": {parameters: []string{"path"}, operations: []logical.Operation{logical.DeleteOperation, logical.PatchOperation, logical.ReadOperation, logical.UpdateOperation}},
-		})...)
-
-		// replication paths
-		paths = append(paths, buildEnterpriseOnlyPaths(map[string]enterprisePathStub{
-			"replication/performance/primary/enable":                                               {operations: []logical.Operation{logical.UpdateOperation}},
-			"replication/dr/primary/enable":                                                        {operations: []logical.Operation{logical.UpdateOperation}},
-			"replication/performance/primary/demote":                                               {operations: []logical.Operation{logical.UpdateOperation}},
-			"replication/dr/primary/demote":                                                        {operations: []logical.Operation{logical.UpdateOperation}},
-			"replication/performance/primary/disable":                                              {operations: []logical.Operation{logical.UpdateOperation}},
-			"replication/dr/primary/disable":                                                       {operations: []logical.Operation{logical.UpdateOperation}},
-			"replication/performance/primary/secondary-token":                                      {operations: []logical.Operation{logical.UpdateOperation}},
-			"replication/dr/primary/secondary-token":                                               {operations: []logical.Operation{logical.UpdateOperation}},
-			"replication/performance/primary/revoke-secondary":                                     {operations: []logical.Operation{logical.UpdateOperation}},
-			"replication/dr/primary/revoke-secondary":                                              {operations: []logical.Operation{logical.UpdateOperation}},
-			"replication/performance/secondary/generate-public-key":                                {operations: []logical.Operation{logical.UpdateOperation}},
-			"replication/dr/secondary/generate-public-key":                                         {operations: []logical.Operation{logical.UpdateOperation}},
-			"replication/performance/secondary/enable":                                             {operations: []logical.Operation{logical.UpdateOperation}},
-			"replication/dr/secondary/enable":                                                      {operations: []logical.Operation{logical.UpdateOperation}},
-			"replication/performance/secondary/promote":                                            {operations: []logical.Operation{logical.UpdateOperation}},
-			"replication/dr/secondary/promote":                                                     {operations: []logical.Operation{logical.UpdateOperation}},
-			"replication/performance/secondary/disable":                                            {operations: []logical.Operation{logical.UpdateOperation}},
-			"replication/dr/secondary/disable":                                                     {operations: []logical.Operation{logical.UpdateOperation}},
-			"replication/dr/secondary/operation-token/delete":                                      {operations: []logical.Operation{logical.UpdateOperation}},
-			"replication/performance/secondary/update-primary":                                     {operations: []logical.Operation{logical.UpdateOperation}},
-			"replication/dr/secondary/update-primary":                                              {operations: []logical.Operation{logical.UpdateOperation}},
-			"replication/dr/secondary/license/status":                                              {operations: []logical.Operation{logical.ReadOperation}},
-			"replication/dr/secondary/config/reload/(?P<subsystem>.+)":                             {parameters: []string{"subsystem"}, operations: []logical.Operation{logical.UpdateOperation}},
-			"replication/recover":                                                                  {operations: []logical.Operation{logical.UpdateOperation}},
-			"replication/dr/secondary/recover":                                                     {operations: []logical.Operation{logical.UpdateOperation}},
-			"replication/dr/secondary/reindex":                                                     {operations: []logical.Operation{logical.UpdateOperation}},
-			"replication/reindex":                                                                  {operations: []logical.Operation{logical.UpdateOperation}},
-			"replication/dr/status":                                                                {operations: []logical.Operation{logical.ReadOperation}},
-			"replication/performance/status":                                                       {operations: []logical.Operation{logical.ReadOperation}},
-			"replication/primary/enable":                                                           {operations: []logical.Operation{logical.UpdateOperation}},
-			"replication/primary/demote":                                                           {operations: []logical.Operation{logical.UpdateOperation}},
-			"replication/primary/disable":                                                          {operations: []logical.Operation{logical.UpdateOperation}},
-			"replication/primary/secondary-token":                                                  {operations: []logical.Operation{logical.UpdateOperation}},
-			"replication/performance/primary/paths-filter/" + framework.GenericNameRegex("id"):     {parameters: []string{"id"}, operations: []logical.Operation{logical.DeleteOperation, logical.ReadOperation, logical.UpdateOperation}},
-			"replication/performance/primary/dynamic-filter/" + framework.GenericNameRegex("id"):   {parameters: []string{"id"}, operations: []logical.Operation{logical.ReadOperation}},
-			"replication/primary/revoke-secondary":                                                 {operations: []logical.Operation{logical.UpdateOperation}},
-			"replication/secondary/enable":                                                         {operations: []logical.Operation{logical.UpdateOperation}},
-			"replication/secondary/promote":                                                        {operations: []logical.Operation{logical.UpdateOperation}},
-			"replication/secondary/disable":                                                        {operations: []logical.Operation{logical.UpdateOperation}},
-			"replication/secondary/update-primary":                                                 {operations: []logical.Operation{logical.UpdateOperation}},
-			"replication/performance/secondary/dynamic-filter/" + framework.GenericNameRegex("id"): {parameters: []string{"id"}, operations: []logical.Operation{logical.ReadOperation}},
-		})...)
-		// This path, though an enterprise path, has always been handled in OSS.
-		paths = append(paths, &framework.Path{
-			Pattern: "replication/status",
-			Callbacks: map[logical.Operation]framework.OperationFunc{
-				logical.ReadOperation: func(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
-					resp := &logical.Response{
-						Data: map[string]interface{}{
-							"mode": "disabled",
-						},
-					}
-					return resp, nil
+	entPaths = func(b *SystemBackend) []*framework.Path {
+		return []*framework.Path{
+			{
+				Pattern: "replication/status",
+				Callbacks: map[logical.Operation]framework.OperationFunc{
+					logical.ReadOperation: func(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
+						resp := &logical.Response{
+							Data: map[string]interface{}{
+								"mode": "disabled",
+							},
+						}
+						return resp, nil
+					},
 				},
 			},
-		})
-
-		// seal paths
-		paths = append(paths, buildEnterpriseOnlyPaths(map[string]enterprisePathStub{
-			"sealwrap/rewrap": {operations: []logical.Operation{logical.ReadOperation, logical.UpdateOperation}},
-		})...)
-
-		// mfa paths
-		paths = append(paths, buildEnterpriseOnlyPaths(map[string]enterprisePathStub{
-			"mfa/method/?": {operations: []logical.Operation{logical.ListOperation}},
-			"mfa/method/totp/" + framework.GenericNameRegex("name") + "/generate$":       {parameters: []string{"name"}, operations: []logical.Operation{logical.ReadOperation}},
-			"mfa/method/totp/" + framework.GenericNameRegex("name") + "/admin-generate$": {parameters: []string{"name"}, operations: []logical.Operation{logical.UpdateOperation}},
-			"mfa/method/totp/" + framework.GenericNameRegex("name") + "/admin-destroy$":  {parameters: []string{"name"}, operations: []logical.Operation{logical.UpdateOperation}},
-			"mfa/method/totp/" + framework.GenericNameRegex("name"):                      {parameters: []string{"name"}, operations: []logical.Operation{logical.DeleteOperation, logical.ReadOperation, logical.UpdateOperation}},
-			"mfa/method/okta/" + framework.GenericNameRegex("name"):                      {parameters: []string{"name"}, operations: []logical.Operation{logical.DeleteOperation, logical.ReadOperation, logical.UpdateOperation}},
-			"mfa/method/duo/" + framework.GenericNameRegex("name"):                       {parameters: []string{"name"}, operations: []logical.Operation{logical.DeleteOperation, logical.ReadOperation, logical.UpdateOperation}},
-			"mfa/method/pingid/" + framework.GenericNameRegex("name"):                    {parameters: []string{"name"}, operations: []logical.Operation{logical.DeleteOperation, logical.ReadOperation, logical.UpdateOperation}},
-		})...)
-
-		// control-group paths
-		paths = append(paths, buildEnterpriseOnlyPaths(map[string]enterprisePathStub{
-			"control-group/authorize": {operations: []logical.Operation{logical.UpdateOperation}},
-			"control-group/request":   {operations: []logical.Operation{logical.UpdateOperation}},
-			"config/control-group":    {operations: []logical.Operation{logical.DeleteOperation, logical.ReadOperation, logical.UpdateOperation}},
-		})...)
-
-		// sentinel paths
-		paths = append(paths, buildEnterpriseOnlyPaths(map[string]enterprisePathStub{
-			"policies/rgp/?$":           {operations: []logical.Operation{logical.ListOperation}},
-			"policies/rgp/(?P<name>.+)": {parameters: []string{"name"}, operations: []logical.Operation{logical.DeleteOperation, logical.ReadOperation, logical.UpdateOperation}},
-			"policies/egp/?$":           {operations: []logical.Operation{logical.ListOperation}},
-			"policies/egp/(?P<name>.+)": {parameters: []string{"name"}, operations: []logical.Operation{logical.DeleteOperation, logical.ReadOperation, logical.UpdateOperation}},
-		})...)
-
-		// plugins reload status paths
-		paths = append(paths, buildEnterpriseOnlyPaths(map[string]enterprisePathStub{
-			"plugins/reload/backend/status$": {operations: []logical.Operation{logical.ReadOperation}},
-		})...)
-
-		// quotas paths
-		paths = append(paths, buildEnterpriseOnlyPaths(map[string]enterprisePathStub{
-			"quotas/lease-count/?$": {operations: []logical.Operation{logical.ListOperation}},
-			"quotas/lease-count/" + framework.GenericNameRegex("name"): {parameters: []string{"name"}, operations: []logical.Operation{logical.DeleteOperation, logical.ReadOperation, logical.UpdateOperation}},
-		})...)
-
-		// raft auto-snapshot paths
-		paths = append(paths, buildEnterpriseOnlyPaths(map[string]enterprisePathStub{
-			"storage/raft/snapshot-auto/config/":                                      {operations: []logical.Operation{logical.ListOperation}},
-			"storage/raft/snapshot-auto/config/" + framework.GenericNameRegex("name"): {parameters: []string{"name"}, operations: []logical.Operation{logical.DeleteOperation, logical.ReadOperation, logical.UpdateOperation}},
-			"storage/raft/snapshot-auto/status/" + framework.GenericNameRegex("name"): {parameters: []string{"name"}, operations: []logical.Operation{logical.ReadOperation}},
-		})...)
-
-		paths = append(paths, buildEnterpriseOnlyPaths(map[string]enterprisePathStub{
-			"managed-keys/" + framework.GenericNameRegex("type") + "/?":                                                    {parameters: []string{"type"}, operations: []logical.Operation{logical.ListOperation}},
-			"managed-keys/" + framework.GenericNameRegex("type") + "/" + framework.GenericNameRegex("name"):                {parameters: []string{"type", "name"}, operations: []logical.Operation{logical.CreateOperation, logical.DeleteOperation, logical.ReadOperation, logical.UpdateOperation}},
-			"managed-keys/" + framework.GenericNameRegex("type") + "/" + framework.GenericNameRegex("name") + "/test/sign": {parameters: []string{"type", "name"}, operations: []logical.Operation{logical.CreateOperation, logical.UpdateOperation}},
-		})...)
-
-		return paths
+		}
 	}
 	handleGlobalPluginReload = func(context.Context, *Core, string, string, []string) error {
 		return nil
diff --git a/vault/logical_system_integ_test.go b/vault/logical_system_integ_test.go
index 58a131ad953d6..c04ccbf6b9549 100644
--- a/vault/logical_system_integ_test.go
+++ b/vault/logical_system_integ_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault_test
 
 import (
@@ -11,19 +8,22 @@ import (
 	"github.com/go-test/deep"
 	"github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/vault/api"
-	"github.com/hashicorp/vault/helper/testhelpers/corehelpers"
-	"github.com/hashicorp/vault/helper/testhelpers/minimal"
 	vaulthttp "github.com/hashicorp/vault/http"
 	"github.com/hashicorp/vault/sdk/helper/logging"
 	"github.com/hashicorp/vault/sdk/physical"
 	"github.com/hashicorp/vault/sdk/physical/inmem"
+	"github.com/hashicorp/vault/sdk/version"
 	"github.com/hashicorp/vault/vault"
-	"github.com/hashicorp/vault/version"
 )
 
 func TestSystemBackend_InternalUIResultantACL(t *testing.T) {
 	t.Parallel()
-	cluster := minimal.NewTestSoloCluster(t, nil)
+	cluster := vault.NewTestCluster(t, nil, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+		NumCores:    1,
+	})
+	cluster.Start()
+	defer cluster.Cleanup()
 	client := cluster.Cores[0].Client
 
 	resp, err := client.Auth().Token().Create(&api.TokenCreateRequest{
@@ -169,7 +169,7 @@ func TestSystemBackend_HAStatus(t *testing.T) {
 	cluster.Start()
 	defer cluster.Cleanup()
 
-	corehelpers.RetryUntil(t, 15*time.Second, func() error {
+	vault.RetryUntil(t, 15*time.Second, func() error {
 		// Use standby deliberately to make sure it forwards
 		client := cluster.Cores[1].Client
 		resp, err := client.Sys().HAStatus()
@@ -189,7 +189,12 @@ func TestSystemBackend_HAStatus(t *testing.T) {
 // authenticated and thus a 403 response is expected.
 func TestSystemBackend_VersionHistory_unauthenticated(t *testing.T) {
 	t.Parallel()
-	cluster := minimal.NewTestSoloCluster(t, nil)
+	cluster := vault.NewTestCluster(t, nil, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+		NumCores:    1,
+	})
+	cluster.Start()
+	defer cluster.Cleanup()
 	client := cluster.Cores[0].Client
 
 	client.SetToken("")
@@ -214,7 +219,12 @@ func TestSystemBackend_VersionHistory_unauthenticated(t *testing.T) {
 // core/versions storage entries, a single version entry should exist.
 func TestSystemBackend_VersionHistory_authenticated(t *testing.T) {
 	t.Parallel()
-	cluster := minimal.NewTestSoloCluster(t, nil)
+	cluster := vault.NewTestCluster(t, nil, &vault.TestClusterOptions{
+		HandlerFunc: vaulthttp.Handler,
+		NumCores:    1,
+	})
+	cluster.Start()
+	defer cluster.Cleanup()
 	client := cluster.Cores[0].Client
 
 	resp, err := client.Logical().List("sys/version-history")
diff --git a/vault/logical_system_paths.go b/vault/logical_system_paths.go
index ea3bc35ed34a8..939de210fc65d 100644
--- a/vault/logical_system_paths.go
+++ b/vault/logical_system_paths.go
@@ -1,10 +1,6 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
-	"net/http"
 	"strings"
 
 	"github.com/hashicorp/vault/sdk/framework"
@@ -16,10 +12,6 @@ func (b *SystemBackend) configPaths() []*framework.Path {
 		{
 			Pattern: "config/cors$",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "cors",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"enable": {
 					Type:        framework.TypeBool,
@@ -37,57 +29,18 @@ func (b *SystemBackend) configPaths() []*framework.Path {
 
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
-					Callback: b.handleCORSRead,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationSuffix: "configuration",
-					},
+					Callback:    b.handleCORSRead,
 					Summary:     "Return the current CORS settings.",
 					Description: "",
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"enabled": {
-									Type:     framework.TypeBool,
-									Required: true,
-								},
-								"allowed_origins": {
-									Type:     framework.TypeCommaStringSlice,
-									Required: false,
-								},
-								"allowed_headers": {
-									Type:     framework.TypeCommaStringSlice,
-									Required: false,
-								},
-							},
-						}},
-					},
 				},
 				logical.UpdateOperation: &framework.PathOperation{
-					Callback: b.handleCORSUpdate,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb: "configure",
-					},
+					Callback:    b.handleCORSUpdate,
 					Summary:     "Configure the CORS settings.",
 					Description: "",
-					Responses: map[int][]framework.Response{
-						http.StatusNoContent: {{
-							Description: "OK",
-						}},
-					},
 				},
 				logical.DeleteOperation: &framework.PathOperation{
 					Callback: b.handleCORSDelete,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "delete",
-						OperationSuffix: "configuration",
-					},
-					Summary: "Remove any CORS settings.",
-					Responses: map[int][]framework.Response{
-						http.StatusNoContent: {{
-							Description: "OK",
-						}},
-					},
+					Summary:  "Remove any CORS settings.",
 				},
 			},
 
@@ -99,20 +52,9 @@ func (b *SystemBackend) configPaths() []*framework.Path {
 			Pattern: "config/state/sanitized$",
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
-					Callback: b.handleConfigStateSanitized,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "read",
-						OperationSuffix: "sanitized-configuration-state",
-					},
+					Callback:    b.handleConfigStateSanitized,
 					Summary:     "Return a sanitized version of the Vault server configuration.",
 					Description: "The sanitized output strips configuration values in the storage, HA storage, and seals stanzas, which may contain sensitive values such as API tokens. It also removes any token or secret fields in other stanzas, such as the circonus_api_token from telemetry.",
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							// response has dynamic keys
-							Fields: map[string]*framework.FieldSchema{},
-						}},
-					},
 				},
 			},
 		},
@@ -127,18 +69,9 @@ func (b *SystemBackend) configPaths() []*framework.Path {
 			},
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.UpdateOperation: &framework.PathOperation{
-					Callback: b.handleConfigReload,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "reload",
-						OperationSuffix: "subsystem",
-					},
+					Callback:    b.handleConfigReload,
 					Summary:     "Reload the given subsystem",
 					Description: "",
-					Responses: map[int][]framework.Response{
-						http.StatusNoContent: {{
-							Description: "OK",
-						}},
-					},
 				},
 			},
 		},
@@ -146,10 +79,6 @@ func (b *SystemBackend) configPaths() []*framework.Path {
 		{
 			Pattern: "config/ui/headers/" + framework.GenericNameRegex("header"),
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "ui-headers",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"header": {
 					Type:        framework.TypeString,
@@ -168,54 +97,15 @@ func (b *SystemBackend) configPaths() []*framework.Path {
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
 					Callback: b.handleConfigUIHeadersRead,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "read",
-						OperationSuffix: "configuration",
-					},
-					Summary: "Return the given UI header's configuration",
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"value": {
-									Type:        framework.TypeString,
-									Required:    false,
-									Description: "returns the first header value when `multivalue` request parameter is false",
-								},
-								"values": {
-									Type:        framework.TypeCommaStringSlice,
-									Required:    false,
-									Description: "returns all header values when `multivalue` request parameter is true",
-								},
-							},
-						}},
-					},
+					Summary:  "Return the given UI header's configuration",
 				},
 				logical.UpdateOperation: &framework.PathOperation{
 					Callback: b.handleConfigUIHeadersUpdate,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb: "configure",
-					},
-					Summary: "Configure the values to be returned for the UI header.",
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							// returns 200 with null `data`
-							Description: "OK",
-						}},
-					},
+					Summary:  "Configure the values to be returned for the UI header.",
 				},
 				logical.DeleteOperation: &framework.PathOperation{
 					Callback: b.handleConfigUIHeadersDelete,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "delete",
-						OperationSuffix: "configuration",
-					},
-					Summary: "Remove a UI header.",
-					Responses: map[int][]framework.Response{
-						http.StatusNoContent: {{
-							Description: "OK",
-						}},
-					},
+					Summary:  "Remove a UI header.",
 				},
 			},
 
@@ -229,22 +119,7 @@ func (b *SystemBackend) configPaths() []*framework.Path {
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ListOperation: &framework.PathOperation{
 					Callback: b.handleConfigUIHeadersList,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationPrefix: "ui-headers",
-						OperationVerb:   "list",
-					},
-					Summary: "Return a list of configured UI headers.",
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Fields: map[string]*framework.FieldSchema{
-								"keys": {
-									Type:        framework.TypeCommaStringSlice,
-									Description: "Lists of configured UI headers. Omitted if list is empty",
-									Required:    false,
-								},
-							},
-						}},
-					},
+					Summary:  "Return a list of configured UI headers.",
 				},
 			},
 
@@ -254,139 +129,22 @@ func (b *SystemBackend) configPaths() []*framework.Path {
 
 		{
 			Pattern: "generate-root(/attempt)?$",
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "root-token-generation",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"pgp_key": {
 					Type:        framework.TypeString,
 					Description: "Specifies a base64-encoded PGP public key.",
 				},
 			},
-
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "read",
-						OperationSuffix: "progress2|progress",
-					},
 					Summary: "Read the configuration and progress of the current root generation attempt.",
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"nonce": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"started": {
-									Type:     framework.TypeBool,
-									Required: true,
-								},
-								"progress": {
-									Type:     framework.TypeInt,
-									Required: true,
-								},
-								"required": {
-									Type:     framework.TypeInt,
-									Required: true,
-								},
-								"complete": {
-									Type:     framework.TypeBool,
-									Required: true,
-								},
-								"encoded_token": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"encoded_root_token": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"pgp_fingerprint": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"otp": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"otp_length": {
-									Type:     framework.TypeInt,
-									Required: true,
-								},
-							},
-						}},
-					},
 				},
 				logical.UpdateOperation: &framework.PathOperation{
-					Summary: "Initializes a new root generation attempt.",
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "initialize",
-						OperationSuffix: "2|",
-					},
+					Summary:     "Initializes a new root generation attempt.",
 					Description: "Only a single root generation attempt can take place at a time. One (and only one) of otp or pgp_key are required.",
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"nonce": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"started": {
-									Type:     framework.TypeBool,
-									Required: true,
-								},
-								"progress": {
-									Type:     framework.TypeInt,
-									Required: true,
-								},
-								"required": {
-									Type:     framework.TypeInt,
-									Required: true,
-								},
-								"complete": {
-									Type:     framework.TypeBool,
-									Required: true,
-								},
-								"encoded_token": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"encoded_root_token": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"pgp_fingerprint": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"otp": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"otp_length": {
-									Type:     framework.TypeInt,
-									Required: true,
-								},
-							},
-						}},
-					},
 				},
 				logical.DeleteOperation: &framework.PathOperation{
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "cancel",
-						OperationSuffix: "2|",
-					},
 					Summary: "Cancels any in-progress root generation attempt.",
-					Responses: map[int][]framework.Response{
-						http.StatusNoContent: {{
-							Description: "OK",
-						}},
-					},
 				},
 			},
 
@@ -407,91 +165,14 @@ func (b *SystemBackend) configPaths() []*framework.Path {
 			},
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.UpdateOperation: &framework.PathOperation{
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationPrefix: "root-token-generation",
-						OperationVerb:   "update",
-					},
 					Summary:     "Enter a single unseal key share to progress the root generation attempt.",
 					Description: "If the threshold number of unseal key shares is reached, Vault will complete the root generation and issue the new token. Otherwise, this API must be called multiple times until that threshold is met. The attempt nonce must be provided with each call.",
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"nonce": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"started": {
-									Type:     framework.TypeBool,
-									Required: true,
-								},
-								"progress": {
-									Type:     framework.TypeInt,
-									Required: true,
-								},
-								"required": {
-									Type:     framework.TypeInt,
-									Required: true,
-								},
-								"complete": {
-									Type:     framework.TypeBool,
-									Required: true,
-								},
-								"encoded_token": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"encoded_root_token": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"pgp_fingerprint": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"otp": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"otp_length": {
-									Type:     framework.TypeInt,
-									Required: true,
-								},
-							},
-						}},
-					},
 				},
 			},
 
 			HelpSynopsis:    strings.TrimSpace(sysHelp["generate-root"][0]),
 			HelpDescription: strings.TrimSpace(sysHelp["generate-root"][1]),
 		},
-		{
-			Pattern: "decode-token$",
-			Fields: map[string]*framework.FieldSchema{
-				"encoded_token": {
-					Type:        framework.TypeString,
-					Description: "Specifies the encoded token (result from generate-root).",
-				},
-				"otp": {
-					Type:        framework.TypeString,
-					Description: "Specifies the otp code for decode.",
-				},
-			},
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.UpdateOperation: &framework.PathOperation{
-					Callback: b.handleGenerateRootDecodeTokenUpdate,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb: "decode",
-					},
-					Summary: "Decodes the encoded token with the otp.",
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{Description: "OK"}},
-					},
-				},
-			},
-		},
-
 		{
 			Pattern: "health$",
 			Fields: map[string]*framework.FieldSchema{
@@ -530,10 +211,6 @@ func (b *SystemBackend) configPaths() []*framework.Path {
 			},
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "read",
-						OperationSuffix: "health-status",
-					},
 					Summary: "Returns the health status of Vault.",
 					Responses: map[int][]framework.Response{
 						200: {{Description: "initialized, unsealed, and active"}},
@@ -587,16 +264,9 @@ func (b *SystemBackend) configPaths() []*framework.Path {
 			},
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "read",
-						OperationSuffix: "initialization-status",
-					},
 					Summary: "Returns the initialization status of Vault.",
 				},
 				logical.UpdateOperation: &framework.PathOperation{
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb: "initialize",
-					},
 					Summary:     "Initialize a new Vault.",
 					Description: "The Vault must not have been previously initialized. The recovery options, as well as the stored shares option, are only available when using Vault HSM.",
 				},
@@ -610,10 +280,6 @@ func (b *SystemBackend) configPaths() []*framework.Path {
 
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.UpdateOperation: &framework.PathOperation{
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "step-down",
-						OperationSuffix: "leader",
-					},
 					Summary:     "Cause the node to give up active status.",
 					Description: "This endpoint forces the node to give up active status. If the node does not have active status, this endpoint does nothing. Note that the node will sleep for ten seconds before attempting to grab the active lock again, but if no standby nodes grab the active lock in the interim, the same node may become the active node again.",
 					Responses: map[int][]framework.Response{
@@ -624,9 +290,6 @@ func (b *SystemBackend) configPaths() []*framework.Path {
 		},
 		{
 			Pattern: "loggers$",
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "loggers",
-			},
 			Fields: map[string]*framework.FieldSchema{
 				"level": {
 					Type: framework.TypeString,
@@ -637,50 +300,20 @@ func (b *SystemBackend) configPaths() []*framework.Path {
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
 					Callback: b.handleLoggersRead,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "read",
-						OperationSuffix: "verbosity-level",
-					},
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-						}},
-					},
-					Summary: "Read the log level for all existing loggers.",
+					Summary:  "Read the log level for all existing loggers.",
 				},
 				logical.UpdateOperation: &framework.PathOperation{
 					Callback: b.handleLoggersWrite,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "update",
-						OperationSuffix: "verbosity-level",
-					},
-					Responses: map[int][]framework.Response{
-						http.StatusNoContent: {{
-							Description: "OK",
-						}},
-					},
-					Summary: "Modify the log level for all existing loggers.",
+					Summary:  "Modify the log level for all existing loggers.",
 				},
 				logical.DeleteOperation: &framework.PathOperation{
 					Callback: b.handleLoggersDelete,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "revert",
-						OperationSuffix: "verbosity-level",
-					},
-					Responses: map[int][]framework.Response{
-						http.StatusNoContent: {{
-							Description: "OK",
-						}},
-					},
-					Summary: "Revert the all loggers to use log level provided in config.",
+					Summary:  "Revert the all loggers to use log level provided in config.",
 				},
 			},
 		},
 		{
 			Pattern: "loggers/" + framework.MatchAllRegex("name"),
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "loggers",
-			},
 			Fields: map[string]*framework.FieldSchema{
 				"name": {
 					Type:        framework.TypeString,
@@ -695,42 +328,15 @@ func (b *SystemBackend) configPaths() []*framework.Path {
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
 					Callback: b.handleLoggersByNameRead,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "read",
-						OperationSuffix: "verbosity-level-for",
-					},
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-						}},
-					},
-					Summary: "Read the log level for a single logger.",
+					Summary:  "Read the log level for a single logger.",
 				},
 				logical.UpdateOperation: &framework.PathOperation{
 					Callback: b.handleLoggersByNameWrite,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "update",
-						OperationSuffix: "verbosity-level-for",
-					},
-					Responses: map[int][]framework.Response{
-						http.StatusNoContent: {{
-							Description: "OK",
-						}},
-					},
-					Summary: "Modify the log level of a single logger.",
+					Summary:  "Modify the log level of a single logger.",
 				},
 				logical.DeleteOperation: &framework.PathOperation{
 					Callback: b.handleLoggersByNameDelete,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "revert",
-						OperationSuffix: "verbosity-level-for",
-					},
-					Responses: map[int][]framework.Response{
-						http.StatusNoContent: {{
-							Description: "OK",
-						}},
-					},
-					Summary: "Revert a single logger to use log level provided in config.",
+					Summary:  "Revert a single logger to use log level provided in config.",
 				},
 			},
 		},
@@ -738,55 +344,10 @@ func (b *SystemBackend) configPaths() []*framework.Path {
 }
 
 func (b *SystemBackend) rekeyPaths() []*framework.Path {
-	respFields := map[string]*framework.FieldSchema{
-		"nounce": {
-			Type:     framework.TypeString,
-			Required: true,
-		},
-		"started": {
-			Type:     framework.TypeString,
-			Required: true,
-		},
-		"t": {
-			Type:     framework.TypeInt,
-			Required: true,
-		},
-		"n": {
-			Type:     framework.TypeInt,
-			Required: true,
-		},
-		"progress": {
-			Type:     framework.TypeInt,
-			Required: true,
-		},
-		"required": {
-			Type:     framework.TypeInt,
-			Required: true,
-		},
-		"verification_required": {
-			Type:     framework.TypeBool,
-			Required: true,
-		},
-		"verification_nonce": {
-			Type:     framework.TypeString,
-			Required: true,
-		},
-		"backup": {
-			Type: framework.TypeBool,
-		},
-		"pgp_fingerprints": {
-			Type: framework.TypeCommaStringSlice,
-		},
-	}
-
 	return []*framework.Path{
 		{
 			Pattern: "rekey/init",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "rekey-attempt",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"secret_shares": {
 					Type:        framework.TypeInt,
@@ -812,40 +373,13 @@ func (b *SystemBackend) rekeyPaths() []*framework.Path {
 
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "read",
-						OperationSuffix: "progress",
-					},
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields:      respFields,
-						}},
-					},
 					Summary: "Reads the configuration and progress of the current rekey attempt.",
 				},
 				logical.UpdateOperation: &framework.PathOperation{
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb: "initialize",
-					},
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields:      respFields,
-						}},
-					},
 					Summary:     "Initializes a new rekey attempt.",
 					Description: "Only a single rekey attempt can take place at a time, and changing the parameters of a rekey requires canceling and starting a new rekey, which will also provide a new nonce.",
 				},
 				logical.DeleteOperation: &framework.PathOperation{
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb: "cancel",
-					},
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-						}},
-					},
 					Summary:     "Cancels any in-progress rekey.",
 					Description: "This clears the rekey settings as well as any progress made. This must be called to change the parameters of the rekey. Note: verification is still a part of a rekey. If rekeying is canceled during the verification flow, the current unseal keys remain valid.",
 				},
@@ -854,52 +388,16 @@ func (b *SystemBackend) rekeyPaths() []*framework.Path {
 		{
 			Pattern: "rekey/backup$",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "rekey",
-			},
-
 			Fields: map[string]*framework.FieldSchema{},
 
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
 					Callback: b.handleRekeyRetrieveBarrier,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "read",
-						OperationSuffix: "backup-key",
-					},
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"nonce": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"keys": {
-									Type:     framework.TypeMap,
-									Required: true,
-								},
-								"keys_base64": {
-									Type:     framework.TypeMap,
-									Required: true,
-								},
-							},
-						}},
-					},
-					Summary: "Return the backup copy of PGP-encrypted unseal keys.",
+					Summary:  "Return the backup copy of PGP-encrypted unseal keys.",
 				},
 				logical.DeleteOperation: &framework.PathOperation{
 					Callback: b.handleRekeyDeleteBarrier,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "delete",
-						OperationSuffix: "backup-key",
-					},
-					Responses: map[int][]framework.Response{
-						http.StatusNoContent: {{
-							Description: "OK",
-						}},
-					},
-					Summary: "Delete the backup copy of PGP-encrypted unseal keys.",
+					Summary:  "Delete the backup copy of PGP-encrypted unseal keys.",
 				},
 			},
 
@@ -910,51 +408,11 @@ func (b *SystemBackend) rekeyPaths() []*framework.Path {
 		{
 			Pattern: "rekey/recovery-key-backup$",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "rekey",
-			},
-
 			Fields: map[string]*framework.FieldSchema{},
 
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.ReadOperation: &framework.PathOperation{
-					Callback: b.handleRekeyRetrieveRecovery,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "read",
-						OperationSuffix: "backup-recovery-key",
-					},
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"nonce": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"keys": {
-									Type:     framework.TypeMap,
-									Required: true,
-								},
-								"keys_base64": {
-									Type:     framework.TypeMap,
-									Required: true,
-								},
-							},
-						}},
-					},
-				},
-				logical.DeleteOperation: &framework.PathOperation{
-					Callback: b.handleRekeyDeleteRecovery,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "delete",
-						OperationSuffix: "backup-recovery-key",
-					},
-					Responses: map[int][]framework.Response{
-						http.StatusNoContent: {{
-							Description: "OK",
-						}},
-					},
-				},
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.ReadOperation:   b.handleRekeyRetrieveRecovery,
+				logical.DeleteOperation: b.handleRekeyDeleteRecovery,
 			},
 
 			HelpSynopsis:    strings.TrimSpace(sysHelp["rekey_backup"][0]),
@@ -976,59 +434,6 @@ func (b *SystemBackend) rekeyPaths() []*framework.Path {
 
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.UpdateOperation: &framework.PathOperation{
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationPrefix: "rekey-attempt",
-						OperationVerb:   "update",
-					},
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"nounce": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"complete": {
-									Type: framework.TypeBool,
-								},
-								"started": {
-									Type: framework.TypeString,
-								},
-								"t": {
-									Type: framework.TypeInt,
-								},
-								"n": {
-									Type: framework.TypeInt,
-								},
-								"progress": {
-									Type: framework.TypeInt,
-								},
-								"required": {
-									Type: framework.TypeInt,
-								},
-								"keys": {
-									Type: framework.TypeCommaStringSlice,
-								},
-								"keys_base64": {
-									Type: framework.TypeCommaStringSlice,
-								},
-								"verification_required": {
-									Type:     framework.TypeBool,
-									Required: true,
-								},
-								"verification_nonce": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"backup": {
-									Type: framework.TypeBool,
-								},
-								"pgp_fingerprints": {
-									Type: framework.TypeCommaStringSlice,
-								},
-							},
-						}},
-					},
 					Summary: "Enter a single unseal key share to progress the rekey of the Vault.",
 				},
 			},
@@ -1036,10 +441,6 @@ func (b *SystemBackend) rekeyPaths() []*framework.Path {
 		{
 			Pattern: "rekey/verify",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "rekey-verification",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"key": {
 					Type:        framework.TypeString,
@@ -1053,91 +454,13 @@ func (b *SystemBackend) rekeyPaths() []*framework.Path {
 
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "read",
-						OperationSuffix: "progress",
-					},
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"nounce": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"started": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"t": {
-									Type:     framework.TypeInt,
-									Required: true,
-								},
-								"n": {
-									Type:     framework.TypeInt,
-									Required: true,
-								},
-								"progress": {
-									Type:     framework.TypeInt,
-									Required: true,
-								},
-							},
-						}},
-					},
 					Summary: "Read the configuration and progress of the current rekey verification attempt.",
 				},
 				logical.DeleteOperation: &framework.PathOperation{
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb: "cancel",
-					},
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"nounce": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"started": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"t": {
-									Type:     framework.TypeInt,
-									Required: true,
-								},
-								"n": {
-									Type:     framework.TypeInt,
-									Required: true,
-								},
-								"progress": {
-									Type:     framework.TypeInt,
-									Required: true,
-								},
-							},
-						}},
-					},
 					Summary:     "Cancel any in-progress rekey verification operation.",
 					Description: "This clears any progress made and resets the nonce. Unlike a `DELETE` against `sys/rekey/init`, this only resets the current verification operation, not the entire rekey atttempt.",
 				},
 				logical.UpdateOperation: &framework.PathOperation{
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb: "update",
-					},
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"nounce": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"complete": {
-									Type: framework.TypeBool,
-								},
-							},
-						}},
-					},
 					Summary: "Enter a single new key share to progress the rekey verification operation.",
 				},
 			},
@@ -1145,19 +468,9 @@ func (b *SystemBackend) rekeyPaths() []*framework.Path {
 
 		{
 			Pattern: "seal$",
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationVerb: "seal",
-			},
-
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.UpdateOperation: &framework.PathOperation{
 					Summary: "Seal the Vault.",
-					Responses: map[int][]framework.Response{
-						http.StatusNoContent: {{
-							Description: "OK",
-						}},
-					},
 				},
 			},
 			HelpSynopsis:    strings.TrimSpace(sysHelp["seal"][0]),
@@ -1166,11 +479,6 @@ func (b *SystemBackend) rekeyPaths() []*framework.Path {
 
 		{
 			Pattern: "unseal$",
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationVerb: "unseal",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"key": {
 					Type:        framework.TypeString,
@@ -1185,77 +493,6 @@ func (b *SystemBackend) rekeyPaths() []*framework.Path {
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.UpdateOperation: &framework.PathOperation{
 					Summary: "Unseal the Vault.",
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							// unseal returns `vault.SealStatusResponse` struct
-							Fields: map[string]*framework.FieldSchema{
-								"type": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"initialized": {
-									Type:     framework.TypeBool,
-									Required: true,
-								},
-								"sealed": {
-									Type:     framework.TypeBool,
-									Required: true,
-								},
-								"t": {
-									Type:     framework.TypeInt,
-									Required: true,
-								},
-								"n": {
-									Type:     framework.TypeInt,
-									Required: true,
-								},
-								"progress": {
-									Type:     framework.TypeInt,
-									Required: true,
-								},
-								"nonce": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"version": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"build_date": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"migration": {
-									Type:     framework.TypeBool,
-									Required: true,
-								},
-								"cluster_name": {
-									Type:     framework.TypeString,
-									Required: false,
-								},
-								"cluster_id": {
-									Type:     framework.TypeString,
-									Required: false,
-								},
-								"recovery_seal": {
-									Type:     framework.TypeBool,
-									Required: true,
-								},
-								"storage_type": {
-									Type:     framework.TypeString,
-									Required: false,
-								},
-								"hcp_link_status": {
-									Type:     framework.TypeString,
-									Required: false,
-								},
-								"hcp_link_resource_ID": {
-									Type:     framework.TypeString,
-									Required: false,
-								},
-							},
-						}},
-					},
 				},
 			},
 
@@ -1270,64 +507,10 @@ func (b *SystemBackend) statusPaths() []*framework.Path {
 		{
 			Pattern: "leader$",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "leader",
-				OperationVerb:   "status",
-			},
-
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
 					Callback: b.handleLeaderStatus,
 					Summary:  "Returns the high availability status and current leader instance of Vault.",
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							// returns `vault.LeaderResponse` struct
-							Fields: map[string]*framework.FieldSchema{
-								"ha_enabled": {
-									Type:     framework.TypeBool,
-									Required: true,
-								},
-								"is_self": {
-									Type:     framework.TypeBool,
-									Required: true,
-								},
-								"active_time": {
-									Type: framework.TypeTime,
-									// active_time has 'omitempty' tag, but its not a pointer so never "empty"
-									Required: true,
-								},
-								"leader_address": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"leader_cluster_address": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"performance_standby": {
-									Type:     framework.TypeBool,
-									Required: true,
-								},
-								"performance_standby_last_remote_wal": {
-									Type:     framework.TypeInt64,
-									Required: true,
-								},
-								"last_wal": {
-									Type:     framework.TypeInt64,
-									Required: false,
-								},
-								"raft_committed_index": {
-									Type:     framework.TypeInt64,
-									Required: false,
-								},
-								"raft_applied_index": {
-									Type:     framework.TypeInt64,
-									Required: false,
-								},
-							},
-						}},
-					},
 				},
 			},
 
@@ -1335,87 +518,10 @@ func (b *SystemBackend) statusPaths() []*framework.Path {
 		},
 		{
 			Pattern: "seal-status$",
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "seal",
-				OperationVerb:   "status",
-			},
-
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
 					Callback: b.handleSealStatus,
 					Summary:  "Check the seal status of a Vault.",
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							// unseal returns `vault.SealStatusResponse` struct
-							Fields: map[string]*framework.FieldSchema{
-								"type": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"initialized": {
-									Type:     framework.TypeBool,
-									Required: true,
-								},
-								"sealed": {
-									Type:     framework.TypeBool,
-									Required: true,
-								},
-								"t": {
-									Type:     framework.TypeInt,
-									Required: true,
-								},
-								"n": {
-									Type:     framework.TypeInt,
-									Required: true,
-								},
-								"progress": {
-									Type:     framework.TypeInt,
-									Required: true,
-								},
-								"nonce": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"version": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"build_date": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"migration": {
-									Type:     framework.TypeBool,
-									Required: true,
-								},
-								"cluster_name": {
-									Type:     framework.TypeString,
-									Required: false,
-								},
-								"cluster_id": {
-									Type:     framework.TypeString,
-									Required: false,
-								},
-								"recovery_seal": {
-									Type:     framework.TypeBool,
-									Required: true,
-								},
-								"storage_type": {
-									Type:     framework.TypeString,
-									Required: false,
-								},
-								"hcp_link_status": {
-									Type:     framework.TypeString,
-									Required: false,
-								},
-								"hcp_link_resource_ID": {
-									Type:     framework.TypeString,
-									Required: false,
-								},
-							},
-						}},
-					},
 				},
 			},
 
@@ -1425,26 +531,10 @@ func (b *SystemBackend) statusPaths() []*framework.Path {
 		{
 			Pattern: "ha-status$",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "ha",
-				OperationVerb:   "status",
-			},
-
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
 					Callback: b.handleHAStatus,
 					Summary:  "Check the HA status of a Vault cluster",
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"nodes": {
-									Type:     framework.TypeSlice,
-									Required: true,
-								},
-							},
-						}},
-					},
 				},
 			},
 
@@ -1453,30 +543,10 @@ func (b *SystemBackend) statusPaths() []*framework.Path {
 		},
 		{
 			Pattern: "version-history/$",
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationVerb: "version-history",
-			},
-
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ListOperation: &framework.PathOperation{
 					Callback: b.handleVersionHistoryList,
 					Summary:  "Returns map of historical version change entries",
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"keys": {
-									Type:     framework.TypeCommaStringSlice,
-									Required: true,
-								},
-								"key_info": {
-									Type:     framework.TypeKVPairs,
-									Required: true,
-								},
-							},
-						}},
-					},
 				},
 			},
 
@@ -1491,12 +561,6 @@ func (b *SystemBackend) auditPaths() []*framework.Path {
 		{
 			Pattern: "audit-hash/(?P<path>.+)",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "auditing",
-				OperationVerb:   "calculate",
-				OperationSuffix: "hash",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"path": {
 					Type:        framework.TypeString,
@@ -1508,21 +572,8 @@ func (b *SystemBackend) auditPaths() []*framework.Path {
 				},
 			},
 
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.UpdateOperation: &framework.PathOperation{
-					Callback: b.handleAuditHash,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"hash": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-							},
-						}},
-					},
-				},
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.UpdateOperation: b.handleAuditHash,
 			},
 
 			HelpSynopsis:    strings.TrimSpace(sysHelp["audit-hash"][0]),
@@ -1532,23 +583,10 @@ func (b *SystemBackend) auditPaths() []*framework.Path {
 		{
 			Pattern: "audit$",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "auditing",
-				OperationVerb:   "list",
-				OperationSuffix: "enabled-devices",
-			},
-
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
 					Callback: b.handleAuditTable,
 					Summary:  "List the enabled audit devices.",
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							// this response has dynamic keys
-							Description: "OK",
-							Fields:      nil,
-						}},
-					},
 				},
 			},
 
@@ -1559,10 +597,6 @@ func (b *SystemBackend) auditPaths() []*framework.Path {
 		{
 			Pattern: "audit/(?P<path>.+)",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "auditing",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"path": {
 					Type:        framework.TypeString,
@@ -1590,29 +624,11 @@ func (b *SystemBackend) auditPaths() []*framework.Path {
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.UpdateOperation: &framework.PathOperation{
 					Callback: b.handleEnableAudit,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "enable",
-						OperationSuffix: "device",
-					},
-					Summary: "Enable a new audit device at the supplied path.",
-					Responses: map[int][]framework.Response{
-						http.StatusNoContent: {{
-							Description: "OK",
-						}},
-					},
+					Summary:  "Enable a new audit device at the supplied path.",
 				},
 				logical.DeleteOperation: &framework.PathOperation{
 					Callback: b.handleDisableAudit,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "disable",
-						OperationSuffix: "device",
-					},
-					Summary: "Disable the audit device at the given path.",
-					Responses: map[int][]framework.Response{
-						http.StatusNoContent: {{
-							Description: "OK",
-						}},
-					},
+					Summary:  "Disable the audit device at the given path.",
 				},
 			},
 
@@ -1623,10 +639,6 @@ func (b *SystemBackend) auditPaths() []*framework.Path {
 		{
 			Pattern: "config/auditing/request-headers/(?P<header>.+)",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "auditing",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"header": {
 					Type: framework.TypeString,
@@ -1639,44 +651,15 @@ func (b *SystemBackend) auditPaths() []*framework.Path {
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.UpdateOperation: &framework.PathOperation{
 					Callback: b.handleAuditedHeaderUpdate,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "enable",
-						OperationSuffix: "request-header",
-					},
-					Summary: "Enable auditing of a header.",
-					Responses: map[int][]framework.Response{
-						http.StatusNoContent: {{
-							Description: "OK",
-						}},
-					},
+					Summary:  "Enable auditing of a header.",
 				},
 				logical.DeleteOperation: &framework.PathOperation{
 					Callback: b.handleAuditedHeaderDelete,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "disable",
-						OperationSuffix: "request-header",
-					},
-					Summary: "Disable auditing of the given request header.",
-					Responses: map[int][]framework.Response{
-						http.StatusNoContent: {{
-							Description: "OK",
-						}},
-					},
+					Summary:  "Disable auditing of the given request header.",
 				},
 				logical.ReadOperation: &framework.PathOperation{
 					Callback: b.handleAuditedHeaderRead,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "read",
-						OperationSuffix: "request-header-information",
-					},
-					Summary: "List the information for the given request header.",
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							// the response keys are dynamic
-							Fields: nil,
-						}},
-					},
+					Summary:  "List the information for the given request header.",
 				},
 			},
 
@@ -1687,27 +670,10 @@ func (b *SystemBackend) auditPaths() []*framework.Path {
 		{
 			Pattern: "config/auditing/request-headers$",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "auditing",
-				OperationVerb:   "list",
-				OperationSuffix: "request-headers",
-			},
-
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
 					Callback: b.handleAuditedHeadersRead,
 					Summary:  "List the request headers that are configured to be audited.",
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"headers": {
-									Type:     framework.TypeMap,
-									Required: true,
-								},
-							},
-						}},
-					},
 				},
 			},
 
@@ -1722,11 +688,6 @@ func (b *SystemBackend) sealPaths() []*framework.Path {
 		{
 			Pattern: "key-status$",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "encryption-key",
-				OperationVerb:   "status",
-			},
-
 			Callbacks: map[logical.Operation]framework.OperationFunc{
 				logical.ReadOperation: b.handleKeyStatus,
 			},
@@ -1737,11 +698,6 @@ func (b *SystemBackend) sealPaths() []*framework.Path {
 
 		{
 			Pattern: "rotate/config$",
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "encryption-key",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"enabled": {
 					Type:        framework.TypeBool,
@@ -1760,41 +716,9 @@ func (b *SystemBackend) sealPaths() []*framework.Path {
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
 					Callback: b.handleKeyRotationConfigRead,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "read",
-						OperationSuffix: "rotation-configuration",
-					},
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"max_operations": {
-									Type:     framework.TypeInt64,
-									Required: true,
-								},
-								"enabled": {
-									Type:     framework.TypeBool,
-									Required: true,
-								},
-								"interval": {
-									Type:     framework.TypeDurationSecond,
-									Required: true,
-								},
-							},
-						}},
-					},
 				},
 				logical.UpdateOperation: &framework.PathOperation{
-					Callback: b.handleKeyRotationConfigUpdate,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "configure",
-						OperationSuffix: "rotation",
-					},
-					Responses: map[int][]framework.Response{
-						http.StatusNoContent: {{
-							Description: "OK",
-						}},
-					},
+					Callback:                    b.handleKeyRotationConfigUpdate,
 					ForwardPerformanceSecondary: true,
 					ForwardPerformanceStandby:   true,
 				},
@@ -1807,26 +731,10 @@ func (b *SystemBackend) sealPaths() []*framework.Path {
 		{
 			Pattern: "rotate$",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "encryption-key",
-				OperationVerb:   "rotate",
-			},
-
 			Callbacks: map[logical.Operation]framework.OperationFunc{
 				logical.UpdateOperation: b.handleRotate,
 			},
 
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.UpdateOperation: &framework.PathOperation{
-					Callback: b.handleRotate,
-					Responses: map[int][]framework.Response{
-						http.StatusNoContent: {{
-							Description: "OK",
-						}},
-					},
-				},
-			},
-
 			HelpSynopsis:    strings.TrimSpace(sysHelp["rotate"][0]),
 			HelpDescription: strings.TrimSpace(sysHelp["rotate"][1]),
 		},
@@ -1837,10 +745,6 @@ func (b *SystemBackend) pluginsCatalogCRUDPath() *framework.Path {
 	return &framework.Path{
 		Pattern: "plugins/catalog(/(?P<type>auth|database|secret))?/(?P<name>.+)",
 
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: "plugins-catalog",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"name": {
 				Type:        framework.TypeString,
@@ -1879,78 +783,15 @@ func (b *SystemBackend) pluginsCatalogCRUDPath() *framework.Path {
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.UpdateOperation: &framework.PathOperation{
 				Callback: b.handlePluginCatalogUpdate,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb:   "register",
-					OperationSuffix: "plugin|plugin-with-type|plugin-with-type-and-name",
-				},
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-					}},
-				},
-				Summary: "Register a new plugin, or updates an existing one with the supplied name.",
+				Summary:  "Register a new plugin, or updates an existing one with the supplied name.",
 			},
 			logical.DeleteOperation: &framework.PathOperation{
 				Callback: b.handlePluginCatalogDelete,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb:   "remove",
-					OperationSuffix: "plugin|plugin-with-type|plugin-with-type-and-name",
-				},
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields:      map[string]*framework.FieldSchema{},
-					}},
-				},
-				Summary: "Remove the plugin with the given name.",
+				Summary:  "Remove the plugin with the given name.",
 			},
 			logical.ReadOperation: &framework.PathOperation{
 				Callback: b.handlePluginCatalogRead,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb:   "read",
-					OperationSuffix: "plugin-configuration|plugin-configuration-with-type|plugin-configuration-with-type-and-name",
-				},
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"name": {
-								Type:        framework.TypeString,
-								Description: strings.TrimSpace(sysHelp["plugin-catalog_name"][0]),
-								Required:    true,
-							},
-							"sha256": {
-								Type:        framework.TypeString,
-								Description: strings.TrimSpace(sysHelp["plugin-catalog_sha-256"][0]),
-								Required:    true,
-							},
-							"command": {
-								Type:        framework.TypeString,
-								Description: strings.TrimSpace(sysHelp["plugin-catalog_command"][0]),
-								Required:    true,
-							},
-							"args": {
-								Type:        framework.TypeStringSlice,
-								Description: strings.TrimSpace(sysHelp["plugin-catalog_args"][0]),
-								Required:    true,
-							},
-							"version": {
-								Type:        framework.TypeString,
-								Description: strings.TrimSpace(sysHelp["plugin-catalog_version"][0]),
-								Required:    true,
-							},
-							"builtin": {
-								Type:     framework.TypeBool,
-								Required: true,
-							},
-							"deprecation_status": {
-								Type:     framework.TypeString,
-								Required: false,
-							},
-						},
-					}},
-				},
-				Summary: "Return the configuration data for the plugin with the given name.",
+				Summary:  "Return the configuration data for the plugin with the given name.",
 			},
 		},
 
@@ -1964,12 +805,6 @@ func (b *SystemBackend) pluginsCatalogListPaths() []*framework.Path {
 		{
 			Pattern: "plugins/catalog/(?P<type>auth|database|secret)/?$",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "plugins-catalog",
-				OperationVerb:   "list",
-				OperationSuffix: "plugins-with-type",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"type": {
 					Type:        framework.TypeString,
@@ -1980,19 +815,7 @@ func (b *SystemBackend) pluginsCatalogListPaths() []*framework.Path {
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ListOperation: &framework.PathOperation{
 					Callback: b.handlePluginCatalogTypedList,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"keys": {
-									Type:        framework.TypeStringSlice,
-									Description: "List of plugin names in the catalog",
-									Required:    true,
-								},
-							},
-						}},
-					},
-					Summary: "List the plugins in the catalog.",
+					Summary:  "List the plugins in the catalog.",
 				},
 			},
 
@@ -2002,27 +825,8 @@ func (b *SystemBackend) pluginsCatalogListPaths() []*framework.Path {
 		{
 			Pattern: "plugins/catalog/?$",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "plugins-catalog",
-				OperationVerb:   "list",
-				OperationSuffix: "plugins",
-			},
-
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.ReadOperation: &framework.PathOperation{
-					Callback: b.handlePluginCatalogUntypedList,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"detailed": {
-									Type:     framework.TypeMap,
-									Required: false,
-								},
-							},
-						}},
-					},
-				},
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.ReadOperation: b.handlePluginCatalogUntypedList,
 			},
 
 			HelpSynopsis:    strings.TrimSpace(sysHelp["plugin-catalog-list-all"][0]),
@@ -2035,12 +839,6 @@ func (b *SystemBackend) pluginsReloadPath() *framework.Path {
 	return &framework.Path{
 		Pattern: "plugins/reload/backend$",
 
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: "plugins",
-			OperationVerb:   "reload",
-			OperationSuffix: "backends",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"plugin": {
 				Type:        framework.TypeString,
@@ -2058,27 +856,7 @@ func (b *SystemBackend) pluginsReloadPath() *framework.Path {
 
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.UpdateOperation: &framework.PathOperation{
-				Callback: b.handlePluginReloadUpdate,
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"reload_id": {
-								Type:     framework.TypeString,
-								Required: true,
-							},
-						},
-					}},
-					http.StatusAccepted: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"reload_id": {
-								Type:     framework.TypeString,
-								Required: true,
-							},
-						},
-					}},
-				},
+				Callback:    b.handlePluginReloadUpdate,
 				Summary:     "Reload mounted plugin backends.",
 				Description: "Either the plugin name (`plugin`) or the desired plugin backend mounts (`mounts`) must be provided, but not both. In the case that the plugin name is provided, all mounted paths that use that plugin backend will be reloaded.  If (`scope`) is provided and is (`global`), the plugin(s) are reloaded globally.",
 			},
@@ -2093,12 +871,6 @@ func (b *SystemBackend) toolsPaths() []*framework.Path {
 	return []*framework.Path{
 		{
 			Pattern: "tools/hash" + framework.OptionalParamRegex("urlalgorithm"),
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationVerb:   "generate",
-				OperationSuffix: "hash|hash-with-algorithm",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"input": {
 					Type:        framework.TypeString,
@@ -2130,21 +902,8 @@ func (b *SystemBackend) toolsPaths() []*framework.Path {
 				},
 			},
 
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.UpdateOperation: &framework.PathOperation{
-					Callback: b.pathHashWrite,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"sum": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-							},
-						}},
-					},
-				},
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.UpdateOperation: b.pathHashWrite,
 			},
 
 			HelpSynopsis:    strings.TrimSpace(sysHelp["hash"][0]),
@@ -2153,12 +912,6 @@ func (b *SystemBackend) toolsPaths() []*framework.Path {
 
 		{
 			Pattern: "tools/random(/" + framework.GenericNameRegex("source") + ")?" + framework.OptionalParamRegex("urlbytes"),
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationVerb:   "generate",
-				OperationSuffix: "random|random-with-source|random-with-bytes|random-with-source-and-bytes",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"urlbytes": {
 					Type:        framework.TypeString,
@@ -2184,21 +937,8 @@ func (b *SystemBackend) toolsPaths() []*framework.Path {
 				},
 			},
 
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.UpdateOperation: &framework.PathOperation{
-					Callback: b.pathRandomWrite,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"random_bytes": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-							},
-						}},
-					},
-				},
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.UpdateOperation: b.pathRandomWrite,
 			},
 
 			HelpSynopsis:    strings.TrimSpace(sysHelp["random"][0]),
@@ -2211,12 +951,6 @@ func (b *SystemBackend) internalPaths() []*framework.Path {
 	return []*framework.Path{
 		{
 			Pattern: "internal/specs/openapi",
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "internal",
-				OperationVerb:   "generate",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"context": {
 					Type:        framework.TypeString,
@@ -2229,48 +963,26 @@ func (b *SystemBackend) internalPaths() []*framework.Path {
 					Default:     false,
 				},
 			},
-
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.ReadOperation:   b.pathInternalOpenAPI,
+				logical.UpdateOperation: b.pathInternalOpenAPI,
+			},
+		},
+		{
+			Pattern: "internal/specs/openapi",
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
 					Callback: b.pathInternalOpenAPI,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationSuffix: "open-api-document",
-					},
-				},
-				logical.UpdateOperation: &framework.PathOperation{
-					Callback: b.pathInternalOpenAPI,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationSuffix: "open-api-document-with-parameters",
-					},
+					Summary:  "Generate an OpenAPI 3 document of all mounted paths.",
 				},
 			},
-
-			HelpSynopsis: "Generate an OpenAPI 3 document of all mounted paths.",
 		},
 		{
 			Pattern: "internal/ui/feature-flags",
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "internal-ui",
-				OperationVerb:   "list",
-				OperationSuffix: "enabled-feature-flags",
-			},
-
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
 					// callback is absent because this is an unauthenticated method
 					Summary: "Lists enabled feature flags.",
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"feature_flags": {
-									Type:     framework.TypeCommaStringSlice,
-									Required: true,
-								},
-							},
-						}},
-					},
 				},
 			},
 			HelpSynopsis:    strings.TrimSpace(sysHelp["internal-ui-feature-flags"][0]),
@@ -2278,34 +990,10 @@ func (b *SystemBackend) internalPaths() []*framework.Path {
 		},
 		{
 			Pattern: "internal/ui/mounts",
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "internal-ui",
-				OperationVerb:   "list",
-				OperationSuffix: "enabled-visible-mounts",
-			},
-
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
 					Callback: b.pathInternalUIMountsRead,
 					Summary:  "Lists all enabled and visible auth and secrets mounts.",
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"secret": {
-									Description: "secret mounts",
-									Type:        framework.TypeMap,
-									Required:    true,
-								},
-								"auth": {
-									Description: "auth mounts",
-									Type:        framework.TypeMap,
-									Required:    true,
-								},
-							},
-						}},
-					},
 				},
 			},
 			HelpSynopsis:    strings.TrimSpace(sysHelp["internal-ui-mounts"][0]),
@@ -2313,83 +1001,16 @@ func (b *SystemBackend) internalPaths() []*framework.Path {
 		},
 		{
 			Pattern: "internal/ui/mounts/(?P<path>.+)",
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "internal-ui",
-				OperationVerb:   "read",
-				OperationSuffix: "mount-information",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"path": {
 					Type:        framework.TypeString,
 					Description: "The path of the mount.",
 				},
 			},
-
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
 					Callback: b.pathInternalUIMountRead,
 					Summary:  "Return information about the given mount.",
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"type": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"description": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"accessor": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"local": {
-									Type:     framework.TypeBool,
-									Required: true,
-								},
-								"seal_wrap": {
-									Type:     framework.TypeBool,
-									Required: true,
-								},
-								"external_entropy_access": {
-									Type:     framework.TypeBool,
-									Required: true,
-								},
-								"options": {
-									Type:     framework.TypeMap,
-									Required: true,
-								},
-								"uuid": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"plugin_version": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"running_plugin_version": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"running_sha256": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"path": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"config": {
-									Type:     framework.TypeMap,
-									Required: true,
-								},
-							},
-						}},
-					},
 				},
 			},
 			HelpSynopsis:    strings.TrimSpace(sysHelp["internal-ui-mounts"][0]),
@@ -2397,26 +1018,10 @@ func (b *SystemBackend) internalPaths() []*framework.Path {
 		},
 		{
 			Pattern: "internal/ui/namespaces",
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "internal-ui",
-				OperationVerb:   "list",
-				OperationSuffix: "namespaces",
-			},
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
 					Callback: pathInternalUINamespacesRead(b),
 					Summary:  "Backwards compatibility is not guaranteed for this API",
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"keys": {
-									Type:        framework.TypeCommaStringSlice,
-									Description: "field is only returned if there are one or more namespaces",
-								},
-							},
-						}},
-					},
 				},
 			},
 			HelpSynopsis:    strings.TrimSpace(sysHelp["internal-ui-namespaces"][0]),
@@ -2424,38 +1029,10 @@ func (b *SystemBackend) internalPaths() []*framework.Path {
 		},
 		{
 			Pattern: "internal/ui/resultant-acl",
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "internal-ui",
-				OperationVerb:   "read",
-				OperationSuffix: "resultant-acl",
-			},
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
 					Callback: b.pathInternalUIResultantACL,
 					Summary:  "Backwards compatibility is not guaranteed for this API",
-					Responses: map[int][]framework.Response{
-						http.StatusNoContent: {{
-							Description: "empty response returned if no client token",
-							Fields:      nil,
-						}},
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"root": {
-									Type:     framework.TypeBool,
-									Required: true,
-								},
-								"exact_paths": {
-									Type:     framework.TypeMap,
-									Required: false,
-								},
-								"glob_paths": {
-									Type:     framework.TypeMap,
-									Required: false,
-								},
-							},
-						}},
-					},
 				},
 			},
 			HelpSynopsis:    strings.TrimSpace(sysHelp["internal-ui-resultant-acl"][0]),
@@ -2463,16 +1040,10 @@ func (b *SystemBackend) internalPaths() []*framework.Path {
 		},
 		{
 			Pattern: "internal/counters/requests",
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "internal",
-				OperationVerb:   "count",
-				OperationSuffix: "requests",
-			},
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
-					Callback:   b.pathInternalCountersRequests,
-					Deprecated: true,
-					Summary:    "Backwards compatibility is not guaranteed for this API",
+					Callback: b.pathInternalCountersRequests,
+					Summary:  "Backwards compatibility is not guaranteed for this API",
 				},
 			},
 			HelpSynopsis:    strings.TrimSpace(sysHelp["internal-counters-requests"][0]),
@@ -2480,26 +1051,10 @@ func (b *SystemBackend) internalPaths() []*framework.Path {
 		},
 		{
 			Pattern: "internal/counters/tokens",
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "internal",
-				OperationVerb:   "count",
-				OperationSuffix: "tokens",
-			},
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
 					Callback: b.pathInternalCountersTokens,
 					Summary:  "Backwards compatibility is not guaranteed for this API",
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"counters": {
-									Type:     framework.TypeMap,
-									Required: true,
-								},
-							},
-						}},
-					},
 				},
 			},
 			HelpSynopsis:    strings.TrimSpace(sysHelp["internal-counters-tokens"][0]),
@@ -2507,26 +1062,10 @@ func (b *SystemBackend) internalPaths() []*framework.Path {
 		},
 		{
 			Pattern: "internal/counters/entities",
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "internal",
-				OperationVerb:   "count",
-				OperationSuffix: "entities",
-			},
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
 					Callback: b.pathInternalCountersEntities,
 					Summary:  "Backwards compatibility is not guaranteed for this API",
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"counters": {
-									Type:     framework.TypeMap,
-									Required: true,
-								},
-							},
-						}},
-					},
 				},
 			},
 			HelpSynopsis:    strings.TrimSpace(sysHelp["internal-counters-entities"][0]),
@@ -2535,43 +1074,11 @@ func (b *SystemBackend) internalPaths() []*framework.Path {
 	}
 }
 
-func (b *SystemBackend) introspectionPaths() []*framework.Path {
-	return []*framework.Path{
-		{
-			Pattern: "internal/inspect/router/" + framework.GenericNameRegex("tag"),
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "internal",
-				OperationVerb:   "inspect",
-				OperationSuffix: "router",
-			},
-			Fields: map[string]*framework.FieldSchema{
-				"tag": {
-					Type:        framework.TypeString,
-					Description: "Name of subtree being observed",
-				},
-			},
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.ReadOperation: &framework.PathOperation{
-					Callback: b.pathInternalInspectRouter,
-					Summary:  "Expose the route entry and mount entry tables present in the router",
-				},
-			},
-			HelpSynopsis:    strings.TrimSpace(sysHelp["internal-inspect-router"][0]),
-			HelpDescription: strings.TrimSpace(sysHelp["internal-inspect-router"][1]),
-		},
-	}
-}
-
 func (b *SystemBackend) capabilitiesPaths() []*framework.Path {
 	return []*framework.Path{
 		{
 			Pattern: "capabilities-accessor$",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationVerb:   "query",
-				OperationSuffix: "token-accessor-capabilities",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"accessor": {
 					Type:        framework.TypeString,
@@ -2588,17 +1095,8 @@ func (b *SystemBackend) capabilitiesPaths() []*framework.Path {
 				},
 			},
 
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.UpdateOperation: &framework.PathOperation{
-					Callback: b.handleCapabilitiesAccessor,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							// response keys are dynamic
-							Fields: nil,
-						}},
-					},
-				},
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.UpdateOperation: b.handleCapabilitiesAccessor,
 			},
 
 			HelpSynopsis:    strings.TrimSpace(sysHelp["capabilities_accessor"][0]),
@@ -2608,11 +1106,6 @@ func (b *SystemBackend) capabilitiesPaths() []*framework.Path {
 		{
 			Pattern: "capabilities$",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationVerb:   "query",
-				OperationSuffix: "token-capabilities",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"token": {
 					Type:        framework.TypeString,
@@ -2629,17 +1122,8 @@ func (b *SystemBackend) capabilitiesPaths() []*framework.Path {
 				},
 			},
 
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.UpdateOperation: &framework.PathOperation{
-					Callback: b.handleCapabilities,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							// response keys are dynamic
-							Fields: nil,
-						}},
-					},
-				},
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.UpdateOperation: b.handleCapabilities,
 			},
 
 			HelpSynopsis:    strings.TrimSpace(sysHelp["capabilities"][0]),
@@ -2649,11 +1133,6 @@ func (b *SystemBackend) capabilitiesPaths() []*framework.Path {
 		{
 			Pattern: "capabilities-self$",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationVerb:   "query",
-				OperationSuffix: "token-self-capabilities",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"token": {
 					Type:        framework.TypeString,
@@ -2670,17 +1149,8 @@ func (b *SystemBackend) capabilitiesPaths() []*framework.Path {
 				},
 			},
 
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.UpdateOperation: &framework.PathOperation{
-					Callback: b.handleCapabilities,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							// response keys are dynamic
-							Fields: nil,
-						}},
-					},
-				},
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.UpdateOperation: b.handleCapabilities,
 			},
 
 			HelpSynopsis:    strings.TrimSpace(sysHelp["capabilities_self"][0]),
@@ -2694,12 +1164,6 @@ func (b *SystemBackend) leasePaths() []*framework.Path {
 		{
 			Pattern: "leases/lookup/(?P<prefix>.+?)?",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "leases",
-				OperationVerb:   "look-up",
-				OperationSuffix: "|with-prefix",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"prefix": {
 					Type:        framework.TypeString,
@@ -2710,18 +1174,7 @@ func (b *SystemBackend) leasePaths() []*framework.Path {
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ListOperation: &framework.PathOperation{
 					Callback: b.handleLeaseLookupList,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"keys": {
-									Type:        framework.TypeCommaStringSlice,
-									Description: "A list of lease ids",
-									Required:    false,
-								},
-							},
-						}},
-					},
+					Summary:  "Returns a list of lease ids.",
 				},
 			},
 
@@ -2732,12 +1185,6 @@ func (b *SystemBackend) leasePaths() []*framework.Path {
 		{
 			Pattern: "leases/lookup",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "leases",
-				OperationVerb:   "read",
-				OperationSuffix: "lease",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"lease_id": {
 					Type:        framework.TypeString,
@@ -2748,43 +1195,7 @@ func (b *SystemBackend) leasePaths() []*framework.Path {
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.UpdateOperation: &framework.PathOperation{
 					Callback: b.handleLeaseLookup,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"id": {
-									Type:        framework.TypeString,
-									Description: "Lease id",
-									Required:    true,
-								},
-								"issue_time": {
-									Type:        framework.TypeTime,
-									Description: "Timestamp for the lease's issue time",
-									Required:    true,
-								},
-								"renewable": {
-									Type:        framework.TypeBool,
-									Description: "True if the lease is able to be renewed",
-									Required:    true,
-								},
-								"expire_time": {
-									Type:        framework.TypeTime,
-									Description: "Optional lease expiry time ",
-									Required:    true,
-								},
-								"last_renewal": {
-									Type:        framework.TypeTime,
-									Description: "Optional Timestamp of the last time the lease was renewed",
-									Required:    true,
-								},
-								"ttl": {
-									Type:        framework.TypeInt,
-									Description: "Time to Live set for the lease, returns 0 if unset",
-									Required:    true,
-								},
-							},
-						}},
-					},
+					Summary:  "Retrieve lease metadata.",
 				},
 			},
 
@@ -2795,12 +1206,6 @@ func (b *SystemBackend) leasePaths() []*framework.Path {
 		{
 			Pattern: "(leases/)?renew" + framework.OptionalParamRegex("url_lease_id"),
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "leases",
-				OperationVerb:   "renew",
-				OperationSuffix: "lease2|lease|lease-with-id2|lease-with-id",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"url_lease_id": {
 					Type:        framework.TypeString,
@@ -2819,12 +1224,7 @@ func (b *SystemBackend) leasePaths() []*framework.Path {
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.UpdateOperation: &framework.PathOperation{
 					Callback: b.handleRenew,
-					Responses: map[int][]framework.Response{
-						http.StatusNoContent: {{
-							Description: "OK",
-						}},
-					},
-					Summary: "Renews a lease, requesting to extend the lease.",
+					Summary:  "Renews a lease, requesting to extend the lease.",
 				},
 			},
 
@@ -2835,12 +1235,6 @@ func (b *SystemBackend) leasePaths() []*framework.Path {
 		{
 			Pattern: "(leases/)?revoke" + framework.OptionalParamRegex("url_lease_id"),
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "leases",
-				OperationVerb:   "revoke",
-				OperationSuffix: "lease2|lease|lease-with-id2|lease-with-id",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"url_lease_id": {
 					Type:        framework.TypeString,
@@ -2860,12 +1254,7 @@ func (b *SystemBackend) leasePaths() []*framework.Path {
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.UpdateOperation: &framework.PathOperation{
 					Callback: b.handleRevoke,
-					Responses: map[int][]framework.Response{
-						http.StatusNoContent: {{
-							Description: "OK",
-						}},
-					},
-					Summary: "Revokes a lease immediately.",
+					Summary:  "Revokes a lease immediately.",
 				},
 			},
 
@@ -2876,12 +1265,6 @@ func (b *SystemBackend) leasePaths() []*framework.Path {
 		{
 			Pattern: "(leases/)?revoke-force/(?P<prefix>.+)",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "leases",
-				OperationVerb:   "force-revoke",
-				OperationSuffix: "lease-with-prefix2|lease-with-prefix",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"prefix": {
 					Type:        framework.TypeString,
@@ -2891,12 +1274,7 @@ func (b *SystemBackend) leasePaths() []*framework.Path {
 
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.UpdateOperation: &framework.PathOperation{
-					Callback: b.handleRevokeForce,
-					Responses: map[int][]framework.Response{
-						http.StatusNoContent: {{
-							Description: "OK",
-						}},
-					},
+					Callback:    b.handleRevokeForce,
 					Summary:     "Revokes all secrets or tokens generated under a given prefix immediately",
 					Description: "Unlike `/sys/leases/revoke-prefix`, this path ignores backend errors encountered during revocation. This is potentially very dangerous and should only be used in specific emergency situations where errors in the backend or the connected backend service prevent normal revocation.\n\nBy ignoring these errors, Vault abdicates responsibility for ensuring that the issued credentials or secrets are properly revoked and/or cleaned up. Access to this endpoint should be tightly controlled.",
 				},
@@ -2909,12 +1287,6 @@ func (b *SystemBackend) leasePaths() []*framework.Path {
 		{
 			Pattern: "(leases/)?revoke-prefix/(?P<prefix>.+)",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "leases",
-				OperationVerb:   "revoke",
-				OperationSuffix: "lease-with-prefix2|lease-with-prefix",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"prefix": {
 					Type:        framework.TypeString,
@@ -2930,12 +1302,7 @@ func (b *SystemBackend) leasePaths() []*framework.Path {
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.UpdateOperation: &framework.PathOperation{
 					Callback: b.handleRevokePrefix,
-					Responses: map[int][]framework.Response{
-						http.StatusNoContent: {{
-							Description: "OK",
-						}},
-					},
-					Summary: "Revokes all secrets (via a lease ID prefix) or tokens (via the tokens' path property) generated under a given prefix immediately.",
+					Summary:  "Revokes all secrets (via a lease ID prefix) or tokens (via the tokens' path property) generated under a given prefix immediately.",
 				},
 			},
 
@@ -2946,21 +1313,8 @@ func (b *SystemBackend) leasePaths() []*framework.Path {
 		{
 			Pattern: "leases/tidy$",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "leases",
-				OperationVerb:   "tidy",
-			},
-
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.UpdateOperation: &framework.PathOperation{
-					Callback: b.handleTidyLeases,
-					Responses: map[int][]framework.Response{
-						http.StatusNoContent: {{
-							Description: "OK",
-							Fields:      map[string]*framework.FieldSchema{},
-						}},
-					},
-				},
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.UpdateOperation: b.handleTidyLeases,
 			},
 
 			HelpSynopsis:    strings.TrimSpace(sysHelp["tidy_leases"][0]),
@@ -2969,12 +1323,6 @@ func (b *SystemBackend) leasePaths() []*framework.Path {
 
 		{
 			Pattern: "leases/count$",
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "leases",
-				OperationVerb:   "count",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"type": {
 					Type:        framework.TypeString,
@@ -2988,28 +1336,9 @@ func (b *SystemBackend) leasePaths() []*framework.Path {
 				},
 			},
 
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.ReadOperation: &framework.PathOperation{
-					// currently only works for irrevocable leases with param: type=irrevocable
-					Callback: b.handleLeaseCount,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"lease_count": {
-									Type:        framework.TypeInt,
-									Description: "Number of matching leases",
-									Required:    true,
-								},
-								"counts": {
-									Type:        framework.TypeInt,
-									Description: "Number of matching leases per mount",
-									Required:    true,
-								},
-							},
-						}},
-					},
-				},
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				// currently only works for irrevocable leases with param: type=irrevocable
+				logical.ReadOperation: b.handleLeaseCount,
 			},
 
 			HelpSynopsis:    strings.TrimSpace(sysHelp["count-leases"][0]),
@@ -3018,12 +1347,6 @@ func (b *SystemBackend) leasePaths() []*framework.Path {
 
 		{
 			Pattern: "leases$",
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "leases",
-				OperationVerb:   "list",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"type": {
 					Type:        framework.TypeString,
@@ -3042,28 +1365,9 @@ func (b *SystemBackend) leasePaths() []*framework.Path {
 				},
 			},
 
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.ReadOperation: &framework.PathOperation{
-					// currently only works for irrevocable leases with param: type=irrevocable
-					Callback: b.handleLeaseList,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"lease_count": {
-									Type:        framework.TypeInt,
-									Description: "Number of matching leases",
-									Required:    true,
-								},
-								"counts": {
-									Type:        framework.TypeInt,
-									Description: "Number of matching leases per mount",
-									Required:    true,
-								},
-							},
-						}},
-					},
-				},
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				// currently only works for irrevocable leases with param: type=irrevocable
+				logical.ReadOperation: b.handleLeaseList,
 			},
 
 			HelpSynopsis:    strings.TrimSpace(sysHelp["list-leases"][0]),
@@ -3077,10 +1381,6 @@ func (b *SystemBackend) remountPaths() []*framework.Path {
 		{
 			Pattern: "remount",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationVerb: "remount",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"from": {
 					Type:        framework.TypeString,
@@ -3095,18 +1395,7 @@ func (b *SystemBackend) remountPaths() []*framework.Path {
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.UpdateOperation: &framework.PathOperation{
 					Callback: b.handleRemount,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"migration_id": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-							},
-						}},
-					},
-					Summary: "Initiate a mount migration",
+					Summary:  "Initiate a mount migration",
 				},
 			},
 			HelpSynopsis:    strings.TrimSpace(sysHelp["remount"][0]),
@@ -3115,11 +1404,6 @@ func (b *SystemBackend) remountPaths() []*framework.Path {
 		{
 			Pattern: "remount/status/(?P<migration_id>.+?)$",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "remount",
-				OperationVerb:   "status",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"migration_id": {
 					Type:        framework.TypeString,
@@ -3130,22 +1414,7 @@ func (b *SystemBackend) remountPaths() []*framework.Path {
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
 					Callback: b.handleRemountStatusCheck,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"migration_id": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"migration_info": {
-									Type:     framework.TypeMap,
-									Required: true,
-								},
-							},
-						}},
-					},
-					Summary: "Check status of a mount migration",
+					Summary:  "Check status of a mount migration",
 				},
 			},
 			HelpSynopsis:    strings.TrimSpace(sysHelp["remount-status"][0]),
@@ -3157,11 +1426,6 @@ func (b *SystemBackend) remountPaths() []*framework.Path {
 func (b *SystemBackend) metricsPath() *framework.Path {
 	return &framework.Path{
 		Pattern: "metrics",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationVerb: "metrics",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"format": {
 				Type:        framework.TypeString,
@@ -3169,15 +1433,8 @@ func (b *SystemBackend) metricsPath() *framework.Path {
 				Query:       true,
 			},
 		},
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.ReadOperation: &framework.PathOperation{
-				Callback: b.handleMetrics,
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-					}},
-				},
-			},
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.ReadOperation: b.handleMetrics,
 		},
 		HelpSynopsis:    strings.TrimSpace(sysHelp["metrics"][0]),
 		HelpDescription: strings.TrimSpace(sysHelp["metrics"][1]),
@@ -3187,11 +1444,6 @@ func (b *SystemBackend) metricsPath() *framework.Path {
 func (b *SystemBackend) monitorPath() *framework.Path {
 	return &framework.Path{
 		Pattern: "monitor",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationVerb: "monitor",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"log_level": {
 				Type:        framework.TypeString,
@@ -3205,15 +1457,8 @@ func (b *SystemBackend) monitorPath() *framework.Path {
 				Default:     "standard",
 			},
 		},
-		Operations: map[logical.Operation]framework.OperationHandler{
-			logical.ReadOperation: &framework.PathOperation{
-				Callback: b.handleMonitor,
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-					}},
-				},
-			},
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.ReadOperation: b.handleMonitor,
 		},
 		HelpSynopsis:    strings.TrimSpace(sysHelp["monitor"][0]),
 		HelpDescription: strings.TrimSpace(sysHelp["monitor"][1]),
@@ -3223,23 +1468,11 @@ func (b *SystemBackend) monitorPath() *framework.Path {
 func (b *SystemBackend) inFlightRequestPath() *framework.Path {
 	return &framework.Path{
 		Pattern: "in-flight-req",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationVerb:   "collect",
-			OperationSuffix: "in-flight-request-information",
-		},
-
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.ReadOperation: &framework.PathOperation{
 				Callback:    b.handleInFlightRequestData,
 				Summary:     strings.TrimSpace(sysHelp["in-flight-req"][0]),
 				Description: strings.TrimSpace(sysHelp["in-flight-req"][1]),
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields:      nil, // dynamic fields
-					}},
-				},
 			},
 		},
 	}
@@ -3248,48 +1481,11 @@ func (b *SystemBackend) inFlightRequestPath() *framework.Path {
 func (b *SystemBackend) hostInfoPath() *framework.Path {
 	return &framework.Path{
 		Pattern: "host-info/?",
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationVerb:   "collect",
-			OperationSuffix: "host-information",
-		},
-
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.ReadOperation: &framework.PathOperation{
 				Callback:    b.handleHostInfo,
 				Summary:     strings.TrimSpace(sysHelp["host-info"][0]),
 				Description: strings.TrimSpace(sysHelp["host-info"][1]),
-				Responses: map[int][]framework.Response{
-					http.StatusOK: {{
-						Description: "OK",
-						Fields: map[string]*framework.FieldSchema{
-							"timestamp": {
-								Type:     framework.TypeTime,
-								Required: true,
-							},
-							"cpu": {
-								Type:     framework.TypeSlice,
-								Required: false,
-							},
-							"cpu_times": {
-								Type:     framework.TypeSlice,
-								Required: false,
-							},
-							"disk": {
-								Type:     framework.TypeSlice,
-								Required: false,
-							},
-							"host": {
-								Type:     framework.TypeMap,
-								Required: false,
-							},
-							"memory": {
-								Type:     framework.TypeMap,
-								Required: false,
-							},
-						},
-					}},
-				},
 			},
 		},
 		HelpSynopsis:    strings.TrimSpace(sysHelp["host-info"][0]),
@@ -3301,35 +1497,14 @@ func (b *SystemBackend) authPaths() []*framework.Path {
 	return []*framework.Path{
 		{
 			Pattern: "auth$",
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "auth",
-				OperationVerb:   "list",
-				OperationSuffix: "enabled-methods",
-			},
-
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.ReadOperation: &framework.PathOperation{
-					Callback: b.handleAuthTable,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							// response keys are dynamic
-							Fields: nil,
-						}},
-					},
-				},
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.ReadOperation: b.handleAuthTable,
 			},
 			HelpSynopsis:    strings.TrimSpace(sysHelp["auth-table"][0]),
 			HelpDescription: strings.TrimSpace(sysHelp["auth-table"][1]),
 		},
 		{
 			Pattern: "auth/(?P<path>.+?)/tune$",
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "auth",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"path": {
 					Type:        framework.TypeString,
@@ -3375,10 +1550,6 @@ func (b *SystemBackend) authPaths() []*framework.Path {
 					Type:        framework.TypeString,
 					Description: strings.TrimSpace(sysHelp["token_type"][0]),
 				},
-				"user_lockout_config": {
-					Type:        framework.TypeMap,
-					Description: strings.TrimSpace(sysHelp["tune_user_lockout_config"][0]),
-				},
 				"plugin_version": {
 					Type:        framework.TypeString,
 					Description: strings.TrimSpace(sysHelp["plugin-catalog_version"][0]),
@@ -3386,106 +1557,14 @@ func (b *SystemBackend) authPaths() []*framework.Path {
 			},
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
-					Callback: b.handleAuthTuneRead,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "read",
-						OperationSuffix: "tuning-information",
-					},
+					Callback:    b.handleAuthTuneRead,
 					Summary:     "Reads the given auth path's configuration.",
 					Description: "This endpoint requires sudo capability on the final path, but the same functionality can be achieved without sudo via `sys/mounts/auth/[auth-path]/tune`.",
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"description": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"default_lease_ttl": {
-									Type:     framework.TypeInt,
-									Required: true,
-								},
-								"max_lease_ttl": {
-									Type:     framework.TypeInt,
-									Required: true,
-								},
-								"force_no_cache": {
-									Type:     framework.TypeBool,
-									Required: true,
-								},
-								"external_entropy_access": {
-									Type:     framework.TypeBool,
-									Required: false,
-								},
-								"token_type": {
-									Type:     framework.TypeString,
-									Required: false,
-								},
-								"audit_non_hmac_request_keys": {
-									Type:     framework.TypeCommaStringSlice,
-									Required: false,
-								},
-								"audit_non_hmac_response_keys": {
-									Type:     framework.TypeCommaStringSlice,
-									Required: false,
-								},
-								"listing_visibility": {
-									Type:     framework.TypeString,
-									Required: false,
-								},
-								"passthrough_request_headers": {
-									Type:     framework.TypeCommaStringSlice,
-									Required: false,
-								},
-								"allowed_response_headers": {
-									Type:     framework.TypeCommaStringSlice,
-									Required: false,
-								},
-								"allowed_managed_keys": {
-									Type:     framework.TypeCommaStringSlice,
-									Required: false,
-								},
-								"user_lockout_counter_reset_duration": {
-									Type:     framework.TypeInt64,
-									Required: false,
-								},
-								"user_lockout_threshold": {
-									Type:     framework.TypeInt64, // uint64
-									Required: false,
-								},
-								"user_lockout_duration": {
-									Type:     framework.TypeInt64,
-									Required: false,
-								},
-								"user_lockout_disable": {
-									Type:     framework.TypeBool,
-									Required: false,
-								},
-								"options": {
-									Type:     framework.TypeMap,
-									Required: false,
-								},
-								"plugin_version": {
-									Type:     framework.TypeString,
-									Required: false,
-								},
-							},
-						}},
-					},
 				},
 				logical.UpdateOperation: &framework.PathOperation{
-					Callback: b.handleAuthTuneWrite,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "tune",
-						OperationSuffix: "configuration-parameters",
-					},
+					Callback:    b.handleAuthTuneWrite,
 					Summary:     "Tune configuration parameters for a given auth path.",
 					Description: "This endpoint requires sudo capability on the final path, but the same functionality can be achieved without sudo via `sys/mounts/auth/[auth-path]/tune`.",
-					Responses: map[int][]framework.Response{
-						http.StatusNoContent: {{
-							Description: "OK",
-						}},
-					},
 				},
 			},
 			HelpSynopsis:    strings.TrimSpace(sysHelp["auth_tune"][0]),
@@ -3493,11 +1572,6 @@ func (b *SystemBackend) authPaths() []*framework.Path {
 		},
 		{
 			Pattern: "auth/(?P<path>.+)",
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "auth",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"path": {
 					Type:        framework.TypeString,
@@ -3546,99 +1620,18 @@ func (b *SystemBackend) authPaths() []*framework.Path {
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
 					Callback: b.handleReadAuth,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "read",
-						OperationSuffix: "configuration",
-					},
-					Summary: "Read the configuration of the auth engine at the given path.",
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"type": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"description": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"accessor": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"local": {
-									Type:     framework.TypeBool,
-									Required: true,
-								},
-								"seal_wrap": {
-									Type:     framework.TypeBool,
-									Required: true,
-								},
-								"external_entropy_access": {
-									Type:     framework.TypeBool,
-									Required: true,
-								},
-								"options": {
-									Type:     framework.TypeMap,
-									Required: true,
-								},
-								"uuid": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"plugin_version": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"running_plugin_version": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"running_sha256": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"deprecation_status": {
-									Type:     framework.TypeString,
-									Required: false,
-								},
-								"config": {
-									Type:     framework.TypeMap,
-									Required: true,
-								},
-							},
-						}},
-					},
+					Summary:  "Read the configuration of the auth engine at the given path.",
 				},
 				logical.UpdateOperation: &framework.PathOperation{
 					Callback: b.handleEnableAuth,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "enable",
-						OperationSuffix: "method",
-					},
-					Summary: "Enables a new auth method.",
+					Summary:  "Enables a new auth method.",
 					Description: `After enabling, the auth method can be accessed and configured via the auth path specified as part of the URL. This auth path will be nested under the auth prefix.
 
 For example, enable the "foo" auth method will make it accessible at /auth/foo.`,
-					Responses: map[int][]framework.Response{
-						http.StatusNoContent: {{
-							Description: "OK",
-						}},
-					},
 				},
 				logical.DeleteOperation: &framework.PathOperation{
 					Callback: b.handleDisableAuth,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "disable",
-						OperationSuffix: "method",
-					},
-					Summary: "Disable the auth method at the given auth path",
-					Responses: map[int][]framework.Response{
-						http.StatusNoContent: {{
-							Description: "OK",
-						}},
-					},
+					Summary:  "Disable the auth method at the given auth path",
 				},
 			},
 			HelpSynopsis:    strings.TrimSpace(sysHelp["auth"][0]),
@@ -3652,46 +1645,9 @@ func (b *SystemBackend) policyPaths() []*framework.Path {
 		{
 			Pattern: "policy/?$",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "policies",
-				OperationVerb:   "list",
-			},
-
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.ReadOperation: &framework.PathOperation{
-					Callback: b.handlePoliciesList(PolicyTypeACL),
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"keys": {
-									Type:     framework.TypeStringSlice,
-									Required: true,
-								},
-								"policies": {
-									Type: framework.TypeStringSlice,
-								},
-							},
-						}},
-					},
-				},
-				logical.ListOperation: &framework.PathOperation{
-					Callback: b.handlePoliciesList(PolicyTypeACL),
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"keys": {
-									Type:     framework.TypeStringSlice,
-									Required: true,
-								},
-								"policies": {
-									Type: framework.TypeStringSlice,
-								},
-							},
-						}},
-					},
-				},
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.ReadOperation: b.handlePoliciesList(PolicyTypeACL),
+				logical.ListOperation: b.handlePoliciesList(PolicyTypeACL),
 			},
 
 			HelpSynopsis:    strings.TrimSpace(sysHelp["policy-list"][0]),
@@ -3701,11 +1657,6 @@ func (b *SystemBackend) policyPaths() []*framework.Path {
 		{
 			Pattern: "policy/(?P<name>.+)",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "policies",
-				OperationSuffix: "acl-policy2", // this endpoint duplicates /sys/policies/acl
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"name": {
 					Type:        framework.TypeString,
@@ -3725,46 +1676,15 @@ func (b *SystemBackend) policyPaths() []*framework.Path {
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
 					Callback: b.handlePoliciesRead(PolicyTypeACL),
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"name": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"rules": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"policy": {
-									Type:     framework.TypeString,
-									Required: false,
-								},
-							},
-						}},
-					},
-					Summary: "Retrieve the policy body for the named policy.",
+					Summary:  "Retrieve the policy body for the named policy.",
 				},
 				logical.UpdateOperation: &framework.PathOperation{
 					Callback: b.handlePoliciesSet(PolicyTypeACL),
-					Responses: map[int][]framework.Response{
-						http.StatusNoContent: {{
-							Description: "OK",
-							Fields:      map[string]*framework.FieldSchema{},
-						}},
-					},
-					Summary: "Add a new or update an existing policy.",
+					Summary:  "Add a new or update an existing policy.",
 				},
 				logical.DeleteOperation: &framework.PathOperation{
 					Callback: b.handlePoliciesDelete(PolicyTypeACL),
-					Responses: map[int][]framework.Response{
-						http.StatusNoContent: {{
-							Description: "OK",
-							Fields:      map[string]*framework.FieldSchema{},
-						}},
-					},
-					Summary: "Delete the policy with the given name.",
+					Summary:  "Delete the policy with the given name.",
 				},
 			},
 
@@ -3775,29 +1695,8 @@ func (b *SystemBackend) policyPaths() []*framework.Path {
 		{
 			Pattern: "policies/acl/?$",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "policies",
-				OperationSuffix: "acl-policies",
-			},
-
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.ListOperation: &framework.PathOperation{
-					Callback: b.handlePoliciesList(PolicyTypeACL),
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"keys": {
-									Type:     framework.TypeStringSlice,
-									Required: true,
-								},
-								"policies": {
-									Type: framework.TypeStringSlice,
-								},
-							},
-						}},
-					},
-				},
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.ListOperation: b.handlePoliciesList(PolicyTypeACL),
 			},
 
 			HelpSynopsis:    strings.TrimSpace(sysHelp["policy-list"][0]),
@@ -3807,11 +1706,6 @@ func (b *SystemBackend) policyPaths() []*framework.Path {
 		{
 			Pattern: "policies/acl/(?P<name>.+)",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "policies",
-				OperationSuffix: "acl-policy",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"name": {
 					Type:        framework.TypeString,
@@ -3826,46 +1720,15 @@ func (b *SystemBackend) policyPaths() []*framework.Path {
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
 					Callback: b.handlePoliciesRead(PolicyTypeACL),
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"name": {
-									Type:     framework.TypeString,
-									Required: false,
-								},
-								"rules": {
-									Type:     framework.TypeString,
-									Required: false,
-								},
-								"policy": {
-									Type:     framework.TypeString,
-									Required: false,
-								},
-							},
-						}},
-					},
-					Summary: "Retrieve information about the named ACL policy.",
+					Summary:  "Retrieve information about the named ACL policy.",
 				},
 				logical.UpdateOperation: &framework.PathOperation{
 					Callback: b.handlePoliciesSet(PolicyTypeACL),
-					Responses: map[int][]framework.Response{
-						http.StatusNoContent: {{
-							Description: "OK",
-							Fields:      map[string]*framework.FieldSchema{},
-						}},
-					},
-					Summary: "Add a new or update an existing ACL policy.",
+					Summary:  "Add a new or update an existing ACL policy.",
 				},
 				logical.DeleteOperation: &framework.PathOperation{
 					Callback: b.handlePoliciesDelete(PolicyTypeACL),
-					Responses: map[int][]framework.Response{
-						http.StatusNoContent: {{
-							Description: "OK",
-							Fields:      map[string]*framework.FieldSchema{},
-						}},
-					},
-					Summary: "Delete the ACL policy with the given name.",
+					Summary:  "Delete the ACL policy with the given name.",
 				},
 			},
 
@@ -3876,26 +1739,10 @@ func (b *SystemBackend) policyPaths() []*framework.Path {
 		{
 			Pattern: "policies/password/?$",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "policies",
-				OperationSuffix: "password-policies",
-			},
-
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ListOperation: &framework.PathOperation{
 					Callback: b.handlePoliciesPasswordList,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"keys": {
-									Type:     framework.TypeStringSlice,
-									Required: false,
-								},
-							},
-						}},
-					},
-					Summary: "List the existing password policies.",
+					Summary:  "List the existing password policies.",
 				},
 			},
 		},
@@ -3903,12 +1750,6 @@ func (b *SystemBackend) policyPaths() []*framework.Path {
 		{
 			Pattern: "policies/password/(?P<name>.+)/generate$",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "policies",
-				OperationVerb:   "generate",
-				OperationSuffix: "password-from-password-policy",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"name": {
 					Type:        framework.TypeString,
@@ -3919,18 +1760,7 @@ func (b *SystemBackend) policyPaths() []*framework.Path {
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
 					Callback: b.handlePoliciesPasswordGenerate,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"password": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-							},
-						}},
-					},
-					Summary: "Generate a password from an existing password policy.",
+					Summary:  "Generate a password from an existing password policy.",
 				},
 			},
 
@@ -3941,11 +1771,6 @@ func (b *SystemBackend) policyPaths() []*framework.Path {
 		{
 			Pattern: "policies/password/(?P<name>.+)$",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "policies",
-				OperationSuffix: "password-policy",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"name": {
 					Type:        framework.TypeString,
@@ -3960,38 +1785,15 @@ func (b *SystemBackend) policyPaths() []*framework.Path {
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.UpdateOperation: &framework.PathOperation{
 					Callback: b.handlePoliciesPasswordSet,
-					Responses: map[int][]framework.Response{
-						http.StatusNoContent: {{
-							Description: "OK",
-							Fields:      map[string]*framework.FieldSchema{},
-						}},
-					},
-					Summary: "Add a new or update an existing password policy.",
+					Summary:  "Add a new or update an existing password policy.",
 				},
 				logical.ReadOperation: &framework.PathOperation{
 					Callback: b.handlePoliciesPasswordGet,
-					Responses: map[int][]framework.Response{
-						http.StatusNoContent: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"policy": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-							},
-						}},
-					},
-					Summary: "Retrieve an existing password policy.",
+					Summary:  "Retrieve an existing password policy.",
 				},
 				logical.DeleteOperation: &framework.PathOperation{
 					Callback: b.handlePoliciesPasswordDelete,
-					Responses: map[int][]framework.Response{
-						http.StatusNoContent: {{
-							Description: "OK",
-							Fields:      map[string]*framework.FieldSchema{},
-						}},
-					},
-					Summary: "Delete a password policy.",
+					Summary:  "Delete a password policy.",
 				},
 			},
 
@@ -4007,27 +1809,10 @@ func (b *SystemBackend) wrappingPaths() []*framework.Path {
 		{
 			Pattern: "wrapping/wrap$",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationVerb: "wrap",
-			},
-
 			Callbacks: map[logical.Operation]framework.OperationFunc{
 				logical.UpdateOperation: b.handleWrappingWrap,
 			},
 
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.UpdateOperation: &framework.PathOperation{
-					Callback: b.handleWrappingWrap,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							// dynamic fields
-							Fields: nil,
-						}},
-					},
-				},
-			},
-
 			HelpSynopsis:    strings.TrimSpace(sysHelp["wrap"][0]),
 			HelpDescription: strings.TrimSpace(sysHelp["wrap"][1]),
 
@@ -4037,30 +1822,14 @@ func (b *SystemBackend) wrappingPaths() []*framework.Path {
 		{
 			Pattern: "wrapping/unwrap$",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationVerb: "unwrap",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"token": {
 					Type: framework.TypeString,
 				},
 			},
 
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.UpdateOperation: &framework.PathOperation{
-					Callback: b.handleWrappingUnwrap,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							// dynamic fields
-							Fields: nil,
-						}},
-						http.StatusNoContent: {{
-							Description: "No content",
-						}},
-					},
-				},
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.UpdateOperation: b.handleWrappingUnwrap,
 			},
 
 			HelpSynopsis:    strings.TrimSpace(sysHelp["unwrap"][0]),
@@ -4079,57 +1848,11 @@ func (b *SystemBackend) wrappingPaths() []*framework.Path {
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.UpdateOperation: &framework.PathOperation{
 					Callback: b.handleWrappingLookup,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "read",
-						OperationSuffix: "wrapping-properties",
-					},
-					Summary: "Look up wrapping properties for the given token.",
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"creation_ttl": {
-									Type:     framework.TypeDurationSecond,
-									Required: false,
-								},
-								"creation_time": {
-									Type:     framework.TypeTime,
-									Required: false,
-								},
-								"creation_path": {
-									Type:     framework.TypeString,
-									Required: false,
-								},
-							},
-						}},
-					},
+					Summary:  "Look up wrapping properties for the given token.",
 				},
 				logical.ReadOperation: &framework.PathOperation{
 					Callback: b.handleWrappingLookup,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "read",
-						OperationSuffix: "wrapping-properties2",
-					},
-					Summary: "Look up wrapping properties for the requester's token.",
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"creation_ttl": {
-									Type:     framework.TypeDurationSecond,
-									Required: false,
-								},
-								"creation_time": {
-									Type:     framework.TypeTime,
-									Required: false,
-								},
-								"creation_path": {
-									Type:     framework.TypeString,
-									Required: false,
-								},
-							},
-						}},
-					},
+					Summary:  "Look up wrapping properties for the requester's token.",
 				},
 			},
 
@@ -4140,27 +1863,14 @@ func (b *SystemBackend) wrappingPaths() []*framework.Path {
 		{
 			Pattern: "wrapping/rewrap$",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationVerb: "rewrap",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"token": {
 					Type: framework.TypeString,
 				},
 			},
 
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.UpdateOperation: &framework.PathOperation{
-					Callback: b.handleWrappingRewrap,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							// dynamic fields
-							Fields: nil,
-						}},
-					},
-				},
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.UpdateOperation: b.handleWrappingRewrap,
 			},
 
 			HelpSynopsis:    strings.TrimSpace(sysHelp["rewrap"][0]),
@@ -4174,10 +1884,6 @@ func (b *SystemBackend) mountPaths() []*framework.Path {
 		{
 			Pattern: "mounts/(?P<path>.+?)/tune$",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "mounts",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"path": {
 					Type:        framework.TypeString,
@@ -4231,119 +1937,11 @@ func (b *SystemBackend) mountPaths() []*framework.Path {
 					Type:        framework.TypeString,
 					Description: strings.TrimSpace(sysHelp["plugin-catalog_version"][0]),
 				},
-				"user_lockout_config": {
-					Type:        framework.TypeMap,
-					Description: strings.TrimSpace(sysHelp["tune_user_lockout_config"][0]),
-				},
 			},
 
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.ReadOperation: &framework.PathOperation{
-					Callback: b.handleMountTuneRead,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "read",
-						OperationSuffix: "tuning-information",
-					},
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"max_lease_ttl": {
-									Type:        framework.TypeInt,
-									Description: strings.TrimSpace(sysHelp["tune_max_lease_ttl"][0]),
-									Required:    true,
-								},
-								"description": {
-									Type:        framework.TypeString,
-									Description: strings.TrimSpace(sysHelp["auth_desc"][0]),
-									Required:    true,
-								},
-								"default_lease_ttl": {
-									Type:        framework.TypeInt,
-									Description: strings.TrimSpace(sysHelp["tune_default_lease_ttl"][0]),
-									Required:    true,
-								},
-								"force_no_cache": {
-									Type:     framework.TypeBool,
-									Required: true,
-								},
-								"token_type": {
-									Type:        framework.TypeString,
-									Description: strings.TrimSpace(sysHelp["token_type"][0]),
-									Required:    false,
-								},
-								"allowed_managed_keys": {
-									Type:        framework.TypeCommaStringSlice,
-									Description: strings.TrimSpace(sysHelp["tune_allowed_managed_keys"][0]),
-									Required:    false,
-								},
-								"allowed_response_headers": {
-									Type:        framework.TypeCommaStringSlice,
-									Description: strings.TrimSpace(sysHelp["allowed_response_headers"][0]),
-									Required:    false,
-								},
-								"options": {
-									Type:        framework.TypeKVPairs,
-									Description: strings.TrimSpace(sysHelp["tune_mount_options"][0]),
-									Required:    false,
-								},
-								"plugin_version": {
-									Type:        framework.TypeString,
-									Description: strings.TrimSpace(sysHelp["plugin-catalog_version"][0]),
-									Required:    false,
-								},
-								"external_entropy_access": {
-									Type:     framework.TypeBool,
-									Required: false,
-								},
-								"audit_non_hmac_request_keys": {
-									Type:     framework.TypeCommaStringSlice,
-									Required: false,
-								},
-								"audit_non_hmac_response_keys": {
-									Type:     framework.TypeCommaStringSlice,
-									Required: false,
-								},
-								"listing_visibility": {
-									Type:     framework.TypeString,
-									Required: false,
-								},
-								"passthrough_request_headers": {
-									Type:     framework.TypeCommaStringSlice,
-									Required: false,
-								},
-								"user_lockout_counter_reset_duration": {
-									Type:     framework.TypeInt64,
-									Required: false,
-								},
-								"user_lockout_threshold": {
-									Type:     framework.TypeInt64, // TODO this is actuall a Uint64 do we need a new type?
-									Required: false,
-								},
-								"user_lockout_duration": {
-									Type:     framework.TypeInt64,
-									Required: false,
-								},
-								"user_lockout_disable": {
-									Type:     framework.TypeBool,
-									Required: false,
-								},
-							},
-						}},
-					},
-				},
-				logical.UpdateOperation: &framework.PathOperation{
-					Callback: b.handleMountTuneWrite,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "tune",
-						OperationSuffix: "configuration-parameters",
-					},
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-						}},
-					},
-				},
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.ReadOperation:   b.handleMountTuneRead,
+				logical.UpdateOperation: b.handleMountTuneWrite,
 			},
 
 			HelpSynopsis:    strings.TrimSpace(sysHelp["mount_tune"][0]),
@@ -4353,10 +1951,6 @@ func (b *SystemBackend) mountPaths() []*framework.Path {
 		{
 			Pattern: "mounts/(?P<path>.+?)",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "mounts",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"path": {
 					Type:        framework.TypeString,
@@ -4406,105 +2000,15 @@ func (b *SystemBackend) mountPaths() []*framework.Path {
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
 					Callback: b.handleReadMount,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "read",
-						OperationSuffix: "configuration",
-					},
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"type": {
-									Type:        framework.TypeString,
-									Description: strings.TrimSpace(sysHelp["mount_type"][0]),
-									Required:    true,
-								},
-								"description": {
-									Type:        framework.TypeString,
-									Description: strings.TrimSpace(sysHelp["mount_desc"][0]),
-									Required:    true,
-								},
-								"accessor": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"local": {
-									Type:        framework.TypeBool,
-									Default:     false,
-									Description: strings.TrimSpace(sysHelp["mount_local"][0]),
-									Required:    true,
-								},
-								"seal_wrap": {
-									Type:        framework.TypeBool,
-									Default:     false,
-									Description: strings.TrimSpace(sysHelp["seal_wrap"][0]),
-									Required:    true,
-								},
-								"external_entropy_access": {
-									Type:     framework.TypeBool,
-									Required: true,
-								},
-								"options": {
-									Type:        framework.TypeKVPairs,
-									Description: strings.TrimSpace(sysHelp["mount_options"][0]),
-									Required:    true,
-								},
-								"plugin_version": {
-									Type:        framework.TypeString,
-									Description: strings.TrimSpace(sysHelp["plugin-catalog_version"][0]),
-									Required:    true,
-								},
-								"uuid": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"running_plugin_version": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"running_sha256": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"config": {
-									Type:        framework.TypeMap,
-									Description: strings.TrimSpace(sysHelp["mount_config"][0]),
-									Required:    true,
-								},
-								"deprecation_status": {
-									Type:     framework.TypeString,
-									Required: false,
-								},
-							},
-						}},
-					},
-					Summary: "Read the configuration of the secret engine at the given path.",
+					Summary:  "Read the configuration of the secret engine at the given path.",
 				},
 				logical.UpdateOperation: &framework.PathOperation{
 					Callback: b.handleMount,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "enable",
-						OperationSuffix: "secrets-engine",
-					},
-					Responses: map[int][]framework.Response{
-						http.StatusNoContent: {{
-							Description: "OK",
-						}},
-					},
-					Summary: "Enable a new secrets engine at the given path.",
+					Summary:  "Enable a new secrets engine at the given path.",
 				},
 				logical.DeleteOperation: &framework.PathOperation{
 					Callback: b.handleUnmount,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb:   "disable",
-						OperationSuffix: "secrets-engine",
-					},
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-						}},
-					},
-					Summary: "Disable the mount point specified at the given path.",
+					Summary:  "Disable the mount point specified at the given path.",
 				},
 			},
 			HelpSynopsis:    strings.TrimSpace(sysHelp["mount"][0]),
@@ -4514,22 +2018,8 @@ func (b *SystemBackend) mountPaths() []*framework.Path {
 		{
 			Pattern: "mounts$",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "mounts",
-				OperationVerb:   "list",
-				OperationSuffix: "secrets-engines",
-			},
-
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.ReadOperation: &framework.PathOperation{
-					Callback: b.handleMountTable,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields:      map[string]*framework.FieldSchema{},
-						}},
-					},
-				},
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.ReadOperation: b.handleMountTable,
 			},
 
 			HelpSynopsis:    strings.TrimSpace(sysHelp["mounts"][0]),
@@ -4537,81 +2027,3 @@ func (b *SystemBackend) mountPaths() []*framework.Path {
 		},
 	}
 }
-
-func (b *SystemBackend) experimentPaths() []*framework.Path {
-	return []*framework.Path{
-		{
-			Pattern: "experiments$",
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationVerb:   "list",
-				OperationSuffix: "experimental-features",
-			},
-
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.ReadOperation: &framework.PathOperation{
-					Callback: b.handleReadExperiments,
-					Summary:  "Returns the available and enabled experiments",
-				},
-			},
-
-			HelpSynopsis:    strings.TrimSpace(sysHelp["experiments"][0]),
-			HelpDescription: strings.TrimSpace(sysHelp["experiments"][1]),
-		},
-	}
-}
-
-func (b *SystemBackend) lockedUserPaths() []*framework.Path {
-	return []*framework.Path{
-		{
-			Pattern: "locked-users/(?P<mount_accessor>.+?)/unlock/(?P<alias_identifier>.+)",
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "locked-users",
-				OperationVerb:   "unlock",
-			},
-
-			Fields: map[string]*framework.FieldSchema{
-				"mount_accessor": {
-					Type:        framework.TypeString,
-					Description: strings.TrimSpace(sysHelp["mount_accessor"][0]),
-				},
-				"alias_identifier": {
-					Type:        framework.TypeString,
-					Description: strings.TrimSpace(sysHelp["alias_identifier"][0]),
-				},
-			},
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.UpdateOperation: &framework.PathOperation{
-					Callback: b.handleUnlockUser,
-					Summary:  "Unlocks the user with given mount_accessor and alias_identifier",
-				},
-			},
-			HelpSynopsis:    strings.TrimSpace(sysHelp["unlock_user"][0]),
-			HelpDescription: strings.TrimSpace(sysHelp["unlock_user"][1]),
-		},
-		{
-			Pattern: "locked-users",
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "locked-users",
-				OperationVerb:   "list",
-			},
-
-			Fields: map[string]*framework.FieldSchema{
-				"mount_accessor": {
-					Type:        framework.TypeString,
-					Description: strings.TrimSpace(sysHelp["mount_accessor"][0]),
-				},
-			},
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.ReadOperation: &framework.PathOperation{
-					Callback: b.handleLockedUsersMetricQuery,
-					Summary:  "Report the locked user count metrics, for this namespace and all child namespaces.",
-				},
-			},
-			HelpSynopsis:    strings.TrimSpace(sysHelp["locked_users"][0]),
-			HelpDescription: strings.TrimSpace(sysHelp["locked_users"][1]),
-		},
-	}
-}
diff --git a/vault/logical_system_pprof.go b/vault/logical_system_pprof.go
index 9b5a5a8fa2819..ce7fc4b27a442 100644
--- a/vault/logical_system_pprof.go
+++ b/vault/logical_system_pprof.go
@@ -1,13 +1,9 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
 	"context"
 	"errors"
 	"fmt"
-	"net/http"
 	"net/http/pprof"
 	"strconv"
 
@@ -20,20 +16,10 @@ func (b *SystemBackend) pprofPaths() []*framework.Path {
 		{
 			Pattern: "pprof/$",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "pprof",
-				OperationVerb:   "index",
-			},
-
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
 					Callback: b.handlePprofIndex,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-						}},
-					},
-					Summary: "Returns an HTML page listing the available profiles.",
+					Summary:  "Returns an HTML page listing the available profiles.",
 					Description: `Returns an HTML page listing the available 
 profiles. This should be mainly accessed via browsers or applications that can 
 render pages.`,
@@ -43,19 +29,9 @@ render pages.`,
 		{
 			Pattern: "pprof/cmdline",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "pprof",
-				OperationVerb:   "command-line",
-			},
-
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
-					Callback: b.handlePprofCmdline,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-						}},
-					},
+					Callback:    b.handlePprofCmdline,
 					Summary:     "Returns the running program's command line.",
 					Description: "Returns the running program's command line, with arguments separated by NUL bytes.",
 				},
@@ -64,19 +40,9 @@ render pages.`,
 		{
 			Pattern: "pprof/goroutine",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "pprof",
-				OperationVerb:   "goroutines",
-			},
-
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
-					Callback: b.handlePprofGoroutine,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-						}},
-					},
+					Callback:    b.handlePprofGoroutine,
 					Summary:     "Returns stack traces of all current goroutines.",
 					Description: "Returns stack traces of all current goroutines.",
 				},
@@ -85,19 +51,9 @@ render pages.`,
 		{
 			Pattern: "pprof/heap",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "pprof",
-				OperationVerb:   "memory-allocations-live",
-			},
-
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
-					Callback: b.handlePprofHeap,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-						}},
-					},
+					Callback:    b.handlePprofHeap,
 					Summary:     "Returns a sampling of memory allocations of live object.",
 					Description: "Returns a sampling of memory allocations of live object.",
 				},
@@ -106,19 +62,9 @@ render pages.`,
 		{
 			Pattern: "pprof/allocs",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "pprof",
-				OperationVerb:   "memory-allocations",
-			},
-
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
-					Callback: b.handlePprofAllocs,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-						}},
-					},
+					Callback:    b.handlePprofAllocs,
 					Summary:     "Returns a sampling of all past memory allocations.",
 					Description: "Returns a sampling of all past memory allocations.",
 				},
@@ -127,20 +73,9 @@ render pages.`,
 		{
 			Pattern: "pprof/threadcreate",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "pprof",
-				OperationVerb:   "thread-creations",
-			},
-
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
-					Callback: b.handlePprofThreadcreate,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-						}},
-					},
-
+					Callback:    b.handlePprofThreadcreate,
 					Summary:     "Returns stack traces that led to the creation of new OS threads",
 					Description: "Returns stack traces that led to the creation of new OS threads",
 				},
@@ -149,19 +84,9 @@ render pages.`,
 		{
 			Pattern: "pprof/block",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "pprof",
-				OperationVerb:   "blocking",
-			},
-
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
-					Callback: b.handlePprofBlock,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-						}},
-					},
+					Callback:    b.handlePprofBlock,
 					Summary:     "Returns stack traces that led to blocking on synchronization primitives",
 					Description: "Returns stack traces that led to blocking on synchronization primitives",
 				},
@@ -170,19 +95,9 @@ render pages.`,
 		{
 			Pattern: "pprof/mutex",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "pprof",
-				OperationVerb:   "mutexes",
-			},
-
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
-					Callback: b.handlePprofMutex,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-						}},
-					},
+					Callback:    b.handlePprofMutex,
 					Summary:     "Returns stack traces of holders of contended mutexes",
 					Description: "Returns stack traces of holders of contended mutexes",
 				},
@@ -191,11 +106,6 @@ render pages.`,
 		{
 			Pattern: "pprof/profile",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "pprof",
-				OperationVerb:   "cpu-profile",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"seconds": {
 					Type:        framework.TypeInt,
@@ -205,12 +115,7 @@ render pages.`,
 
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
-					Callback: b.handlePprofProfile,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-						}},
-					},
+					Callback:    b.handlePprofProfile,
 					Summary:     "Returns a pprof-formatted cpu profile payload.",
 					Description: "Returns a pprof-formatted cpu profile payload. Profiling lasts for duration specified in seconds GET parameter, or for 30 seconds if not specified.",
 				},
@@ -219,19 +124,9 @@ render pages.`,
 		{
 			Pattern: "pprof/symbol",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "pprof",
-				OperationVerb:   "symbols",
-			},
-
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
-					Callback: b.handlePprofSymbol,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-						}},
-					},
+					Callback:    b.handlePprofSymbol,
 					Summary:     "Returns the program counters listed in the request.",
 					Description: "Returns the program counters listed in the request.",
 				},
@@ -241,11 +136,6 @@ render pages.`,
 		{
 			Pattern: "pprof/trace",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "pprof",
-				OperationVerb:   "execution-trace",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"seconds": {
 					Type:        framework.TypeInt,
@@ -255,12 +145,7 @@ render pages.`,
 
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ReadOperation: &framework.PathOperation{
-					Callback: b.handlePprofTrace,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-						}},
-					},
+					Callback:    b.handlePprofTrace,
 					Summary:     "Returns the execution trace in binary form.",
 					Description: "Returns  the execution trace in binary form. Tracing lasts for duration specified in seconds GET parameter, or for 1 second if not specified.",
 				},
diff --git a/vault/logical_system_quotas.go b/vault/logical_system_quotas.go
index 1a9dbbf6084f0..9d8de5769742e 100644
--- a/vault/logical_system_quotas.go
+++ b/vault/logical_system_quotas.go
@@ -1,11 +1,7 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
 	"context"
-	"net/http"
 	"strings"
 	"time"
 
@@ -21,11 +17,6 @@ func (b *SystemBackend) quotasPaths() []*framework.Path {
 	return []*framework.Path{
 		{
 			Pattern: "quotas/config$",
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "rate-limit-quotas",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"rate_limit_exempt_paths": {
 					Type:        framework.TypeStringSlice,
@@ -43,39 +34,9 @@ func (b *SystemBackend) quotasPaths() []*framework.Path {
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.UpdateOperation: &framework.PathOperation{
 					Callback: b.handleQuotasConfigUpdate(),
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb: "configure",
-					},
-					Responses: map[int][]framework.Response{
-						http.StatusNoContent: {{
-							Description: "OK",
-						}},
-					},
 				},
 				logical.ReadOperation: &framework.PathOperation{
 					Callback: b.handleQuotasConfigRead(),
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationSuffix: "configuration",
-					},
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"enable_rate_limit_audit_logging": {
-									Type:     framework.TypeBool,
-									Required: true,
-								},
-								"enable_rate_limit_response_headers": {
-									Type:     framework.TypeBool,
-									Required: true,
-								},
-								"rate_limit_exempt_paths": {
-									Type:     framework.TypeStringSlice,
-									Required: true,
-								},
-							},
-						}},
-					},
 				},
 			},
 			HelpSynopsis:    strings.TrimSpace(quotasHelp["quotas-config"][0]),
@@ -83,26 +44,9 @@ func (b *SystemBackend) quotasPaths() []*framework.Path {
 		},
 		{
 			Pattern: "quotas/rate-limit/?$",
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "rate-limit-quotas",
-				OperationVerb:   "list",
-			},
-
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.ListOperation: &framework.PathOperation{
 					Callback: b.handleRateLimitQuotasList(),
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"keys": {
-									Type:     framework.TypeStringSlice,
-									Required: true,
-								},
-							},
-						}},
-					},
 				},
 			},
 			HelpSynopsis:    strings.TrimSpace(quotasHelp["rate-limit-list"][0]),
@@ -110,11 +54,6 @@ func (b *SystemBackend) quotasPaths() []*framework.Path {
 		},
 		{
 			Pattern: "quotas/rate-limit/" + framework.GenericNameRegex("name"),
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "rate-limit-quotas",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"type": {
 					Type:        framework.TypeString,
@@ -153,66 +92,12 @@ from any further requests until after the 'block_interval' has elapsed.`,
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.UpdateOperation: &framework.PathOperation{
 					Callback: b.handleRateLimitQuotasUpdate(),
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb: "write",
-					},
-					Responses: map[int][]framework.Response{
-						http.StatusNoContent: {{
-							Description: http.StatusText(http.StatusNoContent),
-						}},
-					},
 				},
 				logical.ReadOperation: &framework.PathOperation{
 					Callback: b.handleRateLimitQuotasRead(),
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb: "read",
-					},
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-							Fields: map[string]*framework.FieldSchema{
-								"type": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"name": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"path": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"role": {
-									Type:     framework.TypeString,
-									Required: true,
-								},
-								"rate": {
-									Type:     framework.TypeFloat,
-									Required: true,
-								},
-								"interval": {
-									Type:     framework.TypeInt,
-									Required: true,
-								},
-								"block_interval": {
-									Type:     framework.TypeInt,
-									Required: true,
-								},
-							},
-						}},
-					},
 				},
 				logical.DeleteOperation: &framework.PathOperation{
 					Callback: b.handleRateLimitQuotasDelete(),
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb: "delete",
-					},
-					Responses: map[int][]framework.Response{
-						http.StatusNoContent: {{
-							Description: "OK",
-						}},
-					},
 				},
 			},
 			HelpSynopsis:    strings.TrimSpace(quotasHelp["rate-limit"][0]),
diff --git a/vault/logical_system_raft.go b/vault/logical_system_raft.go
index ca475eddcc77c..a415b1710e503 100644
--- a/vault/logical_system_raft.go
+++ b/vault/logical_system_raft.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -592,9 +589,7 @@ func (b *SystemBackend) handleStorageRaftSnapshotWrite(force bool) framework.Ope
 			defer cleanup()
 
 			// Grab statelock
-			l := newLockGrabber(b.Core.stateLock.Lock, b.Core.stateLock.Unlock, b.Core.standbyStopCh.Load().(chan struct{}))
-			go l.grab()
-			if stopped := l.lockOrStop(); stopped {
+			if stopped := grabLockOrStop(b.Core.stateLock.Lock, b.Core.stateLock.Unlock, b.Core.standbyStopCh.Load().(chan struct{})); stopped {
 				b.Core.logger.Error("not applying snapshot; shutting down")
 				return
 			}
diff --git a/vault/logical_system_test.go b/vault/logical_system_test.go
index 5ee5b3fdf2212..e7c3768aa3a8a 100644
--- a/vault/logical_system_test.go
+++ b/vault/logical_system_test.go
@@ -1,10 +1,8 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
 	"context"
+	"crypto/sha256"
 	"encoding/base64"
 	"encoding/hex"
 	"fmt"
@@ -21,23 +19,21 @@ import (
 	"github.com/go-test/deep"
 	"github.com/hashicorp/go-hclog"
 	semver "github.com/hashicorp/go-version"
+	"github.com/hashicorp/vault/audit"
 	credUserpass "github.com/hashicorp/vault/builtin/credential/userpass"
 	"github.com/hashicorp/vault/helper/builtinplugins"
-	"github.com/hashicorp/vault/helper/experiments"
 	"github.com/hashicorp/vault/helper/identity"
 	"github.com/hashicorp/vault/helper/namespace"
 	"github.com/hashicorp/vault/helper/random"
-	"github.com/hashicorp/vault/helper/testhelpers/corehelpers"
 	"github.com/hashicorp/vault/helper/versions"
 	"github.com/hashicorp/vault/sdk/framework"
 	"github.com/hashicorp/vault/sdk/helper/compressutil"
 	"github.com/hashicorp/vault/sdk/helper/consts"
 	"github.com/hashicorp/vault/sdk/helper/jsonutil"
-	"github.com/hashicorp/vault/sdk/helper/logging"
 	"github.com/hashicorp/vault/sdk/helper/pluginutil"
-	"github.com/hashicorp/vault/sdk/helper/testhelpers/schema"
+	"github.com/hashicorp/vault/sdk/helper/salt"
 	"github.com/hashicorp/vault/sdk/logical"
-	"github.com/hashicorp/vault/version"
+	"github.com/hashicorp/vault/sdk/version"
 	"github.com/mitchellh/mapstructure"
 )
 
@@ -67,7 +63,6 @@ func TestSystemBackend_RootPaths(t *testing.T) {
 		"leases/lookup/*",
 		"storage/raft/snapshot-auto/config/*",
 		"leases",
-		"internal/inspect/*",
 	}
 
 	b := testSystemBackend(t)
@@ -79,7 +74,6 @@ func TestSystemBackend_RootPaths(t *testing.T) {
 
 func TestSystemConfigCORS(t *testing.T) {
 	b := testSystemBackend(t)
-	paths := b.(*SystemBackend).configPaths()
 	_, barrier, _ := mockBarrier(t)
 	view := NewBarrierView(barrier, "")
 	b.(*SystemBackend).Core.systemBarrierView = view
@@ -109,67 +103,37 @@ func TestSystemConfigCORS(t *testing.T) {
 	if !reflect.DeepEqual(actual, expected) {
 		t.Fatalf("bad: %#v", actual)
 	}
-	schema.ValidateResponse(
-		t,
-		schema.FindResponseSchema(t, paths, 0, req.Operation),
-		actual,
-		true,
-	)
 
 	// Do it again. Bug #6182
 	req = logical.TestRequest(t, logical.UpdateOperation, "config/cors")
 	req.Data["allowed_origins"] = "http://www.example.com"
 	req.Data["allowed_headers"] = "X-Custom-Header"
-	resp, err := b.HandleRequest(namespace.RootContext(nil), req)
+	_, err = b.HandleRequest(namespace.RootContext(nil), req)
 	if err != nil {
 		t.Fatal(err)
 	}
-	schema.ValidateResponse(
-		t,
-		schema.FindResponseSchema(t, paths, 0, req.Operation),
-		resp,
-		true,
-	)
 
 	req = logical.TestRequest(t, logical.ReadOperation, "config/cors")
 	actual, err = b.HandleRequest(namespace.RootContext(nil), req)
 	if err != nil {
 		t.Fatalf("err: %v", err)
 	}
-	schema.ValidateResponse(
-		t,
-		schema.FindResponseSchema(t, paths, 0, req.Operation),
-		actual,
-		true,
-	)
 
 	if !reflect.DeepEqual(actual, expected) {
 		t.Fatalf("bad: %#v", actual)
 	}
 
 	req = logical.TestRequest(t, logical.DeleteOperation, "config/cors")
-	resp, err = b.HandleRequest(namespace.RootContext(nil), req)
+	_, err = b.HandleRequest(namespace.RootContext(nil), req)
 	if err != nil {
 		t.Fatalf("err: %v", err)
 	}
-	schema.ValidateResponse(
-		t,
-		schema.FindResponseSchema(t, paths, 0, req.Operation),
-		resp,
-		true,
-	)
 
 	req = logical.TestRequest(t, logical.ReadOperation, "config/cors")
 	actual, err = b.HandleRequest(namespace.RootContext(nil), req)
 	if err != nil {
 		t.Fatalf("err: %v", err)
 	}
-	schema.ValidateResponse(
-		t,
-		schema.FindResponseSchema(t, paths, 0, req.Operation),
-		actual,
-		true,
-	)
 
 	expected = &logical.Response{
 		Data: map[string]interface{}{
@@ -283,14 +247,6 @@ func TestSystemBackend_mounts(t *testing.T) {
 		if diff := deep.Equal(resp.Data, conf); len(diff) > 0 {
 			t.Fatalf("bad, diff: %#v", diff)
 		}
-
-		// validate the response structure for mount named read
-		schema.ValidateResponse(
-			t,
-			schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-			resp,
-			true,
-		)
 	}
 }
 
@@ -313,14 +269,9 @@ func TestSystemBackend_mount(t *testing.T) {
 	if err != nil {
 		t.Fatalf("err: %v", err)
 	}
-
-	// validate the response structure for mount named update
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-		resp,
-		true,
-	)
+	if resp != nil {
+		t.Fatalf("bad: %v", resp)
+	}
 
 	req = logical.TestRequest(t, logical.ReadOperation, "mounts")
 	resp, err = b.HandleRequest(namespace.RootContext(nil), req)
@@ -481,14 +432,9 @@ func TestSystemBackend_unmount(t *testing.T) {
 	if err != nil {
 		t.Fatalf("err: %v", err)
 	}
-
-	// validate the response structure for mount named delete
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-		resp,
-		true,
-	)
+	if resp != nil {
+		t.Fatalf("bad: %v", resp)
+	}
 }
 
 var capabilitiesPolicy = `
@@ -536,45 +482,31 @@ func TestSystemBackend_PathCapabilities(t *testing.T) {
 	}
 
 	// Check the capabilities using the root token
-	req := &logical.Request{
+	resp, err = b.HandleRequest(namespace.RootContext(nil), &logical.Request{
 		Path:      "capabilities",
 		Operation: logical.UpdateOperation,
 		Data: map[string]interface{}{
 			"paths": []string{path1, path2, path3, path4},
 			"token": rootToken,
 		},
-	}
-	resp, err = b.HandleRequest(namespace.RootContext(nil), req)
+	})
 	if err != nil || (resp != nil && resp.IsError()) {
 		t.Fatalf("bad: resp: %#v\nerr: %v", resp, err)
 	}
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-		resp,
-		true,
-	)
 	rootCheckFunc(t, resp)
 
 	// Check the capabilities using capabilities-self
-	req = &logical.Request{
+	resp, err = b.HandleRequest(namespace.RootContext(nil), &logical.Request{
 		ClientToken: rootToken,
 		Path:        "capabilities-self",
 		Operation:   logical.UpdateOperation,
 		Data: map[string]interface{}{
 			"paths": []string{path1, path2, path3, path4},
 		},
-	}
-	resp, err = b.HandleRequest(namespace.RootContext(nil), req)
+	})
 	if err != nil || (resp != nil && resp.IsError()) {
 		t.Fatalf("bad: resp: %#v\nerr: %v", resp, err)
 	}
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-		resp,
-		true,
-	)
 	rootCheckFunc(t, resp)
 
 	// Lookup the accessor of the root token
@@ -584,24 +516,17 @@ func TestSystemBackend_PathCapabilities(t *testing.T) {
 	}
 
 	// Check the capabilities using capabilities-accessor endpoint
-	req = &logical.Request{
+	resp, err = b.HandleRequest(namespace.RootContext(nil), &logical.Request{
 		Path:      "capabilities-accessor",
 		Operation: logical.UpdateOperation,
 		Data: map[string]interface{}{
 			"paths":    []string{path1, path2, path3, path4},
 			"accessor": te.Accessor,
 		},
-	}
-	resp, err = b.HandleRequest(namespace.RootContext(nil), req)
+	})
 	if err != nil || (resp != nil && resp.IsError()) {
 		t.Fatalf("bad: resp: %#v\nerr: %v", resp, err)
 	}
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-		resp,
-		true,
-	)
 	rootCheckFunc(t, resp)
 
 	// Create a non-root token
@@ -622,46 +547,32 @@ func TestSystemBackend_PathCapabilities(t *testing.T) {
 	}
 
 	// Check the capabilities using a non-root token
-	req = &logical.Request{
+	resp, err = b.HandleRequest(namespace.RootContext(nil), &logical.Request{
 		Path:      "capabilities",
 		Operation: logical.UpdateOperation,
 		Data: map[string]interface{}{
 			"paths": []string{path1, path2, path3, path4},
 			"token": "tokenid",
 		},
-	}
-	resp, err = b.HandleRequest(namespace.RootContext(nil), req)
+	})
 	if err != nil || (resp != nil && resp.IsError()) {
 		t.Fatalf("bad: resp: %#v\nerr: %v", resp, err)
 	}
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-		resp,
-		true,
-	)
 	nonRootCheckFunc(t, resp)
 
 	// Check the capabilities of a non-root token using capabilities-self
 	// endpoint
-	req = &logical.Request{
+	resp, err = b.HandleRequest(namespace.RootContext(nil), &logical.Request{
 		ClientToken: "tokenid",
 		Path:        "capabilities-self",
 		Operation:   logical.UpdateOperation,
 		Data: map[string]interface{}{
 			"paths": []string{path1, path2, path3, path4},
 		},
-	}
-	resp, err = b.HandleRequest(namespace.RootContext(nil), req)
+	})
 	if err != nil || (resp != nil && resp.IsError()) {
 		t.Fatalf("bad: resp: %#v\nerr: %v", resp, err)
 	}
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-		resp,
-		true,
-	)
 	nonRootCheckFunc(t, resp)
 
 	// Lookup the accessor of the non-root token
@@ -672,24 +583,17 @@ func TestSystemBackend_PathCapabilities(t *testing.T) {
 
 	// Check the capabilities using a non-root token using
 	// capabilities-accessor endpoint
-	req = &logical.Request{
+	resp, err = b.HandleRequest(namespace.RootContext(nil), &logical.Request{
 		Path:      "capabilities-accessor",
 		Operation: logical.UpdateOperation,
 		Data: map[string]interface{}{
 			"paths":    []string{path1, path2, path3, path4},
 			"accessor": te.Accessor,
 		},
-	}
-	resp, err = b.HandleRequest(namespace.RootContext(nil), req)
+	})
 	if err != nil || (resp != nil && resp.IsError()) {
 		t.Fatalf("bad: resp: %#v\nerr: %v", resp, err)
 	}
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-		resp,
-		true,
-	)
 	nonRootCheckFunc(t, resp)
 }
 
@@ -835,29 +739,12 @@ func TestSystemBackend_remount_auth(t *testing.T) {
 	req.Data["config"] = structs.Map(MountConfig{})
 	resp, err := b.HandleRequest(namespace.RootContext(nil), req)
 
-	// validate the response structure for remount named read
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-		resp,
-		true,
-	)
-
-	corehelpers.RetryUntil(t, 5*time.Second, func() error {
+	RetryUntil(t, 5*time.Second, func() error {
 		req = logical.TestRequest(t, logical.ReadOperation, fmt.Sprintf("remount/status/%s", resp.Data["migration_id"]))
 		resp, err = b.HandleRequest(namespace.RootContext(nil), req)
 		if err != nil {
 			t.Fatalf("err: %v", err)
 		}
-
-		// validate the response structure for remount status read
-		schema.ValidateResponse(
-			t,
-			schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-			resp,
-			true,
-		)
-
 		migrationInfo := resp.Data["migration_info"].(*MountMigrationInfo)
 		if migrationInfo.MigrationStatus != MigrationSuccessStatus.String() {
 			return fmt.Errorf("Expected migration status to be successful, got %q", migrationInfo.MigrationStatus)
@@ -1004,7 +891,7 @@ func TestSystemBackend_remount(t *testing.T) {
 	req.Data["to"] = "foo"
 	req.Data["config"] = structs.Map(MountConfig{})
 	resp, err := b.HandleRequest(namespace.RootContext(nil), req)
-	corehelpers.RetryUntil(t, 5*time.Second, func() error {
+	RetryUntil(t, 5*time.Second, func() error {
 		req = logical.TestRequest(t, logical.ReadOperation, fmt.Sprintf("remount/status/%s", resp.Data["migration_id"]))
 		resp, err = b.HandleRequest(namespace.RootContext(nil), req)
 		if err != nil {
@@ -1211,15 +1098,6 @@ func TestSystemBackend_leases(t *testing.T) {
 	if err != nil {
 		t.Fatalf("err: %v", err)
 	}
-
-	// validate the response structure for Update
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-		resp,
-		true,
-	)
-
 	if resp.Data["renewable"] == nil || resp.Data["renewable"].(bool) {
 		t.Fatal("kv leases are not renewable")
 	}
@@ -1269,14 +1147,9 @@ func TestSystemBackend_leases_list(t *testing.T) {
 	if err != nil {
 		t.Fatalf("err: %v", err)
 	}
-
-	// validate the response body for list
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-		resp,
-		true,
-	)
+	if resp == nil || resp.Data == nil {
+		t.Fatalf("bad: %#v", resp)
+	}
 	var keys []string
 	if err := mapstructure.WeakDecode(resp.Data["keys"], &keys); err != nil {
 		t.Fatalf("err: %v", err)
@@ -1435,14 +1308,6 @@ func TestSystemBackend_renew(t *testing.T) {
 		t.Fatalf("err: %v", err)
 	}
 
-	// Validate lease renewal response structure
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, b.(*SystemBackend).Route(req2.Path), req2.Operation),
-		resp,
-		true,
-	)
-
 	// Should get error about non-renewability
 	if resp2.Data["error"] != "lease is not renewable" {
 		t.Fatalf("bad: %#v", resp)
@@ -1701,15 +1566,6 @@ func TestSystemBackend_revoke_invalidID(t *testing.T) {
 	if err != nil {
 		t.Fatalf("err: %v", err)
 	}
-
-	// validate the response structure for lease revoke
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-		resp,
-		true,
-	)
-
 	if resp != nil {
 		t.Fatalf("bad: %v", resp)
 	}
@@ -1777,14 +1633,9 @@ func TestSystemBackend_revokePrefix(t *testing.T) {
 	if err != nil {
 		t.Fatalf("err: %v %#v", err, resp2)
 	}
-
-	// validate the response structure for lease revoke-prefix
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, b.(*SystemBackend).Route(req2.Path), req2.Operation),
-		resp,
-		true,
-	)
+	if resp2 != nil {
+		t.Fatalf("bad: %#v", resp)
+	}
 
 	// Attempt renew
 	req3 := logical.TestRequest(t, logical.UpdateOperation, "leases/renew/"+resp.Secret.LeaseID)
@@ -1985,12 +1836,6 @@ func TestSystemBackend_authTable(t *testing.T) {
 	if err != nil {
 		t.Fatalf("err: %v", err)
 	}
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-		resp,
-		true,
-	)
 
 	exp := map[string]interface{}{
 		"token/": map[string]interface{}{
@@ -2022,13 +1867,6 @@ func TestSystemBackend_authTable(t *testing.T) {
 	if err != nil {
 		t.Fatalf("err: %v", err)
 	}
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-		resp,
-		true,
-	)
-
 	if diff := deep.Equal(resp.Data, exp["token/"]); diff != nil {
 		t.Fatal(diff)
 	}
@@ -2056,12 +1894,6 @@ func TestSystemBackend_enableAuth(t *testing.T) {
 	if resp != nil {
 		t.Fatalf("bad: %v", resp)
 	}
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-		resp,
-		true,
-	)
 
 	req = logical.TestRequest(t, logical.ReadOperation, "auth")
 	resp, err = b.HandleRequest(namespace.RootContext(nil), req)
@@ -2071,12 +1903,6 @@ func TestSystemBackend_enableAuth(t *testing.T) {
 	if resp == nil {
 		t.Fatal("resp is nil")
 	}
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-		resp,
-		true,
-	)
 
 	exp := map[string]interface{}{
 		"foo/": map[string]interface{}{
@@ -2156,12 +1982,6 @@ func TestSystemBackend_disableAuth(t *testing.T) {
 	if resp != nil {
 		t.Fatalf("bad: %v", resp)
 	}
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-		resp,
-		true,
-	)
 }
 
 func TestSystemBackend_tuneAuth(t *testing.T) {
@@ -2178,12 +1998,6 @@ func TestSystemBackend_tuneAuth(t *testing.T) {
 	if resp == nil {
 		t.Fatal("resp is nil")
 	}
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-		resp,
-		true,
-	)
 
 	exp := map[string]interface{}{
 		"description":       "token based credentials",
@@ -2205,13 +2019,6 @@ func TestSystemBackend_tuneAuth(t *testing.T) {
 		t.Fatalf("expected tune request to fail, but got resp: %#v, err: %s", resp, err)
 	}
 
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-		resp,
-		true,
-	)
-
 	// Register the plugin in the catalog, and then try the same request again.
 	{
 		tempDir, err := filepath.EvalSymlinks(t.TempDir())
@@ -2245,12 +2052,6 @@ func TestSystemBackend_tuneAuth(t *testing.T) {
 	if resp == nil {
 		t.Fatal("resp is nil")
 	}
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-		resp,
-		true,
-	)
 
 	if resp.Data["description"] != "" {
 		t.Fatalf("got: %#v expect: %#v", resp.Data["description"], "")
@@ -2268,14 +2069,6 @@ func TestSystemBackend_policyList(t *testing.T) {
 		t.Fatalf("err: %v", err)
 	}
 
-	// validate the response structure for policy read
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-		resp,
-		true,
-	)
-
 	exp := map[string]interface{}{
 		"keys":     []string{"default", "root"},
 		"policies": []string{"default", "root"},
@@ -2300,14 +2093,6 @@ func TestSystemBackend_policyCRUD(t *testing.T) {
 		t.Fatalf("bad: %#v", resp)
 	}
 
-	// validate the response structure for policy named Update
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-		resp,
-		true,
-	)
-
 	// Read the policy
 	req = logical.TestRequest(t, logical.ReadOperation, "policy/foo")
 	resp, err = b.HandleRequest(namespace.RootContext(nil), req)
@@ -2315,14 +2100,6 @@ func TestSystemBackend_policyCRUD(t *testing.T) {
 		t.Fatalf("err: %v", err)
 	}
 
-	// validate the response structure for policy named read
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-		resp,
-		true,
-	)
-
 	exp := map[string]interface{}{
 		"name":  "foo",
 		"rules": rules,
@@ -2371,14 +2148,6 @@ func TestSystemBackend_policyCRUD(t *testing.T) {
 		t.Fatalf("bad: %#v", resp)
 	}
 
-	// validate the response structure for policy named delete
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-		resp,
-		true,
-	)
-
 	// Read the policy (deleted)
 	req = logical.TestRequest(t, logical.ReadOperation, "policy/foo")
 	resp, err = b.HandleRequest(namespace.RootContext(nil), req)
@@ -2407,7 +2176,11 @@ func TestSystemBackend_policyCRUD(t *testing.T) {
 
 func TestSystemBackend_enableAudit(t *testing.T) {
 	c, b, _ := testCoreSystemBackend(t)
-	c.auditBackends["noop"] = corehelpers.NoopAuditFactory(nil)
+	c.auditBackends["noop"] = func(ctx context.Context, config *audit.BackendConfig) (audit.Backend, error) {
+		return &NoopAudit{
+			Config: config,
+		}, nil
+	}
 
 	req := logical.TestRequest(t, logical.UpdateOperation, "audit/foo")
 	req.Data["type"] = "noop"
@@ -2421,63 +2194,24 @@ func TestSystemBackend_enableAudit(t *testing.T) {
 	}
 }
 
-// TestSystemBackend_decodeToken ensures the correct decoding of the encoded token.
-// It also ensures that the API fails if there is some payload missing.
-func TestSystemBackend_decodeToken(t *testing.T) {
-	encodedToken := "Bxg9JQQqOCNKBRICNwMIRzo2J3cWCBRi"
-	otp := "3JhHkONiyiaNYj14nnD9xZQS"
-	tokenExpected := "4RUmoevJ3lsLni9sTXcNnRE1"
-
-	_, b, _ := testCoreSystemBackend(t)
-
-	req := logical.TestRequest(t, logical.UpdateOperation, "decode-token")
-	req.Data["encoded_token"] = encodedToken
-	req.Data["otp"] = otp
-
-	resp, err := b.HandleRequest(namespace.RootContext(nil), req)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-		resp,
-		true,
-	)
-
-	token, ok := resp.Data["token"]
-	if !ok {
-		t.Fatalf("did not get token back in response, response was %#v", resp.Data)
-	}
-
-	if token.(string) != tokenExpected {
-		t.Fatalf("bad token back: %s", token.(string))
-	}
-
-	datas := []map[string]interface{}{
-		nil,
-		{"encoded_token": encodedToken},
-		{"otp": otp},
-	}
-	for _, data := range datas {
-		req.Data = data
-		resp, err := b.HandleRequest(namespace.RootContext(nil), req)
-		if err == nil {
-			t.Fatalf("no error despite missing payload")
-		}
-		schema.ValidateResponse(
-			t,
-			schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-			resp,
-			true,
-		)
-	}
-}
-
 func TestSystemBackend_auditHash(t *testing.T) {
 	c, b, _ := testCoreSystemBackend(t)
-	c.auditBackends["noop"] = corehelpers.NoopAuditFactory(nil)
+	c.auditBackends["noop"] = func(ctx context.Context, config *audit.BackendConfig) (audit.Backend, error) {
+		view := &logical.InmemStorage{}
+		view.Put(namespace.RootContext(nil), &logical.StorageEntry{
+			Key:   "salt",
+			Value: []byte("foo"),
+		})
+		config.SaltView = view
+		config.SaltConfig = &salt.Config{
+			HMAC:     sha256.New,
+			HMACType: "hmac-sha256",
+			Location: salt.DefaultLocation,
+		}
+		return &NoopAudit{
+			Config: config,
+		}, nil
+	}
 
 	req := logical.TestRequest(t, logical.UpdateOperation, "audit/foo")
 	req.Data["type"] = "noop"
@@ -2490,13 +2224,6 @@ func TestSystemBackend_auditHash(t *testing.T) {
 		t.Fatalf("bad: %v", resp)
 	}
 
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-		resp,
-		true,
-	)
-
 	req = logical.TestRequest(t, logical.UpdateOperation, "audit-hash/foo")
 	req.Data["input"] = "bar"
 
@@ -2507,14 +2234,6 @@ func TestSystemBackend_auditHash(t *testing.T) {
 	if resp == nil || resp.Data == nil {
 		t.Fatalf("response or its data was nil")
 	}
-
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-		resp,
-		true,
-	)
-
 	hash, ok := resp.Data["hash"]
 	if !ok {
 		t.Fatalf("did not get hash back in response, response was %#v", resp.Data)
@@ -2539,7 +2258,11 @@ func TestSystemBackend_enableAudit_invalid(t *testing.T) {
 
 func TestSystemBackend_auditTable(t *testing.T) {
 	c, b, _ := testCoreSystemBackend(t)
-	c.auditBackends["noop"] = corehelpers.NoopAuditFactory(nil)
+	c.auditBackends["noop"] = func(ctx context.Context, config *audit.BackendConfig) (audit.Backend, error) {
+		return &NoopAudit{
+			Config: config,
+		}, nil
+	}
 
 	req := logical.TestRequest(t, logical.UpdateOperation, "audit/foo")
 	req.Data["type"] = "noop"
@@ -2574,7 +2297,11 @@ func TestSystemBackend_auditTable(t *testing.T) {
 
 func TestSystemBackend_disableAudit(t *testing.T) {
 	c, b, _ := testCoreSystemBackend(t)
-	c.auditBackends["noop"] = corehelpers.NoopAuditFactory(nil)
+	c.auditBackends["noop"] = func(ctx context.Context, config *audit.BackendConfig) (audit.Backend, error) {
+		return &NoopAudit{
+			Config: config,
+		}, nil
+	}
 
 	req := logical.TestRequest(t, logical.UpdateOperation, "audit/foo")
 	req.Data["type"] = "noop"
@@ -2604,14 +2331,6 @@ func TestSystemBackend_rawRead_Compressed(t *testing.T) {
 		if err != nil {
 			t.Fatalf("err: %v", err)
 		}
-
-		schema.ValidateResponse(
-			t,
-			schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-			resp,
-			true,
-		)
-
 		if !strings.HasPrefix(resp.Data["value"].(string), `{"type":"mounts"`) {
 			t.Fatalf("bad: %v", resp)
 		}
@@ -2714,13 +2433,6 @@ func TestSystemBackend_rawRead_Compressed(t *testing.T) {
 			t.Fatalf("bad: %v", resp)
 		}
 
-		schema.ValidateResponse(
-			t,
-			schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-			resp,
-			true,
-		)
-
 		req = logical.TestRequest(t, logical.ReadOperation, "raw/test_raw")
 		resp, err = b.HandleRequest(namespace.RootContext(nil), req)
 		if err == nil {
@@ -2909,13 +2621,6 @@ func TestSystemBackend_rawReadWrite_Compressed(t *testing.T) {
 			t.Fatalf("err: %v", err)
 		}
 
-		schema.ValidateResponse(
-			t,
-			schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-			resp,
-			true,
-		)
-
 		// Read back and check gzip was applied by looking for prefix byte
 		req = logical.TestRequest(t, logical.ReadOperation, "raw/core/mounts")
 		req.Data = map[string]interface{}{
@@ -3157,13 +2862,6 @@ func TestSystemBackend_rawDelete(t *testing.T) {
 		t.Fatalf("bad: %v", resp)
 	}
 
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-		resp,
-		true,
-	)
-
 	// Policy should be gone
 	c.policyStore.tokenPoliciesLRU.Purge()
 	out, err := c.policyStore.GetPolicy(namespace.RootContext(nil), "test", PolicyTypeToken)
@@ -3201,13 +2899,6 @@ func TestSystemBackend_rotateConfig(t *testing.T) {
 		t.Fatalf("err: %v", err)
 	}
 
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-		resp,
-		true,
-	)
-
 	exp := map[string]interface{}{
 		"max_operations": absoluteOperationMaximum,
 		"interval":       0,
@@ -3226,22 +2917,11 @@ func TestSystemBackend_rotateConfig(t *testing.T) {
 	if err != nil {
 		t.Fatalf("err: %v", err)
 	}
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, b.(*SystemBackend).Route(req2.Path), req2.Operation),
-		resp,
-		true,
-	)
 
 	resp, err = b.HandleRequest(namespace.RootContext(nil), req)
 	if err != nil {
 		t.Fatalf("err: %v", err)
 	}
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation), resp,
-		true,
-	)
 
 	exp = map[string]interface{}{
 		"max_operations": int64(3221225472),
@@ -3321,13 +3001,6 @@ func TestSystemBackend_PluginCatalog_CRUD(t *testing.T) {
 		t.Fatalf("err: %v", err)
 	}
 
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-		resp,
-		true,
-	)
-
 	if len(resp.Data["keys"].([]string)) != len(c.builtinRegistry.Keys(consts.PluginTypeDatabase)) {
 		t.Fatalf("Wrong number of plugins, got %d, expected %d", len(resp.Data["keys"].([]string)), len(builtinplugins.Registry.Keys(consts.PluginTypeDatabase)))
 	}
@@ -3338,13 +3011,6 @@ func TestSystemBackend_PluginCatalog_CRUD(t *testing.T) {
 		t.Fatalf("err: %v", err)
 	}
 
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-		resp,
-		true,
-	)
-
 	// Get deprecation status directly from the registry so we can compare it to the API response
 	deprecationStatus, _ := c.builtinRegistry.DeprecationStatus("mysql-database-plugin", consts.PluginTypeDatabase)
 
@@ -3383,13 +3049,6 @@ func TestSystemBackend_PluginCatalog_CRUD(t *testing.T) {
 		t.Fatalf("err: %v", resp.Error())
 	}
 
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-		resp,
-		true,
-	)
-
 	delete(req.Data, "args")
 	resp, err = b.HandleRequest(namespace.RootContext(nil), req)
 	if err != nil || resp.Error() != nil {
@@ -3422,13 +3081,6 @@ func TestSystemBackend_PluginCatalog_CRUD(t *testing.T) {
 		t.Fatalf("err: %v", err)
 	}
 
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-		resp,
-		true,
-	)
-
 	req = logical.TestRequest(t, logical.ReadOperation, "plugins/catalog/database/test-plugin")
 	resp, err = b.HandleRequest(namespace.RootContext(nil), req)
 	if resp != nil || err != nil {
@@ -3542,16 +3194,10 @@ func TestSystemBackend_ToolsHash(t *testing.T) {
 	req.Data = map[string]interface{}{
 		"input": "dGhlIHF1aWNrIGJyb3duIGZveA==",
 	}
-	resp, err := b.HandleRequest(namespace.RootContext(nil), req)
+	_, err := b.HandleRequest(namespace.RootContext(nil), req)
 	if err != nil {
 		t.Fatalf("err: %v", err)
 	}
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-		resp,
-		true,
-	)
 
 	doRequest := func(req *logical.Request, errExpected bool, expected string) {
 		t.Helper()
@@ -3562,21 +3208,12 @@ func TestSystemBackend_ToolsHash(t *testing.T) {
 		if resp == nil {
 			t.Fatal("expected non-nil response")
 		}
-
 		if errExpected {
 			if !resp.IsError() {
 				t.Fatalf("bad: got error response: %#v", *resp)
 			}
 			return
-		} else {
-			schema.ValidateResponse(
-				t,
-				schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-				resp,
-				true,
-			)
 		}
-
 		if resp.IsError() {
 			t.Fatalf("bad: got error response: %#v", *resp)
 		}
@@ -3642,16 +3279,10 @@ func TestSystemBackend_ToolsRandom(t *testing.T) {
 	b := testSystemBackend(t)
 	req := logical.TestRequest(t, logical.UpdateOperation, "tools/random")
 
-	resp, err := b.HandleRequest(namespace.RootContext(nil), req)
+	_, err := b.HandleRequest(namespace.RootContext(nil), req)
 	if err != nil {
 		t.Fatalf("err: %v", err)
 	}
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-		resp,
-		true,
-	)
 
 	doRequest := func(req *logical.Request, errExpected bool, format string, numBytes int) {
 		t.Helper()
@@ -3668,15 +3299,7 @@ func TestSystemBackend_ToolsRandom(t *testing.T) {
 					t.Fatalf("bad: got error response: %#v", *resp)
 				}
 				return nil
-			} else {
-				schema.ValidateResponse(
-					t,
-					schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-					resp,
-					true,
-				)
 			}
-
 			if resp.IsError() {
 				t.Fatalf("bad: got error response: %#v", *resp)
 			}
@@ -3739,7 +3362,6 @@ func TestSystemBackend_ToolsRandom(t *testing.T) {
 
 func TestSystemBackend_InternalUIMounts(t *testing.T) {
 	_, b, rootToken := testCoreSystemBackend(t)
-	systemBackend := b.(*SystemBackend)
 
 	// Ensure no entries are in the endpoint as a starting point
 	req := logical.TestRequest(t, logical.ReadOperation, "internal/ui/mounts")
@@ -3747,12 +3369,6 @@ func TestSystemBackend_InternalUIMounts(t *testing.T) {
 	if err != nil {
 		t.Fatalf("err: %v", err)
 	}
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, systemBackend.Route(req.Path), req.Operation),
-		resp,
-		true,
-	)
 
 	exp := map[string]interface{}{
 		"secret": map[string]interface{}{},
@@ -3768,12 +3384,6 @@ func TestSystemBackend_InternalUIMounts(t *testing.T) {
 	if err != nil {
 		t.Fatalf("err: %v", err)
 	}
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, systemBackend.Route(req.Path), req.Operation),
-		resp,
-		true,
-	)
 
 	exp = map[string]interface{}{
 		"secret": map[string]interface{}{
@@ -3896,25 +3506,11 @@ func TestSystemBackend_InternalUIMounts(t *testing.T) {
 		t.Fatalf("resp.Error: %v, err:%v", resp.Error(), err)
 	}
 
-	// validate the response structure for mount update
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-		resp,
-		true,
-	)
-
 	req = logical.TestRequest(t, logical.ReadOperation, "internal/ui/mounts")
 	resp, err = b.HandleRequest(namespace.RootContext(nil), req)
 	if err != nil {
 		t.Fatalf("err: %v", err)
 	}
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, systemBackend.Route(req.Path), req.Operation),
-		resp,
-		true,
-	)
 
 	exp = map[string]interface{}{
 		"secret": map[string]interface{}{
@@ -3939,7 +3535,6 @@ func TestSystemBackend_InternalUIMounts(t *testing.T) {
 
 func TestSystemBackend_InternalUIMount(t *testing.T) {
 	core, b, rootToken := testCoreSystemBackend(t)
-	systemBackend := b.(*SystemBackend)
 
 	req := logical.TestRequest(t, logical.UpdateOperation, "policy/secret")
 	req.ClientToken = rootToken
@@ -3969,12 +3564,6 @@ func TestSystemBackend_InternalUIMount(t *testing.T) {
 	if err != nil || (resp != nil && resp.IsError()) {
 		t.Fatalf("Bad %#v %#v", err, resp)
 	}
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, systemBackend.Route(req.Path), req.Operation),
-		resp,
-		true,
-	)
 	if resp.Data["type"] != "kv" {
 		t.Fatalf("Bad Response: %#v", resp)
 	}
@@ -3994,12 +3583,6 @@ func TestSystemBackend_InternalUIMount(t *testing.T) {
 	if err != nil || (resp != nil && resp.IsError()) {
 		t.Fatalf("Bad %#v %#v", err, resp)
 	}
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, systemBackend.Route(req.Path), req.Operation),
-		resp,
-		true,
-	)
 	if resp.Data["type"] != "kv" {
 		t.Fatalf("Bad Response: %#v", resp)
 	}
@@ -4010,12 +3593,6 @@ func TestSystemBackend_InternalUIMount(t *testing.T) {
 	if err != nil || (resp != nil && resp.IsError()) {
 		t.Fatalf("Bad %#v %#v", err, resp)
 	}
-	schema.ValidateResponse(
-		t,
-		schema.GetResponseSchema(t, systemBackend.Route(req.Path), req.Operation),
-		resp,
-		true,
-	)
 	if resp.Data["type"] != "system" {
 		t.Fatalf("Bad Response: %#v", resp)
 	}
@@ -4067,8 +3644,8 @@ func TestSystemBackend_OpenAPI(t *testing.T) {
 		}
 	}
 
-	// Check that default paths are present with a root token (with and without generic_mount_paths)
-	for _, genericMountPaths := range []bool{false, true} {
+	// Check that default paths are present with a root token (without generic_mount_paths)
+	for _, genericMountPaths := range []bool{false} {
 		req := logical.TestRequest(t, logical.ReadOperation, "internal/specs/openapi")
 		if genericMountPaths {
 			req.Data["generic_mount_paths"] = true
@@ -5267,6 +4844,7 @@ func TestSystemBackend_Loggers(t *testing.T) {
 			t.Parallel()
 
 			core, b, _ := testCoreSystemBackend(t)
+
 			// Test core overrides logging level outside of config,
 			// an initial delete will ensure that we an initial read
 			// to get expected values is based off of config and not
@@ -5281,13 +4859,6 @@ func TestSystemBackend_Loggers(t *testing.T) {
 				t.Fatalf("unexpected error, err: %v, resp: %#v", err, resp)
 			}
 
-			schema.ValidateResponse(
-				t,
-				schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-				resp,
-				true,
-			)
-
 			req = &logical.Request{
 				Path:      "loggers",
 				Operation: logical.ReadOperation,
@@ -5298,13 +4869,6 @@ func TestSystemBackend_Loggers(t *testing.T) {
 				t.Fatalf("unexpected error, err: %v, resp: %#v", err, resp)
 			}
 
-			schema.ValidateResponse(
-				t,
-				schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-				resp,
-				true,
-			)
-
 			initialLoggers := resp.Data
 
 			req = &logical.Request{
@@ -5318,13 +4882,6 @@ func TestSystemBackend_Loggers(t *testing.T) {
 			resp, err = b.HandleRequest(namespace.RootContext(nil), req)
 			respIsError := resp != nil && resp.IsError()
 
-			schema.ValidateResponse(
-				t,
-				schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-				resp,
-				true,
-			)
-
 			if err != nil || (!tc.expectError && respIsError) {
 				t.Fatalf("unexpected error, err: %v, resp: %#v", err, resp)
 			}
@@ -5344,13 +4901,6 @@ func TestSystemBackend_Loggers(t *testing.T) {
 					t.Fatalf("unexpected error, err: %v, resp: %#v", err, resp)
 				}
 
-				schema.ValidateResponse(
-					t,
-					schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-					resp,
-					true,
-				)
-
 				for _, logger := range core.allLoggers {
 					loggerName := logger.Name()
 					levelRaw, ok := resp.Data[loggerName]
@@ -5375,13 +4925,6 @@ func TestSystemBackend_Loggers(t *testing.T) {
 				t.Fatalf("unexpected error, err: %v, resp: %#v", err, resp)
 			}
 
-			schema.ValidateResponse(
-				t,
-				schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-				resp,
-				true,
-			)
-
 			req = &logical.Request{
 				Path:      "loggers",
 				Operation: logical.ReadOperation,
@@ -5392,13 +4935,6 @@ func TestSystemBackend_Loggers(t *testing.T) {
 				t.Fatalf("unexpected error, err: %v, resp: %#v", err, resp)
 			}
 
-			schema.ValidateResponse(
-				t,
-				schema.GetResponseSchema(t, b.(*SystemBackend).Route(req.Path), req.Operation),
-				resp,
-				true,
-			)
-
 			for _, logger := range core.allLoggers {
 				loggerName := logger.Name()
 				levelRaw, currentOk := resp.Data[loggerName]
@@ -5518,10 +5054,7 @@ func TestSystemBackend_LoggersByName(t *testing.T) {
 		t.Run(fmt.Sprintf("loggers-by-name-%s", tc.logger), func(t *testing.T) {
 			t.Parallel()
 
-			core, _, _ := TestCoreUnsealedWithConfig(t, &CoreConfig{
-				Logger: logging.NewVaultLogger(hclog.Trace),
-			})
-			b := core.systemBackend
+			core, b, _ := testCoreSystemBackend(t)
 
 			// Test core overrides logging level outside of config,
 			// an initial delete will ensure that we an initial read
@@ -5886,32 +5419,3 @@ func TestCanUnseal_WithNonExistentBuiltinPluginVersion_InMountStorage(t *testing
 		}
 	}
 }
-
-func TestSystemBackend_ReadExperiments(t *testing.T) {
-	c, _, _ := TestCoreUnsealed(t)
-
-	for name, tc := range map[string][]string{
-		"no experiments enabled": {},
-		"one experiment enabled": {experiments.VaultExperimentEventsAlpha1},
-	} {
-		t.Run(name, func(t *testing.T) {
-			// Set the enabled experiments.
-			c.experiments = tc
-
-			req := logical.TestRequest(t, logical.ReadOperation, "experiments")
-			resp, err := c.systemBackend.HandleRequest(namespace.RootContext(nil), req)
-			if err != nil {
-				t.Fatalf("err: %v", err)
-			}
-			if resp == nil {
-				t.Fatal("Expected a response")
-			}
-			if !reflect.DeepEqual(experiments.ValidExperiments(), resp.Data["available"]) {
-				t.Fatalf("Expected %v but got %v", experiments.ValidExperiments(), resp.Data["available"])
-			}
-			if !reflect.DeepEqual(tc, resp.Data["enabled"]) {
-				t.Fatal("No experiments should be enabled by default")
-			}
-		})
-	}
-}
diff --git a/vault/logical_system_user_lockout.go b/vault/logical_system_user_lockout.go
deleted file mode 100644
index edd0a61e3e51a..0000000000000
--- a/vault/logical_system_user_lockout.go
+++ /dev/null
@@ -1,200 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package vault
-
-import (
-	"context"
-	"fmt"
-	"sort"
-	"strings"
-
-	"github.com/hashicorp/vault/helper/namespace"
-)
-
-type LockedUsersResponse struct {
-	NamespaceID    string                    `json:"namespace_id" mapstructure:"namespace_id"`
-	NamespacePath  string                    `json:"namespace_path" mapstructure:"namespace_path"`
-	Counts         int                       `json:"counts" mapstructure:"counts"`
-	MountAccessors []*ResponseMountAccessors `json:"mount_accessors" mapstructure:"mount_accessors"`
-}
-
-type ResponseMountAccessors struct {
-	MountAccessor    string   `json:"mount_accessor" mapstructure:"mount_accessor"`
-	Counts           int      `json:"counts" mapstructure:"counts"`
-	AliasIdentifiers []string `json:"alias_identifiers" mapstructure:"alias_identifiers"`
-}
-
-// unlockUser deletes the entry for locked user from storage and userFailedLoginInfo map
-func unlockUser(ctx context.Context, core *Core, mountAccessor string, aliasName string) error {
-	ns, err := namespace.FromContext(ctx)
-	if err != nil {
-		return err
-	}
-
-	lockedUserStoragePath := coreLockedUsersPath + ns.ID + "/" + mountAccessor + "/" + aliasName
-
-	// remove entry for locked user from storage
-	// if read only error, the error is handled by handleError in logical_system.go
-	// this will be forwarded to the active node
-	if err := core.barrier.Delete(ctx, lockedUserStoragePath); err != nil {
-		return err
-	}
-
-	loginUserInfoKey := FailedLoginUser{
-		aliasName:     aliasName,
-		mountAccessor: mountAccessor,
-	}
-
-	// remove entry for locked user from userFailedLoginInfo map and storage
-	if err := updateUserFailedLoginInfo(ctx, core, loginUserInfoKey, nil, true); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// handleLockedUsersQuery reports the locked user metrics by namespace in the decreasing order
-// of locked users
-func (b *SystemBackend) handleLockedUsersQuery(ctx context.Context, mountAccessor string) (map[string]interface{}, error) {
-	// Calculate the namespace response breakdowns of locked users for query namespace and child namespaces (if needed)
-	totalCount, byNamespaceResponse, err := b.getLockedUsersResponses(ctx, mountAccessor)
-	if err != nil {
-		return nil, err
-	}
-
-	// Now populate the response based on breakdowns.
-	responseData := make(map[string]interface{})
-	responseData["by_namespace"] = byNamespaceResponse
-	responseData["total"] = totalCount
-	return responseData, nil
-}
-
-// getLockedUsersResponses returns the locked users
-// for a particular mount_accessor if provided in request
-// else returns it for the current namespace and all the child namespaces that has locked users
-// they are sorted in the decreasing order of locked users count
-func (b *SystemBackend) getLockedUsersResponses(ctx context.Context, mountAccessor string) (int, []*LockedUsersResponse, error) {
-	lockedUsersResponse := make([]*LockedUsersResponse, 0)
-	totalCounts := 0
-
-	queryNS, err := namespace.FromContext(ctx)
-	if err != nil {
-		return 0, nil, err
-	}
-
-	if mountAccessor != "" {
-		// get the locked user response for mount_accessor, here for mount_accessor in request
-		totalCountForNSID, mountAccessorsResponse, err := b.getMountAccessorsLockedUsers(ctx, []string{mountAccessor + "/"},
-			coreLockedUsersPath+queryNS.ID+"/")
-		if err != nil {
-			return 0, nil, err
-		}
-
-		totalCounts += totalCountForNSID
-		lockedUsersResponse = append(lockedUsersResponse, &LockedUsersResponse{
-			NamespaceID:    queryNS.ID,
-			NamespacePath:  queryNS.Path,
-			Counts:         totalCountForNSID,
-			MountAccessors: mountAccessorsResponse,
-		})
-		return totalCounts, lockedUsersResponse, nil
-	}
-
-	// no mount_accessor is provided in request, get information for current namespace and its child namespaces
-
-	// get all the namespaces of locked users
-	nsIDs, err := b.Core.barrier.List(ctx, coreLockedUsersPath)
-	if err != nil {
-		return 0, nil, err
-	}
-
-	// identify if the namespaces must be included in response and get counts
-	for _, nsID := range nsIDs {
-		nsID = strings.TrimSuffix(nsID, "/")
-		ns, err := NamespaceByID(ctx, nsID, b.Core)
-		if err != nil {
-			return 0, nil, err
-		}
-
-		if b.includeNSInLockedUsersResponse(queryNS, ns) {
-			var displayPath string
-			if ns == nil {
-				// deleted namespace
-				displayPath = fmt.Sprintf("deleted namespace %q", nsID)
-			} else {
-				displayPath = ns.Path
-			}
-
-			// get mount accessors of locked users for this namespace
-			mountAccessors, err := b.Core.barrier.List(ctx, coreLockedUsersPath+nsID+"/")
-			if err != nil {
-				return 0, nil, err
-			}
-
-			// get the locked user response for mount_accessor list
-			totalCountForNSID, mountAccessorsResponse, err := b.getMountAccessorsLockedUsers(ctx, mountAccessors, coreLockedUsersPath+nsID+"/")
-			if err != nil {
-				return 0, nil, err
-			}
-
-			totalCounts += totalCountForNSID
-			lockedUsersResponse = append(lockedUsersResponse, &LockedUsersResponse{
-				NamespaceID:    strings.TrimSuffix(nsID, "/"),
-				NamespacePath:  displayPath,
-				Counts:         totalCountForNSID,
-				MountAccessors: mountAccessorsResponse,
-			})
-
-		}
-	}
-
-	// sort namespaces in response by decreasing order of counts
-	sort.Slice(lockedUsersResponse, func(i, j int) bool {
-		return lockedUsersResponse[i].Counts > lockedUsersResponse[j].Counts
-	})
-
-	return totalCounts, lockedUsersResponse, nil
-}
-
-// getMountAccessorsLockedUsers returns the locked users for all the mount_accessors of locked users for a namespace
-// they are sorted in the decreasing order of locked users
-// returns the total locked users for the namespace and  locked users response for every mount_accessor for a namespace that has locked users
-func (b *SystemBackend) getMountAccessorsLockedUsers(ctx context.Context, mountAccessors []string, lockedUsersPath string) (int, []*ResponseMountAccessors, error) {
-	byMountAccessorsResponse := make([]*ResponseMountAccessors, 0)
-	totalCountForMountAccessors := 0
-
-	for _, mountAccessor := range mountAccessors {
-		// get the list of aliases of locked users for a mount accessor
-		aliasIdentifiers, err := b.Core.barrier.List(ctx, lockedUsersPath+mountAccessor)
-		if err != nil {
-			return 0, nil, err
-		}
-
-		totalCountForMountAccessors += len(aliasIdentifiers)
-		byMountAccessorsResponse = append(byMountAccessorsResponse, &ResponseMountAccessors{
-			MountAccessor:    strings.TrimSuffix(mountAccessor, "/"),
-			Counts:           len(aliasIdentifiers),
-			AliasIdentifiers: aliasIdentifiers,
-		})
-
-	}
-
-	// sort mount Accessors in response by decreasing order of counts
-	sort.Slice(byMountAccessorsResponse, func(i, j int) bool {
-		return byMountAccessorsResponse[i].Counts > byMountAccessorsResponse[j].Counts
-	})
-
-	return totalCountForMountAccessors, byMountAccessorsResponse, nil
-}
-
-// includeNSInLockedUsersResponse checks if the namespace is the child namespace of namespace in query
-// if child namespace, it can be included in response
-// locked users from deleted namespaces are listed under root namespace
-func (b *SystemBackend) includeNSInLockedUsersResponse(query *namespace.Namespace, record *namespace.Namespace) bool {
-	if record == nil {
-		// Deleted namespace, only include in root queries
-		return query.ID == namespace.RootNamespaceID
-	}
-	return record.HasParent(query)
-}
diff --git a/vault/logical_system_util.go b/vault/logical_system_util.go
index f90b4e71efeed..ba87e243b19a4 100644
--- a/vault/logical_system_util.go
+++ b/vault/logical_system_util.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !enterprise
 
 package vault
diff --git a/vault/login_mfa.go b/vault/login_mfa.go
index 780c1fe39431e..00064436ac29d 100644
--- a/vault/login_mfa.go
+++ b/vault/login_mfa.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -72,12 +69,6 @@ func (b *SystemBackend) loginMFAPaths() []*framework.Path {
 	return []*framework.Path{
 		{
 			Pattern: "mfa/validate",
-
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: "mfa",
-				OperationVerb:   "validate",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"mfa_request_id": {
 					Type:        framework.TypeString,
@@ -92,12 +83,7 @@ func (b *SystemBackend) loginMFAPaths() []*framework.Path {
 			},
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.UpdateOperation: &framework.PathOperation{
-					Callback: b.Core.loginMFABackend.handleMFALoginValidate,
-					Responses: map[int][]framework.Response{
-						http.StatusOK: {{
-							Description: "OK",
-						}},
-					},
+					Callback:                  b.Core.loginMFABackend.handleMFALoginValidate,
 					Summary:                   "Validates the login for the given MFA methods. Upon successful validation, it returns an auth response containing the client token",
 					ForwardPerformanceStandby: true,
 				},
@@ -283,7 +269,6 @@ func (i *IdentityStore) handleMFAMethodUpdateCommon(ctx context.Context, req *lo
 	}
 
 	methodID := d.Get("method_id").(string)
-	methodName := d.Get("method_name").(string)
 
 	b := i.mfaBackend
 	b.mfaLock.Lock()
@@ -301,23 +286,6 @@ func (i *IdentityStore) handleMFAMethodUpdateCommon(ctx context.Context, req *lo
 		}
 	}
 
-	// check if an MFA method configuration exists with that method name
-	if methodName != "" {
-		namedMfaConfig, err := b.MemDBMFAConfigByName(ctx, methodName)
-		if err != nil {
-			return nil, err
-		}
-		if namedMfaConfig != nil {
-			if mConfig == nil {
-				mConfig = namedMfaConfig
-			} else {
-				if mConfig.ID != namedMfaConfig.ID {
-					return nil, fmt.Errorf("a login MFA method configuration with the method name %s already exists", methodName)
-				}
-			}
-		}
-	}
-
 	if mConfig == nil {
 		configID, err := uuid.GenerateUUID()
 		if err != nil {
@@ -330,11 +298,6 @@ func (i *IdentityStore) handleMFAMethodUpdateCommon(ctx context.Context, req *lo
 		}
 	}
 
-	// Updating the method config name
-	if methodName != "" {
-		mConfig.Name = methodName
-	}
-
 	mfaNs, err := i.namespacer.NamespaceByID(ctx, mConfig.NamespaceID)
 	if err != nil {
 		return nil, err
@@ -684,55 +647,6 @@ func (b *LoginMFABackend) loginMFAMethodExistenceCheck(eConfig *mfa.MFAEnforceme
 	return aggErr.ErrorOrNil()
 }
 
-// sanitizeMFACredsWithLoginEnforcementMethodIDs updates the MFACred map
-// looping through the matched login enforcement configurations, and
-// replacing MFA method names with MFA method IDs
-func (b *LoginMFABackend) sanitizeMFACredsWithLoginEnforcementMethodIDs(ctx context.Context, mfaCredsMap logical.MFACreds, mfaMethodIDs []string) (logical.MFACreds, error) {
-	sanitizedMfaCreds := make(logical.MFACreds, 0)
-	var multiError *multierror.Error
-	for _, methodID := range mfaMethodIDs {
-		val, ok := mfaCredsMap[methodID]
-		if ok {
-			sanitizedMfaCreds[methodID] = val
-			continue
-		}
-		mConfig, err := b.MemDBMFAConfigByID(methodID)
-		if err != nil {
-			return nil, err
-		}
-		if mConfig == nil {
-			multiError = multierror.Append(multiError, fmt.Errorf("failed to find MFA config for method ID %s", methodID))
-			continue
-		}
-
-		// method name in the MFACredsMap should be the method full name,
-		// i.e., namespacePath+name. This is because, a user in a child
-		// namespace can reference an MFA method ID in a parent namespace
-		configNS, err := NamespaceByID(ctx, mConfig.NamespaceID, b.Core)
-		if err != nil {
-			return nil, err
-		}
-		if configNS != nil {
-			val, ok = mfaCredsMap[configNS.Path+mConfig.Name]
-			if ok {
-				sanitizedMfaCreds[mConfig.ID] = val
-			} else {
-				multiError = multierror.Append(multiError, fmt.Errorf("failed to find MFA credentials associated with an MFA method ID %v, method name %v", methodID, configNS.Path+mConfig.Name))
-			}
-		} else {
-			multiError = multierror.Append(multiError, fmt.Errorf("failed to find the namespace associated with an MFA method ID %v", mConfig.ID))
-		}
-	}
-
-	// we don't need to find every MFA method identifiers in the MFA header
-	// So, don't return errors if that is the case.
-	if len(sanitizedMfaCreds) > 0 {
-		return sanitizedMfaCreds, nil
-	}
-
-	return sanitizedMfaCreds, multiError
-}
-
 func (b *LoginMFABackend) handleMFALoginValidate(ctx context.Context, req *logical.Request, d *framework.FieldData) (retResp *logical.Response, retErr error) {
 	// mfaReqID is the ID of the login request
 	mfaReqID := d.Get("mfa_request_id").(string)
@@ -741,13 +655,13 @@ func (b *LoginMFABackend) handleMFALoginValidate(ctx context.Context, req *logic
 	}
 
 	// a map of methodID to passcode
-	mfaPayload := d.Get("mfa_payload")
-	if mfaPayload == nil {
+	methodIDToPasscodeInterface := d.Get("mfa_payload")
+	if methodIDToPasscodeInterface == nil {
 		return logical.ErrorResponse("missing mfa payload"), nil
 	}
 
 	var mfaCreds logical.MFACreds
-	err := mapstructure.Decode(mfaPayload, &mfaCreds)
+	err := mapstructure.Decode(methodIDToPasscodeInterface, &mfaCreds)
 	if err != nil {
 		return logical.ErrorResponse("invalid mfa payload"), nil
 	}
@@ -1660,19 +1574,11 @@ func parseOktaConfig(mConfig *mfa.Config, d *framework.FieldData) error {
 }
 
 func (c *Core) validateLoginMFA(ctx context.Context, eConfig *mfa.MFAEnforcementConfig, entity *identity.Entity, requestConnRemoteAddr string, mfaCredsMap logical.MFACreds) error {
-	sanitizedMfaCreds, err := c.loginMFABackend.sanitizeMFACredsWithLoginEnforcementMethodIDs(ctx, mfaCredsMap, eConfig.MFAMethodIDs)
-	if err != nil {
-		return fmt.Errorf("failed to sanitize MFA creds, %w", err)
-	}
-	if len(sanitizedMfaCreds) == 0 && len(eConfig.MFAMethodIDs) > 0 {
-		return fmt.Errorf("login MFA validation failed for methodID: %v", eConfig.MFAMethodIDs)
-	}
-
 	var retErr error
 	for _, methodID := range eConfig.MFAMethodIDs {
 		// as configID is the same as methodID, and methodID is unique, we can
 		// use it to retrieve the MFACreds
-		mfaCreds, ok := sanitizedMfaCreds[methodID]
+		mfaCreds, ok := mfaCredsMap[methodID]
 		if !ok || mfaCreds == nil {
 			continue
 		}
@@ -1728,11 +1634,6 @@ func (c *Core) validateLoginMFAInternal(ctx context.Context, methodID string, en
 		}
 	}
 
-	mfaFactors, err := parseMfaFactors(mfaCreds)
-	if err != nil {
-		return fmt.Errorf("failed to parse MFA factor, %w", err)
-	}
-
 	switch mConfig.Type {
 	case mfaMethodTypeTOTP:
 		// Get the MFA secret data required to validate the supplied credentials
@@ -1744,13 +1645,17 @@ func (c *Core) validateLoginMFAInternal(ctx context.Context, methodID string, en
 			return fmt.Errorf("MFA secret for method name %q not present in entity %q", mConfig.Name, entity.ID)
 		}
 
-		return c.validateTOTP(ctx, mfaFactors, entityMFASecret, mConfig.ID, entity.ID, c.loginMFABackend.usedCodes, mConfig.GetTOTPConfig().MaxValidationAttempts)
+		if mfaCreds == nil {
+			return fmt.Errorf("MFA credentials not supplied")
+		}
+
+		return c.validateTOTP(ctx, mfaCreds, entityMFASecret, mConfig.ID, entity.ID, c.loginMFABackend.usedCodes, mConfig.GetTOTPConfig().MaxValidationAttempts)
 
 	case mfaMethodTypeOkta:
 		return c.validateOkta(ctx, mConfig, finalUsername)
 
 	case mfaMethodTypeDuo:
-		return c.validateDuo(ctx, mfaFactors, mConfig, finalUsername, reqConnectionRemoteAddress)
+		return c.validateDuo(ctx, mfaCreds, mConfig, finalUsername, reqConnectionRemoteAddress)
 
 	case mfaMethodTypePingID:
 		return c.validatePingID(ctx, mConfig, finalUsername)
@@ -1860,58 +1765,25 @@ func formatUsername(format string, alias *identity.Alias, entity *identity.Entit
 	return username
 }
 
-type MFAFactor struct {
-	passcode string
-}
-
-func parseMfaFactors(creds []string) (*MFAFactor, error) {
-	mfaFactor := &MFAFactor{}
+func (c *Core) validateDuo(ctx context.Context, creds []string, mConfig *mfa.Config, username, reqConnectionRemoteAddr string) error {
+	duoConfig := mConfig.GetDuoConfig()
+	if duoConfig == nil {
+		return fmt.Errorf("failed to get Duo configuration for method %q", mConfig.Name)
+	}
 
+	passcode := ""
 	for _, cred := range creds {
-		switch {
-		case cred == "": // for the case of push notification
-			continue
-		case strings.HasPrefix(cred, "passcode="):
-			if mfaFactor.passcode != "" {
-				return nil, fmt.Errorf("found multiple passcodes for the same MFA method")
-			}
-
+		if strings.HasPrefix(cred, "passcode") {
 			splits := strings.SplitN(cred, "=", 2)
-			if splits[1] == "" {
-				return nil, fmt.Errorf("invalid passcode")
+			if len(splits) != 2 {
+				return fmt.Errorf("invalid credential %q", cred)
 			}
-
-			mfaFactor.passcode = splits[1]
-		case strings.Contains(cred, "="):
-			return nil, fmt.Errorf("found an invalid MFA cred: %v", cred)
-		default:
-			// a non-empty cred that does not match the above
-			// means it is a passcode
-			if mfaFactor.passcode != "" {
-				return nil, fmt.Errorf("found multiple passcodes for the same MFA method")
+			if splits[0] == "passcode" {
+				passcode = splits[1]
 			}
-			mfaFactor.passcode = cred
 		}
 	}
 
-	if mfaFactor.passcode == "" {
-		return nil, nil
-	}
-
-	return mfaFactor, nil
-}
-
-func (c *Core) validateDuo(ctx context.Context, mfaFactors *MFAFactor, mConfig *mfa.Config, username, reqConnectionRemoteAddr string) error {
-	duoConfig := mConfig.GetDuoConfig()
-	if duoConfig == nil {
-		return fmt.Errorf("failed to get Duo configuration for method %q", mConfig.Name)
-	}
-
-	var passcode string
-	if mfaFactors != nil {
-		passcode = mfaFactors.passcode
-	}
-
 	client := duoapi.NewDuoApi(
 		duoConfig.IntegrationKey,
 		duoConfig.SecretKey,
@@ -1975,7 +1847,6 @@ func (c *Core) validateDuo(ctx context.Context, mfaFactors *MFAFactor, mConfig *
 		}
 	}
 
-	options = append(options, authapi.AuthIpAddr(reqConnectionRemoteAddr))
 	options = append(options, authapi.AuthUsername(username))
 	options = append(options, authapi.AuthAsync())
 
@@ -2010,13 +1881,11 @@ func (c *Core) validateDuo(ctx context.Context, mfaFactors *MFAFactor, mConfig *
 		case "allow":
 			return nil
 		}
-		timer := time.NewTimer(time.Second)
 
 		select {
 		case <-ctx.Done():
-			timer.Stop()
 			return fmt.Errorf("duo push verification operation canceled")
-		case <-timer.C:
+		case <-time.After(time.Second):
 		}
 	}
 }
@@ -2141,13 +2010,11 @@ func (c *Core) validateOkta(ctx context.Context, mConfig *mfa.Config, username s
 		default:
 			return fmt.Errorf("unknown status code")
 		}
-		timer := time.NewTimer(time.Second)
 
 		select {
 		case <-ctx.Done():
-			timer.Stop()
 			return fmt.Errorf("push verification operation canceled")
-		case <-timer.C:
+		case <-time.After(time.Second):
 		}
 	}
 }
@@ -2363,18 +2230,21 @@ func (c *Core) validatePingID(ctx context.Context, mConfig *mfa.Config, username
 	return nil
 }
 
-func (c *Core) validateTOTP(ctx context.Context, mfaFactors *MFAFactor, entityMethodSecret *mfa.Secret, configID, entityID string, usedCodes *cache.Cache, maximumValidationAttempts uint32) error {
-	if mfaFactors == nil || mfaFactors.passcode == "" {
-		return fmt.Errorf("MFA credentials not supplied")
+func (c *Core) validateTOTP(ctx context.Context, creds []string, entityMethodSecret *mfa.Secret, configID, entityID string, usedCodes *cache.Cache, maximumValidationAttempts uint32) error {
+	if len(creds) == 0 {
+		return fmt.Errorf("missing TOTP passcode")
+	}
+
+	if len(creds) > 1 {
+		return fmt.Errorf("more than one TOTP passcode supplied")
 	}
-	passcode := mfaFactors.passcode
 
 	totpSecret := entityMethodSecret.GetTOTPSecret()
 	if totpSecret == nil {
 		return fmt.Errorf("entity does not contain the TOTP secret")
 	}
 
-	usedName := fmt.Sprintf("%s_%s", configID, passcode)
+	usedName := fmt.Sprintf("%s_%s", configID, creds[0])
 
 	_, ok := usedCodes.Get(usedName)
 	if ok {
@@ -2421,7 +2291,7 @@ func (c *Core) validateTOTP(ctx context.Context, mfaFactors *MFAFactor, entityMe
 		Algorithm: otplib.Algorithm(int(totpSecret.Algorithm)),
 	}
 
-	valid, err := totplib.ValidateCustom(passcode, key, time.Now(), validateOpts)
+	valid, err := totplib.ValidateCustom(creds[0], key, time.Now(), validateOpts)
 	if err != nil && err != otplib.ErrValidateInputInvalidLength {
 		return errwrap.Wrapf("failed to validate TOTP passcode: {{err}}", err)
 	}
@@ -2471,21 +2341,6 @@ func loginMFAConfigTableSchema() *memdb.TableSchema {
 					Field: "Type",
 				},
 			},
-			"name": {
-				Name:         "name",
-				Unique:       true,
-				AllowMissing: true,
-				Indexer: &memdb.CompoundIndex{
-					Indexes: []memdb.Indexer{
-						&memdb.StringFieldIndex{
-							Field: "NamespaceID",
-						},
-						&memdb.StringFieldIndex{
-							Field: "Name",
-						},
-					},
-				},
-			},
 		},
 	}
 }
@@ -2633,47 +2488,6 @@ func (b *LoginMFABackend) MemDBMFAConfigByID(mConfigID string) (*mfa.Config, err
 	return b.MemDBMFAConfigByIDInTxn(txn, mConfigID)
 }
 
-func (b *LoginMFABackend) MemDBMFAConfigByNameInTxn(ctx context.Context, txn *memdb.Txn, mConfigName string) (*mfa.Config, error) {
-	if mConfigName == "" {
-		return nil, fmt.Errorf("missing config name")
-	}
-
-	if txn == nil {
-		return nil, fmt.Errorf("txn is nil")
-	}
-
-	ns, err := namespace.FromContext(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	mConfigRaw, err := txn.First(b.methodTable, "name", ns.ID, mConfigName)
-	if err != nil {
-		return nil, fmt.Errorf("failed to fetch MFA config from memdb using name: %w", err)
-	}
-
-	if mConfigRaw == nil {
-		return nil, nil
-	}
-
-	mConfig, ok := mConfigRaw.(*mfa.Config)
-	if !ok {
-		return nil, fmt.Errorf("failed to declare the type of fetched MFA config")
-	}
-
-	return mConfig.Clone()
-}
-
-func (b *LoginMFABackend) MemDBMFAConfigByName(ctx context.Context, name string) (*mfa.Config, error) {
-	if name == "" {
-		return nil, fmt.Errorf("missing config name")
-	}
-
-	txn := b.db.Txn(false)
-
-	return b.MemDBMFAConfigByNameInTxn(ctx, txn, name)
-}
-
 func (b *LoginMFABackend) MemDBMFALoginEnforcementConfigByNameAndNamespace(name, namespaceId string) (*mfa.MFAEnforcementConfig, error) {
 	if name == "" {
 		return nil, fmt.Errorf("missing config name")
diff --git a/vault/login_mfa_test.go b/vault/login_mfa_test.go
deleted file mode 100644
index 45bb1bacd4cdc..0000000000000
--- a/vault/login_mfa_test.go
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package vault
-
-import (
-	"strings"
-	"testing"
-)
-
-func TestParseFactors(t *testing.T) {
-	testcases := []struct {
-		name                string
-		invalidMFAHeaderVal []string
-		expectedError       string
-	}{
-		{
-			"two headers with passcode",
-			[]string{"passcode", "foo"},
-			"found multiple passcodes for the same MFA method",
-		},
-		{
-			"single header with passcode=",
-			[]string{"passcode="},
-			"invalid passcode",
-		},
-		{
-			"single invalid header",
-			[]string{"foo="},
-			"found an invalid MFA cred",
-		},
-		{
-			"single header equal char",
-			[]string{"=="},
-			"found an invalid MFA cred",
-		},
-		{
-			"two headers with passcode=",
-			[]string{"passcode=foo", "foo"},
-			"found multiple passcodes for the same MFA method",
-		},
-		{
-			"two headers invalid name",
-			[]string{"passcode=foo", "passcode=bar"},
-			"found multiple passcodes for the same MFA method",
-		},
-		{
-			"two headers, two invalid",
-			[]string{"foo", "bar"},
-			"found multiple passcodes for the same MFA method",
-		},
-	}
-	for _, tc := range testcases {
-		t.Run(tc.name, func(t *testing.T) {
-			_, err := parseMfaFactors(tc.invalidMFAHeaderVal)
-			if err == nil {
-				t.Fatal("nil error returned")
-			}
-			if !strings.Contains(err.Error(), tc.expectedError) {
-				t.Fatalf("expected %s, got %v", tc.expectedError, err)
-			}
-		})
-	}
-}
diff --git a/vault/managed_key_registry.go b/vault/managed_key_registry.go
index 42e2015bb9008..eaf6f54493287 100644
--- a/vault/managed_key_registry.go
+++ b/vault/managed_key_registry.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !enterprise
 
 package vault
diff --git a/vault/mfa_auth_resp_priority_queue.go b/vault/mfa_auth_resp_priority_queue.go
index 53c88bef16dcf..615b343dc3455 100644
--- a/vault/mfa_auth_resp_priority_queue.go
+++ b/vault/mfa_auth_resp_priority_queue.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/mfa_auth_resp_priority_queue_test.go b/vault/mfa_auth_resp_priority_queue_test.go
index fc3e5a1c5867a..b8930158b508a 100644
--- a/vault/mfa_auth_resp_priority_queue_test.go
+++ b/vault/mfa_auth_resp_priority_queue_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/mount.go b/vault/mount.go
index d6ace890afbe7..defe4e87ce243 100644
--- a/vault/mount.go
+++ b/vault/mount.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -18,7 +15,6 @@ import (
 	"github.com/hashicorp/go-secure-stdlib/strutil"
 	"github.com/hashicorp/go-uuid"
 	"github.com/hashicorp/vault/builtin/plugin"
-	"github.com/hashicorp/vault/helper/experiments"
 	"github.com/hashicorp/vault/helper/metricsutil"
 	"github.com/hashicorp/vault/helper/namespace"
 	"github.com/hashicorp/vault/helper/versions"
@@ -360,7 +356,6 @@ type MountConfig struct {
 	AllowedResponseHeaders    []string              `json:"allowed_response_headers,omitempty" structs:"allowed_response_headers" mapstructure:"allowed_response_headers"`
 	TokenType                 logical.TokenType     `json:"token_type,omitempty" structs:"token_type" mapstructure:"token_type"`
 	AllowedManagedKeys        []string              `json:"allowed_managed_keys,omitempty" mapstructure:"allowed_managed_keys"`
-	UserLockoutConfig         *UserLockoutConfig    `json:"user_lockout_config,omitempty" mapstructure:"user_lockout_config"`
 
 	// PluginName is the name of the plugin registered in the catalog.
 	//
@@ -368,20 +363,6 @@ type MountConfig struct {
 	PluginName string `json:"plugin_name,omitempty" structs:"plugin_name,omitempty" mapstructure:"plugin_name"`
 }
 
-type UserLockoutConfig struct {
-	LockoutThreshold    uint64        `json:"lockout_threshold,omitempty" structs:"lockout_threshold" mapstructure:"lockout_threshold"`
-	LockoutDuration     time.Duration `json:"lockout_duration,omitempty" structs:"lockout_duration" mapstructure:"lockout_duration"`
-	LockoutCounterReset time.Duration `json:"lockout_counter_reset,omitempty" structs:"lockout_counter_reset" mapstructure:"lockout_counter_reset"`
-	DisableLockout      bool          `json:"disable_lockout,omitempty" structs:"disable_lockout" mapstructure:"disable_lockout"`
-}
-
-type APIUserLockoutConfig struct {
-	LockoutThreshold            string `json:"lockout_threshold,omitempty" structs:"lockout_threshold" mapstructure:"lockout_threshold"`
-	LockoutDuration             string `json:"lockout_duration,omitempty" structs:"lockout_duration" mapstructure:"lockout_duration"`
-	LockoutCounterResetDuration string `json:"lockout_counter_reset_duration,omitempty" structs:"lockout_counter_reset_duration" mapstructure:"lockout_counter_reset_duration"`
-	DisableLockout              *bool  `json:"lockout_disable,omitempty" structs:"lockout_disable" mapstructure:"lockout_disable"`
-}
-
 // APIMountConfig is an embedded struct of api.MountConfigInput
 type APIMountConfig struct {
 	DefaultLeaseTTL           string                `json:"default_lease_ttl" structs:"default_lease_ttl" mapstructure:"default_lease_ttl"`
@@ -394,7 +375,6 @@ type APIMountConfig struct {
 	AllowedResponseHeaders    []string              `json:"allowed_response_headers,omitempty" structs:"allowed_response_headers" mapstructure:"allowed_response_headers"`
 	TokenType                 string                `json:"token_type" structs:"token_type" mapstructure:"token_type"`
 	AllowedManagedKeys        []string              `json:"allowed_managed_keys,omitempty" mapstructure:"allowed_managed_keys"`
-	UserLockoutConfig         *UserLockoutConfig    `json:"user_lockout_config,omitempty" mapstructure:"user_lockout_config"`
 	PluginVersion             string                `json:"plugin_version,omitempty" mapstructure:"plugin_version"`
 
 	// PluginName is the name of the plugin registered in the catalog.
@@ -403,16 +383,6 @@ type APIMountConfig struct {
 	PluginName string `json:"plugin_name,omitempty" structs:"plugin_name,omitempty" mapstructure:"plugin_name"`
 }
 
-type FailedLoginUser struct {
-	aliasName     string
-	mountAccessor string
-}
-
-type FailedLoginInfo struct {
-	count               uint
-	lastFailedLoginTime int
-}
-
 // Clone returns a deep copy of the mount entry
 func (e *MountEntry) Clone() (*MountEntry, error) {
 	cp, err := copystructure.Copy(e)
@@ -422,25 +392,6 @@ func (e *MountEntry) Clone() (*MountEntry, error) {
 	return cp.(*MountEntry), nil
 }
 
-// IsExternalPlugin returns whether the plugin is running externally
-// if the RunningSha256 is non-empty, the builtin is external. Otherwise, it's builtin
-func (e *MountEntry) IsExternalPlugin() bool {
-	return e.RunningSha256 != ""
-}
-
-// MountClass returns the mount class based on Accessor and Path
-func (e *MountEntry) MountClass() string {
-	if e.Accessor == "" || strings.HasPrefix(e.Path, fmt.Sprintf("%s/", systemMountPath)) {
-		return ""
-	}
-
-	if e.Table == credentialTableType {
-		return consts.PluginTypeCredential.String()
-	}
-
-	return consts.PluginTypeSecrets.String()
-}
-
 // Namespace returns the namespace for the mount entry
 func (e *MountEntry) Namespace() *namespace.Namespace {
 	return e.namespace
@@ -499,16 +450,6 @@ func (e *MountEntry) SyncCache() {
 	}
 }
 
-func (entry *MountEntry) Deserialize() map[string]interface{} {
-	return map[string]interface{}{
-		"mount_path":      entry.Path,
-		"mount_namespace": entry.Namespace().Path,
-		"uuid":            entry.UUID,
-		"accessor":        entry.Accessor,
-		"mount_type":      entry.Type,
-	}
-}
-
 func (c *Core) decodeMountTable(ctx context.Context, raw []byte) (*MountTable, error) {
 	// Decode into mount table
 	mountTable := new(MountTable)
@@ -644,16 +585,8 @@ func (c *Core) mountInternal(ctx context.Context, entry *MountEntry, updateStora
 	// Sync values to the cache
 	entry.SyncCache()
 
-	// Resolution to absolute storage paths (versus uuid-relative) needs
-	// to happen prior to calling into the forwarded writer. Thus we
-	// intercept writes just before they hit barrier storage.
-	forwarded, err := c.NewForwardedWriter(ctx, c.barrier, entry.Local)
-	if err != nil {
-		return fmt.Errorf("error creating forwarded writer: %v", err)
-	}
-
 	viewPath := entry.ViewPath()
-	view := NewBarrierView(forwarded, viewPath)
+	view := NewBarrierView(c.barrier, viewPath)
 
 	// Singleton mounts cannot be filtered manually on a per-secondary basis
 	// from replication.
@@ -698,7 +631,7 @@ func (c *Core) mountInternal(ctx context.Context, entry *MountEntry, updateStora
 	entry.RunningVersion = entry.Version
 	if entry.RunningVersion == "" {
 		// don't set the running version to a builtin if it is running as an external plugin
-		if entry.RunningSha256 == "" {
+		if externaler, ok := backend.(logical.Externaler); !ok || !externaler.IsExternal() {
 			entry.RunningVersion = versions.GetBuiltinVersion(consts.PluginTypeSecrets, entry.Type)
 		}
 	}
@@ -1176,9 +1109,9 @@ func (c *Core) remountSecretsEngine(ctx context.Context, src, dst namespace.Moun
 	return nil
 }
 
-// From an input path that has a relative namespace hierarchy followed by a mount point, return the full
+// From an input path that has a relative namespace heirarchy followed by a mount point, return the full
 // namespace of the mount point, along with the mount point without the namespace related prefix.
-// For example, in a hierarchy ns1/ns2/ns3/secret-mount, when currNs is ns1 and path is ns2/ns3/secret-mount,
+// For example, in a heirarchy ns1/ns2/ns3/secret-mount, when currNs is ns1 and path is ns2/ns3/secret-mount,
 // this returns the namespace object for ns1/ns2/ns3/, and the string "secret-mount"
 func (c *Core) splitNamespaceAndMountFromPath(currNs, path string) namespace.MountPathDetails {
 	fullPath := currNs + path
@@ -1344,6 +1277,7 @@ func (c *Core) runMountUpdates(ctx context.Context, needPersist bool) error {
 			needPersist = true
 		}
 	}
+
 	// Done if we have restored the mount table and we don't need
 	// to persist
 	if !needPersist {
@@ -1365,6 +1299,13 @@ func (c *Core) persistMounts(ctx context.Context, table *MountTable, local *bool
 		return fmt.Errorf("invalid table type given, not persisting")
 	}
 
+	for _, entry := range table.Entries {
+		if entry.Table != table.Type {
+			c.logger.Error("given entry to persist in mount table has wrong table value", "path", entry.Path, "entry_table_type", entry.Table, "actual_type", table.Type)
+			return fmt.Errorf("invalid mount entry found, not persisting")
+		}
+	}
+
 	nonLocalMounts := &MountTable{
 		Type: mountTableType,
 	}
@@ -1374,11 +1315,6 @@ func (c *Core) persistMounts(ctx context.Context, table *MountTable, local *bool
 	}
 
 	for _, entry := range table.Entries {
-		if entry.Table != table.Type {
-			c.logger.Error("given entry to persist in mount table has wrong table value", "path", entry.Path, "entry_table_type", entry.Table, "actual_type", table.Type)
-			return fmt.Errorf("invalid mount entry found, not persisting")
-		}
-
 		if entry.Local {
 			localMounts.Entries = append(localMounts.Entries, entry)
 		} else {
@@ -1455,16 +1391,8 @@ func (c *Core) setupMounts(ctx context.Context) error {
 		// Initialize the backend, special casing for system
 		barrierPath := entry.ViewPath()
 
-		// Resolution to absolute storage paths (versus uuid-relative) needs
-		// to happen prior to calling into the forwarded writer. Thus we
-		// intercept writes just before they hit barrier storage.
-		forwarded, err := c.NewForwardedWriter(ctx, c.barrier, entry.Local)
-		if err != nil {
-			return fmt.Errorf("error creating forwarded writer: %v", err)
-		}
-
-		// Create a barrier storage view using the UUID
-		view := NewBarrierView(forwarded, barrierPath)
+		// Create a barrier view using the UUID
+		view := NewBarrierView(c.barrier, barrierPath)
 
 		// Singleton mounts cannot be filtered manually on a per-secondary basis
 		// from replication
@@ -1512,7 +1440,7 @@ func (c *Core) setupMounts(ctx context.Context) error {
 		entry.RunningVersion = entry.Version
 		if entry.RunningVersion == "" {
 			// don't set the running version to a builtin if it is running as an external plugin
-			if entry.RunningSha256 == "" {
+			if externaler, ok := backend.(logical.Externaler); !ok || !externaler.IsExternal() {
 				entry.RunningVersion = versions.GetBuiltinVersion(consts.PluginTypeSecrets, entry.Type)
 			}
 		}
@@ -1671,17 +1599,6 @@ func (c *Core) newLogicalBackend(ctx context.Context, entry *MountEntry, sysView
 
 	backendLogger := c.baseLogger.Named(fmt.Sprintf("secrets.%s.%s", t, entry.Accessor))
 	c.AddLogger(backendLogger)
-	pluginEventSender, err := c.events.WithPlugin(entry.namespace, &logical.EventPluginInfo{
-		MountClass:    consts.PluginTypeSecrets.String(),
-		MountAccessor: entry.Accessor,
-		MountPath:     entry.Path,
-		Plugin:        entry.Type,
-		PluginVersion: entry.RunningVersion,
-		Version:       entry.Version,
-	})
-	if err != nil {
-		return nil, "", err
-	}
 	config := &logical.BackendConfig{
 		StorageView: view,
 		Logger:      backendLogger,
@@ -1689,9 +1606,6 @@ func (c *Core) newLogicalBackend(ctx context.Context, entry *MountEntry, sysView
 		System:      sysView,
 		BackendUUID: entry.BackendAwareUUID,
 	}
-	if c.IsExperimentEnabled(experiments.VaultExperimentEventsAlpha1) {
-		config.EventsSender = pluginEventSender
-	}
 
 	ctx = context.WithValue(ctx, "core_number", c.coreNumber)
 	b, err := f(ctx, config)
diff --git a/vault/mount_test.go b/vault/mount_test.go
index f73ce3876e8ce..e217879cfe809 100644
--- a/vault/mount_test.go
+++ b/vault/mount_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -11,8 +8,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/vault/helper/testhelpers/corehelpers"
-
 	"github.com/armon/go-metrics"
 	"github.com/go-test/deep"
 	"github.com/hashicorp/vault/audit"
@@ -123,7 +118,7 @@ func TestCore_DefaultMountTable(t *testing.T) {
 	conf := &CoreConfig{
 		Physical:        c.physical,
 		DisableMlock:    true,
-		BuiltinRegistry: corehelpers.NewMockBuiltinRegistry(),
+		BuiltinRegistry: NewMockBuiltinRegistry(),
 		MetricSink:      metricsutil.NewClusterMetricSink("test-cluster", inmemSink),
 		MetricsHelper:   metricsutil.NewMetricsHelper(inmemSink, false),
 	}
@@ -168,7 +163,7 @@ func TestCore_Mount(t *testing.T) {
 	conf := &CoreConfig{
 		Physical:        c.physical,
 		DisableMlock:    true,
-		BuiltinRegistry: corehelpers.NewMockBuiltinRegistry(),
+		BuiltinRegistry: NewMockBuiltinRegistry(),
 		MetricSink:      metricsutil.NewClusterMetricSink("test-cluster", inmemSink),
 		MetricsHelper:   metricsutil.NewMetricsHelper(inmemSink, false),
 	}
@@ -240,7 +235,7 @@ func TestCore_Mount_kv_generic(t *testing.T) {
 	conf := &CoreConfig{
 		Physical:        c.physical,
 		DisableMlock:    true,
-		BuiltinRegistry: corehelpers.NewMockBuiltinRegistry(),
+		BuiltinRegistry: NewMockBuiltinRegistry(),
 		MetricSink:      metricsutil.NewClusterMetricSink("test-cluster", inmemSink),
 		MetricsHelper:   metricsutil.NewMetricsHelper(inmemSink, false),
 	}
@@ -454,7 +449,7 @@ func TestCore_Unmount(t *testing.T) {
 	conf := &CoreConfig{
 		Physical:        c.physical,
 		DisableMlock:    true,
-		BuiltinRegistry: corehelpers.NewMockBuiltinRegistry(),
+		BuiltinRegistry: NewMockBuiltinRegistry(),
 		MetricSink:      metricsutil.NewClusterMetricSink("test-cluster", inmemSink),
 		MetricsHelper:   metricsutil.NewMetricsHelper(inmemSink, false),
 	}
@@ -725,7 +720,7 @@ func TestCore_MountTable_UpgradeToTyped(t *testing.T) {
 	c, _, _ := TestCoreUnsealed(t)
 
 	c.auditBackends["noop"] = func(ctx context.Context, config *audit.BackendConfig) (audit.Backend, error) {
-		return &corehelpers.NoopAudit{
+		return &NoopAudit{
 			Config: config,
 		}, nil
 	}
diff --git a/vault/mount_util.go b/vault/mount_util.go
index 004750ecac5bf..d6a108b0d2fb5 100644
--- a/vault/mount_util.go
+++ b/vault/mount_util.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !enterprise
 
 package vault
@@ -13,14 +10,8 @@ import (
 	"github.com/hashicorp/vault/sdk/logical"
 )
 
-func addPathCheckers(c *Core, entry *MountEntry, backend logical.Backend, viewPath string) {
-	c.addBackendWriteForwardedPaths(backend, viewPath)
-}
-
-func removePathCheckers(c *Core, entry *MountEntry, viewPath string) {
-	c.writeForwardedPaths.RemovePathPrefix(viewPath)
-}
-
+func addPathCheckers(*Core, *MountEntry, logical.Backend, string)             {}
+func removePathCheckers(*Core, *MountEntry, string)                           {}
 func addAuditPathChecker(*Core, *MountEntry, *BarrierView, string)            {}
 func removeAuditPathChecker(*Core, *MountEntry)                               {}
 func addFilterablePath(*Core, string)                                         {}
@@ -56,18 +47,10 @@ func verifyNamespace(*Core, *namespace.Namespace, *MountEntry) error { return ni
 // mount-specific entries; because this should be called when setting
 // up a mountEntry, it doesn't check to ensure that me is not nil
 func (c *Core) mountEntrySysView(entry *MountEntry) extendedSystemView {
-	esi := extendedSystemViewImpl{
+	return extendedSystemViewImpl{
 		dynamicSystemView{
-			core:        c,
-			mountEntry:  entry,
-			perfStandby: c.perfStandby,
+			core:       c,
+			mountEntry: entry,
 		},
 	}
-
-	// Due to complexity in the ACME interface, only return it when we
-	// are a PKI plugin that needs it.
-	if entry.Type != "pki" {
-		return esi
-	}
-	return c.NewAcmeBillingSystemView(esi)
 }
diff --git a/vault/mount_util_shared.go b/vault/mount_util_shared.go
deleted file mode 100644
index fffd3cb93da9f..0000000000000
--- a/vault/mount_util_shared.go
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package vault
-
-import (
-	"github.com/hashicorp/vault/sdk/logical"
-)
-
-func (c *Core) addBackendWriteForwardedPaths(backend logical.Backend, viewPath string) {
-	paths := collectBackendSpecialPaths(backend, viewPath, func(specialPaths *logical.Paths) []string {
-		return specialPaths.WriteForwardedStorage
-	})
-
-	c.logger.Trace("adding write forwarded paths", "paths", paths)
-	c.writeForwardedPaths.AddPaths(paths)
-}
-
-func collectBackendSpecialPaths(backend logical.Backend, viewPath string, accessor func(specialPaths *logical.Paths) []string) []string {
-	if backend == nil || backend.SpecialPaths() == nil {
-		return nil
-	}
-	paths := accessor(backend.SpecialPaths())
-
-	var ret []string
-	for _, path := range paths {
-		ret = append(ret, viewPath+path)
-	}
-
-	return ret
-}
diff --git a/vault/namespaces.go b/vault/namespaces.go
index fbff5ee4baff5..49339922f672b 100644
--- a/vault/namespaces.go
+++ b/vault/namespaces.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/namespaces_oss.go b/vault/namespaces_oss.go
index 13b93372edc3b..90d1dfbdd6fb4 100644
--- a/vault/namespaces_oss.go
+++ b/vault/namespaces_oss.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !enterprise
 
 package vault
diff --git a/vault/password_policy_util.go b/vault/password_policy_util.go
index a5cfcb3776202..4db38d1c11be4 100644
--- a/vault/password_policy_util.go
+++ b/vault/password_policy_util.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !enterprise
 
 package vault
diff --git a/vault/plugin_catalog.go b/vault/plugin_catalog.go
index 4c81d450066fa..dd92f591d6af5 100644
--- a/vault/plugin_catalog.go
+++ b/vault/plugin_catalog.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -27,7 +24,6 @@ import (
 	"github.com/hashicorp/vault/sdk/helper/pluginutil"
 	"github.com/hashicorp/vault/sdk/logical"
 	backendplugin "github.com/hashicorp/vault/sdk/plugin"
-	"github.com/hashicorp/vault/version"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
 )
@@ -59,8 +55,7 @@ type PluginCatalog struct {
 	externalPlugins map[externalPluginsKey]*externalPlugin
 	mlockPlugins    bool
 
-	lock    sync.RWMutex
-	wrapper pluginutil.RunnerUtil
+	lock sync.RWMutex
 }
 
 // Only plugins running with identical PluginRunner config can be multiplexed,
@@ -173,7 +168,6 @@ func (c *Core) setupPluginCatalog(ctx context.Context) error {
 		directory:       c.pluginDirectory,
 		logger:          c.logger,
 		mlockPlugins:    c.enableMlock,
-		wrapper:         logical.StaticSystemView{VersionString: version.GetVersion().Version},
 	}
 
 	// Run upgrade if untyped plugins exist
@@ -467,7 +461,6 @@ func (c *PluginCatalog) getBackendPluginType(ctx context.Context, pluginRunner *
 		Logger:          log.NewNullLogger(),
 		IsMetadataMode:  false,
 		AutoMTLS:        true,
-		Wrapper:         c.wrapper,
 	}
 
 	var client logical.Backend
@@ -507,7 +500,7 @@ func (c *PluginCatalog) getBackendPluginType(ctx context.Context, pluginRunner *
 		config.AutoMTLS = false
 		config.IsMetadataMode = true
 		// attempt to run as a v4 backend plugin
-		client, err = backendplugin.NewPluginClient(ctx, c.wrapper, pluginRunner, log.NewNullLogger(), true)
+		client, err = backendplugin.NewPluginClient(ctx, nil, pluginRunner, log.NewNullLogger(), true)
 		if err != nil {
 			merr = multierror.Append(merr, fmt.Errorf("failed to dispense v4 backend plugin: %w", err))
 			c.logger.Debug("failed to dispense v4 backend plugin", "name", pluginRunner.Name, "error", merr)
@@ -557,7 +550,6 @@ func (c *PluginCatalog) getBackendRunningVersion(ctx context.Context, pluginRunn
 		Logger:          log.NewNullLogger(),
 		IsMetadataMode:  false,
 		AutoMTLS:        true,
-		Wrapper:         c.wrapper,
 	}
 
 	var client logical.Backend
@@ -598,7 +590,7 @@ func (c *PluginCatalog) getBackendRunningVersion(ctx context.Context, pluginRunn
 	config.AutoMTLS = false
 	config.IsMetadataMode = true
 	// attempt to run as a v4 backend plugin
-	client, err = backendplugin.NewPluginClient(ctx, c.wrapper, pluginRunner, log.NewNullLogger(), true)
+	client, err = backendplugin.NewPluginClient(ctx, nil, pluginRunner, log.NewNullLogger(), true)
 	if err != nil {
 		merr = multierror.Append(merr, fmt.Errorf("failed to dispense v4 backend plugin: %w", err))
 		c.logger.Debug("failed to dispense v4 backend plugin", "name", pluginRunner.Name, "error", merr)
@@ -629,7 +621,6 @@ func (c *PluginCatalog) getDatabaseRunningVersion(ctx context.Context, pluginRun
 		Logger:          log.Default(),
 		IsMetadataMode:  true,
 		AutoMTLS:        true,
-		Wrapper:         c.wrapper,
 	}
 
 	// Attempt to run as database V5+ multiplexed plugin
@@ -660,7 +651,7 @@ func (c *PluginCatalog) getDatabaseRunningVersion(ctx context.Context, pluginRun
 	merr = multierror.Append(merr, fmt.Errorf("failed to load plugin as database v5: %w", err))
 
 	c.logger.Debug("attempting to load database plugin as v4", "name", pluginRunner.Name)
-	v4Client, err := v4.NewPluginClient(ctx, c.wrapper, pluginRunner, log.NewNullLogger(), true)
+	v4Client, err := v4.NewPluginClient(ctx, nil, pluginRunner, log.NewNullLogger(), true)
 	if err == nil {
 		// Close the client and cleanup the plugin process
 		defer func() {
@@ -692,7 +683,6 @@ func (c *PluginCatalog) isDatabasePlugin(ctx context.Context, pluginRunner *plug
 		Logger:          log.NewNullLogger(),
 		IsMetadataMode:  true,
 		AutoMTLS:        true,
-		Wrapper:         c.wrapper,
 	}
 
 	// Attempt to run as database V5+ multiplexed plugin
@@ -714,7 +704,7 @@ func (c *PluginCatalog) isDatabasePlugin(ctx context.Context, pluginRunner *plug
 	merr = multierror.Append(merr, fmt.Errorf("failed to load plugin as database v5: %w", err))
 
 	c.logger.Debug("attempting to load database plugin as v4", "name", pluginRunner.Name)
-	v4Client, err := v4.NewPluginClient(ctx, c.wrapper, pluginRunner, log.NewNullLogger(), true)
+	v4Client, err := v4.NewPluginClient(ctx, nil, pluginRunner, log.NewNullLogger(), true)
 	if err == nil {
 		// Close the client and cleanup the plugin process
 		err = v4Client.Close()
diff --git a/vault/plugin_catalog_test.go b/vault/plugin_catalog_test.go
index 07587836af25b..d1b469f05de16 100644
--- a/vault/plugin_catalog_test.go
+++ b/vault/plugin_catalog_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/plugin_reload.go b/vault/plugin_reload.go
index 79054cf8a9659..deae7054ff1e9 100644
--- a/vault/plugin_reload.go
+++ b/vault/plugin_reload.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -197,7 +194,7 @@ func (c *Core) reloadBackendCommon(ctx context.Context, entry *MountEntry, isAut
 	entry.RunningVersion = entry.Version
 	if entry.RunningVersion == "" {
 		// don't set the running version to a builtin if it is running as an external plugin
-		if entry.RunningSha256 == "" {
+		if externaler, ok := backend.(logical.Externaler); !ok || !externaler.IsExternal() {
 			if isAuth {
 				entry.RunningVersion = versions.GetBuiltinVersion(consts.PluginTypeCredential, entry.Type)
 			} else {
diff --git a/vault/policy.go b/vault/policy.go
index 86e7905c70618..7d2b5c88bc787 100644
--- a/vault/policy.go
+++ b/vault/policy.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/policy_store.go b/vault/policy_store.go
index e4c12e7b0f366..d79ffe09eedc1 100644
--- a/vault/policy_store.go
+++ b/vault/policy_store.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -11,7 +8,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/armon/go-metrics"
+	metrics "github.com/armon/go-metrics"
 	log "github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/go-secure-stdlib/strutil"
 	lru "github.com/hashicorp/golang-lru"
@@ -156,7 +153,7 @@ path "sys/control-group/request" {
 
 # Allow a token to make requests to the Authorization Endpoint for OIDC providers.
 path "identity/oidc/provider/+/authorize" {
-    capabilities = ["read", "update"]
+	capabilities = ["read", "update"]
 }
 `
 )
@@ -254,7 +251,7 @@ func NewPolicyStore(ctx context.Context, core *Core, baseView *BarrierView, syst
 func (c *Core) setupPolicyStore(ctx context.Context) error {
 	// Create the policy store
 	var err error
-	sysView := &dynamicSystemView{core: c, perfStandby: c.perfStandby}
+	sysView := &dynamicSystemView{core: c}
 	psLogger := c.baseLogger.Named("policy")
 	c.AddLogger(psLogger)
 	c.policyStore, err = NewPolicyStore(ctx, c, c.systemBarrierView, sysView, psLogger)
@@ -649,60 +646,6 @@ func (ps *PolicyStore) ListPolicies(ctx context.Context, policyType PolicyType)
 	return keys, err
 }
 
-// policiesByNamespace is used to list the available policies for the given namespace
-func (ps *PolicyStore) policiesByNamespace(ctx context.Context, policyType PolicyType, ns *namespace.Namespace) ([]string, error) {
-	var err error
-	var keys []string
-	var view *BarrierView
-
-	// Scan the view, since the policy names are the same as the
-	// key names.
-	switch policyType {
-	case PolicyTypeACL:
-		view = ps.getACLView(ns)
-	case PolicyTypeRGP:
-		view = ps.getRGPView(ns)
-	case PolicyTypeEGP:
-		view = ps.getEGPView(ns)
-	default:
-		return nil, fmt.Errorf("unknown policy type %q", policyType)
-	}
-
-	if view == nil {
-		return nil, fmt.Errorf("unable to get the barrier subview for policy type %q", policyType)
-	}
-
-	// Get the appropriate view based on policy type and namespace
-	ctx = namespace.ContextWithNamespace(ctx, ns)
-	keys, err = logical.CollectKeys(ctx, view)
-	if err != nil {
-		return nil, err
-	}
-
-	if policyType == PolicyTypeACL {
-		// We only have non-assignable ACL policies at the moment
-		keys = strutil.Difference(keys, nonAssignablePolicies, false)
-	}
-
-	return keys, err
-}
-
-// policiesByNamespaces is used to list the available policies for the given namespaces
-func (ps *PolicyStore) policiesByNamespaces(ctx context.Context, policyType PolicyType, ns []*namespace.Namespace) ([]string, error) {
-	var err error
-	var keys []string
-
-	for _, nspace := range ns {
-		ks, err := ps.policiesByNamespace(ctx, policyType, nspace)
-		if err != nil {
-			return nil, err
-		}
-		keys = append(keys, ks...)
-	}
-
-	return keys, err
-}
-
 // DeletePolicy is used to delete the named policy
 func (ps *PolicyStore) DeletePolicy(ctx context.Context, name string, policyType PolicyType) error {
 	return ps.switchedDeletePolicy(ctx, name, policyType, true, false)
@@ -802,6 +745,18 @@ func (ps *PolicyStore) switchedDeletePolicy(ctx context.Context, name string, po
 	return nil
 }
 
+type TemplateError struct {
+	Err error
+}
+
+func (t *TemplateError) WrappedErrors() []error {
+	return []error{t.Err}
+}
+
+func (t *TemplateError) Error() string {
+	return t.Err.Error()
+}
+
 // ACL is used to return an ACL which is built using the
 // named policies and pre-fetched policies if given.
 func (ps *PolicyStore) ACL(ctx context.Context, entity *identity.Entity, policyNames map[string][]string, additionalPolicies ...*Policy) (*ACL, error) {
diff --git a/vault/policy_store_test.go b/vault/policy_store_test.go
index 59e005d612701..d4b1fcf6e874a 100644
--- a/vault/policy_store_test.go
+++ b/vault/policy_store_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -9,7 +6,6 @@ import (
 	"testing"
 
 	"github.com/hashicorp/vault/helper/namespace"
-	"github.com/hashicorp/vault/sdk/logical"
 )
 
 func mockPolicyWithCore(t *testing.T, disableCache bool) (*Core, *PolicyStore) {
@@ -278,78 +274,3 @@ func testPolicyStoreACL(t *testing.T, ps *PolicyStore, ns *namespace.Namespace)
 	}
 	testLayeredACL(t, acl, ns)
 }
-
-func TestDefaultPolicy(t *testing.T) {
-	ctx := namespace.ContextWithNamespace(context.Background(), namespace.RootNamespace)
-
-	policy, err := ParseACLPolicy(namespace.RootNamespace, defaultPolicy)
-	if err != nil {
-		t.Fatal(err)
-	}
-	acl, err := NewACL(ctx, []*Policy{policy})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	for name, tc := range map[string]struct {
-		op            logical.Operation
-		path          string
-		expectAllowed bool
-	}{
-		"lookup self":            {logical.ReadOperation, "auth/token/lookup-self", true},
-		"renew self":             {logical.UpdateOperation, "auth/token/renew-self", true},
-		"revoke self":            {logical.UpdateOperation, "auth/token/revoke-self", true},
-		"check own capabilities": {logical.UpdateOperation, "sys/capabilities-self", true},
-
-		"read arbitrary path":     {logical.ReadOperation, "foo/bar", false},
-		"login at arbitrary path": {logical.UpdateOperation, "auth/foo", false},
-	} {
-		t.Run(name, func(t *testing.T) {
-			request := new(logical.Request)
-			request.Operation = tc.op
-			request.Path = tc.path
-
-			result := acl.AllowOperation(ctx, request, false)
-			if result.RootPrivs {
-				t.Fatal("unexpected root")
-			}
-			if tc.expectAllowed != result.Allowed {
-				t.Fatalf("Expected %v, got %v", tc.expectAllowed, result.Allowed)
-			}
-		})
-	}
-}
-
-// TestPolicyStore_PoliciesByNamespaces tests the policiesByNamespaces function, which should return a slice of policy names for a given slice of namespaces.
-func TestPolicyStore_PoliciesByNamespaces(t *testing.T) {
-	_, ps := mockPolicyWithCore(t, false)
-
-	ctxRoot := namespace.RootContext(context.Background())
-	rootNs := namespace.RootNamespace
-
-	parsedPolicy, _ := ParseACLPolicy(rootNs, aclPolicy)
-
-	err := ps.SetPolicy(ctxRoot, parsedPolicy)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	// Get should work
-	pResult, err := ps.GetPolicy(ctxRoot, "dev", PolicyTypeACL)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	if !reflect.DeepEqual(pResult, parsedPolicy) {
-		t.Fatalf("bad: %v", pResult)
-	}
-
-	out, err := ps.policiesByNamespaces(ctxRoot, PolicyTypeACL, []*namespace.Namespace{rootNs})
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	expectedResult := []string{"default", "dev"}
-	if !reflect.DeepEqual(expectedResult, out) {
-		t.Fatalf("expected: %v\ngot: %v", expectedResult, out)
-	}
-}
diff --git a/vault/policy_store_util.go b/vault/policy_store_util.go
index 65cd056d89708..75098c1a272ed 100644
--- a/vault/policy_store_util.go
+++ b/vault/policy_store_util.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !enterprise
 
 package vault
diff --git a/vault/policy_test.go b/vault/policy_test.go
index e7323da14d542..7f09d7cb2be75 100644
--- a/vault/policy_test.go
+++ b/vault/policy_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/policy_util.go b/vault/policy_util.go
index 5443618f1dc18..06c2c709d26fe 100644
--- a/vault/policy_util.go
+++ b/vault/policy_util.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !enterprise
 
 package vault
diff --git a/vault/quotas/quotas.go b/vault/quotas/quotas.go
index 624b5ccf8084b..69163364b9d51 100644
--- a/vault/quotas/quotas.go
+++ b/vault/quotas/quotas.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package quotas
 
 import (
@@ -9,10 +6,10 @@ import (
 	"fmt"
 	"path"
 	"strings"
+	"sync"
 
 	log "github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/go-memdb"
-	"github.com/hashicorp/vault/helper/locking"
 	"github.com/hashicorp/vault/helper/metricsutil"
 	"github.com/hashicorp/vault/helper/namespace"
 	"github.com/hashicorp/vault/sdk/helper/pathmanager"
@@ -170,13 +167,13 @@ type Manager struct {
 	metricSink *metricsutil.ClusterMetricSink
 
 	// quotaLock is a lock for manipulating quotas and anything not covered by a more specific lock
-	quotaLock *locking.DeadlockRWMutex
+	quotaLock *sync.RWMutex
 
 	// quotaConfigLock is a lock for accessing config items, such as RateLimitExemptPaths
-	quotaConfigLock *locking.DeadlockRWMutex
+	quotaConfigLock *sync.RWMutex
 
 	// dbAndCacheLock is a lock for db and path caches that need to be reset during Reset()
-	dbAndCacheLock *locking.DeadlockRWMutex
+	dbAndCacheLock *sync.RWMutex
 }
 
 // QuotaLeaseInformation contains all of the information lease-count quotas require
@@ -284,9 +281,9 @@ func NewManager(logger log.Logger, walkFunc leaseWalkFunc, ms *metricsutil.Clust
 		metricSink:           ms,
 		rateLimitPathManager: pathmanager.New(),
 		config:               new(Config),
-		quotaLock:            new(locking.DeadlockRWMutex),
-		quotaConfigLock:      new(locking.DeadlockRWMutex),
-		dbAndCacheLock:       new(locking.DeadlockRWMutex),
+		quotaLock:            new(sync.RWMutex),
+		quotaConfigLock:      new(sync.RWMutex),
+		dbAndCacheLock:       new(sync.RWMutex),
 	}
 
 	manager.init(walkFunc)
diff --git a/vault/quotas/quotas_rate_limit.go b/vault/quotas/quotas_rate_limit.go
index bd000e1dafd98..4774259a3ba0e 100644
--- a/vault/quotas/quotas_rate_limit.go
+++ b/vault/quotas/quotas_rate_limit.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package quotas
 
 import (
diff --git a/vault/quotas/quotas_rate_limit_test.go b/vault/quotas/quotas_rate_limit_test.go
index ff5711acfb822..a117ee78ccc9d 100644
--- a/vault/quotas/quotas_rate_limit_test.go
+++ b/vault/quotas/quotas_rate_limit_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package quotas
 
 import (
diff --git a/vault/quotas/quotas_test.go b/vault/quotas/quotas_test.go
index 4b99a8ee2d1b7..00299859fc859 100644
--- a/vault/quotas/quotas_test.go
+++ b/vault/quotas/quotas_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package quotas
 
 import (
diff --git a/vault/quotas/quotas_util.go b/vault/quotas/quotas_util.go
index d9e733b040cae..984e736b60c7e 100644
--- a/vault/quotas/quotas_util.go
+++ b/vault/quotas/quotas_util.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !enterprise
 
 package quotas
diff --git a/vault/raft.go b/vault/raft.go
index daf4d2b6f1523..7752da2a666ba 100644
--- a/vault/raft.go
+++ b/vault/raft.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -41,7 +38,7 @@ const (
 
 	// undoLogSafeVersion is the minimum version Vault must be at in order
 	// for undo logs to be turned on.
-	undoLogSafeVersion = "1.12.0"
+	undoLogSafeVersion = "1.12.0-rc1"
 )
 
 var (
@@ -202,13 +199,6 @@ func (c *Core) monitorUndoLogs() error {
 		return nil
 	}
 
-	// If undo logs have been explicitly enabled, likely via VAULT_REPLICATION_USE_UNDO_LOGS, then exit, as presumably
-	// we don't want to be checking for safety if we already know it's safe.
-	if c.UndoLogsEnabled() {
-		logger.Debug("undo logs have been explicitly enabled. exiting monitor.")
-		return nil
-	}
-
 	minimumVersion, err := goversion.NewSemver(undoLogSafeVersion)
 	if err != nil {
 		return fmt.Errorf("minimum undo log version (%q) won't parse: %w", undoLogSafeVersion, err)
@@ -292,7 +282,7 @@ func (c *Core) monitorUndoLogs() error {
 					continue
 				}
 
-				logger.Debug("undo logs have been enabled and this has been persisted to storage. shutting down the checker.")
+				logger.Debug("undo logs have been enabled and this has been persisted to storage. shutting down the checker loop.")
 				return
 			}
 		}
@@ -325,10 +315,10 @@ func (c *Core) setupRaftActiveNode(ctx context.Context) error {
 		return err
 	}
 
-	// We always want to start this watcher - if undo logs are safe to be enabled, it will exit quickly. If not, it
-	// will monitor for safety until they are enabled.
-	if err := c.monitorUndoLogs(); err != nil {
-		return err
+	if c.UndoLogsEnabled() {
+		if err := c.monitorUndoLogs(); err != nil {
+			return err
+		}
 	}
 	return c.startPeriodicRaftTLSRotate(ctx)
 }
@@ -436,9 +426,8 @@ func (c *Core) raftTLSRotateDirect(ctx context.Context, logger hclog.Logger, sto
 				backoff = false
 			}
 
-			timer := time.NewTimer(time.Until(nextRotationTime))
 			select {
-			case <-timer.C:
+			case <-time.After(time.Until(nextRotationTime)):
 				// It's time to rotate the keys
 				next, err := rotateKeyring()
 				if err != nil {
@@ -450,7 +439,6 @@ func (c *Core) raftTLSRotateDirect(ctx context.Context, logger hclog.Logger, sto
 				nextRotationTime = next
 
 			case <-stopCh:
-				timer.Stop()
 				return
 			}
 		}
@@ -772,9 +760,7 @@ func (c *Core) raftSnapshotRestoreCallback(grabLock bool, sealNode bool) func(co
 
 		if grabLock {
 			// Grab statelock
-			l := newLockGrabber(c.stateLock.Lock, c.stateLock.Unlock, c.standbyStopCh.Load().(chan struct{}))
-			go l.grab()
-			if stopped := l.lockOrStop(); stopped {
+			if stopped := grabLockOrStop(c.stateLock.Lock, c.stateLock.Unlock, c.standbyStopCh.Load().(chan struct{})); stopped {
 				c.logger.Error("did not apply snapshot; vault is shutting down")
 				return errors.New("did not apply snapshot; vault is shutting down")
 			}
@@ -1239,11 +1225,6 @@ func (c *Core) raftLeaderInfo(leaderInfo *raft.LeaderJoinInfo, disco *discover.D
 	return ret, nil
 }
 
-// NewDelegateForCore creates a raft.Delegate for the specified core using its backend.
-func NewDelegateForCore(c *Core) *raft.Delegate {
-	return raft.NewDelegate(c.getRaftBackend())
-}
-
 // getRaftBackend returns the RaftBackend from the HA or physical backend,
 // in that order of preference, or nil if not of type RaftBackend.
 func (c *Core) getRaftBackend() *raft.RaftBackend {
@@ -1268,7 +1249,7 @@ func (c *Core) isRaftHAOnly() bool {
 	return isRaftHA && !isRaftStorage
 }
 
-func (c *Core) joinRaftSendAnswer(ctx context.Context, sealAccess seal.Access, raftInfo *raftInformation) error {
+func (c *Core) joinRaftSendAnswer(ctx context.Context, sealAccess *seal.Access, raftInfo *raftInformation) error {
 	if raftInfo.challenge == nil {
 		return errors.New("raft challenge is nil")
 	}
diff --git a/vault/rekey.go b/vault/rekey.go
index 80df6552d726b..742543a55cb30 100644
--- a/vault/rekey.go
+++ b/vault/rekey.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -401,10 +398,11 @@ func (c *Core) BarrierRekeyUpdate(ctx context.Context, key []byte, nonce string)
 		}
 	case c.seal.BarrierType() == wrapping.WrapperTypeShamir:
 		if c.seal.StoredKeysSupported() == seal.StoredKeysSupportedShamirRoot {
-			shamirWrapper := aeadwrapper.NewShamirWrapper()
-			testseal := NewDefaultSeal(seal.NewAccess(shamirWrapper))
+			testseal := NewDefaultSeal(&seal.Access{
+				Wrapper: aeadwrapper.NewShamirWrapper(),
+			})
 			testseal.SetCore(c)
-			err = shamirWrapper.SetAesGcmKeyBytes(recoveredKey)
+			err = testseal.GetAccess().Wrapper.(*aeadwrapper.ShamirWrapper).SetAesGcmKeyBytes(recoveredKey)
 			if err != nil {
 				return nil, logical.CodedError(http.StatusInternalServerError, fmt.Errorf("failed to setup unseal key: %w", err).Error())
 			}
@@ -532,10 +530,7 @@ func (c *Core) performBarrierRekey(ctx context.Context, newSealKey []byte) logic
 	}
 
 	if c.seal.StoredKeysSupported() != seal.StoredKeysSupportedGeneric {
-		shamirWrapper, err := c.seal.GetShamirWrapper()
-		if err == nil {
-			err = shamirWrapper.SetAesGcmKeyBytes(newSealKey)
-		}
+		err := c.seal.GetAccess().Wrapper.(*aeadwrapper.ShamirWrapper).SetAesGcmKeyBytes(newSealKey)
 		if err != nil {
 			return logical.CodedError(http.StatusInternalServerError, fmt.Errorf("failed to update barrier seal key: %w", err).Error())
 		}
diff --git a/vault/rekey_test.go b/vault/rekey_test.go
index 508892d5dc012..5224db532ee59 100644
--- a/vault/rekey_test.go
+++ b/vault/rekey_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/replication/cluster.go b/vault/replication/cluster.go
index 263c8cb4fdcd4..a61c174ce6ab8 100644
--- a/vault/replication/cluster.go
+++ b/vault/replication/cluster.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !enterprise
 
 package replication
diff --git a/vault/request_forwarding.go b/vault/request_forwarding.go
index fbbad12c0ef0a..b68b6a0d6b01e 100644
--- a/vault/request_forwarding.go
+++ b/vault/request_forwarding.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/request_forwarding_rpc.go b/vault/request_forwarding_rpc.go
index 062ec47be4055..42e4bb462f596 100644
--- a/vault/request_forwarding_rpc.go
+++ b/vault/request_forwarding_rpc.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/request_forwarding_rpc_util.go b/vault/request_forwarding_rpc_util.go
index cd1fbc1c1d399..932259bb4e74c 100644
--- a/vault/request_forwarding_rpc_util.go
+++ b/vault/request_forwarding_rpc_util.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !enterprise
 
 package vault
diff --git a/vault/request_forwarding_service.pb.go b/vault/request_forwarding_service.pb.go
index 005d588992d09..86d3347515d9d 100644
--- a/vault/request_forwarding_service.pb.go
+++ b/vault/request_forwarding_service.pb.go
@@ -1,10 +1,7 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc        v3.21.5
 // source: vault/request_forwarding_service.proto
 
 package vault
diff --git a/vault/request_forwarding_service.proto b/vault/request_forwarding_service.proto
index 367691fb035de..508248a2268fd 100644
--- a/vault/request_forwarding_service.proto
+++ b/vault/request_forwarding_service.proto
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 syntax = "proto3";
 
 option go_package = "github.com/hashicorp/vault/vault";
diff --git a/vault/request_handling.go b/vault/request_handling.go
index 655d0c7a2163a..151792610f4e2 100644
--- a/vault/request_handling.go
+++ b/vault/request_handling.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -10,7 +7,6 @@ import (
 	"errors"
 	"fmt"
 	"os"
-	"strconv"
 	"strings"
 	"time"
 
@@ -21,7 +17,6 @@ import (
 	"github.com/hashicorp/go-secure-stdlib/strutil"
 	"github.com/hashicorp/go-sockaddr"
 	"github.com/hashicorp/go-uuid"
-	"github.com/hashicorp/vault/command/server"
 	"github.com/hashicorp/vault/helper/identity"
 	"github.com/hashicorp/vault/helper/identity/mfa"
 	"github.com/hashicorp/vault/helper/metricsutil"
@@ -42,8 +37,6 @@ import (
 const (
 	replTimeout                           = 1 * time.Second
 	EnvVaultDisableLocalAuthMountEntities = "VAULT_DISABLE_LOCAL_AUTH_MOUNT_ENTITIES"
-	// base path to store locked users
-	coreLockedUsersPath = "core/login/lockedUsers/"
 )
 
 var (
@@ -114,11 +107,6 @@ func (c *Core) fetchEntityAndDerivedPolicies(ctx context.Context, tokenNS *names
 			return nil, nil, err
 		}
 
-		policyApplicationMode, err := c.GetGroupPolicyApplicationMode(ctx)
-		if err != nil {
-			return nil, nil, err
-		}
-
 		// Filter and add the policies to the resultant set
 		for nsID, nsPolicies := range groupPolicies {
 			ns, err := NamespaceByID(ctx, nsID, c)
@@ -128,13 +116,8 @@ func (c *Core) fetchEntityAndDerivedPolicies(ctx context.Context, tokenNS *names
 			if ns == nil {
 				return nil, nil, namespace.ErrNoNamespace
 			}
-			// If we're only applying policies to namespaces within the same
-			// hierarchy, then skip any policies not found in the same
-			// hierarchy
-			if policyApplicationMode == groupPolicyApplicationModeWithinNamespaceHierarchy {
-				if tokenNS.Path != ns.Path && !ns.HasParent(tokenNS) {
-					continue
-				}
+			if tokenNS.Path != ns.Path && !ns.HasParent(tokenNS) {
+				continue
 			}
 			nsPolicies = strutil.RemoveDuplicates(nsPolicies, false)
 			if len(nsPolicies) != 0 {
@@ -256,6 +239,10 @@ func (c *Core) fetchACLTokenEntryAndEntity(ctx context.Context, req *logical.Req
 	// performed on the token's namespace.
 	acl, err := c.policyStore.ACL(tokenCtx, entity, policyNames, policies...)
 	if err != nil {
+		if errwrap.ContainsType(err, new(TemplateError)) {
+			c.logger.Warn("permission denied due to a templated policy being invalid or containing directives not satisfied by the requestor", "error", err)
+			return nil, nil, nil, nil, logical.ErrPermissionDenied
+		}
 		c.logger.Error("failed to construct ACL", "error", err)
 		return nil, nil, nil, nil, ErrInternalError
 	}
@@ -263,7 +250,7 @@ func (c *Core) fetchACLTokenEntryAndEntity(ctx context.Context, req *logical.Req
 	return acl, te, entity, identityPolicies, nil
 }
 
-func (c *Core) CheckToken(ctx context.Context, req *logical.Request, unauth bool) (*logical.Auth, *logical.TokenEntry, error) {
+func (c *Core) checkToken(ctx context.Context, req *logical.Request, unauth bool) (*logical.Auth, *logical.TokenEntry, error) {
 	defer metrics.MeasureSince([]string{"core", "check_token"}, time.Now())
 
 	var acl *ACL
@@ -434,12 +421,9 @@ func (c *Core) CheckToken(ctx context.Context, req *logical.Request, unauth bool
 		auth.PolicyResults.GrantingPolicies = append(auth.PolicyResults.GrantingPolicies, authResults.SentinelResults.GrantingPolicies...)
 	}
 
-	c.activityLogLock.RLock()
-	activityLog := c.activityLog
-	c.activityLogLock.RUnlock()
 	// If it is an authenticated ( i.e with vault token ) request, increment client count
-	if !unauth && activityLog != nil {
-		activityLog.HandleTokenUsage(ctx, te, clientID, isTWE)
+	if !unauth && c.activityLog != nil {
+		c.activityLog.HandleTokenUsage(ctx, te, clientID, isTWE)
 	}
 	return auth, te, nil
 }
@@ -567,7 +551,7 @@ func (c *Core) handleCancelableRequest(ctx context.Context, req *logical.Request
 			// be revoked after the call. So we have to do the validation here.
 			valid, err := c.validateWrappingToken(ctx, req)
 			if err != nil {
-				return logical.ErrorResponse(fmt.Sprintf("error validating wrapping token: %s", err.Error())), logical.ErrPermissionDenied
+				return nil, fmt.Errorf("error validating wrapping token: %w", err)
 			}
 			if !valid {
 				return nil, consts.ErrInvalidWrappingToken
@@ -681,10 +665,6 @@ func (c *Core) handleCancelableRequest(ctx context.Context, req *logical.Request
 		resp, auth, err = c.handleRequest(ctx, req)
 	}
 
-	if err == nil && c.requestResponseCallback != nil {
-		c.requestResponseCallback(c.router.MatchingBackend(ctx, req.Path), req, resp)
-	}
-
 	// If we saved the token in the request, we should return it in the response
 	// data.
 	if resp != nil && resp.Data != nil {
@@ -806,7 +786,7 @@ func (c *Core) handleCancelableRequest(ctx context.Context, req *logical.Request
 	}
 
 	if walState.LocalIndex != 0 || walState.ReplicatedIndex != 0 {
-		walState.ClusterID = c.ClusterID()
+		walState.ClusterID = c.clusterID.Load()
 		if walState.LocalIndex == 0 {
 			if c.perfStandby {
 				walState.LocalIndex = LastRemoteWAL(c)
@@ -836,30 +816,7 @@ func (c *Core) doRouting(ctx context.Context, req *logical.Request) (*logical.Re
 	// If we're replicating and we get a read-only error from a backend, need to forward to primary
 	resp, err := c.router.Route(ctx, req)
 	if shouldForward(c, resp, err) {
-		fwdResp, fwdErr := forward(ctx, c, req)
-		if fwdErr != nil && err != logical.ErrReadOnly {
-			// When handling the request locally, we got an error that
-			// contained ErrReadOnly, but had additional information.
-			// Since we've now forwarded this request and got _another_
-			// error, we should tell the user about both errors, so
-			// they know about both.
-			//
-			// When there is no error from forwarding, the request
-			// succeeded and so no additional context is necessary. When
-			// the initial error here was only ErrReadOnly, it's likely
-			// the plugin authors intended to forward this request
-			// remotely anyway.
-			repErr, ok := fwdErr.(*logical.ReplicationCodedError)
-			if ok {
-				fwdErr = &logical.ReplicationCodedError{
-					Msg:  fmt.Sprintf("errors from both primary and secondary; primary error was %s; secondary errors follow: %s", repErr.Error(), err.Error()),
-					Code: repErr.Code,
-				}
-			} else {
-				fwdErr = multierror.Append(fwdErr, err)
-			}
-		}
-		return fwdResp, fwdErr
+		return forward(ctx, c, req)
 	}
 	return resp, err
 }
@@ -876,11 +833,6 @@ func (c *Core) handleRequest(ctx context.Context, req *logical.Request) (retResp
 	if entry != nil {
 		// Set here so the audit log has it even if authorization fails
 		req.MountType = entry.Type
-		req.SetMountRunningSha256(entry.RunningSha256)
-		req.SetMountRunningVersion(entry.RunningVersion)
-		req.SetMountIsExternalPlugin(entry.IsExternalPlugin())
-		req.SetMountClass(entry.MountClass())
-
 		// Get and set ignored HMAC'd value.
 		if rawVals, ok := entry.synthesizedConfigCache.Load("audit_non_hmac_request_keys"); ok {
 			nonHMACReqDataKeys = rawVals.([]string)
@@ -895,7 +847,7 @@ func (c *Core) handleRequest(ctx context.Context, req *logical.Request) (retResp
 	}
 
 	// Validate the token
-	auth, te, ctErr := c.CheckToken(ctx, req, false)
+	auth, te, ctErr := c.checkToken(ctx, req, false)
 	if ctErr == logical.ErrRelativePath {
 		return logical.ErrorResponse(ctErr.Error()), nil, ctErr
 	}
@@ -1239,28 +1191,26 @@ func (c *Core) handleRequest(ctx context.Context, req *logical.Request) (retResp
 			switch resp.Auth.TokenType {
 			case logical.TokenTypeBatch:
 			case logical.TokenTypeService:
-				if !c.perfStandby {
-					registeredTokenEntry := &logical.TokenEntry{
-						TTL:         auth.TTL,
-						Policies:    auth.TokenPolicies,
-						Path:        resp.Auth.CreationPath,
-						NamespaceID: ns.ID,
-					}
-					if err := c.expiration.RegisterAuth(ctx, registeredTokenEntry, resp.Auth, c.DetermineRoleFromLoginRequest(req.MountPoint, req.Data, ctx)); err != nil {
-						// Best-effort clean up on error, so we log the cleanup error as
-						// a warning but still return as internal error.
-						if err := c.tokenStore.revokeOrphan(ctx, resp.Auth.ClientToken); err != nil {
-							c.logger.Warn("failed to clean up token lease during auth/token/ request", "request_path", req.Path, "error", err)
-						}
-						c.logger.Error("failed to register token lease during auth/token/ request", "request_path", req.Path, "error", err)
-						retErr = multierror.Append(retErr, ErrInternalError)
-						return nil, auth, retErr
-					}
-					if registeredTokenEntry.ExternalID != "" {
-						resp.Auth.ClientToken = registeredTokenEntry.ExternalID
+				registeredTokenEntry := &logical.TokenEntry{
+					TTL:         auth.TTL,
+					Policies:    auth.TokenPolicies,
+					Path:        resp.Auth.CreationPath,
+					NamespaceID: ns.ID,
+				}
+				if err := c.expiration.RegisterAuth(ctx, registeredTokenEntry, resp.Auth, c.DetermineRoleFromLoginRequest(req.MountPoint, req.Data, ctx)); err != nil {
+					// Best-effort clean up on error, so we log the cleanup error as
+					// a warning but still return as internal error.
+					if err := c.tokenStore.revokeOrphan(ctx, resp.Auth.ClientToken); err != nil {
+						c.logger.Warn("failed to clean up token lease during auth/token/ request", "request_path", req.Path, "error", err)
 					}
-					leaseGenerated = true
+					c.logger.Error("failed to register token lease during auth/token/ request", "request_path", req.Path, "error", err)
+					retErr = multierror.Append(retErr, ErrInternalError)
+					return nil, auth, retErr
+				}
+				if registeredTokenEntry.ExternalID != "" {
+					resp.Auth.ClientToken = registeredTokenEntry.ExternalID
 				}
+				leaseGenerated = true
 			}
 		}
 
@@ -1301,11 +1251,6 @@ func (c *Core) handleLoginRequest(ctx context.Context, req *logical.Request) (re
 	if entry != nil {
 		// Set here so the audit log has it even if authorization fails
 		req.MountType = entry.Type
-		req.SetMountRunningSha256(entry.RunningSha256)
-		req.SetMountRunningVersion(entry.RunningVersion)
-		req.SetMountIsExternalPlugin(entry.IsExternalPlugin())
-		req.SetMountClass(entry.MountClass())
-
 		// Get and set ignored HMAC'd value.
 		if rawVals, ok := entry.synthesizedConfigCache.Load("audit_non_hmac_request_keys"); ok {
 			nonHMACReqDataKeys = rawVals.([]string)
@@ -1315,7 +1260,7 @@ func (c *Core) handleLoginRequest(ctx context.Context, req *logical.Request) (re
 	// Do an unauth check. This will cause EGP policies to be checked
 	var auth *logical.Auth
 	var ctErr error
-	auth, _, ctErr = c.CheckToken(ctx, req, true)
+	auth, _, ctErr = c.checkToken(ctx, req, true)
 	if ctErr == logical.ErrPerfStandbyPleaseForward {
 		return nil, nil, ctErr
 	}
@@ -1380,37 +1325,8 @@ func (c *Core) handleLoginRequest(ctx context.Context, req *logical.Request) (re
 		return nil, nil, ErrInternalError
 	}
 
-	// check if user lockout feature is disabled
-	isUserLockoutDisabled, err := c.isUserLockoutDisabled(entry)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// if user lockout feature is not disabled, check if the user is locked
-	if !isUserLockoutDisabled {
-		isloginUserLocked, err := c.isUserLocked(ctx, entry, req)
-		if err != nil {
-			return nil, nil, err
-		}
-		if isloginUserLocked {
-			return nil, nil, logical.ErrPermissionDenied
-		}
-	}
-
 	// Route the request
 	resp, routeErr := c.doRouting(ctx, req)
-
-	// if routeErr has invalid credentials error, update the userFailedLoginMap
-	if routeErr != nil && routeErr == logical.ErrInvalidCredentials {
-		if !isUserLockoutDisabled {
-			err := c.failedUserLoginProcess(ctx, entry, req)
-			if err != nil {
-				return nil, nil, err
-			}
-		}
-		return nil, nil, resp.Error()
-	}
-
 	if resp != nil {
 		// If wrapping is used, use the shortest between the request and response
 		var wrapTTL time.Duration
@@ -1680,27 +1596,6 @@ func (c *Core) handleLoginRequest(ctx context.Context, req *logical.Request) (re
 		resp = respTokenCreate
 	}
 
-	// Successful login, remove any entry from userFailedLoginInfo map
-	// if it exists. This is done for batch tokens (for oss & ent)
-	// For service tokens on oss it is taken care by core RegisterAuth function.
-	// For service tokens on ent it is taken care by registerAuth RPC calls.
-	// This update is done as part of registerAuth of RPC calls from standby
-	// to active node. This is added there to reduce RPC calls
-	if !isUserLockoutDisabled && (auth.TokenType == logical.TokenTypeBatch) {
-		loginUserInfoKey := FailedLoginUser{
-			aliasName:     auth.Alias.Name,
-			mountAccessor: auth.Alias.MountAccessor,
-		}
-
-		// We don't need to try to delete the lockedUsers storage entry, since we're
-		// processing a login request. If a login attempt is allowed, it means the user is
-		// unlocked and we only add storage entry when the user gets locked.
-		err = updateUserFailedLoginInfo(ctx, c, loginUserInfoKey, nil, true)
-		if err != nil {
-			return nil, nil, err
-		}
-	}
-
 	// if we were already going to return some error from this login, do that.
 	// if not, we will then check if the API is locked for the requesting
 	// namespace, to avoid leaking locked namespaces to unauthenticated clients.
@@ -1822,244 +1717,6 @@ func (c *Core) LoginCreateToken(ctx context.Context, ns *namespace.Namespace, re
 	return leaseGenerated, resp, nil
 }
 
-// failedUserLoginProcess updates the userFailedLoginMap with login count and  last failed
-// login time for users with failed login attempt
-// If the user gets locked for current login attempt, it updates the storage entry too
-func (c *Core) failedUserLoginProcess(ctx context.Context, mountEntry *MountEntry, req *logical.Request) error {
-	// get the user lockout configuration for the user
-	userLockoutConfiguration := c.getUserLockoutConfiguration(mountEntry)
-
-	// determine the key for userFailedLoginInfo map
-	loginUserInfoKey, err := c.getLoginUserInfoKey(ctx, mountEntry, req)
-	if err != nil {
-		return err
-	}
-
-	// get entry from userFailedLoginInfo map for the key
-	userFailedLoginInfo, err := getUserFailedLoginInfo(ctx, c, loginUserInfoKey)
-	if err != nil {
-		return err
-	}
-
-	// update the last failed login time with current time
-	failedLoginInfo := FailedLoginInfo{
-		lastFailedLoginTime: int(time.Now().Unix()),
-	}
-
-	// set the failed login count value for the entry in userFailedLoginInfo map
-	switch userFailedLoginInfo {
-	case nil: // entry does not exist in userfailedLoginMap
-		failedLoginInfo.count = 1
-	default:
-		failedLoginInfo.count = userFailedLoginInfo.count + 1
-
-		// if counter reset, set the count value to 1 as this gets counted as new entry
-		lastFailedLoginTime := time.Unix(int64(userFailedLoginInfo.lastFailedLoginTime), 0)
-		counterResetDuration := userLockoutConfiguration.LockoutCounterReset
-		if time.Now().After(lastFailedLoginTime.Add(counterResetDuration)) {
-			failedLoginInfo.count = 1
-		}
-	}
-
-	// update the userFailedLoginInfo map (and/or storage) with the updated/new entry
-	err = updateUserFailedLoginInfo(ctx, c, loginUserInfoKey, &failedLoginInfo, false)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// getLoginUserInfoKey gets failedUserLoginInfo map key for login user
-func (c *Core) getLoginUserInfoKey(ctx context.Context, mountEntry *MountEntry, req *logical.Request) (FailedLoginUser, error) {
-	userInfo := FailedLoginUser{}
-	aliasName, err := c.aliasNameFromLoginRequest(ctx, req)
-	if err != nil {
-		return userInfo, err
-	}
-	if aliasName == "" {
-		return userInfo, errors.New("failed to determine alias name from login request")
-	}
-
-	userInfo.aliasName = aliasName
-	userInfo.mountAccessor = mountEntry.Accessor
-	return userInfo, nil
-}
-
-// isUserLockoutDisabled checks if user lockout feature to prevent brute forcing is disabled
-// Auth types userpass, ldap and approle support this feature
-// precedence: environment var setting >> auth tune setting >> config file setting >> default (enabled)
-func (c *Core) isUserLockoutDisabled(mountEntry *MountEntry) (bool, error) {
-	if !strutil.StrListContains(configutil.GetSupportedUserLockoutsAuthMethods(), mountEntry.Type) {
-		return true, nil
-	}
-
-	// check environment variable
-	if disableUserLockoutEnv := os.Getenv(consts.VaultDisableUserLockout); disableUserLockoutEnv != "" {
-		var err error
-		disableUserLockout, err := strconv.ParseBool(disableUserLockoutEnv)
-		if err != nil {
-			return false, errors.New("Error parsing the environment variable VAULT_DISABLE_USER_LOCKOUT")
-		}
-		if disableUserLockout {
-			return true, nil
-		}
-		return false, nil
-	}
-
-	// read auth tune for mount entry
-	userLockoutConfigFromMount := mountEntry.Config.UserLockoutConfig
-	if userLockoutConfigFromMount != nil && userLockoutConfigFromMount.DisableLockout {
-		return true, nil
-	}
-
-	// read config for auth type from config file
-	userLockoutConfiguration := c.getUserLockoutFromConfig(mountEntry.Type)
-	if userLockoutConfiguration.DisableLockout {
-		return true, nil
-	}
-
-	// default
-	return false, nil
-}
-
-// isUserLocked determines if the login user is locked
-func (c *Core) isUserLocked(ctx context.Context, mountEntry *MountEntry, req *logical.Request) (locked bool, err error) {
-	// get userFailedLoginInfo map key for login user
-	loginUserInfoKey, err := c.getLoginUserInfoKey(ctx, mountEntry, req)
-	if err != nil {
-		return false, err
-	}
-
-	// get entry from userFailedLoginInfo map for the key
-	userFailedLoginInfo, err := getUserFailedLoginInfo(ctx, c, loginUserInfoKey)
-	if err != nil {
-		return false, err
-	}
-	userLockoutConfiguration := c.getUserLockoutConfiguration(mountEntry)
-
-	switch userFailedLoginInfo {
-	case nil:
-		// entry not found in userFailedLoginInfo map, check storage to re-verify
-		ns, err := namespace.FromContext(ctx)
-		if err != nil {
-			return false, fmt.Errorf("could not parse namespace from http context: %w", err)
-		}
-		storageUserLockoutPath := fmt.Sprintf(coreLockedUsersPath+"%s/%s/%s", ns.ID, loginUserInfoKey.mountAccessor, loginUserInfoKey.aliasName)
-		existingEntry, err := c.barrier.Get(ctx, storageUserLockoutPath)
-		if err != nil {
-			return false, err
-		}
-		var lastLoginTime int
-		if existingEntry == nil {
-			// no storage entry found, user is not locked
-			return false, nil
-		}
-
-		err = jsonutil.DecodeJSON(existingEntry.Value, &lastLoginTime)
-		if err != nil {
-			return false, err
-		}
-
-		// if time passed from last login time is within lockout duration, the user is locked
-		if time.Now().Unix()-int64(lastLoginTime) < int64(userLockoutConfiguration.LockoutDuration.Seconds()) {
-			// user locked
-			return true, nil
-		}
-
-		// else user is not locked. Entry is stale, this will be removed from storage during cleanup
-		// by the background thread
-
-	default:
-		// entry found in userFailedLoginInfo map, check if the user is locked
-		isCountOverLockoutThreshold := userFailedLoginInfo.count >= uint(userLockoutConfiguration.LockoutThreshold)
-		isWithinLockoutDuration := time.Now().Unix()-int64(userFailedLoginInfo.lastFailedLoginTime) < int64(userLockoutConfiguration.LockoutDuration.Seconds())
-
-		if isCountOverLockoutThreshold && isWithinLockoutDuration {
-			// user locked
-			return true, nil
-		}
-	}
-	return false, nil
-}
-
-// getUserLockoutConfiguration gets the user lockout configuration for a mount entry
-// it checks the config file and auth tune values
-// precedence: auth tune >> config file values for auth type >> config file values for all type
-// >> default user lockout values
-// getUserLockoutFromConfig call in this function takes care of config file precedence
-func (c *Core) getUserLockoutConfiguration(mountEntry *MountEntry) (userLockoutConfig UserLockoutConfig) {
-	// get user configuration values from config file
-	userLockoutConfig = c.getUserLockoutFromConfig(mountEntry.Type)
-
-	authTuneUserLockoutConfig := mountEntry.Config.UserLockoutConfig
-	// if user lockout is not configured using auth tune, return values from config file
-	if authTuneUserLockoutConfig == nil {
-		return userLockoutConfig
-	}
-	// replace values in return with config file configuration
-	// for fields that are not configured using auth tune
-	if authTuneUserLockoutConfig.LockoutThreshold != 0 {
-		userLockoutConfig.LockoutThreshold = authTuneUserLockoutConfig.LockoutThreshold
-	}
-	if authTuneUserLockoutConfig.LockoutDuration != 0 {
-		userLockoutConfig.LockoutDuration = authTuneUserLockoutConfig.LockoutDuration
-	}
-	if authTuneUserLockoutConfig.LockoutCounterReset != 0 {
-		userLockoutConfig.LockoutCounterReset = authTuneUserLockoutConfig.LockoutCounterReset
-	}
-	if authTuneUserLockoutConfig.DisableLockout {
-		userLockoutConfig.DisableLockout = authTuneUserLockoutConfig.DisableLockout
-	}
-	return userLockoutConfig
-}
-
-// getUserLockoutFromConfig gets the userlockout configuration for given mount type from config file
-// it reads the user lockout configuration from server config
-// it has values for "all" type and any mountType that is configured using config file
-// "all" type values are updated in shared config with default values i.e; if "all" type is
-// not configured in config file, it is updated in shared config with default configuration
-// If "all" type is configured in config file, any missing fields are updated with default values
-// similarly missing values for a given mount type in config file are updated with "all" type
-// default values
-// If user_lockout configuration is not configured using config file at all, defaults are returned
-func (c *Core) getUserLockoutFromConfig(mountType string) UserLockoutConfig {
-	defaultUserLockoutConfig := UserLockoutConfig{
-		LockoutThreshold:    configutil.UserLockoutThresholdDefault,
-		LockoutDuration:     configutil.UserLockoutDurationDefault,
-		LockoutCounterReset: configutil.UserLockoutCounterResetDefault,
-		DisableLockout:      configutil.DisableUserLockoutDefault,
-	}
-	conf := c.rawConfig.Load()
-	if conf == nil {
-		return defaultUserLockoutConfig
-	}
-	userlockouts := conf.(*server.Config).UserLockouts
-	if userlockouts == nil {
-		return defaultUserLockoutConfig
-	}
-	for _, userLockoutConfig := range userlockouts {
-		switch userLockoutConfig.Type {
-		case "all":
-			defaultUserLockoutConfig = UserLockoutConfig{
-				LockoutThreshold:    userLockoutConfig.LockoutThreshold,
-				LockoutDuration:     userLockoutConfig.LockoutDuration,
-				LockoutCounterReset: userLockoutConfig.LockoutCounterReset,
-				DisableLockout:      userLockoutConfig.DisableLockout,
-			}
-		case mountType:
-			return UserLockoutConfig{
-				LockoutThreshold:    userLockoutConfig.LockoutThreshold,
-				LockoutDuration:     userLockoutConfig.LockoutDuration,
-				LockoutCounterReset: userLockoutConfig.LockoutCounterReset,
-				DisableLockout:      userLockoutConfig.DisableLockout,
-			}
-
-		}
-	}
-	return defaultUserLockoutConfig
-}
-
 func (c *Core) buildMfaEnforcementResponse(eConfig *mfa.MFAEnforcementConfig) (*logical.MFAConstraintAny, error) {
 	mfaAny := &logical.MFAConstraintAny{
 		Any: []*logical.MFAMethodID{},
@@ -2081,7 +1738,6 @@ func (c *Core) buildMfaEnforcementResponse(eConfig *mfa.MFAEnforcementConfig) (*
 			Type:         mConfig.Type,
 			ID:           methodID,
 			UsesPasscode: mConfig.Type == mfaMethodTypeTOTP || duoUsePasscode,
-			Name:         mConfig.Name,
 		}
 		mfaAny.Any = append(mfaAny.Any, mfaMethod)
 	}
@@ -2154,84 +1810,8 @@ func (c *Core) RegisterAuth(ctx context.Context, tokenTTL time.Duration, path st
 		if te.ExternalID != "" {
 			auth.ClientToken = te.ExternalID
 		}
-		// Successful login, remove any entry from userFailedLoginInfo map
-		// if it exists. This is done for service tokens (for oss) here.
-		// For ent it is taken care by registerAuth RPC calls.
-		if auth.Alias != nil {
-			loginUserInfoKey := FailedLoginUser{
-				aliasName:     auth.Alias.Name,
-				mountAccessor: auth.Alias.MountAccessor,
-			}
-
-			// We don't need to try to delete the lockedUsers storage entry, since we're
-			// processing a login request. If a login attempt is allowed, it means the user is
-			// unlocked and we only add storage entry when the user gets locked.
-			err = updateUserFailedLoginInfo(ctx, c, loginUserInfoKey, nil, true)
-			if err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-// LocalGetUserFailedLoginInfo gets the failed login information for a user based on alias name and mountAccessor
-func (c *Core) LocalGetUserFailedLoginInfo(ctx context.Context, userKey FailedLoginUser) *FailedLoginInfo {
-	c.userFailedLoginInfoLock.Lock()
-	value, exists := c.userFailedLoginInfo[userKey]
-	c.userFailedLoginInfoLock.Unlock()
-	if exists {
-		return value
 	}
-	return nil
-}
-
-// LocalUpdateUserFailedLoginInfo updates the failed login information for a user based on alias name and mountAccessor
-func (c *Core) LocalUpdateUserFailedLoginInfo(ctx context.Context, userKey FailedLoginUser, failedLoginInfo *FailedLoginInfo, deleteEntry bool) error {
-	c.userFailedLoginInfoLock.Lock()
-	switch deleteEntry {
-	case false:
-		// update entry in the map
-		c.userFailedLoginInfo[userKey] = failedLoginInfo
-
-		// get the user lockout configuration for the user
-		mountEntry := c.router.MatchingMountByAccessor(userKey.mountAccessor)
-		if mountEntry == nil {
-			mountEntry = &MountEntry{}
-			mountEntry.NamespaceID = namespace.RootNamespaceID
-		}
-		userLockoutConfiguration := c.getUserLockoutConfiguration(mountEntry)
-
-		// if failed login count has reached threshold, create a storage entry as the user got locked
-		if failedLoginInfo.count >= uint(userLockoutConfiguration.LockoutThreshold) {
-			// user locked
-			storageUserLockoutPath := fmt.Sprintf(coreLockedUsersPath+"%s/%s/%s", mountEntry.NamespaceID, userKey.mountAccessor, userKey.aliasName)
-
-			compressedBytes, err := jsonutil.EncodeJSONAndCompress(failedLoginInfo.lastFailedLoginTime, nil)
-			if err != nil {
-				c.logger.Error("failed to encode or compress failed login user entry", "error", err)
-				return err
-			}
 
-			// Create an entry
-			entry := &logical.StorageEntry{
-				Key:   storageUserLockoutPath,
-				Value: compressedBytes,
-			}
-
-			// Write to the physical backend
-			if err := c.barrier.Put(ctx, entry); err != nil {
-				c.logger.Error("failed to persist failed login user entry", "error", err)
-				return err
-			}
-
-		}
-
-	default:
-		// delete the entry from the map, if no key exists it is no-op
-		delete(c.userFailedLoginInfo, userKey)
-	}
-	c.userFailedLoginInfoLock.Unlock()
 	return nil
 }
 
@@ -2343,7 +1923,7 @@ func (c *Core) DecodeSSCToken(token string) (string, error) {
 	if !IsSSCToken(token) {
 		return token, nil
 	}
-	tok, err := DecodeSSCTokenInternal(token)
+	tok, err := c.DecodeSSCTokenInternal(token)
 	if err != nil {
 		return "", err
 	}
@@ -2352,7 +1932,7 @@ func (c *Core) DecodeSSCToken(token string) (string, error) {
 
 // DecodeSSCTokenInternal is a helper used to get the inner part of a SSC token without
 // checking the token signature or the WAL index.
-func DecodeSSCTokenInternal(token string) (*tokens.Token, error) {
+func (c *Core) DecodeSSCTokenInternal(token string) (*tokens.Token, error) {
 	signedToken := &tokens.SignedToken{}
 
 	// Skip batch and old style service tokens. These can have the prefix "b.",
@@ -2430,7 +2010,7 @@ func (c *Core) checkSSCTokenInternal(ctx context.Context, token string, isPerfSt
 		return plainToken.Random, nil
 	}
 
-	requiredWalState := &logical.WALState{ClusterID: c.ClusterID(), LocalIndex: plainToken.LocalIndex, ReplicatedIndex: 0}
+	requiredWalState := &logical.WALState{ClusterID: c.clusterID.Load(), LocalIndex: plainToken.LocalIndex, ReplicatedIndex: 0}
 	if c.HasWALState(requiredWalState, isPerfStandby) {
 		return plainToken.Random, nil
 	}
diff --git a/vault/request_handling_test.go b/vault/request_handling_test.go
index 635cf54517a00..cfdea525f7320 100644
--- a/vault/request_handling_test.go
+++ b/vault/request_handling_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/request_handling_util.go b/vault/request_handling_util.go
index c7dfe71803838..de1437e89f7fe 100644
--- a/vault/request_handling_util.go
+++ b/vault/request_handling_util.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !enterprise
 
 package vault
@@ -8,7 +5,6 @@ package vault
 import (
 	"context"
 	"sync"
-	"time"
 
 	"github.com/hashicorp/vault/helper/identity"
 	"github.com/hashicorp/vault/sdk/logical"
@@ -54,14 +50,6 @@ func getAuthRegisterFunc(c *Core) (RegisterAuthFunc, error) {
 	return c.RegisterAuth, nil
 }
 
-func getUserFailedLoginInfo(ctx context.Context, c *Core, userInfo FailedLoginUser) (*FailedLoginInfo, error) {
-	return c.LocalGetUserFailedLoginInfo(ctx, userInfo), nil
-}
-
-func updateUserFailedLoginInfo(ctx context.Context, c *Core, userInfo FailedLoginUser, failedLoginInfo *FailedLoginInfo, deleteEntry bool) error {
-	return c.LocalUpdateUserFailedLoginInfo(ctx, userInfo, failedLoginInfo, deleteEntry)
-}
-
 func possiblyForwardAliasCreation(ctx context.Context, c *Core, inErr error, auth *logical.Auth, entity *identity.Entity) (*identity.Entity, bool, error) {
 	return entity, false, inErr
 }
@@ -84,7 +72,3 @@ func possiblyForwardSaveCachedAuthResponse(ctx context.Context, c *Core, respAut
 
 	return nil
 }
-
-func forwardCreateTokenRegisterAuth(ctx context.Context, c *Core, te *logical.TokenEntry, roleName string, renewable bool, periodToUse, explicitMaxTTLToUse time.Duration) (*logical.TokenEntry, error) {
-	return nil, nil
-}
diff --git a/vault/rollback.go b/vault/rollback.go
index 61a2686f43905..a483af9c2c458 100644
--- a/vault/rollback.go
+++ b/vault/rollback.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -43,13 +40,11 @@ type RollbackManager struct {
 	inflight     map[string]*rollbackState
 	inflightLock sync.RWMutex
 
-	doneCh          chan struct{}
-	shutdown        bool
-	shutdownCh      chan struct{}
-	shutdownLock    sync.Mutex
-	stopTicker      chan struct{}
-	tickerIsStopped bool
-	quitContext     context.Context
+	doneCh       chan struct{}
+	shutdown     bool
+	shutdownCh   chan struct{}
+	shutdownLock sync.Mutex
+	quitContext  context.Context
 
 	core *Core
 }
@@ -72,7 +67,6 @@ func NewRollbackManager(ctx context.Context, logger log.Logger, backendsFunc fun
 		inflight:    make(map[string]*rollbackState),
 		doneCh:      make(chan struct{}),
 		shutdownCh:  make(chan struct{}),
-		stopTicker:  make(chan struct{}),
 		quitContext: ctx,
 		core:        core,
 	}
@@ -97,24 +91,10 @@ func (m *RollbackManager) Stop() {
 	m.inflightAll.Wait()
 }
 
-// StopTicker stops the automatic Rollback manager's ticker, causing us
-// to not do automatic rollbacks. This is useful for testing plugin's
-// periodic function's behavior, without trying to race against the
-// rollback manager proper.
-//
-// THIS SHOULD ONLY BE CALLED FROM TEST HELPERS.
-func (m *RollbackManager) StopTicker() {
-	if !m.tickerIsStopped {
-		close(m.stopTicker)
-		m.tickerIsStopped = true
-	}
-}
-
 // run is a long running routine to periodically invoke rollback
 func (m *RollbackManager) run() {
 	m.logger.Info("starting rollback manager")
 	tick := time.NewTicker(m.period)
-	logTestStopOnce := false
 	defer tick.Stop()
 	defer close(m.doneCh)
 	for {
@@ -125,13 +105,6 @@ func (m *RollbackManager) run() {
 		case <-m.shutdownCh:
 			m.logger.Info("stopping rollback manager")
 			return
-
-		case <-m.stopTicker:
-			if !logTestStopOnce {
-				m.logger.Info("stopping rollback manager ticker for tests")
-				logTestStopOnce = true
-			}
-			tick.Stop()
 		}
 	}
 }
@@ -229,9 +202,7 @@ func (m *RollbackManager) attemptRollback(ctx context.Context, fullPath string,
 		}()
 
 		// Grab the statelock or stop
-		l := newLockGrabber(m.core.stateLock.RLock, m.core.stateLock.RUnlock, stopCh)
-		go l.grab()
-		if stopped := l.lockOrStop(); stopped {
+		if stopped := grabLockOrStop(m.core.stateLock.RLock, m.core.stateLock.RUnlock, stopCh); stopped {
 			// If we stopped due to shutdown, return. Otherwise another thread
 			// is holding the lock for us, continue on.
 			select {
diff --git a/vault/rollback_test.go b/vault/rollback_test.go
index 8eb457c12e977..681101217a30e 100644
--- a/vault/rollback_test.go
+++ b/vault/rollback_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/router.go b/vault/router.go
index 3497e8244a603..96da9c5a17479 100644
--- a/vault/router.go
+++ b/vault/router.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -97,43 +94,6 @@ func (r *Router) reset() {
 	r.mountAccessorCache = radix.New()
 }
 
-func (r *Router) GetRecords(tag string) ([]map[string]interface{}, error) {
-	r.l.RLock()
-	defer r.l.RUnlock()
-	var data []map[string]interface{}
-	var tree *radix.Tree
-	switch tag {
-	case "root":
-		tree = r.root
-	case "uuid":
-		tree = r.mountUUIDCache
-	case "accessor":
-		tree = r.mountAccessorCache
-	case "storage":
-		tree = r.storagePrefix
-	default:
-		return nil, logical.ErrUnsupportedPath
-	}
-	for _, v := range tree.ToMap() {
-		info := v.(Deserializable).Deserialize()
-		data = append(data, info)
-	}
-	return data, nil
-}
-
-func (entry *routeEntry) Deserialize() map[string]interface{} {
-	entry.l.RLock()
-	defer entry.l.RUnlock()
-	ret := map[string]interface{}{
-		"tainted":        entry.tainted,
-		"storage_prefix": entry.storagePrefix,
-	}
-	for k, v := range entry.mountEntry.Deserialize() {
-		ret[k] = v
-	}
-	return ret
-}
-
 // ValidateMountByAccessor returns the mount type and ID for a given mount
 // accessor
 func (r *Router) ValidateMountByAccessor(accessor string) *ValidateMountResponse {
@@ -465,12 +425,7 @@ func (r *Router) MatchingBackend(ctx context.Context, path string) logical.Backe
 	if !ok {
 		return nil
 	}
-
-	re := raw.(*routeEntry)
-	re.l.RLock()
-	defer re.l.RUnlock()
-
-	return re.backend
+	return raw.(*routeEntry).backend
 }
 
 // MatchingSystemView returns the SystemView used for a path
@@ -618,11 +573,6 @@ func (r *Router) routeCommon(ctx context.Context, req *logical.Request, existenc
 	req.Path = strings.TrimPrefix(ns.Path+req.Path, mount)
 	req.MountPoint = mount
 	req.MountType = re.mountEntry.Type
-	req.SetMountRunningSha256(re.mountEntry.RunningSha256)
-	req.SetMountRunningVersion(re.mountEntry.RunningVersion)
-	req.SetMountIsExternalPlugin(re.mountEntry.IsExternalPlugin())
-	req.SetMountClass(re.mountEntry.MountClass())
-
 	if req.Path == "/" {
 		req.Path = ""
 	}
@@ -738,11 +688,6 @@ func (r *Router) routeCommon(ctx context.Context, req *logical.Request, existenc
 		req.Path = originalPath
 		req.MountPoint = mount
 		req.MountType = re.mountEntry.Type
-		req.SetMountRunningSha256(re.mountEntry.RunningSha256)
-		req.SetMountRunningVersion(re.mountEntry.RunningVersion)
-		req.SetMountIsExternalPlugin(re.mountEntry.IsExternalPlugin())
-		req.SetMountClass(re.mountEntry.MountClass())
-
 		req.Connection = originalConn
 		req.ID = originalReqID
 		req.Storage = nil
diff --git a/vault/router_access.go b/vault/router_access.go
index 357e702453219..90335d7abc186 100644
--- a/vault/router_access.go
+++ b/vault/router_access.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import "context"
diff --git a/vault/router_test.go b/vault/router_test.go
index bcfedfcc1da2d..2a2340a51c14e 100644
--- a/vault/router_test.go
+++ b/vault/router_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/router_testing.go b/vault/router_testing.go
index 78f84a6e652c0..db1ff4b159d55 100644
--- a/vault/router_testing.go
+++ b/vault/router_testing.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/seal.go b/vault/seal.go
index 964e94ca8d537..1fdfcacef68f9 100644
--- a/vault/seal.go
+++ b/vault/seal.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -12,15 +9,14 @@ import (
 	"fmt"
 	"sync/atomic"
 
-	aeadwrapper "github.com/hashicorp/go-kms-wrapping/wrappers/aead/v2"
-
 	"github.com/hashicorp/vault/sdk/helper/jsonutil"
 	"github.com/hashicorp/vault/sdk/physical"
 
-	"github.com/ProtonMail/go-crypto/openpgp"
-	"github.com/ProtonMail/go-crypto/openpgp/packet"
+	"github.com/golang/protobuf/proto"
 	wrapping "github.com/hashicorp/go-kms-wrapping/v2"
 	"github.com/hashicorp/vault/vault/seal"
+	"github.com/keybase/go-crypto/openpgp"
+	"github.com/keybase/go-crypto/openpgp/packet"
 )
 
 const (
@@ -59,35 +55,32 @@ type Seal interface {
 	SetCore(*Core)
 	Init(context.Context) error
 	Finalize(context.Context) error
-	StoredKeysSupported() seal.StoredKeysSupport // SealAccess
+	StoredKeysSupported() seal.StoredKeysSupport
 	SealWrapable() bool
 	SetStoredKeys(context.Context, [][]byte) error
 	GetStoredKeys(context.Context) ([][]byte, error)
-	BarrierType() wrapping.WrapperType                  // SealAccess
-	BarrierConfig(context.Context) (*SealConfig, error) // SealAccess
+	BarrierType() wrapping.WrapperType
+	BarrierConfig(context.Context) (*SealConfig, error)
 	SetBarrierConfig(context.Context, *SealConfig) error
 	SetCachedBarrierConfig(*SealConfig)
-	RecoveryKeySupported() bool // SealAccess
+	RecoveryKeySupported() bool
 	RecoveryType() string
-	RecoveryConfig(context.Context) (*SealConfig, error) // SealAccess
+	RecoveryConfig(context.Context) (*SealConfig, error)
 	RecoveryKey(context.Context) ([]byte, error)
 	SetRecoveryConfig(context.Context, *SealConfig) error
 	SetCachedRecoveryConfig(*SealConfig)
 	SetRecoveryKey(context.Context, []byte) error
-	VerifyRecoveryKey(context.Context, []byte) error // SealAccess
-	GetAccess() seal.Access                          // SealAccess
-	GetShamirWrapper() (*aeadwrapper.ShamirWrapper, error)
+	VerifyRecoveryKey(context.Context, []byte) error
+	GetAccess() *seal.Access
 }
 
 type defaultSeal struct {
-	access seal.Access
+	access *seal.Access
 	config atomic.Value
 	core   *Core
 }
 
-var _ Seal = (*defaultSeal)(nil)
-
-func NewDefaultSeal(lowLevel seal.Access) Seal {
+func NewDefaultSeal(lowLevel *seal.Access) Seal {
 	ret := &defaultSeal{
 		access: lowLevel,
 	}
@@ -106,11 +99,11 @@ func (d *defaultSeal) checkCore() error {
 	return nil
 }
 
-func (d *defaultSeal) GetAccess() seal.Access {
+func (d *defaultSeal) GetAccess() *seal.Access {
 	return d.access
 }
 
-func (d *defaultSeal) SetAccess(access seal.Access) {
+func (d *defaultSeal) SetAccess(access *seal.Access) {
 	d.access = access
 }
 
@@ -291,16 +284,6 @@ func (d *defaultSeal) SetRecoveryKey(ctx context.Context, key []byte) error {
 	return fmt.Errorf("recovery not supported")
 }
 
-func (d *defaultSeal) GetShamirWrapper() (*aeadwrapper.ShamirWrapper, error) {
-	// defaultSeal is meant to be for Shamir seals, so it should always have a ShamirWrapper.
-	// Nonetheless, NewDefaultSeal does not check, so let's play it safe.
-	w, ok := d.GetAccess().GetWrapper().(*aeadwrapper.ShamirWrapper)
-	if !ok {
-		return nil, fmt.Errorf("expected defaultSeal to have a ShamirWrapper, but found a %T instead", d.GetAccess().GetWrapper())
-	}
-	return w, nil
-}
-
 // SealConfig is used to describe the seal configuration
 type SealConfig struct {
 	// The type, for sanity checking
@@ -445,7 +428,7 @@ func (e *ErrDecrypt) Is(target error) bool {
 	return ok || errors.Is(e.Err, target)
 }
 
-func writeStoredKeys(ctx context.Context, storage physical.Backend, encryptor seal.Access, keys [][]byte) error {
+func writeStoredKeys(ctx context.Context, storage physical.Backend, encryptor *seal.Access, keys [][]byte) error {
 	if keys == nil {
 		return fmt.Errorf("keys were nil")
 	}
@@ -453,13 +436,28 @@ func writeStoredKeys(ctx context.Context, storage physical.Backend, encryptor se
 		return fmt.Errorf("no keys provided")
 	}
 
+	buf, err := json.Marshal(keys)
+	if err != nil {
+		return fmt.Errorf("failed to encode keys for storage: %w", err)
+	}
+
 	// Encrypt and marshal the keys
-	pe, err := SealWrapStoredBarrierKeys(ctx, encryptor, keys)
+	blobInfo, err := encryptor.Encrypt(ctx, buf, nil)
+	if err != nil {
+		return &ErrEncrypt{Err: fmt.Errorf("failed to encrypt keys for storage: %w", err)}
+	}
+
+	value, err := proto.Marshal(blobInfo)
 	if err != nil {
 		return fmt.Errorf("failed to marshal value for storage: %w", err)
 	}
 
 	// Store the seal configuration.
+	pe := &physical.Entry{
+		Key:   StoredBarrierKeysPath,
+		Value: value,
+	}
+
 	if err := storage.Put(ctx, pe); err != nil {
 		return fmt.Errorf("failed to write keys to storage: %w", err)
 	}
@@ -467,7 +465,7 @@ func writeStoredKeys(ctx context.Context, storage physical.Backend, encryptor se
 	return nil
 }
 
-func readStoredKeys(ctx context.Context, storage physical.Backend, encryptor seal.Access) ([][]byte, error) {
+func readStoredKeys(ctx context.Context, storage physical.Backend, encryptor *seal.Access) ([][]byte, error) {
 	pe, err := storage.Get(ctx, StoredBarrierKeysPath)
 	if err != nil {
 		return nil, fmt.Errorf("failed to fetch stored keys: %w", err)
@@ -479,5 +477,21 @@ func readStoredKeys(ctx context.Context, storage physical.Backend, encryptor sea
 		return nil, nil
 	}
 
-	return UnsealWrapStoredBarrierKeys(ctx, encryptor, pe)
+	blobInfo := &wrapping.BlobInfo{}
+	if err := proto.Unmarshal(pe.Value, blobInfo); err != nil {
+		return nil, fmt.Errorf("failed to proto decode stored keys: %w", err)
+	}
+
+	pt, err := encryptor.Decrypt(ctx, blobInfo, nil)
+	if err != nil {
+		return nil, &ErrDecrypt{Err: fmt.Errorf("failed to decrypt keys from storage: %w", err)}
+	}
+
+	// Decode the barrier entry
+	var keys [][]byte
+	if err := json.Unmarshal(pt, &keys); err != nil {
+		return nil, fmt.Errorf("failed to decode stored keys: %v", err)
+	}
+
+	return keys, nil
 }
diff --git a/vault/seal/envelope.go b/vault/seal/envelope.go
index 67d93adbf5d3f..b3165e9f74f96 100644
--- a/vault/seal/envelope.go
+++ b/vault/seal/envelope.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package seal
 
 import (
diff --git a/vault/seal/envelope_test.go b/vault/seal/envelope_test.go
index deadecbfaa02d..3600ff45177cb 100644
--- a/vault/seal/envelope_test.go
+++ b/vault/seal/envelope_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package seal
 
 import (
diff --git a/vault/seal/seal.go b/vault/seal/seal.go
index 4233951c2e1cb..913bc8227ed0c 100644
--- a/vault/seal/seal.go
+++ b/vault/seal/seal.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package seal
 
 import (
@@ -36,51 +33,32 @@ func (s StoredKeysSupport) String() string {
 
 // Access is the embedded implementation of autoSeal that contains logic
 // specific to encrypting and decrypting data, or in this case keys.
-type Access interface {
+type Access struct {
 	wrapping.Wrapper
-	wrapping.InitFinalizer
-
-	GetWrapper() wrapping.Wrapper
-}
-
-type access struct {
-	w wrapping.Wrapper
+	WrapperType wrapping.WrapperType
 }
 
-var _ Access = (*access)(nil)
-
-func NewAccess(w wrapping.Wrapper) Access {
-	return &access{
-		w: w,
+func (a *Access) Init(ctx context.Context) error {
+	if initWrapper, ok := a.Wrapper.(wrapping.InitFinalizer); ok {
+		return initWrapper.Init(ctx)
 	}
+	return nil
 }
 
-func (a *access) KeyId(ctx context.Context) (string, error) {
-	return a.w.KeyId(ctx)
-}
-
-func (a *access) SetConfig(ctx context.Context, options ...wrapping.Option) (*wrapping.WrapperConfig, error) {
-	return a.w.SetConfig(ctx, options...)
-}
-
-func (a *access) GetWrapper() wrapping.Wrapper {
-	return a.w
+func (a *Access) SetType(t wrapping.WrapperType) {
+	a.WrapperType = t
 }
 
-func (a *access) Init(ctx context.Context, options ...wrapping.Option) error {
-	if initWrapper, ok := a.w.(wrapping.InitFinalizer); ok {
-		return initWrapper.Init(ctx, options...)
+func (a *Access) Type(ctx context.Context) (wrapping.WrapperType, error) {
+	if a != nil && a.WrapperType != "" {
+		return a.WrapperType, nil
 	}
-	return nil
-}
-
-func (a *access) Type(ctx context.Context) (wrapping.WrapperType, error) {
-	return a.w.Type(ctx)
+	return a.Wrapper.Type(ctx)
 }
 
 // Encrypt uses the underlying seal to encrypt the plaintext and returns it.
-func (a *access) Encrypt(ctx context.Context, plaintext []byte, options ...wrapping.Option) (blob *wrapping.BlobInfo, err error) {
-	wTyp, err := a.w.Type(ctx)
+func (a *Access) Encrypt(ctx context.Context, plaintext, aad []byte) (blob *wrapping.BlobInfo, err error) {
+	wTyp, err := a.Wrapper.Type(ctx)
 	if err != nil {
 		return nil, err
 	}
@@ -98,14 +76,14 @@ func (a *access) Encrypt(ctx context.Context, plaintext []byte, options ...wrapp
 	metrics.IncrCounter([]string{"seal", "encrypt"}, 1)
 	metrics.IncrCounter([]string{"seal", wTyp.String(), "encrypt"}, 1)
 
-	return a.w.Encrypt(ctx, plaintext, options...)
+	return a.Wrapper.Encrypt(ctx, plaintext, wrapping.WithAad(aad))
 }
 
 // Decrypt uses the underlying seal to decrypt the cryptotext and returns it.
 // Note that it is possible depending on the wrapper used that both pt and err
 // are populated.
-func (a *access) Decrypt(ctx context.Context, data *wrapping.BlobInfo, options ...wrapping.Option) (pt []byte, err error) {
-	wTyp, err := a.w.Type(ctx)
+func (a *Access) Decrypt(ctx context.Context, data *wrapping.BlobInfo, aad []byte) (pt []byte, err error) {
+	wTyp, err := a.Wrapper.Type(ctx)
 	defer func(now time.Time) {
 		metrics.MeasureSince([]string{"seal", "decrypt", "time"}, now)
 		metrics.MeasureSince([]string{"seal", wTyp.String(), "decrypt", "time"}, now)
@@ -119,12 +97,12 @@ func (a *access) Decrypt(ctx context.Context, data *wrapping.BlobInfo, options .
 	metrics.IncrCounter([]string{"seal", "decrypt"}, 1)
 	metrics.IncrCounter([]string{"seal", wTyp.String(), "decrypt"}, 1)
 
-	return a.w.Decrypt(ctx, data, options...)
+	return a.Wrapper.Decrypt(ctx, data, wrapping.WithAad(aad))
 }
 
-func (a *access) Finalize(ctx context.Context, options ...wrapping.Option) error {
-	if finalizeWrapper, ok := a.w.(wrapping.InitFinalizer); ok {
-		return finalizeWrapper.Finalize(ctx, options...)
+func (a *Access) Finalize(ctx context.Context) error {
+	if finalizeWrapper, ok := a.Wrapper.(wrapping.InitFinalizer); ok {
+		return finalizeWrapper.Finalize(ctx)
 	}
 	return nil
 }
diff --git a/vault/seal/seal_testing.go b/vault/seal/seal_testing.go
index ebbe71b814afe..fc33e4d9a3bf3 100644
--- a/vault/seal/seal_testing.go
+++ b/vault/seal/seal_testing.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package seal
 
 import (
@@ -18,32 +15,33 @@ type TestSealOpts struct {
 	Name       wrapping.WrapperType
 }
 
-func NewTestSeal(opts *TestSealOpts) (Access, *ToggleableWrapper) {
+func NewTestSeal(opts *TestSealOpts) *Access {
 	if opts == nil {
 		opts = new(TestSealOpts)
 	}
 
-	w := &ToggleableWrapper{Wrapper: wrapping.NewTestWrapper(opts.Secret)}
-	if opts.Name != "" {
-		w.wrapperType = &opts.Name
+	return &Access{
+		Wrapper:     wrapping.NewTestWrapper(opts.Secret),
+		WrapperType: opts.Name,
 	}
-	return NewAccess(w), w
 }
 
-func NewToggleableTestSeal(opts *TestSealOpts) (Access, func(error)) {
+func NewToggleableTestSeal(opts *TestSealOpts) (*Access, func(error)) {
 	if opts == nil {
 		opts = new(TestSealOpts)
 	}
 
 	w := &ToggleableWrapper{Wrapper: wrapping.NewTestWrapper(opts.Secret)}
-	return NewAccess(w), w.SetError
+	return &Access{
+		Wrapper:     w,
+		WrapperType: opts.Name,
+	}, w.SetError
 }
 
 type ToggleableWrapper struct {
 	wrapping.Wrapper
-	wrapperType *wrapping.WrapperType
-	error       error
-	l           sync.RWMutex
+	error error
+	l     sync.RWMutex
 }
 
 func (t *ToggleableWrapper) Encrypt(ctx context.Context, bytes []byte, opts ...wrapping.Option) (*wrapping.BlobInfo, error) {
@@ -70,11 +68,4 @@ func (t *ToggleableWrapper) SetError(err error) {
 	t.error = err
 }
 
-func (t *ToggleableWrapper) Type(ctx context.Context) (wrapping.WrapperType, error) {
-	if t.wrapperType != nil {
-		return *t.wrapperType, nil
-	}
-	return t.Wrapper.Type(ctx)
-}
-
 var _ wrapping.Wrapper = &ToggleableWrapper{}
diff --git a/vault/seal_access.go b/vault/seal_access.go
index b278f773ff2be..cd7b8e41779b9 100644
--- a/vault/seal_access.go
+++ b/vault/seal_access.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -46,7 +43,6 @@ func (s *SealAccess) VerifyRecoveryKey(ctx context.Context, key []byte) error {
 	return s.seal.VerifyRecoveryKey(ctx, key)
 }
 
-// TODO(SEALHA): This looks like it belongs in Seal instead, it only has two callers
 func (s *SealAccess) ClearCaches(ctx context.Context) {
 	s.seal.SetBarrierConfig(ctx, nil)
 	if s.RecoveryKeySupported() {
@@ -54,6 +50,6 @@ func (s *SealAccess) ClearCaches(ctx context.Context) {
 	}
 }
 
-func (s *SealAccess) GetAccess() seal.Access {
+func (s *SealAccess) GetAccess() *seal.Access {
 	return s.seal.GetAccess()
 }
diff --git a/vault/seal_autoseal.go b/vault/seal_autoseal.go
index c913a90c0ff44..59afd3596bc8c 100644
--- a/vault/seal_autoseal.go
+++ b/vault/seal_autoseal.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -14,8 +11,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	aeadwrapper "github.com/hashicorp/go-kms-wrapping/wrappers/aead/v2"
-
+	proto "github.com/golang/protobuf/proto"
 	log "github.com/hashicorp/go-hclog"
 	wrapping "github.com/hashicorp/go-kms-wrapping/v2"
 	"github.com/hashicorp/vault/sdk/physical"
@@ -37,9 +33,8 @@ var (
 // decrypting stored keys via an underlying AutoSealAccess implementation, as
 // well as logic related to recovery keys and barrier config.
 type autoSeal struct {
-	seal.Access
+	*seal.Access
 
-	barrierType    wrapping.WrapperType
 	barrierConfig  atomic.Value
 	recoveryConfig atomic.Value
 	core           *Core
@@ -52,21 +47,18 @@ type autoSeal struct {
 // Ensure we are implementing the Seal interface
 var _ Seal = (*autoSeal)(nil)
 
-func NewAutoSeal(lowLevel seal.Access) (*autoSeal, error) {
+func NewAutoSeal(lowLevel *seal.Access) (*autoSeal, error) {
 	ret := &autoSeal{
 		Access: lowLevel,
 	}
 	ret.barrierConfig.Store((*SealConfig)(nil))
 	ret.recoveryConfig.Store((*SealConfig)(nil))
 
-	// Having the wrapper type in a field is just a convenience since Seal.BarrierType()
-	// does not return an error.
 	var err error
-	ret.barrierType, err = ret.Type(context.Background())
+	ret.WrapperType, err = ret.Type(context.Background())
 	if err != nil {
 		return nil, err
 	}
-
 	return ret, nil
 }
 
@@ -74,7 +66,7 @@ func (d *autoSeal) SealWrapable() bool {
 	return true
 }
 
-func (d *autoSeal) GetAccess() seal.Access {
+func (d *autoSeal) GetAccess() *seal.Access {
 	return d.Access
 }
 
@@ -102,11 +94,7 @@ func (d *autoSeal) Finalize(ctx context.Context) error {
 }
 
 func (d *autoSeal) BarrierType() wrapping.WrapperType {
-	return d.barrierType
-}
-
-func (d *autoSeal) GetShamirWrapper() (*aeadwrapper.ShamirWrapper, error) {
-	return nil, fmt.Errorf("autoSeal does not use a ShamirWrapper")
+	return d.WrapperType
 }
 
 func (d *autoSeal) StoredKeysSupported() seal.StoredKeysSupport {
@@ -138,9 +126,9 @@ func (d *autoSeal) upgradeStoredKeys(ctx context.Context) error {
 		return fmt.Errorf("no stored keys found")
 	}
 
-	blobInfo, err := UnmarshalSealWrappedValue(pe.Value)
-	if err != nil {
-		return fmt.Errorf("failed to unmarshal stored keys: %w", err)
+	blobInfo := &wrapping.BlobInfo{}
+	if err := proto.Unmarshal(pe.Value, blobInfo); err != nil {
+		return fmt.Errorf("failed to proto decode stored keys: %w", err)
 	}
 
 	keyId, err := d.Access.KeyId(ctx)
@@ -150,11 +138,17 @@ func (d *autoSeal) upgradeStoredKeys(ctx context.Context) error {
 	if blobInfo.KeyInfo != nil && blobInfo.KeyInfo.KeyId != keyId {
 		d.logger.Info("upgrading stored keys")
 
-		keys, err := UnsealWrapStoredBarrierKeys(ctx, d.GetAccess(), pe)
+		pt, err := d.Decrypt(ctx, blobInfo, nil)
 		if err != nil {
 			return fmt.Errorf("failed to decrypt encrypted stored keys: %w", err)
 		}
 
+		// Decode the barrier entry
+		var keys [][]byte
+		if err := json.Unmarshal(pt, &keys); err != nil {
+			return fmt.Errorf("failed to decode stored keys: %w", err)
+		}
+
 		if err := d.SetStoredKeys(ctx, keys); err != nil {
 			return fmt.Errorf("failed to save upgraded stored keys: %w", err)
 		}
@@ -414,11 +408,21 @@ func (d *autoSeal) SetRecoveryKey(ctx context.Context, key []byte) error {
 	}
 
 	// Encrypt and marshal the keys
-	be, err := SealWrapRecoveryKey(ctx, d.Access, key)
+	blobInfo, err := d.Encrypt(ctx, key, nil)
 	if err != nil {
 		return fmt.Errorf("failed to encrypt keys for storage: %w", err)
 	}
 
+	value, err := proto.Marshal(blobInfo)
+	if err != nil {
+		return fmt.Errorf("failed to marshal value for storage: %w", err)
+	}
+
+	be := &physical.Entry{
+		Key:   recoveryKeyPath,
+		Value: value,
+	}
+
 	if err := d.core.physical.Put(ctx, be); err != nil {
 		d.logger.Error("failed to write recovery key", "error", err)
 		return fmt.Errorf("failed to write recovery key: %w", err)
@@ -442,7 +446,12 @@ func (d *autoSeal) getRecoveryKeyInternal(ctx context.Context) ([]byte, error) {
 		return nil, fmt.Errorf("no recovery key found")
 	}
 
-	pt, _, err := UnsealWrapRecoveryKey(ctx, d.Access, pe)
+	blobInfo := &wrapping.BlobInfo{}
+	if err := proto.Unmarshal(pe.Value, blobInfo); err != nil {
+		return nil, fmt.Errorf("failed to proto decode stored keys: %w", err)
+	}
+
+	pt, err := d.Decrypt(ctx, blobInfo, nil)
 	if err != nil {
 		return nil, fmt.Errorf("failed to decrypt encrypted stored keys: %w", err)
 	}
@@ -459,8 +468,8 @@ func (d *autoSeal) upgradeRecoveryKey(ctx context.Context) error {
 		return fmt.Errorf("no recovery key found")
 	}
 
-	pt, blobInfo, err := UnsealWrapRecoveryKey(ctx, d.Access, pe)
-	if err != nil {
+	blobInfo := &wrapping.BlobInfo{}
+	if err := proto.Unmarshal(pe.Value, blobInfo); err != nil {
 		return fmt.Errorf("failed to proto decode recovery key: %w", err)
 	}
 
@@ -472,6 +481,10 @@ func (d *autoSeal) upgradeRecoveryKey(ctx context.Context) error {
 	if blobInfo.KeyInfo != nil && blobInfo.KeyInfo.KeyId != keyId {
 		d.logger.Info("upgrading recovery key")
 
+		pt, err := d.Decrypt(ctx, blobInfo, nil)
+		if err != nil {
+			return fmt.Errorf("failed to decrypt encrypted recovery key: %w", err)
+		}
 		if err := d.SetRecoveryKey(ctx, pt); err != nil {
 			return fmt.Errorf("failed to save upgraded recovery key: %w", err)
 		}
diff --git a/vault/seal_autoseal_test.go b/vault/seal_autoseal_test.go
index dc3393616091b..6635bfc82245a 100644
--- a/vault/seal_autoseal_test.go
+++ b/vault/seal_autoseal_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -69,12 +66,12 @@ func (p *phy) Len() int {
 
 func TestAutoSeal_UpgradeKeys(t *testing.T) {
 	core, _, _ := TestCoreUnsealed(t)
-	testSeal, toggleableWrapper := seal.NewTestSeal(nil)
+	testSeal := seal.NewTestSeal(nil)
 
 	var encKeys []string
 	changeKey := func(key string) {
 		encKeys = append(encKeys, key)
-		toggleableWrapper.Wrapper.(*wrapping.TestWrapper).SetKeyId(key)
+		testSeal.Wrapper.(*wrapping.TestWrapper).SetKeyId(key)
 	}
 
 	// Set initial encryption key.
diff --git a/vault/seal_test.go b/vault/seal_test.go
index 141bc00722fe7..a174289b20159 100644
--- a/vault/seal_test.go
+++ b/vault/seal_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/seal_testing.go b/vault/seal_testing.go
index 4260136bbdcd0..982b44a3434b2 100644
--- a/vault/seal_testing.go
+++ b/vault/seal_testing.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/seal_testing_util.go b/vault/seal_testing_util.go
index f51f0296f7e4d..f4dcc02fbc84b 100644
--- a/vault/seal_testing_util.go
+++ b/vault/seal_testing_util.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -22,7 +19,9 @@ func NewTestSeal(t testing.T, opts *seal.TestSealOpts) Seal {
 
 	switch opts.StoredKeys {
 	case seal.StoredKeysSupportedShamirRoot:
-		newSeal := NewDefaultSeal(seal.NewAccess(aeadwrapper.NewShamirWrapper()))
+		newSeal := NewDefaultSeal(&seal.Access{
+			Wrapper: aeadwrapper.NewShamirWrapper(),
+		})
 		// Need StoredShares set or this will look like a legacy shamir seal.
 		newSeal.SetCachedBarrierConfig(&SealConfig{
 			StoredShares:    1,
@@ -31,7 +30,9 @@ func NewTestSeal(t testing.T, opts *seal.TestSealOpts) Seal {
 		})
 		return newSeal
 	case seal.StoredKeysNotSupported:
-		newSeal := NewDefaultSeal(seal.NewAccess(aeadwrapper.NewShamirWrapper()))
+		newSeal := NewDefaultSeal(&seal.Access{
+			Wrapper: aeadwrapper.NewShamirWrapper(),
+		})
 		newSeal.SetCachedBarrierConfig(&SealConfig{
 			StoredShares:    0,
 			SecretThreshold: 1,
@@ -39,8 +40,7 @@ func NewTestSeal(t testing.T, opts *seal.TestSealOpts) Seal {
 		})
 		return newSeal
 	default:
-		access, _ := seal.NewTestSeal(opts)
-		seal, err := NewAutoSeal(access)
+		seal, err := NewAutoSeal(seal.NewTestSeal(opts))
 		if err != nil {
 			t.Fatal(err)
 		}
diff --git a/vault/seal_util.go b/vault/seal_util.go
deleted file mode 100644
index 679374a418c84..0000000000000
--- a/vault/seal_util.go
+++ /dev/null
@@ -1,162 +0,0 @@
-package vault
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"strings"
-
-	wrapping "github.com/hashicorp/go-kms-wrapping/v2"
-	"github.com/hashicorp/vault/sdk/physical"
-	"github.com/hashicorp/vault/vault/seal"
-	"google.golang.org/protobuf/proto"
-)
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// Seal Wrapping
-
-// SealWrapValue creates a BlobInfo wrapper with the entryValue being optionally encrypted with the give seal Access.
-func SealWrapValue(ctx context.Context, access seal.Access, encrypt bool, entryValue []byte) (*wrapping.BlobInfo, error) {
-	wrappedEntryValue := &wrapping.BlobInfo{
-		Wrapped:    false,
-		Ciphertext: entryValue,
-	}
-
-	if access != nil && encrypt {
-		swi, err := access.Encrypt(ctx, entryValue, nil)
-		if err != nil {
-			return nil, err
-		}
-		wrappedEntryValue.Wrapped = true
-		wrappedEntryValue.Ciphertext = swi.Ciphertext
-		wrappedEntryValue.Iv = swi.Iv
-		wrappedEntryValue.Hmac = swi.Hmac
-		wrappedEntryValue.KeyInfo = swi.KeyInfo
-	}
-
-	return wrappedEntryValue, nil
-}
-
-// MarshalSealWrappedValue marshals a BlobInfo into a byte slice.
-func MarshalSealWrappedValue(wrappedEntryValue *wrapping.BlobInfo) ([]byte, error) {
-	return proto.Marshal(wrappedEntryValue)
-}
-
-// UnmarshalSealWrappedValue attempts to unmarshal a BlobInfo.
-func UnmarshalSealWrappedValue(value []byte) (*wrapping.BlobInfo, error) {
-	wrappedEntryValue := &wrapping.BlobInfo{}
-	err := proto.Unmarshal(value, wrappedEntryValue)
-	if err != nil {
-		return nil, err
-	}
-	return wrappedEntryValue, nil
-}
-
-// UnmarshalSealWrappedValueWithCanary unmarshalls a byte array into a BlobInfo, taking care of
-// removing the 's' canary value. Note that if the value does not end with the canary value,
-// or a BlobInfo cannot be unmarshalled, nil is returned.
-func UnmarshalSealWrappedValueWithCanary(value []byte) *wrapping.BlobInfo {
-	eLen := len(value)
-	if eLen > 0 && value[eLen-1] == 's' {
-		if wrappedEntryValue, err := UnmarshalSealWrappedValue(value[:eLen-1]); err == nil {
-			return wrappedEntryValue
-		}
-		// Else, note that having the canary value present is not a guarantee that
-		// the value is wrapped, so if there is an error we will simply return a nil BlobInfo.
-	}
-	return nil
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// Stored Barrier Keys (a.k.a. Root Key)
-
-// SealWrapStoredBarrierKeys takes the json-marshalled barriers (root) keys, encrypts them using the seal access,
-// and returns a physical.Entry for storage.
-func SealWrapStoredBarrierKeys(ctx context.Context, access seal.Access, keys [][]byte) (*physical.Entry, error) {
-	buf, err := json.Marshal(keys)
-	if err != nil {
-		return nil, fmt.Errorf("failed to encode keys for storage: %w", err)
-	}
-
-	blobInfo, err := SealWrapValue(ctx, access, true, buf)
-	if err != nil {
-		return nil, &ErrEncrypt{Err: fmt.Errorf("failed to encrypt keys for storage: %w", err)}
-	}
-
-	// Watch out, Wrapped has to be false for StoredBarrierKeysPath, since it used to be that the BlobInfo
-	// returned by access.Encrypt() was marshalled directly. It probably would not matter if the value
-	// was true, but setting if to false here makes TestSealWrapBackend_StorageBarrierKeyUpgrade_FromIVEntry
-	// pass (maybe other tests as well?).
-	blobInfo.Wrapped = false
-
-	wrappedValue, err := MarshalSealWrappedValue(blobInfo)
-	if err != nil {
-		return nil, fmt.Errorf("failed to marshal value for storage: %w", err)
-	}
-	return &physical.Entry{
-		Key:   StoredBarrierKeysPath,
-		Value: wrappedValue,
-	}, nil
-}
-
-// UnsealWrapStoredBarrierKeys is the counterpart to SealWrapStoredBarrierKeys.
-func UnsealWrapStoredBarrierKeys(ctx context.Context, access seal.Access, pe *physical.Entry) ([][]byte, error) {
-	blobInfo, err := UnmarshalSealWrappedValue(pe.Value)
-	if err != nil {
-		return nil, fmt.Errorf("failed to proto decode stored keys: %w", err)
-	}
-
-	pt, err := access.Decrypt(ctx, blobInfo, nil)
-	if err != nil {
-		if strings.Contains(err.Error(), "message authentication failed") {
-			return nil, &ErrInvalidKey{Reason: fmt.Sprintf("failed to decrypt keys from storage: %v", err)}
-		}
-		return nil, &ErrDecrypt{Err: fmt.Errorf("failed to decrypt keys from storage: %w", err)}
-	}
-
-	// Decode the barrier entry
-	var keys [][]byte
-	if err := json.Unmarshal(pt, &keys); err != nil {
-		return nil, fmt.Errorf("failed to decode stored keys: %v", err)
-	}
-	return keys, nil
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// Recovery Key
-
-// SealWrapRecoveryKey encrypts the recovery key using the given seal access and returns a physical.Entry for storage.
-func SealWrapRecoveryKey(ctx context.Context, access seal.Access, key []byte) (*physical.Entry, error) {
-	blobInfo, err := SealWrapValue(ctx, access, true, key)
-	if err != nil {
-		return nil, &ErrEncrypt{Err: fmt.Errorf("failed to encrypt keys for storage: %w", err)}
-	}
-
-	// Not that we set Wrapped to false since it used to be that the BlobInfo returned by access.Encrypt()
-	// was marshalled directly. It probably would not matter if the value was true, it doesn't seem to
-	// break any tests.
-	blobInfo.Wrapped = false
-
-	wrappedValue, err := MarshalSealWrappedValue(blobInfo)
-	if err != nil {
-		return nil, fmt.Errorf("failed to marshal value for storage: %w", err)
-	}
-	return &physical.Entry{
-		Key:   recoveryKeyPath,
-		Value: wrappedValue,
-	}, nil
-}
-
-// UnsealWrapRecoveryKey is the counterpart to SealWrapRecoveryKey.
-func UnsealWrapRecoveryKey(ctx context.Context, access seal.Access, pe *physical.Entry) ([]byte, *wrapping.BlobInfo, error) {
-	blobInfo, err := UnmarshalSealWrappedValue(pe.Value)
-	if err != nil {
-		return nil, nil, fmt.Errorf("failed to proto decode recevory key: %w", err)
-	}
-
-	pt, err := access.Decrypt(ctx, blobInfo, nil)
-	if err != nil {
-		return nil, nil, fmt.Errorf("failed to decrypt recovery key from storage: %w", err)
-	}
-	return pt, blobInfo, nil
-}
diff --git a/vault/sealunwrapper.go b/vault/sealunwrapper.go
index 6045987ce8d3d..eb22fb3efdc3f 100644
--- a/vault/sealunwrapper.go
+++ b/vault/sealunwrapper.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !enterprise
 
 package vault
@@ -10,7 +7,9 @@ import (
 	"fmt"
 	"sync/atomic"
 
+	proto "github.com/golang/protobuf/proto"
 	log "github.com/hashicorp/go-hclog"
+	wrapping "github.com/hashicorp/go-kms-wrapping/v2"
 	"github.com/hashicorp/vault/sdk/helper/locksutil"
 	"github.com/hashicorp/vault/sdk/physical"
 )
@@ -63,59 +62,81 @@ func (d *sealUnwrapper) Put(ctx context.Context, entry *physical.Entry) error {
 	return d.underlying.Put(ctx, entry)
 }
 
-// unwrap gets an entry from underlying storage and tries to unwrap it. If the entry was not wrapped, return
-// value unwrappedEntry will be nil. If the entry is wrapped and encrypted, an error is returned.
-func (d *sealUnwrapper) unwrap(ctx context.Context, key string) (entry, unwrappedEntry *physical.Entry, err error) {
-	entry, err = d.underlying.Get(ctx, key)
+func (d *sealUnwrapper) Get(ctx context.Context, key string) (*physical.Entry, error) {
+	entry, err := d.underlying.Get(ctx, key)
 	if err != nil {
-		return nil, nil, err
+		return nil, err
 	}
 	if entry == nil {
-		return nil, nil, err
+		return nil, nil
 	}
 
-	se := UnmarshalSealWrappedValueWithCanary(entry.Value)
-	switch {
-	case se == nil:
-		unwrappedEntry = entry
-	case se.Wrapped:
-		return nil, nil, fmt.Errorf("cannot decode sealwrapped storage entry %q", entry.Key)
-	default:
-		unwrappedEntry = &physical.Entry{
-			Key:   entry.Key,
-			Value: se.Ciphertext,
+	var performUnwrap bool
+	se := &wrapping.BlobInfo{}
+	// If the value ends in our canary value, try to decode the bytes.
+	eLen := len(entry.Value)
+	if eLen > 0 && entry.Value[eLen-1] == 's' {
+		if err := proto.Unmarshal(entry.Value[:eLen-1], se); err == nil {
+			// We unmarshaled successfully which means we need to store it as a
+			// non-proto message
+			performUnwrap = true
 		}
 	}
-
-	return entry, unwrappedEntry, nil
-}
-
-func (d *sealUnwrapper) Get(ctx context.Context, key string) (*physical.Entry, error) {
-	entry, unwrappedEntry, err := d.unwrap(ctx, key)
-	switch {
-	case err != nil:
-		return nil, err
-	case entry == nil:
-		return nil, nil
-	case atomic.LoadUint32(d.allowUnwraps) != 1:
-		return unwrappedEntry, nil
+	if !performUnwrap {
+		return entry, nil
+	}
+	// It's actually encrypted and we can't read it
+	if se.Wrapped {
+		return nil, fmt.Errorf("cannot decode sealwrapped storage entry %q", entry.Key)
+	}
+	if atomic.LoadUint32(d.allowUnwraps) != 1 {
+		return &physical.Entry{
+			Key:   entry.Key,
+			Value: se.Ciphertext,
+		}, nil
 	}
 
 	locksutil.LockForKey(d.locks, key).Lock()
 	defer locksutil.LockForKey(d.locks, key).Unlock()
 
 	// At this point we need to re-read and re-check
-	entry, unwrappedEntry, err = d.unwrap(ctx, key)
-	switch {
-	case err != nil:
+	entry, err = d.underlying.Get(ctx, key)
+	if err != nil {
 		return nil, err
-	case entry == nil:
+	}
+	if entry == nil {
 		return nil, nil
-	case atomic.LoadUint32(d.allowUnwraps) != 1:
-		return unwrappedEntry, nil
 	}
 
-	return unwrappedEntry, d.underlying.Put(ctx, unwrappedEntry)
+	performUnwrap = false
+	se = &wrapping.BlobInfo{}
+	// If the value ends in our canary value, try to decode the bytes.
+	eLen = len(entry.Value)
+	if eLen > 0 && entry.Value[eLen-1] == 's' {
+		// We ignore an error because the canary is not a guarantee; if it
+		// doesn't decode, proceed normally
+		if err := proto.Unmarshal(entry.Value[:eLen-1], se); err == nil {
+			// We unmarshaled successfully which means we need to store it as a
+			// non-proto message
+			performUnwrap = true
+		}
+	}
+	if !performUnwrap {
+		return entry, nil
+	}
+	if se.Wrapped {
+		return nil, fmt.Errorf("cannot decode sealwrapped storage entry %q", entry.Key)
+	}
+
+	entry = &physical.Entry{
+		Key:   entry.Key,
+		Value: se.Ciphertext,
+	}
+
+	if atomic.LoadUint32(d.allowUnwraps) != 1 {
+		return entry, nil
+	}
+	return entry, d.underlying.Put(ctx, entry)
 }
 
 func (d *sealUnwrapper) Delete(ctx context.Context, key string) error {
diff --git a/vault/sealunwrapper_test.go b/vault/sealunwrapper_test.go
index c57096f91da67..339b9ec5bffc5 100644
--- a/vault/sealunwrapper_test.go
+++ b/vault/sealunwrapper_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !enterprise
 
 package vault
diff --git a/vault/test_cluster_detect_deadlock.go b/vault/test_cluster_detect_deadlock.go
deleted file mode 100644
index ec35ef759de97..0000000000000
--- a/vault/test_cluster_detect_deadlock.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-//go:build deadlock
-
-package vault
-
-const TestDeadlockDetection = "statelock"
diff --git a/vault/test_cluster_do_not_detect_deadlock.go b/vault/test_cluster_do_not_detect_deadlock.go
deleted file mode 100644
index f365e7ee69468..0000000000000
--- a/vault/test_cluster_do_not_detect_deadlock.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-//go:build !deadlock
-
-package vault
-
-const TestDeadlockDetection = ""
diff --git a/vault/testing.go b/vault/testing.go
index 375d7f749c384..5e343bf4caa9e 100644
--- a/vault/testing.go
+++ b/vault/testing.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -25,7 +22,6 @@ import (
 	"net/http"
 	"os"
 	"path/filepath"
-	"reflect"
 	"sync"
 	"sync/atomic"
 	"time"
@@ -38,20 +34,18 @@ import (
 	"github.com/hashicorp/vault/api"
 	"github.com/hashicorp/vault/audit"
 	auditFile "github.com/hashicorp/vault/builtin/audit/file"
+	"github.com/hashicorp/vault/builtin/credential/approle"
 	"github.com/hashicorp/vault/command/server"
-	"github.com/hashicorp/vault/helper/constants"
-	"github.com/hashicorp/vault/helper/experiments"
 	"github.com/hashicorp/vault/helper/metricsutil"
 	"github.com/hashicorp/vault/helper/namespace"
-	"github.com/hashicorp/vault/helper/testhelpers/corehelpers"
-	"github.com/hashicorp/vault/helper/testhelpers/pluginhelpers"
 	"github.com/hashicorp/vault/internalshared/configutil"
+	dbMysql "github.com/hashicorp/vault/plugins/database/mysql"
 	v5 "github.com/hashicorp/vault/sdk/database/dbplugin/v5"
 	"github.com/hashicorp/vault/sdk/framework"
 	"github.com/hashicorp/vault/sdk/helper/consts"
 	"github.com/hashicorp/vault/sdk/helper/logging"
 	"github.com/hashicorp/vault/sdk/helper/pluginutil"
-	"github.com/hashicorp/vault/sdk/helper/testcluster"
+	"github.com/hashicorp/vault/sdk/helper/salt"
 	"github.com/hashicorp/vault/sdk/logical"
 	"github.com/hashicorp/vault/sdk/physical"
 	physInmem "github.com/hashicorp/vault/sdk/physical/inmem"
@@ -133,7 +127,7 @@ func TestCoreWithSeal(t testing.T, testSeal Seal, enableRaw bool) *Core {
 		Seal:            testSeal,
 		EnableUI:        false,
 		EnableRaw:       enableRaw,
-		BuiltinRegistry: corehelpers.NewMockBuiltinRegistry(),
+		BuiltinRegistry: NewMockBuiltinRegistry(),
 		AuditBackends: map[string]audit.Factory{
 			"file": auditFile.Factory,
 		},
@@ -158,7 +152,7 @@ func TestCoreWithCustomResponseHeaderAndUI(t testing.T, CustomResponseHeaders ma
 		RawConfig:       confRaw,
 		EnableUI:        enableUI,
 		EnableRaw:       true,
-		BuiltinRegistry: corehelpers.NewMockBuiltinRegistry(),
+		BuiltinRegistry: NewMockBuiltinRegistry(),
 	}
 	core := TestCoreWithSealAndUI(t, conf)
 	return testCoreUnsealed(t, core)
@@ -168,7 +162,7 @@ func TestCoreUI(t testing.T, enableUI bool) *Core {
 	conf := &CoreConfig{
 		EnableUI:        enableUI,
 		EnableRaw:       true,
-		BuiltinRegistry: corehelpers.NewMockBuiltinRegistry(),
+		BuiltinRegistry: NewMockBuiltinRegistry(),
 	}
 	return TestCoreWithSealAndUI(t, conf)
 }
@@ -191,7 +185,7 @@ func TestCoreWithSealAndUI(t testing.T, opts *CoreConfig) *Core {
 }
 
 func TestCoreWithSealAndUINoCleanup(t testing.T, opts *CoreConfig) *Core {
-	logger := logging.NewVaultLogger(log.Trace).Named(t.Name())
+	logger := logging.NewVaultLogger(log.Trace)
 	physicalBackend, err := physInmem.NewInmem(nil, logger)
 	if err != nil {
 		t.Fatal(err)
@@ -205,7 +199,6 @@ func TestCoreWithSealAndUINoCleanup(t testing.T, opts *CoreConfig) *Core {
 	// Override config values with ones that gets passed in
 	conf.EnableUI = opts.EnableUI
 	conf.EnableRaw = opts.EnableRaw
-	conf.EnableIntrospection = opts.EnableIntrospection
 	conf.Seal = opts.Seal
 	conf.LicensingConfig = opts.LicensingConfig
 	conf.DisableKeyEncodingChecks = opts.DisableKeyEncodingChecks
@@ -216,9 +209,6 @@ func TestCoreWithSealAndUINoCleanup(t testing.T, opts *CoreConfig) *Core {
 	conf.EnableResponseHeaderHostname = opts.EnableResponseHeaderHostname
 	conf.DisableSSCTokens = opts.DisableSSCTokens
 	conf.PluginDirectory = opts.PluginDirectory
-	conf.DetectDeadlocks = opts.DetectDeadlocks
-	conf.Experiments = []string{experiments.VaultExperimentEventsAlpha1}
-	conf.CensusAgent = opts.CensusAgent
 
 	if opts.Logger != nil {
 		conf.Logger = opts.Logger
@@ -240,7 +230,6 @@ func TestCoreWithSealAndUINoCleanup(t testing.T, opts *CoreConfig) *Core {
 	}
 
 	conf.ActivityLogConfig = opts.ActivityLogConfig
-	testApplyEntBaseConfig(conf, opts)
 
 	c, err := NewCore(conf)
 	if err != nil {
@@ -253,7 +242,26 @@ func TestCoreWithSealAndUINoCleanup(t testing.T, opts *CoreConfig) *Core {
 func testCoreConfig(t testing.T, physicalBackend physical.Backend, logger log.Logger) *CoreConfig {
 	t.Helper()
 	noopAudits := map[string]audit.Factory{
-		"noop": corehelpers.NoopAuditFactory(nil),
+		"noop": func(_ context.Context, config *audit.BackendConfig) (audit.Backend, error) {
+			view := &logical.InmemStorage{}
+			view.Put(context.Background(), &logical.StorageEntry{
+				Key:   "salt",
+				Value: []byte("foo"),
+			})
+			config.SaltConfig = &salt.Config{
+				HMAC:     sha256.New,
+				HMACType: "hmac-sha256",
+			}
+			config.SaltView = view
+
+			n := &noopAudit{
+				Config: config,
+			}
+			n.formatter.AuditFormatWriter = &audit.JSONFormatWriter{
+				SaltFunc: n.Salt,
+			}
+			return n, nil
+		},
 	}
 
 	noopBackends := make(map[string]logical.Factory)
@@ -292,7 +300,7 @@ func testCoreConfig(t testing.T, physicalBackend physical.Backend, logger log.Lo
 		CredentialBackends: credentialBackends,
 		DisableMlock:       true,
 		Logger:             logger,
-		BuiltinRegistry:    corehelpers.NewMockBuiltinRegistry(),
+		BuiltinRegistry:    NewMockBuiltinRegistry(),
 	}
 
 	return conf
@@ -371,7 +379,7 @@ func SetupMetrics(conf *CoreConfig) *metrics.InmemSink {
 func TestCoreUnsealedWithMetrics(t testing.T) (*Core, [][]byte, string, *metrics.InmemSink) {
 	t.Helper()
 	conf := &CoreConfig{
-		BuiltinRegistry: corehelpers.NewMockBuiltinRegistry(),
+		BuiltinRegistry: NewMockBuiltinRegistry(),
 	}
 	sink := SetupMetrics(conf)
 	core, keys, root := testCoreUnsealed(t, TestCoreWithSealAndUI(t, conf))
@@ -504,7 +512,7 @@ func TestDynamicSystemView(c *Core, ns *namespace.Namespace) *dynamicSystemView
 		me.namespace = ns
 	}
 
-	return &dynamicSystemView{c, me, c.perfStandby}
+	return &dynamicSystemView{c, me}
 }
 
 // TestAddTestPlugin registers the testFunc as part of the plugin command to the
@@ -603,9 +611,9 @@ func TestRunTestPlugin(t testing.T, c *Core, pluginType consts.PluginType, plugi
 }
 
 func TestPluginClientConfig(c *Core, pluginType consts.PluginType, pluginName string) pluginutil.PluginClientConfig {
-	dsv := TestDynamicSystemView(c, nil)
 	switch pluginType {
 	case consts.PluginTypeCredential, consts.PluginTypeSecrets:
+		dsv := TestDynamicSystemView(c, nil)
 		return pluginutil.PluginClientConfig{
 			Name:            pluginName,
 			PluginType:      pluginType,
@@ -625,7 +633,6 @@ func TestPluginClientConfig(c *Core, pluginType consts.PluginType, pluginName st
 			Logger:          log.NewNullLogger(),
 			AutoMTLS:        true,
 			IsMetadataMode:  false,
-			Wrapper:         dsv,
 		}
 	}
 	return pluginutil.PluginClientConfig{}
@@ -662,6 +669,112 @@ func AddTestLogicalBackend(name string, factory logical.Factory) error {
 	return nil
 }
 
+type noopAudit struct {
+	Config    *audit.BackendConfig
+	salt      *salt.Salt
+	saltMutex sync.RWMutex
+	formatter audit.AuditFormatter
+	records   [][]byte
+	l         sync.RWMutex
+}
+
+func (n *noopAudit) GetHash(ctx context.Context, data string) (string, error) {
+	salt, err := n.Salt(ctx)
+	if err != nil {
+		return "", err
+	}
+	return salt.GetIdentifiedHMAC(data), nil
+}
+
+func (n *noopAudit) LogRequest(ctx context.Context, in *logical.LogInput) error {
+	n.l.Lock()
+	defer n.l.Unlock()
+	var w bytes.Buffer
+	err := n.formatter.FormatRequest(ctx, &w, audit.FormatterConfig{}, in)
+	if err != nil {
+		return err
+	}
+	n.records = append(n.records, w.Bytes())
+	return nil
+}
+
+func (n *noopAudit) LogResponse(ctx context.Context, in *logical.LogInput) error {
+	n.l.Lock()
+	defer n.l.Unlock()
+	var w bytes.Buffer
+	err := n.formatter.FormatResponse(ctx, &w, audit.FormatterConfig{}, in)
+	if err != nil {
+		return err
+	}
+	n.records = append(n.records, w.Bytes())
+	return nil
+}
+
+func (n *noopAudit) LogTestMessage(ctx context.Context, in *logical.LogInput, config map[string]string) error {
+	n.l.Lock()
+	defer n.l.Unlock()
+	var w bytes.Buffer
+	tempFormatter := audit.NewTemporaryFormatter(config["format"], config["prefix"])
+	err := tempFormatter.FormatResponse(ctx, &w, audit.FormatterConfig{}, in)
+	if err != nil {
+		return err
+	}
+	n.records = append(n.records, w.Bytes())
+	return nil
+}
+
+func (n *noopAudit) Reload(_ context.Context) error {
+	return nil
+}
+
+func (n *noopAudit) Invalidate(_ context.Context) {
+	n.saltMutex.Lock()
+	defer n.saltMutex.Unlock()
+	n.salt = nil
+}
+
+func (n *noopAudit) Salt(ctx context.Context) (*salt.Salt, error) {
+	n.saltMutex.RLock()
+	if n.salt != nil {
+		defer n.saltMutex.RUnlock()
+		return n.salt, nil
+	}
+	n.saltMutex.RUnlock()
+	n.saltMutex.Lock()
+	defer n.saltMutex.Unlock()
+	if n.salt != nil {
+		return n.salt, nil
+	}
+	salt, err := salt.NewSalt(ctx, n.Config.SaltView, n.Config.SaltConfig)
+	if err != nil {
+		return nil, err
+	}
+	n.salt = salt
+	return salt, nil
+}
+
+func AddNoopAudit(conf *CoreConfig, records **[][]byte) {
+	conf.AuditBackends = map[string]audit.Factory{
+		"noop": func(_ context.Context, config *audit.BackendConfig) (audit.Backend, error) {
+			view := &logical.InmemStorage{}
+			view.Put(context.Background(), &logical.StorageEntry{
+				Key:   "salt",
+				Value: []byte("foo"),
+			})
+			n := &noopAudit{
+				Config: config,
+			}
+			n.formatter.AuditFormatWriter = &audit.JSONFormatWriter{
+				SaltFunc: n.Salt,
+			}
+			if records != nil {
+				*records = &n.records
+			}
+			return n, nil
+		},
+	}
+}
+
 type rawHTTP struct{}
 
 func (n *rawHTTP) HandleRequest(ctx context.Context, req *logical.Request) (*logical.Response, error) {
@@ -785,7 +898,6 @@ type TestCluster struct {
 	CAKeyPEM           []byte
 	Cores              []*TestClusterCore
 	ID                 string
-	Plugins            []pluginhelpers.TestPlugin
 	RootToken          string
 	RootCAs            *x509.CertPool
 	TempDir            string
@@ -798,18 +910,9 @@ type TestCluster struct {
 	base              *CoreConfig
 	LicensePublicKey  ed25519.PublicKey
 	LicensePrivateKey ed25519.PrivateKey
-	opts              *TestClusterOptions
-}
-
-func (c *TestCluster) SetRootToken(token string) {
-	c.RootToken = token
 }
 
 func (c *TestCluster) Start() {
-}
-
-func (c *TestCluster) start(t testing.T) {
-	t.Helper()
 	for i, core := range c.Cores {
 		if core.Server != nil {
 			for _, ln := range core.Listeners {
@@ -821,54 +924,6 @@ func (c *TestCluster) start(t testing.T) {
 	if c.SetupFunc != nil {
 		c.SetupFunc()
 	}
-
-	if c.opts != nil && c.opts.SkipInit {
-		// SkipInit implies that vault may not be ready to service requests, or that
-		// we're restarting a cluster from an existing storage.
-		return
-	}
-
-	activeCore := -1
-WAITACTIVE:
-	for i := 0; i < 60; i++ {
-		for i, core := range c.Cores {
-			if standby, _ := core.Core.Standby(); !standby {
-				activeCore = i
-				break WAITACTIVE
-			}
-		}
-
-		time.Sleep(time.Second)
-	}
-	if activeCore == -1 {
-		t.Fatalf("no core became active")
-	}
-
-	switch {
-	case c.opts == nil:
-	case c.opts.NoDefaultQuotas:
-	case c.opts.HandlerFunc == nil:
-	// If no HandlerFunc is provided that means that we can't actually do
-	// regular vault requests.
-	case reflect.TypeOf(c.opts.HandlerFunc).PkgPath() != "github.com/hashicorp/vault/http":
-	case reflect.TypeOf(c.opts.HandlerFunc).Name() != "Handler":
-	default:
-		cli := c.Cores[activeCore].Client
-		_, err := cli.Logical().Write("sys/quotas/rate-limit/rl-NewTestCluster", map[string]interface{}{
-			"rate": 1000000,
-		})
-		if err != nil {
-			t.Fatalf("error setting up global rate limit quota: %v", err)
-		}
-		if constants.IsEnterprise {
-			_, err = cli.Logical().Write("sys/quotas/lease-count/lc-NewTestCluster", map[string]interface{}{
-				"max_leases": 1000000,
-			})
-			if err != nil {
-				t.Fatalf("error setting up global lease count quota: %v", err)
-			}
-		}
-	}
 }
 
 // UnsealCores uses the cluster barrier keys to unseal the test cluster cores
@@ -976,10 +1031,6 @@ func (c *TestClusterCore) Seal(t testing.T) {
 	}
 }
 
-func (c *TestClusterCore) LogicalStorage() logical.Storage {
-	return c.barrier
-}
-
 func (c *TestClusterCore) stop() error {
 	c.Logger().Info("stopping vault test core")
 
@@ -1012,35 +1063,9 @@ func (c *TestClusterCore) stop() error {
 	return nil
 }
 
-func (c *TestClusterCore) StopAutomaticRollbacks() {
-	c.rollback.StopTicker()
-}
-
-func (c *TestClusterCore) GrabRollbackLock() {
-	// Ensure we don't hold this lock while there are in flight rollbacks.
-	c.rollback.inflightAll.Wait()
-	c.rollback.inflightLock.Lock()
-}
-
-func (c *TestClusterCore) ReleaseRollbackLock() {
-	c.rollback.inflightLock.Unlock()
-}
-
-func (c *TestClusterCore) TriggerRollbacks() {
-	c.rollback.triggerRollbacks()
-}
-
-func (c *TestClusterCore) TLSConfig() *tls.Config {
-	return c.tlsConfig.Clone()
-}
-
-func (c *TestClusterCore) ClusterListener() *cluster.Listener {
-	return c.getClusterListener()
-}
-
 func (c *TestCluster) Cleanup() {
 	c.Logger.Info("cleaning up vault cluster")
-	if tl, ok := c.Logger.(*corehelpers.TestLogger); ok {
+	if tl, ok := c.Logger.(*TestLogger); ok {
 		tl.StopLogging()
 	}
 
@@ -1116,7 +1141,7 @@ type TestClusterCore struct {
 	ServerCertPEM        []byte
 	ServerKey            *ecdsa.PrivateKey
 	ServerKeyPEM         []byte
-	tlsConfig            *tls.Config
+	TLSConfig            *tls.Config
 	UnderlyingStorage    physical.Backend
 	UnderlyingRawStorage physical.Backend
 	UnderlyingHAStorage  physical.HABackend
@@ -1130,14 +1155,10 @@ type PhysicalBackendBundle struct {
 	Cleanup   func()
 }
 
-type HandlerHandler interface {
-	Handler(*HandlerProperties) http.Handler
-}
-
 type TestClusterOptions struct {
 	KeepStandbysSealed       bool
 	SkipInit                 bool
-	HandlerFunc              HandlerHandler
+	HandlerFunc              func(*HandlerProperties) http.Handler
 	DefaultHandlerProperties HandlerProperties
 
 	// BaseListenAddress is used to explicitly assign ports in sequence to the
@@ -1211,22 +1232,10 @@ type TestClusterOptions struct {
 	KVVersion              string
 	EffectiveSDKVersionMap map[int]string
 
-	NoDefaultQuotas bool
-
-	Plugins *TestPluginConfig
-
-	// if populated, the callback is called for every request
-	RequestResponseCallback func(logical.Backend, *logical.Request, *logical.Response)
-
 	// ABCDLoggerNames names the loggers according to our ABCD convention when generating 4 clusters
 	ABCDLoggerNames bool
 }
 
-type TestPluginConfig struct {
-	Typ      consts.PluginType
-	Versions []string
-}
-
 var DefaultNumCores = 3
 
 type certInfo struct {
@@ -1237,6 +1246,58 @@ type certInfo struct {
 	keyPEM    []byte
 }
 
+type TestLogger struct {
+	log.Logger
+	Path string
+	File *os.File
+	sink log.SinkAdapter
+}
+
+func NewTestLogger(t testing.T) *TestLogger {
+	var logFile *os.File
+	var logPath string
+	output := os.Stderr
+
+	logDir := os.Getenv("VAULT_TEST_LOG_DIR")
+	if logDir != "" {
+		logPath = filepath.Join(logDir, t.Name()+".log")
+		// t.Name may include slashes.
+		dir, _ := filepath.Split(logPath)
+		err := os.MkdirAll(dir, 0o755)
+		if err != nil {
+			t.Fatal(err)
+		}
+		logFile, err = os.Create(logPath)
+		if err != nil {
+			t.Fatal(err)
+		}
+		output = logFile
+	}
+
+	// We send nothing on the regular logger, that way we can later deregister
+	// the sink to stop logging during cluster cleanup.
+	logger := log.NewInterceptLogger(&log.LoggerOptions{
+		Output:            ioutil.Discard,
+		IndependentLevels: true,
+	})
+	sink := log.NewSinkAdapter(&log.LoggerOptions{
+		Output:            output,
+		Level:             log.Trace,
+		IndependentLevels: true,
+	})
+	logger.RegisterSink(sink)
+	return &TestLogger{
+		Path:   logPath,
+		File:   logFile,
+		Logger: logger,
+		sink:   sink,
+	}
+}
+
+func (tl *TestLogger) StopLogging() {
+	tl.Logger.(log.InterceptLogger).DeregisterSink(tl.sink)
+}
+
 // NewTestCluster creates a new test cluster based on the provided core config
 // and test cluster options.
 //
@@ -1267,7 +1328,6 @@ func NewTestCluster(t testing.T, base *CoreConfig, opts *TestClusterOptions) *Te
 	var baseAddr *net.TCPAddr
 	if opts != nil && opts.BaseListenAddress != "" {
 		baseAddr, err = net.ResolveTCPAddr("tcp", opts.BaseListenAddress)
-
 		if err != nil {
 			t.Fatal("could not parse given base IP")
 		}
@@ -1286,7 +1346,7 @@ func NewTestCluster(t testing.T, base *CoreConfig, opts *TestClusterOptions) *Te
 	case opts != nil && opts.Logger != nil:
 		testCluster.Logger = opts.Logger
 	default:
-		testCluster.Logger = corehelpers.NewTestLogger(t)
+		testCluster.Logger = NewTestLogger(t)
 	}
 
 	if opts != nil && opts.TempDir != "" {
@@ -1515,11 +1575,10 @@ func NewTestCluster(t testing.T, base *CoreConfig, opts *TestClusterOptions) *Te
 		DisableMlock:       true,
 		EnableUI:           true,
 		EnableRaw:          true,
-		BuiltinRegistry:    corehelpers.NewMockBuiltinRegistry(),
+		BuiltinRegistry:    NewMockBuiltinRegistry(),
 	}
 
 	if base != nil {
-		coreConfig.DetectDeadlocks = TestDeadlockDetection
 		coreConfig.RawConfig = base.RawConfig
 		coreConfig.DisableCache = base.DisableCache
 		coreConfig.EnableUI = base.EnableUI
@@ -1621,7 +1680,7 @@ func NewTestCluster(t testing.T, base *CoreConfig, opts *TestClusterOptions) *Te
 
 	addAuditBackend := len(coreConfig.AuditBackends) == 0
 	if addAuditBackend {
-		coreConfig.AuditBackends["noop"] = corehelpers.NoopAuditFactory(nil)
+		AddNoopAudit(coreConfig, nil)
 	}
 
 	if coreConfig.Physical == nil && (opts == nil || opts.PhysicalFactory == nil) {
@@ -1658,23 +1717,6 @@ func NewTestCluster(t testing.T, base *CoreConfig, opts *TestClusterOptions) *Te
 		opts.ClusterLayers = inmemCluster
 	}
 
-	if opts != nil && opts.Plugins != nil {
-		var pluginDir string
-		var cleanup func(t testing.T)
-
-		if coreConfig.PluginDirectory == "" {
-			pluginDir, cleanup = corehelpers.MakeTestPluginDir(t)
-			coreConfig.PluginDirectory = pluginDir
-			t.Cleanup(func() { cleanup(t) })
-		}
-
-		var plugins []pluginhelpers.TestPlugin
-		for _, version := range opts.Plugins.Versions {
-			plugins = append(plugins, pluginhelpers.CompilePlugin(t, opts.Plugins.Typ, version, coreConfig.PluginDirectory))
-		}
-		testCluster.Plugins = plugins
-	}
-
 	// Create cores
 	testCluster.cleanupFuncs = []func(){}
 	cores := []*Core{}
@@ -1713,7 +1755,7 @@ func NewTestCluster(t testing.T, base *CoreConfig, opts *TestClusterOptions) *Te
 			Listeners:            listeners[i],
 			Handler:              handlers[i],
 			Server:               servers[i],
-			tlsConfig:            tlsConfigs[i],
+			TLSConfig:            tlsConfigs[i],
 			Barrier:              cores[i].barrier,
 			NodeID:               fmt.Sprintf("core-%d", i),
 			UnderlyingRawStorage: coreConfigs[i].Physical,
@@ -1751,7 +1793,7 @@ func NewTestCluster(t testing.T, base *CoreConfig, opts *TestClusterOptions) *Te
 		for _, c := range testCluster.cleanupFuncs {
 			c()
 		}
-		if l, ok := testCluster.Logger.(*corehelpers.TestLogger); ok {
+		if l, ok := testCluster.Logger.(*TestLogger); ok {
 			if t.Failed() {
 				_ = l.File.Close()
 			} else {
@@ -1769,8 +1811,6 @@ func NewTestCluster(t testing.T, base *CoreConfig, opts *TestClusterOptions) *Te
 		}
 	}
 
-	testCluster.opts = opts
-	testCluster.start(t)
 	return &testCluster
 }
 
@@ -1811,7 +1851,7 @@ func (cluster *TestCluster) StartCore(t testing.T, idx int, opts *TestClusterOpt
 	}
 	tcc.Listeners = []*TestListener{
 		{
-			Listener: tls.NewListener(ln, tcc.tlsConfig),
+			Listener: tls.NewListener(ln, tcc.TLSConfig),
 			Address:  ln.Addr().(*net.TCPAddr),
 		},
 	}
@@ -1838,7 +1878,7 @@ func (cluster *TestCluster) StartCore(t testing.T, idx int, opts *TestClusterOpt
 		t, idx, newCore, tcc.CoreConfig,
 		opts, tcc.Listeners, tcc.Handler)
 
-	tcc.Client = cluster.getAPIClient(t, opts, tcc.Listeners[0].Address.Port, tcc.tlsConfig)
+	tcc.Client = cluster.getAPIClient(t, opts, tcc.Listeners[0].Address.Port, tcc.TLSConfig)
 
 	testAdjustUnderlyingStorage(tcc)
 	testExtraTestCoreSetup(t, cluster.LicensePrivateKey, tcc)
@@ -1967,11 +2007,7 @@ func (testCluster *TestCluster) newCore(t testing.T, idx int, coreConfig *CoreCo
 		if props.ListenerConfig != nil && props.ListenerConfig.MaxRequestDuration == 0 {
 			props.ListenerConfig.MaxRequestDuration = DefaultMaxRequestDuration
 		}
-		handler = opts.HandlerFunc.Handler(&props)
-	}
-
-	if opts != nil && opts.RequestResponseCallback != nil {
-		c.requestResponseCallback = opts.RequestResponseCallback
+		handler = opts.HandlerFunc(&props)
 	}
 
 	// Set this in case the Seal was manually set before the core was
@@ -2208,77 +2244,263 @@ func (testCluster *TestCluster) getAPIClient(
 	return apiClient
 }
 
-func (c *TestCluster) GetBarrierOrRecoveryKeys() [][]byte {
-	if c.Cores[0].SealAccess().RecoveryKeySupported() {
-		return c.GetRecoveryKeys()
-	} else {
-		return c.GetBarrierKeys()
+func toFunc(f logical.Factory) func() (interface{}, error) {
+	return func() (interface{}, error) {
+		return f, nil
 	}
 }
 
-func (c *TestCluster) GetCACertPEMFile() string {
-	return c.CACertPEMFile
+func NewMockBuiltinRegistry() *mockBuiltinRegistry {
+	return &mockBuiltinRegistry{
+		forTesting: map[string]mockBackend{
+			"mysql-database-plugin":      {PluginType: consts.PluginTypeDatabase},
+			"postgresql-database-plugin": {PluginType: consts.PluginTypeDatabase},
+			"approle":                    {PluginType: consts.PluginTypeCredential},
+			"pending-removal-test-plugin": {
+				PluginType:        consts.PluginTypeCredential,
+				DeprecationStatus: consts.PendingRemoval,
+			},
+			"aws":    {PluginType: consts.PluginTypeCredential},
+			"consul": {PluginType: consts.PluginTypeSecrets},
+		},
+	}
 }
 
-func (c *TestCluster) ClusterID() string {
-	return c.ID
+type mockBackend struct {
+	consts.PluginType
+	consts.DeprecationStatus
+}
+
+type mockBuiltinRegistry struct {
+	forTesting map[string]mockBackend
+}
+
+func (m *mockBuiltinRegistry) Get(name string, pluginType consts.PluginType) (func() (interface{}, error), bool) {
+	testBackend, ok := m.forTesting[name]
+	if !ok {
+		return nil, false
+	}
+	testPluginType := testBackend.PluginType
+	if pluginType != testPluginType {
+		return nil, false
+	}
+
+	switch name {
+	case "approle", "pending-removal-test-plugin":
+		return toFunc(approle.Factory), true
+	case "aws":
+		return toFunc(func(ctx context.Context, config *logical.BackendConfig) (logical.Backend, error) {
+			b := new(framework.Backend)
+			b.Setup(ctx, config)
+			b.BackendType = logical.TypeCredential
+			return b, nil
+		}), true
+	case "postgresql-database-plugin":
+		return toFunc(func(ctx context.Context, config *logical.BackendConfig) (logical.Backend, error) {
+			b := new(framework.Backend)
+			b.Setup(ctx, config)
+			b.BackendType = logical.TypeLogical
+			return b, nil
+		}), true
+	case "mysql-database-plugin":
+		return dbMysql.New(dbMysql.DefaultUserNameTemplate), true
+	case "consul":
+		return toFunc(func(ctx context.Context, config *logical.BackendConfig) (logical.Backend, error) {
+			b := new(framework.Backend)
+			b.Setup(ctx, config)
+			b.BackendType = logical.TypeLogical
+			return b, nil
+		}), true
+	default:
+		return nil, false
+	}
 }
 
-func (c *TestCluster) Nodes() []testcluster.VaultClusterNode {
-	ret := make([]testcluster.VaultClusterNode, len(c.Cores))
-	for i, core := range c.Cores {
-		ret[i] = core
+// Keys only supports getting a realistic list of the keys for database plugins,
+// and approle
+func (m *mockBuiltinRegistry) Keys(pluginType consts.PluginType) []string {
+	switch pluginType {
+	case consts.PluginTypeDatabase:
+		// This is a hard-coded reproduction of the db plugin keys in
+		// helper/builtinplugins/registry.go. The registry isn't directly used
+		// because it causes import cycles.
+		return []string{
+			"mysql-database-plugin",
+			"mysql-aurora-database-plugin",
+			"mysql-rds-database-plugin",
+			"mysql-legacy-database-plugin",
+
+			"cassandra-database-plugin",
+			"couchbase-database-plugin",
+			"elasticsearch-database-plugin",
+			"hana-database-plugin",
+			"influxdb-database-plugin",
+			"mongodb-database-plugin",
+			"mongodbatlas-database-plugin",
+			"mssql-database-plugin",
+			"postgresql-database-plugin",
+			"redis-elasticache-database-plugin",
+			"redshift-database-plugin",
+			"redis-database-plugin",
+			"snowflake-database-plugin",
+		}
+	case consts.PluginTypeCredential:
+		return []string{
+			"pending-removal-test-plugin",
+			"approle",
+		}
 	}
-	return ret
+	return []string{}
 }
 
-func (c *TestCluster) SetBarrierKeys(keys [][]byte) {
-	c.BarrierKeys = make([][]byte, len(keys))
-	for i, k := range keys {
-		c.BarrierKeys[i] = TestKeyCopy(k)
+func (m *mockBuiltinRegistry) Contains(name string, pluginType consts.PluginType) bool {
+	for _, key := range m.Keys(pluginType) {
+		if key == name {
+			return true
+		}
 	}
+	return false
 }
 
-func (c *TestCluster) SetRecoveryKeys(keys [][]byte) {
-	c.RecoveryKeys = make([][]byte, len(keys))
-	for i, k := range keys {
-		c.RecoveryKeys[i] = TestKeyCopy(k)
+func (m *mockBuiltinRegistry) DeprecationStatus(name string, pluginType consts.PluginType) (consts.DeprecationStatus, bool) {
+	if m.Contains(name, pluginType) {
+		return m.forTesting[name].DeprecationStatus, true
 	}
+
+	return consts.Unknown, false
+}
+
+type NoopAudit struct {
+	Config         *audit.BackendConfig
+	ReqErr         error
+	ReqAuth        []*logical.Auth
+	Req            []*logical.Request
+	ReqHeaders     []map[string][]string
+	ReqNonHMACKeys []string
+	ReqErrs        []error
+
+	RespErr            error
+	RespAuth           []*logical.Auth
+	RespReq            []*logical.Request
+	Resp               []*logical.Response
+	RespNonHMACKeys    []string
+	RespReqNonHMACKeys []string
+	RespErrs           []error
+
+	salt      *salt.Salt
+	saltMutex sync.RWMutex
 }
 
-func (c *TestCluster) GetBarrierKeys() [][]byte {
-	ret := make([][]byte, len(c.BarrierKeys))
-	for i, k := range c.BarrierKeys {
-		ret[i] = TestKeyCopy(k)
+func (n *NoopAudit) LogRequest(ctx context.Context, in *logical.LogInput) error {
+	n.ReqAuth = append(n.ReqAuth, in.Auth)
+	n.Req = append(n.Req, in.Request)
+	n.ReqHeaders = append(n.ReqHeaders, in.Request.Headers)
+	n.ReqNonHMACKeys = in.NonHMACReqDataKeys
+	n.ReqErrs = append(n.ReqErrs, in.OuterErr)
+	return n.ReqErr
+}
+
+func (n *NoopAudit) LogResponse(ctx context.Context, in *logical.LogInput) error {
+	n.RespAuth = append(n.RespAuth, in.Auth)
+	n.RespReq = append(n.RespReq, in.Request)
+	n.Resp = append(n.Resp, in.Response)
+	n.RespErrs = append(n.RespErrs, in.OuterErr)
+
+	if in.Response != nil {
+		n.RespNonHMACKeys = in.NonHMACRespDataKeys
+		n.RespReqNonHMACKeys = in.NonHMACReqDataKeys
 	}
-	return ret
+
+	return n.RespErr
 }
 
-func (c *TestCluster) GetRecoveryKeys() [][]byte {
-	ret := make([][]byte, len(c.RecoveryKeys))
-	for i, k := range c.RecoveryKeys {
-		ret[i] = TestKeyCopy(k)
+func (n *NoopAudit) LogTestMessage(ctx context.Context, in *logical.LogInput, options map[string]string) error {
+	return nil
+}
+
+func (n *NoopAudit) Salt(ctx context.Context) (*salt.Salt, error) {
+	n.saltMutex.RLock()
+	if n.salt != nil {
+		defer n.saltMutex.RUnlock()
+		return n.salt, nil
+	}
+	n.saltMutex.RUnlock()
+	n.saltMutex.Lock()
+	defer n.saltMutex.Unlock()
+	if n.salt != nil {
+		return n.salt, nil
+	}
+	salt, err := salt.NewSalt(ctx, n.Config.SaltView, n.Config.SaltConfig)
+	if err != nil {
+		return nil, err
 	}
-	return ret
+	n.salt = salt
+	return salt, nil
 }
 
-func (c *TestCluster) NamedLogger(name string) log.Logger {
-	return c.Logger.Named(name)
+func (n *NoopAudit) GetHash(ctx context.Context, data string) (string, error) {
+	salt, err := n.Salt(ctx)
+	if err != nil {
+		return "", err
+	}
+	return salt.GetIdentifiedHMAC(data), nil
 }
 
-func (c *TestCluster) GetRootToken() string {
-	return c.RootToken
+func (n *NoopAudit) Reload(ctx context.Context) error {
+	return nil
 }
 
-func (c *TestClusterCore) Name() string {
-	return c.NodeID
+func (n *NoopAudit) Invalidate(ctx context.Context) {
+	n.saltMutex.Lock()
+	defer n.saltMutex.Unlock()
+	n.salt = nil
 }
 
-func (c *TestClusterCore) APIClient() *api.Client {
-	return c.Client
+// RetryUntil runs f until it returns a nil result or the timeout is reached.
+// If a nil result hasn't been obtained by timeout, calls t.Fatal.
+func RetryUntil(t testing.T, timeout time.Duration, f func() error) {
+	t.Helper()
+	deadline := time.Now().Add(timeout)
+	var err error
+	for time.Now().Before(deadline) {
+		if err = f(); err == nil {
+			return
+		}
+		time.Sleep(100 * time.Millisecond)
+	}
+	t.Fatalf("did not complete before deadline, err: %v", err)
 }
 
-var (
-	_ testcluster.VaultCluster     = &TestCluster{}
-	_ testcluster.VaultClusterNode = &TestClusterCore{}
-)
+// MakeTestPluginDir creates a temporary directory suitable for holding plugins.
+// This helper also resolves symlinks to make tests happy on OS X.
+func MakeTestPluginDir(t testing.T) (string, func(t testing.T)) {
+	if t != nil {
+		t.Helper()
+	}
+
+	dir, err := os.MkdirTemp("", "")
+	if err != nil {
+		if t == nil {
+			panic(err)
+		}
+		t.Fatal(err)
+	}
+
+	// OSX tempdir are /var, but actually symlinked to /private/var
+	dir, err = filepath.EvalSymlinks(dir)
+	if err != nil {
+		if t == nil {
+			panic(err)
+		}
+		t.Fatal(err)
+	}
+
+	return dir, func(t testing.T) {
+		if err := os.RemoveAll(dir); err != nil {
+			if t == nil {
+				panic(err)
+			}
+			t.Fatal(err)
+		}
+	}
+}
diff --git a/vault/testing_util.go b/vault/testing_util.go
index 8987325e873bd..30f524177baa2 100644
--- a/vault/testing_util.go
+++ b/vault/testing_util.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !enterprise
 
 package vault
diff --git a/vault/token_store.go b/vault/token_store.go
index e0aba9b67f167..f8e7b63b24167 100644
--- a/vault/token_store.go
+++ b/vault/token_store.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -138,17 +135,10 @@ var (
 )
 
 func (ts *TokenStore) paths() []*framework.Path {
-	const operationPrefixToken = "token"
-
 	p := []*framework.Path{
 		{
 			Pattern: "roles/?$",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: operationPrefixToken,
-				OperationSuffix: "roles",
-			},
-
 			Callbacks: map[logical.Operation]framework.OperationFunc{
 				logical.ListOperation: ts.tokenStoreRoleList,
 			},
@@ -160,11 +150,6 @@ func (ts *TokenStore) paths() []*framework.Path {
 		{
 			Pattern: "accessors/$",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: operationPrefixToken,
-				OperationSuffix: "accessors",
-			},
-
 			Callbacks: map[logical.Operation]framework.OperationFunc{
 				logical.ListOperation: ts.tokenStoreAccessorList,
 			},
@@ -176,12 +161,6 @@ func (ts *TokenStore) paths() []*framework.Path {
 		{
 			Pattern: "create-orphan$",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: operationPrefixToken,
-				OperationVerb:   "create",
-				OperationSuffix: "orphan",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"role_name": {
 					Type:        framework.TypeString,
@@ -257,12 +236,6 @@ func (ts *TokenStore) paths() []*framework.Path {
 		{
 			Pattern: "create/" + framework.GenericNameRegex("role_name"),
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: operationPrefixToken,
-				OperationVerb:   "create",
-				OperationSuffix: "against-role",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"role_name": {
 					Type:        framework.TypeString,
@@ -338,11 +311,6 @@ func (ts *TokenStore) paths() []*framework.Path {
 		{
 			Pattern: "create$",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: operationPrefixToken,
-				OperationVerb:   "create",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"display_name": {
 					Type:        framework.TypeString,
@@ -414,11 +382,6 @@ func (ts *TokenStore) paths() []*framework.Path {
 		{
 			Pattern: "lookup",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: operationPrefixToken,
-				OperationVerb:   "look-up",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"token": {
 					Type:        framework.TypeString,
@@ -426,16 +389,9 @@ func (ts *TokenStore) paths() []*framework.Path {
 				},
 			},
 
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.ReadOperation: &framework.PathOperation{
-					Callback: ts.handleLookup,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationSuffix: "self3", // avoid collision with lookup-self
-					},
-				},
-				logical.UpdateOperation: &framework.PathOperation{
-					Callback: ts.handleLookup,
-				},
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.ReadOperation:   ts.handleLookup,
+				logical.UpdateOperation: ts.handleLookup,
 			},
 
 			HelpSynopsis:    strings.TrimSpace(tokenLookupHelp),
@@ -445,12 +401,6 @@ func (ts *TokenStore) paths() []*framework.Path {
 		{
 			Pattern: "lookup-accessor",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: operationPrefixToken,
-				OperationVerb:   "look-up",
-				OperationSuffix: "accessor",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"accessor": {
 					Type:        framework.TypeString,
@@ -469,11 +419,6 @@ func (ts *TokenStore) paths() []*framework.Path {
 		{
 			Pattern: "lookup-self$",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: operationPrefixToken,
-				OperationVerb:   "look-up",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"token": {
 					Type:        framework.TypeString,
@@ -481,19 +426,9 @@ func (ts *TokenStore) paths() []*framework.Path {
 				},
 			},
 
-			Operations: map[logical.Operation]framework.OperationHandler{
-				logical.ReadOperation: &framework.PathOperation{
-					Callback: ts.handleLookupSelf,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationSuffix: "self",
-					},
-				},
-				logical.UpdateOperation: &framework.PathOperation{
-					Callback: ts.handleLookupSelf,
-					DisplayAttrs: &framework.DisplayAttributes{
-						OperationSuffix: "self2",
-					},
-				},
+			Callbacks: map[logical.Operation]framework.OperationFunc{
+				logical.UpdateOperation: ts.handleLookupSelf,
+				logical.ReadOperation:   ts.handleLookupSelf,
 			},
 
 			HelpSynopsis:    strings.TrimSpace(tokenLookupHelp),
@@ -503,12 +438,6 @@ func (ts *TokenStore) paths() []*framework.Path {
 		{
 			Pattern: "revoke-accessor",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: operationPrefixToken,
-				OperationVerb:   "revoke",
-				OperationSuffix: "accessor",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"accessor": {
 					Type:        framework.TypeString,
@@ -527,12 +456,6 @@ func (ts *TokenStore) paths() []*framework.Path {
 		{
 			Pattern: "revoke-self$",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: operationPrefixToken,
-				OperationVerb:   "revoke",
-				OperationSuffix: "self",
-			},
-
 			Callbacks: map[logical.Operation]framework.OperationFunc{
 				logical.UpdateOperation: ts.handleRevokeSelf,
 			},
@@ -544,11 +467,6 @@ func (ts *TokenStore) paths() []*framework.Path {
 		{
 			Pattern: "revoke",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: operationPrefixToken,
-				OperationVerb:   "revoke",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"token": {
 					Type:        framework.TypeString,
@@ -567,12 +485,6 @@ func (ts *TokenStore) paths() []*framework.Path {
 		{
 			Pattern: "revoke-orphan",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: operationPrefixToken,
-				OperationVerb:   "revoke",
-				OperationSuffix: "orphan",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"token": {
 					Type:        framework.TypeString,
@@ -591,12 +503,6 @@ func (ts *TokenStore) paths() []*framework.Path {
 		{
 			Pattern: "renew-accessor",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: operationPrefixToken,
-				OperationVerb:   "renew",
-				OperationSuffix: "accessor",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"accessor": {
 					Type:        framework.TypeString,
@@ -620,12 +526,6 @@ func (ts *TokenStore) paths() []*framework.Path {
 		{
 			Pattern: "renew-self$",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: operationPrefixToken,
-				OperationVerb:   "renew",
-				OperationSuffix: "self",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"token": {
 					Type:        framework.TypeString,
@@ -649,11 +549,6 @@ func (ts *TokenStore) paths() []*framework.Path {
 		{
 			Pattern: "renew",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: operationPrefixToken,
-				OperationVerb:   "renew",
-			},
-
 			Fields: map[string]*framework.FieldSchema{
 				"token": {
 					Type:        framework.TypeString,
@@ -677,11 +572,6 @@ func (ts *TokenStore) paths() []*framework.Path {
 		{
 			Pattern: "tidy$",
 
-			DisplayAttrs: &framework.DisplayAttributes{
-				OperationPrefix: operationPrefixToken,
-				OperationVerb:   "tidy",
-			},
-
 			Callbacks: map[logical.Operation]framework.OperationFunc{
 				logical.UpdateOperation: ts.handleTidy,
 			},
@@ -693,12 +583,6 @@ func (ts *TokenStore) paths() []*framework.Path {
 
 	rolesPath := &framework.Path{
 		Pattern: "roles/" + framework.GenericNameRegex("role_name"),
-
-		DisplayAttrs: &framework.DisplayAttributes{
-			OperationPrefix: operationPrefixToken,
-			OperationSuffix: "role",
-		},
-
 		Fields: map[string]*framework.FieldSchema{
 			"role_name": {
 				Type:        framework.TypeString,
@@ -1221,7 +1105,7 @@ func (ts *TokenStore) create(ctx context.Context, entry *logical.TokenEntry) err
 			entry.ID = fmt.Sprintf("%s.%s", entry.ID, tokenNS.ID)
 		}
 
-		if tokenNS.ID != namespace.RootNamespaceID || strings.HasPrefix(entry.ID, consts.ServiceTokenPrefix) || strings.HasPrefix(entry.ID, consts.LegacyServiceTokenPrefix) {
+		if tokenNS.ID != namespace.RootNamespaceID || strings.HasPrefix(entry.ID, consts.ServiceTokenPrefix) {
 			if entry.CubbyholeID == "" {
 				cubbyholeID, err := base62.Random(TokenLength)
 				if err != nil {
@@ -2183,6 +2067,25 @@ func (ts *TokenStore) revokeTreeInternal(ctx context.Context, id string) error {
 	return nil
 }
 
+func (c *Core) IsBatchTokenCreationRequest(ctx context.Context, path string) (bool, error) {
+	c.stateLock.RLock()
+	defer c.stateLock.RUnlock()
+
+	if c.tokenStore == nil {
+		return false, fmt.Errorf("no token store")
+	}
+
+	name := strings.TrimPrefix(path, "auth/token/create/")
+	roleEntry, err := c.tokenStore.tokenStoreRole(ctx, name)
+	if err != nil {
+		return false, err
+	}
+	if roleEntry == nil {
+		return false, fmt.Errorf("unknown role")
+	}
+	return roleEntry.TokenType == logical.TokenTypeBatch, nil
+}
+
 // handleCreateAgainstRole handles the auth/token/create path for a role
 func (ts *TokenStore) handleCreateAgainstRole(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
 	name := d.Get("role_name").(string)
@@ -2872,20 +2775,10 @@ func (ts *TokenStore) handleCreateCommon(ctx context.Context, req *logical.Reque
 			MountType:     mountValidationResp.Type,
 		}
 
-		// Create or fetch entity from entity alias. Note that we might be on a perf
-		// standby so a create would return a ReadOnly error which would cause an
-		// RPC-based redirect. That path doesn't register leases since the code that
-		// calls RegisterAuth is in the http layer... So be careful to catch and
-		// handle readonly ourselves.
+		// Create or fetch entity from entity alias
 		entity, _, err := ts.core.identityStore.CreateOrFetchEntity(ctx, alias)
 		if err != nil {
-			auth := &logical.Auth{
-				Alias: alias,
-			}
-			entity, _, err = possiblyForwardAliasCreation(ctx, ts.core, err, auth, entity)
-			if err != nil {
-				return nil, err
-			}
+			return nil, err
 		}
 		if entity == nil {
 			return nil, errors.New("failed to create or fetch entity from given entity alias")
@@ -3278,22 +3171,9 @@ func (ts *TokenStore) handleCreateCommon(ctx context.Context, req *logical.Reque
 		resp.AddWarning("Supplying a custom ID for the token uses the weaker SHA1 hashing instead of the more secure SHA2-256 HMAC for token obfuscation. SHA1 hashed tokens on the wire leads to less secure lookups.")
 	}
 
-	// check if we are perfStandby, and if so forward the service token
-	// creation to the active node
-	var roleName string
-	if role != nil {
-		roleName = role.Name
-	}
-	if te.Type == logical.TokenTypeService && ts.core.perfStandby {
-		forwardedTokenEntry, err := forwardCreateTokenRegisterAuth(ctx, ts.core, &te, roleName, renewable, periodToUse, explicitMaxTTLToUse)
-		if err != nil {
-			return logical.ErrorResponse(err.Error()), ErrInternalError
-		}
-		te = *forwardedTokenEntry
-	} else {
-		if err := ts.create(ctx, &te); err != nil {
-			return logical.ErrorResponse(err.Error()), logical.ErrInvalidRequest
-		}
+	// Create the token
+	if err := ts.create(ctx, &te); err != nil {
+		return logical.ErrorResponse(err.Error()), logical.ErrInvalidRequest
 	}
 
 	// Count the successful token creation.
@@ -3331,12 +3211,6 @@ func (ts *TokenStore) handleCreateCommon(ctx context.Context, req *logical.Reque
 		Orphan:         te.Parent == "",
 	}
 
-	// We have registered the auth at this point if the token is of service
-	// type and core is perfStandby.
-	if te.Type == logical.TokenTypeService && ts.core.perfStandby && te.ExternalID != "" {
-		resp.Auth.ClientToken = te.ExternalID
-	}
-
 	for _, p := range te.Policies {
 		policy, err := ts.core.policyStore.GetPolicy(ctx, p, PolicyTypeToken)
 		if err != nil {
diff --git a/vault/token_store_test.go b/vault/token_store_test.go
index 5495cdae3c7e0..5d5a2642f1404 100644
--- a/vault/token_store_test.go
+++ b/vault/token_store_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -53,22 +50,8 @@ func TestTokenStore_CreateOrphanResponse(t *testing.T) {
 	}
 }
 
-// TestTokenStore_CubbyholeDeletion tests that a token's cubbyhole
-// can be used and that the cubbyhole is removed after the token is revoked.
 func TestTokenStore_CubbyholeDeletion(t *testing.T) {
 	c, _, root := TestCoreUnsealed(t)
-	testTokenStore_CubbyholeDeletion(t, c, root)
-}
-
-// TestTokenStore_CubbyholeDeletionSSCTokensDisabled tests that a legacy token's
-// cubbyhole can be used, and that the cubbyhole is removed after the token is revoked.
-func TestTokenStore_CubbyholeDeletionSSCTokensDisabled(t *testing.T) {
-	c, _, root := TestCoreUnsealed(t)
-	c.disableSSCTokens = true
-	testTokenStore_CubbyholeDeletion(t, c, root)
-}
-
-func testTokenStore_CubbyholeDeletion(t *testing.T, c *Core, root string) {
 	ts := c.tokenStore
 
 	for i := 0; i < 10; i++ {
diff --git a/vault/token_store_util.go b/vault/token_store_util.go
index 85a3b9b26e69a..d87b0898600f5 100644
--- a/vault/token_store_util.go
+++ b/vault/token_store_util.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !enterprise
 
 package vault
diff --git a/vault/token_store_util_common.go b/vault/token_store_util_common.go
index b633de231cf5f..019c2b7e84011 100644
--- a/vault/token_store_util_common.go
+++ b/vault/token_store_util_common.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/tokens/token.pb.go b/vault/tokens/token.pb.go
index b8cbd283dd9d5..7c8c53392f2ad 100644
--- a/vault/tokens/token.pb.go
+++ b/vault/tokens/token.pb.go
@@ -1,10 +1,7 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc        v3.21.5
 // source: vault/tokens/token.proto
 
 package tokens
diff --git a/vault/tokens/token.proto b/vault/tokens/token.proto
index f64b124048faa..ae4364a3af7eb 100644
--- a/vault/tokens/token.proto
+++ b/vault/tokens/token.proto
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 syntax = "proto3";
 
 option go_package = "github.com/hashicorp/vault/vault/tokens";
diff --git a/vault/ui.go b/vault/ui.go
index c2343bca7cc1b..408c0e9acede2 100644
--- a/vault/ui.go
+++ b/vault/ui.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/ui_test.go b/vault/ui_test.go
index 8c787388bfffb..f2b2d148f2983 100644
--- a/vault/ui_test.go
+++ b/vault/ui_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/util.go b/vault/util.go
index 56bc8f08e211f..9e03afd292c2c 100644
--- a/vault/util.go
+++ b/vault/util.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
diff --git a/vault/util_test.go b/vault/util_test.go
index a48379a0d8824..70fe1d78d718a 100644
--- a/vault/util_test.go
+++ b/vault/util_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import "testing"
diff --git a/vault/vault_version_time.go b/vault/vault_version_time.go
index df12d14018ae6..4bcf3a97a8308 100644
--- a/vault/vault_version_time.go
+++ b/vault/vault_version_time.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import "time"
diff --git a/vault/version_store.go b/vault/version_store.go
index ec415bcf2d1b2..c10ea68a74fff 100644
--- a/vault/version_store.go
+++ b/vault/version_store.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -13,7 +10,7 @@ import (
 	semver "github.com/hashicorp/go-version"
 	"github.com/hashicorp/vault/sdk/helper/consts"
 	"github.com/hashicorp/vault/sdk/logical"
-	"github.com/hashicorp/vault/version"
+	"github.com/hashicorp/vault/sdk/version"
 )
 
 const (
diff --git a/vault/version_store_test.go b/vault/version_store_test.go
index 73a8a6869a014..823301c2b2720 100644
--- a/vault/version_store_test.go
+++ b/vault/version_store_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -8,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/vault/version"
+	"github.com/hashicorp/vault/sdk/version"
 )
 
 // TestVersionStore_StoreMultipleVaultVersions writes multiple versions of 1.9.0 and verifies that only
diff --git a/vault/wrapping.go b/vault/wrapping.go
index 69e002491185e..850d5ad063e61 100644
--- a/vault/wrapping.go
+++ b/vault/wrapping.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package vault
 
 import (
@@ -13,14 +10,14 @@ import (
 	"time"
 
 	"github.com/armon/go-metrics"
-	"github.com/go-jose/go-jose/v3"
-	"github.com/go-jose/go-jose/v3/jwt"
 	"github.com/hashicorp/vault/helper/metricsutil"
 	"github.com/hashicorp/vault/helper/namespace"
 	"github.com/hashicorp/vault/sdk/helper/certutil"
 	"github.com/hashicorp/vault/sdk/helper/consts"
 	"github.com/hashicorp/vault/sdk/helper/jsonutil"
 	"github.com/hashicorp/vault/sdk/logical"
+	"gopkg.in/square/go-jose.v2"
+	squarejwt "gopkg.in/square/go-jose.v2/jwt"
 )
 
 const (
@@ -194,16 +191,16 @@ DONELISTHANDLING:
 	switch resp.WrapInfo.Format {
 	case "jwt":
 		// Create the JWT
-		claims := jwt.Claims{
+		claims := squarejwt.Claims{
 			// Map the JWT ID to the token ID for ease of use
 			ID: te.ID,
 			// Set the issue time to the creation time
-			IssuedAt: jwt.NewNumericDate(creationTime),
+			IssuedAt: squarejwt.NewNumericDate(creationTime),
 			// Set the expiration to the TTL
-			Expiry: jwt.NewNumericDate(creationTime.Add(resp.WrapInfo.TTL)),
+			Expiry: squarejwt.NewNumericDate(creationTime.Add(resp.WrapInfo.TTL)),
 			// Set a reasonable not-before time; since unwrapping happens on this
 			// node we shouldn't have to worry much about drift
-			NotBefore: jwt.NewNumericDate(time.Now().Add(-5 * time.Second)),
+			NotBefore: squarejwt.NewNumericDate(time.Now().Add(-5 * time.Second)),
 		}
 		type privateClaims struct {
 			Accessor string `json:"accessor"`
@@ -225,7 +222,7 @@ DONELISTHANDLING:
 			c.logger.Error("failed to create JWT builder", "error", err)
 			return nil, ErrInternalError
 		}
-		ser, err := jwt.Signed(sig).Claims(claims).Claims(priClaims).CompactSerialize()
+		ser, err := squarejwt.Signed(sig).Claims(claims).Claims(priClaims).CompactSerialize()
 		if err != nil {
 			c.tokenStore.revokeOrphan(ctx, te.ID)
 			c.logger.Error("failed to serialize JWT", "error", err)
@@ -407,11 +404,11 @@ func (c *Core) validateWrappingToken(ctx context.Context, req *logical.Request)
 	// and then a dot.
 	if IsJWT(token) {
 		// Implement the jose library way
-		parsedJWT, err := jwt.ParseSigned(token)
+		parsedJWT, err := squarejwt.ParseSigned(token)
 		if err != nil {
 			return false, fmt.Errorf("wrapping token could not be parsed: %w", err)
 		}
-		var claims jwt.Claims
+		var claims squarejwt.Claims
 		allClaims := make(map[string]interface{})
 		if err = parsedJWT.Claims(&c.wrappingJWTKey.PublicKey, &claims, &allClaims); err != nil {
 			return false, fmt.Errorf("wrapping token signature could not be validated: %w", err)
diff --git a/vault/wrapping_util.go b/vault/wrapping_util.go
index 19e80eb452d36..fc947e65ad672 100644
--- a/vault/wrapping_util.go
+++ b/vault/wrapping_util.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !enterprise
 
 package vault
diff --git a/version/cgo.go b/version/cgo.go
deleted file mode 100644
index 89942e78c4851..0000000000000
--- a/version/cgo.go
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-//go:build cgo
-
-package version
-
-func init() {
-	CgoEnabled = true
-}
diff --git a/version/version_base.go b/version/version_base.go
deleted file mode 100644
index dcf7f0788b26a..0000000000000
--- a/version/version_base.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package version
-
-var (
-	// The git commit that was compiled. This will be filled in by the compiler.
-	GitCommit   string
-	GitDescribe string
-
-	// The compilation date. This will be filled in by the compiler.
-	BuildDate string
-
-	// Whether cgo is enabled or not; set at build time
-	CgoEnabled bool
-
-	Version           = "1.15.0"
-	VersionPrerelease = "beta1"
-	VersionMetadata   = ""
-)
diff --git a/website/.eslintrc.js b/website/.eslintrc.js
index eafa067f942ff..720d525e01275 100644
--- a/website/.eslintrc.js
+++ b/website/.eslintrc.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 module.exports = {
   ...require('@hashicorp/platform-cli/config/.eslintrc'),
   /* Specify overrides here */
diff --git a/website/.stylelintrc.js b/website/.stylelintrc.js
index 01d3cc17031ae..497a1c999eefb 100644
--- a/website/.stylelintrc.js
+++ b/website/.stylelintrc.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 module.exports = {
   ...require('@hashicorp/platform-cli/config/stylelint.config'),
   /* Specify overrides here */
diff --git a/website/Dockerfile b/website/Dockerfile
index b1057944240ad..f8cbf41594e5c 100644
--- a/website/Dockerfile
+++ b/website/Dockerfile
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 FROM docker.mirror.hashicorp.services/node:14.17.0-alpine
 RUN apk add --update --no-cache git make g++ automake autoconf libtool nasm libpng-dev
 
diff --git a/website/README.md b/website/README.md
index e18ee8cc38ff2..b4611af9d9811 100644
--- a/website/README.md
+++ b/website/README.md
@@ -40,9 +40,13 @@ The website can be run locally through node.js or [Docker](https://www.docker.co
 
 > **Note:** If you are using a text editor that uses a "safe write" save style such as **vim** or **goland**, this can cause issues with the live reload in development. If you turn off safe write, this should solve the problem. In vim, this can be done by running `:set backupcopy=yes`. In goland, search the settings for "safe write" and turn that setting off.
 
+| :warning: WARNING :warning:                                                                                                                                                                                                                                                                                                                                                     |
+| :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| If you've previously run the website successfully using either the Docker or Node.js approach but are now facing some issue then try `docker rmi $(docker images -aq hashicorp-vault-website-local) && make build-image && make website-local` or `rm -rf node_modules`; failing that consider cloning this repository again and re-attempting the steps anew in a clean clone. |
+
 ### With Docker
 
-Running the site locally is simple. Provided you have Docker installed, clone this repo, run `make`, and then visit `http://localhost:3000`.
+Running the site locally is simple. Provided you have the [latest version](https://docs.docker.com/engine/release-notes/) of Docker installed, clone this repo, run `make`, and then visit `http://localhost:3000`.
 
 The docker image is pre-built with all the website dependencies installed, which is what makes it so quick and simple, but also means if you need to change dependencies and test the changes within Docker, you'll need a new image. If this is something you need to do, you can run `make build-image` to generate a local Docker image with updated dependencies, then `make website-local` to use that image and preview.
 
@@ -86,16 +90,6 @@ The significant keys in the YAML frontmatter are:
 
 > ⚠️ If there is a need for a `/api/*` url on this website, the url will be changed to `/api-docs/*`, as the `api` folder is reserved by next.js.
 
-### Validating Content
-
-Content changes are automatically validated against a set of rules as part of the pull request process. If you want to run these checks locally to validate your content before comitting your changes, you can run the following command:
-
-```
-npm run content-check
-```
-
-If the validation fails, actionable error messages will be displayed to help you address detected issues.
-
 ### Creating New Pages
 
 There is currently a small bug with new page creation - if you create a new page and link it up via subnav data while the server is running, it will report an error saying the page was not found. This can be resolved by restarting the server.
@@ -104,12 +98,12 @@ There is currently a small bug with new page creation - if you create a new page
 
 There are several custom markdown plugins that are available by default that enhance [standard markdown](https://commonmark.org/) to fit our use cases. This set of plugins introduces a couple instances of custom syntax, and a couple specific pitfalls that are not present by default with markdown, detailed below:
 
-- > **Warning**: We are deprecating the current [paragraph alerts](https://github.com/hashicorp/remark-plugins/tree/master/plugins/paragraph-custom-alerts#paragraph-custom-alerts), in favor of the newer [MDX Inline Alert](#inline-alerts) components. The legacy paragraph alerts are represented by the symbols `~>`, `->`, `=>`, or `!>`.
+- If you see the symbols `~>`, `->`, `=>`, or `!>`, these represent [custom alerts](https://github.com/hashicorp/remark-plugins/tree/master/plugins/paragraph-custom-alerts#paragraph-custom-alerts). These render as colored boxes to draw the user's attention to some type of aside.
 - If you see `@include '/some/path.mdx'`, this is a [markdown include](https://github.com/hashicorp/remark-plugins/tree/master/plugins/include-markdown#include-markdown-plugin). It's worth noting as well that all includes resolve from `website/content/partials` by default, and that changes to partials will not live-reload the website.
 - If you see `# Headline ((#slug))`, this is an example of an [anchor link alias](https://github.com/hashicorp/remark-plugins/tree/je.anchor-link-adjustments/plugins/anchor-links#anchor-link-aliases). It adds an extra permalink to a headline for compatibility and is removed from the output.
 - Due to [automatically generated permalinks](https://github.com/hashicorp/remark-plugins/tree/je.anchor-link-adjustments/plugins/anchor-links#anchor-links), any text changes to _headlines_ or _list items that begin with inline code_ can and will break existing permalinks. Be very cautious when changing either of these two text items.
 
-  Headlines are fairly self-explanatory, but here's an example of how to list items that begin with inline code look.
+  Headlines are fairly self-explanatory, but here's an example of how list items that begin with inline code look.
 
   ```markdown
   - this is a normal list item
@@ -129,44 +123,6 @@ There are several custom markdown plugins that are available by default that enh
 
 A number of custom [mdx components](https://mdxjs.com/) are available for use within any `.mdx` file. Each one is documented below:
 
-#### Inline Alerts
-
-There are custom MDX components available to author alert data. [See the full documentation here](https://developer.hashicorp.com/swingset/components/mdxinlinealert). They render as colored boxes to draw the user's attention to some type of aside.
-
-```mdx
-## Alert types
-
-### Tip
-
-<Tip>
-  To provide general information to the user regarding the current context or
-  relevant actions.
-</Tip>
-
-### Highlight
-
-<Highlight>
-  To provide general or promotional information to the user prominently.
-</Highlight>
-
-### Note
-
-<Note>
-  To help users avoid an issue. Provide guidance and actions if possible.
-</Note>
-
-### Warning
-
-<Warning>
-  To indicate critical issues that need immediate action or help users
-  understand something critical.
-</Warning>
-
-## Title override prop
-
-<Note title="Hashiconf 2027">To provide general information.</Note>
-```
-
 #### Tabs
 
 The `Tabs` component creates tabbed content of any type, but is often used for code examples given in different languages. Here's an example of how it looks from the Vagrant documentation website:
@@ -519,9 +475,9 @@ It's also worth noting that it is possible to do glob-based redirects, for examp
 
 We support the following browsers targeting roughly the versions specified.
 
-| ![Chrome](https://raw.githubusercontent.com/alrra/browser-logos/main/src/chrome/chrome.svg) | ![Edge](https://raw.githubusercontent.com/alrra/browser-logos/main/src/edge/edge.svg) | ![Opera](https://raw.githubusercontent.com/alrra/browser-logos/main/src/opera/opera.svg) | ![Firefox](https://raw.githubusercontent.com/alrra/browser-logos/main/src/firefox/firefox.svg) | ![Safari](https://raw.githubusercontent.com/alrra/browser-logos/main/src/safari/safari.svg) |
-| ------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------- |
-| **Latest**                                                                                  | **Latest**                                                                            | **Latest**                                                                               | **Latest**                                                                                     | **Latest**                                                                                  |
+| ![Chrome](https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_24x24.png) | ![Firefox](https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefox_24x24.png) | ![Opera](https://raw.githubusercontent.com/alrra/browser-logos/master/src/opera/opera_24x24.png) | ![Safari](https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari/safari_24x24.png) | ![Internet Explorer](https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_24x24.png) |
+| --------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------ | --------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- |
+| **Latest**                                                                                          | **Latest**                                                                                             | **Latest**                                                                                       | **Latest**                                                                                          | **11+**                                                                                                    |
 
 <!-- END: browser-support -->
 
diff --git a/website/content/api-docs/auth/alicloud.mdx b/website/content/api-docs/auth/alicloud.mdx
index 124f91cce15fc..94289b58cad4e 100644
--- a/website/content/api-docs/auth/alicloud.mdx
+++ b/website/content/api-docs/auth/alicloud.mdx
@@ -8,13 +8,13 @@ description: This is the API documentation for the Vault AliCloud auth method.
 
 This is the API documentation for the Vault AliCloud auth method. For
 general information about the usage and operation of the AliCloud method, please
-see the [Vault AliCloud auth method documentation](/vault/docs/auth/alicloud).
+see the [Vault AliCloud auth method documentation](/docs/auth/alicloud).
 
 This documentation assumes the AliCloud auth method is mounted at the `/auth/alicloud`
 path in Vault. Since it is possible to enable auth methods at any location,
 please update your API calls accordingly.
 
-## Create/Update Role
+## Create Role
 
 Registers a role. Only entities using the role registered using this endpoint
 will be able to perform the login operation.
diff --git a/website/content/api-docs/auth/app-id.mdx b/website/content/api-docs/auth/app-id.mdx
index bca5712a3bb02..5d4e609da2733 100644
--- a/website/content/api-docs/auth/app-id.mdx
+++ b/website/content/api-docs/auth/app-id.mdx
@@ -11,7 +11,7 @@ Please use AppRole instead.
 
 This is the API documentation for the Vault App ID auth method. For
 general information about the usage and operation of the App ID method, please
-see the [Vault App ID method documentation](/vault/docs/auth/app-id).
+see the [Vault App ID method documentation](/docs/auth/app-id).
 
 This documentation assumes the App ID method is mounted at the `/auth/app-id`
 path in Vault. Since it is possible to enable auth methods at any location,
diff --git a/website/content/api-docs/auth/approle.mdx b/website/content/api-docs/auth/approle.mdx
index 24363a85965ec..8b70006101e0d 100644
--- a/website/content/api-docs/auth/approle.mdx
+++ b/website/content/api-docs/auth/approle.mdx
@@ -8,7 +8,7 @@ description: This is the API documentation for the Vault AppRole auth method.
 
 This is the API documentation for the Vault AppRole auth method. For
 general information about the usage and operation of the AppRole method, please
-see the [Vault AppRole method documentation](/vault/docs/auth/approle).
+see the [Vault AppRole method documentation](/docs/auth/approle).
 
 This documentation assumes the AppRole method is mounted at the `/auth/approle`
 path in Vault. Since it is possible to enable auth methods at any location,
@@ -113,7 +113,7 @@ Reads the properties of an existing AppRole.
 
 ### Parameters
 
-- `role_name` `(string: <required>)` - Name of the AppRole. Must be less than 4096 bytes.
+- `role_name` `(string: <required>)` - Name of the AppRole.
 
 ### Sample Request
 
@@ -156,7 +156,7 @@ Deletes an existing AppRole from the method.
 
 ### Parameters
 
-- `role_name` `(string: <required>)` - Name of the AppRole. Must be less than 4096 bytes.
+- `role_name` `(string: <required>)` - Name of the AppRole.
 
 ### Sample Request
 
@@ -177,7 +177,7 @@ Reads the RoleID of an existing AppRole.
 
 ### Parameters
 
-- `role_name` `(string: <required>)` - Name of the AppRole. Must be less than 4096 bytes.
+- `role_name` `(string: <required>)` - Name of the AppRole.
 
 ### Sample Request
 
@@ -213,7 +213,7 @@ Updates the RoleID of an existing AppRole to a custom value.
 
 ### Parameters
 
-- `role_name` `(string: <required>)` - Name of the AppRole. Must be less than 4096 bytes.
+- `role_name` `(string: <required>)` - Name of the AppRole.
 - `role_id` `(string: <required>)` - Value to be set as RoleID.
 
 ### Sample Payload
@@ -263,7 +263,7 @@ itself, and also to delete the SecretID from the AppRole.
 
 ### Parameters
 
-- `role_name` `(string: <required>)` - Name of the AppRole. Must be less than 4096 bytes.
+- `role_name` `(string: <required>)` - Name of the AppRole.
 - `metadata` `(string: "")` - Metadata to be tied to the SecretID. This should be
   a JSON-formatted string containing the metadata in key-value pairs. This
   metadata will be set on tokens issued with this SecretID, and is logged in
@@ -334,7 +334,7 @@ This includes the accessors for "custom" SecretIDs as well.
 
 ### Parameters
 
-- `role_name` `(string: <required>)` - Name of the AppRole. Must be less than 4096 bytes.
+- `role_name` `(string: <required>)` - Name of the AppRole.
 
 ### Sample Request
 
@@ -377,7 +377,7 @@ Reads out the properties of a SecretID.
 
 ### Parameters
 
-- `role_name` `(string: <required>)` - Name of the AppRole. Must be less than 4096 bytes.
+- `role_name` `(string: <required>)` - Name of the AppRole.
 - `secret_id` `(string: <required>)` - Secret ID attached to the role.
 
 ### Sample Payload
@@ -408,7 +408,7 @@ Destroy an AppRole secret ID.
 
 ### Parameters
 
-- `role_name` `(string: <required>)` - Name of the AppRole. Must be less than 4096 bytes.
+- `role_name` `(string: <required>)` - Name of the AppRole.
 - `secret_id` `(string: <required>)` - Secret ID attached to the role.
 
 ### Sample Payload
@@ -439,7 +439,7 @@ Reads out the properties of a SecretID.
 
 ### Parameters
 
-- `role_name` `(string: <required>)` - Name of the AppRole. Must be less than 4096 bytes.
+- `role_name` `(string: <required>)` - Name of the AppRole.
 - `secret_id_accessor` `(string: <required>)` - Secret ID accessor attached to the role.
 
 ### Sample Payload
@@ -470,7 +470,7 @@ Destroy an AppRole secret ID by its accessor.
 
 ### Parameters
 
-- `role_name` `(string: <required>)` - Name of the AppRole. Must be less than 4096 bytes.
+- `role_name` `(string: <required>)` - Name of the AppRole.
 - `secret_id_accessor` `(string: <required>)` - Secret ID accessor attached to the role.
 
 ### Sample Payload
@@ -502,7 +502,7 @@ Assigns a "custom" SecretID against an existing AppRole. This is used in the
 
 ### Parameters
 
-- `role_name` `(string: <required>)` - Name of the AppRole. Must be less than 4096 bytes.
+- `role_name` `(string: <required>)` - Name of the AppRole.
 - `secret_id` `(string: <required>)` - SecretID to be attached to the Role.
 - `metadata` `(string: "")` - Metadata to be tied to the SecretID. This should be
   a JSON-formatted string containing the metadata in key-value pairs. This
diff --git a/website/content/api-docs/auth/aws.mdx b/website/content/api-docs/auth/aws.mdx
index d7290d12fc323..ba80410651294 100644
--- a/website/content/api-docs/auth/aws.mdx
+++ b/website/content/api-docs/auth/aws.mdx
@@ -12,7 +12,7 @@ description: This is the API documentation for the Vault AWS auth method.
 
 This is the API documentation for the Vault AWS auth method. For
 general information about the usage and operation of the AWS method, please
-see the [Vault AWS method documentation](/vault/docs/auth/aws).
+see the [Vault AWS method documentation](/docs/auth/aws).
 
 This documentation assumes the AWS method is mounted at the `/auth/aws`
 path in Vault. Since it is possible to enable auth methods at any location,
@@ -188,7 +188,7 @@ The new access key Vault uses is returned by this operation.
 ## Configure Identity Integration
 
 This configures the way that Vault interacts with the
-[Identity](/vault/docs/secrets/identity) store. The default (as of Vault
+[Identity](/docs/secrets/identity) store. The default (as of Vault
 1.0.3) is `role_id` for both values.
 
 | Method | Path                        |
@@ -687,7 +687,7 @@ $ curl \
     http://127.0.0.1:8200/v1/auth/aws/config/tidy/roletag-denylist
 ```
 
-## Create/Update Role
+## Create Role
 
 Registers a role in the method. Only those instances or principals which
 are using the role registered using this endpoint, will be able to perform
diff --git a/website/content/api-docs/auth/azure.mdx b/website/content/api-docs/auth/azure.mdx
index 3b8caa836a8ee..e803193687199 100644
--- a/website/content/api-docs/auth/azure.mdx
+++ b/website/content/api-docs/auth/azure.mdx
@@ -10,7 +10,7 @@ description: |-
 
 This is the API documentation for the Vault Azure auth method
 plugin. To learn more about the usage and operation, see the
-[Vault Azure method documentation](/vault/docs/auth/azure).
+[Vault Azure method documentation](/docs/auth/azure).
 
 This documentation assumes the plugin method is mounted at the
 `/auth/azure` path in Vault. Since it is possible to enable auth methods
@@ -31,7 +31,7 @@ virtual machine.
 - `tenant_id` `(string: <required>)` - The tenant id for the Azure Active Directory organization.
   This value can also be provided with the `AZURE_TENANT_ID` environment variable.
 - `resource` `(string: <required>)` - The resource URL for the application registered in Azure Active Directory.
-  The value is expected to match the audience (`aud` claim) of the [JWT](/vault/api-docs/auth/azure#jwt)
+  The value is expected to match the audience (`aud` claim) of the [JWT](/api-docs/auth/azure#jwt)
   provided to the login API. See the [resource](https://docs.microsoft.com/en-us/azure/active-directory/managed-identities-azure-resources/how-to-use-vm-token#get-a-token-using-http)
   parameter for how the audience is set when requesting a JWT access token from the Azure Instance Metadata Service (IMDS) endpoint.
   This value can also be provided with the `AZURE_AD_RESOURCE` environment variable.
@@ -111,29 +111,7 @@ $ curl \
     https://127.0.0.1:8200/v1/auth/azure/config
 ```
 
-## Rotate Root
-
-This endpoint generates a new client secret for the root account defined in the config. The
-value generated will only be known by Vault.
-
-| Method | Path                 |
-| :----- | :------------------- |
-| `POST` | `/azure/rotate-root` |
-
-### Parameters
-
-There are no parameters to this operation.
-
-### Sample Request
-
-```shell-session
-$ curl \
-  --header "X-Vault-Token: ..." \
-  --request POST \
-  https://127.0.0.1:8200/v1/auth/azure/rotate-root
-```
-
-## Create/Update Role
+## Create Role
 
 Registers a role in the method. Role types have specific entities
 that can perform login operations against this endpoint. Constraints specific
@@ -302,14 +280,10 @@ entity and then authorizes the entity for the given role.
   metadata.
 - `vm_name` `(string: "")` - The virtual machine name for the machine that
   generated the MSI token. This information can be obtained through instance
-  metadata. If `vmss_name` is provided, this value is ignored.
+  metadata. If vmss_name is provided, this value is ignored.
 - `vmss_name` `(string: "")` - The virtual machine scale set name for the machine
   that generated the MSI token. This information can be obtained through instance
   metadata.
-- `resource_id` `(string: "")` - The fully qualified ID of the Azure resource that
-  generated the MSI token, including the resource name and resource type. Use
-  the format /subscriptions/{guid}/resourceGroups/{resource-group-name}/{resource-provider-namespace}/{resource-type}/{resource-name}.
-  If `vm_name` or `vmss_name` is provided, this value is ignored.
 
 ### Sample Payload
 
diff --git a/website/content/api-docs/auth/cert.mdx b/website/content/api-docs/auth/cert.mdx
index 82a72596cc3e0..9ac2f0a0c7de2 100644
--- a/website/content/api-docs/auth/cert.mdx
+++ b/website/content/api-docs/auth/cert.mdx
@@ -12,7 +12,7 @@ description: |-
 
 This is the API documentation for the Vault TLS Certificate authentication
 method. For general information about the usage and operation of the TLS
-Certificate method, please see the [Vault TLS Certificate method documentation](/vault/docs/auth/cert).
+Certificate method, please see the [Vault TLS Certificate method documentation](/docs/auth/cert).
 
 This documentation assumes the TLS Certificate method is mounted at the
 `/auth/cert` path in Vault. Since it is possible to enable auth methods at any
@@ -66,24 +66,6 @@ Sets a CA cert and associated parameters in a role name.
   will be added as metadata if they are present in the certificate. The
   metadata key will be the string consisting of the oid numbers separated
   by a dash (-) instead of a dot (.) to allow usage in ACL templates.
-- `ocsp_enabled` `(bool: false)` - If enabled, validate certificates' revocation
-  status using OCSP.
-- `ocsp_ca_certificates` `(string: "")` Any additional CA certificates needed to
-  verify OCSP responses.  Provided as base64 encoded PEM data.
-- `ocsp_servers_override` `(array: [])`: A comma-separated list of OCSP server
-  addresses.  If unset, the OCSP server is determined from the AuthorityInformationAccess
-  extension on the certificate being inspected.
-- `ocsp_fail_open` `(bool: false)` - If true and an OCSP response cannot be fetched
-  or is of an unknown status, the login will proceed as if the certificate has not
-  been revoked.
-- `ocsp_query_all_servers` `(bool: false)` - If set to true, rather than accepting
-  the first successful OCSP response, query all servers and consider the certificate
-  valid only if all servers agree.
-
-  ~> **Note**: When using Vault's PKI engine with Performance Replication clusters
-     as the OCSP provider, and without `unified_crls=true` set on the source mount
-     or when using cluster-local OCSP resolvers, we recommend enabling this option.
-
 - `display_name` `(string: "")` - The `display_name` to set on tokens issued
   when authenticating against this CA certificate. If not set, defaults to the
   name of the role.
@@ -210,40 +192,6 @@ $ curl \
     https://127.0.0.1:8200/v1/auth/cert/certs/cert1
 ```
 
-## List CRLs
-
-Lists configured certificate revocation lists.
-
-| Method | Path              |
-| :----- | :---------------- |
-| `LIST` | `/auth/cert/crls` |
-
-### Sample Request
-
-```shell-session
-$ curl \
-    --header "X-Vault-Token: ..." \
-    --request LIST \
-    --cacert vault-ca.pem \
-    https://127.0.0.1:8200/v1/auth/cert/crls
-```
-
-### Sample Response
-
-```json
-{
-  "auth": null,
-  "warnings": null,
-  "wrap_info": null,
-  "data": {
-    "keys": ["crl1", "crl2"]
-  },
-  "lease_duration": 0,
-  "renewable": false,
-  "lease_id": ""
-}
-```
-
 ## Create CRL
 
 Sets a named CRL.
@@ -354,8 +302,6 @@ Configuration options for the method.
 - `enable_identity_alias_metadata` `(boolean: false)` - If set, metadata of
   the certificate including the metadata corresponding to
   `allowed_metadata_extensions` will be stored in the alias
-- `ocsp_cache_size` `(int: 100)` - The size of the OCSP response LRU cache.  Note
-  that this cache is used for all configured certificates.
 
 ### Sample Payload
 
diff --git a/website/content/api-docs/auth/cf.mdx b/website/content/api-docs/auth/cf.mdx
index 4edfd0cfddb14..a8ddb0fe7185e 100644
--- a/website/content/api-docs/auth/cf.mdx
+++ b/website/content/api-docs/auth/cf.mdx
@@ -10,7 +10,7 @@ description: This is the API documentation for the Vault Cloud Foundry auth meth
 
 This is the API documentation for the Vault CF auth method. For
 general information about the usage and operation of the CF method, please
-see the [Vault CF method documentation](/vault/docs/auth/cf).
+see the [Vault CF method documentation](/docs/auth/cf).
 
 This documentation assumes the CF method is mounted at the `/auth/cf`
 path in Vault. Since it is possible to enable auth methods at any location,
@@ -21,7 +21,7 @@ please update your API calls accordingly.
 Configure the root CA certificate to be used for verifying instance identity
 certificates, and configure access to the CF API. For detailed instructions
 on how to obtain these values, please see the [Vault CF method
-documentation](/vault/docs/auth/cf).
+documentation](/docs/auth/cf).
 
 | Method | Path              |
 | :----- | ----------------- |
@@ -125,7 +125,7 @@ $ curl \
     http://127.0.0.1:8200/v1/auth/cf/config
 ```
 
-## Create/Update Role
+## Create Role
 
 Create a role in Vault granting a particular level of access to a particular group
 of CF instances. We recommend using the CF API or the CF CLI to gain the IDs you
diff --git a/website/content/api-docs/auth/gcp.mdx b/website/content/api-docs/auth/gcp.mdx
index 9c4d23c1b5f6d..7169d4d2b9f31 100644
--- a/website/content/api-docs/auth/gcp.mdx
+++ b/website/content/api-docs/auth/gcp.mdx
@@ -10,7 +10,7 @@ description: |-
 
 This is the API documentation for the Vault Google Cloud auth method. To learn
 more about the usage and operation, see the
-[Vault Google Cloud method documentation](/vault/docs/auth/gcp).
+[Vault Google Cloud method documentation](/docs/auth/gcp).
 
 This documentation assumes the plugin method is mounted at the
 `/auth/gcp` path in Vault. Since it is possible to enable auth methods
@@ -31,7 +31,7 @@ to confirm signed JWTs passed in during login.
 
 - `credentials` `(string: "")` - A JSON string containing the contents of a GCP
   service account credentials file. The service account associated with the credentials
-  file must have the following [permissions](/vault/docs/auth/gcp#required-gcp-permissions).
+  file must have the following [permissions](/docs/auth/gcp#required-gcp-permissions).
   If this value is empty, Vault will try to use [Application Default Credentials][gcp-adc]
   from the machine on which the Vault server is running.
 
@@ -128,7 +128,7 @@ $ curl \
 }
 ```
 
-## Create/Update Role
+## Create Role
 
 Registers a role in the method. Role types have specific entities
 that can perform login operations against this endpoint. Constraints specific
diff --git a/website/content/api-docs/auth/github.mdx b/website/content/api-docs/auth/github.mdx
index 6a83123e02582..26fb2170ab13f 100644
--- a/website/content/api-docs/auth/github.mdx
+++ b/website/content/api-docs/auth/github.mdx
@@ -8,7 +8,7 @@ description: This is the API documentation for the Vault GitHub auth method.
 
 This is the API documentation for the Vault GitHub auth method. For
 general information about the usage and operation of the GitHub method, please
-see the [Vault GitHub method documentation](/vault/docs/auth/github).
+see the [Vault GitHub method documentation](/docs/auth/github).
 
 This documentation assumes the GitHub method is enabled at the `/auth/github`
 path in Vault. Since it is possible to enable auth methods at any location,
diff --git a/website/content/api-docs/auth/jwt.mdx b/website/content/api-docs/auth/jwt.mdx
index 42b6c5a4ce5ad..dca6a72a886fb 100644
--- a/website/content/api-docs/auth/jwt.mdx
+++ b/website/content/api-docs/auth/jwt.mdx
@@ -12,7 +12,7 @@ description: |-
 
 This is the API documentation for the Vault JWT/OIDC auth method
 plugin. To learn more about the usage and operation, see the
-[Vault JWT/OIDC method documentation](/vault/docs/auth/jwt).
+[Vault JWT/OIDC method documentation](/docs/auth/jwt).
 
 This documentation assumes the plugin method is mounted at the
 `/auth/jwt` path in Vault. Since it is possible to enable auth methods
@@ -43,7 +43,7 @@ set.
 - `bound_issuer` `(string: <optional>)` - The value against which to match the `iss` claim in a JWT.
 - `jwt_supported_algs` `(comma-separated string, or array of strings: <optional>)` - A list of supported signing algorithms. Defaults to [RS256] for OIDC roles. Defaults to all [available algorithms](https://github.com/hashicorp/cap/blob/main/jwt/algs.go) for JWT roles.
 - `default_role` `(string: <optional>)` - The default role to use if none is provided during login.
-- `provider_config` `(map: <optional>)` - Configuration options for provider-specific handling. Providers with specific handling include: Azure, Google, SecureAuth, IBM ISAM. The options are described in each provider's section in [OIDC Provider Setup](/vault/docs/auth/jwt/oidc-providers).
+- `provider_config` `(map: <optional>)` - Configuration options for provider-specific handling. Providers with specific handling include: Azure, Google, SecureAuth. The options are described in each provider's section in [OIDC Provider Setup](/docs/auth/jwt/oidc-providers).
 - `namespace_in_state` `(bool: true)` - Pass namespace in the OIDC state parameter instead of as a separate query parameter. With this setting, the allowed redirect URL(s) in Vault and on the provider side should not contain a namespace query parameter. This means only one redirect URL entry needs to be maintained on the provider side for all vault namespaces that will be authenticating against it. Defaults to true for new configs.
 
 ### Sample Payload
@@ -95,7 +95,7 @@ $ curl \
 }
 ```
 
-## Create/Update Role
+## Create Role
 
 Registers a role in the method. Role types have specific entities
 that can perform login operations against this endpoint. Constraints specific
@@ -111,13 +111,12 @@ entities attempting to login. At least one of the bound values must be set.
 - `name` `(string: <required>)` - Name of the role.
 - `role_type` `(string: <optional>)` - Type of role, either "oidc" (default) or "jwt".
 - `bound_audiences` `(array: <optional>)` - List of `aud` claims to match against.
-  Any match is sufficient. For "jwt" roles, at least one of `bound_audiences`, `bound_subject`,
-  `bound_claims` or `token_bound_cidrs` is required. Optional for "oidc" roles.
+  Any match is sufficient. Required for "jwt" roles, optional for "oidc" roles.
 - `user_claim` `(string: <required>)` - The claim to use to uniquely identify
   the user; this will be used as the name for the Identity entity alias created
   due to a successful login. The claim value must be a string.
 - `user_claim_json_pointer` `(bool: false)` - Specifies if the `user_claim` value uses
-  [JSON pointer](/vault/docs/auth/jwt#claim-specifications-and-json-pointer) syntax for
+  [JSON pointer](/docs/auth/jwt#claim-specifications-and-json-pointer) syntax for
   referencing claims. By default, the `user_claim` value will not use JSON pointer.
 - `clock_skew_leeway` `(int or string: <optional>)` - The amount of leeway to add to all claims to
   account for clock skew, in seconds. Defaults to `60` seconds if set to `0` and can be disabled
@@ -135,7 +134,7 @@ entities attempting to login. At least one of the bound values must be set.
   claim matches this value.
 - `bound_claims` `(map: <optional>)` - If set, a map of claims (keys) to match against respective claim values (values).
   The expected value may be a single string or a list of strings. The interpretation of the bound
-  claim values is configured with `bound_claims_type`. Keys support [JSON pointer](/vault/docs/auth/jwt#claim-specifications-and-json-pointer)
+  claim values is configured with `bound_claims_type`. Keys support [JSON pointer](/docs/auth/jwt#claim-specifications-and-json-pointer)
   syntax for referencing claims.
 - `bound_claims_type` `(string: "string")` - Configures the interpretation of the bound_claims values.
   If `"string"` (the default), the values will treated as string literals and must match exactly.
@@ -144,10 +143,10 @@ entities attempting to login. At least one of the bound values must be set.
 - `groups_claim` `(string: <optional>)` - The claim to use to uniquely identify
   the set of groups to which the user belongs; this will be used as the names
   for the Identity group aliases created due to a successful login. The claim
-  value must be a list of strings. Supports [JSON pointer](/vault/docs/auth/jwt#claim-specifications-and-json-pointer)
+  value must be a list of strings. Supports [JSON pointer](/docs/auth/jwt#claim-specifications-and-json-pointer)
   syntax for referencing claims.
 - `claim_mappings` `(map: <optional>)` - If set, a map of claims (keys) to be copied to
-  specified metadata fields (values). Keys support [JSON pointer](/vault/docs/auth/jwt#claim-specifications-and-json-pointer)
+  specified metadata fields (values). Keys support [JSON pointer](/docs/auth/jwt#claim-specifications-and-json-pointer)
   syntax for referencing claims.
 - `oidc_scopes` `(list: <optional>)` - If set, a list of OIDC scopes to be used with an OIDC role.
   The standard scope "openid" is automatically included and need not be specified.
@@ -306,10 +305,10 @@ Obtain an authorization URL from Vault to start an OIDC login flow.
 - `redirect_uri` `(string: <required>)` - Path to the callback to complete the login. This will be
   of the form, "https&#x3A;//.../oidc/callback" where the leading portion is dependent on your Vault
   server location, port, and the mount of the JWT plugin. This must be configured with Vault and the
-  provider. See [Redirect URIs](/vault/docs/auth/jwt#redirect-uris) for more information.
+  provider. See [Redirect URIs](/docs/auth/jwt#redirect-uris) for more information.
 - `client_nonce` `(string: <optional>)` - Optional client-provided nonce that
   must match the `client_nonce` value provided during a subsequent request to the
-  [callback](/vault/api-docs/auth/jwt#oidc-callback) API.
+  [callback](/api-docs/auth/jwt#oidc-callback) API.
 
 ### Sample Payload
 
@@ -360,7 +359,7 @@ against any bound claims, and if valid a Vault token will be returned.
   an ID token.
 - `client_nonce` `(string: <optional>)` - Optional client-provided nonce that must
   match the `client_nonce` value provided during the prior request to the
-  [auth_url](/vault/api-docs/auth/jwt#oidc-authorization-url-request) API.
+  [auth_url](/api-docs/auth/jwt#oidc-authorization-url-request) API.
 
 ### Sample Request
 
diff --git a/website/content/api-docs/auth/kerberos.mdx b/website/content/api-docs/auth/kerberos.mdx
index 52468eb0c8f96..e5ad3dafa4144 100644
--- a/website/content/api-docs/auth/kerberos.mdx
+++ b/website/content/api-docs/auth/kerberos.mdx
@@ -10,7 +10,7 @@ description: This is the API documentation for the Vault Kerberos auth method pl
 
 This is the API documentation for the Vault Kerberos auth method plugin. To
 learn more about the usage and operation, see the
-[Vault Kerberos auth method](/vault/docs/auth/kerberos).
+[Vault Kerberos auth method](/docs/auth/kerberos).
 
 This documentation assumes the Kerberos auth method is mounted at the
 `auth/kerberos` path in Vault. Since it is possible to enable auth methods at
diff --git a/website/content/api-docs/auth/kubernetes.mdx b/website/content/api-docs/auth/kubernetes.mdx
index 930540176bdf5..88be94c96de61 100644
--- a/website/content/api-docs/auth/kubernetes.mdx
+++ b/website/content/api-docs/auth/kubernetes.mdx
@@ -10,7 +10,7 @@ description: This is the API documentation for the Vault Kubernetes auth method
 
 This is the API documentation for the Vault Kubernetes auth method plugin. To
 learn more about the usage and operation, see the
-[Vault Kubernetes auth method](/vault/docs/auth/kubernetes).
+[Vault Kubernetes auth method](/docs/auth/kubernetes).
 
 This documentation assumes the Kubernetes method is mounted at the
 `/auth/kubernetes` path in Vault. Since it is possible to enable auth methods at
@@ -50,7 +50,7 @@ access the Kubernetes API.
 - `disable_iss_validation` `(bool: true)` **Deprecated** Disable JWT issuer validation. Allows to skip ISS validation.
 
 - `issuer` `(string: "")` **Deprecated** Optional JWT issuer. If no issuer is specified, then this plugin will use `kubernetes/serviceaccount` as the default issuer.
-See [these instructions](/vault/docs/auth/kubernetes#discovering-the-service-account-issuer) for looking up the issuer for a given Kubernetes cluster.
+See [these instructions](/docs/auth/kubernetes#discovering-the-service-account-issuer) for looking up the issuer for a given Kubernetes cluster.
 
 ### Caveats
 
@@ -112,7 +112,7 @@ $ curl \
 }
 ```
 
-## Create/Update Role
+## Create Role
 
 Registers a role in the auth method. Role types have specific entities
 that can perform login operations against this endpoint. Constraints specific
@@ -138,7 +138,7 @@ entities attempting to login.
   While it is strongly advised that you use `serviceaccount_uid`, you may also use `serviceaccount_name` in cases where
   you want to set the alias ahead of time, and the risks are mitigated or otherwise acceptable given your use case.
   It is very important to limit who is able to delete/create service accounts within a given cluster.
-  See the [Create an Entity Alias](/vault/api-docs/secret/identity/entity-alias#create-an-entity-alias) document
+  See the [Create an Entity Alias](/api-docs/secret/identity/entity-alias#create-an-entity-alias) document
   which further expands on the potential security implications mentioned above.
 
 @include 'tokenfields.mdx'
diff --git a/website/content/api-docs/auth/ldap.mdx b/website/content/api-docs/auth/ldap.mdx
index ba514d2f3e5fa..0ad5fd920ff07 100644
--- a/website/content/api-docs/auth/ldap.mdx
+++ b/website/content/api-docs/auth/ldap.mdx
@@ -10,7 +10,7 @@ description: This is the API documentation for the Vault LDAP auth method.
 
 This is the API documentation for the Vault LDAP auth method. For
 general information about the usage and operation of the LDAP method, please
-see the [Vault LDAP method documentation](/vault/docs/auth/ldap).
+see the [Vault LDAP method documentation](/docs/auth/ldap).
 
 This documentation assumes the LDAP method is mounted at the `/auth/ldap`
 path in Vault. Since it is possible to enable auth methods at any location,
@@ -94,9 +94,6 @@ This endpoint configures the LDAP auth method.
   returning _user_ objects, use: `memberOf`. The default is `cn`.
 - `username_as_alias` `(bool: false)` - If set to true, forces the auth method
   to use the username passed by the user as the alias name.
-- `dereference_aliases` `(string: never)` - When aliases should be dereferenced
-  on search operations. Accepted values are 'never', 'finding', 'searching',
-  'always'. Defaults to 'never'.
 - `max_page_size` `(int: 0)` - If set to a value greater than 0, the LDAP
   backend will use the LDAP server's paged search control to request pages of
   up to the given size. This can be used to avoid hitting the LDAP server's
diff --git a/website/content/api-docs/auth/oci.mdx b/website/content/api-docs/auth/oci.mdx
index 64ddc1ec7cf49..1b1185b6511db 100644
--- a/website/content/api-docs/auth/oci.mdx
+++ b/website/content/api-docs/auth/oci.mdx
@@ -8,7 +8,7 @@ description: This is the API documentation for the Vault OCI auth method plugin.
 
 This is the API documentation for the Vault OCI auth method plugin. To
 learn more about the usage and operation, see the
-[Vault OCI auth method](/vault/docs/auth/oci).
+[Vault OCI auth method](/docs/auth/oci).
 
 This documentation assumes the OCI method is mounted at the
 `/auth/oci` path in Vault. Since it is possible to enable auth methods at
@@ -70,7 +70,7 @@ $ curl \
 }
 ```
 
-## Create/Update Role
+## Create Role
 
 Create a Vault administrator role in the OCI Auth method.
 
diff --git a/website/content/api-docs/auth/okta.mdx b/website/content/api-docs/auth/okta.mdx
index b3dda440fd6ed..a2d15430118a9 100644
--- a/website/content/api-docs/auth/okta.mdx
+++ b/website/content/api-docs/auth/okta.mdx
@@ -8,7 +8,7 @@ description: This is the API documentation for the Vault Okta auth method.
 
 This is the API documentation for the Vault Okta auth method. For
 general information about the usage and operation of the Okta method, please
-see the [Vault Okta method documentation](/vault/docs/auth/okta).
+see the [Vault Okta method documentation](/docs/auth/okta).
 
 This documentation assumes the Okta method is mounted at the `/auth/okta`
 path in Vault. Since it is possible to enable auth methods at any location,
diff --git a/website/content/api-docs/auth/radius.mdx b/website/content/api-docs/auth/radius.mdx
index ec139ceac4c74..91e370c4b4835 100644
--- a/website/content/api-docs/auth/radius.mdx
+++ b/website/content/api-docs/auth/radius.mdx
@@ -8,7 +8,7 @@ description: This is the API documentation for the Vault RADIUS auth method.
 
 This is the API documentation for the Vault RADIUS auth method. For
 general information about the usage and operation of the RADIUS method, please
-see the [Vault RADIUS method documentation](/vault/docs/auth/radius).
+see the [Vault RADIUS method documentation](/docs/auth/radius).
 
 This documentation assumes the RADIUS method is mounted at the `/auth/radius`
 path in Vault. Since it is possible to enable auth methods at any location,
diff --git a/website/content/api-docs/auth/token.mdx b/website/content/api-docs/auth/token.mdx
index 7b876f055ab68..1abe2cdb2b759 100644
--- a/website/content/api-docs/auth/token.mdx
+++ b/website/content/api-docs/auth/token.mdx
@@ -8,7 +8,7 @@ description: This is the API documentation for the Vault token auth method.
 
 This is the API documentation for the Vault token auth method. For
 general information about the usage and operation of the token method, please
-see the [Vault Token method documentation](/vault/docs/auth/token).
+see the [Vault Token method documentation](/docs/auth/token).
 
 ## List Accessors
 
@@ -88,7 +88,7 @@ during this call.
 - `lease` `(string: "")` - DEPRECATED; use `ttl` instead
 - `ttl` `(string: "")` - The TTL period of the token, provided as "1h", where
   hour is the largest suffix. If not provided, the token is valid for the
-  [default lease TTL](/vault/docs/configuration), or indefinitely if the
+  [default lease TTL](/docs/configuration), or indefinitely if the
   root policy is used.
 - `type` `(string: "")` - The token type. Can be "batch" or "service". Defaults
   to the type specified by the role configuration named by `role_name`.
@@ -800,7 +800,7 @@ be cached. Listing the `/auth/token/accessors` endpoint is a good way to get
 some sense of the potential impact: tidy does this and more, so if this call creates problems
 for your cluster, it would be wise to give Vault more resources before attempting
 tidy. Note that the request may time out depending on
-[max duration](/vault/docs/configuration#default_max_request_duration)
+[max duration](https://www.vaultproject.io/docs/configuration#default_max_request_duration)
 and your client's timeout configuration, make sure to allow it run to completion
 to properly judge the impact.
 
diff --git a/website/content/api-docs/auth/userpass.mdx b/website/content/api-docs/auth/userpass.mdx
index 737c121c7ad91..fb95dc93be6ef 100644
--- a/website/content/api-docs/auth/userpass.mdx
+++ b/website/content/api-docs/auth/userpass.mdx
@@ -10,7 +10,7 @@ description: |-
 
 This is the API documentation for the Vault Username & Password auth method. For
 general information about the usage and operation of the Username and Password method, please
-see the [Vault Userpass method documentation](/vault/docs/auth/userpass).
+see the [Vault Userpass method documentation](/docs/auth/userpass).
 
 This documentation assumes the Username & Password method is mounted at the `/auth/userpass`
 path in Vault. Since it is possible to enable auth methods at any location,
diff --git a/website/content/api-docs/index.mdx b/website/content/api-docs/index.mdx
index 156b03c7d48b6..387c3ef5251aa 100644
--- a/website/content/api-docs/index.mdx
+++ b/website/content/api-docs/index.mdx
@@ -6,8 +6,8 @@ description: Vault has an HTTP API that can be used to control every aspect of V
 
 # HTTP API
 
-The Vault HTTP API gives you full access to Vault using [REST like HTTP verbs](https://en.wikipedia.org/wiki/Representational_state_transfer).
-Every aspect of Vault can be controlled using the APIs. The Vault CLI uses the
+The Vault HTTP API gives you full access to Vault using [REST like HTTP verbs](https://en.wikipedia.org/wiki/Representational_state_transfer). 
+Every aspect of Vault can be controlled using the APIs. The Vault CLI uses the 
 HTTP API to access Vault similar to all other consumers.
 
 All API routes are prefixed with `/v1/`.
@@ -36,7 +36,7 @@ either the `X-Vault-Token` HTTP Header or as `Authorization` HTTP Header using
 the `Bearer <token>` scheme.
 
 Otherwise, a client token can be retrieved using an [authentication
-engine](/vault/docs/auth).
+engine](/docs/auth).
 
 Each auth method has one or more unauthenticated login endpoints. These
 endpoints can be reached without any authentication, and are used for
@@ -49,21 +49,21 @@ client or passed via the `X-Vault-Token` or `Authorization` header for future re
 
 ## Parameter restrictions
 
-Several Vault APIs require specifying path parameters. The path parameter cannot end
+Several Vault APIs require specifying path parameters. The path parameter cannot end 
 in periods. Otherwise, Vault will return a 404 unsupported path error.
 
 ## Namespaces
 
-When using [Namespaces](/vault/docs/enterprise/namespaces) the final path of the API
-request is relative to the `X-Vault-Namespace` header. For instance, if a
-request URI is `secret/foo` with the `X-Vault-Namespace` header set as `ns1/ns2/`,
+When using [Namespaces](/docs/enterprise/namespaces) the final path of the API 
+request is relative to the `X-Vault-Namespace` header. For instance, if a 
+request URI is `secret/foo` with the `X-Vault-Namespace` header set as `ns1/ns2/`, 
 then the resulting request path to Vault will be `ns1/ns2/secret/foo`.
 
-Note that it is semantically equivalent to use the full path rather than the
-`X-Vault-Namespace` header, Vault will match the corresponding namespace
-based on correlating user input. Similar path results may be achieved if
-`X-Vault-Namespace` is set to `ns1/` with the request path of `ns2/secret/foo`
-as well, or otherwise if `X-Vault-Namespace` is omitted entirely and instead a
+Note that it is semantically equivalent to use the full path rather than the 
+`X-Vault-Namespace` header, Vault will match the corresponding namespace 
+based on correlating user input. Similar path results may be achieved if 
+`X-Vault-Namespace` is set to `ns1/` with the request path of `ns2/secret/foo` 
+as well, or otherwise if `X-Vault-Namespace` is omitted entirely and instead a 
 complete path is provided such as: `ns1/ns2/secret/foo`.
 
 For example, the following two commands result in equivalent requests:
@@ -85,13 +85,13 @@ $ curl \
 
 ## API Operations
 
-Typically the request data, body and response data to and from Vault is in JSON.
-Vault sets the `Content-Type` header appropriately with its response and does
+Typically the request data, body and response data to and from Vault is in JSON. 
+Vault sets the `Content-Type` header appropriately with its response and does 
 not require it from the clients request.
 
-The demonstration below uses the [`KVv1` secrets engine](/vault/api-docs/secret/kv/kv-v1), which is a
-simple Key/Value store. Please read [the API documentation of KV secret engines](/vault/api-docs/secret/kv)
-for details of `KVv1` compared to `KVv2` and how they differ in their URI paths
+The demonstration below uses the [`KVv1` secrets engine](/api/secret/kv/kv-v1), which is a 
+simple Key/Value store. Please read [the API documentation of KV secret engines](/api/secret/kv) 
+for details of `KVv1` compared to `KVv2` and how they differ in their URI paths 
 as well as the features available in version 2 of the KV secrets engine.
 
 For `KVv1`, reading a secret using the HTTP API is done by issuing a GET:
@@ -112,14 +112,14 @@ $ curl \
     http://127.0.0.1:8200/v1/secret/foo
 ```
 
-A few endpoints consume calls with `GET` query string parameters, but only if
-those parameters are not sensitive, especially since  some load balancers will
-be able log these. Most endpoints that accept `POST` query string parameters
+A few endpoints consume calls with `GET` query string parameters, but only if 
+those parameters are not sensitive, especially since  some load balancers will 
+be able log these. Most endpoints that accept `POST` query string parameters 
 expect those parameters in the request body.
 
 You can list secrets as well. To do this, either issue a `GET` with the query
-string parameter `list=true`, or you use the `LIST` HTTP verb. For the `kv` secrets
-engine, listing is allowed on directories only, which returns the keys at the
+string parameter `list=true`, or you use the `LIST` HTTP verb. For the `kv` secrets 
+engine, listing is allowed on directories only, which returns the keys at the 
 requested path:
 
 ```shell-session
@@ -163,7 +163,7 @@ discover whether an operation is actually a create or update operation based on
 the data already stored within Vault. This makes permission management via ACLs
 more flexible.
 
-A [KVv2 example](/vault/api-docs/secret/kv/kv-v2#sample-request-3) for the engine path of `secret` requires that URI is
+A [KVv2 example](api/secret/kv/kv-v2#sample-request-3) for the engine path of `secret` requires that URI is 
 appended with ***`data/`***  prior to the secret name (`baz`) such as:
 
 ```shell-session
@@ -179,7 +179,7 @@ For more examples, please look at the Vault API client.
 
 ## The `X-Vault-Request` Header
 
-Requests that are sent to a [Vault Proxy][proxy] that is configured to use the
+Requests that are sent to a [Vault Agent][agent] that is configured to use the
 `require_request_header` option must include the `X-Vault-Request` header
 entry, e.g.:
 
@@ -201,12 +201,12 @@ addition, the Vault SDK always adds this header to every request.
 
 To retrieve the help for any API within Vault, including mounted engines, auth
 methods, etc. then append `?help=1` to any URL. If you have valid permission to
-access the path, then the help text will be returned as a markdown-formatted block
+access the path, then the help text will be returned as a markdown-formatted block 
 in the `help` attribute of the response.
 
-Additionally, with the [OpenAPI generation](/vault/api-docs/system/internal-specs-openapi) in Vault, you will get back a small
-OpenAPI document in the `openapi` attribute. This document is relevant for the
-path you're looking up and any paths under it - also note paths in the OpenAPI
+Additionally, with the [OpenAPI generation](/api/system/internal-specs-openapi) in Vault, you will get back a small
+OpenAPI document in the `openapi` attribute. This document is relevant for the 
+path you're looking up and any paths under it - also note paths in the OpenAPI 
 document are relative to the initial path queried.
 
 
@@ -274,7 +274,7 @@ This structure will be returned for any HTTP status greater than or equal to 400
 ## HTTP Status Codes
 
 The following HTTP status codes are used throughout the API. Vault tries to
-adhere to these whenever possible, but in case it doesn't -- then feel free to
+adhere to these whenever possible, but in case it doesn't -- then feel free to 
 [raise a bug](https://github.com/hashicorp/vault/issues) for our attention!
 
 ~> _Note_: Applications should be prepared to accept both `200` and `204` as
@@ -297,7 +297,7 @@ warnings are generated during the operation.
 - `412` - Precondition failed.  Returned on Enterprise when a request can't be
   processed yet due to some missing eventually consistent data.  Should be retried,
   perhaps with a little backoff.
-  See [Vault Eventual Consistency](/vault/docs/enterprise/consistency).
+  See [Vault Eventual Consistency](/docs/enterprise/consistency).
 - `429` - Default return code for health status of standby nodes. This will
   likely change in the future.
 - `473` - Default return code for health status of performance standby nodes.
@@ -314,4 +314,4 @@ A maximum request size of 32MB is imposed to prevent a denial of service attack
 with arbitrarily large requests; this can be tuned per `listener` block in
 Vault's server configuration file.
 
-[proxy]: /vault/docs/agent-and-proxy/proxy#listener-stanza
+[agent]: /docs/agent#listener-stanza
diff --git a/website/content/api-docs/libraries.mdx b/website/content/api-docs/libraries.mdx
index 18260d48f0575..9cf5fcb173894 100644
--- a/website/content/api-docs/libraries.mdx
+++ b/website/content/api-docs/libraries.mdx
@@ -11,7 +11,7 @@ description: >-
 The programming libraries listed on this page can be used to consume the API more conveniently.
 Some are officially maintained while others are provided by the community.
 
-For a step-by-step walkthrough on using these client libraries, see the [developer quickstart](/vault/docs/get-started/developer-qs).
+For a step-by-step walkthrough on using these client libraries, see the [developer quickstart](https://www.vaultproject.io/docs/get-started/developer-qs).
 For copy-pastable code examples, see the [vault-examples](https://github.com/hashicorp/vault-examples) repo.
 
 ## Official
@@ -113,7 +113,7 @@ $ stack install gothic
 ### Java
 
 - [Spring Vault](https://github.com/spring-projects/spring-vault)
-- [vault-java-driver](https://github.com/jopenlibs/vault-java-driver)
+- [vault-java-driver](https://github.com/BetterCloud/vault-java-driver)
 
 ### Kotlin
 
@@ -181,6 +181,12 @@ Install-Module Zyborg.Vault
 $ pip install hvac
 ```
 
+- [Async-HVAC](https://github.com/Aloomaio/async-hvac)
+
+```shell-session
+$ pip install async-hvac
+```
+
 ### R
 
 - [vaultr](https://github.com/vimc/vaultr)
diff --git a/website/content/api-docs/secret/ad.mdx b/website/content/api-docs/secret/ad.mdx
index 7c76bdf5833af..cac8265a384ed 100644
--- a/website/content/api-docs/secret/ad.mdx
+++ b/website/content/api-docs/secret/ad.mdx
@@ -6,13 +6,11 @@ description: This is the API documentation for the Vault Active Directory secret
 
 # Active Directory Secrets Engine (API)
 
-@include 'ad-secrets-deprecation.mdx'
-
 @include 'x509-sha1-deprecation.mdx'
 
 This is the API documentation for the Vault AD secrets engine. For general
 information about the usage and operation of the AD secrets engine, please see
-the [Vault Active Directory documentation](/vault/docs/secrets/ad).
+the [Vault Active Directory documentation](/docs/secrets/ad).
 
 This documentation assumes the AD secrets engine is enabled at the `/ad` path
 in Vault. Since it is possible to enable secrets engines at any location, please
@@ -28,7 +26,7 @@ The `config` endpoint configures the LDAP connection and binding parameters, as
   be rotated the next time it's requested.
 - `max_ttl` `(int: "")` - The maximum password time-to-live in seconds. No role will be allowed to set a
   custom ttl greater than the `max_ttl`.
-- `password_policy` `(string: "")` - Name of the [password policy](/vault/docs/concepts/password-policies) to use to
+- `password_policy` `(string: "")` - Name of the [password policy](/docs/concepts/password-policies) to use to
   generate passwords from. Mutually exclusive with `length` and `formatter`.
 
 **Deprecated parameters**:
@@ -260,10 +258,10 @@ The `library` endpoint configures the sets of service accounts that Vault will o
   service accounts must already exist in Active Directory.
 - `ttl` (duration: "24h", optional): The maximum amount of time a single check-out lasts before Vault
   automatically checks it back in. Defaults to 24 hours. Setting it to zero reflects an unlimited lending period.
-  Uses [duration format strings](/vault/docs/concepts/duration-format).
+  Uses [duration format strings](/docs/concepts/duration-format).
 - `max_ttl` (duration: "24h", optional): The maximum amount of time a check-out last with renewal before Vault
   automatically checks it back in. Defaults to 24 hours. Setting it to zero reflects an unlimited lending period.
-  Uses [duration format strings](/vault/docs/concepts/duration-format).
+  Uses [duration format strings](/docs/concepts/duration-format).
 - `disable_check_in_enforcement` (bool: false, optional): Disable enforcing that service accounts must be
   checked in by the entity or client token that checked them out. Defaults to false.
 
@@ -328,7 +326,7 @@ Returns a `200` if a credential is available, and a `400` if no credential is av
 - `ttl` (duration: "", optional): The maximum amount of time a check-out lasts before Vault
   automatically checks it back in. Setting it to zero reflects an unlimited lending period.
   Defaults to the set's `ttl`. If the requested `ttl` is higher than the set's, the set's will be used.
-  Uses [duration format strings](/vault/docs/concepts/duration-format).
+  Uses [duration format strings](/docs/concepts/duration-format).
 
 | Method | Path                              |
 | :----- | :-------------------------------- |
diff --git a/website/content/api-docs/secret/alicloud.mdx b/website/content/api-docs/secret/alicloud.mdx
index 14630697bcfb1..688cbcb721589 100644
--- a/website/content/api-docs/secret/alicloud.mdx
+++ b/website/content/api-docs/secret/alicloud.mdx
@@ -8,7 +8,7 @@ description: This is the API documentation for the Vault AliCloud secrets engine
 
 This is the API documentation for the Vault AliCloud secrets engine. For general
 information about the usage and operation of the AliCloud secrets engine, please see
-the [Vault AliCloud documentation](/vault/docs/secrets/alicloud).
+the [Vault AliCloud documentation](/docs/secrets/alicloud).
 
 This documentation assumes the AliCloud secrets engine is enabled at the `/alicloud` path
 in Vault. Since it is possible to enable secrets engines at any location, please
@@ -28,7 +28,7 @@ To use instance metadata, leave the static credential configuration unset.
 At present, this endpoint does not confirm that the provided AliCloud credentials are
 valid AliCloud credentials with proper permissions.
 
-Please see the [Vault AliCloud documentation](/vault/docs/secrets/alicloud) for
+Please see the [Vault AliCloud documentation](/docs/secrets/alicloud) for
 the policies that should be attached to the access key you provide.
 
 | Method | Path               |
@@ -77,7 +77,7 @@ The `role` endpoint configures how Vault will generate credentials for users of
 - `name` (string, required) – Specifies the name of the role to generate credentials against. This is part of the request URL.
 - `remote_policies` (string, optional) - The names and types of a pre-existing policies to be applied to the generate access token. Example: "name:AliyunOSSReadOnlyAccess,type:System".
 - `inline_policies` (string, optional) - The policy document JSON to be generated and attached to the access token.
-- `role_arn` (string, optional) - The ARN of a role that will be assumed to obtain STS credentials. See [Vault AliCloud documentation](/vault/docs/secrets/alicloud) regarding trusted actors.
+- `role_arn` (string, optional) - The ARN of a role that will be assumed to obtain STS credentials. See [Vault AliCloud documentation](/docs/secrets/alicloud) regarding trusted actors.
 - `ttl` (int, optional) - The duration in seconds after which the issued token should expire. Defaults to 0, in which case the value will fallback to the system/mount defaults.
 - `max_ttl` (int, optional) - The maximum allowed lifetime of tokens issued using this role.
 
diff --git a/website/content/api-docs/secret/aws.mdx b/website/content/api-docs/secret/aws.mdx
index 9a13139ba9122..306874e3e7653 100644
--- a/website/content/api-docs/secret/aws.mdx
+++ b/website/content/api-docs/secret/aws.mdx
@@ -8,7 +8,7 @@ description: This is the API documentation for the Vault AWS secrets engine.
 
 This is the API documentation for the Vault AWS secrets engine. For general
 information about the usage and operation of the AWS secrets engine, please see
-the [Vault AWS documentation](/vault/docs/secrets/aws).
+the [Vault AWS documentation](/docs/secrets/aws).
 
 This documentation assumes the AWS secrets engine is enabled at the `/aws` path
 in Vault. Since it is possible to enable secrets engines at any location, please
@@ -58,15 +58,13 @@ valid AWS credentials with proper permissions.
 
 - `sts_endpoint` `(string: <optional>)` – Specifies a custom HTTP STS endpoint to use.
 
-- `username_template` `(string: <optional>)` - [Template](/vault/docs/concepts/username-templating) describing how
+- `username_template` `(string: <optional>)` - [Template](/docs/concepts/username-templating) describing how
   dynamic usernames are generated. The username template is used to generate both IAM usernames (capped at 64 characters)
   and STS usernames (capped at 32 characters). Longer usernames result in a 500 error.
 
   To ensure generated usernames are within length limits for both STS/IAM, the template must adequately handle
   both conditional cases (see [Conditional Templates](https://pkg.go.dev/text/template)). As an example, if no template
-  is provided the field defaults to the template below. It is to be noted that, DisplayName is the name of the vault
-  authenticated user running the AWS credential generation and PolicyName is the name of the Role for which the
-  credential is being generated for:
+  is provided the field defaults to the template:
 
   ```
   {{ if (eq .Type "STS") }}
@@ -585,136 +583,3 @@ $ curl \
   }
 }
 ```
-
-## Create Static Role
-This endpoint creates or updates static role definitions. A static role is a 1-to-1 mapping
-with an AWS IAM User, which will be adopted and managed by Vault, including rotating it according
-to the configured `rotation_period`.
-
-<Note>
-
-Vault will create a new credential upon configuration, and if the maximum number of access keys already exist, Vault will rotate the oldest one. Vault must do this to know the credential.
-
-At each rotation, Vault will rotate the oldest existing credential.
-
-</Note>
-
-| Method | Path                      |
-| :----- | :------------------------ |
-| `POST` | `/aws/static-roles/:name` |
-
-### Parameters
-
-- `name` `(string: <required>)` – Specifies the name of the role to create. This
-is specified as part of the URL.
-
-- `username` `(string: <required>)` – Specifies the username of the IAM user.
-
-- `rotation_period` `(string/int: <required>)` – Specifies the amount of time
-Vault should wait before rotating the password. The minimum is 1 minute. Can be
-specified in either `24h` or `86400` format (see [duration format strings](/vault/docs/concepts/duration-format)).
-
-### Sample Payload
-
-```json
-{
-  "username": "example-user",
-  "rotation_period": "11h30m"
-}
-```
-
-### Sample Request
-
-```shell-session
-$ curl \
-    --header "X-Vault-Token: ..." \
-    --request POST \
-    --data @payload.json \
-    http://127.0.0.1:8200/v1/aws/static-roles/my-static-role
-```
-
-### Sample Response
-
-## Read Static Role
-
-This endpoint queries the static role definition.
-
-| Method | Path                      |
-| :----- | :------------------------ |
-| `GET`  | `/aws/static-roles/:name` |
-
-### Parameters
-
-- `name` `(string: <required>)` – Specifies the name of the static role to read.
-This is specified as part of the URL.
-
-### Sample Request
-
-```shell-session
-$ curl \
-    --header "X-Vault-Token: ..." \
-    --request GET \
-    http://127.0.0.1:8200/v1/aws/static-roles/my-static-role
-```
-### Sample Response
-
-```json
-{
-  "name": "my-static-role",
-  "username": "example-user",
-  "rotation_period": "11h30m"
-}
-```
-
-## Delete Static Role
-
-This endpoint deletes the static role definition. The user, having been defined externally,
-must be cleaned up manually.
-
-| Method   | Path                      |
-| :------- | :------------------------ |
-| `DELETE` | `/aws/static-roles/:name` |
-
-### Parameters
-
-- `name` `(string: <required>)` – Specifies the name of the static role to
-delete. This is specified as part of the URL.
-
-### Sample Request
-
-```shell-session
-$ curl \
-    --header "X-Vault-Token: ..." \
-    --request DELETE \
-    http://127.0.0.1:8200/v1/aws/static-roles/my-static-role
-```
-
-## Get Static Credentials
-
-This endpoint returns the current credentials based on the named static role.
-
-| Method | Path                      |
-| :----- | :------------------------ |
-| `GET`  | `/aws/static-creds/:name` |
-
-### Parameters
-
-- `name` `(string: <required>)` – Specifies the name of the static role to get
-credentials for. This is specified as part of the URL.
-
-### Sample Request
-
-```shell-session
-$ curl \
-    --header "X-Vault-Token: ..." \
-    http://127.0.0.1:8200/v1/aws/static-creds/my-static-role
-```
-
-### Sample Response
-
-```json
-{
-  "access_key": "AKIA...",
-  "secret_key": "..."
-}
-```
diff --git a/website/content/api-docs/secret/azure.mdx b/website/content/api-docs/secret/azure.mdx
index fee3fd46fae4b..9dab4c0974ea9 100644
--- a/website/content/api-docs/secret/azure.mdx
+++ b/website/content/api-docs/secret/azure.mdx
@@ -29,15 +29,15 @@ service principals. Environment variables will override any parameters set in th
 - `tenant_id` (`string: <required>`) - The tenant id for the Azure Active Directory.
   This value can also be provided with the AZURE_TENANT_ID environment variable.
 - `client_id` (`string:""`) - The OAuth2 client id to connect to Azure. This value can also be provided
-  with the AZURE_CLIENT_ID environment variable. See [authentication](/vault/docs/secrets/azure#authentication) for more details.
+  with the AZURE_CLIENT_ID environment variable. See [authentication](/docs/secrets/azure#authentication) for more details.
 - `client_secret` (`string:""`) - The OAuth2 client secret to connect to Azure. This value can also be
-  provided with the AZURE_CLIENT_SECRET environment variable. See [authentication](/vault/docs/secrets/azure#authentication) for more details.
+  provided with the AZURE_CLIENT_SECRET environment variable. See [authentication](/docs/secrets/azure#authentication) for more details.
 - `environment` (`string:""`) - The Azure environment. This value can also be provided with the AZURE_ENVIRONMENT
   environment variable. If not specified, Vault will use Azure Public Cloud.
-- `password_policy` `(string: "")` - Specifies a [password policy](/vault/docs/concepts/password-policies) to
+- `password_policy` `(string: "")` - Specifies a [password policy](/docs/concepts/password-policies) to
   use when creating dynamic credentials. Defaults to generating an alphanumeric password if not set.
 - `root_password_ttl` `(string: 182d)` - Specifies how long the root password is valid for in Azure when
-  rotate-root generates a new client secret. Uses [duration format strings](/vault/docs/concepts/duration-format).
+  rotate-root generates a new client secret. Uses [duration format strings](/docs/concepts/duration-format).
 
 ### Sample Payload
 
@@ -204,8 +204,6 @@ information about roles.
 - `application_object_id` (`string: ""`) - Application Object ID for an existing service principal that will
   be used instead of creating dynamic service principals. If present, `azure_roles` will be ignored. See
   [roles docs][roles] for details on role definition.
-- `persist_app` (`bool: "false"`) – If set to true, persists the created service principal and application for the lifetime of the role.
- Useful for when the Service Principal needs to maintain ownership of objects it creates
 - `ttl` (`string: ""`) – Specifies the default TTL for service principals generated using this role.
   Accepts time suffixed strings ("1h") or an integer number of seconds. Defaults to the system/engine default TTL time.
 - `max_ttl` (`string: ""`) – Specifies the maximum TTL for service principals generated using this role. Accepts time
@@ -329,8 +327,8 @@ $ vault read azure/creds/my-role
 
 ## Revoking/Renewing Secrets
 
-See docs on how to [renew](/vault/api-docs/system/leases#renew-lease) and [revoke](/vault/api-docs/system/leases#revoke-lease) leases.
+See docs on how to [renew](/api-docs/system/leases#renew-lease) and [revoke](/api-docs/system/leases#revoke-lease) leases.
 
-[docs]: /vault/docs/secrets/azure
-[roles]: /vault/docs/secrets/azure#roles
-[groups]: /vault/docs/secrets/azure#azure-groups
+[docs]: /docs/secrets/azure
+[roles]: /docs/secrets/azure#roles
+[groups]: /docs/secrets/azure#azure-groups
diff --git a/website/content/api-docs/secret/cassandra.mdx b/website/content/api-docs/secret/cassandra.mdx
index a3c7c90ebb125..1cd829e598e39 100644
--- a/website/content/api-docs/secret/cassandra.mdx
+++ b/website/content/api-docs/secret/cassandra.mdx
@@ -11,12 +11,12 @@ description: This is the API documentation for the Vault Cassandra secrets engin
 ~> **Deprecation Note:** This backend is deprecated in favor of the
 combined databases backend added in v0.7.1. See the API documentation for
 the new implementation of this backend at
-[Cassandra database plugin HTTP API](/vault/api-docs/secret/databases/cassandra).
+[Cassandra database plugin HTTP API](/api-docs/secret/databases/cassandra).
 
 This is the API documentation for the Vault Cassandra secrets engine. For
 general information about the usage and operation of the Cassandra backend,
 please see the
-[Vault Cassandra backend documentation](/vault/docs/secrets/databases/cassandra).
+[Vault Cassandra backend documentation](/docs/secrets/databases/cassandra).
 
 This documentation assumes the Cassandra backend is mounted at the `/cassandra`
 path in Vault. Since it is possible to enable secrets engines at any location,
@@ -56,7 +56,7 @@ Cassandra.
   private key; a certificate, private key, and issuing CA certificate; or just a
   CA certificate. For convenience format is the same as the output of the
   `issue` command from the `pki` backend; see
-  [the pki documentation](/vault/docs/secrets/pki).
+  [the pki documentation](/docs/secrets/pki).
 
 - `protocol_version` `(int: 2)` – Specifies the CQL protocol version to use.
 
diff --git a/website/content/api-docs/secret/consul.mdx b/website/content/api-docs/secret/consul.mdx
index 87b8d7a5e1a23..3751299b0fb3a 100644
--- a/website/content/api-docs/secret/consul.mdx
+++ b/website/content/api-docs/secret/consul.mdx
@@ -12,7 +12,7 @@ description: This is the API documentation for the Vault Consul secrets engine.
 
 This is the API documentation for the Vault Consul secrets engine. For general
 information about the usage and operation of the Consul secrets engine, please
-see the [Vault Consul documentation](/vault/docs/secrets/consul).
+see the [Vault Consul documentation](/docs/secrets/consul).
 
 This documentation assumes the Consul secrets engine is enabled at the `/consul`
 path in Vault. Since it is possible to enable secrets engines at any location,
@@ -162,11 +162,11 @@ To create a client token with service identities attached:
 - `token_type` <sup>DEPRECATED (1.11)</sup> `(string: "client")` - Specifies the type of token to create
   when using this role. Valid values are `"client"` or `"management"`. If a `"management"`
   token, the `policy` parameter is not required. Defaults to `"client`". [Deprecated from Consul as of 1.4 and
-  removed as of Consul 1.11.](/consul/api-docs/acl/legacy)
+  removed as of Consul 1.11.](https://developer.hashicorp.com/consul/api-docs/acl/legacy)
 
 - `policy` <sup>DEPRECATED (1.11)</sup> `(string: "")` – Specifies the base64-encoded ACL policy.
   This is required unless the `token_type` is `"management"`. [Deprecated from Consul as of 1.4 and
-  removed as of Consul 1.11.](/consul/api-docs/acl/legacy)
+  removed as of Consul 1.11.](https://developer.hashicorp.com/consul/api-docs/acl/legacy)
 
 - `policies` <sup>DEPRECATED (1.11)</sup> `(list: <policy or policies>)` - Same as `consul_policies`.
   Deprecated in favor of using `consul_policies`.
@@ -179,10 +179,10 @@ To create a client token with service identities attached:
   1.4 and greater.
 
 - `ttl` `(duration: "")` – Specifies the TTL for this role. If not
-  provided, the default Vault TTL is used. Uses [duration format strings](/vault/docs/concepts/duration-format).
+  provided, the default Vault TTL is used. Uses [duration format strings](/docs/concepts/duration-format).
 
 - `max_ttl` `(duration: "")` – Specifies the max TTL for this role. If not
-  provided, the default Vault Max TTL is used. Uses [duration format strings](/vault/docs/concepts/duration-format).
+  provided, the default Vault Max TTL is used. Uses [duration format strings](/docs/concepts/duration-format).
 
 ### Sample Payload
 
@@ -197,12 +197,12 @@ To create a client token with policies defined in Consul:
 ### Parameters for Consul version below 1.4
 
 - `lease` <sup>DEPRECATED (1.11)</sup> `(string: "")` – Specifies the lease for this role.
-  Uses [duration format strings](/vault/docs/concepts/duration-format). If not
+  Uses [duration format strings](/docs/concepts/duration-format). If not
   provided, the default Vault lease is used.
 
 - `policy` <sup>DEPRECATED (1.11)</sup> `(string: <policy>)` – Specifies the base64-encoded ACL policy. The
   ACL format can be found in the [Consul ACL
-  documentation](/consul/docs/security/acl/acl-legacy). This is
+  documentation](https://developer.hashicorp.com/consul/docs/security/acl/acl-legacy). This is
   required unless the `token_type` is `"management"`.
 
 ### Sample Payload
diff --git a/website/content/api-docs/secret/cubbyhole.mdx b/website/content/api-docs/secret/cubbyhole.mdx
index 7361c95bb673a..f384a06eb355b 100644
--- a/website/content/api-docs/secret/cubbyhole.mdx
+++ b/website/content/api-docs/secret/cubbyhole.mdx
@@ -9,7 +9,7 @@ description: This is the API documentation for the Vault Cubbyhole secrets engin
 This is the API documentation for the Vault Cubbyhole secrets engine. For
 general information about the usage and operation of the Cubbyhole secrets
 engine, please see the
-[Vault Cubbyhole documentation](/vault/docs/secrets/cubbyhole).
+[Vault Cubbyhole documentation](/docs/secrets/cubbyhole).
 
 This documentation assumes the Cubbyhole secrets engine is enabled at the
 `/cubbyhole` path in Vault. Since it is possible to enable secrets engines at
diff --git a/website/content/api-docs/secret/databases/cassandra.mdx b/website/content/api-docs/secret/databases/cassandra.mdx
index 88563e9708f75..620ea6af58511 100644
--- a/website/content/api-docs/secret/databases/cassandra.mdx
+++ b/website/content/api-docs/secret/databases/cassandra.mdx
@@ -17,7 +17,7 @@ configured roles for the Cassandra database.
 ## Configure Connection
 
 In addition to the parameters defined by the [Database
-Secrets Engine](/vault/api-docs/secret/databases#configure-connection), this plugin
+Secrets Engine](/api-docs/secret/databases#configure-connection), this plugin
 has a number of parameters to further configure a connection.
 
 | Method | Path                     |
@@ -55,7 +55,7 @@ has a number of parameters to further configure a connection.
   private key; a certificate, private key, and issuing CA certificate; or just a
   CA certificate. The value in this field must be an encoded JSON object. For convenience format is the
   same as the output of the `issue` command from the `pki` secrets engine; see
-  [the pki documentation](/vault/docs/secrets/pki). Only one of `pem_bundle` or `pem_json` can be specified.
+  [the pki documentation](/docs/secrets/pki). Only one of `pem_bundle` or `pem_json` can be specified.
 
 <details>
 <summary><b><tt>pem_json</tt> example</b></summary>
@@ -97,7 +97,7 @@ vault write database/config/cassandra-example <...other fields> pem_json=@/path/
   definition](https://github.com/gocql/gocql/blob/master/frame.go#L188) for
   valid options.
 
-- `username_template` `(string)` - [Template](/vault/docs/concepts/username-templating) describing how
+- `username_template` `(string)` - [Template](/docs/concepts/username-templating) describing how
   dynamic usernames are generated.
 
 <details>
@@ -173,7 +173,7 @@ $ curl \
 Statements are configured during role creation and are used by the plugin to
 determine what is sent to the database on user creation, renewing, and
 revocation. For more information on configuring roles see the [Role
-API](/vault/api-docs/secret/databases#create-role) in the database secrets engine docs.
+API](/api-docs/secret/databases#create-role) in the database secrets engine docs.
 
 ### Parameters
 
diff --git a/website/content/api-docs/secret/databases/couchbase.mdx b/website/content/api-docs/secret/databases/couchbase.mdx
index 27914658f8c2a..86f5f81f55bd2 100644
--- a/website/content/api-docs/secret/databases/couchbase.mdx
+++ b/website/content/api-docs/secret/databases/couchbase.mdx
@@ -17,7 +17,7 @@ configured roles for the Couchbase database.
 ## Configure Connection
 
 In addition to the parameters defined by the [Database
-Secrets Engine](/vault/api-docs/secret/databases#configure-connection), this plugin
+Secrets Engine](/api-docs/secret/databases#configure-connection), this plugin
 has a number of parameters to further configure a connection.
 
 | Method | Path                     |
@@ -27,7 +27,7 @@ has a number of parameters to further configure a connection.
 ### Parameters
 
 - `hosts` `(string: <required>)` – Specifies a set of comma-delimited Couchbase
-  hosts to connect to. Must use `couchbase://` scheme if `tls` is `true`.
+  hosts to connect to. Must use `couchbases://` scheme if `tls` is `true`.
 
 - `username` `(string: <required>)` – Specifies the username for Vault to use.
 
@@ -47,7 +47,7 @@ has a number of parameters to further configure a connection.
 - `bucket_name` `(string: "")` - Required for Couchbase versions prior to 6.5.0. This
   is only used to verify vault's connection to the server.
 
-- `username_template` `(string)` - [Template](/vault/docs/concepts/username-templating) describing how
+- `username_template` `(string)` - [Template](/docs/concepts/username-templating) describing how
   dynamic usernames are generated.
 
 <details>
@@ -80,7 +80,7 @@ V_{{.DisplayName | uppercase | truncate 64}}_{{.RoleName | uppercase | truncate
 ```json
 {
   "plugin_name": "couchbase-database-plugin",
-  "hosts": "couchbase://127.0.0.1",
+  "hosts": "couchbases://127.0.0.1",
   "username": "user",
   "password": "pass",
   "allowed-roles": "my-*-role"
@@ -102,7 +102,7 @@ $ curl \
 Statements are configured during role creation and are used by the plugin to
 determine what is sent to the database on user creation, renewing, and
 revocation. For more information on configuring roles see the [Role
-API](/vault/api-docs/secret/databases#create-role) in the database secrets engine docs.
+API](/api-docs/secret/databases#create-role) in the database secrets engine docs.
 
 ### Parameters
 
diff --git a/website/content/api-docs/secret/databases/elasticdb.mdx b/website/content/api-docs/secret/databases/elasticdb.mdx
index 88bee60af1efe..ffdf87c6ede60 100644
--- a/website/content/api-docs/secret/databases/elasticdb.mdx
+++ b/website/content/api-docs/secret/databases/elasticdb.mdx
@@ -17,7 +17,7 @@ configured roles for Elasticsearch.
 ## Configure Connection
 
 In addition to the parameters defined by the [Database
-Backend](/vault/api-docs/secret/databases#configure-connection), this plugin
+Backend](/api-docs/secret/databases#configure-connection), this plugin
 has a number of parameters to further configure a connection.
 
 | Method | Path                     |
@@ -35,7 +35,7 @@ has a number of parameters to further configure a connection.
 - `client_key` `(string: "")` - The path to the key for the Elasticsearch client to use for communication.
 - `tls_server_name` `(string: "")` - This, if set, is used to set the SNI host when connecting via TLS.
 - `insecure` `(bool: false)` - Not recommended. Default to `false`. Can be set to `true` to disable certificate verification.
-- `username_template` `(string)` - [Template](/vault/docs/concepts/username-templating) describing how dynamic usernames are generated.
+- `username_template` `(string)` - [Template](/docs/concepts/username-templating) describing how dynamic usernames are generated.
 - `use_old_xpack` `(bool: false)` - Can be set to `true` to use the `/_xpack/security` base API path when managing Elasticsearch. May be required for Elasticsearch server versions prior to 6.
 
 ### Sample Payload
@@ -68,7 +68,7 @@ $ curl \
 Statements are configured during role creation and are used by the plugin to
 determine what is sent to the database on user creation, renewing, and
 revocation. For more information on configuring roles see the [Role
-API](/vault/api-docs/secret/databases#create-role) in the database secrets engine docs.
+API](/api-docs/secret/databases#create-role) in the database secrets engine docs.
 
 ### Parameters
 
diff --git a/website/content/api-docs/secret/databases/hanadb.mdx b/website/content/api-docs/secret/databases/hanadb.mdx
index 7bb6bcb91dbd2..a9a76cacab208 100644
--- a/website/content/api-docs/secret/databases/hanadb.mdx
+++ b/website/content/api-docs/secret/databases/hanadb.mdx
@@ -15,7 +15,7 @@ configured roles for the HANA database.
 ## Configure Connection
 
 In addition to the parameters defined by the [database
-secrets engine](/vault/api-docs/secret/databases#configure-connection), this plugin
+secrets engine](/api-docs/secret/databases#configure-connection), this plugin
 has a number of parameters to further configure a connection.
 
 | Method | Path                     | Produces |
@@ -44,10 +44,10 @@ has a number of parameters to further configure a connection.
 
 - `password` `(string: "")` - The root credential password used in the connection URL.
 
-- `username_template` `(string)` - [Template](/vault/docs/concepts/username-templating) describing how dynamic usernames are generated.
+- `username_template` `(string)` - [Template](/docs/concepts/username-templating) describing how dynamic usernames are generated.
 
 - `disable_escaping` `(boolean: false)` - Turns off the escaping of special characters inside of the username
-  and password fields. See the [databases secrets engine docs](/vault/docs/secrets/databases#disable-character-escaping)
+  and password fields. See the [databases secrets engine docs](/docs/secrets/databases#disable-character-escaping)
   for more information. Defaults to `false`.
 
 ### Sample Payload
@@ -79,7 +79,7 @@ $ curl \
 Statements are configured during role creation and are used by the plugin to
 determine what is sent to the database on user creation, renewing, and
 revocation. For more information on configuring roles see the [Role
-API](/vault/api-docs/secret/databases#create-role) in the database secrets engine docs.
+API](/api-docs/secret/databases#create-role) in the database secrets engine docs.
 
 ### Parameters
 
diff --git a/website/content/api-docs/secret/databases/index.mdx b/website/content/api-docs/secret/databases/index.mdx
index 0d80764b719d4..18cf9f1898d24 100644
--- a/website/content/api-docs/secret/databases/index.mdx
+++ b/website/content/api-docs/secret/databases/index.mdx
@@ -9,7 +9,7 @@ description: Top page for database secrets engine information
 This is the API documentation for the Vault Database secrets engine. For
 general information about the usage and operation of the database secrets engine,
 please see the
-[Vault database secrets engine documentation](/vault/docs/secrets/databases).
+[Vault database secrets engine documentation](/docs/secrets/databases).
 
 This documentation assumes the database secrets engine is enabled at the
 `/database` path in Vault. Since it is possible to enable secrets engines at any
@@ -51,7 +51,7 @@ list of additional parameters.
   information on support and formatting for this parameter.
 
 - `password_policy` `(string: "")` - The name of the
-  [password policy](/vault/docs/concepts/password-policies) to use when generating passwords
+  [password policy](/docs/concepts/password-policies) to use when generating passwords
   for this database. If not specified, this will use a default policy defined as:
   20 characters with at least 1 uppercase, 1 lowercase, 1 number, and 1 dash character.
 
@@ -90,7 +90,7 @@ are supported and any additional details about them.
 - `disable_escaping` `(boolean: false)` - Determines whether special characters in the
   username and password fields will be escaped. Useful for alternate connection string
   formats like ADO. More information regarding this parameter can be found on the
-  [databases secrets engine docs.](/vault/docs/secrets/databases#disable-character-escaping)
+  [databases secrets engine docs.](/docs/secrets/databases#disable-character-escaping)
   Defaults to `false`.
 
 ### Sample Payload
@@ -301,7 +301,7 @@ This endpoint creates or updates a role definition.
 
 - `max_ttl` `(string/int: 0)` - Specifies the maximum TTL for the leases
   associated with this role. Accepts time suffixed strings (`1h`) or an integer
-  number of seconds. Defaults to `sys/mounts`'s default TTL time; this value is allowed to be less than the mount max TTL (or, if not set, the system max TTL), but it is not allowed to be longer. See also [The TTL General Case](/vault/docs/concepts/tokens#the-general-case).
+  number of seconds. Defaults to `sys/mounts`'s default TTL time; this value is allowed to be less than the mount max TTL (or, if not set, the system max TTL), but it is not allowed to be longer. See also [The TTL General Case](/docs/concepts/tokens#the-general-case).
 
 - `creation_statements` `(list: <required>)` – Specifies the database
   statements executed to create and configure a user. See the plugin's API page
@@ -519,7 +519,7 @@ this in order to know the password.
   "db_name": "mysql",
   "username": "static-database-user",
   "rotation_statements": [
-    "ALTER USER \"{{name}}\" IDENTIFIED BY '{{password}}';"
+    "ALTER USER \"{{name}}\" WITH PASSWORD '{{password}}';"
   ],
   "rotation_period": "1h"
 }
@@ -565,7 +565,7 @@ $ curl \
     "db_name": "mysql",
     "username": "static-user",
     "rotation_statements": [
-      "ALTER USER \"{{name}}\" IDENTIFIED BY '{{password}}';"
+      "ALTER USER \"{{name}}\" WITH PASSWORD '{{password}}';"
     ],
     "rotation_period": "1h"
   }
diff --git a/website/content/api-docs/secret/databases/influxdb.mdx b/website/content/api-docs/secret/databases/influxdb.mdx
index 681615726d297..56209f603b726 100644
--- a/website/content/api-docs/secret/databases/influxdb.mdx
+++ b/website/content/api-docs/secret/databases/influxdb.mdx
@@ -17,7 +17,7 @@ configured roles for the Influxdb database.
 ## Configure Connection
 
 In addition to the parameters defined by the [Database
-Secrets Engine](/vault/api-docs/secret/databases#configure-connection), this plugin
+Secrets Engine](/api-docs/secret/databases#configure-connection), this plugin
 has a number of parameters to further configure a connection.
 
 | Method | Path                     |
@@ -52,11 +52,11 @@ has a number of parameters to further configure a connection.
   private key; a certificate, private key, and issuing CA certificate; or just a
   CA certificate. For convenience format is the same as the output of the
   `issue` command from the `pki` secrets engine; see
-  [the pki documentation](/vault/docs/secrets/pki).
+  [the pki documentation](/docs/secrets/pki).
 
 - `connect_timeout` `(string: "5s")` – Specifies the connection timeout to use.
 
-- `username_template` `(string)` - [Template](/vault/docs/concepts/username-templating) describing how
+- `username_template` `(string)` - [Template](/docs/concepts/username-templating) describing how
 dynamic usernames are generated.
 
 TLS works as follows:
@@ -107,7 +107,7 @@ $ curl \
 Statements are configured during role creation and are used by the plugin to
 determine what is sent to the database on user creation, renewing, and
 revocation. For more information on configuring roles see the [Role
-API](/vault/api-docs/secret/databases#create-role) in the database secrets engine docs.
+API](/api-docs/secret/databases#create-role) in the database secrets engine docs.
 
 ### Parameters
 
diff --git a/website/content/api-docs/secret/databases/mongodb.mdx b/website/content/api-docs/secret/databases/mongodb.mdx
index b3f94a6b1a3b3..158a4f7e911d6 100644
--- a/website/content/api-docs/secret/databases/mongodb.mdx
+++ b/website/content/api-docs/secret/databases/mongodb.mdx
@@ -17,7 +17,7 @@ configured roles for the MongoDB database.
 ## Configure Connection
 
 In addition to the parameters defined by the [Database
-Backend](/vault/api-docs/secret/databases#configure-connection), this plugin
+Backend](/api-docs/secret/databases#configure-connection), this plugin
 has a number of parameters to further configure a connection.
 
 | Method | Path                     |
@@ -47,7 +47,7 @@ has a number of parameters to further configure a connection.
 - `tls_ca` `(string: "")` - x509 CA file for validating the certificate presented by the
   MongoDB server. Must be PEM encoded.
 
-- `username_template` `(string)` - [Template](/vault/docs/concepts/username-templating) describing how
+- `username_template` `(string)` - [Template](/docs/concepts/username-templating) describing how
   dynamic usernames are generated.
 
 <details>
@@ -103,7 +103,7 @@ $ curl \
 Statements are configured during role creation and are used by the plugin to
 determine what is sent to the database on user creation, renewing, and
 revocation. For more information on configuring roles see the [Role
-API](/vault/api-docs/secret/databases#create-role) in the database secrets engine docs.
+API](/api-docs/secret/databases#create-role) in the database secrets engine docs.
 
 ### Parameters
 
diff --git a/website/content/api-docs/secret/databases/mongodbatlas.mdx b/website/content/api-docs/secret/databases/mongodbatlas.mdx
index 29e8e9fa3baac..c01cd2aec8e76 100644
--- a/website/content/api-docs/secret/databases/mongodbatlas.mdx
+++ b/website/content/api-docs/secret/databases/mongodbatlas.mdx
@@ -14,7 +14,7 @@ configured roles.
 ## Configure Connection
 
 In addition to the parameters defined by the [Database
-Backend](/vault/api-docs/secret/databases#configure-connection), this plugin
+Backend](/api-docs/secret/databases#configure-connection), this plugin
 has a number of parameters to further configure a connection.
 
 | Method | Path                     |
@@ -26,7 +26,7 @@ has a number of parameters to further configure a connection.
 - `public_key` `(string: <required>)` – The Public Programmatic API Key used to authenticate with the MongoDB Atlas API.
 - `private_key` `(string: <required>)` - The Private Programmatic API Key used to connect with MongoDB Atlas API.
 - `project_id` `(string: <required>)` - The [Project ID](https://docs.atlas.mongodb.com/api/#project-id) the Database User should be created within.
-- `username_template` `(string)` - [Template](/vault/docs/concepts/username-templating) describing how
+- `username_template` `(string)` - [Template](/docs/concepts/username-templating) describing how
   dynamic usernames are generated.
 
 
@@ -56,7 +56,7 @@ $ curl \
 
 Statements are configured during Vault role creation and are used by the plugin to
 determine what is sent to MongoDB Atlas upon user creation, renewal, and
-revocation. For more information on configuring roles see the [Role API](/vault/api-docs/secret/databases#create-role)
+revocation. For more information on configuring roles see the [Role API](/api-docs/secret/databases#create-role)
 in the Database Secrets Engine docs.
 
 ### Parameters
@@ -69,8 +69,8 @@ list the plugin does not support that statement type.
   serialized JSON object, or a base64-encoded serialized JSON object.
   The object can optionally contain a `database_name`, the name of
   the authentication database to log into MongoDB. In Atlas deployments of
-  MongoDB, the options for the authentication database include admin (default) and $external database.
-  The object must also contain a `roles` array, and from Vault version 1.6.0 (plugin
+  MongoDB, the authentication database is always the admin database. The object
+  must also contain a `roles` array, and from Vault version 1.6.0 (plugin
   version 0.2.0) may optionally contain a `scopes` array. The `roles` array
   contains objects that hold a series of roles `roleName`, an optional
   `databaseName` and `collectionName` value. The `scopes` array determines
@@ -82,7 +82,7 @@ list the plugin does not support that statement type.
 - `max_ttl` `(string/int): 0` - Specifies the maximum TTL for the leases associated with this role. Accepts time
   suffixed strings (`1h`) or an integer number of seconds. Defaults to `sys/mounts` default TTL time; this value
   is allowed to be less than the mount max TTL (or, if not set, the system max TTL),
-  but it is not allowed to be longer. See also [The TTL General Case](/vault/docs/concepts/tokens#the-general-case).
+  but it is not allowed to be longer. See also [The TTL General Case](/docs/concepts/tokens#the-general-case).
 
 ### Sample Creation Statement
 
diff --git a/website/content/api-docs/secret/databases/mssql.mdx b/website/content/api-docs/secret/databases/mssql.mdx
index 29d46da81f474..7d750d7527d12 100644
--- a/website/content/api-docs/secret/databases/mssql.mdx
+++ b/website/content/api-docs/secret/databases/mssql.mdx
@@ -15,7 +15,7 @@ configured roles for the MSSQL database.
 ## Configure Connection
 
 In addition to the parameters defined by the [Database
-Backend](/vault/api-docs/secret/databases#configure-connection), this plugin
+Backend](/api-docs/secret/databases#configure-connection), this plugin
 has a number of parameters to further configure a connection.
 
 | Method | Path                     |
@@ -44,7 +44,7 @@ has a number of parameters to further configure a connection.
 
 - `password` `(string: "")` - The root credential password used in the connection URL.
 
-- `username_template` `(string)` - [Template](/vault/docs/concepts/username-templating) describing how
+- `username_template` `(string)` - [Template](/docs/concepts/username-templating) describing how
   dynamic usernames are generated.
 
 - `contained_db` `(bool: false)` - If set, specifies that the connection being configured is to a
@@ -52,7 +52,7 @@ has a number of parameters to further configure a connection.
   like AzureSQL.
 
 - `disable_escaping` `(boolean: false)` - Turns off the escaping of special characters inside of the username
-  and password fields. See the [databases secrets engine docs](/vault/docs/secrets/databases#disable-character-escaping)
+  and password fields. See the [databases secrets engine docs](/docs/secrets/databases#disable-character-escaping)
   for more information. Defaults to `false`.
 
 <details>
@@ -109,7 +109,7 @@ $ curl \
 Statements are configured during role creation and are used by the plugin to
 determine what is sent to the database on user creation, renewing, and
 revocation. For more information on configuring roles see the [Role
-API](/vault/api-docs/secret/databases#create-role) in the database secrets engine docs.
+API](/api-docs/secret/databases#create-role) in the database secrets engine docs.
 
 ### Parameters
 
diff --git a/website/content/api-docs/secret/databases/mysql-maria.mdx b/website/content/api-docs/secret/databases/mysql-maria.mdx
index 62f4b769b5be9..0164853f33ed9 100644
--- a/website/content/api-docs/secret/databases/mysql-maria.mdx
+++ b/website/content/api-docs/secret/databases/mysql-maria.mdx
@@ -17,7 +17,7 @@ configured roles for the MySQL database.
 ## Configure Connection
 
 In addition to the parameters defined by the [Database
-Backend](/vault/api-docs/secret/databases#configure-connection), this plugin
+Backend](/api-docs/secret/databases#configure-connection), this plugin
 has a number of parameters to further configure a connection.
 
 | Method | Path                     |
@@ -58,11 +58,11 @@ has a number of parameters to further configure a connection.
 - `tls_skip_verify` `(boolean: false)` - When set to true, disables the server certificate verification. 
   Setting this to true is not recommended for production.
 
-- `username_template` `(string)` - [Template](/vault/docs/concepts/username-templating) describing how
+- `username_template` `(string)` - [Template](/docs/concepts/username-templating) describing how
   dynamic usernames are generated.
 
 - `disable_escaping` `(boolean: false)` - Turns off the escaping of special characters inside of the username
-  and password fields. See the [databases secrets engine docs](/vault/docs/secrets/databases#disable-character-escaping)
+  and password fields. See the [databases secrets engine docs](/docs/secrets/databases#disable-character-escaping)
   for more information. Defaults to `false`.
 
 **Default Username Templates:**
@@ -150,7 +150,7 @@ $ curl \
 Statements are configured during role creation and are used by the plugin to
 determine what is sent to the database on user creation, renewing, and
 revocation. For more information on configuring roles see the [Role
-API](/vault/api-docs/secret/databases#create-role) in the database secrets engine docs.
+API](/api-docs/secret/databases#create-role) in the database secrets engine docs.
 
 ### Parameters
 
diff --git a/website/content/api-docs/secret/databases/oracle.mdx b/website/content/api-docs/secret/databases/oracle.mdx
index 8dd5b063bb582..ed10da398ceb0 100644
--- a/website/content/api-docs/secret/databases/oracle.mdx
+++ b/website/content/api-docs/secret/databases/oracle.mdx
@@ -15,7 +15,7 @@ configured roles for the Oracle database.
 ## Configure Connection
 
 In addition to the parameters defined by the [Database
-Backend](/vault/api-docs/secret/databases#configure-connection), this plugin
+Backend](/api-docs/secret/databases#configure-connection), this plugin
 has a number of parameters to further configure a connection.
 
 | Method | Path                     |
@@ -41,11 +41,11 @@ has a number of parameters to further configure a connection.
 
 - `password` `(string: "")` - The root credential password used in the connection URL.
 
-- `username_template` `(string)` - [Template](/vault/docs/concepts/username-templating) describing how
+- `username_template` `(string)` - [Template](/docs/concepts/username-templating) describing how
   dynamic usernames are generated.
 
 - `disable_escaping` `(boolean: false)` - Turns off the escaping of special characters inside of the username
-  and password fields. See the [databases secrets engine docs](/vault/docs/secrets/databases#disable-character-escaping)
+  and password fields. See the [databases secrets engine docs](/docs/secrets/databases#disable-character-escaping)
   for more information. Defaults to `false`.
 
 <details>
@@ -102,7 +102,7 @@ $ curl \
 Statements are configured during role creation and are used by the plugin to
 determine what is sent to the database on user creation, renewing, and
 revocation. For more information on configuring roles see the [Role
-API](/vault/api-docs/secret/databases#create-role) in the database secrets engine docs.
+API](/api-docs/secret/databases#create-role) in the database secrets engine docs.
 
 ### Parameters
 
diff --git a/website/content/api-docs/secret/databases/postgresql.mdx b/website/content/api-docs/secret/databases/postgresql.mdx
index fe248730cbce1..d2db58b903ff3 100644
--- a/website/content/api-docs/secret/databases/postgresql.mdx
+++ b/website/content/api-docs/secret/databases/postgresql.mdx
@@ -15,7 +15,7 @@ configured roles for the PostgreSQL database.
 ## Configure Connection
 
 In addition to the parameters defined by the [Database
-Backend](/vault/api-docs/secret/databases#configure-connection), this plugin
+Backend](/api-docs/secret/databases#configure-connection), this plugin
 has a number of parameters to further configure a connection.
 
 | Method | Path                     |
@@ -27,14 +27,11 @@ has a number of parameters to further configure a connection.
 - `connection_url` `(string: <required>)` - Specifies the PostgreSQL DSN. This field
   can be templated and supports passing the username and password
   parameters in the following format `{{field_name}}`. Certificate authentication
-  can be used by setting `?sslmode=` to be any of the applicable values as outlined in 
-  the [Postgres SQL documentation](https://www.postgresql.org/docs/11/libpq-ssl.html#LIBPQ-SSL-PROTECTION)
-  and giving the SSL credentials in the `sslrootcert`, `sslcert` and `sslkey` credentials. 
-  A templated connection URL is required when using root credential rotation. This field 
-  supports both format string types, URI and keyword/value. Both formats support multiple 
-  host connection strings.
-  Due to how `pgx` works, parameters such as `sslrootcert`, `sslcert`, `sslkey` are treated as paths
-  on the Vault server.
+  can be used by setting `?sslinline=true` and giving the SSL credentials in the
+  `sslrootcert`, `sslcert` and `sslkey` credentials. A templated connection URL
+  is required when using root credential rotation. This field supports both format
+  string types, URI and keyword/value. Both formats support multiple host connection
+  strings.
 
 - `max_open_connections` `(int: 4)` - Specifies the maximum number of open
   connections to the database.
@@ -51,19 +48,13 @@ has a number of parameters to further configure a connection.
 
 - `password` `(string: "")` - The root credential password used in the connection URL.
 
-- `username_template` `(string)` - [Template](/vault/docs/concepts/username-templating) describing how
+- `username_template` `(string)` - [Template](/docs/concepts/username-templating) describing how
   dynamic usernames are generated.
 
 - `disable_escaping` `(boolean: false)` - Turns off the escaping of special characters inside of the username
-  and password fields. See the [databases secrets engine docs](/vault/docs/secrets/databases#disable-character-escaping)
+  and password fields. See the [databases secrets engine docs](/docs/secrets/databases#disable-character-escaping)
   for more information. Defaults to `false`.
 
-- `password_authentication` `(string: "password")` - When set to "scram-sha-256", passwords will be hashed by Vault and stored as-is by PostgreSQL.
-  Using "scram-sha-256" requires a minimum version of PostgreSQL 10. Available options are "scram-sha-256" and "password". The default is "password".
-  When set to "password", passwords will be sent to PostgreSQL in plaintext format and may appear in PostgreSQL logs as-is.
-  For more information, please refer to the [PostgreSQL documentation](https://www.postgresql.org/docs/current/sql-createrole.html#password).
-
-
 <details>
 <summary><b>Default Username Template</b></summary>
 
@@ -156,7 +147,7 @@ for more information. Below are two small examples.
 Statements are configured during role creation and are used by the plugin to
 determine what is sent to the database on user creation, renewing, and
 revocation. For more information on configuring roles see the [Role
-API](/vault/api-docs/secret/databases#create-role) in the database secrets engine docs.
+API](/api-docs/secret/databases#create-role) in the database secrets engine docs.
 
 ### Parameters
 
diff --git a/website/content/api-docs/secret/databases/redis.mdx b/website/content/api-docs/secret/databases/redis.mdx
index 9d0e096b59a41..b05964741a149 100644
--- a/website/content/api-docs/secret/databases/redis.mdx
+++ b/website/content/api-docs/secret/databases/redis.mdx
@@ -15,7 +15,7 @@ configured roles for the Redis database.
 ## Configure Connection
 
 In addition to the parameters defined by the [Database
-Secrets Engine](/vault/api-docs/secret/databases#configure-connection), this plugin
+Secrets Engine](/api-docs/secret/databases#configure-connection), this plugin
 has a number of parameters to further configure a connection.
 
 | Method | Path                     |
@@ -64,7 +64,7 @@ $ curl \
 Statements are configured during role creation and are used by the plugin to
 determine what is sent to the database on user creation, renewing, and
 revocation. For more information on configuring roles see the [Role
-API](/vault/api-docs/secret/databases#create-role) in the database secrets engine docs.
+API](/api-docs/secret/databases#create-role) in the database secrets engine docs.
 
 ### Parameters
 
diff --git a/website/content/api-docs/secret/databases/rediselasticache.mdx b/website/content/api-docs/secret/databases/rediselasticache.mdx
index 25a18e3ad91f6..0fe1739c5cf6a 100644
--- a/website/content/api-docs/secret/databases/rediselasticache.mdx
+++ b/website/content/api-docs/secret/databases/rediselasticache.mdx
@@ -14,7 +14,7 @@ configured roles for the Redis ElastiCache database.
 ## Configure Connection
 
 In addition to the parameters defined by the [Database
-Secrets Engine](/vault/api-docs/secret/databases#configure-connection), this plugin
+Secrets Engine](/api-docs/secret/databases#configure-connection), this plugin
 has a number of parameters to further configure a connection.
 
 | Method | Path                     |
@@ -25,20 +25,10 @@ has a number of parameters to further configure a connection.
 
 - `url` `(string: <required>)` – Specifies the primary endpoint to connect to.
 
-- `access_key_id` `(string)` – Specifies the IAM `access_key_id` for Vault to use. If omitted, authentication falls back on
-the AWS credentials provider chain and tries to infer authentication from the environment.
+- `username` `(string)` – Specifies the IAM access_key_id for Vault to use. If omitted, authentication fallbacks on the AWS credentials provider chain and tries to infer authentication from the environment.
 
-- `secret_access_key` `(string)` – Specifies the IAM `secret_access_key` corresponding to the given `access_key_id`.
-If omitted, authentication falls back on the AWS credentials provider chain and tries to infer authentication from the environment.
-
-- `region` `(string)` – Specifies the AWS region where to ElastiCache cluster is provisioned. If omitted, falls back on
-the context from the environment.
-
-### Deprecated Parameters
-
-- `username` `(string)` – Use `access_key_id` instead, it is strictly equivalent.
-
-- `password` `(string)` – Use `secret_access_key` instead, it is strictly equivalent.
+- `password` `(string)` – Specifies the IAM secret_access_key corresponding to
+the given access_key_id. If omitted, authentication fallbacks on the AWS credentials provider chain and tries to infer authentication from the environment.
 
 ### Sample Payload
 
@@ -46,9 +36,8 @@ the context from the environment.
 {
   "plugin_name": "redis-elasticache-database-plugin",
   "url": "primary-endpoint.my-cluster.xxx.yyy.cache.amazonaws.com:6379",
-  "access_key_id": "AKI***",
-  "secret_access_key": "ktriNYvULAWLzUmTGb***",
-  "region": "us-east-1",
+  "username": "AKI***",
+  "password": "ktriNYvULAWLzUmTGb***",
   "allowed-roles": "*"
 }
 ```
diff --git a/website/content/api-docs/secret/databases/redshift.mdx b/website/content/api-docs/secret/databases/redshift.mdx
index 30b05a729d71c..d60fbe8f98d9c 100644
--- a/website/content/api-docs/secret/databases/redshift.mdx
+++ b/website/content/api-docs/secret/databases/redshift.mdx
@@ -15,7 +15,7 @@ configured roles for the Redshift database.
 ## Configure Connection
 
 In addition to the parameters defined by the [Database
-Backend](/vault/api-docs/secret/databases#configure-connection), this plugin
+Backend](/api-docs/secret/databases#configure-connection), this plugin
 has a number of parameters to further configure a connection.
 
 | Method | Path                     |
@@ -44,10 +44,10 @@ has a number of parameters to further configure a connection.
 
 - `password` `(string: "")` - The root credential password used in the connection URL.
 
-- `username_template` `(string)` - [Template](/vault/docs/concepts/username-templating) describing how dynamic usernames are generated.
+- `username_template` `(string)` - [Template](/docs/concepts/username-templating) describing how dynamic usernames are generated.
 
 - `disable_escaping` `(boolean: false)` - Turns off the escaping of special characters inside of the username
-  and password fields. See the [databases secrets engine docs](/vault/docs/secrets/databases#disable-character-escaping)
+  and password fields. See the [databases secrets engine docs](/docs/secrets/databases#disable-character-escaping)
   for more information. Defaults to `false`.
 
 ### Sample Payload
@@ -79,7 +79,7 @@ $ curl \
 Statements are configured during role creation and are used by the plugin to
 determine what is sent to the database on user creation, renewing, and
 revocation. For more information on configuring roles see the [Role
-API](/vault/api-docs/secret/databases#create-role) in the database secrets engine docs.
+API](/api-docs/secret/databases#create-role) in the database secrets engine docs.
 
 ### Parameters
 
diff --git a/website/content/api-docs/secret/databases/snowflake.mdx b/website/content/api-docs/secret/databases/snowflake.mdx
index 2bad673e72171..de62c12dbc492 100644
--- a/website/content/api-docs/secret/databases/snowflake.mdx
+++ b/website/content/api-docs/secret/databases/snowflake.mdx
@@ -15,7 +15,7 @@ configured roles for the Snowflake database.
 ## Configure Connection
 
 In addition to the parameters defined by the [Database
-Backend](/vault/api-docs/secret/databases#configure-connection), this plugin
+Backend](/api-docs/secret/databases#configure-connection), this plugin
 has a number of parameters to further configure a connection.
 
 | Method | Path                     |
@@ -44,10 +44,10 @@ has a number of parameters to further configure a connection.
 
 - `password` `(string: "")` - The root credential password used in the connection URL.
 
-- `username_template` `(string)` - [Template](/vault/docs/concepts/username-templating) describing how dynamic usernames are generated.
+- `username_template` `(string)` - [Template](/docs/concepts/username-templating) describing how dynamic usernames are generated.
 
 - `disable_escaping` `(boolean: false)` - Turns off the escaping of special characters inside of the username
-  and password fields. See the [databases secrets engine docs](/vault/docs/secrets/databases#disable-character-escaping)
+  and password fields. See the [databases secrets engine docs](/docs/secrets/databases#disable-character-escaping)
   for more information. Defaults to `false`.
 
 ### Sample Payload
@@ -79,7 +79,7 @@ $ curl \
 Statements are configured during role creation and are used by the plugin to
 determine what is sent to the database on user creation, renewing, and
 revocation. For more information on configuring roles see the [Role
-API](/vault/api-docs/secret/databases#create-role) in the database secrets engine docs.
+API](/api-docs/secret/databases#create-role) in the database secrets engine docs.
 
 ### Parameters
 
@@ -93,7 +93,7 @@ list the plugin does not support that statement type.
   array. The `{{name}}` and `{{expiration}}` values will be substituted.
 
   The following values will be substituted depending on the
-  [credential_type](/vault/api-docs/secret/databases#credential_type) of the role:
+  [credential_type](/api-docs/secret/databases#credential_type) of the role:
 
   - `{{password}}` is substituted for the `password` credential type
   - `{{public_key}}` is substituted for the `rsa_private_key` credential type
@@ -125,7 +125,7 @@ list the plugin does not support that statement type.
   array. The `{{name}}` value will be substituted.
 
   The following values will be substituted depending on the
-  [credential_type](/vault/api-docs/secret/databases#credential_type) of the role:
+  [credential_type](/api-docs/secret/databases#credential_type) of the role:
 
   - `{{password}}` is substituted for the `password` credential type
   - `{{public_key}}` is substituted for the `rsa_private_key` credential type
diff --git a/website/content/api-docs/secret/gcp.mdx b/website/content/api-docs/secret/gcp.mdx
index 02301cf76045b..f2c200fc37755 100644
--- a/website/content/api-docs/secret/gcp.mdx
+++ b/website/content/api-docs/secret/gcp.mdx
@@ -8,7 +8,7 @@ description: This is the API documentation for the Vault Google Cloud secrets en
 
 This is the API documentation for the Vault Google Cloud Platform (GCP)
 secrets engine. For general information about the usage and operation of
-the GCP secrets engine, please see [these docs](/vault/docs/secrets/gcp).
+the GCP secrets engine, please see [these docs](/docs/secrets/gcp).
 
 This documentation assumes the GCP secrets engine is enabled at the `/gcp` path
 in Vault. Since it is possible to mount secrets engines at any path, please
@@ -25,15 +25,15 @@ This endpoint configures shared information for the secrets engine.
 ### Parameters
 
 - `credentials` (`string:""`) - JSON credentials (either file contents or '@path/to/file')
-  See docs for [alternative ways](/vault/docs/secrets/gcp#setup)
+  See docs for [alternative ways](/docs/secrets/gcp#setup)
   to pass in to this parameter, as well as the
-  [required permissions](/vault/docs/secrets/gcp#required-permissions).
+  [required permissions](/docs/secrets/gcp#required-permissions).
 
 - `ttl` (`int: 0 || string:"0s"`) – Specifies default config TTL for long-lived credentials
-  (i.e. service account keys). Uses [duration format strings](/vault/docs/concepts/duration-format).
+  (i.e. service account keys). Uses [duration format strings](/docs/concepts/duration-format).
 
 - `max_ttl` (`int: 0 || string:"0s"`)– Specifies the maximum config TTL for long-lived credentials
-  (i.e. service account keys). Uses [duration format strings](/vault/docs/concepts/duration-format).\*\*
+  (i.e. service account keys). Uses [duration format strings](/docs/concepts/duration-format).\*\*
 
 ### Sample Payload
 
@@ -115,7 +115,7 @@ $ curl \
 | :----- | :------------------- |
 | `POST` | `/gcp/roleset/:name` |
 
-This method allows you to create a roleset or update an existing roleset. See [docs](/vault/docs/secrets/gcp#bindings) for the GCP secrets backend
+This method allows you to create a roleset or update an existing roleset. See [docs](/docs/secrets/gcp#bindings) for the GCP secrets backend
 to learn more about what happens when you create or update a roleset.
 
 **If you update a roleset's bindings, this will effectively revoke any secrets
@@ -145,7 +145,7 @@ generated under this roleset.**
 
 #### Sample Bindings:
 
-See [bindings format docs](/vault/docs/secrets/gcp#bindings) for more information.
+See [bindings format docs](/docs/secrets/gcp#bindings) for more information.
 
 ```hcl
 resource "//cloudresourcemanager.googleapis.com/projects/mygcpproject" {
@@ -307,7 +307,7 @@ $ curl \
 | :----- | :-------------------------- |
 | `POST` | `/gcp/static-account/:name` |
 
-This method allows you to create a static account or update an existing static account. See [docs](/vault/docs/secrets/gcp#bindings) for the GCP secrets backend
+This method allows you to create a static account or update an existing static account. See [docs](/docs/secrets/gcp#bindings) for the GCP secrets backend
 to learn more about what happens when you create or update a static account.
 
 **If you update a static account's bindings, this will effectively revoke any secrets
@@ -337,7 +337,7 @@ generated under this static account.**
 
 #### Sample Bindings:
 
-See [bindings format docs](/vault/docs/secrets/gcp#bindings) for more information.
+See [bindings format docs](/docs/secrets/gcp#bindings) for more information.
 
 ```hcl
 resource "//cloudresourcemanager.googleapis.com/projects/mygcpproject" {
@@ -476,144 +476,15 @@ $ curl \
     https://127.0.0.1:8200/v1/gcp/static-account/my-token-account
 ```
 
-## Create/Update Impersonated Account
-
-| Method | Path                              |
-| :----- | :-------------------------------- |
-| `POST` | `/gcp/impersonated-account/:name` |
-
-This method allows you to create an impersonated account or update an existing
-impersonated account.
-
-### Parameters
-
-- `name` (`string: <required>`): Name of the impersonated account. Cannot be updated.
-- `service_account_email` (`string: <required>`): Email of the GCP service account to
-  manage. Cannot be updated.
-- `token_scopes` (`array: []`): List of OAuth scopes to assign to access tokens
-  generated under this impersonation account.
-- `ttl` (`duration: ""`): Lifetime of the token generated. Defaults to 1 hour and
-  is limited to a maximum of 12 hours. Uses [duration format strings](/vault/docs/concepts/duration-format).
-
-### Sample Payload
-
-```json
-{
-  "service_account_email": "projectOwner@my-project.iam.gserviceaccount.com",
-  "token_scopes": [
-    "https://www.googleapis.com/auth/cloud-platform",
-    "https://www.googleapis.com/auth/bigquery"
-  ],
-  "ttl": "2h"
-}
-```
-
-### Sample Request
-
-```shell-session
-$ curl \
-    --header "X-Vault-Token: ..." \
-    --request POST \
-    --data @payload.json \
-    https://127.0.0.1:8200/v1/gcp/impersonated-account/my-token-impersonate
-```
-
-## Read Impersonated Account
-
-| Method | Path                              |
-| :----- | :-------------------------------- |
-| `GET`  | `/gcp/impersonated-account/:name` |
-
-### Parameters
-
-- `name` (`string:<required>`): Name of the impersonated account to read.
-
-### Sample Request
-
-```shell-session
-$ curl \
-    --header "X-Vault-Token: ..." \
-    --request GET \
-    https://127.0.0.1:8200/v1/gcp/impersonated-account/my-token-impersonate
-```
-
-### Sample Response
-
-```json
-{
-  "data": {
-    "service_account_email": "projectOwner@my-project.iam.gserviceaccount.com",
-    "service_account_project": "my-project",
-    "token_scopes": [
-      "https://www.googleapis.com/auth/cloud-platform",
-      "https://www.googleapis.com/auth/bigquery"
-    ],
-    "ttl": 7200
-  },
-}
-```
-## List Impersonated Accounts
-
-This endpoint lists the configured Vault roles for impersonated accounts.
-
-| Method | Path                         |
-| :----- | :---------------------       |
-| `LIST` | `/gcp/impersonated-accounts` |
-
-### Sample Request
-
-```shell-session
-$ curl \
-    --header "X-Vault-Token: ..." \
-    --request LIST \
-    https://127.0.0.1:8200/v1/gcp/impersonated-accounts
-```
-
-### Sample Response
-
-```json
-{
-  "data": {
-    "keys": [
-      "my-token-impersonate",
-      "secondary-role"
-    ]
-  }
-}
-```
-
-## Delete Impersonated Account
-
-This endpoint deletes an existing impersonated account by the given name.
-
-| Method   | Path                              |
-| :------- | :-------------------------------- |
-| `DELETE` | `/gcp/impersonated-account/:name` |
-
-### Parameters
-
-- `name` (`string:<required>`): Name of the impersonated account to delete.
-
-### Sample Request
-
-```shell-session
-$ curl \
-    --header "X-Vault-Token: ..." \
-    --request DELETE \
-    https://127.0.0.1:8200/v1/gcp/impersonated-account/my-token-impersonate
-```
-
 ## Generate Secret (IAM Service Account Creds): OAuth2 Access Token
 
-| Method         | Path                                                    |
-| :------------- | :------------------------------------------------------ |
-| `GET` / `POST` | `/gcp/roleset/:roleset/token`                           |
-| `GET` / `POST` | `/gcp/static-account/:static-account/token`             |
-| `GET` / `POST` | `/gcp/impersonated-account/:impersonated-account/token` |
-| `GET` / `POST` | `/gcp/token/:roleset` (deprecated)                      |
+| Method         | Path                                        |
+| :------------- | :------------------------------------------ |
+| `GET` / `POST` | `/gcp/roleset/:roleset/token`               |
+| `GET` / `POST` | `/gcp/static-account/:static-account/token` |
+| `GET` / `POST` | `/gcp/token/:roleset` (deprecated)          |
 
-Generates an OAuth2 token with the scopes defined on the roleset, static
-account, or impersonated account. This OAuth access token can
+Generates an OAuth2 token with the scopes defined on the roleset or static account. This OAuth access token can
 be used in GCP API calls, e.g. `curl -H "Authorization: Bearer $TOKEN" ...`
 
 Tokens are non-revocable and non-renewable and have a static TTL of an hour. The TTL configured
@@ -624,12 +495,9 @@ do not apply.
 
 - `roleset` (`string:<required>`): Name of an roleset with secret type `access_token` to generate access_token under.
 - `static-account` (`string:<required>`): Name of the static account with secret type `access_token` to generate access_token under.
-- `impersonated-account` (`string:<required>`): Name of the impersonated account to
-  generate access_token_under.
 
 ### Sample Request
 
-**Roleset:**
 ```shell-session
 $ curl \
     --header "X-Vault-Token: ..." \
@@ -637,22 +505,6 @@ $ curl \
     https://127.0.0.1:8200/v1/gcp/roleset/my-token-roleset/token
 ```
 
-**Static account:**
-```shell-session
-$ curl \
-    --header "X-Vault-Token: ..." \
-    --request GET \
-    https://127.0.0.1:8200/v1/gcp/static-account/my-token-account/token
-```
-
-**Impersonated account:**
-```shell-session
-$ curl \
-    --header "X-Vault-Token: ..." \
-    --request GET \
-    https://127.0.0.1:8200/v1/gcp/impersonated-account/my-token-impersonate/token
-```
-
 ### Sample Response
 
 ```json
@@ -693,14 +545,14 @@ or the system default if config was not defined.
   `enum(`[`ServiceAccountKeyAlgorithm`](https://cloud.google.com/iam/reference/rest/v1/projects.serviceAccounts.keys#ServiceAccountKeyAlgorithm)`)`
 - `key_type` (`string:"TYPE_GOOGLE_CREDENTIALS_FILE`): Private key type to generate. Defaults to JSON credentials file.
   Accepted values are `enum(`[`ServiceAccountPrivateKeyType`](https://cloud.google.com/iam/reference/rest/v1/projects.serviceAccounts.keys#ServiceAccountPrivateKeyType)`)`
-- `ttl` (`string: ""`): Specifies the Time To Live value provided using a [duration format string](/vault/docs/concepts/duration-format). If not set, uses the system default value.
+- `ttl` (`string: ""`): Specifies the Time To Live value provided using a [duration format string](/docs/concepts/duration-format). If not set, uses the system default value.
 
 ### Sample Payload
 
 ```json
 {
-  "key_algorithm": "KEY_ALG_RSA_2048",
-  "key_type": "TYPE_GOOGLE_CREDENTIALS_FILE"
+  "key_algorithm": "TYPE_GOOGLE_CREDENTIALS_FILE",
+  "key_type": "KEY_ALG_RSA_2048"
 }
 ```
 
@@ -742,5 +594,5 @@ $ curl \
 
 ## Revoking/Renewing Secrets
 
-See docs on how to [renew](/vault/api-docs/system/leases#renew-lease) and [revoke](/vault/api-docs/system/leases#revoke-lease) leases.
+See docs on how to [renew](/api-docs/system/leases#renew-lease) and [revoke](/api-docs/system/leases#revoke-lease) leases.
 Note this only applies to service account keys.
diff --git a/website/content/api-docs/secret/gcpkms.mdx b/website/content/api-docs/secret/gcpkms.mdx
index 5ffaab50890ae..ef2676fbd9056 100644
--- a/website/content/api-docs/secret/gcpkms.mdx
+++ b/website/content/api-docs/secret/gcpkms.mdx
@@ -9,7 +9,7 @@ description: This is the API documentation for the Vault Google Cloud KMS secret
 This is the API documentation for the Vault Google Cloud KMS secrets engine. For
 general information about the usage and operation of the Google Cloud KMS
 secrets engine, please see the
-[Google Cloud KMS documentation](/vault/docs/secrets/gcpkms).
+[Google Cloud KMS documentation](/docs/secrets/gcpkms).
 
 This documentation assumes the Google Cloud KMS secrets engine is enabled at the
 `/gcpkms` path in Vault. Since it is possible to enable secrets engines at any
diff --git a/website/content/api-docs/secret/identity/entity-alias.mdx b/website/content/api-docs/secret/identity/entity-alias.mdx
index be145afa7acd3..f8ee39a6bd754 100644
--- a/website/content/api-docs/secret/identity/entity-alias.mdx
+++ b/website/content/api-docs/secret/identity/entity-alias.mdx
@@ -135,14 +135,14 @@ This endpoint is used to update an existing entity alias.
 
 - `id` `(string: <required>)` – Identifier of the entity alias.
 
-- `name` `(string: "")` - Name of the alias. Name should be the identifier
+- `name` `(string: <required>)` - Name of the alias. Name should be the identifier
   of the client in the authentication source. For example, if the alias belongs
   to userpass backend, the name should be a valid username within userpass
   backend. If alias belongs to GitHub, it should be the GitHub username.
 
-- `canonical_id` `(string: "")` - Entity ID to which this alias belongs to.
+- `canonical_id` `(string: <required>)` - Entity ID to which this alias belongs to.
 
-- `mount_accessor` `(string: "")` - Accessor of the mount to which the
+- `mount_accessor` `(string: <required>)` - Accessor of the mount to which the
   alias should belong to.
 
 - `custom_metadata` `(map<string|string>: <optional>)` - A map of arbitrary string to string valued 
@@ -182,7 +182,7 @@ $ curl \
 }
 ```
 
-## Delete Entity Alias by ID
+### Delete Entity Alias by ID
 
 This endpoint deletes an alias from its corresponding entity.
 
@@ -203,7 +203,7 @@ $ curl \
     http://127.0.0.1:8200/v1/identity/entity-alias/id/34982d3d-e3ce-5d8b-6e5f-b9bb34246c31
 ```
 
-## List Entity Aliases by ID
+### List Entity Aliases by ID
 
 This endpoint returns a list of available entity aliases by their identifiers.
 
diff --git a/website/content/api-docs/secret/identity/entity.mdx b/website/content/api-docs/secret/identity/entity.mdx
index c5f77935344ee..8eb2c0a4e18e6 100644
--- a/website/content/api-docs/secret/identity/entity.mdx
+++ b/website/content/api-docs/secret/identity/entity.mdx
@@ -398,7 +398,7 @@ $ curl \
 This endpoint merges many entities into one entity. Additionally, all groups associated with `from_entity_ids` are merged with those of `to_entity_id`.
 Note that if these entities contain aliases sharing the same mount accessor, the merge will fail unless `conflicting_alias_ids_to_keep` is present, and
 entities must be merged one at a time. This is because each entity can only have one alias with each mount accessor - for more
-information, see the [identity concepts page](/vault/docs/concepts/identity).
+information, see the [identity concepts page](/docs/concepts/identity).
 
 | Method | Path                     |
 | :----- | :----------------------- |
diff --git a/website/content/api-docs/secret/identity/index.mdx b/website/content/api-docs/secret/identity/index.mdx
index d423551830408..2c5f20bebb6e2 100644
--- a/website/content/api-docs/secret/identity/index.mdx
+++ b/website/content/api-docs/secret/identity/index.mdx
@@ -8,15 +8,15 @@ description: This is the API documentation for the Vault Identity secrets engine
 
 This is the API documentation for the Vault Identity secrets engine. For general
 information about the usage and operation of the Identity secrets engine, please
-see the [Vault Identity documentation](/vault/docs/secrets/identity).
+see the [Vault Identity documentation](/docs/secrets/identity).
 
 ## API Sections
 
-- [Entity](/vault/api-docs/secret/identity/entity)
-- [Entity Alias](/vault/api-docs/secret/identity/entity-alias)
-- [Group](/vault/api-docs/secret/identity/group)
-- [Group Alias](/vault/api-docs/secret/identity/group-alias)
-- [Identity Tokens](/vault/api-docs/secret/identity/tokens)
-- [Lookup](/vault/api-docs/secret/identity/lookup)
-- [OIDC Provider](/vault/api-docs/secret/identity/oidc-provider)
-- [MFA](/vault/api-docs/secret/identity/mfa)
+- [Entity](/api-docs/secret/identity/entity)
+- [Entity Alias](/api-docs/secret/identity/entity-alias)
+- [Group](/api-docs/secret/identity/group)
+- [Group Alias](/api-docs/secret/identity/group-alias)
+- [Identity Tokens](/api-docs/secret/identity/tokens)
+- [Lookup](/api-docs/secret/identity/lookup)
+- [OIDC Provider](/api-docs/secret/identity/oidc-provider)
+- [MFA](/api-docs/secret/identity/mfa)
diff --git a/website/content/api-docs/secret/identity/mfa/duo.mdx b/website/content/api-docs/secret/identity/mfa/duo.mdx
index 80869186e48a3..bf2d8675c8100 100644
--- a/website/content/api-docs/secret/identity/mfa/duo.mdx
+++ b/website/content/api-docs/secret/identity/mfa/duo.mdx
@@ -11,13 +11,11 @@ This endpoint defines an MFA method of type Duo.
 
 | Method | Path                           |
 | :----- | :----------------------------- |
-| `POST` | `/identity/mfa/method/duo/:method_id` |
+| `POST` | `/identity/mfa/method/duo/:id` |
 
 ### Parameters
 
-- `method_id` `(string: "")` - Optional UUID to specify if updating an existing method.
-
-- `method_name` `(string)` - The unique name identifier for this MFA method. Supported from Vault 1.13.0.
+- `id` `(string: "")` - Optional UUID to specify if updating an existing method.
 
 - `username_format` `(string)` - A template string for mapping Identity names to MFA methods. Values to substitute should be placed in `{{}}`. For example, `"{{identity.entity.name}}"`. If blank, the Entity's Name field is used as-is.
 
@@ -29,6 +27,8 @@ This endpoint defines an MFA method of type Duo.
 
 - `push_info` `(string)` - Push information for Duo.
 
+-
+
 - `use_passcode` `(bool: false)` - If true, the user is reminded to use the passcode upon MFA validation.
 
 ### Sample Payload
@@ -38,8 +38,7 @@ This endpoint defines an MFA method of type Duo.
   "username_format": "{{identity.entity.aliases.auth_userpass_1793464a.name}}",
   "secret_key": "BIACEUEAXI20BNWTEYXT",
   "integration_key": "8C7THtrIigh2rPZQMbguugt8IUftWhMRCOBzbuyz",
-  "api_hostname": "api-2b5c39f5.duosecurity.com",
-  "method_name": "ns1_duo",
+  "api_hostname": "api-2b5c39f5.duosecurity.com"
 }
 ```
 
@@ -81,6 +80,7 @@ $ curl \
     --header "X-Vault-Token: ..." \
     --request GET \
     http://127.0.0.1:8200/v1/identity/mfa/method/duo/4194659f-139b-400b-b5dd-86bfb726759d
+
 ```
 
 ### Sample Response
@@ -103,7 +103,7 @@ $ curl \
 ## Delete Duo MFA Method
 
 This endpoint deletes a Duo MFA method. MFA methods can only be deleted if they're not currently in use
-by a [login enforcement](/vault/api-docs/secret/identity/mfa/login-enforcement).
+by a [login enforcement](/api-docs/secret/identity/mfa/login-enforcement).
 
 | Method   | Path                           |
 | :------- | :----------------------------- |
@@ -120,6 +120,7 @@ $ curl \
     --header "X-Vault-Token: ..." \
     --request DELETE \
     http://127.0.0.1:8200/v1/identity/mfa/method/duo/4194659f-139b-400b-b5dd-86bfb726759d
+
 ```
 
 ## List Duo MFA Methods
@@ -137,6 +138,7 @@ $ curl \
     --header "X-Vault-Token: ..." \
     --request LIST \
     http://127.0.0.1:8200/v1/identity/mfa/method/duo
+
 ```
 
 ### Sample Response
diff --git a/website/content/api-docs/secret/identity/mfa/index.mdx b/website/content/api-docs/secret/identity/mfa/index.mdx
index 5f441af3586e4..ab505c62154ac 100644
--- a/website/content/api-docs/secret/identity/mfa/index.mdx
+++ b/website/content/api-docs/secret/identity/mfa/index.mdx
@@ -9,18 +9,18 @@ description: >-
 
 ## Supported MFA types.
 
-- [TOTP](/vault/api-docs/secret/identity/mfa/totp)
+- [TOTP](/api-docs/secret/identity/mfa/totp)
 
-- [Okta](/vault/api-docs/secret/identity/mfa/okta)
+- [Okta](/api-docs/secret/identity/mfa/okta)
 
-- [Duo](/vault/api-docs/secret/identity/mfa/duo)
+- [Duo](/api-docs/secret/identity/mfa/duo)
 
-- [PingID](/vault/api-docs/secret/identity/mfa/pingid)
+- [PingID](/api-docs/secret/identity/mfa/pingid)
 
 ## Other
 
-- [Login Enforcement](/vault/api-docs/secret/identity/mfa/login-enforcement)
-- [MFA Validate](/vault/api-docs/system/mfa/validate)
+- [Login Enforcement](/api-docs/secret/identity/mfa/login-enforcement)
+- [MFA Validate](/api-docs/system/mfa/validate)
 
 While the above endpoints are available in both the open source and Enterprise versions of Vault,
 they are namespace aware. MFA methods and login enforcements created in one namespace are separate from other
diff --git a/website/content/api-docs/secret/identity/mfa/okta.mdx b/website/content/api-docs/secret/identity/mfa/okta.mdx
index 10ded2cf3f3cb..8e63db5394237 100644
--- a/website/content/api-docs/secret/identity/mfa/okta.mdx
+++ b/website/content/api-docs/secret/identity/mfa/okta.mdx
@@ -11,13 +11,11 @@ This endpoint defines an MFA method of type Okta.
 
 | Method | Path                            |
 | :----- | :------------------------------ |
-| `POST` | `/identity/mfa/method/okta/:method_id` |
+| `POST` | `/identity/mfa/method/okta/:id` |
 
 ### Parameters
 
-- `method_id` `(string: "")` - Optional UUID to specify if updating an existing method.
-
-- `method_name` `(string)` - The unique name identifier for this MFA method. Supported from Vault 1.13.0.
+- `id` `(string: "")` - Optional UUID to specify if updating an existing method.
 
 - `username_format` `(string)` - A format string for mapping Identity names to MFA method names. Values to substitute should be placed in `{{}}`. For example, `"{{identity.entity.name}}@example.com"`. If blank, the Entity's Name field is used as-is.
 
@@ -77,6 +75,7 @@ $ curl \
     --header "X-Vault-Token: ..." \
     --request GET \
     http://127.0.0.1:8200/v1/identity/mfa/method/okta/1db034b5-81f1-4a2b-8c2b-0f51ed0bd9fc
+
 ```
 
 ### Sample Response
@@ -97,7 +96,7 @@ $ curl \
 ## Delete Okta MFA Method
 
 This endpoint deletes a Okta MFA method. The MFA methods can only be deleted if they're not currently in use
-by a [login enforcement](/vault/api-docs/secret/identity/mfa/login-enforcement).
+by a [login enforcement](/api-docs/secret/identity/mfa/login-enforcement).
 
 | Method   | Path                            |
 | :------- | :------------------------------ |
@@ -114,6 +113,7 @@ $ curl \
     --header "X-Vault-Token: ..." \
     --request DELETE \
     http://127.0.0.1:8200/v1/identity/mfa/method/okta/1db034b5-81f1-4a2b-8c2b-0f51ed0bd9fc
+
 ```
 
 ## List Okta MFA Methods
@@ -131,6 +131,7 @@ $ curl \
     --header "X-Vault-Token: ..." \
     --request LIST \
     http://127.0.0.1:8200/v1/identity/mfa/method/okta
+
 ```
 
 ### Sample Response
diff --git a/website/content/api-docs/secret/identity/mfa/pingid.mdx b/website/content/api-docs/secret/identity/mfa/pingid.mdx
index ec53322b3a30a..d61f2e65a75a9 100644
--- a/website/content/api-docs/secret/identity/mfa/pingid.mdx
+++ b/website/content/api-docs/secret/identity/mfa/pingid.mdx
@@ -11,13 +11,11 @@ This endpoint defines an MFA method of type PingID.
 
 | Method | Path                              |
 | :----- | :-------------------------------- |
-| `POST` | `/identity/mfa/method/pingid/:method_id` |
+| `POST` | `/identity/mfa/method/pingid/:id` |
 
 ### Parameters
 
-- `method_id` `(string: "")` - Optional UUID to specify if updating an existing method.
-
-- `method_name` `(string)` - The unique name identifier for this MFA method. Supported from Vault 1.13.0.
+- `id` `(string: "")` - Optional UUID to specify if updating an existing method.
 
 - `username_format` `(string)` - A template string for mapping Identity names to MFA method names. Values to substitute should be placed in `{{}}`. For example, `"{{identity.entity.name}}@example.com"`. If blank, the Entity's Name field is used as-is.
 
@@ -70,6 +68,7 @@ $ curl \
     --header "X-Vault-Token: ..." \
     --request GET \
     http://127.0.0.1:8200/v1/identity/mfa/method/pingid/f8381105-67f0-4105-8662-4b07ae5c1233
+
 ```
 
 ### Sample Response
@@ -91,7 +90,7 @@ $ curl \
 ## Delete PingID MFA Method
 
 This endpoint deletes a PingID MFA method. MFA methods can only be deleted if they're not currently in use
-by a [login enforcement](/vault/api-docs/secret/identity/mfa/login-enforcement).
+by a [login enforcement](/api-docs/secret/identity/mfa/login-enforcement).
 
 | Method   | Path                              |
 | :------- | :-------------------------------- |
@@ -108,6 +107,7 @@ $ curl \
     --header "X-Vault-Token: ..." \
     --request DELETE \
     http://127.0.0.1:8200/v1/identity/mfa/method/pingid/f8381105-67f0-4105-8662-4b07ae5c1233
+
 ```
 
 ## List PingID MFA Methods
@@ -125,6 +125,7 @@ $ curl \
     --header "X-Vault-Token: ..." \
     --request LIST \
     http://127.0.0.1:8200/v1/identity/mfa/method/pingid
+
 ```
 
 ### Sample Response
diff --git a/website/content/api-docs/secret/identity/mfa/totp.mdx b/website/content/api-docs/secret/identity/mfa/totp.mdx
index 5c0d9a50ff74b..404c2f609ef54 100644
--- a/website/content/api-docs/secret/identity/mfa/totp.mdx
+++ b/website/content/api-docs/secret/identity/mfa/totp.mdx
@@ -11,13 +11,11 @@ This endpoint defines an MFA method of type TOTP.
 
 | Method | Path                            |
 | :----- | :------------------------------ |
-| `POST` | `/identity/mfa/method/totp/:method_id` |
+| `POST` | `/identity/mfa/method/totp/:id` |
 
 ### Parameters
 
-- `method_id` `(string: "")` - Optional UUID to specify if updating an existing method.
-
-- `method_name` `(string)` - The unique name identifier for this MFA method. Supported from Vault 1.13.0.
+- `id` `(string: "")` - Optional UUID to specify if updating an existing method.
 
 - `issuer` `(string: <required>)` - The name of the key's issuing organization.
 
@@ -27,7 +25,7 @@ This endpoint defines an MFA method of type TOTP.
 
 - `qr_size` `(int: 200)` - The pixel size of the generated square QR code.
 
-- `algorithm` `(string: "SHA1")` – Specifies the hashing algorithm used to generate the TOTP code. Options include "SHA1", "SHA256" and "SHA512".
+- `algorithm` `(string: "SHA1")` – Specifies the hashing algorithm used to generate the TOTP code. Options include "SHA1", "SHA256" and "SHA512".
 
 - `digits` `(int: 6)` - The number of digits in the generated TOTP token. This value can either be 6 or 8.
 
@@ -81,6 +79,7 @@ $ curl \
     --header "X-Vault-Token: ..." \
     --request GET \
     http://127.0.0.1:8200/v1/identity/mfa/method/totp/4c6b1968-b385-4c46-ac5e-9b74e7b206be
+
 ```
 
 ### Sample Response
@@ -105,7 +104,7 @@ $ curl \
 ## Delete TOTP MFA Method
 
 This endpoint deletes a TOTP MFA method.  MFA methods can only be deleted if they're not currently in use
-by a [login enforcement](/vault/api-docs/secret/identity/mfa/login-enforcement).
+by a [login enforcement](/api-docs/secret/identity/mfa/login-enforcement).
 
 | Method   | Path                            |
 | :------- | :------------------------------ |
@@ -122,6 +121,7 @@ $ curl \
     --header "X-Vault-Token: ..." \
     --request DELETE \
     http://127.0.0.1:8200/v1/identity/mfa/method/totp/4c6b1968-b385-4c46-ac5e-9b74e7b206be
+
 ```
 
 ## List TOTP MFA Methods
@@ -139,6 +139,7 @@ $ curl \
     --header "X-Vault-Token: ..." \
     --request LIST \
     http://127.0.0.1:8200/v1/identity/mfa/method/totp
+
 ```
 
 ### Sample Response
diff --git a/website/content/api-docs/secret/identity/oidc-provider.mdx b/website/content/api-docs/secret/identity/oidc-provider.mdx
index 0688f6b62719d..a35d27c6d049e 100644
--- a/website/content/api-docs/secret/identity/oidc-provider.mdx
+++ b/website/content/api-docs/secret/identity/oidc-provider.mdx
@@ -87,7 +87,7 @@ This endpoint returns a list of all OIDC providers.
 ### Query Parameters
 
 - `allowed_client_id` `(string: <optional>)` – Filters the list of OIDC providers to those
-  that allow the given client ID in their set of [allowed_client_ids](/vault/api-docs/secret/identity/oidc-provider#allowed_client_ids).
+  that allow the given client ID in their set of [allowed_client_ids](/api-docs/secret/identity/oidc-provider#allowed_client_ids).
 
 ### Sample Request
 
@@ -152,7 +152,7 @@ This endpoint creates or updates a scope.
 
 - `name` `(string: <required>)` – The name of the scope. This parameter is specified as part of the URL. The `openid` scope name is reserved.
 
-- `template` `(string: <optional>)` - The [JSON template](/vault/docs/concepts/oidc-provider#scopes)
+- `template` `(string: <optional>)` - The [JSON template](/docs/concepts/oidc-provider#scopes)
   string for the scope. This may be provided as escaped JSON or base64 encoded JSON.
 
 - `description` `(string: <optional>)` – A description of the scope.
@@ -269,9 +269,9 @@ This endpoint creates or updates a client.
 
 - `name` `(string: <required>)` – The name of the client. This parameter is specified as part of the URL.
 
-- `key` `(string: "default")` – A reference to a [named key](/vault/api-docs/secret/identity/tokens#create-a-named-key)
+- `key` `(string: "default")` – A reference to a [named key](/api-docs/secret/identity/tokens#create-a-named-key)
   resource. This key will be used to sign ID tokens for the client. This cannot be modified
-  after creation. If not supplied, defaults to the built-in [default key](/vault/docs/concepts/oidc-provider#keys).
+  after creation. If not supplied, defaults to the built-in [default key](/docs/concepts/oidc-provider#keys).
 
 - `redirect_uris` `([]string: <optional>)` - Redirection URI values used by the client. One of these values
   must exactly match the `redirect_uri` parameter value used in each [authentication request](https://openid.net/specs/openid-connect-core-1_0.html#AuthRequest).
@@ -280,7 +280,7 @@ This endpoint creates or updates a client.
   the client. Client assignments limit the Vault entities and groups that are allowed to
   authenticate through the client. By default, no Vault entities are allowed. To allow all
   Vault entities to authenticate through the client, supply the built-in
-  [allow_all](/vault/docs/concepts/oidc-provider#assignments) assignment.
+  [allow_all](/docs/concepts/oidc-provider#assignments) assignment.
 
 - `client_type` `(string: "confidential")` – The [client type](https://datatracker.ietf.org/doc/html/rfc6749#section-2.1)
   based on its ability to maintain confidentiality of credentials. This cannot be modified
@@ -300,11 +300,11 @@ This endpoint creates or updates a client.
       for the authorization code flow
 
 - `id_token_ttl` `(int or duration: "24h")` – The time-to-live for ID tokens obtained by the client.
-  Accepts [duration format strings](/vault/docs/concepts/duration-format). The value should be less than the `verification_ttl`
+  Accepts [duration format strings](/docs/concepts/duration-format). The value should be less than the `verification_ttl`
   on the key.
 
 - `access_token_ttl` `(int or duration: "24h")` – The time-to-live for access tokens obtained by the client.
-  Accepts [duration format strings](/vault/docs/concepts/duration-format).
+  Accepts [duration format strings](/docs/concepts/duration-format).
 
 ### Sample Payload
 
@@ -440,9 +440,9 @@ This endpoint creates or updates an assignment.
 
 - `name` `(string: <required>)` – The name of the assignment. This parameter is specified as part of the URL.
 
-- `entity_ids` `([]string: <optional>)` - A list of Vault [entity](/vault/docs/secrets/identity#entities-and-aliases) IDs.
+- `entity_ids` `([]string: <optional>)` - A list of Vault [entity](https://www.vaultproject.io/docs/secrets/identity#entities-and-aliases) IDs.
 
-- `group_ids` `([]string: <optional>)` – A list of Vault [group](/vault/docs/secrets/identity#identity-groups) IDs.
+- `group_ids` `([]string: <optional>)` – A list of Vault [group](https://www.vaultproject.io/docs/secrets/identity#identity-groups) IDs.
 
 ### Sample Payload
 
diff --git a/website/content/api-docs/secret/identity/tokens.mdx b/website/content/api-docs/secret/identity/tokens.mdx
index a952b08be4763..ac453e0ff647d 100644
--- a/website/content/api-docs/secret/identity/tokens.mdx
+++ b/website/content/api-docs/secret/identity/tokens.mdx
@@ -86,9 +86,9 @@ This endpoint creates or updates a named key which is used by a role to sign tok
 
 - `name` `(string)` – Name of the named key.
 
-- `rotation_period` `(int or time string: "24h")` - How often to generate a new signing key. Uses [duration format strings](/vault/docs/concepts/duration-format).
+- `rotation_period` `(int or time string: "24h")` - How often to generate a new signing key. Uses [duration format strings](/docs/concepts/duration-format).
 
-- `verification_ttl` `(int or time string: "24h")` - Controls how long the public portion of a signing key will be available for verification after being rotated. Uses [duration format strings](/vault/docs/concepts/duration-format).
+- `verification_ttl` `(int or time string: "24h")` - Controls how long the public portion of a signing key will be available for verification after being rotated. Uses [duration format strings](/docs/concepts/duration-format).
 
 - `allowed_client_ids` `(list: [])` - Array of role client ids allowed to use this key for signing. If empty, no roles are allowed. If "\*", all roles are allowed.
 
@@ -244,7 +244,7 @@ Create or update a role. ID tokens are generated against a role and signed again
 
 - `client_id` `(string: <optional>)` - Optional client ID. A random ID will be generated if left unset.
 
-- `ttl` `(int or time string: "24h")` - TTL of the tokens generated against the role. Uses [duration format strings](/vault/docs/concepts/duration-format).
+- `ttl` `(int or time string: "24h")` - TTL of the tokens generated against the role. Uses [duration format strings](/docs/concepts/duration-format).
 
 ### Sample Payload
 
diff --git a/website/content/api-docs/secret/key-management/gcpkms.mdx b/website/content/api-docs/secret/key-management/gcpkms.mdx
index b4b56efd20e80..824e16f5a5802 100644
--- a/website/content/api-docs/secret/key-management/gcpkms.mdx
+++ b/website/content/api-docs/secret/key-management/gcpkms.mdx
@@ -38,7 +38,7 @@ the given parameter values.
 
 - `credentials` `(map<string|string>: nil)` – The credentials to use for authentication with GCP
   Cloud KMS. Supplying values for this parameter is optional, as credentials may also be specified
-  as environment variables. See the [authentication](/vault/docs/secrets/key-management/gcpkms#authentication)
+  as environment variables. See the [authentication](/docs/secrets/key-management/gcpkms#authentication)
   section for details on precedence.
 
   - `service_account_file` `(string: <required>)` - The path to a Google service account key file. The
diff --git a/website/content/api-docs/secret/key-management/index.mdx b/website/content/api-docs/secret/key-management/index.mdx
index 196901179120e..dcdb339dbca11 100644
--- a/website/content/api-docs/secret/key-management/index.mdx
+++ b/website/content/api-docs/secret/key-management/index.mdx
@@ -8,7 +8,7 @@ description: The API documentation for the Key Management secrets engine.
 
 This is the API documentation for the Key Management secrets engine. For general
 information about the usage and operation of the secrets engine, please see the
-[Key Management secrets engine documentation](/vault/docs/secrets/key-management).
+[Key Management secrets engine documentation](/docs/secrets/key-management).
 
 This documentation assumes the Key Management secrets engine is enabled at the
 `/keymgmt` path in Vault. Since it is possible to enable secrets engines at any
@@ -265,7 +265,7 @@ the given parameter values.
 
 - `provider` `(string: <required>)` – Specifies the name of a KMS provider that's external to
   Vault. Cannot be changed after creation. For more information about each provider, refer to
-  the [KMS Providers](/vault/docs/secrets/key-management#kms-providers) section. The following values
+  the [KMS Providers](/docs/secrets/key-management#kms-providers) section. The following values
   are supported:
 
   - `azurekeyvault`
diff --git a/website/content/api-docs/secret/kmip.mdx b/website/content/api-docs/secret/kmip.mdx
index 35efae51c8e78..bf97b52c9ffdf 100644
--- a/website/content/api-docs/secret/kmip.mdx
+++ b/website/content/api-docs/secret/kmip.mdx
@@ -10,7 +10,7 @@ description: This is the API documentation for the Vault KMIP secrets engine.
 
 This is the API documentation for the Vault KMIP secrets engine. For general
 information about the usage and operation of
-the KMIP secrets engine, please see [these docs](/vault/docs/secrets/kmip).
+the KMIP secrets engine, please see [these docs](/docs/secrets/kmip).
 
 This documentation assumes the KMIP secrets engine is enabled at the `/kmip` path
 in Vault. Since it is possible to mount secrets engines at any path, please
diff --git a/website/content/api-docs/secret/kubernetes.mdx b/website/content/api-docs/secret/kubernetes.mdx
index 68df103b529df..d3f0edcfb147c 100644
--- a/website/content/api-docs/secret/kubernetes.mdx
+++ b/website/content/api-docs/secret/kubernetes.mdx
@@ -10,7 +10,7 @@ description: This is the API documentation for the Vault Kubernetes secrets engi
 
 This is the API documentation for the Vault Kubernetes secrets engine. To
 learn more about the usage and operation, see the
-[Kubernetes secrets engine documentation](/vault/docs/secrets/kubernetes).
+[Kubernetes secrets engine documentation](/docs/secrets/kubernetes).
 
 This documentation assumes the Kubernetes secrets engine is mounted at the
 `/kubernetes` path in Vault. Since it is possible to enable secrets engines at
@@ -136,18 +136,15 @@ Only one of `service_account_name`, `kubernetes_role_name` or
   namespaces in which credentials can be generated. Accepts either a JSON or YAML object. The value
   should be of type
   [LabelSelector](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#labelselector-v1-meta)
-  as illustrated in [Sample Payload 4](/vault/api-docs/secret/kubernetes#sample-payload-4) and
-  [Sample Payload 5](/vault/api-docs/secret/kubernetes#sample-payload-5) below.
+  as illustrated in [Sample Payload 4](/api-docs/secret/kubernetes#sample-payload-4) and
+  [Sample Payload 5](/api-docs/secret/kubernetes#sample-payload-5) below.
   If set with `allowed_kubernetes_namespaces`, the conditions are `OR`ed.
 - `token_max_ttl` `(string: "")` - The maximum TTL for generated Kubernetes
   tokens, specified in seconds or as a Go duration format string, e.g. `"1h"`.
-  If not set or set to 0, the [system default](/vault/docs/configuration#max_lease_ttl) will be used.
+  If not set or set to 0, the [system default](/docs/configuration#max_lease_ttl) will be used.
 - `token_default_ttl` `(string: "")` - The default TTL for generated Kubernetes
   tokens, specified in seconds or as a Go duration format string, e.g. `"1h"`.
-  If not set or set to 0, the [system default](/vault/docs/configuration#default_lease_ttl) will be used.
-- `token_default_audiences` `(string: "")` - The default intended audiences for generated Kubernetes
-  tokens, specified by a comma separated string. e.g `"custom-audience-0,custom-audience-1"`.
-  If not set or set to `""`, the Kubernetes cluster default for audiences of service account tokens will be used.
+  If not set or set to 0, the [system default](/docs/configuration#default_lease_ttl) will be used.
 - `service_account_name` `(string: "")` - The pre-existing service account to
   generate tokens for. Mutually exclusive with all role parameters. If set, only
   a Kubernetes token will be created when credentials are requested. See the
@@ -167,10 +164,10 @@ Only one of `service_account_name`, `kubernetes_role_name` or
   [PolicyRule](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#policyrule-v1-rbac-authorization-k8s-io)
   objects, as illustrated in the
   [Kubernetes RBAC documentation](https://kubernetes.io/docs/reference/access-authn-authz/rbac/)
-  and [Sample Payload 3](/vault/api-docs/secret/kubernetes#sample-payload-3) below.
+  and [Sample Payload 3](/api-docs/secret/kubernetes#sample-payload-3) below.
 - `name_template` `(string: "")` - The name template to use when generating
   service accounts, roles and role bindings. If unset, a default template is
-  used. See [username templating](/vault/docs/concepts/username-templating)
+  used. See [username templating](https://www.vaultproject.io/docs/concepts/username-templating)
   for details on how to write a custom template.
 - `extra_annotations` `(map<string|string>: nil)` - Additional annotations to
   apply to all generated Kubernetes objects. See the
@@ -372,9 +369,8 @@ Generate a service account token.
 ### Parameters
 
 - `role` `(string: <required>)` - Name of the role to generate credentials for.
-- `kubernetes_namespace` `(string)` - The name of the Kubernetes
-  namespace in which to generate the credentials. Optional if the Vault role is configured
-  with a single namespace that is not `"*"`; required otherwise.
+- `kubernetes_namespace` `(string: <required>)` - The name of the Kubernetes
+  namespace in which to generate the credentials.
 - `cluster_role_binding` `(bool: false)` - If true, generate a ClusterRoleBinding
   to grant permissions across the whole cluster instead of within a namespace.
   Requires the Vault role to have `kubernetes_role_type` set to ClusterRole.
@@ -382,10 +378,6 @@ Generate a service account token.
   specified in seconds or as a Go duration format string, e.g. `"1h"`. The TTL
   returned may be different from the TTL specified due to limits specified in
   Kubernetes, Vault system-wide controls, or role-specific controls.
-- `audiences` `(string: "")` - A comma separated string containing the intended audiences
-  of the generated Kubernetes service account the token, e.g.  `"custom-audience-0,custom-audience-1"`.
-  If not set or set to `""`,
-  the [token_default_audiences](/vault/api-docs/secret/kubernetes#token_default_audiences) will be used.
 
 ### Sample Payload
 
diff --git a/website/content/api-docs/secret/kv/index.mdx b/website/content/api-docs/secret/kv/index.mdx
index 9fcc209dfffcb..ea7f37d0c76e5 100644
--- a/website/content/api-docs/secret/kv/index.mdx
+++ b/website/content/api-docs/secret/kv/index.mdx
@@ -8,8 +8,8 @@ description: This is the API documentation for the Vault KV secrets engine.
 
 This backend can be run in one of two versions. Each of which have a distinct API.
 Choose the version below you are running. For more information on the KV secrets
-engine see the [Vault kv documentation](/vault/docs/secrets/kv).
+engine see the [Vault kv documentation](/docs/secrets/kv).
 
-- [KV Version 1 API](/vault/api-docs/secret/kv/kv-v1)
+- [KV Version 1 API](/api-docs/secret/kv/kv-v1)
 
-- [KV Version 2 API](/vault/api-docs/secret/kv/kv-v2)
+- [KV Version 2 API](/api-docs/secret/kv/kv-v2)
diff --git a/website/content/api-docs/secret/kv/kv-v1.mdx b/website/content/api-docs/secret/kv/kv-v1.mdx
index 8ef9e6a0dcaac..359e6a557be1a 100644
--- a/website/content/api-docs/secret/kv/kv-v1.mdx
+++ b/website/content/api-docs/secret/kv/kv-v1.mdx
@@ -8,7 +8,7 @@ description: This is the API documentation for the Vault KV secrets engine.
 
 This is the API documentation for the Vault KV secrets engine. For general
 information about the usage and operation of the kv secrets engine, please
-see the [Vault kv documentation](/vault/docs/secrets/kv).
+see the [Vault kv documentation](/docs/secrets/kv).
 
 ~> Note: This documentation assumes the kv secrets engine is enabled at the
 `/secret` path in Vault. Since it is possible to enable secrets engines at any
@@ -53,7 +53,7 @@ $ curl \
 _Note_: the `lease_duration` field, which will be populated if a "ttl" field
 was included in the data, is advisory. No lease is created. This is a way for
 writers to indicate how often a given value should be re-read by the client.
-See the [Vault KV secrets engine documentation](/vault/docs/secrets/kv)
+See the [Vault KV secrets engine documentation](/docs/secrets/kv)
 for more details.
 
 ## List Secrets
@@ -120,7 +120,7 @@ policy granting the `update` capability.
   be held at the given location. Multiple key/value pairs can be specified, and
   all will be returned on a read operation. A key called `ttl` will trigger
   some special behavior. See the [Vault KV secrets engine
-  documentation](/vault/docs/secrets/kv) for details.
+  documentation](/docs/secrets/kv) for details.
 
 ### Sample Payload
 
diff --git a/website/content/api-docs/secret/kv/kv-v2.mdx b/website/content/api-docs/secret/kv/kv-v2.mdx
index 9f0fdf0f82ae3..0670ccb0b15f4 100644
--- a/website/content/api-docs/secret/kv/kv-v2.mdx
+++ b/website/content/api-docs/secret/kv/kv-v2.mdx
@@ -9,22 +9,24 @@ description: This is the API documentation for the Vault KV secrets engine.
 This is the API documentation for the Vault KV secrets engine while running in
 versioned mode. For general information about the usage and operation of the kv
 secrets engine, please see the [Vault kv
-documentation](/vault/docs/secrets/kv).
+documentation](/docs/secrets/kv).
+
+~> Note: This documentation assumes the kv secrets engine is enabled at the
+`/secret` path in Vault and that versioning has been enabled. Since it is
+possible to enable secrets engines at any location, please update your API calls
+accordingly.
 
 ## Configure the KV Engine
 
 This path configures backend level settings that are applied to every key in the
 key-value store.
 
-| Method | Path                         |
-|:-------|:-----------------------------|
-| `POST` | `/:secret-mount-path/config` |
+| Method | Path             |
+| :----- | :--------------- |
+| `POST` | `/secret/config` |
 
 ### Parameters
 
-- `secret-mount-path` `(string: <required>)` - The path to the KV mount to config,
-  such as `secret`. This is specified as part of the URL.
-
 - `max_versions` `(int: 0)` – The number of versions to keep per key. This value
   applies to all keys, but a key's metadata setting can overwrite this value.
   Once a key has more than the configured allowed versions, the oldest version
@@ -36,7 +38,7 @@ key-value store.
 
 - `delete_version_after` `(string:"0s")` – If set, specifies the length
   of time before a version is deleted.
-  Accepts [duration format strings](/vault/docs/concepts/duration-format).
+  Accepts [duration format strings](/docs/concepts/duration-format).
 
 ### Sample Payload
 
@@ -63,14 +65,9 @@ $ curl \
 This path retrieves the current configuration for the secrets backend at the
 given path.
 
-| Method | Path                         |
-|:-------|:-----------------------------|
-| `GET`  | `/:secret-mount-path/config` |
-
-### Parameters
-
-- `secret-mount-path` `(string: <required>)` - The path to the KV mount to read the config,
-  of, such as `secret`. This is specified as part of the URL.
+| Method | Path             |
+| :----- | :--------------- |
+| `GET`  | `/secret/config` |
 
 ### Sample Request
 
@@ -98,16 +95,14 @@ This endpoint retrieves the secret at the specified location. The metadata
 fields `created_time`, `deletion_time`, `destroyed`, and `version` are version
 specific. The `custom_metadata` field is part of the secret's key metadata and
 is included in the response whether or not the calling token has `read` access to
-the associated [metadata endpoint](/vault/api-docs/secret/kv/kv-v2#read-secret-metadata).
+the associated [metadata endpoint](/api-docs/secret/kv/kv-v2#read-secret-metadata).
 
-| Method | Path                                                     |
-|:-------|:---------------------------------------------------------|
-| `GET`  | `/:secret-mount-path/data/:path?version=:version-number` |
+| Method | Path                                         |
+| :----- | :------------------------------------------- |
+| `GET`  | `/secret/data/:path?version=:version-number` |
 
 ### Parameters
 
-- `secret-mount-path` `(string: <required>)` - The path to the KV mount containing
-  the secret to read, such as `secret`. This is specified as part of the URL.
 - `path` `(string: <required>)` – Specifies the path of the secret to read.
   This is specified as part of the URL.
 - `version` `(int: 0)` - Specifies the version to return. If not set the latest
@@ -150,18 +145,12 @@ the value does not yet exist, the calling token must have an ACL policy granting
 the `create` capability. If the value already exists, the calling token must
 have an ACL policy granting the `update` capability.
 
-| Method | Path                             |
-|:-------|:---------------------------------|
-| `POST` | `/:secret-mount-path/data/:path` |
+| Method | Path                 |
+| :----- | :------------------- |
+| `POST` | `/secret/data/:path` |
 
 ### Parameters
 
-- `secret-mount-path` `(string: <required>)` - The path to the KV mount containing
-  the secret to update, such as `secret`. This is specified as part of the URL.
-
-- `path` `(string: <required>)` – Specifies the path of the secret to update.
-  This is specified as part of the URL.
-
 - `options` `(Map: <optional>)` – An object that holds option settings.
 
   - `cas` `(int: <optional>)` - This flag is required if `cas_required` is set
@@ -227,18 +216,12 @@ is supported and must be specified using a `Content-Type` header value of
 `application/merge-patch+json`. A new version will be created upon successfully
 applying a patch with the provided data.
 
-| Method  | Path                             |
-|:--------|:---------------------------------|
-| `PATCH` | `/:secret-mount-path/data/:path` |
+| Method  | Path                 |
+| :------ | :------------------- |
+| `PATCH` | `/secret/data/:path` |
 
 ### Parameters
 
-- `secret-mount-path` `(string: <required>)` - The path to the KV mount containing
-   the secret to patch, such as `secret`. This is specified as part of the URL.
-
-- `path` `(string: <required>)` – Specifies the path of the secret to patch.
-   This is specified as part of the URL.
-
 - `options` `(Map: <optional>)` – An object that holds option settings.
 
   - `cas` `(int: <optional>)` - This flag is required if `cas_required` is set to true on either
@@ -300,14 +283,12 @@ at the requested path. The secret entry at this path will be retrieved
 and stripped of all data by replacing underlying values of leaf keys
 (i.e. non-map keys or map keys with no underlying subkeys) with `null`.
 
-| Method | Path                                |
-|:-------|:------------------------------------|
-| `GET`  | `/:secret-mount-path/subkeys/:path` |
+| Method | Path                    |
+| :----- | :---------------------- |
+| `GET`  | `/secret/subkeys/:path` |
 
 ### Parameters
 
-- `secret-mount-path` `(string: <required>)` - The path to the KV mount containing
-  the secret to read, such as `secret`. This is specified as part of the URL.
 - `path` `(string: <required>)` – Specifies the path of the secret to read.
   This is specified as part of the URL.
 - `version` `(int: 0)` - Specifies the version to return. If not set the latest
@@ -367,12 +348,10 @@ delete can be undone using the `undelete` path.
 
 | Method   | Path                 |
 | :------- | :------------------- |
-| `DELETE` | `/:secret-mount-path/data/:path` |
+| `DELETE` | `/secret/data/:path` |
 
 ### Parameters
 
-- `secret-mount-path` `(string: <required>)` - The path to the KV mount containing
-  the secret to delete, such as `secret`. This is specified as part of the URL.
 - `path` `(string: <required>)` – Specifies the path of the secret to delete.
   This is specified as part of the URL.
 
@@ -392,14 +371,12 @@ marks the versions as deleted and will stop them from being returned from reads,
 but the underlying data will not be removed. A delete can be undone using the
 `undelete` path.
 
-| Method | Path                               |
-|:-------|:-----------------------------------|
-| `POST` | `/:secret-mount-path/delete/:path` |
+| Method | Path                   |
+| :----- | :--------------------- |
+| `POST` | `/secret/delete/:path` |
 
 ### Parameters
 
-- `secret-mount-path` `(string: <required>)` - The path to the KV mount containing
-  the secret to delete, such as `secret`. This is specified as part of the URL.
 - `path` `(string: <required>)` – Specifies the path of the secret to delete.
   This is specified as part of the URL.
 - `versions` `([]int: <required>)` - The versions to be deleted. The versioned
@@ -429,15 +406,12 @@ $ curl \
 Undeletes the data for the provided version and path in the key-value store.
 This restores the data, allowing it to be returned on get requests.
 
-| Method | Path                                 |
-|:-------|:-------------------------------------|
-| `POST` | `/:secret-mount-path/undelete/:path` |
+| Method | Path                     |
+| :----- | :----------------------- |
+| `POST` | `/secret/undelete/:path` |
 
 ### Parameters
 
-- `secret-mount-path` `(string: <required>)` - The path to the KV mount containing
-  the secret to undelete, such as `secret`. This is specified as part of the URL.
-
 - `path` `(string: <required>)` – Specifies the path of the secret to undelete.
   This is specified as part of the URL.
 
@@ -467,15 +441,12 @@ $ curl \
 Permanently removes the specified version data for the provided key and version
 numbers from the key-value store.
 
-| Method | Path                                |
-|:-------|:------------------------------------|
-| `PUT`  | `/:secret-mount-path/destroy/:path` |
+| Method | Path                    |
+| :----- | :---------------------- |
+| `POST` | `/secret/destroy/:path` |
 
 ### Parameters
 
-- `secret-mount-path` `(string: <required>)` - The path to the KV mount containing
-  the secret to destroy, such as `secret`. This is specified as part of the URL.
-
 - `path` `(string: <required>)` – Specifies the path of the secret to destroy.
   This is specified as part of the URL.
 
@@ -495,7 +466,7 @@ numbers from the key-value store.
 ```shell-session
 $ curl \
     --header "X-Vault-Token: ..." \
-    --request PUT \
+    --request POST \
     --data @payload.json \
     https://127.0.0.1:8200/v1/secret/destroy/my-secret
 ```
@@ -508,15 +479,12 @@ value. Note that no policy-based filtering is performed on keys; do not encode
 sensitive information in key names. The values themselves are not accessible via
 this command.
 
-| Method | Path                                 |
-|:-------|:-------------------------------------|
-| `LIST` | `/:secret-mount-path/metadata/:path` |
+| Method | Path                     |
+| :----- | :----------------------- |
+| `LIST` | `/secret/metadata/:path` |
 
 ### Parameters
 
-- `secret-mount-path` `(string: <required>)` - The path to the KV mount containing
-the secret to list, such as `secret`. This is specified as part of the URL.
-
 - `path` `(string: <required>)` – Specifies the path of the secrets to list.
   This is specified as part of the URL.
 
@@ -548,15 +516,12 @@ entries.
 This endpoint retrieves the metadata and versions for the secret at the
 specified path. Metadata is version-agnostic.
 
-| Method | Path                                 |
-|:-------|:-------------------------------------|
-| `GET`  | `/:secret-mount-path/metadata/:path` |
+| Method | Path                     |
+| :----- | :----------------------- |
+| `GET`  | `/secret/metadata/:path` |
 
 ### Parameters
 
-- `secret-mount-path` `(string: <required>)` - The path to the KV mount containing
-  the secret to read, such as `secret`. This is specified as part of the URL.
-
 - `path` `(string: <required>)` – Specifies the path of the secret to read.
   This is specified as part of the URL.
 
@@ -611,18 +576,12 @@ $ curl \
 This endpoint creates or updates the metadata of a secret at the specified location.
 It does not create a new version.
 
-| Method | Path                                 |
-|:-------|:-------------------------------------|
-| `POST` | `/:secret-mount-path/metadata/:path` |
+| Method | Path                     |
+| :----- | :----------------------- |
+| `POST` | `/secret/metadata/:path` |
 
 ### Parameters
 
-- `secret-mount-path` `(string: <required>)` - The path to the KV mount containing
-  the secret to update, such as `secret`. This is specified as part of the URL.
-
-- `path` `(string: <required>)` – Specifies the path of the secret to update.
-  This is specified as part of the URL.
-
 - `max_versions` `(int: 0)` – The number of versions to keep per key. If not
   set, the backend’s configured max version is used. Once a key has more than
   the configured allowed versions, the oldest version will be permanently
@@ -675,18 +634,12 @@ capability. Currently, only JSON merge patch is supported and must be specified
 using a `Content-Type` header value of `application/merge-patch+json`. It does
 not create a new version.
 
-| Method  | Path                                 |
-|:--------|:-------------------------------------|
-| `PATCH` | `/:secret-mount-path/metadata/:path` |
+| Method  | Path                     |
+| :------ | :----------------------- |
+| `PATCH` | `/secret/metadata/:path` |
 
 ### Parameters
 
-- `secret-mount-path` `(string: <required>)` - The path to the KV mount containing
-  the secret to patch, such as `secret`. This is specified as part of the URL.
-
-- `path` `(string: <required>)` – Specifies the path of the secret to patch.
-  This is specified as part of the URL.
-
 - `max_versions` `(int: 0)` – The number of versions to keep per key. If not
   set, the backend’s configured max version is used. Once a key has more than
   the configured allowed versions, the oldest version will be permanently
@@ -701,7 +654,7 @@ not create a new version.
   written to this key. If not set, the backend's `delete_version_after` will be
   used. If the value is greater than the backend's `delete_version_after`, the
   backend's `delete_version_after` will be used. Accepts [duration format
-  strings](/vault/docs/concepts/duration-format).
+  strings](/docs/concepts/duration-format).
 
 - `custom_metadata` `(map<string|string>: nil)` - A map of arbitrary string to string valued user-provided metadata meant
   to describe the secret.
@@ -734,14 +687,11 @@ This endpoint permanently deletes the key metadata and all version data for the
 specified key. All version history will be removed.
 
 | Method   | Path                     |
-|:---------|:-------------------------|
+| :------- | :----------------------- |
 | `DELETE` | `/secret/metadata/:path` |
 
 ### Parameters
 
-- `secret-mount-path` `(string: <required>)` - The path to the KV mount containing
-  the secret to delete, such as `secret`. This is specified as part of the URL.
-
 - `path` `(string: <required>)` – Specifies the path of the secret to delete.
   This is specified as part of the URL.
 
diff --git a/website/content/api-docs/secret/ldap.mdx b/website/content/api-docs/secret/ldap.mdx
index a5ee22ccfbab1..9868fdf67d2d6 100644
--- a/website/content/api-docs/secret/ldap.mdx
+++ b/website/content/api-docs/secret/ldap.mdx
@@ -10,7 +10,7 @@ description: This is the API documentation for the Vault LDAP secrets engine.
 
 This is the API documentation for the Vault LDAP secrets engine. For general
 information about the usage and operation of the LDAP secrets engine,
-please see the [LDAP secrets engine docs](/vault/docs/secrets/ldap).
+please see the [LDAP secrets engine docs](/docs/secrets/ldap).
 
 This documentation assumes the LDAP secrets engine is enabled at the `/ldap` path
 in Vault. Since it is possible to mount secrets engines at any path, please
@@ -38,15 +38,15 @@ to search and change entry passwords in LDAP.
   `ldaps://ldap.myorg.com:636`. This can also be a comma-delineated list of URLs, e.g.
   `ldaps://ldap.myorg.com, ldaps://ldap.myorg.com:636`, in which case the servers will be tried in-order if
   there are errors during the connection process.`.
-- `password_policy` `(string: <optional>)` - The name of the [password policy](/vault/docs/concepts/password-policies)
+- `password_policy` `(string: <optional>)` - The name of the [password policy](/docs/concepts/password-policies)
   to use to generate passwords. Note that this accepts the name of the policy, not the policy itself.
 - `schema` `(string: "openldap")` - The LDAP schema to use when storing entry passwords.
   Valid schemas include `openldap`, `ad`, and `racf`.
 - `userdn` `(string: <optional>)` - The base DN under which to perform user search in
-  [library management](/vault/api-docs/secret/ldap#library-management) and [static roles](/vault/api-docs/secret/ldap#static-roles).
+  [library management](/api-docs/secret/ldap#library-management) and [static roles](/api-docs/secret/ldap#static-roles).
   For example, `ou=Users,dc=hashicorp,dc=com`.
 - `userattr` `(string: <optional>)` – The attribute field name used to perform user search
-  in [library management](/vault/api-docs/secret/ldap#library-management) and [static roles](/vault/api-docs/secret/ldap#static-roles).
+  in [library management](/api-docs/secret/ldap#library-management) and [static roles](/api-docs/secret/ldap#static-roles).
   Defaults to `cn` for the `openldap` schema, `userPrincipalName` for the `ad` schema, and
   `racfid` for the `racf` schema.
 - `upndomain` (string: `optional`) - The domain (userPrincipalDomain) used to construct a UPN
@@ -81,11 +81,11 @@ configuration if both are specified.
   prior to the introduction of password policies).
 - If `length` is set, the same algorithm is used, but with the length specified instead of the default length.
 - If `password_policy` is set, the password will be generated from the associated
-  [password policy](/vault/docs/concepts/password-policies). The policy is not exercised prior to saving the configuration.
+  [password policy](/docs/concepts/password-policies). The policy is not exercised prior to saving the configuration.
   The policy will need to exist prior to passwords needing to be generated by this engine, but does not need to exist
   prior to saving the configuration.
 
-See [LDAP secrets engine docs](/vault/docs/secrets/ldap) for additional information.
+See [LDAP secrets engine docs](/docs/secrets/ldap) for additional information.
 
 ### Sample Payload
 
@@ -167,9 +167,9 @@ The `static-role` endpoint configures Vault to manage the passwords of existing
 ### Parameters
 
 - `username` `(string: <required>)` - The username of the existing LDAP entry to manage
-  password rotation for. LDAP search for the username will be rooted at the [userdn](/vault/api-docs/secret/ldap#userdn)
+  password rotation for. LDAP search for the username will be rooted at the [userdn](/api-docs/secret/ldap#userdn)
   configuration value. The attribute to use when searching for the user can be configured
-  with the [userattr](/vault/api-docs/secret/ldap#userattr) configuration value. This is useful
+  with the [userattr](/api-docs/secret/ldap#userattr) configuration value. This is useful
   when `dn` isn't used for login purposes (such as SSH). Cannot be modified after creation.<br />
   **Example:** `"bob"`
 - `dn` `(string: <optional>)` - Distinguished name (DN) of the existing LDAP entry to manage
@@ -177,7 +177,7 @@ The `static-role` endpoint configures Vault to manage the passwords of existing
   search performed during password rotation. Cannot be modified after creation.<br />
   **Example:** `cn=bob,ou=Users,dc=hashicorp,dc=com`
 - `rotation_period` `(string: <required>)` - How often Vault should rotate the password of the user entry. Accepts
-  [duration format strings](/vault/docs/concepts/duration-format). The minimum rotation period is 5 seconds.<br />
+  [duration format strings](/docs/concepts/duration-format). The minimum rotation period is 5 seconds.<br />
   **Example:** `"3600", "5s", "1h"`
 
 ### Sample Payload
@@ -341,14 +341,14 @@ v_{{.DisplayName}}_{{.RoleName}}_{{random 10}}_{{unix_time}}
 </details>
 
 - `default_ttl` `(string/int)` - Specifies the TTL for the leases associated with this role. Accepts
-  [duration format strings](/vault/docs/concepts/duration-format). Defaults to system/engine default TTL time.
+  [duration format strings](/docs/concepts/duration-format). Defaults to system/engine default TTL time.
 - `max_ttl` `(string/int)` - Specifies the maximum TTL for the leases associated with this role. Accepts
-  [duration format strings](/vault/docs/concepts/duration-format). Defaults to system/mount default TTL time;
+  [duration format strings](/docs/concepts/duration-format). Defaults to system/mount default TTL time;
   this value is allowed to be less than the mount max TTL (or, if not set, the system max TTL),
   but it is not allowed to be longer.
 
 The `creation_ldif`, `deletion_ldif`, `rollback_ldif`, and `username_template` fields are all templated fields. See
-[Username Templating](/vault/docs/concepts/username-templating) for details on how to use templating. Also see
+[Username Templating](/docs/concepts/username-templating) for details on how to use templating. Also see
 [Templates](#templates) for specifics on what data is available for each template.
 
 #### Sample Payload
@@ -446,7 +446,7 @@ The following parameters are available within the LDIF templates:
 **Default pattern:** `v_<display name>_<role name>_<10 random chars>_<unix timestamp>`
 
 `.Password` - The generated password (optionally from
-[password policies](/vault/docs/concepts/password-policies))
+[password policies](https://www.vaultproject.io/docs/concepts/password-policies))
 
 `.RoleName` - The name of the role that credentials are being generated for.
 
@@ -550,35 +550,6 @@ The username template cannot use this function.
 `utf16le` - Encodes the provided value into UTF16-LE.<br />
 **Example:** `{{.FieldName | utf16le}}`
 
-## Dynamic Role Passwords
-
-The `creds` endpoint offers the credential information for a given dynamic role.
-
-| Method | Path                               |
-| :----- | :--------------------------------- |
-| `GET`  | `/ldap/creds/:role_name` |
-
-#### Sample Get Request
-
-```shell-session
-$ curl \
-    --header "X-Vault-Token: ..." \
-    --request GET \
-    http://127.0.0.1:8200/v1/ldap/creds/dynamic-role
-```
-
-#### Sample Get Response
-
-```json
-{
-  "distinguished_names": [
-    "cn=v_token-dispname_testrole_jmZMnjS42a_1680580467,ou=users,dc=hashicorp,dc=com"
-  ],
-  "password": "OWexB3OzYYLFiotWxUS2EheGpriwR20fa2yA7JGTsnBREcxyqpwf73htofMihxcC",
-  "username": "v_token-dispname_testrole_jmZMnjS42a_1680580467"
-}
-```
-
 ## Library Set Management
 
 The `library` endpoint configures the sets of service accounts that Vault will offer for check-out.
@@ -600,10 +571,10 @@ When adding a service account to the library, Vault verifies it already exists i
   service accounts must already exist in the LDAP directory.
 - `ttl` `(duration: "24h", optional)` - The maximum amount of time a single check-out lasts before Vault
   automatically checks it back in. Defaults to 24 hours. Setting it to zero reflects an unlimited lending period.
-  Uses [duration format strings](/vault/docs/concepts/duration-format).
+  Uses [duration format strings](/docs/concepts/duration-format).
 - `max_ttl` `(duration: "24h", optional)` - The maximum amount of time a check-out last with renewal before Vault
   automatically checks it back in. Defaults to 24 hours. Setting it to zero reflects an unlimited lending period.
-  Uses [duration format strings](/vault/docs/concepts/duration-format).
+  Uses [duration format strings](/docs/concepts/duration-format).
 - `disable_check_in_enforcement` `(bool: false, optional)` - Disable enforcing that service accounts must be
   checked in by the entity or client token that checked them out. Defaults to false.
 
@@ -704,7 +675,7 @@ Returns a `200` if a credential is available, and a `400` if no credential is av
 - `ttl` `(duration: "", optional)` - The maximum amount of time a check-out lasts before Vault
   automatically checks it back in. Setting it to zero reflects an unlimited lending period.
   Defaults to the set's `ttl`. If the requested `ttl` is higher than the set's, the set's will be used.
-  Uses [duration format strings](/vault/docs/concepts/duration-format).
+  Uses [duration format strings](/docs/concepts/duration-format).
 
 ### Sample POST Request
 
diff --git a/website/content/api-docs/secret/mongodbatlas.mdx b/website/content/api-docs/secret/mongodbatlas.mdx
index 5490801eb8e5f..c5b29d63481c1 100644
--- a/website/content/api-docs/secret/mongodbatlas.mdx
+++ b/website/content/api-docs/secret/mongodbatlas.mdx
@@ -90,10 +90,6 @@ either the MongoDB Atlas Organization or Project level with the designated role(
 
 * `ip_addresses` `(list [string] <Optional>)` - IP address to be added to the whitelist for the API key. This field is mutually exclusive with the cidrBlock field.
 * `cidr_blocks` `(list [string] <Optional>)` - Whitelist entry in CIDR notation to be added for the API key. This field is mutually exclusive with the ipAddress field.
-* `project_roles` `(list [string] <Optional>)` - Roles assigned when an Organization API key is assigned to a Projects API key.
-* `ttl` `(string <Optional>)` - Duration in seconds after which the issued credential should expire. Defaults to 0, in which case the value will fallback to the system/mount defaults.
-* `max_ttl` `(string <Optional>)` - The maximum allowed lifetime of credentials issued using this role.
-
 
 ### Sample Payload
 
diff --git a/website/content/api-docs/secret/nomad.mdx b/website/content/api-docs/secret/nomad.mdx
index b71f1cacdca92..2c74c53012d17 100644
--- a/website/content/api-docs/secret/nomad.mdx
+++ b/website/content/api-docs/secret/nomad.mdx
@@ -10,7 +10,7 @@ description: This is the API documentation for the Vault Nomad secrets engine.
 
 This is the API documentation for the Vault Nomad secrets engine. For general
 information about the usage and operation of the Nomad secrets engine, please see the
-[Vault Nomad secrets engine documentation](/vault/docs/secrets/nomad).
+[Vault Nomad secrets engine documentation](/docs/secrets/nomad).
 
 This documentation assumes the Nomad secrets engine is mounted at the `/nomad` path
 in Vault. Since it is possible to mount secrets engines at any location, please
@@ -107,9 +107,9 @@ This endpoint configures the lease settings for generated tokens.
 
 ### Parameters
 
-- `ttl` `(string: "")` – Specifies the ttl for the lease. Uses [duration format strings](/vault/docs/concepts/duration-format).
+- `ttl` `(string: "")` – Specifies the ttl for the lease. Uses [duration format strings](/docs/concepts/duration-format).
 
-- `max_ttl` `(string: "")` – Specifies the max ttl for the lease. Uses [duration format strings](/vault/docs/concepts/duration-format).
+- `max_ttl` `(string: "")` – Specifies the max ttl for the lease. Uses [duration format strings](/docs/concepts/duration-format).
 
 ### Sample Payload
 
@@ -188,7 +188,7 @@ updated attributes.
 
 - `policies` `(string: "")` – Comma separated list of Nomad policies the token is going to be created against. These need to be created beforehand in Nomad.
 
-- `global` `(bool: "false")` – Specifies if the token should be global, as defined in the [Nomad Documentation](/nomad/tutorials/access-control#acl-tokens).
+- `global` `(bool: "false")` – Specifies if the token should be global, as defined in the [Nomad Documentation](https://learn.hashicorp.com/collections/nomad/access-control#acl-tokens).
 
 - `type` `(string: "client")` - Specifies the type of token to create when
   using this role. Valid values are `"client"` or `"management"`.
diff --git a/website/content/api-docs/secret/pki.mdx b/website/content/api-docs/secret/pki.mdx
index 64ca4b904b584..f01d66b97ee2c 100644
--- a/website/content/api-docs/secret/pki.mdx
+++ b/website/content/api-docs/secret/pki.mdx
@@ -10,7 +10,7 @@ description: This is the API documentation for the Vault PKI secrets engine.
 
 This is the API documentation for the Vault PKI secrets engine. For general
 information about the usage and operation of the PKI secrets engine, please see
-the [PKI documentation](/vault/docs/secrets/pki).
+the [PKI documentation](/docs/secrets/pki).
 
 This documentation assumes the PKI secrets engine is enabled at the `/pki` path
 in Vault. Since it is possible to enable secrets engines at any location, please
@@ -19,13 +19,6 @@ update your API calls accordingly.
 ## Table of Contents
 
 - [Notice About New Multi-Issuer Functionality](#notice-about-new-multi-issuer-functionality)
-- [ACME Certificate Issuance](#acme-certificate-issuance)
-  - [ACME Directories](#acme-directories)
-  - [Get ACME EAB Binding Token](#get-acme-eab-binding-token)
-  - [List Unused ACME EAB Binding Tokens](#list-unused-acme-eab-binding-tokens)
-  - [Delete Unused ACME EAB Binding Tokens](#delete-unused-acme-eab-binding-tokens)
-  - [Get ACME Configuration](#get-acme-configuration)
-  - [Set ACME Configuration](#set-acme-configuration)
 - [Issuing Certificates](#issuing-certificates)
   - [List Roles](#list-roles)
   - [Read Role](#read-role)
@@ -36,9 +29,6 @@ update your API calls accordingly.
   - [Sign Verbatim](#sign-verbatim)
   - [Revoke Certificate](#revoke-certificate)
   - [Revoke Certificate with Private Key](#revoke-certificate-with-private-key)
-  - [List Revoked Certificates](#list-revoked-certificates)
-  - [List Revocation Requests](#list-revocation-requests)
-  - [List Cross-Cluster Revocations](#list-cross-cluster-revocations)
 - [Accessing Authority Information](#accessing-authority-information)
   - [List Issuers](#list-issuers)
   - [Read Issuer Certificate](#read-issuer-certificate)
@@ -74,17 +64,12 @@ update your API calls accordingly.
   - [Set Issuers Configuration](#set-issuers-configuration)
   - [Read Keys Configuration](#read-keys-configuration)
   - [Set Keys Configuration](#set-keys-configuration)
-  - [Read Cluster Configuration](#read-cluster-configuration)
-  - [Set Cluster Configuration](#set-cluster-configuration)
   - [Read CRL Configuration](#read-crl-configuration)
   - [Set CRL Configuration](#set-crl-configuration)
   - [Rotate CRLs](#rotate-crls)
   - [Rotate Delta CRLs](#rotate-delta-crls)
-  - [Combining CRLs from the Same Issuer](#combine-crls-from-the-same-issuer)
-  - [Sign Revocation List](#sign-revocation-list)
   - [Tidy](#tidy)
-  - [Read Automatic Tidy Configuration](#read-automatic-tidy-configuration)
-  - [Set Automatic Tidy Configuration](#set-automatic-tidy-configuration)
+  - [Configure Automatic Tidy](#configure-automatic-tidy)
   - [Tidy Status](#tidy-status)
   - [Cancel Tidy](#cancel-tidy)
 - [Cluster Scalability](#cluster-scalability)
@@ -113,335 +98,6 @@ to mix different types of CAs (roots and intermediates).
    current issuing certificate on migration from an older Vault version
    (Vault < 1.11.0).
 
-## ACME Certificate Issuance
-
-Starting with Vault 1.14, Vault supports the [ACME certificate lifecycle
-management protocol](https://datatracker.ietf.org/doc/html/rfc8555) for issuing
-and renewing leaf server certificates.
-
-In order to use ACME, a [cluster path](#set-cluster-configuration) must be
-set and ACME must be [enabled in its configuration](#set-acme-configuration)
-with the [required headers](#acme-required-headers) enabled on the mount
-tuning.
-
-Using ACME with a role requires `no_store=false` to be set on the role; this
-allows the certificate to be stored and later fetched through the ACME
-protocol.
-
-### ACME Directories
-
-Vault PKI supports the following ACME directories, providing different
-restrictions around usage (defaults, a specific issuer and/or a specific
-role). To interact with these directories, specify the directory URL in
-an ACME client. For example, with the EFF's [CertBot](https://certbot.eff.org/):
-
-```
-$ certbot certonly --server https://localhost:8200/v1/pki/acme/directory ...
-```
-
-These endpoints are unauthenticated from a Vault authentication model, but
-internally authenticated via the ACME protocol.
-
-| Method | Path                                                 | Default Directory Policy | Issuer                | Role          |
-|:-------|:-----------------------------------------------------|:-------------------------|:----------------------|:--------------|
-| `ACME` | `/pki/acme/directory`                                | `sign-verbatim`          | `default`             | Sign-Verbatim |
-| `ACME` | `/pki/acme/directory`                                | `role:role_ref`          | Specified by the role | `:role_ref`   |
-| `ACME` | `/pki/issuer/:issuer_ref/acme/directory`             | `sign-verbatim`          | `:issuer_ref`         | Sign-Verbatim |
-| `ACME` | `/pki/issuer/:issuer_ref/acme/directory`             | `role:role_ref`          | `:issuer_ref`         | `:role_ref`   |
-| `ACME` | `/pki/roles/:role/acme/directory`                    | (any)                    | Specified by the role | `:role`       |
-| `ACME` | `/pki/issuer/:issuer_ref/roles/:role/acme/directory` | (any)                    | `:issuer_ref`         | `:role`       |
-
-When a role is not specified (for the first two directory URLs, or four lines
-in the table), behavior is specified by the `default_directory_policy` in the
-[ACME configuration](#set-acme-configuration).  These directories can also be
-forbidden by setting that policy as `forbid`.  If the policy is `sign-verbatim`
-then _any_ identifier for which the client can prove ownership of will be
-issued for.  This is similar to using the [Sign Verbatim](#sign-verbatim)
-endpoint, but with additional verification that the client has proven
-ownership (within the ACME protocol) of the requested certificate
-identifiers.
-
-#### ACME Challenge Types
-
-Vault supports the following ACME challenge types presently:
-
- - `http-01`, supporting both `dns` and `ip` identifiers.
- - `dns-01`, supporting `dns` identifiers including wildcards.
- - `tls-alpn-01`, supporting only non-wildcard `dns` identifiers.
-
-A custom DNS resolver used by the server for looking up DNS names for use
-with both mechanisms can be added via the [ACME configuration](#set-acme-configuration).
-
-#### ACME External Account Bindings
-
-ACME External Account Binding (EAB) Policy can enforce that clients need to
-have a valid external account binding to Vault. Before registering a new account,
-an authenticated Vault client will need to [fetch a new EAB
-token](#get-acme-eab-binding-token). This returns two values: a key identifier
-and an HMAC key used by the ACME client to authenticate with EAB. For example:
-
-```
-$ vault write -f /pki/acme/new-eab
-$ certbot certonly --server https://localhost:8200/v1/pki/acme/directory \
-                   --eab-kid <id> --eab-hmac-key <hmac-key>
-```
-
-With or without EAB, requests from the ACME client are not authenticated using
-traditional Vault authentication, but are instead authenticated through the
-ACME protocol. With EAB however, a Vault authenticated client will have to
-fetch an EAB token and pass it to the ACME client for use on the initial
-registration: this binds the ACME client's registration to an authenticated
-Vault endpoint, but not further to the client's entity or other information.
-
-~> Note: Enabling EAB is strongly recommended for public-facing Vault
-   deployments. Use of the `VAULT_DISABLE_PUBLIC_ACME` environment variable
-   can be used to enforce all ACME instances have EAB enabled.
-
-#### ACME Accounts
-
-ACME Accounts are created specific to a particular directory and are not
-portable across Performance Secondary clusters.
-
-#### ACME Required Headers
-
-ACME requires the following response headers (`allowed_response_headers`)
-to be specified by [mount tuning](/vault/api-docs/system/mounts#tune-mount-configuration):
-
- - `Replay-Nonce`
- - `Link`
- - `Location`
-
-On an existing mount, these can be specified by running the following command:
-
-```
-$ vault secrets tune -allowed-response-headers=Location -allowed-response-headers=Replay-Nonce \
-                     -allowed-response-headers=Link \
-                     pki/
-```
-
-### Get ACME EAB Binding Token
-
-This endpoint returns a new ACME binding token. The `id` response field can
-be used as the key identifier and the `key` response field be used as the
-EAB HMAC key in the ACME Client.
-
-Each call to this endpoint will generate and return a new EAB binding token
-that is linked to the specific ACME directory it resides under. EAB tokens
-are not usable across different ACME directories.
-
-| Method | Path                                               |
-|:-------|:---------------------------------------------------|
-| `POST` | `/pki/acme/new-eab`                                |
-| `POST` | `/pki/issuer/:issuer_ref/acme/new-eab`             |
-| `POST` | `/pki/roles/:role/acme/new-eab`                    |
-| `POST` | `/pki/issuer/:issuer_ref/roles/:role/acme/new-eab` |
-
-#### Parameters
-
-No parameters.
-
-#### Sample Request
-
-```
-$ curl \
-    --header "X-Vault-Token: ..." \
-    --request POST \
-    http://127.0.0.1:8200/v1/pki/acme/new-eab
-```
-
-#### Sample Response
-
-```
-{
-  "data": {
-    "created_on": "2023-05-24T14:33:00-04:00",
-    "id": "bc8088d9-3816-5177-ae8e-d8393265f7dd",
-    "key_type": "hs",
-    "acme_directory": "acme/directory",
-    "key": "MHcCAQE... additional data elided ...",
-  }
-}
-```
-
-### List Unused ACME EAB Binding Tokens
-
-This endpoint returns a list of all unused ACME binding tokens; once used,
-they will be removed from this list.
-
-| Method | Path       |
-| :----- | :--------- |
-| `LIST` | `/pki/eab` |
-
-#### Sample Request
-
-```
-$ curl \
-    --header "X-Vault-Token: ..." \
-    --request LIST \
-    http://127.0.0.1:8200/v1/pki/eab
-```
-
-#### Sample Response
-
-```
-{
-  "data": {
-    "key_info": {
-      "bc8088d9-3816-5177-ae8e-d8393265f7dd": {
-        "created_on": "2023-05-24T14:33:00-04:00",
-        "key_type": "hs",
-        "acme_directory": "acme/directory"
-      }
-    },
-    "keys": [
-      "bc8088d9-3816-5177-ae8e-d8393265f7dd"
-    ]
-  }
-}
-```
-
-### Delete Unused ACME EAB Binding Tokens
-
-This endpoint allows the deletion of an unused ACME binding token.
-
-| Method   | Path               |
-| :------- | :----------------- |
-| `DELETE` | `/pki/eab/:key_id` |
-
-#### Parameters
-
- - `key_id` `(string: <required>)` - The id of the EAB binding token to
-   delete. This is part of the request URL.
-
-#### Sample Request
-
-```
-$ curl \
-    --header "X-Vault-Token: ..." \
-    --request DELETE \
-    http://127.0.0.1:8200/v1/pki/eab/bc8088d9-3816-5177-ae8e-d8393265f7dd
-```
-
-### Get ACME Configuration
-
-This endpoint allows reading of the current ACME server configuration used by
-this mount.
-
-| Method | Path               |
-| :----- | :----------------- |
-| `GET`  | `/pki/config/acme` |
-
-#### Sample Request
-
-```
-$ curl \
-    --header "X-Vault-Token: ..." \
-    http://127.0.0.1:8200/v1/pki/config/acme
-```
-
-#### Sample Response
-
-```
-{
-  "data": {
-    "allowed_issuers": [
-      "*"
-    ],
-    "allowed_roles": [
-      "*"
-    ],
-    "default_directory_policy": "sign-verbatim",
-    "dns_resolver": "",
-    "eab_policy": "not-required",
-    "enabled": true
-  },
-}
-```
-
-### Set ACME Configuration
-
-This endpoint allows setting the ACME server configuration used by this
-mount.
-
-| Method | Path               |
-| :----- | :----------------- |
-| `POST` | `/pki/config/acme` |
-
-#### Parameters
-
- - `allowed_issuers` `(list: ["*"])` - Specifies a list issuers allowed to
-   issue certificates via explicit ACME paths. If an allowed role specifies
-   an issuer outside this list, it will be allowed. The default value `*`
-   allows every issuer within the mount.
-
- - `allowed_roles` `(list: ["*"])` - Specifies a list of roles allowed to
-   issue certificates via explicit ACME paths.  The default value `*` allows
-   every role within the mount to be used.  If the `default_directory_policy`
-   specifies a role, it must be allowed under this configuration.
-
- - `default_directory_policy` `(string: "sign-verbatim")` - Specifies the
-   behavior of the default ACME directory.  Can be `forbid`, `sign-verbatim`
-   or a role given by `role:<role_name>`.  If a role is used, it must be
-   present in `allowed_roles`.
-
- - `dns_resolver` `(string: "")` - An optional overriding DNS resolver to
-   use for challenge verification lookups. When not specified, the default
-   system resolver will be used. This allows domains on peered networks with
-   an accessible DNS resolver to be validated.
-
- - `eab_policy` `(string: "not-required")` - Specified policy to enforce
-   around [External Account Bindings (EABs)](#acme-external-account-bindings).
-   The allowed values are:
-
-     - `not-required`, where EABs are not enforced but are validated if
-        specified.
-
-     - `new-account-required`, where new accounts are required to have EAB
-       but existing accounts can still be used.
-
-     - `always-required`, where all accounts regardless of age are required
-       to have EABs set.
-
- - `enabled` `(bool: false)` - Whether ACME is enabled on this mount. When
-   ACME is disabled, all requests to ACME directory URLs will return 404.
-
-#### Sample Payload
-
-```
-{
-    "enabled": true
-}
-```
-
-#### Sample Request
-
-```
-$ curl \
-    --header "X-Vault-Token: ..." \
-    --request POST \
-    --data @payload.json \
-    http://127.0.0.1:8200/v1/pki/config/acme
-```
-
-#### Sample Response
-
-```
-{
-  "data": {
-    "allowed_issuers": [
-      "*"
-    ],
-    "allowed_roles": [
-      "*"
-    ],
-    "default_directory_policy": "sign-verbatim",
-    "dns_resolver": "",
-    "eab_policy": "not-required",
-    "enabled": true
-  }
-}
-```
-
 ## Issuing Certificates
 
 The following API endpoints allow users or operators to request certificates
@@ -579,13 +235,11 @@ It is suggested to limit access to the path-overridden issue endpoint (on
 ~> Note: This parameter is not present on the `/pki/issue/:name` path and
    takes its value from the role's `issuer_ref` field.
 
-- `common_name` `(string: "")` - Specifies the requested CN for the
+- `common_name` `(string: <required>)` - Specifies the requested CN for the
   certificate. If the CN is allowed by role policy, it will be issued. If more
   than one `common_name` is desired, specify the alternative names in the
   `alt_names` list.
 
-~> Note: A value for `common_name` is required when [require_cn](#require_cn) is set to `true`
-
 - `alt_names` `(string: "")` - Specifies requested Subject Alternative Names, in
   a comma-delimited list. These can be host names or email addresses; they will
   be parsed into their respective fields. If any requested names do not match
@@ -637,15 +291,6 @@ It is suggested to limit access to the path-overridden issue endpoint (on
   `YYYY-MM-ddTHH:MM:SSZ`. Supports the Y10K end date for IEEE 802.1AR-2018
   standard devices, `9999-12-31T23:59:59Z`.
 
-- `remove_roots_from_chain` `(bool: false)` - If true, the returned `ca_chain`
-  field will not include any self-signed CA certificates. Useful if end-users
-  already have the root CA in their trust store.
-
-- `user_ids` `(string: "")` - Specifies the comma-separated list of requested
-  User ID (OID 0.9.2342.19200300.100.1.1) Subject values to be placed on the
-  signed certificate. This field is validated against `allowed_user_ids` on
-  the role.
-
 #### Sample Payload
 
 ```json
@@ -767,11 +412,6 @@ It is suggested to limit access to the path-overridden sign endpoint (on
   field will not include any self-signed CA certificates. Useful if end-users
   already have the root CA in their trust store.
 
-- `user_ids` `(string: "")` - Specifies the comma-separated list of requested
-  User ID (OID 0.9.2342.19200300.100.1.1) Subject values to be placed on the
-  signed certificate. This field is validated against `allowed_user_ids` on
-  the role.
-
 #### Sample Payload
 
 ```json
@@ -928,7 +568,7 @@ when signing an externally-owned intermediate.
 - `not_before_duration` `(duration: "30s")` - Specifies the duration by which to
   backdate the NotBefore property. This value has no impact in the validity period
   of the requested certificate, specified in the `ttl` field.
-  Uses [duration format strings](/vault/docs/concepts/duration-format).
+  Uses [duration format strings](/docs/concepts/duration-format).
 
 - `not_after` `(string)` - Set the Not After field of the certificate with
   specified date value. The value format should be given in UTC format
@@ -1157,10 +797,6 @@ have access.**
   field will not include any self-signed CA certificates. Useful if end-users
   already have the root CA in their trust store.
 
-- `user_ids` `(string: "")` - Specifies the comma-separated list of requested
-  User ID (OID 0.9.2342.19200300.100.1.1) Subject values to be placed on the
-  signed certificate. No validation on names is performed using this endpoint.
-
 #### Sample Payload
 
 ```json
@@ -1322,109 +958,6 @@ $ curl \
 }
 ```
 
-
-### List Revoked Certificates
-
-This endpoint returns a list of serial numbers that have been revoked on the local cluster.
-
-| Method | Path              |
-|:-------|:------------------|
-| `LIST` | `/certs/revoked`  |
-
-#### Sample Request
-
-```shell-session
-$ curl \
-    --header "X-Vault-Token: ..." \
-    --request LIST \
-    http://127.0.0.1:8200/v1/pki/certs/revoked
-```
-
-#### Sample Response
-
-```json
-{
-  "data": {
-    "keys": [
-      "3d:80:91:c3:c2:34:3b:81:69:3d:92:a3:80:69:db:53:04:26:ab:b4"
-    ]
-  }
-}
-```
-
-### List Revocation Requests
-
-This endpoint returns a list of serial numbers that have been requested to
-be revoked on any cluster, along with information about the request's state
-and which cluster it originated on.
-
-| Method | Path                      |
-| :----- | :------------------------ |
-| `LIST` | `/certs/revocation-queue` |
-
-#### Sample Request
-
-```shell-session
-$ curl \
-    --header "X-Vault-Token: ..." \
-    --request LIST \
-    http://127.0.0.1:8200/v1/pki/certs/revocation-queue
-```
-
-#### Sample Response
-
-```json
-{
-  "data": {
-    "key_info": {
-      "3d:80:91:c3:c2:34:3b:81:69:3d:92:a3:80:69:db:53:04:26:ab:b4": {
-        "requesting_cluster": "48327b28-8325-6d79-6a0b-4cbaa6f27b4a"
-      }
-    },
-    "keys": [
-      "3d:80:91:c3:c2:34:3b:81:69:3d:92:a3:80:69:db:53:04:26:ab:b4"
-    ]
-  }
-}
-```
-
-### List Cross-Cluster Revocations
-
-This endpoint returns a list of serial numbers that have been revoked on any
-cluster, along with the clusters that have a copy of that revoked certificate.
-
-| Method | Path                     |
-| :----- | :----------------------- |
-| `LIST` | `/certs/unified-revoked` |
-
-#### Sample Request
-
-```shell-session
-$ curl \
-    --header "X-Vault-Token: ..." \
-    --request LIST \
-    http://127.0.0.1:8200/v1/pki/certs/unified-revoked
-```
-
-#### Sample Response
-
-```json
-{
-  "data": {
-    "key_info": {
-      "7f:fd:12:5b:16:29:bb:28:ea:24:bc:a1:80:f7:4e:6e:a0:69:b9:95": {
-        "revoking_clusters": [
-          "48327b28-8325-6d79-6a0b-4cbaa6f27b4a"
-        ]
-      }
-    },
-    "keys": [
-      "7f:fd:12:5b:16:29:bb:28:ea:24:bc:a1:80:f7:4e:6e:a0:69:b9:95"
-    ]
-  }
-}
-```
-
 ---
 
 ## Accessing Authority Information
@@ -1599,16 +1132,6 @@ corresponding full CRL when it has been regenerated; otherwise, some serial
 numbers may not appear in the local copy of the full CRL if the remote
 complete and delta CRLs has been regenerated.
 
-Endpoints with source `local` only include cluster-local revocations. When
-the `unified_crl` parameters is enabled in the [CRL
-configuration](#set-crl-configuration), endpoints with source `unified`
-will have revocations from all clusters. Generally use of the `unified`
-source is more consistent with expectations of external apps, but see
-the [PKI Considerations](/vault/docs/secrets/pki/considerations) page
-for a discussion on cluster size and unified CRLs/OCSP.
-
-~> Note: Unified CRLs are a Vault Enterprise only feature.
-
 These are unauthenticated endpoints.
 
 ~> **Note**: As of Vault 1.11.0, these endpoints now serve a [version 2](https://datatracker.ietf.org/doc/html/rfc5280#section-5.1.2.1) CRL response.
@@ -1620,32 +1143,20 @@ These are unauthenticated endpoints.
    header `Last-Modified` needs to be added to the mount tunable
    `allowed_response_headers`.
 
-| Method | Path                                            | Issuer    | Format                                                                            | Type     | Source  |
-| :----- | :---------------------------------------------- | :-------- | :-------------------------------------------------------------------------------- | :------- | :------ |
-| `GET`  | `/pki/cert/crl`                                 | `default` | JSON                                                                              | Complete | Local   |
-| `GET`  | `/pki/crl`                                      | `default` | DER [\[1\]](#vault-cli-with-der-pem-responses "Vault CLI With DER/PEM Responses") | Complete | Local   |
-| `GET`  | `/pki/crl/pem`                                  | `default` | PEM [\[1\]](#vault-cli-with-der-pem-responses "Vault CLI With DER/PEM Responses") | Complete | Local   |
-| `GET`  | `/pki/cert/delta-crl`                           | `default` | JSON                                                                              | Delta    | Local   |
-| `GET`  | `/pki/crl/delta`                                | `default` | DER [\[1\]](#vault-cli-with-der-pem-responses "Vault CLI With DER/PEM Responses") | Delta    | Local   |
-| `GET`  | `/pki/crl/delta/pem`                            | `default` | PEM [\[1\]](#vault-cli-with-der-pem-responses "Vault CLI With DER/PEM Responses") | Delta    | Local   |
-| `GET`  | `/pki/issuer/:issuer_ref/crl`                   | Selected  | JSON                                                                              | Complete | Local   |
-| `GET`  | `/pki/issuer/:issuer_ref/crl/der`               | Selected  | DER [\[1\]](#vault-cli-with-der-pem-responses "Vault CLI With DER/PEM Responses") | Complete | Local   |
-| `GET`  | `/pki/issuer/:issuer_ref/crl/pem`               | Selected  | PEM [\[1\]](#vault-cli-with-der-pem-responses "Vault CLI With DER/PEM Responses") | Complete | Local   |
-| `GET`  | `/pki/issuer/:issuer_ref/crl/delta`             | Selected  | JSON                                                                              | Delta    | Local   |
-| `GET`  | `/pki/issuer/:issuer_ref/crl/delta/der`         | Selected  | DER [\[1\]](#vault-cli-with-der-pem-responses "Vault CLI With DER/PEM Responses") | Delta    | Local   |
-| `GET`  | `/pki/issuer/:issuer_ref/crl/delta/pem`         | Selected  | PEM [\[1\]](#vault-cli-with-der-pem-responses "Vault CLI With DER/PEM Responses") | Delta    | Local   |
-| `GET`  | `/pki/cert/unified-crl`                         | `default` | JSON                                                                              | Complete | Unified |
-| `GET`  | `/pki/unified-crl`                              | `default` | DER [\[1\]](#vault-cli-with-der-pem-responses "Vault CLI With DER/PEM Responses") | Complete | Unified |
-| `GET`  | `/pki/unified-crl/pem`                          | `default` | PEM [\[1\]](#vault-cli-with-der-pem-responses "Vault CLI With DER/PEM Responses") | Complete | Unified |
-| `GET`  | `/pki/cert/unified-delta-crl`                   | `default` | JSON                                                                              | Delta    | Unified |
-| `GET`  | `/pki/unified-crl/delta`                        | `default` | DER [\[1\]](#vault-cli-with-der-pem-responses "Vault CLI With DER/PEM Responses") | Delta    | Unified |
-| `GET`  | `/pki/unified-crl/delta/pem`                    | `default` | PEM [\[1\]](#vault-cli-with-der-pem-responses "Vault CLI With DER/PEM Responses") | Delta    | Unified |
-| `GET`  | `/pki/issuer/:issuer_ref/unified-crl`           | Selected  | JSON                                                                              | Complete | Unified |
-| `GET`  | `/pki/issuer/:issuer_ref/unified-crl/der`       | Selected  | DER [\[1\]](#vault-cli-with-der-pem-responses "Vault CLI With DER/PEM Responses") | Complete | Unified |
-| `GET`  | `/pki/issuer/:issuer_ref/unified-crl/pem`       | Selected  | PEM [\[1\]](#vault-cli-with-der-pem-responses "Vault CLI With DER/PEM Responses") | Complete | Unified |
-| `GET`  | `/pki/issuer/:issuer_ref/unified-crl/delta`     | Selected  | JSON                                                                              | Delta    | Unified |
-| `GET`  | `/pki/issuer/:issuer_ref/unified-crl/delta/der` | Selected  | DER [\[1\]](#vault-cli-with-der-pem-responses "Vault CLI With DER/PEM Responses") | Delta    | Unified |
-| `GET`  | `/pki/issuer/:issuer_ref/unified-crl/delta/pem` | Selected  | PEM [\[1\]](#vault-cli-with-der-pem-responses "Vault CLI With DER/PEM Responses") | Delta    | Unified |
+| Method | Path                                    | Issuer    | Format                                                                            | Type     |
+| :----- | :-------------------------------------- | :-------- | :-------------------------------------------------------------------------------- | :------- |
+| `GET`  | `/pki/cert/crl`                         | `default` | JSON                                                                              | Complete |
+| `GET`  | `/pki/crl`                              | `default` | DER [\[1\]](#vault-cli-with-der-pem-responses "Vault CLI With DER/PEM Responses") | Complete |
+| `GET`  | `/pki/crl/pem`                          | `default` | PEM [\[1\]](#vault-cli-with-der-pem-responses "Vault CLI With DER/PEM Responses") | Complete |
+| `GET`  | `/pki/cert/delta-crl`                   | `default` | JSON                                                                              | Delta    |
+| `GET`  | `/pki/crl/delta`                        | `default` | DER [\[1\]](#vault-cli-with-der-pem-responses "Vault CLI With DER/PEM Responses") | Delta    |
+| `GET`  | `/pki/crl/delta/pem`                    | `default` | PEM [\[1\]](#vault-cli-with-der-pem-responses "Vault CLI With DER/PEM Responses") | Delta    |
+| `GET`  | `/pki/issuer/:issuer_ref/crl`           | Selected  | JSON                                                                              | Complete |
+| `GET`  | `/pki/issuer/:issuer_ref/crl/der`       | Selected  | DER [\[1\]](#vault-cli-with-der-pem-responses "Vault CLI With DER/PEM Responses") | Complete |
+| `GET`  | `/pki/issuer/:issuer_ref/crl/pem`       | Selected  | PEM [\[1\]](#vault-cli-with-der-pem-responses "Vault CLI With DER/PEM Responses") | Complete |
+| `GET`  | `/pki/issuer/:issuer_ref/crl/delta`     | Selected  | JSON                                                                              | Delta    |
+| `GET`  | `/pki/issuer/:issuer_ref/crl/delta/der` | Selected  | DER [\[1\]](#vault-cli-with-der-pem-responses "Vault CLI With DER/PEM Responses") | Delta    |
+| `GET`  | `/pki/issuer/:issuer_ref/crl/delta/pem` | Selected  | PEM [\[1\]](#vault-cli-with-der-pem-responses "Vault CLI With DER/PEM Responses") | Delta    |
 
 #### Parameters
 
@@ -1679,32 +1190,19 @@ $ curl \
 This endpoint retrieves an OCSP response (revocation status) for a given serial number. The request/response formats are
 based on [RFC 6960](https://datatracker.ietf.org/doc/html/rfc6960)
 
-Endpoints with source `local` only include cluster-local revocations. When
-the `unified_crl` parameters is enabled in the [CRL
-configuration](#set-crl-configuration), endpoints with source `unified`
-will have revocations from all clusters. Generally use of the `unified`
-source is more consistent with expectations of external apps, but see
-the [PKI Considerations](/vault/docs/secrets/pki/considerations) page
-for a discussion on cluster size and unified CRLs/OCSP.
-
-~> Note: Unified OCSP is a Vault Enterprise only feature.
-
-At this time there are certain limitations of the OCSP implementation at this path:
-
- 1. Only a single serial number within the request will appear in the response,
- 1. None of the extensions defined in the RFC are supported for requests or responses,
- 1. Ed25519 backed CA's are not supported for OCSP requests,
- 1. Note that this API will not work with the Vault client as both request and responses are DER encoded, and
+At this time there are certain limitations of the OCSP implementation at this path.
+ 1. Only a single serial number within the request will appear in the response
+ 1. None of the extensions defined in the RFC are supported for requests or responses
+ 1. Ed25519 backed CA's are not supported for OCSP requests
+ 1. Note that this api will not work with the Vault client as both request and responses are DER encoded
  1. Note that KMS based issuers which require PSS support are not supported either (such as PKCS#11 HSMs or GCP in certain scenarios).
 
 These are unauthenticated endpoints.
 
-| Method | Path                                                       | Response Format                                                                   | Source  |
-| :----- | :--------------------------------------------------------- | :-------------------------------------------------------------------------------- | :------ |
-| `GET`  | `/pki/ocsp/<base 64+URL encoded ocsp DER request>`         | DER [\[1\]](#vault-cli-with-der-pem-responses "Vault CLI With DER/PEM Responses") | Local   |
-| `POST` | `/pki/ocsp`                                                | DER [\[1\]](#vault-cli-with-der-pem-responses "Vault CLI With DER/PEM Responses") | Local   |
-| `GET`  | `/pki/unified-ocsp/<base 64+URL encoded ocsp DER request>` | DER [\[1\]](#vault-cli-with-der-pem-responses "Vault CLI With DER/PEM Responses") | Unified |
-| `POST` | `/pki/unified-ocsp`                                        | DER [\[1\]](#vault-cli-with-der-pem-responses "Vault CLI With DER/PEM Responses") | Unified |
+| Method | Path                                           | Response Format                                                                   |
+| :----- |:-----------------------------------------------|:----------------------------------------------------------------------------------|
+| `GET`  | `/pki/ocsp/<base 64 encoded ocsp DER request>` | DER [\[1\]](#vault-cli-with-der-pem-responses "Vault CLI With DER/PEM Responses") |
+| `POST` | `/pki/ocsp`                                    | DER [\[1\]](#vault-cli-with-der-pem-responses "Vault CLI With DER/PEM Responses") |
 
 #### Parameters
 
@@ -1811,10 +1309,7 @@ $ curl \
 ```json
 {
   "data": {
-    "certificate": "-----BEGIN CERTIFICATE-----\nMIIGmDCCBYCgAwIBAgIHBzEB3fTzhTANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UE\n...",
-    "revocation_time": 1667400107,
-    "revocation_time_rfc3339": "2022-11-02T14:41:47.327515Z",
-    "issuer_id": "e27bf456-51e1-d937-0001-4a609184fd9b"
+    "certificate": "-----BEGIN CERTIFICATE-----\nMIIGmDCCBYCgAwIBAgIHBzEB3fTzhTANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UE\n..."
   }
 }
 ```
@@ -2110,7 +1605,7 @@ use the values set via `config/urls`.
 - `not_before_duration` `(duration: "30s")` - Specifies the duration by which to
   backdate the NotBefore property. This value has no impact in the validity period
   of the requested certificate, specified in the `ttl` field.
-  Uses [duration format strings](/vault/docs/concepts/duration-format).
+  Uses [duration format strings](/docs/concepts/duration-format).
 
 - `not_after` `(string)` - Set the Not After field of the certificate with
   specified date value. The value format should be given in UTC format
@@ -2176,7 +1671,7 @@ key. If using Vault as a root (and, like many other CAs), the various parameters
 on the final signed certificate are set at signing time and _may or may not honor
 the parameters set here_ (and transmitted in the returned CSR).
 
-Note that this API supports [Managed Keys](/vault/docs/enterprise/managed-keys);
+Note that this API supports [Managed Keys](/docs/enterprise/managed-keys);
 additional details are available [below in a dedicated section](#managed-keys).
 
 The parameters below are mostly meant as a helper function; not all possible
@@ -2378,10 +1873,7 @@ issuer or key entry; duplicates (including with existing keys) will be ignored.
 The response will indicate what issuers and keys were created as part of this
 request (in the `imported_issuers` and `imported_keys`), along with a `mapping`
 field, indicating which keys belong to which issuers (including from already
-imported entries present in the same bundle). In Vault 1.14.0, the response
-also contains an `existing_issuers` and `existing_keys` fields, which specifies
-the issuer and key IDs of any entries in the bundle that already
-existed within this mount.
+imported entries present in the same bundle).
 
 | Method | Path                           | Allows private keys | Request Parameter |
 | :----- | :----------------------------- | :------------------ | :---------------- |
@@ -2403,7 +1895,7 @@ existed within this mount.
    issues; this may impact long-term use of these issuers, but some issuers or
    keys may still be imported as a result of this process.
 
-~> Warning: See the [note](/vault/docs/secrets/pki/considerations#issuer-subjects-and-crls)
+~> Warning: See the [note](/docs/secrets/pki/considerations#issuer-subjects-and-crls)
    regarding Subject naming on externally created CA certificates and
    shortcomings with CRL building.
 
@@ -2448,9 +1940,7 @@ JSON-formatted, with newlines replaced with `\n`, like so:
     "imported_keys": ["97be2525-717a-e2f7-88da-0a20e11aad88"],
     "mapping": {
       "1ae8ce9d-2f70-0761-a465-8c9840a247a2": "97be2525-717a-e2f7-88da-0a20e11aad88"
-    },
-    "existing_issuers": [],
-    "existing_keys": []
+    }
   }
 }
 ```
@@ -2628,18 +2118,6 @@ do so, import a new issuer and a new `issuer_id` will be assigned.
   [RFC 5280 Section 4.2.2.1](https://datatracker.ietf.org/doc/html/rfc5280#section-4.2.2.1)
   for information about the Authority Information Access field.
 
-- `enable_aia_url_templating` `(bool: false)` - Specifies that the above AIA
-  URL values (`issuing_certificates`, `crl_distribution_points`, and
-  `ocsp_servers`) should be templated. This replaces the literal value
-  `{{issuer_id}}` with the ID of the issuer doing the issuance, the
-  literal value `{{cluster_path}}` with the value of `path` from the
-  cluster-local configuration endpoint `/config/cluster`, and the
-  literal value '{{cluster_aia_path}}' with the value of `aia_path` from
-  the cluster-local configuration endpoint `/config/cluster`.
-
-~> **Note**: If no cluster-local address is present and templating is used,
-   issuance will fail.
-
 #### Sample Payload
 
 ```json
@@ -3047,7 +2525,7 @@ request is denied.
    `foo.*.example.com` and `bar` is a subdomain of that.
 
 - `allowed_domains_template` `(bool: false)` - When set, `allowed_domains`
-  may contain templates, as with [ACL Path Templating](/vault/docs/concepts/policies).
+  may contain templates, as with [ACL Path Templating](/docs/concepts/policies).
   Non-templated domains are also still permitted.
 
 - `allow_bare_domains` `(bool: false)` - Specifies if clients can request
@@ -3115,7 +2593,7 @@ request is denied.
   `spiffe://hostname/*`).
 
 - `allowed_uri_sans_template` `(bool: false)` - When set, `allowed_uri_sans`
-  may contain templates, as with [ACL Path Templating](/vault/docs/concepts/policies).
+  may contain templates, as with [ACL Path Templating](/docs/concepts/policies).
   Non-templated domains are also still permitted.
 
 - `allowed_other_sans` `(string: "")` - Defines allowed custom OID/UTF8-string
@@ -3285,11 +2763,6 @@ request is denied.
   correctness validation around email addresses and domain names). This allows
   non-standard CNs to be used verbatim from the request.
 
-- `allowed_user_ids` `(string: "")` - Comma separated, globbing list of User ID
-  Subject components to allow on requests. By default, no user IDs are allowed.
-  Use the bare wildcard `*` value to allow any value. See also the `user_ids`
-  request parameter.
-
 #### Sample Payload
 
 ```json
@@ -3386,11 +2859,7 @@ parameter.
    suggested to use the per-issuer AIA information instead of the global
    AIA information. If any of the per-issuer AIA fields are set, the entire
    issuer's preferences will be used instead. Otherwise, these fields are used
-   as a fallback.<br /><br />
-   This can be achieved by using _templated_ global AIA values, but setting
-   the cluster-local address in configuration. When used, this value **must**
-   be set on all performance replication clusters, otherwise issuance will
-   fail!
+   as a fallback.
 
 #### Parameters
 
@@ -3417,27 +2886,6 @@ parameter.
   [RFC 5280 Section 4.2.2.1](https://datatracker.ietf.org/doc/html/rfc5280#section-4.2.2.1)
   for information about the Authority Information Access field.
 
-- `enable_aia_url_templating` `(bool: false)` - Specifies that the above AIA
-  URL values (`issuing_certificates`, `crl_distribution_points`, and
-  `ocsp_servers`) should be templated. This replaces the literal value
-  `{{issuer_id}}` with the ID of the issuer doing the issuance, the
-  literal value `{{cluster_path}}` with the value of `path` from the
-  cluster-local configuration endpoint `/config/cluster`, and the
-  literal value '{{cluster_aia_path}}' with the value of `aia_path` from
-  the cluster-local configuration endpoint `/config/cluster`.
-
-  For example, the following values can be used globally to ensure all AIA
-  URIs use the cluster-local, per-issuer canonical reference, but with
-  the issuing CA certificate and CRL distribution points to potentially
-  use an external, non-Vault CDN.
-
-   - `issuing_certificates={{cluster_aia_path}}/issuer/{{issuer_id}}/der`
-   - `crl_distribution_points={{cluster_aia_path}}/issuer/{{issuer_id}}/crl/der`
-   - `ocsp_servers={{cluster_path}}/ocsp`
-
-~> **Note**: If no cluster-local address is present and templating is used,
-   issuance will fail.
-
 #### Sample Payload
 
 ```json
@@ -3514,7 +2962,7 @@ This endpoint allows setting the value of the default issuer.
   generation) will become the default and it will look (to anyone strictly
   using old APIs) that it is the only issuer in the mount. However, it is
   encouraged for applications to update to the newer, safer semantics
-  associated with [multi-issuer rotation](/vault/docs/secrets/pki/rotation-primitives).
+  associated with [multi-issuer rotation](/docs/secrets/pki/rotation-primitives).
 
 ~> Note: When an import creates more than one new issuer with key material
    known to this mount, no default update will occur.
@@ -3614,96 +3062,6 @@ $ curl \
 }
 ```
 
-### Read Cluster Configuration
-
-This endpoint fetches the cluster-local configuration.
-
-The cluster-local config has `path`, which sets the URL to this mount on
-a particular performance replication cluster. This is useful for populating
-`{{cluster_path}}` during AIA URL templating, but may be used for other
-values in the future.
-
-It also has `aia_path`, which allows using a non-Vault, external responder,
-setting the `{{cluster_aia_path}}` value for AIA URL templating. This is
-useful for distributing CA and CRL information over an unsecured, non-TLS
-channel.
-
-| Method | Path                  |
-| :----- | :-------------------- |
-| `GET`  | `/pki/config/cluster` |
-
-#### Sample Request
-
-```shell-session
-$ curl \
-    --header "X-Vault-Token: ..." \
-    http://127.0.0.1:8200/v1/pki/config/cluster
-```
-
-#### Sample Response
-
-```json
-{
-  "lease_id": "",
-  "renewable": false,
-  "lease_duration": 0,
-  "data": {
-    "path": "<url>",
-    "aia_path": "<url>"
-  },
-  "auth": null
-}
-```
-
-### Set Cluster Configuration
-
-This endpoint sets cluster-local configuration.
-
-The cluster-local config has `path`, which sets the URL to this mount on
-a particular performance replication cluster. This is useful for populating
-`{{cluster_path}}` during AIA URL templating, but may be used for other
-values in the future.
-
-It also has `aia_path`, which allows using a non-Vault, external responder,
-setting the `{{cluster_aia_path}}` value for AIA URL templating. This is
-useful for distributing CA and CRL information over an unsecured, non-TLS
-channel.
-
-| Method | Path                  |
-| :----- | :-------------------- |
-| `POST` | `/pki/config/cluster` |
-
-#### Parameters
-
-- `path` `(string: "")` - Specifies the path to this performance replication
-  cluster's API mount path, including any namespaces as path components.
-  For example, `https://pr-a.vault.example.com/v1/ns1/pki-root`.
-
-- `aia_path` `(string: "")` - Specifies the path to this performance replication
-  cluster's AIA distribution point; may refer to an external, non-Vault responder.
-  This is for resolving AIA URLs and providing the `{{cluster_aia_path}}` template
-  parameter and will not be used for other purposes. As such, unlike `path` above,
-  this could safely be an insecure transit mechanism (like HTTP without TLS).
-
-#### Sample Payload
-
-```json
-{
-  "path": "https://...",
-  "aia_path": "http://..."
-}
-```
-
-#### Sample Request
-
-```shell-session
-$ curl \
-    --header "X-Vault-Token: ..." \
-    --request POST \
-    --data @payload.json \
-    http://127.0.0.1:8200/v1/pki/config/cluster
-```
-
 ### Read CRL Configuration
 
 This endpoint allows getting the duration for which the generated CRL should be
@@ -3737,10 +3095,7 @@ $ curl \
     "auto_rebuild": false,
     "auto_rebuild_grace_period": "12h",
     "enable_delta": false,
-    "delta_rebuild_interval": "15m",
-    "cross_cluster_revocation": true,
-    "unified_crl": true,
-    "unified_crl_on_existing_paths": true
+    "delta_rebuild_interval": "15m"
   },
   "auth": null
 }
@@ -3779,11 +3134,6 @@ the CRL.
    and delta CRLs only executes once a minute; this prevents high system load
    but limits the granularity of the temporal options below.
 
-~> Note: The `unified_crl`, `unified_crl_on_existing_paths`, and
-   `cross_cluster_revocation` parameters are all Vault Enterprise only
-   functionality. While they appear in the responses on Vault OSS, they cannot
-   be enabled.
-
 | Method | Path              |
 | :----- | :---------------- |
 | `POST` | `/pki/config/crl` |
@@ -3791,66 +3141,22 @@ the CRL.
 #### Parameters
 
 - `expiry` `(string: "72h")` - The amount of time the generated CRL should be valid.
-
 - `disable` `(bool: false)` - Disables or enables CRL building.
-
 - `ocsp_disable` `(bool: false)` - Disables or enables the OCSP responder in Vault.
-
 - `ocsp_expiry` `(string: "12h")` - The amount of time an OCSP response can be cached for,
   (controls the NextUpdate field), useful for OCSP stapling refresh durations. Setting to 0
   should effectively disable caching in third party systems.
-
 - `auto_rebuild` `(bool: false)` - Enables or disables periodic rebuilding of
   the CRL upon expiry.
-
 - `auto_rebuild_grace_period` `(string: "12h")` - Grace period before CRL expiry
   to attempt rebuild of CRL. Must be shorter than the CRL expiry period.
-
 - `enable_delta` `(bool: false)` - Enables or disables building of delta CRLs
   with up-to-date revocation information, augmenting the last complete CRL.
   This option requires `auto_rebuild` to also be enabled.
-
 - `delta_rebuild_interval` `(string: "15m")` - Interval to check for new
   revocations on, to regenerate the delta CRL. Must be shorter than CRL
   expiry.
 
-- `cross_cluster_revocation` `(bool: false)` - Enables cross-cluster revocation
-  request queues. When a serial not issued on this local cluster is presented
-  to Vault via the [`/revoke` API](#revoke-certificate), it is replicated
-  across clusters and the cluster which issued that certificate will revoke
-  it if it is online.
-
-~> Note: API calls to revoke a certificate with Bring Your Own Certificate
-   (BYOC) will always trigger a local revocation of that certificate. No
-   cross-cluster revocation request will be created.<br /><br />
-   API calls to revoke a certificate with Proof of Possession (PoP) cannot
-   be satisfied if the certificate is not available locally and will
-   not result in a cross-cluster revocation request.
-
-~> Note: `cross_cluster_revocation` is a Vault Enterprise only feature.
-
-- `unified_crl` `(bool: false)` - Enables unified CRL and OCSP building. This
-  synchronizes all revocations between clusters; a single, unified CRL will be
-  built on the active node of the primary performance replication (PR)
-  cluster. Any node in any PR cluster will be able to serve this unified CRL
-  and respond to unified OCSP inquiries.
-
-~> Note: This option ensures existing, non-expired revocations are
-   consistently reported. If a certificate was issued and stored on one
-   cluster, but revoked via BYOC on another, this option will inform the
-   issuing cluster of the revocation.
-
-~> Note: `unified_crl` is a Vault Enterprise only feature.
-
-- `unified_crl_on_existing_paths` `(bool: false)` - Enables serving the
-  unified CRL and OCSP on the existing, previously cluster-local paths
-  (e.g., `/pki/crl` will now contain the unified CRL when enabled). This
-  allows transitioning AIA-based consumption of CRLs to a unified view
-  without having to re-issue certificates or update scripts pulling
-  a single CRL.
-
-~> Note: `unified_crl_on_existing_paths` is a Vault Enterprise only feature.
-
 #### Sample Payload
 
 ```json
@@ -3863,9 +3169,6 @@ the CRL.
   "auto_rebuild_grace_period": "8h",
   "enable_delta": "true",
   "delta_rebuild_interval": "10m",
-  "cross_cluster_revocation": true,
-  "unified_crl": true,
-  "unified_crl_on_existing_paths": true,
 }
 ```
 
@@ -3956,156 +3259,8 @@ $ curl \
 }
 ```
 
-### Combine CRLs from the Same Issuer
-
-This endpoint allows combining multiple different CRLs that have been signed by the
-same issuer into a single signed CRL. This is useful to generate a single authoritative
-CRL of revocations across distinct Vault clusters such as primary and performance replica
-clusters.
-
-
-| Method | Path                                  |
-|:-------|:--------------------------------------|
-| `POST` | `/pki/issuer/:issuer_ref/resign-crls` |
 
 
-#### Parameters
-
-- `issuer_ref` `(string: <required>)` - Reference to an existing issuer,
-  either by Vault-generated identifier, the literal string `default` to
-  refer to the currently configured default issuer, or the name assigned
-  to an issuer. This parameter is part of the request URL.
-- `crls` `(list of strings: <required>)` - A list of PEM encoded CRLs that have been
-  signed by the issuer
-- `crl_number` `(int: <required>)` - The sequence number to be written within the CRL
-  Number extension.
-- `delta_crl_base_number` `(int: -1)` - Using a value of 0 or greater specifies the base CRL revision
-  number to encode within a Delta CRL indicator extension, otherwise the extension will
-  not be added; defaults to -1.
-- `format` `(string: pem)` - The format of the combined CRL, can be "pem" or "der".
-  If "der", the value will be base64 encoded; Defaults to "pem".
-- `next_update` `(string: 72h)` - The amount of time the generated CRL should be
-  valid; defaults to 72 hours.
-
-#### Sample Payload
-
-```json
-{
-  "crl_number": "10",
-  "next_update": "24h",
-  "crls": ["<PEM crl 1>", "<PEM crl 2>"],
-  "format": "pem"
-}
-```
-
-#### Sample Request
-
-```shell-session
-$ curl \
-    --header "X-Vault-Token: ..." \
-    -request POST \
-    --data @payload.json \
-    http://127.0.0.1:8200/v1/pki/issuer/default/resign-crls
-```
-
-#### Sample Response
-
-```json
-{
-  "data": {
-    "crl": "<PEM encoded crl>"
-  }
-}
-```
-
-### Sign Revocation List
-
-This endpoint allows generating a CRL based on the provided parameter data from any external
-source and signed by the specified issuer. Values are taken verbatim from the parameters provided.
-
-**This is a potentially dangerous endpoint and only highly trusted users should have access.**
-
-| Method | Path                                           |
-|:-------|:-----------------------------------------------|
-| `POST` | `/pki/issuer/:issuer_ref/sign-revocation-list` |
-
-
-#### Parameters
-
-- `issuer_ref` `(string: <required>)` - Reference to an existing issuer,
-  either by Vault-generated identifier, the literal string `default` to
-  refer to the currently configured default issuer, or the name assigned
-  to an issuer. This parameter is part of the request URL.
-- `crl_number` `(int: <required>)` - The sequence number to be written within the CRL
-  Number extension.
-- `delta_crl_base_number` `(int: -1)` - Using a value of 0 or greater specifies the base CRL revision
-  number to encode within a Delta CRL indicator extension, otherwise the extension will
-  not be added; defaults to -1.
-- `format` `(string: pem)` - The format of the combined CRL, can be "pem" or "der".
-  If "der", the value will be base64 encoded; Defaults to "pem".
-- `next_update` `(string: 72h)` - The amount of time the generated CRL should be
-  valid; defaults to 72 hours.
-- `revoked_certs` `(type: slice of maps)` - Each element contains revocation information for a
-  single serial number along with the revocation time and the serial's extensions if any. Each
-  element can have the following key/values
-   - `serial_number` `(type: string)` - the serial number of the revoked cert
-   - `revocation_time` `(type: string)` - the revocation time, unix int format or RFC3339 encoding supported
-   - `extensions` `(type: slice of maps)` - A slice of all extensions that should be added to the revoked
-      certificate entry. Each ele,ent contains a map with the following entries
-     - `id` `(type: string)` - an ASN1 object identifier in dot notation
-     - `critical` `(type: bool)` - should the extension be marked critical
-     - `value` `(type: string)` - base64 encoded bytes for extension value
-- `extensions` `(type: slice of maps)` - A slice of all extensions that should be added to the generated
-  CRL each element containing a map with the following entries.
-   - `id` `(type: string)` - an ASN1 object identifier in dot notation
-   - `critical` `(type: bool)` - should the extension be marked critical
-   - `value` `(type: string)` - base64 encoded bytes for extension value
-
-~> **Note**:: The following extension ids are not allowed to be provided and can be influenced by other parameters
-  - `2.5.29.20`: CRL Number
-  - `2.5.29.27`: Delta CRL
-  - `2.5.29.35`: Authority Key Identifier
-
-#### Sample Payload
-
-```json
-{
-  "crl_number": "10",
-  "next_update": "24h",
-  "format": "pem",
-  "revoked_certs": [
-    {
-      "serial_number": "39:dd:2e:90:b7:23:1f:8d:d3:7d:31:c5:1b:da:84:d0:5b:65:31:58",
-      "revocation_time": "2009-11-10T23:00:00Z"
-    },
-    {
-      "serial_number": "40:33:2e:90:b7:23:1f:8d:d3:7d:31:c5:1b:da:84:d0:5b:65:31:58",
-      "revocation_time": "1257894000"
-    }
-  ]
-}
-```
-
-#### Sample Request
-
-```shell-session
-$ curl \
-    --header "X-Vault-Token: ..." \
-    -request POST \
-    --data @payload.json \
-    http://127.0.0.1:8200/v1/pki/issuer/default/sign-revocation-list
-```
-
-#### Sample Response
-
-```json
-{
-  "data": {
-    "crl": "<PEM encoded crl>"
-  }
-}
-```
-
 ### Tidy
 
 This endpoint allows tidying up the storage backend and/or CRL by removing
@@ -4135,58 +3290,13 @@ expiration time.
   performance of OCSP and CRL building, by shifting work to a tidy operation
   instead.
 
-~> Note: With multiple issuers, a CA which issued a particular revoked
-   certificate may be removed and re-added, resulting in a different issuer
-   ID value. When building CRLs, these links are automatically updated for any
-   missing or added issuers, but during OCSP this value is computed and then
-   discarded, potentially causing a performance penalty on each request.
-   During regular CA operations, it is not necessary to run this operation.
-   <br /><br />
-   It is suggested to run this tidy when removing or importing new issuers and
-   on the first upgrade to a post-1.11 Vault version, but otherwise not to run
-   it during automatic tidy operations.
-
-- `tidy_expired_issuers` `(bool: false)` - Set to true to automatically remove
-  expired issuers after the `issuer_safety_buffer` duration has elapsed. We
-  log the issuer certificate on removal to allow recovery; no keys are removed
-  during this process.
-
-~> Note: The default issuer will not be removed even if it has expired and is
-   past the `issuer_safety_buffer` specified.
-
-- `tidy_move_legacy_ca_bundle` `(bool: false)` - Set to true to backup any
-  legacy CA/issuers bundle (from Vault versions earlier than 1.11) to
-  `config/ca_bundle.bak`. This can be restored with `sys/raw` back to
-  `config/ca_bundle` if necessary, but won't impact mount startup (as
-  mounts will attempt to read the latter and do a migration of CA issuers
-  if present). Migration will only occur after `issuer_safety_buffer` has
-  passed since the last successful migration.
-
-- `tidy_revocation_queue` `(bool: false)` - Set to true to remove stale
-  revocation request entries that haven't been confirmed by any active
-  node of a performance replication (PR) cluster. Only runs on the active
-  node of the primary cluster.
-
-~> Note: this tidy is only applicable on Vault Enterprise.
-
-- `tidy_cross_cluster_revoked_certs` `(bool: false)` - Set to true to remove
-  expired, cross-cluster revocation entries. This is the cross-cluster
-  equivalent of `tidy_revoked_certs`. Only runs on the active node of the
-  primary cluster.
-
-~> Note: this tidy is only applicable on Vault Enterprise.
-
-- `safety_buffer` `(string: "")` - Specifies a duration using [duration format strings](/vault/docs/concepts/duration-format)
+- `safety_buffer` `(string: "")` - Specifies a duration using [duration format strings](/docs/concepts/duration-format)
   used as a safety buffer to ensure certificates are not expunged prematurely; as an example, this can keep
   certificates from being removed from the CRL that, due to clock skew, might
   still be considered valid on other hosts. For a certificate to be expunged,
   the time must be after the expiration time of the certificate (according to
   the local clock) plus the duration of `safety_buffer`. Defaults to `72h`.
 
-- `issuer_safety_buffer` `(string: "")` - Specifies a duration that issuers
-  should be kept for, past their `NotAfter` validity period. Defaults to
-  365 days as hours (`8760h`).
-
 - `pause_duration` `(string: "0s")` - Specifies the duration to pause
   between tidying individual certificates. This releases the revocation
   lock and allows other operations to continue while tidy is paused.
@@ -4195,37 +3305,11 @@ expiration time.
   between reading, parsing, and updates on-disk cert entries will be
   increased, decreasing resource utilization.
 
-  Does not affect `tidy_expired_issuers`.
-
 ~> Note: Using too long of a `pause_duration` can result in tidy operations
    not concluding during this lifetime! Using too short of a pause duration
    (but non-zero) can lead to lock contention. Use [tidy's cancellation](#cancel-tidy)
    to stop a running operation after the sleep period is over.
 
-- `revocation_queue_safety_buffer` `(string: "")` - Specifies a duration
-  after which cross-cluster revocation requests will be removed as expired.
-  This should be set high enough that, if a cluster disappears for a while
-  but later comes back, any revocation requests which it should process will
-  still be there, but not too long as to fill up storage with too many invalid
-  requests. Defaults to `48h`.
-
- - `tidy_acme` `(bool: false)` - Set to true to tidy stale ACME accounts,
-   orders, authorizations, EABs, and challenges. ACME orders are tidied (deleted)
-   `safety_buffer` after the certificate associated with them expires, or after
-   the order and relevant authorizations have expired if no certificate was
-   produced. Authorizations are tidied with the corresponding order.
-
-   When a valid ACME Account is at least `acme_account_safety_buffer`
-   old, and has no remaining orders associated with it, the account is
-   marked as revoked. After another `acme_account_safety_buffer` has
-   passed from the revocation or deactivation date, a revoked or
-   deactivated ACME account is deleted.
-
- - `acme_account_safety_buffer` `(string: "720h")` - The amount of time that
-   must pass after creation that an account with no orders is marked revoked,
-   and the amount of time after being marked revoked or deactivated. The
-   default is 30 days as hours.
-
 #### Sample Payload
 
 ```json
@@ -4244,57 +3328,7 @@ $ curl \
     http://127.0.0.1:8200/v1/pki/tidy
 ```
 
-### Read Automatic Tidy Configuration
-
-This endpoint fetches the current automatic tidy configuration.
-
-This is the combination of the periodic invocation parameters described
-[in the below write handler](#set-automatic-tidy-configuration) and
-the tidy parameters [described above in the tidy endpoint](#tidy).
-
-| Method | Path                    |
-| :----- | :---------------------- |
-| `GET`  | `/pki/config/auto-tidy` |
-
-#### Sample Request
-
-```shell-session
-$ curl \
-    --header "X-Vault-Token: ..." \
-    http://127.0.0.1:8200/v1/pki/config/auto-tidy
-```
-
-#### Sample Response
-
-```json
-{
-  "lease_id": "",
-  "renewable": false,
-  "lease_duration": 0,
-  "data": {
-    "enabled": false,
-    "interval_duration": 43200,
-    "issuer_safety_buffer": 31536000,
-    "maintain_stored_certificate_counts": false,
-    "pause_duration": "0s",
-    "publish_stored_certificate_count_metrics": false,
-    "revocation_queue_safety_buffer": 172800,
-    "safety_buffer": 259200,
-    "tidy_cert_store": false,
-    "tidy_cross_cluster_revoked_certs": false,
-    "tidy_expired_issuers": false,
-    "tidy_move_legacy_ca_bundle": false,
-    "tidy_revocation_queue": false,
-    "tidy_revoked_cert_issuer_associations": false,
-    "tidy_revoked_certs": false
-  },
-  "auth": null
-}
-```
-
-<a name="configure-automatic-tidy"></a>
-
-### Set Automatic Tidy Configuration
+### Configure Automatic Tidy
 
 This endpoint allows configuring periodic tidy operations, using the tidy mechanism
 described above. Status is from automatically run tidies are still reported at the
@@ -4306,30 +3340,33 @@ status endpoint described below.
 
 #### Parameters
 
-The below parameters are in addition to the regular parameters accepted by the
-[`/pki/tidy` endpoint](#tidy) documented above.
-
 - `enabled` `(bool: false)` - Specifies whether automatic tidy is enabled or not.
 
 - `interval_duration` `(string: "")` - Specifies the duration between automatic tidy
   operations; note that this is from the end of one operation to the start of
   the next so the time of the operation itself does not need to be considered.
-  Defaults to 12h
 
-- `maintain_stored_certificate_counts` `(bool: false)` - When enabled,
-  maintains expensive counts of certificates. During initialization of the
-  mount, a LIST of all certificates is performed to get a baseline figure and
-  throughout operations like issuance, revocation, and subsequent tidies, the
-  figure is updated.
+- `tidy_cert_store` `(bool: false)` - Specifies whether to tidy up the certificate
+  store.
+
+- `tidy_revoked_certs` `(bool: false)` - Set to true to remove all invalid and
+  expired certificates from storage. A revoked storage entry is considered
+  invalid if the entry is empty, or the value within the entry is empty. If a
+  certificate is removed due to expiry, the entry will also be removed from the
+  CRL, and the CRL will be rotated.
+
+- `tidy_revoked_cert_issuer_associations` `(bool: false)` - Set to true to associate
+  revoked certificates with their corresponding issuers; this improves the
+  performance of OCSP and CRL building, by shifting work to a tidy operation
+  instead.
 
-~> *Note*: It is strongly recommend to not enable this value if 50k or more
-   certificates are stored in the mount or if many PKI mounts are in use in
-   this cluster. Instead, use audit logs and aggregate this data externally
-   to Vault so as not to impact Vault performance.
+- `safety_buffer` `(string: "")` - Specifies a duration using [duration format strings](/docs/concepts/duration-format)
+  used as a safety buffer to ensure certificates are not expunged prematurely; as an example, this can keep
+  certificates from being removed from the CRL that, due to clock skew, might
+  still be considered valid on other hosts. For a certificate to be expunged,
+  the time must be after the expiration time of the certificate (according to
+  the local clock) plus the duration of `safety_buffer`. Defaults to `72h`.
 
-- `publish_stored_certificate_count_metrics` `(bool: false)` - When enabled,
-  publishes the value computed by `maintain_stored_certificate_counts` to
-  the mount's metrics. This requires the former to be enabled.
 
 #### Sample Payload
 
@@ -4357,11 +3394,10 @@ This is a read only endpoint that returns information about the current tidy
 operation, or the most recent if none are currently running.
 
 The result includes the following fields:
-
 * `safety_buffer`: the value of this parameter when initiating the tidy operation
 * `tidy_cert_store`: the value of this parameter when initiating the tidy operation
 * `tidy_revoked_certs`: the value of this parameter when initiating the tidy operation
-* `state`: one of *Inactive*, *Running*, *Finished*, *Error*, *Cancelling*, or *Cancelled*
+* `state`: one of *Inactive*, *Running*, *Finished*, *Error*
 * `error`: the error message, if the operation ran into an error
 * `time_started`: the time the operation started
 * `time_finished`: the time the operation finished
@@ -4369,18 +3405,6 @@ The result includes the following fields:
   *Tidying revoked certificates: checking certificate N of TOTAL*
 * `cert_store_deleted_count`: The number of certificate storage entries deleted
 * `revoked_cert_deleted_count`: The number of revoked certificate entries deleted
-* `missing_issuer_cert_count`: The number of revoked certificates which were missing a valid issuer reference
-* `tidy_expired_issuers`: the value of this parameter when initiating the tidy operation
-* `issuer_safety_buffer`: the value of this parameter when initiating the tidy operation
-* `tidy_move_legacy_ca_bundle`: the value of this parameter when initiating the tidy operation
-* `tidy_revocation_queue`: the value of this parameter when initiating the tidy operation
-* `revocation_queue_deleted_count`: the number of revocation queue entries deleted
-* `tidy_cross_cluster_revoked_certs`: the value of this parameter when initiating the tidy operation
-* `cross_revoked_cert_deleted_count`: the number of cross-cluster revoked certificate entries deleted
-* `revocation_queue_safety_buffer`: the value of this parameter when initiating the tidy operation
-* `pause_duration`: the value of this parameter when initiating the tidy operation
-* `last_auto_tidy_finished`: the time when the last auto-tidy operation finished; may be different than `time_finished` especially if the last operation was a manually executed tidy operation. Set to current time at mount time to delay the initial auto-tidy operation; not persisted.
-
 
 | Method | Path               |
 | :----- | :----------------- |
@@ -4457,7 +3481,7 @@ $ curl \
 
 ## Cluster Scalability
 
-See [PKI Cluster Scalability](/vault/docs/secrets/pki/considerations#cluster-scalability) in the considerations page.
+See [PKI Cluster Scalability](/docs/secrets/pki/considerations#cluster-scalability) in the considerations page.
 
 ## Managed Keys
 
@@ -4485,5 +3509,5 @@ operations behave the same, with no other special configuration or parameters re
 ## Vault CLI with DER/PEM responses
 
 The Vault CLI can only display JSON responses. For APIs that return non-JSON formatted
-data such as DER and PEM formats, `vault read` will fail without the `-format=raw`
-option added in Vault 1.13 or another client such as `curl` must be used.
+data such as DER and PEM formats, `vault read` will fail and another client such as curl
+must be used.
diff --git a/website/content/api-docs/secret/rabbitmq.mdx b/website/content/api-docs/secret/rabbitmq.mdx
index df14f54e103a4..e3da050084b50 100644
--- a/website/content/api-docs/secret/rabbitmq.mdx
+++ b/website/content/api-docs/secret/rabbitmq.mdx
@@ -8,7 +8,7 @@ description: This is the API documentation for the Vault RabbitMQ secrets engine
 
 This is the API documentation for the Vault RabbitMQ secrets engine. For general
 information about the usage and operation of the RabbitMQ secrets engine, please
-see the [RabbitMQ documentation](/vault/docs/secrets/rabbitmq).
+see the [RabbitMQ documentation](/docs/secrets/rabbitmq).
 
 This documentation assumes the RabbitMQ secrets engine is enabled at the
 `/rabbitmq` path in Vault. Since it is possible to enable secrets engines at any
@@ -33,10 +33,10 @@ RabbitMQ.
 
 - `verify_connection` `(bool: true)` – Specifies whether to verify connection URI, username, and password.
 
-- `password_policy` `(string: "")` - Specifies a [password policy](/vault/docs/concepts/password-policies) to
+- `password_policy` `(string: "")` - Specifies a [password policy](/docs/concepts/password-policies) to
   use when creating dynamic credentials. Defaults to generating an alphanumeric password if not set.
 
-- `username_template` `(string)` - [Template](/vault/docs/concepts/username-templating) describing how
+- `username_template` `(string)` - [Template](/docs/concepts/username-templating) describing how
   dynamic usernames are generated.
 
 ### Sample Payload
diff --git a/website/content/api-docs/secret/ssh.mdx b/website/content/api-docs/secret/ssh.mdx
index 21fcb60b05a26..6c685e2a5674b 100644
--- a/website/content/api-docs/secret/ssh.mdx
+++ b/website/content/api-docs/secret/ssh.mdx
@@ -8,13 +8,69 @@ description: This is the API documentation for the Vault SSH secrets engine.
 
 This is the API documentation for the Vault SSH secrets engine. For general
 information about the usage and operation of the SSH secrets engine, please see
-the [SSH documentation](/vault/docs/secrets/ssh).
+the [SSH documentation](/docs/secrets/ssh).
 
 This documentation assumes the SSH secrets engine is enabled at the `/ssh` path
 in Vault. Since it is possible to enable secrets engines at any location, please
 update your API calls accordingly.
 
-## Create/Update Role
+## Create/Update Key
+
+This endpoint creates or updates a named key.
+
+| Method | Path              |
+| :----- | :---------------- |
+| `POST` | `/ssh/keys/:name` |
+
+### Parameters
+
+- `name` `(string: <required>)` – Specifies the name of the key to create. This
+  is part of the request URL.
+
+- `key` `(string: <required>)` – Specifies an SSH private key with appropriate
+  privileges on remote hosts.
+
+### Sample Payload
+
+```json
+{
+  "key": "..."
+}
+```
+
+### Sample Request
+
+```shell-session
+$ curl \
+    --header "X-Vault-Token: ..." \
+    --request POST \
+    --data @payload.json \
+    http://127.0.0.1:8200/v1/ssh/keys/my-key
+```
+
+## Delete Key
+
+This endpoint deletes a named key.
+
+| Method   | Path              |
+| :------- | :---------------- |
+| `DELETE` | `/ssh/keys/:name` |
+
+### Parameters
+
+- `name` `(string: <required>)` – Specifies the name of the key to delete. This
+  is part of the request URL.
+
+### Sample Request
+
+```shell-session
+$ curl \
+    --header "X-Vault-Token: ..." \
+    --request DELETE \
+    http://127.0.0.1:8200/v1/ssh/keys/my-key
+```
+
+## Create Role
 
 This endpoint creates or updates a named role.
 
@@ -27,11 +83,21 @@ This endpoint creates or updates a named role.
 - `name` `(string: <required>)` – Specifies the name of the role to create. This
   is part of the request URL.
 
+- `key` `(string: "")` – Specifies the name of the registered key in Vault.
+  Before creating the role, use the `keys/` endpoint to create a named key. This
+  is required for "Dynamic Key" type.
+
+- `admin_user` `(string: "")` – Specifies the admin user at remote host. The
+  shared key being registered should be for this user and should have root or
+  sudo privileges. Every time a dynamic credential is generated for a client,
+  Vault uses this admin username to login to remote host and install the
+  generated credential. This is required for Dynamic Key type.
+
 - `default_user` `(string: "")` – Specifies the default username for which a
   credential will be generated. When the endpoint `creds/` is used without a
   username, this value will be used as default username. Its recommended to
   create individual roles for each username to ensure absolute isolation between
-  usernames. This is required for OTP type roles.
+  usernames. This is required for Dynamic Key type and OTP type.
 
   When `default_user_template` is set to `true`, this field can contain an identity
   template with any prefix or suffix, like `ssh-{{identity.entity.id}}-user`.
@@ -60,7 +126,13 @@ This endpoint creates or updates a named role.
   will be returned to the client by Vault along with the OTP.
 
 - `key_type` `(string: <required>)` – Specifies the type of credentials
-  generated by this role. This can be either `otp` or `ca`.
+  generated by this role. This can be either `otp`, `dynamic` or `ca`.
+
+- `key_bits` `(int: 1024)` – Specifies the length of the RSA dynamic key in
+  bits. This can be either 1024 or 2048.
+
+- `install_script` `(string: "")` – Specifies the script used to install and
+  uninstall public keys in the target machine. Defaults to the built-in script.
 
 - `allowed_users` `(string: "")` – If this option is not specified, or if it is
   `*`, the client can request a credential for any valid user at the remote
@@ -86,6 +158,10 @@ This endpoint creates or updates a named role.
   specified using identity template policies. Non-templated domains are also
   permitted.
 
+- `key_option_specs` `(string: "")` – Specifies a comma separated option
+  specification which will be prefixed to RSA keys in the remote host's
+  authorized_keys file. N.B.: Vault does not check this string for validity.
+
 - `ttl` `(string: "")` – Specifies the Time To Live value provided as a string
   duration with time suffix. Hour is the largest suffix. If not set, uses the
   system default value or the value of `max_ttl`, whichever is shorter.
@@ -185,7 +261,7 @@ This endpoint creates or updates a named role.
   explicit `algorithm_signer=rsa-sha` parameter or has been migrated to such.
 
 - `not_before_duration` `(duration: "30s")` – Specifies the duration by which to
-  backdate the `ValidAfter` property. Uses [duration format strings](/vault/docs/concepts/duration-format).
+  backdate the `ValidAfter` property. Uses [duration format strings](/docs/concepts/duration-format).
 
 ### Sample Payload
 
@@ -228,6 +304,19 @@ $ curl \
 
 ### Sample Response
 
+For a dynamic key role:
+
+```json
+{
+  "admin_user": "username",
+  "cidr_list": "x.x.x.x/y",
+  "default_user": "username",
+  "key": "<key name>",
+  "key_type": "dynamic",
+  "port": 22
+}
+```
+
 For an OTP role:
 
 ```json
@@ -285,6 +374,9 @@ $ curl \
     "key_info": {
       "dev": {
         "key_type": "ca"
+      },
+      "prod": {
+        "key_type": "dynamic"
       }
     }
   },
@@ -435,6 +527,31 @@ $ curl \
 
 ### Sample Response
 
+For a dynamic key role:
+
+```json
+{
+  "lease_id": "",
+  "renewable": false,
+  "lease_duration": 0,
+  "data": {
+    "admin_user": "rajanadar",
+    "allowed_users": "",
+    "cidr_list": "x.x.x.x/y",
+    "default_user": "rajanadar",
+    "exclude_cidr_list": "x.x.x.x/y",
+    "install_script": "pretty_large_script",
+    "key": "5d9ee6a1-c787-47a9-9738-da243f4f69bf",
+    "key_bits": 1024,
+    "key_option_specs": "",
+    "key_type": "dynamic",
+    "port": 22
+  },
+  "warnings": null,
+  "auth": null
+}
+```
+
 For an OTP role:
 
 ```json
@@ -652,11 +769,7 @@ $ curl \
 This endpoint returns the configured/generated public key. This is an unauthenticated
 endpoint.
 
-~> Note: this is a raw response endpoint without JSON encoding; use
-   `vault read -format=raw` or an external tool (e.g., `curl`) to fetch this
-   value.
-
-| Method | Path              | Content-Type     |
+| Method | Path              |
 | :----- | :---------------- | ---------------- |
 | `GET`  | `/ssh/public_key` | `200 text/plain` |
 
@@ -879,48 +992,3 @@ $ curl \
   "auth": null
 }
 ```
-
-## Tidy Host Keys
-
-This endpoint removes all existing host keys from Vault, if any are present.
-These keys were used with the Dynamic Keys functionality, which were removed
-from this engine.
-
-~> Note: This does not clean up any pending dynamic key leases and will not
-   remove these keys from systems with authorized hosts entries created by
-   Vault. That must be done manually by an operator, potentially before the
-   removal of these host keys if they are necessary to access these
-   systems.<br /><br />
-   For a more effective cleanup process, it is suggest to stay on Vault 1.12,
-   manually revoke all dynamic key leases, wait for this to finish, and then
-   upgrade to Vault 1.13+.
-
-| Method   | Path                     |
-| :------- | :----------------------- |
-| `DELETE` | `/ssh/tidy/dynamic-keys` |
-
-### Sample Request
-
-```shell-session
-$ curl \
-    --header "X-Vault-Token: ..." \
-    --request DELETE \
-    http://127.0.0.1:8200/v1/ssh/issue/my-role
-```
-
-### Sample Response
-
-```json
-{
-  "request_id": "",
-  "lease_id": "",
-  "renewable": false,
-  "lease_duration": 0,
-  "data": {
-    "message": "Removed 15 of 15 host keys."
-  },
-  "wrap_info": null,
-  "warnings": null,
-  "auth": null
-}
-```
diff --git a/website/content/api-docs/secret/terraform.mdx b/website/content/api-docs/secret/terraform.mdx
index 2ab1d7c480d74..9d9e6893fa236 100644
--- a/website/content/api-docs/secret/terraform.mdx
+++ b/website/content/api-docs/secret/terraform.mdx
@@ -8,7 +8,7 @@ description: This is the API documentation for the Vault Terraform Cloud secret
 
 This is the API documentation for the Vault Terraform Cloud secret backend. For general
 information about the usage and operation of the Terraform Cloud backend, please see the
-[Vault Terraform Cloud backend documentation](/vault/docs/secrets/terraform).
+[Vault Terraform Cloud backend documentation](/docs/secrets/terraform).
 
 This documentation assumes the Terraform Cloud backend is mounted at the `/terraform` path
 in Vault. Since it is possible to mount secret backends at any location, please
@@ -102,7 +102,7 @@ with the `/rotate-role` endpoint.
 
 Please see the [Terraform Cloud API
 Token documentation for more
-information](/terraform/cloud-docs/users-teams-organizations/api-tokens).
+information](https://www.terraform.io/cloud-docs/users-teams-organizations/api-tokens).
 
 | Method | Path                    |
 | :----- | :---------------------- |
@@ -126,11 +126,11 @@ information](/terraform/cloud-docs/users-teams-organizations/api-tokens).
 
 - `ttl` `(duration: "")` – Specifies the TTL for this role. If not
   provided, the default Vault TTL is used. Only applies to User API tokens.
-  Uses [duration format strings](/vault/docs/concepts/duration-format).
+  Uses [duration format strings](/docs/concepts/duration-format).
 
 - `max_ttl` `(duration: "")` – Specifies the max TTL for this role. If not
   provided, the default Vault Max TTL is used. Only applies to User API tokens.
-  Uses [duration format strings](/vault/docs/concepts/duration-format).
+  Uses [duration format strings](/docs/concepts/duration-format).
 
 ### Sample Payload
 
diff --git a/website/content/api-docs/secret/totp.mdx b/website/content/api-docs/secret/totp.mdx
index 6e3d78fc5630c..f04e2a6c3d90d 100644
--- a/website/content/api-docs/secret/totp.mdx
+++ b/website/content/api-docs/secret/totp.mdx
@@ -8,7 +8,7 @@ description: This is the API documentation for the Vault TOTP secrets engine.
 
 This is the API documentation for the Vault TOTP secrets engine. For general
 information about the usage and operation of the TOTP secrets engine, please see
-the [TOTP documentation](/vault/docs/secrets/totp).
+the [TOTP documentation](/docs/secrets/totp).
 
 This documentation assumes the TOTP secrets engine is enabled at the `/totp`
 path in Vault. Since it is possible to enable secrets engines at any location,
diff --git a/website/content/api-docs/secret/transform.mdx b/website/content/api-docs/secret/transform.mdx
index bfb161d11e88f..ce56cd4ff801f 100644
--- a/website/content/api-docs/secret/transform.mdx
+++ b/website/content/api-docs/secret/transform.mdx
@@ -8,7 +8,7 @@ description: This is the API documentation for the Transform secrets engine.
 
 This is the API documentation for the Transform secrets engine. For general
 information about the usage and operation of the secrets engine, please see the
-[Transform secrets engine documentation](/vault/docs/secrets/transform).
+[Transform secrets engine documentation](/docs/secrets/transform).
 
 This documentation assumes the transform secrets engine is enabled at the
 `/transform` path in Vault. Since it is possible to enable secrets engines at any
@@ -981,7 +981,7 @@ The database user configured here should only have permission to `SELECT`,
 
 - `max_connection_lifetime` `(duration: 0)` -
   The maximum amount of time a connection can be open before closing it.
-  0 means no limit. Uses [duration format strings](/vault/docs/concepts/duration-format).
+  0 means no limit. Uses [duration format strings](/docs/concepts/duration-format).
 
 ### Sample Payloads
 
@@ -1897,7 +1897,7 @@ This endpoint starts or continues retrieving an export of tokenization
 state, including the tokens and their decoded values. This call is only
 supported on tokenization stores configured with the `exportable` mapping
 mode. Refer to the Tokenization
-[documentation](/vault/docs/secrets/transform/tokenization#security-considerations)
+[documentation](../../docs/secrets/transform/tokenization#security-considerations)
 for when to use the `exportable` mapping mode.
 Decoded values are in Base64 representation.
 
@@ -2018,7 +2018,7 @@ Only valid for tokenization transformations.
 - `auto_rotate_period` `(duration: "0", optional)` - The period at which this key
   should be rotated automatically. Setting this to "0" will disable automatic key
   rotation. This value cannot be shorter than one hour. Uses
-  [duration format strings](/vault/docs/concepts/duration-format).
+  [duration format strings](/docs/concepts/duration-format).
 
 ### Sample Payload
 
diff --git a/website/content/api-docs/secret/transit.mdx b/website/content/api-docs/secret/transit.mdx
index 1b7a9e201677f..a69bca00d27e3 100644
--- a/website/content/api-docs/secret/transit.mdx
+++ b/website/content/api-docs/secret/transit.mdx
@@ -8,7 +8,7 @@ description: This is the API documentation for the Vault Transit secrets engine.
 
 This is the API documentation for the Vault Transit secrets engine. For general
 information about the usage and operation of the Transit secrets engine, please
-see the [transit documentation](/vault/docs/secrets/transit).
+see the [transit documentation](/docs/secrets/transit).
 
 This documentation assumes the transit secrets engine is enabled at the
 `/transit` path in Vault. Since it is possible to enable secrets engines at any
@@ -64,7 +64,6 @@ values set here cannot be changed after key creation.
   - `rsa-3072` - RSA with bit size of 3072 (asymmetric)
   - `rsa-4096` - RSA with bit size of 4096 (asymmetric)
   - `hmac` - HMAC (HMAC generation, verification)
-  - `managed_key` - External key configured via the [Managed Keys](/vault/docs/enterprise/managed-keys) feature (enterprise only)
 
   ~> **Note**: In FIPS 140-2 mode, the following algorithms are not certified
      and thus should not be used: `chacha20-poly1305` and `ed25519`.
@@ -74,18 +73,14 @@ values set here cannot be changed after key creation.
      supports HMAC, and behaves identically to other algorithms with
      respect to the HMAC operations but supports key import.  By default,
      the HMAC key type uses a 256-bit key.
-
-  ~> **Note**: When key type is `managed_key`, either the `managed_key_name` or
-     `managed_key_id` parameter must be specified.
 - `key_size` `(int: "0", optional)` - The key size in bytes for algorithms
   that allow variable key sizes.  Currently only applicable to HMAC, where
-  it must be between 32 and 512 bytes.
+  it must be between 16 and 512 bytes.
 - `auto_rotate_period` `(duration: "0", optional)` – The period at which
   this key should be rotated automatically. Setting this to "0" (the default)
   will disable automatic key rotation. This value cannot be shorter than one
-  hour. Uses [duration format strings](/vault/docs/concepts/duration-format).
-- `managed_key_name` `(string: "")` - The name of the managed key to use for this transit key.
-- `managed_key_id` `(string: "")` - The UUID of the managed key to use for this transit key.
+  hour. Uses [duration format strings](/docs/concepts/duration-format).
+
 ### Sample Payload
 
 ```json
@@ -110,17 +105,6 @@ $ curl \
 This endpoint imports existing key material into a new transit-managed encryption key.
 To import key material into an existing key, see the `import_version/` endpoint.
 
-This supports one of two forms:
-
- 1. Private/Symmetric Key import, requiring the `ciphertext`, `hash_function`
-    parameters be set (and automatically deriving the public key), or
- 2. Public Key-only import, restricting the operations that can be done with
-    this key, and requiring only the `public_key` parameter.
-
-The remaining parameters (including `name`, `type`, `allow_rotation`,
-`derived`, `context`, `exportable`, `allow_plaintext_backup`, and
-`auto_rotate_period`) remain the same across both versions of this call.
-
 | Method | Path                         |
 | :----- | :--------------------------- |
 | `POST` | `/transit/keys/:name/import` |
@@ -135,9 +119,8 @@ two values: an ephemeral 256-bit AES key wrapped using the wrapping key
 returned by Vault and the encryption of the import key material under the
 provided AES key. The wrapped AES key should be the first 512 bytes of the
 ciphertext, and the encrypted key material should be the remaining bytes.
-See the BYOK section of the [Transit secrets engine documentation](/vault/docs/secrets/transit#bring-your-own-key-byok)
-for more information on constructing the ciphertext. If `public_key` is set,
-this field is not required.
+See the BYOK section of the [Transit secrets engine documentation](/docs/secrets/transit#bring-your-own-key-byok)
+for more information on constructing the ciphertext.
 
 - `hash_function` `(string: "SHA256")` - The hash function used for the
 RSA-OAEP step of creating the ciphertext. Supported hash functions are:
@@ -163,11 +146,6 @@ the hash function defaults to SHA256.
   - `rsa-3072` - RSA with bit size of 3072 (asymmetric)
   - `rsa-4096` - RSA with bit size of 4096 (asymmetric)
 
-- `public_key` `(string: "", optional)` - A plaintext PEM public key to be
-imported. This limits the operations available under this key to verification
-and encryption, depending on the key type and algorithm, as no private key
-is available.
-
 - `allow_rotation` `(bool: false)` - If set, the imported key can be rotated
 within Vault by using the `rotate` endpoint.
 
@@ -216,12 +194,6 @@ $ curl \
 
 This endpoint imports new key material into an existing imported key.
 
-See description and note in [Import Key](#import-key) above about importing
-public and private keys.
-
-Notably, using this method, a private key matching a public key can be
-imported at a later date.
-
 | Method | Path                                 |
 | :----- | :----------------------------------- |
 | `POST` | `/transit/keys/:name/import_version` |
@@ -240,7 +212,7 @@ two values: an ephemeral 256-bit AES key wrapped using the wrapping key
 returned by Vault and the encryption of the import key material under the
 provided AES key. The wrapped AES key should be the first 512 bytes of the
 ciphertext, and the encrypted key material should be the remaining bytes.
-See the BYOK section of the [Transit secrets engine documentation](/vault/docs/secrets/transit#bring-your-own-key-byok)
+See the BYOK section of the [Transit secrets engine documentation](/docs/secrets/transit#bring-your-own-key-byok)
 for more information on constructing the ciphertext.
 
 - `hash_function` `(string: "SHA256")` - The hash function used for the
@@ -248,18 +220,6 @@ RSA-OAEP step of creating the ciphertext. Supported hash functions are:
 `SHA1`, `SHA224`, `SHA256`, `SHA384`, and `SHA512`. If not specified,
 the hash function defaults to SHA256.
 
-- `public_key` `(string: "", optional)` - A plaintext PEM public key to be
-imported. This limits the operations available under this key to verification
-and encryption, depending on the key type and algorithm, as no private key
-is available.
-
-- `bump_version` - By default, each operator will create a new key version.
-If set to "false", will try to update the latest version of the key,
-unless changed in parameter `version`.
-
-- `version` - Key version to be updated, if left empty "Latest" version will be updated.
-If `bump_version` is set to "true", this field is ignored.
-
 ### Sample Payload
 
 ```json
@@ -454,7 +414,7 @@ are returned during a read operation on the named key.)
 - `auto_rotate_period` `(duration: "", optional)` – The period at which this
   key should be rotated automatically. Setting this to "0" will disable automatic
   key rotation. This value cannot be shorter than one hour. When no value is
-  provided, the period remains unchanged. Uses [duration format strings](/vault/docs/concepts/duration-format).
+  provided, the period remains unchanged. Uses [duration format strings](/docs/concepts/duration-format).
 
 ### Sample Payload
 
@@ -493,14 +453,6 @@ rotated within Vault, it will not support further import operations.
 | :----- | :--------------------------- |
 | `POST` | `/transit/keys/:name/rotate` |
 
-### Parameters
-
-- `managed_key_name` `(string: "")` - The name of the managed key to use for this transit key.
-- `managed_key_id` `(string: "")` - The UUID of the managed key to use for this transit key.
-
-~> **Note**: If the key to be rotated is of type `managed_key`, either the `managed_key_name` or
-   the `managed_key_id` for the new key must be provided.
-
 ### Sample Request
 
 ```shell-session
@@ -510,58 +462,6 @@ $ curl \
     http://127.0.0.1:8200/v1/transit/keys/my-key/rotate
 ```
 
-## Securely Export Key
-
-This endpoint returns a wrapped copy of the `source` key, protected by the
-`destination` key using BYOK method accepted by the
-`/transit/keys/:name/import` API. This allows an operator using two separate
-Vault instances to secure established shared key material, withing exposing
-either key in plaintext and needing to run a manual BYOK import using the
-CLI helper utility.
-
-| Method | Path                                                   |
-| :----- | :----------------------------------------------------- |
-| `GET`  | `/transit/byok-export/:destination/:source(/:version)` |
-
-### Parameters
-
-- `destination` `(string: <required>)` - Specifies the name of the key to
-  encrypt the `source` key to: this is usually another mount or cluster's
-  wrapping key (from `/transit/wrapping_key`). This is specified as part of
-  the URL.
-
-~> Note: This destination key type must be an RSA key type.
-
-- `source` `(string: <required>)` - Specifies the source key to encrypt, to
-  copy (encrypted) to another cluster. This is specified as part of the URL.
-
-- `version` `(string: "")` - Specifies the version of the source key to
-  wrap. If omitted, all versions of the key will be returned. This is
-  specified as part of the URL. If the version is set to `latest`, the
-  current key will be returned.
-
-### Sample Request
-
-```shell-session
-$ curl \
-    --header "X-Vault-Token: ..." \
-    http://127.0.0.1:8200/v1/transit/byok-export/wrapping-key/to-be-shared-key/1
-```
-
-### Sample Response
-
-```json
-{
-  "data": {
-    "name": "foo",
-    "keys": {
-      "1": "H/0T+CKQ8I82KJWpPk ... additional response elided ...",
-    }
-  }
-}
-```
-
-
 ## Export Key
 
 This endpoint returns the named key. The `keys` object shows the value of the
@@ -583,8 +483,6 @@ be valid.
   - `encryption-key`
   - `signing-key`
   - `hmac-key`
-  - `public-key`, to return the corresponding public keys of private key
-    asymmetric keys (EC with NIST P-curves or Ed25519 and RSA).
 
 - `name` `(string: <required>)` – Specifies the name of the key to read
   information about. This is specified as part of the URL.
@@ -615,77 +513,6 @@ $ curl \
 }
 ```
 
-## Write Keys Configuration
-
-This endpoint maintains global configuration across all keys. This
-allows removing the upsert capability of the `/encrypt/:key` endpoint,
-preventing new keys from being created if none exists.
-
-| Method | Path                   |
-| :----- | :--------------------- |
-| `POST` | `/transit/config/keys` |
-
-### Parameters
-
-- `disable_upsert` `(bool: false)` - Specifies whether to disable upserting on
-  encryption (automatic creation of unknown keys).
-
-### Sample Payload
-
-```json
-{
-  "disable_upsert": true
-}
-```
-
-### Sample Request
-
-```shell-session
-$ curl \
-    --header "X-Vault-Token: ..." \
-    --request POST \
-    --data @payload.json \
-    http://127.0.0.1:8200/v1/transit/config/keys
-```
-
-### Sample Response
-
-```json
-{
-  "data": {
-    "disable_upsert": true,
-  }
-}
-```
-
-## Read Keys Configuration
-
-This endpoint maintains global configuration across all keys. This
-allows removing the upsert capability of the `/encrypt/:key` endpoint,
-preventing new keys from being created if none exists.
-
-| Method | Path                   |
-| :----- | :--------------------- |
-| `GET`  | `/transit/config/keys` |
-
-### Sample Request
-
-```shell-session
-$ curl \
-    --header "X-Vault-Token: ..." \
-    http://127.0.0.1:8200/v1/transit/config/keys
-```
-
-### Sample Response
-
-```json
-{
-  "data": {
-    "disable_upsert": false,
-  }
-}
-```
-
 ## Encrypt Data
 
 This endpoint encrypts the provided plaintext using the named key. This path
@@ -696,9 +523,6 @@ requires derivation depends on whether the context parameter is empty or not).
 If the user only has `update` capability and the key does not exist, an error
 will be returned.
 
-~> Note: If upsert is disallowed by global keys configuration, `create`
-   requests will behave like `update` requests.
-
 | Method | Path                     |
 | :----- | :----------------------- |
 | `POST` | `/transit/encrypt/:name` |
@@ -711,10 +535,6 @@ will be returned.
 - `plaintext` `(string: <required>)` – Specifies **base64 encoded** plaintext to
   be encoded.
 
-- `associated_data` `(string: "")` - Specifies **base64 encoded** associated
-  data (also known as additional data or AAD) to also be authenticated with
-  AEAD ciphers (`aes128-gcm96`, `aes256-gcm`, and `chacha20-poly1305`).
-
 - `context` `(string: "")` – Specifies the **base64 encoded** context for key
   derivation. This is required if key derivation is enabled for this key.
 
@@ -729,15 +549,9 @@ will be returned.
   for any given context (and thus, any given encryption key) this nonce value is
   **never reused**.
 
-- `reference` `(string: "")` -
-  A user-supplied string that will be present in the `reference` field on the
-  corresponding `batch_results` item in the response, to assist in understanding
-  which result corresponds to a particular input. Only valid on batch requests
-  when using ‘batch_input’ below.
-
 - `batch_input` `(array<object>: nil)` – Specifies a list of items to be
   encrypted in a single batch. When this parameter is set, if the parameters
-  'plaintext', 'context' and 'nonce' are also set, they will be ignored.
+  'plaintext', 'context' and 'nonce' are also set, they will be ignored. 
   Any batch output will preserve the order of the batch input. The
   format for the input is:
 
@@ -768,10 +582,10 @@ will be returned.
   all nonces are unique for a given context. Failing to do so will severely
   impact the ciphertext's security.
 
-- `partial_failure_response_code` `(int: 400)` Ordinarily, if a batch item fails
-  to encrypt due to a bad input, but other batch items succeed, the HTTP response
+- `partial_failure_response_code` `(int: 400)` Ordinarily, if a batch item fails 
+  to encrypt due to a bad input, but other batch items succeed, the HTTP response 
   code is 400 (Bad Request).  Some applications may want to treat partial failures
-  differently.  Providing the parameter returns the given response code integer
+  differently.  Providing the parameter returns the given response code integer 
   instead of a failed status code in this case. If all values fail an error
   code is still returned.  Be warned that some failures (such as failure to
   decrypt) could be indicative of a security breach and should not be
@@ -799,7 +613,7 @@ Use the base64-encoded plaintext in the payload:
 }
 ```
 
-!> Vault HTTP API imposes a maximum request size of 32MB to prevent a denial of service attack. This can be tuned per [`listener` block](/vault/docs/configuration/listener/tcp) in the Vault server configuration.
+!> Vault HTTP API imposes a maximum request size of 32MB to prevent a denial of service attack. This can be tuned per [`listener` block](/docs/configuration/listener/tcp) in the Vault server configuration.
 
 ### Sample Request
 
@@ -836,10 +650,6 @@ This endpoint decrypts the provided ciphertext using the named key.
 
 - `ciphertext` `(string: <required>)` – Specifies the ciphertext to decrypt.
 
-- `associated_data` `(string: "")` - Specifies **base64 encoded** associated
-  data (also known as additional data or AAD) to also be authenticated with
-  AEAD ciphers (`aes128-gcm96`, `aes256-gcm`, and `chacha20-poly1305`).
-
 - `context` `(string: "")` – Specifies the **base64 encoded** context for key
   derivation. This is required if key derivation is enabled.
 
@@ -848,15 +658,9 @@ This endpoint decrypts the provided ciphertext using the named key.
   and the key was generated with Vault 0.6.1. Not required for keys created in
   0.6.2+.
 
-- `reference` `(string: "")` -
-  A user-supplied string that will be present in the `reference` field on the
-  corresponding `batch_results` item in the response, to assist in understanding
-  which result corresponds to a particular input. Only valid on batch requests
-  when using ‘batch_input’ below.
-
 - `batch_input` `(array<object>: nil)` – Specifies a list of items to be
   decrypted in a single batch. When this parameter is set, if the parameters
-  'ciphertext', 'context' and 'nonce' are also set, they will be ignored.
+  'ciphertext', 'context' and 'nonce' are also set, they will be ignored. 
   Any batch output will preserve the order of the batch input. Format
   for the input goes like this:
 
@@ -872,10 +676,10 @@ This endpoint decrypts the provided ciphertext using the named key.
     }
   ]
   ```
-- `partial_failure_response_code` `(int: 400)` Ordinarily, if a batch item fails
-  to encrypt due to a bad input, but other batch items succeed, the HTTP response
+- `partial_failure_response_code` `(int: 400)` Ordinarily, if a batch item fails 
+  to encrypt due to a bad input, but other batch items succeed, the HTTP response 
   code is 400 (Bad Request).  Some applications may want to treat partial failures
-  differently.  Providing the parameter returns the given response code integer
+  differently.  Providing the parameter returns the given response code integer 
   instead of a failed status code in this case. If all values fail an error
   code is still returned.  Be warned that some failures (such as failure to
   decrypt) could be indicative of a security breach and should not be
@@ -938,12 +742,6 @@ functionality to untrusted users or scripts.
   and the key was generated with Vault 0.6.1. Not required for keys created in
   0.6.2+.
 
-- `reference` `(string: "")` -
-  A user-supplied string that will be present in the `reference` field on the
-  corresponding `batch_results` item in the response, to assist in understanding
-  which result corresponds to a particular input. Only valid on batch requests
-  when using ‘batch_input’ below.
-
 - `batch_input` `(array<object>: nil)` – Specifies a list of items to be
   re-encrypted in a single batch. When this parameter is set, if the parameters
   'ciphertext', 'context' and 'nonce' are also set, they will be ignored.
@@ -1168,7 +966,7 @@ $ curl \
 ## Generate HMAC
 
 This endpoint returns the digest of given data using the specified hash
-algorithm and the named key. The key can be of any type supported by `transit`,
+algorithm and the named key. The key can be of any type supported by `transit`, 
 as each `transit` key version has an independent, random 256-bit HMAC secret key. If
 the key is of a type that supports rotation, the latest (current) version will
 be used.
@@ -1205,16 +1003,10 @@ be used.
 - `input` `(string: "")` – Specifies the **base64 encoded** input data. One of
   `input` or `batch_input` must be supplied.
 
-- `reference` `(string: "")` -
-  A user-supplied string that will be present in the `reference` field on the
-  corresponding `batch_results` item in the response, to assist in understanding
-  which result corresponds to a particular input. Only valid on batch requests
-  when using ‘batch_input’ below.
-
 - `batch_input` `(array<object>: nil)` – Specifies a list of items for processing.
   When this parameter is set, if the parameter 'input' is also set, it will be
   ignored. Responses are returned in the 'batch_results' array component of the
-  'data' element of the response. Any batch output will preserve the order of
+  'data' element of the response. Any batch output will preserve the order of 
   the batch input. If the input data value of an item is invalid, the
   corresponding item in the 'batch_results' will have the key 'error' with a value
   describing the error. The format for batch_input is:
@@ -1335,7 +1127,6 @@ supports signing.
   - `sha3-256`
   - `sha3-384`
   - `sha3-512`
-  - `none`
 
   ~> **Note**: In FIPS 140-2 mode, the following algorithms are not certified
      and thus should not be used: `sha3-224`, `sha3-256`, `sha3-384`, and
@@ -1351,24 +1142,13 @@ supports signing.
   }
   ```
 
-  ~> **Note**: using `hash_algorithm=none` requires setting `prehashed=true`
-     and `signature_algorithm=pkcs1v15`. This generates a `PKCSv1_5_NoOID`
-     signature rather than the `PKCSv1_5_DERnull` signature type usually
-     created. See [RFC 3447 Section 9.2](https://www.rfc-editor.org/rfc/rfc3447#section-9.2).
-
 - `input` `(string: "")` – Specifies the **base64 encoded** input data. One of
   `input` or `batch_input` must be supplied.
 
-- `reference` `(string: "")` -
-  A user-supplied string that will be present in the `reference` field on the
-  corresponding `batch_results` item in the response, to assist in understanding
-  which result corresponds to a particular input. Only valid on batch requests
-  when using ‘batch_input’ below.
-
 - `batch_input` `(array<object>: nil)` – Specifies a list of items for processing.
   When this parameter is set, any supplied 'input' or 'context' parameters will be
   ignored. Responses are returned in the 'batch_results' array component of the
-  'data' element of the response. Any batch output will preserve the order of the
+  'data' element of the response. Any batch output will preserve the order of the 
   batch input. If the input data value of an item is invalid, the
   corresponding item in the 'batch_results' will have the key 'error' with a value
   describing the error. The format for batch_input is:
@@ -1516,7 +1296,6 @@ data.
   - `sha3-256`
   - `sha3-384`
   - `sha3-512`
-  - `none`
 
   ~> **Note**: In FIPS 140-2 mode, the following algorithms are not certified
      and thus should not be used: `sha3-224`, `sha3-256`, `sha3-384`, and
@@ -1533,11 +1312,6 @@ data.
   }
   ```
 
-  ~> **Note**: using `hash_algorithm=none` requires setting `prehashed=true`
-     and `signature_algorithm=pkcs1v15`. This verifies a `PKCSv1_5_NoOID`
-     signature rather than the `PKCSv1_5_DERnull` signature type usually
-     verified. See [RFC 3447 Section 9.2](https://www.rfc-editor.org/rfc/rfc3447#section-9.2).
-
 - `input` `(string: "")` – Specifies the **base64 encoded** input data. One of
   `input` or `batch_input` must be supplied.
 
@@ -1549,21 +1323,15 @@ data.
   `/transit/hmac` function. Either this must be supplied or `signature` must be
   supplied.
 
-- `reference` `(string: "")` -
-  A user-supplied string that will be present in the `reference` field on the
-  corresponding `batch_results` item in the response, to assist in understanding
-  which result corresponds to a particular input. Only valid on batch requests
-  when using ‘batch_input’ below.
-
 - `batch_input` `(array<object>: nil)` – Specifies a list of items for processing.
   When this parameter is set, any supplied 'input', 'hmac' or 'signature' parameters
   will be ignored. 'batch_input' items should contain an 'input' parameter and
   either an 'hmac' or 'signature' parameter. All items in the batch must consistently
   supply either 'hmac' or 'signature' parameters. It is an error for some items to
   supply 'hmac' while others supply 'signature'. Responses are returned in the
-  'batch_results' array component of the 'data' element of the response. Any batch
-  output will preserve the order of the batch input. If the input data value of an
-  item is invalid, the corresponding item in the 'batch_results' will have the key
+  'batch_results' array component of the 'data' element of the response. Any batch 
+  output will preserve the order of the batch input. If the input data value of an 
+  item is invalid, the corresponding item in the 'batch_results' will have the key 
   'error' with a value describing the error. The format for batch_input is:
 
   ```json
@@ -1744,9 +1512,7 @@ name first to verify that the operation successfully completes.
 ### Sample Payload
 
 ```json
-{
-    "backup": "eyJwb2xpY3kiOnsibmFtZSI6ImFlcyIsImtleXMiOnsiMSI6eyJrZXkiOiJXK3k4Z0dOMHdiTDJLOU95NXFPN1laMGtjdzMvR0ZiNWM4STBzdlNMMnFNPSIsImhtYWNfa2V5IjoiUDBTcjh1YTJaZERNUTdPd2h4RGp1Z0U5d0JSR3Q2QXl6K0t4TzN5Z2M5ST0iLCJ0aW1lIjoiMjAxNy0xMi0wOFQxMTo1MDowOC42MTM4MzctMDU6MDAiLCJlY194IjpudWxsLCJlY195IjpudWxsLCJlY19kIjpudWxsLCJyc2Ffa2V5IjpudWxsLCJwdWJsaWNfa2V5IjoiIiwiY3JlYXRpb25fdGltZSI6MTUxMjc1MTgwOH19LCJkZXJpdmVkIjpmYWxzZSwia2RmIjowLCJjb252ZXJnZW50X2VuY3J5cHRpb24iOmZhbHNlLCJleHBvcnRhYmxlIjpmYWxzZSwibWluX2RlY3J5cHRpb25fdmVyc2lvbiI6MSwibWluX2VuY3J5cHRpb25fdmVyc2lvbiI6MCwibGF0ZXN0X3ZlcnNpb24iOjEsImFyY2hpdmVfdmVyc2lvbiI6MSwiZGVsZXRpb25fYWxsb3dlZCI6ZmFsc2UsImNvbnZlcmdlbnRfdmVyc2lvbiI6MCwidHlwZSI6MCwiYmFja3VwX2luZm8iOnsidGltZSI6IjIwMTctMTItMDhUMTE6NTA6MjkuMjI4MTU3LTA1OjAwIiwidmVyc2lvbiI6MX0sInJlc3RvcmVfaW5mbyI6bnVsbH0sImFyY2hpdmVkX2tleXMiOnsia2V5cyI6W3sia2V5IjpudWxsLCJobWFjX2tleSI6bnVsbCwidGltZSI6IjAwMDEtMDEtMDFUMDA6MDA6MDBaIiwiZWNfeCI6bnVsbCwiZWNfeSI6bnVsbCwiZWNfZCI6bnVsbCwicnNhX2tleSI6bnVsbCwicHVibGljX2tleSI6IiIsImNyZWF0aW9uX3RpbWUiOjB9LHsia2V5IjoiVyt5OGdHTjB3YkwySzlPeTVxTzdZWjBrY3czL0dGYjVjOEkwc3ZTTDJxTT0iLCJobWFjX2tleSI6IlAwU3I4dWEyWmRETVE3T3doeERqdWdFOXdCUkd0NkF5eitLeE8zeWdjOUk9IiwidGltZSI6IjIwMTctMTItMDhUMTE6NTA6MDguNjEzODM3LTA1OjAwIiwiZWNfeCI6bnVsbCwiZWNfeSI6bnVsbCwiZWNfZCI6bnVsbCwicnNhX2tleSI6bnVsbCwicHVibGljX2tleSI6IiIsImNyZWF0aW9uX3RpbWUiOjE1MTI3NTE4MDh9XX19Cg=="
-}
+  "backup": "eyJwb2xpY3kiOnsibmFtZSI6ImFlcyIsImtleXMiOnsiMSI6eyJrZXkiOiJXK3k4Z0dOMHdiTDJLOU95NXFPN1laMGtjdzMvR0ZiNWM4STBzdlNMMnFNPSIsImhtYWNfa2V5IjoiUDBTcjh1YTJaZERNUTdPd2h4RGp1Z0U5d0JSR3Q2QXl6K0t4TzN5Z2M5ST0iLCJ0aW1lIjoiMjAxNy0xMi0wOFQxMTo1MDowOC42MTM4MzctMDU6MDAiLCJlY194IjpudWxsLCJlY195IjpudWxsLCJlY19kIjpudWxsLCJyc2Ffa2V5IjpudWxsLCJwdWJsaWNfa2V5IjoiIiwiY3JlYXRpb25fdGltZSI6MTUxMjc1MTgwOH19LCJkZXJpdmVkIjpmYWxzZSwia2RmIjowLCJjb252ZXJnZW50X2VuY3J5cHRpb24iOmZhbHNlLCJleHBvcnRhYmxlIjpmYWxzZSwibWluX2RlY3J5cHRpb25fdmVyc2lvbiI6MSwibWluX2VuY3J5cHRpb25fdmVyc2lvbiI6MCwibGF0ZXN0X3ZlcnNpb24iOjEsImFyY2hpdmVfdmVyc2lvbiI6MSwiZGVsZXRpb25fYWxsb3dlZCI6ZmFsc2UsImNvbnZlcmdlbnRfdmVyc2lvbiI6MCwidHlwZSI6MCwiYmFja3VwX2luZm8iOnsidGltZSI6IjIwMTctMTItMDhUMTE6NTA6MjkuMjI4MTU3LTA1OjAwIiwidmVyc2lvbiI6MX0sInJlc3RvcmVfaW5mbyI6bnVsbH0sImFyY2hpdmVkX2tleXMiOnsia2V5cyI6W3sia2V5IjpudWxsLCJobWFjX2tleSI6bnVsbCwidGltZSI6IjAwMDEtMDEtMDFUMDA6MDA6MDBaIiwiZWNfeCI6bnVsbCwiZWNfeSI6bnVsbCwiZWNfZCI6bnVsbCwicnNhX2tleSI6bnVsbCwicHVibGljX2tleSI6IiIsImNyZWF0aW9uX3RpbWUiOjB9LHsia2V5IjoiVyt5OGdHTjB3YkwySzlPeTVxTzdZWjBrY3czL0dGYjVjOEkwc3ZTTDJxTT0iLCJobWFjX2tleSI6IlAwU3I4dWEyWmRETVE3T3doeERqdWdFOXdCUkd0NkF5eitLeE8zeWdjOUk9IiwidGltZSI6IjIwMTctMTItMDhUMTE6NTA6MDguNjEzODM3LTA1OjAwIiwiZWNfeCI6bnVsbCwiZWNfeSI6bnVsbCwiZWNfZCI6bnVsbCwicnNhX2tleSI6bnVsbCwicHVibGljX2tleSI6IiIsImNyZWF0aW9uX3RpbWUiOjE1MTI3NTE4MDh9XX19Cg=="
 ```
 
 ### Sample Request
@@ -1854,25 +1620,4 @@ $ curl \
   },
 ```
 
-## Managed Keys
-
-~> **Note**: Managed keys are an Enterprise only feature.
-
-Managed Keys can be used with the Transit Secrets Engine to perform cryptographic operations. Currently
-[Sign Data](#sign-data) and [Verify Signed Data](#verify-signed-data) are well supported, and in certain
-configurations, [Encrypt Data](#encrypt-data) and [Decrypt Data](#decrypt-data) are supported.
-
-When a Transit key is created of type `managed_key`, Transit will lookup the key by name or ID, and will
-attempt to generate the key when key generation is allowed (as specified when the [Create/Update Managed Key](/vault/api-docs/system/managed-keys#create-update-managed-key)
-endpoint is called). Key generation is currently supported for cloud KMSes and for certain PKCS#11 mechanisms
-on HSMs. This is a best effort operation, so certain KMS/HSM/key configurations will require the key to exist
-externally prior to use with Transit.
-
-For key types and mechanisms that require an IV, this value can be provided via the `nonce` parameter of
-the [Encrypt Data](#encrypt-data) and [Decrypt Data](#decrypt-data) endpoints.
-
-Signing and verifying data with a Managed Key through Transit may require pre-hashing of the data. Transit
-can be informed that data is pre-hashed with the `prehashed` parameter of the [Sign Data](#sign-data) and
-[Verify Signed Data](#verify-signed-data) endpoints.
-
-[sys-plugin-reload-backend]: /vault/api-docs/system/plugins-reload-backend#reload-plugins
+[sys-plugin-reload-backend]: /api-docs/system/plugins-reload-backend#reload-plugins
diff --git a/website/content/api-docs/system/audit.mdx b/website/content/api-docs/system/audit.mdx
index 752455349bbec..1e10e4d05e58e 100644
--- a/website/content/api-docs/system/audit.mdx
+++ b/website/content/api-docs/system/audit.mdx
@@ -101,10 +101,6 @@ $ curl \
 
 This endpoint disables the audit device at the given path.
 
-~> Note: Once an audit device is disabled, you will no longer be able to HMAC values
-for comparison with entries in the audit logs. This is true even if you re-enable
-the audit device at the same path, as a new salt will be created for hashing.
-
 - **`sudo` required** – This endpoint requires `sudo` capability in addition to
   any path-specific capabilities.
 
diff --git a/website/content/api-docs/system/auth.mdx b/website/content/api-docs/system/auth.mdx
index 64e71efc2f255..b40f7c1325032 100644
--- a/website/content/api-docs/system/auth.mdx
+++ b/website/content/api-docs/system/auth.mdx
@@ -346,33 +346,13 @@ can be achieved without `sudo` via `sys/mounts/auth/[auth-path]/tune`._
 - `plugin_version` `(string: "")` – Specifies the semantic version of the plugin
   to use, e.g. "v1.0.0". Changes will not take effect until the mount is reloaded.
 
-- `user_lockout_config` `(map<string|string>: nil)` – Specifies the user lockout configuration
-  for the mount. User lockout feature was added in Vault 1.13. These are the possible values:
-
-  - `lockout_threshold` `(string: "")` - Specifies the number of failed login attempts after 
-    which the user is locked out, specified as a string like "15".
-
-  - `lockout_duration` `(string: "")` - Specifies the duration for which an user will be locked out, 
-    specified as a string duration like "5s" or "30m".
-
-  - `lockout_counter_reset` `(string: "")` - Specifies the duration after which the lockout counter is 
-    reset with no failed login attempts, specified as a string duration like "5s" or "30m".
-
-  - `lockout_disable` `(bool: false)` - Disables the user lockout feature for this mount
-     if set to true.
-
 ### Sample Payload
 
 ```json
 {
   "default_lease_ttl": 1800,
   "max_lease_ttl": 86400,
-  "audit_non_hmac_request_keys": ["client_nonce"],
-  "user_lockout_config":{
-    "lockout_threshold":"20",
-    "lockout_duration":"5m",
-    "lockout_counter_reset":"5m"
-  }
+  "audit_non_hmac_request_keys": ["client_nonce"]
 }
 ```
 
diff --git a/website/content/api-docs/system/config-group-policy-application.mdx b/website/content/api-docs/system/config-group-policy-application.mdx
deleted file mode 100644
index de3e80926617e..0000000000000
--- a/website/content/api-docs/system/config-group-policy-application.mdx
+++ /dev/null
@@ -1,81 +0,0 @@
----
-layout: api
-page_title: /sys/config/group-policy-application - HTTP API
-description: The '/sys/config/group-policy-application' endpoint is used to configure the global mode for group policy application.
----
-
-# `/sys/config/group-policy-application`
-
-~> **Enterprise Only** – These endpoints require Vault Enterprise Platform.
-
-The `sys/config/group-policy-application` endpoint can be used to configure the
-mode of policy application for identity groups in Vault. This setting dictates
-the behavior across all groups in all namespaces in Vault.
-
-Vault allows you to add entities and groups from any namespace into an identity group.
-However, historically, any policies attached to that group would only apply when the
-Vault token authorizing a request was created in the same namespace as that group,
-or a descendent namespace. This endpoint allows relaxing that restriction: when the mode is set to the default,
-`within_namespace_hierarchy`, the historical behaviour is maintained,
-but when set to `any`, group policies apply to all members of a group,
-regardless of what namespace the request token came from.
-
-Note that this configuration will be replicated between primary and secondaries, that
-is to say, primaries cannot have a different policy application mode to secondaries.
-
-## Get Group Policy Application Information
-
-This endpoint returns the current group policy application mode, which will be
-either `within_namespace_hierarchy` or `any`.
-
-
-| Method | Path                          |
-| :----- | :---------------------------- |
-| `GET`  | `/sys/config/group-policy-application` |
-
-### Sample Request
-
-```shell-session
-$ curl \
-  --header "X-Vault-Token: ..." \
-    'http://127.0.0.1:8200/v1/sys/config/group-policy-application'
-```
-
-### Sample Response
-
-```json
-{
-   "group_policy_application_mode": "within_namespace_hierarchy"
-}
-```
-
-## Set Group Policy Application Information
-
-This endpoint allows you to modify the current group policy application mode, which can be
-either `within_namespace_hierarchy` or `any`. `within_namespace_hierarchy`
-restricts policy application to only policies from groups from parent namespaces, and
-`any` does not restrict policy application in any way, and policies will apply from any namespace,
-irrespective of namespace hierarchy.
-
-
-| Method | Path                          |
-| :----- | :---------------------------- |
-| `POST`, `PUT`  | `/sys/config/group-policy-application` |
-
-### Sample Payload
-
-```json
-{
-   "group_policy_application_mode": "any"
-}
-```
-
-### Sample Request
-
-```shell-session
-$ curl \
-  --request POST \
-  --header "X-Vault-Token: ..." \
-  --data @payload.json \
-  'http://127.0.0.1:8200/v1/sys/config/group-policy-application'
-```
diff --git a/website/content/api-docs/system/decode-token.mdx b/website/content/api-docs/system/decode-token.mdx
deleted file mode 100644
index 01cbc336de4ce..0000000000000
--- a/website/content/api-docs/system/decode-token.mdx
+++ /dev/null
@@ -1,30 +0,0 @@
----
-layout: api
-page_title: /sys/decode-token - HTTP API
-description: The `/sys/decode-token` endpoint is used to decode the encoded token which is the result of /sys/generate-root.
----
-
-# `/sys/decode-token`
-
-The `/sys/decode-token` endpoint is used to decode the encoded token which is the result of the [/sys/generate-root](/vault/api-docs/system/generate-root) API.
-
-## Parameters
-
-- `encoded_token` `(string: <required>)` – Specifies the encoded token (result from /sys/generate-root).
-
-- `otp` `(string: <required>)` - Specifies the otp code for decode.
-
-## Sample Response
-
-```json
-{
-  "request_id": "9bc0fab8-d65c-3961-afe6-d05f50c5fd22",
-  "lease_id": "",
-  "lease_duration": 0,
-  "renewable": false,
-  "data": {
-    "token": "4RUmoevJ3lsLni9sTXcNnRE1"
-  },
-  "warnings": null
-}
-```
diff --git a/website/content/api-docs/system/experiments.mdx b/website/content/api-docs/system/experiments.mdx
deleted file mode 100644
index 93a4c10ea1066..0000000000000
--- a/website/content/api-docs/system/experiments.mdx
+++ /dev/null
@@ -1,46 +0,0 @@
----
-layout: api
-page_title: /sys/experiments - HTTP API
-description: The `/sys/experiments` endpoint returns information about experiments on the Vault node.
----
-
-# `/sys/experiments`
-
-The `/sys/experiments` endpoint returns information about experiments on the Vault node.
-
-## Read Experiments
-
-This endpoint returns the experiments available and enabled on the Vault node.
-Experiments are per-node and cannot be changed while the node is running. See
-the [`-experiment`](/vault/docs/commands/server#experiment) flag and the
-[`experiments`](/vault/docs/configuration#experiments) config key documentation for
-details on enabling experiments.
-
-| Method | Path               |
-| :----- | :----------------- |
-| `GET`  | `/sys/experiments` |
-
-### Sample Request
-
-```shell-session
-$ curl \
-    http://127.0.0.1:8200/v1/sys/experiments
-```
-
-### Sample Response
-
-```json
-{
-  "request_id": "cb48b1e2-635c-52e9-db79-ad9a54ed3e88",
-  "lease_id": "",
-  "lease_duration": 0,
-  "renewable": false,
-  "data": {
-    "available": [
-      "events.alpha1"
-    ],
-    "enabled": []
-  },
-  "warnings": null
-}
-```
diff --git a/website/content/api-docs/system/init.mdx b/website/content/api-docs/system/init.mdx
index b40896ac752ce..a54d18184ea29 100644
--- a/website/content/api-docs/system/init.mdx
+++ b/website/content/api-docs/system/init.mdx
@@ -35,7 +35,7 @@ $ curl \
 
 This endpoint initializes a new Vault. The Vault must not have been previously
 initialized. The recovery options, as well as the stored shares option, are only
-available when using [Auto Unseal](/vault/docs/concepts/seal#auto-unseal).
+available when using [Auto Unseal](/docs/concepts/seal#auto-unseal).
 
 | Method | Path        |
 | :----- | :---------- |
@@ -107,10 +107,3 @@ provided) root keys, base 64 encoded root keys and initial root token:
   "root_token": "foo"
 }
 ```
-
--> **Warning:** Please be reminded that recovery keys are used as an 
-authentication flow for rekeying and regeneration of root credentials and cannot 
-be used to unseal Vault in the case of the unavailability of the seal mechanism.
-Refer to the full warning in the documentation for 
-[Auto Unseal](/vault/docs/concepts/seal#auto-unseal).
-
diff --git a/website/content/api-docs/system/inspect/index.mdx b/website/content/api-docs/system/inspect/index.mdx
deleted file mode 100644
index 33fb07c8fc353..0000000000000
--- a/website/content/api-docs/system/inspect/index.mdx
+++ /dev/null
@@ -1,22 +0,0 @@
----
-layout: api
-page_title: /sys/internal/inspect - HTTP API
-description: >-
-  This endpoint is intended to inspect a specific internal subsystem for debugging purposes, and turned off by default.
-  Once turned on, it can be accessed with a root token or sudo privileges
----
-
-# `/sys/internal/inspect`
-
-The `/sys/internal/inspect` family of endpoints is intended to inspect a specific internal subsystem for debugging purposes.
-This endpoint is off by default. See the
-[Vault configuration documentation](/vault/docs/configuration) to
-enable. Once the endpoint is turned on, it can be accessed with a root token or sudo privileges.
-
-~> **NOTE**: These endpoints are only available in Vault version 1.13+. Backwards compatibility is not guaranteed. These endpoints are subject to change or may disappear without notice.
-
-
-## Supported Inspection Paths
-
-- [Router](/vault/api-docs/system/inspect/router)
-
diff --git a/website/content/api-docs/system/inspect/router.mdx b/website/content/api-docs/system/inspect/router.mdx
deleted file mode 100644
index 5ccebf804e6c4..0000000000000
--- a/website/content/api-docs/system/inspect/router.mdx
+++ /dev/null
@@ -1,272 +0,0 @@
----
-layout: api
-page_title: /sys/internal/inspect/router - HTTP API
-description: >-
-  The '/sys/internal/inspect/router' endpoint focuses on viewing the contents of specific structures in the internal router subsystem.
----
-
-# `/sys/internal/inspect/router`
-The `/sys/internal/inspect/router` endpoint is intended for a Vault admin to inspect the internal components of Vault's router.
-This endpoint can be accessed with a root token or sudo privileges.
-
-~> **NOTE**: These endpoints are only available in Vault version 1.13+. Backwards compatibility is not guaranteed. These endpoints are subject to change or may disappear without notice.
-
-
-## Root
-
-This endpoint returns a list of router entries in the router's root tree.
-
-| Method | Path          |
-| :----- | :------------ |
-| `GET`  | `/sys/internal/inspect/router/root` |
-
-### Sample Request
-
-```shell-session
-$ curl \
-    --header "X-Vault-Token: ..." \
-    http://127.0.0.1:8200/v1/sys/internal/inspect/router/root
-```
-
-### Sample Response
-```json
-{
-  "request_id": "819de627-d3bc-27f4-0e3c-5c5fb0b204ee",
-  "lease_id": "",
-  "lease_duration": 0,
-  "renewable": false,
-  "data": {
-    "root": [
-      {
-        "accessor": "auth_token_d5fcf970",
-        "mount_namespace": "",
-        "mount_path": "token/",
-        "mount_type": "token",
-        "storage_prefix": "sys/token/",
-        "tainted": false,
-        "uuid": "de61dd8c-a181-ccc2-457d-908e417d10b0"
-      },
-      {
-        "accessor": "cubbyhole_58b6727b",
-        "mount_namespace": "",
-        "mount_path": "cubbyhole/",
-        "mount_type": "cubbyhole",
-        "storage_prefix": "logical/496bc2e4-b641-2561-1829-f6557bf1fedc/",
-        "tainted": false,
-        "uuid": "496bc2e4-b641-2561-1829-f6557bf1fedc"
-      },
-      {
-        "accessor": "identity_2ccfb6ab",
-        "mount_namespace": "",
-        "mount_path": "identity/",
-        "mount_type": "identity",
-        "storage_prefix": "logical/b15e93e0-5bf1-07b0-86d3-563f9c77eef1/",
-        "tainted": false,
-        "uuid": "b15e93e0-5bf1-07b0-86d3-563f9c77eef1"
-      },
-      {
-        "accessor": "system_0157e00a",
-        "mount_namespace": "",
-        "mount_path": "sys/",
-        "mount_type": "system",
-        "storage_prefix": "sys/",
-        "tainted": false,
-        "uuid": "8ac2615e-8a73-fe66-52a6-a422f7e3273f"
-      }
-    ]
-  },
-  "warnings": null
-}
-```
-
-## Mount UUID Cache
-
-This endpoint returns a list of mount entries in the router's mount UUID cache.
-
-| Method | Path          |
-| :----- | :------------ |
-| `GET`  | `/sys/internal/inspect/router/uuid` |
-
-### Sample Request
-
-```shell-session
-$ curl \
-    --header "X-Vault-Token: ..." \
-    http://127.0.0.1:8200/v1/sys/internal/inspect/router/uuid
-```
-
-### Sample Response
-```json
-{
-  "request_id": "71512d6c-bb77-2e05-c24e-07c964139fdb",
-  "lease_id": "",
-  "lease_duration": 0,
-  "renewable": false,
-  "data": {
-    "uuid": [
-      {
-        "accessor": "auth_token_d5fcf970",
-        "mount_namespace": "",
-        "mount_path": "token/",
-        "mount_type": "token",
-        "uuid": "de61dd8c-a181-ccc2-457d-908e417d10b0"
-      },
-      {
-        "accessor": "cubbyhole_58b6727b",
-        "mount_namespace": "",
-        "mount_path": "cubbyhole/",
-        "mount_type": "cubbyhole",
-        "uuid": "496bc2e4-b641-2561-1829-f6557bf1fedc"
-      },
-      {
-        "accessor": "system_0157e00a",
-        "mount_namespace": "",
-        "mount_path": "sys/",
-        "mount_type": "system",
-        "uuid": "8ac2615e-8a73-fe66-52a6-a422f7e3273f"
-      },
-      {
-        "accessor": "identity_2ccfb6ab",
-        "mount_namespace": "",
-        "mount_path": "identity/",
-        "mount_type": "identity",
-        "uuid": "b15e93e0-5bf1-07b0-86d3-563f9c77eef1"
-      }
-    ]
-  },
-  "warnings": null
-}
-```
-
-## Mount Accessor Cache
-
-This endpoint returns a list of mount entries in the router's mount accessor cache.
-
-| Method | Path          |
-| :----- | :------------ |
-| `GET`  | `/sys/internal/inspect/router/accessor` |
-
-### Sample Request
-
-```shell-session
-$ curl \
-    --header "X-Vault-Token: ..." \
-    http://127.0.0.1:8200/v1/sys/internal/inspect/router/accessor
-```
-
-### Sample Request
-
-```json
-{
-  "request_id": "4b7de90d-75e0-978f-bc23-23c23b19a604",
-  "lease_id": "",
-  "lease_duration": 0,
-  "renewable": false,
-  "data": {
-    "accessor": [
-      {
-        "accessor": "auth_token_d5fcf970",
-        "mount_namespace": "",
-        "mount_path": "token/",
-        "mount_type": "token",
-        "uuid": "de61dd8c-a181-ccc2-457d-908e417d10b0"
-      },
-      {
-        "accessor": "cubbyhole_58b6727b",
-        "mount_namespace": "",
-        "mount_path": "cubbyhole/",
-        "mount_type": "cubbyhole",
-        "uuid": "496bc2e4-b641-2561-1829-f6557bf1fedc"
-      },
-      {
-        "accessor": "identity_2ccfb6ab",
-        "mount_namespace": "",
-        "mount_path": "identity/",
-        "mount_type": "identity",
-        "uuid": "b15e93e0-5bf1-07b0-86d3-563f9c77eef1"
-      },
-      {
-        "accessor": "system_0157e00a",
-        "mount_namespace": "",
-        "mount_path": "sys/",
-        "mount_type": "system",
-        "uuid": "8ac2615e-8a73-fe66-52a6-a422f7e3273f"
-      }
-    ]
-  },
-  "warnings": null
-}
-```
-
-
-## Storage Prefix Tree
-
-This endpoint returns a list of mount entries in the router's storage prefix tree.
-
-| Method | Path          |
-| :----- | :------------ |
-| `GET`  | `/sys/internal/inspect/router/storage` |
-
-### Sample Request
-
-```shell-session
-$ curl \
-    --header "X-Vault-Token: ..." \
-    http://127.0.0.1:8200/v1/sys/internal/inspect/router/storage
-```
-
-### Sample Response
-
-```json
-{
-  "request_id": "ff94bb22-3d4d-8199-6882-f0e4188e10bd",
-  "lease_id": "",
-  "lease_duration": 0,
-  "renewable": false,
-  "data": {
-    "storage": [
-      {
-        "accessor": "identity_2ccfb6ab",
-        "mount_namespace": "",
-        "mount_path": "identity/",
-        "mount_type": "identity",
-        "storage_prefix": "logical/b15e93e0-5bf1-07b0-86d3-563f9c77eef1/",
-        "tainted": false,
-        "uuid": "b15e93e0-5bf1-07b0-86d3-563f9c77eef1"
-      },
-      {
-        "accessor": "system_0157e00a",
-        "mount_namespace": "",
-        "mount_path": "sys/",
-        "mount_type": "system",
-        "storage_prefix": "sys/",
-        "tainted": false,
-        "uuid": "8ac2615e-8a73-fe66-52a6-a422f7e3273f"
-      },
-      {
-        "accessor": "auth_token_d5fcf970",
-        "mount_namespace": "",
-        "mount_path": "token/",
-        "mount_type": "token",
-        "storage_prefix": "sys/token/",
-        "tainted": false,
-        "uuid": "de61dd8c-a181-ccc2-457d-908e417d10b0"
-      },
-      {
-        "accessor": "cubbyhole_58b6727b",
-        "mount_namespace": "",
-        "mount_path": "cubbyhole/",
-        "mount_type": "cubbyhole",
-        "storage_prefix": "logical/496bc2e4-b641-2561-1829-f6557bf1fedc/",
-        "tainted": false,
-        "uuid": "496bc2e4-b641-2561-1829-f6557bf1fedc"
-      }
-    ]
-  },
-  "warnings": null
-}
-```
-
-
-
-
diff --git a/website/content/api-docs/system/internal-counters.mdx b/website/content/api-docs/system/internal-counters.mdx
index 8c3ac0079d907..7147eefc9ffc2 100644
--- a/website/content/api-docs/system/internal-counters.mdx
+++ b/website/content/api-docs/system/internal-counters.mdx
@@ -106,8 +106,6 @@ previous month to the start of 12 months prior to that date.
 - As of 1.11, this behavior has been modified to return all available data within 
 the specified billing period.
 
-- As of 1.12, the `end_time` can be the current month. 
-
 - The response contains the total activity for the billing period and the
 attributions of the total activity against specific components in Vault. This
 helps in understanding the total activity better by knowing which components in
@@ -259,69 +257,9 @@ information, it will not be added to the API response.
 match the query parameters due to the month granularity of data or missing
 months in the requested time range.
 
-- Note that if the `end_date` specified is the current month, 
-the last element in the `months` response stanza, signifying the current month, will
-not have namespace attribution for the `new_clients` stanza. Furthermore, the 
-`new_clients` counts returned for the current month will be an approximation. 
-That is to say, the response will appear as follows.
-
-```json
-{
-   "months":[
-      {
-         "timestamp":"current_month_timestamp",
-         "counts":{ 
-            "distinct_entities":"exact int value",
-            "entity_clients":"exact int value",
-            "non_entity_tokens":"exact int value",
-            "non_entity_clients":"exact int value",
-            "clients":"exact int value"
-         },
-         "namespaces": [
-               {
-                  "namespace_id":"root",
-                  "namespace_path":"path",
-                  "counts":{ 
-                     "distinct_entities":"exact int value",
-                     "entity_clients":"exact int value",
-                     "non_entity_tokens":"exact int value",
-                     "non_entity_clients":"exact int value",
-                     "clients":"exact int value"
-                  },
-                  "mounts":[
-                     {
-                        "path":"auth/up2/",
-                        "counts":{ 
-                           "distinct_entities":"exact int value",
-                           "entity_clients":"exact int value",
-                           "non_entity_tokens":"exact int value",
-                           "non_entity_clients":"exact int value",
-                           "clients":"exact int value"
-                        },
-                     },
-                  ]
-               },
-         ],
-         "new_clients":{
-            "counts":{
-               "distinct_entities":"approx int value",
-               "entity_clients":"approx int value",
-               "non_entity_tokens":"approx int value",
-               "non_entity_clients":"approx int value",
-               "clients":"approx int value"
-            },
-            "namespaces":[]
-         }
-      }
-   ],
-}
-```
-
-
-Please visit the [client count](/vault/docs/concepts/client-count) concepts page for
+Please visit the [client count](/docs/concepts/client-count) concepts page for
 more information on how clients map to these client IDs and how they are
-counted, or for more information about how the new clients for the current month 
-are estimated in a billing period.
+counted.
 
 The response will include all child namespaces of the namespace in which the
 request was made. If some namespace has subsequently been deleted, its path will
@@ -346,10 +284,6 @@ This endpoint was added in Vault 1.6.
 - `limit_namespaces` `(int, optional)` - Controls the total number of by_namespace data returned. This can
    be used to return the client counts for the specified number of namespaces having highest activity. 
    If no `limit_namespaces` parameter is specified, client counts for all namespaces in specified usage period is returned.
-- `current_billing_period` `(bool, optional)` - Uses the builtin billing start
-  timestamp as `start_time` and the current time as the `end_time`, returning a
-  response with the current billing period information without having to
-  explicitly provide a start and end time.
 
 
 ### Sample Request
@@ -928,9 +862,7 @@ $ curl \
     "default_report_months": 12,
     "enabled": "default-enabled",
     "queries_available": true,
-    "retention_months": 24,
-    "reporting_enabled": false,
-    "billing_start_timestamp": "2022-03-01T00:00:00Z",
+    "retention_months": 24
   },
   "warnings": null
 }
diff --git a/website/content/api-docs/system/internal-specs-openapi.mdx b/website/content/api-docs/system/internal-specs-openapi.mdx
index 452c62ed9284f..68545600d3390 100644
--- a/website/content/api-docs/system/internal-specs-openapi.mdx
+++ b/website/content/api-docs/system/internal-specs-openapi.mdx
@@ -15,7 +15,7 @@ The set of included paths is based on the permissions of the request token.
 
 The response may include Vault-specific [extensions](https://github.com/oai/openapi-specification/blob/master/versions/3.0.2.md#specification-extensions). Three are currently defined:
 
-- `x-vault-sudo` - Endpoint requires [sudo](/vault/docs/concepts/policies#sudo) privileges.
+- `x-vault-sudo` - Endpoint requires [sudo](/docs/concepts/policies#sudo) privileges.
 - `x-vault-unauthenticated` - Endpoint is unauthenticated.
 - `x-vault-create-supported` - Endpoint allows creation of new items, in addition to updating existing items.
 
diff --git a/website/content/api-docs/system/license.mdx b/website/content/api-docs/system/license.mdx
index 45520e819d72a..0689f7bbbd351 100644
--- a/website/content/api-docs/system/license.mdx
+++ b/website/content/api-docs/system/license.mdx
@@ -15,7 +15,7 @@ Vault.
 
 ## License Status
 
-This endpoint returns information about licensing. See [license autoloading](/vault/docs/enterprise/license/autoloading) for additional background.
+This endpoint returns information about licensing. See [license autoloading](/docs/enterprise/license/autoloading) for additional background.
 
 In the response:
 
diff --git a/website/content/api-docs/system/managed-keys.mdx b/website/content/api-docs/system/managed-keys.mdx
index 762b2a181114c..57c80c3359594 100644
--- a/website/content/api-docs/system/managed-keys.mdx
+++ b/website/content/api-docs/system/managed-keys.mdx
@@ -7,7 +7,7 @@ description: The `/sys/managed-keys` endpoint is used to manage the managed keys
 # `/sys/managed-keys`
 
 The `/sys/managed-keys` endpoint is used to manage the Managed Key configuration within Vault.
-See the [Managed Keys](/vault/docs/enterprise/managed-keys) section for further details on the Managed Keys system.
+See the [Managed Keys](/docs/enterprise/managed-keys) section for further details on the Managed Keys system.
 
 ## List managed keys.
 
@@ -94,9 +94,6 @@ $ curl \
   specific mount points will need their `allowed_managed_keys` parameter to be updated with the key name to
   grant usage.
 
-- `usages` `(comma-delimited string: "sign,verify")` - A comma-delimited list of the allowed usages of this key. Valid values
-  are encrypt, decrypt, sign, verify, wrap, unwrap, mac, and random.
-
 #### PKCS#11 backend Parameters
 
 ~> NOTE: The `pkcs11` backend is only available with Vault Enterprise Plus (HSMs) edition
@@ -104,7 +101,7 @@ $ curl \
 - `type` `(string: "pkcs11")` - To select a PKCS#11 backend, the type parameter must be set to `pkcs11`.
 
 - `library` `(string: <required>)` - The name of the `kms_library` stanza to use from Vault's config to
-   lookup the local library path. See [kms_library stanza](/vault/docs/configuration/kms-library) for further details.
+   lookup the local library path. See [kms_library stanza](/docs/configuration/kms-library) for further details.
 
 - `key_label` `(string: <required>)` - The label of the key to use. If the key does not exist
   and generation is enabled, this is the label that will be given to the generated key. This
@@ -121,10 +118,6 @@ $ curl \
     - `0x0009` `CKM_RSA_PKCS_OAEP`
     - `0x0001` `CKM_RSA_PKCS`
 
-  ~> **Note**: It is possible to use unsupported mechanisms with a managed key, however automatic key generation is only
-  possible with the above supported mechanisms. Automatic key generation is also currently a best effort operation and may
-  not function correctly on all HSMs.
-
 - `pin` `(string: <required>)`: The PIN for login.
 
 - `slot` `(string: <slot or token label required>)`: The slot number to use,
@@ -221,7 +214,7 @@ $ curl \
 - `key_bits` `(string: <required if allow_generate_key is true>)`: The size in bits for an RSA key.
    This field is required when `key_type` is `RSA`. Supported values are `2048`, `3072`, and `4096`.
 
-- `key_type` `(string: <required>)`: The type of key to use. At this time only supported value is `RSA-HSM`.
+- `key_type` `(string: <required>)`: The type of key to use. At this time only supported value is `RSA`.
 
 #### GCP Cloud KMS Parameters
 - `type` `(string: "gcpckms")` - To select an GCP Cloud KMS backend, the type parameter must be set to `gcpckms`.
diff --git a/website/content/api-docs/system/mfa/index.mdx b/website/content/api-docs/system/mfa/index.mdx
index d44e99215fe4e..43311c3d7e64b 100644
--- a/website/content/api-docs/system/mfa/index.mdx
+++ b/website/content/api-docs/system/mfa/index.mdx
@@ -13,17 +13,17 @@ behaviors in Vault Enterprise MFA.
 
 ## Supported MFA types
 
-- [TOTP](/vault/api-docs/system/mfa/totp)
+- [TOTP](/api-docs/system/mfa/totp)
 
-- [Okta](/vault/api-docs/system/mfa/okta)
+- [Okta](/api-docs/system/mfa/okta)
 
-- [Duo](/vault/api-docs/system/mfa/duo)
+- [Duo](/api-docs/system/mfa/duo)
 
-- [PingID](/vault/api-docs/system/mfa/pingid)
+- [PingID](/api-docs/system/mfa/pingid)
 
 ## Step-up Enterprise MFA
 
-[Vault Enterprise](/vault/docs/enterprise/mfa) allows MFA for login and access to
+[Vault Enterprise](/docs/enterprise/mfa) allows MFA for login and access to
 sensitive resources in Vault.  The Step-up Enterprise MFA expects the method
 creator to specify a name for the method; Login MFA does not, and instead
 returns an ID when a method is created. Although MFA methods supported with Step-up Enterprise MFA are supported with the Login MFA, they use different API endpoints.
@@ -34,5 +34,5 @@ returns an ID when a method is created. Although MFA methods supported with Step
 ~> **Note:** While the `sys/mfa` endpoint is supported for both OSS and Vault Enterprise, `sys/mfa/method/:type/:/name` is only supported for Vault Enterprise.
 
 Refer to the [Login MFA
-FAQ](/vault/docs/auth/login-mfa/faq#q-are-there-new-mfa-api-endpoints-introduced-as-part-of-the-new-vault-version-1-10-mfa-for-login-functionality) document
+FAQ](/docs/auth/login-mfa/faq#q-are-there-new-mfa-api-endpoints-introduced-as-part-of-the-new-vault-version-1-10-mfa-for-login-functionality) document
 for more details.
diff --git a/website/content/api-docs/system/mfa/validate.mdx b/website/content/api-docs/system/mfa/validate.mdx
index 046789eae2235..5fab73f13b7a9 100644
--- a/website/content/api-docs/system/mfa/validate.mdx
+++ b/website/content/api-docs/system/mfa/validate.mdx
@@ -35,17 +35,6 @@ string slices. In cases where an MFA method is configured not to use passcodes,
 }
 ```
 
-As of Vault 1.13.0, it is also possible to use an MFA method name as the key to the `mfa_payload`.
-In versions 1.12.x and below,`passcode=` was used for Duo MFA only. Starting in version 1.13.x, `passcode=` is optional for all supported MFA methods.
-
-```json
-{
-  "mfa_request_id": "5879c74a-1418-1948-7be9-97b209d693a7",
-  "mfa_payload": {
-      "sample_mfa_method_name": ["passcode=910201"]
-  }
-}
-
 ### Sample Request
 
 ```shell-session
diff --git a/website/content/api-docs/system/mounts.mdx b/website/content/api-docs/system/mounts.mdx
index 55d64f9e58353..7090d64b954cc 100644
--- a/website/content/api-docs/system/mounts.mdx
+++ b/website/content/api-docs/system/mounts.mdx
@@ -242,7 +242,7 @@ simple as increasing the timeout (in the event of timeout errors).
 
 For recovery situations where the secret was manually removed from the
 secrets backing service, one can force a secrets engine disable in Vault by
-performing a [force revoke](/vault/api-docs/system/leases)
+performing a [force revoke](/api-docs/system/leases)
 on the mount prefix, followed by a secrets disable when that completes. 
 If the underlying secrets were not manually cleaned up, this method might result
 in dangling credentials. This is meant for extreme circumstances.
diff --git a/website/content/api-docs/system/namespaces.mdx b/website/content/api-docs/system/namespaces.mdx
index a00961e11193f..d4bc7212fdb13 100644
--- a/website/content/api-docs/system/namespaces.mdx
+++ b/website/content/api-docs/system/namespaces.mdx
@@ -172,7 +172,7 @@ $ curl \
 
 This endpoint locks the API for the current namespace path or optional subpath.
 The behavior when interacting with Vault from a locked namespace is described in
-[API Locked Response](/vault/docs/concepts/namespace-api-lock#api-locked-response).
+[API Locked Response](/docs/concepts/namespace-api-lock#api-locked-response).
 
 | Method | Path                    |
 | :----- | :---------------------- |
diff --git a/website/content/api-docs/system/policies-password.mdx b/website/content/api-docs/system/policies-password.mdx
index e81fca7d2882a..583bbf8067299 100644
--- a/website/content/api-docs/system/policies-password.mdx
+++ b/website/content/api-docs/system/policies-password.mdx
@@ -13,7 +13,7 @@ are using for compatibility.
 
 ~> Password policies are only available in Vault version 1.5+.
 
-See [Password Policies](/vault/docs/concepts/password-policies) for details of how password policies work
+See [Password Policies](/docs/concepts/password-policies) for details of how password policies work
 as well as the syntax of the policies themselves.
 
 ## Create/Update Password Policy
@@ -37,7 +37,7 @@ generation times.
   This is specified as part of the request URL.
 
 - `policy` `(string: <required>)` - Specifies the password policy document. This can be
-  base64-encoded to avoid string escaping. See [Password Policy Syntax](/vault/docs/concepts/password-policies#password-policy-syntax)
+  base64-encoded to avoid string escaping. See [Password Policy Syntax](/docs/concepts/password-policies#password-policy-syntax)
   for details on password policy definitions.
 
 ### Sample Payload
diff --git a/website/content/api-docs/system/raw.mdx b/website/content/api-docs/system/raw.mdx
index a8bccb1ddf72d..227210e38a725 100644
--- a/website/content/api-docs/system/raw.mdx
+++ b/website/content/api-docs/system/raw.mdx
@@ -9,7 +9,7 @@ description: The `/sys/raw` endpoint is used to access the raw underlying store
 The `/sys/raw` endpoint is used to access the raw underlying store in Vault.
 
 This endpoint is off by default. See the
-[Vault configuration documentation](/vault/docs/configuration) to
+[Vault configuration documentation](/docs/configuration) to
 enable.
 
 ## Read Raw
diff --git a/website/content/api-docs/system/remount.mdx b/website/content/api-docs/system/remount.mdx
index 6e394701fa743..b7abdf0b9c9bb 100644
--- a/website/content/api-docs/system/remount.mdx
+++ b/website/content/api-docs/system/remount.mdx
@@ -17,7 +17,7 @@ engines and auth methods.
 
 The remount operation returns a migration ID to the user. The user may utilize the migration ID to look up 
 the status of the mount migration. More details about the remount operation are described in 
-[Mount Migration](/vault/docs/concepts/mount-migration).
+[Mount Migration](/docs/concepts/mount-migration).
 
 ~> Note: This endpoint requires a policy with both `sudo` and `update` capabilities to `sys/remount`
 
diff --git a/website/content/api-docs/system/replication/replication-dr.mdx b/website/content/api-docs/system/replication/replication-dr.mdx
index cb37e17ded4d1..2e1063593fa40 100644
--- a/website/content/api-docs/system/replication/replication-dr.mdx
+++ b/website/content/api-docs/system/replication/replication-dr.mdx
@@ -178,8 +178,7 @@ identifier can later be used to revoke a DR secondary's access.
 
 - `secondary_public_key` `(string: "")` – Specifies the secondary's generated
   public key, if using encryption rather than response wrapping to protect the
-  secondary credentials. (Vault 1.3+). Use this to avoid making an API call to
-  the primary during secondary activation.
+  secondary credentials. (Vault 1.3+)
 
 ### Sample Payload
 
@@ -250,11 +249,11 @@ $ curl \
     http://127.0.0.1:8200/v1/sys/replication/dr/primary/revoke-secondary
 ```
 
-## Generate DR Secondary Public Key
+## Fetch DR Secondary Public Key
 
 (Vault 1.3+)
 
-This endpoint allows generating a public key that is used to encrypt the returned
+This endpoint allows fetching a public key that is used to encrypt the returned
 credential information (instead of using a response wrapped token). This avoids
 needing to make an API call to the primary during activation.
 
@@ -344,7 +343,7 @@ result in data loss!
 ~> It is not safe to replicate from a newer version of Vault to an older version.
 When upgrading replicated clusters, ensure that upstream clusters are always
 on older versions of Vault than downstream clusters. See
-[Upgrading Vault](/vault/docs/upgrading#replication-installations) for an example.
+[Upgrading Vault](/docs/upgrading#replication-installations) for an example.
 
 
 | Method | Path                                    |
@@ -407,8 +406,6 @@ $ curl \
 This endpoint disables DR replication entirely on the cluster. The cluster will no
 longer be able to connect to the DR primary.
 
-This endpoint requires a DR Operation Token to be provided as means of authorization. See the DR Operation Token API docs for more information.
-
 !> Re-enabling this node as a DR primary or secondary will change its cluster ID;
 in the secondary case this means a wipe of the underlying storage when connected
 to a primary, and in the primary case, secondaries connecting back to the
@@ -419,20 +416,12 @@ underlying storage.
 | :----- | :-------------------------------------- |
 | `POST` | `/sys/replication/dr/secondary/disable` |
 
-### Sample Payload
-
-```json
-{
-  "dr_operation_token": "...",
-}
-```
-
 ### Sample Request
 
 ```shell-session
 $ curl \
+    --header "X-Vault-Token: ..." \
     --request POST \
-    --data @payload.json \
     http://127.0.0.1:8200/v1/sys/replication/dr/secondary/disable
 ```
 
diff --git a/website/content/api-docs/system/replication/replication-performance.mdx b/website/content/api-docs/system/replication/replication-performance.mdx
index 7285ba8ef6f9f..8ca5af6544b0d 100644
--- a/website/content/api-docs/system/replication/replication-performance.mdx
+++ b/website/content/api-docs/system/replication/replication-performance.mdx
@@ -62,7 +62,7 @@ secondary, it will look something like:
 ```json
 {
   "data": {
-    "cluster_id": "06dcf957-6630-44ae-bdd9-117d5f4d70d7",
+    "cluster_id": "d4095d41-3aee-8791-c421-9bc7f88f7c3e",
     "known_primary_cluster_addrs": ["https://127.0.0.1:8201"],
     "last_remote_wal": 87,
     "merkle_root": "c31e40f6ff02f32c37b70e6a4d58732ac812abf0",
@@ -567,13 +567,6 @@ secondary activation token. This does not wipe all data in the cluster.
   PEM-format files that the secondary can use when unwrapping the token from the
   primary. If this and ca_file are not given, defaults to system CA roots.
 
-- `update_primary_addrs` `array: []` – List of cluster addresses for potential
-  primary clusters. These addresses will be pinged in sequence, and if any of them
-  respond successfully, these will be recorded as the new primary addresses. This is
-  a lighter weight version of specifying a token and should result in less disruption
-  of replication. Note that it's invalid to specify this and `token` in the same API call.
-  They are mutually exclusive.
-
 ### Sample Payload
 
 ```json
diff --git a/website/content/api-docs/system/storage/index.mdx b/website/content/api-docs/system/storage/index.mdx
index ce25488325fb9..5c93c276b4837 100644
--- a/website/content/api-docs/system/storage/index.mdx
+++ b/website/content/api-docs/system/storage/index.mdx
@@ -6,6 +6,6 @@ description: |-
   The '/sys/storage' endpoints are used to manage Vault's storage backends.
 ---
 
-This API sub-section is currently only used to manage [Raft](/vault/api-docs/system/storage/raft) storage backend.
+This API sub-section is currently only used to manage [Raft](/api-docs/system/storage/raft) storage backend.
 
-On Enterprise there are additional endpoints for working with [Raft Automated Snapshots](/vault/api-docs/system/storage/raftautosnapshots).
+On Enterprise there are additional endpoints for working with [Raft Automated Snapshots](/api-docs/system/storage/raftautosnapshots).
diff --git a/website/content/api-docs/system/storage/raftautopilot.mdx b/website/content/api-docs/system/storage/raftautopilot.mdx
index 538aaffb9d637..b3e3fe332eb9f 100644
--- a/website/content/api-docs/system/storage/raftautopilot.mdx
+++ b/website/content/api-docs/system/storage/raftautopilot.mdx
@@ -10,12 +10,12 @@ description: |-
 # `/sys/storage/raft/autopilot`
 
 The `/sys/storage/raft/autopilot` endpoints are used to manage raft clusters using autopilot
-with Vault's [Integrated Storage backend](/vault/docs/internals/integrated-storage).
-Refer to the [Integrated Storage Autopilot](/vault/tutorials/raft/raft-autopilot) tutorial to learn how to manage raft clusters using autopilot.
+with Vault's [Integrated Storage backend](/docs/internals/integrated-storage).
+Refer to the [Integrated Storage Autopilot](https://learn.hashicorp.com/tutorials/vault/raft-autopilot?in=vault/raft) tutorial to learn how to manage raft clusters using autopilot.
 
 ## Get Cluster State
 
-This endpoint is used to retrieve the raft cluster state. See the [docs page](/vault/docs/commands/operator/raft#autopilot-state) for a description of the output.
+This endpoint is used to retrieve the raft cluster state. See the [docs page](/docs/commands/operator/raft#autopilot-state) for a description of the output.
 
 | Method | Path                                |
 | :----- | :---------------------------------- |
diff --git a/website/content/api-docs/system/user-lockout.mdx b/website/content/api-docs/system/user-lockout.mdx
deleted file mode 100644
index f43b5f2cb74b9..0000000000000
--- a/website/content/api-docs/system/user-lockout.mdx
+++ /dev/null
@@ -1,222 +0,0 @@
----
-layout: api
-page_title: /sys/locked-users - HTTP API
-description: The `/sys/locked-users` endpoint is used to manage locked users in Vault.
----
-
-# `/sys/locked-users`
-
-The `/sys/locked-users` endpoint is used to list and unlock locked users in Vault. 
-
-Please visit [user lockout](/vault/docs/concepts/user-lockout) concepts page for more details about the feature. 
-
-## List Locked Users
-
-This endpoint lists the locked users information in Vault. 
-
-The response will include all child namespaces of the namespace in which the
-request was made. If some namespace has subsequently been deleted, its path will
-be listed as "deleted namespace :ID:." Deleted namespaces are reported only for
-queries in the root namespace because the information about the namespace path
-is unknown. The response will be returned in the decreasing order of locked user
-counts. 
-
-This endpoint was added in Vault 1.13.
-
-| Method | Path             |
-| :----- | :--------------- |
-| `GET` | `/sys/locked-users` |
-
-### Parameters
-
-- `mount_accessor` `(string, optional)` -  Specifies the identifier of the auth mount entry to which the user
-belongs in the namespace in which the request was made. If no mount accessor is specified,
-the response will include locked users in all child namespaces of the namespace in which the request was made. 
-
-### Sample Request
-
-```shell-session
-$ curl \
-    --header "X-Vault-Token: ..." \
-    --request GET \
-    http://127.0.0.1:8200/v1/sys/locked-users
-```
-
-### Sample Response
-
-```json
-{
-   "request_id":"26be5ab9-dcac-9237-ec12-269a8ca647d5",
-   "lease_id":"",
-   "renewable":false,
-   "lease_duration":0,
-   "data":{
-      "by_namespace":[
-         {
-            "namespace_id":"BzIex",
-            "namespace_path":"ns1/",
-            "counts": 3,
-            "mount_accessors":[
-               {
-                  "mount_accessor":"auth_userpass_79e2fe02",
-                  "counts":3,
-                  "alias_identifiers":[
-                      {"user3"},
-                      {"user4"},
-                      {"user5"},
-                  ]
-               },
-            ]
-         },
-         {
-            "namespace_id":"root",
-            "namespace_path":"",
-            "counts":2,
-            "mount_accessors":[
-               {
-                  "mount_accessor":"auth_userpass_837f35fc",
-                  "counts":2,
-                  "alias_identifiers":[
-                      {"user1"},
-                      {"user2"}
-                  ]
-               },
-            ]
-         },
-          {
-            "namespace_id":"v1lb9",
-            "namespace_path":"ns1/ns2/",
-            "counts":1,
-            "mount_accessors":[
-               {
-                  "mount_accessor":"auth_userpass_af8d1d32",
-                  "counts":1,
-                  "alias_identifiers":[
-                      {"user6"}
-                  ]
-               },
-            ]
-         }
-      ],
-      "total":6
-   },
-   "wrap_info":null,
-   "warnings":null,
-   "auth":null
-}
-```
-
-For deleted namespaces, the response will look like:
-
-```json
-{
-   "request_id":"26be5ab9-dcac-9237-ec12-269a8ca647d5",
-   "lease_id":"",
-   "renewable":false,
-   "lease_duration":0,
-   "data":{
-      "by_namespace":[
-         {
-            "namespace_id":"BzIex",
-            "namespace_path":"ns1/",
-            "counts": 3,
-            "mount_accessors":[
-               {
-                  "mount_accessor":"auth_userpass_79e2fe02",
-                  "counts":3,
-                  "alias_identifiers":[
-                      {"user3"},
-                      {"user4"},
-                      {"user5"},
-                  ]
-               },
-            ]
-         },
-         {
-            "namespace_id":"root",
-            "namespace_path":"",
-            "counts":2,
-            "mount_accessors":[
-               {
-                  "mount_accessor":"auth_userpass_837f35fc",
-                  "counts":2,
-                  "alias_identifiers":[
-                      {"user1"},
-                      {"user2"}
-                  ]
-               },
-            ]
-         },
-          {
-            "namespace_id":"v1lb9",
-            "namespace_path":"deleted namespace v1lb9",
-            "counts":1,
-            "mount_accessors":[
-               {
-                  "mount_accessor":"auth_userpass_af8d1d32",
-                  "counts":1,
-                  "alias_identifiers":[
-                      {"user6"}
-                  ]
-               },
-            ]
-         }
-      ],
-      "total":6
-   },
-   "wrap_info":null,
-   "warnings":null,
-   "auth":null
-}
-```
-
-
-### Sample request with mount accessor
-
-#### Sample Payload
-
-```json
-{
-  "mount_accessor": "auth_userpass_af8d1d32"
-}
-```
-
-#### Sample Request
-
-```shell-session
-$ curl \
-    --header "X-Vault-Token: ..." \
-    --data @payload.json \
-    --request GET \
-    http://127.0.0.1:8200/v1/sys/locked-users
-```
-
-## Unlock User
-
-This endpoint unlocks a locked user with provided mount_accessor and alias_identifier in namespace in which the request was made if locked. 
-This command is idempotent, meaning it succeeds even if user with the given mount_accessor and alias_identifier is not locked. 
- 
-
-This endpoint was added in Vault 1.13.
-
-| Method | Path             |
-| :----- | :--------------- |
-| `POST` | `/sys/locked-users/:mount_accessor/unlock/:alias-identifier` |
-
-### Parameters
-
-- `mount_accessor` `(string, required)` - Specifies the identifier of the auth mount entry to which the user
-belongs
-- `alias_identifier` `(string, required)` - It is the name of the alias (user). For example, if the alias 
-belongs to userpass backend, the name should be a valid username within userpass auth method. If the alias belongs
-to an approle auth method, the name should be a valid RoleID. If the alias belongs to an ldap auth method, the name
-should be a valid username.
-
-### Sample Request
-
-```shell-session
-$ curl \
-    --header "X-Vault-Token: ..." \
-    --request POST \
-    http://127.0.0.1:8200/v1/sys/locked-users/auth_userpass_af8d1d32/unlock/bsmith
-```
\ No newline at end of file
diff --git a/website/content/api-docs/system/wrapping-unwrap.mdx b/website/content/api-docs/system/wrapping-unwrap.mdx
index 701bc6eecf28b..a3ed5973eee93 100644
--- a/website/content/api-docs/system/wrapping-unwrap.mdx
+++ b/website/content/api-docs/system/wrapping-unwrap.mdx
@@ -51,15 +51,6 @@ $ curl \
     http://127.0.0.1:8200/v1/sys/wrapping/unwrap
 ```
 
-Or you can use token to unwrap without authentication in vault
-
-```shell-session
-$ curl \
-    --header "X-Vault-Token: abcd1234..." \
-    --request POST \
-    http://127.0.0.1:8200/v1/sys/wrapping/unwrap
-```
-
 ### Sample Response
 
 ```json
diff --git a/website/content/docs/agent-and-proxy/agent/apiproxy.mdx b/website/content/docs/agent-and-proxy/agent/apiproxy.mdx
deleted file mode 100644
index de262b40a8576..0000000000000
--- a/website/content/docs/agent-and-proxy/agent/apiproxy.mdx
+++ /dev/null
@@ -1,90 +0,0 @@
----
-layout: docs
-page_title: Vault Agent API Proxy
-description: >-
-  Vault Agent's API Proxy functionality allows you to use Vault Agent's API as a proxy
-  for Vault's API.
----
-
-# Vault Agent API Proxy
-
-Vault Agent's API Proxy functionality allows you to use Vault Agent's API as a proxy
-for Vault's API.
-
-~> Note: This functionality will be deprecated in a future release. Please
-switch to using [Vault Proxy](/vault/docs/agent-and-proxy/proxy) for API proxying purposes, instead.
-
-## Functionality
-
-The [`listener` stanza](/vault/docs/agent-and-proxy/agent#listener-stanza) for Vault Agent configures a listener for Vault Agent. If
-its `role` is not set to `metrics_only`, it will act as a proxy for the Vault server that
-has been configured in the [`vault` stanza](/vault/docs/agent-and-proxy/agent#vault-stanza) of Vault Agent. This enables access to the Vault
-API from the Agent API, and can be configured to optionally allow or force the automatic use of
-the Auto-Auth token for these requests, as described below.
-
-If a `listener` has been configured alongside a `cache` stanza, the API Proxy will
-first attempt to utilize the cache subsystem for qualifying requests, before forwarding the
-request to Vault. See the [caching docs](/vault/docs/agent-and-proxy/agent/caching) for more information on caching.
-
-## Using Auto-Auth Token
-
-Vault Agent allows for easy authentication to Vault in a wide variety of
-environments using [Auto-Auth](/vault/docs/agent-and-proxy/agent/autoauth). By setting the
-`use_auto_auth_token` (see below) configuration, clients will not be required
-to provide a Vault token to the requests made to the Agent. When this
-configuration is set, if the request doesn't already bear a token, then the
-auto-auth token will be used to forward the request to the Vault server. This
-configuration will be overridden if the request already has a token attached,
-in which case, the token present in the request will be used to forward the
-request to the Vault server.
-
-## Forcing Auto-Auth Token
-
-Vault Agent can be configured to force the use of the auto-auth token by using
-the value `force` for the `use_auto_auth_token` option. This configuration
-overrides the default behavior described above in [Using Auto-Auth
-Token](/vault/docs/agent-and-proxy/agent/apiproxy#using-auto-auth-token), and instead ignores any
-existing Vault token in the request and instead uses the auto-auth token.
-
-
-## Configuration (`api_proxy`)
-
-The top level `api_proxy` block has the following configuration entries:
-
-- `use_auto_auth_token` `(bool/string: false)` - If set, the requests made to Agent
-without a Vault token will be forwarded to the Vault server with the
-auto-auth token attached. If the requests already bear a token, this
-configuration will be overridden and the token in the request will be used to
-forward the request to the Vault server. If set to `"force"` Agent will use the
-auto-auth token, overwriting the attached Vault token if set.
-
-The following two `api_proxy` options are only useful when making requests to a Vault
-Enterprise cluster, and are documented as part of its
-[Eventual Consistency](/vault/docs/enterprise/consistency#vault-agent-and-consistency-headers)
-page.
-
-- `enforce_consistency` `(string: "never")` - Set to one of `"always"`
-or `"never"`.
-
-- `when_inconsistent` `(string: optional)` - Set to one of `"fail"`, `"retry"`,
-or `"forward"`.
-
-### Example Configuration
-
-Here is an example of a `listener` configuration alongside `api_proxy` configuration to force the use of the auto_auth token
-and enforce consistency.
-
-```hcl
-# Other Vault Agent configuration blocks
-# ...
-
-api_proxy {
-  use_auto_auth_token = "force"
-  enforce_consistency = "always"
-}
-
-listener "tcp" {
-    address = "127.0.0.1:8100"
-    tls_disable = true
-}
-```
diff --git a/website/content/docs/agent-and-proxy/agent/caching/index.mdx b/website/content/docs/agent-and-proxy/agent/caching/index.mdx
deleted file mode 100644
index da970d1847e5a..0000000000000
--- a/website/content/docs/agent-and-proxy/agent/caching/index.mdx
+++ /dev/null
@@ -1,263 +0,0 @@
----
-layout: docs
-page_title: Vault Agent Caching
-description: |-
-  Vault Agent Caching allows client-side caching of responses containing newly
-  created tokens and responses containing leased secrets generated off of these
-  newly created tokens.
----
-
-# Vault Agent Caching
-
-Vault Agent Caching allows client-side caching of responses containing newly
-created tokens and responses containing leased secrets generated off of these
-newly created tokens. The renewals of the cached tokens and leases are also
-managed by the agent.
-
--> **Note:** Vault Agent Caching works best with servers/clusters that are
-running on Vault 1.1 and above due to changes that were introduced
-alongside this feature, such as the exposure of the `orphan` field in token
-creation responses.
-
-## Caching and Renewals
-
-Response caching and renewals are managed by the agent only under these
-specific scenarios.
-
-1. Token creation requests are made through the agent. This means that any
-   login operations performed using various auth methods and invoking the token
-   creation endpoints of the token auth method via the agent will result in the
-   response getting cached by the agent. Responses containing new tokens will
-   be cached by the agent only if the parent token is already being managed by
-   the agent or if the new token is an orphan token.
-
-2. Leased secret creation requests are made through the agent using tokens that
-   are already managed by the agent. This means that any dynamic credentials
-   that are issued using the tokens managed by the agent, will be cached and
-   its renewals are taken care of.
-
-## Persistent Cache
-
-Vault Agent can restore tokens and leases from a persistent cache file created
-by a previous Vault Agent process.
-
-Refer to the [Vault Agent Persistent
-Caching](/vault/docs/agent-and-proxy/agent/caching/persistent-caches) page for more information on
-this functionality.
-
-## Cache Evictions
-
-The eviction of cache entries pertaining to secrets will occur when the agent
-can no longer renew them. This can happen when the secrets hit their maximum
-TTL or if the renewals result in errors.
-
-Agent does some best-effort cache evictions by observing specific request types
-and response codes. For example, if a token revocation request is made via the
-agent and if the forwarded request to the Vault server succeeds, then agent
-evicts all the cache entries associated with the revoked token. Similarly, any
-lease revocation operation will also be intercepted by the agent and the
-respective cache entries will be evicted.
-
-Note that while agent evicts the cache entries upon secret expirations and upon
-intercepting revocation requests, it is still possible for the agent to be
-completely unaware of the revocations that happen through direct client
-interactions with the Vault server. This could potentially lead to stale cache
-entries. For managing the stale entries in the cache, an endpoint
-`/agent/v1/cache-clear`(see below) is made available to manually evict cache
-entries based on some of the query criteria used for indexing the cache entries.
-
-## Request Uniqueness
-
-In order to detect repeat requests and return cached responses, agent will need
-to have a way to uniquely identify the requests. This computation as it stands
-today takes a simplistic approach (may change in future) of serializing and
-hashing the HTTP request along with all the headers and the request body. This
-hash value is then used as an index into the cache to check if the response is
-readily available. The consequence of this approach is that the hash value for
-any request will differ if any data in the request is modified. This has the
-side-effect of resulting in false negatives if say, the ordering of the request
-parameters are modified. As long as the requests come in without any change,
-caching behavior should be consistent. Identical requests with differently
-ordered request values will result in duplicated cache entries. A heuristic
-assumption that the clients will use consistent mechanisms to make requests,
-thereby resulting in consistent hash values per request is the idea upon which
-the caching functionality is built upon.
-
-## Renewal Management
-
-The tokens and leases are renewed by the agent using the secret renewer that is
-made available via the Vault server's [Go
-API](https://godoc.org/github.com/hashicorp/vault/api#Renewer). Agent performs
-all operations in memory and does not persist anything to storage. This means
-that when the agent is shut down, all the renewal operations are immediately
-terminated and there is no way for agent to resume renewals after the fact.
-Note that shutting down the agent does not indicate revocations of the secrets,
-instead it only means that renewal responsibility for all the valid unrevoked
-secrets are no longer performed by the Vault agent.
-
-### Agent CLI
-
-Agent's listener address will be picked up by the CLI through the
-`VAULT_AGENT_ADDR` environment variable. This should be a complete URL such as
-`"http://127.0.0.1:8200"`.
-
-## API
-
-### Cache Clear
-
-This endpoint clears the cache based on given criteria. To use this
-API, some information on how the agent caches values should be known
-beforehand. Each response that is cached in the agent will be indexed on some
-factors depending on the type of request. Those factors can be the `token` that
-is belonging to the cached response, the `token_accessor` of the token
-belonging to the cached response, the `request_path` that resulted in the
-cached response, the `lease` that is attached to the cached response, the
-`namespace` to which the cached response belongs to, and a few more. This API
-exposes some factors through which associated cache entries are fetched and
-evicted. For listeners without caching enabled, this API will still be available,
-but will do nothing (there is no cache to clear) and will return a `200` response.
-
-| Method | Path                    | Produces               |
-| :----- | :---------------------- | :--------------------- |
-| `POST` | `/agent/v1/cache-clear` | `200 application/json` |
-
-#### Parameters
-
-- `type` `(strings: required)` - The type of cache entries to evict. Valid
-  values are `request_path`, `lease`, `token`, `token_accessor`, and `all`.
-  If the `type` is set to `all`, the _entire cache_ is cleared.
-
-- `value` `(string: required)` - An exact value or the prefix of the value for
-  the `type` selected. This parameter is optional when the `type` is set
-  to `all`.
-
-- `namespace` `(string: optional)` - This is only applicable when the `type` is set to
-  `request_path`. The namespace of which the cache entries to be evicted for
-  the given request path.
-
-### Sample Payload
-
-```json
-{
-  "type": "token",
-  "value": "hvs.rlNjegSKykWcplOkwsjd8bP9"
-}
-```
-
-### Sample Request
-
-```shell-session
-$ curl \
-    --request POST \
-    --data @payload.json \
-    http://127.0.0.1:1234/agent/v1/cache-clear
-```
-
-## Configuration (`cache`)
-
-The presence of the top level `cache` block in any way (including an empty `cache` block)  will enable the cache.
-The top level `cache` block has the following configuration entry:
-
-- `persist` `(object: optional)` - Configuration for the persistent cache.
-
-The `cache` block also supports the `use_auto_auth_token`, `enforce_consistency`, and
-`when_inconsistent` configuration values of the `api_proxy` block
-[described in the API Proxy documentation](/vault/docs/agent-and-proxy/agent/apiproxy#configuration-api_proxy) only to
-maintain backwards compatibility. This configuration **cannot** be specified alongside `api_proxy` equivalents,
-should not be preferred over configuring these values in the `api_proxy` block,
-and `api_proxy` should be the preferred place to configure these values.
-
--> **Note:** When the `cache` block is defined, at least one
-[template][agent-template] or [listener][agent-listener] must also be defined
-in the config, otherwise there is no way to utilize the cache.
-
-[agent-template]: /vault/docs/agent-and-proxy/agent/template
-[agent-listener]: /vault/docs/agent-and-proxy/agent#listener-stanza
-
-### Configuration (Persist)
-
-These are common configuration values that live within the `persist` block:
-
-- `type` `(string: required)` - The type of the persistent cache to use,
-  e.g. `kubernetes`. _Note_: when using HCL this can be used as the key for
-  the block, e.g. `persist "kubernetes" {...}`.
-
-- `path` `(string: required)` - The path on disk where the persistent cache file
-  should be created or restored from.
-
-- `keep_after_import` `(bool: optional)` - When set to true, a restored cache file
-  is not deleted. Defaults to `false`.
-
-- `exit_on_err` `(bool: optional)` - When set to true, if any errors occur during
-  a persistent cache restore, Vault Agent will exit with an error. Defaults to `true`.
-
-- `service_account_token_file` `(string: optional)` - When `type` is set to `kubernetes`,
-this configures the path on disk where the Kubernetes service account token can be found.
-Defaults to `/var/run/secrets/kubernetes.io/serviceaccount/token`.
-
-## Configuration (`listener`)
-
-- `listener` `(array of objects: required)` - Configuration for the listeners.
-
-There can be one or more `listener` blocks at the top level. Adding a listener enables
-the [API Proxy](/vault/docs/agent-and-proxy/agent/apiproxy) and enables the API proxy to use the cache, if configured.
-These configuration values are common to both `tcp` and `unix` listener blocks. Blocks of type
-`tcp` support the standard `tcp` [listener](/vault/docs/configuration/listener/tcp)
-options. Additionally, the `role` string option is available as part of the top level
-of the `listener` block, which can be configured to `metrics_only` to serve only metrics,
-or the default role, `default`, which serves everything (including metrics).
-
-- `type` `(string: required)` - The type of the listener to use. Valid values
-  are `tcp` and `unix`.
-  _Note_: when using HCL this can be used as the key for the block, e.g.
-  `listener "tcp" {...}`.
-
-- `address` `(string: required)` - The address for the listener to listen to.
-  This can either be a URL path when using `tcp` or a file path when using
-  `unix`. For example, `127.0.0.1:8200` or `/path/to/socket`. Defaults to
-  `127.0.0.1:8200`.
-
-- `tls_disable` `(bool: false)` - Specifies if TLS will be disabled.
-
-- `tls_key_file` `(string: optional)` - Specifies the path to the private key
-  for the certificate.
-
-- `tls_cert_file` `(string: optional)` - Specifies the path to the certificate
-  for TLS.
-
-### Example Configuration
-
-Here is an example of a cache configuration with the optional `persist` block,
-alongside a regular listener, and a listener that only serves metrics.
-
-```hcl
-# Other Vault Agent configuration blocks
-# ...
-
-cache {
-	persist = {
-		type = "kubernetes"
-		path = "/vault/agent-cache/"
-		keep_after_import = true
-		exit_on_err = true
-		service_account_token_file = "/tmp/serviceaccount/token"
-	}
-}
-
-listener "tcp" {
-    address = "127.0.0.1:8100"
-    tls_disable = true
-}
-
-listener "tcp" {
-    address = "127.0.0.1:3000"
-    tls_disable = true
-    role = "metrics_only"
-}
-```
-
-## Tutorial
-
-Refer to the [Vault Agent
-Caching](/vault/tutorials/vault-agent/agent-caching)
-tutorial to learn how to use the Vault Agent to increase the availability of tokens and secrets to clients using its Caching function.
diff --git a/website/content/docs/agent-and-proxy/agent/caching/persistent-caches/index.mdx b/website/content/docs/agent-and-proxy/agent/caching/persistent-caches/index.mdx
deleted file mode 100644
index 6923ca7b09ad9..0000000000000
--- a/website/content/docs/agent-and-proxy/agent/caching/persistent-caches/index.mdx
+++ /dev/null
@@ -1,46 +0,0 @@
----
-layout: docs
-page_title: Vault Agent Persistent Caching
-description: Vault Agent Caching
----
-
-# Vault Agent Persistent Caching
-
-Vault Agent can restore tokens and leases from a persistent cache file created
-by a previous Vault Agent process. The persistent cache is a BoltDB file that
-includes tuples encrypted by a generated encryption key. The encrypted tuples
-include the Vault token used to retrieve secrets, leases for tokens/secrets, and
-secret values.
-
--> **Note:** Vault Agent Persistent Caching will only restore _leased_
-secrets. Secrets that are not renewable, such as KV v2, will not be persisted.
-
-In order to use Vault Agent persistent cache, auto-auth must be used. If the
-auto-auth token has expired by the time the cache is restored, the cache will
-be invalidated and secrets will need to be re-fetched from Vault.
-
-If Vault Agent templating is enabled alongside of the persistent cache, Vault
-Agent will automatically route templating requests through the cache. This
-ensures template requests are cached and restored properly.
-
--> **Note** Vault Agent persistent cache is currently supported only in a
-Kubernetes environment.
-
-## Vault Agent Persistent Cache Types
-
-Please see the sidebar for available types and their usage/configuration.
-
-## Persistent Cache Example Configuration
-
-Here is an example of a persistent cache configuration.
-
-```hcl
-# Other Vault Agent configuration blocks
-# ...
-
-cache {
-  persist "kubernetes" {
-    path = "/vault/agent-cache"
-  }
-}
-```
diff --git a/website/content/docs/agent-and-proxy/agent/caching/persistent-caches/kubernetes.mdx b/website/content/docs/agent-and-proxy/agent/caching/persistent-caches/kubernetes.mdx
deleted file mode 100644
index febf9d3bc4538..0000000000000
--- a/website/content/docs/agent-and-proxy/agent/caching/persistent-caches/kubernetes.mdx
+++ /dev/null
@@ -1,25 +0,0 @@
----
-layout: docs
-page_title: Kubernetes - Vault Agent Persistent Cache
-description: Kubernetes Persistent Cache for Vault Agent Caching
----
-
-# Vault Agent Kubernetes Persistent Cache
-
-When `kubernetes` is configured for the persistent cache type, Vault Agent will optimize the
-persistent cache specifically for Kubernetes. This type of persistent cache requires a Kubernetes
-service account token. The service account token is used during encryption and decryption of the
-persistent cache as an additional integrity check.
-
-The Vault Agent persistent cache file in Kubernetes should only be used for handing off Vault tokens
-and leases between initialization and sidecar Vault Agent containers. This cache file should be shared
-using a memory volume between the Vault Agent containers.
-
-If the Vault Agent Injector for Kubernetes is being used, the persistent cache is automatically configured
-and used if the annotation [`vault.hashicorp.com/agent-cache-enable: true`](/vault/docs/platform/k8s/injector/annotations#vault-hashicorp-com-agent-cache-enable) is set.
-
-## Configuration
-
-- `service_account_token_file` `(string: optional)` - When type is set to `kubernetes`,
-  this configures the path on disk where the Kubernetes service account token can be found.
-  Defaults to `/var/run/secrets/kubernetes.io/serviceaccount/token`.
diff --git a/website/content/docs/agent-and-proxy/agent/generate-config/index.mdx b/website/content/docs/agent-and-proxy/agent/generate-config/index.mdx
deleted file mode 100644
index f02cd8e126db5..0000000000000
--- a/website/content/docs/agent-and-proxy/agent/generate-config/index.mdx
+++ /dev/null
@@ -1,112 +0,0 @@
----
-layout: docs
-page_title: agent generate-config - Command
-description: |-
-  Generates a simple Vault Agent configuration file from the given parameters.
----
-
-# agent generate-config
-
-Generates a simple Vault Agent configuration file from the given parameters.
-
-Currently, the only supported configuration type is `env-template`, which
-helps you generate a configuration file with environment variable templates
-for running Vault Agent in
-[process supervisor](/vault/docs/agent-and-proxy/agent/process-supervisor)
-mode.
-
-For every specified secret `-path`, the command will attempt to generate one or
-multiple `env_template` entries based on the `JSON` key(s) stored in the
-specified secret. If the secret `-path` ends with `/*`, the command will
-attempt to recurse through the secrets tree rooted at the given path,
-generating `env_template` entries for each encountered secret. Currently,
-only [kv-v1](/vault/docs/secrets/kv/kv-v1) and
-[kv-v2](/vault/docs/secrets/kv/kv-v2) paths are supported.
-
-The command specified in the `-exec` option will be used to generate an
-`exec` entry, which will tell Vault Agent which child process to run.
-
-In addition to the `env_template` entries, the command generates an `auto_auth`
-section with `token_file` authentication method. While this method is very
-convenient for local testing, it should **NOT** be used in production. In a
-production environment, please use any other
-[Auto-Auth method](/vault/docs/agent-and-proxy/autoauth/methods) instead.
-
-By default, the file will be generated in the local directory as `agent.hcl`
-unless a path is specified as an argument.
-
-## Example
-
-Before generating a configuration file, let's insert a secret `foo`:
-
-```shell-session
-$ vault kv put -mount=secret foo user="admin" password="s3cr3t"
-```
-
-Generate an agent configuration file which will reference `secret/foo`:
-
-```shell-session
-$ vault agent generate-config \
-                -type="env-template" \
-                -exec="./my-app arg1 arg2" \
-                -path="secret/foo" \
-                    my-config.hcl
-
-Successfully generated "my-config.hcl" configuration file!
-Warning: the generated file uses 'token_file' authentication method, which is not suitable for production environments.
-```
-
-This will produce `my-config.hcl` file in the current directory with contents
-similar to the following:
-
-```hcl
-auto_auth {
-
-  method {
-    type = "token_file"
-
-    config {
-      token_file_path = "/Users/avean/.vault-token"
-    }
-  }
-}
-
-template_config {
-  static_secret_render_interval = "5m"
-  exit_on_retry_failure         = true
-}
-
-vault {
-  address = "http://localhost:8200"
-}
-
-env_template "FOO_PASSWORD" {
-  contents             = "{{ with secret \"secret/data/foo\" }}{{ .Data.data.password }}{{ end }}"
-  error_on_missing_key = true
-}
-env_template "FOO_USER" {
-  contents             = "{{ with secret \"secret/data/foo\" }}{{ .Data.data.user }}{{ end }}"
-  error_on_missing_key = true
-}
-
-exec {
-  command                   = ["./my-app", "arg1", "arg2"]
-  restart_on_secret_changes = "always"
-  restart_stop_signal       = "SIGTERM"
-}
-```
-
-## Usage
-
-The following flags are available in addition to the [standard set of
-flags](/vault/docs/commands) included in all commands.
-
-- `type` `(string: <required>)` - The type of configuration file to generate;
-  currently, only `env-template` is supported.
-
-- `path` `(string: "")` - Path to a kv-v1 or kv-v2 secret
-  (e.g. `secret/data/foo`, `kv-v2/my-app/*`); multiple secrets and tail `*`
-  wildcards are allowed.
-
-- `-exec` `(string: "env")` - The command to execute in agent process
-  supervisor mode.
diff --git a/website/content/docs/agent-and-proxy/agent/index.mdx b/website/content/docs/agent-and-proxy/agent/index.mdx
deleted file mode 100644
index e84da62d273a1..0000000000000
--- a/website/content/docs/agent-and-proxy/agent/index.mdx
+++ /dev/null
@@ -1,400 +0,0 @@
----
-layout: docs
-page_title: Vault Agent
-description: |-
-  Vault Agent is a client-side daemon that can be used to perform some Vault
-  functionality automatically.
----
-
-# What is Vault Agent?
-
-Vault Agent aims to remove the initial hurdle to adopt Vault by providing a
-more scalable and simpler way for applications to integrate with Vault, by
-providing the ability to render [templates][template] containing the secrets
-required by your application, without requiring changes to your application.
-
-![Vault Agent workflow](/img/vault-agent-workflow.png)
-
-Vault Agent is a client daemon that provides the following features:
-
-- [Auto-Auth][autoauth] - Automatically authenticate to Vault and manage the
-  token renewal process for locally-retrieved dynamic secrets.
-- [API Proxy][apiproxy] - Allows Vault Agent to act as a proxy for Vault's API,
-  optionally using (or forcing the use of) the Auto-Auth token.
-- [Caching][caching] - Allows client-side caching of responses containing newly
-  created tokens and responses containing leased secrets generated off of these
-  newly created tokens. The agent also manages the renewals of the cached tokens and leases.
-- [Windows Service][winsvc] - Allows running the Vault Agent as a Windows
-  service.
-- [Templating][template] - Allows rendering of user-supplied templates by Vault
-  Agent, using the token generated by the Auto-Auth step.
-- [Process Supervisor Mode][process-supervisor] - Runs a child process with Vault
-  secrets injected as environment variables.
-
-## Auto-Auth
-
-Vault Agent allows easy authentication to Vault in a wide variety of
-environments. Please see the [Auto-Auth docs][autoauth]
-for information.
-
-Auto-Auth functionality takes place within an `auto_auth` configuration stanza.
-
-## API Proxy
-
-Vault Agent can act as an API proxy for Vault, allowing you to talk to Vault's
-API via a listener defined for Agent. It can be configured to optionally allow or force the automatic use of
-the Auto-Auth token for these requests. Please see the [API Proxy docs][apiproxy]
-for more information.
-
-API Proxy functionality takes place within a defined `listener`, and its behaviour can be configured with an
-[`api_proxy` stanza](/vault/docs/agent-and-proxy/agent/apiproxy#configuration-api_proxy).
-
-## Caching
-
-Vault Agent allows client-side caching of responses containing newly created tokens
-and responses containing leased secrets generated off of these newly created tokens.
-Please see the [Caching docs][caching] for information.
-
-## API
-
-### Quit
-
-This endpoint triggers shutdown of the agent. By default, it is disabled, and can
-be enabled per listener using the [`agent_api`][agent-api] stanza. It is recommended
-to only enable this on trusted interfaces, as it does not require any authorization to use.
-
-| Method | Path             |
-| :----- | :--------------- |
-| `POST` | `/agent/v1/quit` |
-
-### Cache
-
-See the [caching](/vault/docs/agent-and-proxy/agent/caching#api) page for details on the cache API.
-
-## Configuration
-
-### Command Options
-
-- `-log-level` ((#\_log_level)) `(string: "info")` - Log verbosity level. Supported values (in
-  order of descending detail) are `trace`, `debug`, `info`, `warn`, and `error`. This can
-  also be specified via the `VAULT_LOG_LEVEL` environment variable.
-
-- `-log-format` ((#\_log_format)) `(string: "standard")` - Log format. Supported values
-  are `standard` and `json`. This can also be specified via the
-  `VAULT_LOG_FORMAT` environment variable.
-
-- `-log-file` ((#\_log_file)) - writes all the Vault agent log messages
-  to a file. This value is used as a prefix for the log file name. The current timestamp
-  is appended to the file name. If the value ends in a path separator, `vault-agent`
-  will be appended to the value. If the file name is missing an extension, `.log`
-  is appended. For example, setting `log-file` to `/var/log/` would result in a log
-  file path of `/var/log/vault-agent-{timestamp}.log`. `log-file` can be combined with
-  [`-log-rotate-bytes`](#_log_rotate_bytes) and [`-log-rotate-duration`](#_log_rotate_duration)
-  for a fine-grained log rotation experience.
-
-- `-log-rotate-bytes` ((#\_log_rotate_bytes)) - to specify the number of
-  bytes that should be written to a log before it needs to be rotated. Unless specified,
-  there is no limit to the number of bytes that can be written to a log file.
-
-- `-log-rotate-duration` ((#\_log_rotate_duration)) - to specify the maximum
-  duration a log should be written to before it needs to be rotated. Must be a duration
-  value such as 30s. Defaults to 24h.
-
-- `-log-rotate-max-files` ((#\_log_rotate_max_files)) - to specify the maximum
-  number of older log file archives to keep. Defaults to `0` (no files are ever deleted).
-  Set to `-1` to discard old log files when a new one is created.
-
-### Configuration File Options
-
-These are the currently-available general configuration options:
-
-- `vault` <code>([vault][vault]: <optional\>)</code> - Specifies the remote Vault server the Agent connects to.
-
-- `auto_auth` <code>([auto_auth][autoauth]: <optional\>)</code> - Specifies the method and other options used for Auto-Auth functionality.
-
-- `api_proxy` <code>([api_proxy][apiproxy]: <optional\>)</code> - Specifies options used for API Proxy functionality.
-
-- `cache` <code>([cache][caching]: <optional\>)</code> - Specifies options used for Caching functionality.
-
-- `listener` <code>([listener][listener]: <optional\>)</code> - Specifies the addresses and ports on which the Agent will respond to requests.
-
-  ~> **Note:** On `SIGHUP` (`kill -SIGHUP $(pidof vault)`), Vault Agent will attempt to reload listener TLS configuration.
-  This method can be used to refresh certificates used by Vault Agent without having to restart its process.
-
-- `pid_file` `(string: "")` - Path to the file in which the agent's Process ID
-  (PID) should be stored
-
-- `exit_after_auth` `(bool: false)` - If set to `true`, the agent will exit
-  with code `0` after a single successful auth, where success means that a
-  token was retrieved and all sinks successfully wrote it
-
-- `disable_idle_connections` `(string array: [])` - A list of strings that disables idle connections for various features in Vault Agent.
-  Valid values include: `auto-auth`, `caching`, `proxying`, and `templating`. `proxying` configures this for the API proxy, which is
-  identical in function to `caching` for historical reasons. Can also be configured by setting the `VAULT_AGENT_DISABLE_IDLE_CONNECTIONS`
-  environment variable as a comma separated string. This environment variable will override any values found in a configuration file.
-
-- `disable_keep_alives` `(string array: [])` - A list of strings that disables keep alives for various features in Vault Agent.
-  Valid values include: `auto-auth`, `caching`, `proxying`, and `templating`. `proxying` configures this for the API proxy, which is
-  identical in function to `caching` for historical reasons. Can also be configured by setting the `VAULT_AGENT_DISABLE_KEEP_ALIVES`
-  environment variable as a comma separated string. This environment variable will override any values found in a configuration file.
-
-- `template` <code>([template][template]: <optional\>)</code> - Specifies options used for templating Vault secrets to files.
-
-- `template_config` <code>([template_config][template-config]: <optional\>)</code> - Specifies templating engine behavior.
-
-- `exec` <code>([exec][process-supervisor]: <optional\>)</code> - Specifies options for vault agent to run a child process
-  that injects secrets (via `env_template` stanzas) as environment variables.
-
-- `env_template` <code>([env_template][template]: <optional\>)</code> - Multiple blocks accepted. Each block contains
-  the options used for templating Vault secrets as environment variables via the
-  [process supervisor mode](/vault/docs/agent-and-proxy/agent/process-supervisor).
-
-- `telemetry` <code>([telemetry][telemetry]: <optional\>)</code> – Specifies the telemetry
-  reporting system. See the [telemetry Stanza](/vault/docs/agent-and-proxy/agent#telemetry-stanza) section below
-  for a list of metrics specific to Agent.
-
-- `log_level` - Equivalent to the [`-log-level` command-line flag](#_log_level).
-
-  ~> **Note:** On `SIGHUP` (`kill -SIGHUP $(pidof vault)`), Vault Agent will update the log level to the value
-  specified by configuration file (including overriding values set using CLI or environment variable parameters).
-
-- `log_format` - Equivalent to the [`-log-format` command-line flag](#_log_format).
-
-- `log_file` - Equivalent to the [`-log-file` command-line flag](#_log_file).
-
-- `log_rotate_duration` - Equivalent to the [`-log-rotate-duration` command-line flag](#_log_rotate_duration).
-
-- `log_rotate_bytes` - Equivalent to the [`-log-rotate-bytes` command-line flag](#_log_rotate_bytes).
-
-- `log_rotate_max_files` - Equivalent to the [`-log-rotate-max-files` command-line flag](#_log_rotate_max_files).
-
-### vault Stanza
-
-There can at most be one top level `vault` block, and it has the following
-configuration entries:
-
-- `address` `(string: <optional>)` - The address of the Vault server to
-  connect to. This should be a Fully Qualified Domain Name (FQDN) or IP
-  such as `https://vault-fqdn:8200` or `https://172.16.9.8:8200`.
-  This value can be overridden by setting the `VAULT_ADDR` environment variable.
-
-- `ca_cert` `(string: <optional>)` - Path on the local disk to a single PEM-encoded
-  CA certificate to verify the Vault server's SSL certificate. This value can
-  be overridden by setting the `VAULT_CACERT` environment variable.
-
-- `ca_path` `(string: <optional>)` - Path on the local disk to a directory of
-  PEM-encoded CA certificates to verify the Vault server's SSL certificate.
-  This value can be overridden by setting the `VAULT_CAPATH` environment
-  variable.
-
-- `client_cert` `(string: <optional>)` - Path on the local disk to a single
-  PEM-encoded CA certificate to use for TLS authentication to the Vault server.
-  This value can be overridden by setting the `VAULT_CLIENT_CERT` environment
-  variable.
-
-- `client_key` `(string: <optional>)` - Path on the local disk to a single
-  PEM-encoded private key matching the client certificate from `client_cert`.
-  This value can be overridden by setting the `VAULT_CLIENT_KEY` environment
-  variable.
-
-- `tls_skip_verify` `(string: <optional>)` - Disable verification of TLS
-  certificates. Using this option is highly discouraged as it decreases the
-  security of data transmissions to and from the Vault server. This value can
-  be overridden by setting the `VAULT_SKIP_VERIFY` environment variable.
-
-- `tls_server_name` `(string: <optional>)` - Name to use as the SNI host when
-  connecting via TLS. This value can be overridden by setting the
-  `VAULT_TLS_SERVER_NAME` environment variable.
-
-#### retry Stanza
-
-The `vault` stanza may contain a `retry` stanza that controls how failing Vault
-requests are handled, whether these requests are issued in order to render
-templates, or are proxied requests coming from the api proxy subsystem.
-Auto-auth, however, has its own notion of retrying and is not affected by this
-section.
-
-For requests from the templating engine, Vaul Agent will reset its retry counter and
-perform retries again once all retries are exhausted. This means that templating
-will retry on failures indefinitely unless `exit_on_retry_failure` from the
-[`template_config`][template-config] stanza is set to `true`.
-
-Here are the options for the `retry` stanza:
-
-- `num_retries` `(int: 12)` - Specify how many times a failing request will
-  be retried. A value of `0` translates to the default, i.e. 12 retries.
-  A value of `-1` disables retries. The environment variable `VAULT_MAX_RETRIES`
-  overrides this setting.
-
-There are a few subtleties to be aware of here. First, requests originating
-from the proxy cache will only be retried if they resulted in specific HTTP
-result codes: any 50x code except 501 ("not implemented"), as well as 412
-("precondition failed"); 412 is used in Vault Enterprise 1.7+ to indicate a
-stale read due to eventual consistency. Requests coming from the template
-subsystem are retried regardless of the failure.
-
-Second, templating retries may be performed by both the templating engine _and_
-the cache proxy if Vault Agent [persistent
-cache][persistent-cache] is enabled. This is due to the
-fact that templating requests go through the cache proxy when persistence is
-enabled.
-
-Third, the backoff algorithm used to set the time between retries differs for
-the template and cache subsystems. This is a technical limitation we hope
-to address in the future.
-
-### listener Stanza
-
-Vault Agent supports one or more [listener][listener_main] stanzas. Listeners
-can be configured with or without [caching][caching], but will use the cache if it
-has been configured, and will enable the [API proxy][apiproxy]. In addition to the standard
-listener configuration, an Agent's listener configuration also supports the following:
-
-- `require_request_header` `(bool: false)` - Require that all incoming HTTP
-  requests on this listener must have an `X-Vault-Request: true` header entry.
-  Using this option offers an additional layer of protection from Server Side
-  Request Forgery attacks. Requests on the listener that do not have the proper
-  `X-Vault-Request` header will fail, with a HTTP response status code of `412: Precondition Failed`.
-
-- `role` `(string: default)` - `role` determines which APIs the listener serves.
-  It can be configured to `metrics_only` to serve only metrics, or the default role, `default`,
-  which serves everything (including metrics). The `require_request_header` does not apply
-  to `metrics_only` listeners.
-
-- `agent_api` <code>([agent_api][agent-api]: <optional\>)</code> - Manages optional Agent API endpoints.
-
-#### agent_api Stanza
-
-- `enable_quit` `(bool: false)` - If set to `true`, the agent will enable the [quit](/vault/docs/agent-and-proxy/agent#quit) API.
-
-### telemetry Stanza
-
-Vault Agent supports the [telemetry][telemetry] stanza and collects various
-runtime metrics about its performance, the auto-auth and the cache status:
-
-| Metric                           | Description                                          | Type    |
-| -------------------------------- | ---------------------------------------------------- | ------- |
-| `vault.agent.auth.failure`       | Number of authentication failures                    | counter |
-| `vault.agent.auth.success`       | Number of authentication successes                   | counter |
-| `vault.agent.proxy.success`      | Number of requests successfully proxied              | counter |
-| `vault.agent.proxy.client_error` | Number of requests for which Vault returned an error | counter |
-| `vault.agent.proxy.error`        | Number of requests the agent failed to proxy         | counter |
-| `vault.agent.cache.hit`          | Number of cache hits                                 | counter |
-| `vault.agent.cache.miss`         | Number of cache misses                               | counter |
-
-## Start Vault Agent
-
-To run Vault Agent:
-
-1. [Download](/vault/downloads) the Vault binary where the client application runs
-   (virtual machine, Kubernetes pod, etc.)
-
-1. Create a Vault Agent configuration file. (See the [Example
-   Configuration](#example-configuration) section for an example configuration.)
-
-1. Start a Vault Agent with the configuration file.
-
-   **Example:**
-
-   ```shell-session
-   $ vault agent -config=/etc/vault/agent-config.hcl
-   ```
-
-   To get help, run:
-
-   ```shell-session
-   $ vault agent -h
-   ```
-
-As with Vault, the `-config` flag can be used in three different ways:
-
-- Use the flag once to name the path to a single specific configuration file.
-- Use the flag multiple times to name multiple configuration files, which will be composed at runtime.
-- Use the flag to name a directory of configuration files, the contents of which will be composed at runtime.
-
-## Example Configuration
-
-An example configuration, with very contrived values, follows:
-
-```hcl
-pid_file = "./pidfile"
-
-vault {
-  address = "https://vault-fqdn:8200"
-  retry {
-    num_retries = 5
-  }
-}
-
-auto_auth {
-  method "aws" {
-    mount_path = "auth/aws-subaccount"
-    config = {
-      type = "iam"
-      role = "foobar"
-    }
-  }
-
-  sink "file" {
-    config = {
-      path = "/tmp/file-foo"
-    }
-  }
-
-  sink "file" {
-    wrap_ttl = "5m"
-    aad_env_var = "TEST_AAD_ENV"
-    dh_type = "curve25519"
-    dh_path = "/tmp/file-foo-dhpath2"
-    config = {
-      path = "/tmp/file-bar"
-    }
-  }
-}
-
-cache {
-  // An empty cache stanza still enables caching
-}
-
-api_proxy {
-  use_auto_auth_token = true
-}
-
-listener "unix" {
-  address = "/path/to/socket"
-  tls_disable = true
-
-  agent_api {
-    enable_quit = true
-  }
-}
-
-listener "tcp" {
-  address = "127.0.0.1:8100"
-  tls_disable = true
-}
-
-template {
-  source = "/etc/vault/server.key.ctmpl"
-  destination = "/etc/vault/server.key"
-}
-
-template {
-  source = "/etc/vault/server.crt.ctmpl"
-  destination = "/etc/vault/server.crt"
-}
-```
-
-[vault]: /vault/docs/agent-and-proxy/agent#vault-stanza
-[autoauth]: /vault/docs/agent-and-proxy/agent/autoauth
-[caching]: /vault/docs/agent-and-proxy/agent/caching
-[apiproxy]: /vault/docs/agent-and-proxy/agent/apiproxy
-[persistent-cache]: /vault/docs/agent-and-proxy/agent/caching/persistent-caches
-[template]: /vault/docs/agent-and-proxy/agent/template
-[process-supervisor]: /vault/docs/agent-and-proxy/agent/process-supervisor
-[template-config]: /vault/docs/agent-and-proxy/agent/template#template-configurations
-[agent-api]: /vault/docs/agent-and-proxy/agent/#agent_api-stanza
-[listener]: /vault/docs/agent-and-proxy/agent#listener-stanza
-[listener_main]: /vault/docs/configuration/listener/tcp
-[winsvc]: /vault/docs/agent-and-proxy/agent/winsvc
-[telemetry]: /vault/docs/configuration/telemetry
diff --git a/website/content/docs/agent-and-proxy/agent/process-supervisor.mdx b/website/content/docs/agent-and-proxy/agent/process-supervisor.mdx
deleted file mode 100644
index 97c7887ae294a..0000000000000
--- a/website/content/docs/agent-and-proxy/agent/process-supervisor.mdx
+++ /dev/null
@@ -1,151 +0,0 @@
----
-layout: docs
-page_title: Vault Agent's Process Supervisor Mode
-description: >-
-  Vault Agent's Process Supervisor Mode allows Vault secrets to be injected
-  into a process via environment variables using Consul Template markup.
----
-
-# Vault Agent's Process Supervisor Mode
-
-Vault Agent's Process Supervisor Mode allows Vault secrets to be injected into
-a process via environment variables using
-[Consul Template markup][consul-templating-language].
-
--> If you are running your applications in a Kubernetes cluster, we recommend
-  evaluating the [Vault Secrets Operator](/vault/docs/platform/k8s/vso) and
-  the [Vault Agent Sidecar Injector](/vault/docs/platform/k8s/injector).
-
-!> Vault Agent's Process Supervisor Mode is in public beta. Please provide your
-   feedback by opening a GitHub issue [here](https://github.com/hashicorp/vault/issues).
-
-## Functionality
-
-Vault Agent will inject secrets referenced in the `env_template` configuration
-blocks as environment variables into the child process specified in the `exec` block.
-
-When you start Vault Agent in process supervisor mode, it will wait until each
-environment variable template has rendered at least once before starting the
-process. If `restart_on_secret_changes` is set to `always` (default), Agent
-will restart the process whenever an update to an injected secret is detected.
-This could be either a static secret update (done on
-[`static_secret_render_interval`](/vault/docs/agent-and-proxy/agent/template#static_secret_render_interval))
-or dynamic secret being close to its expiration.
-
-In many ways, Vault Agent will mirror the child process. Standard intput and
-output streams (`stdin` / `stdout` / `stderr`) are all forwarded to the child
-process. Additionally, Vault Agent will exit when the child process exits on
-its own with the same exit code.
-
-## Configuration
-
--> Agent's [generate-config](/vault/docs/agent-and-proxy/agent/generate-config)
-   tool will help you get started by generating a valid agent configuration
-   file from the given inputs.
-
-The process supervisor mode requires at least one `env_template` block and
-exactly one top level `exec` block. It is incompatible with regular file
-`template` entries.
-
-### `env_template`
-
-`env_template` stanza maps the template specified in the `contents` field or
-referenced in the `source` field to the environment variable name in the title
-of the stanza. It uses the same
-[templating language](/vault/docs/agent-and-proxy/agent/template#templating-language)
-as file templates but permits only a subset of
-[its configuration parameters](/vault/docs/agent-and-proxy/agent/template#template_configurations):
-
-- environment variable name `(string: <required>)` - the name of the
-  environment variable to which the contents of the template should map.
-
-- `contents` `(string: "")` - This option allows embedding the contents of
-  a template in the configuration file rather then supplying the `source` path to
-  the template file. This is useful for short templates. This option is mutually
-  exclusive with the `source` option.
-
-- `source` `(string: "")` - Path on disk to use as the input template. This
-  option is required if not using the `contents` option.
-
-- `error_on_missing_key` `(bool: false)` - Exit with an error when accessing
-  a struct or map field/key that does notexist. The default behavior will print `<no value>`
-  when accessing a field that does not exist. It is highly recommended you set this
-  to "true". Also see
-  [`exit_on_retry_failure` in global Vault Agent Template Config](/vault/docs/agent-and-proxy/agent/template#interaction-between-exit_on_retry_failure-and-error_on_missing_key).
-
-- `left_delimiter` `(string: "{{")` - Delimiter to use in the template. The
-  default is "{{" but for some templates, it may be easier to use a different
-  delimiter that does not conflict with the output file itself.
-
-- `right_delimiter` `(string: "}}")` - Delimiter to use in the template. The
-  default is "}}" but for some templates, it may be easier to use a different
-  delimiter that does not conflict with the output file itself.
-
-### `exec`
-
-The top level `exec` block has the following configuration entries.
-
-- `command` `(string array: required)` - Specify the command for the child
-  process with optional arguments. The executable's path must be either
-  absolute or relative to the current working directory.
-
-- `restart_on_secret_changes` `(string: "always")` - Controls whether agent
-  will restart the child process on secret changes. There are two types of
-  secret changes relevant to this configuration: a static secret update (on
-  [static_secret_render_interval`](/vault/docs/agent-and-proxy/agent/template#static_secret_render_interval))
-  and dynamic secret being close to its expiration. The configuration supports
-  two options: `always` and `never`.
-
-- `restart_stop_signal` `(string: "SIGTERM")` - Signal to send to the child
-  process when a secret has been updated and the process needs to be restarted.
-  The process has 30 seconds after this signal is sent until `SIGKILL` is sent
-  to force the child process to stop.
-
-
-## Configuration Example
-
-The following example was generated using
-[`vault agent generate-config`](/vault/docs/agent-and-proxy/agent/generate-config),
-a configuration helper tool. Given this configuration, Vault Agent will run
-the child process (`./my-app arg1 arg2`) with two additional environment
-variables (`FOO_USER` and `FOO_PASSWORD`) populated with secrets from Vault.
-
-```hcl
-auto_auth {
-
-  method {
-    type = "token_file"
-
-    config {
-      token_file_path = "/Users/avean/.vault-token"
-    }
-  }
-}
-
-template_config {
-  static_secret_render_interval = "5m"
-  exit_on_retry_failure         = true
-}
-
-vault {
-  address = "http://localhost:8200"
-}
-
-env_template "FOO_PASSWORD" {
-  contents             = "{{ with secret \"secret/data/foo\" }}{{ .Data.data.password }}{{ end }}"
-  error_on_missing_key = true
-}
-env_template "FOO_USER" {
-  contents             = "{{ with secret \"secret/data/foo\" }}{{ .Data.data.user }}{{ end }}"
-  error_on_missing_key = true
-}
-
-exec {
-  command                   = ["./my-app", "arg1", "arg2"]
-  restart_on_secret_changes = "always"
-  restart_stop_signal       = "SIGTERM"
-}
-```
-
-[consul-templating-language]: https://github.com/hashicorp/consul-template/blob/v0.28.1/docs/templating-language.md
-[template-config]: /vault/docs/agent-and-proxy/agent/template#template-configurations
diff --git a/website/content/docs/agent-and-proxy/agent/versions.mdx b/website/content/docs/agent-and-proxy/agent/versions.mdx
deleted file mode 100644
index 17c39192ffced..0000000000000
--- a/website/content/docs/agent-and-proxy/agent/versions.mdx
+++ /dev/null
@@ -1,47 +0,0 @@
----
-layout: docs
-page_title: Vault Agent Version Compatibility
-description: |-
-  Guidelines for running different versions of Agent and Server
----
-
-# Running different versions of Agent and Server
-
-There is no requirement to run identical versions of Vault Agent and Vault Server.
-It is safe to run different versions, however you may not be able to take advantage of all the newest features in Vault if you do not upgrade to the most recent versions of Agent and Server. We recognize that this isn’t always possible, so we do support version mismatch as best as possible.
-
-As of Vault Agent 1.13.0, Agent will write a note to its logs when it detects a mismatch between Agent and Server.  This is purely informative, intended to assist with debugging in case the mismatch is given rise to problems, e.g. because a newer Agent version is trying to make use of functionality that doesn't exist in the Server version it's talking to.  If Agent is behaving acceptably, the message may be ignored.
-
-This document describes the common cases.  There may be occasional exceptions, which if intentional will be called out in the CHANGELOG in a `CHANGES` section.  If unintentional/undocumented these should be treated as bugs and reported.
-
-## Older version of Agent than Server
-
-We do not anticipate any problems stemming from continuing to run an older Agent version after the server nodes are upgraded to a later version.  Existing deployments using Agent should not be impacted, as we don't generally make backwards-incompatible changes to Vault Server.
-
-Auto-auth:
-- new auth methods that have been introduced since Agent was built will be unavailable
-- existing auth methods should continue to function normally
-
-Proxy:
-- since Agent simply mirrors the incoming requests, even if an incoming request uses an endpoint that didn't exist when that version of Agent was compiled, that won't impede Agent's ability to proxy the request
-
-Templating:
-- the templating language features that interact with the Vault server use stable Vault APIs to retrieve and renew secrets
-- even if new secret engine types are introduced in newer Vault releases, these should not require an Agent upgrade to access via templates
-
-## Newer version of Agent than Server
-
-It is possible that an Agent could depend on features that don’t exist in older Server versions.
-
-Auto-auth:
-- Agent may claim to support newer auth methods that have been introduced since Server was built, but they won't work due to Server not supporting them
-- Agent may make use of new functionality for existing auth methods that isn't available in an older Server you're using
-  - Generally we will try to make such a change be opt-in, or to gracefully degrade when connecting to an older Server instance, unless there's a very good reason (such as a serious security flaw being patched)
-
-Proxy:
-- since Agent simply mirrors the incoming requests, it is unlikely that incompatibilities would surface in proxying, but new functionality may not be available
-- example: When client-controlled consistency support was added to Agent, it started looking for X-Vault-Index headers in responses, and started providing X-Vault-Index headers in proxied requests.  Older Vault Enterprise servers that don't make use of these headers would ignore the new request header and not emit them either.  Agent proxying behaviour continued unchanged, unable to take advantage of the new functionality, but also not impeded in its previously existing behavior.
-
-Templating:
-- we don't anticipate a scenario where changes to Agent's templating itself gives rise to an incompatibility with older Vault Servers, though of course with any Agent version it's possible to write templates that issue requests which make use of functionality not yet present in the upstream vault server, e.g. {{ with secret "secret/my-secret?some-new-option" }}
-- we would not deliberately make a change to templating that breaks existing deployments
diff --git a/website/content/docs/agent-and-proxy/autoauth/index.mdx b/website/content/docs/agent-and-proxy/autoauth/index.mdx
deleted file mode 100644
index a7231704e5dfd..0000000000000
--- a/website/content/docs/agent-and-proxy/autoauth/index.mdx
+++ /dev/null
@@ -1,347 +0,0 @@
----
-layout: docs
-page_title: Vault Agent and Vault Proxy Auto-Auth
-description: |-
-  Vault Agent and Vault Proxy's Auto-Auth functionality allows easy and automatic
-  authentication to Vault in a variety of environments.
----
-
-# Vault Agent and Vault Proxy Auto-Auth
-
-The Auto-Auth functionality of Vault Agent and Vault Proxy allow for
-easy authentication in a wide variety of environments.
-
-## Functionality
-
-Auto-Auth consists of two parts: a Method, which is the authentication method
-that should be used in the current environment; and any number of Sinks, which
-are locations where the agent should write a token any time the current token
-value has changed.
-
-When Vault Agent or Vault Proxy are started with Auto-Auth enabled, it will attempt to acquire a
-Vault token using the configured Method. On failure, it will exponentially back
-off and then retry. On success, unless the auth method is configured to wrap
-the tokens, it will keep the resulting token renewed until renewal is no longer
-allowed or fails, at which point it will attempt to reauthenticate.
-
-Every time an authentication is successful, the token is written to the
-configured Sinks, subject to their configuration.
-
-## Advanced Functionality
-
-Sinks support some advanced features, including the ability for the written
-values to be encrypted or
-[response-wrapped](/vault/docs/concepts/response-wrapping).
-
-Both mechanisms can be used concurrently; in this case, the value will be
-response-wrapped, then encrypted.
-
-### Response-Wrapping Tokens
-
-There are two ways that tokens can be response-wrapped:
-
-1. By the auth method. This allows the end client to introspect the
-   `creation_path` of the token, helping prevent Man-In-The-Middle (MITM)
-   attacks. However, because auto-auth cannot then unwrap the token and rewrap
-   it without modifying the `creation_path`, we are not able to renew the
-   token; it is up to the end client to renew the token. Agent and Proxy both
-   stay daemonized in this mode since some auth methods allow for reauthentication
-   on certain events.
-
-2. By any of the token sinks. Because more than one sink can be configured, the
-   token must be wrapped after it is fetched, rather than wrapped by Vault as
-   it's being returned. As a result, the `creation_path` will always be
-   `sys/wrapping/wrap`, and validation of this field cannot be used as
-   protection against MITM attacks. However, this mode allows auto-auth to keep
-   the token renewed for the end client and automatically reauthenticate when
-   it expires.
-
-### Encrypting Tokens
-
-~> Support for encrypted tokens is experimental; if input/output formats
-change, we will make every effort to provide backwards compatibility.
-
-Tokens can be encrypted, using a Diffie-Hellman exchange to generate an
-ephemeral key. In this mechanism, the client receiving the token writes a
-generated public key to a file. The sink responsible for writing the token to
-that client looks for this public key and uses it to compute a shared secret
-key, which is then used to encrypt the token via AES-GCM. The nonce, encrypted
-payload, and the sink's public key are then written to the output file, where
-the client can compute the shared secret and decrypt the token value.
-
-~> NOTE: Token encryption is not a protection against MITM attacks! The purpose
-of this feature is for forward-secrecy and coverage against bare token values
-being persisted. A MITM that can write to the sink's output and/or client
-public-key input files could attack this exchange. Using TLS to protect the
-transit of tokens is highly recommended.
-
-To help mitigate MITM attacks, additional authenticated data (AAD) can be
-provided to Agent and Proxy. This data is written as part of the AES-GCM tag and must
-match on both Agent and Proxy and the client. This of course means that protecting
-this AAD becomes important, but it provides another layer for an attacker to
-have to overcome. For instance, if the attacker has access to the file system
-where the token is being written, but not to read configuration or read
-environment variables, this AAD can be generated and passed to Agent or Proxy and
-the client in ways that would be difficult for the attacker to find.
-
-When using AAD, it is always a good idea for this to be as fresh as possible;
-generate a value and pass it to your client and Agent or Proxy on startup. Additionally,
-Agent and Proxy a Trust On First Use model; after it finds a generated public key,
-it will reuse that public key instead of looking for new values that have been
-written.
-
-If writing a client that uses this feature, it will likely be helpful to look
-at the
-[dhutil](https://github.com/hashicorp/vault/blob/main/helper/dhutil/dhutil.go)
-library. This shows the expected format of the public key input and envelope
-output formats.
-
-## Configuration
-
-The top level `auto_auth` block has two configuration entries:
-
-- `method` `(object: required)` - Configuration for the method
-
-- `sinks` `(array of objects: optional)` - Configuration for the sinks
-
-### Configuration (Method)
-
-~> Auto-auth does not support using tokens with a limited number of uses. Auto-auth
-does not track the number of uses remaining, and may allow the token to
-expire before attempting to renew it. For example, if using AppRole auto-auth,
-you must use 0 (meaning unlimited) as the value for
-[`token_num_uses`](/vault/api-docs/auth/approle#token_num_uses).
-
-These are common configuration values that live within the `method` block:
-
-- `type` `(string: required)` - The type of the method to use, e.g. `aws`,
-  `gcp`, `azure`, etc. _Note_: when using HCL this can be used as the key for
-  the block, e.g. `method "aws" {...}`.
-
-- `mount_path` `(string: optional)` - The mount path of the method. If not
-  specified, defaults to a value of `auth/<method type>`.
-
-- `namespace` `(string: optional)` - Namespace in which the mount lives.
-  The order of precedence is: this setting lowest, followed by the
-  environment variable `VAULT_NAMESPACE`, and then the highest precedence
-  command-line option `-namespace`.
-  If none of these are specified, defaults to the root namespace.
-  Note that because sink response wrapping and templating are also based
-  on the client created by auto-auth, they use the same namespace.
-
-- `wrap_ttl` `(string or integer: optional)` - If specified, the written token
-  will be response-wrapped by auto-auth. This is more secure than wrapping by
-  sinks, but does not allow the auto-auth to keep the token renewed or
-  automatically reauthenticate when it expires. Rather than a simple string,
-  the written value will be a JSON-encoded
-  [SecretWrapInfo](https://godoc.org/github.com/hashicorp/vault/api#SecretWrapInfo)
-  structure. Uses [duration format strings](/vault/docs/concepts/duration-format).
-
-- `min_backoff` `(string or integer: "1s")` - The minimum backoff time auto-auth
-  will delay before retrying after a failed auth attempt. The backoff will start
-  at the configured value and double (with some randomness) after successive
-  failures, capped by `max_backoff.` If Agent templating is being used, this
-  value is also used as the min backoff time for the templating server.
-  Uses [duration format strings](/vault/docs/concepts/duration-format).
-
-- `max_backoff` `(string or integer: "5m")` - The maximum time Agent will delay
-  before retrying after a failed auth attempt. The backoff will start at
-  `min_backoff` and double (with some randomness) after successive failures,
-  capped by `max_backoff.` If Agent templating is being used, this value is also
-  used as the max backoff time for the templating server. `max_backoff` is the
-  duration between retries, and **not** the duration that retries will be
-  performed before giving up. Uses [duration format strings](/vault/docs/concepts/duration-format).
-
-- `exit_on_err` `(bool: false)` - When set to true, Vault Agent and Vault Proxy
-  will exit if any errors occur during authentication. This configurable only affects login
-  attempts for new tokens (either initial or expired tokens) and will not exit for errors on
-  valid token renewals.
-
-- `config` `(object: required)` - Configuration of the method itself. See the
-  sidebar for information about each method.
-
-### Configuration (Sinks)
-
-These configuration values are common to all Sinks:
-
-- `type` `(string: required)` - The type of the method to use, e.g. `file`.
-  _Note_: when using HCL this can be used as the key for the block, e.g. `sink "file" {...}`.
-
-- `wrap_ttl` `(string or integer: optional)` - If specified, the written token
-  will be response-wrapped by the sink. This is less secure than wrapping by
-  the method, but allows auto-auth to keep the token renewed and automatically
-  reauthenticate when it expires. Rather than a simple string, the written
-  value will be a JSON-encoded
-  [SecretWrapInfo](https://godoc.org/github.com/hashicorp/vault/api#SecretWrapInfo)
-  structure. Uses [duration format strings](/vault/docs/concepts/duration-format).
-
-- `dh_type` `(string: optional)` - If specified, the type of Diffie-Hellman exchange to
-  perform, meaning, which ciphers and/or curves. Currently only `curve25519` is
-  supported.
-
-- `dh_path` `(string: required if dh_type is set)` - The path from which the
-  auto-auth should read the client's initial parameters (e.g. curve25519 public
-  key).
-
-- `derive_key` `(bool: false)` - If specified, the final encryption key is
-  calculated by using HKDF-SHA256 to derive a key from the calculated shared
-  secret and the two public keys for enhanced security. This is recommended
-  if backward compatibility isn't a concern.
-
-- `aad` `(string: optional)` - If specified, additional authenticated data to
-  use with the AES-GCM encryption of the token. Can be any string, including
-  serialized data.
-
-- `aad_env_var` `(string: optional)` - If specified, AAD will be read from the
-  given environment variable rather than a value in the configuration file.
-
-- `config` `(object: required)` - Configuration of the sink itself. See the
-  sidebar for information about each sink.
-
-### Auto Auth Examples
-
-Auto-Auth configuration objects take two separate forms when specified in HCL
-and JSON. The following examples are meant to clarify the differences between
-the two formats.
-
-#### Sinks (HCL Format)
-
-The HCL format may define any number of sink objects with an optional wrapping
-`sinks {...}` object.
-
-~> Note: The [corresponding JSON format](#sinks-json-format) _must_ specify a
-`"sinks" : [...]` array to encapsulate all `sink` JSON objects.
-
-```hcl
-// Other Vault Agent or Vault Proxy configuration blocks
-// ...
-
-auto_auth {
-  method {
-    type = "approle"
-
-    config = {
-      role_id_file_path = "/etc/vault/roleid"
-      secret_id_file_path = "/etc/vault/secretid"
-    }
-  }
-
-  sinks {
-    sink {
-      type = "file"
-
-      config = {
-        path = "/tmp/file-foo"
-      }
-    }
-  }
-}
-```
-
-The following valid HCL omits the wrapping `sinks` object while specifying
-multiple sinks.
-
-```hcl
-// Other Vault Agent or Vault Proxy configuration blocks
-// ...
-
-auto_auth {
-  method {
-    type = "approle"
-
-    config = {
-      role_id_file_path = "/etc/vault/roleid"
-      secret_id_file_path = "/etc/vault/secretid"
-    }
-  }
-
-  sink {
-    type = "file"
-
-    config = {
-      path = "/tmp/file-foo"
-    }
-  }
-
-  sink {
-    type = "file"
-
-    config = {
-      path = "/tmp/file-bar"
-    }
-  }
-}
-```
-
-#### Sinks (JSON format)
-
-The following JSON configuration illustrates the need for a `sinks: [...]` array
-wrapping any number of `sink` objects.
-
-```hcl
-{
-  "auto_auth" : {
-    "method" : [
-      {
-        type = "approle"
-
-        config = {
-          role_id_file_path = "/etc/vault/roleid"
-          secret_id_file_path = "/etc/vault/secretid"
-        }
-      }
-    ],
-    "sinks" : [
-      {
-        "sink" : {
-          type = "file"
-
-          config = {
-            path = "/tmp/file-foo"
-          }
-        }
-      }
-    ]
-  }
-}
-```
-
-Multiple sinks are defined by appending more `sink` objects within the `sinks`
-array:
-
-```hcl
-{
-  "auto_auth" : {
-    "method" : [
-      {
-        type = "approle"
-
-        config = {
-          role_id_file_path = "/etc/vault/roleid"
-          secret_id_file_path = "/etc/vault/secretid"
-        }
-      }
-    ],
-    "sinks" : [
-      {
-        "sink" : {
-          type = "file"
-
-          config = {
-            path = "/tmp/file-foo"
-          }
-        }
-      },
-      {
-        "sink" : {
-          type = "file"
-
-          config = {
-            path = "/tmp/file-bar"
-          }
-        }
-      }
-    ]
-  }
-}
-```
diff --git a/website/content/docs/agent-and-proxy/autoauth/methods/cert.mdx b/website/content/docs/agent-and-proxy/autoauth/methods/cert.mdx
deleted file mode 100644
index 623241e791a52..0000000000000
--- a/website/content/docs/agent-and-proxy/autoauth/methods/cert.mdx
+++ /dev/null
@@ -1,35 +0,0 @@
----
-layout: docs
-page_title: Vault Auto-Auth Cert Method
-description: Cert Method for Vault Auto-Auth
----
-
-# Vault Auto-Auth Cert Method
-
-The `cert` method uses the configured TLS certificates from the `vault` stanza of
-the agent configuration and takes an optional `name` parameter. There is no option
-to use certificates which differ from those used in the `vault` stanza.
-
-It is strongly advised to provide TLS settings in the configuration stanza
-within the auth method to avoid agent cache, if also enabled, from using the
-same TLS settings when proxying requests. If TLS settings are not present in the
-config stanza, Agent and Proxy will fall back to using TLS settings from their respective
-[`vault` Stanzas](/vault/docs/agent#vault-stanza).
-
-## Configuration
-
-- `name` `(string: optional)` - The trusted certificate role which should be used
-  when authenticating with TLS. If a `name` is not specified, the auth method will
-  try to authenticate against [all trusted certificates](/vault/docs/auth/cert#authentication).
-
-- `ca_cert` `(string: optional)` - Path on the local disk to a single
-  PEM-encoded CA certificate to verify the Vault server's SSL certificate.
-
-- `client_cert` `(string: optional)` - Path on the local disk to a single
-  PEM-encoded client certificate to use for cert auth method authentication.
-
-- `client_key` `(string: optional)` - Path on the local disk to a single
-  PEM-encoded private key matching the client certificate from client_cert.
-
-- `reload` `(bool: optional, default: false)` - If true, causes the local x509 key-pair to be reloaded from disk on each authentication attempt.
-  This is useful in situations where client certificates are short-lived and automatically renewed.
diff --git a/website/content/docs/agent-and-proxy/autoauth/methods/index.mdx b/website/content/docs/agent-and-proxy/autoauth/methods/index.mdx
deleted file mode 100644
index 321ef526e0714..0000000000000
--- a/website/content/docs/agent-and-proxy/autoauth/methods/index.mdx
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: docs
-page_title: Vault Auto-Auth Methods
-description: Methods for Vault Auto-Auth
----
-
-# Vault Auto-Auth Methods
-
-Auto-auth is a mechanism used by Vault Agent and Vault Proxy to authenticate
-to Vault in an automatic manner, given a set of parameters allowing the
-authentication. Please see the sidebar for available methods and their
-usage/configuration.
diff --git a/website/content/docs/agent-and-proxy/autoauth/methods/jwt.mdx b/website/content/docs/agent-and-proxy/autoauth/methods/jwt.mdx
deleted file mode 100644
index fd8f6d9ed884e..0000000000000
--- a/website/content/docs/agent-and-proxy/autoauth/methods/jwt.mdx
+++ /dev/null
@@ -1,30 +0,0 @@
----
-layout: docs
-page_title: Vault Auto-Auth JWT Method
-description: JWT Method for Vault Auto-Auth
----
-
-# Vault Auto-Auth JWT Method
-
-The `jwt` method reads in a JWT from a file and sends it to the [JWT Auth
-method](/vault/docs/auth/jwt).
-
-## Configuration
-
-- `path` `(string: required)` - The path to the JWT file
-
-- `role` `(string: required)` - The role to authenticate against on Vault
-
-- `remove_jwt_after_reading` `(bool: optional, defaults to true)` -
-  This can be set to `false` to disable the default behavior of removing the
-  JWT after it's been read.
-
-- `remove_jwt_follows_symlinks` `(bool: optional, defaults to false)` -
-This can be set to `true` to follow symlinks when removing the JWT after it has been read
-when executing the `remove_jwt_after_reading` behaviour. If set to false, it will delete
-the symlink, not the JWT. Does nothing if `remove_jwt_after_reading` is false.
-
-- `jwt_read_period` `(duration: "0.5s", optional)` - The duration after which
-Agent will attempt to read the JWT stored at `path`. Defaults to `1m` if
-`remove_jwt_after_reading` is set to `true`, or `0.5s` otherwise.
-Uses [duration format strings](/vault/docs/concepts/duration-format).
diff --git a/website/content/docs/agent-and-proxy/autoauth/methods/kubernetes.mdx b/website/content/docs/agent-and-proxy/autoauth/methods/kubernetes.mdx
deleted file mode 100644
index 227d0eaba73c0..0000000000000
--- a/website/content/docs/agent-and-proxy/autoauth/methods/kubernetes.mdx
+++ /dev/null
@@ -1,24 +0,0 @@
----
-layout: docs
-page_title: Vault Auto-Auth Kubernetes Method
-description: Kubernetes Method for Vault Auto-Auth
----
-
-# Vault Auto-Auth Kubernetes Method
-
-The `kubernetes` method reads in a Kubernetes service account token from the
-running pod (via `/var/run/secrets/kubernetes.io/serviceaccount/token`) and
-sends it to the [Kubernetes Auth
-method](/vault/docs/auth/kubernetes/).
-
-## Configuration
-
-- `role` `(string: required)` - The role to authenticate against on Vault
-- `token_path` `(string: optional)` - The file path to a custom JWT token to use
-  for authentication. If omitted, the default service account token path is used.
-
-## Tutorial
-
-Refer to the [Vault Agent with
-Kubernetes](/vault/tutorials/kubernetes/agent-kubernetes)
-tutorial to learn how to authenticate the clients using a Kubernetes Service Account Token and manage the tokens lifecycle.
diff --git a/website/content/docs/agent-and-proxy/autoauth/methods/oci.mdx b/website/content/docs/agent-and-proxy/autoauth/methods/oci.mdx
deleted file mode 100644
index 680d2a9e32e10..0000000000000
--- a/website/content/docs/agent-and-proxy/autoauth/methods/oci.mdx
+++ /dev/null
@@ -1,43 +0,0 @@
----
-layout: docs
-page_title: Vault Auto-Auth OCI (Oracle Cloud Infrastructure) Method
-description: OCI (Oracle Cloud Infrastructure) Method for Vault Auto-Auth
----
-
-# Vault Auto-Auth OCI (Oracle Cloud Infrastructure) Method
-
-The `oci` method performs authentication against the [OCI Auth
-method](/vault/docs/auth/oci).
-
-## Credentials
-
-The method use to authenticate is set using the `type` parameter. Valid values are `apikey` to authenticate using
-API Key credentials and `instance` for Instance Principal credentials.
-
-If `apikey` is used, the Vault agent will use the first credential it can successfully obtain in the following order:
-
-1. Environment variables:
-  - `OCI_tenancy_ocid`
-  - `OCI_user_ocid`
-  - `OCI_fingerprint`
-  - `OCI_private_key_path`
-2. Configuration file in `$HOME/.oci/config`
-3. Path to configuration file defined in the `OCI_CONFIG_FILE` environment variable
-4. Configuration file in `$HOME/.obmcs/config`
-
-Wherever possible, we recommend using instance principal for credentials. These are rotated automatically by OCI
-and require no effort on your part to provision, making instance principal the most secure of the three methods. If
-using instance principal _and_ a custom `credential_poll_interval`, be sure the frequency is set to a value that is less
-than OCI's rotation frequency. This is currently documented as
-[multiple times a day](https://docs.oracle.com/en-us/iaas/Content/Identity/Tasks/callingservicesfrominstances.htm#faq),
-but from experience, credentials are rotated every 10 to 15 minutes.
-
-## Configuration
-
-### General
-
-- `type` `(string: required)` - The type of authentication to use. Valid values are `apikey` and `instance`.
-
-- `role` `(string: required)` - The role to authenticate against on Vault.
-
-- `credential_poll_interval` `(duration: "60s", optional)` - In seconds, how frequently the Vault auto-auth method should check for new credentials.
diff --git a/website/content/docs/agent-and-proxy/autoauth/methods/token_file.mdx b/website/content/docs/agent-and-proxy/autoauth/methods/token_file.mdx
deleted file mode 100644
index d8f8cba2970b5..0000000000000
--- a/website/content/docs/agent-and-proxy/autoauth/methods/token_file.mdx
+++ /dev/null
@@ -1,66 +0,0 @@
----
-layout: docs
-page_title: Vault Auto-Auth Token File Method
-description: Token File Method for Vault Auto-Auth
----
-
-# Vault Auto-Auth Token File Method
-
-~> Note: This authentication method is tailored for the development experience,
-and to facilitate getting started with Vault Agent and Vault Proxy. Vault Agent and
-Vault Proxy should never be configured to use this auto-auth method in a production environment.
-
-The `token_file` method reads in an existing, valid Vault token from a file, and uses that
-token in lieu of authenticating itself. While it's a first class auto-auth method for all intents
-and purposes, it naturally doesn't authenticate itself, as it requires a token from elsewhere. Like
-other auto-auth methods, this method will attempt to renew the token, as appropriate.
-
-This auto-auth method is especially useful when testing Vault Agent or Vault Proxy without needing to set up
-any authentication methods in Vault. For long-running Agent or Proxy processes, we strongly recommend another
-auto-auth method, such that Agent and Proxy are issuing their own own authentication requests to Vault.
-
-## Configuration
-
-- `token_file_path` `(string: required)` - The path to the file with the token inside. This token cannot be a wrapping token.
-
-## Example Configuration
-
-An example configuration for Vault Agent, using the `token_file` method to enable [auto-auth](/vault/docs/agent-and-proxy/autoauth), follows:
-
-```hcl
-pid_file = "./pidfile"
-
-vault {
-  address = "https://127.0.0.1:8200"
-}
-
-auto_auth {
-  method {
-    type = "token_file"
-
-    config = {
-      token_file_path = "/home/username/.vault-token"
-    }
-  }
-}
-
-
-api_proxy {
-  use_auto_auth_token = true
-}
-
-listener "tcp" {
-  address = "127.0.0.1:8100"
-  tls_disable = true
-}
-
-template {
-  source      = "/etc/vault/server.key.ctmpl"
-  destination = "/etc/vault/server.key"
-}
-
-template {
-  source      = "/etc/vault/server.crt.ctmpl"
-  destination = "/etc/vault/server.crt"
-}
-```
diff --git a/website/content/docs/agent-and-proxy/autoauth/sinks/index.mdx b/website/content/docs/agent-and-proxy/autoauth/sinks/index.mdx
deleted file mode 100644
index 62e7334c7e20d..0000000000000
--- a/website/content/docs/agent-and-proxy/autoauth/sinks/index.mdx
+++ /dev/null
@@ -1,11 +0,0 @@
----
-layout: docs
-page_title: Vault Agent and Vault Proxy Auto-Auth Sinks
-description: Sinks for Auto-Auth
----
-
-# Vault Agent and Vault Proxy Auto-Auth Sinks
-
-Every time an auto-auth authentication is successful, the token is written to the
-enabled Sinks, subject to their configuration. Today, we only support one
-type of sink, [file sink](/vault/docs/agent-and-proxy/sinks/file).
diff --git a/website/content/docs/agent-and-proxy/index.mdx b/website/content/docs/agent-and-proxy/index.mdx
deleted file mode 100644
index e9f82e7c9b443..0000000000000
--- a/website/content/docs/agent-and-proxy/index.mdx
+++ /dev/null
@@ -1,109 +0,0 @@
----
-layout: docs
-page_title: Vault Agent and Vault Proxy
-description: |-
-  Vault Agent and Vault Proxy are daemons that can be used to perform some Vault
-  functionality automatically.
----
-
-# Vault Agent and Vault Proxy
-
-A valid client token must accompany most requests to Vault. This
-includes all API requests, as well as via the Vault CLI and other libraries.
-Therefore, Vault clients must first authenticate with Vault to acquire a token.
-Vault provides several authentication methods to assist in
-delivering this initial token.
-
-![Client authentication](/img/diagram-vault-agent.png)
-
-If the client can securely acquire the token, all subsequent requests (e.g., request
-database credentials, read key/value secrets) are processed based on the
-trust established by a successful authentication.
-
-This means that client application must invoke the Vault API to authenticate
-with Vault and manage the acquired token, in addition to invoking the API to
-request secrets from Vault. This implies code changes to client applications
-along with additional testing and maintenance of the application.
-
-The following code example implements Vault API to authenticate with Vault
-through [AppRole auth method](/vault/docs/auth/approle#code-example), and then uses
-the returned client token to read secrets at `kv-v2/data/creds`.
-
-```go
-package main
-
-import (
-    ...snip...
-    vault "github.com/hashicorp/vault/api"
-)
-
-// Fetches a key-value secret (kv-v2) after authenticating via AppRole
-func getSecretWithAppRole() (string, error) {
-    config := vault.DefaultConfig()
-
-    client := vault.NewClient(config)
-    wrappingToken := ioutil.ReadFile("path/to/wrapping-token")
-    unwrappedToken := client.Logical().Unwrap(strings.TrimSuffix(string(wrappingToken), "\n"))
-
-    secretID := unwrappedToken.Data["secret_id"]
-    roleID := os.Getenv("APPROLE_ROLE_ID")
-
-    params := map[string]interface{}{
-        "role_id":   roleID,
-        "secret_id": secretID,
-    }
-    resp := client.Logical().Write("auth/approle/login", params)
-    client.SetToken(resp.Auth.ClientToken)
-
-    secret, err := client.Logical().Read("kv-v2/data/creds")
-    if err != nil {
-        return "", fmt.Errorf("unable to read secret: %w", err)
-    }
-
-    data := secret.Data["data"].(map[string]interface{})
-
-    ...snip...
-}
-```
-
-For some Vault deployments, making (and maintaining) these changes to
-applications may not be a problem, and may actually be preferred. This may be
-applied to scenarios where you have a small number of applications, or you want
-to keep strict, customized control over how each application interacts with
-Vault. However, in other situations where you have a large number of
-applications, as in large enterprises, you may not have the resources or expertise
-to update and maintain the Vault integration code for every application. When
-third party applications are being deployed by the application, it is prohibited
-to add the Vault integration code.
-
-### Introduce Vault Agent and Vault Proxy to the workflow
-
-[Vault Agent][vaultagent] and [Vault Proxy][vaultproxy] aim to remove this initial hurdle to adopt Vault by providing a
-more scalable and simpler way for applications to integrate with Vault. Vault Agent can
-obtain secrets and provide them to applications, and Vault Proxy can act as
-a proxy between Vault and the application, optionally simplifying the authentication process
-and caching requests.
-
-
-| Capability                                                                               |    Vault Agent     | Vault Proxy |
-|------------------------------------------------------------------------------------------|:------------------:|:-----------:|
-| [Auto-Auth][autoauth] to authenticate with Vault                                         |         x          |      x      |
-| [Caching][caching] the newly created tokens and leases                                   |         x          |      x      |
-| Run as a [Windows Service][winsvc]                                                       |         x          |             |
-| [Templating][template] to render user-supplied templates                                 |         x          |             |
-| [API Proxy][apiproxy] to act as a proxy for Vault API                                    | Will be deprecated |      x      |
-| [Process Supervisor][exec] for injecting secrets as environment variables into a process |         x          |             |
-
-To learn more, refer to the [Vault Agent][vaultagent] or [Vault
-Proxy][vaultproxy] documentation page.
-
-
-[autoauth]: /vault/docs/agent-and-proxy/autoauth
-[caching]: /vault/docs/agent-and-proxy/agent/caching
-[apiproxy]: /vault/docs/agent-and-proxy/proxy/apiproxy
-[template]: /vault/docs/agent-and-proxy/agent/template
-[exec]: /vault/docs/agent-and-proxy/agent/process-supervisor
-[template-config]: /vault/docs/agent-and-proxy/agent/template#template-configurations
-[vaultagent]: /vault/docs/agent-and-proxy/agent
-[vaultproxy]: /vault/docs/agent-and-proxy/proxy
-[winsvc]: /vault/docs/agent-and-proxy/agent/winsvc
diff --git a/website/content/docs/agent-and-proxy/proxy/apiproxy.mdx b/website/content/docs/agent-and-proxy/proxy/apiproxy.mdx
deleted file mode 100644
index 3b4d7ece762c2..0000000000000
--- a/website/content/docs/agent-and-proxy/proxy/apiproxy.mdx
+++ /dev/null
@@ -1,87 +0,0 @@
----
-layout: docs
-page_title: Vault Proxy API Proxy
-description: >-
-  Vault Proxy's API Proxy functionality allows you to use Vault Proxy's API as a proxy
-  for Vault's API.
----
-
-# Vault Proxy API Proxy
-
-Vault Proxy's API Proxy functionality allows you to use Vault Proxy's API as a proxy
-for Vault's API.
-
-## Functionality
-
-The [`listener` stanza](/vault/docs/agent#listener-stanza) for Vault Proxy configures a listener for Vault Proxy. If
-its `role` is not set to `metrics_only`, it will act as a proxy for the Vault server that
-has been configured in the [`vault` stanza](/vault/docs/agent-and-proxy/proxy#vault-stanza) of Proxy Agent. This enables access to the Vault
-API from the Proxy API, and can be configured to optionally allow or force the automatic use of
-the Auto-Auth token for these requests, as described below.
-
-If a `listener` has been configured alongside a `cache` stanza, the API Proxy will
-first attempt to utilize the cache subsystem for qualifying requests, before forwarding the
-request to Vault. See the [caching docs](/vault/docs/agent-and-proxy/proxy/caching) for more information on caching.
-
-## Using Auto-Auth Token
-
-Vault Proxy allows for easy authentication to Vault in a wide variety of
-environments using [Auto-Auth](/vault/docs/agent-and-proxy/autoauth). By setting the
-`use_auto_auth_token` (see below) configuration, clients will not be required
-to provide a Vault token to the requests made to the Agent. When this
-configuration is set, if the request doesn't already bear a token, then the
-auto-auth token will be used to forward the request to the Vault server. This
-configuration will be overridden if the request already has a token attached,
-in which case, the token present in the request will be used to forward the
-request to the Vault server.
-
-## Forcing Auto-Auth Token
-
-Vault Proxy can be configured to force the use of the auto-auth token by using
-the value `force` for the `use_auto_auth_token` option. This configuration
-overrides the default behavior described above in [Using Auto-Auth
-Token](/vault/docs/proxy/apiproxy#using-auto-auth-token), and instead ignores any
-existing Vault token in the request and instead uses the auto-auth token.
-
-
-## Configuration (`api_proxy`)
-
-The top level `api_proxy` block has the following configuration entries:
-
-- `use_auto_auth_token` `(bool/string: false)` - If set, the requests made to Agent
-without a Vault token will be forwarded to the Vault server with the
-auto-auth token attached. If the requests already bear a token, this
-configuration will be overridden and the token in the request will be used to
-forward the request to the Vault server. If set to `"force"` Agent will use the
-auto-auth token, overwriting the attached Vault token if set.
-
-The following two `api_proxy` options are only useful when making requests to a Vault
-Enterprise cluster, and are documented as part of its
-[Eventual Consistency](/vault/docs/enterprise/consistency#vault-agent-and-consistency-headers)
-page.
-
-- `enforce_consistency` `(string: "never")` - Set to one of `"always"`
-or `"never"`.
-
-- `when_inconsistent` `(string: optional)` - Set to one of `"fail"`, `"retry"`,
-or `"forward"`.
-
-### Example Configuration
-
-Here is an example of a `listener` configuration alongside `api_proxy` configuration to force the use of the auto_auth token
-and enforce consistency.
-
-```hcl
-# Other Vault Proxy configuration blocks
-# ...
-
-api_proxy {
-  use_auto_auth_token = "force"
-  enforce_consistency = "always"
-}
-
-listener "tcp" {
-    address = "127.0.0.1:8100"
-    tls_disable = true
-}
-```
diff --git a/website/content/docs/agent-and-proxy/proxy/caching/index.mdx b/website/content/docs/agent-and-proxy/proxy/caching/index.mdx
deleted file mode 100644
index fbd3bfb962aea..0000000000000
--- a/website/content/docs/agent-and-proxy/proxy/caching/index.mdx
+++ /dev/null
@@ -1,242 +0,0 @@
----
-layout: docs
-page_title: Vault Proxy Caching
-description: |-
-  Vault Proxy Caching allows client-side caching of responses containing newly
-  created tokens and responses containing leased secrets generated off of these
-  newly created tokens.
----
-
-# Vault Proxy Caching
-
-Vault Proxy Caching allows client-side caching of responses containing newly
-created tokens and responses containing leased secrets generated off of these
-newly created tokens. The renewals of the cached tokens and leases are also
-managed by the proxy.
-
--> **Note:** Vault Proxy Caching works best with servers/clusters that are
-running on Vault 1.1 and above due to changes that were introduced
-alongside this feature, such as the exposure of the `orphan` field in token
-creation responses.
-
-## Caching and Renewals
-
-Response caching and renewals are managed by the proxy only under these
-specific scenarios.
-
-1. Token creation requests are made through the proxy. This means that any
-   login operations performed using various auth methods and invoking the token
-   creation endpoints of the token auth method via the proxy will result in the
-   response getting cached by the proxy. Responses containing new tokens will
-   be cached by the proxy only if the parent token is already being managed by
-   the proxy or if the new token is an orphan token.
-
-2. Leased secret creation requests are made through the proxy using tokens that
-   are already managed by the proxy. This means that any dynamic credentials
-   that are issued using the tokens managed by the proxy, will be cached and
-   its renewals are taken care of.
-
-## Persistent Cache
-
-Vault Proxy can restore tokens and leases from a persistent cache file created
-by a previous Vault Proxy process.
-
-Refer to the [Vault Proxy Persistent
-Caching](/vault/docs/agent-and-proxy/proxy/caching/persistent-caches) page for more information on
-this functionality.
-
-## Cache Evictions
-
-The eviction of cache entries pertaining to secrets will occur when the proxy
-can no longer renew them. This can happen when the secrets hit their maximum
-TTL or if the renewals result in errors.
-
-Vault Proxy does some best-effort cache evictions by observing specific request types
-and response codes. For example, if a token revocation request is made via the
-proxy and if the forwarded request to the Vault server succeeds, then proxy
-evicts all the cache entries associated with the revoked token. Similarly, any
-lease revocation operation will also be intercepted by the proxy and the
-respective cache entries will be evicted.
-
-Note that while proxy evicts the cache entries upon secret expirations and upon
-intercepting revocation requests, it is still possible for the proxy to be
-completely unaware of the revocations that happen through direct client
-interactions with the Vault server. This could potentially lead to stale cache
-entries. For managing the stale entries in the cache, an endpoint
-`/proxy/v1/cache-clear`(see below) is made available to manually evict cache
-entries based on some of the query criteria used for indexing the cache entries.
-
-## Request Uniqueness
-
-In order to detect repeat requests and return cached responses, proxy will need
-to have a way to uniquely identify the requests. This computation as it stands
-today takes a simplistic approach (may change in future) of serializing and
-hashing the HTTP request along with all the headers and the request body. This
-hash value is then used as an index into the cache to check if the response is
-readily available. The consequence of this approach is that the hash value for
-any request will differ if any data in the request is modified. This has the
-side-effect of resulting in false negatives if say, the ordering of the request
-parameters are modified. As long as the requests come in without any change,
-caching behavior should be consistent. Identical requests with differently
-ordered request values will result in duplicated cache entries. A heuristic
-assumption that the clients will use consistent mechanisms to make requests,
-thereby resulting in consistent hash values per request is the idea upon which
-the caching functionality is built upon.
-
-## Renewal Management
-
-The tokens and leases are renewed by the proxy using the secret renewer that is
-made available via the Vault server's [Go
-API](https://godoc.org/github.com/hashicorp/vault/api#Renewer). Proxy performs
-all operations in memory and does not persist anything to storage. This means
-that when the proxy is shut down, all the renewal operations are immediately
-terminated and there is no way for the proxy to resume renewals after the fact.
-Note that shutting down the proxy does not indicate revocations of the secrets,
-instead it only means that renewal responsibility for all the valid unrevoked
-secrets are no longer performed by the Vault proxy.
-
-## API
-
-### Cache Clear
-
-This endpoint clears the cache based on given criteria. To use this
-API, some information on how the proxy caches values should be known
-beforehand. Each response that is cached in the proxy will be indexed on some
-factors depending on the type of request. Those factors can be the `token` that
-is belonging to the cached response, the `token_accessor` of the token
-belonging to the cached response, the `request_path` that resulted in the
-cached response, the `lease` that is attached to the cached response, the
-`namespace` to which the cached response belongs to, and a few more. This API
-exposes some factors through which associated cache entries are fetched and
-evicted. For listeners without caching enabled, this API will still be available,
-but will do nothing (there is no cache to clear) and will return a `200` response.
-
-| Method | Path                    | Produces               |
-| :----- | :---------------------- | :--------------------- |
-| `POST` | `/proxy/v1/cache-clear` | `200 application/json` |
-
-#### Parameters
-
-- `type` `(strings: required)` - The type of cache entries to evict. Valid
-  values are `request_path`, `lease`, `token`, `token_accessor`, and `all`.
-  If the `type` is set to `all`, the _entire cache_ is cleared.
-
-- `value` `(string: required)` - An exact value or the prefix of the value for
-  the `type` selected. This parameter is optional when the `type` is set
-  to `all`.
-
-- `namespace` `(string: optional)` - This is only applicable when the `type` is set to
-  `request_path`. The namespace of which the cache entries to be evicted for
-  the given request path.
-
-### Sample Payload
-
-```json
-{
-  "type": "token",
-  "value": "hvs.rlNjegSKykWcplOkwsjd8bP9"
-}
-```
-
-### Sample Request
-
-```shell-session
-$ curl \
-    --request POST \
-    --data @payload.json \
-    http://127.0.0.1:1234/proxy/v1/cache-clear
-```
-
-## Configuration (`cache`)
-
-The presence of the top level `cache` block in any way (including an empty `cache` block)  will enable the cache.
-The top level `cache` block has the following configuration entry:
-
-- `persist` `(object: optional)` - Configuration for the persistent cache.
-
--> **Note:** When the `cache` block is defined, a [listener][proxy-listener] must also be defined
-in the config, otherwise there is no way to utilize the cache.
-
-[proxy-listener]: /vault/docs/agent-and-proxy/proxy#listener-stanza
-
-### Configuration (Persist)
-
-These are common configuration values that live within the `persist` block:
-
-- `type` `(string: required)` - The type of the persistent cache to use,
-  e.g. `kubernetes`. _Note_: when using HCL this can be used as the key for
-  the block, e.g. `persist "kubernetes" {...}`.
-
-- `path` `(string: required)` - The path on disk where the persistent cache file
-  should be created or restored from.
-
-- `keep_after_import` `(bool: optional)` - When set to true, a restored cache file
-  is not deleted. Defaults to `false`.
-
-- `exit_on_err` `(bool: optional)` - When set to true, if any errors occur during
-  a persistent cache restore, Vault Proxy will exit with an error. Defaults to `true`.
-
-- `service_account_token_file` `(string: optional)` - When `type` is set to `kubernetes`,
-this configures the path on disk where the Kubernetes service account token can be found.
-Defaults to `/var/run/secrets/kubernetes.io/serviceaccount/token`.
-
-## Configuration (`listener`)
-
-- `listener` `(array of objects: required)` - Configuration for the listeners.
-
-There can be one or more `listener` blocks at the top level. Adding a listener enables
-the [API Proxy](/vault/docs/agent-and-proxy/proxy/apiproxy) and enables the API proxy to use the cache, if configured.
-These configuration values are common to both `tcp` and `unix` listener blocks. Blocks of type
-`tcp` support the standard `tcp` [listener](/vault/docs/configuration/listener/tcp)
-options. Additionally, the `role` string option is available as part of the top level
-of the `listener` block, which can be configured to `metrics_only` to serve only metrics,
-or the default role, `default`, which serves everything (including metrics).
-
-- `type` `(string: required)` - The type of the listener to use. Valid values
-  are `tcp` and `unix`.
-  _Note_: when using HCL this can be used as the key for the block, e.g.
-  `listener "tcp" {...}`.
-
-- `address` `(string: required)` - The address for the listener to listen to.
-  This can either be a URL path when using `tcp` or a file path when using
-  `unix`. For example, `127.0.0.1:8200` or `/path/to/socket`. Defaults to
-  `127.0.0.1:8200`.
-
-- `tls_disable` `(bool: false)` - Specifies if TLS will be disabled.
-
-- `tls_key_file` `(string: optional)` - Specifies the path to the private key
-  for the certificate.
-
-- `tls_cert_file` `(string: optional)` - Specifies the path to the certificate
-  for TLS.
-
-### Example Configuration
-
-Here is an example of a cache configuration with the optional `persist` block,
-alongside a regular listener, and a listener that only serves metrics.
-
-```hcl
-# Other Vault Proxy configuration blocks
-# ...
-
-cache {
-	persist = {
-		type = "kubernetes"
-		path = "/vault/proxy-cache/"
-		keep_after_import = true
-		exit_on_err = true
-		service_account_token_file = "/tmp/serviceaccount/token"
-	}
-}
-
-listener "tcp" {
-    address = "127.0.0.1:8100"
-    tls_disable = true
-}
-
-listener "tcp" {
-    address = "127.0.0.1:3000"
-    tls_disable = true
-    role = "metrics_only"
-}
-```
diff --git a/website/content/docs/agent-and-proxy/proxy/caching/persistent-caches/index.mdx b/website/content/docs/agent-and-proxy/proxy/caching/persistent-caches/index.mdx
deleted file mode 100644
index 7458dee0dd2f1..0000000000000
--- a/website/content/docs/agent-and-proxy/proxy/caching/persistent-caches/index.mdx
+++ /dev/null
@@ -1,42 +0,0 @@
----
-layout: docs
-page_title: Vault Proxy Persistent Caching
-description: Vault Proxy Caching
----
-
-# Vault Proxy Persistent Caching
-
-Vault Proxy can restore tokens and leases from a persistent cache file created
-by a previous Vault Proxy process. The persistent cache is a BoltDB file that
-includes tuples encrypted by a generated encryption key. The encrypted tuples
-include the Vault token used to retrieve secrets, leases for tokens/secrets, and
-secret values.
-
--> **Note:** Vault Proxy Persistent Caching will only restore _leased_
-secrets. Secrets that are not renewable, such as KV v2, will not be persisted.
-
-In order to use Vault Proxy persistent cache, auto-auth must be used. If the
-auto-auth token has expired by the time the cache is restored, the cache will
-be invalidated and secrets will need to be re-fetched from Vault.
-
--> **Note** Vault Proxy persistent cache is currently supported only in a
-Kubernetes environment.
-
-## Vault Proxy Persistent Cache Types
-
-Please see the sidebar for available types and their usage/configuration.
-
-## Persistent Cache Example Configuration
-
-Here is an example of a persistent cache configuration.
-
-```hcl
-# Other Vault Proxy configuration blocks
-# ...
-
-cache {
-  persist "kubernetes" {
-    path = "/vault/proxy-cache"
-  }
-}
-```
diff --git a/website/content/docs/agent-and-proxy/proxy/caching/persistent-caches/kubernetes.mdx b/website/content/docs/agent-and-proxy/proxy/caching/persistent-caches/kubernetes.mdx
deleted file mode 100644
index e3428080f6ff4..0000000000000
--- a/website/content/docs/agent-and-proxy/proxy/caching/persistent-caches/kubernetes.mdx
+++ /dev/null
@@ -1,22 +0,0 @@
----
-layout: docs
-page_title: Kubernetes - Vault Proxy Persistent Cache
-description: Kubernetes Persistent Cache for Vault Proxy Caching
----
-
-# Vault Proxy Kubernetes Persistent Cache
-
-When `kubernetes` is configured for the persistent cache type, Vault Proxy will optimize the
-persistent cache specifically for Kubernetes. This type of persistent cache requires a Kubernetes
-service account token. The service account token is used during encryption and decryption of the
-persistent cache as an additional integrity check.
-
-The Vault Proxy persistent cache file in Kubernetes should only be used for handing off Vault tokens
-and leases between initialization and sidecar Vault Proxy containers. This cache file should be shared
-using a memory volume between the Vault Proxy containers.
-
-## Configuration
-
-- `service_account_token_file` `(string: optional)` - When type is set to `kubernetes`,
-  this configures the path on disk where the Kubernetes service account token can be found.
-  Defaults to `/var/run/secrets/kubernetes.io/serviceaccount/token`.
diff --git a/website/content/docs/agent-and-proxy/proxy/index.mdx b/website/content/docs/agent-and-proxy/proxy/index.mdx
deleted file mode 100644
index 8f4abc810f567..0000000000000
--- a/website/content/docs/agent-and-proxy/proxy/index.mdx
+++ /dev/null
@@ -1,354 +0,0 @@
----
-layout: docs
-page_title: Vault Proxy
-description: |-
-  Vault Proxy is a daemon that can be used to perform some Vault
-  functionality automatically, and act as a proxy for Vault's APIs.
----
-
-# What is Vault Proxy?
-
-Vault Proxy aims to remove the initial hurdle to adopt Vault by providing a
-more scalable and simpler way for applications to integrate with Vault.
-Vault Proxy acts as an [API Proxy][apiproxy] for Vault, and can optionally allow
-or force interacting clients to use its [automatically authenticated token][autoauth].
-
-Vault Proxy is a client daemon that provides the following features:
-
-- [Auto-Auth][autoauth] - Automatically authenticate to Vault and manage the
-token renewal process for locally-retrieved dynamic secrets.
-- [API Proxy][apiproxy] - Acts as a proxy for Vault's API,
-optionally using (or forcing the use of) the Auto-Auth token.
-- [Caching][caching] - Allows client-side caching of responses containing newly
-created tokens and responses containing leased secrets generated off of these
-newly created tokens. The agent also manages the renewals of the cached tokens and leases.
-
-## Auto-Auth
-
-Vault Proxy allows easy authentication to Vault in a wide variety of
-environments. Please see the [Auto-Auth docs][autoauth]
-for information.
-
-Auto-Auth functionality takes place within an `auto_auth` configuration stanza.
-
-## API Proxy
-
-Vault Proxy's primary purpose is to act as an API proxy for Vault, allowing you to talk to Vault's
-API via a listener. It can be configured to optionally allow or force the automatic use of
-the Auto-Auth token for these requests. Please see the [API Proxy docs][apiproxy]
-for more information.
-
-API Proxy functionality takes place within a defined `listener`, and its behaviour can be configured with an
-[`api_proxy` stanza](/vault/docs/agent-and-proxy/proxy/apiproxy#configuration-api_proxy).
-
-## Caching
-
-Vault Proxy allows client-side caching of responses containing newly created tokens
-and responses containing leased secrets generated off of these newly created tokens.
-Please see the [Caching docs][caching] for information.
-
-## API
-
-### Quit
-
-This endpoint triggers shutdown of the proxy. By default, it is disabled, and can
-be enabled per listener using the [`agent_api`][agent-api] stanza. It is recommended
-to only enable this on trusted interfaces, as it does not require any authorization to use.
-
-| Method | Path             |
-| :----- | :--------------- |
-| `POST` | `/proxy/v1/quit` |
-
-### Cache
-
-See the [caching](/vault/docs/agent-and-proxy/proxy/caching#api) page for details on the cache API.
-
-## Configuration
-
-### Command Options
-
-- `-log-level` ((#\_log_level)) `(string: "info")` - Log verbosity level. Supported values (in
-order of descending detail) are `trace`, `debug`, `info`, `warn`, and `error`. This can
-also be specified via the `VAULT_LOG_LEVEL` environment variable.
-
-- `-log-format` ((#\_log_format)) `(string: "standard")` - Log format. Supported values
-are `standard` and `json`. This can also be specified via the
-`VAULT_LOG_FORMAT` environment variable.
-
-- `-log-file` ((#\_log_file)) - writes all the Vault proxy log messages
-to a file. This value is used as a prefix for the log file name. The current timestamp
-is appended to the file name. If the value ends in a path separator, `vault-proxy`
-will be appended to the value. If the file name is missing an extension, `.log`
-is appended. For example, setting `log-file` to `/var/log/` would result in a log
-file path of `/var/log/vault-proxy-{timestamp}.log`. `log-file` can be combined with
-[`-log-rotate-bytes`](#_log_rotate_bytes) and [`-log-rotate-duration`](#_log_rotate_duration)
-for a fine-grained log rotation experience.
-
-- `-log-rotate-bytes` ((#\_log_rotate_bytes)) - to specify the number of
-bytes that should be written to a log before it needs to be rotated. Unless specified,
-there is no limit to the number of bytes that can be written to a log file.
-
-- `-log-rotate-duration` ((#\_log_rotate_duration)) - to specify the maximum
-duration a log should be written to before it needs to be rotated. Must be a duration
-value such as 30s. Defaults to 24h.
-
-- `-log-rotate-max-files` ((#\_log_rotate_max_files)) - to specify the maximum
-number of older log file archives to keep. Defaults to `0` (no files are ever deleted).
-Set to `-1` to discard old log files when a new one is created.
-
-### Configuration File Options
-
-These are the currently-available general configuration options:
-
-- `vault` <code>([vault][vault]: <optional\>)</code> - Specifies the remote Vault server the Proxy connects to.
-
-- `auto_auth` <code>([auto_auth][autoauth]: <optional\>)</code> - Specifies the method and other options used for Auto-Auth functionality.
-
-- `api_proxy` <code>([api_proxy][apiproxy]: <optional\>)</code> - Specifies options used for API Proxy functionality.
-
-- `cache` <code>([cache][caching]: <optional\>)</code> - Specifies options used for Caching functionality.
-
-- `listener` <code>([listener][listener]: <optional\>)</code> - Specifies the addresses and ports on which the Proxy will respond to requests.
-
-~> **Note:** On `SIGHUP` (`kill -SIGHUP $(pidof vault)`), Vault Proxy will attempt to reload listener TLS configuration.
-This method can be used to refresh certificates used by Vault Proxy without having to restart its process.
-
-- `pid_file` `(string: "")` - Path to the file in which the Proxy's Process ID
-(PID) should be stored
-
-- `exit_after_auth` `(bool: false)` - If set to `true`, the proxy will exit
-with code `0` after a single successful auth, where success means that a
-token was retrieved and all sinks successfully wrote it
-
-- `disable_idle_connections` `(string array: [])` - A list of strings that disables idle connections for various features in Vault Proxy.
-Valid values include: `auto-auth`, and `proxying`. Can also be configured by setting the `VAULT_PROXY_DISABLE_IDLE_CONNECTIONS`
-environment variable as a comma separated string. This environment variable will override any values found in a configuration file.
-
-- `disable_keep_alives` `(string array: [])` - A list of strings that disables keep alives for various features in Vault Agent.
-Valid values include: `auto-auth`, and `proxying`. Can also be configured by setting the `VAULT_PROXY_DISABLE_KEEP_ALIVES`
-environment variable as a comma separated string. This environment variable will override any values found in a configuration file.
-
-- `template` <code>([template][template]: <optional\>)</code> - Specifies options used for templating Vault secrets to files.
-
-- `template_config` <code>([template_config][template-config]: <optional\>)</code> - Specifies templating engine behavior.
-
-- `telemetry` <code>([telemetry][telemetry]: <optional\>)</code> – Specifies the telemetry
-reporting system. See the [telemetry Stanza](/vault/docs/agent-and-proxy/proxy#telemetry-stanza) section below
-for a list of metrics specific to Proxy.
-
-- `log_level` - Equivalent to the [`-log-level` command-line flag](#_log_level).
-
-~> **Note:** On `SIGHUP` (`kill -SIGHUP $(pidof vault)`), Vault Proxy will update the log level to the value
-specified by configuration file (including overriding values set using CLI or environment variable parameters).
-
-- `log_format` - Equivalent to the [`-log-format` command-line flag](#_log_format).
-
-- `log_file` - Equivalent to the [`-log-file` command-line flag](#_log_file).
-
-- `log_rotate_duration` - Equivalent to the [`-log-rotate-duration` command-line flag](#_log_rotate_duration).
-
-- `log_rotate_bytes` - Equivalent to the [`-log-rotate-bytes` command-line flag](#_log_rotate_bytes).
-
-- `log_rotate_max_files` - Equivalent to the [`-log-rotate-max-files` command-line flag](#_log_rotate_max_files).
-
-### vault Stanza
-
-There can at most be one top level `vault` block, and it has the following
-configuration entries:
-
-- `address` `(string: <optional>)` - The address of the Vault server to
-connect to. This should be a Fully Qualified Domain Name (FQDN) or IP
-such as `https://vault-fqdn:8200` or `https://172.16.9.8:8200`.
-This value can be overridden by setting the `VAULT_ADDR` environment variable.
-
-- `ca_cert` `(string: <optional>)` - Path on the local disk to a single PEM-encoded
-CA certificate to verify the Vault server's SSL certificate. This value can
-be overridden by setting the `VAULT_CACERT` environment variable.
-
-- `ca_path` `(string: <optional>)` - Path on the local disk to a directory of
-PEM-encoded CA certificates to verify the Vault server's SSL certificate.
-This value can be overridden by setting the `VAULT_CAPATH` environment
-variable.
-
-- `client_cert` `(string: <optional>)` - Path on the local disk to a single
-PEM-encoded CA certificate to use for TLS authentication to the Vault server.
-This value can be overridden by setting the `VAULT_CLIENT_CERT` environment
-variable.
-
-- `client_key` `(string: <optional>)` - Path on the local disk to a single
-PEM-encoded private key matching the client certificate from `client_cert`.
-This value can be overridden by setting the `VAULT_CLIENT_KEY` environment
-variable.
-
-- `tls_skip_verify` `(string: <optional>)` - Disable verification of TLS
-certificates. Using this option is highly discouraged as it decreases the
-security of data transmissions to and from the Vault server. This value can
-be overridden by setting the `VAULT_SKIP_VERIFY` environment variable.
-
-- `tls_server_name` `(string: <optional>)` - Name to use as the SNI host when
-connecting via TLS. This value can be overridden by setting the
-`VAULT_TLS_SERVER_NAME` environment variable.
-
-#### retry Stanza
-
-The `vault` stanza may contain a `retry` stanza that controls how failing Vault
-requests are handled. Auto-auth, however, has its own notion of retrying and is not
-affected by this section.
-
-Here are the options for the `retry` stanza:
-
-- `num_retries` `(int: 12)` - Specify how many times a failing request will
-be retried. A value of `0` translates to the default, i.e. 12 retries.
-A value of `-1` disables retries. The environment variable `VAULT_MAX_RETRIES`
-overrides this setting.
-
-Requests originating
-from the proxy cache will only be retried if they resulted in specific HTTP
-result codes: any 50x code except 501 ("not implemented"), as well as 412
-("precondition failed"); 412 is used in Vault Enterprise 1.7+ to indicate a
-stale read due to eventual consistency. Requests coming from the template
-subsystem are retried regardless of the failure.
-
-### listener Stanza
-
-Vault Proxy supports one or more [listener][listener_main] stanzas. Listeners
-can be configured with or without [caching][caching], but will use the cache if it
-has been configured, and will enable the [API proxy][apiproxy]. In addition to the standard
-listener configuration, a Proxy's listener configuration also supports the following:
-
-- `require_request_header` `(bool: false)` - Require that all incoming HTTP
-requests on this listener must have an `X-Vault-Request: true` header entry.
-Using this option offers an additional layer of protection from Server Side
-Request Forgery attacks. Requests on the listener that do not have the proper
-`X-Vault-Request` header will fail, with a HTTP response status code of `412: Precondition Failed`.
-
-- `role` `(string: default)` - `role` determines which APIs the listener serves.
-It can be configured to `metrics_only` to serve only metrics, or the default role, `default`,
-which serves everything (including metrics). The `require_request_header` does not apply
-to `metrics_only` listeners.
-
-- `proxy_api` <code>([proxy_api][proxy-api]: <optional\>)</code> - Manages optional Proxy API endpoints.
-
-#### proxy_api Stanza
-
-- `enable_quit` `(bool: false)` - If set to `true`, the Proxy will enable the [quit](/vault/docs/agent-and-proxy/proxy#quit) API.
-
-### telemetry Stanza
-
-Vault Proxy supports the [telemetry][telemetry] stanza and collects various
-runtime metrics about its performance, the auto-auth and the cache status:
-
-| Metric                           | Description                                          | Type    |
-| -------------------------------- | ---------------------------------------------------- | ------- |
-| `vault.proxy.auth.failure`       | Number of authentication failures                    | counter |
-| `vault.proxy.auth.success`       | Number of authentication successes                   | counter |
-| `vault.proxy.proxy.success`      | Number of requests successfully proxied              | counter |
-| `vault.proxy.proxy.client_error` | Number of requests for which Vault returned an error | counter |
-| `vault.proxy.proxy.error`        | Number of requests the proxy failed to proxy         | counter |
-| `vault.proxy.cache.hit`          | Number of cache hits                                 | counter |
-| `vault.proxy.cache.miss`         | Number of cache misses                               | counter |
-
-## Start Vault Proxy
-
-To run Vault Proxy:
-
-1. [Download](/vault/downloads) the Vault binary where the client application runs
-(virtual machine, Kubernetes pod, etc.)
-
-1. Create a Vault Proxy configuration file. (See the [Example
-Configuration](#example-configuration) section for an example configuration.)
-
-1. Start a Vault Proxy with the configuration file.
-
-**Example:**
-
-```shell-session
-$ vault proxy -config=/etc/vault/proxy-config.hcl
-   ```
-
-To get help, run:
-
-```shell-session
-$ vault proxy -h
-   ```
-
-As with Vault, the `-config` flag can be used in three different ways:
-
-- Use the flag once to name the path to a single specific configuration file.
-- Use the flag multiple times to name multiple configuration files, which will be composed at runtime.
-- Use the flag to name a directory of configuration files, the contents of which will be composed at runtime.
-
-## Example Configuration
-
-An example configuration, with very contrived values, follows:
-
-```hcl
-pid_file = "./pidfile"
-
-vault {
-  address = "https://vault-fqdn:8200"
-  retry {
-    num_retries = 5
-  }
-}
-
-auto_auth {
-  method "aws" {
-    mount_path = "auth/aws-subaccount"
-    config = {
-      type = "iam"
-      role = "foobar"
-    }
-  }
-
-  sink "file" {
-    config = {
-      path = "/tmp/file-foo"
-    }
-  }
-
-  sink "file" {
-    wrap_ttl = "5m"
-    aad_env_var = "TEST_AAD_ENV"
-    dh_type = "curve25519"
-    dh_path = "/tmp/file-foo-dhpath2"
-    config = {
-      path = "/tmp/file-bar"
-    }
-  }
-}
-
-cache {
-  // An empty cache stanza still enables caching
-}
-
-api_proxy {
-  use_auto_auth_token = true
-}
-
-listener "unix" {
-  address = "/path/to/socket"
-  tls_disable = true
-
-  agent_api {
-    enable_quit = true
-  }
-}
-
-listener "tcp" {
-  address = "127.0.0.1:8100"
-  tls_disable = true
-}
-```
-
-[vault]: /vault/docs/agent-and-proxy/proxy#vault-stanza
-[autoauth]: /vault/docs/agent-and-proxy/proxy/autoauth
-[caching]: /vault/docs/agent-and-proxy/proxy/caching
-[apiproxy]: /vault/docs/agent-and-proxy/proxy/apiproxy
-[persistent-cache]: /vault/docs/agent-and-proxy/proxy/caching/persistent-caches
-[template]: /vault/docs/agent-and-proxy/proxy/template
-[template-config]: /vault/docs/agent-and-proxy/proxy/template#template-configurations
-[proxy-api]: /vault/docs/agent-and-proxy/proxy/#proxy_api-stanza
-[listener]: /vault/docs/agent-and-proxy/proxy#listener-stanza
-[listener_main]: /vault/docs/configuration/listener/tcp
-[telemetry]: /vault/docs/configuration/telemetry
diff --git a/website/content/docs/agent-and-proxy/proxy/versions.mdx b/website/content/docs/agent-and-proxy/proxy/versions.mdx
deleted file mode 100644
index a1fb158e882b6..0000000000000
--- a/website/content/docs/agent-and-proxy/proxy/versions.mdx
+++ /dev/null
@@ -1,39 +0,0 @@
----
-layout: docs
-page_title: Vault Proxy Version Compatibility
-description: |-
-  Guidelines for running different versions of Proxy and Server
----
-
-# Running different versions of Proxy and Server
-
-There is no requirement to run identical versions of Vault Proxy and Vault Server.
-It is safe to run different versions, however you may not be able to take advantage of all the newest features in Vault if you do not upgrade to the most recent versions of Proxy and Server. We recognize that this isn’t always possible, so we do support version mismatch as best as possible.
-
-Proxy will write a note to its logs when it detects a mismatch between Proxy and Server.  This is purely informative, intended to assist with debugging in case the mismatch is given rise to problems, e.g. because a newer Proxy version is trying to make use of functionality that doesn't exist in the Server version it's talking to.  If Proxy is behaving acceptably, the message may be ignored.
-
-This document describes the common cases.  There may be occasional exceptions, which if intentional will be called out in the CHANGELOG in a `CHANGES` section.  If unintentional/undocumented these should be treated as bugs and reported.
-
-## Older version of Proxy than Server
-
-We do not anticipate any problems stemming from continuing to run an older Proxy version after the server nodes are upgraded to a later version.  Existing deployments using Proxy should not be impacted, as we don't generally make backwards-incompatible changes to Vault Server.
-
-Auto-auth:
-- new auth methods that have been introduced since Proxy was built will be unavailable
-- existing auth methods should continue to function normally
-
-Proxy:
-- since Proxy simply mirrors the incoming requests, even if an incoming request uses an endpoint that didn't exist when that version of Proxy was compiled, that won't impede Proxy's ability to proxy the request
-
-## Newer version of Proxy than Server
-
-It is possible that an Proxy could depend on features that don’t exist in older Server versions.
-
-Auto-auth:
-- Proxy may claim to support newer auth methods that have been introduced since Server was built, but they won't work due to Server not supporting them
-- Proxy may make use of new functionality for existing auth methods that isn't available in an older Server you're using
-  - Generally we will try to make such a change be opt-in, or to gracefully degrade when connecting to an older Server instance, unless there's a very good reason (such as a serious security flaw being patched)
-
-Proxy:
-- since Proxy simply mirrors the incoming requests, it is unlikely that incompatibilities would surface in proxying, but new functionality may not be available
-- example: When client-controlled consistency support was added to Proxy, it started looking for X-Vault-Index headers in responses, and started providing X-Vault-Index headers in proxied requests.  Older Vault Enterprise servers that don't make use of these headers would ignore the new request header and not emit them either.  Proxy proxying behaviour continued unchanged, unable to take advantage of the new functionality, but also not impeded in its previously existing behavior.
diff --git a/website/content/docs/agent/autoauth/index.mdx b/website/content/docs/agent/autoauth/index.mdx
new file mode 100644
index 0000000000000..dc6fb55050a28
--- /dev/null
+++ b/website/content/docs/agent/autoauth/index.mdx
@@ -0,0 +1,347 @@
+---
+layout: docs
+page_title: Vault Agent Auto-Auth
+description: |-
+  Vault Agent's Auto-Auth functionality allows easy and automatic
+  authentication to Vault in a variety of environments.
+---
+
+# Vault Agent Auto-Auth
+
+The Auto-Auth functionality of Vault Agent allows for easy authentication in a
+wide variety of environments.
+
+## Functionality
+
+Auto-Auth consists of two parts: a Method, which is the authentication method
+that should be used in the current environment; and any number of Sinks, which
+are locations where the agent should write a token any time the current token
+value has changed.
+
+When the agent is started with Auto-Auth enabled, it will attempt to acquire a
+Vault token using the configured Method. On failure, it will exponentially back
+off and then retry. On success, unless the auth method is configured to wrap
+the tokens, it will keep the resulting token renewed until renewal is no longer
+allowed or fails, at which point it will attempt to reauthenticate.
+
+Every time an authentication is successful, the token is written to the
+configured Sinks, subject to their configuration.
+
+## Advanced Functionality
+
+Sinks support some advanced features, including the ability for the written
+values to be encrypted or
+[response-wrapped](/docs/concepts/response-wrapping).
+
+Both mechanisms can be used concurrently; in this case, the value will be
+response-wrapped, then encrypted.
+
+### Response-Wrapping Tokens
+
+There are two ways that tokens can be response-wrapped by the agent:
+
+1. By the auth method. This allows the end client to introspect the
+   `creation_path` of the token, helping prevent Man-In-The-Middle (MITM)
+   attacks. However, because the agent cannot then unwrap the token and rewrap
+   it without modifying the `creation_path`, the agent is not able to renew the
+   token; it is up to the end client to renew the token. The agent stays
+   daemonized in this mode since some auth methods allow for reauthentication
+   on certain events.
+
+2. By any of the token sinks. Because more than one sink can be configured, the
+   token must be wrapped after it is fetched, rather than wrapped by Vault as
+   it's being returned. As a result, the `creation_path` will always be
+   `sys/wrapping/wrap`, and validation of this field cannot be used as
+   protection against MITM attacks. However, this mode allows the agent to keep
+   the token renewed for the end client and automatically reauthenticate when
+   it expires.
+
+### Encrypting Tokens
+
+~> Support for encrypted tokens is experimental; if input/output formats
+change, we will make every effort to provide backwards compatibility.
+
+Tokens can be encrypted, using a Diffie-Hellman exchange to generate an
+ephemeral key. In this mechanism, the client receiving the token writes a
+generated public key to a file. The sink responsible for writing the token to
+that client looks for this public key and uses it to compute a shared secret
+key, which is then used to encrypt the token via AES-GCM. The nonce, encrypted
+payload, and the sink's public key are then written to the output file, where
+the client can compute the shared secret and decrypt the token value.
+
+~> NOTE: Token encryption is not a protection against MITM attacks! The purpose
+of this feature is for forward-secrecy and coverage against bare token values
+being persisted. A MITM that can write to the sink's output and/or client
+public-key input files could attack this exchange. Using TLS to protect the
+transit of tokens is highly recommended.
+
+To help mitigate MITM attacks, additional authenticated data (AAD) can be
+provided to the agent. This data is written as part of the AES-GCM tag and must
+match on both the agent and the client. This of course means that protecting
+this AAD becomes important, but it provides another layer for an attacker to
+have to overcome. For instance, if the attacker has access to the file system
+where the token is being written, but not to read agent configuration or read
+environment variables, this AAD can be generated and passed to the agent and
+the client in ways that would be difficult for the attacker to find.
+
+When using AAD, it is always a good idea for this to be as fresh as possible;
+generate a value and pass it to your client and agent on startup. Additionally,
+agent uses a Trust On First Use model; after it finds a generated public key,
+it will reuse that public key instead of looking for new values that have been
+written.
+
+If writing a client that uses this feature, it will likely be helpful to look
+at the
+[dhutil](https://github.com/hashicorp/vault/blob/main/helper/dhutil/dhutil.go)
+library. This shows the expected format of the public key input and envelope
+output formats.
+
+## Configuration
+
+The top level `auto_auth` block has two configuration entries:
+
+- `method` `(object: required)` - Configuration for the method
+
+- `sinks` `(array of objects: optional)` - Configuration for the sinks
+
+### Configuration (Method)
+
+~> Auto-auth does not support using tokens with a limited number of uses. Vault
+Agent does not track the number of uses remaining, and may allow the token to
+expire before attempting to renew it. For example, if using AppRole auto-auth,
+you must use 0 (meaning unlimited) as the value for
+[`token_num_uses`](https://www.vaultproject.io/api-docs/auth/approle#token_num_uses).
+
+These are common configuration values that live within the `method` block:
+
+- `type` `(string: required)` - The type of the method to use, e.g. `aws`,
+  `gcp`, `azure`, etc. _Note_: when using HCL this can be used as the key for
+  the block, e.g. `method "aws" {...}`.
+
+- `mount_path` `(string: optional)` - The mount path of the method. If not
+  specified, defaults to a value of `auth/<method type>`.
+
+- `namespace` `(string: optional)` - Namespace in which the mount lives.
+  The order of precedence is: this setting lowest, followed by the
+  environment variable `VAULT_NAMESPACE`, and then the highest precedence
+  command-line option `-namespace`.
+  If none of these are specified, defaults to the root namespace.
+  Note that because sink response wrapping and templating are also based
+  on the client created by auto-auth, they use the same namespace.
+
+- `wrap_ttl` `(string or integer: optional)` - If specified, the written token
+  will be response-wrapped by the agent. This is more secure than wrapping by
+  sinks, but does not allow the agent to keep the token renewed or
+  automatically reauthenticate when it expires. Rather than a simple string,
+  the written value will be a JSON-encoded
+  [SecretWrapInfo](https://godoc.org/github.com/hashicorp/vault/api#SecretWrapInfo)
+  structure. Uses [duration format strings](/docs/concepts/duration-format).
+
+- `min_backoff` `(string or integer: "1s")` - The minimum backoff time Agent
+  will delay before retrying after a failed auth attempt. The backoff will start
+  at the configured value and double (with some randomness) after successive
+  failures, capped by `max_backoff.` If Agent templating is being used, this
+  value is also used as the min backoff time for the templating server.
+  Uses [duration format strings](/docs/concepts/duration-format).
+
+- `max_backoff` `(string or integer: "5m")` - The maximum time Agent will delay
+  before retrying after a failed auth attempt. The backoff will start at
+  `min_backoff` and double (with some randomness) after successive failures,
+  capped by `max_backoff.` If Agent templating is being used, this value is also
+  used as the max backoff time for the templating server. `max_backoff` is the
+  duration between retries, and **not** the duration that retries will be
+  performed before giving up. Uses [duration format strings](/docs/concepts/duration-format).
+
+- `exit_on_err` `(bool: false)` - When set to true, Vault Agent will exit if any 
+  errors occur during authentication. This configurable only affects login attempts 
+  for new tokens (either intial or expired tokens) and will not exit for errors on 
+  valid token renewals.
+
+- `config` `(object: required)` - Configuration of the method itself. See the
+  sidebar for information about each method.
+
+### Configuration (Sinks)
+
+These configuration values are common to all Sinks:
+
+- `type` `(string: required)` - The type of the method to use, e.g. `file`.
+  _Note_: when using HCL this can be used as the key for the block, e.g. `sink "file" {...}`.
+
+- `wrap_ttl` `(string or integer: optional)` - If specified, the written token
+  will be response-wrapped by the sink. This is less secure than wrapping by
+  the method, but allows the agent to keep the token renewed and automatically
+  reauthenticate when it expires. Rather than a simple string, the written
+  value will be a JSON-encoded
+  [SecretWrapInfo](https://godoc.org/github.com/hashicorp/vault/api#SecretWrapInfo)
+  structure. Uses [duration format strings](/docs/concepts/duration-format).
+
+- `dh_type` `(string: optional)` - If specified, the type of Diffie-Hellman exchange to
+  perform, meaning, which ciphers and/or curves. Currently only `curve25519` is
+  supported.
+
+- `dh_path` `(string: required if dh_type is set)` - The path from which the
+  agent should read the client's initial parameters (e.g. curve25519 public
+  key).
+
+- `derive_key` `(bool: false)` - If specified, the final encryption key is
+  calculated by using HKDF-SHA256 to derive a key from the calculated shared
+  secret and the two public keys for enhanced security. This is recommended
+  if backward compatibility isn't a concern.
+
+- `aad` `(string: optional)` - If specified, additional authenticated data to
+  use with the AES-GCM encryption of the token. Can be any string, including
+  serialized data.
+
+- `aad_env_var` `(string: optional)` - If specified, AAD will be read from the
+  given environment variable rather than a value in the configuration file.
+
+- `config` `(object: required)` - Configuration of the sink itself. See the
+  sidebar for information about each sink.
+
+### Auto Auth Examples
+
+Auto-Auth configuration objects take two separate forms when specified in HCL
+and JSON. The following examples are meant to clarify the differences between
+the two formats.
+
+#### Sinks (HCL Format)
+
+The HCL format may define any number of sink objects with an optional wrapping
+`sinks {...}` object.
+
+~> Note: The [corresponding JSON format](#sinks-json-format) _must_ specify a
+`"sinks" : [...]` array to encapsulate all `sink` JSON objects.
+
+```hcl
+// Other Vault Agent configuration blocks
+// ...
+
+auto_auth {
+  method {
+    type = "approle"
+
+    config = {
+      role_id_file_path = "/etc/vault/roleid"
+      secret_id_file_path = "/etc/vault/secretid"
+    }
+  }
+
+  sinks {
+    sink {
+      type = "file"
+
+      config = {
+        path = "/tmp/file-foo"
+      }
+    }
+  }
+}
+```
+
+The following valid HCL omits the wrapping `sinks` object while specifying
+multiple sinks.
+
+```hcl
+// Other Vault Agent configuration blocks
+// ...
+
+auto_auth {
+  method {
+    type = "approle"
+
+    config = {
+      role_id_file_path = "/etc/vault/roleid"
+      secret_id_file_path = "/etc/vault/secretid"
+    }
+  }
+
+  sink {
+    type = "file"
+
+    config = {
+      path = "/tmp/file-foo"
+    }
+  }
+
+  sink {
+    type = "file"
+
+    config = {
+      path = "/tmp/file-bar"
+    }
+  }
+}
+```
+
+#### Sinks (JSON format)
+
+The following JSON configuration illustrates the need for a `sinks: [...]` array
+wrapping any number of `sink` objects.
+
+```json
+{
+  "auto_auth" : {
+    "method" : [
+      {
+        type = "approle"
+
+        config = {
+          role_id_file_path = "/etc/vault/roleid"
+          secret_id_file_path = "/etc/vault/secretid"
+        }
+      }
+    ],
+    "sinks" : [
+      {
+        "sink" : {
+          type = "file"
+
+          config = {
+            path = "/tmp/file-foo"
+          }
+        }
+      }
+    ]
+  }
+}
+```
+
+Multiple sinks are defined by appending more `sink` objects within the `sinks`
+array:
+
+```json
+{
+  "auto_auth" : {
+    "method" : [
+      {
+        type = "approle"
+
+        config = {
+          role_id_file_path = "/etc/vault/roleid"
+          secret_id_file_path = "/etc/vault/secretid"
+        }
+      }
+    ],
+    "sinks" : [
+      {
+        "sink" : {
+          type = "file"
+
+          config = {
+            path = "/tmp/file-foo"
+          }
+        }
+      },
+      {
+        "sink" : {
+          type = "file"
+
+          config = {
+            path = "/tmp/file-bar"
+          }
+        }
+      }
+    ]
+  }
+}
+```
\ No newline at end of file
diff --git a/website/content/docs/agent-and-proxy/autoauth/methods/alicloud.mdx b/website/content/docs/agent/autoauth/methods/alicloud.mdx
similarity index 89%
rename from website/content/docs/agent-and-proxy/autoauth/methods/alicloud.mdx
rename to website/content/docs/agent/autoauth/methods/alicloud.mdx
index 3b252e09840b6..dea7cb73d1b4f 100644
--- a/website/content/docs/agent-and-proxy/autoauth/methods/alicloud.mdx
+++ b/website/content/docs/agent/autoauth/methods/alicloud.mdx
@@ -1,17 +1,17 @@
 ---
 layout: docs
-page_title: Vault Auto-Auth AliCloud Method
-description: AliCloud Method for Vault Auto-Auth
+page_title: Vault Agent Auto-Auth AliCloud Method
+description: AliCloud Method for Vault Agent Auto-Auth
 ---
 
 # Vault Agent Auto-Auth AliCloud Method
 
 The `alicloud` method performs authentication against the [AliCloud Auth
-method](/vault/docs/auth/alicloud).
+method](/docs/auth/alicloud).
 
 ## Credentials
 
-Auto-auth will use the first credential it can successfully obtain in the following order:
+The Vault agent will use the first credential it can successfully obtain in the following order:
 
 1. [Environment variables](https://github.com/aliyun/alibaba-cloud-sdk-go/blob/master/sdk/auth/credentials/providers/env.go)
 2. A static credential configuration
diff --git a/website/content/docs/agent-and-proxy/autoauth/methods/approle.mdx b/website/content/docs/agent/autoauth/methods/approle.mdx
similarity index 85%
rename from website/content/docs/agent-and-proxy/autoauth/methods/approle.mdx
rename to website/content/docs/agent/autoauth/methods/approle.mdx
index 22b6236167d19..3f81242d78854 100644
--- a/website/content/docs/agent-and-proxy/autoauth/methods/approle.mdx
+++ b/website/content/docs/agent/autoauth/methods/approle.mdx
@@ -1,14 +1,14 @@
 ---
 layout: docs
-page_title: Vault Auto-Auth AppRole Method
-description: AppRole Method for Vault Auto-Auth
+page_title: Vault Agent Auto-Auth AppRole Method
+description: AppRole Method for Vault Agent Auto-Auth
 ---
 
-# Vault Auto-Auth AppRole Method
+# Vault Agent Auto-Auth AppRole Method
 
 The `approle` method reads in a role ID and a secret ID from files and sends
 the values to the [AppRole Auth
-method](/vault/docs/auth/approle).
+method](/docs/auth/approle).
 
 The method caches values and it is safe to delete the role ID/secret ID files
 after they have been read. In fact, by default, after reading the secret ID,
@@ -32,15 +32,15 @@ cached.
 
 - `secret_id_response_wrapping_path` `(string: optional)` - If set, the value
   at `secret_id_file_path` will be expected to be a [Response-Wrapping
-  Token](/vault/docs/concepts/response-wrapping)
+  Token](/docs/concepts/response-wrapping)
   containing the output of the secret ID retrieval endpoint for the role (e.g.
   `auth/approle/role/webservers/secret-id`) and the creation path for the
   response-wrapping token must match the value set here.
 
 ## Example Configuration
 
-An example configuration, using approle to enable [auto-auth](/vault/docs/agent-and-proxy/autoauth)
-and creating both a plaintext token sink and a [response-wrapped token sink file](/vault/docs/agent-and-proxy/autoauth#wrap_ttl), follows:
+An example configuration, using approle to enable [auto-auth](/docs/agent/autoauth)
+and creating both a plaintext token sink and a [response-wrapped token sink file](/docs/agent/autoauth#wrap_ttl), follows:
 
 ```hcl
 pid_file = "./pidfile"
@@ -77,7 +77,7 @@ auto_auth {
 }
 
 
-api_proxy {
+cache {
   use_auto_auth_token = true
 }
 
diff --git a/website/content/docs/agent-and-proxy/autoauth/methods/aws.mdx b/website/content/docs/agent/autoauth/methods/aws.mdx
similarity index 82%
rename from website/content/docs/agent-and-proxy/autoauth/methods/aws.mdx
rename to website/content/docs/agent/autoauth/methods/aws.mdx
index 45f1b56ee0578..9abbd74a114a4 100644
--- a/website/content/docs/agent-and-proxy/autoauth/methods/aws.mdx
+++ b/website/content/docs/agent/autoauth/methods/aws.mdx
@@ -1,13 +1,13 @@
 ---
 layout: docs
-page_title: Vault Auto-Auth AWS Method
-description: AWS Method for Vault Auto-Auth
+page_title: Vault Agent Auto-Auth AWS Method
+description: AWS Method for Vault Agent Auto-Auth
 ---
 
-# Vault Auto-Auth AWS Method
+# Vault Agent Auto-Auth AWS Method
 
 The `aws` method performs authentication against the [AWS Auth
-method](/vault/docs/auth/aws). Both `ec2` and `iam`
+method](/docs/auth/aws). Both `ec2` and `iam`
 authentication types are supported. If `ec2` is used, the agent will store the
 reauthentication value in memory and use it for reauthenticating, but will not
 persist it to disk.
@@ -48,19 +48,19 @@ parameters unset in your configuration.
 
 - `region` `(string: "us-east-1")` - The region to use for signing the authentication request. The
   region Agent uses should match that corresponding to
-  [`sts_endpoint`](/vault/api-docs/auth/aws#sts_endpoint),
+  [`sts_endpoint`](/api-docs/auth/aws#sts_endpoint),
   if a custom endpoint has been configured on the Vault server.
 
 - `session_token` `(string: optional)` - The session token to use for authentication, if needed.
 
 - `header_value` `(string: optional)` - If configured in Vault, the value to use for
-  [`iam_server_id_header_value`](/vault/api-docs/auth/aws#iam_server_id_header_value).
+  [`iam_server_id_header_value`](/api-docs/auth/aws#iam_server_id_header_value).
 
 - `nonce` `(string: optional)` - If not provided, Vault will generate a new UUID every time `vault agent` runs.
   If set, make sure you understand the importance of generating a good, unique `nonce` and protecting it.
-  See [Client Nonce](/vault/docs/auth/aws#client-nonce) for more information.
+  See [Client Nonce](/docs/auth/aws#client-nonce) for more information.
 
 ## Tutorial
 
 Refer to the [Vault Agent with
-AWS](/vault/tutorials/vault-agent/agent-aws) tutorial to learn how to integrate Vault Agent with IAM AWS' native authentication.
+AWS](https://learn.hashicorp.com/vault/identity-access-management/vault-agent-aws) tutorial to learn how to integrate Vault with IAM AWS' native authentication.
diff --git a/website/content/docs/agent-and-proxy/autoauth/methods/azure.mdx b/website/content/docs/agent/autoauth/methods/azure.mdx
similarity index 85%
rename from website/content/docs/agent-and-proxy/autoauth/methods/azure.mdx
rename to website/content/docs/agent/autoauth/methods/azure.mdx
index c97c809a8b372..d02d0e61e9dda 100644
--- a/website/content/docs/agent-and-proxy/autoauth/methods/azure.mdx
+++ b/website/content/docs/agent/autoauth/methods/azure.mdx
@@ -1,14 +1,14 @@
 ---
 layout: docs
-page_title: Vault Auto-Auth Azure Method
-description: Azure Method for Vault Auto-Auth
+page_title: Vault Agent Auto-Auth Azure Method
+description: Azure Method for Vault Agent Auto-Auth
 ---
 
-# Vault Auto-Auth Azure Method
+# Vault Agent Auto-Auth Azure Method
 
 The `azure` method reads in Azure instance credentials and uses them to
 authenticate with the [Azure Auth
-method](/vault/docs/auth/azure). It reads most
+method](/docs/auth/azure). It reads most
 parameters needed for authentication directly from instance information based
 on the value of the `resource` parameter.
 
diff --git a/website/content/docs/agent/autoauth/methods/cert.mdx b/website/content/docs/agent/autoauth/methods/cert.mdx
new file mode 100644
index 0000000000000..21f0a7fc62c33
--- /dev/null
+++ b/website/content/docs/agent/autoauth/methods/cert.mdx
@@ -0,0 +1,32 @@
+---
+layout: docs
+page_title: Vault Agent Auto-Auth Cert Method
+description: Cert Method for Vault Agent Auto-Auth
+---
+
+# Vault Agent Auto-Auth Cert Method
+
+The `cert` method uses the configured TLS certificates from the `vault` stanza of
+the agent configuration and takes an optional `name` parameter. There is no option
+to use certificates which differ from those used in the `vault` stanza.
+
+It is strongly advised to provide TLS settings in the configuration stanza
+within the auth method to avoid agent cache, if also enabled, from using the
+same TLS settings when proxying requests. If TLS settings are not present in the
+config stanza, Agent will fall back to using TLS settings from the [`vault`
+Stanza](/docs/agent#vault-stanza).
+
+## Configuration
+
+- `name` `(string: optional)` - The trusted certificate role which should be used
+  when authenticating with TLS. If a `name` is not specified, the auth method will
+  try to authenticate against [all trusted certificates](/docs/auth/cert#authentication).
+
+- `ca_cert` `(string: optional)` - Path on the local disk to a single
+  PEM-encoded CA certificate to verify the Vault server's SSL certificate.
+
+- `client_cert` `(string: optional)` - Path on the local disk to a single
+  PEM-encoded client certificate to use for cert auth method authentication.
+
+- `client_key` `(string: optional)` - Path on the local disk to a single
+  PEM-encoded private key matching the client certificate from client_cert.
diff --git a/website/content/docs/agent-and-proxy/autoauth/methods/cf.mdx b/website/content/docs/agent/autoauth/methods/cf.mdx
similarity index 75%
rename from website/content/docs/agent-and-proxy/autoauth/methods/cf.mdx
rename to website/content/docs/agent/autoauth/methods/cf.mdx
index e4dd4e616c09a..9446dda20f06d 100644
--- a/website/content/docs/agent-and-proxy/autoauth/methods/cf.mdx
+++ b/website/content/docs/agent/autoauth/methods/cf.mdx
@@ -1,13 +1,13 @@
 ---
 layout: docs
-page_title: Vault Auto-Auth CF Method
-description: CF Method for Vault Auto-Auth
+page_title: Vault Agent Auto-Auth CF Method
+description: CF Method for Vault Agent Auto-Auth
 ---
 
 # Vault Agent Auto-Auth CF Method
 
 The `cf` method performs authentication against the [CF Auth
-method](/vault/docs/auth/cf).
+method](/docs/auth/cf).
 
 ## Credentials
 
diff --git a/website/content/docs/agent-and-proxy/autoauth/methods/gcp.mdx b/website/content/docs/agent/autoauth/methods/gcp.mdx
similarity index 85%
rename from website/content/docs/agent-and-proxy/autoauth/methods/gcp.mdx
rename to website/content/docs/agent/autoauth/methods/gcp.mdx
index 758e24ad21194..1fb8e5ddca9ae 100644
--- a/website/content/docs/agent-and-proxy/autoauth/methods/gcp.mdx
+++ b/website/content/docs/agent/autoauth/methods/gcp.mdx
@@ -1,13 +1,13 @@
 ---
 layout: docs
-page_title: Vault Auto-Auth GCP Method
-description: GCP Method for Vault Auto-Auth
+page_title: Vault Agent Auto-Auth GCP Method
+description: GCP Method for Vault Agent Auto-Auth
 ---
 
-# Vault Auto-Auth GCP Method
+# Vault Agent Auto-Auth GCP Method
 
 The `gcp` method performs authentication against the [GCP Auth
-method](/vault/docs/auth/gcp). Both `gce` and `iam`
+method](/docs/auth/gcp). Both `gce` and `iam`
 authentication types are supported.
 
 ## Credentials
diff --git a/website/content/docs/agent/autoauth/methods/index.mdx b/website/content/docs/agent/autoauth/methods/index.mdx
new file mode 100644
index 0000000000000..2a05825fc7fae
--- /dev/null
+++ b/website/content/docs/agent/autoauth/methods/index.mdx
@@ -0,0 +1,9 @@
+---
+layout: docs
+page_title: Vault Agent Auto-Auth Methods
+description: Methods for Vault Agent Auto-Auth
+---
+
+# Vault Agent Auto-Auth Methods
+
+Please see the sidebar for available methods and their usage/configuration.
diff --git a/website/content/docs/agent/autoauth/methods/jwt.mdx b/website/content/docs/agent/autoauth/methods/jwt.mdx
new file mode 100644
index 0000000000000..26400a219fac6
--- /dev/null
+++ b/website/content/docs/agent/autoauth/methods/jwt.mdx
@@ -0,0 +1,20 @@
+---
+layout: docs
+page_title: Vault Agent Auto-Auth JWT Method
+description: JWT Method for Vault Agent Auto-Auth
+---
+
+# Vault Agent Auto-Auth JWT Method
+
+The `jwt` method reads in a JWT from a file and sends it to the [JWT Auth
+method](/docs/auth/jwt).
+
+## Configuration
+
+- `path` `(string: required)` - The path to the JWT file
+
+- `role` `(string: required)` - The role to authenticate against on Vault
+
+- `remove_jwt_after_reading` `(bool: optional, defaults to true)` -
+  This can be set to `false` to disable the default behavior of removing the
+  JWT after it's been read.
diff --git a/website/content/docs/agent-and-proxy/autoauth/methods/kerberos.mdx b/website/content/docs/agent/autoauth/methods/kerberos.mdx
similarity index 81%
rename from website/content/docs/agent-and-proxy/autoauth/methods/kerberos.mdx
rename to website/content/docs/agent/autoauth/methods/kerberos.mdx
index 6a725ea79b7fa..6905995c91f2a 100644
--- a/website/content/docs/agent-and-proxy/autoauth/methods/kerberos.mdx
+++ b/website/content/docs/agent/autoauth/methods/kerberos.mdx
@@ -1,19 +1,19 @@
 ---
 layout: 'docs'
-page_title: 'Vault Auto-Auth Kerberos Method'
-sidebar_current: 'docs-agent-and-proxy-autoauth-methods-kerberos'
+page_title: 'Vault Agent Auto-Auth Kerberos Method'
+sidebar_current: 'docs-agent-autoauth-methods-kerberos'
 description: |-
-  Kerberos Method for Vault Auto-Auth
+  Kerberos Method for Vault Agent Auto-Auth
 ---
 
-# Vault Auto-Auth Kerberos Method
+# Vault Agent Auto-Auth Kerberos Method
 
-The `kerberos` auto-auth method provides an automated mechanism to retrieve
+The `kerberos` agent provides an automated mechanism to retrieve
 a Vault token for Kerberos entities. It reads in configuration and
 identification information from the surrounding environment, and uses
 it to authenticate to Vault.
 
-For more on this auth method, see the [Kerberos auth method](/vault/docs/auth/kerberos).
+For more on this auth method, see the [Kerberos auth method](/docs/auth/kerberos).
 
 ## Configuration
 
diff --git a/website/content/docs/agent/autoauth/methods/kubernetes.mdx b/website/content/docs/agent/autoauth/methods/kubernetes.mdx
new file mode 100644
index 0000000000000..b8b81371e9ee4
--- /dev/null
+++ b/website/content/docs/agent/autoauth/methods/kubernetes.mdx
@@ -0,0 +1,24 @@
+---
+layout: docs
+page_title: Vault Agent Auto-Auth Kubernetes Method
+description: Kubernetes Method for Vault Agent Auto-Auth
+---
+
+# Vault Agent Auto-Auth Kubernetes Method
+
+The `kubernetes` method reads in a Kubernetes service account token from the
+running pod (via `/var/run/secrets/kubernetes.io/serviceaccount/token`) and
+sends it to the [Kubernetes Auth
+method](/docs/auth/kubernetes/).
+
+## Configuration
+
+- `role` `(string: required)` - The role to authenticate against on Vault
+- `token_path` `(string: optional)` - The file path to a custom JWT token to use
+  for authentication. If omitted, the default service account token path is used.
+
+## Tutorial
+
+Refer to the [Vault Agent with
+Kubernetes](https://learn.hashicorp.com/vault/identity-access-management/vault-agent-k8s)
+tutorial to learn how to authenticate the clients using a Kubernetes Service Account Token and manage the tokens lifecycle.
diff --git a/website/content/docs/agent-and-proxy/autoauth/sinks/file.mdx b/website/content/docs/agent/autoauth/sinks/file.mdx
similarity index 77%
rename from website/content/docs/agent-and-proxy/autoauth/sinks/file.mdx
rename to website/content/docs/agent/autoauth/sinks/file.mdx
index 5ac5ec42e8d40..e1b226a77513f 100644
--- a/website/content/docs/agent-and-proxy/autoauth/sinks/file.mdx
+++ b/website/content/docs/agent/autoauth/sinks/file.mdx
@@ -1,10 +1,10 @@
 ---
 layout: docs
-page_title: Vault Agent and Vault Proxy Auto-Auth File Sink
-description: File sink for Auto-Auth
+page_title: Vault Agent Auto-Auth File Sink
+description: File sink for Vault Agent Auto-Auth
 ---
 
-# Vault Agent and Vault Proxy Auto-Auth File Sink
+# Vault Agent Auto-Auth File Sink
 
 The `file` sink writes tokens, optionally response-wrapped and/or encrypted, to
 a file. This may be a local file or a file mapped via some other process (NFS,
@@ -23,5 +23,5 @@ written with `0640` permissions as default, but can be overridden with the optio
 - `path` `(string: required)` - The path to use to write the token file
 - `mode` `(int: optional)` - A string containing an octal number representing the bit pattern for the file mode, similar to chmod. Set to `0000` to prevent Vault from modifying the file mode. Note: This configuration option is only available in Vault 1.3.0 and above.
 
-~> Note: Configuration options for response-wrapping and encryption for the sink
-file are located within the [options common to all sinks](/vault/docs/agent-and-proxy/autoauth#configuration-sinks) documentation.
+~> Note: Configuration options for response-wrapping and encryption for the sink 
+file are located within the [options common to all sinks](/docs/agent/autoauth#configuration-sinks) documentation. 
diff --git a/website/content/docs/agent/autoauth/sinks/index.mdx b/website/content/docs/agent/autoauth/sinks/index.mdx
new file mode 100644
index 0000000000000..106feb7556840
--- /dev/null
+++ b/website/content/docs/agent/autoauth/sinks/index.mdx
@@ -0,0 +1,9 @@
+---
+layout: docs
+page_title: Vault Agent Auto-Auth Sinks
+description: Sinks for Vault Agent Auto-Auth
+---
+
+# Vault Agent Auto-Auth Sinks
+
+Please see the sidebar for available sinks and their usage/configuration.
diff --git a/website/content/docs/agent/caching/index.mdx b/website/content/docs/agent/caching/index.mdx
new file mode 100644
index 0000000000000..c101bc6f44de6
--- /dev/null
+++ b/website/content/docs/agent/caching/index.mdx
@@ -0,0 +1,267 @@
+---
+layout: docs
+page_title: Vault Agent Caching
+description: |-
+  Vault Agent Caching allows client-side caching of responses containing newly
+  created tokens and responses containing leased secrets generated off of these
+  newly created tokens.
+---
+
+# Vault Agent Caching
+
+Vault Agent Caching allows client-side caching of responses containing newly
+created tokens and responses containing leased secrets generated off of these
+newly created tokens. The renewals of the cached tokens and leases are also
+managed by the agent.
+
+-> **Note:** Vault Agent Caching works best with servers/clusters that are
+running on Vault 1.1 and above due to changes that were introduced
+alongside this feature, such as the exposure of the `orphan` field in token
+creation responses.
+
+## Caching and Renewals
+
+Response caching and renewals are managed by the agent only under these
+specific scenarios.
+
+1. Token creation requests are made through the agent. This means that any
+   login operations performed using various auth methods and invoking the token
+   creation endpoints of the token auth method via the agent will result in the
+   response getting cached by the agent. Responses containing new tokens will
+   be cached by the agent only if the parent token is already being managed by
+   the agent or if the new token is an orphan token.
+
+2. Leased secret creation requests are made through the agent using tokens that
+   are already managed by the agent. This means that any dynamic credentials
+   that are issued using the tokens managed by the agent, will be cached and
+   its renewals are taken care of.
+
+## Using Auto-Auth Token
+
+Vault Agent allows for easy authentication to Vault in a wide variety of
+environments using [Auto-Auth](/docs/agent/autoauth). By setting the
+`use_auto_auth_token` (see below) configuration, clients will not be required
+to provide a Vault token to the requests made to the agent. When this
+configuration is set, if the request doesn't already bear a token, then the
+auto-auth token will be used to forward the request to the Vault server. This
+configuration will be overridden if the request already has a token attached,
+in which case, the token present in the request will be used to forward the
+request to the Vault server.
+
+## Forcing Auto-Auth Token
+
+Vault Agent can be configured to force the use of the auto-auth token by using
+the value `force` for the `use_auto_auth_token` option. This configuration
+overrides the default behavior described above in [Using Auto-Auth
+Token](/docs/agent/caching#using-auto-auth-token), and instead ignores any
+existing Vault token in the request and instead uses the auto-auth token.
+
+## Persistent Cache
+
+Vault Agent can restore tokens and leases from a persistent cache file created
+by a previous Vault Agent process.
+
+Refer to the [Vault Agent Persistent
+Caching](/docs/agent/caching/persistent-caches) page for more information on
+this functionality.
+
+## Cache Evictions
+
+The eviction of cache entries pertaining to secrets will occur when the agent
+can no longer renew them. This can happen when the secrets hit their maximum
+TTL or if the renewals result in errors.
+
+Agent does some best-effort cache evictions by observing specific request types
+and response codes. For example, if a token revocation request is made via the
+agent and if the forwarded request to the Vault server succeeds, then agent
+evicts all the cache entries associated with the revoked token. Similarly, any
+lease revocation operation will also be intercepted by the agent and the
+respective cache entries will be evicted.
+
+Note that while agent evicts the cache entries upon secret expirations and upon
+intercepting revocation requests, it is still possible for the agent to be
+completely unaware of the revocations that happen through direct client
+interactions with the Vault server. This could potentially lead to stale cache
+entries. For managing the stale entries in the cache, an endpoint
+`/agent/v1/cache-clear`(see below) is made available to manually evict cache
+entries based on some of the query criteria used for indexing the cache entries.
+
+## Request Uniqueness
+
+In order to detect repeat requests and return cached responses, agent will need
+to have a way to uniquely identify the requests. This computation as it stands
+today takes a simplistic approach (may change in future) of serializing and
+hashing the HTTP request along with all the headers and the request body. This
+hash value is then used as an index into the cache to check if the response is
+readily available. The consequence of this approach is that the hash value for
+any request will differ if any data in the request is modified. This has the
+side-effect of resulting in false negatives if say, the ordering of the request
+parameters are modified. As long as the requests come in without any change,
+caching behavior should be consistent. Identical requests with differently
+ordered request values will result in duplicated cache entries. A heuristic
+assumption that the clients will use consistent mechanisms to make requests,
+thereby resulting in consistent hash values per request is the idea upon which
+the caching functionality is built upon.
+
+## Renewal Management
+
+The tokens and leases are renewed by the agent using the secret renewer that is
+made available via the Vault server's [Go
+API](https://godoc.org/github.com/hashicorp/vault/api#Renewer). Agent performs
+all operations in memory and does not persist anything to storage. This means
+that when the agent is shut down, all the renewal operations are immediately
+terminated and there is no way for agent to resume renewals after the fact.
+Note that shutting down the agent does not indicate revocations of the secrets,
+instead it only means that renewal responsibility for all the valid unrevoked
+secrets are no longer performed by the Vault agent.
+
+### Agent CLI
+
+Agent's listener address will be picked up by the CLI through the
+`VAULT_AGENT_ADDR` environment variable. This should be a complete URL such as
+`"http://127.0.0.1:8200"`.
+
+## API
+
+### Cache Clear
+
+This endpoint clears the cache based on given criteria. To use this
+API, some information on how the agent caches values should be known
+beforehand. Each response that is cached in the agent will be indexed on some
+factors depending on the type of request. Those factors can be the `token` that
+is belonging to the cached response, the `token_accessor` of the token
+belonging to the cached response, the `request_path` that resulted in the
+cached response, the `lease` that is attached to the cached response, the
+`namespace` to which the cached response belongs to, and a few more. This API
+exposes some factors through which associated cache entries are fetched and
+evicted.
+
+| Method | Path                    | Produces               |
+| :----- | :---------------------- | :--------------------- |
+| `POST` | `/agent/v1/cache-clear` | `200 application/json` |
+
+#### Parameters
+
+- `type` `(strings: required)` - The type of cache entries to evict. Valid
+  values are `request_path`, `lease`, `token`, `token_accessor`, and `all`.
+  If the `type` is set to `all`, the _entire cache_ is cleared.
+
+- `value` `(string: required)` - An exact value or the prefix of the value for
+  the `type` selected. This parameter is optional when the `type` is set
+  to `all`.
+
+- `namespace` `(string: optional)` - This is only applicable when the `type` is set to
+  `request_path`. The namespace of which the cache entries to be evicted for
+  the given request path.
+
+### Sample Payload
+
+```json
+{
+  "type": "token",
+  "value": "s.rlNjegSKykWcplOkwsjd8bP9"
+}
+```
+
+### Sample Request
+
+```shell-session
+$ curl \
+    --request POST \
+    --data @payload.json \
+    http://127.0.0.1:1234/agent/v1/cache-clear
+```
+
+## Configuration (`cache`)
+
+The top level `cache` block has the following configuration entries:
+
+- `use_auto_auth_token (bool/string: false)` - If set, the requests made to agent
+  without a Vault token will be forwarded to the Vault server with the
+  auto-auth token attached. If the requests already bear a token, this
+  configuration will be overridden and the token in the request will be used to
+  forward the request to the Vault server. If set to `"force"` Agent will use the
+  auto-auth token, overwriting the attached Vault token if set.
+
+- `persist` `(object: optional)` - Configuration for the persistent cache.
+
+The following two `cache` options are only useful when talking to a Vault
+Enterprise cluster, and are documented as part of its
+[Eventual Consistency](/docs/enterprise/consistency#vault-agent-and-consistency-headers)
+page.
+
+- `enforce_consistency` `(string: "never")` - Set to one of `"always"`
+  or `"never"`.
+
+- `when_inconsistent` `(string: optional)` - Set to one of `"fail"`, `"retry"`,
+  or `"forward"`.
+
+-> **Note:** When the `cache` block is defined, at least one
+[template][agent-template] or [listener][agent-listener] must also be defined
+in the config, otherwise there is no way to utilize the cache.
+
+[agent-template]: /docs/agent/template
+[agent-listener]: /docs/agent/caching#configuration-listener
+
+### Configuration (Persist)
+
+These are common configuration values that live within the `persist` block:
+
+- `type` `(string: required)` - The type of the persistent cache to use,
+  e.g. `kubernetes`. _Note_: when using HCL this can be used as the key for
+  the block, e.g. `persist "kubernetes" {...}`.
+
+- `path` `(string: required)` - The path on disk where the persistent cache file
+  should be created or restored from.
+
+- `keep_after_import` `(bool: optional)` - When set to true, a restored cache file
+  is not deleted. Defaults to `false`.
+
+- `exit_on_err` `(bool: optional)` - When set to true, if any errors occur during
+  a persistent cache restore, Vault Agent will exit with an error. Defaults to `true`.
+
+## Configuration (`listener`)
+
+- `listener` `(array of objects: required)` - Configuration for the listeners.
+
+There can be one or more `listener` blocks at the top level. These configuration
+values are common to both `tcp` and `unix` listener blocks. Blocks of type
+`tcp` support the standard `tcp` [listener](/docs/configuration/listener/tcp)
+options.
+
+- `type` `(string: required)` - The type of the listener to use. Valid values
+  are `tcp` and `unix`.
+  _Note_: when using HCL this can be used as the key for the block, e.g.
+  `listener "tcp" {...}`.
+
+- `address` `(string: required)` - The address for the listener to listen to.
+  This can either be a URL path when using `tcp` or a file path when using
+  `unix`. For example, `127.0.0.1:8200` or `/path/to/socket`. Defaults to
+  `127.0.0.1:8200`.
+
+- `tls_disable` `(bool: false)` - Specifies if TLS will be disabled.
+
+- `tls_key_file` `(string: optional)` - Specifies the path to the private key
+  for the certificate.
+
+- `tls_cert_file` `(string: optional)` - Specifies the path to the certificate
+  for TLS.
+
+### Example Configuration
+
+Here is an example of a cache configuration.
+
+```hcl
+# Other Vault Agent configuration blocks
+# ...
+
+cache {
+  use_auto_auth_token = true
+}
+```
+
+## Tutorial
+
+Refer to the [Vault Agent
+Caching](https://learn.hashicorp.com/vault/identity-access-management/agent-caching)
+tutorial to learn how to use the Vault Agent to increase the availability of tokens and secrets to clients using its Caching function.
diff --git a/website/content/docs/agent/caching/persistent-caches/index.mdx b/website/content/docs/agent/caching/persistent-caches/index.mdx
new file mode 100644
index 0000000000000..a0f739d473e71
--- /dev/null
+++ b/website/content/docs/agent/caching/persistent-caches/index.mdx
@@ -0,0 +1,47 @@
+---
+layout: docs
+page_title: Vault Agent Persistent Caching
+description: Vault Agent Caching
+---
+
+# Vault Agent Persistent Caching
+
+Vault Agent can restore tokens and leases from a persistent cache file created
+by a previous Vault Agent process. The persistent cache is a BoltDB file that
+includes tuples encrypted by a generated encryption key. The encrypted tuples
+include the Vault token used to retrieve secrets, leases for tokens/secrets, and
+secret values.
+
+-> **Note:** Vault Agent Persistent Caching will only restore _leased_
+secrets. Secrets that are not renewable, such as KV v2, will not be persisted.
+
+In order to use Vault Agent persistent cache, auto-auth must be used. If the
+auto-auth token has expired by the time the cache is restored, the cache will
+be invalidated and secrets will need to be re-fetched from Vault.
+
+If Vault Agent templating is enabled alongside of the persistent cache, Vault
+Agent will automatically route templating requests through the cache. This
+ensures template requests are cached and restored properly.
+
+-> **Note** Vault Agent persistent cache is currently supported only in a
+Kubernetes environment.
+
+## Vault Agent Persistent Cache Types
+
+Please see the sidebar for available types and their usage/configuration.
+
+## Persistent Cache Example Configuration
+
+Here is an example of a persistent cache configuration.
+
+```hcl
+# Other Vault Agent configuration blocks
+# ...
+
+cache {
+  use_auto_auth_token = true
+  persist "kubernetes" {
+    path = "/vault/agent-cache"
+  }
+}
+```
diff --git a/website/content/docs/agent/caching/persistent-caches/kubernetes.mdx b/website/content/docs/agent/caching/persistent-caches/kubernetes.mdx
new file mode 100644
index 0000000000000..5217edb06d8eb
--- /dev/null
+++ b/website/content/docs/agent/caching/persistent-caches/kubernetes.mdx
@@ -0,0 +1,25 @@
+---
+layout: docs
+page_title: Kubernetes - Vault Agent Persistent Cache
+description: Kubernetes Persistent Cache for Vault Agent Caching
+---
+
+# Vault Agent Kubernetes Persistent Cache
+
+When `kubernetes` is configured for the persistent cache type, Vault Agent will optimize the
+persistent cache specifically for Kubernetes. This type of persistent cache requires a Kubernetes
+service account token. The service account token is used during encryption and decryption of the
+persistent cache as an additional integrity check.
+
+The Vault Agent persistent cache file in Kubernetes should only be used for handing off Vault tokens
+and leases between initialization and sidecar Vault Agent containers. This cache file should be shared
+using a memory volume between the Vault Agent containers.
+
+If the Vault Agent Injector for Kubernetes is being used, the persistent cache is automatically configured
+and used if the annotation [`vault.hashicorp.com/agent-cache-enable: true`](/docs/platform/k8s/injector/annotations#vault-hashicorp-com-agent-cache-enable) is set.
+
+## Configuration
+
+- `service_account_token_file` `(string: optional)` - When type is set to `kubernetes`,
+  this configures the path on disk where the Kubernetes service account token can be found.
+  Defaults to `/var/run/secrets/kubernetes.io/serviceaccount/token`.
diff --git a/website/content/docs/agent/index.mdx b/website/content/docs/agent/index.mdx
new file mode 100644
index 0000000000000..db5b9ba23b670
--- /dev/null
+++ b/website/content/docs/agent/index.mdx
@@ -0,0 +1,376 @@
+---
+layout: docs
+page_title: Vault Agent
+description: |-
+  Vault Agent is a client-side daemon that can be used to perform some Vault
+  functionality automatically.
+---
+
+# Vault Agent
+
+A valid client token must accompany most requests to Vault. This
+includes all API requests, as well as via the Vault CLI and other libraries.
+Therefore, Vault clients must first authenticate with Vault to acquire a token.
+Vault provides several different authentication methods to assist in
+delivering this initial token.
+
+![Client authentication](/img/diagram-vault-agent.png)
+
+If the client can securely acquire the token, all subsequent requests (e.g., request
+database credentials, read key/value secrets) are processed based on the
+trust established by a successful authentication.
+
+This means that client application must invoke the Vault API to authenticate
+with Vault and manage the acquired token, in addition to invoking the API to
+request secrets from Vault. This implies code changes to client applications
+along with additional testing and maintenance of the application.
+
+The following code example implements Vault API to authenticate with Vault
+through [AppRole auth method](/docs/auth/approle#code-example), and then uses
+the returned client token to read secrets at `kv-v2/data/creds`.
+
+```go
+package main
+
+import (
+    ...snip...
+    vault "github.com/hashicorp/vault/api"
+)
+
+// Fetches a key-value secret (kv-v2) after authenticating via AppRole
+func getSecretWithAppRole() (string, error) {
+    config := vault.DefaultConfig()
+
+    client := vault.NewClient(config)
+    wrappingToken := ioutil.ReadFile("path/to/wrapping-token")
+    unwrappedToken := client.Logical().Unwrap(strings.TrimSuffix(string(wrappingToken), "\n"))
+
+    secretID := unwrappedToken.Data["secret_id"]
+    roleID := os.Getenv("APPROLE_ROLE_ID")
+
+    params := map[string]interface{}{
+        "role_id":   roleID,
+        "secret_id": secretID,
+    }
+    resp := client.Logical().Write("auth/approle/login", params)
+    client.SetToken(resp.Auth.ClientToken)
+
+    secret, err := client.Logical().Read("kv-v2/data/creds")
+    if err != nil {
+        return "", fmt.Errorf("unable to read secret: %w", err)
+    }
+
+    data := secret.Data["data"].(map[string]interface{})
+
+    ...snip...
+}
+```
+
+For some Vault deployments, making (and maintaining) these changes to
+applications may not be a problem, and may actually be preferred. This may be
+applied to scenarios where you have a small number of applications or you want
+to keep strict, customized control over how each application interacts with
+Vault. However, in other situations where you have a large number of
+applications, as in large enterprises, you may not have the resources or expertise
+to update and maintain the Vault integration code for every application. When
+third party applications are being deployed by the application, it is prohibited
+to add the Vault integration code.
+
+Vault Agent aims to remove this initial hurdle to adopt Vault by providing a
+more scalable and simpler way for applications to integrate with Vault.
+
+
+## What is Vault Agent?
+
+Vault Agent is a client daemon that provides the following features:
+
+- [Auto-Auth][autoauth] - Automatically authenticate to Vault and manage the
+token renewal process for locally-retrieved dynamic secrets.
+- [Caching][caching] - Allows client-side caching of responses containing newly
+created tokens and responses containing leased secrets generated off of these
+newly created tokens. The agent also manages the renewals of the cached tokens and leases.
+- [Windows Service][winsvc] - Allows running the Vault Agent as a Windows
+service.
+- [Templating][template] - Allows rendering of user-supplied templates by Vault
+Agent, using the token generated by the Auto-Auth step.
+
+
+## Auto-Auth
+
+Vault Agent allows easy authentication to Vault in a wide variety of
+environments. Please see the [Auto-Auth docs][autoauth]
+for information.
+
+Auto-Auth functionality takes place within an `auto_auth` configuration stanza.
+
+## Caching
+
+Vault Agent allows client-side caching of responses containing newly created tokens
+and responses containing leased secrets generated off of these newly created tokens.
+Please see the [Caching docs][caching] for information.
+
+## API
+
+### Quit
+
+This endpoints triggers shutdown of the agent. By default, it is disabled, and can
+be enabled per listener using the [`agent_api`][agent-api] stanza. It is recommended
+to only enable this on trusted interfaces, as it does not require any authorization to use.
+
+| Method | Path             |
+| :----- | :--------------- |
+| `POST` | `/agent/v1/quit` |
+
+### Cache
+
+See the [caching](/docs/agent/caching#api) page for details on the cache API.
+
+## Configuration
+
+These are the currently-available general configuration option:
+
+- `vault` <code>([vault][vault]: <optional\>)</code> - Specifies the remote Vault server the Agent connects to.
+
+- `auto_auth` <code>([auto_auth][autoauth]: <optional\>)</code> - Specifies the method and other options used for Auto-Auth functionality.
+
+- `cache` <code>([cache][caching]: <optional\>)</code> - Specifies options used for Caching functionality.
+
+- `listener` <code>([listener][listener]: <optional\>)</code> - Specifies the addresses and ports on which the Agent will respond to requests.
+
+- `pid_file` `(string: "")` - Path to the file in which the agent's Process ID
+  (PID) should be stored
+
+- `exit_after_auth` `(bool: false)` - If set to `true`, the agent will exit
+  with code `0` after a single successful auth, where success means that a
+  token was retrieved and all sinks successfully wrote it
+
+- `disable_idle_connections` `(string array: [])` - A list of strings that disables idle connections for various features in Vault Agent.
+  Valid values include: `auto-auth`, `caching` and `templating`. Can also be configured by setting the `VAULT_AGENT_DISABLE_IDLE_CONNECTIONS` 
+  environment variable as a comma separated string. This environment variable will override any values found in a configuration file.
+
+- `disable_keep_alives` `(string array: [])` - A list of strings that disables keep alives for various features in Vault Agent.
+  Valid values include: `auto-auth`, `caching` and `templating`. Can also be configured by setting the `VAULT_AGENT_DISABLE_KEEP_ALIVES` 
+  environment variable as a comma separated string. This environment variable will override any values found in a configuration file.
+
+- `template` <code>([template][template]: <optional\>)</code> - Specifies options used for templating Vault secrets to files.
+
+- `template_config` <code>([template_config][template-config]: <optional\>)</code> - Specifies templating engine behavior.
+
+- `telemetry` <code>([telemetry][telemetry]: <optional\>)</code> – Specifies the telemetry
+  reporting system. See the [telemetry Stanza](/docs/agent#telemetry-stanza) section below
+  for a list of metrics specific to Agent.
+
+### vault Stanza
+
+There can at most be one top level `vault` block and it has the following
+configuration entries:
+
+- `address` `(string: <optional>)` - The address of the Vault server to 
+  connect to. This should be a Fully Qualified Domain Name (FQDN) or IP 
+  such as `https://vault-fqdn:8200` or `https://172.16.9.8:8200`. 
+  This value can be overridden by setting the `VAULT_ADDR` environment variable.
+
+- `ca_cert` `(string: <optional>)` - Path on the local disk to a single PEM-encoded
+  CA certificate to verify the Vault server's SSL certificate. This value can
+  be overridden by setting the `VAULT_CACERT` environment variable.
+
+- `ca_path` `(string: <optional>)` - Path on the local disk to a directory of
+  PEM-encoded CA certificates to verify the Vault server's SSL certificate.
+  This value can be overridden by setting the `VAULT_CAPATH` environment
+  variable.
+
+- `client_cert` `(string: <optional>)` - Path on the local disk to a single
+  PEM-encoded CA certificate to use for TLS authentication to the Vault server.
+  This value can be overridden by setting the `VAULT_CLIENT_CERT` environment
+  variable.
+
+- `client_key` `(string: <optional>)` - Path on the local disk to a single
+  PEM-encoded private key matching the client certificate from `client_cert`.
+  This value can be overridden by setting the `VAULT_CLIENT_KEY` environment
+  variable.
+
+- `tls_skip_verify` `(string: <optional>)` - Disable verification of TLS
+  certificates. Using this option is highly discouraged as it decreases the
+  security of data transmissions to and from the Vault server. This value can
+  be overridden by setting the `VAULT_SKIP_VERIFY` environment variable.
+
+- `tls_server_name` `(string: <optional>)` - Name to use as the SNI host when
+  connecting via TLS. This value can be overridden by setting the
+  `VAULT_TLS_SERVER_NAME` environment variable.
+
+#### retry Stanza
+
+The `vault` stanza may contain a `retry` stanza that controls how failing Vault
+requests are handled, whether these requests are issued in order to render
+templates, or are proxied requests coming from the proxy cache subsystem.
+Auto-auth, however, has its own notion of retrying and is not affected by this
+section.
+
+For requests from the templating engine, Vaul Agent will reset its retry counter and
+perform retries again once all retries are exhausted. This means that templating
+will retry on failures indefinitely unless `exit_on_retry_failure` from the
+[`template_config`][template-config] stanza is set to `true`.
+
+Here are the options for the `retry` stanza:
+
+- `num_retries` `(int: 12)` - Specify how many times a failing request will
+  be retried. A value of `0` translates to the default, i.e. 12 retries.
+  A value of `-1` disables retries. The environment variable `VAULT_MAX_RETRIES`
+  overrides this setting.
+
+There are a few subtleties to be aware of here. First, requests originating
+from the proxy cache will only be retried if they resulted in specific HTTP
+result codes: any 50x code except 501 ("not implemented"), as well as 412
+("precondition failed"); 412 is used in Vault Enterprise 1.7+ to indicate a
+stale read due to eventual consistency. Requests coming from the template
+subsystem are retried regardless of the failure.
+
+Second, templating retries may be performed by both the templating engine _and_
+the cache proxy if Vault Agent [persistent
+cache][persistent-cache] is enabled. This is due to the
+fact that templating requests go through the cache proxy when persistence is
+enabled.
+
+Third, the backoff algorithm used to set the time between retries differs for
+the template and cache subsystems. This is a technical limitation we hope
+to address in the future.
+
+### listener Stanza
+
+Vault Agent supports one or more [listener][listener_main] stanzas. In addition
+to the standard listener configuration, an Agent's listener configuration also
+supports the following:
+
+- `require_request_header` `(bool: false)` - Require that all incoming HTTP
+  requests on this listener must have an `X-Vault-Request: true` header entry.
+  Using this option offers an additional layer of protection from Server Side
+  Request Forgery attacks. Requests on the listener that do not have the proper
+  `X-Vault-Request` header will fail, with a HTTP response status code of `412: Precondition Failed`.
+
+- `agent_api` <code>([agent_api][agent-api]: <optional\>)</code> - Manages optional Agent API endpoints.
+
+#### agent_api Stanza
+
+- `enable_quit` `(bool: false)` - If set to `true`, the agent will enable the [quit](/docs/agent#quit) API.
+
+### telemetry Stanza
+
+Vault Agent supports the [telemetry][telemetry] stanza and collects various
+runtime metrics about its performance, the auto-auth and the cache status:
+
+| Metric                           | Description                                          | Type    |
+| -------------------------------- | ---------------------------------------------------- | ------- |
+| `vault.agent.auth.failure`       | Number of authentication failures                    | counter |
+| `vault.agent.auth.success`       | Number of authentication successes                   | counter |
+| `vault.agent.proxy.success`      | Number of requests successfully proxied              | counter |
+| `vault.agent.proxy.client_error` | Number of requests for which Vault returned an error | counter |
+| `vault.agent.proxy.error`        | Number of requests the agent failed to proxy         | counter |
+| `vault.agent.cache.hit`          | Number of cache hits                                 | counter |
+| `vault.agent.cache.miss`         | Number of cache misses                               | counter |
+
+
+
+## Start Vault Agent
+
+To run Vault Agent:
+
+1. [Download](/downloads) the Vault binary where the client application runs
+(virtual machine, Kubernetes pod, etc.)
+
+1. Create a Vault Agent configuration file. (See the [Example
+Configuration](#example-configuration) section for an example configuration.)
+
+1. Start a Vault Agent with the configuration file.
+
+   **Example:**
+
+   ```shell-session
+   $ vault agent -config=/etc/vault/agent-config.hcl
+   ```
+
+   To get help, run:
+
+   ```shell-session
+   $ vault agent -h
+   ```
+
+## Example Configuration
+
+An example configuration, with very contrived values, follows:
+
+```hcl
+pid_file = "./pidfile"
+
+vault {
+  address = "https://vault-fqdn:8200"
+  retry {
+    num_retries = 5
+  }
+}
+
+auto_auth {
+  method "aws" {
+    mount_path = "auth/aws-subaccount"
+    config = {
+      type = "iam"
+      role = "foobar"
+    }
+  }
+
+  sink "file" {
+    config = {
+      path = "/tmp/file-foo"
+    }
+  }
+
+  sink "file" {
+    wrap_ttl = "5m"
+    aad_env_var = "TEST_AAD_ENV"
+    dh_type = "curve25519"
+    dh_path = "/tmp/file-foo-dhpath2"
+    config = {
+      path = "/tmp/file-bar"
+    }
+  }
+}
+
+cache {
+  use_auto_auth_token = true
+}
+
+listener "unix" {
+  address = "/path/to/socket"
+  tls_disable = true
+
+  agent_api {
+    enable_quit = true
+  }
+}
+
+listener "tcp" {
+  address = "127.0.0.1:8100"
+  tls_disable = true
+}
+
+template {
+  source = "/etc/vault/server.key.ctmpl"
+  destination = "/etc/vault/server.key"
+}
+
+template {
+  source = "/etc/vault/server.crt.ctmpl"
+  destination = "/etc/vault/server.crt"
+}
+```
+
+[vault]: /docs/agent#vault-stanza
+[autoauth]: /docs/agent/autoauth
+[caching]: /docs/agent/caching
+[persistent-cache]: /docs/agent/caching/persistent-caches
+[template]: /docs/agent/template
+[template-config]: /docs/agent/template-config
+[agent-api]: /docs/agent/#agent_api-stanza
+[listener]: /docs/agent#listener-stanza
+[listener_main]: /docs/configuration/listener/tcp
+[winsvc]: /docs/agent/winsvc
+[telemetry]: /docs/configuration/telemetry
diff --git a/website/content/docs/agent-and-proxy/agent/template.mdx b/website/content/docs/agent/template.mdx
similarity index 82%
rename from website/content/docs/agent-and-proxy/agent/template.mdx
rename to website/content/docs/agent/template.mdx
index a34821c299653..ffbfd10d624d8 100644
--- a/website/content/docs/agent-and-proxy/agent/template.mdx
+++ b/website/content/docs/agent/template.mdx
@@ -9,7 +9,6 @@ description: >-
 # Vault Agent Templates
 
 Vault Agent's Template functionality allows Vault secrets to be rendered to files
-or environment variables (via the [Process Supervisor Mode](/vault/docs/agent-and-proxy/agent/process-supervisor))
 using [Consul Template markup][consul-templating-language].
 
 ## Functionality
@@ -52,7 +51,7 @@ of secret that's being rendered by this function, template will have different
 renewal behavior as detailed in the [Renewals
 section](#renewals-and-updating-secrets). The `pkiCert` function is intended to
 work specifically for certificates issued by the [PKI Secrets
-Engine](/vault/docs/secrets/pki). Refer to the [Certificates](#certificates) section
+Engine](/docs/secrets/pki). Refer to the [Certificates](#certificates) section
 for differences in certificate renewal behavior between `secret` and `pkiCert`.
 
 The following links contain additional resources for the templating language used by Vault Agent templating.
@@ -105,7 +104,7 @@ failures.
 - `static_secret_render_interval` `(string or integer: 5m)` - If specified, configures
   how often Vault Agent Template should render non-leased secrets such as KV v2.
   This setting will not change how often Vault Agent Templating renders leased
-  secrets. Uses [duration format strings](/vault/docs/concepts/duration-format).
+  secrets. Uses [duration format strings](/docs/concepts/duration-format).
 
 ### `template_config` Stanza Example
 
@@ -116,7 +115,7 @@ template_config {
 }
 ```
 
-In another example `template_config` with [`error_on_missing_key` parameter in the template stanza](/vault/docs/agent-and-proxy/agent/template#error_on_missing_key)
+In another example `template_config` with [`error_on_missing_key` parameter in the template stanza](/docs/agent/template#error_on_missing_key)
 as well as `exit_on_retry_failure` result in the agent exiting in case of no key
 / value issues instead of the default retry behavior.
 
@@ -136,7 +135,7 @@ template {
 ### Interaction between `exit_on_retry_failure` and `error_on_missing_key`
 
 The parameter
-[`error_on_missing_key`](/vault/docs/agent-and-proxy/agent/template#error_on_missing_key) can be
+[`error_on_missing_key`](/docs/agent/template#error_on_missing_key) can be
 specified within the `template` stanza which determines if a template should
 error when a key is missing in the secret. When `error_on_missing_key` is not
 specified or set to `false` and the key to render is not in the secret's
@@ -162,35 +161,31 @@ parameters found in the template configuration section in the consul-template
 [documentation
 page](https://github.com/hashicorp/consul-template/blob/main/docs/configuration.md#templates)
 can be used here:
-<Tip>
-The parameters marked with `Δ` below are only applicable to file templates and
-cannot be used with `env_template` entries in process supervisor mode.
-</Tip>
 
 - `source` `(string: "")` - Path on disk to use as the input template. This
   option is required if not using the `contents` option.
-- `destination`Δ `(string: required)` - Path on disk where the rendered secrets should
+- `destination` `(string: required)` - Path on disk where the rendered secrets should
   be created. If the parent directories do not exist, Vault
   Agent will attempt to create them, unless `create_dest_dirs` is false.
-- `create_dest_dirs`Δ `(bool: true)` - This option tells Vault Agent to create
+- `create_dest_dirs` `(bool: true)` - This option tells Vault Agent to create
   the parent directories of the destination path if they do not exist.
 - `contents` `(string: "")` - This option allows embedding the contents of
   a template in the configuration file rather then supplying the `source` path to
   the template file. This is useful for short templates. This option is mutually
   exclusive with the `source` option.
-- `command`Δ `(string: "")` - This is the optional command to run when the
+- `command` `(string: "")` - This is the optional command to run when the
   template is rendered. The command will only run if the resulting template changes.
   The command must return within 30s (configurable), and it must have a successful
   exit code. Vault Agent is not a replacement for a process monitor or init system.
   This is deprecated in favor of the `exec` option.
-- `command_timeout`Δ `(duration: 30s)` - This is the maximum amount of time to
+- `command_timeout` `(duration: 30s)` - This is the maximum amount of time to
   wait for the optional command to return. This is deprecated in favor of the
   `exec` option.
 - `error_on_missing_key` `(bool: false)` - Exit with an error when accessing
   a struct or map field/key that does notexist. The default behavior will print `<no value>`
   when accessing a field that does not exist. It is highly recommended you set this
-  to "true". Also see [`exit_on_retry_failure` in global Vault Agent Template Config](/vault/docs/agent-and-proxy/agent/template#interaction-between-exit_on_retry_failure-and-error_on_missing_key).
-- `exec`Δ `(object: optional)` - The exec block executes a command when the
+  to "true". Also see [`exit_on_retry_failure` in global Vault Agent Template Config](/docs/agent/template#interaction-between-exit_on_retry_failure-and-error_on_missing_key).
+- `exec` `(object: optional)` - The exec block executes a command when the
   template is rendered and the output has changed. The block parameters are
   `command` `(string or array: required)` and `timeout` `(string: optional, defaults
   to 30s)`. `command` can be given as a string or array of strings to execute, such as
@@ -198,11 +193,11 @@ cannot be used with `env_template` entries in process supervisor mode.
   strongly recommend using an array of strings, and we attempt to parse that way first.
   Note also that using a comma with the string approach will cause it to be interpreted as an
   array, which may not be desirable.
-- `perms`Δ `(string: "")` - This is the permission to render the file. If
+- `perms` `(string: "")` - This is the permission to render the file. If
   this option is left unspecified, Vault Agent will attempt to match the permissions
   of the file that already exists at the destination path. If no file exists at that
   path, the permissions are 0644.
-- `backup`Δ `(bool: true)` - This option backs up the previously rendered template
+- `backup` `(bool: true)` - This option backs up the previously rendered template
   at the destination path before writing a new one. It keeps exactly one backup.
   This option is useful for preventing accidental changes to the data without having
   a rollback strategy.
@@ -212,10 +207,10 @@ cannot be used with `env_template` entries in process supervisor mode.
 - `right_delimiter` `(string: "}}")` - Delimiter to use in the template. The
   default is "}}" but for some templates, it may be easier to use a different
   delimiter that does not conflict with the output file itself.
-- `sandbox_path`Δ `(string: "")` - If a sandbox path is provided, any path
+- `sandbox_path` `(string: "")` - If a sandbox path is provided, any path
   provided to the `file` function is checked that it falls within the sandbox path.
   Relative paths that try to traverse outside the sandbox path will exit with an error.
-- `wait`Δ `(object: required)` - This is the `minimum(:maximum)` to wait before rendering
+- `wait` `(object: required)` - This is the `minimum(:maximum)` to wait before rendering
   a new template to disk and triggering a command, separated by a colon (`:`).
 
 
@@ -236,7 +231,7 @@ the `auto_auth` stanza in the agent configuration.
 ## Renewals and Updating Secrets
 
 The Vault Agent templating automatically renews and fetches secrets/tokens.
-Unlike [Vault Agent caching](/vault/docs/agent-and-proxy/agent/caching), the behavior of how Vault Agent
+Unlike [Vault Agent caching](/docs/agent/caching), the behavior of how Vault Agent
 templating does this depends on the type of secret or token. The following is a
 high level overview of different behaviors.
 
@@ -248,18 +243,18 @@ of the secret's lease duration has elapsed.
 ### Non-Renewable Secrets
 
 If a secret or token isn't renewable or leased, Vault Agent will fetch the secret every 5 minutes.
-This can be configured using Template config [static_secret_render_interval](/vault/docs/agent-and-proxy/agent/template#static_secret_render_interval) (requires Vault 1.8+).
-Non-renewable secrets include (but not limited to) [KV Version 2](/vault/docs/secrets/kv/kv-v2).
+This can be configured using Template config [static_secret_render_interval](/docs/agent/template#static_secret_render_interval) (requires Vault 1.8+).
+Non-renewable secrets include (but not limited to) [KV Version 2](/docs/secrets/kv/kv-v2).
 
 ### Non-Renewable Leased Secrets
 
 If a secret or token is non-renewable but leased, Vault Agent will fetch the secret when 85% of the
 secrets time-to-live (TTL) is reached. Leased, non-renewable secrets include (but not limited
-to) dynamic secrets such as [database credentials](/vault/docs/secrets/databases) and [KV Version 1](/vault/docs/secrets/kv/kv-v1).
+to) dynamic secrets such as [database credentials](/docs/secrets/databases) and [KV Version 1](/docs/secrets/kv/kv-v1).
 
 ### Static Roles
 
-If a secret has a `rotation_period`, such as a [database static role](/vault/docs/secrets/databases#static-roles),
+If a secret has a `rotation_period`, such as a [database static role](/docs/secrets/databases#static-roles),
 Vault Agent template will fetch the new secret as it changes in Vault. It does
 this by inspecting the secret's time-to-live (TTL).
 
@@ -272,7 +267,7 @@ re-authenticates.
 
 #### Rendering using the `pkiCert` template function
 
-If a [certificate](/vault/docs/secrets/pki) is rendered using the `pkiCert` template
+If a [certificate](/docs/secrets/pki) is rendered using the `pkiCert` template
 function, Vault Agent template will have the following fetching and re-rendering
 behaviors on certificates:
 
@@ -283,7 +278,7 @@ skip fetching unless the current rendered one has expired.
 
 #### Rendering using the `secret` template function
 
-If a [certificate](/vault/docs/secrets/pki) is rendered using the `secret` template
+If a [certificate](/docs/secrets/pki) is rendered using the `secret` template
 function, Vault Agent template will have the following fetching and re-rendering
 behaviors on certificates:
 
@@ -321,27 +316,4 @@ template {
 }
 ```
 
-And the following demonstrates how the templates look when using `env_template` with
-[Process Supervisor Mode](/vault/docs/agent-and-proxy/agent/process-supervisor)
-
-
-```hcl
-# Other Vault Agent configuration blocks
-# ...
-
-template_config {
-  static_secret_render_interval = "10m"
-  exit_on_retry_failure = true
-}
-
-env_template "MY_ENV_VAR" {
-  contents = "{{ with secret \"secret/my-secret\" }}{{ .Data.data.foo }}{{ end }}"
-}
-
-env_template "ENV_VAR_FROM_FILE" {
-  source = "/tmp/agent/template.ctmpl"
-}
-```
-
 [consul-templating-language]: https://github.com/hashicorp/consul-template/blob/v0.28.1/docs/templating-language.md
-[process-supervisor]: /vault/docs/agent-and-proxy/agent/process-supervisor
diff --git a/website/content/docs/agent-and-proxy/agent/winsvc.mdx b/website/content/docs/agent/winsvc.mdx
similarity index 96%
rename from website/content/docs/agent-and-proxy/agent/winsvc.mdx
rename to website/content/docs/agent/winsvc.mdx
index f67d7f96164a2..7436c8b965221 100644
--- a/website/content/docs/agent-and-proxy/agent/winsvc.mdx
+++ b/website/content/docs/agent/winsvc.mdx
@@ -35,7 +35,7 @@ of Vault Agent as a service, using "Vault Agent" as the display name, and starti
 The `binPath` argument should include the fully qualified path to the Vault executable, as well as any arguments required.
 
 ```shell-session
-PS C:\Windows\system32> sc.exe create VaultAgent binPath="C:\vault\vault.exe agent -config=C:\vault\agent-config.hcl" displayName="Vault Agent" start=auto
+PS C:\Windows\system32> sc.exe create VaultAgent binPath= "C:\vault\vault.exe agent -config=C:\vault\agent-config.hcl" displayName= "Vault Agent" start= auto
 [SC] CreateService SUCCESS
 ```
 
diff --git a/website/content/docs/audit/file.mdx b/website/content/docs/audit/file.mdx
index 4c2457d0e30be..6c8af50eb53fe 100644
--- a/website/content/docs/audit/file.mdx
+++ b/website/content/docs/audit/file.mdx
@@ -41,10 +41,9 @@ $ vault audit enable file file_path=stdout
 
 Note the difference between `audit enable` command options and the `file` backend
 configuration options. Use `vault audit enable -help` to see the command options.
+Following are the configuration options available for the backend.
 
-The `file` audit device supports the common configuration options documented on
-the [main Audit Devices page](/vault/docs/audit#common-configuration-options), and
-these device-specific options:
+## Configuration
 
 - `file_path` `(string: <required>)` - The path to where the audit log will be
   written. If a file already exists at the given path, the audit backend will
@@ -54,11 +53,21 @@ these device-specific options:
 
   - `discard` writes output (useful in testing scenarios)
 
+- `log_raw` `(bool: false)` - If enabled, logs the security sensitive
+  information without hashing, in the raw format.
+
+- `hmac_accessor` `(bool: true)` - If enabled, enables the hashing of token
+  accessor.
+
 - `mode` `(string: "0600")` - A string containing an octal number representing
   the bit pattern for the file mode, similar to `chmod`. Set to `"0000"` to
   prevent Vault from modifying the file mode.
 
+- `format` `(string: "json")` - Allows selecting the output format. Valid values
+  are `"json"` and `"jsonx"`, which formats the normal log entries as XML.
 
+- `prefix` `(string: "")` - A customizable string prefix to write before the
+  actual log line.
 
 ## Log File Rotation
 
diff --git a/website/content/docs/audit/index.mdx b/website/content/docs/audit/index.mdx
index e48fb1337b7ad..bd63d7617338d 100644
--- a/website/content/docs/audit/index.mdx
+++ b/website/content/docs/audit/index.mdx
@@ -19,7 +19,7 @@ a way to check for data tampering in the logs themselves.
 
 Vault considers a request to be successful if it can log to *at least* one
 configured audit device (see: [Blocked Audit
-Devices](/vault/docs/audit#blocked-audit-devices) section below).  Therefore in order
+Devices](/docs/audit#blocked-audit-devices) section below).  Therefore in order
 to build a complete picture of all audited actions, use the aggregate/union of
 the logs from each audit device.
 
@@ -49,15 +49,15 @@ HMAC'd. Other data types, like integers, booleans, and so on, are passed
 through in plaintext. We recommend that all sensitive data be provided as string values
 inside all JSON sent to Vault (i.e., that integer values are provided in quotes).
 
-While most strings are hashed, Vault does make some exceptions, such as auth and secrets, and users can enable additional exceptions using the [secrets enable](/vault/docs/commands/secrets/enable) command, and then tune it afterward.
+While most strings are hashed, Vault does make some exceptions, such as auth and secrets, and users can enable additional exceptions using the [secrets enable](/docs/commands/secrets/enable) command, and then tune it afterward.
 
 **see also**:
 
-[secrets tune](/vault/docs/commands/secrets/tune)
+[secrets tune](/docs/commands/secrets/tune)
 
-[auth enable](/vault/docs/commands/auth/enable)
+[auth enable](/docs/commands/auth/enable)
 
-[auth tune](/vault/docs/commands/auth/tune)
+[auth tune](/docs/commands/auth/tune)
 
 ## Enabling/Disabling Audit Devices
 
@@ -80,15 +80,11 @@ cluster by default, and to performance/DR secondaries for Vault Enterprise clust
 Before enabling an audit device, ensure that all nodes within the cluster(s)
 will be able to successfully log to the audit device to avoid Vault being
 blocked from serving requests.
-An audit device can be limited to only within the node's cluster with the [`local`](/vault/api-docs/system/audit#local) parameter.
+An audit device can be limited to only within the node's cluster with the [`local`](/api-docs/system/audit#local) parameter.
 
 When an audit device is disabled, it will stop receiving logs immediately.
 The existing logs that it did store are untouched.
 
-~> Note: Once an audit device is disabled, you will no longer be able to HMAC values
-for comparison with entries in the audit logs. This is true even if you re-enable
-the audit device at the same path, as a new salt will be created for hashing.
-
 ## Blocked Audit Devices
 
 Audit device logs are critically important and ignoring auditing failures opens an avenue for attack. Vault will not respond to requests when no enabled audit devices can record them.
@@ -103,75 +99,9 @@ In other words, Vault will not complete any requests until the blocked audit dev
 
 ## Tutorial
 
-Refer to [Blocked Audit Devices](/vault/tutorials/monitoring/blocked-audit-devices) for a step-by-step tutorial.
+Refer to [Blocked Audit Devices](https://learn.hashicorp.com/tutorials/vault/blocked-audit-devices) for a step-by-step tutorial.
 
 ## API
 
 Audit devices also have a full HTTP API. Please see the [Audit device API
-docs](/vault/api-docs/system/audit) for more details.
-
-## Common configuration options
-
-- `elide_list_responses` `(bool: false)` - See [Eliding list response
-  bodies](/vault/docs/audit#eliding-list-response-bodies) below.
-
-- `format` `(string: "json")` - Allows selecting the output format. Valid values
-  are `"json"` and `"jsonx"`, which formats the normal log entries as XML.
-
-- `hmac_accessor` `(bool: true)` - If enabled, enables the hashing of token
-  accessor.
-
-- `log_raw` `(bool: false)` - If enabled, logs the security sensitive
-  information without hashing, in the raw format.
-
-- `prefix` `(string: "")` - A customizable string prefix to write before the
-  actual log line.
-
-## Eliding list response bodies
-
-Some Vault responses can be very large. Primarily, this affects list operations -
-as Vault lacks pagination in its APIs, listing a very large collection can result
-in a response that is tens of megabytes long. Some audit backends are unable to
-process individual audit records of larger sizes.
-
-The contents of the response for a list operation is often not very interesting;
-most contain only a "keys" field, containing a list of IDs. Select API endpoints
-additionally return a "key_info" field, a map from ID to some additional
-information about the list entry - `identity/entity/id/` is an example of this.
-Even in this case, the response to a list operation is usually less-confidential
-or public information, for which having the full response in the audit logs is of
-lesser importance.
-
-The `elide_list_responses` audit option provides the flexibility to not write the
-full list response data from the audit log, to mitigate the creation of very long
-individual audit records.
-
-When enabled, it affects only audit records of `type=response` and
-`request.operation=list`. The values of `response.data.keys` and
-`response.data.key_info` will be replaced with a simple integer, recording how
-many entries were contained in the list (`keys`) or map (`key_info`) - therefore
-even with this feature enabled, it is still possible to see how many items were
-returned by a list operation.
-
-This extra processing only affects the response data fields `keys` and `key_info`,
-and only when they have the expected data types - in the event a list response
-contains data outside of the usual conventions that apply to Vault list responses,
-it will be left as is by this feature.
-
-Here is an example of an audit record that has been processed by this feature
-(formatted with extra whitespace, and with fields not relevant to the example
-omitted):
-```json
-{
-  "type": "response",
-  "request": {
-    "operation": "list"
-  },
-  "response": {
-    "data": {
-      "key_info": 4,
-      "keys": 4
-    }
-  }
-}
-```
+docs](/api-docs/system/audit) for more details.
diff --git a/website/content/docs/audit/socket.mdx b/website/content/docs/audit/socket.mdx
index 4daa56874be49..68fd3006adc20 100644
--- a/website/content/docs/audit/socket.mdx
+++ b/website/content/docs/audit/socket.mdx
@@ -28,14 +28,25 @@ $ vault audit enable socket address=127.0.0.1:9090 socket_type=tcp
 
 ## Configuration
 
-The `socket` audit device supports the common configuration options documented on
-the [main Audit Devices page](/vault/docs/audit#common-configuration-options), and
-these device-specific options:
-
 - `address` `(string: "")` - The socket server address to use. Example
   `127.0.0.1:9090` or `/tmp/audit.sock`.
 
 - `socket_type` `(string: "tcp")` - The socket type to use, any type compatible
   with <a href="https://golang.org/pkg/net/#Dial">net.Dial</a> is acceptable. It's
   important to note if TCP is used and the destination socket becomes unavailable
-  Vault may become unresponsive per [Blocked Audit Devices](/vault/docs/audit/#blocked-audit-devices).
+  Vault may become unresponsive per [Blocked Audit Devices](docs/audit/#blocked-audit-devices).
+
+- `log_raw` `(bool: false)` - If enabled, logs the security sensitive
+  information without hashing, in the raw format.
+
+- `hmac_accessor` `(bool: true)` - If enabled, enables the hashing of token
+  accessor.
+
+- `mode` `(string: "0600")` - A string containing an octal number representing
+  the bit pattern for the file mode, similar to `chmod`.
+
+- `format` `(string: "json")` - Allows selecting the output format. Valid values
+  are `"json"` and `"jsonx"`, which formats the normal log entries as XML.
+
+- `prefix` `(string: "")` - A customizable string prefix to write before the
+  actual log line.
diff --git a/website/content/docs/audit/syslog.mdx b/website/content/docs/audit/syslog.mdx
index ca114d3d13870..2238a869a1094 100644
--- a/website/content/docs/audit/syslog.mdx
+++ b/website/content/docs/audit/syslog.mdx
@@ -36,10 +36,21 @@ $ vault audit enable syslog tag="vault" facility="AUTH"
 
 ## Configuration
 
-The `syslog` audit device supports the common configuration options documented on
-the [main Audit Devices page](/vault/docs/audit#common-configuration-options), and
-these device-specific options:
-
 - `facility` `(string: "AUTH")` - The syslog facility to use.
 
 - `tag` `(string: "vault")` - The syslog tag to use.
+
+- `log_raw` `(bool: false)` - If enabled, logs the security sensitive
+  information without hashing, in the raw format.
+
+- `hmac_accessor` `(bool: true)` - If enabled, enables the hashing of token
+  accessor.
+
+- `mode` `(string: "0600")` - A string containing an octal number representing
+  the bit pattern for the file mode, similar to `chmod`.
+
+- `format` `(string: "json")` - Allows selecting the output format. Valid values
+  are `"json"` and `"jsonx"`, which formats the normal log entries as XML.
+
+- `prefix` `(string: "")` - A customizable string prefix to write before the
+  actual log line.
diff --git a/website/content/docs/auth/alicloud.mdx b/website/content/docs/auth/alicloud.mdx
index 4c67ebfd8af3b..c1f514b5feaa5 100644
--- a/website/content/docs/auth/alicloud.mdx
+++ b/website/content/docs/auth/alicloud.mdx
@@ -108,5 +108,5 @@ can be found found in the
 ## API
 
 The AliCloud auth method has a full HTTP API. Please see the
-[AliCloud Auth API](/vault/api-docs/auth/alicloud) for more
+[AliCloud Auth API](/api-docs/auth/alicloud) for more
 details.
diff --git a/website/content/docs/auth/app-id.mdx b/website/content/docs/auth/app-id.mdx
index 34fb117b6b1f5..033f4ec8a215c 100644
--- a/website/content/docs/auth/app-id.mdx
+++ b/website/content/docs/auth/app-id.mdx
@@ -7,7 +7,7 @@ description: The AppID auth method is a mechanism for machines to authenticate w
 # AppID Auth Method
 
 ~> **DEPRECATED!** As of Vault 0.6.1, AppID is deprecated in favor of
-[AppRole](/vault/docs/auth/approle). AppRole can accommodate the same workflow as
+[AppRole](/docs/auth/approle). AppRole can accommodate the same workflow as
 AppID while enabling much more secure and flexible management and other types
 of authentication workflows. No new features or enhancements are planned for App
 ID, and new users should use AppRole instead of AppID.
@@ -120,5 +120,5 @@ management tool.
 ## API
 
 The AppID auth method has a full HTTP API. Please see the
-[AppID auth method API](/vault/api-docs/auth/app-id) for more
+[AppID auth method API](/api-docs/auth/app-id) for more
 details.
diff --git a/website/content/docs/auth/approle.mdx b/website/content/docs/auth/approle.mdx
index 085eabf1983c2..eed7aade40a3a 100644
--- a/website/content/docs/auth/approle.mdx
+++ b/website/content/docs/auth/approle.mdx
@@ -216,7 +216,7 @@ full set of client credentials (RoleID and SecretID) in order to create the
 entry, even if these are then distributed via different paths. However, in Pull
 mode, even though the RoleID must be known in order to distribute it to the
 client, the SecretID can be kept confidential from all parties except for the
-final authenticating client by using [Response Wrapping](/vault/docs/concepts/response-wrapping).
+final authenticating client by using [Response Wrapping](/docs/concepts/response-wrapping).
 
 Push mode is available for App-ID workflow compatibility, which in some
 specific cases is preferable, but in most cases Pull mode is more secure and
@@ -236,13 +236,13 @@ belonging to configured CIDR blocks on the AppRole.
 ## Tutorial
 
 Refer to the [AppRole Pull
-Authentication](/vault/tutorials/auth-methods/approle)
+Authentication](https://learn.hashicorp.com/vault/identity-access-management/iam-authentication)
 tutorial to learn how to use the AppRole method to generate tokens for machines or apps.
 
 ## API
 
 The AppRole auth method has a full HTTP API. Please see the
-[AppRole API](/vault/api-docs/auth/approle) for more
+[AppRole API](/api-docs/auth/approle) for more
 details.
 
 ## Code Example
diff --git a/website/content/docs/auth/aws.mdx b/website/content/docs/auth/aws.mdx
index 6a50945b021ad..267585478cfce 100644
--- a/website/content/docs/auth/aws.mdx
+++ b/website/content/docs/auth/aws.mdx
@@ -348,7 +348,7 @@ are needed.
   `sts:AssumeRole` statement).
 - The `ManageOwnAccessKeys` stanza is necessary when you have configured Vault
   with static credentials, and wish to rotate these credentials with the
-  [Rotate Root Credentials](/vault/api-docs/auth/aws#rotate-root-credentials)
+  [Rotate Root Credentials](https://www.vaultproject.io/api-docs/auth/aws#rotate-root-credentials)
   API call.
 
 ## Client Nonce
@@ -442,7 +442,7 @@ not specify the policy component, the client will inherit the allowed policies s
 on the role. If the role tag creation specifies the policy component but it contains
 no policies, the token will contain only the `default` policy; by default, this policy
 allows only manipulation (revocation, renewal, lookup) of the existing token, plus
-access to its [cubbyhole](/vault/docs/secrets/cubbyhole).
+access to its [cubbyhole](/docs/secrets/cubbyhole).
 This can be useful to allow instances access to a secure "scratch space" for
 storing data (via the token's cubbyhole) but without granting any access to
 other resources provided by or resident in Vault.
@@ -674,10 +674,6 @@ If the region is specified as `auto`, the Vault CLI will determine the region ba
 on standard AWS credentials precedence as described earlier. Whichever method is used,
 be sure the designated region corresponds to that of the STS endpoint you're using.
 
-~> **Note:** If you are making use of AWS GovCloud and setting the `sts_endpoint`
-and `sts_region` role parameters to `us-gov-west-1` / `us-gov-east-1` then you must include
-the `region` argument in your login request with a matching value, i.e. `region=us-gov-west-1`.
-
 An example of how to generate the required request values for the `login` method
 can be found found in the [vault cli
 source code](https://github.com/hashicorp/vault/blob/main/builtin/credential/aws/cli.go).
@@ -758,7 +754,7 @@ The response will be in JSON. For example:
 ## API
 
 The AWS auth method has a full HTTP API. Please see the
-[AWS Auth API](/vault/api-docs/auth/aws) for more
+[AWS Auth API](/api-docs/auth/aws) for more
 details.
 
 ## Code Example
diff --git a/website/content/docs/auth/azure.mdx b/website/content/docs/auth/azure.mdx
index de44c2fefca15..5646d0f81a84d 100644
--- a/website/content/docs/auth/azure.mdx
+++ b/website/content/docs/auth/azure.mdx
@@ -14,56 +14,35 @@ and expects a [JSON Web Token (JWT)](https://tools.ietf.org/html/rfc7519)
 signed by Azure Active Directory for the configured tenant.
 
 This method supports authentication for system-assigned and user-assigned
-managed identities. See [Managed identities for Azure resources](https://learn.microsoft.com/en-us/azure/active-directory/managed-identities-azure-resources/overview)
-for more information about these resources.
+managed identities. See [Azure Managed Service Identity (MSI)](https://docs.microsoft.com/en-us/azure/active-directory/managed-service-identity/overview) for more information about these resources.
 
-This documentation assumes the Azure method is mounted at the `/auth/azure`
-path in Vault. Since it is possible to enable auth methods at any location,
-please update your API calls accordingly.
+~> System-assigned identities are unique to every virtual machine in Azure. If the
+virtual machines using Azure auth are recreated frequently, using system-assigned
+identities could result in a lot of Vault entities. For environments with high ephemeral
+workloads, user-assigned identities are recommended.
 
 ## Prerequisites:
 
-The Azure auth method requires client credentials to access Azure APIs. The following
-are required to configure the auth method:
+The following documentation assumes that the method has been
+[mounted](/docs/plugins) at `auth/azure`.
 
-- A configured [Azure AD application](https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-integrating-applications)
-  which is used as the resource for generating MSI access tokens.
-- Client credentials (shared secret) with read access to particular Azure Resource Manager
-  resources. See [Azure AD Service to Service Client Credentials](https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-protocols-oauth-service-to-service).
+- A configured [Azure AD application](https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-integrating-applications) which is used as the resource for generating MSI access tokens.
+- Client credentials (shared secret) for accessing the Azure Resource Manager with read access to compute endpoints. See [Azure AD Service to Service Client Credentials](https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-protocols-oauth-service-to-service)
 
-If Vault is hosted on Azure, Vault can use MSI to access Azure instead of a shared secret.
-A managed identity must be [enabled](https://learn.microsoft.com/en-us/azure/active-directory/managed-identities-azure-resources/)
-on the resource that acquires the access token.
+Required Azure API permissions to be granted to Vault user:
 
-The following Azure [role assignments](https://learn.microsoft.com/en-us/azure/role-based-access-control/overview#role-assignments)
-must be granted to the Azure AD application in order for the auth method to access Azure
-APIs during authentication.
+- `Microsoft.Compute/virtualMachines/*/read`
+- `Microsoft.Compute/virtualMachineScaleSets/*/read`
 
-### Role Assignments
+_NOTE:_ The above permissions are only required when the associated vm\* parameters are used on login. Please see the [API doc](https://www.vaultproject.io/api-docs/auth/azure#login) for more details.
 
-~> **Note:** The role assignments are only required when the
-[`vm_name`](/vault/api-docs/auth/azure#vm_name), [`vmss_name`](/vault/api-docs/auth/azure#vmss_name),
-or [`resource_id`](/vault/api-docs/auth/azure#resource_id) parameters are used on login.
+If Vault is hosted on Azure, Vault can use MSI to access Azure instead of a shared secret. MSI must be [enabled](https://docs.microsoft.com/en-us/azure/active-directory/managed-service-identity/qs-configure-portal-windows-vm) on the VMs hosting Vault.
 
-| Azure Environment | Login Parameter | Azure API Permission |
-| ----------- | --------------- | -------------------- |
-| Virtual Machine | [`vm_name`](/vault/api-docs/auth/azure#vm_name) | `Microsoft.Compute/virtualMachines/*/read` |
-| Virtual Machine Scale Set ([Uniform Orchestration][vmss-uniform]) | [`vmss_name`](/vault/api-docs/auth/azure#vmss_name) | `Microsoft.Compute/virtualMachineScaleSets/*/read` |
-| Virtual Machine Scale Set ([Flexible Orchestration][vmss-flex]) | [`vmss_name`](/vault/api-docs/auth/azure#vmss_name) | `Microsoft.Compute/virtualMachineScaleSets/*/read` `Microsoft.ManagedIdentity/userAssignedIdentities/*/read` |
-| Services that ([support managed identities][managed-identities]) for Azure resources | [`resource_id`](/vault/api-docs/auth/azure#resource_id) | `read` on the resource used to obtain the JWT |
+The next sections review how the authN/Z workflows work. If you
+have already reviewed these sections, here are some quick links to:
 
-[vmss-uniform]: https://learn.microsoft.com/en-us/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-orchestration-modes#scale-sets-with-uniform-orchestration
-[vmss-flex]: https://learn.microsoft.com/en-us/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-orchestration-modes#scale-sets-with-flexible-orchestration
-[managed-identities]: https://learn.microsoft.com/en-us/azure/active-directory/managed-identities-azure-resources/managed-identities-status
-
-### API Permissions
-
-The following [API permissions](https://learn.microsoft.com/en-us/azure/active-directory/develop/permissions-consent-overview#types-of-permissions)
-must be assigned to the service principal provided to Vault for managing the root rotation in Azure:
-
-| Permission Name               | Type        |
-| ----------------------------- | ----------- |
-| Application.ReadWrite.All     | Application |
+- [Usage](/docs/secrets/azure#usage)
+- [API documentation](/api-docs/auth/azure) docs.
 
 ## Authentication
 
@@ -81,12 +60,7 @@ $ vault write auth/azure/login \
     vm_name="test-vm"
 ```
 
-The `role` and `jwt` parameters are required. When using
-`bound_service_principal_ids` and `bound_group_ids` in the token roles, all the
-information is required in the JWT (except for `vm_name`, `vmss_name`, `resource_id`). When
-using other `bound_*` parameters, calls to Azure APIs will be made and
-`subscription_id`, `resource_group_name`, and `vm_name`/`vmss_name` are all required
-and can be obtained through instance metadata.
+The `role` and `jwt` parameters are required. When using `bound_service_principal_ids` and `bound_group_ids` in the token roles, all the information is required in the JWT (except for _vm_name_ and _vmss_name_). When using other `bound_*` parameters, calls to Azure APIs will be made and subscription id, resource group name, and vm name/vmss_name are all required and can be obtained through instance metadata.
 
 For example:
 
@@ -134,13 +108,13 @@ tool.
 
 1. Enable Azure authentication in Vault:
 
-   ```shell-session
+   ```text
    $ vault auth enable azure
    ```
 
 1. Configure the Azure auth method:
 
-   ```shell-session
+   ```text
    $ vault write auth/azure/config \
        tenant_id=7cd1f227-ca67-4fc6-a1a4-9888ea7f388c \
        resource=https://management.azure.com/ \
@@ -153,7 +127,7 @@ tool.
 
 1. Create a role:
 
-   ```shell-session
+   ```text
    $ vault write auth/azure/role/dev-role \
        policies="prod,dev" \
        bound_subscription_ids=6a1d5988-5917-4221-b224-904cd7e24a25 \
@@ -165,13 +139,13 @@ tool.
    authentication type, as well as overall constraints and configuration for
    the generated auth tokens.
 
-   For the complete list of role options, please see the [API documentation](/vault/api-docs/auth/azure).
+   For the complete list of role options, please see the [API documentation](/api-docs/auth/azure).
 
 ### Via the API
 
 1. Enable Azure authentication in Vault:
 
-   ```shell-session
+   ```sh
    $ curl \
        --header "X-Vault-Token: ..." \
        --request POST \
@@ -181,7 +155,7 @@ tool.
 
 1. Configure the Azure auth method:
 
-   ```shell-session
+   ```sh
    $ curl \
        --header "X-Vault-Token: ..." \
        --request POST \
@@ -191,7 +165,7 @@ tool.
 
 1. Create a role:
 
-   ```shell-session
+   ```sh
    $ curl \
        --header "X-Vault-Token: ..." \
        --request POST \
@@ -199,23 +173,29 @@ tool.
        https://127.0.0.1:8200/v1/auth/azure/role/dev-role
    ```
 
-## Azure Managed Identities
+### Plugin Setup
 
-There are two types of [managed identities](https://learn.microsoft.com/en-us/azure/active-directory/managed-identities-azure-resources/overview#managed-identity-types)
-in Azure: System-assigned and User-assigned. System-assigned identities are unique to
-every virtual machine in Azure. If the resources using Azure auth are recreated
-frequently, using system-assigned identities could result in many Vault entities being
-created. For environments with high ephemeral workloads, user-assigned identities are
-recommended.
+~> The following section is only relevant if you decide to enable the azure auth
+method as an external plugin. The azure plugin method is integrated into Vault as
+a builtin method by default.
 
+Assuming you have saved the binary `vault-plugin-auth-azure` to some folder and
+configured the [plugin directory](/docs/plugins/plugin-architecture#plugin-directory)
+for your server at `path/to/plugins`:
 
-### Limitations
+1. Enable the plugin in the catalog:
 
-The TTL of the access token returned by Azure AD for a managed identity is
-24hrs and is not configurable. See ([limitations of using managed identities][id-limitations])
-for more info.
+   ```text
+   $ vault write sys/plugins/catalog/auth/azure-auth \
+       command="vault-plugin-auth-azure" \
+       sha256="..."
+   ```
+
+1. Enable the azure auth method as a plugin:
 
-[id-limitations]: https://learn.microsoft.com/en-us/azure/active-directory/managed-identities-azure-resources/managed-identity-best-practice-recommendations#limitation-of-using-managed-identities-for-authorization
+   ```text
+   $ vault auth enable -path=azure azure-auth
+   ```
 
 ## Azure Debug Logs
 
@@ -231,7 +211,7 @@ AZURE_GO_SDK_LOG_LEVEL=DEBUG
 
 ## API
 
-The Azure Auth Plugin has a full HTTP API. Please see the [API documentation](/vault/api-docs/auth/azure) for more details.
+The Azure Auth Plugin has a full HTTP API. Please see the [API documentation](/api-docs/auth/azure) for more details.
 
 ## Code Example
 
diff --git a/website/content/docs/auth/cert.mdx b/website/content/docs/auth/cert.mdx
index b1f481c852419..7b49de40bd312 100644
--- a/website/content/docs/auth/cert.mdx
+++ b/website/content/docs/auth/cert.mdx
@@ -57,15 +57,9 @@ mount of the method. The workaround here is to mount multiple copies of the
 `cert` method, configure each with one CA/CRL, and have clients connect to the
 appropriate mount.
 
-In addition, if a CRL distribution point is not set the method will not
-fetch the CRLs itself, the CRL's designated time to next update is not
-considered. If a CRL is no longer in use, it is up to the administrator to
-remove it from the method.
-
-In addition to automatic or manual CRL management, OCSP may be enabled for
-a configured certificate, in which case Vault will query the OCSP server either
-specified in the presented certificate or configured in the auth method to
-check revocation.
+In addition, since the method does not fetch the CRLs itself, the CRL's
+designated time to next update is not considered. If a CRL is no longer in use,
+it is up to the administrator to remove it from the method.
 
 ## Authentication
 
@@ -143,4 +137,4 @@ management tool.
 ## API
 
 The TLS Certificate auth method has a full HTTP API. Please see the
-[TLS Certificate API](/vault/api-docs/auth/cert) for more details.
+[TLS Certificate API](/api-docs/auth/cert) for more details.
diff --git a/website/content/docs/auth/cf.mdx b/website/content/docs/auth/cf.mdx
index 78a7621682a5e..c0a8b22589fbf 100644
--- a/website/content/docs/auth/cf.mdx
+++ b/website/content/docs/auth/cf.mdx
@@ -324,5 +324,5 @@ match the certificates you're checking.
 
 ## API
 
-The CF auth method has a full HTTP API. Please see the [CF Auth API](/vault/api-docs/auth/cf)
+The CF auth method has a full HTTP API. Please see the [CF Auth API](/api-docs/auth/cf)
 for more details.
diff --git a/website/content/docs/auth/gcp.mdx b/website/content/docs/auth/gcp.mdx
index 1b44e5139bf10..1c06f51839959 100644
--- a/website/content/docs/auth/gcp.mdx
+++ b/website/content/docs/auth/gcp.mdx
@@ -98,7 +98,7 @@ management tool.
 
    -> **Note**: If you're using a [Private Google Access](https://cloud.google.com/vpc/docs/configure-private-google-access)
    environment, you will additionally need to configure your environment’s custom endpoints
-   via the [custom_endpoint](/vault/api-docs/auth/gcp#custom_endpoint) configuration parameter.
+   via the [custom_endpoint](/api-docs/auth/gcp#custom_endpoint) configuration parameter.
 
 1. Create a named role:
 
@@ -163,18 +163,18 @@ The GCP project must have the following APIs enabled:
 - [compute.googleapis.com](https://console.cloud.google.com/flows/enableapi?apiid=compute.googleapis.com)
   for `gce` type roles.
 - [cloudresourcemanager.googleapis.com](https://console.cloud.google.com/flows/enableapi?apiid=cloudresourcemanager.googleapis.com)
-  for `iam` and `gce` type roles that set [`add_group_aliases`](/vault/api-docs/auth/gcp#add_group_aliases) to true.
+  for `iam` and `gce` type roles that set [`add_group_aliases`](/api-docs/auth/gcp#add_group_aliases) to true.
 
 #### Vault Server Permissions
 
-**For `iam`-type Vault roles**, the service account [`credentials`](/vault/api-docs/auth/gcp#credentials)
+**For `iam`-type Vault roles**, the service account [`credentials`](/api-docs/auth/gcp#credentials)
 given to Vault can have the following role:
 
 ```text
 roles/iam.serviceAccountKeyAdmin
 ```
 
-**For `gce`-type Vault roles**, the service account [`credentials`](/vault/api-docs/auth/gcp#credentials)
+**For `gce`-type Vault roles**, the service account [`credentials`](/api-docs/auth/gcp#credentials)
 given to Vault can have the following role:
 
 ```text
@@ -400,8 +400,8 @@ The GCP Auth Plugin has a full HTTP API. Please see the
 [signjwt-method]: https://cloud.google.com/iam/docs/reference/credentials/rest/v1/projects.serviceAccounts/signJwt
 [cloud-creds]: https://cloud.google.com/docs/authentication/production#providing_credentials_to_your_application
 [service-accounts]: https://cloud.google.com/compute/docs/access/service-accounts
-[api-docs]: /vault/api-docs/auth/gcp
-[identity-group-aliases]: /vault/api-docs/secret/identity/group-alias
+[api-docs]: /api-docs/auth/gcp
+[identity-group-aliases]: /api-docs/secret/identity/group-alias
 [instance-identity]: https://cloud.google.com/compute/docs/instances/verifying-instance-identity
 [repo]: https://github.com/hashicorp/vault-plugin-auth-gcp
 
diff --git a/website/content/docs/auth/github.mdx b/website/content/docs/auth/github.mdx
index c50b6fe06fcc1..d802c80eeeddd 100644
--- a/website/content/docs/auth/github.mdx
+++ b/website/content/docs/auth/github.mdx
@@ -109,5 +109,5 @@ management tool.
 ## API
 
 The GitHub auth method has a full HTTP API. Please see the
-[GitHub Auth API](/vault/api-docs/auth/github) for more
+[GitHub Auth API](/api-docs/auth/github) for more
 details.
diff --git a/website/content/docs/auth/index.mdx b/website/content/docs/auth/index.mdx
index 2908a94d8d9ea..35163c5db481d 100644
--- a/website/content/docs/auth/index.mdx
+++ b/website/content/docs/auth/index.mdx
@@ -16,12 +16,12 @@ Azure, Okta ...).
 Having multiple auth methods enables you to use an auth method that makes the
 most sense for your use case of Vault and your organization.
 
-For example, on developer machines, the [GitHub auth method](/vault/docs/auth/github)
-is easiest to use. But for servers the [AppRole](/vault/docs/auth/approle)
+For example, on developer machines, the [GitHub auth method](/docs/auth/github)
+is easiest to use. But for servers the [AppRole](/docs/auth/approle)
 method is the recommended choice.
 
 To learn more about authentication, see the
-[authentication concepts page](/vault/docs/concepts/auth).
+[authentication concepts page](/docs/concepts/auth).
 
 ## Enabling/Disabling Auth Methods
 
@@ -31,7 +31,7 @@ Auth methods can be enabled/disabled using the CLI or the API.
 $ vault auth enable userpass
 ```
 
-When enabled, auth methods are similar to [secrets engines](/vault/docs/secrets):
+When enabled, auth methods are similar to [secrets engines](/docs/secrets):
 they are mounted within the Vault mount table and can be accessed
 and configured using the standard read/write API. All auth methods are mounted underneath the `auth/` prefix.
 
@@ -52,5 +52,5 @@ automatically logged out.
 When using an external auth method (e.g., GitHub), Vault will call the external service
 at the time of authentication and for any subsequent token renewals. This means that issued tokens
 are valid for their entire duration, and are not invalidated until a renewal or user re-authentication
-occurs. Operators should ensure appropriate [token TTLs](/vault/docs/concepts/tokens#the-general-case)
+occurs. Operators should ensure appropriate [token TTLs](/docs/concepts/tokens#the-general-case)
 are set when using these auth methods.
\ No newline at end of file
diff --git a/website/content/docs/auth/jwt/index.mdx b/website/content/docs/auth/jwt/index.mdx
index f8d7b0d87ca9c..b39196baf3b85 100644
--- a/website/content/docs/auth/jwt/index.mdx
+++ b/website/content/docs/auth/jwt/index.mdx
@@ -28,7 +28,7 @@ examples of OIDC and JWT usage.
 ## OIDC Authentication
 
 This section covers the setup and use of OIDC roles. If a JWT is to be provided directly,
-refer to the [JWT Authentication](/vault/docs/auth/jwt#jwt-authentication) section below. Basic
+refer to the [JWT Authentication](/docs/auth/jwt#jwt-authentication) section below. Basic
 familiarity with [OIDC concepts](https://developer.okta.com/blog/2017/07/25/oidc-primer-part-1)
 is assumed. The Authorization Code flow makes use of the Proof Key for Code
 Exchange (PKCE) extension.
@@ -60,19 +60,19 @@ Logging in via the Vault UI requires a redirect URI of the form:
 The "host:port" must be correct for the Vault server, and "path" must match the path the JWT
 backend is mounted at (e.g. "oidc" or "jwt").
 
-If the [oidc_response_mode](/vault/api-docs/auth/jwt#oidc_response_mode) is set to `form_post`, then
+If the [oidc_response_mode](/api-docs/auth/jwt#oidc_response_mode) is set to `form_post`, then
 logging in via the Vault UI requires a redirect URI of the form:
 
 `https://{host:port}/v1/auth/{path}/oidc/callback`
 
-Prior to Vault 1.6, if [namespaces](/vault/docs/enterprise/namespaces) are in use,
+Prior to Vault 1.6, if [namespaces](/docs/enterprise/namespaces) are in use,
 they must be added as query parameters, for example:
 
 `https://vault.example.com:8200/ui/vault/auth/oidc/oidc/callback?namespace=my_ns`
 
 For Vault 1.6+, it is no longer necessary to add the namespace as a query
 parameter in the redirect URI, if
-[`namespace_in_state`](/vault/api-docs/auth/jwt#namespace_in_state) is set to `true`,
+[`namespace_in_state`](/api-docs/auth/jwt#namespace_in_state) is set to `true`,
 which is the default for new configs.
 
 ### OIDC Login (Vault UI)
@@ -115,7 +115,7 @@ not required to be set:
 The OIDC authentication flow has been successfully tested with a number of providers. A full
 guide to configuring OAuth/OIDC applications is beyond the scope of Vault documentation, but a
 collection of provider configuration steps has been collected to help get started:
-[OIDC Provider Setup](/vault/docs/auth/jwt/oidc-providers)
+[OIDC Provider Setup](/docs/auth/jwt/oidc-providers)
 
 ### OIDC Configuration Troubleshooting
 
@@ -161,7 +161,7 @@ EOF
 
   `cat jwt.json | jq -r .access_token | cut -d. -f2 | base64 -D`
 
-- As of Vault 1.2, the [`verbose_oidc_logging`](/vault/api-docs/auth/jwt#verbose_oidc_logging) role
+- As of Vault 1.2, the [`verbose_oidc_logging`](/api-docs/auth/jwt#verbose_oidc_logging) role
   option is available which will log the received OIDC token to the _server_ logs if debug-level logging is enabled. This can
   be helpful when debugging provider setup and verifying that the received claims are what you expect.
   Since claims data is logged verbatim and may contain sensitive information, this option should not be
@@ -169,7 +169,7 @@ EOF
 
 - Azure requires some additional configuration when a user is a member of more
   than 200 groups, described in [Azure-specific handling
-  configuration](/vault/docs/auth/jwt/oidc-providers/azuread#optional-azure-specific-configuration)
+  configuration](/docs/auth/jwt/oidc-providers/azuread#optional-azure-specific-configuration)
 
 ## JWT Authentication
 
@@ -248,7 +248,7 @@ management tool.
 
 1. Use the `/config` endpoint to configure Vault. To support JWT roles, either local keys, a JWKS URL, or an OIDC
    Discovery URL must be present. For OIDC roles, OIDC Discovery URL, OIDC Client ID and OIDC Client Secret are required. For the
-   list of available configuration options, please see the [API documentation](/vault/api-docs/auth/jwt).
+   list of available configuration options, please see the [API documentation](/api-docs/auth/jwt).
 
    ```text
    $ vault write auth/jwt/config \
@@ -315,7 +315,7 @@ To limit authorization to a set of email addresses:
 }
 ```
 
-Bound claims can optionally be configured with globs. See the [API documentation](/vault/api-docs/auth/jwt#bound_claims_type) for more details.
+Bound claims can optionally be configured with globs. See the [API documentation](/api-docs/auth/jwt#bound_claims_type) for more details.
 
 ### Claims as Metadata
 
@@ -363,4 +363,4 @@ JSON Pointer can be used as a selector. Refer to the
 ## API
 
 The JWT Auth Plugin has a full HTTP API. Please see the
-[API docs](/vault/api-docs/auth/jwt) for more details.
+[API docs](/api-docs/auth/jwt) for more details.
diff --git a/website/content/docs/auth/jwt/oidc-providers/azuread.mdx b/website/content/docs/auth/jwt/oidc-providers/azuread.mdx
index 36bf16a248ee9..5f3df30cafa1a 100644
--- a/website/content/docs/auth/jwt/oidc-providers/azuread.mdx
+++ b/website/content/docs/auth/jwt/oidc-providers/azuread.mdx
@@ -36,12 +36,12 @@ Reference: [Azure Active Directory v2.0 and the OpenID Connect protocol](https:/
 
 ### Connect AD group with Vault external group
 
-Reference: [Azure Active Directory with OIDC Auth Method and External Groups](/vault/tutorials/auth-methods/oidc-auth-azure)
+Reference: [Azure Active Directory with OIDC Auth Method and External Groups](https://learn.hashicorp.com/tutorials/vault/oidc-auth-azure)
 
-To connect the AD group with a [Vault external groups](/vault/docs/secrets/identity#external-vs-internal-groups),
+To connect the AD group with a [Vault external groups](/docs/secrets/identity#external-vs-internal-groups),
 you will need
 [Azure AD v2.0 endpoints](https://docs.microsoft.com/en-gb/azure/active-directory/develop/azure-ad-endpoint-comparison).
-You should set up a [Vault policy](/vault/tutorials/policies/policies) for the Azure AD group to use.
+You should set up a [Vault policy](https://learn.hashicorp.com/tutorials/vault/policies) for the Azure AD group to use.
 
 1. Go to **Azure Active Directory** and choose your Vault application.
 
@@ -79,16 +79,16 @@ You should set up a [Vault policy](/vault/tutorials/policies/policies) for the A
       policies=default
    ```
 
-1. In Vault, create the [external group](/vault/api-docs/secret/identity/group).
+1. In Vault, create the [external group](/api-docs/secret/identity/group).
    Record the group ID as you will need it for the group alias.
 
-1. From Vault, retrieve the [OIDC accessor ID](/vault/api-docs/system/auth#list-auth-methods)
+1. From Vault, retrieve the [OIDC accessor ID](/api-docs/system/auth#list-auth-methods)
    from the OIDC auth method as you will need it for the group alias's `mount_accessor`.
 
 1. Go to the Azure AD Group you want to attach to Vault's external group. Record the `objectId`
    as you will need it as the group alias name in Vault.
 
-1. In Vault, create a [group alias](/vault/api-docs/secret/identity/group-alias)
+1. In Vault, create a [group alias](/api-docs/secret/identity/group-alias)
    for the external group and set the `objectId` as the group alias name.
    ```shell
    vault write identity/group-alias \
@@ -127,7 +127,7 @@ To set the proper permissions on the Azure app:
 1. Add a permission
 1. Select "Microsoft Graph"
 1. Select "Delegated permissions"
-1. Add the [User.Read](https://learn.microsoft.com/en-us/graph/permissions-reference#delegated-permissions-93) permission
+1. Add the [User.Read](https://learn.microsoft.com/en-us/graph/permissions-reference#delegated-permissions-86) permission
 1. Check the "Grant admin consent for Default Directory" checkbox
 1. Configure the OIDC auth method in Vault by setting `"provider_config"` to Azure.
    ```shell
diff --git a/website/content/docs/auth/jwt/oidc-providers/forgerock.mdx b/website/content/docs/auth/jwt/oidc-providers/forgerock.mdx
index b5a1785f6f92b..113094b02d474 100644
--- a/website/content/docs/auth/jwt/oidc-providers/forgerock.mdx
+++ b/website/content/docs/auth/jwt/oidc-providers/forgerock.mdx
@@ -29,7 +29,7 @@ description: OIDC provider configuration for ForgeRock
       oidc_discovery_url="https://openam.example.com:8443/openam/oauth2"
    ```
 
-1. Configure the [OIDC Role](/vault/api-docs/auth/jwt) with the following:
+1. Configure the [OIDC Role](/api-docs/auth/jwt) with the following:
   - `user_claim` should be `"sub"`.
   - `allowed_redirect_uris` should be the two redirect URIs for Vault CLI and UI access.
   - `oidc_scopes` should be set to the OIDC scopes.
diff --git a/website/content/docs/auth/jwt/oidc-providers/google.mdx b/website/content/docs/auth/jwt/oidc-providers/google.mdx
index 6cdd00f887c13..b44abecc7735e 100644
--- a/website/content/docs/auth/jwt/oidc-providers/google.mdx
+++ b/website/content/docs/auth/jwt/oidc-providers/google.mdx
@@ -14,7 +14,7 @@ Main reference: [Using OAuth 2.0 to Access Google APIs](https://developers.googl
 1. Create a new credential via Credentials > Create Credentials > OAuth Client ID.
 1. Configure the OAuth Consent Screen. Application Name is required. Save.
 1. Select application type: "Web Application".
-1. Configure Authorized [Redirect URIs](/vault/docs/auth/jwt#redirect-uris).
+1. Configure Authorized Redirect URIs.
 1. Save client ID and secret.
 
 ### Optional Google-specific Configuration
@@ -23,7 +23,7 @@ Google-specific configuration is available when using Google as an identity prov
 Vault JWT/OIDC auth method. The configuration allows Vault to obtain Google Workspace group membership and
 user information during the JWT/OIDC authentication flow. The group membership obtained from Google Workspace
 may be used for Identity group alias association. The user information obtained from Google Workspace can be
-used to copy claims data into resulting auth token and alias metadata via [claim_mappings](/vault/api-docs/auth/jwt#claim_mappings).
+used to copy claims data into resulting auth token and alias metadata via [claim_mappings](/api-docs/auth/jwt#claim_mappings).
 
 #### Setup
 
@@ -38,14 +38,14 @@ To set up the Google-specific handling, you'll need:
   Google account to authenticate with Vault.
 
 The Google-specific handling that's used to fetch Google Workspace groups and user information in Vault uses
-Google Workspace Domain-Wide Delegation of Authority for authentication and authorization. You need to follow
-**all steps** in the [guide](https://developers.google.com/workspace/guides/create-credentials#service-account)
+[Google Workspace Domain-Wide Delegation of Authority](https://developers.google.com/admin-sdk/directory/v1/guides/delegation)
+for authentication and authorization. You need to follow **all steps** in the [guide](https://developers.google.com/admin-sdk/directory/v1/guides/delegation)
 to obtain the key file for a Google service account capable of making requests to the Google Workspace
 [User Accounts](https://developers.google.com/admin-sdk/directory/v1/guides/manage-users) and
 [Groups](https://developers.google.com/admin-sdk/directory/v1/guides/manage-groups) APIs.
 
-In **step 11** within the section titled
-[Optional: Set up domain-wide delegation for a service account](https://developers.google.com/workspace/guides/create-credentials#optional_set_up_domain-wide_delegation_for_a_service_account),
+In **step 5** within the section titled
+[Delegate domain-wide authority to your service account](https://developers.google.com/admin-sdk/directory/v1/guides/delegation#delegate_domain-wide_authority_to_your_service_account),
 the only OAuth scopes that should be granted are:
 
 - `https://www.googleapis.com/auth/admin.directory.group.readonly`
@@ -65,7 +65,7 @@ that enable the feature.
 - `fetch_user_info` `(bool: false)` - If set to true, user info will be fetched from Google Workspace using the configured [user_custom_schemas](#user_custom_schemas).
 - `groups_recurse_max_depth` `(int: <optional>)` - Group membership recursion max depth. Defaults to 0, which means don't recurse.
 - `user_custom_schemas` `(string: <optional>)` - Comma-separated list of Google Workspace [custom schemas](https://developers.google.com/admin-sdk/directory/v1/guides/manage-schemas).
-  Values set for Google Workspace users using custom schema fields will be fetched and made available as claims that can be used with [claim_mappings](/vault/api-docs/auth/jwt#claim_mappings). Required if [fetch_user_info](#fetch_user_info) is set to true.
+  Values set for Google Workspace users using custom schema fields will be fetched and made available as claims that can be used with [claim_mappings](/api-docs/auth/jwt#claim_mappings). Required if [fetch_user_info](#fetch_user_info) is set to true.
 
 Example configuration:
 
@@ -91,7 +91,7 @@ EOF
 
 #### Role
 
-The [user_claim](/vault/api-docs/auth/jwt#user_claim) value of the role must be set to
+The [user_claim](/api-docs/auth/jwt#user_claim) value of the role must be set to
 one of either `sub` or `email` for the Google Workspace group and user information
 queries to succeed.
 
diff --git a/website/content/docs/auth/jwt/oidc-providers/ibmisam.mdx b/website/content/docs/auth/jwt/oidc-providers/ibmisam.mdx
deleted file mode 100644
index 9b21f93772d5b..0000000000000
--- a/website/content/docs/auth/jwt/oidc-providers/ibmisam.mdx
+++ /dev/null
@@ -1,34 +0,0 @@
----
-layout: docs
-page_title: OIDC Provider Setup - Auth Methods - IBM Security Access Manager (ISAM)
-description: OIDC provider configuration for IBM Security Access Manager (recently renamed to IBM Security Verify Access)
----
-
-## IBM ISAM
-
-The [IBM ISAM](https://www.ibm.com/de-de/products/verify-access) identity provider
-returns group membership claims as a space-separated list of strings (e.g.
-`groups: "group-1 group-2"`) instead of a list of strings.
-
-To properly obtain group membership when using IBMISAM as the identity provider for
-Vault's OIDC Auth Method, the `ibmisam` provider must be explicitly configured as
-shown below.
-
-```shell
-vault write auth/oidc/config -<<"EOH"
-{
-   "oidc_client_id": "your_client_id",
-   "oidc_client_secret": "your_client_secret",
-   "default_role": "your_default_role",
-   "oidc_discovery_url": "https://your.idp.host",
-   "provider_config": {
-      "provider": "ibmisam"
-   }
-}
-EOH
-```
-
-This will instruct the OIDC Auth Method to parse the space-separated groups claims string
-into individual groups. Note that the role's [`groups_claim`](/vault/api-docs/auth/jwt#groups_claim)
-value must be properly configured to target the groups claim for your IBM ISAM identity
-provider.
diff --git a/website/content/docs/auth/jwt/oidc-providers/index.mdx b/website/content/docs/auth/jwt/oidc-providers/index.mdx
index 7cb59d38354e6..568d2e2ee48a0 100644
--- a/website/content/docs/auth/jwt/oidc-providers/index.mdx
+++ b/website/content/docs/auth/jwt/oidc-providers/index.mdx
@@ -8,20 +8,19 @@ description: OIDC provider configuration quick starts
 
 This page collects high-level setup steps on how to configure an OIDC
 application for various providers. For more general usage and operation
-information, see the [Vault JWT/OIDC method documentation](/vault/docs/auth/jwt).
+information, see the [Vault JWT/OIDC method documentation](/docs/auth/jwt).
 
 OIDC providers are often highly configurable, and you should become familiar with
 their recommended settings and best practices. The guides listed below are
 largely community-driven and intended to help you get started. Corrections
 and additions may be submitted via the [Vault Github repository](https://github.com/hashicorp/vault).
 
-- [Auth0](/vault/docs/auth/jwt/oidc-providers/auth0)
-- [Azure AD](/vault/docs/auth/jwt/oidc-providers/azuread)
-- [ForgeRock](/vault/docs/auth/jwt/oidc-providers/forgerock)
-- [Gitlab](/vault/docs/auth/jwt/oidc-providers/gitlab)
-- [Google](/vault/docs/auth/jwt/oidc-providers/google)
-- [Keycloak](/vault/docs/auth/jwt/oidc-providers/keycloak)
-- [Kubernetes](/vault/docs/auth/jwt/oidc-providers/kubernetes)
-- [Okta](/vault/docs/auth/jwt/oidc-providers/okta)
-- [SecureAuth](/vault/docs/auth/jwt/oidc-providers/secureauth)
-- [IBMISAM](/vault/docs/auth/jwt/oidc-providers/ibmisam)
+- [Auth0](/docs/auth/jwt/oidc-providers/auth0)
+- [Azure AD](/docs/auth/jwt/oidc-providers/azuread)
+- [ForgeRock](/docs/auth/jwt/oidc-providers/forgerock)
+- [Gitlab](/docs/auth/jwt/oidc-providers/gitlab)
+- [Google](/docs/auth/jwt/oidc-providers/google)
+- [Keycloak](/docs/auth/jwt/oidc-providers/keycloak)
+- [Kubernetes](/docs/auth/jwt/oidc-providers/kubernetes)
+- [Okta](/docs/auth/jwt/oidc-providers/okta)
+- [SecureAuth](/docs/auth/jwt/oidc-providers/secureauth)
diff --git a/website/content/docs/auth/jwt/oidc-providers/kubernetes.mdx b/website/content/docs/auth/jwt/oidc-providers/kubernetes.mdx
index 383b12592e9ae..fe30820a83f67 100644
--- a/website/content/docs/auth/jwt/oidc-providers/kubernetes.mdx
+++ b/website/content/docs/auth/jwt/oidc-providers/kubernetes.mdx
@@ -14,7 +14,7 @@ during authentication, and instead uses public key cryptography to verify the
 contents of JWTs. This means tokens that have been revoked by Kubernetes will
 still be considered valid by Vault until their expiry time. To mitigate this
 risk, use short TTLs for service account tokens or use
-[Kubernetes auth](/vault/docs/auth/kubernetes) which _does_ use the `TokenReview` API.
+[Kubernetes auth](/docs/auth/kubernetes) which _does_ use the `TokenReview` API.
 
 ### Using service account issuer discovery
 
diff --git a/website/content/docs/auth/jwt/oidc-providers/secureauth.mdx b/website/content/docs/auth/jwt/oidc-providers/secureauth.mdx
index fd024b8d4437e..22ca5904a0e7b 100644
--- a/website/content/docs/auth/jwt/oidc-providers/secureauth.mdx
+++ b/website/content/docs/auth/jwt/oidc-providers/secureauth.mdx
@@ -29,6 +29,6 @@ EOH
 ```
 
 This will instruct the OIDC Auth Method to parse the comma-separated groups claims string
-into individual groups. Note that the role's [`groups_claim`](/vault/api-docs/auth/jwt#groups_claim)
+into individual groups. Note that the role's [`groups_claim`](/api-docs/auth/jwt#groups_claim)
 value must be properly configured to target the groups claim for your SecureAuth identity
 provider.
diff --git a/website/content/docs/auth/kerberos.mdx b/website/content/docs/auth/kerberos.mdx
index 4aefe30965236..f62589dca7885 100644
--- a/website/content/docs/auth/kerberos.mdx
+++ b/website/content/docs/auth/kerberos.mdx
@@ -27,8 +27,8 @@ it into HashiCorp's maintenance.
 ## Prerequisites
 
 Kerberos is a very hands-on auth method. Other auth methods like
-[LDAP](/vault/docs/auth/ldap) and
-[Azure](/vault/docs/auth/azure) only require
+[LDAP](/docs/auth/ldap) and
+[Azure](/docs/auth/azure) only require
 a cursory amount of knowledge for configuration and use.
 Kerberos, on the other hand, is best used by people already familiar
 with it. We recommend that you use simpler authentication methods if
@@ -114,14 +114,14 @@ $ vault write auth/kerberos/config/ldap \
 ```
 
 The LDAP above relies upon the same code as the LDAP auth method.
-See [its documentation](/vault/docs/auth/ldap)
+See [its documentation](/docs/auth/ldap)
 for further discussion of available parameters.
 
 - Configure the Vault policies that should be granted to those
   who successfully authenticate based on their LDAP group membership.
   Since this is identical to the LDAP auth method, see
-  [Group Membership Resolution](/vault/docs/auth/ldap#group-membership-resolution)
-  and [LDAP Group -> Policy Mapping](/vault/docs/auth/ldap#ldap-group-policy-mapping)
+  [Group Membership Resolution](/docs/auth/ldap#group-membership-resolution)
+  and [LDAP Group -> Policy Mapping](/docs/auth/ldap#ldap-group-policy-mapping)
   for further discussion.
 
 ```shell-session
@@ -211,7 +211,7 @@ or by providing it to [HashiCorp Support](https://www.hashicorp.com/support)
 
 ### Additional Troubleshooting Resources
 
-- [Troubleshooting Vault](/vault/tutorials/monitoring/troubleshooting-vault)
+- [Troubleshooting Vault](https://learn.hashicorp.com/vault/operations/troubleshooting-vault)
 - [The plugin's code](https://github.com/hashicorp/vault-plugin-auth-kerberos)
 
 The Vault Kerberos library has a working integration test environment that
@@ -231,5 +231,5 @@ client.
 ## API
 
 The Kerberos auth method has a full HTTP API. Please see the
-[Kerberos auth method API](/vault/api-docs/auth/kerberos) for more
+[Kerberos auth method API](/api-docs/auth/kerberos) for more
 details.
diff --git a/website/content/docs/auth/kubernetes.mdx b/website/content/docs/auth/kubernetes.mdx
index 9e44d28e24301..0643cd6f03307 100644
--- a/website/content/docs/auth/kubernetes.mdx
+++ b/website/content/docs/auth/kubernetes.mdx
@@ -83,7 +83,7 @@ management tool.
 1. Use the `/config` endpoint to configure Vault to talk to Kubernetes. Use
   `kubectl cluster-info` to validate the Kubernetes host address and TCP port.
   For the list of available configuration options, please see the
-  [API documentation](/vault/api-docs/auth/kubernetes).
+  [API documentation](/api-docs/auth/kubernetes).
 
   ```bash
   vault write auth/kubernetes/config \
@@ -94,7 +94,7 @@ management tool.
 
   !> **Note:** The pattern Vault uses to authenticate Pods depends on sharing
   the JWT token over the network. Given the [security model of
-  Vault](/vault/docs/internals/security), this is allowable because Vault is
+  Vault](/docs/internals/security), this is allowable because Vault is
   part of the trusted compute base. In general, Kubernetes applications should
   **not** share this JWT with other applications, as it allows API calls to be
   made on behalf of the Pod and can result in unintended access being granted
@@ -114,7 +114,7 @@ management tool.
   namespace and it gives it the default policy.
 
   For the complete list of configuration options, please see the [API
-  documentation](/vault/api-docs/auth/kubernetes).
+  documentation](/api-docs/auth/kubernetes).
 
 ## Kubernetes 1.21
 
@@ -127,7 +127,7 @@ Kubernetes auth:
 * The value of the JWT's `"iss"` claim depends on the cluster's configuration.
 
 The changes to token lifetime are important when configuring the
-[`token_reviewer_jwt`](/vault/api-docs/auth/kubernetes#token_reviewer_jwt) option.
+[`token_reviewer_jwt`](/api-docs/auth/kubernetes#token_reviewer_jwt) option.
 If a short-lived token is used,
 Kubernetes will revoke it as soon as the pod or service account are deleted, or
 if the expiry time passes, and Vault will no longer be able to use the
@@ -166,7 +166,7 @@ injected service account tokens to a year to help smooth the transition to
 short-lived tokens. If you would like to disable this, set
 [--service-account-extend-token-expiration=false][k8s-extended-tokens] for
 `kube-apiserver` or specify your own `serviceAccountToken` volume mount. See
-[here](/vault/docs/auth/jwt/oidc-providers/kubernetes#specifying-ttl-and-audience) for an example.
+[here](/docs/auth/jwt/oidc-providers/kubernetes#specifying-ttl-and-audience) for an example.
 
 [k8s-extended-tokens]: https://kubernetes.io/docs/reference/command-line-tools-reference/kube-apiserver/#options
 
@@ -239,7 +239,7 @@ JWT tokens Kubernetes generates can also be verified using Kubernetes as an OIDC
 provider. The JWT auth method documentation has [instructions][k8s-jwt-auth] for
 setting up JWT auth with Kubernetes as the OIDC provider.
 
-[k8s-jwt-auth]: /vault/docs/auth/jwt/oidc-providers/kubernetes
+[k8s-jwt-auth]: /docs/auth/jwt/oidc-providers/kubernetes
 
 This solution allows you to use short-lived tokens for all clients and removes
 the need for a reviewer JWT. However, the client tokens cannot be revoked before
@@ -256,7 +256,7 @@ value, but `disable_iss_validation=true` is the new recommended value for all
 versions of Vault.
 
 Kubernetes 1.21+ clusters may require setting the service account
-[`issuer`](/vault/api-docs/auth/kubernetes#issuer) to the same value as
+[`issuer`](/api-docs/auth/kubernetes#issuer) to the same value as
 `kube-apiserver`'s `--service-account-issuer` flag. This is because the service
 account JWTs for these clusters may have an issuer specific to the cluster
 itself, instead of the old default of `kubernetes/serviceaccount`. If you are
@@ -318,7 +318,7 @@ subjects:
 ## API
 
 The Kubernetes Auth Plugin has a full HTTP API. Please see the
-[API docs](/vault/api-docs/auth/kubernetes) for more details.
+[API docs](/api-docs/auth/kubernetes) for more details.
 
 [k8s-tokenreview]: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.22/#tokenreview-v1-authentication-k8s-io
 
@@ -339,7 +339,7 @@ import (
 	"os"
 
 	vault "github.com/hashicorp/vault/api"
-	auth "github.com/hashicorp/vault/api/auth/kubernetes"
+  auth "github.com/hashicorp/vault/api/auth/kubernetes"
 )
 
 // Fetches a key-value secret (kv-v2) after authenticating to Vault with a Kubernetes service account.
diff --git a/website/content/docs/auth/ldap.mdx b/website/content/docs/auth/ldap.mdx
index 1e515d48058fe..9cb4b0aa50ba1 100644
--- a/website/content/docs/auth/ldap.mdx
+++ b/website/content/docs/auth/ldap.mdx
@@ -133,10 +133,6 @@ There are two alternate methods of resolving the user object used to authenticat
 
 @include 'ldap-auth-userfilter-warning.mdx'
 
-#### Alias Dereferencing
-
-- `dereference_aliases` (string, optional) - Control how aliases are dereferenced when performing the search. Possible values are: `never`, `finding`, `searching`, and `always`. `finding` will only dereference aliases during name resolution of the base. `searching` will dereference aliases after name resolution.
-
 #### Binding - User Principal Name (AD)
 
 - `upndomain` (string, optional) - userPrincipalDomain used to construct the UPN string for the authenticating user. The constructed UPN will appear as `[username]@UPNDomain`. Example: `example.com`, which will cause vault to bind as `username@example.com`.
@@ -273,5 +269,5 @@ It should be noted that user -> policy mapping happens at token creation time. A
 ## API
 
 The LDAP auth method has a full HTTP API. Please see the
-[LDAP auth method API](/vault/api-docs/auth/ldap) for more
+[LDAP auth method API](/api-docs/auth/ldap) for more
 details.
diff --git a/website/content/docs/auth/login-mfa/faq.mdx b/website/content/docs/auth/login-mfa/faq.mdx
index f3a5df958ac7e..c6f6324f8ec16 100644
--- a/website/content/docs/auth/login-mfa/faq.mdx
+++ b/website/content/docs/auth/login-mfa/faq.mdx
@@ -26,7 +26,7 @@ This FAQ section contains frequently asked questions about the Login MFA feature
 
 Vault supports Step-up Enterprise MFA as part of our Enterprise edition. The Step-up Enterprise MFA provides MFA on login, or for step-up access to sensitive resources in Vault using ACL and Sentinel policies, and is configurable through the CLI/API.
 
-Starting with Vault version 1.10, Vault OSS provides [MFA on login](/vault/docs/auth/login-mfa) only. This is also available with Vault Enterprise and configurable through the CLI/API.
+Starting with Vault version 1.10, Vault OSS provides [MFA on login](/docs/auth/login-mfa) only. This is also available with Vault Enterprise and configurable through the CLI/API.
 
 The Step-up Enterprise MFA will co-exist with the newly introduced Login MFA starting with Vault version 1.10.
 
@@ -34,15 +34,15 @@ The Step-up Enterprise MFA will co-exist with the newly introduced Login MFA sta
 
 | MFA workflow                                   | What does it do?                                                                                                                                                                                                                                                                                    | Who manages the MFA?              | OSS vs. Enterprise Support    |
 | ---------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------- | ----------------------------- |
-| [Login MFA](/vault/docs/auth/login-mfa)              | MFA in Vault OSS provides MFA on login. CLI, API, and UI-based login are supported.                                                                                                                                                                                                                 | MFA is managed by Vault           | Supported in Vault OSS        |
-| [Okta Auth MFA](/vault/docs/auth/okta#mfa)           | This is MFA as part of [Okta Auth method](/vault/docs/auth/okta) in Vault OSS, where MFA is enforced by Okta on login. MFA must be satisfied for authentication to be successful. This is different from the Okta MFA method used with Login MFA and Step-up Enterprise MFA. CLI/API login are supported. | MFA is managed externally by Okta | Supported in Vault OSS        |
-| [Step-up Enterprise MFA](/vault/docs/enterprise/mfa) | MFA in Vault Enterprise provides MFA for login and for step-up access to sensitive resources in Vault. Supports CLI/API based login, and ACL/Sentinel policies.                                                                                                                                     | MFA is managed by Vault           | Supported in Vault Enterprise |
+| [Login MFA](/docs/auth/login-mfa)              | MFA in Vault OSS provides MFA on login. CLI, API, and UI-based login are supported.                                                                                                                                                                                                                 | MFA is managed by Vault           | Supported in Vault OSS        |
+| [Okta Auth MFA](/docs/auth/okta#mfa)           | This is MFA as part of [Okta Auth method](/docs/auth/okta) in Vault OSS, where MFA is enforced by Okta on login. MFA must be satisfied for authentication to be successful. This is different from the Okta MFA method used with Login MFA and Step-up Enterprise MFA. CLI/API login are supported. | MFA is managed externally by Okta | Supported in Vault OSS        |
+| [Step-up Enterprise MFA](/docs/enterprise/mfa) | MFA in Vault Enterprise provides MFA for login and for step-up access to sensitive resources in Vault. Supports CLI/API based login, and ACL/Sentinel policies.                                                                                                                                     | MFA is managed by Vault           | Supported in Vault Enterprise |
 
-~> **Note**: [The Legacy MFA](/vault/docs/v1.10.x/auth/mfa) is a **deprecated** MFA workflow in Vault OSS. Refer [here](#q-what-is-the-legacy-mfa-feature) for more details.
+~> **Note**: [The Legacy MFA](/docs/auth/mfa) is a **deprecated** MFA workflow in Vault OSS. Refer [here](#q-what-is-the-legacy-mfa-feature) for more details.
 
 ### Q: What is the Legacy MFA feature?
 
-[Legacy MFA](/vault/docs/v1.10.x/auth/mfa) is functionality that was available in Vault OSS, prior to introducing MFA in the Enterprise version. This is now a deprecated feature. Please see the [Vault Feature Deprecation Notice and Plans](/vault/docs/deprecation) for detailed product plans around deprecated features. We plan to remove Legacy MFA in 1.11.
+[Legacy MFA](/docs/auth/mfa) is functionality that was available in Vault OSS, prior to introducing MFA in the Enterprise version. This is now a deprecated feature. Please see the [Vault Feature Deprecation Notice and Plans](/docs/deprecation) for detailed product plans around deprecated features. We plan to remove Legacy MFA in 1.11.
 
 ### Q: Will HCP Vault support MFA?
 
@@ -61,7 +61,7 @@ If the configured MFA methods, such as PingID, Okta, or Duo, do not require a pa
 
 ### Q: Are there new MFA API endpoints introduced as part of the new Vault version 1.10 MFA for login functionality?
 
-Yes, this feature adds the following new MFA configuration endpoints: `identity/mfa/method`, `identity/mfa/login-enforcement`, and `sys/mfa/validate`. Refer to the [documentation](/vault/api-docs/secret/identity/mfa/duo) for more details.
+Yes, this feature adds the following new MFA configuration endpoints: `identity/mfa/method`, `identity/mfa/login-enforcement`, and `sys/mfa/validate`. Refer to the [documentation](/api-docs/secret/identity/mfa/duo) for more details.
 
 ### Q: How do MFA configurations differ between the Login MFA and Step-up Enterprise MFA?
 
@@ -72,7 +72,7 @@ All MFA methods supported with the Step-up Enterprise MFA are supported with the
 
 There are also two differences in how methods are defined in the two systems.
 The Step-up Enterprise MFA expects the method creator to specify a name for the method; Login MFA does not, and instead returns an ID when a method is created.
-The Step-up Enterprise MFA uses the combination of mount accessors plus a `username_format` template string, whereas in Login MFA, these are combined into a single field `username_format`, which uses the same identity [templating format](/vault/docs/concepts/policies#templated-policies) as used in policies.
+The Step-up Enterprise MFA uses the combination of mount accessors plus a `username_format` template string, whereas in Login MFA, these are combined into a single field `username_format`, which uses the same identity [templating format](/docs/concepts/policies#templated-policies) as used in policies.
 
 ### Q: What are the ways to configure the various MFA workflows?
 
@@ -86,13 +86,13 @@ The Step-up Enterprise MFA uses the combination of mount accessors plus a `usern
 
 | MFA workflow                                   | UI        | CLI/API                                                                                                                                   | Single-Phase                | Two-Phase                   |
 | ---------------------------------------------- | --------- | ----------------------------------------------------------------------------------------------------------------------------------------- | --------------------------- | --------------------------- |
-| [Login MFA](/vault/docs/auth/login-mfa)              | Supported | Supported. You can select single-phase MFA by supplying the X-Vault-MFA header. In the absence of this header, the Two- Phase MFA is used | N/A                         | Supported                   |
-| [Okta Auth MFA](/vault/docs/auth/okta)               | N/A       | N/A                                                                                                                                       | MFA is not managed by Vault | MFA is not managed by Vault |
-| [Step-up Enterprise MFA](/vault/docs/enterprise/mfa) | N/A       | Supported                                                                                                                                 | Supported                   | N/A                         |
+| [Login MFA](/docs/auth/login-mfa)              | Supported | Supported. You can select single-phase MFA by supplying the X-Vault-MFA header. In the absence of this header, the Two- Phase MFA is used | N/A                         | Supported                   |
+| [Okta Auth MFA](/docs/auth/okta)               | N/A       | N/A                                                                                                                                       | MFA is not managed by Vault | MFA is not managed by Vault |
+| [Step-up Enterprise MFA](/docs/enterprise/mfa) | N/A       | Supported                                                                                                                                 | Supported                   | N/A                         |
 
 ### Q: Are namespaces supported with the MFA workflows that Vault has as of Vault version 1.10?
 
-The Step-up Enterprise MFA configurations can only be configured in the root [namespace](/vault/docs/enterprise/mfa#namespaces), although they can be referenced in other namespaces via the policies.
+The Step-up Enterprise MFA configurations can only be configured in the root [namespace](/docs/enterprise/mfa#namespaces), although they can be referenced in other namespaces via the policies.
 The Login MFA supports namespaces awareness. Users will need a Vault Enterprise license to user or configure Login MFA with namespaces. MFA method configurations can be defined per namespace with Login MFA, and used in enforcements defined in that namespace and its children. Everything operates in the root namespace in Vault OSS. MFA login enforcements can also be defined per namespace, and applied to that namespace and its children.
 
 ### Q: I use the Vault Agent. Does MFA pose any challenges for me?
@@ -101,7 +101,7 @@ The Vault Agent should not use MFA to authenticate to Vault; it should be able t
 
 ### Q: I am a Step-up Enterprise MFA user using MFA for login. Should I migrate to the new Login MFA?
 
-If you are currently using Enterprise MFA, evaluate your MFA specific use cases to determine whether or not you should migrate to [Login MFA](/vault/docs/auth/login-mfa).
+If you are currently using Enterprise MFA, evaluate your MFA specific use cases to determine whether or not you should migrate to [Login MFA](/docs/auth/login-mfa).
 
 Here are some considerations:
 
@@ -118,6 +118,6 @@ If you wish to migrate to Login MFA, follow these steps and guidelines to migrat
 
    -the new endpoints yield an ID instead of allowing you to define a name
 
-   -the new non-TOTP endpoints have a username_format field instead of username_format+mount_accessor fields; see [Templated Policies](/vault/docs/concepts/policies#templated-policies) for the username_format format.
+   -the new non-TOTP endpoints have a username_format field instead of username_format+mount_accessor fields; see [Templated Policies](/docs/concepts/policies#templated-policies) for the username_format format.
 
 1. Instead of writing sentinel EGP rules to require that logins use MFA, use the `identity/mfa/login_enforcement` endpoint to specify the MFA methods.
diff --git a/website/content/docs/auth/login-mfa/index.mdx b/website/content/docs/auth/login-mfa/index.mdx
index 6b279365582ff..835354c75c08d 100644
--- a/website/content/docs/auth/login-mfa/index.mdx
+++ b/website/content/docs/auth/login-mfa/index.mdx
@@ -10,7 +10,7 @@ description: |-
 
 Vault supports Multi-factor Authentication (MFA) for authenticating to
 an auth method using different authentication types. We use the term `Login MFA` to distinguish
-this feature and the [Vault Enterprise MFA](/vault/docs/enterprise/mfa).
+this feature and the [Vault Enterprise MFA](/docs/enterprise/mfa).
 Login MFA is built on top of the Identity system of Vault.
 
 ## MFA Types
@@ -40,15 +40,15 @@ MFA in Vault includes the following login types:
 ## Login MFA Procedure
 
 ~> **NOTE:** Vault's built-in Login MFA feature does not protect against brute forcing of
-TOTP passcodes by default. We recommend that per-client [rate limits](/vault/docs/concepts/resource-quotas)
+TOTP passcodes by default. We recommend that per-client [rate limits](/docs/concepts/resource-quotas)
 are applied to the relevant login and/or mfa paths (e.g. `/sys/mfa/validate`). External MFA
 methods (`Duo`, `Ping` and `Okta`) may already provide configurable rate limiting. Rate limiting of
 Login MFA paths are enforced by default in Vault 1.10.1 and above.
 
 Login MFA can be configured to secure further authenticating to an auth method. To enable login
-MFA, an MFA method needs to be configured. Please see [Login MFA API](/vault/api-docs/secret/identity/mfa) for details
+MFA, an MFA method needs to be configured. Please see [Login MFA API](/api-docs/secret/identity/mfa) for details
 on how to configure an MFA method. Once an MFA method is configured, an operator can configure an MFA enforcement using the returned unique MFA method ID.
-Please see [Login MFA Enforcement API](/vault/api-docs/secret/identity/mfa/login-enforcement)
+Please see [Login MFA Enforcement API](/api-docs/secret/identity/mfa/login-enforcement)
 for details on how to configure an MFA enforcement config. MFA could be enforced for an entity, a group of
 entities, a specific auth method accessor, or an auth method type. A login request that matches
 any MFA enforcement restrictions is subject to further MFA validation,
@@ -62,10 +62,8 @@ In the Single-phase login, the required MFA information is embedded in a login r
 the `X-Vault-MFA` header. In this case, the MFA validation is done
 as a part of the login request.
 
-MFA credentials are retrieved from the `X-Vault-MFA` HTTP header. Before Vault 1.13.0, the format of
-the header is `mfa_method_id[:passcode]` for TOTP, Okta, and PingID. However, for Duo, it is `mfa_method_id[:passcode=<passcode>]`.
-The item in the `[]` is optional. From Vault 1.13.0, the format is consistent for all supported MFA methods, and one can use either of the above two formats.
-If there are multiple MFA methods that need to be validated, a user can pass in multiple `X-Vault-MFA` HTTP headers.
+MFA credentials are retrieved from the `X-Vault-MFA` HTTP header. The format of
+the header is `mfa_method_id[:passcode]`. The item in the `[]` is optional. If there are multiple MFA methods that need to be validated, a user can pass in multiple `X-Vault-MFA` HTTP headers.
 
 #### Sample Request
 
@@ -85,27 +83,6 @@ If an MFA method does not require a passcode, the login request MFA header only
      http://127.0.0.1:8200/v1/auth/userpass/login/alice
 ```
 
-Starting in Vault 1.13.0, an operator can configure a name for an MFA method.
-This name should be unique in the namespace in which the MFA method is configured.
-The MFA method name can be used in the MFA header.
-
-```shell-session
-$ curl \
-    --header "X-Vault-Token: ..." \
-    --header "X-Vault-MFA: sample_mfa_method_name:695452" \
-    http://127.0.0.1:8200/v1/auth/userpass/login/alice
-```
-
-In cases where the MFA method is configured in a specific namespace, the MFA method name should be prefixed with the namespace path.
-Below shows an example where an MFA method is configured in `ns1`.
-
-```shell-session
-$ curl \
-    --header "X-Vault-Token: ..." \
-    --header "X-Vault-MFA: ns1/sample_mfa_method_name:695452" \
-    http://127.0.0.1:8200/v1/auth/userpass/login/alice
-```
-
 ### Two-Phase Login
 
 The more conventional and prevalent MFA method is a two-request mechanism, also referred to as Two-phase Login MFA.
@@ -148,8 +125,7 @@ note that this can affect the login response on any auth mount protected by MFA
             {
               "type": "totp",
               "id": "820997b3-110e-c251-7e8b-ff4aa428a6e1",
-              "uses_passcode": true,
-              "name": "sample_mfa_method_name",
+              "uses_passcode": true
             }
           ]
         }
@@ -161,10 +137,10 @@ note that this can affect the login response on any auth mount protected by MFA
 
 Note that the `uses_passcode` boolean value will always show true for TOTP, and false for Okta and PingID.
 For Duo method, the value can be configured as part of the method configuration, using the `use_passcode` parameter.
-Please see [Duo API](/vault/api-docs/secret/identity/mfa/duo) for details
+Please see [Duo API](/api-docs/secret/identity/mfa/duo) for details
 on how to configure the boolean value for Duo.
 
-To validate the MFA restricted login request, the user sends a second request to the [validate](/vault/api-docs/system/mfa/validate)
+To validate the MFA restricted login request, the user sends a second request to the [validate](/api-docs/system/mfa/validate)
 endpoint including the MFA request ID and MFA payload. MFA payload contains a map of methodIDs and their associated credentials.
 If the configured MFA methods, such as PingID, Okta, and Duo, do not require a passcode, the associated
 credentials will be a list with one empty string.
@@ -180,17 +156,6 @@ credentials will be a list with one empty string.
 }
 ```
 
-If an MFA method is configured in a namespace, the MFA method name prefixed with the namespace path can be used in the validation payload.
-
-```json
-{
-  "mfa_request_id": "5879c74a-1418-1948-7be9-97b209d693a7",
-  "mfa_payload": {
-    "ns1/sample_mfa_method_name": ["910201"]
-  }
-}
-```
-
 #### Sample Request
 
 ```shell-session
@@ -224,7 +189,7 @@ To disable the interactive login experience, a user needs to pass in the `non-in
 $ vault write -non-interactive sys/mfa/validate -format=json @payload.json
 ```
 
-To get started with Login MFA, refer to the [Login MFA](/vault/tutorials/auth-methods/multi-factor-authentication) tutorial.
+To get started with Login MFA, refer to the [Login MFA](https://learn.hashicorp.com/tutorials/vault/multi-factor-authentication) tutorial.
 
 
 ### TOTP Passcode Validation Rate Limit
diff --git a/website/content/docs/auth/oci.mdx b/website/content/docs/auth/oci.mdx
index 02fbc9ac5882f..07f806814f6aa 100644
--- a/website/content/docs/auth/oci.mdx
+++ b/website/content/docs/auth/oci.mdx
@@ -45,122 +45,104 @@ Follow the steps below to add policies to your tenancy that allow the OCI comput
 1. Add the OCID of the compute instance(s) to the dynamic group.
 1. Add the following policies to the root compartment of your tenancy that allow the dynamic group to call specific Identity APIs.
 
-   ```plaintext
-   allow dynamic-group VaultDynamicGroup to {AUTHENTICATION_INSPECT} in tenancy
-   allow dynamic-group VaultDynamicGroup to {GROUP_MEMBERSHIP_INSPECT} in tenancy
-   ```
+```
+    allow dynamic-group VaultDynamicGroup to {AUTHENTICATION_INSPECT} in tenancy
+    allow dynamic-group VaultDynamicGroup to {GROUP_MEMBERSHIP_INSPECT} in tenancy
+```
 
 ### Configure the OCI Auth method
 
-First, enable the OCI Auth method.
+- Configure your home tenancy in the Vault, so that only users or instances from your tenancy will
+  be allowed to log into Vault through the OCI Auth method. Create a file named hometenancyid.json with
+  the below content, using the tenancy OCID. To find your tenancy OCID, see [https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm).
 
-```shell-session
-$ vault auth enable oci
+```json
+{ "home_tenancy_id": "your tenancy ocid here" }
 ```
 
-Then, configure your home tenancy in the Vault, so that only users or instances from your tenancy will be allowed to log into Vault through the OCI Auth method. 
-  
-1. Create a file named `hometenancyid.json` with the below content using the
-   tenancy OCID. To find your tenancy OCID, see
-  the [Oracle Cloud IDs documentation](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm).
-
-   ```json
-   { "home_tenancy_id": "your tenancy ocid here" }
-   ```
+- Configure the home_tenancy_id parameter in the Vault.
 
-1. Configure the `home_tenancy_id` parameter in the Vault.
-
-   ```shell-session
-   $ curl --header "X-Vault-Token: $roottoken" --request POST \
-      --data @hometenancyid.json \
-      http://127.0.0.1:8200/v1/auth/oci/config (127.0.0.1:8200/v1/auth/oci/config)
-   ```
+```sh
+    curl --header "X-Vault-Token: $roottoken" --request POST \
+    --data @hometenancyid.json \
+    http://127.0.0.1:8200/v1/auth/oci/config (127.0.0.1:8200/v1/auth/oci/config)
+```
 
-Continue by creating a Vault administrator role in the OCI Auth method. The `vaultadminrole` allows the administrator of Vault to log into Vault and grants them the permissions allowed in the policy.
+- Create a Vault administrator role in the OCI Auth method. The vaultadminrole allows the
+  administrator of Vault to log into Vault and grants them the permissions allowed in the policy.
 
-1. Create a file named `vaultadminrole.json` with the below contents. Replace the `ocid_list` with the
+Create a file named vaultadminrole.json with the below contents. Replace the ocid_list with the
 Group or Dynamic Group OCIDs in your tenancy that has users or instances that you want to take the Vault admin role.
 
-   - For testing in dev mode, you can add the OCID of the dynamic group previously created.
-   - In production, add only the OCID of groups and dynamic groups that can take the admin role in Vault.
-
-      ```json
-      {
-         "token_policies": "vaultadminpolicy",
-         "token_ttl": "1800",
-         "ocid_list": "ocid1.group.oc1..aaaaaaaaiqnblimpvmegkqh3bxilrdvjobr7qd223g275idcqhexamplefq,ocid1.dynamicgroup.oc1..aaaaaaaa5hmfyrdaxvmt52ekju5n7ffamn2pdvxaq6esb2vzzoduexamplea"
-      }
-      ```
-
-1. Create the Vault admin role:
+- For testing in dev mode, you can add the OCID of the dynamic group previously created.
+- In production, add only the OCID of groups and dynamic groups that can take the admin role in Vault.
 
-   ```shell-session
-   $ curl --header "X-Vault-Token: $roottoken" --request POST \
-      --data @vaultadminrole.json \
-      http://127.0.0.1:8200/v1/auth/oci/role/vaultadminrole (127.0.0.1:8200/v1/auth/oci/role/vaultadminrole)
-   ```
-
-### Log in to Vault using OCI Auth
-
-As a result of both methods described below, you will get a response that includes a token with the previously added policy.
-
-You can use the received token to read or write secrets, and add roles per the instructions in [/docs/secrets/kv/kv-v1](/vault/docs/secrets/kv/kv-v1).
-
-For both methods to work:
-- The VAULT_ADDR export has to be specified, as shown earlier in this page; when testing in dev mode in the same compute instance that the Vault is running on, this is [http://127.0.0.1:8200](http://127.0.0.1:8200/).
+```json
+{
+  "token_policies": "vaultadminpolicy",
+  "token_ttl": "1800",
+  "ocid_list": "ocid1.group.oc1..aaaaaaaaiqnblimpvmegkqh3bxilrdvjobr7qd223g275idcqhexamplefq,ocid1.dynamicgroup.oc1..aaaaaaaa5hmfyrdaxvmt52ekju5n7ffamn2pdvxaq6esb2vzzoduexamplea"
+}
+```
 
-#### Log in with instance principals
+Create the Vault admin role:
 
-```shell-session
-$ vault login -method=oci auth_type=instance role=vaultadminrole
+```sh
+    curl --header "X-Vault-Token: $roottoken" --request POST \
+    --data @vaultadminrole.json \
+    http://127.0.0.1:8200/v1/auth/oci/role/vaultadminrole (127.0.0.1:8200/v1/auth/oci/role/vaultadminrole)
 ```
 
-This assumes that the compute instance that you are logging in from should be a part of a dynamic group that was added to the Vault admin role. If logging on from a different compute instance than the one on which Vault is running on, the compute should have connectivity to the endpoint specified in VAULT_ADDR. 
-
-#### Log in with an API key
+1.  Log into the Vault using instance principal.
+    - This assumes that the VAULT_ADDR export has been specified, as shown earlier in this page.
+    - The compute instance that you are logging in from should be a part of a dynamic group that was added to the Vault admin role. The compute instance should also have connectivity to the endpoint specified in VAULT_ADDR.
+    - When testing in dev mode in the same compute instance that the Vault is running, this is [http://127.0.0.1:8200](http://127.0.0.1:8200/).
+      `vault login -method=oci auth_type=instance role=vaultadminrole`
 
-```shell-session
-$ vault login -method=oci auth_type=apikey role=vaultadminrole
-```
+You will see a response that includes a token with the previously added policy.
 
-This assumes you have an OCI API key.
+1.  Use the received token to read secrets, writer secrets, and add roles per the instructions in [/docs/secrets/kv/kv-v1](/docs/secrets/kv/kv-v1).
+1.  Log into Vault using the user API key.
 
-If you don't have an API key:
+    - [Add an API Key](https://docs.cloud.oracle.com/iaas/Content/API/Concepts/apisigningkey.htm) for a user in the console. This user should be part of a group that has previously been added to the Vault admin role.
+    - Create the config file `~/.oci/config` using the user's credentials as detailed in [https://docs.cloud.oracle.com/iaas/Content/API/Concepts/sdkconfig.htm](https://docs.cloud.oracle.com/iaas/Content/API/Concepts/sdkconfig.htm).
+      Ensure that the region in the config matches the region of the compute instance that is running Vault.
+    - Log into Vault using the user API key.
 
-1. [Add an API Key](https://docs.cloud.oracle.com/iaas/Content/API/Concepts/apisigningkey.htm) for a user in the console. This user should be part of a group that has previously been added to the Vault admin role.
-1. Create the config file `~/.oci/config` using the user's credentials as detailed in [https://docs.cloud.oracle.com/iaas/Content/API/Concepts/sdkconfig.htm](https://docs.cloud.oracle.com/iaas/Content/API/Concepts/sdkconfig.htm).
-1. Ensure that the region in the config matches the region of the compute instance that is running Vault.
+      `vault login -method=oci auth_type=apikey role=vaultadminrole`
 
+1.  Stop Vault and re-start it in the production environment. See [the configuration docs](/docs/configuration/) for more information.
+1.  Repeat all steps in this [Configure the OCI Auth Method](#configure-the-oci-auth-method) section while in the production environment.
 
 ### Manage Roles in the OCI Auth method
 
 1.  Similar to creating the Vault administrator role, create other roles mapped to other policies. Create a file named devrole.json with the following contents. Replace ocid_list with Groups or Dynamic Groups in your tenancy.
 
-   ```json
-   {
-   "token_policies": "devpolicy",
-   "token_ttl": "1500",
-   "ocid_list": "ocid1.group.oc1..aaaaaaaaiqnblimpvmgrouplrdvjobr7qd223g275idcqhexamplefq,ocid1.dynamicgroup.oc1..aaaaaaaa5hmfyrdaxvmdg2u5n7ffamn2pdvxaq6esb2vzzoduexamplea"
-   }
-   ```
+```json
+{
+  "token_policies": "devpolicy",
+  "token_ttl": "1500",
+  "ocid_list": "ocid1.group.oc1..aaaaaaaaiqnblimpvmgrouplrdvjobr7qd223g275idcqhexamplefq,ocid1.dynamicgroup.oc1..aaaaaaaa5hmfyrdaxvmdg2u5n7ffamn2pdvxaq6esb2vzzoduexamplea"
+}
+```
 
-2.  Add the role.
+1.  Add the role.
 
-   ```shell-session
-   $ curl --header "X-Vault-Token: $token" --request POST \
-      --data @devrole.json \
-      http://127.0.0.1:8200/v1/auth/oci/role/devrole (127.0.0.1:8200/v1/auth/oci/role/devrole)
-   ```
+```sh
+curl --header "X-Vault-Token: $token" --request POST \
+--data @devrole.json \
+http://127.0.0.1:8200/v1/auth/oci/role/devrole (127.0.0.1:8200/v1/auth/oci/role/devrole)
+```
 
-3.  Login to Vault assuming the devrole.
+1.  Login to Vault assuming the devrole.
 
-   ```shell-session
-   $ vault login -method=oci auth_type=instance role=devrole
-   ```
+```sh
+vault login -method=oci auth_type=instance role=vaultadminrole`
+```
 
 ## Authentication
 
-You can authenticate with the Vault CLI or by communicating with the API directly.
+When authenticating, users can use Vault cli.
 
 ### Via the CLI
 
@@ -170,7 +152,7 @@ With Compute Instance credentials:
 $ vault login -method=oci auth_type=instance role=devrole
 ```
 
-With User credentials ([SDK configuration](https://docs.cloud.oracle.com/iaas/Content/API/Concepts/sdkconfig.htm)):
+With User credentials: [SDK Config](https://docs.cloud.oracle.com/iaas/Content/API/Concepts/sdkconfig.htm)
 
 ```shell-session
 $ vault login -method=oci auth_type=apikey role=devrole
@@ -178,57 +160,43 @@ $ vault login -method=oci auth_type=apikey role=devrole
 
 ### Via the API
 
-1.  Sign the following request with your OCI credentials and obtain the signing string and the authorization header. Replace the endpoint, scheme (http or https) & role of the URL corresponding to your Vault configuration. For more information on signing, see [signing the request](https://docs.cloud.oracle.com/iaas/Content/API/Concepts/signingrequests.htm).
+1.  First, sign the following request with your OCI credentials and obtain the signing string and the authorization header. Replace the endpoint, scheme (http or https) & role of the URL corresponding to your vault configuration. For more information on signing, see [signing the request](https://docs.cloud.oracle.com/iaas/Content/API/Concepts/signingrequests.htm).
 
     http://127.0.0.1/v1/auth/oci/login/devrole
 
-1.  On signing the above request, you will get the following headers.
-
-   The signing string (line breaks inserted into the (request-target) header for easier reading):
-
-   <CodeBlockConfig hideClipboard>
+1.  On signing the above request, you would get headers similar to:
 
-   ```text
-   date: Fri, 22 Aug 2019 21:02:19 GMT
-   (request-target): get /v1/auth/oci/login/devrole
-   host: 127.0.0.1
-   ```
+The signing string would look like (line breaks inserted into the (request-target) header for easier reading):
 
-   </CodeBlockConfig>
+```text
+date: Fri, 22 Aug 2019 21:02:19 GMT
+(request-target): get /v1/auth/oci/login/devrole
+host: 127.0.0.1
 
-   The Authorization header:
+The Authorization header would look like:
 
-   <CodeBlockConfig hideClipboard>
-
-   ```text
-   Signature version="1",headers="date (request-target) host",keyId="ocid1.t
-   enancy.oc1..aaaaaaaaba3pv6wkcr4jqae5f15p2b2m2yt2j6rx32uzr4h25vqstifsfdsq/
-   ocid1.user.oc1..aaaaaaaat5nvwcna5j6aqzjcaty5eqbb6qt2jvpkanghtgdaqedqw3ryn
-   jq/73:61:a2:21:67:e0:df:be:7e:4b:93:1e:15:98:a5:b7",algorithm="rsa-sha256
-   ",signature="GBas7grhyrhSKHP6AVIj/h5/Vp8bd/peM79H9Wv8kjoaCivujVXlpbKLjMPe
-   DUhxkFIWtTtLBj3sUzaFj34XE6YZAHc9r2DmE4pMwOAy/kiITcZxa1oHPOeRheC0jP2dqbTll
-   8fmTZVwKZOKHYPtrLJIJQHJjNvxFWeHQjMaR7M="
-   ```
-
-   </CodeBlockConfig>
-
-1.  Add the signed headers to the "request_headers" field and make the actual request to Vault. For example:
-
-   <CodeBlockConfig hideClipboard>
+Signature version="1",headers="date (request-target) host",keyId="ocid1.t
+enancy.oc1..aaaaaaaaba3pv6wkcr4jqae5f15p2b2m2yt2j6rx32uzr4h25vqstifsfdsq/
+ocid1.user.oc1..aaaaaaaat5nvwcna5j6aqzjcaty5eqbb6qt2jvpkanghtgdaqedqw3ryn
+jq/73:61:a2:21:67:e0:df:be:7e:4b:93:1e:15:98:a5:b7",algorithm="rsa-sha256
+",signature="GBas7grhyrhSKHP6AVIj/h5/Vp8bd/peM79H9Wv8kjoaCivujVXlpbKLjMPe
+DUhxkFIWtTtLBj3sUzaFj34XE6YZAHc9r2DmE4pMwOAy/kiITcZxa1oHPOeRheC0jP2dqbTll
+8fmTZVwKZOKHYPtrLJIJQHJjNvxFWeHQjMaR7M="
+```
 
-   ```sh
-   POST http://127.0.0.1/v1/auth/oci/login/devrole
-      "request_headers": {
-         "date": ["Fri, 22 Aug 2019 21:02:19 GMT"],
-         "(request-target)": ["get /v1/auth/oci/login/devrole"],
-         "host": ["127.0.0.1"],
-         "content-type": ["application/json"],
-         "authorization": ["Signature algorithm=\"rsa-sha256\",headers=\"date (request-target) host\",keyId=\"ocid1.tenancy.oc1..aaaaaaaaba3pv6wkcr4jqae5f15p2b2m2yt2j6rx32uzr4h25vqstifsfdsq/ocid1.user.oc1..aaaaaaaat5nvwcna5j6aqzjcaty5eqbb6qt2jvpkanghtgdaqedqw3rynjq/73:61:a2:21:67:e0:df:be:7e:4b:93:1e:15:98:a5:b7\",signature=\"GBas7grhyrhSKHP6AVIj/h5/Vp8bd/peM79H9Wv8kjoaCivujVXlpbKLjMPeDUhxkFIWtTtLBj3sUzaFj34XE6YZAHc9r2DmE4pMwOAy/kiITcZxa1oHPOeRheC0jP2dqbTll8fmTZVwKZOKHYPtrLJIJQHJjNvxFWeHQjMaR7M=\",version=\"1\""]
-      }
-   ```
+1.  Add the signed headers to the "request_headers" field and make the actual request to vault. An example is given below:
 
-   </CodeBlockConfig>
+```sh
+POST http://127.0.0.1/v1/auth/oci/login/devrole
+   "request_headers": {
+       "date": ["Fri, 22 Aug 2019 21:02:19 GMT"],
+       "(request-target)": ["get /v1/auth/oci/login/devrole"],
+       "host": ["127.0.0.1"],
+       "content-type": ["application/json"],
+       "authorization": ["Signature algorithm=\"rsa-sha256\",headers=\"date (request-target) host\",keyId=\"ocid1.tenancy.oc1..aaaaaaaaba3pv6wkcr4jqae5f15p2b2m2yt2j6rx32uzr4h25vqstifsfdsq/ocid1.user.oc1..aaaaaaaat5nvwcna5j6aqzjcaty5eqbb6qt2jvpkanghtgdaqedqw3rynjq/73:61:a2:21:67:e0:df:be:7e:4b:93:1e:15:98:a5:b7\",signature=\"GBas7grhyrhSKHP6AVIj/h5/Vp8bd/peM79H9Wv8kjoaCivujVXlpbKLjMPeDUhxkFIWtTtLBj3sUzaFj34XE6YZAHc9r2DmE4pMwOAy/kiITcZxa1oHPOeRheC0jP2dqbTll8fmTZVwKZOKHYPtrLJIJQHJjNvxFWeHQjMaR7M=\",version=\"1\""]
+   }
+```
 
 ## API
 
-The OCI Auth method has a full HTTP API. Please see the [API docs](/vault/api-docs/auth/oci) for more details.
\ No newline at end of file
+The OCI Auth method has a full HTTP API. Please see the [API docs](/api-docs/auth/oci) for more details.
diff --git a/website/content/docs/auth/okta.mdx b/website/content/docs/auth/okta.mdx
index 56ce27e5ee3be..2cb37c903ec6b 100644
--- a/website/content/docs/auth/okta.mdx
+++ b/website/content/docs/auth/okta.mdx
@@ -12,7 +12,7 @@ The `okta` auth method allows authentication using Okta and user/password
 credentials. This allows Vault to be integrated into environments using Okta.
 
 The mapping of groups in Okta to Vault policies is managed by using the
-[users](/vault/api-docs/auth/okta#register-user) and [groups](/vault/api-docs/auth/okta#register-group)
+[users](/api-docs/auth/okta#register-user) and [groups](/api-docs/auth/okta#register-group)
 APIs.
 
 ## Authentication
@@ -75,7 +75,7 @@ It does not manage Okta [sessions](https://developer.okta.com/docs/reference/api
 users. This means that if MFA Push is configured, it will be required during both login and token renewal.
 
 Note that this MFA support is integrated with Okta Auth and is limited strictly to login
-operations. It is not related to [Enterprise MFA](/vault/docs/enterprise/mfa).
+operations. It is not related to [Enterprise MFA](https://www.vaultproject.io/docs/enterprise/mfa).
 
 ## Configuration
 
@@ -106,7 +106,7 @@ management tool.
   queried.
 
   For the complete list of configuration options, please see the
-  [API documentation](/vault/api-docs/auth/okta).
+  [API documentation](/api-docs/auth/okta).
 
 1. Map an Okta group to a Vault policy:
 
@@ -138,7 +138,7 @@ management tool.
 
 The `okta` auth method uses the [Authentication](https://developer.okta.com/docs/reference/api/authn/)
 and [User Groups](https://developer.okta.com/docs/reference/api/users/#get-user-s-groups)
-APIs to authenticate users and obtain their group membership. The [`api_token`](/vault/api-docs/auth/okta#api_token)
+APIs to authenticate users and obtain their group membership. The [`api_token`](/api-docs/auth/okta#api_token)
 provided to the auth method's configuration must have sufficient privileges to exercise
 these Okta APIs.
 
@@ -150,4 +150,4 @@ role. Custom roles may also be used to grant minimal permissions to the Okta API
 ## API
 
 The Okta auth method has a full HTTP API. Please see the
-[Okta Auth API](/vault/api-docs/auth/okta) for more details.
+[Okta Auth API](/api-docs/auth/okta) for more details.
diff --git a/website/content/docs/auth/radius.mdx b/website/content/docs/auth/radius.mdx
index a0581e7ea40ad..755a73ccad036 100644
--- a/website/content/docs/auth/radius.mdx
+++ b/website/content/docs/auth/radius.mdx
@@ -78,5 +78,5 @@ The response will contain a token at `auth.client_token`:
 ## API
 
 The RADIUS auth method has a full HTTP API. Please see the
-[RADIUS Auth API](/vault/api-docs/auth/radius) for more
+[RADIUS Auth API](/api-docs/auth/radius) for more
 details.
diff --git a/website/content/docs/auth/token.mdx b/website/content/docs/auth/token.mdx
index d743cbceaa755..491bb1d0b3dd8 100644
--- a/website/content/docs/auth/token.mdx
+++ b/website/content/docs/auth/token.mdx
@@ -17,7 +17,7 @@ The token store can also be used to bypass any other auth method:
 you can create tokens directly, as well as perform a variety of other
 operations on tokens such as renewal and revocation.
 
-Please see the [token concepts](/vault/docs/concepts/tokens) page dedicated
+Please see the [token concepts](/docs/concepts/tokens) page dedicated
 to tokens.
 
 ## Authentication
@@ -36,5 +36,5 @@ either `X-Vault-Token: <token>` or `Authorization: Bearer <token>`.
 ## API
 
 The Token auth method has a full HTTP API. Please see the
-[Token auth method API](/vault/api-docs/auth/token) for more
+[Token auth method API](/api-docs/auth/token) for more
 details.
diff --git a/website/content/docs/auth/userpass.mdx b/website/content/docs/auth/userpass.mdx
index f168ffaabb178..ae581bcc23278 100644
--- a/website/content/docs/auth/userpass.mdx
+++ b/website/content/docs/auth/userpass.mdx
@@ -65,20 +65,14 @@ management tool.
 
 1. Enable the userpass auth method:
 
-   ```shell-session
+   ```text
    $ vault auth enable userpass
    ```
-   
-   This enables the userpass auth method at `auth/userpass`. To enable it at a different path, use the `-path` flag:
-   
-   ```shell-session
-   $ vault auth enable -path=<path> userpass
-   ```
 
 1. Configure it with users that are allowed to authenticate:
 
-   ```shell-session
-   $ vault write auth/<userpass:path>/users/mitchellh \
+   ```text
+   $ vault write auth/userpass/users/mitchellh \
        password=foo \
        policies=admins
    ```
@@ -87,8 +81,7 @@ management tool.
    associated with the "admins" policy. This is the only configuration
    necessary.
 
-
 ## API
 
 The Userpass auth method has a full HTTP API. Please see the [Userpass auth
-method API](/vault/api-docs/auth/userpass) for more details.
+method API](/api-docs/auth/userpass) for more details.
diff --git a/website/content/docs/commands/agent.mdx b/website/content/docs/commands/agent.mdx
index 196fb4fe0a964..18b7005e5aebb 100644
--- a/website/content/docs/commands/agent.mdx
+++ b/website/content/docs/commands/agent.mdx
@@ -6,4 +6,4 @@ description: The "agent" command is used to start Vault Agent
 
 # agent
 
-Please see the [Vault Agent documentation page](/vault/docs/agent).
+Please see the [Vault Agent documentation page](/docs/agent).
diff --git a/website/content/docs/commands/audit/disable.mdx b/website/content/docs/commands/audit/disable.mdx
index 7950fbc626691..7a271dc1a1f48 100644
--- a/website/content/docs/commands/audit/disable.mdx
+++ b/website/content/docs/commands/audit/disable.mdx
@@ -18,10 +18,6 @@ data associated with the audit device is unaffected. For example, if you
 disabled an audit device that was logging to a file, the file would still exist
 and have stored contents.
 
-~> Note: Once an audit device is disabled, you will no longer be able to HMAC values
-for comparison with entries in the audit logs. This is true even if you re-enable
-the audit device at the same path, as a new salt will be created for hashing.
-
 ## Examples
 
 Disable the audit device enabled at "file/":
@@ -33,5 +29,5 @@ Success! Disabled audit device (if it was enabled) at: file/
 
 ## Usage
 
-There are no flags beyond the [standard set of flags](/vault/docs/commands)
+There are no flags beyond the [standard set of flags](/docs/commands)
 included on all commands.
diff --git a/website/content/docs/commands/audit/enable.mdx b/website/content/docs/commands/audit/enable.mdx
index f92d9bf0b5b8b..6f3326f64eb6d 100644
--- a/website/content/docs/commands/audit/enable.mdx
+++ b/website/content/docs/commands/audit/enable.mdx
@@ -24,12 +24,12 @@ Success! Enabled the file audit device at: file/
 ```
 
 Full configuration parameters for each audit device are available on the 
-[Audit Devices](/vault/docs/audit) page.
+[Audit Devices](/docs/audit) page.
 
 ## Usage
 
 The following flags are available in addition to the [standard set of
-flags](/vault/docs/commands) included on all commands.
+flags](/docs/commands) included on all commands.
 
 - `-description` `(string: "")` - Human-friendly description for the purpose of
   this audit device.
diff --git a/website/content/docs/commands/audit/index.mdx b/website/content/docs/commands/audit/index.mdx
index 40c7297bafd55..e492cffac6e7c 100644
--- a/website/content/docs/commands/audit/index.mdx
+++ b/website/content/docs/commands/audit/index.mdx
@@ -12,7 +12,7 @@ The `audit` command groups subcommands for interacting with Vault's audit
 devices. Users can list, enable, and disable audit devices.
 
 For more information, please see the [audit device
-documentation](/vault/docs/audit)
+documentation](/docs/audit)
 
 ## Examples
 
@@ -39,10 +39,6 @@ $ vault audit disable file/
 Success! Disabled audit device (if it was enabled) at: file/
 ```
 
-~> Note: Once an audit device is disabled, you will no longer be able to HMAC values
-for comparison with entries in the audit logs. This is true even if you re-enable
-the audit device at the same path, as a new salt will be created for hashing.
-
 ## Usage
 
 ```text
diff --git a/website/content/docs/commands/audit/list.mdx b/website/content/docs/commands/audit/list.mdx
index 327e838dff1c8..c4400d95bbd56 100644
--- a/website/content/docs/commands/audit/list.mdx
+++ b/website/content/docs/commands/audit/list.mdx
@@ -34,7 +34,7 @@ file/    file    n/a            replicated     file_path=/var/log/audit.log
 ## Usage
 
 The following flags are available in addition to the [standard set of
-flags](/vault/docs/commands) included on all commands.
+flags](/docs/commands) included on all commands.
 
 ### Output Options
 
diff --git a/website/content/docs/commands/auth/disable.mdx b/website/content/docs/commands/auth/disable.mdx
index fd451aa4652c3..41011e53b8bdc 100644
--- a/website/content/docs/commands/auth/disable.mdx
+++ b/website/content/docs/commands/auth/disable.mdx
@@ -28,5 +28,5 @@ Success! Disabled the auth method (if it existed) at: userpass/
 
 ## Usage
 
-There are no flags beyond the [standard set of flags](/vault/docs/commands)
+There are no flags beyond the [standard set of flags](/docs/commands)
 included on all commands.
diff --git a/website/content/docs/commands/auth/enable.mdx b/website/content/docs/commands/auth/enable.mdx
index f19c418d080b8..46d65b3d4da3d 100644
--- a/website/content/docs/commands/auth/enable.mdx
+++ b/website/content/docs/commands/auth/enable.mdx
@@ -17,7 +17,7 @@ auth method.
 An auth method is responsible for authenticating users or machines and assigning
 them policies and a token with which they can access Vault. Authentication is
 usually mapped to policy. Please see the [policies
-concepts](/vault/docs/concepts/policies) page for more information.
+concepts](/docs/concepts/policies) page for more information.
 
 ## Examples
 
@@ -36,17 +36,17 @@ Success! Data written to: auth/userpass/users/sethvargo
 ```
 
 For more information on the specific configuration options and paths, please see
-the [auth method](/vault/docs/auth) documentation.
+the [auth method](/docs/auth) documentation.
 
 ## Usage
 
 The following flags are available in addition to the [standard set of
-flags](/vault/docs/commands) included on all commands.
+flags](/docs/commands) included on all commands.
 
 - `-audit-non-hmac-request-keys` `(string: "")` - Key that will not be HMAC'd
   by audit devices in the request data object. Note that multiple keys may be
   specified by providing this option multiple times, each time with 1 key.
-  An example of this is provided in the [tune section](/vault/docs/commands/auth/tune).
+  An example of this is provided in the [tune section](/docs/commands/auth/tune).
 
 - `-audit-non-hmac-response-keys` `(string: "")` - Key that will not be HMAC'd
   by audit devices in the response data object. Note that multiple keys may be
@@ -55,7 +55,7 @@ flags](/vault/docs/commands) included on all commands.
 - `-default-lease-ttl` `(duration: "")` - The default lease TTL for this auth
   method. If unspecified, this defaults to the Vault server's globally
   configured default lease TTL, or a previously configured value for the auth
-  method. Uses [duration format strings](/vault/docs/concepts/duration-format).
+  method. Uses [duration format strings](/docs/concepts/duration-format).
 
 - `-passthrough-request-headers` `(string: "")` - request header values that will
   be sent to the auth method. Note that multiple keys may be
diff --git a/website/content/docs/commands/auth/help.mdx b/website/content/docs/commands/auth/help.mdx
index 3bb4adb736be6..610e188566cbb 100644
--- a/website/content/docs/commands/auth/help.mdx
+++ b/website/content/docs/commands/auth/help.mdx
@@ -39,5 +39,5 @@ $ vault auth help my-method/
 
 ## Usage
 
-There are no flags beyond the [standard set of flags](/vault/docs/commands)
+There are no flags beyond the [standard set of flags](/docs/commands)
 included on all commands.
diff --git a/website/content/docs/commands/auth/index.mdx b/website/content/docs/commands/auth/index.mdx
index 5e7d73a7bc203..eec90c7388a73 100644
--- a/website/content/docs/commands/auth/index.mdx
+++ b/website/content/docs/commands/auth/index.mdx
@@ -13,10 +13,10 @@ The `auth` command groups subcommands for interacting with Vault's auth methods.
 Users can list, enable, disable, and get help for different auth methods.
 
 For more information, please see the [auth method
-documentation](/vault/docs/auth) or the [authentication
-concepts](/vault/docs/concepts/auth) page.
+documentation](/docs/auth) or the [authentication
+concepts](/docs/concepts/auth) page.
 
-To authenticate to Vault as a user or machine, use the [`vault login`](/vault/docs/commands/login) command instead. This command is for
+To authenticate to Vault as a user or machine, use the [`vault login`](/docs/commands/login) command instead. This command is for
 interacting with the auth methods themselves, not authenticating to Vault.
 
 ## Examples
diff --git a/website/content/docs/commands/auth/list.mdx b/website/content/docs/commands/auth/list.mdx
index 8414cf62ce5e5..61c6a3546c344 100644
--- a/website/content/docs/commands/auth/list.mdx
+++ b/website/content/docs/commands/auth/list.mdx
@@ -58,7 +58,7 @@ token/      token      auth_token_aafab997      system         system     defaul
 ## Usage
 
 The following flags are available in addition to the [standard set of
-flags](/vault/docs/commands) included on all commands.
+flags](/docs/commands) included on all commands.
 
 ### Output Options
 
diff --git a/website/content/docs/commands/auth/move.mdx b/website/content/docs/commands/auth/move.mdx
index cb5e3a5000d1f..e567d4d42be63 100644
--- a/website/content/docs/commands/auth/move.mdx
+++ b/website/content/docs/commands/auth/move.mdx
@@ -30,5 +30,5 @@ $ vault auth move ns1/auth/approle/ ns2/auth/new-approle/
 
 ## Usage
 
-There are no flags beyond the [standard set of flags](/vault/docs/commands)
+There are no flags beyond the [standard set of flags](/docs/commands)
 included on all commands.
diff --git a/website/content/docs/commands/auth/tune.mdx b/website/content/docs/commands/auth/tune.mdx
index 15c59805421ca..abc401b86c378 100644
--- a/website/content/docs/commands/auth/tune.mdx
+++ b/website/content/docs/commands/auth/tune.mdx
@@ -43,34 +43,10 @@ $ vault auth tune -audit-non-hmac-request-keys=value1 -audit-non-hmac-request-ke
 Success! Tuned the auth method at: github/
 ```
 
-User lockout feature is only supported for userpass, ldap, and approle auth methods.
-
-```shell-session
-$ vault auth tune -user-lockout-threshold=10  -user-lockout-duration=10m userpass/
-Success! Tuned the auth method at: userpass/
-```
-
-View the current configuration of the auth method enabled at "userpass/".
-
-```shell-session
-$ vault read sys/auth/userpass/tune
-Key                  Value
----                  -----
-default_lease_ttl    768h
-description          n/a
-force_no_cache       false
-max_lease_ttl        768h
-token_type           default-service
-user_lockout_counter_reset_duration    0s
-user_lockout_disable                   false
-user_lockout_duration                  10m
-user_lockout_threshold                 10
-```
-
 ## Usage
 
 The following flags are available in addition to the [standard set of
-flags](/vault/docs/commands) included on all commands.
+flags](/docs/commands) included on all commands.
 
 - `-allowed-response-headers` `(string: "")` - response header values that the auth
   method will be allowed to set.
@@ -97,7 +73,7 @@ flags](/vault/docs/commands) included on all commands.
 
 - `-max-lease-ttl` `(duration: "")` - The maximum lease TTL for this auth
   method. If unspecified, this defaults to the Vault server's globally
-  configured [maximum lease TTL](/vault/docs/configuration#max_lease_ttl), or a
+  configured [maximum lease TTL](/docs/configuration#max_lease_ttl), or a
   previously configured value for the auth method. This value is allowed to
   override the server's global max TTL; it can be longer or shorter.
 
@@ -110,16 +86,4 @@ flags](/vault/docs/commands) included on all commands.
 
 - `-plugin-version` `(string: "")` - Configures the semantic version of the plugin
   to use. The new version will not start running until the mount is
-  [reloaded](/vault/docs/commands/plugin/reload).
-
-- `-user-lockout-threshold` `(string: "")` - Specifies the number of failed login attempts 
-  after which the user is locked out. User lockout feature was added in Vault 1.13. 
-
-- `-user-lockout-duration` `(duration: "")` - Specifies the duration for which a user will be locked out.
-  User lockout feature was added in Vault 1.13.
-
-- `-user-lockout-counter-reset-duration` `(duration: "")` - Specifies the duration after which the lockout 
-  counter is reset with no failed login attempts. User lockout feature was added in Vault 1.13.
-
-- `-user-lockout-disable` `(bool: false)` - Disables the user lockout feature if set to true. User lockout feature was added in Vault 1.13.
-
+  [reloaded](/docs/commands/plugin/reload).
diff --git a/website/content/docs/commands/debug.mdx b/website/content/docs/commands/debug.mdx
index 0d020f4c95f4a..4b8b938dfbf11 100644
--- a/website/content/docs/commands/debug.mdx
+++ b/website/content/docs/commands/debug.mdx
@@ -36,34 +36,6 @@ query the matching endpoint in order to get a proper response. Any errors
 encountered during capture due to permissions or otherwise will be logged in the
 index file.
 
-The following policy can be used for generating debug packages with all targets:
-
-```hcl
-path "auth/token/lookup-self" {
-  capabilities = ["read"]
-}
-
-path "sys/pprof/*" {
-  capabilities = ["read"]
-}
-
-path "sys/config/state/sanitized" {
-  capabilities = ["read"]
-}
-
-path "sys/monitor" {
-  capabilities = ["read"]
-}
-
-path "sys/host-info" {
-  capabilities = ["read"]
-}
-
-path "sys/in-flight-req" {
-  capabilities = ["read"]
-}
-```
-
 ## Capture Targets
 
 The `-target` flag can be specified multiple times to capture specific
@@ -86,7 +58,7 @@ Additionally, host information is not available on the OpenBSD platform due to
 library limitations in fetching the data without enabling `cgo`.
 
 [Enterprise] Telemetry can be gathered from a DR Secondary active node via the
-`metrics` target if [unauthenticated_metrics_access](/vault/docs/configuration/listener/tcp#unauthenticated_metrics_access) is enabled.
+`metrics` target if [unauthenticated_metrics_access](/docs/configuration/listener/tcp#unauthenticated_metrics_access) is enabled.
 
 ## Output Layout
 
@@ -153,7 +125,7 @@ $ vault debug -target=host -target=metrics
 ## Usage
 
 The following flags are available in addition to the [standard set of
-flags](/vault/docs/commands) included on all commands.
+flags](/docs/commands) included on all commands.
 
 ### Command Options
 
diff --git a/website/content/docs/commands/delete.mdx b/website/content/docs/commands/delete.mdx
index 57ea7cd4950b1..75bebffe3a7f8 100644
--- a/website/content/docs/commands/delete.mdx
+++ b/website/content/docs/commands/delete.mdx
@@ -28,7 +28,7 @@ $ vault delete transit/keys/my-key
 ```
 
 Note: changing the `deletion_allowed` parameter to `true` is necessary for the
-key to be successfully deleted, you can read more on key parameters [here](/vault/api-docs/secret/transit#update-key-configuration)
+key to be successfully deleted, you can read more on key parameters [here](/api-docs/secret/transit#update-key-configuration)
 
 Delete an IAM role:
 
@@ -38,5 +38,5 @@ $ vault delete aws/roles/ops
 
 ## Usage
 
-There are no flags beyond the [standard set of flags](/vault/docs/commands)
+There are no flags beyond the [standard set of flags](/docs/commands)
 included on all commands.
diff --git a/website/content/docs/commands/index.mdx b/website/content/docs/commands/index.mdx
index c1a536066ea87..f4e90178c7267 100644
--- a/website/content/docs/commands/index.mdx
+++ b/website/content/docs/commands/index.mdx
@@ -13,10 +13,10 @@ description: |-
 ~> **Note:** The Vault command-line interface (CLI) changed substantially in
 0.9.2+ and may cause confusion while using older versions of Vault with this
 documentation. Read our [upgrade
-guide](/vault/docs/upgrading/upgrade-to-0.9.2#backwards-compatible-cli-changes) for
+guide](/docs/upgrading/upgrade-to-0.9.2#backwards-compatible-cli-changes) for
 more information.
 
-In addition to a verbose [HTTP API](/vault/api-docs), Vault features a command-line
+In addition to a verbose [HTTP API](/api-docs), Vault features a command-line
 interface (CLI) that wraps common functionality and formats output. The Vault
 CLI is a single static binary. It is a thin wrapper around the HTTP API. Every
 CLI command maps directly to the HTTP API internally.
@@ -38,7 +38,7 @@ vault <command> [options] [path] [args]
 
 </CodeBlockConfig>
 
-- `options` - [Flags](/vault/docs/commands#flags) to specify additional settings
+- `options` - [Flags](/docs/commands#flags) to specify additional settings
 - `args` - API arguments specific to the operation
 
 -> **NOTE:** Use the [command help](#command-help) to display available options
@@ -49,7 +49,7 @@ and arguments.
 The following `write` command creates a new user (`bob`) in the userpass auth
 method. It passes the `-address` flag to specify the Vault server address which
 precedes the path (`auth/userpass/users/bob`) and its
-[argument](/vault/api-docs/auth/userpass#create-update-user)
+[argument](/api-docs/auth/userpass#create-update-user)
 (`password="long-password"`) at last.
 
 ```shell-session
@@ -57,7 +57,7 @@ $ vault write -address="http://127.0.0.1:8200" auth/userpass/users/bob password=
 ```
 
 If multiple options (`-address` and `-namespace`) and
-[arguments](/vault/api-docs/auth/userpass#create-update-user) (`password` and
+[arguments](/api-docs/auth/userpass#create-update-user) (`password` and
 `policies`) are specified, the command would look like:
 
 ```shell-session
@@ -68,9 +68,9 @@ $ vault write -address="http://127.0.0.1:8200" -namespace="my-organization" \
 The options (flags) come after the command (or subcommand) preceding the path,
 and the args always follow the path to set API parameter values.
 
-The four most common operations in Vault are [read](/vault/docs/commands/read),
-[write](/vault/docs/commands/write), [delete](/vault/docs/commands/delete), and
-[list](/vault/docs/commands/list). These operations work on most paths in Vault. Some
+The four most common operations in Vault are [read](/docs/commands/read),
+[write](/docs/commands/write), [delete](/docs/commands/delete), and
+[list](/docs/commands/list). These operations work on most paths in Vault. Some
 paths will contain secrets while other paths may contain configuration. Whatever it
 is, the primary interface for reading and writing data to Vault is similar.
 
@@ -123,10 +123,10 @@ The help output displays available subcommands, parameters, and command flags.
 
 ### API Help
 
-To invoke the Vault API paths, you can use the [read](/vault/docs/commands/read) (for
-HTTP GET), [write](/vault/docs/commands/write) (for HTTP PUT or POST),
-[delete](/vault/docs/commands/delete) (for HTTP DELETE), and
-[list](/vault/docs/commands/list) (for HTTP LIST) commands.
+To invoke the Vault API paths, you can use the [read](/docs/commands/read) (for
+HTTP GET), [write](/docs/commands/write) (for HTTP PUT or POST),
+[delete](/docs/commands/delete) (for HTTP DELETE), and
+[list](/docs/commands/list) (for HTTP LIST) commands.
 
 Use `path-help` to get Vault API help:
 
@@ -138,7 +138,7 @@ The `path-help` retrieves API help on any API paths. Vault API paths provide
 built-in help in markdown format. This includes system paths, secret engines,
 and auth methods.
 
-**Example:** API help on the [`sys/mounts/`](/vault/api-docs/system/mounts) path.
+**Example:** API help on the [`sys/mounts/`](/api-docs/system/mounts) path.
 
 ```shell-session
 $ vault path-help sys/mounts
@@ -281,7 +281,7 @@ variables available to the Vault process will be logged during startup.
 Vault authentication token. Conceptually similar to a session token on a
 website, the `VAULT_TOKEN` environment variable holds the contents of the token.
 For more information, please see the [token
-concepts](/vault/docs/concepts/tokens) page.
+concepts](/docs/concepts/tokens) page.
 
 ### `VAULT_ADDR`
 
@@ -326,12 +326,12 @@ Provide Vault output (read/status/write) in the specified format. Valid formats
 
 [Enterprise, Server only] Specify a license to use for this node. This takes
 precedence over [#VAULT_LICENSE_PATH](#vault_license_path) and
-[license_path in config](/vault/docs/configuration#license_path).
+[license_path in config](/docs/configuration#license_path).
 
 ### `VAULT_LICENSE_PATH`
 
 [Enterprise, Server only] Specify a path to a license on disk to use for this node.
-This takes precedence over [license_path in config](/vault/docs/configuration#license_path).
+This takes precedence over [license_path in config](/docs/configuration#license_path).
 
 ### `VAULT_LOG_LEVEL`
 
@@ -355,7 +355,7 @@ High Availability mode.
 
 Do not verify Vault's presented certificate before communicating with it.
 Setting this variable is not recommended and voids Vault's [security
-model](/vault/docs/internals/security).
+model](/docs/internals/security).
 
 ### `VAULT_TLS_SERVER_NAME`
 
@@ -379,7 +379,7 @@ limiting is off by default.
 _Note:_ The rate is limited for each invocation of the `vault` CLI. Since
 each invocation of the `vault` CLI typically only makes a few requests,
 this environment variable is most useful when using the Go
-[Vault client API](/vault/api-docs/libraries#go).
+[Vault client API](/api-docs/libraries#go).
 
 ### `VAULT_NAMESPACE`
 
@@ -441,4 +441,4 @@ list of available flags, run:
 
 ```shell-session
 $ vault <subcommand> -h
-```
\ No newline at end of file
+```
diff --git a/website/content/docs/commands/kv/delete.mdx b/website/content/docs/commands/kv/delete.mdx
index c123285458d67..67973b1e437c1 100644
--- a/website/content/docs/commands/kv/delete.mdx
+++ b/website/content/docs/commands/kv/delete.mdx
@@ -32,7 +32,7 @@ Success! Data deleted (if it existed) at: secret/data/creds
 
 ## Usage
 
-There are no flags beyond the [standard set of flags](/vault/docs/commands)
+There are no flags beyond the [standard set of flags](/docs/commands)
 included on all commands.
 
 ### Command Options
diff --git a/website/content/docs/commands/kv/destroy.mdx b/website/content/docs/commands/kv/destroy.mdx
index 20eb296359541..86fa351c497e0 100644
--- a/website/content/docs/commands/kv/destroy.mdx
+++ b/website/content/docs/commands/kv/destroy.mdx
@@ -8,7 +8,7 @@ description: |-
 
 # kv destroy
 
-~> **NOTE:** This is a [K/V Version 2](/vault/docs/secrets/kv/kv-v2) secrets
+~> **NOTE:** This is a [K/V Version 2](/docs/secrets/kv/kv-v2) secrets
 engine command, and not available for Version 1.
 
 The `kv destroy` command permanently removes the specified versions' data
@@ -26,7 +26,7 @@ Success! Data written to: secret/destroy/creds
 
 ## Usage
 
-There are no flags beyond the [standard set of flags](/vault/docs/commands)
+There are no flags beyond the [standard set of flags](/docs/commands)
 included on all commands.
 
 ### Output Options
diff --git a/website/content/docs/commands/kv/enable-versioning.mdx b/website/content/docs/commands/kv/enable-versioning.mdx
index 5b210276dfebc..2a8c51a3f2173 100644
--- a/website/content/docs/commands/kv/enable-versioning.mdx
+++ b/website/content/docs/commands/kv/enable-versioning.mdx
@@ -23,7 +23,7 @@ Success! Tuned the secrets engine at: secret/
 
 ## Usage
 
-There are no flags beyond the [standard set of flags](/vault/docs/commands)
+There are no flags beyond the [standard set of flags](/docs/commands)
 included on all commands.
 
 ### Output Options
diff --git a/website/content/docs/commands/kv/index.mdx b/website/content/docs/commands/kv/index.mdx
index 487320b3e16cc..642d77bff359f 100644
--- a/website/content/docs/commands/kv/index.mdx
+++ b/website/content/docs/commands/kv/index.mdx
@@ -9,8 +9,8 @@ description: |-
 # kv
 
 The `kv` command groups subcommands for interacting with Vault's key/value
-secrets engine (both [K/V Version 1](/vault/docs/secrets/kv/kv-v1) and [K/V
-Version 2](/vault/docs/secrets/kv/kv-v2).
+secrets engine (both [K/V Version 1](/docs/secrets/kv/kv-v1) and [K/V
+Version 2](/docs/secrets/kv/kv-v2).
 
 ## Syntax
 
diff --git a/website/content/docs/commands/kv/list.mdx b/website/content/docs/commands/kv/list.mdx
index b6ecc83bcb4c3..4ac6b7db2d220 100644
--- a/website/content/docs/commands/kv/list.mdx
+++ b/website/content/docs/commands/kv/list.mdx
@@ -21,7 +21,7 @@ Use this command to list all existing key names at a specific path.
 List values under the key "my-app":
 
 ```shell-session
-$ vault kv list -mount=secret my-app/
+$ vault kv list secret/my-app/
 Keys
 ----
 admin_creds
@@ -33,17 +33,11 @@ release
 
 ## Usage
 
-There are no flags beyond the [standard set of flags](/vault/docs/commands)
+There are no flags beyond the [standard set of flags](/docs/commands)
 included on all commands.
 
 ### Output Options
 
-- `-mount` `(string: "")` - Specifies the path where the KV backend is mounted.
-  If specified, the next argument will be interpreted as the secret path. If
-  this flag is not specified, the next argument will be interpreted as the
-  combined mount path and secret path, with /data/ automatically inserted for
-  KV v2 secrets.
-
 - `-format` `(string: "table")` - Print the output in the given format. Valid
   formats are "table", "json", or "yaml". This can also be specified via the
   `VAULT_FORMAT` environment variable.
diff --git a/website/content/docs/commands/kv/metadata.mdx b/website/content/docs/commands/kv/metadata.mdx
index 6d40126a2f42a..433bd3ea84b8d 100644
--- a/website/content/docs/commands/kv/metadata.mdx
+++ b/website/content/docs/commands/kv/metadata.mdx
@@ -8,7 +8,7 @@ description: |-
 
 # kv metadata
 
-~> **NOTE:** This is a [K/V Version 2](/vault/docs/secrets/kv/kv-v2) secrets
+~> **NOTE:** This is a [K/V Version 2](/docs/secrets/kv/kv-v2) secrets
 engine command, and not available for Version 1.
 
 The `kv metadata` command has subcommands for interacting with the metadata and
@@ -150,9 +150,9 @@ be applied to new versions.
   to a duration to specify the `deletion_time` for all new versions written to
   this key. If not set, the backend's `delete_version_after` will be used. If
   the value is greater than the backend's `delete_version_after`, the backend's
-  `delete_version_after` will be used. Accepts [duration format strings](/vault/docs/concepts/duration-format).
+  `delete_version_after` will be used. Accepts [duration format strings](/docs/concepts/duration-format).
 
-- `-custom-metadata` `(string: "")` - Specifies a key-value pair for the
+- `custom-metadata` `(string: "")` - Specifies a key-value pair for the
   `custom_metadata` field. This can be specified multiple times to add multiple
   pieces of metadata.
 
diff --git a/website/content/docs/commands/kv/patch.mdx b/website/content/docs/commands/kv/patch.mdx
index 676ea623222e9..9870927cfb8fd 100644
--- a/website/content/docs/commands/kv/patch.mdx
+++ b/website/content/docs/commands/kv/patch.mdx
@@ -8,7 +8,7 @@ description: |-
 
 # kv patch
 
-~> **NOTE:** This is a [K/V Version 2](/vault/docs/secrets/kv/kv-v2) secrets
+~> **NOTE:** This is a [K/V Version 2](/docs/secrets/kv/kv-v2) secrets
 engine command, and not available for Version 1.
 
 The `kv patch` command writes the data to the given path in the K/V v2 secrets
diff --git a/website/content/docs/commands/kv/put.mdx b/website/content/docs/commands/kv/put.mdx
index c158f6baf6320..e4698cce5afaa 100644
--- a/website/content/docs/commands/kv/put.mdx
+++ b/website/content/docs/commands/kv/put.mdx
@@ -43,7 +43,7 @@ $ echo "abcd1234" | vault kv put -mount=secret foo bar=-
 
 ## Usage
 
-There are no flags beyond the [standard set of flags](/vault/docs/commands)
+There are no flags beyond the [standard set of flags](/docs/commands)
 included on all commands.
 
 ### Output Options
diff --git a/website/content/docs/commands/kv/rollback.mdx b/website/content/docs/commands/kv/rollback.mdx
index 94191fe4cf968..92fc42867ef99 100644
--- a/website/content/docs/commands/kv/rollback.mdx
+++ b/website/content/docs/commands/kv/rollback.mdx
@@ -8,7 +8,7 @@ description: |-
 
 # kv rollback
 
-~> **NOTE:** This is a [K/V Version 2](/vault/docs/secrets/kv/kv-v2) secrets
+~> **NOTE:** This is a [K/V Version 2](/docs/secrets/kv/kv-v2) secrets
 engine command, and not available for Version 1.
 
 The `kv rollback` command restores a given previous version to the current
@@ -33,7 +33,7 @@ version          6
 
 ## Usage
 
-There are no flags beyond the [standard set of flags](/vault/docs/commands)
+There are no flags beyond the [standard set of flags](/docs/commands)
 included on all commands.
 
 ### Output Options
diff --git a/website/content/docs/commands/kv/undelete.mdx b/website/content/docs/commands/kv/undelete.mdx
index 0428f81614e2e..759bea8de083f 100644
--- a/website/content/docs/commands/kv/undelete.mdx
+++ b/website/content/docs/commands/kv/undelete.mdx
@@ -9,7 +9,7 @@ description: |-
 
 # kv undelete
 
-~> **NOTE:** This is a [K/V Version 2](/vault/docs/secrets/kv/kv-v2) secrets
+~> **NOTE:** This is a [K/V Version 2](/docs/secrets/kv/kv-v2) secrets
 engine command, and not available for Version 1.
 
 The `kv undelete` command undoes the deletes of the data for the provided version
@@ -27,7 +27,7 @@ Success! Data written to: secret/undelete/creds
 
 ## Usage
 
-There are no flags beyond the [standard set of flags](/vault/docs/commands)
+There are no flags beyond the [standard set of flags](/docs/commands)
 included on all commands.
 
 ### Output Options
diff --git a/website/content/docs/commands/lease/index.mdx b/website/content/docs/commands/lease/index.mdx
index b1de95902fe62..db47755061952 100644
--- a/website/content/docs/commands/lease/index.mdx
+++ b/website/content/docs/commands/lease/index.mdx
@@ -9,7 +9,7 @@ description: |-
 # lease
 
 The `lease` command groups subcommands for interacting with leases attached to
-secrets. For leases attached to tokens, use the [`vault token`](/vault/docs/commands/token) subcommand.
+secrets. For leases attached to tokens, use the [`vault token`](/docs/commands/token) subcommand.
 
 ## Examples
 
diff --git a/website/content/docs/commands/lease/lookup.mdx b/website/content/docs/commands/lease/lookup.mdx
index 6d9aed6d3ca95..a483a88ed062b 100644
--- a/website/content/docs/commands/lease/lookup.mdx
+++ b/website/content/docs/commands/lease/lookup.mdx
@@ -30,5 +30,5 @@ ttl             9m52s
 
 ## Usage
 
-There are no flags beyond the [standard set of flags](/vault/docs/commands)
+There are no flags beyond the [standard set of flags](/docs/commands)
 included on all commands.
diff --git a/website/content/docs/commands/lease/renew.mdx b/website/content/docs/commands/lease/renew.mdx
index f90ec757d7b6f..e1cc1cdbff093 100644
--- a/website/content/docs/commands/lease/renew.mdx
+++ b/website/content/docs/commands/lease/renew.mdx
@@ -31,7 +31,7 @@ lease_renewable    true
 ## Usage
 
 The following flags are available in addition to the [standard set of
-flags](/vault/docs/commands) included on all commands.
+flags](/docs/commands) included on all commands.
 
 - `-increment` `(duration: "")` - Request a specific increment in seconds. Vault
   is not required to honor this request.
diff --git a/website/content/docs/commands/lease/revoke.mdx b/website/content/docs/commands/lease/revoke.mdx
index dc8618fc8dcea..fa76fc20586d7 100644
--- a/website/content/docs/commands/lease/revoke.mdx
+++ b/website/content/docs/commands/lease/revoke.mdx
@@ -30,7 +30,7 @@ Success! Revoked any leases with prefix: database/creds
 ## Usage
 
 The following flags are available in addition to the [standard set of
-flags](/vault/docs/commands) included on all commands.
+flags](/docs/commands) included on all commands.
 
 - `-force` `(bool: false)` - Delete the lease from Vault even if the secret
   engine revocation fails. This is meant for recovery situations where the
diff --git a/website/content/docs/commands/license/get.mdx b/website/content/docs/commands/license/get.mdx
index f36f4d66023e1..abdaedab14cbb 100644
--- a/website/content/docs/commands/license/get.mdx
+++ b/website/content/docs/commands/license/get.mdx
@@ -9,7 +9,7 @@ description: |-
 
 The `license get` command reports on the license in use.  With the `-signed`
 flag, it will return the actual license string, but only if the license
-is stored, as opposed to [autoloaded](/vault/docs/enterprise/license/autoloading).
+is stored, as opposed to [autoloaded](/docs/enterprise/license/autoloading).
 
 ## Examples
 
@@ -44,7 +44,7 @@ License not found or using a temporary license.
 ## Usage
 
 The following flags are available in addition to the [standard set of
-flags](/vault/docs/commands) included on all commands.
+flags](/docs/commands) included on all commands.
 
 ### Command Options
 
diff --git a/website/content/docs/commands/license/index.mdx b/website/content/docs/commands/license/index.mdx
index 2567c9ce0b538..77ebf6862ba0f 100644
--- a/website/content/docs/commands/license/index.mdx
+++ b/website/content/docs/commands/license/index.mdx
@@ -9,7 +9,7 @@ description: |-
 
 The `license` command groups subcommands for interacting with Vault licenses
 
-For more information, please see the [license documentation](/vault/docs/enterprise/license)
+For more information, please see the [license documentation](/docs/enterprise/license)
 
 ## Examples
 
diff --git a/website/content/docs/commands/license/inspect.mdx b/website/content/docs/commands/license/inspect.mdx
index 2fcef167ae00d..3a0596041423d 100644
--- a/website/content/docs/commands/license/inspect.mdx
+++ b/website/content/docs/commands/license/inspect.mdx
@@ -51,7 +51,7 @@ License is valid
 ## Usage
 
 The following flags are available in addition to the [standard set of
-flags](/vault/docs/commands) included on all commands.
+flags](/docs/commands) included on all commands.
 
 ### Command Options
 
diff --git a/website/content/docs/commands/list.mdx b/website/content/docs/commands/list.mdx
index 9caed719a0f3b..dce32d7b5d263 100644
--- a/website/content/docs/commands/list.mdx
+++ b/website/content/docs/commands/list.mdx
@@ -21,5 +21,5 @@ $ vault list identity/entity/id
 
 ## Usage
 
-There are no flags beyond the [standard set of flags](/vault/docs/commands)
+There are no flags beyond the [standard set of flags](/docs/commands)
 included on all commands.
diff --git a/website/content/docs/commands/login.mdx b/website/content/docs/commands/login.mdx
index 8228f08394769..2503400ece90d 100644
--- a/website/content/docs/commands/login.mdx
+++ b/website/content/docs/commands/login.mdx
@@ -123,7 +123,7 @@ token_meta_username    my-username
 ## Usage
 
 The following flags are available in addition to the [standard set of
-flags](/vault/docs/commands) included on all commands.
+flags](/docs/commands) included on all commands.
 
 ### Output Options
 
diff --git a/website/content/docs/commands/monitor.mdx b/website/content/docs/commands/monitor.mdx
index e90f94fd45c6c..e0afc5a916fea 100644
--- a/website/content/docs/commands/monitor.mdx
+++ b/website/content/docs/commands/monitor.mdx
@@ -34,7 +34,7 @@ $ vault monitor -log-level=debug
 ## Usage
 
 The following flags are available in addition to the [standard set of
-flags](/vault/docs/commands) included on all commands.
+flags](/docs/commands) included on all commands.
 
 ### Output Options
 
diff --git a/website/content/docs/commands/operator/diagnose.mdx b/website/content/docs/commands/operator/diagnose.mdx
index 4513e546039f3..4c6c8dd008859 100644
--- a/website/content/docs/commands/operator/diagnose.mdx
+++ b/website/content/docs/commands/operator/diagnose.mdx
@@ -23,7 +23,7 @@ messages or warnings.
 ## Usage
 
 The following flags are available in addition to the [standard set of
-flags](/vault/docs/commands) included on all commands.
+flags](/docs/commands) included on all commands.
 
 ### Output Options
 
diff --git a/website/content/docs/commands/operator/generate-root.mdx b/website/content/docs/commands/operator/generate-root.mdx
index b9c3d3fb47546..c40e6c785c702 100644
--- a/website/content/docs/commands/operator/generate-root.mdx
+++ b/website/content/docs/commands/operator/generate-root.mdx
@@ -20,14 +20,14 @@ One of the following must be provided to start the root token generation:
   final value.
 
 - A file containing a PGP key or a
-  [keybase](/vault/docs/concepts/pgp-gpg-keybase) username in the `-pgp-key`
+  [keybase](/docs/concepts/pgp-gpg-keybase) username in the `-pgp-key`
   flag. The resulting token is encrypted with this public key.
 
 An unseal key may be provided directly on the command line as an argument to the
 command. If key is specified as "-", the command will read from stdin. If a TTY
 is available, the command will prompt for text.
 
-Please see the [generate root guide](/vault/tutorials/operations/generate-root) for
+Please see the [generate root guide](https://learn.hashicorp.com/tutorials/vault/generate-root) for
 step-by-step instructions.
 
 ## Examples
@@ -53,7 +53,7 @@ $ vault operator generate-root -otp="..."
 ## Usage
 
 The following flags are available in addition to the [standard set of
-flags](/vault/docs/commands) included on all commands.
+flags](/docs/commands) included on all commands.
 
 ### Output Options
 
diff --git a/website/content/docs/commands/operator/init.mdx b/website/content/docs/commands/operator/init.mdx
index ea55ab098b879..b9457f3a7ed1a 100644
--- a/website/content/docs/commands/operator/init.mdx
+++ b/website/content/docs/commands/operator/init.mdx
@@ -20,7 +20,7 @@ During initialization, Vault generates a root key, which is stored in the storag
 
 The default Vault configuration uses [Shamir's Secret Sharing](https://en.wikipedia.org/wiki/Shamir%27s_Secret_Sharing) to split the root key into a configured number of shards (referred as key shares, or unseal keys). A certain threshold of shards is required to reconstruct the root key, which is then used to decrypt the Vault's encryption key.
 
-Refer to the [Seal/Unseal](/vault/docs/concepts/seal#seal-unseal) documentation for further details.
+Refer to the [Seal/Unseal](/docs/concepts/seal#seal-unseal) documentation for further details.
 
 ## Examples
 
@@ -57,7 +57,7 @@ $ vault operator init -root-token-pgp-key="keybase:hashicorp"
 ## Usage
 
 The following flags are available in addition to the [standard set of
-flags](/vault/docs/commands) included on all commands.
+flags](/docs/commands) included on all commands.
 
 ### Output Options
 
@@ -109,17 +109,17 @@ flags](/vault/docs/commands) included on all commands.
 ### HSM and KMS Options
 
 - `-recovery-pgp-keys` `(string: "...")` - Behaves like `-pgp-keys`, but for the
-  recovery key shares. This is only available with [Auto Unseal](/vault/docs/concepts/seal#auto-unseal) seals (HSM, KMS and Transit seals).
+  recovery key shares. This is only available with [Auto Unseal](/docs/concepts/seal#auto-unseal) seals (HSM, KMS and Transit seals).
 
 - `-recovery-shares` `(int: 5)` - Number of key shares to split the recovery key
-  into. This is only available with [Auto Unseal](/vault/docs/concepts/seal#auto-unseal) seals (HSM, KMS and Transit seals).
+  into. This is only available with [Auto Unseal](/docs/concepts/seal#auto-unseal) seals (HSM, KMS and Transit seals).
 
 - `-recovery-threshold` `(int: 3)` - Number of key shares required to
-  reconstruct the recovery key. This is only available with [Auto Unseal](/vault/docs/concepts/seal#auto-unseal) seals (HSM, KMS and Transit seals).
+  reconstruct the recovery key. This is only available with [Auto Unseal](/docs/concepts/seal#auto-unseal) seals (HSM, KMS and Transit seals).
 
 - `-stored-shares` `(int: 0)` - Number of unseal keys to store on an HSM. This
   must be equal to `-key-shares`.
 
 -> **Recovery keys:** Refer to the
- [Seal/Unseal](/vault/docs/concepts/seal#recovery-key) documentation to learn more
+ [Seal/Unseal](/docs/concepts/seal#recovery-key) documentation to learn more
  about recovery keys.
diff --git a/website/content/docs/commands/operator/key-status.mdx b/website/content/docs/commands/operator/key-status.mdx
index b9ecc9fbe83b5..3c0c1954d59b8 100644
--- a/website/content/docs/commands/operator/key-status.mdx
+++ b/website/content/docs/commands/operator/key-status.mdx
@@ -25,7 +25,7 @@ Encryption Count  4494
 ## Usage
 
 The following flags are available in addition to the [standard set of
-flags](/vault/docs/commands) included on all commands.
+flags](/docs/commands) included on all commands.
 
 ### Output Options
 
diff --git a/website/content/docs/commands/operator/members.mdx b/website/content/docs/commands/operator/members.mdx
index d532302c37056..de5b82b64ec99 100644
--- a/website/content/docs/commands/operator/members.mdx
+++ b/website/content/docs/commands/operator/members.mdx
@@ -30,7 +30,7 @@ Note that in the above output, `Upgrade Version` and `Redundancy Zone` are Enter
 ## Usage
 
 The following flags are available in addition to the [standard set of
-flags](/vault/docs/commands) included on all commands.
+flags](/docs/commands) included on all commands.
 
 ### Output Options
 
diff --git a/website/content/docs/commands/operator/migrate.mdx b/website/content/docs/commands/operator/migrate.mdx
index 81af3b27b5a86..ccbc57be6ae51 100644
--- a/website/content/docs/commands/operator/migrate.mdx
+++ b/website/content/docs/commands/operator/migrate.mdx
@@ -48,7 +48,7 @@ $ vault operator migrate -config migrate.hcl -start "data/logical/fd"
 
 The `operator migrate` command uses a dedicated configuration file to specify the source
 and destination storage backends. The format of the storage stanzas is identical
-to that used to [configure Vault](/vault/docs/configuration/storage),
+to that used to [configure Vault](/docs/configuration/storage),
 with the only difference being that two stanzas are required: `storage_source` and `storage_destination`.
 
 ```hcl
@@ -71,9 +71,9 @@ storage_destination "consul" {
 The below configuration will migrate away from Consul storage to integrated
 raft storage. The raft data will be stored on the local filesystem in the
 defined `path`. `node_id` can optionally be set to identify this node.
-[cluster_addr](/vault/docs/configuration#cluster_addr) must be set to the
+[cluster_addr](/docs/configuration#cluster_addr) must be set to the
 cluster hostname of this node. For more configuration options see the [raft
-storage configuration documentation](/vault/docs/configuration/storage/raft).
+storage configuration documentation](/docs/configuration/storage/raft).
 
 If the original configuration uses "raft" for `ha_storage` a different
 `path` needs to be declared for the path in `storage_destination` and the new
@@ -110,7 +110,7 @@ $ vault operator migrate -config migrate.hcl
 After migration has completed, the data is stored on the local file system. To
 use the new storage backend with Vault, update Vault's configuration file as
 described in the [raft storage configuration
-documentation](/vault/docs/configuration/storage/raft). Then start and unseal the
+documentation](/docs/configuration/storage/raft). Then start and unseal the
 vault server.
 
 ### Join additional nodes
@@ -132,11 +132,3 @@ The following flags are available for the `operator migrate` command.
 - `-reset` - Reset the migration lock. A lock file is added during migration to prevent
   starting the Vault server or another migration. The `-reset` option can be used to
   remove a stale lock file if present.
-
-- `-max-parallel` `int: 10` - Allows the operator to specify the maximum number of lightweight threads (goroutines)
-  which may be used to migrate data in parallel. This can potentially speed up migration on slower backends at
-  the cost of more resources (e.g. CPU, memory). Permitted values range from `1` (synchronous) to the maximum value
-  for an `integer`. If not supplied, a default of `10` parallel goroutines will be used.
-
-  ~> Note: The maximum number of concurrent requests handled by a storage backend is ultimately governed by the
-  storage backend configuration setting, which enforces a maximum number of concurrent requests (`max_parallel`).
diff --git a/website/content/docs/commands/operator/raft.mdx b/website/content/docs/commands/operator/raft.mdx
index 329a18c321022..39fb0d857114a 100644
--- a/website/content/docs/commands/operator/raft.mdx
+++ b/website/content/docs/commands/operator/raft.mdx
@@ -79,7 +79,7 @@ The following flags are available for the `operator raft join` command.
   server not participate in the Raft quorum, and have it only receive the data
   replication stream. This can be used to add read scalability to a cluster in
   cases where a high volume of reads to servers are needed. The default is false.
-  See [`retry_join_as_non_voter`](/vault/docs/configuration/storage/raft#retry_join_as_non_voter)
+  See [`retry_join_as_non_voter`](/docs/configuration/storage/raft#retry_join_as_non_voter)
   for the equivalent config option when using `retry_join` stanzas instead.
 
 - `-retry` `(bool: false)` - Continuously retry joining the Raft cluster upon
@@ -198,7 +198,7 @@ This command groups subcommands for operators interacting with the autopilot
 functionality of the integrated Raft storage backend. There are 3 subcommands
 supported: `get-config`, `set-config` and `state`.
 
-For a more detailed overview of autopilot features, see the [concepts page](/vault/docs/concepts/integrated-storage/autopilot).
+For a more detailed overview of autopilot features, see the [concepts page](/docs/concepts/integrated-storage/autopilot).
 
 ```text
 Usage: vault operator raft autopilot <subcommand> [options] [args]
@@ -222,7 +222,7 @@ State includes a list of all servers by nodeID and IP address. Last Index
 indicates how close the state on each node is to the leader's.
 
 A node can have a status of "leader", "voter", and
-"[non-voter](/vault/docs/concepts/integrated-storage#non-voting-nodes-enterprise-only)".
+"[non-voter](/docs/concepts/integrated-storage#non-voting-nodes-enterprise-only)".
 
 ```text
 Usage: vault operator raft autopilot state
@@ -331,10 +331,8 @@ Flags applicable to this command are the following:
   go without leader contact before being considered unhealthy. Defaults to `10s`.
 
 - `dead-server-last-contact-threshold` `(string)` - Limit on the amount of time
-  a server can go without leader contact before being considered failed.
-  This takes effect only when `cleanup_dead_servers` is set as `true`. Defaults to `24h`.
-  
-  -> **Note:** A failed server that autopilot has removed from the raft configuration cannot rejoin the cluster without being reinitialized.  
+  a server can go without leader contact before being considered failed. This
+  takes effect only when `cleanup_dead_servers` is set. Defaults to `24h`.
 
 - `max-trailing-logs` `(int)` - Amount of entries in the Raft Log that a server
   can be behind before being considered unhealthy. Defaults to `1000`.
diff --git a/website/content/docs/commands/operator/rekey.mdx b/website/content/docs/commands/operator/rekey.mdx
index 80341a2518ce0..a1a6eb67cb01e 100644
--- a/website/content/docs/commands/operator/rekey.mdx
+++ b/website/content/docs/commands/operator/rekey.mdx
@@ -21,7 +21,7 @@ An unseal key may be provided directly on the command line as an argument to the
 command. If key is specified as "-", the command will read from stdin. If a TTY
 is available, the command will prompt for text.
 
-Please see the [rotating and rekeying](/vault/tutorials/operations/rekeying-and-rotating) for
+Please see the [rotating and rekeying](https://learn.hashicorp.com/tutorials/vault/rekeying-and-rotating) for
 step-by-step instructions.
 
 ## Examples
@@ -106,7 +106,7 @@ $ vault operator rekey -verify -nonce="..."
 ## Usage
 
 The following flags are available in addition to the [standard set of
-flags](/vault/docs/commands) included on all commands.
+flags](/docs/commands) included on all commands.
 
 ### Output Options
 
@@ -143,7 +143,7 @@ flags](/vault/docs/commands) included on all commands.
   providing an unseal key. The default is false.
 
 - `-target` `(string: "barrier")` - Target for rekeying. "recovery" only applies
-  when HSM support is enabled or using [Auto Unseal](/vault/docs/concepts/seal#auto-unseal).
+  when HSM support is enabled or using [Auto Unseal](/docs/concepts/seal#auto-unseal).
 
 - `-verify` `(bool: false)` - Indicate during the phase `-init` that the
   verification process is activated for the rekey. Along with `-nonce` option
diff --git a/website/content/docs/commands/operator/rotate.mdx b/website/content/docs/commands/operator/rotate.mdx
index 40ffcec34ce9e..db3ab2235eed3 100644
--- a/website/content/docs/commands/operator/rotate.mdx
+++ b/website/content/docs/commands/operator/rotate.mdx
@@ -32,7 +32,7 @@ Install Time    01 May 17 10:30 UTC
 ## Usage
 
 The following flags are available in addition to the [standard set of
-flags](/vault/docs/commands) included on all commands.
+flags](/docs/commands) included on all commands.
 
 ### Output Options
 
diff --git a/website/content/docs/commands/operator/seal.mdx b/website/content/docs/commands/operator/seal.mdx
index 9edbb885a0425..9e2db28b9b76e 100644
--- a/website/content/docs/commands/operator/seal.mdx
+++ b/website/content/docs/commands/operator/seal.mdx
@@ -25,7 +25,7 @@ Users will have to re-enter their portions of the root key again.
 This command does nothing if the Vault server is already sealed.
 
 For more information on sealing and unsealing, please the [seal concepts
-page](/vault/docs/concepts/seal).
+page](/docs/concepts/seal).
 
 ## Examples
 
@@ -38,5 +38,5 @@ Success! Vault is sealed.
 
 ## Usage
 
-There are no flags beyond the [standard set of flags](/vault/docs/commands)
+There are no flags beyond the [standard set of flags](/docs/commands)
 included on all commands.
diff --git a/website/content/docs/commands/operator/step-down.mdx b/website/content/docs/commands/operator/step-down.mdx
index e66714d9d21c5..fa74c0536cf9d 100644
--- a/website/content/docs/commands/operator/step-down.mdx
+++ b/website/content/docs/commands/operator/step-down.mdx
@@ -8,9 +8,9 @@ description: |-
 
 # operator step-down
 
-The `operator step-down` forces the active Vault node within an [HA cluster](/vault/docs/concepts/ha)
+The `operator step-down` forces the active Vault node within an [HA cluster](/docs/concepts/ha)
 to step down from active duty. When executed against a non-active node, i.e. a 
-standby or [performance standby](/vault/docs/enterprise/performance-standby) node, 
+standby or [performance standby](/docs/enterprise/performance-standby) node, 
 the request will be forwarded to the active node.  While the 
 affected node will have a delay before attempting to acquire 
 the leader lock again, if no other Vault nodes acquire the
@@ -28,5 +28,5 @@ Success! Stepped down: http://127.0.0.1:8200
 
 ## Usage
 
-There are no flags beyond the [standard set of flags](/vault/docs/commands)
+There are no flags beyond the [standard set of flags](/docs/commands)
 included on all commands.
diff --git a/website/content/docs/commands/operator/unseal.mdx b/website/content/docs/commands/operator/unseal.mdx
index 0019fcd6af1f1..aa535d4a16900 100644
--- a/website/content/docs/commands/operator/unseal.mdx
+++ b/website/content/docs/commands/operator/unseal.mdx
@@ -28,7 +28,7 @@ Key (will be hidden): IXyR0OJnSFobekZMMCKCoVEpT7wI6l+USMzE3IcyDyo=
 ```
 
 For more information on sealing and unsealing, please the [seal concepts
-page](/vault/docs/concepts/seal).
+page](/docs/concepts/seal).
 
 ## Examples
 
@@ -46,7 +46,7 @@ Unseal Progress: 0
 ## Usage
 
 The following flags are available in addition to the [standard set of
-flags](/vault/docs/commands) included on all commands.
+flags](/docs/commands) included on all commands.
 
 ### Output Options
 
diff --git a/website/content/docs/commands/operator/usage.mdx b/website/content/docs/commands/operator/usage.mdx
index 2a3bf728d66ac..65c35a045bd7c 100644
--- a/website/content/docs/commands/operator/usage.mdx
+++ b/website/content/docs/commands/operator/usage.mdx
@@ -8,7 +8,7 @@ description: |-
 # operator usage
 
 The `operator usage` command allows an administrator to retrieve a
-[client count](/vault/docs/concepts/client-count) report
+[client count](https://www.vaultproject.io/docs/concepts/client-count) report
 for the default reporting period, or for a specific time range of months.
 
 The command output will list clients by distinct entities, non-entity tokens, and total
@@ -17,7 +17,7 @@ indicate that no data is available for the requested time range, which may be
 because the client count reporting is disabled, the time range is too far
 in the past, or no data has yet been collected since the feature was enabled.
 
-> Refer to the [Vault Usage Metrics](/vault/tutorials/monitoring/usage-metrics) tutorial to learn more about usage metrics,
+> Refer to the [Vault Usage Metrics](https://learn.hashicorp.com/tutorials/vault/usage-metrics) tutorial to learn more about usage metrics,
 > including required policy and data collection details.
 
 ## Examples
@@ -53,7 +53,7 @@ Total            954                 176                 1130
 ## Usage
 
 The following flags are available in addition to the [standard set of
-flags](/vault/docs/commands) included on all commands.
+flags](/docs/commands) included on all commands.
 
 ### Output Options
 
diff --git a/website/content/docs/commands/patch.mdx b/website/content/docs/commands/patch.mdx
deleted file mode 100644
index 9009359a87540..0000000000000
--- a/website/content/docs/commands/patch.mdx
+++ /dev/null
@@ -1,87 +0,0 @@
----
-layout: docs
-page_title: patch - Command
-description: |-
-  The "patch" command updates data in Vault at the given path. The data can be
-  credentials, secrets, configuration, or arbitrary data. The specific behavior
-  of this command is determined at the thing mounted at the path.
----
-
-# patch
-
-The `patch` command updates data in Vault at the given path (wrapper command for
-HTTP PATCH using the [JSON Patch format](https://datatracker.ietf.org/doc/html/rfc6902)).
-The data can be credentials, secrets, configuration, or arbitrary data. The specific
-behavior of the `patch` command is determined at the thing mounted at the path.
-
-Data is specified as "**key=value**" pairs on the command line. If the value begins
-with an "**@**", then it is loaded from a file. If the value for a key is "**-**", Vault
-will read the value from stdin rather than the command line.
-
-Some API fields require more advanced structures such as maps. These cannot
-directly be represented on the command line. However, direct control of the
-request parameters can be achieved by using `-` as the only data argument.
-This causes `vault patch` to read a JSON blob containing all request parameters
-from stdin. This argument will be ignored if used in conjunction with any
-"key=value" pairs.
-
-For a full list of examples and paths, please see the documentation that
-corresponds to the secrets engines in use.
-
-Unlike [the `write` command](/vault/docs/commands/write), the `patch` command only
-modifies data specified on the command line.
-
-## Examples
-
-Updates a PKI role to modify a single parameter:
-
-```shell-session
-$ vault patch pki/roles/example allow_localhost=false
-```
-
-### API versus CLI
-
-Updates a PKI role to modify the `allow_localhost` parameter:
-
-```shell-session
-$ vault patch pki/roles/example allow_localhost=false
-```
-
-Equivalent cURL command for this operation:
-
-```shell-session
-$ tee request_payload.json -<<EOF
-{
-   "organization": "hashicorp"
-}
-EOF
-
-$ curl --header "X-Vault-Token: $VAULT_TOKEN" \
-    --request PATCH \
-    --header 'Content-Type: application/merge-patch+json'
-    --data @request_payload.json \
-    $VAULT_ADDR/v1/pki/roles/example
-```
-
-The `vault patch` command simplifies the API call.
-
-## Usage
-
-The following flags are available in addition to the [standard set of
-flags](/vault/docs/commands) included on all commands.
-
-### Output Options
-
-- `-field` `(string: "")` - Print only the field with the given name. Specifying
-  this option will take precedence over other formatting directives. The result
-  will not have a trailing newline making it ideal for piping to other processes.
-
-- `-format` `(string: "table")` - Print the output in the given format. Valid
-  formats are "table", "json", or "yaml". This can also be specified via the
-  `VAULT_FORMAT` environment variable.
-
-### Command Options
-
-- `-force` `(bool: false)` - Allow the operation to continue with no key=value
-  pairs. This allows writing to keys that do not need or expect data. This is
-  aliased as `-f`.
diff --git a/website/content/docs/commands/path-help.mdx b/website/content/docs/commands/path-help.mdx
index 4099fb1104d8c..af2a88be64d18 100644
--- a/website/content/docs/commands/path-help.mdx
+++ b/website/content/docs/commands/path-help.mdx
@@ -87,5 +87,5 @@ user of this backend.
 
 ## Usage
 
-There are no flags beyond the [standard set of flags](/vault/docs/commands)
+There are no flags beyond the [standard set of flags](/docs/commands)
 included on all commands.
diff --git a/website/content/docs/commands/pki/health-check.mdx b/website/content/docs/commands/pki/health-check.mdx
deleted file mode 100644
index 9dfb8b0380aef..0000000000000
--- a/website/content/docs/commands/pki/health-check.mdx
+++ /dev/null
@@ -1,353 +0,0 @@
----
-layout: docs
-page_title: pki health-check - Command
-description: |-
-  The "pki health-check" command verifies the health of the given PKI secrets
-  engine mount against an optional configuration.
----
-
-# pki health-check
-
-The `pki health-check` command verifies the health of the given PKI secrets
-engine mount against an optional configuration.
-
-This runs with the permissions of the given token, reading various APIs from
-the mount and `/sys` against the given Vault server
-
-Mounts need to be specified with any namespaces prefixed in the path, e.g.,
-`ns1/pki`.
-
-## Examples
-
-Performs a basic health check against the `pki-root` mount:
-
-```shell-session
-$ vault pki health-check pki-root/
-```
-
-Configuration can be specified using the `-health-config` flag:
-
-```shell-session
-$ vault pki health-check -health-config=mycorp-root.json pki-root/
-```
-
-Using the `-list` flag will show the list of health checks and any
-known configuration values (with their defaults) that will be run
-against this mount:
-
-```shell-session
-$ vault pki health-check -list pki-root/
-```
-
-## Usage
-
-The following flags are unique to this command:
-
- - `-default-disabled` - When specified, results in all health checks being
-   disabled by default unless enabled by the configuration file explicitly.
-  The default is `false`, meaning all default-enabled health checks will run.
-
- - `-health-config` `(string: "")` - Path to JSON configuration file to
-   modify health check execution and parameters.
-
- - `-list` - When specified, no health checks are run, but all known health
-   checks are printed. Still requires a positional mount argument. The default
-   is `false`, meaning no listing is printed and health checks will execute.
-
- - `-return-indicator` `(string: "default")` - Behavior of the return value
-   (exit code) of this command:
-     - `permission`, for exiting with a non-zero code when the tool lacks
-       permissions or has a version mismatch with
-       the server;
-     - `critical`, for exiting with a non-zero code when a check returns a
-       critical status in addition to the above;
-     - `warning`, for exiting with a non-zero status when a check returns a
-       warning status in addition to the above;
-     - `informational`, for exiting with a non-zero status when a check
-       returns an informational status in addition to the above;
-     - `default`, for the default behavior based on severity of message
-        and only returning a zero exit status when all checks have passed
-        and no execution errors have occurred.
-
-This command respects the `-format` parameter to control the presentation of
-output sent to stdout. Fatal errors that prevent health checks from executing
-may not follow this formatting.
-
-## Return Status and Output
-
-This command returns the following exit codes:
-
- - `0` - Everything is good.
- - `1` - Usage error (check CLI parameters).
- - `2` - Informational message from a health check.
- - `3` - Warning message from a health check.
- - `4` - Critical message from a health check.
- - `5` - A version mismatch between health check and Vault Server occurred,
-	     preventing one or more health checks from being fully run.
- - `6` - A permission denied message was returned from Vault Server for
-	     one or more health checks.
-
-Note that an exit code of `5` (due to a version mismatch) is not necessarily
-fatal to the health check. For example, the `crl_validity_period` health
-check will return an invalid version warning when run against Vault 1.11 as
-no Delta CRL exists for this version of Vault, but this will not impact its
-ability to check the complete CRL.
-
-Each health check outputs one or results in a list. This list contains a
-mapping of keys (`status`, `status_code`, `endpoint`, and `message`) to
-values returned by the health check. An endpoint may occur in more than
-one health check and is not necessarily guaranteed to exist on the server
-(e.g., using wildcards to indicate all matching paths have the same
-result). Tabular form elides the status code, as this is meant to be
-consumed programatically.
-
-These correspond to the following health check status values:
-
- - status `not_applicable` / status code `0`: exit code `0`.
- - status `ok` / status code `1`: exit code `0`
- - status `informational` / status code `2`: exit code `2`.
- - status `warning` / status code `3`: exit code `3`.
- - status `critical` / status code `4`: exit code `4`.
- - status `invalid_version` / status code `5`: exit code `5`.
- - status `insufficient_permissions` / status code `6`: exit code `6`.
-
-## Health Checks
-
-The following health checks are currently implemented. More health checks may
-be added in future releases and may default to being enabled.
-
-### CA Validity Period
-
-**Name**: `ca_validity_period`
-
-**Accessed APIs**:
-
- - `LIST /issuers` (unauthenticated)
- - `READ /issuer/:issuer_ref/json` (unauthenticated)
-
-**Config Parameters**:
-
- - `root_expiry_critical` `(duration: 182d)` - for a duration within which the root's lifetime is considered critical
- - `intermediate_expiry_critical` `(duration: 30d)` - for a duration within which the intermediate's lifetime is considered critical
- - `root_expiry_warning` `(duration: 365d)` -  for a duration within which the root's lifetime is considered warning
- - `intermediate_expiry_warning` `(duration: 60d)` - for a duration within which the intermediate's lifetime is considered warning
- - `root_expiry_informational` `(duration: 730d)` - for a duration within which the root's lifetime is considered informational
- - `intermediate_expiry_informational` `(duration: 180d)` - for a duration within which the intermediate's lifetime is considered informational
-
-This health check will check each issuer in the mount for validity status, returning a list. If a CA expires within the next 30 days, the result will be critical. If a root CA expires within the next 12 months or an intermediate CA within the next 2 months, the result will be a warning. If a root CA expires within 24 months or an intermediate CA within 6 months, the result will be informational.
-
-The remediation here is to remove old CAs after they expire and perform a [CA rotation operation](/vault/docs/secrets/pki/rotation-primitives) for any with pending expiry.
-
-### CRL Validity Period
-
-**Name**: `crl_validity_period`
-
-**Accessed APIs**:
-
- - `LIST /issuers` (unauthenticated)
- - `READ /config/crl` (optional)
- - `READ /issuer/:issuer_ref/crl` (unauthenticated)
- - `READ /issuer/:issuer_ref/crl/delta` (unauthenticated)
-
-**Config Parameters**:
-
- - `crl_expiry_pct_critical` `(int: 95)` - the percentage of validity period after which a CRL should be considered critically close to expiry
- - `delta_crl_expiry_pct_critical` `(int: 95)` - the percentage of validity period after which a Delta CRL should be considered critically close to expiry
-
-This health check checks each issuer's CRL for validity status, returning a list. Unlike CAs, where a date-based duration makes sense due to effort required to successfully rotate, rotating CRLs are much easier, so a percentage based approach makes sense. If the chosen percentage exceeds that of the `grace_period` from the CRL configuration, an informational message will be issued rather than OK.
-
-For informational purposes, it reads the CRL config and suggests enabling auto-rebuild CRLs if not enabled.
-
-### Hardware-Backed Root Certificate
-
-**Name**: `hardware_backed_root`
-
-**APIs**:
-
- - `LIST /issuers` (unauthenticated)
- - `READ /issuer/:issuer_ref`
- - `READ /key/:key_ref`
-
-**Config Parameters**:
-
- - `enabled` `(boolean: false)` - defaults to not being run.
-
-This health check checks issuers for root CAs backed by software keys. While Vault is secure, for production root certificates, we'd recommend the additional integrity of KMS-backed keys. This is an informational check only. When all roots are KMS-backed, we'll return OK; when no issuers are roots, we'll return not applicable.
-
-### Root Certificate Issued Non-CA Leaves
-
-**Name**: `root_issued_leaves`
-
-**APIs**:
-
- - `LIST /issuers` (unauthenticated)
- - `READ /issuer/:issuer_ref/pem` (unauthenticated)
- - `LIST /certs`
- - `READ /certs/:serial` (unauthenticated)
-
-**Config Parameters**:
-
- - `certs_to_fetch` `(int: 100)` - a quantity of leaf certificates to fetch to see if any leaves have been issued by a root directly.
-
-This health check verifies whether a proper CA hierarchy is in use. We do this by fetching `certs_to_fetch` leaf certificates (configurable) and seeing if they are a non-issuer leaf and if they were signed by a root issuer in this mount. If one is found, we'll issue a warning about this, and recommend setting up an intermediate CA.
-
-### Role Allows Implicit Localhost Issuance
-
-**Name**: `role_allows_localhost`
-
-**APIs**:
-
- - `LIST /roles`
- - `READ /roles/:name`
-
-**Config Parameters**: (none)
-
-This health check checks each role to see whether the role allows localhost based issuance implicitly (`allow_localhost=true`) with a non-empty allowed_domains value. If it does, it issues a warning and suggests setting it to false and switching to allowed_domains with an explicit list of allowed localhost-like domains. This is a best-practice to simplify understanding of roles.
-
-### Role Allows Glob-Based Wildcard Issuance
-
-**Name**: `role_allows_glob_wildcards`
-
-**APIs**:
-
- - `LIST /roles`
- - `READ /roles/:name`
-
-**Config Parameters**:
-
- - `allowed_roles` `(list: nil)` - an allow-list of roles to ignore.
-
-This health check checks each role to see whether or not it allows wildcard issuance with glob domains as well - these two interact and can result in nested wildcards and other quirks. It is strongly suggested that roles either allow globs or or allow wildcards, but not both - this will be a critical warning. If both behaviors are required, we'd suggest splitting it into two roles.
-
-### Role Sets `no_store=false` and Performance
-
-**Name**: `role_no_store_false`
-
-**APIs**:
-
- - `LIST /roles`
- - `READ /roles/:name`
- - `LIST /certs`
- - `READ /config/crl`
-
-**Config Parameters**:
-
- - `allowed_roles` `(list: nil)` - an allow-list of roles to ignore.
-
-This health check checks each role to see whether it sets `no_store=false` or not. When used with lots of certificates and no temporal auto-rebuilding of CRLs, this can result in bad performance. Instead, BYOC can be used for the occasional revocation and shorter certificate lifetimes used instead. Without auto-rebuild, this will be a warning, but when auto-rebuild is enabled, we can make it informational.
-
-### Accessibility of Audit Information
-
-**Name**: `audit_visibility`
-
-**APIs**:
-
- - `READ /sys/mounts/:mount/tune`
-
-**Config Parameters**:
-
- - `ignored_parameters` `(list: nil)` - a list of parameters to ignore their HMAC status.
-
-This health check checks whether audit information is accessible to log consumers, validating whether our list of safe and unsafe audit parameters are generally followed. These are informational responses, if any are present.
-
-### ACL Policies Allow Problematic Endpoints
-
-**Name**: `policy_allow_endpoints`
-
-**APIs**:
-
- - `LIST /sys/policy`
- - `READ /sys/policy/:name`
-
-**Config Parameters**:
-
- - `allowed_policies` `(list: nil)` -  a list of policies to allow-list for access to insecure APIs.
-
-This health check checks whether unsafe access to APIs (such as `sign-intermediate`, `sign-verbatim`, and `sign-self-issued`) are allowed. Any findings are a critical result and should be rectified by the administrator or explicitly allowed.
-
-### Allow If-Modified-Since Requests
-
-**Name**: `allow_if_modified_since`
-
-**APIs**:
-
- - `READ /sys/internal/ui/mounts`
-
-**Config Parameters**: (none)
-
-This health check verifies if the `If-Modified-Since` header has been added to `passthrough_request_headers` and if `Last-Modified` header has been added to `allowed_response_headers`. This is an informational message if both haven't been configured, or a warning if only one has been configured.
-
-### Auto-Tidy Disabled
-
-**Name**: `enable_auto_tidy`
-
-**APIs**:
-
- - `READ /config/auto-tidy`
-
-**Config Parameters**:
-
- - `interval_duration_critical` `(duration: 7d)` - the maximum allowed interval_duration to hit critical threshold.
- - `interval_duration_warning` `(duration: 2d)` - the maximum allowed interval_duration to hit a warning threshold.
- - `pause_duration_critical` `(duration: 1s)` - the maximum allowed pause_duration to hit a critical threshold.
- - `pause_duration_warning` `(duration: 200ms)` - the maximum allowed pause_duration to hit a warning threshold.
-
-This health check verifies that auto-tidy is enabled, with sane defaults for interval_duration and pause_duration. Any disabled findings will be informational, as this is a best-practice but not strictly required, but other findings w.r.t. `interval_duration` or `pause_duration` will be critical/warnings.
-
-### Tidy Hasn't Run
-
-**Name**: `tidy_last_run`
-
-**APIs**:
-
- - `READ /tidy-status`
-
-**Config Parameters**:
-
- - `last_run_critical` `(duration: 7d)` - the critical delay threshold between when tidy should have last run.
- - `last_run_warning` `(duration: 2d)` - the warning delay threshold between when tidy should have last run.
-
-This health check verifies that tidy has run within the last run window. This can be critical/warning alerts as this can start to seriously impact Vault's performance.
-
-### Too Many Certificates
-
-**Name**: `too_many_certs`
-
-**APIs**:
-
- - `READ /tidy-status`
- - `LIST /certs`
-
-**Config Parameters**:
-
- - `count_critical` `(int: 250000)` - the critical threshold at which there are too many certs.
- - `count_warning` `(int: 50000)` - the warning threshold at which there are too many certs.
-
-This health check verifies that this cluster has a reasonable number of certificates. Ideally this would be fetched from tidy's status or a new metric reporting format, but as a fallback when tidy hasn't run, a list operation will be performed instead.
-
-### Enable ACME issuance
-
-**Name**: `enable_acme_issuance`
-
-**APIs**:
-
-- `READ /config/acme`
-- `READ /config/cluster`
-- `LIST /issuers` (unauthenticated)
-- `READ /issuer/:issuer_ref/json` (unauthenticated)
-
-**Config Parameters**: (none)
-
-This health check verifies that ACME is enabled within a mount that contains an intermediary issuer, as this is considered a best-practice to support a self-rotating PKI infrastructure.
-
-### ACME Response headers
-
-**Name**: `allow_acme_headers`
-
-**APIs**:
-
-- `READ /sys/internal/ui/mounts`
-
-**Config Parameters**: (none)
-
-This health check verifies if the `"Replay-Nonce`, `Link`, and `Location` headers have been added to `allowed_response_headers`, when the ACME feature is enabled. The ACME protocol will not work if these headers are not added to the mount.
diff --git a/website/content/docs/commands/pki/index.mdx b/website/content/docs/commands/pki/index.mdx
deleted file mode 100644
index 8a6ec3379407c..0000000000000
--- a/website/content/docs/commands/pki/index.mdx
+++ /dev/null
@@ -1,94 +0,0 @@
----
-layout: docs
-page_title: pki - Command
-description: |-
-  The "pki" command groups subcommands for interacting with Vault's PKI
-  secrets engine.
----
-
-# pki
-
-The `pki` command groups subcommands for interacting with Vault's
-[PKI Secrets Engine](/vault/docs/secrets/pki).
-
-## Syntax
-
-Option flags for a given subcommand are provided after the subcommand, but before the arguments.
-
-## Example Health Check
-
-To [health check](/vault/docs/commands/pki/health-check) a mount, use the
-`vault pki health-check <mount>` command:
-
-```
-$ vault pki health-check pki
-ca_validity_period
-------------------
-status    endpoint                                            message
-------    --------                                            -------
-ok        /pki/issuer/da41ffb1-cc6d-5a5c-f147-e4d7beeb1b73    Issuer's validity (2032-12-17) is OK
-
-... more output elided ...
-```
-
-## Example Verify Sign
-
-To [verify](/vault/docs/commands/pki/verify-sign) the signature between two
-issuer certificates, use the `vault pki verify-sign <parent> <child>` command:
-
-```shell-session
-$ vault pki verify-sign pki_root/issuer/root pki_int/issuer/FirstDepartment
-issuer:pki_root/issuer/root
-issued:pki_int/issuer/FirstDepartment
-
-field              value
------              -----
-subject_match      true
-path_match         true
-trust_match        true
-key_id_match       true
-signature_match    true
-```
-
-## Example List Child Issuers
-
-To [list intermediate](/vault/docs/commands/pki/list-intermediates) certificates
-potentially issued by a certificate inside vault, use the
-`vault pki list-intermediates <parent>` command:
-
-```shell-session
-$ vault pki list-intermediates /pki_root/issuer/default
-intermediate                                             match?
-------------                                             ------
-pki_int_2/issuer/d4404ccc-3ad4-83a9-f5df-398637654b3b    true
-pki_int_2/issuer/db0b0a6c-6641-ac15-363a-4e5261315581    true
-pki_root/issuer/9464c4fe-e8a6-d96a-0566-021575e7382c     true
-pki_int/issuer/2f958ec5-1838-336e-331b-07032379b958      true
-pki_int/issuer/b8cc0b41-e0e9-1a92-12c4-6849c9d6f837      true
-```
-
-## Example Issue
-
-To [issue](/vault/docs/commands/pki/issue) a new issuer certificate, use the
-`vault pki issue <parent-certificate-path> <mount>` command:
-
-```shell-session
-$ vault pki issue -issuer_name="FirstDepartment" /pki_root/issuer/default /pki_int/ common_name="first-department.example.com"
-Key                               Value
----                               -----
-ca_chain                          [-----BEGIN CERTIFICATE-----
-MIIDsDCCApigAwIBAgIULEPuHTW7UDtAQg+qcc18osNWgZIwDQYJKoZIhvcNAQEL...
-```
-
-## Example Reissue
-
-To [reissue](/vault/docs/commands/pki/reissue) an issuer certificate, using the
-same fields as an existing issuer template, use the
-`vault pki reissue <parent-certificate-path> <template> <mount>` command:
-
-```shell-session
-$ vault pki reissue -issuer_name="SecondDepartment" /pki_root/issuer/default /pki_int/issuer/FirstDepartment /pki_int_2/ common_name="second-department.example.com"
-Key                               Value
----                               -----
-ca_chain                          [-----BEGIN CERTIFICATE-----
-MIID0DCCArigAwIBAgIUdfRe05B5eRXsg3pvsJ/g94eYuWkwDQYJKoZIhvcNAQEL```
diff --git a/website/content/docs/commands/pki/issue.mdx b/website/content/docs/commands/pki/issue.mdx
deleted file mode 100644
index 674f1fa4f87bf..0000000000000
--- a/website/content/docs/commands/pki/issue.mdx
+++ /dev/null
@@ -1,72 +0,0 @@
----
-layout: docs
-page_title: pki issue - Command
-description: |-
-  The "pki issue" command issues a new intermediate ("issuer") certificate,
-  using a parent certificate in vault.
----
-
-# pki issue
-
-This command creates a intermediate certificate authority certificate signed by
-the `<parent>` in the `<child_mount>`, using the options to determine the fields
-on that certificate.
-
-## Usage
-
-Usage: `vault pki issue [flags] <parent> <child_mount> [options]`
-
-- `[flags]` are optional arguments described below
-
-- `<parent>` is the fully qualified path of the Certificate Authority in vault
-  which will issue the new intermediate certificate.
-
-- `<child_mount>` is the path of the mount in vault where the new issuer is saved.
-
-- `[options]` are the superset of the k=v options passed to generate-intermediate-csr
-  and sign-intermediate commands.  At least one option must be set.
-  See [below](/vault/docs/commands/pki/issue#options).
-
-### Flags
-
-- `-type` `(string: "internal")` - This determines the type of key use for the
-   newly created certificate.  Valid types are `"existing"` - where we link to
-   a key already present in the vault-backend to be used (and expect option
-   arguments `"key_ref"`) - `"internal"` - to generate a new key for this
-   certificate - or `"kms"` - to link to an external key.  Exported keys are not
-   available through this API.
-
-- `-issuer_name` `(string: "")` - If present, the newly created issuer will be
-   given this name.
-
-### Options
-
-Other than `type` (which is passed as a flag, see above), this command accepts
-all options provided to the
-[Generate CSR](/vault/api-docs/secret/pki#generate-intermediate-csr) and
-[Sign Intermediate](/vault/api-docs/secret/pki#sign-intermediate) endpoints.
-
-### Accessed APIs
-
-Note that the vault user running this command will need to have access to the
-following API endpoints, each representing a step in the process:
-
- - `READ /:parent` - used to check validity
- - `WRITE /:child_mount/intermediate/generate/:type` - used to generate the csr
- - `WRITE /:parent/sign-intermediate` - used to sign the csr
- - `WRITE /:child_mount/issuers/import/cert` - used to import the new issuer,
- and the issuer chain
- - `UPDATE /:child_mount/issuer/:issuer_refs` - used to both name the new
- issuer, and also set the name of the parent in the issuer chain
- - `READ /:child_mount/issuer/:new_issuer_ref` - used to verify completion,
- generate the output
-
-## Examples
-
-```shell-session
-$ vault pki issue -issuer_name="FirstDepartment" /pki_root/issuer/default /pki_int/ common_name="first-department.example.com"
-Key                               Value
----                               -----
-ca_chain                          [-----BEGIN CERTIFICATE-----
-MIIDsDCCApigAwIBAgIULEPuHTW7UDtAQg+qcc18osNWgZIwDQYJKoZIhvcNAQEL...
-```
diff --git a/website/content/docs/commands/pki/list-intermediates.mdx b/website/content/docs/commands/pki/list-intermediates.mdx
deleted file mode 100644
index aa0606c3e4c49..0000000000000
--- a/website/content/docs/commands/pki/list-intermediates.mdx
+++ /dev/null
@@ -1,89 +0,0 @@
----
-layout: docs
-page_title: pki list-intermediates - Command
-description: |-
-  The "pki list-intermediates" command searches a mount, or set of mounts for
-  child certificates.
----
-
-# pki list-intermediates
-
-This command determines which of a list of certificates were issued by a given
-parent certificate.
-
-## Usage
-
-Usage: `vault pki list-intermediates [flags] <parent> [child] [child] [child...`
-
-Lists the set of intermediate CAs issued by this parent issuer.
-
-- `[flags]` listed below determine the type of match required between the `<parent>`
-  and each potential child, and the type of output
-
-- `<parent>` is the certificate that might be the issuer which everything is
-  verified against.
-
-- `[child]` is an optional path to a certificate to be compared to the `<parent>`,
-  or pki mounts to look for certificates on. If `[child]` is omitted entirely, the
-  list will be constructed from all accessible pki mounts.
-
-This returns a list of issuing certificates and whether they are a match.
-By default, the type of match required is whether the `<parent>` has the
-expected subject, [authority/subject key id match](https://datatracker.ietf.org/doc/html/rfc5280#section-4.2.1.1), and could have (directly) signed this issuer.
-The match criteria can be updated by changed the corresponding flag.
-
-### Flags
-
-- `-use_names` `(bool: "false")` - this determines how issuers are referred to
-  in the output, whether by issuer_id (the default), or by their name, or status
-  as default issuer (when use_names is true)
-
-The following flags determine what sorts of relationship between the parent and
-potential child issuers are considered a match.
-
-- `-subject_match` `(bool: "true")` - determines whether the subject of the
-  parent-issuer must match the issuer of the potential child for this to be
-  considered a match
-
-- `-key_id_match` `(bool: "true")` - determines whether the identifier of the
-  parent-issuer must match the IUI of the potential child for this to be
-  considered a match
-
-- `-direct_verify` `(bool: "true")` - determines whether it is required for this
-  to be a match that someone trusting the parent certificate would trust the
-  potential-child certificate (without any more information)
-
-- `-indirect-sign` `(bool: "true")` - determines whether it is required for this
-  to be a match that if someone trusted the first certificate, they would trust
-  the potential-child certificate (using the certificate chains available)
-
-- `-path_contains` `(bool: "false")` - determines whether it is required for
-  this to be a match for the ca_chain of the potential child certificate to
-  contain the parent certificate
-
-### Accessed APIs
-
-Note that the vault user running this command will need to have access to the
-following API endpoints, each representing a step in the process:
-
-- `READ /:parent`
-- `LIST /sys/mounts` - when no `[child]` argument is provided, this is used to
-find a list of pki mounts
-- `LIST /:child_mount/issuers/` - when no `[child]` argument is provided, or the
-`[child]` argument is a mount rather than an issuer, this is used to find a list
-of pki issuers on the mount
-- `READ /:child` - each potential child issuer is read for comparison against
-the parent
-
-## Examples
-
-```shell-session
-$ vault pki list-intermediates /pki_root/issuer/default
-intermediate                                             match?
-------------                                             ------
-pki_int_2/issuer/d4404ccc-3ad4-83a9-f5df-398637654b3b    true
-pki_int_2/issuer/db0b0a6c-6641-ac15-363a-4e5261315581    true
-pki_root/issuer/9464c4fe-e8a6-d96a-0566-021575e7382c     true
-pki_int/issuer/2f958ec5-1838-336e-331b-07032379b958      true
-pki_int/issuer/b8cc0b41-e0e9-1a92-12c4-6849c9d6f837      true
-```
diff --git a/website/content/docs/commands/pki/reissue.mdx b/website/content/docs/commands/pki/reissue.mdx
deleted file mode 100644
index cb11d5a6c9ac8..0000000000000
--- a/website/content/docs/commands/pki/reissue.mdx
+++ /dev/null
@@ -1,88 +0,0 @@
----
-layout: docs
-page_title: pki reissue - Command
-description: |-
-  The "pki reissue" command issues a new intermediate ("issuer") certificate,
-  using an existing certificate in vault as a template, and using a parent
-  certificate in vault to issue the new certificate.
----
-
-# pki reissue
-
-Frequently, a reissued CA certificate is to be very similar to another.
-This command enables reissuing a CA, using an existing issuer within
-Vault as a template, but allowing modifications to the desired attributes.
-
-## Usage
-
-Usage: `vault pki reissue [flags] <parent> <template> <child_mount> [options]`
-
-- `[flags]` are optional arguments described below.
-
-- `<parent>` is the fully qualified path of the Certificate Authority in vault
-  which will issue the new intermediate certificate.
-
-- `<template>` is the fully qualified path of an intermediate certificate in vault
-  which will be used to populate certificate fields not overridden by `[options]`.
-
-~> **Note**: not all possible certificate fields are supported by Vault, and
-  this template reader covers only those vault generates as a best effort.  If
-  unknown fields are set, such as when an external CA was imported into Vault,
-  there may not be a warning that those are missing from the new issuer.
-
-- `<child_mount>` is the path of the mount in vault where the new issuer is saved.
-
-- `[options]` are the superset of the k=v options passed to generate/intermediate
-  and sign-intermediate commands.  See [below](/vault/docs/commands/pki/reissue#options).
-
-The output of this command when it is successful is to read the resulting new
-issuer entry.
-
-### Flags
-
-- `-type` `(string: "internal")` - This determines the type of key use for the
-   newly created certificate.  Valid types are `"existing"` - where we link to
-   a key already present in the vault-backend to be used - `"internal"` - to
-   generate a new key for this certificate - or `"kms"` - to link to an external
-   key.  Exported keys are not available through this API.
-
-~> **Note**: It is only possible to generate a new certificate with an existing
-   key that exists in the same mount where that key-material exists.  This
-   command is expected to fail should the template exist on a different mount,
-   `existing` is the selected type, and no `key_ref` for a key in the new issuer
-   mount is provided.
-
-- `-issuer_name` `(string: "")` - If present, the newly created issuer will be
-   given this name.
-
-### Options
-
-Other than `type` (which is passed as a flag, see above), this command accepts
-all options provided to the
-[Generate CSR](/vault/api-docs/secret/pki#generate-intermediate-csr) and
-[Sign Intermediate](/vault/api-docs/secret/pki#sign-intermediate) endpoints.
-
-### Accessed APIs
-
-Note that the vault user running this command will need to have access to the
-following API endpoints, each representing a step in the process:
-
- - `READ /:parent` - used to check validity
- - `READ /:template` - used to generate the options for the new certificate
- - `WRITE /:child_mount/intermediate/generate/:type` - used to generate the csr
- - `WRITE /:parent/sign-intermediate` - used to sign the csr
- - `WRITE /:child_mount/issuers/import/cert` - used to import the new issuer,
- and the issuer chain
- - `UPDATE /:child_mount/issuer/:issuer_refs` - used to both name the new
- issuer, and also set the name of the parent in the issuer chain
- - `READ /:child_mount/issuer/:new_issuer_ref` - used to verify completion,
- generate the output
-
-## Examples
-
-```shell-session
-$ vault pki reissue -issuer_name="SecondDepartment" /pki_root/issuer/default /pki_int/issuer/FirstDepartment /pki_int_2/ common_name="second-department.example.com"
-Key                               Value
----                               -----
-ca_chain                          [-----BEGIN CERTIFICATE-----
-MIID0DCCArigAwIBAgIUdfRe05B5eRXsg3pvsJ/g94eYuWkwDQYJKoZIhvcNAQEL```
diff --git a/website/content/docs/commands/pki/verify-sign.mdx b/website/content/docs/commands/pki/verify-sign.mdx
deleted file mode 100644
index ec4c68a7f2cbb..0000000000000
--- a/website/content/docs/commands/pki/verify-sign.mdx
+++ /dev/null
@@ -1,56 +0,0 @@
----
-layout: docs
-page_title: pki verify-sign - Command
-description: |-
-  The "pki verify-sign" command verifies the relationship between two issuer
-  certificates in vault
----
-
-# pki verify-sign
-
-This command verifies whether the listed issuer has signed the listed issued
-certificate.
-
-This command returns five fields of information:
-
-- `signature_match`: was the key of the issuer used to sign the issued.
-
-- `path_match`: the possible issuer appears in the valid certificate chain
-	of the issued.
-
-- `key_id_match`: does the [key id](https://datatracker.ietf.org/doc/html/rfc5280#section-4.2.1.1)
-  of the issuer match the key_id of the subject.
-
-- `subject_match`: does the subject name of the issuer match the issuer
-	subject of the issued.
-
-- `trust_match`: if someone trusted the parent issuer, is the chain
-  provided sufficient to trust the child issued.
-
-## Usage
-
-Usage: `vault pki verify-sign <parent> <child>`
-
-- `<parent>` is the fully name-spaced path to the issuer certificate which will be
-used to verify the `<child>` certificate
-
-- `<child>` is the fully name-spaced path to the potential child-certificate to be
-verified
-
-A fully namespaced path looks like, for instance, 'ns1/mount1/issuer/issuerName/json'.
-
-## Example
-
-```shell-session
-$ vault pki verify-sign pki_root/issuer/root pki_int/issuer/FirstDepartment
-issuer:pki_root/issuer/root
-issued:pki_int/issuer/FirstDepartment
-
-field              value
------              -----
-subject_match      true
-path_match         true
-trust_match        true
-key_id_match       true
-signature_match    true
-```
diff --git a/website/content/docs/commands/plugin/deregister.mdx b/website/content/docs/commands/plugin/deregister.mdx
index 2353773b2825d..3ac58f303bc7b 100644
--- a/website/content/docs/commands/plugin/deregister.mdx
+++ b/website/content/docs/commands/plugin/deregister.mdx
@@ -27,4 +27,4 @@ The following flags are available in addition to the [standard set of
 flags](/vault/docs/commands) included on all commands.
 
 - `-version` `(string: "")` - Semantic version of the plugin to deregister. 
-  If unset, only an unversioned plugin may be deregistered.
+  If unset, only an unversioned plugin may be deregistered.
\ No newline at end of file
diff --git a/website/content/docs/commands/plugin/info.mdx b/website/content/docs/commands/plugin/info.mdx
index 8a1127f12c0ce..783832346033d 100644
--- a/website/content/docs/commands/plugin/info.mdx
+++ b/website/content/docs/commands/plugin/info.mdx
@@ -49,7 +49,7 @@ version               n/a
 ## Usage
 
 The following flags are available in addition to the [standard set of
-flags](/vault/docs/commands) included on all commands.
+flags](/docs/commands) included on all commands.
 
 ### Output Options
 
diff --git a/website/content/docs/commands/plugin/list.mdx b/website/content/docs/commands/plugin/list.mdx
index 6a92a4f02d29f..45d77325c445f 100644
--- a/website/content/docs/commands/plugin/list.mdx
+++ b/website/content/docs/commands/plugin/list.mdx
@@ -47,7 +47,7 @@ app-id                           auth        v1.12.0+builtin.vault
 ## Usage
 
 The following flags are available in addition to the [standard set of
-flags](/vault/docs/commands) included on all commands.
+flags](/docs/commands) included on all commands.
 
 ### Output Options
 
diff --git a/website/content/docs/commands/plugin/register.mdx b/website/content/docs/commands/plugin/register.mdx
index 51bb725003a82..d50b8d194efd4 100644
--- a/website/content/docs/commands/plugin/register.mdx
+++ b/website/content/docs/commands/plugin/register.mdx
@@ -34,7 +34,7 @@ $ vault plugin register \
 ## Usage
 
 The following flags are available in addition to the [standard set of
-flags](/vault/docs/commands) included on all commands.
+flags](/docs/commands) included on all commands.
 
 ### Output Options
 
diff --git a/website/content/docs/commands/plugin/reload.mdx b/website/content/docs/commands/plugin/reload.mdx
index ec53e4350fca9..27a6e24bb1f14 100644
--- a/website/content/docs/commands/plugin/reload.mdx
+++ b/website/content/docs/commands/plugin/reload.mdx
@@ -41,7 +41,7 @@ Success! Reloaded mounts: [my-custom-plugin-1/ my-custom-plugin-2/]
 ## Usage
 
 The following flags are available in addition to the [standard set of
-flags](/vault/docs/commands) included on all commands.
+flags](/docs/commands) included on all commands.
 
 ### Command Options
 
diff --git a/website/content/docs/commands/policy/delete.mdx b/website/content/docs/commands/policy/delete.mdx
index 05c1cadd70bf6..cb0a1e1dc4877 100644
--- a/website/content/docs/commands/policy/delete.mdx
+++ b/website/content/docs/commands/policy/delete.mdx
@@ -26,5 +26,5 @@ $ vault policy delete my-policy
 
 ## Usage
 
-There are no flags beyond the [standard set of flags](/vault/docs/commands)
+There are no flags beyond the [standard set of flags](/docs/commands)
 included on all commands.
diff --git a/website/content/docs/commands/policy/fmt.mdx b/website/content/docs/commands/policy/fmt.mdx
index 9a3ba7e513e32..0c047a6c9cfc4 100644
--- a/website/content/docs/commands/policy/fmt.mdx
+++ b/website/content/docs/commands/policy/fmt.mdx
@@ -23,5 +23,5 @@ $ vault policy fmt my-policy.hcl
 
 ## Usage
 
-There are no flags beyond the [standard set of flags](/vault/docs/commands)
+There are no flags beyond the [standard set of flags](/docs/commands)
 included on all commands.
diff --git a/website/content/docs/commands/policy/index.mdx b/website/content/docs/commands/policy/index.mdx
index 1f66e7d8d33de..b76bba3ee142f 100644
--- a/website/content/docs/commands/policy/index.mdx
+++ b/website/content/docs/commands/policy/index.mdx
@@ -12,7 +12,7 @@ The `policy` command groups subcommands for interacting with policies. Users can
 write, read, and list policies in Vault.
 
 For more information, please see the [policy
-documentation](/vault/docs/concepts/policies).
+documentation](/docs/concepts/policies).
 
 ## Examples
 
diff --git a/website/content/docs/commands/policy/list.mdx b/website/content/docs/commands/policy/list.mdx
index 3355ac297395f..23904bf848a8f 100644
--- a/website/content/docs/commands/policy/list.mdx
+++ b/website/content/docs/commands/policy/list.mdx
@@ -24,7 +24,7 @@ root
 ## Usage
 
 The following flags are available in addition to the [standard set of
-flags](/vault/docs/commands) included on all commands.
+flags](/docs/commands) included on all commands.
 
 ### Output Options
 
diff --git a/website/content/docs/commands/policy/read.mdx b/website/content/docs/commands/policy/read.mdx
index c01334e4b496d..29dcf03ac60da 100644
--- a/website/content/docs/commands/policy/read.mdx
+++ b/website/content/docs/commands/policy/read.mdx
@@ -22,7 +22,7 @@ $ vault policy read my-policy
 ## Usage
 
 The following flags are available in addition to the [standard set of
-flags](/vault/docs/commands) included on all commands.
+flags](/docs/commands) included on all commands.
 
 ### Output Options
 
diff --git a/website/content/docs/commands/policy/write.mdx b/website/content/docs/commands/policy/write.mdx
index b9ff586e7f623..abd5332ac6a97 100644
--- a/website/content/docs/commands/policy/write.mdx
+++ b/website/content/docs/commands/policy/write.mdx
@@ -14,7 +14,7 @@ a local file PATH or stdin. If PATH is "-", the policy is read from stdin.
 Otherwise, it is loaded from the file at the given path on the local disk.
 
 For details on the policy syntax, please see the [policy
-documentation](/vault/docs/concepts/policies).
+documentation](/docs/concepts/policies).
 
 ## Examples
 
@@ -32,5 +32,5 @@ $ cat my-policy.hcl | vault policy write my-policy -
 
 ## Usage
 
-There are no flags beyond the [standard set of flags](/vault/docs/commands)
+There are no flags beyond the [standard set of flags](/docs/commands)
 included on all commands.
diff --git a/website/content/docs/commands/read.mdx b/website/content/docs/commands/read.mdx
index 03cdeecb5bb33..294cd84ff6a6d 100644
--- a/website/content/docs/commands/read.mdx
+++ b/website/content/docs/commands/read.mdx
@@ -45,7 +45,7 @@ $ curl --request GET --header "X-Vault-Token: $VAULT_TOKEN" \
 ```
 
 Since K/V secrets engine is a commonly used feature, Vault CLI provides the
-[`kv`](/vault/docs/commands/kv) command. Read secrets from the `secret/data/customers`
+[`kv`](/docs/commands/kv) command. Read secrets from the `secret/data/customers`
 path using the `kv` CLI command:
 
 ```shell-session
@@ -61,7 +61,7 @@ engine, it prints the output in more structured format that is easy to read.
 ## Usage
 
 The following flags are available in addition to the [standard set of
-flags](/vault/docs/commands) included on all commands.
+flags](/docs/commands) included on all commands.
 
 ### Output Options
 
@@ -70,8 +70,8 @@ flags](/vault/docs/commands) included on all commands.
   will not have a trailing newline making it ideal for piping to other processes.
 
 - `-format` `(string: "table")` - Print the output in the given format. Valid
-  formats are "table", "json", "yaml", or "raw". This can also be specified
-  via the `VAULT_FORMAT` environment variable.
+  formats are "table", "json", or "yaml". This can also be specified via the
+  `VAULT_FORMAT` environment variable.
 
 For a full list of examples and paths, please see the documentation that
 corresponds to the secrets engine in use.
diff --git a/website/content/docs/commands/secrets/disable.mdx b/website/content/docs/commands/secrets/disable.mdx
index 7918990e4cf1d..78d4b5a7840cf 100644
--- a/website/content/docs/commands/secrets/disable.mdx
+++ b/website/content/docs/commands/secrets/disable.mdx
@@ -28,7 +28,7 @@ $ vault secrets disable aws/
 
 ## Usage
 
-There are no flags beyond the [standard set of flags](/vault/docs/commands)
+There are no flags beyond the [standard set of flags](/docs/commands)
 included on all commands.
 
 ## Force Disable
@@ -43,7 +43,7 @@ can be as simple as increasing the timeout (in the event of timeout errors).
 
 For recovery situations where the secret was manually removed from the
 secrets backing service, one can force a secrets engine disable in Vault by
-performing a [prefix force revoke](/vault/docs/commands/lease/revoke) on the mount
+performing a [prefix force revoke](/docs/commands/lease/revoke) on the mount
 prefix, followed by a `secrets disable` when that completes. 
 If the underlying secrets were not manually cleaned up, this method might result
 in dangling credentials. This is meant for extreme circumstances.
diff --git a/website/content/docs/commands/secrets/enable.mdx b/website/content/docs/commands/secrets/enable.mdx
index 179ce517abf94..82963528c5165 100644
--- a/website/content/docs/commands/secrets/enable.mdx
+++ b/website/content/docs/commands/secrets/enable.mdx
@@ -22,7 +22,7 @@ Some secrets engines persist data, some act as data pass-through, and some
 generate dynamic credentials. The secrets engine will likely require
 configuration after it is mounted. For details on the specific configuration
 options, please see the [secrets engine
-documentation](/vault/docs/secrets).
+documentation](/docs/secrets).
 
 ## Examples
 
@@ -52,17 +52,17 @@ $ vault secrets enable -path=my-secrets my-plugin
 ```
 
 For more information on the specific configuration options and paths, please see
-the [secrets engine](/vault/docs/secrets) documentation.
+the [secrets engine](/docs/secrets) documentation.
 
 ## Usage
 
 The following flags are available in addition to the [standard set of
-flags](/vault/docs/commands) included on all commands.
+flags](/docs/commands) included on all commands.
 
 - `-audit-non-hmac-request-keys` `(string: "")` - Key that will not be HMAC'd
   by audit devices in the request data object. Note that multiple keys may be
   specified by providing this option multiple times, each time with 1 key.
-  An example of this is provided in the [tune section](/vault/docs/commands/secrets/tune).
+  An example of this is provided in the [tune section](/docs/commands/secrets/tune).
 
 - `-audit-non-hmac-response-keys` `(string: "")` - Key that will not be HMAC'd
   by audit devices in the response data object. Note that multiple keys may be
diff --git a/website/content/docs/commands/secrets/index.mdx b/website/content/docs/commands/secrets/index.mdx
index a88cb59f48da3..f40f139c2d9f4 100644
--- a/website/content/docs/commands/secrets/index.mdx
+++ b/website/content/docs/commands/secrets/index.mdx
@@ -16,7 +16,7 @@ Some secrets engines persist data, some act as data pass-through, and some
 generate dynamic credentials. The secrets engine will likely require
 configuration after it is mounted. For details on the specific configuration
 options, please see the [secrets engine
-documentation](/vault/docs/secrets).
+documentation](/docs/secrets).
 
 ## Examples
 
diff --git a/website/content/docs/commands/secrets/list.mdx b/website/content/docs/commands/secrets/list.mdx
index c4253011a847d..68e84f6f8ca87 100644
--- a/website/content/docs/commands/secrets/list.mdx
+++ b/website/content/docs/commands/secrets/list.mdx
@@ -64,7 +64,7 @@ sys/           system        system_c86bd362        n/a            n/a        fa
 ## Usage
 
 The following flags are available in addition to the [standard set of
-flags](/vault/docs/commands) included on all commands.
+flags](/docs/commands) included on all commands.
 
 ### Output Options
 
diff --git a/website/content/docs/commands/secrets/move.mdx b/website/content/docs/commands/secrets/move.mdx
index e8956cb3afca5..4e769f0b7e750 100644
--- a/website/content/docs/commands/secrets/move.mdx
+++ b/website/content/docs/commands/secrets/move.mdx
@@ -30,5 +30,5 @@ $ vault secrets move ns1/secret/ ns2/kv/
 
 ## Usage
 
-There are no flags beyond the [standard set of flags](/vault/docs/commands)
+There are no flags beyond the [standard set of flags](/docs/commands)
 included on all commands.
diff --git a/website/content/docs/commands/secrets/tune.mdx b/website/content/docs/commands/secrets/tune.mdx
index 4074374888c9f..ecd445c3692a0 100644
--- a/website/content/docs/commands/secrets/tune.mdx
+++ b/website/content/docs/commands/secrets/tune.mdx
@@ -52,7 +52,7 @@ $ vault secrets tune -audit-non-hmac-request-keys=common_name -audit-non-hmac-re
 ## Usage
 
 The following flags are available in addition to the [standard set of
-flags](/vault/docs/commands) included on all commands.
+flags](/docs/commands) included on all commands.
 
 - `-allowed-response-headers` `(string: "")` - response header values that the
   secrets engine will be allowed to set. Note that multiple keys may be
@@ -69,7 +69,7 @@ flags](/vault/docs/commands) included on all commands.
 - `-default-lease-ttl` `(duration: "")` - The default lease TTL for this secrets
   engine. If unspecified, this defaults to the Vault server's globally
   configured default lease TTL, or a previously configured value for the secrets
-  engine. Uses [duration format strings](/vault/docs/concepts/duration-format).
+  engine. Uses [duration format strings](/docs/concepts/duration-format).
 
 - `-description` `(string: "")` - Specifies the description of the mount.
   This overrides the current stored value, if any.
@@ -80,10 +80,10 @@ flags](/vault/docs/commands) included on all commands.
 
 - `-max-lease-ttl` `(duration: "")` - The maximum lease TTL for this secrets
   engine. If unspecified, this defaults to the Vault server's globally
-  configured [maximum lease TTL](/vault/docs/configuration#max_lease_ttl), or a
+  configured [maximum lease TTL](/docs/configuration#max_lease_ttl), or a
   previously configured value for the secrets engine. This value is allowed to
   override the server's global max TTL; it can be longer or shorter.
-  Uses [duration format strings](/vault/docs/concepts/duration-format).
+  Uses [duration format strings](/docs/concepts/duration-format).
 
 - `-passthrough-request-headers` `(string: "")` - request header values that will
   be sent to the secrets engine. Note that multiple keys may be
@@ -96,4 +96,4 @@ flags](/vault/docs/commands) included on all commands.
 
 - `-plugin-version` `(string: "")` - Configures the semantic version of the plugin
   to use. The new version will not start running until the mount is
-  [reloaded](/vault/docs/commands/plugin/reload).
+  [reloaded](/docs/commands/plugin/reload).
diff --git a/website/content/docs/commands/server.mdx b/website/content/docs/commands/server.mdx
index 5348a25351fd7..644778bc8667f 100644
--- a/website/content/docs/commands/server.mdx
+++ b/website/content/docs/commands/server.mdx
@@ -17,13 +17,13 @@ API before the server can respond to requests.
 
 For more information, please see:
 
-- [`operator init` command](/vault/docs/commands/operator/init) for information
+- [`operator init` command](/docs/commands/operator/init) for information
   on initializing a Vault server.
 
-- [`operator unseal` command](/vault/docs/commands/operator/unseal) for
+- [`operator unseal` command](/docs/commands/operator/unseal) for
   information on providing unseal keys.
 
-- [Vault configuration](/vault/docs/configuration) for the syntax and
+- [Vault configuration](/docs/configuration) for the syntax and
   various configuration options for a Vault server.
 
 ## Examples
@@ -43,7 +43,7 @@ $ vault server -dev -dev-root-token-id="root"
 ## Usage
 
 The following flags are available in addition to the [standard set of
-flags](/vault/docs/commands) included on all commands.
+flags](/docs/commands) included on all commands.
 
 ### Command Options
 
@@ -52,50 +52,21 @@ flags](/vault/docs/commands) included on all commands.
   multiple configurations. If the path is a directory, all files which end in
   .hcl or .json are loaded.
 
-- `-log-level` ((#\_log_level)) `(string: "info")` - Log verbosity level. Supported values (in
-  order of descending detail) are `trace`, `debug`, `info`, `warn`, and `error`. This can
-  also be specified via the `VAULT_LOG_LEVEL` environment variable.
-
-- `-log-format` ((#\_log_format)) `(string: "standard")` - Log format. Supported values
-  are `standard` and `json`. This can also be specified via the
-  `VAULT_LOG_FORMAT` environment variable.
-
-- `-log-file` ((#\_log_file)) - writes all the Vault log messages
-  to a file. This value is used as a prefix for the log file name. The current timestamp
-  is appended to the file name. If the value ends in a path separator, `vault`
-  will be appended to the value. If the file name is missing an extension, `.log`
-  is appended. For example, setting `log-file` to `/var/log/` would result in a log
-  file path of `/var/log/vault-{timestamp}.log`. `log-file` can be combined with
-  [`-log-rotate-bytes`](#_log_rotate_bytes) and [`-log-rotate-duration`](#_log_rotate_duration)
-  for a fine-grained log rotation experience. This output operates in addition to existing 
-  outputs, meaning logs will continue to be written to journald / stdout (where appropriate).
-
-- `-log-rotate-bytes` ((#\_log_rotate_bytes)) - to specify the number of
-  bytes that should be written to a log before it needs to be rotated. Unless specified,
-  there is no limit to the number of bytes that can be written to a log file.
-
-- `-log-rotate-duration` ((#\_log_rotate_duration)) - to specify the maximum
-  duration a log should be written to before it needs to be rotated. Must be a duration
-  value such as 30s. Defaults to 24h.
-
-- `-log-rotate-max-files` ((#\_log_rotate_max_files)) - to specify the maximum
-  number of older log file archives to keep. Defaults to 0 (no files are ever deleted).
-  Set to -1 to discard old log files when a new one is created.
-
-- `-experiment` `(string array: [])` - The name of an experiment to enable for this node.
-  This flag can be specified multiple times to enable multiple experiments. Experiments
-  should NOT be used in production, and the associated APIs may have backwards incompatible
-  changes between releases. Additional experiments can also be specified via the
-  `VAULT_EXPERIMENTS` environment variable as a comma-separated list, or via the
-  [`experiments`](/vault/docs/configuration#experiments) config key.
+- `-log-level` `(string: "info")` - Log verbosity level. Supported values (in
+  order of detail) are "trace", "debug", "info", "warn", and "err". This can
+  also be specified via the VAULT_LOG_LEVEL environment variable.
+
+- `-log-format` `(string: "standard")` - Log format. Supported values
+  are "standard" and "json". This can also be specified via the
+  VAULT_LOG_FORMAT environment variable.
 
 - `VAULT_ALLOW_PENDING_REMOVAL_MOUNTS` `(bool: false)` - (environment variable)
-  Allow Vault to be started with builtin engines which have the `Pending Removal`
-  deprecation state. This is a temporary stopgap in place in order to perform an
-  upgrade and disable these engines. Once these engines are marked `Removed` (in
-  the next major release of Vault), the environment variable will no longer work
-  and a downgrade must be performed in order to remove the offending engines. For
-  more information, see the [deprecation faq](/vault/docs/deprecation/faq/#q-what-are-the-phases-of-deprecation).
+Allow Vault to be started with builtin engines which have the `Pending Removal`
+deprecation state. This is a temporary stopgap in place in order to perform an
+upgrade and disable these engines. Once these engines are marked `Removed` (in
+the next major release of Vault), the environment variable will no longer work
+and a downgrade must be performed in order to remove the offending engines. For
+more information, see the [deprecation faq](/docs/deprecation/faq/#q-what-are-the-phases-of-deprecation).
 
 ### Dev Options
 
@@ -104,7 +75,7 @@ flags](/vault/docs/commands) included on all commands.
   production.
 
 - `-dev-tls` `(bool: false)` - Enable TLS development mode. In this mode, Vault runs
-  in-memory and starts unsealed with a generated TLS CA, certificate and key.
+  in-memory and starts unsealed with a generated TLS CA, certificate and key. 
   As the name implies, do not run "dev" mode in production.
 
 - `-dev-tls-cert-dir` `(string: "")` - Directory where generated TLS files are created if `-dev-tls` is specified. If left unset, files are generated in a temporary directory.
diff --git a/website/content/docs/commands/ssh.mdx b/website/content/docs/commands/ssh.mdx
index eefc739d6779c..fab9f7d63afe1 100644
--- a/website/content/docs/commands/ssh.mdx
+++ b/website/content/docs/commands/ssh.mdx
@@ -45,12 +45,12 @@ $ vault ssh \
 
 For step-by-step guides and instructions for each of the available SSH
 auth methods, please see the corresponding [SSH secrets
-engine](/vault/docs/secrets/ssh).
+engine](/docs/secrets/ssh).
 
 ## Usage
 
 The following flags are available in addition to the [standard set of
-flags](/vault/docs/commands) included on all commands.
+flags](/docs/commands) included on all commands.
 
 ### Output Options
 
diff --git a/website/content/docs/commands/status.mdx b/website/content/docs/commands/status.mdx
index 7c602346de53c..ea60237de6b25 100644
--- a/website/content/docs/commands/status.mdx
+++ b/website/content/docs/commands/status.mdx
@@ -42,28 +42,10 @@ High-Availability Enabled: false
 ## Usage
 
 The following flags are available in addition to the [standard set of
-flags](/vault/docs/commands) included on all commands.
+flags](/docs/commands) included on all commands.
 
 ### Output Options
 
 - `-format` `(string: "table")` - Print the output in the given format. Valid
   formats are "table", "json", or "yaml". This can also be specified via the
   `VAULT_FORMAT` environment variable.
-
-By default, the output is displayed in "table" format.
-
-#### Output Fields
-
-1. The field for total shares is displayed as `"n"` instead of `n` in yaml outputs. 
-2. The following fields in "table" format are displayed only when relevant:
-- "Unseal Progress" and "Unseal Nonce" are displayed when vault is sealed.
-- "HCP Link Status" and "HCP Link Resource ID" are displayed when HCP link is configured.
-- "Seal Migration in Progress" is displayed when it is in progress.
-- "Cluster Name" and "Cluster ID" are displayed if they have a value.
-- "Raft Committed Index", "Raft Applied Index", "Last WAL" are diplayed if they are non-zero.
-- "Warnings" are displayed if the warnings apply.
-- The following fields are displayed only when HA mode is enabled and is unsealed:
-  - "HA Cluster".
-  - "HA Mode".
-  - "Active Since" is displayed if the node is active and has a valid active time.
-  - "Performance Standby" Node and "Performance Standby Last Remote WAL" are displayed for performance standby nodes.
diff --git a/website/content/docs/commands/token/capabilities.mdx b/website/content/docs/commands/token/capabilities.mdx
index dd524aa99f58b..c8becdd6c4e3d 100644
--- a/website/content/docs/commands/token/capabilities.mdx
+++ b/website/content/docs/commands/token/capabilities.mdx
@@ -35,7 +35,7 @@ deny
 ## Usage
 
 The following flags are available in addition to the [standard set of
-flags](/vault/docs/commands) included on all commands.
+flags](/docs/commands) included on all commands.
 
 ### Output Options
 
diff --git a/website/content/docs/commands/token/create.mdx b/website/content/docs/commands/token/create.mdx
index ed66e21ea90ea..2a3e36e6d6827 100644
--- a/website/content/docs/commands/token/create.mdx
+++ b/website/content/docs/commands/token/create.mdx
@@ -57,7 +57,7 @@ token_policies     [my-policy]
 ## Usage
 
 The following flags are available in addition to the [standard set of
-flags](/vault/docs/commands) included on all commands.
+flags](/docs/commands) included on all commands.
 
 ### Output Options
 
@@ -82,7 +82,7 @@ flags](/vault/docs/commands) included on all commands.
 
 - `-explicit-max-ttl` `(duration: "")` - Explicit maximum lifetime for the
   token. Unlike normal TTLs, the maximum TTL is a hard limit and cannot be
-  exceeded. Uses [duration format strings](/vault/docs/concepts/duration-format).
+  exceeded. Uses [duration format strings](/docs/concepts/duration-format).
 
 - `-id` `(string: "")` - Value for the token. By default, this is an
   auto-generated value. Specifying this value requires sudo permissions.
@@ -101,7 +101,7 @@ flags](/vault/docs/commands) included on all commands.
 - `-period` `(duration: "")` - If specified, every renewal will use the given
   period. Periodic tokens do not expire as long as they are actively being
   renewed (unless `-explicit-max-ttl` is also provided). Setting this value
-  requires sudo permissions. Uses [duration format strings](/vault/docs/concepts/duration-format).
+  requires sudo permissions. Uses [duration format strings](/docs/concepts/duration-format).
 
 - `-policy` `(string: "")` - Name of a policy to associate with this token. This
   can be specified multiple times to attach multiple policies.
@@ -115,7 +115,7 @@ flags](/vault/docs/commands) included on all commands.
 
 - `-ttl` `(duration: "")` - Initial TTL to associate with the token. Token
   renewals may be able to extend beyond this value, depending on the configured
-  maximumTTLs. Uses [duration format strings](/vault/docs/concepts/duration-format).
+  maximumTTLs. Uses [duration format strings](/docs/concepts/duration-format).
 
 - `-type` `(string: "service")` - The type of token to create. Can be "service" or "batch".
 
diff --git a/website/content/docs/commands/token/index.mdx b/website/content/docs/commands/token/index.mdx
index d4a4645c922e7..181e4f8b0c63c 100644
--- a/website/content/docs/commands/token/index.mdx
+++ b/website/content/docs/commands/token/index.mdx
@@ -12,7 +12,7 @@ The `token` command groups subcommands for interacting with tokens. Users can
 create, lookup, renew, and revoke tokens.
 
 For more information on tokens, please see the [token concepts
-page](/vault/docs/concepts/tokens).
+page](/docs/concepts/tokens).
 
 ## Examples
 
diff --git a/website/content/docs/commands/token/lookup.mdx b/website/content/docs/commands/token/lookup.mdx
index bee5061fa9f98..8b617bbfc0568 100644
--- a/website/content/docs/commands/token/lookup.mdx
+++ b/website/content/docs/commands/token/lookup.mdx
@@ -36,7 +36,7 @@ $ vault token lookup -accessor 9793c9b3-e04a-46f3-e7b8-748d7da248da
 ## Usage
 
 The following flags are available in addition to the [standard set of
-flags](/vault/docs/commands) included on all commands.
+flags](/docs/commands) included on all commands.
 
 ### Output Options
 
diff --git a/website/content/docs/commands/token/renew.mdx b/website/content/docs/commands/token/renew.mdx
index 9ff30eafe26bf..48052f609bbba 100644
--- a/website/content/docs/commands/token/renew.mdx
+++ b/website/content/docs/commands/token/renew.mdx
@@ -39,7 +39,7 @@ $ vault token renew -increment=30m 96ddf4bc-d217-f3ba-f9bd-017055595017
 ## Usage
 
 The following flags are available in addition to the [standard set of
-flags](/vault/docs/commands) included on all commands.
+flags](/docs/commands) included on all commands.
 
 ### Output Options
 
diff --git a/website/content/docs/commands/token/revoke.mdx b/website/content/docs/commands/token/revoke.mdx
index a281d4607a582..8d0e33a477c9b 100644
--- a/website/content/docs/commands/token/revoke.mdx
+++ b/website/content/docs/commands/token/revoke.mdx
@@ -38,7 +38,7 @@ Success! Revoked token (if it existed)
 ## Usage
 
 The following flags are available in addition to the [standard set of
-flags](/vault/docs/commands) included on all commands.
+flags](/docs/commands) included on all commands.
 
 - `-accessor` `(bool: false)` - Treat the argument as an accessor instead of a
   token.
diff --git a/website/content/docs/commands/transit/import.mdx b/website/content/docs/commands/transit/import.mdx
deleted file mode 100644
index 2a8c72055602e..0000000000000
--- a/website/content/docs/commands/transit/import.mdx
+++ /dev/null
@@ -1,62 +0,0 @@
----
-layout: docs
-page_title: transit import and transit import-version - Command
-description: |-
-  The "transit import" and "transit import-version" commands import the
-  specified key into Transit, via the Transit BYOK mechanism.
----
-
-# transit import and transit import-version
-
-The `transit import` and `transit import-version` commands import the
-specified key into Transit, via the [Transit BYOK
-mechanism](/vault/docs/secrets/transit#bring-your-own-key-byok). The former
-imports this key as a new key, failing if it already exists, whereas the
-latter will only update an existing key in Transit to a new version of the
-key material.
-
-This needs access to read the transit mount's wrapping key (at
-`transit/wrapping_key`) and the ability to write to either import
-endpoints (either `transit/keys/:name/import` or
-`transit/keys/:name/import_version`).
-
-## Examples
-
-Imports a 2048-bit RSA key as a new key:
-
-```
-$ vault transit import transit/keys/test-key @test-key type=rsa-2048
-Retrieving transit wrapping key.
-Wrapping source key with ephemeral key.
-Encrypting ephemeral key with transit wrapping key.
-Submitting wrapped key to Vault transit.
-Success!
-```
-
-Imports a new version of an existing key:
-
-```
-$ vault transit import-version transit/keys/test-key @test-key-updated
-Retrieving transit wrapping key.
-Wrapping source key with ephemeral key.
-Encrypting ephemeral key with transit wrapping key.
-Submitting wrapped key to Vault transit.
-Success!
-```
-
-## Usage
-
-This command does not have any unique flags and respects core Vault CLI
-commands. See `vault transit import -help` for more information.
-
-This command requires two positional arguments:
-
- 1. `PATH`, the path to the transit key to import in the format of
-    `<mount>/keys/<key-name>`, where `<mount>` is the path to the mount
-    (using `-namespace=<ns>` to specify any namespaces), and `<key-name>`
-    is the desired name of the key.
- 2. `KEY`, the key material to import in Standard Base64 encoding (either
-    of a raw key in the case of symmetric keys such as AES, or of the DER
-    encoded format for asymmetric keys such as RSA). If the value for `KEY`
-    begins with an `@`, the CLI argument is assumed to be a path to a file
-    on disk to be read.
diff --git a/website/content/docs/commands/transit/index.mdx b/website/content/docs/commands/transit/index.mdx
deleted file mode 100644
index 72f8291eb07d2..0000000000000
--- a/website/content/docs/commands/transit/index.mdx
+++ /dev/null
@@ -1,32 +0,0 @@
----
-layout: docs
-page_title: transit - Command
-description: |-
-  The "transit" command groups subcommands for interacting with Vault's Transit
-  secrets engine.
----
-
-# transit
-
-The `transit` command groups subcommands for interacting with Vault's
-[Transit Secrets Engine](/vault/docs/secrets/transit).
-
-## Syntax
-
-Option flags for a given subcommand are provided after the subcommand, but before the arguments.
-
-## Examples
-
-To [import](/vault/docs/commands/transit/import) keys into a mount via the
-[Transit BYOK](/vault/docs/secrets/transit#bring-your-own-key-byok)
-mechanism, use the `vault transit import <path> <key>` or
-`vault transit import-version <path> <key>` commands:
-
-```
-$ vault transit import transit/keys/test-key @test-key type=rsa-2048
-Retrieving transit wrapping key.
-Wrapping source key with ephemeral key.
-Encrypting ephemeral key with transit wrapping key.
-Submitting wrapped key to Vault transit.
-Success!
-```
diff --git a/website/content/docs/commands/unwrap.mdx b/website/content/docs/commands/unwrap.mdx
index db562b8076b55..533cf6174d672 100644
--- a/website/content/docs/commands/unwrap.mdx
+++ b/website/content/docs/commands/unwrap.mdx
@@ -32,7 +32,7 @@ $ vault unwrap # unwraps 848f9ccf...
 ## Usage
 
 The following flags are available in addition to the [standard set of
-flags](/vault/docs/commands) included on all commands.
+flags](/docs/commands) included on all commands.
 
 ### Output Options
 
diff --git a/website/content/docs/commands/write.mdx b/website/content/docs/commands/write.mdx
index 7755a507d3e3e..6ced0952101a8 100644
--- a/website/content/docs/commands/write.mdx
+++ b/website/content/docs/commands/write.mdx
@@ -86,8 +86,8 @@ $ curl --header "X-Vault-Token: $VAULT_TOKEN" \
 The `vault write` command simplifies the API call.
 
 Since token management is a common task, Vault CLI provides a
-[`token`](/vault/docs/commands/token) command with
-[`create`](/vault/docs/commands/token/create) subcommand. The CLI command simplifies
+[`token`](/docs/commands/token) command with
+[`create`](/docs/commands/token/create) subcommand. The CLI command simplifies
 the token creation. Use the `vault create` command with options to set the token
 TTL, policies, and use limit.
 
@@ -102,7 +102,7 @@ you are invoking.
 ## Usage
 
 The following flags are available in addition to the [standard set of
-flags](/vault/docs/commands) included on all commands.
+flags](/docs/commands) included on all commands.
 
 ### Output Options
 
diff --git a/website/content/docs/concepts/auth.mdx b/website/content/docs/concepts/auth.mdx
index 7ad6fdf89dc00..77ac470d01c21 100644
--- a/website/content/docs/concepts/auth.mdx
+++ b/website/content/docs/concepts/auth.mdx
@@ -10,14 +10,14 @@ description: >-
 
 Authentication in Vault is the process by which user or machine supplied
 information is verified against an internal or external system. Vault supports
-multiple [auth methods](/vault/docs/auth) including GitHub,
+multiple [auth methods](/docs/auth) including GitHub,
 LDAP, AppRole, and more. Each auth method has a specific use case.
 
 Before a client can interact with Vault, it must _authenticate_ against an
 auth method. Upon authentication, a token is generated. This token is
 conceptually similar to a session ID on a website. The token may have attached
 policy, which is mapped at authentication time. This process is described in
-detail in the [policies concepts](/vault/docs/concepts/policies) documentation.
+detail in the [policies concepts](/docs/concepts/policies) documentation.
 
 ## auth methods
 
@@ -48,7 +48,7 @@ access, although some backends do support MFA.
 
 ## Tokens
 
-There is an [entire page dedicated to tokens](/vault/docs/concepts/tokens),
+There is an [entire page dedicated to tokens](/docs/concepts/tokens),
 but it is important to understand that authentication works by verifying
 your identity and then generating a token to associate with that identity.
 
@@ -60,7 +60,7 @@ the API you'll have to do this manually.
 This token given for authentication with any backend can also be used
 with the full set of token commands, such as creating new sub-tokens,
 revoking tokens, and renewing tokens. This is all covered on the
-[token concepts page](/vault/docs/concepts/tokens).
+[token concepts page](/docs/concepts/tokens).
 
 ## Authenticating
 
@@ -99,7 +99,7 @@ be used.
 ## Auth Leases
 
 Just like secrets, identities have
-[leases](/vault/docs/concepts/lease) associated with them. This means that
+[leases](/docs/concepts/lease) associated with them. This means that
 you must reauthenticate after the given lease period to continue accessing
 Vault.
 
diff --git a/website/content/docs/concepts/client-count/faq.mdx b/website/content/docs/concepts/client-count/faq.mdx
index b5f9772961cde..8f72e845e5ac0 100644
--- a/website/content/docs/concepts/client-count/faq.mdx
+++ b/website/content/docs/concepts/client-count/faq.mdx
@@ -46,9 +46,9 @@ This FAQ section contains frequently asked questions about the client count feat
 
 ### Q: What is a client?
 
-Clients are unique applications, services, or users that authenticate to a HashiCorp Vault cluster. For billing and consumption, only unique and active clients during the billing period (monthly in the case of HCP and annual in the case of self-managed Vault) count towards totals. Each client is counted just once within a billing period, regardless of how many times it's been active. When a client authenticates to a cluster, those clients have unlimited access to that cluster for the remainder of the billing period. The client metric is a combination of active identity entities and active non-entity tokens. To learn more, refer to the documentation on [What is a Client?](/vault/docs/concepts/client-count#what-is-a-client).
+Clients are unique applications, services, or users that authenticate to a HashiCorp Vault cluster. For billing and consumption, only unique and active clients during the billing period (monthly in the case of HCP and annual in the case of self-managed Vault) count towards totals. Each client is counted just once within a billing period, regardless of how many times it's been active. When a client authenticates to a cluster, those clients have unlimited access to that cluster for the remainder of the billing period. The client metric is a combination of active identity entities and active non-entity tokens. To learn more, refer to the documentation on [What is a Client?](/docs/concepts/client-count#what-is-a-client).
 
-~> **Note**: For KMIP, a different metric is used to compute clients, as described in the **Vault Usage Metrics** documentation under the [KMIP Client metrics](/vault/tutorials/monitoring/usage-metrics) section.
+~> **Note**: For KMIP, a different metric is used to compute clients, as described in the **Vault Usage Metrics** documentation under the [KMIP Client metrics](https://learn.hashicorp.com/tutorials/vault/usage-metrics) section.
 
 ### Q: Where can I learn more about Vault clients?
 
@@ -56,21 +56,21 @@ Refer to the table below for documentation resources.
 
 | Resource                                                                                           | Description                                                                                                      |
 | -------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------- |
-| [What is a Client?](/vault/docs/concepts/client-count/#what-is-a-client)                                 | Provides a conceptual overview of Vault client                                                                   |
-| [Usage Metrics UI](/vault/tutorials/monitoring/usage-metrics)                      | Provides an overview of the client count dashboard and how to use it                                             |
-| [Client Count API](/vault/api-docs/system/internal-counters#client-count)     | Provides information about the client count API endpoints                                                        |
-| [Vault Auditor Tool](/vault/tutorials/monitoring/usage-metrics#vault-auditor-tool) | Provides a walkthrough on how to use the vault-auditor tool to extract metrics from the server audit device logs |
+| [What is a Client?](/docs/concepts/client-count/#what-is-a-client)                                 | Provides a conceptual overview of Vault client                                                                   |
+| [Usage Metrics UI](https://learn.hashicorp.com/tutorials/vault/usage-metrics)                      | Provides an overview of the client count dashboard and how to use it                                             |
+| [Client Count API](https://www.vaultproject.io/api-docs/system/internal-counters#client-count)     | Provides information about the client count API endpoints                                                        |
+| [Vault Auditor Tool](https://learn.hashicorp.com/tutorials/vault/usage-metrics#vault-auditor-tool) | Provides a walkthrough on how to use the vault-auditor tool to extract metrics from the server audit device logs |
 
 ### Q: What is the difference between a direct entity (entity client) and a non-entity token (non-entity client)?
 
-While the definition of clients appears to be simple on the surface, there are many nuances involved in the computation of clients. As mentioned, clients are unique applications, services, and/or users that authenticate to a Vault cluster. When anything authenticates to Vault, it is associated with a unique identity entity within the [Vault Identity system](/vault/docs/secrets/identity). The name reported to the identity systems by the different types of authentication methods varies, and each entity is created or verified during authorization.
+While the definition of clients appears to be simple on the surface, there are many nuances involved in the computation of clients. As mentioned, clients are unique applications, services, and/or users that authenticate to a Vault cluster. When anything authenticates to Vault, it is associated with a unique identity entity within the [Vault Identity system](/docs/secrets/identity). The name reported to the identity systems by the different types of authentication methods varies, and each entity is created or verified during authorization.
 
 One thing to note is that Vault clients are a combination of active identities as well as non-entity tokens. Identity entities are unique users, and when identities authenticate to Vault, corresponding tokens are generated. However, there are some situations in which tokens are generated without corresponding identities (e.g., when using the token auth method to create a token for someone else whose identity is unknown). As such, these non-entity tokens also represent users, and are counted towards the overall client aggregates. Here are some situations in which non-entity tokens get created within Vault.
 
-- Tokens within Vault are the core method for authentication. You can use Tokens to authenticate directly, or use the [auth methods](/vault/docs/concepts/auth) to dynamically generate tokens based on external identities.
+- Tokens within Vault are the core method for authentication. You can use Tokens to authenticate directly, or use the [auth methods](/docs/concepts/auth) to dynamically generate tokens based on external identities.
 - There are scenarios where tokens are created outside of the identity system without an associated entity. For this reason, unique identity entities alone cannot always add up to the total unique authentications made to Vault over a stipulated time period.
 - In a scenario where tokens are created outside of the identity system, these tokens are considered clients. Note that it should be rare for production usage to have any tokens created outside any identity systems.
-- There are a few ways of creating tokens without entities: _Token Roles_, _Token Create APIs_, _Wrapping Tokens_, and _Control Groups_. For more information, refer to the [What is a Client?](/vault/docs/concepts/client-count/#what-is-a-client) documentation.
+- There are a few ways of creating tokens without entities: _Token Roles_, _Token Create APIs_, _Wrapping Tokens_, and _Control Groups_. For more information, refer to the [What is a Client?](/docs/concepts/client-count/#what-is-a-client) documentation.
 
 Client counts are not computed solely using a combination of unique identity entities within Vault but also computed using a combination of unique identity entities and non-entity tokens.
 
@@ -89,7 +89,7 @@ Although client counts have been available via the usage metrics UI since Vault
   - Changed the non-entity token computation logic to deduplicate non-entity tokens, reducing the overall client count. Moving forward, non-entity tokens, where there is no entity to map tokens, Vault will use the contents of the token to generate a unique client identifier based on the namespace ID and associated policies. The clientID will prevent duplicating the same token in the overall client count when the token is used again during the billing period.
   - Changed the tracking of non-entity tokens to complete on access instead of creation.
   - Changed the computation logic to not include root tokens in the client count aggregate.
-  - Changed the local auth mount computation logic such that local auth mounts count towards clients but not as non-entity tokens. Prior to Vault 1.9, local auth mounts counted towards non-entity tokens. Refer to the [What is a Client?](/vault/docs/concepts/client-count) documentation to learn more.
+  - Changed the local auth mount computation logic such that local auth mounts count towards clients but not as non-entity tokens. Prior to Vault 1.9, local auth mounts counted towards non-entity tokens. Refer to the [What is a Client?](/docs/concepts/client-count) documentation to learn more.
   - Added ability to display clients per namespace (top 10, descending order) in the UI and export data for all namespaces. Prior to Vault 1.9, you could not view view the split of clients per namespace on the UI, nor could you export this data via the UI.
   - Added ability to display clients earlier than a month (within ten minutes of enabling the feature) in the UI. Prior to Vault 1.9, after enabling the counting of clients, you had to wait for a month to view the client aggregates in the UI.
   - Changed functionality to disallow creating two aliases from the same auth mount under a single entity. For more information, refer to the question [Starting in Vault 1.9, Vault does not allow creating two aliases from the same auth mount under a single entity. What changed and how does this impact client counting?](#q-starting-in-vault-1-9-vault-does-not-allow-creating-two-aliases-from-the-same-auth-mount-under-a-single-entity-what-changed-and-how-does-this-impact-client-counting)
@@ -99,7 +99,7 @@ Although client counts have been available via the usage metrics UI since Vault
   - Display of clients month to month for a selected billing period via the API.
 
 - Vault 1.11:
-  - (Tech preview) New functionality to export the unique clients that contribute to the client count aggregate for the selected billing period - available via a new [activity export API endpoint](/vault/api-docs/system/internal-counters#activity-export).
+  - (Tech preview) New functionality to export the unique clients that contribute to the client count aggregate for the selected billing period - available via a new [activity export API endpoint](/api-docs/system/internal-counters#activity-export).
   - Display of clients month over month in the UI.
 
 **Auditor tool**:
@@ -113,25 +113,25 @@ The latest GA version of the Vault binary contains the most updated version of t
 
 ### Q: For customers using versions of Vault older than 1.6, what’s the best way to compute clients?
 
-The Vault [auditor tool](/vault/tutorials/monitoring/usage-metrics#vault-auditor-tool) was built to compute clients for Vault versions older than Vault 1.6. It has been tested for versions 1.3 to 1.5 but should work for earlier versions, such as Vault 1.0, although not officially tested. To use the Vault [auditor tool](/vault/tutorials/monitoring/usage-metrics#vault-auditor-tool), customers should have audit logs for the billing period for computed client counts. You can also set a specific date range in the [auditor tool](/vault/tutorials/monitoring/usage-metrics#vault-auditor-tool).
+The Vault [auditor tool](https://learn.hashicorp.com/tutorials/vault/usage-metrics#vault-auditor-tool) was built to compute clients for Vault versions older than Vault 1.6. It has been tested for versions 1.3 to 1.5 but should work for earlier versions, such as Vault 1.0, although not officially tested. To use the Vault [auditor tool](https://learn.hashicorp.com/tutorials/vault/usage-metrics#vault-auditor-tool), customers should have audit logs for the billing period for computed client counts. You can also set a specific date range in the [auditor tool](https://learn.hashicorp.com/tutorials/vault/usage-metrics#vault-auditor-tool).
 
-The auditor tool is separate from the Vault binary. It does not include the latest updates for the usage metrics UI/API (e.g., it does not contain changes made to the deduplication of non-entity tokens logic). Currently, there are no plans to augment the capabilities of the [auditor tool](/vault/tutorials/monitoring/usage-metrics#vault-auditor-tool).
+The auditor tool is separate from the Vault binary. It does not include the latest updates for the usage metrics UI/API (e.g., it does not contain changes made to the deduplication of non-entity tokens logic). Currently, there are no plans to augment the capabilities of the [auditor tool](https://learn.hashicorp.com/tutorials/vault/usage-metrics#vault-auditor-tool).
 
 ### Q: For customers using newer versions than Vault 1.6, what’s the best way to compute clients?
 
-The usage metrics UI that leverages the internal client count API is the best way to compute clients for versions greater than or equal to Vault 1.6. It’s important to note that the upgrade should have occurred before the ‘billing period’ started. Otherwise, it’s best to use the [auditor tool](/vault/tutorials/monitoring/usage-metrics#vault-auditor-tool) to compute clients because the usage metrics UI will not reflect all clients for the billing period; it will only reflect active unique clients since the upgrade.
+The usage metrics UI that leverages the internal client count API is the best way to compute clients for versions greater than or equal to Vault 1.6. It’s important to note that the upgrade should have occurred before the ‘billing period’ started. Otherwise, it’s best to use the [auditor tool](https://learn.hashicorp.com/tutorials/vault/usage-metrics#vault-auditor-tool) to compute clients because the usage metrics UI will not reflect all clients for the billing period; it will only reflect active unique clients since the upgrade.
 
 ### Q: Why do we have two different tools (auditor tool and UI/API) to compute clients? Do we plan to deprecate one in the future?
 
-Not all customers may be on a version greater than Vault version 1.6 that leverages the client count API to display clients via the UI. The [auditor tool](/vault/tutorials/monitoring/usage-metrics#vault-auditor-tool) is available for customers running older Vault versions to compute client counts. The [auditor tool](/vault/tutorials/monitoring/usage-metrics#vault-auditor-tool) does not contain client count computation logic updates (e.g., non-entity token computation logic made in Vault 1.9). In the future, we will deprecate the [auditor tool](/vault/tutorials/monitoring/usage-metrics#vault-auditor-tool).
+Not all customers may be on a version greater than Vault version 1.6 that leverages the client count API to display clients via the UI. The [auditor tool](https://learn.hashicorp.com/tutorials/vault/usage-metrics#vault-auditor-tool) is available for customers running older Vault versions to compute client counts. The [auditor tool](https://learn.hashicorp.com/tutorials/vault/usage-metrics#vault-auditor-tool) does not contain client count computation logic updates (e.g., non-entity token computation logic made in Vault 1.9). In the future, we will deprecate the [auditor tool](https://learn.hashicorp.com/tutorials/vault/usage-metrics#vault-auditor-tool).
 
 ### Q: How can I compute KMIP clients for Vault?
 
-As of Vault 1.11.0, KMIP clients are not available via the usage metrics UI or the client count API; they are provided via the [auditor tool](/vault/tutorials/monitoring/usage-metrics#vault-auditor-tool). To learn more, refer to the [Vault Usage Metrics](/vault/tutorials/monitoring/usage-metrics#vault-auditor-tool) documentation.
+As of Vault 1.11.0, KMIP clients are not available via the usage metrics UI or the client count API; they are provided via the [auditor tool](https://learn.hashicorp.com/tutorials/vault/usage-metrics#vault-auditor-tool). To learn more, refer to the [Vault Usage Metrics](https://learn.hashicorp.com/tutorials/vault/usage-metrics#vault-auditor-tool) documentation.
 
 ### Q: Why do the Vault auditor tool and the usage metrics UI show me different results for the total number of clients?
 
-For versions prior to Vault 1.7, the [auditor tool](/vault/tutorials/monitoring/usage-metrics#vault-auditor-tool) and usage metrics UI should typically result in the same number of total unique clients for the billing period, unless there is some discrepancy in the underlying data represented by both or due to some other error. For example:
+For versions prior to Vault 1.7, the [auditor tool](https://learn.hashicorp.com/tutorials/vault/usage-metrics#vault-auditor-tool) and usage metrics UI should typically result in the same number of total unique clients for the billing period, unless there is some discrepancy in the underlying data represented by both or due to some other error. For example:
 
 - If there is a discrepancy between the dates selected in the two tools, then the clients reflected in the results may be different
 - If the auditor tool does not leverage audit data for the billing period, the auditor results may be incorrect
@@ -143,14 +143,14 @@ For newer versions of Vault 1.8, the API/UI for client counts was updated to ref
 
 ### Q: When I upgrade to a version of Vault that's greater Vault 1.6, will the clients be available for the entire history of the billing period, or only available after the upgrade occurred during the billing period?
 
-The client counts will only be available after the upgrade occurs. For the complete billing period data, it’s preferable to refer to the [auditor tool](/vault/tutorials/monitoring/usage-metrics#vault-auditor-tool). However, keep in mind that since Vault 1.8, we made improvements to the client count API/UI that may cause mismatched results from the [auditor tool](/vault/tutorials/monitoring/usage-metrics#vault-auditor-tool). For more details, refer to the question [If I migrate from Vault 1.8 to 1.9, how will the changes to non-entity token logic and local auth mount made in Vault 1.9 affect the clients created prior to the migration?](/vault/docs/concepts/client-count/faq#q-if-i-migrate-from-vault-1-8-to-1-9-how-will-the-changes-to-non-entity-token-logic-and-local-auth-mount-made-in-vault-1-9-affect-the-clients-created-prior-to-the-migration).
-A workaround is to leverage the results from the UI/API (if on a newer version greater than Vault 1.8) instead of the [auditor tool](/vault/tutorials/monitoring/usage-metrics#vault-auditor-tool), and extrapolate the clients for the available period to the billing period.
+The client counts will only be available after the upgrade occurs. For the complete billing period data, it’s preferable to refer to the [auditor tool](https://learn.hashicorp.com/tutorials/vault/usage-metrics#vault-auditor-tool). However, keep in mind that since Vault 1.8, we made improvements to the client count API/UI that may cause mismatched results from the [auditor tool](https://learn.hashicorp.com/tutorials/vault/usage-metrics#vault-auditor-tool). For more details, refer to the question [If I migrate from Vault 1.8 to 1.9, how will the changes to non-entity token logic and local auth mount made in Vault 1.9 affect the clients created prior to the migration?](/docs/concepts/client-count/faq#q-if-i-migrate-from-vault-1-8-to-1-9-how-will-the-changes-to-non-entity-token-logic-and-local-auth-mount-made-in-vault-1-9-affect-the-clients-created-prior-to-the-migration).
+A workaround is to leverage the results from the UI/API (if on a newer version greater than Vault 1.8) instead of the [auditor tool](https://learn.hashicorp.com/tutorials/vault/usage-metrics#vault-auditor-tool), and extrapolate the clients for the available period to the billing period.
 
 ### Q: If I upgrade from Vault 1.8 to 1.9+, how will the changes to non-entity token logic and local auth mount made in Vault 1.9 affect the clients created prior to the upgrade?
 
 If you have a non-entity token for a fragment pre-Vault 1.9 version and then use the same token post-Vault 1.9 version, it will be counted again. However, for post-upgrade, the token will have an ID associated with it. From there, the subsequent uses of the token will not be counted again, as the token is tracked with the unique clientID. Hence, only for the period post the upgrade, the new deduplication logic for non-entity tokens are accounted for.
 
-As for the local auth mounts, the tokens issued by the local auth mounts pre-Vault 1.9 version will be non-entity-tokens and counted as clients - 1 for each token. After the upgrade to Vault 1.9, the older tokens will continue to be counted as they were counted before, but the newer tokens issued will be part of entities and counted as far lesser clients (equal to the number of entities). To learn more, refer to the documentation on [What is a Client?](/vault/docs/concepts/client-count#what-is-a-client).
+As for the local auth mounts, the tokens issued by the local auth mounts pre-Vault 1.9 version will be non-entity-tokens and counted as clients - 1 for each token. After the upgrade to Vault 1.9, the older tokens will continue to be counted as they were counted before, but the newer tokens issued will be part of entities and counted as far lesser clients (equal to the number of entities). To learn more, refer to the documentation on [What is a Client?](/docs/concepts/client-count#what-is-a-client).
 
 ### Q: Post Vault 1.9, will the clientID be viewable via the audit logs when non-entity tokens are used?
 
@@ -158,7 +158,7 @@ Yes, beginning with Vault 1.9, audit logs have a new field called clientID, whic
 
 ### Q: Is it possible to view a list of unique client IDs that contributed to the client count aggregate?
 
-Yes. This is possible starting with Vault 1.11, with new functionality (tech preview) to export the unique clients that contribute to the client count aggregate for the selected billing period. This is possible via a new [activity export API endpoint](/vault/api-docs/system/internal-counters#activity-export).
+Yes. This is possible starting with Vault 1.11, with new functionality (tech preview) to export the unique clients that contribute to the client count aggregate for the selected billing period. This is possible via a new [activity export API endpoint](/api-docs/system/internal-counters#activity-export).
 
 ### Q: What happens if audit logs are unreadable for use by the Vault auditor tool?
 
@@ -239,7 +239,7 @@ Should a Vault node go down any time during the 10-minute window (e.g., at the 8
 
 ### Q: How can I disable the counting of client activity?
 
-You can disable the count of client activity by using the enabled parameter in the client count config. For more information, refer to the documentation on [Update the Client Count Configuration](/vault/api-docs/system/internal-counters#update-the-client-count-configuration). Disabling the feature during the middle of a month will discard any data recorded for that month but does not delete previous months.
+You can disable the count of client activity by using the enabled parameter in the client count config. For more information, refer to the documentation on [Update the Client Count Configuration](https://www.vaultproject.io/api-docs/system/internal-counters#update-the-client-count-configuration). Disabling the feature during the middle of a month will discard any data recorded for that month but does not delete previous months.
 
 ### Q: If I request data for January 2021 - December 2021, but April’s data does not exist, what will be included in the total client count result?
 
@@ -247,7 +247,7 @@ In this scenario where you requested data for January 2021 through December 2021
 
 ### Q: How can I configure the activity for log retention?
 
-Specify retention months in the client config by following the steps in the documentation on [Update the Client Count Configuration](/vault/api-docs/system/internal-counters#update-the-client-count-configuration).
+Specify retention months in the client config by following the steps in the documentation on [Update the Client Count Configuration](https://www.vaultproject.io/api-docs/system/internal-counters#update-the-client-count-configuration).
 
 ### Q: Do child namespaces create duplicate tokens?
 
@@ -257,7 +257,7 @@ However, creating a new token across a parent/child namespace boundary could res
 
 ### Q: How does the Nomad Vault integration affect client counts?
 
-The [Nomad Vault integration](/nomad/docs/integrations/vault-integration#token-role-based-integration) uses [token roles](/nomad/docs/integrations/vault-integration#vault-token-role-configuration#vault-token-role-configuration). A single token role creates tokens for many Nomad jobs. If no [explicit identity aliases](/vault/api-docs/auth/token#entity_alias) are provided (which is not currently supported in the integration), this would create a non-entity token for every running instance of a Nomad job.
+The [Nomad Vault integration](https://www.nomadproject.io/docs/integrations/vault-integration#token-role-based-integration) uses [token roles](https://www.nomadproject.io/docs/integrations/vault-integration#vault-token-role-configuration#vault-token-role-configuration). A single token role creates tokens for many Nomad jobs. If no [explicit identity aliases](/api-docs/auth/token#entity_alias) are provided (which is not currently supported in the integration), this would create a non-entity token for every running instance of a Nomad job.
 Prior to Vault 1.9, the Nomad Vault integration caused duplicate clients, resulting in an elevated client count. Post Vault 1.9, with the introduction of the deduplication logic, the number of clients created by the integration is reduced. For more information on improvements made to client count in Vault 1.9, refer to the question [Which version of Vault reflects the most accurate count of clients with Vault?](#q-which-vault-version-reflects-the-most-accurate-client-counts).
 
 ### Q: Starting in Vault 1.7, Vault does not allow creating two aliases from the same auth mount under a single entity. What changed and how does this impact client counting?
@@ -270,7 +270,7 @@ To provide further clarity, post Vault 1.9, if there was an auth mount per names
 
 ### Q: How does mount migration impact the client count metric?
 
-In Vault 1.10, we made improvements to the [`sys/remount`](/vault/api-docs/system/remount) API endpoint to simplify the complexities of moving data, such as secret engine and authentication method configuration from one mount to another, within a namespace or across namespaces. This can help with restructuring namespaces and mounts for various reasons, including [migrating mounts](/vault/docs/concepts/mount-migration) from root to other namespaces when transitioning to using namespaces for the first time. To learn more, refer to the [Mount Move](/vault/tutorials/enterprise/mount-move) tutorial.
+In Vault 1.10, we made improvements to the [`sys/remount`](/api-docs/system/remount) API endpoint to simplify the complexities of moving data, such as secret engine and authentication method configuration from one mount to another, within a namespace or across namespaces. This can help with restructuring namespaces and mounts for various reasons, including [migrating mounts](/docs/concepts/mount-migration) from root to other namespaces when transitioning to using namespaces for the first time. To learn more, refer to the [Mount Move](https://learn.hashicorp.com/tutorials/vault/mount-move) tutorial.
 
 When migrating mounts, any aliases that refer to users on the auth mount could now point to an invalid mount when an auth mount is moved. Pointing to an invalid mount may not be the case for every instance; a remount within a namespace will end in the aliases pointing to a valid mount. Still, a remount across namespaces will always result in the aliases pointing to an invalid mount. In the latter case, the Vault operator should find and remove those aliases from the source namespace, and create equivalent aliases and entities for the new mount in the target namespace. If new entities and aliases aren’t created in the target namespace, Vault will dynamically generate them upon login operations.
 
@@ -282,7 +282,7 @@ When migrating mounts within a namespace, client counts are not impacted.
 
 ### Q: Vault 1.9 added support for providing custom user filters through the userfilter parameter. How does this affect client counts?
 
-Vault 1.9 added support for providing custom user filters through the [userfilter](/vault/api-docs/auth/ldap#userfilter) parameter. This addition changed the way that entity alias gets mapped to an entity. Prior to Vault 1.9, alias names were always based on the [login username](/vault/api-docs/auth/ldap#username-3) (which in turn is based on the value of the [userattr](/vault/api-docs/auth/ldap#userattr)). In Vault 1.9, alias names no longer always map to the login username. Instead, the mapping depends on other config values as well, such as [updomain](/vault/api-docs/auth/ldap#upndomain), [binddn](/vault/api-docs/auth/ldap#binddn), [discoverydn](/vault/api-docs/auth/ldap#discoverdn), and userattr.
+Vault 1.9 added support for providing custom user filters through the [userfilter](/api-docs/auth/ldap#userfilter) parameter. This addition changed the way that entity alias gets mapped to an entity. Prior to Vault 1.9, alias names were always based on the [login username](/api-docs/auth/ldap#username-3) (which in turn is based on the value of the [userattr](/api-docs/auth/ldap#userattr)). In Vault 1.9, alias names no longer always map to the login username. Instead, the mapping depends on other config values as well, such as [updomain](/api-docs/auth/ldap#upndomain), [binddn](/api-docs/auth/ldap#binddn), [discoverydn](/api-docs/auth/ldap#discoverdn), and userattr.
 
 Vault 1.10 re-introduces the option to force the alias name to map to the login username with the optional parameter username_as_alias. Users that have the LDAP auth method enabled prior to Vault 1.9 may want to consider setting this to true to revert back to the old behavior. Otherwise, depending on the other aforementioned config values, logins may generate a new and different entity for an existing user that already had an entity associated in Vault. This in turn affects client counts since there may be more than one entity tied to this user. The username_as_alias flag will also be made available in subsequent Vault 1.8.1x and Vault 1.9.x releases to allow for this to be set prior to a Vault 1.10 upgrade.
 
diff --git a/website/content/docs/concepts/client-count/index.mdx b/website/content/docs/concepts/client-count/index.mdx
index 95fba1f94fb27..ade1db822eecc 100644
--- a/website/content/docs/concepts/client-count/index.mdx
+++ b/website/content/docs/concepts/client-count/index.mdx
@@ -21,21 +21,21 @@ There are three main ways clients are assigned an identity:
 
 There can be many different types of clients that authenticate and communicate with Vault using one of the above identities, including:
 
-1. **[Human users](/vault/tutorials/recommended-patterns/pattern-centralized-secrets#human-authentication):** GitHub ID, username/password, LDAP, Active Directory, Kerberos, JWT/ OIDC claims, OKTA
+1. **[Human users](https://learn.hashicorp.com/tutorials/vault/pattern-centralized-secrets?in=vault/recommended-patterns#human-authentication):** GitHub ID, username/password, LDAP, Active Directory, Kerberos, JWT/ OIDC claims, OKTA
 2. **Applications or Microservices:** 2-Factor Authentication methods such as AppRole, or by LDAP, Active Directory, or based on the platform’s identity, such as credentials from AWS, Azure, GCP, AliCloud, OCI, Kubernetes, Cloud Foundry, etc.
-3. **[Servers and Platforms](/vault/tutorials/recommended-patterns/pattern-centralized-secrets#machine-programmatic-authentication):** VMs, Containers, Pods (Identified by LDAP, Active Directory service accounts, AWS, Azure, GCP, AliCloud, OCI, Kubernetes, TLS Certs
+3. **[Servers and Platforms](https://learn.hashicorp.com/tutorials/vault/pattern-centralized-secrets?in=vault/recommended-patterns#machine-programmatic-authentication):** VMs, Containers, Pods (Identified by LDAP, Active Directory service accounts, AWS, Azure, GCP, AliCloud, OCI, Kubernetes, TLS Certs
 4. **Orchestrators:** Nomad, Terraform, Ansible, or Continuous Integration Continuous Delivery (CI/CD) Pipelines where each pipeline usually identified by 2FA
-5. **[Vault Agents and Vault Proxies](/vault/docs/agent-and-proxy/autoauth):** acting on behalf of a app/microservice, typically identified by App role, Cloud credentials, Kubernetes, TLS Certs
+5. **[Vault Agents](/docs/agent/autoauth):** acting on behalf of a app/microservice, typically identified by App role, Cloud credentials, Kubernetes, TLS Certs
 6. **Tokens**: which are not tied to any identities at all. **_These should be used sparingly._**
    Hashicorp recommends always associating tokens to an entity alias and token role.
 
 ## How do Clients work in Vault?
 
-When anything authenticates to Vault, be it a user, application, machine, etc., it is associated with a unique **entity** within the [Vault identity system](/vault/docs/secrets/identity). The name reported to the identity systems by the different types of authentication methods varies ([list below](#authentication-methods-and-how-they-re-counted-in-vault)), each entity is created or verified during authorization. There are scenarios where tokens can be created outside of the identity system, without an associated entity. In this scenario, these tokens are considered **clients** (for production usage, it should be rare to have any tokens created outside any identity systems).
+When anything authenticates to Vault, be it a user, application, machine, etc., it is associated with a unique **entity** within the [Vault identity system](/docs/secrets/identity). The name reported to the identity systems by the different types of authentication methods varies ([list below](#authentication-methods-and-how-they-re-counted-in-vault)), each entity is created or verified during authorization. There are scenarios where tokens can be created outside of the identity system, without an associated entity. In this scenario, these tokens are considered **clients** (for production usage, it should be rare to have any tokens created outside any identity systems).
 
 ## But wait, there’s more...
 
-Want to take full advantage of the Vault identity system and how clients are counted? The Vault identity system also has [Entity Aliases](/vault/api-docs/secret/identity/entity-alias) and [Identity Groups](/vault/api-docs/secret/identity/group-alias).
+Want to take full advantage of the Vault identity system and how clients are counted? The Vault identity system also has [Entity Aliases](/api-docs/secret/identity/entity-alias) and [Identity Groups](/api-docs/secret/identity/group-alias).
 
 ![Vault Identity Entities and Aliases](https://www.datocms-assets.com/2885/1617325026-vault-clients-identity-entity-aliases.png)
 
@@ -47,7 +47,7 @@ Entity Aliases enable users or services to authenticate with more than one metho
 
 Identity Groups within Vault leverage entities, in that Vault enables teams to create and manage logical groupings of entities. **Identity Groups** that can be based on organizations or teams within companies and can be used to assign policies and metadata, making user management dramatically simpler, especially for automating workflows by using Identity Groups to quickly and easily grant access to secrets and functionality within Vault.
 
-For more on managing access with identity, entities, and more, check out [Identity-based Security and Low-trust Networks](https://www.hashicorp.com/identity-based-security-and-low-trust-networks) and the HashiCorp Learn tutorial [Identity: Entities and Groups | Vault](/vault/tutorials/auth-methods/identity)
+For more on managing access with identity, entities, and more, check out [Identity-based Security and Low-trust Networks](https://www.hashicorp.com/identity-based-security-and-low-trust-networks) and the HashiCorp Learn tutorial [Identity: Entities and Groups | Vault](https://learn.hashicorp.com/tutorials/vault/identity)
 
 ## How does Vault avoid counting the same entity twice?
 
@@ -55,18 +55,18 @@ Using the identity system allows for Vault to make sure that entities aren’t c
 
 ## Non-entity Tokens
 
-If you choose to use the [Token Auth Method](/vault/docs/auth/token) without an identity, this will create a non-entity token. Starting with Vault 1.9, any number of non-entity tokens having the same namespace and set of policies assigned, count as one client. In earlier versions, every non-entity token counted as a separate client, which could rapidly drive up client count to unrealistic values. If you are using Vault 1.8 or earlier, and need to address this without upgrading, one option is to create a [Token Role](/vault/api-docs/auth/token#create-update-token-role) first, with allowable entity aliases and create your token with the appropriate [role and entity alias name](/vault/api-docs/auth/token#create-token). All tokens issued with the same entity alias name count as one client.
+If you choose to use the [Token Auth Method](/docs/auth/token) without an identity, this will create a non-entity token. Starting with Vault 1.9, any number of non-entity tokens having the same namespace and set of policies assigned, count as one client. In earlier versions, every non-entity token counted as a separate client, which could rapidly drive up client count to unrealistic values. If you are using Vault 1.8 or earlier, and need to address this without upgrading, one option is to create a [Token Role](/api-docs/auth/token#create-update-token-role) first, with allowable entity aliases and create your token with the appropriate [role and entity alias name](/api-docs/auth/token#create-token). All tokens issued with the same entity alias name count as one client.
 
 ### Differences between a direct entity and a non-entity token
 
-While the definition of clients appears to be simple on the surface, there are many nuances involved in the computation of clients. As mentioned, clients are unique applications, services, and/or users that authenticate to a Vault cluster. When anything authenticates to Vault, it is associated with a unique identity entity within the [Vault Identity system](/vault/docs/secrets/identity). The name reported to the identity systems by the different types of authentication methods varies, and each entity is created or verified during authorization.
+While the definition of clients appears to be simple on the surface, there are many nuances involved in the computation of clients. As mentioned, clients are unique applications, services, and/or users that authenticate to a Vault cluster. When anything authenticates to Vault, it is associated with a unique identity entity within the [Vault Identity system](/docs/secrets/identity). The name reported to the identity systems by the different types of authentication methods varies, and each entity is created or verified during authorization.
 
 One thing to note is that Vault clients are a combination of active identities as well as non-entity tokens. Identity entities are unique users, and when identities authenticate to Vault, corresponding tokens are generated. However, there are some situations in which tokens are generated without corresponding identities (e.g., when using the token auth method to create a token for someone else whose identity is unknown). As such, these non-entity tokens also represent users, and are counted towards the overall client aggregates. Here are some situations in which non-entity tokens get created within Vault.
 
-- Tokens within Vault are the core method for authentication. You can use Tokens to authenticate directly, or use the [auth methods](/vault/docs/concepts/auth) to dynamically generate tokens based on external identities.
+- Tokens within Vault are the core method for authentication. You can use Tokens to authenticate directly, or use the [auth methods](/docs/concepts/auth) to dynamically generate tokens based on external identities.
 - There are scenarios where tokens are created outside of the identity system without an associated entity. For this reason, unique identity entities alone cannot always add up to the total unique authentications made to Vault over a stipulated time period.
 - In a scenario where tokens are created outside of the identity system, these tokens are considered clients. Note that it should be rare for production usage to have any tokens created outside any identity systems.
-- There are a few ways of creating tokens without entities: _Token Roles_, _Token Create APIs_, _Wrapping Tokens_, and _Control Groups_. For more information, refer to the [What is a Client?](/vault/docs/concepts/client-count/#what-is-a-client) documentation.
+- There are a few ways of creating tokens without entities: _Token Roles_, _Token Create APIs_, _Wrapping Tokens_, and _Control Groups_. For more information, refer to the [What is a Client?](/docs/concepts/client-count/#what-is-a-client) documentation.
 
 ## Considerations for Namespaces
 
@@ -77,7 +77,7 @@ Since namespaces represent logical isolations within a single Vault cluster for
    1. Move the auth to the parent workspace and any auth to child namespaces would be considered as the same client
    2. Place that auth in the root namespace to be considered as 1 client in all namespaces.
 
-See also the guide [Secure Multi-Tenancy with Namespaces | Vault](/vault/tutorials/enterprise/namespaces).
+See also the guide [Secure Multi-Tenancy with Namespaces | Vault](https://learn.hashicorp.com/tutorials/vault/namespaces).
 
 ## Authentication Methods and how they’re counted in Vault
 
@@ -89,24 +89,24 @@ How does this relate to Vault clients? As outlined above, and as an example, if
 
 | **Auth method**                                                                                  | **Name reported by auth method**                                                   |
 | ------------------------------------------------------------------------------------------------ | ---------------------------------------------------------------------------------- |
-| **[AliCloud](/vault/docs/auth/alicloud)**                                   | Principal ID                                                                       |
-| **[AppRole](/vault/api-docs/auth/approle#create-update-approle)**           | Role ID                                                                            |
-| **[AWS IAM](/vault/docs/auth/aws#iam-auth-method)**                         | Configurable via iam_alias to one of: Role ID (default), IAM unique ID, Full ARN   |
-| **[AWS EC2](/vault/docs/auth/aws#ec2-auth-method)**                         | Configurable via ec2_alias to one of: Role ID (default), EC2 instance ID, AMI ID   |
-| **[Azure](/vault/api-docs/auth/azure#create-role)**                         | Subject (from JWT claim)                                                           |
-| **[Cloud Foundry](/vault/docs/auth/cf)**                                    | App ID                                                                             |
-| **[GitHub](/vault/docs/auth/github)**                                       | User login name associated with token                                              |
-| **[Google Cloud](/vault/api-docs/auth/gcp#create-role)**                    | Configurable via iam_alias to one of: Role ID (default), Service account unique ID |
-| **[JWT/OIDC](/vault/api-docs/auth/jwt#create-role)**                        | Configurable via user_claim to one of the presented claims (no default value)      |
-| **[Kerberos](/vault/docs/auth/kerberos)**                                   | Username                                                                           |
-| **[Kubernetes](/vault/api-docs/auth/kubernetes#create-role)**               | Service account UID                                                                |
-| **[LDAP](/vault/docs/auth/ldap)**                                           | Username                                                                           |
-| **[OCI](/vault/api-docs/auth/oci#create-role)**                             | Rolename                                                                           |
-| **[Okta](/vault/api-docs/auth/okta#register-user)**                         | Username                                                                           |
-| **[RADIUS](/vault/docs/auth/radius)**                                       | Username                                                                           |
-| **[TLS Certificate](/vault/api-docs/auth/cert#create-ca-certificate-role)** | Subject CommonName                                                                 |
-| **[Token](/vault/docs/auth/token)**                                         | entity_alias, if provided (Note: please ensure that entity_alias is always used)   |
-| **[Username/Password](/vault/api-docs/auth/userpass#create-update-user)**   | Username                                                                           |
+| **[AliCloud](https://www.vaultproject.io/docs/auth/alicloud)**                                   | Principal ID                                                                       |
+| **[AppRole](/api-docs/auth/approle#create-update-approle)**           | Role ID                                                                            |
+| **[AWS IAM](https://www.vaultproject.io/docs/auth/aws#iam-auth-method)**                         | Configurable via iam_alias to one of: Role ID (default), IAM unique ID, Full ARN   |
+| **[AWS EC2](https://www.vaultproject.io/docs/auth/aws#ec2-auth-method)**                         | Configurable via ec2_alias to one of: Role ID (default), EC2 instance ID, AMI ID   |
+| **[Azure](/api-docs/auth/azure#create-role)**                         | Subject (from JWT claim)                                                           |
+| **[Cloud Foundry](https://www.vaultproject.io/docs/auth/cf)**                                    | App ID                                                                             |
+| **[GitHub](https://www.vaultproject.io/docs/auth/github)**                                       | User login name associated with token                                              |
+| **[Google Cloud](/api-docs/auth/gcp#create-role)**                    | Configurable via iam_alias to one of: Role ID (default), Service account unique ID |
+| **[JWT/OIDC](/api-docs/auth/jwt#create-role)**                        | Configurable via user_claim to one of the presented claims (no default value)      |
+| **[Kerberos](https://www.vaultproject.io/docs/auth/kerberos)**                                   | Username                                                                           |
+| **[Kubernetes](/api-docs/auth/kubernetes#create-role)**               | Service account UID                                                                |
+| **[LDAP](https://www.vaultproject.io/docs/auth/ldap)**                                           | Username                                                                           |
+| **[OCI](/api-docs/auth/oci#create-role)**                             | Rolename                                                                           |
+| **[Okta](/api-docs/auth/okta#register-user)**                         | Username                                                                           |
+| **[RADIUS](https://www.vaultproject.io/docs/auth/radius)**                                       | Username                                                                           |
+| **[TLS Certificate](/api-docs/auth/cert#create-ca-certificate-role)** | Subject CommonName                                                                 |
+| **[Token](https://www.vaultproject.io/docs/auth/token)**                                         | entity_alias, if provided (Note: please ensure that entity_alias is always used)   |
+| **[Username/Password](/api-docs/auth/userpass#create-update-user)**   | Username                                                                           |
 
 ## Considerations with CI/CD
 
@@ -118,7 +118,7 @@ A CI/CD workflow can encompass many pipelines. Let us consider your options:
 2. **Pipeline Identity**: Or would every CI/CD pipeline be given an identity (e.g. app role, token with an entity alias), authenticate to Vault once and retrieve all the secrets for each application/ infrastructure to be deployed??
 3. **Pipeline and App/ Service/ Infra identity**: Or would every CI/CD pipeline be given an identity (e.g. app role, token with an entity alias), authenticate to Vault once and then give each application/ service/ infrastructure deployed, workflow its own identity, which upon bootstrap, in turn, authenticates to Vault on its own to retrieve a secret?
 
-From a threat model and security assessment perspective, **_option 3_** above, where the pipeline does not have access to any secret, but allows applications, services or infrastructure to get its own secrets upon bootstrapping, is the most secure approach. With **_options 1_** and **_2_**, there is a risk that if someone gets access to your CI/CD workflow **_(option 1)_**, or your pipelines **_(option 2)_**, they would gain access to every or some of the secrets used by your apps and services. Using the [principle of least privilege](/vault/tutorials/recommended-patterns/pattern-centralized-secrets#the-principle-of-least-privilege-polp), where you only want to give access to secrets where necessary, there should be little or no gap between your secrets distribution and when it is accessed. Therefore one should avoid inadvertently giving your orchestrator and CI/CD tool god-like privileges where it potentially can access every secret for every app, service or infrastructure you deploy.
+From a threat model and security assessment perspective, **_option 3_** above, where the pipeline does not have access to any secret, but allows applications, services or infrastructure to get its own secrets upon bootstrapping, is the most secure approach. With **_options 1_** and **_2_**, there is a risk that if someone gets access to your CI/CD workflow **_(option 1)_**, or your pipelines **_(option 2)_**, they would gain access to every or some of the secrets used by your apps and services. Using the [principle of least privilege](https://learn.hashicorp.com/tutorials/vault/pattern-centralized-secrets?in=vault/recommended-patterns#the-principle-of-least-privilege-polp), where you only want to give access to secrets where necessary, there should be little or no gap between your secrets distribution and when it is accessed. Therefore one should avoid inadvertently giving your orchestrator and CI/CD tool god-like privileges where it potentially can access every secret for every app, service or infrastructure you deploy.
 
 If someone goes wrong in **_option 1_** and you revoke access, all pipelines are affected. If something goes wrong in **_option 2_** and you revoke access to a pipeline, only that pipeline is affected, and you limit your security risk blast radius. If something goes wrong in **_option 3_** you can just revoke an app or service without affecting everything else. Please carefully consider your security options as you manage security in a dynamic world.
 
@@ -137,13 +137,13 @@ The number of active clients using a Vault cluster is the total of:
   that is not associated with an entity
 
 Prior to Vault 1.6, this metric could only be measured from the audit log, using the
-[`vault-auditor`](/vault/tutorials/monitoring/usage-metrics#vault-auditor-tool) tool. Starting with Vault 1.6, the number of clients per month, or for
+[`vault-auditor`](https://learn.hashicorp.com/tutorials/vault/usage-metrics#vault-auditor-tool) tool. Starting with Vault 1.6, the number of clients per month, or for
 a contiguous sequence of months, can be measured by Vault itself.
 
 As of Vault 1.9, the total client count should always be measured using Vault itself. The
 metrics shown by the Vault UI are the source of truth for this data.
 
-Please refer to [Vault Usage Metrics](/vault/tutorials/monitoring/usage-metrics) for a
+Please refer to [Vault Usage Metrics](https://learn.hashicorp.com/tutorials/vault/usage-metrics) for a
 step-by-step tutorial and description of how to use the UI.
 
 ## Measuring clients
@@ -216,8 +216,8 @@ entity_id           n/a
 ```
 
 To reduce the number of non-entity tokens in use, consider switching to an authentication method such as
-[AppRole](/vault/docs/auth/approle) instead of handing out directly-created tokens. Ensure that entities and
-[entity aliases](/vault/api-docs/secret/identity/entity-alias) exist for all login methods used to create batch tokens.
+[AppRole](/docs/auth/approle) instead of handing out directly-created tokens. Ensure that entities and
+[entity aliases](/api-docs/secret/identity/entity-alias) exist for all login methods used to create batch tokens.
 
 ### Tracking non-entity tokens
 
@@ -246,7 +246,7 @@ request; this can happen if the request is unauthenticated, or made with a root
 
 ## API and Permissions
 
-Please see [Client Count API](/vault/api-docs/system/internal-counters#client-count) for more details. Note that this API is marked as
+Please see [Client Count API](/api-docs/system/internal-counters#client-count) for more details. Note that this API is marked as
 "internal" so its behavior or format may change without warning. The UI is the preferred means of interacting with the
 client count feature.
 
@@ -257,67 +257,3 @@ For the UI to be able to use the client count feature, it needs `read` permissio
 
 For the UI to be able to modify the configuration settings, it additionally needs `update` permission to
 `sys/internal/counters/config`.
-
-## New Clients For Current Month
-
-The billing period for the activity log API can be specified to include the current month
-for the end date. For more information, please refer to the
-[the internal counters API docs](/vault/api-docs/system/internal-counters) documentation.
-
-When the end date is the current month, the `new_clients` counts will be an approximation of the
-number of new clients for the month, and not an exact value. Note that the `new_clients` counts for the rest
-of the months will be accurate.
-
-### Why An Approximation?
-
-The `new_clients` counts for the current month is an approximation to improve API
-performance and make the UI usable. To give an exact value for the current month's
-new clients, client IDs need to be de-duplicated with the previous months' client IDs,
-which is a time and i/o intensive process.
-
-### Approximation Details And Accuracy Testing Results
-
-The `new_clients` approximation is calculated by using a [hyperloglog algorithm](https://en.wikipedia.org/wiki/HyperLogLog)
-to approximate the cardinality of the total number of clients within the billing period, and the cardinality
-of the total number of clients within the billing period not including the current month. The returned value
-is the difference between these two numbers.
-
-The hyperloglog library used for the cardinality estimate is [axiomhq](https://github.com/axiomhq/hyperloglog),
-with fourteen registers and the use of sparse representations, when applicable. Some accurate estimates can be found
-in this library's [README](https://github.com/axiomhq/hyperloglog#readme). These are accuracy results
-for the cardinality of the multiset, which is the total number of clients within a billing period. The accuracy
-estimate for the number of new clients can be far lower, depending on the discrepancy between the number of
-clients in the current month and the number of clients in the billing period.
-
-If we call the number of clients for the current month C and the number of clients in the billing period B, we
-have found that in general, if C << B, the approximation can be imprecise, and the further the difference between
-C and B grows, the more imprecise the approximation will be. Furthermore, the closer C is to 0, the more imprecise
-the approximation can be. Also, the more months in the billing period, the less accurate the approximation can be.
-
-The maximum observed error rate ((found new clients)/(expected new clients)) with testing for 10,000 clients and under
-was 30%, with most cases yielding an error rate of 5-10%.
-
-A table with a few randomly selected values for C and B are listed below for the purposes of predictive analysis.
-
-| Current Month Clients      | Total Months' Clients | Accuracy     |
-| :---                       |    :----:             |        ---:  |
-|           7                |         10            |      100%    |
-|           20               |         600           |      100%    |
-|           20               |         1000          |      100%    |
-|           20               |         6000          |      90%     |
-|           20               |         10000         |      90%     |
-|           200              |         600           |      100%    |
-|           200              |         10000         |      93%     |
-|           400              |         6000          |      95%     |
-|           2000             |         10000         |      96%     |
-
-Some multi-month (over 2 months) and multi-segment tests are below:
-
-| Current Month Clients      | Total Months' Clients | Accuracy     |
-| :---                       |    :----:             |        ---:  |
-|           20               |         15            |      100%    |
-|           20               |         100           |      100%    |
-|           20               |         1000          |      100%    |
-|           20               |         10000         |      70%     |
-|           200              |         10000         |      94%     |
-|           2000             |         10000         |      98%     |
diff --git a/website/content/docs/concepts/dev-server.mdx b/website/content/docs/concepts/dev-server.mdx
index acc4f54d666d7..6688a28746d7a 100644
--- a/website/content/docs/concepts/dev-server.mdx
+++ b/website/content/docs/concepts/dev-server.mdx
@@ -50,7 +50,7 @@ flags or by specifying a configuration file):
 
 The dev server should be used for experimentation with Vault features, such
 as different auth methods, secrets engines, audit devices, etc.
-If you're new to Vault, you may want to pick up with [Your First Secret](/vault/tutorials/getting-started/getting-started-first-secret) in our getting started guide.
+If you're new to Vault, you may want to pick up with [Your First Secret](https://learn.hashicorp.com/vault/getting-started/first-secret) in our getting started guide.
 
 In addition to experimentation, the dev server is very easy to automate
 for development environments.
diff --git a/website/content/docs/concepts/events.mdx b/website/content/docs/concepts/events.mdx
deleted file mode 100644
index 50be813ea29cb..0000000000000
--- a/website/content/docs/concepts/events.mdx
+++ /dev/null
@@ -1,169 +0,0 @@
----
-layout: docs
-page_title: Events
-description: >-
-  Events are an experimental feature that allows Vault and plugins to exchange arbitrary activity data
-  within Vault and with external subscribers via WebSockets.
----
-
-# Events
-
-~> **Important:** Events are experimental, and may have backwards incompatible changes introduced in subsequent versions of Vault, or be removed altogether.
-
-Events are arbitrary, **non-secret** data that can be exchanged between producers (Vault and plugins)
-and subscribers (Vault components and external users via the API).
-Events are delivered on a *best-effort* basis, so do not have delivery guarantees at this time.
-
-As of Vault 1.13, events are not considered production-ready, and so are disabled by default when starting a Vault server.
-Events can be enabled via the `events.alpha1` [experiment option](/vault/docs/configuration#experiments) in the Vault
-configuration or on the command-line:
-
-```shell-session
-$ vault server -experiment events.alpha1
-```
-
--> Note: Experiments can only be enabled at startup, and cannot be disabled or enabled at runtime.
-
-## Event Types
-
-<!-- This information will probably be migrated to the plugin pages eventually -->
-
-Internal components of Vault as well as external plugins can generate events.
-These are published to "event types", sometimes called "topics" in some event systems.
-All events of a specific event type will have the same format for their
-additional `metadata` field.
-
-The following events are currently generated by Vault and its builtin plugins automatically:
-
-| Plugin | Event Type              | Vault version |
-| ------ | ----------------------- | ------------- |
-| kv     | `kv-v1/delete`          | 1.13          |
-| kv     | `kv-v1/write`           | 1.13          |
-| kv     | `kv-v2/config-write`    | 1.13          |
-| kv     | `kv-v2/data-delete`     | 1.13          |
-| kv     | `kv-v2/data-patch`      | 1.13          |
-| kv     | `kv-v2/data-write`      | 1.13          |
-| kv     | `kv-v2/delete`          | 1.13          |
-| kv     | `kv-v2/destroy`         | 1.13          |
-| kv     | `kv-v2/metadata-delete` | 1.13          |
-| kv     | `kv-v2/metadata-patch`  | 1.13          |
-| kv     | `kv-v2/metadata-read`   | 1.13          |
-| kv     | `kv-v2/metadata-write`  | 1.13          |
-| kv     | `kv-v2/undelete`        | 1.13          |
-
-
-## Event Format
-
-Events may be formatted in protobuf binary format or as JSON.
-See `EventReceived` in [`sdk/logical/event.proto`](https://github.com/hashicorp/vault/blob/main/sdk/logical/event.proto) in the relevant Vault version for the protobuf schema.
-
-When formatted as JSON, the event conforms to the [CloudEvents](https://cloudevents.io/) specification.
-
-- `id` `(string)` - CloudEvents unique identifier for the event. The `id` is unique for each event, and events with the same `id` represent the same event.
-
-- `source` `(string)` - CloudEvents source, which is currently `https://vaultproject.io`.
-
-- `specversion` `(string)` - The CloudEvents specification version this conforms to.
-
-- `type` `(string)` - CloudEvents type this event corresponds to, which is currently always `*`.
-
-- ` datacontenttype` `(string)` - CloudEvents content type of the event, which is currently always `application/json`.
-
-- `time` `(string)` - ISO 8601-formatted timestamp for when the event was generated.
-
-- ` data` `(object)` - Vault-specific data.
-
-  - `event` `(Event)` - contains the event that happened.
-
-    - `id` `(string)` - (repeat of the `id` parameter)
-
-    - `metadata` `(object)` - arbitrary extra data customized for the event type.
-
-  - `eventType` `(string)` - the event type that was published.
-
-  - `pluginInfo` `(PluginInfo)` - information about the plugin that generated the event, if applicable.
-
-    - `mountClass` `(string)` - the class of plugin, e.g., `secret`, `auth`.
-
-    - `mountAccessor` `(string)` - the unique ID of the mounted plugin.
-
-    - `mountPath` `(string)` - the path that the plugin is mounted at.
-
-    - `plugin` `(string)` - the name of the plugin, e.g., `kv`.
-
-Here is an example event in JSON format:
-
-```json
-{
-  "id": "901f2388-aabb-a385-7bc0-0b09d5fa060b",
-  "source": "https://vaultproject.io/",
-  "specversion": "1.0",
-  "type": "*",
-  "data": {
-    "event": {
-      "id": "901f2388-aabb-a385-7bc0-0b09d5fa060b",
-      "metadata": {
-        "current_version": "1",
-        "oldest_version": "0",
-        "path": "data/foo"
-      }
-    },
-    "event_type": "kv-v2/data-write",
-    "plugin_info": {
-      "mount_class": "secret",
-      "mount_accessor": "kv_a6081d01",
-      "mount_path": "secret/",
-      "plugin": "kv"
-    }
-  },
-  "datacontentype": "application/cloudevents",
-  "time": "2023-02-17T13:11:39.227341-08:00"
-}
-```
-
-## Subscribing to Events
-
-Vault has an API endpoint, `/v1/sys/events/subscribe/{eventType}`, that allows users to subscribe to events via a
-WebSocket stream.
-This endpoint supports the standard authentication and authorization workflows used by other Vault endpoints.
-The `{eventType}` parameter is a non-empty string of what event type to subscribe to, which may contain wildcards (`*`)
-to subscribe to multiple events, e.g., `kv-v2/data-*`.
-
-By default, the events are delivered in protobuf binary format.
-The endpoint can also format the data as JSON if the `json` query parameter is set to `true`:
-
-```shell-session
-$ wscat -H "X-Vault-Token: $(vault print token)" --connect 'ws://127.0.0.1:8200/v1/sys/events/subscribe/kv-v2/data-write?json=true
-{"id":"901f2388-aabb-a385-7bc0-0b09d5fa060b","source":"https://vaultproject.io/","specversion":"1.0","type":"*","data":{"event":{"id":"901f2388-aabb-a385-7bc0-0b09d5fa060b","metadata":{"current_version":"1","oldest_version":"0","path":"data/foo"}},"event_type":"kv-v2/data-write","plugin_info":{"mount_class":"secret","mount_accessor":"kv_a6081d01","mount_path":"secret/","plugin":"kv"}},"datacontentype":"application/cloudevents","time":"2023-02-17T13:11:39.227341-08:00"}
-...
-```
-
-The Vault CLI support this endpoint via the `events subscribe` command, which will output a stream of
-JSON for the requested events (one line per event):
-
-```shell-session
-$ vault events subscribe kv-v2/data-write
-{"id":"901f2388-aabb-a385-7bc0-0b09d5fa060b","source":"https://vaultproject.io/","specversion":"1.0","type":"*","data":{"event":{"id":"901f2388-aabb-a385-7bc0-0b09d5fa060b","metadata":{"current_version":"1","oldest_version":"0","path":"data/foo"}},"event_type":"kv-v2/data-write","plugin_info":{"mount_class":"secret","mount_accessor":"kv_a6081d01","mount_path":"secret/","plugin":"kv"}},"datacontentype":"application/cloudevents","time":"2023-02-17T13:11:39.227341-08:00"}
-...
-```
-
-## Policies
-
-To subscribe, the `read` capability must be granted by a [policy](/vault/docs/concepts/policies)
-on the `/v1/sys/events/subscribe/{eventType}` path, where `{eventType}` is the event type that will be
-subscribed to. The path may contain wildcards.
-
-An example blanket policy is:
-```hcl
-path "sys/events/subscribe/*" {
-    capabilities = ["read"]
-}
-```
-
-
-## Supported Versions
-
-| Vault Version | Support                                     |
-| ------------- | ------------------------------------------- |
-| <= 1.12       | Not supported                               |
-| 1.13          | Supported (with `events.alpha1` experiment) |
\ No newline at end of file
diff --git a/website/content/docs/concepts/ha.mdx b/website/content/docs/concepts/ha.mdx
index 1a5909cbf4d43..09d70ab0b5e9d 100644
--- a/website/content/docs/concepts/ha.mdx
+++ b/website/content/docs/concepts/ha.mdx
@@ -16,7 +16,7 @@ You can tell if a data store supports high availability mode ("HA") by starting
 the server and seeing if "(HA available)" is output next to the data store
 information. If it is, then Vault will automatically use HA mode. This
 information is also available on the
-[Configuration](/vault/docs/configuration) page.
+[Configuration](/docs/configuration) page.
 
 To be highly available, one of the Vault server nodes grabs a lock within the
 data store. The successful server node then becomes the active node; all other
@@ -33,11 +33,11 @@ Certain storage backends can support high availability mode, which enable them
 to store both Vault's information in addition to the HA lock. However, Vault
 also supports split data/HA mode, whereby the lock value and the rest of the
 data live separately. This can be done by specifying both the
-[`storage`](/vault/docs/configuration#storage) and
-[`ha_storage`](/vault/docs/configuration#ha_storage) stanzas in the configuration file
+[`storage`](/docs/configuration#storage) and
+[`ha_storage`](/docs/configuration#ha_storage) stanzas in the configuration file
 with different backends. For instance, a Vault cluster can be set up to use
-Consul as the [`ha_storage`](/vault/docs/configuration#ha_storage) to manage the lock,
-and use Amazon S3 as the [`storage`](/vault/docs/configuration#storage) for all other
+Consul as the [`ha_storage`](/docs/configuration#ha_storage) to manage the lock,
+and use Amazon S3 as the [`storage`](/docs/configuration#storage) for all other
 persisted data.
 
 The sections below explain the server communication patterns and each type of
@@ -87,35 +87,35 @@ always required for all HA setups.
 
 Some HA data store drivers can autodetect the redirect address, but it is often
 necessary to configure it manually via a top-level value in the configuration
-file. The key for this value is [`api_addr`](/vault/docs/configuration#api_addr) and
+file. The key for this value is [`api_addr`](/docs/configuration#api_addr) and
 the value can also be specified by the `VAULT_API_ADDR` environment variable,
 which takes precedence.
 
-What the [`api_addr`](/vault/docs/configuration#api_addr) value should be set to
+What the [`api_addr`](/docs/configuration#api_addr) value should be set to
 depends on how Vault is set up. There are two common scenarios: Vault servers
 accessed directly by clients, and Vault servers accessed via a load balancer.
 
-In both cases, the [`api_addr`](/vault/docs/configuration#api_addr) should be a full
+In both cases, the [`api_addr`](/docs/configuration#api_addr) should be a full
 URL including scheme (`http`/`https`), not simply an IP address and port.
 
 ### Direct Access
 
 When clients are able to access Vault directly, the
-[`api_addr`](/vault/docs/configuration#api_addr) for each node should be that node's
+[`api_addr`](/docs/configuration#api_addr) for each node should be that node's
 address. For instance, if there are two Vault nodes:
 
 - `A`, accessed via `https://a.vault.mycompany.com:8200`
 - `B`, accessed via `https://b.vault.mycompany.com:8200`
 
 Then node `A` would set its
-[`api_addr`](/vault/docs/configuration#api_addr) to
+[`api_addr`](/docs/configuration#api_addr) to
 `https://a.vault.mycompany.com:8200` and node `B` would set its
-[`api_addr`](/vault/docs/configuration#api_addr) to
+[`api_addr`](/docs/configuration#api_addr) to
 `https://b.vault.mycompany.com:8200`.
 
 This way, when `A` is the active node, any requests received by node `B` will
 cause it to redirect the client to node `A`'s
-[`api_addr`](/vault/docs/configuration#api_addr) at `https://a.vault.mycompany.com`,
+[`api_addr`](/docs/configuration#api_addr) at `https://a.vault.mycompany.com`,
 and vice-versa.
 
 ### Behind Load Balancers
@@ -126,7 +126,7 @@ case, the Vault servers should actually be set up as described in the above
 section, since for redirection purposes the clients have direct access.
 
 However, if the only access to the Vault servers is via the load balancer, the
-[`api_addr`](/vault/docs/configuration#api_addr) on each node should be the same: the
+[`api_addr`](/docs/configuration#api_addr) on each node should be the same: the
 address of the load balancer. Clients that reach a standby node will be
 redirected back to the load balancer; at that point hopefully the load
 balancer's configuration will have been updated to know the address of the
@@ -135,16 +135,16 @@ setup when it can be avoided.
 
 ### Per-Node Cluster Listener Addresses
 
-Each [`listener`](/vault/docs/configuration/listener) block in Vault's configuration
-file contains an [`address`](/vault/docs/configuration/listener/tcp#address) value on
+Each [`listener`](/docs/configuration/listener) block in Vault's configuration
+file contains an [`address`](/docs/configuration/listener/tcp#address) value on
 which Vault listens for requests. Similarly, each
-[`listener`](/vault/docs/configuration/listener) block can contain a
-[`cluster_address`](/vault/docs/configuration/listener/tcp#cluster_address) on which
+[`listener`](/docs/configuration/listener) block can contain a
+[`cluster_address`](/docs/configuration/listener/tcp#cluster_address) on which
 Vault listens for server-to-server cluster requests. If this value is not set,
 its IP address will be automatically set to same as the
-[`address`](/vault/docs/configuration/listener/tcp#address) value, and its port will
+[`address`](/docs/configuration/listener/tcp#address) value, and its port will
 be automatically set to the same as the
-[`address`](/vault/docs/configuration/listener/tcp#address) value plus one (so by
+[`address`](/docs/configuration/listener/tcp#address) value plus one (so by
 default, port `8201`).
 
 Note that _only_ active nodes have active listeners. When a node becomes active
@@ -152,14 +152,14 @@ it will start cluster listeners, and when it becomes standby it will stop them.
 
 ### Per-Node Cluster Address
 
-Similar to the [`api_addr`](/vault/docs/configuration#api_addr),
-[`cluster_addr`](/vault/docs/configuration#cluster_addr) is the value that each node,
+Similar to the [`api_addr`](/docs/configuration#api_addr),
+[`cluster_addr`](/docs/configuration#cluster_addr) is the value that each node,
 if active, should advertise to the standbys to use for server-to-server
 communications, and lives as a top-level value in the configuration file. On
 each node, this should be set to a host name or IP address that a standby can
 use to reach one of that node's
-[`cluster_address`](/vault/docs/configuration#cluster_address) values set in the
-[`listener`](/vault/docs/configuration/listener) blocks, including port. (Note that
+[`cluster_address`](/docs/configuration#cluster_address) values set in the
+[`listener`](/docs/configuration/listener) blocks, including port. (Note that
 this will always be forced to `https` since only TLS connections are used
 between servers.)
 
@@ -169,12 +169,12 @@ variable, which takes precedence.
 ## Storage Support
 
 Currently there are several storage backends that support high availability
-mode, including [Consul](/vault/docs/configuration/storage/consul),
-[ZooKeeper](/vault/docs/configuration/storage/zookeeper) and [etcd](/vault/docs/configuration/storage/etcd). These may
-change over time, and the [configuration page](/vault/docs/configuration) should be
+mode, including [Consul](/docs/configuration/storage/consul),
+[ZooKeeper](/docs/configuration/storage/zookeeper) and [etcd](/docs/configuration/storage/etcd). These may
+change over time, and the [configuration page](/docs/configuration) should be
 referenced.
 
-HashiCorp recommends [Vault Integrated Storage](/vault/docs/configuration/storage/raft) as the default HA backend for new deployments of Vault. [Consul Storage Backend](/vault/docs/configuration/storage/consul) is also a supported option and used by many production deployments. See the [comparison chart](/vault/docs/configuration/storage#integrated-storage-vs-consul-as-vault-storage) for help deciding which option is best for you.
+HashiCorp recommends [Vault Integrated Storage](/docs/configuration/storage/raft) as the default HA backend for new deployments of Vault. [Consul Storage Backend](/docs/configuration/storage/consul) is also a supported option and used by many production deployments. See the [comparison chart](/docs/configuration/storage#integrated-storage-vs-consul-as-vault-storage) for help deciding which option is best for you.
 
 If you're interested in implementing another backend or adding HA support to
 another backend, we'd love your contributions. Adding HA support requires
diff --git a/website/content/docs/concepts/identity.mdx b/website/content/docs/concepts/identity.mdx
index 9b83381d97eed..a6d2808983df5 100644
--- a/website/content/docs/concepts/identity.mdx
+++ b/website/content/docs/concepts/identity.mdx
@@ -12,7 +12,7 @@ overview of the various terminologies and their concepts. The idea of Identity
 is to maintain the clients who are recognized by Vault. As such, Vault provides
 an identity management solution through the **Identity secrets engine**. For
 more information about the Identity secrets engine and how it is used, refer to
-the [Identity Secrets Engine](/vault/docs/secrets/identity) documentation.
+the [Identity Secrets Engine](/docs/secrets/identity) documentation.
 
 ## Entities and Aliases
 
@@ -45,7 +45,7 @@ to the authenticated token. When such tokens are used, their entity identifiers
 are audit logged, marking a trail of actions performed by specific users.
 
 ~> Vault Entity is used to count the number of Vault clients. To learn more
-about client count, refer to the [Client Count](/vault/docs/concepts/client-count)
+about client count, refer to the [Client Count](/docs/concepts/client-count)
 documentation.
 
 ## Entity Management
@@ -186,9 +186,9 @@ group and has an alias that maps to the group in LDAP. If the user is removed
 from the group in LDAP, that change gets reflected in Vault only upon the
 subsequent login or renewal operation.
 
-For information about Identity Secrets Engine, refer to [Identity Secrets Engine](/vault/docs/secrets/identity).
+For information about Identity Secrets Engine, refer to [Identity Secrets Engine](/docs/secrets/identity).
 
 ## Tutorial
 
 Refer to the [Identity: Entities and
-Groups](/vault/tutorials/auth-methods/identity) tutorial to learn how Vault supports mutliple authentication methods and enables the same authentication method to be used with different mount paths.
+Groups](https://learn.hashicorp.com/tutorials/vault/identity) tutorial to learn how Vault supports mutliple authentication methods and enables the same authentication method to be used with different mount paths.
diff --git a/website/content/docs/concepts/integrated-storage/autopilot.mdx b/website/content/docs/concepts/integrated-storage/autopilot.mdx
index 6e945d4459358..9ea4aab4eab22 100644
--- a/website/content/docs/concepts/integrated-storage/autopilot.mdx
+++ b/website/content/docs/concepts/integrated-storage/autopilot.mdx
@@ -51,8 +51,8 @@ Raft clusters deployed with older versions of Vault will also transition to use
 Autopilot automatically.
 
 Autopilot exposes a [configuration
-API](/vault/api-docs/system/storage/raftautopilot#set-configuration) to manage its
-behavior. Autopilot gets initialized with the following default values. If these default values do not meet your expected autopilot behavior, don't forget to set them to your desired values.
+API](/api-docs/system/storage/raftautopilot#set-configuration) to manage its
+behavior. Autopilot gets initialized with the following default values.
 
 - `cleanup_dead_servers` - `false`
   - This controls whether to remove dead servers from
@@ -80,7 +80,7 @@ behavior. Autopilot gets initialized with the following default values. If these
   - Minimum amount of time a server must be in a healthy state before it can become a voter. Until that happens,
     it will be visible as a peer in the cluster, but as a non-voter, meaning it won't contribute to quorum.
 
-- `disable_upgrade_migration` - `false`
+- `disable-upgrade-migration` - `false`
   - Controls whether to disable automated upgrade migrations, an Enterprise-only feature.
 
 ~> **Note**: Autopilot in Vault does similar things to what autopilot does in
@@ -115,13 +115,13 @@ increase read scalability.
 DR secondary and Performance secondary clusters have their own Autopilot configurations, managed
 independently of their primary.
 
-The [Autopilot API](/vault/api-docs/system/storage/raftautopilot) uses DR operation tokens for
+The [Autopilot API](/api-docs/system/storage/raftautopilot) uses DR operation tokens for
 authorization when executed against a DR secondary cluster.
 
 ## Tutorial
 
 Refer to the following tutorials to learn more.
 
-- [Integrated Storage Autopilot](/vault/tutorials/raft/raft-autopilot)
-- [Fault Tolerance with Redundancy Zones](/vault/tutorials/raft/raft-redundancy-zones)
-- [Automate Upgrades with Vault Enterprise](/vault/tutorials/raft/raft-upgrade-automation)
+- [Integrated Storage Autopilot](https://learn.hashicorp.com/tutorials/vault/raft-autopilot)
+- [Fault Tolerance with Redundancy Zones](https://learn.hashicorp.com/tutorials/vault/raft-redundancy-zones)
+- [Automate Upgrades with Vault Enterprise](https://learn.hashicorp.com/tutorials/vault/raft-upgrade-automation)
diff --git a/website/content/docs/concepts/integrated-storage/index.mdx b/website/content/docs/concepts/integrated-storage/index.mdx
index bf5797ca10dc1..0e1f24a424849 100644
--- a/website/content/docs/concepts/integrated-storage/index.mdx
+++ b/website/content/docs/concepts/integrated-storage/index.mdx
@@ -16,8 +16,8 @@ The option stores Vault's data on the server's filesystem and
 uses a consensus protocol to replicate data to each server in the cluster. More
 information on the internals of Integrated Storage can be found in the
 [Integrated Storage internals
-documentation](/vault/docs/internals/integrated-storage/). Additionally, the
-[Configuration](/vault/docs/configuration/storage/raft/) docs can help in configuring
+documentation](/docs/internals/integrated-storage/). Additionally, the
+[Configuration](/docs/configuration/storage/raft/) docs can help in configuring
 Vault to use Integrated Storage.
 
 The sections below go into various details on how to operate Vault with
@@ -30,7 +30,7 @@ Vault's cluster port. The cluster port defaults to `8201`. The TLS information
 is exchanged at join time and is rotated on a cadence.
 
 A requirement for Integrated Storage is that the
-[`cluster_addr`](/vault/docs/concepts/ha#per-node-cluster-address) configuration option
+[`cluster_addr`](/docs/concepts/ha#per-node-cluster-address) configuration option
 is set. This allows Vault to assign an address to the node ID at join time.
 
 ## Cluster Membership
@@ -39,9 +39,9 @@ This section will outline how to bootstrap and manage a cluster of Vault nodes
 running Integrated Storage.
 
 Integrated Storage is bootstrapped during the [initialization
-process](/vault/tutorials/getting-started/getting-started-deploy#initializing-the-vault),
+process](https://learn.hashicorp.com/vault/getting-started/deploy#initializing-the-vault),
 and results in a cluster of size 1. Depending on the [desired deployment
-size](/vault/docs/internals/integrated-storage/#deployment-table), nodes can be joined
+size](/docs/internals/integrated-storage/#deployment-table), nodes can be joined
 to the active Vault node.
 
 ### Joining Nodes
@@ -57,7 +57,7 @@ been joined it cannot be re-joined to a different cluster.
 
 You can either join the node automatically via the config file or manually through the
 API (both methods described below). When joining a node, the API address of the leader node must be used. We
-recommend setting the [`api_addr`](/vault/docs/concepts/ha#direct-access) configuration
+recommend setting the [`api_addr`](/docs/concepts/ha#direct-access) configuration
 option on all nodes to make joining simpler.
 
 #### `retry_join` Configuration
@@ -69,7 +69,7 @@ leaders become active this node will successfully join. When using Shamir seal,
 the joined nodes will still need to be unsealed manually. When using Auto Unseal
 the node will be able to join and unseal automatically.
 
-An example [`retry_join`](/vault/docs/configuration/storage/raft#retry_join-stanza)
+An example [`retry_join`](/docs/configuration/storage/raft#retry_join-stanza)
 config can be seen below:
 
 ```hcl
@@ -86,18 +86,18 @@ storage "raft" {
 }
 ```
 
-Note, in each [`retry_join`](/vault/docs/configuration/storage/raft#retry_join-stanza)
+Note, in each [`retry_join`](/docs/configuration/storage/raft#retry_join-stanza)
 stanza, you may provide a single
-[`leader_api_addr`](/vault/docs/configuration/storage/raft#leader_api_addr) or
-[`auto_join`](/vault/docs/configuration/storage/raft#auto_join) value. When a cloud
-[`auto_join`](/vault/docs/configuration/storage/raft#auto_join) configuration value is
+[`leader_api_addr`](/docs/configuration/storage/raft#leader_api_addr) or
+[`auto_join`](/docs/configuration/storage/raft#auto_join) value. When a cloud
+[`auto_join`](/docs/configuration/storage/raft#auto_join) configuration value is
 provided, Vault will use [go-discover](https://github.com/hashicorp/go-discover)
 to automatically attempt to discover and resolve potential Raft leader
 addresses.
 
 See the go-discover
 [README](https://github.com/hashicorp/go-discover/blob/master/README.md) for
-details on the format of the [`auto_join`](/vault/docs/configuration/storage/raft#auto_join) value.
+details on the format of the [`auto_join`](/docs/configuration/storage/raft#auto_join) value.
 
 ```hcl
 storage "raft" {
@@ -111,8 +111,8 @@ storage "raft" {
 ```
 
 By default, Vault will attempt to reach discovered peers using HTTPS and port 8200. Operators may override these through the
-[`auto_join_scheme`](/vault/docs/configuration/storage/raft#auto_join_scheme) and
-[`auto_join_port`](/vault/docs/configuration/storage/raft#auto_join_port) fields
+[`auto_join_scheme`](/docs/configuration/storage/raft#auto_join_scheme) and
+[`auto_join_port`](/docs/configuration/storage/raft#auto_join_port) fields
 respectively.
 
 ```hcl
@@ -131,7 +131,7 @@ storage "raft" {
 #### Join from the CLI
 
 Alternatively you can use the [`join` CLI
-command](/vault/docs/commands/operator/raft/#join) or the API to join a node. The
+command](/docs/commands/operator/raft/#join) or the API to join a node. The
 active node's API address will need to be specified:
 
 ```shell-session
@@ -143,7 +143,7 @@ $ vault operator raft join https://node1.vault.local:8200
 Nodes that are joined to a cluster can be specified as non-voters. A non-voting
 node has all of Vault's data replicated to it, but does not contribute to the
 quorum count. This can be used in conjunction with [Performance
-Standby](/vault/docs/enterprise/performance-standby/) nodes to add read scalability to
+Standby](/docs/enterprise/performance-standby/) nodes to add read scalability to
 a cluster in cases where a high volume of reads to servers are needed.
 
 ```shell-session
@@ -159,7 +159,7 @@ the size of the cluster, or for many other reasons. Removing the peer will
 ensure the cluster stays at the desired size, and that quorum is maintained.
 
 To remove the peer you can issue a
-[`remove-peer`](/vault/docs/commands/operator/raft#remove-peer) command and provide the
+[`remove-peer`](/docs/commands/operator/raft#remove-peer) command and provide the
 node ID you wish to remove:
 
 ```shell-session
@@ -170,7 +170,7 @@ Peer removed successfully!
 ### Listing Peers
 
 To see the current peer set for the cluster you can issue a
-[`list-peers`](/vault/docs/commands/operator/raft#list-peers) command. All the voting
+[`list-peers`](/docs/commands/operator/raft#list-peers) command. All the voting
 nodes that are listed here contribute to the quorum and a majority must be alive
 for Integrated Storage to continue to operate.
 
@@ -198,8 +198,8 @@ these IPs in their IP SANs.
 Before we explore solutions to this problem, let's recapitulate how Vault nodes
 speak to one another.
 
-Vault exposes two TCP ports: [the API port](/vault/docs/configuration#api_addr) and
-[the cluster port](/vault/docs/configuration#cluster_addr).
+Vault exposes two TCP ports: [the API port](/docs/configuration#api_addr) and
+[the cluster port](/docs/configuration#cluster_addr).
 
 The API port is where clients send their Vault HTTP requests.
 
@@ -238,15 +238,15 @@ All subsequent inter-node communication will use the cluster port.
 
 ### Assisted raft join techniques
 
-The simplest option is to do it by hand: issue [`raft join`](/vault/docs/commands/operator/raft#join) commands specifying the explicit names
+The simplest option is to do it by hand: issue [`raft join`](/docs/commands/operator/raft#join) commands specifying the explicit names
 or IPs of the nodes to join to. In this section we look at other TLS-compatible
 options that lend themselves more to automation.
 
 #### Autojoin with TLS servername
 
 As of Vault 1.6.2, the simplest option might be to specify a
-[`leader_tls_servername`](/vault/docs/configuration/storage/raft#leader_tls_servername)
-in the [`retry_join`](/vault/docs/configuration/storage/raft#retry_join-stanza) stanza
+[`leader_tls_servername`](/docs/configuration/storage/raft#leader_tls_servername)
+in the [`retry_join`](/docs/configuration/storage/raft#retry_join-stanza) stanza
 which matches a [DNS
 SAN](https://en.wikipedia.org/wiki/Subject_Alternative_Name) in the certificate.
 
@@ -269,7 +269,7 @@ using non-voting nodes and dynamically scaling clusters.
 Most Vault instances are going to have a load balancer (LB) between clients and
 the Vault nodes. In that case, the LB knows how to route traffic to working
 Vault nodes, and there's no need for auto-join: we can just use
-[`retry_join`](/vault/docs/configuration/storage/raft#retry_join-stanza) with the LB
+[`retry_join`](/docs/configuration/storage/raft#retry_join-stanza) with the LB
 address as the target.
 
 One potential issue here: some users want a public facing LB for clients to
@@ -290,10 +290,10 @@ and have it reconnect to the cluster with the same host address. This will retur
 the cluster to a fully healthy state.
 
 If this is impractical, you need to remove the failed server. Usually, you can
-issue a [`remove-peer`](/vault/docs/commands/operator/raft#remove-peer) command to
+issue a [`remove-peer`](/docs/commands/operator/raft#remove-peer) command to
 remove the failed server if it's still a member of the cluster.
 
-If the [`remove-peer`](/vault/docs/commands/operator/raft#remove-peer) command isn't
+If the [`remove-peer`](/docs/commands/operator/raft#remove-peer) command isn't
 possible or you'd rather manually re-write the cluster membership a
 [`raft/peers.json`](#manual-recovery-using-peers-json) file can be written to
 the configured data directory.
@@ -339,7 +339,7 @@ automated processes that will put the peers file in place on a periodic basis.
 To begin, stop all remaining servers.
 
 The next step is to go to the [configured data
-path](/vault/docs/configuration/storage/raft/#path) of each Vault server. Inside that
+path](/docs/configuration/storage/raft/#path) of each Vault server. Inside that
 directory, there will be a `raft/` sub-directory. We need to create a
 `raft/peers.json` file. The file should be formatted as a JSON array containing
 the node ID, `address:port`, and suffrage information of each Vault server you
@@ -385,4 +385,4 @@ active.
 ### Other Recovery Methods
 
 For other, non-quorum related recovery [Vault's
-recovery](/vault/docs/concepts/recovery-mode/) mode can be used.
+recovery](/docs/concepts/recovery-mode/) mode can be used.
diff --git a/website/content/docs/concepts/lease.mdx b/website/content/docs/concepts/lease.mdx
index eedd6b76ca8bf..707785b2f2259 100644
--- a/website/content/docs/concepts/lease.mdx
+++ b/website/content/docs/concepts/lease.mdx
@@ -26,7 +26,7 @@ to check in routinely.
 
 In addition to renewals, a lease can be _revoked_. When a lease is revoked, it
 invalidates that secret immediately and prevents any further renewals. For
-example, with the [AWS secrets engine](/vault/docs/secrets/aws), the
+example, with the [AWS secrets engine](/docs/secrets/aws), the
 access keys will be deleted from AWS the moment a lease is revoked. This
 renders the access keys invalid from that point forward.
 
@@ -35,7 +35,7 @@ the user interface (UI) under the Access tab, or automatically by Vault. When a
 is expired, Vault will automatically revoke that lease. When a token is revoked,
 Vault will revoke all leases that were created using that token.
 
-**Note**: The [Key/Value Backend](/vault/docs/secrets/kv) which stores
+**Note**: The [Key/Value Backend](/docs/secrets/kv) which stores
 arbitrary secrets does not issue leases although it will sometimes return a
 lease duration; see the documentation for more information.
 
@@ -69,7 +69,7 @@ As a result, the return value of renewals should be carefully inspected to
 determine what the new lease is.
 
 
--> To implement token renewal logic in your application code, refer to the [code example in the Authentication doc](/vault/docs/concepts/auth#code-example).
+-> To implement token renewal logic in your application code, refer to the [code example in the Authentication doc](/docs/concepts/auth#code-example).
 
 ## Prefix-based Revocation
 
@@ -80,7 +80,7 @@ Lease IDs are structured in a way that their prefix is always the path where
 the secret was requested from. This lets you revoke trees of secrets. For
 example, to revoke all AWS access keys, you can do `vault lease revoke -prefix aws/`.
 For more information about revoke command please check
-[cli's lease revoke](/vault/docs/commands/lease/revoke#lease-revoke)
+[cli's lease revoke](/docs/commands/lease/revoke#lease-revoke)
 command docs.
 
 This is very useful if there is an intrusion within a specific system: all
diff --git a/website/content/docs/concepts/oidc-provider.mdx b/website/content/docs/concepts/oidc-provider.mdx
index 1b132257c4cc8..8f8ec8fbffe46 100644
--- a/website/content/docs/concepts/oidc-provider.mdx
+++ b/website/content/docs/concepts/oidc-provider.mdx
@@ -9,9 +9,9 @@ description: >-
 
 This document provides conceptual information about the Vault **OpenID Connect (OIDC) identity
 provider** feature. This feature enables client applications that speak the OIDC protocol to
-leverage Vault's source of [identity](/vault/docs/concepts/identity) and wide range of [authentication methods](/vault/docs/auth)
+leverage Vault's source of [identity](/docs/concepts/identity) and wide range of [authentication methods](/docs/auth)
 when authenticating end-users. For more information about the usage of Vault's OIDC provider,
-refer to the [OIDC identity provider](/vault/docs/secrets/identity/oidc-provider) documentation.
+refer to the [OIDC identity provider](/docs/secrets/identity/oidc-provider) documentation.
 
 ## Configuration Options
 
@@ -23,7 +23,7 @@ Each Vault namespace will contain a built-in provider resource named `default`.
 provider will allow all client applications within the namespace to use it for OIDC flows.
 The `default` provider can be modified but not deleted.
 
-Additionally, a Vault namespace may contain several provider resources. Each configured provider will publish the APIs listed within the [OIDC flow](/vault/docs/concepts/oidc-provider#oidc-flow) section. The APIs will be served via backend path-based routing on Vault's listen [address](/vault/docs/configuration/listener/tcp#address).
+Additionally, a Vault namespace may contain several provider resources. Each configured provider will publish the APIs listed within the [OIDC flow](/docs/concepts/oidc-provider#oidc-flow) section. The APIs will be served via backend path-based routing on Vault's listen [address](/docs/configuration/listener/tcp#address).
 
 A provider has the following configuration parameters:
 
@@ -31,7 +31,7 @@ A provider has the following configuration parameters:
 * **Allowed client IDs**: limits which clients can access the provider
 * **Scopes supported**: limits what identity information is available as claims
 
-The issuer URL parameter is necessary for the validation of ID tokens by clients. If an URL parameter is not provided explicitly, it will default to a URL with Vault's [api_addr](/vault/docs/configuration#api_addr) as the `scheme://host:port` component and `/v1/:namespace/identity/oidc/provider/:name` as the path component. This means tokens issued by a provider in a specified Vault cluster must be validated within that same cluster. If the issuer URL is provided explicitly, it must point to a Vault instance that is network-reachable by clients for ID token validation.
+The issuer URL parameter is necessary for the validation of ID tokens by clients. If an URL parameter is not provided explicitly, it will default to a URL with Vault's [api_addr](/docs/configuration#api_addr) as the `scheme://host:port` component and `/v1/:namespace/identity/oidc/provider/:name` as the path component. This means tokens issued by a provider in a specified Vault cluster must be validated within that same cluster. If the issuer URL is provided explicitly, it must point to a Vault instance that is network-reachable by clients for ID token validation.
 
 The allowed client IDs parameter utilizes the list of client IDs that have been generated by Vault as a part of client registration. By default, all clients will be *disallowed*. Providing `*` as the parameter value will allow all clients to use the provider.
 
@@ -47,7 +47,7 @@ A scope will have the following configuration parameters:
 * **Template**: maps individual claims to Vault identity information
 
 
-The template parameter takes advantage of the [JSON-based templating](/vault/api-docs/secret/identity/tokens#template) used by identity tokens for claims mapping. This means the parameter will take a JSON string of arbitrary structure where the values may be replaced with specific identity information. Template parameters that are not present for a Vault identity are omitted from the resulting claims without an error.
+The template parameter takes advantage of the [JSON-based templating](/api-docs/secret/identity/tokens#template) used by identity tokens for claims mapping. This means the parameter will take a JSON string of arbitrary structure where the values may be replaced with specific identity information. Template parameters that are not present for a Vault identity are omitted from the resulting claims without an error.
 
 
 Example of a JSON template for a scope:
@@ -80,8 +80,8 @@ The full list of template parameters are included in the following table:
 | `identity.entity.aliases.<mount accessor>.custom_metadata`                       | Custom metadata associated with the alias for the given mount                           |
 | `identity.entity.aliases.<mount accessor>.custom_metadata.<custom_metadata key>` | Custom metadata associated with the alias for the given mount and custom metadata key   |
 | `time.now`                                                                       | Current time as integral seconds since the Epoch                                        |
-| `time.now.plus.<duration>`                                                       | Current time plus a [duration format string](/vault/docs/concepts/duration-format)                 |
-| `time.now.minus.<duration>`                                                      | Current time minus a [duration format string](/vault/docs/concepts/duration-format)                |
+| `time.now.plus.<duration>`                                                       | Current time plus a [duration format string](/docs/concepts/duration-format)                 |
+| `time.now.minus.<duration>`                                                      | Current time minus a [duration format string](/docs/concepts/duration-format)                |
 
 
 Several named scopes can be made available on an individual provider. Note that the top-level keys in a JSON template may conflict with those in another scope. When scopes are made available on a provider, their templates are checked for top-level conflicts. A warning will be issued to the Vault operator if any conflicts are found. This may result in an error if the scopes are requested in an OIDC Authentication Request.
@@ -113,7 +113,7 @@ A client has the following configuration parameters:
 
 The `key` parameter is optional. The key will be used to sign ID tokens for the client.
 It cannot be modified after creation. If not supplied, defaults to the built-in
-[default key](/vault/docs/concepts/oidc-provider#keys).
+[default key](/docs/concepts/oidc-provider#keys).
 
 A `client_id` is generated and returned after a successful client registration. The
 `client_id` uniquely identifies the client. Its value will be a string with 32 random
@@ -162,7 +162,7 @@ Each Vault namespace will contain a built-in assignment resource named `allow_al
 
 Key resources are referenced by clients via the `key` parameter. This parameter specifies
 the key that will be used to sign ID tokens for the client. See existing
-[documentation](/vault/api-docs/secret/identity/tokens#create-a-named-key) for details on keyring
+[documentation](/api-docs/secret/identity/tokens#create-a-named-key) for details on keyring
 management, supported signing algorithms, rotation periods, and verification TTLs. Currently,
 a key referenced by a client cannot be changed.
 
@@ -199,7 +199,7 @@ Each provider offers an unauthenticated endpoint that provides the public portio
 
 ### Authorization Endpoint
 
-Each provider offers an authenticated [authorization endpoint](https://openid.net/specs/openid-connect-core-1_0.html#AuthorizationEndpoint). The authorization endpoint for each provider is added to Vault's [default policy](/vault/docs/concepts/policies#default-policy) using the `identity/oidc/provider/+/authorize` path. The endpoint incorporates all required [authentication request](https://openid.net/specs/openid-connect-core-1_0.html#AuthRequest) parameters as input.
+Each provider offers an authenticated [authorization endpoint](https://openid.net/specs/openid-connect-core-1_0.html#AuthorizationEndpoint). The authorization endpoint for each provider is added to Vault's [default policy](/docs/concepts/policies#default-policy) using the `identity/oidc/provider/+/authorize` path. The endpoint incorporates all required [authentication request](https://openid.net/specs/openid-connect-core-1_0.html#AuthRequest) parameters as input.
 
 The endpoint [validates](https://openid.net/specs/openid-connect-core-1_0.html#AuthRequestValidation) client requests and ensures that all required parameters are present and valid. The `redirect_uri` of the request is validated against the client's `redirect_uris`. The requesting Vault entity will be validated against the client's `assignments`. An appropriate [error code](https://openid.net/specs/openid-connect-core-1_0.html#AuthError) is returned for invalid requests.
 
@@ -207,12 +207,12 @@ An authorization code is generated with a successful validation of the request.
 
 ### Token Endpoint
 
-Each provider will offer a [token endpoint](/vault/api-docs/secret/identity/oidc-provider#token-endpoint). The endpoint may be unauthenticated in Vault but is authenticated by requiring a `client_secret` as described in [client authentication](https://openid.net/specs/openid-connect-core-1_0.html#ClientAuthentication). The endpoint ingests all required [token request](/vault/api-docs/secret/identity/oidc-provider#parameters-15) parameters as input. The endpoint [validates](https://openid.net/specs/openid-connect-core-1_0.html#TokenRequestValidation) the client requests and exchanges an authorization code for the ID token and access token. The cache of authorization codes will be verified against the code presented in the exchange. The appropriate [error codes](https://openid.net/specs/openid-connect-core-1_0.html#TokenErrorResponse) are returned for all invalid requests.
+Each provider will offer a [token endpoint](/api-docs/secret/identity/oidc-provider#token-endpoint). The endpoint may be unauthenticated in Vault but is authenticated by requiring a `client_secret` as described in [client authentication](https://openid.net/specs/openid-connect-core-1_0.html#ClientAuthentication). The endpoint ingests all required [token request](/api-docs/secret/identity/oidc-provider#parameters-15) parameters as input. The endpoint [validates](https://openid.net/specs/openid-connect-core-1_0.html#TokenRequestValidation) the client requests and exchanges an authorization code for the ID token and access token. The cache of authorization codes will be verified against the code presented in the exchange. The appropriate [error codes](https://openid.net/specs/openid-connect-core-1_0.html#TokenErrorResponse) are returned for all invalid requests.
 
 The ID token is generated and returned upon successful client authentication and request validation. The ID token will contain a combination of required and configurable claims. The required claims are enumerated in the scopes section above for the `openid` scope. The configurable claims are populated by templates associated with the scopes provided in the authentication request that generated the authorization code.
 
-An access token is also generated and returned upon successful client authentication and request validation. The access token is a Vault [batch token](/vault/docs/concepts/tokens#batch-tokens) with a policy that only provides read access to the issuing provider's [userinfo endpoint](/vault/api-docs/secret/identity/oidc-provider#userinfo-endpoint). The access token is also a TTL as defined by the `access_token_ttl` of the requesting client.
+An access token is also generated and returned upon successful client authentication and request validation. The access token is a Vault [batch token](/docs/concepts/tokens#batch-tokens) with a policy that only provides read access to the issuing provider's [userinfo endpoint](/api-docs/secret/identity/oidc-provider#userinfo-endpoint). The access token is also a TTL as defined by the `access_token_ttl` of the requesting client.
 
 ### UserInfo Endpoint
 
-Each provider provides an authenticated [userinfo endpoint](/vault/api-docs/secret/identity/oidc-provider#userinfo-endpoint). The endpoint accepts the access token obtained from the token endpoint as a [bearer token](/vault/api-docs#authentication). The userinfo response is a JSON object with the `application/json` content type. The JSON object contains claims for the Vault entity associated with the access token. The claims returned are determined by the scopes requested in the authentication request that produced the access token. The `sub` claim is always returned as the entity ID in the userinfo response.
+Each provider provides an authenticated [userinfo endpoint](/api-docs/secret/identity/oidc-provider#userinfo-endpoint). The endpoint accepts the access token obtained from the token endpoint as a [bearer token](/api-docs#authentication). The userinfo response is a JSON object with the `application/json` content type. The JSON object contains claims for the Vault entity associated with the access token. The claims returned are determined by the scopes requested in the authentication request that produced the access token. The `sub` claim is always returned as the entity ID in the userinfo response.
diff --git a/website/content/docs/concepts/password-policies.mdx b/website/content/docs/concepts/password-policies.mdx
index e134ce5f5f00f..1195735ebe2fd 100644
--- a/website/content/docs/concepts/password-policies.mdx
+++ b/website/content/docs/concepts/password-policies.mdx
@@ -13,9 +13,9 @@ generators. These password policies are used in a subset of secret engines to al
 how a password is generated for that engine. Not all secret engines utilize password policies, so check
 the documentation for the engine you are using for compatibility.
 
-**Note:** Password policies are unrelated to [Policies](/vault/docs/concepts/policies) other than sharing similar names.
+**Note:** Password policies are unrelated to [Policies](/docs/concepts/policies) other than sharing similar names.
 
-Password policies are available in Vault version 1.5+. [API docs can be found here](/vault/api-docs/system/policies-password).
+Password policies are available in Vault version 1.5+. [API docs can be found here](/api-docs/system/policies-password).
 
 !> Password policies are an advanced usage of Vault. This generates credentials for external systems
 (databases, LDAP, AWS, etc.) and should be used with caution.
@@ -237,7 +237,7 @@ If we do this for uppercase letters as well as numbers, then we get a combined p
 
 It should be noted that this probability curve only applies to this specific policy. To understand the
 performance characteristics of a given policy, you should run your policy with the
-[`generate`](/vault/api-docs/system/policies-password) endpoint to see how much time the policy takes to
+[`generate`](/api-docs/system/policies-password) endpoint to see how much time the policy takes to
 produce passwords.
 
 </details>
@@ -247,7 +247,7 @@ produce passwords.
 Password policies are defined in [HCL](https://github.com/hashicorp/hcl) or JSON which defines
 the length of the password and a set of rules a password must adhere to.
 
-See the [API docs](/vault/api-docs/system/policies-password) for examples of the commands to save/read/etc.
+See the [API docs](/api-docs/system/policies-password) for examples of the commands to save/read/etc.
 password policies
 
 Here is a very simple policy which generates 20 character passwords from lowercase characters:
@@ -363,5 +363,5 @@ character from `01234` to be in it, but does not require any characters from `ab
 ## Tutorial
 
 Refer to [User Configurable Password Generation for Secret
-Engines](/vault/tutorials/policies/password-policies)
+Engines](https://learn.hashicorp.com/vault/secrets-management/password-policies)
 for a step-by-step tutorial.
diff --git a/website/content/docs/concepts/policies.mdx b/website/content/docs/concepts/policies.mdx
index a58a39262b8a9..0c05d7647f82d 100644
--- a/website/content/docs/concepts/policies.mdx
+++ b/website/content/docs/concepts/policies.mdx
@@ -15,10 +15,10 @@ operations in Vault. This section discusses policy workflows and syntaxes.
 Policies are **deny by default**, so an empty policy grants no permission in the
 system.
 
-## Policy-authorization workflow
+## Policy-Authorization Workflow
 
 Before a human or machine can gain access, an administrator must configure Vault
-with an [auth method](/vault/docs/concepts/auth). Authentication is
+with an [auth method](/docs/concepts/auth). Authentication is
 the process by which human or machine-supplied information is verified against
 an internal or external system.
 
@@ -84,7 +84,7 @@ user or machine is allowed to access.
 
 [hcl]: https://github.com/hashicorp/hcl
 
-Here is a very simple policy which grants read capabilities to the [KVv1](/vault/api-docs/secret/kv/kv-v1) path
+Here is a very simple policy which grants read capabilities to the [KVv1](/api-docs/secret/kv/kv-v1) path
 `"secret/foo"`:
 
 ```ruby
@@ -205,7 +205,7 @@ control over permitted (or denied) operations. As shown in the examples above,
 capabilities are always specified as a list of strings, even if there is only
 one capability.
 
-To determine the capabilities needed to perform a specific operation, the `-output-policy` flag can be added to the CLI subcommand. For an example, refer to the [Print Policy Requirements](/vault/docs/commands#print-policy-requirements) document section.
+To determine the capabilities needed to perform a specific operation, the `-output-policy` flag can be added to the CLI subcommand. For an example, refer to the [Print Policy Requirements](/docs/commands#print-policy-requirements) document section.
 
 
 The list of capabilities include the following:
@@ -255,7 +255,7 @@ credentials _creates_ database credentials, but the HTTP request is a GET which
 corresponds to a `read` capability. Thus, to grant access to generate database
 credentials, the policy would grant `read` access on the appropriate path.
 
-## Templated policies
+## Templated Policies
 
 The policy syntax allows for doing variable replacement in some policy strings
 with values available to the token. Currently `identity` information can be
@@ -333,19 +333,17 @@ path "secret/data/{{identity.entity.aliases.auth_kubernetes_xxxx.metadata.servic
 }
 ```
 
-## Fine-grained control
+## Fine-Grained Control
 
 In addition to the standard set of capabilities, Vault offers finer-grained
 control over permissions at a given path. The capabilities associated with a
 path take precedence over permissions on parameters.
 
-### Parameter constraints
+### Parameter Constraints
 
-!> **Note:** The use of [globs](/vault/docs/concepts/policies#policy-syntax) (`*`) may result in [surprising or unexpected behavior](#parameter-constraints-limitations).
+~> **Note:** The `allowed_parameters`, `denied_parameters`, and `required_parameters` fields are not supported for policies used with the [version 2 kv secrets engine](/docs/secrets/kv/kv-v2).
 
-~> **Note:** The `allowed_parameters`, `denied_parameters`, and `required_parameters` fields are not supported for policies used with the [version 2 kv secrets engine](/vault/docs/secrets/kv/kv-v2).
-
-See the [API Specification](/vault/api-docs/secret/kv/kv-v2) for more information.
+See the [API Specification](/api-docs/secret/kv/kv-v2) for more information.
 
 Policies can take into account HTTP request parameters to further
 constrain requests, using the following options:
@@ -354,13 +352,13 @@ constrain requests, using the following options:
 
   ```ruby
   # This requires the user to create "secret/profile" with a parameter/key named
-  # "name" and "id" where kv v1 is enabled at "secret/".
+  # "name" and "id" where kv v1 is enabled at "secret/". 
   path "secret/profile" {
     capabilities = ["create"]
     required_parameters = ["name", "id"]
   }
   ```
-
+  
 - `allowed_parameters` - A list of keys and values that are
   permitted on the given path.
 
@@ -371,7 +369,7 @@ constrain requests, using the following options:
     # This allows the user to update the password parameter value set on any
     # users configured for userpass auth method. The password value can be
     # anything. However, the user cannot update other parameter values such as
-    # token_ttl.
+    # token_ttl. 
     path "auth/userpass/users/*" {
       capabilities = ["update"]
       allowed_parameters = {
@@ -381,10 +379,10 @@ constrain requests, using the following options:
     ```
 
     -> **Usage example:** The [ACL Policy Path
-     Templating](/vault/tutorials/policies/policy-templating)
+     Templating](https://learn.hashicorp.com/tutorials/vault/policy-templating)
      tutorial demonstrates the use of `allowed_parameters` to permit a user to
      update the user's password when using the [userpass auth
-     method](/vault/docs/auth/userpass) to log in with Vault.
+     method](/docs/auth/userpass) to log in with Vault. 
 
   - Setting a parameter with a value of a populated list allows the parameter
     to contain only those values.
@@ -422,7 +420,29 @@ constrain requests, using the following options:
     }
     ```
 
-- `denied_parameters` - A list of keys and values that are not permitted on the given
+  - It's important to note that the use of globbing may result in surprising
+    or unexpected behavior.
+    
+    ```ruby
+    # This allows the user to create, update, or patch "secret/foo" with a parameter
+    # named "bar". The values passed to parameter "bar" must start with "baz/"
+    # so values like "baz/quux" are fine. However, values like
+    # "baz/quux,wibble,wobble,wubble" would also be accepted. The API that
+    # underlies "secret/foo" might allow comma delimited values for the "bar"
+    # parameter, and if it did, specifying a value like
+    # "baz/quux,wibble,wobble,wubble" would result in 4 different values getting
+    # passed along. Seeing values like "wibble" or "wobble" getting passed to
+    # "secret/foo" might surprise someone that expected the allowed_parameters
+    # constraint to only allow values starting with "baz/".
+    path "secret/foo" {
+      capabilities = ["create", "update", "patch"]
+      allowed_parameters = {
+        "bar" = ["baz/*"]
+      }
+    }
+    ```
+
+- `denied_parameters` - A list of keys and values that are not permitted on the given 
   path. Any values specified here take precedence over `allowed_parameters`.
 
   - Setting a parameter with a value of the empty list denies any changes to
@@ -447,7 +467,7 @@ constrain requests, using the following options:
     ```ruby
     # This allows the user to create or update token roles. However, the
     # "allowed_policies" parameter value cannot be "admin", but the user can
-    # assign any other policies to the parameter.
+    # assign any other policies to the parameter.   
     path "auth/token/roles/*" {
       capabilities = ["create", "update"]
       denied_parameters = {
@@ -489,90 +509,12 @@ path "secret/foo" {
 
 ~> **Note:** the only value that can be used with the `*` parameter is `[]`.
 
-#### Parameter Constraints Limitations
-
-##### Default Values
-Evaluation of policies with `allowed_parameters`, `denied_parameters`, and `required_parameters` happens
-without consideration of parameters' default values.
-
-Given the following policy:
-
-```ruby
-# The "no_store" parameter cannot be false
-path "secret/foo" {
-  capabilities = ["create"]
-  denied_parameters = {
-    "no_store" = [false, "false"]
-  }
-}
-```
-
-The following operation will error, because "no_store" is set to false:
-
-```shell-session
-$ vault write secret/foo no_store=false value=bar
-```
-
-Whereas the following operation will succeed, even if the "no_store"
-parameter must be a boolean, and it defaults to false:
-
-```shell-session
-# Succeeds because "no_store=false" isn't present in the parameters
-$ vault write secret/foo value=bar
-```
-
-This is because the policy evaluator does not know what the default value is for
-the "no_store" parameter. All it sees is that the denied parameter isn't present
-in the command.
-
-This can be resolved by requiring the "no_store" parameter in your policy:
-
-```ruby
-path "secret/foo" {
-  capabilities = ["create"]
-  required_parameters = ["no_store"]
-  denied_parameters = {
-    "no_store" = [false, "false"]
-  }
-}
-```
-
-The following command, which previously succeeded, will now fail under the new policy
-because there is no "no_store" parameter:
-
-```shell-session
-$ vault write secret/foo value=bar
-```
-
-##### Globbing
-
-It's also important to note that the use of globbing may result in surprising
-or unexpected behavior:
-
-```ruby
-# This allows the user to create, update, or patch "secret/foo" with a parameter
-# named "bar". The values passed to parameter "bar" must start with "baz/"
-# so values like "baz/quux" are fine. However, values like
-# "baz/quux,wibble,wobble,wubble" would also be accepted. The API that
-# underlies "secret/foo" might allow comma delimited values for the "bar"
-# parameter, and if it did, specifying a value like
-# "baz/quux,wibble,wobble,wubble" would result in 4 different values getting
-# passed along. Seeing values like "wibble" or "wobble" getting passed to
-# "secret/foo" might surprise someone that expected the allowed_parameters
-# constraint to only allow values starting with "baz/".
-path "secret/foo" {
-  capabilities = ["create", "update", "patch"]
-  allowed_parameters = {
-    "bar" = ["baz/*"]
-  }
-}
-```
-### Required response wrapping TTLs
+### Required Response Wrapping TTLs
 
 These parameters can be used to set minimums/maximums on TTLs set by clients
 when requesting that a response be
-[wrapped](/vault/docs/concepts/response-wrapping), with a granularity of a
-second. These use [duration format strings](/vault/docs/concepts/duration-format).
+[wrapped](/docs/concepts/response-wrapping), with a granularity of a
+second. These use [duration format strings](/docs/concepts/duration-format).
 
 In practice, setting a minimum TTL of one second effectively makes response
 wrapping mandatory for a particular path.
@@ -643,7 +585,7 @@ $ curl \
   https://vault.hashicorp.rocks/v1/auth/token/create
 ```
 
-### Root policy
+### Root Policy
 
 The `root` policy is a built-in Vault policy that cannot be modified or removed.
 Any user associated with this policy becomes a root user. A root user can do
@@ -673,16 +615,16 @@ $ curl \
 
 For more information, please read:
 
-- [Production Hardening](/vault/tutorials/operations/production-hardening)
-- [Generating a Root Token](/vault/tutorials/operations/generate-root)
+- [Production Hardening](https://learn.hashicorp.com/tutorials/vault/production-hardening)
+- [Generating a Root Token](https://learn.hashicorp.com/tutorials/vault/generate-root)
 
-## Managing policies
+## Managing Policies
 
 Policies are authored (written) in your editor of choice. They can be authored
 in HCL or JSON, and the syntax is described in detail above. Once saved,
 policies must be uploaded to Vault before they can be used.
 
-### Listing policies
+### Listing Policies
 
 To list all registered policies in Vault:
 
@@ -702,7 +644,7 @@ $ curl \
 wrapper around reading the sys endpoint directly. It provides the same
 functionality but formats the output in a special manner.
 
-### Creating policies
+### Creating Policies
 
 Policies may be created (uploaded) via the CLI or via the API. To create a new
 policy in Vault:
@@ -725,7 +667,7 @@ In both examples, the name of the policy is "policy-name". You can think of this
 name as a pointer or symlink to the policy ACLs. Tokens are attached policies by
 name, which are then mapped to the set of rules corresponding to that name.
 
-### Updating policies
+### Updating Policies
 
 Existing policies may be updated to change permissions via the CLI or via the
 API. To update an existing policy in Vault, follow the same steps as creating a
@@ -745,7 +687,7 @@ $ curl \
   https://vault.hashicorp.rocks/v1/sys/policy/my-existing-policy
 ```
 
-### Deleting policies
+### Deleting Policies
 
 Existing policies may be deleted via the CLI or API. To delete a policy:
 
@@ -765,7 +707,7 @@ $ curl \
 This is an idempotent operation. Vault will not return an error when deleting a
 policy that does not exist.
 
-## Associating policies
+## Associating Policies
 
 Vault can automatically associate a set of policies to a token based on an
 authorization. This configuration varies significantly between authentication
@@ -796,48 +738,6 @@ If the provided information is correct, Vault will generate a token, assign the
 list of configured policies to the token, and return that token to the
 authenticated user.
 
-## Root protected API endpoints
-
-~> **Note:** Vault treats the HTTP POST and PUT verbs as equivalent, so for each mention
-   of POST in the table above, PUT may also be used. Vault uses the non-standard LIST HTTP
-   verb, but also allows list requests to be made using the GET verb along with `?list=true`
-   as a query parameter, so for each mention of LIST in the table above, GET with `?list=true`
-   may also be used.
-
-The following paths requires a root token or `sudo` capability in the policy:
-
-| Path                                                                                                                                                   | HTTP verb         | Description                                                                                                                                         |
-| -------------------------------------------------------------------------------------------------------------------------------------------------------| ----------------- | --------------------------------------------------------------------------------------------------------------------------------------------------- |
-| [auth/token/accessors](/vault/api-docs/auth/token#list-accessors)                                                                                      | LIST              | List token accessors for all current Vault service tokens                                                                                           |
-| [auth/token/create](/vault/api-docs/auth/token#create-token)                                                                                           | POST              | Create a periodic or an orphan token (`period` or `no_parent`) option                                                                               |
-| [pki/root](/vault/api-docs/secret/pki#delete-all-issuers-and-keys)                                                                                     | DELETE            | Delete the current CA key ([pki secrets engine](/vault/docs/secrets/pki))                                                                           |
-| [pki/root/sign-self-issued](/vault/api-docs/secret/pki#sign-self-issued)                                                                               | POST              | Use the configured CA certificate to sign a self-issued certificate ([pki secrets engine](/vault/docs/secrets/pki))                                 |
-| [sys/audit](/vault/api-docs/system/audit)                                                                                                              | GET               | List enabled audit devices                                                                                                                          |
-| [sys/audit/:path](/vault/api-docs/system/audit)                                                                                                        | POST, DELETE      | Enable or remove an audit device                                                                                                                    |
-| [sys/auth/:path](/vault/api-docs/system/auth)                                                                                                          | GET, POST, DELETE | Manage the auth methods (enable, read, and delete)                                                                                                  |
-| [sys/auth/:path/tune](/vault/api-docs/system/auth#tune-auth-method)                                                                                    | GET, POST         | Manage the auth methods (enable, read, delete, and tune)                                                                                            |
-| [sys/config/auditing/request-headers](/vault/api-docs/system/config-auditing)                                                                          | GET               | List the request headers that are configured to be audited                                                                                          |
-| [sys/config/auditing/request-headers/:name](/vault/api-docs/system/config-auditing)                                                                    | GET, POST, DELETE | Manage the auditing headers (create, update, read and delete)                                                                                       |
-| [sys/config/cors](/vault/api-docs/system/config-cors)                                                                                                  | GET, POST, DELETE | Configure CORS setting                                                                                                                              |
-| [sys/config/ui/headers](/vault/api-docs/system/config-ui)                                                                                              | GET, LIST         | Configure the UI settings                                                                                                                           |
-| [sys/config/ui/headers/:name](/vault/api-docs/system/config-ui#name)                                                                                   | POST, DELETE      | Configure custom HTTP headers to be served with the UI                                                                                              |
-| [sys/internal/inspect/router/:tag](/vault/api-docs/system/inspect/router)                                                                              | GET               | Inspect the internal components of Vault's router. `tag` must be one of root, uuid, accessor, or storage                                            |
-| [sys/leases/lookup/:prefix](/vault/api-docs/system/leases#list-leases)                                                                                 | LIST              | List lease IDs                                                                                                                                      |
-| [sys/leases/revoke-force/:prefix](/vault/api-docs/system/leases#revoke-force)                                                                          | POST              | Revoke all secrets or tokens ignoring backend errors                                                                                                |
-| [sys/leases/revoke-prefix/:prefix](/vault/api-docs/system/leases#revoke-prefix)                                                                        | POST              | Revoke all secrets generated under a given prefix                                                                                                   |
-| [sys/plugins/catalog/:type/:name](/vault/api-docs/system/plugins-catalog#register-plugin)                                                              | GET, POST, DELETE | Register a new plugin, or read/remove an existing plugin                                                                                            |
-| [sys/raw:path](/vault/api-docs/system/raw)                                                                                                             | GET, POST, DELETE | Used to access the raw underlying store in Vault                                                                                                    |
-| [sys/raw:prefix](/vault/api-docs/system/raw#list-raw)                                                                                                  | GET, LIST         | Returns a list keys for a given path prefix                                                                                                         |
-| [sys/remount](/vault/api-docs/system/remount)                                                                                                          | POST              | Moves an already-mounted backend to a new mount point                                                                                               |
-| [sys/replication/reindex](/vault/api-docs/system/replication#reindex-replication)                                                                      | POST              | Reindex the local data storage                                                                                                                      |
-| [sys/replication/performance/primary/secondary-token](/vault/api-docs/system/replication/replication-performance#generate-performance-secondary-token) | POST              | Generate a performance secondary activation token                                                                                                   |
-| [sys/replication/dr/primary/secondary-token](/vault/api-docs/system/replication/replication-dr#generate-dr-secondary-token)                            | POST              | Generate a DR secondary activation token                                                                                                            |
-| [sys/rotate](/vault/api-docs/system/rotate)                                                                                                            | POST              | Trigger a rotation of the backend encryption key                                                                                                    |
-| [sys/seal](/vault/api-docs/system/seal)                                                                                                                | POST              | Seals the Vault                                                                                                                                     |
-| [sys/step-down](/vault/api-docs/system/step-down)                                                                                                      | POST              | Forces a node to give up active status                                                                                                              |
-| [sys/storage/raft/snapshot-auto/config](/vault/api-docs/system/storage/raftautosnapshots#list-automated-snapshots-configs)                             | LIST              | Lists named configurations                                                                                                                          |
-| [sys/storage/raft/snapshot-auto/config/:name](/vault/api-docs/system/storage/raftautosnapshots)                                                        | GET, POST, DELETE | Creates or updates a named configuration                                                                                                            |
-
 ### Tokens
 
 Tokens have two sets of policies: identity policies, which are computed
@@ -869,5 +769,5 @@ next time a token, with that policy attached, is used to make a call to Vault.
 
 Refer to the following tutorials for further learning:
 
-- [Vault Policies](/vault/tutorials/policies/policies)
-- [ACL Policy Path Templating](/vault/tutorials/policies/policy-templating)
+- [Vault Policies](https://learn.hashicorp.com/vault/identity-access-management/iam-policies)
+- [ACL Policy Path Templating](https://learn.hashicorp.com/vault/identity-access-management/policy-templating)
diff --git a/website/content/docs/concepts/recovery-mode.mdx b/website/content/docs/concepts/recovery-mode.mdx
index 891f77490cf2f..a5648090965f5 100644
--- a/website/content/docs/concepts/recovery-mode.mdx
+++ b/website/content/docs/concepts/recovery-mode.mdx
@@ -72,6 +72,6 @@ This means that after having used recovery mode, part of the procedure for
 returning to active service must include re-forming the raft cluster.  There
 are two ways to do so: either delete the vault data directory on the other nodes
 and re-join them to the recovered node, or use the
-[Manual Recovery Using peers.json](/vault/docs/concepts/integrated-storage#manual-recovery-using-peers-json)
+[Manual Recovery Using peers.json](https://www.vaultproject.io/docs/concepts/integrated-storage#manual-recovery-using-peers-json)
 approach to get all nodes to agree on what nodes are part of the cluster.
 
diff --git a/website/content/docs/concepts/resource-quotas.mdx b/website/content/docs/concepts/resource-quotas.mdx
index dee76b1dc9fbf..a06cd19f1ecd4 100644
--- a/website/content/docs/concepts/resource-quotas.mdx
+++ b/website/content/docs/concepts/resource-quotas.mdx
@@ -21,7 +21,7 @@ developers.
 Vault provides a feature, resource quotas, that allows Vault operators to specify
 limits on resources used in Vault. Specifically, Vault allows operators to create
 and configure API rate limits. Users of Vault Enterprise have a second option, alongside
-rate limits, [lease-count quotas](/vault/docs/enterprise/lease-count-quotas), which can
+rate limits, [lease-count quotas](/docs/enterprise/lease-count-quotas), which can
 limit the number of leases that can be in use at one time.
 
 ## Rate Limit Quotas
@@ -49,7 +49,7 @@ to a non-zero value, any client that hits a rate limit threshold will be blocked
 from all subsequent requests for a duration of `block_interval` seconds.
 
 Vault also allows the inspection of the state of rate limiting in a Vault node
-through various [metrics](/vault/docs/internals/telemetry#Resource-Quota-Metrics) exposed
+through various [metrics](/docs/internals/telemetry#Resource-Quota-Metrics) exposed
 and through enabling optional audit logging.
 
 ## Exempt Routes
@@ -69,10 +69,10 @@ resource quotas by updating the `rate_limit_exempt_paths` configuration field.
 ## Tutorial
 
 Refer to [Protecting Vault with Resource
-Quotas](/vault/tutorials/operations/resource-quotas) for a
+Quotas](https://learn.hashicorp.com/vault/security/resource-quotas) for a
 step-by-step tutorial.
 
 ## API
 
 Rate limit quotas can be managed over the HTTP API. Please see
-[Rate Limit Quotas API](/vault/api-docs/system/rate-limit-quotas) for more details.
+[Rate Limit Quotas API](/api-docs/system/rate-limit-quotas) for more details.
diff --git a/website/content/docs/concepts/response-wrapping.mdx b/website/content/docs/concepts/response-wrapping.mdx
index f0175557d6df8..b033570297032 100644
--- a/website/content/docs/concepts/response-wrapping.mdx
+++ b/website/content/docs/concepts/response-wrapping.mdx
@@ -25,7 +25,7 @@ in persistent storage, you cannot encrypt this key in transit.
 To help address this problem, Vault includes a feature called _response
 wrapping_. When requested, Vault can take the response it would have sent to an
 HTTP client and instead insert it into the
-[`cubbyhole`](/vault/docs/secrets/cubbyhole) of a single-use token,
+[`cubbyhole`](/docs/secrets/cubbyhole) of a single-use token,
 returning that single-use token instead.
 
 Logically speaking, the response is
@@ -134,7 +134,7 @@ If a client requests wrapping:
 5. The new response is returned to the caller
 
 Note that policies can control minimum/maximum wrapping TTLs; see the [policies
-concepts page](/vault/docs/concepts/policies) for
+concepts page](/docs/concepts/policies) for
 more information.
 
 ## Response-Wrapping Token Validation
diff --git a/website/content/docs/concepts/seal.mdx b/website/content/docs/concepts/seal.mdx
index 52702f3e4d6e1..1fde9ab6ef883 100644
--- a/website/content/docs/concepts/seal.mdx
+++ b/website/content/docs/concepts/seal.mdx
@@ -88,7 +88,7 @@ access to the root key shares.
 -> **Note:** The Seal Wrap functionality is enabled by default. For this
 reason, the seal provider (HSM or cloud KMS) must be available throughout
 Vault's runtime and not just during the unseal process. Refer to the [Seal
-Wrap](/vault/docs/enterprise/sealwrap) documentation for more information.
+Wrap](/docs/enterprise/sealwrap) documentation for more information.
 
 Auto Unseal was developed to aid in reducing the operational complexity of
 keeping the unseal key secure. This feature delegates the responsibility of
@@ -107,32 +107,17 @@ keys_ instead.
 Just as the initialization process with a Shamir seal yields unseal keys,
 initializing with an Auto Unseal yields recovery keys.
 
+-> **Note:** Recovery keys cannot decrypt the root key, and thus are not
+sufficient to unseal Vault if the Auto Unseal mechanism isn't working. They
+are purely an authorization mechanism.
+
 It is still possible to seal a Vault node using the API. In this case Vault
 will remain sealed until restarted, or the unseal API is used, which with Auto
 Unseal requires the recovery key fragments instead of the unseal key fragments
 that would be provided with Shamir. The process remains the same.
 
 For a list of examples and supported providers, please see the
-[seal documentation](/vault/docs/configuration/seal).
-
--> **Warning:** Recovery keys cannot decrypt the root key, and thus are not
-sufficient to unseal Vault if the Auto Unseal mechanism isn't working. They
-are purely an authorization mechanism.  Using Auto Unseal 
-creates a strict Vault lifecycle dependency on the underlying seal mechanism. 
-This means that if the seal mechanism (such as the Cloud KMS key) becomes unavailable, 
-or deleted before the seal is migrated, then there is no ability to recover 
-access to the Vault cluster until the mechanism is available again. **If the seal 
-mechanism or its keys are permanently deleted, then the Vault cluster cannot be recovered, even
-from backups.**
-To mitigate this risk, we recommend careful controls around management of the seal
-mechanism, for example using 
-[AWS Service Control Policies](https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies_scps.html)
-or similar.  
-With Vault Enterprise secondary clusters (disaster or performance) can have a
-seal configured independently of the primary, and when properly configured guards 
-against *some* of this risk.  Unreplicated items such as local mounts could still 
-be lost.
-
+[seal documentation](/docs/configuration/seal).
 
 ## Recovery Key
 
@@ -148,7 +133,7 @@ keys for this purpose, rather than the barrier unseal keys, is automatic.
 ### Initialization
 
 When initializing, the split is performed according to the following CLI flags
-and their API equivalents in the [/sys/init](/vault/api-docs/system/init) endpoint:
+and their API equivalents in the [/sys/init](/api-docs/system/init) endpoint:
 
 - `recovery-shares`: The number of shares into which to split the recovery
   key. This value is equivalent to the `recovery_shares` value in the API
@@ -163,7 +148,7 @@ and their API equivalents in the [/sys/init](/vault/api-docs/system/init) endpoi
 
 Additionally, Vault will refuse to initialize if the option has not been set to
 generate a key, and no key is found. See
-[Configuration](/vault/docs/configuration/seal/pkcs11) for more details.
+[Configuration](/docs/configuration/seal/pkcs11) for more details.
 
 ### Rekeying
 
@@ -183,7 +168,7 @@ this is performed by using the `-target=recovery` flag to `vault operator rekey`
 
 Via the API, the rekey operation is performed with the same parameters as the
 [normal `/sys/rekey`
-endpoint](/vault/api-docs/system/rekey); however, the
+endpoint](/api-docs/system/rekey); however, the
 API prefix for this operation is at `/sys/rekey-recovery-key` rather than
 `/sys/rekey`.
 
@@ -216,7 +201,7 @@ These steps are common for seal migrations between any supported kinds and for
 any storage backend.
 
 1. Take a standby node down and update the [seal
-   configuration](/vault/docs/configuration/seal).
+   configuration](/docs/configuration/seal).
 
    - If the migration is from Shamir seal to Auto seal, add the desired new Auto
      seal block to the configuration.
@@ -239,7 +224,7 @@ any storage backend.
    specifically when Integrated Storage is in use for it helps to retain the
    quorum.
 
-1. [Step down](/vault/docs/commands/operator/step-down) the
+1. [Step down](https://www.vaultproject.io/docs/commands/operator/step-down) the
    active node. One of the standby nodes will become the new active node.
    When using Integrated Storage, ensure that quorum is reached and a leader is
    elected.
@@ -265,7 +250,7 @@ any storage backend.
 #### Migration From Shamir to Auto Unseal
 
 To migrate from Shamir keys to Auto Unseal, take your server cluster offline and
-update the [seal configuration](/vault/docs/configuration/seal) with the appropriate
+update the [seal configuration](/docs/configuration/seal) with the appropriate
 seal configuration. Bring your server back up and leave the rest of the nodes
 offline if using multi-server mode, then run the unseal process with the
 `-migrate` flag and bring the rest of the cluster online.
@@ -279,7 +264,7 @@ keys.
 #### Migration From Auto Unseal to Shamir
 
 To migrate from Auto Unseal to Shamir keys, take your server cluster offline
-and update the [seal configuration](/vault/docs/configuration/seal) and add `disabled
+and update the [seal configuration](/docs/configuration/seal) and add `disabled
 = "true"` to the seal block. This allows the migration to use this information
 to decrypt the key but will not unseal Vault. When you bring your server back
 up, run the unseal process with the `-migrate` flag and use the Recovery Keys
@@ -295,7 +280,7 @@ one type of Auto Unseal to a different type (ie Transit -> AWSKMS).
 
 To migrate from Auto Unseal to a different Auto Unseal configuration, take your
 server cluster offline and update the existing [seal
-configuration](/vault/docs/configuration/seal) and add `disabled = "true"` to the seal
+configuration](/docs/configuration/seal) and add `disabled = "true"` to the seal
 block. Then add another seal block to describe the new seal.
 
 When you bring your server back up, run the unseal process with the `-migrate`
diff --git a/website/content/docs/concepts/storage.mdx b/website/content/docs/concepts/storage.mdx
index a90930108801d..c4f61facc862e 100644
--- a/website/content/docs/concepts/storage.mdx
+++ b/website/content/docs/concepts/storage.mdx
@@ -8,7 +8,7 @@ description: >-
 
 # Storage
 
-As described on our [Architecture](/vault/docs/internals/architecture) page, Vault's
+As described on our [Architecture](/docs/internals/architecture) page, Vault's
 storage backend is untrusted storage used purely to keep encrypted information.
 
 ## Supported Storage Backends
@@ -16,11 +16,11 @@ storage backend is untrusted storage used purely to keep encrypted information.
 @include 'ent-supported-storage.mdx'
 
 Many other options for storage are available with community support for open-source Vault - see our
-[Storage Configuration](/vault/docs/configuration/storage) section for more
+[Storage Configuration](/docs/configuration/storage) section for more
 information.
 
 -> **Choosing a storage backend:** Refer to the [integrated storage vs. external
-storage](/vault/docs/configuration/storage#integrated-storage-vs-external-storage)
+storage](/docs/configuration/storage#integrated-storage-vs-external-storage)
 section of the storage configuration page to help make a decision about which
 storage backend to use.
 
@@ -62,12 +62,12 @@ study](https://www.hashicorp.com/resources/oh-no-i-deleted-my-vault-secret).
 We do not recommend backups as protection against the failure of an individual
 machine. Vault servers can run in clusters, so to protect against server
 failure, we recommend running Vault in [HA
-mode](/vault/docs/internals/high-availability). With open source features, a
+mode](/docs/internals/high-availability). With open source features, a
 Vault cluster can extend across multiple availability zones within a region.
 
 Vault Enterprise supports replicated clusters and disaster recovery for data
 center failure. When using OSS Vault in [HA
-Mode](/vault/docs/internals/high-availability), a backup can help guard against the
+Mode](/docs/internals/high-availability), a backup can help guard against the
 failure of a data center.
 
 Ultimately, backups are not a replacement for running in HA, or for using
@@ -80,8 +80,8 @@ components of that plan.
 Backups and restores are ideally performed while Vault is offline. If offline
 backups are not feasible, we recommend using a storage backend that supports
 atomic snapshots (such as
-[Consul](/consul/commands/snapshot) or [Integrated
-Storage](/vault/docs/commands/operator/raft#snapshot)).
+[Consul](https://developer.hashicorp.com/consul/commands/snapshot) or [Integrated
+Storage](/docs/commands/operator/raft#snapshot)).
 
 ~> If your storage backend does not support atomic snapshots, we recommend only
 taking offline backups.
@@ -91,13 +91,13 @@ HashiCorp-supported storage backend, see the instructions linked below. For
 other storage backends, follow the documentation of that backend for taking and
 restoring backups.
 
-- Integrated Storage [snapshots](/vault/docs/commands/operator/raft#snapshot)
-- Consul [snapshots](/consul/commands/snapshot)
+- Integrated Storage [snapshots](/docs/commands/operator/raft#snapshot)
+- Consul [snapshots](https://developer.hashicorp.com/consul/commands/snapshot)
 
 #### Backing up Multiple Clusters
 
 If you are using Vault Enterprise [Performance
-Replication](/vault/docs/enterprise/replication#performance-replication-and-disaster-recovery-dr-replication),
+Replication](/docs/enterprise/replication#performance-replication-and-disaster-recovery-dr-replication),
 you should plan to take backups of the active node on each of your clusters.
 
 ### Configuration
diff --git a/website/content/docs/concepts/tokens.mdx b/website/content/docs/concepts/tokens.mdx
index 29b9981e61e28..8eada9daed511 100644
--- a/website/content/docs/concepts/tokens.mdx
+++ b/website/content/docs/concepts/tokens.mdx
@@ -9,7 +9,7 @@ description: Tokens are a core auth method in Vault. Concepts and important feat
 !> **Warning**: Since tokens are considered opaque values, their structure is undocumented and subject to change. For these reasons, we do not recommend using tokens within your scripts or for automation since it can cause breakage.
 
 Tokens are the core method for _authentication_ within Vault. Tokens
-can be used directly or [auth methods](/vault/docs/concepts/auth)
+can be used directly or [auth methods](/docs/concepts/auth)
 can be used to dynamically generate tokens based on external identities.
 
 If you've gone through the getting started guide, you probably noticed that
@@ -17,20 +17,20 @@ If you've gone through the getting started guide, you probably noticed that
 initial "root token." This is the first method of authentication for Vault.
 It is also the only auth method that cannot be disabled.
 
-As stated in the [authentication concepts](/vault/docs/concepts/auth),
+As stated in the [authentication concepts](/docs/concepts/auth),
 all external authentication mechanisms, such as GitHub, map down to dynamically
 created tokens. These tokens have all the same properties as a normal manually
 created token.
 
 Within Vault, tokens map to information. The most important information mapped
 to a token is a set of one or more attached
-[policies](/vault/docs/concepts/policies). These policies control what the token
+[policies](/docs/concepts/policies). These policies control what the token
 holder is allowed to do within Vault. Other mapped information includes
 metadata that can be viewed and is added to the audit log, such as creation
 time, last renewal time, and more.
 
 Read on for a deeper dive into token concepts.  See the
-[tokens tutorial](/vault/tutorials/tokens/tokens)
+[tokens tutorial](https://learn.hashicorp.com/tutorials/vault/tokens)
 for details on how these concepts play out in practice.
 
 ## Token Types
@@ -45,7 +45,7 @@ their applicability to batch tokens is discussed later.
 
 Often in documentation or in help channels, the "token store" is referenced.
 This is the same as the [`token` authentication
-backend](/vault/docs/auth/token). This is a special
+backend](/docs/auth/token). This is a special
 backend in that it is responsible for creating and storing tokens, and cannot
 be disabled. It is also the only auth method that has no login
 capability -- all actions require existing authenticated tokens.
@@ -62,7 +62,7 @@ there are only three ways to create root tokens:
    expiration
 1. By using another root token; a root token with an expiration cannot create a
    root token that never expires
-1. By using `vault operator generate-root` ([example](/vault/tutorials/operations/generate-root))
+1. By using `vault operator generate-root` ([example](https://learn.hashicorp.com/tutorials/vault/generate-root))
    with the permission of a quorum of unseal key holders
 
 Root tokens are useful in development but should be extremely carefully guarded
@@ -71,7 +71,7 @@ used for just enough initial setup (usually, setting up auth methods
 and policies necessary to allow administrators to acquire more limited tokens)
 or in emergencies, and are revoked immediately after they are no longer needed.
 If a new root token is needed, the `operator generate-root` command and associated
-[API endpoint](/vault/api-docs/system/generate-root) can be used to generate one on-the-fly.
+[API endpoint](/api-docs/system/generate-root) can be used to generate one on-the-fly.
 
 It is also good security practice for there to be multiple eyes on a terminal
 whenever a root token is live. This way multiple people can verify as to the
@@ -160,7 +160,7 @@ token's information is looked up. It is based on a combination of factors:
 1. The system max TTL, which is 32 days but can be changed in Vault's
    configuration file.
 1. The max TTL set on a mount using [mount
-   tuning](/vault/api-docs/system/mounts). This value
+   tuning](/api-docs/system/mounts). This value
    is allowed to override the system max TTL -- it can be longer or shorter,
    and if set this value will be respected.
 1. A value suggested by the auth method that issued the token. This
diff --git a/website/content/docs/concepts/user-lockout.mdx b/website/content/docs/concepts/user-lockout.mdx
deleted file mode 100644
index 1ecbb66cbba7b..0000000000000
--- a/website/content/docs/concepts/user-lockout.mdx
+++ /dev/null
@@ -1,37 +0,0 @@
----
-layout: docs
-page_title: User Lockout
-description: >-
-  If a user provides bad credentials several times in quick succession, 
-  Vault will stop trying to validate their credentials for a while, instead 
-  returning immediately with a permission denied error.
----
-
-# User Lockout
-
-@include 'user-lockout.mdx'
-
-## Precendence
-
-The precedence for user lockout configuration is as follows: 
-
-Configuration for an auth mount using tune >> Configuration for an auth method in config file >> 
-Configuration for "all" auth methods in config file >> Default values.
-
-The precedence for user lockout disable is as follows: 
-
-Disable using environment variable VAULT_DISABLE_USER_LOCKOUT >> 
-Configuration for an auth mount using tune >> Configuration for an auth method in config file >> 
-Configuration for "all" auth methods in config file >> Default values.
-
-## Configuration
-
-User lockout parameters can be configured using config file for "all" auth methods or a specific auth method (userpass, ldap, or approle).
-Please see [user lockout configuration](/vault/docs/configuration/user-lockout#user_lockout-stanza) for more details. 
-
-The user lockout configuration for the auth method at a given path can be tuned using auth tune. Please see [auth tune command](/vault/docs/commands/auth/tune)
-or [auth tune api](/vault/api-docs/system/auth#tune-auth-method) for more details. 
-
-## API 
-
-Please see [sys/locked-users API](/vault/api-docs/system/user-lockout) for more details. 
\ No newline at end of file
diff --git a/website/content/docs/concepts/username-templating.mdx b/website/content/docs/concepts/username-templating.mdx
index 53acabb870de8..034e828b17f35 100644
--- a/website/content/docs/concepts/username-templating.mdx
+++ b/website/content/docs/concepts/username-templating.mdx
@@ -73,7 +73,7 @@ number indicating how many characters to generate.<br/>
 
 Each secret engine provides a different set of data to the template. Please see the associated secret engine's
 documentation for details on what values are provided to the template. The examples below are modeled after the
-[Database engine's](/vault/docs/secrets/databases) data, however the specific fields that are provided from a given engine
+[Database engine's](/docs/secrets/databases) data, however the specific fields that are provided from a given engine
 may differ from these examples. Additionally, the time is assumed to be 2009-02-13 11:31:30PM GMT
 (unix timestamp: 1234567890) and random characters are the ordered english alphabet: `abcdefghijklmnopqrstuvwxyz`.
 
@@ -154,5 +154,5 @@ each field. This results in `v_token-wi_my_custo_abcdefghijklmnopqrst_1234567890
 
 Refer to the following tutorials for step-by-step instructions.
 
-- [Database Secrets Engine with MongoDB](/vault/tutorials/db-credentials/database-mongodb#customize-the-generated-username-schema)
-- [Dynamic Secrets: Database Secrets Engine](/vault/tutorials/db-credentials/database-secrets#define-a-username-template)
+- [Database Secrets Engine with MongoDB](https://learn.hashicorp.com/tutorials/vault/database-mongodb#customize-the-generated-username-schema)
+- [Dynamic Secrets: Database Secrets Engine](https://learn.hashicorp.com/tutorials/vault/database-secrets#define-a-username-template)
diff --git a/website/content/docs/configuration/entropy-augmentation.mdx b/website/content/docs/configuration/entropy-augmentation.mdx
index 1d4951790ec18..df4c980b0717e 100644
--- a/website/content/docs/configuration/entropy-augmentation.mdx
+++ b/website/content/docs/configuration/entropy-augmentation.mdx
@@ -9,9 +9,9 @@ description: >-
 # `Entropy Augmentation` Seal
 
 Entropy augmentation enables Vault to sample entropy from external cryptographic modules.
-Sourcing external entropy is done by configuring a supported [Seal](/vault/docs/configuration/seal) type which
-include: [PKCS11 seal](/vault/docs/configuration/seal/pkcs11), [AWS KMS](/vault/docs/configuration/seal/awskms), and
-[Vault Transit](/vault/docs/configuration/seal/transit).
+Sourcing external entropy is done by configuring a supported [Seal](/docs/configuration/seal) type which
+include: [PKCS11 seal](/docs/configuration/seal/pkcs11), [AWS KMS](/docs/configuration/seal/awskms), and
+[Vault Transit](/docs/configuration/seal/transit).
 Vault Enterprises's external entropy support is activated by the presence of an `entropy "seal"`
 block in Vault's configuration file.
 
@@ -22,7 +22,7 @@ A valid Vault Enterprise license is required for Entropy Augmentation.
 ~> **Warning** This feature is not available with FIPS 140-2 Inside variants of Vault.
 
 Additionally, the following software packages and enterprise modules are required for sourcing entropy
-via the [PKCS11 seal](/vault/docs/configuration/seal/pkcs11):
+via the [PKCS11 seal](/docs/configuration/seal/pkcs11):
 
 - Vault Enterprise with the Plus package
 - PKCS#11 compatible HSM integration library. Vault targets version 2.2 or
@@ -46,7 +46,7 @@ entropy "seal" {
 }
 ```
 
-For a more detailed tutorial, visit the [HSM Entropy Challenge](/vault/tutorials/enterprise/hsm-entropy)
+For a more detailed tutorial, visit the [HSM Entropy Challenge](https://learn.hashicorp.com/vault/operations/hsm-entropy)
 on HashiCorp's Learn website.
 
 ## `entropy augmentation` Parameters
@@ -55,4 +55,4 @@ These parameters apply to the `entropy` stanza in the Vault configuration file:
 
 - `mode` `(string: <required>)`: The mode determines which Vault operations requiring
   entropy will sample entropy from the external source. Currently, the only mode supported
-  is `augmentation` which sources entropy for [Critical Security Parameters (CSPs)](/vault/docs/enterprise/entropy-augmentation#critical-security-parameters-csps).
+  is `augmentation` which sources entropy for [Critical Security Parameters (CSPs)](/docs/enterprise/entropy-augmentation#critical-security-parameters-csps).
diff --git a/website/content/docs/configuration/index.mdx b/website/content/docs/configuration/index.mdx
index 7b430454330d4..7c3e6023453e3 100644
--- a/website/content/docs/configuration/index.mdx
+++ b/website/content/docs/configuration/index.mdx
@@ -13,21 +13,15 @@ The format of this file is [HCL](https://github.com/hashicorp/hcl) or JSON.
 
 An example configuration is shown below:
 
-```hcl
-ui            = true
-cluster_addr  = "https://127.0.0.1:8201"
-api_addr      = "https://127.0.0.1:8200"
-disable_mlock = true
-
+```javascript
 storage "consul" {
   address = "127.0.0.1:8500"
   path    = "vault/"
 }
 
 listener "tcp" {
-  address       = "127.0.0.1:8200"
-  tls_cert_file = "/path/to/full-chain.pem"
-  tls_key_file  = "/path/to/private-key.pem"
+  address     = "127.0.0.1:8200"
+  tls_disable = 1
 }
 
 telemetry {
@@ -58,16 +52,12 @@ to specify where the configuration is.
   storage backend supports HA coordination and if HA specific options are
   already specified with `storage` parameter. (Refer to [Use Integrated Storage
   for HA
-  Coordination](/vault/tutorials/raft/raft-ha-storage)
+  Coordination](https://learn.hashicorp.com/vault/operations/raft-ha-storage)
   for a usage example.)
 
 - `listener` `([Listener][listener]: <required>)` – Configures how
   Vault is listening for API requests.
 
-- `user_lockout` `([UserLockout][user-lockout]: nil)` –
-  Configures the user-lockout behaviour for failed logins. For more information, please see the
-  [user lockout configuration documentation](/vault/docs/configuration/user-lockout). 
-
 - `seal` `([Seal][seal]: nil)` – Configures the seal type to use for
   auto-unsealing, as well as for
   [seal wrapping][sealwrap] as an additional layer of data protection.
@@ -86,7 +76,7 @@ to specify where the configuration is.
 
 - `disable_mlock` `(bool: false)` – Disables the server from executing the
   `mlock` syscall. `mlock` prevents memory from being swapped to disk. Disabling
-  `mlock` is not recommended unless using [integrated storage](/vault/docs/internals/integrated-storage).
+  `mlock` is not recommended unless using [integrated storage](/docs/internals/integrated-storage).
   Follow the additional security precautions outlined below when disabling `mlock`.
   This can also be provided via the environment variable `VAULT_DISABLE_MLOCK`.
 
@@ -98,7 +88,7 @@ to specify where the configuration is.
   automatically disabled on unsupported platforms.
 
   Disabling `mlock` is strongly recommended if using [integrated
-  storage](/vault/docs/internals/integrated-storage) due to
+  storage](/docs/internals/integrated-storage) due to
   the fact that `mlock` does not interact well with memory mapped files such as
   those created by BoltDB, which is used by Raft to track state. When using
   `mlock`, memory-mapped files get loaded into resident memory which causes
@@ -117,7 +107,7 @@ to specify where the configuration is.
 
   ~> Note: Since each plugin runs as a separate process, you need to do the same
   for each plugin in your [plugins
-  directory](/vault/docs/plugins/plugin-architecture#plugin-directory).
+  directory](/docs/plugins/plugin-architecture#plugin-directory).
 
   If you use a Linux distribution with a modern version of systemd, you can add
   the following directive to the "[Service]" configuration section:
@@ -133,17 +123,27 @@ to specify where the configuration is.
   @include 'plugin-file-permissions-check.mdx'
 
 - `plugin_file_uid` `(integer: 0)` – Uid of the plugin directories and plugin binaries if they
-  are owned by an user other than the user running Vault. This only needs to be set if the
-  file permissions check is enabled via the environment variable `VAULT_ENABLE_FILE_PERMISSIONS_CHECK`.
+   are owned by an user other than the user running Vault. This only needs to be set if the 
+   file permissions check is enabled via the environment variable `VAULT_ENABLE_FILE_PERMISSIONS_CHECK`.
 
 - `plugin_file_permissions` `(string: "")` – Octal permission string of the plugin
-  directories and plugin binaries if they have write or execute permissions for group or others.
-  This only needs to be set if the file permissions check is enabled via the environment variable
-  `VAULT_ENABLE_FILE_PERMISSIONS_CHECK`.
+   directories and plugin binaries if they have write or execute permissions for group or others.
+   This only needs to be set if the file permissions check is enabled via the environment variable 
+   `VAULT_ENABLE_FILE_PERMISSIONS_CHECK`.
 
 - `telemetry` `([Telemetry][telemetry]: <none>)` – Specifies the telemetry
   reporting system.
 
+- `log_level` `(string: "")` – Specifies the log level to use; overridden by
+  CLI and env var parameters. On SIGHUP (`sudo kill -s HUP` *pid of vault*), Vault will update the log level to the
+  current value specified here (including overriding the CLI/env var
+  parameters). Not all parts of Vault's logging can have its level be changed
+  dynamically this way; in particular, secrets/auth plugins are currently not
+  updated dynamically. Supported log levels: Trace, Debug, Error, Warn, Info.
+
+- `log_format` `(string: "")` – Specifies the log format to use; overridden by
+  CLI and env var parameters. Supported log formats: "standard", "json".
+
 - `default_lease_ttl` `(string: "768h")` – Specifies the default lease duration
   for tokens and secrets. This is specified using a label suffix like `"30s"` or
   `"1h"`. This value cannot be larger than `max_lease_ttl`.
@@ -152,30 +152,22 @@ to specify where the configuration is.
   duration for tokens and secrets. This is specified using a label
   suffix like `"30s"` or `"1h"`. Individual mounts can override this value
   by tuning the mount with the `max-lease-ttl` flag of the
-  [auth](/vault/docs/commands/auth/tune#max-lease-ttl) or
-  [secret](/vault/docs/commands/secrets/tune#max-lease-ttl) commands.
+  [auth](/docs/commands/auth/tune#max-lease-ttl) or
+  [secret](/docs/commands/secrets/tune#max-lease-ttl) commands.
 
 - `default_max_request_duration` `(string: "90s")` – Specifies the default
   maximum request duration allowed before Vault cancels the request. This can
   be overridden per listener via the `max_request_duration` value.
 
-- `detect_deadlocks` `(string: "")` - Specifies the internal mutex locks that should be monitored for
-potential deadlocks. Currently supported value is `statelock`, which will cause "POTENTIAL DEADLOCK:"
-to be logged when an attempt at a core state lock appears to be deadlocked. Enabling this can have
-a negative effect on performance due to the tracking of each lock attempt.
-
 - `raw_storage_endpoint` `(bool: false)` – Enables the `sys/raw` endpoint which
   allows the decryption/encryption of raw data into and out of the security
   barrier. This is a highly privileged endpoint.
 
-- `introspection_endpoint` `(bool: false)` - Enables the `sys/internal/inspect` endpoint
-  which allows users with a root token or sudo privileges to inspect certain subsystems inside Vault.
-
 - `ui` `(bool: false)` – Enables the built-in web UI, which is available on all
   listeners (address + port) at the `/ui` path. Browsers accessing the standard
   Vault API address will automatically redirect there. This can also be provided
   via the environment variable `VAULT_UI`. For more information, please see the
-  [ui configuration documentation](/vault/docs/configuration/ui).
+  [ui configuration documentation](/docs/configuration/ui).
 
 - `pid_file` `(string: "")` - Path to the file in which the Vault server's
   Process ID (PID) should be stored.
@@ -195,32 +187,6 @@ a negative effect on performance due to the tracking of each lock attempt.
   participating in a Raft cluster, this header will be omitted, whether this configuration
   option is enabled or not.
 
-- `log_level` `(string: "info")` - Log verbosity level.
-  Supported values (in order of descending detail) are `trace`, `debug`, `info`, `warn`, and `error`.
-  This can also be specified via the `VAULT_LOG_LEVEL` environment variable.
-
-  ~> Note: On SIGHUP (`sudo kill -s HUP` _pid of vault_), if a valid value is specified, Vault will update the existing log level,
-  overriding (even if specified) both the CLI flag and environment variable.
-
-  ~> Note: Not all parts of Vault's logging can have its log level be changed dynamically this way; in particular,
-  secrets/auth plugins are currently not updated dynamically.
-
-- `log_format` - Equivalent to the [`-log-format` command-line flag](/vault/docs/commands/server#_log_format).
-
-- `log_file` - Equivalent to the [`-log-file` command-line flag](/vault/docs/commands/server#_log_file).
-
-- `log_rotate_duration` - Equivalent to the [`-log-rotate-duration` command-line flag](/vault/docs/commands/server#_log_rotate_duration).
-
-- `log_rotate_bytes` - Equivalent to the [`-log-rotate-bytes` command-line flag](/vault/docs/commands/server#_log_rotate_bytes).
-
-- `log_rotate_max_files` - Equivalent to the [`-log-rotate-max-files` command-line flag](/vault/docs/commands/server#_log_rotate_max_files).
-
-- `experiments` `(string array: [])` - The list of experiments to enable for this node.
-  Experiments should NOT be used in production, and the associated APIs may have backwards
-  incompatible changes between releases. Additional experiments can also be specified via
-  the `VAULT_EXPERIMENTS` environment variable as a comma-separated list, or via the
-  [`-experiment`](/vault/docs/commands/server#experiment) flag.
-
 ### High Availability Parameters
 
 The following parameters are used on backends that support [high availability][high-availability].
@@ -261,15 +227,15 @@ The following parameters are only used with Vault Enterprise
   node will disable this feature when this node is Active or Standby. It's
   recommended to sync this setting across all nodes in the cluster.
 
-- `license_path` `(string: "")` - Path to license file. This can also be
+- `license_path` `(string: "")` - Path to license file.  This can also be
   provided via the environment variable `VAULT_LICENSE_PATH`, or the license
   itself can be provided in the environment variable `VAULT_LICENSE`.
 
-[storage-backend]: /vault/docs/configuration/storage
-[listener]: /vault/docs/configuration/listener
-[seal]: /vault/docs/configuration/seal
-[sealwrap]: /vault/docs/enterprise/sealwrap
-[telemetry]: /vault/docs/configuration/telemetry
-[sentinel]: /vault/docs/configuration/sentinel
-[high-availability]: /vault/docs/concepts/ha
-[plugins]: /vault/docs/plugins
+[storage-backend]: /docs/configuration/storage
+[listener]: /docs/configuration/listener
+[seal]: /docs/configuration/seal
+[sealwrap]: /docs/enterprise/sealwrap
+[telemetry]: /docs/configuration/telemetry
+[sentinel]: /docs/configuration/sentinel
+[high-availability]: /docs/concepts/ha
+[plugins]: /docs/plugins
diff --git a/website/content/docs/configuration/listener/index.mdx b/website/content/docs/configuration/listener/index.mdx
index 868ea1d4fc478..af45f0e23f320 100644
--- a/website/content/docs/configuration/listener/index.mdx
+++ b/website/content/docs/configuration/listener/index.mdx
@@ -9,9 +9,6 @@ description: |-
 # `listener` Stanza
 
 The `listener` stanza configures the addresses and ports on which Vault will
-respond to requests. At this time, there are two listeners: 
-- [TCP][tcp]
-- [Unix Domain Socket][unix]
+respond to requests. At this time, there is only one listener - [TCP][tcp].
 
-[tcp]: /vault/docs/configuration/listener/tcp
-[unix]: /vault/docs/configuration/listener/unix
+[tcp]: /docs/configuration/listener/tcp
diff --git a/website/content/docs/configuration/listener/tcp.mdx b/website/content/docs/configuration/listener/tcp.mdx
index 82ad27409c131..f35793d69923c 100644
--- a/website/content/docs/configuration/listener/tcp.mdx
+++ b/website/content/docs/configuration/listener/tcp.mdx
@@ -26,9 +26,9 @@ advertise the correct address to other nodes.
 As of version 1.9, Vault supports defining custom HTTP response headers for the root path (`/`) and also on API endpoints (`/v1/*`).
 The headers are defined based on the returned status code. For example, a user can define a list of
 custom response headers for the `200` status code, and another list of custom response headers for
-the `307` status code. There is a `"/sys/config/ui"` [API endpoint](/vault/api-docs/system/config-ui) which allows users
+the `307` status code. There is a `"/sys/config/ui"` [API endpoint](/api-docs/system/config-ui) which allows users
 to set `UI` specific custom headers. If a header is configured in a configuration file, it is not allowed
-to be reconfigured through the `"/sys/config/ui"` [API endpoint](/vault/api-docs/system/config-ui). In cases where a
+to be reconfigured through the `"/sys/config/ui"` [API endpoint](/api-docs/system/config-ui). In cases where a
 custom header value needs to be modified or the custom header needs to be removed, the Vault's configuration file
 needs to be modified accordingly, and a `SIGHUP` signal needs to be sent to the Vault process.
 
@@ -40,11 +40,11 @@ upon start up indicating the header with `X-Vault-` prefix is not accepted.
 ### Order of precedence
 
 If the same header is configured in both the configuration file and
-in the `"/sys/config/ui"` [API endpoint](/vault/api-docs/system/config-ui), the header in the configuration file takes precedence.
+in the `"/sys/config/ui"` [API endpoint](/api-docs/system/config-ui), the header in the configuration file takes precedence.
 For example, the `"Content-Security-Policy"` header is defined by default in the
-`"/sys/config/ui"` [API endpoint](/vault/api-docs/system/config-ui). If that header is also defined in the configuration file,
+`"/sys/config/ui"` [API endpoint](/api-docs/system/config-ui). If that header is also defined in the configuration file,
 the value in the configuration file is set in the response headers instead of the
-default value in the `"/sys/config/ui"` [API endpoint](/vault/api-docs/system/config-ui).
+default value in the `"/sys/config/ui"` [API endpoint](/api-docs/system/config-ui).
 
 ## `tcp` Listener Parameters
 
@@ -133,13 +133,6 @@ default value in the `"/sys/config/ui"` [API endpoint](/vault/api-docs/system/co
   `tls_min_version` and `tls_max_version` parameters) are widely considered
   insecure.
 
-- `tls_max_version` `(string: "tls13")` – Specifies the maximum supported
-  version of TLS. Accepted values are "tls10", "tls11", "tls12" or "tls13".
-
-~> **Warning**: TLS 1.1 and lower (`tls10` and `tls11` values for the
-  `tls_min_version` and `tls_max_version` parameters) are widely considered
-  insecure.
-
 - `tls_cipher_suites` `(string: "")` – Specifies the list of supported
   ciphersuites as a comma-separated-list. The list of all available ciphersuites
   is available in the [Golang TLS documentation][golang-tls].
@@ -305,7 +298,7 @@ listener "tcp" {
     },
     "301" = {
       "Strict-Transport-Security" = ["max-age=31536000"],
-      "Content-Security-Policy" = ["connect-src https://clusterC.vault.external/"],
+      “Content-Security-Policy" = ["connect-src https://clusterC.vault.external/"],
     },
   }
 }
@@ -359,6 +352,6 @@ cluster_addr = "https://[2001:1c04:90d:1c00:a00:27ff:fefa:58ec]:8201"
 ```
 
 [golang-tls]: https://golang.org/src/crypto/tls/cipher_suites.go
-[api-addr]: /vault/docs/configuration#api_addr
-[cluster-addr]: /vault/docs/configuration#cluster_addr
+[api-addr]: /docs/configuration#api_addr
+[cluster-addr]: /docs/configuration#cluster_addr
 [go-tls-blog]: https://go.dev/blog/tls-cipher-suites
diff --git a/website/content/docs/configuration/listener/unix.mdx b/website/content/docs/configuration/listener/unix.mdx
deleted file mode 100644
index e338edb268b60..0000000000000
--- a/website/content/docs/configuration/listener/unix.mdx
+++ /dev/null
@@ -1,69 +0,0 @@
----
-layout: docs
-page_title: Unix - Listeners - Configuration
-description: |-
-  The Unix listener configures Vault to listen on the specified Unix domain socket.
----
-
-# `unix` Listener
-
-The Unix listener configures Vault to listen on the specified Unix domain socket.
-
-```hcl
-listener "unix" {
-  address = "/run/vault.sock"
-}
-```
-
-The `listener` stanza may be specified more than once to make Vault listen on
-multiple sockets.
-
-## `unix` Listener Parameters
-- `address` `(string: "/run/vault.sock", <required>)` – Specifies the address to bind the Unix socket.
-
-- `socket_mode` `(string: "", <optional>)` – Changes the access
-  permissions and the special mode flags of the Unix socket.
-
-- `socket_user` `(string: "", <optional>)` – Changes the user owner of the Unix socket.
-
-- `socket_group` `(string: "", <optional>)` – Changes the group owner of the Unix socket.
-
-
-## `unix` Listener Examples
-
-### Listening on Multiple Sockets
-
-This example shows Vault listening on a specified socket, as well as the default.
-
-```hcl
-listener "unix" {}
-
-listener "unix" {
-  address = "/var/run/vault.sock"
-}
-```
-
-### Listening on Multiple Interfaces
-
-This example shows Vault listening on TCP localhost, as well as Unix socket.
-
-```hcl
-listener "unix" {
-  address = "/var/run/vault.sock"
-}
-
-listener "tcp" {
-  address = "127.0.0.1:8200"
-}
-```
-
-### Configuring Permissions
-This example shows changing access permissions and ownership of the Unix socket.
-```hcl
-listener "unix" {
-  address = "/var/run/vault.sock"
-  socket_mode = "644"
-  socket_user = "1000"
-  socket_group = "1000"
-}
-```
\ No newline at end of file
diff --git a/website/content/docs/configuration/replication.mdx b/website/content/docs/configuration/replication.mdx
index f10d2263461de..41c78ce03b121 100644
--- a/website/content/docs/configuration/replication.mdx
+++ b/website/content/docs/configuration/replication.mdx
@@ -45,4 +45,4 @@ replication {
 - `allow_forwarding_via_token` `(string: "")` - When set to `new_token`, requests sent to non-active nodes
   are forwarded if the node does not yet have the token information in storage.
 
-Support for Server Side Consistent Tokens is now available. Refer to the [Server Side Consistent Token FAQ](/vault/docs/faq/ssct) for details.
+Support for Server Side Consistent Tokens is now available. Refer to the [Server Side Consistent Token FAQ](/docs/faq/ssct) for details.
diff --git a/website/content/docs/configuration/seal/alicloudkms.mdx b/website/content/docs/configuration/seal/alicloudkms.mdx
index 5220acd37aca6..2c6fcc3ac6d90 100644
--- a/website/content/docs/configuration/seal/alicloudkms.mdx
+++ b/website/content/docs/configuration/seal/alicloudkms.mdx
@@ -10,7 +10,7 @@ description: >-
 
 # `alicloudkms` Seal
 
--> **Note:** The Seal Wrap functionality is enabled by default. For this reason, the KMS service must be available throughout Vault's runtime and not just during the unseal process. Refer to the [Seal Wrap](/vault/docs/enterprise/sealwrap) documenation for more information.
+-> **Note:** The Seal Wrap functionality is enabled by default. For this reason, the KMS service must be available throughout Vault's runtime and not just during the unseal process. Refer to the [Seal Wrap](/docs/enterprise/sealwrap) documenation for more information.
 
 
 The AliCloud KMS seal configures Vault to use AliCloud KMS as the seal wrapping mechanism.
@@ -63,7 +63,7 @@ These parameters apply to the `seal` stanza in the Vault configuration file:
 
 - `disabled` `(string: "")`: Set this to `true` if Vault is migrating from an auto seal configuration. Otherwise, set to `false`.
 
-Refer to the [Seal Migration](/vault/docs/concepts/seal#seal-migration) documentation for more information about the seal migration process.
+Refer to the [Seal Migration](/docs/concepts/seal#seal-migration) documentation for more information about the seal migration process.
 
 ## Authentication
 
diff --git a/website/content/docs/configuration/seal/awskms.mdx b/website/content/docs/configuration/seal/awskms.mdx
index 2d9384223e469..62af6351db086 100644
--- a/website/content/docs/configuration/seal/awskms.mdx
+++ b/website/content/docs/configuration/seal/awskms.mdx
@@ -8,7 +8,7 @@ description: |-
 
 # `awskms` Seal
 
--> **Note:** The Seal Wrap functionality is enabled by default. For this reason, the KMS service must be available throughout Vault's runtime and not just during the unseal process. Refer to the [Seal Wrap](/vault/docs/enterprise/sealwrap) documenation for more information.
+-> **Note:** The Seal Wrap functionality is enabled by default. For this reason, the KMS service must be available throughout Vault's runtime and not just during the unseal process. Refer to the [Seal Wrap](/docs/enterprise/sealwrap) documenation for more information.
 
 The AWS KMS seal configures Vault to use AWS KMS as the seal wrapping mechanism.
 The AWS KMS seal is activated by one of the following:
@@ -67,7 +67,7 @@ These parameters apply to the `seal` stanza in the Vault configuration file:
   Endpoint](https://docs.aws.amazon.com/kms/latest/developerguide/kms-vpc-endpoint.html).
   If not set, Vault will use the default API endpoint for your region.
 
-Refer to the [Seal Migration](/vault/docs/concepts/seal#seal-migration) documentation for more information about the seal migration process.
+Refer to the [Seal Migration](/docs/concepts/seal#seal-migration) documentation for more information about the seal migration process.
 
 ## Authentication
 
@@ -123,5 +123,5 @@ or set to current under a key alias.
 
 ## Tutorial
 
-Refer to the [Auto-unseal using AWS KMS](/vault/tutorials/auto-unseal/autounseal-aws-kms)
+Refer to the [Auto-unseal using AWS KMS](https://learn.hashicorp.com/vault/operations/ops-autounseal-aws-kms)
 tutorial to learn how to auto-unseal Vault using AWS KMS.
diff --git a/website/content/docs/configuration/seal/azurekeyvault.mdx b/website/content/docs/configuration/seal/azurekeyvault.mdx
index 30ce8c849aa54..5433e24b1e1ac 100644
--- a/website/content/docs/configuration/seal/azurekeyvault.mdx
+++ b/website/content/docs/configuration/seal/azurekeyvault.mdx
@@ -10,7 +10,7 @@ description: >-
 
 # `azurekeyvault` Seal
 
--> **Note:** The Seal Wrap functionality is enabled by default. For this reason, the KMS service must be available throughout Vault's runtime and not just during the unseal process. Refer to the [Seal Wrap](/vault/docs/enterprise/sealwrap) documenation for more information.
+-> **Note:** The Seal Wrap functionality is enabled by default. For this reason, the KMS service must be available throughout Vault's runtime and not just during the unseal process. Refer to the [Seal Wrap](/docs/enterprise/sealwrap) documenation for more information.
 
 The Azure Key Vault seal configures Vault to use Azure Key Vault as the seal
 wrapping mechanism. The Azure Key Vault seal is activated by one of the following:
@@ -65,7 +65,7 @@ These parameters apply to the `seal` stanza in the Vault configuration file:
 
 - `disabled` `(string: "")`: Set this to `true` if Vault is migrating from an auto seal configuration. Otherwise, set to `false`.
 
-Refer to the [Seal Migration](/vault/docs/concepts/seal#seal-migration) documentation for more information about the seal migration process.
+Refer to the [Seal Migration](/docs/concepts/seal#seal-migration) documentation for more information about the seal migration process.
 
 
 ## Authentication
@@ -88,7 +88,7 @@ and secret. MSI must be
 on the VMs hosting Vault, and it is the preferred configuration since MSI
 prevents your Azure credentials from being stored as clear text. Refer to the
 [Production
-Hardening](/vault/tutorials/operations/production-hardening) tutorial
+Hardening](https://learn.hashicorp.com/vault/day-one/production-hardening) tutorial
 for more best practices.
 
 -> **Note:** If you are using a Managed HSM KeyVault, `AZURE_AD_RESOURCE` or the `resource`
@@ -113,5 +113,5 @@ using Azure Automation Account and Vault will recognize newly rotated keys.
 
 ## Tutorial
 
-Refer to the [Auto-unseal using Azure Key Vault](/vault/tutorials/auto-unseal/autounseal-azure-keyvault)
+Refer to the [Auto-unseal using Azure Key Vault](https://learn.hashicorp.com/vault/operations/autounseal-azure-keyvault)
 tutorial to learn how to use the Azure Key Vault to auto-unseal a Vault server.
diff --git a/website/content/docs/configuration/seal/gcpckms.mdx b/website/content/docs/configuration/seal/gcpckms.mdx
index c6c584b80e4eb..e3d70a877d548 100644
--- a/website/content/docs/configuration/seal/gcpckms.mdx
+++ b/website/content/docs/configuration/seal/gcpckms.mdx
@@ -10,7 +10,7 @@ description: >-
 
 # `gcpckms` Seal
 
--> **Note:** The Seal Wrap functionality is enabled by default. For this reason, the KMS service must be available throughout Vault's runtime and not just during the unseal process. Refer to the [Seal Wrap](/vault/docs/enterprise/sealwrap) documenation for more information.
+-> **Note:** The Seal Wrap functionality is enabled by default. For this reason, the KMS service must be available throughout Vault's runtime and not just during the unseal process. Refer to the [Seal Wrap](/docs/enterprise/sealwrap) documenation for more information.
 
 The GCP Cloud KMS seal configures Vault to use GCP Cloud KMS as the seal
 wrapping mechanism. The GCP Cloud KMS seal is activated by one of the following:
@@ -62,7 +62,7 @@ These parameters apply to the `seal` stanza in the Vault configuration file:
 
 - `disabled` `(string: "")`: Set this to `true` if Vault is migrating from an auto seal configuration. Otherwise, set to `false`.
 
-Refer to the [Seal Migration](/vault/docs/concepts/seal#seal-migration) documentation for more information about the seal migration process.
+Refer to the [Seal Migration](/docs/concepts/seal#seal-migration) documentation for more information about the seal migration process.
 
 ## Authentication &amp; Permissions
 
@@ -116,5 +116,5 @@ encrypted with the primary key version.
 
 ## Tutorial
 
-Refer to the [Auto-unseal using GCP Cloud KMS](/vault/tutorials/auto-unseal/autounseal-gcp-kms)
+Refer to the [Auto-unseal using GCP Cloud KMS](https://learn.hashicorp.com/vault/operations/autounseal-gcp-kms)
 guide for a step-by-step tutorial.
diff --git a/website/content/docs/configuration/seal/index.mdx b/website/content/docs/configuration/seal/index.mdx
index 63d09e2e5dc7a..01a82f8ff6c2f 100644
--- a/website/content/docs/configuration/seal/index.mdx
+++ b/website/content/docs/configuration/seal/index.mdx
@@ -43,4 +43,4 @@ seal "pkcs11" {
 For configuration options which also read an environment variable, the
 environment variable will take precedence over values in the configuration file.
 
-[sealwrap]: /vault/docs/enterprise/sealwrap
+[sealwrap]: /docs/enterprise/sealwrap
diff --git a/website/content/docs/configuration/seal/ocikms.mdx b/website/content/docs/configuration/seal/ocikms.mdx
index c534e555bf6ae..4013048e4aa13 100644
--- a/website/content/docs/configuration/seal/ocikms.mdx
+++ b/website/content/docs/configuration/seal/ocikms.mdx
@@ -8,7 +8,7 @@ description: |-
 
 # `ocikms` Seal
 
--> **Note:** The Seal Wrap functionality is enabled by default. For this reason, the KMS service must be available throughout Vault's runtime and not just during the unseal process. Refer to the [Seal Wrap](/vault/docs/enterprise/sealwrap) documenation for more information.
+-> **Note:** The Seal Wrap functionality is enabled by default. For this reason, the KMS service must be available throughout Vault's runtime and not just during the unseal process. Refer to the [Seal Wrap](/docs/enterprise/sealwrap) documenation for more information.
 
 The OCI KMS seal configures Vault to use OCI KMS as the seal wrapping mechanism.
 The OCI KMS seal is activated by one of the following:
@@ -51,14 +51,14 @@ These parameters apply to the `seal` stanza in the Vault configuration file:
 
 - `disabled` `(string: "")`: Set this to `true` if Vault is migrating from an auto seal configuration. Otherwise, set to `false`.
 
-Refer to the [Seal Migration](/vault/docs/concepts/seal#seal-migration) documentation for more information about the seal migration process.
+Refer to the [Seal Migration](/docs/concepts/seal#seal-migration) documentation for more information about the seal migration process.
 
 ## Authentication
 
 Authentication-related values must be provided, either as environment
 variables or as configuration parameters.
 
-If you want to use Instance Principal, add section configuration below and add further configuration settings as detailed in the [configuration docs](/vault/docs/configuration/).
+If you want to use Instance Principal, add section configuration below and add further configuration settings as detailed in the [configuration docs](/docs/configuration/).
 
 ```hcl
 seal "ocikms" {
diff --git a/website/content/docs/configuration/seal/pkcs11.mdx b/website/content/docs/configuration/seal/pkcs11.mdx
index bb1949ea64acf..c743cd3d42b04 100644
--- a/website/content/docs/configuration/seal/pkcs11.mdx
+++ b/website/content/docs/configuration/seal/pkcs11.mdx
@@ -8,7 +8,7 @@ description: |-
 
 # `pkcs11` Seal
 
--> **Note:** The Seal Wrap functionality is enabled by default. For this reason, HSM must be available throughout Vault's runtime and not just during the unseal process. Refer to the [Seal Wrap](/vault/docs/enterprise/sealwrap) documentation for more information.
+-> **Note:** The Seal Wrap functionality is enabled by default. For this reason, HSM must be available throughout Vault's runtime and not just during the unseal process. Refer to the [Seal Wrap](/docs/enterprise/sealwrap) documentation for more information.
 
 The PKCS11 seal configures Vault to use an HSM with PKCS11 as the seal wrapping
 mechanism. Vault Enterprise's HSM PKCS11 support is activated by one of the
@@ -154,7 +154,7 @@ These parameters apply to the `seal` stanza in the Vault configuration file:
 
 - `disabled` `(string: "")`: Set this to `true` if Vault is migrating from an auto seal configuration. Otherwise, set to `false`.
 
-Refer to the [Seal Migration](/vault/docs/concepts/seal#seal-migration) documentation for more information about the seal migration process.
+Refer to the [Seal Migration](/docs/concepts/seal#seal-migration) documentation for more information about the seal migration process.
   
 ### Mechanism Specific Flags
 
@@ -275,5 +275,5 @@ rotation is desired for data that was seal wrapped prior to this version must al
 
 ## Tutorial
 
-Refer to the [HSM Integration - Seal Wrap](/vault/tutorials/auto-unseal/seal-wrap)
+Refer to the [HSM Integration - Seal Wrap](https://learn.hashicorp.com/vault/operations/ops-seal-wrap)
 tutorial to learn how to enable the Seal Wrap feature to protect your data.
diff --git a/website/content/docs/configuration/seal/transit.mdx b/website/content/docs/configuration/seal/transit.mdx
index a72b87ad7cd3c..1c7e12aae87fe 100644
--- a/website/content/docs/configuration/seal/transit.mdx
+++ b/website/content/docs/configuration/seal/transit.mdx
@@ -89,7 +89,7 @@ These parameters apply to the `seal` stanza in the Vault configuration file:
 
 - `disabled` `(string: "")`: Set this to `true` if Vault is migrating from an auto seal configuration. Otherwise, set to `false`.
 
-Refer to the [Seal Migration](/vault/docs/concepts/seal#seal-migration) documentation for more information about the seal migration process.
+Refer to the [Seal Migration](/docs/concepts/seal#seal-migration) documentation for more information about the seal migration process.
 
 ## Authentication
 
@@ -114,18 +114,18 @@ path "<mount path>/decrypt/<key name>" {
 ```
 
 Other considerations for the token used:
-* it should probably be an [orphan token](/vault/docs/concepts/tokens#token-hierarchies-and-orphan-tokens),
+* it should probably be an [orphan token](/docs/concepts/tokens#token-hierarchies-and-orphan-tokens),
 otherwise when the parent token expires or gets revoked the seal will break.
-* consider making it a [periodic token](/vault/docs/concepts/tokens#periodic-tokens)
+* consider making it a [periodic token](/docs/concepts/tokens#periodic-tokens)
 and not setting an explicit max TTL, otherwise at some point it will cease to be renewable.
 
 ## Key Rotation
 
 This seal supports key rotation using the Transit Secret Engine's key rotation endpoints. See
-[doc](/vault/api-docs/secret/transit#rotate-key). Old keys must not be disabled or deleted and are
+[doc](/api-docs/secret/transit#rotate-key). Old keys must not be disabled or deleted and are
 used to decrypt older data.
 
 ## Tutorial
 
-Refer to the [Auto-unseal using Transit Secrets Engine](/vault/tutorials/auto-unseal/autounseal-transit)
+Refer to the [Auto-unseal using Transit Secrets Engine](https://learn.hashicorp.com/vault/operations/autounseal-transit)
 tutorial to learn how use the transit secrets engine to automatically unseal Vault.
diff --git a/website/content/docs/configuration/sentinel.mdx b/website/content/docs/configuration/sentinel.mdx
index 5a61f5deddb3a..50c5bfa18b3fd 100644
--- a/website/content/docs/configuration/sentinel.mdx
+++ b/website/content/docs/configuration/sentinel.mdx
@@ -8,7 +8,7 @@ description: |-
 # `sentinel` Stanza
 
 The sentinel stanza specifies configurations for
-[Vault's Sentinel](/vault/docs/enterprise/sentinel) integration.
+[Vault's Sentinel](https://www.vaultproject.io/docs/enterprise/sentinel) integration.
 
 ```hcl
 sentinel {
diff --git a/website/content/docs/configuration/service-registration/consul.mdx b/website/content/docs/configuration/service-registration/consul.mdx
index 3f2a4f614dc9f..0795babc12063 100644
--- a/website/content/docs/configuration/service-registration/consul.mdx
+++ b/website/content/docs/configuration/service-registration/consul.mdx
@@ -21,23 +21,12 @@ a default health check. When Consul is configured as the storage backend, the st
 - **HashiCorp Supported** – Consul Service Registration is officially supported
   by HashiCorp.
 
-## Configuration
-
 ```hcl
 service_registration "consul" {
   address      = "127.0.0.1:8500"
 }
 ```
 
-If Vault is running in HA mode, include the transfer protocol (`http://` or
-`https://`) in the address:
-
-```hcl
-service_registration "consul" {
-  address      = "http://127.0.0.1:8500"
-}
-```
-
 Once properly configured, an unsealed Vault installation should be available and
 accessible at:
 
@@ -104,17 +93,17 @@ connection. You can read more about encrypting Consul connections on the
 - `tls_ca_file` `(string: "")` – Specifies the path to the CA certificate used
   for Consul communication. This defaults to system bundle if not specified.
   This should be set according to the
-  [`ca_file`](/consul/docs/agent/config/config-files#ca_file) setting in
+  [`ca_file`](https://developer.hashicorp.com/consul/docs/agent/config/config-files#ca_file) setting in
   Consul.
 
 - `tls_cert_file` `(string: "")` (optional) – Specifies the path to the
   certificate for Consul communication. This should be set according to the
-  [`cert_file`](/consul/docs/agent/config/config-files#cert_file) setting
+  [`cert_file`](https://developer.hashicorp.com/consul/docs/agent/config/config-files#cert_file) setting
   in Consul.
 
 - `tls_key_file` `(string: "")` – Specifies the path to the private key for
   Consul communication. This should be set according to the
-  [`key_file`](/consul/docs/agent/config/config-files#key_file) setting
+  [`key_file`](https://developer.hashicorp.com/consul/docs/agent/config/config-files#key_file) setting
   in Consul.
 
 - `tls_min_version` `(string: "tls12")` – Specifies the minimum TLS version to
@@ -187,6 +176,6 @@ service_registration "consul" {
 ```
 
 [consul]: https://www.consul.io/ 'Consul by HashiCorp'
-[consul-acl]: /consul/docs/guides/acl 'Consul ACLs'
-[consul-encryption]: /consul/docs/agent/encryption 'Consul Encryption'
-[consul-translate-wan-addrs]: /consul/docs/agent/options#translate_wan_addrs 'Consul Configuration'
+[consul-acl]: https://www.consul.io/docs/guides/acl.html 'Consul ACLs'
+[consul-encryption]: https://www.consul.io/docs/agent/encryption.html 'Consul Encryption'
+[consul-translate-wan-addrs]: https://www.consul.io/docs/agent/options.html#translate_wan_addrs 'Consul Configuration'
diff --git a/website/content/docs/configuration/service-registration/index.mdx b/website/content/docs/configuration/service-registration/index.mdx
index 1bd5cf466377a..daaf2d8bde10c 100644
--- a/website/content/docs/configuration/service-registration/index.mdx
+++ b/website/content/docs/configuration/service-registration/index.mdx
@@ -60,8 +60,8 @@ file.
 
 [consul]: https://www.consul.io/
 [consul-discovery]: https://www.consul.io/
-[storage-backend]: /vault/docs/configuration/storage
-[consul-backend]: /vault/docs/configuration/storage/consul
-[raft-backend]: /vault/docs/configuration/storage/raft
-[consul-service-registration]: /vault/docs/configuration/service-registration/consul
-[kubernetes-service-registration]: /vault/docs/configuration/service-registration/kubernetes
+[storage-backend]: /docs/configuration/storage
+[consul-backend]: /docs/configuration/storage/consul
+[raft-backend]: /docs/configuration/storage/raft
+[consul-service-registration]: /docs/configuration/service-registration/consul
+[kubernetes-service-registration]: /docs/configuration/service-registration/kubernetes
diff --git a/website/content/docs/configuration/service-registration/kubernetes.mdx b/website/content/docs/configuration/service-registration/kubernetes.mdx
index 56e489474d52f..7db97a82f6c4a 100644
--- a/website/content/docs/configuration/service-registration/kubernetes.mdx
+++ b/website/content/docs/configuration/service-registration/kubernetes.mdx
@@ -10,7 +10,7 @@ description: >-
 
 Kubernetes Service Registration tags Vault pods with their current status for
 use with selectors. Service registration is only available when Vault is running in
-[High Availability mode](/vault/docs/concepts/ha).
+[High Availability mode](/docs/concepts/ha).
 
 - **HashiCorp Supported** – Kubernetes Service Registration is officially supported
   by HashiCorp.
@@ -71,7 +71,7 @@ metadata:
     vault-initialized: "true"
     vault-perf-standby: "false"
     vault-sealed: "false"
-    vault-version: 1.13.1
+    vault-version: 1.3.0
 ```
 
 After shutdowns, Vault pods will bear the following labels:
@@ -86,7 +86,7 @@ metadata:
     vault-initialized: "false"
     vault-perf-standby: "false"
     vault-sealed: "true"
-    vault-version: 1.13.1
+    vault-version: 1.3.0
 ```
 
 ## Label Definitions
@@ -102,7 +102,7 @@ metadata:
 - `vault-sealed` `(string: "true"/"false")` – Vault sealed is updated dynamically each
   time Vault's sealed/unsealed status changes. True indicates that Vault is currently sealed. False indicates that Vault
   is currently unsealed.
-- `vault-version` `(string: "1.13.1")` – Vault version is a string that will not change during a pod's lifecycle.
+- `vault-version` `(string: "1.3.0")` – Vault version is a string that will not change during a pod's lifecycle.
 
 ## Working with Vault's Service Discovery Labels
 
@@ -156,7 +156,7 @@ $ vault write -f sys/replication/performance/primary/enable \
 In conjunction with the pod labels and the `OnDelete` upgrade strategy, upgrades are much easier to orchestrate:
 
 ```shell-session
-$ helm upgrade vault --set='server.image.tag=1.13.1'
+$ helm upgrade vault --set='server.image.tag=1.12.0'
 
 $ kubectl delete pod --selector=vault-active=false \
     --selector=vault-version=1.2.3
diff --git a/website/content/docs/configuration/storage/aerospike.mdx b/website/content/docs/configuration/storage/aerospike.mdx
index bb47140325de0..826a03e5666ec 100644
--- a/website/content/docs/configuration/storage/aerospike.mdx
+++ b/website/content/docs/configuration/storage/aerospike.mdx
@@ -19,9 +19,6 @@ The Aerospike storage backend is used to persist Vault's data in an
   be as knowledgeable about the technology. If you encounter problems with them,
   you may be referred to the original author.
 
-- **64-bit only** - the Aerospike storage backend is not supported when Vault runs
-  on a 32-bit architecture, because the Aerospike Go client doesn't support 32-bits.
-
 ```hcl
 storage "aerospike" {
   hostname = "localhost"
diff --git a/website/content/docs/configuration/storage/consul.mdx b/website/content/docs/configuration/storage/consul.mdx
index 00d3607087c9d..96713dc0bb7f8 100644
--- a/website/content/docs/configuration/storage/consul.mdx
+++ b/website/content/docs/configuration/storage/consul.mdx
@@ -76,7 +76,7 @@ and [`cluster_addr`][cluster-addr] ([example][listener-example]).
 - `max_parallel` `(string: "128")` – Specifies the maximum number of concurrent
   requests to Consul. Make sure that your Consul agents are configured to
   support this level of parallelism, see
-  [http_max_conns_per_client](/consul/docs/agent/config/config-files#http_max_conns_per_client).
+  [http_max_conns_per_client](https://developer.hashicorp.com/consul/docs/agent/config/config-files#http_max_conns_per_client).
 
 - `path` `(string: "vault/")` – Specifies the path in Consul's key-value store
   where Vault data will be stored.
@@ -122,17 +122,17 @@ connection. You can read more about encrypting Consul connections on the
 - `tls_ca_file` `(string: "")` – Specifies the path to the CA certificate used
   for Consul communication. This defaults to system bundle if not specified.
   This should be set according to the
-  [`ca_file`](/consul/docs/agent/config/config-files#ca_file) setting in
+  [`ca_file`](https://developer.hashicorp.com/consul/docs/agent/config/config-files#ca_file) setting in
   Consul.
 
 - `tls_cert_file` `(string: "")` (optional) – Specifies the path to the
   certificate for Consul communication. This should be set according to the
-  [`cert_file`](/consul/docs/agent/config/config-files#cert_file) setting
+  [`cert_file`](https://developer.hashicorp.com/consul/docs/agent/config/config-files#cert_file) setting
   in Consul.
 
 - `tls_key_file` `(string: "")` – Specifies the path to the private key for
   Consul communication. This should be set according to the
-  [`key_file`](/consul/docs/agent/config/config-files#key_file) setting
+  [`key_file`](https://developer.hashicorp.com/consul/docs/agent/config/config-files#key_file) setting
   in Consul.
 
 - `tls_min_version` `(string: "tls12")` – Specifies the minimum TLS version to
@@ -260,12 +260,12 @@ storage "consul" {
 ```
 
 [consul]: https://www.consul.io/ 'Consul by HashiCorp'
-[consul-acl]: /consul/docs/guides/acl 'Consul ACLs'
-[consul-consistency]: /consul/api-docs/features/consistency 'Consul Consistency Modes'
-[consul-encryption]: /consul/docs/agent/encryption 'Consul Encryption'
-[consul-translate-wan-addrs]: /consul/docs/agent/options#translate_wan_addrs 'Consul Configuration'
-[consul-token]: /consul/docs/commands/acl/set-agent-token#token-lt-value-gt- 'Consul Token'
-[consul-session-ttl]: /consul/docs/agent/options#session_ttl_min 'Consul Configuration'
-[api-addr]: /vault/docs/configuration#api_addr
-[cluster-addr]: /vault/docs/configuration#cluster_addr
-[listener-example]: /vault/docs/configuration/listener/tcp#listening-on-multiple-interfaces
+[consul-acl]: https://www.consul.io/docs/guides/acl.html 'Consul ACLs'
+[consul-consistency]: https://www.consul.io/api-docs/features/consistency 'Consul Consistency Modes'
+[consul-encryption]: https://www.consul.io/docs/agent/encryption.html 'Consul Encryption'
+[consul-translate-wan-addrs]: https://www.consul.io/docs/agent/options.html#translate_wan_addrs 'Consul Configuration'
+[consul-token]: https://www.consul.io/docs/commands/acl/set-agent-token.html#token-lt-value-gt- 'Consul Token'
+[consul-session-ttl]: https://www.consul.io/docs/agent/options.html#session_ttl_min 'Consul Configuration'
+[api-addr]: /docs/configuration#api_addr
+[cluster-addr]: /docs/configuration#cluster_addr
+[listener-example]: /docs/configuration/listener/tcp#listening-on-multiple-interfaces
diff --git a/website/content/docs/configuration/storage/etcd.mdx b/website/content/docs/configuration/storage/etcd.mdx
index d7a5fe5532577..00665513afae7 100644
--- a/website/content/docs/configuration/storage/etcd.mdx
+++ b/website/content/docs/configuration/storage/etcd.mdx
@@ -16,9 +16,9 @@ based on the version of the Etcd cluster.
 ~> The Etcd v2 API has been deprecated with the release of Etcd v3.5, and will
 be decommissioned by Etcd v3.6. It will be removed from Vault in Vault 1.10.
 Users of the Etcd storage backend should prepare to
-[migrate](/vault/docs/commands/operator/migrate) Vault storage to an Etcd v3 cluster
+[migrate](/docs/commands/operator/migrate) Vault storage to an Etcd v3 cluster
 prior to upgrading to Vault 1.10. All storage migrations should have
-[backups](/vault/docs/concepts/storage#backing-up-vault-s-persisted-data) taken prior
+[backups](/docs/concepts/storage#backing-up-vault-s-persisted-data) taken prior
 to migration.
 
 - **High Availability** – the Etcd storage backend supports high availability.
diff --git a/website/content/docs/configuration/storage/index.mdx b/website/content/docs/configuration/storage/index.mdx
index fbb00a5b293c7..e21d83f7eefa8 100644
--- a/website/content/docs/configuration/storage/index.mdx
+++ b/website/content/docs/configuration/storage/index.mdx
@@ -44,7 +44,7 @@ file.
 ## Integrated Storage vs. External Storage
 
 HashiCorp recommends using Vault's [integrated
-storage](/vault/docs/configuration/storage/raft) for most use cases rather than
+storage](/docs/configuration/storage/raft) for most use cases rather than
 configuring another system to store Vault data externally. (Integrated Storage is
 an **embedded Vault data storage** available in Vault 1.4 or later.) Prior to Vault 1.4, Consul was the recommended Vault storage.
 
@@ -52,7 +52,7 @@ an **embedded Vault data storage** available in Vault 1.4 or later.) Prior to Va
 use Integrated Storage as their storage backend.
 
 The table below compares the characteristics of Integrated Storage and External
-Storage. Suppose you decide that the additional operational complexity of external storage is worth it for your use case. In that case, there are several external storage options to choose from (e.g., [Consul](/vault/docs/configuration/storage/consul), [DynamoDB](/vault/docs/configuration/storage/dynamodb), etc.).
+Storage. Suppose you decide that the additional operational complexity of external storage is worth it for your use case. In that case, there are several external storage options to choose from (e.g., [Consul](/docs/configuration/storage/consul), [DynamoDB](/docs/configuration/storage/dynamodb), etc.).
 
 |                                | Integrated Storage                                                                                                                                                                                                           | External Storage                                                                                                                                                                                                                      |
 | ------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
@@ -61,36 +61,36 @@ Storage. Suppose you decide that the additional operational complexity of extern
 | Networking                     | One less network hop.                                                                                                                                                                                                        | Extra network hop between Vault and the external storage system (e.g., Consul cluster).                                                                                                                                               |
 | Troubleshooting and monitoring | Integrated Storage is a part of Vault; therefore, Vault is the only system you need to monitor and troubleshoot.                                                                                                             | The source of failure could be the external storage; therefore, you need to check the health of both Vault and the external storage. This requires expertise in the chosen storage backend and additional monitoring of that storage. |
 | Data location                  | The encrypted Vault data is stored on the same host where the Vault server process runs.                                                                                                                                     | The encrypted Vault data is stored where the external storage is located. Therefore, the Vault server and the data storage are hosted on physically separate hosts.                                                                   |
-| System requirements            | Avoid "burstable" CPU and storage options. SSDs should be used for the hard drive. <p />See the [Reference Architecture](/vault/tutorials/day-one-raft/raft-reference-architecture#system-requirements) guide. | Follow the system requirements given by your chosen storage backend.                                                                                                                                                                  |
+| System requirements            | Avoid "burstable" CPU and storage options. SSDs should be used for the hard drive. <p />See the [Reference Architecture](https://learn.hashicorp.com/tutorials/vault/raft-reference-architecture#system-requirements) guide. | Follow the system requirements given by your chosen storage backend.                                                                                                                                                                  |
 
 ### Integrated Storage vs. Consul as Vault Storage
 
-[HashiCorp Consul](/consul/docs/intro) is a comprehensive
+[HashiCorp Consul](https://developer.hashicorp.com/consul/docs/intro) is a comprehensive
 multi-cloud service networking solution including service mesh, service
 discovery, and network infrastructure automation. Vault can leverage
-Consul's [KV Store](/consul/api-docs/kv) to persist Vault data.
+Consul's [KV Store](https://developer.hashicorp.com/consul/api-docs/kv) to persist Vault data.
 
 The table below highlights the differences between Integrated Storage and
 Consul.
 
 |                     | Integrated Storage                                                                                                 | Consul                                                                                                                                                                                                                                                                                                                                           |
 | ------------------- | ------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| Deployment          | Vault cluster is all you need.                                                                                     | Vault cluster & Consul cluster. <p />Use a dedicated Consul cluster for Vault storage, and it should not be used for other purposes (e.g., service discovery, service mesh). <p />See the [Vault with Consul Storage Reference Architecture](/vault/tutorials/day-one-consul/reference-architecture#recommended-architecture) guide. |
+| Deployment          | Vault cluster is all you need.                                                                                     | Vault cluster & Consul cluster. <p />Use a dedicated Consul cluster for Vault storage, and it should not be used for other purposes (e.g., service discovery, service mesh). <p />See the [Vault with Consul Storage Reference Architecture](https://learn.hashicorp.com/tutorials/vault/reference-architecture#recommended-architecture) guide. |
 | Data location       | Data is on disk.                                                                                                   | All data is in memory.                                                                                                                                                                                                                                                                                                                           |
-| System requirements | [System requirements](/vault/tutorials/day-one-raft/raft-reference-architecture#system-requirements) | [System requirements](/vault/tutorials/day-one-consul/reference-architecture#hardware-sizing-for-vault-servers)                                                                                                                                                                                                                      |
+| System requirements | [System requirements](https://learn.hashicorp.com/tutorials/vault/raft-reference-architecture#system-requirements) | [System requirements](https://learn.hashicorp.com/tutorials/vault/reference-architecture#hardware-sizing-for-vault-servers)                                                                                                                                                                                                                      |
 | Snapshots           | Normal data backup strategy of your organization.                                                                  | More frequent snapshots are necessary since data is in memory.                                                                                                                                                                                                                                                                                   |
-| Max message size    | 1 MiB (Configurable using the [`max_entry_size`](/vault/docs/configuration/storage/raft#max_entry_size) parameter)       | 512 KiB (Configurable using the [`kv_max_value_size`](/consul/docs/agent/config/config-files#kv_max_value_size) parameter)                                                                                                                                                                                                                     |
+| Max message size    | 1 MiB (Configurable using the [`max_entry_size`](/docs/configuration/storage/raft#max_entry_size) parameter)       | 512 KiB (Configurable using the [`kv_max_value_size`](https://developer.hashicorp.com/consul/docs/agent/config/config-files#kv_max_value_size) parameter)                                                                                                                                                                                                                     |
 
 If you have a Vault cluster using Consul as its storage backend and wish to
 migrate to Integrated Storage, read the following tutorials:
 
 1. [Preflight Checklist - Migrating to Integrated
-   Storage](/vault/tutorials/raft/storage-migration-checklist)
+   Storage](https://learn.hashicorp.com/tutorials/vault/storage-migration-checklist)
 1. [Storage Migration tutorial - Consul to Integrated
-   Storage](/vault/tutorials/raft/raft-migration)
+   Storage](https://learn.hashicorp.com/tutorials/vault/raft-migration)
 
 ## Tutorial
 
 Refer to the [Integrated
-Storage](/vault/tutorials/raft) tutorials
+Storage](https://learn.hashicorp.com/collections/vault/raft) tutorials
 to learn more about Integrated Storage.
diff --git a/website/content/docs/configuration/storage/raft.mdx b/website/content/docs/configuration/storage/raft.mdx
index cc399f6ebdc66..28476736ef186 100644
--- a/website/content/docs/configuration/storage/raft.mdx
+++ b/website/content/docs/configuration/storage/raft.mdx
@@ -32,15 +32,15 @@ cluster_addr = "http://127.0.0.1:8201"
 ```
 
 ~> **Note:** When using the Integrated Storage backend, it is required to provide
-[`cluster_addr`](/vault/docs/concepts/ha#per-node-cluster-address) to indicate the address and port to be used for communication
+[`cluster_addr`](/docs/concepts/ha#per-node-cluster-address) to indicate the address and port to be used for communication
 between the nodes in the Raft cluster.
 
 ~> **Note:** When using the Integrated Storage backend, a separate
-[`ha_storage`](/vault/docs/configuration#ha_storage)
+[`ha_storage`](/docs/configuration#ha_storage)
 backend cannot be declared.
 
 ~> **Note:** When using the Integrated Storage backend, it is strongly recommended to
-set [`disable_mlock`](/vault/docs/configuration#disable_mlock) to `true`, and to disable memory swapping on the system.
+set [`disable_mlock`](/docs/configuration#disable_mlock) to `true`, and to disable memory swapping on the system.
 
 ## `raft` Parameters
 
@@ -99,7 +99,7 @@ set [`disable_mlock`](/vault/docs/configuration#disable_mlock) to `true`, and to
   config to join the Raft cluster as a non-voter. The node will not participate
   in the Raft quorum but will still receive the data replication stream, adding
   read scalability to a cluster. This option has the same effect as the
-  [`-non-voter`](/vault/docs/commands/operator/raft#non-voter) flag for the
+  [`-non-voter`](/docs/commands/operator/raft#non-voter) flag for the
   `vault operator raft join` command, but only affects voting status when joining
   via `retry_join` config. This setting can be overridden to true by setting the
   `VAULT_RAFT_RETRY_JOIN_AS_NON_VOTER` environment variable to any non-empty value.
@@ -132,13 +132,13 @@ set [`disable_mlock`](/vault/docs/configuration#disable_mlock) to `true`, and to
 - `autopilot_upgrade_version` `(string: "")` - This is an optional string that, if
   provided, will be used reported to autopilot as Vault's version. This is then used
   by autopilot when it makes decisions regarding
-  [automated upgrades](/vault/docs/enterprise/automated-upgrades). If omitted, the
+  [automated upgrades](/docs/enterprise/automated-upgrades). If omitted, the
   version of Vault currently in use will be used. Note that this string must conform
   to [Semantic Versioning](https://semver.org). Use of this feature requires Vault
   Enterprise.
 
 - `autopilot_redundancy_zone` `(string: "")` - This is an optional string that specifies
-  Vault's [redundancy zone](/vault/docs/enterprise/redundancy-zones). This is reported to autopilot
+  Vault's [redundancy zone](/docs/enterprise/redundancy-zones). This is reported to autopilot
   and is used to enhance scaling and resiliency. Use of this feature requires Vault Enterprise.
 
 ### `retry_join` stanza
@@ -159,7 +159,7 @@ set [`disable_mlock`](/vault/docs/configuration#disable_mlock) to `true`, and to
   Should match one of the names in the [DNS
   SANs](https://en.wikipedia.org/wiki/Subject_Alternative_Name) of the remote
   server certificate.
-  See also [Integrated Storage and TLS](/vault/docs/concepts/integrated-storage#autojoin-with-tls-servername)
+  See also [Integrated Storage and TLS](https://www.vaultproject.io/docs/concepts/integrated-storage#autojoin-with-tls-servername)
 
 - `leader_ca_cert_file` `(string: "")` - File path to the CA cert of the
   possible leader node.
@@ -228,6 +228,6 @@ storage "raft" {
 ## Tutorial
 
 Refer to the [Integrated
-Storage](/vault/tutorials/raft) series of tutorials to learn more about implementing Vault using Integrated Storage.
+Storage](https://learn.hashicorp.com/collections/vault/raft) series of tutorials to learn more about implementing Vault using Integrated Storage.
 
 [raft]: https://raft.github.io/ 'The Raft Consensus Algorithm'
diff --git a/website/content/docs/configuration/telemetry.mdx b/website/content/docs/configuration/telemetry.mdx
index 9aa2eb1b976f2..1b8bcd864b853 100644
--- a/website/content/docs/configuration/telemetry.mdx
+++ b/website/content/docs/configuration/telemetry.mdx
@@ -10,7 +10,7 @@ description: |-
 
 The `telemetry` stanza specifies various configurations for Vault to publish
 metrics to upstream systems. Available Vault metrics can be found in the
-[Telemetry internals documentation](/vault/docs/internals/telemetry).
+[Telemetry internals documentation](/docs/internals/telemetry).
 
 ```hcl
 telemetry {
@@ -29,7 +29,7 @@ The following options are available on all telemetry configurations.
 
 - `usage_gauge_period` `(string: "10m")` - Specifies the interval at which high-cardinality
   usage data is collected, such as token counts, entity counts, and secret counts.
-   A value of "none" disables the collection.  Uses [duration format strings](/vault/docs/concepts/duration-format).
+   A value of "none" disables the collection.  Uses [duration format strings](/docs/concepts/duration-format).
 - `maximum_gauge_cardinality` `(int: 500)` - The maximum cardinality of gauge labels.
 - `disable_hostname` `(bool: false)` - Specifies if gauge values should be
   prefixed with the local hostname.
@@ -42,7 +42,7 @@ The following options are available on all telemetry configurations.
   Note that leases are put into buckets by rounding. For example, if `lease_metrics_epsilon` is set to 1h and
   lease A expires 25 minutes from now, and lease B expires 35 minutes from now, then lease A will be in the first
   bucket, which corresponds to 0-30 minutes, and lease B will be in the second bucket, which corresponds to 31-90
-  minutes. Uses [duration format strings](/vault/docs/concepts/duration-format).
+  minutes. Uses [duration format strings](/docs/concepts/duration-format).
 - `num_lease_metrics_buckets` `(int: 168)` - The number of expiry buckets for leases. For the default value, for
   example, 168 value labels for the `vault.expire.leases.by_expiration` metric will be reported, where each value
   each bucket is separated in time by the `lease_metrics_epsilon` parameter. For the default 1 hour value of
@@ -263,4 +263,4 @@ Metrics from Vault can be found in [Metrics Explorer](https://cloud.google.com/m
 All those metrics are shown with a resource type of `generic_task`, and the metric name
 is prefixed with `custom.googleapis.com/go-metrics/`.
 
-[telemetry-tcp]: /vault/docs/configuration/listener/tcp#telemetry-parameters
+[telemetry-tcp]: /docs/configuration/listener/tcp#telemetry-parameters
diff --git a/website/content/docs/configuration/ui.mdx b/website/content/docs/configuration/ui.mdx
index 0d1224d08a8f0..393df129cfa83 100644
--- a/website/content/docs/configuration/ui.mdx
+++ b/website/content/docs/configuration/ui.mdx
@@ -30,7 +30,7 @@ listener "tcp" {
 ```
 
 For more information, please see the
-[Vault configuration options](/vault/docs/configuration).
+[Vault configuration options](/docs/configuration).
 
 ## Accessing the Vault UI
 
diff --git a/website/content/docs/configuration/user-lockout.mdx b/website/content/docs/configuration/user-lockout.mdx
deleted file mode 100644
index 1306c9aea44c3..0000000000000
--- a/website/content/docs/configuration/user-lockout.mdx
+++ /dev/null
@@ -1,67 +0,0 @@
----
-layout: docs
-page_title: User Lockout - Configuration
-description: |-
-  The user_lockout stanza specifies various configurations for user lockout behaviour for
-  failed logins in vault. 
----
-# User Lockout
-
-@include 'user-lockout.mdx'
-
-## `user_lockout` Stanza
-
-The `user_lockout` stanza specifies various configurations for user lockout 
-behaviour for failed logins in vault. They can be configured for all supported auth methods
-(userpass, ldap and approle) using "all" user_lockout stanza name or for a specific auth method 
-using the auth method name in stanza. 
-
-Supported user_lockout stanza names are all, userpass, ldap and approle.
-
-The configurations for a specific auth method takes precedence over the configurations specified 
-for all auth methods using "all" user_lockout stanza name in the config file.
-
-## Configuration
-
-User lockouts configuration is done through the Vault configuration file using
-the `user_lockout` stanza:
-
-```hcl
-user_lockout [NAME] {
-  [PARAMETERS...]
-}
-```
-
-For example:
-
-```hcl
-user_lockout "all" {
-  lockout_duration = "10m"
-  lockout_counter_reset = "10m"
-}
-
-user_lockout "userpass" {
-  lockout_threshold = "25"
-  lockout_duration = "5m"
-}
-
-user_lockout "ldap" {
- disable_lockout = "true"
-}
-```
-
-Here, user lockout feature will be disabled for ldap auth methods. Userpass auth methods will have lockout threshold of 25, 
-lockout duration of 5 minutes, lockout counter reset of 10 minutes. Approle auth methods will have a lockout threshold of 
-5 (considers default as this value is not configured), lockout duration of 10 minutes and lockout counter reset of 10 minutes.
-
-The user lockout configuration for the auth method at a given path can be tuned using auth tune. Please see [auth tune command](/vault/docs/commands/auth/tune)
-or [auth tune api](/vault/api-docs/system/auth#tune-auth-method) for more details. 
-
-## `user_lockout` Parameters
-
-The following options are available on all user_lockout configurations.
-
-- `lockout_threshold` `(string: "")` - Specifies the number of failed login attempts after which the user is locked out.
-- `lockout_duration` `(string: "")` - Specifies the duration for which an user will be locked out.
-- `lockout_counter_reset` `(string: "")` - Specifies the duration after which the lockout counter is reset with no failed login attempts.
-- `disable_lockout` `(bool: false)` - Disables the user lockout feature if set to true.
\ No newline at end of file
diff --git a/website/content/docs/deprecation/faq.mdx b/website/content/docs/deprecation/faq.mdx
index c953ef5a576a9..6296aeaf86f51 100644
--- a/website/content/docs/deprecation/faq.mdx
+++ b/website/content/docs/deprecation/faq.mdx
@@ -3,12 +3,12 @@ layout: docs
 page_title: Feature Deprecation FAQ
 sidebar_title: FAQ
 description: |-
-  An FAQ page to communicate frequently asked questions concerning feature deprecations.
+  An FAQ page to communicate frequently asked questions concering feature deprecations.
 ---
 
 # Feature Deprecation FAQ
 
-This page provides frequently asked questions concerning decisions made about Vault feature deprecations. If you are looking for information about Vault licensing, refer to the [Licensing FAQ](/vault/docs/enterprise/license/faq) page. Pleaser refer to the [Feature Deprecation Notice and Plans](/vault/docs/deprecation) document for up-to-date information on Vault feature deprecations and notice.
+This page provides frequently asked questions concerning decisions made about Vault feature deprecations. If you are looking for information about Vault licensing, refer to the [Licensing FAQ](/docs/enterprise/license/faq) page. Pleaser refer to the [Feature Deprecation Notice and Plans](/docs/deprecation) document for up-to-date information on Vault feature deprecations and notice.
 
 - [Q: What is the impact on anyone using the legacy MFA feature?](#q-what-is-the-impact-on-anyone-using-the-legacy-mfa-feature)
 - [Q: I'm currently using the Etcd storage backend feature. How does the deprecation impact me?](#q-i-m-currently-using-the-etcd-storage-backend-feature-how-does-the-deprecation-impact-me)
@@ -34,9 +34,9 @@ These features were deprecated in prior releases of Vault. We are targeting the
 
 | Deprecated Feature    | Alternative Feature                                                                                                 |
 | --------------------- | ------------------------------------------------------------------------------------------------------------------- |
-| Mount Filters         | [Path Filters](/vault/api-docs/system/replication/replication-performance#create-paths-filter) |
-| AppID                 | [AppRole auth method](/vault/docs/auth/approle)                                                                           |
-| Standalone DB engines | [Combined DB engines](/vault/docs/secrets/databases)                                                                      |
+| Mount Filters         | [Path Filters](https://www.vaultproject.io/api-docs/system/replication/replication-performance#create-paths-filter) |
+| AppID                 | [AppRole auth method](/docs/auth/approle)                                                                           |
+| Standalone DB engines | [Combined DB engines](/docs/secrets/databases)                                                                      |
 
 **Note:** After upgrading to 1.12, any attempt to unseal a core with one of the following features enabled will result in a core shutdown. This may temporarily be overridden using the `VAULT_ALLOW_PENDING_REMOVAL_MOUNTS` environment variable when launching the Vault server. These features will be officially removed from Vault in version 1.13 and this environment variable will not work. In order to upgrade to 1.13, you will have to completely disable all removed features.
 
@@ -63,31 +63,31 @@ Here are the use cases that may still use certificates with SHA-1:
 
 #### Auth Methods
 
-- [AWS Auth Method](/vault/docs/auth/aws): [AWS](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-identity-documents.html) can use SHA-1-based PKCS7 signatures for DSA key pairs.
-- [Cloud Foundry (CF) Auth Method ](/vault/docs/auth/cf)
-- [Kerberos Auth Method](/vault/docs/auth/kerberos)
-- [Kubernetes Auth Method](/vault/docs/auth/kubernetes)
-- [LDAP Auth Method](/vault/docs/auth/ldap)
-- [JWT/OIDC Auth Method](/vault/docs/auth/jwt/)
-- [TLS Certificates Auth Method](/vault/docs/auth/cert)
+- [AWS Auth Method](/docs/auth/aws): [AWS](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-identity-documents.html) can use SHA-1-based PKCS7 signatures for DSA key pairs.
+- [Cloud Foundry (CF) Auth Method ](/docs/auth/cf)
+- [Kerberos Auth Method](/docs/auth/kerberos)
+- [Kubernetes Auth Method](/docs/auth/kubernetes)
+- [LDAP Auth Method](/docs/auth/ldap)
+- [JWT/OIDC Auth Method](/docs/auth/jwt/)
+- [TLS Certificates Auth Method](/docs/auth/cert)
 
 #### Database Secrets Engines
 
-- [Cassandra Database Secrets Engine](/vault/docs/secrets/databases/cassandra)
-- [Couchbase Database Secrets Engine](/vault/docs/secrets/databases/couchbase)
-- [Elasticsearch Database Secrets Engine](/vault/docs/secrets/databases/elasticdb)
-- [InfluxDB Database Secrets Engine](/vault/docs/secrets/databases/influxdb)
-- [MongoDB Database Secrets Engine](/vault/docs/secrets/databases/mongodb)
-- [MySQL/MariaDB Database Secrets Engine](/vault/docs/secrets/databases/mysql-maria)
+- [Cassandra Database Secrets Engine](/docs/secrets/databases/cassandra)
+- [Couchbase Database Secrets Engine](/docs/secrets/databases/couchbase)
+- [Elasticsearch Database Secrets Engine](/docs/secrets/databases/elasticdb)
+- [InfluxDB Database Secrets Engine](/docs/secrets/databases/influxdb)
+- [MongoDB Database Secrets Engine](/docs/secrets/databases/mongodb)
+- [MySQL/MariaDB Database Secrets Engine](/docs/secrets/databases/mysql-maria)
 
 #### Secrets Engines
 
-- [Active Directory Secrets Engine](/vault/docs/secrets/ad)
-- [Consul Secrets Engine](/vault/docs/secrets/consul)
-- [Kubernetes Secrets Engine](/vault/docs/secrets/kubernetes)
-- [Nomad Secrets Engine](/vault/docs/secrets/nomad)
-- [LDAP Secrets Engine](/vault/docs/secrets/ldap)
-- [PKI Secrets Engine](/vault/docs/secrets/pki/)
+- [Active Directory Secrets Engine](/docs/secrets/ad)
+- [Consul Secrets Engine](/docs/secrets/consul)
+- [Kubernetes Secrets Engine](/docs/secrets/kubernetes)
+- [Nomad Secrets Engine](/docs/secrets/nomad)
+- [LDAP Secrets Engine](/docs/secrets/ldap)
+- [PKI Secrets Engine](/docs/secrets/pki/)
 
 ### Q: What are the phases of deprecation?
 
@@ -123,7 +123,7 @@ This status reflects a feature which has been officially deprecated in this rele
 
 ##### VAULT_ALLOW_PENDING_REMOVAL_MOUNTS
 
-The `Pending Removal` behavior may be overriden using a new environment variable: [`VAULT_ALLOW_PENDING_REMOVAL_MOUNTS`](/vault/docs/commands/server#vault_allow_pending_removal_mounts). This environment variable effectively allows all `Pending Removal` features to be treated as `Deprecated`.
+The `Pending Removal` behavior may be overriden using a new environment variable: [`VAULT_ALLOW_PENDING_REMOVAL_MOUNTS`](/docs/commands/server#vault_allow_pending_removal_mounts). This environment variable effectively allows all `Pending Removal` features to be treated as `Deprecated`.
 
 #### Removed
 
diff --git a/website/content/docs/deprecation/index.mdx b/website/content/docs/deprecation/index.mdx
index 561c1b0b2b274..bca40e9603010 100644
--- a/website/content/docs/deprecation/index.mdx
+++ b/website/content/docs/deprecation/index.mdx
@@ -8,7 +8,7 @@ description: |-
 
 # Feature Deprecation Notice and Plans
 
-This announcement page is maintained and updated periodically to communicate important decisions made concerning End of Support(EoS) for Vault features as well as features we have removed or disabled from the product. We document the removal of features, enable the community with a plan and timeline for eventual deprecations, and supply alternative paths to explore and evaluate to minimize business disruptions. If you have questions or concerns about a deprecated feature, please create a topic on [the community forum](https://discuss.hashicorp.com/c/vault/30) or raise a ticket with your support team. Please refer to the [FAQ](/vault/docs/deprecation/faq) page for frequently asked questions concerning Vault feature deprecations.
+This announcement page is maintained and updated periodically to communicate important decisions made concerning End of Support(EoS) for Vault features as well as features we have removed or disabled from the product. We document the removal of features, enable the community with a plan and timeline for eventual deprecations, and supply alternative paths to explore and evaluate to minimize business disruptions. If you have questions or concerns about a deprecated feature, please create a topic on [the community forum](https://discuss.hashicorp.com/c/vault/30) or raise a ticket with your support team. Please refer to the [FAQ](/docs/deprecation/faq) page for frequently asked questions concerning Vault feature deprecations.
 
 **Deprecation Announcement**: This indicates the release version during which the announcement was made to deprecate a feature.
 
@@ -20,21 +20,20 @@ This announcement page is maintained and updated periodically to communicate imp
 
 | Feature                                           | Deprecation announcement | End of Support | Feature Removal | Migration Path/Impact                                                                                                                                                                                                                                                                                                                              | Resources                                                                                                                                                                                                                                                        |
 | ------------------------------------------------- | ------------------------ | -------------- | --------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Active Directory Secrets Engine                  | 1.13                  | v1.18               | v1.19                 | Use the [LDAP Secrets Engine](/vault/docs/secrets/ldap) with the `ad` [schema](/vault/api-docs/secret/ldap#schema) | [Migration Guide](/vault/docs/secrets/ad/migration-guide) |
-| Vault Enterprise storage backend                  | N/A                  | v1.12               | N/A                 | Use [Integrated Storage](/vault/docs/configuration/storage/raft) or [Consul](/vault/docs/configuration/storage/consul) as your Vault's storage backend. Vault Enterprise will no longer start up if configured to use a storage backend other than Integrated Storage or Consul.  | [Upgrade Guide](/vault/docs/upgrading/upgrade-to-1.12.x)    |
-| Vault generation of Dynamic SSH Keys                 | v0.7.1                     | N/A            | v1.13           | Use the alternative [signed SSH certificates](/vault/docs/secrets/ssh/signed-ssh-certificates) feature which supports key pair generation as of Vault 1.12. SSH certificates do not require an external connection from Vault to provision the key/certificate and more secure than having Vault provision dynamic SSH keys.                  | [SSH Certificates](/vault/docs/secrets/ssh/signed-ssh-certificates)                                                                                                                                                                                               |
-| [Duplicative Docker Images](https://hub.docker.com/_/vault)                 | v1.12                     | 1.13            | v1.14           | Upon feature removal, the `vault` Docker image will no longer be updated. Only the [Verified Publisher](https://hub.docker.com/r/hashicorp/vault) `hashicorp/vault` image will be updated on DockerHub. Users of [Official Images](https://hub.docker.com/_/vault) will need to use `docker pull hashicorp/vault:<version>` instead of `docker pull vault:version` to get newer versions of Vault in Docker images. Currently, HashiCorp publishes and updates identical Docker images of Vault as Verified Publisher and Official images separately. | [The Verified Publisher Program](https://docs.docker.com/docker-hub/publish/) |
-| Etcd V2 API (OSS)                 | v1.9                     | N/A            | v1.10           | The Etcd v2 has been deprecated with the release of Etcd v3.5, and will be decomissioned by Etcd v3.6. Etcd v2 API has been removed in Vaut 1.10. Users of Etcd storage backend must migrate Vault storage to an Etcd V3 cluster prior to upgrading to Vault 1.10. All storage migrations should be backed up prior to migration.                  | [Etcd Storage Backend](/vault/docs/configuration/storage/etcd)                                                                                                                                                                                                         |
-| Licenses in storage (ENT)         | v1.8                     | v1.10          | v1.11           | Migrate to [Autoloading](/vault/docs/enterprise/license/autoloading) by v1.11.                                                                                                                                                                                                                                                                           | [Vault License](/vault/docs/enterprise/license) [System Backend](/vault/api-docs/system/license) [FAQ](/vault/docs/enterprise/license/faq)                                                                                                              |
-| Mount Filters (ENT)              | v1.3                     | v1.10          | v1.11           | Use the alternative feature: [Path Filters](/vault/api-docs/system/replication/replication-performance#create-paths-filter).                                                                                                                                                                                                   | [API Deprecation Notice](/vault/api-docs/system/replication/replication-performance#create-mounts-filter-deprecated) [Filter Mount Replication Deprecation Notice](/vault/docs/upgrading/upgrade-to-1.3.0#filtered-mount-replication-deprecation) |
-| Legacy MFA (OSS)                 | v1.0                     | N/A            | v1.11           | Based on your use case, use the Policy-based Enterprise MFA or Login MFA supported in Vault OSS as of v1.10.                                                                                                                                                                                                                                        | [Multi-Factor Authentication](/vault/docs/v1.10.x/auth/mfa)                                                                                                                                                                                                                    |
-| *****Standalone DB Engines (OSS)      | v0.8                     | N/A            | v1.13           | Use the alternative DB secrets engine feature.                                                                                                                                                                                                                                                                                                      | [DB secrets engine](/vault/docs/secrets/databases)                                                                                                                                                                                                                     |
-| *****AppID (OSS)                      | v0.6                     | N/A            | v1.13           | Use the alternative feature: [AppRole auth method](/vault/docs/auth/approle).                                                                                                                                                                                                                                                  | [AppID Auth Method Deprecation Notice](/vault/docs/auth/app-id)                                                                                                                                                                                                        |
+| Vault Enterprise storage backend                  | N/A                  | v1.12               | N/A                 | Use [Integrated Storage](/docs/configuration/storage/raft) or [Consul](/docs/configuration/storage/consul) as your Vault's storage backend. Vault Enterprise will no longer start up if configured to use a storage backend other than Integrated Storage or Consul.  | [Upgrade Guide](/docs/upgrading/upgrade-to-1.12.x)    |
+| Vault generation of Dynamic SSH Keys                 | v0.7.1                     | N/A            | v1.13           | Use the alternative [signed SSH certificates](/docs/secrets/ssh/signed-ssh-certificates) feature which supports key pair generation as of Vault 1.12. SSH certificates do not require an external connection from Vault to provision the key/certificate and more secure than having Vault provision dynamic SSH keys.                  | [SSH Certificates](/docs/secrets/ssh/signed-ssh-certificates)                                                                                                                                                                                               |
+| [Duplicative Docker Images](https://hub.docker.com/_/vault)                 | v1.12                     | 1.13            | v1.14           | Upon feature removal, the `vault` Docker image will no longer be updated. Only the [Verified Publisher](https://hub.docker.com/r/hashicorp/vault) `hashicorp/vault` image will be updated on DockerHub. Users of [Official Images](https://hub.docker.com/_/vault) will need to use `docker pull hashicorp/vault:<version>` instead of `docker pull vault:version` to get newer versions of Vault in Docker images. Currently, HashiCorp publishes and updates identical Docker images of Vault as Verified Publisher and Official images separately. | [The Verified Publisher Program](https://docs.docker.com/docker-hub/publish/)                                                                                   
+| Etcd V2 API (OSS)                 | v1.9                     | N/A            | v1.10           | The Etcd v2 has been deprecated with the release of Etcd v3.5, and will be decomissioned by Etcd v3.6. Etcd v2 API has been removed in Vaut 1.10. Users of Etcd storage backend must migrate Vault storage to an Etcd V3 cluster prior to upgrading to Vault 1.10. All storage migrations should be backed up prior to migration.                  | [Etcd Storage Backend](/docs/configuration/storage/etcd)                                                                                                                                                                                                         |
+| Licenses in storage (ENT)         | v1.8                     | v1.10          | v1.11           | Migrate to [Autoloading](/docs/enterprise/license/autoloading) by v1.11.                                                                                                                                                                                                                                                                           | [Vault License](/docs/enterprise/license) [System Backend](https://www.vaultproject.io/api-docs/system/license) [FAQ](/docs/enterprise/license/faq)                                                                                                              |
+| Mount Filters (ENT)              | v1.3                     | v1.10          | v1.11           | Use the alternative feature: [Path Filters](https://www.vaultproject.io/api-docs/system/replication/replication-performance#create-paths-filter).                                                                                                                                                                                                   | [API Deprecation Notice](https://www.vaultproject.io/api-docs/system/replication/replication-performance#create-mounts-filter-deprecated) [Filter Mount Replication Deprecation Notice](/docs/upgrading/upgrade-to-1.3.0#filtered-mount-replication-deprecation) |
+| Legacy MFA (OSS)                 | v1.0                     | N/A            | v1.11           | Based on your use case, use the Policy-based Enterprise MFA or Login MFA supported in Vault OSS as of v1.10.                                                                                                                                                                                                                                        | [Multi-Factor Authentication](https://www.vaultproject.io/docs/v1.10.x/auth/mfa)                                                                                                                                                                                                                    |
+| *****Standalone DB Engines (OSS)      | v0.8                     | N/A            | v1.13           | Use the alternative DB secrets engine feature.                                                                                                                                                                                                                                                                                                      | [DB secrets engine](/docs/secrets/databases)                                                                                                                                                                                                                     |
+| *****AppID (OSS)                      | v0.6                     | N/A            | v1.13           | Use the alternative feature: [AppRole auth method](https://www.vaultproject.io/docs/auth/approle).                                                                                                                                                                                                                                                  | [AppID Auth Method Deprecation Notice](/docs/auth/app-id)                                                                                                                                                                                                        |
 | AAD Graph on Azure Secrets Engine | v1.10                    | 1.11           | v1.12           | Microsoft will end its support of the [AAD Graph API on June 30, 2022](https://docs.microsoft.com/en-us/graph/migrate-azure-ad-graph-overview). Support for Microsoft Graph API was introduced in Vault 1.9. If your Vault deployment is on a prior release, you may use the Azure Secrets Engine as an external plugin while you plan to upgrade. | [AAD (Azure Active Directory](https://vault-git-post-1-10-doc-changes-hashicorp.vercel.app/docs/secrets/azure#aad-azure-active-directory)                                                                                                                        |
-| Optional `api_token` parameter in Okta Auth Method  | v1.4                    | 1.11           | v1.12           | The `api_token` parameter on the Okta Auth Method will change from being optional to being required. | [API Documentation](/vault/api-docs/auth/okta#api_token) |
-| SHA-1 certificate signing | v1.11             | v1.11          | v1.12           | Go version 1.18 removes support for SHA-1 by default. As Vault updates its Go version to 1.18, you should plan to move off SHA-1 for certficate signing. Operators can set a Go [environmental variable](/vault/docs/deprecation/faq#q-what-is-the-impact-of-removing-support-for-x-509-certificates-with-signatures-that-use-sha-1) to restore SHA-1 support if they need to continue using SHA-1. It is unknown at this time when Go will remove the environmental variable support. Therefore, we highly encourage you to migrate off of SHA-1 for certificate signing. |[FAQ](/vault/docs/deprecation/faq#q-what-is-the-impact-of-removing-support-for-x-509-certificates-with-signatures-that-use-sha-1)|
-| Consul secrets engine parameter changes  | v1.11     | N/A     | N/A     | The `policies` parameter on the Consul secrets engine has been changed in favor of `consul_policies`. The `token_type` and `policy` parameters have been deprecated as the latest versions of Consul no longer support the older ACL system they were used for. | [Consul secrets engine API documentation](/vault/api-docs/secret/consul) |
-| Vault Agent API proxy support | v1.14 | v1.16 | v1.17 | Migrate to [Vault Proxy](/vault/docs/proxy/index) by v1.17|
+| Optional `api_token` parameter in Okta Auth Method  | v1.4                    | 1.11           | v1.12           | The `api_token` parameter on the Okta Auth Method will change from being optional to being required. | [API Documentation](https://www.vaultproject.io/api-docs/auth/okta#api_token) |
+| SHA-1 certificate signing | v1.11             | v1.11          | v1.12           | Go version 1.18 removes support for SHA-1 by default. As Vault updates its Go version to 1.18, you should plan to move off SHA-1 for certficate signing. Operators can set a Go [environmental variable](/docs/deprecation/faq#q-what-is-the-impact-of-removing-support-for-x-509-certificates-with-signatures-that-use-sha-1) to restore SHA-1 support if they need to continue using SHA-1. It is unknown at this time when Go will remove the environmental variable support. Therefore, we highly encourage you to migrate off of SHA-1 for certificate signing. |[FAQ](/docs/deprecation/faq#q-what-is-the-impact-of-removing-support-for-x-509-certificates-with-signatures-that-use-sha-1)|
+| Consul secrets engine parameter changes  | v1.11     | N/A     | N/A     | The `policies` parameter on the Consul secrets engine has been changed in favor of `consul_policies`. The `token_type` and `policy` parameters have been deprecated as the latest versions of Consul no longer support the older ACL system they were used for. | [Consul secrets engine API documentation](/api-docs/secret/consul) |
+
 
 *If you use **Standalone DB Engines** or **AppID (OSS)**, you should actively plan to migrate away from their usage. If you use these features and upgrade to Release 1.12, Vault will log error messages and shut down, and any attempts to add new mounts will result in an error.
 This behavior may temporarily be overridden when starting the Vault server by using the `VAULT_ALLOW_PENDING_REMOVAL_MOUNTS` environment variable until they are officially removed in Vault version 1.13.
diff --git a/website/content/docs/enterprise/automated-integrated-storage-snapshots.mdx b/website/content/docs/enterprise/automated-integrated-storage-snapshots.mdx
index 5bebd96533242..ef6a4892448b0 100644
--- a/website/content/docs/enterprise/automated-integrated-storage-snapshots.mdx
+++ b/website/content/docs/enterprise/automated-integrated-storage-snapshots.mdx
@@ -35,14 +35,6 @@ and GCP can be used without specifying credentials, by ensuring that the VMs on
 which Vault is running have been granted permission to access the specified
 object store.
 
-<Note>
-
-Currently, Vault does not allow the use of AWS IAM Roles for EKS Service
-Accounts to authenticate to Amazon S3 buckets for the Automated Integrated
-Storage Snapshots.
-
-</Note>
-
 # vs Snapshot Agents
 
 Nomad and Consul Enterprise offer the same functionality in a slightly different way.
@@ -62,5 +54,5 @@ that all Vault Enterprise users would be running Consul or an orchestrator.
 
 # See also
 
-Refer to the [API docs](/vault/api-docs/system/storage/raftautosnapshots) for the specifics
+Refer to the [API docs](/api-docs/system/storage/raftautosnapshots) for the specifics
 of how to configure automated snapshots and query their status.
diff --git a/website/content/docs/enterprise/automated-upgrades.mdx b/website/content/docs/enterprise/automated-upgrades.mdx
index e77bcf6a56a68..767248a616378 100644
--- a/website/content/docs/enterprise/automated-upgrades.mdx
+++ b/website/content/docs/enterprise/automated-upgrades.mdx
@@ -37,7 +37,7 @@ Below is a flowchart depicting Autopilot's automated upgrade state machine.
 
 ![Automated Upgrade State Machine](/img/autopilot-automated-upgrade.png)
 
-The status of the automated upgrade can be monitored by consulting the [Autopilot state API endpoint](/vault/api-docs/system/storage/raftautopilot#get-cluster-state).
+The status of the automated upgrade can be monitored by consulting the [Autopilot state API endpoint](/api-docs/system/storage/raftautopilot#get-cluster-state).
 
 ## Examples
 ### Using Vault's built-in version
diff --git a/website/content/docs/enterprise/consistency.mdx b/website/content/docs/enterprise/consistency.mdx
index b97b84af0e998..11cb65fb9515e 100644
--- a/website/content/docs/enterprise/consistency.mdx
+++ b/website/content/docs/enterprise/consistency.mdx
@@ -87,7 +87,7 @@ node completes the request anyway, returning a warning in the response.
 
 This mitigation option still exists in Vault 1.7, though now there is a
 configuration option to adjust the wait time:
-[best_effort_wal_wait_duration](/vault/docs/configuration/replication).
+[best_effort_wal_wait_duration](/docs/configuration/replication).
 
 ## Vault 1.7 Mitigations
 
@@ -97,13 +97,13 @@ There are now a variety of other mitigations available:
 - per-request option to conditionally forward the request to the active node
   if it would otherwise result in a stale read
 - per-request option to fail requests if they might result in a stale read
-- Vault Proxy configuration to do the above for proxied requests
+- Vault Agent configuration to do the above for proxied requests
 
 The remainder of this document describes the tradeoffs of these mitigations and
 how to use them.
 
 Note that any headers requesting forwarding are disabled by default, and must
-be enabled using [allow_forwarding_via_header](/vault/docs/configuration/replication).
+be enabled using [allow_forwarding_via_header](/docs/configuration/replication).
 
 ### Unconditional Forwarding (Performance standbys only)
 
@@ -173,22 +173,22 @@ methods for propagating the X-Vault-Index response header into the request
 header of subsequent requests. Those not using the Vault Go API will want
 to build equivalent functionality into their client library.
 
-### Vault Proxy and consistency headers
+### Vault Agent and consistency headers
 
-When configured, the [Vault API Proxy](/vault/docs/agent-and-proxy/proxy/apiproxy) will proxy incoming requests to Vault. There is
-Proxy configuration available in the `api_proxy` stanza that allows making use
+Vault Agent Caching will proxy incoming requests to Vault. There is
+new Agent configuration available in the `cache` stanza that allows making use
 of some of the above mitigations without modifying clients.
 
-By setting `enforce_consistency="always"`, Proxy will always provide
+By setting `enforce_consistency="always"`, Agent will always provide
 the `X-Vault-Index` consistency header. The value it uses for the header
-will be based on the responses that have passed through the Proxy previously.
+will be based on the responses that have passed through the Agent previously.
 
 The option `when_inconsistent` controls how stale reads are prevented:
 
 - `"fail"` means that when a `412` response is seen, it is returned to the client
-- `"retry"` means that `412` responses will be retried automatically by Proxy,
+- `"retry"` means that `412` responses will be retried automatically by Agent,
   so the client doesn't have to deal with them
-- `"forward"` makes Proxy provide the
+- `"forward"` makes Agent provide the
   `X-Vault-Inconsistent: forward-active-node` header as described above under
   Conditional Forwarding
 
@@ -202,11 +202,11 @@ a 412 status code. The Vault Go API automatically retries when receiving 412s, s
 unless there is a considerable replication delay, users will experience
 read-after-write consistency.
 
-The replication option [allow_forwarding_via_token](/vault/docs/configuration/replication)
+The replication option [allow_forwarding_via_token](/docs/configuration/replication)
 can be used to enforce requests that would have returned 412s in the
 aforementioned way will be forwarded instead to the active node.
 
-Refer to the [Server Side Consistent Token FAQ](/vault/docs/faq/ssct) for details.
+Refer to the [Server Side Consistent Token FAQ](/docs/faq/ssct) for details.
 
 ## Client API helpers
 
diff --git a/website/content/docs/enterprise/control-groups.mdx b/website/content/docs/enterprise/control-groups.mdx
index 2f614e62758b0..11c1739005d59 100644
--- a/website/content/docs/enterprise/control-groups.mdx
+++ b/website/content/docs/enterprise/control-groups.mdx
@@ -171,7 +171,7 @@ to go through the control group workflow in order to execute a read operation ag
 ## Control Groups in Sentinel
 
 Control Groups are also supported in Sentinel policies using the `controlgroup`
-import. See [Sentinel Documentation](/vault/docs/enterprise/sentinel) for more
+import. See [Sentinel Documentation](/docs/enterprise/sentinel) for more
 details on available properties.
 
 ### Sample Sentinel Policy
@@ -206,10 +206,10 @@ happened in the last hour.
 
 ## Tutorial
 
-Refer to the [Control Groups](/vault/tutorials/enterprise/control-groups)
+Refer to the [Control Groups](https://learn.hashicorp.com/vault/identity-access-management/iam-control-groups)
 tutorial to learn how to implement dual controller authorization within your policies.
 
 ## API
 
 Control Groups can be managed over the HTTP API. Please see
-[Control Groups API](/vault/api-docs/system/control-group) for more details.
+[Control Groups API](/api-docs/system/control-group) for more details.
diff --git a/website/content/docs/enterprise/entropy-augmentation.mdx b/website/content/docs/enterprise/entropy-augmentation.mdx
index d1592f74b08b4..b04ec6f3515b3 100644
--- a/website/content/docs/enterprise/entropy-augmentation.mdx
+++ b/website/content/docs/enterprise/entropy-augmentation.mdx
@@ -13,7 +13,7 @@ description: |-
 ~> **Warning** This feature is not available with FIPS 140-2 Inside variants of Vault.
 
 Vault Enterprise features a mechanism to sample entropy (or randomness for
-cryptographic operations) from external cryptographic modules via the [seals](/vault/docs/configuration/seal)
+cryptographic operations) from external cryptographic modules via the [seals](/docs/configuration/seal)
 interface. While the system entropy used by Vault is more than capable of
 operating in most threat models, there are some situations where additional
 entropy from hardware-based random number generators is desirable.
@@ -43,22 +43,22 @@ and include the following:
 - JWT token wrapping keys
 - Root tokens
 - DR operation tokens
-- [Transit](/vault/docs/secrets/transit) backend key generation and `/random` endpoint (`/random` only on Vault 1.11+)
-- [PKI](/vault/docs/secrets/pki) issuer key generation, but not for leaf certificate private keys
-- [`/sys/tools/random`](/vault/api-docs/system/tools#generate-random-bytes) endpoint (Vault 1.11+)
-- [SSH](/vault/docs/secrets/ssh) CA key generation, but not for key pair generation
-- [KMIP](/vault/docs/secrets/kmip) uses EA for its TLS CA, server, and client
+- [Transit](/docs/secrets/transit) backend key generation and `/random` endpoint (`/random` only on Vault 1.11+)
+- [PKI](/docs/secrets/pki) issuer key generation, but not for leaf certificate private keys
+- [`/sys/tools/random`](/api-docs/system/tools#generate-random-bytes) endpoint (Vault 1.11+)
+- [SSH](/docs/secrets/ssh) CA key generation, but not for key pair generation
+- [KMIP](/docs/secrets/kmip) uses EA for its TLS CA, server, and client
   certificates.
 
 ## Enabling/Disabling
 
 Entropy augmentation is disabled by default. To enable entropy augmentation Vault's
-[configuration file][configuration] must include a properly configured [entropy and seal stanza](/vault/docs/configuration/entropy-augmentation)
+[configuration file][configuration] must include a properly configured [entropy and seal stanza](/docs/configuration/entropy-augmentation)
 for a supported seal type.
 
-[configuration]: /vault/docs/configuration
+[configuration]: /docs/configuration
 
 ## Tutorial
 
-Refer to the [HSM Integration - Entropy Augmentation](/vault/tutorials/enterprise/hsm-entropy) tutorial
+Refer to the [HSM Integration - Entropy Augmentation](https://learn.hashicorp.com/vault/operations/hsm-entropy) tutorial
 to learn how to use the Entropy Augmentation function to leverage an external Hardware Security Module to augment system entropy.
diff --git a/website/content/docs/enterprise/fips/fips1402.mdx b/website/content/docs/enterprise/fips/fips1402.mdx
index 1ec4ff7d353a2..817dcd82a02c3 100644
--- a/website/content/docs/enterprise/fips/fips1402.mdx
+++ b/website/content/docs/enterprise/fips/fips1402.mdx
@@ -120,17 +120,6 @@ Additionally, only the following key types are allowed in TLS chains of trust:
 Finally, only TLSv1.2 or higher is supported in FIPS mode. These are in line
 with recent NIST guidance and recommendations.
 
-#### Heterogeneous Cluster Deployments
-
-Hashicorp does not support mixed deployment scenarios within the same Vault
-cluster, e.g., mixing FIPS and non-FIPS Vault binary versions, or mixing FIPS
-Inside with FIPS Seal Wrap clusters. Clusters nodes must be of a single
-binary/deployment type across the entire cluster. Usage of Seal Wrap with
-the FIPS Inside binary is permitted.
-
-Running a heterogeneous cluster is not permitted by FIPS, as components of
-the system are not compliant with FIPS.
-
 ## Technical Details
 
 Vault Enterprise's FIPS 140-2 Inside binaries rely on a special version of the
diff --git a/website/content/docs/enterprise/fips/index.mdx b/website/content/docs/enterprise/fips/index.mdx
index 0c5a824074089..9fcc96d3a7f36 100644
--- a/website/content/docs/enterprise/fips/index.mdx
+++ b/website/content/docs/enterprise/fips/index.mdx
@@ -15,34 +15,10 @@ Hashicorp's Vault Enterprise supports the modes of FIPS compliance documented be
 
 Vault Enterprise now includes release flavors with FIPS 140-2 compliant
 cryptography built into the Vault binary. More information on these releases
-can be found on the [FIPS 140-2 Inside](/vault/docs/enterprise/fips/fips1402) page.
+can be found on the [FIPS 140-2 Inside](/docs/enterprise/fips/fips1402) page.
 
 ## Seal Wrap
 
 Before our FIPS Inside effort, Vault [depended on](https://www.hashicorp.com/vault-compliance)
-an external HSM for FIPS 140-2 compliance. This uses the [Seal Wrap](/vault/docs/enterprise/fips/sealwrap)
+an external HSM for FIPS 140-2 compliance. This uses the [Seal Wrap](/docs/enterprise/fips/sealwrap)
 functionality to wrap security relevant keys in an extra layer of encryption.
-
-## Comparison of Versions
-
-The below table attempts to documents the FIPS compliance of various Vault
-operations between FIPS Inside and FIPS Seal Wrap. This table is by no means
-an official evaluation of either product; refer to the Leidos Letters of
-Attestation for that information.
-
-| Feature                           | FIPS Inside              | FIPS Seal Wrap                           |
-| :-------------------------------- | :----------------------- | :--------------------------------------- |
-| Entropy Augmentation              | Not Supported            | Yes                                      |
-| TLS Listener                      | Yes                      | No                                       |
-| Vault HA/DR/Raft TLS              | Yes                      | No                                       |
-| Barrier Storage                   | Yes                      | No                                       |
-| Seal Wrapping of CSPs             | With FIPS-Compliant HSM  | With FIPS-Compliant HSM                  |
-| SSH CA Operations                 | Yes with FIPS algorithms | No                                       |
-| Transit Operations                | Yes with FIPS algorithms | With Managed Keys and FIPS-Compliant HSM |
-| PKI Operations                    | Yes with FIPS algorithms | With Managed Keys and FIPS-Compliant HSM |
-| KMIP (Key Creation & Use)         | Yes with FIPS algorithms | No                                       |
-| Transform Tokenization            | Yes                      | No                                       |
-| Vault Agent TLS & Internal Crypto | Yes                      | No                                       |
-| Vault to External Plugin TLS      | Yes from Vault's side    | No                                       |
-| Plugin to third-party service TLS | Yes from Vault's side    | No                                       |
-| Auth Plugins' Internal Crypto     | Yes with FIPS algorithms | No                                       |
diff --git a/website/content/docs/enterprise/fips/sealwrap.mdx b/website/content/docs/enterprise/fips/sealwrap.mdx
index 3094f631a03b6..8f442e275f01b 100644
--- a/website/content/docs/enterprise/fips/sealwrap.mdx
+++ b/website/content/docs/enterprise/fips/sealwrap.mdx
@@ -12,7 +12,7 @@ description: |-
 -> **Note**: This feature requires [Vault Enterprise Plus](https://www.hashicorp.com/products/vault/).
 
 Vault Enterprise features a mechanism to wrap values with an extra layer of
-encryption for supporting [seals](/vault/docs/configuration/seal). This adds an
+encryption for supporting [seals](/docs/configuration/seal). This adds an
 extra layer of protection and is useful in some compliance and regulatory
 environments, including FIPS 140-2 environments.
 
@@ -22,7 +22,7 @@ sales](mailto:sales@hashicorp.com).
 
 ## Using Seal Wrap
 
-See [the Enterprise documentation](/vault/docs/enterprise/sealwrap) for instructions
+See [the Enterprise documentation](/docs/enterprise/sealwrap) for instructions
 on how to use and enable Seal Wrap.
 
 ## FIPS 140-2 Compliance
@@ -34,7 +34,7 @@ KeyStorage and KeyTransit requirements. This is on by default for many parts of
 Vault and opt-in for each individual mount; see the Activating Seal Wrapping
 section below for details.
 
-[Download the current compliance letter](/vault/docs/enterprise/sealwrap/Vault_Compliance_Letter_signed.pdf)
+[Download the current compliance letter](/docs/enterprise/sealwrap/Vault_Compliance_Letter_signed.pdf)
 
 ### Updates Since The Latest FIPS Compliance Audit
 
@@ -60,4 +60,4 @@ certified FIPS 140-2 TLS (such as
 [stunnel](https://www.stunnel.org/index.html)) can be used for replication
 traffic if meeting KeyTransit requirements for replication is necessary.
 
-[configuration]: /vault/docs/configuration
+[configuration]: /docs/configuration
diff --git a/website/content/docs/enterprise/hsm/behavior.mdx b/website/content/docs/enterprise/hsm/behavior.mdx
index f9f0757e79ef0..c5daf6e7f24f3 100644
--- a/website/content/docs/enterprise/hsm/behavior.mdx
+++ b/website/content/docs/enterprise/hsm/behavior.mdx
@@ -15,7 +15,7 @@ effect when using Vault with an HSM.
 
 Normally, Vault uses a single set of unseal keys to perform both decryption of
 the cryptographic barrier and to authorize recovery operations, such as the
-[`generate-root`](/vault/api-docs/system/generate-root)
+[`generate-root`](/api-docs/system/generate-root)
 functionality.
 
 When using an HSM, because the HSM automatically unseals the barrier but
@@ -23,7 +23,7 @@ recovery operations should still have human oversight, Vault instead uses two
 sets of keys: unseal keys and recovery keys. 
 
 -> **Recovery keys:** Refer to the
- [Seal/Unseal](/vault/docs/concepts/seal#recovery-key) documentation to learn more
+ [Seal/Unseal](/docs/concepts/seal#recovery-key) documentation to learn more
  about recovery keys.
 
 ## Unseal (Root) Key
@@ -32,7 +32,7 @@ Vault usually generates a root key and splits it using [Shamir's Secret
 Sharing](https://en.wikipedia.org/wiki/Shamir%27s_Secret_Sharing) to prevent a
 single operator from being able to modify and unseal Vault (see more
 information about Vault's security model
-[here](/vault/docs/internals/security)).
+[here](/docs/internals/security)).
 
 When using an HSM, Vault instead stores the root key, encrypted by the HSM,
 into its internal storage. As a result, during an `init` command, the number of
diff --git a/website/content/docs/enterprise/hsm/index.mdx b/website/content/docs/enterprise/hsm/index.mdx
index 1e96b8f27a3da..2add06d2b6dff 100644
--- a/website/content/docs/enterprise/hsm/index.mdx
+++ b/website/content/docs/enterprise/hsm/index.mdx
@@ -14,9 +14,9 @@ description: >-
   the HSM for encryption rather than splitting into key shares
 - Automatic Unsealing: Vault stores its HSM-wrapped root key in storage,
   allowing for automatic unsealing
-- [Seal Wrapping](/vault/docs/enterprise/sealwrap) to provide FIPS
+- [Seal Wrapping](/docs/enterprise/sealwrap) to provide FIPS
   KeyStorage-conforming functionality for Critical Security Parameters
-- [Entropy Augmentation](/vault/docs/enterprise/entropy-augmentation) to
+- [Entropy Augmentation](/docs/enterprise/entropy-augmentation) to
   allow Vault to sample entropy from an external cryptographic module.
 
 HSM support is available for devices that support PKCS#11 version 2.20+
@@ -31,11 +31,11 @@ within PKCS#11 vary depending on HSM model and configuration. Consult your
 HSM's documentation for more details.
 
 Some parts of Vault work differently when using an HSM. Please see the
-[Behavioral Changes](/vault/docs/enterprise/hsm/behavior) page for
+[Behavioral Changes](/docs/enterprise/hsm/behavior) page for
 important information on these differences.
 
-The [Configuration](/vault/docs/configuration/seal/pkcs11) page contains
+The [Configuration](/docs/configuration/seal/pkcs11) page contains
 configuration information.
 
-Finally, the [Security](/vault/docs/enterprise/hsm/security) page contains
+Finally, the [Security](/docs/enterprise/hsm/security) page contains
 information about deploying Vault's HSM support in a secure fashion.
diff --git a/website/content/docs/enterprise/hsm/security.mdx b/website/content/docs/enterprise/hsm/security.mdx
index bb7c1cc635768..cc42e5832cf82 100644
--- a/website/content/docs/enterprise/hsm/security.mdx
+++ b/website/content/docs/enterprise/hsm/security.mdx
@@ -20,7 +20,7 @@ stored in Vault's configuration file, read access to the file should be tightly
 controlled to appropriate users. (Vault's configuration file should always have
 tight write controls.) Rather than storing these values into Vault's
 configuration file, they can also be supplied via the environment; see the
-[Configuration](/vault/docs/configuration/seal/pkcs11) page for more details.
+[Configuration](/docs/configuration/seal/pkcs11) page for more details.
 
 The attack surface of stolen PKCS#11 credentials depends highly on the
 individual HSM, but generally speaking, it should be assumed that if an
diff --git a/website/content/docs/enterprise/index.mdx b/website/content/docs/enterprise/index.mdx
index 871018a861111..9bdea81d9e20e 100644
--- a/website/content/docs/enterprise/index.mdx
+++ b/website/content/docs/enterprise/index.mdx
@@ -18,5 +18,5 @@ These features are part of [Vault Enterprise](https://www.hashicorp.com/vault?ut
 
 A Vault Enterprise license needs to be applied to a Vault cluster
 in order to use Vault Enterprise features.  See
-[Vault License](/vault/docs/enterprise/license) for details.
+[Vault License](/docs/enterprise/license) for details.
 
diff --git a/website/content/docs/enterprise/lease-count-quotas.mdx b/website/content/docs/enterprise/lease-count-quotas.mdx
index b15c1f49fc411..62149bc453054 100644
--- a/website/content/docs/enterprise/lease-count-quotas.mdx
+++ b/website/content/docs/enterprise/lease-count-quotas.mdx
@@ -44,16 +44,16 @@ further restrict usages in a specific namespace or mount, that can be done
 using the precedence model too.
 
 Vault also allows the inspection into the state of lease count quotas in a Vault
-cluster through various [metrics](/vault/docs/internals/telemetry#Resource-Quota-Metrics)
+cluster through various [metrics](/docs/internals/telemetry#Resource-Quota-Metrics)
 exposed and through enabling optional audit logging.
 
 ## Tutorial
 
 Refer to [Protecting Vault with Resource
-Quotas](/vault/tutorials/operations/resource-quotas) for a
+Quotas](https://learn.hashicorp.com/vault/security/resource-quotas) for a
 step-by-step tutorial.
 
 ## API
 
 Lease count quotas can be managed over the HTTP API. Please see
-[Lease Count Quotas API](/vault/api-docs/system/lease-count-quotas) for more details.
+[Lease Count Quotas API](/api-docs/system/lease-count-quotas) for more details.
diff --git a/website/content/docs/enterprise/license/autoloading.mdx b/website/content/docs/enterprise/license/autoloading.mdx
index dafd15bec28ba..d7444cd988d35 100644
--- a/website/content/docs/enterprise/license/autoloading.mdx
+++ b/website/content/docs/enterprise/license/autoloading.mdx
@@ -8,7 +8,7 @@ description: An overview of license autoloading.
 
 Prior to Vault 1.8, Vault Enterprise would be licensed using special binaries
 that contained embedded licenses, or via a license written into Vault storage
-using the [POST sys/license API](/vault/api-docs/system/license#install-license).
+using the [POST sys/license API](/api-docs/system/license#install-license).
 
 As of Vault 1.8 those options still exist but are deprecated, and the recommended
 mechanism for managing licenses is called License Autoloading. New clusters are
@@ -18,9 +18,9 @@ License Autoloading can be done using one of these mechanisms, in decreasing ord
 of priority (i.e. `VAULT_LICENSE` takes precedence over `VAULT_LICENSE_PATH`, which
 takes precedence over `license_path` in config.)
 
-- [VAULT_LICENSE environment variable](/vault/docs/commands#vault_license)
-- [VAULT_LICENSE_PATH environment variable](/vault/docs/commands#vault_license_path)
-- [license_path in config](/vault/docs/configuration#license_path)
+- [VAULT_LICENSE environment variable](/docs/commands#vault_license)
+- [VAULT_LICENSE_PATH environment variable](/docs/commands#vault_license_path)
+- [license_path in config](/docs/configuration#license_path)
 
 Nodes within a cluster should be consistently licensed. All nodes in a cluster
 should use autoloading, or none should. If autoloading is used, all nodes should
diff --git a/website/content/docs/enterprise/license/faq.mdx b/website/content/docs/enterprise/license/faq.mdx
index 4538645f7baf7..1ef9d6df00f84 100644
--- a/website/content/docs/enterprise/license/faq.mdx
+++ b/website/content/docs/enterprise/license/faq.mdx
@@ -30,14 +30,14 @@ This FAQ section is for license changes and updates introduced for Vault Enterpr
 
 ### Q: What is the product behavior change introduced by the licensing changes?
 
-Per the [feature deprecation plans](/vault/docs/deprecation), Vault will no longer support licenses in storage. An [auto-loaded license](/vault/docs/enterprise/license/autoloading) must be used instead. If you are using stored licenses, you must migrate to auto-loaded licenses prior to upgrading to Vault 1.11
+Per the [feature deprecation plans](/docs/deprecation), Vault will no longer support licenses in storage. An [auto-loaded license](/docs/enterprise/license/autoloading) must be used instead. If you are using stored licenses, you must migrate to auto-loaded licenses prior to upgrading to Vault 1.11
 
-Vault 1.12 will also introduce different termination behavior for evaluation licenses versus non-evaluation licenses. An evaluation license will include a 30-day trial period after which a running Vault server will terminate. Vault servers using a non-evaluation license will not terminate.
+Vault 1.12 will also introduce different termination behavior for evaluation licenses versus non-evaluation licenses. An [evaluation](https://www.hashicorp.com/products/vault/trial) license will include a 30-day trial period after which a running Vault server will terminate. Vault servers using a non-evaluation license will not terminate.
 
 ### Q: How do the license termination changes affect upgrades?
 Vault 1.12 will introduce changes to the license termination behavior. Upgrades when using expired licenses will now be limited.
-Vault will not startup if the build date of the binary is _after_ the expiration date of a license. License expiration date and binary build date compatibility can be verified using the [Check for Autoloaded License](/vault/docs/commands/operator/diagnose#check-for-autoloaded-license) check performed by the `vault operator diagnose` command.
-The build date of a binary can also be found using the [vault version](/vault/docs/commands/version#version) command.
+Vault will not startup if the build date of the binary is _after_ the expiration date of a license. License expiration date and binary build date compatibility can be verified using the [Check for Autoloaded License](/docs/commands/operator/diagnose#check-for-autoloaded-license) check performed by the `vault operator diagnose` command.
+The build date of a binary can also be found using the [vault version](/docs/commands/version#version) command.
 
 A user can expect the following to occur based on the following scenarios:
 
@@ -51,7 +51,7 @@ Vault will start normally
 Vault will not start
 
 **Evaluation license is terminated:**
-Vault will not start independent of the binary's build date
+Vault will not start independent of the binary’s build date
 
 **Non-evaluation license is terminated, binary build date _before_ license expiry date:**
 Vault will start normally
@@ -74,28 +74,28 @@ No, these changes will not impact HCP Vault.
 
 ### Q: What is the product behavior change introduced by the licensing changes?
 
-With Vault 1.11, the use of an [auto-loaded license](/vault/docs/enterprise/license/autoloading) is required for Vault to start successfully.
+With Vault 1.11, the use of an [auto-loaded license](/docs/enterprise/license/autoloading) is required for Vault to start successfully.
 
 ### Q: How will Vault behave at startup when a license expires or terminates?
 
 When a license expires, Vault continues to function until the license terminates. This behavior exists today and remains unchanged in Vault 1.11. The grace period, defined as the time between license expiration and license termination, is one day for evaluation licenses (as of 1.8), and ten years for non-evaluation licenses.
-Customers must provide a valid license before the grace period expires. This license is required to be [auto-loaded](/vault/docs/enterprise/license/autoloading). When license terminates (upon grace period expiry), Vault will seal itself and customers will need a valid license in order to successfully bring-up Vault. If a valid license was not installed after license expiry, customers will need to provide one, and this license will need to be auto-loaded.
+Customers must provide a valid license before the grace period expires. This license is required to be [auto-loaded](/docs/enterprise/license/autoloading). When license terminates (upon grace period expiry), Vault will seal itself and customers will need a valid license in order to successfully bring-up Vault. If a valid license was not installed after license expiry, customers will need to provide one, and this license will need to be auto-loaded.
 
 Vault 1.12 changes the license expiration and termination behavior. Evaluation licenses include a 30-day trial period after which a running Vault server will terminate. Non-evaluation licenses, however, will no longer terminate. When a non-evaluation license expires, Vault will continue to function but upgrades will be limited. The build date of the upgrade binary must be before the expiration date of the license.
-Vault will not start when attempting to use an expired license and binary with a build date _after_ the license expiration date. Attempting to [reload](/vault/api-docs/system/config-reload#reload-license-file) an expired license will result in an error if the build date of the running Vault server is _after_ the license expiration date.
+Vault will not start when attempting to use an expired license and binary with a build date _after_ the license expiration date. Attempting to [reload](/api-docs/system/config-reload#reload-license-file) an expired license will result in an error if the build date of the running Vault server is _after_ the license expiration date.
 
-License expiration date and binary build date compatibility can be verified using the [Check for Autoloaded License](/vault/docs/commands/operator/diagnose#check-for-autoloaded-license) check performed by the `vault operator diagnose` command. The build date of a binary can also be found using the [vault version](/vault/docs/commands/version#version) command.
+License expiration date and binary build date compatibility can be verified using the [Check for Autoloaded License](/docs/commands/operator/diagnose#check-for-autoloaded-license) check performed by the `vault operator diagnose` command. The build date of a binary can also be found using the [vault version](/docs/commands/version#version) command.
 
 ### Q: What is the impact on evaluation licenses due to this change?
 
-As of Vault 1.8, any Vault cluster deployed must have a valid [auto-loaded](/vault/docs/enterprise/license/autoloading) license.
+As of Vault 1.8, any Vault cluster deployed must have a valid [auto-loaded](/docs/enterprise/license/autoloading) license.
 
 Vault 1.12 introduces [expiration and termination behavior changes](#q-how-will-vault-behave-at-startup-when-a-license-expires-or-terminates) for non-evaluation licenses. Evaluation licenses will continue to have a 1-day grace period upon license expiry after which they will terminate. Vault will seal itself and shutdown once an evaluation license terminates.
 
 ### Q: Are there any changes to existing methods for manual license loading (API or CLI)?
 
-The [`/sys/license`](/vault/api-docs/v1.10.x/system/license#install-license) and [`/sys/license/signed`](/vault/api-docs/v1.10.x/system/license#read-signed-license) endpoints have been removed as of Vault 1.11. With that said, it is no longer possible to provide a license via the `/sys/license` endpoint. License [auto-loading](/vault/docs/enterprise/license/autoloading) must be used instead.
-The [`/sys/config/reload/license`](/vault/api-docs/system/config-reload#reload-license-file) endpoint can be used to reload an auto-loaded license provided as a path via an environment variable or configuration.
+The [`/sys/license`](/api-docs/v1.10.x/system/license#install-license) and [`/sys/license/signed`](/api-docs/v1.10.x/system/license#read-signed-license) endpoints have been removed as of Vault 1.11. With that said, it is no longer possible to provide a license via the `/sys/license` endpoint. License [auto-loading](/docs/enterprise/license/autoloading) must be used instead.
+The [`/sys/config/reload/license`](/api-docs/system/config-reload#reload-license-file) endpoint can be used to reload an auto-loaded license provided as a path via an environment variable or configuration.
 
 ### Q: Is there a grace period when evaluation licenses expire?
 
@@ -110,40 +110,40 @@ The changes to licenses apply to all nodes in a cluster. The license files are n
 Yes, starting with Vault 1.8, ENT binaries will be subjected to a EULA check. The release of Vault 1.8 introduces the EULA check for evaluation licenses (non-evaluation licenses are evaluated with a EULA check during contractual agreement) .
 Although the agreement to a EULA occurs only once (when the user receives their license), Vault will check for the presence of a valid license every time a node is restarted.
 
-Starting Vault 1.11, when customers deploy new Vault clusters, or upgrade existing Vault clusters, a valid [auto-loaded](/vault/docs/enterprise/license/autoloading) license must exist for the upgrade to be successful.
+Starting Vault 1.11, when customers deploy new Vault clusters, or upgrade existing Vault clusters, a valid [auto-loaded](/docs/enterprise/license/autoloading) license must exist for the upgrade to be successful.
 
 ### Q: What scenarios should a customer plan for due to these license changes?
 
-- **New Cluster Deployment**: When a customer deploys new clusters to Vault 1.11 or later, a valid license must exist to successfully deploy. This valid license must be on-disk ([auto-loaded](/vault/docs/enterprise/license/autoloading)).
+- **New Cluster Deployment**: When a customer deploys new clusters to Vault 1.11 or later, a valid license must exist to successfully deploy. This valid license must be on-disk ([auto-loaded](/docs/enterprise/license/autoloading)).
 
 - **Eventual Migration**: Vault 1.11 removes support for in-storage licenses. Migrating to an auto-loaded license is required for Vault to start successfully using version 1.11 or greater. Pre-existing license storage entries will be automatically removed from storage upon startup.
 
 ### Q: What is the migration path for customers who want to migrate from their existing license-as-applied-via-the-CLI flow to the license on disk flow?
 
-If a Vault cluster using a stored license is planned to be upgraded to Vault 1.11 or greater, the operator must migrate to using an auto-loaded license. The [`vault license get -signed`](/vault/docs/v1.10.x/commands/license/get) command (or underlying [`/sys/license/signed`](/vault/api-docs/v1.10.x/system/license#read-signed-license) endpoint) can be used to retrieve the license from storage in a running cluster.
-It is not necessary to remove the stored license entry. That will occur automatically upon startup in Vault 1.11 or greater. Prior to completing the [recommended upgrade steps](/vault/docs/upgrading), perform the following to ensure your license is properly configured:
+If a Vault cluster using a stored license is planned to be upgraded to Vault 1.11 or greater, the operator must migrate to using an auto-loaded license. The [`vault license get -signed`](/docs/v1.10.x/commands/license/get) command (or underlying [`/sys/license/signed`](/api-docs/v1.10.x/system/license#read-signed-license) endpoint) can be used to retrieve the license from storage in a running cluster.
+It is not necessary to remove the stored license entry. That will occur automatically upon startup in Vault 1.11 or greater. Prior to completing the [recommended upgrade steps](/docs/upgrading), perform the following to ensure your license is properly configured:
 
 1. Use the command `vault license get -signed` to retrieve the license from storage of your running cluster.
 2. Put the license on disk
-3. Configure license auto-loading by specifying the [`license_path`](/vault/docs/configuration#license_path) config option or setting the [`VAULT_LICENSE`](/vault/docs/commands#vault_license) or [`VAULT_LICENSE_PATH`](/vault/docs/commands#vault_license_path) environment variable.
+3. Configure license auto-loading by specifying the [`license_path`](/docs/configuration#license_path) config option or setting the [`VAULT_LICENSE`](/docs/commands#vault_license) or [`VAULT_LICENSE_PATH`](/docs/commands#vault_license_path) environment variable.
 
 ### Q: What is the path for customers who want to downgrade/rollback from Vault 1.11 or later (auto-loaded license mandatory) to a pre-Vault 1.11 (auto-loading not mandatory, stored license supported)?
 
-The downgrade procedure remains the same for Vault customers who are currently on Vault 1.11 or later, have a license installed via auto-loading, and would like to downgrade their cluster to a pre-1.11 version. Please refer to the [upgrade procedures](/vault/tutorials/standard-procedures/sop-upgrade) that remind the customers that they must take a snapshot before the upgrade. Customers will need to restore their version from the snapshot, apply the pre-1.11 enterprise binary version they wish to roll back, and bring up the clusters.
+The downgrade procedure remains the same for Vault customers who are currently on Vault 1.11 or later, have a license installed via auto-loading, and would like to downgrade their cluster to a pre-1.11 version. Please refer to the [upgrade procedures](https://learn.hashicorp.com/tutorials/vault/sop-upgrade?in=vault/standard-procedures) that remind the customers that they must take a snapshot before the upgrade. Customers will need to restore their version from the snapshot, apply the pre-1.11 enterprise binary version they wish to roll back, and bring up the clusters.
 
 ### Q: Is there a limited time for support of licenses that are in storage?
 
-The support of licenses installed by alternative means often leads to difficulties providing the appropriate support. To provide the support expected by our customers, as we have announced in [Vault feature deprecations and plans](/vault/docs/deprecation) we are removing support for licenses in storage with Vault 1.11. This implies licensing endpoints that deal with licenses in storage will be removed, and Vault will no longer check for valid licenses in storage. This change requires that all customers have [auto-loaded](/vault/docs/enterprise/license/autoloading) licenses to upgrade to 1.11(+) successfully.
+The support of licenses installed by alternative means often leads to difficulties providing the appropriate support. To provide the support expected by our customers, as we have announced in [Vault feature deprecations and plans](/docs/deprecation) we are removing support for licenses in storage with Vault 1.11. This implies licensing endpoints that deal with licenses in storage will be removed, and Vault will no longer check for valid licenses in storage. This change requires that all customers have [auto-loaded](/docs/enterprise/license/autoloading) licenses to upgrade to 1.11(+) successfully.
 
 ### Q: What are the steps to upgrade from one autoloaded license to another autoloaded license?
 
 Follow these steps to migrate from one autoloaded license to another autoloaded license.
 
-1. Use the [`vault license inspect`](/vault/docs/commands/license/inspect) command to compare the new license against the output of the [`vault license get`](/vault/docs/commands/license/get) command. This is to ensure that you have the correct license.
+1. Use the [`vault license inspect`](/docs/commands/license/inspect) command to compare the new license against the output of the [`vault license get`](/docs/commands/license/get) command. This is to ensure that you have the correct license.
 1. Backup the old license file in a safe location.
 1. Replace the old license file on each Vault server with the new one.
-1. Invoke the [reload command](/vault/api-docs/system/config-reload#reload-license-file) on each individual Vault server, starting with the standbys and doing the leader last. Invoking in this manner reduces possible disruptions if something was performed incorrectly with the above steps. You can either use the [reload command](/vault/api-docs/system/config-reload#reload-license-file) or send a SIGHUP.
-1. On each node, ensure that the new license is in use by using the [`vault license get`](/vault/docs/commands/license/get) command and/or checking the logs.
+1. Invoke the [reload command](/api-docs/system/config-reload#reload-license-file) on each individual Vault server, starting with the standbys and doing the leader last. Invoking in this manner reduces possible disruptions if something was performed incorrectly with the above steps. You can either use the [reload command](/api-docs/system/config-reload#reload-license-file) or send a SIGHUP.
+1. On each node, ensure that the new license is in use by using the [`vault license get`](/docs/commands/license/get) command and/or checking the logs.
 
 # ADP Licensing
 
@@ -155,13 +155,13 @@ As of Vault Enterprise 1.8, the functionality formerly sold as the Vault ADP mod
 
 **ADP-KM** includes:
 
-- [Key Management Secrets Engine (KMSE)](/vault/docs/secrets/key-management)
-- [Key Management Interoperability (KMIP)](/vault/docs/secrets/kmip)
+- [Key Management Secrets Engine (KMSE)](/docs/secrets/key-management)
+- [Key Management Interoperability (KMIP)](/docs/secrets/kmip)
 - [MSSQL Transparent Data Encryption (TDE)](https://www.hashicorp.com/blog/enabling-transparent-data-encryption-for-microsoft-sql-with-vault)
 
 **ADP-Transform** includes:
 
-- [Transform Secrets Engine (TSE)](/vault/docs/secrets/transform)
+- [Transform Secrets Engine (TSE)](/docs/secrets/transform)
 
 ### Q: How can the new ADP modules be purchased and what features are customer entitled to as part of that purchase?
 
diff --git a/website/content/docs/enterprise/license/index.mdx b/website/content/docs/enterprise/license/index.mdx
index 596fc4a68fc1a..60b9c506da451 100644
--- a/website/content/docs/enterprise/license/index.mdx
+++ b/website/content/docs/enterprise/license/index.mdx
@@ -6,6 +6,6 @@ description: An overview of license.
 
 # Vault License
 
-Licenses and EULA enhancements have been introduced in Vault 1.8 release. Please refer to the [FAQ](/vault/docs/enterprise/license/faq) for common questions concerning these changes.
+Licenses and EULA enhancements have been introduced in Vault 1.8 release. Please refer to the [FAQ](/docs/enterprise/license/faq) for common questions concerning these changes.
 
-The [Install a HashiCorp Enterprise License](/vault/tutorials/enterprise/hashicorp-enterprise-license) tutorial provides the instruction to load your Vault license.
+The [Install a HashiCorp Enterprise License](https://learn.hashicorp.com/tutorials/nomad/hashicorp-enterprise-license?in=vault/enterprise) tutorial provides the instruction to load your Vault license.
diff --git a/website/content/docs/enterprise/license/utilization-reporting.mdx b/website/content/docs/enterprise/license/utilization-reporting.mdx
deleted file mode 100644
index 4cb798b4a10c3..0000000000000
--- a/website/content/docs/enterprise/license/utilization-reporting.mdx
+++ /dev/null
@@ -1,281 +0,0 @@
----
-layout: docs
-page_title: Automated license utilization reporting
-description: >-
-  Learn what data HashiCorp collects to meter Enterprise license utilization. Enable or disable reporting. Review sample payloads and logs.
----
-
-# Automated License utilization reporting
-
-Automated license utilization reporting sends license utilization data to
-HashiCorp without requiring you to manually collect and report them. It also
-lets you review your license usage with the monitoring solution you already use
-(for example Splunk, Datadog, or others) so you can optimize and manage your
-deployments. Use these reports to understand how much more you can deploy under
-your current contract, protect against overutilization, and budget for predicted
-consumption.  
-
-Automated reporting shares the minimum data required to validate license
-utilization as defined in our contracts. They consist of mostly computed metrics
-and will never contain Personal Identifiable Information (PII) or other
-sensitive information. Automated reporting shares the data with HashiCorp using
-a secure, unidirectional HTTPS API and makes an auditable record in the product
-logs each time it submits a report.
-
-## Enable automated reporting
-
-To enable automated reporting, you need to make sure that outbound network
-traffic is configured correctly and upgrade your enterprise product to a version
-that supports it. If your installation is air-gapped or network settings are not
-in place, automated reporting will not work. 
-
-### 1. Allow outbound HTTPS traffic on port 443
-
-Make sure that your network allows HTTPS egress on port 443 to
-https://reporting.hashicorp.services by allow-listing the following IP
-addresses: 
-
-- 100.20.70.12
-- 35.166.5.222
-- 23.95.85.111
-- 44.215.244.1
-
-### 2. Upgrade
-
-Upgrade to a release that supports entitlement utilization reporting. These
-releases include:
-
-- [Vault Enterprise 1.14.0](https://releases.hashicorp.com/vault/) and later
-
-
-### 3. Check logs
-
-Automatic license utilization reporting will start sending data within 24 hours.
-Check the server logs for records that the data sent successfully.
-
-You will find log entries similar to the following:
-
-<CodeBlockConfig hideClipboard>
-
-```
-[DEBUG] core.reporting: beginning snapshot export
-[DEBUG] core.reporting: creating payload
-[DEBUG] core.reporting: marshalling payload to json
-[DEBUG] core.reporting: generating authentication headers
-[DEBUG] core.reporting: creating request
-[DEBUG] core.reporting: sending request
-[DEBUG] core.reporting: performing request: method=POST url=https://reporting.hashicorp.services
-[DEBUG] core.reporting: recording audit record
-[INFO]  core.reporting: Report sent: auditRecord="{\"payload\":{\"payload_version\":\"1\",\"license_id\":\"97afe7b4-b9c8-bf19-bf35-b89b5cc0efea\",\"product\":\"vault\",\"product_version\":\"1.14.0-rc1+ent\",\"export_timestamp\":\"2023-06-01T09:34:44.215133-04:00\",\"snapshots\":[{\"snapshot_version\":1,\"snapshot_id\":\"0001J7H7KMEDRXKM5C1QJGBXV3\",\"process_id\":\"01H1T45CZK2GN9WR22863W2K32\",\"timestamp\":\"2023-06-01T09:34:44.215001-04:00\",\"schema_version\":\"1.0.0\",\"service\":\"vault\",\"metrics\":{\"clientcount.current_month_estimate\":{\"key\":\"clientcount.current_month_estimate\",\"kind\":\"sum\",\"mode\":\"write\",\"labels\":{\"type\":{\"entity\":20,\"nonentity\":11}}},\"clientcount.previous_month_complete\":{\"key\":\"clientcount.previous_month_complete\",\"kind\":\"sum\",\"mode\":\"write\",\"labels\":{\"type\":{\"entity\":10,\"nonentity\":11}}}}}],\"metadata\":{\"vault\":{\"billing_start\":\"2023-03-01T00:00:00Z\",\"cluster_id\":\"a8d95acc-ec0a-6087-d7f6-4f054ab2e7fd\"}}}}"
-[DEBUG] core.reporting: completed recording audit record
-[DEBUG] core.reporting: export finished successfully
-```
-
-</CodeBlockConfig>
-
-If your installation is air-gapped or your network doesn’t allow the correct
-egress, logs will show an error. 
-
-<CodeBlockConfig hideClipboard>
-
-```
-[DEBUG] core.reporting: beginning snapshot export
-[DEBUG] core.reporting: creating payload
-[DEBUG] core.reporting: marshalling payload to json
-[DEBUG] core.reporting: generating authentication headers
-[DEBUG] core.reporting: creating request
-[DEBUG] core.reporting: sending request
-[DEBUG] core.reporting: performing request: method=POST url=https://reporting.hashicorp.services
-[DEBUG] core.reporting: error status code received: statusCode=403
-```
-
-</CodeBlockConfig>
-
-In this case, reconfigure your network to allow egress and check back in 24
-hours. 
-
-## Opt out
-
-If your installation is air-gapped or you want to manually collect and report on
-the same license utilization metrics, you can opt-out of automated reporting. 
-
-Manually reporting these metrics can be time consuming. Opting out of automated
-reporting does not mean that you also opt out from sending license utilization
-metrics. Customers who opt out of automated reporting will still be required to
-manually collect and send license utilization metrics to HashiCorp. 
-
-If you are considering opting out because you’re worried about the data, we
-strongly recommend that you review the [example payloads](#example-payloads)
-before opting out. If you have concerns with any of the automatically-reported
-data please bring them to your account manager. 
-
-You have two options to opt out of automated reporting: 
-
-- HCL configuration (recommended) 
-- Environment variable (requires restart)
-
-
-#### HCL configuration
-
-Opting out in your product’s configuration file doesn’t require a system
-restart, and is the method we recommend. Add the following block to your server
-configuration file (e.g. `vault-config.hcl`).
-
-```hcl
-reporting {
-	license {
-		enabled = false
-   }
-}
-```
-
-<Warning>
-
-When you have a cluster, each node must have the reporting stanza in its
-configuration to be consistent. In the event of leadership change, nodes will
-use its server configuration to determine whether or not to opt-out the
-automated reporting. Inconsistent configuration between nodes will change the
-reporting status upon active unseal.
-
-</Warning>
-
-
-You will find the following entries in the server log.
-
-<CodeBlockConfig hideClipboard>
-
-```
-[DEBUG] core: reloading automated reporting
-[INFO]  core: opting out of automated reporting
-[DEBUG] activity: there is no reporting agent configured, skipping counts reporting
-```
-
-</CodeBlockConfig>
-
-#### Environment variable
-
-If you need to, you can also opt out using an environment variable, which will
-provide a startup message confirming that you have disabled automated reporting.
-This option requires a system restart. 
-
-<Note>
-
-If the reporting stanza exists in the configuration file, the
-`OPTOUT_LICENSE_REPORTING` value overrides the configuration.
-
-</Note>
-
-Set the following environment variable.
-
-```shell-session
-$ export OPTOUT_LICENSE_REPORTING=true
-```
-
-Now, restart your [Vault servers](/vault/docs/commands/server) from the shell
-where you set the environment variable.
-
-You will find the following entries in the server log.
-
-<CodeBlockConfig hideClipboard>
-
-```
-[INFO]  core: automated reporting disabled via environment variable: env=OPTOUT_LICENSE_REPORTING
-[INFO]  core: opting out of automated reporting
-[DEBUG] activity: there is no reporting agent configured, skipping counts reporting
-```
-
-</CodeBlockConfig>
-
-
-Check your product logs 24 hours after opting out to make sure that the system
-isn’t trying to send reports. 
-
-If your configuration file and environment variable differ, the environment
-variable setting will take precedence.
-
-## Example payloads
-
-HashiCorp collects the following utilization data as JSON payloads:
-
-- `payload_version` - The version of this payload schema
-- `license_id` - The license ID for this product
-- `product` - The product that this contribution is for
-- `product_version` - The product version this contribution is for
-- `export_timestamp`- The date and time for this contribution
-- `snapshots` - An array of snapshot details. A snapshot is a structure that
-  represents a single data collection
-   - `snapshot_version` - The version of the snapshot package that produced this
-     snapshot
-   - `snapshot_id` - A unique identifier for this particular snapshot
-   - `process_id` - An identifier for the system that produced this snapshot
-   - `timestamp` - The date and time for this snapshot
-   - `schema_version` - The version of the schema associated with this snapshot
-   - `service` - The service that produced this snapshot (likely to be product
-     name)
-   - `metrics` - A map of representations of snapshot metrics contained within
-     this snapshot
-      - `key` - The key name associated with this metric
-      - `kind` - The kind of metric (feature, counter, sum, or mean)
-      - `mode` - The mode of operation associated with this metric (write or
-        collect)
-      - `labels` - The labels associated with each collected metric
-         - `entity` - The sum of tokens generated for a unique client identifier
-         - `nonentity` - The sum of tokens without an entity attached
-- `metadata` - Optional product-specific metadata
-   - `billing_start` - The billing start date associated with the reporting cluster (license start date if not configured)
-   - `cluster_id` - The cluster UUID as shown by `vault status` on the reporting
-     cluster
-   
-<CodeBlockConfig hideClipboard>
-
-```json
-{
-  "payload_version": "1",
-  "license_id": "97afe7b4-b9c8-bf19-bf35-b89b5cc0efea",
-  "product": "vault",
-  "product_version": "1.14.0-rc1+ent",
-  "export_timestamp": "2023-06-01T11:39:00.76643-04:00",
-  "snapshots": [
-    {
-      "snapshot_version": 1,
-      "snapshot_id": "0001J7HEWM1PEHPMF5YZT8EV65",
-      "process_id": "01H1VSQMNYAP77R566F1Y03GE6",
-      "timestamp": "2023-06-01T11:39:00.766099-04:00",
-      "schema_version": "1.0.0",
-      "service": "vault",
-      "metrics": {
-        "clientcount.current_month_estimate": {
-          "key": "clientcount.current_month_estimate",
-          "kind": "sum",
-          "mode": "write",
-          "labels": {
-            "type": {
-              "entity": 20,
-              "nonentity": 11
-            }
-          }
-        },
-        "clientcount.previous_month_complete": {
-          "key": "clientcount.previous_month_complete",
-          "kind": "sum",
-          "mode": "write",
-          "labels": {
-            "type": {
-              "entity": 10,
-              "nonentity": 11
-            }
-          }
-        }
-      }
-    }
-  ],
-  "metadata": {
-    "vault": {
-      "billing_start": "2023-03-01T00:00:00Z",
-      "cluster_id": "a8d95acc-ec0a-6087-d7f6-4f054ab2e7fd"
-    }
-  }
-}
-```
-
-</CodeBlockConfig>
\ No newline at end of file
diff --git a/website/content/docs/enterprise/managed-keys.mdx b/website/content/docs/enterprise/managed-keys.mdx
index fe71a3adc67e6..e562de11e4647 100644
--- a/website/content/docs/enterprise/managed-keys.mdx
+++ b/website/content/docs/enterprise/managed-keys.mdx
@@ -17,11 +17,11 @@ To satisfy these requirements, Vault has a centralized abstraction called
 delegate these operations to a trusted external KMS.
 
 Minimally, a managed key consists of a named managed key entry managed by the
-[`sys/managed-key`](/vault/api-docs/system/managed-keys) API.  Besides a name,
+[`sys/managed-key`](../../api-docs/system/managed-keys) API.  Besides a name,
 there are backend specific configurations to access the key in question.
 
 For PKCS#11 (HSM) backed managed keys, the managed key configuration must
-reference a [kms library stanza](/vault/docs/configuration/kms-library) which points
+reference a [kms library stanza](../configuration/kms-library) which points
 to a PKCS#11 access library on the host machine.
 
 Note that a configured, named managed key corresponds to a single key within
@@ -42,21 +42,16 @@ Cloud KMS. Support for additional integrations may be added in the future.
 
 ## Secret and Auth Engine Support
 
-The [PKI Secrets Engine](/vault/api-docs/secret/pki#managed-keys) has been integrated
+The [PKI Secrets Engine](/api-docs/secret/pki#managed-keys) has been integrated
 with Managed Keys to offer certificate generation, both root and intermediary
 PKI paths, leveraging private keys from an external trusted KMS.
 
-The [Transit Secrets Engine](/vault/api-docs/secret/transit#managed-keys) allows users
-to generate and verify cryptographic signatures with Managed Keys, and in some cases encrypt
-and decrypt data, or generate MACs and HMACs. These operations are performed on the KMS or HSM
-that hosts the Managed Key material.
-
 More engines may leverage managed keys in the future.
 
 ## API
 
 Managed Keys can be managed over the HTTP API. Please see
-[Managed Keys API](/vault/api-docs/system/managed-keys) for more details.
+[Managed Keys API](/api-docs/system/managed-keys) for more details.
 
 To configure PKI secrets engine with Managed Keys please see
-[PKI Secret API](/vault/api-docs/secret/pki#managed-keys)
+[PKI Secret API](/api-docs/secret/pki#managed-keys)
diff --git a/website/content/docs/enterprise/mfa/index.mdx b/website/content/docs/enterprise/mfa/index.mdx
index cd9d9953c8c82..295c62e120882 100644
--- a/website/content/docs/enterprise/mfa/index.mdx
+++ b/website/content/docs/enterprise/mfa/index.mdx
@@ -41,7 +41,7 @@ MFA in Vault can be of the following types.
 ## Configuring MFA Methods
 
 MFA methods are globally managed within the `System Backend` using the HTTP API.
-Please see [MFA API](/vault/api-docs/system/mfa) for details on how to configure an MFA
+Please see [MFA API](/api-docs/system/mfa) for details on how to configure an MFA
 method.
 
 ## MFA Methods In Policies
@@ -68,7 +68,7 @@ referenced from ACL and Sentinel policies in any namespace via the method name
 and can be tied to a mount accessor in any namespace.
 
 When using [Sentinel
-EGPs](/vault/docs/enterprise/sentinel#endpoint-governing-policies-egps),
+EGPs](/docs/enterprise/sentinel#endpoint-governing-policies-egps),
 any MFA configuration specified must be satisfied by all requests affected by
 the policy, which can be difficult if the configured paths spread across
 namespaces. One way to address this is to use a policy similar to the
@@ -112,4 +112,4 @@ $ curl \
 
 ### API
 
-MFA can be managed entirely over the HTTP API. Please see [MFA API](/vault/api-docs/system/mfa) for more details.
+MFA can be managed entirely over the HTTP API. Please see [MFA API](/api-docs/system/mfa) for more details.
diff --git a/website/content/docs/enterprise/namespaces.mdx b/website/content/docs/enterprise/namespaces.mdx
index 08a2dff60bd06..fa977ff9c43b6 100644
--- a/website/content/docs/enterprise/namespaces.mdx
+++ b/website/content/docs/enterprise/namespaces.mdx
@@ -67,13 +67,11 @@ There are certain API paths that can only be called from the root namespace:
 - `sys/leader`
 - `sys/health`
 - `sys/metrics`
-- `sys/config/group-policy-application`
 - `sys/config/state`
 - `sys/host-info`
 - `sys/key-status`
 - `sys/storage`
 - `sys/storage/raft`
-- `sys/quotas`
 
 ## Architecture
 
@@ -96,11 +94,9 @@ of delegate admins.
 Child namespaces can share policies from their parent namespaces. For example, a child namespace
 may refer to parent identities (entities and groups) when writing policies that function only
 within that child namespace. Similarly, a parent namespace can have policies asserted on child
-identities. This behavior can be configured using the [group-policy-application](/vault/api-docs/system/config-group-policy-application) API, and
-can be set to allow policies to be applied irrespective of namespace hierarchy, allowing sharing
-across any namespace.
+identities.
 
 ## Tutorial
 
-Refer to the [Secure Multi-Tenancy with Namespaces](/vault/tutorials/enterprise/namespaces)
+Refer to the [Secure Multi-Tenancy with Namespaces](https://learn.hashicorp.com/vault/operations/namespaces)
 tutorial to learn how to use Vault as a Service to allow organizations(tenants) to manage their own secrets and policies.
diff --git a/website/content/docs/enterprise/performance-standby.mdx b/website/content/docs/enterprise/performance-standby.mdx
index 3f33d3199d8bf..7882e0ff69861 100644
--- a/website/content/docs/enterprise/performance-standby.mdx
+++ b/website/content/docs/enterprise/performance-standby.mdx
@@ -11,7 +11,7 @@ description: Performance Standby Nodes - Vault Enterprise
 Vault supports a multi-server mode for high availability. This mode protects
 against outages by running multiple Vault servers. High availability mode
 is automatically enabled when using a data store that supports it. You can
-learn more about HA mode on the [Concepts](/vault/docs/concepts/ha) page.
+learn more about HA mode on the [Concepts](/docs/concepts/ha) page.
 
 Vault Enterprise offers additional features that allow HA nodes to service
 read-only requests on the local standby node. Read-only requests are requests
@@ -20,7 +20,7 @@ that do not modify Vault's storage.
 ## Server-to-Server Communication
 
 Performance Standbys require the request forwarding method described in the [HA
-Server-to-Server](/vault/docs/concepts/ha#server-to-server-communication) docs.
+Server-to-Server](/docs/concepts/ha#server-to-server-communication) docs.
 
 A performance standby will connect to the active node over the existing request
 forwarding connection. If selected by the active node to be promoted to a
@@ -53,7 +53,7 @@ based on consul configuration).
 
 Additionally, if you wish to point your load balancers at performance standby
 nodes, the `sys/health` endpoint can be used to determine if a node is a
-performance standby. See the [sys/health API](/vault/api-docs/system/health) docs for
+performance standby. See the [sys/health API](/api-docs/system/health) docs for
 more info.
 
 ## Disabling Performance Standbys
diff --git a/website/content/docs/enterprise/pkcs11-provider/aws-xks.mdx b/website/content/docs/enterprise/pkcs11-provider/aws-xks.mdx
index 81b54fdab01e5..7297cf320773b 100644
--- a/website/content/docs/enterprise/pkcs11-provider/aws-xks.mdx
+++ b/website/content/docs/enterprise/pkcs11-provider/aws-xks.mdx
@@ -10,7 +10,7 @@ description: |-
 ~> **Note**: AWS [`xks-proxy`](https://github.com/aws-samples/aws-kms-xks-proxy) is used in this document as a sample implementation.
 
 Vault's KMIP Secrets Engine can be used as an external key store for the AWS KMS [External Key Store (XKS)](https://aws.amazon.com/blogs/aws/announcing-aws-kms-external-key-store-xks/) protocol using the AWS [`xks-proxy`](https://github.com/aws-samples/aws-kms-xks-proxy) along
-with the [Vault PKCS#11 Provider](/vault/docs/enterprise/pkcs11-provider).
+with the [Vault PKCS#11 Provider](https://developer.hashicorp.com/vault/docs/enterprise/pkcs11-provider).
 
 ## Overview
 
@@ -35,9 +35,9 @@ to the desired KMS region.
 
 ## Vault Setup
 
-On the Vault server, we need to [setup the KMIP Secrets Engine](/vault/docs/secrets/kmip):
+On the Vault server, we need to [setup the KMIP Secrets Engine](/docs/secrets/kmip):
 
-1. Start the [KMIP Secrets Engine](/vault/docs/secrets/kmip) and listener:
+1. Start the [KMIP Secrets Engine](/docs/secrets/kmip) and listener:
 
     ```sh
     vault secrets enable kmip
@@ -175,11 +175,11 @@ to the XKS proxy. This helps to quickly setup a valid domain and TLS endpoint fo
     ```
 
     This file is used by `libvault-pkcs11.so` to know how to find and communicate with the KMIP server.
-    See [the Vault docs](/vault/docs/enterprise/pkcs11-provider) for all available parameters and their usage.
+    See [the Vault docs](https://developer.hashicorp.com/vault/docs/enterprise/pkcs11-provider) for all available parameters and their usage.
 
 1. If you want to view the Vault logs (helpful when trying to find error messages), you can specify the `VAULT_LOG_FILE` (default is stdout) and `VAULT_LOG_LEVEL` (default is `INFO`). We'd recommend setting `VAULT_LOG_FILE` to something like `/tmp/vault.log` or `/var/log/vault.log`. Other useful log levels are `WARN` (quieter) and `TRACE` (very verbose, could possibly contain sensitive information, like raw network packets).
 
-1. Create an AES-256 key in KMIP, for example, using `pkcs11-tool` (usually installed with the OpenSC package). See the [Vault docs](/vault/docs/enterprise/pkcs11-provider) for the full setup.
+1. Create an AES-256 key in KMIP, for example, using `pkcs11-tool` (usually installed with the OpenSC package). See the [Vault docs](https://developer.hashicorp.com/vault/docs/enterprise/pkcs11-provider) for the full setup.
    ```sh
    VAULT_LOG_FILE=/dev/null pkcs11-tool --module ./libvault-pkcs11.so --keygen -a abc123 --key-type AES:32 \
        --extractable --allow-sw
diff --git a/website/content/docs/enterprise/pkcs11-provider/index.mdx b/website/content/docs/enterprise/pkcs11-provider/index.mdx
index 3ecbc02f47802..c344bfb5f5f63 100644
--- a/website/content/docs/enterprise/pkcs11-provider/index.mdx
+++ b/website/content/docs/enterprise/pkcs11-provider/index.mdx
@@ -15,7 +15,7 @@ For example, it is often used to access a Hardware Security Module (HSM) (like a
 
 Vault provides a PKCS#11 library (or provider) so that Vault can be used as an SSM (Software Security Module).
 This allows a user to treat Vault like any other PKCS#11 device to manage keys, objects, and perform encryption and decryption in Vault using PKCS#11 calls.
-The PKCS#11 library connects to Vault's [KMIP Secrets Engine](/vault/docs/secrets/kmip) to provide cryptographic operations and object storage.
+The PKCS#11 library connects to Vault's [KMIP Secrets Engine](/docs/secrets/kmip) to provide cryptographic operations and object storage.
 
 ## Platform Support
 
@@ -29,9 +29,6 @@ with the KMIP Secrets Engine.
 | Linux            | x86-64       | RHEL 9 compatible | 2.34    |
 | macOS            | x86-64       | &mdash;           | &mdash; |
 
-_Note:_ `vault-pkcs11-provider` runs on _any_ glibc-based Linux distribution. The versions above are given in RHEL-compatible GLIBC versions; for your
-distro's glibc version, choose the `vault-pkcs11-provider` built against the same or older version as what your distro provides.
-
 The provider comes in the form of a shared C library, `libvault-pkcs11.so` (for Linux) or `libvault-pkcs11.dylib` (for macOS).
 It can be downloaded from [releases.hashicorp.com](https://releases.hashicorp.com/vault-pkcs11-provider).
 
@@ -54,7 +51,7 @@ It can be downloaded from [releases.hashicorp.com](https://releases.hashicorp.co
       server -dev -dev-root-token-id root -dev-listen-address 0.0.0.0:8200
     ```
 
-1. Configure the [KMIP Secrets Engine](/vault/docs/secrets/kmip) and a KMIP *scope*. The scope is used to hold keys and objects.
+1. Configure the [KMIP Secrets Engine](/docs/secrets/kmip) and a KMIP *scope*. The scope is used to hold keys and objects.
 
     ~> **Note**: These commands will output the credentials in plaintext.
 
@@ -67,7 +64,7 @@ It can be downloaded from [releases.hashicorp.com](https://releases.hashicorp.co
     ```
 
     ~> **Important**: When configuring KMIP in production, you will probably need to set the
-    `server_hostnames` and `server_ips` [configuration parameters](/vault/api-docs/secret/kmip#parameters),
+    `server_hostnames` and `server_ips` [configuration parameters](/api-docs/secret/kmip#parameters),
     otherwise the TLS connection to the KMIP Secrets Engine will fail due to certification validation errors.
 
     This last line will generate a JSON file with the certificate, key, and CA certificate chain to connect
@@ -149,7 +146,7 @@ Most programs will use only one slot.
 - `tls_cert_path` (required): the location of the client TLS certificate used to authenticate to the KMIP engine.
 - `tls_key_path` (optional, defaults to the value of `tls_cert_path`): the location of the encrypted or unencrypted TLS key used to authenticate to the KMIP engine.
 - `ca_path` (required): the location of the CA bundle that will be used to verify the server's certificate.
-- `scope` (required): the [KMIP scope](/vault/docs/secrets/kmip#scopes-and-roles) to authenticate against and where the TDE master keys and associated metadata will be stored.
+- `scope` (required): the [KMIP scope](/docs/secrets/kmip#scopes-and-roles) to authenticate against and where the TDE master keys and associated metadata will be stored.
 - `cache` (optional, default `true`): if the provider uses a cache to improve the performance of `C_GetAttributeValue` (KMIP: `GetAttributes`) calls.
 - `emulate_hardware` (optional, default `false`): specifies if the provider should report that it is connected to a hardware device.
 
@@ -212,168 +209,58 @@ The Vault PKCS#11 provider implements the following PKCS#11 provider profiles:
 - [Baseline](http://docs.oasis-open.org/pkcs11/pkcs11-profiles/v2.40/os/pkcs11-profiles-v2.40-os.html#_Toc416960548)
 - [Extended](http://docs.oasis-open.org/pkcs11/pkcs11-profiles/v2.40/os/pkcs11-profiles-v2.40-os.html#_Toc416960554)
 
-The following key genration mechanisms are currently supported:
-
-| Name               | Mechanism Number |Provider Version|Vault Version|
-| ------------------ | ---------------- |----------------|-------------|
-| RSA-PKCS           | `0x0000`         | 0.2.0          | 1.13        |
-| AES key generation | `0x1080`         | 0.1.0          | 1.12        |
-
-
-The following encryption mechanisms are currently supported:
-
-| Name               | Mechanism Number |Provider Version|Vault Version|
-| ------------------ | ---------------- |----------------|-------------|
-| RSA-PKCS           | `0x0001`         | 0.2.0          | 1.13        |
-| RSA-PKCS-OAEP      | `0x0009`         | 0.2.0          | 1.13        |
-| AES-ECB            | `0x1081`         | 0.2.0          | 1.13        |
-| AES-CBC            | `0x1082`         | 0.1.0          | 1.12        |
-| AES-CBC Pad        | `0x1085`         | 0.1.0          | 1.12        |
-| AES-CTR            | `0x1086`         | 0.1.0          | 1.12        |
-| AES-GCM            | `0x1087`         | 0.1.0          | 1.12        |
-| AES-OFB            | `0x2104`         | 0.2.0          | 1.13        |
-| AES-CFB128         | `0x2107`         | 0.2.0          | 1.13        |
-
-The following signing mechanisms are currently supported:
-
-| Name               | Mechanism Number |Provider Version|Vault Version|
-| ------------------ | ---------------- |----------------|-------------|
-| RSA-PKCS           | `0x0001`         | 0.2.0          | 1.13        |
-| SHA256-RSA-PKCS    | `0x0040`         | 0.2.0          | 1.13        |
-| SHA384-RSA-PKCS    | `0x0041`         | 0.2.0          | 1.13        |
-| SHA512-RSA-PKCS    | `0x0042`         | 0.2.0          | 1.13        |
-| SHA224-RSA-PKCS    | `0x0046`         | 0.2.0          | 1.13        |
-| SHA512-224-HMAC    | `0x0049`         | 0.2.0          | 1.13        |
-| SHA512-256-HMAC    | `0x004D`         | 0.2.0          | 1.13        |
-| SHA256-HMAC        | `0x0251`         | 0.2.0          | 1.13        |
-| SHA224-HMAC        | `0x0256`         | 0.2.0          | 1.13        |
-| SHA384-HMAC        | `0x0261`         | 0.2.0          | 1.13        |
-| SHA512-HMAC        | `0x0271`         | 0.2.0          | 1.13        |
-
-
-<Tabs>
-<Tab heading="Supported PKCS#11 Functions (version 0.2)">
-Here is the list of supported and unsupported PKCS#11 functions:
+The following mechanisms are currently supported, as of Vault 1.12:
 
-- Encryption and decryption
-  - [X]  `C_EncryptInit`
-  - [X]  `C_Encrypt`
-  - [X]  `C_EncryptUpdate`
-  - [X]  `C_EncryptFinal`
-  - [X]  `C_DecryptInit`
-  - [X]  `C_Decrypt`
-  - [X]  `C_DecryptUpdate`
-  - [X]  `C_DecryptFinal`
-- Key management
-  - [X]  `C_GenerateKey`
-  - [X]  `C_GenerateKeyPair`
-  - [ ]  `C_WrapKey`
-  - [ ]  `C_UnwrapKey`
-  - [ ]  `C_DeriveKey`
-- Objects
-  - [X]  `C_CreateObject`
-  - [X]  `C_DestroyObject`
-  - [X]  `C_GetAttributeValue`
-  - [X]  `C_FindObjectsInit`
-  - [X]  `C_FindObjects`
-  - [X]  `C_FindObjectsFinal`
-  - [ ]  `C_SetAttributeValue`
-  - [ ]  `C_CopyObject`
-  - [ ]  `C_GetObjectSize`
-- Management
-  - [X]  `C_Initialize`
-  - [X]  `C_Finalize`
-  - [X]  `C_Login` (PIN is used as a passphrase for the TLS encryption key, if provided)
-  - [X]  `C_Logout`
-  - [X]  `C_GetInfo`
-  - [X]  `C_GetSlotList`
-  - [X]  `C_GetSlotInfo`
-  - [X]  `C_GetTokenInfo`
-  - [X]  `C_GetMechanismList`
-  - [X]  `C_GetMechanismInfo`
-  - [X]  `C_OpenSession`
-  - [X]  `C_CloseSession`
-  - [X]  `C_CloseAllSessions`
-  - [X]  `C_GetSessionInfo`
-  - [ ]  `C_InitToken`
-  - [ ]  `C_InitPIN`
-  - [ ]  `C_SetPIN`
-  - [ ]  `C_GetOperationState`
-  - [ ]  `C_SetOperationState`
-  - [ ]  `C_GetFunctionStatus`
-  - [ ]  `C_CancelFunction`
-  - [ ]  `C_WaitForSlotEvent`
-- Signing
-  - [X]  `C_SignInit`
-  - [X]  `C_Sign`
-  - [X]  `C_SignUpdate`
-  - [X]  `C_SignFinal`
-  - [ ]  `C_SignRecoverInit`
-  - [ ]  `C_SignRecover`
-  - [X]  `C_VerifyInit`
-  - [X]  `C_Verify`
-  - [X]  `C_VerifyUpdate`
-  - [X]  `C_VerifyFinal`
-  - [ ]  `C_VerifyRecoverInit`
-  - [ ]  `C_VerifyRecover`
-- Digests
-  - [ ]  `C_DigestInit`
-  - [ ]  `C_Digest`
-  - [ ]  `C_DigestUpdate`
-  - [ ]  `C_DigestKey`
-  - [ ]  `C_DigestFinal`
-  - [ ]  `C_DigestEncryptUpdate`
-  - [ ]  `C_DecryptDigestUpdate`
-  - [ ]  `C_SignEncryptUpdate`
-  - [ ]  `C_DecryptVerifyUpdate`
-- Random Number Generation (see note below)
-  - [X]  `C_SeedRandom`
-  - [X]  `C_GenerateRandom`
+| Name               | Mechanism Number |
+| ------------------ | ---------------- |
+| AES key generation | `0x1080`         |
+| AES-CBC            | `0x1082`         |
+| AES-CBC Pad        | `0x1085`         |
+| AES-CTR            | `0x1086`         |
+| AES-GCM            | `0x1087`         |
 
-</Tab>
-<Tab heading="Supported PKCS#11 Functions (version 0.1)">
 Here is the list of supported and unsupported PKCS#11 functions:
 
 - Encryption and decryption
-  - [X]  `C_EncryptInit`
-  - [X]  `C_Encrypt`
+  - [x]  `C_EncryptInit`
+  - [x]  `C_Encrypt`
   - [ ]  `C_EncryptUpdate`
   - [ ]  `C_EncryptFinal`
-  - [X]  `C_DecryptInit`
-  - [X]  `C_Decrypt`
+  - [x]  `C_DecryptInit`
+  - [x]  `C_Decrypt`
   - [ ]  `C_DecryptUpdate`
   - [ ]  `C_DecryptFinal`
 - Key management
-  - [X]  `C_GenerateKey`
+  - [x]  `C_GenerateKey`
   - [ ]  `C_GenerateKeyPair`
   - [ ]  `C_WrapKey`
   - [ ]  `C_UnwrapKey`
   - [ ]  `C_DeriveKey`
 - Objects
-  - [X]  `C_CreateObject`
-  - [X]  `C_DestroyObject`
-  - [X]  `C_GetAttributeValue`
-  - [X]  `C_FindObjectsInit`
-  - [X]  `C_FindObjects`
-  - [X]  `C_FindObjectsFinal`
+  - [x]  `C_CreateObject`
+  - [x]  `C_DestroyObject`
+  - [x]  `C_GetAttributeValue`
+  - [x]  `C_FindObjectsInit`
+  - [x]  `C_FindObjects`
+  - [x]  `C_FindObjectsFinal`
   - [ ]  `C_SetAttributeValue`
   - [ ]  `C_CopyObject`
   - [ ]  `C_GetObjectSize`
 - Management
-  - [X]  `C_Initialize`
-  - [X]  `C_Finalize`
-  - [X]  `C_Login` (PIN is used as a passphrase for the TLS encryption key, if provided)
-  - [X]  `C_Logout`
-  - [X]  `C_GetInfo`
-  - [X]  `C_GetSlotList`
-  - [X]  `C_GetSlotInfo`
-  - [X]  `C_GetTokenInfo`
-  - [X]  `C_GetMechanismList`
-  - [X]  `C_GetMechanismInfo`
-  - [X]  `C_OpenSession`
-  - [X]  `C_CloseSession`
-  - [X]  `C_CloseAllSessions`
-  - [X]  `C_GetSessionInfo`
+  - [x]  `C_Initialize`
+  - [x]  `C_Finalize`
+  - [x]  `C_Login` (PIN is used as a passphrase for the TLS encryption key, if provided)
+  - [x]  `C_Logout`
+  - [x]  `C_GetInfo`
+  - [x]  `C_GetSlotList`
+  - [x]  `C_GetSlotInfo`
+  - [x]  `C_GetTokenInfo`
+  - [x]  `C_GetMechanismList`
+  - [x]  `C_GetMechanismInfo`
+  - [x]  `C_OpenSession`
+  - [x]  `C_CloseSession`
+  - [x]  `C_CloseAllSessions`
+  - [x]  `C_GetSessionInfo`
   - [ ]  `C_InitToken`
   - [ ]  `C_InitPIN`
   - [ ]  `C_SetPIN`
@@ -409,9 +296,6 @@ Here is the list of supported and unsupported PKCS#11 functions:
   - [X]  `C_SeedRandom`
   - [X]  `C_GenerateRandom`
 
-</Tab>
-</Tabs>
-
 ## Limitations and Notes
 
 Due to the nature of Vault, the KMIP Secrets Engine, and PKCS#11, there are some other limitations to be aware of:
@@ -423,4 +307,4 @@ Due to the nature of Vault, the KMIP Secrets Engine, and PKCS#11, there are some
   Multiple sessions can be safely used simultaneously though, and a single Vault server node has been tested as supporting thousands of ongoing sessions.
 - The object attribute cache is valid only for a single object per session, and will be cleared when another object's attributes are queried.
 - The random number generator function, `C_GenerateRandom`, is currently implemented in software in the library by calling out to Go's [`crypto/rand`](https://pkg.go.dev/crypto/rand) package,
-  and does **not** call Vault.
+  and does **not** call Vault.
\ No newline at end of file
diff --git a/website/content/docs/enterprise/pkcs11-provider/oracle-tde.mdx b/website/content/docs/enterprise/pkcs11-provider/oracle-tde.mdx
index b67407f53fb5b..7926b6ffc1de0 100644
--- a/website/content/docs/enterprise/pkcs11-provider/oracle-tde.mdx
+++ b/website/content/docs/enterprise/pkcs11-provider/oracle-tde.mdx
@@ -8,7 +8,7 @@ description: |-
 # Oracle TDE
 
 [Oracle Transparent Data Encryption](https://docs.oracle.com/database/121/ASOAG/introduction-to-transparent-data-encryption.htm#ASOAG10270) (TDE)
-is supported with the [Vault PKCS#11 provider](/vault/docs/enterprise/pkcs11-provider).
+is supported with the [Vault PKCS#11 provider](/docs/enterprise/pkcs11-provider).
 In this setup, Vault's KMIP engine generates and store the "TDE Master Encryption Key" that the Oracle Database uses to encrypt and decrypt the "TDE Table Keys".
 Oracle will not have access to the TDE Master Encryption Key itself.
 
@@ -23,7 +23,7 @@ To setup Oracle TDE backed by Vault, the following are required:
 
 ## Vault Setup
 
-On the Vault server, we need to [setup the KMIP Secrets Engine](/vault/docs/secrets/kmip):
+On the Vault server, we need to [setup the KMIP Secrets Engine](/docs/secrets/kmip):
 
 1. Start the KMIP Secrets Engine and listener:
 
@@ -33,7 +33,7 @@ On the Vault server, we need to [setup the KMIP Secrets Engine](/vault/docs/secr
     ```
 
     ~> **Important**: When configuring KMIP for Oracle, you will probably need to set the
-    `server_hostnames` and `server_ips` [configuration parameters](/vault/api-docs/secret/kmip#parameters),
+    `server_hostnames` and `server_ips` [configuration parameters](/api-docs/secret/kmip#parameters),
     otherwise the TLS connection to the KMIP Secrets Engine will fail due to certification validation errors.
     When configuring Oracle TDE, this error can manifest as the `sqlplus` session silently hanging.
 
diff --git a/website/content/docs/enterprise/redundancy-zones.mdx b/website/content/docs/enterprise/redundancy-zones.mdx
index 07a9148a38fec..42cb025e0527f 100644
--- a/website/content/docs/enterprise/redundancy-zones.mdx
+++ b/website/content/docs/enterprise/redundancy-zones.mdx
@@ -36,4 +36,4 @@ ensure that Vault is never moving from a more healthy state to a less healthy st
 wait to begin leadership transfer until it can ensure that there will be as much redundancy on the
 new Vault version as there was on the old Vault version.
 
-The status of redundancy zones can be monitored by consulting the [Autopilot state API endpoint](/vault/api-docs/system/storage/raftautopilot#get-cluster-state).
+The status of redundancy zones can be monitored by consulting the [Autopilot state API endpoint](/api-docs/system/storage/raftautopilot#get-cluster-state).
diff --git a/website/content/docs/enterprise/replication.mdx b/website/content/docs/enterprise/replication.mdx
index c406668e04d3b..9f15236c1cd13 100644
--- a/website/content/docs/enterprise/replication.mdx
+++ b/website/content/docs/enterprise/replication.mdx
@@ -26,7 +26,7 @@ applications that need to interoperate.
 Vault replication addresses both of these needs in providing consistency,
 scalability, and highly-available disaster recovery.
 
-Note: Using replication requires a storage backend that supports transactional updates, such as [Integrated Storage](/vault/docs/concepts/integrated-storage) or Consul.
+Note: Using replication requires a storage backend that supports transactional updates, such as [Integrated Storage](/docs/concepts/integrated-storage) or Consul.
 
 ## Architecture
 
@@ -42,17 +42,14 @@ All communication between primaries and secondaries is end-to-end encrypted
 with mutually-authenticated TLS sessions, setup via replication tokens which are
 exchanged during bootstrapping.
 
-## Replicated data
-
 What data is replicated between the primary and secondary depends on the type of
 replication that is configured between the primary and secondary. These types
-of relationships are either **disaster recovery** or
-**performance replication** relationships.
+of relationships are either **disaster recovery** or **performance**
+relationships.
 
 ![](/img/replication-overview.png)
 
-The following table shows a capability comparison between Disaster Recovery
-and Performance Replication.
+The following table shows a capability comparison between Disaster Recovery and Performance Replication.
 
 | Capability                                                                                                           | Disaster Recovery | Performance Replication                                                                                                                                                                        |
 | -------------------------------------------------------------------------------------------------------------------- | ----------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
@@ -61,30 +58,6 @@ and Performance Replication.
 | Mirrors the tokens and leases for applications and users interacting with the primary cluster                        | Yes               | No. Secondaries keep track of their own tokens and leases. When the secondary is promoted, applications must reauthenticate and obtain new leases from the newly-promoted primary. |
 | Allows the secondary cluster to handle client requests                                                               | No                | Yes                                            |
 
-Everything written to storage is classified into one of three categories:
-* `replicated` (or "shared"): all downstream clusters receive it
-* `local`: only downstream disaster recovery clusters receive it
-* `ignored`: not replicated to downstream clusters at all
-
-When mounting a secret engine or auth method, you can choose whether to make it a
-local mount or a shared mount.
-
-Shared mounts (the default) usually replicate all their data to performance secondaries, but
-they can choose to designate specific storage paths as local.  For example, PKI mounts
-store certificates locally. If you query the roles on a shared PKI mount, you'll see
-the same result for that mount when you send the query to either the performance primary or
-secondary, but if you list stored certs, you'll see different values.
-
-Local mounts replicate their data only to disaster recovery secondaries.  A local mount
-created on a performance primary isn't visible at all to its performance secondaries.
-Local mounts can also be created on performance secondaries, in which case they aren't visible
-to the performance primary.
-
-There exist other storage entries that aren't mount specific.  For example, the Integrated
-Storage Autopilot configuration is an `ignored` storage entry, which allows for disaster recovery
-secondaries to have a different configuration than their primary.  Tokens and leases are written to
-`local` storage entries.
-
 ## Performance Replication
 
 In Performance Replication, secondaries keep track of their own tokens and leases
@@ -104,7 +77,7 @@ The primary cluster's mount configuration gets replicated across its secondary
 clusters when you enable Performance Replication. In some cases, you may not
 want all data to be replicated. For example, your primary cluster is in the EU
 region, and you have a secondary cluster outside of the EU region. [General Data
-Protection Regulation (GDPR)](https://gdpr.eu/) requires that personally
+Protection Regulation (GDPR)](https://www.eugdpr.org/) requires that personally
 identifiable data not be physically transferred to locations outside the
 European Union unless the region or country has an equal rigor of data
 protection regulation as the EU.
@@ -134,7 +107,7 @@ $ vault secrets enable -local -path=us_west_data kv-v2
 ```
 
 -> **Learn:** Refer to the [Performance Replication with Paths
-Filter](/vault/tutorials/enterprise/paths-filter) tutorial for
+Filter](https://learn.hashicorp.com/tutorials/vault/paths-filter) tutorial for
 step-by-step instructions.
 
 
@@ -152,7 +125,7 @@ They do not forward service read or write requests until they are elected and be
 -> **Note**: Unlike with Performance Replication, local secret engines, auth methods and audit devices are replicated to a DR secondary.
 
 
-For more information on the capabilities of performance and disaster recovery replication, see the Vault Replication [API Documentation](/vault/api-docs/system/replication).
+For more information on the capabilities of performance and disaster recovery replication, see the Vault Replication [API Documentation](/api-docs/system/replication).
 
 ## Primary and Secondary Cluster Compatibility
 
@@ -163,7 +136,7 @@ There is no requirement that both clusters use the same storage engine.
 ### Seals
 
 There is no requirement that both clusters use the same seal type, but see
-[sealwrap](/vault/docs/enterprise/sealwrap#seal-wrap-and-replication) for the full
+[sealwrap](/docs/enterprise/sealwrap#seal-wrap-and-replication) for the full
 details.
 
 Also note that enabling replication will modify the secondary seal.
@@ -185,7 +158,7 @@ Note: Clusters with Shamir seal config do not have separate recovery keys. Auto
 ### Vault versions
 
 Vault changes are designed and tested to ensure that the
-[upgrade instructions](/vault/docs/upgrading#replication-installations) are viable, i.e.
+[upgrade instructions](/docs/upgrading#replication-installations) are viable, i.e.
 that a secondary can run a newer Vault version than its primary.
 
 That said, we do not recommend running replicated Vault clusters with different
@@ -194,7 +167,7 @@ versions any longer than necessary to perform the upgrade.
 ## Internals
 
 Details on the internal design of the replication feature can be found in the
-[replication internals](/vault/docs/internals/replication) document.
+[replication internals](/docs/internals/replication) document.
 
 ## Security Model
 
@@ -249,22 +222,22 @@ its encrypted barrier.
 
 ## Mutual TLS and Load Balancers
 
-Vault generates its own certificates for cluster members. All replication traffic
-uses the cluster port using these Vault-generated certificates after initial
-bootstrapping. Because of this, the cluster traffic can NOT be terminated at the
+Vault generates its own certificates for cluster members. All replication traffic 
+uses the cluster port using these Vault-generated certificates after initial 
+bootstrapping. Because of this, the cluster traffic can NOT be terminated at the 
 cluster port at a load balancer level.
 
 ## Tutorial
 
 Refer to the following tutorials replication setup and best practices:
 
-- [Setting up Performance Replication](/vault/tutorials/enterprise/performance-replication)
-- [Disaster Recovery Replication Setup](/vault/tutorials/enterprise/disaster-recovery)
-- [Performance Replication with Paths Filters](/vault/tutorials/enterprise/paths-filter)
-- [Monitoring Vault Replication](/vault/tutorials/monitoring/monitor-replication)
+- [Setting up Performance Replication](https://learn.hashicorp.com/vault/operations/ops-replication)
+- [Disaster Recovery Replication Setup](https://learn.hashicorp.com/vault/operations/ops-disaster-recovery)
+- [Performance Replication with Paths Filters](https://learn.hashicorp.com/tutorials/vault/paths-filter)
+- [Monitoring Vault Replication](https://learn.hashicorp.com/vault/operations/monitor-replication)
 
 ## API
 
 The Vault replication component has a full HTTP API. Please see the
-[Vault Replication API](/vault/api-docs/system/replication) for more
+[Vault Replication API](/api-docs/system/replication) for more
 details.
diff --git a/website/content/docs/enterprise/sealwrap.mdx b/website/content/docs/enterprise/sealwrap.mdx
index 762b12424cef4..eb47303ce5d04 100644
--- a/website/content/docs/enterprise/sealwrap.mdx
+++ b/website/content/docs/enterprise/sealwrap.mdx
@@ -11,7 +11,7 @@ description: |-
 -> **Note**: This feature requires [Vault Enterprise Plus](https://www.hashicorp.com/products/vault/).
 
 Vault Enterprise features a mechanism to wrap values with an extra layer of
-encryption for supporting [seals](/vault/docs/configuration/seal). This adds an
+encryption for supporting [seals](/docs/configuration/seal). This adds an
 extra layer of protection and is useful in some compliance and regulatory
 environments, including FIPS 140-2 environments.
 
@@ -80,20 +80,20 @@ Seal Wrapping does incur some performance overhead.
 
 Some examples of places where seal wrapping is used include:
 
-- The [LDAP](/vault/docs/auth/ldap), [RADIUS](/vault/docs/auth/radius),
-  [Okta](/vault/docs/auth/okta), and [AWS](/vault/docs/auth/aws) auth methods,
+- The [LDAP](/docs/auth/ldap), [RADIUS](/docs/auth/radius),
+  [Okta](/docs/auth/okta), and [AWS](/docs/auth/aws) auth methods,
   for storing their config.
-- [PKI](/vault/docs/secrets/pki) for storing the issuers and their keys,
-- [SSH](/vault/docs/secrets/ssh) for storing the CA's keys,
-- [KMIP](/vault/docs/secrets/kmip) for storing managed objects (externally-provided
+- [PKI](/docs/secrets/pki) for storing the issuers and their keys,
+- [SSH](/docs/secrets/ssh) for storing the CA's keys,
+- [KMIP](/docs/secrets/kmip) for storing managed objects (externally-provided
   keys) and its CA keys.
-- [Transit](/vault/docs/secrets/transit) for storing keys and their policy.
+- [Transit](/docs/secrets/transit) for storing keys and their policy.
 
 ## FIPS Status
 
-See the [FIPS-specific Seal Wrap documentation](/vault/docs/enterprise/fips/sealwrap)
+See the [FIPS-specific Seal Wrap documentation](/docs/enterprise/fips/sealwrap)
 for more information about using Seal Wrapping to achieve FIPS 140-2 compliance.
-Note that there are additional [FIPS considerations](/vault/docs/enterprise/sealwrap#seal-wrap-and-replication)
+Note that there are additional [FIPS considerations](/docs/enterprise/sealwrap#seal-wrap-and-replication)
 regarding Seal Wrap usage and Vault Replication.
 
-[configuration]: /vault/docs/configuration
+[configuration]: /docs/configuration
diff --git a/website/content/docs/enterprise/sentinel/index.mdx b/website/content/docs/enterprise/sentinel/index.mdx
index ebc2ecc1bef3f..bf621b7f97225 100644
--- a/website/content/docs/enterprise/sentinel/index.mdx
+++ b/website/content/docs/enterprise/sentinel/index.mdx
@@ -19,7 +19,7 @@ the form of multiple types of policies and a fixed evaluation order.
 Vault's policy system has been expanded to support three types of policies:
 
 - `ACLs` - These are the [traditional Vault
-  policies](/vault/docs/concepts/policies) and remain unchanged.
+  policies](/docs/concepts/policies) and remain unchanged.
 
 - `Role Governing Policies (RGPs)` - RGPs are Sentinel policies that are tied
   to particular tokens, Identity entities, or Identity groups. They have access
@@ -35,7 +35,7 @@ to root token generation cannot support EGPs because it's already the mechanism
 of last resort if, for instance, all clients are locked out of Vault due to
 misconfigured EGPs.
 
-Like with ACLs, [root tokens](/vault/docs/concepts/tokens#root-tokens)
+Like with ACLs, [root tokens](/docs/concepts/tokens#root-tokens)
 are not subject to Sentinel policy checks.
 
 Sentinel execution should be considered to be significantly slower than normal
@@ -71,7 +71,7 @@ logged as warnings in Vault's server logs.
 ## MFA
 
 Sentinel policies support the [Identity-based MFA
-system](/vault/docs/enterprise/mfa) in Vault Enterprise. Within a single
+system](/docs/enterprise/mfa) in Vault Enterprise. Within a single
 request, multiple checks of any named MFA method will only trigger
 authentication behavior for that method once, regardless of whether its
 validity is checked via ACLs, RGPs, or EGPs.
@@ -89,7 +89,7 @@ able to glean from the original request alone.
 
 Sentinel policies can be configured via the `sys/policies/rgp/` and
 `sys/policies/egp/` endpoints; see [the
-documentation](/vault/api-docs/system/policies) for more information.
+documentation](/api-docs/system/policies) for more information.
 
 Once set, RGPs can be assigned to Identity entities and groups or to tokens
 just like ACL policies. As a result, they cannot share names with ACL policies.
@@ -105,12 +105,12 @@ effect on all requests.
 
 ## Properties and Examples
 
-See the [Examples](/vault/docs/enterprise/sentinel/examples) page for examples
+See the [Examples](/docs/enterprise/sentinel/examples) page for examples
 of Sentinel in action, and the
-[Properties](/vault/docs/enterprise/sentinel/properties) page for detailed
+[Properties](/docs/enterprise/sentinel/properties) page for detailed
 property documentation.
 
 ## Tutorial
 
-Refer to the [Sentinel Policies](/vault/tutorials/policies/sentinel)
+Refer to the [Sentinel Policies](https://learn.hashicorp.com/vault/identity-access-management/iam-sentinel)
 tutorial to learn how to author Sentinel policies in Vault.
diff --git a/website/content/docs/faq/ssct.mdx b/website/content/docs/faq/ssct.mdx
index a4da089d7342f..69efb83b31f1d 100644
--- a/website/content/docs/faq/ssct.mdx
+++ b/website/content/docs/faq/ssct.mdx
@@ -23,11 +23,11 @@ This FAQ section contains frequently asked questions about the Server Side Consi
 
 ~> **Note**: This features requires Vault Enterprise.
 
-Vault has an [eventual consistency](/vault/docs/enterprise/consistency) model where only the leader can write to Vault's storage. When using performance standbys with Integrated Storage, there are sequences of operations that don't always yield read-after-write consistency, which may pose a challenge for some use cases.
+Vault has an [eventual consistency](/docs/enterprise/consistency) model where only the leader can write to Vault's storage. When using performance standbys with Integrated Storage, there are sequences of operations that don't always yield read-after-write consistency, which may pose a challenge for some use cases.
 
 Several client-based mitigations were added in Vault version 1.7, which depended on some modifications to clients (provide the appropriate response header per request) so they can specify state. This may not be possible to do in some environments.
 
-To help with such cases, we’ve now added support for the Server Side Consistent Tokens feature in Vault version 1.10. See [Replication](/vault/docs/configuration/replication), [Vault Eventual Consistency](/vault/docs/enterprise/consistency), and [Upgrade to 1.10](/vault/docs/upgrading/upgrade-to-1.10.x).
+To help with such cases, we’ve now added support for the Server Side Consistent Tokens feature in Vault version 1.10. See [Replication](/docs/configuration/replication), [Vault Eventual Consistency](/docs/enterprise/consistency), and [Upgrade to 1.10](/docs/upgrading/upgrade-to-1.10.x).
 This feature provides a way for Service tokens, returned from logins (or token create requests), to have the relevant minimum WAL state information embedded within the token itself. Clients can then use this token to authenticate subsequent requests. Thus, clients can obtain read-after-write consistency for the token without typically having to make changes to their code or architecture.
 If a performance standby does not have the state required to authenticate the token, it returns a 412 error to allow the client to retry. If client retry is not possible, there is a server config to allow for the consistency.
 
@@ -39,7 +39,7 @@ For the sake of standardization between OSS and Enterprise, and due to the value
 
 Server Side Consistent Tokens introduces the following key changes:
 
-- Token length : Server side consistent tokens are longer, being 95+ characters as opposed to 27+ characters. Since the token can be subject to change (see [Token](/vault/docs/concepts/tokens)), we recommend that you plan for a maximum length of 255 bytes to future proof yourself if you have workflows that rely on the token size.
+- Token length : Server side consistent tokens are longer, being 95+ characters as opposed to 27+ characters. Since the token can be subject to change (see [Token](/docs/concepts/tokens)), we recommend that you plan for a maximum length of 255 bytes to future proof yourself if you have workflows that rely on the token size.
 - By default, Vault 1.10 will use the new token prefixes and new token format.
 - Tokens don't visibly have a ".namespaceID" suffix
 - Token prefix: Token prefixes are being changed as follows:
@@ -78,7 +78,7 @@ Yes, there are several considerations to keep in mind, and possibly things that
 
 - As stated earlier, if a performance standby does not have the state required to authenticate the token, it returns a 412 error allowing the client to retry.
 - Ensure that your clients can retry for the best experience.
-- Starting with Go api version [1.1.0](https://pkg.go.dev/github.com/hashicorp/vault/api@v1.1.0), the Go client library enables automatic retries for 412 errors. By default, retries=2, or use client method [SetMaxRetries](https://pkg.go.dev/github.com/hashicorp/vault/api#Client.SetMaxRetries). Or, you can use the Vault environment variable [VAULT_MAX_RETRIES](/vault/docs/commands#vault_max_retries) to achieve the same result.
+- Starting with Go api version [1.1.0](https://pkg.go.dev/github.com/hashicorp/vault/api@v1.1.0), the Go client library enables automatic retries for 412 errors. By default, retries=2, or use client method [SetMaxRetries](https://pkg.go.dev/github.com/hashicorp/vault/api#Client.SetMaxRetries). Or, you can use the Vault environment variable [VAULT_MAX_RETRIES](/docs/commands#vault_max_retries) to achieve the same result.
 - If you use a client library other than Go, you may still need to ensure that your client can handle 412 retries in order to achieve consistency.
 - If your client cannot retry, you can use the Vault server replication configuration `allow_forwarding_via_token`  to allow for consistency. As stated earlier, this will incur extra load on the server due to forwarding of requests that don't have the up-to-date WAL-state to the server:
 
@@ -88,21 +88,21 @@ replication {
 }
 ```
 
-~> **Note:** If you are generating root tokens or recovery tokens without using the Vault CLI, you will need to modify the OTP length used. refer [here](/vault/docs/upgrading/upgrade-to-1.10.x) for details.
+~> **Note:** If you are generating root tokens or recovery tokens without using the Vault CLI, you will need to modify the OTP length used. refer [here](/docs/upgrading/upgrade-to-1.10.x) for details.
 
 ### Q: What do I need to be paying attention to if I rely on tokens for some of my workflows?
 
-Our documentation on [tokens](/vault/docs/concepts/tokens) clearly identifies that the token body itself is subject to change between versions and should not be relied on. We strongly recommend that you consider this while architecting your environment.
+Our documentation on [tokens](/docs/concepts/tokens) clearly identifies that the token body itself is subject to change between versions and should not be relied on. We strongly recommend that you consider this while architecting your environment.
 
-However, if you use scripting and tooling to help in the authentication process for Vault-dependent applications, it is important that you take time to understand the changes (see [Replication](/vault/docs/configuration/replication), [Vault Eventual Consistency](/vault/docs/enterprise/consistency), and [Upgrade to 1.10](/vault/docs/upgrading/upgrade-to-1.10.x)), and test these changes in your specific dev environments before deploying this in production.
+However, if you use scripting and tooling to help in the authentication process for Vault-dependent applications, it is important that you take time to understand the changes (see [Replication](/docs/configuration/replication), [Vault Eventual Consistency](/docs/enterprise/consistency), and [Upgrade to 1.10](/docs/upgrading/upgrade-to-1.10.x)), and test these changes in your specific dev environments before deploying this in production.
 
-If your workflow used the embedded NamespaceID suffix, you will need to perform a [token lookup](/vault/docs/commands/token/lookup) because this is currently absent in the new tokens.
+If your workflow used the embedded NamespaceID suffix, you will need to perform a [token lookup](/docs/commands/token/lookup) because this is currently absent in the new tokens.
 
 ### Q: What are the main mitigation options that Vault offers to achieve consistency, and what are the differences between them?
 
 Vault offers the following options to achieve consistency:
 
-- [Client based mitigations](/vault/docs/enterprise/consistency#vault-1-7-mitigations), which was added in Vault Release 1.7, depend on some modifications to clients to include per request header options to ‘always forward the request to the active node’ OR to ‘conditionally forward the request to the active node’ if it would otherwise result in a stale read OR to ‘fail requests’ with error 412 if they might result in a stale read.
+- [Client based mitigations](/docs/enterprise/consistency#vault-1-7-mitigations), which was added in Vault Release 1.7, depend on some modifications to clients to include per request header options to ‘always forward the request to the active node’ OR to ‘conditionally forward the request to the active node’ if it would otherwise result in a stale read OR to ‘fail requests’ with error 412 if they might result in a stale read.
 - The Vault Agent can also be leveraged for proxied requests to achieve consistency via the above mitigations without client modifications
 - Server Side Consistent Tokens, added in Vault version 1.10, provide a more implicit way to achieve consistency, but only addresses consistency for new tokens.
 
@@ -124,4 +124,4 @@ Finally, when speaking of performance implications above, there are two kinds th
 
 ### Q: Is this feature something I need with Consul Storage?
 
-Consul has a [default consistency model](/consul/api-docs/features/consistency) and this feature is not relevant with Consul storage.
+Consul has a [default consistency model](https://developer.hashicorp.com/consul/api-docs/features/consistency) and this feature is not relevant with Consul storage.
diff --git a/website/content/docs/get-started/developer-qs.mdx b/website/content/docs/get-started/developer-qs.mdx
index c969ca89aa000..b19a37bb9d618 100644
--- a/website/content/docs/get-started/developer-qs.mdx
+++ b/website/content/docs/get-started/developer-qs.mdx
@@ -15,21 +15,19 @@ The complete code samples for the steps below are available here:
 - [C#](https://github.com/hashicorp/vault-examples/blob/main/examples/_quick-start/dotnet/Example.cs)
 - [Python](https://github.com/hashicorp/vault-examples/blob/main/examples/_quick-start/python/example.py)
 - [Java (Spring)](https://github.com/hashicorp/vault-examples/blob/main/examples/_quick-start/java/Example.java)
-- [OpenAPI-based Go](https://github.com/hashicorp/vault-client-go/#getting-started)
-- [OpenAPI-based .NET](https://github.com/hashicorp/vault-client-dotnet/#getting-started)
 
 For an out-of-the-box runnable demo application showcasing these concepts and more, see the hello-vault repositories ([Go](https://github.com/hashicorp/hello-vault-go), [C#](https://github.com/hashicorp/hello-vault-dotnet) and [Java/Spring Boot](https://github.com/hashicorp/hello-vault-spring)).
 
 ## Prerequisites
 
-- [Docker](https://docs.docker.com/get-docker/) or a [local installation](/vault/tutorials/getting-started/getting-started-install) of the Vault binary
+- [Docker](https://docs.docker.com/get-docker/) or a [local installation](https://learn.hashicorp.com/tutorials/vault/getting-started-install?in=vault/getting-started) of the Vault binary
 - A development environment applicable to one of the languages in this quick start (currently **Go**, **Ruby**, **C#**, **Python**, **Java (Spring)**, and **Bash (curl)**)
 
 -> **Note**: Make sure you are using the [latest version](https://docs.docker.com/engine/release-notes/) of Docker. Older versions may not work. As of 1.12.0, the recommended version of Docker is 20.10.17 or higher.
 
 ## Step 1: Start Vault
 
-!> **Warning**: This in-memory “dev” server is useful for practicing with Vault locally for the first time, but is insecure and **should never be used in production**. For developers who need to manage their own production Vault installations, this [page](/vault/tutorials/operations/production-hardening) provides some guidance on how to make your setup more production-friendly.
+!> **Warning**: This in-memory “dev” server is useful for practicing with Vault locally for the first time, but is insecure and **should never be used in production**. For developers who need to manage their own production Vault installations, this [page](https://learn.hashicorp.com/tutorials/vault/production-hardening) provides some guidance on how to make your setup more production-friendly.
 
 Run the Vault server in a non-production "dev" mode in one of the following ways:
 
@@ -47,7 +45,7 @@ $ vault server -dev -dev-root-token-id="dev-only-token"
 
 The `-dev-root-token-id` flag for dev servers tells the Vault server to allow full root access to anyone who presents a token with the specified value (in this case "dev-only-token").
 
-!> **Warning**: The [root token](/vault/docs/concepts/tokens#root-tokens) is useful for development, but allows full access to all data and functionality of Vault, so it must be carefully guarded in production. Ideally, even an administrator of Vault would use their own token with limited privileges instead of the root token.
+!> **Warning**: The [root token](https://www.vaultproject.io/docs/concepts/tokens#root-tokens) is useful for development, but allows full access to all data and functionality of Vault, so it must be carefully guarded in production. Ideally, even an administrator of Vault would use their own token with limited privileges instead of the root token.
 
 Vault is now listening over HTTP on port **8200**. With all the setup out of the way, it's time to get coding!
 
@@ -59,7 +57,7 @@ Let's install the Vault client library for your language of choice.
 -> **Note**: Some of these libraries are currently community-maintained.
 
 <Tabs>
-<Tab heading="Go" group="go">
+<Tab heading="Go">
 
 [Go](https://pkg.go.dev/github.com/hashicorp/vault/api) (official) client library:
    
@@ -78,7 +76,7 @@ import vault "github.com/hashicorp/vault/api"
 </CodeBlockConfig>
 
 </Tab>
-<Tab heading="Ruby" group="ruby">
+<Tab heading="Ruby">
 
    
 [Ruby](https://github.com/hashicorp/vault-ruby) (official) client library:
@@ -98,7 +96,7 @@ require "vault"
 </CodeBlockConfig>
 
 </Tab>
-<Tab heading="C#" group="cs">
+<Tab heading="C#">
 
    
 [C#](https://github.com/rajanadar/VaultSharp) client library:
@@ -121,7 +119,7 @@ using VaultSharp.V1.Commons;
 </CodeBlockConfig>
 
 </Tab>
-<Tab heading="Python" group="python">
+<Tab heading="Python">
 
    
 [Python](https://github.com/hvac/hvac) client library:
@@ -141,7 +139,7 @@ import hvac
 </CodeBlockConfig>
 
 </Tab>
-<Tab heading="Java" group="java">
+<Tab heading="Java">
 
    
 [Java (Spring)](https://spring.io/projects/spring-vault) client library:
@@ -169,59 +167,6 @@ import org.springframework.vault.core.VaultTemplate;
 
 </CodeBlockConfig>
 
-</Tab>
-<Tab heading="OpenAPI Go (Beta)" group="openAPI-go">
-
-
-[OpenAPI Go](https://github.com/hashicorp/vault-client-go) (Beta) client library:
-
-```shell-session
-$ go get github.com/hashicorp/vault-client-go
-```
-
-Now, let's add the import statements for the client library to the top of the file.
-
-<CodeBlockConfig heading="import statements for client library" lineNumbers>
-
-```go
-import (
-	"github.com/hashicorp/vault-client-go"
-	"github.com/hashicorp/vault-client-go/schema"
-)
-```
-
-</CodeBlockConfig>
-
-
-</Tab>
-<Tab heading="OpenAPI .NET (Beta)" group="openAPI-dotnet">
-
-
-[OpenAPI .NET](https://github.com/hashicorp/vault-client-dotnet) (Beta) client library:
-
-Vault is a package available at [Hashicorp Nuget](https://www.nuget.org/profiles/hashicorp).
-
-
-```shell-session
-$ nuget install HashiCorp.Vault -Version "0.1.0-beta"
-```
-
-**Or:**
-
-```shell-session
-$ dotnet add package Hashicorp.Vault -version "0.1.0-beta" 
-```
-
-Now, let's add the import statements for the client library to the top of the file.
-
-<CodeBlockConfig heading="import statements for client library" lineNumbers>
-
-```cs
-using Vault;
-using Vault.Client;
-```
-
-</CodeBlockConfig>
 
 </Tab>
 </Tabs>
@@ -229,13 +174,12 @@ using Vault.Client;
 
 ## Step 3: Authenticate to Vault
 
-A variety of [authentication methods](/vault/docs/auth) can be used to prove your application's identity to the Vault server. To explore more secure authentication methods, such as via Kubernetes or your cloud provider, see the auth code snippets in the [vault-examples](https://github.com/hashicorp/vault-examples) repository.
+A variety of [authentication methods](/docs/auth) can be used to prove your application's identity to the Vault server. To explore more secure authentication methods, such as via Kubernetes or your cloud provider, see the auth code snippets in the [vault-examples](https://github.com/hashicorp/vault-examples) repository.
 
 To keep things simple for our example, we'll just use the root token created in **Step 1**.
 Paste the following code to initialize a new Vault client that will use token-based authentication for all its requests:
 
-<Tabs>
-<Tab heading="Go">
+<CodeTabs heading="initialize a new vault client">
 
 ```go
 config := vault.DefaultConfig()
@@ -250,9 +194,6 @@ if err != nil {
 client.SetToken("dev-only-token")
 ```
 
-</Tab>
-<Tab heading="Ruby" group="ruby">
-
 ```ruby
 Vault.configure do |config|
     config.address = "http://127.0.0.1:8200"
@@ -260,9 +201,6 @@ Vault.configure do |config|
 end
 ```
 
-</Tab>
-<Tab heading="C#" group="cs">
-
 ```cs
 IAuthMethodInfo authMethod = new TokenAuthMethodInfo(vaultToken: "dev-only-token");
 
@@ -271,9 +209,6 @@ VaultClientSettings("http://127.0.0.1:8200", authMethod);
 IVaultClient vaultClient = new VaultClient(vaultClientSettings);
 ```
 
-</Tab>
-<Tab heading="Python" group="python">
-
 ```Python
 client = hvac.Client(
     url='http://127.0.0.1:8200',
@@ -281,9 +216,6 @@ client = hvac.Client(
 )
 ```
 
-</Tab>
-<Tab heading="Java" group="java">
-
 ```Java
 VaultEndpoint vaultEndpoint = new VaultEndpoint();
 
@@ -297,43 +229,11 @@ VaultTemplate vaultTemplate = new VaultTemplate(
 );
 ```
 
-</Tab>
-<Tab heading="Bash" group="bash">
-
 ```shell-session
-$ export VAULT_TOKEN="dev-only-token"
+export VAULT_TOKEN="dev-only-token"
 ```
 
-</Tab>
-<Tab heading="OpenAPI Go (Beta)" group="openAPI-go">
-
-```go
-client, err := vault.New(
-   vault.WithAddress("http://127.0.0.1:8200"),
-   vault.WithRequestTimeout(30*time.Second),
-)
-if err != nil {
-   log.Fatal(err)
-}
-
-if err := client.SetToken("dev-only-token"); err != nil {
-   log.Fatal(err)
-}
-```
-
-</Tab>
-<Tab heading="OpenAPI .NET (Beta)" group="openAPI-dotnet">
-
-```cs
-string address = "http://127.0.0.1:8200";
-VaultConfiguration config = new VaultConfiguration(address);
-
-VaultClient vaultClient = new VaultClient(config);
-vaultClient.SetToken("dev-only-token");
-```
-
-</Tab>
-</Tabs>
+</CodeTabs>
 
 ## Step 4: Store a secret
 
@@ -341,8 +241,7 @@ Secrets are sensitive data like API keys and passwords that we shouldn’t be st
 
 We'll use the Vault client we just initialized to write a secret to Vault, like so:
 
-<Tabs>
-<Tab heading="Go">
+<CodeTabs heading="write a secret to vault">
 
 ```go
 secretData := map[string]interface{}{
@@ -358,9 +257,6 @@ if err != nil {
 fmt.Println("Secret written successfully.")
 ```
 
-</Tab>
-<Tab heading="Ruby" group="ruby">
-
 ```ruby
 secret_data = {data: {password: "Hashi123"}}
 Vault.logical.write("secret/data/my-secret-password", secret_data)
@@ -368,9 +264,6 @@ Vault.logical.write("secret/data/my-secret-password", secret_data)
 puts "Secret written successfully."
 ```
 
-</Tab>
-<Tab heading="C#" group="cs">
-
 ```cs
 var secretData = new Dictionary<string, object> { { "password", "Hashi123" } };
 vaultClient.V1.Secrets.KeyValue.V2.WriteSecretAsync(
@@ -382,9 +275,6 @@ vaultClient.V1.Secrets.KeyValue.V2.WriteSecretAsync(
 Console.WriteLine("Secret written successfully.");
 ```
 
-</Tab>
-<Tab heading="Python" group="python">
-
 ```Python
 create_response = client.secrets.kv.v2.create_or_update_secret(
     path='my-secret-password',
@@ -394,9 +284,6 @@ create_response = client.secrets.kv.v2.create_or_update_secret(
 print('Secret written successfully.')
 ```
 
-</Tab>
-<Tab heading="Java" group="java">
-
 ```Java
 Map<String, String> data = new HashMap<>();
 data.put("password", "Hashi123");
@@ -408,11 +295,8 @@ Versioned.Metadata createResponse = vaultTemplate
 System.out.println("Secret written successfully.");
 ```
 
-</Tab>
-<Tab heading="Bash" group="bash">
-
 ```shell-session
-$ curl \
+curl \
     --header "X-Vault-Token: $VAULT_TOKEN" \
     --header "Content-Type: application/json" \
     --request POST \
@@ -420,38 +304,9 @@ $ curl \
     http://127.0.0.1:8200/v1/secret/data/my-secret-password
 ```
 
-</Tab>
-<Tab heading="OpenAPI Go (Beta)" group="openAPI-go">
+</CodeTabs>
 
-```go
-_, err = client.Secrets.KVv2Write(context.Background(), "my-secret-password", schema.KVv2WriteRequest{
-   Data: map[string]any{
-      "password": "Hashi123",
-   },
-})
-if err != nil {
-   log.Fatal(err)
-}
-
-log.Println("Secret written successfully.")
-```
-
-</Tab>
-<Tab heading="OpenAPI .NET (Beta)" group="openAPI-dotnet">
-
-```cs
-var secretData = new Dictionary<string, string> { { "password", "Hashi123" } };
-
-// Write a secret
-var kvRequestData = new KVv2WriteRequest(secretData);
-
-vaultClient.Secrets.KVv2Write("my-secret-password", kvRequestData);
-```
-
-</Tab>
-</Tabs>
-
-A common way of storing secrets is as key-value pairs using the [KV secrets engine (v2)](/vault/docs/secrets/kv/kv-v2). In the code we've just added, `password` is the key in the key-value pair, and `Hashi123` is the value.
+A common way of storing secrets is as key-value pairs using the [KV secrets engine (v2)](/docs/secrets/kv/kv-v2). In the code we've just added, `password` is the key in the key-value pair, and `Hashi123` is the value.
 
 We also provided the path to our secret in Vault. We will reference this path in a moment when we learn how to retrieve our secret.
 
@@ -463,8 +318,7 @@ Now that we know how to write a secret, let's practice reading one.
 
 Underneath the line where you wrote a secret to Vault, let's add a few more lines, where we will be retrieving the secret and unpacking the value:
 
-<Tabs>
-<Tab heading="Go">
+<CodeTabs heading="read a secret">
 
 ```go
 secret, err := client.KVv2("secret").Get(context.Background(), "my-secret-password")
@@ -478,17 +332,11 @@ log.Fatalf("value type assertion failed: %T %#v", secret.Data["password"], secre
 }
 ```
 
-</Tab>
-<Tab heading="Ruby" group="ruby">
-
 ```ruby
 secret = Vault.logical.read("secret/data/my-secret-password")
 password = secret.data[:data][:password]
 ```
 
-</Tab>
-<Tab heading="C#" group="cs">
-
 ```cs
 Secret<SecretData> secret = vaultClient.V1.Secrets.KeyValue.V2.ReadSecretAsync(
     path: "/my-secret-password",
@@ -498,18 +346,12 @@ Secret<SecretData> secret = vaultClient.V1.Secrets.KeyValue.V2.ReadSecretAsync(
 var password = secret.Data.Data["password"];
 ```
 
-</Tab>
-<Tab heading="Python" group="python">
-
 ```Python
 read_response = client.secrets.kv.read_secret_version(path='my-secret-password')
 
 password = read_response['data']['data']['password']
 ```
 
-</Tab>
-<Tab heading="Java" group="java">
-
 ```Java
 Versioned<Map<String, Object>> readResponse = vaultTemplate
     .opsForVersionedKeyValue("secret")
@@ -521,42 +363,17 @@ if (readResponse != null && readResponse.hasData()) {
 }
 ```
 
-</Tab>
-<Tab heading="Bash" group="bash">
-
 ```shell-session
-$ curl \
+curl \
     --header "X-Vault-Token: $VAULT_TOKEN" \
     http://127.0.0.1:8200/v1/secret/data/my-secret-password > secrets.json
 ```
 
-</Tab>
-<Tab heading="OpenAPI Go (Beta)" group="openAPI-go">
-
-```go
-s, err := client.Secrets.KVv2Read(context.Background(), "my-secret-password")
-if err != nil {
-   log.Fatal(err)
-}
-
-log.Println("Secret retrieved:", s.Data)
-```
-
-</Tab>
-<Tab heading="OpenAPI .NET (Beta)" group="openAPI-dotnet">
-
-```cs
-VaultResponse<Object> resp = vaultClient.Secrets.KVv2Read("my-secret-password");
-Console.WriteLine(resp.Data);
-```
-
-</Tab>
-</Tabs>
+</CodeTabs>
 
 Last, confirm that the value we unpacked from the read response is correct:
 
-<Tabs>
-<Tab heading="Go">
+<CodeTabs heading="confirm value">
 
 ```go
 if value != "Hashi123" {
@@ -566,18 +383,12 @@ if value != "Hashi123" {
 fmt.Println("Access granted!")
 ```
 
-</Tab>
-<Tab heading="Ruby" group="ruby">
-
 ```ruby
 abort "Unexpected password" if password != "Hashi123"
 
 puts "Access granted!"
 ```
 
-</Tab>
-<Tab heading="C#" group="cs">
-
 ```cs
 if (password.ToString() != "Hashi123")
 {
@@ -587,9 +398,6 @@ if (password.ToString() != "Hashi123")
 Console.WriteLine("Access granted!");
 ```
 
-</Tab>
-<Tab heading="Python" group="python">
-
 ```Python
 if password != 'Hashi123':
     sys.exit('unexpected password')
@@ -597,9 +405,6 @@ if password != 'Hashi123':
 print('Access granted!')
 ```
 
-</Tab>
-<Tab heading="Java" group="java">
-
 ```Java
 if (!password.equals("Hashi123")) {
     throw new Exception("Unexpected password");
@@ -608,15 +413,10 @@ if (!password.equals("Hashi123")) {
 System.out.println("Access granted!");
 ```
 
-</Tab>
-<Tab heading="Bash" group="bash">
-
 ```shell-session
-$ cat secrets.json | jq '.data.data'
+    cat secrets.json | jq '.data.data'
 ```
-
-</Tab>
-</Tabs>
+</CodeTabs>
 
 If the secret was fetched successfully, you should see the `Access granted!` message after you run the code. If not, check to see if you provided the correct path to your secret.
 
@@ -628,4 +428,4 @@ For more secure examples of client authentication, see the auth snippets in the
 
 For a runnable demo app that demonstrates more features, for example, how to keep your connection to Vault alive and how to connect to a database using Vault's dynamic database credentials, see the sample application hello-vault ([Go](https://github.com/hashicorp/hello-vault-go), [C#](https://github.com/hashicorp/hello-vault-dotnet)).
 
-To learn how to integrate applications with Vault without needing to always change your application code, see the [Vault Agent](/vault/docs/agent) documentation.
+To learn how to integrate applications with Vault without needing to always change your application code, see the [Vault Agent](https://www.vaultproject.io/docs/agent) documentation.
diff --git a/website/content/docs/glossary.mdx b/website/content/docs/glossary.mdx
index 88e751a93d7eb..c189393c54ac2 100644
--- a/website/content/docs/glossary.mdx
+++ b/website/content/docs/glossary.mdx
@@ -53,7 +53,7 @@ policies. This token is passed via HTTP headers.
 ### Plugin
 
 Plugins are a feature of Vault that can be enabled, disabled, and customized to
-some degree. All Vault [auth methods](/vault/docs/auth) and [secrets engines](/vault/docs/secrets)
+some degree. All Vault [auth methods](/docs/auth) and [secrets engines](/docs/secrets)
 are considered plugins.
 
 #### Built-in Plugin
@@ -72,7 +72,7 @@ spawned.
 
 #### External Multiplexed Plugin
 
-An external plugin may make use of [plugin multiplexing](/vault/docs/plugins/plugin-architecture#plugin-multiplexing).
+An external plugin may make use of [plugin multiplexing](/docs/plugins/plugin-architecture#plugin-multiplexing).
 A multiplexed plugin allows a single plugin process to be used for multiple
 mounts of the same type.
 
diff --git a/website/content/docs/index.mdx b/website/content/docs/index.mdx
index c18e1198c417d..287db769014a2 100644
--- a/website/content/docs/index.mdx
+++ b/website/content/docs/index.mdx
@@ -7,4 +7,4 @@ description: |-
 
 # Documentation
 
-Welcome to the Vault documentation! This documentation is more of a reference guide for all available features and options of Vault. If you're just getting started with Vault, please start with the [introduction](/vault/docs/what-is-vault) instead, and work your way up to the [Getting Started](/vault/tutorials/getting-started/getting-started-install) guide.
+Welcome to the Vault documentation! This documentation is more of a reference guide for all available features and options of Vault. If you're just getting started with Vault, please start with the [introduction](/docs/what-is-vault) instead, and work your way up to the [Getting Started](https://learn.hashicorp.com/tutorials/vault/getting-started-install) guide.
diff --git a/website/content/docs/install.mdx b/website/content/docs/install.mdx
index 24f41c896776e..9e7946e8837f9 100644
--- a/website/content/docs/install.mdx
+++ b/website/content/docs/install.mdx
@@ -15,7 +15,7 @@ There are several options to install Vault:
 
 1. Install [from source](#compiling-from-source).
 
-1. [Helm for Kubernetes](/vault/docs/platform/k8s/helm)
+1. [Helm for Kubernetes](https://www.vaultproject.io/docs/platform/k8s/helm)
 
 
 ## Package Manager
@@ -27,7 +27,7 @@ install.
 
 ## Precompiled Binaries
 
-To install the precompiled binary, [download](/vault/downloads) the applicable
+To install the precompiled binary, [download](/downloads) the applicable
 package for your system. Vault is packaged as a zip file.
 
 Once the zip is downloaded, unzip the file into your designated directory. The `vault` binary
@@ -48,7 +48,7 @@ a copy of [`git`](https://www.git-scm.com/) in your `PATH`.
 
 Clone the Vault repository from GitHub into your `GOPATH`:
 
-```shell-session
+```shell
 $ mkdir -p $GOPATH/src/github.com/hashicorp && cd $_
 $ git clone https://github.com/hashicorp/vault.git
 $ cd vault
@@ -57,7 +57,7 @@ $ cd vault
 Bootstrap the project. This will download and compile libraries and tools needed
 to compile Vault:
 
-```shell-session
+```shell
 $ make bootstrap
 ```
 
@@ -65,7 +65,7 @@ Build Vault for your current system and put the binary in `./bin/` (relative to
 the git checkout). The `make dev` target is just a shortcut that builds `vault`
 for only your local build environment (no cross-compiled targets).
 
-```shell-session
+```shell
 $ make dev
 ```
 
@@ -79,13 +79,5 @@ on your `PATH` to avoid receiving an error that Vault is not found.
 $ vault -h
 ```
 
-## Tutorial
-
-Following tutorials provide some guidance on production cluster deployment: 
-
-- [Day One Preperation](/vault/tutorials/day-one-raft) 
-- [Recommended Patterns](/vault/tutorials/recommended-patterns)
-
-
-[learn-vault-install]: /vault/tutorials/getting-started/getting-started-install
-[learn-vault-dev-server]: /vault/tutorials/getting-started/getting-started-dev-server
+[learn-vault-install]: https://learn.hashicorp.com/vault/getting-started/install
+[learn-vault-dev-server]: https://learn.hashicorp.com/vault/getting-started/dev-server
diff --git a/website/content/docs/internals/architecture.mdx b/website/content/docs/internals/architecture.mdx
index 1abe2c7617aca..742384aadc16c 100644
--- a/website/content/docs/internals/architecture.mdx
+++ b/website/content/docs/internals/architecture.mdx
@@ -32,7 +32,7 @@ which is then used to decrypt the Vault's root key.
 
 ![Unseal keys](/img/vault-shamir-seal.png)
 
-Refer to the [Seal/Unseal](/vault/docs/concepts/seal#seal-unseal) documentation for
+Refer to the [Seal/Unseal](/docs/concepts/seal#seal-unseal) documentation for
 further details.
 
 The number of shares and the minimum number of shards required can both be specified.
@@ -43,7 +43,7 @@ Vault loads the configured audit devices, auth methods, and secrets
 engines.
 
 ~> **Note:** The default Vault configuration uses a Shamir seal; however, Vault can be [auto
-unsealed](/vault/docs/concepts/seal#auto-unseal) by a trusted cloud key management
+unsealed](/docs/concepts/seal#auto-unseal) by a trusted cloud key management
 system (KMS) or hardware security module (HSM) to increase security.
 
 The configuration of the audit devices, auth methods, and secrets engines are security sensitive and are stored in Vault. Users with permissions can modify them and cannot be specified outside of the barrier. By storing them in Vault, changes are protected by the ACL system and tracked by audit logs.
@@ -84,4 +84,4 @@ flow, the core performs specific background activities. Lease management is crit
 
 - To learn more about each components and sub-systems within Vault, select a topic from the left-navigation menu.
 - For in depth details, consult the code.
-- To get started with Vault, try out our [Getting Started](/vault/tutorials/getting-started) tutorial.
+- To get started with Vault, try out our [Getting Started](https://learn.hashicorp.com/collections/vault/getting-started) tutorial.
diff --git a/website/content/docs/internals/high-availability.mdx b/website/content/docs/internals/high-availability.mdx
index 7af93fcc9a165..45801a56b1577 100644
--- a/website/content/docs/internals/high-availability.mdx
+++ b/website/content/docs/internals/high-availability.mdx
@@ -51,8 +51,8 @@ network connectivity.
 
 Refer to the following tutorials to learn more.
 
-- [Vault with Integrated Storage Reference Architecture](/vault/tutorials/day-one-raft/raft-reference-architecture)
-- [Vault HA Cluster with Integrated Storage](/vault/tutorials/raft/raft-storage)
-- [Vault High Availability with Consul](/vault/tutorials/day-one-consul/ha-with-consul)
-- [Performance Standby Nodes](/vault/tutorials/enterprise/performance-standbys)
+- [Vault with Integrated Storage Reference Architecture](https://learn.hashicorp.com/tutorials/vault/raft-reference-architecture)
+- [Vault HA Cluster with Integrated Storage](https://learn.hashicorp.com/tutorials/vault/raft-storage)
+- [Vault High Availability with Consul](https://learn.hashicorp.com/tutorials/vault/ha-with-consul)
+- [Performance Standby Nodes](https://learn.hashicorp.com/tutorials/vault/performance-standbys)
 
diff --git a/website/content/docs/internals/integrated-storage.mdx b/website/content/docs/internals/integrated-storage.mdx
index 286e75c68bf8f..b124e760c3e0d 100644
--- a/website/content/docs/internals/integrated-storage.mdx
+++ b/website/content/docs/internals/integrated-storage.mdx
@@ -41,7 +41,7 @@ There are a few key terms to know when discussing Raft:
 
 - **Leader** - At any given time, the peer set elects a single node to be the leader.
 The leader is responsible for ingesting new log entries, replicating to followers,
-and managing when an entry is committed. The leader node is also the active Vault node and followers are standby nodes. Refer to the [High Availability](/vault/docs/internals/high-availability#design-overview) document for more information.
+and managing when an entry is committed. The leader node is also the active Vault node and followers are standby nodes. Refer to the [High Availability](/docs/internals/high-availability#design-overview) document for more information.
 
 - **Log** - An ordered sequence of entries (replicated log) to keep track of any cluster changes. The leader is responsible for _log replication_. When new data is written, for example, a new event creates a log entry. The leader then sends the new log entry to its followers. Any inconsistency within the replicated log entries will indicate an issue.
 
@@ -118,7 +118,7 @@ Thus, performance is bound by disk I/O and network latency.
 ### Raft in Vault
 
 When getting started, a single Vault server is
-[initialized](/vault/docs/commands/operator/init/#operator-init). At this point, the
+[initialized](/docs/commands/operator/init/#operator-init). At this point, the
 cluster is of size 1, which allows the node to self-elect as a leader. Once a
 leader is elected, other servers can be added to the peer set in a way that
 preserves consistency and safety.
@@ -138,11 +138,15 @@ forwarded to the leader.
 Similar to other storage backends, data that is written to the Raft log and FSM
 will be encrypted by Vault's barrier.
 
+Vault does not currently offer automated dead server cleanup. If you wish to
+decommission a node, or a node dies and must be replaced, the node must manually
+be removed from the cluster with the `remove peer` [command](/docs/commands/operator/raft#remove-peer).
+
 ### Quorum Management
 
 #### Autopilot
 
-An [Autopilot feature](/vault/docs/concepts/integrated-storage/autopilot) 
+An [Autopilot feature](https://www.vaultproject.io/docs/concepts/integrated-storage/autopilot) 
 is available since 1.7.x & later versions that include configurable parameters 
 for when a node is treated as healthy before it's considered an eligible voter in the 
 quorum list. Other features which may be enabled include the ability to remove nodes 
@@ -160,9 +164,9 @@ counted as voters before they are capable of voting.
 
 As of Vault 1.7, a dead server cleanup capability is available. With this feature 
 enabled, unhealthy nodes are automatically removed from the Raft cluster without 
-manual operator intervention. This is enabled via the [Autopilot API](/vault/api-docs/system/storage/raftautopilot).
+manual operator intervention. This is enabled via the [Autopilot API](/api-docs/system/storage/raftautopilot).
 If you wish to decommission a node manually, this can be done with the 
-`remove peer` [command](/vault/docs/commands/operator/raft#remove-peer).
+`remove peer` [command](/docs/commands/operator/raft#remove-peer).
 
 #### Without Autopilot
 
@@ -170,7 +174,7 @@ Older versions of Vault, 1.6.x & lower, as well as cases where Autopilot may be
 disabled or misconfigured, behave differently.
 
 In scenarios involving those when a node joins a Raft cluster, it attempts to 
-catch up with the rest of the nodes through the data that it's replicating from 
+catch up with the reset of the nodes through the data that it's replicating from 
 the leader. While in this initial synchronisation state, the node cannot 
 vote but is counted for the purposes of quorum. If a number of new nodes join 
 the cluster simultaneously or at similar times, and thereby exceeding the failure
@@ -246,7 +250,7 @@ in a failure scenario.
 
 ### Minimums & Scaling
 
-The [Vault Reference Architecture](/vault/tutorials/day-one-raft/raft-reference-architecture#recommended-architecture) 
+The [Vault Reference Architecture](https://learn.hashicorp.com/tutorials/vault/raft-reference-architecture#recommended-architecture) 
 recommends a 5 node cluster to ensure a minimum failure tolerance of at least 2.
 
 It is good practise, wherever possible, to retain a failure tolerance of 2 or 
diff --git a/website/content/docs/internals/limits.mdx b/website/content/docs/internals/limits.mdx
index 1f4550deacd9a..86c52edb087d5 100644
--- a/website/content/docs/internals/limits.mdx
+++ b/website/content/docs/internals/limits.mdx
@@ -24,11 +24,11 @@ by that backend.
 
 For the Consul storage backend, the default limit imposed by Consul is
 512 KiB. This may be configured via Consul’s
-[`kv_max_value_size`](/consul/docs/agent/config/config-files#kv_max_value_size) parameter, introduced in version 1.5.3.
+[`kv_max_value_size`](https://developer.hashicorp.com/consul/docs/agent/config/config-files#kv_max_value_size) parameter, introduced in version 1.5.3.
 
 For the integrated storage backend, the default limit (introduced in
 Vault 1.5.0) is 1 MiB. This may be configured via `max_entry_size` in
-the [storage stanza](/vault/docs/configuration/storage/raft#max_entry_size).
+the [storage stanza](/docs/configuration/storage/raft#max_entry_size).
 
 Many of the other limits within Vault derive from the maximum size of
 a storage entry, as described in the next sections. It is possible to
@@ -58,8 +58,8 @@ Specifying distinct per-mount options, or using long mount point paths, can
 increase the space required per mount.
 
 The number of mount points can be monitored by reading the
-[`sys/auth`](/vault/api-docs/system/auth) and
-[`sys/mounts`](/vault/api-docs/system/mounts) endpoints from the root namespace and
+[`sys/auth`](/api-docs/system/auth) and
+[`sys/mounts`](/api-docs/system/mounts) endpoints from the root namespace and
 similar sub-paths for namespaces respectively, like: `namespace1/sys/auth`,
 `namespace1/sys/mounts`, etc.
 
@@ -81,7 +81,7 @@ path element. 160 nested paths = 160 namespaces ranging from 40 bytes to
 6400 bytes.
 
 The number of namespaces can be monitored by querying
-[`sys/namespaces`](/vault/api-docs/system/namespaces).
+[`sys/namespaces`](/api-docs/system/namespaces).
 
 To estimate the number of namespaces that can be created, divide the mount
 point limit by the larger of the number of auth mounts per namespace
@@ -132,7 +132,7 @@ group has a large number of members.
 | Maximum number of groups (100 entities per group)                                        | ~22,000                  | ~50,000                            |
 | Maximum number of members in a group                                                     | ~11,500                  | ~23,000                            |
 
-The number of entities can be monitored using Vault's [telemetry](/vault/docs/internals/telemetry#token-identity-and-lease-metrics); see `vault.identity.num_entities` (total) or `vault.identity.entities.count` (by namespace).
+The number of entities can be monitored using Vault's [telemetry](/docs/internals/telemetry#token-identity-and-lease-metrics); see `vault.identity.num_entities` (total) or `vault.identity.entities.count` (by namespace).
 
 The cost of entity and group updates grows as the number of objects in
 each shard increases. This cost can be monitored via the
@@ -141,7 +141,7 @@ the `vault.identity.upsert_group_txn` metrics.
 
 Very large internal groups should be avoided (more than 1000 members),
 because the membership list in a group must reside in a single storage entry.
-Instead, consider using [external groups](/vault/docs/concepts/identity#external-vs-internal-groups) or split the group up into multiple sub-groups.
+Instead, consider using [external groups](/docs/concepts/identity#external-vs-internal-groups) or split the group up into multiple sub-groups.
 
 ### Token limits
 
@@ -175,7 +175,7 @@ policies attached to that token, to the entity, to any groups that the
 entity belongs to, and recursively to any groups that contain those groups.
 Very large numbers of policies are possible, but can cause Vault’s
 response time to increase. You can monitor the
-[`vault.core.fetch_acl_and_token`](/vault/docs/internals/telemetry#core-metrics)
+[`vault.core.fetch_acl_and_token`](/docs/internals/telemetry#core-metrics)
 metric to determine if the time required to assemble an access control list
 is becoming excessive.
 
@@ -229,18 +229,18 @@ This limit depends on the key size.
 ### Request size
 
 The maximum size of an HTTP request sent to Vault is limited by
-the `max_request_size` option in the [listener stanza](/vault/docs/configuration/listener/tcp). It defaults to 32 MiB. This value, minus the overhead of
+the `max_request_size` option in the [listener stanza](/docs/configuration/listener/tcp). It defaults to 32 MiB. This value, minus the overhead of
 the HTTP request itself, places an upper bound on any Transit operation,
 and on the maximum size of any key-value secrets.
 
 ### Request duration
 
 The maximum duration of a Vault operation is
-[`max_request_duration`](/vault/docs//configuration/listener/tcp), which defaults to
+[`max_request_duration`](/docs//configuration/listener/tcp), which defaults to
 90 seconds. If a particular secret engine takes longer than this to perform an
 operation on a remote service, the Vault client will see a failure.
 
-The environment variable [`VAULT_CLIENT_TIMEOUT`](/vault/docs/commands#vault_client_timeout) sets a client-side maximum duration as well,
+The environment variable [`VAULT_CLIENT_TIMEOUT`](https://www.vaultproject.io/docs/commands#vault_client_timeout) sets a client-side maximum duration as well,
 which is 60 seconds by default.
 
 ### Cluster and replication limits
@@ -263,8 +263,8 @@ maximum number of replicas has been exceeded.
 
 ### Lease limits
 
-A systemwide [maximum TTL](/vault/docs/configuration#max_lease_ttl), and a
-[maximum TTL per mount point](/vault/api-docs/system/mounts#max_lease_ttl-1) can be
+A systemwide [maximum TTL](/docs/configuration#max_lease_ttl), and a
+[maximum TTL per mount point](/api-docs/system/mounts#max_lease_ttl-1) can be
 configured.
 
 Although no technical maximum exists, high lease counts can cause
@@ -278,17 +278,17 @@ unexpired leases, or a large number of simultaneous expirations.
 | Maximum duration of lease or token | 768 hours by default      |
 
 The current number of unexpired leases can be monitored via the
-[`vault.expire.num_leases`](/vault/docs/internals/telemetry#token-identity-and-lease-metrics) metric.
+[`vault.expire.num_leases`](/docs/internals/telemetry#token-identity-and-lease-metrics) metric.
 
 ### Transform limits
 
 The Transform secret engine obeys the [FF3-1 minimum and maximum sizes
-on the length of an input](/vault/docs/secrets/transform#input-limits), which
+on the length of an input](/docs/secrets/transform#input-limits), which
 are a function of the alphabet size.
 
 ### External plugin limits
 
-The [plugin system](/vault/docs/plugins) launches a separate process
+The [plugin system](/docs/plugins) launches a separate process
 initiated by Vault that communicates over RPC. For each secret engine and auth
 method that's enabled as an external plugin, Vault will spawn a process on the
 host system. For the Database Secrets Engines, external database plugins will
diff --git a/website/content/docs/internals/replication.mdx b/website/content/docs/internals/replication.mdx
index b8b2d55677e40..933d8fb706f30 100644
--- a/website/content/docs/internals/replication.mdx
+++ b/website/content/docs/internals/replication.mdx
@@ -215,7 +215,7 @@ primary.
 version of Vault to an older version. When upgrading replicated clusters,
 ensure that upstream clusters are always on older version of Vault than
 downstream clusters. See
-[Upgrading Vault](/vault/docs/upgrading#replication-installations) for an example.
+[Upgrading Vault](/docs/upgrading#replication-installations) for an example.
 
 - **Read-After-Write Consistency**: All write requests are forwarded from
   secondaries to the primary cluster in order to avoid potential conflicts.
@@ -225,7 +225,7 @@ downstream clusters. See
   client making subsequent requests by stalling write requests until the write
   is replicated or a timeout is reached (2 seconds). If the timeout is reached,
   the client will receive a warning. Clients can also take steps to protect
-  against this, see [Consistency](/vault/docs/enterprise/consistency#mitigations).
+  against this, see [Consistency](/docs/enterprise/consistency#mitigations).
 
 - **Stale Reads**: Secondary clusters service reads based on their
   locally-replicated data. During normal operation updates from a primary are
diff --git a/website/content/docs/internals/rotation.mdx b/website/content/docs/internals/rotation.mdx
index 519b50b8be48f..c0de2a48053f0 100644
--- a/website/content/docs/internals/rotation.mdx
+++ b/website/content/docs/internals/rotation.mdx
@@ -9,7 +9,7 @@ description: Learn about the details of key rotation within Vault.
 Vault has multiple encryption keys that are used for various purposes. These keys support
 rotation so that they can be periodically changed or in response to a potential leak or
 compromise. It is useful to first understand the
-[high-level architecture](/vault/docs/internals/architecture) before learning about key rotation.
+[high-level architecture](/docs/internals/architecture) before learning about key rotation.
 
 As a review, Vault starts in a _sealed_ state. Vault is unsealed by providing the unseal keys.
 By default, Vault uses a technique known as [Shamir's secret sharing algorithm](https://en.wikipedia.org/wiki/Shamir's_Secret_Sharing)
diff --git a/website/content/docs/internals/security.mdx b/website/content/docs/internals/security.mdx
index e900e34a01ad2..a23565889ec22 100644
--- a/website/content/docs/internals/security.mdx
+++ b/website/content/docs/internals/security.mdx
@@ -75,12 +75,6 @@ The following are not considered part of the Vault threat model:
   credentials, they can access Vault with the level of privilege associated with this
   client.
 
-- Protecting against Vault administrators supplying vulnerable or malicious configuration
-  data. Any data provided as configuration values to Vault's administrative endpoints
-  (e.g. [secret engines](/vault/docs/secrets) configurations), or Vault's
-  configuration files should be validated. If an attacker can write to Vault's
-  configuration, then the confidentiality or integrity of data can be compromised.
-
 # External Threat Overview
 
 Vault architecture compromises of three distinct systems:
@@ -101,8 +95,8 @@ All server-to-server traffic between Vault instances within a cluster (i.e,
 high availability, enterprise replication or integrated storage) uses
 mutually-authenticated TLS to ensure the confidentiality and integrity of data
 in transit. Nodes are authenticated prior to joining the cluster by an
-[unseal challenge](/vault/docs/concepts/integrated-storage#vault-networking-recap) or
-a [one-time-use activation token](/vault/docs/enterprise/replication#security-model).
+[unseal challenge](/docs/concepts/integrated-storage#vault-networking-recap) or
+a [one-time-use activation token](/docs/enterprise/replication#security-model).
 
 The storage backends used by Vault are also untrusted by design. Vault uses a
 security barrier for all requests made to the backend. The security barrier
@@ -147,7 +141,7 @@ client), the highest access level permitted is used. For example, if the
 "ops" policy permits read access to the "ops/" path, then the user gets the
 union of those. Policy is matched using the most specific defined policy, which
 may be an exact match or the longest-prefix match glob pattern. See
-[Policy Syntax](/vault/docs/concepts/policies#policy-syntax) for more details.
+[Policy Syntax](/docs/concepts/policies#policy-syntax) for more details.
 
 Certain operations are only permitted by "root" users, which is a distinguished
 policy built into Vault. This is similar to the concept of a root user on a
diff --git a/website/content/docs/internals/telemetry.mdx b/website/content/docs/internals/telemetry.mdx
index 4a578886257aa..2785a42814162 100644
--- a/website/content/docs/internals/telemetry.mdx
+++ b/website/content/docs/internals/telemetry.mdx
@@ -93,9 +93,8 @@ These metrics represent operational aspects of the running Vault instance.
 | `vault.core.handle_login_request`                   | Duration of time taken by login requests handled by Vault core                                                                                                                                                                                                                                                                                                                                                                              | ms           | summary |
 | `vault.core.in_flight_requests`                     | Number of in-flight requests.                                                                                                                                                                                                                                                                                                                                                                                                               | requests     | gauge   |
 | `vault.core.leadership_setup_failed`                | Duration of time taken by cluster leadership setup failures which have occurred in a highly available Vault cluster. This should be monitored and alerted on for overall cluster leadership status.                                                                                                                                                                                                                                         | ms           | summary |
-| `vault.core.leadership_lost`                        | The total duration that a HA cluster node maintained leadership as reported at the last time of loss. If metric is present and has a count greater than zero, that means a leadership change has occurred. Continuing changes or reports of low value could be a cause for monitoring alerts as they would typically imply ongoing flapping of leadership that may rotate between nodes.                                                    | ms           | summary |
+| `vault.core.leadership_lost`                        | The total duration that a HA cluster node maintained leadership as reported at the last time of loss. Any count greater than zero means that a leadership change has occurred. Continuing changes or reports of low value could be a cause for monitoring alerts as they would typically imply ongoing flapping of leadership that may rotate between nodes.                                                                                | ms           | summary |
 | `vault.core.license.expiration_time_epoch`          | Time as epoch (seconds since Jan 1 1970) at which license will expire.                                                                                                                                                                                                                                                                                                                                                                      | seconds      | gauge   |
-| `vault.core.locked_users`                           | Number of locked users in Vault. This measurement is performed every 15 minutes.                                                                                                                                                                                                                                                                                                                                                            | locked users | gauge   |
 | `vault.core.mount_table.num_entries`                | Number of mounts in a particular mount table. This metric is labeled by table type (auth or logical) and whether or not the table is replicated (local or not)                                                                                                                                                                                                                                                                              | objects      | gauge   |
 | `vault.core.mount_table.size`                       | Size of a particular mount table. This metric is labeled by table type (auth or logical) and whether or not the table is replicated (local or not)                                                                                                                                                                                                                                                                                          | bytes        | gauge   |
 | `vault.core.post_unseal`                            | Duration of time taken by post-unseal operations handled by Vault core                                                                                                                                                                                                                                                                                                                                                                      | ms           | summary |
@@ -232,15 +231,14 @@ These metrics are emitted on standbys when talking to the active node, and in so
 
 ## Replication Metrics
 
-These metrics relate to [Vault Enterprise Replication](/vault/docs/enterprise/replication). The following metrics are not available in telemetry unless replication is in an unhealthy state: `replication.fetchRemoteKeys`, `replication.merkleDiff`, and `replication.merkleSync`.
+These metrics relate to [Vault Enterprise Replication](/docs/enterprise/replication). The following metrics are not available in telemetry unless replication is in an unhealthy state: `replication.fetchRemoteKeys`, `replication.merkleDiff`, and `replication.merkleSync`.
 
 | Metric                                                        | Description                                                                                                                                | Unit            | Type    |
-|:--------------------------------------------------------------|:-------------------------------------------------------------------------------------------------------------------------------------------| :-------------- | :------ |
+| :------------------------------------------------------------ | :----------------------------------------------------------------------------------------------------------------------------------------- | :-------------- | :------ |
 | `vault.core.replication.performance.primary`                  | Set to 1 if this is a performance primary, 0 if not                                                                                        | boolean         | gauge   |
 | `vault.core.replication.performance.secondary`                | Set to 1 if this is a performance secondary, 0 if not                                                                                      | boolean         | gauge   |
 | `vault.core.replication.dr.primary`                           | Set to 1 if this is a DR primary, 0 if not                                                                                                 | boolean         | gauge   |
 | `vault.core.replication.dr.secondary`                         | Set to 1 if this is a DR secondary, 0 if not                                                                                               | boolean         | gauge   |
-| `vault.core.replication.write_undo_logs`                      | Set to 1 if undo logs are enabled, 0 if not                                                                                                | boolean         | gauge   |
 | `vault.core.performance_standby`                              | Set to 1 if this is a performance standby, 0 if not                                                                                        | boolean         | gauge   |
 | `vault.logshipper.streamWALs.missing_guard`                   | Number of incidences where the starting Merkle Tree index used to begin streaming WAL entries is not matched/found                         | missing guards  | counter |
 | `vault.logshipper.streamWALs.guard_found`                     | Number of incidences where the starting Merkle Tree index used to begin streaming WAL entries is matched/found                             | found guards    | counter |
@@ -510,7 +508,7 @@ indicate flapping leadership.
 
 ## Integrated Storage (Raft) Automated Snapshots
 
-These metrics related to the Enterprise feature [Raft Automated Snapshots](/vault/docs/enterprise/automated-integrated-storage-snapshots).
+These metrics related to the Enterprise feature [Raft Automated Snapshots](/docs/enterprise/automated-integrated-storage-snapshots).
 
 | Metric                                      | Description                                                                                   | Unit       | Type    |
 | :------------------------------------------ | :-------------------------------------------------------------------------------------------- | :--------- | :------ |
@@ -539,48 +537,48 @@ These metrics related to the Enterprise feature [Raft Automated Snapshots](/vaul
 | `node_id`              | Unique identifier of a raft peer, same as peer_id.                                                                                                                                                                                                    | `node-1`                |
 | `snapshot_config_name` | For automated snapshots, the name of the configuration                                                                                                                                                                                                | `config1`               |
 
-[secrets-engines]: /vault/docs/secrets
+[secrets-engines]: /docs/secrets
 
-[storage-backends]: /vault/docs/configuration/storage
+[storage-backends]: /docs/configuration/storage
 
-[telemetry-stanza]: /vault/docs/configuration/telemetry
+[telemetry-stanza]: /docs/configuration/telemetry
 
-[cubbyhole-secrets-engine]: /vault/docs/secrets/cubbyhole
+[cubbyhole-secrets-engine]: /docs/secrets/cubbyhole
 
-[kv-secrets-engine]: /vault/docs/secrets/kv
+[kv-secrets-engine]: /docs/secrets/kv
 
-[ldap-auth-backend]: /vault/docs/auth/ldap
+[ldap-auth-backend]: /docs/auth/ldap
 
-[token-auth-backend]: /vault/docs/auth/token
+[token-auth-backend]: /docs/auth/token
 
-[azure-storage-backend]: /vault/docs/configuration/storage/azure
+[azure-storage-backend]: /docs/configuration/storage/azure
 
-[cassandra-storage-backend]: /vault/docs/configuration/storage/cassandra
+[cassandra-storage-backend]: /docs/configuration/storage/cassandra
 
-[cockroachdb-storage-backend]: /vault/docs/configuration/storage/cockroachdb
+[cockroachdb-storage-backend]: /docs/configuration/storage/cockroachdb
 
-[consul-storage-backend]: /vault/docs/configuration/storage/consul
+[consul-storage-backend]: /docs/configuration/storage/consul
 
-[couchdb-storage-backend]: /vault/docs/configuration/storage/couchdb
+[couchdb-storage-backend]: /docs/configuration/storage/couchdb
 
-[dynamodb-storage-backend]: /vault/docs/configuration/storage/dynamodb
+[dynamodb-storage-backend]: /docs/configuration/storage/dynamodb
 
-[etcd-storage-backend]: /vault/docs/configuration/storage/etcd
+[etcd-storage-backend]: /docs/configuration/storage/etcd
 
-[gcs-storage-backend]: /vault/docs/configuration/storage/google-cloud-storage
+[gcs-storage-backend]: /docs/configuration/storage/google-cloud-storage
 
-[spanner-storage-backend]: /vault/docs/configuration/storage/google-cloud-spanner
+[spanner-storage-backend]: /docs/configuration/storage/google-cloud-spanner
 
-[mssql-storage-backend]: /vault/docs/configuration/storage/mssql
+[mssql-storage-backend]: /docs/configuration/storage/mssql
 
-[mysql-storage-backend]: /vault/docs/configuration/storage/mysql
+[mysql-storage-backend]: /docs/configuration/storage/mysql
 
-[postgresql-storage-backend]: /vault/docs/configuration/storage/postgresql
+[postgresql-storage-backend]: /docs/configuration/storage/postgresql
 
-[s3-storage-backend]: /vault/docs/configuration/storage/s3
+[s3-storage-backend]: /docs/configuration/storage/s3
 
-[swift-storage-backend]: /vault/docs/configuration/storage/swift
+[swift-storage-backend]: /docs/configuration/storage/swift
 
-[zookeeper-storage-backend]: /vault/docs/configuration/storage/zookeeper
+[zookeeper-storage-backend]: /docs/configuration/storage/zookeeper
 
-[integrated-storage]: /vault/docs/configuration/storage/raft
+[integrated-storage]: /docs/configuration/storage/raft
diff --git a/website/content/docs/interoperability-matrix.mdx b/website/content/docs/interoperability-matrix.mdx
index 4f48c56741b2c..9788fb2ac4e64 100644
--- a/website/content/docs/interoperability-matrix.mdx
+++ b/website/content/docs/interoperability-matrix.mdx
@@ -6,7 +6,7 @@ description: Guide to viewing which partners Vault integrates with.
 
 # Vault Interoperability Matrix
 
-Vault integrates with various appliances, platforms and applications for different use cases. Below are two tables indicating the partner’s product that has been verified to work with Vault for [Auto Unsealing](/vault/docs/concepts/seal#auto-unseal) / [HSM Support](/vault/docs/enterprise/hsm) and [External Key Management](https://vaultproject.io/use-cases/key-management).
+Vault integrates with various appliances, platforms and applications for different use cases. Below are two tables indicating the partner’s product that has been verified to work with Vault for [Auto Unsealing](/docs/concepts/seal#auto-unseal) / [HSM Support](/docs/enterprise/hsm) and [External Key Management](/use-cases/key-management).
 
 Auto Unseal and HSM Support was developed to aid in reducing the operational complexity of keeping the unseal key secure. This feature delegates the responsibility of securing the unseal key from users to a trusted device or service. At startup Vault will connect to the device or service implementing the seal and ask it to decrypt the root key Vault read from storage.
 
@@ -45,7 +45,7 @@ The below table shows the partner product and if the partner’s technology work
 
 Partners who integrate with Vault to have Vault store and/or manage encryption keys with their products
 
-~> Note: HCP Vault Verified means that the integration has been verified to work with HCP Vault. All integrations have been verified with Vault self-managed.
+~> Note: HCP Vault Verified means that the integration has been verified to work with HCP Vault. All integrations have been verified with Vaut self-managed.
 
 <span style={{fontSize:'12px'}}>
 Vault Secrets Engine Key: K/V = <a href="/docs/secrets/kv">K/V secrets engine</a>; KMSE = <a href="/docs/secrets/key-management">Key Management Secrets Engine</a>; KMIP = <a href="/docs/secrets/kmip">KMIP Secrets Engine</a>; Transit = <a href="/docs/secrets/transit">Transit Secrets Engine</a>
@@ -90,4 +90,4 @@ Vault Secrets Engine Key: K/V = <a href="/docs/secrets/kv">K/V secrets engine</a
 
 Please reach out to [technologypartners@hashicorp.com](mailto:technologypartners@hashicorp.com) if there are any questions on the above tables. 
 
-Missing an integration? Join the [Vault Integration Program](/vault/docs/partnerships) and get the integration listed.
+Missing an integration? Join the [Vault Integration Program](/docs/partnerships) and get the integration listed.
diff --git a/website/content/docs/partnerships.mdx b/website/content/docs/partnerships.mdx
index 3c725c41c43ea..a0c8cd7329db2 100644
--- a/website/content/docs/partnerships.mdx
+++ b/website/content/docs/partnerships.mdx
@@ -18,7 +18,7 @@ Vault is an Identity-based security solution that leverages trusted sources of i
 
 There are two main types of integrations with Vault. The first is Runtime Integrations which use Vault as part of a workflow. Many partners have integrations that use existing Vault deployments to retrieve various types of secrets for use in a partner’s application or platform. The use cases can range from Vault storing and providing secrets, issuing or managing PKI certificates or acting as an external key management system.
 
-The second type is where a partner develops a custom plugin. Vault has a secure [plugin](/vault/docs/plugins) architecture. Vault’s plugins are completely separate, standalone applications that Vault executes and communicates with over RPC.
+The second type is where a partner develops a custom plugin. Vault has a secure [plugin](/docs/plugins) architecture. Vault’s plugins are completely separate, standalone applications that Vault executes and communicates with over RPC.
 
 Plugins can be broken into two categories, Secrets Engines and Auth Methods. They can be built-in and bundled with the Vault binary, or be external that has to be manually registered. Built-in plugins are developed by HashiCorp, while external plugins can be developed by HashiCorp, technology partners, or the community. There is a curated collection of all plugins, both built-in and external, located on the [Vault Integrations](/vault/integrations) page.
 
@@ -28,7 +28,7 @@ The diagram below depicts the key Vault integration categories and types.
 
 Main Vault categories for partners to integrate with include:
 
-**Authentication Methods**: Authentication (or Auth) methods are plugin components in Vault that perform authentication and are responsible for assigning identity along with a set of policies to a user. Vault supports multiple auth methods/identity models and partners can build a plugin that allows Vault to authenticate against the partners’ platform. You can find more information about Vault Auth Methods [here](/vault/docs/auth/).
+**Authentication Methods**: Authentication (or Auth) methods are plugin components in Vault that perform authentication and are responsible for assigning identity along with a set of policies to a user. Vault supports multiple auth methods/identity models and partners can build a plugin that allows Vault to authenticate against the partners’ platform. You can find more information about Vault Auth Methods [here](/docs/auth/).
 
 **Runtime Integrations**: These types of integrations include integrations developed by partners that work with existing deployments of Vault and the partner’s product as part of the customer's identity/security workflow.
 
@@ -36,23 +36,23 @@ Oftentimes these integrations involve modifying a partner’s product to become
 1. How is the application going to authenticate itself to Vault?
 1. Support of Namespaces
 
-There are many ways for an application to authenticate itself to Vault (see [Auth Methods](/vault/docs/auth/)), but we recommend partners use one of the following methods: [AppRole](/vault/docs/auth/approle), [JWT / OIDC](/vault/docs/auth/jwt), [TLS Certificates](/vault/docs/auth/cert) or [Username / Password](/vault/docs/auth/userpass). For an integration to be verified as production ready by HashiCorp, there needs to be at least one other Auth method supported besides [Token](/vault/docs/auth/token). Token is not recommended for use in production since it involves creating a manual long lived token (which is against best practice and poses a security risk). Using one of the above mentioned auth methods automatically creates short lived tokens and eliminates the need to manually generate a new token on a regular basis.
+There are many ways for an application to authenticate itself to Vault (see [Auth Methods](/docs/auth/)), but we recommend partners use one of the following methods: [AppRole](/docs/auth/approle), [JWT / OIDC](/docs/auth/jwt), [TLS Certificates](/docs/auth/cert) or [Username / Password](/docs/auth/userpass). For an integration to be verified as production ready by HashiCorp, there needs to be at least one other Auth method supported besides [Token](/docs/auth/token). Token is not recommended for use in production since it involves creating a manual long lived token (which is against best practice and poses a security risk). Using one of the above mentioned auth methods automatically creates short lived tokens and eliminates the need to manually generate a new token on a regular basis.
 
-As the number of customers using Vault Enterprise increases, partners are encouraged to support [Namespaces](/vault/tutorials/enterprise/namespaces). By supporting Namespaces, there is an additional benefit that an integration should be able to work with HCP Vault.
+As the number of customers using Vault Enterprise increases, partners are encouraged to support [Namespaces](https://learn.hashicorp.com/tutorials/vault/namespaces). By supporting Namespaces, there is an additional benefit that an integration should be able to work with HCP Vault.
 
-HSM (Hardware Security Module) are specific types of runtime integrations and can be configured to work with new or existing Vault deployments. They provide an added level of security and compliance. The HSM communicates with Vault using the PKCS#11 protocol thereby resulting in the integration to primarily involve verification of the operation of the functionality. You can find more information about Vault’s HSM support [here](/vault/docs/enterprise/hsm). A list of HSMs that have been verified to work with Vault is shown in our [interoperability matrix](/vault/docs/interoperability-matrix).
+HSM (Hardware Security Module) are specific types of runtime integrations and can be configured to work with new or existing Vault deployments. They provide an added level of security and compliance. The HSM communicates with Vault using the PKCS#11 protocol thereby resulting in the integration to primarily involve verification of the operation of the functionality. You can find more information about Vault’s HSM support [here](/docs/enterprise/hsm). A list of HSMs that have been verified to work with Vault is shown in our [interoperability matrix](/docs/interoperability-matrix).
 
-**Audit/Monitoring & Compliance**: Audit/Monitoring and Compliance are components in Vault that keep a detailed log of all requests and responses to Vault. Because every operation with Vault is an API request/response, the audit log contains every authenticated interaction with Vault, including errors. Vault supports multiple audit devices to support your business use case. You can find more information about Vault Audit Devices [here](/vault/docs/audit/).
+**Audit/Monitoring & Compliance**: Audit/Monitoring and Compliance are components in Vault that keep a detailed log of all requests and responses to Vault. Because every operation with Vault is an API request/response, the audit log contains every authenticated interaction with Vault, including errors. Vault supports multiple audit devices to support your business use case. You can find more information about Vault Audit Devices [here](/docs/audit/).
 
-**Secrets Engines**: Secrets engines are plugin components which store, generate, or encrypt data. Secrets engines are provided with some set of data, that take some action on that data, and then return a result. Some secrets engines store and read data, like encrypted in-memory data structure, other secrets engines connect to other services. Examples of Secrets Engines include identity modules of Cloud providers like AWS, Azure IAM models, Cloud (LDAP), database or certificate management. You can find more information about Vault Secrets Engines [here](/vault/docs/secrets/).
+**Secrets Engines**: Secrets engines are plugin components which store, generate, or encrypt data. Secrets engines are provided with some set of data, that take some action on that data, and then return a result. Some secrets engines store and read data, like encrypted in-memory data structure, other secrets engines connect to other services. Examples of Secrets Engines include identity modules of Cloud providers like AWS, Azure IAM models, Cloud (LDAP), database or certificate management. You can find more information about Vault Secrets Engines [here](/docs/secrets/).
 
--> **Note:** Integrations related Vault’s [storage](/vault/docs/concepts/storage) backend, [auto auth](/vault/docs/agent-and-proxy/autoauth), and [auto unseal](/vault/docs/concepts/seal#auto-unseal) functionality are not encouraged. Please reach out to [technologypartners@hashicorp.com](mailto:technologypartners@hashicorp.com) for any questions related to this.
+-> **Note:** Integrations related Vault’s [storage](/docs/concepts/storage) backend, [auto auth](/docs/agent/autoauth), and [auto unseal](/docs/concepts/seal#auto-unseal) functionality are not encouraged. Please reach out to [technologypartners@hashicorp.com](mailto:technologypartners@hashicorp.com) for any questions related to this.
 
 ### HCP Vault
 
 HCP Vault is a managed version of Vault which is operated by HashiCorp to allow customers to quickly get up and running. HCP Vault uses the same binary as self-managed Vault Enterprise, and offers a consistent user experience. You can use the same Vault clients to communicate with HCP Vault as you use to communicate with Vault. Most runtime integrations can be verified with HCP Vault.
 
-Sign up for HCP Vault [here](https://portal.cloud.hashicorp.com/) and check out [this](/vault/tutorials/cloud) learn guide for quickly getting started.
+Sign up for HCP Vault [here](https://portal.cloud.hashicorp.com/) and check out [this](https://learn.hashicorp.com/collections/vault/cloud) learn guide for quickly getting started.
 
 ### Vault Integration Badges
 
@@ -98,7 +98,7 @@ While not mandatory, HashiCorp encourages partners to sign an MNDA (Mutual Non-D
 
 In an effort to support our self-serve model, we’ve included links to resources, documentation, examples and best practices to guide you through the Vault integration development and testing process.
 
-- [Vault Tutorial and Learn Site](/vault/tutorials)
+- [Vault Tutorial and Learn Site](https://learn.hashicorp.com/vault)
 - Sample development implemented by a [partner](https://www.hashicorp.com/integrations/venafi/vault/)
 - Example runtime integrations for reference: [F5](https://www.hashicorp.com/integrations/f5/vault), [ServiceNow](https://www.hashicorp.com/integrations/servicenow/vault)
 - [Vault Community Forum](https://discuss.hashicorp.com/c/vault)
@@ -107,46 +107,46 @@ We encourage partners to closely follow the above guidance. Adopting the same st
 
 ### 3. Develop and Test
 
-For our partners who are building runtime integrations with Vault, we encourage them to support multiple [authentication](/vault/docs/auth) methods (e.g. Approle, JWT, K8s) besides tokens. Additionally we encourage them to add as much flexibility when specifying paths for secrets engines. For our partners who want to build a plugin, the only knowledge necessary to write a plugin is basic command-line skills and knowledge of the Go programming language. When writing in Go-Language, HashiCorp has found the integration development process to be straightforward and simple when partners pay close attention and follow the resources by adopting the same structure and coding patterns to help expedite the review and release cycles.
+For our partners who are building runtime integrations with Vault, we encourage them to support multiple [authentication](/docs/auth) methods (e.g. Approle, JWT, K8s) besides tokens. Additionally we encourage them to add as much flexibility when specifying paths for secrets engines. For our partners who want to build a plugin, the only knowledge necessary to write a plugin is basic command-line skills and knowledge of the Go programming language. When writing in Go-Language, HashiCorp has found the integration development process to be straightforward and simple when partners pay close attention and follow the resources by adopting the same structure and coding patterns to help expedite the review and release cycles.
 
 Please remember that all integrations should have the appropriate documentation to assist Vault users in configuring the integrations.
 
 **Auth Methods**
 
-- [Auth Methods documentation](/vault/docs/auth)
+- [Auth Methods documentation](/docs/auth)
 - [Example of how to build, install, and maintain auth method plugins plugin](https://www.hashicorp.com/blog/building-a-vault-secure-plugin)
 - [Sample plugin code](https://github.com/hashicorp/vault-auth-plugin-example)
 
 **Runtime Integration**
 
-- [Vault Tutorial and Learn Site](/vault/tutorials)
-- [Auth Methods documentation](/vault/docs/auth)
-- [HSM documentation](/vault/docs/enterprise/hsm)
-- [HSM Configuration information](/vault/docs/configuration/seal/pkcs11)
+- [Vault Tutorial and Learn Site](https://learn.hashicorp.com/vault)
+- [Auth Methods documentation](/docs/auth)
+- [HSM documentation](/docs/enterprise/hsm)
+- [HSM Configuration information](/docs/configuration/seal/pkcs11)
 
 **Audit, Monitoring & Compliance Integration**
 
-- [Audit devices documentation](/vault/docs/audit)
+- [Audit devices documentation](/docs/audit)
 
 **Secrets Engine Integration**
 
-- [Secret engine documentation](/vault/docs/secrets)
-- [Custom Secrets Engines | Vault - HashiCorp Learn](/vault/tutorials/custom-secrets-engine)
+- [Secret engine documentation](/docs/secrets)
+- [Custom Secrets Engines | Vault - HashiCorp Learn](https://learn.hashicorp.com/collections/vault/custom-secrets-engine)
 
 **HCP Vault**
 
-The process to spin up a testing instance of HCP Vault is very [straightforward](/vault/tutorials/cloud/get-started-vault). HCP has been designed as a turn-key managed service so configuration is minimal. Furthermore, HashiCorp provides all new users an initial credit which lasts for a couple of months when using the [development](https://cloud.hashicorp.com/products/vault/pricing) cluster. Used in conjunction with AWS free tier resources, there should be no cost beyond the time spent by the designated tester.
+The process to spin up a testing instance of HCP Vault is very [straightforward](https://learn.hashicorp.com/tutorials/cloud/get-started-vault). HCP has been designed as a turn-key managed service so configuration is minimal. Furthermore, HashiCorp provides all new users an initial credit which lasts for a couple of months when using the [development](https://cloud.hashicorp.com/products/vault/pricing) cluster. Used in conjunction with AWS free tier resources, there should be no cost beyond the time spent by the designated tester.
 
 There are a couple of items to consider when determining if the integration will work with HCP Vault.
 
-- Since HCP Vault is running Vault Enterprise, the integration will need to be aware of [Namespaces](/vault/tutorials/enterprise/namespaces). This is important as the main namespace in HCP Vault is called 'admin' which is different from the standard ‘root’ namespace in a self managed Vault instance. If the integration currently doesn't support namespaces, then an additional benefit of adding Namespace support iis that this will also enable it to work with all self managed Vault Enterprise installations.
-- HCP Vault is currently only deployed on AWS and so the partner’s application should be able to be deployed or run in AWS. This is vital so that HCP Vault is able to communicate with the application using a [private peered](/hcp/tutorials/networking/amazon-peering-hcp) connection via a [HashiCorp Virtual Network](/hcp/docs/hcp/network).
+- Since HCP Vault is running Vault Enterprise, the integration will need to be aware of [Namespaces](https://learn.hashicorp.com/tutorials/vault/namespaces). This is important as the main namespace in HCP Vault is called 'admin' which is different from the standard ‘root’ namespace in a self managed Vault instance. If the integration currently doesn't support namespaces, then an additional benefit of adding Namespace support iis that this will also enable it to work with all self managed Vault Enterprise installations.
+- HCP Vault is currently only deployed on AWS and so the partner’s application should be able to be deployed or run in AWS. This is vital so that HCP Vault is able to communicate with the application using a [private peered](https://learn.hashicorp.com/tutorials/cloud/amazon-peering-hcp) connection via a [HashiCorp Virtual Network](https://cloud.hashicorp.com/docs/hcp/network).
 
 Additional resources:
 
-- [HCP Sign up](/hcp/docs/hcp/network)
-- [Namespaces - Vault Enterprise](/vault/docs/enterprise/namespaces)
-- [Create a Vault Cluster on HCP | HashiCorp Learn](/vault/tutorials/cloud/get-started-vault)
+- [HCP Sign up](https://cloud.hashicorp.com/docs/hcp/network)
+- [Namespaces - Vault Enterprise](/docs/enterprise/namespaces)
+- [Create a Vault Cluster on HCP | HashiCorp Learn](https://learn.hashicorp.com/tutorials/cloud/get-started-vault)
 
 ### 4. Review
 
diff --git a/website/content/docs/platform/aws/index.mdx b/website/content/docs/platform/aws/index.mdx
index 7934aae56ed71..b65f3d92ee285 100644
--- a/website/content/docs/platform/aws/index.mdx
+++ b/website/content/docs/platform/aws/index.mdx
@@ -20,4 +20,4 @@ The AWS Marketplace listings can be found below.
 
 The Vault AMIs listed in the AWS Marketplace are intended to serve as an easy starting point for a Vault installation. Vault AMIs are built on top of a minimal Ubuntu distribution and contain up to date packages for both Vault and the underlying operating system dependencies.
 
-The Open Source Vault AMI is intended for development and test use cases. This listing will launch a non-HA Vault instance with Vault running and the Vault UI available. For production use cases, please see the [Architecture](/vault/docs/platform/aws/run#architecture) section of this documentation.
+The Open Source Vault AMI is intended for development and test use cases. This listing will launch a non-HA Vault instance with Vault running and the Vault UI available. For production use cases, please see the [Architecture](/docs/platform/aws-mp/run#architecture) section of this documentation.
diff --git a/website/content/docs/platform/aws/lambda-extension.mdx b/website/content/docs/platform/aws/lambda-extension.mdx
index a9decea5a20e9..7597b9589bbc7 100644
--- a/website/content/docs/platform/aws/lambda-extension.mdx
+++ b/website/content/docs/platform/aws/lambda-extension.mdx
@@ -34,7 +34,7 @@ Where region may be any of `af-south-1`, `ap-east-1`, `ap-northeast-1`,
 `eu-west-1`, `eu-west-2`, `eu-west-3`, `me-south-1`, `sa-east-1`, `us-east-1`,
 `us-east-2`, `us-west-1`, `us-west-2`.
 
-The extension authenticates with Vault using [AWS IAM auth](/vault/docs/auth/aws),
+The extension authenticates with Vault using [AWS IAM auth](/docs/auth/aws),
 and all configuration is supplied via environment variables. There are two methods
 to read secrets, which can both be used side-by-side:
 
@@ -102,7 +102,7 @@ $ curl --silent https://releases.hashicorp.com/vault-lambda-extension/0.5.0/vaul
   --output vault-lambda-extension.zip
 ```
 
-Unzip the downloaded binary.
+Unzip the donwloaded binary.
 
 ```shell-session
 $ unzip vault-lambda-extension.zip
@@ -164,27 +164,26 @@ to communicate with Vault if configured to do so as detailed below.
 ## Configuration
 
 The extension is configured via [Lambda environment variables](https://docs.aws.amazon.com/lambda/latest/dg/configuration-envvars.html).
-Most of the [Vault CLI client's environment variables](/vault/docs/commands#environment-variables) are available,
+Most of the [Vault CLI client's environment variables](/docs/commands#environment-variables) are available,
 as well as some additional variables to configure auth, which secret(s) to read and
 where to write secrets.
 
 | Environment variable              | Description                                                                                                                                                                                                                                                                                                           | Required | Example value               |
-|-----------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|-----------------------------|
+| --------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------- | --------------------------- |
 | `VLE_VAULT_ADDR`                  | Vault address to connect to. Takes precedence over `VAULT_ADDR` so that clients of the proxy server can be configured using the standard `VAULT_ADDR`                                                                                                                                                                 | No       | `https://x.x.x.x:8200`      |
 | `VAULT_ADDR`                      | Vault address to connect to if `VLE_VAULT_ADDR` is not set. Required if `VLE_VAULT_ADDR` is not set                                                                                                                                                                                                                   | No       | `https://x.x.x.x:8200`      |
 | `VAULT_AUTH_PROVIDER`             | Name of the configured AWS IAM auth route on Vault                                                                                                                                                                                                                                                                    | Yes      | `aws`                       |
 | `VAULT_AUTH_ROLE`                 | Vault role to authenticate as                                                                                                                                                                                                                                                                                         | Yes      | `lambda-app`                |
-| `VAULT_IAM_SERVER_ID`             | Value to pass to the Vault server via the [`X-Vault-AWS-IAM-Server-ID` HTTP Header for AWS Authentication](/vault/api-docs/auth/aws#iam_server_id_header_value)                                                                                                                                                       | No       | `vault.example.com`         |
+| `VAULT_IAM_SERVER_ID`             | Value to pass to the Vault server via the [`X-Vault-AWS-IAM-Server-ID` HTTP Header for AWS Authentication](/api-docs/auth/aws#iam_server_id_header_value)                                                                                                                                                             | No       | `vault.example.com`         |
 | `VAULT_SECRET_PATH`               | Secret path to read, written to `/tmp/vault/secret.json` unless `VAULT_SECRET_FILE` is specified                                                                                                                                                                                                                      | No       | `database/creds/lambda-app` |
 | `VAULT_SECRET_FILE`               | Path to write the JSON response for `VAULT_SECRET_PATH`                                                                                                                                                                                                                                                               | No       | `/tmp/db.json`              |
 | `VAULT_SECRET_PATH_FOO`           | Additional secret path to read, where FOO can be any name, as long as a matching `VAULT_SECRET_FILE_FOO` is specified                                                                                                                                                                                                 | No       | `secret/lambda-app/token`   |
 | `VAULT_SECRET_FILE_FOO`           | Must exist for any correspondingly named `VAULT_SECRET_PATH_FOO`. Name has no further effect beyond matching to the correct path variable                                                                                                                                                                             | No       | `/tmp/token`                |
-| `VAULT_RUN_MODE`                  | Available options are `default`, `proxy`, and `file`. Proxy mode makes requests to the extension's local proxy server. File mode configures the extension to read and write secrets to disk. Default mode uses both file and proxy mode. The default is `default`.                                                    | No       | `default`                   |
 | `VAULT_TOKEN_EXPIRY_GRACE_PERIOD` | Period at the end of the proxy server's auth token TTL where it will consider the token expired and attempt to re-authenticate to Vault. Must have a unit and be parseable by `time.Duration`. Defaults to 10s.                                                                                                       | No       | `1m`                        |
 | `VAULT_STS_ENDPOINT_REGION`       | The region of the STS regional endpoint to authenticate with. If the AWS IAM auth mount specified uses a regional STS endpoint, then this needs to match the region of that endpoint. Defaults to using the global endpoint, or the region the Lambda resides in if `AWS_STS_REGIONAL_ENDPOINTS` is set to `regional` | No       | `eu-west-1`                 |
 
 The remaining environment variables are not required, and function exactly as
-described in the [Vault Commands (CLI)](/vault/docs/commands#environment-variables) documentation. However,
+described in the [Vault Commands (CLI)](/docs/commands#environment-variables) documentation. However,
 note that `VAULT_CLIENT_TIMEOUT` cannot extend the timeout beyond the 10s
 initialization timeout imposed by the Extensions API when writing files to disk.
 
@@ -196,9 +195,9 @@ initialization timeout imposed by the Extensions API when writing files to disk.
 | `VAULT_CLIENT_KEY`            | Path to an unencrypted, PEM-encoded private key on disk which corresponds to the matching client certificate                                                                    | No       | `/tmp/client.key`   |
 | `VAULT_CLIENT_TIMEOUT`        | Timeout for Vault requests. Default value is 60s. Ignored by proxy server. **Any value over 10s will exceed the Extensions API timeout and therefore have no effect**           | No       | `5s`                |
 | `VAULT_MAX_RETRIES`           | Maximum number of retries on `5xx` error codes. Defaults to 2. Ignored by proxy server                                                                                          | No       | `2`                 |
-| `VAULT_SKIP_VERIFY`           | Do not verify Vault's presented certificate before communicating with it. Setting this variable is not recommended and voids Vault's [security model](/vault/docs/internals/security) | No       | `true`              |
+| `VAULT_SKIP_VERIFY`           | Do not verify Vault's presented certificate before communicating with it. Setting this variable is not recommended and voids Vault's [security model](/docs/internals/security) | No       | `true`              |
 | `VAULT_TLS_SERVER_NAME`       | Name to use as the SNI host when connecting via TLS                                                                                                                             | No       | `vault.example.com` |
-| `VAULT_RATE_LIMIT`            | Only applies to a single invocation of the extension. See [Vault Commands (CLI)](/vault/docs/commands#environment-variables) documentation for details. Ignored by proxy server       | No       | `10`                |
+| `VAULT_RATE_LIMIT`            | Only applies to a single invocation of the extension. See [Vault Commands (CLI)](/docs/commands#environment-variables) documentation for details. Ignored by proxy server       | No       | `10`                |
 | `VAULT_NAMESPACE`             | The namespace to use for pre-configured secrets. Ignored by proxy server                                                                                                        | No       | `education`         |
 | `VAULT_DEFAULT_CACHE_TTL`     | The time to live configuration (aka, TTL) of the cache used by proxy server. Must have a unit and be parsable as a time.Duration. Required for caching to be enabled.           | No       | `15m`               |
 | `VAULT_DEFAULT_CACHE_ENABLED` | Enable caching for all requests, without needing to set the X-Vault-Cache-Control header for each request. Must be set to a boolean value.                                      | No       | `true`              |
@@ -250,10 +249,6 @@ the header to `nocache` on a request will opt-out of caching entirely in this
 configuration. Setting the header to `recache` will skip the cache lookup and
 return and cache the response from Vault as described previously.
 
-~> **Warning!** The Vault Lambda Extension's cache is only in-memory
-and will not be persisted when the Lambda execution environment shuts down.
-In order words, the cache TTL is capped to the duration of the Lambda execution environment.
-
 ## Limitations
 
 Secrets written to disk or returned from the proxy server will not be automatically
@@ -273,6 +268,10 @@ synchronously refresh its own token before proxying requests if the token is
 expired (including a grace window), and it will attempt to renew its token if the
 token is nearly expired but renewable.
 
+~> **Note**: The Vault Lambda Extension is currently incompatible with
+[AWS SnapStart](https://docs.aws.amazon.com/lambda/latest/dg/snapstart.html).
+This is because AWS SnapStart does not support the Lambda Extensions API.
+
 ## Performance impact
 
 AWS Lambda pricing is based on [number of invocations, time of execution and memory
@@ -316,4 +315,4 @@ $ aws lambda publish-layer-version \
 
 ## Tutorial
 
-For step-by-step instructions, refer to the [Vault AWS Lambda Extension](/vault/tutorials/app-integration/aws-lambda) tutorial for details on how to create an AWS Lambda function and use the Vault Lambda Extension to authenticate with Vault.
+For step-by-step instructions, refer to the [Vault AWS Lambda Extension](https://learn.hashicorp.com/tutorials/vault/aws-lambda) tutorial for details on how to create an AWS Lambda function and use the Vault Lambda Extension to authenticate with Vault.
diff --git a/website/content/docs/platform/aws/run.mdx b/website/content/docs/platform/aws/run.mdx
index 8f4c955904b8f..6dbe325ea7976 100644
--- a/website/content/docs/platform/aws/run.mdx
+++ b/website/content/docs/platform/aws/run.mdx
@@ -10,11 +10,11 @@ description: >-
 
 ## Launching the Vault AMI
 
-When Vault is first launched from an official Marketplace AMI, it will come up in an uninitialized state and must be initialized via the [API](/vault/api-docs/system/init), [CLI](/vault/docs/commands/operator/init), or UI. The Marketplace AMI listens on port 8200 by default. It is recommended to restrict ingress networking to the Vault instance as much as possible when initially deploying Vault (through EC2 security groups or otherwise) because anyone with network access to Vault will be able to initialize it. To learn more about the default listener configuration, or to make changes, please see the [Vault Deployment Guide](/vault/tutorials/day-one-consul/deployment-guide#listener-stanza).
+When Vault is first launched from an official Marketplace AMI, it will come up in an uninitialized state and must be initialized via the [API](/api-docs/system/init), [CLI](/docs/commands/operator/init), or UI. The Marketplace AMI listens on port 8200 by default. It is recommended to restrict ingress networking to the Vault instance as much as possible when initially deploying Vault (through EC2 security groups or otherwise) because anyone with network access to Vault will be able to initialize it. To learn more about the default listener configuration, or to make changes, please see the [Vault Deployment Guide](https://learn.hashicorp.com/vault/operations/ops-deployment-guide#listener-stanza).
 
-Additionally on first launch, a new self-signed [certificate](/vault/docs/configuration/listener/tcp#tls_cert_file) and [key](/vault/docs/configuration/listener/tcp#tls_key_file) (unique to the EC2 instance) will be generated to secure Vault traffic using TLS. This is provided as a “more secure” (vs. unencrypted TCP traffic) temporary solution, but it is strongly recommended to replace these with your own certificate and key. Please note that when using a self-signed certificate, Vault clients will need to [skip](/vault/docs/commands#vault_skip_verify) the verification of Vault’s certificate, which voids Vault’s [security model](/vault/docs/internals/security).
+Additionally on first launch, a new self-signed [certificate](/docs/configuration/listener/tcp#tls_cert_file) and [key](/docs/configuration/listener/tcp#tls_key_file) (unique to the EC2 instance) will be generated to secure Vault traffic using TLS. This is provided as a “more secure” (vs. unencrypted TCP traffic) temporary solution, but it is strongly recommended to replace these with your own certificate and key. Please note that when using a self-signed certificate, Vault clients will need to [skip](/docs/commands#vault_skip_verify) the verification of Vault’s certificate, which voids Vault’s [security model](/docs/internals/security).
 
-In order to begin using a newly launched Vault instance or cluster, it must be [unsealed](/vault/docs/concepts/seal) first. HashiCorp generally recommends using the [AWS KMS Seal](/vault/docs/configuration/seal/awskms) when running Vault on AWS.
+In order to begin using a newly launched Vault instance or cluster, it must be [unsealed](/docs/concepts/seal) first. HashiCorp generally recommends using the [AWS KMS Seal](/docs/configuration/seal/awskms) when running Vault on AWS.
 
 ## Viewing the Vault UI
 
@@ -24,13 +24,13 @@ The Vault UI is enabled by default. You can view the UI by navigating to `https:
 
 New Vault AMIs are added to the AWS Marketplace listing regularly and contain the latest versions of Vault and updated operating system packages. However, new AMIs are not built and tested to support in-place upgrades of your existing Vault installation.
 
-To upgrade a Vault instance launched from an official AWS Marketplace AMI, please follow the normal upgrade instructions for a [non-HA installation](/vault/docs/upgrading#non-ha-installations).
+To upgrade a Vault instance launched from an official AWS Marketplace AMI, please follow the normal upgrade instructions for a [non-HA installation](/docs/upgrading#non-ha-installations).
 
 # Architecture
 
-HashiCorp’s AWS Marketplace offerings provide an easy way to deploy Vault in a single-instance configuration using the [Filesystem storage backend](/vault/docs/configuration/storage/filesystem), but for production use, we recommend running Vault on AWS with the same [general architecture](/vault/docs/internals/architecture) as running it anywhere else. While the Filesystem storage backend is officially supported by HashiCorp, it does not support High Availability. Because Vault data is stored on disk in this configuration, it is subject to the durability and availability of Amazon Elastic Block Store (EBS) and should be backed up accordingly.
+HashiCorp’s AWS Marketplace offerings provide an easy way to deploy Vault in a single-instance configuration using the [Filesystem storage backend](/docs/configuration/storage/filesystem), but for production use, we recommend running Vault on AWS with the same [general architecture](/docs/internals/architecture) as running it anywhere else. While the Filesystem storage backend is officially supported by HashiCorp, it does not support High Availability. Because Vault data is stored on disk in this configuration, it is subject to the durability and availability of Amazon Elastic Block Store (EBS) and should be backed up accordingly.
 
-For additional guidance on best practices for running Vault in production, please refer to the [Production Hardening](/vault/tutorials/operations/production-hardening) tutorial.
+For additional guidance on best practices for running Vault in production, please refer to the [Production Hardening](https://learn.hashicorp.com/vault/day-one/production-hardening) tutorial.
 
 # Getting Support
 
diff --git a/website/content/docs/platform/github-actions.mdx b/website/content/docs/platform/github-actions.mdx
index f218608003e38..d6244c273622f 100644
--- a/website/content/docs/platform/github-actions.mdx
+++ b/website/content/docs/platform/github-actions.mdx
@@ -43,4 +43,4 @@ This example will authenticate to Vault instance at `https://vault.example.com:8
 For more information on using the `vault-action` GitHub Action, visit:
 
 - [`vault-secrets` GitHub action documentation](https://github.com/marketplace/actions/vault-secrets)
-- [Vault GitHub actions tutorial](/vault/tutorials/app-integration/github-actions)
\ No newline at end of file
+- [Vault GitHub actions tutorial](https://learn.hashicorp.com/tutorials/vault/github-actions)
\ No newline at end of file
diff --git a/website/content/docs/platform/k8s/csi/configurations.mdx b/website/content/docs/platform/k8s/csi/configurations.mdx
index f20bbed67cd09..1d61729f8797f 100644
--- a/website/content/docs/platform/k8s/csi/configurations.mdx
+++ b/website/content/docs/platform/k8s/csi/configurations.mdx
@@ -16,31 +16,19 @@ Most settings support being set by, in ascending order of precedence:
 If installing via the helm chart, they can be set using e.g.
 `--set "csi.extraArgs={-debug=true}"`.
 
-- `-cache-size` `(int: 1000)` - Set the maximum number of Vault tokens that will
-  be cached in-memory. One Vault token will be stored for each pod on the same
-  node that mounts secrets. Setting to 0 will disable the cache and force each
-  volume mount request to reauthenticate to Vault.
-
 - `-debug` `(bool: false)` - Set to true to enable debug level logging.
 
 - `-endpoint` `(string: "/tmp/vault.sock")` - Path to unix socket on which the
   provider will listen for gRPC calls from the driver.
 
-- `-health-addr` `(string: ":8080")` - The address of the HTTP listener
+- `-health-addr` `(string: ":8080")` - (v0.3.0+) The address of the HTTP listener
   for reporting health.
 
-- `-hmac-secret-name` `(string: "vault-csi-provider-hmac-key")` - Configure the
-  Kubernetes secret name that the provider creates to store an HMAC key for
-  generating secret version hashes.
-
-- `-vault-addr` `(string: "https://127.0.0.1:8200")` - Default address
+- `-vault-addr` `(string: "https://127.0.0.1:8200")` - (v0.3.0+) Default address
   for connecting to Vault. Can also be specified via the `VAULT_ADDR` environment
-  variable. **Note:** It is highly recommended to only set the Vault address when
-  installing the helm chart. The helm chart will install Vault Agent as a sidecar
-  to the Vault CSI Provider for caching and renewals, but setting `-vault-addr`
-  here will cause the Vault CSI Provider to bypass the Agent's cache.
+  variable.
 
-- `-vault-mount` `(string: "kubernetes")` - Default Vault mount path
+- `-vault-mount` `(string: "kubernetes")` - (v0.3.0+) Default Vault mount path
   for Kubernetes authentication. Can be overridden per Secret Provider Class
   object.
 
@@ -81,17 +69,13 @@ If installing via the helm chart, they can be set using e.g.
 
 The following parameters are supported by the Vault provider. Each parameter is
 an entry under `spec.parameters` in a SecretProviderClass object. The full
-structure is illustrated in the [examples](/vault/docs/platform/k8s/csi/examples).
+structure is illustrated in the [examples](/docs/platform/k8s/csi/examples).
 
 - `roleName` `(string: "")` - Name of the role to be used during login with Vault.
 
-- `vaultAddress` `(string: "")` - The address of the Vault server. **Note:** It is
-  highly recommended to only set the Vault address when installing the helm chart.
-  The helm chart will install Vault Agent as a sidecar to the Vault CSI Provider
-  for caching and renewals, but setting `vaultAddress` here will cause the Vault
-  CSI Provider to bypass the Agent's cache.
+- `vaultAddress` `(string: "")` - The address of the Vault server.
 
-- `vaultNamespace` `(string: "")` - The Vault [namespace](/vault/docs/enterprise/namespaces) to use.
+- `vaultNamespace` `(string: "")` - The Vault [namespace](/docs/enterprise/namespaces) to use.
 
 - `vaultSkipTLSVerify` `(string: "false")` - When set to true, skips verification of the Vault server
   certificate. Setting this to true is not recommended for production.
@@ -110,17 +94,14 @@ structure is illustrated in the [examples](/vault/docs/platform/k8s/csi/examples
 
 - `vaultTLSServerName` `(string: "")` - The name to use as the SNI host when connecting via TLS.
 
-- `vaultAuthMountPath` `(string: "kubernetes")` - The name of the auth mount used for login.
-  Can be a Kubernetes or JWT auth mount. Mutually exclusive with `vaultKubernetesMountPath`.
-
 - `vaultKubernetesMountPath` `(string: "kubernetes")` - The name of the auth mount used for login.
-  Can be a Kubernetes or JWT auth mount. Mutually exclusive with `vaultAuthMountPath`.
+  At this time only the Kubernetes auth method is supported.
 
 - `audience` `(string: "")` - Specifies a custom audience for the requesting pod's service account token,
   generated using the
   [TokenRequest API](https://kubernetes.io/docs/reference/kubernetes-api/authentication-resources/token-request-v1/#TokenRequestSpec).
   The resulting token is used to authenticate to Vault, so if you specify an
-  [audience](/vault/api-docs/auth/kubernetes#audience) for your Kubernetes auth
+  [audience](https://www.vaultproject.io/api-docs/auth/kubernetes#audience) for your Kubernetes auth
   role, it must match the audience specified here. If not set, the token audiences will default to
   the Kubernetes cluster's default API audiences.
 
@@ -133,7 +114,7 @@ structure is illustrated in the [examples](/vault/docs/platform/k8s/csi/examples
 
   - `secretPath` `(string: "")` - The path in Vault where the secret is located.
     For secrets that are retrieved via HTTP GET method, the `secretPath` can include optional URI parameters,
-    for example, the [version of the KV2 secret](/vault/api-docs/secret/kv/kv-v2#read-secret-version):
+    for example, the [version of the KV2 secret](https://www.vaultproject.io/api-docs/secret/kv/kv-v2#read-secret-version):
 
     ```yaml
     objects: |
@@ -146,8 +127,6 @@ structure is illustrated in the [examples](/vault/docs/platform/k8s/csi/examples
 
   - `filePermission` `(integer: 0o644)` - The file permissions to set for this secret's file.
 
-  - `encoding` `(string: "utf-8")` - The encoding of the secret value. Supports decoding `utf-8` (default), `hex`, and `base64` values.
-
   - `secretArgs` `(map: {})` - Additional arguments to be sent to Vault for a specific secret. Arguments can vary
     for different secret engines. For example:
 
@@ -158,5 +137,5 @@ structure is illustrated in the [examples](/vault/docs/platform/k8s/csi/examples
     ```
 
     ~> `secretArgs` are sent as part of the HTTP request body. Therefore, they are only effective for HTTP PUT/POST requests, for instance,
-        the [request used to generate a new certificate](/vault/api-docs/secret/pki#generate-certificate).
+        the [request used to generate a new certificate](https://www.vaultproject.io/api-docs/secret/pki#generate-certificate).
         To supply additional parameters for secrets retrieved via HTTP GET, include optional URI parameters in [`secretPath`](#secretpath).
diff --git a/website/content/docs/platform/k8s/csi/examples.mdx b/website/content/docs/platform/k8s/csi/examples.mdx
index 05f3747ec4c5b..230ab8a1dd948 100644
--- a/website/content/docs/platform/k8s/csi/examples.mdx
+++ b/website/content/docs/platform/k8s/csi/examples.mdx
@@ -26,6 +26,8 @@ spec:
   provider: vault
   parameters:
     roleName: 'app'
+    vaultAddress: 'https://vault.vault:8200'
+    vaultCACertPath: '/vault/tls/ca.crt'
     objects: |
       - objectName: "dbUsername"
         secretPath: "database/creds/db-app"
@@ -103,6 +105,8 @@ spec:
           key: password
   parameters:
     roleName: 'app'
+    vaultAddress: 'https://vault.vault:8200'
+    vaultCACertPath: '/vault/tls/ca.crt'
     objects: |
       - objectName: "dbUsername"
         secretPath: "database/creds/db-app"
diff --git a/website/content/docs/platform/k8s/csi/index.mdx b/website/content/docs/platform/k8s/csi/index.mdx
index 062a21d221b1c..b84d69675277a 100644
--- a/website/content/docs/platform/k8s/csi/index.mdx
+++ b/website/content/docs/platform/k8s/csi/index.mdx
@@ -19,7 +19,7 @@ At a high level, the CSI Secrets Store driver allows users to create `SecretProv
 This object defines which secret provider to use and what secrets to retrieve. When pods requesting CSI volumes
 are created, the CSI Secrets Store driver will send the request to the Vault CSI Provider if the provider
 is `vault`. The Vault CSI Provider will then use Secret Provider Class specified and the pod's service account to retrieve
-the secrets from Vault, and mount them into the pod's CSI volume.
+the secrets from Vault, and <span class="x x-first x-last">mount</span> them <span class="x x-first x-last">into</span> the pod<span class="x x-first x-last">'s CSI</span> volume.
 
 The secret is retrieved from Vault and populated to the CSI secrets store volume during the `ContainerCreation` phase.
 This means that pods will be blocked from starting until the secrets have been read from Vault and written to the volume.
@@ -32,21 +32,44 @@ The following features are supported by the Vault CSI Provider:
 - Authentication using the requesting pod's service account.
 - TLS/mTLS communications with Vault.
 - Rendering Vault secrets to files.
-- Dynamic lease caching and renewal performed by Agent.
 - Syncing secrets to Kubernetes secrets to be used as environment variables.
-- Installation via [Vault Helm](/vault/docs/platform/k8s/helm)
-
-@include 'kubernetes-supported-versions.mdx'
+- Installation via [Vault Helm](/docs/platform/k8s/helm)
 
 ## Authenticating with Vault
 
-The Vault CSI Provider will authenticate with Vault as the service account of the
-pod that mounts the CSI volume. [Kubernetes](/vault/docs/auth/kubernetes) and
-[JWT](/vault/docs/auth/jwt) auth methods are supported. The pod's service account
-must be bound to a Vault role and a policy granting access to the secrets desired.
+The primary method of authentication with Vault when using the Vault CSI Provider
+is the service account attached to the pod. At this time no other authentication methods
+are supported.
+
+For [Kubernetes authentication](/docs/auth/kubernetes), the service account must be bound to a Vault role and a
+policy granting access to the secrets desired.
+
+A service account must be present to use the Vault CSI Provider with the Kubernetes
+authentication method. It is _not_ recommended to bind Vault roles to the default service
+account provided to pods if no service account is defined.
+
+### Setting `issuer` for Kubernetes authentication
+
+-> **Deprecated:** The `issuer` parameter has been deprecated as of Vault 1.9 and will be removed in a future release.
+
+If running Vault prior to version 1.9, you will likely need to set [`issuer`](/api-docs/auth/kubernetes#issuer) when
+configuring Kubernetes authentication for the Vault CSI Provider.
+Vault CSI Provider does not use the default token associated with service accounts.
+Instead, it creates a token with a short TTL whose lifetime is also bound to the
+lifetime of the requesting pod. A key difference between default tokens and
+ephemeral tokens is the JWT issuer. Default tokens use `kubernetes/serviceaccount`,
+which is the default value that Kubernetes auth will try to validate. However,
+ephemeral tokens use the value of `kube-apiserver`'s `--service-account-issuer`
+flag as the issuer, which is normally a URL instead. See the [Kubernetes auth
+docs](/docs/auth/kubernetes#discovering-the-service-account-issuer) for
+ways to check the issuer using the Kubernetes API.
 
-It is highly recommended to run pods with dedicated Kubernetes service accounts to
-ensure applications cannot access more secrets than they require.
+Importantly, this means most common configurations of Vault Agent Injector and
+Vault CSI Provider **cannot share the same Kubernetes auth mount**. Vault
+Agent sidecars will most commonly be configured to authenticate using a
+long-lived default service account token, with an issuer different to the tokens
+Vault CSI Provider will create. But one Kubernetes auth mount can only be
+configured to validate a single issuer value.
 
 ## Secret Provider Class Example
 
@@ -64,12 +87,10 @@ spec:
   parameters:
     # Vault role name to use during login
     roleName: 'app'
-    # Vault address and TLS connection config is normally best configured by the
-    # helm chart, but can be overridden per SecretProviderClass:
     # Vault's hostname
-    #vaultAddress: 'https://vault:8200'
+    vaultAddress: 'https://vault:8200'
     # TLS CA certification for validation
-    #vaultCACertPath: '/vault/tls/ca.crt'
+    vaultCACertPath: '/vault/tls/ca.crt'
     objects: |
       - objectName: "dbUsername"
         secretPath: "database/creds/db-app"
@@ -126,5 +147,5 @@ the Secret Provider Class named `vault-db-creds`.
 
 ## Tutorial
 
-Refer to the [Vault CSI Provider](/vault/tutorials/kubernetes/kubernetes-secret-store-driver)
-tutorial to learn how to set up Vault and its dependencies with a Helm chart.
+Refer to the [Vault CSI Provider](https://learn.hashicorp.com/tutorials/vault/kubernetes-secret-store-driver?in=vault/kubernetes)
+tutorial to learn how to set up Vault and its depedencies with a Helm chart.
diff --git a/website/content/docs/platform/k8s/csi/installation.mdx b/website/content/docs/platform/k8s/csi/installation.mdx
index 9fa130bc541ff..eca82caaf9a65 100644
--- a/website/content/docs/platform/k8s/csi/installation.mdx
+++ b/website/content/docs/platform/k8s/csi/installation.mdx
@@ -16,7 +16,7 @@ description: The Vault CSI Provider can be installed using Vault Helm.
 
 ## Installation using helm
 
-The [Vault Helm chart](/vault/docs/platform/k8s/helm) is the recommended way to
+The [Vault Helm chart](/docs/platform/k8s/helm) is the recommended way to
 install and configure the Vault CSI Provider in Kubernetes.
 
 To install a new instance of Vault and the Vault CSI Provider, first add the
@@ -35,18 +35,18 @@ Then install the chart and enable the CSI feature by setting the
 $ helm install vault hashicorp/vault --set="csi.enabled=true"
 ```
 
-Upgrades may be performed with `helm upgrade` on an existing installation. Please
+Upgrades may be performed with `helm upgrade` on an existing install. Please
 always run Helm with `--dry-run` before any install or upgrade to verify
 changes.
 
 You can see all the available values settings by running `helm inspect values hashicorp/vault` or by reading the [Vault Helm Configuration
-Docs](/vault/docs/platform/k8s/helm/configuration). Commonly used values in the Helm
+Docs](/docs/platform/k8s/helm/configuration). Commonly used values in the Helm
 chart include limiting the namespaces the Vault CSI Provider runs in, TLS options and
 more.
 
 ## Installation on OpenShift
 
-We recommend using the [Vault agent injector on Openshift](/vault/docs/platform/k8s/helm/openshift)
+We recommend using the [Vault agent injector on Openshift](/docs/platform/k8s/helm/openshift)
 instead of the Secrets Store CSI driver. OpenShift
 [does not recommend](https://docs.openshift.com/container-platform/4.9/storage/persistent_storage/persistent-storage-hostpath.html)
 using `hostPath` mounting in production or
@@ -116,8 +116,8 @@ users:
 EOF
 ```
 
-Add the security context constraint for the application.
+Add the security context constraint for the applicaiton.
 
 ```shell-session
 $ kubectl apply -f application-scc.yaml
-```
+```
\ No newline at end of file
diff --git a/website/content/docs/platform/k8s/helm/configuration.mdx b/website/content/docs/platform/k8s/helm/configuration.mdx
index 6129ca065358a..a4ff6e3735408 100644
--- a/website/content/docs/platform/k8s/helm/configuration.mdx
+++ b/website/content/docs/platform/k8s/helm/configuration.mdx
@@ -58,14 +58,14 @@ and consider if they're appropriate for your deployment.
   - `serverTelemetry` - Values that configure metrics and telemetry
 
     - `prometheusOperator` (`boolean: false`) - When set to `true`, enables integration with the
-      Prometheus Operator. Be sure to configure the top-level [`serverTelemetry`](/vault/docs/platform/k8s/helm/configuration#servertelemetry-1) section for more details
+      Prometheus Operator. Be sure to configure the top-level [`serverTelemetry`](/docs/platform/k8s/helm/configuration#servertelemetry-1) section for more details
       and required configuration values.
 
 - `injector` - Values that configure running a Vault Agent Injector Admission Webhook Controller within Kubernetes.
 
   - `enabled` (`boolean or string: "-"`) - When set to `true`, the Vault Agent Injector Admission Webhook controller will be created. When set to `"-"`, defaults to the value of `global.enabled`.
 
-  - `externalVaultAddr` (`string: ""`) - Deprecated: Please use [global.externalVaultAddr](/vault/docs/platform/k8s/helm/configuration#externalvaultaddr) instead.
+  - `externalVaultAddr` (`string: ""`) - Deprecated: Please use [global.externalVaultAddr](/docs/platform/k8s/helm/configuration#externalvaultaddr) instead.
 
   - `replicas` (`int: 1`) - The number of pods to deploy to create a highly available cluster of Vault Agent Injectors. Requires Vault K8s 0.7.0 to have more than 1 replica.
 
@@ -77,7 +77,7 @@ and consider if they're appropriate for your deployment.
 
     - `repository` (`string: "hashicorp/vault-k8s"`) - The name of the Docker image for Vault Agent Injector.
 
-    - `tag` (`string: "1.2.1"`) - The tag of the Docker image for the Vault Agent Injector. **This should be pinned to a specific version when running in production.** Otherwise, other changes to the chart may inadvertently upgrade your admission controller.
+    - `tag` (`string: "1.1.0"`) - The tag of the Docker image for the Vault Agent Injector. **This should be pinned to a specific version when running in production.** Otherwise, other changes to the chart may inadvertently upgrade your admission controller.
 
     - `pullPolicy` (`string: "IfNotPresent"`) - The pull policy for container images. The default pull policy is `IfNotPresent` which causes the Kubelet to skip pulling an image if it already exists.
 
@@ -85,7 +85,7 @@ and consider if they're appropriate for your deployment.
 
     - `repository` (`string: "hashicorp/vault"`) - The name of the Docker image for the Vault Agent sidecar. This should be set to the official Vault Docker image.
 
-    - `tag` (`string: "1.13.1"`) - The tag of the Vault Docker image to use for the Vault Agent Sidecar. **Vault 1.3.1+ is required by the admission controller**.
+    - `tag` (`string: "1.12.1"`) - The tag of the Vault Docker image to use for the Vault Agent Sidecar. **Vault 1.3.1+ is required by the admission controller**.
 
   - `agentDefaults` - Values that configure the injected Vault Agent containers default values.
 
@@ -100,11 +100,11 @@ and consider if they're appropriate for your deployment.
     - `template` (`string: "map"`) - The default template type for rendered secrets if no custom templates are defined.
       Possible values include `map` and `json`.
 
-    - `templateConfig` - Default values within Agent's [`template_config` stanza](/vault/docs/agent-and-proxy/agent/template).
+    - `templateConfig` - Default values within Agent's [`template_config` stanza](/docs/agent/template).
 
       - `exitOnRetryFailure` (`boolean: true`) - Controls whether Vault Agent exits after it has exhausted its number of template retry attempts due to failures.
 
-      - `staticSecretRenderInterval` (`string: ""`) - Configures how often Vault Agent Template should render non-leased secrets such as KV v2. See the [Vault Agent Templates documentation](/vault/docs/agent-and-proxy/agent/template#non-renewable-secrets) for more details.
+      - `staticSecretRenderInterval` (`string: ""`) - Configures how often Vault Agent Template should render non-leased secrets such as KV v2. See the [Vault Agent Templates documentation] (/docs/agent/template#non-renewable-secrets) for more details.
 
   - `metrics` - Values that configure the Vault Agent Injector metric exporter.
 
@@ -176,9 +176,9 @@ and consider if they're appropriate for your deployment.
 
     - `annotations` (`string or object: {}`) - Defines additional annotations to attach to the webhook. This can either be YAML or a YAML-formatted multi-line templated string.
 
-  - `namespaceSelector` (`dictionary: {}`) - Deprecated: please use [`webhook.namespaceSelector`](/vault/docs/platform/k8s/helm/configuration#namespaceselector) instead.
+  - `namespaceSelector` (`dictionary: {}`) - Deprecated: please use [`webhook.namespaceSelector`](/docs/platform/k8s/helm/configuration#namespaceselector) instead.
 
-  - `objectSelector` (`dictionary: {}`) - Deprecated: please use [`webhook.objectSelector`](/vault/docs/platform/k8s/helm/configuration#objectselector) instead.
+  - `objectSelector` (`dictionary: {}`) - Deprecated: please use [`webhook.objectSelector`](/docs/platform/k8s/helm/configuration#objectselector) instead.
 
   - `extraLabels` (`dictionary: {}`) - This value defines additional labels for Vault Agent Injector pods.
 
@@ -243,9 +243,9 @@ and consider if they're appropriate for your deployment.
       "sample/annotation2": "bar"
     ```
 
-  - `failurePolicy` (`string: "Ignore"`) - Deprecated: please use [`webhook.failurePolicy`](/vault/docs/platform/k8s/helm/configuration#failurepolicy) instead.
+  - `failurePolicy` (`string: "Ignore"`) - Deprecated: please use [`webhook.failurePolicy`](/docs/platform/k8s/helm/configuration#failurepolicy) instead.
 
-  - `webhookAnnotations` (`dictionary: {}`) - Deprecated: please use [`webhook.annotations`](/vault/docs/platform/k8s/helm/configuration#annotations-1) instead.
+  - `webhookAnnotations` (`dictionary: {}`) - Deprecated: please use [`webhook.annotations`](/docs/platform/k8s/helm/configuration#annotations-1) instead.
 
   - `service` - The service section configures the Kubernetes service for the Vault Agent Injector.
 
@@ -295,42 +295,6 @@ and consider if they're appropriate for your deployment.
       type: RollingUpdate
     ```
 
-  - `livenessProbe` - Values that configure the liveness probe for the injector.
-
-    - `failureThreshold` (`int: 2`) - When set to a value, configures how many probe failures will be tolerated by Kubernetes.
-
-    - `initialDelaySeconds` (`int: 60`) - Sets the initial delay of the liveness probe when the container starts.
-
-    - `periodSeconds` (`int: 5`) - When set to a value, configures how often (in seconds) to perform the probe.
-
-    - `successThreshold` (`int: 1`) - When set to a value, configures the minimum consecutive successes for the probe to be considered successful after having failed.
-
-    - `timeoutSeconds` (`int: 3`) - When set to a value, configures the number of seconds after which the probe times out.
-
-  - `readinessProbe` - Values that configure the readiness probe for the injector.
-
-    - `failureThreshold` (`int: 2`) - When set to a value, configures how many probe failures will be tolerated by Kubernetes.
-
-    - `initialDelaySeconds` (`int: 60`) - Sets the initial delay of the readiness probe when the container starts.
-
-    - `periodSeconds` (`int: 5`) - When set to a value, configures how often (in seconds) to perform the probe.
-
-    - `successThreshold` (`int: 1`) - When set to a value, configures the minimum consecutive successes for the probe to be considered successful after having failed.
-
-    - `timeoutSeconds` (`int: 3`) - When set to a value, configures the number of seconds after which the probe times out.
-
-  - `startupProbe` - Values that configure the startup probe for the injector.
-
-    - `failureThreshold` (`int: 2`) - When set to a value, configures how many probe failures will be tolerated by Kubernetes.
-
-    - `initialDelaySeconds` (`int: 60`) - Sets the initial delay of the startup probe when the container starts.
-
-    - `periodSeconds` (`int: 5`) - When set to a value, configures how often (in seconds) to perform the probe.
-
-    - `successThreshold` (`int: 1`) - When set to a value, configures the minimum consecutive successes for the probe to be considered successful after having failed.
-
-    - `timeoutSeconds` (`int: 3`) - When set to a value, configures the number of seconds after which the probe times out.
-
 - `server` - Values that configure running a Vault server within Kubernetes.
 
   - `enabled` (`boolean or string: "-"`) - When set to `true`, the Vault server will be created. When set to `"-"`, defaults to the value of `global.enabled`.
@@ -345,7 +309,7 @@ and consider if they're appropriate for your deployment.
 
     - `repository` (`string: "hashicorp/vault"`) - The name of the Docker image for the containers running Vault.
 
-    - `tag` (`string: "1.13.1"`) - The tag of the Docker image for the containers running Vault. **This should be pinned to a specific version when running in production.** Otherwise, other changes to the chart may inadvertently upgrade your admission controller.
+    - `tag` (`string: "1.12.1"`) - The tag of the Docker image for the containers running Vault. **This should be pinned to a specific version when running in production.** Otherwise, other changes to the chart may inadvertently upgrade your admission controller.
 
     - `pullPolicy` (`string: "IfNotPresent"`) - The pull policy for container images. The default pull policy is `IfNotPresent` which causes the Kubelet to skip pulling an image if it already exists.
 
@@ -370,7 +334,7 @@ and consider if they're appropriate for your deployment.
   - `ingress` - Values that configure Ingress services for Vault.
 
     ~> If deploying on OpenShift, these ingress settings are ignored. Use the [`route`](#route) configuration to expose Vault on OpenShift. <br/> <br/>
-    If [`ha`](#ha) is enabled the Ingress will point to the active vault server via the `active` Service. This requires vault 1.4+ and [service_registration](/vault/docs/configuration/service-registration/kubernetes) to be set in the vault config.
+    If [`ha`](#ha) is enabled the Ingress will point to the active vault server via the `active` Service. This requires vault 1.4+ and [service_registration](https://www.vaultproject.io/docs/configuration/service-registration/kubernetes) to be set in the vault config.
 
     - `enabled` (`boolean: false`) - When set to `true`, an [Ingress](https://kubernetes.io/docs/concepts/services-networking/ingress/) service will be created.
 
@@ -431,7 +395,7 @@ and consider if they're appropriate for your deployment.
 
   - `route` - Values that configure Route services for Vault in OpenShift
 
-    ~> If [`ha`](#ha) is enabled the Route will point to the active vault server via the `active` Service (requires vault 1.4+ and [service_registration](/vault/docs/configuration/service-registration/kubernetes) to be set in the vault config).
+    ~> If [`ha`](#ha) is enabled the Route will point to the active vault server via the `active` Service (requires vault 1.4+ and [service_registration](https://www.vaultproject.io/docs/configuration/service-registration/kubernetes) to be set in the vault config).
 
     - `enabled` (`boolean: false`) - When set to `true`, a Route for Vault will be created.
 
@@ -447,7 +411,7 @@ and consider if they're appropriate for your deployment.
 
   - `authDelegator` - Values that configure the Cluster Role Binding attached to the Vault service account.
 
-    - `enabled` (`boolean: true`) - When set to `true`, a Cluster Role Binding will be bound to the Vault service account. This Cluster Role Binding has the necessary privileges for Vault to use the [Kubernetes Auth Method](/vault/docs/auth/kubernetes).
+    - `enabled` (`boolean: true`) - When set to `true`, a Cluster Role Binding will be bound to the Vault service account. This Cluster Role Binding has the necessary privileges for Vault to use the [Kubernetes Auth Method](/docs/auth/kubernetes).
 
   - `readinessProbe` - Values that configure the readiness probe for the Vault pods.
 
@@ -465,8 +429,6 @@ and consider if they're appropriate for your deployment.
 
     - `timeoutSeconds` (`int: 3`) - When set to a value, configures the number of seconds after which the probe times out.
 
-    - `port` (`int: 8200`) - When set to a value, overrides the default port used for the server readiness probe.
-
     ```yaml
     readinessProbe:
       enabled: true
@@ -476,16 +438,15 @@ and consider if they're appropriate for your deployment.
       periodSeconds: 5
       successThreshold: 1
       timeoutSeconds: 3
-      port: 8200
     ```
 
-  - `livenessProbe` - Values that configure the liveness probe for the Vault pods.
+  - `livenessProbe` - Values that configure the liveliness probe for the Vault pods.
 
-    - `enabled` (`boolean: false`) - When set to `true`, a liveness probe will be applied to the Vault pods.
+    - `enabled` (`boolean: false`) - When set to `true`, a liveliness probe will be applied to the Vault pods.
 
     - `path` (`string: "/v1/sys/health?standbyok=true"`) - When set to a value, enables HTTP/HTTPS probes instead of using the default `exec` probe. The http/https scheme is controlled by the `tlsDisable` value.
 
-    - `initialDelaySeconds` (`int: 60`) - Sets the initial delay of the liveness probe when the container starts.
+    - `initialDelaySeconds` (`int: 60`) - Sets the initial delay of the liveliness probe when the container starts.
 
     - `failureThreshold` (`int: 2`) - When set to a value, configures how many probe failures will be tolerated by Kubernetes.
 
@@ -495,10 +456,8 @@ and consider if they're appropriate for your deployment.
 
     - `timeoutSeconds` (`int: 3`) - When set to a value, configures the number of seconds after which the probe times out.
 
-    - `port` (`int: 8200`) - When set to a value, overrides the default port used for the server liveness probe.
-
     ```yaml
-    livenessProbe:
+    livelinessProbe:
       enabled: true
       path: /v1/sys/health?standbyok=true
       initialDelaySeconds: 60
@@ -506,7 +465,6 @@ and consider if they're appropriate for your deployment.
       periodSeconds: 5
       successThreshold: 1
       timeoutSeconds: 3
-      port: 8200
     ```
 
   - `terminationGracePeriodSeconds` (`int: 10`) - Optional duration in seconds the pod needs to terminate gracefully. See: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/
@@ -551,14 +509,6 @@ and consider if they're appropriate for your deployment.
     extraArgs: '-config=/path/to/extra/config.hcl -log-format=json'
     ```
 
-  - `extraPorts` (`array: []`) - additional ports to add to the server statefulset
-
-  ```yaml
-  extraPorts:
-    - containerPort: 8300
-      name: http-monitoring
-  ```
-
   - `extraSecretEnvironmentVars` (`array: []`) - The extra environment variables populated from a secret to be applied to the Vault server.
 
     - `envName` (`string: required`) -
@@ -768,7 +718,7 @@ and consider if they're appropriate for your deployment.
 
     - `serviceDiscovery` - Values that configure permissions required for Vault Server to automatically discover and join a Vault cluster using pod metadata.
 
-      - `enabled` (`boolean: true`) - Enable or disable a service account role binding with the permissions required for Vault's Kubernetes [`service_registration`](/vault/docs/configuration/service-registration/kubernetes) config option.
+      - `enabled` (`boolean: true`) - Enable or disable a service account role binding with the permissions required for Vault's Kubernetes [`service_registration`](https://developer.hashicorp.com/vault/docs/configuration/service-registration/kubernetes) config option.
 
   - `dataStorage` - This configures the volume used for storing Vault data when not using external storage such as Consul.
 
@@ -799,7 +749,7 @@ and consider if they're appropriate for your deployment.
       kubernetes.io/my-pvc: foobar
     ```
 
-  - `auditStorage` - This configures the volume used for storing Vault's audit logs. See the [Vault documentation](/vault/docs/audit) for more information.
+  - `auditStorage` - This configures the volume used for storing Vault's audit logs. See the [Vault documentation](/docs/audit) for more information.
 
     - `enabled` (`boolean: false`) -
       Enables a persistent volume to be created for storing Vault's audit logs.
@@ -843,7 +793,7 @@ and consider if they're appropriate for your deployment.
       Enables `standalone` mode for the Vault server. This mode uses the `file` storage backend and requires a volume for persistence (`dataStorage`).
 
     - `config` (`string or object: "{}"`) -
-      A raw string of extra HCL or JSON [configuration](/vault/docs/configuration) for Vault servers.
+      A raw string of extra HCL or JSON [configuration](/docs/configuration) for Vault servers.
       This will be saved as-is into a ConfigMap that is read by the Vault servers.
       This can be used to add additional configuration that isn't directly exposed by the chart.
       If an object is provided, it will be written as JSON.
@@ -872,12 +822,12 @@ and consider if they're appropriate for your deployment.
   - `ha` - This configures `ha` mode for the Vault server.
 
     - `enabled` (`boolean: false`) -
-      Enables `ha` mode for the Vault server. This mode uses a highly available backend storage (such as Consul) to store Vault's data. By default this is configured to use [Consul Helm](https://github.com/hashicorp/consul-helm). For a complete list of storage backends, see the [Vault documentation](/vault/docs/configuration).
+      Enables `ha` mode for the Vault server. This mode uses a highly available backend storage (such as Consul) to store Vault's data. By default this is configured to use [Consul Helm](https://github.com/hashicorp/consul-helm). For a complete list of storage backends, see the [Vault documentation](/docs/configuration).
 
     - `apiAddr`: (`string: "{}"`) -
       Set the API address configuration for a Vault cluster. If set to an empty string, the pod IP address is used.
 
-    - `clusterAddr` (`string: null`) - Set the [`cluster_addr`](/vault/docs/configuration#cluster_addr) configuration for Vault HA.
+    - `clusterAddr` (`string: null`) - Set the [`cluster_addr`](https://www.vaultproject.io/docs/configuration#cluster_addr) configuration for Vault HA.
       If null, defaults to `https://$(HOSTNAME).{{ template "vault.fullname" . }}-internal:8201`.
 
     - `raft` - This configures `raft` integrated storage mode for the Vault server.
@@ -888,7 +838,7 @@ and consider if they're appropriate for your deployment.
       - `setNodeId` (`boolean: false`) - Set the Node Raft ID to the name of the pod.
 
       - `config` (`string or object: "{}"`) -
-        A raw string of extra HCL or JSON [configuration](/vault/docs/configuration) for Vault servers.
+        A raw string of extra HCL or JSON [configuration](/docs/configuration) for Vault servers.
         This will be saved as-is into a ConfigMap that is read by the Vault servers.
         This can be used to add additional configuration that isn't directly exposed by the chart.
         If an object is provided, it will be written as JSON.
@@ -900,7 +850,7 @@ and consider if they're appropriate for your deployment.
       If an updatePartition is specified, all Pods with an ordinal that is greater than or equal to the partition will be updated when the StatefulSet’s `.spec.template` is updated. If set to `0`, this disables partition updates. For more information see the [official Kubernetes documentation](https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#rolling-updates).
 
     - `config` (`string or object: "{}"`) -
-      A raw string of extra HCL or JSON [configuration](/vault/docs/configuration) for Vault servers.
+      A raw string of extra HCL or JSON [configuration](/docs/configuration) for Vault servers.
       This will be saved as-is into a ConfigMap that is read by the Vault servers.
       This can be used to add additional configuration that isn't directly exposed by the chart.
       If an object is provided, it will be written as JSON.
@@ -1028,7 +978,7 @@ and consider if they're appropriate for your deployment.
 
     - `repository` (`string: "hashicorp/vault-csi-provider"`) - The name of the Docker image for the Vault CSI Provider.
 
-    - `tag` (`string: "1.3.0"`) - The tag of the Docker image for the Vault CSI Provider.. **This should be pinned to a specific version when running in production.** Otherwise, other changes to the chart may inadvertently upgrade your CSI provider.
+    - `tag` (`string: "1.2.1"`) - The tag of the Docker image for the Vault CSI Provider.. **This should be pinned to a specific version when running in production.** Otherwise, other changes to the chart may inadvertently upgrade your CSI provider.
 
     - `pullPolicy` (`string: "IfNotPresent"`) - The pull policy for container images. The default pull policy is `IfNotPresent` which causes the Kubelet to skip pulling an image if it already exists locally.
 
@@ -1141,9 +1091,9 @@ and consider if they're appropriate for your deployment.
 
     - `timeoutSeconds` (`int: 3`) - When set to a value, configures the number of seconds after which the probe times out.
 
-  - `livenessProbe` - Values that configure the liveness probe for the Vault CSI Provider pods.
+  - `livenessProbe` - Values that configure the liveliness probe for the Vault CSI Provider pods.
 
-    - `initialDelaySeconds` (`int: 5`) - Sets the initial delay of the liveness probe when the container starts.
+    - `initialDelaySeconds` (`int: 5`) - Sets the initial delay of the liveliness probe when the container starts.
 
     - `failureThreshold` (`int: 2`) - When set to a value, configures how many probe failures will be tolerated by Kubernetes.
 
@@ -1155,35 +1105,11 @@ and consider if they're appropriate for your deployment.
 
   - `debug` (`bool: false`) - When set to true, enables debug logging on the Vault CSI Provider daemonset.
 
-  - `extraArgs` (`array: []`) - The extra arguments to be applied to the CSI pod startup command. See [here](/vault/docs/platform/k8s/csi/configurations#command-line-arguments) for available flags.
-
-  - `agent` - Configures the Vault Agent sidecar for the CSI Provider
-    - `enabled` (`bool: true`) - whether to enable the agent sidecar for the CSI provider
-    - `extraArgs` (`array: []`) - The extra arguments to be applied to the agent startup command.
-
-    - `image` - Values that configure the Vault Agent sidecar image for the CSI Provider.
-      - `pullPolicy` (`string: "IfNotPresent"`) - The pull policy for agent image. The default pull policy is `IfNotPresent` which causes the Kubelet to skip pulling an image if it already exists.
-
-      - `repository` (`string: "hashicorp/vault"`) - The name of the Docker image for the Vault Agent sidecar. This should be set to the official Vault Docker image.
-
-      - `tag` (`string: "1.13.1"`) - The tag of the Vault Docker image to use for the Vault Agent Sidecar.
-
-    - `logFormat` (`string: "standard"`) -
-    - `logLevel` (`string: "info"`) -
-    - `resources` (`dictionary: {}`) - The resource requests and limits (CPU, memory, etc.) for the agent. This should be a YAML dictionary of a Kubernetes [ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#resourcerequirements-v1-core) object.
-    ```yaml
-    resources:
-      requests:
-        memory: '256Mi'
-        cpu: '250m'
-      limits:
-        memory: '256Mi'
-        cpu: '250m'
-    ```
+  - `extraArgs` (`string: array`) - The extra arguments to be applied to the CSI pod startup command. See [here](/docs/platform/k8s/csi/configurations#command-line-arguments) for available flags.
 
 - `serverTelemetry` - Values the configure metrics and telemetry. Enabling these features requires setting
-  the `telemetry {}` stanza in the Vault configuration. See the [telemetry](/vault/docs/configuration/telemetry)
-  [docs](/vault/docs/internals/telemetry) for more on the Vault configuration.
+  the `telemetry {}` stanza in the Vault configuration. See the [telemetry](/docs/configuration/telemetry)
+  [docs](/docs/internals/telemetry) for more on the Vault configuration.
 
   Currently, this chart does not support authenticating to Vault's metrics endpoint, so the following `telemetry {}` block must be included in the `listener "tcp" {}` stanza of the Vault configuration:
 
diff --git a/website/content/docs/platform/k8s/helm/enterprise.mdx b/website/content/docs/platform/k8s/helm/enterprise.mdx
index 8c21049209fc8..89b36a377b8d8 100644
--- a/website/content/docs/platform/k8s/helm/enterprise.mdx
+++ b/website/content/docs/platform/k8s/helm/enterprise.mdx
@@ -9,7 +9,7 @@ description: >-
 
 You can use this Helm chart to deploy Vault Enterprise by following a few extra steps around licensing.
 
-~> **Note:** As of Vault Enterprise 1.8, the license must be specified via HCL configuration or environment variables on startup, unless the Vault cluster was created with an older Vault version and the license was stored. More information is available in the [Vault Enterprise License docs](/vault/docs/enterprise/license).
+~> **Note:** As of Vault Enterprise 1.8, the license must be specified via HCL configuration or environment variables on startup, unless the Vault cluster was created with an older Vault version and the license was stored. More information is available in the [Vault Enterprise License docs](/docs/enterprise/license).
 
 @include 'helm/version.mdx'
 
@@ -26,14 +26,14 @@ kubectl create secret generic vault-ent-license --from-literal="license=${secret
 
 -> **Note:** If you cannot find your `.hclic` file, please contact your sales team or Technical Account Manager.
 
-In your chart overrides, set the values of [`server.image`](/vault/docs/platform/k8s/helm/configuration#image-2) to one of the enterprise [release tags](https://hub.docker.com/r/hashicorp/vault-enterprise/tags). Also set the name of the secret you just created in [`server.enterpriseLicense`](/vault/docs/platform/k8s/helm/configuration#enterpriselicense).
+In your chart overrides, set the values of [`server.image`](/docs/platform/k8s/helm/configuration#image-2) to one of the enterprise [release tags](https://hub.docker.com/r/hashicorp/vault-enterprise/tags). Also set the name of the secret you just created in [`server.enterpriseLicense`](/docs/platform/k8s/helm/configuration#enterpriselicense).
 
 ```yaml
 # config.yaml
 server:
   image:
     repository: hashicorp/vault-enterprise
-    tag: 1.13.1-ent
+    tag: 1.12.1-ent
   enterpriseLicense:
     secretName: vault-ent-license
 ```
@@ -44,7 +44,7 @@ Now run `helm install`:
 $ helm install hashicorp hashicorp/vault -f config.yaml
 ```
 
-Once the cluster is [initialized and unsealed](/vault/docs/platform/k8s/helm/run), you may check the license status using the `vault license get` command:
+Once the cluster is [initialized and unsealed](/docs/platform/k8s/helm/run), you may check the license status using the `vault license get` command:
 
 ```shell
 kubectl exec -ti vault-0 -- vault license get
@@ -67,7 +67,7 @@ EOF
 kubectl patch secret vault-ent-license --patch "$(cat patch-license.yaml)"
 ```
 
-- Wait until [`vault license inspect`](/vault/docs/commands/license/inspect) shows the updated license
+- Wait until [`vault license inspect`](/docs/commands/license/inspect) shows the updated license
 
   Since the `inspect` command is reading the license file from the mounted secret, this tells you when the updated secret has been propagated to the mount on the Vault pod.
 
@@ -77,7 +77,7 @@ kubectl exec vault-0 -- vault license inspect
 
 - Reload Vault's license config
 
-  You may use the [`sys/config/reload/license` API endpoint](/vault/api-docs/system/config-reload#reload-license-file):
+  You may use the [`sys/config/reload/license` API endpoint](/api-docs/system/config-reload#reload-license-file):
 
 ```shell
 kubectl exec vault-0 -- vault write -f sys/config/reload/license
@@ -89,7 +89,7 @@ Or you may issue an HUP signal directly to Vault:
 kubectl exec vault-0 -- pkill -HUP vault
 ```
 
-- Verify that [`vault license get`](/vault/docs/commands/license/get) shows the updated license
+- Verify that [`vault license get`](/docs/commands/license/get) shows the updated license
 
 ```shell
 kubectl exec vault-0 -- vault license get
@@ -97,7 +97,7 @@ kubectl exec vault-0 -- vault license get
 
 ## Vault Enterprise prior to 1.8
 
-In your chart overrides, set the values of `server.image` to one of the enterprise [release tags](https://hub.docker.com/r/hashicorp/vault-enterprise/tags). Install the chart, and initialize and unseal vault as described in [Running Vault](/vault/docs/platform/k8s/helm/run).
+In your chart overrides, set the values of `server.image` to one of the enterprise [release tags](https://hub.docker.com/r/hashicorp/vault-enterprise/tags). Install the chart, and initialize and unseal vault as described in [Running Vault](/docs/platform/k8s/helm/run).
 
 After Vault has been initialized and unsealed, setup a port-forward tunnel to the Vault Enterprise cluster:
 
diff --git a/website/content/docs/platform/k8s/helm/examples/development.mdx b/website/content/docs/platform/k8s/helm/examples/development.mdx
index ba1038c671663..35617cd4e997e 100644
--- a/website/content/docs/platform/k8s/helm/examples/development.mdx
+++ b/website/content/docs/platform/k8s/helm/examples/development.mdx
@@ -21,5 +21,5 @@ server:
 ## Tutorial
 
 Refer to the [Injecting Secrets into Kubernetes Pods via Vault Helm
-Sidecar](/vault/tutorials/kubernetes/kubernetes-sidecar) tutorial
+Sidecar](https://learn.hashicorp.com/vault/getting-started-k8s/sidecar) tutorial
 to learn how to set up Vault and the Vault Agent Injector service with the Vault Helm chart.
diff --git a/website/content/docs/platform/k8s/helm/examples/enterprise-dr-with-raft.mdx b/website/content/docs/platform/k8s/helm/examples/enterprise-dr-with-raft.mdx
index 687704cf4ab04..91bce56989ca3 100644
--- a/website/content/docs/platform/k8s/helm/examples/enterprise-dr-with-raft.mdx
+++ b/website/content/docs/platform/k8s/helm/examples/enterprise-dr-with-raft.mdx
@@ -12,9 +12,9 @@ description: |-
 
 The following is an example of creating a disaster recovery cluster using Vault Helm.
 
-For more information on Disaster Recovery, [see the official documentation](/vault/docs/enterprise/replication/).
+For more information on Disaster Recovery, [see the official documentation](/docs/enterprise/replication/).
 
--> For license configuration refer to [Running Vault Enterprise](/vault/docs/platform/k8s/helm/enterprise).
+-> For license configuration refer to [Running Vault Enterprise](/docs/platform/k8s/helm/enterprise).
 
 ## Primary Cluster
 
@@ -23,7 +23,7 @@ First, create the primary cluster:
 ```shell
 helm install vault-primary hashicorp/vault \
   --set='server.image.repository=hashicorp/vault-enterprise' \
-  --set='server.image.tag=1.13.1-ent' \
+  --set='server.image.tag=1.12.1-ent' \
   --set='server.ha.enabled=true' \
   --set='server.ha.raft.enabled=true'
 ```
@@ -75,7 +75,7 @@ disaster recovery replication.
 ```shell
 helm install vault-secondary hashicorp/vault \
   --set='server.image.repository=hashicorp/vault-enterprise' \
-  --set='server.image.tag=1.13.1-ent' \
+  --set='server.image.tag=1.12.1-ent' \
   --set='server.ha.enabled=true' \
   --set='server.ha.raft.enabled=true'
 ```
diff --git a/website/content/docs/platform/k8s/helm/examples/enterprise-perf-with-raft.mdx b/website/content/docs/platform/k8s/helm/examples/enterprise-perf-with-raft.mdx
index 89ab693bbb78d..73e18628d405b 100644
--- a/website/content/docs/platform/k8s/helm/examples/enterprise-perf-with-raft.mdx
+++ b/website/content/docs/platform/k8s/helm/examples/enterprise-perf-with-raft.mdx
@@ -12,9 +12,9 @@ description: |-
 
 The following is an example of creating a performance cluster using Vault Helm.
 
-For more information on Disaster Recovery, [see the official documentation](/vault/docs/enterprise/replication/).
+For more information on Disaster Recovery, [see the official documentation](/docs/enterprise/replication/).
 
--> For license configuration refer to [Running Vault Enterprise](/vault/docs/platform/k8s/helm/enterprise).
+-> For license configuration refer to [Running Vault Enterprise](/docs/platform/k8s/helm/enterprise).
 
 ## Primary Cluster
 
@@ -23,7 +23,7 @@ First, create the primary cluster:
 ```shell
 helm install vault-primary hashicorp/vault \
   --set='server.image.repository=hashicorp/vault-enterprise' \
-  --set='server.image.tag=1.13.1-ent' \
+  --set='server.image.tag=1.12.1-ent' \
   --set='server.ha.enabled=true' \
   --set='server.ha.raft.enabled=true'
 ```
@@ -74,7 +74,7 @@ With the primary cluster created, next create a secondary cluster.
 ```shell
 helm install vault-secondary hashicorp/vault \
   --set='server.image.repository=hashicorp/vault-enterprise' \
-  --set='server.image.tag=1.13.1-ent' \
+  --set='server.image.tag=1.12.1-ent' \
   --set='server.ha.enabled=true' \
   --set='server.ha.raft.enabled=true'
 ```
diff --git a/website/content/docs/platform/k8s/helm/examples/enterprise-with-raft.mdx b/website/content/docs/platform/k8s/helm/examples/enterprise-with-raft.mdx
index 1989275a68843..7239f6fa7d431 100644
--- a/website/content/docs/platform/k8s/helm/examples/enterprise-with-raft.mdx
+++ b/website/content/docs/platform/k8s/helm/examples/enterprise-with-raft.mdx
@@ -15,12 +15,12 @@ Integrated Storage (raft) can be enabled using the `server.ha.raft.enabled` valu
 ```shell
 helm install vault hashicorp/vault \
   --set='server.image.repository=hashicorp/vault-enterprise' \
-  --set='server.image.tag=1.13.1-ent' \
+  --set='server.image.tag=1.12.1-ent' \
   --set='server.ha.enabled=true' \
   --set='server.ha.raft.enabled=true'
 ```
 
--> For license configuration refer to [Running Vault Enterprise](/vault/docs/platform/k8s/helm/enterprise).
+-> For license configuration refer to [Running Vault Enterprise](/docs/platform/k8s/helm/enterprise).
 
 Next, initialize and unseal `vault-0` pod:
 
diff --git a/website/content/docs/platform/k8s/helm/examples/external.mdx b/website/content/docs/platform/k8s/helm/examples/external.mdx
index ae4c88543060d..1aceac9bdde14 100644
--- a/website/content/docs/platform/k8s/helm/examples/external.mdx
+++ b/website/content/docs/platform/k8s/helm/examples/external.mdx
@@ -21,5 +21,5 @@ injector:
 ## Learn
 
 Refer to the [Integrate a Kubernetes Cluster with an External
-Vault](/vault/tutorials/kubernetes/kubernetes-external-vault)
+Vault](https://learn.hashicorp.com/vault/getting-started-k8s/external-vault)
 guide for a step-by-step tutorial.
diff --git a/website/content/docs/platform/k8s/helm/examples/index.mdx b/website/content/docs/platform/k8s/helm/examples/index.mdx
index 4863496ebb060..14931057a91d5 100644
--- a/website/content/docs/platform/k8s/helm/examples/index.mdx
+++ b/website/content/docs/platform/k8s/helm/examples/index.mdx
@@ -18,5 +18,5 @@ deployment models. You can view the different examples from the list on the left
 ## Tutorial
 
 Refer to the [Run Vault on
-Kubernetes](/vault/tutorials/kubernetes)
+Kubernetes](https://learn.hashicorp.com/collections/vault/kubernetes)
 tutorial series to learn how to run Vault on Kubernetes.
diff --git a/website/content/docs/platform/k8s/helm/examples/kubernetes-auth.mdx b/website/content/docs/platform/k8s/helm/examples/kubernetes-auth.mdx
index 762b71e1c7b78..5599b4351faa4 100644
--- a/website/content/docs/platform/k8s/helm/examples/kubernetes-auth.mdx
+++ b/website/content/docs/platform/k8s/helm/examples/kubernetes-auth.mdx
@@ -10,23 +10,37 @@ description: |-
 
 @include 'helm/version.mdx'
 
-In this example, we will walk through how to set up the [Kubernetes Auth Method](/vault/docs/auth/kubernetes).
+In this example, we will walk through how to set up the [Kubernetes Auth Method](/docs/auth/kubernetes).
 
 This assumes the following commands will be run inside a Vault pod running in Kubernetes.
 
+You will optionally need the following variables:
+
+```bash
+# JWT is a service account token that has access to the Kubernetes TokenReview API
+# You can retrieve this from inside a pod at: /var/run/secrets/kubernetes.io/serviceaccount/token
+JWT=$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)
+
+# Address of Kubernetes itself as viewed from inside a running pod
+KUBERNETES_HOST=https://${KUBERNETES_PORT_443_TCP_ADDR}:443
+
+# Kubernetes internal CA
+KUBERNETES_CA_CERT=$(cat /var/run/secrets/kubernetes.io/serviceaccount/ca.crt)
+```
+
 Exec into the Vault pod:
 
 ```bash
-kubectl exec -it vault-0 -- /bin/sh
+kubectl exec -it vault-0 /bin/sh
 ```
 
-If you didn't set `server.dev.enabled=true`, you'll need to log in to Vault first using `vault login`.
-Then run the following commands to configure the Kubernetes Auth Method:
+Then run the following command to configure the Kubernetes Auth Method:
 
 ```bash
-vault auth enable kubernetes
 vault write auth/kubernetes/config \
-    kubernetes_host=https://$KUBERNETES_SERVICE_HOST:$KUBERNETES_SERVICE_PORT
+   token_reviewer_jwt="$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)" \
+   kubernetes_host=https://${KUBERNETES_PORT_443_TCP_ADDR}:443 \
+   kubernetes_ca_cert=@/var/run/secrets/kubernetes.io/serviceaccount/ca.crt
 ```
 
-From here you can continue to configure Vault from the [Kubernetes Auth Method](/vault/docs/auth/kubernetes) documentation.
+From here you can continue to configure Vault from the [Kubernetes Auth Method](/docs/auth/kubernetes) documentation.
diff --git a/website/content/docs/platform/k8s/helm/index.mdx b/website/content/docs/platform/k8s/helm/index.mdx
index 49daba2a31afe..300016e0d6424 100644
--- a/website/content/docs/platform/k8s/helm/index.mdx
+++ b/website/content/docs/platform/k8s/helm/index.mdx
@@ -20,13 +20,11 @@ This page assumes general knowledge of [Helm](https://helm.sh/) and
 how to use it. Using Helm to install Vault requires that Helm is
 properly installed and configured with your Kubernetes cluster.
 
-@include 'kubernetes-supported-versions.mdx'
-
 ## Using the Helm Chart
 
 Helm must be installed and configured on your machine. Please refer to the [Helm
 documentation](https://helm.sh/) or the [Vault Installation to Minikube via
-Helm](/vault/tutorials/kubernetes/kubernetes-minikube-consul) tutorial.
+Helm](https://learn.hashicorp.com/tutorials/vault/kubernetes-minikube-consul) tutorial.
 
 To use the Helm chart, add the Hashicorp helm repository and check that you have
 access to the chart:
@@ -56,10 +54,10 @@ secure and less resilient installation that is **NOT** appropriate for a
 production setup. It is highly recommended to use a [properly secured Kubernetes
 cluster](https://kubernetes.io/docs/tasks/administer-cluster/securing-a-cluster/),
 [learn the available configuration
-options](/vault/docs/platform/k8s/helm/configuration), and read the [production deployment
-checklist](/vault/docs/platform/k8s/helm/run#architecture).
+options](/docs/platform/k8s/helm/configuration), and read the [production deployment
+checklist](/docs/platform/k8s/helm/run#architecture).
 
 ## Tutorial
 
-Refer to the [Kubernetes](/vault/tutorials/kubernetes)
+Refer to the [Kubernetes](https://learn.hashicorp.com/collections/vault/kubernetes)
 tutorials series to learn how to run Vault on Kubernetes.
diff --git a/website/content/docs/platform/k8s/helm/openshift.mdx b/website/content/docs/platform/k8s/helm/openshift.mdx
index 637533174b8b2..3373cb44cd35f 100644
--- a/website/content/docs/platform/k8s/helm/openshift.mdx
+++ b/website/content/docs/platform/k8s/helm/openshift.mdx
@@ -21,7 +21,7 @@ using `hostPath` mounting in production or
 [certify Helm charts](https://github.com/redhat-certification/chart-verifier/blob/dbf89bff2d09142e4709d689a9f4037a739c2244/docs/helm-chart-checks.md#table-2-helm-chart-default-checks)
 using CSI objects because pods must run as privileged. If you would like to run the Secrets Store
 CSI driver on a development or testing cluster, refer to
-[installation instructions for the Vault CSI provider](/vault/docs/platform/k8s/csi/installation).
+[installation instructions for the Vault CSI provider](/docs/platform/k8s/csi/installation).
 
 ## Requirements
 
@@ -42,8 +42,8 @@ deployments, Raft integrated storage is recommended.
 The documentation, configuration and examples for Vault Helm and Vault K8s Agent Injector
 are applicable to OpenShift installations. For more examples see the existing documentation:
 
-- [Vault Helm documentation](/vault/docs/platform/k8s/helm)
-- [Vault K8s documentation](/vault/docs/platform/k8s/injector)
+- [Vault Helm documentation](/docs/platform/k8s/helm)
+- [Vault K8s documentation](/docs/platform/k8s/injector)
 
 ## Helm Chart
 
@@ -64,8 +64,8 @@ secure and less resilient installation that is **NOT** appropriate for a
 production setup. It is highly recommended to use a [properly secured Kubernetes
 cluster](https://kubernetes.io/docs/tasks/administer-cluster/securing-a-cluster/),
 [learn the available configuration
-options](/vault/docs/platform/k8s/helm/configuration), and read the [production deployment
-checklist](/vault/docs/platform/k8s/helm/run#architecture).
+options](/docs/platform/k8s/helm/configuration), and read the [production deployment
+checklist](/docs/platform/k8s/helm/run#architecture).
 
 ## How-To
 
@@ -204,5 +204,5 @@ $ helm install vault hashicorp/vault \
 ## Tutorial
 
 Refer to the [Integrate a Kubernetes Cluster with an
-External Vault](/vault/tutorials/kubernetes/kubernetes-external-vault)
+External Vault](https://learn.hashicorp.com/vault/getting-started-k8s/external-vault)
 tutorial to learn how to use an external Vault within a Kubernetes cluster.
diff --git a/website/content/docs/platform/k8s/helm/run.mdx b/website/content/docs/platform/k8s/helm/run.mdx
index cec137ee96e0c..bf2cf70de453f 100644
--- a/website/content/docs/platform/k8s/helm/run.mdx
+++ b/website/content/docs/platform/k8s/helm/run.mdx
@@ -33,8 +33,8 @@ secure and less resilient installation that is **NOT** appropriate for a
 production setup. It is highly recommended to use a [properly secured Kubernetes
 cluster](https://kubernetes.io/docs/tasks/administer-cluster/securing-a-cluster/),
 [learn the available configuration
-options](/vault/docs/platform/k8s/helm/configuration), and read the [production deployment
-checklist](/vault/docs/platform/k8s/helm/run#architecture).
+options](/docs/platform/k8s/helm/configuration), and read the [production deployment
+checklist](/docs/platform/k8s/helm/run#architecture).
 
 ## How-To
 
@@ -42,7 +42,7 @@ checklist](/vault/docs/platform/k8s/helm/run#architecture).
 
 Helm must be installed and configured on your machine. Please refer to the [Helm
 documentation](https://helm.sh/) or the [Vault Installation to Minikube via
-Helm](/vault/tutorials/kubernetes/kubernetes-minikube-consul) tutorial.
+Helm](https://learn.hashicorp.com/vault/getting-started-k8s/minikube) tutorial.
 
 To use the Helm chart, add the Hashicorp helm repository and check that you have
 access to the chart:
@@ -127,7 +127,7 @@ $ helm install vault hashicorp/vault \
 ```
 
 Refer to the [Vault Installation to Minikube via
-Helm](/vault/tutorials/kubernetes/kubernetes-minikube-consul) tutorial
+Helm](https://learn.hashicorp.com/vault/getting-started-k8s/minikube) tutorial
 to learn how to set up Consul and Vault in HA mode.
 
 #### External mode
@@ -143,14 +143,14 @@ $ helm install vault hashicorp/vault \
 ```
 
 Refer to the [Integrate a Kubernetes Cluster with an
-External Vault](/vault/tutorials/kubernetes/kubernetes-external-vault)
+External Vault](https://learn.hashicorp.com/vault/getting-started-k8s/external-vault)
 tutorial to learn how to use an external Vault within a Kubernetes cluster.
 
 ### View the Vault UI
 
 The Vault UI is enabled but NOT exposed as service for security reasons. The
 Vault UI can also be exposed via port-forwarding or through a [`ui`
-configuration value](/vault/docs/platform/k8s/helm/configuration/#ui).
+configuration value](/docs/platform/k8s/helm/configuration/#ui).
 
 Expose the Vault UI with port-forwarding:
 
@@ -165,9 +165,9 @@ Forwarding from [::1]:8200 -> 8200
 
 After the Vault Helm chart is installed in `standalone` or `ha` mode one of the
 Vault servers need to be
-[initialized](/vault/docs/commands/operator/init). The
+[initialized](/docs/commands/operator/init). The
 initialization generates the credentials necessary to
-[unseal](/vault/docs/concepts/seal#why) all the Vault
+[unseal](/docs/concepts/seal#why) all the Vault
 servers.
 
 #### CLI initialize and unseal
@@ -222,7 +222,7 @@ vault-2                                 1/1     Running   0          1m49s
 #### Google KMS Auto Unseal
 
 The Helm chart may be run with [Google KMS for Auto
-Unseal](/vault/docs/configuration/seal/gcpckms). This enables Vault server pods to
+Unseal](/docs/configuration/seal/gcpckms). This enables Vault server pods to
 auto unseal if they are rescheduled.
 
 Vault Helm requires the Google Cloud KMS credentials stored in
@@ -292,7 +292,7 @@ server:
 #### Amazon KMS Auto Unseal
 
 The Helm chart may be run with [AWS KMS for Auto
-Unseal](/vault/docs/configuration/seal/awskms). This enables Vault server pods to auto
+Unseal](/docs/configuration/seal/awskms). This enables Vault server pods to auto
 unseal if they are rescheduled.
 
 Vault Helm requires the AWS credentials stored as environment variables that
@@ -353,7 +353,7 @@ Probes are essential for detecting failures, rescheduling and using pods in
 Kubernetes. The helm chart offers configurable readiness and liveliness probes
 which can be customized for a variety of use cases.
 
-Vault's [/sys/health`](/vault/api-docs/system/health) endpoint can be customized to
+Vault's [/sys/health`](/api-docs/system/health) endpoint can be customized to
 change the behavior of the health check. For example, we can change the Vault
 readiness probe to show the Vault pods are ready even if they're still uninitialized
 and sealed using the following probe:
@@ -371,9 +371,9 @@ pod is ready for additional setup.
 ### Upgrading Vault on Kubernetes
 
 To upgrade Vault on Kubernetes, we follow the same pattern as
-[generally upgrading Vault](/vault/docs/upgrading), except we can use
+[generally upgrading Vault](/docs/upgrading), except we can use
 the Helm chart to update the Vault server StatefulSet. It is important to understand
-how to [generally upgrade Vault](/vault/docs/upgrading) before reading this
+how to [generally upgrade Vault](/docs/upgrading) before reading this
 section.
 
 The Vault StatefulSet uses `OnDelete` update strategy. It is critical to use `OnDelete` instead
@@ -409,14 +409,14 @@ Next, list the Helm versions and choose the desired version to install.
 ```bash
 $ helm search repo hashicorp/vault
 NAME           	CHART VERSION	APP VERSION	DESCRIPTION
-hashicorp/vault	0.24.0       	1.13.1     	Official HashiCorp Vault Chart
+hashicorp/vault	0.23.0       	1.12.1     	Official HashiCorp Vault Chart
 ```
 
 Next, test the upgrade with `--dry-run` first to verify the changes sent to the
 Kubernetes cluster.
 
 ```shell-session
-$ helm upgrade vault hashicorp/vault --version=0.24.0 \
+$ helm upgrade vault hashicorp/vault --version=0.23.0 \
     --set='server.image.repository=vault' \
     --set='server.image.tag=123.456' \
     --dry-run
@@ -453,10 +453,10 @@ Select the active Vault pod:
 $ kubectl get pods -l vault-active=true
 ```
 
-Next, sequentially delete every pod that is not the active primary, ensuring the quorum is maintained at all times:
+Next, delete every pod that is not the active primary:
 
 ```shell-session
-$ kubectl delete pod <name of Vault pod>
+$ kubectl delete pod <name of Vault pods>
 ```
 
 If auto-unseal is not being used, the newly scheduled Vault standby pods needs
@@ -530,10 +530,10 @@ $ helm install vault hashicorp/vault \
 ## Architecture
 
 We recommend running Vault on Kubernetes with the same
-[general architecture](/vault/docs/internals/architecture)
+[general architecture](/docs/internals/architecture)
 as running it anywhere else. There are some benefits Kubernetes can provide
 that eases operating a Vault cluster and we document those below. The standard
-[production deployment](/vault/tutorials/operations/production-hardening) tutorial is still an
+[production deployment](https://learn.hashicorp.com/vault/day-one/production-hardening) tutorial is still an
 important read even if running Vault within Kubernetes.
 
 ### Production Deployment Checklist
@@ -542,14 +542,14 @@ _End-to-End TLS._ Vault should always be used with TLS in production. If
 intermediate load balancers or reverse proxies are used to front Vault,
 they should not terminate TLS. This way traffic is always encrypted in transit
 to Vault and minimizes risks introduced by intermediate layers. See the
-[official documentation](/vault/docs/platform/k8s/helm/examples/standalone-tls/)
+[official documentation](/docs/platform/k8s/helm/examples/standalone-tls/)
 for example on configuring Vault Helm to use TLS.
 
 _Single Tenancy._ Vault should be the only main process running on a machine.
 This reduces the risk that another process running on the same machine is
 compromised and can interact with Vault. This can be accomplished by using Vault
 Helm's `affinity` configurable. See the
-[official documentation](/vault/docs/platform/k8s/helm/examples/ha-with-consul/)
+[official documentation](/docs/platform/k8s/helm/examples/ha-with-consul/)
 for example on configuring Vault Helm to use affinity rules.
 
 _Enable Auditing._ Vault supports several auditing backends. Enabling auditing
@@ -558,7 +558,7 @@ trail in the case of misuse or compromise. Audit logs securely hash any sensitiv
 data, but access should still be restricted to prevent any unintended disclosures.
 Vault Helm includes a configurable `auditStorage` option that provisions a persistent
 volume to store audit logs. See the
-[official documentation](/vault/docs/platform/k8s/helm/examples/standalone-audit/)
+[official documentation](/docs/platform/k8s/helm/examples/standalone-audit/)
 for an example on configuring Vault Helm to use auditing.
 
 _Immutable Upgrades._ Vault relies on an external storage backend for persistence,
diff --git a/website/content/docs/platform/k8s/helm/terraform.mdx b/website/content/docs/platform/k8s/helm/terraform.mdx
index 8e0f8ec3db9c9..e0ac12e0f02b7 100644
--- a/website/content/docs/platform/k8s/helm/terraform.mdx
+++ b/website/content/docs/platform/k8s/helm/terraform.mdx
@@ -10,7 +10,7 @@ description: |-
 
 Terraform may also be used to configure and deploy the Vault Helm chart, by using the [Helm provider](https://registry.terraform.io/providers/hashicorp/helm/latest/docs).
 
-For example, to configure the chart to deploy [HA Vault with integrated storage (raft)](/vault/docs/platform/k8s/helm/examples/ha-with-raft), the values overrides can be set on the command-line, in a values yaml file, or with a Terraform configuration:
+For example, to configure the chart to deploy [HA Vault with integrated storage (raft)](/docs/platform/k8s/helm/examples/ha-with-raft), the values overrides can be set on the command-line, in a values yaml file, or with a Terraform configuration:
 
 <CodeTabs>
 <CodeBlockConfig>
diff --git a/website/content/docs/platform/k8s/index.mdx b/website/content/docs/platform/k8s/index.mdx
index f1e09fb53be4b..38c9058681234 100644
--- a/website/content/docs/platform/k8s/index.mdx
+++ b/website/content/docs/platform/k8s/index.mdx
@@ -22,19 +22,19 @@ Kubernetes, as long as they can communicate to the server via the network.
 
 **Accessing and Storing Secrets:** Applications using the Vault service running in
 Kubernetes can access and store secrets from Vault using a number of different
-[secret engines](/vault/docs/secrets) and [authentication methods](/vault/docs/auth).
+[secret engines](/docs/secrets) and [authentication methods](/docs/auth).
 
 **Running a Highly Available Vault Service:** By using pod affinities, highly available
-backend storage (such as Consul) and [auto-unseal](/vault/docs/concepts/seal#auto-unseal),
+backend storage (such as Consul) and [auto-unseal](/docs/concepts/seal#auto-unseal),
 Vault can become a highly available service in Kubernetes.
 
 **Encryption as a Service:** Applications using the Vault service running in Kubernetes
-can leverage the [Transit secret engine](/vault/docs/secrets/transit)
+can leverage the [Transit secret engine](/docs/secrets/transit)
 as "encryption as a service". This allows applications to offload encryption needs
 to Vault before storing data at rest.
 
 **Audit Logs for Vault:** Operators can choose to attach a persistent volume
-to the Vault cluster which can be used to [store audit logs](/vault/docs/audit).
+to the Vault cluster which can be used to [store audit logs](/docs/audit).
 
 **And more!** Vault can run directly on Kubernetes, so in addition to the
 native integrations provided by Vault itself, any other tool built for
@@ -46,38 +46,16 @@ There are several ways to try Vault with Kubernetes in different environments.
 
 ### Guides
 
-- [Vault Installation to Minikube via Helm with Integrated Storage](/vault/tutorials/kubernetes/kubernetes-minikube-raft) covers installing Vault locally using Minikube and the official Helm chart.
+- [Vault Installation to Minikube via Helm with Integrated Storage](https://learn.hashicorp.com/tutorials/vault/kubernetes-minikube-raft) covers installing Vault locally using Minikube and the official Helm chart.
 
-- [Vault Installation to Red Hat OpenShift via Helm](/vault/tutorials/kubernetes/kubernetes-openshift) covers installing Vault using Helm on Red Hat's OpenShift platform.
+- [Vault Installation to Red Hat OpenShift via Helm](https://learn.hashicorp.com/tutorials/vault/kubernetes-openshift) covers installing Vault using Helm on Red Hat's OpenShift platform.
 
-- [Integrate a Kubernetes Cluster with an External Vault](/vault/tutorials/kubernetes/kubernetes-external-vault) provides an example of making Vault accessible via a Kubernetes service and endpoint.
+- [Integrate a Kubernetes Cluster with an External Vault](https://learn.hashicorp.com/tutorials/vault/kubernetes-external-vault) provides an example of making Vault accessible via a Kubernetes service and endpoint.
 
-- [Vault on Kubernetes Deployment Guide](/vault/tutorials/kubernetes/kubernetes-raft-deployment-guide) covers the steps required to install and configure a single HashiCorp Vault cluster as defined in the [Vault on Kubernetes Reference Architecture](/vault/tutorials/kubernetes/kubernetes-reference-architecture).
-
-### High Level Comparison of Integrations
-
-There are currently 3 different integrations to help Kubernetes workloads seamlessly consume secrets from Vault, without the need to modify the application to interact directly with Vault. Each integration addresses slightly different use-cases. The following is a brief overview of the strengths of each integration.
-
-#### Agent Injector
-
-- No durable secret storage outside Vault. All secrets written to disk are in ephemeral in-memory volumes.
-- No highly privileged service accounts required. All secrets are fetched with the pod's own service account without the need for any other service accounts to impersonate it.
-- More mature solution, with proven production record and advanced features like templating,
-  wider array of auth methods, etc.
-
-#### Vault Secrets Operator
-
-- More native UX for app developers. Workloads can mount Kubernetes secrets without adding any Vault-specific configuration.
-- Reduced load on Vault. Secrets are synced per CRD instead of per consuming pod.
-- Better Vault secret availability. Kubernetes secrets act as a durable cluster-local cache of Vault secrets.
-
-#### Vault CSI Provider
-
-- The CSI driver that the provider is based on is vendor neutral.
-- No durable secret storage outside Vault if the secret sync feature isn't used. All secrets written to disk are in ephemeral in-memory volumes.
+- [Vault on Kubernetes Deployment Guide](https://learn.hashicorp.com/tutorials/vault/kubernetes-raft-deployment-guide) covers the steps required to install and configure a single HashiCorp Vault cluster as defined in the [Vault on Kubernetes Reference Architecture](https://learn.hashicorp.com/tutorials/vault/kubernetes-reference-architecture).
 
 ### Documentation
 
-- [Vault on Kubernetes Reference Architecture](/vault/tutorials/kubernetes/kubernetes-reference-architecture) provides recommended practices for running Vault on Kubernetes in production.
+- [Vault on Kubernetes Reference Architecture](https://learn.hashicorp.com/tutorials/vault/kubernetes-reference-architecture) provides recommended practices for running Vault on Kubernetes in production.
 
-- [Vault on Kubernetes Security Considerations](/vault/tutorials/kubernetes/kubernetes-security-concerns) provides recommendations specific to securely running Vault in a production Kubernetes environment.
+- [Vault on Kubernetes Security Considerations](https://learn.hashicorp.com/tutorials/vault/kubernetes-security-concerns) provides recommendations specific to securely running Vault in a production Kubernetes environment.
diff --git a/website/content/docs/platform/k8s/injector-csi.mdx b/website/content/docs/platform/k8s/injector-csi.mdx
index 819e1d4fe9615..de2771a9d1e5d 100644
--- a/website/content/docs/platform/k8s/injector-csi.mdx
+++ b/website/content/docs/platform/k8s/injector-csi.mdx
@@ -12,13 +12,13 @@ Information contained within this document details the contrast between the Agen
 
 ## Vault Sidecar Agent Injector
 
-The [Vault Sidecar Agent Injector](/vault/docs/platform/k8s/injector) leverages the [sidecar pattern](https://docs.microsoft.com/en-us/azure/architecture/patterns/sidecar) to alter pod specifications to include a Vault Agent container that renders Vault secrets to a shared memory volume. By rendering secrets to a shared volume, containers within the pod can consume Vault secrets without being Vault-aware. The injector is a Kubernetes mutating webhook controller. The controller intercepts pod events and applies mutations to the pod if annotations exist within the request. This functionality is provided by the [vault-k8s](https://github.com/hashicorp/vault-k8s) project and can be automatically installed and configured using the Vault Helm chart.
+The [Vault Sidecar Agent Injector](/docs/platform/k8s/injector) leverages the [sidecar pattern](https://docs.microsoft.com/en-us/azure/architecture/patterns/sidecar) to alter pod specifications to include a Vault Agent container that renders Vault secrets to a shared memory volume. By rendering secrets to a shared volume, containers within the pod can consume Vault secrets without being Vault-aware. The injector is a Kubernetes mutating webhook controller. The controller intercepts pod events and applies mutations to the pod if annotations exist within the request. This functionality is provided by the [vault-k8s](https://github.com/hashicorp/vault-k8s) project and can be automatically installed and configured using the Vault Helm chart.
 
 ![Vault Sidecar Injection Workflow](/img/vault-sidecar-inject-workflow.png)
 
 ## Vault CSI Provider
 
-The [Vault CSI provider](/vault/docs/platform/k8s/csi) allows pods to consume Vault secrets by using ephemeral [CSI Secrets Store](https://github.com/kubernetes-sigs/secrets-store-csi-driver) volumes. At a high level, the CSI Secrets Store driver enables users to create `SecretProviderClass` objects. These objects define which secret provider to use and what secrets to retrieve. When pods requesting CSI volumes are made, the CSI Secrets Store driver sends the request to the Vault CSI provider if the provider is `vault`. The Vault CSI provider then uses the specified `SecretProviderClass` and the pod’s service account to retrieve the secrets from Vault and mount them into the pod’s CSI volume. Note that the secret is retrieved from Vault and populated to the CSI secrets store volume during the `ContainerCreation` phase. Therefore, pods are blocked from starting until the secrets are read from Vault and written to the volume.
+The [Vault CSI provider](/docs/platform/k8s/csi) allows pods to consume Vault secrets by using ephemeral [CSI Secrets Store](https://github.com/kubernetes-sigs/secrets-store-csi-driver) volumes. At a high level, the CSI Secrets Store driver enables users to create `SecretProviderClass` objects. These objects define which secret provider to use and what secrets to retrieve. When pods requesting CSI volumes are made, the CSI Secrets Store driver sends the request to the Vault CSI provider if the provider is `vault`. The Vault CSI provider then uses the specified `SecretProviderClass` and the pod’s service account to retrieve the secrets from Vault and mount them into the pod’s CSI volume. Note that the secret is retrieved from Vault and populated to the CSI secrets store volume during the `ContainerCreation` phase. Therefore, pods are blocked from starting until the secrets are read from Vault and written to the volume.
 
 ![Vault Sidecar Injection Workflow](/img/vault-csi-workflow.png)
 
@@ -52,7 +52,7 @@ Both Agent Injection and Vault CSI solutions have the following similarities:
 
 - They simplify retrieving different types of secrets stored in Vault and expose them to the target pod running on Kubernetes without knowing the not-so-trivial Vault processes. It’s important to note that there is no need to change the application logic or code to use these solutions, therefore, making it easier to migrate brownfield applications into Kubernetes. Developers working on greenfield applications can leverage the Vault SDKs to integrate with Vault directly.
 
-- They support all types of Vault [secrets engines](/vault/docs/secrets). This support allows you to leverage an extensive set of secret types, ranging from static key-value secrets to dynamically generated database credentials and TLS certs with customized TTL.
+- They support all types of Vault [secrets engines](/docs/secrets). This support allows you to leverage an extensive set of secret types, ranging from static key-value secrets to dynamically generated database credentials and TLS certs with customized TTL.
 
 - They leverage the application’s Kubernetes pod service account token as [Secret Zero](https://www.hashicorp.com/resources/secret-zero-mitigating-the-risk-of-secret-introduction-with-vault) to authenticate with Vault via the Kubernetes auth method. With this method, there is no need to manage yet another separate identity to identify the application pods when authenticating to Vault.
 
@@ -81,21 +81,21 @@ Now that you understand the similarities, there are differences between these tw
 
 - In contrast, the Vault CSI Driver is deployed as a daemonset on every node in the Kubernetes cluster and uses the Secret Provider Class specified and the pod’s service account to retrieve the secrets from Vault and mount them into the pod’s CSI volume.
 
-- The Sidecar Agent Injector supports [all](/vault/docs/platform/k8s/injector/annotations#vault-hashicorp-com-auth-path) Vault [auto-auth](/vault/docs/agent-and-proxy/autoauth/methods) methods. The Sidecar CSI driver supports only Vault’s [Kubernetes auth method](/vault/docs/platform/k8s/csi/configurations#vaultkubernetesmountpath).
+- The Sidecar Agent Injector supports [all](/docs/platform/k8s/injector/annotations#vault-hashicorp-com-auth-path) Vault [auto-auth](/docs/agent/autoauth/methods) methods. The Sidecar CSI driver supports only Vault’s [Kubernetes auth method](/docs/platform/k8s/csi/configurations#vaultkubernetesmountpath).
 
 - The Sidecar container launched with every application pod uses [Vault Agent](https://www.hashicorp.com/blog/why-use-the-vault-agent-for-secrets-management), which provides a powerful set of capabilities such as auto-auth, templating, and caching. The CSI driver does not use the Vault Agent and therefore lacks these functionalities.
 
-- The Vault CSI driver supports rendering Vault secrets into Kubernetes secrets and environment variables. Sidecar Injector Service does not support rendering secrets into Kubernetes secrets; however, there are ways to [agent templating](/vault/docs/platform/k8s/injector/examples#environment-variable-example) to render secrets into environment variables.
+- The Vault CSI driver supports rendering Vault secrets into Kubernetes secrets and environment variables. Sidecar Injector Service does not support rendering secrets into Kubernetes secrets; however, there are ways to [agent templating](/docs/platform/k8s/injector/examples#environment-variable-example) to render secrets into environment variables.
 
 - The CSI driver uses `hostPath` to mount ephemeral volumes into the pods, which some container platforms (e.g., OpenShift) disable by default. On the other hand, Sidecar Agent Service uses in-memory _tmpfs_ volumes.
 
-- Sidecar Injector Service [automatically](/vault/docs/agent-and-proxy/agent/template#renewals-and-updating-secrets) renews, rotates, and fetches secrets/tokens while the CSI Driver does not support that.
+- Sidecar Injector Service [automatically](/docs/agent/template#renewals-and-updating-secrets) renews, rotates, and fetches secrets/tokens while the CSI Driver does not support that.
 
 ## Comparison chart
 
 The below chart provides a high-level comparison between the two solutions.
 
-~> **Note:** Shared Memory Volume Environment Variable can be achieved through [Agent templating](/vault/docs/platform/k8s/injector/examples#environment-variable-example).
+~> **Note:** Shared Memory Volume Environment Variable can be achieved through [Agent templating](/docs/platform/k8s/injector/examples#environment-variable-example).
 
 ![Comparison Chart](/img/comparison-table.png)
 
@@ -119,10 +119,10 @@ Designing secrets management in Kubernetes is an intricate task. There are multi
 
 - [Retrieve HashiCorp Vault Secrets with Kubernetes CSI](https://www.hashicorp.com/blog/retrieve-hashicorp-vault-secrets-with-kubernetes-csi)
 
-- [Mount Vault Secrets Through Container Storage Interface (CSI) Volume](/vault/tutorials/kubernetes/kubernetes-secret-store-driver)
+- [Mount Vault Secrets Through Container Storage Interface (CSI) Volume](https://learn.hashicorp.com/tutorials/vault/kubernetes-secret-store-driver?in=vault/kubernetes)
 
-- [Injecting Secrets into Kubernetes Pods via Vault Agent Containers](/vault/tutorials/kubernetes/kubernetes-sidecar)
+- [Injecting Secrets into Kubernetes Pods via Vault Agent Containers](https://learn.hashicorp.com/tutorials/vault/kubernetes-sidecar)
 
-- [Vault Sidecar Injector Configurations and Examples](/vault/docs/platform/k8s/injector/annotations)
+- [Vault Sidecar Injector Configurations and Examples](/docs/platform/k8s/injector/annotations)
 
-- [Vault CSI Driver Configurations and Examples](/vault/docs/platform/k8s/csi/configurations)
+- [Vault CSI Driver Configurations and Examples](/docs/platform/k8s/csi/configurations)
diff --git a/website/content/docs/platform/k8s/injector/annotations.mdx b/website/content/docs/platform/k8s/injector/annotations.mdx
index 62f5b9a5e1d51..33be2712ee45b 100644
--- a/website/content/docs/platform/k8s/injector/annotations.mdx
+++ b/website/content/docs/platform/k8s/injector/annotations.mdx
@@ -95,11 +95,11 @@ them, optional commands to run, etc.
 - `vault.hashicorp.com/template-config-exit-on-retry-failure` - controls whether
   Vault Agent exits after it has exhausted its number of template retry attempts
   due to failures. Defaults to `true`. See [Vault Agent Template
-  Config](/vault/docs/agent-and-proxy/agent/template#template-configurations) for more details.
+  Config](/docs/agent/template-config) for more details.
 
 - `vault.hashicorp.com/template-static-secret-render-interval` - If specified,
   configures how often Vault Agent Template should render non-leased secrets such as KV v2.
-  See [Vault Agent Template Config](/vault/docs/agent-and-proxy/agent/template#template-configurations) for more details.
+  See [Vault Agent Template Config](/docs/agent/template-config) for more details.
 
 - `vault.hashicorp.com/agent-extra-secret` - mounts Kubernetes secret as a volume at
   `/vault/custom` in the sidecar/init containers. Useful for custom Agent configs with
@@ -197,7 +197,7 @@ them, optional commands to run, etc.
   Defaults to `false`.
 
 - `vault.hashicorp.com/agent-cache-enable` - configures Vault Agent to enable
-  [caching](/vault/docs/agent-and-proxy/agent/caching). In Vault 1.7+ this annotation will also enable
+  [caching](/docs/agent/caching). In Vault 1.7+ this annotation will also enable
   a Vault Agent persistent cache. This persistent cache will be shared between the init
   and sidecar container to reuse tokens and leases retrieved by the init container.
   Defaults to `false`.
@@ -215,7 +215,7 @@ them, optional commands to run, etc.
 
 - `vault.hashicorp.com/agent-service-account-token-volume-name` - the optional name of a projected volume containing a service account token for use with auto-auth against Vault's Kubernetes auth method. If the volume is mounted to another container in the deployment, the token volume will be mounted to the same location in the vault-agent containers. Otherwise it will be mounted at the default location of `/var/run/secrets/vault.hashicorp.com/serviceaccount/`.
 
-- `vault.hashicorp.com/agent-enable-quit` - enable the [`/agent/v1/quit` endpoint](/vault/docs/agent-and-proxy/agent#quit) on an injected agent. This option defaults to false, and if true will be set on the existing cache listener, or a new localhost listener with a basic cache stanza configured. The [agent-cache-listener-port annotation](/vault/docs/platform/k8s/injector/annotations#vault-hashicorp-com-agent-cache-listener-port) can be used to change the port.
+- `vault.hashicorp.com/agent-enable-quit` - enable the [`/agent/v1/quit` endpoint](/docs/agent#quit) on an injected agent. This option defaults to false, and if true will be set on the existing cache listener, or a new localhost listener with a basic cache stanza configured. The [agent-cache-listener-port annotation](/docs/platform/k8s/injector/annotations#vault-hashicorp-com-agent-cache-listener-port) can be used to change the port.
 
 - `vault.hashicorp.com/agent-telemetry` - specifies the [telemetry](/vault/docs/configuration/telemetry) configuration for the
   Vault Agent sidecar. The name of the config is any unique string after
@@ -244,20 +244,20 @@ etc.
   This annotation can be reused multiple times to configure multiple settings for the authentication
   method. Some authentication methods may require additional secrets and should be mounted via the
   `vault.hashicorp.com/agent-extra-secret` annotation. For a list of valid authentication configurations,
-  see the Vault Agent [auto-auth documentation](/vault/docs/agent-and-proxy/autoauth/methods).
+  see the Vault Agent [auto-auth documentation](/docs/agent/autoauth/methods).
 
 - `vault.hashicorp.com/auth-path` - configures the authentication path for the Kubernetes
   auth method. Defaults to `auth/kubernetes`.
 
 - `vault.hashicorp.com/auth-type` - configures the authentication type for Vault Agent.
   Defaults to `kubernetes`. For a list of valid authentication methods, see the Vault Agent
-  [auto-auth documentation](/vault/docs/agent-and-proxy/autoauth/methods).
+  [auto-auth documentation](/docs/agent/autoauth/methods).
 
-- `vault.hashicorp.com/auth-min-backoff` - set the [min_backoff](/vault/docs/agent-and-proxy/autoauth#min_backoff) option in the auto-auth config. Requires Vault 1.11+.
+- `vault.hashicorp.com/auth-min-backoff` - set the [min_backoff](/docs/agent/autoauth#min_backoff) option in the auto-auth config. Requires Vault 1.11+.
 
-- `vault.hashicorp.com/auth-max-backoff` - set the [max_backoff](/vault/docs/agent-and-proxy/autoauth#max_backoff) option in the auto-auth config
+- `vault.hashicorp.com/auth-max-backoff` - set the [max_backoff](/docs/agent/autoauth#max_backoff) option in the auto-auth config
 
-- `vault.hashicorp.com/agent-auto-auth-exit-on-err` - set the [exit_on_err](/vault/docs/agent-and-proxy/autoauth#exit_on_err) option in the auto-auth config
+- `vault.hashicorp.com/agent-auto-auth-exit-on-err` - set the [exit_on_err](/docs/agent/autoauth#exit_on_err) option in the auto-auth config
 
 - `vault.hashicorp.com/ca-cert` - path of the CA certificate used to verify Vault's
   TLS.
@@ -314,14 +314,14 @@ etc.
   value to true in a production environment.
 
 - `vault.hashicorp.com/agent-disable-idle-connections` - Comma-separated [list
-  of Vault Agent features](/vault/docs/agent-and-proxy/agent#disable_idle_connections) where idle
+  of Vault Agent features](/docs/agent#disable_idle_connections) where idle
   connections should be disabled. Also available as a command-line option
   (`-disable-idle-connections`) or environment variable
   (`AGENT_INJECT_DISABLE_IDLE_CONNECTIONS`) to set the default for all injected
   Agents.
 
 - `vault.hashicorp.com/agent-disable-keep-alives` - Comma-separated [list of
-  Vault Agent features](/vault/docs/agent-and-proxy/agent#disable_keep_alives) where keep-alives
+  Vault Agent features](/docs/agent#disable_keep_alives) where keep-alives
   should be disabled. Also available as a command-line option
   (`-disable-keep-alives`) or environment variable
   (`AGENT_INJECT_DISABLE_KEEP_ALIVES`) to set the default for all injected
diff --git a/website/content/docs/platform/k8s/injector/examples.mdx b/website/content/docs/platform/k8s/injector/examples.mdx
index 240922fe8a069..1e397c079719c 100644
--- a/website/content/docs/platform/k8s/injector/examples.mdx
+++ b/website/content/docs/platform/k8s/injector/examples.mdx
@@ -40,7 +40,7 @@ which is on port `8080`.
 - the service account should be bound to a Vault role with a policy enabling access to desired secrets.
 
 For more information on configuring the Vault Kubernetes auth method,
-[see the official documentation](/vault/docs/auth/kubernetes#configuration).
+[see the official documentation](/docs/auth/kubernetes#configuration).
 
 ## Debugging
 
@@ -144,7 +144,7 @@ spec:
 
 The following example creates a deployment that mounts a Kubernetes ConfigMap
 containing Vault Agent configuration files. For a complete list of the Vault
-Agent configuration settings, [see the Agent documentation](/vault/docs/agent-and-proxy/agent/template#vault-agent-templates).
+Agent configuration settings, [see the Agent documentation](/docs/agent/template#vault-agent-templates).
 
 ```yaml
 ---
@@ -276,7 +276,7 @@ spec:
         vault.hashicorp.com/agent-inject-secret-config: 'secret/data/web'
         # Environment variable export template
         vault.hashicorp.com/agent-inject-template-config: |
-          {{- with secret "secret/data/web" -}}
+          {{ with secret "secret/data/web" -}}
             export api_key="{{ .Data.data.payments_api_key }}"
           {{- end }}
     spec:
@@ -340,48 +340,3 @@ spec:
           ports:
             - containerPort: 9090
 ```
-
-## PKI Cert Example
-
-The following example demonstrates how to use the [`pkiCert` function][pkiCert] and
-[`writeToFile` function][writeToFile] from consul-template to create two files
-from a template: one for the certificate and CA (`cert.pem`) and one for the key
-(`cert.key`) generated by [Vault's PKI Secrets Engine](/vault/docs/secrets/pki).
-
-```yaml
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: web-deployment
-  labels:
-    app: web
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: web
-  template:
-    metadata:
-      labels:
-        app: web
-      annotations:
-        vault.hashicorp.com/agent-inject: 'true'
-        vault.hashicorp.com/role: 'web'
-        vault.hashicorp.com/agent-inject-secret-certs: 'pki/issue/cert'
-        vault.hashicorp.com/agent-inject-template-certs: |
-          {{- with pkiCert "pki/issue/cert" "common_name=test.example.com" "ttl=2h" -}}
-          {{ .Cert }}{{ .CA }}{{ .Key }}
-          {{ .Key | writeToFile "/vault/secrets/cert.key" "vault" "vault" "0644" }}
-          {{ .CA | writeToFile "/vault/secrets/cert.pem" "vault" "vault" "0644" }}
-          {{ .Cert | writeToFile "/vault/secrets/cert.pem" "vault" "vault" "0644" "append" }}
-          {{- end -}}
-    spec:
-      serviceAccountName: web
-      containers:
-        - name: web
-          image: nginx
-```
-
-[pkiCert]: https://github.com/hashicorp/consul-template/blob/main/docs/templating-language.md#pkicert
-[writeToFile]: https://github.com/hashicorp/consul-template/blob/main/docs/templating-language.md#writeToFile
diff --git a/website/content/docs/platform/k8s/injector/index.mdx b/website/content/docs/platform/k8s/injector/index.mdx
index f55642978513b..3bc4a98b7d170 100644
--- a/website/content/docs/platform/k8s/injector/index.mdx
+++ b/website/content/docs/platform/k8s/injector/index.mdx
@@ -10,7 +10,7 @@ description: >-
 
 The Vault Agent Injector alters pod specifications to include Vault Agent
 containers that render Vault secrets to a shared memory volume using
-[Vault Agent Templates](/vault/docs/agent-and-proxy/agent/template).
+[Vault Agent Templates](/docs/agent/template).
 By rendering secrets to a shared volume, containers within the pod can consume
 Vault secrets without being Vault aware.
 
@@ -20,7 +20,20 @@ the request. This functionality is provided by the [vault-k8s](https://github.co
 project and can be automatically installed and configured using the
 [Vault Helm](https://github.com/hashicorp/vault-helm) chart.
 
-@include 'kubernetes-supported-versions.mdx'
+## Supported Kubernetes Versions
+
+The following [Kubernetes minor releases][k8s-releases] are currently supported.
+The latest version of the injector is tested against each version. It may work
+with other versions of Kubernetes, but those are not supported.
+
+* 1.26
+* 1.25
+* 1.24
+* 1.23
+* 1.22
+* 1.21
+
+[k8s-releases]: https://kubernetes.io/releases/
 
 ## Overview
 
@@ -126,7 +139,7 @@ vault.hashicorp.com/agent-inject-template-<unique-name>: |
 For example, consider the following:
 
 ```yaml
-vault.hashicorp.com/agent-inject-secret-foo: 'database/creds/db-app'
+vault.hashicorp.com/agent-inject-secret-foo: 'database/roles/app'
 vault.hashicorp.com/agent-inject-template-foo: |
   {{- with secret "database/creds/db-app" -}}
   postgres://{{ .Data.username }}:{{ .Data.password }}@postgres:5432/mydb?sslmode=disable
@@ -174,7 +187,7 @@ username: v-kubernet-pg-app-q0Z7WPfVNqqTJuoDqCTY-1576529094
 ### Renewals and Updating Secrets
 
 For more information on when Vault Agent fetches and renews secrets, see the
-[Agent documentation](/vault/docs/agent-and-proxy/agent/template#renewals-and-updating-secrets).
+[Agent documentation](/docs/agent/template#renewals-and-updating-secrets).
 
 ### Vault Agent Configuration Map
 
@@ -188,10 +201,10 @@ The configuration map must contain either one or both of the following files:
 - **config-init.hcl** used by the init container. This must have `exit_after_auth` set to `true`.
 - **config.hcl** used by the sidecar container. This must have `exit_after_auth` set to `false`.
 
-An example of mounting a Vault Agent configmap [can be found here](/vault/docs/platform/k8s/injector/examples#configmap-example).
+An example of mounting a Vault Agent configmap [can be found here](/docs/platform/k8s/injector/examples#configmap-example).
 
 ## Tutorial
 
 Refer to the [Injecting Secrets into Kubernetes Pods via Vault Helm
-Sidecar](/vault/tutorials/kubernetes/kubernetes-sidecar) guide
+Sidecar](https://learn.hashicorp.com/vault/getting-started-k8s/sidecar) guide
 for a step-by-step tutorial.
diff --git a/website/content/docs/platform/k8s/injector/installation.mdx b/website/content/docs/platform/k8s/injector/installation.mdx
index 4cffe808b155d..15c5f3e4bf22c 100644
--- a/website/content/docs/platform/k8s/injector/installation.mdx
+++ b/website/content/docs/platform/k8s/injector/installation.mdx
@@ -6,7 +6,7 @@ description: The Vault Agent Sidecar Injector can be installed using Vault Helm.
 
 # Installing the Agent Injector
 
-The [Vault Helm chart](/vault/docs/platform/k8s/helm) is the recommended way to
+The [Vault Helm chart](/docs/platform/k8s/helm) is the recommended way to
 install and configure the Agent Injector in Kubernetes.
 
 ~> The Vault Agent Injector requires Vault 1.3.1 or greater.
@@ -28,7 +28,7 @@ always run Helm with `--dry-run` before any install or upgrade to verify
 changes.
 
 You can see all the available values settings by running `helm inspect values hashicorp/vault` or by reading the [Vault Helm Configuration
-Docs](/vault/docs/platform/k8s/helm/configuration). Commonly used values in the Helm
+Docs](/docs/platform/k8s/helm/configuration). Commonly used values in the Helm
 chart include limiting the namespaces the injector runs in, TLS options and
 more.
 
@@ -47,7 +47,7 @@ the following environment variables:
 ~> **Warning**: TLS 1.1 and lower are generally considered insecure.
 
 These may be set in a Helm chart deployment via the
-[injector.extraEnvironmentVars](/vault/docs/platform/k8s/helm/configuration#extraenvironmentvars)
+[injector.extraEnvironmentVars](/docs/platform/k8s/helm/configuration#extraenvironmentvars)
 option:
 
 ```bash
@@ -76,17 +76,17 @@ The following is required to configure TLS manually:
 - Server certificate/key
 - Base64 PEM encoded Certificate Authority bundle
 
-For more information on configuring manual TLS, see the [Vault Helm cert values](/vault/docs/platform/k8s/helm/configuration#certs).
+For more information on configuring manual TLS, see the [Vault Helm cert values](/docs/platform/k8s/helm/configuration#certs).
 
-This option may also be used in conjunction with [cert-manager for certificate management](/vault/docs/platform/k8s/helm/examples/injector-tls-cert-manager).
+This option may also be used in conjunction with [cert-manager for certificate management](/docs/platform/k8s/helm/examples/injector-tls-cert-manager).
 
 ## Multiple Replicas and TLS
 
 The Vault Agent Injector can be run with multiple replicas if using [Manual
-TLS](#manual-tls) or [cert-manager](/vault/docs/platform/k8s/helm/examples/injector-tls-cert-manager), and as of v0.7.0 multiple replicas are also supported with
+TLS](#manual-tls) or [cert-manager](/docs/platform/k8s/helm/examples/injector-tls-cert-manager), and as of v0.7.0 multiple replicas are also supported with
 [Auto TLS](#auto-tls). The number of replicas is controlled in the Vault Helm
 chart by the [injector.replicas
-value](/vault/docs/platform/k8s/helm/configuration#replicas).
+value](/docs/platform/k8s/helm/configuration#replicas).
 
 With Auto TLS and multiple replicas, a leader replica is determined by ownership
 of a ConfigMap named `vault-k8s-leader`. Another replica can become the leader
@@ -98,7 +98,7 @@ certificate and key needed for the webhook service listener from a Kubernetes
 Secret, which is updated by the leader when a certificate is near expiration.
 
 With Manual TLS and multiple replicas,
-[injector.leaderElector.enabled](/vault/docs/platform/k8s/helm/configuration#enabled-2)
+[injector.leaderElector.enabled](/docs/platform/k8s/helm/configuration#enabled-2)
 can be set to `false` since leader determination is not necessary in this case.
 
 ## Namespace Selector
@@ -108,6 +108,6 @@ the system namespaces `kube-system` and `kube-public`. To limit what namespaces
 the injector can work in a namespace selector can be defined to match labels attached
 to namespaces.
 
-For more information on configuring namespace selection, see the [Vault Helm namespaceSelector value](/vault/docs/platform/k8s/helm/configuration#namespaceselector).
+For more information on configuring namespace selection, see the [Vault Helm namespaceSelector value](/docs/platform/k8s/helm/configuration#namespaceselector).
 
 [tls-suites]: https://golang.org/src/crypto/tls/cipher_suites.go
diff --git a/website/content/docs/platform/k8s/vso/api-reference.mdx b/website/content/docs/platform/k8s/vso/api-reference.mdx
deleted file mode 100644
index e25ba7f89f283..0000000000000
--- a/website/content/docs/platform/k8s/vso/api-reference.mdx
+++ /dev/null
@@ -1,489 +0,0 @@
----
-layout: docs
-page_title: Vault Secrets Operator API Reference
-description: >-
-  The Vault Secrets Operator allows Pods to consume Vault secrets natively from Kubernetes Secrets.
----
-
-<!--
-  copied from docs/api/api-reference.md in the vault-secrets-operator repo.
-  commit SHA=d314ea202def8bdfe1ef55209c864ab4bbe44c39
--->
-# API Reference
-
-## Packages
-- [secrets.hashicorp.com/v1beta1](#secretshashicorpcomv1beta1)
-
-
-## secrets.hashicorp.com/v1beta1
-
-Package v1beta1 contains API Schema definitions for the secrets v1beta1 API group
-
-### Resource Types
-- [VaultAuth](#vaultauth)
-- [VaultAuthList](#vaultauthlist)
-- [VaultConnection](#vaultconnection)
-- [VaultConnectionList](#vaultconnectionlist)
-- [VaultDynamicSecret](#vaultdynamicsecret)
-- [VaultDynamicSecretList](#vaultdynamicsecretlist)
-- [VaultPKISecret](#vaultpkisecret)
-- [VaultPKISecretList](#vaultpkisecretlist)
-- [VaultStaticSecret](#vaultstaticsecret)
-- [VaultStaticSecretList](#vaultstaticsecretlist)
-
-
-
-#### Destination
-
-
-
-Destination provides the configuration that will be applied to the destination Kubernetes Secret during a Vault Secret -> K8s Secret sync.
-
-_Appears in:_
-- [VaultDynamicSecretSpec](#vaultdynamicsecretspec)
-- [VaultPKISecretSpec](#vaultpkisecretspec)
-- [VaultStaticSecretSpec](#vaultstaticsecretspec)
-
-| Field | Description |
-| --- | --- |
-| `name` _string_ | Name of the Secret |
-| `create` _boolean_ | Create the destination Secret. If the Secret already exists this should be set to false. |
-| `labels` _object (keys:string, values:string)_ | Labels to apply to the Secret. Requires Create to be set to true. |
-| `annotations` _object (keys:string, values:string)_ | Annotations to apply to the Secret. Requires Create to be set to true. |
-| `type` _[SecretType](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#secrettype-v1-core)_ | Type of Kubernetes Secret. Requires Create to be set to true. Defaults to Opaque. |
-
-
-#### RolloutRestartTarget
-
-
-
-RolloutRestartTarget provides the configuration required to perform a rollout-restart of the supported resources upon Vault Secret rotation. The rollout-restart is triggered by patching the target resource's 'spec.template.metadata.annotations' to include 'vso.secrets.hashicorp.com/restartedAt' with a timestamp value of when the trigger was executed. E.g. vso.secrets.hashicorp.com/restartedAt: "2023-03-23T13:39:31Z"
- Supported resources: Deployment, DaemonSet, StatefulSet
-
-_Appears in:_
-- [VaultDynamicSecretSpec](#vaultdynamicsecretspec)
-- [VaultPKISecretSpec](#vaultpkisecretspec)
-- [VaultStaticSecretSpec](#vaultstaticsecretspec)
-
-| Field | Description |
-| --- | --- |
-| `kind` _string_ |  |
-| `name` _string_ |  |
-
-
-#### StorageEncryption
-
-
-
-StorageEncryption provides the necessary configuration need to encrypt the storage cache entries using Vault's Transit engine. It only supports Kubernetes Auth for now.
-
-_Appears in:_
-- [VaultAuthSpec](#vaultauthspec)
-
-| Field | Description |
-| --- | --- |
-| `mount` _string_ | Mount path of the Transit engine in Vault. |
-| `keyName` _string_ | KeyName to use for encrypt/decrypt operations via Vault Transit. |
-
-
-#### VaultAuth
-
-
-
-VaultAuth is the Schema for the vaultauths API
-
-_Appears in:_
-- [VaultAuthList](#vaultauthlist)
-
-| Field | Description |
-| --- | --- |
-| `apiVersion` _string_ | `secrets.hashicorp.com/v1beta1`
-| `kind` _string_ | `VaultAuth`
-| `metadata` _[ObjectMeta](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#objectmeta-v1-meta)_ | Refer to Kubernetes API documentation for fields of `metadata`. |
-| `spec` _[VaultAuthSpec](#vaultauthspec)_ |  |
-
-
-#### VaultAuthConfigAWS
-
-
-
-VaultAuthConfigAWS provides VaultAuth configuration options needed for authenticating to Vault via an AWS AuthMethod. Will use creds from `SecretRef` or `IRSAServiceAccount` if provided, in that order. If neither are provided, the underlying node role or instance profile will be used to authenticate to Vault.
-
-_Appears in:_
-- [VaultAuthSpec](#vaultauthspec)
-
-| Field | Description |
-| --- | --- |
-| `role` _string_ | Vault role to use for authenticating |
-| `region` _string_ | AWS Region to use for signing the authentication request |
-| `headerValue` _string_ | The Vault header value to include in the STS signing request |
-| `sessionName` _string_ | The role session name to use when creating a webidentity provider |
-| `stsEndpoint` _string_ | The STS endpoint to use; if not set will use the default |
-| `iamEndpoint` _string_ | The IAM endpoint to use; if not set will use the default |
-| `secretRef` _string_ | SecretRef is the name of a Kubernetes Secret which holds credentials for AWS. Expected keys include `access_key_id`, `secret_access_key`, `session_token` |
-| `irsaServiceAccount` _string_ | IRSAServiceAccount name to use with IAM Roles for Service Accounts (IRSA), and should be annotated with "eks.amazonaws.com/role-arn". This ServiceAccount will be checked for other EKS annotations: eks.amazonaws.com/audience and eks.amazonaws.com/token-expiration |
-
-
-#### VaultAuthConfigAppRole
-
-
-
-VaultAuthConfigAppRole provides VaultAuth configuration options needed for authenticating to Vault via an AppRole AuthMethod.
-
-_Appears in:_
-- [VaultAuthSpec](#vaultauthspec)
-
-| Field | Description |
-| --- | --- |
-| `roleId` _string_ | RoleID of the AppRole Role to use for authenticating to Vault. |
-| `secretRef` _string_ | SecretRef is the name of a Kubernetes secret in the consumer's (VDS/VSS/PKI) namespace which provides the AppRole Role's SecretID. The secret must have a key named `id` which holds the AppRole Role's secretID. |
-
-
-#### VaultAuthConfigJWT
-
-
-
-VaultAuthConfigJWT provides VaultAuth configuration options needed for authenticating to Vault.
-
-_Appears in:_
-- [VaultAuthSpec](#vaultauthspec)
-
-| Field | Description |
-| --- | --- |
-| `role` _string_ | Role to use for authenticating to Vault. |
-| `secretRef` _string_ | SecretRef is the name of a Kubernetes secret in the consumer's (VDS/VSS/PKI) namespace which provides the JWT token to authenticate to Vault's JWT authentication backend. The secret must have a key named `jwt` which holds the JWT token. |
-| `serviceAccount` _string_ | ServiceAccount to use when creating a ServiceAccount token to authenticate to Vault's JWT authentication backend. |
-| `audiences` _string array_ | TokenAudiences to include in the ServiceAccount token. |
-| `tokenExpirationSeconds` _integer_ | TokenExpirationSeconds to set the ServiceAccount token. |
-
-
-#### VaultAuthConfigKubernetes
-
-
-
-VaultAuthConfigKubernetes provides VaultAuth configuration options needed for authenticating to Vault.
-
-_Appears in:_
-- [VaultAuthSpec](#vaultauthspec)
-
-| Field | Description |
-| --- | --- |
-| `role` _string_ | Role to use for authenticating to Vault. |
-| `serviceAccount` _string_ | ServiceAccount to use when authenticating to Vault's kubernetes authentication backend. |
-| `audiences` _string array_ | TokenAudiences to include in the ServiceAccount token. |
-| `tokenExpirationSeconds` _integer_ | TokenExpirationSeconds to set the ServiceAccount token. |
-
-
-#### VaultAuthList
-
-
-
-VaultAuthList contains a list of VaultAuth
-
-
-
-| Field | Description |
-| --- | --- |
-| `apiVersion` _string_ | `secrets.hashicorp.com/v1beta1`
-| `kind` _string_ | `VaultAuthList`
-| `metadata` _[ListMeta](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#listmeta-v1-meta)_ | Refer to Kubernetes API documentation for fields of `metadata`. |
-| `items` _[VaultAuth](#vaultauth) array_ |  |
-
-
-#### VaultAuthSpec
-
-
-
-VaultAuthSpec defines the desired state of VaultAuth
-
-_Appears in:_
-- [VaultAuth](#vaultauth)
-
-| Field | Description |
-| --- | --- |
-| `vaultConnectionRef` _string_ | VaultConnectionRef of the corresponding VaultConnection CustomResource. If no value is specified the Operator will default to the `default` VaultConnection, configured in its own Kubernetes namespace. |
-| `namespace` _string_ | Namespace to auth to in Vault |
-| `method` _string_ | Method to use when authenticating to Vault. |
-| `mount` _string_ | Mount to use when authenticating to auth method. |
-| `params` _object (keys:string, values:string)_ | Params to use when authenticating to Vault |
-| `headers` _object (keys:string, values:string)_ | Headers to be included in all Vault requests. |
-| `kubernetes` _[VaultAuthConfigKubernetes](#vaultauthconfigkubernetes)_ | Kubernetes specific auth configuration, requires that the Method be set to `kubernetes`. |
-| `appRole` _[VaultAuthConfigAppRole](#vaultauthconfigapprole)_ | AppRole specific auth configuration, requires that the Method be set to `appRole`. |
-| `jwt` _[VaultAuthConfigJWT](#vaultauthconfigjwt)_ | JWT specific auth configuration, requires that the Method be set to `jwt`. |
-| `aws` _[VaultAuthConfigAWS](#vaultauthconfigaws)_ | AWS specific auth configuration, requires that Method be set to `aws`. |
-| `storageEncryption` _[StorageEncryption](#storageencryption)_ | StorageEncryption provides the necessary configuration to encrypt the client storage cache. This should only be configured when client cache persistence with encryption is enabled. This is done by passing setting the manager's commandline argument --client-cache-persistence-model=direct-encrypted. Typically there should only ever be one VaultAuth configured with StorageEncryption in the Cluster, and it should have the label: cacheStorageEncryption=true |
-
-
-
-
-#### VaultConnection
-
-
-
-VaultConnection is the Schema for the vaultconnections API
-
-_Appears in:_
-- [VaultConnectionList](#vaultconnectionlist)
-
-| Field | Description |
-| --- | --- |
-| `apiVersion` _string_ | `secrets.hashicorp.com/v1beta1`
-| `kind` _string_ | `VaultConnection`
-| `metadata` _[ObjectMeta](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#objectmeta-v1-meta)_ | Refer to Kubernetes API documentation for fields of `metadata`. |
-| `spec` _[VaultConnectionSpec](#vaultconnectionspec)_ |  |
-
-
-#### VaultConnectionList
-
-
-
-VaultConnectionList contains a list of VaultConnection
-
-
-
-| Field | Description |
-| --- | --- |
-| `apiVersion` _string_ | `secrets.hashicorp.com/v1beta1`
-| `kind` _string_ | `VaultConnectionList`
-| `metadata` _[ListMeta](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#listmeta-v1-meta)_ | Refer to Kubernetes API documentation for fields of `metadata`. |
-| `items` _[VaultConnection](#vaultconnection) array_ |  |
-
-
-#### VaultConnectionSpec
-
-
-
-VaultConnectionSpec defines the desired state of VaultConnection
-
-_Appears in:_
-- [VaultConnection](#vaultconnection)
-
-| Field | Description |
-| --- | --- |
-| `address` _string_ | Address of the Vault server |
-| `headers` _object (keys:string, values:string)_ | Headers to be included in all Vault requests. |
-| `tlsServerName` _string_ | TLSServerName to use as the SNI host for TLS connections. |
-| `caCertSecretRef` _string_ | CACertSecretRef is the name of a Kubernetes secret containing the trusted PEM encoded CA certificate chain as `ca.crt`. |
-| `skipTLSVerify` _boolean_ | SkipTLSVerify for TLS connections. |
-
-
-
-
-#### VaultDynamicSecret
-
-
-
-VaultDynamicSecret is the Schema for the vaultdynamicsecrets API
-
-_Appears in:_
-- [VaultDynamicSecretList](#vaultdynamicsecretlist)
-
-| Field | Description |
-| --- | --- |
-| `apiVersion` _string_ | `secrets.hashicorp.com/v1beta1`
-| `kind` _string_ | `VaultDynamicSecret`
-| `metadata` _[ObjectMeta](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#objectmeta-v1-meta)_ | Refer to Kubernetes API documentation for fields of `metadata`. |
-| `spec` _[VaultDynamicSecretSpec](#vaultdynamicsecretspec)_ |  |
-
-
-#### VaultDynamicSecretList
-
-
-
-VaultDynamicSecretList contains a list of VaultDynamicSecret
-
-
-
-| Field | Description |
-| --- | --- |
-| `apiVersion` _string_ | `secrets.hashicorp.com/v1beta1`
-| `kind` _string_ | `VaultDynamicSecretList`
-| `metadata` _[ListMeta](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#listmeta-v1-meta)_ | Refer to Kubernetes API documentation for fields of `metadata`. |
-| `items` _[VaultDynamicSecret](#vaultdynamicsecret) array_ |  |
-
-
-#### VaultDynamicSecretSpec
-
-
-
-VaultDynamicSecretSpec defines the desired state of VaultDynamicSecret
-
-_Appears in:_
-- [VaultDynamicSecret](#vaultdynamicsecret)
-
-| Field | Description |
-| --- | --- |
-| `vaultAuthRef` _string_ | VaultAuthRef to the VaultAuth resource If no value is specified the Operator will default to the `default` VaultAuth, configured in its own Kubernetes namespace. |
-| `namespace` _string_ | Namespace where the secrets engine is mounted in Vault. |
-| `mount` _string_ | Mount path of the secret's engine in Vault. |
-| `requestHTTPMethod` _string_ | RequestHTTPMethod to use when syncing Secrets from Vault. Setting a value here is not typically required. If left unset the Operator will make requests using the GET method. In the case where Params are specified the Operator will use the PUT method. Please consult [secrets](/vault/docs/secrets) if you are uncertain about what method to use. Of note, the Vault client treats PUT and POST as being equivalent. The underlying Vault client implementation will always use the PUT method. |
-| `path` _string_ | Path in Vault to get the credentials for, and is relative to Mount. Please consult [secrets](/vault/docs/secrets) if you are uncertain about what 'path' should be set to. |
-| `params` _object (keys:string, values:string)_ | Params that can be passed when requesting credentials/secrets. When Params is set the configured RequestHTTPMethod will be ignored. See RequestHTTPMethod for more details. Please consult [secrets](/vault/docs/secrets) if you are uncertain about what 'params' should/can be set to. |
-| `renewalPercent` _integer_ | RenewalPercent is the percent out of 100 of the lease duration when the lease is renewed. Defaults to 67 percent plus jitter. |
-| `revoke` _boolean_ | Revoke the existing lease on VDS resource deletion. |
-| `allowStaticCreds` _boolean_ | AllowStaticCreds should be set when syncing credentials that are periodically rotated by the Vault server, rather than created upon request. These secrets are sometimes referred to as "static roles", or "static credentials", with a request path that contains "static-creds". |
-| `rolloutRestartTargets` _[RolloutRestartTarget](#rolloutrestarttarget) array_ | RolloutRestartTargets should be configured whenever the application(s) consuming the Vault secret does not support dynamically reloading a rotated secret. In that case one, or more RolloutRestartTarget(s) can be configured here. The Operator will trigger a "rollout-restart" for each target whenever the Vault secret changes between reconciliation events. See RolloutRestartTarget for more details. |
-| `destination` _[Destination](#destination)_ | Destination provides configuration necessary for syncing the Vault secret to Kubernetes. |
-
-
-
-
-#### VaultPKISecret
-
-
-
-VaultPKISecret is the Schema for the vaultpkisecrets API
-
-_Appears in:_
-- [VaultPKISecretList](#vaultpkisecretlist)
-
-| Field | Description |
-| --- | --- |
-| `apiVersion` _string_ | `secrets.hashicorp.com/v1beta1`
-| `kind` _string_ | `VaultPKISecret`
-| `metadata` _[ObjectMeta](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#objectmeta-v1-meta)_ | Refer to Kubernetes API documentation for fields of `metadata`. |
-| `spec` _[VaultPKISecretSpec](#vaultpkisecretspec)_ |  |
-
-
-#### VaultPKISecretList
-
-
-
-VaultPKISecretList contains a list of VaultPKISecret
-
-
-
-| Field | Description |
-| --- | --- |
-| `apiVersion` _string_ | `secrets.hashicorp.com/v1beta1`
-| `kind` _string_ | `VaultPKISecretList`
-| `metadata` _[ListMeta](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#listmeta-v1-meta)_ | Refer to Kubernetes API documentation for fields of `metadata`. |
-| `items` _[VaultPKISecret](#vaultpkisecret) array_ |  |
-
-
-#### VaultPKISecretSpec
-
-
-
-VaultPKISecretSpec defines the desired state of VaultPKISecret
-
-_Appears in:_
-- [VaultPKISecret](#vaultpkisecret)
-
-| Field | Description |
-| --- | --- |
-| `vaultAuthRef` _string_ | VaultAuthRef of the VaultAuth resource If no value is specified the Operator will default to the `default` VaultAuth, configured in its own Kubernetes namespace. |
-| `namespace` _string_ | Namespace to get the secret from in Vault |
-| `mount` _string_ | Mount for the secret in Vault |
-| `role` _string_ | Role in Vault to use when issuing TLS certificates. |
-| `revoke` _boolean_ | Revoke the certificate when the resource is deleted. |
-| `clear` _boolean_ | Clear the Kubernetes secret when the resource is deleted. |
-| `expiryOffset` _string_ | ExpiryOffset to use for computing when the certificate should be renewed. The rotation time will be difference between the expiration and the offset. Should be in duration notation e.g. 30s, 120s, etc. Set to empty string "" to prevent certificate rotation. |
-| `issuerRef` _string_ | IssuerRef reference to an existing PKI issuer, either by Vault-generated identifier, the literal string default to refer to the currently configured default issuer, or the name assigned to an issuer. This parameter is part of the request URL. |
-| `rolloutRestartTargets` _[RolloutRestartTarget](#rolloutrestarttarget) array_ | RolloutRestartTargets should be configured whenever the application(s) consuming the Vault secret does not support dynamically reloading a rotated secret. In that case one, or more RolloutRestartTarget(s) can be configured here. The Operator will trigger a "rollout-restart" for each target whenever the Vault secret changes between reconciliation events. See RolloutRestartTarget for more details. |
-| `destination` _[Destination](#destination)_ | Destination provides configuration necessary for syncing the Vault secret to Kubernetes. If the type is set to "kubernetes.io/tls", the Vault response fields "certificate" and "private_key" will be copied to fields "tls.crt" and "tls.key", respectively, in the Kubernetes secret. |
-| `commonName` _string_ | CommonName to include in the request. |
-| `altNames` _string array_ | AltNames to include in the request May contain both DNS names and email addresses. |
-| `ipSans` _string array_ | IPSans to include in the request. |
-| `uriSans` _string array_ | The requested URI SANs. |
-| `otherSans` _string array_ | Requested other SANs, in an array with the format oid;type:value for each entry. |
-| `ttl` _string_ | TTL for the certificate; sets the expiration date. If not specified the Vault role's default, backend default, or system default TTL is used, in that order. Cannot be larger than the mount's max TTL. Note: this only has an effect when generating a CA cert or signing a CA cert, not when generating a CSR for an intermediate CA. Should be in duration notation e.g. 120s, 2h, etc. |
-| `format` _string_ | Format for the certificate. Choices: "pem", "der", "pem_bundle". If "pem_bundle", any private key and issuing cert will be appended to the certificate pem. If "der", the value will be base64 encoded. Default: pem |
-| `privateKeyFormat` _string_ | PrivateKeyFormat, generally the default will be controlled by the Format parameter as either base64-encoded DER or PEM-encoded DER. However, this can be set to "pkcs8" to have the returned private key contain base64-encoded pkcs8 or PEM-encoded pkcs8 instead. Default: der |
-| `notAfter` _string_ | NotAfter field of the certificate with specified date value. The value format should be given in UTC format YYYY-MM-ddTHH:MM:SSZ |
-| `excludeCNFromSans` _boolean_ | ExcludeCNFromSans from DNS or Email Subject Alternate Names. Default: false |
-
-
-
-
-#### VaultSecretLease
-
-
-
-
-
-_Appears in:_
-- [VaultDynamicSecretStatus](#vaultdynamicsecretstatus)
-
-| Field | Description |
-| --- | --- |
-| `id` _string_ | ID of the Vault secret. |
-| `duration` _integer_ | LeaseDuration of the Vault secret. |
-| `renewable` _boolean_ | Renewable Vault secret lease |
-| `requestID` _string_ | RequestID of the Vault secret request. |
-
-
-#### VaultStaticCredsMetaData
-
-
-
-
-
-_Appears in:_
-- [VaultDynamicSecretStatus](#vaultdynamicsecretstatus)
-
-| Field | Description |
-| --- | --- |
-| `lastVaultRotation` _integer_ | LastVaultRotation represents the last time Vault rotated the password |
-| `rotationPeriod` _integer_ | RotationPeriod is number in seconds between each rotation, effectively a "time to live". This value is compared to the LastVaultRotation to determine if a password needs to be rotated |
-| `ttl` _integer_ | TTL is the seconds remaining before the next rotation. |
-
-
-#### VaultStaticSecret
-
-
-
-VaultStaticSecret is the Schema for the vaultstaticsecrets API
-
-_Appears in:_
-- [VaultStaticSecretList](#vaultstaticsecretlist)
-
-| Field | Description |
-| --- | --- |
-| `apiVersion` _string_ | `secrets.hashicorp.com/v1beta1`
-| `kind` _string_ | `VaultStaticSecret`
-| `metadata` _[ObjectMeta](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#objectmeta-v1-meta)_ | Refer to Kubernetes API documentation for fields of `metadata`. |
-| `spec` _[VaultStaticSecretSpec](#vaultstaticsecretspec)_ |  |
-
-
-#### VaultStaticSecretList
-
-
-
-VaultStaticSecretList contains a list of VaultStaticSecret
-
-
-
-| Field | Description |
-| --- | --- |
-| `apiVersion` _string_ | `secrets.hashicorp.com/v1beta1`
-| `kind` _string_ | `VaultStaticSecretList`
-| `metadata` _[ListMeta](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#listmeta-v1-meta)_ | Refer to Kubernetes API documentation for fields of `metadata`. |
-| `items` _[VaultStaticSecret](#vaultstaticsecret) array_ |  |
-
-
-#### VaultStaticSecretSpec
-
-
-
-VaultStaticSecretSpec defines the desired state of VaultStaticSecret
-
-_Appears in:_
-- [VaultStaticSecret](#vaultstaticsecret)
-
-| Field | Description |
-| --- | --- |
-| `vaultAuthRef` _string_ | VaultAuthRef of the VaultAuth resource If no value is specified the Operator will default to the `default` VaultAuth, configured in its own Kubernetes namespace. |
-| `namespace` _string_ | Namespace to get the secret from in Vault |
-| `mount` _string_ | Mount for the secret in Vault |
-| `path` _string_ | Path of the secret in Vault, corresponds to the `path` parameter for, [kv-v1](/vault/api-docs/secret/kv/kv-v1#read-secret) [kv-v2](/vault/api-docs/secret/kv/kv-v2#read-secret-version) |
-| `version` _integer_ | Version of the secret to fetch. Only valid for type kv-v2. Corresponds to version query parameter: [version](/vault/api-docs/secret/kv/kv-v2#version) |
-| `type` _string_ | Type of the Vault static secret |
-| `refreshAfter` _string_ | RefreshAfter a period of time, in duration notation |
-| `hmacSecretData` _boolean_ | HMACSecretData determines whether the Operator computes the HMAC of the Secret's data. The MAC value will be stored in the resource's Status.SecretMac field, and will be used for drift detection and during incoming Vault secret comparison. Enabling this feature is recommended to ensure that Secret's data stays consistent with Vault. |
-| `rolloutRestartTargets` _[RolloutRestartTarget](#rolloutrestarttarget) array_ | RolloutRestartTargets should be configured whenever the application(s) consuming the Vault secret does not support dynamically reloading a rotated secret. In that case one, or more RolloutRestartTarget(s) can be configured here. The Operator will trigger a "rollout-restart" for each target whenever the Vault secret changes between reconciliation events. All configured targets wil be ignored if HMACSecretData is set to false. See RolloutRestartTarget for more details. |
-| `destination` _[Destination](#destination)_ | Destination provides configuration necessary for syncing the Vault secret to Kubernetes. |
-
-
-
-
diff --git a/website/content/docs/platform/k8s/vso/examples.mdx b/website/content/docs/platform/k8s/vso/examples.mdx
deleted file mode 100644
index 020cca3609811..0000000000000
--- a/website/content/docs/platform/k8s/vso/examples.mdx
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: docs
-page_title: Vault Secrets Operator Examples
-description: >-
-  The Vault Secrets Operator allows Pods to consume Vault secrets natively from Kubernetes Secrets.
----
-
-# Vault Secrets Operator Examples
-
-The Operator project provides the following examples:
-- Sample use-cases are documented [here](https://github.com/hashicorp/vault-secrets-operator#samples)
-- A Terraform based demo can be found [here](https://github.com/hashicorp/vault-secrets-operator/tree/main/demo)
diff --git a/website/content/docs/platform/k8s/vso/helm.mdx b/website/content/docs/platform/k8s/vso/helm.mdx
deleted file mode 100644
index ae150e35d0d8b..0000000000000
--- a/website/content/docs/platform/k8s/vso/helm.mdx
+++ /dev/null
@@ -1,438 +0,0 @@
----
-layout: docs
-page_title: Vault Secrets Operator Helm Chart Configuration
-description: >-
-  Configuration for the Vault Secrets Operator Helm chart.
----
-
-# Vault Secrets Operator Helm Chart
-
-The chart is customizable using
-[Helm configuration values](https://helm.sh/docs/intro/using_helm/#customizing-the-chart-before-installing).
-
-<!-- DO NOT EDIT. The docs below are generated automatically. To change, edit
-                  the vault-secrets-operator repo's values.yaml: file commit=e9c2b499105d977fa23a9f746186253991ebcee1 -->
-<!-- codegen: start -->
-
-## Top-Level Stanzas
-
-Use these links to navigate to a particular top-level stanza.
-
-- [`controller`](#h-controller)
-- [`metricsService`](#h-metricsservice)
-- [`defaultVaultConnection`](#h-defaultvaultconnection)
-- [`defaultAuthMethod`](#h-defaultauthmethod)
-- [`telemetry`](#h-telemetry)
-- [`tests`](#h-tests)
-
-## All Values
-
-### controller ((#h-controller))
-
-- `controller` ((#v-controller)) - Top level configuration for the vault secrets operator deployment.
-  This consists of a controller and a kube rbac proxy container.
-
-  - `replicas` ((#v-controller-replicas)) (`integer: 1`) - Set the number of replicas for the operator.
-
-  - `kubeRbacProxy` ((#v-controller-kuberbacproxy)) - Settings related to the kubeRbacProxy container. This container is an HTTP proxy for the
-    controller manager which performs RBAC authorization against the Kubernetes API using SubjectAccessReviews.
-
-    - `image` ((#v-controller-kuberbacproxy-image)) - Image sets the repo and tag of the kube-rbac-proxy image to use for the controller.
-
-      - `repository` ((#v-controller-kuberbacproxy-image-repository)) (`string: gcr.io/kubebuilder/kube-rbac-proxy`)
-
-      - `tag` ((#v-controller-kuberbacproxy-image-tag)) (`string: v0.11.0`)
-
-    - `resources` ((#v-controller-kuberbacproxy-resources)) (`map`) - Configures the default resources for the kube rbac proxy container.
-      For more information on configuring resources, see the K8s documentation:
-      https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
-
-      - `limits` ((#v-controller-kuberbacproxy-resources-limits))
-
-        - `cpu` ((#v-controller-kuberbacproxy-resources-limits-cpu)) (`string: 500m`)
-
-        - `memory` ((#v-controller-kuberbacproxy-resources-limits-memory)) (`string: 128Mi`)
-
-      - `requests` ((#v-controller-kuberbacproxy-resources-requests))
-
-        - `cpu` ((#v-controller-kuberbacproxy-resources-requests-cpu)) (`string: 5m`)
-
-        - `memory` ((#v-controller-kuberbacproxy-resources-requests-memory)) (`string: 64Mi`)
-
-  - `annotations` ((#v-controller-annotations)) - This value defines additional annotations for the deployment. This should be formatted as a YAML object (map)
-
-  - `manager` ((#v-controller-manager)) - Settings related to the vault-secrets-operator container.
-
-    - `image` ((#v-controller-manager-image)) - Image sets the repo and tag of the vault-secrets-operator image to use for the controller.
-
-      - `repository` ((#v-controller-manager-image-repository)) (`string: hashicorp/vault-secrets-operator`)
-
-      - `tag` ((#v-controller-manager-image-tag)) (`string: 0.1.0`)
-
-    - `clientCache` ((#v-controller-manager-clientcache)) - Configures the client cache which is used by the controller to cache (and potentially persist) vault tokens that
-      are the result of using the VaultAuthMethod. This enables re-use of Vault Tokens
-      throughout their TTLs as well as the ability to renew.
-      Persistence is only useful in the context of Dynamic Secrets, so "none" is an okay default.
-
-      - `persistenceModel` ((#v-controller-manager-clientcache-persistencemodel)) (`string: ""`) - Defines the `-client-cache-persistence-model` which caches+persists vault tokens.
-        Valid values are:
-        "none" - in-memory client cache is used, no tokens are persisted.
-        "direct-unencrypted" - in-memory client cache is persisted, unencrypted. This is NOT recommended for any production workload.
-        "direct-encrypted" - in-memory client cache is persisted encrypted using the Vault Transit engine.
-        Note: It is strongly encouraged to not use the setting of "direct-unencrypted" in
-        production due to the potential of vault tokens being leaked as they would then be stored
-        in clear text.
-
-        default: "none"
-
-      - `cacheSize` ((#v-controller-manager-clientcache-cachesize)) (`integer: ""`) - Defines the size of the in-memory LRU cache *in entries*, that is used by the client cache controller.
-        Larger numbers will increase memory usage by the controller, lower numbers will cause more frequent evictions
-        of the client cache which can result in additional Vault client counts.
-
-        default: 10000
-
-      - `storageEncryption` ((#v-controller-manager-clientcache-storageencryption)) - StorageEncryption provides the necessary configuration to encrypt the client storage
-        cache within Kubernetes objects using (required) Vault Transit Engine.
-        This should only be configured when client cache persistence with encryption is enabled and
-        will deploy an additional VaultAuthMethod to be used by the Vault Transit Engine.
-        E.g. when `controller.manager.clientCache.persistenceModel=direct-encrypted`
-        Supported Vault authentication methods for the Transit Auth method are: jwt, appRole,
-        aws, and kubernetes.
-        Typically, there should only ever be one VaultAuth configured with
-        StorageEncryption in the Cluster.
-
-        - `enabled` ((#v-controller-manager-clientcache-storageencryption-enabled)) (`boolean: false`) - toggles the deployment of the Transit VaultAuthMethod CR.
-
-        - `vaultConnectionRef` ((#v-controller-manager-clientcache-storageencryption-vaultconnectionref)) (`string: default`) - Vault Connection Ref to be used by the Transit VaultAuthMethod.
-          Default setting will use the default VaultConnectionRef, which must also be configured.
-
-        - `keyName` ((#v-controller-manager-clientcache-storageencryption-keyname)) (`string: ""`) - KeyName to use for encrypt/decrypt operations via Vault Transit.
-
-        - `transitMount` ((#v-controller-manager-clientcache-storageencryption-transitmount)) (`string: ""`) - Mount path for the Transit VaultAuthMethod.
-
-        - `namespace` ((#v-controller-manager-clientcache-storageencryption-namespace)) (`string: ""`) - Vault namespace for the Transit VaultAuthMethod CR.
-
-        - `method` ((#v-controller-manager-clientcache-storageencryption-method)) (`string: kubernetes`) - Vault Auth method to be used with the Transit VaultAuthMethod CR.
-
-        - `mount` ((#v-controller-manager-clientcache-storageencryption-mount)) (`string: kubernetes`) - Mount path for the Transit VaultAuthMethod.
-
-        - `kubernetes` ((#v-controller-manager-clientcache-storageencryption-kubernetes)) - Vault Kubernetes auth method specific configuration
-
-          - `role` ((#v-controller-manager-clientcache-storageencryption-kubernetes-role)) (`string: ""`) - Vault Auth Role to use
-            This is a required field and must be setup in Vault prior to deploying the helm chart
-            if `defaultAuthMethod.enabled=true`
-
-          - `serviceAccount` ((#v-controller-manager-clientcache-storageencryption-kubernetes-serviceaccount)) (`string: ""`) - Kubernetes ServiceAccount associated with the Transit Vault Auth Role
-            Defaults to using the Operator's service-account.
-
-          - `tokenAudiences` ((#v-controller-manager-clientcache-storageencryption-kubernetes-tokenaudiences)) (`array<string>: []`) - Token Audience should match the audience of the vault kubernetes auth role.
-
-        - `jwt` ((#v-controller-manager-clientcache-storageencryption-jwt)) - Vault JWT auth method specific configuration
-
-          - `role` ((#v-controller-manager-clientcache-storageencryption-jwt-role)) (`string: ""`) - Vault Auth Role to use
-            This is a required field and must be setup in Vault prior to deploying the helm chart
-            if using JWT for the Transit VaultAuthMethod.
-
-          - `secretRef` ((#v-controller-manager-clientcache-storageencryption-jwt-secretref)) (`string: ""`) - One of the following is required prior to deploying the helm chart
-            - K8s secret that contains the JWT
-            - K8s service account if a service account JWT is used as a Vault JWT auth token and
-            needs generating by VSO.
-
-            Name of Kubernetes Secret that has the Vault JWT auth token.
-            The Kubernetes Secret must contain a key named `jwt` which references the JWT token, and
-            must exist in the namespace of any consuming VaultSecret CR. This is a required field if
-            a JWT token is provided.
-
-          - `serviceAccount` ((#v-controller-manager-clientcache-storageencryption-jwt-serviceaccount)) (`string: default`) - Kubernetes ServiceAccount to generate a service account JWT
-
-          - `tokenAudiences` ((#v-controller-manager-clientcache-storageencryption-jwt-tokenaudiences)) (`array<string>: []`) - Token Audience should match the bound_audiences or the `aud` list in bound_claims if
-            applicable of the Vault JWT auth role.
-
-        - `appRole` ((#v-controller-manager-clientcache-storageencryption-approle)) - AppRole auth method specific configuration
-
-          - `roleId` ((#v-controller-manager-clientcache-storageencryption-approle-roleid)) (`string: ""`) - AppRole Role's RoleID to use for authenticating to Vault.
-            This is a required field when using appRole and must be setup in Vault prior to deploying
-            the helm chart.
-
-          - `secretRef` ((#v-controller-manager-clientcache-storageencryption-approle-secretref)) (`string: ""`) - Name of Kubernetes Secret that has the AppRole Role's SecretID used to authenticate with
-            Vault. The Kubernetes Secret must contain a key named `id` which references the AppRole
-            Role's SecretID, and must exist in the namespace of any consuming VaultSecret CR.
-            This is a required field when using appRole and must be setup in Vault prior to
-            deploying the helm chart.
-
-        - `aws` ((#v-controller-manager-clientcache-storageencryption-aws)) - AWS auth method specific configuration
-
-          - `role` ((#v-controller-manager-clientcache-storageencryption-aws-role)) (`string: ""`) - Vault Auth Role to use
-            This is a required field and must be setup in Vault prior to deploying the helm chart
-            if using the AWS for the Transit auth method.
-
-          - `region` ((#v-controller-manager-clientcache-storageencryption-aws-region)) (`string: ""`) - AWS region to use for signing the authentication request
-            Optional, but most commonly will be the EKS cluster region.
-
-          - `headerValue` ((#v-controller-manager-clientcache-storageencryption-aws-headervalue)) (`string: ""`) - Vault header value to include in the STS signing request
-
-          - `sessionName` ((#v-controller-manager-clientcache-storageencryption-aws-sessionname)) (`string: ""`) - The role session name to use when creating a WebIdentity provider
-
-          - `stsEndpoint` ((#v-controller-manager-clientcache-storageencryption-aws-stsendpoint)) (`string: ""`) - The STS endpoint to use; if not set will use the default
-
-          - `iamEndpoint` ((#v-controller-manager-clientcache-storageencryption-aws-iamendpoint)) (`string: ""`) - The IAM endpoint to use; if not set will use the default
-
-          - `secretRef` ((#v-controller-manager-clientcache-storageencryption-aws-secretref)) (`string: ""`) - The name of a Kubernetes Secret which holds credentials for AWS. Supported keys
-            include `access_key_id`, `secret_access_key`, `session_token`
-
-          - `irsaServiceAccount` ((#v-controller-manager-clientcache-storageencryption-aws-irsaserviceaccount)) (`string: ""`) - Name of a Kubernetes service account that is configured with IAM Roles
-            for Service Accounts (IRSA). Should be annotated with "eks.amazonaws.com/role-arn".
-
-        - `params` ((#v-controller-manager-clientcache-storageencryption-params)) (`map`) - Params to use when authenticating to Vault using this auth method.
-          params:
-            param-something1: "foo"
-
-        - `headers` ((#v-controller-manager-clientcache-storageencryption-headers)) (` map: ""`) - Headers to be included in all Vault requests.
-          headers:
-            X-vault-something1: "foo"
-
-    - `maxConcurrentReconciles` ((#v-controller-manager-maxconcurrentreconciles)) (`integer: ""`) - Defines the maximum number of concurrent reconciles by the controller.
-      NOTE: Currently this is only used by the reconciliation logic of dynamic secrets.
-
-      default: 100
-
-    - `resources` ((#v-controller-manager-resources)) (`map`) - Configures the default resources for the vault-secrets-operator container.
-      For more information on configuring resources, see the K8s documentation:
-      https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
-
-      - `limits` ((#v-controller-manager-resources-limits))
-
-        - `cpu` ((#v-controller-manager-resources-limits-cpu)) (`string: 500m`)
-
-        - `memory` ((#v-controller-manager-resources-limits-memory)) (`string: 128Mi`)
-
-      - `requests` ((#v-controller-manager-resources-requests))
-
-        - `cpu` ((#v-controller-manager-resources-requests-cpu)) (`string: 10m`)
-
-        - `memory` ((#v-controller-manager-resources-requests-memory)) (`string: 64Mi`)
-
-  - `controllerConfigMapYaml` ((#v-controller-controllerconfigmapyaml)) (`map`) - Sets the configuration settings used by the controller. Any custom changes will be reflected in the
-    data field of the configmap.
-    For more information on configuring resources, see the K8s documentation:
-    https://kubernetes.io/docs/concepts/configuration/configmap/
-
-    - `health` ((#v-controller-controllerconfigmapyaml-health))
-
-      - `healthProbeBindAddress` ((#v-controller-controllerconfigmapyaml-health-healthprobebindaddress)) (`string: :8081`)
-
-    - `leaderElection` ((#v-controller-controllerconfigmapyaml-leaderelection))
-
-      - `leaderElect` ((#v-controller-controllerconfigmapyaml-leaderelection-leaderelect)) (`boolean: true`)
-
-      - `resourceName` ((#v-controller-controllerconfigmapyaml-leaderelection-resourcename)) (`string: b0d477c0.hashicorp.com`)
-
-    - `metrics` ((#v-controller-controllerconfigmapyaml-metrics))
-
-      - `bindAddress` ((#v-controller-controllerconfigmapyaml-metrics-bindaddress)) (`string: 127.0.0.1:8080`)
-
-    - `webhook` ((#v-controller-controllerconfigmapyaml-webhook))
-
-      - `port` ((#v-controller-controllerconfigmapyaml-webhook-port)) (`integer: 9443`)
-
-  - `kubernetesClusterDomain` ((#v-controller-kubernetesclusterdomain)) (`string: cluster.local`) - Configures the environment variable KUBERNETES_CLUSTER_DOMAIN used by KubeDNS.
-
-### metricsService ((#h-metricsservice))
-
-- `metricsService` ((#v-metricsservice)) (`map`) - Configure the metrics service ports used by the metrics service.
-  Set the configuration fo the metricsService port.
-
-  - `ports` ((#v-metricsservice-ports)) (`map`) - Set the port settings for the metrics service.
-    For more information on configuring resources, see the K8s documentation:
-    https://kubernetes.io/docs/concepts/services-networking/service/
-
-  - `name` ((#v-metricsservice-ports-name)) (`string: https`)
-
-  - `port` ((#v-metricsservice-ports-port)) (`integer: 8443`)
-
-  - `protocol` ((#v-metricsservice-ports-protocol)) (`string: TCP`)
-
-  - `targetPort` ((#v-metricsservice-ports-targetport)) (`string: https`)
-
-  - `type` ((#v-metricsservice-type)) (`string: ClusterIP`)
-
-### defaultVaultConnection ((#h-defaultvaultconnection))
-
-- `defaultVaultConnection` ((#v-defaultvaultconnection)) - Configures the default VaultConnection CR which will be used by resources
-  if they do not specify a VaultConnection reference. The name is 'default' and will
-  always be installed in the same namespace as the operator.
-  NOTE:
-  * It is strongly recommended to deploy the vault secrets operator in a secure Vault environment
-    which includes a configuration utilizing TLS and installing Vault into its own restricted namespace.
-
-  - `enabled` ((#v-defaultvaultconnection-enabled)) (`boolean: false`) - toggles the deployment of the VaultAuthMethod CR
-
-  - `address` ((#v-defaultvaultconnection-address)) (`string: ""`) - Address of the Vault Server
-    Example: http://vault.default.svc.cluster.local:8200
-
-  - `caCertSecret` ((#v-defaultvaultconnection-cacertsecret)) (`string: ""`) - CACertSecret is the name of a Kubernetes secret containing the trusted PEM encoded CA certificate chain as `ca.crt`.
-    Note: This secret must exist prior to deploying the CR.
-
-  - `tlsServerName` ((#v-defaultvaultconnection-tlsservername)) (`string: ""`) - TLSServerName to use as the SNI host for TLS connections.
-
-  - `skipTLSVerify` ((#v-defaultvaultconnection-skiptlsverify)) (`boolean: false`) - SkipTLSVerify for TLS connections.
-
-  - `headers` ((#v-defaultvaultconnection-headers)) (`map`) - Headers to be included in all Vault requests.
-    headers:
-      X-vault-something: "foo"
-
-### defaultAuthMethod ((#h-defaultauthmethod))
-
-- `defaultAuthMethod` ((#v-defaultauthmethod)) - Configures and deploys the default VaultAuthMethod CR which will be used by resources
-  if they do not specify a VaultAuthMethod reference. The name is 'default' and will
-  always be installed in the same namespace as the operator.
-  NOTE:
-  * It is strongly recommended to deploy the vault secrets operator in a secure Vault environment
-    which includes a configuration utilizing TLS and installing Vault into its own restricted namespace.
-
-  - `enabled` ((#v-defaultauthmethod-enabled)) (`boolean: false`) - toggles the deployment of the VaultAuthMethod CR
-
-  - `namespace` ((#v-defaultauthmethod-namespace)) (`string: ""`) - Vault namespace for the VaultAuthMethod CR
-
-  - `method` ((#v-defaultauthmethod-method)) (`string: kubernetes`) - Vault Auth method to be used with the VaultAuthMethod CR
-
-  - `mount` ((#v-defaultauthmethod-mount)) (`string: kubernetes`) - Mount path for the Vault Auth Method.
-
-  - `kubernetes` ((#v-defaultauthmethod-kubernetes)) - Vault Kubernetes auth method specific configuration
-
-    - `role` ((#v-defaultauthmethod-kubernetes-role)) (`string: ""`) - Vault Auth Role to use
-      This is a required field and must be setup in Vault prior to deploying the helm chart
-      if `defaultAuthMethod.enabled=true`
-
-    - `serviceAccount` ((#v-defaultauthmethod-kubernetes-serviceaccount)) (`string: default`) - Kubernetes ServiceAccount associated with the default Vault Auth Role
-
-    - `tokenAudiences` ((#v-defaultauthmethod-kubernetes-tokenaudiences)) (`array<string>: []`) - Token Audience should match the audience of the vault kubernetes auth role.
-
-  - `jwt` ((#v-defaultauthmethod-jwt)) - Vault JWT auth method specific configuration
-
-    - `role` ((#v-defaultauthmethod-jwt-role)) (`string: ""`) - Vault Auth Role to use
-      This is a required field and must be setup in Vault prior to deploying the helm chart
-      if using the JWT for the default auth method.
-
-    - `secretRef` ((#v-defaultauthmethod-jwt-secretref)) (`string: ""`) - One of the following is required prior to deploying the helm chart
-      - K8s secret that contains the JWT
-      - K8s service account if a service account JWT is used as a Vault JWT auth token and needs generating by VSO
-
-      Name of Kubernetes Secret that has the Vault JWT auth token.
-      The Kubernetes Secret must contain a key named `jwt` which references the JWT token, and must exist in the namespace
-      of any consuming VaultSecret CR. This is a required field if a JWT token is provided.
-
-    - `serviceAccount` ((#v-defaultauthmethod-jwt-serviceaccount)) (`string: default`) - Kubernetes ServiceAccount to generate a service account JWT
-
-    - `tokenAudiences` ((#v-defaultauthmethod-jwt-tokenaudiences)) (`array<string>: []`) - Token Audience should match the bound_audiences or the `aud` list in bound_claims if applicable
-      of the Vault JWT auth role.
-
-  - `appRole` ((#v-defaultauthmethod-approle)) - AppRole auth method specific configuration
-
-    - `roleId` ((#v-defaultauthmethod-approle-roleid)) (`string: ""`) - AppRole Role's RoleID to use for authenticating to Vault.
-      This is a required field when using appRole and must be setup in Vault prior to deploying the
-      helm chart.
-
-    - `secretRef` ((#v-defaultauthmethod-approle-secretref)) (`string: ""`) - Name of Kubernetes Secret that has the AppRole Role's SecretID used to authenticate with Vault.
-      The Kubernetes Secret must contain a key named `id` which references the AppRole Role's
-      SecretID, and must exist in the namespace of any consuming VaultSecret CR.
-      This is a required field when using appRole and must be setup in Vault prior to deploying the
-      helm chart.
-
-  - `aws` ((#v-defaultauthmethod-aws)) - AWS auth method specific configuration
-
-    - `role` ((#v-defaultauthmethod-aws-role)) (`string: ""`) - Vault Auth Role to use
-      This is a required field and must be setup in Vault prior to deploying the helm chart
-      if using the AWS for the default auth method.
-
-    - `region` ((#v-defaultauthmethod-aws-region)) (`string: ""`) - AWS region to use for signing the authentication request
-      Optional, but most commonly will be the region where the EKS cluster is running
-
-    - `headerValue` ((#v-defaultauthmethod-aws-headervalue)) (`string: ""`) - Vault header value to include in the STS signing request
-
-    - `sessionName` ((#v-defaultauthmethod-aws-sessionname)) (`string: ""`) - The role session name to use when creating a WebIdentity provider
-
-    - `stsEndpoint` ((#v-defaultauthmethod-aws-stsendpoint)) (`string: ""`) - The STS endpoint to use; if not set will use the default
-
-    - `iamEndpoint` ((#v-defaultauthmethod-aws-iamendpoint)) (`string: ""`) - The IAM endpoint to use; if not set will use the default
-
-    - `secretRef` ((#v-defaultauthmethod-aws-secretref)) (`string: ""`) - The name of a Kubernetes Secret which holds credentials for AWS. Supported keys include
-      `access_key_id`, `secret_access_key`, `session_token`
-
-    - `irsaServiceAccount` ((#v-defaultauthmethod-aws-irsaserviceaccount)) (`string: ""`) - Name of a Kubernetes service account that is configured with IAM Roles
-      for Service Accounts (IRSA). Should be annotated with "eks.amazonaws.com/role-arn".
-
-  - `params` ((#v-defaultauthmethod-params)) (`map`) - Params to use when authenticating to Vault
-    params:
-      param-something1: "foo"
-
-  - `headers` ((#v-defaultauthmethod-headers)) (`map`) - Headers to be included in all Vault requests.
-    headers:
-      X-vault-something1: "foo"
-
-### telemetry ((#h-telemetry))
-
-- `telemetry` ((#v-telemetry)) - Configures a Prometheus ServiceMonitor
-
-  - `serviceMonitor` ((#v-telemetry-servicemonitor))
-
-    - `enabled` ((#v-telemetry-servicemonitor-enabled)) (`boolean: false`) - The Prometheus operator *must* be installed before enabling this feature,
-      if not the chart will fail to install due to missing CustomResourceDefinitions
-      provided by the operator.
-
-      Instructions on how to install the Helm chart can be found here:
-       https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack
-      More information can be found here:
-       https://github.com/prometheus-operator/prometheus-operator
-       https://github.com/prometheus-operator/kube-prometheus
-
-      Enable deployment of the Vault Secrets Operator ServiceMonitor CustomResource.
-
-    - `selectors` ((#v-telemetry-servicemonitor-selectors)) (`string: ""`) - Selector labels to add to the ServiceMonitor.
-      When empty, defaults to:
-       release: prometheus
-
-    - `scheme` ((#v-telemetry-servicemonitor-scheme)) (`string: https`) - Scheme of the service Prometheus scrapes metrics from. This must match the scheme of the metrics service of VSO
-
-    - `port` ((#v-telemetry-servicemonitor-port)) (`string: https`) - Port at which Prometheus scrapes metrics. This must match the port of the metrics service of VSO
-
-    - `path` ((#v-telemetry-servicemonitor-path)) (`string: /metrics`) - Path at which Prometheus scrapes metrics
-
-    - `bearerTokenFile` ((#v-telemetry-servicemonitor-bearertokenfile)) (`string: /var/run/secrets/kubernetes.io/serviceaccount/token`) - File Prometheus reads bearer token from for scraping metrics
-
-    - `interval` ((#v-telemetry-servicemonitor-interval)) (`string: 30s`) - Interval at which Prometheus scrapes metrics
-
-    - `scrapeTimeout` ((#v-telemetry-servicemonitor-scrapetimeout)) (`string: 10s`) - Timeout for Prometheus scrapes
-
-### tests ((#h-tests))
-
-- `tests` ((#v-tests)) - # Used by unit tests, and will not be rendered except when using `helm template`, this can be safely ignored.
-
-  - `enabled` ((#v-tests-enabled)) (`boolean: true`)
-
-  <!-- codegen: end -->
-
-## Helm Chart Examples
-
-The below `config.yaml` results in a single replica installation of the Vault Secrets Operator
-with a default vault connection and auth method custom resource deployed.
-It expects a local Vault installation within the kubernetes cluster
-accessible via `http://vault.default.svc.cluster.local:8200` with TLS disabled,
-and a [Vault Auth Method](/vault/docs/auth/kubernetes) to be setup against the `default` ServiceAccount.
-
-
-```yaml
-# config.yaml
-
-defaultVaultConnection:
-  enabled: true
-defaultAuthMethod:
-  enabled: true
-
-```
-
-## Customizing the Helm Chart
-
-If you need to extend the Helm chart with additional options, we recommend using a third-party tool,
-such as [kustomize](https://github.com/kubernetes-sigs/kustomize) using the project repo `config/` path
-in the [vault-secrets-operator](https://github.com/hashicorp/vault-secrets-operator) project.
diff --git a/website/content/docs/platform/k8s/vso/index.mdx b/website/content/docs/platform/k8s/vso/index.mdx
deleted file mode 100644
index 8bc1dbb82d692..0000000000000
--- a/website/content/docs/platform/k8s/vso/index.mdx
+++ /dev/null
@@ -1,274 +0,0 @@
----
-layout: docs
-page_title: Vault Secrets Operator
-description: >-
-  The Vault Secrets Operator allows Pods to consume Vault secrets natively from Kubernetes Secrets.
----
-
-# Vault Secrets Operator
-
-The Vault Secrets Operator (VSO) allows Pods to consume Vault secrets natively from Kubernetes Secrets.
-
-## Overview
-
-The Vault Secrets Operator operates by watching for changes to its supported set of Custom Resource Definitions (CRD).
-Each CRD provides the specification required to allow the Operator to synchronize a Vault Secrets to a Kubernetes Secret.
-The Operator writes the *source* Vault secret data directly to the *destination* Kubernetes Secret, ensuring that any
-changes made to the *source* are replicated to the *destination* over its lifetime. In this way, an application only needs
-to have access to the *destination* secret in order to make use of the secret data contained within.
-
-## Features
-
-The following features are supported by the Vault Secrets Operator:
-
-- All Vault [secret engines](/vault/docs/secrets) supported.
-- TLS/mTLS communications with Vault.
-- Authentication to Vault with any of the following Auth Methods:
-  - [Kubernetes](/vault/docs/auth/kubernetes)
-  - [JWT](/vault/docs/auth/jwt)
-  - [AppRole](/vault/docs/auth/approle)
-  - [AWS](/vault/docs/auth/aws)
-  - Support for additional Auth Methods coming soon.
-- Secret rotation for `Deployment`, `ReplicaSet`, `StatefulSet` Kubernetes resource types.
-- Prometheus instrumentation for [monitoring](/vault/docs/platform/k8s/vso/telemetry) the Operator
-- Support for installing using: `Helm` or `Kustomize`<br />
-*see the [installation](/vault/docs/platform/k8s/vso/installation) docs for more details*
-
-## Supported Vault Versions
-
-- Vault OSS 1.11+
-- Vault Enterprise 1.11+
-- [HCP Vault](https://www.hashicorp.com/cloud)
-
-@include 'kubernetes-supported-versions.mdx'
-
-## Supported Cloud Providers
-
-The Vault Secrets Operator has been tested successfully in the following hosted Kubernetes environments:
-- Amazon Elastic Kubernetes Service (EKS)
-- Google Kubernetes Engine (GKE)
-- Microsoft Azure Kubernetes Service (AKS)
-- Red Hat OpenShift
-
-Basic integration tests are available in the project repository.
-Please report any incompatibilities via a [Github Issue](https://github.com/hashicorp/vault-secrets-operator/issues).
-
-
-## Vault Access and Custom Resource Definitions
-
-The Vault connection and authentication configuration is provided by the `VaultConnection` and `VaultAuth` CRDs. These can be considered as
-foundational Custom Resources that all secret replication type resources will reference.
-
-### VaultConnection Custom Resource
-
-Provides the configuration necessary for the Operator to connect to a single Vault server instance.
-
-```yaml
----
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultConnection
-metadata:
-  namespace: vso-example
-  name: example
-spec:
-  # required configuration
-  # address to the Vault server.
-  address: http://vault.vault.svc.cluster.local:8200
-
-  # optional configuration
-  # HTTP headers to be included in all Vault requests.
-  # headers: []
-  # TLS server name to use as the SNI host for TLS connections.
-  # tlsServerName: ""
-  # skip TLS verification for TLS connections to Vault.
-  # skipTLSVerify: false
-  # the trusted PEM encoded CA certificate chain stored in a Kubernetes Secret
-  # caCertSecretRef: ""
-```
-
-### VaultAuth Custom Resource
-
-Provide the configuration necessary for the Operator to authenticate to a single Vault server instance as
-specified in a `VaultConnection` Custom Resource.
-
-```yaml
----
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultAuth
-metadata:
-  namespace: vso-example
-  name: example
-spec:
-  # required configuration
-  # VaultConnectionRef of the corresponding VaultConnection CustomResource.
-  # If no value is specified the Operator will default to the `default` VaultConnection,
-  # configured in its own Kubernetes namespace.
-  vaultConnectionRef: example
-  # Method to use when authenticating to Vault.
-  method: kubernetes
-  # Mount to use when authenticating to auth method.
-  mount: kubernetes
-  # Kubernetes specific auth configuration, requires that the Method be set to kubernetes.
-  kubernetes:
-    # role to use when authenticating to Vault
-    role: example
-    # ServiceAccount to use when authenticating to Vault
-    # it is recommended to always provide a unique serviceAccount per Pod/application
-    serviceAccount: default
-
-  # optional configuration
-  # Vault namespace where the auth backend is mounted (requires Vault Enterprise)
-  # namespace: ""
-  # Params to use when authenticating to Vault
-  # params: []
-  # HTTP headers to be included in all Vault authentication requests.
-  # headers: []
-```
-
-## Vault Secret Custom Resource Definitions
-
-Provide the configuration necessary for the Operator to replicate a single Vault Secret to a single Kubernetes Secret.
-Each supported CRD is specialized to a *class* of Vault secret, documented below.
-
-### VaultStaticSecret Custom Resource
-
-Provides the configuration necessary for the Operator to synchronize a single Vault *static* Secret to a single Kubernetes Secret.<br />
-Supported secrets engines: [kv-v2](/vault/docs/secrets/kv/kv-v2), [kv-v1](/vault/docs/secrets/kv/kv-v1)
-
-##### KV version 1 secret example
-
-The KV secrets engine's `kvv1` mount path is specified under `spec.mount` of `VaultStaticSecret` custom resource. Please consult [KV Secrets Engine - Version 1 - Setup](/vault/docs/secrets/kv/kv-v1#setup) for configuring KV secrets engine version 1. The following results in a request to `http://127.0.0.1:8200/v1/kvv1/eng/apikey/google` to retrieve the secret.
-
-```yaml
----
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultStaticSecret
-metadata:
-  namespace: vso-example
-  name: example
-spec:
-  vaultAuthRef: example
-  mount: kvv1
-  type: kv-v1
-  path: eng/apikey/google
-  refreshAfter: 60s
-  destination:
-    create: true
-    name: static-secret1
-```
-
-##### KV version 2 secret example
-
-The KV secrets engine's `kvv2` mount path is specified under `spec.mount` of `VaultStaticSecret` custom resource. Please consult [KV Secrets Engine - Version 2 - Setup](/vault/docs/secrets/kv/kv-v2#setup) for configuring KV secrets engine version 2. The following results in a request to `http://127.0.0.1:8200/v1/kvv2/data/eng/apikey/google?version=2` to retrieve the secret.
-
-```yaml
----
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultStaticSecret
-metadata:
-  namespace: vso-example
-  name: example
-spec:
-  vaultAuthRef: example
-  mount: kvv2
-  type: kv-v2
-  path: eng/apikey/google
-  version: 2
-  refreshAfter: 60s
-  destination:
-    create: true
-    name: static-secret2
-```
-
-### VaultPKISecret Custom Resource
-Provides the configuration necessary for the Operator to synchronize a single Vault *PKI* Secret to a single Kubernetes Secret.<br />
-Supported secrets engines: [pki](/vault/docs/secrets/pki)
-
-The PKI secrets engine's mount path is specified under `spec.mount` of `VaultPKISecret` custom resource. Please consult [PKI Secrets Engine - Setup and Usage](/vault/docs/secrets/pki/setup) for configuring PKI secrets engine. The following results in a request to `http://127.0.0.1:8200/v1/pki/issue/default` to generate TLS certificates.
-
-```yaml
----
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultPKISecret
-metadata:
-  namespace: vso-example
-  name: example
-spec:
-  vaultAuthRef: example
-  mount: pki
-  role: default
-  commonName: example.com
-  format: pem
-  expiryOffset: 1s
-  ttl: 60s
-  namespace: tenant-1
-  destination:
-    create: true
-    name: pki1
-```
-
-### VaultDynamicSecret Custom Resource
-
-Provides the configuration necessary for the Operator to synchronize a single Vault *dynamic* Secret to a single Kubernetes Secret.<br />
-Supported secrets engines *non-exhaustive*: [databases](/vault/docs/secrets/databases), [aws](/vault/docs/secrets/aws),
-[azure](/vault/docs/secrets/azure), [gcp](/vault/docs/secrets/gcp), ...
-
-##### Database secret example
-
-The database secret engine's `db` mount path is specified under `spec.mount` of `VaultDynamicSecret` custom resource. Please consult [Database Secrets Engine - Setup](/vault/docs/secrets/databases#setup) for configuring the database secrets engine. The following results in a request to `http://127.0.0.1:8200/v1/db/creds/my-postgresql-role` to generate a new credential.
-
-```yaml
----
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultDynamicSecret
-metadata:
-  namespace: vso-example
-  name: example
-spec:
-  vaultAuthRef: example
-  mount: db
-  path: creds/my-postgresql-role
-  destination:
-    create: true
-    name: dynamic1
-```
-
-##### AWS secret example
-
-The AWS secrets engine's `aws` mount path is specified under `spec.mount` of `VaultDynamicSecret` custom resource. Please consult [AWS Secrets Engine - Setup](/vault/docs/secrets/aws#setup) for configuring AWS secrets engine.
-
-The following results in a request to `http://127.0.0.1:8200/v1/aws/creds/my-iam-role` to generate a new IAM credential.
-
-```yaml
----
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultDynamicSecret
-metadata:
-  namespace: vso-example
-  name: example
-spec:
-  vaultAuthRef: example
-  mount: aws
-  path: creds/my-iam-role
-  destination:
-    create: true
-    name: dynamic1
-```
-
-The following results in a request to `http://127.0.0.1:8200/v1/aws/sts/my-sts-role` to generate a new STS credential.
-
-```yaml
----
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultDynamicSecret
-metadata:
-  namespace: vso-example
-  name: example
-spec:
-  vaultAuthRef: example
-  mount: aws
-  path: sts/my-sts-role
-  destination:
-    create: true
-    name: dynamic2
-```
diff --git a/website/content/docs/platform/k8s/vso/installation.mdx b/website/content/docs/platform/k8s/vso/installation.mdx
deleted file mode 100644
index f2ee045e4d346..0000000000000
--- a/website/content/docs/platform/k8s/vso/installation.mdx
+++ /dev/null
@@ -1,47 +0,0 @@
----
-layout: docs
-page_title: Vault Secrets Operator Installation
-description: >-
-  The Vault Secrets Operator can be installed using Helm.
----
-
-# Installing the Vault Secrets Operator
-
-## Prerequisites
-
-- Kubernetes 1.22+
-- Vault OSS/Enterprise 1.11+ or [HCP Vault](https://www.hashicorp.com/cloud)
-
-## Installation using helm
-
-The [Vault Secrets Operator Helm chart](/vault/docs/platform/k8s/vso/helm) is the recommended way of
-installing and configuring the Vault Secrets Operator.
-
-To install a new instance of the Vault Secrets Operator, first add the
-HashiCorp helm repository and ensure you have access to the chart:
-
-```shell-session
-$ helm repo add hashicorp https://helm.releases.hashicorp.com
-"hashicorp" has been added to your repositories
-
-$ helm search repo hashicorp/vault-secrets-operator
-NAME           	CHART VERSION	APP VERSION	DESCRIPTION
-hashicorp/vault-secrets-operator	0.1.0       	0.1.0     	Official HashiCorp Vault Secrets Operator Chart
-```
-
-Then install the Operator:
-
-```shell-session
-$ helm install --create-namespace --namespace vault-secrets-operator vault-secrets-operator hashicorp/vault-secrets-operator --version 0.1.0
-```
-
-
-## Upgrading using helm
-
-Upgrades may be performed with `helm upgrade` on an existing install. Please
-always run Helm with `--dry-run` before any install or upgrade to verify
-changes.
-
-
-### Helm Chart Values
-All supported Helm chart values can be found [here](/vault/docs/platform/k8s/vso/helm)
diff --git a/website/content/docs/platform/k8s/vso/telemetry.mdx b/website/content/docs/platform/k8s/vso/telemetry.mdx
deleted file mode 100644
index e58211e67b75e..0000000000000
--- a/website/content/docs/platform/k8s/vso/telemetry.mdx
+++ /dev/null
@@ -1,14 +0,0 @@
----
-layout: docs
-page_title: Vault Secrets Operator Telemetry
-description: >-
-  The Vault Secrets Operator allows Pods to consume Vault secrets natively from Kubernetes Secrets.
----
-
-# Telemetry
-
-The Vault Secrets Operator is instrumented with Prometheus metrics in the following ways:
-* The operator will emit the default controller-runtime metrics as outlined in the [monitoring](https://book-v1.book.kubebuilder.io/beyond_basics/controller_metrics.html)
-* Custom metrics related to the operator internals which are defined in [`internal/metrics/metrics.go`](https://github.com/hashicorp/vault-secrets-operator/blob/main/internal/metrics/metrics.go)
-* Ability to deploy a Prometheus Service Monitor, configured via the Helm Chart [`telemetry`](/vault/docs/platform/k8s/vso/helm#h-telemetry) stanza.
-* Ability to deploy a Metrics Service, configured via the Helm Chart [`metricsService`](/vault/docs/platform/k8s/vso/helm#h-metricsservice) stanza.
diff --git a/website/content/docs/platform/mssql/changelog.mdx b/website/content/docs/platform/mssql/changelog.mdx
index 3ba5d8bd7dce4..04b6167d76c21 100644
--- a/website/content/docs/platform/mssql/changelog.mdx
+++ b/website/content/docs/platform/mssql/changelog.mdx
@@ -27,4 +27,4 @@ IMPROVEMENTS
 
 Initial release.
 
-[config]: /vault/docs/platform/mssql/configuration
+[config]: /docs/platform/mssql/configuration
diff --git a/website/content/docs/platform/mssql/configuration.mdx b/website/content/docs/platform/mssql/configuration.mdx
index 36a5e1a19e6df..2efd0e2710d76 100644
--- a/website/content/docs/platform/mssql/configuration.mdx
+++ b/website/content/docs/platform/mssql/configuration.mdx
@@ -18,7 +18,7 @@ The following options are supported:
 - `vaultApiBaseUrl` `(string: required)` - Address of Vault server, e.g.
     `https://vault.example.com:8200`
 - `enableTrace` `(bool: false)` - Enable trace logging. Logs are viewable from
-    the event viewer. See [troubleshooting](/vault/docs/platform/mssql/troubleshooting)
+    the event viewer. See [troubleshooting](/docs/platform/mssql/troubleshooting)
     for further details.
 - `namespace` `(string: "")` - Set the Vault namespace to use. Applies to both
     AppRole and Transit.
diff --git a/website/content/docs/platform/mssql/index.mdx b/website/content/docs/platform/mssql/index.mdx
index 0946587389597..74a71e4b90ed1 100644
--- a/website/content/docs/platform/mssql/index.mdx
+++ b/website/content/docs/platform/mssql/index.mdx
@@ -17,10 +17,10 @@ Keys (KEK) managed by Vault's [Transit][transit] secret engine using SQL Server'
 
 [tde]: https://docs.microsoft.com/en-us/sql/relational-databases/security/encryption/transparent-data-encryption?view=sql-server-ver15
 [ekm]: https://docs.microsoft.com/sql/relational-databases/security/encryption/extensible-key-management-ekm?view=sql-server-ver15
-[transit]: /vault/docs/secrets/transit
+[transit]: https://www.vaultproject.io/docs/secrets/transit
 
 
-See [installation](/vault/docs/platform/mssql/installation) and [configuration](/vault/docs/platform/mssql/configuration)
+See [installation](/docs/platform/mssql/installation) and [configuration](/docs/platform/mssql/configuration)
 for help getting started with the Vault EKM provider for SQL Server.
 
 ## Features
diff --git a/website/content/docs/platform/mssql/installation.mdx b/website/content/docs/platform/mssql/installation.mdx
index c30c44dc22616..562ec964bf14a 100644
--- a/website/content/docs/platform/mssql/installation.mdx
+++ b/website/content/docs/platform/mssql/installation.mdx
@@ -7,7 +7,7 @@ description: Installation steps for the Vault EKM Provider for Microsoft SQL Ser
 # Installing the Vault EKM Provider
 
 This guide assumes you are installing the Vault EKM Provider for the first time.
-For upgrade instructions, see [upgrading](/vault/docs/platform/mssql/upgrading).
+For upgrade instructions, see [upgrading](/docs/platform/mssql/upgrading).
 
 ## Prerequisites
 
@@ -50,8 +50,8 @@ EKM provider to use it.
 1. Retrieve the AppRole ID and secret ID for use later when configuring SQL Server:
 
     ```bash
-    vault read auth/approle/role/ekm-encryption-key-role/role-id
-    vault write -f auth/approle/role/ekm-encryption-key-role/secret-id
+    vault read auth/approle/role/tde-role/role-id
+    vault write -f auth/approle/role/tde-role/secret-id
     ```
 
 1. Enable the transit secret engine and create a key:
@@ -98,7 +98,7 @@ The remaining steps are all run on the database server.
   [releases.hashicorp.com](https://releases.hashicorp.com/vault-mssql-ekm-provider/)
 1. Enter your Vault server's address when prompted and complete the installer
 1. If you need to configure non-default namespace or mount paths for your AppRole and
-   Transit engines, see [configuration](/vault/docs/platform/mssql/configuration).
+   Transit engines, see [configuration](/docs/platform/mssql/configuration).
 
 ### Configure the EKM provider using SQL
 
@@ -137,8 +137,8 @@ installation.
     ```sql
     -- Replace <approle-role-id> and <approle-secret-id> with the values from
     -- the earlier vault commands:
-    -- vault read auth/approle/role/ekm-encryption-key/role-id
-    -- vault write -f auth/approle/role/ekm-encryption-key/secret-id
+    -- vault read auth/approle/role/tde-role/role-id
+    -- vault write -f auth/approle/role/tde-role/secret-id
     CREATE CREDENTIAL TransitVaultCredentials
         WITH IDENTITY = '<approle-role-id>',
         SECRET = '<approle-secret-id>'
@@ -161,7 +161,7 @@ installation.
 
     -> **Note:** This is the first step at which the EKM provider will communicate with Vault. If
     Vault is misconfigured, this step is likely to fail. See
-    [troubleshooting](/vault/docs/platform/mssql/troubleshooting) for tips on specific error codes.
+    [troubleshooting](/docs/platform/mssql/troubleshooting) for tips on specific error codes.
 
 1. Create another login from the new asymmetric key:
 
@@ -233,7 +233,7 @@ SELECT * FROM sys.dm_database_encryption_keys;
 ```
 
 To rotate the asymmetric key in Vault's Transit, you can use the standard
-[`/rotate`](/vault/api-docs/secret/transit#rotate-key) endpoint:
+[`/rotate`](/api-docs/secret/transit#rotate-key) endpoint:
 
 ```shell-session
 $ vault write -f transit/keys/ekm-encryption-key/rotate
diff --git a/website/content/docs/platform/mssql/troubleshooting.mdx b/website/content/docs/platform/mssql/troubleshooting.mdx
index bad4d06f78b40..e1bb6ca794fcf 100644
--- a/website/content/docs/platform/mssql/troubleshooting.mdx
+++ b/website/content/docs/platform/mssql/troubleshooting.mdx
@@ -14,7 +14,7 @@ Logs from the Vault EKM provider will appear in Windows Event Viewer under
 ### Enable trace logging
 
 If the logs in the Event Viewer don't give enough information to help debug
-your issue, you can [enable trace logging](/vault/docs/platform/mssql/configuration#enabletrace).
+your issue, you can [enable trace logging](/docs/platform/mssql/configuration#enabletrace).
 
 Restart SQL Server for the config change to take effect, and you should see more
 detailed logs in the same section of Windows Event Viewer.
@@ -28,13 +28,13 @@ During installation, the EKM provider registers a manifest of coded event logs t
 The EKM provider was unable to verify that Vault has the correct license features. This
 could be due to:
 
-- An incompatible Vault Enterprise license - see the installation [prerequisites](/vault/docs/platform/mssql/installation#prerequisites) for the required license feature.
+- An incompatible Vault Enterprise license - see the installation [prerequisites](/docs/platform/mssql/installation#prerequisites) for the required license feature.
 - Lack of network connectivity - Check Vault's audit logs to see if any requests are made to
    authenticate via AppRole or query the `/sys/license/status` API.
 - Misconfigured AppRole auth - Ensure you provided the correct Role ID and Secret ID when
    configuring the SQL Server `CREDENTIAL`. See the
-   [installation instructions](/vault/docs/platform/mssql/installation) for an end-to-end working example.
+   [installation instructions](/docs/platform/mssql/installation) for an end-to-end working example.
 - Incorrect policy permissions - The EKM provider requires the `read` capability
    on the path `sys/license/status`. See the `tde-policy` created in the
-   [installation instructions](/vault/docs/platform/mssql/installation#configuring-vault)
+   [installation instructions](/docs/platform/mssql/installation#configuring-vault)
    for an example of a working policy.
diff --git a/website/content/docs/platform/servicenow/configuration.mdx b/website/content/docs/platform/servicenow/configuration.mdx
index 22ebd9bbf20cf..e9d9aeac88f2a 100644
--- a/website/content/docs/platform/servicenow/configuration.mdx
+++ b/website/content/docs/platform/servicenow/configuration.mdx
@@ -32,10 +32,10 @@ To consume Vault credentials from your MID server, you will need to:
 
 The credential resolver supports reading credentials from the following secret engines:
 
-* [Active Directory](/vault/docs/secrets/ad)
-* [AWS](/vault/docs/secrets/aws)
-* [K/V v1](/vault/docs/secrets/kv/kv-v1)
-* [K/V v2](/vault/docs/secrets/kv/kv-v2)
+* [Active Directory](/docs/secrets/ad)
+* [AWS](/docs/secrets/aws)
+* [K/V v1](/docs/secrets/kv/kv-v1)
+* [K/V v2](/docs/secrets/kv/kv-v2)
 
 When creating K/V secrets, you must use the following keys for each component
 to ensure it is correctly mapped to ServiceNow's credential fields:
@@ -79,7 +79,7 @@ In the ServiceNow UI:
   * Fill in a meaningful name
   * Set "Credential ID" to the path in Vault where your secret is located, e.g.
     for a KV v2 secret engine mounted at "secret", you might have a secret stored
-    under "ssh": `secret/data/ssh`. Check the [API docs](/vault/api-docs/secret/) for
+    under "ssh": `secret/data/ssh`. Check the [API docs](/api-docs/secret/) for
     your secret engine if you are unsure of the path to use
   * **Optional:** Click "Test credential" and select a MID server and a target
     to test against to test everything is working
diff --git a/website/content/docs/platform/servicenow/index.mdx b/website/content/docs/platform/servicenow/index.mdx
index 8af7b938a3678..a440f126dec06 100644
--- a/website/content/docs/platform/servicenow/index.mdx
+++ b/website/content/docs/platform/servicenow/index.mdx
@@ -9,8 +9,8 @@ description: >-
 
 ServiceNow® MID servers can use the Vault Credential Resolver to consume secrets
 directly from Vault for the purpose of performing discovery. See
-[installation](/vault/docs/platform/servicenow/installation) and
-[configuration](/vault/docs/platform/servicenow/configuration) for help getting started
+[installation](/docs/platform/servicenow/installation) and
+[configuration](/docs/platform/servicenow/configuration) for help getting started
 with the Vault Credential Resolver.
 
 ## Overview
diff --git a/website/content/docs/platform/servicenow/installation.mdx b/website/content/docs/platform/servicenow/installation.mdx
index a257dd9d3e042..334c5d7b4e1eb 100644
--- a/website/content/docs/platform/servicenow/installation.mdx
+++ b/website/content/docs/platform/servicenow/installation.mdx
@@ -15,7 +15,7 @@ description: Installation steps for the Vault ServiceNow Credential Resolver.
 
 ## Installing Vault Agent
 
-* Select your desired auth method from Agent's [supported auth methods](/vault/docs/agent-and-proxy/autoauth/methods)
+* Select your desired auth method from Agent's [supported auth methods](/docs/agent/autoauth/methods)
   and set it up in Vault
   * For example, to set up AppRole auth and a role called `role1` with the `demo` policy attached:
 
@@ -65,7 +65,7 @@ description: Installation steps for the Vault ServiceNow Credential Resolver.
   ```
 
 * Install Vault Agent as a service running `vault agent -config=/path/to/agent.hcl`
-  * Documentation for Windows service installation [here](/vault/docs/agent-and-proxy/agent/winsvc)
+  * Documentation for Windows service installation [here](/docs/agent/winsvc)
 
 ## Uploading JAR file to MID server
 
@@ -84,5 +84,5 @@ description: Installation steps for the Vault ServiceNow Credential Resolver.
 
 ## Next steps
 
-See [configuration](/vault/docs/platform/servicenow/configuration) for details on
+See [configuration](/docs/platform/servicenow/configuration) for details on
 configuring the resolver and using credentials for discovery.
diff --git a/website/content/docs/platform/servicenow/troubleshooting.mdx b/website/content/docs/platform/servicenow/troubleshooting.mdx
index 1f976a9ae5243..4eacd8db50c15 100644
--- a/website/content/docs/platform/servicenow/troubleshooting.mdx
+++ b/website/content/docs/platform/servicenow/troubleshooting.mdx
@@ -18,7 +18,7 @@ from the fields you expected.
 
 You will also find any exceptions that the resolver throws in the logs, including
 if it didn't find the minimum set of required fields as specified in
-[configuration](/vault/docs/platform/servicenow/configuration#creating-a-secret-in-vault),
+[configuration](/docs/platform/servicenow/configuration#creating-a-secret-in-vault),
 or if it couldn't communicate with Vault.
 
 [log files]: https://docs.servicenow.com/bundle/quebec-servicenow-platform/page/product/mid-server/reference/r_MIDServerTroubleshooting.html
diff --git a/website/content/docs/plugins/index.mdx b/website/content/docs/plugins/index.mdx
index 9e1783566f09f..c4dc6c17ca1d0 100644
--- a/website/content/docs/plugins/index.mdx
+++ b/website/content/docs/plugins/index.mdx
@@ -18,7 +18,7 @@ A plugin is uniquely identified by its type (one of `secret`, `auth`, or
 implies either the built-in plugin or the single unversioned plugin that can
 be registered.
 
-See [Plugin Upgrade Procedure](/vault/docs/upgrading/plugins#plugin-upgrade-procedure)
+See [Plugin Upgrade Procedure](/docs/upgrading/plugins#plugin-upgrade-procedure)
 for details on how to upgrade a built-in plugin in-place.
 
 ## Built-In Plugins
@@ -33,12 +33,12 @@ intervention to run.
 
 To run an external plugin, a binary of the plugin is required. Plugin
 binaries can be obtained from [releases.hashicorp.com](https://releases.hashicorp.com/)
-or they can be [built from source](/vault/docs/plugins/plugin-development#building-a-plugin-from-source).
+or they can be [built from source](/docs/plugins/plugin-development#building-a-plugin-from-source).
 
 Vault's external plugins are completely separate, standalone applications that
 Vault executes and communicates with over RPC. Each time a Vault secret engine,
 auth method, or database plugin is mounted, a new process is spawned. However,
-plugins can be made to implement [plugin multiplexing](/vault/docs/plugins/plugin-architecture#plugin-multiplexing)
+plugins can be made to implement [plugin multiplexing](/docs/plugins/plugin-architecture#plugin-multiplexing)
 to improve performance. Plugin multiplexing allows plugin processes to be
 reused across all mounts of a given type.
 
diff --git a/website/content/docs/plugins/plugin-architecture.mdx b/website/content/docs/plugins/plugin-architecture.mdx
index efcbfbbad586f..d2b4c5d990a4a 100644
--- a/website/content/docs/plugins/plugin-architecture.mdx
+++ b/website/content/docs/plugins/plugin-architecture.mdx
@@ -48,7 +48,7 @@ loaded when a request that requires the plugin is received by Vault.
 
 ### External Plugin Scaling Characteristics
 
-External plugins can leverage [Performance Standbys](/vault/docs/enterprise/performance-standby)
+External plugins can leverage [Performance Standbys](/docs/enterprise/performance-standby)
 without any explicit action by a plugin author. The default behavior of Vault
 Enterprise is to attempt to handle all requests, including requests to plugins,
 on performance standbys. If the plugin request makes any attempt to modify
@@ -65,7 +65,7 @@ plugin's RPC server. Plugins make use of the AutoMTLS feature of
 [go-plugin](https://www.github.com/hashicorp/go-plugin) which will
 automatically negotiate mutual TLS for transport authentication.
 
-The [`api_addr`](/vault/docs/configuration#api_addr) must be set in order for the
+The [`api_addr`](/docs/configuration#api_addr) must be set in order for the
 plugin process to establish communication with the Vault server during mount
 time. If the storage backend has HA enabled and supports automatic host address
 detection (e.g. Consul), Vault will automatically attempt to determine the
@@ -84,7 +84,7 @@ plugin directory and the plugin catalog entry.
 ### Plugin Directory
 
 The plugin directory is a configuration option of Vault and can be specified in
-the [configuration file](/vault/docs/configuration).
+the [configuration file](/docs/configuration).
 This setting specifies a directory in which all plugin binaries must live;
 _this value cannot be a symbolic link_. A plugin
 cannot be added to Vault unless it exists in the plugin directory. There is no
@@ -103,7 +103,7 @@ ensure the executable referenced in the command exists in the plugin
 directory. When added to the catalog, the plugin is not automatically executed,
 but becomes visible to backends and can be executed by them. For more
 information on the plugin catalog please see the [Plugin Catalog API
-docs](/vault/api-docs/system/plugins-catalog).
+docs](/api-docs/system/plugins-catalog).
 
 An example of plugin registration in current versions of Vault:
 
@@ -132,17 +132,17 @@ When a backend wants to run a plugin, it first looks up the plugin, by name, in
 the catalog. It then checks the executable's SHA256 sum against the one
 configured in the plugin catalog. Finally Vault runs the command configured in
 the catalog, sending along the JWT formatted response wrapping token and mlock
-settings. Like Vault, plugins support [the use of mlock when available](/vault/docs/configuration#disable_mlock).
+settings. Like Vault, plugins support [the use of mlock when available](/docs/configuration#disable_mlock).
 
 ~> Note: If Vault is configured with `mlock` enabled, then the Vault executable
-and each plugin executable in your [plugins directory](/vault/docs/plugins/plugin-architecture#plugin-directory)
+and each plugin executable in your [plugins directory](/docs/plugins/plugin-architecture#plugin-directory)
 must be given the ability to use the `mlock` syscall.
 
 ### Plugin Upgrades
 
 External plugins may be updated by registering and reloading them. More details
 on the upgrade procedure can be found in
-[Upgrading Vault Plugins](/vault/docs/upgrading/plugins).
+[Upgrading Vault Plugins](/docs/upgrading/plugins).
 
 ## Plugin Multiplexing
 
@@ -160,8 +160,8 @@ multiplexing. To use a non-multiplexed plugin, run an older version of the
 plugin, i.e., the plugin calls the `Serve` function.
 
 More resources on implementing plugin multiplexing:
-* [Database secrets engines](/vault/docs/secrets/databases/custom#serving-a-plugin-with-multiplexing)
-* [Secrets engines and auth methods](/vault/docs/plugins/plugin-development)
+* [Database secrets engines](/docs/secrets/databases/custom#serving-a-plugin-with-multiplexing)
+* [Secrets engines and auth methods](/docs/plugins/plugin-development)
 
 ## Troubleshooting
 
diff --git a/website/content/docs/plugins/plugin-development.mdx b/website/content/docs/plugins/plugin-development.mdx
index bc1bd831d8613..b30c487b01c3c 100644
--- a/website/content/docs/plugins/plugin-development.mdx
+++ b/website/content/docs/plugins/plugin-development.mdx
@@ -88,17 +88,17 @@ Let's take a closer look at a snippet from the above main package.
 
 The call to `plugin.ServeMultiplex` ensures that the plugin will use
 Vault's [plugin
-multiplexing](/vault/docs/plugins/plugin-architecture#plugin-multiplexing) feature.
+multiplexing](/docs/plugins/plugin-architecture#plugin-multiplexing) feature.
 However, this plugin will not be multiplexed if it is run by a version of Vault
 that does not support multiplexing. Vault will simply fall back to a plugin
 version that it can run. Additionally, we set the `TLSProviderFunc` to ensure
 that our plugin is backwards compatible with versions of Vault that do not
 support automatic mutual TLS for secure [plugin
-communication](/vault/docs/plugins/plugin-architecture#plugin-communication). If you
+communication](/docs/plugins/plugin-architecture#plugin-communication). If you
 are certain your plugin does not need backwards compatibility, this field can
 be omitted.
 
-[api_addr]: /vault/docs/configuration#api_addr
+[api_addr]: /docs/configuration#api_addr
 
 ## Leveraging plugin versioning
 
@@ -118,19 +118,19 @@ interface directly.
 To build a plugin from source, first navigate to the location holding the
 desired plugin version. Next, run `go build` to obtain a new binary for the
 plugin. Finally,
-[register](/vault/docs/plugins/plugin-architecture#plugin-registration) the
+[register](/docs/plugins/plugin-architecture#plugin-registration) the
 plugin and enable it.
 
 ## Plugin Development - Resources
 
 For more information on how to register and enable your plugin, refer to the
-[Building Plugin Backends](/vault/tutorials/app-integration/plugin-backends)
+[Building Plugin Backends](https://learn.hashicorp.com/vault/developer/plugin-backends)
 tutorial.
 
 Other HashiCorp plugin development resources:
 
 * [vault-auth-plugin-example](https://github.com/hashicorp/vault-auth-plugin-example)
-* [Custom Secrets Engines](/vault/tutorials/custom-secrets-engine)
+* [Custom Secrets Engines](https://learn.hashicorp.com/collections/vault/custom-secrets-engine)
 
 ### Plugin Development - Resources - Community
 
diff --git a/website/content/docs/plugins/plugin-management.mdx b/website/content/docs/plugins/plugin-management.mdx
index 1f949babc5041..3a51c7b827d2d 100644
--- a/website/content/docs/plugins/plugin-management.mdx
+++ b/website/content/docs/plugins/plugin-management.mdx
@@ -18,12 +18,12 @@ backend has HA enabled and supports automatic host address detection (e.g.
 Consul), Vault will automatically attempt to determine the `api_addr` as well.
 
 Detailed information regarding the plugin system can be found in the
-[internals documentation](/vault/docs/plugins).
+[internals documentation](/docs/plugins).
 
 ## Registering External Plugins
 
 Before an external plugin can be mounted, it needs to be
-[registered](/vault/docs/plugins/plugin-architecture#plugin-registration) in the
+[registered](/docs/plugins/plugin-architecture#plugin-registration) in the
 plugin catalog to ensure the plugin invoked by Vault is authentic and maintains
 integrity:
 
@@ -65,5 +65,5 @@ $ vault secrets disable my-secrets
 Upgrade instructions can be found in the [Upgrading Plugins - Guides][upgrading_plugins]
 page.
 
-[api_addr]: /vault/docs/configuration#api_addr
-[upgrading_plugins]: /vault/docs/upgrading/plugins
+[api_addr]: /docs/configuration#api_addr
+[upgrading_plugins]: /docs/upgrading/plugins
diff --git a/website/content/docs/release-notes/1.10.0.mdx b/website/content/docs/release-notes/1.10.0.mdx
index bff701f242136..ef9be72fd8517 100644
--- a/website/content/docs/release-notes/1.10.0.mdx
+++ b/website/content/docs/release-notes/1.10.0.mdx
@@ -28,13 +28,13 @@ This section describes the new features introduced as part of Vault
 
 ### Multi-Factor Authentication (MFA) for Vault OSS
 
-Vault has had support for the [Step-up Enterprise MFA](/vault/docs/enterprise/mfa) as part of its Enterprise edition. The Step-up Enterprise MFA allows having an MFA on login, or for step-up access to sensitive resources in Vault.
+Vault has had support for the [Step-up Enterprise MFA](/docs/enterprise/mfa) as part of its Enterprise edition. The Step-up Enterprise MFA allows having an MFA on login, or for step-up access to sensitive resources in Vault.
 
-With Vault 1.10.0, MFA as part of [login](/vault/docs/auth/login-mfa) is now supported for Vault OSS. This demonstrates HashiCorp’s thought leadership in security and its continued endeavor to enable all Vault users to employ strong security policies with Vault.
+With Vault 1.10.0, MFA as part of [login](/docs/auth/login-mfa) is now supported for Vault OSS. This demonstrates HashiCorp’s thought leadership in security and its continued endeavor to enable all Vault users to employ strong security policies with Vault.
 
-~> **Note:** The Legacy MFA in Vault OSS is a [deprecated](/vault/docs/deprecation) feature and will be removed in Vault 1.11.
+~> **Note:** The Legacy MFA in Vault OSS is a [deprecated](/docs/deprecation) feature and will be removed in Vault 1.11.
 
-Refer to the [Login MFA FAQ](/vault/docs/auth/login-mfa/faq) to understand the various MFA workflows that are supported in Vault 1.10.0.
+Refer to the [Login MFA FAQ](/docs/auth/login-mfa/faq) to understand the various MFA workflows that are supported in Vault 1.10.0.
 
 ### Vault OIDC provider with PKCE support
 
@@ -50,11 +50,11 @@ We have introduced three new resources to enable configuration of the [KMIP secr
 
 ### KV Secrets Engine v2 patch operations
 
-We now support an additional method for managing [KV v2 secrets](/vault/api-docs/secret/kv/kv-v2) to maintain least privilege security in certain types of automated environments. This feature creates a new PATCH capability that enables partial updates to KV v2 secrets without requiring the READ privilege to the entire endpoint for an entity.
+We now support an additional method for managing [KV v2 secrets](/api-docs/secret/kv/kv-v2) to maintain least privilege security in certain types of automated environments. This feature creates a new PATCH capability that enables partial updates to KV v2 secrets without requiring the READ privilege to the entire endpoint for an entity.
 
 ### DB2 Dynamic Secrets support
 
-Vault operators can leverage the openldap secrets engine to manage credentials for IBM DB2 and the LDAP security plugin for Db2. This allows Db2 to offload authentication and authorization to the LDAP security plugin and allows Vault to manage static credentials or even generate dynamic users. For more details, refer to the For more details, refer to the [IBM Db2 Credentials Management](/vault/tutorials/secrets-management/ibm-db2-openldap) tutorial.
+Vault operators can leverage the openldap secrets engine to manage credentials for IBM DB2 and the LDAP security plugin for Db2. This allows Db2 to offload authentication and authorization to the LDAP security plugin and allows Vault to manage static credentials or even generate dynamic users. For more details, refer to the For more details, refer to the [IBM Db2 Credentials Management](https://learn.hashicorp.com/tutorials/vault/ibm-db2-openldap) tutorial.
 
 ### Temporal Transit Key rotation
 
@@ -70,23 +70,23 @@ The work done above to support HSM-backed PKI operations inspired us to consider
 
 ### Server Side Consistent Tokens
 
-Vault’s [eventual consistency](/vault/docs/enterprise/consistency) model precludes read-after-write guarantees when clients interact with performance standbys or performance replication clusters. The [Client Controlled Consistency](/vault/docs/enterprise/consistency#vault-1-7-mitigations) mitigations supported with Vault 1.7 provide ways to achieve consistency through client modifications or by using the agent for proxied requests, which is not possible in all cases. The Server Side Consistent Tokens feature provides an implicit way to achieve consistency by embedding the minimum Write-Ahead-Log state information in the Service tokens returned from logins or token-create requests. This feature introduces changes in the token format and the new tokesn will be the default tokens starting in Vault 1.10.0. Vault 1.10.0 is backwards compatible with old tokens.
+Vault’s [eventual consistency](/docs/enterprise/consistency) model precludes read-after-write guarantees when clients interact with performance standbys or performance replication clusters. The [Client Controlled Consistency](/docs/enterprise/consistency#vault-1-7-mitigations) mitigations supported with Vault 1.7 provide ways to achieve consistency through client modifications or by using the agent for proxied requests, which is not possible in all cases. The Server Side Consistent Tokens feature provides an implicit way to achieve consistency by embedding the minimum Write-Ahead-Log state information in the Service tokens returned from logins or token-create requests. This feature introduces changes in the token format and the new tokesn will be the default tokens starting in Vault 1.10.0. Vault 1.10.0 is backwards compatible with old tokens.
 
-See [Replication](/vault/docs/configuration/replication), [Vault Eventual Consistency](/vault/docs/enterprise/consistency), [Upgrade to 1.10.0](/vault/docs/upgrading/upgrade-to-1.10.x) and [Server Side Consistent Token FAQ](/vault/docs/faq/ssct) to understand the various consistency options available with Vault 1.10.0 and the considerations to be aware of prior to selecting an option for your use case.
+See [Replication](/docs/configuration/replication), [Vault Eventual Consistency](/docs/enterprise/consistency), [Upgrade to 1.10.0](/docs/upgrading/upgrade-to-1.10.x) and [Server Side Consistent Token FAQ](/docs/faq/ssct) to understand the various consistency options available with Vault 1.10.0 and the considerations to be aware of prior to selecting an option for your use case.
 
 ## Vault Agent Features
 
 ### Support for Telemetry
 
-Starting with Vault 1.10.0, the Vault Agent supports a new metrics endpoint and [Telemetry](/vault/docs/agent#telemetry-stanza) metrics around run time, authentication success, authentication failures, cache hits, cache misses, proxy succes, and proxy client errors. This Vault Agent Telemetry should greatly help with the retrieval of key operational insights for Vault Agent deployments.
+Starting with Vault 1.10.0, the Vault Agent supports a new metrics endpoint and [Telemetry](/docs/agent#telemetry-stanza) metrics around run time, authentication success, authentication failures, cache hits, cache misses, proxy succes, and proxy client errors. This Vault Agent Telemetry should greatly help with the retrieval of key operational insights for Vault Agent deployments.
 
 ### User-assigned managed identities for auto auth in Azure
 
-With this [enhancement](/vault/docs/agent/autoauth/methods/azure), users can specify user-assigned managed identities via the `object_id` and `client_id` when configuring Vault agent auto-auth for Azure. This enables users that have more than one user-assigned managed identity associated with their VM to specify which one they'd like to use when authenticating via the Vault's Azure auth method. Note that providing these parameters is an "exclusive or" operation.
+With this [enhancement](/docs/agent/autoauth/methods/azure), users can specify user-assigned managed identities via the `object_id` and `client_id` when configuring Vault agent auto-auth for Azure. This enables users that have more than one user-assigned managed identity associated with their VM to specify which one they'd like to use when authenticating via the Vault's Azure auth method. Note that providing these parameters is an "exclusive or" operation.
 
 ### Quit API endpoint with config
 
-Previously, for instances where the Agent is a sidecar in a Kubernetes job and the job hangs, you must either use `shareProcessNamespace: true` for the container so that the process kill signals can be sent, or avoid the sidecar container entirely and solely rely on an init container. With this [enhancement](/vault/docs/agent#quit), we have added support for a Quit API endpoint to automatically shut down the Vault Agent, therefore eliminating the need to perform the workarounds.
+Previously, for instances where the Agent is a sidecar in a Kubernetes job and the job hangs, you must either use `shareProcessNamespace: true` for the container so that the process kill signals can be sent, or avoid the sidecar container entirely and solely rely on an init container. With this [enhancement](/docs/agent#quit), we have added support for a Quit API endpoint to automatically shut down the Vault Agent, therefore eliminating the need to perform the workarounds.
 
 ## Other Features and Enhancements
 
@@ -96,21 +96,21 @@ This section describes other features and enhancements introduced as part of the
 
 We have introduced auth mount-based attribution of clients to help better understand where clients are being used within a cluster. This is available via UI and API. This is an enhancement on top of the namespace attribution capability we introduced in Vault 1.9.
 
-We have also introduced the ability to view changes to clients month over month via the client count API, and made other UI enhancements. Refer to [What is a Client?](/vault/docs/concepts/client-count) and [Client Count FAQ](/vault/docs/concepts/client-count/faq) for more details.
+We have also introduced the ability to view changes to clients month over month via the client count API, and made other UI enhancements. Refer to [What is a Client?](/docs/concepts/client-count) and [Client Count FAQ](/docs/concepts/client-count/faq) for more details.
 
 ### Mount Migration
 
-We have made improvements to the `sys/remount` API endpoint to simplify the complexities of moving data, such as secret engine and authentication method configuration from one mount to another, within a namespace or across namespaces. This can help with restructuring namespaces and mounts for various reasons, including migrating mounts from root to other namespaces when transitioning to using namespaces for the first time. For step-by-step instructions, refer to the [Mount Move](/vault/tutorials/enterprise/mount-move) tutorial.
+We have made improvements to the `sys/remount` API endpoint to simplify the complexities of moving data, such as secret engine and authentication method configuration from one mount to another, within a namespace or across namespaces. This can help with restructuring namespaces and mounts for various reasons, including migrating mounts from root to other namespaces when transitioning to using namespaces for the first time. For step-by-step instructions, refer to the [Mount Move](https://learn.hashicorp.com/tutorials/vault/mount-move) tutorial.
 
 ### Scaling External Database plugins
 
-Database plugins can now implement [plugin multiplexing](/vault/docs/plugins/plugin-architecture#plugin-multiplexing) which allows a single plugin process to be used for multiple database connections. Database plugin multiplexing will be enabled on the Oracle Database plugin starting in v0.6.0. We will extend this functionality to additional database plugins in subsequent releases.
+Database plugins can now implement [plugin multiplexing](/docs/plugins/plugin-architecture#plugin-multiplexing) which allows a single plugin process to be used for multiple database connections. Database plugin multiplexing will be enabled on the Oracle Database plugin starting in v0.6.0. We will extend this functionality to additional database plugins in subsequent releases.
 
 Any external database plugins that want to adopt multiplexing support will have to update their main.go call from [dbplugin.Serve()](https://github.com/hashicorp/vault/blob/sdk/v0.4.1/sdk/database/dbplugin/v5/plugin_server.go#L13) to [dbplugin.ServeMultiplex()](https://github.com/hashicorp/vault/blob/sdk/v0.4.1/sdk/database/dbplugin/v5/plugin_server.go#L42). Multiplexable database plugins are compatible with older versions of Vault down to Vault 1.6. Refer to this [Oracle Database PR](https://github.com/hashicorp/vault-plugin-database-oracle/pull/74) as an example of the upgrade process.
 
 ### Consul Secrets Engine enhancements
 
-Consul has supported [namespace](/consul/docs/enterprise/namespaces), [admin partitions](/consul/docs/enterprise/admin-partitions) and [ACL roles](/consul/commands/acl/role) for some time now. In this release we have added enhancements to the Consul Secrets engine to support namespace awareness and add admin partition and role support for Consul ACL tokens. This significantly simplifies the integrations for customers who want to achieve a zero trust security posture with both Vault and Consul.
+Consul has supported [namespace](https://developer.hashicorp.com/consul/docs/enterprise/namespaces), [admin partitions](https://developer.hashicorp.com/consul/docs/enterprise/admin-partitions) and [ACL roles](https://developer.hashicorp.com/consul/commands/acl/role) for some time now. In this release we have added enhancements to the Consul Secrets engine to support namespace awareness and add admin partition and role support for Consul ACL tokens. This significantly simplifies the integrations for customers who want to achieve a zero trust security posture with both Vault and Consul.
 
 ### Using sessionStorage instead of localStorage for the Vault UI
 
@@ -118,7 +118,7 @@ Prior to Vault 1.10.0, the Vault UI used localStorage to store authentication in
 
 ### Advanced I/O Handling for Transform FPE
 
-The Transform Secrets Engine allows users to securely encrypt data while providing control over the output format. In Vault 1.9, we introduced [additional format fields](/vault/docs/release-notes/1.9.0#advanced-i-o-handling-for-tranform-fpe-adp-transform) on the templates used for this workflow. In Vault 1.10.0, we have now added those two new fields, `encode_format` and `decode_format`, to the Create Template page on the UI under Advanced Templating.
+The Transform Secrets Engine allows users to securely encrypt data while providing control over the output format. In Vault 1.9, we introduced [additional format fields](/docs/release-notes/1.9.0#advanced-i-o-handling-for-tranform-fpe-adp-transform) on the templates used for this workflow. In Vault 1.10.0, we have now added those two new fields, `encode_format` and `decode_format`, to the Create Template page on the UI under Advanced Templating.
 
 ## Breaking changes
 
@@ -126,7 +126,7 @@ The following section details breaking changes introduced in Vault 1.10.0.
 
 ### LDAP auth method entity alias mapping
 
-In Vault 1.9, we added support to provide custom user filters through the [userfilter](/vault/api-docs/auth/ldap#userfilter) parameter. This support changed the way that entity alias was mapped to an entity. Prior to Vault 1.9, alias names were always based on the [login username](/vault/api-docs/auth/ldap#username-3) (which in turn is based on the value of the [userattr](/vault/api-docs/auth/ldap#userattr)). In Vault 1.9, alias names no longer mapped to the login username. Instead, the mapping depends on other config values as well, such as [updomain](/vault/api-docs/auth/ldap#upndomain), [binddn](/vault/api-docs/auth/ldap#binddn), [discoverydn](/vault/api-docs/auth/ldap#discoverdn), and [userattr](/vault/api-docs/auth/ldap#userattr).
+In Vault 1.9, we added support to provide custom user filters through the [userfilter](/api-docs/auth/ldap#userfilter) parameter. This support changed the way that entity alias was mapped to an entity. Prior to Vault 1.9, alias names were always based on the [login username](/api-docs/auth/ldap#username-3) (which in turn is based on the value of the [userattr](/api-docs/auth/ldap#userattr)). In Vault 1.9, alias names no longer mapped to the login username. Instead, the mapping depends on other config values as well, such as [updomain](/api-docs/auth/ldap#upndomain), [binddn](/api-docs/auth/ldap#binddn), [discoverydn](/api-docs/auth/ldap#discoverdn), and [userattr](/api-docs/auth/ldap#userattr).
 
 With Vault 1.10.0, we re-introduced the option to force the alias name to map to the login username with the optional parameter username_as_alias. Users that have the LDAP auth method enabled prior to Vault 1.9 may want to consider setting this to true to revert back to the old behavior. Otherwise, depending on the other aforementioned config values, logins may generate a new and different entity for an existing user with a previous entity associated in Vault. This in turn affects client counts since there may be more than one entity tied to this user. The username_as_alias flag was also made available in subsequent Vault 1.8.x and Vault 1.9.x releases to allow for this to be set prior to a Vault 1.10.0 upgrade.
 
@@ -134,9 +134,9 @@ With Vault 1.10.0, we re-introduced the option to force the alias name to map to
 
 ### Single Vault follower restart causes election even with established quorum
 
-We now support Server Side Consistent Tokens (See [Replication](/vault/docs/configuration/replication), [Vault Eventual Consistency](/vault/docs/enterprise/consistency), and [Upgrade to 1.10.0](/vault/docs/upgrading/upgrade-to-1.10.x).), which introduces a new token format that can only be used on nodes of 1.10 or higher version. This new format is enabled by default upon upgrading to the new version. Old format tokens can be read by Vault 1.10.0, but the new format Vault 1.10 tokens cannot be read by older Vault versions.
+We now support Server Side Consistent Tokens (See [Replication](/docs/configuration/replication), [Vault Eventual Consistency](/docs/enterprise/consistency), and [Upgrade to 1.10.0](/docs/upgrading/upgrade-to-1.10.x).), which introduces a new token format that can only be used on nodes of 1.10 or higher version. This new format is enabled by default upon upgrading to the new version. Old format tokens can be read by Vault 1.10.0, but the new format Vault 1.10 tokens cannot be read by older Vault versions.
 
-For more details, see the [Server Side Consistent Tokens FAQ](/vault/docs/faq/ssct).
+For more details, see the [Server Side Consistent Tokens FAQ](/docs/faq/ssct).
 
 Since service tokens are always created on the leader, as long as the leader is not upgraded before performance standbys, service tokens will be of the old format and still be usable during the upgrade process. However, the usual upgrade process we recommend can't be relied upon to always upgrade the leader last. Due to this known [issue](https://github.com/hashicorp/vault/issues/14153), a Vault cluster using Integrated Storage may result in a leader not being upgraded last, and this can trigger a re-election. This re-election can cause the upgraded node to become the leader, resulting in the newly created tokens on the leader to be unusable on nodes that have not yet been upgraded. Note that this issue does not impact Vault OSS users.
 
@@ -154,7 +154,7 @@ When adding or modifying a Duo MFA method for step-up Enterprise MFA using the `
 
 Signing in to the Vault UI using an OIDC auth mount listed in the "tabs" of the form will result
 in the following error: "Authentication failed: role with oidc role_type is not allowed".
-The auth mounts listed in the "tabs" of the form are those that have [listing_visibility](/vault/api-docs/system/auth#listing_visibility-1)
+The auth mounts listed in the "tabs" of the form are those that have [listing_visibility](/api-docs/system/auth#listing_visibility-1)
 set to `unauth`.
 
 There is a workaround for this error that will allow you to sign in to Vault using the OIDC
@@ -167,4 +167,4 @@ When trying to start Vault server 1.10.0 on Windows, and there is less than 100G
 
 ## Feature Deprecations and EOL
 
-Please refer to the [Deprecation Plans and Notice](/vault/docs/deprecation) page for up-to-date information on feature deprecations and plans. An [Feature Deprecation FAQ](/vault/docs/deprecation/faq) page is also available to address questions concerning decisions made about Vault feature deprecations.
+Please refer to the [Deprecation Plans and Notice](/docs/deprecation) page for up-to-date information on feature deprecations and plans. An [Feature Deprecation FAQ](/docs/deprecation/faq) page is also available to address questions concerning decisions made about Vault feature deprecations.
diff --git a/website/content/docs/release-notes/1.11.0.mdx b/website/content/docs/release-notes/1.11.0.mdx
index 46391667445f4..2b2ef6735497c 100644
--- a/website/content/docs/release-notes/1.11.0.mdx
+++ b/website/content/docs/release-notes/1.11.0.mdx
@@ -32,16 +32,16 @@ This section describes the new features introduced as part of Vault 1.11.0.
 
 ### Configure GCP auth to target non-public good API addresses
 
-The GCP auth method only allows for public API endpoints to be configured for authentication purposes. Workloads running in GCP that do not have external internet access need the ability to authenticate using [Private Google Access](https://cloud.google.com/vpc/docs/private-google-access#pga). In Vault 1.11.0, we allow for customization of certain service endpoints. For more information, refer to the [GCP auth method](/vault/api-docs/auth/gcp#custom_endpoint) documentation.
+The GCP auth method only allows for public API endpoints to be configured for authentication purposes. Workloads running in GCP that do not have external internet access need the ability to authenticate using [Private Google Access](https://cloud.google.com/vpc/docs/private-google-access#pga). In Vault 1.11.0, we allow for customization of certain service endpoints. For more information, refer to the [GCP auth method](/api-docs/auth/gcp#custom_endpoint) documentation.
 
 
 ### Support for key/pair based authentication for Snowflake
 
-In Vault 1.11.0, the Snowflake Database Engine supports an additional credential type that can be generated. For users not wanting to rely on the standard user/pass authentication to Snowflake, Vault can now dynamically generate RSA key pairs that allow users to authenticate into Snowflake. For more information, refer to the [Snowflake Database Secrets Engine](/vault/docs/secrets/databases/snowflake) and [Database Secrets Engine (API)](/vault/api-docs/secret/databases) documentation.
+In Vault 1.11.0, the Snowflake Database Engine supports an additional credential type that can be generated. For users not wanting to rely on the standard user/pass authentication to Snowflake, Vault can now dynamically generate RSA key pairs that allow users to authenticate into Snowflake. For more information, refer to the [Snowflake Database Secrets Engine](/docs/secrets/databases/snowflake) and [Database Secrets Engine (API)](/api-docs/secret/databases) documentation.
 
 ### Dynamic Kubernetes service account secrets
 
-Kubernetes service accounts must be manually generated and passed to a Kubernetes configuration file or the command line using a CLI tool such as kubectl to interact with Kubernetes clusters. With this method, service account credentials, which contain static secrets, can be exposed and would require a periodic manual rotation. To address this issue, we now support generating short-lived dynamic service accounts and associate role bindings to specific Kubernetes namespaces. For more information, refer to the [Kubernetes Auth Method](/vault/docs/auth/kubernetes) and [Kubernetes Auth Method (API)](/vault/api-docs/auth/kubernetes) documentation.
+Kubernetes service accounts must be manually generated and passed to a Kubernetes configuration file or the command line using a CLI tool such as kubectl to interact with Kubernetes clusters. With this method, service account credentials, which contain static secrets, can be exposed and would require a periodic manual rotation. To address this issue, we now support generating short-lived dynamic service accounts and associate role bindings to specific Kubernetes namespaces. For more information, refer to the [Kubernetes Auth Method](/docs/auth/kubernetes) and [Kubernetes Auth Method (API)](/api-docs/auth/kubernetes) documentation.
 
 ### New KV secrets engine (v2) utilities
 
@@ -51,15 +51,15 @@ The KV version 2 secrets engine now includes a set of utilities and enhancements
 * New flag to output a sample policy in HCL (`-output-policy`) for any Vault CLI command.
 * New KV convenience/helper methods (GET and PUT) added to the Go client library.
 
-For more details, refer to the [Version Key/Value Secrets Engine](/vault/tutorials/secrets-management/versioned-kv) tutorial.
+For more details, refer to the [Version Key/Value Secrets Engine](https://learn.hashicorp.com/tutorials/vault/versioned-kv) tutorial.
 
 ### Support for node identity and service identity for Vault Consul secrets engine
 
-Within the Consul secrets engine, practitioners writing a Vault role can specify node-identity or service-identity. You can also specify multiples of each identity on a Vault role. For more information, refer to the [Consul Secrets Engine](/vault/docs/secrets/consul) and [Consul Secrets Engine (API)](/vault/api-docs/secret/consul) documentation.
+Within the Consul secrets engine, practitioners writing a Vault role can specify node-identity or service-identity. You can also specify multiples of each identity on a Vault role. For more information, refer to the [Consul Secrets Engine](/docs/secrets/consul) and [Consul Secrets Engine (API)](/api-docs/secret/consul) documentation.
 
 ### Autopilot (Vault Enterprise)
 
-Vault release 1.7 introduced the Autopilot feature to Integrated Storage. In this release, new Autopilot features are added to Vault Enterprise to perform seamless automatic upgrades and support redundancy zones for improved cluster resiliency. Refer to the [autopilot endpoint](/vault/api-docs/system/storage/raftautopilot#sys-storage-raft-autopilot), [operator raft](/vault/docs/commands/operator/raft), [Autopilot](/vault/docs/concepts/integrated-storage/autopilot),  [Automated Upgrades](/vault/docs/enterprise/automated-upgrades), and [Redundancy Zones](/vault/docs/enterprise/redundancy-zones) documentation for more information.
+Vault release 1.7 introduced the Autopilot feature to Integrated Storage. In this release, new Autopilot features are added to Vault Enterprise to perform seamless automatic upgrades and support redundancy zones for improved cluster resiliency. Refer to the [autopilot endpoint](/api-docs/system/storage/raftautopilot#sys-storage-raft-autopilot), [operator raft](/docs/commands/operator/raft), [Autopilot](/docs/concepts/integrated-storage/autopilot),  [Automated Upgrades](/docs/enterprise/automated-upgrades), and [Redundancy Zones](/docs/enterprise/redundancy-zones) documentation for more information.
 
 ## Other Features and Enhancements
 
@@ -77,12 +77,12 @@ PKI secrets engine users have sought a way to rotate root or intermediate CAs wi
 
 We have made the following improvements to the Client Count tooling:
 
-* Provide the ability to export the unique clients that contribute to the client count aggregate for the selected billing period via a new [activity export API endpoint](/vault/api-docs/system/internal-counters#activity-export). This feature is available in tech preview mode.
+* Provide the ability to export the unique clients that contribute to the client count aggregate for the selected billing period via a new [activity export API endpoint](/api-docs/system/internal-counters#activity-export). This feature is available in tech preview mode.
 * Provide the ability to view changes to client counts month over month in the UI.
 
 ### MFA Enhancements
 
-Vault 1.10 introduced [Login MFA](/vault/docs/auth/login-mfa) support for Vault OSS. In this release, we included additional enhancements to the Login MFA feature by introducing the ability to configure Login MFA via the UI and providing an enhanced TOTP configuration experience via the QR code scan.
+Vault 1.10 introduced [Login MFA](/docs/auth/login-mfa) support for Vault OSS. In this release, we included additional enhancements to the Login MFA feature by introducing the ability to configure Login MFA via the UI and providing an enhanced TOTP configuration experience via the QR code scan.
 
 ### Vault Agent: Support for using an existing valid certificate upon re-authentication
 
@@ -94,11 +94,11 @@ With Terraform Vault provider v3.7.0, we have made enhancements where it’s now
 
 ### ADP-Tranform enhancements
 
-Two new enhancements were made to the Transform secrets engine. The first is Convergent Tokenization, which allows tokenization transformations to be configured as _convergent_. When enabled, this guarantees that tokenizing a given plaintext and expiration more than once always results in the same token value being produced. Please refer to the [Convergent Tokenization](/vault/docs/secrets/transform/tokenization#convergence) document for more information. Token Lookup allows you to look up the value of a token given its plaintext. While this is not typically encouraged from a security perspective, it may be necessary for particular circumstances that require this operation. Note that token lookup is only supported when convergence is enabled. For more information on the endpoint, refer to the [Lookup Token](/vault/api-docs/secret/transform#lookup-token) documentation.
+Two new enhancements were made to the Transform secrets engine. The first is Convergent Tokenization, which allows tokenization transformations to be configured as _convergent_. When enabled, this guarantees that tokenizing a given plaintext and expiration more than once always results in the same token value being produced. Please refer to the [Convergent Tokenization](/docs/secrets/transform/tokenization#convergence) document for more information. Token Lookup allows you to look up the value of a token given its plaintext. While this is not typically encouraged from a security perspective, it may be necessary for particular circumstances that require this operation. Note that token lookup is only supported when convergence is enabled. For more information on the endpoint, refer to the [Lookup Token](/api-docs/secret/transform#lookup-token) documentation.
 
 ### KMIP support for import, query, encryption and decryption
 
-Previously, KMIP did not support certain operations such as import, decrypt, encrypt, and query. These operations are now supported. For a complete list of supported KMIP operations, please refer to the [Supported KMIP Operations](/vault/docs/secrets/kmip) documentation.
+Previously, KMIP did not support certain operations such as import, decrypt, encrypt, and query. These operations are now supported. For a complete list of supported KMIP operations, please refer to the [Supported KMIP Operations](/docs/secrets/kmip) documentation.
 
 @include 'pgx-params.mdx'
 
@@ -110,4 +110,4 @@ When you use Vault 1.11.0+ as a Consul's Connect CA, you may encounter an issue
 
 ## Feature Deprecations and EOL
 
-Please refer to the [Deprecation Plans and Notice](/vault/docs/deprecation) page for up-to-date information on feature deprecations and plans. An [Feature Deprecation FAQ](/vault/docs/deprecation/faq) page is also available to address questions concerning decisions made about Vault feature deprecations.
+Please refer to the [Deprecation Plans and Notice](/docs/deprecation) page for up-to-date information on feature deprecations and plans. An [Feature Deprecation FAQ](/docs/deprecation/faq) page is also available to address questions concerning decisions made about Vault feature deprecations.
diff --git a/website/content/docs/release-notes/1.12.0.mdx b/website/content/docs/release-notes/1.12.0.mdx
index 796eefd1aa789..8c2a89d651629 100644
--- a/website/content/docs/release-notes/1.12.0.mdx
+++ b/website/content/docs/release-notes/1.12.0.mdx
@@ -27,7 +27,7 @@ Some of these enhancements and changes in this release include the following:
 - **Redis Database Secrets Engine** is now available to manage static roles or generation of dynamic credentials, as well as root credential rotation on a stand-alone Redis server.
 - **AWS Elasticache Database Secrets Engine** is introduced to manage static credentials for AWS Elasticache instances. 
 
-~> **Vault Enterprise:** Use [Integrated Storage](/vault/docs/configuration/storage/raft) or [Consul](/vault/docs/configuration/storage/consul) as your Vault's storage backend. Vault Enterprise will no longer start up if configured to use a storage backend other than Integrated Storage or Consul. (See the [Upgrade Guide](/vault/docs/upgrading/upgrade-to-1.12.x).)
+~> **Vault Enterprise:** Use [Integrated Storage](/docs/configuration/storage/raft) or [Consul](/docs/configuration/storage/consul) as your Vault's storage backend. Vault Enterprise will no longer start up if configured to use a storage backend other than Integrated Storage or Consul. (See the [Upgrade Guide](/docs/upgrading/upgrade-to-1.12.x).)
 
 ## New Features
 
@@ -44,13 +44,13 @@ We  are extending that support to the Vault Transform Secrets Engine in this rel
 
 #### MSSQL Support
 
-An MSSQL store is now available to be used as an external storage engine with tokenization Transform Secrets Engine. Refer to the following documents, [Transform Secrets Engine(API)](/vault/api-docs/secret/transform), [Transform Secrets Engine](/vault/docs/secrets/transform), and [Tokenization Transform](/vault/docs/secrets/transform/tokenization) for more information.
+An MSSQL store is now available to be used as an external storage engine with tokenization Transform Secrets Engine. Refer to the following documents, [Transform Secrets Engine(API)](/api-docs/secret/transform), [Transform Secrets Engine](/docs/secrets/transform), and [Tokenization Transform](/docs/secrets/transform/tokenization) for more information.
 
 #### Key Auto Rotation
 
 Periodic rotation of encryption keys is a recommended key management practice for a good security posture. In Vault release 1.10, we added support for Auto key rotation for Transit Secrets Engine. In Vault 1.12, the Transform secrets engine is now  enhanced, allowing users to set the rotation policy during key creation in a time interval, which will cause Vault to rotate the Transform keys when the time interval elapses automatically.
 
-Refer to the following documentation [Tokenization Transform](/vault/docs/secrets/transform/tokenization) and [Transform Secrets Engine(API)](/vault/api-docs/secret/transform#rotate-tokenization-key) for more information.
+Refer to the following documentation [Tokenization Transform](/docs/secrets/transform/tokenization) and [Transform Secrets Engine(API)](/api-docs/secret/transform#rotate-tokenization-key) for more information.
 
 ### PKI Secrets Engine Improvements
 
@@ -60,7 +60,7 @@ We are improving Vault PKI Engine’s revocation capabilities by adding support
 
 #### PKI and Managed Key support for RSA-PSS Signatures
 
-Since its initial release, Vault's PKI secrets engine only supported RSA-PKCS#1v1.5 (Public Key Cryptographic Standards) signatures for issuers and leaves. To conform with NIST's guidance around key transport and for compatibility with newer HSM Firmware, we have included support for RSA-PSS signatures (Probabilistic Signature Scheme). See the section on [PSS Support in the PKI documentation](/vault/docs/secrets/pki/considerations#pss-support) for limitations of this feature.
+Since its initial release, Vault's PKI secrets engine only supported RSA-PKCS#1v1.5 (Public Key Cryptographic Standards) signatures for issuers and leaves. To conform with NIST's guidance around key transport and for compatibility with newer HSM Firmware, we have included support for RSA-PSS signatures (Probabilistic Signature Scheme). See the section on [PSS Support in the PKI documentation](https://www.vaultproject.io/docs/secrets/pki/considerations#pss-support) for limitations of this feature.
 
 #### PKI Telemetry Improvements
 
@@ -86,18 +86,18 @@ This was a community contributed enhancement.
 
 ### Path and Role-Based Resource Quotas
 
-In this release, the existing resource quota functionality has been enhanced. In addition to applying the API rate limiting and lease quotas at the namespace or mount level, you can now use  the quotas to the [API path suffixes and auth mount roles](/vault/docs/enterprise/lease-count-quotas). This enhancement provides users with more control over issued certificates.
+In this release, the existing resource quota functionality has been enhanced. In addition to applying the API rate limiting and lease quotas at the namespace or mount level, you can now use  the quotas to the [API path suffixes and auth mount roles](/docs/enterprise/lease-count-quotas). This enhancement provides users with more control over issued certificates.
 
 ### Client Count Improvements
 
-The billing period for client counting API can now be specified with the [current month](/vault/docs/concepts/client-count) for the end date parameter. When this is done the "new_clients" field will have an hyperlog approximate value indicating the number of new clients that came in the current month. Note that for the previous months, the number will be an exact value.
+The billing period for client counting API can now be specified with the [current month](/docs/concepts/client-count) for the end date parameter. When this is done the "new_clients" field will have an hyperlog approximate value indicating the number of new clients that came in the current month. Note that for the previous months, the number will be an exact value.
 
 ### Redis Database Secrets Engine
 
-With the support of the Redis database secrets engine, users can use Vault to manage static and dynamic credentials for Redis OSS. The engine  works similarly to other database secrets engines. Refer to the [Redis](/vault/docs/secrets/databases/redis) documentation for more information. Huge thanks to [Francis Hitchens](https://github.com/fhitchen), who contributed their repository to HashiCorp
+With the support of the Redis database secrets engine, users can use Vault to manage static and dynamic credentials for Redis OSS. The engine  works similarly to other database secrets engines. Refer to the [Redis](/docs/secrets/redis) documentation for more information. Huge thanks to [Francis Hitchens](https://github.com/fhitchen), who contributed their repository to HashiCorp
 
 ### AWS Elasticache Database Secrets Engine
-With the support of the AWS ElastiCache database secrets engine, users may use Vault to manage static credentials for AWS Elasticache instances. The engine will work similarly to other database secrets engines. Refer to the [elasticache](/vault/docs/secrets/databases/rediselasticache) documentation for more information.
+With the support of the AWS ElastiCache database secrets engine, users may use Vault to manage static credentials for AWS Elasticache instances. The engine will work similarly to other database secrets engines. Refer to the [elasticache](/docs/secrets/databases/rediselasticache) documentation for more information.
 
 ### LDAP Secrets Engine
 
@@ -137,10 +137,10 @@ Vault can now act as an OIDC provider for applications that wish to delegate aut
 
 ### License Termination Behavior
 
-The Licensing termination behavior has changed where non-evaluation licenses (production licenses) no longer have a termination date, making Vault more robust for Vault Enterprise customers. Also refer to the updated [licensing FAQ](/vault/docs/enterprise/license/faq) for more information.
+The Licensing termination behavior has changed where non-evaluation licenses (production licenses) no longer have a termination date, making Vault more robust for Vault Enterprise customers. Also refer to the updated [licensing FAQ](/docs/enterprise/license/faq) for more information.
 
 ### Namespace Custom Metadata
-Customers can now specify [custom metadata](/vault/api-docs/system/namespaces) on the namespaces. The new `vault namespace patch` [command](/vault/docs/commands/namespace) can be used to update existing namespaces with custom metadata as well. This will make it possible to tag namespaces with additional fields (For example: owner, region department) describing it.
+Customers can now specify [custom metadata](/api-docs/system/namespaces) on the namespaces. The new `vault namespace patch` [command](/docs/commands/namespace) can be used to update existing namespaces with custom metadata as well. This will make it possible to tag namespaces with additional fields (For example: owner, region department) describing it.
 
 ### Vault Agent Improvements
 
@@ -158,4 +158,4 @@ There are no known issues documented for this release.
 
 ## Feature Deprecations and EOL
 
-Please refer to the [Deprecation Plans and Notice](/vault/docs/deprecation) page for up-to-date information on feature deprecations and plans. A [Feature Deprecation FAQ](/vault/docs/deprecation/faq) page addresses questions about  decisions made about Vault feature deprecations.
+Please refer to the [Deprecation Plans and Notice](/docs/deprecation) page for up-to-date information on feature deprecations and plans. A [Feature Deprecation FAQ](/docs/deprecation/faq) page addresses questions about  decisions made about Vault feature deprecations.
diff --git a/website/content/docs/release-notes/1.13.0.mdx b/website/content/docs/release-notes/1.13.0.mdx
deleted file mode 100644
index 8c8736b6f9998..0000000000000
--- a/website/content/docs/release-notes/1.13.0.mdx
+++ /dev/null
@@ -1,125 +0,0 @@
----
-layout: docs
-page_title: 1.13.0
-description: |-
-  This page contains release notes for Vault 1.13.0
----
-
-# Vault 1.13.0 Release Notes
-
-**Software Release date:** March 1, 2023
-
-**Summary:** Vault Release 1.13.0 offers features and enhancements that improve
-the user experience while solving critical  issues previously encountered by our
-customers. We are providing an overview  of improvements in this set of  release
-notes.
-
-We encourage you to [upgrade](/vault/docs/upgrading) to the latest release of
-Vault to take advantage of the new benefits provided. With this latest release,
-we offer solutions to critical feature gaps that were identified previously.
-Please refer to the
-[Changelog](https://github.com/hashicorp/vault/blob/main/CHANGELOG.md#1130-rc1)
-within the Vault release for further information on product improvements,
-including a comprehensive list of bug fixes. 
-
-Some of these enhancements and changes in this release include the following:
-
-- **PKI improvements:**
-   - **Cross Cluster PKI Certificate Revocation:** Introducing a new unified
-     OCSP responder and CRL builder that enables a certificate revocations and
-     CRL view across clusters for a given PKI mount.
-   - **PKI UI Beta:** New UI introducing cross-signing flow, overview page,
-     roles and keys view.
-   - **Health Checks:** Provide a health overview of PKI mounts for proactive
-     actions and troubleshooting.
-   - **Command Line:** Simplified CLI to discover, rotate issuers and related
-     commands for PKI mounts
-
-- **Azure Auth Improvements:**
-   - **Rotate-root support:** Add the ability to rotate the root account's
-     client secret defined in the auth method's configuration via the new
-     `rotate-root` endpoint.
-   - **Managed Identities authentication:** The auth method now allows any Azure
-     resource that supports managed identities to authenticate with Vault.
-   - **VMSS Flex authentication:** Add support for Virtual Machine Scale Set
-     (VMSS) Flex authentication.
-
-- **GCP Secrets Impersonated Account Support:** Add support for GCP service
-  account impersonation, allowing callers to generate a GCP access token without
-  requiring Vault to store or retrieve a GCP service account key for each role.
-- **Managed Keys in Transit Engine:** Support for offloading Transit Key
-  operations to HSMs/external KMS.
-- **KMIP Secret Engine Enhancements:** Implemented Asymmetric Key Lifecycle
-  Server and Advanced Cryptographic Server profiles. Added support for RSA keys
-  and operations such as:  MAC, MAC Verify, Sign, Sign Verify, RNG Seed and RNG
-  Retrieve.
-- **Vault as a SSM:** Support is planned for an upcoming Vault PKCS#11 Provider
-  version to include mechanisms for encryption, decryption, signing and
-  signature verification for AES and RSA keys.
-- **Replication (enterprise):** We fixed a bug that could cause a cluster to
-  wind up in a permanent merkle-diff/merkle-sync loop and never enter
-  stream-wals, particularly in cases of high write loads on the primary cluster.
-- **Share Secrets in Independent Namespaces (enterprise):** You can now add
-  users from namespaces outside a namespace hierarchy to a group in a given
-  namespace hierarchy. For Vault Agent, you can now grant it access to secrets
-  outside the namespace where it authenticated, and reduce the number of Agents
-  you need to run. 
-- **User Lockout:** Vault now supports configuration to lock out users when they
-  have consecutive failed login attempts.
-- **Event System (Alpha):** Vault has a new experimental event system. Events
-  are currently only generated on writes to the KV secrets engine, but external
-  plugins can also be updated to start generating events.
-- **Kubernetes authentication plugin bug fix:** Ensures a consistent TLS
-  configuration for all k8s API requests. This fixes a bug where it was possible
-  for the http.Client's Transport to be missing the necessary root CAs to ensure
-  that all TLS connections between the auth engine and the Kubernetes API were
-  validated against the configured set of CA certificates.
-- **Kubernetes Secretes Engine on Vault UI:** Introducing Kubernetes secret
-  engine support on the UI
-- **Client Count UI improvements:** Combining current month and previous history
-  into one dashboard 
-- **OCSP Support in the TLS Certificate Auth Method:** The auth method now can
-  check for revoked certificates using the OCSP protocol.
-- **UI Wizard removal:** The UI Wizard has been removed from the UI since the
-  information was occasionally out-of-date and did not align with the latest
-  changes. A new and enhanced UI experience is planned in a future release. 
-
-- **Vault Agent improvements:**
-   - Auto-auth introduced `token_file` method which reads an existing token from
-     a file. The token file method is designed for development and testing. It
-     is not suitable for production deployment.
-   - Listeners for the Vault Agent can define a role set to `metrics_only` so
-     that a service can be configured to listen on a particular port to collect
-     metrics.
-   - Vault Agent can read configurations from multiple files.
-   - Users can specify the log file path using the `-log-file` command flag or
-     `VAULT_LOG_FILE` environment variable. This is particularly useful when
-     Vault Agent is running as a Windows service.
-
-- **OpenAPI-based Go & .NET Client Libraries (Public Beta):** Use the new Go &
-  .NET client libraries to interact with the Vault API from your applications.
-   - [OpenAPI-based Go client library](https://github.com/hashicorp/vault-client-go/)
-   - [OpenAPI-based .NET client library](https://github.com/hashicorp/vault-client-dotnet/)
-
-## Known issues
-
-When Vault is configured without a TLS certificate on the TCP listener, the Vault UI may throw an error that blocks you from performing operational tasks. 
-
-The error message: `Q.randomUUID is not a function`
-
-<Note>
-
-Refer to this [Knowledge Base article](https://support.hashicorp.com/hc/en-us/articles/14512496697875) for more details and a workaround.
-
-</Note>
-
-The fix for this UI issue is coming in the Vault 1.13.1 release.
-
-@include 'perf-standby-token-create-forwarding-failure.mdx'
-
-## Feature Deprecations and EOL
-
-Please refer to the [Deprecation Plans and Notice](/vault/docs/deprecation) page
-for up-to-date information on feature deprecations and plans. A [Feature
-Deprecation FAQ](/vault/docs/deprecation/faq) page addresses questions about
-decisions made about Vault feature deprecations.
diff --git a/website/content/docs/release-notes/1.14.0.mdx b/website/content/docs/release-notes/1.14.0.mdx
deleted file mode 100644
index 0f132adca4c59..0000000000000
--- a/website/content/docs/release-notes/1.14.0.mdx
+++ /dev/null
@@ -1,29 +0,0 @@
----
-layout: docs
-page_title: 1.14.0
-description: |-
-  This page contains release notes for Vault 1.14.0
----
-
-# Vault 1.14.0 Release Notes
-
-**Software Release date:** TBD
-
-**Summary:** Vault Release 1.14.0 offers features and enhancements that improve
-the user experience while solving critical  issues previously encountered by our
-customers. We are providing an overview  of improvements in this set of  release
-notes.
-
-~> Note: these are **draft** notes for a future version of Vault. They should not be considered
-official guidance until the release has been completed.
-
-## Known issues
-
-@include 'ui-pki-control-groups-known-issue.mdx'
-
-## Feature Deprecations and EOL
-
-Please refer to the [Deprecation Plans and Notice](/vault/docs/deprecation) page
-for up-to-date information on feature deprecations and plans. A [Feature
-Deprecation FAQ](/vault/docs/deprecation/faq) page addresses questions about
-decisions made about Vault feature deprecations.
diff --git a/website/content/docs/release-notes/1.8.0.mdx b/website/content/docs/release-notes/1.8.0.mdx
index 642419acaf55d..99470f0ac4165 100644
--- a/website/content/docs/release-notes/1.8.0.mdx
+++ b/website/content/docs/release-notes/1.8.0.mdx
@@ -55,7 +55,7 @@ description: |-
 The following API endpoints have been deprecated and will be removed in a future release:
 
 - `POST sys/license` to store licenses in storage; it is recommended to use
-  [License Autoloading](/vault/docs/enterprise/license/autoloading) instead.
+  [License Autoloading](/docs/enterprise/license/autoloading) instead.
 
 - `/gcp/token/:roleset` and `/gcp/key/:roleset` paths for generating secrets for rolesets
 
diff --git a/website/content/docs/release-notes/1.9.0.mdx b/website/content/docs/release-notes/1.9.0.mdx
index d19e54d8e139d..4a0f1a6f6053e 100644
--- a/website/content/docs/release-notes/1.9.0.mdx
+++ b/website/content/docs/release-notes/1.9.0.mdx
@@ -35,7 +35,7 @@ The following section provides details about the ADP module features added in th
 
 #### Advanced I/O handling for Tranform FPE (ADP-Transform)
 
-Users of the Format Preserving Encryption (FPE) feature of ADP Transform will now benefit from increased flexibility with regards to formatting the input and output of their data. [Transformation templates](/vault/tutorials/adp/transform#advanced-handling) are receiving two new fields- **encode_format** and **decode_formats** -that allow users to specify and format individual [capturing groups](https://www.regular-expressions.info/refcapture.html) within the regular expressions that define their formats.
+Users of the Format Preserving Encryption (FPE) feature of ADP Transform will now benefit from increased flexibility with regards to formatting the input and output of their data. [Transformation templates](https://learn.hashicorp.com/tutorials/vault/transform#advanced-handling) are receiving two new fields- **encode_format** and **decode_formats** -that allow users to specify and format individual [capturing groups](https://www.regular-expressions.info/refcapture.html) within the regular expressions that define their formats.
 
 #### MS SQL TDE (ADP-KM)
 
@@ -43,7 +43,7 @@ We added support to Vault Enterprise for customers who want Vault to manage encr
 
 #### Key Management Secrets(KMS) engine - GCP (ADP-KM)
 
-The [KMS Engine for GCP](/vault/docs/secrets/gcpkms) provides key management via the Google Cloud KMS to assist with automating many GCP key management functions.
+The [KMS Engine for GCP](https://www.vaultproject.io/docs/secrets/gcpkms) provides key management via the Google Cloud KMS to assist with automating many GCP key management functions.
 
 ## Other Features and Enhancements
 
@@ -51,7 +51,7 @@ This section describes other features and enhancements introduced as part of the
 
 ### Vault Agent improvements
 
-Improvements were made to the Vault Agent Cache to ensure that [consul-template is always routed through the Vault Agent cache](/vault/docs/agent/template), therefore, eliminating the need for listeners to be defined in the Vault Agent for just templating.
+Improvements were made to the Vault Agent Cache to ensure that [consul-template is always routed through the Vault Agent cache](/docs/agent/template), therefore, eliminating the need for listeners to be defined in the Vault Agent for just templating.
 
 ### Customized username generation for database dynamic credentials
 
@@ -59,7 +59,7 @@ This feature enables customization of username for database dynamic credentials.
 
 ### Customizable HTTP headers for Vault
 
-This feature allows security operators to configure [custom response headers](/vault/docs/configuration/listener/tcp) to HTTP root path (`/`) and API endpoints (`/v1/*`), in addition to the previously supported UI paths through the server HCL configuration file.
+This feature allows security operators to configure [custom response headers](/docs/configuration/listener/tcp) to HTTP root path (`/`) and API endpoints (`/v1/*`), in addition to the previously supported UI paths through the server HCL configuration file.
 
 ### Support for IBM s390X CPU architecture
 
@@ -67,11 +67,11 @@ This feature adds support for Vault to run on the IBM s390x architecture via the
 
 ### Namespace API lock
 
-This [feature](/vault/docs/concepts/namespace-api-lock) allows namespace administrators to flexibly control operations such as locking APIs from child namespaces to which they have access. This enables them to restrict access to their domain in a multi-tenant environment and perform break-glass procedures in times of emergency to protect a cluster from within their child namespace.
+This [feature](/docs/concepts/namespace-api-lock) allows namespace administrators to flexibly control operations such as locking APIs from child namespaces to which they have access. This enables them to restrict access to their domain in a multi-tenant environment and perform break-glass procedures in times of emergency to protect a cluster from within their child namespace.
 
 ### Vault Terraform Provider v3
 
-We have upgraded the [Vault Terraform Provider](https://registry.terraform.io/providers/hashicorp/vault/latest/docs) to the latest version of the [Terraform Plugin SDKv2](/terraform/plugin/sdkv2) to leverage new features.
+We have upgraded the [Vault Terraform Provider](https://registry.terraform.io/providers/hashicorp/vault/latest/docs) to the latest version of the [Terraform Plugin SDKv2](https://www.terraform.io/plugin/sdkv2) to leverage new features.
 
 ### Azure Secrets Engine
 
@@ -82,26 +82,26 @@ The following enhancement are included:
 
 ### Customized metadata for KV
 
-This [enhancement](/vault/api-docs/secret/kv/kv-v2) provides the ability to set version-agnostic custom key metadata for Vault KVv2 secrets via a metadata endpoint. This custom metadata is also visible in the UI.
+This [enhancement](https://www.vaultproject.io/api-docs/secret/kv/kv-v2) provides the ability to set version-agnostic custom key metadata for Vault KVv2 secrets via a metadata endpoint. This custom metadata is also visible in the UI.
 
 ## UI Enhancements
 ### Expanding the UI for more DB secrets engines
 
-We have been adding support for DB secrets engines in the UI over the past few releases. In the Vault 1.9 release, we have added support for [Oracle](/vault/docs/secrets/databases/oracle) and [ElasticSearch](/vault/docs/secrets/databases/elasticdb) and [PostgresSQL](/vault/docs/secrets/databases/postgresql) database secrets engines in the UI.
+We have been adding support for DB secrets engines in the UI over the past few releases. In the Vault 1.9 release, we have added support for [Oracle](/docs/secrets/databases/oracle) and [ElasticSearch](/docs/secrets/databases/elasticdb) and [PostgresSQL](/docs/secrets/databases/postgresql) database secrets engines in the UI.
 
 ### PKI certificate metadata
 
-The [PKI Secrets Engine](/vault/docs/secrets/pki) now displays additional PKI certificate metadata in the UI, such as date issued, date of expiry, serial number, and subject/name.
+The [PKI Secrets Engine](/docs/secrets/pki) now displays additional PKI certificate metadata in the UI, such as date issued, date of expiry, serial number, and subject/name.
 
 ## Tech Preview Features
 
 ### KV Secrets Engine v2 patch operations
 
-This feature provides a more streamlined method for managing [KV v2 secrets](/vault/api-docs/secret/kv/kv-v2), enabling customers to better maintain least privilege security in automated environments. This feature allows performing partial updates to KV v2 secrets without requiring to read the full KV secret's key/value pairs.
+This feature provides a more streamlined method for managing [KV v2 secrets](https://www.vaultproject.io/api-docs/secret/kv/kv-v2), enabling customers to better maintain least privilege security in automated environments. This feature allows performing partial updates to KV v2 secrets without requiring to read the full KV secret's key/value pairs.
 
 ### Vault as an OIDC Provider
 
-Vault can now act as an OIDC Provider so applications can leverage the pre-existing [Vault identities](/vault/api-docs/secret/identity) to authenticate into applications.
+Vault can now act as an OIDC Provider so applications can leverage the pre-existing [Vault identities](/api-docs/secret/identity) to authenticate into applications.
 
 ## Breaking Changes
 
@@ -109,11 +109,11 @@ The following section details breaking changes introduced in Vault 1.9.
 
 ### Removal of HTTP request counters
 
-In Vault 1.9, the [internal HTTP Request count API](/vault/api-docs/system/internal-counters#http-requests) was removed from the product. Calls to the endpoint will result in a **404 error** with a message stating that functionality on this path has been removed.
-Please refer to the [upgrade guide](/vault/docs/upgrading/upgrade-to-1.9.x) for more information.
+In Vault 1.9, the [internal HTTP Request count API](https://www.vaultproject.io/api-docs/system/internal-counters#http-requests) was removed from the product. Calls to the endpoint will result in a **404 error** with a message stating that functionality on this path has been removed.
+Please refer to the [upgrade guide](/docs/upgrading/upgrade-to-1.9.x) for more information.
 
 As called out in the documentation, Vault does not make backwards compatible guarantees on internal APIs (those prefaced with `sys/internal`). They are subject to change and may disappear without notice.
 
 ## Feature Deprecations and EOL
 
-Please refer to the [Deprecation Plans and Notice](/vault/docs/deprecation) page for up-to-date information on feature deprecations and plans. An [FAQ](/vault/docs/deprecation/faq) page is also available to address questions concerning decisions made about Vault feature deprecations.
+Please refer to the [Deprecation Plans and Notice](/docs/deprecation) page for up-to-date information on feature deprecations and plans. An [FAQ](/docs/deprecation/faq) page is also available to address questions concerning decisions made about Vault feature deprecations.
diff --git a/website/content/docs/release-notes/index.mdx b/website/content/docs/release-notes/index.mdx
index 2d35e21e8ce98..d140285d63b0b 100644
--- a/website/content/docs/release-notes/index.mdx
+++ b/website/content/docs/release-notes/index.mdx
@@ -7,11 +7,3 @@ description: Release notes for new Vault versions.
 # Release Notes
 
 Release notes describe major updates in new versions of Vault.
-
-Choose a version from the navigation sidebar to view the release notes for each
-of the major software packages in the Vault product line.
-
-Please refer to the
-[Changelog](https://github.com/hashicorp/vault/blob/main/CHANGELOG.md) for
-further information on product improvements, including a comprehensive list of
-bug fixes.
\ No newline at end of file
diff --git a/website/content/docs/secrets/ad.mdx b/website/content/docs/secrets/ad.mdx
new file mode 100644
index 0000000000000..fe44877440f29
--- /dev/null
+++ b/website/content/docs/secrets/ad.mdx
@@ -0,0 +1,360 @@
+---
+layout: docs
+page_title: Active Directory - Secrets Engines
+description: >-
+  The Active Directory secrets engine allowing Vault to generate dynamic credentials.
+---
+
+# Active Directory Secrets Engine
+
+@include 'x509-sha1-deprecation.mdx'
+
+The Active Directory (AD) secrets engine is a plugin residing [here](https://github.com/hashicorp/vault-plugin-secrets-active-directory).
+It has two main features.
+
+The first feature (password rotation) is where the AD secrets engine rotates AD passwords dynamically.
+This is designed for a high-load environment where many instances may be accessing
+a shared password simultaneously. With a simple set up and a simple creds API,
+it doesn't require instances to be manually registered in advance to gain access.
+As long as access has been granted to the creds path via a method like
+[AppRole](/api-docs/auth/approle), they're available. Passwords are
+lazily rotated based on preset TTLs and can have a length configured to meet your needs. Additionally,
+passwords can be manually rotated using the [rotate-role](/api-docs/secret/ad#rotate-role-credentials) endpoint.
+
+The second feature (service account check-out) is where a library of service accounts can
+be checked out by a person or by machines. Vault will automatically rotate the password
+each time a service account is checked in. Service accounts can be voluntarily checked in, or Vault
+will check them in when their lending period (or, "ttl", in Vault's language) ends.
+
+## Password Rotation
+
+### Customizing Password Generation
+
+There are two ways of customizing how passwords are generated in the Active Directory secret engine:
+
+1. [Password Policies](/docs/concepts/password-policies)
+2. `length` and `formatter` fields within the [configuration](/api-docs/secret/ad#password-parameters)
+
+Utilizing password policies is the recommended path as the `length` and `formatter` fields have
+been deprecated in favor of password policies. The `password_policy` field within the configuration
+cannot be specified alongside either `length` or `formatter` to prevent a confusing configuration.
+
+### A Note on Lazy Rotation
+
+To drive home the point that passwords are rotated "lazily", consider this scenario:
+
+- A password is configured with a TTL of 1 hour.
+- All instances of a service using this password are off for 12 hours.
+- Then they wake up and again request the password.
+
+In this scenario, although the password TTL was set to 1 hour, the password wouldn't be rotated for 12 hours when it
+was next requested. "Lazy" rotation means passwords are rotated when all of the following conditions are true:
+
+- They are over their TTL
+- They are requested
+
+Therefore, the AD TTL can be considered a soft contract. It's fulfilled when the given password is next requested.
+
+To ensure your passwords are rotated as expected, we'd recommend you configure services to request each password at least
+twice as often as its TTL.
+
+### A Note on Escaping
+
+**It is up to the administrator** to provide properly escaped DNs. This
+includes the user DN, bind DN for search, and so on.
+
+The only DN escaping performed by this method is on usernames given at login
+time when they are inserted into the final bind DN, and uses escaping rules
+defined in RFC 4514.
+
+Additionally, Active Directory has escaping rules that differ slightly from the
+RFC; in particular it requires escaping of '#' regardless of position in the DN
+(the RFC only requires it to be escaped when it is the first character), and
+'=', which the RFC indicates can be escaped with a backslash, but does not
+contain in its set of required escapes. If you are using Active Directory and
+these appear in your usernames, please ensure that they are escaped, in
+addition to being properly escaped in your configured DNs.
+
+For reference, see [RFC 4514](https://www.ietf.org/rfc/rfc4514.txt) and this
+[TechNet post on characters to escape in Active
+Directory](http://social.technet.microsoft.com/wiki/contents/articles/5312.active-directory-characters-to-escape.aspx).
+
+### Quick Setup
+
+Most secrets engines must be configured in advance before they can perform their
+functions. These steps are usually completed by an operator or configuration
+management tool.
+
+1.  Enable the Active Directory secrets engine:
+
+    ```text
+    $ vault secrets enable ad
+    Success! Enabled the ad secrets engine at: ad/
+    ```
+
+    By default, the secrets engine will mount at the name of the engine. To
+    enable the secrets engine at a different path, use the `-path` argument.
+
+2.  Configure the credentials that Vault uses to communicate with Active Directory
+    to generate passwords:
+
+    ```text
+    $ vault write ad/config \
+        binddn=$USERNAME \
+        bindpass=$PASSWORD \
+        url=ldaps://138.91.247.105 \
+        userdn='dc=example,dc=com'
+    ```
+
+    The `$USERNAME` and `$PASSWORD` given must have access to modify passwords
+    for the given account. It is possible to delegate access to change
+    passwords for these accounts to the one Vault is in control of, and this is
+    usually the highest-security solution.
+
+    If you'd like to do a quick, insecure evaluation, also set `insecure_tls` to true. However, this is NOT RECOMMENDED
+    in a production environment. In production, we recommend `insecure_tls` is false (its default) and is used with a valid
+    `certificate`.
+
+3.  Configure a role that maps a name in Vault to an account in Active Directory.
+    When applications request passwords, password rotation settings will be managed by
+    this role.
+
+    ```text
+    $ vault write ad/roles/my-application \
+        service_account_name="my-application@example.com"
+    ```
+
+4.  Grant "my-application" access to its creds at `ad/creds/my-application` using an
+    auth method like [AppRole](/api-docs/auth/approle).
+
+### FAQ
+
+#### What if someone directly rotates an Active Directory password that Vault is managing?
+
+If an administrator at your company rotates a password that Vault is managing,
+the next time an application asks _Vault_ for that password, Vault won't know
+it.
+
+To maintain that application's up-time, Vault will need to return to a state of
+knowing the password. Vault will generate a new password, update it, and return
+it to the application(s) asking for it. This all occurs automatically, without
+human intervention.
+
+Thus, we wouldn't recommend that administrators directly rotate the passwords
+for accounts that Vault is managing. This may lead to behavior the
+administrator wouldn't expect, like finding very quickly afterwards that their
+new password has already been changed.
+
+The password `ttl` on a role can be updated at any time to ensure that the
+responsibility of updating passwords can be left to Vault, rather than
+requiring manual administrator updates.
+
+#### Why does Vault return the last password in addition to the current one?
+
+Active Directory promises _eventual consistency_, which means that new
+passwords may not be propagated to all instances immediately. To deal with
+this, Vault returns the current password with the last password if it's known.
+That way, if a new password isn't fully operational, the last password can also
+be used.
+
+## Service Account Check-Out
+
+Vault offers the ability to check service accounts in and out. This is a separate,
+different set of functionality from the password rotation feature above. Let's walk
+through how to use it, with explanation at each step.
+
+First we'll need to enable the AD secrets engine and tell it how to talk to our AD
+server just as we did above.
+
+```shell-session
+$ vault secrets enable ad
+Success! Enabled the ad secrets engine at: ad/
+
+$ vault write ad/config \
+    binddn=$USERNAME \
+    bindpass=$PASSWORD \
+    url=ldaps://138.91.247.105 \
+    userdn='dc=example,dc=com'
+```
+
+Our next step is to designate a set of service accounts for check-out.
+
+```shell-session
+$ vault write ad/library/accounting-team \
+    service_account_names=fizz@example.com,buzz@example.com \
+    ttl=10h \
+    max_ttl=20h \
+    disable_check_in_enforcement=false
+```
+
+In this example, the service account names of `fizz@example.com` and `buzz@example.com` have
+already been created on the remote AD server. They've been set aside solely for Vault to handle.
+The `ttl` is how long each check-out will last before Vault checks in a service account,
+rotating its password during check-in. The `max_ttl` is the maximum amount of time it can live
+if it's renewed. These default to `24h`, and both use [duration format strings](/docs/concepts/duration-format).
+Also by default, a service account must be checked in by the same Vault entity or client token that
+checked it out. However, if this behavior causes problems, set `disable_check_in_enforcement=true`.
+
+When a library of service accounts has been created, view their status at any time to see if they're
+available or checked out.
+
+```shell-session
+$ vault read ad/library/accounting-team/status
+Key                 Value
+---                 -----
+buzz@example.com    map[available:true]
+fizz@example.com    map[available:true]
+```
+
+To check out any service account that's available, simply execute:
+
+```shell-session
+$ vault write -f ad/library/accounting-team/check-out
+Key                     Value
+---                     -----
+lease_id                ad/library/accounting-team/check-out/EpuS8cX7uEsDzOwW9kkKOyGW
+lease_duration          10h
+lease_renewable         true
+password                ?@09AZKh03hBORZPJcTDgLfntlHqxLy29tcQjPVThzuwWAx/Twx4a2ZcRQRqrZ1w
+service_account_name    fizz@example.com
+```
+
+If the default `ttl` for the check-out is higher than needed, set the check-out to last
+for a shorter time by using:
+
+```shell-session
+$ vault write ad/library/accounting-team/check-out ttl=30m
+Key                     Value
+---                     -----
+lease_id                ad/library/accounting-team/check-out/gMonJ2jB6kYs6d3Vw37WFDCY
+lease_duration          30m
+lease_renewable         true
+password                ?@09AZerLLuJfEMbRqP+3yfQYDSq6laP48TCJRBJaJu/kDKLsq9WxL9szVAvL/E1
+service_account_name    buzz@example.com
+```
+
+This can be a nice way to say, "Although I _can_ have a check-out for 24 hours, if I
+haven't checked it in after 30 minutes, I forgot or I'm a dead instance, so you can just
+check it back in."
+
+If no service accounts are available for check-out, Vault will return a 400 Bad Request.
+
+```shell-session
+$ vault write -f ad/library/accounting-team/check-out
+Error writing data to ad/library/accounting-team/check-out: Error making API request.
+
+URL: POST http://localhost:8200/v1/ad/library/accounting-team/check-out
+Code: 400. Errors:
+
+* No service accounts available for check-out.
+```
+
+To extend a check-out, renew its lease.
+
+```shell-session
+$ vault lease renew ad/library/accounting-team/check-out/0C2wmeaDmsToVFc0zDiX9cMq
+Key                Value
+---                -----
+lease_id           ad/library/accounting-team/check-out/0C2wmeaDmsToVFc0zDiX9cMq
+lease_duration     10h
+lease_renewable    true
+```
+
+Renewing a check-out means its current password will live longer, since passwords are rotated
+anytime a password is _checked in_ either by a caller, or by Vault because the check-out `ttl`
+ends.
+
+To check a service account back in for others to use, call:
+
+```shell-session
+$ vault write -f ad/library/accounting-team/check-in
+Key          Value
+---          -----
+check_ins    [fizz@example.com]
+```
+
+Most of the time this will just work, but if multiple service accounts checked out by the same
+caller, Vault will need to know which one(s) to check in.
+
+```shell-session
+$ vault write ad/library/accounting-team/check-in service_account_names=fizz@example.com
+Key          Value
+---          -----
+check_ins    [fizz@example.com]
+```
+
+To perform a check-in, Vault verifies that the caller _should_ be able to check in a given service account.
+To do this, Vault looks for either the same [entity ID](https://learn.hashicorp.com/vault/identity-access-management/iam-identity)
+used to check out the service account, or the same client token.
+
+If a caller is unable to check in a service account, or simply doesn't try,
+Vault will check it back in automatically when the `ttl` expires. However, if that is too long,
+service accounts can be forcibly checked in by a highly privileged user through:
+
+```shell-session
+$ vault write -f ad/library/manage/accounting-team/check-in
+Key          Value
+---          -----
+check_ins    [fizz@example.com]
+```
+
+Or, alternatively, revoking the secret's lease has the same effect.
+
+```shell-session
+$ vault lease revoke ad/library/accounting-team/check-out/PvBVG0m7pEg2940Cb3Jw3KpJ
+All revocation operations queued successfully!
+```
+
+### Troubleshooting
+
+#### Old passwords are still valid for a period of time.
+
+During testing, we found that by default, many versions of Active Directory
+perpetuate old passwords for a short while. After we discovered this behavior,
+we found articles discussing it by searching for "AD password caching" and "OldPasswordAllowedPeriod". We
+also found [an article from Microsoft](https://support.microsoft.com/en-us/help/906305/new-setting-modifies-ntlm-network-authentication-behavior)
+discussing how to configure this behavior. This behavior appears to vary by AD
+version. We recommend you test the behavior of your particular AD server,
+and edit its settings to gain the desired behavior.
+
+#### I get a lot of 400 Bad Request's when trying to check out service accounts.
+
+This will occur when there aren't enough service accounts for those requesting them. Let's
+suppose our "accounting-team" service accounts are the ones being requested. When Vault
+receives a check-out call but none are available, Vault will log at debug level:
+"'accounting-team' had no check-outs available". Vault will also increment a metric
+containing the strings "active directory", "check-out", "unavailable", and "accounting-team".
+
+Once it's known _which_ library needs more service accounts for checkout, fix this issue
+by merely creating a new service account for it to use in Active Directory, then adding it to
+Vault like so:
+
+```shell-session
+$ vault write ad/library/accounting-team \
+    service_account_names=fizz@example.com,buzz@example.com,new@example.com
+```
+
+In this example, fizz and buzz were pre-existing but were still included in the call
+because we'd like them to exist in the resulting set. The new account was appended to
+the end.
+
+#### Sometimes Vault gives me a password but then AD says it's not valid.
+
+Active Directory is eventually consistent, meaning that it can take some time for word
+of a new password to travel across all AD instances in a cluster. In larger clusters, we
+have observed the password taking over 10 seconds to propagate fully. The simplest way to
+handle this is to simply wait and retry using the new password.
+
+#### When trying to read credentials I get 'LDAP Result Code 53 "Unwilling To Perform"'
+
+Active Directory will only support password changes over a secure connection. Ensure that your configuration block is not using an unsecured LDAP connection.
+
+## Tutorial
+
+Refer to the [Active Directory Service Account Check-out](https://learn.hashicorp.com/vault/secrets-management/ad-secrets) tutorial to learn how to enable a team to share a select set of service accounts.
+
+## API
+
+The Active Directory secrets engine has a full HTTP API. Please see the
+[Active Directory secrets engine API](/api-docs/secret/ad) for more
+details.
diff --git a/website/content/docs/secrets/ad/index.mdx b/website/content/docs/secrets/ad/index.mdx
deleted file mode 100644
index 8c94477f49bc5..0000000000000
--- a/website/content/docs/secrets/ad/index.mdx
+++ /dev/null
@@ -1,362 +0,0 @@
----
-layout: docs
-page_title: Active Directory - Secrets Engines
-description: >-
-  The Active Directory secrets engine allowing Vault to generate dynamic credentials.
----
-
-# Active Directory Secrets Engine
-
-@include 'ad-secrets-deprecation.mdx'
-
-@include 'x509-sha1-deprecation.mdx'
-
-The Active Directory (AD) secrets engine is a plugin residing [here](https://github.com/hashicorp/vault-plugin-secrets-active-directory).
-It has two main features.
-
-The first feature (password rotation) is where the AD secrets engine rotates AD passwords dynamically.
-This is designed for a high-load environment where many instances may be accessing
-a shared password simultaneously. With a simple set up and a simple creds API,
-it doesn't require instances to be manually registered in advance to gain access.
-As long as access has been granted to the creds path via a method like
-[AppRole](/vault/api-docs/auth/approle), they're available. Passwords are
-lazily rotated based on preset TTLs and can have a length configured to meet your needs. Additionally,
-passwords can be manually rotated using the [rotate-role](/vault/api-docs/secret/ad#rotate-role-credentials) endpoint.
-
-The second feature (service account check-out) is where a library of service accounts can
-be checked out by a person or by machines. Vault will automatically rotate the password
-each time a service account is checked in. Service accounts can be voluntarily checked in, or Vault
-will check them in when their lending period (or, "ttl", in Vault's language) ends.
-
-## Password Rotation
-
-### Customizing Password Generation
-
-There are two ways of customizing how passwords are generated in the Active Directory secret engine:
-
-1. [Password Policies](/vault/docs/concepts/password-policies)
-2. `length` and `formatter` fields within the [configuration](/vault/api-docs/secret/ad#password-parameters)
-
-Utilizing password policies is the recommended path as the `length` and `formatter` fields have
-been deprecated in favor of password policies. The `password_policy` field within the configuration
-cannot be specified alongside either `length` or `formatter` to prevent a confusing configuration.
-
-### A Note on Lazy Rotation
-
-To drive home the point that passwords are rotated "lazily", consider this scenario:
-
-- A password is configured with a TTL of 1 hour.
-- All instances of a service using this password are off for 12 hours.
-- Then they wake up and again request the password.
-
-In this scenario, although the password TTL was set to 1 hour, the password wouldn't be rotated for 12 hours when it
-was next requested. "Lazy" rotation means passwords are rotated when all of the following conditions are true:
-
-- They are over their TTL
-- They are requested
-
-Therefore, the AD TTL can be considered a soft contract. It's fulfilled when the given password is next requested.
-
-To ensure your passwords are rotated as expected, we'd recommend you configure services to request each password at least
-twice as often as its TTL.
-
-### A Note on Escaping
-
-**It is up to the administrator** to provide properly escaped DNs. This
-includes the user DN, bind DN for search, and so on.
-
-The only DN escaping performed by this method is on usernames given at login
-time when they are inserted into the final bind DN, and uses escaping rules
-defined in RFC 4514.
-
-Additionally, Active Directory has escaping rules that differ slightly from the
-RFC; in particular it requires escaping of '#' regardless of position in the DN
-(the RFC only requires it to be escaped when it is the first character), and
-'=', which the RFC indicates can be escaped with a backslash, but does not
-contain in its set of required escapes. If you are using Active Directory and
-these appear in your usernames, please ensure that they are escaped, in
-addition to being properly escaped in your configured DNs.
-
-For reference, see [RFC 4514](https://www.ietf.org/rfc/rfc4514.txt) and this
-[TechNet post on characters to escape in Active
-Directory](http://social.technet.microsoft.com/wiki/contents/articles/5312.active-directory-characters-to-escape.aspx).
-
-### Quick Setup
-
-Most secrets engines must be configured in advance before they can perform their
-functions. These steps are usually completed by an operator or configuration
-management tool.
-
-1.  Enable the Active Directory secrets engine:
-
-    ```text
-    $ vault secrets enable ad
-    Success! Enabled the ad secrets engine at: ad/
-    ```
-
-    By default, the secrets engine will mount at the name of the engine. To
-    enable the secrets engine at a different path, use the `-path` argument.
-
-2.  Configure the credentials that Vault uses to communicate with Active Directory
-    to generate passwords:
-
-    ```text
-    $ vault write ad/config \
-        binddn=$USERNAME \
-        bindpass=$PASSWORD \
-        url=ldaps://138.91.247.105 \
-        userdn='dc=example,dc=com'
-    ```
-
-    The `$USERNAME` and `$PASSWORD` given must have access to modify passwords
-    for the given account. It is possible to delegate access to change
-    passwords for these accounts to the one Vault is in control of, and this is
-    usually the highest-security solution.
-
-    If you'd like to do a quick, insecure evaluation, also set `insecure_tls` to true. However, this is NOT RECOMMENDED
-    in a production environment. In production, we recommend `insecure_tls` is false (its default) and is used with a valid
-    `certificate`.
-
-3.  Configure a role that maps a name in Vault to an account in Active Directory.
-    When applications request passwords, password rotation settings will be managed by
-    this role.
-
-    ```text
-    $ vault write ad/roles/my-application \
-        service_account_name="my-application@example.com"
-    ```
-
-4.  Grant "my-application" access to its creds at `ad/creds/my-application` using an
-    auth method like [AppRole](/vault/api-docs/auth/approle).
-
-### FAQ
-
-#### What if someone directly rotates an Active Directory password that Vault is managing?
-
-If an administrator at your company rotates a password that Vault is managing,
-the next time an application asks _Vault_ for that password, Vault won't know
-it.
-
-To maintain that application's up-time, Vault will need to return to a state of
-knowing the password. Vault will generate a new password, update it, and return
-it to the application(s) asking for it. This all occurs automatically, without
-human intervention.
-
-Thus, we wouldn't recommend that administrators directly rotate the passwords
-for accounts that Vault is managing. This may lead to behavior the
-administrator wouldn't expect, like finding very quickly afterwards that their
-new password has already been changed.
-
-The password `ttl` on a role can be updated at any time to ensure that the
-responsibility of updating passwords can be left to Vault, rather than
-requiring manual administrator updates.
-
-#### Why does Vault return the last password in addition to the current one?
-
-Active Directory promises _eventual consistency_, which means that new
-passwords may not be propagated to all instances immediately. To deal with
-this, Vault returns the current password with the last password if it's known.
-That way, if a new password isn't fully operational, the last password can also
-be used.
-
-## Service Account Check-Out
-
-Vault offers the ability to check service accounts in and out. This is a separate,
-different set of functionality from the password rotation feature above. Let's walk
-through how to use it, with explanation at each step.
-
-First we'll need to enable the AD secrets engine and tell it how to talk to our AD
-server just as we did above.
-
-```shell-session
-$ vault secrets enable ad
-Success! Enabled the ad secrets engine at: ad/
-
-$ vault write ad/config \
-    binddn=$USERNAME \
-    bindpass=$PASSWORD \
-    url=ldaps://138.91.247.105 \
-    userdn='dc=example,dc=com'
-```
-
-Our next step is to designate a set of service accounts for check-out.
-
-```shell-session
-$ vault write ad/library/accounting-team \
-    service_account_names=fizz@example.com,buzz@example.com \
-    ttl=10h \
-    max_ttl=20h \
-    disable_check_in_enforcement=false
-```
-
-In this example, the service account names of `fizz@example.com` and `buzz@example.com` have
-already been created on the remote AD server. They've been set aside solely for Vault to handle.
-The `ttl` is how long each check-out will last before Vault checks in a service account,
-rotating its password during check-in. The `max_ttl` is the maximum amount of time it can live
-if it's renewed. These default to `24h`, and both use [duration format strings](/vault/docs/concepts/duration-format).
-Also by default, a service account must be checked in by the same Vault entity or client token that
-checked it out. However, if this behavior causes problems, set `disable_check_in_enforcement=true`.
-
-When a library of service accounts has been created, view their status at any time to see if they're
-available or checked out.
-
-```shell-session
-$ vault read ad/library/accounting-team/status
-Key                 Value
----                 -----
-buzz@example.com    map[available:true]
-fizz@example.com    map[available:true]
-```
-
-To check out any service account that's available, simply execute:
-
-```shell-session
-$ vault write -f ad/library/accounting-team/check-out
-Key                     Value
----                     -----
-lease_id                ad/library/accounting-team/check-out/EpuS8cX7uEsDzOwW9kkKOyGW
-lease_duration          10h
-lease_renewable         true
-password                ?@09AZKh03hBORZPJcTDgLfntlHqxLy29tcQjPVThzuwWAx/Twx4a2ZcRQRqrZ1w
-service_account_name    fizz@example.com
-```
-
-If the default `ttl` for the check-out is higher than needed, set the check-out to last
-for a shorter time by using:
-
-```shell-session
-$ vault write ad/library/accounting-team/check-out ttl=30m
-Key                     Value
----                     -----
-lease_id                ad/library/accounting-team/check-out/gMonJ2jB6kYs6d3Vw37WFDCY
-lease_duration          30m
-lease_renewable         true
-password                ?@09AZerLLuJfEMbRqP+3yfQYDSq6laP48TCJRBJaJu/kDKLsq9WxL9szVAvL/E1
-service_account_name    buzz@example.com
-```
-
-This can be a nice way to say, "Although I _can_ have a check-out for 24 hours, if I
-haven't checked it in after 30 minutes, I forgot or I'm a dead instance, so you can just
-check it back in."
-
-If no service accounts are available for check-out, Vault will return a 400 Bad Request.
-
-```shell-session
-$ vault write -f ad/library/accounting-team/check-out
-Error writing data to ad/library/accounting-team/check-out: Error making API request.
-
-URL: POST http://localhost:8200/v1/ad/library/accounting-team/check-out
-Code: 400. Errors:
-
-* No service accounts available for check-out.
-```
-
-To extend a check-out, renew its lease.
-
-```shell-session
-$ vault lease renew ad/library/accounting-team/check-out/0C2wmeaDmsToVFc0zDiX9cMq
-Key                Value
----                -----
-lease_id           ad/library/accounting-team/check-out/0C2wmeaDmsToVFc0zDiX9cMq
-lease_duration     10h
-lease_renewable    true
-```
-
-Renewing a check-out means its current password will live longer, since passwords are rotated
-anytime a password is _checked in_ either by a caller, or by Vault because the check-out `ttl`
-ends.
-
-To check a service account back in for others to use, call:
-
-```shell-session
-$ vault write -f ad/library/accounting-team/check-in
-Key          Value
----          -----
-check_ins    [fizz@example.com]
-```
-
-Most of the time this will just work, but if multiple service accounts checked out by the same
-caller, Vault will need to know which one(s) to check in.
-
-```shell-session
-$ vault write ad/library/accounting-team/check-in service_account_names=fizz@example.com
-Key          Value
----          -----
-check_ins    [fizz@example.com]
-```
-
-To perform a check-in, Vault verifies that the caller _should_ be able to check in a given service account.
-To do this, Vault looks for either the same [entity ID](/vault/tutorials/auth-methods/identity)
-used to check out the service account, or the same client token.
-
-If a caller is unable to check in a service account, or simply doesn't try,
-Vault will check it back in automatically when the `ttl` expires. However, if that is too long,
-service accounts can be forcibly checked in by a highly privileged user through:
-
-```shell-session
-$ vault write -f ad/library/manage/accounting-team/check-in
-Key          Value
----          -----
-check_ins    [fizz@example.com]
-```
-
-Or, alternatively, revoking the secret's lease has the same effect.
-
-```shell-session
-$ vault lease revoke ad/library/accounting-team/check-out/PvBVG0m7pEg2940Cb3Jw3KpJ
-All revocation operations queued successfully!
-```
-
-### Troubleshooting
-
-#### Old passwords are still valid for a period of time.
-
-During testing, we found that by default, many versions of Active Directory
-perpetuate old passwords for a short while. After we discovered this behavior,
-we found articles discussing it by searching for "AD password caching" and "OldPasswordAllowedPeriod". We
-also found [an article from Microsoft](https://support.microsoft.com/en-us/help/906305/new-setting-modifies-ntlm-network-authentication-behavior)
-discussing how to configure this behavior. This behavior appears to vary by AD
-version. We recommend you test the behavior of your particular AD server,
-and edit its settings to gain the desired behavior.
-
-#### I get a lot of 400 Bad Request's when trying to check out service accounts.
-
-This will occur when there aren't enough service accounts for those requesting them. Let's
-suppose our "accounting-team" service accounts are the ones being requested. When Vault
-receives a check-out call but none are available, Vault will log at debug level:
-"'accounting-team' had no check-outs available". Vault will also increment a metric
-containing the strings "active directory", "check-out", "unavailable", and "accounting-team".
-
-Once it's known _which_ library needs more service accounts for checkout, fix this issue
-by merely creating a new service account for it to use in Active Directory, then adding it to
-Vault like so:
-
-```shell-session
-$ vault write ad/library/accounting-team \
-    service_account_names=fizz@example.com,buzz@example.com,new@example.com
-```
-
-In this example, fizz and buzz were pre-existing but were still included in the call
-because we'd like them to exist in the resulting set. The new account was appended to
-the end.
-
-#### Sometimes Vault gives me a password but then AD says it's not valid.
-
-Active Directory is eventually consistent, meaning that it can take some time for word
-of a new password to travel across all AD instances in a cluster. In larger clusters, we
-have observed the password taking over 10 seconds to propagate fully. The simplest way to
-handle this is to simply wait and retry using the new password.
-
-#### When trying to read credentials I get 'LDAP Result Code 53 "Unwilling To Perform"'
-
-Active Directory will only support password changes over a secure connection. Ensure that your configuration block is not using an unsecured LDAP connection.
-
-## Tutorial
-
-Refer to the [Active Directory Service Account Check-out](/vault/tutorials/secrets-management/active-directory) tutorial to learn how to enable a team to share a select set of service accounts.
-
-## API
-
-The Active Directory secrets engine has a full HTTP API. Please see the
-[Active Directory secrets engine API](/vault/api-docs/secret/ad) for more
-details.
diff --git a/website/content/docs/secrets/ad/migration-guide.mdx b/website/content/docs/secrets/ad/migration-guide.mdx
deleted file mode 100644
index 5af91330f4b0e..0000000000000
--- a/website/content/docs/secrets/ad/migration-guide.mdx
+++ /dev/null
@@ -1,163 +0,0 @@
----
-layout: docs
-page_title: Migration Guide - Active Directory - Secrets Engines
-description: >-
-  The guide for migrating from the Active Directory secrets engine to the LDAP secrets engine.
----
-
-# Migration Guide - Active Directory Secrets Engine
-
-The Vault [Active Directory secrets engine](/vault/docs/secrets/ad) has been deprecated as
-of the Vault 1.13 release. This document provides guidance for migrating from the Active
-Directory secrets engine to the [LDAP secrets engine](/vault/docs/secrets/ldap) that was
-introduced in Vault 1.12.
-
-## Deprecation Timeline
-
-Beginning from the Vault 1.13 release, we will continue to support the Active Directory (AD)
-secrets engine in maintenance mode for six major Vault releases. Maintenance mode means that
-we will fix bugs and security issues, but no new features will be added. All new feature
-development efforts will go towards the unified LDAP secrets engine. At Vault 1.18, we will
-mark the AD secrets engine as [pending removal](/vault/docs/deprecation/faq#pending-removal).
-At this time, Vault will begin to strongly signal operators that they need to migrate off of
-the AD secrets engine. At Vault 1.19, we will mark the AD secrets engine as
-[removed](/vault/docs/deprecation/faq#removed). At this time, the AD secrets engine will be
-removed from Vault. Vault will not start up with the AD secrets engine mounts enabled.
-
-## Migration Steps
-
-The following sections detail how to migrate the AD secrets engine configuration and
-applications consuming secrets to the new LDAP secrets engine.
-
-### 1. Enable LDAP Secrets Engine
-
-The LDAP secrets engine needs to be enabled in order to have a target for migration of
-existing AD secrets engine mounts. AD secrets engine mounts should be mapped 1-to-1 with
-new LDAP secrets engine mounts.
-
-To enable the LDAP secrets engine:
-
-```shell-session
-$ vault secrets enable ldap
-```
-
-To enable at a custom path:
-
-```shell-session
-$ vault secrets enable -path=<custom_path> ldap
-```
-
-If enabled at a custom path, the `/ldap/` path segment in API paths must be replaced with
-the custom path value.
-
-### 2. Migrate Configuration
-
-The AD secrets engine [configuration](/vault/api-docs/secret/ad#configuration)
-will need to be migrated to an LDAP secrets engine [configuration](/vault/api-docs/secret/ldap#configuration-management).
-The API paths and parameters will need to be considered during the migration.
-
-#### API Path
-
-| AD Secrets Engine | LDAP Secrets Engine |
-| ----------------- |-------------------- |
-| [/ad/config](/vault/api-docs/secret/ad#configuration) | [/ldap/config](/vault/api-docs/secret/ad#configuration)    |
-
-#### Parameters
-
-The parameters from existing AD secrets engine configurations can generally be mapped 1-to-1
-to LDAP secrets engine configuration. The following LDAP secrets engine parameters are the
-exception and must be considered during the migration.
-
-| AD Secrets Engine | LDAP Secrets Engine | Details |
-| ----------------- | ------------------- | ------- |
-| N/A | [schema](/vault/api-docs/secret/ldap#schema) | Must be set to the `ad` option on the LDAP secrets engine configuration. |
-| [userdn](/vault/api-docs/secret/ad#userdn) | [userdn](/vault/api-docs/secret/ad#userdn) | Required to be set if using the [library sets](#4-migrate-library-sets) check-out feature. It can be optionally set if using the [static roles](#3-migrate-roles) feature without providing a distinguished name ([dn](/vault/api-docs/secret/ldap#dn)). |
-| [ttl](/vault/api-docs/secret/ad#ttl) | N/A | Replaced by static role [rotation_period](/vault/api-docs/secret/ldap#rotation_period). |
-| [max_ttl](/vault/api-docs/secret/ad#max_ttl) | N/A | Not supported for [static roles](#3-migrate-roles). Can be set using [max_ttl](/vault/api-docs/secret/ldap#max_ttl-1) for library sets. |
-| [last_rotation_tolerance](/vault/api-docs/secret/ad#last_rotation_tolerance) | N/A | Not supported by the LDAP secrets engine. Passwords will be rotated based on the static role [rotation_period](/vault/api-docs/secret/ldap#rotation_period). |
-
-### 3. Migrate Roles
-
-AD secrets engine [roles](/vault/api-docs/secret/ad#role-management) will need to be migrated
-to LDAP secrets engine [static roles](/vault/api-docs/secret/ldap#static-roles). The API paths,
-parameters, and rotation periods will need to be considered during the migration.
-
-#### API Path
-
-| AD Secrets Engine | LDAP Secrets Engine |
-| ----------------- | ------------------- |
-| [/ad/roles/:role_name](/vault/api-docs/secret/ad#role-management) | [/ldap/static-role/:role_name](/vault/api-docs/secret/ldap#static-roles) |
-
-#### Parameters
-
-The following parameters must be migrated.
-
-| AD Secrets Engine | LDAP Secrets Engine | Details |
-| ----------------- | ------------------- | ------- |
-| [ttl](/vault/api-docs/secret/ad#ttl-1) | [rotation_period](/vault/api-docs/secret/ldap#rotation_period) | N/A |
-| [service_account_name](/vault/api-docs/secret/ad#service_account_name) | [username](/vault/api-docs/secret/ldap#username)    | If `username` is set without setting the [dn](/vault/api-docs/secret/ldap#dn) value, then the configuration [userdn](/vault/api-docs/secret/ldap#userdn) must also be set. |
-
-#### Rotation Periods
-
-Rotations that occur from AD secrets engine [roles](/vault/api-docs/secret/ad#role-management)
-may conflict with rotations performed by LDAP secrets engine [static roles](/vault/api-docs/secret/ldap#static-roles)
-during the migration process. This could cause applications consuming passwords to read a
-password that gets invalidated by a rotation shortly after. To mitigate this, it's recommended
-to set an initial [rotation_period](/vault/api-docs/secret/ldap#rotation_period) that provides
-a large enough window to complete [application migrations](#5-migrate-applications) to minimize
-the chance of this happening. Additionally, tuning the AD secrets engine [last_rotation_tolerance](/vault/api-docs/secret/ad#last_rotation_tolerance)
-parameter could help mitigate applications reading stale passwords, since the parameter allows
-rotation of the password if it's been rotated out-of-band within a given duration.
-
-### 4. Migrate Library Sets
-
-AD secrets engine [library sets](/vault/api-docs/secret/ad#library-management) will need to
-be migrated to LDAP secrets engine [library sets](/vault/api-docs/secret/ldap#library-set-management).
-The API paths and parameters will need to be considered during the migration.
-
-#### API Path
-
-| AD Secrets Engine | LDAP Secrets Engine |
-| ----------------- | ------------------- |
-| [/ad/library/:set_name](/vault/api-docs/secret/ad#library-management) | [/ldap/library/:set_name](/vault/api-docs/secret/ldap#library-set-management) |
-
-#### Parameters
-
-The parameters from existing AD secrets engine library sets can be exactly mapped 1-to-1
-to LDAP secrets engine library sets. There are no exceptions to consider.
-
-### 5. Migrate Applications
-
-The AD secrets engine provides APIs to obtain credentials for AD users and service accounts.
-Applications, or Vault clients, are typically the consumer of these credentials. For applications
-to successfully migrate, they must begin using new API paths and response formats provided
-by the LDAP secrets engine. Additionally, they must obtain a Vault [token](/vault/docs/concepts/tokens)
-with an ACL [policy](/vault/docs/concepts/policies) that authorizes access to the new APIs.
-The following section details credential-providing APIs and how their response formats differ
-between the AD secrets engine and LDAP secrets engine.
-
-#### API Paths
-
-| AD Secrets Engine | LDAP Secrets Engine | Details |
-| ----------------- | ------------------- | ------- |
-| [/ad/creds/:role_name](/vault/api-docs/secret/ad#retrieving-passwords) | [/ldap/static-cred/:role_name](/vault/api-docs/secret/ldap#static-role-passwords) | Response formats differ. Namely, `current_password` is now `password`.  See [AD response](/vault/api-docs/secret/ad#sample-get-response) and [LDAP response](/vault/api-docs/secret/ldap#sample-get-response-1) for the difference. |
-| [/ad/library/:set_name/check-out](/vault/api-docs/secret/ad#check-a-credential-out) | [/ldap/library/:set_name/check-out](/vault/api-docs/secret/ldap#check-out-management) | Response formats do not differ. |
-| [/ad/library/:set_name/check-in](/vault/api-docs/secret/ad#check-a-credential-in) | [/ldap/library/:set_name/check-in](/vault/api-docs/secret/ldap#check-in-management) | Response formats do not differ. |
-
-### 6. Disable AD Secrets Engines
-
-AD secrets engine mounts can be disabled after successful migration of configuration and
-applications to the LDAP secrets engine. Note that disabling the secrets engine will erase
-its configuration from storage. This cannot be reversed.
-
-To disable the AD secrets engine:
-
-```shell-session
-$ vault secrets disable ad
-```
-
-To disable at a custom path:
-
-```shell-session
-$ vault secrets disable <custom_path>
-```
diff --git a/website/content/docs/secrets/alicloud.mdx b/website/content/docs/secrets/alicloud.mdx
index a892725d34689..899e1c7b9241e 100644
--- a/website/content/docs/secrets/alicloud.mdx
+++ b/website/content/docs/secrets/alicloud.mdx
@@ -207,5 +207,5 @@ the proper permission, it can generate credentials.
 ## API
 
 The AliCloud secrets engine has a full HTTP API. Please see the
-[AliCloud secrets engine API](/vault/api-docs/secret/alicloud) for more
+[AliCloud secrets engine API](/api-docs/secret/alicloud) for more
 details.
diff --git a/website/content/docs/secrets/aws.mdx b/website/content/docs/secrets/aws.mdx
index f9615ed3db270..b4e791873b130 100644
--- a/website/content/docs/secrets/aws.mdx
+++ b/website/content/docs/secrets/aws.mdx
@@ -32,18 +32,6 @@ Vault supports three different types of credentials to retrieve from AWS:
    passing in the supplied AWS policy document and return the access key, secret
    key, and session token to the caller.
 
-### Static Roles
-The AWS secrets engine supports the concept of "static roles", which are
-a 1-to-1 mapping of Vault Roles to IAM users. The current password
-for the user is stored and automatically rotated by Vault on a
-configurable period of time. This is in contrast to dynamic secrets, where a
-unique username and password pair are generated with each credential request.
-When credentials are requested for the Role, Vault returns the current
-Access Key ID and Secret Access Key for the configured user, allowing anyone with the proper
-Vault policies to have access to the IAM credentials.
-
-Please see the [API documentation](/vault/api-docs/secret/aws#create-static-role) for details on this feature.
-
 ## Setup
 
 Most secrets engines must be configured in advance before they can perform their
@@ -172,11 +160,11 @@ the proper permission, it can generate credentials.
     ---           -----
     access_key    AKIA3ALIVABCDG5XC8H4
     ```
-
+    
     ~> **Note:** Due to AWS eventual consistency, after calling the
     `aws/config/rotate-root` endpoint, subsequent calls from Vault to
     AWS may fail for a few seconds until AWS becomes consistent again.
-    See the [AWS secrets engine API](/vault/api-docs/secret/aws#rotate-root-iam-credentials)
+    See the [AWS secrets engine API](/api-docs/secret/aws#rotate-root-iam-credentials)
     for further information on `config/rotate-root` functionality.
 
 ## Example IAM Policy for Vault
@@ -367,36 +355,37 @@ authentication or single sign-on (SSO) scenarios. In order to use an
    instance in an IAM instance profile) can retrieve `assumed_role` credentials
    (but cannot retrieve `federation_token` credentials).
 
-The `aws/config/root` credentials must be allowed `sts:AssumeRole` through one of
-two methods:
+The `aws/config/root` credentials must have an IAM policy that allows `sts:AssumeRole`
+against the target role:
 
-1.  The credentials have an IAM policy attached to them against the target role:
-    ```javascript
-    {
-      "Version": "2012-10-17",
-      "Statement": {
-        "Effect": "Allow",
-        "Action": "sts:AssumeRole",
-        "Resource": "arn:aws:iam::ACCOUNT-ID-WITHOUT-HYPHENS:role/RoleNameToAssume"
-      }
-    }
-    ```
+```javascript
+{
+  "Version": "2012-10-17",
+  "Statement": {
+    "Effect": "Allow",
+    "Action": "sts:AssumeRole",
+    "Resource": "arn:aws:iam::ACCOUNT-ID-WITHOUT-HYPHENS:role/RoleNameToAssume"
+  }
+}
+```
+
+You must attach a trust policy to the target IAM role to assume, allowing
+the aws/root/config credentials to assume the role.
 
-1.  A trust policy is attached to the target IAM role for the principal:
-    ```javascript
+```javascript
+{
+  "Version": "2012-10-17",
+  "Statement": [
     {
-      "Version": "2012-10-17",
-      "Statement": [
-        {
-          "Effect": "Allow",
-          "Principal": {
-            "AWS": "arn:aws:iam::ACCOUNT-ID-WITHOUT-HYPHENS:user/VAULT-AWS-ROOT-CONFIG-USER-NAME"
-          },
-          "Action": "sts:AssumeRole"
-        }
-      ]
+      "Effect": "Allow",
+      "Principal": {
+        "AWS": "arn:aws:iam::ACCOUNT-ID-WITHOUT-HYPHENS:user/VAULT-AWS-ROOT-CONFIG-USER-NAME"
+      },
+      "Action": "sts:AssumeRole"
     }
-    ```
+  ]
+}
+```
 
 When specifying a Vault role with a `credential_type` of `assumed_role`, you can
 specify more than one IAM role ARN. If you do so, Vault clients can select which
@@ -490,5 +479,5 @@ errors for exceeding the AWS limit of 32 characters on STS token names.
 ## API
 
 The AWS secrets engine has a full HTTP API. Please see the
-[AWS secrets engine API](/vault/api-docs/secret/aws) for more
+[AWS secrets engine API](/api-docs/secret/aws) for more
 details.
diff --git a/website/content/docs/secrets/azure.mdx b/website/content/docs/secrets/azure.mdx
index c8d2fc0dd892a..b063573cacb9e 100644
--- a/website/content/docs/secrets/azure.mdx
+++ b/website/content/docs/secrets/azure.mdx
@@ -103,20 +103,6 @@ This endpoint generates a renewable set of credentials. The application can logi
 using the `client_id`/`client_secret` and will have access provided by configured service
 principal or the Azure roles set in the "my-role" configuration.
 
-## Root Credential Rotation
-
-If the mount is configured with credentials directly, the credential's key may be
-rotated to a Vault-generated value that is not accessible by the operator.
-This will ensure that only Vault is able to access the "root" user that Vault uses to
-manipulate dynamic & static credentials.
-
-```shell-session
-vault write -f azure/rotate-root
-```
-
-For more details on this operation, please see the
-[Root Credential Rotation](/vault/api-docs/secret/azure#rotate-root) API docs.
-
 ## Roles
 
 Vault roles let you configure either an existing service principal or a set of Azure roles, along with
@@ -298,7 +284,7 @@ Please report issues, add feature requests, and submit contributions to the
 ## Tutorial
 
 Refer to the [Azure Secrets
-Engine](/vault/tutorials/secrets-management/azure-secrets) tutorial
+Engine](https://learn.hashicorp.com/vault/secrets-management/azure-creds) tutorial
 to learn how to use the Azure secrets engine to dynamically generate Azure credentials.
 
 ## API
@@ -306,6 +292,6 @@ to learn how to use the Azure secrets engine to dynamically generate Azure crede
 The Azure secrets engine has a full HTTP API. Please see the [Azure secrets engine API docs][api]
 for more details.
 
-[api]: /vault/api-docs/secret/azure
-[config]: /vault/api-docs/secret/azure#configure-access
+[api]: /api-docs/secret/azure
+[config]: /api-docs/secret/azure#configure-access
 [repo]: https://github.com/hashicorp/vault-plugin-secrets-azure
diff --git a/website/content/docs/secrets/consul.mdx b/website/content/docs/secrets/consul.mdx
index 031c606f1b18b..59ed6cf247cb5 100644
--- a/website/content/docs/secrets/consul.mdx
+++ b/website/content/docs/secrets/consul.mdx
@@ -11,7 +11,7 @@ description: The Consul secrets engine for Vault generates tokens for Consul dyn
 The Consul secrets engine generates [Consul](https://www.consul.io/) API tokens
 dynamically based on Consul ACL policies.
 
--> **Note:** See the Consul Agent [config documentation](/consul/docs/agent/config/config-files#acl-parameters)
+-> **Note:** See the Consul Agent [config documentation](https://developer.hashicorp.com/consul/docs/agent/config/config-files#acl-parameters)
 for details on how to enable Consul's ACL system.
 
 ## Setup
@@ -103,7 +103,7 @@ management tool.
     you will either provide a policy document and a token type, a list of policies or roles, or a set of
     service or node identities. When users generate credentials, they are generated against this role.
 
-    1.  For Consul versions 1.8 and above, attach [a Consul node identity](/consul/commands/acl/token/create#node-identity) to the role.
+    1.  For Consul versions 1.8 and above, attach [a Consul node identity](https://developer.hashicorp.com/consul/commands/acl/token/create#node-identity) to the role.
 
         ```shell-session
         $ vault write consul/roles/my-role \
@@ -112,7 +112,7 @@ management tool.
         Success! Data written to: consul/roles/my-role
         ```
 
-    1.  For Consul versions 1.5 and above, attach either [a role in Consul](/consul/api-docs/acl/roles) or [a Consul service identity](/consul/commands/acl/token/create#service-identity) to the role:
+    1.  For Consul versions 1.5 and above, attach either [a role in Consul](https://developer.hashicorp.com/consul/api-docs/acl/roles) or [a Consul service identity](https://developer.hashicorp.com/consul/commands/acl/token/create#service-identity) to the role:
 
         ```shell-session
         $ vault write consul/roles/my-role consul_roles="api-server"
@@ -126,7 +126,7 @@ management tool.
         Success! Data written to: consul/roles/my-role
         ```
 
-    1.  For Consul versions 1.4 and above, generate [a policy in Consul](/consul/tutorials/security/access-control-setup-production),
+    1.  For Consul versions 1.4 and above, generate [a policy in Consul](https://learn.hashicorp.com/tutorials/consul/access-control-setup-production),
         and proceed to link it to the role:
 
         ```shell-session
@@ -135,7 +135,7 @@ management tool.
         ```
 
     1.  For Consul versions below 1.4, the policy must be base64-encoded. The policy language is
-        [documented by Consul](/consul/docs/security/acl/acl-legacy). Support for this method is
+        [documented by Consul](https://developer.hashicorp.com/consul/docs/security/acl/acl-legacy). Support for this method is
         deprecated as of Vault 1.11.
 
         Write a policy and proceed to link it to the role:
@@ -147,11 +147,11 @@ management tool.
 
         -> **Token lease duration:** If you do not specify a value for `ttl` (or `lease` for Consul versions below 1.4) the
         tokens created using Vault's Consul secrets engine are created with a Time To Live (TTL) of 30 days. You can change
-        the lease duration by passing `-ttl=<duration>` to the command above where duration is a [duration format strings](/vault/docs/concepts/duration-format).
+        the lease duration by passing `-ttl=<duration>` to the command above where duration is a [duration format strings](/docs/concepts/duration-format).
 
 1.  You may further limit a role's access by adding the optional parameters `consul_namespace` and
-    `partition`. Please refer to Consul's [namespace documentation](/consul/docs/enterprise/namespaces) and
-    [admin partition documentation](/consul/docs/enterprise/admin-partitions) for further information about
+    `partition`. Please refer to Consul's [namespace documentation](https://developer.hashicorp.com/consul/docs/enterprise/namespaces) and
+    [admin partition documentation](https://developer.hashicorp.com/consul/docs/enterprise/admin-partitions) for further information about
     these features.
 
     1.  For Consul version 1.11 and above, link an admin partition to a role:
@@ -198,13 +198,13 @@ the token is synchronized with Consul, apply the token to the agents using the C
 ## Tutorial
 
 Refer to [Administer Consul Access Control Tokens with
-Vault](/consul/tutorials/vault-secure/vault-consul-secrets) for a
+Vault](https://learn.hashicorp.com/tutorials/consul/vault-consul-secrets) for a
 step-by-step tutorial.
 
 ## API
 
 The Consul secrets engine has a full HTTP API. Please see the
-[Consul secrets engine API](/vault/api-docs/secret/consul) for more
+[Consul secrets engine API](/api-docs/secret/consul) for more
 details.
 
-[consul-mgmt-token]: /consul/api-docs/acl#acl_create
+[consul-mgmt-token]: https://developer.hashicorp.com/consul/api-docs/acl#acl_create
diff --git a/website/content/docs/secrets/cubbyhole.mdx b/website/content/docs/secrets/cubbyhole.mdx
index cf99ab790c4f2..632b539ea04df 100644
--- a/website/content/docs/secrets/cubbyhole.mdx
+++ b/website/content/docs/secrets/cubbyhole.mdx
@@ -53,11 +53,11 @@ engine allows for writing keys with arbitrary values.
 
 ## Tutorial
 
-Refer to the [Cubbyhole Response Wrapping](/vault/tutorials/secrets-management/cubbyhole-response-wrapping)
+Refer to the [Cubbyhole Response Wrapping](https://learn.hashicorp.com/vault/secrets-management/sm-cubbyhole)
 tutorial to learn how to securely distribute the initial token to the trusted entity.
 
 ## API
 
 The Cubbyhole secrets engine has a full HTTP API. Please see the
-[Cubbyhole secrets engine API](/vault/api-docs/secret/cubbyhole) for more
+[Cubbyhole secrets engine API](/api-docs/secret/cubbyhole) for more
 details.
diff --git a/website/content/docs/secrets/databases/cassandra.mdx b/website/content/docs/secrets/databases/cassandra.mdx
index c8d6cc6d3c232..38014ec7e3f19 100644
--- a/website/content/docs/secrets/databases/cassandra.mdx
+++ b/website/content/docs/secrets/databases/cassandra.mdx
@@ -15,7 +15,7 @@ Cassandra is one of the supported plugins for the database secrets engine. This
 plugin generates database credentials dynamically based on configured roles for
 the Cassandra database.
 
-See the [database secrets engine](/vault/docs/secrets/databases) docs for
+See the [database secrets engine](/docs/secrets/databases) docs for
 more information about setting up the database secrets engine.
 
 ## Capabilities
@@ -90,6 +90,6 @@ the proper permission, it can generate credentials.
 
 ## API
 
-The full list of configurable options can be seen in the [Cassandra database plugin API](/vault/api-docs/secret/databases/cassandra) page.
+The full list of configurable options can be seen in the [Cassandra database plugin API](/api-docs/secret/databases/cassandra) page.
 
-For more information on the database secrets engine's HTTP API please see the [Database secret secrets engine API](/vault/api-docs/secret/databases) page.
+For more information on the database secrets engine's HTTP API please see the [Database secret secrets engine API](/api-docs/secret/databases) page.
diff --git a/website/content/docs/secrets/databases/couchbase.mdx b/website/content/docs/secrets/databases/couchbase.mdx
index 7cd879e471259..fd942f0988b5b 100644
--- a/website/content/docs/secrets/databases/couchbase.mdx
+++ b/website/content/docs/secrets/databases/couchbase.mdx
@@ -15,7 +15,7 @@ Couchbase is one of the supported plugins for the database secrets engine. This
 plugin generates database credentials dynamically based on configured roles for
 the Couchbase database.
 
-See the [database secrets engine](/vault/docs/secrets/databases) docs for
+See the [database secrets engine](/docs/secrets/databases) docs for
 more information about setting up the database secrets engine.
 
 ## Capabilities
@@ -41,7 +41,7 @@ more information about setting up the database secrets engine.
     ```bash
     $ vault write database/config/my-couchbase-database \
         plugin_name="couchbase-database-plugin" \
-        hosts="couchbase://127.0.0.1" \
+        hosts="couchbases://127.0.0.1" \
         tls=true \
         base64pem="${BASE64PEM}" \
         username="vaultuser" \
@@ -58,7 +58,7 @@ more information about setting up the database secrets engine.
     ```bash
     $ vault write database/config/my-couchbase-database \
         plugin_name="couchbase-database-plugin" \
-        hosts="couchbase://127.0.0.1" \
+        hosts="couchbases://127.0.0.1" \
         tls=true \
         base64pem="${BASE64PEM}" \
         username="vaultuser" \
@@ -138,6 +138,6 @@ to enable generating credentials.
 
 ## API
 
-The full list of configurable options can be seen in the [Couchbase database plugin API](/vault/api-docs/secret/databases/couchbase) page.
+The full list of configurable options can be seen in the [Couchbase database plugin API](/api-docs/secret/databases/couchbase) page.
 
-For more information on the database secrets engine's HTTP API please see the [Database secret secrets engine API](/vault/api-docs/secret/databases) page.
+For more information on the database secrets engine's HTTP API please see the [Database secret secrets engine API](/api-docs/secret/databases) page.
diff --git a/website/content/docs/secrets/databases/custom.mdx b/website/content/docs/secrets/databases/custom.mdx
index 535a699f751a4..3f49526df6690 100644
--- a/website/content/docs/secrets/databases/custom.mdx
+++ b/website/content/docs/secrets/databases/custom.mdx
@@ -27,12 +27,12 @@ write your own code to generate credentials in any database you wish. It also
 allows databases that require dynamically linked libraries to be used as plugins
 while keeping Vault itself statically linked.
 
-Please read the [Plugins internals](/vault/docs/plugins) docs for more
+Please read the [Plugins internals](/docs/plugins) docs for more
 information about the plugin system before getting started building your
 Database plugin.
 
 Database plugins can be made to implement
-[plugin multiplexing](/vault/docs/plugins/plugin-architecture#plugin-multiplexing)
+[plugin multiplexing](/docs/plugins/plugin-architecture#plugin-multiplexing)
 which allows a single plugin process to be used for multiple database
 connections. To enable multiplexing, the plugin must be compiled with the
 `ServeMultiplex` function call from Vault's `dbplugin` package.
@@ -207,7 +207,7 @@ plugin. We also recommend if you are planning on distributing your plugin to
 build with [gox](https://github.com/mitchellh/gox) for cross platform builds.
 
 To use your plugin with the database secrets engine you need to place the binary in the
-plugin directory as specified in the [plugin internals](/vault/docs/plugins) docs.
+plugin directory as specified in the [plugin internals](/docs/plugins) docs.
 
 You should now be able to register your plugin into the Vault catalog. To do
 this your token will need sudo permissions.
@@ -255,7 +255,7 @@ type PluginVersion struct {
 
 Scaling many external plugins can become resource intensive. To address
 performance problems with scaling external plugins, database plugins can be
-made to implement [plugin multiplexing](/vault/docs/plugins/plugin-architecture#plugin-multiplexing)
+made to implement [plugin multiplexing](/docs/plugins/plugin-architecture#plugin-multiplexing)
 which allows a single plugin process to be used for multiple database
 connections. To enable multiplexing, the plugin must be compiled with the
 `ServeMultiplex` function call from Vault's `dbplugin` package.
@@ -268,7 +268,7 @@ multiplexed database plugin: Change the `Serve` function call to `ServeMultiplex
 This will run the RPC server for the plugin just as before. However, the
 `ServeMultiplex` function takes the factory function directly as its argument.
 This factory function is a function that returns an object that implements the
-[`dbplugin.Database` interface](/vault/docs/secrets/databases/custom#plugin-interface).
+[`dbplugin.Database` interface](/docs/secrets/databases/custom#plugin-interface).
 
 ### When should plugin multiplexing be avoided?
 
@@ -288,7 +288,7 @@ that was not explicitly exposed.
 
 The new interface was introduced for several reasons:
 
-1. [Password policies](/vault/docs/concepts/password-policies) introduced in Vault 1.5 required
+1. [Password policies](/docs/concepts/password-policies) introduced in Vault 1.5 required
    that Vault be responsible for generating passwords. In the prior version, the database
    plugin was responsible for generating passwords. This prevented integration with
    password policies.
diff --git a/website/content/docs/secrets/databases/db2.mdx b/website/content/docs/secrets/databases/db2.mdx
index ff16dc2b0f120..1ada71a792c96 100644
--- a/website/content/docs/secrets/databases/db2.mdx
+++ b/website/content/docs/secrets/databases/db2.mdx
@@ -19,11 +19,11 @@ for Lightweight Directory Access Protocol (LDAP). This enables the Db2 database
 authenticate users and obtain group membership defined in an LDAP directory, removing the
 requirement that users and groups be defined to the operating system.
 
-Vault's [LDAP secrets engine](/vault/docs/secrets/ldap) can be used to manage the lifecycle
+Vault's [LDAP secrets engine](/docs/secrets/ldap) can be used to manage the lifecycle
 of credentials for Db2 environments that have been configured to delegate user authentication
 and group membership to an LDAP server.
 
 ## Tutorial
 
-Refer to the [IBM Db2 Credential Management](/vault/tutorials/secrets-management/ibm-db2-openldap)
+Refer to the [IBM Db2 Credential Management](https://learn.hashicorp.com/tutorials/vault/ibm-db2-openldap)
 tutorial to learn how to use Vault to manage both static and dynamic credentials for access to Db2.
diff --git a/website/content/docs/secrets/databases/elasticdb.mdx b/website/content/docs/secrets/databases/elasticdb.mdx
index 137bbc207484a..861e54f916805 100644
--- a/website/content/docs/secrets/databases/elasticdb.mdx
+++ b/website/content/docs/secrets/databases/elasticdb.mdx
@@ -18,7 +18,7 @@ Elasticsearch is one of the supported plugins for the database secrets engine. T
 plugin generates database credentials dynamically based on configured roles for
 Elasticsearch.
 
-See the [database secrets engine](/vault/docs/secrets/databases) docs for
+See the [database secrets engine](/docs/secrets/databases) docs for
 more information about setting up the database secrets engine.
 
 ## Capabilities
@@ -90,7 +90,7 @@ $ curl \
 
 The contents of `data.json` in this example are:
 
-```json
+```
 {
  "password" : "myPa55word",
  "roles" : [ "vault" ],
@@ -108,7 +108,7 @@ Now, Elasticsearch is configured and ready to be used with Vault.
 
 1. Enable the database secrets engine if it is not already enabled:
 
-   ```shell-session
+   ```text
    $ vault secrets enable database
    Success! Enabled the database secrets engine at: database/
    ```
@@ -118,7 +118,7 @@ Now, Elasticsearch is configured and ready to be used with Vault.
 
 1. Configure Vault with the proper plugin and connection information:
 
-   ```shell-session
+   ```text
    $ vault write database/config/my-elasticsearch-database \
        plugin_name="elasticsearch-database-plugin" \
        allowed_roles="internally-defined-role,externally-defined-role" \
@@ -135,23 +135,25 @@ Now, Elasticsearch is configured and ready to be used with Vault.
    a privilege escalation by editing a role's privileges out-of-band in
    Elasticsearch:
 
-   ```shell-session
+   ```text
    $ vault write database/roles/internally-defined-role \
          db_name=my-elasticsearch-database \
          creation_statements='{"elasticsearch_role_definition": {"indices": [{"names":["*"], "privileges":["read"]}]}}' \
          default_ttl="1h" \
          max_ttl="24h"
+   Success! Data written to: database/roles/internally-defined-role
    ```
 
 1. Alternatively, configure a role that maps a name in Vault to a pre-existing
    role definition in Elasticsearch:
 
-   ```shell-session
+   ```text
    $ vault write database/roles/externally-defined-role \
          db_name=my-elasticsearch-database \
          creation_statements='{"elasticsearch_roles": ["pre-existing-role-in-elasticsearch"]}' \
          default_ttl="1h" \
          max_ttl="24h"
+   Success! Data written to: database/roles/externally-defined-role
    ```
 
 ## Usage
@@ -162,7 +164,7 @@ the proper permission, it can generate credentials.
 1. Generate a new credential by reading from the `/creds` endpoint with the name
    of the role:
 
-   ```shell-session
+   ```text
    $ vault read database/creds/my-role
    Key                Value
    ---                -----
@@ -175,7 +177,7 @@ the proper permission, it can generate credentials.
 
 ## API
 
-The full list of configurable options can be seen in the [Elasticsearch database plugin API](/vault/api-docs/secret/databases/elasticdb) page.
+The full list of configurable options can be seen in the [Elasticsearch database plugin API](/api-docs/secret/databases/elasticdb) page.
 
 For more information on the database secrets engine's HTTP API please see the
-[Database secrets engine API](/vault/api-docs/secret/databases) page.
+[Database secrets engine API](/api-docs/secret/databases) page.
diff --git a/website/content/docs/secrets/databases/hanadb.mdx b/website/content/docs/secrets/databases/hanadb.mdx
index 2361d08e99fd4..c13d86816bc8f 100644
--- a/website/content/docs/secrets/databases/hanadb.mdx
+++ b/website/content/docs/secrets/databases/hanadb.mdx
@@ -13,7 +13,7 @@ HANA is one of the supported plugins for the database secrets engine. This
 plugin generates database credentials dynamically based on configured roles for
 the HANA database.
 
-See the [database secrets engine](/vault/docs/secrets/databases) docs for
+See the [database secrets engine](/docs/secrets/databases) docs for
 more information about setting up the database secrets engine.
 
 ## Capabilities
@@ -79,7 +79,7 @@ the proper permission, it can generate credentials.
 
 ## API
 
-The full list of configurable options can be seen in the [HANA database plugin API](/vault/api-docs/secret/databases/hanadb) page.
+The full list of configurable options can be seen in the [HANA database plugin API](/api-docs/secret/databases/hanadb) page.
 
 For more information on the database secrets engine's HTTP API please see the
-[Database secrets engine API](/vault/api-docs/secret/databases) page.
+[Database secrets engine API](/api-docs/secret/databases) page.
diff --git a/website/content/docs/secrets/databases/index.mdx b/website/content/docs/secrets/databases/index.mdx
index 8a765744d7fe3..5dd4eeac44267 100644
--- a/website/content/docs/secrets/databases/index.mdx
+++ b/website/content/docs/secrets/databases/index.mdx
@@ -15,7 +15,7 @@ configured roles. It works with a number of different databases through a plugin
 interface. There are a number of built-in database types, and an exposed framework
 for running custom database types for extendability. This means that services
 that need to access a database no longer need to hardcode credentials: they can
-request them from Vault, and use Vault's [leasing mechanism](/vault/docs/concepts/lease)
+request them from Vault, and use Vault's [leasing mechanism](/docs/concepts/lease)
 to more easily roll keys. These are referred to as "dynamic roles" or "dynamic
 secrets".
 
@@ -136,41 +136,41 @@ and private key pair to authenticate.
 
 | Database                                                               | Root Credential Rotation | Dynamic Roles | Static Roles | Username Customization | Credential Types          |
 | ---------------------------------------------------------------------- | ------------------------ | ------------- | ------------ | ---------------------- |---------------------------|
-| [Cassandra](/vault/docs/secrets/databases/cassandra)                         | Yes                      | Yes           | Yes (1.6+)   | Yes (1.7+)             | password                     |
-| [Couchbase](/vault/docs/secrets/databases/couchbase)                         | Yes                      | Yes           | Yes          | Yes (1.7+)             | password                     |
-| [Elasticsearch](/vault/docs/secrets/databases/elasticdb)                     | Yes                      | Yes           | Yes (1.6+)   | Yes (1.8+)             | password                     |
-| [HanaDB](/vault/docs/secrets/databases/hanadb)                               | Yes (1.6+)               | Yes           | Yes (1.6+)   | Yes (1.12+)            | password                     |
-| [InfluxDB](/vault/docs/secrets/databases/influxdb)                           | Yes                      | Yes           | Yes (1.6+)   | Yes (1.8+)             | password                     |
-| [MongoDB](/vault/docs/secrets/databases/mongodb)                             | Yes                      | Yes           | Yes          | Yes (1.7+)             | password                     |
-| [MongoDB Atlas](/vault/docs/secrets/databases/mongodbatlas)                  | No                       | Yes           | Yes          | Yes (1.8+)             | password, client_certificate |
-| [MSSQL](/vault/docs/secrets/databases/mssql)                                 | Yes                      | Yes           | Yes          | Yes (1.7+)             | password                     |
-| [MySQL/MariaDB](/vault/docs/secrets/databases/mysql-maria)                   | Yes                      | Yes           | Yes          | Yes (1.7+)             | password                     |
-| [Oracle](/vault/docs/secrets/databases/oracle)                               | Yes                      | Yes           | Yes          | Yes (1.7+)             | password                     |
-| [PostgreSQL](/vault/docs/secrets/databases/postgresql)                       | Yes                      | Yes           | Yes          | Yes (1.7+)             | password                     |
-| [Redis](/vault/docs/secrets/databases/redis)                                 | Yes                      | Yes           | Yes          | No                     | password                     |
-| [Redis ElastiCache](/vault/docs/secrets/databases/rediselasticache)          | No                       | No            | Yes          | No                     | password                     |
-| [Redshift](/vault/docs/secrets/databases/redshift)                           | Yes                      | Yes           | Yes          | Yes (1.8+)             | password                     |
-| [Snowflake](/vault/docs/secrets/databases/snowflake)                         | Yes                      | Yes           | Yes          | Yes (1.8+)             | password, rsa_private_key    |
+| [Cassandra](/docs/secrets/databases/cassandra)                         | Yes                      | Yes           | Yes (1.6+)   | Yes (1.7+)             | password                  |
+| [Couchbase](/docs/secrets/databases/couchbase)                         | Yes                      | Yes           | Yes          | Yes (1.7+)             | password                  |
+| [Elasticsearch](/docs/secrets/databases/elasticdb)                     | Yes                      | Yes           | Yes (1.6+)   | Yes (1.8+)             | password                  |
+| [HanaDB](/docs/secrets/databases/hanadb)                               | Yes (1.6+)               | Yes           | Yes (1.6+)   | Yes (1.12+)            | password                  |
+| [InfluxDB](/docs/secrets/databases/influxdb)                           | Yes                      | Yes           | Yes (1.6+)   | Yes (1.8+)             | password                  |
+| [MongoDB](/docs/secrets/databases/mongodb)                             | Yes                      | Yes           | Yes          | Yes (1.7+)             | password                  |
+| [MongoDB Atlas](/docs/secrets/databases/mongodbatlas)                  | No                       | Yes           | Yes          | Yes (1.8+)             | password                  |
+| [MSSQL](/docs/secrets/databases/mssql)                                 | Yes                      | Yes           | Yes          | Yes (1.7+)             | password                  |
+| [MySQL/MariaDB](/docs/secrets/databases/mysql-maria)                   | Yes                      | Yes           | Yes          | Yes (1.7+)             | password                  |
+| [Oracle](/docs/secrets/databases/oracle)                               | Yes                      | Yes           | Yes          | Yes (1.7+)             | password                  |
+| [PostgreSQL](/docs/secrets/databases/postgresql)                       | Yes                      | Yes           | Yes          | Yes (1.7+)             | password                  |
+| [Redis](/docs/secrets/databases/redis)                                 | Yes                      | Yes           | Yes          | No                     | password                  |
+| [Redis ElastiCache](/docs/secrets/databases/rediselasticache)          | No                       | No            | Yes          | No                     | password                  |
+| [Redshift](/docs/secrets/databases/redshift)                           | Yes                      | Yes           | Yes          | Yes (1.8+)             | password                  |
+| [Snowflake](/docs/secrets/databases/snowflake)                         | Yes                      | Yes           | Yes          | Yes (1.8+)             | password, rsa_private_key |
 
 ## Custom Plugins
 
 This secrets engine allows custom database types to be run through the exposed
-plugin interface. Please see the [custom database plugin](/vault/docs/secrets/databases/custom)
+plugin interface. Please see the [custom database plugin](/docs/secrets/databases/custom)
 for more information.
 
 ## Credential Types
 
 Database systems support a variety of authentication methods and credential types.
 The database secrets engine supports management of credentials alternative to usernames
-and passwords. The [credential_type](/vault/api-docs/secret/databases#credential_type)
-and [credential_config](/vault/api-docs/secret/databases#credential_config) parameters
+and passwords. The [credential_type](/api-docs/secret/databases#credential_type)
+and [credential_config](/api-docs/secret/databases#credential_config) parameters
 of dynamic and static roles configure the credential that Vault will generate and
 make available to database plugins. See the documentation of individual database
 plugins for the credential types they support and usage examples.
 
 ## Password Generation
 
-Passwords are generated via [Password Policies](/vault/docs/concepts/password-policies).
+Passwords are generated via [Password Policies](/docs/concepts/password-policies).
 Databases can optionally set a password policy for use across all roles or at the
 individual role level for that database. For example, each time you call
 `vault write database/config/my-database` you can specify a password policy for all
@@ -206,7 +206,7 @@ rule "charset" {
 As of Vault 1.10, you can now specify the option `disable_escaping` with a value of `true ` in
 some secrets engines to prevent Vault from escaping special characters in the username and password
 fields. This is necessary for some alternate connection string formats, such as ADO with MSSQL or Azure
-SQL. See the [databases secrets engine API docs](/vault/api-docs/secret/databases#common-fields) and reference
+SQL. See the [databases secrets engine API docs](/api-docs/secret/databases#common-fields) and reference
 individual plugin documentation to determine support for this parameter.
 
 For example, when the password contains URL-escaped characters like `#` or `%` they will
@@ -224,11 +224,11 @@ disable_escaping="true"
 ## Tutorial
 Refer to the following step-by-step tutorials for more information:
 
-- [Secrets as a Service: Dynamic Secrets](/vault/tutorials/db-credentials/database-secrets)
-- [Database Root Credential Rotation](/vault/tutorials/db-credentials/database-root-rotation)
-- [Database Static Roles and Credential Rotation](/vault/tutorials/db-credentials/database-creds-rotation)
+- [Secrets as a Service: Dynamic Secrets](https://learn.hashicorp.com/tutorials/vault/database-secrets)
+- [Database Root Credential Rotation](https://learn.hashicorp.com/tutorials/vault/database-root-rotation)
+- [Database Static Roles and Credential Rotation](https://learn.hashicorp.com/tutorials/vault/database-creds-rotation)
 
 ## API
 
 The database secrets engine has a full HTTP API. Please see the [Database secret
-secrets engine API](/vault/api-docs/secret/databases) for more details.
+secrets engine API](/api-docs/secret/databases) for more details.
diff --git a/website/content/docs/secrets/databases/influxdb.mdx b/website/content/docs/secrets/databases/influxdb.mdx
index d97e6692e9a1a..7f1d1eb41dd18 100644
--- a/website/content/docs/secrets/databases/influxdb.mdx
+++ b/website/content/docs/secrets/databases/influxdb.mdx
@@ -15,7 +15,7 @@ InfluxDB is one of the supported plugins for the database secrets engine. This
 plugin generates database credentials dynamically based on configured roles for
 the InfluxDB database.
 
-See the [database secrets engine](/vault/docs/secrets/databases) docs for
+See the [database secrets engine](/docs/secrets/databases) docs for
 more information about setting up the database secrets engine.
 
 ## Capabilities
@@ -82,7 +82,7 @@ the proper permission, it can generate credentials.
 ## API
 
 The full list of configurable options can be seen in the [InfluxDB database
-plugin API](/vault/api-docs/secret/databases/influxdb) page.
+plugin API](/api-docs/secret/databases/influxdb) page.
 
 For more information on the database secrets engine's HTTP API please see the [Database secret
-secrets engine API](/vault/api-docs/secret/databases) page.
+secrets engine API](/api-docs/secret/databases) page.
diff --git a/website/content/docs/secrets/databases/mongodb.mdx b/website/content/docs/secrets/databases/mongodb.mdx
index 1ce48c92c7bee..2e3b22ba0f8aa 100644
--- a/website/content/docs/secrets/databases/mongodb.mdx
+++ b/website/content/docs/secrets/databases/mongodb.mdx
@@ -14,9 +14,9 @@ description: |-
 MongoDB is one of the supported plugins for the database secrets engine. This
 plugin generates database credentials dynamically based on configured roles for
 the MongoDB database and also supports
-[Static Roles](/vault/docs/secrets/databases#static-roles).
+[Static Roles](/docs/secrets/databases#static-roles).
 
-See the [database secrets engine](/vault/docs/secrets/databases) docs for
+See the [database secrets engine](/docs/secrets/databases) docs for
 more information about setting up the database secrets engine.
 
 ## Capabilities
@@ -103,13 +103,13 @@ for more information.
 ## Tutorial
 
 Refer to [Database Secrets Engine with
-MongoDB](/vault/tutorials/db-credentials/database-mongodb) for a
+MongoDB](https://learn.hashicorp.com/tutorials/vault/database-mongodb) for a
 step-by-step tutorial.
 
 ## API
 
 The full list of configurable options can be seen in the [MongoDB database
-plugin API](/vault/api-docs/secret/databases/mongodb) page.
+plugin API](/api-docs/secret/databases/mongodb) page.
 
 For more information on the database secrets engine's HTTP API please see the
-[Database secrets engine API](/vault/api-docs/secret/databases) page.
+[Database secrets engine API](/api-docs/secret/databases) page.
diff --git a/website/content/docs/secrets/databases/mongodbatlas.mdx b/website/content/docs/secrets/databases/mongodbatlas.mdx
index 9a4a5b6e60712..9ea78f5aab0f1 100644
--- a/website/content/docs/secrets/databases/mongodbatlas.mdx
+++ b/website/content/docs/secrets/databases/mongodbatlas.mdx
@@ -14,20 +14,20 @@ plugin generates database credentials dynamically based on configured roles for
 MongoDB Atlas databases. It cannot support rotating the root user's credentials because
 it uses a public and private key pair to authenticate.
 
-See the [database secrets engine](/vault/docs/secrets/databases) docs for
+See the [database secrets engine](/docs/secrets/databases) docs for
 more information about setting up the database secrets engine.
 
 ## Capabilities
 
-| Plugin Name                    | Root Credential Rotation | Dynamic Roles | Static Roles | Username Customization | Credential Types             |
-| ------------------------------ | ------------------------ | ------------- | ------------ | ---------------------- | ---------------------------- |
-| `mongodbatlas-database-plugin` | No                       | Yes           | Yes          | Yes (1.8+)             | password, client_certificate |
+| Plugin Name                    | Root Credential Rotation | Dynamic Roles | Static Roles | Username Customization |
+| ------------------------------ | ------------------------ | ------------- | ------------ | ---------------------- |
+| `mongodbatlas-database-plugin` | No                       | Yes           | Yes          | Yes (1.8+)             |
 
 ## Setup
 
 1.  Enable the database secrets engine if it is not already enabled:
 
-    ```shell-session
+    ```text
     $ vault secrets enable database
     Success! Enabled the database secrets engine at: database/
     ```
@@ -37,103 +37,48 @@ more information about setting up the database secrets engine.
 
 1.  Configure Vault with the proper plugin and connection information:
 
-    ```shell-session
+    ```text
     $ vault write database/config/my-mongodbatlas-database \
         plugin_name=mongodbatlas-database-plugin \
-        allowed_roles="*" \
+        allowed_roles="my-role" \
         public_key="jmskfortvf" \
         private_key="ea6acbc7-8a30-4a3f-812e-6f869c08bcd1" \
         project_id="4f96cad208574fd14aa8dda3a"
     ```
 
-## Usage
-
-After the secrets engine is configured and a user/machine has a Vault token with
-the proper permissions, it can generate credentials.
-
-#### Password Credentials
-
 1.  Configure a role that maps a name in Vault to a MongoDB Atlas command that executes and
     creates the database user credential:
 
-    ```shell-session
-    $ vault write database/roles/my-password-role \
+    ```text
+    $ vault write database/roles/my-role \
         db_name=my-mongodbatlas-database \
         creation_statements='{"database_name": "admin","roles": [{"databaseName":"admin","roleName":"atlasAdmin"}]}' \
         default_ttl="1h" \
         max_ttl="24h"
-    Success! Data written to: database/roles/my-password-role
+    Success! Data written to: database/roles/my-role
     ```
 
+## Usage
+
+After the secrets engine is configured and a user/machine has a Vault token with
+the proper permissions, it can generate credentials.
+
 1.  Generate a new credential by reading from the `/creds` endpoint with the name
     of the role:
 
-    ```shell-session
-    $ vault read database/creds/my-password-role
+        $ vault read database/creds/my-role
         Key                Value
         ---                -----
         lease_id           database/creds/my-role/2f6a614c-4aa2-7b19-24b9-ad944a8d4de6
         lease_duration     1h
         lease_renewable    true
         password           FBYwnnh-fwc0quxtKf11
-        username           v-my-password-role-DKbQEg6uRn
-    ```
-
-#### Client Certificate Credentials
-
-1.  Configure a role that maps a name in Vault to a MongoDB Atlas command that executes and
-    creates the X509 type database user credential:
-
-    ```shell-session
-    $ vault write database/roles/my-dynamic-certificate-role \
-      db_name=my-mongodbatlas-database \
-      creation_statements='{"database_name": "$external", "x509Type": "CUSTOMER", "roles": [{"databaseName":"$external","roleName":"readWrite"}]}' \
-      default_ttl="1h" \
-      max_ttl="24h" \
-      credential_type="client_certificate" \
-      credential_config=ca_cert="$(cat path/to/ca_cert.pem)" \
-      credential_config=ca_private_key="$(cat path/to/private_key.pem)" \
-      credential_config=key_type="rsa" \
-      credential_config=key_bits=2048 \
-      credential_config=signature_bits=256 \
-      credential_config=common_name_template="{{.DisplayName}}_{{.RoleName}}_{{unix_time}}"
-    Success! Data written to: database/roles/my-dynamic-certificate-role
-    ```
-
-1.  Generate a new credential by reading from the `/creds` endpoint with the name
-of the role:
-
-    ```shell-session
-    $ vault read database/creds/my-dynamic-certificate-role
-      Key                 Value
-      ---                 -----
-      request_id          b6556b2d-c379-5a92-465d-6597c506c821
-      lease_id            database/creds/my-dynamic-certificate-role/AZ5tao6NjLJctx7fm1bujKEL
-      lease_duration      1h
-      lease_renewable     true
-      client_certificate  -----BEGIN CERTIFICATE-----
-                          ...
-                          -----END CERTIFICATE-----
-      private_key         -----BEGIN PRIVATE KEY-----
-                          ...
-                          -----END PRIVATE KEY-----
-      private_key_type    rsa
-      username            CN=token_my-dynamic-certificate-role_1677262121
-    ```
-
-## Client Certificate Authentication
-
-MongoDB Atlas supports [X.509 client certificate based authentication](https://www.mongodb.com/docs/manual/tutorial/configure-x509-client-authentication/)
-for enhanced authentication security as an alternative to username and password authentication.
-The MongoDB Atlas database plugin can be used to manage client certificate credentials for
-MongoDB Atlas users by using `client_certificate` [credential_type](/vault/api-docs/secret/databases#credential_type).
-
-See the [usage](/vault/docs/secrets/databases/mongodbatlas#usage) section for examples using dynamic roles.
+        username           v-my-role-DKbQEg6uRn
 
 ## API
 
 The full list of configurable options can be seen in the [MongoDB Atlas Database
-Plugin HTTP API](/vault/api-docs/secret/databases/mongodbatlas) page.
+Plugin HTTP API](/api-docs/secret/databases/mongodbatlas) page.
 
 For more information on the database secrets engine's HTTP API please see the
-[Database Secrets Engine API](/vault/api-docs/secret/databases) page.
+[Database Secrets Engine API](/api-docs/secret/databases) page.
diff --git a/website/content/docs/secrets/databases/mssql.mdx b/website/content/docs/secrets/databases/mssql.mdx
index a24d556096846..4f843e5a40b52 100644
--- a/website/content/docs/secrets/databases/mssql.mdx
+++ b/website/content/docs/secrets/databases/mssql.mdx
@@ -14,7 +14,7 @@ MSSQL is one of the supported plugins for the database secrets engine. This
 plugin generates database credentials dynamically based on configured roles for
 the MSSQL database.
 
-See the [database secrets engine](/vault/docs/secrets/databases) docs for
+See the [database secrets engine](/docs/secrets/databases) docs for
 more information about setting up the database secrets engine.
 
 ## Capabilities
@@ -100,10 +100,6 @@ the proper permission, it can generate credentials.
 
 Here is a complete example using Azure SQL Database. Note that databases in Azure SQL Database are [contained databases](https://docs.microsoft.com/en-us/sql/relational-databases/databases/contained-databases) and that we do not create a login for the user; instead, we associate the password directly with the user itself. Also note that you will need a separate connection and role for each Azure SQL database for which you want to generate dynamic credentials. You can use a single database backend mount for all these databases or use a separate mount for each of them. In this example, we use a custom path for the database backend.
 
-<Note>
-  Azure SQL databases may use different authentication mechanism that are configured on the SQL server. Vault only supports SQL authentication. Azure AD authentication is not supported.
-</Note>
-
 First, we mount a database backend at the azuresql path with `vault secrets enable -path=azuresql database`. Then we configure a connection called "testvault" to connect to a database called "test-vault", using "azuresql" at the beginning of our path:
 
 ```shell-session
@@ -148,7 +144,7 @@ is to add custom revocation statements to roles, for example:
 
 ```shell
 vault write database/roles/my-role revocation_statements="\
-   USE my_database \
+   USE my_database; \
    IF EXISTS \
      (SELECT name \
       FROM sys.database_principals \
@@ -169,7 +165,7 @@ vault write database/roles/my-role revocation_statements="\
 ## API
 
 The full list of configurable options can be seen in the [MSSQL database
-plugin API](/vault/api-docs/secret/databases/mssql) page.
+plugin API](/api-docs/secret/databases/mssql) page.
 
 For more information on the database secrets engine's HTTP API please see the
-[Database secrets engine API](/vault/api-docs/secret/databases) page.
+[Database secrets engine API](/api-docs/secret/databases) page.
diff --git a/website/content/docs/secrets/databases/mysql-maria.mdx b/website/content/docs/secrets/databases/mysql-maria.mdx
index 0b23b91f7c03a..d867d3feb97aa 100644
--- a/website/content/docs/secrets/databases/mysql-maria.mdx
+++ b/website/content/docs/secrets/databases/mysql-maria.mdx
@@ -14,7 +14,7 @@ description: |-
 MySQL is one of the supported plugins for the database secrets engine. This
 plugin generates database credentials dynamically based on configured roles for
 the MySQL database, and also supports [Static
-Roles](/vault/docs/secrets/databases#static-roles).
+Roles](/docs/secrets/databases#static-roles).
 
 This plugin has a few different instances built into vault, each instance is for
 a slightly different MySQL driver. The only difference between these plugins is
@@ -26,7 +26,7 @@ accept different lengths. The available plugins are:
 - mysql-rds-database-plugin
 - mysql-legacy-database-plugin
 
-See the [database secrets engine](/vault/docs/secrets/databases) docs for
+See the [database secrets engine](/docs/secrets/databases) docs for
 more information about setting up the database secrets engine.
 
 ## Capabilities
@@ -143,7 +143,7 @@ $ vault write database/roles/my-role \
 
 The default root rotation setup for MySQL uses the `ALTER USER` syntax present
 in MySQL 5.7 and up. For MySQL 5.6, the [root rotation
-statements](/vault/api-docs/secret/databases#root_rotation_statements)
+statements](/api-docs/secret/databases#root_rotation_statements)
 must be configured to use the old `SET PASSWORD` syntax. For example:
 
 ```shell-session
@@ -157,12 +157,12 @@ $ vault write database/config/my-mysql-database \
 ```
 
 For a guide in root credential rotation, see [Database Root Credential
-Rotation](/vault/tutorials/db-credentials/database-root-rotation).
+Rotation](https://learn.hashicorp.com/vault/secrets-management/db-root-rotation).
 
 ## API
 
 The full list of configurable options can be seen in the [MySQL database plugin
-API](/vault/api-docs/secret/databases/mysql-maria) page.
+API](/api-docs/secret/databases/mysql-maria) page.
 
 For more information on the database secrets engine's HTTP API please see the
-[Database secrets engine API](/vault/api-docs/secret/databases) page.
+[Database secrets engine API](/api-docs/secret/databases) page.
diff --git a/website/content/docs/secrets/databases/oracle.mdx b/website/content/docs/secrets/databases/oracle.mdx
index 66c32b9b7704d..394f6e7a1296e 100644
--- a/website/content/docs/secrets/databases/oracle.mdx
+++ b/website/content/docs/secrets/databases/oracle.mdx
@@ -33,7 +33,7 @@ found at its own git repository here:
 
 | Plugin Name                                                          | Root Credential Rotation | Dynamic Roles | Static Roles | Username Customization |
 | -------------------------------------------------------------------- | ------------------------ | ------------- | ------------ | ---------------------- |
-| Customizable (see: [Custom Plugins](/vault/docs/secrets/databases/custom)) | Yes                      | Yes           | Yes          | Yes (1.7+)             |
+| Customizable (see: [Custom Plugins](/docs/secrets/databases/custom)) | Yes                      | Yes           | Yes          | Yes (1.7+)             |
 
 </Tab>
 <Tab heading="HCP Vault" group="hcp">
@@ -58,11 +58,11 @@ found at its own git repository here:
 
 For linux/amd64, pre-built binaries can be found at [the releases page](https://releases.hashicorp.com/vault-plugin-database-oracle)
 
-Before running the plugin you will need to have the Oracle Instant Client
+Before running the plugin you will need to have the the Oracle Instant Client
 library installed. These can be downloaded from Oracle. The libraries will need to
 be placed in the default library search path or defined in the ld.so.conf configuration files.
 
-If you are running Vault with [mlock enabled](/vault/docs/configuration#disable_mlock),
+If you are running Vault with [mlock enabled](/docs/configuration#disable_mlock),
 you will need to enable ipc_lock capabilities for the plugin binary.
 
 1.  Enable the database secrets engine if it is not already enabled:
@@ -100,7 +100,7 @@ you will need to enable ipc_lock capabilities for the plugin binary.
    pluggable databases rather than the container database in the `connection_url` field.
 
 1. It is highly recommended that you immediately rotate the "root" user's password, see
-   [Rotate Root Credentials](/vault/api-docs/secret/databases#rotate-root-credentials) for more details.
+   [Rotate Root Credentials](/api-docs/secret/databases#rotate-root-credentials) for more details.
    This will ensure that only Vault is able to access the "root" user that Vault uses to
    manipulate dynamic & static credentials.
 
@@ -126,7 +126,7 @@ you will need to enable ipc_lock capabilities for the plugin binary.
        ...
    ```
 
-   See the [Commands](/vault/docs/commands#files) docs for more details.
+   See the [Commands](/docs/commands#files) docs for more details.
 
 ### Connect using SSL
 
@@ -136,7 +136,7 @@ plugin will require extra configuration using the `connection_url` parameter:
 ```shell-session
 vault write database/config/oracle \
   plugin_name=vault-plugin-database-oracle \
-  connection_url='{{username}}/{{password}}@(DESCRIPTION=(ADDRESS=(PROTOCOL=tcps)(HOST=<host>)(PORT=<port>))(CONNECT_DATA=(SERVICE_NAME=<service_name>))(SECURITY=(SSL_SERVER_CERT_DN="<cert_dn>")(MY_WALLET_DIRECTORY=<path_to_wallet>)))' \
+  connection_url='{{ username }}/{{ password }}@(DESCRIPTION=(ADDRESS=(PROTOCOL=tcps)(HOST=<host>)(PORT=<port>))(CONNECT_DATA=(SERVICE_NAME=<service_name>))(SECURITY=(SSL_SERVER_CERT_DN="<cert_dn>")(MY_WALLET_DIRECTORY=<path_to_wallet>)))' \
   allowed_roles="my-role" \
   username="admin" \
   password="password"
@@ -148,7 +148,7 @@ to use for connection and verification could be configured using:
 ```shell-session
 vault write database/config/oracle \
   plugin_name=vault-plugin-database-oracle \
-  connection_url='{{username}}/{{password}}@(DESCRIPTION=(ADDRESS=(PROTOCOL=tcps)(HOST=hashicorp.com)(PORT=1523))(CONNECT_DATA=(SERVICE_NAME=ORCL))(SECURITY=(SSL_SERVER_CERT_DN="CN=hashicorp.com,OU=TestCA,O=HashiCorp=com")(MY_WALLET_DIRECTORY=/etc/oracle/wallets)))' \
+  connection_url='{{ username }}/{{ password }}@(DESCRIPTION=(ADDRESS=(PROTOCOL=tcps)(HOST=hashicorp.com)(PORT=1523))(CONNECT_DATA=(SERVICE_NAME=ORCL))(SECURITY=(SSL_SERVER_CERT_DN="CN=hashicorp.com,OU=TestCA,O=HashiCorp=com")(MY_WALLET_DIRECTORY=/etc/oracle/wallets)))' \
   allowed_roles="my-role" \
   username="admin" \
   password="password"
@@ -219,14 +219,14 @@ Use the alias in the `connection_url` parameter on the database configuration:
 ```
 vault write database/config/oracle-east \
     plugin_name=vault-plugin-database-oracle \
-    connection_url="{{username}}/{{password}}@AWSEAST" \
+    connection_url="{{ username }}/{{ password }}@AWSEAST" \
     allowed_roles="my-role" \
     username="VAULT_SUPER_USER" \
     password="myreallysecurepassword"
 
 vault write database/config/oracle-west \
     plugin_name=vault-plugin-database-oracle \
-    connection_url="{{username}}/{{password}}@AWSWEST" \
+    connection_url="{{ username }}/{{ password }}@AWSWEST" \
     allowed_roles="my-role" \
     username="VAULT_SUPER_USER" \
     password="myreallysecurepassword"
@@ -361,7 +361,7 @@ the proper permission, it can generate credentials.
 ## API
 
 The full list of configurable options can be seen in the [Oracle database plugin
-API](/vault/api-docs/secret/databases/oracle) page.
+API](/api-docs/secret/databases/oracle) page.
 
 For more information on the database secrets engine's HTTP API please see the
-[Database secrets engine API](/vault/api-docs/secret/databases) page.
+[Database secrets engine API](/api-docs/secret/databases) page.
diff --git a/website/content/docs/secrets/databases/postgresql.mdx b/website/content/docs/secrets/databases/postgresql.mdx
index 691f7b8e1b696..48861a2b6977d 100644
--- a/website/content/docs/secrets/databases/postgresql.mdx
+++ b/website/content/docs/secrets/databases/postgresql.mdx
@@ -12,13 +12,13 @@ description: |-
 PostgreSQL is one of the supported plugins for the database secrets engine. This
 plugin generates database credentials dynamically based on configured roles for
 the PostgreSQL database, and also supports [Static
-Roles](/vault/docs/secrets/databases#static-roles).
+Roles](/docs/secrets/databases#static-roles).
 
-See the [database secrets engine](/vault/docs/secrets/databases) docs for
+See the [database secrets engine](/docs/secrets/databases) docs for
 more information about setting up the database secrets engine.
 
 The PostgreSQL secrets engine uses [pgx][pgxlib], the same database library as the
-[PostgreSQL storage backend](/vault/docs/configuration/storage/postgresql). Connection string
+[PostgreSQL storage backend](/docs/configuration/storage/postgresql). Connection string
 options, including SSL options, can be found in the [pgx][pgxlib] and
 [PostgreSQL connection string][pg_conn_docs] documentation.
 
@@ -48,8 +48,7 @@ options, including SSL options, can be found in the [pgx][pgxlib] and
         allowed_roles="my-role" \
         connection_url="postgresql://{{username}}:{{password}}@localhost:5432/database-name" \
         username="vaultuser" \
-        password="vaultpass" \
-        password_authentication="scram-sha-256"
+        password="vaultpass"
     ```
 
 1.  Configure a role that maps a name in Vault to an SQL statement to execute to
@@ -87,10 +86,10 @@ the proper permission, it can generate credentials.
 ## API
 
 The full list of configurable options can be seen in the [PostgreSQL database
-plugin API](/vault/api-docs/secret/databases/postgresql) page.
+plugin API](/api-docs/secret/databases/postgresql) page.
 
 For more information on the database secrets engine's HTTP API please see the
-[Database secrets engine API](/vault/api-docs/secret/databases) page.
+[Database secrets engine API](/api-docs/secret/databases) page.
 
 [pgxlib]: https://pkg.go.dev/github.com/jackc/pgx/stdlib
 [pg_conn_docs]: https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNSTRING
diff --git a/website/content/docs/secrets/databases/redis.mdx b/website/content/docs/secrets/databases/redis.mdx
index 9d861cda15c78..ebf358c5feeb2 100644
--- a/website/content/docs/secrets/databases/redis.mdx
+++ b/website/content/docs/secrets/databases/redis.mdx
@@ -4,7 +4,7 @@ page_title: Redis - Database - Secrets Engines
 description: |-
   Redis is one of the supported plugins for the database secrets engine.
   This plugin generates database credentials dynamically based on configured
-  roles for the Redis database, and also supports [Static Roles](/vault/docs/secrets/databases#static-roles).
+  roles for the Redis database, and also supports [Static Roles](https://developer.hashicorp.com/vault/docs/secrets/databases#static-roles).
 ---
 
 # Redis Database Secrets Engine
@@ -13,7 +13,7 @@ Redis is one of the supported plugins for the database secrets engine. This
 plugin generates database credentials dynamically based on configured roles for
 the Redis database.
 
-See the [database secrets engine](/vault/docs/secrets/databases) docs for
+See the [database secrets engine](/docs/secrets/databases) docs for
 more information about setting up the database secrets engine.
 
 ## Capabilities
@@ -121,6 +121,6 @@ to Vault to enable generating credentials.
 
 ## API
 
-The full list of configurable options can be seen in the [Redis Database Plugin API](/vault/api-docs/secret/databases/redis) page.
+The full list of configurable options can be seen in the [Redis Database Plugin API](/api-docs/secret/databases/redis) page.
 
-For more information on the database secrets engine's HTTP API please see the [Database Secrets Engine API](/vault/api-docs/secret/databases) page.
+For more information on the database secrets engine's HTTP API please see the [Database Secrets Engine API](/api-docs/secret/databases) page.
diff --git a/website/content/docs/secrets/databases/rediselasticache.mdx b/website/content/docs/secrets/databases/rediselasticache.mdx
index e35aa23c00000..01705c8d132e4 100644
--- a/website/content/docs/secrets/databases/rediselasticache.mdx
+++ b/website/content/docs/secrets/databases/rediselasticache.mdx
@@ -11,7 +11,7 @@ description: |-
 Redis ElastiCache is one of the supported plugins for the database secrets engine.
 This plugin generates static credentials for existing managed roles.
 
-See the [database secrets engine](/vault/docs/secrets/databases) docs for
+See the [database secrets engine](/docs/secrets/databases) docs for
 more information about setting up the database secrets engine.
 
 ## Capabilities
@@ -38,38 +38,14 @@ more information about setting up the database secrets engine.
   $ vault write database/config/my-redis-elasticache-cluster \
     plugin_name="redis-elasticache-database-plugin" \
     url="primary-endpoint.my-cluster.xxx.yyy.cache.amazonaws.com:6379" \
-    access_key_id="AKI***" \
-    secret_access_key="ktriNYvULAWLzUmTGb***" \
-    region=us-east-1 \
+    username="AKI***" \
+    password="ktriNYvULAWLzUmTGb***" \
     allowed_roles="*"
   ```
 
-~> **Note**: The `access_key_id`, `secret_access_key` and `region` parameters are optional. If omitted, authentication falls back
-on the AWS credentials provider chain.
-
-~> **Deprecated**: The `username` & `password` parameters are deprecated but supported for backward compatibility. They are replaced
-by the equivalent `access_key_id` and `secret_access_key` parameters respectively.
-
-The Redis ElastiCache secrets engine must use AWS credentials that have sufficient permissions to manage ElastiCache users.
-This IAM policy sample can be used as an example. Note that &lt;region&gt; and &lt;account-id&gt;
-must correspond to your own environment.
-
-  ```json
-  {
-    "Version": "2012-10-17",
-    "Statement": [
-      {
-        "Sid": "",
-        "Effect": "Allow",
-        "Action": [
-          "elasticache:ModifyUser",
-          "elasticache:DescribeUsers"
-        ],
-        "Resource": "arn:aws:elasticache:<region>:<account-id>:user:*"
-      }
-    ]
-  }
-  ```
+~> **Note**: The username and password parameters are optional. If omitted, authentication falls back on the AWS credentials provider chain.
+  Using a [temporary credential](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp.html) stored in the proper environment
+  variable is the preferred configuration method.
 
 ## Usage
 
@@ -106,6 +82,6 @@ After the secrets engine is configured, write static roles to enable generating
 
 ## API
 
-The full list of configurable options can be seen in the [Redis ElastiCache Database Plugin API](/vault/api-docs/secret/databases/rediselasticache) page.
+The full list of configurable options can be seen in the [Redis ElastiCache Database Plugin API](/api-docs/secret/databases/rediselasticache) page.
 
-For more information on the database secrets engine's HTTP API please see the [Database Secrets Engine API](/vault/api-docs/secret/databases) page.
+For more information on the database secrets engine's HTTP API please see the [Database Secrets Engine API](/api-docs/secret/databases) page.
diff --git a/website/content/docs/secrets/databases/redshift.mdx b/website/content/docs/secrets/databases/redshift.mdx
index 3676925b62cf4..c764908e6a524 100644
--- a/website/content/docs/secrets/databases/redshift.mdx
+++ b/website/content/docs/secrets/databases/redshift.mdx
@@ -12,9 +12,9 @@ description: |-
 Redshift is a supported plugin for the database secrets engine. This
 plugin generates database credentials dynamically based on configured roles for
 the AWS Redshift database service, and also supports [Static
-Roles](/vault/docs/secrets/databases#static-roles).
+Roles](/docs/secrets/databases#static-roles).
 
-See the [database secrets engine](/vault/docs/secrets/databases) docs for
+See the [database secrets engine](/docs/secrets/databases) docs for
 more information about setting up the database secrets engine.
 
 ## Capabilities
@@ -81,7 +81,7 @@ the proper permission, it can generate credentials.
 ## API
 
 The full list of configurable options can be seen in the [Redshift database
-plugin API](/vault/api-docs/secret/databases/redshift) page.
+plugin API](/api-docs/secret/databases/redshift) page.
 
 For more information on the database secrets engine's HTTP API please see the
-[Database secrets engine API](/vault/api-docs/secret/databases) page.
+[Database secrets engine API](/api-docs/secret/databases) page.
diff --git a/website/content/docs/secrets/databases/snowflake.mdx b/website/content/docs/secrets/databases/snowflake.mdx
index 93f1bc7c9f8e5..c9e500f584921 100644
--- a/website/content/docs/secrets/databases/snowflake.mdx
+++ b/website/content/docs/secrets/databases/snowflake.mdx
@@ -11,9 +11,9 @@ description: |-
 
 Snowflake is one of the supported plugins for the database secrets engine. This plugin
 generates database credentials dynamically based on configured roles for Snowflake-hosted
-databases and supports [Static Roles](/vault/docs/secrets/databases#static-roles).
+databases and supports [Static Roles](/docs/secrets/databases#static-roles).
 
-See the [database secrets engine](/vault/docs/secrets/databases) docs for
+See the [database secrets engine](/docs/secrets/databases) docs for
 more information about setting up the database secrets engine.
 
 The Snowflake database secrets engine uses
@@ -211,15 +211,15 @@ enable generating credentials.
 Snowflake supports using [key pair authentication](https://docs.snowflake.com/en/user-guide/key-pair-auth.html)
 for enhanced authentication security as an alternative to username and password authentication.
 The Snowflake database plugin can be used to manage key pair credentials for Snowflake users
-by using the `rsa_private_key` [credential_type](/vault/api-docs/secret/databases#credential_type).
+by using the `rsa_private_key` [credential_type](/api-docs/secret/databases#credential_type).
 
-See the [usage](/vault/docs/secrets/databases/snowflake#usage) section for examples using both
+See the [usage](/docs/secrets/databases/snowflake#usage) section for examples using both
 dynamic and static roles.
 
 ## API
 
 The full list of configurable options can be seen in the [Snowflake database
-plugin API](/vault/api-docs/secret/databases/snowflake) page.
+plugin API](/api-docs/secret/databases/snowflake) page.
 
 For more information on the database secrets engine's HTTP API please see the
-[Database secrets engine API](/vault/api-docs/secret/databases) page.
+[Database secrets engine API](/api-docs/secret/databases) page.
diff --git a/website/content/docs/secrets/gcp.mdx b/website/content/docs/secrets/gcp.mdx
index eef36380d71bb..c215a0dd912e7 100644
--- a/website/content/docs/secrets/gcp.mdx
+++ b/website/content/docs/secrets/gcp.mdx
@@ -41,7 +41,7 @@ management tool.
 
 1.  Enable the Google Cloud secrets engine:
 
-    ```shell-session
+    ```text
     $ vault secrets enable gcp
     Success! Enabled the gcp secrets engine at: gcp/
     ```
@@ -52,7 +52,7 @@ management tool.
 1.  Configure the secrets engine with account credentials, or leave blank or unwritten
     to use Application Default Credentials.
 
-    ```shell-session
+    ```text
     $ vault write gcp/config credentials=@my-credentials.json
     Success! Data written to: gcp/config
     ```
@@ -101,13 +101,13 @@ path "/gcp/roleset/+" {
 ```
 
 For more more information on policy syntax, see the 
-[policy documentation](/vault/docs/concepts/policies#policy-syntax).
+[policy documentation](/docs/concepts/policies#policy-syntax).
 
 ### Examples
 
 To configure a roleset that generates OAuth2 access tokens (preferred):
 
-```shell-session
+```text
 $ vault write gcp/roleset/my-token-roleset \
     project="my-project-id" \
     secret_type="access_token"  \
@@ -121,7 +121,7 @@ $ vault write gcp/roleset/my-token-roleset \
 
 To configure a roleset that generates GCP Service Account keys:
 
-```shell-session
+```text
 $ vault write gcp/roleset/my-key-roleset \
     project="my-project" \
     secret_type="service_account_key"  \
@@ -134,7 +134,7 @@ $ vault write gcp/roleset/my-key-roleset \
 
 Alternatively, provide a file for the `bindings` argument like so:
 
-```shell-session
+```text
 $ vault write gcp/roleset/my-roleset
     bindings=@mybindings.hcl
     ...
@@ -168,7 +168,7 @@ account you have created. Service account emails are of the format
 
 To configure a static account that generates OAuth2 access tokens (preferred):
 
-```shell-session
+```text
 $ vault write gcp/static-account/my-token-account \
     service_account_email="account@my-project.iam.gserviceaccount.com" \
     secret_type="access_token"  \
@@ -182,7 +182,7 @@ $ vault write gcp/static-account/my-token-account \
 
 To configure a static account that generates GCP Service Account keys:
 
-```shell-session
+```text
 $ vault write gcp/static-account/my-key-account \
     service_account_email="account@my-project.iam.gserviceaccount.com" \
     secret_type="service_account_key"  \
@@ -195,7 +195,7 @@ $ vault write gcp/static-account/my-key-account \
 
 Alternatively, provide a file for the `bindings` argument like so:
 
-```shell-session
+```text
 $ vault write gcp/static-account/my-account
     bindings=@mybindings.hcl
     ...
@@ -211,45 +211,17 @@ below.
 For more information on creating and managing static accounts, see the
 [GCP secrets engine API docs][api] docs.
 
-## Impersonated Accounts
-
-Impersonated accounts are a way to generate an OAuth2 [access token](/vault/docs/secrets/gcp#access-tokens) that is granted
-the permissions and accesses of another given service account. These access
-tokens do not have the same 10-key limit as service account keys do, yet they
-retain their short-lived nature. By default, their TTL in GCP is 1 hour, but
-this may be configured to be up to 12 hours as explained in Google's 
-[short-lived credentials documentation](https://cloud.google.com/iam/docs/create-short-lived-credentials-delegated#sa-credentials-oauth).
-
-For more information regarding service account impersonation in GCP, consider starting
-with their documentation [available here](https://cloud.google.com/iam/docs/impersonating-service-accounts).
-
-### Examples
-
-To configure a Vault role that impersonates the administrator on the Google
-Cloud project with the cloud platform and compute scopes:
-
-```shell-session
-$ vault write gcp/impersonated-account/my-token-impersonate \
-    service_account_email="projectAdmin@my-project.iam.gserviceaccount.com" \
-    token_scopes="https://www.googleapis.com/auth/cloud-platform,https://www.googleapis.com/auth/compute" \
-    ttl="6h"
-```
-
 ## Usage
 
 After the secrets engine is configured and a user/machine has a Vault token with
-the proper permission, it can generate credentials. Depending on how the Vault role
+the proper permission, it can generate credentials. Depending on how the roleset
 was configured, you can generate OAuth2 tokens or service account keys.
 
 ### Access Tokens
 
-To generate OAuth2 [access tokens](https://cloud.google.com/docs/authentication/token-types#access),
-read from the [`gcp/.../token`](/vault/api-docs/secret/gcp#generate-secret-iam-service-account-creds-oauth2-access-token)
-API. If using a roleset or static account, it must have been created with a
-[`secret_type`](/vault/api-docs/secret/gcp#secret_type) of `access_token`. Impersonated accounts will
-generate OAuth2 tokens by default.
+To generate OAuth2 tokens, read from `gcp/token/...`. The roleset must have been
+created as type `access_token`:
 
-**Roleset:**
 ```shell-session
 $ vault read gcp/roleset/my-token-roleset/token
 
@@ -260,30 +232,8 @@ token                 ya29.c.ElodBmNPwHUNY5gcBpnXcE4ywG4w1k...
 token_ttl             3599
 ```
 
-**Static account:**
-```shell-session
-$ vault read gcp/static-account/my-token-account/token
-
-Key                Value
----                -----
-expires_at_seconds    1672231587
-token                 ya29.c.b0Aa9VdykAdYoW9S1ImtPZykF_oTi9...
-token_ttl             3599
-```
-
-**Impersonated account:**
-```shell-session
-$ vault read gcp/impersonated-account/my-token-impersonate/token
-
-Key                Value
----                -----
-expires_at_seconds    1671667844
-token                 ya29.c.b0AT7lpjBRmO7ghBEyMV18evd016hq...
-token_ttl             59m59s
-```
-
 This endpoint generates a non-renewable, non-revocable static OAuth2 access token
-with a max lifetime of one hour, where `token_ttl` is given in seconds and the
+with a lifetime of one hour, where `token_ttl` is given in seconds and the
 `expires_at_seconds` is the expiry time for the token, given as a Unix timestamp.
 The `token` value then can be used as a HTTP Authorization Bearer token in requests
 to GCP APIs:
@@ -294,10 +244,8 @@ $ curl -H "Authorization: Bearer ya29.c.ElodBmNPwHUNY5gcBpnXcE4ywG4w1k..."
 
 ### Service Account Keys
 
-To generate service account keys, read from `gcp/.../key`. Vault returns the service
-account key data as a base64-encoded string in the `private_key_data` field. This can
-be read by decoding it using `base64 --decode "ewogICJ0e..."` or another base64 tool of
-your choice. The roleset or static account must have been created as type `service_account_key`:
+To generate service account keys, read from `gcp/key/...`. The roleset must have
+been created as type `service_account_key`:
 
 ```shell-session
 $ vault read gcp/roleset/my-key-roleset/key
@@ -313,7 +261,7 @@ private_key_data    ewogICJ0eXBlIjogInNlcnZpY2VfYWNjb3VudCIsC...
 ```
 
 This endpoint generates a new [GCP IAM service account key][iam-keys] associated
-with the role's Service Account. When the lease expires (or is revoked
+with the roleset's Service Account. When the lease expires (or is revoked
 early), the Service Account key will be deleted.
 
 **There is a default limit of 10 keys per Service Account.** For more
@@ -490,11 +438,14 @@ iam.serviceAccountKeys.get
 iam.serviceAccountKeys.list
 ```
 
-When using static accounts or impersonated accounts, Vault must have the following permissions
-at the service account level:
+When using static accounts, Vault must have the following permissions at the service account level:
 
 ```text
-# For `access_token` secrets and impersonated accounts
+# Service account key admin
+# This is provided in the `roles/iam.serviceAccountKeyAdmin` role
+iam.serviceAccounts.get
+
+# For `access_token` secrets
 iam.serviceAccounts.getAccessToken
 
 # For `service_account_keys` secrets
@@ -504,7 +455,7 @@ iam.serviceAccountKeys.get
 iam.serviceAccountKeys.list
 ```
 
-When using rolesets or static accounts with bindings, Vault must have the following permissions:
+When using rolesets or static accounts with bindings,  Vault must have the following permissions:
 
 ```text
 # IAM Policy Changes
@@ -549,7 +500,7 @@ You can either:
 If the mount is configured with credentials directly, the credential's key may be
 rotated to a Vault-generated value that is not accessible by the operator. For more
 details on this operation, please see the
-[Root Credential Rotation](/vault/api-docs/secret/gcp#rotate-root-credentials) API docs.
+[Root Credential Rotation](/api-docs/secret/gcp#rotate-root-credentials) API docs.
 
 ## Things to Note
 
@@ -679,7 +630,7 @@ Please report issues, add feature requests, and submit contributions to the
 The GCP secrets engine has a full HTTP API. Please see the [GCP secrets engine API docs][api]
 for more details.
 
-[api]: /vault/api-docs/secret/gcp
+[api]: /api-docs/secret/gcp
 [cloud-creds]: https://cloud.google.com/docs/authentication/production#providing_credentials_to_your_application
 [custom-roles]: https://cloud.google.com/iam/docs/creating-custom-roles
 [gce]: https://cloud.google.com/compute/
diff --git a/website/content/docs/secrets/gcpkms.mdx b/website/content/docs/secrets/gcpkms.mdx
index 8c3c28bc43ade..b5de0e473f82e 100644
--- a/website/content/docs/secrets/gcpkms.mdx
+++ b/website/content/docs/secrets/gcpkms.mdx
@@ -435,7 +435,7 @@ Please report issues, add feature requests, and submit contributions to the
 The Google Cloud KMS secrets engine has a full HTTP API. Please see the
 [Google Cloud KMS secrets engine API docs][api] for more details.
 
-[api]: /vault/api-docs/secret/gcpkms
+[api]: /api-docs/secret/gcpkms
 [cloud-creds]: https://cloud.google.com/docs/authentication/production#providing_credentials_to_your_application
 [gce]: https://cloud.google.com/compute/
 [gke]: https://cloud.google.com/kubernetes-engine/
@@ -444,4 +444,4 @@ The Google Cloud KMS secrets engine has a full HTTP API. Please see the
 [kms-pricing]: https://cloud.google.com/kms/pricing
 [repo]: https://github.com/hashicorp/vault-plugin-secrets-gcpkms
 [service-accounts]: https://cloud.google.com/compute/docs/access/service-accounts
-[vault-transit]: /vault/docs/secrets/transit
+[vault-transit]: /docs/secrets/transit
diff --git a/website/content/docs/secrets/identity/identity-token.mdx b/website/content/docs/secrets/identity/identity-token.mdx
index 745f0822d8312..ecb8c7e04afe6 100644
--- a/website/content/docs/secrets/identity/identity-token.mdx
+++ b/website/content/docs/secrets/identity/identity-token.mdx
@@ -64,7 +64,7 @@ Identity tokens will always contain, at a minimum, the claims required by OIDC:
 In addition, the operator may configure per-role templates that allow a variety
 of other entity information to be added to the token. The templates are
 structured as JSON with replaceable parameters. The parameter syntax is the same
-as that used for [ACL Path Templating](/vault/docs/concepts/policies).
+as that used for [ACL Path Templating](/docs/concepts/policies).
 
 For example:
 
@@ -137,13 +137,13 @@ The full list of template parameters is shown below:
 | `identity.entity.aliases.<mount accessor>.custom_metadata`                       | Custom metadata associated with the alias for the given mount                           |
 | `identity.entity.aliases.<mount accessor>.custom_metadata.<custom_metadata key>` | Custom metadata associated with the alias for the given mount and custom metadata key   |
 | `time.now`                                                                       | Current time as integral seconds since the Epoch                                        |
-| `time.now.plus.<duration>`                                                       | Current time plus a [duration format string](/vault/docs/concepts/duration-format)                 |
-| `time.now.minus.<duration>`                                                      | Current time minus a [duration format string](/vault/docs/concepts/duration-format)                |
+| `time.now.plus.<duration>`                                                       | Current time plus a [duration format string](/docs/concepts/duration-format)                 |
+| `time.now.minus.<duration>`                                                      | Current time minus a [duration format string](/docs/concepts/duration-format)                |
 
 ### Token Generation
 
 An authenticated client may request a token using the [token generation
-endpoint](/vault/api-docs/secret/identity/tokens#generate-a-signed-id-token). The token
+endpoint](/api-docs/secret/identity/tokens#generate-a-signed-id-token). The token
 will be generated per the requested role's specifications, for the requester's
 entity. It is not possible to generate tokens for an arbitrary entity.
 
@@ -161,7 +161,7 @@ only requiring _access_ to Vault, not _authorization_, as the .well-known
 endpoints are unauthenticated.
 
 Alternatively, the token may be sent to Vault for verification via an
-[introspection endpoint](/vault/api-docs/secret/identity/tokens#introspect-a-signed-id-token).
+[introspection endpoint](/api-docs/secret/identity/tokens#introspect-a-signed-id-token).
 The response will indicate whether the token is "active" or not, as well as any
 errors that occurred during validation. Beyond simply allowing the client to
 delegate verification to Vault, using this endpoint incorporates the additional
@@ -175,15 +175,15 @@ authorization.
 The identity token system has one configurable parameter: issuer. The issuer
 `iss` claim is particularly important for proper validation of the token by
 clients, and special consideration should be given when using Identity Tokens
-with [performance replication](/vault/docs/enterprise/replication).
+with [performance replication](/docs/enterprise/replication).
 Consumers of the token will request public keys from Vault using the issuer URL,
 so it must be network reachable. Furthermore, the returned set of keys will include
 an issuer that must match the request.
 
 By default Vault will set the issuer to the Vault instance's
-[`api_addr`](/vault/docs/configuration#api_addr). This means that tokens
+[`api_addr`](/docs/configuration#api_addr). This means that tokens
 issued in a given cluster should be validated within that same cluster.
-Alternatively, the [`issuer`](/vault/api-docs/secret/identity/tokens#issuer) parameter
+Alternatively, the [`issuer`](/api-docs/secret/identity/tokens#issuer) parameter
 may be configured explicitly. This address must point to the identity/oidc path
 for the Vault instance (e.g.
 `https://vault-1.example.com:8200/v1/identity/oidc`) and should be
@@ -192,5 +192,5 @@ reachable by any client trying to validate identity tokens.
 ## API
 
 The Identity secrets engine has a full HTTP API. Please see the
-[Identity secrets engine API](/vault/api-docs/secret/identity) for more
+[Identity secrets engine API](/api-docs/secret/identity) for more
 details.
diff --git a/website/content/docs/secrets/identity/index.mdx b/website/content/docs/secrets/identity/index.mdx
index 3998135fa433b..3170a8a0cc84e 100644
--- a/website/content/docs/secrets/identity/index.mdx
+++ b/website/content/docs/secrets/identity/index.mdx
@@ -31,20 +31,20 @@ controlling the access of tokens that are already issued.
 
 ~> **NOTE:** This secrets engine will be mounted by default. This secrets engine
 cannot be disabled or moved. For more conceptual overview on identity, refer to
-the [Identity](/vault/docs/concepts/identity) documentation.
+the [Identity](/docs/concepts/identity) documentation.
 
 The Vault Identity secrets engine supports several different features. Each
 one is individually documented on its own page.
 
-- [Identity tokens](/vault/docs/secrets/identity/identity-token)
-- [OIDC Identity Provider](/vault/docs/secrets/identity/oidc-provider)
+- [Identity tokens](/docs/secrets/identity/identity-token)
+- [OIDC Identity Provider](/docs/secrets/identity/oidc-provider)
 
 ## API
 
 The Identity secrets engine has a full HTTP API. Please see the
-[Identity secrets engine API](/vault/api-docs/secret/identity) for more
+[Identity secrets engine API](/api-docs/secret/identity) for more
 details.
 
 Additionally, Vault can be configured as an OIDC identity provider. Please see
-the [OIDC identity provider API](/vault/api-docs/secret/identity/oidc-provider) for
+the [OIDC identity provider API](/api-docs/secret/identity/oidc-provider) for
 more details.
diff --git a/website/content/docs/secrets/identity/oidc-provider.mdx b/website/content/docs/secrets/identity/oidc-provider.mdx
index 3ad049eb5e9c3..a8ff3353edd72 100644
--- a/website/content/docs/secrets/identity/oidc-provider.mdx
+++ b/website/content/docs/secrets/identity/oidc-provider.mdx
@@ -9,24 +9,24 @@ description: >-
 
 Vault is an OpenID Connect ([OIDC](https://openid.net/specs/openid-connect-core-1_0.html))
 identity provider. This enables client applications that speak the OIDC protocol to leverage
-Vault's source of [identity](/vault/docs/concepts/identity) and wide range of [authentication methods](/vault/docs/auth)
+Vault's source of [identity](/docs/concepts/identity) and wide range of [authentication methods](/docs/auth)
 when authenticating end-users. Client applications can configure their authentication logic
 to talk to Vault. Once enabled, Vault will act as the bridge to other identity providers via
 its existing authentication methods. Client applications can also obtain identity information
 for their end-users by leveraging custom templating of Vault identity information.
 
-\-> **Note**: For more detailed information on the configuration resources and OIDC endpoints,
-please visit the [OIDC provider](/vault/docs/concepts/oidc-provider) concepts page.
+-> **Note**: For more detailed information on the configuration resources and OIDC endpoints,
+please visit the [OIDC provider](/docs/concepts/oidc-provider) concepts page.
 
 ## Setup
 
 The Vault OIDC provider system is built on top of the identity secrets engine.
 This secrets engine is mounted by default and cannot be disabled or moved.
 
-Each Vault namespace has a default OIDC [provider](/vault/docs/concepts/oidc-provider#providers)
-and [key](/vault/docs/concepts/oidc-provider#key). This built-in configuration enables client
+Each Vault namespace has a default OIDC [provider](/docs/concepts/oidc-provider#providers)
+and [key](/docs/concepts/oidc-provider#key). This built-in configuration enables client
 applications to begin using Vault as a source of identity with minimal configuration. For
-details on the built-in configuration and advanced options, see the [OIDC provider](/vault/docs/concepts/oidc-provider)
+details on the built-in configuration and advanced options, see the [OIDC provider](/docs/concepts/oidc-provider)
 concepts page.
 
 The following steps show a minimal configuration that allows a client application to use
@@ -52,7 +52,7 @@ Any Vault auth method may be used within the OIDC flow. For simplicity, enable t
    This user will authenticate to Vault through a client application, otherwise known as
    an OIDC [relying party](https://openid.net/specs/openid-connect-core-1_0.html#Terminology).
 
-2. Create a client application:
+3. Create a client application:
 
    ```text
    $ vault write identity/oidc/client/my-webapp \
@@ -62,15 +62,15 @@ Any Vault auth method may be used within the OIDC flow. For simplicity, enable t
    ```
 
    This operation creates a client application which can be used to configure an OIDC
-   relying party. See the [client applications](/vault/docs/concepts/oidc-provider#client-applications)
+   relying party. See the [client applications](/docs/concepts/oidc-provider#client-applications)
    section for details on different client types, including `confidential` and `public` clients.
 
    The `assignments` parameter limits the Vault entities and groups that are allowed to
    authenticate through the client application. By default, no Vault entities are allowed.
-   To allow all Vault entities to authenticate, the built-in [allow_all](/vault/docs/concepts/oidc-provider#assignments)
+   To allow all Vault entities to authenticate, the built-in [allow_all](/docs/concepts/oidc-provider#assignments)
    assignment is provided.
 
-2. Read client credentials:
+4. Read client credentials:
 
    ```text
    $ vault read identity/oidc/client/my-webapp
@@ -90,7 +90,7 @@ Any Vault auth method may be used within the OIDC flow. For simplicity, enable t
    The `client_id` and `client_secret` are the client application's credentials. These
    values are typically required when configuring an OIDC relying party.
 
-2. Read OIDC discovery configuration:
+5. Read OIDC discovery configuration:
 
    ```text
    $ curl -s http://127.0.0.1:8200/v1/identity/oidc/provider/default/.well-known/openid-configuration
@@ -147,10 +147,9 @@ A number of HashiCorp products provide OIDC authentication methods. This means t
 can leverage Vault as a source of identity using the OIDC protocol. See the following links
 for details on configuring OIDC authentication for other HashiCorp products:
 
-- [Boundary](/boundary/tutorials/access-management/oidc-auth)
-- [Consul](/consul/docs/security/acl/auth-methods/oidc)
-- [Waypoint](/waypoint/docs/server/auth/oidc)
-- [Nomad](/nomad/tutorials/single-sign-on/sso-oidc-vault)
+- [Boundary](https://learn.hashicorp.com/tutorials/boundary/oidc-auth)
+- [Consul](https://developer.hashicorp.com/consul/docs/security/acl/auth-methods/oidc)
+- [Waypoint](https://developer.hashicorp.com/waypoint/docs/server/auth/oidc)
 
 Otherwise, refer to the documentation of the specific OIDC relying party for usage details.
 
@@ -162,12 +161,12 @@ The Vault OIDC provider feature currently supports the following authentication
 
 ## Tutorial
 
-Refer to the [Vault as an OIDC Identity Provider](/vault/tutorials/auth-methods/oidc-identity-provider)
+Refer to the [Vault as an OIDC Identity Provider](https://learn.hashicorp.com/tutorials/vault/oidc-identity-provider)
 tutorial to learn how to configure a HashiCorp [Boundary](https://www.boundaryproject.io/)
 to leverage Vault as a source of identity using the OIDC protocol.
 
 ## API
 
 The Vault OIDC provider feature has a full HTTP API. Please see the
-[OIDC identity provider API](/vault/api-docs/secret/identity/oidc-provider) for more
+[OIDC identity provider API](/api-docs/secret/identity/oidc-provider) for more
 details.
diff --git a/website/content/docs/secrets/index.mdx b/website/content/docs/secrets/index.mdx
index 7e23aee24fa79..f4ce69497e2f1 100644
--- a/website/content/docs/secrets/index.mdx
+++ b/website/content/docs/secrets/index.mdx
@@ -27,7 +27,7 @@ supporting operations like read, write, and delete.
 Most secrets engines can be enabled, disabled, tuned, and moved via the CLI or
 API. 
 
-- [Enable](/vault/docs/commands/secrets/enable) - This enables a secrets engine at
+- [Enable](/docs/commands/secrets/enable) - This enables a secrets engine at
   a given path. With a few exceptions, secrets engines can be enabled at multiple
   paths. Each secrets engine is isolated to its path. By default, they are
   enabled at their "type" (e.g. "aws" enables at `aws/`).
@@ -36,17 +36,17 @@ API.
   example, the KV secrets engine enabled at `kv/` and `KV/` are treated as two
   distinct instances of KV secrets engine.
 
-- [Disable](/vault/docs/commands/secrets/disable) - This disables an existing
+- [Disable](/docs/commands/secrets/disable) - This disables an existing
   secrets engine. When a secrets engine is disabled, all of its secrets are
   revoked (if they support it), and all the data stored for that engine in
   the physical storage layer is deleted.
 
-- [Move](/vault/docs/commands/secrets/move) - This moves the path for an existing
+- [Move](/docs/commands/secrets/move) - This moves the path for an existing
   secrets engine. This process revokes all secrets, since secret leases are tied
   to the path where they were created. The configuration data stored for the engine
   persists through the move.
 
-- [Tune](/vault/docs/commands/secrets/tune) - This tunes global configuration for
+- [Tune](/docs/commands/secrets/tune) - This tunes global configuration for
   the secrets engine such as the TTLs.
 
 Once a secrets engine is enabled, you can interact with it directly at its path
diff --git a/website/content/docs/secrets/key-management/awskms.mdx b/website/content/docs/secrets/key-management/awskms.mdx
index a841ee3eaf70d..f8b1ae54f23f6 100644
--- a/website/content/docs/secrets/key-management/awskms.mdx
+++ b/website/content/docs/secrets/key-management/awskms.mdx
@@ -20,11 +20,11 @@ the functionality.
 
 The Key Management secrets engine must be configured with credentials that have sufficient
 permissions to manage keys in an AWS KMS region. The authentication parameters are described
-in the [credentials](/vault/api-docs/secret/key-management/awskms#credentials) section of the API
+in the [credentials](/api-docs/secret/key-management/awskms#credentials) section of the API
 documentation. The authentication parameters will be set with the following order of
 precedence:
 
-1. [KMS provider credentials](/vault/api-docs/secret/key-management/awskms#credentials)
+1. [KMS provider credentials](/api-docs/secret/key-management/awskms#credentials)
 2. Environment variables
 3. Shared credentials file
 4. IAM role for AWS EC2 or ECS task
@@ -56,7 +56,7 @@ $ vault write keymgmt/kms/example-kms \
     credentials=secret_key="bCiYmNroLxLmPNQ47VIvjlm8mQu5oktZcQdq195w"
 ```
 
-Refer to the AWS KMS [API documentation](/vault/api-docs/secret/key-management/awskms)
+Refer to the AWS KMS [API documentation](/api-docs/secret/key-management/awskms)
 for a detailed description of individual configuration parameters.
 
 ## Key Transfer Specification
@@ -76,7 +76,7 @@ associated with imported keys. Aliases will always have the form: `hashicorp/<ke
 
 ## Key Purpose Compatability
 
-The following table defines which key [purposes](/vault/api-docs/secret/key-management#purpose) can be used
+The following table defines which key [purposes](/api-docs/secret/key-management#purpose) can be used
 for each key type supported by AWS KMS.
 
 | Key Type       | Purpose                 |
diff --git a/website/content/docs/secrets/key-management/azurekeyvault.mdx b/website/content/docs/secrets/key-management/azurekeyvault.mdx
index 62e906e4d59c7..b8855e4898dd7 100644
--- a/website/content/docs/secrets/key-management/azurekeyvault.mdx
+++ b/website/content/docs/secrets/key-management/azurekeyvault.mdx
@@ -18,12 +18,12 @@ the functionality.
 
 The Key Management secrets engine must be configured with credentials that have sufficient
 permissions to manage keys in an Azure Key Vault instance. The authentication parameters are
-described in the [credentials](/vault/api-docs/secret/key-management/azurekeyvault#credentials) section
+described in the [credentials](/api-docs/secret/key-management/azurekeyvault#credentials) section
 of the API documentation. The authentication parameters will be set with the following order
 of precedence:
 
 1. Environment variables
-2. [KMS provider credentials](/vault/api-docs/secret/key-management/azurekeyvault#credentials)
+2. [KMS provider credentials](/api-docs/secret/key-management/azurekeyvault#credentials)
 3. [Managed Service Identity (MSI)](https://docs.microsoft.com/en-us/azure/active-directory/managed-service-identity/overview)
 
 If the client ID or secret are not provided and Vault is running on an Azure VM, Vault will attempt
@@ -54,7 +54,7 @@ $ vault write keymgmt/kms/example-kms \
     credentials=tenant_id="cd4bf224-d114-4f96-9bbc-b8f45751c43f"
 ```
 
-Refer to the Azure Key Vault [API documentation](/vault/api-docs/secret/key-management/azurekeyvault)
+Refer to the Azure Key Vault [API documentation](/api-docs/secret/key-management/azurekeyvault)
 for a detailed description of individual configuration parameters.
 
 ## Key Transfer Specification
@@ -65,14 +65,14 @@ specification.
 
 ## Key Purpose Compatability
 
-The following table defines which key [purposes](/vault/api-docs/secret/key-management#purpose) can be used
+The following table defines which key [purposes](/api-docs/secret/key-management#purpose) can be used
 for each key type supported by GCP Cloud KMS.
 
 | Key Type       | Purpose                                                 |
 | -------------- | ------------------------------------------------------- |
-| `rsa-2048`     | [All purposes](/vault/api-docs/secret/key-management#purpose) |
-| `rsa-3072`     | [All purposes](/vault/api-docs/secret/key-management#purpose) |
-| `rsa-4096`     | [All purposes](/vault/api-docs/secret/key-management#purpose) |
+| `rsa-2048`     | [All purposes](/api-docs/secret/key-management#purpose) |
+| `rsa-3072`     | [All purposes](/api-docs/secret/key-management#purpose) |
+| `rsa-4096`     | [All purposes](/api-docs/secret/key-management#purpose) |
 
 ## Azure Private Link
 
@@ -100,8 +100,8 @@ Aliases:  <keyvault-name>.vault.azure.net
 ```
 
 The secrets engine doesn't require special configuration to communicate with a Key Vault instance
-over an Azure Private Endpoint. For example, the given [KMS configuration](/vault/docs/secrets/key-management/azurekeyvault#configuration)
+over an Azure Private Endpoint. For example, the given [KMS configuration](/docs/secrets/key-management/azurekeyvault#configuration)
 will result in the secrets engine resolving a Key Vault domain name of `keyvault-name.vault.azure.net`
 to the Private Endpoint IP address. Note that it's possible to change the Key Vault DNS suffix using the
-[environment](/vault/api-docs/secret/key-management/azurekeyvault#environment)
+[environment](/api-docs/secret/key-management/azurekeyvault#environment)
 configuration parameter or `AZURE_ENVIRONMENT` environment variable.
diff --git a/website/content/docs/secrets/key-management/gcpkms.mdx b/website/content/docs/secrets/key-management/gcpkms.mdx
index bd0f4072b3f77..61c40587a04eb 100644
--- a/website/content/docs/secrets/key-management/gcpkms.mdx
+++ b/website/content/docs/secrets/key-management/gcpkms.mdx
@@ -18,12 +18,12 @@ the functionality.
 
 The Key Management secrets engine must be configured with credentials that have sufficient
 permissions to manage keys in an existing GCP Cloud KMS [key ring](https://cloud.google.com/kms/docs/resource-hierarchy#key_rings).
-The authentication parameters are described in the [credentials](/vault/api-docs/secret/key-management/gcpkms#credentials)
+The authentication parameters are described in the [credentials](/api-docs/secret/key-management/gcpkms#credentials)
 section of the API documentation. The authentication parameters will be set with the following order
 of precedence:
 
 1. `GOOGLE_CREDENTIALS` environment variable
-2. [KMS provider credentials](/vault/api-docs/secret/key-management/gcpkms#credentials) parameter
+2. [KMS provider credentials](/api-docs/secret/key-management/gcpkms#credentials) parameter
 3. [Application default credentials](https://cloud.google.com/docs/authentication/production)
 
 The service account must be authorized with the following minimum
@@ -50,7 +50,7 @@ $ vault write keymgmt/kms/example-kms \
     credentials=service_account_file="/path/to/service_account/credentials.json"
 ```
 
-Refer to the GCP Cloud KMS [API documentation](/vault/api-docs/secret/key-management/gcpkms)
+Refer to the GCP Cloud KMS [API documentation](/api-docs/secret/key-management/gcpkms)
 for a detailed description of individual configuration parameters.
 
 ## Key Transfer Specification
@@ -60,7 +60,7 @@ with the [key import](https://cloud.google.com/kms/docs/key-import) specificatio
 
 ## Key Purpose Compatability
 
-The following table defines which key [purposes](/vault/api-docs/secret/key-management#purpose) can be used
+The following table defines which key [purposes](/api-docs/secret/key-management#purpose) can be used
 for each key type supported by GCP Cloud KMS.
 
 | Key Type       | Purpose                 |
diff --git a/website/content/docs/secrets/key-management/index.mdx b/website/content/docs/secrets/key-management/index.mdx
index 866aed868a384..f0961c57beaae 100644
--- a/website/content/docs/secrets/key-management/index.mdx
+++ b/website/content/docs/secrets/key-management/index.mdx
@@ -89,12 +89,12 @@ manage the lifecycle of cryptographic keys in [supported KMS providers](#kms-pro
    `purpose` and `protection`. The `purpose` defines the set of cryptographic capabilities
    that the key will have in the KMS provider. The `protection` defines where cryptographic
    operations are performed with the key in the KMS provider. See the API documentation for a list of
-   supported [purpose](/vault/api-docs/secret/key-management#purpose) and [protection](/vault/api-docs/secret/key-management#protection)
+   supported [purpose](/api-docs/secret/key-management#purpose) and [protection](/api-docs/secret/key-management#protection)
    values.
 
    ~> **Note:** The amount of time it takes to distribute a key to a KMS provider is proportional to the
    number of versions that the key has. If a timeout occurs when distributing a key to a KMS
-   provider, you may need to increase the [VAULT_CLIENT_TIMEOUT](/vault/docs/commands#vault_client_timeout).
+   provider, you may need to increase the [VAULT_CLIENT_TIMEOUT](https://www.vaultproject.io/docs/commands#vault_client_timeout).
 
 1. Rotate a key:
 
@@ -126,7 +126,7 @@ manage the lifecycle of cryptographic keys in [supported KMS providers](#kms-pro
    This operation results in the key being deleted from the KMS provider. The key will still exist
    in the secrets engine and can be redistributed to a KMS provider at a later time.
 
-   To permanently delete the key from the secrets engine, the [delete key](/vault/api-docs/secret/key-management#delete-key)
+   To permanently delete the key from the secrets engine, the [delete key](/api-docs/secret/key-management#delete-key)
    API may be invoked.
 
 ## Key Types
@@ -146,9 +146,9 @@ The Key Management secrets engine supports generation of the following key types
 The Key Management secrets engine supports lifecycle management of keys in the following
 KMS providers:
 
-- [Azure Key Vault](/vault/docs/secrets/key-management/azurekeyvault)
-- [AWS KMS](/vault/docs/secrets/key-management/awskms)
-- [GCP Cloud KMS](/vault/docs/secrets/key-management/gcpkms)
+- [Azure Key Vault](/docs/secrets/key-management/azurekeyvault)
+- [AWS KMS](/docs/secrets/key-management/awskms)
+- [GCP Cloud KMS](/docs/secrets/key-management/gcpkms)
 
 Refer to the provider-specific documentation for details on how to properly configure each provider.
 
@@ -168,10 +168,10 @@ The following table defines which key types are compatible with each KMS provide
 
 ## Tutorial
 
-Refer to the [Key Management Secrets Engine](/vault/tutorials/key-management) tutorial series to learn how to use the key management secrets engine for Azure and GCP.
+Refer to the [Key Management Secrets Engine](https://learn.hashicorp.com/collections/vault/key-management) tutorial series to learn how to use the key management secrets engine for Azure and GCP.
 
 ## API
 
 The Key Management secrets engine has a full HTTP API. Please see the
-[Key Management Secrets Engine API](/vault/api-docs/secret/key-management) for more
+[Key Management Secrets Engine API](/api-docs/secret/key-management) for more
 details.
diff --git a/website/content/docs/secrets/kmip-profiles.mdx b/website/content/docs/secrets/kmip-profiles.mdx
index 95b098c5451f0..bbce5365f90e5 100644
--- a/website/content/docs/secrets/kmip-profiles.mdx
+++ b/website/content/docs/secrets/kmip-profiles.mdx
@@ -171,73 +171,8 @@ Vault implements version 1.4 of the following Key Management Interoperability Pr
   3. MAY support any clause within [KMIP-SPEC][kmip-spec] provided it does not conflict with any other clause within the section [Basic Cryptographic Server][basic-cryptographic-server]
   4. MAY support extensions outside the scope of this standard (e.g., vendor extensions, conformance clauses) that do not contradict any KMIP requirements.
 
-## [Asymmetric Key Lifecycle Server][asymmetric-key-lifecycle-server]
 
-  1. SHALL conform to the [Baseline Server][baseline-server]
-
-  2. Supports the following objects:
-
-    | Object                                                                 | Supported |
-    | -----------------------------------------------------------------------| :----- --:|
-    | Symmetric Key [KMIP-SPEC 2.2.2][kmip-spec-2.2.2]                       | ✅        |
-    | Key Format Type [KMIP-SPEC 9.1.3.2.3][kmip-spec-9.1.3.2.3]             | ✅        |
-
-  3. Supports the following objects:
-
-    | Object                                                              | Supported | Notes |
-    | --------------------------------------------------------------------| :-------: | :---: |
-    | Public Key [KMIP-SPEC 2.2.3][kmip-spec-2.2.3]                       | ✅        |  Vault 1.13 |
-    | Private Key [KMIP-SPEC 2.2.4][kmip-spec-2.2.4]                      | ✅        |  Vault 1.13 |
-    | Process Start Date [KMIP-SPEC 3.25][kmip-spec-3.25]                 | ✅        |  Vault 1.11 |
-    | Key Format Type [KMIP-SPEC 9.1.3.2.3][kmip-spec-9.1.3.2.3]          | ✅        |        |
-
-  4. Supports the following attributes:
-
-    | Attribute                                                              | Supported | Notes |
-    | -----------------------------------------------------------------------| :-------: | :---: |
-    | Cryptographic Algorithm [KMIP-SPEC 3.4][kmip-spec-3.4]                 | ✅        |       |
-    | Object Type [KMIP-SPEC 3.3][kmip-spec-3.3]                             | ✅        |       |
-    | Process Start Date [KMIP-SPEC 3.25][kmip-spec-3.25]                    | ✅        | Vault 1.11 |
-    | Protect Stop Date [KMIP-SPEC 3.26][kmip-spec-3.26]                     | ✅        | Vault 1.11 |
-
-  5. Supports the following message encoding:
-
-    | Message Encoding                                                                     | Supported | Notes |
-    | -------------------------------------------------------------------------------------| :--------:|:-----:|
-    | Cryptographic Algorithm [KMIP-SPEC 9.1.3.2.13][kmip-spec-9.1.3.2.13] with values:    |           |       |
-    | i. RSA                                                                               | ✅        | Vault 1.13 |
-    | Object Type [KMIP-SPEC 9.1.3.2.12][kmip-spec-9.1.3.2.12] with value:                 |           |        |
-    | i. Public	 Key                                                                       | ✅        | Vault 1.13 |
-    | ii. Private	 Key                                                                     | ✅        | Vault 1.13 |
-    | Key Format Type [KMIP-SPEC 9.1.3.2.3][kmip-spec-9.1.3.2.3] with value:               |           |        |
-    | i. PKCS#1                                                                            | ✅        | Vault 1.13 <br/> Supported for Private and Public Keys|
-    | ii. PKCS#8                                                                           | ✅        | Vault 1.13 <br/> Supported for Private Key|
-    | iii. Transparent RSA Public Key                                                      | ✅        | Vault 1.13 |
-    | iv. Transparent RSA Private Key                                                      | ✅        | Vault 1.13 |
-    | v. X.509                                                                             | ✅        | Vault 1.13 <br/> Supported for Public Key|
-
-  6. MAY support any clause within [KMIP-SPEC][kmip-spec] provided it does not conflict with any other clause within the section [Symmetric Key Lifecycle Server][lifecycle-server]
-  7. MAY support extensions outside the scope of this standard (e.g., vendor extensions, conformance clauses) that do not contradict any KMIP requirements.
-
-## [Advanced Cryptographic Server][advanced-cryptographic-server]
-  1. SHALL conform to the [Baseline Server][baseline-server]
-  2. Supports the following client-to-server operations:
-
-    | Operation                                             | Supported | Notes   |
-    | ------------------------------------------------------| :--------:| --------|
-    | Encrypt [KMIP-SPEC 4.29][kmip-spec-4.29]              | ✅        | Vault 1.11 <br/> [See Basic Cryptographic Server](#basic-cryptographic-server) <br/><br/> Vault 1.13 <br/> Supported for RSA Asymmetric Keys: <br/><br/> Supported padding methods: <br/> <ol> <li> OAEP </li> <li> PKCS1v15 </li> </ol> <br/> Streaming operations are not supported. |
-    | Decypt [KMIP-SPEC 4.30][kmip-spec-4.30]               | ✅        | Vault 1.11 <br/> [See Basic Cryptographic Server](#basic-cryptographic-server) <br/><br/> Vault 1.13 <br/> Supported for RSA Asymmetric Keys: <br/><br/> Supported padding methods: <br/> <ol> <li> OAEP </li> <li> PKCS1v15 </li> </ol> <br/> Streaming operations are not supported. |
-    | Sign [KMIP-SPEC 4.31][kmip-spec-4.31]                 | ✅        | Vault 1.13 <br/> Supported for RSA Asymmetric Keys: <br/><br/> Supported padding methods: <br/> <ol> <li> PSS </li> <li> PKCS1v15 </li> </ol> <br/><br/> The supported hashing algorithms with PSS are: <br/> <ol> <li> SHA224 </li> <li> SHA256 </li> <li> SHA384 </li> <li> SHA512 </li> <li> RIPEMD160 </li> <li> SHA512_224 </li> <li> SHA512_256 </li> <li> SHA3_224 </li> <li> SHA3_256 </li> <li> SHA3_384 </li> <li> SHA3_512 </li> </ol> <br/> The supported hashing algorithms with PKCS1v15 are: <br/> <ol> <li> SHA224 </li> <li> SHA256 </li> <li> SHA384 </li> <li> SHA512 </li> <li> RIPEMD160 </li> </ol> <br/> Streaming operations are supported.|
-    | Signature Verify [KMIP-SPEC 4.32][kmip-spec-4.32]     | ✅        | Vault 1.13 <br/> Supported for RSA Asymmetric Keys: <br/><br/> Supported padding methods: <br/> <ol> <li> PSS </li> <li> PKCS1v15 </li> </ol> <br/><br/> The supported hashing algorithms with PSS are: <br/> <ol> <li> SHA224 </li> <li> SHA256 </li> <li> SHA384 </li> <li> SHA512 </li> <li> RIPEMD160 </li> <li> SHA512_224 </li> <li> SHA512_256 </li> <li> SHA3_224 </li> <li> SHA3_256 </li> <li> SHA3_384 </li> <li> SHA3_512 </li> </ol> <br/> The supported hashing algorithms with PKCS1v15 are: <br/> <ol> <li> SHA224 </li> <li> SHA256 </li> <li> SHA384 </li> <li> SHA512 </li> <li> RIPEMD160 </li> </ol> <br/> Streaming operations are supported.|
-    | MAC [KMIP-SPEC 4.33][kmip-spec-4.33]                  | ✅        | Vault 1.13 <br/> Supported for RSA Asymmetric Keys: <br/><br/> The supported hashing algorithms are: <br/> <ol> <li> SHA224 </li> <li> SHA256 </li> <li> SHA384 </li> <li> SHA512 </li> <li> RIPEMD160 </li> <li> SHA512_224 </li> <li> SHA512_256 </li> <li> SHA3_256 </li> <li> SHA3_384 </li> <li> SHA3_512 </li> </ol> <br/> The follwing hashing algorithms are not supported: <br/> <ol> <li> MD4 </li> <li> MD5 </li> <li> SHA1 </li> </ol> <br/> Streaming operations are supported.|
-    | MAC Verify [KMIP-SPEC 4.34][kmip-spec-4.34]           | ✅        | Vault 1.13 <br/> Supported for RSA Asymmetric Keys: <br/><br/> The supported hashing algorithms are: <br/> <ol> <li> SHA224 </li> <li> SHA256 </li> <li> SHA384 </li> <li> SHA512 </li> <li> RIPEMD160 </li> <li> SHA512_224 </li> <li> SHA512_256 </li> <li> SHA3_256 </li> <li> SHA3_384 </li> <li> SHA3_512 </li> </ol> <br/> The follwing hashing algorithms are not supported: <br/> <ol> <li> MD4 </li> <li> MD5 </li> <li> SHA1 </li> </ol> <br/> Streaming operations are supported.|
-    | RNG Retrieve [KMIP-SPEC 4.35][kmip-spec-4.35]         | ✅        | Vault 1.13 |
-    | RNG Seed [KMIP-SPEC 4.36][kmip-spec-4.36]             | ✅        | Vault 1.13 |
-  3. MAY support any clause within [KMIP-SPEC][kmip-spec] provided it does not conflict with any other clause within the section [Basic Cryptographic Server][basic-cryptographic-server]
-  4. MAY support extensions outside the scope of this standard (e.g., vendor extensions, conformance clauses) that do not contradict any KMIP requirements.
-
-
-[kmip-spec-2.1.1]: https://docs.oasis-open.org/kmip/spec/v1.4/errata01/os/kmip-spec-v1.4-errata01-os-redlined.html#_Toc490660735
+  [kmip-spec-2.1.1]: https://docs.oasis-open.org/kmip/spec/v1.4/errata01/os/kmip-spec-v1.4-errata01-os-redlined.html#_Toc490660735
   [kmip-spec-2.1.2]: https://docs.oasis-open.org/kmip/spec/v1.4/errata01/os/kmip-spec-v1.4-errata01-os-redlined.html#_Toc490660736
   [kmip-spec-2.1.3]: https://docs.oasis-open.org/kmip/spec/v1.4/errata01/os/kmip-spec-v1.4-errata01-os-redlined.html#_Toc490660737
   [kmip-spec-2.1.4]: https://docs.oasis-open.org/kmip/spec/v1.4/errata01/os/kmip-spec-v1.4-errata01-os-redlined.html#_Toc490660738
@@ -246,8 +181,6 @@ Vault implements version 1.4 of the following Key Management Interoperability Pr
   [kmip-spec-2.1.19]: https://docs.oasis-open.org/kmip/spec/v1.4/errata01/os/kmip-spec-v1.4-errata01-os-redlined.html#_Toc490660768
   [kmip-spec-2.1.20]: https://docs.oasis-open.org/kmip/spec/v1.4/errata01/os/kmip-spec-v1.4-errata01-os-redlined.html#_Toc490660769
   [kmip-spec-2.1.21]: https://docs.oasis-open.org/kmip/spec/v1.4/errata01/os/kmip-spec-v1.4-errata01-os-redlined.html#_Toc490660770
-  [kmip-spec-2.2.3]: https://docs.oasis-open.org/kmip/spec/v1.4/errata01/os/kmip-spec-v1.4-errata01-os-redlined.html#_Toc490660776
-  [kmip-spec-2.2.4]: https://docs.oasis-open.org/kmip/spec/v1.4/errata01/os/kmip-spec-v1.4-errata01-os-redlined.html#_Toc490660777
   [kmip-spec-3.1]: https://docs.oasis-open.org/kmip/spec/v1.4/errata01/os/kmip-spec-v1.4-errata01-os-redlined.html#_Toc490660784
   [kmip-spec-3.2]: https://docs.oasis-open.org/kmip/spec/v1.4/errata01/os/kmip-spec-v1.4-errata01-os-redlined.html#_Toc490660785
   [kmip-spec-3.3]: https://docs.oasis-open.org/kmip/spec/v1.4/errata01/os/kmip-spec-v1.4-errata01-os-redlined.html#_Toc490660786
@@ -293,14 +226,6 @@ Vault implements version 1.4 of the following Key Management Interoperability Pr
   [kmip-spec-4.21]: https://docs.oasis-open.org/kmip/spec/v1.4/errata01/os/kmip-spec-v1.4-errata01-os-redlined.html#_Toc490660861
   [kmip-spec-4.25]: https://docs.oasis-open.org/kmip/spec/v1.4/errata01/os/kmip-spec-v1.4-errata01-os-redlined.html#_Toc490660865
   [kmip-spec-4.26]: https://docs.oasis-open.org/kmip/spec/v1.4/errata01/os/kmip-spec-v1.4-errata01-os-redlined.html#_Toc490660866
-  [kmip-spec-4.29]: https://docs.oasis-open.org/kmip/spec/v1.4/errata01/os/kmip-spec-v1.4-errata01-os-redlined.html#_Toc490660869
-  [kmip-spec-4.30]: https://docs.oasis-open.org/kmip/spec/v1.4/errata01/os/kmip-spec-v1.4-errata01-os-redlined.html#_Toc490660870
-  [kmip-spec-4.31]: https://docs.oasis-open.org/kmip/spec/v1.4/errata01/os/kmip-spec-v1.4-errata01-os-redlined.html#_Toc490660871
-  [kmip-spec-4.32]: https://docs.oasis-open.org/kmip/spec/v1.4/errata01/os/kmip-spec-v1.4-errata01-os-redlined.html#_Toc490660872
-  [kmip-spec-4.33]: https://docs.oasis-open.org/kmip/spec/v1.4/errata01/os/kmip-spec-v1.4-errata01-os-redlined.html#_Toc490660873
-  [kmip-spec-4.34]: https://docs.oasis-open.org/kmip/spec/v1.4/errata01/os/kmip-spec-v1.4-errata01-os-redlined.html#_Toc490660874
-  [kmip-spec-4.35]: https://docs.oasis-open.org/kmip/spec/v1.4/errata01/os/kmip-spec-v1.4-errata01-os-redlined.html#_Toc490660875
-  [kmip-spec-4.36]: https://docs.oasis-open.org/kmip/spec/v1.4/errata01/os/kmip-spec-v1.4-errata01-os-redlined.html#_Toc490660876
   [kmip-spec-6.1]: https://docs.oasis-open.org/kmip/spec/v1.4/errata01/os/kmip-spec-v1.4-errata01-os-redlined.html#_Toc490660887
   [kmip-spec-6.2]: https://docs.oasis-open.org/kmip/spec/v1.4/errata01/os/kmip-spec-v1.4-errata01-os-redlined.html#_Toc490660888
   [kmip-spec-6.3]: https://docs.oasis-open.org/kmip/spec/v1.4/errata01/os/kmip-spec-v1.4-errata01-os-redlined.html#_Toc490660889
@@ -329,10 +254,9 @@ Vault implements version 1.4 of the following Key Management Interoperability Pr
   [kmip-spec-4.1]: https://docs.oasis-open.org/kmip/spec/v1.4/errata01/os/kmip-spec-v1.4-errata01-os-redlined.html#_Toc490660841
   [kmip-spec-9.1.3.2.13]: https://docs.oasis-open.org/kmip/spec/v1.4/errata01/os/kmip-spec-v1.4-errata01-os-redlined.html#_Toc490660933
   [kmip-spec-9.1.3.2.12]: https://docs.oasis-open.org/kmip/spec/v1.4/errata01/os/kmip-spec-v1.4-errata01-os-redlined.html#_Toc490660932
+  [kmip-spec-4.29]: https://docs.oasis-open.org/kmip/spec/v1.4/errata01/os/kmip-spec-v1.4-errata01-os-redlined.html#_Toc490660869
+  [kmip-spec-4.30]: https://docs.oasis-open.org/kmip/spec/v1.4/errata01/os/kmip-spec-v1.4-errata01-os-redlined.html#_Toc490660870
   [baseline-server]: http://docs.oasis-open.org/kmip/profiles/v1.4/os/kmip-profiles-v1.4-os.html#_Toc491431430
   [lifecycle-server]: http://docs.oasis-open.org/kmip/profiles/v1.4/os/kmip-profiles-v1.4-os.html#_Toc491431487
   [basic-cryptographic-server]: http://docs.oasis-open.org/kmip/profiles/v1.4/os/kmip-profiles-v1.4-os.html#_Toc491431527
-  [asymmetric-key-lifecycle-server]: http://docs.oasis-open.org/kmip/profiles/v1.4/os/kmip-profiles-v1.4-os.html#_Toc491431516
-  [advanced-cryptographic-server]: http://docs.oasis-open.org/kmip/profiles/v1.4/os/kmip-profiles-v1.4-os.html#_Toc491431528
   [tc-proc-2.18]: https://www.oasis-open.org/policies-guidelines/tc-process-2017-05-26/technical-committee-tc-process-27-july-2011/#specQuality
-
diff --git a/website/content/docs/secrets/kmip.mdx b/website/content/docs/secrets/kmip.mdx
index aaac0aaf65dc9..fdb2896daeedd 100644
--- a/website/content/docs/secrets/kmip.mdx
+++ b/website/content/docs/secrets/kmip.mdx
@@ -31,30 +31,18 @@ Vault implements version 1.4 of the following Key Management Interoperability Pr
 
   * [Symmetric Key Lifecycle Server][lifecycle-server]
     * Supports cryptographic algorithm *AES* (*3DES* is not supported).
-    * Only the *Raw* key format type is supported. (*Transparent Symmetric Key* is not supported).
+    * Only the *Transparent Symmetric Key* key format type is supported.
 
   * [Basic Cryptographic Server][basic-cryptographic-server]
     * Supports block cipher modes *CBC*, *CFB*, *CTR*, *ECB*, *GCM*, and *OFB*.
     * On multi-part (streaming) operations, block cipher mode *GCM* is not supported.
     * The supported padding methods are *None* and *PKCS5*.
 
-  * [Asymmetric Key Lifecycle Server][asymmetric-key-lifecycle-server]
-    * Supports *Public Key* and *Private Key* objects.
-    * Supports *RSA* cryptographic algorithm
-    * Supports *PKCS#1*, *PKCS#8*, *X.509*, *Transparent RSA Public Key* and *Transparent RSA Private Key* key format types.
-
-  * [Advanced Cryptographic Server][advanced-cryptographic-server]
-    * Supports *Encrypt*, *Decrypt*, *Sign*, *Signature Verify*, *MAC*, *MAC Verify*, *RNG Retrieve*, and *RNG Seed* client-to-server operations.
-    * The supported hashing algorithms for Sign and Signature Verify operations are *SHA224*, *SHA256*, *SHA384*, *SHA512*, *RIPEMD160*, *SHA512_224*, *SHA512_256*, *SHA3_224*, *SHA3_256*, *SHA3_384*, and *SHA3_512* for *PSS* padding method, and algorithms *SHA224*, *SHA256*, *SHA384*, *SHA512*, and *RIPEMD160* for *PKCS1v15* padding method.
-    * The supported hashing algorithms for MAC and MAC Verify operations are *SHA224*, *SHA256*, *SHA384*, *SHA512*, *RIPEMD160*, *SHA512_224*, *SHA512_256*, *SHA3_224*, *SHA3_256*, *SHA3_384*, and *SHA3_512* (*MD4*, *MD5*, and *SHA1* are not supoorted).
-
-Refer to [KMIP - Profiles Support](/vault/docs/secrets/kmip-profiles) page for more details.
+Refer to [KMIP - Profiles Support](/docs/secrets/kmip-profiles) page for more details.
 
 [baseline-server]: http://docs.oasis-open.org/kmip/profiles/v1.4/os/kmip-profiles-v1.4-os.html#_Toc491431430
 [lifecycle-server]: http://docs.oasis-open.org/kmip/profiles/v1.4/os/kmip-profiles-v1.4-os.html#_Toc491431487
 [basic-cryptographic-server]: http://docs.oasis-open.org/kmip/profiles/v1.4/os/kmip-profiles-v1.4-os.html#_Toc491431527
-[asymmetric-key-lifecycle-server]: http://docs.oasis-open.org/kmip/profiles/v1.4/os/kmip-profiles-v1.4-os.html#_Toc491431516
-[advanced-cryptographic-server]: http://docs.oasis-open.org/kmip/profiles/v1.4/os/kmip-profiles-v1.4-os.html#_Toc491431528
 
 ## Setup
 
@@ -112,7 +100,6 @@ The KMIP secrets engine currently supports the following set of operations:
 operation_activate
 operation_add_attribute
 operation_create
-operation_create_keypair
 operation_decrypt
 operation_delete_attribute
 operation_destroy
@@ -123,18 +110,11 @@ operation_get_attribute_list
 operation_get_attributes
 operation_import
 operation_locate
-operation_mac
-operation_mac_verify
 operation_modify_attribute
 operation_query
 operation_register
 operation_rekey
-operation_rekey_keypair
 operation_revoke
-operation_sign
-operation_signature_verify
-operation_rng_seed
-operation_rng_retrieve
 ```
 
 Additionally, there are two pseudo-operations that can be used to allow or deny
@@ -281,7 +261,7 @@ with their client certificate.
 
 ## Tutorial
 
-Refer to the [KMIP Secrets Engine](/vault/tutorials/adp/kmip-engine)
+Refer to the [KMIP Secrets Engine](https://learn.hashicorp.com/vault/secrets-management/kmip-engine)
 guide for a step-by-step tutorial.
 
 [kmip-spec]: http://docs.oasis-open.org/kmip/spec/v1.4/kmip-spec-v1.4.html
diff --git a/website/content/docs/secrets/kubernetes.mdx b/website/content/docs/secrets/kubernetes.mdx
index f6c9eb26a28fd..1285d5c4d0f38 100644
--- a/website/content/docs/secrets/kubernetes.mdx
+++ b/website/content/docs/secrets/kubernetes.mdx
@@ -23,7 +23,7 @@ and [Kubernetes RBAC](https://kubernetes.io/docs/reference/access-authn-authz/rb
 documentation.
 
 ~> **Note:** We do not recommend using tokens created by the Kubernetes Secrets Engine to
-   authenticate with the [Vault Kubernetes Auth Method](/vault/docs/auth/kubernetes). This will
+   authenticate with the [Vault Kubernetes Auth Method](/docs/auth/kubernetes). This will
    generate many unique identities in Vault that will be hard to manage.
 
 ## Setup
@@ -39,7 +39,7 @@ management tool.
 
    It's necessary to ensure that the service account Vault uses will have permissions to manage
    service account tokens, and optionally manage service accounts, roles, and role bindings. These
-   permissions can be managed using a Kubernetes role or cluster role. The role is attached to the
+   permissions can be managed using a Kuberentes role or cluster role. The role is attached to the
    Vault service account with a role binding or cluster role binding.
 
    For example, a minimal cluster role to create service account tokens is:
@@ -196,7 +196,7 @@ management tool.
    ```
 
    Configuration options are available as specified in the
-   [API docs](/vault/api-docs/secret/kubernetes).
+   [API docs](/api-docs/secret/kubernetes).
 
 1. You can now configure Kubernetes Secrets Engine to create a Vault role (**not** the same as a
    Kubernetes role) that can generate service account tokens for the given service account:
@@ -303,45 +303,6 @@ $ echo 'eyJhbGc...' | cut -d'.' -f2 | base64 -d  | jq -r '.iat,.exp|todate'
 2022-05-20T17:34:50Z
 ```
 
-## Audiences
-
-Kubernetes service account tokens have audiences.
-
-You can set default audiences (`token_default_audiences`) when creating or tuning the Vault role.
-The Kubernetes cluster default audiences for service account tokens will be used if not specified.
-
-```shell-session
-$ vault write kubernetes/roles/my-role \
-    allowed_kubernetes_namespaces="*" \
-    service_account_name="new-service-account-with-generated-token" \
-    token_default_audiences="custom-audience"
-```
-
-You can also set audiences (`audiences`) when you generate the token from the credentials endpoint.
-The audiences of the token will be given the default audiences if not specified.
-
-```shell-session
-$ vault write kubernetes/creds/my-role \
-    kubernetes_namespace=test \
-    audiences="another-custom-audience"
-
-Key                        Value
-–--                        -----
-lease_id                   kubernetes/creds/my-role/SriWQf0bPZ...
-lease_duration             768h
-lease_renwable             false
-service_account_name       new-service-account-with-generated-token
-service_account_namespace  test
-service_account_token      eyJHbGci0iJSUzI1NiIsImtpZCI6ImlrUEE...
-```
-
-You can verify the token's audiences by decoding the JWT.
-
-```shell-session
-$ echo 'eyJhbGc...' | cut -d'.' -f2 | base64 -d
-{"aud":["another-custom-audience"]...
-```
-
 ## Automatically Managing Roles and Service Accounts
 
 When configuring the Vault role, you can pass in parameters to specify that you want to
@@ -360,7 +321,7 @@ $ vault write kubernetes/roles/auto-managed-sa-role \
 
 ~> **Note**: Vault's service account will also need access to the resources it is granting
 access to. This can be done for the examples above with `kubectl -n test create rolebinding --role test-role-list-pods --serviceaccount=vault:vault vault-test-role-abilities`.
-This is how Kubernetes prevents privilege escalation.
+This is how Kuberentes prevents privilege escalation.
 You can read more in the
 [Kubernetes RBAC documentation](https://kubernetes.io/docs/reference/access-authn-authz/rbac/#privilege-escalation-prevention-and-bootstrapping).
 
@@ -404,4 +365,4 @@ service_account_token        eyJHbGci0iJSUzI1Ni...
 ## API
 
 The Kubernetes Secrets Engine has a full HTTP API. Please see the
-[Kubernetes Secrets Engine API docs](/vault/api-docs/secret/kubernetes) for more details.
+[Kubernetes Secrets Engine API docs](/api-docs/secret/kubernetes) for more details.
diff --git a/website/content/docs/secrets/kv/index.mdx b/website/content/docs/secrets/kv/index.mdx
index 815f6cdce22be..398d18910e3f3 100644
--- a/website/content/docs/secrets/kv/index.mdx
+++ b/website/content/docs/secrets/kv/index.mdx
@@ -22,7 +22,7 @@ more performant because for any given request there will be fewer storage calls
 and no locking.
 
 More information about running in this mode can be found in the [K/V Version 1
-Docs](/vault/docs/secrets/kv/kv-v1)
+Docs](/docs/secrets/kv/kv-v1)
 
 ## KV Version 2
 
@@ -39,4 +39,4 @@ command or API endpoint. Each of these operations can be ACL'ed differently,
 restricting who has permissions to soft delete, undelete, or fully remove data.
 
 More information about running in this mode can be found in the [K/V Version 2
-Docs](/vault/docs/secrets/kv/kv-v2)
+Docs](/docs/secrets/kv/kv-v2)
diff --git a/website/content/docs/secrets/kv/kv-v1.mdx b/website/content/docs/secrets/kv/kv-v1.mdx
index ba010881f3442..f87222875a8ef 100644
--- a/website/content/docs/secrets/kv/kv-v1.mdx
+++ b/website/content/docs/secrets/kv/kv-v1.mdx
@@ -28,8 +28,8 @@ secret's path.
 
 To enable a version 1 kv store:
 
-```shell-session
-$ vault secrets enable -version=1 kv
+```
+vault secrets enable -version=1 kv
 ```
 
 ## Usage
@@ -40,14 +40,14 @@ allows for writing keys with arbitrary values.
 
 1. Write arbitrary data:
 
-   ```shell-session
+   ```text
    $ vault kv put kv/my-secret my-value=s3cr3t
    Success! Data written to: kv/my-secret
    ```
 
 1. Read arbitrary data:
 
-   ```shell-session
+   ```text
    $ vault kv get kv/my-secret
    Key                 Value
    ---                 -----
@@ -56,7 +56,7 @@ allows for writing keys with arbitrary values.
 
 1. List the keys:
 
-   ```shell-session
+   ```text
    $ vault kv list kv/
    Keys
    ----
@@ -65,50 +65,11 @@ allows for writing keys with arbitrary values.
 
 1. Delete a key:
 
-   ```shell-session
+   ```
    $ vault kv delete kv/my-secret
    Success! Data deleted (if it existed) at: kv/my-secret
    ```
 
-You can also use [Vault's password policy](/vault/docs/concepts/password-policies) feature to generate arbitrary values.
-
-1. Write a password policy:
-
-   ```shell-session
-   $ vault write sys/policies/password/example policy=-<<EOF
-
-     length=20
-
-     rule "charset" {
-       charset = "abcdefghij0123456789"
-       min-chars = 1
-     }
-
-     rule "charset" {
-       charset = "!@#$%^&*STUVWXYZ"
-       min-chars = 1
-     }
-
-   EOF
-   ```
-
-1. Write data using the `example` policy:
-
-   ```shell-session
-   $ vault kv put kv/my-generated-secret \
-       password=$(vault read -field password sys/policies/password/example/generate)
-   ```
-
-1. Read the generated data:
-
-   ```shell-session
-   $ vault kv get kv/my-generated-secret
-   ====== Data ======
-   Key         Value
-   ---         -----
-   password    ^dajd609Xf8Zhac$dW24
-   ```
-
 ## TTLs
 
 Unlike other secrets engines, the KV secrets engine does not enforce TTLs
@@ -140,11 +101,11 @@ ttl                 30m
 ## Tutorial
 
 Refer to the [Static Secrets: Key/Value Secrets
-Engine](/vault/tutorials/secrets-management/static-secrets)
+Engine](https://learn.hashicorp.com/vault/secrets-management/sm-static-secrets)
 tutorial to learn how to set up a uniform workflow to securely store sensitive information.
 
 ## API
 
 The KV secrets engine has a full HTTP API. Please see the
-[KV secrets engine API](/vault/api-docs/secret/kv/kv-v1) for more
+[KV secrets engine API](/api-docs/secret/kv/kv-v1) for more
 details.
diff --git a/website/content/docs/secrets/kv/kv-v2.mdx b/website/content/docs/secrets/kv/kv-v2.mdx
index 6f26ba786cc78..4804df53ecd7f 100644
--- a/website/content/docs/secrets/kv/kv-v2.mdx
+++ b/website/content/docs/secrets/kv/kv-v2.mdx
@@ -45,7 +45,7 @@ different paths. Each instance of the KV secrets engine is isolated and unique.
 
 An existing version 1 kv store can be upgraded to a version 2 kv store via the CLI or API, as shown below. This will start an upgrade process to upgrade the existing key/value data to a versioned format. The mount will be inaccessible during this process. This process could take a long time, so plan accordingly.
 
-Once upgraded to version 2, the former paths at which the data was accessible will no longer suffice. You will need to adjust user policies to add access to the version 2 paths as detailed in the [ACL Rules section below](/vault/docs/secrets/kv/kv-v2#acl-rules). Similarly, users/applications will need to update the paths at which they interact with the kv data once it has been upgraded to version 2.
+Once upgraded to version 2, the former paths at which the data was accessible will no longer suffice. You will need to adjust user policies to add access to the version 2 paths as detailed in the [ACL Rules section below](/docs/secrets/kv/kv-v2#acl-rules). Similarly, users/applications will need to update the paths at which they interact with the kv data once it has been upgraded to version 2.
 
 An existing version 1 kv can be upgraded to a version 2 KV store with the CLI command:
 
@@ -63,9 +63,7 @@ $ cat payload.json
       "version": "2"
   }
 }
-```
 
-```shell-session
 $ curl \
     --header "X-Vault-Token: ..." \
     --request POST \
@@ -83,7 +81,7 @@ differently.
 Writing and reading versions are prefixed with the `data/` path. This policy
 that worked for the version 1 kv:
 
-```plaintext
+```
 path "secret/dev/team-1/*" {
   capabilities = ["create", "update", "read"]
 }
@@ -91,7 +89,7 @@ path "secret/dev/team-1/*" {
 
 Should be changed to:
 
-```plaintext
+```
 path "secret/data/dev/team-1/*" {
   capabilities = ["create", "update", "read"]
 }
@@ -100,7 +98,7 @@ path "secret/data/dev/team-1/*" {
 There are different levels of data deletion for this backend. To grant a policy
 the permissions to delete the latest version of a key:
 
-```plaintext
+```
 path "secret/data/dev/team-1/*" {
   capabilities = ["delete"]
 }
@@ -108,7 +106,7 @@ path "secret/data/dev/team-1/*" {
 
 To allow the policy to delete any version of a key:
 
-```plaintext
+```
 path "secret/delete/dev/team-1/*" {
   capabilities = ["update"]
 }
@@ -116,7 +114,7 @@ path "secret/delete/dev/team-1/*" {
 
 To allow a policy to undelete data:
 
-```plaintext
+```
 path "secret/undelete/dev/team-1/*" {
   capabilities = ["update"]
 }
@@ -124,7 +122,7 @@ path "secret/undelete/dev/team-1/*" {
 
 To allow a policy to destroy versions:
 
-```plaintext
+```
 path "secret/destroy/dev/team-1/*" {
   capabilities = ["update"]
 }
@@ -132,7 +130,7 @@ path "secret/destroy/dev/team-1/*" {
 
 To allow a policy to list keys:
 
-```plaintext
+```
 path "secret/metadata/dev/team-1/*" {
   capabilities = ["list"]
 }
@@ -140,7 +138,7 @@ path "secret/metadata/dev/team-1/*" {
 
 To allow a policy to view metadata for each version:
 
-```plaintext
+```
 path "secret/metadata/dev/team-1/*" {
   capabilities = ["read"]
 }
@@ -148,17 +146,17 @@ path "secret/metadata/dev/team-1/*" {
 
 To allow a policy to permanently remove all versions and metadata for a key:
 
-```plaintext
+```
 path "secret/metadata/dev/team-1/*" {
   capabilities = ["delete"]
 }
 ```
 
 The `allowed_parameters`, `denied_parameters`, and `required_parameters` fields are
-not supported for policies used with the version 2 kv store. See the [Policies Concepts](/vault/docs/concepts/policies)
+not supported for policies used with the version 2 kv store. See the [Policies Concepts](/docs/concepts/policies)
 for a description of these parameters.
 
-See the [API Specification](/vault/api-docs/secret/kv/kv-v2) for more
+See the [API Specification](/api-docs/secret/kv/kv-v2) for more
 information.
 
 ## Usage
@@ -209,11 +207,11 @@ real path).
 
 1. Write another version, the previous version will still be accessible. The
    `-cas` flag can optionally be passed to perform a check-and-set operation. If
-   not set the write will be allowed. In order for a write to be successful, `cas` must be set to
-  the current version of the secret. If set to 0 a write will only be allowed if
-  the key doesn’t exist as unset keys do not have any version information. Also
+   not set the write will be allowed. In order for a write to be successful, `cas` must be set to 
+  the current version of the secret. If set to 0 a write will only be allowed if 
+  the key doesn’t exist as unset keys do not have any version information. Also 
   remember that soft deletes do not remove any underlying version data from storage.
-  In order to write to a soft deleted key, the cas parameter must match the key's
+  In order to write to a soft deleted key, the cas parameter must match the key's 
   current version.
 
    ```shell-session
@@ -341,77 +339,6 @@ real path).
    bar         b
    ```
 
-You can also use [Vault's password policy](/vault/docs/concepts/password-policies) feature to generate arbitrary values.
-
-1. Write a password policy:
-
-   ```shell-session
-   $ vault write sys/policies/password/example policy=-<<EOF
-
-     length=20
-
-     rule "charset" {
-       charset = "abcdefghij0123456789"
-       min-chars = 1
-     }
-
-     rule "charset" {
-       charset = "!@#$%^&*STUVWXYZ"
-       min-chars = 1
-     }
-
-   EOF
-   ```
-
-1. Write data using the `example` policy:
-
-   ```shell-session
-   $ vault kv put -mount=secret my-generated-secret \
-       password=$(vault read -field password sys/policies/password/example/generate)
-   ```
-
-   **Example output:**
-
-   <CodeBlockConfig hideClipboard>
-
-   ```plaintext
-   ========= Secret Path =========
-   secret/data/my-generated-secret
-
-   ======= Metadata =======
-   Key                Value
-   ---                -----
-   created_time       2023-05-10T14:32:32.37354939Z
-   custom_metadata    <nil>
-   deletion_time      n/a
-   destroyed          false
-   version            1
-   ```
-
-   </CodeBlockConfig>
-
-1. Read the generated data:
-
-   ```shell-session
-   $ vault kv get -mount=secret my-generated-secret
-   ========= Secret Path =========
-   secret/data/my-generated-secret
-
-   ======= Metadata =======
-   Key                Value
-   ---                -----
-   created_time       2023-05-10T14:32:32.37354939Z
-   custom_metadata    <nil>
-   deletion_time      n/a
-   destroyed          false
-   version            1
-
-   ====== Data ======
-   Key         Value
-   ---         -----
-   password    !hh&be1e4j16dVc0ggae
-   ```
-
 ### Deleting and Destroying Data
 
 When deleting data the standard `vault kv delete` command will perform a
@@ -590,9 +517,7 @@ See the commands below for more information:
    ```shell-session
    $ vault kv metadata patch -mount=secret -custom-metadata=foo=def my-secret
    Success! Data written to: secret/metadata/my-secret
-   ```
 
-   ```shell-session
    $ vault kv get -mount=secret my-secret
    ====== Metadata ======
    Key              Value
@@ -620,11 +545,11 @@ See the commands below for more information:
 ## Tutorial
 
 Refer to the [Versioned Key/Value Secrets
-Engine](/vault/tutorials/secrets-management/versioned-kv)
+Engine](https://learn.hashicorp.com/vault/secrets-management/sm-versioned-kv)
 tutorial to learn how to use KV secrets engine v2 to version or roll back secrets.
 
 ## API
 
 The KV secrets engine has a full HTTP API. Please see the
-[KV secrets engine API](/vault/api-docs/secret/kv/kv-v2) for more
+[KV secrets engine API](/api-docs/secret/kv/kv-v2) for more
 details.
diff --git a/website/content/docs/secrets/ldap.mdx b/website/content/docs/secrets/ldap.mdx
index f9d6a5e44f92b..2c15239316ead 100644
--- a/website/content/docs/secrets/ldap.mdx
+++ b/website/content/docs/secrets/ldap.mdx
@@ -15,9 +15,9 @@ v3 protocol, including OpenLDAP, Active Directory, and IBM Resource Access Contr
 Facility (RACF).
 
 The secrets engine has three primary features:
-- [Static Credentials](/vault/docs/secrets/ldap#static-credentials)
-- [Dynamic Credentials](/vault/docs/secrets/ldap#dynamic-credentials)
-- [Service Account Check-Out](/vault/docs/secrets/ldap#service-account-check-out)
+- [Static Credentials](/docs/secrets/ldap#static-credentials)
+- [Dynamic Credentials](/docs/secrets/ldap#dynamic-credentials)
+- [Service Account Check-Out](/docs/secrets/ldap#service-account-check-out)
 
 ## Setup
 
@@ -77,7 +77,7 @@ For managing IBM's Resource Access Control Facility (RACF) security system, the
 engine must be configured to use the schema `racf`.
 
 Generated passwords must be 8 characters or less to support RACF. The length of the
-password can be configured using a [password policy](/vault/docs/concepts/password-policies):
+password can be configured using a [password policy](/docs/concepts/password-policies):
 
 ```bash
 $ vault write ldap/config \
@@ -225,8 +225,6 @@ password and enable the account.
 Windows NT systems and has a limit of 20 characters. Keep this in mind when defining your `username_template`.
 See [here](https://docs.microsoft.com/en-us/windows/win32/adschema/a-samaccountname) for additional details.
 
-Since the default `username_template` is longer than 20 characters which follows the template of `v_{{.DisplayName}}_{{.RoleName}}_{{random 10}}_{{unix_time}}`, we recommend customising the `username_template` on the role configuration to generate accounts with names less than 20 characters. Please refer to the [username templating document](/vault/docs/concepts/username-templating) for more information.
-
 With regard to adding dynamic users to groups, AD doesn't let you directly modify a user's `memberOf` attribute.
 The `member` attribute of a group and `memberOf` attribute of a user are
 [linked attributes](https://docs.microsoft.com/en-us/windows/win32/ad/linked-attributes). Linked attributes are
@@ -272,7 +270,7 @@ by a person or by machines. Vault will automatically rotate the password each ti
 service account is checked in. Service accounts can be voluntarily checked in, or Vault
 will check them in when their lending period (or, "ttl", in Vault's language) ends.
 
-The service account check-out functionality works with various [schemas](/vault/api-docs/secret/ldap#schema),
+The service account check-out functionality works with various [schemas](/api-docs/secret/ldap#schema),
 including OpenLDAP, Active Directory, and RACF. In the following usage example, the secrets
 engine is configured to manage a library of service accounts in an Active Directory instance.
 
@@ -304,7 +302,7 @@ In this example, the service account names of `fizz@example.com` and `buzz@examp
 already been created on the remote AD server. They've been set aside solely for Vault to handle.
 The `ttl` is how long each check-out will last before Vault checks in a service account,
 rotating its password during check-in. The `max_ttl` is the maximum amount of time it can live
-if it's renewed. These default to `24h`, and both use [duration format strings](/vault/docs/concepts/duration-format).
+if it's renewed. These default to `24h`, and both use [duration format strings](/docs/concepts/duration-format).
 Also by default, a service account must be checked in by the same Vault entity or client token that
 checked it out. However, if this behavior causes problems, set `disable_check_in_enforcement=true`.
 
@@ -397,7 +395,7 @@ check_ins    [fizz@example.com]
 ```
 
 To perform a check-in, Vault verifies that the caller _should_ be able to check in a given service account.
-To do this, Vault looks for either the same [entity ID](/vault/tutorials/auth-methods/identity)
+To do this, Vault looks for either the same [entity ID](https://learn.hashicorp.com/tutorials/vault/identity)
 used to check out the service account, or the same client token.
 
 If a caller is unable to check in a service account, or simply doesn't try,
@@ -422,7 +420,7 @@ All revocation operations queued successfully!
 
 This engine previously allowed configuration of the length of the password that is generated
 when rotating credentials. This mechanism was deprecated in Vault 1.5 in favor of
-[password policies](/vault/docs/concepts/password-policies). This means the `length` field should
+[password policies](/docs/concepts/password-policies). This means the `length` field should
 no longer be used. The following password policy can be used to mirror the same behavior
 that the `length` field provides:
 
@@ -464,5 +462,5 @@ olcPPolicyUseLockout: TRUE
 
 ## API
 
-The LDAP secrets engine has a full HTTP API. Please see the [LDAP secrets engine API docs](/vault/api-docs/secret/ldap)
+The LDAP secrets engine has a full HTTP API. Please see the [LDAP secrets engine API docs](/api-docs/secret/ldap)
 for more details.
diff --git a/website/content/docs/secrets/mongodbatlas.mdx b/website/content/docs/secrets/mongodbatlas.mdx
index 5d2cd62d57552..d935b79b1c0b1 100644
--- a/website/content/docs/secrets/mongodbatlas.mdx
+++ b/website/content/docs/secrets/mongodbatlas.mdx
@@ -188,4 +188,4 @@ $ vault read mongodbatlas/creds/test
 ## API
 
 The MongoDB Atlas secrets engine has a full HTTP API. Please see the
-[MongoDB Atlas secrets engine API docs](/vault/api-docs/secret/mongodbatlas) for more details.
+[MongoDB Atlas secrets engine API docs](/api-docs/secret/mongodbatlas) for more details.
diff --git a/website/content/docs/secrets/nomad.mdx b/website/content/docs/secrets/nomad.mdx
index 8edf56a4db93f..fcd44949d342d 100644
--- a/website/content/docs/secrets/nomad.mdx
+++ b/website/content/docs/secrets/nomad.mdx
@@ -10,7 +10,8 @@ description: The Nomad secrets engine for Vault generates tokens for Nomad dynam
 
 Name: `Nomad`
 
-Nomad is a simple, flexible scheduler and workload orchestrator. The Nomad secrets engine for Vault generates [Nomad](https://www.nomadproject.io/)
+Nomad is a simple, flexible scheduler and workload orchestrator. The Nomad
+secrets secrets engine for Vault generates [Nomad](https://www.nomadproject.io/)
 ACL tokens dynamically based on pre-existing Nomad ACL policies.
 
 This page will show a quick start for this secrets engine. For detailed documentation
@@ -36,7 +37,7 @@ Success! Data written to: nomad/config/lease
 ```
 
 For a quick start, you can use the SecretID token provided by the [Nomad ACL bootstrap
-process](/nomad/tutorials/access-control#generate-the-initial-token), although this
+process](https://learn.hashicorp.com/collections/nomad/access-control#generate-the-initial-token), although this
 is discouraged for production deployments.
 
 ```shell-session
@@ -53,7 +54,7 @@ Modify Index = 7
 ```
 
 The suggested pattern is to generate a token specifically for Vault, following the
-[Nomad ACL guide](/nomad/tutorials/access-control)
+[Nomad ACL guide](https://learn.hashicorp.com/collections/nomad/access-control)
 
 Next, we must configure Vault to know how to contact Nomad.
 This is done by writing the access information:
@@ -113,11 +114,11 @@ Modify Index = 138
 ## Tutorial
 
 Refer to [Generate Nomad Tokens with HashiCorp
-Vault](/nomad/tutorials/integrate-vault/vault-nomad-secrets) for a
+Vault](https://learn.hashicorp.com/tutorials/nomad/vault-nomad-secrets) for a
 step-by-step tutorial.
 
 ## API
 
 The Nomad secrets engine has a full HTTP API. Please see the
-[Nomad Secrets Engine API](/vault/api-docs/secret/nomad) for more
+[Nomad Secrets Engine API](/api-docs/secret/nomad) for more
 details.
diff --git a/website/content/docs/secrets/pki/considerations.mdx b/website/content/docs/secrets/pki/considerations.mdx
index cdb72415279ce..ad03d6b989357 100644
--- a/website/content/docs/secrets/pki/considerations.mdx
+++ b/website/content/docs/secrets/pki/considerations.mdx
@@ -25,11 +25,8 @@ generating the CA to use with this secrets engine.
    - [Cluster Performance and Quantity of Leaf Certificates](#cluster-performance-and-quantity-of-leaf-certificates)
  - [You must configure issuing/CRL/OCSP information _in advance_](#you-must-configure-issuingcrlocsp-information-_in-advance_)
  - [Distribution of CRLs and OCSP](#distribution-of-crls-ocsp)
- - [Automate CRL Building and Tidying](#automate-crl-building-and-tidying)
- - [Spectrum of Revocation Support](#spectrum-of-revocation-support)
-   - [What Are Cross-Cluster CRLs?](#what-are-cross-cluster-crls)
- - [Issuer Subjects and CRLs](#issuer-subjects-and-crls)
  - [Automate Leaf Certificate Renewal](#automate-leaf-certificate-renewal)
+ - [Automate CRL Building and Tidying](#automate-crl-building-and-tidying)
  - [Safe Minimums](#safe-minimums)
  - [Token Lifetimes and Revocation](#token-lifetimes-and-revocation)
  - [Safe Usage of Roles](#safe-usage-of-roles)
@@ -39,6 +36,7 @@ generating the CA to use with this secrets engine.
  - [Replicated DataSets](#replicated-datasets)
  - [Cluster Scalability](#cluster-scalability)
  - [PSS Support](#pss-support)
+ - [Issuer Subjects and CRLs](#issuer-subjects-and-crls)
  - [Issuer Storage Migration Issues](#issuer-storage-migration-issues)
 
 ## Be Careful with Root CAs
@@ -62,7 +60,7 @@ root CA (which may be a second mount of the `pki` secrets engine).
 ### Managed Keys
 
 Since 1.10, Vault Enterprise can access private key material in a
-[_managed key_](/vault/docs/enterprise/managed-keys).  In this case, Vault never sees the
+[_managed key_](/docs/enterprise/managed-keys).  In this case, Vault never sees the
 private key, and the external KMS or HSM performs certificate signing operations.
 Managed keys are configured by selecting the `kms` type when generating a root
 or intermediate.
@@ -112,7 +110,7 @@ mount can decide which to use.
 
 ### Always Configure a Default Issuer
 
-For backwards compatibility, [the default issuer](/vault/api-docs/secret/pki#read-issuers-configuration)
+For backwards compatibility, [the default issuer](/api-docs/secret/pki#read-issuers-configuration)
 is used to service PKI endpoints without an explicit issuer (either via path
 selection or role-based selection). When certificates are revoked and their
 issuer is no longer part of this PKI mount, Vault places them on the default
@@ -155,8 +153,8 @@ performance of easier-to-rotate intermediates and certificates (such as
 TLS intermediates).
 
 Vault supports the use of both the [`allowed_domains` parameter on
-Roles](/vault/api-docs/secret/pki#allowed_domains) and the [`permitted_dns_domains`
-parameter to set the Name Constraints extension](/vault/api-docs/secret/pki#permitted_dns_domains)
+Roles](/api-docs/secret/pki#allowed_domains) and the [`permitted_dns_domains`
+parameter to set the Name Constraints extension](/api-docs/secret/pki#permitted_dns_domains)
 on root and intermediate generation. This allows for several layers of
 separation of concerns between TLS-based services.
 
@@ -225,7 +223,7 @@ is down.
 
 In Vault 1.11.0, the PKI Secrets Engine has introduced a new
 `leaf_not_after_behavior` [parameter on
-issuers](/vault/api-docs/secret/pki#leaf_not_after_behavior).
+issuers](/api-docs/secret/pki#leaf_not_after_behavior).
 This allows modification of the issuance behavior: should Vault `err`,
 preventing issuance of a longer-lived leaf cert than issuer, silently
 `truncate` to that of the issuer's `NotAfter` value, or `permit` longer
@@ -239,7 +237,7 @@ In combination with a cascading expiration with longer lived roots (perhaps
 on the range of 2-10 years), shorter lived intermediates (perhaps on the
 range of 6 months to 2 years), and short-lived leaf certificates (on the
 range of 30 to 90 days), and the [rotation strategies discussed in other
-sections](/vault/docs/secrets/pki/rotation-primitives), this should keep the
+sections](/docs/secrets/pki/rotation-primitives), this should keep the
 CRLs adequately small.
 
 ### Cluster Performance and Quantity of Leaf Certificates
@@ -250,7 +248,7 @@ this is a scale problem: 10-1000 long-lived, stored certificates are probably
 fine, but 50k-100k become a problem and 500k+ stored, unexpired certificates
 can negatively impact even large Vault clusters--even with short TTLs!
 
-However, once these certificates are expired, a [tidy operation](/vault/api-docs/secret/pki#tidy)
+However, once these certificates are expired, a [tidy operation](/api-docs/secret/pki#tidy)
 will clean up CRLs and Vault cluster storage.
 
 Note that organizational risk assessments for certificate compromise might
@@ -266,7 +264,7 @@ Having a shorter TTL decreases the likelihood of needing to revoke a cert
 compromise.
 
 ~> Note: As of Vault 1.12, the PKI Secret Engine's [Bring-Your-Own-Cert
-    (BYOC)](/vault/api-docs/secret/pki#revoke-certificate)
+    (BYOC)](/api-docs/secret/pki#revoke-certificate)
    functionality allows revocation of certificates not previously stored
    (e.g., issued via a role with `no_store=true`). This means that setting
    `no_store=true` _is now_ safe to be used globally, regardless of importance
@@ -302,6 +300,15 @@ OCSP responses are signed by the issuing CA within Vault). This means both are
 fine to distribute over non-secure and non-authenticated channels, such as
 HTTP.
 
+## Automate Leaf Certificate Renewal
+
+As much as possible, for managing certificates for services at scale, it is
+best to automate renewal of certificates. Vault agent [has support for
+automatically renewing requested certificates](/docs/agent/template#certificates)
+based on the `validTo` field. Other solutions might involve using
+[cert-manager](https://cert-manager.io/) in Kubernetes or OpenShift, backed
+by the Vault CA.
+
 ## Automate CRL Building and Tidying
 
 Since Vault 1.12, the PKI Secrets Engine supports automated CRL rebuilding
@@ -311,130 +318,6 @@ revoked and expired certificates can be configured automatically via the
 `/config/auto-tidy` endpoint. Both of these should be enabled to ensure
 compatibility with the wider PKIX ecosystem and performance of the cluster.
 
-## Spectrum of Revocation Support
-
-Starting with Vault 1.13, the PKI secrets engine has the ability to support a
-spectrum of cluster sizes and certificate revocation quantities.
-
-For users with few revocations or who want a unified view and have the
-inter-cluster bandwidth to support it, we recommend turning on auto
-rebuilding of CRLs, cross-cluster revocation queues, and cross-cluster CRLs.
-This allows all consumers of the CRLs to have the most accurate picture of
-revocations, regardless of which cluster they talk to.
-
-If the unified CRL becomes too big for the underlying storage mechanism or
-for a single host to build, we recommend relying on OCSP instead of CRLs.
-These have much smaller storage entries, and the CRL `disabled` flag is
-independent of `unified_crls`, allowing unified OCSP to remain.
-
-However, when cross-cluster traffic becomes too high (or if CRLs are still
-necessary in addition to OCSP), we recommend sharding the CRL between
-different clusters. This has been the default behavior of Vault, but with
-the introduction of per-cluster, templated AIA information, the leaf
-certificate's Authority Information Access (AIA) info will point directly
-to the cluster which issued it, allowing the correct CRL for this cert to
-be identified by the application. This more correctly mimics the behavior
-of [Let's Encrypt's CRL sharding](https://letsencrypt.org/2022/09/07/new-life-for-crls.html).
-
-This sharding behavior can also be used for OCSP, if the cross-cluster
-traffic for revocation entries becomes too high.
-
-For users who wish to manage revocation manually, using the audit logs to
-track certificate issuance would allow an external system to identify which
-certificates were issued. These can be manually tracked for revocation, and
-a [custom CRL can be built](/vault/api-docs/secret/pki#combine-crls-from-the-same-issuer)
-using externally tracked revocations. This would allow usage of roles set to
-`no_store=true`, so Vault is strictly used as an issuing authority and isn't
-storing any certificates, issued or revoked. For the highest of revocation
-volumes, this could be the best option.
-
-Notably, this last approach can either be used for the creation of externally
-stored unified or sharded CRLs. If a single external unified CRL becomes
-unreasonably large, each cluster's certificates could have AIA info point
-to an externally stored and maintained, sharded CRL. However,
-Vault has no mechanism to sign OCSP requests at this time.
-
-### What Are Cross-Cluster CRLs?
-
-Vault Enterprise supports a clustering mode called [Performance
-Replication](/vault/docs/enterprise/replication#performance-replication). In
-a replicated PKI Secrets Engine mount, issuer and role information is synced
-between the Performance Primary and all Performance Secondary clusters.
-However, each Performance Secondary cluster has its own local storage of
-issued certificates and revocations which is not synced. In Vault versions
-before 1.13, this meant that each of these clusters had its own CRL and
-OCSP data, and any revocation requests needed to be processed on the
-cluster that issued it (or BYOC used).
-
-Starting with Vault 1.13, we've added [two
-features](/vault/api-docs/secret/pki#read-crl-configuration) to Vault
-Enterprise to help manage this setup more correctly and easily: revocation
-request queues (`cross_cluster_revocation=true` in `config/crl`) and unified
-revocation entries (`unified_crl=true` in `config/crl`).
-
-The former allows operators (revoking by serial number) to request a
-certificate be revoked regardless of which cluster it was issued on. For
-example, if a request goes into the Performance Primary, but it didn't
-issue the certificate, it'll write a cross-cluster revocation request,
-and mark the results as pending. If another cluster already has this
-certificate in storage, it will revoke it and confirm the revocation back
-to the main cluster. An operator can [list pending
-revocations](/vault/api-docs/secret/pki#list-revocation-requests) to see
-the status of these requests. To clean up invalid requests (e.g., if the
-cluster which had that certificate disappeared, if that certificate was
-issued with `no_store=true` on the role, or if it was an invalid serial
-number), an operator can [use tidy](/vault/api-docs/secret/pki#tidy) with
-`tidy_revocation_queue=true`, optionally shortening
-`revocation_queue_safety_buffer` to remove them quicker.
-
-The latter allows all clusters to have a unified view of revocations,
-that is, to have access to a list of revocations performed by other clusters.
-While the configuration parameter includes `crl` in the description, this
-applies to [both CRLs](/vault/api-docs/secret/pki#read-issuer-crl) and the
-[OCSP responder](/vault/api-docs/secret/pki#ocsp-request). When this
-revocation replication occurs, if any cluster considers a cert revoked when
-another doesn't (e.g., via BYOC revocation of a `no_store=false` certificate),
-all clusters will now consider it revoked assuming it hasn't expired. Notably,
-the active node of the primary cluster will be used to rebuild the CRL; as
-this can grow large if many clusters have lots of revoked certs, an operator
-might need to disable CRL building (`disabled=true` in `config/crl`) or
-increase the [storage size](/vault/docs/configuration/storage/raft#max_entry_size).
-
-As an aside, all new cross-cluster writes (from Performance Secondary up to
-the Performance Primary) are performed synchronously. This gives the caller
-confidence that the request actually went through, at the expense of incurring
-a bit higher overhead for revoking certificates. When a node loses its GRPC
-connection (e.g., during leadership election or being otherwise unable to
-contact the active primary), errors will occur though the local portion of the
-write (if any) will still succeed. For cross-cluster revocation requests, due
-to there being no local write, this means that the operation will need to be
-retried, but in the event of an issue writing a cross-cluster revocation entry
-when the cert existed locally, the revocation will eventually be synced across
-clusters when the connection comes back.
-
-## Issuer Subjects and CRLs
-
-As noted on several [GitHub issues](https://github.com/hashicorp/vault/issues/10176),
-Go's x509 library has an opinionated parsing and structuring mechanism for
-certificate's Subjects. Issuers created within Vault are fine, but when using
-externally created CA certificates, these may not be parsed
-correctly throughout all parts of the PKI. In particular, CRLs embed a
-(modified) copy of the issuer name. This can be avoided by using OCSP to
-track revocation, but note that performance characteristics are different
-between OCSP and CRLs.
-
-~> Note: As of Go 1.20 and Vault 1.13, Go correctly formats the CRL's issuer
-   name and this notice [does not apply](https://github.com/golang/go/commit/a367981b4c8e3ae955eca9cc597d9622201155f3).
-
-## Automate Leaf Certificate Renewal
-
-To manage certificates for services at scale, it is best to automate the
-certificate renewal as much as possible. Vault Agent [has support for
-automatically renewing requested certificates](/vault/docs/agent-and-proxy/agent/template#certificates)
-based on the `validTo` field. Other solutions might involve using
-[cert-manager](https://cert-manager.io/) in Kubernetes or OpenShift, backed
-by the Vault CA.
-
 ## Safe Minimums
 
 Since its inception, this secrets engine has enforced SHA256 for signature
@@ -455,7 +338,7 @@ endpoint.
 ## Safe Usage of Roles
 
 The Vault PKI Secrets Engine supports many options to limit issuance via
-[Roles](/vault/api-docs/secret/pki#create-update-role).
+[Roles](/api-docs/secret/pki#create-update-role).
 Careful consideration of construction is necessary to ensure that more
 permissions are not given than necessary. Additionally, roles should generally
 do _one_ thing; multiple roles should be preferable over having too permissive
@@ -509,12 +392,12 @@ this mount.
    the `/pki/cert/crl` API endpoint. Additionally, the `http_raw_body` can
    be used to return CRL both in PEM and raw binary DER form, so it is
    suggested not to un-HMAC that field to not corrupt the log format.<br /><br />
-   If this is done with only a [syslog](/vault/docs/audit/syslog) audit device,
+   If this is done with only a [syslog](/docs/audit/syslog) audit device,
    Vault can deny requests (with an opaque `500 Internal Error` message)
    after the action has been performed on the server, because it was
    unable to log the message.<br /><br />
    The suggested workaround is to either leave the `certificate` and `crl`
-   response fields HMACed and/or to also enable the [`file`](/vault/docs/audit/file)
+   response fields HMACed and/or to also enable the [`file`](/docs/audit/file)
    audit log type.
 
 Some suggested keys to un-HMAC for requests are as follows:
@@ -574,7 +457,7 @@ nature:
 
 ## Role-Based Access
 
-Vault supports [path-based ACL Policies](/vault/tutorials/getting-started/getting-started-policies)
+Vault supports [path-based ACL Policies](https://learn.hashicorp.com/tutorials/vault/getting-started-policies)
 for limiting access to various paths within Vault.
 
 The following is a condensed example reference of ACLing the PKI Secrets
@@ -655,12 +538,12 @@ For these personas, we suggest the following ACLs, in condensed, tabular form:
 | `/root/replace` | Write | Yes | | | | |
 
 ~> Note: With managed keys, operators might need access to [read the mount
-   point's tunable data](/vault/api-docs/system/mounts) (Read on `/sys/mounts`) and
-   may need access [to use or manage managed keys](/vault/api-docs/system/managed-keys).
+   point's tunable data](/api-docs/system/mounts) (Read on `/sys/mounts`) and
+   may need access [to use or manage managed keys](/api-docs/system/managed-keys).
 
 ## Replicated DataSets
 
-When operating with [Performance Secondary](/vault/docs/enterprise/replication#architecture)
+When operating with [Performance Secondary](/docs/enterprise/replication#architecture)
 clusters, certain data-sets are maintained across all clusters, while others for performance
 and scalability reasons are kept within a given cluster.
 
@@ -682,7 +565,7 @@ sent to the appropriate cluster that the data was generated on.
 
 The main effect is that within the PKI secrets engine leaf certificates
 issued with `no_store` set to `false` are stored local to the cluster that issued them.
-This allows for both primary and [Performance Secondary](/vault/docs/enterprise/replication#architecture)
+This allows for both primary and [Performance Secondary](/docs/enterprise/replication#architecture)
 clusters' active node to issue certificates for greater scalability. As a
 result, these certificates and any revocations are visible only on the issuing
 cluster. This additionally means each cluster has its own set of CRLs, distinct
@@ -755,6 +638,17 @@ certain KMS devices (like HSMs and GCP) may not support this with the
 same key. As a result, the OCSP responder may fail to sign responses,
 returning an internal error.
 
+## Issuer Subjects and CRLs
+
+As noted on several [GitHub issues](https://github.com/hashicorp/vault/issues/10176),
+Go's x509 library has an opinionated parsing and structuring mechanism for
+certificate's Subjects. Issuers created within Vault are fine, but when using
+externally created CA certificates, note that these may not be parsed
+correctly throughout all parts of the PKI. In particular, CRLs embed a
+(modified) copy of the issuer name. This can be avoided by using OCSP to
+track revocation, but note that performance characteristics are different
+between OCSP and CRLs.
+
 ## Issuer Storage Migration Issues
 
 When Vault migrates to the new multi-issuer storage layout on releases prior
@@ -784,14 +678,14 @@ vault read pki/issuer/default
 
 ## Tutorial
 
-Refer to the [Build Your Own Certificate Authority (CA)](/vault/tutorials/secrets-management/pki-engine)
+Refer to the [Build Your Own Certificate Authority (CA)](https://learn.hashicorp.com/vault/secrets-management/sm-pki-engine)
 guide for a step-by-step tutorial.
 
-Have a look at the [PKI Secrets Engine with Managed Keys](/vault/tutorials/enterprise/managed-key-pki)
+Have a look at the [PKI Secrets Engine with Managed Keys](https://learn.hashicorp.com/tutorials/vault/managed-key-pki?in=vault/enterprise)
 for more about how to use externally managed keys with PKI.
 
 ## API
 
 The PKI secrets engine has a full HTTP API. Please see the
-[PKI secrets engine API](/vault/api-docs/secret/pki) for more
+[PKI secrets engine API](/api-docs/secret/pki) for more
 details.
diff --git a/website/content/docs/secrets/pki/index.mdx b/website/content/docs/secrets/pki/index.mdx
index 29dff1a97608d..899b241a89dd2 100644
--- a/website/content/docs/secrets/pki/index.mdx
+++ b/website/content/docs/secrets/pki/index.mdx
@@ -31,29 +31,29 @@ written to disk.
 
 The PKI Secrets Engine documentation is split into the following pieces:
 
- - [Overview](/vault/docs/secrets/pki) - this document.
- - [Setup and Usage](/vault/docs/secrets/pki/setup) - a brief description of setting
+ - [Overview](/docs/secrets/pki) - this document.
+ - [Setup and Usage](/docs/secrets/pki/setup) - a brief description of setting
    up and using the PKI Secrets Engine to issue certificates.
- - [Quick Start - Root CA Setup](/vault/docs/secrets/pki/quick-start-root-ca) - A
+ - [Quick Start - Root CA Setup](/docs/secrets/pki/quick-start-root-ca) - A
    quick start guide for setting up a root CA.
- - [Quick Start - Intermediate CA Setup](/vault/docs/secrets/pki/quick-start-intermediate-ca) - A
+ - [Quick Start - Intermediate CA Setup](/docs/secrets/pki/quick-start-intermediate-ca) - A
    quick start guide for setting up an intermediate CA.
- - [Considerations](/vault/docs/secrets/pki/considerations) - A list of helpful
+ - [Considerations](/docs/secrets/pki/considerations) - A list of helpful
    considerations to keep in mind when using and operating the PKI Secrets
    Engine.
- - [Rotation Primitives](/vault/docs/secrets/pki/rotation-primitives) - A document
+ - [Rotation Primitives](/docs/secrets/pki/rotation-primitives) - A document
    which explains different types of certificates used to achieve rotation.
 
 ## Tutorial
 
-Refer to the [Build Your Own Certificate Authority (CA)](/vault/tutorials/secrets-management/pki-engine)
+Refer to the [Build Your Own Certificate Authority (CA)](https://learn.hashicorp.com/vault/secrets-management/sm-pki-engine)
 guide for a step-by-step tutorial.
 
-Have a look at the [PKI Secrets Engine with Managed Keys](/vault/tutorials/enterprise/managed-key-pki)
+Have a look at the [PKI Secrets Engine with Managed Keys](https://learn.hashicorp.com/tutorials/vault/managed-key-pki?in=vault/enterprise)
 for more about how to use externally managed keys with PKI.
 
 ## API
 
 The PKI secrets engine has a full HTTP API. Please see the
-[PKI secrets engine API](/vault/api-docs/secret/pki) for more
+[PKI secrets engine API](/api-docs/secret/pki) for more
 details.
diff --git a/website/content/docs/secrets/pki/quick-start-intermediate-ca.mdx b/website/content/docs/secrets/pki/quick-start-intermediate-ca.mdx
index 1c13f5a22325c..e37127dd2cfd4 100644
--- a/website/content/docs/secrets/pki/quick-start-intermediate-ca.mdx
+++ b/website/content/docs/secrets/pki/quick-start-intermediate-ca.mdx
@@ -6,7 +6,7 @@ description: The PKI secrets engine for Vault generates TLS certificates.
 
 # PKI Secrets Engine - Quick Start - Intermediate CA Setup
 
-In the [first Quick Start guide](/vault/docs/secrets/pki/quick-start-root-ca),
+In the [first Quick Start guide](/docs/secrets/pki/quick-start-root-ca),
 certificates were issued directly from the root certificate authority.
 As described in the example, this is not a recommended practice. This guide
 builds on the previous guide's root certificate authority and creates an
@@ -259,14 +259,14 @@ OS.
 
 ## Tutorial
 
-Refer to the [Build Your Own Certificate Authority (CA)](/vault/tutorials/secrets-management/pki-engine)
+Refer to the [Build Your Own Certificate Authority (CA)](https://learn.hashicorp.com/vault/secrets-management/sm-pki-engine)
 guide for a step-by-step tutorial.
 
-Have a look at the [PKI Secrets Engine with Managed Keys](/vault/tutorials/enterprise/managed-key-pki)
+Have a look at the [PKI Secrets Engine with Managed Keys](https://learn.hashicorp.com/tutorials/vault/managed-key-pki?in=vault/enterprise)
 for more about how to use externally managed keys with PKI.
 
 ## API
 
 The PKI secrets engine has a full HTTP API. Please see the
-[PKI secrets engine API](/vault/api-docs/secret/pki) for more
+[PKI secrets engine API](/api-docs/secret/pki) for more
 details.
diff --git a/website/content/docs/secrets/pki/quick-start-root-ca.mdx b/website/content/docs/secrets/pki/quick-start-root-ca.mdx
index 17e4f5f61b6a6..8c5f365a1015f 100644
--- a/website/content/docs/secrets/pki/quick-start-root-ca.mdx
+++ b/website/content/docs/secrets/pki/quick-start-root-ca.mdx
@@ -216,14 +216,14 @@ subpath for interactive help output.
 
 ## Tutorial
 
-Refer to the [Build Your Own Certificate Authority (CA)](/vault/tutorials/secrets-management/pki-engine)
+Refer to the [Build Your Own Certificate Authority (CA)](https://learn.hashicorp.com/vault/secrets-management/sm-pki-engine)
 guide for a step-by-step tutorial.
 
-Have a look at the [PKI Secrets Engine with Managed Keys](/vault/tutorials/enterprise/managed-key-pki)
+Have a look at the [PKI Secrets Engine with Managed Keys](https://learn.hashicorp.com/tutorials/vault/managed-key-pki?in=vault/enterprise)
 for more about how to use externally managed keys with PKI.
 
 ## API
 
 The PKI secrets engine has a full HTTP API. Please see the
-[PKI secrets engine API](/vault/api-docs/secret/pki) for more
+[PKI secrets engine API](/api-docs/secret/pki) for more
 details.
diff --git a/website/content/docs/secrets/pki/rotation-primitives.mdx b/website/content/docs/secrets/pki/rotation-primitives.mdx
index 066f3bb7b0467..a51da22eed451 100644
--- a/website/content/docs/secrets/pki/rotation-primitives.mdx
+++ b/website/content/docs/secrets/pki/rotation-primitives.mdx
@@ -244,18 +244,18 @@ This construct is documented and used in several places:
 #### Execution in Vault
 
 To create a cross-signed certificate in Vault, use the [`/intermediate/cross-sign`
-endpoint](/vault/api-docs/secret/pki#generate-intermediate-csr). Here, when creating
+endpoint](/api-docs/secret/pki#generate-intermediate-csr). Here, when creating
 a cross-signature to all `cert B` to be validated by `cert A`, provide the values
 (`key_ref`, all Subject parts, &c) for `cert B` during intermediate generation.
 Then sign this CSR (using the [`/issuer/:issuer_ref/sign-intermediate`
-endpoint](/vault/api-docs/secret/pki#sign-intermediate)) with `cert A`'s reference
+endpoint](/api-docs/secret/pki#sign-intermediate)) with `cert A`'s reference
 and provide necessary values from `cert B` (e.g., Subject parts). `cert A` may
 live outside Vault. Finally, import the cross-signed certificate into Vault
-[using the `/issuers/import/cert` endpoint](/vault/api-docs/secret/pki#import-ca-certificates-and-keys).
+[using the `/issuers/import/cert` endpoint](/api-docs/secret/pki#import-ca-certificates-and-keys).
 
 If this process succeeded, and both `cert A` and `cert B` and their key
 material lives in Vault, the newly imported cross-signed certificate
-will have a `ca_chain` response field [during read](/vault/api-docs/secret/pki#read-issuer)
+will have a `ca_chain` response field [during read](/api-docs/secret/pki#read-issuer)
 containing `cert A`, and `cert B`'s `ca_chain` will contain the cross-signed
 cert and its `ca_chain` value.
 
@@ -273,7 +273,7 @@ one of these pairs of chains. This is because the leaf issuance's `ca_chain`
 parameter copies the value from signing issuer directly, rather than computing
 its own copy of the chain.
 
-To fix this, update the `manual_chain` field on the [issuers](/vault/api-docs/secret/pki#update-issuer)
+To fix this, update the `manual_chain` field on the [issuers](/api-docs/secret/pki#update-issuer)
 to include the chains of both pairs. For instance, given `intA` signed by
 `rootA` and `intB` signed by `rootB` as its cross-signed version, one
 could do the following:
@@ -358,9 +358,9 @@ same key material from the existing authority.
 #### Execution in Vault
 
 To create a reissued root certificate in Vault, use [`/issuers/generate/root/existing`
-endpoint](/vault/api-docs/secret/pki#generate-root). This allows the generation of a new
+endpoint](/api-docs/secret/pki#generate-root). This allows the generation of a new
 root certificate with the existing key material (via the `key_ref` request parameter).
-If this process succeeded, when [reading the issuer](/vault/api-docs/secret/pki#read-issuer)
+If this process succeeded, when [reading the issuer](/api-docs/secret/pki#read-issuer)
 (via `GET /issuer/:issuer_ref`), both issuers (old and reissued) will appear in
 each others' `ca_chain` response field (unless prevented so by a `manual_chain`
 value).
@@ -369,16 +369,16 @@ To create a reissued intermediate certificate in Vault, this is a three step
 process:
 
  1. Use the [`/issuers/generate/intermediate/existing`
-    endpoint](/vault/api-docs/secret/pki#generate-intermediate-csr)
+    endpoint](/api-docs/secret/pki#generate-intermediate-csr)
     to generate a new CSR with the existing key material with the `key_ref`
     request parameter.
  2. Sign this CSR via the same signing process under the same issuer. This
     step is specific to the parent CA, which may or may not be Vault.
- 3. Finally, use the [`/intermediate/set-signed` endpoint](/vault/api-docs/secret/pki#import-ca-certificates-and-keys)
+ 3. Finally, use the [`/intermediate/set-signed` endpoint](/api-docs/secret/pki#import-ca-certificates-and-keys)
     to import the signed certificate from step 2.
 
 If the process to reissue an intermediate certificate succeeded, when
-[reading the issuer](/vault/api-docs/secret/pki#read-issuer) (via
+[reading the issuer](/api-docs/secret/pki#read-issuer) (via
 `GET /issuer/:issuer_ref`), both issuers (old and reissued) will have
 the same `ca_chain` response field, except for the first entry (unless
 prevented so by a `manual_chain` value).
@@ -485,14 +485,14 @@ At this point, rotation is fully completed.
 
 ## Tutorial
 
-Refer to the [Build Your Own Certificate Authority (CA)](/vault/tutorials/secrets-management/pki-engine)
+Refer to the [Build Your Own Certificate Authority (CA)](https://learn.hashicorp.com/vault/secrets-management/sm-pki-engine)
 guide for a step-by-step tutorial.
 
-Have a look at the [PKI Secrets Engine with Managed Keys](/vault/tutorials/enterprise/managed-key-pki)
+Have a look at the [PKI Secrets Engine with Managed Keys](https://learn.hashicorp.com/tutorials/vault/managed-key-pki?in=vault/enterprise)
 for more about how to use externally managed keys with PKI.
 
 ## API
 
 The PKI secrets engine has a full HTTP API. Please see the
-[PKI secrets engine API](/vault/api-docs/secret/pki) for more
+[PKI secrets engine API](/api-docs/secret/pki) for more
 details.
diff --git a/website/content/docs/secrets/pki/setup.mdx b/website/content/docs/secrets/pki/setup.mdx
index ee9ba55809fbd..80e5f448733b1 100644
--- a/website/content/docs/secrets/pki/setup.mdx
+++ b/website/content/docs/secrets/pki/setup.mdx
@@ -107,14 +107,14 @@ the proper permission, it can generate credentials.
 
 ## Tutorial
 
-Refer to the [Build Your Own Certificate Authority (CA)](/vault/tutorials/secrets-management/pki-engine)
+Refer to the [Build Your Own Certificate Authority (CA)](https://learn.hashicorp.com/vault/secrets-management/sm-pki-engine)
 guide for a step-by-step tutorial.
 
-Have a look at the [PKI Secrets Engine with Managed Keys](/vault/tutorials/enterprise/managed-key-pki)
+Have a look at the [PKI Secrets Engine with Managed Keys](https://learn.hashicorp.com/tutorials/vault/managed-key-pki?in=vault/enterprise)
 for more about how to use externally managed keys with PKI.
 
 ## API
 
 The PKI secrets engine has a full HTTP API. Please see the
-[PKI secrets engine API](/vault/api-docs/secret/pki) for more
+[PKI secrets engine API](/api-docs/secret/pki) for more
 details.
diff --git a/website/content/docs/secrets/rabbitmq.mdx b/website/content/docs/secrets/rabbitmq.mdx
index 7671bc657876a..d0b6984878c97 100644
--- a/website/content/docs/secrets/rabbitmq.mdx
+++ b/website/content/docs/secrets/rabbitmq.mdx
@@ -94,7 +94,7 @@ the proper permission, it can generate credentials.
 ## API
 
 The RabbitMQ secrets engine has a full HTTP API. Please see the
-[RabbitMQ secrets engine API](/vault/api-docs/secret/rabbitmq) for more
+[RabbitMQ secrets engine API](/api-docs/secret/rabbitmq) for more
 details.
 
 [rmq-perms]: https://www.rabbitmq.com/management.html#permissions
diff --git a/website/content/docs/secrets/ssh/dynamic-ssh-keys.mdx b/website/content/docs/secrets/ssh/dynamic-ssh-keys.mdx
new file mode 100644
index 0000000000000..8dd217858fd60
--- /dev/null
+++ b/website/content/docs/secrets/ssh/dynamic-ssh-keys.mdx
@@ -0,0 +1,193 @@
+---
+layout: docs
+page_title: Dynamic SSH Keys - SSH - Secrets Engines
+description: |-
+  When using this type, the administrator registers a secret key with
+  appropriate sudo privileges on the remote machines. For every authorized
+  credential request, Vault creates a new SSH key pair and appends the
+  newly-generated public key to the authorized_keys file for the configured
+  username on the remote host. Vault uses a configurable install script to
+  achieve this.
+---
+
+# Dynamic SSH Keys
+
+~> **Deprecated**: There are several serious drawbacks and security implications
+inherent in this type. Because of these drawbacks, please use the SSH CA or OTP
+types whenever possible.
+
+When using this type, the administrator registers a secret key with appropriate
+`sudo` privileges on the remote machines; for every authorized credential
+request, Vault creates a new SSH key pair and appends the newly-generated public
+key to the `authorized_keys` file for the configured username on the remote
+host. Vault uses a configurable install script to achieve this.
+
+The secrets engine does not prompt for `sudo` passwords; the `NOPASSWD` option for
+sudoers should be enabled at all remote hosts for the Vault administrative
+user.
+
+The private key returned to the user will be leased and can be renewed if
+desired. Once the key is given to the user, Vault will not know when it gets
+used or how many time it gets used. Therefore, Vault **WILL NOT** and cannot
+audit the SSH session establishments.
+
+When the credential lease expires, Vault removes the secret key from the remote
+machine.
+
+This page will show a quick start for this secrets engine. For detailed documentation
+on every path, use `vault path-help` after mounting the secrets engine.
+
+### Drawbacks
+
+The dynamic key type has several serious drawbacks:
+
+1. _Audit logs are unreliable_: Vault can only log when users request
+   credentials, not when they use the given keys. If user A and user B both
+   request access to a machine, and are given a lease valid for five minutes,
+   it is impossible to know whether two accesses to that user account on the
+   remote machine were A, A; A, B; B, A; or B, B.
+2. _Generating dynamic keys consumes entropy_: Unless equipped with a hardware
+   entropy generating device, a machine can quickly run out of entropy when
+   generating SSH keys. This will cause further requests for various Vault
+   operations to stall until more entropy is available, which could take a
+   significant amount of time, after which the next request for a new SSH key
+   will use the generated entropy and cause stalling again.
+3. This type makes connections to client hosts; when this happens the host key
+   is _not_ verified.
+
+### sudo
+
+In order to adjust the `authorized_keys` file for the desired user, Vault
+connects via SSH to the remote machine as a separate user, and uses `sudo` to
+gain the privileges required. An example `sudoers` file is shown below.
+
+File: `/etc/sudoers`
+
+```hcl
+# This is a sample sudoers statement; you should modify it
+# as appropriate to satisfy your security needs.
+vaultadmin   ALL=(ALL)NOPASSWD: ALL
+```
+
+### Configuration
+
+Next, infrastructure configuration must be registered with Vault via roles.
+First, however, the shared secret key must be specified.
+
+### Mount the secrets engine
+
+```shell-session
+$ vault secrets enable ssh
+Successfully mounted 'ssh' at 'ssh'!
+```
+
+#### Registering the shared secret key
+
+Register a key with a name; this key must have administrative capabilities on
+the remote hosts.
+
+```shell-session
+$ vault write ssh/keys/dev_key \
+    key=@dev_shared_key.pem
+```
+
+#### Create a Role
+
+Next, create a role. All of the machines contained within this CIDR block list
+should be accessible using the registered shared secret key.
+
+```shell-session
+$ vault write ssh/roles/dynamic_key_role \
+    key_type=dynamic \
+    key=dev_key \
+    admin_user=username \
+    default_user=username \
+    cidr_list=x.x.x.x/y
+Success! Data written to: ssh/roles/dynamic_key_role
+```
+
+`cidr_list` is a comma separated list of CIDR blocks for which a role can
+generate credentials. If this is empty, the role can only generate credentials
+if it belongs to the set of zero-address roles.
+
+Zero-address roles, configured via `/ssh/config/zeroaddress` endpoint, takes
+comma separated list of role names that can generate credentials for any IP
+address.
+
+Use the `install_script` option to provide an install script if the remote
+hosts do not resemble a typical Linux machine. The default script is compiled
+into the Vault binary, but it is straight forward to specify an alternate. The
+script takes three arguments which are explained in the comments.
+
+To see the default, see
+[linux_install_script.go](https://github.com/hashicorp/vault/blob/main/builtin/logical/ssh/linux_install_script.go)
+
+### Create a credential
+
+Create a dynamic key for an IP of the remote host that is covered by
+`dynamic_key_role`'s CIDR list.
+
+```shell-session
+$ vault write ssh/creds/dynamic_key_role ip=x.x.x.x
+Key            	Value
+lease_id       	ssh/creds/dynamic_key_role/8c4d2042-23bc-d6a8-42c2-6ff01cb83cf8
+lease_duration 	600
+lease_renewable	true
+ip             	x.x.x.x
+key            	-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEA5V/Y95qfGaUXRPkKNK9jgDHXPD2n5Ein+QTNnLSGrHtJUH7+
+pgs/5Hc4//124P9qHNmjIYQVyvcLreFgSrQCq4K8193hmypBYtsvCgvpc+jEwaGA
+zK0QV7uc1z8KL7FuRAxpHJwB6+nubOzzqM03xsViHRhaWhYVHw2Vl4oputSHE7R9
+ugaTRg67wge4Nyi5RRL0RQcmW15/Vop8B6HpBSmZQy3enjg+32KbOWCMMTAPuF9/
+DgxSgZQaFMjGN4RjDreZI8Vv5zIiFJzZ3KVOWy8piI0PblLnDpU4Q0QSQ9A+Vr7b
+JS22Lbet1Zbapl/n947/r1wGObLCc5Lilu//1QIDAQABAoIBAHWLfdO9sETjHp6h
+BULkkpgScpuTeSN6vGHXvUrOFKn1cCfJPNR4tWBuXI6LJM2+9nEccwXs+4IMwjZ0
+ZfVCdI/SKtZxBXmP2PxBGMUMP7G/mn0kN64sDlD3ezOvQZgZVEmZFpCrvixYsG+v
+qlpZ+HhrlJEWds7tvBsyyfNjwWjVIpm08zBmteFj4zu7OEcmGXEHDoxDXxyVP2BG
+eLU/fM5JA2UEjfCQ1MIZ3rBtPePdz4LRpb+ajklqrUj1OHoiDrXa8EAf0/wDP9re
+c1iH4bn7ZjYK0+IhZ+Pmw6gUftzZNWSC2kOLnZLdN/K7hgh0l0r0K/1eeXt43upB
+WALNuiECgYEA8PM2Ob3XXKALF86PUewne4fCz9iixr/cIpvrEGrh9lyQRO8X5Jxb
+ug38jEql4a574C6TSXfzxURza4P6lnfa0LvymmW0bhxZ5nev9kcAVnLKvpOUArTR
+32k9bKXd6zp8Q9ZyVNwHRxcVs4YgwfJlcx8geC4o6YRiIjvcBQ9RVHkCgYEA87OK
+lZDFBeEY/HVOxAQNXS5fgTd4U4DbwEJLv7SPk02v9oDkGHkpgMs4PcsIpCzsTpJ0
+oXMfLSxZ1lmZiuUvAupKj/7RjJ0XyjSMfm1Zs81epWj+boVfM4amZNHVLIWgddmM
+XzXEZKByvi1gs7qFcjQz2DEbZltWO6dX14O4Fz0CgYEAlWSWyHJWZ02r0xT1c7vS
+NxtTxH7zXftzR9oYgtNiStfVc4gy7kGr9c3aOjnGZAlFMRhvpevDrxnj3lO0OTsS
+5rzBjM1mc6cMboLjDPW01eTSpBroeE0Ym0arGQQ2djSK+5yowsixknhTsj2FbfsW
+v6wa+6jTIQY9ujAXGOQIbzECgYAYuXlw7SwgCZNYYappFqQodQD5giAyEJu66L74
+px/96N7WWoNJvFkqmPOOyV+KEIi0/ATbMGvUUHCY36RFRDU9zXldHJQz+Ogl+qja
+VsvIAyj8DSfrHJrpBlsxVVyUVMZPzo+ARVs0flbF1qK9+Ul6qbMs1uaZvuCD0tmF
+ovZ1XQKBgQDB0s7SDmAMgVjG8UBZgUru9vsDrxERT2BloptnnAjSiarLF5M+qeZO
+7L4NLyVP39Z83eerEonzDAHHbvhPyi6n2YmnYhGjeP+lPZIVqGF9cpZD3q48YHZc
+3ePn2/oLZrXKWOMyMwp2Uj+0SArCW+xMnoNp50sYNVR/JK3BPIdkag==
+-----END RSA PRIVATE KEY-----
+key_type       	dynamic
+port           	22
+username       	username
+```
+
+### Establish an SSH session
+
+Save the key to a file (e.g. `dyn_key.pem`) and then use it to establish an SSH
+session.
+
+```shell-session
+$ ssh -i dyn_key.pem username@<IP of remote host>
+username@<IP of remote host>:~$
+```
+
+### Automate it!
+
+Creation of new key, saving to a file, and using it to establish an SSH session
+can all be done with a single Vault CLI command.
+
+```shell-session
+$ vault ssh -role dynamic_key_role username@<IP of remote host>
+username@<IP of remote host>:~$
+```
+
+## API
+
+The SSH secret secrets engine has a full HTTP API. Please see the
+[SSH secret secrets engine API](/api-docs/secret/ssh) for more
+details.
diff --git a/website/content/docs/secrets/ssh/index.mdx b/website/content/docs/secrets/ssh/index.mdx
index ad9f9ab221518..bc2004ab6c69d 100644
--- a/website/content/docs/secrets/ssh/index.mdx
+++ b/website/content/docs/secrets/ssh/index.mdx
@@ -3,8 +3,9 @@ layout: docs
 page_title: SSH - Secrets Engines
 description: |-
   The Vault SSH secrets engine provides secure authentication and authorization
-  for access to machines via the SSH protocol. There are two modes to the Vault
-  SSH secrets engine including signed SSH certificates and one-time passwords.
+  for access to machines via the SSH protocol. There are multiple modes to the
+  Vault SSH secrets engine including signed SSH certificates, dynamic SSH keys,
+  and one-time passwords.
 ---
 
 # SSH Secrets Engine
@@ -19,18 +20,14 @@ credentials.
 The Vault SSH secrets engine supports the following modes. Each mode is
 individually documented on its own page.
 
-- [Signed SSH Certificates](/vault/docs/secrets/ssh/signed-ssh-certificates)
-- [One-time SSH Passwords](/vault/docs/secrets/ssh/one-time-ssh-passwords)
+- [Signed SSH Certificates](/docs/secrets/ssh/signed-ssh-certificates)
+- [One-time SSH Passwords](/docs/secrets/ssh/one-time-ssh-passwords)
+- [Dynamic SSH Keys](/docs/secrets/ssh/dynamic-ssh-keys) <sup>DEPRECATED</sup>
 
 All guides assume a basic familiarity with the SSH protocol.
 
-## Removal of Dynamic Keys feature
-
-Per [Vault 1.12's deprecation notice page](/vault/docs/v1.12.x/deprecation),
-the dynamic keys functionality of this engine has been removed in Vault 1.13.
-
 ## API
 
 The SSH secrets engine has a full HTTP API. Please see the
-[SSH secrets engine API](/vault/api-docs/secret/ssh) for more
+[SSH secrets engine API](/api-docs/secret/ssh) for more
 details.
diff --git a/website/content/docs/secrets/ssh/one-time-ssh-passwords.mdx b/website/content/docs/secrets/ssh/one-time-ssh-passwords.mdx
index 085d9d29b0d18..e7a779b6f2083 100644
--- a/website/content/docs/secrets/ssh/one-time-ssh-passwords.mdx
+++ b/website/content/docs/secrets/ssh/one-time-ssh-passwords.mdx
@@ -110,11 +110,11 @@ disabled by setting `-strict-host-key-checking=no`.
 ## Tutorial
 
 Refer to the [SSH Secrets Engine: One-Time SSH
-Password](/vault/tutorials/secrets-management/ssh-otp) tutorial
+Password](https://learn.hashicorp.com/vault/secrets-management/sm-ssh-otp) tutorial
 to learn how to use the Vault SSH secrets engine to secure authentication and authorization for access to machines.
 
 ## API
 
 The SSH secrets engine has a full HTTP API. Please see the
-[SSH secrets engine API](/vault/api-docs/secret/ssh) for more
+[SSH secrets engine API](/api-docs/secret/ssh) for more
 details.
diff --git a/website/content/docs/secrets/ssh/signed-ssh-certificates.mdx b/website/content/docs/secrets/ssh/signed-ssh-certificates.mdx
index 705180b99b091..4df8dbcd43ac3 100644
--- a/website/content/docs/secrets/ssh/signed-ssh-certificates.mdx
+++ b/website/content/docs/secrets/ssh/signed-ssh-certificates.mdx
@@ -72,7 +72,7 @@ team, or configuration management tooling.
     ```
 
     Regardless of whether it is generated or uploaded, the client signer public
-    key is accessible via the API at the `/public_key` endpoint or the CLI (see next step).
+    key is accessible via the API at the `/public_key` endpoint.
 
 1.  Add the public key to all target host's SSH configuration. This process can
     be manual or automated using a configuration management tool. The public key is
@@ -539,5 +539,5 @@ Destroy the keypair and `payload.json` from your hosts immediately after they ha
 ## API
 
 The SSH secrets engine has a full HTTP API. Please see the
-[SSH secrets engine API](/vault/api-docs/secret/ssh) for more
+[SSH secrets engine API](/api-docs/secret/ssh) for more
 details.
diff --git a/website/content/docs/secrets/terraform.mdx b/website/content/docs/secrets/terraform.mdx
index d3de02b8b86d8..f2285fb3d98c3 100644
--- a/website/content/docs/secrets/terraform.mdx
+++ b/website/content/docs/secrets/terraform.mdx
@@ -45,7 +45,7 @@ management tool.
     ```
 
     See [Terraform Cloud's documentation on API
-    tokens](/terraform/cloud-docs/users-teams-organizations/api-tokens)
+    tokens](https://www.terraform.io/cloud-docs/users-teams-organizations/api-tokens)
     to determine the appropriate API token for use with the secret engine. In
     order to perform all operations, a User API token is recommended.
 
@@ -55,7 +55,7 @@ management tool.
     and manages the lifecycle of that API token. You will need to know the User
     ID in order to generate User API tokens for that user. You can use the
     Terraform Cloud [Account
-    API](/terraform/cloud-docs/api-docs/account) to find the
+    API](https://www.terraform.io/cloud-docs/api-docs/account) to find the
     desired User ID.
 
     ```shell-session
@@ -156,16 +156,16 @@ token_id        at-fqvtdTQ5kQWcjUfG
 
 Please see the [Terraform Cloud API
 Token documentation for more
-information](/terraform/cloud-docs/users-teams-organizations/api-tokens).
+information](https://www.terraform.io/cloud-docs/users-teams-organizations/api-tokens).
 
 ## Tutorial
 
 Refer to [Terraform Cloud Secrets
-Engine](/vault/tutorials/secrets-management/terraform-secrets-engine)
+Engine](https://learn.hashicorp.com/tutorials/vault/terraform-secrets-engine)
 for a step-by-step tutorial.
 
 ## API
 
 The Terraform Cloud secrets engine has a full HTTP API. Please see the
-[Terraform Cloud secrets engine API](/vault/api-docs/secret/terraform) for more
+[Terraform Cloud secrets engine API](/api-docs/secret/terraform) for more
 details.
diff --git a/website/content/docs/secrets/totp.mdx b/website/content/docs/secrets/totp.mdx
index cfe0559d758fd..038292c3e26cc 100644
--- a/website/content/docs/secrets/totp.mdx
+++ b/website/content/docs/secrets/totp.mdx
@@ -120,5 +120,5 @@ management tool.
 ## API
 
 The TOTP secrets engine has a full HTTP API. Please see the
-[TOTP secrets engine API](/vault/api-docs/secret/totp) for more
+[TOTP secrets engine API](/api-docs/secret/totp) for more
 details.
diff --git a/website/content/docs/secrets/transform/index.mdx b/website/content/docs/secrets/transform/index.mdx
index e3faf0938538d..0ebd082440386 100644
--- a/website/content/docs/secrets/transform/index.mdx
+++ b/website/content/docs/secrets/transform/index.mdx
@@ -188,7 +188,7 @@ In summary, there are three ways in which the tweak value may be sourced:
 
 Your team and organization should weigh the trade-offs when it comes to
 choosing the proper tweak source to use. For `supplied` and `internal`
-sourcing, please see [FF3-1 Tweak Usage Details](/vault/docs/secrets/transform/ff3-tweak-details)
+sourcing, please see [FF3-1 Tweak Usage Details](transform/ff3-tweak-details)
 
 #### Input Limits
 
@@ -227,7 +227,7 @@ not support retrieving the original value back using the decode operation.
 
 ### Tokenization
 
-[Tokenization](/vault/docs/secrets/transform/tokenization) exchanges a
+[Tokenization](transform/tokenization) exchanges a
 sensitive value for an unrelated value called a _token_. The original sensitive
 value cannot be recovered from a token alone, they are irreversible.
 
@@ -268,7 +268,7 @@ for external storage.
 
 #### Mapping Modes
 
-[Tokenization](/vault/docs/secrets/transform/tokenization) stores the results of an encode operation
+[Tokenization](transform/tokenization) stores the results of an encode operation
 in storage using a cryptographic construct that enhances the safety of its values.
 In the `default` mapping mode, the token itself is transformed via a one way
 function involving the transform key and elements of the token. As Vault does
@@ -288,7 +288,7 @@ imported keys.
 In addition, tokenization transformations may be configured as *convergent*, meaning
 that tokenizing a plaintext and expiration more than once results in the
 same token value.  Enabling convergence has performance and security
-[considerations](/vault/docs/secrets/transform/tokenization#convergence).
+[considerations](transform/tokenization#convergence).
 
 ## Deletion Behavior
 
@@ -353,7 +353,7 @@ transformations:
 
 ## Tutorial
 
-Refer to the [Transform Secrets Engine](/vault/tutorials/adp/transform) tutorial to learn how to use the Transform secrets engine to handle secure data transmission and tokenization against provided secrets.
+Refer to the [Transform Secrets Engine](https://learn.hashicorp.com/vault/adp/transform) tutorial to learn how to use the Transform secrets engine to handle secure data transmission and tokenization against provided secrets.
 
 ## Bring Your Own Key (BYOK)
 
@@ -407,11 +407,11 @@ either SHA-1, SHA-224, SHA-256, SHA-384, or SHA-512.
 
 6. Base64 encode the result.
 
-For more details on the key wrapping process, see the [key wrapping guide](/vault/docs/secrets/transit/key-wrapping-guide)
+For more details on the key wrapping process, see the [key wrapping guide](/docs/secrets/transit/key-wrapping-guide)
 (be sure to use the transform wrapping key when wrapping a key for import into the transform secrets engine).
 
 ## API
 
 The Transform secrets engine has a full HTTP API. Please see the
-[Transform secrets engine API](/vault/api-docs/secret/transform) for more
+[Transform secrets engine API](/api-docs/secret/transform) for more
 details.
diff --git a/website/content/docs/secrets/transform/tokenization.mdx b/website/content/docs/secrets/transform/tokenization.mdx
index f43684caac0ab..fbf0eb43b09b0 100644
--- a/website/content/docs/secrets/transform/tokenization.mdx
+++ b/website/content/docs/secrets/transform/tokenization.mdx
@@ -52,7 +52,7 @@ Some use cases may want to lookup the value of a token given its plaintext.  Ord
 this is contrary to the nature of tokenization where we want to prevent the ability
 of an attacker to determine that a token corresponds to a plaintext value (a known
 plaintext attack).  But for use cases that require it, the 
-[token lookup](/vault/api-docs/secret/transform#token-lookup)
+[token lookup](../../../api-docs/secret/transform#token-lookup)
 operation is supported, but only in some configurations of the tokenization
 transformation.  Token lookup is supported when convergence is enabled, or
 if the mapping mode is exportable *and* the storage backend is external.
@@ -138,7 +138,7 @@ can immediately reject the operation when presented with an expired token.
 
 Currently the PostgreSQL, MySQL, and MSSQL relational databases are supported as
 external storage backends for tokenization.
-The [Schema Endpoint](/vault/api-docs/secret/transform#create-update-store-schema)
+The [Schema Endpoint](../../../api-docs/secret/transform#create-update-store-schema)
 may be used to initialize and upgrade the necessary database tables. Vault uses
 a schema versioning table to determine if it needs to create or modify the
 tables when using that endpoint. If you make changes to those tables yourself,
@@ -192,10 +192,10 @@ Keys can be rotated to a new version, with backward compatibility for
 decoding. Encoding is always performed with the newest key version. Keys versions
 can be tidied as well. Keys may also be rotated automatically on a user-defined
 time interval, specified by the `auto_rotate_field` of the key config. For more
-information, see the [transform api docs](/vault/api-docs/secret/transform).
+information, see the [transform api docs](../../../api-docs/secret/transform).
 
 ## Tutorial
 
 Refer to [Tokenize Data with Transform Secrets
-Engine](/vault/tutorials/adp/tokenization) for a
+Engine](https://learn.hashicorp.com/tutorials/vault/tokenization) for a
 step-by-step tutorial.
diff --git a/website/content/docs/secrets/transit/index.mdx b/website/content/docs/secrets/transit/index.mdx
index db44a62787128..d168b0191b341 100644
--- a/website/content/docs/secrets/transit/index.mdx
+++ b/website/content/docs/secrets/transit/index.mdx
@@ -86,9 +86,6 @@ types also generate separate HMAC keys):
 - `rsa-4096`: 4096-bit RSA key; supports encryption, decryption, signing, and
   signature verification
 - `hmac`: HMAC; supporting HMAC generation and verification.
-- `managed_key`: Managed key; supports a variety of operations depending on the
-  backing key management solution. See [Managed Keys](/vault/docs/enterprise/managed-keys)
-  for more information.
 
 ~> **Note**: In FIPS 140-2 mode, the following algorithms are not certified
 and thus should not be used: `chacha20-poly1305` and `ed25519`.
@@ -99,12 +96,6 @@ supports HMAC, and behaves identically to other algorithms with
 respect to the HMAC operations but supports key import. By default,
 the HMAC key type uses a 256-bit key.
 
-RSA operations use one of the following methods:
-
- - OAEP (encrypt, decrypt), with SHA-256 hash function and MGF,
- - PSS (sign, verify), with configurable hash function also used for MGF, and
- - PKCS#1v1.5: (sign, verify), with configurable hash function.
-
 ## Convergent Encryption
 
 Convergent encryption is a mode where the same set of plaintext+context always
@@ -190,7 +181,7 @@ the proper permission, it can use this secrets engine.
 
     !> Vault HTTP API imposes a maximum request size of 32MB to prevent a denial
     of service attack. This can be tuned per [`listener`
-    block](/vault/docs/configuration/listener/tcp) in the Vault server
+    block](/docs/configuration/listener/tcp) in the Vault server
     configuration.
 
 1.  Decrypt a piece of data using the `/decrypt` endpoint with a named key:
@@ -312,16 +303,16 @@ the ciphertext for the input of the `import` endpoint:
 - Base64 encode the result.
 
 For more details about wrapping the key for import into transit, see the
-[key wrapping guide](/vault/docs/secrets/transit/key-wrapping-guide).
+[key wrapping guide](/docs/secrets/transit/key-wrapping-guide).
 
 ## Tutorial
 
 Refer to the [Encryption as a Service: Transit Secrets
-Engine](/vault/tutorials/encryption-as-a-service/eaas-transit)
+Engine](https://learn.hashicorp.com/vault/encryption-as-a-service/eaas-transit)
 tutorial to learn how to use the transit secrets engine to handle cryptographic functions on data in-transit.
 
 ## API
 
 The Transit secrets engine has a full HTTP API. Please see the
-[Transit secrets engine API](/vault/api-docs/secret/transit) for more
+[Transit secrets engine API](/api-docs/secret/transit) for more
 details.
diff --git a/website/content/docs/secrets/venafi.mdx b/website/content/docs/secrets/venafi.mdx
index fda09fb0869df..0ed5763867ece 100644
--- a/website/content/docs/secrets/venafi.mdx
+++ b/website/content/docs/secrets/venafi.mdx
@@ -24,7 +24,7 @@ workloads are the primary focus of the Venafi secrets engine. As such,
 revocation is not currently supported.
 
 The Venafi secrets engine makes use of HashiCorp Vault's
-[plugin system](/vault/docs/plugins)
+[plugin system](/docs/plugins)
 and Venafi's [VCert Client SDK](https://github.com/Venafi/vcert). If you have
 questions about the Venafi secrets engine, have an issue to report, or have
 developed improvements that you want to contribute, visit the
@@ -104,7 +104,7 @@ and any other dependencies that appear in the Venafi Cloud documentation.
 Before certificates can be issued, you must complete these steps to configure the
 Venafi secrets engine:
 
-1. Create the [directory](/vault/docs/plugins/plugin-architecture#plugin-directory)
+1. Create the [directory](/docs/plugins/plugin-architecture#plugin-directory)
    where your Vault server will look for plugins (e.g. /etc/vault/vault_plugins).
    The directory must not be a symbolic link. On macOS, for example, /etc is a
    link to /private/etc. To avoid errors, choose an alternative directory such
@@ -122,14 +122,14 @@ Venafi secrets engine:
    $ mv venafi-pki-backend /etc/vault/vault_plugins
    ```
 
-1. Update the Vault [server configuration](/vault/docs/configuration/)
+1. Update the Vault [server configuration](/docs/configuration/)
    to specify the plugin directory:
 
    ```text
    plugin_directory = "/etc/vault/vault_plugins"
    ```
 
-1. Start your Vault using the [server command](/vault/docs/commands/server).
+1. Start your Vault using the [server command](/docs/commands/server).
 
 1. Get the SHA-256 checksum of the `venafi-pki-backend` plugin binary:
 
@@ -138,7 +138,7 @@ Venafi secrets engine:
    ```
 
 1. Register the `venafi-pki-backend` plugin in the Vault
-   [system catalog](/vault/docs/plugins/plugin-architecture#plugin-catalog):
+   [system catalog](/docs/plugins/plugin-architecture#plugin-catalog):
 
    ```text
    $ vault write sys/plugins/catalog/secret/venafi-pki-backend \
@@ -186,7 +186,7 @@ Venafi secrets engine:
    Success! Data written to: venafi-pki/roles/cloud
    ```
 
-1. Lastly, configure a [role](/vault/docs/secrets/pki)
+1. Lastly, configure a [role](/docs/secrets/pki)
    that maps a name in Vault to a Venafi secret for enrollment. To see all
    options available for roles, including `ttl`, `max_ttl` and `issuer_hint`
    (for validity), use `vault path-help venafi-pki/roles/:name` after
@@ -300,6 +300,6 @@ To see all of the options available when requesting a certificate, including
 ## API
 
 Venafi Machine Identity Secrets Engine uses the same
-[Vault API](/vault/api-docs/secret/pki)
+[Vault API](/api-docs/secret/pki)
 as the built-in PKI secrets engine. Some methods, such as those for
 managing certificate authorities, do not apply.
diff --git a/website/content/docs/upgrading/index.mdx b/website/content/docs/upgrading/index.mdx
index 5ac8185aaeb00..dc52fdb91bf44 100644
--- a/website/content/docs/upgrading/index.mdx
+++ b/website/content/docs/upgrading/index.mdx
@@ -28,13 +28,13 @@ during, or after the upgrade.
 ## Integrated Storage Autopilot
 
 Vault 1.11 introduced [automated
-upgrades](/vault/docs/concepts/integrated-storage/autopilot#automated-upgrades) as
+upgrades](/docs/concepts/integrated-storage/autopilot#automated-upgrades) as
 part of the Integrated Storage Autopilot feature. If your Vault environment is
 configured to use Integrated Storage, consider leveraging this new feature to
 upgrade your Vault environment.
 
 -> **Tutorial:** Refer to the [Automate Upgrades with Vault
- Enterprise](/vault/tutorials/raft/raft-upgrade-automation)
+ Enterprise](https://learn.hashicorp.com/tutorials/vault/raft-upgrade-automation)
  tutorial for more details.
 
 ## Agent
@@ -58,7 +58,7 @@ along with the non-test cluster.
 
 ## OSS to Enterprise Installations
 
-Upgrading to Vault Enterprise installations follow the same steps as OSS upgrades except that the Vault Enterprise binary is to be used and the license file [applied](/vault/api-docs/system/license#install-license), when applicable. The Enterprise binary and license file can be obtained through your HashiCorp sales team.
+Upgrading to Vault Enterprise installations follow the same steps as OSS upgrades except that the Vault Enterprise binary is to be used and the license file [applied](/api-docs/system/license#install-license), when applicable. The Enterprise binary and license file can be obtained through your HashiCorp sales team.
 
 ## Non-HA Installations
 
@@ -73,14 +73,95 @@ upgrade notes.
 
 ## HA Installations
 
-The recommended upgrade procedure depends on the version of Vault you're currently on and the storage backend of Vault. If you're currently running on Vault 1.11 or later with Integrated Storage and you have Autopilot enabled, you should let Autopilot do the upgrade for you, as that's easier and
+!> **Important:** Note that these instructions are not relevant if you're on a
+version of Vault greater than or equal to 1.11 and you have Autopilot enabled.
+If so, you should let Autopilot do the upgrade for you, as that's easier and
 less prone to human error. Please refer to our [automated
-upgrades](/vault/docs/concepts/integrated-storage/autopilot#automated-upgrades) documentation for information on this feature and our
+upgrades](/docs/concepts/integrated-storage/autopilot#automated-upgrades)
+documentation for information on this feature and our
 [Automate Upgrades with Vault
-Enterprise](/vault/tutorials/raft/raft-upgrade-automation)
+Enterprise](https://learn.hashicorp.com/tutorials/vault/raft-upgrade-automation)
 tutorial for more details.
 
-If you're currently on a version of Vault before 1.11, or you've chosen to opt-out the Autopilot automated upgrade features when running Vault after 1.11 with Integrated Storage, or if you are running Vault with other storage backend such as Consul. Please refer to our [Vault HA upgrades Pre 1.11/Without Autopilot Upgrade Automation](/vault/docs/upgrading/vault-ha-upgrade) documentation for more details. Please note that this upgrade procedure also applies if you are upgrading Vault from pre 1.11 to post 1.11.
+This is our recommended upgrade procedure if you're on a version of Vault before
+1.11, or you've chosen not to use Autopilot. However, you should consider how to
+apply these steps to your particular setup since HA setups can differ on whether
+a load balancer is in use, what addresses clients are being given to connect to
+Vault (standby + leader, leader-only, or discovered via service discovery), etc.
 
+Whatever method you use, you should ensure that you never fail over from a
+newer version of Vault to an older version. Our suggested procedure is designed
+to prevent this.
 
+Please note that Vault does not support true zero-downtime upgrades, but with
+proper upgrade procedure the downtime should be very short (a few hundred
+milliseconds to a second depending on how the speed of access to the storage
+backend).
 
+Perform these steps on each standby:
+
+1. Properly shut down Vault on the standby node via `SIGINT` or `SIGTERM`
+2. Replace the Vault binary with the new version; ensure that `mlock()` capability is added to the new binary with [setcap](/docs/configuration#disable_mlock)
+3. Start the standby node
+4. Unseal the standby node
+5. Verify `vault status` shows correct Version and HA Mode is `standby`
+6. Review the node's logs to ensure successful startup and unseal
+
+At this point all standby nodes will be upgraded and ready to take over. The
+upgrade will not be complete until one of the upgraded standby nodes takes over
+active duty. To do this:
+
+1. Properly shut down the remaining (active) node
+
+   ~> **Note:** It is important that you shut the node down properly.
+   This will perform a step-down and release the HA lock, allowing a standby
+   node to take over with a very short delay.
+   If you kill Vault without letting it release the lock, a standby node will
+   not be able to take over until the lock's timeout period has expired. This
+   is backend-specific but could be ten seconds or more.
+
+2. Replace the Vault binary with the new version; ensure that `mlock()` capability is added to the new binary with [setcap](/docs/configuration#disable_mlock)
+3. Start the node
+4. Unseal the node
+5. Verify `vault status` shows correct Version and HA Mode is `standby`
+6. Review the node's logs to ensure successful startup and unseal
+
+Internal upgrade tasks will happen after one of the upgraded standby nodes
+takes over active duty.
+
+Be sure to also read and follow any instructions in the version-specific
+upgrade notes.
+
+## Replication Installations
+
+-> **Note:** Prior to any upgrade, be sure to also read and follow any instructions in the version-specific
+upgrade notes which are found in the navigation menu for this documentation.
+
+Upgrading installations of Vault which participate in [Enterprise Replication](/docs/enterprise/replication) requires the following basic order of operations:
+
+- **Upgrade the replication secondary instances first** using appropriate
+  guidance from the previous sections depending on whether each secondary
+  instance is Non-HA or HA
+- Verify functionality of each secondary instance after upgrading
+- When satisfied with functionality of upgraded secondary instances, upgrade
+  the primary instance
+
+~> **Note:** It is not safe to replicate from a newer version of Vault to an
+older version. When upgrading replicated clusters, ensure that upstream clusters
+are always on older versions of Vault than downstream clusters.
+
+Here is an example of upgrading four Vault replicated Vault clusters:
+
+![Upgrading multiple replicated clusters](/img/vault-replication-upgrade.png)
+
+In the above scenario, the ideal upgrade procedure would be as follows,
+verifying functionality after each cluster upgrade.
+
+1. Upgrade Clusters B and D, using the HA upgrade process above. These clusters
+   have no downstream clusters, so they should be upgraded first, but the
+   ordering of B vs D does not matter.
+2. Upgrade Cluster C, which now has an upgraded downstream cluster (Cluster D).
+   Because Cluster C is a cluster, it should also use the HA upgrade process.
+3. Finally, upgrade Cluster A. All clusters downstream of A will already be
+   upgraded. It should be upgraded last, as it is a Performance Primary and a DR
+   Primary.
diff --git a/website/content/docs/upgrading/plugins.mdx b/website/content/docs/upgrading/plugins.mdx
index 3bf71daa2544d..bc4f3e6ff0872 100644
--- a/website/content/docs/upgrading/plugins.mdx
+++ b/website/content/docs/upgrading/plugins.mdx
@@ -12,9 +12,8 @@ The following procedures detail steps for upgrading a plugin that has been mount
 at a path on a running server. The steps are the same whether the plugin being
 upgraded is built-in or external.
 
-~> [Plugin versioning](/vault/docs/plugins#plugin-versioning) was introduced
-  with Vault 1.12.0, so if your Vault server is on 1.11.x or earlier, see the
-  [1.11.x version of this page](/vault/docs/v1.11.x/upgrading/plugins)
+~> Plugin versioning was introduced with Vault 1.12.0, so if your Vault server is
+  on 1.11.x or earlier, see the [1.11.x version of this page](/docs/v1.11.x/upgrading/plugins)
   for plugin upgrade instructions.
 
 ### Upgrading auth and secrets plugins
@@ -26,7 +25,7 @@ an auth plugin, just replace all usages of `secrets` or `secret` with `auth`.
    Skip this step if your initial plugin is built-in or already registered.
 
     ```shell-session
-    $ vault plugin register \
+    $ vault plugin register
         -sha256=<SHA256 Hex value of the plugin binary> \
         secret \
         my-secret-plugin
@@ -65,7 +64,7 @@ an auth plugin, just replace all usages of `secrets` or `secret` with `auth`.
    $ vault secrets list -detailed
    ```
 
-1. Finally, trigger a [plugin reload](/vault/docs/commands/plugin/reload) to reload all
+1. Finally, trigger a [plugin reload](/docs/commands/plugin/reload) to reload all
    mounted backends using that plugin or a subset of the mounts using that plugin
    with either the `plugin` or `mounts` flag respectively.
 
@@ -179,11 +178,11 @@ transit             v1.12.0+builtin.vault
   to manage schema upgrades and downgrades. Check the plugin release notes for
   any unsupported upgrade or downgrade transitions, especially before moving to
   a new major version or downgrading.
-* Existing Vault [leases](/vault/docs/concepts/lease) and [tokens](/vault/docs/concepts/tokens)
+* Existing Vault [leases](/docs/concepts/lease) and [tokens](/docs/concepts/tokens)
   are generally unaffected by plugin upgrades and reloads. This is because the lifecycle
   of leases and tokens is handled by core systems within Vault. The plugin itself only
   handles renewal and revocation of them when it’s requested by those core systems.
 
-[plugin_reload_api]: /vault/api-docs/system/plugins-reload-backend
-[plugin_registration]: /vault/docs/plugins/plugin-architecture#plugin-registration
-[plugin_management]: /vault/docs/plugins/plugin-management#enabling-disabling-external-plugins
+[plugin_reload_api]: /api-docs/system/plugins-reload-backend
+[plugin_registration]: /docs/plugins/plugin-architecture#plugin-registration
+[plugin_management]: /docs/plugins/plugin-management#enabling-disabling-external-plugins
diff --git a/website/content/docs/upgrading/upgrade-to-0.10.2.mdx b/website/content/docs/upgrading/upgrade-to-0.10.2.mdx
index e90569baaeb67..84b8688900365 100644
--- a/website/content/docs/upgrading/upgrade-to-0.10.2.mdx
+++ b/website/content/docs/upgrading/upgrade-to-0.10.2.mdx
@@ -15,9 +15,9 @@ for Vault 0.10.2 compared to 0.10.1. Please read it carefully.
 
 If you are using `transit`'s convergent encryption feature, which prior to this
 release was at version 2, we recommend
-[rotating](/vault/api-docs/secret/transit#rotate-key)
+[rotating](/api-docs/secret/transit#rotate-key)
 your encryption key (the new key will use version 3) and
-[rewrapping](/vault/api-docs/secret/transit#rewrap-data)
+[rewrapping](/api-docs/secret/transit#rewrap-data)
 your data to mitigate the chance of offline plaintext-confirmation attacks.
 
 ### PKI duration return types
diff --git a/website/content/docs/upgrading/upgrade-to-0.11.0.mdx b/website/content/docs/upgrading/upgrade-to-0.11.0.mdx
index 1477c780e3993..739b4f9895538 100644
--- a/website/content/docs/upgrading/upgrade-to-0.11.0.mdx
+++ b/website/content/docs/upgrading/upgrade-to-0.11.0.mdx
@@ -136,9 +136,9 @@ allowing it to be set manually didn't make sense.
 
 If you are using `transit`'s convergent encryption feature, which prior to this
 release was at version 2, we recommend
-[rotating](/vault/api-docs/secret/transit#rotate-key)
+[rotating](/api-docs/secret/transit#rotate-key)
 your encryption key (the new key will use version 3) and
-[rewrapping](/vault/api-docs/secret/transit#rewrap-data)
+[rewrapping](/api-docs/secret/transit#rewrap-data)
 your data to mitigate the chance of offline plaintext-confirmation attacks.
 
 ### PKI duration return types
diff --git a/website/content/docs/upgrading/upgrade-to-0.6.0.mdx b/website/content/docs/upgrading/upgrade-to-0.6.0.mdx
index 4d1098c377412..5d9d4806fc920 100644
--- a/website/content/docs/upgrading/upgrade-to-0.6.0.mdx
+++ b/website/content/docs/upgrading/upgrade-to-0.6.0.mdx
@@ -50,5 +50,5 @@ If using the Consul HA storage backend, Vault will now automatically register
 itself as the `vault` service and perform its own health checks/lifecycle
 status management. This behavior can be adjusted or turned off in Vault's
 configuration; see the
-[documentation](/vault/docs/configuration/storage/consul#check_timeout)
+[documentation](/docs/configuration/storage/consul#check_timeout)
 for details.
diff --git a/website/content/docs/upgrading/upgrade-to-0.6.1.mdx b/website/content/docs/upgrading/upgrade-to-0.6.1.mdx
index 6ff4fd4f10f22..9b13518f48aef 100644
--- a/website/content/docs/upgrading/upgrade-to-0.6.1.mdx
+++ b/website/content/docs/upgrading/upgrade-to-0.6.1.mdx
@@ -15,7 +15,7 @@ carefully.
 
 Once an active node is running 0.6.1, only standby nodes running 0.6.1+ will be
 able to form an HA cluster. If following our [general upgrade
-instructions](/vault/docs/upgrading) this will
+instructions](/docs/upgrading) this will
 not be an issue.
 
 ## Health Endpoint Status Code Changes
@@ -38,7 +38,7 @@ each status code (including `500`).
 
 Root tokens (tokens with the `root` policy) can no longer be created except by
 another root token or the
-[`generate-root`](/vault/api-docs/system/generate-root)
+[`generate-root`](/api-docs/system/generate-root)
 endpoint or CLI command.
 
 ## PKI Backend Certificates Will Contain Default Key Usages
@@ -49,14 +49,14 @@ compatibility with some software that requires strict adherence to RFCs, such
 as OpenVPN.
 
 This behavior is fully adjustable; see the [PKI backend
-documentation](/vault/docs/secrets/pki) for
+documentation](/docs/secrets/pki) for
 details.
 
 ## DynamoDB Does Not Support HA By Default
 
 If using DynamoDB and want to use HA support, you will need to explicitly
 enable it in Vault's configuration; see the
-[documentation](/vault/docs/configuration#ha_storage)
+[documentation](/docs/configuration#ha_storage)
 for details.
 
 If you are already using DynamoDB in an HA fashion and wish to keep doing so,
@@ -82,7 +82,7 @@ unfortunately has the side effect that `memberOf` is no longer searched for by
 default, which is a breaking change for many existing setups.
 
 `Scenario 2` in the [updated
-documentation](/vault/docs/auth/ldap) shows an
+documentation](/docs/auth/ldap) shows an
 example of configuring the backend to query `memberOf`. It is recommended that
 a test Vault server be set up and that successful authentication can be
 performed using the new configuration before upgrading a primary or production
@@ -96,7 +96,7 @@ configuration can be specified successfully.
 ## App-ID is Deprecated
 
 With the addition of the new [AppRole
-backend](/vault/docs/auth/approle), App-ID is
+backend](/docs/auth/approle), App-ID is
 deprecated. There are no current plans to remove it, but we encourage using
 AppRole whenever possible, as it offers enhanced functionality and can
 accommodate many more types of authentication paradigms. App-ID will receive
diff --git a/website/content/docs/upgrading/upgrade-to-0.6.2.mdx b/website/content/docs/upgrading/upgrade-to-0.6.2.mdx
index 077c68258c622..235a60c53a515 100644
--- a/website/content/docs/upgrading/upgrade-to-0.6.2.mdx
+++ b/website/content/docs/upgrading/upgrade-to-0.6.2.mdx
@@ -15,7 +15,7 @@ for Vault 0.6.2. Please read it carefully.
 
 In 0.6.1 this feature was in beta and required opting-in, but is now enabled by
 default. This can be disabled via the `"disable_clustering"` parameter in
-Vault's [config](/vault/docs/configuration), or
+Vault's [config](/docs/configuration), or
 per-request with the `X-Vault-No-Request-Forwarding` header.
 
 ## AppRole Role Constraints
diff --git a/website/content/docs/upgrading/upgrade-to-0.8.0.mdx b/website/content/docs/upgrading/upgrade-to-0.8.0.mdx
index 9d18421290c1d..49bb0300d8c8a 100644
--- a/website/content/docs/upgrading/upgrade-to-0.8.0.mdx
+++ b/website/content/docs/upgrading/upgrade-to-0.8.0.mdx
@@ -49,4 +49,4 @@ is performing an explicit reindex.
 This path was meant to require `sudo` capability but was not implemented this
 way. It now requires `sudo` capability to run.
 
-[reindex]: /vault/api-docs/system/replication#reindex-replication
+[reindex]: /api-docs/system/replication#reindex-replication
diff --git a/website/content/docs/upgrading/upgrade-to-0.9.0.mdx b/website/content/docs/upgrading/upgrade-to-0.9.0.mdx
index f977bcc91c204..2db1197f4a8a7 100644
--- a/website/content/docs/upgrading/upgrade-to-0.9.0.mdx
+++ b/website/content/docs/upgrading/upgrade-to-0.9.0.mdx
@@ -117,5 +117,5 @@ corresponding object containing the `key_type`.
 Audit request and response entries are still in RFC3339 format but now have a
 granularity of nanoseconds.
 
-[generate-root]: /vault/api-docs/secret/pki#generate-root
-[pkcs11-seal]: /vault/docs/configuration/seal/pkcs11
+[generate-root]: /api-docs/secret/pki#generate-root
+[pkcs11-seal]: /docs/configuration/seal/pkcs11
diff --git a/website/content/docs/upgrading/upgrade-to-0.9.3.mdx b/website/content/docs/upgrading/upgrade-to-0.9.3.mdx
index b929e013f2753..2f2ea7443bec8 100644
--- a/website/content/docs/upgrading/upgrade-to-0.9.3.mdx
+++ b/website/content/docs/upgrading/upgrade-to-0.9.3.mdx
@@ -12,4 +12,4 @@ Due to a rapid release following 0.9.2, there are no version-specific upgrade
 instructions although any upgrade notices for 0.9.2 apply if you are coming
 from a previous version.
 
-Please see the [0.9.2 upgrade guide](/vault/docs/upgrading/upgrade-to-0.9.2) for notes on upgrading to 0.9.3.
+Please see the [0.9.2 upgrade guide](/docs/upgrading/upgrade-to-0.9.2) for notes on upgrading to 0.9.3.
diff --git a/website/content/docs/upgrading/upgrade-to-1.10.x.mdx b/website/content/docs/upgrading/upgrade-to-1.10.x.mdx
index 15dd4db044775..41e58adf0eb71 100644
--- a/website/content/docs/upgrading/upgrade-to-1.10.x.mdx
+++ b/website/content/docs/upgrading/upgrade-to-1.10.x.mdx
@@ -26,10 +26,10 @@ was deprecated with the release of [Etcd v3.5](https://etcd.io/blog/2021/announc
 and will be decommissioned in a forthcoming Etcd release.
 
 Users of the `etcd` storage backend with the etcdv2 API that are
-upgrading to Vault 1.10 should [migrate](/vault/docs/commands/operator/migrate)
+upgrading to Vault 1.10 should [migrate](/docs/commands/operator/migrate)
 Vault storage to an Etcd v3 cluster prior to upgrading to Vault 1.10.
 All storage migrations should have
-[backups](/vault/docs/concepts/storage#backing-up-vault-s-persisted-data)
+[backups](/docs/concepts/storage#backing-up-vault-s-persisted-data)
 taken prior to migration.
 
 ## OTP Generation Process
@@ -41,7 +41,7 @@ of the change in the prefix from hvs. to s. for service tokens.
 
 ## New error response for requests to perf standbys lagging behind active node
 
-The introduction of [Server Side Consistent Tokens](/vault/docs/faq/ssct) means that
+The introduction of [Server Side Consistent Tokens](/docs/faq/ssct) means that
 when issuing a request to a perf standby right after having obtained a token (e.g.
 via login), if the token and its lease haven't yet been replicated to the perf
 standby, an HTTP 412 error will be returned.  Before 1.10.0 this typically would've
@@ -59,11 +59,11 @@ Additionally, non-root service tokens are now longer than before. Previously, se
 were 26 characters; they now have a minimum of 95 characters. However, existing tokens will
 still work.
 
-Refer to the [Server Side Consistent Token FAQ](/vault/docs/faq/ssct) for details.
+Refer to the [Server Side Consistent Token FAQ](/docs/faq/ssct) for details.
 
 ## OIDC Provider Built-in Resources
 
-In Vault 1.9, the [OIDC identity provider](/vault/docs/secrets/identity/oidc-provider) feature
+In Vault 1.9, the [OIDC identity provider](/docs/secrets/identity/oidc-provider) feature
 was released as a tech preview. In Vault 1.10, built-in resources were introduced to the
 OIDC provider system to reduce configuration steps and enhance usability.
 
@@ -75,14 +75,14 @@ The following built-in resources are included in each Vault namespace starting w
  - An `allow_all` assignment which authorizes all Vault entities to authenticate via a
    client application
 
-If you created an [OIDC provider](/vault/api-docs/secret/identity/oidc-provider#create-or-update-a-provider)
-with the name `default`, [key](/vault/api-docs/secret/identity/tokens#create-a-named-key) with the
-name `default`, or [assignment](/vault/api-docs/secret/identity/oidc-provider#create-or-update-an-assignment)
+If you created an [OIDC provider](/api-docs/secret/identity/oidc-provider#create-or-update-a-provider)
+with the name `default`, [key](/api-docs/secret/identity/tokens#create-a-named-key) with the
+name `default`, or [assignment](/api-docs/secret/identity/oidc-provider#create-or-update-an-assignment)
 with the name `allow_all` using the Vault 1.9 tech preview, the installation of these built-in
 resources will be skipped. We _strongly recommend_ that you delete any existing resources
 that have naming collisions before upgrading to Vault 1.10. Failing to delete resources with
 naming collisions could result unexpected default behavior. Additionally, we recommend reading
-the corresponding details in the OIDC provider [concepts](/vault/docs/concepts/oidc-provider) document
+the corresponding details in the OIDC provider [concepts](/docs/concepts/oidc-provider) document
 to understand how the built-in resources are used in the system.
 
 ## Known Issues
@@ -95,7 +95,7 @@ to understand how the built-in resources are used in the system.
 
 ### Errors returned by perf standbys lagging behind active node with Consul storage
 
-The introduction of [Server Side Consistent Tokens](/vault/docs/faq/ssct) means that
+The introduction of [Server Side Consistent Tokens](/docs/faq/ssct) means that
 when issuing a request to a perf standby right after having obtained a token (e.g.
 via login), if the token and its lease haven't yet been replicated to the perf
 standby, an HTTP 412 error will be returned.  Before 1.10.0 this wouldn't have
@@ -103,9 +103,9 @@ resulted in the client seeing errors with Consul storage.
 
 ### Single Vault follower restart causes election even with established quorum
 
-We now support Server Side Consistent Tokens (See [Replication](/vault/docs/configuration/replication) and [Vault Eventual Consistency](/vault/docs/enterprise/consistency)), which introduces a new token format that can only be used on nodes of 1.10 or higher version. This new format is enabled by default upon upgrading to the new version. Old format tokens can be read by Vault 1.10, but the new format Vault 1.10 tokens cannot be read by older Vault versions.
+We now support Server Side Consistent Tokens (See [Replication](/docs/configuration/replication) and [Vault Eventual Consistency](/docs/enterprise/consistency)), which introduces a new token format that can only be used on nodes of 1.10 or higher version. This new format is enabled by default upon upgrading to the new version. Old format tokens can be read by Vault 1.10, but the new format Vault 1.10 tokens cannot be read by older Vault versions.
 
-For more details, see the [Server Side Consistent Tokens FAQ](/vault/docs/faq/ssct).
+For more details, see the [Server Side Consistent Tokens FAQ](/docs/faq/ssct).
 
 Since service tokens are always created on the leader, as long as the leader is not upgraded before performance standbys, service tokens will be of the old format and still be usable during the upgrade process. However, the usual upgrade process we recommend can't be relied upon to always upgrade the leader last. Due to this known [issue](https://github.com/hashicorp/vault/issues/14153), a Vault cluster using Integrated Storage may result in a leader not being upgraded last, and this can trigger a re-election. This re-election can cause the upgraded node to become the leader, resulting in the newly created tokens on the leader to be unusable on nodes that have not yet been upgraded. Note that this issue does not impact Vault OSS users.
 
@@ -123,7 +123,7 @@ When adding or modifying a Duo MFA method for step-up Enterprise MFA using the `
 
 Signing in to the Vault UI using an OIDC auth mount listed in the "tabs" of the form will result
 in the following error: "Authentication failed: role with oidc role_type is not allowed".
-The auth mounts listed in the "tabs" of the form are those that have [listing_visibility](/vault/api-docs/system/auth#listing_visibility-1)
+The auth mounts listed in the "tabs" of the form are those that have [listing_visibility](/api-docs/system/auth#listing_visibility-1)
 set to `unauth`.
 
 There is a workaround for this error that will allow you to sign in to Vault using the OIDC
diff --git a/website/content/docs/upgrading/upgrade-to-1.11.x.mdx b/website/content/docs/upgrading/upgrade-to-1.11.x.mdx
index f288e7af1a92a..0a03292518d63 100644
--- a/website/content/docs/upgrading/upgrade-to-1.11.x.mdx
+++ b/website/content/docs/upgrading/upgrade-to-1.11.x.mdx
@@ -16,7 +16,7 @@ for Vault 1.11.x compared to 1.10. Please read it carefully.
 The Elaticsearch Database Secrets Engine now uses the new `/_security` base API
 path instead of `/_xpack/security` when managing Elasticsearch. If users are on
 an Elasticsearch version prior to 6, they will need to switch back to the old
-API path by setting the [bool config option](/vault/api-docs/secret/databases/elasticdb#use_old_xpack)
+API path by setting the [bool config option](/api-docs/secret/databases/elasticdb#use_old_xpack)
 `use_old_xpack=true`.
 
 ## Changes
diff --git a/website/content/docs/upgrading/upgrade-to-1.12.x.mdx b/website/content/docs/upgrading/upgrade-to-1.12.x.mdx
index c0e62d429cca0..2d24e06f14937 100644
--- a/website/content/docs/upgrading/upgrade-to-1.12.x.mdx
+++ b/website/content/docs/upgrading/upgrade-to-1.12.x.mdx
@@ -78,9 +78,9 @@ remediations if you have any affected mounts:
 
 * Upgrade Vault directly to 1.12.2 once released
 * Upgrade to an external version of the plugin before upgrading to 1.12.1;
-  * Using the [tune API](/vault/api-docs/system/auth#tune-auth-method) for auth methods
-  * Using the [tune API](/vault/api-docs/system/mounts#tune-mount-configuration) for secrets plugins
-  * Or using the [configure connection](/vault/api-docs/secret/databases#configure-connection)
+  * Using the [tune API](/api-docs/system/auth#tune-auth-method) for auth methods
+  * Using the [tune API](/api-docs/system/mounts#tune-mount-configuration) for secrets plugins
+  * Or using the [configure connection](/api-docs/secret/databases#configure-connection)
     API for database plugins
 * Unmount and remount the path without a version specified before upgrading to 1.12.1.
   **Note:** This will delete all data and leases associated with the mount.
@@ -119,13 +119,13 @@ app-id                               auth        v1.12.0+builtin.vault
 ```
 
 The remediation for affected mounts is to set the
-[VAULT_ALLOW_PENDING_REMOVAL_MOUNTS](/vault/docs/commands/server#vault_allow_pending_removal_mounts)
+[VAULT_ALLOW_PENDING_REMOVAL_MOUNTS](/docs/commands/server#vault_allow_pending_removal_mounts)
 environment variable and replace any `Pending Removal` feature with the
 [preferred alternative
-feature](/vault/docs/deprecation/faq#q-what-should-i-do-if-i-use-mount-filters-appid-or-any-of-the-standalone-db-engines).
+feature](/docs/deprecation/faq#q-what-should-i-do-if-i-use-mount-filters-appid-or-any-of-the-standalone-db-engines).
 
 For more information on the phases of deprecation, see the [Deprecation Notices
-FAQ](/vault/docs/deprecation/faq#q-what-are-the-phases-of-deprecation).
+FAQ](/docs/deprecation/faq#q-what-are-the-phases-of-deprecation).
 
 #### Impacted Versions
 
@@ -135,7 +135,7 @@ are unaffected.
 ### `vault plugin list` fails when audit logging is enabled
 
 If audit logging is enabled, Vault will fail to audit the response from any
-calls to the [`GET /v1/sys/plugins/catalog`](/vault/api-docs/system/plugins-catalog#list-plugins)
+calls to the [`GET /v1/sys/plugins/catalog`](/api-docs/system/plugins-catalog#list-plugins)
 endpoint, which causes the whole request to fail and return a 500 internal
 server error. From the CLI, this looks like the following:
 
@@ -155,7 +155,7 @@ It will produce errors in Vault Server's logs such as:
   |
 ```
 
-As a workaround, [listing plugins by type](/vault/api-docs/system/plugins-catalog#list-plugins-1)
+As a workaround, [listing plugins by type](/api-docs/system/plugins-catalog#list-plugins-1)
 will succeed:
 
 * `vault list sys/plugins/catalog/auth`
@@ -199,17 +199,3 @@ vault write auth/ldap/config max_page_size=-1
 #### Impacted Versions
 
 Affects Vault 1.12.6.
-
-### Slow Startup Time When Storing PKI Certificates 
-
-There was a regression introduced in 1.12.0 where Vault is slow to start because the 
-PKI secret engine performs a list operation on the stored certificates. If a large number 
-of certificates are stored this can cause long start times on active and standby nodes.
-
-There is currently no workaround for this other than limiting the number of certificates stored
-in Vault via the [PKI tidy](/vault/api-docs/secret/pki#tidy) or using `no_store`
-flag for [PKI roles](/vault/api-docs/secret/pki#createupdate-role).
-
-#### Impacted Versions
-
-Affects Vault 1.12.0+
diff --git a/website/content/docs/upgrading/upgrade-to-1.13.x.mdx b/website/content/docs/upgrading/upgrade-to-1.13.x.mdx
deleted file mode 100644
index 7372a3c6099c0..0000000000000
--- a/website/content/docs/upgrading/upgrade-to-1.13.x.mdx
+++ /dev/null
@@ -1,159 +0,0 @@
----
-layout: docs
-page_title: Upgrading to Vault 1.13.x - Guides
-description: |-
-  This page contains the list of deprecations and important or breaking changes
-  for Vault 1.13.x. Please read it carefully.
----
-
-# Overview
-
-This page contains the list of deprecations and important or breaking changes
-for Vault 1.13.x compared to 1.12. Please read it carefully.
-
-## Changes
-
-@include 'consul-dataplane-upgrade-note.mdx'
-
-### Active Directory Secrets Engine Deprecation
-
-The Active Directory (AD) secrets engine has been deprecated as of the Vault 1.13 release.
-We will continue to support the AD secrets engine in maintenance mode for six major Vault
-releases. Maintenance mode means that we will fix bugs and security issues but will not add
-new features. For additional information, see the [deprecation table](/vault/docs/deprecation)
-and [migration guide](/vault/docs/secrets/ad/migration-guide).
-
-### AliCloud Auth Role Parameter
-
-The AliCloud auth plugin will now require the `role` parameter on login. This
-has always been documented as a required field but the requirement will now be
-enforced.
-
-### Mounts associated with removed builtin plugins will result in core shutdown on upgrade
-
-As of 1.13.0 Standalone (logical) DB Engines and the AppId Auth Method have been
-marked with the `Removed` status. Any attempt to unseal Vault with
-mounts backed by one of these builtin plugins will result in an immediate
-shutdown of the Vault core.
-
--> **NOTE** In the event that an external plugin with the same name and type as
-a deprecated builtin is deregistered, any subsequent unseal will continue to
-unseal with an unusable auth backend, and a corresponding ERROR log.
-
-```shell-session
-$ vault plugin register -sha256=c805cf3b69f704dfcd5176ef1c7599f88adbfd7374e9c76da7f24a32a97abfe1 auth app-id
-Success! Registered plugin: app-id
-$ vault auth enable -plugin-name=app-id plugin
-Success! Enabled app-id auth method at: app-id/
-$ vault auth list -detailed | grep "app-id"
-app-id/    app-id    auth_app-id_3a8f2e24    system         system     default-service    replicated     false        false                      map[]      n/a                        0018263c-0d64-7a70-fd5c-50e05c5f5dc3    n/a        n/a                      c805cf3b69f704dfcd5176ef1c7599f88adbfd7374e9c76da7f24a32a97abfe1    n/a
-$ vault plugin deregister auth app-id
-Success! Deregistered plugin (if it was registered): app-id
-$ vault plugin list -detailed | grep "app-id"
-app-id                               auth        v1.13.0+builtin.vault                                 removed
-$ curl --header "X-Vault-Token: $VAULT_TOKEN" --request POST http://127.0.0.2:8200/v1/sys/seal
-$ vault operator unseal <key1>
-...
-$ vault operator unseal <key2>
-...
-$ vault operator unseal <key3>
-...
-$ grep "app-id" /path/to/vault.log
-[ERROR] core: skipping deprecated auth entry: name=app-id path=app-id/ error="mount entry associated with removed builtin"
-[ERROR] core: skipping initialization for nil auth backend: path=app-id/ type=app-id version="v1.13.0+builtin.vault"
-```
-
-The remediation for affected mounts is to downgrade to the previously-used version of Vault
-environment variable and replace any `Removed` feature with the
-[preferred alternative
-feature](/vault/docs/deprecation/faq#q-what-should-i-do-if-i-use-mount-filters-appid-or-any-of-the-standalone-db-engines).
-
-For more information on the phases of deprecation, see the [Deprecation Notices
-FAQ](/vault/docs/deprecation/faq#q-what-are-the-phases-of-deprecation).
-
-#### Impacted Versions
-
-Affects upgrading from any version of Vault to 1.13.x. All other upgrade paths
-are unaffected.
-
-## Known Issues
-
-@include 'tokenization-rotation-persistence.mdx'
-
-@include 'ocsp-redirect.mdx'
-
-### PKI Revocation Request Forwarding
-
-If a revocation request comes in to a standby or performance secondary node,
-for a certificate that is present locally, the request will not be correctly
-forwarded to the active node of this cluster.
-
-As a workaround, submit revocation requests to the active node only.
-
-### STS credentials do not return a lease_duration
-Vault 1.13.0 introduced a change to the AWS Secrets Engine such that it no longer creates leases for STS credentials due
-to the fact that they cannot be revoked or renewed. As part of this change, a bug was introduced which causes `lease_duration`
-to always return zero. This prevents the Vault Agent from refreshing STS credentials and may introduce undesired behaviour
-for anything which relies on a non-zero `lease_duration`.
-
-For applications that can control what value to look for, the `ttl` value in the response can be used to know when to
-request STS credentials next.
-
-An additional workaround for users rendering STS credentials via the Vault Agent is to set the
-`static-secret-render-interval` for a template using the credentials. Setting this configuration to 15 minutes
-accommodates the default minimum duration of an STS token and overrides the default render interval of 5 minutes.
-
-#### Impacted Versions
-
-Affects Vault 1.13.0 only.
-
-### LDAP Pagination Issue
-
-There was a regression introduced in 1.13.2 relating to LDAP maximum page sizes, resulting in
-an error `no LDAP groups found in groupDN [...] only policies from locally-defined groups available`.  The issue
-occurs when upgrading Vault with an instance that has an existing LDAP Auth configuration.
-
-As a workaround, disable paged searching using the following:
-```shell-session
-vault write auth/ldap/config max_page_size=-1
-```
-
-#### Impacted Versions
-
-Affects Vault 1.13.2.
-
-### PKI Cross-Cluster Revocation Requests and Unified CRL/OCSP
-
-When revoking certificates on a cluster that doesn't own the
-certificate, writing the revocation request will fail with
-a message like `error persisting cross-cluster revocation request`.
-Similar errors will appear in the log for failure to write
-unified CRL and unified delta CRL WAL entries.
-
-As a workaround, submit revocation requests to the cluster which
-issued the certificate, or use BYOC revocation. Use cluster-local
-OCSP and CRLs until this is resolved.
-
-#### Impacted Versions
-
-Affects Vault 1.13.0 to 1.13.2. Fixed in 1.13.3.
-
-On upgrade, all local revocations will be synchronized between
-clusters; revocation requests are not persisted when failing to
-write cross-cluster.
-
-### Slow Startup Time When Storing PKI Certificates 
-
-There was a regression introduced in 1.13.0 where Vault is slow to start because the
-PKI secret engine performs a list operation on the stored certificates. If a large number
-of certificates are stored this can cause long start times on active and standby nodes.
-
-There is currently no workaround for this other than limiting the number of certificates stored 
-in Vault via the [PKI tidy](/vault/api-docs/secret/pki#tidy) or using `no_store` 
-flag for [PKI roles](/vault/api-docs/secret/pki#createupdate-role).
-
-#### Impacted Versions
-
-Affects Vault 1.13.0+
-
-@include 'perf-standby-token-create-forwarding-failure.mdx'
\ No newline at end of file
diff --git a/website/content/docs/upgrading/upgrade-to-1.14.x.mdx b/website/content/docs/upgrading/upgrade-to-1.14.x.mdx
deleted file mode 100644
index fe3d5e7417883..0000000000000
--- a/website/content/docs/upgrading/upgrade-to-1.14.x.mdx
+++ /dev/null
@@ -1,25 +0,0 @@
----
-layout: docs
-page_title: Upgrading to Vault 1.14.x - Guides
-description: |-
-  This page contains the list of deprecations and important or breaking changes
-  for Vault 1.14.x. Please read it carefully.
----
-
-# Overview
-
-This page contains the list of deprecations and important or breaking changes
-for Vault 1.14.x compared to 1.13. Please read it carefully.
-
-~> Note: these are **draft** notes for a future version of Vault. They should not be considered
-official guidance until the release has been completed.
-
-## Changes
-
-
-
-## Known Issues
-
-@include 'ui-pki-control-groups-known-issue.mdx'
-
-
diff --git a/website/content/docs/upgrading/upgrade-to-1.3.0.mdx b/website/content/docs/upgrading/upgrade-to-1.3.0.mdx
index dac71b5095232..2731b689b3077 100644
--- a/website/content/docs/upgrading/upgrade-to-1.3.0.mdx
+++ b/website/content/docs/upgrading/upgrade-to-1.3.0.mdx
@@ -42,9 +42,9 @@ reauthenticate.
 ## Filtered Mount Replication Deprecation
 
 As of 1.3.0, paths that were once filtered with
-[Filtered Mount Replication](/vault/api-docs/system/replication/replication-performance#create-mounts-filter-deprecated)
+[Filtered Mount Replication](/api-docs/system/replication/replication-performance#create-mounts-filter-deprecated)
 are migrated to use
-[Filtered Paths Replication](/vault/api-docs/system/replication/replication-performance#create-paths-filter).
+[Filtered Paths Replication](/api-docs/system/replication/replication-performance#create-paths-filter).
 The APIs are very similar, but as of 1.3.0, we have marked the mount filter API as
 deprecated and recommend migrating to the path filter API, as the mount filter
 API will be removed in a future version of Vault.
diff --git a/website/content/docs/upgrading/upgrade-to-1.5.0.mdx b/website/content/docs/upgrading/upgrade-to-1.5.0.mdx
index 676a06cf5687f..e32f903f2c4db 100644
--- a/website/content/docs/upgrading/upgrade-to-1.5.0.mdx
+++ b/website/content/docs/upgrading/upgrade-to-1.5.0.mdx
@@ -15,7 +15,7 @@ for Vault 1.5.0 compared to 1.4.1. Please read it carefully.
 
 The deprecated `credentials_file` config option has been removed. The `GOOGLE_APPLICATION_CREDENTIALS`
 environment variable or default credentials may be used instead. See
-[GCS Authentication](/vault/docs/configuration/storage/google-cloud-storage#gcs-authentication)
+[GCS Authentication](https://www.vaultproject.io/docs/configuration/storage/google-cloud-storage#gcs-authentication)
 for details on supported options.
 
 ## Raft Configuration
@@ -29,12 +29,12 @@ configuration is 1MiB.
 In addition, a new metric has been introduced, `vault.raft-storage.entry_size`,
 that allows for operators to sample the entry size, view the average, and adjust
 the configuration value as necessary. For additional details, please see
-[Raft configuration](/vault/docs/configuration/storage/raft).
+[Raft configuration](/docs/configuration/storage/raft).
 
 ## Enabling telemetry on 32-bit systems will cause Vault to crash.
 
 A workaround for this issue is to disable collection of usage gauges in
-the [telemetry](/vault/docs/configuration/telemetry) stanza of the configuration.
+the [telemetry](/docs/configuration/telemetry) stanza of the configuration.
 
 ```
 telemetry {
@@ -55,7 +55,7 @@ modified to make this operation impossible. The metrics collection process crash
 this while counting the number of KV secrets.
 
 A workaround for this issue is to disable collection of usage gauges in
-the [telemetry](/vault/docs/configuration/telemetry) stanza of the configuration.
+the [telemetry](/docs/configuration/telemetry) stanza of the configuration.
 
 ```
 telemetry {
@@ -69,7 +69,7 @@ This will disable all the metrics listed in the previous section. Or, set the en
 
 ## Non-string values in seal config prevent startup
 
-Any values in the [Seal configuration stanza](/vault/docs/configuration/seal)
+Any values in the [Seal configuration stanza](/docs/configuration/seal)
 that are not quoted strings yield a parse error of the form:
 
 ```
diff --git a/website/content/docs/upgrading/upgrade-to-1.6.0.mdx b/website/content/docs/upgrading/upgrade-to-1.6.0.mdx
index 6660b5089c270..aca95ad35feaf 100644
--- a/website/content/docs/upgrading/upgrade-to-1.6.0.mdx
+++ b/website/content/docs/upgrading/upgrade-to-1.6.0.mdx
@@ -33,13 +33,13 @@ modifications via replication.
 ## Database Engine Interface Upgrade
 
 The Database Engine has changed the underlying interface between Vault and each database
-implementation. This change allows use of [password policies](/vault/docs/concepts/password-policies)
+implementation. This change allows use of [password policies](/docs/concepts/password-policies)
 within the Database engine. The API for the Database Engine has not changed, only the underlying
 interface between Vault and the database plugins. All built-in database plugins (as well as the
 [Oracle](https://github.com/hashicorp/vault-plugin-database-oracle) plugin) have been upgraded to
 the new interface so no user actions are needed. Vault will continue to recognize existing custom
 database plugins but the old interface should be considered deprecated and may be removed in a
-future release. See our [upgrade guide for custom databases](/vault/docs/secrets/databases/custom) for
+future release. See our [upgrade guide for custom databases](/docs/secrets/databases/custom) for
 more information on upgrading custom database plugins.
 
 @include 'alpine-314.mdx'
diff --git a/website/content/docs/upgrading/upgrade-to-1.7.x.mdx b/website/content/docs/upgrading/upgrade-to-1.7.x.mdx
index 90300d4719d59..325ecac30f200 100644
--- a/website/content/docs/upgrading/upgrade-to-1.7.x.mdx
+++ b/website/content/docs/upgrading/upgrade-to-1.7.x.mdx
@@ -33,7 +33,7 @@ have been updated to more inclusive language (e.g. `/auth/aws/identity-whitelist
 updated to`/auth/aws/identity-accesslist`). The old and new endpoints are aliases,
 sharing the same underlying data. The legacy endpoint names are considered **deprecated**
 and will be removed in a future release (not before Vault 1.9). The complete list of
-endpoint changes is available in the [AWS Auth API docs](/vault/api-docs/auth/aws#deprecations-effective-in-vault-1-7).
+endpoint changes is available in the [AWS Auth API docs](/api-docs/auth/aws#deprecations-effective-in-vault-1-7).
 
 @include 'alpine-314.mdx'
 
diff --git a/website/content/docs/upgrading/upgrade-to-1.8.x.mdx b/website/content/docs/upgrading/upgrade-to-1.8.x.mdx
index fad33d7ccd9e3..e047c80e23d35 100644
--- a/website/content/docs/upgrading/upgrade-to-1.8.x.mdx
+++ b/website/content/docs/upgrading/upgrade-to-1.8.x.mdx
@@ -15,14 +15,14 @@ for Vault 1.8.x compared to 1.7. Please read it carefully.
 
 Licenses and EULA enhancements have been introduced in the Vault 1.8 release.
 These changes are important for Enterprise customers to review. They do not affect
-OSS users. Please see the [License](/vault/docs/enterprise/license) documentation for more details.
+OSS users. Please see the [License](/docs/enterprise/license) documentation for more details.
 
 ## Deprecations
 
 The following API endpoints have been deprecated and will be removed in a future release:
 
 * `sys/license` to manage licenses in storage; it is recommended to use
-   [License Autoloading](/vault/docs/enterprise/license/autoloading) instead.
+   [License Autoloading](/docs/enterprise/license/autoloading) instead.
 
 * `/gcp/token/:roleset` and `/gcp/key/:roleset` paths for generating secrets for rolesets
   in GCP Secrets. Use `/gcp/roleset/:roleset/token` and `/gcp/roleset/:roleset/key` instead.
@@ -59,7 +59,7 @@ Vault Enterprise binaries for `arm64` architectures will crash immediately when
 
 ### AWS auth
 
-AWS Auth using the [EC2 method](/vault/docs/auth/aws#ec2-auth-method) fails with the error `failed to verify the signature`. This effects 1.8.0 and 1.8.1 and there is not a workaround. The issue was fixed in Vault 1.8.2.
+AWS Auth using the [EC2 method](https://www.vaultproject.io/docs/auth/aws#ec2-auth-method) fails with the error `failed to verify the signature`. This effects 1.8.0 and 1.8.1 and there is not a workaround. The issue was fixed in Vault 1.8.2.
 
 ### Configuration files in RedHat packages
 
@@ -68,4 +68,4 @@ the defaults when a new package was installed. This [issue](https://github.com/h
 
 ### Introduction of rolesets
 
-The introduction of `/gcp/roleset/:roleset/token` and `/gcp/roleset/:roleset/key` could inadvertently give users the ability to generate tokens and key if globs are used in policies. To avoid issues like this, globs should be avoided in policies to help adhere to the principle of least privilege. See the [roleset documentation](/vault/docs/secrets/gcp#rolesets) for more information.
+The introduction of `/gcp/roleset/:roleset/token` and `/gcp/roleset/:roleset/key` could inadvertently give users the ability to generate tokens and key if globs are used in policies. To avoid issues like this, globs should be avoided in policies to help adhere to the principle of least privilege. See the [roleset documentation](/docs/secrets/gcp#rolesets) for more information.
diff --git a/website/content/docs/upgrading/upgrade-to-1.9.x.mdx b/website/content/docs/upgrading/upgrade-to-1.9.x.mdx
index 1de7388f5dc86..90ea40f6ec9c8 100644
--- a/website/content/docs/upgrading/upgrade-to-1.9.x.mdx
+++ b/website/content/docs/upgrading/upgrade-to-1.9.x.mdx
@@ -14,14 +14,14 @@ for Vault 1.9.x compared to 1.8. Please read it carefully.
 ## OIDC Provider
 
 Vault 1.9.0 introduced the ability for Vault to be an OpenID Connect (OIDC) identity
-provider. To support the feature, Vault's [default policy](/vault/docs/concepts/policies#default-policy)
+provider. To support the feature, Vault's [default policy](https://www.vaultproject.io/docs/concepts/policies#default-policy)
 was modified to include an ACL rule for its Authorization Endpoint. Due to the handling
 of Vault's default policy during upgrades, existing deployments of Vault that are upgraded
 to 1.9.0 will not have this required ACL rule.
 
 If you're upgrading to 1.9.0 and want to use the new OIDC provider feature, the following
 ACL rule must be added to the default policy **or** a policy associated with the Vault
-[Auth Method](/vault/docs/auth) used to authenticate end-users during
+[Auth Method](https://www.vaultproject.io/docs/auth) used to authenticate end-users during
 the OIDC flow.
 
 ```hcl
@@ -38,14 +38,14 @@ token roles. When creating a role, the key parameter is required and the key
 must exist. Previously, it was possible to create a role and assign it a named
 key that did not yet exist despite the documentation stating otherwise.
 
-All calls to [create or update a role](/vault/api-docs/secret/identity/tokens#create-or-update-a-role)
+All calls to [create or update a role](https://www.vaultproject.io/api-docs/secret/identity/tokens#create-or-update-a-role)
 must be checked to ensure that roles are not being created or updated with
 non-existent keys.
 
 ## SSH Role Parameter `allowed_extensions` Behavior Change
 
 Prior versions of Vault allowed clients to specify any extension when requesting
-SSH certificate [signing requests](/vault/api-docs/secret/ssh#sign-ssh-key)
+SSH certificate [signing requests](https://www.vaultproject.io/api-docs/secret/ssh#sign-ssh-key)
 if their role had an `allowed_extensions` set to `""` or was missing.
 
 Now, Vault will reject a client request that specifies extensions if the role
@@ -63,7 +63,7 @@ specified by clients.
 ### HTTP Request Counter Deprecation
 
 In Vault 1.9, the internal HTTP Request count
-[API](/vault/api-docs/v1.8.x/system/internal-counters#http-requests)
+[API](https://www.vaultproject.io/api-docs/v1.8.x/system/internal-counters#http-requests)
 will be removed from the product. Calls to the endpoint will result in a 404
 error with a message stating that `functionality on this path has been removed`.
 
@@ -80,9 +80,9 @@ v3.5](https://etcd.io/blog/2021/announcing-etcd-3.5/), and will be
 decommissioned in the Etcd v3.6 release.
 
 Users upgrading to Vault 1.9 and planning to eventually upgrade to Vault 1.10
-should prepare to [migrate](/vault/docs/commands/operator/migrate) Vault storage to
+should prepare to [migrate](/docs/commands/operator/migrate) Vault storage to
 an Etcd v3 cluster prior to upgrading to Vault 1.10. All storage migrations
-should have [backups](/vault/docs/concepts/storage#backing-up-vault-s-persisted-data)
+should have [backups](/docs/concepts/storage#backing-up-vault-s-persisted-data)
 taken prior to migration.
 
 ## TLS Cipher Suites Changes
@@ -105,8 +105,8 @@ See [this blog post](https://go.dev/blog/tls-cipher-suites) for more information
 ### Identity Token Backend Key Rotations
 
 Existing Vault installations that use the [Identity Token
-backend](/vault/api-docs/secret/identity/tokens) and have [named
-keys](/vault/api-docs/secret/identity/tokens#create-a-named-key) generated will
+backend](/api-docs/secret/identity/tokens) and have [named
+keys](/api-docs/secret/identity/tokens#create-a-named-key) generated will
 encounter a panic when any of those existing keys pass their
 `rotation_period`. This issue affects Vault 1.9.0, and is fixed in Vault 1.9.1.
 Users should upgrade directly to 1.9.1 or above in order to avoid this panic.
diff --git a/website/content/docs/upgrading/vault-ha-upgrade.mdx b/website/content/docs/upgrading/vault-ha-upgrade.mdx
deleted file mode 100644
index 79ac69de66665..0000000000000
--- a/website/content/docs/upgrading/vault-ha-upgrade.mdx
+++ /dev/null
@@ -1,141 +0,0 @@
----
-layout: docs
-page_title: Vault HA upgrades without Autopilot Upgrade Automation (Pre 1.11)
-description: |-
-  Upgrade instructions for Vault HA Pre 1.11 or Vault without autopilot upgrade automation being enabled. Be sure to read the Upgrading-Vault Guides as well.
----
-
-# Vault HA upgrades without Autopilot Upgrade Automation (Pre 1.11)
-
-This is our recommended upgrade procedure if **one** of the following applies:
-
-- Running Vault version earlier than 1.11
-- Opt-out the [Autopilot automated upgrade](/vault/docs/concepts/integrated-storage/autopilot#automated-upgrade) features with Vault 1.11 or later
-- Running Vault with external storage backend such as Consul
-
-You should consider how to apply the steps described in this document to your
-particular setup since HA setups can differ on whether a load balancer is in
-use, what addresses clients are being given to connect to Vault (standby +
-leader, leader-only, or discovered via service discovery), etc.
-
-If you are running on Vault 1.11+ with Integrated Storage and wish to enable the
-Autopilot upgrade automation features, read to the [automated
-upgrades](/vault/docs/concepts/integrated-storage/autopilot#automated-upgrades)
-documentation for details and the [Automate Upgrades with Vault
-Enterprise](/vault/tutorials/raft/raft-upgrade-automation) tutorial for
-additional guidance.
-
-
-## HA Installations
-
-Regardless of the method you use, do not fail over from a newer version of Vault
-to an older version. Our suggested procedure is designed to prevent this.
-
-Please note that Vault does not support true zero-downtime upgrades, but with
-proper upgrade procedure the downtime should be very short (a few hundred
-milliseconds to a second depending on how the speed of access to the storage
-backend).
-
-<Warning title="Important">
-
-If you are currently running on Vault 1.11+ with Integrated Storage and have
-chosen to opt-out the Autopilot automated upgrade features, please disable the
-default automated upgrade migrations feature of the Vault. To disable this
-feature, follow the [Automate Upgrades with Vault Enterprise Autopilot
-configuration](/vault/tutorials/raft/raft-upgrade-automation#autopilot-configuration)
-tutorial for more details. Without disabling this feature, you may run into Lost
-Quorum issue as described in the [Quorum lost while upgrading the vault from
-1.11.0 to later version of
-it](https://support.hashicorp.com/hc/en-us/articles/7122445204755-Quorum-lost-while-upgrading-the-vault-from-1-11-0-to-later-version-of-it)
-article.
-
-</Warning>
-
-Perform these steps on each standby:
-
-1. Properly shut down Vault on the standby node via `SIGINT` or `SIGTERM`
-2. Replace the Vault binary with the new version; ensure that `mlock()`
-   capability is added to the new binary with
-   [setcap](/vault/docs/configuration#disable_mlock)
-3. Start the standby node
-4. Unseal the standby node
-5. Verify `vault status` shows correct Version and HA Mode is `standby`
-6. Review the node's logs to ensure successful startup and unseal
-
-At this point all standby nodes are upgraded and ready to take over. The
-upgrade will not complete until one of the upgraded standby nodes takes over
-active duty. 
-
-To complete the cluster upgrade:
-
-1. Properly shut down the remaining (active) node
-
-   <Note>
-   
-   It is important that you shut the node down properly.
-   This will perform a step-down and release the HA lock, allowing a standby
-   node to take over with a very short delay.
-   If you kill Vault without letting it release the lock, a standby node will
-   not be able to take over until the lock's timeout period has expired. This
-   is backend-specific but could be ten seconds or more.
-
-   </Note>
-
-2. Replace the Vault binary with the new version; ensure that `mlock()`
-   capability is added to the new binary with
-   [setcap](/vault/docs/configuration#disable_mlock)
-3. Start the node
-4. Unseal the node
-5. Verify `vault status` shows correct Version and HA Mode is `standby`
-6. Review the node's logs to ensure successful startup and unseal
-
-Internal upgrade tasks will happen after one of the upgraded standby nodes
-takes over active duty.
-
-Be sure to also read and follow any instructions in the version-specific
-upgrade notes.
-
-## Enterprise Replication Installations
-
-<Note>
-
-Prior to any upgrade, be sure to also read and follow any instructions in the
-version-specific upgrade notes which are found in the navigation menu for this
-documentation.
-
-</Note>
-
-Upgrading Vault Enterprise clusters which participate in [Enterprise
-Replication](/vault/docs/enterprise/replication) requires the following basic
-order of operations:
-
-- **Upgrade the replication secondary instances first** using appropriate
-  guidance from the previous sections depending on whether each secondary
-  instance is non-HA or HA
-- Verify functionality of each secondary instance after upgrading
-- When satisfied with functionality of upgraded secondary instances, upgrade
-  the primary instance
-
-<Note>
-
-It is not safe to replicate from a newer version of Vault to an older version.
-When upgrading replicated clusters, ensure that upstream clusters are always on
-older versions of Vault than downstream clusters.
-
-</Note>
-
-Here is an example of upgrading four Vault replicated Vault clusters:
-
-![Upgrading multiple replicated clusters](/img/vault-replication-upgrade.png)
-
-In the above scenario, the ideal upgrade procedure would be as follows,
-verifying functionality after each cluster upgrade.
-
-1. Upgrade Clusters B and D, using the HA upgrade process above. These clusters
-   have no downstream clusters, so they should be upgraded first, but the
-   ordering of B vs D does not matter.
-2. Upgrade Cluster C, which now has an upgraded downstream cluster (Cluster D).
-   Because Cluster C is a cluster, it should also use the HA upgrade process.
-3. Finally, upgrade Cluster A. All clusters downstream of A will already be
-   upgraded. It should be upgraded last, as it is a Performance Primary and a DR
-   Primary.
diff --git a/website/content/docs/use-cases.mdx b/website/content/docs/use-cases.mdx
index d52c1ece1eceb..54fc0971c8015 100644
--- a/website/content/docs/use-cases.mdx
+++ b/website/content/docs/use-cases.mdx
@@ -8,7 +8,7 @@ description: >-
 
 # Use Cases
 
-[HashiCorp Vault](/vault/docs/what-is-vault) is an identity-based secrets and encryption management system. Vault validates and authorizes clients (users, machines, apps) before providing them access to secrets or stored sensitive data.
+[HashiCorp Vault](/docs/what-is-vault) is an identity-based secrets and encryption management system. Vault validates and authorizes clients (users, machines, apps) before providing them access to secrets or stored sensitive data.
 
 This page describes common Vault use cases and provides related resources that can be used to create Vault configurations and workflows. Please note that not all use cases may be listed.
 
@@ -19,45 +19,45 @@ With Vault, you can generate short-lived, just-in-time credentials that are auto
 
 ### Static Secrets
 
-Credentials can be long-lived and static, where they don't change or are changed infrequently. Vault can store these secrets behind its cryptographic barrier, and clients can request them to use in their applications.
+Credentials can be long-lived and static, where they don't change or are changed infrequently. Vault can store these secrets bedhind its cryptographic barrier, and clients can request them to use in their applications.
 
-- Refer to the [Versioned Key/Vault Secrets Engine](/vault/tutorials/secrets-management/versioned-kv) tutorial and learn how a versioned key-value secrets engine protects your static secrets.
+- Refer to the [Versioned Key/Vault Secrets Engine](https://learn.hashicorp.com/tutorials/vault/versioned-kv?in=vault/secrets-management) tutorial and learn how a versioned key-value secrets engine protects your static secrets.
 
 ### Dynamic Secrets
 
 The key value with secrets storage is the ability to dynamically generate credentials. These credentials are created when clients need them. Vault can also manage the lifecycle of these credentials, including but not limited to, deleting them after a defined period of time.
 
-- Refer to the [Dynamic Secrets: Database Secrets Engine](/vault/tutorials/db-credentials/database-secrets) tutorial and learn how Vault can dynamically manage your database credentials.
+- Refer to the [Dynamic Secrets: Database Secrets Engine](https://learn.hashicorp.com/tutorials/vault/database-secrets) tutorial and learn how Vault can dynamically manage your database credentials.
 
-In addition to database credential management, Vault can manage your Active Directory accounts, SSH keys, PKI certificates and more. Visit the [Secrets Management](/vault/tutorials/secrets-management) tutorial series to learn more about secrets management using Vault.
+In addition to database credential management, Vault can manage your Active Directory accounts, SSH keys, PKI certificates and more. Visit the [Secrets Management](https://learn.hashicorp.com/collections/vault/secrets-management) tutorial series to learn more about secrets management using Vault.
 
 ## Data Encryption
 
-Many organizations seek solutions to encrypt/decrypt application data within a cloud or multi-datacenter environment; deploying cryptography and maintaining a complex key management infrastructure can be expensive and challenging to develop. Vault provides [encryption as a service](/vault/docs/secrets/transit) with centralized key management to simplify encrypting data in transit and stored across clouds and datacenters. Vault can encrypt/decrypt data stored elsewhere, essentially allowing applications to encrypt their data while storing it in the primary data store. Vault's security team manages and maintains the responsibility of the data encryption within the Vault environment, allowing developers to focus solely on encrypting/decrypting data as needed.
+Many organizations seek solutions to encrypt/decrypt application data within a cloud or multi-datacenter environment; deploying cryptography and maintaining a complex key management infrastructure can be expensive and challenging to develop. Vault provides [encryption as a service](/docs/secrets/transit) with centralized key management to simplify encrypting data in transit and stored across clouds and datacenters. Vault can encrypt/decrypt data stored elsewhere, essentially allowing applications to encrypt their data while storing it in the primary data store. Vault's security team manages and maintains the responsibility of the data encryption within the Vault environment, allowing developers to focus solely on encrypting/decrypting data as needed.
 
 ### Resources
 
-- Try our [Encryption as a Service: Transit Secrets Engine](/vault/tutorials/encryption-as-a-service) to learn the essential workings of the Transit secrets engine handles cryptographic functions on data in-transit.
+- Try our [Encryption as a Service: Transit Secrets Engine](https://learn.hashicorp.com/collections/vault/encryption-as-a-service) to learn the essential workings of the Transit secrets engine handles cryptographic functions on data in-transit.
 
-- For more advanced data protection, refer to the [Advanced Data Protection](/vault/tutorials/adp) tutorial series. Vault's Transform secrets engine handles secure data transformation and tokenization against provided input value.
+- For more advanced data protection, refer to the [Advanced Data Protection](https://learn.hashicorp.com/collections/vault/adp) tutorial series. Vault's Transform secrets engine handles secure data transformation and tokenization against provided input value.
 
 
 ## Identity-Based Access
 
-Organizations need a way to manage identity sprawl with the proliferation of different clouds, services, and systems- all with their identity providers. The risk of compromising an organization's security infrastructure increases as organizations are forced to manage multiple identity management systems as they try to implement solutions to unify a single logical identity across numerous cloud platforms. Different platforms support different methods and constructs for identity, making it difficult to recognize a user or identity across multiple forms of credentials. Vault solves this challenge by using a unified ACL system to broker access to systems and secrets and merges identities across providers. With [identity-based access](/vault/docs/secrets/identity), organizations can leverage any trusted resource identity to regulate and manage system and application access, and authentication across various clouds, systems, and endpoints.
+Organizations need a way to manage identity sprawl with the proliferation of different clouds, services, and systems- all with their identity providers. The risk of compromising an organization's security infrastructure increases as organizations are forced to manage multiple identity management systems as they try to implement solutions to unify a single logical identity across numerous cloud platforms. Different platforms support different methods and constructs for identity, making it difficult to recognize a user or identity across multiple forms of credentials. Vault solves this challenge by using a unified ACL system to broker access to systems and secrets and merges identities across providers. With [identity-based access](/docs/secrets/identity), organizations can leverage any trusted resource identity to regulate and manage system and application access, and authentication across various clouds, systems, and endpoints.
 
 ### Resources
 
-- Try our [Identity: Entities and Groups](/vault/tutorials/auth-methods/identity) tutorial to learn how Vault's unified identity system works.
+- Try our [Identity: Entities and Groups](https://learn.hashicorp.com/tutorials/vault/identity) tutorial to learn how Vault's unified identity system works.
 
-- Follow the [Policies](/vault/tutorials/policies) tutorial series to learn how Vault enforces role-based access control (RBAC) across multiple cloud environments.
+- Follow the [Policies](https://learn.hashicorp.com/collections/vault/policies) tutorial series to learn how Vault enforces role-based access control (RBAC) across multiple cloud environments.
 
 ## Key Management
 
-Working with cloud providers requires that you use their security features, which involve encryption keys issued and stored by the provider in its own key management system (KMS). You may also have a requirement to maintain root of trust and control of the encryption key lifecycle, both within and outside of the cloud. The [Vault Key Management Secrets Engine](/vault/docs/secrets/key-management) provides a consistent workflow for distribution and lifecycle management of cloud provider keys, allowing organizations to maintain centralized control of their keys in Vault while leveraging the cryptographic capabilities native to the KMS providers.
+Working with cloud providers requires that you use their security features, which involve encryption keys issued and stored by the provider in its own key management system (KMS). You may also have a requirement to maintain root of trust and control of the encryption key lifecycle, both within and outside of the cloud. The [Vault Key Management Secrets Engine](/docs/secrets/key-management) provides a consistent workflow for distribution and lifecycle management of cloud provider keys, allowing organizations to maintain centralized control of their keys in Vault while leveraging the cryptographic capabilities native to the KMS providers.
 
 ### Resources
 
-- Try our [Key Management Secrets Engine with Azure Key Vault](/vault/tutorials/adp/key-management-secrets-engine-azure-key-vault) to enable management of the Key Vault key with the Key Management secrets engine.
+- Try our [Key Management Secrets Engine with Azure Key Vault](https://learn.hashicorp.com/tutorials/vault/key-management-secrets-engine-azure-key-vault?in=vault/adp) to enable management of the Key Vault key with the Key Management secrets engine.
 
-- Try our [Key Management Secrets Engine with GCP Cloud KMS](/vault/tutorials/adp/key-management-secrets-engine-gcp-cloud-kms) to enable management of the Key Value key with the Key Management secrets engine.
+- Try our [Key Management Secrets Engine with GCP Cloud KMS](https://learn.hashicorp.com/tutorials/vault/key-management-secrets-engine-azure-key-vault?in=vault/adp) to enable management of the Key Value key with the Key Management secrets engine.
diff --git a/website/content/docs/what-is-vault.mdx b/website/content/docs/what-is-vault.mdx
index df2ed4cfcd7c8..582c308a35015 100644
--- a/website/content/docs/what-is-vault.mdx
+++ b/website/content/docs/what-is-vault.mdx
@@ -70,13 +70,13 @@ The key features of Vault are:
   Revocation assists in key rolling as well as locking down systems in the
   case of an intrusion.
 
--> **Tip**: Learn more about Vault [use cases](/vault/docs/use-cases).
+-> **Tip**: Learn more about Vault [use cases](/docs/use-cases).
 
 ### What is HCP Vault?
 
-HashiCorp Cloud Platform (HCP) Vault is a hosted version of Vault, which is operated by HashiCorp to allow organizations to get up and running quickly. HCP Vault uses the same binary as self-hosted Vault, which means you will have a consistent user experience. You can use the same Vault clients to communicate with HCP Vault as you use to communicate with a self-hosted Vault. Refer to the [HCP Vault](/hcp/docs/vault) documentation to learn more.
+HashiCorp Cloud Platform (HCP) Vault is a hosted version of Vault, which is operated by HashiCorp to allow organizations to get up and running quickly. HCP Vault uses the same binary as self-hosted Vault, which means you will have a consistent user experience. You can use the same Vault clients to communicate with HCP Vault as you use to communicate with a self-hosted Vault. Refer to the [HCP Vault](https://cloud.hashicorp.com/docs/vault) documentation to learn more.
 
--> **Hands On:** Try the [Get started](/vault/tutorials/cloud) tutorials to set up a managed Vault cluster.
+-> **Hands On:** Try the [Get started](https://learn.hashicorp.com/collections/vault/cloud) tutorials to set up a managed Vault cluster.
 
 ### Community
 
diff --git a/website/content/partials/ad-secrets-deprecation.mdx b/website/content/partials/ad-secrets-deprecation.mdx
deleted file mode 100644
index 85732c38350ee..0000000000000
--- a/website/content/partials/ad-secrets-deprecation.mdx
+++ /dev/null
@@ -1,5 +0,0 @@
-~> **Note**: The Active Directory (AD) secrets engine has been deprecated as of the Vault
-1.13 release. We will continue to support the AD secrets engine in maintenance mode for
-six major Vault releases. Maintenance mode means that we will fix bugs and security issues
-but will not add new features. For additional information, see the [deprecation table](/vault/docs/deprecation)
-and [migration guide](/vault/docs/secrets/ad/migration-guide).
diff --git a/website/content/partials/aws-sha1-deprecation.mdx b/website/content/partials/aws-sha1-deprecation.mdx
index fb05450db632e..28b762cbad182 100644
--- a/website/content/partials/aws-sha1-deprecation.mdx
+++ b/website/content/partials/aws-sha1-deprecation.mdx
@@ -1,5 +1,5 @@
 ~> **Note**: Starting in Vault 1.12, only the `pkcs7` login flow with the AWS
    [`/rsa2048` signature endpoint](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/verify-rsa2048.html)
    credentials will work by default due to the deprecation of SHA-1-based signatures.
-   Please see [the deprecation FAQ](/vault/docs/deprecation/faq#q-what-is-the-impact-of-removing-support-for-x-509-certificates-with-signatures-that-use-sha-1)
+   Please see [the deprecation FAQ](/docs/deprecation/faq#q-what-is-the-impact-of-removing-support-for-x-509-certificates-with-signatures-that-use-sha-1)
    for more details and a workaround.
diff --git a/website/content/partials/consul-dataplane-compat.mdx b/website/content/partials/consul-dataplane-compat.mdx
index e9a71997e8441..8b039a1953780 100644
--- a/website/content/partials/consul-dataplane-compat.mdx
+++ b/website/content/partials/consul-dataplane-compat.mdx
@@ -1 +1 @@
-~> **Compatibility information:** As of Consul 1.14.0, Consul on Kubernetes uses [Consul Dataplane](/consul/docs/connect/dataplane) by default instead of client agents. Vault does not currently support Consul Dataplane. Please follow the Consul 1.14.0 [upgrade guide](/consul/docs/k8s/upgrade#upgrading-to-consul-dataplane) to ensure that your Consul on Kubernetes deployment continues to use client agents.
+~> **Compatibility information:** As of Consul 1.14.0, Consul on Kubernetes uses [Consul Dataplane](https://developer.hashicorp.com/consul/docs/connect/dataplane) by default instead of client agents. Vault does not currently support Consul Dataplane. Please follow the Consul 1.14.0 [upgrade guide](https://developer.hashicorp.com/consul/docs/k8s/upgrade#upgrading-to-consul-dataplane) to ensure that your Consul on Kubernetes deployment continues to use client agents.
diff --git a/website/content/partials/consul-dataplane-upgrade-note.mdx b/website/content/partials/consul-dataplane-upgrade-note.mdx
index 060e23222f312..d4a6d31f6e080 100644
--- a/website/content/partials/consul-dataplane-upgrade-note.mdx
+++ b/website/content/partials/consul-dataplane-upgrade-note.mdx
@@ -1,2 +1,2 @@
 ### Consul Dataplane Compatibility
-If you are using Consul on Kubernetes, please be aware that upgrading to Consul 1.14.0 will impact Consul [secrets](/vault/docs/secrets/consul), [storage](/vault/docs/configuration/storage/consul), and [service registration](/vault/docs/configuration/service-registration/consul). As of Consul 1.14.0, Consul on Kubernetes uses [Consul Dataplane](/consul/docs/connect/dataplane) by default instead of client agents. Vault does not currently support Consul Dataplane. Please follow the Consul 1.14.0 [upgrade guide](/consul/docs/k8s/upgrade#upgrading-to-consul-dataplane) to ensure that your Consul on Kubernetes deployment continues to use client agents.
+If you are using Consul on Kubernetes, please be aware that upgrading to Consul 1.14.0 will impact Consul [secrets](/docs/secrets/consul), [storage](/docs/configuration/storage/consul), and [service registration](/docs/configuration/service-registration/consul). As of Consul 1.14.0, Consul on Kubernetes uses [Consul Dataplane](https://developer.hashicorp.com/consul/docs/connect/dataplane) by default instead of client agents. Vault does not currently support Consul Dataplane. Please follow the Consul 1.14.0 [upgrade guide](https://developer.hashicorp.com/consul/docs/k8s/upgrade#upgrading-to-consul-dataplane) to ensure that your Consul on Kubernetes deployment continues to use client agents.
diff --git a/website/content/partials/db-secrets-credential-types.mdx b/website/content/partials/db-secrets-credential-types.mdx
index 733313e0a3db4..3da4eb93d71be 100644
--- a/website/content/partials/db-secrets-credential-types.mdx
+++ b/website/content/partials/db-secrets-credential-types.mdx
@@ -1,5 +1,5 @@
 - `credential_type` `(string: "password")` – Specifies the type of credential that
-  will be generated for the role. Options include: `password`, `rsa_private_key`, `client_certificate`.
+  will be generated for the role. Options include: `password`, `rsa_private_key`.
   See the plugin's API page for credential types supported by individual databases.
 
 - `credential_config` `(map<string|string>: <optional>)` – Specifies the configuration
@@ -8,9 +8,9 @@
   The following options are available for each `credential_type` value:
 
   - `password`
-    - `password_policy` `(string: <optional>)` - The [policy](/vault/docs/concepts/password-policies)
+    - `password_policy` `(string: <optional>)` - The [policy](/docs/concepts/password-policies)
       used for password generation. If not provided, defaults to the password policy of the
-      database [configuration](/vault/api-docs/secret/databases#password_policy).
+      database [configuration](/api-docs/secret/databases#password_policy).
 
   - `rsa_private_key`
     - `key_bits` `(int: 2048)` - The bit size of the RSA key to generate. Options include:
@@ -18,16 +18,3 @@
     - `format` `(string: "pkcs8")` - The output format of the generated private key
       credential. The private key will be returned from the API in PEM encoding. Options
       include: `pkcs8`.
-
-  - `client_certificate`
-    - `common_name_template` `(string: "")` - A [username template](/vault/docs/concepts/username-templating)
-       to be used for the client certificate common name.
-    - `ca_cert` `(string: "")` - The PEM-encoded CA certificate.
-    - `ca_private_key` `(string: "")` - The PEM-encoded private key for the given `ca_cert`.
-    - `key_type` `(string: <required>")` - Specifies the desired key type. Options include:
-      `rsa`, `ed25519`, `ec`.
-    - `key_bits` `(int: 2048)` - Number of bits to use for the generated keys. Options include:
-      `2048` (default), `3072`, `4096`; with `key_type=ec`, allowed values are: `224`, `256` (default),
-      `384`, `521`; ignored with `key_type=ed25519`.
-    - `signature_bits` `(int: 256)` - The number of bits to use in the signature algorithm. Options include:
-      `256` (default), `384`, `512`.
diff --git a/website/content/partials/helm/install.mdx b/website/content/partials/helm/install.mdx
index 4c94d424be222..e06d56302a243 100644
--- a/website/content/partials/helm/install.mdx
+++ b/website/content/partials/helm/install.mdx
@@ -2,15 +2,15 @@
 # List the available releases
 $ helm search repo hashicorp/vault -l
 NAME           	CHART VERSION	APP VERSION	DESCRIPTION
-hashicorp/vault	0.24.0       	1.13.1     	Official HashiCorp Vault Chart
 hashicorp/vault	0.23.0       	1.12.1     	Official HashiCorp Vault Chart
 hashicorp/vault	0.22.1       	1.12.0     	Official HashiCorp Vault Chart
 hashicorp/vault	0.22.0       	1.11.3     	Official HashiCorp Vault Chart
 hashicorp/vault	0.21.0       	1.11.2     	Official HashiCorp Vault Chart
 hashicorp/vault	0.20.1       	1.10.3     	Official HashiCorp Vault Chart
 hashicorp/vault	0.20.0       	1.10.3     	Official HashiCorp Vault Chart
+hashicorp/vault	0.19.0       	1.9.2      	Official HashiCorp Vault Chart
 ...
 
-# Install version 0.24.0
-$ helm install vault hashicorp/vault --version 0.24.0
+# Install version 0.23.0
+$ helm install vault hashicorp/vault --version 0.23.0
 ```
diff --git a/website/content/partials/helm/repo.mdx b/website/content/partials/helm/repo.mdx
index f3571bbea1c07..62ff0453a7d83 100644
--- a/website/content/partials/helm/repo.mdx
+++ b/website/content/partials/helm/repo.mdx
@@ -4,5 +4,5 @@ $ helm repo add hashicorp https://helm.releases.hashicorp.com
 
 $ helm search repo hashicorp/vault
 NAME           	CHART VERSION	APP VERSION	DESCRIPTION
-hashicorp/vault	0.24.0       	1.13.1     	Official HashiCorp Vault Chart
+hashicorp/vault	0.23.0       	1.12.1     	Official HashiCorp Vault Chart
 ```
diff --git a/website/content/partials/kubernetes-supported-versions.mdx b/website/content/partials/kubernetes-supported-versions.mdx
deleted file mode 100644
index 5b5528839c6dc..0000000000000
--- a/website/content/partials/kubernetes-supported-versions.mdx
+++ /dev/null
@@ -1,13 +0,0 @@
-## Supported Kubernetes Versions
-
-The following [Kubernetes minor releases][k8s-releases] are currently supported.
-The latest version is tested against each Kubernetes version. It may work with
-other versions of Kubernetes, but those are not supported.
-
-* 1.26
-* 1.25
-* 1.24
-* 1.23
-* 1.22
-
-[k8s-releases]: https://kubernetes.io/releases/
\ No newline at end of file
diff --git a/website/content/partials/perf-standby-token-create-forwarding-failure.mdx b/website/content/partials/perf-standby-token-create-forwarding-failure.mdx
deleted file mode 100644
index 06846b779b0dc..0000000000000
--- a/website/content/partials/perf-standby-token-create-forwarding-failure.mdx
+++ /dev/null
@@ -1,19 +0,0 @@
-### Token creation with a new entity alias could silently fail
-
-A regression caused token creation requests under specific circumstances to be
-forwarded from perf standbys (Enterprise only) to the active node incorrectly.
-They would appear to succeed, however no lease was created. The token would then
-be revoked on first use causing a 403 error.
-
-This only happened when all of the following conditions were met:
- - the token is being created against a role
- - the request specifies an entity alias which has never been used before with
-   the same role (for example for a brand new role or a unique alias)
- - the request happens to be made to a perf standby rather than the active node
-
-Retrying token creation after the affected token is rejected would work since
-the entity alias has already been created.
-
-#### Affected Versions
-
-Affects Vault 1.13.0 to 1.13.3. Fixed in 1.13.4.
diff --git a/website/content/partials/raft-large-snapshots.mdx b/website/content/partials/raft-large-snapshots.mdx
index d06cf7ea0f36b..aeafacee6c029 100644
--- a/website/content/partials/raft-large-snapshots.mdx
+++ b/website/content/partials/raft-large-snapshots.mdx
@@ -2,5 +2,5 @@
 
 Taking and restoring Raft snapshots can exceed Vault's default and recommended
 timeout settings. The
-[`VAULT_CLIENT_TIMEOUT`](/vault/docs/commands#vault_client_timeout) environment variable can
+[`VAULT_CLIENT_TIMEOUT`](/docs/commands#vault_client_timeout) environment variable can
 be used to allow for more time to take or restore a snapshot.
diff --git a/website/content/partials/raft-retry-join-failure.mdx b/website/content/partials/raft-retry-join-failure.mdx
index 47b66912c6b9c..2b5a95783f5c7 100644
--- a/website/content/partials/raft-retry-join-failure.mdx
+++ b/website/content/partials/raft-retry-join-failure.mdx
@@ -1,12 +1,12 @@
 ### Cluster initialization hangs with `retry_join`
 
 The
-[`retry_join`](/vault/docs/concepts/integrated-storage/index#retry_join-configuration)
+[`retry_join`](/docs/concepts/integrated-storage/index#retry_join-configuration)
 feature no longer successfully attempts to rejoin the raft cluster every 2
 seconds following a join failure.
 
 The error occurs when attempting to initialize non-leader nodes with a
-[`retry_join` stanza](/vault/docs/configuration/storage/raft/#retry_join-stanza). This
+[`retry_join` stanza](/docs/configuration/storage/raft/#retry_join-stanza). This
 affects multi-node raft clusters on [impacted versions](#impacted-versions).
 
 The bug was introduced by commit
diff --git a/website/content/partials/tokenfields.mdx b/website/content/partials/tokenfields.mdx
index 43308afcf23ae..5cc49591a205c 100644
--- a/website/content/partials/tokenfields.mdx
+++ b/website/content/partials/tokenfields.mdx
@@ -7,9 +7,8 @@
 - `token_policies` `(array: [] or comma-delimited string: "")` - List of
   token policies to encode onto generated tokens. Depending on the auth method, this
   list may be supplemented by user/group/other values.
-- `policies` `(array: [] or comma-delimited string: "")` - DEPRECATED: Please
-  use the `token_policies` parameter instead. List of token policies to encode
-  onto generated tokens. Depending on the auth method, this list may be
-  supplemented by user/group/other values.
+- `policies` `(array: [] or comma-delimited string: "")` - List of token
+  policies to encode onto generated tokens. Depending on the auth method, this
+  list may be supplemented by user/group/other values.
 
 @include 'tokenstorefields.mdx'
diff --git a/website/content/partials/tokenstorefields.mdx b/website/content/partials/tokenstorefields.mdx
index d84a94df25d02..6d6ab365ea166 100644
--- a/website/content/partials/tokenstorefields.mdx
+++ b/website/content/partials/tokenstorefields.mdx
@@ -3,7 +3,7 @@
   successfully, and ties the resulting token to these blocks as well.
 - `token_explicit_max_ttl` `(integer: 0 or string: "")` - If set, will encode
   an [explicit max
-  TTL](/vault/docs/concepts/tokens#token-time-to-live-periodic-tokens-and-explicit-max-ttls)
+  TTL](/docs/concepts/tokens#token-time-to-live-periodic-tokens-and-explicit-max-ttls)
   onto the token. This is a hard cap even if `token_ttl` and `token_max_ttl`
   would otherwise allow a renewal.
 - `token_no_default_policy` `(bool: false)` - If set, the `default` policy will
@@ -13,7 +13,9 @@
   token may be used (within its lifetime); 0 means unlimited.
   If you require the token to have the ability to create child tokens,
   you will need to set this value to 0.
-- `token_period` `(integer: 0 or string: "")` - The maximum allowed [period](/vault/docs/concepts/tokens#token-time-to-live-periodic-tokens-and-explicit-max-ttls) value when a periodic token is requested from this role.
+- `token_period` `(integer: 0 or string: "")` - The
+  [period](/docs/concepts/tokens#token-time-to-live-periodic-tokens-and-explicit-max-ttls),
+  if any, to set on the token.
 - `token_type` `(string: "")` - The type of token that should be generated. Can
   be `service`, `batch`, or `default` to use the mount's tuned default (which
   unless changed will be `service` tokens). For token store roles, there are two
diff --git a/website/content/partials/ui-pki-control-groups-known-issue.mdx b/website/content/partials/ui-pki-control-groups-known-issue.mdx
deleted file mode 100644
index 4876210228ec8..0000000000000
--- a/website/content/partials/ui-pki-control-groups-known-issue.mdx
+++ /dev/null
@@ -1,12 +0,0 @@
-### Control Groups with Issuer detail reads only accessible in UI from overview
-
-Given a scenario where a user can only read an Issuer's details after Control Group
-approval, they will constantly be directed to the Control Group Access page when
-attempting to link to the Issuer details page from the Issuer list page.
-
-As a workaround, users constrained by Control Groups can select an Issuer to view
-details for from the overview page rather than through the Issuers list page.
-
-#### Impacted Versions
-
-Affects all current versions of 1.14.x
diff --git a/website/content/partials/user-lockout.mdx b/website/content/partials/user-lockout.mdx
deleted file mode 100644
index b66fffbfac3da..0000000000000
--- a/website/content/partials/user-lockout.mdx
+++ /dev/null
@@ -1,23 +0,0 @@
-If a user provides bad credentials several times in quick succession, 
-Vault will stop trying to validate their credentials for a while, instead returning immediately 
-with a permission denied error. We call this behavior "user lockout". The time for which 
-a user will be locked out is called “lockout duration”. The user will be able to login after the lockout 
-duration has passed. The number of failed login attempts after which the user is locked out is called 
-“lockout threshold”. The lockout threshold counter is reset to zero after a few minutes without login attempts, 
-or upon a successful login attempt. The duration after which the counter will be reset to zero
-after no login attempts is called "lockout counter reset". This can defeat both automated and targeted requests 
-i.e, user-based password guessing attacks as well as automated attacks. 
-
-The user lockout feature is enabled by default. The default values for "lockout threshold" is 5 attempts, 
-"lockout duration" is 15 minutes, "lockout counter reset" is 15 minutes.
-
-The user lockout feature can disabled as follows: 
-- It can be disabled globally using environment variable VAULT_DISABLE_USER_LOCKOUT.
-- It can be disabled for all supported auth methods (ldap, userpass and approle) or a specific supported auth method using "disable_lockout"
- parameter within user_lockout stanza in configuration file. 
- Please see [user lockout configuration](/vault/docs/configuration/user-lockout#user_lockout-stanza) for more details. 
-- It can be disabled for a specific auth mount using "auth tune". Please see [auth tune command](/vault/docs/commands/auth/tune)
-or [auth tune api](/vault/api-docs/system/auth#tune-auth-method) for more details. 
-
-
-~> **NOTE**: This feature is available from  Vault version 1.13 and is only supported by userpass, ldap and approle auth methods.
\ No newline at end of file
diff --git a/website/content/partials/x509-sha1-deprecation.mdx b/website/content/partials/x509-sha1-deprecation.mdx
index ff030daa41822..39a5d753752dd 100644
--- a/website/content/partials/x509-sha1-deprecation.mdx
+++ b/website/content/partials/x509-sha1-deprecation.mdx
@@ -1,5 +1,5 @@
 ~> **Note**: This engine can use external X.509 certificates as part of TLS or signature validation.
    Verifying signatures against X.509 certificates that use SHA-1 is deprecated and is no longer
    usable without a workaround starting in Vault 1.12. See the
-   [deprecation FAQ](/vault/docs/deprecation/faq#q-what-is-the-impact-of-removing-support-for-x-509-certificates-with-signatures-that-use-sha-1)
+   [deprecation FAQ](/docs/deprecation/faq#q-what-is-the-impact-of-removing-support-for-x-509-certificates-with-signatures-that-use-sha-1)
    for more information.
\ No newline at end of file
diff --git a/website/data/api-docs-nav-data.json b/website/data/api-docs-nav-data.json
index a34798af797b9..ac926b3d9a6c1 100644
--- a/website/data/api-docs-nav-data.json
+++ b/website/data/api-docs-nav-data.json
@@ -421,15 +421,6 @@
         "title": "<code>/sys/config/cors</code>",
         "path": "system/config-cors"
       },
-      {
-        "title": "<code>/sys/config/group-policy-application</code>",
-        "path": "system/config-group-policy-application",
-        "badge": {
-          "text": "ENT",
-          "type": "outlined",
-          "color": "neutral"
-        }
-      },
       {
         "title": "<code>/sys/config/reload</code>",
         "path": "system/config-reload"
@@ -446,10 +437,6 @@
         "title": "<code>/sys/control-group</code>",
         "path": "system/control-group"
       },
-      {
-        "title": "<code>/sys/experiments</code>",
-        "path": "system/experiments"
-      },
       {
         "title": "<code>/sys/generate-recovery-token</code>",
         "path": "system/generate-recovery-token"
@@ -458,10 +445,6 @@
         "title": "<code>/sys/generate-root</code>",
         "path": "system/generate-root"
       },
-      {
-        "title": "<code>/sys/decode-token</code>",
-        "path": "system/decode-token"
-      },
       {
         "title": "<code>/sys/health</code>",
         "path": "system/health"
@@ -482,19 +465,6 @@
         "title": "<code>/sys/internal/counters</code>",
         "path": "system/internal-counters"
       },
-      {
-        "title": "<code>/sys/internal/inspect</code>",
-        "routes": [
-          {
-            "title": "Overview",
-            "path": "system/inspect"
-          },
-          {
-            "title": "<code>/sys/internal/inspect/router</code>",
-            "path": "system/inspect/router"
-          }
-        ]
-      },
       {
         "title": "<code>/sys/internal/specs/openapi</code>",
         "path": "system/internal-specs-openapi"
@@ -535,10 +505,6 @@
         "title": "<code>/sys/license/status</code>",
         "path": "system/license"
       },
-      {
-        "title": "<code>/sys/locked-users</code>",
-        "path": "system/user-lockout"
-      },
       {
         "title": "<code>/sys/loggers</code>",
         "path": "system/loggers"
diff --git a/website/data/docs-nav-data.json b/website/data/docs-nav-data.json
index b2bce7b4c1350..d6c1840fe03a9 100644
--- a/website/data/docs-nav-data.json
+++ b/website/data/docs-nav-data.json
@@ -194,19 +194,6 @@
       {
         "title": "Duration String Format",
         "path": "concepts/duration-format"
-      },
-      {
-        "title": "User Lockout",
-        "path": "concepts/user-lockout"
-      },
-      {
-        "title": "Events",
-        "path": "concepts/events",
-        "badge": {
-          "text": "ALPHA",
-          "type": "outlined",
-          "color": "neutral"
-        }
       }
     ]
   },
@@ -227,10 +214,6 @@
           {
             "title": "TCP",
             "path": "configuration/listener/tcp"
-          },
-          {
-            "title": "Unix",
-            "path": "configuration/listener/unix"
           }
         ]
       },
@@ -410,10 +393,6 @@
         "title": "<code>ui</code>",
         "path": "configuration/ui"
       },
-      {
-        "title": "<code>user_lockout</code>",
-        "path": "configuration/user-lockout"
-      },
       {
         "title": "<code>Log Completed Requests</code>",
         "path": "configuration/log-requests-level"
@@ -560,35 +539,6 @@
           }
         ]
       },
-      {
-        "title": "<code>pki</code>",
-        "routes": [
-          {
-            "title": "Overview",
-            "path": "commands/pki"
-          },
-          {
-            "title": "<code>health-check</code>",
-            "path": "commands/pki/health-check"
-          },
-          {
-            "title": "<code>verify-sign</code>",
-            "path": "commands/pki/verify-sign"
-          },
-          {
-            "title": "<code>list-intermeidates</code>",
-            "path": "commands/pki/list-intermediates"
-          },
-          {
-            "title": "<code>issue</code>",
-            "path": "commands/pki/issue"
-          },
-          {
-            "title": "<code>reissue</code>",
-            "path": "commands/pki/reissue"
-          }
-        ]
-      },
       {
         "title": "<code>lease</code>",
         "routes": [
@@ -704,10 +654,6 @@
           }
         ]
       },
-      {
-        "title": "<code>patch</code>",
-        "path": "commands/patch"
-      },
       {
         "title": "<code>path-help</code>",
         "path": "commands/path-help"
@@ -848,19 +794,6 @@
           }
         ]
       },
-      {
-        "title": "<code>transit</code>",
-        "routes": [
-          {
-            "title": "Overview",
-            "path": "commands/transit"
-          },
-          {
-            "title": "<code>import</code> and <code>import-version</code>",
-            "path": "commands/transit/import"
-          }
-        ]
-      },
       {
         "title": "<code>unwrap</code>",
         "path": "commands/unwrap"
@@ -884,73 +817,65 @@
     ]
   },
   {
-    "title": "Vault Agent and Vault Proxy",
+    "title": "Vault Agent",
     "routes": [
       {
         "title": "Overview",
-        "path": "agent-and-proxy"
+        "path": "agent"
       },
       {
         "title": "Auto-Auth",
         "routes": [
           {
             "title": "Overview",
-            "path": "agent-and-proxy/autoauth"
+            "path": "agent/autoauth"
           },
           {
             "title": "Methods",
             "routes": [
               {
                 "title": "Overview",
-                "path": "agent-and-proxy/autoauth/methods"
+                "path": "agent/autoauth/methods"
               },
               {
                 "title": "AliCloud",
-                "path": "agent-and-proxy/autoauth/methods/alicloud"
+                "path": "agent/autoauth/methods/alicloud"
               },
               {
                 "title": "AppRole",
-                "path": "agent-and-proxy/autoauth/methods/approle"
+                "path": "agent/autoauth/methods/approle"
               },
               {
                 "title": "AWS",
-                "path": "agent-and-proxy/autoauth/methods/aws"
+                "path": "agent/autoauth/methods/aws"
               },
               {
                 "title": "Azure",
-                "path": "agent-and-proxy/autoauth/methods/azure"
+                "path": "agent/autoauth/methods/azure"
               },
               {
                 "title": "Cert",
-                "path": "agent-and-proxy/autoauth/methods/cert"
+                "path": "agent/autoauth/methods/cert"
               },
               {
                 "title": "CF",
-                "path": "agent-and-proxy/autoauth/methods/cf"
+                "path": "agent/autoauth/methods/cf"
               },
               {
                 "title": "GCP",
-                "path": "agent-and-proxy/autoauth/methods/gcp"
+                "path": "agent/autoauth/methods/gcp"
               },
               {
                 "title": "JWT",
-                "path": "agent-and-proxy/autoauth/methods/jwt"
+                "path": "agent/autoauth/methods/jwt"
               },
               {
                 "title": "Kerberos",
-                "path": "agent-and-proxy/autoauth/methods/kerberos"
+                "path": "agent/autoauth/methods/kerberos"
               },
               {
                 "title": "Kubernetes",
-                "path": "agent-and-proxy/autoauth/methods/kubernetes"
-              },
-              {
-                "title": "Oracle Cloud Infrastructure",
-                "path": "agent-and-proxy/autoauth/methods/oci"
-              },
-              {
-                "title": "Token File",
-                "path": "agent-and-proxy/autoauth/methods/token_file"
+                "path": "agent/autoauth/methods/kubernetes"
               }
             ]
           },
@@ -959,109 +884,45 @@
             "routes": [
               {
                 "title": "Overview",
-                "path": "agent-and-proxy/autoauth/sinks"
+                "path": "agent/autoauth/sinks"
               },
               {
                 "title": "File",
-                "path": "agent-and-proxy/autoauth/sinks/file"
+                "path": "agent/autoauth/sinks/file"
               }
             ]
           }
         ]
       },
       {
-        "title": "Vault Proxy",
+        "title": "Caching",
         "routes": [
           {
             "title": "Overview",
-            "path": "agent-and-proxy/proxy"
+            "path": "agent/caching"
           },
           {
-            "title": "API Proxy",
-            "path": "agent-and-proxy/proxy/apiproxy"
-          },
-          {
-            "title": "Caching",
+            "title": "Persistent Caching",
             "routes": [
               {
                 "title": "Overview",
-                "path": "agent-and-proxy/proxy/caching"
+                "path": "agent/caching/persistent-caches"
               },
               {
-                "title": "Persistent Caching",
-                "routes": [
-                  {
-                    "title": "Overview",
-                    "path": "agent-and-proxy/proxy/caching/persistent-caches"
-                  },
-                  {
-                    "title": "Kubernetes",
-                    "path": "agent-and-proxy/proxy/caching/persistent-caches/kubernetes"
-                  }
-                ]
+                "title": "Kubernetes",
+                "path": "agent/caching/persistent-caches/kubernetes"
               }
             ]
-          },
-          {
-            "title": "Version compatibility",
-            "path": "agent-and-proxy/proxy/versions"
           }
         ]
       },
       {
-        "title": "Vault Agent",
-        "routes": [
-          {
-            "title": "Overview",
-            "path": "agent-and-proxy/agent"
-          },
-          {
-            "title": "API Proxy",
-            "path": "agent-and-proxy/agent/apiproxy"
-          },
-          {
-            "title": "Caching",
-            "routes": [
-              {
-                "title": "Overview",
-                "path": "agent-and-proxy/agent/caching"
-              },
-              {
-                "title": "Persistent Caching",
-                "routes": [
-                  {
-                    "title": "Overview",
-                    "path": "agent-and-proxy/agent/caching/persistent-caches"
-                  },
-                  {
-                    "title": "Kubernetes",
-                    "path": "agent-and-proxy/agent/caching/persistent-caches/kubernetes"
-                  }
-                ]
-              }
-            ]
-          },
-          {
-            "title": "generate-config",
-            "path": "agent-and-proxy/agent/generate-config"
-          },
-          {
-            "title": "Process Supervisor Mode",
-            "path": "agent-and-proxy/agent/process-supervisor"
-          },
-          {
-            "title": "Templates",
-            "path": "agent-and-proxy/agent/template"
-          },
-          {
-            "title": "Windows service",
-            "path": "agent-and-proxy/agent/winsvc"
-          },
-          {
-            "title": "Version compatibility",
-            "path": "agent-and-proxy/agent/versions"
-          }
-        ]
+        "title": "Templates",
+        "path": "agent/template"
+      },
+      {
+        "title": "Windows service",
+        "path": "agent/winsvc"
       }
     ]
   },
@@ -1077,16 +938,7 @@
       },
       {
         "title": "Active Directory",
-        "routes": [
-          {
-            "title": "Overview",
-            "path": "secrets/ad"
-          },
-          {
-            "title": "Migration Guide",
-            "path": "secrets/ad/migration-guide"
-          }
-        ]
+        "path": "secrets/ad"
       },
       {
         "title": "AliCloud",
@@ -1330,6 +1182,10 @@
           {
             "title": "SSH OTP",
             "path": "secrets/ssh/one-time-ssh-passwords"
+          },
+          {
+            "title": "Dynamic Key",
+            "path": "secrets/ssh/dynamic-ssh-keys"
           }
         ]
       },
@@ -1471,10 +1327,6 @@
               {
                 "title": "SecureAuth",
                 "path": "auth/jwt/oidc-providers/secureauth"
-              },
-              {
-                "title": "IBM ISAM",
-                "path": "auth/jwt/oidc-providers/ibmisam"
               }
             ]
           }
@@ -1526,7 +1378,7 @@
         "path": "auth/token"
       },
       {
-        "title": "Username and Password",
+        "title": "Username &amp; Password",
         "path": "auth/userpass"
       },
       {
@@ -1780,35 +1632,6 @@
                 "path": "platform/k8s/csi/examples"
               }
             ]
-          },
-          {
-            "title": "Vault Secrets Operator",
-            "routes": [
-              {
-                "title": "Overview",
-                "path": "platform/k8s/vso"
-              },
-              {
-                "title": "Installation",
-                "path": "platform/k8s/vso/installation"
-              },
-              {
-                "title": "Examples",
-                "path": "platform/k8s/vso/examples"
-              },
-              {
-                "title": "Helm Chart",
-                "path": "platform/k8s/vso/helm"
-              },
-              {
-                "title": "Telemetry",
-                "path": "platform/k8s/vso/telemetry"
-              },
-              {
-                "title": "API Reference",
-                "path": "platform/k8s/vso/api-reference"
-              }
-            ]
           }
         ]
       },
@@ -1874,23 +1697,10 @@
         "title": "Overview",
         "path": "upgrading"
       },
-      {
-        "title": "Upgrade Vault HA installations",
-        "path": "upgrading/vault-ha-upgrade"
-      },
       {
         "title": "Upgrade Plugins",
         "path": "upgrading/plugins"
       },
-      {
-        "title": "Upgrade to 1.14.x",
-        "path": "upgrading/upgrade-to-1.14.x",
-        "hidden": true
-      },
-      {
-        "title": "Upgrade to 1.13.x",
-        "path": "upgrading/upgrade-to-1.13.x"
-      },
       {
         "title": "Upgrade to 1.12.x",
         "path": "upgrading/upgrade-to-1.12.x"
@@ -2131,15 +1941,6 @@
         "title": "Overview",
         "path": "release-notes"
       },
-      {
-        "title": "1.14.0",
-        "path": "release-notes/1.14.0",
-        "hidden": true
-      },
-      {
-        "title": "1.13.0",
-        "path": "release-notes/1.13.0"
-      },
       {
         "title": "1.12.0",
         "path": "release-notes/1.12.0"
@@ -2250,10 +2051,6 @@
             "title": "Autoloading",
             "path": "enterprise/license/autoloading"
           },
-          {
-            "title": "Automated license utilization reporting",
-            "path": "enterprise/license/utilization-reporting"
-          },
           {
             "title": "FAQ",
             "path": "enterprise/license/faq"
diff --git a/website/package-lock.json b/website/package-lock.json
index 79339e660dbcc..0114eaab6152a 100644
--- a/website/package-lock.json
+++ b/website/package-lock.json
@@ -9,15 +9,13 @@
       "version": "1.0.0",
       "hasInstallScript": true,
       "devDependencies": {
-        "@hashicorp/platform-cli": "^2.6.0",
-        "@hashicorp/platform-content-conformance": "^0.0.9",
+        "@hashicorp/platform-cli": "^1.2.0",
         "dart-linkcheck": "2.0.15",
-        "next": "^12.3.1",
         "prettier": "2.2.1",
         "simple-git-hooks": "^2.6.1"
       },
       "engines": {
-        "node": ">=12.0.0 <= 16.x",
+        "node": ">=12.0.0",
         "npm": ">=7.0.0"
       }
     },
@@ -202,10 +200,10 @@
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.20.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz",
-      "integrity": "sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==",
+      "version": "7.14.5",
+      "integrity": "sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==",
       "dev": true,
+      "peer": true,
       "engines": {
         "node": ">=6.9.0"
       }
@@ -355,20 +353,6 @@
         "node": ">=6.0.0"
       }
     },
-    "node_modules/@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz",
-      "integrity": "sha512-s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
-        "@babel/plugin-transform-parameters": "^7.12.1"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
     "node_modules/@babel/plugin-syntax-async-generators": {
       "version": "7.8.4",
       "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
@@ -429,18 +413,6 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-jsx": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.1.tgz",
-      "integrity": "sha512-1yRi7yAtB0ETgxdY9ti/p2TivUxJkTdhu/ZbF9MshVGqOx1TdB3b7xCXs49Fupgg50N45KcAsRP/ZqWjs9SRjg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
     "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
       "version": "7.10.4",
       "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
@@ -481,6 +453,7 @@
       "version": "7.8.3",
       "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -527,28 +500,24 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.7.tgz",
-      "integrity": "sha512-WiWBIkeHKVOSYPO0pWkxGPfKeWrCJyD3NJ53+Lrp/QMSZbsVPovrVl2aWZ19D/LTVnaDv5Ap7GJ/B2CTOZdrfA==",
+    "node_modules/@babel/runtime": {
+      "version": "7.15.4",
+      "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.20.2"
+        "regenerator-runtime": "^0.13.4"
       },
       "engines": {
         "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/runtime": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.7.tgz",
-      "integrity": "sha512-UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ==",
+    "node_modules/@babel/runtime-corejs3": {
+      "version": "7.15.4",
+      "integrity": "sha512-lWcAqKeB624/twtTc3w6w/2o9RqJPaNBhPGK6DKLSiwuVWC7WFkypWyNg+CpZoyJH0jVzv1uMtXZ/5/lQOLtCg==",
       "dev": true,
       "dependencies": {
-        "regenerator-runtime": "^0.13.11"
+        "core-js-pure": "^3.16.0",
+        "regenerator-runtime": "^0.13.4"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -621,32 +590,35 @@
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz",
-      "integrity": "sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==",
+      "version": "0.4.3",
+      "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
       "dev": true,
       "dependencies": {
         "ajv": "^6.12.4",
-        "debug": "^4.3.2",
-        "espree": "^9.4.0",
-        "globals": "^13.19.0",
-        "ignore": "^5.2.0",
+        "debug": "^4.1.1",
+        "espree": "^7.3.0",
+        "globals": "^13.9.0",
+        "ignore": "^4.0.6",
         "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "minimatch": "^3.1.2",
+        "js-yaml": "^3.13.1",
+        "minimatch": "^3.0.4",
         "strip-json-comments": "^3.1.1"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/argparse": {
+      "version": "1.0.10",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
       }
     },
     "node_modules/@eslint/eslintrc/node_modules/globals": {
-      "version": "13.19.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz",
-      "integrity": "sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==",
+      "version": "13.11.0",
+      "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==",
       "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -658,9 +630,20 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/@eslint/eslintrc/node_modules/js-yaml": {
+      "version": "3.14.1",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
     "node_modules/@eslint/eslintrc/node_modules/type-fest": {
       "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
       "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
       "dev": true,
       "engines": {
@@ -670,29 +653,54 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/@hapi/accept": {
+      "version": "5.0.2",
+      "integrity": "sha512-CmzBx/bXUR8451fnZRuZAJRlzgm0Jgu5dltTX/bszmR2lheb9BpyN47Q1RbaGTsvFzn0PXAEs+lXDKfshccYZw==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@hapi/boom": "9.x.x",
+        "@hapi/hoek": "9.x.x"
+      }
+    },
+    "node_modules/@hapi/boom": {
+      "version": "9.1.4",
+      "integrity": "sha512-Ls1oH8jaN1vNsqcaHVYJrKmgMcKsC1wcp8bujvXrHaAqD2iDYq3HoOwsxwo09Cuda5R5nC0o0IxlrlTuvPuzSw==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@hapi/hoek": "9.x.x"
+      }
+    },
+    "node_modules/@hapi/hoek": {
+      "version": "9.2.1",
+      "integrity": "sha512-gfta+H8aziZsm8pZa0vj04KO6biEiisppNgA1kbJvFrrWu9Vm7eaUEy76DIxsuTaWvti5fkJVhllWc6ZTE+Mdw==",
+      "dev": true,
+      "peer": true
+    },
     "node_modules/@hashicorp/platform-cli": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/@hashicorp/platform-cli/-/platform-cli-2.6.0.tgz",
-      "integrity": "sha512-nMO7Uiy/A5CT/BCE9RyQt6/Uci7bxwTesxCNWkXlciyqlIrz9WmBa9hr710IiMoDzrzQ1tL6AgFIeTbXs4RTqA==",
+      "version": "1.2.0",
+      "integrity": "sha512-bdGYmqRxxApO+WKPoj8Tc6cWLY2zfPIOQUwnSAcheSE3hIwhscEeudkAxQhKGtgjX4HazgfhEBmQEcJ8T28Bew==",
       "dev": true,
       "dependencies": {
         "@hashicorp/platform-cms": "0.3.0",
-        "@typescript-eslint/eslint-plugin": "^5.48.0",
-        "@typescript-eslint/parser": "^5.48.0",
+        "@typescript-eslint/eslint-plugin": "4.9.1",
+        "@typescript-eslint/parser": "4.9.1",
+        "babel-eslint": "10.1.0",
         "chalk": "4.1.0",
         "commander": "7.2.0",
         "ejs": "3.1.5",
-        "eslint": "^8.31.0",
-        "eslint-config-next": "^13.1.1",
-        "eslint-config-prettier": "^8.6.0",
-        "eslint-plugin-jsx-a11y": "^6.6.1",
-        "eslint-plugin-prettier": "^4.2.1",
+        "eslint": "7.23.0",
+        "eslint-config-next": "^11.0.1",
+        "eslint-config-prettier": "7.0.0",
+        "eslint-plugin-jsx-a11y": "6.4.1",
+        "eslint-plugin-prettier": "3.3.0",
         "fs-extra": "9.0.1",
         "globby": "11.0.1",
         "inquirer": "7.3.3",
         "lint-staged": "11.1.2",
         "open": "7.3.0",
-        "prettier": "2.5.1",
+        "prettier": "2.2.1",
         "readdirp": "3.5.0",
         "signale": "1.4.0",
         "slugify": "1.4.6",
@@ -710,18 +718,6 @@
         "next-hashicorp": "next-hashicorp"
       }
     },
-    "node_modules/@hashicorp/platform-cli/node_modules/prettier": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.5.1.tgz",
-      "integrity": "sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==",
-      "dev": true,
-      "bin": {
-        "prettier": "bin-prettier.js"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
     "node_modules/@hashicorp/platform-cms": {
       "version": "0.3.0",
       "integrity": "sha512-sRX9A+kDEZvfZy8PvGFbEaHjn5G1mEsHwTri1vDnrmKG8apE+ELlug83b0iEkD5wIJi9OqaewMIb0NrLxg9s5A==",
@@ -730,519 +726,189 @@
         "rivet-graphql": "0.3.1"
       }
     },
-    "node_modules/@hashicorp/platform-content-conformance": {
-      "version": "0.0.9",
-      "resolved": "https://registry.npmjs.org/@hashicorp/platform-content-conformance/-/platform-content-conformance-0.0.9.tgz",
-      "integrity": "sha512-kotY/4M/0YjiUGPgXv9vbWMiZJV5N5tlXTN3e+VzTQlQfbEXP1xYDcs6pNMtxbxCwfS29pkNRIWAsnGVIbBISw==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^6.3.0",
-        "flat": "^5.0.2",
-        "globby": "^13.1.2",
-        "mdast-util-to-string": "^3.1.0",
-        "remark": "12.0.1",
-        "remark-mdx": "^1.6.22",
-        "unified-lint-rule": "^2.1.1",
-        "unist-util-stringify-position": "^3.0.2",
-        "unist-util-visit": "^4.1.1",
-        "vfile": "^5.3.6",
-        "vfile-matter": "^4.0.0",
-        "vfile-reporter": "^7.0.4",
-        "vfile-reporter-json": "^3.2.0",
-        "vfile-statistics": "^2.0.0",
-        "yaml": "^2.1.3",
-        "yargs": "^17.4.1",
-        "zod": "^3.19.1"
-      },
-      "bin": {
-        "hc-content": "dist/cli.js"
-      }
-    },
-    "node_modules/@hashicorp/platform-content-conformance/node_modules/cliui": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+    "node_modules/@istanbuljs/load-nyc-config": {
+      "version": "1.1.0",
+      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.1",
-        "wrap-ansi": "^7.0.0"
+        "camelcase": "^5.3.1",
+        "find-up": "^4.1.0",
+        "get-package-type": "^0.1.0",
+        "js-yaml": "^3.13.1",
+        "resolve-from": "^5.0.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=8"
       }
     },
-    "node_modules/@hashicorp/platform-content-conformance/node_modules/find-up": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz",
-      "integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==",
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/argparse": {
+      "version": "1.0.10",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "locate-path": "^7.1.0",
-        "path-exists": "^5.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "sprintf-js": "~1.0.2"
       }
     },
-    "node_modules/@hashicorp/platform-content-conformance/node_modules/globby": {
-      "version": "13.1.3",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-13.1.3.tgz",
-      "integrity": "sha512-8krCNHXvlCgHDpegPzleMq07yMYTO2sXKASmZmquEYWEmCx6J5UTRbp5RwMJkTJGtcQ44YpiUYUiN0b9mzy8Bw==",
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": {
+      "version": "4.1.0",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.11",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^4.0.0"
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
       },
       "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=8"
       }
     },
-    "node_modules/@hashicorp/platform-content-conformance/node_modules/locate-path": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz",
-      "integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==",
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/js-yaml": {
+      "version": "3.14.1",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "p-locate": "^6.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/@hashicorp/platform-content-conformance/node_modules/mdast-util-to-string": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-3.1.1.tgz",
-      "integrity": "sha512-tGvhT94e+cVnQt8JWE9/b3cUQZWS732TJxXHktvP+BYo62PpYD53Ls/6cC60rW21dW+txxiM4zMdc6abASvZKA==",
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/locate-path": {
+      "version": "5.0.0",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "@types/mdast": "^3.0.0"
+        "p-locate": "^4.1.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/@hashicorp/platform-content-conformance/node_modules/p-limit": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz",
-      "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==",
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/p-limit": {
+      "version": "2.3.0",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "yocto-queue": "^1.0.0"
+        "p-try": "^2.0.0"
       },
       "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+        "node": ">=6"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@hashicorp/platform-content-conformance/node_modules/p-locate": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz",
-      "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==",
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/p-locate": {
+      "version": "4.1.0",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "p-limit": "^4.0.0"
+        "p-limit": "^2.2.0"
       },
       "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=8"
       }
     },
-    "node_modules/@hashicorp/platform-content-conformance/node_modules/path-exists": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz",
-      "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==",
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/path-exists": {
+      "version": "4.0.0",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
       "dev": true,
+      "peer": true,
       "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      }
-    },
-    "node_modules/@hashicorp/platform-content-conformance/node_modules/remark": {
-      "version": "12.0.1",
-      "resolved": "https://registry.npmjs.org/remark/-/remark-12.0.1.tgz",
-      "integrity": "sha512-gS7HDonkdIaHmmP/+shCPejCEEW+liMp/t/QwmF0Xt47Rpuhl32lLtDV1uKWvGoq+kxr5jSgg5oAIpGuyULjUw==",
-      "dev": true,
-      "dependencies": {
-        "remark-parse": "^8.0.0",
-        "remark-stringify": "^8.0.0",
-        "unified": "^9.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+        "node": ">=8"
       }
     },
-    "node_modules/@hashicorp/platform-content-conformance/node_modules/remark-stringify": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-8.1.1.tgz",
-      "integrity": "sha512-q4EyPZT3PcA3Eq7vPpT6bIdokXzFGp9i85igjmhRyXWmPs0Y6/d2FYwUNotKAWyLch7g0ASZJn/KHHcHZQ163A==",
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/resolve-from": {
+      "version": "5.0.0",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
       "dev": true,
-      "dependencies": {
-        "ccount": "^1.0.0",
-        "is-alphanumeric": "^1.0.0",
-        "is-decimal": "^1.0.0",
-        "is-whitespace-character": "^1.0.0",
-        "longest-streak": "^2.0.1",
-        "markdown-escapes": "^1.0.0",
-        "markdown-table": "^2.0.0",
-        "mdast-util-compact": "^2.0.0",
-        "parse-entities": "^2.0.0",
-        "repeat-string": "^1.5.4",
-        "state-toggle": "^1.0.0",
-        "stringify-entities": "^3.0.0",
-        "unherit": "^1.0.4",
-        "xtend": "^4.0.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+      "peer": true,
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/@hashicorp/platform-content-conformance/node_modules/slash": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
-      "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
+    "node_modules/@istanbuljs/schema": {
+      "version": "0.1.3",
+      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
       "dev": true,
+      "peer": true,
       "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=8"
       }
     },
-    "node_modules/@hashicorp/platform-content-conformance/node_modules/unist-util-stringify-position": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.3.tgz",
-      "integrity": "sha512-k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg==",
+    "node_modules/@jest/console": {
+      "version": "26.6.2",
+      "integrity": "sha512-IY1R2i2aLsLr7Id3S6p2BA82GNWryt4oSvEXLAKc+L2zdi89dSkE8xC1C+0kpATG4JhBJREnQOH7/zmccM2B0g==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "@types/unist": "^2.0.0"
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "jest-message-util": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "slash": "^3.0.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+      "engines": {
+        "node": ">= 10.14.2"
       }
     },
-    "node_modules/@hashicorp/platform-content-conformance/node_modules/vfile": {
-      "version": "5.3.7",
-      "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.7.tgz",
-      "integrity": "sha512-r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g==",
+    "node_modules/@jest/core": {
+      "version": "26.6.3",
+      "integrity": "sha512-xvV1kKbhfUqFVuZ8Cyo+JPpipAHHAV3kcDBftiduK8EICXmTFddryy3P7NfZt8Pv37rA9nEJBKCCkglCPt/Xjw==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "@types/unist": "^2.0.0",
-        "is-buffer": "^2.0.0",
-        "unist-util-stringify-position": "^3.0.0",
-        "vfile-message": "^3.0.0"
+        "@jest/console": "^26.6.2",
+        "@jest/reporters": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.4",
+        "jest-changed-files": "^26.6.2",
+        "jest-config": "^26.6.3",
+        "jest-haste-map": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-regex-util": "^26.0.0",
+        "jest-resolve": "^26.6.2",
+        "jest-resolve-dependencies": "^26.6.3",
+        "jest-runner": "^26.6.3",
+        "jest-runtime": "^26.6.3",
+        "jest-snapshot": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
+        "jest-watcher": "^26.6.2",
+        "micromatch": "^4.0.2",
+        "p-each-series": "^2.1.0",
+        "rimraf": "^3.0.0",
+        "slash": "^3.0.0",
+        "strip-ansi": "^6.0.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+      "engines": {
+        "node": ">= 10.14.2"
       }
     },
-    "node_modules/@hashicorp/platform-content-conformance/node_modules/vfile-message": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.4.tgz",
-      "integrity": "sha512-fa0Z6P8HUrQN4BZaX05SIVXic+7kE3b05PWAtPuYP9QLHsLKYR7/AlLW3NtOrpXRLeawpDLMsVkmk5DG0NXgWw==",
+    "node_modules/@jest/environment": {
+      "version": "26.6.2",
+      "integrity": "sha512-nFy+fHl28zUrRsCeMB61VDThV1pVTtlEokBRgqPrcT1JNq4yRNIyTHfyht6PqtUvY9IsuLGTrbG8kPXjSZIZwA==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "@types/unist": "^2.0.0",
-        "unist-util-stringify-position": "^3.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/@hashicorp/platform-content-conformance/node_modules/y18n": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@hashicorp/platform-content-conformance/node_modules/yaml": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.2.1.tgz",
-      "integrity": "sha512-e0WHiYql7+9wr4cWMx3TVQrNwejKaEe7/rHNmQmqRjazfOP5W8PB6Jpebb5o6fIapbz9o9+2ipcaTM2ZwDI6lw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/@hashicorp/platform-content-conformance/node_modules/yargs": {
-      "version": "17.7.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz",
-      "integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==",
-      "dev": true,
-      "dependencies": {
-        "cliui": "^8.0.1",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.3",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^21.1.1"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@hashicorp/platform-content-conformance/node_modules/yargs-parser": {
-      "version": "21.1.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@hashicorp/platform-content-conformance/node_modules/yocto-queue": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz",
-      "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==",
-      "dev": true,
-      "engines": {
-        "node": ">=12.20"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.8",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
-      "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==",
-      "dev": true,
-      "dependencies": {
-        "@humanwhocodes/object-schema": "^1.2.1",
-        "debug": "^4.1.1",
-        "minimatch": "^3.0.5"
-      },
-      "engines": {
-        "node": ">=10.10.0"
-      }
-    },
-    "node_modules/@humanwhocodes/module-importer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
-      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
-      "dev": true,
-      "engines": {
-        "node": ">=12.22"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/nzakas"
-      }
-    },
-    "node_modules/@humanwhocodes/object-schema": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
-      "dev": true
-    },
-    "node_modules/@istanbuljs/load-nyc-config": {
-      "version": "1.1.0",
-      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "camelcase": "^5.3.1",
-        "find-up": "^4.1.0",
-        "get-package-type": "^0.1.0",
-        "js-yaml": "^3.13.1",
-        "resolve-from": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/argparse": {
-      "version": "1.0.10",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": {
-      "version": "4.1.0",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/js-yaml": {
-      "version": "3.14.1",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/locate-path": {
-      "version": "5.0.0",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/p-limit": {
-      "version": "2.3.0",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/p-locate": {
-      "version": "4.1.0",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/path-exists": {
-      "version": "4.0.0",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/resolve-from": {
-      "version": "5.0.0",
-      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@istanbuljs/schema": {
-      "version": "0.1.3",
-      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/console": {
-      "version": "26.6.2",
-      "integrity": "sha512-IY1R2i2aLsLr7Id3S6p2BA82GNWryt4oSvEXLAKc+L2zdi89dSkE8xC1C+0kpATG4JhBJREnQOH7/zmccM2B0g==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@jest/types": "^26.6.2",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "jest-message-util": "^26.6.2",
-        "jest-util": "^26.6.2",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/@jest/core": {
-      "version": "26.6.3",
-      "integrity": "sha512-xvV1kKbhfUqFVuZ8Cyo+JPpipAHHAV3kcDBftiduK8EICXmTFddryy3P7NfZt8Pv37rA9nEJBKCCkglCPt/Xjw==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@jest/console": "^26.6.2",
-        "@jest/reporters": "^26.6.2",
-        "@jest/test-result": "^26.6.2",
-        "@jest/transform": "^26.6.2",
-        "@jest/types": "^26.6.2",
-        "@types/node": "*",
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.0.0",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.4",
-        "jest-changed-files": "^26.6.2",
-        "jest-config": "^26.6.3",
-        "jest-haste-map": "^26.6.2",
-        "jest-message-util": "^26.6.2",
-        "jest-regex-util": "^26.0.0",
-        "jest-resolve": "^26.6.2",
-        "jest-resolve-dependencies": "^26.6.3",
-        "jest-runner": "^26.6.3",
-        "jest-runtime": "^26.6.3",
-        "jest-snapshot": "^26.6.2",
-        "jest-util": "^26.6.2",
-        "jest-validate": "^26.6.2",
-        "jest-watcher": "^26.6.2",
-        "micromatch": "^4.0.2",
-        "p-each-series": "^2.1.0",
-        "rimraf": "^3.0.0",
-        "slash": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/@jest/environment": {
-      "version": "26.6.2",
-      "integrity": "sha512-nFy+fHl28zUrRsCeMB61VDThV1pVTtlEokBRgqPrcT1JNq4yRNIyTHfyht6PqtUvY9IsuLGTrbG8kPXjSZIZwA==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@jest/fake-timers": "^26.6.2",
-        "@jest/types": "^26.6.2",
-        "@types/node": "*",
-        "jest-mock": "^26.6.2"
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "jest-mock": "^26.6.2"
       },
       "engines": {
         "node": ">= 10.14.2"
@@ -1430,26 +1096,21 @@
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/@mdx-js/util": {
-      "version": "1.6.22",
-      "resolved": "https://registry.npmjs.org/@mdx-js/util/-/util-1.6.22.tgz",
-      "integrity": "sha512-H1rQc1ZOHANWBvPcW+JpGwr+juXSxM8Q8YCkm3GhZd8REu1fHR3z99CErO1p9pkcfcxZnMdIZdIsXkOHY0NilA==",
+    "node_modules/@napi-rs/triples": {
+      "version": "1.0.3",
+      "integrity": "sha512-jDJTpta+P4p1NZTFVLHJ/TLFVYVcOqv6l8xwOeBKNPMgY/zDYH/YH7SJbvrr/h1RcS9GzbPcLKGzpuK9cV56UA==",
       "dev": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
+      "peer": true
     },
     "node_modules/@next/env": {
-      "version": "12.3.1",
-      "resolved": "https://registry.npmjs.org/@next/env/-/env-12.3.1.tgz",
-      "integrity": "sha512-9P9THmRFVKGKt9DYqeC2aKIxm8rlvkK38V1P1sRE7qyoPBIs8l9oo79QoSdPtOWfzkbDAVUqvbQGgTMsb8BtJg==",
-      "dev": true
+      "version": "11.1.2",
+      "integrity": "sha512-+fteyVdQ7C/OoulfcF6vd1Yk0FEli4453gr8kSFbU8sKseNSizYq6df5MKz/AjwLptsxrUeIkgBdAzbziyJ3mA==",
+      "dev": true,
+      "peer": true
     },
     "node_modules/@next/eslint-plugin-next": {
-      "version": "13.1.2",
-      "resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-13.1.2.tgz",
-      "integrity": "sha512-WGaNVvIYphdriesP6r7jq/8l7u38tzotnVQuxc1RYKLqYYApSsrebti3OCPoT3Gx0pw2smPIFHH98RzcsgW5GQ==",
+      "version": "11.1.2",
+      "integrity": "sha512-cN+ojHRsufr9Yz0rtvjv8WI5En0RPZRJnt0y16Ha7DD+0n473evz8i1ETEJHmOLeR7iPJR0zxRrxeTN/bJMOjg==",
       "dev": true,
       "dependencies": {
         "glob": "7.1.7"
@@ -1457,7 +1118,6 @@
     },
     "node_modules/@next/eslint-plugin-next/node_modules/glob": {
       "version": "7.1.7",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
       "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
       "dev": true,
       "dependencies": {
@@ -1475,214 +1135,165 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/@next/swc-android-arm-eabi": {
-      "version": "12.3.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-12.3.1.tgz",
-      "integrity": "sha512-i+BvKA8tB//srVPPQxIQN5lvfROcfv4OB23/L1nXznP+N/TyKL8lql3l7oo2LNhnH66zWhfoemg3Q4VJZSruzQ==",
-      "cpu": [
-        "arm"
-      ],
+    "node_modules/@next/polyfill-module": {
+      "version": "11.1.2",
+      "integrity": "sha512-xZmixqADM3xxtqBV0TpAwSFzWJP0MOQzRfzItHXf1LdQHWb0yofHHC+7eOrPFic8+ZGz5y7BdPkkgR1S25OymA==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
+      "peer": true
     },
-    "node_modules/@next/swc-android-arm64": {
-      "version": "12.3.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-android-arm64/-/swc-android-arm64-12.3.1.tgz",
-      "integrity": "sha512-CmgU2ZNyBP0rkugOOqLnjl3+eRpXBzB/I2sjwcGZ7/Z6RcUJXK5Evz+N0ucOxqE4cZ3gkTeXtSzRrMK2mGYV8Q==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/@next/react-dev-overlay": {
+      "version": "11.1.2",
+      "integrity": "sha512-rDF/mGY2NC69mMg2vDqzVpCOlWqnwPUXB2zkARhvknUHyS6QJphPYv9ozoPJuoT/QBs49JJd9KWaAzVBvq920A==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">= 10"
+      "peer": true,
+      "dependencies": {
+        "@babel/code-frame": "7.12.11",
+        "anser": "1.4.9",
+        "chalk": "4.0.0",
+        "classnames": "2.2.6",
+        "css.escape": "1.5.1",
+        "data-uri-to-buffer": "3.0.1",
+        "platform": "1.3.6",
+        "shell-quote": "1.7.2",
+        "source-map": "0.8.0-beta.0",
+        "stacktrace-parser": "0.1.10",
+        "strip-ansi": "6.0.0"
+      },
+      "peerDependencies": {
+        "react": "^17.0.2",
+        "react-dom": "^17.0.2"
       }
     },
-    "node_modules/@next/swc-darwin-arm64": {
-      "version": "12.3.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-12.3.1.tgz",
-      "integrity": "sha512-hT/EBGNcu0ITiuWDYU9ur57Oa4LybD5DOQp4f22T6zLfpoBMfBibPtR8XktXmOyFHrL/6FC2p9ojdLZhWhvBHg==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/@next/react-dev-overlay/node_modules/@babel/code-frame": {
+      "version": "7.12.11",
+      "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">= 10"
+      "peer": true,
+      "dependencies": {
+        "@babel/highlight": "^7.10.4"
       }
     },
-    "node_modules/@next/swc-darwin-x64": {
-      "version": "12.3.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-12.3.1.tgz",
-      "integrity": "sha512-9S6EVueCVCyGf2vuiLiGEHZCJcPAxglyckTZcEwLdJwozLqN0gtS0Eq0bQlGS3dH49Py/rQYpZ3KVWZ9BUf/WA==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/@next/react-dev-overlay/node_modules/chalk": {
+      "version": "4.0.0",
+      "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
+      "peer": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
       "engines": {
-        "node": ">= 10"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@next/swc-freebsd-x64": {
-      "version": "12.3.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-freebsd-x64/-/swc-freebsd-x64-12.3.1.tgz",
-      "integrity": "sha512-qcuUQkaBZWqzM0F1N4AkAh88lLzzpfE6ImOcI1P6YeyJSsBmpBIV8o70zV+Wxpc26yV9vpzb+e5gCyxNjKJg5Q==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/@next/react-dev-overlay/node_modules/classnames": {
+      "version": "2.2.6",
+      "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
+      "peer": true
     },
-    "node_modules/@next/swc-linux-arm-gnueabihf": {
-      "version": "12.3.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm-gnueabihf/-/swc-linux-arm-gnueabihf-12.3.1.tgz",
-      "integrity": "sha512-diL9MSYrEI5nY2wc/h/DBewEDUzr/DqBjIgHJ3RUNtETAOB3spMNHvJk2XKUDjnQuluLmFMloet9tpEqU2TT9w==",
-      "cpu": [
-        "arm"
-      ],
+    "node_modules/@next/react-dev-overlay/node_modules/punycode": {
+      "version": "2.1.1",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
+      "peer": true,
       "engines": {
-        "node": ">= 10"
+        "node": ">=6"
       }
     },
-    "node_modules/@next/swc-linux-arm64-gnu": {
-      "version": "12.3.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-12.3.1.tgz",
-      "integrity": "sha512-o/xB2nztoaC7jnXU3Q36vGgOolJpsGG8ETNjxM1VAPxRwM7FyGCPHOMk1XavG88QZSQf+1r+POBW0tLxQOJ9DQ==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/@next/react-dev-overlay/node_modules/source-map": {
+      "version": "0.8.0-beta.0",
+      "integrity": "sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
+      "peer": true,
+      "dependencies": {
+        "whatwg-url": "^7.0.0"
+      },
       "engines": {
-        "node": ">= 10"
+        "node": ">= 8"
       }
     },
-    "node_modules/@next/swc-linux-arm64-musl": {
-      "version": "12.3.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-12.3.1.tgz",
-      "integrity": "sha512-2WEasRxJzgAmP43glFNhADpe8zB7kJofhEAVNbDJZANp+H4+wq+/cW1CdDi8DqjkShPEA6/ejJw+xnEyDID2jg==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/@next/react-dev-overlay/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
+      "peer": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
       "engines": {
-        "node": ">= 10"
+        "node": ">=8"
       }
     },
-    "node_modules/@next/swc-linux-x64-gnu": {
-      "version": "12.3.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-12.3.1.tgz",
-      "integrity": "sha512-JWEaMyvNrXuM3dyy9Pp5cFPuSSvG82+yABqsWugjWlvfmnlnx9HOQZY23bFq3cNghy5V/t0iPb6cffzRWylgsA==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/@next/react-dev-overlay/node_modules/tr46": {
+      "version": "1.0.1",
+      "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=",
       "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
+      "peer": true,
+      "dependencies": {
+        "punycode": "^2.1.0"
       }
     },
-    "node_modules/@next/swc-linux-x64-musl": {
-      "version": "12.3.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-12.3.1.tgz",
-      "integrity": "sha512-xoEWQQ71waWc4BZcOjmatuvPUXKTv6MbIFzpm4LFeCHsg2iwai0ILmNXf81rJR+L1Wb9ifEke2sQpZSPNz1Iyg==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/@next/react-dev-overlay/node_modules/webidl-conversions": {
+      "version": "4.0.2",
+      "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
+      "peer": true
     },
-    "node_modules/@next/swc-win32-arm64-msvc": {
-      "version": "12.3.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-12.3.1.tgz",
-      "integrity": "sha512-hswVFYQYIeGHE2JYaBVtvqmBQ1CppplQbZJS/JgrVI3x2CurNhEkmds/yqvDONfwfbttTtH4+q9Dzf/WVl3Opw==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/@next/react-dev-overlay/node_modules/whatwg-url": {
+      "version": "7.1.0",
+      "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10"
+      "peer": true,
+      "dependencies": {
+        "lodash.sortby": "^4.7.0",
+        "tr46": "^1.0.1",
+        "webidl-conversions": "^4.0.2"
       }
     },
-    "node_modules/@next/swc-win32-ia32-msvc": {
-      "version": "12.3.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-12.3.1.tgz",
-      "integrity": "sha512-Kny5JBehkTbKPmqulr5i+iKntO5YMP+bVM8Hf8UAmjSMVo3wehyLVc9IZkNmcbxi+vwETnQvJaT5ynYBkJ9dWA==",
-      "cpu": [
-        "ia32"
-      ],
+    "node_modules/@next/react-refresh-utils": {
+      "version": "11.1.2",
+      "integrity": "sha512-hsoJmPfhVqjZ8w4IFzoo8SyECVnN+8WMnImTbTKrRUHOVJcYMmKLL7xf7T0ft00tWwAl/3f3Q3poWIN2Ueql/Q==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10"
+      "peer": true,
+      "peerDependencies": {
+        "react-refresh": "0.8.3",
+        "webpack": "^4 || ^5"
+      },
+      "peerDependenciesMeta": {
+        "webpack": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@next/swc-win32-x64-msvc": {
-      "version": "12.3.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-12.3.1.tgz",
-      "integrity": "sha512-W1ijvzzg+kPEX6LAc+50EYYSEo0FVu7dmTE+t+DM4iOLqgGHoW9uYSz9wCVdkXOEEMP9xhXfGpcSxsfDucyPkA==",
+    "node_modules/@next/swc-darwin-x64": {
+      "version": "11.1.2",
+      "integrity": "sha512-PGOp0E1GisU+EJJlsmJVGE+aPYD0Uh7zqgsrpD3F/Y3766Ptfbe1lEPPWnRDl+OzSSrSrX1lkyM/Jlmh5OwNvA==",
       "cpu": [
         "x64"
       ],
       "dev": true,
       "optional": true,
       "os": [
-        "win32"
+        "darwin"
       ],
+      "peer": true,
       "engines": {
         "node": ">= 10"
       }
     },
+    "node_modules/@node-rs/helper": {
+      "version": "1.2.1",
+      "integrity": "sha512-R5wEmm8nbuQU0YGGmYVjEc0OHtYsuXdpRG+Ut/3wZ9XAvQWyThN08bTh2cBJgoZxHQUPtvRfeQuxcAgLuiBISg==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@napi-rs/triples": "^1.0.3"
+      }
+    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
@@ -1715,53 +1326,9 @@
         "node": ">= 8"
       }
     },
-    "node_modules/@pkgr/utils": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/@pkgr/utils/-/utils-2.3.1.tgz",
-      "integrity": "sha512-wfzX8kc1PMyUILA+1Z/EqoE4UCXGy0iRGMhPwdfae1+f0OXlLqCk+By+aMzgJBzR9AzS4CDizioG6Ss1gvAFJw==",
-      "dev": true,
-      "dependencies": {
-        "cross-spawn": "^7.0.3",
-        "is-glob": "^4.0.3",
-        "open": "^8.4.0",
-        "picocolors": "^1.0.0",
-        "tiny-glob": "^0.2.9",
-        "tslib": "^2.4.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/unts"
-      }
-    },
-    "node_modules/@pkgr/utils/node_modules/open": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz",
-      "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==",
-      "dev": true,
-      "dependencies": {
-        "define-lazy-prop": "^2.0.0",
-        "is-docker": "^2.1.1",
-        "is-wsl": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@pkgr/utils/node_modules/picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
-      "dev": true
-    },
     "node_modules/@rushstack/eslint-patch": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.2.0.tgz",
-      "integrity": "sha512-sXo/qW2/pAcmT43VoRKOJbDOfV3cYpq3szSVfIThQXNt+E4DfKj361vaAt3c88U5tPUxzEswam7GW48PJqtKAg==",
+      "version": "1.0.7",
+      "integrity": "sha512-3Zi2LGbCLDz4IIL7ir6wD0u/ggHotLkK5SlVzFzTcYaNgPR4MAt/9JYZqXWKcofPWEoptfpnCJU8Bq9sxw8QUg==",
       "dev": true
     },
     "node_modules/@sinonjs/commons": {
@@ -1808,15 +1375,6 @@
         "postcss-syntax": ">=0.36.2"
       }
     },
-    "node_modules/@swc/helpers": {
-      "version": "0.4.11",
-      "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.4.11.tgz",
-      "integrity": "sha512-rEUrBSGIoSFuYxwBYtlUFMlE2CwGhmW+w9355/5oduSw8e5h2+Tj4UrAGNNgP9915++wj5vkQo0UuOBqOAq4nw==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^2.4.0"
-      }
-    },
     "node_modules/@tootallnate/once": {
       "version": "1.1.2",
       "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
@@ -1898,15 +1456,13 @@
       }
     },
     "node_modules/@types/json-schema": {
-      "version": "7.0.11",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
-      "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
+      "version": "7.0.9",
+      "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
       "dev": true
     },
     "node_modules/@types/json5": {
       "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
+      "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
       "dev": true
     },
     "node_modules/@types/mdast": {
@@ -1943,24 +1499,12 @@
       "dev": true,
       "peer": true
     },
-    "node_modules/@types/semver": {
-      "version": "7.3.13",
-      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz",
-      "integrity": "sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==",
-      "dev": true
-    },
     "node_modules/@types/stack-utils": {
       "version": "2.0.1",
       "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==",
       "dev": true,
       "peer": true
     },
-    "node_modules/@types/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/@types/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-dPWnWsf+kzIG140B8z2w3fr5D03TLWbOAFQl45xUpI3vcizeXriNR5VYkWZ+WTMsUHqZ9Xlt3hrxGNANFyNQfw==",
-      "dev": true
-    },
     "node_modules/@types/unist": {
       "version": "2.0.6",
       "integrity": "sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==",
@@ -1980,31 +1524,28 @@
       "dev": true
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "5.48.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.48.1.tgz",
-      "integrity": "sha512-9nY5K1Rp2ppmpb9s9S2aBiF3xo5uExCehMDmYmmFqqyxgenbHJ3qbarcLt4ITgaD6r/2ypdlcFRdcuVPnks+fQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/scope-manager": "5.48.1",
-        "@typescript-eslint/type-utils": "5.48.1",
-        "@typescript-eslint/utils": "5.48.1",
-        "debug": "^4.3.4",
-        "ignore": "^5.2.0",
-        "natural-compare-lite": "^1.4.0",
-        "regexpp": "^3.2.0",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
+      "version": "4.9.1",
+      "integrity": "sha512-QRLDSvIPeI1pz5tVuurD+cStNR4sle4avtHhxA+2uyixWGFjKzJ+EaFVRW6dA/jOgjV5DTAjOxboQkRDE8cRlQ==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/experimental-utils": "4.9.1",
+        "@typescript-eslint/scope-manager": "4.9.1",
+        "debug": "^4.1.1",
+        "functional-red-black-tree": "^1.0.1",
+        "regexpp": "^3.0.0",
+        "semver": "^7.3.2",
+        "tsutils": "^3.17.1"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^10.12.0 || >=12.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^5.0.0",
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+        "@typescript-eslint/parser": "^4.0.0",
+        "eslint": "^5.0.0 || ^6.0.0 || ^7.0.0"
       },
       "peerDependenciesMeta": {
         "typescript": {
@@ -2012,41 +1553,48 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+    "node_modules/@typescript-eslint/experimental-utils": {
+      "version": "4.9.1",
+      "integrity": "sha512-c3k/xJqk0exLFs+cWSJxIjqLYwdHCuLWhnpnikmPQD2+NGAx9KjLYlBDcSI81EArh9FDYSL6dslAUSwILeWOxg==",
       "dev": true,
       "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
+        "@types/json-schema": "^7.0.3",
+        "@typescript-eslint/scope-manager": "4.9.1",
+        "@typescript-eslint/types": "4.9.1",
+        "@typescript-eslint/typescript-estree": "4.9.1",
+        "eslint-scope": "^5.0.0",
+        "eslint-utils": "^2.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "*"
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "5.48.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.48.1.tgz",
-      "integrity": "sha512-4yg+FJR/V1M9Xoq56SF9Iygqm+r5LMXvheo6DQ7/yUWynQ4YfCRnsKuRgqH4EQ5Ya76rVwlEpw4Xu+TgWQUcdA==",
+      "version": "4.9.1",
+      "integrity": "sha512-Gv2VpqiomvQ2v4UL+dXlQcZ8zCX4eTkoIW+1aGVWT6yTO+6jbxsw7yQl2z2pPl/4B9qa5JXeIbhJpONKjXIy3g==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "5.48.1",
-        "@typescript-eslint/types": "5.48.1",
-        "@typescript-eslint/typescript-estree": "5.48.1",
-        "debug": "^4.3.4"
+        "@typescript-eslint/scope-manager": "4.9.1",
+        "@typescript-eslint/types": "4.9.1",
+        "@typescript-eslint/typescript-estree": "4.9.1",
+        "debug": "^4.1.1"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^10.12.0 || >=12.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+        "eslint": "^5.0.0 || ^6.0.0 || ^7.0.0"
       },
       "peerDependenciesMeta": {
         "typescript": {
@@ -2055,56 +1603,27 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "5.48.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.48.1.tgz",
-      "integrity": "sha512-S035ueRrbxRMKvSTv9vJKIWgr86BD8s3RqoRZmsSh/s8HhIs90g6UlK8ZabUSjUZQkhVxt7nmZ63VJ9dcZhtDQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "5.48.1",
-        "@typescript-eslint/visitor-keys": "5.48.1"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils": {
-      "version": "5.48.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.48.1.tgz",
-      "integrity": "sha512-Hyr8HU8Alcuva1ppmqSYtM/Gp0q4JOp1F+/JH5D1IZm/bUBrV0edoewQZiEc1r6I8L4JL21broddxK8HAcZiqQ==",
+      "version": "4.9.1",
+      "integrity": "sha512-sa4L9yUfD/1sg9Kl8OxPxvpUcqxKXRjBeZxBuZSSV1v13hjfEJkn84n0An2hN8oLQ1PmEl2uA6FkI07idXeFgQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "5.48.1",
-        "@typescript-eslint/utils": "5.48.1",
-        "debug": "^4.3.4",
-        "tsutils": "^3.21.0"
+        "@typescript-eslint/types": "4.9.1",
+        "@typescript-eslint/visitor-keys": "4.9.1"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "*"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "5.48.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.48.1.tgz",
-      "integrity": "sha512-xHyDLU6MSuEEdIlzrrAerCGS3T7AA/L8Hggd0RCYBi0w3JMvGYxlLlXHeg50JI9Tfg5MrtsfuNxbS/3zF1/ATg==",
+      "version": "4.9.1",
+      "integrity": "sha512-fjkT+tXR13ks6Le7JiEdagnwEFc49IkOyys7ueWQ4O8k4quKPwPJudrwlVOJCUQhXo45PrfIvIarcrEjFTNwUA==",
       "dev": true,
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
       },
       "funding": {
         "type": "opencollective",
@@ -2112,21 +1631,21 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "5.48.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.48.1.tgz",
-      "integrity": "sha512-Hut+Osk5FYr+sgFh8J/FHjqX6HFcDzTlWLrFqGoK5kVUN3VBHF/QzZmAsIXCQ8T/W9nQNBTqalxi1P3LSqWnRA==",
+      "version": "4.9.1",
+      "integrity": "sha512-bzP8vqwX6Vgmvs81bPtCkLtM/Skh36NE6unu6tsDeU/ZFoYthlTXbBmpIrvosgiDKlWTfb2ZpPELHH89aQjeQw==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "5.48.1",
-        "@typescript-eslint/visitor-keys": "5.48.1",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
+        "@typescript-eslint/types": "4.9.1",
+        "@typescript-eslint/visitor-keys": "4.9.1",
+        "debug": "^4.1.1",
+        "globby": "^11.0.1",
+        "is-glob": "^4.0.1",
+        "lodash": "^4.17.15",
+        "semver": "^7.3.2",
+        "tsutils": "^3.17.1"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^10.12.0 || >=12.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -2138,99 +1657,229 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/globby": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+    "node_modules/@typescript-eslint/visitor-keys": {
+      "version": "4.9.1",
+      "integrity": "sha512-9gspzc6UqLQHd7lXQS7oWs+hrYggspv/rk6zzEMhCbYwPE/sF7oxo7GAjkS35Tdlt7wguIG+ViWCPtVZHz/ybQ==",
       "dev": true,
       "dependencies": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.9",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^3.0.0"
+        "@typescript-eslint/types": "4.9.1",
+        "eslint-visitor-keys": "^2.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+    "node_modules/@webassemblyjs/ast": {
+      "version": "1.9.0",
+      "integrity": "sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
+        "@webassemblyjs/helper-module-context": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/wast-parser": "1.9.0"
       }
     },
-    "node_modules/@typescript-eslint/utils": {
-      "version": "5.48.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.48.1.tgz",
-      "integrity": "sha512-SmQuSrCGUOdmGMwivW14Z0Lj8dxG1mOFZ7soeJ0TQZEJcs3n5Ndgkg0A4bcMFzBELqLJ6GTHnEU+iIoaD6hFGA==",
+    "node_modules/@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.9.0",
+      "integrity": "sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==",
       "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "@types/semver": "^7.3.12",
-        "@typescript-eslint/scope-manager": "5.48.1",
-        "@typescript-eslint/types": "5.48.1",
-        "@typescript-eslint/typescript-estree": "5.48.1",
-        "eslint-scope": "^5.1.1",
-        "eslint-utils": "^3.0.0",
-        "semver": "^7.3.7"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      }
+      "optional": true,
+      "peer": true
     },
-    "node_modules/@typescript-eslint/utils/node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+    "node_modules/@webassemblyjs/helper-api-error": {
+      "version": "1.9.0",
+      "integrity": "sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==",
       "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/@webassemblyjs/helper-buffer": {
+      "version": "1.9.0",
+      "integrity": "sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/@webassemblyjs/helper-code-frame": {
+      "version": "1.9.0",
+      "integrity": "sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@webassemblyjs/wast-printer": "1.9.0"
       }
     },
-    "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "5.48.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.48.1.tgz",
-      "integrity": "sha512-Ns0XBwmfuX7ZknznfXozgnydyR8F6ev/KEGePP4i74uL3ArsKbEhJ7raeKr1JSa997DBDwol/4a0Y+At82c9dA==",
+    "node_modules/@webassemblyjs/helper-fsm": {
+      "version": "1.9.0",
+      "integrity": "sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/@webassemblyjs/helper-module-context": {
+      "version": "1.9.0",
+      "integrity": "sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "@typescript-eslint/types": "5.48.1",
-        "eslint-visitor-keys": "^3.3.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "@webassemblyjs/ast": "1.9.0"
+      }
+    },
+    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.9.0",
+      "integrity": "sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/@webassemblyjs/helper-wasm-section": {
+      "version": "1.9.0",
+      "integrity": "sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-buffer": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/wasm-gen": "1.9.0"
+      }
+    },
+    "node_modules/@webassemblyjs/ieee754": {
+      "version": "1.9.0",
+      "integrity": "sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@xtuc/ieee754": "^1.2.0"
+      }
+    },
+    "node_modules/@webassemblyjs/leb128": {
+      "version": "1.9.0",
+      "integrity": "sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webassemblyjs/utf8": {
+      "version": "1.9.0",
+      "integrity": "sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/@webassemblyjs/wasm-edit": {
+      "version": "1.9.0",
+      "integrity": "sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-buffer": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/helper-wasm-section": "1.9.0",
+        "@webassemblyjs/wasm-gen": "1.9.0",
+        "@webassemblyjs/wasm-opt": "1.9.0",
+        "@webassemblyjs/wasm-parser": "1.9.0",
+        "@webassemblyjs/wast-printer": "1.9.0"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-gen": {
+      "version": "1.9.0",
+      "integrity": "sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/ieee754": "1.9.0",
+        "@webassemblyjs/leb128": "1.9.0",
+        "@webassemblyjs/utf8": "1.9.0"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-opt": {
+      "version": "1.9.0",
+      "integrity": "sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-buffer": "1.9.0",
+        "@webassemblyjs/wasm-gen": "1.9.0",
+        "@webassemblyjs/wasm-parser": "1.9.0"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-parser": {
+      "version": "1.9.0",
+      "integrity": "sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-api-error": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/ieee754": "1.9.0",
+        "@webassemblyjs/leb128": "1.9.0",
+        "@webassemblyjs/utf8": "1.9.0"
+      }
+    },
+    "node_modules/@webassemblyjs/wast-parser": {
+      "version": "1.9.0",
+      "integrity": "sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/floating-point-hex-parser": "1.9.0",
+        "@webassemblyjs/helper-api-error": "1.9.0",
+        "@webassemblyjs/helper-code-frame": "1.9.0",
+        "@webassemblyjs/helper-fsm": "1.9.0",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webassemblyjs/wast-printer": {
+      "version": "1.9.0",
+      "integrity": "sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/wast-parser": "1.9.0",
+        "@xtuc/long": "4.2.2"
       }
     },
+    "node_modules/@xtuc/ieee754": {
+      "version": "1.2.0",
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/@xtuc/long": {
+      "version": "4.2.2",
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
     "node_modules/abab": {
       "version": "2.0.5",
       "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==",
@@ -2241,7 +1890,6 @@
       "version": "7.4.1",
       "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
       "dev": true,
-      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -2261,7 +1909,6 @@
     },
     "node_modules/acorn-jsx": {
       "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
       "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
       "dev": true,
       "peerDependencies": {
@@ -2303,7 +1950,6 @@
     },
     "node_modules/ajv": {
       "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
       "dependencies": {
@@ -2317,6 +1963,32 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
+    "node_modules/ajv-errors": {
+      "version": "1.0.1",
+      "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "peerDependencies": {
+        "ajv": ">=5.0.0"
+      }
+    },
+    "node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/anser": {
+      "version": "1.4.9",
+      "integrity": "sha512-AI+BjTeGt2+WFk4eWcqbQ7snZpDBt8SaLlj0RT2h5xfdWaiy51OjYvqwMrNzJLGy8iOAL6nKDITWO+rd4MkYEA==",
+      "dev": true,
+      "peer": true
+    },
     "node_modules/ansi-colors": {
       "version": "4.1.1",
       "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
@@ -2374,19 +2046,23 @@
         "node": ">= 8"
       }
     },
-    "node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true
+    "node_modules/aproba": {
+      "version": "1.2.0",
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "node_modules/aria-query": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz",
-      "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==",
+      "version": "4.2.2",
+      "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
       "dev": true,
       "dependencies": {
-        "deep-equal": "^2.0.5"
+        "@babel/runtime": "^7.10.2",
+        "@babel/runtime-corejs3": "^7.10.2"
+      },
+      "engines": {
+        "node": ">=6.0"
       }
     },
     "node_modules/arr-diff": {
@@ -2417,15 +2093,14 @@
       }
     },
     "node_modules/array-includes": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz",
-      "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==",
+      "version": "3.1.4",
+      "integrity": "sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "get-intrinsic": "^1.1.3",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1",
+        "get-intrinsic": "^1.1.1",
         "is-string": "^1.0.7"
       },
       "engines": {
@@ -2453,15 +2128,13 @@
       }
     },
     "node_modules/array.prototype.flat": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
-      "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==",
+      "version": "1.2.5",
+      "integrity": "sha512-KaYU+S+ndVqyUnignHftkwc58o3uVU1jzczILJ1tN2YaIZpFIKBiP/x/j97E5MVPsaCloPbqWLB/8qCTVvT2qg==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "es-shim-unscopables": "^1.0.0"
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -2471,15 +2144,13 @@
       }
     },
     "node_modules/array.prototype.flatmap": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz",
-      "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==",
+      "version": "1.2.5",
+      "integrity": "sha512-08u6rVyi1Lj7oqWbS9nUxliETrtIROT4XGTA4D/LWGten6E3ocm7cy9SIrmNHOL5XVbVuckUp3X6Xyg8/zpvHA==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "es-shim-unscopables": "^1.0.0"
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -2488,19 +2159,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array.prototype.tosorted": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz",
-      "integrity": "sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "es-shim-unscopables": "^1.0.0",
-        "get-intrinsic": "^1.1.3"
-      }
-    },
     "node_modules/arrify": {
       "version": "1.0.1",
       "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
@@ -2509,6 +2167,36 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/asn1.js": {
+      "version": "5.4.1",
+      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "bn.js": "^4.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0",
+        "safer-buffer": "^2.1.0"
+      }
+    },
+    "node_modules/asn1.js/node_modules/bn.js": {
+      "version": "4.12.0",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/assert": {
+      "version": "2.0.0",
+      "integrity": "sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "es6-object-assign": "^1.1.0",
+        "is-nan": "^1.2.1",
+        "object-is": "^1.0.1",
+        "util": "^0.12.0"
+      }
+    },
     "node_modules/assign-symbols": {
       "version": "1.0.0",
       "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
@@ -2518,10 +2206,18 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/ast-types": {
+      "version": "0.13.2",
+      "integrity": "sha512-uWMHxJxtfj/1oZClOxDEV1sQ1HCDkA4MG8Gr69KKeBjEVH0R84WlejZ0y2DcwyBlpAEMltmVYkVgqfLFb2oyiA==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/ast-types-flow": {
       "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
-      "integrity": "sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==",
+      "integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0=",
       "dev": true
     },
     "node_modules/astral-regex": {
@@ -2537,6 +2233,13 @@
       "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
       "dev": true
     },
+    "node_modules/async-each": {
+      "version": "1.0.3",
+      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
     "node_modules/asynckit": {
       "version": "0.4.0",
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
@@ -2609,9 +2312,9 @@
     },
     "node_modules/available-typed-arrays": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
       "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
       "dev": true,
+      "peer": true,
       "engines": {
         "node": ">= 0.4"
       },
@@ -2620,21 +2323,44 @@
       }
     },
     "node_modules/axe-core": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.6.2.tgz",
-      "integrity": "sha512-b1WlTV8+XKLj9gZy2DZXgQiyDp9xkkoe2a6U6UbYccScq2wgH/YwCeI2/Jq2mgo0HzQxqJOjWZBLeA/mqsk5Mg==",
+      "version": "4.3.3",
+      "integrity": "sha512-/lqqLAmuIPi79WYfRpy2i8z+x+vxU3zX2uAm0gs1q52qTuKwolOj1P8XbufpXcsydrpKx2yGn2wzAnxCMV86QA==",
       "dev": true,
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/axobject-query": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.1.1.tgz",
-      "integrity": "sha512-goKlv8DZrK9hUh975fnHzhNIO4jUnFCfv/dszV5VwUGDFjI6vQ2VwoyjYjYNEbBE8AH87TduWP5uyDR1D+Iteg==",
+      "version": "2.2.0",
+      "integrity": "sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==",
+      "dev": true
+    },
+    "node_modules/babel-eslint": {
+      "version": "10.1.0",
+      "integrity": "sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==",
+      "deprecated": "babel-eslint is now @babel/eslint-parser. This package will no longer receive updates.",
       "dev": true,
       "dependencies": {
-        "deep-equal": "^2.0.5"
+        "@babel/code-frame": "^7.0.0",
+        "@babel/parser": "^7.7.0",
+        "@babel/traverse": "^7.7.0",
+        "@babel/types": "^7.7.0",
+        "eslint-visitor-keys": "^1.0.0",
+        "resolve": "^1.12.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "peerDependencies": {
+        "eslint": ">= 4.12.1"
+      }
+    },
+    "node_modules/babel-eslint/node_modules/eslint-visitor-keys": {
+      "version": "1.3.0",
+      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
       }
     },
     "node_modules/babel-jest": {
@@ -2773,6 +2499,67 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/base64-js": {
+      "version": "1.5.1",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "peer": true
+    },
+    "node_modules/big.js": {
+      "version": "5.2.2",
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/binary-extensions": {
+      "version": "2.2.0",
+      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/bindings": {
+      "version": "1.5.0",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "file-uri-to-path": "1.0.0"
+      }
+    },
+    "node_modules/bluebird": {
+      "version": "3.7.2",
+      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/bn.js": {
+      "version": "5.2.0",
+      "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==",
+      "dev": true,
+      "peer": true
+    },
     "node_modules/brace-expansion": {
       "version": "1.1.11",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
@@ -2793,37 +2580,136 @@
         "node": ">=8"
       }
     },
+    "node_modules/brorand": {
+      "version": "1.1.0",
+      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
+      "dev": true,
+      "peer": true
+    },
     "node_modules/browser-process-hrtime": {
       "version": "1.0.0",
       "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
       "dev": true,
       "peer": true
     },
-    "node_modules/browserslist": {
-      "version": "4.17.3",
-      "integrity": "sha512-59IqHJV5VGdcJZ+GZ2hU5n4Kv3YiASzW6Xk5g9tf5a/MAzGeFwgGWU39fVzNIOVcgB3+Gp+kiQu0HEfTVU/3VQ==",
+    "node_modules/browserify-aes": {
+      "version": "1.2.0",
+      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "caniuse-lite": "^1.0.30001264",
-        "electron-to-chromium": "^1.3.857",
-        "escalade": "^3.1.1",
-        "node-releases": "^1.1.77",
-        "picocolors": "^0.2.1"
-      },
-      "bin": {
-        "browserslist": "cli.js"
-      },
-      "engines": {
-        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/browserslist"
+        "buffer-xor": "^1.0.3",
+        "cipher-base": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.3",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
       }
     },
-    "node_modules/bs-logger": {
-      "version": "0.2.6",
-      "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
+    "node_modules/browserify-cipher": {
+      "version": "1.0.1",
+      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "browserify-aes": "^1.0.4",
+        "browserify-des": "^1.0.0",
+        "evp_bytestokey": "^1.0.0"
+      }
+    },
+    "node_modules/browserify-des": {
+      "version": "1.0.2",
+      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "cipher-base": "^1.0.1",
+        "des.js": "^1.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "node_modules/browserify-rsa": {
+      "version": "4.1.0",
+      "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "bn.js": "^5.0.0",
+        "randombytes": "^2.0.1"
+      }
+    },
+    "node_modules/browserify-sign": {
+      "version": "4.2.1",
+      "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "bn.js": "^5.1.1",
+        "browserify-rsa": "^4.0.1",
+        "create-hash": "^1.2.0",
+        "create-hmac": "^1.1.7",
+        "elliptic": "^6.5.3",
+        "inherits": "^2.0.4",
+        "parse-asn1": "^5.1.5",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
+      }
+    },
+    "node_modules/browserify-sign/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "peer": true
+    },
+    "node_modules/browserify-zlib": {
+      "version": "0.2.0",
+      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "pako": "~1.0.5"
+      }
+    },
+    "node_modules/browserslist": {
+      "version": "4.17.3",
+      "integrity": "sha512-59IqHJV5VGdcJZ+GZ2hU5n4Kv3YiASzW6Xk5g9tf5a/MAzGeFwgGWU39fVzNIOVcgB3+Gp+kiQu0HEfTVU/3VQ==",
+      "dev": true,
+      "dependencies": {
+        "caniuse-lite": "^1.0.30001264",
+        "electron-to-chromium": "^1.3.857",
+        "escalade": "^3.1.1",
+        "node-releases": "^1.1.77",
+        "picocolors": "^0.2.1"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      },
+      "engines": {
+        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/browserslist"
+      }
+    },
+    "node_modules/bs-logger": {
+      "version": "0.2.6",
+      "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
       "dev": true,
       "dependencies": {
         "fast-json-stable-stringify": "2.x"
@@ -2841,11 +2727,96 @@
         "node-int64": "^0.4.0"
       }
     },
+    "node_modules/buffer": {
+      "version": "5.6.0",
+      "integrity": "sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4"
+      }
+    },
     "node_modules/buffer-from": {
       "version": "1.1.2",
       "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
       "dev": true
     },
+    "node_modules/buffer-xor": {
+      "version": "1.0.3",
+      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/builtin-status-codes": {
+      "version": "3.0.0",
+      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/bytes": {
+      "version": "3.1.0",
+      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/cacache": {
+      "version": "12.0.4",
+      "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "bluebird": "^3.5.5",
+        "chownr": "^1.1.1",
+        "figgy-pudding": "^3.5.1",
+        "glob": "^7.1.4",
+        "graceful-fs": "^4.1.15",
+        "infer-owner": "^1.0.3",
+        "lru-cache": "^5.1.1",
+        "mississippi": "^3.0.0",
+        "mkdirp": "^0.5.1",
+        "move-concurrently": "^1.0.1",
+        "promise-inflight": "^1.0.1",
+        "rimraf": "^2.6.3",
+        "ssri": "^6.0.1",
+        "unique-filename": "^1.1.1",
+        "y18n": "^4.0.0"
+      }
+    },
+    "node_modules/cacache/node_modules/lru-cache": {
+      "version": "5.1.1",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "yallist": "^3.0.2"
+      }
+    },
+    "node_modules/cacache/node_modules/rimraf": {
+      "version": "2.7.1",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/cacache/node_modules/yallist": {
+      "version": "3.1.1",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
     "node_modules/cache-base": {
       "version": "1.0.1",
       "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
@@ -2868,7 +2839,6 @@
     },
     "node_modules/call-bind": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
       "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
       "dev": true,
       "dependencies": {
@@ -2896,20 +2866,13 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001416",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001416.tgz",
-      "integrity": "sha512-06wzzdAkCPZO+Qm4e/eNghZBDfVNDsCgw33T27OwBH9unE9S478OYw//Q2L7Npf/zBzs7rjZOszIFQkwQKAEqA==",
+      "version": "1.0.30001265",
+      "integrity": "sha512-YzBnspggWV5hep1m9Z6sZVLOt7vrju8xWooFAgN6BA5qvy98qPAPb7vNUzypFaoh2pb3vlfzbDO8tB57UPGbtw==",
       "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
-        }
-      ]
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/browserslist"
+      }
     },
     "node_modules/capture-exit": {
       "version": "2.0.0",
@@ -2923,16 +2886,6 @@
         "node": "6.* || 8.* || >= 10.*"
       }
     },
-    "node_modules/ccount": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/ccount/-/ccount-1.1.0.tgz",
-      "integrity": "sha512-vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
     "node_modules/chalk": {
       "version": "4.1.0",
       "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
@@ -2966,16 +2919,6 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/character-entities-html4": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.4.tgz",
-      "integrity": "sha512-HRcDxZuZqMx3/a+qrzxdBKBPUpxWEq9xw2OPZ3a/174ihfrQKVsFhqtthBInFy1zZ9GgZyFXOatNujm8M+El3g==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
     "node_modules/character-entities-legacy": {
       "version": "1.1.4",
       "integrity": "sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==",
@@ -2999,11 +2942,59 @@
       "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
       "dev": true
     },
+    "node_modules/chokidar": {
+      "version": "3.5.1",
+      "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "anymatch": "~3.1.1",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.0",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.5.0"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.1"
+      }
+    },
+    "node_modules/chownr": {
+      "version": "1.1.4",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/chrome-trace-event": {
+      "version": "1.0.3",
+      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=6.0"
+      }
+    },
     "node_modules/ci-info": {
       "version": "2.0.0",
       "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
       "dev": true
     },
+    "node_modules/cipher-base": {
+      "version": "1.0.4",
+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
     "node_modules/cjs-module-lexer": {
       "version": "0.6.0",
       "integrity": "sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw==",
@@ -3210,16 +3201,6 @@
         "node": ">= 0.12.0"
       }
     },
-    "node_modules/collapse-white-space": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.6.tgz",
-      "integrity": "sha512-jEovNnrhMuqyCcjfEJA56v0Xq8SkIoPKDyaHahwo3POf4qcSXqMYuwNcOTzp74vTsR9Tn08z4MxWqAhcekogkQ==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
     "node_modules/collect-v8-coverage": {
       "version": "1.0.1",
       "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==",
@@ -3279,6 +3260,12 @@
         "node": ">= 10"
       }
     },
+    "node_modules/commondir": {
+      "version": "1.0.1",
+      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
+      "dev": true,
+      "peer": true
+    },
     "node_modules/component-emitter": {
       "version": "1.3.0",
       "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
@@ -3290,6 +3277,60 @@
       "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
       "dev": true
     },
+    "node_modules/concat-stream": {
+      "version": "1.6.2",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "dev": true,
+      "engines": [
+        "node >= 0.8"
+      ],
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
+      }
+    },
+    "node_modules/concat-stream/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/concat-stream/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/console-browserify": {
+      "version": "1.2.0",
+      "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/constants-browserify": {
+      "version": "1.0.0",
+      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
+      "dev": true,
+      "peer": true
+    },
     "node_modules/convert-source-map": {
       "version": "1.8.0",
       "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
@@ -3298,6 +3339,34 @@
         "safe-buffer": "~5.1.1"
       }
     },
+    "node_modules/copy-concurrently": {
+      "version": "1.0.5",
+      "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "aproba": "^1.1.1",
+        "fs-write-stream-atomic": "^1.0.8",
+        "iferr": "^0.1.5",
+        "mkdirp": "^0.5.1",
+        "rimraf": "^2.5.4",
+        "run-queue": "^1.0.0"
+      }
+    },
+    "node_modules/copy-concurrently/node_modules/rimraf": {
+      "version": "2.7.1",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
     "node_modules/copy-descriptor": {
       "version": "0.1.1",
       "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
@@ -3307,6 +3376,22 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/core-js-pure": {
+      "version": "3.18.2",
+      "integrity": "sha512-4hMMLUlZhKJKOWbbGD1/VDUxGPEhEoN/T01k7bx271WiBKCvCfkgPzy0IeRS4PB50p6/N1q/SZL4B/TRsTE5bA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
+    "node_modules/core-util-is": {
+      "version": "1.0.3",
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+      "dev": true,
+      "peer": true
+    },
     "node_modules/cosmiconfig": {
       "version": "7.0.1",
       "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
@@ -3322,23 +3407,66 @@
         "node": ">=10"
       }
     },
-    "node_modules/cross-fetch": {
-      "version": "3.1.4",
-      "integrity": "sha512-1eAtFWdIubi6T4XPy6ei9iUFoKpUkIF971QLN8lIvvvwueI65+Nw5haMNKUwfJxabqlIIDODJKGrQ66gxC0PbQ==",
+    "node_modules/create-ecdh": {
+      "version": "4.0.4",
+      "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "node-fetch": "2.6.1"
+        "bn.js": "^4.1.0",
+        "elliptic": "^6.5.3"
       }
     },
-    "node_modules/cross-fetch/node_modules/node-fetch": {
-      "version": "2.6.1",
-      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
+    "node_modules/create-ecdh/node_modules/bn.js": {
+      "version": "4.12.0",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
       "dev": true,
-      "engines": {
-        "node": "4.x || >=6.0.0"
-      }
+      "peer": true
     },
-    "node_modules/cross-spawn": {
+    "node_modules/create-hash": {
+      "version": "1.2.0",
+      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "cipher-base": "^1.0.1",
+        "inherits": "^2.0.1",
+        "md5.js": "^1.3.4",
+        "ripemd160": "^2.0.1",
+        "sha.js": "^2.4.0"
+      }
+    },
+    "node_modules/create-hmac": {
+      "version": "1.1.7",
+      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "cipher-base": "^1.0.3",
+        "create-hash": "^1.1.0",
+        "inherits": "^2.0.1",
+        "ripemd160": "^2.0.0",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
+    "node_modules/cross-fetch": {
+      "version": "3.1.4",
+      "integrity": "sha512-1eAtFWdIubi6T4XPy6ei9iUFoKpUkIF971QLN8lIvvvwueI65+Nw5haMNKUwfJxabqlIIDODJKGrQ66gxC0PbQ==",
+      "dev": true,
+      "dependencies": {
+        "node-fetch": "2.6.1"
+      }
+    },
+    "node_modules/cross-fetch/node_modules/node-fetch": {
+      "version": "2.6.1",
+      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
+      "dev": true,
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      }
+    },
+    "node_modules/cross-spawn": {
       "version": "7.0.3",
       "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
       "dev": true,
@@ -3351,6 +3479,34 @@
         "node": ">= 8"
       }
     },
+    "node_modules/crypto-browserify": {
+      "version": "3.12.0",
+      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "browserify-cipher": "^1.0.0",
+        "browserify-sign": "^4.0.0",
+        "create-ecdh": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.0",
+        "diffie-hellman": "^5.0.0",
+        "inherits": "^2.0.1",
+        "pbkdf2": "^3.0.3",
+        "public-encrypt": "^4.0.0",
+        "randombytes": "^2.0.0",
+        "randomfill": "^1.0.3"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/css.escape": {
+      "version": "1.5.1",
+      "integrity": "sha1-QuJ9T6BK4y+TGktNQZH6nN3ul8s=",
+      "dev": true,
+      "peer": true
+    },
     "node_modules/cssesc": {
       "version": "3.0.0",
       "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
@@ -3362,6 +3518,35 @@
         "node": ">=4"
       }
     },
+    "node_modules/cssnano-preset-simple": {
+      "version": "3.0.0",
+      "integrity": "sha512-vxQPeoMRqUT3c/9f0vWeVa2nKQIHFpogtoBvFdW4GQ3IvEJ6uauCP6p3Y5zQDLFcI7/+40FTgX12o7XUL0Ko+w==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "caniuse-lite": "^1.0.30001202"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
+      }
+    },
+    "node_modules/cssnano-simple": {
+      "version": "3.0.0",
+      "integrity": "sha512-oU3ueli5Dtwgh0DyeohcIEE00QVfbPR3HzyXdAl89SfnQG3y0/qcpfLVW+jPIh3/rgMZGwuW96rejZGaYE9eUg==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "cssnano-preset-simple": "^3.0.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
+      },
+      "peerDependenciesMeta": {
+        "postcss": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/cssom": {
       "version": "0.4.4",
       "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==",
@@ -3386,10 +3571,16 @@
       "dev": true,
       "peer": true
     },
+    "node_modules/cyclist": {
+      "version": "1.0.1",
+      "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
     "node_modules/damerau-levenshtein": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz",
-      "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==",
+      "version": "1.0.7",
+      "integrity": "sha512-VvdQIPGdWP0SqFXghj79Wf/5LArmreyMsGLa6FG6iC4t3j7j5s71TrwWmT/4akbDQIqjfACkLZmjXhA7g2oUZw==",
       "dev": true
     },
     "node_modules/dart-linkcheck": {
@@ -3402,6 +3593,15 @@
         "linkcheck-win": "bin/linkcheck-win"
       }
     },
+    "node_modules/data-uri-to-buffer": {
+      "version": "3.0.1",
+      "integrity": "sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/data-urls": {
       "version": "2.0.0",
       "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
@@ -3417,9 +3617,8 @@
       }
     },
     "node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "version": "4.3.2",
+      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
       "dev": true,
       "dependencies": {
         "ms": "2.1.2"
@@ -3468,68 +3667,20 @@
         "node": ">=0.10"
       }
     },
-    "node_modules/deep-equal": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.0.tgz",
-      "integrity": "sha512-RdpzE0Hv4lhowpIUKKMJfeH6C1pXdtT1/it80ubgWqwI3qpuxUBpC1S4hnHg+zjnuOoDkzUtUCEEkG+XG5l3Mw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "es-get-iterator": "^1.1.2",
-        "get-intrinsic": "^1.1.3",
-        "is-arguments": "^1.1.1",
-        "is-array-buffer": "^3.0.1",
-        "is-date-object": "^1.0.5",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "isarray": "^2.0.5",
-        "object-is": "^1.1.5",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.4.3",
-        "side-channel": "^1.0.4",
-        "which-boxed-primitive": "^1.0.2",
-        "which-collection": "^1.0.1",
-        "which-typed-array": "^1.1.9"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/deep-equal/node_modules/isarray": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-      "dev": true
-    },
     "node_modules/deep-is": {
       "version": "0.1.4",
       "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
       "dev": true
     },
-    "node_modules/define-lazy-prop": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
-      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+      "version": "1.1.3",
+      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
       "dev": true,
       "dependencies": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
+        "object-keys": "^1.0.12"
       },
       "engines": {
         "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/define-property": {
@@ -3553,6 +3704,25 @@
         "node": ">=0.4.0"
       }
     },
+    "node_modules/depd": {
+      "version": "1.1.2",
+      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/des.js": {
+      "version": "1.0.1",
+      "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
     "node_modules/detect-newline": {
       "version": "3.1.0",
       "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
@@ -3571,6 +3741,23 @@
         "node": ">= 10.14.2"
       }
     },
+    "node_modules/diffie-hellman": {
+      "version": "5.0.3",
+      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "miller-rabin": "^4.0.0",
+        "randombytes": "^2.0.0"
+      }
+    },
+    "node_modules/diffie-hellman/node_modules/bn.js": {
+      "version": "4.12.0",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true,
+      "peer": true
+    },
     "node_modules/dir-glob": {
       "version": "3.0.1",
       "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
@@ -3584,7 +3771,6 @@
     },
     "node_modules/doctrine": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
       "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
       "dev": true,
       "dependencies": {
@@ -3622,6 +3808,18 @@
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
+    "node_modules/domain-browser": {
+      "version": "4.19.0",
+      "integrity": "sha512-fRA+BaAWOR/yr/t7T9E9GJztHPeFjj8U35ajyAjCDtAAnTn1Rc1f6W6VGPJrO1tkQv9zWu+JRof7z6oQtiYVFQ==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://bevry.me/fund"
+      }
+    },
     "node_modules/domelementtype": {
       "version": "1.3.1",
       "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
@@ -3665,11 +3863,44 @@
         "domelementtype": "1"
       }
     },
-    "node_modules/eastasianwidth": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
-      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
-      "dev": true
+    "node_modules/duplexify": {
+      "version": "3.7.1",
+      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "end-of-stream": "^1.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0",
+        "stream-shift": "^1.0.0"
+      }
+    },
+    "node_modules/duplexify/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/duplexify/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
     },
     "node_modules/ejs": {
       "version": "3.1.5",
@@ -3690,6 +3921,27 @@
       "integrity": "sha512-okGcCKfihgGlaROMFNPQ6eaU3bk9Xa68rLYSnVD2PyIqM5B/vyQoXCpB3p1HI3AXio097ROVBlSO4JZVilUWuA==",
       "dev": true
     },
+    "node_modules/elliptic": {
+      "version": "6.5.4",
+      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "brorand": "^1.1.0",
+        "hash.js": "^1.0.0",
+        "hmac-drbg": "^1.0.1",
+        "inherits": "^2.0.4",
+        "minimalistic-assert": "^1.0.1",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "node_modules/elliptic/node_modules/bn.js": {
+      "version": "4.12.0",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true,
+      "peer": true
+    },
     "node_modules/emittery": {
       "version": "0.7.2",
       "integrity": "sha512-A8OG5SR/ij3SsJdWDJdkkSYUjQdCUx6APQXem0SaEePBSRg4eymGYwBkKo1Y6DU+af/Jn2dBQqDBvjnr9Vi8nQ==",
@@ -3704,30 +3956,47 @@
     },
     "node_modules/emoji-regex": {
       "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
       "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
       "dev": true
     },
-    "node_modules/end-of-stream": {
-      "version": "1.4.4",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+    "node_modules/emojis-list": {
+      "version": "3.0.0",
+      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/encoding": {
+      "version": "0.1.13",
+      "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "once": "^1.4.0"
+        "iconv-lite": "^0.6.2"
       }
     },
-    "node_modules/enhanced-resolve": {
-      "version": "5.12.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz",
-      "integrity": "sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==",
+    "node_modules/encoding/node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "graceful-fs": "^4.2.4",
-        "tapable": "^2.2.0"
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
       },
       "engines": {
-        "node": ">=10.13.0"
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/end-of-stream": {
+      "version": "1.4.4",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "once": "^1.4.0"
       }
     },
     "node_modules/enquirer": {
@@ -3746,6 +4015,19 @@
       "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
       "dev": true
     },
+    "node_modules/errno": {
+      "version": "0.1.8",
+      "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "prr": "~1.0.1"
+      },
+      "bin": {
+        "errno": "cli.js"
+      }
+    },
     "node_modules/error-ex": {
       "version": "1.3.2",
       "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
@@ -3755,44 +4037,30 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.21.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.1.tgz",
-      "integrity": "sha512-QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg==",
+      "version": "1.19.1",
+      "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
       "dev": true,
       "dependencies": {
-        "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",
-        "es-set-tostringtag": "^2.0.1",
         "es-to-primitive": "^1.2.1",
         "function-bind": "^1.1.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.1.3",
+        "get-intrinsic": "^1.1.1",
         "get-symbol-description": "^1.0.0",
-        "globalthis": "^1.0.3",
-        "gopd": "^1.0.1",
         "has": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.4",
-        "is-array-buffer": "^3.0.1",
-        "is-callable": "^1.2.7",
-        "is-negative-zero": "^2.0.2",
+        "has-symbols": "^1.0.2",
+        "internal-slot": "^1.0.3",
+        "is-callable": "^1.2.4",
+        "is-negative-zero": "^2.0.1",
         "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
+        "is-shared-array-buffer": "^1.0.1",
         "is-string": "^1.0.7",
-        "is-typed-array": "^1.1.10",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.2",
+        "is-weakref": "^1.0.1",
+        "object-inspect": "^1.11.0",
         "object-keys": "^1.1.1",
-        "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.4.3",
-        "safe-regex-test": "^1.0.0",
-        "string.prototype.trimend": "^1.0.6",
-        "string.prototype.trimstart": "^1.0.6",
-        "typed-array-length": "^1.0.4",
-        "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.9"
+        "object.assign": "^4.1.2",
+        "string.prototype.trimend": "^1.0.4",
+        "string.prototype.trimstart": "^1.0.4",
+        "unbox-primitive": "^1.0.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -3801,58 +4069,8 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/es-get-iterator": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz",
-      "integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.3",
-        "has-symbols": "^1.0.3",
-        "is-arguments": "^1.1.1",
-        "is-map": "^2.0.2",
-        "is-set": "^2.0.2",
-        "is-string": "^1.0.7",
-        "isarray": "^2.0.5",
-        "stop-iteration-iterator": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/es-get-iterator/node_modules/isarray": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-      "dev": true
-    },
-    "node_modules/es-set-tostringtag": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz",
-      "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==",
-      "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.1.3",
-        "has": "^1.0.3",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/es-shim-unscopables": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
-      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
-      "dev": true,
-      "dependencies": {
-        "has": "^1.0.3"
-      }
-    },
     "node_modules/es-to-primitive": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
       "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
       "dev": true,
       "dependencies": {
@@ -3867,6 +4085,12 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/es6-object-assign": {
+      "version": "1.1.0",
+      "integrity": "sha1-wsNYJlYkfDnqEHyx5mUrb58kUjw=",
+      "dev": true,
+      "peer": true
+    },
     "node_modules/escalade": {
       "version": "3.1.1",
       "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
@@ -3967,79 +4191,76 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.31.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.31.0.tgz",
-      "integrity": "sha512-0tQQEVdmPZ1UtUKXjX7EMm9BlgJ08G90IhWh0PKDCb3ZLsgAOHI8fYSIzYVZej92zsgq+ft0FGsxhJ3xo2tbuA==",
+      "version": "7.23.0",
+      "integrity": "sha512-kqvNVbdkjzpFy0XOszNwjkKzZ+6TcwCQ/h+ozlcIWwaimBBuhlQ4nN6kbiM2L+OjDcznkTJxzYfRFH92sx4a0Q==",
       "dev": true,
       "dependencies": {
-        "@eslint/eslintrc": "^1.4.1",
-        "@humanwhocodes/config-array": "^0.11.8",
-        "@humanwhocodes/module-importer": "^1.0.1",
-        "@nodelib/fs.walk": "^1.2.8",
+        "@babel/code-frame": "7.12.11",
+        "@eslint/eslintrc": "^0.4.0",
         "ajv": "^6.10.0",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
-        "debug": "^4.3.2",
+        "debug": "^4.0.1",
         "doctrine": "^3.0.0",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.1.1",
-        "eslint-utils": "^3.0.0",
-        "eslint-visitor-keys": "^3.3.0",
-        "espree": "^9.4.0",
+        "enquirer": "^2.3.5",
+        "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",
-        "find-up": "^5.0.0",
-        "glob-parent": "^6.0.2",
-        "globals": "^13.19.0",
-        "grapheme-splitter": "^1.0.4",
-        "ignore": "^5.2.0",
+        "functional-red-black-tree": "^1.0.1",
+        "glob-parent": "^5.0.0",
+        "globals": "^13.6.0",
+        "ignore": "^4.0.6",
         "import-fresh": "^3.0.0",
         "imurmurhash": "^0.1.4",
         "is-glob": "^4.0.0",
-        "is-path-inside": "^3.0.3",
-        "js-sdsl": "^4.1.4",
-        "js-yaml": "^4.1.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.1.2",
+        "lodash": "^4.17.21",
+        "minimatch": "^3.0.4",
         "natural-compare": "^1.4.0",
         "optionator": "^0.9.1",
-        "regexpp": "^3.2.0",
-        "strip-ansi": "^6.0.1",
+        "progress": "^2.0.0",
+        "regexpp": "^3.1.0",
+        "semver": "^7.2.1",
+        "strip-ansi": "^6.0.0",
         "strip-json-comments": "^3.1.0",
-        "text-table": "^0.2.0"
+        "table": "^6.0.4",
+        "text-table": "^0.2.0",
+        "v8-compile-cache": "^2.0.3"
       },
       "bin": {
         "eslint": "bin/eslint.js"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^10.12.0 || >=12.0.0"
       },
       "funding": {
         "url": "https://opencollective.com/eslint"
       }
     },
     "node_modules/eslint-config-next": {
-      "version": "13.1.2",
-      "resolved": "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-13.1.2.tgz",
-      "integrity": "sha512-zdRAQOr8v69ZwJRtBrGqAqm160ONqKxU/pV1FB1KlgfyqveGsLZmlQ7l31otwtw763901J7xdiTVkj2y3YxXZA==",
+      "version": "11.1.2",
+      "integrity": "sha512-dFutecxX2Z5/QVlLwdtKt+gIfmNMP8Qx6/qZh3LM/DFVdGJEAnUKrr4VwGmACB2kx/PQ5bx3R+QxnEg4fDPiTg==",
       "dev": true,
       "dependencies": {
-        "@next/eslint-plugin-next": "13.1.2",
-        "@rushstack/eslint-patch": "^1.1.3",
-        "@typescript-eslint/parser": "^5.42.0",
-        "eslint-import-resolver-node": "^0.3.6",
-        "eslint-import-resolver-typescript": "^3.5.2",
-        "eslint-plugin-import": "^2.26.0",
-        "eslint-plugin-jsx-a11y": "^6.5.1",
-        "eslint-plugin-react": "^7.31.7",
-        "eslint-plugin-react-hooks": "^4.5.0"
+        "@next/eslint-plugin-next": "11.1.2",
+        "@rushstack/eslint-patch": "^1.0.6",
+        "@typescript-eslint/parser": "^4.20.0",
+        "eslint-import-resolver-node": "^0.3.4",
+        "eslint-import-resolver-typescript": "^2.4.0",
+        "eslint-plugin-import": "^2.22.1",
+        "eslint-plugin-jsx-a11y": "^6.4.1",
+        "eslint-plugin-react": "^7.23.1",
+        "eslint-plugin-react-hooks": "^4.2.0"
       },
       "peerDependencies": {
-        "eslint": "^7.23.0 || ^8.0.0",
+        "eslint": "^7.23.0",
+        "next": ">=10.2.0",
         "typescript": ">=3.3.1"
       },
       "peerDependenciesMeta": {
@@ -4048,131 +4269,191 @@
         }
       }
     },
-    "node_modules/eslint-config-prettier": {
-      "version": "8.6.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.6.0.tgz",
-      "integrity": "sha512-bAF0eLpLVqP5oEVUFKpMA+NnRFICwn9X8B5jrR9FcqnYBuPbqWEjTEspPWMj5ye6czoSLDweCzSo3Ko7gGrZaA==",
+    "node_modules/eslint-config-next/node_modules/@typescript-eslint/parser": {
+      "version": "4.33.0",
+      "integrity": "sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA==",
       "dev": true,
-      "bin": {
-        "eslint-config-prettier": "bin/cli.js"
+      "dependencies": {
+        "@typescript-eslint/scope-manager": "4.33.0",
+        "@typescript-eslint/types": "4.33.0",
+        "@typescript-eslint/typescript-estree": "4.33.0",
+        "debug": "^4.3.1"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": ">=7.0.0"
+        "eslint": "^5.0.0 || ^6.0.0 || ^7.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
-    "node_modules/eslint-import-resolver-node": {
-      "version": "0.3.7",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz",
-      "integrity": "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==",
+    "node_modules/eslint-config-next/node_modules/@typescript-eslint/scope-manager": {
+      "version": "4.33.0",
+      "integrity": "sha512-5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ==",
       "dev": true,
       "dependencies": {
-        "debug": "^3.2.7",
-        "is-core-module": "^2.11.0",
-        "resolve": "^1.22.1"
+        "@typescript-eslint/types": "4.33.0",
+        "@typescript-eslint/visitor-keys": "4.33.0"
+      },
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/eslint-import-resolver-node/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+    "node_modules/eslint-config-next/node_modules/@typescript-eslint/types": {
+      "version": "4.33.0",
+      "integrity": "sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ==",
       "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/eslint-import-resolver-node/node_modules/resolve": {
-      "version": "1.22.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
+    "node_modules/eslint-config-next/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "4.33.0",
+      "integrity": "sha512-rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA==",
       "dev": true,
       "dependencies": {
-        "is-core-module": "^2.9.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
+        "@typescript-eslint/types": "4.33.0",
+        "@typescript-eslint/visitor-keys": "4.33.0",
+        "debug": "^4.3.1",
+        "globby": "^11.0.3",
+        "is-glob": "^4.0.1",
+        "semver": "^7.3.5",
+        "tsutils": "^3.21.0"
       },
-      "bin": {
-        "resolve": "bin/resolve"
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
-    "node_modules/eslint-import-resolver-typescript": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.5.3.tgz",
-      "integrity": "sha512-njRcKYBc3isE42LaTcJNVANR3R99H9bAxBDMNDr2W7yq5gYPxbU3MkdhsQukxZ/Xg9C2vcyLlDsbKfRDg0QvCQ==",
+    "node_modules/eslint-config-next/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "4.33.0",
+      "integrity": "sha512-uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg==",
       "dev": true,
       "dependencies": {
-        "debug": "^4.3.4",
-        "enhanced-resolve": "^5.10.0",
-        "get-tsconfig": "^4.2.0",
-        "globby": "^13.1.2",
-        "is-core-module": "^2.10.0",
-        "is-glob": "^4.0.3",
-        "synckit": "^0.8.4"
+        "@typescript-eslint/types": "4.33.0",
+        "eslint-visitor-keys": "^2.0.0"
       },
       "engines": {
-        "node": "^14.18.0 || >=16.0.0"
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
       },
       "funding": {
-        "url": "https://opencollective.com/unts/projects/eslint-import-resolver-ts"
-      },
-      "peerDependencies": {
-        "eslint": "*",
-        "eslint-plugin-import": "*"
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/eslint-import-resolver-typescript/node_modules/globby": {
-      "version": "13.1.3",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-13.1.3.tgz",
-      "integrity": "sha512-8krCNHXvlCgHDpegPzleMq07yMYTO2sXKASmZmquEYWEmCx6J5UTRbp5RwMJkTJGtcQ44YpiUYUiN0b9mzy8Bw==",
+    "node_modules/eslint-config-next/node_modules/globby": {
+      "version": "11.0.4",
+      "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==",
       "dev": true,
       "dependencies": {
+        "array-union": "^2.1.0",
         "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.11",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^4.0.0"
+        "fast-glob": "^3.1.1",
+        "ignore": "^5.1.4",
+        "merge2": "^1.3.0",
+        "slash": "^3.0.0"
       },
       "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+        "node": ">=10"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/eslint-import-resolver-typescript/node_modules/slash": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
-      "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
+    "node_modules/eslint-config-next/node_modules/ignore": {
+      "version": "5.1.8",
+      "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
       "dev": true,
       "engines": {
-        "node": ">=12"
+        "node": ">= 4"
+      }
+    },
+    "node_modules/eslint-config-prettier": {
+      "version": "7.0.0",
+      "integrity": "sha512-8Y8lGLVPPZdaNA7JXqnvETVC7IiVRgAP6afQu9gOQRn90YY3otMNh+x7Vr2vMePQntF+5erdSUBqSzCmU/AxaQ==",
+      "dev": true,
+      "bin": {
+        "eslint-config-prettier": "bin/cli.js"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "peerDependencies": {
+        "eslint": ">=7.0.0"
       }
     },
-    "node_modules/eslint-module-utils": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz",
-      "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==",
+    "node_modules/eslint-import-resolver-node": {
+      "version": "0.3.6",
+      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.2.7",
+        "resolve": "^1.20.0"
+      }
+    },
+    "node_modules/eslint-import-resolver-node/node_modules/debug": {
+      "version": "3.2.7",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-import-resolver-typescript": {
+      "version": "2.5.0",
+      "integrity": "sha512-qZ6e5CFr+I7K4VVhQu3M/9xGv9/YmwsEXrsm3nimw8vWaVHRDrQRp26BgCypTxBp3vUp4o5aVEJRiy0F2DFddQ==",
       "dev": true,
       "dependencies": {
-        "debug": "^3.2.7"
+        "debug": "^4.3.1",
+        "glob": "^7.1.7",
+        "is-glob": "^4.0.1",
+        "resolve": "^1.20.0",
+        "tsconfig-paths": "^3.9.0"
       },
       "engines": {
         "node": ">=4"
       },
-      "peerDependenciesMeta": {
-        "eslint": {
-          "optional": true
-        }
+      "peerDependencies": {
+        "eslint": "*",
+        "eslint-plugin-import": "*"
+      }
+    },
+    "node_modules/eslint-module-utils": {
+      "version": "2.7.0",
+      "integrity": "sha512-hqSE88MmHl3ru9SYvDyGrlo0JwROlf9fiEMplEV7j/EAuq9iSlIlyCFbBT6pdULQBSnBYtYKiMLps+hKkyP7Gg==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.2.7",
+        "find-up": "^2.1.0",
+        "pkg-dir": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
       }
     },
     "node_modules/eslint-module-utils/node_modules/debug": {
       "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
       "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
       "dependencies": {
@@ -4180,46 +4461,43 @@
       }
     },
     "node_modules/eslint-plugin-import": {
-      "version": "2.27.4",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.4.tgz",
-      "integrity": "sha512-Z1jVt1EGKia1X9CnBCkpAOhWy8FgQ7OmJ/IblEkT82yrFU/xJaxwujaTzLWqigewwynRQ9mmHfX9MtAfhxm0sA==",
+      "version": "2.24.2",
+      "integrity": "sha512-hNVtyhiEtZmpsabL4neEj+6M5DCLgpYyG9nzJY8lZQeQXEn5UPW1DpUdsMHMXsq98dbNm7nt1w9ZMSVpfJdi8Q==",
       "dev": true,
       "dependencies": {
-        "array-includes": "^3.1.6",
-        "array.prototype.flat": "^1.3.1",
-        "array.prototype.flatmap": "^1.3.0",
-        "debug": "^3.2.7",
+        "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.7",
-        "eslint-module-utils": "^2.7.4",
+        "eslint-import-resolver-node": "^0.3.6",
+        "eslint-module-utils": "^2.6.2",
+        "find-up": "^2.0.0",
         "has": "^1.0.3",
-        "is-core-module": "^2.11.0",
-        "is-glob": "^4.0.3",
-        "minimatch": "^3.1.2",
-        "object.values": "^1.1.6",
-        "resolve": "^1.22.1",
-        "semver": "^6.3.0",
-        "tsconfig-paths": "^3.14.1"
+        "is-core-module": "^2.6.0",
+        "minimatch": "^3.0.4",
+        "object.values": "^1.1.4",
+        "pkg-up": "^2.0.0",
+        "read-pkg-up": "^3.0.0",
+        "resolve": "^1.20.0",
+        "tsconfig-paths": "^3.11.0"
       },
       "engines": {
         "node": ">=4"
       },
       "peerDependencies": {
-        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
+        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0"
       }
     },
     "node_modules/eslint-plugin-import/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "version": "2.6.9",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
       "dependencies": {
-        "ms": "^2.1.1"
+        "ms": "2.0.0"
       }
     },
     "node_modules/eslint-plugin-import/node_modules/doctrine": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
       "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
       "dev": true,
       "dependencies": {
@@ -4229,136 +4507,96 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/resolve": {
-      "version": "1.22.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
-      "dev": true,
-      "dependencies": {
-        "is-core-module": "^2.9.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
+    "node_modules/eslint-plugin-import/node_modules/ms": {
+      "version": "2.0.0",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
     },
     "node_modules/eslint-plugin-jsx-a11y": {
-      "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.7.1.tgz",
-      "integrity": "sha512-63Bog4iIethyo8smBklORknVjB0T2dwB8Mr/hIC+fBS0uyHdYYpzM/Ed+YC8VxTjlXHEWFOdmgwcDn1U2L9VCA==",
+      "version": "6.4.1",
+      "integrity": "sha512-0rGPJBbwHoGNPU73/QCLP/vveMlM1b1Z9PponxO87jfr6tuH5ligXbDT6nHSSzBC8ovX2Z+BQu7Bk5D/Xgq9zg==",
       "dev": true,
       "dependencies": {
-        "@babel/runtime": "^7.20.7",
-        "aria-query": "^5.1.3",
-        "array-includes": "^3.1.6",
-        "array.prototype.flatmap": "^1.3.1",
+        "@babel/runtime": "^7.11.2",
+        "aria-query": "^4.2.2",
+        "array-includes": "^3.1.1",
         "ast-types-flow": "^0.0.7",
-        "axe-core": "^4.6.2",
-        "axobject-query": "^3.1.1",
-        "damerau-levenshtein": "^1.0.8",
-        "emoji-regex": "^9.2.2",
+        "axe-core": "^4.0.2",
+        "axobject-query": "^2.2.0",
+        "damerau-levenshtein": "^1.0.6",
+        "emoji-regex": "^9.0.0",
         "has": "^1.0.3",
-        "jsx-ast-utils": "^3.3.3",
-        "language-tags": "=1.0.5",
-        "minimatch": "^3.1.2",
-        "object.entries": "^1.1.6",
-        "object.fromentries": "^2.0.6",
-        "semver": "^6.3.0"
+        "jsx-ast-utils": "^3.1.0",
+        "language-tags": "^1.0.5"
       },
       "engines": {
         "node": ">=4.0"
       },
       "peerDependencies": {
-        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
-      }
-    },
-    "node_modules/eslint-plugin-jsx-a11y/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
+        "eslint": "^3 || ^4 || ^5 || ^6 || ^7"
       }
     },
     "node_modules/eslint-plugin-prettier": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz",
-      "integrity": "sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.3.0.tgz",
+      "integrity": "sha512-tMTwO8iUWlSRZIwS9k7/E4vrTsfvsrcM5p1eftyuqWH25nKsz/o6/54I7jwQ/3zobISyC7wMy9ZsFwgTxOcOpQ==",
       "dev": true,
       "dependencies": {
         "prettier-linter-helpers": "^1.0.0"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=6.0.0"
       },
       "peerDependencies": {
-        "eslint": ">=7.28.0",
-        "prettier": ">=2.0.0"
+        "eslint": ">=5.0.0",
+        "prettier": ">=1.13.0"
       },
       "peerDependenciesMeta": {
-        "eslint-config-prettier": {
+        "eslint-plugin-prettier": {
           "optional": true
         }
       }
     },
     "node_modules/eslint-plugin-react": {
-      "version": "7.32.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.32.0.tgz",
-      "integrity": "sha512-vSBi1+SrPiLZCGvxpiZIa28fMEUaMjXtCplrvxcIxGzmFiYdsXQDwInEjuv5/i/2CTTxbkS87tE8lsQ0Qxinbw==",
+      "version": "7.26.1",
+      "integrity": "sha512-Lug0+NOFXeOE+ORZ5pbsh6mSKjBKXDXItUD2sQoT+5Yl0eoT82DqnXeTMfUare4QVCn9QwXbfzO/dBLjLXwVjQ==",
       "dev": true,
       "dependencies": {
-        "array-includes": "^3.1.6",
-        "array.prototype.flatmap": "^1.3.1",
-        "array.prototype.tosorted": "^1.1.1",
+        "array-includes": "^3.1.3",
+        "array.prototype.flatmap": "^1.2.4",
         "doctrine": "^2.1.0",
-        "estraverse": "^5.3.0",
+        "estraverse": "^5.2.0",
         "jsx-ast-utils": "^2.4.1 || ^3.0.0",
-        "minimatch": "^3.1.2",
-        "object.entries": "^1.1.6",
-        "object.fromentries": "^2.0.6",
-        "object.hasown": "^1.1.2",
-        "object.values": "^1.1.6",
-        "prop-types": "^15.8.1",
-        "resolve": "^2.0.0-next.4",
+        "minimatch": "^3.0.4",
+        "object.entries": "^1.1.4",
+        "object.fromentries": "^2.0.4",
+        "object.hasown": "^1.0.0",
+        "object.values": "^1.1.4",
+        "prop-types": "^15.7.2",
+        "resolve": "^2.0.0-next.3",
         "semver": "^6.3.0",
-        "string.prototype.matchall": "^4.0.8"
+        "string.prototype.matchall": "^4.0.5"
       },
       "engines": {
         "node": ">=4"
       },
       "peerDependencies": {
-        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
+        "eslint": "^3 || ^4 || ^5 || ^6 || ^7"
       }
     },
     "node_modules/eslint-plugin-react-hooks": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz",
-      "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==",
+      "version": "4.2.0",
+      "integrity": "sha512-623WEiZJqxR7VdxFCKLI6d6LLpwJkGPYKODnkH3D7WpOG5KM8yWueBd8TLsNAetEJNF5iJmolaAKO3F8yzyVBQ==",
       "dev": true,
       "engines": {
         "node": ">=10"
       },
       "peerDependencies": {
-        "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0"
+        "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0"
       }
     },
     "node_modules/eslint-plugin-react/node_modules/doctrine": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
       "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
       "dev": true,
       "dependencies": {
@@ -4368,27 +4606,13 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/eslint-plugin-react/node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
     "node_modules/eslint-plugin-react/node_modules/resolve": {
-      "version": "2.0.0-next.4",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz",
-      "integrity": "sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==",
+      "version": "2.0.0-next.3",
+      "integrity": "sha512-W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q==",
       "dev": true,
       "dependencies": {
-        "is-core-module": "^2.9.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
+        "is-core-module": "^2.2.0",
+        "path-parse": "^1.0.6"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -4396,7 +4620,6 @@
     },
     "node_modules/eslint-plugin-react/node_modules/semver": {
       "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
       "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
       "dev": true,
       "bin": {
@@ -4405,7 +4628,6 @@
     },
     "node_modules/eslint-scope": {
       "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
       "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
       "dev": true,
       "dependencies": {
@@ -4418,7 +4640,6 @@
     },
     "node_modules/eslint-scope/node_modules/estraverse": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
       "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
       "dev": true,
       "engines": {
@@ -4426,98 +4647,54 @@
       }
     },
     "node_modules/eslint-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+      "version": "2.1.0",
+      "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
       "dev": true,
       "dependencies": {
-        "eslint-visitor-keys": "^2.0.0"
+        "eslint-visitor-keys": "^1.1.0"
       },
       "engines": {
-        "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
+        "node": ">=6"
       },
       "funding": {
         "url": "https://github.com/sponsors/mysticatea"
-      },
-      "peerDependencies": {
-        "eslint": ">=5"
       }
     },
     "node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+      "version": "1.3.0",
+      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
       "dev": true,
       "engines": {
-        "node": ">=10"
+        "node": ">=4"
       }
     },
     "node_modules/eslint-visitor-keys": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/eslint/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "version": "2.1.0",
+      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
       "dev": true,
       "engines": {
         "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/eslint-scope": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
-      "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
-    "node_modules/eslint/node_modules/find-up": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+    "node_modules/eslint/node_modules/@babel/code-frame": {
+      "version": "7.12.11",
+      "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
       "dev": true,
       "dependencies": {
-        "locate-path": "^6.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "@babel/highlight": "^7.10.4"
       }
     },
-    "node_modules/eslint/node_modules/glob-parent": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+    "node_modules/eslint/node_modules/argparse": {
+      "version": "1.0.10",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
       "dev": true,
       "dependencies": {
-        "is-glob": "^4.0.3"
-      },
-      "engines": {
-        "node": ">=10.13.0"
+        "sprintf-js": "~1.0.2"
       }
     },
     "node_modules/eslint/node_modules/globals": {
-      "version": "13.19.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz",
-      "integrity": "sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==",
+      "version": "13.11.0",
+      "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==",
       "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -4529,48 +4706,20 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/eslint/node_modules/locate-path": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/p-locate": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+    "node_modules/eslint/node_modules/js-yaml": {
+      "version": "3.14.1",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
       "dev": true,
       "dependencies": {
-        "p-limit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=10"
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
       }
     },
     "node_modules/eslint/node_modules/type-fest": {
       "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
       "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
       "dev": true,
       "engines": {
@@ -4581,39 +4730,30 @@
       }
     },
     "node_modules/espree": {
-      "version": "9.4.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz",
-      "integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==",
+      "version": "7.3.1",
+      "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
       "dev": true,
       "dependencies": {
-        "acorn": "^8.8.0",
-        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.3.0"
+        "acorn": "^7.4.0",
+        "acorn-jsx": "^5.3.1",
+        "eslint-visitor-keys": "^1.3.0"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
+        "node": "^10.12.0 || >=12.0.0"
       }
     },
-    "node_modules/espree/node_modules/acorn": {
-      "version": "8.8.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
-      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
+    "node_modules/espree/node_modules/eslint-visitor-keys": {
+      "version": "1.3.0",
+      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
       "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
       "engines": {
-        "node": ">=0.4.0"
+        "node": ">=4"
       }
     },
     "node_modules/esprima": {
       "version": "4.0.1",
       "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
       "dev": true,
-      "peer": true,
       "bin": {
         "esparse": "bin/esparse.js",
         "esvalidate": "bin/esvalidate.js"
@@ -4624,7 +4764,6 @@
     },
     "node_modules/esquery": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
       "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
       "dev": true,
       "dependencies": {
@@ -4636,7 +4775,6 @@
     },
     "node_modules/esrecurse": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
       "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
       "dev": true,
       "dependencies": {
@@ -4662,6 +4800,34 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/etag": {
+      "version": "1.8.1",
+      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/events": {
+      "version": "3.3.0",
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=0.8.x"
+      }
+    },
+    "node_modules/evp_bytestokey": {
+      "version": "1.0.3",
+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "md5.js": "^1.3.4",
+        "safe-buffer": "^5.1.1"
+      }
+    },
     "node_modules/exec-sh": {
       "version": "0.3.6",
       "integrity": "sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==",
@@ -4929,14 +5095,12 @@
     },
     "node_modules/fast-diff": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz",
       "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==",
       "dev": true
     },
     "node_modules/fast-glob": {
-      "version": "3.2.12",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
-      "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
+      "version": "3.2.7",
+      "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==",
       "dev": true,
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
@@ -4946,7 +5110,7 @@
         "micromatch": "^4.0.4"
       },
       "engines": {
-        "node": ">=8.6.0"
+        "node": ">=8"
       }
     },
     "node_modules/fast-json-stable-stringify": {
@@ -4981,6 +5145,13 @@
         "bser": "2.1.1"
       }
     },
+    "node_modules/figgy-pudding": {
+      "version": "3.5.2",
+      "integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
     "node_modules/figures": {
       "version": "3.2.0",
       "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
@@ -5006,7 +5177,14 @@
         "node": "^10.12.0 || >=12.0.0"
       }
     },
-    "node_modules/filelist": {
+    "node_modules/file-uri-to-path": {
+      "version": "1.0.0",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/filelist": {
       "version": "1.0.2",
       "integrity": "sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ==",
       "dev": true,
@@ -5025,6 +5203,120 @@
         "node": ">=8"
       }
     },
+    "node_modules/find-cache-dir": {
+      "version": "3.3.1",
+      "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "commondir": "^1.0.1",
+        "make-dir": "^3.0.2",
+        "pkg-dir": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
+      }
+    },
+    "node_modules/find-cache-dir/node_modules/find-up": {
+      "version": "4.1.0",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/find-cache-dir/node_modules/locate-path": {
+      "version": "5.0.0",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/find-cache-dir/node_modules/make-dir": {
+      "version": "3.1.0",
+      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "semver": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/find-cache-dir/node_modules/p-limit": {
+      "version": "2.3.0",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/find-cache-dir/node_modules/p-locate": {
+      "version": "4.1.0",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/find-cache-dir/node_modules/path-exists": {
+      "version": "4.0.0",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/find-cache-dir/node_modules/pkg-dir": {
+      "version": "4.2.0",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "find-up": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/find-cache-dir/node_modules/semver": {
+      "version": "6.3.0",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true,
+      "peer": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
     "node_modules/find-up": {
       "version": "2.1.0",
       "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
@@ -5036,15 +5328,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/flat": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
-      "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
-      "dev": true,
-      "bin": {
-        "flat": "cli.js"
-      }
-    },
     "node_modules/flat-cache": {
       "version": "3.0.4",
       "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
@@ -5062,13 +5345,41 @@
       "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==",
       "dev": true
     },
-    "node_modules/for-each": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
-      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+    "node_modules/flush-write-stream": {
+      "version": "1.1.1",
+      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.3.6"
+      }
+    },
+    "node_modules/flush-write-stream/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/flush-write-stream/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "is-callable": "^1.1.3"
+        "safe-buffer": "~5.1.0"
       }
     },
     "node_modules/for-in": {
@@ -5080,6 +5391,12 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/foreach": {
+      "version": "2.0.5",
+      "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
+      "dev": true,
+      "peer": true
+    },
     "node_modules/form-data": {
       "version": "3.0.1",
       "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
@@ -5105,6 +5422,43 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/from2": {
+      "version": "2.3.0",
+      "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0"
+      }
+    },
+    "node_modules/from2/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/from2/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
     "node_modules/fs-extra": {
       "version": "9.0.1",
       "integrity": "sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==",
@@ -5119,6 +5473,45 @@
         "node": ">=10"
       }
     },
+    "node_modules/fs-write-stream-atomic": {
+      "version": "1.0.10",
+      "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "iferr": "^0.1.5",
+        "imurmurhash": "^0.1.4",
+        "readable-stream": "1 || 2"
+      }
+    },
+    "node_modules/fs-write-stream-atomic/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/fs-write-stream-atomic/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
     "node_modules/fs.realpath": {
       "version": "1.0.0",
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
@@ -5143,32 +5536,10 @@
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
       "dev": true
     },
-    "node_modules/function.prototype.name": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
-      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0",
-        "functions-have-names": "^1.2.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/functions-have-names": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
-      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+    "node_modules/functional-red-black-tree": {
+      "version": "1.0.1",
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+      "dev": true
     },
     "node_modules/gensync": {
       "version": "1.0.0-beta.2",
@@ -5182,24 +5553,33 @@
       "version": "2.0.5",
       "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
       "dev": true,
+      "peer": true,
       "engines": {
         "node": "6.* || 8.* || >= 10.*"
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
+      "version": "1.1.1",
+      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
       "dev": true,
       "dependencies": {
         "function-bind": "^1.1.1",
         "has": "^1.0.3",
-        "has-symbols": "^1.0.3"
+        "has-symbols": "^1.0.1"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/get-orientation": {
+      "version": "1.1.2",
+      "integrity": "sha512-/pViTfifW+gBbh/RnlFYHINvELT9Znt+SYyDKAUL6uV6By019AK/s+i9XP4jSwq7lwP38Fd8HVeTxym3+hkwmQ==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "stream-parser": "^0.3.1"
+      }
+    },
     "node_modules/get-own-enumerable-property-symbols": {
       "version": "3.0.2",
       "integrity": "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==",
@@ -5231,7 +5611,6 @@
     },
     "node_modules/get-symbol-description": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
       "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
       "dev": true,
       "dependencies": {
@@ -5245,15 +5624,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/get-tsconfig": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.3.0.tgz",
-      "integrity": "sha512-YCcF28IqSay3fqpIu5y3Krg/utCBHBeoflkZyHj/QcqI2nrLPC3ZegS9CmIo+hJb8K7aiGsuUl7PwWVjNG2HQQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1"
-      }
-    },
     "node_modules/get-value": {
       "version": "2.0.6",
       "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
@@ -5293,6 +5663,12 @@
         "node": ">= 6"
       }
     },
+    "node_modules/glob-to-regexp": {
+      "version": "0.4.1",
+      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
+      "dev": true,
+      "peer": true
+    },
     "node_modules/global-modules": {
       "version": "2.0.0",
       "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
@@ -5336,27 +5712,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/globalthis": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
-      "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.1.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/globalyzer": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/globalyzer/-/globalyzer-0.1.0.tgz",
-      "integrity": "sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==",
-      "dev": true
-    },
     "node_modules/globby": {
       "version": "11.0.1",
       "integrity": "sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==",
@@ -5376,17 +5731,19 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/globby/node_modules/ignore": {
+      "version": "5.1.8",
+      "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
     "node_modules/globjoin": {
       "version": "0.1.4",
       "integrity": "sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=",
       "dev": true
     },
-    "node_modules/globrex": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz",
-      "integrity": "sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==",
-      "dev": true
-    },
     "node_modules/gonzales-pe": {
       "version": "4.3.0",
       "integrity": "sha512-otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ==",
@@ -5401,29 +5758,11 @@
         "node": ">=0.6.0"
       }
     },
-    "node_modules/gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
-      "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.1.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/graceful-fs": {
       "version": "4.2.8",
       "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==",
       "dev": true
     },
-    "node_modules/grapheme-splitter": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
-      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
-      "dev": true
-    },
     "node_modules/graphql": {
       "version": "15.6.1",
       "integrity": "sha512-3i5lu0z6dRvJ48QP9kFxBkJ7h4Kso7PS8eahyTFz5Jm6CvQfLtNIE8LX9N6JLnXTuwR+sIYnXzaWp6anOg0QQw==",
@@ -5472,9 +5811,8 @@
       }
     },
     "node_modules/has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+      "version": "1.0.1",
+      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
       "dev": true,
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -5488,37 +5826,12 @@
         "node": ">=8"
       }
     },
-    "node_modules/has-property-descriptors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
-      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+    "node_modules/has-symbols": {
+      "version": "1.0.2",
+      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
       "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.1.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
-      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -5526,7 +5839,6 @@
     },
     "node_modules/has-tostringtag": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
       "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
       "dev": true,
       "dependencies": {
@@ -5608,11 +5920,74 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/hash-base": {
+      "version": "3.1.0",
+      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/hash-base/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "peer": true
+    },
+    "node_modules/hash.js": {
+      "version": "1.1.7",
+      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.1"
+      }
+    },
+    "node_modules/he": {
+      "version": "1.2.0",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+      "dev": true,
+      "peer": true,
+      "bin": {
+        "he": "bin/he"
+      }
+    },
+    "node_modules/hmac-drbg": {
+      "version": "1.0.1",
+      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "hash.js": "^1.0.3",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
     "node_modules/hosted-git-info": {
       "version": "2.8.9",
       "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "node_modules/html-encoding-sniffer": {
       "version": "2.0.1",
@@ -5667,6 +6042,12 @@
         "node": ">= 6"
       }
     },
+    "node_modules/https-browserify": {
+      "version": "1.0.0",
+      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
+      "dev": true,
+      "peer": true
+    },
     "node_modules/https-proxy-agent": {
       "version": "5.0.0",
       "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
@@ -5700,15 +6081,56 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/ieee754": {
+      "version": "1.2.1",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "peer": true
+    },
+    "node_modules/iferr": {
+      "version": "0.1.5",
+      "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
     "node_modules/ignore": {
-      "version": "5.2.4",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
-      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
+      "version": "4.0.6",
+      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
       "dev": true,
       "engines": {
         "node": ">= 4"
       }
     },
+    "node_modules/image-size": {
+      "version": "1.0.0",
+      "integrity": "sha512-JLJ6OwBfO1KcA+TvJT+v8gbE6iWbj24LyDNFgFEN0lzegn6cC6a/p3NIDaepMsJjQjlUWqIC7wJv8lBFxPNjcw==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "queue": "6.0.2"
+      },
+      "bin": {
+        "image-size": "bin/image-size.js"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
     "node_modules/import-fresh": {
       "version": "3.3.0",
       "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
@@ -5829,6 +6251,13 @@
         "node": ">=8"
       }
     },
+    "node_modules/infer-owner": {
+      "version": "1.0.4",
+      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
     "node_modules/inflight": {
       "version": "1.0.6",
       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
@@ -5873,12 +6302,11 @@
       }
     },
     "node_modules/internal-slot": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz",
-      "integrity": "sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==",
+      "version": "1.0.3",
+      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
       "dev": true,
       "dependencies": {
-        "get-intrinsic": "^1.1.3",
+        "get-intrinsic": "^1.1.0",
         "has": "^1.0.3",
         "side-channel": "^1.0.4"
       },
@@ -5915,15 +6343,6 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/is-alphanumeric": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-alphanumeric/-/is-alphanumeric-1.0.0.tgz",
-      "integrity": "sha512-ZmRL7++ZkcMOfDuWZuMJyIVLr2keE1o/DeNWh1EmgqGhUcV+9BIVsx0BcSBOHTZqzjs4+dISzr2KAeBEWGgXeA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/is-alphanumerical": {
       "version": "1.0.4",
       "integrity": "sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==",
@@ -5939,9 +6358,9 @@
     },
     "node_modules/is-arguments": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
       "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "call-bind": "^1.0.2",
         "has-tostringtag": "^1.0.0"
@@ -5953,20 +6372,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-array-buffer": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.1.tgz",
-      "integrity": "sha512-ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.3",
-        "is-typed-array": "^1.1.10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/is-arrayish": {
       "version": "0.2.1",
       "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
@@ -5974,7 +6379,6 @@
     },
     "node_modules/is-bigint": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
       "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
       "dev": true,
       "dependencies": {
@@ -5984,9 +6388,20 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "binary-extensions": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/is-boolean-object": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
       "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
       "dev": true,
       "dependencies": {
@@ -6023,9 +6438,8 @@
       }
     },
     "node_modules/is-callable": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
+      "version": "1.2.4",
+      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
       "dev": true,
       "engines": {
         "node": ">= 0.4"
@@ -6046,9 +6460,8 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
-      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
+      "version": "2.7.0",
+      "integrity": "sha512-ByY+tjCciCr+9nLryBYcSD50EOGWt95c7tIsKTG1J2ixKKXPvF7Ej3AVd+UfDydAJom3biBGDBALaO79ktwgEQ==",
       "dev": true,
       "dependencies": {
         "has": "^1.0.3"
@@ -6071,7 +6484,6 @@
     },
     "node_modules/is-date-object": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
       "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
       "dev": true,
       "dependencies": {
@@ -6155,6 +6567,21 @@
         "node": ">=6"
       }
     },
+    "node_modules/is-generator-function": {
+      "version": "1.0.10",
+      "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-glob": {
       "version": "4.0.3",
       "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
@@ -6175,19 +6602,25 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/is-map": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz",
-      "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==",
+    "node_modules/is-nan": {
+      "version": "1.3.2",
+      "integrity": "sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==",
       "dev": true,
+      "peer": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+      "version": "2.0.1",
+      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
       "dev": true,
       "engines": {
         "node": ">= 0.4"
@@ -6205,9 +6638,8 @@
       }
     },
     "node_modules/is-number-object": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
-      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+      "version": "1.0.6",
+      "integrity": "sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==",
       "dev": true,
       "dependencies": {
         "has-tostringtag": "^1.0.0"
@@ -6227,15 +6659,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/is-plain-obj": {
       "version": "1.1.0",
       "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
@@ -6264,7 +6687,6 @@
     },
     "node_modules/is-regex": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
       "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
       "dev": true,
       "dependencies": {
@@ -6286,23 +6708,10 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-set": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz",
-      "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+      "version": "1.0.1",
+      "integrity": "sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==",
       "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -6320,7 +6729,6 @@
     },
     "node_modules/is-string": {
       "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
       "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
       "dev": true,
       "dependencies": {
@@ -6335,7 +6743,6 @@
     },
     "node_modules/is-symbol": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
       "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
       "dev": true,
       "dependencies": {
@@ -6349,15 +6756,15 @@
       }
     },
     "node_modules/is-typed-array": {
-      "version": "1.1.10",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz",
-      "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==",
+      "version": "1.1.8",
+      "integrity": "sha512-HqH41TNZq2fgtGT8WHVFVJhBVGuY3AnP3Q36K8JKXUxSxRgk/d+7NjmwG2vo2mYmXK8UYZKu0qH8bVP5gEisjA==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
+        "es-abstract": "^1.18.5",
+        "foreach": "^2.0.5",
         "has-tostringtag": "^1.0.0"
       },
       "engines": {
@@ -6394,50 +6801,17 @@
         "node": ">=8"
       }
     },
-    "node_modules/is-weakmap": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz",
-      "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-weakset": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz",
-      "integrity": "sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==",
+      "version": "1.0.1",
+      "integrity": "sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
+        "call-bind": "^1.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-whitespace-character": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz",
-      "integrity": "sha512-SDweEzfIZM0SJV0EUga669UTKlmL0Pq8Lno0QDQsPnvECB3IM2aP0gdx5TrU0A01MAPfViaZiI2V1QMZLaKK5w==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
     "node_modules/is-windows": {
       "version": "1.0.2",
       "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
@@ -6447,16 +6821,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-word-character": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-word-character/-/is-word-character-1.0.4.tgz",
-      "integrity": "sha512-5SMO8RVennx3nZrqtKwCGyyetPE9VDba5ugvKLaD4KopPG5kR4mQ7tNt/r7feL5yt5h3lpuBbIUmCOG2eSzXHA==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
     "node_modules/is-wsl": {
       "version": "2.2.0",
       "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
@@ -7335,33 +7699,11 @@
         "node": ">= 10.13.0"
       }
     },
-    "node_modules/js-sdsl": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.2.0.tgz",
-      "integrity": "sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==",
-      "dev": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/js-sdsl"
-      }
-    },
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
       "dev": true
     },
-    "node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
     "node_modules/jsdom": {
       "version": "16.7.0",
       "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==",
@@ -7443,14 +7785,12 @@
     },
     "node_modules/json-schema-traverse": {
       "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
       "dev": true
     },
     "node_modules/json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
       "dev": true
     },
     "node_modules/json5": {
@@ -7487,13 +7827,12 @@
       }
     },
     "node_modules/jsx-ast-utils": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.3.tgz",
-      "integrity": "sha512-fYQHZTZ8jSfmWZ0iyzfwiU4WDX4HpHbMCZ3gPlWYiCl3BoeOTsqKBqnTVfH2rYT7eP5c3sVbeSPHnnJOaTrWiw==",
+      "version": "3.2.1",
+      "integrity": "sha512-uP5vu8xfy2F9A6LGC22KO7e2/vGTS1MhP+18f++ZNlf0Ohaxbc9nIEwHAsejlJKyzfZzU5UIhe5ItYkitcZnZA==",
       "dev": true,
       "dependencies": {
-        "array-includes": "^3.1.5",
-        "object.assign": "^4.1.3"
+        "array-includes": "^3.1.3",
+        "object.assign": "^4.1.2"
       },
       "engines": {
         "node": ">=4.0"
@@ -7522,15 +7861,13 @@
       "dev": true
     },
     "node_modules/language-subtag-registry": {
-      "version": "0.3.22",
-      "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz",
-      "integrity": "sha512-tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w==",
+      "version": "0.3.21",
+      "integrity": "sha512-L0IqwlIXjilBVVYKFT37X9Ih11Um5NEl9cbJIuU/SwP/zEEAbBPOnEeeuxVMf45ydWQRDQN3Nqc96OgbH1K+Pg==",
       "dev": true
     },
     "node_modules/language-tags": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz",
-      "integrity": "sha512-qJhlO9cGXi6hBGKoxEG/sKZDAHD5Hnu9Hs4WbOY3pCWXDhw0N8x1NenNzm2EnNLkLkk7J2SdxAkDSbb6ftT+UQ==",
+      "integrity": "sha1-0yHbxNowuovzAk4ED6XBRmH5GTo=",
       "dev": true,
       "dependencies": {
         "language-subtag-registry": "~0.3.2"
@@ -7547,7 +7884,6 @@
     },
     "node_modules/levn": {
       "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
       "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
       "dev": true,
       "dependencies": {
@@ -7708,6 +8044,44 @@
         "node": ">=4"
       }
     },
+    "node_modules/loader-runner": {
+      "version": "2.4.0",
+      "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=4.3.0 <5.0.0 || >=5.10"
+      }
+    },
+    "node_modules/loader-utils": {
+      "version": "1.4.0",
+      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/loader-utils/node_modules/json5": {
+      "version": "1.0.1",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
     "node_modules/locate-path": {
       "version": "2.0.0",
       "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
@@ -7730,11 +8104,11 @@
       "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
       "dev": true
     },
-    "node_modules/lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
+    "node_modules/lodash.sortby": {
+      "version": "4.7.0",
+      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=",
+      "dev": true,
+      "peer": true
     },
     "node_modules/lodash.truncate": {
       "version": "4.4.2",
@@ -7876,29 +8250,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/markdown-escapes": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.4.tgz",
-      "integrity": "sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/markdown-table": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-2.0.0.tgz",
-      "integrity": "sha512-Ezda85ToJUBhM6WGaG6veasyym+Tbs3cMAw/ZhOPqXiYsr0jgocBV3j3nx+4lk47plLlIqjwuTm/ywVI+zjJ/A==",
-      "dev": true,
-      "dependencies": {
-        "repeat-string": "^1.0.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
     "node_modules/mathml-tag-names": {
       "version": "2.1.3",
       "integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==",
@@ -7908,46 +8259,15 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/mdast-util-compact": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/mdast-util-compact/-/mdast-util-compact-2.0.1.tgz",
-      "integrity": "sha512-7GlnT24gEwDrdAwEHrU4Vv5lLWrEer4KOkAiKT9nYstsTad7Oc1TwqT2zIMKRdZF7cTuaf+GA1E4Kv7jJh8mPA==",
-      "dev": true,
-      "dependencies": {
-        "unist-util-visit": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/mdast-util-compact/node_modules/unist-util-visit": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.3.tgz",
-      "integrity": "sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==",
-      "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.0",
-        "unist-util-is": "^4.0.0",
-        "unist-util-visit-parents": "^3.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/mdast-util-compact/node_modules/unist-util-visit-parents": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz",
-      "integrity": "sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==",
+    "node_modules/md5.js": {
+      "version": "1.3.5",
+      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "@types/unist": "^2.0.0",
-        "unist-util-is": "^4.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
       }
     },
     "node_modules/mdast-util-from-markdown": {
@@ -7992,6 +8312,43 @@
         "url": "https://opencollective.com/unified"
       }
     },
+    "node_modules/memory-fs": {
+      "version": "0.4.1",
+      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "errno": "^0.1.3",
+        "readable-stream": "^2.0.1"
+      }
+    },
+    "node_modules/memory-fs/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/memory-fs/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
     "node_modules/merge-stream": {
       "version": "2.0.0",
       "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
@@ -8036,6 +8393,25 @@
         "node": ">=8.6"
       }
     },
+    "node_modules/miller-rabin": {
+      "version": "4.0.1",
+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "bn.js": "^4.0.0",
+        "brorand": "^1.0.1"
+      },
+      "bin": {
+        "miller-rabin": "bin/miller-rabin"
+      }
+    },
+    "node_modules/miller-rabin/node_modules/bn.js": {
+      "version": "4.12.0",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true,
+      "peer": true
+    },
     "node_modules/mime-db": {
       "version": "1.50.0",
       "integrity": "sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A==",
@@ -8071,10 +8447,21 @@
         "node": ">=4"
       }
     },
+    "node_modules/minimalistic-assert": {
+      "version": "1.0.1",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/minimalistic-crypto-utils": {
+      "version": "1.0.1",
+      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
+      "dev": true,
+      "peer": true
+    },
     "node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "version": "3.0.4",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
       "dev": true,
       "dependencies": {
         "brace-expansion": "^1.1.7"
@@ -8084,13 +8471,9 @@
       }
     },
     "node_modules/minimist": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",
-      "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+      "version": "1.2.5",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "dev": true
     },
     "node_modules/minimist-options": {
       "version": "4.1.0",
@@ -8105,6 +8488,28 @@
         "node": ">= 6"
       }
     },
+    "node_modules/mississippi": {
+      "version": "3.0.0",
+      "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "concat-stream": "^1.5.0",
+        "duplexify": "^3.4.2",
+        "end-of-stream": "^1.1.0",
+        "flush-write-stream": "^1.0.0",
+        "from2": "^2.1.0",
+        "parallel-transform": "^1.1.0",
+        "pump": "^3.0.0",
+        "pumpify": "^1.3.3",
+        "stream-each": "^1.1.0",
+        "through2": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
     "node_modules/mixin-deep": {
       "version": "1.3.2",
       "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
@@ -8130,6 +8535,47 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/mkdirp": {
+      "version": "0.5.5",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "minimist": "^1.2.5"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
+    "node_modules/move-concurrently": {
+      "version": "1.0.1",
+      "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "aproba": "^1.1.1",
+        "copy-concurrently": "^1.0.0",
+        "fs-write-stream-atomic": "^1.0.8",
+        "mkdirp": "^0.5.1",
+        "rimraf": "^2.5.4",
+        "run-queue": "^1.0.3"
+      }
+    },
+    "node_modules/move-concurrently/node_modules/rimraf": {
+      "version": "2.7.1",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
     "node_modules/ms": {
       "version": "2.1.2",
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
@@ -8140,11 +8586,18 @@
       "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
       "dev": true
     },
+    "node_modules/nan": {
+      "version": "2.15.0",
+      "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
     "node_modules/nanoid": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
-      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
+      "version": "3.1.29",
+      "integrity": "sha512-dW2pUSGZ8ZnCFIlBIA31SV8huOGCHb6OwzVCc7A69rb/a+SgPBwfmLvK5TKQ3INPbRkcI8a/Owo0XbiTNH19wg==",
       "dev": true,
+      "peer": true,
       "bin": {
         "nanoid": "bin/nanoid.cjs"
       },
@@ -8199,56 +8652,101 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/native-url": {
+      "version": "0.3.4",
+      "integrity": "sha512-6iM8R99ze45ivyH8vybJ7X0yekIcPf5GgLV5K0ENCbmRcaRIDoj37BC8iLEmaaBfqqb8enuZ5p0uhY+lVAbAcA==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "querystring": "^0.2.0"
+      }
+    },
     "node_modules/natural-compare": {
       "version": "1.4.0",
       "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
       "dev": true
     },
-    "node_modules/natural-compare-lite": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz",
-      "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==",
-      "dev": true
+    "node_modules/neo-async": {
+      "version": "2.6.2",
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "node_modules/next": {
-      "version": "12.3.1",
-      "resolved": "https://registry.npmjs.org/next/-/next-12.3.1.tgz",
-      "integrity": "sha512-l7bvmSeIwX5lp07WtIiP9u2ytZMv7jIeB8iacR28PuUEFG5j0HGAPnMqyG5kbZNBG2H7tRsrQ4HCjuMOPnANZw==",
-      "dev": true,
-      "dependencies": {
-        "@next/env": "12.3.1",
-        "@swc/helpers": "0.4.11",
-        "caniuse-lite": "^1.0.30001406",
-        "postcss": "8.4.14",
-        "styled-jsx": "5.0.7",
-        "use-sync-external-store": "1.2.0"
+      "version": "11.1.2",
+      "integrity": "sha512-azEYL0L+wFjv8lstLru3bgvrzPvK0P7/bz6B/4EJ9sYkXeW8r5Bjh78D/Ol7VOg0EIPz0CXoe72hzAlSAXo9hw==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@babel/runtime": "7.15.3",
+        "@hapi/accept": "5.0.2",
+        "@next/env": "11.1.2",
+        "@next/polyfill-module": "11.1.2",
+        "@next/react-dev-overlay": "11.1.2",
+        "@next/react-refresh-utils": "11.1.2",
+        "@node-rs/helper": "1.2.1",
+        "assert": "2.0.0",
+        "ast-types": "0.13.2",
+        "browserify-zlib": "0.2.0",
+        "browserslist": "4.16.6",
+        "buffer": "5.6.0",
+        "caniuse-lite": "^1.0.30001228",
+        "chalk": "2.4.2",
+        "chokidar": "3.5.1",
+        "constants-browserify": "1.0.0",
+        "crypto-browserify": "3.12.0",
+        "cssnano-simple": "3.0.0",
+        "domain-browser": "4.19.0",
+        "encoding": "0.1.13",
+        "etag": "1.8.1",
+        "find-cache-dir": "3.3.1",
+        "get-orientation": "1.1.2",
+        "https-browserify": "1.0.0",
+        "image-size": "1.0.0",
+        "jest-worker": "27.0.0-next.5",
+        "native-url": "0.3.4",
+        "node-fetch": "2.6.1",
+        "node-html-parser": "1.4.9",
+        "node-libs-browser": "^2.2.1",
+        "os-browserify": "0.3.0",
+        "p-limit": "3.1.0",
+        "path-browserify": "1.0.1",
+        "pnp-webpack-plugin": "1.6.4",
+        "postcss": "8.2.15",
+        "process": "0.11.10",
+        "querystring-es3": "0.2.1",
+        "raw-body": "2.4.1",
+        "react-is": "17.0.2",
+        "react-refresh": "0.8.3",
+        "stream-browserify": "3.0.0",
+        "stream-http": "3.1.1",
+        "string_decoder": "1.3.0",
+        "styled-jsx": "4.0.1",
+        "timers-browserify": "2.0.12",
+        "tty-browserify": "0.0.1",
+        "use-subscription": "1.5.1",
+        "util": "0.12.4",
+        "vm-browserify": "1.1.2",
+        "watchpack": "2.1.1"
       },
       "bin": {
         "next": "dist/bin/next"
       },
       "engines": {
-        "node": ">=12.22.0"
+        "node": ">=12.0.0"
       },
       "optionalDependencies": {
-        "@next/swc-android-arm-eabi": "12.3.1",
-        "@next/swc-android-arm64": "12.3.1",
-        "@next/swc-darwin-arm64": "12.3.1",
-        "@next/swc-darwin-x64": "12.3.1",
-        "@next/swc-freebsd-x64": "12.3.1",
-        "@next/swc-linux-arm-gnueabihf": "12.3.1",
-        "@next/swc-linux-arm64-gnu": "12.3.1",
-        "@next/swc-linux-arm64-musl": "12.3.1",
-        "@next/swc-linux-x64-gnu": "12.3.1",
-        "@next/swc-linux-x64-musl": "12.3.1",
-        "@next/swc-win32-arm64-msvc": "12.3.1",
-        "@next/swc-win32-ia32-msvc": "12.3.1",
-        "@next/swc-win32-x64-msvc": "12.3.1"
+        "@next/swc-darwin-arm64": "11.1.2",
+        "@next/swc-darwin-x64": "11.1.2",
+        "@next/swc-linux-x64-gnu": "11.1.2",
+        "@next/swc-win32-x64-msvc": "11.1.2"
       },
       "peerDependencies": {
         "fibers": ">= 3.1.0",
-        "node-sass": "^6.0.0 || ^7.0.0",
-        "react": "^17.0.2 || ^18.0.0-0",
-        "react-dom": "^17.0.2 || ^18.0.0-0",
+        "node-sass": "^4.0.0 || ^5.0.0",
+        "react": "^17.0.2",
+        "react-dom": "^17.0.2",
         "sass": "^1.3.0"
       },
       "peerDependenciesMeta": {
@@ -8263,99 +8761,425 @@
         }
       }
     },
-    "node_modules/nice-try": {
-      "version": "1.0.5",
-      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
-      "dev": true,
-      "peer": true
-    },
-    "node_modules/node-int64": {
-      "version": "0.4.0",
-      "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
+    "node_modules/next/node_modules/@babel/runtime": {
+      "version": "7.15.3",
+      "integrity": "sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA==",
       "dev": true,
-      "peer": true
+      "peer": true,
+      "dependencies": {
+        "regenerator-runtime": "^0.13.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
     },
-    "node_modules/node-modules-regexp": {
-      "version": "1.0.0",
-      "integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=",
+    "node_modules/next/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "dev": true,
       "peer": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=4"
       }
     },
-    "node_modules/node-notifier": {
-      "version": "8.0.2",
-      "integrity": "sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg==",
+    "node_modules/next/node_modules/browserslist": {
+      "version": "4.16.6",
+      "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
       "dev": true,
-      "optional": true,
       "peer": true,
       "dependencies": {
-        "growly": "^1.3.0",
-        "is-wsl": "^2.2.0",
-        "semver": "^7.3.2",
-        "shellwords": "^0.1.1",
-        "uuid": "^8.3.0",
-        "which": "^2.0.2"
+        "caniuse-lite": "^1.0.30001219",
+        "colorette": "^1.2.2",
+        "electron-to-chromium": "^1.3.723",
+        "escalade": "^3.1.1",
+        "node-releases": "^1.1.71"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      },
+      "engines": {
+        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/browserslist"
       }
     },
-    "node_modules/node-releases": {
-      "version": "1.1.77",
-      "integrity": "sha512-rB1DUFUNAN4Gn9keO2K1efO35IDK7yKHCdCaIMvFO7yUYmmZYeDjnGKle26G4rwj+LKRQpjyUUvMkPglwGCYNQ==",
-      "dev": true
-    },
-    "node_modules/normalize-package-data": {
-      "version": "2.5.0",
-      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+    "node_modules/next/node_modules/chalk": {
+      "version": "2.4.2",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "hosted-git-info": "^2.1.4",
-        "resolve": "^1.10.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
       }
     },
-    "node_modules/normalize-package-data/node_modules/semver": {
-      "version": "5.7.1",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+    "node_modules/next/node_modules/color-convert": {
+      "version": "1.9.3",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
       "dev": true,
       "peer": true,
-      "bin": {
-        "semver": "bin/semver"
+      "dependencies": {
+        "color-name": "1.1.3"
       }
     },
-    "node_modules/normalize-path": {
-      "version": "3.0.0",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+    "node_modules/next/node_modules/color-name": {
+      "version": "1.1.3",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
       "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "peer": true
     },
-    "node_modules/normalize-range": {
-      "version": "0.1.2",
-      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
+    "node_modules/next/node_modules/jest-worker": {
+      "version": "27.0.0-next.5",
+      "integrity": "sha512-mk0umAQ5lT+CaOJ+Qp01N6kz48sJG2kr2n1rX0koqKf6FIygQV0qLOdN9SCYID4IVeSigDOcPeGLozdMLYfb5g==",
       "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/normalize-selector": {
-      "version": "0.2.0",
-      "integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=",
-      "dev": true
-    },
-    "node_modules/npm-run-path": {
-      "version": "4.0.1",
-      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+    "node_modules/next/node_modules/jest-worker/node_modules/supports-color": {
+      "version": "8.1.1",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "path-key": "^3.0.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=8"
-      }
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/next/node_modules/node-fetch": {
+      "version": "2.6.1",
+      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      }
+    },
+    "node_modules/next/node_modules/postcss": {
+      "version": "8.2.15",
+      "integrity": "sha512-2zO3b26eJD/8rb106Qu2o7Qgg52ND5HPjcyQiK2B98O388h43A448LCslC0dI2P97wCAQRJsFvwTRcXxTKds+Q==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "colorette": "^1.2.2",
+        "nanoid": "^3.1.23",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
+      }
+    },
+    "node_modules/next/node_modules/react-is": {
+      "version": "17.0.2",
+      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/next/node_modules/source-map": {
+      "version": "0.6.1",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/next/node_modules/supports-color": {
+      "version": "5.5.0",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/next/node_modules/supports-color/node_modules/has-flag": {
+      "version": "3.0.0",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/nice-try": {
+      "version": "1.0.5",
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/node-html-parser": {
+      "version": "1.4.9",
+      "integrity": "sha512-UVcirFD1Bn0O+TSmloHeHqZZCxHjvtIeGdVdGMhyZ8/PWlEiZaZ5iJzR189yKZr8p0FXN58BUeC7RHRkf/KYGw==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "he": "1.2.0"
+      }
+    },
+    "node_modules/node-int64": {
+      "version": "0.4.0",
+      "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/node-libs-browser": {
+      "version": "2.2.1",
+      "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "assert": "^1.1.1",
+        "browserify-zlib": "^0.2.0",
+        "buffer": "^4.3.0",
+        "console-browserify": "^1.1.0",
+        "constants-browserify": "^1.0.0",
+        "crypto-browserify": "^3.11.0",
+        "domain-browser": "^1.1.1",
+        "events": "^3.0.0",
+        "https-browserify": "^1.0.0",
+        "os-browserify": "^0.3.0",
+        "path-browserify": "0.0.1",
+        "process": "^0.11.10",
+        "punycode": "^1.2.4",
+        "querystring-es3": "^0.2.0",
+        "readable-stream": "^2.3.3",
+        "stream-browserify": "^2.0.1",
+        "stream-http": "^2.7.2",
+        "string_decoder": "^1.0.0",
+        "timers-browserify": "^2.0.4",
+        "tty-browserify": "0.0.0",
+        "url": "^0.11.0",
+        "util": "^0.11.0",
+        "vm-browserify": "^1.0.1"
+      }
+    },
+    "node_modules/node-libs-browser/node_modules/assert": {
+      "version": "1.5.0",
+      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "object-assign": "^4.1.1",
+        "util": "0.10.3"
+      }
+    },
+    "node_modules/node-libs-browser/node_modules/assert/node_modules/inherits": {
+      "version": "2.0.1",
+      "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/node-libs-browser/node_modules/assert/node_modules/util": {
+      "version": "0.10.3",
+      "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "inherits": "2.0.1"
+      }
+    },
+    "node_modules/node-libs-browser/node_modules/buffer": {
+      "version": "4.9.2",
+      "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4",
+        "isarray": "^1.0.0"
+      }
+    },
+    "node_modules/node-libs-browser/node_modules/domain-browser": {
+      "version": "1.2.0",
+      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=0.4",
+        "npm": ">=1.2"
+      }
+    },
+    "node_modules/node-libs-browser/node_modules/inherits": {
+      "version": "2.0.3",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/node-libs-browser/node_modules/path-browserify": {
+      "version": "0.0.1",
+      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/node-libs-browser/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/node-libs-browser/node_modules/stream-browserify": {
+      "version": "2.0.2",
+      "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "inherits": "~2.0.1",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "node_modules/node-libs-browser/node_modules/stream-http": {
+      "version": "2.8.3",
+      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "builtin-status-codes": "^3.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.3.6",
+        "to-arraybuffer": "^1.0.0",
+        "xtend": "^4.0.0"
+      }
+    },
+    "node_modules/node-libs-browser/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/node-libs-browser/node_modules/tty-browserify": {
+      "version": "0.0.0",
+      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/node-libs-browser/node_modules/util": {
+      "version": "0.11.1",
+      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "inherits": "2.0.3"
+      }
+    },
+    "node_modules/node-modules-regexp": {
+      "version": "1.0.0",
+      "integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/node-notifier": {
+      "version": "8.0.2",
+      "integrity": "sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "growly": "^1.3.0",
+        "is-wsl": "^2.2.0",
+        "semver": "^7.3.2",
+        "shellwords": "^0.1.1",
+        "uuid": "^8.3.0",
+        "which": "^2.0.2"
+      }
+    },
+    "node_modules/node-releases": {
+      "version": "1.1.77",
+      "integrity": "sha512-rB1DUFUNAN4Gn9keO2K1efO35IDK7yKHCdCaIMvFO7yUYmmZYeDjnGKle26G4rwj+LKRQpjyUUvMkPglwGCYNQ==",
+      "dev": true
+    },
+    "node_modules/normalize-package-data": {
+      "version": "2.5.0",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "dev": true,
+      "dependencies": {
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
+      }
+    },
+    "node_modules/normalize-package-data/node_modules/semver": {
+      "version": "5.7.1",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/normalize-range": {
+      "version": "0.1.2",
+      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/normalize-selector": {
+      "version": "0.2.0",
+      "integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=",
+      "dev": true
+    },
+    "node_modules/npm-run-path": {
+      "version": "4.0.1",
+      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
     },
     "node_modules/num2fraction": {
       "version": "1.2.2",
@@ -8370,8 +9194,7 @@
     },
     "node_modules/object-assign": {
       "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -8469,9 +9292,8 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.12.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
+      "version": "1.11.0",
+      "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==",
       "dev": true,
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -8479,9 +9301,9 @@
     },
     "node_modules/object-is": {
       "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
       "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3"
@@ -8495,7 +9317,6 @@
     },
     "node_modules/object-keys": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
       "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
       "dev": true,
       "engines": {
@@ -8515,14 +9336,13 @@
       }
     },
     "node_modules/object.assign": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
+      "version": "4.1.2",
+      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "has-symbols": "^1.0.3",
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3",
+        "has-symbols": "^1.0.1",
         "object-keys": "^1.1.1"
       },
       "engines": {
@@ -8533,28 +9353,26 @@
       }
     },
     "node_modules/object.entries": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz",
-      "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==",
+      "version": "1.1.5",
+      "integrity": "sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1"
       },
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/object.fromentries": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz",
-      "integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==",
+      "version": "2.0.5",
+      "integrity": "sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -8564,13 +9382,12 @@
       }
     },
     "node_modules/object.hasown": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.2.tgz",
-      "integrity": "sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==",
+      "version": "1.1.0",
+      "integrity": "sha512-MhjYRfj3GBlhSkDHo6QmvgjRLXQ2zndabdf3nX0yTyZK9rPfxb6uRpAac8HXNLy1GpqWtZ81Qh4v3uOls2sRAg==",
       "dev": true,
       "dependencies": {
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -8589,14 +9406,13 @@
       }
     },
     "node_modules/object.values": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
-      "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==",
+      "version": "1.1.5",
+      "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -8644,7 +9460,6 @@
     },
     "node_modules/optionator": {
       "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
       "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
       "dev": true,
       "dependencies": {
@@ -8659,6 +9474,12 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/os-browserify": {
+      "version": "0.3.0",
+      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
+      "dev": true,
+      "peer": true
+    },
     "node_modules/os-tmpdir": {
       "version": "1.0.2",
       "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
@@ -8690,9 +9511,9 @@
     },
     "node_modules/p-limit": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
       "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "yocto-queue": "^0.1.0"
       },
@@ -8755,17 +9576,74 @@
         "node": ">=6"
       }
     },
-    "node_modules/parent-module": {
-      "version": "1.0.1",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+    "node_modules/pako": {
+      "version": "1.0.11",
+      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
       "dev": true,
-      "dependencies": {
-        "callsites": "^3.0.0"
-      },
+      "peer": true
+    },
+    "node_modules/parallel-transform": {
+      "version": "1.2.0",
+      "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "cyclist": "^1.0.1",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.1.5"
+      }
+    },
+    "node_modules/parallel-transform/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/parallel-transform/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/parent-module": {
+      "version": "1.0.1",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "dependencies": {
+        "callsites": "^3.0.0"
+      },
       "engines": {
         "node": ">=6"
       }
     },
+    "node_modules/parse-asn1": {
+      "version": "5.1.6",
+      "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "asn1.js": "^5.2.0",
+        "browserify-aes": "^1.0.0",
+        "evp_bytestokey": "^1.0.0",
+        "pbkdf2": "^3.0.3",
+        "safe-buffer": "^5.1.1"
+      }
+    },
     "node_modules/parse-entities": {
       "version": "2.0.0",
       "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==",
@@ -8815,6 +9693,19 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/path-browserify": {
+      "version": "1.0.1",
+      "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/path-dirname": {
+      "version": "1.0.2",
+      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
     "node_modules/path-exists": {
       "version": "3.0.0",
       "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
@@ -8852,6 +9743,22 @@
         "node": ">=8"
       }
     },
+    "node_modules/pbkdf2": {
+      "version": "3.1.2",
+      "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4",
+        "ripemd160": "^2.0.1",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      },
+      "engines": {
+        "node": ">=0.12"
+      }
+    },
     "node_modules/picocolors": {
       "version": "0.2.1",
       "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
@@ -8868,6 +9775,16 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
+    "node_modules/pify": {
+      "version": "4.0.1",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/pirates": {
       "version": "4.0.1",
       "integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==",
@@ -8892,6 +9809,34 @@
         "node": ">=4"
       }
     },
+    "node_modules/pkg-dir": {
+      "version": "2.0.0",
+      "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/pkg-up": {
+      "version": "2.0.0",
+      "integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/platform": {
+      "version": "1.3.6",
+      "integrity": "sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg==",
+      "dev": true,
+      "peer": true
+    },
     "node_modules/please-upgrade-node": {
       "version": "3.2.0",
       "integrity": "sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==",
@@ -8900,6 +9845,18 @@
         "semver-compare": "^1.0.0"
       }
     },
+    "node_modules/pnp-webpack-plugin": {
+      "version": "1.6.4",
+      "integrity": "sha512-7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "ts-pnp": "^1.1.6"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/posix-character-classes": {
       "version": "0.1.1",
       "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
@@ -8910,27 +9867,21 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.14",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz",
-      "integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==",
+      "version": "8.3.9",
+      "integrity": "sha512-f/ZFyAKh9Dnqytx5X62jgjhhzttjZS7hMsohcI7HEI5tjELX/HxCy3EFhsRxyzGvrzFF+82XPvCS8T9TFleVJw==",
       "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/postcss"
-        }
-      ],
+      "peer": true,
       "dependencies": {
-        "nanoid": "^3.3.4",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.2"
+        "nanoid": "^3.1.28",
+        "picocolors": "^0.2.1",
+        "source-map-js": "^0.6.2"
       },
       "engines": {
         "node": "^10 || ^12 || >=14"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
       }
     },
     "node_modules/postcss-html": {
@@ -9192,15 +10143,8 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/postcss/node_modules/picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
-      "dev": true
-    },
     "node_modules/prelude-ls": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
       "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
       "dev": true,
       "engines": {
@@ -9221,7 +10165,6 @@
     },
     "node_modules/prettier-linter-helpers": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz",
       "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==",
       "dev": true,
       "dependencies": {
@@ -9252,6 +10195,36 @@
       "dev": true,
       "peer": true
     },
+    "node_modules/process": {
+      "version": "0.11.10",
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
+    "node_modules/process-nextick-args": {
+      "version": "2.0.1",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/progress": {
+      "version": "2.0.3",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/promise-inflight": {
+      "version": "1.0.1",
+      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
     "node_modules/prompts": {
       "version": "2.4.2",
       "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
@@ -9266,22 +10239,48 @@
       }
     },
     "node_modules/prop-types": {
-      "version": "15.8.1",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
-      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
+      "version": "15.7.2",
+      "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
       "dev": true,
       "dependencies": {
         "loose-envify": "^1.4.0",
         "object-assign": "^4.1.1",
-        "react-is": "^16.13.1"
+        "react-is": "^16.8.1"
       }
     },
+    "node_modules/prr": {
+      "version": "1.0.1",
+      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
     "node_modules/psl": {
       "version": "1.8.0",
       "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
       "dev": true,
       "peer": true
     },
+    "node_modules/public-encrypt": {
+      "version": "4.0.3",
+      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "parse-asn1": "^5.0.0",
+        "randombytes": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "node_modules/public-encrypt/node_modules/bn.js": {
+      "version": "4.12.0",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true,
+      "peer": true
+    },
     "node_modules/pump": {
       "version": "3.0.0",
       "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
@@ -9292,6 +10291,63 @@
         "once": "^1.3.1"
       }
     },
+    "node_modules/pumpify": {
+      "version": "1.5.1",
+      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "duplexify": "^3.6.0",
+        "inherits": "^2.0.3",
+        "pump": "^2.0.0"
+      }
+    },
+    "node_modules/pumpify/node_modules/pump": {
+      "version": "2.0.1",
+      "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "node_modules/punycode": {
+      "version": "1.4.1",
+      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/querystring": {
+      "version": "0.2.1",
+      "integrity": "sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg==",
+      "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=0.4.x"
+      }
+    },
+    "node_modules/querystring-es3": {
+      "version": "0.2.1",
+      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=0.4.x"
+      }
+    },
+    "node_modules/queue": {
+      "version": "6.0.2",
+      "integrity": "sha512-iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "inherits": "~2.0.3"
+      }
+    },
     "node_modules/queue-microtask": {
       "version": "1.2.3",
       "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
@@ -9319,39 +10375,141 @@
         "node": ">=8"
       }
     },
+    "node_modules/randombytes": {
+      "version": "2.1.0",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/randomfill": {
+      "version": "1.0.4",
+      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "randombytes": "^2.0.5",
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/raw-body": {
+      "version": "2.4.1",
+      "integrity": "sha512-9WmIKF6mkvA0SLmA2Knm9+qj89e+j1zqgyn8aXGd7+nAduPoqgI9lO57SAZNn/Byzo5P7JhXTyg9PzaJbH73bA==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "bytes": "3.1.0",
+        "http-errors": "1.7.3",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/raw-body/node_modules/http-errors": {
+      "version": "1.7.3",
+      "integrity": "sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.1.1",
+        "statuses": ">= 1.5.0 < 2",
+        "toidentifier": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/react": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz",
-      "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==",
+      "version": "17.0.2",
+      "integrity": "sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "loose-envify": "^1.1.0"
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/react-dom": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",
-      "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==",
+      "version": "17.0.2",
+      "integrity": "sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==",
       "dev": true,
       "peer": true,
       "dependencies": {
         "loose-envify": "^1.1.0",
-        "scheduler": "^0.23.0"
+        "object-assign": "^4.1.1",
+        "scheduler": "^0.20.2"
       },
       "peerDependencies": {
-        "react": "^18.2.0"
+        "react": "17.0.2"
       }
     },
     "node_modules/react-is": {
       "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
       "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
       "dev": true
     },
+    "node_modules/react-refresh": {
+      "version": "0.8.3",
+      "integrity": "sha512-X8jZHc7nCMjaCqoU+V2I0cOhNW+QMBwSUkeXnTi8IPe6zaRWfn60ZzvFDZqWPfmSJfjub7dDW1SP0jaHWLu/hg==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/read-pkg": {
+      "version": "3.0.0",
+      "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
+      "dev": true,
+      "dependencies": {
+        "load-json-file": "^4.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/read-pkg-up": {
+      "version": "3.0.0",
+      "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^2.0.0",
+        "read-pkg": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/read-pkg/node_modules/path-type": {
+      "version": "3.0.0",
+      "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+      "dev": true,
+      "dependencies": {
+        "pify": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/read-pkg/node_modules/pify": {
+      "version": "3.0.0",
+      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/readable-stream": {
       "version": "3.6.0",
       "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
@@ -9377,9 +10535,8 @@
       }
     },
     "node_modules/regenerator-runtime": {
-      "version": "0.13.11",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
-      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==",
+      "version": "0.13.9",
+      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
       "dev": true
     },
     "node_modules/regex-not": {
@@ -9421,14 +10578,12 @@
       }
     },
     "node_modules/regexp.prototype.flags": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
+      "version": "1.3.1",
+      "integrity": "sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "functions-have-names": "^1.2.2"
+        "define-properties": "^1.1.3"
       },
       "engines": {
         "node": ">= 0.4"
@@ -9439,7 +10594,6 @@
     },
     "node_modules/regexpp": {
       "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
       "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
       "dev": true,
       "engines": {
@@ -9463,106 +10617,12 @@
         "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/remark-mdx": {
-      "version": "1.6.22",
-      "resolved": "https://registry.npmjs.org/remark-mdx/-/remark-mdx-1.6.22.tgz",
-      "integrity": "sha512-phMHBJgeV76uyFkH4rvzCftLfKCr2RZuF+/gmVcaKrpsihyzmhXjA0BEMDaPTXG5y8qZOKPVo83NAOX01LPnOQ==",
+    "node_modules/remark-stringify": {
+      "version": "9.0.1",
+      "integrity": "sha512-mWmNg3ZtESvZS8fv5PTvaPckdL4iNlCHTt8/e/8oN08nArHRHjNZMKzA/YW3+p7/lYqIw4nx1XsjCBo/AxNChg==",
       "dev": true,
       "dependencies": {
-        "@babel/core": "7.12.9",
-        "@babel/helper-plugin-utils": "7.10.4",
-        "@babel/plugin-proposal-object-rest-spread": "7.12.1",
-        "@babel/plugin-syntax-jsx": "7.12.1",
-        "@mdx-js/util": "1.6.22",
-        "is-alphabetical": "1.0.4",
-        "remark-parse": "8.0.3",
-        "unified": "9.2.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/remark-mdx/node_modules/@babel/core": {
-      "version": "7.12.9",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.12.9.tgz",
-      "integrity": "sha512-gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/generator": "^7.12.5",
-        "@babel/helper-module-transforms": "^7.12.1",
-        "@babel/helpers": "^7.12.5",
-        "@babel/parser": "^7.12.7",
-        "@babel/template": "^7.12.7",
-        "@babel/traverse": "^7.12.9",
-        "@babel/types": "^7.12.7",
-        "convert-source-map": "^1.7.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.1",
-        "json5": "^2.1.2",
-        "lodash": "^4.17.19",
-        "resolve": "^1.3.2",
-        "semver": "^5.4.1",
-        "source-map": "^0.5.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/babel"
-      }
-    },
-    "node_modules/remark-mdx/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-      "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-      "dev": true
-    },
-    "node_modules/remark-mdx/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/remark-parse": {
-      "version": "8.0.3",
-      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-8.0.3.tgz",
-      "integrity": "sha512-E1K9+QLGgggHxCQtLt++uXltxEprmWzNfg+MxpfHsZlrddKzZ/hZyWHDbK3/Ap8HJQqYJRXP+jHczdL6q6i85Q==",
-      "dev": true,
-      "dependencies": {
-        "ccount": "^1.0.0",
-        "collapse-white-space": "^1.0.2",
-        "is-alphabetical": "^1.0.0",
-        "is-decimal": "^1.0.0",
-        "is-whitespace-character": "^1.0.0",
-        "is-word-character": "^1.0.0",
-        "markdown-escapes": "^1.0.0",
-        "parse-entities": "^2.0.0",
-        "repeat-string": "^1.5.4",
-        "state-toggle": "^1.0.0",
-        "trim": "0.0.1",
-        "trim-trailing-lines": "^1.0.0",
-        "unherit": "^1.0.4",
-        "unist-util-remove-position": "^2.0.0",
-        "vfile-location": "^3.0.0",
-        "xtend": "^4.0.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/remark-stringify": {
-      "version": "9.0.1",
-      "integrity": "sha512-mWmNg3ZtESvZS8fv5PTvaPckdL4iNlCHTt8/e/8oN08nArHRHjNZMKzA/YW3+p7/lYqIw4nx1XsjCBo/AxNChg==",
-      "dev": true,
-      "dependencies": {
-        "mdast-util-to-markdown": "^0.6.0"
+        "mdast-util-to-markdown": "^0.6.0"
       },
       "funding": {
         "type": "opencollective",
@@ -9608,6 +10668,7 @@
       "version": "2.1.1",
       "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
       "dev": true,
+      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -9718,6 +10779,16 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/ripemd160": {
+      "version": "2.0.2",
+      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
+      }
+    },
     "node_modules/rivet-graphql": {
       "version": "0.3.1",
       "integrity": "sha512-HEov02XhZ6H1jOME+mO8CZwliu/UtgZSHixYUwvQ7HSx3gk8EOVaQY5c3zscOYjZECvP8cR4+1Ob3KHWJRWEMw==",
@@ -9766,6 +10837,16 @@
         "queue-microtask": "^1.2.2"
       }
     },
+    "node_modules/run-queue": {
+      "version": "1.0.3",
+      "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "aproba": "^1.1.1"
+      }
+    },
     "node_modules/rxjs": {
       "version": "6.6.7",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
@@ -9798,20 +10879,6 @@
         "ret": "~0.1.10"
       }
     },
-    "node_modules/safe-regex-test": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
-      "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.3",
-        "is-regex": "^1.1.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/safer-buffer": {
       "version": "2.1.2",
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
@@ -10122,13 +11189,28 @@
       }
     },
     "node_modules/scheduler": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz",
-      "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==",
+      "version": "0.20.2",
+      "integrity": "sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1"
+      }
+    },
+    "node_modules/schema-utils": {
+      "version": "1.0.0",
+      "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
       "dev": true,
+      "optional": true,
       "peer": true,
       "dependencies": {
-        "loose-envify": "^1.1.0"
+        "ajv": "^6.1.0",
+        "ajv-errors": "^1.0.0",
+        "ajv-keywords": "^3.1.0"
+      },
+      "engines": {
+        "node": ">= 4"
       }
     },
     "node_modules/semver": {
@@ -10150,6 +11232,16 @@
       "integrity": "sha1-De4hahyUGrN+nvsXiPavxf9VN/w=",
       "dev": true
     },
+    "node_modules/serialize-javascript": {
+      "version": "4.0.0",
+      "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "randombytes": "^2.1.0"
+      }
+    },
     "node_modules/set-blocking": {
       "version": "2.0.0",
       "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
@@ -10171,6 +11263,31 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/setimmediate": {
+      "version": "1.0.5",
+      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/setprototypeof": {
+      "version": "1.1.1",
+      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/sha.js": {
+      "version": "2.4.11",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      },
+      "bin": {
+        "sha.js": "bin.js"
+      }
+    },
     "node_modules/shebang-command": {
       "version": "2.0.0",
       "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
@@ -10190,6 +11307,12 @@
         "node": ">=8"
       }
     },
+    "node_modules/shell-quote": {
+      "version": "1.7.2",
+      "integrity": "sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==",
+      "dev": true,
+      "peer": true
+    },
     "node_modules/shellwords": {
       "version": "0.1.1",
       "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==",
@@ -10199,7 +11322,6 @@
     },
     "node_modules/side-channel": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
       "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
       "dev": true,
       "dependencies": {
@@ -10519,6 +11641,13 @@
       "dev": true,
       "peer": true
     },
+    "node_modules/source-list-map": {
+      "version": "2.0.1",
+      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
     "node_modules/source-map": {
       "version": "0.5.7",
       "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
@@ -10528,10 +11657,10 @@
       }
     },
     "node_modules/source-map-js": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+      "version": "0.6.2",
+      "integrity": "sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==",
       "dev": true,
+      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -10650,8 +11779,17 @@
     "node_modules/sprintf-js": {
       "version": "1.0.3",
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+      "dev": true
+    },
+    "node_modules/ssri": {
+      "version": "6.0.2",
+      "integrity": "sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==",
       "dev": true,
-      "peer": true
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "figgy-pudding": "^3.5.1"
+      }
     },
     "node_modules/stack-utils": {
       "version": "2.0.5",
@@ -10674,14 +11812,25 @@
         "node": ">=8"
       }
     },
-    "node_modules/state-toggle": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.3.tgz",
-      "integrity": "sha512-d/5Z4/2iiCnHw6Xzghyhb+GcmF89bxwgXG60wjIiZaxnymbyOmI8Hk4VqHXiVVp6u2ysaskFfXg3ekCj4WNftQ==",
+    "node_modules/stacktrace-parser": {
+      "version": "0.1.10",
+      "integrity": "sha512-KJP1OCML99+8fhOHxwwzyWrlUuVX5GQ0ZpJTd1DFXhdkrvg1szxfHhawXUZ3g9TkXORQd4/WG68jMlQZ2p8wlg==",
       "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
+      "peer": true,
+      "dependencies": {
+        "type-fest": "^0.7.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/stacktrace-parser/node_modules/type-fest": {
+      "version": "0.7.1",
+      "integrity": "sha512-Ne2YiiGN8bmrmJJEuTWTLJR32nh/JdL1+PSicowtNb0WFpn59GK8/lfD61bVtzguz7b3PBt74nxpv/Pw5po5Rg==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=8"
       }
     },
     "node_modules/static-extend": {
@@ -10786,18 +11935,79 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/stop-iteration-iterator": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz",
-      "integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==",
+    "node_modules/statuses": {
+      "version": "1.5.0",
+      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
       "dev": true,
-      "dependencies": {
-        "internal-slot": "^1.0.4"
-      },
+      "peer": true,
       "engines": {
-        "node": ">= 0.4"
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/stream-browserify": {
+      "version": "3.0.0",
+      "integrity": "sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "inherits": "~2.0.4",
+        "readable-stream": "^3.5.0"
+      }
+    },
+    "node_modules/stream-each": {
+      "version": "1.2.3",
+      "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "stream-shift": "^1.0.0"
       }
     },
+    "node_modules/stream-http": {
+      "version": "3.1.1",
+      "integrity": "sha512-S7OqaYu0EkFpgeGFb/NPOoPLxFko7TPqtEeFg5DXPB4v/KETHG0Ln6fRFrNezoelpaDKmycEmmZ81cC9DAwgYg==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "builtin-status-codes": "^3.0.0",
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.6.0",
+        "xtend": "^4.0.2"
+      }
+    },
+    "node_modules/stream-parser": {
+      "version": "0.3.1",
+      "integrity": "sha1-FhhUhpRCACGhGC/wrxkRwSl2F3M=",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "debug": "2"
+      }
+    },
+    "node_modules/stream-parser/node_modules/debug": {
+      "version": "2.6.9",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/stream-parser/node_modules/ms": {
+      "version": "2.0.0",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/stream-shift": {
+      "version": "1.0.1",
+      "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
     "node_modules/string_decoder": {
       "version": "1.3.0",
       "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
@@ -10833,6 +12043,12 @@
         "node": ">=0.6.19"
       }
     },
+    "node_modules/string-hash": {
+      "version": "1.1.3",
+      "integrity": "sha1-6Kr8CsGFW0Zmkp7X3RJ1311sgRs=",
+      "dev": true,
+      "peer": true
+    },
     "node_modules/string-length": {
       "version": "4.0.2",
       "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
@@ -10865,18 +12081,17 @@
       "dev": true
     },
     "node_modules/string.prototype.matchall": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz",
-      "integrity": "sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==",
+      "version": "4.0.6",
+      "integrity": "sha512-6WgDX8HmQqvEd7J+G6VtAahhsQIssiZ8zl7zKh1VDMFyL3hRTJP4FTNA3RbIp2TOQ9AYNDcc7e3fH0Qbup+DBg==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "get-intrinsic": "^1.1.3",
-        "has-symbols": "^1.0.3",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1",
+        "get-intrinsic": "^1.1.1",
+        "has-symbols": "^1.0.2",
         "internal-slot": "^1.0.3",
-        "regexp.prototype.flags": "^1.4.3",
+        "regexp.prototype.flags": "^1.3.1",
         "side-channel": "^1.0.4"
       },
       "funding": {
@@ -10884,48 +12099,29 @@
       }
     },
     "node_modules/string.prototype.trimend": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
-      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
+      "version": "1.0.4",
+      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "define-properties": "^1.1.3"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/string.prototype.trimstart": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
-      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
+      "version": "1.0.4",
+      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "define-properties": "^1.1.3"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/stringify-entities": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-3.1.0.tgz",
-      "integrity": "sha512-3FP+jGMmMV/ffZs86MoghGqAoqXAdxLrJP4GUdrDN1aIScYih5tuIO3eF4To5AJZ79KDZ8Fpdy7QJnK8SsL1Vg==",
-      "dev": true,
-      "dependencies": {
-        "character-entities-html4": "^1.0.0",
-        "character-entities-legacy": "^1.0.0",
-        "xtend": "^4.0.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
     "node_modules/stringify-object": {
       "version": "3.3.0",
       "integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==",
@@ -10978,7 +12174,6 @@
     },
     "node_modules/strip-json-comments": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
       "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
       "dev": true,
       "engines": {
@@ -10994,62 +12189,150 @@
       "dev": true
     },
     "node_modules/styled-jsx": {
-      "version": "5.0.7",
-      "resolved": "https://registry.npmjs.org/styled-jsx/-/styled-jsx-5.0.7.tgz",
-      "integrity": "sha512-b3sUzamS086YLRuvnaDigdAewz1/EFYlHpYBP5mZovKEdQQOIIYq8lApylub3HHZ6xFjV051kkGU7cudJmrXEA==",
+      "version": "4.0.1",
+      "integrity": "sha512-Gcb49/dRB1k8B4hdK8vhW27Rlb2zujCk1fISrizCcToIs+55B4vmUM0N9Gi4nnVfFZWe55jRdWpAqH1ldAKWvQ==",
       "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@babel/plugin-syntax-jsx": "7.14.5",
+        "@babel/types": "7.15.0",
+        "convert-source-map": "1.7.0",
+        "loader-utils": "1.2.3",
+        "source-map": "0.7.3",
+        "string-hash": "1.1.3",
+        "stylis": "3.5.4",
+        "stylis-rule-sheet": "0.0.10"
+      },
       "engines": {
         "node": ">= 12.0.0"
       },
       "peerDependencies": {
-        "react": ">= 16.8.0 || 17.x.x || ^18.0.0-0"
+        "react": ">= 16.8.0 || 17.x.x || 18.x.x"
       },
       "peerDependenciesMeta": {
         "@babel/core": {
           "optional": true
-        },
-        "babel-plugin-macros": {
-          "optional": true
         }
       }
     },
-    "node_modules/stylelint": {
-      "version": "13.8.0",
-      "integrity": "sha512-iHH3dv3UI23SLDrH4zMQDjLT9/dDIz/IpoFeuNxZmEx86KtfpjDOscxLTFioQyv+2vQjPlRZnK0UoJtfxLICXQ==",
+    "node_modules/styled-jsx/node_modules/@babel/plugin-syntax-jsx": {
+      "version": "7.14.5",
+      "integrity": "sha512-ohuFIsOMXJnbOMRfX7/w7LocdR6R7whhuRD4ax8IipLcLPlZGJKkBxgHp++U4N/vKyU16/YDQr2f5seajD3jIw==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "@stylelint/postcss-css-in-js": "^0.37.2",
-        "@stylelint/postcss-markdown": "^0.36.2",
-        "autoprefixer": "^9.8.6",
-        "balanced-match": "^1.0.0",
-        "chalk": "^4.1.0",
-        "cosmiconfig": "^7.0.0",
-        "debug": "^4.2.0",
-        "execall": "^2.0.0",
-        "fast-glob": "^3.2.4",
-        "fastest-levenshtein": "^1.0.12",
-        "file-entry-cache": "^6.0.0",
-        "get-stdin": "^8.0.0",
-        "global-modules": "^2.0.0",
-        "globby": "^11.0.1",
-        "globjoin": "^0.1.4",
-        "html-tags": "^3.1.0",
-        "ignore": "^5.1.8",
-        "import-lazy": "^4.0.0",
-        "imurmurhash": "^0.1.4",
-        "known-css-properties": "^0.20.0",
-        "lodash": "^4.17.20",
-        "log-symbols": "^4.0.0",
-        "mathml-tag-names": "^2.1.3",
-        "meow": "^8.0.0",
-        "micromatch": "^4.0.2",
-        "normalize-selector": "^0.2.0",
-        "postcss": "^7.0.35",
-        "postcss-html": "^0.36.0",
-        "postcss-less": "^3.1.4",
-        "postcss-media-query-parser": "^0.2.3",
-        "postcss-resolve-nested-selector": "^0.1.1",
-        "postcss-safe-parser": "^4.0.2",
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/styled-jsx/node_modules/@babel/types": {
+      "version": "7.15.0",
+      "integrity": "sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.14.9",
+        "to-fast-properties": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/styled-jsx/node_modules/convert-source-map": {
+      "version": "1.7.0",
+      "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "safe-buffer": "~5.1.1"
+      }
+    },
+    "node_modules/styled-jsx/node_modules/emojis-list": {
+      "version": "2.1.0",
+      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/styled-jsx/node_modules/json5": {
+      "version": "1.0.1",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/styled-jsx/node_modules/loader-utils": {
+      "version": "1.2.3",
+      "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^2.0.0",
+        "json5": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/styled-jsx/node_modules/source-map": {
+      "version": "0.7.3",
+      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/stylelint": {
+      "version": "13.8.0",
+      "integrity": "sha512-iHH3dv3UI23SLDrH4zMQDjLT9/dDIz/IpoFeuNxZmEx86KtfpjDOscxLTFioQyv+2vQjPlRZnK0UoJtfxLICXQ==",
+      "dev": true,
+      "dependencies": {
+        "@stylelint/postcss-css-in-js": "^0.37.2",
+        "@stylelint/postcss-markdown": "^0.36.2",
+        "autoprefixer": "^9.8.6",
+        "balanced-match": "^1.0.0",
+        "chalk": "^4.1.0",
+        "cosmiconfig": "^7.0.0",
+        "debug": "^4.2.0",
+        "execall": "^2.0.0",
+        "fast-glob": "^3.2.4",
+        "fastest-levenshtein": "^1.0.12",
+        "file-entry-cache": "^6.0.0",
+        "get-stdin": "^8.0.0",
+        "global-modules": "^2.0.0",
+        "globby": "^11.0.1",
+        "globjoin": "^0.1.4",
+        "html-tags": "^3.1.0",
+        "ignore": "^5.1.8",
+        "import-lazy": "^4.0.0",
+        "imurmurhash": "^0.1.4",
+        "known-css-properties": "^0.20.0",
+        "lodash": "^4.17.20",
+        "log-symbols": "^4.0.0",
+        "mathml-tag-names": "^2.1.3",
+        "meow": "^8.0.0",
+        "micromatch": "^4.0.2",
+        "normalize-selector": "^0.2.0",
+        "postcss": "^7.0.35",
+        "postcss-html": "^0.36.0",
+        "postcss-less": "^3.1.4",
+        "postcss-media-query-parser": "^0.2.3",
+        "postcss-resolve-nested-selector": "^0.1.1",
+        "postcss-safe-parser": "^4.0.2",
         "postcss-sass": "^0.4.4",
         "postcss-scss": "^2.1.1",
         "postcss-selector-parser": "^6.0.4",
@@ -11244,6 +12527,14 @@
         "node": ">=10"
       }
     },
+    "node_modules/stylelint/node_modules/ignore": {
+      "version": "5.1.8",
+      "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
     "node_modules/stylelint/node_modules/import-lazy": {
       "version": "4.0.0",
       "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==",
@@ -11489,6 +12780,21 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/stylis": {
+      "version": "3.5.4",
+      "integrity": "sha512-8/3pSmthWM7lsPBKv7NXkzn2Uc9W7NotcwGNpJaa3k7WMM1XDCA4MgT5k/8BIexd5ydZdboXtU90XH9Ec4Bv/Q==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/stylis-rule-sheet": {
+      "version": "0.0.10",
+      "integrity": "sha512-nTbZoaqoBnmK+ptANthb10ZRZOGC+EmTLLUxeYIuHNkEKcmKgXX1XWKkUBT2Ac4es3NybooPe0SmvKdhKJZAuw==",
+      "dev": true,
+      "peer": true,
+      "peerDependencies": {
+        "stylis": "^3.5.0"
+      }
+    },
     "node_modules/sugarss": {
       "version": "2.0.0",
       "integrity": "sha512-WfxjozUk0UVA4jm+U1d736AUpzSrNsQcIbyOkoE364GrtWmIrFdk5lksEupgWMD4VaT/0kVx1dobpiDumSgmJQ==",
@@ -11545,18 +12851,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/supports-preserve-symlinks-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/svg-tags": {
       "version": "1.0.0",
       "integrity": "sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=",
@@ -11568,22 +12862,6 @@
       "dev": true,
       "peer": true
     },
-    "node_modules/synckit": {
-      "version": "0.8.4",
-      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.8.4.tgz",
-      "integrity": "sha512-Dn2ZkzMdSX827QbowGbU/4yjWuvNaCoScLLoMo/yKbu+P4GBR6cRGKZH27k6a9bRzdqcyd1DE96pQtQ6uNkmyw==",
-      "dev": true,
-      "dependencies": {
-        "@pkgr/utils": "^2.3.1",
-        "tslib": "^2.4.0"
-      },
-      "engines": {
-        "node": "^14.18.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/unts"
-      }
-    },
     "node_modules/table": {
       "version": "6.7.2",
       "integrity": "sha512-UFZK67uvyNivLeQbVtkiUs8Uuuxv24aSL4/Vil2PJVtMgU8Lx0CYkP12uCGa3kjyQzOSgV1+z9Wkb82fCGsO0g==",
@@ -11636,15 +12914,6 @@
         "url": "https://github.com/chalk/slice-ansi?sponsor=1"
       }
     },
-    "node_modules/tapable": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
-      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/terminal-link": {
       "version": "2.1.1",
       "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
@@ -11661,150 +12930,381 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/test-exclude": {
-      "version": "6.0.0",
-      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+    "node_modules/terser": {
+      "version": "4.8.0",
+      "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==",
       "dev": true,
+      "optional": true,
       "peer": true,
       "dependencies": {
-        "@istanbuljs/schema": "^0.1.2",
-        "glob": "^7.1.4",
-        "minimatch": "^3.0.4"
+        "commander": "^2.20.0",
+        "source-map": "~0.6.1",
+        "source-map-support": "~0.5.12"
+      },
+      "bin": {
+        "terser": "bin/terser"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
-      "dev": true
-    },
-    "node_modules/throat": {
-      "version": "5.0.0",
-      "integrity": "sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==",
-      "dev": true,
-      "peer": true
-    },
-    "node_modules/through": {
-      "version": "2.3.8",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
-      "dev": true
-    },
-    "node_modules/tiny-glob": {
-      "version": "0.2.9",
-      "resolved": "https://registry.npmjs.org/tiny-glob/-/tiny-glob-0.2.9.tgz",
-      "integrity": "sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg==",
+    "node_modules/terser-webpack-plugin": {
+      "version": "1.4.5",
+      "integrity": "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "globalyzer": "0.1.0",
-        "globrex": "^0.1.2"
+        "cacache": "^12.0.2",
+        "find-cache-dir": "^2.1.0",
+        "is-wsl": "^1.1.0",
+        "schema-utils": "^1.0.0",
+        "serialize-javascript": "^4.0.0",
+        "source-map": "^0.6.1",
+        "terser": "^4.1.2",
+        "webpack-sources": "^1.4.0",
+        "worker-farm": "^1.7.0"
+      },
+      "engines": {
+        "node": ">= 6.9.0"
+      },
+      "peerDependencies": {
+        "webpack": "^4.0.0"
       }
     },
-    "node_modules/tlds": {
-      "version": "1.224.0",
-      "integrity": "sha512-Jgdc8SEijbDFUsmCn6Wk/f7E6jBLFZOG3U1xK0amGSfEH55Xx97ItUS/d2NngsuApjn11UeWCWj8Um3VRhseZQ==",
+    "node_modules/terser-webpack-plugin/node_modules/find-cache-dir": {
+      "version": "2.1.0",
+      "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
       "dev": true,
-      "bin": {
-        "tlds": "bin.js"
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "commondir": "^1.0.1",
+        "make-dir": "^2.0.0",
+        "pkg-dir": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
       }
     },
-    "node_modules/tmp": {
-      "version": "0.0.33",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+    "node_modules/terser-webpack-plugin/node_modules/find-up": {
+      "version": "3.0.0",
+      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "os-tmpdir": "~1.0.2"
+        "locate-path": "^3.0.0"
       },
       "engines": {
-        "node": ">=0.6.0"
+        "node": ">=6"
       }
     },
-    "node_modules/tmpl": {
-      "version": "1.0.5",
-      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
-      "dev": true,
-      "peer": true
-    },
-    "node_modules/to-fast-properties": {
-      "version": "2.0.0",
-      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+    "node_modules/terser-webpack-plugin/node_modules/is-wsl": {
+      "version": "1.1.0",
+      "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">=4"
       }
     },
-    "node_modules/to-object-path": {
-      "version": "0.3.0",
-      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+    "node_modules/terser-webpack-plugin/node_modules/locate-path": {
+      "version": "3.0.0",
+      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
       "dev": true,
+      "optional": true,
       "peer": true,
       "dependencies": {
-        "kind-of": "^3.0.2"
+        "p-locate": "^3.0.0",
+        "path-exists": "^3.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6"
       }
     },
-    "node_modules/to-object-path/node_modules/is-buffer": {
-      "version": "1.1.6",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true,
-      "peer": true
-    },
-    "node_modules/to-object-path/node_modules/kind-of": {
-      "version": "3.2.2",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+    "node_modules/terser-webpack-plugin/node_modules/make-dir": {
+      "version": "2.1.0",
+      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
       "dev": true,
+      "optional": true,
       "peer": true,
       "dependencies": {
-        "is-buffer": "^1.1.5"
+        "pify": "^4.0.1",
+        "semver": "^5.6.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6"
       }
     },
-    "node_modules/to-regex": {
-      "version": "3.0.2",
-      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+    "node_modules/terser-webpack-plugin/node_modules/p-limit": {
+      "version": "2.3.0",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
       "dev": true,
+      "optional": true,
       "peer": true,
       "dependencies": {
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "regex-not": "^1.0.2",
-        "safe-regex": "^1.1.0"
+        "p-try": "^2.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+    "node_modules/terser-webpack-plugin/node_modules/p-locate": {
+      "version": "3.0.0",
+      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "is-number": "^7.0.0"
+        "p-limit": "^2.0.0"
       },
       "engines": {
-        "node": ">=8.0"
+        "node": ">=6"
       }
     },
-    "node_modules/to-regex/node_modules/extend-shallow": {
-      "version": "3.0.2",
-      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+    "node_modules/terser-webpack-plugin/node_modules/pkg-dir": {
+      "version": "3.0.0",
+      "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
       "dev": true,
+      "optional": true,
       "peer": true,
       "dependencies": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
+        "find-up": "^3.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6"
       }
     },
-    "node_modules/to-regex/node_modules/is-extendable": {
+    "node_modules/terser-webpack-plugin/node_modules/semver": {
+      "version": "5.7.1",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/source-map": {
+      "version": "0.6.1",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/terser/node_modules/commander": {
+      "version": "2.20.3",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/terser/node_modules/source-map": {
+      "version": "0.6.1",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/test-exclude": {
+      "version": "6.0.0",
+      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@istanbuljs/schema": "^0.1.2",
+        "glob": "^7.1.4",
+        "minimatch": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/text-table": {
+      "version": "0.2.0",
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+      "dev": true
+    },
+    "node_modules/throat": {
+      "version": "5.0.0",
+      "integrity": "sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/through": {
+      "version": "2.3.8",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+      "dev": true
+    },
+    "node_modules/through2": {
+      "version": "2.0.5",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "node_modules/through2/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/through2/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/timers-browserify": {
+      "version": "2.0.12",
+      "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "setimmediate": "^1.0.4"
+      },
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
+    "node_modules/tlds": {
+      "version": "1.224.0",
+      "integrity": "sha512-Jgdc8SEijbDFUsmCn6Wk/f7E6jBLFZOG3U1xK0amGSfEH55Xx97ItUS/d2NngsuApjn11UeWCWj8Um3VRhseZQ==",
+      "dev": true,
+      "bin": {
+        "tlds": "bin.js"
+      }
+    },
+    "node_modules/tmp": {
+      "version": "0.0.33",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "dev": true,
+      "dependencies": {
+        "os-tmpdir": "~1.0.2"
+      },
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
+    "node_modules/tmpl": {
+      "version": "1.0.5",
+      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/to-arraybuffer": {
+      "version": "1.0.1",
+      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/to-fast-properties": {
+      "version": "2.0.0",
+      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/to-object-path": {
+      "version": "0.3.0",
+      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/to-object-path/node_modules/is-buffer": {
+      "version": "1.1.6",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/to-object-path/node_modules/kind-of": {
+      "version": "3.2.2",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/to-regex": {
+      "version": "3.0.2",
+      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "regex-not": "^1.0.2",
+        "safe-regex": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/to-regex/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/to-regex/node_modules/is-extendable": {
       "version": "1.0.1",
       "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
       "dev": true,
@@ -11816,6 +13316,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/toidentifier": {
+      "version": "1.0.0",
+      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
     "node_modules/tough-cookie": {
       "version": "4.0.0",
       "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
@@ -11869,22 +13378,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/trim": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz",
-      "integrity": "sha512-YzQV+TZg4AxpKxaTHK3c3D+kRDCGVEE7LemdlQZoQXn0iennk10RsIoY6ikzAqJTc9Xjl9C1/waHom/J86ziAQ==",
-      "dev": true
-    },
-    "node_modules/trim-trailing-lines": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.4.tgz",
-      "integrity": "sha512-rjUWSqnfTNrjbB9NQWfPMH/xRK1deHeGsHoVfpxJ++XeYXE0d6B1En37AHfw3jtfTU7dzMzZL2jjpe8Qb5gLIQ==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
     "node_modules/trough": {
       "version": "1.0.5",
       "integrity": "sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==",
@@ -11932,22 +13425,34 @@
         "node": ">=10"
       }
     },
+    "node_modules/ts-pnp": {
+      "version": "1.2.0",
+      "integrity": "sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=6"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/tsconfig-paths": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
-      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
+      "version": "3.11.0",
+      "integrity": "sha512-7ecdYDnIdmv639mmDwslG6KQg1Z9STTz1j7Gcz0xa+nshh/gKDAHcPxRbWOsA3SPp0tXP2leTcY9Kw+NAkfZzA==",
       "dev": true,
       "dependencies": {
         "@types/json5": "^0.0.29",
         "json5": "^1.0.1",
-        "minimist": "^1.2.6",
+        "minimist": "^1.2.0",
         "strip-bom": "^3.0.0"
       }
     },
     "node_modules/tsconfig-paths/node_modules/json5": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
-      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+      "version": "1.0.1",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
       "dev": true,
       "dependencies": {
         "minimist": "^1.2.0"
@@ -11958,22 +13463,14 @@
     },
     "node_modules/tsconfig-paths/node_modules/strip-bom": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
       "dev": true,
       "engines": {
         "node": ">=4"
       }
     },
-    "node_modules/tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
-      "dev": true
-    },
     "node_modules/tsutils": {
       "version": "3.21.0",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
       "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
       "dev": true,
       "dependencies": {
@@ -11988,13 +13485,17 @@
     },
     "node_modules/tsutils/node_modules/tslib": {
       "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
       "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
       "dev": true
     },
+    "node_modules/tty-browserify": {
+      "version": "0.0.1",
+      "integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==",
+      "dev": true,
+      "peer": true
+    },
     "node_modules/type-check": {
       "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
       "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
       "dev": true,
       "dependencies": {
@@ -12024,19 +13525,12 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/typed-array-length": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
-      "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==",
+    "node_modules/typedarray": {
+      "version": "0.0.6",
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
       "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "for-each": "^0.3.3",
-        "is-typed-array": "^1.1.9"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+      "optional": true,
+      "peer": true
     },
     "node_modules/typedarray-to-buffer": {
       "version": "3.1.5",
@@ -12060,37 +13554,22 @@
       }
     },
     "node_modules/unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+      "version": "1.0.1",
+      "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
+        "function-bind": "^1.1.1",
+        "has-bigints": "^1.0.1",
+        "has-symbols": "^1.0.2",
         "which-boxed-primitive": "^1.0.2"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/unherit": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/unherit/-/unherit-1.1.3.tgz",
-      "integrity": "sha512-Ft16BJcnapDKp0+J/rqFC3Rrk6Y/Ng4nzsC028k2jdDII/rdZ7Wd3pPT/6+vIIxRagwRc9K0IUX0Ra4fKvw+WQ==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.0",
-        "xtend": "^4.0.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/unified": {
-      "version": "9.2.0",
-      "integrity": "sha512-vx2Z0vY+a3YoTj8+pttM3tiJHCwY5UFbYdiWrwBEbHmK8pvsPj2rtAX2BFfgXen8T39CJWblWRDT4L5WGXtDdg==",
+    "node_modules/unified": {
+      "version": "9.2.0",
+      "integrity": "sha512-vx2Z0vY+a3YoTj8+pttM3tiJHCwY5UFbYdiWrwBEbHmK8pvsPj2rtAX2BFfgXen8T39CJWblWRDT4L5WGXtDdg==",
       "dev": true,
       "dependencies": {
         "bail": "^1.0.0",
@@ -12105,116 +13584,6 @@
         "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/unified-lint-rule": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/unified-lint-rule/-/unified-lint-rule-2.1.1.tgz",
-      "integrity": "sha512-vsLHyLZFstqtGse2gvrGwasOmH8M2y+r2kQMoDSWzSqUkQx2MjHjvZuGSv5FUaiv4RQO1bHRajy7lSGp7XWq5A==",
-      "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.0",
-        "trough": "^2.0.0",
-        "unified": "^10.0.0",
-        "vfile": "^5.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/unified-lint-rule/node_modules/bail": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/bail/-/bail-2.0.2.tgz",
-      "integrity": "sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/unified-lint-rule/node_modules/is-plain-obj": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz",
-      "integrity": "sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/unified-lint-rule/node_modules/trough": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/trough/-/trough-2.1.0.tgz",
-      "integrity": "sha512-AqTiAOLcj85xS7vQ8QkAV41hPDIJ71XJB4RCUrzo/1GM2CQwhkJGaf9Hgr7BOugMRpgGUrqRg/DrBDl4H40+8g==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/unified-lint-rule/node_modules/unified": {
-      "version": "10.1.2",
-      "resolved": "https://registry.npmjs.org/unified/-/unified-10.1.2.tgz",
-      "integrity": "sha512-pUSWAi/RAnVy1Pif2kAoeWNBa3JVrx0MId2LASj8G+7AiHWoKZNTomq6LG326T68U7/e263X6fTdcXIy7XnF7Q==",
-      "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.0",
-        "bail": "^2.0.0",
-        "extend": "^3.0.0",
-        "is-buffer": "^2.0.0",
-        "is-plain-obj": "^4.0.0",
-        "trough": "^2.0.0",
-        "vfile": "^5.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/unified-lint-rule/node_modules/unist-util-stringify-position": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.3.tgz",
-      "integrity": "sha512-k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg==",
-      "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/unified-lint-rule/node_modules/vfile": {
-      "version": "5.3.7",
-      "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.7.tgz",
-      "integrity": "sha512-r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g==",
-      "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.0",
-        "is-buffer": "^2.0.0",
-        "unist-util-stringify-position": "^3.0.0",
-        "vfile-message": "^3.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/unified-lint-rule/node_modules/vfile-message": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.4.tgz",
-      "integrity": "sha512-fa0Z6P8HUrQN4BZaX05SIVXic+7kE3b05PWAtPuYP9QLHsLKYR7/AlLW3NtOrpXRLeawpDLMsVkmk5DG0NXgWw==",
-      "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.0",
-        "unist-util-stringify-position": "^3.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
     "node_modules/unified/node_modules/is-plain-obj": {
       "version": "2.1.0",
       "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
@@ -12238,64 +13607,42 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/unist-util-find-all-after": {
-      "version": "3.0.2",
-      "integrity": "sha512-xaTC/AGZ0rIM2gM28YVRAFPIZpzbpDtU3dRmp7EXlNVA8ziQc4hY3H7BHXM1J49nEmiqc3svnqMReW+PGqbZKQ==",
+    "node_modules/unique-filename": {
+      "version": "1.1.1",
+      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "unist-util-is": "^4.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/unist-util-is": {
-      "version": "4.1.0",
-      "integrity": "sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==",
-      "dev": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+        "unique-slug": "^2.0.0"
       }
     },
-    "node_modules/unist-util-remove-position": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-2.0.1.tgz",
-      "integrity": "sha512-fDZsLYIe2uT+oGFnuZmy73K6ZxOPG/Qcm+w7jbEjaFcJgbQ6cqjs/eSPzXhsmGpAsWPkqZM9pYjww5QTn3LHMA==",
+    "node_modules/unique-slug": {
+      "version": "2.0.2",
+      "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "unist-util-visit": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+        "imurmurhash": "^0.1.4"
       }
     },
-    "node_modules/unist-util-remove-position/node_modules/unist-util-visit": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.3.tgz",
-      "integrity": "sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==",
+    "node_modules/unist-util-find-all-after": {
+      "version": "3.0.2",
+      "integrity": "sha512-xaTC/AGZ0rIM2gM28YVRAFPIZpzbpDtU3dRmp7EXlNVA8ziQc4hY3H7BHXM1J49nEmiqc3svnqMReW+PGqbZKQ==",
       "dev": true,
       "dependencies": {
-        "@types/unist": "^2.0.0",
-        "unist-util-is": "^4.0.0",
-        "unist-util-visit-parents": "^3.0.0"
+        "unist-util-is": "^4.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/unist-util-remove-position/node_modules/unist-util-visit-parents": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz",
-      "integrity": "sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==",
+    "node_modules/unist-util-is": {
+      "version": "4.1.0",
+      "integrity": "sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==",
       "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.0",
-        "unist-util-is": "^4.0.0"
-      },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/unified"
@@ -12313,55 +13660,6 @@
         "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/unist-util-visit": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-4.1.2.tgz",
-      "integrity": "sha512-MSd8OUGISqHdVvfY9TPhyK2VdUrPgxkUtWSuMHF6XAAFuL4LokseigBnZtPnJMu+FbynTkFNnFlyjxpVKujMRg==",
-      "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.0",
-        "unist-util-is": "^5.0.0",
-        "unist-util-visit-parents": "^5.1.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/unist-util-visit-parents": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-5.1.3.tgz",
-      "integrity": "sha512-x6+y8g7wWMyQhL1iZfhIPhDAs7Xwbn9nRosDXl7qoPTSCy0yNxnKc+hWokFifWQIDGi154rdUqKvbCa4+1kLhg==",
-      "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.0",
-        "unist-util-is": "^5.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/unist-util-visit-parents/node_modules/unist-util-is": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-5.2.0.tgz",
-      "integrity": "sha512-Glt17jWwZeyqrFqOK0pF1Ded5U3yzJnFr8CG1GMjCWTp9zDo2p+cmD6pWbZU8AgM5WU3IzRv6+rBwhzsGh6hBQ==",
-      "dev": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/unist-util-visit/node_modules/unist-util-is": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-5.2.0.tgz",
-      "integrity": "sha512-Glt17jWwZeyqrFqOK0pF1Ded5U3yzJnFr8CG1GMjCWTp9zDo2p+cmD6pWbZU8AgM5WU3IzRv6+rBwhzsGh6hBQ==",
-      "dev": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
     "node_modules/universalify": {
       "version": "1.0.0",
       "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==",
@@ -12370,6 +13668,15 @@
         "node": ">= 10.0.0"
       }
     },
+    "node_modules/unpipe": {
+      "version": "1.0.0",
+      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/unset-value": {
       "version": "1.0.0",
       "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
@@ -12418,6 +13725,17 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/upath": {
+      "version": "1.2.0",
+      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=4",
+        "yarn": "*"
+      }
+    },
     "node_modules/uri-js": {
       "version": "4.4.1",
       "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
@@ -12441,6 +13759,16 @@
       "dev": true,
       "peer": true
     },
+    "node_modules/url": {
+      "version": "0.11.0",
+      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "punycode": "1.3.2",
+        "querystring": "0.2.0"
+      }
+    },
     "node_modules/url-regex": {
       "version": "5.0.0",
       "integrity": "sha512-O08GjTiAFNsSlrUWfqF1jH0H1W3m35ZyadHrGv5krdnmPPoxP27oDTqux/579PtaroiSGm5yma6KT1mHFH6Y/g==",
@@ -12453,6 +13781,22 @@
         "node": ">=8"
       }
     },
+    "node_modules/url/node_modules/punycode": {
+      "version": "1.3.2",
+      "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/url/node_modules/querystring": {
+      "version": "0.2.0",
+      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
+      "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=0.4.x"
+      }
+    },
     "node_modules/use": {
       "version": "3.1.1",
       "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
@@ -12462,13 +13806,30 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/use-sync-external-store": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz",
-      "integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==",
+    "node_modules/use-subscription": {
+      "version": "1.5.1",
+      "integrity": "sha512-Xv2a1P/yReAjAbhylMfFplFKj9GssgTwN7RlcTxBujFQcloStWNDQdc4g4NRWH9xS4i/FDk04vQBptAXoF3VcA==",
       "dev": true,
+      "peer": true,
+      "dependencies": {
+        "object-assign": "^4.1.1"
+      },
       "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+        "react": "^16.8.0 || ^17.0.0"
+      }
+    },
+    "node_modules/util": {
+      "version": "0.12.4",
+      "integrity": "sha512-bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "is-arguments": "^1.0.4",
+        "is-generator-function": "^1.0.7",
+        "is-typed-array": "^1.1.3",
+        "safe-buffer": "^5.1.2",
+        "which-typed-array": "^1.1.2"
       }
     },
     "node_modules/util-deprecate": {
@@ -12538,423 +13899,702 @@
         "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/vfile-location": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-3.2.0.tgz",
-      "integrity": "sha512-aLEIZKv/oxuCDZ8lkJGhuhztf/BW4M+iHdCwglA/eWc+vtuRFJj8EtgceYFX4LRjOhCAAiNHsKGssC6onJ+jbA==",
+    "node_modules/vfile-message": {
+      "version": "2.0.4",
+      "integrity": "sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==",
       "dev": true,
+      "dependencies": {
+        "@types/unist": "^2.0.0",
+        "unist-util-stringify-position": "^2.0.0"
+      },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/vfile-matter": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/vfile-matter/-/vfile-matter-4.0.1.tgz",
-      "integrity": "sha512-ZeACdaxCOxhePpoLO4A5y/VgI9EuWBXu+sUk65aQ7lXBZDFg7X0tuOzigLJUtsQzazFt6K2m9SdlDxZdfL5vVg==",
+    "node_modules/vm-browserify": {
+      "version": "1.1.2",
+      "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/w3c-hr-time": {
+      "version": "1.0.2",
+      "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "is-buffer": "^2.0.0",
-        "vfile": "^5.0.0",
-        "yaml": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+        "browser-process-hrtime": "^1.0.0"
       }
     },
-    "node_modules/vfile-matter/node_modules/unist-util-stringify-position": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.3.tgz",
-      "integrity": "sha512-k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg==",
+    "node_modules/w3c-xmlserializer": {
+      "version": "2.0.0",
+      "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "@types/unist": "^2.0.0"
+        "xml-name-validator": "^3.0.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+      "engines": {
+        "node": ">=10"
       }
     },
-    "node_modules/vfile-matter/node_modules/vfile": {
-      "version": "5.3.7",
-      "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.7.tgz",
-      "integrity": "sha512-r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g==",
+    "node_modules/walker": {
+      "version": "1.0.7",
+      "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "@types/unist": "^2.0.0",
-        "is-buffer": "^2.0.0",
-        "unist-util-stringify-position": "^3.0.0",
-        "vfile-message": "^3.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+        "makeerror": "1.0.x"
       }
     },
-    "node_modules/vfile-matter/node_modules/vfile-message": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.4.tgz",
-      "integrity": "sha512-fa0Z6P8HUrQN4BZaX05SIVXic+7kE3b05PWAtPuYP9QLHsLKYR7/AlLW3NtOrpXRLeawpDLMsVkmk5DG0NXgWw==",
+    "node_modules/watchpack": {
+      "version": "2.1.1",
+      "integrity": "sha512-Oo7LXCmc1eE1AjyuSBmtC3+Wy4HcV8PxWh2kP6fOl8yTlNS7r0K9l1ao2lrrUza7V39Y3D/BbJgY8VeSlc5JKw==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "@types/unist": "^2.0.0",
-        "unist-util-stringify-position": "^3.0.0"
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.1.2"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+      "engines": {
+        "node": ">=10.13.0"
       }
     },
-    "node_modules/vfile-matter/node_modules/yaml": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.2.1.tgz",
-      "integrity": "sha512-e0WHiYql7+9wr4cWMx3TVQrNwejKaEe7/rHNmQmqRjazfOP5W8PB6Jpebb5o6fIapbz9o9+2ipcaTM2ZwDI6lw==",
+    "node_modules/watchpack-chokidar2": {
+      "version": "2.0.1",
+      "integrity": "sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==",
       "dev": true,
-      "engines": {
-        "node": ">= 14"
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "chokidar": "^2.1.8"
       }
     },
-    "node_modules/vfile-message": {
-      "version": "2.0.4",
-      "integrity": "sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==",
+    "node_modules/watchpack-chokidar2/node_modules/anymatch": {
+      "version": "2.0.0",
+      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "@types/unist": "^2.0.0",
-        "unist-util-stringify-position": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+        "micromatch": "^3.1.4",
+        "normalize-path": "^2.1.1"
       }
     },
-    "node_modules/vfile-reporter": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/vfile-reporter/-/vfile-reporter-7.0.5.tgz",
-      "integrity": "sha512-NdWWXkv6gcd7AZMvDomlQbK3MqFWL1RlGzMn++/O2TI+68+nqxCPTvLugdOtfSzXmjh+xUyhp07HhlrbJjT+mw==",
+    "node_modules/watchpack-chokidar2/node_modules/anymatch/node_modules/normalize-path": {
+      "version": "2.1.1",
+      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "@types/supports-color": "^8.0.0",
-        "string-width": "^5.0.0",
-        "supports-color": "^9.0.0",
-        "unist-util-stringify-position": "^3.0.0",
-        "vfile": "^5.0.0",
-        "vfile-message": "^3.0.0",
-        "vfile-sort": "^3.0.0",
-        "vfile-statistics": "^2.0.0"
+        "remove-trailing-separator": "^1.0.1"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/vfile-reporter-json": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/vfile-reporter-json/-/vfile-reporter-json-3.3.0.tgz",
-      "integrity": "sha512-/zgRtjxQ2UGJn+HViiZ7+nIXtUzkkXFQum3BmaS/bSyr10P0X41ETRqqwMJ95RtbKUah3m7pKb6oS1eZeXXHzQ==",
+    "node_modules/watchpack-chokidar2/node_modules/binary-extensions": {
+      "version": "1.13.1",
+      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
       "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/watchpack-chokidar2/node_modules/braces": {
+      "version": "2.3.2",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "vfile": "^5.0.0",
-        "vfile-message": "^3.0.0"
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/vfile-reporter-json/node_modules/unist-util-stringify-position": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.3.tgz",
-      "integrity": "sha512-k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg==",
+    "node_modules/watchpack-chokidar2/node_modules/chokidar": {
+      "version": "2.1.8",
+      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+      "deprecated": "Chokidar 2 will break on node v14+. Upgrade to chokidar 3 with 15x less dependencies.",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "@types/unist": "^2.0.0"
+        "anymatch": "^2.0.0",
+        "async-each": "^1.0.1",
+        "braces": "^2.3.2",
+        "glob-parent": "^3.1.0",
+        "inherits": "^2.0.3",
+        "is-binary-path": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "normalize-path": "^3.0.0",
+        "path-is-absolute": "^1.0.0",
+        "readdirp": "^2.2.1",
+        "upath": "^1.1.1"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+      "optionalDependencies": {
+        "fsevents": "^1.2.7"
       }
     },
-    "node_modules/vfile-reporter-json/node_modules/vfile": {
-      "version": "5.3.7",
-      "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.7.tgz",
-      "integrity": "sha512-r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g==",
+    "node_modules/watchpack-chokidar2/node_modules/fill-range": {
+      "version": "4.0.0",
+      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "@types/unist": "^2.0.0",
-        "is-buffer": "^2.0.0",
-        "unist-util-stringify-position": "^3.0.0",
-        "vfile-message": "^3.0.0"
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/vfile-reporter-json/node_modules/vfile-message": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.4.tgz",
-      "integrity": "sha512-fa0Z6P8HUrQN4BZaX05SIVXic+7kE3b05PWAtPuYP9QLHsLKYR7/AlLW3NtOrpXRLeawpDLMsVkmk5DG0NXgWw==",
+    "node_modules/watchpack-chokidar2/node_modules/fsevents": {
+      "version": "1.2.13",
+      "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+      "deprecated": "fsevents 1 will break on node v14+ and could be using insecure binaries. Upgrade to fsevents 2.",
       "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "peer": true,
       "dependencies": {
-        "@types/unist": "^2.0.0",
-        "unist-util-stringify-position": "^3.0.0"
+        "bindings": "^1.5.0",
+        "nan": "^2.12.1"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+      "engines": {
+        "node": ">= 4.0"
       }
     },
-    "node_modules/vfile-reporter/node_modules/ansi-regex": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+    "node_modules/watchpack-chokidar2/node_modules/glob-parent": {
+      "version": "3.1.0",
+      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
       "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "is-glob": "^3.1.0",
+        "path-dirname": "^1.0.0"
+      }
+    },
+    "node_modules/watchpack-chokidar2/node_modules/glob-parent/node_modules/is-glob": {
+      "version": "3.1.0",
+      "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "is-extglob": "^2.1.0"
+      },
       "engines": {
-        "node": ">=12"
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/watchpack-chokidar2/node_modules/is-binary-path": {
+      "version": "1.0.1",
+      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "binary-extensions": "^1.0.0"
       },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/vfile-reporter/node_modules/string-width": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
-      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+    "node_modules/watchpack-chokidar2/node_modules/is-buffer": {
+      "version": "1.1.6",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
       "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/watchpack-chokidar2/node_modules/is-extendable": {
+      "version": "1.0.1",
+      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "eastasianwidth": "^0.2.0",
-        "emoji-regex": "^9.2.2",
-        "strip-ansi": "^7.0.1"
+        "is-plain-object": "^2.0.4"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/watchpack-chokidar2/node_modules/is-number": {
+      "version": "3.0.0",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/vfile-reporter/node_modules/strip-ansi": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
-      "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
+    "node_modules/watchpack-chokidar2/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "ansi-regex": "^6.0.1"
+        "is-buffer": "^1.1.5"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/watchpack-chokidar2/node_modules/micromatch": {
+      "version": "3.1.10",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
       },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/vfile-reporter/node_modules/supports-color": {
-      "version": "9.3.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-9.3.1.tgz",
-      "integrity": "sha512-knBY82pjmnIzK3NifMo3RxEIRD9E0kIzV4BKcyTZ9+9kWgLMxd4PrsTSMoFQUabgRBbF8KOLRDCyKgNV+iK44Q==",
+    "node_modules/watchpack-chokidar2/node_modules/micromatch/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
       "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
       "engines": {
-        "node": ">=12"
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/watchpack-chokidar2/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/watchpack-chokidar2/node_modules/readdirp": {
+      "version": "2.2.1",
+      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.11",
+        "micromatch": "^3.1.10",
+        "readable-stream": "^2.0.2"
       },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      "engines": {
+        "node": ">=0.10"
       }
     },
-    "node_modules/vfile-reporter/node_modules/unist-util-stringify-position": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.3.tgz",
-      "integrity": "sha512-k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg==",
+    "node_modules/watchpack-chokidar2/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "@types/unist": "^2.0.0"
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/watchpack-chokidar2/node_modules/to-regex-range": {
+      "version": "2.1.1",
+      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webidl-conversions": {
+      "version": "6.1.0",
+      "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=10.4"
       }
     },
-    "node_modules/vfile-reporter/node_modules/vfile": {
-      "version": "5.3.7",
-      "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.7.tgz",
-      "integrity": "sha512-r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g==",
+    "node_modules/webpack": {
+      "version": "4.46.0",
+      "integrity": "sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "@types/unist": "^2.0.0",
-        "is-buffer": "^2.0.0",
-        "unist-util-stringify-position": "^3.0.0",
-        "vfile-message": "^3.0.0"
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-module-context": "1.9.0",
+        "@webassemblyjs/wasm-edit": "1.9.0",
+        "@webassemblyjs/wasm-parser": "1.9.0",
+        "acorn": "^6.4.1",
+        "ajv": "^6.10.2",
+        "ajv-keywords": "^3.4.1",
+        "chrome-trace-event": "^1.0.2",
+        "enhanced-resolve": "^4.5.0",
+        "eslint-scope": "^4.0.3",
+        "json-parse-better-errors": "^1.0.2",
+        "loader-runner": "^2.4.0",
+        "loader-utils": "^1.2.3",
+        "memory-fs": "^0.4.1",
+        "micromatch": "^3.1.10",
+        "mkdirp": "^0.5.3",
+        "neo-async": "^2.6.1",
+        "node-libs-browser": "^2.2.1",
+        "schema-utils": "^1.0.0",
+        "tapable": "^1.1.3",
+        "terser-webpack-plugin": "^1.4.3",
+        "watchpack": "^1.7.4",
+        "webpack-sources": "^1.4.1"
+      },
+      "bin": {
+        "webpack": "bin/webpack.js"
+      },
+      "engines": {
+        "node": ">=6.11.5"
       },
       "funding": {
         "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependenciesMeta": {
+        "webpack-cli": {
+          "optional": true
+        },
+        "webpack-command": {
+          "optional": true
+        }
       }
     },
-    "node_modules/vfile-reporter/node_modules/vfile-message": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.4.tgz",
-      "integrity": "sha512-fa0Z6P8HUrQN4BZaX05SIVXic+7kE3b05PWAtPuYP9QLHsLKYR7/AlLW3NtOrpXRLeawpDLMsVkmk5DG0NXgWw==",
+    "node_modules/webpack-sources": {
+      "version": "1.4.3",
+      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "@types/unist": "^2.0.0",
-        "unist-util-stringify-position": "^3.0.0"
+        "source-list-map": "^2.0.0",
+        "source-map": "~0.6.1"
+      }
+    },
+    "node_modules/webpack-sources/node_modules/source-map": {
+      "version": "0.6.1",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack/node_modules/acorn": {
+      "version": "6.4.2",
+      "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "bin": {
+        "acorn": "bin/acorn"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+      "engines": {
+        "node": ">=0.4.0"
       }
     },
-    "node_modules/vfile-sort": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/vfile-sort/-/vfile-sort-3.0.1.tgz",
-      "integrity": "sha512-1os1733XY6y0D5x0ugqSeaVJm9lYgj0j5qdcZQFyxlZOSy1jYarL77lLyb5gK4Wqr1d5OxmuyflSO3zKyFnTFw==",
+    "node_modules/webpack/node_modules/braces": {
+      "version": "2.3.2",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "vfile": "^5.0.0",
-        "vfile-message": "^3.0.0"
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/vfile-sort/node_modules/unist-util-stringify-position": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.3.tgz",
-      "integrity": "sha512-k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg==",
+    "node_modules/webpack/node_modules/enhanced-resolve": {
+      "version": "4.5.0",
+      "integrity": "sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "@types/unist": "^2.0.0"
+        "graceful-fs": "^4.1.2",
+        "memory-fs": "^0.5.0",
+        "tapable": "^1.0.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/vfile-sort/node_modules/vfile": {
-      "version": "5.3.7",
-      "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.7.tgz",
-      "integrity": "sha512-r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g==",
+    "node_modules/webpack/node_modules/enhanced-resolve/node_modules/memory-fs": {
+      "version": "0.5.0",
+      "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "@types/unist": "^2.0.0",
-        "is-buffer": "^2.0.0",
-        "unist-util-stringify-position": "^3.0.0",
-        "vfile-message": "^3.0.0"
+        "errno": "^0.1.3",
+        "readable-stream": "^2.0.1"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+      "engines": {
+        "node": ">=4.3.0 <5.0.0 || >=5.10"
       }
     },
-    "node_modules/vfile-sort/node_modules/vfile-message": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.4.tgz",
-      "integrity": "sha512-fa0Z6P8HUrQN4BZaX05SIVXic+7kE3b05PWAtPuYP9QLHsLKYR7/AlLW3NtOrpXRLeawpDLMsVkmk5DG0NXgWw==",
+    "node_modules/webpack/node_modules/eslint-scope": {
+      "version": "4.0.3",
+      "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "@types/unist": "^2.0.0",
-        "unist-util-stringify-position": "^3.0.0"
+        "esrecurse": "^4.1.0",
+        "estraverse": "^4.1.1"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+      "engines": {
+        "node": ">=4.0.0"
       }
     },
-    "node_modules/vfile-statistics": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/vfile-statistics/-/vfile-statistics-2.0.1.tgz",
-      "integrity": "sha512-W6dkECZmP32EG/l+dp2jCLdYzmnDBIw6jwiLZSER81oR5AHRcVqL+k3Z+pfH1R73le6ayDkJRMk0sutj1bMVeg==",
+    "node_modules/webpack/node_modules/estraverse": {
+      "version": "4.3.0",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/webpack/node_modules/fill-range": {
+      "version": "4.0.0",
+      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "vfile": "^5.0.0",
-        "vfile-message": "^3.0.0"
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/vfile-statistics/node_modules/unist-util-stringify-position": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.3.tgz",
-      "integrity": "sha512-k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg==",
+    "node_modules/webpack/node_modules/is-buffer": {
+      "version": "1.1.6",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
       "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/webpack/node_modules/is-extendable": {
+      "version": "1.0.1",
+      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "@types/unist": "^2.0.0"
+        "is-plain-object": "^2.0.4"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/vfile-statistics/node_modules/vfile": {
-      "version": "5.3.7",
-      "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.7.tgz",
-      "integrity": "sha512-r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g==",
+    "node_modules/webpack/node_modules/is-number": {
+      "version": "3.0.0",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "@types/unist": "^2.0.0",
-        "is-buffer": "^2.0.0",
-        "unist-util-stringify-position": "^3.0.0",
-        "vfile-message": "^3.0.0"
+        "kind-of": "^3.0.2"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/vfile-statistics/node_modules/vfile-message": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.4.tgz",
-      "integrity": "sha512-fa0Z6P8HUrQN4BZaX05SIVXic+7kE3b05PWAtPuYP9QLHsLKYR7/AlLW3NtOrpXRLeawpDLMsVkmk5DG0NXgWw==",
+    "node_modules/webpack/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "@types/unist": "^2.0.0",
-        "unist-util-stringify-position": "^3.0.0"
+        "is-buffer": "^1.1.5"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/w3c-hr-time": {
-      "version": "1.0.2",
-      "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
+    "node_modules/webpack/node_modules/micromatch": {
+      "version": "3.1.10",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
       "dev": true,
+      "optional": true,
       "peer": true,
       "dependencies": {
-        "browser-process-hrtime": "^1.0.0"
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/w3c-xmlserializer": {
-      "version": "2.0.0",
-      "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
+    "node_modules/webpack/node_modules/micromatch/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
       "dev": true,
+      "optional": true,
       "peer": true,
       "dependencies": {
-        "xml-name-validator": "^3.0.0"
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/walker": {
-      "version": "1.0.7",
-      "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=",
+    "node_modules/webpack/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/webpack/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/webpack/node_modules/tapable": {
+      "version": "1.1.3",
+      "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/webpack/node_modules/to-regex-range": {
+      "version": "2.1.1",
+      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
       "dev": true,
+      "optional": true,
       "peer": true,
       "dependencies": {
-        "makeerror": "1.0.x"
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/webidl-conversions": {
-      "version": "6.1.0",
-      "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
+    "node_modules/webpack/node_modules/watchpack": {
+      "version": "1.7.5",
+      "integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==",
       "dev": true,
+      "optional": true,
       "peer": true,
-      "engines": {
-        "node": ">=10.4"
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "neo-async": "^2.5.0"
+      },
+      "optionalDependencies": {
+        "chokidar": "^3.4.1",
+        "watchpack-chokidar2": "^2.0.1"
       }
     },
     "node_modules/whatwg-encoding": {
@@ -13002,7 +14642,6 @@
     },
     "node_modules/which-boxed-primitive": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
       "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
       "dev": true,
       "dependencies": {
@@ -13016,21 +14655,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/which-collection": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz",
-      "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==",
-      "dev": true,
-      "dependencies": {
-        "is-map": "^2.0.1",
-        "is-set": "^2.0.1",
-        "is-weakmap": "^2.0.1",
-        "is-weakset": "^2.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/which-module": {
       "version": "2.0.0",
       "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
@@ -13038,17 +14662,17 @@
       "peer": true
     },
     "node_modules/which-typed-array": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz",
-      "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==",
+      "version": "1.1.7",
+      "integrity": "sha512-vjxaB4nfDqwKI0ws7wZpxIlde1XrLX5uB0ZjpfshgmapJMD7jJWhZI+yToJTqaFByF0eNBcYxbjmCzoRP7CfEw==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
+        "es-abstract": "^1.18.5",
+        "foreach": "^2.0.5",
         "has-tostringtag": "^1.0.0",
-        "is-typed-array": "^1.1.10"
+        "is-typed-array": "^1.1.7"
       },
       "engines": {
         "node": ">= 0.4"
@@ -13065,6 +14689,16 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/worker-farm": {
+      "version": "1.7.0",
+      "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "errno": "~0.1.7"
+      }
+    },
     "node_modules/wrap-ansi": {
       "version": "7.0.0",
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
@@ -13132,9 +14766,9 @@
     },
     "node_modules/xtend": {
       "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
       "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
       "dev": true,
+      "peer": true,
       "engines": {
         "node": ">=0.4"
       }
@@ -13264,9 +14898,9 @@
     },
     "node_modules/yocto-queue": {
       "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
       "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
       "dev": true,
+      "peer": true,
       "engines": {
         "node": ">=10"
       },
@@ -13274,15 +14908,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/zod": {
-      "version": "3.20.6",
-      "resolved": "https://registry.npmjs.org/zod/-/zod-3.20.6.tgz",
-      "integrity": "sha512-oyu0m54SGCtzh6EClBVqDDlAYRz4jrVtKwQ7ZnsEmMI9HnzuZFj8QFwAY1M5uniIYACdGvv0PBWPF2kO0aNofA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/colinhacks"
-      }
-    },
     "node_modules/zwitch": {
       "version": "1.0.5",
       "integrity": "sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==",
@@ -13430,10 +15055,10 @@
       }
     },
     "@babel/helper-plugin-utils": {
-      "version": "7.20.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz",
-      "integrity": "sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==",
-      "dev": true
+      "version": "7.14.5",
+      "integrity": "sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==",
+      "dev": true,
+      "peer": true
     },
     "@babel/helper-replace-supers": {
       "version": "7.15.4",
@@ -13543,17 +15168,6 @@
       "integrity": "sha512-BRYa3wcQnjS/nqI8Ac94pYYpJfojHVvVXJ97+IDCImX4Jc8W8Xv1+47enbruk+q1etOpsQNwnfFcNGw+gtPGxA==",
       "dev": true
     },
-    "@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz",
-      "integrity": "sha512-s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
-        "@babel/plugin-transform-parameters": "^7.12.1"
-      }
-    },
     "@babel/plugin-syntax-async-generators": {
       "version": "7.8.4",
       "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
@@ -13599,15 +15213,6 @@
         "@babel/helper-plugin-utils": "^7.8.0"
       }
     },
-    "@babel/plugin-syntax-jsx": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.1.tgz",
-      "integrity": "sha512-1yRi7yAtB0ETgxdY9ti/p2TivUxJkTdhu/ZbF9MshVGqOx1TdB3b7xCXs49Fupgg50N45KcAsRP/ZqWjs9SRjg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      }
-    },
     "@babel/plugin-syntax-logical-assignment-operators": {
       "version": "7.10.4",
       "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
@@ -13639,6 +15244,7 @@
       "version": "7.8.3",
       "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
       "dev": true,
+      "peer": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.8.0"
       }
@@ -13670,22 +15276,21 @@
         "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
-    "@babel/plugin-transform-parameters": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.7.tgz",
-      "integrity": "sha512-WiWBIkeHKVOSYPO0pWkxGPfKeWrCJyD3NJ53+Lrp/QMSZbsVPovrVl2aWZ19D/LTVnaDv5Ap7GJ/B2CTOZdrfA==",
+    "@babel/runtime": {
+      "version": "7.15.4",
+      "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.20.2"
+        "regenerator-runtime": "^0.13.4"
       }
     },
-    "@babel/runtime": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.7.tgz",
-      "integrity": "sha512-UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ==",
+    "@babel/runtime-corejs3": {
+      "version": "7.15.4",
+      "integrity": "sha512-lWcAqKeB624/twtTc3w6w/2o9RqJPaNBhPGK6DKLSiwuVWC7WFkypWyNg+CpZoyJH0jVzv1uMtXZ/5/lQOLtCg==",
       "dev": true,
       "requires": {
-        "regenerator-runtime": "^0.13.11"
+        "core-js-pure": "^3.16.0",
+        "regenerator-runtime": "^0.13.4"
       }
     },
     "@babel/template": {
@@ -13740,62 +15345,101 @@
       }
     },
     "@eslint/eslintrc": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz",
-      "integrity": "sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==",
+      "version": "0.4.3",
+      "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
       "dev": true,
       "requires": {
         "ajv": "^6.12.4",
-        "debug": "^4.3.2",
-        "espree": "^9.4.0",
-        "globals": "^13.19.0",
-        "ignore": "^5.2.0",
+        "debug": "^4.1.1",
+        "espree": "^7.3.0",
+        "globals": "^13.9.0",
+        "ignore": "^4.0.6",
         "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "minimatch": "^3.1.2",
+        "js-yaml": "^3.13.1",
+        "minimatch": "^3.0.4",
         "strip-json-comments": "^3.1.1"
       },
       "dependencies": {
+        "argparse": {
+          "version": "1.0.10",
+          "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+          "dev": true,
+          "requires": {
+            "sprintf-js": "~1.0.2"
+          }
+        },
         "globals": {
-          "version": "13.19.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz",
-          "integrity": "sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==",
+          "version": "13.11.0",
+          "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==",
           "dev": true,
           "requires": {
             "type-fest": "^0.20.2"
           }
         },
+        "js-yaml": {
+          "version": "3.14.1",
+          "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+          "dev": true,
+          "requires": {
+            "argparse": "^1.0.7",
+            "esprima": "^4.0.0"
+          }
+        },
         "type-fest": {
           "version": "0.20.2",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
           "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
           "dev": true
         }
       }
     },
+    "@hapi/accept": {
+      "version": "5.0.2",
+      "integrity": "sha512-CmzBx/bXUR8451fnZRuZAJRlzgm0Jgu5dltTX/bszmR2lheb9BpyN47Q1RbaGTsvFzn0PXAEs+lXDKfshccYZw==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "@hapi/boom": "9.x.x",
+        "@hapi/hoek": "9.x.x"
+      }
+    },
+    "@hapi/boom": {
+      "version": "9.1.4",
+      "integrity": "sha512-Ls1oH8jaN1vNsqcaHVYJrKmgMcKsC1wcp8bujvXrHaAqD2iDYq3HoOwsxwo09Cuda5R5nC0o0IxlrlTuvPuzSw==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "@hapi/hoek": "9.x.x"
+      }
+    },
+    "@hapi/hoek": {
+      "version": "9.2.1",
+      "integrity": "sha512-gfta+H8aziZsm8pZa0vj04KO6biEiisppNgA1kbJvFrrWu9Vm7eaUEy76DIxsuTaWvti5fkJVhllWc6ZTE+Mdw==",
+      "dev": true,
+      "peer": true
+    },
     "@hashicorp/platform-cli": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/@hashicorp/platform-cli/-/platform-cli-2.6.0.tgz",
-      "integrity": "sha512-nMO7Uiy/A5CT/BCE9RyQt6/Uci7bxwTesxCNWkXlciyqlIrz9WmBa9hr710IiMoDzrzQ1tL6AgFIeTbXs4RTqA==",
+      "version": "1.2.0",
+      "integrity": "sha512-bdGYmqRxxApO+WKPoj8Tc6cWLY2zfPIOQUwnSAcheSE3hIwhscEeudkAxQhKGtgjX4HazgfhEBmQEcJ8T28Bew==",
       "dev": true,
       "requires": {
         "@hashicorp/platform-cms": "0.3.0",
-        "@typescript-eslint/eslint-plugin": "^5.48.0",
-        "@typescript-eslint/parser": "^5.48.0",
+        "@typescript-eslint/eslint-plugin": "4.9.1",
+        "@typescript-eslint/parser": "4.9.1",
+        "babel-eslint": "10.1.0",
         "chalk": "4.1.0",
         "commander": "7.2.0",
         "ejs": "3.1.5",
-        "eslint": "^8.31.0",
-        "eslint-config-next": "^13.1.1",
-        "eslint-config-prettier": "^8.6.0",
-        "eslint-plugin-jsx-a11y": "^6.6.1",
-        "eslint-plugin-prettier": "^4.2.1",
+        "eslint": "7.23.0",
+        "eslint-config-next": "^11.0.1",
+        "eslint-config-prettier": "7.0.0",
+        "eslint-plugin-jsx-a11y": "6.4.1",
+        "eslint-plugin-prettier": "3.3.0",
         "fs-extra": "9.0.1",
         "globby": "11.0.1",
         "inquirer": "7.3.3",
         "lint-staged": "11.1.2",
         "open": "7.3.0",
-        "prettier": "2.5.1",
+        "prettier": "2.2.1",
         "readdirp": "3.5.0",
         "signale": "1.4.0",
         "slugify": "1.4.6",
@@ -13808,14 +15452,6 @@
         "stylelint-use-nesting": "3.0.0",
         "stylelint-value-no-unknown-custom-properties": "3.0.0",
         "ts-jest": "^26.4.4"
-      },
-      "dependencies": {
-        "prettier": {
-          "version": "2.5.1",
-          "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.5.1.tgz",
-          "integrity": "sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==",
-          "dev": true
-        }
       }
     },
     "@hashicorp/platform-cms": {
@@ -13826,241 +15462,6 @@
         "rivet-graphql": "0.3.1"
       }
     },
-    "@hashicorp/platform-content-conformance": {
-      "version": "0.0.9",
-      "resolved": "https://registry.npmjs.org/@hashicorp/platform-content-conformance/-/platform-content-conformance-0.0.9.tgz",
-      "integrity": "sha512-kotY/4M/0YjiUGPgXv9vbWMiZJV5N5tlXTN3e+VzTQlQfbEXP1xYDcs6pNMtxbxCwfS29pkNRIWAsnGVIbBISw==",
-      "dev": true,
-      "requires": {
-        "find-up": "^6.3.0",
-        "flat": "^5.0.2",
-        "globby": "^13.1.2",
-        "mdast-util-to-string": "^3.1.0",
-        "remark": "12.0.1",
-        "remark-mdx": "^1.6.22",
-        "unified-lint-rule": "^2.1.1",
-        "unist-util-stringify-position": "^3.0.2",
-        "unist-util-visit": "^4.1.1",
-        "vfile": "^5.3.6",
-        "vfile-matter": "^4.0.0",
-        "vfile-reporter": "^7.0.4",
-        "vfile-reporter-json": "^3.2.0",
-        "vfile-statistics": "^2.0.0",
-        "yaml": "^2.1.3",
-        "yargs": "^17.4.1",
-        "zod": "^3.19.1"
-      },
-      "dependencies": {
-        "cliui": {
-          "version": "8.0.1",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-          "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-          "dev": true,
-          "requires": {
-            "string-width": "^4.2.0",
-            "strip-ansi": "^6.0.1",
-            "wrap-ansi": "^7.0.0"
-          }
-        },
-        "find-up": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz",
-          "integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^7.1.0",
-            "path-exists": "^5.0.0"
-          }
-        },
-        "globby": {
-          "version": "13.1.3",
-          "resolved": "https://registry.npmjs.org/globby/-/globby-13.1.3.tgz",
-          "integrity": "sha512-8krCNHXvlCgHDpegPzleMq07yMYTO2sXKASmZmquEYWEmCx6J5UTRbp5RwMJkTJGtcQ44YpiUYUiN0b9mzy8Bw==",
-          "dev": true,
-          "requires": {
-            "dir-glob": "^3.0.1",
-            "fast-glob": "^3.2.11",
-            "ignore": "^5.2.0",
-            "merge2": "^1.4.1",
-            "slash": "^4.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz",
-          "integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^6.0.0"
-          }
-        },
-        "mdast-util-to-string": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-3.1.1.tgz",
-          "integrity": "sha512-tGvhT94e+cVnQt8JWE9/b3cUQZWS732TJxXHktvP+BYo62PpYD53Ls/6cC60rW21dW+txxiM4zMdc6abASvZKA==",
-          "dev": true,
-          "requires": {
-            "@types/mdast": "^3.0.0"
-          }
-        },
-        "p-limit": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz",
-          "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==",
-          "dev": true,
-          "requires": {
-            "yocto-queue": "^1.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz",
-          "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^4.0.0"
-          }
-        },
-        "path-exists": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz",
-          "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==",
-          "dev": true
-        },
-        "remark": {
-          "version": "12.0.1",
-          "resolved": "https://registry.npmjs.org/remark/-/remark-12.0.1.tgz",
-          "integrity": "sha512-gS7HDonkdIaHmmP/+shCPejCEEW+liMp/t/QwmF0Xt47Rpuhl32lLtDV1uKWvGoq+kxr5jSgg5oAIpGuyULjUw==",
-          "dev": true,
-          "requires": {
-            "remark-parse": "^8.0.0",
-            "remark-stringify": "^8.0.0",
-            "unified": "^9.0.0"
-          }
-        },
-        "remark-stringify": {
-          "version": "8.1.1",
-          "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-8.1.1.tgz",
-          "integrity": "sha512-q4EyPZT3PcA3Eq7vPpT6bIdokXzFGp9i85igjmhRyXWmPs0Y6/d2FYwUNotKAWyLch7g0ASZJn/KHHcHZQ163A==",
-          "dev": true,
-          "requires": {
-            "ccount": "^1.0.0",
-            "is-alphanumeric": "^1.0.0",
-            "is-decimal": "^1.0.0",
-            "is-whitespace-character": "^1.0.0",
-            "longest-streak": "^2.0.1",
-            "markdown-escapes": "^1.0.0",
-            "markdown-table": "^2.0.0",
-            "mdast-util-compact": "^2.0.0",
-            "parse-entities": "^2.0.0",
-            "repeat-string": "^1.5.4",
-            "state-toggle": "^1.0.0",
-            "stringify-entities": "^3.0.0",
-            "unherit": "^1.0.4",
-            "xtend": "^4.0.1"
-          }
-        },
-        "slash": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
-          "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
-          "dev": true
-        },
-        "unist-util-stringify-position": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.3.tgz",
-          "integrity": "sha512-k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg==",
-          "dev": true,
-          "requires": {
-            "@types/unist": "^2.0.0"
-          }
-        },
-        "vfile": {
-          "version": "5.3.7",
-          "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.7.tgz",
-          "integrity": "sha512-r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g==",
-          "dev": true,
-          "requires": {
-            "@types/unist": "^2.0.0",
-            "is-buffer": "^2.0.0",
-            "unist-util-stringify-position": "^3.0.0",
-            "vfile-message": "^3.0.0"
-          }
-        },
-        "vfile-message": {
-          "version": "3.1.4",
-          "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.4.tgz",
-          "integrity": "sha512-fa0Z6P8HUrQN4BZaX05SIVXic+7kE3b05PWAtPuYP9QLHsLKYR7/AlLW3NtOrpXRLeawpDLMsVkmk5DG0NXgWw==",
-          "dev": true,
-          "requires": {
-            "@types/unist": "^2.0.0",
-            "unist-util-stringify-position": "^3.0.0"
-          }
-        },
-        "y18n": {
-          "version": "5.0.8",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-          "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-          "dev": true
-        },
-        "yaml": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.2.1.tgz",
-          "integrity": "sha512-e0WHiYql7+9wr4cWMx3TVQrNwejKaEe7/rHNmQmqRjazfOP5W8PB6Jpebb5o6fIapbz9o9+2ipcaTM2ZwDI6lw==",
-          "dev": true
-        },
-        "yargs": {
-          "version": "17.7.1",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz",
-          "integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==",
-          "dev": true,
-          "requires": {
-            "cliui": "^8.0.1",
-            "escalade": "^3.1.1",
-            "get-caller-file": "^2.0.5",
-            "require-directory": "^2.1.1",
-            "string-width": "^4.2.3",
-            "y18n": "^5.0.5",
-            "yargs-parser": "^21.1.1"
-          }
-        },
-        "yargs-parser": {
-          "version": "21.1.1",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-          "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-          "dev": true
-        },
-        "yocto-queue": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz",
-          "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==",
-          "dev": true
-        }
-      }
-    },
-    "@humanwhocodes/config-array": {
-      "version": "0.11.8",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
-      "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==",
-      "dev": true,
-      "requires": {
-        "@humanwhocodes/object-schema": "^1.2.1",
-        "debug": "^4.1.1",
-        "minimatch": "^3.0.5"
-      }
-    },
-    "@humanwhocodes/module-importer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
-      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
-      "dev": true
-    },
-    "@humanwhocodes/object-schema": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
-      "dev": true
-    },
     "@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
       "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
@@ -14365,22 +15766,21 @@
         "chalk": "^4.0.0"
       }
     },
-    "@mdx-js/util": {
-      "version": "1.6.22",
-      "resolved": "https://registry.npmjs.org/@mdx-js/util/-/util-1.6.22.tgz",
-      "integrity": "sha512-H1rQc1ZOHANWBvPcW+JpGwr+juXSxM8Q8YCkm3GhZd8REu1fHR3z99CErO1p9pkcfcxZnMdIZdIsXkOHY0NilA==",
-      "dev": true
+    "@napi-rs/triples": {
+      "version": "1.0.3",
+      "integrity": "sha512-jDJTpta+P4p1NZTFVLHJ/TLFVYVcOqv6l8xwOeBKNPMgY/zDYH/YH7SJbvrr/h1RcS9GzbPcLKGzpuK9cV56UA==",
+      "dev": true,
+      "peer": true
     },
     "@next/env": {
-      "version": "12.3.1",
-      "resolved": "https://registry.npmjs.org/@next/env/-/env-12.3.1.tgz",
-      "integrity": "sha512-9P9THmRFVKGKt9DYqeC2aKIxm8rlvkK38V1P1sRE7qyoPBIs8l9oo79QoSdPtOWfzkbDAVUqvbQGgTMsb8BtJg==",
-      "dev": true
+      "version": "11.1.2",
+      "integrity": "sha512-+fteyVdQ7C/OoulfcF6vd1Yk0FEli4453gr8kSFbU8sKseNSizYq6df5MKz/AjwLptsxrUeIkgBdAzbziyJ3mA==",
+      "dev": true,
+      "peer": true
     },
     "@next/eslint-plugin-next": {
-      "version": "13.1.2",
-      "resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-13.1.2.tgz",
-      "integrity": "sha512-WGaNVvIYphdriesP6r7jq/8l7u38tzotnVQuxc1RYKLqYYApSsrebti3OCPoT3Gx0pw2smPIFHH98RzcsgW5GQ==",
+      "version": "11.1.2",
+      "integrity": "sha512-cN+ojHRsufr9Yz0rtvjv8WI5En0RPZRJnt0y16Ha7DD+0n473evz8i1ETEJHmOLeR7iPJR0zxRrxeTN/bJMOjg==",
       "dev": true,
       "requires": {
         "glob": "7.1.7"
@@ -14388,110 +15788,143 @@
       "dependencies": {
         "glob": {
           "version": "7.1.7",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
           "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
           "dev": true,
           "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
+            "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"
+          }
+        }
+      }
+    },
+    "@next/polyfill-module": {
+      "version": "11.1.2",
+      "integrity": "sha512-xZmixqADM3xxtqBV0TpAwSFzWJP0MOQzRfzItHXf1LdQHWb0yofHHC+7eOrPFic8+ZGz5y7BdPkkgR1S25OymA==",
+      "dev": true,
+      "peer": true
+    },
+    "@next/react-dev-overlay": {
+      "version": "11.1.2",
+      "integrity": "sha512-rDF/mGY2NC69mMg2vDqzVpCOlWqnwPUXB2zkARhvknUHyS6QJphPYv9ozoPJuoT/QBs49JJd9KWaAzVBvq920A==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "@babel/code-frame": "7.12.11",
+        "anser": "1.4.9",
+        "chalk": "4.0.0",
+        "classnames": "2.2.6",
+        "css.escape": "1.5.1",
+        "data-uri-to-buffer": "3.0.1",
+        "platform": "1.3.6",
+        "shell-quote": "1.7.2",
+        "source-map": "0.8.0-beta.0",
+        "stacktrace-parser": "0.1.10",
+        "strip-ansi": "6.0.0"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.12.11",
+          "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "@babel/highlight": "^7.10.4"
+          }
+        },
+        "chalk": {
+          "version": "4.0.0",
+          "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "classnames": {
+          "version": "2.2.6",
+          "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==",
+          "dev": true,
+          "peer": true
+        },
+        "punycode": {
+          "version": "2.1.1",
+          "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+          "dev": true,
+          "peer": true
+        },
+        "source-map": {
+          "version": "0.8.0-beta.0",
+          "integrity": "sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "whatwg-url": "^7.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "6.0.0",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "ansi-regex": "^5.0.0"
+          }
+        },
+        "tr46": {
+          "version": "1.0.1",
+          "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "punycode": "^2.1.0"
+          }
+        },
+        "webidl-conversions": {
+          "version": "4.0.2",
+          "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==",
+          "dev": true,
+          "peer": true
+        },
+        "whatwg-url": {
+          "version": "7.1.0",
+          "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "lodash.sortby": "^4.7.0",
+            "tr46": "^1.0.1",
+            "webidl-conversions": "^4.0.2"
           }
         }
       }
     },
-    "@next/swc-android-arm-eabi": {
-      "version": "12.3.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-12.3.1.tgz",
-      "integrity": "sha512-i+BvKA8tB//srVPPQxIQN5lvfROcfv4OB23/L1nXznP+N/TyKL8lql3l7oo2LNhnH66zWhfoemg3Q4VJZSruzQ==",
-      "dev": true,
-      "optional": true
-    },
-    "@next/swc-android-arm64": {
-      "version": "12.3.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-android-arm64/-/swc-android-arm64-12.3.1.tgz",
-      "integrity": "sha512-CmgU2ZNyBP0rkugOOqLnjl3+eRpXBzB/I2sjwcGZ7/Z6RcUJXK5Evz+N0ucOxqE4cZ3gkTeXtSzRrMK2mGYV8Q==",
-      "dev": true,
-      "optional": true
-    },
-    "@next/swc-darwin-arm64": {
-      "version": "12.3.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-12.3.1.tgz",
-      "integrity": "sha512-hT/EBGNcu0ITiuWDYU9ur57Oa4LybD5DOQp4f22T6zLfpoBMfBibPtR8XktXmOyFHrL/6FC2p9ojdLZhWhvBHg==",
+    "@next/react-refresh-utils": {
+      "version": "11.1.2",
+      "integrity": "sha512-hsoJmPfhVqjZ8w4IFzoo8SyECVnN+8WMnImTbTKrRUHOVJcYMmKLL7xf7T0ft00tWwAl/3f3Q3poWIN2Ueql/Q==",
       "dev": true,
-      "optional": true
+      "peer": true,
+      "requires": {}
     },
     "@next/swc-darwin-x64": {
-      "version": "12.3.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-12.3.1.tgz",
-      "integrity": "sha512-9S6EVueCVCyGf2vuiLiGEHZCJcPAxglyckTZcEwLdJwozLqN0gtS0Eq0bQlGS3dH49Py/rQYpZ3KVWZ9BUf/WA==",
-      "dev": true,
-      "optional": true
-    },
-    "@next/swc-freebsd-x64": {
-      "version": "12.3.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-freebsd-x64/-/swc-freebsd-x64-12.3.1.tgz",
-      "integrity": "sha512-qcuUQkaBZWqzM0F1N4AkAh88lLzzpfE6ImOcI1P6YeyJSsBmpBIV8o70zV+Wxpc26yV9vpzb+e5gCyxNjKJg5Q==",
-      "dev": true,
-      "optional": true
-    },
-    "@next/swc-linux-arm-gnueabihf": {
-      "version": "12.3.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm-gnueabihf/-/swc-linux-arm-gnueabihf-12.3.1.tgz",
-      "integrity": "sha512-diL9MSYrEI5nY2wc/h/DBewEDUzr/DqBjIgHJ3RUNtETAOB3spMNHvJk2XKUDjnQuluLmFMloet9tpEqU2TT9w==",
-      "dev": true,
-      "optional": true
-    },
-    "@next/swc-linux-arm64-gnu": {
-      "version": "12.3.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-12.3.1.tgz",
-      "integrity": "sha512-o/xB2nztoaC7jnXU3Q36vGgOolJpsGG8ETNjxM1VAPxRwM7FyGCPHOMk1XavG88QZSQf+1r+POBW0tLxQOJ9DQ==",
-      "dev": true,
-      "optional": true
-    },
-    "@next/swc-linux-arm64-musl": {
-      "version": "12.3.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-12.3.1.tgz",
-      "integrity": "sha512-2WEasRxJzgAmP43glFNhADpe8zB7kJofhEAVNbDJZANp+H4+wq+/cW1CdDi8DqjkShPEA6/ejJw+xnEyDID2jg==",
-      "dev": true,
-      "optional": true
-    },
-    "@next/swc-linux-x64-gnu": {
-      "version": "12.3.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-12.3.1.tgz",
-      "integrity": "sha512-JWEaMyvNrXuM3dyy9Pp5cFPuSSvG82+yABqsWugjWlvfmnlnx9HOQZY23bFq3cNghy5V/t0iPb6cffzRWylgsA==",
-      "dev": true,
-      "optional": true
-    },
-    "@next/swc-linux-x64-musl": {
-      "version": "12.3.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-12.3.1.tgz",
-      "integrity": "sha512-xoEWQQ71waWc4BZcOjmatuvPUXKTv6MbIFzpm4LFeCHsg2iwai0ILmNXf81rJR+L1Wb9ifEke2sQpZSPNz1Iyg==",
-      "dev": true,
-      "optional": true
-    },
-    "@next/swc-win32-arm64-msvc": {
-      "version": "12.3.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-12.3.1.tgz",
-      "integrity": "sha512-hswVFYQYIeGHE2JYaBVtvqmBQ1CppplQbZJS/JgrVI3x2CurNhEkmds/yqvDONfwfbttTtH4+q9Dzf/WVl3Opw==",
-      "dev": true,
-      "optional": true
-    },
-    "@next/swc-win32-ia32-msvc": {
-      "version": "12.3.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-12.3.1.tgz",
-      "integrity": "sha512-Kny5JBehkTbKPmqulr5i+iKntO5YMP+bVM8Hf8UAmjSMVo3wehyLVc9IZkNmcbxi+vwETnQvJaT5ynYBkJ9dWA==",
+      "version": "11.1.2",
+      "integrity": "sha512-PGOp0E1GisU+EJJlsmJVGE+aPYD0Uh7zqgsrpD3F/Y3766Ptfbe1lEPPWnRDl+OzSSrSrX1lkyM/Jlmh5OwNvA==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "peer": true
     },
-    "@next/swc-win32-x64-msvc": {
-      "version": "12.3.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-12.3.1.tgz",
-      "integrity": "sha512-W1ijvzzg+kPEX6LAc+50EYYSEo0FVu7dmTE+t+DM4iOLqgGHoW9uYSz9wCVdkXOEEMP9xhXfGpcSxsfDucyPkA==",
+    "@node-rs/helper": {
+      "version": "1.2.1",
+      "integrity": "sha512-R5wEmm8nbuQU0YGGmYVjEc0OHtYsuXdpRG+Ut/3wZ9XAvQWyThN08bTh2cBJgoZxHQUPtvRfeQuxcAgLuiBISg==",
       "dev": true,
-      "optional": true
+      "peer": true,
+      "requires": {
+        "@napi-rs/triples": "^1.0.3"
+      }
     },
     "@nodelib/fs.scandir": {
       "version": "2.1.5",
@@ -14516,43 +15949,9 @@
         "fastq": "^1.6.0"
       }
     },
-    "@pkgr/utils": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/@pkgr/utils/-/utils-2.3.1.tgz",
-      "integrity": "sha512-wfzX8kc1PMyUILA+1Z/EqoE4UCXGy0iRGMhPwdfae1+f0OXlLqCk+By+aMzgJBzR9AzS4CDizioG6Ss1gvAFJw==",
-      "dev": true,
-      "requires": {
-        "cross-spawn": "^7.0.3",
-        "is-glob": "^4.0.3",
-        "open": "^8.4.0",
-        "picocolors": "^1.0.0",
-        "tiny-glob": "^0.2.9",
-        "tslib": "^2.4.0"
-      },
-      "dependencies": {
-        "open": {
-          "version": "8.4.0",
-          "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz",
-          "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==",
-          "dev": true,
-          "requires": {
-            "define-lazy-prop": "^2.0.0",
-            "is-docker": "^2.1.1",
-            "is-wsl": "^2.2.0"
-          }
-        },
-        "picocolors": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-          "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
-          "dev": true
-        }
-      }
-    },
     "@rushstack/eslint-patch": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.2.0.tgz",
-      "integrity": "sha512-sXo/qW2/pAcmT43VoRKOJbDOfV3cYpq3szSVfIThQXNt+E4DfKj361vaAt3c88U5tPUxzEswam7GW48PJqtKAg==",
+      "version": "1.0.7",
+      "integrity": "sha512-3Zi2LGbCLDz4IIL7ir6wD0u/ggHotLkK5SlVzFzTcYaNgPR4MAt/9JYZqXWKcofPWEoptfpnCJU8Bq9sxw8QUg==",
       "dev": true
     },
     "@sinonjs/commons": {
@@ -14590,15 +15989,6 @@
         "unist-util-find-all-after": "^3.0.2"
       }
     },
-    "@swc/helpers": {
-      "version": "0.4.11",
-      "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.4.11.tgz",
-      "integrity": "sha512-rEUrBSGIoSFuYxwBYtlUFMlE2CwGhmW+w9355/5oduSw8e5h2+Tj4UrAGNNgP9915++wj5vkQo0UuOBqOAq4nw==",
-      "dev": true,
-      "requires": {
-        "tslib": "^2.4.0"
-      }
-    },
     "@tootallnate/once": {
       "version": "1.1.2",
       "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
@@ -14677,15 +16067,13 @@
       }
     },
     "@types/json-schema": {
-      "version": "7.0.11",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
-      "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
+      "version": "7.0.9",
+      "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
       "dev": true
     },
     "@types/json5": {
       "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
+      "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
       "dev": true
     },
     "@types/mdast": {
@@ -14722,24 +16110,12 @@
       "dev": true,
       "peer": true
     },
-    "@types/semver": {
-      "version": "7.3.13",
-      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz",
-      "integrity": "sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==",
-      "dev": true
-    },
     "@types/stack-utils": {
       "version": "2.0.1",
       "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==",
       "dev": true,
       "peer": true
     },
-    "@types/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/@types/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-dPWnWsf+kzIG140B8z2w3fr5D03TLWbOAFQl45xUpI3vcizeXriNR5VYkWZ+WTMsUHqZ9Xlt3hrxGNANFyNQfw==",
-      "dev": true
-    },
     "@types/unist": {
       "version": "2.0.6",
       "integrity": "sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==",
@@ -14759,150 +16135,288 @@
       "dev": true
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "5.48.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.48.1.tgz",
-      "integrity": "sha512-9nY5K1Rp2ppmpb9s9S2aBiF3xo5uExCehMDmYmmFqqyxgenbHJ3qbarcLt4ITgaD6r/2ypdlcFRdcuVPnks+fQ==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/scope-manager": "5.48.1",
-        "@typescript-eslint/type-utils": "5.48.1",
-        "@typescript-eslint/utils": "5.48.1",
-        "debug": "^4.3.4",
-        "ignore": "^5.2.0",
-        "natural-compare-lite": "^1.4.0",
-        "regexpp": "^3.2.0",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "7.3.8",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        }
+      "version": "4.9.1",
+      "integrity": "sha512-QRLDSvIPeI1pz5tVuurD+cStNR4sle4avtHhxA+2uyixWGFjKzJ+EaFVRW6dA/jOgjV5DTAjOxboQkRDE8cRlQ==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/experimental-utils": "4.9.1",
+        "@typescript-eslint/scope-manager": "4.9.1",
+        "debug": "^4.1.1",
+        "functional-red-black-tree": "^1.0.1",
+        "regexpp": "^3.0.0",
+        "semver": "^7.3.2",
+        "tsutils": "^3.17.1"
       }
     },
-    "@typescript-eslint/parser": {
-      "version": "5.48.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.48.1.tgz",
-      "integrity": "sha512-4yg+FJR/V1M9Xoq56SF9Iygqm+r5LMXvheo6DQ7/yUWynQ4YfCRnsKuRgqH4EQ5Ya76rVwlEpw4Xu+TgWQUcdA==",
+    "@typescript-eslint/experimental-utils": {
+      "version": "4.9.1",
+      "integrity": "sha512-c3k/xJqk0exLFs+cWSJxIjqLYwdHCuLWhnpnikmPQD2+NGAx9KjLYlBDcSI81EArh9FDYSL6dslAUSwILeWOxg==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "5.48.1",
-        "@typescript-eslint/types": "5.48.1",
-        "@typescript-eslint/typescript-estree": "5.48.1",
-        "debug": "^4.3.4"
+        "@types/json-schema": "^7.0.3",
+        "@typescript-eslint/scope-manager": "4.9.1",
+        "@typescript-eslint/types": "4.9.1",
+        "@typescript-eslint/typescript-estree": "4.9.1",
+        "eslint-scope": "^5.0.0",
+        "eslint-utils": "^2.0.0"
       }
     },
-    "@typescript-eslint/scope-manager": {
-      "version": "5.48.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.48.1.tgz",
-      "integrity": "sha512-S035ueRrbxRMKvSTv9vJKIWgr86BD8s3RqoRZmsSh/s8HhIs90g6UlK8ZabUSjUZQkhVxt7nmZ63VJ9dcZhtDQ==",
+    "@typescript-eslint/parser": {
+      "version": "4.9.1",
+      "integrity": "sha512-Gv2VpqiomvQ2v4UL+dXlQcZ8zCX4eTkoIW+1aGVWT6yTO+6jbxsw7yQl2z2pPl/4B9qa5JXeIbhJpONKjXIy3g==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "5.48.1",
-        "@typescript-eslint/visitor-keys": "5.48.1"
+        "@typescript-eslint/scope-manager": "4.9.1",
+        "@typescript-eslint/types": "4.9.1",
+        "@typescript-eslint/typescript-estree": "4.9.1",
+        "debug": "^4.1.1"
       }
     },
-    "@typescript-eslint/type-utils": {
-      "version": "5.48.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.48.1.tgz",
-      "integrity": "sha512-Hyr8HU8Alcuva1ppmqSYtM/Gp0q4JOp1F+/JH5D1IZm/bUBrV0edoewQZiEc1r6I8L4JL21broddxK8HAcZiqQ==",
+    "@typescript-eslint/scope-manager": {
+      "version": "4.9.1",
+      "integrity": "sha512-sa4L9yUfD/1sg9Kl8OxPxvpUcqxKXRjBeZxBuZSSV1v13hjfEJkn84n0An2hN8oLQ1PmEl2uA6FkI07idXeFgQ==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/typescript-estree": "5.48.1",
-        "@typescript-eslint/utils": "5.48.1",
-        "debug": "^4.3.4",
-        "tsutils": "^3.21.0"
+        "@typescript-eslint/types": "4.9.1",
+        "@typescript-eslint/visitor-keys": "4.9.1"
       }
     },
     "@typescript-eslint/types": {
-      "version": "5.48.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.48.1.tgz",
-      "integrity": "sha512-xHyDLU6MSuEEdIlzrrAerCGS3T7AA/L8Hggd0RCYBi0w3JMvGYxlLlXHeg50JI9Tfg5MrtsfuNxbS/3zF1/ATg==",
+      "version": "4.9.1",
+      "integrity": "sha512-fjkT+tXR13ks6Le7JiEdagnwEFc49IkOyys7ueWQ4O8k4quKPwPJudrwlVOJCUQhXo45PrfIvIarcrEjFTNwUA==",
       "dev": true
     },
     "@typescript-eslint/typescript-estree": {
-      "version": "5.48.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.48.1.tgz",
-      "integrity": "sha512-Hut+Osk5FYr+sgFh8J/FHjqX6HFcDzTlWLrFqGoK5kVUN3VBHF/QzZmAsIXCQ8T/W9nQNBTqalxi1P3LSqWnRA==",
+      "version": "4.9.1",
+      "integrity": "sha512-bzP8vqwX6Vgmvs81bPtCkLtM/Skh36NE6unu6tsDeU/ZFoYthlTXbBmpIrvosgiDKlWTfb2ZpPELHH89aQjeQw==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "5.48.1",
-        "@typescript-eslint/visitor-keys": "5.48.1",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
-      },
-      "dependencies": {
-        "globby": {
-          "version": "11.1.0",
-          "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-          "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-          "dev": true,
-          "requires": {
-            "array-union": "^2.1.0",
-            "dir-glob": "^3.0.1",
-            "fast-glob": "^3.2.9",
-            "ignore": "^5.2.0",
-            "merge2": "^1.4.1",
-            "slash": "^3.0.0"
-          }
-        },
-        "semver": {
-          "version": "7.3.8",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        }
+        "@typescript-eslint/types": "4.9.1",
+        "@typescript-eslint/visitor-keys": "4.9.1",
+        "debug": "^4.1.1",
+        "globby": "^11.0.1",
+        "is-glob": "^4.0.1",
+        "lodash": "^4.17.15",
+        "semver": "^7.3.2",
+        "tsutils": "^3.17.1"
       }
     },
-    "@typescript-eslint/utils": {
-      "version": "5.48.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.48.1.tgz",
-      "integrity": "sha512-SmQuSrCGUOdmGMwivW14Z0Lj8dxG1mOFZ7soeJ0TQZEJcs3n5Ndgkg0A4bcMFzBELqLJ6GTHnEU+iIoaD6hFGA==",
+    "@typescript-eslint/visitor-keys": {
+      "version": "4.9.1",
+      "integrity": "sha512-9gspzc6UqLQHd7lXQS7oWs+hrYggspv/rk6zzEMhCbYwPE/sF7oxo7GAjkS35Tdlt7wguIG+ViWCPtVZHz/ybQ==",
       "dev": true,
       "requires": {
-        "@types/json-schema": "^7.0.9",
-        "@types/semver": "^7.3.12",
-        "@typescript-eslint/scope-manager": "5.48.1",
-        "@typescript-eslint/types": "5.48.1",
-        "@typescript-eslint/typescript-estree": "5.48.1",
-        "eslint-scope": "^5.1.1",
-        "eslint-utils": "^3.0.0",
-        "semver": "^7.3.7"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "7.3.8",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        }
+        "@typescript-eslint/types": "4.9.1",
+        "eslint-visitor-keys": "^2.0.0"
       }
     },
-    "@typescript-eslint/visitor-keys": {
-      "version": "5.48.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.48.1.tgz",
-      "integrity": "sha512-Ns0XBwmfuX7ZknznfXozgnydyR8F6ev/KEGePP4i74uL3ArsKbEhJ7raeKr1JSa997DBDwol/4a0Y+At82c9dA==",
+    "@webassemblyjs/ast": {
+      "version": "1.9.0",
+      "integrity": "sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "requires": {
+        "@webassemblyjs/helper-module-context": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/wast-parser": "1.9.0"
+      }
+    },
+    "@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.9.0",
+      "integrity": "sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "@webassemblyjs/helper-api-error": {
+      "version": "1.9.0",
+      "integrity": "sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "@webassemblyjs/helper-buffer": {
+      "version": "1.9.0",
+      "integrity": "sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "@webassemblyjs/helper-code-frame": {
+      "version": "1.9.0",
+      "integrity": "sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "requires": {
+        "@webassemblyjs/wast-printer": "1.9.0"
+      }
+    },
+    "@webassemblyjs/helper-fsm": {
+      "version": "1.9.0",
+      "integrity": "sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "@webassemblyjs/helper-module-context": {
+      "version": "1.9.0",
+      "integrity": "sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.9.0"
+      }
+    },
+    "@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.9.0",
+      "integrity": "sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "@webassemblyjs/helper-wasm-section": {
+      "version": "1.9.0",
+      "integrity": "sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-buffer": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/wasm-gen": "1.9.0"
+      }
+    },
+    "@webassemblyjs/ieee754": {
+      "version": "1.9.0",
+      "integrity": "sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "requires": {
+        "@xtuc/ieee754": "^1.2.0"
+      }
+    },
+    "@webassemblyjs/leb128": {
+      "version": "1.9.0",
+      "integrity": "sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "requires": {
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "@webassemblyjs/utf8": {
+      "version": "1.9.0",
+      "integrity": "sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "@webassemblyjs/wasm-edit": {
+      "version": "1.9.0",
+      "integrity": "sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-buffer": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/helper-wasm-section": "1.9.0",
+        "@webassemblyjs/wasm-gen": "1.9.0",
+        "@webassemblyjs/wasm-opt": "1.9.0",
+        "@webassemblyjs/wasm-parser": "1.9.0",
+        "@webassemblyjs/wast-printer": "1.9.0"
+      }
+    },
+    "@webassemblyjs/wasm-gen": {
+      "version": "1.9.0",
+      "integrity": "sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/ieee754": "1.9.0",
+        "@webassemblyjs/leb128": "1.9.0",
+        "@webassemblyjs/utf8": "1.9.0"
+      }
+    },
+    "@webassemblyjs/wasm-opt": {
+      "version": "1.9.0",
+      "integrity": "sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-buffer": "1.9.0",
+        "@webassemblyjs/wasm-gen": "1.9.0",
+        "@webassemblyjs/wasm-parser": "1.9.0"
+      }
+    },
+    "@webassemblyjs/wasm-parser": {
+      "version": "1.9.0",
+      "integrity": "sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-api-error": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/ieee754": "1.9.0",
+        "@webassemblyjs/leb128": "1.9.0",
+        "@webassemblyjs/utf8": "1.9.0"
+      }
+    },
+    "@webassemblyjs/wast-parser": {
+      "version": "1.9.0",
+      "integrity": "sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/floating-point-hex-parser": "1.9.0",
+        "@webassemblyjs/helper-api-error": "1.9.0",
+        "@webassemblyjs/helper-code-frame": "1.9.0",
+        "@webassemblyjs/helper-fsm": "1.9.0",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "@webassemblyjs/wast-printer": {
+      "version": "1.9.0",
+      "integrity": "sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
-        "@typescript-eslint/types": "5.48.1",
-        "eslint-visitor-keys": "^3.3.0"
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/wast-parser": "1.9.0",
+        "@xtuc/long": "4.2.2"
       }
     },
+    "@xtuc/ieee754": {
+      "version": "1.2.0",
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "@xtuc/long": {
+      "version": "4.2.2",
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
     "abab": {
       "version": "2.0.5",
       "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==",
@@ -14912,8 +16426,7 @@
     "acorn": {
       "version": "7.4.1",
       "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "acorn-globals": {
       "version": "6.0.0",
@@ -14927,7 +16440,6 @@
     },
     "acorn-jsx": {
       "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
       "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
       "dev": true,
       "requires": {}
@@ -14958,7 +16470,6 @@
     },
     "ajv": {
       "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
       "requires": {
@@ -14968,6 +16479,28 @@
         "uri-js": "^4.2.2"
       }
     },
+    "ajv-errors": {
+      "version": "1.0.1",
+      "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "requires": {}
+    },
+    "ajv-keywords": {
+      "version": "3.5.2",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "requires": {}
+    },
+    "anser": {
+      "version": "1.4.9",
+      "integrity": "sha512-AI+BjTeGt2+WFk4eWcqbQ7snZpDBt8SaLlj0RT2h5xfdWaiy51OjYvqwMrNzJLGy8iOAL6nKDITWO+rd4MkYEA==",
+      "dev": true,
+      "peer": true
+    },
     "ansi-colors": {
       "version": "4.1.1",
       "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
@@ -15004,19 +16537,20 @@
         "picomatch": "^2.0.4"
       }
     },
-    "argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true
+    "aproba": {
+      "version": "1.2.0",
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "aria-query": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz",
-      "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==",
+      "version": "4.2.2",
+      "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
       "dev": true,
       "requires": {
-        "deep-equal": "^2.0.5"
+        "@babel/runtime": "^7.10.2",
+        "@babel/runtime-corejs3": "^7.10.2"
       }
     },
     "arr-diff": {
@@ -15038,15 +16572,14 @@
       "peer": true
     },
     "array-includes": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz",
-      "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==",
+      "version": "3.1.4",
+      "integrity": "sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "get-intrinsic": "^1.1.3",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1",
+        "get-intrinsic": "^1.1.1",
         "is-string": "^1.0.7"
       }
     },
@@ -15062,40 +16595,23 @@
       "peer": true
     },
     "array.prototype.flat": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
-      "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==",
+      "version": "1.2.5",
+      "integrity": "sha512-KaYU+S+ndVqyUnignHftkwc58o3uVU1jzczILJ1tN2YaIZpFIKBiP/x/j97E5MVPsaCloPbqWLB/8qCTVvT2qg==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "es-shim-unscopables": "^1.0.0"
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.0"
       }
     },
     "array.prototype.flatmap": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz",
-      "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==",
+      "version": "1.2.5",
+      "integrity": "sha512-08u6rVyi1Lj7oqWbS9nUxliETrtIROT4XGTA4D/LWGten6E3ocm7cy9SIrmNHOL5XVbVuckUp3X6Xyg8/zpvHA==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "es-shim-unscopables": "^1.0.0"
-      }
-    },
-    "array.prototype.tosorted": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz",
-      "integrity": "sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "es-shim-unscopables": "^1.0.0",
-        "get-intrinsic": "^1.1.3"
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.0"
       }
     },
     "arrify": {
@@ -15103,16 +16619,53 @@
       "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
       "dev": true
     },
+    "asn1.js": {
+      "version": "5.4.1",
+      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "bn.js": "^4.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0",
+        "safer-buffer": "^2.1.0"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "dev": true,
+          "peer": true
+        }
+      }
+    },
+    "assert": {
+      "version": "2.0.0",
+      "integrity": "sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "es6-object-assign": "^1.1.0",
+        "is-nan": "^1.2.1",
+        "object-is": "^1.0.1",
+        "util": "^0.12.0"
+      }
+    },
     "assign-symbols": {
       "version": "1.0.0",
       "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
       "dev": true,
       "peer": true
     },
+    "ast-types": {
+      "version": "0.13.2",
+      "integrity": "sha512-uWMHxJxtfj/1oZClOxDEV1sQ1HCDkA4MG8Gr69KKeBjEVH0R84WlejZ0y2DcwyBlpAEMltmVYkVgqfLFb2oyiA==",
+      "dev": true,
+      "peer": true
+    },
     "ast-types-flow": {
       "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
-      "integrity": "sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==",
+      "integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0=",
       "dev": true
     },
     "astral-regex": {
@@ -15125,6 +16678,13 @@
       "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
       "dev": true
     },
+    "async-each": {
+      "version": "1.0.3",
+      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
     "asynckit": {
       "version": "0.4.0",
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
@@ -15173,23 +16733,38 @@
     },
     "available-typed-arrays": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
       "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
-      "dev": true
+      "dev": true,
+      "peer": true
     },
     "axe-core": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.6.2.tgz",
-      "integrity": "sha512-b1WlTV8+XKLj9gZy2DZXgQiyDp9xkkoe2a6U6UbYccScq2wgH/YwCeI2/Jq2mgo0HzQxqJOjWZBLeA/mqsk5Mg==",
+      "version": "4.3.3",
+      "integrity": "sha512-/lqqLAmuIPi79WYfRpy2i8z+x+vxU3zX2uAm0gs1q52qTuKwolOj1P8XbufpXcsydrpKx2yGn2wzAnxCMV86QA==",
       "dev": true
     },
     "axobject-query": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.1.1.tgz",
-      "integrity": "sha512-goKlv8DZrK9hUh975fnHzhNIO4jUnFCfv/dszV5VwUGDFjI6vQ2VwoyjYjYNEbBE8AH87TduWP5uyDR1D+Iteg==",
+      "version": "2.2.0",
+      "integrity": "sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==",
+      "dev": true
+    },
+    "babel-eslint": {
+      "version": "10.1.0",
+      "integrity": "sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==",
       "dev": true,
       "requires": {
-        "deep-equal": "^2.0.5"
+        "@babel/code-frame": "^7.0.0",
+        "@babel/parser": "^7.7.0",
+        "@babel/traverse": "^7.7.0",
+        "@babel/types": "^7.7.0",
+        "eslint-visitor-keys": "^1.0.0",
+        "resolve": "^1.12.0"
+      },
+      "dependencies": {
+        "eslint-visitor-keys": {
+          "version": "1.3.0",
+          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+          "dev": true
+        }
       }
     },
     "babel-jest": {
@@ -15299,6 +16874,47 @@
         }
       }
     },
+    "base64-js": {
+      "version": "1.5.1",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "dev": true,
+      "peer": true
+    },
+    "big.js": {
+      "version": "5.2.2",
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+      "dev": true,
+      "peer": true
+    },
+    "binary-extensions": {
+      "version": "2.2.0",
+      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+      "dev": true,
+      "peer": true
+    },
+    "bindings": {
+      "version": "1.5.0",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "requires": {
+        "file-uri-to-path": "1.0.0"
+      }
+    },
+    "bluebird": {
+      "version": "3.7.2",
+      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "bn.js": {
+      "version": "5.2.0",
+      "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==",
+      "dev": true,
+      "peer": true
+    },
     "brace-expansion": {
       "version": "1.1.11",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
@@ -15316,12 +16932,99 @@
         "fill-range": "^7.0.1"
       }
     },
+    "brorand": {
+      "version": "1.1.0",
+      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
+      "dev": true,
+      "peer": true
+    },
     "browser-process-hrtime": {
       "version": "1.0.0",
       "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
       "dev": true,
       "peer": true
     },
+    "browserify-aes": {
+      "version": "1.2.0",
+      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "buffer-xor": "^1.0.3",
+        "cipher-base": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.3",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "browserify-cipher": {
+      "version": "1.0.1",
+      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "browserify-aes": "^1.0.4",
+        "browserify-des": "^1.0.0",
+        "evp_bytestokey": "^1.0.0"
+      }
+    },
+    "browserify-des": {
+      "version": "1.0.2",
+      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "cipher-base": "^1.0.1",
+        "des.js": "^1.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "browserify-rsa": {
+      "version": "4.1.0",
+      "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "bn.js": "^5.0.0",
+        "randombytes": "^2.0.1"
+      }
+    },
+    "browserify-sign": {
+      "version": "4.2.1",
+      "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "bn.js": "^5.1.1",
+        "browserify-rsa": "^4.0.1",
+        "create-hash": "^1.2.0",
+        "create-hmac": "^1.1.7",
+        "elliptic": "^6.5.3",
+        "inherits": "^2.0.4",
+        "parse-asn1": "^5.1.5",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.2.1",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+          "dev": true,
+          "peer": true
+        }
+      }
+    },
+    "browserify-zlib": {
+      "version": "0.2.0",
+      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "pako": "~1.0.5"
+      }
+    },
     "browserslist": {
       "version": "4.17.3",
       "integrity": "sha512-59IqHJV5VGdcJZ+GZ2hU5n4Kv3YiASzW6Xk5g9tf5a/MAzGeFwgGWU39fVzNIOVcgB3+Gp+kiQu0HEfTVU/3VQ==",
@@ -15351,11 +17054,92 @@
         "node-int64": "^0.4.0"
       }
     },
+    "buffer": {
+      "version": "5.6.0",
+      "integrity": "sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4"
+      }
+    },
     "buffer-from": {
       "version": "1.1.2",
       "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
       "dev": true
     },
+    "buffer-xor": {
+      "version": "1.0.3",
+      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
+      "dev": true,
+      "peer": true
+    },
+    "builtin-status-codes": {
+      "version": "3.0.0",
+      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
+      "dev": true,
+      "peer": true
+    },
+    "bytes": {
+      "version": "3.1.0",
+      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
+      "dev": true,
+      "peer": true
+    },
+    "cacache": {
+      "version": "12.0.4",
+      "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "requires": {
+        "bluebird": "^3.5.5",
+        "chownr": "^1.1.1",
+        "figgy-pudding": "^3.5.1",
+        "glob": "^7.1.4",
+        "graceful-fs": "^4.1.15",
+        "infer-owner": "^1.0.3",
+        "lru-cache": "^5.1.1",
+        "mississippi": "^3.0.0",
+        "mkdirp": "^0.5.1",
+        "move-concurrently": "^1.0.1",
+        "promise-inflight": "^1.0.1",
+        "rimraf": "^2.6.3",
+        "ssri": "^6.0.1",
+        "unique-filename": "^1.1.1",
+        "y18n": "^4.0.0"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "5.1.1",
+          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "yallist": "^3.0.2"
+          }
+        },
+        "rimraf": {
+          "version": "2.7.1",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        },
+        "yallist": {
+          "version": "3.1.1",
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+          "dev": true,
+          "optional": true,
+          "peer": true
+        }
+      }
+    },
     "cache-base": {
       "version": "1.0.1",
       "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
@@ -15375,7 +17159,6 @@
     },
     "call-bind": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
       "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
       "dev": true,
       "requires": {
@@ -15394,9 +17177,8 @@
       "dev": true
     },
     "caniuse-lite": {
-      "version": "1.0.30001416",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001416.tgz",
-      "integrity": "sha512-06wzzdAkCPZO+Qm4e/eNghZBDfVNDsCgw33T27OwBH9unE9S478OYw//Q2L7Npf/zBzs7rjZOszIFQkwQKAEqA==",
+      "version": "1.0.30001265",
+      "integrity": "sha512-YzBnspggWV5hep1m9Z6sZVLOt7vrju8xWooFAgN6BA5qvy98qPAPb7vNUzypFaoh2pb3vlfzbDO8tB57UPGbtw==",
       "dev": true
     },
     "capture-exit": {
@@ -15408,12 +17190,6 @@
         "rsvp": "^4.8.4"
       }
     },
-    "ccount": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/ccount/-/ccount-1.1.0.tgz",
-      "integrity": "sha512-vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg==",
-      "dev": true
-    },
     "chalk": {
       "version": "4.1.0",
       "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
@@ -15434,12 +17210,6 @@
       "integrity": "sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==",
       "dev": true
     },
-    "character-entities-html4": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.4.tgz",
-      "integrity": "sha512-HRcDxZuZqMx3/a+qrzxdBKBPUpxWEq9xw2OPZ3a/174ihfrQKVsFhqtthBInFy1zZ9GgZyFXOatNujm8M+El3g==",
-      "dev": true
-    },
     "character-entities-legacy": {
       "version": "1.1.4",
       "integrity": "sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==",
@@ -15455,11 +17225,51 @@
       "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
       "dev": true
     },
+    "chokidar": {
+      "version": "3.5.1",
+      "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "anymatch": "~3.1.1",
+        "braces": "~3.0.2",
+        "fsevents": "~2.3.1",
+        "glob-parent": "~5.1.0",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.5.0"
+      }
+    },
+    "chownr": {
+      "version": "1.1.4",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "chrome-trace-event": {
+      "version": "1.0.3",
+      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
     "ci-info": {
       "version": "2.0.0",
       "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
       "dev": true
     },
+    "cipher-base": {
+      "version": "1.0.4",
+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
     "cjs-module-lexer": {
       "version": "0.6.0",
       "integrity": "sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw==",
@@ -15624,12 +17434,6 @@
       "dev": true,
       "peer": true
     },
-    "collapse-white-space": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.6.tgz",
-      "integrity": "sha512-jEovNnrhMuqyCcjfEJA56v0Xq8SkIoPKDyaHahwo3POf4qcSXqMYuwNcOTzp74vTsR9Tn08z4MxWqAhcekogkQ==",
-      "dev": true
-    },
     "collect-v8-coverage": {
       "version": "1.0.1",
       "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==",
@@ -15677,6 +17481,12 @@
       "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
       "dev": true
     },
+    "commondir": {
+      "version": "1.0.1",
+      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
+      "dev": true,
+      "peer": true
+    },
     "component-emitter": {
       "version": "1.3.0",
       "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
@@ -15688,6 +17498,59 @@
       "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
       "dev": true
     },
+    "concat-stream": {
+      "version": "1.6.2",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
+    "console-browserify": {
+      "version": "1.2.0",
+      "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
+      "dev": true,
+      "peer": true
+    },
+    "constants-browserify": {
+      "version": "1.0.0",
+      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
+      "dev": true,
+      "peer": true
+    },
     "convert-source-map": {
       "version": "1.8.0",
       "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
@@ -15696,12 +17559,50 @@
         "safe-buffer": "~5.1.1"
       }
     },
+    "copy-concurrently": {
+      "version": "1.0.5",
+      "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "requires": {
+        "aproba": "^1.1.1",
+        "fs-write-stream-atomic": "^1.0.8",
+        "iferr": "^0.1.5",
+        "mkdirp": "^0.5.1",
+        "rimraf": "^2.5.4",
+        "run-queue": "^1.0.0"
+      },
+      "dependencies": {
+        "rimraf": {
+          "version": "2.7.1",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
+      }
+    },
     "copy-descriptor": {
       "version": "0.1.1",
       "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
       "dev": true,
       "peer": true
     },
+    "core-js-pure": {
+      "version": "3.18.2",
+      "integrity": "sha512-4hMMLUlZhKJKOWbbGD1/VDUxGPEhEoN/T01k7bx271WiBKCvCfkgPzy0IeRS4PB50p6/N1q/SZL4B/TRsTE5bA==",
+      "dev": true
+    },
+    "core-util-is": {
+      "version": "1.0.3",
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+      "dev": true,
+      "peer": true
+    },
     "cosmiconfig": {
       "version": "7.0.1",
       "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
@@ -15714,6 +17615,51 @@
         "yaml": "^1.10.0"
       }
     },
+    "create-ecdh": {
+      "version": "4.0.4",
+      "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "elliptic": "^6.5.3"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "dev": true,
+          "peer": true
+        }
+      }
+    },
+    "create-hash": {
+      "version": "1.2.0",
+      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "cipher-base": "^1.0.1",
+        "inherits": "^2.0.1",
+        "md5.js": "^1.3.4",
+        "ripemd160": "^2.0.1",
+        "sha.js": "^2.4.0"
+      }
+    },
+    "create-hmac": {
+      "version": "1.1.7",
+      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "cipher-base": "^1.0.3",
+        "create-hash": "^1.1.0",
+        "inherits": "^2.0.1",
+        "ripemd160": "^2.0.0",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
     "cross-fetch": {
       "version": "3.1.4",
       "integrity": "sha512-1eAtFWdIubi6T4XPy6ei9iUFoKpUkIF971QLN8lIvvvwueI65+Nw5haMNKUwfJxabqlIIDODJKGrQ66gxC0PbQ==",
@@ -15739,11 +17685,54 @@
         "which": "^2.0.1"
       }
     },
+    "crypto-browserify": {
+      "version": "3.12.0",
+      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "browserify-cipher": "^1.0.0",
+        "browserify-sign": "^4.0.0",
+        "create-ecdh": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.0",
+        "diffie-hellman": "^5.0.0",
+        "inherits": "^2.0.1",
+        "pbkdf2": "^3.0.3",
+        "public-encrypt": "^4.0.0",
+        "randombytes": "^2.0.0",
+        "randomfill": "^1.0.3"
+      }
+    },
+    "css.escape": {
+      "version": "1.5.1",
+      "integrity": "sha1-QuJ9T6BK4y+TGktNQZH6nN3ul8s=",
+      "dev": true,
+      "peer": true
+    },
     "cssesc": {
       "version": "3.0.0",
       "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
       "dev": true
     },
+    "cssnano-preset-simple": {
+      "version": "3.0.0",
+      "integrity": "sha512-vxQPeoMRqUT3c/9f0vWeVa2nKQIHFpogtoBvFdW4GQ3IvEJ6uauCP6p3Y5zQDLFcI7/+40FTgX12o7XUL0Ko+w==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "caniuse-lite": "^1.0.30001202"
+      }
+    },
+    "cssnano-simple": {
+      "version": "3.0.0",
+      "integrity": "sha512-oU3ueli5Dtwgh0DyeohcIEE00QVfbPR3HzyXdAl89SfnQG3y0/qcpfLVW+jPIh3/rgMZGwuW96rejZGaYE9eUg==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "cssnano-preset-simple": "^3.0.0"
+      }
+    },
     "cssom": {
       "version": "0.4.4",
       "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==",
@@ -15767,10 +17756,16 @@
         }
       }
     },
+    "cyclist": {
+      "version": "1.0.1",
+      "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
     "damerau-levenshtein": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz",
-      "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==",
+      "version": "1.0.7",
+      "integrity": "sha512-VvdQIPGdWP0SqFXghj79Wf/5LArmreyMsGLa6FG6iC4t3j7j5s71TrwWmT/4akbDQIqjfACkLZmjXhA7g2oUZw==",
       "dev": true
     },
     "dart-linkcheck": {
@@ -15778,6 +17773,12 @@
       "integrity": "sha512-ZMvxkAyEpBTvBFk+DPjcK0ObNy8GM4gmrGG1qIu0EXb/zj25vjRWNnhLHKZw4JlOLo02oWlwDeqo98GuBlJcIg==",
       "dev": true
     },
+    "data-uri-to-buffer": {
+      "version": "3.0.1",
+      "integrity": "sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og==",
+      "dev": true,
+      "peer": true
+    },
     "data-urls": {
       "version": "2.0.0",
       "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
@@ -15790,9 +17791,8 @@
       }
     },
     "debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "version": "4.3.2",
+      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
       "dev": true,
       "requires": {
         "ms": "2.1.2"
@@ -15824,58 +17824,17 @@
       "dev": true,
       "peer": true
     },
-    "deep-equal": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.0.tgz",
-      "integrity": "sha512-RdpzE0Hv4lhowpIUKKMJfeH6C1pXdtT1/it80ubgWqwI3qpuxUBpC1S4hnHg+zjnuOoDkzUtUCEEkG+XG5l3Mw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "es-get-iterator": "^1.1.2",
-        "get-intrinsic": "^1.1.3",
-        "is-arguments": "^1.1.1",
-        "is-array-buffer": "^3.0.1",
-        "is-date-object": "^1.0.5",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "isarray": "^2.0.5",
-        "object-is": "^1.1.5",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.4.3",
-        "side-channel": "^1.0.4",
-        "which-boxed-primitive": "^1.0.2",
-        "which-collection": "^1.0.1",
-        "which-typed-array": "^1.1.9"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-          "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-          "dev": true
-        }
-      }
-    },
     "deep-is": {
       "version": "0.1.4",
       "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
       "dev": true
     },
-    "define-lazy-prop": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
-      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
-      "dev": true
-    },
     "define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+      "version": "1.1.3",
+      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
       "dev": true,
       "requires": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
+        "object-keys": "^1.0.12"
       }
     },
     "define-property": {
@@ -15893,6 +17852,22 @@
       "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
       "dev": true
     },
+    "depd": {
+      "version": "1.1.2",
+      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
+      "dev": true,
+      "peer": true
+    },
+    "des.js": {
+      "version": "1.0.1",
+      "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
     "detect-newline": {
       "version": "3.1.0",
       "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
@@ -15905,6 +17880,25 @@
       "dev": true,
       "peer": true
     },
+    "diffie-hellman": {
+      "version": "5.0.3",
+      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "miller-rabin": "^4.0.0",
+        "randombytes": "^2.0.0"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "dev": true,
+          "peer": true
+        }
+      }
+    },
     "dir-glob": {
       "version": "3.0.1",
       "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
@@ -15915,7 +17909,6 @@
     },
     "doctrine": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
       "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
       "dev": true,
       "requires": {
@@ -15943,6 +17936,12 @@
         }
       }
     },
+    "domain-browser": {
+      "version": "4.19.0",
+      "integrity": "sha512-fRA+BaAWOR/yr/t7T9E9GJztHPeFjj8U35ajyAjCDtAAnTn1Rc1f6W6VGPJrO1tkQv9zWu+JRof7z6oQtiYVFQ==",
+      "dev": true,
+      "peer": true
+    },
     "domelementtype": {
       "version": "1.3.1",
       "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
@@ -15982,11 +17981,46 @@
         "domelementtype": "1"
       }
     },
-    "eastasianwidth": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
-      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
-      "dev": true
+    "duplexify": {
+      "version": "3.7.1",
+      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "requires": {
+        "end-of-stream": "^1.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0",
+        "stream-shift": "^1.0.0"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
     },
     "ejs": {
       "version": "3.1.5",
@@ -16001,6 +18035,29 @@
       "integrity": "sha512-okGcCKfihgGlaROMFNPQ6eaU3bk9Xa68rLYSnVD2PyIqM5B/vyQoXCpB3p1HI3AXio097ROVBlSO4JZVilUWuA==",
       "dev": true
     },
+    "elliptic": {
+      "version": "6.5.4",
+      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "bn.js": "^4.11.9",
+        "brorand": "^1.1.0",
+        "hash.js": "^1.0.0",
+        "hmac-drbg": "^1.0.1",
+        "inherits": "^2.0.4",
+        "minimalistic-assert": "^1.0.1",
+        "minimalistic-crypto-utils": "^1.0.1"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "dev": true,
+          "peer": true
+        }
+      }
+    },
     "emittery": {
       "version": "0.7.2",
       "integrity": "sha512-A8OG5SR/ij3SsJdWDJdkkSYUjQdCUx6APQXem0SaEePBSRg4eymGYwBkKo1Y6DU+af/Jn2dBQqDBvjnr9Vi8nQ==",
@@ -16009,27 +18066,43 @@
     },
     "emoji-regex": {
       "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
       "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
       "dev": true
     },
-    "end-of-stream": {
-      "version": "1.4.4",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+    "emojis-list": {
+      "version": "3.0.0",
+      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "encoding": {
+      "version": "0.1.13",
+      "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
       "dev": true,
       "peer": true,
       "requires": {
-        "once": "^1.4.0"
+        "iconv-lite": "^0.6.2"
+      },
+      "dependencies": {
+        "iconv-lite": {
+          "version": "0.6.3",
+          "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3.0.0"
+          }
+        }
       }
     },
-    "enhanced-resolve": {
-      "version": "5.12.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz",
-      "integrity": "sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==",
+    "end-of-stream": {
+      "version": "1.4.4",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
       "dev": true,
+      "peer": true,
       "requires": {
-        "graceful-fs": "^4.2.4",
-        "tapable": "^2.2.0"
+        "once": "^1.4.0"
       }
     },
     "enquirer": {
@@ -16045,6 +18118,16 @@
       "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
       "dev": true
     },
+    "errno": {
+      "version": "0.1.8",
+      "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "requires": {
+        "prr": "~1.0.1"
+      }
+    },
     "error-ex": {
       "version": "1.3.2",
       "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
@@ -16054,94 +18137,34 @@
       }
     },
     "es-abstract": {
-      "version": "1.21.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.1.tgz",
-      "integrity": "sha512-QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg==",
+      "version": "1.19.1",
+      "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
       "dev": true,
       "requires": {
-        "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",
-        "es-set-tostringtag": "^2.0.1",
         "es-to-primitive": "^1.2.1",
         "function-bind": "^1.1.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.1.3",
+        "get-intrinsic": "^1.1.1",
         "get-symbol-description": "^1.0.0",
-        "globalthis": "^1.0.3",
-        "gopd": "^1.0.1",
         "has": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.4",
-        "is-array-buffer": "^3.0.1",
-        "is-callable": "^1.2.7",
-        "is-negative-zero": "^2.0.2",
+        "has-symbols": "^1.0.2",
+        "internal-slot": "^1.0.3",
+        "is-callable": "^1.2.4",
+        "is-negative-zero": "^2.0.1",
         "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
+        "is-shared-array-buffer": "^1.0.1",
         "is-string": "^1.0.7",
-        "is-typed-array": "^1.1.10",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.2",
+        "is-weakref": "^1.0.1",
+        "object-inspect": "^1.11.0",
         "object-keys": "^1.1.1",
-        "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.4.3",
-        "safe-regex-test": "^1.0.0",
-        "string.prototype.trimend": "^1.0.6",
-        "string.prototype.trimstart": "^1.0.6",
-        "typed-array-length": "^1.0.4",
-        "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.9"
-      }
-    },
-    "es-get-iterator": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz",
-      "integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.3",
-        "has-symbols": "^1.0.3",
-        "is-arguments": "^1.1.1",
-        "is-map": "^2.0.2",
-        "is-set": "^2.0.2",
-        "is-string": "^1.0.7",
-        "isarray": "^2.0.5",
-        "stop-iteration-iterator": "^1.0.0"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-          "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-          "dev": true
-        }
-      }
-    },
-    "es-set-tostringtag": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz",
-      "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==",
-      "dev": true,
-      "requires": {
-        "get-intrinsic": "^1.1.3",
-        "has": "^1.0.3",
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "es-shim-unscopables": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
-      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
-      "dev": true,
-      "requires": {
-        "has": "^1.0.3"
+        "object.assign": "^4.1.2",
+        "string.prototype.trimend": "^1.0.4",
+        "string.prototype.trimstart": "^1.0.4",
+        "unbox-primitive": "^1.0.1"
       }
     },
     "es-to-primitive": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
       "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
       "dev": true,
       "requires": {
@@ -16150,6 +18173,12 @@
         "is-symbol": "^1.0.2"
       }
     },
+    "es6-object-assign": {
+      "version": "1.1.0",
+      "integrity": "sha1-wsNYJlYkfDnqEHyx5mUrb58kUjw=",
+      "dev": true,
+      "peer": true
+    },
     "escalade": {
       "version": "3.1.1",
       "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
@@ -16222,233 +18251,222 @@
       }
     },
     "eslint": {
-      "version": "8.31.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.31.0.tgz",
-      "integrity": "sha512-0tQQEVdmPZ1UtUKXjX7EMm9BlgJ08G90IhWh0PKDCb3ZLsgAOHI8fYSIzYVZej92zsgq+ft0FGsxhJ3xo2tbuA==",
+      "version": "7.23.0",
+      "integrity": "sha512-kqvNVbdkjzpFy0XOszNwjkKzZ+6TcwCQ/h+ozlcIWwaimBBuhlQ4nN6kbiM2L+OjDcznkTJxzYfRFH92sx4a0Q==",
       "dev": true,
       "requires": {
-        "@eslint/eslintrc": "^1.4.1",
-        "@humanwhocodes/config-array": "^0.11.8",
-        "@humanwhocodes/module-importer": "^1.0.1",
-        "@nodelib/fs.walk": "^1.2.8",
+        "@babel/code-frame": "7.12.11",
+        "@eslint/eslintrc": "^0.4.0",
         "ajv": "^6.10.0",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
-        "debug": "^4.3.2",
+        "debug": "^4.0.1",
         "doctrine": "^3.0.0",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.1.1",
-        "eslint-utils": "^3.0.0",
-        "eslint-visitor-keys": "^3.3.0",
-        "espree": "^9.4.0",
+        "enquirer": "^2.3.5",
+        "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",
-        "find-up": "^5.0.0",
-        "glob-parent": "^6.0.2",
-        "globals": "^13.19.0",
-        "grapheme-splitter": "^1.0.4",
-        "ignore": "^5.2.0",
+        "functional-red-black-tree": "^1.0.1",
+        "glob-parent": "^5.0.0",
+        "globals": "^13.6.0",
+        "ignore": "^4.0.6",
         "import-fresh": "^3.0.0",
         "imurmurhash": "^0.1.4",
         "is-glob": "^4.0.0",
-        "is-path-inside": "^3.0.3",
-        "js-sdsl": "^4.1.4",
-        "js-yaml": "^4.1.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.1.2",
+        "lodash": "^4.17.21",
+        "minimatch": "^3.0.4",
         "natural-compare": "^1.4.0",
         "optionator": "^0.9.1",
-        "regexpp": "^3.2.0",
-        "strip-ansi": "^6.0.1",
+        "progress": "^2.0.0",
+        "regexpp": "^3.1.0",
+        "semver": "^7.2.1",
+        "strip-ansi": "^6.0.0",
         "strip-json-comments": "^3.1.0",
-        "text-table": "^0.2.0"
+        "table": "^6.0.4",
+        "text-table": "^0.2.0",
+        "v8-compile-cache": "^2.0.3"
       },
       "dependencies": {
-        "escape-string-regexp": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-          "dev": true
-        },
-        "eslint-scope": {
-          "version": "7.1.1",
-          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
-          "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
-          "dev": true,
-          "requires": {
-            "esrecurse": "^4.3.0",
-            "estraverse": "^5.2.0"
-          }
-        },
-        "find-up": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-          "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+        "@babel/code-frame": {
+          "version": "7.12.11",
+          "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
           "dev": true,
           "requires": {
-            "locate-path": "^6.0.0",
-            "path-exists": "^4.0.0"
+            "@babel/highlight": "^7.10.4"
           }
         },
-        "glob-parent": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-          "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+        "argparse": {
+          "version": "1.0.10",
+          "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
           "dev": true,
           "requires": {
-            "is-glob": "^4.0.3"
+            "sprintf-js": "~1.0.2"
           }
         },
         "globals": {
-          "version": "13.19.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz",
-          "integrity": "sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==",
+          "version": "13.11.0",
+          "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==",
           "dev": true,
           "requires": {
             "type-fest": "^0.20.2"
           }
         },
-        "locate-path": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-          "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^5.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-          "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+        "js-yaml": {
+          "version": "3.14.1",
+          "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
           "dev": true,
           "requires": {
-            "p-limit": "^3.0.2"
+            "argparse": "^1.0.7",
+            "esprima": "^4.0.0"
           }
         },
-        "path-exists": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-          "dev": true
-        },
         "type-fest": {
           "version": "0.20.2",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
           "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
           "dev": true
         }
       }
     },
     "eslint-config-next": {
-      "version": "13.1.2",
-      "resolved": "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-13.1.2.tgz",
-      "integrity": "sha512-zdRAQOr8v69ZwJRtBrGqAqm160ONqKxU/pV1FB1KlgfyqveGsLZmlQ7l31otwtw763901J7xdiTVkj2y3YxXZA==",
+      "version": "11.1.2",
+      "integrity": "sha512-dFutecxX2Z5/QVlLwdtKt+gIfmNMP8Qx6/qZh3LM/DFVdGJEAnUKrr4VwGmACB2kx/PQ5bx3R+QxnEg4fDPiTg==",
       "dev": true,
       "requires": {
-        "@next/eslint-plugin-next": "13.1.2",
-        "@rushstack/eslint-patch": "^1.1.3",
-        "@typescript-eslint/parser": "^5.42.0",
-        "eslint-import-resolver-node": "^0.3.6",
-        "eslint-import-resolver-typescript": "^3.5.2",
-        "eslint-plugin-import": "^2.26.0",
-        "eslint-plugin-jsx-a11y": "^6.5.1",
-        "eslint-plugin-react": "^7.31.7",
-        "eslint-plugin-react-hooks": "^4.5.0"
+        "@next/eslint-plugin-next": "11.1.2",
+        "@rushstack/eslint-patch": "^1.0.6",
+        "@typescript-eslint/parser": "^4.20.0",
+        "eslint-import-resolver-node": "^0.3.4",
+        "eslint-import-resolver-typescript": "^2.4.0",
+        "eslint-plugin-import": "^2.22.1",
+        "eslint-plugin-jsx-a11y": "^6.4.1",
+        "eslint-plugin-react": "^7.23.1",
+        "eslint-plugin-react-hooks": "^4.2.0"
+      },
+      "dependencies": {
+        "@typescript-eslint/parser": {
+          "version": "4.33.0",
+          "integrity": "sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA==",
+          "dev": true,
+          "requires": {
+            "@typescript-eslint/scope-manager": "4.33.0",
+            "@typescript-eslint/types": "4.33.0",
+            "@typescript-eslint/typescript-estree": "4.33.0",
+            "debug": "^4.3.1"
+          }
+        },
+        "@typescript-eslint/scope-manager": {
+          "version": "4.33.0",
+          "integrity": "sha512-5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ==",
+          "dev": true,
+          "requires": {
+            "@typescript-eslint/types": "4.33.0",
+            "@typescript-eslint/visitor-keys": "4.33.0"
+          }
+        },
+        "@typescript-eslint/types": {
+          "version": "4.33.0",
+          "integrity": "sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ==",
+          "dev": true
+        },
+        "@typescript-eslint/typescript-estree": {
+          "version": "4.33.0",
+          "integrity": "sha512-rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA==",
+          "dev": true,
+          "requires": {
+            "@typescript-eslint/types": "4.33.0",
+            "@typescript-eslint/visitor-keys": "4.33.0",
+            "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": {
+          "version": "4.33.0",
+          "integrity": "sha512-uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg==",
+          "dev": true,
+          "requires": {
+            "@typescript-eslint/types": "4.33.0",
+            "eslint-visitor-keys": "^2.0.0"
+          }
+        },
+        "globby": {
+          "version": "11.0.4",
+          "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==",
+          "dev": true,
+          "requires": {
+            "array-union": "^2.1.0",
+            "dir-glob": "^3.0.1",
+            "fast-glob": "^3.1.1",
+            "ignore": "^5.1.4",
+            "merge2": "^1.3.0",
+            "slash": "^3.0.0"
+          }
+        },
+        "ignore": {
+          "version": "5.1.8",
+          "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
+          "dev": true
+        }
       }
     },
     "eslint-config-prettier": {
-      "version": "8.6.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.6.0.tgz",
-      "integrity": "sha512-bAF0eLpLVqP5oEVUFKpMA+NnRFICwn9X8B5jrR9FcqnYBuPbqWEjTEspPWMj5ye6czoSLDweCzSo3Ko7gGrZaA==",
+      "version": "7.0.0",
+      "integrity": "sha512-8Y8lGLVPPZdaNA7JXqnvETVC7IiVRgAP6afQu9gOQRn90YY3otMNh+x7Vr2vMePQntF+5erdSUBqSzCmU/AxaQ==",
       "dev": true,
       "requires": {}
     },
     "eslint-import-resolver-node": {
-      "version": "0.3.7",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz",
-      "integrity": "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==",
+      "version": "0.3.6",
+      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
       "dev": true,
       "requires": {
         "debug": "^3.2.7",
-        "is-core-module": "^2.11.0",
-        "resolve": "^1.22.1"
+        "resolve": "^1.20.0"
       },
       "dependencies": {
         "debug": {
           "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
           "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
           "dev": true,
           "requires": {
             "ms": "^2.1.1"
           }
-        },
-        "resolve": {
-          "version": "1.22.1",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-          "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
-          "dev": true,
-          "requires": {
-            "is-core-module": "^2.9.0",
-            "path-parse": "^1.0.7",
-            "supports-preserve-symlinks-flag": "^1.0.0"
-          }
         }
       }
     },
     "eslint-import-resolver-typescript": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.5.3.tgz",
-      "integrity": "sha512-njRcKYBc3isE42LaTcJNVANR3R99H9bAxBDMNDr2W7yq5gYPxbU3MkdhsQukxZ/Xg9C2vcyLlDsbKfRDg0QvCQ==",
+      "version": "2.5.0",
+      "integrity": "sha512-qZ6e5CFr+I7K4VVhQu3M/9xGv9/YmwsEXrsm3nimw8vWaVHRDrQRp26BgCypTxBp3vUp4o5aVEJRiy0F2DFddQ==",
       "dev": true,
       "requires": {
-        "debug": "^4.3.4",
-        "enhanced-resolve": "^5.10.0",
-        "get-tsconfig": "^4.2.0",
-        "globby": "^13.1.2",
-        "is-core-module": "^2.10.0",
-        "is-glob": "^4.0.3",
-        "synckit": "^0.8.4"
-      },
-      "dependencies": {
-        "globby": {
-          "version": "13.1.3",
-          "resolved": "https://registry.npmjs.org/globby/-/globby-13.1.3.tgz",
-          "integrity": "sha512-8krCNHXvlCgHDpegPzleMq07yMYTO2sXKASmZmquEYWEmCx6J5UTRbp5RwMJkTJGtcQ44YpiUYUiN0b9mzy8Bw==",
-          "dev": true,
-          "requires": {
-            "dir-glob": "^3.0.1",
-            "fast-glob": "^3.2.11",
-            "ignore": "^5.2.0",
-            "merge2": "^1.4.1",
-            "slash": "^4.0.0"
-          }
-        },
-        "slash": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
-          "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
-          "dev": true
-        }
+        "debug": "^4.3.1",
+        "glob": "^7.1.7",
+        "is-glob": "^4.0.1",
+        "resolve": "^1.20.0",
+        "tsconfig-paths": "^3.9.0"
       }
     },
     "eslint-module-utils": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz",
-      "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==",
+      "version": "2.7.0",
+      "integrity": "sha512-hqSE88MmHl3ru9SYvDyGrlo0JwROlf9fiEMplEV7j/EAuq9iSlIlyCFbBT6pdULQBSnBYtYKiMLps+hKkyP7Gg==",
       "dev": true,
       "requires": {
-        "debug": "^3.2.7"
+        "debug": "^3.2.7",
+        "find-up": "^2.1.0",
+        "pkg-dir": "^2.0.0"
       },
       "dependencies": {
         "debug": {
           "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
           "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
           "dev": true,
           "requires": {
@@ -16458,173 +18476,130 @@
       }
     },
     "eslint-plugin-import": {
-      "version": "2.27.4",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.4.tgz",
-      "integrity": "sha512-Z1jVt1EGKia1X9CnBCkpAOhWy8FgQ7OmJ/IblEkT82yrFU/xJaxwujaTzLWqigewwynRQ9mmHfX9MtAfhxm0sA==",
+      "version": "2.24.2",
+      "integrity": "sha512-hNVtyhiEtZmpsabL4neEj+6M5DCLgpYyG9nzJY8lZQeQXEn5UPW1DpUdsMHMXsq98dbNm7nt1w9ZMSVpfJdi8Q==",
       "dev": true,
       "requires": {
-        "array-includes": "^3.1.6",
-        "array.prototype.flat": "^1.3.1",
-        "array.prototype.flatmap": "^1.3.0",
-        "debug": "^3.2.7",
+        "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.7",
-        "eslint-module-utils": "^2.7.4",
+        "eslint-import-resolver-node": "^0.3.6",
+        "eslint-module-utils": "^2.6.2",
+        "find-up": "^2.0.0",
         "has": "^1.0.3",
-        "is-core-module": "^2.11.0",
-        "is-glob": "^4.0.3",
-        "minimatch": "^3.1.2",
-        "object.values": "^1.1.6",
-        "resolve": "^1.22.1",
-        "semver": "^6.3.0",
-        "tsconfig-paths": "^3.14.1"
+        "is-core-module": "^2.6.0",
+        "minimatch": "^3.0.4",
+        "object.values": "^1.1.4",
+        "pkg-up": "^2.0.0",
+        "read-pkg-up": "^3.0.0",
+        "resolve": "^1.20.0",
+        "tsconfig-paths": "^3.11.0"
       },
       "dependencies": {
         "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+          "version": "2.6.9",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.0.0"
           }
         },
         "doctrine": {
           "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
           "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
           "dev": true,
           "requires": {
             "esutils": "^2.0.2"
           }
         },
-        "resolve": {
-          "version": "1.22.1",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-          "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
-          "dev": true,
-          "requires": {
-            "is-core-module": "^2.9.0",
-            "path-parse": "^1.0.7",
-            "supports-preserve-symlinks-flag": "^1.0.0"
-          }
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+        "ms": {
+          "version": "2.0.0",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
           "dev": true
         }
       }
     },
     "eslint-plugin-jsx-a11y": {
-      "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.7.1.tgz",
-      "integrity": "sha512-63Bog4iIethyo8smBklORknVjB0T2dwB8Mr/hIC+fBS0uyHdYYpzM/Ed+YC8VxTjlXHEWFOdmgwcDn1U2L9VCA==",
+      "version": "6.4.1",
+      "integrity": "sha512-0rGPJBbwHoGNPU73/QCLP/vveMlM1b1Z9PponxO87jfr6tuH5ligXbDT6nHSSzBC8ovX2Z+BQu7Bk5D/Xgq9zg==",
       "dev": true,
       "requires": {
-        "@babel/runtime": "^7.20.7",
-        "aria-query": "^5.1.3",
-        "array-includes": "^3.1.6",
-        "array.prototype.flatmap": "^1.3.1",
+        "@babel/runtime": "^7.11.2",
+        "aria-query": "^4.2.2",
+        "array-includes": "^3.1.1",
         "ast-types-flow": "^0.0.7",
-        "axe-core": "^4.6.2",
-        "axobject-query": "^3.1.1",
-        "damerau-levenshtein": "^1.0.8",
-        "emoji-regex": "^9.2.2",
+        "axe-core": "^4.0.2",
+        "axobject-query": "^2.2.0",
+        "damerau-levenshtein": "^1.0.6",
+        "emoji-regex": "^9.0.0",
         "has": "^1.0.3",
-        "jsx-ast-utils": "^3.3.3",
-        "language-tags": "=1.0.5",
-        "minimatch": "^3.1.2",
-        "object.entries": "^1.1.6",
-        "object.fromentries": "^2.0.6",
-        "semver": "^6.3.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        }
+        "jsx-ast-utils": "^3.1.0",
+        "language-tags": "^1.0.5"
       }
     },
     "eslint-plugin-prettier": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz",
-      "integrity": "sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.3.0.tgz",
+      "integrity": "sha512-tMTwO8iUWlSRZIwS9k7/E4vrTsfvsrcM5p1eftyuqWH25nKsz/o6/54I7jwQ/3zobISyC7wMy9ZsFwgTxOcOpQ==",
       "dev": true,
       "requires": {
         "prettier-linter-helpers": "^1.0.0"
       }
     },
     "eslint-plugin-react": {
-      "version": "7.32.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.32.0.tgz",
-      "integrity": "sha512-vSBi1+SrPiLZCGvxpiZIa28fMEUaMjXtCplrvxcIxGzmFiYdsXQDwInEjuv5/i/2CTTxbkS87tE8lsQ0Qxinbw==",
+      "version": "7.26.1",
+      "integrity": "sha512-Lug0+NOFXeOE+ORZ5pbsh6mSKjBKXDXItUD2sQoT+5Yl0eoT82DqnXeTMfUare4QVCn9QwXbfzO/dBLjLXwVjQ==",
       "dev": true,
       "requires": {
-        "array-includes": "^3.1.6",
-        "array.prototype.flatmap": "^1.3.1",
-        "array.prototype.tosorted": "^1.1.1",
+        "array-includes": "^3.1.3",
+        "array.prototype.flatmap": "^1.2.4",
         "doctrine": "^2.1.0",
-        "estraverse": "^5.3.0",
+        "estraverse": "^5.2.0",
         "jsx-ast-utils": "^2.4.1 || ^3.0.0",
-        "minimatch": "^3.1.2",
-        "object.entries": "^1.1.6",
-        "object.fromentries": "^2.0.6",
-        "object.hasown": "^1.1.2",
-        "object.values": "^1.1.6",
-        "prop-types": "^15.8.1",
-        "resolve": "^2.0.0-next.4",
+        "minimatch": "^3.0.4",
+        "object.entries": "^1.1.4",
+        "object.fromentries": "^2.0.4",
+        "object.hasown": "^1.0.0",
+        "object.values": "^1.1.4",
+        "prop-types": "^15.7.2",
+        "resolve": "^2.0.0-next.3",
         "semver": "^6.3.0",
-        "string.prototype.matchall": "^4.0.8"
+        "string.prototype.matchall": "^4.0.5"
       },
       "dependencies": {
         "doctrine": {
           "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
           "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
           "dev": true,
           "requires": {
             "esutils": "^2.0.2"
           }
         },
-        "estraverse": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-          "dev": true
-        },
         "resolve": {
-          "version": "2.0.0-next.4",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz",
-          "integrity": "sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==",
+          "version": "2.0.0-next.3",
+          "integrity": "sha512-W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q==",
           "dev": true,
           "requires": {
-            "is-core-module": "^2.9.0",
-            "path-parse": "^1.0.7",
-            "supports-preserve-symlinks-flag": "^1.0.0"
+            "is-core-module": "^2.2.0",
+            "path-parse": "^1.0.6"
           }
         },
         "semver": {
           "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
           "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
         }
       }
     },
     "eslint-plugin-react-hooks": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz",
-      "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==",
+      "version": "4.2.0",
+      "integrity": "sha512-623WEiZJqxR7VdxFCKLI6d6LLpwJkGPYKODnkH3D7WpOG5KM8yWueBd8TLsNAetEJNF5iJmolaAKO3F8yzyVBQ==",
       "dev": true,
       "requires": {}
     },
     "eslint-scope": {
       "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
       "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
       "dev": true,
       "requires": {
@@ -16634,50 +18609,44 @@
       "dependencies": {
         "estraverse": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
           "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
           "dev": true
         }
       }
     },
     "eslint-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+      "version": "2.1.0",
+      "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
       "dev": true,
       "requires": {
-        "eslint-visitor-keys": "^2.0.0"
+        "eslint-visitor-keys": "^1.1.0"
       },
       "dependencies": {
         "eslint-visitor-keys": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-          "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+          "version": "1.3.0",
+          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
           "dev": true
         }
       }
     },
     "eslint-visitor-keys": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+      "version": "2.1.0",
+      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
       "dev": true
     },
     "espree": {
-      "version": "9.4.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz",
-      "integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==",
+      "version": "7.3.1",
+      "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
       "dev": true,
       "requires": {
-        "acorn": "^8.8.0",
-        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.3.0"
+        "acorn": "^7.4.0",
+        "acorn-jsx": "^5.3.1",
+        "eslint-visitor-keys": "^1.3.0"
       },
       "dependencies": {
-        "acorn": {
-          "version": "8.8.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
-          "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
+        "eslint-visitor-keys": {
+          "version": "1.3.0",
+          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
           "dev": true
         }
       }
@@ -16685,12 +18654,10 @@
     "esprima": {
       "version": "4.0.1",
       "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "esquery": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
       "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
       "dev": true,
       "requires": {
@@ -16699,7 +18666,6 @@
     },
     "esrecurse": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
       "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
       "dev": true,
       "requires": {
@@ -16716,6 +18682,28 @@
       "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
       "dev": true
     },
+    "etag": {
+      "version": "1.8.1",
+      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
+      "dev": true,
+      "peer": true
+    },
+    "events": {
+      "version": "3.3.0",
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+      "dev": true,
+      "peer": true
+    },
+    "evp_bytestokey": {
+      "version": "1.0.3",
+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "md5.js": "^1.3.4",
+        "safe-buffer": "^5.1.1"
+      }
+    },
     "exec-sh": {
       "version": "0.3.6",
       "integrity": "sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==",
@@ -16934,14 +18922,12 @@
     },
     "fast-diff": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz",
       "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==",
       "dev": true
     },
     "fast-glob": {
-      "version": "3.2.12",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
-      "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
+      "version": "3.2.7",
+      "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==",
       "dev": true,
       "requires": {
         "@nodelib/fs.stat": "^2.0.2",
@@ -16983,6 +18969,13 @@
         "bser": "2.1.1"
       }
     },
+    "figgy-pudding": {
+      "version": "3.5.2",
+      "integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
     "figures": {
       "version": "3.2.0",
       "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
@@ -16999,6 +18992,13 @@
         "flat-cache": "^3.0.4"
       }
     },
+    "file-uri-to-path": {
+      "version": "1.0.0",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
     "filelist": {
       "version": "1.0.2",
       "integrity": "sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ==",
@@ -17015,6 +19015,86 @@
         "to-regex-range": "^5.0.1"
       }
     },
+    "find-cache-dir": {
+      "version": "3.3.1",
+      "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "commondir": "^1.0.1",
+        "make-dir": "^3.0.2",
+        "pkg-dir": "^4.1.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "4.1.0",
+          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "locate-path": "^5.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "5.0.0",
+          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "p-locate": "^4.1.0"
+          }
+        },
+        "make-dir": {
+          "version": "3.1.0",
+          "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "semver": "^6.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.3.0",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "4.1.0",
+          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "p-limit": "^2.2.0"
+          }
+        },
+        "path-exists": {
+          "version": "4.0.0",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "dev": true,
+          "peer": true
+        },
+        "pkg-dir": {
+          "version": "4.2.0",
+          "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "find-up": "^4.0.0"
+          }
+        },
+        "semver": {
+          "version": "6.3.0",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true,
+          "peer": true
+        }
+      }
+    },
     "find-up": {
       "version": "2.1.0",
       "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
@@ -17023,12 +19103,6 @@
         "locate-path": "^2.0.0"
       }
     },
-    "flat": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
-      "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
-      "dev": true
-    },
     "flat-cache": {
       "version": "3.0.4",
       "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
@@ -17043,13 +19117,43 @@
       "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==",
       "dev": true
     },
-    "for-each": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
-      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+    "flush-write-stream": {
+      "version": "1.1.1",
+      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
-        "is-callable": "^1.1.3"
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.3.6"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
       }
     },
     "for-in": {
@@ -17058,6 +19162,12 @@
       "dev": true,
       "peer": true
     },
+    "foreach": {
+      "version": "2.0.5",
+      "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
+      "dev": true,
+      "peer": true
+    },
     "form-data": {
       "version": "3.0.1",
       "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
@@ -17077,6 +19187,45 @@
         "map-cache": "^0.2.2"
       }
     },
+    "from2": {
+      "version": "2.3.0",
+      "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
     "fs-extra": {
       "version": "9.0.1",
       "integrity": "sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==",
@@ -17088,6 +19237,47 @@
         "universalify": "^1.0.0"
       }
     },
+    "fs-write-stream-atomic": {
+      "version": "1.0.10",
+      "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "iferr": "^0.1.5",
+        "imurmurhash": "^0.1.4",
+        "readable-stream": "1 || 2"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
     "fs.realpath": {
       "version": "1.0.0",
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
@@ -17105,22 +19295,9 @@
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
       "dev": true
     },
-    "function.prototype.name": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
-      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0",
-        "functions-have-names": "^1.2.2"
-      }
-    },
-    "functions-have-names": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
-      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
+    "functional-red-black-tree": {
+      "version": "1.0.1",
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
       "dev": true
     },
     "gensync": {
@@ -17131,17 +19308,26 @@
     "get-caller-file": {
       "version": "2.0.5",
       "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "dev": true
+      "dev": true,
+      "peer": true
     },
     "get-intrinsic": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
+      "version": "1.1.1",
+      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
       "dev": true,
       "requires": {
         "function-bind": "^1.1.1",
         "has": "^1.0.3",
-        "has-symbols": "^1.0.3"
+        "has-symbols": "^1.0.1"
+      }
+    },
+    "get-orientation": {
+      "version": "1.1.2",
+      "integrity": "sha512-/pViTfifW+gBbh/RnlFYHINvELT9Znt+SYyDKAUL6uV6By019AK/s+i9XP4jSwq7lwP38Fd8HVeTxym3+hkwmQ==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "stream-parser": "^0.3.1"
       }
     },
     "get-own-enumerable-property-symbols": {
@@ -17166,7 +19352,6 @@
     },
     "get-symbol-description": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
       "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
       "dev": true,
       "requires": {
@@ -17174,12 +19359,6 @@
         "get-intrinsic": "^1.1.1"
       }
     },
-    "get-tsconfig": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.3.0.tgz",
-      "integrity": "sha512-YCcF28IqSay3fqpIu5y3Krg/utCBHBeoflkZyHj/QcqI2nrLPC3ZegS9CmIo+hJb8K7aiGsuUl7PwWVjNG2HQQ==",
-      "dev": true
-    },
     "get-value": {
       "version": "2.0.6",
       "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
@@ -17207,6 +19386,12 @@
         "is-glob": "^4.0.1"
       }
     },
+    "glob-to-regexp": {
+      "version": "0.4.1",
+      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
+      "dev": true,
+      "peer": true
+    },
     "global-modules": {
       "version": "2.0.0",
       "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
@@ -17240,21 +19425,6 @@
       "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
       "dev": true
     },
-    "globalthis": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
-      "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3"
-      }
-    },
-    "globalyzer": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/globalyzer/-/globalyzer-0.1.0.tgz",
-      "integrity": "sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==",
-      "dev": true
-    },
     "globby": {
       "version": "11.0.1",
       "integrity": "sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==",
@@ -17266,6 +19436,13 @@
         "ignore": "^5.1.4",
         "merge2": "^1.3.0",
         "slash": "^3.0.0"
+      },
+      "dependencies": {
+        "ignore": {
+          "version": "5.1.8",
+          "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
+          "dev": true
+        }
       }
     },
     "globjoin": {
@@ -17273,12 +19450,6 @@
       "integrity": "sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=",
       "dev": true
     },
-    "globrex": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz",
-      "integrity": "sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==",
-      "dev": true
-    },
     "gonzales-pe": {
       "version": "4.3.0",
       "integrity": "sha512-otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ==",
@@ -17287,26 +19458,11 @@
         "minimist": "^1.2.5"
       }
     },
-    "gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
-      "dev": true,
-      "requires": {
-        "get-intrinsic": "^1.1.3"
-      }
-    },
     "graceful-fs": {
       "version": "4.2.8",
       "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==",
       "dev": true
     },
-    "grapheme-splitter": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
-      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
-      "dev": true
-    },
     "graphql": {
       "version": "15.6.1",
       "integrity": "sha512-3i5lu0z6dRvJ48QP9kFxBkJ7h4Kso7PS8eahyTFz5Jm6CvQfLtNIE8LX9N6JLnXTuwR+sIYnXzaWp6anOg0QQw==",
@@ -17343,9 +19499,8 @@
       }
     },
     "has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+      "version": "1.0.1",
+      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
       "dev": true
     },
     "has-flag": {
@@ -17353,30 +19508,13 @@
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true
     },
-    "has-property-descriptors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
-      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
-      "dev": true,
-      "requires": {
-        "get-intrinsic": "^1.1.1"
-      }
-    },
-    "has-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
-      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
-      "dev": true
-    },
     "has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "version": "1.0.2",
+      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
       "dev": true
     },
     "has-tostringtag": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
       "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
       "dev": true,
       "requires": {
@@ -17441,11 +19579,56 @@
         }
       }
     },
+    "hash-base": {
+      "version": "3.1.0",
+      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.2.1",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+          "dev": true,
+          "peer": true
+        }
+      }
+    },
+    "hash.js": {
+      "version": "1.1.7",
+      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.1"
+      }
+    },
+    "he": {
+      "version": "1.2.0",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+      "dev": true,
+      "peer": true
+    },
+    "hmac-drbg": {
+      "version": "1.0.1",
+      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "hash.js": "^1.0.3",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
     "hosted-git-info": {
       "version": "2.8.9",
       "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "html-encoding-sniffer": {
       "version": "2.0.1",
@@ -17491,6 +19674,12 @@
         "debug": "4"
       }
     },
+    "https-browserify": {
+      "version": "1.0.0",
+      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
+      "dev": true,
+      "peer": true
+    },
     "https-proxy-agent": {
       "version": "5.0.0",
       "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
@@ -17515,12 +19704,33 @@
         "safer-buffer": ">= 2.1.2 < 3"
       }
     },
+    "ieee754": {
+      "version": "1.2.1",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "dev": true,
+      "peer": true
+    },
+    "iferr": {
+      "version": "0.1.5",
+      "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
     "ignore": {
-      "version": "5.2.4",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
-      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
+      "version": "4.0.6",
+      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
       "dev": true
     },
+    "image-size": {
+      "version": "1.0.0",
+      "integrity": "sha512-JLJ6OwBfO1KcA+TvJT+v8gbE6iWbj24LyDNFgFEN0lzegn6cC6a/p3NIDaepMsJjQjlUWqIC7wJv8lBFxPNjcw==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "queue": "6.0.2"
+      }
+    },
     "import-fresh": {
       "version": "3.3.0",
       "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
@@ -17604,6 +19814,13 @@
       "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
       "dev": true
     },
+    "infer-owner": {
+      "version": "1.0.4",
+      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
     "inflight": {
       "version": "1.0.6",
       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
@@ -17645,12 +19862,11 @@
       }
     },
     "internal-slot": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz",
-      "integrity": "sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==",
+      "version": "1.0.3",
+      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
       "dev": true,
       "requires": {
-        "get-intrinsic": "^1.1.3",
+        "get-intrinsic": "^1.1.0",
         "has": "^1.0.3",
         "side-channel": "^1.0.4"
       }
@@ -17674,12 +19890,6 @@
       "integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==",
       "dev": true
     },
-    "is-alphanumeric": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-alphanumeric/-/is-alphanumeric-1.0.0.tgz",
-      "integrity": "sha512-ZmRL7++ZkcMOfDuWZuMJyIVLr2keE1o/DeNWh1EmgqGhUcV+9BIVsx0BcSBOHTZqzjs4+dISzr2KAeBEWGgXeA==",
-      "dev": true
-    },
     "is-alphanumerical": {
       "version": "1.0.4",
       "integrity": "sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==",
@@ -17691,25 +19901,14 @@
     },
     "is-arguments": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
       "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
       "dev": true,
+      "peer": true,
       "requires": {
         "call-bind": "^1.0.2",
         "has-tostringtag": "^1.0.0"
       }
     },
-    "is-array-buffer": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.1.tgz",
-      "integrity": "sha512-ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.3",
-        "is-typed-array": "^1.1.10"
-      }
-    },
     "is-arrayish": {
       "version": "0.2.1",
       "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
@@ -17717,16 +19916,23 @@
     },
     "is-bigint": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
       "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
       "dev": true,
       "requires": {
         "has-bigints": "^1.0.1"
       }
     },
+    "is-binary-path": {
+      "version": "2.1.0",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "binary-extensions": "^2.0.0"
+      }
+    },
     "is-boolean-object": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
       "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
       "dev": true,
       "requires": {
@@ -17740,9 +19946,8 @@
       "dev": true
     },
     "is-callable": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
+      "version": "1.2.4",
+      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
       "dev": true
     },
     "is-ci": {
@@ -17754,9 +19959,8 @@
       }
     },
     "is-core-module": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
-      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
+      "version": "2.7.0",
+      "integrity": "sha512-ByY+tjCciCr+9nLryBYcSD50EOGWt95c7tIsKTG1J2ixKKXPvF7Ej3AVd+UfDydAJom3biBGDBALaO79ktwgEQ==",
       "dev": true,
       "requires": {
         "has": "^1.0.3"
@@ -17773,7 +19977,6 @@
     },
     "is-date-object": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
       "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
       "dev": true,
       "requires": {
@@ -17823,6 +20026,15 @@
       "dev": true,
       "peer": true
     },
+    "is-generator-function": {
+      "version": "1.0.10",
+      "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
+    },
     "is-glob": {
       "version": "4.0.3",
       "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
@@ -17836,16 +20048,19 @@
       "integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==",
       "dev": true
     },
-    "is-map": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz",
-      "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==",
-      "dev": true
+    "is-nan": {
+      "version": "1.3.2",
+      "integrity": "sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3"
+      }
     },
     "is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+      "version": "2.0.1",
+      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
       "dev": true
     },
     "is-number": {
@@ -17854,9 +20069,8 @@
       "dev": true
     },
     "is-number-object": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
-      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+      "version": "1.0.6",
+      "integrity": "sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==",
       "dev": true,
       "requires": {
         "has-tostringtag": "^1.0.0"
@@ -17867,12 +20081,6 @@
       "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
       "dev": true
     },
-    "is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-      "dev": true
-    },
     "is-plain-obj": {
       "version": "1.1.0",
       "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
@@ -17895,7 +20103,6 @@
     },
     "is-regex": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
       "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
       "dev": true,
       "requires": {
@@ -17908,20 +20115,10 @@
       "integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk=",
       "dev": true
     },
-    "is-set": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz",
-      "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==",
-      "dev": true
-    },
     "is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2"
-      }
+      "version": "1.0.1",
+      "integrity": "sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==",
+      "dev": true
     },
     "is-stream": {
       "version": "2.0.1",
@@ -17930,7 +20127,6 @@
     },
     "is-string": {
       "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
       "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
       "dev": true,
       "requires": {
@@ -17939,7 +20135,6 @@
     },
     "is-symbol": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
       "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
       "dev": true,
       "requires": {
@@ -17947,15 +20142,15 @@
       }
     },
     "is-typed-array": {
-      "version": "1.1.10",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz",
-      "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==",
+      "version": "1.1.8",
+      "integrity": "sha512-HqH41TNZq2fgtGT8WHVFVJhBVGuY3AnP3Q36K8JKXUxSxRgk/d+7NjmwG2vo2mYmXK8UYZKu0qH8bVP5gEisjA==",
       "dev": true,
+      "peer": true,
       "requires": {
         "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
+        "es-abstract": "^1.18.5",
+        "foreach": "^2.0.5",
         "has-tostringtag": "^1.0.0"
       }
     },
@@ -17977,49 +20172,20 @@
         "url-regex": "^5.0.0"
       }
     },
-    "is-weakmap": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz",
-      "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==",
-      "dev": true
-    },
     "is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2"
-      }
-    },
-    "is-weakset": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz",
-      "integrity": "sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==",
+      "version": "1.0.1",
+      "integrity": "sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
+        "call-bind": "^1.0.0"
       }
     },
-    "is-whitespace-character": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz",
-      "integrity": "sha512-SDweEzfIZM0SJV0EUga669UTKlmL0Pq8Lno0QDQsPnvECB3IM2aP0gdx5TrU0A01MAPfViaZiI2V1QMZLaKK5w==",
-      "dev": true
-    },
     "is-windows": {
       "version": "1.0.2",
       "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
       "dev": true,
       "peer": true
     },
-    "is-word-character": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-word-character/-/is-word-character-1.0.4.tgz",
-      "integrity": "sha512-5SMO8RVennx3nZrqtKwCGyyetPE9VDba5ugvKLaD4KopPG5kR4mQ7tNt/r7feL5yt5h3lpuBbIUmCOG2eSzXHA==",
-      "dev": true
-    },
     "is-wsl": {
       "version": "2.2.0",
       "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
@@ -18708,26 +20874,11 @@
         "supports-color": "^7.0.0"
       }
     },
-    "js-sdsl": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.2.0.tgz",
-      "integrity": "sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==",
-      "dev": true
-    },
     "js-tokens": {
       "version": "4.0.0",
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
       "dev": true
     },
-    "js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-      "dev": true,
-      "requires": {
-        "argparse": "^2.0.1"
-      }
-    },
     "jsdom": {
       "version": "16.7.0",
       "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==",
@@ -18788,14 +20939,12 @@
     },
     "json-schema-traverse": {
       "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
       "dev": true
     },
     "json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
       "dev": true
     },
     "json5": {
@@ -18823,13 +20972,12 @@
       }
     },
     "jsx-ast-utils": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.3.tgz",
-      "integrity": "sha512-fYQHZTZ8jSfmWZ0iyzfwiU4WDX4HpHbMCZ3gPlWYiCl3BoeOTsqKBqnTVfH2rYT7eP5c3sVbeSPHnnJOaTrWiw==",
+      "version": "3.2.1",
+      "integrity": "sha512-uP5vu8xfy2F9A6LGC22KO7e2/vGTS1MhP+18f++ZNlf0Ohaxbc9nIEwHAsejlJKyzfZzU5UIhe5ItYkitcZnZA==",
       "dev": true,
       "requires": {
-        "array-includes": "^3.1.5",
-        "object.assign": "^4.1.3"
+        "array-includes": "^3.1.3",
+        "object.assign": "^4.1.2"
       }
     },
     "kind-of": {
@@ -18849,15 +20997,13 @@
       "dev": true
     },
     "language-subtag-registry": {
-      "version": "0.3.22",
-      "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz",
-      "integrity": "sha512-tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w==",
+      "version": "0.3.21",
+      "integrity": "sha512-L0IqwlIXjilBVVYKFT37X9Ih11Um5NEl9cbJIuU/SwP/zEEAbBPOnEeeuxVMf45ydWQRDQN3Nqc96OgbH1K+Pg==",
       "dev": true
     },
     "language-tags": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz",
-      "integrity": "sha512-qJhlO9cGXi6hBGKoxEG/sKZDAHD5Hnu9Hs4WbOY3pCWXDhw0N8x1NenNzm2EnNLkLkk7J2SdxAkDSbb6ftT+UQ==",
+      "integrity": "sha1-0yHbxNowuovzAk4ED6XBRmH5GTo=",
       "dev": true,
       "requires": {
         "language-subtag-registry": "~0.3.2"
@@ -18871,7 +21017,6 @@
     },
     "levn": {
       "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
       "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
       "dev": true,
       "requires": {
@@ -18988,6 +21133,37 @@
         }
       }
     },
+    "loader-runner": {
+      "version": "2.4.0",
+      "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "loader-utils": {
+      "version": "1.4.0",
+      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "requires": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^1.0.1"
+      },
+      "dependencies": {
+        "json5": {
+          "version": "1.0.1",
+          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        }
+      }
+    },
     "locate-path": {
       "version": "2.0.0",
       "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
@@ -19007,11 +21183,11 @@
       "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
       "dev": true
     },
-    "lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
+    "lodash.sortby": {
+      "version": "4.7.0",
+      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=",
+      "dev": true,
+      "peer": true
     },
     "lodash.truncate": {
       "version": "4.4.2",
@@ -19115,56 +21291,20 @@
         "object-visit": "^1.0.0"
       }
     },
-    "markdown-escapes": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.4.tgz",
-      "integrity": "sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg==",
-      "dev": true
-    },
-    "markdown-table": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-2.0.0.tgz",
-      "integrity": "sha512-Ezda85ToJUBhM6WGaG6veasyym+Tbs3cMAw/ZhOPqXiYsr0jgocBV3j3nx+4lk47plLlIqjwuTm/ywVI+zjJ/A==",
-      "dev": true,
-      "requires": {
-        "repeat-string": "^1.0.0"
-      }
-    },
     "mathml-tag-names": {
       "version": "2.1.3",
       "integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==",
       "dev": true
     },
-    "mdast-util-compact": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/mdast-util-compact/-/mdast-util-compact-2.0.1.tgz",
-      "integrity": "sha512-7GlnT24gEwDrdAwEHrU4Vv5lLWrEer4KOkAiKT9nYstsTad7Oc1TwqT2zIMKRdZF7cTuaf+GA1E4Kv7jJh8mPA==",
+    "md5.js": {
+      "version": "1.3.5",
+      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
       "dev": true,
+      "peer": true,
       "requires": {
-        "unist-util-visit": "^2.0.0"
-      },
-      "dependencies": {
-        "unist-util-visit": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.3.tgz",
-          "integrity": "sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==",
-          "dev": true,
-          "requires": {
-            "@types/unist": "^2.0.0",
-            "unist-util-is": "^4.0.0",
-            "unist-util-visit-parents": "^3.0.0"
-          }
-        },
-        "unist-util-visit-parents": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz",
-          "integrity": "sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==",
-          "dev": true,
-          "requires": {
-            "@types/unist": "^2.0.0",
-            "unist-util-is": "^4.0.0"
-          }
-        }
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
       }
     },
     "mdast-util-from-markdown": {
@@ -19197,6 +21337,45 @@
       "integrity": "sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==",
       "dev": true
     },
+    "memory-fs": {
+      "version": "0.4.1",
+      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "requires": {
+        "errno": "^0.1.3",
+        "readable-stream": "^2.0.1"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
     "merge-stream": {
       "version": "2.0.0",
       "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
@@ -19225,6 +21404,24 @@
         "picomatch": "^2.2.3"
       }
     },
+    "miller-rabin": {
+      "version": "4.0.1",
+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "bn.js": "^4.0.0",
+        "brorand": "^1.0.1"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "dev": true,
+          "peer": true
+        }
+      }
+    },
     "mime-db": {
       "version": "1.50.0",
       "integrity": "sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A==",
@@ -19248,19 +21445,29 @@
       "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
       "dev": true
     },
+    "minimalistic-assert": {
+      "version": "1.0.1",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+      "dev": true,
+      "peer": true
+    },
+    "minimalistic-crypto-utils": {
+      "version": "1.0.1",
+      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
+      "dev": true,
+      "peer": true
+    },
     "minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "version": "3.0.4",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
       "dev": true,
       "requires": {
         "brace-expansion": "^1.1.7"
       }
     },
     "minimist": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",
-      "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==",
+      "version": "1.2.5",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
       "dev": true
     },
     "minimist-options": {
@@ -19273,6 +21480,25 @@
         "kind-of": "^6.0.3"
       }
     },
+    "mississippi": {
+      "version": "3.0.0",
+      "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "requires": {
+        "concat-stream": "^1.5.0",
+        "duplexify": "^3.4.2",
+        "end-of-stream": "^1.1.0",
+        "flush-write-stream": "^1.0.0",
+        "from2": "^2.1.0",
+        "parallel-transform": "^1.1.0",
+        "pump": "^3.0.0",
+        "pumpify": "^1.3.3",
+        "stream-each": "^1.1.0",
+        "through2": "^2.0.0"
+      }
+    },
     "mixin-deep": {
       "version": "1.3.2",
       "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
@@ -19294,6 +21520,43 @@
         }
       }
     },
+    "mkdirp": {
+      "version": "0.5.5",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "requires": {
+        "minimist": "^1.2.5"
+      }
+    },
+    "move-concurrently": {
+      "version": "1.0.1",
+      "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "requires": {
+        "aproba": "^1.1.1",
+        "copy-concurrently": "^1.0.0",
+        "fs-write-stream-atomic": "^1.0.8",
+        "mkdirp": "^0.5.1",
+        "rimraf": "^2.5.4",
+        "run-queue": "^1.0.3"
+      },
+      "dependencies": {
+        "rimraf": {
+          "version": "2.7.1",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
+      }
+    },
     "ms": {
       "version": "2.1.2",
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
@@ -19304,11 +21567,18 @@
       "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
       "dev": true
     },
+    "nan": {
+      "version": "2.15.0",
+      "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
     "nanoid": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
-      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
-      "dev": true
+      "version": "3.1.29",
+      "integrity": "sha512-dW2pUSGZ8ZnCFIlBIA31SV8huOGCHb6OwzVCc7A69rb/a+SgPBwfmLvK5TKQ3INPbRkcI8a/Owo0XbiTNH19wg==",
+      "dev": true,
+      "peer": true
     },
     "nanomatch": {
       "version": "1.2.13",
@@ -19350,42 +21620,214 @@
         }
       }
     },
+    "native-url": {
+      "version": "0.3.4",
+      "integrity": "sha512-6iM8R99ze45ivyH8vybJ7X0yekIcPf5GgLV5K0ENCbmRcaRIDoj37BC8iLEmaaBfqqb8enuZ5p0uhY+lVAbAcA==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "querystring": "^0.2.0"
+      }
+    },
     "natural-compare": {
       "version": "1.4.0",
       "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
       "dev": true
     },
-    "natural-compare-lite": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz",
-      "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==",
-      "dev": true
+    "neo-async": {
+      "version": "2.6.2",
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "next": {
-      "version": "12.3.1",
-      "resolved": "https://registry.npmjs.org/next/-/next-12.3.1.tgz",
-      "integrity": "sha512-l7bvmSeIwX5lp07WtIiP9u2ytZMv7jIeB8iacR28PuUEFG5j0HGAPnMqyG5kbZNBG2H7tRsrQ4HCjuMOPnANZw==",
-      "dev": true,
-      "requires": {
-        "@next/env": "12.3.1",
-        "@next/swc-android-arm-eabi": "12.3.1",
-        "@next/swc-android-arm64": "12.3.1",
-        "@next/swc-darwin-arm64": "12.3.1",
-        "@next/swc-darwin-x64": "12.3.1",
-        "@next/swc-freebsd-x64": "12.3.1",
-        "@next/swc-linux-arm-gnueabihf": "12.3.1",
-        "@next/swc-linux-arm64-gnu": "12.3.1",
-        "@next/swc-linux-arm64-musl": "12.3.1",
-        "@next/swc-linux-x64-gnu": "12.3.1",
-        "@next/swc-linux-x64-musl": "12.3.1",
-        "@next/swc-win32-arm64-msvc": "12.3.1",
-        "@next/swc-win32-ia32-msvc": "12.3.1",
-        "@next/swc-win32-x64-msvc": "12.3.1",
-        "@swc/helpers": "0.4.11",
-        "caniuse-lite": "^1.0.30001406",
-        "postcss": "8.4.14",
-        "styled-jsx": "5.0.7",
-        "use-sync-external-store": "1.2.0"
+      "version": "11.1.2",
+      "integrity": "sha512-azEYL0L+wFjv8lstLru3bgvrzPvK0P7/bz6B/4EJ9sYkXeW8r5Bjh78D/Ol7VOg0EIPz0CXoe72hzAlSAXo9hw==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "@babel/runtime": "7.15.3",
+        "@hapi/accept": "5.0.2",
+        "@next/env": "11.1.2",
+        "@next/polyfill-module": "11.1.2",
+        "@next/react-dev-overlay": "11.1.2",
+        "@next/react-refresh-utils": "11.1.2",
+        "@next/swc-darwin-arm64": "11.1.2",
+        "@next/swc-darwin-x64": "11.1.2",
+        "@next/swc-linux-x64-gnu": "11.1.2",
+        "@next/swc-win32-x64-msvc": "11.1.2",
+        "@node-rs/helper": "1.2.1",
+        "assert": "2.0.0",
+        "ast-types": "0.13.2",
+        "browserify-zlib": "0.2.0",
+        "browserslist": "4.16.6",
+        "buffer": "5.6.0",
+        "caniuse-lite": "^1.0.30001228",
+        "chalk": "2.4.2",
+        "chokidar": "3.5.1",
+        "constants-browserify": "1.0.0",
+        "crypto-browserify": "3.12.0",
+        "cssnano-simple": "3.0.0",
+        "domain-browser": "4.19.0",
+        "encoding": "0.1.13",
+        "etag": "1.8.1",
+        "find-cache-dir": "3.3.1",
+        "get-orientation": "1.1.2",
+        "https-browserify": "1.0.0",
+        "image-size": "1.0.0",
+        "jest-worker": "27.0.0-next.5",
+        "native-url": "0.3.4",
+        "node-fetch": "2.6.1",
+        "node-html-parser": "1.4.9",
+        "node-libs-browser": "^2.2.1",
+        "os-browserify": "0.3.0",
+        "p-limit": "3.1.0",
+        "path-browserify": "1.0.1",
+        "pnp-webpack-plugin": "1.6.4",
+        "postcss": "8.2.15",
+        "process": "0.11.10",
+        "querystring-es3": "0.2.1",
+        "raw-body": "2.4.1",
+        "react-is": "17.0.2",
+        "react-refresh": "0.8.3",
+        "stream-browserify": "3.0.0",
+        "stream-http": "3.1.1",
+        "string_decoder": "1.3.0",
+        "styled-jsx": "4.0.1",
+        "timers-browserify": "2.0.12",
+        "tty-browserify": "0.0.1",
+        "use-subscription": "1.5.1",
+        "util": "0.12.4",
+        "vm-browserify": "1.1.2",
+        "watchpack": "2.1.1"
+      },
+      "dependencies": {
+        "@babel/runtime": {
+          "version": "7.15.3",
+          "integrity": "sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "regenerator-runtime": "^0.13.4"
+          }
+        },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "browserslist": {
+          "version": "4.16.6",
+          "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "caniuse-lite": "^1.0.30001219",
+            "colorette": "^1.2.2",
+            "electron-to-chromium": "^1.3.723",
+            "escalade": "^3.1.1",
+            "node-releases": "^1.1.71"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "color-convert": {
+          "version": "1.9.3",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+          "dev": true,
+          "peer": true
+        },
+        "jest-worker": {
+          "version": "27.0.0-next.5",
+          "integrity": "sha512-mk0umAQ5lT+CaOJ+Qp01N6kz48sJG2kr2n1rX0koqKf6FIygQV0qLOdN9SCYID4IVeSigDOcPeGLozdMLYfb5g==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "@types/node": "*",
+            "merge-stream": "^2.0.0",
+            "supports-color": "^8.0.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "8.1.1",
+              "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+              "dev": true,
+              "peer": true,
+              "requires": {
+                "has-flag": "^4.0.0"
+              }
+            }
+          }
+        },
+        "node-fetch": {
+          "version": "2.6.1",
+          "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
+          "dev": true,
+          "peer": true
+        },
+        "postcss": {
+          "version": "8.2.15",
+          "integrity": "sha512-2zO3b26eJD/8rb106Qu2o7Qgg52ND5HPjcyQiK2B98O388h43A448LCslC0dI2P97wCAQRJsFvwTRcXxTKds+Q==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "colorette": "^1.2.2",
+            "nanoid": "^3.1.23",
+            "source-map": "^0.6.1"
+          }
+        },
+        "react-is": {
+          "version": "17.0.2",
+          "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
+          "dev": true,
+          "peer": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true,
+          "peer": true
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          },
+          "dependencies": {
+            "has-flag": {
+              "version": "3.0.0",
+              "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+              "dev": true,
+              "peer": true
+            }
+          }
+        }
       }
     },
     "nice-try": {
@@ -19394,12 +21836,172 @@
       "dev": true,
       "peer": true
     },
+    "node-html-parser": {
+      "version": "1.4.9",
+      "integrity": "sha512-UVcirFD1Bn0O+TSmloHeHqZZCxHjvtIeGdVdGMhyZ8/PWlEiZaZ5iJzR189yKZr8p0FXN58BUeC7RHRkf/KYGw==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "he": "1.2.0"
+      }
+    },
     "node-int64": {
       "version": "0.4.0",
       "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
       "dev": true,
       "peer": true
     },
+    "node-libs-browser": {
+      "version": "2.2.1",
+      "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "assert": "^1.1.1",
+        "browserify-zlib": "^0.2.0",
+        "buffer": "^4.3.0",
+        "console-browserify": "^1.1.0",
+        "constants-browserify": "^1.0.0",
+        "crypto-browserify": "^3.11.0",
+        "domain-browser": "^1.1.1",
+        "events": "^3.0.0",
+        "https-browserify": "^1.0.0",
+        "os-browserify": "^0.3.0",
+        "path-browserify": "0.0.1",
+        "process": "^0.11.10",
+        "punycode": "^1.2.4",
+        "querystring-es3": "^0.2.0",
+        "readable-stream": "^2.3.3",
+        "stream-browserify": "^2.0.1",
+        "stream-http": "^2.7.2",
+        "string_decoder": "^1.0.0",
+        "timers-browserify": "^2.0.4",
+        "tty-browserify": "0.0.0",
+        "url": "^0.11.0",
+        "util": "^0.11.0",
+        "vm-browserify": "^1.0.1"
+      },
+      "dependencies": {
+        "assert": {
+          "version": "1.5.0",
+          "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "object-assign": "^4.1.1",
+            "util": "0.10.3"
+          },
+          "dependencies": {
+            "inherits": {
+              "version": "2.0.1",
+              "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
+              "dev": true,
+              "peer": true
+            },
+            "util": {
+              "version": "0.10.3",
+              "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+              "dev": true,
+              "peer": true,
+              "requires": {
+                "inherits": "2.0.1"
+              }
+            }
+          }
+        },
+        "buffer": {
+          "version": "4.9.2",
+          "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "base64-js": "^1.0.2",
+            "ieee754": "^1.1.4",
+            "isarray": "^1.0.0"
+          }
+        },
+        "domain-browser": {
+          "version": "1.2.0",
+          "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
+          "dev": true,
+          "peer": true
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+          "dev": true,
+          "peer": true
+        },
+        "path-browserify": {
+          "version": "0.0.1",
+          "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
+          "dev": true,
+          "peer": true
+        },
+        "readable-stream": {
+          "version": "2.3.7",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "stream-browserify": {
+          "version": "2.0.2",
+          "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "inherits": "~2.0.1",
+            "readable-stream": "^2.0.2"
+          }
+        },
+        "stream-http": {
+          "version": "2.8.3",
+          "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "builtin-status-codes": "^3.0.0",
+            "inherits": "^2.0.1",
+            "readable-stream": "^2.3.6",
+            "to-arraybuffer": "^1.0.0",
+            "xtend": "^4.0.0"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        },
+        "tty-browserify": {
+          "version": "0.0.0",
+          "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
+          "dev": true,
+          "peer": true
+        },
+        "util": {
+          "version": "0.11.1",
+          "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "inherits": "2.0.3"
+          }
+        }
+      }
+    },
     "node-modules-regexp": {
       "version": "1.0.0",
       "integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=",
@@ -19430,7 +22032,6 @@
       "version": "2.5.0",
       "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
       "dev": true,
-      "peer": true,
       "requires": {
         "hosted-git-info": "^2.1.4",
         "resolve": "^1.10.0",
@@ -19441,8 +22042,7 @@
         "semver": {
           "version": "5.7.1",
           "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-          "dev": true,
-          "peer": true
+          "dev": true
         }
       }
     },
@@ -19482,8 +22082,7 @@
     },
     "object-assign": {
       "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
       "dev": true
     },
     "object-copy": {
@@ -19561,16 +22160,15 @@
       }
     },
     "object-inspect": {
-      "version": "1.12.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
+      "version": "1.11.0",
+      "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==",
       "dev": true
     },
     "object-is": {
       "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
       "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
       "dev": true,
+      "peer": true,
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3"
@@ -19578,7 +22176,6 @@
     },
     "object-keys": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
       "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
       "dev": true
     },
@@ -19592,47 +22189,43 @@
       }
     },
     "object.assign": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
+      "version": "4.1.2",
+      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "has-symbols": "^1.0.3",
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3",
+        "has-symbols": "^1.0.1",
         "object-keys": "^1.1.1"
       }
     },
     "object.entries": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz",
-      "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==",
+      "version": "1.1.5",
+      "integrity": "sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1"
       }
     },
     "object.fromentries": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz",
-      "integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==",
+      "version": "2.0.5",
+      "integrity": "sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1"
       }
     },
     "object.hasown": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.2.tgz",
-      "integrity": "sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==",
+      "version": "1.1.0",
+      "integrity": "sha512-MhjYRfj3GBlhSkDHo6QmvgjRLXQ2zndabdf3nX0yTyZK9rPfxb6uRpAac8HXNLy1GpqWtZ81Qh4v3uOls2sRAg==",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1"
       }
     },
     "object.pick": {
@@ -19645,14 +22238,13 @@
       }
     },
     "object.values": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
-      "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==",
+      "version": "1.1.5",
+      "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1"
       }
     },
     "once": {
@@ -19682,7 +22274,6 @@
     },
     "optionator": {
       "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
       "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
       "dev": true,
       "requires": {
@@ -19694,6 +22285,12 @@
         "word-wrap": "^1.2.3"
       }
     },
+    "os-browserify": {
+      "version": "0.3.0",
+      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
+      "dev": true,
+      "peer": true
+    },
     "os-tmpdir": {
       "version": "1.0.2",
       "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
@@ -19713,9 +22310,9 @@
     },
     "p-limit": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
       "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
       "dev": true,
+      "peer": true,
       "requires": {
         "yocto-queue": "^0.1.0"
       }
@@ -19756,6 +22353,52 @@
       "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
       "dev": true
     },
+    "pako": {
+      "version": "1.0.11",
+      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
+      "dev": true,
+      "peer": true
+    },
+    "parallel-transform": {
+      "version": "1.2.0",
+      "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "requires": {
+        "cyclist": "^1.0.1",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.1.5"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
     "parent-module": {
       "version": "1.0.1",
       "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
@@ -19764,6 +22407,19 @@
         "callsites": "^3.0.0"
       }
     },
+    "parse-asn1": {
+      "version": "5.1.6",
+      "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "asn1.js": "^5.2.0",
+        "browserify-aes": "^1.0.0",
+        "evp_bytestokey": "^1.0.0",
+        "pbkdf2": "^3.0.3",
+        "safe-buffer": "^5.1.1"
+      }
+    },
     "parse-entities": {
       "version": "2.0.0",
       "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==",
@@ -19800,6 +22456,19 @@
       "dev": true,
       "peer": true
     },
+    "path-browserify": {
+      "version": "1.0.1",
+      "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==",
+      "dev": true,
+      "peer": true
+    },
+    "path-dirname": {
+      "version": "1.0.2",
+      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
     "path-exists": {
       "version": "3.0.0",
       "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
@@ -19825,6 +22494,19 @@
       "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
       "dev": true
     },
+    "pbkdf2": {
+      "version": "3.1.2",
+      "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4",
+        "ripemd160": "^2.0.1",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
     "picocolors": {
       "version": "0.2.1",
       "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
@@ -19835,6 +22517,13 @@
       "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
       "dev": true
     },
+    "pify": {
+      "version": "4.0.1",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
     "pirates": {
       "version": "4.0.1",
       "integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==",
@@ -19853,6 +22542,28 @@
         "load-json-file": "^4.0.0"
       }
     },
+    "pkg-dir": {
+      "version": "2.0.0",
+      "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
+      "dev": true,
+      "requires": {
+        "find-up": "^2.1.0"
+      }
+    },
+    "pkg-up": {
+      "version": "2.0.0",
+      "integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=",
+      "dev": true,
+      "requires": {
+        "find-up": "^2.1.0"
+      }
+    },
+    "platform": {
+      "version": "1.3.6",
+      "integrity": "sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg==",
+      "dev": true,
+      "peer": true
+    },
     "please-upgrade-node": {
       "version": "3.2.0",
       "integrity": "sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==",
@@ -19861,6 +22572,15 @@
         "semver-compare": "^1.0.0"
       }
     },
+    "pnp-webpack-plugin": {
+      "version": "1.6.4",
+      "integrity": "sha512-7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "ts-pnp": "^1.1.6"
+      }
+    },
     "posix-character-classes": {
       "version": "0.1.1",
       "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
@@ -19868,22 +22588,14 @@
       "peer": true
     },
     "postcss": {
-      "version": "8.4.14",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz",
-      "integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==",
+      "version": "8.3.9",
+      "integrity": "sha512-f/ZFyAKh9Dnqytx5X62jgjhhzttjZS7hMsohcI7HEI5tjELX/HxCy3EFhsRxyzGvrzFF+82XPvCS8T9TFleVJw==",
       "dev": true,
+      "peer": true,
       "requires": {
-        "nanoid": "^3.3.4",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.2"
-      },
-      "dependencies": {
-        "picocolors": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-          "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
-          "dev": true
-        }
+        "nanoid": "^3.1.28",
+        "picocolors": "^0.2.1",
+        "source-map-js": "^0.6.2"
       }
     },
     "postcss-html": {
@@ -20075,7 +22787,6 @@
     },
     "prelude-ls": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
       "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
       "dev": true
     },
@@ -20087,7 +22798,6 @@
     },
     "prettier-linter-helpers": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz",
       "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==",
       "dev": true,
       "requires": {
@@ -20114,6 +22824,30 @@
         }
       }
     },
+    "process": {
+      "version": "0.11.10",
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
+      "dev": true,
+      "peer": true
+    },
+    "process-nextick-args": {
+      "version": "2.0.1",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "dev": true,
+      "peer": true
+    },
+    "progress": {
+      "version": "2.0.3",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+      "dev": true
+    },
+    "promise-inflight": {
+      "version": "1.0.1",
+      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
     "prompts": {
       "version": "2.4.2",
       "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
@@ -20125,22 +22859,50 @@
       }
     },
     "prop-types": {
-      "version": "15.8.1",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
-      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
+      "version": "15.7.2",
+      "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
       "dev": true,
       "requires": {
         "loose-envify": "^1.4.0",
         "object-assign": "^4.1.1",
-        "react-is": "^16.13.1"
+        "react-is": "^16.8.1"
       }
     },
+    "prr": {
+      "version": "1.0.1",
+      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
     "psl": {
       "version": "1.8.0",
       "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
       "dev": true,
       "peer": true
     },
+    "public-encrypt": {
+      "version": "4.0.3",
+      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "parse-asn1": "^5.0.0",
+        "randombytes": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "dev": true,
+          "peer": true
+        }
+      }
+    },
     "pump": {
       "version": "3.0.0",
       "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
@@ -20151,6 +22913,58 @@
         "once": "^1.3.1"
       }
     },
+    "pumpify": {
+      "version": "1.5.1",
+      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "requires": {
+        "duplexify": "^3.6.0",
+        "inherits": "^2.0.3",
+        "pump": "^2.0.0"
+      },
+      "dependencies": {
+        "pump": {
+          "version": "2.0.1",
+          "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
+          }
+        }
+      }
+    },
+    "punycode": {
+      "version": "1.4.1",
+      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+      "dev": true,
+      "peer": true
+    },
+    "querystring": {
+      "version": "0.2.1",
+      "integrity": "sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg==",
+      "dev": true,
+      "peer": true
+    },
+    "querystring-es3": {
+      "version": "0.2.1",
+      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
+      "dev": true,
+      "peer": true
+    },
+    "queue": {
+      "version": "6.0.2",
+      "integrity": "sha512-iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "inherits": "~2.0.3"
+      }
+    },
     "queue-microtask": {
       "version": "1.2.3",
       "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
@@ -20161,33 +22975,118 @@
       "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
       "dev": true
     },
+    "randombytes": {
+      "version": "2.1.0",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "randomfill": {
+      "version": "1.0.4",
+      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "randombytes": "^2.0.5",
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "raw-body": {
+      "version": "2.4.1",
+      "integrity": "sha512-9WmIKF6mkvA0SLmA2Knm9+qj89e+j1zqgyn8aXGd7+nAduPoqgI9lO57SAZNn/Byzo5P7JhXTyg9PzaJbH73bA==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "bytes": "3.1.0",
+        "http-errors": "1.7.3",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
+      },
+      "dependencies": {
+        "http-errors": {
+          "version": "1.7.3",
+          "integrity": "sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "depd": "~1.1.2",
+            "inherits": "2.0.4",
+            "setprototypeof": "1.1.1",
+            "statuses": ">= 1.5.0 < 2",
+            "toidentifier": "1.0.0"
+          }
+        }
+      }
+    },
     "react": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz",
-      "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==",
+      "version": "17.0.2",
+      "integrity": "sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==",
       "dev": true,
       "peer": true,
       "requires": {
-        "loose-envify": "^1.1.0"
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1"
       }
     },
     "react-dom": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",
-      "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==",
+      "version": "17.0.2",
+      "integrity": "sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==",
       "dev": true,
       "peer": true,
       "requires": {
         "loose-envify": "^1.1.0",
-        "scheduler": "^0.23.0"
+        "object-assign": "^4.1.1",
+        "scheduler": "^0.20.2"
       }
     },
     "react-is": {
       "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
       "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
       "dev": true
     },
+    "react-refresh": {
+      "version": "0.8.3",
+      "integrity": "sha512-X8jZHc7nCMjaCqoU+V2I0cOhNW+QMBwSUkeXnTi8IPe6zaRWfn60ZzvFDZqWPfmSJfjub7dDW1SP0jaHWLu/hg==",
+      "dev": true,
+      "peer": true
+    },
+    "read-pkg": {
+      "version": "3.0.0",
+      "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
+      "dev": true,
+      "requires": {
+        "load-json-file": "^4.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^3.0.0"
+      },
+      "dependencies": {
+        "path-type": {
+          "version": "3.0.0",
+          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+          "dev": true,
+          "requires": {
+            "pify": "^3.0.0"
+          }
+        },
+        "pify": {
+          "version": "3.0.0",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "dev": true
+        }
+      }
+    },
+    "read-pkg-up": {
+      "version": "3.0.0",
+      "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
+      "dev": true,
+      "requires": {
+        "find-up": "^2.0.0",
+        "read-pkg": "^3.0.0"
+      }
+    },
     "readable-stream": {
       "version": "3.6.0",
       "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
@@ -20207,9 +23106,8 @@
       }
     },
     "regenerator-runtime": {
-      "version": "0.13.11",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
-      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==",
+      "version": "0.13.9",
+      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
       "dev": true
     },
     "regex-not": {
@@ -20244,19 +23142,16 @@
       }
     },
     "regexp.prototype.flags": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
+      "version": "1.3.1",
+      "integrity": "sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "functions-have-names": "^1.2.2"
+        "define-properties": "^1.1.3"
       }
     },
     "regexpp": {
       "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
       "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
       "dev": true
     },
@@ -20280,84 +23175,6 @@
         }
       }
     },
-    "remark-mdx": {
-      "version": "1.6.22",
-      "resolved": "https://registry.npmjs.org/remark-mdx/-/remark-mdx-1.6.22.tgz",
-      "integrity": "sha512-phMHBJgeV76uyFkH4rvzCftLfKCr2RZuF+/gmVcaKrpsihyzmhXjA0BEMDaPTXG5y8qZOKPVo83NAOX01LPnOQ==",
-      "dev": true,
-      "requires": {
-        "@babel/core": "7.12.9",
-        "@babel/helper-plugin-utils": "7.10.4",
-        "@babel/plugin-proposal-object-rest-spread": "7.12.1",
-        "@babel/plugin-syntax-jsx": "7.12.1",
-        "@mdx-js/util": "1.6.22",
-        "is-alphabetical": "1.0.4",
-        "remark-parse": "8.0.3",
-        "unified": "9.2.0"
-      },
-      "dependencies": {
-        "@babel/core": {
-          "version": "7.12.9",
-          "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.12.9.tgz",
-          "integrity": "sha512-gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.10.4",
-            "@babel/generator": "^7.12.5",
-            "@babel/helper-module-transforms": "^7.12.1",
-            "@babel/helpers": "^7.12.5",
-            "@babel/parser": "^7.12.7",
-            "@babel/template": "^7.12.7",
-            "@babel/traverse": "^7.12.9",
-            "@babel/types": "^7.12.7",
-            "convert-source-map": "^1.7.0",
-            "debug": "^4.1.0",
-            "gensync": "^1.0.0-beta.1",
-            "json5": "^2.1.2",
-            "lodash": "^4.17.19",
-            "resolve": "^1.3.2",
-            "semver": "^5.4.1",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-          "dev": true
-        },
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-          "dev": true
-        }
-      }
-    },
-    "remark-parse": {
-      "version": "8.0.3",
-      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-8.0.3.tgz",
-      "integrity": "sha512-E1K9+QLGgggHxCQtLt++uXltxEprmWzNfg+MxpfHsZlrddKzZ/hZyWHDbK3/Ap8HJQqYJRXP+jHczdL6q6i85Q==",
-      "dev": true,
-      "requires": {
-        "ccount": "^1.0.0",
-        "collapse-white-space": "^1.0.2",
-        "is-alphabetical": "^1.0.0",
-        "is-decimal": "^1.0.0",
-        "is-whitespace-character": "^1.0.0",
-        "is-word-character": "^1.0.0",
-        "markdown-escapes": "^1.0.0",
-        "parse-entities": "^2.0.0",
-        "repeat-string": "^1.5.4",
-        "state-toggle": "^1.0.0",
-        "trim": "0.0.1",
-        "trim-trailing-lines": "^1.0.0",
-        "unherit": "^1.0.4",
-        "unist-util-remove-position": "^2.0.0",
-        "vfile-location": "^3.0.0",
-        "xtend": "^4.0.1"
-      }
-    },
     "remark-stringify": {
       "version": "9.0.1",
       "integrity": "sha512-mWmNg3ZtESvZS8fv5PTvaPckdL4iNlCHTt8/e/8oN08nArHRHjNZMKzA/YW3+p7/lYqIw4nx1XsjCBo/AxNChg==",
@@ -20386,7 +23203,8 @@
     "require-directory": {
       "version": "2.1.1",
       "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
-      "dev": true
+      "dev": true,
+      "peer": true
     },
     "require-from-string": {
       "version": "2.0.2",
@@ -20464,6 +23282,16 @@
         "glob": "^7.1.3"
       }
     },
+    "ripemd160": {
+      "version": "2.0.2",
+      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
+      }
+    },
     "rivet-graphql": {
       "version": "0.3.1",
       "integrity": "sha512-HEov02XhZ6H1jOME+mO8CZwliu/UtgZSHixYUwvQ7HSx3gk8EOVaQY5c3zscOYjZECvP8cR4+1Ob3KHWJRWEMw==",
@@ -20492,6 +23320,16 @@
         "queue-microtask": "^1.2.2"
       }
     },
+    "run-queue": {
+      "version": "1.0.3",
+      "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "requires": {
+        "aproba": "^1.1.1"
+      }
+    },
     "rxjs": {
       "version": "6.6.7",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
@@ -20523,17 +23361,6 @@
         "ret": "~0.1.10"
       }
     },
-    "safe-regex-test": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
-      "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.3",
-        "is-regex": "^1.1.4"
-      }
-    },
     "safer-buffer": {
       "version": "2.1.2",
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
@@ -20783,13 +23610,25 @@
       }
     },
     "scheduler": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz",
-      "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==",
+      "version": "0.20.2",
+      "integrity": "sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1"
+      }
+    },
+    "schema-utils": {
+      "version": "1.0.0",
+      "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
       "dev": true,
+      "optional": true,
       "peer": true,
       "requires": {
-        "loose-envify": "^1.1.0"
+        "ajv": "^6.1.0",
+        "ajv-errors": "^1.0.0",
+        "ajv-keywords": "^3.1.0"
       }
     },
     "semver": {
@@ -20805,6 +23644,16 @@
       "integrity": "sha1-De4hahyUGrN+nvsXiPavxf9VN/w=",
       "dev": true
     },
+    "serialize-javascript": {
+      "version": "4.0.0",
+      "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "requires": {
+        "randombytes": "^2.1.0"
+      }
+    },
     "set-blocking": {
       "version": "2.0.0",
       "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
@@ -20823,6 +23672,28 @@
         "split-string": "^3.0.1"
       }
     },
+    "setimmediate": {
+      "version": "1.0.5",
+      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
+      "dev": true,
+      "peer": true
+    },
+    "setprototypeof": {
+      "version": "1.1.1",
+      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==",
+      "dev": true,
+      "peer": true
+    },
+    "sha.js": {
+      "version": "2.4.11",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
     "shebang-command": {
       "version": "2.0.0",
       "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
@@ -20836,6 +23707,12 @@
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
       "dev": true
     },
+    "shell-quote": {
+      "version": "1.7.2",
+      "integrity": "sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==",
+      "dev": true,
+      "peer": true
+    },
     "shellwords": {
       "version": "0.1.1",
       "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==",
@@ -20845,7 +23722,6 @@
     },
     "side-channel": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
       "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
       "dev": true,
       "requires": {
@@ -21107,16 +23983,23 @@
         }
       }
     },
+    "source-list-map": {
+      "version": "2.0.1",
+      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
     "source-map": {
       "version": "0.5.7",
       "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
       "dev": true
     },
     "source-map-js": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
-      "dev": true
+      "version": "0.6.2",
+      "integrity": "sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==",
+      "dev": true,
+      "peer": true
     },
     "source-map-resolve": {
       "version": "0.5.3",
@@ -21221,8 +24104,17 @@
     "sprintf-js": {
       "version": "1.0.3",
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+      "dev": true
+    },
+    "ssri": {
+      "version": "6.0.2",
+      "integrity": "sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==",
       "dev": true,
-      "peer": true
+      "optional": true,
+      "peer": true,
+      "requires": {
+        "figgy-pudding": "^3.5.1"
+      }
     },
     "stack-utils": {
       "version": "2.0.5",
@@ -21241,11 +24133,22 @@
         }
       }
     },
-    "state-toggle": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.3.tgz",
-      "integrity": "sha512-d/5Z4/2iiCnHw6Xzghyhb+GcmF89bxwgXG60wjIiZaxnymbyOmI8Hk4VqHXiVVp6u2ysaskFfXg3ekCj4WNftQ==",
-      "dev": true
+    "stacktrace-parser": {
+      "version": "0.1.10",
+      "integrity": "sha512-KJP1OCML99+8fhOHxwwzyWrlUuVX5GQ0ZpJTd1DFXhdkrvg1szxfHhawXUZ3g9TkXORQd4/WG68jMlQZ2p8wlg==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "type-fest": "^0.7.1"
+      },
+      "dependencies": {
+        "type-fest": {
+          "version": "0.7.1",
+          "integrity": "sha512-Ne2YiiGN8bmrmJJEuTWTLJR32nh/JdL1+PSicowtNb0WFpn59GK8/lfD61bVtzguz7b3PBt74nxpv/Pw5po5Rg==",
+          "dev": true,
+          "peer": true
+        }
+      }
     },
     "static-extend": {
       "version": "0.1.2",
@@ -21331,15 +24234,78 @@
         }
       }
     },
-    "stop-iteration-iterator": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz",
-      "integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==",
+    "statuses": {
+      "version": "1.5.0",
+      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
+      "dev": true,
+      "peer": true
+    },
+    "stream-browserify": {
+      "version": "3.0.0",
+      "integrity": "sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "inherits": "~2.0.4",
+        "readable-stream": "^3.5.0"
+      }
+    },
+    "stream-each": {
+      "version": "1.2.3",
+      "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "stream-shift": "^1.0.0"
+      }
+    },
+    "stream-http": {
+      "version": "3.1.1",
+      "integrity": "sha512-S7OqaYu0EkFpgeGFb/NPOoPLxFko7TPqtEeFg5DXPB4v/KETHG0Ln6fRFrNezoelpaDKmycEmmZ81cC9DAwgYg==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "builtin-status-codes": "^3.0.0",
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.6.0",
+        "xtend": "^4.0.2"
+      }
+    },
+    "stream-parser": {
+      "version": "0.3.1",
+      "integrity": "sha1-FhhUhpRCACGhGC/wrxkRwSl2F3M=",
       "dev": true,
+      "peer": true,
       "requires": {
-        "internal-slot": "^1.0.4"
+        "debug": "2"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true,
+          "peer": true
+        }
       }
     },
+    "stream-shift": {
+      "version": "1.0.1",
+      "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
     "string_decoder": {
       "version": "1.3.0",
       "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
@@ -21360,6 +24326,12 @@
       "integrity": "sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==",
       "dev": true
     },
+    "string-hash": {
+      "version": "1.1.3",
+      "integrity": "sha1-6Kr8CsGFW0Zmkp7X3RJ1311sgRs=",
+      "dev": true,
+      "peer": true
+    },
     "string-length": {
       "version": "4.0.2",
       "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
@@ -21388,52 +24360,36 @@
       }
     },
     "string.prototype.matchall": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz",
-      "integrity": "sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==",
+      "version": "4.0.6",
+      "integrity": "sha512-6WgDX8HmQqvEd7J+G6VtAahhsQIssiZ8zl7zKh1VDMFyL3hRTJP4FTNA3RbIp2TOQ9AYNDcc7e3fH0Qbup+DBg==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "get-intrinsic": "^1.1.3",
-        "has-symbols": "^1.0.3",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1",
+        "get-intrinsic": "^1.1.1",
+        "has-symbols": "^1.0.2",
         "internal-slot": "^1.0.3",
-        "regexp.prototype.flags": "^1.4.3",
+        "regexp.prototype.flags": "^1.3.1",
         "side-channel": "^1.0.4"
       }
     },
     "string.prototype.trimend": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
-      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
+      "version": "1.0.4",
+      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "define-properties": "^1.1.3"
       }
     },
     "string.prototype.trimstart": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
-      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
+      "version": "1.0.4",
+      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      }
-    },
-    "stringify-entities": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-3.1.0.tgz",
-      "integrity": "sha512-3FP+jGMmMV/ffZs86MoghGqAoqXAdxLrJP4GUdrDN1aIScYih5tuIO3eF4To5AJZ79KDZ8Fpdy7QJnK8SsL1Vg==",
-      "dev": true,
-      "requires": {
-        "character-entities-html4": "^1.0.0",
-        "character-entities-legacy": "^1.0.0",
-        "xtend": "^4.0.0"
+        "define-properties": "^1.1.3"
       }
     },
     "stringify-object": {
@@ -21473,7 +24429,6 @@
     },
     "strip-json-comments": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
       "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
       "dev": true
     },
@@ -21483,11 +24438,82 @@
       "dev": true
     },
     "styled-jsx": {
-      "version": "5.0.7",
-      "resolved": "https://registry.npmjs.org/styled-jsx/-/styled-jsx-5.0.7.tgz",
-      "integrity": "sha512-b3sUzamS086YLRuvnaDigdAewz1/EFYlHpYBP5mZovKEdQQOIIYq8lApylub3HHZ6xFjV051kkGU7cudJmrXEA==",
+      "version": "4.0.1",
+      "integrity": "sha512-Gcb49/dRB1k8B4hdK8vhW27Rlb2zujCk1fISrizCcToIs+55B4vmUM0N9Gi4nnVfFZWe55jRdWpAqH1ldAKWvQ==",
       "dev": true,
-      "requires": {}
+      "peer": true,
+      "requires": {
+        "@babel/plugin-syntax-jsx": "7.14.5",
+        "@babel/types": "7.15.0",
+        "convert-source-map": "1.7.0",
+        "loader-utils": "1.2.3",
+        "source-map": "0.7.3",
+        "string-hash": "1.1.3",
+        "stylis": "3.5.4",
+        "stylis-rule-sheet": "0.0.10"
+      },
+      "dependencies": {
+        "@babel/plugin-syntax-jsx": {
+          "version": "7.14.5",
+          "integrity": "sha512-ohuFIsOMXJnbOMRfX7/w7LocdR6R7whhuRD4ax8IipLcLPlZGJKkBxgHp++U4N/vKyU16/YDQr2f5seajD3jIw==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "@babel/helper-plugin-utils": "^7.14.5"
+          }
+        },
+        "@babel/types": {
+          "version": "7.15.0",
+          "integrity": "sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.14.9",
+            "to-fast-properties": "^2.0.0"
+          }
+        },
+        "convert-source-map": {
+          "version": "1.7.0",
+          "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "safe-buffer": "~5.1.1"
+          }
+        },
+        "emojis-list": {
+          "version": "2.1.0",
+          "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
+          "dev": true,
+          "peer": true
+        },
+        "json5": {
+          "version": "1.0.1",
+          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        },
+        "loader-utils": {
+          "version": "1.2.3",
+          "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^2.0.0",
+            "json5": "^1.0.1"
+          }
+        },
+        "source-map": {
+          "version": "0.7.3",
+          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+          "dev": true,
+          "peer": true
+        }
+      }
     },
     "stylelint": {
       "version": "13.8.0",
@@ -21576,6 +24602,11 @@
             "lru-cache": "^6.0.0"
           }
         },
+        "ignore": {
+          "version": "5.1.8",
+          "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
+          "dev": true
+        },
         "import-lazy": {
           "version": "4.0.0",
           "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==",
@@ -21820,6 +24851,19 @@
         "postcss-values-parser": "^3.2.1"
       }
     },
+    "stylis": {
+      "version": "3.5.4",
+      "integrity": "sha512-8/3pSmthWM7lsPBKv7NXkzn2Uc9W7NotcwGNpJaa3k7WMM1XDCA4MgT5k/8BIexd5ydZdboXtU90XH9Ec4Bv/Q==",
+      "dev": true,
+      "peer": true
+    },
+    "stylis-rule-sheet": {
+      "version": "0.0.10",
+      "integrity": "sha512-nTbZoaqoBnmK+ptANthb10ZRZOGC+EmTLLUxeYIuHNkEKcmKgXX1XWKkUBT2Ac4es3NybooPe0SmvKdhKJZAuw==",
+      "dev": true,
+      "peer": true,
+      "requires": {}
+    },
     "sugarss": {
       "version": "2.0.0",
       "integrity": "sha512-WfxjozUk0UVA4jm+U1d736AUpzSrNsQcIbyOkoE364GrtWmIrFdk5lksEupgWMD4VaT/0kVx1dobpiDumSgmJQ==",
@@ -21862,12 +24906,6 @@
         "supports-color": "^7.0.0"
       }
     },
-    "supports-preserve-symlinks-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-      "dev": true
-    },
     "svg-tags": {
       "version": "1.0.0",
       "integrity": "sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=",
@@ -21879,73 +24917,200 @@
       "dev": true,
       "peer": true
     },
-    "synckit": {
-      "version": "0.8.4",
-      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.8.4.tgz",
-      "integrity": "sha512-Dn2ZkzMdSX827QbowGbU/4yjWuvNaCoScLLoMo/yKbu+P4GBR6cRGKZH27k6a9bRzdqcyd1DE96pQtQ6uNkmyw==",
+    "table": {
+      "version": "6.7.2",
+      "integrity": "sha512-UFZK67uvyNivLeQbVtkiUs8Uuuxv24aSL4/Vil2PJVtMgU8Lx0CYkP12uCGa3kjyQzOSgV1+z9Wkb82fCGsO0g==",
+      "dev": true,
+      "requires": {
+        "ajv": "^8.0.1",
+        "lodash.clonedeep": "^4.5.0",
+        "lodash.truncate": "^4.4.2",
+        "slice-ansi": "^4.0.0",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "8.6.3",
+          "integrity": "sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "json-schema-traverse": "^1.0.0",
+            "require-from-string": "^2.0.2",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "json-schema-traverse": {
+          "version": "1.0.0",
+          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+          "dev": true
+        },
+        "slice-ansi": {
+          "version": "4.0.0",
+          "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.0.0",
+            "astral-regex": "^2.0.0",
+            "is-fullwidth-code-point": "^3.0.0"
+          }
+        }
+      }
+    },
+    "terminal-link": {
+      "version": "2.1.1",
+      "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
       "dev": true,
+      "peer": true,
       "requires": {
-        "@pkgr/utils": "^2.3.1",
-        "tslib": "^2.4.0"
+        "ansi-escapes": "^4.2.1",
+        "supports-hyperlinks": "^2.0.0"
       }
     },
-    "table": {
-      "version": "6.7.2",
-      "integrity": "sha512-UFZK67uvyNivLeQbVtkiUs8Uuuxv24aSL4/Vil2PJVtMgU8Lx0CYkP12uCGa3kjyQzOSgV1+z9Wkb82fCGsO0g==",
+    "terser": {
+      "version": "4.8.0",
+      "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "requires": {
+        "commander": "^2.20.0",
+        "source-map": "~0.6.1",
+        "source-map-support": "~0.5.12"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.20.3",
+          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+          "dev": true,
+          "optional": true,
+          "peer": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true,
+          "optional": true,
+          "peer": true
+        }
+      }
+    },
+    "terser-webpack-plugin": {
+      "version": "1.4.5",
+      "integrity": "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
-        "ajv": "^8.0.1",
-        "lodash.clonedeep": "^4.5.0",
-        "lodash.truncate": "^4.4.2",
-        "slice-ansi": "^4.0.0",
-        "string-width": "^4.2.3",
-        "strip-ansi": "^6.0.1"
+        "cacache": "^12.0.2",
+        "find-cache-dir": "^2.1.0",
+        "is-wsl": "^1.1.0",
+        "schema-utils": "^1.0.0",
+        "serialize-javascript": "^4.0.0",
+        "source-map": "^0.6.1",
+        "terser": "^4.1.2",
+        "webpack-sources": "^1.4.0",
+        "worker-farm": "^1.7.0"
       },
       "dependencies": {
-        "ajv": {
-          "version": "8.6.3",
-          "integrity": "sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==",
+        "find-cache-dir": {
+          "version": "2.1.0",
+          "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
           "dev": true,
+          "optional": true,
+          "peer": true,
           "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "json-schema-traverse": "^1.0.0",
-            "require-from-string": "^2.0.2",
-            "uri-js": "^4.2.2"
+            "commondir": "^1.0.1",
+            "make-dir": "^2.0.0",
+            "pkg-dir": "^3.0.0"
           }
         },
-        "json-schema-traverse": {
-          "version": "1.0.0",
-          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-          "dev": true
+        "find-up": {
+          "version": "3.0.0",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
         },
-        "slice-ansi": {
-          "version": "4.0.0",
-          "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+        "is-wsl": {
+          "version": "1.1.0",
+          "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
+          "dev": true,
+          "optional": true,
+          "peer": true
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
           "dev": true,
+          "optional": true,
+          "peer": true,
           "requires": {
-            "ansi-styles": "^4.0.0",
-            "astral-regex": "^2.0.0",
-            "is-fullwidth-code-point": "^3.0.0"
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "make-dir": {
+          "version": "2.1.0",
+          "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "pify": "^4.0.1",
+            "semver": "^5.6.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.3.0",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "pkg-dir": {
+          "version": "3.0.0",
+          "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "find-up": "^3.0.0"
           }
+        },
+        "semver": {
+          "version": "5.7.1",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true,
+          "optional": true,
+          "peer": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true,
+          "optional": true,
+          "peer": true
         }
       }
     },
-    "tapable": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
-      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
-      "dev": true
-    },
-    "terminal-link": {
-      "version": "2.1.1",
-      "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "ansi-escapes": "^4.2.1",
-        "supports-hyperlinks": "^2.0.0"
-      }
-    },
     "test-exclude": {
       "version": "6.0.0",
       "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
@@ -21959,8 +25124,7 @@
     },
     "text-table": {
       "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
       "dev": true
     },
     "throat": {
@@ -21974,14 +25138,52 @@
       "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
       "dev": true
     },
-    "tiny-glob": {
-      "version": "0.2.9",
-      "resolved": "https://registry.npmjs.org/tiny-glob/-/tiny-glob-0.2.9.tgz",
-      "integrity": "sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg==",
+    "through2": {
+      "version": "2.0.5",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "requires": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
+    "timers-browserify": {
+      "version": "2.0.12",
+      "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==",
       "dev": true,
+      "peer": true,
       "requires": {
-        "globalyzer": "0.1.0",
-        "globrex": "^0.1.2"
+        "setimmediate": "^1.0.4"
       }
     },
     "tlds": {
@@ -22003,6 +25205,12 @@
       "dev": true,
       "peer": true
     },
+    "to-arraybuffer": {
+      "version": "1.0.1",
+      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
+      "dev": true,
+      "peer": true
+    },
     "to-fast-properties": {
       "version": "2.0.0",
       "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
@@ -22075,6 +25283,12 @@
         "is-number": "^7.0.0"
       }
     },
+    "toidentifier": {
+      "version": "1.0.0",
+      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
+      "dev": true,
+      "peer": true
+    },
     "tough-cookie": {
       "version": "4.0.0",
       "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
@@ -22117,18 +25331,6 @@
         }
       }
     },
-    "trim": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz",
-      "integrity": "sha512-YzQV+TZg4AxpKxaTHK3c3D+kRDCGVEE7LemdlQZoQXn0iennk10RsIoY6ikzAqJTc9Xjl9C1/waHom/J86ziAQ==",
-      "dev": true
-    },
-    "trim-trailing-lines": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.4.tgz",
-      "integrity": "sha512-rjUWSqnfTNrjbB9NQWfPMH/xRK1deHeGsHoVfpxJ++XeYXE0d6B1En37AHfw3jtfTU7dzMzZL2jjpe8Qb5gLIQ==",
-      "dev": true
-    },
     "trough": {
       "version": "1.0.5",
       "integrity": "sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==",
@@ -22158,22 +25360,26 @@
         }
       }
     },
+    "ts-pnp": {
+      "version": "1.2.0",
+      "integrity": "sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==",
+      "dev": true,
+      "peer": true
+    },
     "tsconfig-paths": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
-      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
+      "version": "3.11.0",
+      "integrity": "sha512-7ecdYDnIdmv639mmDwslG6KQg1Z9STTz1j7Gcz0xa+nshh/gKDAHcPxRbWOsA3SPp0tXP2leTcY9Kw+NAkfZzA==",
       "dev": true,
       "requires": {
         "@types/json5": "^0.0.29",
         "json5": "^1.0.1",
-        "minimist": "^1.2.6",
+        "minimist": "^1.2.0",
         "strip-bom": "^3.0.0"
       },
       "dependencies": {
         "json5": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
-          "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+          "version": "1.0.1",
+          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
           "dev": true,
           "requires": {
             "minimist": "^1.2.0"
@@ -22181,21 +25387,13 @@
         },
         "strip-bom": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
           "dev": true
         }
       }
     },
-    "tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
-      "dev": true
-    },
     "tsutils": {
       "version": "3.21.0",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
       "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
       "dev": true,
       "requires": {
@@ -22204,15 +25402,19 @@
       "dependencies": {
         "tslib": {
           "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
           "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
           "dev": true
         }
       }
     },
+    "tty-browserify": {
+      "version": "0.0.1",
+      "integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==",
+      "dev": true,
+      "peer": true
+    },
     "type-check": {
       "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
       "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
       "dev": true,
       "requires": {
@@ -22230,16 +25432,12 @@
       "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
       "dev": true
     },
-    "typed-array-length": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
-      "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==",
+    "typedarray": {
+      "version": "0.0.6",
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
       "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "for-each": "^0.3.3",
-        "is-typed-array": "^1.1.9"
-      }
+      "optional": true,
+      "peer": true
     },
     "typedarray-to-buffer": {
       "version": "3.1.5",
@@ -22256,27 +25454,16 @@
       "peer": true
     },
     "unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+      "version": "1.0.1",
+      "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.2",
-        "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
+        "function-bind": "^1.1.1",
+        "has-bigints": "^1.0.1",
+        "has-symbols": "^1.0.2",
         "which-boxed-primitive": "^1.0.2"
       }
     },
-    "unherit": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/unherit/-/unherit-1.1.3.tgz",
-      "integrity": "sha512-Ft16BJcnapDKp0+J/rqFC3Rrk6Y/Ng4nzsC028k2jdDII/rdZ7Wd3pPT/6+vIIxRagwRc9K0IUX0Ra4fKvw+WQ==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.0",
-        "xtend": "^4.0.0"
-      }
-    },
     "unified": {
       "version": "9.2.0",
       "integrity": "sha512-vx2Z0vY+a3YoTj8+pttM3tiJHCwY5UFbYdiWrwBEbHmK8pvsPj2rtAX2BFfgXen8T39CJWblWRDT4L5WGXtDdg==",
@@ -22297,84 +25484,6 @@
         }
       }
     },
-    "unified-lint-rule": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/unified-lint-rule/-/unified-lint-rule-2.1.1.tgz",
-      "integrity": "sha512-vsLHyLZFstqtGse2gvrGwasOmH8M2y+r2kQMoDSWzSqUkQx2MjHjvZuGSv5FUaiv4RQO1bHRajy7lSGp7XWq5A==",
-      "dev": true,
-      "requires": {
-        "@types/unist": "^2.0.0",
-        "trough": "^2.0.0",
-        "unified": "^10.0.0",
-        "vfile": "^5.0.0"
-      },
-      "dependencies": {
-        "bail": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/bail/-/bail-2.0.2.tgz",
-          "integrity": "sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw==",
-          "dev": true
-        },
-        "is-plain-obj": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz",
-          "integrity": "sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==",
-          "dev": true
-        },
-        "trough": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/trough/-/trough-2.1.0.tgz",
-          "integrity": "sha512-AqTiAOLcj85xS7vQ8QkAV41hPDIJ71XJB4RCUrzo/1GM2CQwhkJGaf9Hgr7BOugMRpgGUrqRg/DrBDl4H40+8g==",
-          "dev": true
-        },
-        "unified": {
-          "version": "10.1.2",
-          "resolved": "https://registry.npmjs.org/unified/-/unified-10.1.2.tgz",
-          "integrity": "sha512-pUSWAi/RAnVy1Pif2kAoeWNBa3JVrx0MId2LASj8G+7AiHWoKZNTomq6LG326T68U7/e263X6fTdcXIy7XnF7Q==",
-          "dev": true,
-          "requires": {
-            "@types/unist": "^2.0.0",
-            "bail": "^2.0.0",
-            "extend": "^3.0.0",
-            "is-buffer": "^2.0.0",
-            "is-plain-obj": "^4.0.0",
-            "trough": "^2.0.0",
-            "vfile": "^5.0.0"
-          }
-        },
-        "unist-util-stringify-position": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.3.tgz",
-          "integrity": "sha512-k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg==",
-          "dev": true,
-          "requires": {
-            "@types/unist": "^2.0.0"
-          }
-        },
-        "vfile": {
-          "version": "5.3.7",
-          "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.7.tgz",
-          "integrity": "sha512-r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g==",
-          "dev": true,
-          "requires": {
-            "@types/unist": "^2.0.0",
-            "is-buffer": "^2.0.0",
-            "unist-util-stringify-position": "^3.0.0",
-            "vfile-message": "^3.0.0"
-          }
-        },
-        "vfile-message": {
-          "version": "3.1.4",
-          "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.4.tgz",
-          "integrity": "sha512-fa0Z6P8HUrQN4BZaX05SIVXic+7kE3b05PWAtPuYP9QLHsLKYR7/AlLW3NtOrpXRLeawpDLMsVkmk5DG0NXgWw==",
-          "dev": true,
-          "requires": {
-            "@types/unist": "^2.0.0",
-            "unist-util-stringify-position": "^3.0.0"
-          }
-        }
-      }
-    },
     "union-value": {
       "version": "1.0.1",
       "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
@@ -22387,6 +25496,26 @@
         "set-value": "^2.0.1"
       }
     },
+    "unique-filename": {
+      "version": "1.1.1",
+      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "requires": {
+        "unique-slug": "^2.0.0"
+      }
+    },
+    "unique-slug": {
+      "version": "2.0.2",
+      "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "requires": {
+        "imurmurhash": "^0.1.4"
+      }
+    },
     "unist-util-find-all-after": {
       "version": "3.0.2",
       "integrity": "sha512-xaTC/AGZ0rIM2gM28YVRAFPIZpzbpDtU3dRmp7EXlNVA8ziQc4hY3H7BHXM1J49nEmiqc3svnqMReW+PGqbZKQ==",
@@ -22400,81 +25529,12 @@
       "integrity": "sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==",
       "dev": true
     },
-    "unist-util-remove-position": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-2.0.1.tgz",
-      "integrity": "sha512-fDZsLYIe2uT+oGFnuZmy73K6ZxOPG/Qcm+w7jbEjaFcJgbQ6cqjs/eSPzXhsmGpAsWPkqZM9pYjww5QTn3LHMA==",
-      "dev": true,
-      "requires": {
-        "unist-util-visit": "^2.0.0"
-      },
-      "dependencies": {
-        "unist-util-visit": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.3.tgz",
-          "integrity": "sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==",
-          "dev": true,
-          "requires": {
-            "@types/unist": "^2.0.0",
-            "unist-util-is": "^4.0.0",
-            "unist-util-visit-parents": "^3.0.0"
-          }
-        },
-        "unist-util-visit-parents": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz",
-          "integrity": "sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==",
-          "dev": true,
-          "requires": {
-            "@types/unist": "^2.0.0",
-            "unist-util-is": "^4.0.0"
-          }
-        }
-      }
-    },
     "unist-util-stringify-position": {
-      "version": "2.0.3",
-      "integrity": "sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==",
-      "dev": true,
-      "requires": {
-        "@types/unist": "^2.0.2"
-      }
-    },
-    "unist-util-visit": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-4.1.2.tgz",
-      "integrity": "sha512-MSd8OUGISqHdVvfY9TPhyK2VdUrPgxkUtWSuMHF6XAAFuL4LokseigBnZtPnJMu+FbynTkFNnFlyjxpVKujMRg==",
-      "dev": true,
-      "requires": {
-        "@types/unist": "^2.0.0",
-        "unist-util-is": "^5.0.0",
-        "unist-util-visit-parents": "^5.1.1"
-      },
-      "dependencies": {
-        "unist-util-is": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-5.2.0.tgz",
-          "integrity": "sha512-Glt17jWwZeyqrFqOK0pF1Ded5U3yzJnFr8CG1GMjCWTp9zDo2p+cmD6pWbZU8AgM5WU3IzRv6+rBwhzsGh6hBQ==",
-          "dev": true
-        }
-      }
-    },
-    "unist-util-visit-parents": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-5.1.3.tgz",
-      "integrity": "sha512-x6+y8g7wWMyQhL1iZfhIPhDAs7Xwbn9nRosDXl7qoPTSCy0yNxnKc+hWokFifWQIDGi154rdUqKvbCa4+1kLhg==",
+      "version": "2.0.3",
+      "integrity": "sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==",
       "dev": true,
       "requires": {
-        "@types/unist": "^2.0.0",
-        "unist-util-is": "^5.0.0"
-      },
-      "dependencies": {
-        "unist-util-is": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-5.2.0.tgz",
-          "integrity": "sha512-Glt17jWwZeyqrFqOK0pF1Ded5U3yzJnFr8CG1GMjCWTp9zDo2p+cmD6pWbZU8AgM5WU3IzRv6+rBwhzsGh6hBQ==",
-          "dev": true
-        }
+        "@types/unist": "^2.0.2"
       }
     },
     "universalify": {
@@ -22482,6 +25542,12 @@
       "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==",
       "dev": true
     },
+    "unpipe": {
+      "version": "1.0.0",
+      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+      "dev": true,
+      "peer": true
+    },
     "unset-value": {
       "version": "1.0.0",
       "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
@@ -22522,6 +25588,13 @@
         }
       }
     },
+    "upath": {
+      "version": "1.2.0",
+      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
     "uri-js": {
       "version": "4.4.1",
       "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
@@ -22543,6 +25616,30 @@
       "dev": true,
       "peer": true
     },
+    "url": {
+      "version": "0.11.0",
+      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "punycode": "1.3.2",
+        "querystring": "0.2.0"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.3.2",
+          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+          "dev": true,
+          "peer": true
+        },
+        "querystring": {
+          "version": "0.2.0",
+          "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
+          "dev": true,
+          "peer": true
+        }
+      }
+    },
     "url-regex": {
       "version": "5.0.0",
       "integrity": "sha512-O08GjTiAFNsSlrUWfqF1jH0H1W3m35ZyadHrGv5krdnmPPoxP27oDTqux/579PtaroiSGm5yma6KT1mHFH6Y/g==",
@@ -22558,12 +25655,28 @@
       "dev": true,
       "peer": true
     },
-    "use-sync-external-store": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz",
-      "integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==",
+    "use-subscription": {
+      "version": "1.5.1",
+      "integrity": "sha512-Xv2a1P/yReAjAbhylMfFplFKj9GssgTwN7RlcTxBujFQcloStWNDQdc4g4NRWH9xS4i/FDk04vQBptAXoF3VcA==",
       "dev": true,
-      "requires": {}
+      "peer": true,
+      "requires": {
+        "object-assign": "^4.1.1"
+      }
+    },
+    "util": {
+      "version": "0.12.4",
+      "integrity": "sha512-bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "inherits": "^2.0.3",
+        "is-arguments": "^1.0.4",
+        "is-generator-function": "^1.0.7",
+        "is-typed-array": "^1.1.3",
+        "safe-buffer": "^5.1.2",
+        "which-typed-array": "^1.1.2"
+      }
     },
     "util-deprecate": {
       "version": "1.0.2",
@@ -22621,314 +25734,593 @@
         "vfile-message": "^2.0.0"
       }
     },
-    "vfile-location": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-3.2.0.tgz",
-      "integrity": "sha512-aLEIZKv/oxuCDZ8lkJGhuhztf/BW4M+iHdCwglA/eWc+vtuRFJj8EtgceYFX4LRjOhCAAiNHsKGssC6onJ+jbA==",
-      "dev": true
+    "vfile-message": {
+      "version": "2.0.4",
+      "integrity": "sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==",
+      "dev": true,
+      "requires": {
+        "@types/unist": "^2.0.0",
+        "unist-util-stringify-position": "^2.0.0"
+      }
     },
-    "vfile-matter": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/vfile-matter/-/vfile-matter-4.0.1.tgz",
-      "integrity": "sha512-ZeACdaxCOxhePpoLO4A5y/VgI9EuWBXu+sUk65aQ7lXBZDFg7X0tuOzigLJUtsQzazFt6K2m9SdlDxZdfL5vVg==",
+    "vm-browserify": {
+      "version": "1.1.2",
+      "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
+      "dev": true,
+      "peer": true
+    },
+    "w3c-hr-time": {
+      "version": "1.0.2",
+      "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
       "dev": true,
+      "peer": true,
       "requires": {
-        "is-buffer": "^2.0.0",
-        "vfile": "^5.0.0",
-        "yaml": "^2.0.0"
+        "browser-process-hrtime": "^1.0.0"
+      }
+    },
+    "w3c-xmlserializer": {
+      "version": "2.0.0",
+      "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "xml-name-validator": "^3.0.0"
+      }
+    },
+    "walker": {
+      "version": "1.0.7",
+      "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "makeerror": "1.0.x"
+      }
+    },
+    "watchpack": {
+      "version": "2.1.1",
+      "integrity": "sha512-Oo7LXCmc1eE1AjyuSBmtC3+Wy4HcV8PxWh2kP6fOl8yTlNS7r0K9l1ao2lrrUza7V39Y3D/BbJgY8VeSlc5JKw==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.1.2"
+      }
+    },
+    "watchpack-chokidar2": {
+      "version": "2.0.1",
+      "integrity": "sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "requires": {
+        "chokidar": "^2.1.8"
       },
       "dependencies": {
-        "unist-util-stringify-position": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.3.tgz",
-          "integrity": "sha512-k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg==",
+        "anymatch": {
+          "version": "2.0.0",
+          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "micromatch": "^3.1.4",
+            "normalize-path": "^2.1.1"
+          },
+          "dependencies": {
+            "normalize-path": {
+              "version": "2.1.1",
+              "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+              "dev": true,
+              "optional": true,
+              "peer": true,
+              "requires": {
+                "remove-trailing-separator": "^1.0.1"
+              }
+            }
+          }
+        },
+        "binary-extensions": {
+          "version": "1.13.1",
+          "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
+          "dev": true,
+          "optional": true,
+          "peer": true
+        },
+        "braces": {
+          "version": "2.3.2",
+          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "arr-flatten": "^1.1.0",
+            "array-unique": "^0.3.2",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
+          }
+        },
+        "chokidar": {
+          "version": "2.1.8",
+          "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "anymatch": "^2.0.0",
+            "async-each": "^1.0.1",
+            "braces": "^2.3.2",
+            "fsevents": "^1.2.7",
+            "glob-parent": "^3.1.0",
+            "inherits": "^2.0.3",
+            "is-binary-path": "^1.0.0",
+            "is-glob": "^4.0.0",
+            "normalize-path": "^3.0.0",
+            "path-is-absolute": "^1.0.0",
+            "readdirp": "^2.2.1",
+            "upath": "^1.1.1"
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          }
+        },
+        "fsevents": {
+          "version": "1.2.13",
+          "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "bindings": "^1.5.0",
+            "nan": "^2.12.1"
+          }
+        },
+        "glob-parent": {
+          "version": "3.1.0",
+          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "is-glob": "^3.1.0",
+            "path-dirname": "^1.0.0"
+          },
+          "dependencies": {
+            "is-glob": {
+              "version": "3.1.0",
+              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+              "dev": true,
+              "optional": true,
+              "peer": true,
+              "requires": {
+                "is-extglob": "^2.1.0"
+              }
+            }
+          }
+        },
+        "is-binary-path": {
+          "version": "1.0.1",
+          "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "binary-extensions": "^1.0.0"
+          }
+        },
+        "is-buffer": {
+          "version": "1.1.6",
+          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+          "dev": true,
+          "optional": true,
+          "peer": true
+        },
+        "is-extendable": {
+          "version": "1.0.1",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        },
+        "is-number": {
+          "version": "3.0.0",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "optional": true,
+              "peer": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "arr-diff": "^4.0.0",
+            "array-unique": "^0.3.2",
+            "braces": "^2.3.1",
+            "define-property": "^2.0.2",
+            "extend-shallow": "^3.0.2",
+            "extglob": "^2.0.4",
+            "fragment-cache": "^0.2.1",
+            "kind-of": "^6.0.2",
+            "nanomatch": "^1.2.9",
+            "object.pick": "^1.3.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.2"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "3.0.2",
+              "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+              "dev": true,
+              "optional": true,
+              "peer": true,
+              "requires": {
+                "assign-symbols": "^1.0.0",
+                "is-extendable": "^1.0.1"
+              }
+            }
+          }
+        },
+        "readable-stream": {
+          "version": "2.3.7",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
           "dev": true,
+          "optional": true,
+          "peer": true,
           "requires": {
-            "@types/unist": "^2.0.0"
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
           }
         },
-        "vfile": {
-          "version": "5.3.7",
-          "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.7.tgz",
-          "integrity": "sha512-r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g==",
+        "readdirp": {
+          "version": "2.2.1",
+          "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
           "dev": true,
+          "optional": true,
+          "peer": true,
           "requires": {
-            "@types/unist": "^2.0.0",
-            "is-buffer": "^2.0.0",
-            "unist-util-stringify-position": "^3.0.0",
-            "vfile-message": "^3.0.0"
+            "graceful-fs": "^4.1.11",
+            "micromatch": "^3.1.10",
+            "readable-stream": "^2.0.2"
           }
         },
-        "vfile-message": {
-          "version": "3.1.4",
-          "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.4.tgz",
-          "integrity": "sha512-fa0Z6P8HUrQN4BZaX05SIVXic+7kE3b05PWAtPuYP9QLHsLKYR7/AlLW3NtOrpXRLeawpDLMsVkmk5DG0NXgWw==",
+        "string_decoder": {
+          "version": "1.1.1",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
+          "peer": true,
           "requires": {
-            "@types/unist": "^2.0.0",
-            "unist-util-stringify-position": "^3.0.0"
+            "safe-buffer": "~5.1.0"
           }
         },
-        "yaml": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.2.1.tgz",
-          "integrity": "sha512-e0WHiYql7+9wr4cWMx3TVQrNwejKaEe7/rHNmQmqRjazfOP5W8PB6Jpebb5o6fIapbz9o9+2ipcaTM2ZwDI6lw==",
-          "dev": true
+        "to-regex-range": {
+          "version": "2.1.1",
+          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1"
+          }
         }
       }
     },
-    "vfile-message": {
-      "version": "2.0.4",
-      "integrity": "sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==",
+    "webidl-conversions": {
+      "version": "6.1.0",
+      "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
       "dev": true,
-      "requires": {
-        "@types/unist": "^2.0.0",
-        "unist-util-stringify-position": "^2.0.0"
-      }
+      "peer": true
     },
-    "vfile-reporter": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/vfile-reporter/-/vfile-reporter-7.0.5.tgz",
-      "integrity": "sha512-NdWWXkv6gcd7AZMvDomlQbK3MqFWL1RlGzMn++/O2TI+68+nqxCPTvLugdOtfSzXmjh+xUyhp07HhlrbJjT+mw==",
+    "webpack": {
+      "version": "4.46.0",
+      "integrity": "sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
-        "@types/supports-color": "^8.0.0",
-        "string-width": "^5.0.0",
-        "supports-color": "^9.0.0",
-        "unist-util-stringify-position": "^3.0.0",
-        "vfile": "^5.0.0",
-        "vfile-message": "^3.0.0",
-        "vfile-sort": "^3.0.0",
-        "vfile-statistics": "^2.0.0"
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-module-context": "1.9.0",
+        "@webassemblyjs/wasm-edit": "1.9.0",
+        "@webassemblyjs/wasm-parser": "1.9.0",
+        "acorn": "^6.4.1",
+        "ajv": "^6.10.2",
+        "ajv-keywords": "^3.4.1",
+        "chrome-trace-event": "^1.0.2",
+        "enhanced-resolve": "^4.5.0",
+        "eslint-scope": "^4.0.3",
+        "json-parse-better-errors": "^1.0.2",
+        "loader-runner": "^2.4.0",
+        "loader-utils": "^1.2.3",
+        "memory-fs": "^0.4.1",
+        "micromatch": "^3.1.10",
+        "mkdirp": "^0.5.3",
+        "neo-async": "^2.6.1",
+        "node-libs-browser": "^2.2.1",
+        "schema-utils": "^1.0.0",
+        "tapable": "^1.1.3",
+        "terser-webpack-plugin": "^1.4.3",
+        "watchpack": "^1.7.4",
+        "webpack-sources": "^1.4.1"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-          "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
-          "dev": true
+        "acorn": {
+          "version": "6.4.2",
+          "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
+          "dev": true,
+          "optional": true,
+          "peer": true
         },
-        "string-width": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
-          "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+        "braces": {
+          "version": "2.3.2",
+          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
           "dev": true,
+          "optional": true,
+          "peer": true,
           "requires": {
-            "eastasianwidth": "^0.2.0",
-            "emoji-regex": "^9.2.2",
-            "strip-ansi": "^7.0.1"
+            "arr-flatten": "^1.1.0",
+            "array-unique": "^0.3.2",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
           }
         },
-        "strip-ansi": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
-          "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
+        "enhanced-resolve": {
+          "version": "4.5.0",
+          "integrity": "sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==",
           "dev": true,
+          "optional": true,
+          "peer": true,
           "requires": {
-            "ansi-regex": "^6.0.1"
+            "graceful-fs": "^4.1.2",
+            "memory-fs": "^0.5.0",
+            "tapable": "^1.0.0"
+          },
+          "dependencies": {
+            "memory-fs": {
+              "version": "0.5.0",
+              "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==",
+              "dev": true,
+              "optional": true,
+              "peer": true,
+              "requires": {
+                "errno": "^0.1.3",
+                "readable-stream": "^2.0.1"
+              }
+            }
           }
         },
-        "supports-color": {
-          "version": "9.3.1",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-9.3.1.tgz",
-          "integrity": "sha512-knBY82pjmnIzK3NifMo3RxEIRD9E0kIzV4BKcyTZ9+9kWgLMxd4PrsTSMoFQUabgRBbF8KOLRDCyKgNV+iK44Q==",
-          "dev": true
-        },
-        "unist-util-stringify-position": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.3.tgz",
-          "integrity": "sha512-k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg==",
+        "eslint-scope": {
+          "version": "4.0.3",
+          "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
           "dev": true,
+          "optional": true,
+          "peer": true,
           "requires": {
-            "@types/unist": "^2.0.0"
+            "esrecurse": "^4.1.0",
+            "estraverse": "^4.1.1"
           }
         },
-        "vfile": {
-          "version": "5.3.7",
-          "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.7.tgz",
-          "integrity": "sha512-r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g==",
+        "estraverse": {
+          "version": "4.3.0",
+          "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
           "dev": true,
-          "requires": {
-            "@types/unist": "^2.0.0",
-            "is-buffer": "^2.0.0",
-            "unist-util-stringify-position": "^3.0.0",
-            "vfile-message": "^3.0.0"
-          }
+          "optional": true,
+          "peer": true
         },
-        "vfile-message": {
-          "version": "3.1.4",
-          "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.4.tgz",
-          "integrity": "sha512-fa0Z6P8HUrQN4BZaX05SIVXic+7kE3b05PWAtPuYP9QLHsLKYR7/AlLW3NtOrpXRLeawpDLMsVkmk5DG0NXgWw==",
+        "fill-range": {
+          "version": "4.0.0",
+          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
           "dev": true,
+          "optional": true,
+          "peer": true,
           "requires": {
-            "@types/unist": "^2.0.0",
-            "unist-util-stringify-position": "^3.0.0"
+            "extend-shallow": "^2.0.1",
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
           }
-        }
-      }
-    },
-    "vfile-reporter-json": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/vfile-reporter-json/-/vfile-reporter-json-3.3.0.tgz",
-      "integrity": "sha512-/zgRtjxQ2UGJn+HViiZ7+nIXtUzkkXFQum3BmaS/bSyr10P0X41ETRqqwMJ95RtbKUah3m7pKb6oS1eZeXXHzQ==",
-      "dev": true,
-      "requires": {
-        "vfile": "^5.0.0",
-        "vfile-message": "^3.0.0"
-      },
-      "dependencies": {
-        "unist-util-stringify-position": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.3.tgz",
-          "integrity": "sha512-k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg==",
+        },
+        "is-buffer": {
+          "version": "1.1.6",
+          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
           "dev": true,
-          "requires": {
-            "@types/unist": "^2.0.0"
-          }
+          "optional": true,
+          "peer": true
         },
-        "vfile": {
-          "version": "5.3.7",
-          "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.7.tgz",
-          "integrity": "sha512-r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g==",
+        "is-extendable": {
+          "version": "1.0.1",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
           "dev": true,
+          "optional": true,
+          "peer": true,
           "requires": {
-            "@types/unist": "^2.0.0",
-            "is-buffer": "^2.0.0",
-            "unist-util-stringify-position": "^3.0.0",
-            "vfile-message": "^3.0.0"
+            "is-plain-object": "^2.0.4"
           }
         },
-        "vfile-message": {
-          "version": "3.1.4",
-          "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.4.tgz",
-          "integrity": "sha512-fa0Z6P8HUrQN4BZaX05SIVXic+7kE3b05PWAtPuYP9QLHsLKYR7/AlLW3NtOrpXRLeawpDLMsVkmk5DG0NXgWw==",
+        "is-number": {
+          "version": "3.0.0",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
           "dev": true,
+          "optional": true,
+          "peer": true,
           "requires": {
-            "@types/unist": "^2.0.0",
-            "unist-util-stringify-position": "^3.0.0"
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "optional": true,
+              "peer": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
           }
-        }
-      }
-    },
-    "vfile-sort": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/vfile-sort/-/vfile-sort-3.0.1.tgz",
-      "integrity": "sha512-1os1733XY6y0D5x0ugqSeaVJm9lYgj0j5qdcZQFyxlZOSy1jYarL77lLyb5gK4Wqr1d5OxmuyflSO3zKyFnTFw==",
-      "dev": true,
-      "requires": {
-        "vfile": "^5.0.0",
-        "vfile-message": "^3.0.0"
-      },
-      "dependencies": {
-        "unist-util-stringify-position": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.3.tgz",
-          "integrity": "sha512-k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg==",
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
           "dev": true,
+          "optional": true,
+          "peer": true,
           "requires": {
-            "@types/unist": "^2.0.0"
+            "arr-diff": "^4.0.0",
+            "array-unique": "^0.3.2",
+            "braces": "^2.3.1",
+            "define-property": "^2.0.2",
+            "extend-shallow": "^3.0.2",
+            "extglob": "^2.0.4",
+            "fragment-cache": "^0.2.1",
+            "kind-of": "^6.0.2",
+            "nanomatch": "^1.2.9",
+            "object.pick": "^1.3.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.2"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "3.0.2",
+              "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+              "dev": true,
+              "optional": true,
+              "peer": true,
+              "requires": {
+                "assign-symbols": "^1.0.0",
+                "is-extendable": "^1.0.1"
+              }
+            }
           }
         },
-        "vfile": {
-          "version": "5.3.7",
-          "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.7.tgz",
-          "integrity": "sha512-r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g==",
+        "readable-stream": {
+          "version": "2.3.7",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
           "dev": true,
+          "optional": true,
+          "peer": true,
           "requires": {
-            "@types/unist": "^2.0.0",
-            "is-buffer": "^2.0.0",
-            "unist-util-stringify-position": "^3.0.0",
-            "vfile-message": "^3.0.0"
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
           }
         },
-        "vfile-message": {
-          "version": "3.1.4",
-          "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.4.tgz",
-          "integrity": "sha512-fa0Z6P8HUrQN4BZaX05SIVXic+7kE3b05PWAtPuYP9QLHsLKYR7/AlLW3NtOrpXRLeawpDLMsVkmk5DG0NXgWw==",
+        "string_decoder": {
+          "version": "1.1.1",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
+          "peer": true,
           "requires": {
-            "@types/unist": "^2.0.0",
-            "unist-util-stringify-position": "^3.0.0"
+            "safe-buffer": "~5.1.0"
           }
-        }
-      }
-    },
-    "vfile-statistics": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/vfile-statistics/-/vfile-statistics-2.0.1.tgz",
-      "integrity": "sha512-W6dkECZmP32EG/l+dp2jCLdYzmnDBIw6jwiLZSER81oR5AHRcVqL+k3Z+pfH1R73le6ayDkJRMk0sutj1bMVeg==",
-      "dev": true,
-      "requires": {
-        "vfile": "^5.0.0",
-        "vfile-message": "^3.0.0"
-      },
-      "dependencies": {
-        "unist-util-stringify-position": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.3.tgz",
-          "integrity": "sha512-k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg==",
+        },
+        "tapable": {
+          "version": "1.1.3",
+          "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
           "dev": true,
-          "requires": {
-            "@types/unist": "^2.0.0"
-          }
+          "optional": true,
+          "peer": true
         },
-        "vfile": {
-          "version": "5.3.7",
-          "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.7.tgz",
-          "integrity": "sha512-r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g==",
+        "to-regex-range": {
+          "version": "2.1.1",
+          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
           "dev": true,
+          "optional": true,
+          "peer": true,
           "requires": {
-            "@types/unist": "^2.0.0",
-            "is-buffer": "^2.0.0",
-            "unist-util-stringify-position": "^3.0.0",
-            "vfile-message": "^3.0.0"
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1"
           }
         },
-        "vfile-message": {
-          "version": "3.1.4",
-          "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.4.tgz",
-          "integrity": "sha512-fa0Z6P8HUrQN4BZaX05SIVXic+7kE3b05PWAtPuYP9QLHsLKYR7/AlLW3NtOrpXRLeawpDLMsVkmk5DG0NXgWw==",
+        "watchpack": {
+          "version": "1.7.5",
+          "integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==",
           "dev": true,
+          "optional": true,
+          "peer": true,
           "requires": {
-            "@types/unist": "^2.0.0",
-            "unist-util-stringify-position": "^3.0.0"
+            "chokidar": "^3.4.1",
+            "graceful-fs": "^4.1.2",
+            "neo-async": "^2.5.0",
+            "watchpack-chokidar2": "^2.0.1"
           }
         }
       }
     },
-    "w3c-hr-time": {
-      "version": "1.0.2",
-      "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "browser-process-hrtime": "^1.0.0"
-      }
-    },
-    "w3c-xmlserializer": {
-      "version": "2.0.0",
-      "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "xml-name-validator": "^3.0.0"
-      }
-    },
-    "walker": {
-      "version": "1.0.7",
-      "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=",
+    "webpack-sources": {
+      "version": "1.4.3",
+      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
       "dev": true,
+      "optional": true,
       "peer": true,
       "requires": {
-        "makeerror": "1.0.x"
+        "source-list-map": "^2.0.0",
+        "source-map": "~0.6.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true,
+          "optional": true,
+          "peer": true
+        }
       }
     },
-    "webidl-conversions": {
-      "version": "6.1.0",
-      "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
-      "dev": true,
-      "peer": true
-    },
     "whatwg-encoding": {
       "version": "1.0.5",
       "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
@@ -22965,7 +26357,6 @@
     },
     "which-boxed-primitive": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
       "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
       "dev": true,
       "requires": {
@@ -22976,18 +26367,6 @@
         "is-symbol": "^1.0.3"
       }
     },
-    "which-collection": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz",
-      "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==",
-      "dev": true,
-      "requires": {
-        "is-map": "^2.0.1",
-        "is-set": "^2.0.1",
-        "is-weakmap": "^2.0.1",
-        "is-weakset": "^2.0.1"
-      }
-    },
     "which-module": {
       "version": "2.0.0",
       "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
@@ -22995,17 +26374,17 @@
       "peer": true
     },
     "which-typed-array": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz",
-      "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==",
+      "version": "1.1.7",
+      "integrity": "sha512-vjxaB4nfDqwKI0ws7wZpxIlde1XrLX5uB0ZjpfshgmapJMD7jJWhZI+yToJTqaFByF0eNBcYxbjmCzoRP7CfEw==",
       "dev": true,
+      "peer": true,
       "requires": {
         "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
+        "es-abstract": "^1.18.5",
+        "foreach": "^2.0.5",
         "has-tostringtag": "^1.0.0",
-        "is-typed-array": "^1.1.10"
+        "is-typed-array": "^1.1.7"
       }
     },
     "word-wrap": {
@@ -23013,6 +26392,16 @@
       "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
       "dev": true
     },
+    "worker-farm": {
+      "version": "1.7.0",
+      "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "requires": {
+        "errno": "~0.1.7"
+      }
+    },
     "wrap-ansi": {
       "version": "7.0.0",
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
@@ -23060,9 +26449,9 @@
     },
     "xtend": {
       "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
       "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-      "dev": true
+      "dev": true,
+      "peer": true
     },
     "y18n": {
       "version": "4.0.3",
@@ -23161,15 +26550,9 @@
     },
     "yocto-queue": {
       "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
       "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-      "dev": true
-    },
-    "zod": {
-      "version": "3.20.6",
-      "resolved": "https://registry.npmjs.org/zod/-/zod-3.20.6.tgz",
-      "integrity": "sha512-oyu0m54SGCtzh6EClBVqDDlAYRz4jrVtKwQ7ZnsEmMI9HnzuZFj8QFwAY1M5uniIYACdGvv0PBWPF2kO0aNofA==",
-      "dev": true
+      "dev": true,
+      "peer": true
     },
     "zwitch": {
       "version": "1.0.5",
diff --git a/website/package.json b/website/package.json
index 3e8666fe3e40e..2a86e95bc4240 100644
--- a/website/package.json
+++ b/website/package.json
@@ -3,17 +3,16 @@
   "description": "HashiCorp Vault documentation website",
   "version": "1.0.0",
   "author": "HashiCorp",
+  "dependencies": {},
   "devDependencies": {
-    "@hashicorp/platform-cli": "^2.6.0",
-    "@hashicorp/platform-content-conformance": "^0.0.9",
+    "@hashicorp/platform-cli": "^1.2.0",
     "dart-linkcheck": "2.0.15",
-    "next": "^12.3.1",
-    "prettier": "2.2.1",
-    "simple-git-hooks": "^2.6.1"
+    "simple-git-hooks": "^2.6.1",
+    "prettier": "2.2.1"
   },
   "engines": {
     "npm": ">=7.0.0",
-    "node": ">=12.0.0 <= 16.x"
+    "node": ">=12.0.0"
   },
   "repository": {
     "type": "git",
@@ -28,8 +27,7 @@
     "linkcheck": "linkcheck https://www.vaultproject.io",
     "lint": "next-hashicorp lint",
     "postinstall": "simple-git-hooks",
-    "start": "./scripts/website-start.sh",
-    "content-check": "hc-content --config base-docs"
+    "start": "./scripts/website-start.sh"
   },
   "simple-git-hooks": {
     "pre-commit": "cd website && ./node_modules/.bin/next-hashicorp precommit"
diff --git a/website/prettier.config.js b/website/prettier.config.js
index 91268c1e3f1b0..1d1295a323b0f 100644
--- a/website/prettier.config.js
+++ b/website/prettier.config.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 module.exports = {
   ...require('@hashicorp/platform-cli/config/prettier.config')
   /* Specify overrides here */
diff --git a/website/public/ie-custom-properties.js b/website/public/ie-custom-properties.js
index 1a99b00abe702..e06d9f6a6ea89 100644
--- a/website/public/ie-custom-properties.js
+++ b/website/public/ie-custom-properties.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 /*! ie11CustomProperties.js v2.6.0 | MIT License | https://git.io/fjXMN */
 // c1.onElement helper
 !(function() {
diff --git a/website/public/img/vault-agent-workflow.png b/website/public/img/vault-agent-workflow.png
deleted file mode 100644
index 32e3967174c38..0000000000000
Binary files a/website/public/img/vault-agent-workflow.png and /dev/null differ
diff --git a/website/redirects.js b/website/redirects.js
index d58382bcf1b20..e1d1ffa5cdda2 100644
--- a/website/redirects.js
+++ b/website/redirects.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 module.exports = [
   // example redirect:
   // {
@@ -14,50 +9,5 @@ module.exports = [
     source: '/vault/docs/plugins/plugin-portal',
     destination: '/vault/integrations',
     permanent: true,
-  },
-  {
-    source: '/vault/docs/agent/autoauth',
-    destination: '/vault/docs/agent-and-proxy/autoauth',
-    permanent: true,
-  },
-  {
-    source: '/vault/docs/agent/autoauth/:slug',
-    destination: '/vault/docs/agent-and-proxy/autoauth/:slug',
-    permanent: true,
-  },
-  {
-    source: '/vault/docs/agent/template',
-    destination: '/vault/docs/agent-and-proxy/agent/template',
-    permanent: true,
-  },
-  {
-    source: '/vault/docs/agent/winsvc',
-    destination: '/vault/docs/agent-and-proxy/agent/winsvc',
-    permanent: true,
-  },
-  {
-    source: '/vault/docs/agent/versions',
-    destination: '/vault/docs/agent-and-proxy/agent/versions',
-    permanent: true,
-  },
-  {
-    source: '/vault/docs/agent/apiproxy',
-    destination: '/vault/docs/agent-and-proxy/agent/apiproxy',
-    permanent: true,
-  },
-  {
-    source: '/vault/docs/agent',
-    destination: '/vault/docs/agent-and-proxy/agent',
-    permanent: true,
-  },
-  {
-    source: '/vault/docs/agent/caching',
-    destination: '/vault/docs/agent-and-proxy/agent/caching',
-    permanent: true,
-  },
-  {
-    source: '/vault/docs/agent/caching/:slug',
-    destination: '/vault/docs/agent-and-proxy/agent/caching/:slug',
-    permanent: true,
   }
 ]
diff --git a/website/scripts/should-build.sh b/website/scripts/should-build.sh
index b653682c52aff..9760f47745be0 100644
--- a/website/scripts/should-build.sh
+++ b/website/scripts/should-build.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 ######################################################
 # NOTE: This file is managed by the Digital Team's   #
diff --git a/website/scripts/website-build.sh b/website/scripts/website-build.sh
index c076140921e31..bf54ca9d635de 100755
--- a/website/scripts/website-build.sh
+++ b/website/scripts/website-build.sh
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 ######################################################
 # NOTE: This file is managed by the Digital Team's   #
 # Terraform configuration @ hashicorp/mktg-terraform #
diff --git a/website/scripts/website-start.sh b/website/scripts/website-start.sh
index 402f7499c0b83..9ead54c530e15 100755
--- a/website/scripts/website-start.sh
+++ b/website/scripts/website-start.sh
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 ######################################################
 # NOTE: This file is managed by the Digital Team's   #
 # Terraform configuration @ hashicorp/mktg-terraform #